/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __LINUX__AIO_H
#define __LINUX__AIO_H

#include <linux/aio_abi.h>

struct kioctx;
struct kiocb;
struct mm_struct;

typedef int (kiocb_cancel_fn)(struct kiocb *);

/* prototypes */
#ifdef CONFIG_AIO
extern void exit_aio(struct mm_struct *mm);
void kiocb_set_cancel_fn(struct kiocb *req, kiocb_cancel_fn *cancel);
#else
static inline void exit_aio(struct mm_struct *mm) { }
static inline void kiocb_set_cancel_fn(struct kiocb *req,
				       kiocb_cancel_fn *cancel) { }
#endif /* CONFIG_AIO */

/* for sysctl: */
extern unsigned long aio_nr;
extern unsigned long aio_max_nr;

#endif /* __LINUX__AIO_H */
<td class='form'><form method='get'>
<input type='hidden' name='id2' value='fb6c79d7261afb7e942251254ea47951c2a9a706'/><select name='h' onchange='this.form.submit();'>
<option value='aarch64/hotplug-vcpu/head'>aarch64/hotplug-vcpu/head</option>
<option value='aarch64/hotplug-vcpu/v6.5'>aarch64/hotplug-vcpu/v6.5</option>
<option value='aarch64/hotplug-vcpu/v6.6'>aarch64/hotplug-vcpu/v6.6</option>
<option value='aarch64/hotplug-vcpu/v6.6-rc1'>aarch64/hotplug-vcpu/v6.6-rc1</option>
<option value='aarch64/hotplug-vcpu/v6.6-rc5'>aarch64/hotplug-vcpu/v6.6-rc5</option>
<option value='aarch64/hotplug-vcpu/v6.6-rc6'>aarch64/hotplug-vcpu/v6.6-rc6</option>
<option value='aarch64/hotplug-vcpu/v6.6-rc7'>aarch64/hotplug-vcpu/v6.6-rc7</option>
<option value='aarch64/hotplug-vcpu/v6.7'>aarch64/hotplug-vcpu/v6.7</option>
<option value='aarch64/hotplug-vcpu/v6.7-rc1'>aarch64/hotplug-vcpu/v6.7-rc1</option>
<option value='aarch64/hotplug-vcpu/v6.7-rc2'>aarch64/hotplug-vcpu/v6.7-rc2</option>
<option value='aarch64/hotplug-vcpu/v6.7-rc3'>aarch64/hotplug-vcpu/v6.7-rc3</option>
<option value='aarch64/hotplug-vcpu/v6.7-rc4'>aarch64/hotplug-vcpu/v6.7-rc4</option>
<option value='aarch64/hotplug-vcpu/v6.7-rc5'>aarch64/hotplug-vcpu/v6.7-rc5</option>
<option value='aarch64/hotplug-vcpu/v6.8-rc2'>aarch64/hotplug-vcpu/v6.8-rc2</option>
<option value='aarch64/ktext/head'>aarch64/ktext/head</option>
<option value='aarch64/ktext/v6.5'>aarch64/ktext/v6.5</option>
<option value='aarch64/ktext/v6.6-rc5'>aarch64/ktext/v6.6-rc5</option>
<option value='aarch64/ktext/v6.7'>aarch64/ktext/v6.7</option>
<option value='adfs'>adfs</option>
<option value='cex7'>cex7</option>
<option value='clearfog'>clearfog</option>
<option value='clearfog-4.10'>clearfog-4.10</option>
<option value='clearfog-4.11'>clearfog-4.11</option>
<option value='clearfog-4.12'>clearfog-4.12</option>
<option value='clearfog-4.13'>clearfog-4.13</option>
<option value='clearfog-4.9'>clearfog-4.9</option>
<option value='clkdev'>clkdev</option>
<option value='csi-v6'>csi-v6</option>
<option value='devel-stable'>devel-stable</option>
<option value='drm-armada-devel'>drm-armada-devel</option>
<option value='drm-armada-devel-4.15'>drm-armada-devel-4.15</option>
<option value='drm-armada-fixes'>drm-armada-fixes</option>
<option value='drm-armada-fixes-4.15'>drm-armada-fixes-4.15</option>
<option value='drm-dwhdmi-devel'>drm-dwhdmi-devel</option>
<option value='drm-etnaviv-devel'>drm-etnaviv-devel</option>
<option value='drm-tda9950-fixes'>drm-tda9950-fixes</option>
<option value='drm-tda998x-devel'>drm-tda998x-devel</option>
<option value='drm-tda998x-fixes'>drm-tda998x-fixes</option>
<option value='fec-testing'>fec-testing</option>
<option value='fiq'>fiq</option>
<option value='fixes'>fixes</option>
<option value='fixes-sa1111'>fixes-sa1111</option>
<option value='for-arm-soc'>for-arm-soc</option>
<option value='for-next'>for-next</option>
<option value='hb2'>hb2</option>
<option value='ktext'>ktext</option>
<option value='ktext-current'>ktext-current</option>
<option value='master' selected='selected'>master</option>
<option value='mcbin'>mcbin</option>
<option value='mvneta'>mvneta</option>
<option value='mvpp2'>mvpp2</option>
<option value='net-merged'>net-merged</option>
<option value='net-next'>net-next</option>
<option value='net-queue'>net-queue</option>
<option value='nmi'>nmi</option>
<option value='phy'>phy</option>
<option value='rtc'>rtc</option>
<option value='sa1100'>sa1100</option>
<option value='spectre'>spectre</option>
<option value='to-build'>to-build</option>
<option value='uaccess'>uaccess</option>
<option value='vcpu-rmk'>vcpu-rmk</option>
<option value='wl18xx'>wl18xx</option>
<option value='zii'>zii</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Russell King's ARM Linux kernel tree</td><td class='sub right'>Russell King</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit/linux-arm.git/'>summary</a><a href='/cgit/linux-arm.git/refs/'>refs</a><a href='/cgit/linux-arm.git/log/drivers/net/wireless'>log</a><a href='/cgit/linux-arm.git/tree/drivers/net/wireless'>tree</a><a href='/cgit/linux-arm.git/commit/drivers/net/wireless'>commit</a><a class='active' href='/cgit/linux-arm.git/diff/drivers/net/wireless?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit/linux-arm.git/log/drivers/net/wireless'>
<input type='hidden' name='id2' value='fb6c79d7261afb7e942251254ea47951c2a9a706'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit/linux-arm.git/diff/?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>root</a>/<a href='/cgit/linux-arm.git/diff/drivers?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers</a>/<a href='/cgit/linux-arm.git/diff/drivers/net?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>net</a>/<a href='/cgit/linux-arm.git/diff/drivers/net/wireless?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>wireless</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id2' value='fb6c79d7261afb7e942251254ea47951c2a9a706'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><div class='diffstat-header'><a href='/cgit/linux-arm.git/diff/?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>Diffstat</a> (limited to 'drivers/net/wireless')</div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/Kconfig</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/admtek/adm8211.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/admtek/adm8211.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ar5523/ar5523.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ar5523/ar5523.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/ahb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/ahb.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/bmi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/bmi.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/bmi.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/bmi.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/ce.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/ce.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/ce.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/ce.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/core.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/core.c</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/core.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/core.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/coredump.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/coredump.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/coredump.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/coredump.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/debug.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/debug.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/debugfs_sta.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/debugfs_sta.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/htc.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/htc.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/htc.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/htc.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/htt.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/htt.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/htt.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/htt.h</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/htt_rx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/htt_rx.c</a></td><td class='right'>555</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/htt_tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/htt_tx.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/hw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/hw.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/hw.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/hw.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/leds.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/leds.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/leds.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/leds.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/mac.c</a></td><td class='right'>618</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/pci.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/pci.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/pci.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/qmi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/qmi.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/qmi.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/qmi.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/rx_desc.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/rx_desc.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/sdio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/sdio.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/snoc.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/snoc.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/snoc.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/snoc.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/spectral.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/spectral.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/swap.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/swap.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/targaddrs.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/targaddrs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/testmode.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/testmode.c</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/testmode_i.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/testmode_i.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/thermal.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/thermal.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/thermal.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/thermal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/trace.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/trace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/trace.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/trace.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/txrx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/txrx.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/usb.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/usb.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/usb.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/wmi-ops.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/wmi-ops.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/wmi-tlv.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/wmi-tlv.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/wmi-tlv.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/wmi-tlv.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/wmi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/wmi.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/wmi.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/wmi.h</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/wow.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/wow.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/ahb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/ahb.c</a></td><td class='right'>725</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/ahb.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/ahb.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/ce.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/ce.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/ce.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/ce.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/core.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/core.c</a></td><td class='right'>1870</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/core.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/core.h</a></td><td class='right'>459</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/coredump.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/coredump.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/coredump.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/coredump.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/dbring.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/dbring.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/dbring.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/dbring.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/debug.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/debug.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/debug.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/debug.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/debugfs.c</a></td><td class='right'>1103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/debugfs.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/debugfs.h</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/debugfs_htt_stats.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/debugfs_htt_stats.c</a></td><td class='right'>4563</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/debugfs_htt_stats.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/debugfs_htt_stats.h</a></td><td class='right'>385</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/debugfs_sta.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/debugfs_sta.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/debugfs_sta.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/debugfs_sta.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/dp.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/dp.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/dp.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/dp.h</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/dp_rx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/dp_rx.c</a></td><td class='right'>1730</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/dp_rx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/dp_rx.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/dp_tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/dp_tx.c</a></td><td class='right'>421</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/dp_tx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/dp_tx.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/fw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/fw.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/fw.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/fw.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/hal.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/hal.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/hal.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/hal.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/hal_desc.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/hal_desc.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/hal_rx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/hal_rx.c</a></td><td class='right'>632</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/hal_rx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/hal_rx.h</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/hal_tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/hal_tx.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/hal_tx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/hal_tx.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/hif.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/hif.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/htc.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/htc.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/htc.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/htc.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/hw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/hw.c</a></td><td class='right'>1196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/hw.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/hw.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/mac.c</a></td><td class='right'>5863</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.7%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/mac.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/mac.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/mhi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/mhi.c</a></td><td class='right'>463</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/mhi.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/mhi.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/p2p.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/p2p.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/p2p.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/p2p.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/pci.c</a></td><td class='right'>1440</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/pci.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/pci.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/pcic.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/pcic.c</a></td><td class='right'>865</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/pcic.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/pcic.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/peer.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/peer.c</a></td><td class='right'>427</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/peer.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/peer.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/qmi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/qmi.c</a></td><td class='right'>1135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/qmi.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/qmi.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/reg.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/reg.c</a></td><td class='right'>557</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/reg.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/reg.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/rx_desc.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/rx_desc.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/spectral.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/spectral.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/spectral.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/spectral.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/testmode.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/testmode.c</a></td><td class='right'>433</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/testmode.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/testmode.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/testmode_i.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/testmode_i.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/thermal.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/thermal.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/thermal.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/thermal.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/trace.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/trace.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/trace.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/trace.h</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/wmi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/wmi.c</a></td><td class='right'>3687</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/wmi.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/wmi.h</a></td><td class='right'>1604</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/wow.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/wow.c</a></td><td class='right'>810</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/wow.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/wow.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/Kconfig</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/Makefile</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/acpi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/acpi.c</a></td><td class='right'>510</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/acpi.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/acpi.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/ahb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/ahb.c</a></td><td class='right'>1156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/ahb.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/ahb.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/ce.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/ce.c</a></td><td class='right'>1051</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/ce.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/ce.h</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/core.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/core.c</a></td><td class='right'>2321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/core.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/core.h</a></td><td class='right'>1519</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/coredump.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/coredump.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/coredump.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/coredump.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/dbring.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/dbring.c</a></td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/dbring.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/dbring.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/debug.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/debug.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/debug.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/debug.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/debugfs.c</a></td><td class='right'>1515</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/debugfs.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/debugfs.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c</a></td><td class='right'>6178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/debugfs_htt_stats.h</a></td><td class='right'>2076</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/debugfs_sta.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/debugfs_sta.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/debugfs_sta.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/debugfs_sta.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/dp.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/dp.c</a></td><td class='right'>1841</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/dp.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/dp.h</a></td><td class='right'>1976</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/dp_mon.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/dp_mon.c</a></td><td class='right'>4438</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/dp_mon.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/dp_mon.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/dp_rx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/dp_rx.c</a></td><td class='right'>4830</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/dp_rx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/dp_rx.h</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/dp_tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/dp_tx.c</a></td><td class='right'>1781</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/dp_tx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/dp_tx.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/fw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/fw.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/fw.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/fw.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/hal.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/hal.c</a></td><td class='right'>2663</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/hal.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/hal.h</a></td><td class='right'>1181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/hal_desc.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/hal_desc.h</a></td><td class='right'>3045</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/hal_rx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/hal_rx.c</a></td><td class='right'>947</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/hal_rx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/hal_rx.h</a></td><td class='right'>1171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/hal_tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/hal_tx.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/hal_tx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/hal_tx.h</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/hif.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/hif.h</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/htc.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/htc.c</a></td><td class='right'>795</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/htc.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/htc.h</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/hw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/hw.c</a></td><td class='right'>1680</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/hw.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/hw.h</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/mac.c</a></td><td class='right'>14996</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 26.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 73.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/mac.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/mac.h</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/mhi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/mhi.c</a></td><td class='right'>659</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/mhi.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/mhi.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/p2p.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/p2p.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/p2p.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/p2p.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/pci.c</a></td><td class='right'>1895</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/pci.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/pci.h</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/peer.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/peer.c</a></td><td class='right'>570</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/peer.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/peer.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/qmi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/qmi.c</a></td><td class='right'>3917</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/qmi.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/qmi.h</a></td><td class='right'>635</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/reg.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/reg.c</a></td><td class='right'>994</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/reg.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/reg.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/rx_desc.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/rx_desc.h</a></td><td class='right'>1544</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/testmode.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/testmode.c</a></td><td class='right'>395</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/testmode.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/testmode.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/trace.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/trace.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/trace.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/trace.h</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/wmi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/wmi.c</a></td><td class='right'>11230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 80.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/wmi.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/wmi.h</a></td><td class='right'>6526</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/wow.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/wow.c</a></td><td class='right'>1029</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/wow.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath12k/wow.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/ahb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/ahb.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/ath5k.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/ath5k.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/base.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/base.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/base.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/base.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/debug.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/debug.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/dma.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/dma.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/eeprom.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/eeprom.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/eeprom.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/eeprom.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/led.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/led.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/mac80211-ops.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/mac80211-ops.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/pci.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/pcu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/pcu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/phy.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/reg.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/reg.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/reset.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/reset.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/sysfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/sysfs.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/bmi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/bmi.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/cfg80211.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/cfg80211.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/core.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/debug.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/debug.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/hif.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/hif.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/hif.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/hif.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/htc.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/htc.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/htc_mbox.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/htc_mbox.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/htc_pipe.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/htc_pipe.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/init.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/init.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/main.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/recovery.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/recovery.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/sdio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/sdio.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/trace.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/trace.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/txrx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/txrx.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/usb.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/wmi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/wmi.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/wmi.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/wmi.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ahb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ahb.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/antenna.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/antenna.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar5008_phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar5008_phy.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9002_calib.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9002_calib.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9002_hw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9002_hw.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9002_mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9002_mac.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9002_phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9002_phy.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_aic.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9003_aic.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_calib.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9003_calib.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9003_eeprom.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9003_eeprom.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_hw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9003_hw.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9003_mac.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_mci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9003_mci.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_paprd.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9003_paprd.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9003_phy.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_phy.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9003_phy.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_wow.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9003_wow.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ath9k.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ath9k.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/beacon.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/beacon.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/btcoex.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/btcoex.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/calib.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/calib.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/channel.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/channel.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/common-beacon.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/common-beacon.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/common-debug.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/common-debug.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/common-init.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/common-init.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/common-spectral.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/common-spectral.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/common.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/common.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/common.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/debug.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/debug.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/debug.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/debug.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/debug_sta.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/debug_sta.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/dfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/dfs.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/dfs_debug.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/dfs_debug.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/dynack.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/dynack.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/eeprom.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/eeprom.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/eeprom.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/eeprom.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/eeprom_4k.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/eeprom_4k.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/eeprom_9287.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/eeprom_9287.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/eeprom_def.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/eeprom_def.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/gpio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/gpio.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/hif_usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/hif_usb.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/hif_usb.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/hif_usb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/htc.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/htc.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/htc_drv_beacon.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/htc_drv_debug.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/htc_drv_debug.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/htc_drv_init.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/htc_drv_init.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/htc_drv_main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/htc_drv_main.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/htc_drv_txrx.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/htc_hst.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/htc_hst.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/hw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/hw.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/hw.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/hw.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/init.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/init.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/link.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/link.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/mac.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/mac.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/mac.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/main.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/mci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/mci.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/pci.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/recv.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/recv.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/reg.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/reg.h</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/reg_aic.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/reg_aic.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/rng.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/rng.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/tx99.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/tx99.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/wmi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/wmi.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/wow.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/wow.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/xmit.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/xmit.c</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/carl9170.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/carl9170.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/cmd.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/cmd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/debug.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/debug.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/fw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/fw.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/fwcmd.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/fwcmd.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/fwdesc.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/fwdesc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/mac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/main.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/rx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/rx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/tx.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/usb.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/wlan.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/wlan.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/dfs_pattern_detector.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/dfs_pattern_detector.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/hw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/hw.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/key.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/key.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/main.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/regd.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/regd.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/regd.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/regd.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/regd_common.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/regd_common.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/spectral_common.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/spectral_common.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/testmode_i.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/testmode_i.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/trace.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/trace.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/debug.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/debug.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/debug.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/debug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/dxe.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/dxe.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/dxe.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/dxe.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/firmware.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/firmware.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/firmware.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/firmware.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/hal.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/hal.h</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/main.c</a></td><td class='right'>547</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/pmc.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/pmc.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/smd.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/smd.c</a></td><td class='right'>831</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/smd.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/smd.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/testmode.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/testmode.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/txrx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/txrx.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/txrx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/txrx.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/wcn36xx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/wcn36xx.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/cfg80211.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/cfg80211.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/debugfs.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/ethtool.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/ethtool.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/fw.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/fw.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/fw_inc.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/fw_inc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/interrupt.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/interrupt.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/main.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/netdev.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/netdev.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/p2p.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/p2p.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/pm.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/pm.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/trace.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/trace.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/txrx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/txrx.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/txrx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/txrx.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/txrx_edma.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/txrx_edma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/txrx_edma.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/txrx_edma.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/wil6210.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/wil6210.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/wmi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/wmi.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/wmi.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/wmi.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/atmel/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/atmel/Kconfig</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/atmel/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/atmel/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/atmel/at76c50x-usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/atmel/at76c50x-usb.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/atmel/at76c50x-usb.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/atmel/at76c50x-usb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/atmel/atmel.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/atmel/atmel.c</a></td><td class='right'>4523</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.9%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/atmel/atmel.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/atmel/atmel.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/atmel/atmel_cs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/atmel/atmel_cs.c</a></td><td class='right'>283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/atmel/atmel_pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/atmel/atmel_pci.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/b43.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/b43.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/debugfs.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/debugfs.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/debugfs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/dma.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/dma.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/leds.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/leds.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/main.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/phy_common.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/phy_common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/phy_g.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/phy_g.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/phy_ht.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/phy_ht.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/phy_n.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/phy_n.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/pio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/pio.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/sysfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/sysfs.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/tables_lpphy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/tables_lpphy.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/tables_lpphy.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/tables_lpphy.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43legacy/b43legacy.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43legacy/b43legacy.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43legacy/debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43legacy/debugfs.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43legacy/debugfs.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43legacy/debugfs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43legacy/dma.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43legacy/dma.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43legacy/leds.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43legacy/leds.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43legacy/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43legacy/main.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43legacy/phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43legacy/phy.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43legacy/radio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43legacy/radio.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43legacy/sysfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43legacy/sysfs.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/acpi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/acpi.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/module.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/module.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/vops.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/vops.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c</a></td><td class='right'>1397</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/module.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/module.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/vops.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/vops.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.h</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c</a></td><td class='right'>910</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/module.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/module.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/vops.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/vops.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c</a></td><td class='right'>453</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_int.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_int.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/pmu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/pmu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/pub.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/pub.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/scb.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/scb.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/stf.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/stf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/types.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/types.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/include/soc.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/include/soc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/cisco/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/cisco/Kconfig</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/cisco/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/cisco/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/cisco/airo.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/cisco/airo.c</a></td><td class='right'>8263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 14.5%;'/><td class='none' style='width: 85.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/cisco/airo.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/cisco/airo.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/cisco/airo_cs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/cisco/airo_cs.c</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/ipw2100.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/ipw2100.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/ipw2100.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/ipw2100.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/ipw2200.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/ipw2200.c</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/ipw2200.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/ipw2200.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/libipw.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/libipw.h</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/libipw_crypto.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/libipw_crypto.c</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/libipw_crypto_ccmp.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/libipw_crypto_ccmp.c</a></td><td class='right'>438</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/libipw_crypto_tkip.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/libipw_crypto_tkip.c</a></td><td class='right'>728</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/libipw_crypto_wep.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/libipw_crypto_wep.c</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/libipw_module.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/libipw_module.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/libipw_rx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/libipw_rx.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/libipw_spy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/libipw_spy.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/libipw_tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/libipw_tx.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/libipw_wx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/libipw_wx.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/3945-mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/3945-mac.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/3945-rs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/3945-rs.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/3945.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/3945.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/3945.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/3945.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/4965-mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/4965-mac.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/4965-rs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/4965-rs.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/4965.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/4965.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/4965.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/4965.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/commands.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/commands.h</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/common.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/common.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/common.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/common.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/iwl-spectrum.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/iwl-spectrum.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/Kconfig</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/Makefile</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/1000.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/1000.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/2000.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/2000.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/22000.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/22000.c</a></td><td class='right'>782</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/5000.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/5000.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/6000.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/6000.c</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/7000.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/7000.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/8000.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/8000.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/9000.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/9000.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/ax210.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/bz.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/bz.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/dr.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/dr.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/rf-fm.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/rf-fm.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/rf-gf.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/rf-gf.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/rf-hr.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/rf-hr.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/rf-jf.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/rf-jf.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/rf-pe.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/rf-pe.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/rf-wh.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/rf-wh.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/sc.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/sc.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/agn.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/agn.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/calib.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/calib.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/commands.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/commands.h</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/dev.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/dev.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/devices.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/devices.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c</a> (renamed from drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c)</td><td class='right'>483</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/led.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/led.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/led.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/led.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/lib.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/lib.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/main.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/power.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/power.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/power.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/power.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/rs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/rs.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/rs.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/rs.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/rx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/rx.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/rxon.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/rxon.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/scan.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/scan.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/sta.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/sta.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/tt.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/tt.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/tt.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/tt.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/tx.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/ucode.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/acpi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/acpi.c</a></td><td class='right'>955</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/acpi.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/acpi.h</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/alive.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/alive.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/binding.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/binding.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/cmdhdr.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/cmdhdr.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/coex.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/coex.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/commands.h</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/config.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/config.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/context.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/context.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/d3.h</a></td><td class='right'>484</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h</a></td><td class='right'>539</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/debug.h</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/dhc.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/dhc.h</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/filter.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/filter.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/location.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/location.h</a></td><td class='right'>524</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h</a></td><td class='right'>858</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/mac.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/mac.h</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/offload.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/offload.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/phy.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/phy.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/power.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/power.h</a></td><td class='right'>312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/rfi.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/rfi.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/rs.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/rs.h</a></td><td class='right'>450</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/rx.h</a></td><td class='right'>578</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/scan.h</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/sta.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/sta.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/stats.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/stats.h</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/system.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/system.h</a> (renamed from drivers/net/wireless/intel/iwlwifi/fw/api/soc.h)</td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/time-event.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/time-event.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/tx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/tx.h</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/txq.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/txq.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/dbg.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/dbg.c</a></td><td class='right'>1207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/dbg.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/dbg.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/debugfs.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/dhc-utils.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/dhc-utils.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/dump.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/dump.c</a></td><td class='right'>508</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/error-dump.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/file.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/file.h</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/img.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/img.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/img.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/img.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/init.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/init.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/notif-wait.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/notif-wait.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/paging.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/paging.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/pnvm.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/pnvm.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/pnvm.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/pnvm.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/regulatory.c</a></td><td class='right'>743</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/regulatory.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/regulatory.h</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/rs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/rs.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/runtime.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/runtime.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/smem.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/smem.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/uefi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/uefi.c</a></td><td class='right'>845</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/uefi.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/uefi.h</a></td><td class='right'>393</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-config.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-config.h</a></td><td class='right'>579</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-csr.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-csr.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c</a></td><td class='right'>482</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-debug.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-debug.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-debug.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-debug.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-io.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace-io.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-ucode.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace-ucode.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-drv.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-drv.c</a></td><td class='right'>757</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-drv.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-drv.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c</a></td><td class='right'>398</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-fh.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-fh.h</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-io.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-io.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-io.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-io.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-modparams.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c</a></td><td class='right'>918</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-nvm-utils.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-nvm-utils.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-nvm-utils.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-nvm-utils.h</a> (renamed from drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.h)</td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-prph.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-prph.h</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-trans.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-trans.c</a></td><td class='right'>841</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-trans.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-trans.h</a></td><td class='right'>1100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-utils.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-utils.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-utils.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-utils.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mei/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mei/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mei/internal.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mei/internal.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mei/iwl-mei.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mei/iwl-mei.h</a></td><td class='right'>542</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mei/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mei/main.c</a></td><td class='right'>2216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mei/net.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mei/net.c</a></td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mei/sap.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mei/sap.h</a></td><td class='right'>784</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mei/trace-data.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mei/trace-data.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mei/trace.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mei/trace.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mei/trace.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mei/trace.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/agg.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/agg.c</a></td><td class='right'>677</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/agg.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/agg.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/ap.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/ap.c</a></td><td class='right'>363</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/ap.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/ap.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/coex.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/coex.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/coex.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/coex.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/constants.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/constants.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/d3.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/d3.c</a></td><td class='right'>2065</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/d3.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/d3.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/debugfs.c</a></td><td class='right'>1113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/debugfs.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/debugfs.h</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/ftm-initiator.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/ftm-initiator.c</a></td><td class='right'>451</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/ftm-initiator.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/ftm-initiator.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/fw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/fw.c</a></td><td class='right'>548</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/hcmd.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/hcmd.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/iface.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/iface.c</a></td><td class='right'>703</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/iface.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/iface.h</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/key.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/key.c</a></td><td class='right'>408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/key.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/key.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/led.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/led.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/led.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/led.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/link.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/link.c</a></td><td class='right'>909</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/link.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/link.h</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/low_latency.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/low_latency.c</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/low_latency.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/low_latency.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/mac80211.c</a></td><td class='right'>2702</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/mac80211.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/mac80211.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/mcc.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/mcc.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/mcc.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/mcc.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/mld.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/mld.c</a></td><td class='right'>776</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/mld.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/mld.h</a></td><td class='right'>615</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/mlo.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/mlo.c</a></td><td class='right'>1199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/mlo.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/mlo.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/notif.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/notif.c</a></td><td class='right'>719</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/notif.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/notif.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/phy.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/phy.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/phy.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/power.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/power.c</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/power.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/power.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/ptp.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/ptp.c</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/ptp.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/ptp.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/regulatory.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/regulatory.c</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/regulatory.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/regulatory.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/roc.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/roc.c</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/roc.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/roc.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/rx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/rx.c</a></td><td class='right'>2264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/rx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/rx.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/scan.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/scan.c</a></td><td class='right'>2179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/scan.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/scan.h</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/session-protect.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/session-protect.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/session-protect.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/session-protect.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/sta.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/sta.c</a></td><td class='right'>1319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/sta.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/sta.h</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/stats.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/stats.c</a></td><td class='right'>521</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/stats.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/stats.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tests/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/tests/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tests/agg.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/tests/agg.c</a></td><td class='right'>663</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tests/hcmd.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/tests/hcmd.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tests/link-selection.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/tests/link-selection.c</a></td><td class='right'>339</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tests/link.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/tests/link.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tests/module.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/tests/module.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tests/rx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/tests/rx.c</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tests/utils.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/tests/utils.c</a></td><td class='right'>503</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tests/utils.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/tests/utils.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/thermal.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/thermal.c</a></td><td class='right'>467</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/thermal.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/thermal.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/time_sync.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/time_sync.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/time_sync.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/time_sync.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tlc.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/tlc.c</a></td><td class='right'>739</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tlc.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/tlc.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/tx.c</a></td><td class='right'>1394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mld/tx.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/binding.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/binding.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/coex.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/coex.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/constants.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/constants.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/d3.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/d3.c</a></td><td class='right'>2592</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c</a></td><td class='right'>1110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/debugfs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c</a></td><td class='right'>527</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/ftm-responder.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/ftm-responder.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/fw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/fw.c</a></td><td class='right'>1196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/led.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/led.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/link.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/link.c</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c</a></td><td class='right'>943</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c</a></td><td class='right'>4403</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c</a></td><td class='right'>408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c</a></td><td class='right'>1283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c</a></td><td class='right'>1226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/mvm.h</a></td><td class='right'>1279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/nvm.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/offloading.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/offloading.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/ops.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/ops.c</a></td><td class='right'>1226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/power.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/power.c</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/ptp.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/ptp.c</a></td><td class='right'>326</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/quota.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/quota.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/rfi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/rfi.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c</a></td><td class='right'>483</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/rs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/rs.c</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/rs.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/rs.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/rx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/rx.c</a></td><td class='right'>580</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c</a></td><td class='right'>1807</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/scan.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/scan.c</a></td><td class='right'>1204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/sf.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/sf.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/sta.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/sta.c</a></td><td class='right'>1312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/sta.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/sta.h</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/tdls.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/tdls.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/tests/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/tests/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/tests/hcmd.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/tests/hcmd.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/tests/module.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/tests/module.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/time-event.c</a></td><td class='right'>566</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/time-event.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/time-event.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/time-sync.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/time-sync.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/time-sync.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/time-sync.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/tt.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/tt.c</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/tx.c</a></td><td class='right'>913</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/utils.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/utils.c</a></td><td class='right'>948</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-v2.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-v2.c</a></td><td class='right'>618</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/drv.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/drv.c</a></td><td class='right'>2309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h</a> (renamed from drivers/net/wireless/intel/iwlwifi/pcie/internal.h)</td><td class='right'>606</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/rx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/rx.c</a> (renamed from drivers/net/wireless/intel/iwlwifi/pcie/rx.c)</td><td class='right'>452</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c</a></td><td class='right'>654</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c</a> (renamed from drivers/net/wireless/intel/iwlwifi/pcie/trans.c)</td><td class='right'>2093</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx-gen2.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx-gen2.c</a></td><td class='right'>1434</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c</a> (renamed from drivers/net/wireless/intel/iwlwifi/pcie/tx.c)</td><td class='right'>1405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/iwl-context-info-v2.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/iwl-context-info-v2.h</a> (renamed from drivers/net/wireless/intel/iwlwifi/iwl-context-info-gen3.h)</td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/iwl-context-info.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/iwl-context-info.h</a> (renamed from drivers/net/wireless/intel/iwlwifi/iwl-context-info.h)</td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c</a></td><td class='right'>378</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/utils.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/utils.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/utils.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/utils.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/queue/tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/queue/tx.c</a></td><td class='right'>1834</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/queue/tx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/queue/tx.h</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/tests/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/tests/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/tests/devinfo.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/tests/devinfo.c</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/tests/module.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/tests/module.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/tests/nvm_parse.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/tests/nvm_parse.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/tests/utils.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/tests/utils.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/Kconfig</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_80211.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_80211.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_80211_rx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_80211_rx.c</a></td><td class='right'>1116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_80211_tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_80211_tx.c</a></td><td class='right'>554</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_ap.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_ap.c</a></td><td class='right'>3277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.7%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_ap.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_ap.h</a></td><td class='right'>264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_common.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_common.h</a></td><td class='right'>420</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_config.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_config.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_cs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_cs.c</a></td><td class='right'>710</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_download.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_download.c</a></td><td class='right'>811</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_hw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_hw.c</a></td><td class='right'>3383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.9%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_info.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_info.c</a></td><td class='right'>509</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_ioctl.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_ioctl.c</a></td><td class='right'>4035</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.1%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_main.c</a></td><td class='right'>1123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_pci.c</a></td><td class='right'>445</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_plx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_plx.c</a></td><td class='right'>617</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_proc.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_proc.c</a></td><td class='right'>411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_wlan.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_wlan.h</a></td><td class='right'>1049</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/Kconfig</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/airport.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/airport.c</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/cfg.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/cfg.c</a></td><td class='right'>291</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/cfg.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/cfg.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/fw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/fw.c</a></td><td class='right'>387</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/fw.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/fw.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/hermes.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/hermes.c</a></td><td class='right'>778</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/hermes.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/hermes.h</a></td><td class='right'>534</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/hermes_dld.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/hermes_dld.c</a></td><td class='right'>477</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/hermes_dld.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/hermes_dld.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/hermes_rid.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/hermes_rid.h</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/hw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/hw.c</a></td><td class='right'>1356</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/hw.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/hw.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/main.c</a></td><td class='right'>2414</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/main.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/main.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/mic.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/mic.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/mic.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/mic.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/orinoco.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/orinoco.h</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/orinoco_cs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/orinoco_cs.c</a></td><td class='right'>341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/orinoco_nortel.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/orinoco_nortel.c</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/orinoco_pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/orinoco_pci.c</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/orinoco_pci.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/orinoco_pci.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/orinoco_plx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/orinoco_plx.c</a></td><td class='right'>362</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/orinoco_tmd.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/orinoco_tmd.c</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/orinoco_usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/orinoco_usb.c</a></td><td class='right'>1787</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/scan.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/scan.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/scan.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/scan.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/spectrum_cs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/spectrum_cs.c</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/wext.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/wext.c</a></td><td class='right'>1413</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/wext.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/wext.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/eeprom.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/p54/eeprom.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/fwio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/p54/fwio.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/p54/main.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/p54.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/p54/p54.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/p54pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/p54/p54pci.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/p54spi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/p54/p54spi.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/txrx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/p54/txrx.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/isl_38xx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/isl_38xx.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/isl_38xx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/isl_38xx.h</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/isl_ioctl.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/isl_ioctl.c</a></td><td class='right'>2909</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/isl_ioctl.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/isl_ioctl.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/isl_oid.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/isl_oid.h</a></td><td class='right'>492</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/islpci_dev.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/islpci_dev.c</a></td><td class='right'>951</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/islpci_dev.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/islpci_dev.h</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/islpci_eth.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/islpci_eth.c</a></td><td class='right'>489</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/islpci_eth.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/islpci_eth.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/islpci_hotplug.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/islpci_hotplug.c</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/islpci_mgt.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/islpci_mgt.c</a></td><td class='right'>491</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/islpci_mgt.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/islpci_mgt.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/oid_mgt.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/oid_mgt.c</a></td><td class='right'>889</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/oid_mgt.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/oid_mgt.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/prismcompat.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/prismcompat.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/cfg.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/cfg.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/cmd.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/cmd.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/cmd.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/cmd.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/cmdresp.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/cmdresp.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/decl.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/decl.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/dev.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/dev.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/ethtool.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/ethtool.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/host.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/host.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/if_cs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/if_cs.c</a></td><td class='right'>957</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/if_sdio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/if_sdio.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/if_spi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/if_spi.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/if_usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/if_usb.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/main.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/mesh.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/mesh.c</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/mesh.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/mesh.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/radiotap.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/radiotap.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/rx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/rx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/tx.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/types.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/types.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas_tf/cmd.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas_tf/cmd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas_tf/if_usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas_tf/if_usb.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas_tf/libertas_tf.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas_tf/libertas_tf.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas_tf/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas_tf/main.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/11ac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/11ac.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/11ac.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/11ac.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/11h.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/11h.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/11n.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/11n.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/11n.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/11n.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/11n_aggr.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/11n_aggr.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/11n_aggr.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/11n_aggr.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/Makefile</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/cfg80211.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/cfg80211.c</a></td><td class='right'>982</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/cfg80211.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/cfg80211.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/cfp.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/cfp.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/cmdevt.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/cmdevt.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/debugfs.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/decl.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/decl.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/ethtool.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/ethtool.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/fw.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/fw.h</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/ie.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/ie.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/init.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/init.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/ioctl.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/ioctl.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/join.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/join.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/main.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/main.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/main.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/pcie.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/pcie.c</a></td><td class='right'>431</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/pcie.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/pcie.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/pcie_quirks.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/pcie_quirks.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/scan.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/scan.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/sdio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/sdio.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/sdio.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/sdio.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/sta_cmd.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/sta_cmd.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/sta_event.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/sta_event.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/sta_ioctl.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/sta_rx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/sta_rx.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/sta_tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/sta_tx.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/tdls.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/tdls.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/txrx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/txrx.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/uap_cmd.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/uap_cmd.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/uap_event.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/uap_event.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/uap_txrx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/uap_txrx.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/usb.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/usb.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/usb.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/util.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/util.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/util.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/util.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/wmm.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/wmm.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/wmm.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/wmm.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwl8k.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwl8k.c</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/Makefile</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/agg-rx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/agg-rx.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/channel.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/channel.c</a></td><td class='right'>416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/debugfs.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/dma.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/dma.c</a></td><td class='right'>804</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/dma.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/dma.h</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/eeprom.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/eeprom.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mac80211.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mac80211.c</a></td><td class='right'>1111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mcu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mcu.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mmio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mmio.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76.h</a></td><td class='right'>1164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/beacon.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/core.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/debugfs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/dma.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/dma.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/eeprom.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/eeprom.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/init.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/init.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/mac.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/mac.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/mac.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/main.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/mcu.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/mcu.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/mcu.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/pci.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/regs.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/regs.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/soc.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/soc.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/dma.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/dma.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/init.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/init.c</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/mac.c</a></td><td class='right'>749</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/mac.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/mac.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/main.c</a></td><td class='right'>282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/mcu.c</a></td><td class='right'>678</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/mcu.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/mcu.h</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/mmio.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/mt7615_trace.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/mt7615_trace.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/pci.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/regs.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/regs.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/sdio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/sdio.c</a></td><td class='right'>334</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/soc.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/soc.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/testmode.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/testmode.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/trace.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/trace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/usb.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76_connac.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76_connac.h</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h</a> (renamed from drivers/net/wireless/mediatek/mt76/mt7921/mac.h)</td><td class='right'>454</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.h</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c</a></td><td class='right'>1108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c</a></td><td class='right'>1846</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h</a></td><td class='right'>1180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/init.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x0/init.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x0/main.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x0/pci.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/pci_mcu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x0/pci_mcu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x0/phy.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x0/usb.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_dfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_dma.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_dma.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_mac.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_mac.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_mcu.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_phy.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_phy.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_phy.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_regs.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_trace.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_trace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_trace.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_trace.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_usb.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_usb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_util.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_util.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/init.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/init.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/mac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/mac.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/mac.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/mcu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/mcu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/mcu.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/mcu.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2u.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2u.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/pci.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/phy.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/usb.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mcu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_mcu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/coredump.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/coredump.c</a></td><td class='right'>411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/coredump.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/coredump.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c</a></td><td class='right'>1485</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/dma.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/dma.c</a></td><td class='right'>731</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c</a></td><td class='right'>366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/init.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/init.c</a></td><td class='right'>1001</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/mac.c</a></td><td class='right'>2303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/mac.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/mac.h</a></td><td class='right'>343</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/main.c</a></td><td class='right'>1284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/mcu.c</a></td><td class='right'>4378</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/mcu.h</a></td><td class='right'>1136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/mmio.c</a></td><td class='right'>988</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h</a></td><td class='right'>442</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/pci.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/regs.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/regs.h</a></td><td class='right'>1123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/soc.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/soc.c</a></td><td class='right'>1312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/testmode.c</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/testmode.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/testmode.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/Kconfig</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/dma.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/dma.c</a></td><td class='right'>480</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/eeprom.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/eeprom.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/eeprom.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/eeprom.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/init.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/init.c</a></td><td class='right'>442</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/mac.c</a></td><td class='right'>1613</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/main.c</a></td><td class='right'>1571</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/mcu.c</a></td><td class='right'>1936</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/mcu.h</a></td><td class='right'>420</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h</a></td><td class='right'>473</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/pci.c</a></td><td class='right'>507</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/regs.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/regs.h</a></td><td class='right'>374</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/sdio.c</a></td><td class='right'>333</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/testmode.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/testmode.c</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/trace.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/trace.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/usb.c</a></td><td class='right'>348</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7925/Kconfig</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7925/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7925/debugfs.c</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/init.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7925/init.c</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7925/mac.c</a></td><td class='right'>1497</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/mac.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7925/mac.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7925/main.c</a></td><td class='right'>2229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7925/mcu.c</a></td><td class='right'>3903</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/mcu.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7925/mcu.h</a></td><td class='right'>714</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h</a></td><td class='right'>380</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7925/pci.c</a></td><td class='right'>639</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/pci_mcu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7925/pci_mcu.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/regd.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7925/regd.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/regd.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7925/regd.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/regs.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7925/regs.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/testmode.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7925/testmode.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7925/usb.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt792x.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt792x.h</a></td><td class='right'>537</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.c</a></td><td class='right'>486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt792x_core.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt792x_core.c</a></td><td class='right'>986</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt792x_debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt792x_debugfs.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt792x_dma.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt792x_dma.c</a></td><td class='right'>372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt792x_mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt792x_mac.c</a></td><td class='right'>384</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt792x_regs.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt792x_regs.h</a></td><td class='right'>487</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt792x_trace.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt792x_trace.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt792x_trace.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt792x_trace.h</a> (renamed from drivers/net/wireless/mediatek/mt76/mt7921/mt7921_trace.h)</td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt792x_usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt792x_usb.c</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7996/Kconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7996/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/coredump.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7996/coredump.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/coredump.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7996/coredump.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7996/debugfs.c</a></td><td class='right'>1056</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/dma.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7996/dma.c</a></td><td class='right'>1005</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c</a></td><td class='right'>405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/eeprom.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7996/eeprom.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/init.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7996/init.c</a></td><td class='right'>1745</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7996/mac.c</a></td><td class='right'>3321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/mac.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7996/mac.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7996/main.c</a></td><td class='right'>2340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7996/mcu.c</a></td><td class='right'>4889</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7996/mcu.h</a></td><td class='right'>974</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7996/mmio.c</a></td><td class='right'>892</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h</a></td><td class='right'>902</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/npu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7996/npu.c</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7996/pci.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/regs.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7996/regs.h</a></td><td class='right'>791</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/npu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/npu.c</a></td><td class='right'>501</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/pci.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/scan.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/scan.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/sdio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/sdio.c</a></td><td class='right'>401</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/sdio.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/sdio.h</a> (renamed from drivers/net/wireless/mediatek/mt76/mt7615/sdio.h)</td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/sdio_txrx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/sdio_txrx.c</a> (renamed from drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c)</td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/testmode.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/testmode.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/testmode.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/testmode.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/trace.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/trace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/trace.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/trace.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/tx.c</a></td><td class='right'>478</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/usb.c</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/usb_trace.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/usb_trace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/usb_trace.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/usb_trace.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/util.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/util.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/util.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/util.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/wed.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/wed.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt7601u/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt7601u/debugfs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/dma.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt7601u/dma.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/dma.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt7601u/dma.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/eeprom.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt7601u/eeprom.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt7601u/mac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt7601u/main.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/mt7601u.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt7601u/mt7601u.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt7601u/phy.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/trace.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt7601u/trace.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt7601u/tx.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt7601u/usb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/cfg80211.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/microchip/wilc1000/cfg80211.c</a></td><td class='right'>502</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/cfg80211.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/microchip/wilc1000/cfg80211.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/fw.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/microchip/wilc1000/fw.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/hif.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/microchip/wilc1000/hif.c</a></td><td class='right'>481</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/hif.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/microchip/wilc1000/hif.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/mon.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/microchip/wilc1000/mon.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/netdev.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/microchip/wilc1000/netdev.c</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/netdev.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/microchip/wilc1000/netdev.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/sdio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/microchip/wilc1000/sdio.c</a></td><td class='right'>370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/spi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/microchip/wilc1000/spi.c</a></td><td class='right'>467</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/wlan.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/microchip/wilc1000/wlan.c</a></td><td class='right'>677</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/wlan.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/microchip/wilc1000/wlan.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/wlan_cfg.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/microchip/wilc1000/wlan_cfg.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/wlan_cfg.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/microchip/wilc1000/wlan_cfg.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/wlan_if.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/microchip/wilc1000/wlan_if.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/purelifi/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/purelifi/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/plfxlc/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/purelifi/plfxlc/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/plfxlc/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/purelifi/plfxlc/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/plfxlc/chip.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/purelifi/plfxlc/chip.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/plfxlc/chip.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/purelifi/plfxlc/chip.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/plfxlc/firmware.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/purelifi/plfxlc/firmware.c</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/plfxlc/intf.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/purelifi/plfxlc/intf.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/plfxlc/mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/purelifi/plfxlc/mac.c</a></td><td class='right'>759</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/plfxlc/mac.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/purelifi/plfxlc/mac.h</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/plfxlc/usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/purelifi/plfxlc/usb.c</a></td><td class='right'>896</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/plfxlc/usb.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/purelifi/plfxlc/usb.h</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/bus.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/quantenna/qtnfmac/bus.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/quantenna/qtnfmac/cfg80211.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/commands.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/quantenna/qtnfmac/commands.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/core.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/quantenna/qtnfmac/core.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/core.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/quantenna/qtnfmac/core.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/event.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/quantenna/qtnfmac/event.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/qlink.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/quantenna/qtnfmac/qlink.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2400pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2400pci.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2400pci.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2400pci.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2500pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2500pci.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2500pci.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2500pci.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2500usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2500usb.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2500usb.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2500usb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2800.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800lib.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2800lib.c</a></td><td class='right'>2190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800lib.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2800lib.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2800mmio.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2800pci.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800soc.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2800soc.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2800usb.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2x00.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00config.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2x00config.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00crypto.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2x00crypto.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2x00dev.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00link.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2x00link.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2x00mac.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2x00queue.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2x00soc.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00soc.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2x00soc.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt2x00usb.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt61pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt61pci.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt61pci.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt61pci.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt73usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt73usb.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt73usb.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ralink/rt2x00/rt73usb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ray_cs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ray_cs.c</a></td><td class='right'>2817</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ray_cs.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ray_cs.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rayctl.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/rayctl.h</a></td><td class='right'>734</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8187/leds.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtl818x/rtl8187/leds.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/8188e.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtl8xxxu/8188e.c</a></td><td class='right'>1885</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/8188f.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtl8xxxu/8188f.c</a></td><td class='right'>1765</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/8192c.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtl8xxxu/8192c.c</a> (renamed from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c)</td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/8192e.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtl8xxxu/8192e.c</a> (renamed from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c)</td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/8192f.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtl8xxxu/8192f.c</a></td><td class='right'>2091</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/8710b.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtl8xxxu/8710b.c</a></td><td class='right'>1875</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/8723a.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtl8xxxu/8723a.c</a> (renamed from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c)</td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/8723b.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtl8xxxu/8723b.c</a> (renamed from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c)</td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtl8xxxu/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtl8xxxu/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/core.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtl8xxxu/core.c</a> (renamed from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c)</td><td class='right'>3056</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/regs.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtl8xxxu/regs.h</a> (renamed from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h)</td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h</a></td><td class='right'>699</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/base.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/base.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/base.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/base.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/cam.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/cam.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/cam.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/cam.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/core.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/core.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/core.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/core.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/debug.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/debug.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/efuse.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/efuse.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/efuse.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/efuse.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/pci.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/pci.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/pci.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/ps.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/ps.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rc.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rc.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/regd.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/regd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/def.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/def.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/def.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/def.h</a> (renamed from drivers/net/wireless/realtek/rtlwifi/rtl8192de/def.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/dm_common.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/dm_common.c</a></td><td class='right'>1061</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/dm_common.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/dm_common.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/fw_common.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/fw_common.c</a></td><td class='right'>370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/fw_common.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/fw_common.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.c</a></td><td class='right'>1225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/main.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/phy_common.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/phy_common.c</a></td><td class='right'>856</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/phy_common.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/phy_common.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/reg.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/reg.h</a> (renamed from drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h)</td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/rf_common.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/rf_common.c</a></td><td class='right'>359</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/rf_common.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/rf_common.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/trx_common.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/trx_common.c</a></td><td class='right'>516</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/trx_common.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/trx_common.h</a></td><td class='right'>405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c</a></td><td class='right'>1086</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.c</a></td><td class='right'>377</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c</a></td><td class='right'>1190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c</a></td><td class='right'>969</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.c</a></td><td class='right'>377</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c</a></td><td class='right'>532</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h</a></td><td class='right'>434</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/dm.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/dm.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/dm.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/dm.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/fw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/fw.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/fw.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/fw.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/hw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/hw.c</a></td><td class='right'>1212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/hw.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/hw.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/led.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/led.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/led.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/led.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/phy.c</a></td><td class='right'>3118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/phy.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/phy.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/rf.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/rf.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/rf.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/rf.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/sw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/sw.c</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/table.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/table.c</a></td><td class='right'>1675</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/table.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/table.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/trx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/trx.c</a></td><td class='right'>372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/trx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/trx.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/led.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/led.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/led.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/led.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_bt_coexist.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_bt_coexist.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/led.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/led.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/led.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/led.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/led.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/led.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/led.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/led.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/usb.c</a></td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/usb.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/usb.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/wifi.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtlwifi/wifi.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/Kconfig</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/Makefile</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/bf.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/bf.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/bf.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/bf.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/coex.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/coex.c</a></td><td class='right'>531</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/coex.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/coex.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/debug.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/debug.c</a></td><td class='right'>602</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/debug.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/debug.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/efuse.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/efuse.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/fw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/fw.c</a></td><td class='right'>973</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/fw.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/fw.h</a></td><td class='right'>301</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/hci.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/hci.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/led.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/led.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/led.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/led.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/mac.c</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/mac.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/mac.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/mac80211.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/mac80211.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/main.c</a></td><td class='right'>1092</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/main.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/main.h</a></td><td class='right'>498</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/pci.c</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/pci.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/pci.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/phy.c</a></td><td class='right'>616</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/phy.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/phy.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/ps.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/ps.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/ps.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/ps.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/reg.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/reg.h</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/regd.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/regd.c</a></td><td class='right'>765</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/regd.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/regd.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8703b.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8703b.c</a></td><td class='right'>2003</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8703b.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8703b.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8703b_tables.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8703b_tables.c</a></td><td class='right'>902</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8703b_tables.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8703b_tables.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8723cs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8723cs.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8723d.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8723d.c</a></td><td class='right'>721</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8723d.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8723d.h</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8723de.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8723de.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8723de.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8723de.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8723ds.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8723ds.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8723du.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8723du.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8723x.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8723x.c</a></td><td class='right'>788</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8723x.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8723x.h</a></td><td class='right'>524</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8812a.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8812a.c</a></td><td class='right'>1125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8812a.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8812a.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8812a_table.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8812a_table.c</a></td><td class='right'>2812</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8812a_table.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8812a_table.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8812au.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8812au.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8814a.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8814a.c</a></td><td class='right'>2270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8814a.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8814a.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8814a_table.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8814a_table.c</a></td><td class='right'>23930</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 41.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 58.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8814a_table.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8814a_table.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8814ae.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8814ae.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8814au.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8814au.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821a.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8821a.c</a></td><td class='right'>1226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821a.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8821a.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821a_table.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8821a_table.c</a></td><td class='right'>2350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821a_table.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8821a_table.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821au.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8821au.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821c.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8821c.c</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821c.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8821c.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821c_table.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8821c_table.c</a></td><td class='right'>1156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821ce.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8821ce.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821ce.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8821ce.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821cs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8821cs.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821cu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8821cu.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822b.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8822b.c</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822b.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8822b.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822be.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8822be.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822be.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8822be.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822bs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8822bs.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822bu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8822bu.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822c.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8822c.c</a></td><td class='right'>381</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822c.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8822c.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822c_table.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8822c_table.c</a></td><td class='right'>2247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822ce.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8822ce.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822ce.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8822ce.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822cs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8822cs.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822cu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw8822cu.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw88xxa.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw88xxa.c</a></td><td class='right'>1989</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw88xxa.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rtw88xxa.h</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rx.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/rx.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/sar.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/sar.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/sar.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/sar.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/sdio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/sdio.c</a></td><td class='right'>1437</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/sdio.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/sdio.h</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/tx.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/tx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/tx.h</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/usb.c</a></td><td class='right'>1381</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/usb.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/usb.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/util.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/util.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/util.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/util.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/wow.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw88/wow.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/Kconfig</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/Makefile</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/acpi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/acpi.c</a></td><td class='right'>1281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/acpi.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/acpi.h</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/cam.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/cam.c</a></td><td class='right'>1142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/cam.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/cam.h</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/chan.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/chan.c</a></td><td class='right'>3448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/chan.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/chan.h</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/coex.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/coex.c</a></td><td class='right'>11906</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/coex.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/coex.h</a></td><td class='right'>387</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/core.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/core.c</a></td><td class='right'>6648</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/core.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/core.h</a></td><td class='right'>7686</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/debug.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/debug.c</a></td><td class='right'>4869</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/debug.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/debug.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/efuse.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/efuse.c</a></td><td class='right'>506</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/efuse.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/efuse.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/efuse_be.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/efuse_be.c</a></td><td class='right'>514</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/fw.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/fw.c</a></td><td class='right'>10212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/fw.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/fw.h</a></td><td class='right'>5333</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/mac.c</a></td><td class='right'>7240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/mac.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/mac.h</a></td><td class='right'>1722</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/mac80211.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/mac80211.c</a></td><td class='right'>2006</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/mac_be.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/mac_be.c</a></td><td class='right'>2657</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/pci.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/pci.c</a></td><td class='right'>4842</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/pci.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/pci.h</a></td><td class='right'>1930</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/pci_be.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/pci_be.c</a></td><td class='right'>708</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/phy.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/phy.c</a></td><td class='right'>8089</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/phy.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/phy.h</a></td><td class='right'>1064</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/phy_be.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/phy_be.c</a></td><td class='right'>1021</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/ps.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/ps.c</a></td><td class='right'>591</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/ps.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/ps.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/reg.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/reg.h</a></td><td class='right'>9522</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/regd.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/regd.c</a></td><td class='right'>1185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8851b.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8851b.c</a></td><td class='right'>2721</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8851b.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8851b.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.c</a></td><td class='right'>3784</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8851b_rfk_table.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8851b_rfk_table.c</a></td><td class='right'>499</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8851b_rfk_table.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8851b_rfk_table.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8851b_table.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8851b_table.c</a></td><td class='right'>14916</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 26.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 73.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8851b_table.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8851b_table.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8851be.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8851be.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8851bu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8851bu.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852a.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852a.c</a></td><td class='right'>2406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852a.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852a.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c</a></td><td class='right'>3866</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852a_rfk_table.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852a_rfk_table.c</a></td><td class='right'>1607</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852a_rfk_table.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852a_rfk_table.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852a_table.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852a_table.c</a></td><td class='right'>51062</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 89.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 10.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852a_table.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852a_table.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852ae.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852ae.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852au.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852au.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852b.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852b.c</a></td><td class='right'>1033</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852b.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852b.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852b_common.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852b_common.c</a></td><td class='right'>2106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852b_common.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852b_common.h</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c</a></td><td class='right'>4212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852b_rfk_table.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852b_rfk_table.c</a></td><td class='right'>794</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852b_rfk_table.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852b_rfk_table.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852b_table.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852b_table.c</a></td><td class='right'>22927</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 40.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 59.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852b_table.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852b_table.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852be.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852be.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852bt.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852bt.c</a></td><td class='right'>890</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852bt.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852bt.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.c</a></td><td class='right'>4279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk_table.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk_table.c</a></td><td class='right'>490</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk_table.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk_table.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852bte.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852bte.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852bu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852bu.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852c.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852c.c</a></td><td class='right'>3251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852c.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852c.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c</a></td><td class='right'>4491</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852c_rfk_table.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852c_rfk_table.c</a></td><td class='right'>781</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852c_rfk_table.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852c_rfk_table.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852c_table.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852c_table.c</a></td><td class='right'>57159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 100.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852c_table.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852c_table.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852ce.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852ce.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852cu.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8852cu.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8922a.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8922a.c</a></td><td class='right'>3009</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8922a.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8922a.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8922ae.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/rtw8922ae.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/sar.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/sar.c</a></td><td class='right'>907</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/sar.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/sar.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/ser.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/ser.c</a></td><td class='right'>846</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/ser.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/ser.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/txrx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/txrx.h</a></td><td class='right'>760</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/usb.c</a></td><td class='right'>1071</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/usb.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/usb.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/util.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/util.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/util.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/util.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/wow.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/wow.c</a></td><td class='right'>1820</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/wow.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/realtek/rtw89/wow.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rndis_wlan.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/rndis_wlan.c</a></td><td class='right'>3766</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.6%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_coex.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/rsi/rsi_91x_coex.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_core.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/rsi/rsi_91x_core.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/rsi/rsi_91x_debugfs.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_hal.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/rsi/rsi_91x_hal.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_mac80211.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/rsi/rsi_91x_mac80211.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/rsi/rsi_91x_main.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_mgmt.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/rsi/rsi_91x_mgmt.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_sdio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/rsi/rsi_91x_sdio.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/rsi/rsi_91x_sdio_ops.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/rsi/rsi_91x_usb.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_usb_ops.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/rsi/rsi_91x_usb_ops.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_debugfs.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/rsi/rsi_debugfs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_hal.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/rsi/rsi_hal.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_main.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/rsi/rsi_main.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_usb.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/rsi/rsi_usb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/Makefile</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/bh.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/bh.c</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/bh.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/bh.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/bus.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/bus.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/bus_sdio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/bus_sdio.c</a></td><td class='right'>326</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/bus_spi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/bus_spi.c</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/data_rx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/data_rx.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/data_rx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/data_rx.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/data_tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/data_tx.c</a></td><td class='right'>594</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/data_tx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/data_tx.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/debug.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/debug.c</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/debug.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/debug.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/fwio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/fwio.c</a></td><td class='right'>388</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/fwio.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/fwio.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/hif_api_cmd.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/hif_api_cmd.h</a></td><td class='right'>553</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/hif_api_general.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/hif_api_general.h</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/hif_api_mib.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/hif_api_mib.h</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/hif_rx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/hif_rx.c</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/hif_rx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/hif_rx.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/hif_tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/hif_tx.c</a></td><td class='right'>537</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/hif_tx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/hif_tx.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/hif_tx_mib.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/hif_tx_mib.c</a></td><td class='right'>307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/hif_tx_mib.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/hif_tx_mib.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/hwio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/hwio.c</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/hwio.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/hwio.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/key.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/key.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/key.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/key.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/main.c</a></td><td class='right'>525</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/main.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/main.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/queue.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/queue.c</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/queue.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/queue.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/scan.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/scan.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/scan.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/scan.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/sta.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/sta.c</a></td><td class='right'>841</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/sta.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/sta.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/traces.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/traces.h</a></td><td class='right'>496</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/wfx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/silabs/wfx/wfx.h</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/bh.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/st/cw1200/bh.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/cw1200_sdio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/st/cw1200/cw1200_sdio.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/cw1200_spi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/st/cw1200/cw1200_spi.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/st/cw1200/main.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/pm.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/st/cw1200/pm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/queue.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/st/cw1200/queue.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/queue.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/st/cw1200/queue.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/scan.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/st/cw1200/scan.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/sta.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/st/cw1200/sta.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/sta.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/st/cw1200/sta.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/txrx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/st/cw1200/txrx.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/wsm.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/st/cw1200/wsm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wilink_platform_data.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wilink_platform_data.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/acx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wl1251/acx.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/acx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wl1251/acx.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/cmd.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wl1251/cmd.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/cmd.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wl1251/cmd.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/event.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wl1251/event.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/init.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wl1251/init.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/io.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wl1251/io.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wl1251/main.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/reg.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wl1251/reg.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/sdio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wl1251/sdio.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/spi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wl1251/spi.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wl1251/tx.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/wl1251.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wl1251/wl1251.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/wl12xx_80211.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wl1251/wl12xx_80211.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl12xx/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wl12xx/main.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl12xx/reg.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wl12xx/reg.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wl18xx/debugfs.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/event.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wl18xx/event.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wl18xx/main.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wl18xx/tx.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/wl18xx.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wl18xx/wl18xx.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/boot.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wlcore/boot.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/cmd.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wlcore/cmd.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/cmd.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wlcore/cmd.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/debugfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wlcore/debugfs.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/event.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wlcore/event.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/main.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wlcore/main.c</a></td><td class='right'>513</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/scan.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wlcore/scan.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/sdio.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wlcore/sdio.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/spi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wlcore/spi.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/sysfs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wlcore/sysfs.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/testmode.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wlcore/testmode.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/tx.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wlcore/tx.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/vendor_cmd.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wlcore/vendor_cmd.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/wl12xx_80211.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wlcore/wl12xx_80211.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/wlcore.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wlcore/wlcore.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/wlcore_i.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ti/wlcore/wlcore_i.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/virtual/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/virtual/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/virtual/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/virtual/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/virtual/mac80211_hwsim.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/virtual/mac80211_hwsim.c</a> (renamed from drivers/net/wireless/mac80211_hwsim.c)</td><td class='right'>3179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/virtual/mac80211_hwsim.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/virtual/mac80211_hwsim.h</a> (renamed from drivers/net/wireless/mac80211_hwsim.h)</td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/virtual/virt_wifi.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/virtual/virt_wifi.c</a> (renamed from drivers/net/wireless/virt_wifi.c)</td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/wl3501.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/wl3501.h</a></td><td class='right'>615</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/wl3501_cs.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/wl3501_cs.c</a></td><td class='right'>2031</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/zydas/Kconfig?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/zydas/Kconfig</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/zydas/Makefile?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/zydas/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/zydas/zd1201.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/zydas/zd1201.c</a></td><td class='right'>1905</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/zydas/zd1201.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/zydas/zd1201.h</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/zydas/zd1211rw/zd_def.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/zydas/zd1211rw/zd_def.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/zydas/zd1211rw/zd_mac.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/zydas/zd1211rw/zd_mac.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/zydas/zd1211rw/zd_mac.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/zydas/zd1211rw/zd_mac.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/zydas/zd1211rw/zd_rf.h?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/zydas/zd1211rw/zd_rf.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/zydas/zd1211rw/zd_usb.c?id2=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/zydas/zd1211rw/zd_usb.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>1753 files changed, 670879 insertions, 133884 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig<br/>index 7add2002ff4c..c6599594dc99 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/Kconfig</a></div><div class='hunk'>@@ -22,93 +22,21 @@ source "drivers/net/wireless/admtek/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/ath/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/atmel/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/broadcom/Kconfig"</div><div class='del'>-source "drivers/net/wireless/cisco/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/intel/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/intersil/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/marvell/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/mediatek/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/microchip/Kconfig"</div><div class='add'>+source "drivers/net/wireless/purelifi/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/ralink/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/realtek/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/rsi/Kconfig"</div><div class='add'>+source "drivers/net/wireless/silabs/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/st/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/ti/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/zydas/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/quantenna/Kconfig"</div><div class='ctx'> </div><div class='del'>-config PCMCIA_RAYCS</div><div class='del'>-	tristate "Aviator/Raytheon 2.4GHz wireless support"</div><div class='del'>-	depends on PCMCIA</div><div class='del'>-	select WIRELESS_EXT</div><div class='del'>-	select WEXT_SPY</div><div class='del'>-	select WEXT_PRIV</div><div class='del'>-	help</div><div class='del'>-	  Say Y here if you intend to attach an Aviator/Raytheon PCMCIA</div><div class='del'>-	  (PC-card) wireless Ethernet networking card to your computer.</div><div class='del'>-	  Please read the file</div><div class='del'>-	  &lt;file:Documentation/networking/device_drivers/wifi/ray_cs.rst&gt; for</div><div class='del'>-	  details.</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here: the module will be</div><div class='del'>-	  called ray_cs.  If unsure, say N.</div><div class='del'>-</div><div class='del'>-config PCMCIA_WL3501</div><div class='del'>-	tristate "Planet WL3501 PCMCIA cards"</div><div class='del'>-	depends on CFG80211 &amp;&amp; PCMCIA</div><div class='del'>-	select WIRELESS_EXT</div><div class='del'>-	select WEXT_SPY</div><div class='del'>-	help</div><div class='del'>-	  A driver for WL3501 PCMCIA 802.11 wireless cards made by Planet.</div><div class='del'>-	  It has basic support for Linux wireless extensions and initial</div><div class='del'>-	  micro support for ethtool.</div><div class='del'>-</div><div class='del'>-config MAC80211_HWSIM</div><div class='del'>-	tristate "Simulated radio testing tool for mac80211"</div><div class='del'>-	depends on MAC80211</div><div class='del'>-	help</div><div class='del'>-	  This driver is a developer testing tool that can be used to test</div><div class='del'>-	  IEEE 802.11 networking stack (mac80211) functionality. This is not</div><div class='del'>-	  needed for normal wireless LAN usage and is only for testing. See</div><div class='del'>-	  Documentation/networking/mac80211_hwsim for more information on how</div><div class='del'>-	  to use this tool.</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here: the module will be</div><div class='del'>-	  called mac80211_hwsim.  If unsure, say N.</div><div class='del'>-</div><div class='del'>-config USB_NET_RNDIS_WLAN</div><div class='del'>-	tristate "Wireless RNDIS USB support"</div><div class='del'>-	depends on USB</div><div class='del'>-	depends on CFG80211</div><div class='del'>-	select USB_NET_DRIVERS</div><div class='del'>-	select USB_USBNET</div><div class='del'>-	select USB_NET_CDCETHER</div><div class='del'>-	select USB_NET_RNDIS_HOST</div><div class='del'>-	help</div><div class='del'>-	  This is a driver for wireless RNDIS devices.</div><div class='del'>-	  These are USB based adapters found in devices such as:</div><div class='del'>-</div><div class='del'>-	  Buffalo WLI-U2-KG125S</div><div class='del'>-	  U.S. Robotics USR5421</div><div class='del'>-	  Belkin F5D7051</div><div class='del'>-	  Linksys WUSB54GSv2</div><div class='del'>-	  Linksys WUSB54GSC</div><div class='del'>-	  Asus WL169gE</div><div class='del'>-	  Eminent EM4045</div><div class='del'>-	  BT Voyager 1055</div><div class='del'>-	  Linksys WUSB54GSv1</div><div class='del'>-	  U.S. Robotics USR5420</div><div class='del'>-	  BUFFALO WLI-USB-G54</div><div class='del'>-</div><div class='del'>-	  All of these devices are based on Broadcom 4320 chip which is the</div><div class='del'>-	  only wireless RNDIS chip known to date.</div><div class='del'>-</div><div class='del'>-	  If you choose to build a module, it'll be called rndis_wlan.</div><div class='del'>-</div><div class='del'>-config VIRT_WIFI</div><div class='del'>-	tristate "Wifi wrapper for ethernet drivers"</div><div class='del'>-	depends on CFG80211</div><div class='del'>-	help</div><div class='del'>-	  This option adds support for ethernet connections to appear as if they</div><div class='del'>-	  are wifi connections through a special rtnetlink device.</div><div class='add'>+source "drivers/net/wireless/virtual/Kconfig"</div><div class='ctx'> </div><div class='ctx'> endif # WLAN</div><div class='head'>diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile<br/>index 80b324499786..e1c4141c6004 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/Makefile</a></div><div class='hunk'>@@ -7,26 +7,19 @@ obj-$(CONFIG_WLAN_VENDOR_ADMTEK) += admtek/</div><div class='ctx'> obj-$(CONFIG_WLAN_VENDOR_ATH) += ath/</div><div class='ctx'> obj-$(CONFIG_WLAN_VENDOR_ATMEL) += atmel/</div><div class='ctx'> obj-$(CONFIG_WLAN_VENDOR_BROADCOM) += broadcom/</div><div class='del'>-obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/</div><div class='ctx'> obj-$(CONFIG_WLAN_VENDOR_INTEL) += intel/</div><div class='ctx'> obj-$(CONFIG_WLAN_VENDOR_INTERSIL) += intersil/</div><div class='ctx'> obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/</div><div class='ctx'> obj-$(CONFIG_WLAN_VENDOR_MEDIATEK) += mediatek/</div><div class='ctx'> obj-$(CONFIG_WLAN_VENDOR_MICROCHIP) += microchip/</div><div class='add'>+obj-$(CONFIG_WLAN_VENDOR_PURELIFI) += purelifi/</div><div class='add'>+obj-$(CONFIG_WLAN_VENDOR_QUANTENNA) += quantenna/</div><div class='ctx'> obj-$(CONFIG_WLAN_VENDOR_RALINK) += ralink/</div><div class='ctx'> obj-$(CONFIG_WLAN_VENDOR_REALTEK) += realtek/</div><div class='ctx'> obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/</div><div class='add'>+obj-$(CONFIG_WLAN_VENDOR_SILABS) += silabs/</div><div class='ctx'> obj-$(CONFIG_WLAN_VENDOR_ST) += st/</div><div class='ctx'> obj-$(CONFIG_WLAN_VENDOR_TI) += ti/</div><div class='ctx'> obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/</div><div class='del'>-obj-$(CONFIG_WLAN_VENDOR_QUANTENNA) += quantenna/</div><div class='del'>-</div><div class='del'>-# 16-bit wireless PCMCIA client drivers</div><div class='del'>-obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o</div><div class='del'>-obj-$(CONFIG_PCMCIA_WL3501)	+= wl3501_cs.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_USB_NET_RNDIS_WLAN)	+= rndis_wlan.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_VIRT_WIFI)	+= virt_wifi.o</div><div class='add'>+obj-$(CONFIG_WLAN) += virtual/</div><div class='head'>diff --git a/drivers/net/wireless/admtek/adm8211.c b/drivers/net/wireless/admtek/adm8211.c<br/>index 2db9c948c0fc..e94a6b180314 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/admtek/adm8211.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/admtek/adm8211.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/admtek/adm8211.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/admtek/adm8211.c</a></div><div class='hunk'>@@ -1293,7 +1293,7 @@ static void adm8211_set_bssid(struct ieee80211_hw *dev, const u8 *bssid)</div><div class='ctx'> 	ADM8211_CSR_WRITE(ABDA1, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int adm8211_config(struct ieee80211_hw *dev, u32 changed)</div><div class='add'>+static int adm8211_config(struct ieee80211_hw *dev, int radio_idx, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm8211_priv *priv = dev-&gt;priv;</div><div class='ctx'> 	struct ieee80211_conf *conf = &amp;dev-&gt;conf;</div><div class='hunk'>@@ -1311,7 +1311,7 @@ static int adm8211_config(struct ieee80211_hw *dev, u32 changed)</div><div class='ctx'> static void adm8211_bss_info_changed(struct ieee80211_hw *dev,</div><div class='ctx'> 				     struct ieee80211_vif *vif,</div><div class='ctx'> 				     struct ieee80211_bss_conf *conf,</div><div class='del'>-				     u32 changes)</div><div class='add'>+				     u64 changes)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm8211_priv *priv = dev-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -1550,7 +1550,7 @@ fail:</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void adm8211_stop(struct ieee80211_hw *dev)</div><div class='add'>+static void adm8211_stop(struct ieee80211_hw *dev, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm8211_priv *priv = dev-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -1759,7 +1759,12 @@ static int adm8211_alloc_rings(struct ieee80211_hw *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ieee80211_ops adm8211_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.tx			= adm8211_tx,</div><div class='add'>+	.wake_tx_queue		= ieee80211_handle_wake_tx_queue,</div><div class='ctx'> 	.start			= adm8211_start,</div><div class='ctx'> 	.stop			= adm8211_stop,</div><div class='ctx'> 	.add_interface		= adm8211_add_interface,</div><div class='head'>diff --git a/drivers/net/wireless/ath/Kconfig b/drivers/net/wireless/ath/Kconfig<br/>index d88edbf1bea3..910c10028b14 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/Kconfig</a></div><div class='hunk'>@@ -63,5 +63,6 @@ source "drivers/net/wireless/ath/wil6210/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/ath/ath10k/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/ath/wcn36xx/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/ath/ath11k/Kconfig"</div><div class='add'>+source "drivers/net/wireless/ath/ath12k/Kconfig"</div><div class='ctx'> </div><div class='ctx'> endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/Makefile b/drivers/net/wireless/ath/Makefile<br/>index 8e4ae9de5ae4..8d6e6e218d24 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/Makefile</a></div><div class='hunk'>@@ -8,6 +8,7 @@ obj-$(CONFIG_WIL6210)		+= wil6210/</div><div class='ctx'> obj-$(CONFIG_ATH10K)		+= ath10k/</div><div class='ctx'> obj-$(CONFIG_WCN36XX)		+= wcn36xx/</div><div class='ctx'> obj-$(CONFIG_ATH11K)		+= ath11k/</div><div class='add'>+obj-$(CONFIG_ATH12K)		+= ath12k/</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_ATH_COMMON)	+= ath.o</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ar5523/ar5523.c b/drivers/net/wireless/ath/ar5523/ar5523.c<br/>index 49cc4b7ed516..1230e6278f23 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ar5523/ar5523.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ar5523/ar5523.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ar5523/ar5523.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ar5523/ar5523.c</a></div><div class='hunk'>@@ -104,7 +104,7 @@ static void ar5523_cmd_rx_cb(struct urb *urb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;actual_length &lt; sizeof(struct ar5523_cmd_hdr)) {</div><div class='del'>-		ar5523_err(ar, "RX USB to short.\n");</div><div class='add'>+		ar5523_err(ar, "RX USB too short.\n");</div><div class='ctx'> 		goto skip;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -153,6 +153,10 @@ static void ar5523_cmd_rx_cb(struct urb *urb)</div><div class='ctx'> 			ar5523_err(ar, "Invalid reply to WDCMSG_TARGET_START");</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='add'>+		if (!cmd-&gt;odata) {</div><div class='add'>+			ar5523_err(ar, "Unexpected WDCMSG_TARGET_START reply");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> 		memcpy(cmd-&gt;odata, hdr + 1, sizeof(u32));</div><div class='ctx'> 		cmd-&gt;olen = sizeof(u32);</div><div class='ctx'> 		cmd-&gt;res = 0;</div><div class='hunk'>@@ -237,6 +241,11 @@ static void ar5523_cmd_tx_cb(struct urb *urb)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ar5523_cancel_tx_cmd(struct ar5523 *ar)</div><div class='add'>+{</div><div class='add'>+	usb_kill_urb(ar-&gt;tx_cmd.urb_tx);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ar5523_cmd(struct ar5523 *ar, u32 code, const void *idata,</div><div class='ctx'> 		      int ilen, void *odata, int olen, int flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -247,7 +256,7 @@ static int ar5523_cmd(struct ar5523 *ar, u32 code, const void *idata,</div><div class='ctx'> 	/* always bulk-out a multiple of 4 bytes */</div><div class='ctx'> 	xferlen = (sizeof(struct ar5523_cmd_hdr) + ilen + 3) &amp; ~3;</div><div class='ctx'> </div><div class='del'>-	hdr = (struct ar5523_cmd_hdr *)cmd-&gt;buf_tx;</div><div class='add'>+	hdr = cmd-&gt;buf_tx;</div><div class='ctx'> 	memset(hdr, 0, sizeof(struct ar5523_cmd_hdr));</div><div class='ctx'> 	hdr-&gt;len  = cpu_to_be32(xferlen);</div><div class='ctx'> 	hdr-&gt;code = cpu_to_be32(code);</div><div class='hunk'>@@ -276,6 +285,7 @@ static int ar5523_cmd(struct ar5523 *ar, u32 code, const void *idata,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!wait_for_completion_timeout(&amp;cmd-&gt;done, 2 * HZ)) {</div><div class='add'>+		ar5523_cancel_tx_cmd(ar);</div><div class='ctx'> 		cmd-&gt;odata = NULL;</div><div class='ctx'> 		ar5523_err(ar, "timeout waiting for command %02x reply\n",</div><div class='ctx'> 			   code);</div><div class='hunk'>@@ -723,7 +733,7 @@ static void ar5523_data_tx_pkt_put(struct ar5523 *ar)</div><div class='ctx'> {</div><div class='ctx'> 	atomic_dec(&amp;ar-&gt;tx_nr_total);</div><div class='ctx'> 	if (!atomic_dec_return(&amp;ar-&gt;tx_nr_pending)) {</div><div class='del'>-		del_timer(&amp;ar-&gt;tx_wd_timer);</div><div class='add'>+		timer_delete(&amp;ar-&gt;tx_wd_timer);</div><div class='ctx'> 		wake_up(&amp;ar-&gt;tx_flush_waitq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -892,7 +902,7 @@ static void ar5523_tx_work(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> static void ar5523_tx_wd_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ar5523 *ar = from_timer(ar, t, tx_wd_timer);</div><div class='add'>+	struct ar5523 *ar = timer_container_of(ar, t, tx_wd_timer);</div><div class='ctx'> </div><div class='ctx'> 	ar5523_dbg(ar, "TX watchdog timer triggered\n");</div><div class='ctx'> 	ieee80211_queue_work(ar-&gt;hw, &amp;ar-&gt;tx_wd_work);</div><div class='hunk'>@@ -1051,7 +1061,7 @@ err:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ar5523_stop(struct ieee80211_hw *hw)</div><div class='add'>+static void ar5523_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct ar5523 *ar = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -1066,14 +1076,15 @@ static void ar5523_stop(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	ar5523_cmd_write(ar, WDCMSG_TARGET_STOP, NULL, 0, 0);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;ar-&gt;tx_wd_timer);</div><div class='add'>+	timer_delete_sync(&amp;ar-&gt;tx_wd_timer);</div><div class='ctx'> 	cancel_work_sync(&amp;ar-&gt;tx_wd_work);</div><div class='ctx'> 	cancel_work_sync(&amp;ar-&gt;rx_refill_work);</div><div class='ctx'> 	ar5523_cancel_rx_bufs(ar);</div><div class='ctx'> 	mutex_unlock(&amp;ar-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ar5523_set_rts_threshold(struct ieee80211_hw *hw, u32 value)</div><div class='add'>+static int ar5523_set_rts_threshold(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+				    u32 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct ar5523 *ar = hw-&gt;priv;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1127,7 +1138,7 @@ static void ar5523_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	ar-&gt;vif = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ar5523_hwconfig(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+static int ar5523_hwconfig(struct ieee80211_hw *hw, int radio_idx, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct ar5523 *ar = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -1156,7 +1167,7 @@ static int ar5523_get_wlan_mode(struct ar5523 *ar,</div><div class='ctx'> 		ar5523_info(ar, "STA not found!\n");</div><div class='ctx'> 		return WLAN_MODE_11b;</div><div class='ctx'> 	}</div><div class='del'>-	sta_rate_set = sta-&gt;supp_rates[ar-&gt;hw-&gt;conf.chandef.chan-&gt;band];</div><div class='add'>+	sta_rate_set = sta-&gt;deflink.supp_rates[ar-&gt;hw-&gt;conf.chandef.chan-&gt;band];</div><div class='ctx'> </div><div class='ctx'> 	for (bit = 0; bit &lt; band-&gt;n_bitrates; bit++) {</div><div class='ctx'> 		if (sta_rate_set &amp; 1) {</div><div class='hunk'>@@ -1194,7 +1205,7 @@ static void ar5523_create_rateset(struct ar5523 *ar,</div><div class='ctx'> 		ar5523_info(ar, "STA not found. Cannot set rates\n");</div><div class='ctx'> 		sta_rate_set = bss_conf-&gt;basic_rates;</div><div class='ctx'> 	} else</div><div class='del'>-		sta_rate_set = sta-&gt;supp_rates[ar-&gt;hw-&gt;conf.chandef.chan-&gt;band];</div><div class='add'>+		sta_rate_set = sta-&gt;deflink.supp_rates[ar-&gt;hw-&gt;conf.chandef.chan-&gt;band];</div><div class='ctx'> </div><div class='ctx'> 	ar5523_dbg(ar, "sta rate_set = %08x\n", sta_rate_set);</div><div class='ctx'> </div><div class='hunk'>@@ -1252,14 +1263,14 @@ static int ar5523_create_connection(struct ar5523 *ar,</div><div class='ctx'> 				sizeof(create), 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ar5523_write_associd(struct ar5523 *ar,</div><div class='del'>-				struct ieee80211_bss_conf *bss)</div><div class='add'>+static int ar5523_write_associd(struct ar5523 *ar, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_bss_conf *bss = &amp;vif-&gt;bss_conf;</div><div class='ctx'> 	struct ar5523_cmd_set_associd associd;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;associd, 0, sizeof(associd));</div><div class='ctx'> 	associd.defaultrateix = cpu_to_be32(0);	/* XXX */</div><div class='del'>-	associd.associd = cpu_to_be32(bss-&gt;aid);</div><div class='add'>+	associd.associd = cpu_to_be32(vif-&gt;cfg.aid);</div><div class='ctx'> 	associd.timoffset = cpu_to_be32(0x3b);	/* XXX */</div><div class='ctx'> 	memcpy(associd.bssid, bss-&gt;bssid, ETH_ALEN);</div><div class='ctx'> 	return ar5523_cmd_write(ar, WDCMSG_WRITE_ASSOCID, &amp;associd,</div><div class='hunk'>@@ -1269,7 +1280,7 @@ static int ar5523_write_associd(struct ar5523 *ar,</div><div class='ctx'> static void ar5523_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 				    struct ieee80211_vif *vif,</div><div class='ctx'> 				    struct ieee80211_bss_conf *bss,</div><div class='del'>-				    u32 changed)</div><div class='add'>+				    u64 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct ar5523 *ar = hw-&gt;priv;</div><div class='ctx'> 	int error;</div><div class='hunk'>@@ -1280,7 +1291,7 @@ static void ar5523_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (!(changed &amp; BSS_CHANGED_ASSOC))</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	if (bss-&gt;assoc) {</div><div class='add'>+	if (vif-&gt;cfg.assoc) {</div><div class='ctx'> 		error = ar5523_create_connection(ar, vif, bss);</div><div class='ctx'> 		if (error) {</div><div class='ctx'> 			ar5523_err(ar, "could not create connection\n");</div><div class='hunk'>@@ -1293,7 +1304,7 @@ static void ar5523_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		error = ar5523_write_associd(ar, bss);</div><div class='add'>+		error = ar5523_write_associd(ar, vif);</div><div class='ctx'> 		if (error) {</div><div class='ctx'> 			ar5523_err(ar, "could not set association\n");</div><div class='ctx'> 			goto out_unlock;</div><div class='hunk'>@@ -1348,9 +1359,14 @@ static void ar5523_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ieee80211_ops ar5523_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.start			= ar5523_start,</div><div class='ctx'> 	.stop			= ar5523_stop,</div><div class='ctx'> 	.tx			= ar5523_tx,</div><div class='add'>+	.wake_tx_queue		= ieee80211_handle_wake_tx_queue,</div><div class='ctx'> 	.set_rts_threshold	= ar5523_set_rts_threshold,</div><div class='ctx'> 	.add_interface		= ar5523_add_interface,</div><div class='ctx'> 	.remove_interface	= ar5523_remove_interface,</div><div class='hunk'>@@ -1496,7 +1512,7 @@ static int ar5523_load_firmware(struct usb_device *dev)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	txblock = kmalloc(sizeof(*txblock), GFP_KERNEL);</div><div class='add'>+	txblock = kzalloc(sizeof(*txblock), GFP_KERNEL);</div><div class='ctx'> 	if (!txblock)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1508,7 +1524,6 @@ static int ar5523_load_firmware(struct usb_device *dev)</div><div class='ctx'> 	if (!fwbuf)</div><div class='ctx'> 		goto out_free_rxblock;</div><div class='ctx'> </div><div class='del'>-	memset(txblock, 0, sizeof(struct ar5523_fwblock));</div><div class='ctx'> 	txblock-&gt;flags = cpu_to_be32(AR5523_WRITE_BLOCK);</div><div class='ctx'> 	txblock-&gt;total = cpu_to_be32(fw-&gt;size);</div><div class='ctx'> </div><div class='hunk'>@@ -1580,6 +1595,20 @@ static int ar5523_probe(struct usb_interface *intf,</div><div class='ctx'> 	struct ar5523 *ar;</div><div class='ctx'> 	int error = -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	static const u8 bulk_ep_addr[] = {</div><div class='add'>+		AR5523_CMD_TX_PIPE | USB_DIR_OUT,</div><div class='add'>+		AR5523_DATA_TX_PIPE | USB_DIR_OUT,</div><div class='add'>+		AR5523_CMD_RX_PIPE | USB_DIR_IN,</div><div class='add'>+		AR5523_DATA_RX_PIPE | USB_DIR_IN,</div><div class='add'>+		0};</div><div class='add'>+</div><div class='add'>+	if (!usb_check_bulk_endpoints(intf, bulk_ep_addr)) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev,</div><div class='add'>+			"Could not find all expected endpoints\n");</div><div class='add'>+		error = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Load firmware if the device requires it.  This will return</div><div class='ctx'> 	 * -ENXIO on success and we'll get called back afer the usb</div><div class='hunk'>@@ -1772,9 +1801,8 @@ static const struct usb_device_id ar5523_id_table[] = {</div><div class='ctx'> 	AR5523_DEVICE_UG(0x0846, 0x5f00),	/* Netgear / WPN111 */</div><div class='ctx'> 	AR5523_DEVICE_UG(0x083a, 0x4506),	/* SMC / EZ Connect</div><div class='ctx'> 						   SMCWUSBT-G2 */</div><div class='del'>-	AR5523_DEVICE_UG(0x157e, 0x3006),	/* Umedia / AR5523_1 */</div><div class='add'>+	AR5523_DEVICE_UG(0x157e, 0x3006),	/* Umedia / AR5523_1, TEW444UBEU*/</div><div class='ctx'> 	AR5523_DEVICE_UX(0x157e, 0x3205),	/* Umedia / AR5523_2 */</div><div class='del'>-	AR5523_DEVICE_UG(0x157e, 0x3006),	/* Umedia / TEW444UBEU */</div><div class='ctx'> 	AR5523_DEVICE_UG(0x1435, 0x0826),	/* Wistronneweb / AR5523_1 */</div><div class='ctx'> 	AR5523_DEVICE_UX(0x1435, 0x0828),	/* Wistronneweb / AR5523_2 */</div><div class='ctx'> 	AR5523_DEVICE_UG(0x0cde, 0x0012),	/* Zcom / AR5523 */</div><div class='hunk'>@@ -1794,5 +1822,6 @@ static struct usb_driver ar5523_driver = {</div><div class='ctx'> </div><div class='ctx'> module_usb_driver(ar5523_driver);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Atheros AR5523 wireless driver");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> MODULE_FIRMWARE(AR5523_FIRMWARE_FILE);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h<br/>index f083fb9038c3..34654f710d8a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath.h</a></div><div class='hunk'>@@ -96,11 +96,13 @@ struct ath_keyval {</div><div class='ctx'> 	u8 kv_type;</div><div class='ctx'> 	u8 kv_pad;</div><div class='ctx'> 	u16 kv_len;</div><div class='del'>-	u8 kv_val[16]; /* TK */</div><div class='del'>-	u8 kv_mic[8]; /* Michael MIC key */</div><div class='del'>-	u8 kv_txmic[8]; /* Michael MIC TX key (used only if the hardware</div><div class='del'>-			 * supports both MIC keys in the same key cache entry;</div><div class='del'>-			 * in that case, kv_mic is the RX key) */</div><div class='add'>+	struct_group(kv_values,</div><div class='add'>+		u8 kv_val[16]; /* TK */</div><div class='add'>+		u8 kv_mic[8]; /* Michael MIC key */</div><div class='add'>+		u8 kv_txmic[8]; /* Michael MIC TX key (used only if the hardware</div><div class='add'>+				 * supports both MIC keys in the same key cache entry;</div><div class='add'>+				 * in that case, kv_mic is the RX key) */</div><div class='add'>+	);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ath_cipher {</div><div class='hunk'>@@ -169,8 +171,10 @@ struct ath_common {</div><div class='ctx'> 	unsigned int clockrate;</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t cc_lock;</div><div class='del'>-	struct ath_cycle_counters cc_ani;</div><div class='del'>-	struct ath_cycle_counters cc_survey;</div><div class='add'>+	struct_group(cc,</div><div class='add'>+		struct ath_cycle_counters cc_ani;</div><div class='add'>+		struct ath_cycle_counters cc_survey;</div><div class='add'>+	);</div><div class='ctx'> </div><div class='ctx'> 	struct ath_regulatory regulatory;</div><div class='ctx'> 	struct ath_regulatory reg_world_copy;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/Kconfig b/drivers/net/wireless/ath/ath10k/Kconfig<br/>index 40f91bc8514d..876aed765833 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/Kconfig</a></div><div class='hunk'>@@ -44,6 +44,9 @@ config ATH10K_SNOC</div><div class='ctx'> 	tristate "Qualcomm ath10k SNOC support"</div><div class='ctx'> 	depends on ATH10K</div><div class='ctx'> 	depends on ARCH_QCOM || COMPILE_TEST</div><div class='add'>+	depends on QCOM_SMEM</div><div class='add'>+	depends on QCOM_RPROC_COMMON || QCOM_RPROC_COMMON=n</div><div class='add'>+	select QCOM_SCM</div><div class='ctx'> 	select QCOM_QMI_HELPERS</div><div class='ctx'> 	help</div><div class='ctx'> 	  This module adds support for integrated WCN3990 chip connected</div><div class='hunk'>@@ -65,6 +68,12 @@ config ATH10K_DEBUGFS</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say Y to make it easier to debug problems.</div><div class='ctx'> </div><div class='add'>+config ATH10K_LEDS</div><div class='add'>+	bool</div><div class='add'>+	depends on ATH10K</div><div class='add'>+	depends on LEDS_CLASS=y || LEDS_CLASS=MAC80211</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> config ATH10K_SPECTRAL</div><div class='ctx'> 	bool "Atheros ath10k spectral scan support"</div><div class='ctx'> 	depends on ATH10K_DEBUGFS</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/Makefile b/drivers/net/wireless/ath/ath10k/Makefile<br/>index 142c777b287f..02bf9b629038 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/Makefile</a></div><div class='hunk'>@@ -19,6 +19,7 @@ ath10k_core-$(CONFIG_ATH10K_SPECTRAL) += spectral.o</div><div class='ctx'> ath10k_core-$(CONFIG_NL80211_TESTMODE) += testmode.o</div><div class='ctx'> ath10k_core-$(CONFIG_ATH10K_TRACING) += trace.o</div><div class='ctx'> ath10k_core-$(CONFIG_THERMAL) += thermal.o</div><div class='add'>+ath10k_core-$(CONFIG_ATH10K_LEDS) += leds.o</div><div class='ctx'> ath10k_core-$(CONFIG_MAC80211_DEBUGFS) += debugfs_sta.o</div><div class='ctx'> ath10k_core-$(CONFIG_PM) += wow.o</div><div class='ctx'> ath10k_core-$(CONFIG_DEV_COREDUMP) += coredump.o</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/ahb.c b/drivers/net/wireless/ath/ath10k/ahb.c<br/>index 869524852fba..eb8b35b6224d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/ahb.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/ahb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/ahb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/ahb.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/reset.h&gt;</div><div class='ctx'> #include "core.h"</div><div class='hunk'>@@ -27,7 +27,7 @@ MODULE_DEVICE_TABLE(of, ath10k_ahb_of_match);</div><div class='ctx'> </div><div class='ctx'> static inline struct ath10k_ahb *ath10k_ahb_priv(struct ath10k *ar)</div><div class='ctx'> {</div><div class='del'>-	return &amp;((struct ath10k_pci *)ar-&gt;drv_priv)-&gt;ahb[0];</div><div class='add'>+	return &amp;ath10k_pci_priv(ar)-&gt;ahb[0];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath10k_ahb_write32(struct ath10k *ar, u32 offset, u32 value)</div><div class='hunk'>@@ -394,14 +394,14 @@ static irqreturn_t ath10k_ahb_interrupt_handler(int irq, void *arg)</div><div class='ctx'> 	if (!ath10k_pci_irq_pending(ar))</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-	ath10k_pci_disable_and_clear_legacy_irq(ar);</div><div class='add'>+	ath10k_pci_disable_and_clear_intx_irq(ar);</div><div class='ctx'> 	ath10k_pci_irq_msi_fw_mask(ar);</div><div class='ctx'> 	napi_schedule(&amp;ar-&gt;napi);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath10k_ahb_request_irq_legacy(struct ath10k *ar)</div><div class='add'>+static int ath10k_ahb_request_irq_intx(struct ath10k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);</div><div class='ctx'> 	struct ath10k_ahb *ar_ahb = ath10k_ahb_priv(ar);</div><div class='hunk'>@@ -415,12 +415,12 @@ static int ath10k_ahb_request_irq_legacy(struct ath10k *ar)</div><div class='ctx'> 			    ar_ahb-&gt;irq, ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	ar_pci-&gt;oper_irq_mode = ATH10K_PCI_IRQ_LEGACY;</div><div class='add'>+	ar_pci-&gt;oper_irq_mode = ATH10K_PCI_IRQ_INTX;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath10k_ahb_release_irq_legacy(struct ath10k *ar)</div><div class='add'>+static void ath10k_ahb_release_irq_intx(struct ath10k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k_ahb *ar_ahb = ath10k_ahb_priv(ar);</div><div class='ctx'> </div><div class='hunk'>@@ -430,7 +430,7 @@ static void ath10k_ahb_release_irq_legacy(struct ath10k *ar)</div><div class='ctx'> static void ath10k_ahb_irq_disable(struct ath10k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	ath10k_ce_disable_interrupts(ar);</div><div class='del'>-	ath10k_pci_disable_and_clear_legacy_irq(ar);</div><div class='add'>+	ath10k_pci_disable_and_clear_intx_irq(ar);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath10k_ahb_resource_init(struct ath10k *ar)</div><div class='hunk'>@@ -442,14 +442,7 @@ static int ath10k_ahb_resource_init(struct ath10k *ar)</div><div class='ctx'> </div><div class='ctx'> 	pdev = ar_ahb-&gt;pdev;</div><div class='ctx'> </div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	if (!res) {</div><div class='del'>-		ath10k_err(ar, "failed to get memory resource\n");</div><div class='del'>-		ret = -ENXIO;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ar_ahb-&gt;mem = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+	ar_ahb-&gt;mem = devm_platform_get_and_ioremap_resource(pdev, 0, &amp;res);</div><div class='ctx'> 	if (IS_ERR(ar_ahb-&gt;mem)) {</div><div class='ctx'> 		ath10k_err(ar, "mem ioremap error\n");</div><div class='ctx'> 		ret = PTR_ERR(ar_ahb-&gt;mem);</div><div class='hunk'>@@ -504,7 +497,7 @@ static int ath10k_ahb_resource_init(struct ath10k *ar)</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_BOOT, "irq: %d\n", ar_ahb-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	ath10k_dbg(ar, ATH10K_DBG_BOOT, "mem: 0x%pK mem_len: %lu gcc mem: 0x%pK tcsr_mem: 0x%pK\n",</div><div class='add'>+	ath10k_dbg(ar, ATH10K_DBG_BOOT, "mem: 0x%p mem_len: %lu gcc mem: 0x%p tcsr_mem: 0x%p\n",</div><div class='ctx'> 		   ar_ahb-&gt;mem, ar_ahb-&gt;mem_len,</div><div class='ctx'> 		   ar_ahb-&gt;gcc_mem, ar_ahb-&gt;tcsr_mem);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -628,7 +621,7 @@ static int ath10k_ahb_hif_start(struct ath10k *ar)</div><div class='ctx'> </div><div class='ctx'> 	ath10k_core_napi_enable(ar);</div><div class='ctx'> 	ath10k_ce_enable_interrupts(ar);</div><div class='del'>-	ath10k_pci_enable_legacy_irq(ar);</div><div class='add'>+	ath10k_pci_enable_intx_irq(ar);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_pci_rx_post(ar);</div><div class='ctx'> </div><div class='hunk'>@@ -735,20 +728,17 @@ static int ath10k_ahb_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct ath10k *ar;</div><div class='ctx'> 	struct ath10k_ahb *ar_ahb;</div><div class='ctx'> 	struct ath10k_pci *ar_pci;</div><div class='del'>-	const struct of_device_id *of_id;</div><div class='ctx'> 	enum ath10k_hw_rev hw_rev;</div><div class='ctx'> 	size_t size;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct ath10k_bus_params bus_params = {};</div><div class='ctx'> </div><div class='del'>-	of_id = of_match_device(ath10k_ahb_of_match, &amp;pdev-&gt;dev);</div><div class='del'>-	if (!of_id) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to find matching device tree id\n");</div><div class='add'>+	hw_rev = (uintptr_t)of_device_get_match_data(&amp;pdev-&gt;dev);</div><div class='add'>+	if (!hw_rev) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "OF data missing\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hw_rev = (enum ath10k_hw_rev)of_id-&gt;data;</div><div class='del'>-</div><div class='ctx'> 	size = sizeof(*ar_pci) + sizeof(*ar_ahb);</div><div class='ctx'> 	ar = ath10k_core_create(size, &amp;pdev-&gt;dev, ATH10K_BUS_AHB,</div><div class='ctx'> 				hw_rev, &amp;ath10k_ahb_hif_ops);</div><div class='hunk'>@@ -785,7 +775,7 @@ static int ath10k_ahb_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	ath10k_pci_init_napi(ar);</div><div class='ctx'> </div><div class='del'>-	ret = ath10k_ahb_request_irq_legacy(ar);</div><div class='add'>+	ret = ath10k_ahb_request_irq_intx(ar);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_free_pipes;</div><div class='ctx'> </div><div class='hunk'>@@ -816,7 +806,7 @@ err_halt_device:</div><div class='ctx'> 	ath10k_ahb_clock_disable(ar);</div><div class='ctx'> </div><div class='ctx'> err_free_irq:</div><div class='del'>-	ath10k_ahb_release_irq_legacy(ar);</div><div class='add'>+	ath10k_ahb_release_irq_intx(ar);</div><div class='ctx'> </div><div class='ctx'> err_free_pipes:</div><div class='ctx'> 	ath10k_pci_release_resource(ar);</div><div class='hunk'>@@ -826,46 +816,32 @@ err_resource_deinit:</div><div class='ctx'> </div><div class='ctx'> err_core_destroy:</div><div class='ctx'> 	ath10k_core_destroy(ar);</div><div class='del'>-	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath10k_ahb_remove(struct platform_device *pdev)</div><div class='add'>+static void ath10k_ahb_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = platform_get_drvdata(pdev);</div><div class='del'>-	struct ath10k_ahb *ar_ahb;</div><div class='del'>-</div><div class='del'>-	if (!ar)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ar_ahb = ath10k_ahb_priv(ar);</div><div class='del'>-</div><div class='del'>-	if (!ar_ahb)</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_AHB, "ahb remove\n");</div><div class='ctx'> </div><div class='ctx'> 	ath10k_core_unregister(ar);</div><div class='ctx'> 	ath10k_ahb_irq_disable(ar);</div><div class='del'>-	ath10k_ahb_release_irq_legacy(ar);</div><div class='add'>+	ath10k_ahb_release_irq_intx(ar);</div><div class='ctx'> 	ath10k_pci_release_resource(ar);</div><div class='ctx'> 	ath10k_ahb_halt_chip(ar);</div><div class='ctx'> 	ath10k_ahb_clock_disable(ar);</div><div class='ctx'> 	ath10k_ahb_resource_deinit(ar);</div><div class='ctx'> 	ath10k_core_destroy(ar);</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(pdev, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver ath10k_ahb_driver = {</div><div class='del'>-	.driver         = {</div><div class='del'>-		.name   = "ath10k_ahb",</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "ath10k_ahb",</div><div class='ctx'> 		.of_match_table = ath10k_ahb_of_match,</div><div class='ctx'> 	},</div><div class='del'>-	.probe  = ath10k_ahb_probe,</div><div class='add'>+	.probe = ath10k_ahb_probe,</div><div class='ctx'> 	.remove = ath10k_ahb_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/bmi.c b/drivers/net/wireless/ath/ath10k/bmi.c<br/>index 4481ed375f55..52118867ecde 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/bmi.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/bmi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/bmi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/bmi.c</a></div><div class='hunk'>@@ -2,8 +2,11 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2005-2011 Atheros Communications Inc.</div><div class='ctx'>  * Copyright (c) 2011-2014,2016-2017 Qualcomm Atheros, Inc.</div><div class='add'>+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include "bmi.h"</div><div class='ctx'> #include "hif.h"</div><div class='ctx'> #include "debug.h"</div><div class='hunk'>@@ -101,7 +104,7 @@ int ath10k_bmi_get_target_info_sdio(struct ath10k *ar,</div><div class='ctx'> 	cmd.id = __cpu_to_le32(BMI_GET_TARGET_INFO);</div><div class='ctx'> </div><div class='ctx'> 	/* Step 1: Read 4 bytes of the target info and check if it is</div><div class='del'>-	 * the special sentinal version word or the first word in the</div><div class='add'>+	 * the special sentinel version word or the first word in the</div><div class='ctx'> 	 * version response.</div><div class='ctx'> 	 */</div><div class='ctx'> 	resplen = sizeof(u32);</div><div class='hunk'>@@ -111,7 +114,7 @@ int ath10k_bmi_get_target_info_sdio(struct ath10k *ar,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Some SDIO boards have a special sentinal byte before the real</div><div class='add'>+	/* Some SDIO boards have a special sentinel byte before the real</div><div class='ctx'> 	 * version response.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (__le32_to_cpu(tmp) == TARGET_VERSION_SENTINAL) {</div><div class='hunk'>@@ -348,7 +351,7 @@ static int ath10k_bmi_lz_data_large(struct ath10k *ar, const void *buffer, u32 l</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	size_t buf_len;</div><div class='ctx'> </div><div class='del'>-	ath10k_dbg(ar, ATH10K_DBG_BMI, "large bmi lz data buffer 0x%pK length %d\n",</div><div class='add'>+	ath10k_dbg(ar, ATH10K_DBG_BMI, "large bmi lz data buffer 0x%p length %d\n",</div><div class='ctx'> 		   buffer, length);</div><div class='ctx'> </div><div class='ctx'> 	if (ar-&gt;bmi.done_sent) {</div><div class='hunk'>@@ -394,7 +397,7 @@ int ath10k_bmi_lz_data(struct ath10k *ar, const void *buffer, u32 length)</div><div class='ctx'> 	u32 txlen;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi lz data buffer 0x%pK length %d\n",</div><div class='add'>+	ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi lz data buffer 0x%p length %d\n",</div><div class='ctx'> 		   buffer, length);</div><div class='ctx'> </div><div class='ctx'> 	if (ar-&gt;bmi.done_sent) {</div><div class='hunk'>@@ -460,7 +463,7 @@ int ath10k_bmi_fast_download(struct ath10k *ar,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_BMI,</div><div class='del'>-		   "bmi fast download address 0x%x buffer 0x%pK length %d\n",</div><div class='add'>+		   "bmi fast download address 0x%x buffer 0x%p length %d\n",</div><div class='ctx'> 		   address, buffer, length);</div><div class='ctx'> </div><div class='ctx'> 	ret = ath10k_bmi_lz_stream_start(ar, address);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/bmi.h b/drivers/net/wireless/ath/ath10k/bmi.h<br/>index f6fadcbdd86e..0685c0d2d4ea 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/bmi.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/bmi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/bmi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/bmi.h</a></div><div class='hunk'>@@ -109,7 +109,7 @@ struct bmi_cmd {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			__le32 addr;</div><div class='ctx'> 			__le32 len;</div><div class='del'>-			u8 payload[0];</div><div class='add'>+			u8 payload[];</div><div class='ctx'> 		} write_mem;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			__le32 addr;</div><div class='hunk'>@@ -138,18 +138,18 @@ struct bmi_cmd {</div><div class='ctx'> 		} rompatch_uninstall;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			__le32 count;</div><div class='del'>-			__le32 patch_ids[0]; /* length of @count */</div><div class='add'>+			__le32 patch_ids[]; /* length of @count */</div><div class='ctx'> 		} rompatch_activate;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			__le32 count;</div><div class='del'>-			__le32 patch_ids[0]; /* length of @count */</div><div class='add'>+			__le32 patch_ids[]; /* length of @count */</div><div class='ctx'> 		} rompatch_deactivate;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			__le32 addr;</div><div class='ctx'> 		} lz_start;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			__le32 len; /* max BMI_MAX_DATA_SIZE */</div><div class='del'>-			u8 payload[0]; /* length of @len */</div><div class='add'>+			u8 payload[]; /* length of @len */</div><div class='ctx'> 		} lz_data;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u8 name[BMI_NVRAM_SEG_NAME_SZ];</div><div class='hunk'>@@ -160,7 +160,7 @@ struct bmi_cmd {</div><div class='ctx'> </div><div class='ctx'> union bmi_resp {</div><div class='ctx'> 	struct {</div><div class='del'>-		u8 payload[0];</div><div class='add'>+		DECLARE_FLEX_ARRAY(u8, payload);</div><div class='ctx'> 	} read_mem;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		__le32 result;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/ce.c b/drivers/net/wireless/ath/ath10k/ce.c<br/>index c45c814fd122..7bbda46cfd93 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/ce.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/ce.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/ce.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/ce.c</a></div><div class='hunk'>@@ -3,8 +3,11 @@</div><div class='ctx'>  * Copyright (c) 2005-2011 Atheros Communications Inc.</div><div class='ctx'>  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.</div><div class='ctx'>  * Copyright (c) 2018 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include "hif.h"</div><div class='ctx'> #include "ce.h"</div><div class='ctx'> #include "debug.h"</div><div class='hunk'>@@ -77,59 +80,13 @@ static inline u32 shadow_sr_wr_ind_addr(struct ath10k *ar,</div><div class='ctx'> 	return addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u32 shadow_dst_wr_ind_addr(struct ath10k *ar,</div><div class='del'>-					 struct ath10k_ce_pipe *ce_state)</div><div class='del'>-{</div><div class='del'>-	u32 ce_id = ce_state-&gt;id;</div><div class='del'>-	u32 addr = 0;</div><div class='del'>-</div><div class='del'>-	switch (ce_id) {</div><div class='del'>-	case 1:</div><div class='del'>-		addr = 0x00032034;</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		addr = 0x00032038;</div><div class='del'>-		break;</div><div class='del'>-	case 5:</div><div class='del'>-		addr = 0x00032044;</div><div class='del'>-		break;</div><div class='del'>-	case 7:</div><div class='del'>-		addr = 0x0003204C;</div><div class='del'>-		break;</div><div class='del'>-	case 8:</div><div class='del'>-		addr = 0x00032050;</div><div class='del'>-		break;</div><div class='del'>-	case 9:</div><div class='del'>-		addr = 0x00032054;</div><div class='del'>-		break;</div><div class='del'>-	case 10:</div><div class='del'>-		addr = 0x00032058;</div><div class='del'>-		break;</div><div class='del'>-	case 11:</div><div class='del'>-		addr = 0x0003205C;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ath10k_warn(ar, "invalid CE id: %d", ce_id);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline unsigned int</div><div class='ctx'> ath10k_set_ring_byte(unsigned int offset,</div><div class='del'>-		     struct ath10k_hw_ce_regs_addr_map *addr_map)</div><div class='add'>+		     const struct ath10k_hw_ce_regs_addr_map *addr_map)</div><div class='ctx'> {</div><div class='ctx'> 	return ((offset &lt;&lt; addr_map-&gt;lsb) &amp; addr_map-&gt;mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int</div><div class='del'>-ath10k_get_ring_byte(unsigned int offset,</div><div class='del'>-		     struct ath10k_hw_ce_regs_addr_map *addr_map)</div><div class='del'>-{</div><div class='del'>-	return ((offset &amp; addr_map-&gt;mask) &gt;&gt; (addr_map-&gt;lsb));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline u32 ath10k_ce_read32(struct ath10k *ar, u32 offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k_ce *ce = ath10k_ce_priv(ar);</div><div class='hunk'>@@ -208,14 +165,6 @@ ath10k_ce_shadow_src_ring_write_index_set(struct ath10k *ar,</div><div class='ctx'> 	ath10k_ce_write32(ar, shadow_sr_wr_ind_addr(ar, ce_state), value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-ath10k_ce_shadow_dest_ring_write_index_set(struct ath10k *ar,</div><div class='del'>-					   struct ath10k_ce_pipe *ce_state,</div><div class='del'>-					   unsigned int value)</div><div class='del'>-{</div><div class='del'>-	ath10k_ce_write32(ar, shadow_dst_wr_ind_addr(ar, ce_state), value);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void ath10k_ce_src_ring_base_addr_set(struct ath10k *ar,</div><div class='ctx'> 						    u32 ce_id,</div><div class='ctx'> 						    u64 addr)</div><div class='hunk'>@@ -256,7 +205,7 @@ static inline void ath10k_ce_src_ring_dmax_set(struct ath10k *ar,</div><div class='ctx'> 					       u32 ce_ctrl_addr,</div><div class='ctx'> 					       unsigned int n)</div><div class='ctx'> {</div><div class='del'>-	struct ath10k_hw_ce_ctrl1 *ctrl_regs = ar-&gt;hw_ce_regs-&gt;ctrl1_regs;</div><div class='add'>+	const struct ath10k_hw_ce_ctrl1 *ctrl_regs = ar-&gt;hw_ce_regs-&gt;ctrl1_regs;</div><div class='ctx'> </div><div class='ctx'> 	u32 ctrl1_addr = ath10k_ce_read32(ar, ce_ctrl_addr +</div><div class='ctx'> 					  ctrl_regs-&gt;addr);</div><div class='hunk'>@@ -270,7 +219,7 @@ static inline void ath10k_ce_src_ring_byte_swap_set(struct ath10k *ar,</div><div class='ctx'> 						    u32 ce_ctrl_addr,</div><div class='ctx'> 						    unsigned int n)</div><div class='ctx'> {</div><div class='del'>-	struct ath10k_hw_ce_ctrl1 *ctrl_regs = ar-&gt;hw_ce_regs-&gt;ctrl1_regs;</div><div class='add'>+	const struct ath10k_hw_ce_ctrl1 *ctrl_regs = ar-&gt;hw_ce_regs-&gt;ctrl1_regs;</div><div class='ctx'> </div><div class='ctx'> 	u32 ctrl1_addr = ath10k_ce_read32(ar, ce_ctrl_addr +</div><div class='ctx'> 					  ctrl_regs-&gt;addr);</div><div class='hunk'>@@ -284,7 +233,7 @@ static inline void ath10k_ce_dest_ring_byte_swap_set(struct ath10k *ar,</div><div class='ctx'> 						     u32 ce_ctrl_addr,</div><div class='ctx'> 						     unsigned int n)</div><div class='ctx'> {</div><div class='del'>-	struct ath10k_hw_ce_ctrl1 *ctrl_regs = ar-&gt;hw_ce_regs-&gt;ctrl1_regs;</div><div class='add'>+	const struct ath10k_hw_ce_ctrl1 *ctrl_regs = ar-&gt;hw_ce_regs-&gt;ctrl1_regs;</div><div class='ctx'> </div><div class='ctx'> 	u32 ctrl1_addr = ath10k_ce_read32(ar, ce_ctrl_addr +</div><div class='ctx'> 					  ctrl_regs-&gt;addr);</div><div class='hunk'>@@ -366,7 +315,7 @@ static inline void ath10k_ce_src_ring_highmark_set(struct ath10k *ar,</div><div class='ctx'> 						   u32 ce_ctrl_addr,</div><div class='ctx'> 						   unsigned int n)</div><div class='ctx'> {</div><div class='del'>-	struct ath10k_hw_ce_dst_src_wm_regs *srcr_wm = ar-&gt;hw_ce_regs-&gt;wm_srcr;</div><div class='add'>+	const struct ath10k_hw_ce_dst_src_wm_regs *srcr_wm = ar-&gt;hw_ce_regs-&gt;wm_srcr;</div><div class='ctx'> 	u32 addr = ath10k_ce_read32(ar, ce_ctrl_addr + srcr_wm-&gt;addr);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_ce_write32(ar, ce_ctrl_addr + srcr_wm-&gt;addr,</div><div class='hunk'>@@ -378,7 +327,7 @@ static inline void ath10k_ce_src_ring_lowmark_set(struct ath10k *ar,</div><div class='ctx'> 						  u32 ce_ctrl_addr,</div><div class='ctx'> 						  unsigned int n)</div><div class='ctx'> {</div><div class='del'>-	struct ath10k_hw_ce_dst_src_wm_regs *srcr_wm = ar-&gt;hw_ce_regs-&gt;wm_srcr;</div><div class='add'>+	const struct ath10k_hw_ce_dst_src_wm_regs *srcr_wm = ar-&gt;hw_ce_regs-&gt;wm_srcr;</div><div class='ctx'> 	u32 addr = ath10k_ce_read32(ar, ce_ctrl_addr + srcr_wm-&gt;addr);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_ce_write32(ar, ce_ctrl_addr + srcr_wm-&gt;addr,</div><div class='hunk'>@@ -390,7 +339,7 @@ static inline void ath10k_ce_dest_ring_highmark_set(struct ath10k *ar,</div><div class='ctx'> 						    u32 ce_ctrl_addr,</div><div class='ctx'> 						    unsigned int n)</div><div class='ctx'> {</div><div class='del'>-	struct ath10k_hw_ce_dst_src_wm_regs *dstr_wm = ar-&gt;hw_ce_regs-&gt;wm_dstr;</div><div class='add'>+	const struct ath10k_hw_ce_dst_src_wm_regs *dstr_wm = ar-&gt;hw_ce_regs-&gt;wm_dstr;</div><div class='ctx'> 	u32 addr = ath10k_ce_read32(ar, ce_ctrl_addr + dstr_wm-&gt;addr);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_ce_write32(ar, ce_ctrl_addr + dstr_wm-&gt;addr,</div><div class='hunk'>@@ -402,7 +351,7 @@ static inline void ath10k_ce_dest_ring_lowmark_set(struct ath10k *ar,</div><div class='ctx'> 						   u32 ce_ctrl_addr,</div><div class='ctx'> 						   unsigned int n)</div><div class='ctx'> {</div><div class='del'>-	struct ath10k_hw_ce_dst_src_wm_regs *dstr_wm = ar-&gt;hw_ce_regs-&gt;wm_dstr;</div><div class='add'>+	const struct ath10k_hw_ce_dst_src_wm_regs *dstr_wm = ar-&gt;hw_ce_regs-&gt;wm_dstr;</div><div class='ctx'> 	u32 addr = ath10k_ce_read32(ar, ce_ctrl_addr + dstr_wm-&gt;addr);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_ce_write32(ar, ce_ctrl_addr + dstr_wm-&gt;addr,</div><div class='hunk'>@@ -413,7 +362,7 @@ static inline void ath10k_ce_dest_ring_lowmark_set(struct ath10k *ar,</div><div class='ctx'> static inline void ath10k_ce_copy_complete_inter_enable(struct ath10k *ar,</div><div class='ctx'> 							u32 ce_ctrl_addr)</div><div class='ctx'> {</div><div class='del'>-	struct ath10k_hw_ce_host_ie *host_ie = ar-&gt;hw_ce_regs-&gt;host_ie;</div><div class='add'>+	const struct ath10k_hw_ce_host_ie *host_ie = ar-&gt;hw_ce_regs-&gt;host_ie;</div><div class='ctx'> </div><div class='ctx'> 	u32 host_ie_addr = ath10k_ce_read32(ar, ce_ctrl_addr +</div><div class='ctx'> 					    ar-&gt;hw_ce_regs-&gt;host_ie_addr);</div><div class='hunk'>@@ -425,7 +374,7 @@ static inline void ath10k_ce_copy_complete_inter_enable(struct ath10k *ar,</div><div class='ctx'> static inline void ath10k_ce_copy_complete_intr_disable(struct ath10k *ar,</div><div class='ctx'> 							u32 ce_ctrl_addr)</div><div class='ctx'> {</div><div class='del'>-	struct ath10k_hw_ce_host_ie *host_ie = ar-&gt;hw_ce_regs-&gt;host_ie;</div><div class='add'>+	const struct ath10k_hw_ce_host_ie *host_ie = ar-&gt;hw_ce_regs-&gt;host_ie;</div><div class='ctx'> </div><div class='ctx'> 	u32 host_ie_addr = ath10k_ce_read32(ar, ce_ctrl_addr +</div><div class='ctx'> 					    ar-&gt;hw_ce_regs-&gt;host_ie_addr);</div><div class='hunk'>@@ -437,7 +386,7 @@ static inline void ath10k_ce_copy_complete_intr_disable(struct ath10k *ar,</div><div class='ctx'> static inline void ath10k_ce_watermark_intr_disable(struct ath10k *ar,</div><div class='ctx'> 						    u32 ce_ctrl_addr)</div><div class='ctx'> {</div><div class='del'>-	struct ath10k_hw_ce_host_wm_regs *wm_regs = ar-&gt;hw_ce_regs-&gt;wm_regs;</div><div class='add'>+	const struct ath10k_hw_ce_host_wm_regs *wm_regs = ar-&gt;hw_ce_regs-&gt;wm_regs;</div><div class='ctx'> </div><div class='ctx'> 	u32 host_ie_addr = ath10k_ce_read32(ar, ce_ctrl_addr +</div><div class='ctx'> 					    ar-&gt;hw_ce_regs-&gt;host_ie_addr);</div><div class='hunk'>@@ -446,23 +395,10 @@ static inline void ath10k_ce_watermark_intr_disable(struct ath10k *ar,</div><div class='ctx'> 			  host_ie_addr &amp; ~(wm_regs-&gt;wm_mask));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ath10k_ce_error_intr_enable(struct ath10k *ar,</div><div class='del'>-					       u32 ce_ctrl_addr)</div><div class='del'>-{</div><div class='del'>-	struct ath10k_hw_ce_misc_regs *misc_regs = ar-&gt;hw_ce_regs-&gt;misc_regs;</div><div class='del'>-</div><div class='del'>-	u32 misc_ie_addr = ath10k_ce_read32(ar, ce_ctrl_addr +</div><div class='del'>-					    ar-&gt;hw_ce_regs-&gt;misc_ie_addr);</div><div class='del'>-</div><div class='del'>-	ath10k_ce_write32(ar,</div><div class='del'>-			  ce_ctrl_addr + ar-&gt;hw_ce_regs-&gt;misc_ie_addr,</div><div class='del'>-			  misc_ie_addr | misc_regs-&gt;err_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void ath10k_ce_error_intr_disable(struct ath10k *ar,</div><div class='ctx'> 						u32 ce_ctrl_addr)</div><div class='ctx'> {</div><div class='del'>-	struct ath10k_hw_ce_misc_regs *misc_regs = ar-&gt;hw_ce_regs-&gt;misc_regs;</div><div class='add'>+	const struct ath10k_hw_ce_misc_regs *misc_regs = ar-&gt;hw_ce_regs-&gt;misc_regs;</div><div class='ctx'> </div><div class='ctx'> 	u32 misc_ie_addr = ath10k_ce_read32(ar,</div><div class='ctx'> 			ce_ctrl_addr + ar-&gt;hw_ce_regs-&gt;misc_ie_addr);</div><div class='hunk'>@@ -476,7 +412,7 @@ static inline void ath10k_ce_engine_int_status_clear(struct ath10k *ar,</div><div class='ctx'> 						     u32 ce_ctrl_addr,</div><div class='ctx'> 						     unsigned int mask)</div><div class='ctx'> {</div><div class='del'>-	struct ath10k_hw_ce_host_wm_regs *wm_regs = ar-&gt;hw_ce_regs-&gt;wm_regs;</div><div class='add'>+	const struct ath10k_hw_ce_host_wm_regs *wm_regs = ar-&gt;hw_ce_regs-&gt;wm_regs;</div><div class='ctx'> </div><div class='ctx'> 	ath10k_ce_write32(ar, ce_ctrl_addr + wm_regs-&gt;addr, mask);</div><div class='ctx'> }</div><div class='hunk'>@@ -1296,7 +1232,7 @@ void ath10k_ce_per_engine_service(struct ath10k *ar, unsigned int ce_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k_ce *ce = ath10k_ce_priv(ar);</div><div class='ctx'> 	struct ath10k_ce_pipe *ce_state = &amp;ce-&gt;ce_states[ce_id];</div><div class='del'>-	struct ath10k_hw_ce_host_wm_regs *wm_regs = ar-&gt;hw_ce_regs-&gt;wm_regs;</div><div class='add'>+	const struct ath10k_hw_ce_host_wm_regs *wm_regs = ar-&gt;hw_ce_regs-&gt;wm_regs;</div><div class='ctx'> 	u32 ctrl_addr = ce_state-&gt;ctrl_addr;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1323,7 +1259,7 @@ EXPORT_SYMBOL(ath10k_ce_per_engine_service);</div><div class='ctx'> /*</div><div class='ctx'>  * Handler for per-engine interrupts on ALL active CEs.</div><div class='ctx'>  * This is used in cases where the system is sharing a</div><div class='del'>- * single interrput for all CEs</div><div class='add'>+ * single interrupt for all CEs</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> void ath10k_ce_per_engine_service_any(struct ath10k *ar)</div><div class='hunk'>@@ -1454,7 +1390,7 @@ static int ath10k_ce_init_src_ring(struct ath10k *ar,</div><div class='ctx'> 	ath10k_ce_src_ring_highmark_set(ar, ctrl_addr, nentries);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_BOOT,</div><div class='del'>-		   "boot init ce src ring id %d entries %d base_addr %pK\n",</div><div class='add'>+		   "boot init ce src ring id %d entries %d base_addr %p\n",</div><div class='ctx'> 		   ce_id, nentries, src_ring-&gt;base_addr_owner_space);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1492,7 +1428,7 @@ static int ath10k_ce_init_dest_ring(struct ath10k *ar,</div><div class='ctx'> 	ath10k_ce_dest_ring_highmark_set(ar, ctrl_addr, nentries);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_BOOT,</div><div class='del'>-		   "boot ce dest ring id %d entries %d base_addr %pK\n",</div><div class='add'>+		   "boot ce dest ring id %d entries %d base_addr %p\n",</div><div class='ctx'> 		   ce_id, nentries, dest_ring-&gt;base_addr_owner_space);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/ce.h b/drivers/net/wireless/ath/ath10k/ce.h<br/>index 666ce384a1d8..27367bd64e95 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/ce.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/ce.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/ce.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/ce.h</a></div><div class='hunk'>@@ -110,7 +110,7 @@ struct ath10k_ce_ring {</div><div class='ctx'> 	struct ce_desc_64 *shadow_base;</div><div class='ctx'> </div><div class='ctx'> 	/* keep last */</div><div class='del'>-	void *per_transfer_context[];</div><div class='add'>+	void *per_transfer_context[] __counted_by(nentries);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ath10k_ce_pipe {</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c<br/>index 2f9be182fbfb..7c2939cbde5f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/core.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/core.c</a></div><div class='hunk'>@@ -3,8 +3,10 @@</div><div class='ctx'>  * Copyright (c) 2005-2011 Atheros Communications Inc.</div><div class='ctx'>  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.</div><div class='ctx'>  * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='hunk'>@@ -12,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/dmi.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/pm_qos.h&gt;</div><div class='add'>+#include &lt;linux/nvmem-consumer.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='hunk'>@@ -25,6 +28,7 @@</div><div class='ctx'> #include "testmode.h"</div><div class='ctx'> #include "wmi-ops.h"</div><div class='ctx'> #include "coredump.h"</div><div class='add'>+#include "leds.h"</div><div class='ctx'> </div><div class='ctx'> unsigned int ath10k_debug_mask;</div><div class='ctx'> EXPORT_SYMBOL(ath10k_debug_mask);</div><div class='hunk'>@@ -32,9 +36,11 @@ EXPORT_SYMBOL(ath10k_debug_mask);</div><div class='ctx'> static unsigned int ath10k_cryptmode_param;</div><div class='ctx'> static bool uart_print;</div><div class='ctx'> static bool skip_otp;</div><div class='del'>-static bool rawmode;</div><div class='ctx'> static bool fw_diag_log;</div><div class='ctx'> </div><div class='add'>+/* frame mode values are mapped as per enum ath10k_hw_txrx_mode */</div><div class='add'>+unsigned int ath10k_frame_mode = ATH10K_HW_TXRX_NATIVE_WIFI;</div><div class='add'>+</div><div class='ctx'> unsigned long ath10k_coredump_mask = BIT(ATH10K_FW_CRASH_DUMP_REGISTERS) |</div><div class='ctx'> 				     BIT(ATH10K_FW_CRASH_DUMP_CE_DATA);</div><div class='ctx'> </div><div class='hunk'>@@ -43,15 +49,16 @@ module_param_named(debug_mask, ath10k_debug_mask, uint, 0644);</div><div class='ctx'> module_param_named(cryptmode, ath10k_cryptmode_param, uint, 0644);</div><div class='ctx'> module_param(uart_print, bool, 0644);</div><div class='ctx'> module_param(skip_otp, bool, 0644);</div><div class='del'>-module_param(rawmode, bool, 0644);</div><div class='ctx'> module_param(fw_diag_log, bool, 0644);</div><div class='add'>+module_param_named(frame_mode, ath10k_frame_mode, uint, 0644);</div><div class='ctx'> module_param_named(coredump_mask, ath10k_coredump_mask, ulong, 0444);</div><div class='ctx'> </div><div class='ctx'> MODULE_PARM_DESC(debug_mask, "Debugging mask");</div><div class='ctx'> MODULE_PARM_DESC(uart_print, "Uart target debugging");</div><div class='ctx'> MODULE_PARM_DESC(skip_otp, "Skip otp failure for calibration in testmode");</div><div class='ctx'> MODULE_PARM_DESC(cryptmode, "Crypto mode: 0-hardware, 1-software");</div><div class='del'>-MODULE_PARM_DESC(rawmode, "Use raw 802.11 frame datapath");</div><div class='add'>+MODULE_PARM_DESC(frame_mode,</div><div class='add'>+		 "Datapath frame mode (0: raw, 1: native wifi (default), 2: ethernet)");</div><div class='ctx'> MODULE_PARM_DESC(coredump_mask, "Bitfield of what to include in firmware crash file");</div><div class='ctx'> MODULE_PARM_DESC(fw_diag_log, "Diag based fw log debugging");</div><div class='ctx'> </div><div class='hunk'>@@ -63,6 +70,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.name = "qca988x hw2.0",</div><div class='ctx'> 		.patch_load_addr = QCA988X_HW_2_0_PATCH_LOAD_ADDR,</div><div class='ctx'> 		.uart_pin = 7,</div><div class='add'>+		.led_pin = 1,</div><div class='ctx'> 		.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_ALL,</div><div class='ctx'> 		.otp_exe_param = 0,</div><div class='ctx'> 		.channel_counters_freq_hz = 88000,</div><div class='hunk'>@@ -70,10 +78,10 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.cal_data_len = 2116,</div><div class='ctx'> 		.fw = {</div><div class='ctx'> 			.dir = QCA988X_HW_2_0_FW_DIR,</div><div class='del'>-			.board = QCA988X_HW_2_0_BOARD_DATA_FILE,</div><div class='ctx'> 			.board_size = QCA988X_BOARD_DATA_SZ,</div><div class='ctx'> 			.board_ext_size = QCA988X_BOARD_EXT_DATA_SZ,</div><div class='ctx'> 		},</div><div class='add'>+		.rx_desc_ops = &amp;qca988x_rx_desc_ops,</div><div class='ctx'> 		.hw_ops = &amp;qca988x_ops,</div><div class='ctx'> 		.decap_align_bytes = 4,</div><div class='ctx'> 		.spectral_bin_discard = 0,</div><div class='hunk'>@@ -89,8 +97,13 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.rri_on_ddr = false,</div><div class='ctx'> 		.hw_filter_reset_required = true,</div><div class='ctx'> 		.fw_diag_ce_download = false,</div><div class='add'>+		.credit_size_workaround = false,</div><div class='ctx'> 		.tx_stats_over_pktlog = true,</div><div class='ctx'> 		.dynamic_sar_support = false,</div><div class='add'>+		.hw_restart_disconnect = false,</div><div class='add'>+		.use_fw_tx_credits = true,</div><div class='add'>+		.delay_unmap_buffer = false,</div><div class='add'>+		.mcast_frame_registration = false,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.id = QCA988X_HW_2_0_VERSION,</div><div class='hunk'>@@ -98,6 +111,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.name = "qca988x hw2.0 ubiquiti",</div><div class='ctx'> 		.patch_load_addr = QCA988X_HW_2_0_PATCH_LOAD_ADDR,</div><div class='ctx'> 		.uart_pin = 7,</div><div class='add'>+		.led_pin = 0,</div><div class='ctx'> 		.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_ALL,</div><div class='ctx'> 		.otp_exe_param = 0,</div><div class='ctx'> 		.channel_counters_freq_hz = 88000,</div><div class='hunk'>@@ -105,10 +119,10 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.cal_data_len = 2116,</div><div class='ctx'> 		.fw = {</div><div class='ctx'> 			.dir = QCA988X_HW_2_0_FW_DIR,</div><div class='del'>-			.board = QCA988X_HW_2_0_BOARD_DATA_FILE,</div><div class='ctx'> 			.board_size = QCA988X_BOARD_DATA_SZ,</div><div class='ctx'> 			.board_ext_size = QCA988X_BOARD_EXT_DATA_SZ,</div><div class='ctx'> 		},</div><div class='add'>+		.rx_desc_ops = &amp;qca988x_rx_desc_ops,</div><div class='ctx'> 		.hw_ops = &amp;qca988x_ops,</div><div class='ctx'> 		.decap_align_bytes = 4,</div><div class='ctx'> 		.spectral_bin_discard = 0,</div><div class='hunk'>@@ -124,8 +138,13 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.rri_on_ddr = false,</div><div class='ctx'> 		.hw_filter_reset_required = true,</div><div class='ctx'> 		.fw_diag_ce_download = false,</div><div class='add'>+		.credit_size_workaround = false,</div><div class='ctx'> 		.tx_stats_over_pktlog = true,</div><div class='ctx'> 		.dynamic_sar_support = false,</div><div class='add'>+		.hw_restart_disconnect = false,</div><div class='add'>+		.use_fw_tx_credits = true,</div><div class='add'>+		.delay_unmap_buffer = false,</div><div class='add'>+		.mcast_frame_registration = false,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.id = QCA9887_HW_1_0_VERSION,</div><div class='hunk'>@@ -134,6 +153,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.name = "qca9887 hw1.0",</div><div class='ctx'> 		.patch_load_addr = QCA9887_HW_1_0_PATCH_LOAD_ADDR,</div><div class='ctx'> 		.uart_pin = 7,</div><div class='add'>+		.led_pin = 1,</div><div class='ctx'> 		.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_ALL,</div><div class='ctx'> 		.otp_exe_param = 0,</div><div class='ctx'> 		.channel_counters_freq_hz = 88000,</div><div class='hunk'>@@ -141,10 +161,10 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.cal_data_len = 2116,</div><div class='ctx'> 		.fw = {</div><div class='ctx'> 			.dir = QCA9887_HW_1_0_FW_DIR,</div><div class='del'>-			.board = QCA9887_HW_1_0_BOARD_DATA_FILE,</div><div class='ctx'> 			.board_size = QCA9887_BOARD_DATA_SZ,</div><div class='ctx'> 			.board_ext_size = QCA9887_BOARD_EXT_DATA_SZ,</div><div class='ctx'> 		},</div><div class='add'>+		.rx_desc_ops = &amp;qca988x_rx_desc_ops,</div><div class='ctx'> 		.hw_ops = &amp;qca988x_ops,</div><div class='ctx'> 		.decap_align_bytes = 4,</div><div class='ctx'> 		.spectral_bin_discard = 0,</div><div class='hunk'>@@ -160,8 +180,13 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.rri_on_ddr = false,</div><div class='ctx'> 		.hw_filter_reset_required = true,</div><div class='ctx'> 		.fw_diag_ce_download = false,</div><div class='add'>+		.credit_size_workaround = false,</div><div class='ctx'> 		.tx_stats_over_pktlog = false,</div><div class='ctx'> 		.dynamic_sar_support = false,</div><div class='add'>+		.hw_restart_disconnect = false,</div><div class='add'>+		.use_fw_tx_credits = true,</div><div class='add'>+		.delay_unmap_buffer = false,</div><div class='add'>+		.mcast_frame_registration = false,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.id = QCA6174_HW_3_2_VERSION,</div><div class='hunk'>@@ -170,16 +195,17 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.name = "qca6174 hw3.2 sdio",</div><div class='ctx'> 		.patch_load_addr = QCA6174_HW_3_0_PATCH_LOAD_ADDR,</div><div class='ctx'> 		.uart_pin = 19,</div><div class='add'>+		.led_pin = 0,</div><div class='ctx'> 		.otp_exe_param = 0,</div><div class='ctx'> 		.channel_counters_freq_hz = 88000,</div><div class='ctx'> 		.max_probe_resp_desc_thres = 0,</div><div class='ctx'> 		.cal_data_len = 0,</div><div class='ctx'> 		.fw = {</div><div class='ctx'> 			.dir = QCA6174_HW_3_0_FW_DIR,</div><div class='del'>-			.board = QCA6174_HW_3_0_BOARD_DATA_FILE,</div><div class='ctx'> 			.board_size = QCA6174_BOARD_DATA_SZ,</div><div class='ctx'> 			.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,</div><div class='ctx'> 		},</div><div class='add'>+		.rx_desc_ops = &amp;qca988x_rx_desc_ops,</div><div class='ctx'> 		.hw_ops = &amp;qca6174_sdio_ops,</div><div class='ctx'> 		.hw_clk = qca6174_clk,</div><div class='ctx'> 		.target_cpu_freq = 176000000,</div><div class='hunk'>@@ -190,9 +216,14 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.num_wds_entries = 0x20,</div><div class='ctx'> 		.uart_pin_workaround = true,</div><div class='ctx'> 		.tx_stats_over_pktlog = false,</div><div class='add'>+		.credit_size_workaround = false,</div><div class='ctx'> 		.bmi_large_size_download = true,</div><div class='ctx'> 		.supports_peer_stats_info = true,</div><div class='ctx'> 		.dynamic_sar_support = true,</div><div class='add'>+		.hw_restart_disconnect = false,</div><div class='add'>+		.use_fw_tx_credits = true,</div><div class='add'>+		.delay_unmap_buffer = false,</div><div class='add'>+		.mcast_frame_registration = false,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.id = QCA6174_HW_2_1_VERSION,</div><div class='hunk'>@@ -201,16 +232,17 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.name = "qca6164 hw2.1",</div><div class='ctx'> 		.patch_load_addr = QCA6174_HW_2_1_PATCH_LOAD_ADDR,</div><div class='ctx'> 		.uart_pin = 6,</div><div class='add'>+		.led_pin = 0,</div><div class='ctx'> 		.otp_exe_param = 0,</div><div class='ctx'> 		.channel_counters_freq_hz = 88000,</div><div class='ctx'> 		.max_probe_resp_desc_thres = 0,</div><div class='ctx'> 		.cal_data_len = 8124,</div><div class='ctx'> 		.fw = {</div><div class='ctx'> 			.dir = QCA6174_HW_2_1_FW_DIR,</div><div class='del'>-			.board = QCA6174_HW_2_1_BOARD_DATA_FILE,</div><div class='ctx'> 			.board_size = QCA6174_BOARD_DATA_SZ,</div><div class='ctx'> 			.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,</div><div class='ctx'> 		},</div><div class='add'>+		.rx_desc_ops = &amp;qca988x_rx_desc_ops,</div><div class='ctx'> 		.hw_ops = &amp;qca988x_ops,</div><div class='ctx'> 		.decap_align_bytes = 4,</div><div class='ctx'> 		.spectral_bin_discard = 0,</div><div class='hunk'>@@ -226,8 +258,13 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.rri_on_ddr = false,</div><div class='ctx'> 		.hw_filter_reset_required = true,</div><div class='ctx'> 		.fw_diag_ce_download = false,</div><div class='add'>+		.credit_size_workaround = false,</div><div class='ctx'> 		.tx_stats_over_pktlog = false,</div><div class='ctx'> 		.dynamic_sar_support = false,</div><div class='add'>+		.hw_restart_disconnect = false,</div><div class='add'>+		.use_fw_tx_credits = true,</div><div class='add'>+		.delay_unmap_buffer = false,</div><div class='add'>+		.mcast_frame_registration = false,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.id = QCA6174_HW_2_1_VERSION,</div><div class='hunk'>@@ -236,16 +273,17 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.name = "qca6174 hw2.1",</div><div class='ctx'> 		.patch_load_addr = QCA6174_HW_2_1_PATCH_LOAD_ADDR,</div><div class='ctx'> 		.uart_pin = 6,</div><div class='add'>+		.led_pin = 0,</div><div class='ctx'> 		.otp_exe_param = 0,</div><div class='ctx'> 		.channel_counters_freq_hz = 88000,</div><div class='ctx'> 		.max_probe_resp_desc_thres = 0,</div><div class='ctx'> 		.cal_data_len = 8124,</div><div class='ctx'> 		.fw = {</div><div class='ctx'> 			.dir = QCA6174_HW_2_1_FW_DIR,</div><div class='del'>-			.board = QCA6174_HW_2_1_BOARD_DATA_FILE,</div><div class='ctx'> 			.board_size = QCA6174_BOARD_DATA_SZ,</div><div class='ctx'> 			.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,</div><div class='ctx'> 		},</div><div class='add'>+		.rx_desc_ops = &amp;qca988x_rx_desc_ops,</div><div class='ctx'> 		.hw_ops = &amp;qca988x_ops,</div><div class='ctx'> 		.decap_align_bytes = 4,</div><div class='ctx'> 		.spectral_bin_discard = 0,</div><div class='hunk'>@@ -261,8 +299,13 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.rri_on_ddr = false,</div><div class='ctx'> 		.hw_filter_reset_required = true,</div><div class='ctx'> 		.fw_diag_ce_download = false,</div><div class='add'>+		.credit_size_workaround = false,</div><div class='ctx'> 		.tx_stats_over_pktlog = false,</div><div class='ctx'> 		.dynamic_sar_support = false,</div><div class='add'>+		.hw_restart_disconnect = false,</div><div class='add'>+		.use_fw_tx_credits = true,</div><div class='add'>+		.delay_unmap_buffer = false,</div><div class='add'>+		.mcast_frame_registration = false,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.id = QCA6174_HW_3_0_VERSION,</div><div class='hunk'>@@ -271,16 +314,17 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.name = "qca6174 hw3.0",</div><div class='ctx'> 		.patch_load_addr = QCA6174_HW_3_0_PATCH_LOAD_ADDR,</div><div class='ctx'> 		.uart_pin = 6,</div><div class='add'>+		.led_pin = 0,</div><div class='ctx'> 		.otp_exe_param = 0,</div><div class='ctx'> 		.channel_counters_freq_hz = 88000,</div><div class='ctx'> 		.max_probe_resp_desc_thres = 0,</div><div class='ctx'> 		.cal_data_len = 8124,</div><div class='ctx'> 		.fw = {</div><div class='ctx'> 			.dir = QCA6174_HW_3_0_FW_DIR,</div><div class='del'>-			.board = QCA6174_HW_3_0_BOARD_DATA_FILE,</div><div class='ctx'> 			.board_size = QCA6174_BOARD_DATA_SZ,</div><div class='ctx'> 			.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,</div><div class='ctx'> 		},</div><div class='add'>+		.rx_desc_ops = &amp;qca988x_rx_desc_ops,</div><div class='ctx'> 		.hw_ops = &amp;qca988x_ops,</div><div class='ctx'> 		.decap_align_bytes = 4,</div><div class='ctx'> 		.spectral_bin_discard = 0,</div><div class='hunk'>@@ -296,8 +340,13 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.rri_on_ddr = false,</div><div class='ctx'> 		.hw_filter_reset_required = true,</div><div class='ctx'> 		.fw_diag_ce_download = false,</div><div class='add'>+		.credit_size_workaround = false,</div><div class='ctx'> 		.tx_stats_over_pktlog = false,</div><div class='ctx'> 		.dynamic_sar_support = false,</div><div class='add'>+		.hw_restart_disconnect = false,</div><div class='add'>+		.use_fw_tx_credits = true,</div><div class='add'>+		.delay_unmap_buffer = false,</div><div class='add'>+		.mcast_frame_registration = false,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.id = QCA6174_HW_3_2_VERSION,</div><div class='hunk'>@@ -306,6 +355,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.name = "qca6174 hw3.2",</div><div class='ctx'> 		.patch_load_addr = QCA6174_HW_3_0_PATCH_LOAD_ADDR,</div><div class='ctx'> 		.uart_pin = 6,</div><div class='add'>+		.led_pin = 0,</div><div class='ctx'> 		.otp_exe_param = 0,</div><div class='ctx'> 		.channel_counters_freq_hz = 88000,</div><div class='ctx'> 		.max_probe_resp_desc_thres = 0,</div><div class='hunk'>@@ -313,10 +363,10 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.fw = {</div><div class='ctx'> 			/* uses same binaries as hw3.0 */</div><div class='ctx'> 			.dir = QCA6174_HW_3_0_FW_DIR,</div><div class='del'>-			.board = QCA6174_HW_3_0_BOARD_DATA_FILE,</div><div class='ctx'> 			.board_size = QCA6174_BOARD_DATA_SZ,</div><div class='ctx'> 			.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,</div><div class='ctx'> 		},</div><div class='add'>+		.rx_desc_ops = &amp;qca988x_rx_desc_ops,</div><div class='ctx'> 		.hw_ops = &amp;qca6174_ops,</div><div class='ctx'> 		.hw_clk = qca6174_clk,</div><div class='ctx'> 		.target_cpu_freq = 176000000,</div><div class='hunk'>@@ -334,9 +384,14 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.rri_on_ddr = false,</div><div class='ctx'> 		.hw_filter_reset_required = true,</div><div class='ctx'> 		.fw_diag_ce_download = true,</div><div class='add'>+		.credit_size_workaround = false,</div><div class='ctx'> 		.tx_stats_over_pktlog = false,</div><div class='ctx'> 		.supports_peer_stats_info = true,</div><div class='ctx'> 		.dynamic_sar_support = true,</div><div class='add'>+		.hw_restart_disconnect = false,</div><div class='add'>+		.use_fw_tx_credits = true,</div><div class='add'>+		.delay_unmap_buffer = false,</div><div class='add'>+		.mcast_frame_registration = true,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.id = QCA99X0_HW_2_0_DEV_VERSION,</div><div class='hunk'>@@ -345,6 +400,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.name = "qca99x0 hw2.0",</div><div class='ctx'> 		.patch_load_addr = QCA99X0_HW_2_0_PATCH_LOAD_ADDR,</div><div class='ctx'> 		.uart_pin = 7,</div><div class='add'>+		.led_pin = 17,</div><div class='ctx'> 		.otp_exe_param = 0x00000700,</div><div class='ctx'> 		.continuous_frag_desc = true,</div><div class='ctx'> 		.cck_rate_map_rev2 = true,</div><div class='hunk'>@@ -356,11 +412,11 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.cal_data_len = 12064,</div><div class='ctx'> 		.fw = {</div><div class='ctx'> 			.dir = QCA99X0_HW_2_0_FW_DIR,</div><div class='del'>-			.board = QCA99X0_HW_2_0_BOARD_DATA_FILE,</div><div class='ctx'> 			.board_size = QCA99X0_BOARD_DATA_SZ,</div><div class='ctx'> 			.board_ext_size = QCA99X0_BOARD_EXT_DATA_SZ,</div><div class='ctx'> 		},</div><div class='ctx'> 		.sw_decrypt_mcast_mgmt = true,</div><div class='add'>+		.rx_desc_ops = &amp;qca99x0_rx_desc_ops,</div><div class='ctx'> 		.hw_ops = &amp;qca99x0_ops,</div><div class='ctx'> 		.decap_align_bytes = 1,</div><div class='ctx'> 		.spectral_bin_discard = 4,</div><div class='hunk'>@@ -376,8 +432,13 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.rri_on_ddr = false,</div><div class='ctx'> 		.hw_filter_reset_required = true,</div><div class='ctx'> 		.fw_diag_ce_download = false,</div><div class='add'>+		.credit_size_workaround = false,</div><div class='ctx'> 		.tx_stats_over_pktlog = false,</div><div class='ctx'> 		.dynamic_sar_support = false,</div><div class='add'>+		.hw_restart_disconnect = false,</div><div class='add'>+		.use_fw_tx_credits = true,</div><div class='add'>+		.delay_unmap_buffer = false,</div><div class='add'>+		.mcast_frame_registration = false,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.id = QCA9984_HW_1_0_DEV_VERSION,</div><div class='hunk'>@@ -386,6 +447,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.name = "qca9984/qca9994 hw1.0",</div><div class='ctx'> 		.patch_load_addr = QCA9984_HW_1_0_PATCH_LOAD_ADDR,</div><div class='ctx'> 		.uart_pin = 7,</div><div class='add'>+		.led_pin = 17,</div><div class='ctx'> 		.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH,</div><div class='ctx'> 		.otp_exe_param = 0x00000700,</div><div class='ctx'> 		.continuous_frag_desc = true,</div><div class='hunk'>@@ -398,13 +460,12 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.cal_data_len = 12064,</div><div class='ctx'> 		.fw = {</div><div class='ctx'> 			.dir = QCA9984_HW_1_0_FW_DIR,</div><div class='del'>-			.board = QCA9984_HW_1_0_BOARD_DATA_FILE,</div><div class='del'>-			.eboard = QCA9984_HW_1_0_EBOARD_DATA_FILE,</div><div class='ctx'> 			.board_size = QCA99X0_BOARD_DATA_SZ,</div><div class='ctx'> 			.board_ext_size = QCA99X0_BOARD_EXT_DATA_SZ,</div><div class='ctx'> 			.ext_board_size = QCA99X0_EXT_BOARD_DATA_SZ,</div><div class='ctx'> 		},</div><div class='ctx'> 		.sw_decrypt_mcast_mgmt = true,</div><div class='add'>+		.rx_desc_ops = &amp;qca99x0_rx_desc_ops,</div><div class='ctx'> 		.hw_ops = &amp;qca99x0_ops,</div><div class='ctx'> 		.decap_align_bytes = 1,</div><div class='ctx'> 		.spectral_bin_discard = 12,</div><div class='hunk'>@@ -424,8 +485,13 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.rri_on_ddr = false,</div><div class='ctx'> 		.hw_filter_reset_required = true,</div><div class='ctx'> 		.fw_diag_ce_download = false,</div><div class='add'>+		.credit_size_workaround = false,</div><div class='ctx'> 		.tx_stats_over_pktlog = false,</div><div class='ctx'> 		.dynamic_sar_support = false,</div><div class='add'>+		.hw_restart_disconnect = false,</div><div class='add'>+		.use_fw_tx_credits = true,</div><div class='add'>+		.delay_unmap_buffer = false,</div><div class='add'>+		.mcast_frame_registration = false,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.id = QCA9888_HW_2_0_DEV_VERSION,</div><div class='hunk'>@@ -434,6 +500,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.name = "qca9888 hw2.0",</div><div class='ctx'> 		.patch_load_addr = QCA9888_HW_2_0_PATCH_LOAD_ADDR,</div><div class='ctx'> 		.uart_pin = 7,</div><div class='add'>+		.led_pin = 17,</div><div class='ctx'> 		.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH,</div><div class='ctx'> 		.otp_exe_param = 0x00000700,</div><div class='ctx'> 		.continuous_frag_desc = true,</div><div class='hunk'>@@ -445,11 +512,11 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.cal_data_len = 12064,</div><div class='ctx'> 		.fw = {</div><div class='ctx'> 			.dir = QCA9888_HW_2_0_FW_DIR,</div><div class='del'>-			.board = QCA9888_HW_2_0_BOARD_DATA_FILE,</div><div class='ctx'> 			.board_size = QCA99X0_BOARD_DATA_SZ,</div><div class='ctx'> 			.board_ext_size = QCA99X0_BOARD_EXT_DATA_SZ,</div><div class='ctx'> 		},</div><div class='ctx'> 		.sw_decrypt_mcast_mgmt = true,</div><div class='add'>+		.rx_desc_ops = &amp;qca99x0_rx_desc_ops,</div><div class='ctx'> 		.hw_ops = &amp;qca99x0_ops,</div><div class='ctx'> 		.decap_align_bytes = 1,</div><div class='ctx'> 		.spectral_bin_discard = 12,</div><div class='hunk'>@@ -469,8 +536,13 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.rri_on_ddr = false,</div><div class='ctx'> 		.hw_filter_reset_required = true,</div><div class='ctx'> 		.fw_diag_ce_download = false,</div><div class='add'>+		.credit_size_workaround = false,</div><div class='ctx'> 		.tx_stats_over_pktlog = false,</div><div class='ctx'> 		.dynamic_sar_support = false,</div><div class='add'>+		.hw_restart_disconnect = false,</div><div class='add'>+		.use_fw_tx_credits = true,</div><div class='add'>+		.delay_unmap_buffer = false,</div><div class='add'>+		.mcast_frame_registration = false,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.id = QCA9377_HW_1_0_DEV_VERSION,</div><div class='hunk'>@@ -479,16 +551,17 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.name = "qca9377 hw1.0",</div><div class='ctx'> 		.patch_load_addr = QCA9377_HW_1_0_PATCH_LOAD_ADDR,</div><div class='ctx'> 		.uart_pin = 6,</div><div class='add'>+		.led_pin = 0,</div><div class='ctx'> 		.otp_exe_param = 0,</div><div class='ctx'> 		.channel_counters_freq_hz = 88000,</div><div class='ctx'> 		.max_probe_resp_desc_thres = 0,</div><div class='ctx'> 		.cal_data_len = 8124,</div><div class='ctx'> 		.fw = {</div><div class='ctx'> 			.dir = QCA9377_HW_1_0_FW_DIR,</div><div class='del'>-			.board = QCA9377_HW_1_0_BOARD_DATA_FILE,</div><div class='ctx'> 			.board_size = QCA9377_BOARD_DATA_SZ,</div><div class='ctx'> 			.board_ext_size = QCA9377_BOARD_EXT_DATA_SZ,</div><div class='ctx'> 		},</div><div class='add'>+		.rx_desc_ops = &amp;qca988x_rx_desc_ops,</div><div class='ctx'> 		.hw_ops = &amp;qca988x_ops,</div><div class='ctx'> 		.decap_align_bytes = 4,</div><div class='ctx'> 		.spectral_bin_discard = 0,</div><div class='hunk'>@@ -504,8 +577,13 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.rri_on_ddr = false,</div><div class='ctx'> 		.hw_filter_reset_required = true,</div><div class='ctx'> 		.fw_diag_ce_download = false,</div><div class='add'>+		.credit_size_workaround = false,</div><div class='ctx'> 		.tx_stats_over_pktlog = false,</div><div class='ctx'> 		.dynamic_sar_support = false,</div><div class='add'>+		.hw_restart_disconnect = false,</div><div class='add'>+		.use_fw_tx_credits = true,</div><div class='add'>+		.delay_unmap_buffer = false,</div><div class='add'>+		.mcast_frame_registration = false,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.id = QCA9377_HW_1_1_DEV_VERSION,</div><div class='hunk'>@@ -514,16 +592,17 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.name = "qca9377 hw1.1",</div><div class='ctx'> 		.patch_load_addr = QCA9377_HW_1_0_PATCH_LOAD_ADDR,</div><div class='ctx'> 		.uart_pin = 6,</div><div class='add'>+		.led_pin = 0,</div><div class='ctx'> 		.otp_exe_param = 0,</div><div class='ctx'> 		.channel_counters_freq_hz = 88000,</div><div class='ctx'> 		.max_probe_resp_desc_thres = 0,</div><div class='ctx'> 		.cal_data_len = 8124,</div><div class='ctx'> 		.fw = {</div><div class='ctx'> 			.dir = QCA9377_HW_1_0_FW_DIR,</div><div class='del'>-			.board = QCA9377_HW_1_0_BOARD_DATA_FILE,</div><div class='ctx'> 			.board_size = QCA9377_BOARD_DATA_SZ,</div><div class='ctx'> 			.board_ext_size = QCA9377_BOARD_EXT_DATA_SZ,</div><div class='ctx'> 		},</div><div class='add'>+		.rx_desc_ops = &amp;qca988x_rx_desc_ops,</div><div class='ctx'> 		.hw_ops = &amp;qca6174_ops,</div><div class='ctx'> 		.hw_clk = qca6174_clk,</div><div class='ctx'> 		.target_cpu_freq = 176000000,</div><div class='hunk'>@@ -541,8 +620,13 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.rri_on_ddr = false,</div><div class='ctx'> 		.hw_filter_reset_required = true,</div><div class='ctx'> 		.fw_diag_ce_download = true,</div><div class='add'>+		.credit_size_workaround = false,</div><div class='ctx'> 		.tx_stats_over_pktlog = false,</div><div class='ctx'> 		.dynamic_sar_support = false,</div><div class='add'>+		.hw_restart_disconnect = false,</div><div class='add'>+		.use_fw_tx_credits = true,</div><div class='add'>+		.delay_unmap_buffer = false,</div><div class='add'>+		.mcast_frame_registration = false,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.id = QCA9377_HW_1_1_DEV_VERSION,</div><div class='hunk'>@@ -551,16 +635,17 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.name = "qca9377 hw1.1 sdio",</div><div class='ctx'> 		.patch_load_addr = QCA9377_HW_1_0_PATCH_LOAD_ADDR,</div><div class='ctx'> 		.uart_pin = 19,</div><div class='add'>+		.led_pin = 0,</div><div class='ctx'> 		.otp_exe_param = 0,</div><div class='ctx'> 		.channel_counters_freq_hz = 88000,</div><div class='ctx'> 		.max_probe_resp_desc_thres = 0,</div><div class='ctx'> 		.cal_data_len = 8124,</div><div class='ctx'> 		.fw = {</div><div class='ctx'> 			.dir = QCA9377_HW_1_0_FW_DIR,</div><div class='del'>-			.board = QCA9377_HW_1_0_BOARD_DATA_FILE,</div><div class='ctx'> 			.board_size = QCA9377_BOARD_DATA_SZ,</div><div class='ctx'> 			.board_ext_size = QCA9377_BOARD_EXT_DATA_SZ,</div><div class='ctx'> 		},</div><div class='add'>+		.rx_desc_ops = &amp;qca988x_rx_desc_ops,</div><div class='ctx'> 		.hw_ops = &amp;qca6174_ops,</div><div class='ctx'> 		.hw_clk = qca6174_clk,</div><div class='ctx'> 		.target_cpu_freq = 176000000,</div><div class='hunk'>@@ -570,7 +655,12 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.ast_skid_limit = 0x10,</div><div class='ctx'> 		.num_wds_entries = 0x20,</div><div class='ctx'> 		.uart_pin_workaround = true,</div><div class='add'>+		.credit_size_workaround = true,</div><div class='ctx'> 		.dynamic_sar_support = false,</div><div class='add'>+		.hw_restart_disconnect = false,</div><div class='add'>+		.use_fw_tx_credits = true,</div><div class='add'>+		.delay_unmap_buffer = false,</div><div class='add'>+		.mcast_frame_registration = false,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.id = QCA4019_HW_1_0_DEV_VERSION,</div><div class='hunk'>@@ -579,6 +669,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.name = "qca4019 hw1.0",</div><div class='ctx'> 		.patch_load_addr = QCA4019_HW_1_0_PATCH_LOAD_ADDR,</div><div class='ctx'> 		.uart_pin = 7,</div><div class='add'>+		.led_pin = 0,</div><div class='ctx'> 		.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH,</div><div class='ctx'> 		.otp_exe_param = 0x0010000,</div><div class='ctx'> 		.continuous_frag_desc = true,</div><div class='hunk'>@@ -591,11 +682,11 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.cal_data_len = 12064,</div><div class='ctx'> 		.fw = {</div><div class='ctx'> 			.dir = QCA4019_HW_1_0_FW_DIR,</div><div class='del'>-			.board = QCA4019_HW_1_0_BOARD_DATA_FILE,</div><div class='ctx'> 			.board_size = QCA4019_BOARD_DATA_SZ,</div><div class='ctx'> 			.board_ext_size = QCA4019_BOARD_EXT_DATA_SZ,</div><div class='ctx'> 		},</div><div class='ctx'> 		.sw_decrypt_mcast_mgmt = true,</div><div class='add'>+		.rx_desc_ops = &amp;qca99x0_rx_desc_ops,</div><div class='ctx'> 		.hw_ops = &amp;qca99x0_ops,</div><div class='ctx'> 		.decap_align_bytes = 1,</div><div class='ctx'> 		.spectral_bin_discard = 4,</div><div class='hunk'>@@ -611,22 +702,31 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.rri_on_ddr = false,</div><div class='ctx'> 		.hw_filter_reset_required = true,</div><div class='ctx'> 		.fw_diag_ce_download = false,</div><div class='add'>+		.credit_size_workaround = false,</div><div class='ctx'> 		.tx_stats_over_pktlog = false,</div><div class='ctx'> 		.dynamic_sar_support = false,</div><div class='add'>+		.hw_restart_disconnect = false,</div><div class='add'>+		.use_fw_tx_credits = true,</div><div class='add'>+		.delay_unmap_buffer = false,</div><div class='add'>+		.mcast_frame_registration = false,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.id = WCN3990_HW_1_0_DEV_VERSION,</div><div class='ctx'> 		.dev_id = 0,</div><div class='ctx'> 		.bus = ATH10K_BUS_SNOC,</div><div class='ctx'> 		.name = "wcn3990 hw1.0",</div><div class='add'>+		.led_pin = 0,</div><div class='ctx'> 		.continuous_frag_desc = true,</div><div class='ctx'> 		.tx_chain_mask = 0x7,</div><div class='ctx'> 		.rx_chain_mask = 0x7,</div><div class='ctx'> 		.max_spatial_stream = 4,</div><div class='ctx'> 		.fw = {</div><div class='ctx'> 			.dir = WCN3990_HW_1_0_FW_DIR,</div><div class='add'>+			.board_size = WCN3990_BOARD_DATA_SZ,</div><div class='add'>+			.board_ext_size = WCN3990_BOARD_EXT_DATA_SZ,</div><div class='ctx'> 		},</div><div class='ctx'> 		.sw_decrypt_mcast_mgmt = true,</div><div class='add'>+		.rx_desc_ops = &amp;wcn3990_rx_desc_ops,</div><div class='ctx'> 		.hw_ops = &amp;wcn3990_ops,</div><div class='ctx'> 		.decap_align_bytes = 1,</div><div class='ctx'> 		.num_peers = TARGET_HL_TLV_NUM_PEERS,</div><div class='hunk'>@@ -639,8 +739,13 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {</div><div class='ctx'> 		.rri_on_ddr = true,</div><div class='ctx'> 		.hw_filter_reset_required = false,</div><div class='ctx'> 		.fw_diag_ce_download = false,</div><div class='add'>+		.credit_size_workaround = false,</div><div class='ctx'> 		.tx_stats_over_pktlog = false,</div><div class='ctx'> 		.dynamic_sar_support = true,</div><div class='add'>+		.hw_restart_disconnect = true,</div><div class='add'>+		.use_fw_tx_credits = false,</div><div class='add'>+		.delay_unmap_buffer = true,</div><div class='add'>+		.mcast_frame_registration = false,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -714,6 +819,7 @@ static void ath10k_send_suspend_complete(struct ath10k *ar)</div><div class='ctx'> </div><div class='ctx'> static int ath10k_init_sdio(struct ath10k *ar, enum ath10k_firmware_mode mode)</div><div class='ctx'> {</div><div class='add'>+	bool mtu_workaround = ar-&gt;hw_params.credit_size_workaround;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 param = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -731,7 +837,7 @@ static int ath10k_init_sdio(struct ath10k *ar, enum ath10k_firmware_mode mode)</div><div class='ctx'> </div><div class='ctx'> 	param |= HI_ACS_FLAGS_SDIO_REDUCE_TX_COMPL_SET;</div><div class='ctx'> </div><div class='del'>-	if (mode == ATH10K_FIRMWARE_MODE_NORMAL)</div><div class='add'>+	if (mode == ATH10K_FIRMWARE_MODE_NORMAL &amp;&amp; !mtu_workaround)</div><div class='ctx'> 		param |= HI_ACS_FLAGS_ALT_DATA_CREDIT_SIZE;</div><div class='ctx'> 	else</div><div class='ctx'> 		param &amp;= ~HI_ACS_FLAGS_ALT_DATA_CREDIT_SIZE;</div><div class='hunk'>@@ -840,11 +946,20 @@ static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar,</div><div class='ctx'> 	if (dir == NULL)</div><div class='ctx'> 		dir = ".";</div><div class='ctx'> </div><div class='add'>+	if (ar-&gt;board_name) {</div><div class='add'>+		snprintf(filename, sizeof(filename), "%s/%s/%s",</div><div class='add'>+			 dir, ar-&gt;board_name, file);</div><div class='add'>+		ret = firmware_request_nowarn(&amp;fw, filename, ar-&gt;dev);</div><div class='add'>+		ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n",</div><div class='add'>+			   filename, ret);</div><div class='add'>+		if (!ret)</div><div class='add'>+			return fw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	snprintf(filename, sizeof(filename), "%s/%s", dir, file);</div><div class='ctx'> 	ret = firmware_request_nowarn(&amp;fw, filename, ar-&gt;dev);</div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n",</div><div class='ctx'> 		   filename, ret);</div><div class='del'>-</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='ctx'> </div><div class='hunk'>@@ -935,7 +1050,8 @@ static int ath10k_core_get_board_id_from_otp(struct ath10k *ar)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ar-&gt;cal_mode == ATH10K_PRE_CAL_MODE_DT ||</div><div class='del'>-	    ar-&gt;cal_mode == ATH10K_PRE_CAL_MODE_FILE)</div><div class='add'>+	    ar-&gt;cal_mode == ATH10K_PRE_CAL_MODE_FILE ||</div><div class='add'>+	    ar-&gt;cal_mode == ATH10K_PRE_CAL_MODE_NVMEM)</div><div class='ctx'> 		bmi_board_id_param = BMI_PARAM_GET_FLASH_BOARD_ID;</div><div class='ctx'> 	else</div><div class='ctx'> 		bmi_board_id_param = BMI_PARAM_GET_EEPROM_BOARD_ID;</div><div class='hunk'>@@ -1048,9 +1164,12 @@ int ath10k_core_check_dt(struct ath10k *ar)</div><div class='ctx'> 	if (!node)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	of_property_read_string(node, "qcom,ath10k-calibration-variant",</div><div class='add'>+	of_property_read_string(node, "qcom,calibration-variant",</div><div class='ctx'> 				&amp;variant);</div><div class='ctx'> 	if (!variant)</div><div class='add'>+		of_property_read_string(node, "qcom,ath10k-calibration-variant",</div><div class='add'>+					&amp;variant);</div><div class='add'>+	if (!variant)</div><div class='ctx'> 		return -ENODATA;</div><div class='ctx'> </div><div class='ctx'> 	if (strscpy(ar-&gt;id.bdf_ext, variant, sizeof(ar-&gt;id.bdf_ext)) &lt; 0)</div><div class='hunk'>@@ -1067,7 +1186,7 @@ static int ath10k_download_fw(struct ath10k *ar)</div><div class='ctx'> 	u32 address, data_len;</div><div class='ctx'> 	const void *data;</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct pm_qos_request latency_qos;</div><div class='add'>+	struct pm_qos_request latency_qos = {};</div><div class='ctx'> </div><div class='ctx'> 	address = ar-&gt;hw_params.patch_load_addr;</div><div class='ctx'> </div><div class='hunk'>@@ -1082,7 +1201,7 @@ static int ath10k_download_fw(struct ath10k *ar)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_BOOT,</div><div class='del'>-		   "boot uploading firmware image %pK len %d\n",</div><div class='add'>+		   "boot uploading firmware image %p len %d\n",</div><div class='ctx'> 		   data, data_len);</div><div class='ctx'> </div><div class='ctx'> 	/* Check if device supports to download firmware via</div><div class='hunk'>@@ -1101,7 +1220,6 @@ static int ath10k_download_fw(struct ath10k *ar)</div><div class='ctx'> 			    ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(&amp;latency_qos, 0, sizeof(latency_qos));</div><div class='ctx'> 	cpu_latency_qos_add_request(&amp;latency_qos, 0);</div><div class='ctx'> </div><div class='ctx'> 	ret = ath10k_bmi_fast_download(ar, address, data, data_len);</div><div class='hunk'>@@ -1182,29 +1300,30 @@ success:</div><div class='ctx'> static int ath10k_core_fetch_board_data_api_1(struct ath10k *ar, int bd_ie_type)</div><div class='ctx'> {</div><div class='ctx'> 	const struct firmware *fw;</div><div class='add'>+	char boardname[100];</div><div class='ctx'> </div><div class='ctx'> 	if (bd_ie_type == ATH10K_BD_IE_BOARD) {</div><div class='del'>-		if (!ar-&gt;hw_params.fw.board) {</div><div class='del'>-			ath10k_err(ar, "failed to find board file fw entry\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='add'>+		scnprintf(boardname, sizeof(boardname), "board-%s-%s.bin",</div><div class='add'>+			  ath10k_bus_str(ar-&gt;hif.bus), dev_name(ar-&gt;dev));</div><div class='ctx'> </div><div class='ctx'> 		ar-&gt;normal_mode_fw.board = ath10k_fetch_fw_file(ar,</div><div class='ctx'> 								ar-&gt;hw_params.fw.dir,</div><div class='del'>-								ar-&gt;hw_params.fw.board);</div><div class='add'>+								boardname);</div><div class='add'>+		if (IS_ERR(ar-&gt;normal_mode_fw.board)) {</div><div class='add'>+			fw = ath10k_fetch_fw_file(ar,</div><div class='add'>+						  ar-&gt;hw_params.fw.dir,</div><div class='add'>+						  ATH10K_BOARD_DATA_FILE);</div><div class='add'>+			ar-&gt;normal_mode_fw.board = fw;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (IS_ERR(ar-&gt;normal_mode_fw.board))</div><div class='ctx'> 			return PTR_ERR(ar-&gt;normal_mode_fw.board);</div><div class='ctx'> </div><div class='ctx'> 		ar-&gt;normal_mode_fw.board_data = ar-&gt;normal_mode_fw.board-&gt;data;</div><div class='ctx'> 		ar-&gt;normal_mode_fw.board_len = ar-&gt;normal_mode_fw.board-&gt;size;</div><div class='ctx'> 	} else if (bd_ie_type == ATH10K_BD_IE_BOARD_EXT) {</div><div class='del'>-		if (!ar-&gt;hw_params.fw.eboard) {</div><div class='del'>-			ath10k_err(ar, "failed to find eboard file fw entry\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		fw = ath10k_fetch_fw_file(ar, ar-&gt;hw_params.fw.dir,</div><div class='del'>-					  ar-&gt;hw_params.fw.eboard);</div><div class='add'>+					  ATH10K_EBOARD_DATA_FILE);</div><div class='ctx'> 		ar-&gt;normal_mode_fw.ext_board = fw;</div><div class='ctx'> 		if (IS_ERR(ar-&gt;normal_mode_fw.ext_board))</div><div class='ctx'> 			return PTR_ERR(ar-&gt;normal_mode_fw.ext_board);</div><div class='hunk'>@@ -1444,7 +1563,7 @@ static int ath10k_core_create_board_name(struct ath10k *ar, char *name,</div><div class='ctx'> 					 bool with_chip_id)</div><div class='ctx'> {</div><div class='ctx'> 	/* strlen(',variant=') + strlen(ar-&gt;id.bdf_ext) */</div><div class='del'>-	char variant[9 + ATH10K_SMBIOS_BDF_EXT_STR_LENGTH] = { 0 };</div><div class='add'>+	char variant[9 + ATH10K_SMBIOS_BDF_EXT_STR_LENGTH] = {};</div><div class='ctx'> </div><div class='ctx'> 	if (with_variant &amp;&amp; ar-&gt;id.bdf_ext[0] != '\0')</div><div class='ctx'> 		scnprintf(variant, sizeof(variant), ",variant=%s",</div><div class='hunk'>@@ -1707,7 +1826,7 @@ static int ath10k_download_and_run_otp(struct ath10k *ar)</div><div class='ctx'> </div><div class='ctx'> 	if (!ar-&gt;running_fw-&gt;fw_file.otp_data ||</div><div class='ctx'> 	    !ar-&gt;running_fw-&gt;fw_file.otp_len) {</div><div class='del'>-		ath10k_warn(ar, "Not running otp, calibration will be incorrect (otp-data %pK otp_len %zd)!\n",</div><div class='add'>+		ath10k_warn(ar, "Not running otp, calibration will be incorrect (otp-data %p otp_len %zd)!\n",</div><div class='ctx'> 			    ar-&gt;running_fw-&gt;fw_file.otp_data,</div><div class='ctx'> 			    ar-&gt;running_fw-&gt;fw_file.otp_len);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1726,7 +1845,8 @@ static int ath10k_download_and_run_otp(struct ath10k *ar)</div><div class='ctx'> </div><div class='ctx'> 	/* As of now pre-cal is valid for 10_4 variants */</div><div class='ctx'> 	if (ar-&gt;cal_mode == ATH10K_PRE_CAL_MODE_DT ||</div><div class='del'>-	    ar-&gt;cal_mode == ATH10K_PRE_CAL_MODE_FILE)</div><div class='add'>+	    ar-&gt;cal_mode == ATH10K_PRE_CAL_MODE_FILE ||</div><div class='add'>+	    ar-&gt;cal_mode == ATH10K_PRE_CAL_MODE_NVMEM)</div><div class='ctx'> 		bmi_otp_exe_param = BMI_PARAM_FLASH_SECTION_ALL;</div><div class='ctx'> </div><div class='ctx'> 	ret = ath10k_bmi_execute(ar, address, bmi_otp_exe_param, &amp;result);</div><div class='hunk'>@@ -1853,6 +1973,39 @@ out_free:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ath10k_download_cal_nvmem(struct ath10k *ar, const char *cell_name)</div><div class='add'>+{</div><div class='add'>+	struct nvmem_cell *cell;</div><div class='add'>+	void *buf;</div><div class='add'>+	size_t len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cell = devm_nvmem_cell_get(ar-&gt;dev, cell_name);</div><div class='add'>+	if (IS_ERR(cell)) {</div><div class='add'>+		ret = PTR_ERR(cell);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buf = nvmem_cell_read(cell, &amp;len);</div><div class='add'>+	if (IS_ERR(buf))</div><div class='add'>+		return PTR_ERR(buf);</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;hw_params.cal_data_len != len) {</div><div class='add'>+		kfree(buf);</div><div class='add'>+		ath10k_warn(ar, "invalid calibration data length in nvmem-cell '%s': %zu != %u\n",</div><div class='add'>+			    cell_name, len, ar-&gt;hw_params.cal_data_len);</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath10k_download_board_data(ar, buf, len);</div><div class='add'>+	kfree(buf);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath10k_warn(ar, "failed to download calibration data from nvmem-cell '%s': %d\n",</div><div class='add'>+			    cell_name, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name,</div><div class='ctx'> 				     struct ath10k_fw_file *fw_file)</div><div class='ctx'> {</div><div class='hunk'>@@ -2087,6 +2240,18 @@ static int ath10k_core_pre_cal_download(struct ath10k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	ret = ath10k_download_cal_nvmem(ar, "pre-calibration");</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		ar-&gt;cal_mode = ATH10K_PRE_CAL_MODE_NVMEM;</div><div class='add'>+		goto success;</div><div class='add'>+	} else if (ret == -EPROBE_DEFER) {</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath10k_dbg(ar, ATH10K_DBG_BOOT,</div><div class='add'>+		   "boot did not find a pre-calibration nvmem-cell, try file next: %d\n",</div><div class='add'>+		   ret);</div><div class='add'>+</div><div class='ctx'> 	ret = ath10k_download_cal_file(ar, ar-&gt;pre_cal_file);</div><div class='ctx'> 	if (ret == 0) {</div><div class='ctx'> 		ar-&gt;cal_mode = ATH10K_PRE_CAL_MODE_FILE;</div><div class='hunk'>@@ -2097,7 +2262,9 @@ static int ath10k_core_pre_cal_download(struct ath10k *ar)</div><div class='ctx'> 		   "boot did not find a pre calibration file, try DT next: %d\n",</div><div class='ctx'> 		   ret);</div><div class='ctx'> </div><div class='del'>-	ret = ath10k_download_cal_dt(ar, "qcom,ath10k-pre-calibration-data");</div><div class='add'>+	ret = ath10k_download_cal_dt(ar, "qcom,pre-calibration-data");</div><div class='add'>+	if (ret == -ENOENT)</div><div class='add'>+		ret = ath10k_download_cal_dt(ar, "qcom,ath10k-pre-calibration-data");</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath10k_dbg(ar, ATH10K_DBG_BOOT,</div><div class='ctx'> 			   "unable to load pre cal data from DT: %d\n", ret);</div><div class='hunk'>@@ -2153,6 +2320,18 @@ static int ath10k_download_cal_data(struct ath10k *ar)</div><div class='ctx'> 		   "pre cal download procedure failed, try cal file: %d\n",</div><div class='ctx'> 		   ret);</div><div class='ctx'> </div><div class='add'>+	ret = ath10k_download_cal_nvmem(ar, "calibration");</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		ar-&gt;cal_mode = ATH10K_CAL_MODE_NVMEM;</div><div class='add'>+		goto done;</div><div class='add'>+	} else if (ret == -EPROBE_DEFER) {</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath10k_dbg(ar, ATH10K_DBG_BOOT,</div><div class='add'>+		   "boot did not find a calibration nvmem-cell, try file next: %d\n",</div><div class='add'>+		   ret);</div><div class='add'>+</div><div class='ctx'> 	ret = ath10k_download_cal_file(ar, ar-&gt;cal_file);</div><div class='ctx'> 	if (ret == 0) {</div><div class='ctx'> 		ar-&gt;cal_mode = ATH10K_CAL_MODE_FILE;</div><div class='hunk'>@@ -2163,7 +2342,9 @@ static int ath10k_download_cal_data(struct ath10k *ar)</div><div class='ctx'> 		   "boot did not find a calibration file, try DT next: %d\n",</div><div class='ctx'> 		   ret);</div><div class='ctx'> </div><div class='del'>-	ret = ath10k_download_cal_dt(ar, "qcom,ath10k-calibration-data");</div><div class='add'>+	ret = ath10k_download_cal_dt(ar, "qcom,calibration-data");</div><div class='add'>+	if (ret == -ENOENT)</div><div class='add'>+		ret = ath10k_download_cal_dt(ar, "qcom,ath10k-calibration-data");</div><div class='ctx'> 	if (ret == 0) {</div><div class='ctx'> 		ar-&gt;cal_mode = ATH10K_CAL_MODE_DT;</div><div class='ctx'> 		goto done;</div><div class='hunk'>@@ -2310,15 +2491,51 @@ static int ath10k_init_hw_params(struct ath10k *ar)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath10k_core_start_recovery(struct ath10k *ar)</div><div class='add'>+static void ath10k_core_recovery_check_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	if (test_and_set_bit(ATH10K_FLAG_RESTARTING, &amp;ar-&gt;dev_flags)) {</div><div class='del'>-		ath10k_warn(ar, "already restarting\n");</div><div class='add'>+	struct ath10k *ar = container_of(work, struct ath10k, recovery_check_work);</div><div class='add'>+	long time_left;</div><div class='add'>+</div><div class='add'>+	/* Sometimes the recovery will fail and then the next all recovery fail,</div><div class='add'>+	 * so avoid infinite recovery.</div><div class='add'>+	 */</div><div class='add'>+	if (atomic_read(&amp;ar-&gt;fail_cont_count) &gt;= ATH10K_RECOVERY_MAX_FAIL_COUNT) {</div><div class='add'>+		ath10k_err(ar, "consecutive fail %d times, will shutdown driver!",</div><div class='add'>+			   atomic_read(&amp;ar-&gt;fail_cont_count));</div><div class='add'>+		ar-&gt;state = ATH10K_STATE_WEDGED;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath10k_dbg(ar, ATH10K_DBG_BOOT, "total recovery count: %d", ++ar-&gt;recovery_count);</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;ar-&gt;pending_recovery)) {</div><div class='add'>+		/* Sometimes it happened another recovery work before the previous one</div><div class='add'>+		 * completed, then the second recovery work will destroy the previous</div><div class='add'>+		 * one, thus below is to avoid that.</div><div class='add'>+		 */</div><div class='add'>+		time_left = wait_for_completion_timeout(&amp;ar-&gt;driver_recovery,</div><div class='add'>+							ATH10K_RECOVERY_TIMEOUT_HZ);</div><div class='add'>+		if (time_left) {</div><div class='add'>+			ath10k_warn(ar, "previous recovery succeeded, skip this!\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Record the continuous recovery fail count when recovery failed. */</div><div class='add'>+		atomic_inc(&amp;ar-&gt;fail_cont_count);</div><div class='add'>+</div><div class='add'>+		/* Avoid having multiple recoveries at the same time. */</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	atomic_inc(&amp;ar-&gt;pending_recovery);</div><div class='ctx'> 	queue_work(ar-&gt;workqueue, &amp;ar-&gt;restart_work);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void ath10k_core_start_recovery(struct ath10k *ar)</div><div class='add'>+{</div><div class='add'>+	/* Use workqueue_aux to avoid blocking recovery tracking */</div><div class='add'>+	queue_work(ar-&gt;workqueue_aux, &amp;ar-&gt;recovery_check_work);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(ath10k_core_start_recovery);</div><div class='ctx'> </div><div class='ctx'> void ath10k_core_napi_enable(struct ath10k *ar)</div><div class='hunk'>@@ -2351,6 +2568,8 @@ static void ath10k_core_restart(struct work_struct *work)</div><div class='ctx'> 	struct ath10k *ar = container_of(work, struct ath10k, restart_work);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	reinit_completion(&amp;ar-&gt;driver_recovery);</div><div class='add'>+</div><div class='ctx'> 	set_bit(ATH10K_FLAG_CRASH_FLUSH, &amp;ar-&gt;dev_flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Place a barrier to make sure the compiler doesn't reorder</div><div class='hunk'>@@ -2415,8 +2634,6 @@ static void ath10k_core_restart(struct work_struct *work)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		ath10k_warn(ar, "failed to send firmware crash dump via devcoredump: %d",</div><div class='ctx'> 			    ret);</div><div class='del'>-</div><div class='del'>-	complete(&amp;ar-&gt;driver_recovery);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath10k_core_set_coverage_class_work(struct work_struct *work)</div><div class='hunk'>@@ -2425,7 +2642,7 @@ static void ath10k_core_set_coverage_class_work(struct work_struct *work)</div><div class='ctx'> 					 set_coverage_class_work);</div><div class='ctx'> </div><div class='ctx'> 	if (ar-&gt;hw_params.hw_ops-&gt;set_coverage_class)</div><div class='del'>-		ar-&gt;hw_params.hw_ops-&gt;set_coverage_class(ar, -1);</div><div class='add'>+		ar-&gt;hw_params.hw_ops-&gt;set_coverage_class(ar, -1, -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath10k_core_init_firmware_features(struct ath10k *ar)</div><div class='hunk'>@@ -2470,7 +2687,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar)</div><div class='ctx'> 	ar-&gt;htt.max_num_amsdu = ATH10K_HTT_MAX_NUM_AMSDU_DEFAULT;</div><div class='ctx'> 	ar-&gt;htt.max_num_ampdu = ATH10K_HTT_MAX_NUM_AMPDU_DEFAULT;</div><div class='ctx'> </div><div class='del'>-	if (rawmode) {</div><div class='add'>+	if (ath10k_frame_mode == ATH10K_HW_TXRX_RAW) {</div><div class='ctx'> 		if (!test_bit(ATH10K_FW_FEATURE_RAW_MODE_SUPPORT,</div><div class='ctx'> 			      fw_file-&gt;fw_features)) {</div><div class='ctx'> 			ath10k_err(ar, "rawmode = 1 requires support from firmware");</div><div class='hunk'>@@ -2690,9 +2907,16 @@ static int ath10k_core_copy_target_iram(struct ath10k *ar)</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> 	u32 len, remaining_len;</div><div class='ctx'> </div><div class='del'>-	hw_mem = ath10k_coredump_get_mem_layout(ar);</div><div class='add'>+	/* copy target iram feature must work also when</div><div class='add'>+	 * ATH10K_FW_CRASH_DUMP_RAM_DATA is disabled, so</div><div class='add'>+	 * _ath10k_coredump_get_mem_layout() to accomplist that</div><div class='add'>+	 */</div><div class='add'>+	hw_mem = _ath10k_coredump_get_mem_layout(ar);</div><div class='ctx'> 	if (!hw_mem)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		/* if CONFIG_DEV_COREDUMP is disabled we get NULL, then</div><div class='add'>+		 * just silently disable the feature by doing nothing</div><div class='add'>+		 */</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; hw_mem-&gt;region_table.size; i++) {</div><div class='ctx'> 		tmp = &amp;hw_mem-&gt;region_table.regions[i];</div><div class='hunk'>@@ -2941,7 +3165,7 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode,</div><div class='ctx'> 		 * enabled always.</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * We can still enable BTCOEX if firmware has the support</div><div class='del'>-		 * eventhough btceox_support value is</div><div class='add'>+		 * even though btceox_support value is</div><div class='ctx'> 		 * ATH10K_DT_BTCOEX_NOT_FOUND</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='hunk'>@@ -3060,6 +3284,10 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode,</div><div class='ctx'> 		goto err_hif_stop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	status = ath10k_leds_start(ar);</div><div class='add'>+	if (status)</div><div class='add'>+		goto err_hif_stop;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_hif_stop:</div><div class='hunk'>@@ -3124,7 +3352,7 @@ EXPORT_SYMBOL(ath10k_core_stop);</div><div class='ctx'>  */</div><div class='ctx'> static int ath10k_core_probe_fw(struct ath10k *ar)</div><div class='ctx'> {</div><div class='del'>-	struct bmi_target_info target_info;</div><div class='add'>+	struct bmi_target_info target_info = {};</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	ret = ath10k_hif_power_up(ar, ATH10K_FIRMWARE_MODE_NORMAL);</div><div class='hunk'>@@ -3135,7 +3363,6 @@ static int ath10k_core_probe_fw(struct ath10k *ar)</div><div class='ctx'> </div><div class='ctx'> 	switch (ar-&gt;hif.bus) {</div><div class='ctx'> 	case ATH10K_BUS_SDIO:</div><div class='del'>-		memset(&amp;target_info, 0, sizeof(target_info));</div><div class='ctx'> 		ret = ath10k_bmi_get_target_info_sdio(ar, &amp;target_info);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ath10k_err(ar, "could not get target info (%d)\n", ret);</div><div class='hunk'>@@ -3147,7 +3374,6 @@ static int ath10k_core_probe_fw(struct ath10k *ar)</div><div class='ctx'> 	case ATH10K_BUS_PCI:</div><div class='ctx'> 	case ATH10K_BUS_AHB:</div><div class='ctx'> 	case ATH10K_BUS_USB:</div><div class='del'>-		memset(&amp;target_info, 0, sizeof(target_info));</div><div class='ctx'> 		ret = ath10k_bmi_get_target_info(ar, &amp;target_info);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ath10k_err(ar, "could not get target info (%d)\n", ret);</div><div class='hunk'>@@ -3157,7 +3383,6 @@ static int ath10k_core_probe_fw(struct ath10k *ar)</div><div class='ctx'> 		ar-&gt;hw-&gt;wiphy-&gt;hw_version = target_info.version;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ATH10K_BUS_SNOC:</div><div class='del'>-		memset(&amp;target_info, 0, sizeof(target_info));</div><div class='ctx'> 		ret = ath10k_hif_get_target_info(ar, &amp;target_info);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ath10k_err(ar, "could not get target info (%d)\n", ret);</div><div class='hunk'>@@ -3224,7 +3449,7 @@ static int ath10k_core_probe_fw(struct ath10k *ar)</div><div class='ctx'> 		ath10k_debug_print_board_info(ar);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	device_get_mac_address(ar-&gt;dev, ar-&gt;mac_addr, sizeof(ar-&gt;mac_addr));</div><div class='add'>+	device_get_mac_address(ar-&gt;dev, ar-&gt;mac_addr);</div><div class='ctx'> </div><div class='ctx'> 	ret = ath10k_core_init_firmware_features(ar);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -3318,9 +3543,18 @@ static void ath10k_core_register_work(struct work_struct *work)</div><div class='ctx'> 		goto err_spectral_destroy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	status = ath10k_leds_register(ar);</div><div class='add'>+	if (status) {</div><div class='add'>+		ath10k_err(ar, "could not register leds: %d\n",</div><div class='add'>+			   status);</div><div class='add'>+		goto err_thermal_unregister;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	set_bit(ATH10K_FLAG_CORE_REGISTERED, &amp;ar-&gt;dev_flags);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='add'>+err_thermal_unregister:</div><div class='add'>+	ath10k_thermal_unregister(ar);</div><div class='ctx'> err_spectral_destroy:</div><div class='ctx'> 	ath10k_spectral_destroy(ar);</div><div class='ctx'> err_debug_destroy:</div><div class='hunk'>@@ -3356,6 +3590,8 @@ void ath10k_core_unregister(struct ath10k *ar)</div><div class='ctx'> 	if (!test_bit(ATH10K_FLAG_CORE_REGISTERED, &amp;ar-&gt;dev_flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	ath10k_leds_unregister(ar);</div><div class='add'>+</div><div class='ctx'> 	ath10k_thermal_unregister(ar);</div><div class='ctx'> 	/* Stop spectral before unregistering from mac80211 to remove the</div><div class='ctx'> 	 * relayfs debugfs file cleanly. Otherwise the parent debugfs tree</div><div class='hunk'>@@ -3434,7 +3670,7 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,</div><div class='ctx'> 	default:</div><div class='ctx'> 		ath10k_err(ar, "unsupported core hardware revision %d\n",</div><div class='ctx'> 			   hw_rev);</div><div class='del'>-		ret = -ENOTSUPP;</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='ctx'> 		goto err_free_mac;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3472,6 +3708,9 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,</div><div class='ctx'> 	mutex_init(&amp;ar-&gt;dump_mutex);</div><div class='ctx'> 	spin_lock_init(&amp;ar-&gt;data_lock);</div><div class='ctx'> </div><div class='add'>+	for (int ac = 0; ac &lt; IEEE80211_NUM_ACS; ac++)</div><div class='add'>+		spin_lock_init(&amp;ar-&gt;queue_lock[ac]);</div><div class='add'>+</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ar-&gt;peers);</div><div class='ctx'> 	init_waitqueue_head(&amp;ar-&gt;peer_mapping_wq);</div><div class='ctx'> 	init_waitqueue_head(&amp;ar-&gt;htt.empty_tx_wq);</div><div class='hunk'>@@ -3488,14 +3727,17 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 	INIT_WORK(&amp;ar-&gt;register_work, ath10k_core_register_work);</div><div class='ctx'> 	INIT_WORK(&amp;ar-&gt;restart_work, ath10k_core_restart);</div><div class='add'>+	INIT_WORK(&amp;ar-&gt;recovery_check_work, ath10k_core_recovery_check_work);</div><div class='ctx'> 	INIT_WORK(&amp;ar-&gt;set_coverage_class_work,</div><div class='ctx'> 		  ath10k_core_set_coverage_class_work);</div><div class='ctx'> </div><div class='del'>-	init_dummy_netdev(&amp;ar-&gt;napi_dev);</div><div class='add'>+	ar-&gt;napi_dev = alloc_netdev_dummy(0);</div><div class='add'>+	if (!ar-&gt;napi_dev)</div><div class='add'>+		goto err_free_tx_complete;</div><div class='ctx'> </div><div class='ctx'> 	ret = ath10k_coredump_create(ar);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto err_free_tx_complete;</div><div class='add'>+		goto err_free_netdev;</div><div class='ctx'> </div><div class='ctx'> 	ret = ath10k_debug_create(ar);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -3505,6 +3747,8 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,</div><div class='ctx'> </div><div class='ctx'> err_free_coredump:</div><div class='ctx'> 	ath10k_coredump_destroy(ar);</div><div class='add'>+err_free_netdev:</div><div class='add'>+	free_netdev(ar-&gt;napi_dev);</div><div class='ctx'> err_free_tx_complete:</div><div class='ctx'> 	destroy_workqueue(ar-&gt;workqueue_tx_complete);</div><div class='ctx'> err_free_aux_wq:</div><div class='hunk'>@@ -3520,15 +3764,13 @@ EXPORT_SYMBOL(ath10k_core_create);</div><div class='ctx'> </div><div class='ctx'> void ath10k_core_destroy(struct ath10k *ar)</div><div class='ctx'> {</div><div class='del'>-	flush_workqueue(ar-&gt;workqueue);</div><div class='ctx'> 	destroy_workqueue(ar-&gt;workqueue);</div><div class='ctx'> </div><div class='del'>-	flush_workqueue(ar-&gt;workqueue_aux);</div><div class='ctx'> 	destroy_workqueue(ar-&gt;workqueue_aux);</div><div class='ctx'> </div><div class='del'>-	flush_workqueue(ar-&gt;workqueue_tx_complete);</div><div class='ctx'> 	destroy_workqueue(ar-&gt;workqueue_tx_complete);</div><div class='ctx'> </div><div class='add'>+	free_netdev(ar-&gt;napi_dev);</div><div class='ctx'> 	ath10k_debug_destroy(ar);</div><div class='ctx'> 	ath10k_coredump_destroy(ar);</div><div class='ctx'> 	ath10k_htt_tx_destroy(&amp;ar-&gt;htt);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h<br/>index 648ed36f845f..73a9db302245 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/core.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/core.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/core.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/core.h</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  * Copyright (c) 2005-2011 Atheros Communications Inc.</div><div class='ctx'>  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.</div><div class='ctx'>  * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _CORE_H_</div><div class='hunk'>@@ -14,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/uuid.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "htt.h"</div><div class='ctx'> #include "htc.h"</div><div class='hunk'>@@ -59,9 +61,6 @@</div><div class='ctx'> #define ATH10K_KEEPALIVE_MAX_IDLE 3895</div><div class='ctx'> #define ATH10K_KEEPALIVE_MAX_UNRESPONSIVE 3900</div><div class='ctx'> </div><div class='del'>-/* NAPI poll budget */</div><div class='del'>-#define ATH10K_NAPI_BUDGET      64</div><div class='del'>-</div><div class='ctx'> /* SMBIOS type containing Board Data File Name Extension */</div><div class='ctx'> #define ATH10K_SMBIOS_BDF_EXT_TYPE 0xF8</div><div class='ctx'> </div><div class='hunk'>@@ -79,7 +78,7 @@</div><div class='ctx'> /* The magic used by QCA spec */</div><div class='ctx'> #define ATH10K_SMBIOS_BDF_EXT_MAGIC "BDF_"</div><div class='ctx'> </div><div class='del'>-/* Default Airtime weight multipler (Tuned for multiclient performance) */</div><div class='add'>+/* Default Airtime weight multiplier (Tuned for multiclient performance) */</div><div class='ctx'> #define ATH10K_AIRTIME_WEIGHT_MULTIPLIER  4</div><div class='ctx'> </div><div class='ctx'> #define ATH10K_MAX_RETRY_COUNT 30</div><div class='hunk'>@@ -88,6 +87,8 @@</div><div class='ctx'> 				  IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER)</div><div class='ctx'> #define ATH10K_ITER_RESUME_FLAGS (IEEE80211_IFACE_ITER_RESUME_ALL |\</div><div class='ctx'> 				  IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER)</div><div class='add'>+#define ATH10K_RECOVERY_TIMEOUT_HZ			(5 * HZ)</div><div class='add'>+#define ATH10K_RECOVERY_MAX_FAIL_COUNT			4</div><div class='ctx'> </div><div class='ctx'> struct ath10k;</div><div class='ctx'> </div><div class='hunk'>@@ -301,7 +302,7 @@ struct ath10k_fw_stats_pdev {</div><div class='ctx'> 	s32 underrun;</div><div class='ctx'> 	u32 hw_paused;</div><div class='ctx'> 	s32 tx_abort;</div><div class='del'>-	s32 mpdus_requed;</div><div class='add'>+	s32 mpdus_requeued;</div><div class='ctx'> 	u32 tx_ko;</div><div class='ctx'> 	u32 data_rc;</div><div class='ctx'> 	u32 self_triggers;</div><div class='hunk'>@@ -610,7 +611,7 @@ struct ath10k_vif {</div><div class='ctx'> 			u8 tim_bitmap[64];</div><div class='ctx'> 			u8 tim_len;</div><div class='ctx'> 			u32 ssid_len;</div><div class='del'>-			u8 ssid[IEEE80211_MAX_SSID_LEN];</div><div class='add'>+			u8 ssid[IEEE80211_MAX_SSID_LEN] __nonstring;</div><div class='ctx'> 			bool hidden_ssid;</div><div class='ctx'> 			/* P2P_IE with NoA attribute for P2P_GO case */</div><div class='ctx'> 			u32 noa_len;</div><div class='hunk'>@@ -780,7 +781,7 @@ enum ath10k_fw_features {</div><div class='ctx'> 	/* Firmware supports bypassing PLL setting on init. */</div><div class='ctx'> 	ATH10K_FW_FEATURE_SUPPORTS_SKIP_CLOCK_INIT = 9,</div><div class='ctx'> </div><div class='del'>-	/* Raw mode support. If supported, FW supports receiving and trasmitting</div><div class='add'>+	/* Raw mode support. If supported, FW supports receiving and transmitting</div><div class='ctx'> 	 * frames in raw mode.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ATH10K_FW_FEATURE_RAW_MODE_SUPPORT = 10,</div><div class='hunk'>@@ -860,15 +861,12 @@ enum ath10k_dev_flags {</div><div class='ctx'> 	/* Disable HW crypto engine */</div><div class='ctx'> 	ATH10K_FLAG_HW_CRYPTO_DISABLED,</div><div class='ctx'> </div><div class='del'>-	/* Bluetooth coexistance enabled */</div><div class='add'>+	/* Bluetooth coexistence enabled */</div><div class='ctx'> 	ATH10K_FLAG_BTCOEX,</div><div class='ctx'> </div><div class='ctx'> 	/* Per Station statistics service */</div><div class='ctx'> 	ATH10K_FLAG_PEER_STATS,</div><div class='ctx'> </div><div class='del'>-	/* Indicates that ath10k device is during recovery process and not complete */</div><div class='del'>-	ATH10K_FLAG_RESTARTING,</div><div class='del'>-</div><div class='ctx'> 	/* protected by conf_mutex */</div><div class='ctx'> 	ATH10K_FLAG_NAPI_ENABLED,</div><div class='ctx'> };</div><div class='hunk'>@@ -877,8 +875,10 @@ enum ath10k_cal_mode {</div><div class='ctx'> 	ATH10K_CAL_MODE_FILE,</div><div class='ctx'> 	ATH10K_CAL_MODE_OTP,</div><div class='ctx'> 	ATH10K_CAL_MODE_DT,</div><div class='add'>+	ATH10K_CAL_MODE_NVMEM,</div><div class='ctx'> 	ATH10K_PRE_CAL_MODE_FILE,</div><div class='ctx'> 	ATH10K_PRE_CAL_MODE_DT,</div><div class='add'>+	ATH10K_PRE_CAL_MODE_NVMEM,</div><div class='ctx'> 	ATH10K_CAL_MODE_EEPROM,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -898,10 +898,14 @@ static inline const char *ath10k_cal_mode_str(enum ath10k_cal_mode mode)</div><div class='ctx'> 		return "otp";</div><div class='ctx'> 	case ATH10K_CAL_MODE_DT:</div><div class='ctx'> 		return "dt";</div><div class='add'>+	case ATH10K_CAL_MODE_NVMEM:</div><div class='add'>+		return "nvmem";</div><div class='ctx'> 	case ATH10K_PRE_CAL_MODE_FILE:</div><div class='ctx'> 		return "pre-cal-file";</div><div class='ctx'> 	case ATH10K_PRE_CAL_MODE_DT:</div><div class='ctx'> 		return "pre-cal-dt";</div><div class='add'>+	case ATH10K_PRE_CAL_MODE_NVMEM:</div><div class='add'>+		return "pre-cal-nvmem";</div><div class='ctx'> 	case ATH10K_CAL_MODE_EEPROM:</div><div class='ctx'> 		return "eeprom";</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1077,6 +1081,8 @@ struct ath10k {</div><div class='ctx'> 	 */</div><div class='ctx'> 	const struct ath10k_fw_components *running_fw;</div><div class='ctx'> </div><div class='add'>+	const char *board_name;</div><div class='add'>+</div><div class='ctx'> 	const struct firmware *pre_cal_file;</div><div class='ctx'> 	const struct firmware *cal_file;</div><div class='ctx'> </div><div class='hunk'>@@ -1167,6 +1173,9 @@ struct ath10k {</div><div class='ctx'> 	/* protects shared structure data */</div><div class='ctx'> 	spinlock_t data_lock;</div><div class='ctx'> </div><div class='add'>+	/* serialize wake_tx_queue calls per ac */</div><div class='add'>+	spinlock_t queue_lock[IEEE80211_NUM_ACS];</div><div class='add'>+</div><div class='ctx'> 	struct list_head arvifs;</div><div class='ctx'> 	struct list_head peers;</div><div class='ctx'> 	struct ath10k_peer *peer_map[ATH10K_MAX_NUM_PEER_IDS];</div><div class='hunk'>@@ -1198,9 +1207,15 @@ struct ath10k {</div><div class='ctx'> </div><div class='ctx'> 	struct work_struct register_work;</div><div class='ctx'> 	struct work_struct restart_work;</div><div class='add'>+	struct work_struct recovery_check_work;</div><div class='ctx'> 	struct work_struct bundle_tx_work;</div><div class='ctx'> 	struct work_struct tx_complete_work;</div><div class='ctx'> </div><div class='add'>+	atomic_t pending_recovery;</div><div class='add'>+	unsigned int recovery_count;</div><div class='add'>+	/* continuous recovery fail count */</div><div class='add'>+	atomic_t fail_cont_count;</div><div class='add'>+</div><div class='ctx'> 	/* cycle count is reported twice for each visited channel during scan.</div><div class='ctx'> 	 * access protected by data_lock</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1244,12 +1259,23 @@ struct ath10k {</div><div class='ctx'> 	struct {</div><div class='ctx'> 		/* protected by conf_mutex */</div><div class='ctx'> 		struct ath10k_fw_components utf_mode_fw;</div><div class='add'>+		u8 ftm_msgref;</div><div class='ctx'> </div><div class='ctx'> 		/* protected by data_lock */</div><div class='ctx'> 		bool utf_monitor;</div><div class='add'>+		u32 data_pos;</div><div class='add'>+		u32 expected_seq;</div><div class='add'>+		u8 *eventdata;</div><div class='ctx'> 	} testmode;</div><div class='ctx'> </div><div class='ctx'> 	struct {</div><div class='add'>+		struct gpio_led wifi_led;</div><div class='add'>+		struct led_classdev cdev;</div><div class='add'>+		char label[48];</div><div class='add'>+		u32 gpio_state_pin;</div><div class='add'>+	} leds;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='ctx'> 		/* protected by data_lock */</div><div class='ctx'> 		u32 rx_crc_err_drop;</div><div class='ctx'> 		u32 fw_crash_counter;</div><div class='hunk'>@@ -1262,7 +1288,7 @@ struct ath10k {</div><div class='ctx'> 	struct ath10k_per_peer_tx_stats peer_tx_stats;</div><div class='ctx'> </div><div class='ctx'> 	/* NAPI */</div><div class='del'>-	struct net_device napi_dev;</div><div class='add'>+	struct net_device *napi_dev;</div><div class='ctx'> 	struct napi_struct napi;</div><div class='ctx'> </div><div class='ctx'> 	struct work_struct set_coverage_class_work;</div><div class='hunk'>@@ -1311,6 +1337,7 @@ static inline bool ath10k_peer_stats_enabled(struct ath10k *ar)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+extern unsigned int ath10k_frame_mode;</div><div class='ctx'> extern unsigned long ath10k_coredump_mask;</div><div class='ctx'> </div><div class='ctx'> void ath10k_core_napi_sync_disable(struct ath10k *ar);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/coredump.c b/drivers/net/wireless/ath/ath10k/coredump.c<br/>index 7eb72290a925..50d0c4213ecf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/coredump.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/coredump.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/coredump.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/coredump.c</a></div><div class='hunk'>@@ -2,11 +2,14 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.</div><div class='ctx'>  * Copyright (c) 2018, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "coredump.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/devcoredump.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/utsname.h&gt;</div><div class='hunk'>@@ -531,7 +534,7 @@ static const struct ath10k_mem_section qca6174_hw30_sdio_register_sections[] = {</div><div class='ctx'> </div><div class='ctx'> 	{0x40000, 0x400A4},</div><div class='ctx'> </div><div class='del'>-	/* SI register is skiped here.</div><div class='add'>+	/* SI register is skipped here.</div><div class='ctx'> 	 * Because it will cause bus hang</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * {0x50000, 0x50018},</div><div class='hunk'>@@ -1447,11 +1450,17 @@ static u32 ath10k_coredump_get_ramdump_size(struct ath10k *ar)</div><div class='ctx'> </div><div class='ctx'> const struct ath10k_hw_mem_layout *ath10k_coredump_get_mem_layout(struct ath10k *ar)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='ctx'> 	if (!test_bit(ATH10K_FW_CRASH_DUMP_RAM_DATA, &amp;ath10k_coredump_mask))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	return _ath10k_coredump_get_mem_layout(ar);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath10k_coredump_get_mem_layout);</div><div class='add'>+</div><div class='add'>+const struct ath10k_hw_mem_layout *_ath10k_coredump_get_mem_layout(struct ath10k *ar)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='ctx'> 	if (WARN_ON(ar-&gt;target_version == 0))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -1464,7 +1473,6 @@ const struct ath10k_hw_mem_layout *ath10k_coredump_get_mem_layout(struct ath10k</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(ath10k_coredump_get_mem_layout);</div><div class='ctx'> </div><div class='ctx'> struct ath10k_fw_crash_data *ath10k_coredump_new(struct ath10k *ar)</div><div class='ctx'> {</div><div class='hunk'>@@ -1517,7 +1525,7 @@ static struct ath10k_dump_file_data *ath10k_coredump_build(struct ath10k *ar)</div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;dump_mutex);</div><div class='ctx'> </div><div class='ctx'> 	dump_data = (struct ath10k_dump_file_data *)(buf);</div><div class='del'>-	strlcpy(dump_data-&gt;df_magic, "ATH10K-FW-DUMP",</div><div class='add'>+	strscpy(dump_data-&gt;df_magic, "ATH10K-FW-DUMP",</div><div class='ctx'> 		sizeof(dump_data-&gt;df_magic));</div><div class='ctx'> 	dump_data-&gt;len = cpu_to_le32(len);</div><div class='ctx'> </div><div class='hunk'>@@ -1538,11 +1546,11 @@ static struct ath10k_dump_file_data *ath10k_coredump_build(struct ath10k *ar)</div><div class='ctx'> 	dump_data-&gt;vht_cap_info = cpu_to_le32(ar-&gt;vht_cap_info);</div><div class='ctx'> 	dump_data-&gt;num_rf_chains = cpu_to_le32(ar-&gt;num_rf_chains);</div><div class='ctx'> </div><div class='del'>-	strlcpy(dump_data-&gt;fw_ver, ar-&gt;hw-&gt;wiphy-&gt;fw_version,</div><div class='add'>+	strscpy(dump_data-&gt;fw_ver, ar-&gt;hw-&gt;wiphy-&gt;fw_version,</div><div class='ctx'> 		sizeof(dump_data-&gt;fw_ver));</div><div class='ctx'> </div><div class='ctx'> 	dump_data-&gt;kernel_ver_code = 0;</div><div class='del'>-	strlcpy(dump_data-&gt;kernel_ver, init_utsname()-&gt;release,</div><div class='add'>+	strscpy(dump_data-&gt;kernel_ver, init_utsname()-&gt;release,</div><div class='ctx'> 		sizeof(dump_data-&gt;kernel_ver));</div><div class='ctx'> </div><div class='ctx'> 	dump_data-&gt;tv_sec = cpu_to_le64(crash_data-&gt;timestamp.tv_sec);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/coredump.h b/drivers/net/wireless/ath/ath10k/coredump.h<br/>index 42404e246e0e..8d274e0f374b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/coredump.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/coredump.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/coredump.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/coredump.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: ISC */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.</div><div class='add'>+ * Copyright (c) 2022, 2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _COREDUMP_H_</div><div class='hunk'>@@ -12,7 +13,11 @@</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum ath10k_fw_crash_dump_type - types of data in the dump file</div><div class='del'>- * @ATH10K_FW_CRASH_DUMP_REGDUMP: Register crash dump in binary format</div><div class='add'>+ * @ATH10K_FW_CRASH_DUMP_REGISTERS: Register crash dump in binary format</div><div class='add'>+ * @ATH10K_FW_CRASH_DUMP_CE_DATA: Copy Engine crash dump data</div><div class='add'>+ * @ATH10K_FW_CRASH_DUMP_RAM_DATA: RAM crash dump data, contains multiple</div><div class='add'>+ *				   struct ath10k_dump_ram_data_hdr</div><div class='add'>+ * @ATH10K_FW_CRASH_DUMP_MAX: Maximum enumeration</div><div class='ctx'>  */</div><div class='ctx'> enum ath10k_fw_crash_dump_type {</div><div class='ctx'> 	ATH10K_FW_CRASH_DUMP_REGISTERS = 0,</div><div class='hunk'>@@ -125,7 +130,7 @@ enum ath10k_mem_region_type {</div><div class='ctx'>  * To minimize the size of the array, the list must obey the format:</div><div class='ctx'>  * '{start0,stop0},{start1,stop1},{start2,stop2}....' The values below must</div><div class='ctx'>  * also obey to 'start0 &lt; stop0 &lt; start1 &lt; stop1 &lt; start2 &lt; ...', otherwise</div><div class='del'>- * we may encouter error in the dump processing.</div><div class='add'>+ * we may encounter error in the dump processing.</div><div class='ctx'>  */</div><div class='ctx'> struct ath10k_mem_section {</div><div class='ctx'> 	u32 start;</div><div class='hunk'>@@ -176,6 +181,7 @@ int ath10k_coredump_register(struct ath10k *ar);</div><div class='ctx'> void ath10k_coredump_unregister(struct ath10k *ar);</div><div class='ctx'> void ath10k_coredump_destroy(struct ath10k *ar);</div><div class='ctx'> </div><div class='add'>+const struct ath10k_hw_mem_layout *_ath10k_coredump_get_mem_layout(struct ath10k *ar);</div><div class='ctx'> const struct ath10k_hw_mem_layout *ath10k_coredump_get_mem_layout(struct ath10k *ar);</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_DEV_COREDUMP */</div><div class='hunk'>@@ -214,6 +220,12 @@ ath10k_coredump_get_mem_layout(struct ath10k *ar)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline const struct ath10k_hw_mem_layout *</div><div class='add'>+_ath10k_coredump_get_mem_layout(struct ath10k *ar)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_DEV_COREDUMP */</div><div class='ctx'> </div><div class='ctx'> #endif /* _COREDUMP_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c<br/>index fd052f6ed019..b7520220465a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/debug.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/debug.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/debug.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/debug.c</a></div><div class='hunk'>@@ -3,13 +3,17 @@</div><div class='ctx'>  * Copyright (c) 2005-2011 Atheros Communications Inc.</div><div class='ctx'>  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.</div><div class='ctx'>  * Copyright (c) 2018, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022, 2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/kstrtox.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "debug.h"</div><div class='hunk'>@@ -292,8 +296,8 @@ void ath10k_debug_fw_stats_process(struct ath10k *ar, struct sk_buff *skb)</div><div class='ctx'> 		goto free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	num_peers = ath10k_wmi_fw_stats_num_peers(&amp;ar-&gt;debug.fw_stats.peers);</div><div class='del'>-	num_vdevs = ath10k_wmi_fw_stats_num_vdevs(&amp;ar-&gt;debug.fw_stats.vdevs);</div><div class='add'>+	num_peers = list_count_nodes(&amp;ar-&gt;debug.fw_stats.peers);</div><div class='add'>+	num_vdevs = list_count_nodes(&amp;ar-&gt;debug.fw_stats.vdevs);</div><div class='ctx'> 	is_start = (list_empty(&amp;ar-&gt;debug.fw_stats.pdevs) &amp;&amp;</div><div class='ctx'> 		    !list_empty(&amp;stats.pdevs));</div><div class='ctx'> 	is_end = (!list_empty(&amp;ar-&gt;debug.fw_stats.pdevs) &amp;&amp;</div><div class='hunk'>@@ -543,7 +547,7 @@ static ssize_t ath10k_write_simulate_fw_crash(struct file *file,</div><div class='ctx'> 					      size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = file-&gt;private_data;</div><div class='del'>-	char buf[32] = {0};</div><div class='add'>+	char buf[32] = {};</div><div class='ctx'> 	ssize_t rc;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -979,7 +983,7 @@ static ssize_t ath10k_write_htt_max_amsdu_ampdu(struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = file-&gt;private_data;</div><div class='ctx'> 	int res;</div><div class='del'>-	char buf[64] = {0};</div><div class='add'>+	char buf[64] = {};</div><div class='ctx'> 	unsigned int amsdu, ampdu;</div><div class='ctx'> </div><div class='ctx'> 	res = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos,</div><div class='hunk'>@@ -1035,7 +1039,7 @@ static ssize_t ath10k_write_fw_dbglog(struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = file-&gt;private_data;</div><div class='ctx'> 	int ret;</div><div class='del'>-	char buf[96] = {0};</div><div class='add'>+	char buf[96] = {};</div><div class='ctx'> 	unsigned int log_level;</div><div class='ctx'> 	u64 mask;</div><div class='ctx'> </div><div class='hunk'>@@ -1081,7 +1085,7 @@ exit:</div><div class='ctx'>  * struct available..</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* This generally cooresponds to the debugfs fw_stats file */</div><div class='add'>+/* This generally corresponds to the debugfs fw_stats file */</div><div class='ctx'> static const char ath10k_gstrings_stats[][ETH_GSTRING_LEN] = {</div><div class='ctx'> 	"tx_pkts_nic",</div><div class='ctx'> 	"tx_bytes_nic",</div><div class='hunk'>@@ -1105,7 +1109,7 @@ static const char ath10k_gstrings_stats[][ETH_GSTRING_LEN] = {</div><div class='ctx'> 	"d_tx_ppdu_reaped",</div><div class='ctx'> 	"d_tx_fifo_underrun",</div><div class='ctx'> 	"d_tx_ppdu_abort",</div><div class='del'>-	"d_tx_mpdu_requed",</div><div class='add'>+	"d_tx_mpdu_requeued",</div><div class='ctx'> 	"d_tx_excessive_retries",</div><div class='ctx'> 	"d_tx_hw_rate",</div><div class='ctx'> 	"d_tx_dropped_sw_retries",</div><div class='hunk'>@@ -1139,7 +1143,7 @@ void ath10k_debug_get_et_strings(struct ieee80211_hw *hw,</div><div class='ctx'> 				 u32 sset, u8 *data)</div><div class='ctx'> {</div><div class='ctx'> 	if (sset == ETH_SS_STATS)</div><div class='del'>-		memcpy(data, *ath10k_gstrings_stats,</div><div class='add'>+		memcpy(data, ath10k_gstrings_stats,</div><div class='ctx'> 		       sizeof(ath10k_gstrings_stats));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1205,7 +1209,7 @@ void ath10k_debug_get_et_stats(struct ieee80211_hw *hw,</div><div class='ctx'> 	data[i++] = pdev_stats-&gt;hw_reaped;</div><div class='ctx'> 	data[i++] = pdev_stats-&gt;underrun;</div><div class='ctx'> 	data[i++] = pdev_stats-&gt;tx_abort;</div><div class='del'>-	data[i++] = pdev_stats-&gt;mpdus_requed;</div><div class='add'>+	data[i++] = pdev_stats-&gt;mpdus_requeued;</div><div class='ctx'> 	data[i++] = pdev_stats-&gt;tx_ko;</div><div class='ctx'> 	data[i++] = pdev_stats-&gt;data_rc;</div><div class='ctx'> 	data[i++] = pdev_stats-&gt;sw_retry_failure;</div><div class='hunk'>@@ -1749,7 +1753,7 @@ void ath10k_debug_stop(struct ath10k *ar)</div><div class='ctx'> </div><div class='ctx'> 	/* Must not use _sync to avoid deadlock, we do that in</div><div class='ctx'> 	 * ath10k_debug_destroy(). The check for htt_stats_mask is to avoid</div><div class='del'>-	 * warning from del_timer().</div><div class='add'>+	 * warning from timer_delete().</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ar-&gt;debug.htt_stats_mask != 0)</div><div class='ctx'> 		cancel_delayed_work(&amp;ar-&gt;debug.htt_stats_dwork);</div><div class='hunk'>@@ -1772,7 +1776,7 @@ static ssize_t ath10k_write_simulate_radar(struct file *file,</div><div class='ctx'> 	if (!arvif-&gt;is_started)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ieee80211_radar_detected(ar-&gt;hw);</div><div class='add'>+	ieee80211_radar_detected(ar-&gt;hw, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -1963,20 +1967,13 @@ static ssize_t ath10k_write_btcoex(struct file *file,</div><div class='ctx'> 				   size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = file-&gt;private_data;</div><div class='del'>-	char buf[32];</div><div class='del'>-	size_t buf_size;</div><div class='del'>-	int ret;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> 	bool val;</div><div class='ctx'> 	u32 pdev_param;</div><div class='ctx'> </div><div class='del'>-	buf_size = min(count, (sizeof(buf) - 1));</div><div class='del'>-	if (copy_from_user(buf, ubuf, buf_size))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	buf[buf_size] = '\0';</div><div class='del'>-</div><div class='del'>-	if (strtobool(buf, &amp;val) != 0)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ret = kstrtobool_from_user(ubuf, count, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!ar-&gt;coex_support)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -1999,7 +1996,7 @@ static ssize_t ath10k_write_btcoex(struct file *file,</div><div class='ctx'> 		     ar-&gt;running_fw-&gt;fw_file.fw_features)) {</div><div class='ctx'> 		ret = ath10k_wmi_pdev_set_param(ar, pdev_param, val);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ath10k_warn(ar, "failed to enable btcoex: %d\n", ret);</div><div class='add'>+			ath10k_warn(ar, "failed to enable btcoex: %zd\n", ret);</div><div class='ctx'> 			ret = count;</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2102,19 +2099,12 @@ static ssize_t ath10k_write_peer_stats(struct file *file,</div><div class='ctx'> 				       size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = file-&gt;private_data;</div><div class='del'>-	char buf[32];</div><div class='del'>-	size_t buf_size;</div><div class='del'>-	int ret;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> 	bool val;</div><div class='ctx'> </div><div class='del'>-	buf_size = min(count, (sizeof(buf) - 1));</div><div class='del'>-	if (copy_from_user(buf, ubuf, buf_size))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	buf[buf_size] = '\0';</div><div class='del'>-</div><div class='del'>-	if (strtobool(buf, &amp;val) != 0)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ret = kstrtobool_from_user(ubuf, count, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -2238,21 +2228,16 @@ static ssize_t ath10k_sta_tid_stats_mask_write(struct file *file,</div><div class='ctx'> 					       size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = file-&gt;private_data;</div><div class='del'>-	char buf[32];</div><div class='del'>-	ssize_t len;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> 	u32 mask;</div><div class='ctx'> </div><div class='del'>-	len = min(count, sizeof(buf) - 1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, len))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	buf[len] = '\0';</div><div class='del'>-	if (kstrtoint(buf, 0, &amp;mask))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ret = kstrtoint_from_user(user_buf, count, 0, &amp;mask);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;sta_tid_stats_mask = mask;</div><div class='ctx'> </div><div class='del'>-	return len;</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct file_operations fops_sta_tid_stats_mask = {</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/debugfs_sta.c b/drivers/net/wireless/ath/ath10k/debugfs_sta.c<br/>index 367539f2c370..b9fb192e0b48 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/debugfs_sta.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/debugfs_sta.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/debugfs_sta.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/debugfs_sta.c</a></div><div class='hunk'>@@ -2,6 +2,8 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2014-2017 Qualcomm Atheros, Inc.</div><div class='ctx'>  * Copyright (c) 2018, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='hunk'>@@ -243,7 +245,7 @@ static ssize_t ath10k_dbg_sta_write_addba(struct file *file,</div><div class='ctx'> 	struct ath10k *ar = arsta-&gt;arvif-&gt;ar;</div><div class='ctx'> 	u32 tid, buf_size;</div><div class='ctx'> 	int ret;</div><div class='del'>-	char buf[64] = {0};</div><div class='add'>+	char buf[64] = {};</div><div class='ctx'> </div><div class='ctx'> 	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos,</div><div class='ctx'> 				     user_buf, count);</div><div class='hunk'>@@ -294,7 +296,7 @@ static ssize_t ath10k_dbg_sta_write_addba_resp(struct file *file,</div><div class='ctx'> 	struct ath10k *ar = arsta-&gt;arvif-&gt;ar;</div><div class='ctx'> 	u32 tid, status;</div><div class='ctx'> 	int ret;</div><div class='del'>-	char buf[64] = {0};</div><div class='add'>+	char buf[64] = {};</div><div class='ctx'> </div><div class='ctx'> 	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos,</div><div class='ctx'> 				     user_buf, count);</div><div class='hunk'>@@ -344,7 +346,7 @@ static ssize_t ath10k_dbg_sta_write_delba(struct file *file,</div><div class='ctx'> 	struct ath10k *ar = arsta-&gt;arvif-&gt;ar;</div><div class='ctx'> 	u32 tid, initiator, reason;</div><div class='ctx'> 	int ret;</div><div class='del'>-	char buf[64] = {0};</div><div class='add'>+	char buf[64] = {};</div><div class='ctx'> </div><div class='ctx'> 	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos,</div><div class='ctx'> 				     user_buf, count);</div><div class='hunk'>@@ -438,7 +440,7 @@ ath10k_dbg_sta_write_peer_debug_trigger(struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='del'>-	return count;</div><div class='add'>+	return ret ?: count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct file_operations fops_peer_debug_trigger = {</div><div class='hunk'>@@ -498,7 +500,7 @@ static char *get_num_ampdu_subfrm_str(enum ath10k_ampdu_subfrm_num i)</div><div class='ctx'> {</div><div class='ctx'> 	switch (i) {</div><div class='ctx'> 	case ATH10K_AMPDU_SUBFRM_NUM_10:</div><div class='del'>-		return "upto 10";</div><div class='add'>+		return "up to 10";</div><div class='ctx'> 	case ATH10K_AMPDU_SUBFRM_NUM_20:</div><div class='ctx'> 		return "11-20";</div><div class='ctx'> 	case ATH10K_AMPDU_SUBFRM_NUM_30:</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c<br/>index fab398046a3f..ce9b248c12dc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/htc.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/htc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/htc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/htc.c</a></div><div class='hunk'>@@ -2,8 +2,12 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2005-2011 Atheros Communications Inc.</div><div class='ctx'>  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.</div><div class='add'>+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "hif.h"</div><div class='ctx'> #include "debug.h"</div><div class='hunk'>@@ -33,7 +37,7 @@ static struct sk_buff *ath10k_htc_build_tx_ctrl_skb(void *ar)</div><div class='ctx'> 	skb_cb = ATH10K_SKB_CB(skb);</div><div class='ctx'> 	memset(skb_cb, 0, sizeof(*skb_cb));</div><div class='ctx'> </div><div class='del'>-	ath10k_dbg(ar, ATH10K_DBG_HTC, "%s: skb %pK\n", __func__, skb);</div><div class='add'>+	ath10k_dbg(ar, ATH10K_DBG_HTC, "%s: skb %p\n", __func__, skb);</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -53,9 +57,18 @@ void ath10k_htc_notify_tx_completion(struct ath10k_htc_ep *ep,</div><div class='ctx'> 	struct ath10k *ar = ep-&gt;htc-&gt;ar;</div><div class='ctx'> 	struct ath10k_htc_hdr *hdr;</div><div class='ctx'> </div><div class='del'>-	ath10k_dbg(ar, ATH10K_DBG_HTC, "%s: ep %d skb %pK\n", __func__,</div><div class='add'>+	ath10k_dbg(ar, ATH10K_DBG_HTC, "%s: ep %d skb %p\n", __func__,</div><div class='ctx'> 		   ep-&gt;eid, skb);</div><div class='ctx'> </div><div class='add'>+	/* A corner case where the copy completion is reaching to host but still</div><div class='add'>+	 * copy engine is processing it due to which host unmaps corresponding</div><div class='add'>+	 * memory and causes SMMU fault, hence as workaround adding delay</div><div class='add'>+	 * the unmapping memory to avoid SMMU faults.</div><div class='add'>+	 */</div><div class='add'>+	if (ar-&gt;hw_params.delay_unmap_buffer &amp;&amp;</div><div class='add'>+	    ep-&gt;ul_pipe_id == 3)</div><div class='add'>+		mdelay(2);</div><div class='add'>+</div><div class='ctx'> 	hdr = (struct ath10k_htc_hdr *)skb-&gt;data;</div><div class='ctx'> 	ath10k_htc_restore_tx_skb(ep-&gt;htc, skb);</div><div class='ctx'> </div><div class='hunk'>@@ -505,7 +518,7 @@ void ath10k_htc_rx_completion_handler(struct ath10k *ar, struct sk_buff *skb)</div><div class='ctx'> 		/* zero length packet with trailer data, just drop these */</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ath10k_dbg(ar, ATH10K_DBG_HTC, "htc rx completion ep %d skb %pK\n",</div><div class='add'>+	ath10k_dbg(ar, ATH10K_DBG_HTC, "htc rx completion ep %d skb %p\n",</div><div class='ctx'> 		   eid, skb);</div><div class='ctx'> 	ep-&gt;ep_ops.ep_rx_complete(ar, skb);</div><div class='ctx'> </div><div class='hunk'>@@ -947,13 +960,18 @@ int ath10k_htc_wait_target(struct ath10k_htc *htc)</div><div class='ctx'> 		return -ECOMM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	htc-&gt;total_transmit_credits = __le16_to_cpu(msg-&gt;ready.credit_count);</div><div class='add'>+	if (ar-&gt;hw_params.use_fw_tx_credits)</div><div class='add'>+		htc-&gt;total_transmit_credits = __le16_to_cpu(msg-&gt;ready.credit_count);</div><div class='add'>+	else</div><div class='add'>+		htc-&gt;total_transmit_credits = 1;</div><div class='add'>+</div><div class='ctx'> 	htc-&gt;target_credit_size = __le16_to_cpu(msg-&gt;ready.credit_size);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_HTC,</div><div class='del'>-		   "Target ready! transmit resources: %d size:%d\n",</div><div class='add'>+		   "Target ready! transmit resources: %d size:%d actual credits:%d\n",</div><div class='ctx'> 		   htc-&gt;total_transmit_credits,</div><div class='del'>-		   htc-&gt;target_credit_size);</div><div class='add'>+		   htc-&gt;target_credit_size,</div><div class='add'>+		   msg-&gt;ready.credit_count);</div><div class='ctx'> </div><div class='ctx'> 	if ((htc-&gt;total_transmit_credits == 0) ||</div><div class='ctx'> 	    (htc-&gt;target_credit_size == 0)) {</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h<br/>index 0d180faf3b77..7ff665020015 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/htc.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/htc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/htc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/htc.h</a></div><div class='hunk'>@@ -246,26 +246,12 @@ struct ath10k_htc_lookahead_bundle {</div><div class='ctx'> struct ath10k_htc_record {</div><div class='ctx'> 	struct ath10k_ath10k_htc_record_hdr hdr;</div><div class='ctx'> 	union {</div><div class='del'>-		struct ath10k_htc_credit_report credit_report[0];</div><div class='del'>-		struct ath10k_htc_lookahead_report lookahead_report[0];</div><div class='del'>-		struct ath10k_htc_lookahead_bundle lookahead_bundle[0];</div><div class='del'>-		u8 pauload[0];</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct ath10k_htc_credit_report, credit_report);</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct ath10k_htc_lookahead_report, lookahead_report);</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct ath10k_htc_lookahead_bundle, lookahead_bundle);</div><div class='ctx'> 	};</div><div class='ctx'> } __packed __aligned(4);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * note: the trailer offset is dynamic depending</div><div class='del'>- * on payload length. this is only a struct layout draft</div><div class='del'>- */</div><div class='del'>-struct ath10k_htc_frame {</div><div class='del'>-	struct ath10k_htc_hdr hdr;</div><div class='del'>-	union {</div><div class='del'>-		struct ath10k_htc_msg msg;</div><div class='del'>-		u8 payload[0];</div><div class='del'>-	};</div><div class='del'>-	struct ath10k_htc_record trailer[0];</div><div class='del'>-} __packed __aligned(4);</div><div class='del'>-</div><div class='ctx'> /*******************/</div><div class='ctx'> /* Host-side stuff */</div><div class='ctx'> /*******************/</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/htt.c b/drivers/net/wireless/ath/ath10k/htt.c<br/>index 127b4e4980ef..dbaf262cd7c1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/htt.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/htt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/htt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/htt.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2005-2011 Atheros Communications Inc.</div><div class='ctx'>  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.</div><div class='add'>+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -131,6 +132,159 @@ static const enum htt_t2h_msg_type htt_10_4_t2h_msg_types[] = {</div><div class='ctx'> 				HTT_T2H_MSG_TYPE_PEER_STATS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+const struct ath10k_htt_rx_desc_ops qca988x_rx_desc_ops = {</div><div class='add'>+	.rx_desc_size = sizeof(struct htt_rx_desc_v1),</div><div class='add'>+	.rx_desc_msdu_payload_offset = offsetof(struct htt_rx_desc_v1, msdu_payload)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ath10k_qca99x0_rx_desc_get_l3_pad_bytes(struct htt_rx_desc *rxd)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_desc_v1 *rx_desc = container_of(rxd,</div><div class='add'>+						      struct htt_rx_desc_v1,</div><div class='add'>+						      base);</div><div class='add'>+</div><div class='add'>+	return MS(__le32_to_cpu(rx_desc-&gt;msdu_end.qca99x0.info1),</div><div class='add'>+		  RX_MSDU_END_INFO1_L3_HDR_PAD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath10k_qca99x0_rx_desc_msdu_limit_error(struct htt_rx_desc *rxd)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_desc_v1 *rx_desc = container_of(rxd,</div><div class='add'>+						      struct htt_rx_desc_v1,</div><div class='add'>+						      base);</div><div class='add'>+</div><div class='add'>+	return !!(rx_desc-&gt;msdu_end.common.info0 &amp;</div><div class='add'>+		  __cpu_to_le32(RX_MSDU_END_INFO0_MSDU_LIMIT_ERR));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ath10k_htt_rx_desc_ops qca99x0_rx_desc_ops = {</div><div class='add'>+	.rx_desc_size = sizeof(struct htt_rx_desc_v1),</div><div class='add'>+	.rx_desc_msdu_payload_offset = offsetof(struct htt_rx_desc_v1, msdu_payload),</div><div class='add'>+</div><div class='add'>+	.rx_desc_get_l3_pad_bytes = ath10k_qca99x0_rx_desc_get_l3_pad_bytes,</div><div class='add'>+	.rx_desc_get_msdu_limit_error = ath10k_qca99x0_rx_desc_msdu_limit_error,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ath10k_rx_desc_wcn3990_get_offsets(struct htt_rx_ring_rx_desc_offsets *off)</div><div class='add'>+{</div><div class='add'>+#define desc_offset(x) (offsetof(struct htt_rx_desc_v2, x) / 4)</div><div class='add'>+	off-&gt;mac80211_hdr_offset = __cpu_to_le16(desc_offset(rx_hdr_status));</div><div class='add'>+	off-&gt;msdu_payload_offset = __cpu_to_le16(desc_offset(msdu_payload));</div><div class='add'>+	off-&gt;ppdu_start_offset = __cpu_to_le16(desc_offset(ppdu_start));</div><div class='add'>+	off-&gt;ppdu_end_offset = __cpu_to_le16(desc_offset(ppdu_end));</div><div class='add'>+	off-&gt;mpdu_start_offset = __cpu_to_le16(desc_offset(mpdu_start));</div><div class='add'>+	off-&gt;mpdu_end_offset = __cpu_to_le16(desc_offset(mpdu_end));</div><div class='add'>+	off-&gt;msdu_start_offset = __cpu_to_le16(desc_offset(msdu_start));</div><div class='add'>+	off-&gt;msdu_end_offset = __cpu_to_le16(desc_offset(msdu_end));</div><div class='add'>+	off-&gt;rx_attention_offset = __cpu_to_le16(desc_offset(attention));</div><div class='add'>+	off-&gt;frag_info_offset = __cpu_to_le16(desc_offset(frag_info));</div><div class='add'>+#undef desc_offset</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct htt_rx_desc *</div><div class='add'>+ath10k_rx_desc_wcn3990_from_raw_buffer(void *buff)</div><div class='add'>+{</div><div class='add'>+	return &amp;((struct htt_rx_desc_v2 *)buff)-&gt;base;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rx_attention *</div><div class='add'>+ath10k_rx_desc_wcn3990_get_attention(struct htt_rx_desc *rxd)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_desc_v2 *rx_desc = container_of(rxd, struct htt_rx_desc_v2, base);</div><div class='add'>+</div><div class='add'>+	return &amp;rx_desc-&gt;attention;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rx_frag_info_common *</div><div class='add'>+ath10k_rx_desc_wcn3990_get_frag_info(struct htt_rx_desc *rxd)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_desc_v2 *rx_desc = container_of(rxd, struct htt_rx_desc_v2, base);</div><div class='add'>+</div><div class='add'>+	return &amp;rx_desc-&gt;frag_info.common;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rx_mpdu_start *</div><div class='add'>+ath10k_rx_desc_wcn3990_get_mpdu_start(struct htt_rx_desc *rxd)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_desc_v2 *rx_desc = container_of(rxd, struct htt_rx_desc_v2, base);</div><div class='add'>+</div><div class='add'>+	return &amp;rx_desc-&gt;mpdu_start;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rx_mpdu_end *</div><div class='add'>+ath10k_rx_desc_wcn3990_get_mpdu_end(struct htt_rx_desc *rxd)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_desc_v2 *rx_desc = container_of(rxd, struct htt_rx_desc_v2, base);</div><div class='add'>+</div><div class='add'>+	return &amp;rx_desc-&gt;mpdu_end;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rx_msdu_start_common *</div><div class='add'>+ath10k_rx_desc_wcn3990_get_msdu_start(struct htt_rx_desc *rxd)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_desc_v2 *rx_desc = container_of(rxd, struct htt_rx_desc_v2, base);</div><div class='add'>+</div><div class='add'>+	return &amp;rx_desc-&gt;msdu_start.common;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rx_msdu_end_common *</div><div class='add'>+ath10k_rx_desc_wcn3990_get_msdu_end(struct htt_rx_desc *rxd)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_desc_v2 *rx_desc = container_of(rxd, struct htt_rx_desc_v2, base);</div><div class='add'>+</div><div class='add'>+	return &amp;rx_desc-&gt;msdu_end.common;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rx_ppdu_start *</div><div class='add'>+ath10k_rx_desc_wcn3990_get_ppdu_start(struct htt_rx_desc *rxd)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_desc_v2 *rx_desc = container_of(rxd, struct htt_rx_desc_v2, base);</div><div class='add'>+</div><div class='add'>+	return &amp;rx_desc-&gt;ppdu_start;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rx_ppdu_end_common *</div><div class='add'>+ath10k_rx_desc_wcn3990_get_ppdu_end(struct htt_rx_desc *rxd)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_desc_v2 *rx_desc = container_of(rxd, struct htt_rx_desc_v2, base);</div><div class='add'>+</div><div class='add'>+	return &amp;rx_desc-&gt;ppdu_end.common;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *</div><div class='add'>+ath10k_rx_desc_wcn3990_get_rx_hdr_status(struct htt_rx_desc *rxd)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_desc_v2 *rx_desc = container_of(rxd, struct htt_rx_desc_v2, base);</div><div class='add'>+</div><div class='add'>+	return rx_desc-&gt;rx_hdr_status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *</div><div class='add'>+ath10k_rx_desc_wcn3990_get_msdu_payload(struct htt_rx_desc *rxd)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_desc_v2 *rx_desc = container_of(rxd, struct htt_rx_desc_v2, base);</div><div class='add'>+</div><div class='add'>+	return rx_desc-&gt;msdu_payload;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ath10k_htt_rx_desc_ops wcn3990_rx_desc_ops = {</div><div class='add'>+	.rx_desc_size = sizeof(struct htt_rx_desc_v2),</div><div class='add'>+	.rx_desc_msdu_payload_offset = offsetof(struct htt_rx_desc_v2, msdu_payload),</div><div class='add'>+</div><div class='add'>+	.rx_desc_from_raw_buffer = ath10k_rx_desc_wcn3990_from_raw_buffer,</div><div class='add'>+	.rx_desc_get_offsets = ath10k_rx_desc_wcn3990_get_offsets,</div><div class='add'>+	.rx_desc_get_attention = ath10k_rx_desc_wcn3990_get_attention,</div><div class='add'>+	.rx_desc_get_frag_info = ath10k_rx_desc_wcn3990_get_frag_info,</div><div class='add'>+	.rx_desc_get_mpdu_start = ath10k_rx_desc_wcn3990_get_mpdu_start,</div><div class='add'>+	.rx_desc_get_mpdu_end = ath10k_rx_desc_wcn3990_get_mpdu_end,</div><div class='add'>+	.rx_desc_get_msdu_start = ath10k_rx_desc_wcn3990_get_msdu_start,</div><div class='add'>+	.rx_desc_get_msdu_end = ath10k_rx_desc_wcn3990_get_msdu_end,</div><div class='add'>+	.rx_desc_get_ppdu_start = ath10k_rx_desc_wcn3990_get_ppdu_start,</div><div class='add'>+	.rx_desc_get_ppdu_end = ath10k_rx_desc_wcn3990_get_ppdu_end,</div><div class='add'>+	.rx_desc_get_rx_hdr_status = ath10k_rx_desc_wcn3990_get_rx_hdr_status,</div><div class='add'>+	.rx_desc_get_msdu_payload = ath10k_rx_desc_wcn3990_get_msdu_payload,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int ath10k_htt_connect(struct ath10k_htt *htt)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k_htc_svc_conn_req conn_req;</div><div class='hunk'>@@ -228,7 +382,7 @@ static int ath10k_htt_verify_version(struct ath10k_htt *htt)</div><div class='ctx'> 	    htt-&gt;target_version_major != 3) {</div><div class='ctx'> 		ath10k_err(ar, "unsupported htt major version %d. supported versions are 2 and 3\n",</div><div class='ctx'> 			   htt-&gt;target_version_major);</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/htt.h b/drivers/net/wireless/ath/ath10k/htt.h<br/>index 956157946106..603f6de62b0a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/htt.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/htt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/htt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/htt.h</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  * Copyright (c) 2005-2011 Atheros Communications Inc.</div><div class='ctx'>  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.</div><div class='ctx'>  * Copyright (c) 2018, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021, 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _HTT_H_</div><div class='hunk'>@@ -69,7 +70,7 @@ struct htt_ver_req {</div><div class='ctx'>  * The HTT tx descriptor is defined in two manners: by a struct with</div><div class='ctx'>  * bitfields, and by a series of [dword offset, bit mask, bit shift]</div><div class='ctx'>  * definitions.</div><div class='del'>- * The target should use the struct def, for simplicitly and clarity,</div><div class='add'>+ * The target should use the struct def, for simplicity and clarity,</div><div class='ctx'>  * but the host shall use the bit-mast + bit-shift defs, to be endian-</div><div class='ctx'>  * neutral.  Specifically, the host shall use the get/set macros built</div><div class='ctx'>  * around the mask + shift defs.</div><div class='hunk'>@@ -240,14 +241,7 @@ enum htt_rx_ring_flags {</div><div class='ctx'> #define HTT_RX_RING_FILL_LEVEL (((HTT_RX_RING_SIZE) / 2) - 1)</div><div class='ctx'> #define HTT_RX_RING_FILL_LEVEL_DUAL_MAC (HTT_RX_RING_SIZE - 1)</div><div class='ctx'> </div><div class='del'>-struct htt_rx_ring_setup_ring32 {</div><div class='del'>-	__le32 fw_idx_shadow_reg_paddr;</div><div class='del'>-	__le32 rx_ring_base_paddr;</div><div class='del'>-	__le16 rx_ring_len; /* in 4-byte words */</div><div class='del'>-	__le16 rx_ring_bufsize; /* rx skb size - in bytes */</div><div class='del'>-	__le16 flags; /* %HTT_RX_RING_FLAGS_ */</div><div class='del'>-	__le16 fw_idx_init_val;</div><div class='del'>-</div><div class='add'>+struct htt_rx_ring_rx_desc_offsets {</div><div class='ctx'> 	/* the following offsets are in 4-byte units */</div><div class='ctx'> 	__le16 mac80211_hdr_offset;</div><div class='ctx'> 	__le16 msdu_payload_offset;</div><div class='hunk'>@@ -261,6 +255,17 @@ struct htt_rx_ring_setup_ring32 {</div><div class='ctx'> 	__le16 frag_info_offset;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct htt_rx_ring_setup_ring32 {</div><div class='add'>+	__le32 fw_idx_shadow_reg_paddr;</div><div class='add'>+	__le32 rx_ring_base_paddr;</div><div class='add'>+	__le16 rx_ring_len; /* in 4-byte words */</div><div class='add'>+	__le16 rx_ring_bufsize; /* rx skb size - in bytes */</div><div class='add'>+	__le16 flags; /* %HTT_RX_RING_FLAGS_ */</div><div class='add'>+	__le16 fw_idx_init_val;</div><div class='add'>+</div><div class='add'>+	struct htt_rx_ring_rx_desc_offsets offsets;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct htt_rx_ring_setup_ring64 {</div><div class='ctx'> 	__le64 fw_idx_shadow_reg_paddr;</div><div class='ctx'> 	__le64 rx_ring_base_paddr;</div><div class='hunk'>@@ -269,17 +274,7 @@ struct htt_rx_ring_setup_ring64 {</div><div class='ctx'> 	__le16 flags; /* %HTT_RX_RING_FLAGS_ */</div><div class='ctx'> 	__le16 fw_idx_init_val;</div><div class='ctx'> </div><div class='del'>-	/* the following offsets are in 4-byte units */</div><div class='del'>-	__le16 mac80211_hdr_offset;</div><div class='del'>-	__le16 msdu_payload_offset;</div><div class='del'>-	__le16 ppdu_start_offset;</div><div class='del'>-	__le16 ppdu_end_offset;</div><div class='del'>-	__le16 mpdu_start_offset;</div><div class='del'>-	__le16 mpdu_end_offset;</div><div class='del'>-	__le16 msdu_start_offset;</div><div class='del'>-	__le16 msdu_end_offset;</div><div class='del'>-	__le16 rx_attention_offset;</div><div class='del'>-	__le16 frag_info_offset;</div><div class='add'>+	struct htt_rx_ring_rx_desc_offsets offsets;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct htt_rx_ring_setup_hdr {</div><div class='hunk'>@@ -713,7 +708,7 @@ struct htt_rx_indication_prefix {</div><div class='ctx'> 	__le16 fw_rx_desc_bytes;</div><div class='ctx'> 	u8 pad0;</div><div class='ctx'> 	u8 pad1;</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct htt_rx_indication {</div><div class='ctx'> 	struct htt_rx_indication_hdr hdr;</div><div class='hunk'>@@ -845,6 +840,7 @@ enum htt_security_types {</div><div class='ctx'> </div><div class='ctx'> #define ATH10K_HTT_TXRX_PEER_SECURITY_MAX 2</div><div class='ctx'> #define ATH10K_TXRX_NUM_EXT_TIDS 19</div><div class='add'>+#define ATH10K_TXRX_NON_QOS_TID 16</div><div class='ctx'> </div><div class='ctx'> enum htt_security_flags {</div><div class='ctx'> #define HTT_SECURITY_TYPE_MASK 0x7F</div><div class='hunk'>@@ -885,8 +881,7 @@ enum htt_data_tx_status {</div><div class='ctx'> 	HTT_DATA_TX_STATUS_OK            = 0,</div><div class='ctx'> 	HTT_DATA_TX_STATUS_DISCARD       = 1,</div><div class='ctx'> 	HTT_DATA_TX_STATUS_NO_ACK        = 2,</div><div class='del'>-	HTT_DATA_TX_STATUS_POSTPONE      = 3, /* HL only */</div><div class='del'>-	HTT_DATA_TX_STATUS_DOWNLOAD_FAIL = 128</div><div class='add'>+	HTT_DATA_TX_STATUS_POSTPONE      = 3 /* HL only */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum htt_data_tx_flags {</div><div class='hunk'>@@ -911,7 +906,7 @@ struct htt_data_tx_completion_ext {</div><div class='ctx'> 	__le16 msdus_rssi[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * @brief target -&gt; host TX completion indication message definition</div><div class='ctx'>  *</div><div class='ctx'>  * @details</div><div class='hunk'>@@ -1113,8 +1108,10 @@ struct htt_rx_in_ord_ind {</div><div class='ctx'> 	u8 reserved;</div><div class='ctx'> 	__le16 msdu_count;</div><div class='ctx'> 	union {</div><div class='del'>-		struct htt_rx_in_ord_msdu_desc msdu_descs32[0];</div><div class='del'>-		struct htt_rx_in_ord_msdu_desc_ext msdu_descs64[0];</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct htt_rx_in_ord_msdu_desc,</div><div class='add'>+				   msdu_descs32);</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct htt_rx_in_ord_msdu_desc_ext,</div><div class='add'>+				   msdu_descs64);</div><div class='ctx'> 	} __packed;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -1282,8 +1279,8 @@ struct htt_dbg_stats_wal_tx_stats {</div><div class='ctx'> 	/* Num PPDUs cleaned up in TX abort */</div><div class='ctx'> 	__le32 tx_abort;</div><div class='ctx'> </div><div class='del'>-	/* Num MPDUs requed by SW */</div><div class='del'>-	__le32 mpdus_requed;</div><div class='add'>+	/* Num MPDUs requeued by SW */</div><div class='add'>+	__le32 mpdus_requeued;</div><div class='ctx'> </div><div class='ctx'> 	/* excessive retries */</div><div class='ctx'> 	__le32 tx_ko;</div><div class='hunk'>@@ -1400,115 +1397,6 @@ enum htt_dbg_stats_status {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * target -&gt; host statistics upload</div><div class='del'>- *</div><div class='del'>- * The following field definitions describe the format of the HTT target</div><div class='del'>- * to host stats upload confirmation message.</div><div class='del'>- * The message contains a cookie echoed from the HTT host-&gt;target stats</div><div class='del'>- * upload request, which identifies which request the confirmation is</div><div class='del'>- * for, and a series of tag-length-value stats information elements.</div><div class='del'>- * The tag-length header for each stats info element also includes a</div><div class='del'>- * status field, to indicate whether the request for the stat type in</div><div class='del'>- * question was fully met, partially met, unable to be met, or invalid</div><div class='del'>- * (if the stat type in question is disabled in the target).</div><div class='del'>- * A special value of all 1's in this status field is used to indicate</div><div class='del'>- * the end of the series of stats info elements.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * |31                         16|15           8|7   5|4       0|</div><div class='del'>- * |------------------------------------------------------------|</div><div class='del'>- * |                  reserved                  |    msg type   |</div><div class='del'>- * |------------------------------------------------------------|</div><div class='del'>- * |                        cookie LSBs                         |</div><div class='del'>- * |------------------------------------------------------------|</div><div class='del'>- * |                        cookie MSBs                         |</div><div class='del'>- * |------------------------------------------------------------|</div><div class='del'>- * |      stats entry length     |   reserved   |  S  |stat type|</div><div class='del'>- * |------------------------------------------------------------|</div><div class='del'>- * |                                                            |</div><div class='del'>- * |                  type-specific stats info                  |</div><div class='del'>- * |                                                            |</div><div class='del'>- * |------------------------------------------------------------|</div><div class='del'>- * |      stats entry length     |   reserved   |  S  |stat type|</div><div class='del'>- * |------------------------------------------------------------|</div><div class='del'>- * |                                                            |</div><div class='del'>- * |                  type-specific stats info                  |</div><div class='del'>- * |                                                            |</div><div class='del'>- * |------------------------------------------------------------|</div><div class='del'>- * |              n/a            |   reserved   | 111 |   n/a   |</div><div class='del'>- * |------------------------------------------------------------|</div><div class='del'>- * Header fields:</div><div class='del'>- *  - MSG_TYPE</div><div class='del'>- *    Bits 7:0</div><div class='del'>- *    Purpose: identifies this is a statistics upload confirmation message</div><div class='del'>- *    Value: 0x9</div><div class='del'>- *  - COOKIE_LSBS</div><div class='del'>- *    Bits 31:0</div><div class='del'>- *    Purpose: Provide a mechanism to match a target-&gt;host stats confirmation</div><div class='del'>- *        message with its preceding host-&gt;target stats request message.</div><div class='del'>- *    Value: LSBs of the opaque cookie specified by the host-side requestor</div><div class='del'>- *  - COOKIE_MSBS</div><div class='del'>- *    Bits 31:0</div><div class='del'>- *    Purpose: Provide a mechanism to match a target-&gt;host stats confirmation</div><div class='del'>- *        message with its preceding host-&gt;target stats request message.</div><div class='del'>- *    Value: MSBs of the opaque cookie specified by the host-side requestor</div><div class='del'>- *</div><div class='del'>- * Stats Information Element tag-length header fields:</div><div class='del'>- *  - STAT_TYPE</div><div class='del'>- *    Bits 4:0</div><div class='del'>- *    Purpose: identifies the type of statistics info held in the</div><div class='del'>- *        following information element</div><div class='del'>- *    Value: htt_dbg_stats_type</div><div class='del'>- *  - STATUS</div><div class='del'>- *    Bits 7:5</div><div class='del'>- *    Purpose: indicate whether the requested stats are present</div><div class='del'>- *    Value: htt_dbg_stats_status, including a special value (0x7) to mark</div><div class='del'>- *        the completion of the stats entry series</div><div class='del'>- *  - LENGTH</div><div class='del'>- *    Bits 31:16</div><div class='del'>- *    Purpose: indicate the stats information size</div><div class='del'>- *    Value: This field specifies the number of bytes of stats information</div><div class='del'>- *       that follows the element tag-length header.</div><div class='del'>- *       It is expected but not required that this length is a multiple of</div><div class='del'>- *       4 bytes.  Even if the length is not an integer multiple of 4, the</div><div class='del'>- *       subsequent stats entry header will begin on a 4-byte aligned</div><div class='del'>- *       boundary.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define HTT_STATS_CONF_ITEM_INFO_STAT_TYPE_MASK 0x1F</div><div class='del'>-#define HTT_STATS_CONF_ITEM_INFO_STAT_TYPE_LSB  0</div><div class='del'>-#define HTT_STATS_CONF_ITEM_INFO_STATUS_MASK    0xE0</div><div class='del'>-#define HTT_STATS_CONF_ITEM_INFO_STATUS_LSB     5</div><div class='del'>-</div><div class='del'>-struct htt_stats_conf_item {</div><div class='del'>-	union {</div><div class='del'>-		u8 info;</div><div class='del'>-		struct {</div><div class='del'>-			u8 stat_type:5; /* %HTT_DBG_STATS_ */</div><div class='del'>-			u8 status:3; /* %HTT_DBG_STATS_STATUS_ */</div><div class='del'>-		} __packed;</div><div class='del'>-	} __packed;</div><div class='del'>-	u8 pad;</div><div class='del'>-	__le16 length;</div><div class='del'>-	u8 payload[]; /* roundup(length, 4) long */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct htt_stats_conf {</div><div class='del'>-	u8 pad[3];</div><div class='del'>-	__le32 cookie_lsb;</div><div class='del'>-	__le32 cookie_msb;</div><div class='del'>-</div><div class='del'>-	/* each item has variable length! */</div><div class='del'>-	struct htt_stats_conf_item items[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-static inline struct htt_stats_conf_item *htt_stats_conf_next_item(</div><div class='del'>-					const struct htt_stats_conf_item *item)</div><div class='del'>-{</div><div class='del'>-	return (void *)item + sizeof(*item) + roundup(item-&gt;length, 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * host -&gt; target FRAG DESCRIPTOR/MSDU_EXT DESC bank</div><div class='ctx'>  *</div><div class='ctx'>  * The following field definitions describe the format of the HTT host</div><div class='hunk'>@@ -1586,15 +1474,19 @@ enum htt_q_depth_type {</div><div class='ctx'> #define HTT_TX_Q_STATE_ENTRY_MULTIPLIER		0</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * htt_q_state_conf - part of htt_frag_desc_bank_cfg for host q state config</div><div class='add'>+ * struct htt_q_state_conf - part of htt_frag_desc_bank_cfg for host q state config</div><div class='ctx'>  *</div><div class='ctx'>  * Defines host q state format and behavior. See htt_q_state.</div><div class='ctx'>  *</div><div class='add'>+ * @paddr: Queue physical address</div><div class='add'>+ * @num_peers: Number of supported peers</div><div class='add'>+ * @num_tids: Number of supported TIDs</div><div class='ctx'>  * @record_size: Defines the size of each host q entry in bytes. In practice</div><div class='ctx'>  *	however firmware (at least 10.4.3-00191) ignores this host</div><div class='ctx'>  *	configuration value and uses hardcoded value of 1.</div><div class='ctx'>  * @record_multiplier: This is valid only when q depth type is MSDUs. It</div><div class='ctx'>  *	defines the exponent for the power of 2 multiplication.</div><div class='add'>+ * @pad: struct padding for 32-bit alignment</div><div class='ctx'>  */</div><div class='ctx'> struct htt_q_state_conf {</div><div class='ctx'> 	__le32 paddr;</div><div class='hunk'>@@ -1630,7 +1522,7 @@ struct htt_frag_desc_bank_cfg64 {</div><div class='ctx'> #define HTT_TX_Q_STATE_ENTRY_EXP_LSB		6</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * htt_q_state - shared between host and firmware via DMA</div><div class='add'>+ * struct htt_q_state - shared between host and firmware via DMA</div><div class='ctx'>  *</div><div class='ctx'>  * This structure is used for the host to expose it's software queue state to</div><div class='ctx'>  * firmware so that its rate control can schedule fetch requests for optimized</div><div class='hunk'>@@ -1673,8 +1565,11 @@ struct htt_tx_fetch_ind {</div><div class='ctx'> 	__le32 token;</div><div class='ctx'> 	__le16 num_resp_ids;</div><div class='ctx'> 	__le16 num_records;</div><div class='del'>-	__le32 resp_ids[0]; /* ath10k_htt_get_tx_fetch_ind_resp_ids() */</div><div class='del'>-	struct htt_tx_fetch_record records[];</div><div class='add'>+	union {</div><div class='add'>+		/* ath10k_htt_get_tx_fetch_ind_resp_ids() */</div><div class='add'>+		DECLARE_FLEX_ARRAY(__le32, resp_ids);</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct htt_tx_fetch_record, records);</div><div class='add'>+	} __packed;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> static inline void *</div><div class='hunk'>@@ -1824,7 +1719,6 @@ struct htt_resp {</div><div class='ctx'> 		struct htt_rc_update rc_update;</div><div class='ctx'> 		struct htt_rx_test rx_test;</div><div class='ctx'> 		struct htt_pktlog_msg pktlog_msg;</div><div class='del'>-		struct htt_stats_conf stats_conf;</div><div class='ctx'> 		struct htt_rx_pn_ind rx_pn_ind;</div><div class='ctx'> 		struct htt_rx_offload_ind rx_offload_ind;</div><div class='ctx'> 		struct htt_rx_in_ord_ind rx_in_ord_ind;</div><div class='hunk'>@@ -1833,7 +1727,7 @@ struct htt_resp {</div><div class='ctx'> 		struct htt_tx_mode_switch_ind tx_mode_switch_ind;</div><div class='ctx'> 		struct htt_channel_change chan_change;</div><div class='ctx'> 		struct htt_peer_tx_stats peer_tx_stats;</div><div class='del'>-	};</div><div class='add'>+	} __packed;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*** host side structures follow ***/</div><div class='hunk'>@@ -2181,12 +2075,22 @@ static inline bool ath10k_htt_rx_proc_rx_frag_ind(struct ath10k_htt *htt,</div><div class='ctx'> 	return htt-&gt;rx_ops-&gt;htt_rx_proc_rx_frag_ind(htt, rx, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* the driver strongly assumes that the rx header status be 64 bytes long,</div><div class='add'>+ * so all possible rx_desc structures must respect this assumption.</div><div class='add'>+ */</div><div class='ctx'> #define RX_HTT_HDR_STATUS_LEN 64</div><div class='ctx'> </div><div class='del'>-/* This structure layout is programmed via rx ring setup</div><div class='add'>+/* The rx descriptor structure layout is programmed via rx ring setup</div><div class='ctx'>  * so that FW knows how to transfer the rx descriptor to the host.</div><div class='del'>- * Buffers like this are placed on the rx ring.</div><div class='add'>+ * Unfortunately, though, QCA6174's firmware doesn't currently behave correctly</div><div class='add'>+ * when modifying the structure layout of the rx descriptor beyond what it expects</div><div class='add'>+ * (even if it correctly programmed during the rx ring setup).</div><div class='add'>+ * Therefore we must keep two different memory layouts, abstract the rx descriptor</div><div class='add'>+ * representation and use ath10k_rx_desc_ops</div><div class='add'>+ * for correctly accessing rx descriptor data.</div><div class='ctx'>  */</div><div class='add'>+</div><div class='add'>+/* base struct used for abstracting the rx descriptor representation */</div><div class='ctx'> struct htt_rx_desc {</div><div class='ctx'> 	union {</div><div class='ctx'> 		/* This field is filled on the host using the msdu buffer</div><div class='hunk'>@@ -2195,6 +2099,13 @@ struct htt_rx_desc {</div><div class='ctx'> 		struct fw_rx_desc_base fw_desc;</div><div class='ctx'> 		u32 pad;</div><div class='ctx'> 	} __packed;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* rx descriptor for wcn3990 and possibly extensible for newer cards</div><div class='add'>+ * Buffers like this are placed on the rx ring.</div><div class='add'>+ */</div><div class='add'>+struct htt_rx_desc_v2 {</div><div class='add'>+	struct htt_rx_desc base;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct rx_attention attention;</div><div class='ctx'> 		struct rx_frag_info frag_info;</div><div class='hunk'>@@ -2209,6 +2120,240 @@ struct htt_rx_desc {</div><div class='ctx'> 	u8 msdu_payload[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* QCA6174, QCA988x, QCA99x0 dedicated rx descriptor to make sure their firmware</div><div class='add'>+ * works correctly. We keep a single rx descriptor for all these three</div><div class='add'>+ * families of cards because from tests it seems to be the most stable solution,</div><div class='add'>+ * e.g. having a rx descriptor only for QCA6174 seldom caused firmware crashes</div><div class='add'>+ * during some tests.</div><div class='add'>+ * Buffers like this are placed on the rx ring.</div><div class='add'>+ */</div><div class='add'>+struct htt_rx_desc_v1 {</div><div class='add'>+	struct htt_rx_desc base;</div><div class='add'>+	struct {</div><div class='add'>+		struct rx_attention attention;</div><div class='add'>+		struct rx_frag_info_v1 frag_info;</div><div class='add'>+		struct rx_mpdu_start mpdu_start;</div><div class='add'>+		struct rx_msdu_start_v1 msdu_start;</div><div class='add'>+		struct rx_msdu_end_v1 msdu_end;</div><div class='add'>+		struct rx_mpdu_end mpdu_end;</div><div class='add'>+		struct rx_ppdu_start ppdu_start;</div><div class='add'>+		struct rx_ppdu_end_v1 ppdu_end;</div><div class='add'>+	} __packed;</div><div class='add'>+	u8 rx_hdr_status[RX_HTT_HDR_STATUS_LEN];</div><div class='add'>+	u8 msdu_payload[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* rx_desc abstraction */</div><div class='add'>+struct ath10k_htt_rx_desc_ops {</div><div class='add'>+	/* These fields are mandatory, they must be specified in any instance */</div><div class='add'>+</div><div class='add'>+	/* sizeof() of the rx_desc structure used by this hw */</div><div class='add'>+	size_t rx_desc_size;</div><div class='add'>+</div><div class='add'>+	/* offset of msdu_payload inside the rx_desc structure used by this hw */</div><div class='add'>+	size_t rx_desc_msdu_payload_offset;</div><div class='add'>+</div><div class='add'>+	/* These fields are options.</div><div class='add'>+	 * When a field is not provided the default implementation gets used</div><div class='add'>+	 * (see the ath10k_rx_desc_* operations below for more info about the defaults)</div><div class='add'>+	 */</div><div class='add'>+	bool (*rx_desc_get_msdu_limit_error)(struct htt_rx_desc *rxd);</div><div class='add'>+	int (*rx_desc_get_l3_pad_bytes)(struct htt_rx_desc *rxd);</div><div class='add'>+</div><div class='add'>+	/* Safely cast from a void* buffer containing an rx descriptor</div><div class='add'>+	 * to the proper rx_desc structure</div><div class='add'>+	 */</div><div class='add'>+	struct htt_rx_desc *(*rx_desc_from_raw_buffer)(void *buff);</div><div class='add'>+</div><div class='add'>+	void (*rx_desc_get_offsets)(struct htt_rx_ring_rx_desc_offsets *offs);</div><div class='add'>+	struct rx_attention *(*rx_desc_get_attention)(struct htt_rx_desc *rxd);</div><div class='add'>+	struct rx_frag_info_common *(*rx_desc_get_frag_info)(struct htt_rx_desc *rxd);</div><div class='add'>+	struct rx_mpdu_start *(*rx_desc_get_mpdu_start)(struct htt_rx_desc *rxd);</div><div class='add'>+	struct rx_mpdu_end *(*rx_desc_get_mpdu_end)(struct htt_rx_desc *rxd);</div><div class='add'>+	struct rx_msdu_start_common *(*rx_desc_get_msdu_start)(struct htt_rx_desc *rxd);</div><div class='add'>+	struct rx_msdu_end_common *(*rx_desc_get_msdu_end)(struct htt_rx_desc *rxd);</div><div class='add'>+	struct rx_ppdu_start *(*rx_desc_get_ppdu_start)(struct htt_rx_desc *rxd);</div><div class='add'>+	struct rx_ppdu_end_common *(*rx_desc_get_ppdu_end)(struct htt_rx_desc *rxd);</div><div class='add'>+	u8 *(*rx_desc_get_rx_hdr_status)(struct htt_rx_desc *rxd);</div><div class='add'>+	u8 *(*rx_desc_get_msdu_payload)(struct htt_rx_desc *rxd);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct ath10k_htt_rx_desc_ops qca988x_rx_desc_ops;</div><div class='add'>+extern const struct ath10k_htt_rx_desc_ops qca99x0_rx_desc_ops;</div><div class='add'>+extern const struct ath10k_htt_rx_desc_ops wcn3990_rx_desc_ops;</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+ath10k_htt_rx_desc_get_l3_pad_bytes(struct ath10k_hw_params *hw, struct htt_rx_desc *rxd)</div><div class='add'>+{</div><div class='add'>+	if (hw-&gt;rx_desc_ops-&gt;rx_desc_get_l3_pad_bytes)</div><div class='add'>+		return hw-&gt;rx_desc_ops-&gt;rx_desc_get_l3_pad_bytes(rxd);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+ath10k_htt_rx_desc_msdu_limit_error(struct ath10k_hw_params *hw, struct htt_rx_desc *rxd)</div><div class='add'>+{</div><div class='add'>+	if (hw-&gt;rx_desc_ops-&gt;rx_desc_get_msdu_limit_error)</div><div class='add'>+		return hw-&gt;rx_desc_ops-&gt;rx_desc_get_msdu_limit_error(rxd);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The default implementation of all these getters is using the old rx_desc,</div><div class='add'>+ * so that it is easier to define the ath10k_htt_rx_desc_ops instances.</div><div class='add'>+ * But probably, if new wireless cards must be supported, it would be better</div><div class='add'>+ * to switch the default implementation to the new rx_desc, since this would</div><div class='add'>+ * make the extension easier .</div><div class='add'>+ */</div><div class='add'>+static inline struct htt_rx_desc *</div><div class='add'>+ath10k_htt_rx_desc_from_raw_buffer(struct ath10k_hw_params *hw,	void *buff)</div><div class='add'>+{</div><div class='add'>+	if (hw-&gt;rx_desc_ops-&gt;rx_desc_from_raw_buffer)</div><div class='add'>+		return hw-&gt;rx_desc_ops-&gt;rx_desc_from_raw_buffer(buff);</div><div class='add'>+	return &amp;((struct htt_rx_desc_v1 *)buff)-&gt;base;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+ath10k_htt_rx_desc_get_offsets(struct ath10k_hw_params *hw,</div><div class='add'>+			       struct htt_rx_ring_rx_desc_offsets *off)</div><div class='add'>+{</div><div class='add'>+	if (hw-&gt;rx_desc_ops-&gt;rx_desc_get_offsets) {</div><div class='add'>+		hw-&gt;rx_desc_ops-&gt;rx_desc_get_offsets(off);</div><div class='add'>+	} else {</div><div class='add'>+#define	desc_offset(x) (offsetof(struct	htt_rx_desc_v1, x)	/ 4)</div><div class='add'>+		off-&gt;mac80211_hdr_offset = __cpu_to_le16(desc_offset(rx_hdr_status));</div><div class='add'>+		off-&gt;msdu_payload_offset = __cpu_to_le16(desc_offset(msdu_payload));</div><div class='add'>+		off-&gt;ppdu_start_offset = __cpu_to_le16(desc_offset(ppdu_start));</div><div class='add'>+		off-&gt;ppdu_end_offset = __cpu_to_le16(desc_offset(ppdu_end));</div><div class='add'>+		off-&gt;mpdu_start_offset = __cpu_to_le16(desc_offset(mpdu_start));</div><div class='add'>+		off-&gt;mpdu_end_offset = __cpu_to_le16(desc_offset(mpdu_end));</div><div class='add'>+		off-&gt;msdu_start_offset = __cpu_to_le16(desc_offset(msdu_start));</div><div class='add'>+		off-&gt;msdu_end_offset = __cpu_to_le16(desc_offset(msdu_end));</div><div class='add'>+		off-&gt;rx_attention_offset = __cpu_to_le16(desc_offset(attention));</div><div class='add'>+		off-&gt;frag_info_offset =	__cpu_to_le16(desc_offset(frag_info));</div><div class='add'>+#undef desc_offset</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct rx_attention *</div><div class='add'>+ath10k_htt_rx_desc_get_attention(struct	ath10k_hw_params *hw, struct htt_rx_desc *rxd)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_desc_v1 *rx_desc;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;rx_desc_ops-&gt;rx_desc_get_attention)</div><div class='add'>+		return hw-&gt;rx_desc_ops-&gt;rx_desc_get_attention(rxd);</div><div class='add'>+</div><div class='add'>+	rx_desc = container_of(rxd, struct htt_rx_desc_v1, base);</div><div class='add'>+	return &amp;rx_desc-&gt;attention;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct rx_frag_info_common *</div><div class='add'>+ath10k_htt_rx_desc_get_frag_info(struct	ath10k_hw_params *hw, struct htt_rx_desc *rxd)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_desc_v1 *rx_desc;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;rx_desc_ops-&gt;rx_desc_get_frag_info)</div><div class='add'>+		return hw-&gt;rx_desc_ops-&gt;rx_desc_get_frag_info(rxd);</div><div class='add'>+</div><div class='add'>+	rx_desc = container_of(rxd, struct htt_rx_desc_v1, base);</div><div class='add'>+	return &amp;rx_desc-&gt;frag_info.common;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct rx_mpdu_start *</div><div class='add'>+ath10k_htt_rx_desc_get_mpdu_start(struct ath10k_hw_params *hw, struct htt_rx_desc *rxd)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_desc_v1 *rx_desc;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;rx_desc_ops-&gt;rx_desc_get_mpdu_start)</div><div class='add'>+		return hw-&gt;rx_desc_ops-&gt;rx_desc_get_mpdu_start(rxd);</div><div class='add'>+</div><div class='add'>+	rx_desc = container_of(rxd, struct htt_rx_desc_v1, base);</div><div class='add'>+	return &amp;rx_desc-&gt;mpdu_start;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct rx_mpdu_end *</div><div class='add'>+ath10k_htt_rx_desc_get_mpdu_end(struct ath10k_hw_params	*hw, struct htt_rx_desc	*rxd)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_desc_v1 *rx_desc;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;rx_desc_ops-&gt;rx_desc_get_mpdu_end)</div><div class='add'>+		return hw-&gt;rx_desc_ops-&gt;rx_desc_get_mpdu_end(rxd);</div><div class='add'>+</div><div class='add'>+	rx_desc = container_of(rxd, struct htt_rx_desc_v1, base);</div><div class='add'>+	return &amp;rx_desc-&gt;mpdu_end;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct rx_msdu_start_common *</div><div class='add'>+ath10k_htt_rx_desc_get_msdu_start(struct ath10k_hw_params *hw, struct htt_rx_desc *rxd)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_desc_v1 *rx_desc;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;rx_desc_ops-&gt;rx_desc_get_msdu_start)</div><div class='add'>+		return hw-&gt;rx_desc_ops-&gt;rx_desc_get_msdu_start(rxd);</div><div class='add'>+</div><div class='add'>+	rx_desc = container_of(rxd, struct htt_rx_desc_v1, base);</div><div class='add'>+	return &amp;rx_desc-&gt;msdu_start.common;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct rx_msdu_end_common	*</div><div class='add'>+ath10k_htt_rx_desc_get_msdu_end(struct ath10k_hw_params	*hw, struct htt_rx_desc	*rxd)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_desc_v1 *rx_desc;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;rx_desc_ops-&gt;rx_desc_get_msdu_end)</div><div class='add'>+		return hw-&gt;rx_desc_ops-&gt;rx_desc_get_msdu_end(rxd);</div><div class='add'>+</div><div class='add'>+	rx_desc = container_of(rxd, struct htt_rx_desc_v1, base);</div><div class='add'>+	return &amp;rx_desc-&gt;msdu_end.common;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct rx_ppdu_start *</div><div class='add'>+ath10k_htt_rx_desc_get_ppdu_start(struct ath10k_hw_params *hw, struct htt_rx_desc *rxd)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_desc_v1 *rx_desc;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;rx_desc_ops-&gt;rx_desc_get_ppdu_start)</div><div class='add'>+		return hw-&gt;rx_desc_ops-&gt;rx_desc_get_ppdu_start(rxd);</div><div class='add'>+</div><div class='add'>+	rx_desc = container_of(rxd, struct htt_rx_desc_v1, base);</div><div class='add'>+	return &amp;rx_desc-&gt;ppdu_start;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct rx_ppdu_end_common	*</div><div class='add'>+ath10k_htt_rx_desc_get_ppdu_end(struct ath10k_hw_params	*hw, struct htt_rx_desc	*rxd)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_desc_v1 *rx_desc;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;rx_desc_ops-&gt;rx_desc_get_ppdu_end)</div><div class='add'>+		return hw-&gt;rx_desc_ops-&gt;rx_desc_get_ppdu_end(rxd);</div><div class='add'>+</div><div class='add'>+	rx_desc = container_of(rxd, struct htt_rx_desc_v1, base);</div><div class='add'>+	return &amp;rx_desc-&gt;ppdu_end.common;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 *</div><div class='add'>+ath10k_htt_rx_desc_get_rx_hdr_status(struct ath10k_hw_params *hw, struct htt_rx_desc *rxd)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_desc_v1 *rx_desc;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;rx_desc_ops-&gt;rx_desc_get_rx_hdr_status)</div><div class='add'>+		return hw-&gt;rx_desc_ops-&gt;rx_desc_get_rx_hdr_status(rxd);</div><div class='add'>+</div><div class='add'>+	rx_desc = container_of(rxd, struct htt_rx_desc_v1, base);</div><div class='add'>+	return rx_desc-&gt;rx_hdr_status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 *</div><div class='add'>+ath10k_htt_rx_desc_get_msdu_payload(struct ath10k_hw_params *hw, struct	htt_rx_desc *rxd)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_desc_v1 *rx_desc;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;rx_desc_ops-&gt;rx_desc_get_msdu_payload)</div><div class='add'>+		return hw-&gt;rx_desc_ops-&gt;rx_desc_get_msdu_payload(rxd);</div><div class='add'>+</div><div class='add'>+	rx_desc = container_of(rxd, struct htt_rx_desc_v1, base);</div><div class='add'>+	return rx_desc-&gt;msdu_payload;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define HTT_RX_DESC_HL_INFO_SEQ_NUM_MASK           0x00000fff</div><div class='ctx'> #define HTT_RX_DESC_HL_INFO_SEQ_NUM_LSB            0</div><div class='ctx'> #define HTT_RX_DESC_HL_INFO_ENCRYPTED_MASK         0x00001000</div><div class='hunk'>@@ -2242,7 +2387,14 @@ struct htt_rx_chan_info {</div><div class='ctx'>  * rounded up to a cache line size.</div><div class='ctx'>  */</div><div class='ctx'> #define HTT_RX_BUF_SIZE 2048</div><div class='del'>-#define HTT_RX_MSDU_SIZE (HTT_RX_BUF_SIZE - (int)sizeof(struct htt_rx_desc))</div><div class='add'>+</div><div class='add'>+/* The HTT_RX_MSDU_SIZE can't be statically computed anymore,</div><div class='add'>+ * because it depends on the underlying device rx_desc representation</div><div class='add'>+ */</div><div class='add'>+static inline int ath10k_htt_rx_msdu_size(struct ath10k_hw_params *hw)</div><div class='add'>+{</div><div class='add'>+	return HTT_RX_BUF_SIZE - (int)hw-&gt;rx_desc_ops-&gt;rx_desc_size;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* Refill a bunch of RX buffers for each refill round so that FW/HW can handle</div><div class='ctx'>  * aggregated traffic more nicely.</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c<br/>index 1a08156d5011..d7e429041065 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/htt_rx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/htt_rx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/htt_rx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/htt_rx.c</a></div><div class='hunk'>@@ -3,8 +3,12 @@</div><div class='ctx'>  * Copyright (c) 2005-2011 Atheros Communications Inc.</div><div class='ctx'>  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.</div><div class='ctx'>  * Copyright (c) 2018, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "htc.h"</div><div class='ctx'> #include "htt.h"</div><div class='hunk'>@@ -21,7 +25,10 @@</div><div class='ctx'> </div><div class='ctx'> #define HTT_RX_RING_REFILL_RESCHED_MS 5</div><div class='ctx'> </div><div class='del'>-static int ath10k_htt_rx_get_csum_state(struct sk_buff *skb);</div><div class='add'>+/* shortcut to interpret a raw memory buffer as a rx descriptor */</div><div class='add'>+#define HTT_RX_BUF_TO_RX_DESC(hw, buf) ath10k_htt_rx_desc_from_raw_buffer(hw, buf)</div><div class='add'>+</div><div class='add'>+static int ath10k_htt_rx_get_csum_state(struct ath10k_hw_params *hw, struct sk_buff *skb);</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *</div><div class='ctx'> ath10k_htt_rx_find_skb_paddr(struct ath10k *ar, u64 paddr)</div><div class='hunk'>@@ -128,6 +135,7 @@ static void *ath10k_htt_get_vaddr_ring_64(struct ath10k_htt *htt)</div><div class='ctx'> </div><div class='ctx'> static int __ath10k_htt_rx_ring_fill_n(struct ath10k_htt *htt, int num)</div><div class='ctx'> {</div><div class='add'>+	struct ath10k_hw_params *hw = &amp;htt-&gt;ar-&gt;hw_params;</div><div class='ctx'> 	struct htt_rx_desc *rx_desc;</div><div class='ctx'> 	struct ath10k_skb_rxcb *rxcb;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -163,8 +171,8 @@ static int __ath10k_htt_rx_ring_fill_n(struct ath10k_htt *htt, int num)</div><div class='ctx'> 				 skb-&gt;data);</div><div class='ctx'> </div><div class='ctx'> 		/* Clear rx_desc attention word before posting to Rx ring */</div><div class='del'>-		rx_desc = (struct htt_rx_desc *)skb-&gt;data;</div><div class='del'>-		rx_desc-&gt;attention.flags = __cpu_to_le32(0);</div><div class='add'>+		rx_desc = HTT_RX_BUF_TO_RX_DESC(hw, skb-&gt;data);</div><div class='add'>+		ath10k_htt_rx_desc_get_attention(hw, rx_desc)-&gt;flags = __cpu_to_le32(0);</div><div class='ctx'> </div><div class='ctx'> 		paddr = dma_map_single(htt-&gt;ar-&gt;dev, skb-&gt;data,</div><div class='ctx'> 				       skb-&gt;len + skb_tailroom(skb),</div><div class='hunk'>@@ -252,7 +260,8 @@ static void ath10k_htt_rx_msdu_buff_replenish(struct ath10k_htt *htt)</div><div class='ctx'> </div><div class='ctx'> static void ath10k_htt_rx_ring_refill_retry(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ath10k_htt *htt = from_timer(htt, t, rx_ring.refill_retry_timer);</div><div class='add'>+	struct ath10k_htt *htt = timer_container_of(htt, t,</div><div class='add'>+						    rx_ring.refill_retry_timer);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_htt_rx_msdu_buff_replenish(htt);</div><div class='ctx'> }</div><div class='hunk'>@@ -282,7 +291,7 @@ void ath10k_htt_rx_free(struct ath10k_htt *htt)</div><div class='ctx'> 	if (htt-&gt;ar-&gt;bus_param.dev_type == ATH10K_DEV_TYPE_HL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;htt-&gt;rx_ring.refill_retry_timer);</div><div class='add'>+	timer_delete_sync(&amp;htt-&gt;rx_ring.refill_retry_timer);</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_purge(&amp;htt-&gt;rx_msdus_q);</div><div class='ctx'> 	skb_queue_purge(&amp;htt-&gt;rx_in_ord_compl_q);</div><div class='hunk'>@@ -297,12 +306,16 @@ void ath10k_htt_rx_free(struct ath10k_htt *htt)</div><div class='ctx'> 			  ath10k_htt_get_vaddr_ring(htt),</div><div class='ctx'> 			  htt-&gt;rx_ring.base_paddr);</div><div class='ctx'> </div><div class='add'>+	ath10k_htt_config_paddrs_ring(htt, NULL);</div><div class='add'>+</div><div class='ctx'> 	dma_free_coherent(htt-&gt;ar-&gt;dev,</div><div class='ctx'> 			  sizeof(*htt-&gt;rx_ring.alloc_idx.vaddr),</div><div class='ctx'> 			  htt-&gt;rx_ring.alloc_idx.vaddr,</div><div class='ctx'> 			  htt-&gt;rx_ring.alloc_idx.paddr);</div><div class='add'>+	htt-&gt;rx_ring.alloc_idx.vaddr = NULL;</div><div class='ctx'> </div><div class='ctx'> 	kfree(htt-&gt;rx_ring.netbufs_ring);</div><div class='add'>+	htt-&gt;rx_ring.netbufs_ring = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct sk_buff *ath10k_htt_rx_netbuf_pop(struct ath10k_htt *htt)</div><div class='hunk'>@@ -343,9 +356,14 @@ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt,</div><div class='ctx'> 				   struct sk_buff_head *amsdu)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = htt-&gt;ar;</div><div class='add'>+	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='ctx'> 	int msdu_len, msdu_chaining = 0;</div><div class='ctx'> 	struct sk_buff *msdu;</div><div class='ctx'> 	struct htt_rx_desc *rx_desc;</div><div class='add'>+	struct rx_attention *rx_desc_attention;</div><div class='add'>+	struct rx_frag_info_common *rx_desc_frag_info_common;</div><div class='add'>+	struct rx_msdu_start_common *rx_desc_msdu_start_common;</div><div class='add'>+	struct rx_msdu_end_common *rx_desc_msdu_end_common;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;htt-&gt;rx_ring.lock);</div><div class='ctx'> </div><div class='hunk'>@@ -360,13 +378,18 @@ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt,</div><div class='ctx'> </div><div class='ctx'> 		__skb_queue_tail(amsdu, msdu);</div><div class='ctx'> </div><div class='del'>-		rx_desc = (struct htt_rx_desc *)msdu-&gt;data;</div><div class='add'>+		rx_desc = HTT_RX_BUF_TO_RX_DESC(hw, msdu-&gt;data);</div><div class='add'>+		rx_desc_attention = ath10k_htt_rx_desc_get_attention(hw, rx_desc);</div><div class='add'>+		rx_desc_msdu_start_common = ath10k_htt_rx_desc_get_msdu_start(hw,</div><div class='add'>+									      rx_desc);</div><div class='add'>+		rx_desc_msdu_end_common = ath10k_htt_rx_desc_get_msdu_end(hw, rx_desc);</div><div class='add'>+		rx_desc_frag_info_common = ath10k_htt_rx_desc_get_frag_info(hw, rx_desc);</div><div class='ctx'> </div><div class='ctx'> 		/* FIXME: we must report msdu payload since this is what caller</div><div class='ctx'> 		 * expects now</div><div class='ctx'> 		 */</div><div class='del'>-		skb_put(msdu, offsetof(struct htt_rx_desc, msdu_payload));</div><div class='del'>-		skb_pull(msdu, offsetof(struct htt_rx_desc, msdu_payload));</div><div class='add'>+		skb_put(msdu, hw-&gt;rx_desc_ops-&gt;rx_desc_msdu_payload_offset);</div><div class='add'>+		skb_pull(msdu, hw-&gt;rx_desc_ops-&gt;rx_desc_msdu_payload_offset);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Sanity check - confirm the HW is finished filling in the</div><div class='hunk'>@@ -376,24 +399,24 @@ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt,</div><div class='ctx'> 		 * To prevent the case that we handle a stale Rx descriptor,</div><div class='ctx'> 		 * just assert for now until we have a way to recover.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!(__le32_to_cpu(rx_desc-&gt;attention.flags)</div><div class='add'>+		if (!(__le32_to_cpu(rx_desc_attention-&gt;flags)</div><div class='ctx'> 				&amp; RX_ATTENTION_FLAGS_MSDU_DONE)) {</div><div class='ctx'> 			__skb_queue_purge(amsdu);</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		msdu_len_invalid = !!(__le32_to_cpu(rx_desc-&gt;attention.flags)</div><div class='add'>+		msdu_len_invalid = !!(__le32_to_cpu(rx_desc_attention-&gt;flags)</div><div class='ctx'> 					&amp; (RX_ATTENTION_FLAGS_MPDU_LENGTH_ERR |</div><div class='ctx'> 					   RX_ATTENTION_FLAGS_MSDU_LENGTH_ERR));</div><div class='del'>-		msdu_len = MS(__le32_to_cpu(rx_desc-&gt;msdu_start.common.info0),</div><div class='add'>+		msdu_len = MS(__le32_to_cpu(rx_desc_msdu_start_common-&gt;info0),</div><div class='ctx'> 			      RX_MSDU_START_INFO0_MSDU_LENGTH);</div><div class='del'>-		msdu_chained = rx_desc-&gt;frag_info.ring2_more_count;</div><div class='add'>+		msdu_chained = rx_desc_frag_info_common-&gt;ring2_more_count;</div><div class='ctx'> </div><div class='ctx'> 		if (msdu_len_invalid)</div><div class='ctx'> 			msdu_len = 0;</div><div class='ctx'> </div><div class='ctx'> 		skb_trim(msdu, 0);</div><div class='del'>-		skb_put(msdu, min(msdu_len, HTT_RX_MSDU_SIZE));</div><div class='add'>+		skb_put(msdu, min(msdu_len, ath10k_htt_rx_msdu_size(hw)));</div><div class='ctx'> 		msdu_len -= msdu-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 		/* Note: Chained buffers do not contain rx descriptor */</div><div class='hunk'>@@ -411,11 +434,12 @@ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt,</div><div class='ctx'> 			msdu_chaining = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		last_msdu = __le32_to_cpu(rx_desc-&gt;msdu_end.common.info0) &amp;</div><div class='add'>+		last_msdu = __le32_to_cpu(rx_desc_msdu_end_common-&gt;info0) &amp;</div><div class='ctx'> 				RX_MSDU_END_INFO0_LAST_MSDU;</div><div class='ctx'> </div><div class='del'>-		trace_ath10k_htt_rx_desc(ar, &amp;rx_desc-&gt;attention,</div><div class='del'>-					 sizeof(*rx_desc) - sizeof(u32));</div><div class='add'>+		/* FIXME: why are we skipping the first part of the rx_desc? */</div><div class='add'>+		trace_ath10k_htt_rx_desc(ar, (void *)rx_desc + sizeof(u32),</div><div class='add'>+					 hw-&gt;rx_desc_ops-&gt;rx_desc_size - sizeof(u32));</div><div class='ctx'> </div><div class='ctx'> 		if (last_msdu)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -480,6 +504,7 @@ static int ath10k_htt_rx_handle_amsdu_mon_32(struct ath10k_htt *htt,</div><div class='ctx'> 					     struct htt_rx_in_ord_msdu_desc **msdu_desc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = htt-&gt;ar;</div><div class='add'>+	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='ctx'> 	u32 paddr;</div><div class='ctx'> 	struct sk_buff *frag_buf;</div><div class='ctx'> 	struct sk_buff *prev_frag_buf;</div><div class='hunk'>@@ -488,12 +513,12 @@ static int ath10k_htt_rx_handle_amsdu_mon_32(struct ath10k_htt *htt,</div><div class='ctx'> 	struct htt_rx_desc *rxd;</div><div class='ctx'> 	int amsdu_len = __le16_to_cpu(ind_desc-&gt;msdu_len);</div><div class='ctx'> </div><div class='del'>-	rxd = (void *)msdu-&gt;data;</div><div class='del'>-	trace_ath10k_htt_rx_desc(ar, rxd, sizeof(*rxd));</div><div class='add'>+	rxd = HTT_RX_BUF_TO_RX_DESC(hw, msdu-&gt;data);</div><div class='add'>+	trace_ath10k_htt_rx_desc(ar, rxd, hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='ctx'> </div><div class='del'>-	skb_put(msdu, sizeof(struct htt_rx_desc));</div><div class='del'>-	skb_pull(msdu, sizeof(struct htt_rx_desc));</div><div class='del'>-	skb_put(msdu, min(amsdu_len, HTT_RX_MSDU_SIZE));</div><div class='add'>+	skb_put(msdu, hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='add'>+	skb_pull(msdu, hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='add'>+	skb_put(msdu, min(amsdu_len, ath10k_htt_rx_msdu_size(hw)));</div><div class='ctx'> 	amsdu_len -= msdu-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	last_frag = ind_desc-&gt;reserved;</div><div class='hunk'>@@ -556,6 +581,7 @@ ath10k_htt_rx_handle_amsdu_mon_64(struct ath10k_htt *htt,</div><div class='ctx'> 				  struct htt_rx_in_ord_msdu_desc_ext **msdu_desc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = htt-&gt;ar;</div><div class='add'>+	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='ctx'> 	u64 paddr;</div><div class='ctx'> 	struct sk_buff *frag_buf;</div><div class='ctx'> 	struct sk_buff *prev_frag_buf;</div><div class='hunk'>@@ -564,12 +590,12 @@ ath10k_htt_rx_handle_amsdu_mon_64(struct ath10k_htt *htt,</div><div class='ctx'> 	struct htt_rx_desc *rxd;</div><div class='ctx'> 	int amsdu_len = __le16_to_cpu(ind_desc-&gt;msdu_len);</div><div class='ctx'> </div><div class='del'>-	rxd = (void *)msdu-&gt;data;</div><div class='del'>-	trace_ath10k_htt_rx_desc(ar, rxd, sizeof(*rxd));</div><div class='add'>+	rxd = HTT_RX_BUF_TO_RX_DESC(hw, msdu-&gt;data);</div><div class='add'>+	trace_ath10k_htt_rx_desc(ar, rxd, hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='ctx'> </div><div class='del'>-	skb_put(msdu, sizeof(struct htt_rx_desc));</div><div class='del'>-	skb_pull(msdu, sizeof(struct htt_rx_desc));</div><div class='del'>-	skb_put(msdu, min(amsdu_len, HTT_RX_MSDU_SIZE));</div><div class='add'>+	skb_put(msdu, hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='add'>+	skb_pull(msdu, hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='add'>+	skb_put(msdu, min(amsdu_len, ath10k_htt_rx_msdu_size(hw)));</div><div class='ctx'> 	amsdu_len -= msdu-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	last_frag = ind_desc-&gt;reserved;</div><div class='hunk'>@@ -631,8 +657,10 @@ static int ath10k_htt_rx_pop_paddr32_list(struct ath10k_htt *htt,</div><div class='ctx'> 					  struct sk_buff_head *list)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = htt-&gt;ar;</div><div class='add'>+	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='ctx'> 	struct htt_rx_in_ord_msdu_desc *msdu_desc = ev-&gt;msdu_descs32;</div><div class='ctx'> 	struct htt_rx_desc *rxd;</div><div class='add'>+	struct rx_attention *rxd_attention;</div><div class='ctx'> 	struct sk_buff *msdu;</div><div class='ctx'> 	int msdu_count, ret;</div><div class='ctx'> 	bool is_offload;</div><div class='hunk'>@@ -667,15 +695,16 @@ static int ath10k_htt_rx_pop_paddr32_list(struct ath10k_htt *htt,</div><div class='ctx'> 		__skb_queue_tail(list, msdu);</div><div class='ctx'> </div><div class='ctx'> 		if (!is_offload) {</div><div class='del'>-			rxd = (void *)msdu-&gt;data;</div><div class='add'>+			rxd = HTT_RX_BUF_TO_RX_DESC(hw, msdu-&gt;data);</div><div class='add'>+			rxd_attention = ath10k_htt_rx_desc_get_attention(hw, rxd);</div><div class='ctx'> </div><div class='del'>-			trace_ath10k_htt_rx_desc(ar, rxd, sizeof(*rxd));</div><div class='add'>+			trace_ath10k_htt_rx_desc(ar, rxd, hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='ctx'> </div><div class='del'>-			skb_put(msdu, sizeof(*rxd));</div><div class='del'>-			skb_pull(msdu, sizeof(*rxd));</div><div class='add'>+			skb_put(msdu, hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='add'>+			skb_pull(msdu, hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='ctx'> 			skb_put(msdu, __le16_to_cpu(msdu_desc-&gt;msdu_len));</div><div class='ctx'> </div><div class='del'>-			if (!(__le32_to_cpu(rxd-&gt;attention.flags) &amp;</div><div class='add'>+			if (!(__le32_to_cpu(rxd_attention-&gt;flags) &amp;</div><div class='ctx'> 			      RX_ATTENTION_FLAGS_MSDU_DONE)) {</div><div class='ctx'> 				ath10k_warn(htt-&gt;ar, "tried to pop an incomplete frame, oops!\n");</div><div class='ctx'> 				return -EIO;</div><div class='hunk'>@@ -693,8 +722,10 @@ static int ath10k_htt_rx_pop_paddr64_list(struct ath10k_htt *htt,</div><div class='ctx'> 					  struct sk_buff_head *list)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = htt-&gt;ar;</div><div class='add'>+	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='ctx'> 	struct htt_rx_in_ord_msdu_desc_ext *msdu_desc = ev-&gt;msdu_descs64;</div><div class='ctx'> 	struct htt_rx_desc *rxd;</div><div class='add'>+	struct rx_attention *rxd_attention;</div><div class='ctx'> 	struct sk_buff *msdu;</div><div class='ctx'> 	int msdu_count, ret;</div><div class='ctx'> 	bool is_offload;</div><div class='hunk'>@@ -728,15 +759,16 @@ static int ath10k_htt_rx_pop_paddr64_list(struct ath10k_htt *htt,</div><div class='ctx'> 		__skb_queue_tail(list, msdu);</div><div class='ctx'> </div><div class='ctx'> 		if (!is_offload) {</div><div class='del'>-			rxd = (void *)msdu-&gt;data;</div><div class='add'>+			rxd = HTT_RX_BUF_TO_RX_DESC(hw, msdu-&gt;data);</div><div class='add'>+			rxd_attention = ath10k_htt_rx_desc_get_attention(hw, rxd);</div><div class='ctx'> </div><div class='del'>-			trace_ath10k_htt_rx_desc(ar, rxd, sizeof(*rxd));</div><div class='add'>+			trace_ath10k_htt_rx_desc(ar, rxd, hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='ctx'> </div><div class='del'>-			skb_put(msdu, sizeof(*rxd));</div><div class='del'>-			skb_pull(msdu, sizeof(*rxd));</div><div class='add'>+			skb_put(msdu, hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='add'>+			skb_pull(msdu, hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='ctx'> 			skb_put(msdu, __le16_to_cpu(msdu_desc-&gt;msdu_len));</div><div class='ctx'> </div><div class='del'>-			if (!(__le32_to_cpu(rxd-&gt;attention.flags) &amp;</div><div class='add'>+			if (!(__le32_to_cpu(rxd_attention-&gt;flags) &amp;</div><div class='ctx'> 			      RX_ATTENTION_FLAGS_MSDU_DONE)) {</div><div class='ctx'> 				ath10k_warn(htt-&gt;ar, "tried to pop an incomplete frame, oops!\n");</div><div class='ctx'> 				return -EIO;</div><div class='hunk'>@@ -823,8 +855,10 @@ err_dma_idx:</div><div class='ctx'> 			  ath10k_htt_get_rx_ring_size(htt),</div><div class='ctx'> 			  vaddr_ring,</div><div class='ctx'> 			  htt-&gt;rx_ring.base_paddr);</div><div class='add'>+	ath10k_htt_config_paddrs_ring(htt, NULL);</div><div class='ctx'> err_dma_ring:</div><div class='ctx'> 	kfree(htt-&gt;rx_ring.netbufs_ring);</div><div class='add'>+	htt-&gt;rx_ring.netbufs_ring = NULL;</div><div class='ctx'> err_netbuf:</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='hunk'>@@ -944,16 +978,32 @@ static void ath10k_htt_rx_h_rates(struct ath10k *ar,</div><div class='ctx'> 				  struct ieee80211_rx_status *status,</div><div class='ctx'> 				  struct htt_rx_desc *rxd)</div><div class='ctx'> {</div><div class='add'>+	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='add'>+	struct rx_attention *rxd_attention;</div><div class='add'>+	struct rx_mpdu_start *rxd_mpdu_start;</div><div class='add'>+	struct rx_mpdu_end *rxd_mpdu_end;</div><div class='add'>+	struct rx_msdu_start_common *rxd_msdu_start_common;</div><div class='add'>+	struct rx_msdu_end_common *rxd_msdu_end_common;</div><div class='add'>+	struct rx_ppdu_start *rxd_ppdu_start;</div><div class='ctx'> 	struct ieee80211_supported_band *sband;</div><div class='ctx'> 	u8 cck, rate, bw, sgi, mcs, nss;</div><div class='add'>+	u8 *rxd_msdu_payload;</div><div class='ctx'> 	u8 preamble = 0;</div><div class='ctx'> 	u8 group_id;</div><div class='ctx'> 	u32 info1, info2, info3;</div><div class='ctx'> 	u32 stbc, nsts_su;</div><div class='ctx'> </div><div class='del'>-	info1 = __le32_to_cpu(rxd-&gt;ppdu_start.info1);</div><div class='del'>-	info2 = __le32_to_cpu(rxd-&gt;ppdu_start.info2);</div><div class='del'>-	info3 = __le32_to_cpu(rxd-&gt;ppdu_start.info3);</div><div class='add'>+	rxd_attention = ath10k_htt_rx_desc_get_attention(hw, rxd);</div><div class='add'>+	rxd_mpdu_start = ath10k_htt_rx_desc_get_mpdu_start(hw, rxd);</div><div class='add'>+	rxd_mpdu_end = ath10k_htt_rx_desc_get_mpdu_end(hw, rxd);</div><div class='add'>+	rxd_msdu_start_common = ath10k_htt_rx_desc_get_msdu_start(hw, rxd);</div><div class='add'>+	rxd_msdu_end_common = ath10k_htt_rx_desc_get_msdu_end(hw, rxd);</div><div class='add'>+	rxd_ppdu_start = ath10k_htt_rx_desc_get_ppdu_start(hw, rxd);</div><div class='add'>+	rxd_msdu_payload = ath10k_htt_rx_desc_get_msdu_payload(hw, rxd);</div><div class='add'>+</div><div class='add'>+	info1 = __le32_to_cpu(rxd_ppdu_start-&gt;info1);</div><div class='add'>+	info2 = __le32_to_cpu(rxd_ppdu_start-&gt;info2);</div><div class='add'>+	info3 = __le32_to_cpu(rxd_ppdu_start-&gt;info3);</div><div class='ctx'> </div><div class='ctx'> 	preamble = MS(info1, RX_PPDU_START_INFO1_PREAMBLE_TYPE);</div><div class='ctx'> </div><div class='hunk'>@@ -1022,24 +1072,24 @@ static void ath10k_htt_rx_h_rates(struct ath10k *ar,</div><div class='ctx'> 		if (mcs &gt; 0x09) {</div><div class='ctx'> 			ath10k_warn(ar, "invalid MCS received %u\n", mcs);</div><div class='ctx'> 			ath10k_warn(ar, "rxd %08x mpdu start %08x %08x msdu start %08x %08x ppdu start %08x %08x %08x %08x %08x\n",</div><div class='del'>-				    __le32_to_cpu(rxd-&gt;attention.flags),</div><div class='del'>-				    __le32_to_cpu(rxd-&gt;mpdu_start.info0),</div><div class='del'>-				    __le32_to_cpu(rxd-&gt;mpdu_start.info1),</div><div class='del'>-				    __le32_to_cpu(rxd-&gt;msdu_start.common.info0),</div><div class='del'>-				    __le32_to_cpu(rxd-&gt;msdu_start.common.info1),</div><div class='del'>-				    rxd-&gt;ppdu_start.info0,</div><div class='del'>-				    __le32_to_cpu(rxd-&gt;ppdu_start.info1),</div><div class='del'>-				    __le32_to_cpu(rxd-&gt;ppdu_start.info2),</div><div class='del'>-				    __le32_to_cpu(rxd-&gt;ppdu_start.info3),</div><div class='del'>-				    __le32_to_cpu(rxd-&gt;ppdu_start.info4));</div><div class='add'>+				    __le32_to_cpu(rxd_attention-&gt;flags),</div><div class='add'>+				    __le32_to_cpu(rxd_mpdu_start-&gt;info0),</div><div class='add'>+				    __le32_to_cpu(rxd_mpdu_start-&gt;info1),</div><div class='add'>+				    __le32_to_cpu(rxd_msdu_start_common-&gt;info0),</div><div class='add'>+				    __le32_to_cpu(rxd_msdu_start_common-&gt;info1),</div><div class='add'>+				    rxd_ppdu_start-&gt;info0,</div><div class='add'>+				    __le32_to_cpu(rxd_ppdu_start-&gt;info1),</div><div class='add'>+				    __le32_to_cpu(rxd_ppdu_start-&gt;info2),</div><div class='add'>+				    __le32_to_cpu(rxd_ppdu_start-&gt;info3),</div><div class='add'>+				    __le32_to_cpu(rxd_ppdu_start-&gt;info4));</div><div class='ctx'> </div><div class='ctx'> 			ath10k_warn(ar, "msdu end %08x mpdu end %08x\n",</div><div class='del'>-				    __le32_to_cpu(rxd-&gt;msdu_end.common.info0),</div><div class='del'>-				    __le32_to_cpu(rxd-&gt;mpdu_end.info0));</div><div class='add'>+				    __le32_to_cpu(rxd_msdu_end_common-&gt;info0),</div><div class='add'>+				    __le32_to_cpu(rxd_mpdu_end-&gt;info0));</div><div class='ctx'> </div><div class='ctx'> 			ath10k_dbg_dump(ar, ATH10K_DBG_HTT_DUMP, NULL,</div><div class='ctx'> 					"rx desc msdu payload: ",</div><div class='del'>-					rxd-&gt;msdu_payload, 50);</div><div class='add'>+					rxd_msdu_payload, 50);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		status-&gt;rate_idx = mcs;</div><div class='hunk'>@@ -1059,6 +1109,10 @@ static void ath10k_htt_rx_h_rates(struct ath10k *ar,</div><div class='ctx'> static struct ieee80211_channel *</div><div class='ctx'> ath10k_htt_rx_h_peer_channel(struct ath10k *ar, struct htt_rx_desc *rxd)</div><div class='ctx'> {</div><div class='add'>+	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='add'>+	struct rx_attention *rxd_attention;</div><div class='add'>+	struct rx_msdu_end_common *rxd_msdu_end_common;</div><div class='add'>+	struct rx_mpdu_start *rxd_mpdu_start;</div><div class='ctx'> 	struct ath10k_peer *peer;</div><div class='ctx'> 	struct ath10k_vif *arvif;</div><div class='ctx'> 	struct cfg80211_chan_def def;</div><div class='hunk'>@@ -1069,15 +1123,19 @@ ath10k_htt_rx_h_peer_channel(struct ath10k *ar, struct htt_rx_desc *rxd)</div><div class='ctx'> 	if (!rxd)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	if (rxd-&gt;attention.flags &amp;</div><div class='add'>+	rxd_attention = ath10k_htt_rx_desc_get_attention(hw, rxd);</div><div class='add'>+	rxd_msdu_end_common = ath10k_htt_rx_desc_get_msdu_end(hw, rxd);</div><div class='add'>+	rxd_mpdu_start = ath10k_htt_rx_desc_get_mpdu_start(hw, rxd);</div><div class='add'>+</div><div class='add'>+	if (rxd_attention-&gt;flags &amp;</div><div class='ctx'> 	    __cpu_to_le32(RX_ATTENTION_FLAGS_PEER_IDX_INVALID))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	if (!(rxd-&gt;msdu_end.common.info0 &amp;</div><div class='add'>+	if (!(rxd_msdu_end_common-&gt;info0 &amp;</div><div class='ctx'> 	      __cpu_to_le32(RX_MSDU_END_INFO0_FIRST_MSDU)))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	peer_id = MS(__le32_to_cpu(rxd-&gt;mpdu_start.info0),</div><div class='add'>+	peer_id = MS(__le32_to_cpu(rxd_mpdu_start-&gt;info0),</div><div class='ctx'> 		     RX_MPDU_START_INFO0_PEER_IDX);</div><div class='ctx'> </div><div class='ctx'> 	peer = ath10k_peer_find_by_id(ar, peer_id);</div><div class='hunk'>@@ -1167,14 +1225,16 @@ static void ath10k_htt_rx_h_signal(struct ath10k *ar,</div><div class='ctx'> 				   struct ieee80211_rx_status *status,</div><div class='ctx'> 				   struct htt_rx_desc *rxd)</div><div class='ctx'> {</div><div class='add'>+	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='add'>+	struct rx_ppdu_start *rxd_ppdu_start = ath10k_htt_rx_desc_get_ppdu_start(hw, rxd);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; IEEE80211_MAX_CHAINS ; i++) {</div><div class='ctx'> 		status-&gt;chains &amp;= ~BIT(i);</div><div class='ctx'> </div><div class='del'>-		if (rxd-&gt;ppdu_start.rssi_chains[i].pri20_mhz != 0x80) {</div><div class='add'>+		if (rxd_ppdu_start-&gt;rssi_chains[i].pri20_mhz != 0x80) {</div><div class='ctx'> 			status-&gt;chain_signal[i] = ATH10K_DEFAULT_NOISE_FLOOR +</div><div class='del'>-				rxd-&gt;ppdu_start.rssi_chains[i].pri20_mhz;</div><div class='add'>+				rxd_ppdu_start-&gt;rssi_chains[i].pri20_mhz;</div><div class='ctx'> </div><div class='ctx'> 			status-&gt;chains |= BIT(i);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1182,7 +1242,7 @@ static void ath10k_htt_rx_h_signal(struct ath10k *ar,</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: Get real NF */</div><div class='ctx'> 	status-&gt;signal = ATH10K_DEFAULT_NOISE_FLOOR +</div><div class='del'>-			 rxd-&gt;ppdu_start.rssi_comb;</div><div class='add'>+			 rxd_ppdu_start-&gt;rssi_comb;</div><div class='ctx'> 	status-&gt;flag &amp;= ~RX_FLAG_NO_SIGNAL_VAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1190,13 +1250,18 @@ static void ath10k_htt_rx_h_mactime(struct ath10k *ar,</div><div class='ctx'> 				    struct ieee80211_rx_status *status,</div><div class='ctx'> 				    struct htt_rx_desc *rxd)</div><div class='ctx'> {</div><div class='add'>+	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='add'>+	struct rx_ppdu_end_common *rxd_ppdu_end_common;</div><div class='add'>+</div><div class='add'>+	rxd_ppdu_end_common = ath10k_htt_rx_desc_get_ppdu_end(hw, rxd);</div><div class='add'>+</div><div class='ctx'> 	/* FIXME: TSF is known only at the end of PPDU, in the last MPDU. This</div><div class='ctx'> 	 * means all prior MSDUs in a PPDU are reported to mac80211 without the</div><div class='ctx'> 	 * TSF. Is it worth holding frames until end of PPDU is known?</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * FIXME: Can we get/compute 64bit TSF?</div><div class='ctx'> 	 */</div><div class='del'>-	status-&gt;mactime = __le32_to_cpu(rxd-&gt;ppdu_end.common.tsf_timestamp);</div><div class='add'>+	status-&gt;mactime = __le32_to_cpu(rxd_ppdu_end_common-&gt;tsf_timestamp);</div><div class='ctx'> 	status-&gt;flag |= RX_FLAG_MACTIME_END;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1206,7 +1271,9 @@ static void ath10k_htt_rx_h_ppdu(struct ath10k *ar,</div><div class='ctx'> 				 u32 vdev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *first;</div><div class='add'>+	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='ctx'> 	struct htt_rx_desc *rxd;</div><div class='add'>+	struct rx_attention *rxd_attention;</div><div class='ctx'> 	bool is_first_ppdu;</div><div class='ctx'> 	bool is_last_ppdu;</div><div class='ctx'> </div><div class='hunk'>@@ -1214,11 +1281,14 @@ static void ath10k_htt_rx_h_ppdu(struct ath10k *ar,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	first = skb_peek(amsdu);</div><div class='del'>-	rxd = (void *)first-&gt;data - sizeof(*rxd);</div><div class='add'>+	rxd = HTT_RX_BUF_TO_RX_DESC(hw,</div><div class='add'>+				    (void *)first-&gt;data - hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='add'>+</div><div class='add'>+	rxd_attention = ath10k_htt_rx_desc_get_attention(hw, rxd);</div><div class='ctx'> </div><div class='del'>-	is_first_ppdu = !!(rxd-&gt;attention.flags &amp;</div><div class='add'>+	is_first_ppdu = !!(rxd_attention-&gt;flags &amp;</div><div class='ctx'> 			   __cpu_to_le32(RX_ATTENTION_FLAGS_FIRST_MPDU));</div><div class='del'>-	is_last_ppdu = !!(rxd-&gt;attention.flags &amp;</div><div class='add'>+	is_last_ppdu = !!(rxd_attention-&gt;flags &amp;</div><div class='ctx'> 			  __cpu_to_le32(RX_ATTENTION_FLAGS_LAST_MPDU));</div><div class='ctx'> </div><div class='ctx'> 	if (is_first_ppdu) {</div><div class='hunk'>@@ -1229,7 +1299,7 @@ static void ath10k_htt_rx_h_ppdu(struct ath10k *ar,</div><div class='ctx'> 		status-&gt;encoding = RX_ENC_LEGACY;</div><div class='ctx'> 		status-&gt;bw = RATE_INFO_BW_20;</div><div class='ctx'> </div><div class='del'>-		status-&gt;flag &amp;= ~RX_FLAG_MACTIME_END;</div><div class='add'>+		status-&gt;flag &amp;= ~RX_FLAG_MACTIME;</div><div class='ctx'> 		status-&gt;flag |= RX_FLAG_NO_SIGNAL_VAL;</div><div class='ctx'> </div><div class='ctx'> 		status-&gt;flag &amp;= ~(RX_FLAG_AMPDU_IS_LAST);</div><div class='hunk'>@@ -1307,14 +1377,14 @@ static void ath10k_process_rx(struct ath10k *ar, struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_DATA,</div><div class='del'>-		   "rx skb %pK len %u peer %pM %s %s sn %u %s%s%s%s%s%s %srate_idx %u vht_nss %u freq %u band %u flag 0x%x fcs-err %i mic-err %i amsdu-more %i\n",</div><div class='add'>+		   "rx skb %p len %u peer %pM %s %s sn %u %s%s%s%s%s%s %srate_idx %u vht_nss %u freq %u band %u flag 0x%x fcs-err %i mic-err %i amsdu-more %i\n",</div><div class='ctx'> 		   skb,</div><div class='ctx'> 		   skb-&gt;len,</div><div class='ctx'> 		   ieee80211_get_SA(hdr),</div><div class='ctx'> 		   ath10k_get_tid(hdr, tid, sizeof(tid)),</div><div class='ctx'> 		   is_multicast_ether_addr(ieee80211_get_DA(hdr)) ?</div><div class='ctx'> 							"mcast" : "ucast",</div><div class='del'>-		   (__le16_to_cpu(hdr-&gt;seq_ctrl) &amp; IEEE80211_SCTL_SEQ) &gt;&gt; 4,</div><div class='add'>+		   IEEE80211_SEQ_TO_SN(__le16_to_cpu(hdr-&gt;seq_ctrl)),</div><div class='ctx'> 		   (status-&gt;encoding == RX_ENC_LEGACY) ? "legacy" : "",</div><div class='ctx'> 		   (status-&gt;encoding == RX_ENC_HT) ? "ht" : "",</div><div class='ctx'> 		   (status-&gt;encoding == RX_ENC_VHT) ? "vht" : "",</div><div class='hunk'>@@ -1357,7 +1427,9 @@ static void ath10k_htt_rx_h_undecap_raw(struct ath10k *ar,</div><div class='ctx'> 					const u8 first_hdr[64])</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='add'>+	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='ctx'> 	struct htt_rx_desc *rxd;</div><div class='add'>+	struct rx_msdu_end_common *rxd_msdu_end_common;</div><div class='ctx'> 	size_t hdr_len;</div><div class='ctx'> 	size_t crypto_len;</div><div class='ctx'> 	bool is_first;</div><div class='hunk'>@@ -1366,10 +1438,13 @@ static void ath10k_htt_rx_h_undecap_raw(struct ath10k *ar,</div><div class='ctx'> 	int bytes_aligned = ar-&gt;hw_params.decap_align_bytes;</div><div class='ctx'> 	u8 *qos;</div><div class='ctx'> </div><div class='del'>-	rxd = (void *)msdu-&gt;data - sizeof(*rxd);</div><div class='del'>-	is_first = !!(rxd-&gt;msdu_end.common.info0 &amp;</div><div class='add'>+	rxd = HTT_RX_BUF_TO_RX_DESC(hw,</div><div class='add'>+				    (void *)msdu-&gt;data - hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='add'>+</div><div class='add'>+	rxd_msdu_end_common = ath10k_htt_rx_desc_get_msdu_end(hw, rxd);</div><div class='add'>+	is_first = !!(rxd_msdu_end_common-&gt;info0 &amp;</div><div class='ctx'> 		      __cpu_to_le32(RX_MSDU_END_INFO0_FIRST_MSDU));</div><div class='del'>-	is_last = !!(rxd-&gt;msdu_end.common.info0 &amp;</div><div class='add'>+	is_last = !!(rxd_msdu_end_common-&gt;info0 &amp;</div><div class='ctx'> 		     __cpu_to_le32(RX_MSDU_END_INFO0_LAST_MSDU));</div><div class='ctx'> </div><div class='ctx'> 	/* Delivered decapped frame:</div><div class='hunk'>@@ -1387,7 +1462,7 @@ static void ath10k_htt_rx_h_undecap_raw(struct ath10k *ar,</div><div class='ctx'> 	 * error packets. If limit exceeds, hw sends all remaining MSDUs as</div><div class='ctx'> 	 * a single last MSDU with this msdu limit error set.</div><div class='ctx'> 	 */</div><div class='del'>-	msdu_limit_err = ath10k_rx_desc_msdu_limit_error(&amp;ar-&gt;hw_params, rxd);</div><div class='add'>+	msdu_limit_err = ath10k_htt_rx_desc_msdu_limit_error(hw, rxd);</div><div class='ctx'> </div><div class='ctx'> 	/* If MSDU limit error happens, then don't warn on, the partial raw MSDU</div><div class='ctx'> 	 * without first MSDU is expected in that case, and handled later here.</div><div class='hunk'>@@ -1479,6 +1554,7 @@ static void ath10k_htt_rx_h_undecap_nwifi(struct ath10k *ar,</div><div class='ctx'> 					  const u8 first_hdr[64],</div><div class='ctx'> 					  enum htt_rx_mpdu_encrypt_type enctype)</div><div class='ctx'> {</div><div class='add'>+	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='ctx'> 	struct htt_rx_desc *rxd;</div><div class='ctx'> 	size_t hdr_len;</div><div class='hunk'>@@ -1499,9 +1575,10 @@ static void ath10k_htt_rx_h_undecap_nwifi(struct ath10k *ar,</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	/* pull decapped header and copy SA &amp; DA */</div><div class='del'>-	rxd = (void *)msdu-&gt;data - sizeof(*rxd);</div><div class='add'>+	rxd = HTT_RX_BUF_TO_RX_DESC(hw, (void *)msdu-&gt;data -</div><div class='add'>+				    hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='ctx'> </div><div class='del'>-	l3_pad_bytes = ath10k_rx_desc_get_l3_pad_bytes(&amp;ar-&gt;hw_params, rxd);</div><div class='add'>+	l3_pad_bytes = ath10k_htt_rx_desc_get_l3_pad_bytes(&amp;ar-&gt;hw_params, rxd);</div><div class='ctx'> 	skb_put(msdu, l3_pad_bytes);</div><div class='ctx'> </div><div class='ctx'> 	hdr = (struct ieee80211_hdr *)(msdu-&gt;data + l3_pad_bytes);</div><div class='hunk'>@@ -1537,18 +1614,25 @@ static void *ath10k_htt_rx_h_find_rfc1042(struct ath10k *ar,</div><div class='ctx'> 					  enum htt_rx_mpdu_encrypt_type enctype)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='add'>+	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='ctx'> 	struct htt_rx_desc *rxd;</div><div class='add'>+	struct rx_msdu_end_common *rxd_msdu_end_common;</div><div class='add'>+	u8 *rxd_rx_hdr_status;</div><div class='ctx'> 	size_t hdr_len, crypto_len;</div><div class='ctx'> 	void *rfc1042;</div><div class='ctx'> 	bool is_first, is_last, is_amsdu;</div><div class='ctx'> 	int bytes_aligned = ar-&gt;hw_params.decap_align_bytes;</div><div class='ctx'> </div><div class='del'>-	rxd = (void *)msdu-&gt;data - sizeof(*rxd);</div><div class='del'>-	hdr = (void *)rxd-&gt;rx_hdr_status;</div><div class='add'>+	rxd = HTT_RX_BUF_TO_RX_DESC(hw,</div><div class='add'>+				    (void *)msdu-&gt;data - hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='add'>+</div><div class='add'>+	rxd_msdu_end_common = ath10k_htt_rx_desc_get_msdu_end(hw, rxd);</div><div class='add'>+	rxd_rx_hdr_status = ath10k_htt_rx_desc_get_rx_hdr_status(hw, rxd);</div><div class='add'>+	hdr = (void *)rxd_rx_hdr_status;</div><div class='ctx'> </div><div class='del'>-	is_first = !!(rxd-&gt;msdu_end.common.info0 &amp;</div><div class='add'>+	is_first = !!(rxd_msdu_end_common-&gt;info0 &amp;</div><div class='ctx'> 		      __cpu_to_le32(RX_MSDU_END_INFO0_FIRST_MSDU));</div><div class='del'>-	is_last = !!(rxd-&gt;msdu_end.common.info0 &amp;</div><div class='add'>+	is_last = !!(rxd_msdu_end_common-&gt;info0 &amp;</div><div class='ctx'> 		     __cpu_to_le32(RX_MSDU_END_INFO0_LAST_MSDU));</div><div class='ctx'> 	is_amsdu = !(is_first &amp;&amp; is_last);</div><div class='ctx'> </div><div class='hunk'>@@ -1574,6 +1658,7 @@ static void ath10k_htt_rx_h_undecap_eth(struct ath10k *ar,</div><div class='ctx'> 					const u8 first_hdr[64],</div><div class='ctx'> 					enum htt_rx_mpdu_encrypt_type enctype)</div><div class='ctx'> {</div><div class='add'>+	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='ctx'> 	struct ethhdr *eth;</div><div class='ctx'> 	size_t hdr_len;</div><div class='hunk'>@@ -1593,8 +1678,10 @@ static void ath10k_htt_rx_h_undecap_eth(struct ath10k *ar,</div><div class='ctx'> 	if (WARN_ON_ONCE(!rfc1042))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	rxd = (void *)msdu-&gt;data - sizeof(*rxd);</div><div class='del'>-	l3_pad_bytes = ath10k_rx_desc_get_l3_pad_bytes(&amp;ar-&gt;hw_params, rxd);</div><div class='add'>+	rxd = HTT_RX_BUF_TO_RX_DESC(hw,</div><div class='add'>+				    (void *)msdu-&gt;data - hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='add'>+</div><div class='add'>+	l3_pad_bytes = ath10k_htt_rx_desc_get_l3_pad_bytes(&amp;ar-&gt;hw_params, rxd);</div><div class='ctx'> 	skb_put(msdu, l3_pad_bytes);</div><div class='ctx'> 	skb_pull(msdu, l3_pad_bytes);</div><div class='ctx'> </div><div class='hunk'>@@ -1635,6 +1722,7 @@ static void ath10k_htt_rx_h_undecap_snap(struct ath10k *ar,</div><div class='ctx'> 					 const u8 first_hdr[64],</div><div class='ctx'> 					 enum htt_rx_mpdu_encrypt_type enctype)</div><div class='ctx'> {</div><div class='add'>+	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='ctx'> 	size_t hdr_len;</div><div class='ctx'> 	int l3_pad_bytes;</div><div class='hunk'>@@ -1647,8 +1735,10 @@ static void ath10k_htt_rx_h_undecap_snap(struct ath10k *ar,</div><div class='ctx'> 	 * [payload]</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	rxd = (void *)msdu-&gt;data - sizeof(*rxd);</div><div class='del'>-	l3_pad_bytes = ath10k_rx_desc_get_l3_pad_bytes(&amp;ar-&gt;hw_params, rxd);</div><div class='add'>+	rxd = HTT_RX_BUF_TO_RX_DESC(hw,</div><div class='add'>+				    (void *)msdu-&gt;data - hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='add'>+</div><div class='add'>+	l3_pad_bytes = ath10k_htt_rx_desc_get_l3_pad_bytes(&amp;ar-&gt;hw_params, rxd);</div><div class='ctx'> </div><div class='ctx'> 	skb_put(msdu, l3_pad_bytes);</div><div class='ctx'> 	skb_pull(msdu, sizeof(struct amsdu_subframe_hdr) + l3_pad_bytes);</div><div class='hunk'>@@ -1673,7 +1763,9 @@ static void ath10k_htt_rx_h_undecap(struct ath10k *ar,</div><div class='ctx'> 				    enum htt_rx_mpdu_encrypt_type enctype,</div><div class='ctx'> 				    bool is_decrypted)</div><div class='ctx'> {</div><div class='add'>+	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='ctx'> 	struct htt_rx_desc *rxd;</div><div class='add'>+	struct rx_msdu_start_common *rxd_msdu_start_common;</div><div class='ctx'> 	enum rx_msdu_decap_format decap;</div><div class='ctx'> </div><div class='ctx'> 	/* First msdu's decapped header:</div><div class='hunk'>@@ -1687,8 +1779,11 @@ static void ath10k_htt_rx_h_undecap(struct ath10k *ar,</div><div class='ctx'> 	 * [rfc1042/llc]</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	rxd = (void *)msdu-&gt;data - sizeof(*rxd);</div><div class='del'>-	decap = MS(__le32_to_cpu(rxd-&gt;msdu_start.common.info1),</div><div class='add'>+	rxd = HTT_RX_BUF_TO_RX_DESC(hw,</div><div class='add'>+				    (void *)msdu-&gt;data - hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='add'>+</div><div class='add'>+	rxd_msdu_start_common = ath10k_htt_rx_desc_get_msdu_start(hw, rxd);</div><div class='add'>+	decap = MS(__le32_to_cpu(rxd_msdu_start_common-&gt;info1),</div><div class='ctx'> 		   RX_MSDU_START_INFO1_DECAP_FORMAT);</div><div class='ctx'> </div><div class='ctx'> 	switch (decap) {</div><div class='hunk'>@@ -1710,17 +1805,23 @@ static void ath10k_htt_rx_h_undecap(struct ath10k *ar,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath10k_htt_rx_get_csum_state(struct sk_buff *skb)</div><div class='add'>+static int ath10k_htt_rx_get_csum_state(struct ath10k_hw_params *hw, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct htt_rx_desc *rxd;</div><div class='add'>+	struct rx_attention *rxd_attention;</div><div class='add'>+	struct rx_msdu_start_common *rxd_msdu_start_common;</div><div class='ctx'> 	u32 flags, info;</div><div class='ctx'> 	bool is_ip4, is_ip6;</div><div class='ctx'> 	bool is_tcp, is_udp;</div><div class='ctx'> 	bool ip_csum_ok, tcpudp_csum_ok;</div><div class='ctx'> </div><div class='del'>-	rxd = (void *)skb-&gt;data - sizeof(*rxd);</div><div class='del'>-	flags = __le32_to_cpu(rxd-&gt;attention.flags);</div><div class='del'>-	info = __le32_to_cpu(rxd-&gt;msdu_start.common.info1);</div><div class='add'>+	rxd = HTT_RX_BUF_TO_RX_DESC(hw,</div><div class='add'>+				    (void *)skb-&gt;data - hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='add'>+</div><div class='add'>+	rxd_attention = ath10k_htt_rx_desc_get_attention(hw, rxd);</div><div class='add'>+	rxd_msdu_start_common = ath10k_htt_rx_desc_get_msdu_start(hw, rxd);</div><div class='add'>+	flags = __le32_to_cpu(rxd_attention-&gt;flags);</div><div class='add'>+	info = __le32_to_cpu(rxd_msdu_start_common-&gt;info1);</div><div class='ctx'> </div><div class='ctx'> 	is_ip4 = !!(info &amp; RX_MSDU_START_INFO1_IPV4_PROTO);</div><div class='ctx'> 	is_ip6 = !!(info &amp; RX_MSDU_START_INFO1_IPV6_PROTO);</div><div class='hunk'>@@ -1741,9 +1842,84 @@ static int ath10k_htt_rx_get_csum_state(struct sk_buff *skb)</div><div class='ctx'> 	return CHECKSUM_UNNECESSARY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath10k_htt_rx_h_csum_offload(struct sk_buff *msdu)</div><div class='add'>+static void ath10k_htt_rx_h_csum_offload(struct ath10k_hw_params *hw,</div><div class='add'>+					 struct sk_buff *msdu)</div><div class='add'>+{</div><div class='add'>+	msdu-&gt;ip_summed = ath10k_htt_rx_get_csum_state(hw, msdu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 ath10k_htt_rx_h_get_pn(struct ath10k *ar, struct sk_buff *skb,</div><div class='add'>+				  enum htt_rx_mpdu_encrypt_type enctype)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	u64 pn = 0;</div><div class='add'>+	u8 *ehdr;</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	ehdr = skb-&gt;data + ieee80211_hdrlen(hdr-&gt;frame_control);</div><div class='add'>+</div><div class='add'>+	if (enctype == HTT_RX_MPDU_ENCRYPT_AES_CCM_WPA2) {</div><div class='add'>+		pn = ehdr[0];</div><div class='add'>+		pn |= (u64)ehdr[1] &lt;&lt; 8;</div><div class='add'>+		pn |= (u64)ehdr[4] &lt;&lt; 16;</div><div class='add'>+		pn |= (u64)ehdr[5] &lt;&lt; 24;</div><div class='add'>+		pn |= (u64)ehdr[6] &lt;&lt; 32;</div><div class='add'>+		pn |= (u64)ehdr[7] &lt;&lt; 40;</div><div class='add'>+	}</div><div class='add'>+	return pn;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath10k_htt_rx_h_frag_multicast_check(struct ath10k *ar,</div><div class='add'>+						 struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	return !is_multicast_ether_addr(hdr-&gt;addr1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath10k_htt_rx_h_frag_pn_check(struct ath10k *ar,</div><div class='add'>+					  struct sk_buff *skb,</div><div class='add'>+					  u16 peer_id,</div><div class='add'>+					  enum htt_rx_mpdu_encrypt_type enctype)</div><div class='ctx'> {</div><div class='del'>-	msdu-&gt;ip_summed = ath10k_htt_rx_get_csum_state(msdu);</div><div class='add'>+	struct ath10k_peer *peer;</div><div class='add'>+	union htt_rx_pn_t *last_pn, new_pn = {};</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	u8 tid, frag_number;</div><div class='add'>+	u32 seq;</div><div class='add'>+</div><div class='add'>+	peer = ath10k_peer_find_by_id(ar, peer_id);</div><div class='add'>+	if (!peer) {</div><div class='add'>+		ath10k_dbg(ar, ATH10K_DBG_HTT, "invalid peer for frag pn check\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	if (ieee80211_is_data_qos(hdr-&gt;frame_control))</div><div class='add'>+		tid = ieee80211_get_tid(hdr);</div><div class='add'>+	else</div><div class='add'>+		tid = ATH10K_TXRX_NON_QOS_TID;</div><div class='add'>+</div><div class='add'>+	last_pn = &amp;peer-&gt;frag_tids_last_pn[tid];</div><div class='add'>+	new_pn.pn48 = ath10k_htt_rx_h_get_pn(ar, skb, enctype);</div><div class='add'>+	frag_number = le16_to_cpu(hdr-&gt;seq_ctrl) &amp; IEEE80211_SCTL_FRAG;</div><div class='add'>+	seq = IEEE80211_SEQ_TO_SN(__le16_to_cpu(hdr-&gt;seq_ctrl));</div><div class='add'>+</div><div class='add'>+	if (frag_number == 0) {</div><div class='add'>+		last_pn-&gt;pn48 = new_pn.pn48;</div><div class='add'>+		peer-&gt;frag_tids_seq[tid] = seq;</div><div class='add'>+	} else {</div><div class='add'>+		if (seq != peer-&gt;frag_tids_seq[tid])</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		if (new_pn.pn48 != last_pn-&gt;pn48 + 1)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		last_pn-&gt;pn48 = new_pn.pn48;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath10k_htt_rx_h_mpdu(struct ath10k *ar,</div><div class='hunk'>@@ -1751,12 +1927,18 @@ static void ath10k_htt_rx_h_mpdu(struct ath10k *ar,</div><div class='ctx'> 				 struct ieee80211_rx_status *status,</div><div class='ctx'> 				 bool fill_crypt_header,</div><div class='ctx'> 				 u8 *rx_hdr,</div><div class='del'>-				 enum ath10k_pkt_rx_err *err)</div><div class='add'>+				 enum ath10k_pkt_rx_err *err,</div><div class='add'>+				 u16 peer_id,</div><div class='add'>+				 bool frag)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *first;</div><div class='ctx'> 	struct sk_buff *last;</div><div class='del'>-	struct sk_buff *msdu;</div><div class='add'>+	struct sk_buff *msdu, *temp;</div><div class='add'>+	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='ctx'> 	struct htt_rx_desc *rxd;</div><div class='add'>+	struct rx_attention *rxd_attention;</div><div class='add'>+	struct rx_mpdu_start *rxd_mpdu_start;</div><div class='add'>+</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='ctx'> 	enum htt_rx_mpdu_encrypt_type enctype;</div><div class='ctx'> 	u8 first_hdr[64];</div><div class='hunk'>@@ -1768,23 +1950,28 @@ static void ath10k_htt_rx_h_mpdu(struct ath10k *ar,</div><div class='ctx'> 	bool is_decrypted;</div><div class='ctx'> 	bool is_mgmt;</div><div class='ctx'> 	u32 attention;</div><div class='add'>+	bool frag_pn_check = true, multicast_check = true;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_queue_empty(amsdu))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	first = skb_peek(amsdu);</div><div class='del'>-	rxd = (void *)first-&gt;data - sizeof(*rxd);</div><div class='add'>+	rxd = HTT_RX_BUF_TO_RX_DESC(hw,</div><div class='add'>+				    (void *)first-&gt;data - hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='add'>+</div><div class='add'>+	rxd_attention = ath10k_htt_rx_desc_get_attention(hw, rxd);</div><div class='add'>+	rxd_mpdu_start = ath10k_htt_rx_desc_get_mpdu_start(hw, rxd);</div><div class='ctx'> </div><div class='del'>-	is_mgmt = !!(rxd-&gt;attention.flags &amp;</div><div class='add'>+	is_mgmt = !!(rxd_attention-&gt;flags &amp;</div><div class='ctx'> 		     __cpu_to_le32(RX_ATTENTION_FLAGS_MGMT_TYPE));</div><div class='ctx'> </div><div class='del'>-	enctype = MS(__le32_to_cpu(rxd-&gt;mpdu_start.info0),</div><div class='add'>+	enctype = MS(__le32_to_cpu(rxd_mpdu_start-&gt;info0),</div><div class='ctx'> 		     RX_MPDU_START_INFO0_ENCRYPT_TYPE);</div><div class='ctx'> </div><div class='ctx'> 	/* First MSDU's Rx descriptor in an A-MSDU contains full 802.11</div><div class='ctx'> 	 * decapped header. It'll be used for undecapping of each MSDU.</div><div class='ctx'> 	 */</div><div class='del'>-	hdr = (void *)rxd-&gt;rx_hdr_status;</div><div class='add'>+	hdr = (void *)ath10k_htt_rx_desc_get_rx_hdr_status(hw, rxd);</div><div class='ctx'> 	memcpy(first_hdr, hdr, RX_HTT_HDR_STATUS_LEN);</div><div class='ctx'> </div><div class='ctx'> 	if (rx_hdr)</div><div class='hunk'>@@ -1802,8 +1989,11 @@ static void ath10k_htt_rx_h_mpdu(struct ath10k *ar,</div><div class='ctx'> </div><div class='ctx'> 	/* Some attention flags are valid only in the last MSDU. */</div><div class='ctx'> 	last = skb_peek_tail(amsdu);</div><div class='del'>-	rxd = (void *)last-&gt;data - sizeof(*rxd);</div><div class='del'>-	attention = __le32_to_cpu(rxd-&gt;attention.flags);</div><div class='add'>+	rxd = HTT_RX_BUF_TO_RX_DESC(hw,</div><div class='add'>+				    (void *)last-&gt;data - hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='add'>+</div><div class='add'>+	rxd_attention = ath10k_htt_rx_desc_get_attention(hw, rxd);</div><div class='add'>+	attention = __le32_to_cpu(rxd_attention-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	has_fcs_err = !!(attention &amp; RX_ATTENTION_FLAGS_FCS_ERR);</div><div class='ctx'> 	has_crypto_err = !!(attention &amp; RX_ATTENTION_FLAGS_DECRYPT_ERR);</div><div class='hunk'>@@ -1866,7 +2056,35 @@ static void ath10k_htt_rx_h_mpdu(struct ath10k *ar,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_walk(amsdu, msdu) {</div><div class='del'>-		ath10k_htt_rx_h_csum_offload(msdu);</div><div class='add'>+		if (frag &amp;&amp; !fill_crypt_header &amp;&amp; is_decrypted &amp;&amp;</div><div class='add'>+		    enctype == HTT_RX_MPDU_ENCRYPT_AES_CCM_WPA2)</div><div class='add'>+			frag_pn_check = ath10k_htt_rx_h_frag_pn_check(ar,</div><div class='add'>+								      msdu,</div><div class='add'>+								      peer_id,</div><div class='add'>+								      enctype);</div><div class='add'>+</div><div class='add'>+		if (frag)</div><div class='add'>+			multicast_check = ath10k_htt_rx_h_frag_multicast_check(ar,</div><div class='add'>+									       msdu);</div><div class='add'>+</div><div class='add'>+		if (!frag_pn_check || !multicast_check) {</div><div class='add'>+			/* Discard the fragment with invalid PN or multicast DA</div><div class='add'>+			 */</div><div class='add'>+			temp = msdu-&gt;prev;</div><div class='add'>+			__skb_unlink(msdu, amsdu);</div><div class='add'>+			dev_kfree_skb_any(msdu);</div><div class='add'>+			msdu = temp;</div><div class='add'>+			frag_pn_check = true;</div><div class='add'>+			multicast_check = true;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath10k_htt_rx_h_csum_offload(&amp;ar-&gt;hw_params, msdu);</div><div class='add'>+</div><div class='add'>+		if (frag &amp;&amp; !fill_crypt_header &amp;&amp;</div><div class='add'>+		    enctype == HTT_RX_MPDU_ENCRYPT_TKIP_WPA)</div><div class='add'>+			status-&gt;flag &amp;= ~RX_FLAG_MMIC_STRIPPED;</div><div class='add'>+</div><div class='ctx'> 		ath10k_htt_rx_h_undecap(ar, msdu, status, first_hdr, enctype,</div><div class='ctx'> 					is_decrypted);</div><div class='ctx'> </div><div class='hunk'>@@ -1884,6 +2102,11 @@ static void ath10k_htt_rx_h_mpdu(struct ath10k *ar,</div><div class='ctx'> </div><div class='ctx'> 		hdr = (void *)msdu-&gt;data;</div><div class='ctx'> 		hdr-&gt;frame_control &amp;= ~__cpu_to_le16(IEEE80211_FCTL_PROTECTED);</div><div class='add'>+</div><div class='add'>+		if (frag &amp;&amp; !fill_crypt_header &amp;&amp;</div><div class='add'>+		    enctype == HTT_RX_MPDU_ENCRYPT_TKIP_WPA)</div><div class='add'>+			status-&gt;flag &amp;= ~RX_FLAG_IV_STRIPPED &amp;</div><div class='add'>+					~RX_FLAG_MMIC_STRIPPED;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1968,12 +2191,19 @@ static void ath10k_htt_rx_h_unchain(struct ath10k *ar,</div><div class='ctx'> 				    unsigned long *unchain_cnt)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *first;</div><div class='add'>+	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='ctx'> 	struct htt_rx_desc *rxd;</div><div class='add'>+	struct rx_msdu_start_common *rxd_msdu_start_common;</div><div class='add'>+	struct rx_frag_info_common *rxd_frag_info;</div><div class='ctx'> 	enum rx_msdu_decap_format decap;</div><div class='ctx'> </div><div class='ctx'> 	first = skb_peek(amsdu);</div><div class='del'>-	rxd = (void *)first-&gt;data - sizeof(*rxd);</div><div class='del'>-	decap = MS(__le32_to_cpu(rxd-&gt;msdu_start.common.info1),</div><div class='add'>+	rxd = HTT_RX_BUF_TO_RX_DESC(hw,</div><div class='add'>+				    (void *)first-&gt;data - hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='add'>+</div><div class='add'>+	rxd_msdu_start_common = ath10k_htt_rx_desc_get_msdu_start(hw, rxd);</div><div class='add'>+	rxd_frag_info = ath10k_htt_rx_desc_get_frag_info(hw, rxd);</div><div class='add'>+	decap = MS(__le32_to_cpu(rxd_msdu_start_common-&gt;info1),</div><div class='ctx'> 		   RX_MSDU_START_INFO1_DECAP_FORMAT);</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: Current unchaining logic can only handle simple case of raw</div><div class='hunk'>@@ -1982,7 +2212,7 @@ static void ath10k_htt_rx_h_unchain(struct ath10k *ar,</div><div class='ctx'> 	 * try re-constructing such frames - it'll be pretty much garbage.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (decap != RX_MSDU_DECAP_RAW ||</div><div class='del'>-	    skb_queue_len(amsdu) != 1 + rxd-&gt;frag_info.ring2_more_count) {</div><div class='add'>+	    skb_queue_len(amsdu) != 1 + rxd_frag_info-&gt;ring2_more_count) {</div><div class='ctx'> 		*drop_cnt += skb_queue_len(amsdu);</div><div class='ctx'> 		__skb_queue_purge(amsdu);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1991,14 +2221,69 @@ static void ath10k_htt_rx_h_unchain(struct ath10k *ar,</div><div class='ctx'> 	ath10k_unchain_msdu(amsdu, unchain_cnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ath10k_htt_rx_validate_amsdu(struct ath10k *ar,</div><div class='add'>+					 struct sk_buff_head *amsdu)</div><div class='add'>+{</div><div class='add'>+	u8 *subframe_hdr;</div><div class='add'>+	struct sk_buff *first;</div><div class='add'>+	bool is_first, is_last;</div><div class='add'>+	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='add'>+	struct htt_rx_desc *rxd;</div><div class='add'>+	struct rx_msdu_end_common *rxd_msdu_end_common;</div><div class='add'>+	struct rx_mpdu_start *rxd_mpdu_start;</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	size_t hdr_len, crypto_len;</div><div class='add'>+	enum htt_rx_mpdu_encrypt_type enctype;</div><div class='add'>+	int bytes_aligned = ar-&gt;hw_params.decap_align_bytes;</div><div class='add'>+</div><div class='add'>+	first = skb_peek(amsdu);</div><div class='add'>+</div><div class='add'>+	rxd = HTT_RX_BUF_TO_RX_DESC(hw,</div><div class='add'>+				    (void *)first-&gt;data - hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='add'>+</div><div class='add'>+	rxd_msdu_end_common = ath10k_htt_rx_desc_get_msdu_end(hw, rxd);</div><div class='add'>+	rxd_mpdu_start = ath10k_htt_rx_desc_get_mpdu_start(hw, rxd);</div><div class='add'>+	hdr = (void *)ath10k_htt_rx_desc_get_rx_hdr_status(hw, rxd);</div><div class='add'>+</div><div class='add'>+	is_first = !!(rxd_msdu_end_common-&gt;info0 &amp;</div><div class='add'>+		      __cpu_to_le32(RX_MSDU_END_INFO0_FIRST_MSDU));</div><div class='add'>+	is_last = !!(rxd_msdu_end_common-&gt;info0 &amp;</div><div class='add'>+		     __cpu_to_le32(RX_MSDU_END_INFO0_LAST_MSDU));</div><div class='add'>+</div><div class='add'>+	/* Return in case of non-aggregated msdu */</div><div class='add'>+	if (is_first &amp;&amp; is_last)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* First msdu flag is not set for the first msdu of the list */</div><div class='add'>+	if (!is_first)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	enctype = MS(__le32_to_cpu(rxd_mpdu_start-&gt;info0),</div><div class='add'>+		     RX_MPDU_START_INFO0_ENCRYPT_TYPE);</div><div class='add'>+</div><div class='add'>+	hdr_len = ieee80211_hdrlen(hdr-&gt;frame_control);</div><div class='add'>+	crypto_len = ath10k_htt_rx_crypto_param_len(ar, enctype);</div><div class='add'>+</div><div class='add'>+	subframe_hdr = (u8 *)hdr + round_up(hdr_len, bytes_aligned) +</div><div class='add'>+		       crypto_len;</div><div class='add'>+</div><div class='add'>+	/* Validate if the amsdu has a proper first subframe.</div><div class='add'>+	 * There are chances a single msdu can be received as amsdu when</div><div class='add'>+	 * the unauthenticated amsdu flag of a QoS header</div><div class='add'>+	 * gets flipped in non-SPP AMSDU's, in such cases the first</div><div class='add'>+	 * subframe has llc/snap header in place of a valid da.</div><div class='add'>+	 * return false if the da matches rfc1042 pattern</div><div class='add'>+	 */</div><div class='add'>+	if (ether_addr_equal(subframe_hdr, rfc1042_header))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool ath10k_htt_rx_amsdu_allowed(struct ath10k *ar,</div><div class='ctx'> 					struct sk_buff_head *amsdu,</div><div class='ctx'> 					struct ieee80211_rx_status *rx_status)</div><div class='ctx'> {</div><div class='del'>-	/* FIXME: It might be a good idea to do some fuzzy-testing to drop</div><div class='del'>-	 * invalid/dangerous frames.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='ctx'> 	if (!rx_status-&gt;freq) {</div><div class='ctx'> 		ath10k_dbg(ar, ATH10K_DBG_HTT, "no channel configured; ignoring frame(s)!\n");</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -2009,6 +2294,11 @@ static bool ath10k_htt_rx_amsdu_allowed(struct ath10k *ar,</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!ath10k_htt_rx_validate_amsdu(ar, amsdu)) {</div><div class='add'>+		ath10k_dbg(ar, ATH10K_DBG_HTT, "invalid amsdu received\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2071,7 +2361,8 @@ static int ath10k_htt_rx_handle_amsdu(struct ath10k_htt *htt)</div><div class='ctx'> 		ath10k_htt_rx_h_unchain(ar, &amp;amsdu, &amp;drop_cnt, &amp;unchain_cnt);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_htt_rx_h_filter(ar, &amp;amsdu, rx_status, &amp;drop_cnt_filter);</div><div class='del'>-	ath10k_htt_rx_h_mpdu(ar, &amp;amsdu, rx_status, true, first_hdr, &amp;err);</div><div class='add'>+	ath10k_htt_rx_h_mpdu(ar, &amp;amsdu, rx_status, true, first_hdr, &amp;err, 0,</div><div class='add'>+			     false);</div><div class='ctx'> 	msdus_to_queue = skb_queue_len(&amp;amsdu);</div><div class='ctx'> 	ath10k_htt_rx_h_enqueue(ar, &amp;amsdu, rx_status);</div><div class='ctx'> </div><div class='hunk'>@@ -2111,7 +2402,7 @@ static bool ath10k_htt_rx_pn_check_replay_hl(struct ath10k *ar,</div><div class='ctx'> 	bool last_pn_valid, pn_invalid = false;</div><div class='ctx'> 	enum htt_txrx_sec_cast_type sec_index;</div><div class='ctx'> 	enum htt_security_types sec_type;</div><div class='del'>-	union htt_rx_pn_t new_pn = {0};</div><div class='add'>+	union htt_rx_pn_t new_pn = {};</div><div class='ctx'> 	struct htt_hl_rx_desc *rx_desc;</div><div class='ctx'> 	union htt_rx_pn_t *last_pn;</div><div class='ctx'> 	u32 rx_desc_info, tid;</div><div class='hunk'>@@ -2174,7 +2465,7 @@ static bool ath10k_htt_rx_proc_rx_ind_hl(struct ath10k_htt *htt,</div><div class='ctx'> 	struct fw_rx_desc_hl *fw_desc;</div><div class='ctx'> 	enum htt_txrx_sec_cast_type sec_index;</div><div class='ctx'> 	enum htt_security_types sec_type;</div><div class='del'>-	union htt_rx_pn_t new_pn = {0};</div><div class='add'>+	union htt_rx_pn_t new_pn = {};</div><div class='ctx'> 	struct htt_hl_rx_desc *rx_desc;</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='ctx'> 	struct ieee80211_rx_status *rx_status;</div><div class='hunk'>@@ -2204,9 +2495,14 @@ static bool ath10k_htt_rx_proc_rx_ind_hl(struct ath10k_htt *htt,</div><div class='ctx'> 	fw_desc = &amp;rx-&gt;fw_desc;</div><div class='ctx'> 	rx_desc_len = fw_desc-&gt;len;</div><div class='ctx'> </div><div class='add'>+	if (fw_desc-&gt;u.bits.discard) {</div><div class='add'>+		ath10k_dbg(ar, ATH10K_DBG_HTT, "htt discard mpdu\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* I have not yet seen any case where num_mpdu_ranges &gt; 1.</div><div class='ctx'> 	 * qcacld does not seem handle that case either, so we introduce the</div><div class='del'>-	 * same limitiation here as well.</div><div class='add'>+	 * same limitation here as well.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (num_mpdu_ranges &gt; 1)</div><div class='ctx'> 		ath10k_warn(ar,</div><div class='hunk'>@@ -2471,7 +2767,7 @@ static bool ath10k_htt_rx_proc_rx_frag_ind_hl(struct ath10k_htt *htt,</div><div class='ctx'> 	struct htt_rx_indication_hl *rx_hl;</div><div class='ctx'> 	enum htt_security_types sec_type;</div><div class='ctx'> 	u32 tid, frag, seq, rx_desc_info;</div><div class='del'>-	union htt_rx_pn_t new_pn = {0};</div><div class='add'>+	union htt_rx_pn_t new_pn = {};</div><div class='ctx'> 	struct htt_hl_rx_desc *rx_desc;</div><div class='ctx'> 	u16 peer_id, sc, hdr_space;</div><div class='ctx'> 	union htt_rx_pn_t *last_pn;</div><div class='hunk'>@@ -2509,6 +2805,13 @@ static bool ath10k_htt_rx_proc_rx_frag_ind_hl(struct ath10k_htt *htt,</div><div class='ctx'> 	rx_desc = (struct htt_hl_rx_desc *)(skb-&gt;data + tot_hdr_len);</div><div class='ctx'> 	rx_desc_info = __le32_to_cpu(rx_desc-&gt;info);</div><div class='ctx'> </div><div class='add'>+	hdr = (struct ieee80211_hdr *)((u8 *)rx_desc + rx_hl-&gt;fw_desc.len);</div><div class='add'>+</div><div class='add'>+	if (is_multicast_ether_addr(hdr-&gt;addr1)) {</div><div class='add'>+		/* Discard the fragment with multicast DA */</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!MS(rx_desc_info, HTT_RX_DESC_HL_INFO_ENCRYPTED)) {</div><div class='ctx'> 		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> 		return ath10k_htt_rx_proc_rx_ind_hl(htt, &amp;resp-&gt;rx_ind_hl, skb,</div><div class='hunk'>@@ -2516,14 +2819,12 @@ static bool ath10k_htt_rx_proc_rx_frag_ind_hl(struct ath10k_htt *htt,</div><div class='ctx'> 						    HTT_RX_NON_TKIP_MIC);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hdr = (struct ieee80211_hdr *)((u8 *)rx_desc + rx_hl-&gt;fw_desc.len);</div><div class='del'>-</div><div class='ctx'> 	if (ieee80211_has_retry(hdr-&gt;frame_control))</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	hdr_space = ieee80211_hdrlen(hdr-&gt;frame_control);</div><div class='ctx'> 	sc = __le16_to_cpu(hdr-&gt;seq_ctrl);</div><div class='del'>-	seq = (sc &amp; IEEE80211_SCTL_SEQ) &gt;&gt; 4;</div><div class='add'>+	seq = IEEE80211_SEQ_TO_SN(sc);</div><div class='ctx'> 	frag = sc &amp; IEEE80211_SCTL_FRAG;</div><div class='ctx'> </div><div class='ctx'> 	sec_index = MS(rx_desc_info, HTT_RX_DESC_HL_INFO_MCAST_BCAST) ?</div><div class='hunk'>@@ -2668,7 +2969,6 @@ static void ath10k_htt_rx_tx_compl_ind(struct ath10k *ar,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HTT_DATA_TX_STATUS_DISCARD:</div><div class='ctx'> 	case HTT_DATA_TX_STATUS_POSTPONE:</div><div class='del'>-	case HTT_DATA_TX_STATUS_DOWNLOAD_FAIL:</div><div class='ctx'> 		tx_done.status = HTT_TX_COMPL_STATE_DISCARD;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -2849,11 +3149,13 @@ static void ath10k_htt_rx_delba(struct ath10k *ar, struct htt_resp *resp)</div><div class='ctx'> 	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath10k_htt_rx_extract_amsdu(struct sk_buff_head *list,</div><div class='add'>+static int ath10k_htt_rx_extract_amsdu(struct ath10k_hw_params *hw,</div><div class='add'>+				       struct sk_buff_head *list,</div><div class='ctx'> 				       struct sk_buff_head *amsdu)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *msdu;</div><div class='ctx'> 	struct htt_rx_desc *rxd;</div><div class='add'>+	struct rx_msdu_end_common *rxd_msdu_end_common;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_queue_empty(list))</div><div class='ctx'> 		return -ENOBUFS;</div><div class='hunk'>@@ -2864,15 +3166,22 @@ static int ath10k_htt_rx_extract_amsdu(struct sk_buff_head *list,</div><div class='ctx'> 	while ((msdu = __skb_dequeue(list))) {</div><div class='ctx'> 		__skb_queue_tail(amsdu, msdu);</div><div class='ctx'> </div><div class='del'>-		rxd = (void *)msdu-&gt;data - sizeof(*rxd);</div><div class='del'>-		if (rxd-&gt;msdu_end.common.info0 &amp;</div><div class='add'>+		rxd = HTT_RX_BUF_TO_RX_DESC(hw,</div><div class='add'>+					    (void *)msdu-&gt;data -</div><div class='add'>+					    hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='add'>+</div><div class='add'>+		rxd_msdu_end_common = ath10k_htt_rx_desc_get_msdu_end(hw, rxd);</div><div class='add'>+		if (rxd_msdu_end_common-&gt;info0 &amp;</div><div class='ctx'> 		    __cpu_to_le32(RX_MSDU_END_INFO0_LAST_MSDU))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	msdu = skb_peek_tail(amsdu);</div><div class='del'>-	rxd = (void *)msdu-&gt;data - sizeof(*rxd);</div><div class='del'>-	if (!(rxd-&gt;msdu_end.common.info0 &amp;</div><div class='add'>+	rxd = HTT_RX_BUF_TO_RX_DESC(hw,</div><div class='add'>+				    (void *)msdu-&gt;data - hw-&gt;rx_desc_ops-&gt;rx_desc_size);</div><div class='add'>+</div><div class='add'>+	rxd_msdu_end_common = ath10k_htt_rx_desc_get_msdu_end(hw, rxd);</div><div class='add'>+	if (!(rxd_msdu_end_common-&gt;info0 &amp;</div><div class='ctx'> 	      __cpu_to_le32(RX_MSDU_END_INFO0_LAST_MSDU))) {</div><div class='ctx'> 		skb_queue_splice_init(amsdu, list);</div><div class='ctx'> 		return -EAGAIN;</div><div class='hunk'>@@ -3015,7 +3324,7 @@ static int ath10k_htt_rx_in_ord_ind(struct ath10k *ar, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	while (!skb_queue_empty(&amp;list)) {</div><div class='ctx'> 		__skb_queue_head_init(&amp;amsdu);</div><div class='del'>-		ret = ath10k_htt_rx_extract_amsdu(&amp;list, &amp;amsdu);</div><div class='add'>+		ret = ath10k_htt_rx_extract_amsdu(&amp;ar-&gt;hw_params, &amp;list, &amp;amsdu);</div><div class='ctx'> 		switch (ret) {</div><div class='ctx'> 		case 0:</div><div class='ctx'> 			/* Note: The in-order indication may report interleaved</div><div class='hunk'>@@ -3027,7 +3336,7 @@ static int ath10k_htt_rx_in_ord_ind(struct ath10k *ar, struct sk_buff *skb)</div><div class='ctx'> 			ath10k_htt_rx_h_ppdu(ar, &amp;amsdu, status, vdev_id);</div><div class='ctx'> 			ath10k_htt_rx_h_filter(ar, &amp;amsdu, status, NULL);</div><div class='ctx'> 			ath10k_htt_rx_h_mpdu(ar, &amp;amsdu, status, false, NULL,</div><div class='del'>-					     NULL);</div><div class='add'>+					     NULL, peer_id, frag);</div><div class='ctx'> 			ath10k_htt_rx_h_enqueue(ar, &amp;amsdu, status);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case -EAGAIN:</div><div class='hunk'>@@ -3259,7 +3568,7 @@ static void ath10k_htt_rx_tx_mode_switch_ind(struct ath10k *ar,</div><div class='ctx'> 	threshold = MS(info1, HTT_TX_MODE_SWITCH_IND_INFO1_THRESHOLD);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_HTT,</div><div class='del'>-		   "htt rx tx mode switch ind info0 0x%04hx info1 0x%04x enable %d num records %zd mode %d threshold %u\n",</div><div class='add'>+		   "htt rx tx mode switch ind info0 0x%04x info1 0x%04x enable %d num records %zd mode %d threshold %u\n",</div><div class='ctx'> 		   info0, info1, enable, num_records, mode, threshold);</div><div class='ctx'> </div><div class='ctx'> 	len += sizeof(resp-&gt;tx_mode_switch_ind.records[0]) * num_records;</div><div class='hunk'>@@ -3536,7 +3845,7 @@ ath10k_update_per_peer_tx_stats(struct ath10k *ar,</div><div class='ctx'> 	switch (txrate.flags) {</div><div class='ctx'> 	case WMI_RATE_PREAMBLE_OFDM:</div><div class='ctx'> 		if (arsta-&gt;arvif &amp;&amp; arsta-&gt;arvif-&gt;vif)</div><div class='del'>-			conf = rcu_dereference(arsta-&gt;arvif-&gt;vif-&gt;chanctx_conf);</div><div class='add'>+			conf = rcu_dereference(arsta-&gt;arvif-&gt;vif-&gt;bss_conf.chanctx_conf);</div><div class='ctx'> 		if (conf &amp;&amp; conf-&gt;def.chan-&gt;band == NL80211_BAND_5GHZ)</div><div class='ctx'> 			arsta-&gt;tx_info.status.rates[0].idx = rate_idx - 4;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -3580,6 +3889,10 @@ ath10k_update_per_peer_tx_stats(struct ath10k *ar,</div><div class='ctx'> 		arsta-&gt;tx_info.status.rates[0].flags |=</div><div class='ctx'> 				IEEE80211_TX_RC_80_MHZ_WIDTH;</div><div class='ctx'> 		break;</div><div class='add'>+	case RATE_INFO_BW_160:</div><div class='add'>+		arsta-&gt;tx_info.status.rates[0].flags |=</div><div class='add'>+				IEEE80211_TX_RC_160_MHZ_WIDTH;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (peer_stats-&gt;succ_pkts) {</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c<br/>index d6b8bdcef416..d6f1d85ba871 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/htt_tx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/htt_tx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/htt_tx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/htt_tx.c</a></div><div class='hunk'>@@ -2,8 +2,11 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2005-2011 Atheros Communications Inc.</div><div class='ctx'>  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.</div><div class='add'>+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include "htt.h"</div><div class='ctx'> #include "mac.h"</div><div class='hunk'>@@ -40,7 +43,6 @@ static void __ath10k_htt_tx_txq_recalc(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct ath10k *ar = hw-&gt;priv;</div><div class='ctx'> 	struct ath10k_sta *arsta;</div><div class='ctx'> 	struct ath10k_vif *arvif = (void *)txq-&gt;vif-&gt;drv_priv;</div><div class='del'>-	unsigned long frame_cnt;</div><div class='ctx'> 	unsigned long byte_cnt;</div><div class='ctx'> 	int idx;</div><div class='ctx'> 	u32 bit;</div><div class='hunk'>@@ -67,7 +69,7 @@ static void __ath10k_htt_tx_txq_recalc(struct ieee80211_hw *hw,</div><div class='ctx'> 	bit = BIT(peer_id % 32);</div><div class='ctx'> 	idx = peer_id / 32;</div><div class='ctx'> </div><div class='del'>-	ieee80211_txq_get_depth(txq, &amp;frame_cnt, &amp;byte_cnt);</div><div class='add'>+	ieee80211_txq_get_depth(txq, NULL, &amp;byte_cnt);</div><div class='ctx'> 	count = ath10k_htt_tx_txq_calc_size(byte_cnt);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(peer_id &gt;= ar-&gt;htt.tx_q_state.num_peers) ||</div><div class='hunk'>@@ -147,6 +149,9 @@ void ath10k_htt_tx_dec_pending(struct ath10k_htt *htt)</div><div class='ctx'> 	htt-&gt;num_pending_tx--;</div><div class='ctx'> 	if (htt-&gt;num_pending_tx == htt-&gt;max_num_pending_tx - 1)</div><div class='ctx'> 		ath10k_mac_tx_unlock(htt-&gt;ar, ATH10K_TX_PAUSE_Q_FULL);</div><div class='add'>+</div><div class='add'>+	if (htt-&gt;num_pending_tx == 0)</div><div class='add'>+		wake_up(&amp;htt-&gt;empty_tx_wq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ath10k_htt_tx_inc_pending(struct ath10k_htt *htt)</div><div class='hunk'>@@ -505,7 +510,7 @@ static int ath10k_htt_tx_clean_up_pending(int msdu_id, void *skb, void *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = ctx;</div><div class='ctx'> 	struct ath10k_htt *htt = &amp;ar-&gt;htt;</div><div class='del'>-	struct htt_tx_done tx_done = {0};</div><div class='add'>+	struct htt_tx_done tx_done = {};</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_HTT, "force cleanup msdu_id %u\n", msdu_id);</div><div class='ctx'> </div><div class='hunk'>@@ -555,7 +560,7 @@ void ath10k_htt_op_ep_tx_credits(struct ath10k *ar)</div><div class='ctx'> void ath10k_htt_htc_tx_complete(struct ath10k *ar, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k_htt *htt = &amp;ar-&gt;htt;</div><div class='del'>-	struct htt_tx_done tx_done = {0};</div><div class='add'>+	struct htt_tx_done tx_done = {};</div><div class='ctx'> 	struct htt_cmd_hdr *htt_hdr;</div><div class='ctx'> 	struct htt_data_tx_desc *desc_hdr = NULL;</div><div class='ctx'> 	u16 flags1 = 0;</div><div class='hunk'>@@ -793,47 +798,22 @@ static int ath10k_htt_send_frag_desc_bank_cfg_64(struct ath10k_htt *htt)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath10k_htt_fill_rx_desc_offset_32(void *rx_ring)</div><div class='add'>+static void ath10k_htt_fill_rx_desc_offset_32(struct ath10k_hw_params *hw,</div><div class='add'>+					      struct htt_rx_ring_setup_ring32 *rx_ring)</div><div class='ctx'> {</div><div class='del'>-	struct htt_rx_ring_setup_ring32 *ring =</div><div class='del'>-			(struct htt_rx_ring_setup_ring32 *)rx_ring;</div><div class='del'>-</div><div class='del'>-#define desc_offset(x) (offsetof(struct htt_rx_desc, x) / 4)</div><div class='del'>-	ring-&gt;mac80211_hdr_offset = __cpu_to_le16(desc_offset(rx_hdr_status));</div><div class='del'>-	ring-&gt;msdu_payload_offset = __cpu_to_le16(desc_offset(msdu_payload));</div><div class='del'>-	ring-&gt;ppdu_start_offset = __cpu_to_le16(desc_offset(ppdu_start));</div><div class='del'>-	ring-&gt;ppdu_end_offset = __cpu_to_le16(desc_offset(ppdu_end));</div><div class='del'>-	ring-&gt;mpdu_start_offset = __cpu_to_le16(desc_offset(mpdu_start));</div><div class='del'>-	ring-&gt;mpdu_end_offset = __cpu_to_le16(desc_offset(mpdu_end));</div><div class='del'>-	ring-&gt;msdu_start_offset = __cpu_to_le16(desc_offset(msdu_start));</div><div class='del'>-	ring-&gt;msdu_end_offset = __cpu_to_le16(desc_offset(msdu_end));</div><div class='del'>-	ring-&gt;rx_attention_offset = __cpu_to_le16(desc_offset(attention));</div><div class='del'>-	ring-&gt;frag_info_offset = __cpu_to_le16(desc_offset(frag_info));</div><div class='del'>-#undef desc_offset</div><div class='add'>+	ath10k_htt_rx_desc_get_offsets(hw, &amp;rx_ring-&gt;offsets);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath10k_htt_fill_rx_desc_offset_64(void *rx_ring)</div><div class='add'>+static void ath10k_htt_fill_rx_desc_offset_64(struct ath10k_hw_params *hw,</div><div class='add'>+					      struct htt_rx_ring_setup_ring64 *rx_ring)</div><div class='ctx'> {</div><div class='del'>-	struct htt_rx_ring_setup_ring64 *ring =</div><div class='del'>-			(struct htt_rx_ring_setup_ring64 *)rx_ring;</div><div class='del'>-</div><div class='del'>-#define desc_offset(x) (offsetof(struct htt_rx_desc, x) / 4)</div><div class='del'>-	ring-&gt;mac80211_hdr_offset = __cpu_to_le16(desc_offset(rx_hdr_status));</div><div class='del'>-	ring-&gt;msdu_payload_offset = __cpu_to_le16(desc_offset(msdu_payload));</div><div class='del'>-	ring-&gt;ppdu_start_offset = __cpu_to_le16(desc_offset(ppdu_start));</div><div class='del'>-	ring-&gt;ppdu_end_offset = __cpu_to_le16(desc_offset(ppdu_end));</div><div class='del'>-	ring-&gt;mpdu_start_offset = __cpu_to_le16(desc_offset(mpdu_start));</div><div class='del'>-	ring-&gt;mpdu_end_offset = __cpu_to_le16(desc_offset(mpdu_end));</div><div class='del'>-	ring-&gt;msdu_start_offset = __cpu_to_le16(desc_offset(msdu_start));</div><div class='del'>-	ring-&gt;msdu_end_offset = __cpu_to_le16(desc_offset(msdu_end));</div><div class='del'>-	ring-&gt;rx_attention_offset = __cpu_to_le16(desc_offset(attention));</div><div class='del'>-	ring-&gt;frag_info_offset = __cpu_to_le16(desc_offset(frag_info));</div><div class='del'>-#undef desc_offset</div><div class='add'>+	ath10k_htt_rx_desc_get_offsets(hw, &amp;rx_ring-&gt;offsets);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath10k_htt_send_rx_ring_cfg_32(struct ath10k_htt *htt)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = htt-&gt;ar;</div><div class='add'>+	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct htt_cmd *cmd;</div><div class='ctx'> 	struct htt_rx_ring_setup_ring32 *ring;</div><div class='hunk'>@@ -893,7 +873,7 @@ static int ath10k_htt_send_rx_ring_cfg_32(struct ath10k_htt *htt)</div><div class='ctx'> 	ring-&gt;flags = __cpu_to_le16(flags);</div><div class='ctx'> 	ring-&gt;fw_idx_init_val = __cpu_to_le16(fw_idx);</div><div class='ctx'> </div><div class='del'>-	ath10k_htt_fill_rx_desc_offset_32(ring);</div><div class='add'>+	ath10k_htt_fill_rx_desc_offset_32(hw, ring);</div><div class='ctx'> 	ret = ath10k_htc_send(&amp;htt-&gt;ar-&gt;htc, htt-&gt;eid, skb);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='hunk'>@@ -906,6 +886,7 @@ static int ath10k_htt_send_rx_ring_cfg_32(struct ath10k_htt *htt)</div><div class='ctx'> static int ath10k_htt_send_rx_ring_cfg_64(struct ath10k_htt *htt)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = htt-&gt;ar;</div><div class='add'>+	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct htt_cmd *cmd;</div><div class='ctx'> 	struct htt_rx_ring_setup_ring64 *ring;</div><div class='hunk'>@@ -962,7 +943,7 @@ static int ath10k_htt_send_rx_ring_cfg_64(struct ath10k_htt *htt)</div><div class='ctx'> 	ring-&gt;flags = __cpu_to_le16(flags);</div><div class='ctx'> 	ring-&gt;fw_idx_init_val = __cpu_to_le16(fw_idx);</div><div class='ctx'> </div><div class='del'>-	ath10k_htt_fill_rx_desc_offset_64(ring);</div><div class='add'>+	ath10k_htt_fill_rx_desc_offset_64(hw, ring);</div><div class='ctx'> 	ret = ath10k_htc_send(&amp;htt-&gt;ar-&gt;htc, htt-&gt;eid, skb);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='hunk'>@@ -1129,7 +1110,7 @@ int ath10k_htt_tx_fetch_resp(struct ath10k *ar,</div><div class='ctx'> 	int len = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* Response IDs are echo-ed back only for host driver convienence</div><div class='add'>+	/* Response IDs are echo-ed back only for host driver convenience</div><div class='ctx'> 	 * purposes. They aren't used for anything in the driver yet so use 0.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='hunk'>@@ -1292,7 +1273,6 @@ static int ath10k_htt_tx_hl(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txm</div><div class='ctx'> 	struct ath10k *ar = htt-&gt;ar;</div><div class='ctx'> 	int res, data_len;</div><div class='ctx'> 	struct htt_cmd_hdr *cmd_hdr;</div><div class='del'>-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)msdu-&gt;data;</div><div class='ctx'> 	struct htt_data_tx_desc *tx_desc;</div><div class='ctx'> 	struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(msdu);</div><div class='ctx'> 	struct sk_buff *tmp_skb;</div><div class='hunk'>@@ -1303,11 +1283,15 @@ static int ath10k_htt_tx_hl(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txm</div><div class='ctx'> 	u16 flags1 = 0;</div><div class='ctx'> 	u16 msdu_id = 0;</div><div class='ctx'> </div><div class='del'>-	if ((ieee80211_is_action(hdr-&gt;frame_control) ||</div><div class='del'>-	     ieee80211_is_deauth(hdr-&gt;frame_control) ||</div><div class='del'>-	     ieee80211_is_disassoc(hdr-&gt;frame_control)) &amp;&amp;</div><div class='del'>-	     ieee80211_has_protected(hdr-&gt;frame_control)) {</div><div class='del'>-		skb_put(msdu, IEEE80211_CCMP_MIC_LEN);</div><div class='add'>+	if (!is_eth) {</div><div class='add'>+		struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)msdu-&gt;data;</div><div class='add'>+</div><div class='add'>+		if ((ieee80211_is_action(hdr-&gt;frame_control) ||</div><div class='add'>+		     ieee80211_is_deauth(hdr-&gt;frame_control) ||</div><div class='add'>+		     ieee80211_is_disassoc(hdr-&gt;frame_control)) &amp;&amp;</div><div class='add'>+		     ieee80211_has_protected(hdr-&gt;frame_control)) {</div><div class='add'>+			skb_put(msdu, IEEE80211_CCMP_MIC_LEN);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	data_len = msdu-&gt;len;</div><div class='hunk'>@@ -1404,7 +1388,6 @@ static int ath10k_htt_tx_32(struct ath10k_htt *htt,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = htt-&gt;ar;</div><div class='ctx'> 	struct device *dev = ar-&gt;dev;</div><div class='del'>-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)msdu-&gt;data;</div><div class='ctx'> 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(msdu);</div><div class='ctx'> 	struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(msdu);</div><div class='ctx'> 	struct ath10k_hif_sg_item sg_items[2];</div><div class='hunk'>@@ -1436,15 +1419,19 @@ static int ath10k_htt_tx_32(struct ath10k_htt *htt,</div><div class='ctx'> 	txbuf_paddr = htt-&gt;txbuf.paddr +</div><div class='ctx'> 		      (sizeof(struct ath10k_htt_txbuf_32) * msdu_id);</div><div class='ctx'> </div><div class='del'>-	if ((ieee80211_is_action(hdr-&gt;frame_control) ||</div><div class='del'>-	     ieee80211_is_deauth(hdr-&gt;frame_control) ||</div><div class='del'>-	     ieee80211_is_disassoc(hdr-&gt;frame_control)) &amp;&amp;</div><div class='del'>-	     ieee80211_has_protected(hdr-&gt;frame_control)) {</div><div class='del'>-		skb_put(msdu, IEEE80211_CCMP_MIC_LEN);</div><div class='del'>-	} else if (!(skb_cb-&gt;flags &amp; ATH10K_SKB_F_NO_HWCRYPT) &amp;&amp;</div><div class='del'>-		   txmode == ATH10K_HW_TXRX_RAW &amp;&amp;</div><div class='del'>-		   ieee80211_has_protected(hdr-&gt;frame_control)) {</div><div class='del'>-		skb_put(msdu, IEEE80211_CCMP_MIC_LEN);</div><div class='add'>+	if (!is_eth) {</div><div class='add'>+		struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)msdu-&gt;data;</div><div class='add'>+</div><div class='add'>+		if ((ieee80211_is_action(hdr-&gt;frame_control) ||</div><div class='add'>+		     ieee80211_is_deauth(hdr-&gt;frame_control) ||</div><div class='add'>+		     ieee80211_is_disassoc(hdr-&gt;frame_control)) &amp;&amp;</div><div class='add'>+		     ieee80211_has_protected(hdr-&gt;frame_control)) {</div><div class='add'>+			skb_put(msdu, IEEE80211_CCMP_MIC_LEN);</div><div class='add'>+		} else if (!(skb_cb-&gt;flags &amp; ATH10K_SKB_F_NO_HWCRYPT) &amp;&amp;</div><div class='add'>+			   txmode == ATH10K_HW_TXRX_RAW &amp;&amp;</div><div class='add'>+			   ieee80211_has_protected(hdr-&gt;frame_control)) {</div><div class='add'>+			skb_put(msdu, IEEE80211_CCMP_MIC_LEN);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_cb-&gt;paddr = dma_map_single(dev, msdu-&gt;data, msdu-&gt;len,</div><div class='hunk'>@@ -1606,7 +1593,6 @@ static int ath10k_htt_tx_64(struct ath10k_htt *htt,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = htt-&gt;ar;</div><div class='ctx'> 	struct device *dev = ar-&gt;dev;</div><div class='del'>-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)msdu-&gt;data;</div><div class='ctx'> 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(msdu);</div><div class='ctx'> 	struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(msdu);</div><div class='ctx'> 	struct ath10k_hif_sg_item sg_items[2];</div><div class='hunk'>@@ -1638,15 +1624,19 @@ static int ath10k_htt_tx_64(struct ath10k_htt *htt,</div><div class='ctx'> 	txbuf_paddr = htt-&gt;txbuf.paddr +</div><div class='ctx'> 		      (sizeof(struct ath10k_htt_txbuf_64) * msdu_id);</div><div class='ctx'> </div><div class='del'>-	if ((ieee80211_is_action(hdr-&gt;frame_control) ||</div><div class='del'>-	     ieee80211_is_deauth(hdr-&gt;frame_control) ||</div><div class='del'>-	     ieee80211_is_disassoc(hdr-&gt;frame_control)) &amp;&amp;</div><div class='del'>-	     ieee80211_has_protected(hdr-&gt;frame_control)) {</div><div class='del'>-		skb_put(msdu, IEEE80211_CCMP_MIC_LEN);</div><div class='del'>-	} else if (!(skb_cb-&gt;flags &amp; ATH10K_SKB_F_NO_HWCRYPT) &amp;&amp;</div><div class='del'>-		   txmode == ATH10K_HW_TXRX_RAW &amp;&amp;</div><div class='del'>-		   ieee80211_has_protected(hdr-&gt;frame_control)) {</div><div class='del'>-		skb_put(msdu, IEEE80211_CCMP_MIC_LEN);</div><div class='add'>+	if (!is_eth) {</div><div class='add'>+		struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)msdu-&gt;data;</div><div class='add'>+</div><div class='add'>+		if ((ieee80211_is_action(hdr-&gt;frame_control) ||</div><div class='add'>+		     ieee80211_is_deauth(hdr-&gt;frame_control) ||</div><div class='add'>+		     ieee80211_is_disassoc(hdr-&gt;frame_control)) &amp;&amp;</div><div class='add'>+		     ieee80211_has_protected(hdr-&gt;frame_control)) {</div><div class='add'>+			skb_put(msdu, IEEE80211_CCMP_MIC_LEN);</div><div class='add'>+		} else if (!(skb_cb-&gt;flags &amp; ATH10K_SKB_F_NO_HWCRYPT) &amp;&amp;</div><div class='add'>+			   txmode == ATH10K_HW_TXRX_RAW &amp;&amp;</div><div class='add'>+			   ieee80211_has_protected(hdr-&gt;frame_control)) {</div><div class='add'>+			skb_put(msdu, IEEE80211_CCMP_MIC_LEN);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_cb-&gt;paddr = dma_map_single(dev, msdu-&gt;data, msdu-&gt;len,</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/hw.c b/drivers/net/wireless/ath/ath10k/hw.c<br/>index 57c58af64a57..59b6cebfdd8f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/hw.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/hw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/hw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/hw.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: ISC</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2014-2017 Qualcomm Atheros, Inc.</div><div class='add'>+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -11,6 +12,7 @@</div><div class='ctx'> #include "hif.h"</div><div class='ctx'> #include "wmi-ops.h"</div><div class='ctx'> #include "bmi.h"</div><div class='add'>+#include "rx_desc.h"</div><div class='ctx'> </div><div class='ctx'> const struct ath10k_hw_regs qca988x_regs = {</div><div class='ctx'> 	.rtc_soc_base_address		= 0x00004000,</div><div class='hunk'>@@ -83,7 +85,7 @@ const struct ath10k_hw_regs qca99x0_regs = {</div><div class='ctx'> 	.ce5_base_address			= 0x0004b400,</div><div class='ctx'> 	.ce6_base_address			= 0x0004b800,</div><div class='ctx'> 	.ce7_base_address			= 0x0004bc00,</div><div class='del'>-	/* Note: qca99x0 supports upto 12 Copy Engines. Other than address of</div><div class='add'>+	/* Note: qca99x0 supports up to 12 Copy Engines. Other than address of</div><div class='ctx'> 	 * CE0 and CE1 no other copy engine is directly referred in the code.</div><div class='ctx'> 	 * It is not really necessary to assign address for newly supported</div><div class='ctx'> 	 * CEs in this address table.</div><div class='hunk'>@@ -119,7 +121,7 @@ const struct ath10k_hw_regs qca4019_regs = {</div><div class='ctx'> 	.ce5_base_address                       = 0x0004b400,</div><div class='ctx'> 	.ce6_base_address                       = 0x0004b800,</div><div class='ctx'> 	.ce7_base_address                       = 0x0004bc00,</div><div class='del'>-	/* qca4019 supports upto 12 copy engines. Since base address</div><div class='add'>+	/* qca4019 supports up to 12 copy engines. Since base address</div><div class='ctx'> 	 * of ce8 to ce11 are not directly referred in the code,</div><div class='ctx'> 	 * no need have them in separate members in this table.</div><div class='ctx'> 	 *      Copy Engine             Address</div><div class='hunk'>@@ -210,40 +212,40 @@ const struct ath10k_hw_regs wcn3990_regs = {</div><div class='ctx'> 	.pcie_intr_fw_mask			= 0x00100000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_regs_addr_map wcn3990_src_ring = {</div><div class='add'>+static const struct ath10k_hw_ce_regs_addr_map wcn3990_src_ring = {</div><div class='ctx'> 	.msb	= 0x00000010,</div><div class='ctx'> 	.lsb	= 0x00000010,</div><div class='ctx'> 	.mask	= GENMASK(17, 17),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_regs_addr_map wcn3990_dst_ring = {</div><div class='add'>+static const struct ath10k_hw_ce_regs_addr_map wcn3990_dst_ring = {</div><div class='ctx'> 	.msb	= 0x00000012,</div><div class='ctx'> 	.lsb	= 0x00000012,</div><div class='ctx'> 	.mask	= GENMASK(18, 18),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_regs_addr_map wcn3990_dmax = {</div><div class='add'>+static const struct ath10k_hw_ce_regs_addr_map wcn3990_dmax = {</div><div class='ctx'> 	.msb	= 0x00000000,</div><div class='ctx'> 	.lsb	= 0x00000000,</div><div class='ctx'> 	.mask	= GENMASK(15, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_ctrl1 wcn3990_ctrl1 = {</div><div class='add'>+static const struct ath10k_hw_ce_ctrl1 wcn3990_ctrl1 = {</div><div class='ctx'> 	.addr		= 0x00000018,</div><div class='ctx'> 	.src_ring	= &amp;wcn3990_src_ring,</div><div class='ctx'> 	.dst_ring	= &amp;wcn3990_dst_ring,</div><div class='ctx'> 	.dmax		= &amp;wcn3990_dmax,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_regs_addr_map wcn3990_host_ie_cc = {</div><div class='add'>+static const struct ath10k_hw_ce_regs_addr_map wcn3990_host_ie_cc = {</div><div class='ctx'> 	.mask	= GENMASK(0, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_host_ie wcn3990_host_ie = {</div><div class='add'>+static const struct ath10k_hw_ce_host_ie wcn3990_host_ie = {</div><div class='ctx'> 	.copy_complete	= &amp;wcn3990_host_ie_cc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_host_wm_regs wcn3990_wm_reg = {</div><div class='add'>+static const struct ath10k_hw_ce_host_wm_regs wcn3990_wm_reg = {</div><div class='ctx'> 	.dstr_lmask	= 0x00000010,</div><div class='ctx'> 	.dstr_hmask	= 0x00000008,</div><div class='ctx'> 	.srcr_lmask	= 0x00000004,</div><div class='hunk'>@@ -253,7 +255,7 @@ static struct ath10k_hw_ce_host_wm_regs wcn3990_wm_reg = {</div><div class='ctx'> 	.addr		= 0x00000030,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_misc_regs wcn3990_misc_reg = {</div><div class='add'>+static const struct ath10k_hw_ce_misc_regs wcn3990_misc_reg = {</div><div class='ctx'> 	.axi_err	= 0x00000100,</div><div class='ctx'> 	.dstr_add_err	= 0x00000200,</div><div class='ctx'> 	.srcr_len_err	= 0x00000100,</div><div class='hunk'>@@ -264,19 +266,19 @@ static struct ath10k_hw_ce_misc_regs wcn3990_misc_reg = {</div><div class='ctx'> 	.addr		= 0x00000038,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_regs_addr_map wcn3990_src_wm_low = {</div><div class='add'>+static const struct ath10k_hw_ce_regs_addr_map wcn3990_src_wm_low = {</div><div class='ctx'> 	.msb	= 0x00000000,</div><div class='ctx'> 	.lsb	= 0x00000010,</div><div class='ctx'> 	.mask	= GENMASK(31, 16),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_regs_addr_map wcn3990_src_wm_high = {</div><div class='add'>+static const struct ath10k_hw_ce_regs_addr_map wcn3990_src_wm_high = {</div><div class='ctx'> 	.msb	= 0x0000000f,</div><div class='ctx'> 	.lsb	= 0x00000000,</div><div class='ctx'> 	.mask	= GENMASK(15, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_dst_src_wm_regs wcn3990_wm_src_ring = {</div><div class='add'>+static const struct ath10k_hw_ce_dst_src_wm_regs wcn3990_wm_src_ring = {</div><div class='ctx'> 	.addr		= 0x0000004c,</div><div class='ctx'> 	.low_rst	= 0x00000000,</div><div class='ctx'> 	.high_rst	= 0x00000000,</div><div class='hunk'>@@ -284,18 +286,18 @@ static struct ath10k_hw_ce_dst_src_wm_regs wcn3990_wm_src_ring = {</div><div class='ctx'> 	.wm_high	= &amp;wcn3990_src_wm_high,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_regs_addr_map wcn3990_dst_wm_low = {</div><div class='add'>+static const struct ath10k_hw_ce_regs_addr_map wcn3990_dst_wm_low = {</div><div class='ctx'> 	.lsb	= 0x00000010,</div><div class='ctx'> 	.mask	= GENMASK(31, 16),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_regs_addr_map wcn3990_dst_wm_high = {</div><div class='add'>+static const struct ath10k_hw_ce_regs_addr_map wcn3990_dst_wm_high = {</div><div class='ctx'> 	.msb	= 0x0000000f,</div><div class='ctx'> 	.lsb	= 0x00000000,</div><div class='ctx'> 	.mask	= GENMASK(15, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_dst_src_wm_regs wcn3990_wm_dst_ring = {</div><div class='add'>+static const struct ath10k_hw_ce_dst_src_wm_regs wcn3990_wm_dst_ring = {</div><div class='ctx'> 	.addr		= 0x00000050,</div><div class='ctx'> 	.low_rst	= 0x00000000,</div><div class='ctx'> 	.high_rst	= 0x00000000,</div><div class='hunk'>@@ -303,7 +305,7 @@ static struct ath10k_hw_ce_dst_src_wm_regs wcn3990_wm_dst_ring = {</div><div class='ctx'> 	.wm_high	= &amp;wcn3990_dst_wm_high,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_ctrl1_upd wcn3990_ctrl1_upd = {</div><div class='add'>+static const struct ath10k_hw_ce_ctrl1_upd wcn3990_ctrl1_upd = {</div><div class='ctx'> 	.shift = 19,</div><div class='ctx'> 	.mask = 0x00080000,</div><div class='ctx'> 	.enable = 0x00000000,</div><div class='hunk'>@@ -342,25 +344,25 @@ const struct ath10k_hw_values wcn3990_values = {</div><div class='ctx'> 	.ce_desc_meta_data_lsb		= 4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_regs_addr_map qcax_src_ring = {</div><div class='add'>+static const struct ath10k_hw_ce_regs_addr_map qcax_src_ring = {</div><div class='ctx'> 	.msb	= 0x00000010,</div><div class='ctx'> 	.lsb	= 0x00000010,</div><div class='ctx'> 	.mask	= GENMASK(16, 16),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_regs_addr_map qcax_dst_ring = {</div><div class='add'>+static const struct ath10k_hw_ce_regs_addr_map qcax_dst_ring = {</div><div class='ctx'> 	.msb	= 0x00000011,</div><div class='ctx'> 	.lsb	= 0x00000011,</div><div class='ctx'> 	.mask	= GENMASK(17, 17),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_regs_addr_map qcax_dmax = {</div><div class='add'>+static const struct ath10k_hw_ce_regs_addr_map qcax_dmax = {</div><div class='ctx'> 	.msb	= 0x0000000f,</div><div class='ctx'> 	.lsb	= 0x00000000,</div><div class='ctx'> 	.mask	= GENMASK(15, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_ctrl1 qcax_ctrl1 = {</div><div class='add'>+static const struct ath10k_hw_ce_ctrl1 qcax_ctrl1 = {</div><div class='ctx'> 	.addr		= 0x00000010,</div><div class='ctx'> 	.hw_mask	= 0x0007ffff,</div><div class='ctx'> 	.sw_mask	= 0x0007ffff,</div><div class='hunk'>@@ -373,31 +375,31 @@ static struct ath10k_hw_ce_ctrl1 qcax_ctrl1 = {</div><div class='ctx'> 	.dmax		= &amp;qcax_dmax,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_regs_addr_map qcax_cmd_halt_status = {</div><div class='add'>+static const struct ath10k_hw_ce_regs_addr_map qcax_cmd_halt_status = {</div><div class='ctx'> 	.msb	= 0x00000003,</div><div class='ctx'> 	.lsb	= 0x00000003,</div><div class='ctx'> 	.mask	= GENMASK(3, 3),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_cmd_halt qcax_cmd_halt = {</div><div class='add'>+static const struct ath10k_hw_ce_cmd_halt qcax_cmd_halt = {</div><div class='ctx'> 	.msb		= 0x00000000,</div><div class='ctx'> 	.mask		= GENMASK(0, 0),</div><div class='ctx'> 	.status_reset	= 0x00000000,</div><div class='ctx'> 	.status		= &amp;qcax_cmd_halt_status,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_regs_addr_map qcax_host_ie_cc = {</div><div class='add'>+static const struct ath10k_hw_ce_regs_addr_map qcax_host_ie_cc = {</div><div class='ctx'> 	.msb	= 0x00000000,</div><div class='ctx'> 	.lsb	= 0x00000000,</div><div class='ctx'> 	.mask	= GENMASK(0, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_host_ie qcax_host_ie = {</div><div class='add'>+static const struct ath10k_hw_ce_host_ie qcax_host_ie = {</div><div class='ctx'> 	.copy_complete_reset	= 0x00000000,</div><div class='ctx'> 	.copy_complete		= &amp;qcax_host_ie_cc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_host_wm_regs qcax_wm_reg = {</div><div class='add'>+static const struct ath10k_hw_ce_host_wm_regs qcax_wm_reg = {</div><div class='ctx'> 	.dstr_lmask	= 0x00000010,</div><div class='ctx'> 	.dstr_hmask	= 0x00000008,</div><div class='ctx'> 	.srcr_lmask	= 0x00000004,</div><div class='hunk'>@@ -407,7 +409,7 @@ static struct ath10k_hw_ce_host_wm_regs qcax_wm_reg = {</div><div class='ctx'> 	.addr		= 0x00000030,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_misc_regs qcax_misc_reg = {</div><div class='add'>+static const struct ath10k_hw_ce_misc_regs qcax_misc_reg = {</div><div class='ctx'> 	.axi_err	= 0x00000400,</div><div class='ctx'> 	.dstr_add_err	= 0x00000200,</div><div class='ctx'> 	.srcr_len_err	= 0x00000100,</div><div class='hunk'>@@ -418,19 +420,19 @@ static struct ath10k_hw_ce_misc_regs qcax_misc_reg = {</div><div class='ctx'> 	.addr		= 0x00000038,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_regs_addr_map qcax_src_wm_low = {</div><div class='add'>+static const struct ath10k_hw_ce_regs_addr_map qcax_src_wm_low = {</div><div class='ctx'> 	.msb    = 0x0000001f,</div><div class='ctx'> 	.lsb	= 0x00000010,</div><div class='ctx'> 	.mask	= GENMASK(31, 16),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_regs_addr_map qcax_src_wm_high = {</div><div class='add'>+static const struct ath10k_hw_ce_regs_addr_map qcax_src_wm_high = {</div><div class='ctx'> 	.msb	= 0x0000000f,</div><div class='ctx'> 	.lsb	= 0x00000000,</div><div class='ctx'> 	.mask	= GENMASK(15, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_dst_src_wm_regs qcax_wm_src_ring = {</div><div class='add'>+static const struct ath10k_hw_ce_dst_src_wm_regs qcax_wm_src_ring = {</div><div class='ctx'> 	.addr		= 0x0000004c,</div><div class='ctx'> 	.low_rst	= 0x00000000,</div><div class='ctx'> 	.high_rst	= 0x00000000,</div><div class='hunk'>@@ -438,18 +440,18 @@ static struct ath10k_hw_ce_dst_src_wm_regs qcax_wm_src_ring = {</div><div class='ctx'> 	.wm_high        = &amp;qcax_src_wm_high,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_regs_addr_map qcax_dst_wm_low = {</div><div class='add'>+static const struct ath10k_hw_ce_regs_addr_map qcax_dst_wm_low = {</div><div class='ctx'> 	.lsb	= 0x00000010,</div><div class='ctx'> 	.mask	= GENMASK(31, 16),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_regs_addr_map qcax_dst_wm_high = {</div><div class='add'>+static const struct ath10k_hw_ce_regs_addr_map qcax_dst_wm_high = {</div><div class='ctx'> 	.msb	= 0x0000000f,</div><div class='ctx'> 	.lsb	= 0x00000000,</div><div class='ctx'> 	.mask	= GENMASK(15, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ath10k_hw_ce_dst_src_wm_regs qcax_wm_dst_ring = {</div><div class='add'>+static const struct ath10k_hw_ce_dst_src_wm_regs qcax_wm_dst_ring = {</div><div class='ctx'> 	.addr		= 0x00000050,</div><div class='ctx'> 	.low_rst	= 0x00000000,</div><div class='ctx'> 	.high_rst	= 0x00000000,</div><div class='hunk'>@@ -588,6 +590,7 @@ void ath10k_hw_fill_survey_time(struct ath10k *ar, struct survey_info *survey,</div><div class='ctx'>  * function monitors and modifies the corresponding MAC registers.</div><div class='ctx'>  */</div><div class='ctx'> static void ath10k_hw_qca988x_set_coverage_class(struct ath10k *ar,</div><div class='add'>+						 int radio_idx,</div><div class='ctx'> 						 s16 value)</div><div class='ctx'> {</div><div class='ctx'> 	u32 slottime_reg;</div><div class='hunk'>@@ -923,7 +926,7 @@ static void ath10k_hw_map_target_mem(struct ath10k *ar, u32 msb)</div><div class='ctx'> 	ath10k_hif_write32(ar, address, msb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* 1. Write to memory region of target, such as IRAM adn DRAM.</div><div class='add'>+/* 1. Write to memory region of target, such as IRAM and DRAM.</div><div class='ctx'>  * 2. Target address( 0 ~ 00100000 &amp; 0x00400000~0x00500000)</div><div class='ctx'>  *    can be written directly. See ath10k_pci_targ_cpu_to_ce_addr() too.</div><div class='ctx'>  * 3. In order to access the region other than the above,</div><div class='hunk'>@@ -1134,21 +1137,7 @@ const struct ath10k_hw_ops qca988x_ops = {</div><div class='ctx'> 	.is_rssi_enable = ath10k_htt_tx_rssi_enable,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ath10k_qca99x0_rx_desc_get_l3_pad_bytes(struct htt_rx_desc *rxd)</div><div class='del'>-{</div><div class='del'>-	return MS(__le32_to_cpu(rxd-&gt;msdu_end.qca99x0.info1),</div><div class='del'>-		  RX_MSDU_END_INFO1_L3_HDR_PAD);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool ath10k_qca99x0_rx_desc_msdu_limit_error(struct htt_rx_desc *rxd)</div><div class='del'>-{</div><div class='del'>-	return !!(rxd-&gt;msdu_end.common.info0 &amp;</div><div class='del'>-		  __cpu_to_le32(RX_MSDU_END_INFO0_MSDU_LIMIT_ERR));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> const struct ath10k_hw_ops qca99x0_ops = {</div><div class='del'>-	.rx_desc_get_l3_pad_bytes = ath10k_qca99x0_rx_desc_get_l3_pad_bytes,</div><div class='del'>-	.rx_desc_get_msdu_limit_error = ath10k_qca99x0_rx_desc_msdu_limit_error,</div><div class='ctx'> 	.is_rssi_enable = ath10k_htt_tx_rssi_enable,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h<br/>index 6b03c7787e36..da71dce9babf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/hw.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/hw.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/hw.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/hw.h</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  * Copyright (c) 2005-2011 Atheros Communications Inc.</div><div class='ctx'>  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.</div><div class='ctx'>  * Copyright (c) 2018 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _HW_H_</div><div class='hunk'>@@ -38,14 +39,12 @@ enum ath10k_bus {</div><div class='ctx'> #define QCA988X_HW_2_0_VERSION		0x4100016c</div><div class='ctx'> #define QCA988X_HW_2_0_CHIP_ID_REV	0x2</div><div class='ctx'> #define QCA988X_HW_2_0_FW_DIR		ATH10K_FW_DIR "/QCA988X/hw2.0"</div><div class='del'>-#define QCA988X_HW_2_0_BOARD_DATA_FILE	"board.bin"</div><div class='ctx'> #define QCA988X_HW_2_0_PATCH_LOAD_ADDR	0x1234</div><div class='ctx'> </div><div class='ctx'> /* QCA9887 1.0 definitions */</div><div class='ctx'> #define QCA9887_HW_1_0_VERSION		0x4100016d</div><div class='ctx'> #define QCA9887_HW_1_0_CHIP_ID_REV	0</div><div class='ctx'> #define QCA9887_HW_1_0_FW_DIR		ATH10K_FW_DIR "/QCA9887/hw1.0"</div><div class='del'>-#define QCA9887_HW_1_0_BOARD_DATA_FILE	"board.bin"</div><div class='ctx'> #define QCA9887_HW_1_0_PATCH_LOAD_ADDR	0x1234</div><div class='ctx'> </div><div class='ctx'> /* QCA6174 target BMI version signatures */</div><div class='hunk'>@@ -84,11 +83,9 @@ enum qca9377_chip_id_rev {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define QCA6174_HW_2_1_FW_DIR		ATH10K_FW_DIR "/QCA6174/hw2.1"</div><div class='del'>-#define QCA6174_HW_2_1_BOARD_DATA_FILE	"board.bin"</div><div class='ctx'> #define QCA6174_HW_2_1_PATCH_LOAD_ADDR	0x1234</div><div class='ctx'> </div><div class='ctx'> #define QCA6174_HW_3_0_FW_DIR		ATH10K_FW_DIR "/QCA6174/hw3.0"</div><div class='del'>-#define QCA6174_HW_3_0_BOARD_DATA_FILE	"board.bin"</div><div class='ctx'> #define QCA6174_HW_3_0_PATCH_LOAD_ADDR	0x1234</div><div class='ctx'> </div><div class='ctx'> /* QCA99X0 1.0 definitions (unsupported) */</div><div class='hunk'>@@ -98,7 +95,6 @@ enum qca9377_chip_id_rev {</div><div class='ctx'> #define QCA99X0_HW_2_0_DEV_VERSION     0x01000000</div><div class='ctx'> #define QCA99X0_HW_2_0_CHIP_ID_REV     0x1</div><div class='ctx'> #define QCA99X0_HW_2_0_FW_DIR          ATH10K_FW_DIR "/QCA99X0/hw2.0"</div><div class='del'>-#define QCA99X0_HW_2_0_BOARD_DATA_FILE "board.bin"</div><div class='ctx'> #define QCA99X0_HW_2_0_PATCH_LOAD_ADDR	0x1234</div><div class='ctx'> </div><div class='ctx'> /* QCA9984 1.0 defines */</div><div class='hunk'>@@ -106,8 +102,6 @@ enum qca9377_chip_id_rev {</div><div class='ctx'> #define QCA9984_HW_DEV_TYPE		0xa</div><div class='ctx'> #define QCA9984_HW_1_0_CHIP_ID_REV	0x0</div><div class='ctx'> #define QCA9984_HW_1_0_FW_DIR		ATH10K_FW_DIR "/QCA9984/hw1.0"</div><div class='del'>-#define QCA9984_HW_1_0_BOARD_DATA_FILE "board.bin"</div><div class='del'>-#define QCA9984_HW_1_0_EBOARD_DATA_FILE "eboard.bin"</div><div class='ctx'> #define QCA9984_HW_1_0_PATCH_LOAD_ADDR	0x1234</div><div class='ctx'> </div><div class='ctx'> /* QCA9888 2.0 defines */</div><div class='hunk'>@@ -115,18 +109,15 @@ enum qca9377_chip_id_rev {</div><div class='ctx'> #define QCA9888_HW_DEV_TYPE		0xc</div><div class='ctx'> #define QCA9888_HW_2_0_CHIP_ID_REV	0x0</div><div class='ctx'> #define QCA9888_HW_2_0_FW_DIR		ATH10K_FW_DIR "/QCA9888/hw2.0"</div><div class='del'>-#define QCA9888_HW_2_0_BOARD_DATA_FILE "board.bin"</div><div class='ctx'> #define QCA9888_HW_2_0_PATCH_LOAD_ADDR	0x1234</div><div class='ctx'> </div><div class='ctx'> /* QCA9377 1.0 definitions */</div><div class='ctx'> #define QCA9377_HW_1_0_FW_DIR          ATH10K_FW_DIR "/QCA9377/hw1.0"</div><div class='del'>-#define QCA9377_HW_1_0_BOARD_DATA_FILE "board.bin"</div><div class='ctx'> #define QCA9377_HW_1_0_PATCH_LOAD_ADDR	0x1234</div><div class='ctx'> </div><div class='ctx'> /* QCA4019 1.0 definitions */</div><div class='ctx'> #define QCA4019_HW_1_0_DEV_VERSION     0x01000000</div><div class='ctx'> #define QCA4019_HW_1_0_FW_DIR          ATH10K_FW_DIR "/QCA4019/hw1.0"</div><div class='del'>-#define QCA4019_HW_1_0_BOARD_DATA_FILE "board.bin"</div><div class='ctx'> #define QCA4019_HW_1_0_PATCH_LOAD_ADDR  0x1234</div><div class='ctx'> </div><div class='ctx'> /* WCN3990 1.0 definitions */</div><div class='hunk'>@@ -158,7 +149,9 @@ enum qca9377_chip_id_rev {</div><div class='ctx'> #define ATH10K_FIRMWARE_MAGIC               "QCA-ATH10K"</div><div class='ctx'> #define ATH10K_BOARD_MAGIC                  "QCA-ATH10K-BOARD"</div><div class='ctx'> </div><div class='add'>+#define ATH10K_BOARD_DATA_FILE         "board.bin"</div><div class='ctx'> #define ATH10K_BOARD_API2_FILE         "board-2.bin"</div><div class='add'>+#define ATH10K_EBOARD_DATA_FILE        "eboard.bin"</div><div class='ctx'> </div><div class='ctx'> #define REG_DUMP_COUNT_QCA988X 60</div><div class='ctx'> </div><div class='hunk'>@@ -296,19 +289,22 @@ struct ath10k_hw_ce_ctrl1 {</div><div class='ctx'> 	u32 sw_wr_mask;</div><div class='ctx'> 	u32 reset_mask;</div><div class='ctx'> 	u32 reset;</div><div class='del'>-	struct ath10k_hw_ce_regs_addr_map *src_ring;</div><div class='del'>-	struct ath10k_hw_ce_regs_addr_map *dst_ring;</div><div class='del'>-	struct ath10k_hw_ce_regs_addr_map *dmax; };</div><div class='add'>+	const struct ath10k_hw_ce_regs_addr_map *src_ring;</div><div class='add'>+	const struct ath10k_hw_ce_regs_addr_map *dst_ring;</div><div class='add'>+	const struct ath10k_hw_ce_regs_addr_map *dmax;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct ath10k_hw_ce_cmd_halt {</div><div class='ctx'> 	u32 status_reset;</div><div class='ctx'> 	u32 msb;</div><div class='ctx'> 	u32 mask;</div><div class='del'>-	struct ath10k_hw_ce_regs_addr_map *status; };</div><div class='add'>+	const struct ath10k_hw_ce_regs_addr_map *status;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct ath10k_hw_ce_host_ie {</div><div class='ctx'> 	u32 copy_complete_reset;</div><div class='del'>-	struct ath10k_hw_ce_regs_addr_map *copy_complete; };</div><div class='add'>+	const struct ath10k_hw_ce_regs_addr_map *copy_complete;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct ath10k_hw_ce_host_wm_regs {</div><div class='ctx'> 	u32 dstr_lmask;</div><div class='hunk'>@@ -335,8 +331,9 @@ struct ath10k_hw_ce_dst_src_wm_regs {</div><div class='ctx'> 	u32 addr;</div><div class='ctx'> 	u32 low_rst;</div><div class='ctx'> 	u32 high_rst;</div><div class='del'>-	struct ath10k_hw_ce_regs_addr_map *wm_low;</div><div class='del'>-	struct ath10k_hw_ce_regs_addr_map *wm_high; };</div><div class='add'>+	const struct ath10k_hw_ce_regs_addr_map *wm_low;</div><div class='add'>+	const struct ath10k_hw_ce_regs_addr_map *wm_high;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct ath10k_hw_ce_ctrl1_upd {</div><div class='ctx'> 	u32 shift;</div><div class='hunk'>@@ -362,14 +359,14 @@ struct ath10k_hw_ce_regs {</div><div class='ctx'> 	u32 ce_rri_low;</div><div class='ctx'> 	u32 ce_rri_high;</div><div class='ctx'> 	u32 host_ie_addr;</div><div class='del'>-	struct ath10k_hw_ce_host_wm_regs *wm_regs;</div><div class='del'>-	struct ath10k_hw_ce_misc_regs *misc_regs;</div><div class='del'>-	struct ath10k_hw_ce_ctrl1 *ctrl1_regs;</div><div class='del'>-	struct ath10k_hw_ce_cmd_halt *cmd_halt;</div><div class='del'>-	struct ath10k_hw_ce_host_ie *host_ie;</div><div class='del'>-	struct ath10k_hw_ce_dst_src_wm_regs *wm_srcr;</div><div class='del'>-	struct ath10k_hw_ce_dst_src_wm_regs *wm_dstr;</div><div class='del'>-	struct ath10k_hw_ce_ctrl1_upd *upd;</div><div class='add'>+	const struct ath10k_hw_ce_host_wm_regs *wm_regs;</div><div class='add'>+	const struct ath10k_hw_ce_misc_regs *misc_regs;</div><div class='add'>+	const struct ath10k_hw_ce_ctrl1 *ctrl1_regs;</div><div class='add'>+	const struct ath10k_hw_ce_cmd_halt *cmd_halt;</div><div class='add'>+	const struct ath10k_hw_ce_host_ie *host_ie;</div><div class='add'>+	const struct ath10k_hw_ce_dst_src_wm_regs *wm_srcr;</div><div class='add'>+	const struct ath10k_hw_ce_dst_src_wm_regs *wm_dstr;</div><div class='add'>+	const struct ath10k_hw_ce_ctrl1_upd *upd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ath10k_hw_values {</div><div class='hunk'>@@ -476,8 +473,8 @@ enum ath10k_hw_cc_wraparound_type {</div><div class='ctx'> 	 */</div><div class='ctx'> 	ATH10K_HW_CC_WRAP_SHIFTED_ALL = 1,</div><div class='ctx'> </div><div class='del'>-	/* Each hw counter wrapsaround independently. When the</div><div class='del'>-	 * counter overflows the repestive counter is right shifted</div><div class='add'>+	/* Each hw counter wraps around independently. When the</div><div class='add'>+	 * counter overflows the respective counter is right shifted</div><div class='ctx'> 	 * by 1, i.e reset to 0x7fffffff, and other counters will be</div><div class='ctx'> 	 * running unaffected. In this type of wraparound, it should</div><div class='ctx'> 	 * be possible to report accurate Rx busy time unlike the</div><div class='hunk'>@@ -510,6 +507,8 @@ struct ath10k_hw_clk_params {</div><div class='ctx'> 	u32 outdiv;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct htt_rx_desc_ops;</div><div class='add'>+</div><div class='ctx'> struct ath10k_hw_params {</div><div class='ctx'> 	u32 id;</div><div class='ctx'> 	u16 dev_id;</div><div class='hunk'>@@ -517,6 +516,7 @@ struct ath10k_hw_params {</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	u32 patch_load_addr;</div><div class='ctx'> 	int uart_pin;</div><div class='add'>+	int led_pin;</div><div class='ctx'> 	u32 otp_exe_param;</div><div class='ctx'> </div><div class='ctx'> 	/* Type of hw cycle counter wraparound logic, for more info</div><div class='hunk'>@@ -550,9 +550,7 @@ struct ath10k_hw_params {</div><div class='ctx'> </div><div class='ctx'> 	struct ath10k_hw_params_fw {</div><div class='ctx'> 		const char *dir;</div><div class='del'>-		const char *board;</div><div class='ctx'> 		size_t board_size;</div><div class='del'>-		const char *eboard;</div><div class='ctx'> 		size_t ext_board_size;</div><div class='ctx'> 		size_t board_ext_size;</div><div class='ctx'> 	} fw;</div><div class='hunk'>@@ -562,6 +560,9 @@ struct ath10k_hw_params {</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool sw_decrypt_mcast_mgmt;</div><div class='ctx'> </div><div class='add'>+	/* Rx descriptor abstraction */</div><div class='add'>+	const struct ath10k_htt_rx_desc_ops *rx_desc_ops;</div><div class='add'>+</div><div class='ctx'> 	const struct ath10k_hw_ops *hw_ops;</div><div class='ctx'> </div><div class='ctx'> 	/* Number of bytes used for alignment in rx_hdr_status of rx desc. */</div><div class='hunk'>@@ -618,6 +619,9 @@ struct ath10k_hw_params {</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool uart_pin_workaround;</div><div class='ctx'> </div><div class='add'>+	/* Workaround for the credit size calculation */</div><div class='add'>+	bool credit_size_workaround;</div><div class='add'>+</div><div class='ctx'> 	/* tx stats support over pktlog */</div><div class='ctx'> 	bool tx_stats_over_pktlog;</div><div class='ctx'> </div><div class='hunk'>@@ -625,18 +629,25 @@ struct ath10k_hw_params {</div><div class='ctx'> 	bool supports_peer_stats_info;</div><div class='ctx'> </div><div class='ctx'> 	bool dynamic_sar_support;</div><div class='add'>+</div><div class='add'>+	bool hw_restart_disconnect;</div><div class='add'>+</div><div class='add'>+	bool use_fw_tx_credits;</div><div class='add'>+</div><div class='add'>+	bool delay_unmap_buffer;</div><div class='add'>+</div><div class='add'>+	/* The hardware support multicast frame registrations */</div><div class='add'>+	bool mcast_frame_registration;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct htt_rx_desc;</div><div class='ctx'> struct htt_resp;</div><div class='ctx'> struct htt_data_tx_completion_ext;</div><div class='add'>+struct htt_rx_ring_rx_desc_offsets;</div><div class='ctx'> </div><div class='ctx'> /* Defines needed for Rx descriptor abstraction */</div><div class='ctx'> struct ath10k_hw_ops {</div><div class='del'>-	int (*rx_desc_get_l3_pad_bytes)(struct htt_rx_desc *rxd);</div><div class='del'>-	void (*set_coverage_class)(struct ath10k *ar, s16 value);</div><div class='add'>+	void (*set_coverage_class)(struct ath10k *ar, int radio_idx, s16 value);</div><div class='ctx'> 	int (*enable_pll_clk)(struct ath10k *ar);</div><div class='del'>-	bool (*rx_desc_get_msdu_limit_error)(struct htt_rx_desc *rxd);</div><div class='ctx'> 	int (*tx_data_rssi_pad_bytes)(struct htt_resp *htt);</div><div class='ctx'> 	int (*is_rssi_enable)(struct htt_resp *resp);</div><div class='ctx'> };</div><div class='hunk'>@@ -650,24 +661,6 @@ extern const struct ath10k_hw_ops wcn3990_ops;</div><div class='ctx'> extern const struct ath10k_hw_clk_params qca6174_clk[];</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='del'>-ath10k_rx_desc_get_l3_pad_bytes(struct ath10k_hw_params *hw,</div><div class='del'>-				struct htt_rx_desc *rxd)</div><div class='del'>-{</div><div class='del'>-	if (hw-&gt;hw_ops-&gt;rx_desc_get_l3_pad_bytes)</div><div class='del'>-		return hw-&gt;hw_ops-&gt;rx_desc_get_l3_pad_bytes(rxd);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool</div><div class='del'>-ath10k_rx_desc_msdu_limit_error(struct ath10k_hw_params *hw,</div><div class='del'>-				struct htt_rx_desc *rxd)</div><div class='del'>-{</div><div class='del'>-	if (hw-&gt;hw_ops-&gt;rx_desc_get_msdu_limit_error)</div><div class='del'>-		return hw-&gt;hw_ops-&gt;rx_desc_get_msdu_limit_error(rxd);</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='ctx'> ath10k_tx_data_rssi_get_pad_bytes(struct ath10k_hw_params *hw,</div><div class='ctx'> 				  struct htt_resp *htt)</div><div class='ctx'> {</div><div class='hunk'>@@ -844,7 +837,7 @@ ath10k_is_rssi_enable(struct ath10k_hw_params *hw,</div><div class='ctx'> #define TARGET_10_4_NUM_TDLS_BUFFER_STA		1</div><div class='ctx'> #define TARGET_10_4_NUM_TDLS_SLEEP_STA		1</div><div class='ctx'> </div><div class='del'>-/* Maximum number of Copy Engine's supported */</div><div class='add'>+/* Maximum number of Copy Engines supported */</div><div class='ctx'> #define CE_COUNT_MAX 12</div><div class='ctx'> </div><div class='ctx'> /* Number of Copy Engines supported */</div><div class='hunk'>@@ -1141,7 +1134,7 @@ ath10k_is_rssi_enable(struct ath10k_hw_params *hw,</div><div class='ctx'> #define RTC_STATE_V_GET(x) (((x) &amp; RTC_STATE_V_MASK) &gt;&gt; RTC_STATE_V_LSB)</div><div class='ctx'> </div><div class='ctx'> /* Register definitions for first generation ath10k cards. These cards include</div><div class='del'>- * a mac thich has a register allocation similar to ath9k and at least some</div><div class='add'>+ * a mac which has a register allocation similar to ath9k and at least some</div><div class='ctx'>  * registers including the ones relevant for modifying the coverage class are</div><div class='ctx'>  * identical to the ath9k definitions.</div><div class='ctx'>  * These registers are usually managed by the ath10k firmware. However by</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/leds.c b/drivers/net/wireless/ath/ath10k/leds.c<br/>new file mode 100644<br/>index 000000000000..3a6c8111e7c6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/leds.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/leds.c</a></div><div class='hunk'>@@ -0,0 +1,89 @@</div><div class='add'>+// SPDX-License-Identifier: ISC</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2005-2011 Atheros Communications Inc.</div><div class='add'>+ * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.</div><div class='add'>+ * Copyright (c) 2018 Sebastian Gottschall &lt;s.gottschall@dd-wrt.com&gt;</div><div class='add'>+ * Copyright (c) 2018 The Linux Foundation. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "wmi.h"</div><div class='add'>+#include "wmi-ops.h"</div><div class='add'>+</div><div class='add'>+#include "leds.h"</div><div class='add'>+</div><div class='add'>+static int ath10k_leds_set_brightness_blocking(struct led_classdev *led_cdev,</div><div class='add'>+					       enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	struct ath10k *ar = container_of(led_cdev, struct ath10k,</div><div class='add'>+					 leds.cdev);</div><div class='add'>+	struct gpio_led *led = &amp;ar-&gt;leds.wifi_led;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;state != ATH10K_STATE_ON)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ar-&gt;leds.gpio_state_pin = (brightness != LED_OFF) ^ led-&gt;active_low;</div><div class='add'>+	ath10k_wmi_gpio_output(ar, ar-&gt;hw_params.led_pin, ar-&gt;leds.gpio_state_pin);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath10k_leds_start(struct ath10k *ar)</div><div class='add'>+{</div><div class='add'>+	if (ar-&gt;hw_params.led_pin == 0)</div><div class='add'>+		/* leds not supported */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* under some circumstances, the gpio pin gets reconfigured</div><div class='add'>+	 * to default state by the firmware, so we need to</div><div class='add'>+	 * reconfigure it this behaviour has only ben seen on</div><div class='add'>+	 * QCA9984 and QCA99XX devices so far</div><div class='add'>+	 */</div><div class='add'>+	ath10k_wmi_gpio_config(ar, ar-&gt;hw_params.led_pin, 0,</div><div class='add'>+			       WMI_GPIO_PULL_NONE, WMI_GPIO_INTTYPE_DISABLE);</div><div class='add'>+	ath10k_wmi_gpio_output(ar, ar-&gt;hw_params.led_pin, 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath10k_leds_register(struct ath10k *ar)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;hw_params.led_pin == 0)</div><div class='add'>+		/* leds not supported */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	snprintf(ar-&gt;leds.label, sizeof(ar-&gt;leds.label), "ath10k-%s",</div><div class='add'>+		 wiphy_name(ar-&gt;hw-&gt;wiphy));</div><div class='add'>+	ar-&gt;leds.wifi_led.active_low = 1;</div><div class='add'>+	ar-&gt;leds.wifi_led.name = ar-&gt;leds.label;</div><div class='add'>+	ar-&gt;leds.wifi_led.default_state = LEDS_GPIO_DEFSTATE_KEEP;</div><div class='add'>+</div><div class='add'>+	ar-&gt;leds.cdev.name = ar-&gt;leds.label;</div><div class='add'>+	ar-&gt;leds.cdev.brightness_set_blocking = ath10k_leds_set_brightness_blocking;</div><div class='add'>+	ar-&gt;leds.cdev.default_trigger = ar-&gt;leds.wifi_led.default_trigger;</div><div class='add'>+</div><div class='add'>+	ret = led_classdev_register(wiphy_dev(ar-&gt;hw-&gt;wiphy), &amp;ar-&gt;leds.cdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath10k_leds_unregister(struct ath10k *ar)</div><div class='add'>+{</div><div class='add'>+	if (ar-&gt;hw_params.led_pin == 0)</div><div class='add'>+		/* leds not supported */</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	led_classdev_unregister(&amp;ar-&gt;leds.cdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/leds.h b/drivers/net/wireless/ath/ath10k/leds.h<br/>new file mode 100644<br/>index 000000000000..56325b0875e5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/leds.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/leds.h</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+/* SPDX-License-Identifier: ISC */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2005-2011 Atheros Communications Inc.</div><div class='add'>+ * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.</div><div class='add'>+ * Copyright (c) 2018 Sebastian Gottschall &lt;s.gottschall@dd-wrt.com&gt;</div><div class='add'>+ * Copyright (c) 2018 The Linux Foundation. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LEDS_H_</div><div class='add'>+#define _LEDS_H_</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ATH10K_LEDS</div><div class='add'>+void ath10k_leds_unregister(struct ath10k *ar);</div><div class='add'>+int ath10k_leds_start(struct ath10k *ar);</div><div class='add'>+int ath10k_leds_register(struct ath10k *ar);</div><div class='add'>+#else</div><div class='add'>+static inline void ath10k_leds_unregister(struct ath10k *ar)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath10k_leds_start(struct ath10k *ar)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath10k_leds_register(struct ath10k *ar)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+#endif /* _LEDS_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c<br/>index 5ce4f8d038b9..da6f7957a0ae 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/mac.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/mac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/mac.c</a></div><div class='hunk'>@@ -3,16 +3,19 @@</div><div class='ctx'>  * Copyright (c) 2005-2011 Atheros Communications Inc.</div><div class='ctx'>  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.</div><div class='ctx'>  * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "mac.h"</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;net/cfg80211.h&gt;</div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "hif.h"</div><div class='ctx'> #include "core.h"</div><div class='hunk'>@@ -24,6 +27,7 @@</div><div class='ctx'> #include "wmi-tlv.h"</div><div class='ctx'> #include "wmi-ops.h"</div><div class='ctx'> #include "wow.h"</div><div class='add'>+#include "leds.h"</div><div class='ctx'> </div><div class='ctx'> /*********/</div><div class='ctx'> /* Rates */</div><div class='hunk'>@@ -286,8 +290,15 @@ static int ath10k_send_key(struct ath10k_vif *arvif,</div><div class='ctx'> 		key-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_IV;</div><div class='ctx'> </div><div class='ctx'> 	if (cmd == DISABLE_KEY) {</div><div class='del'>-		arg.key_cipher = ar-&gt;wmi_key_cipher[WMI_CIPHER_NONE];</div><div class='del'>-		arg.key_data = NULL;</div><div class='add'>+		if (flags &amp; WMI_KEY_GROUP) {</div><div class='add'>+			/* Not all hardware handles group-key deletion operation</div><div class='add'>+			 * correctly. Replace the key with a junk value to invalidate it.</div><div class='add'>+			 */</div><div class='add'>+			get_random_bytes(key-&gt;key, key-&gt;keylen);</div><div class='add'>+		} else {</div><div class='add'>+			arg.key_cipher = ar-&gt;wmi_key_cipher[WMI_CIPHER_NONE];</div><div class='add'>+			arg.key_data = NULL;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ath10k_wmi_vdev_install_key(arvif-&gt;ar, &amp;arg);</div><div class='hunk'>@@ -659,7 +670,7 @@ int ath10k_mac_vif_chan(struct ieee80211_vif *vif,</div><div class='ctx'> 	struct ieee80211_chanctx_conf *conf;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	conf = rcu_dereference(vif-&gt;chanctx_conf);</div><div class='add'>+	conf = rcu_dereference(vif-&gt;bss_conf.chanctx_conf);</div><div class='ctx'> 	if (!conf) {</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		return -ENOENT;</div><div class='hunk'>@@ -728,20 +739,13 @@ static int ath10k_peer_create(struct ath10k *ar,</div><div class='ctx'> 			      const u8 *addr,</div><div class='ctx'> 			      enum wmi_peer_type peer_type)</div><div class='ctx'> {</div><div class='del'>-	struct ath10k_vif *arvif;</div><div class='ctx'> 	struct ath10k_peer *peer;</div><div class='del'>-	int num_peers = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='del'>-	num_peers = ar-&gt;num_peers;</div><div class='del'>-</div><div class='del'>-	/* Each vdev consumes a peer entry as well */</div><div class='del'>-	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list)</div><div class='del'>-		num_peers++;</div><div class='del'>-</div><div class='del'>-	if (num_peers &gt;= ar-&gt;max_num_peers)</div><div class='add'>+	/* Each vdev consumes a peer entry as well. */</div><div class='add'>+	if (ar-&gt;num_peers + list_count_nodes(&amp;ar-&gt;arvifs) &gt;= ar-&gt;max_num_peers)</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> </div><div class='ctx'> 	ret = ath10k_wmi_peer_create(ar, vdev_id, addr, peer_type);</div><div class='hunk'>@@ -864,11 +868,36 @@ static int ath10k_peer_delete(struct ath10k *ar, u32 vdev_id, const u8 *addr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ath10k_peer_map_cleanup(struct ath10k *ar, struct ath10k_peer *peer)</div><div class='add'>+{</div><div class='add'>+	int peer_id, i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(peer_id, peer-&gt;peer_ids,</div><div class='add'>+			 ATH10K_MAX_NUM_PEER_IDS) {</div><div class='add'>+		ar-&gt;peer_map[peer_id] = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Double check that peer is properly un-referenced from</div><div class='add'>+	 * the peer_map</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ar-&gt;peer_map); i++) {</div><div class='add'>+		if (ar-&gt;peer_map[i] == peer) {</div><div class='add'>+			ath10k_warn(ar, "removing stale peer_map entry for %pM (ptr %p idx %d)\n",</div><div class='add'>+				    peer-&gt;addr, peer, i);</div><div class='add'>+			ar-&gt;peer_map[i] = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_del(&amp;peer-&gt;list);</div><div class='add'>+	kfree(peer);</div><div class='add'>+	ar-&gt;num_peers--;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath10k_peer_cleanup(struct ath10k *ar, u32 vdev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k_peer *peer, *tmp;</div><div class='del'>-	int peer_id;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -880,25 +909,7 @@ static void ath10k_peer_cleanup(struct ath10k *ar, u32 vdev_id)</div><div class='ctx'> 		ath10k_warn(ar, "removing stale peer %pM from vdev_id %d\n",</div><div class='ctx'> 			    peer-&gt;addr, vdev_id);</div><div class='ctx'> </div><div class='del'>-		for_each_set_bit(peer_id, peer-&gt;peer_ids,</div><div class='del'>-				 ATH10K_MAX_NUM_PEER_IDS) {</div><div class='del'>-			ar-&gt;peer_map[peer_id] = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Double check that peer is properly un-referenced from</div><div class='del'>-		 * the peer_map</div><div class='del'>-		 */</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(ar-&gt;peer_map); i++) {</div><div class='del'>-			if (ar-&gt;peer_map[i] == peer) {</div><div class='del'>-				ath10k_warn(ar, "removing stale peer_map entry for %pM (ptr %pK idx %d)\n",</div><div class='del'>-					    peer-&gt;addr, peer, i);</div><div class='del'>-				ar-&gt;peer_map[i] = NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		list_del(&amp;peer-&gt;list);</div><div class='del'>-		kfree(peer);</div><div class='del'>-		ar-&gt;num_peers--;</div><div class='add'>+		ath10k_peer_map_cleanup(ar, peer);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -993,8 +1004,12 @@ static void ath10k_mac_vif_beacon_cleanup(struct ath10k_vif *arvif)</div><div class='ctx'> 	ath10k_mac_vif_beacon_free(arvif);</div><div class='ctx'> </div><div class='ctx'> 	if (arvif-&gt;beacon_buf) {</div><div class='del'>-		dma_free_coherent(ar-&gt;dev, IEEE80211_MAX_FRAME_LEN,</div><div class='del'>-				  arvif-&gt;beacon_buf, arvif-&gt;beacon_paddr);</div><div class='add'>+		if (ar-&gt;bus_param.dev_type == ATH10K_DEV_TYPE_HL)</div><div class='add'>+			kfree(arvif-&gt;beacon_buf);</div><div class='add'>+		else</div><div class='add'>+			dma_free_coherent(ar-&gt;dev, IEEE80211_MAX_FRAME_LEN,</div><div class='add'>+					  arvif-&gt;beacon_buf,</div><div class='add'>+					  arvif-&gt;beacon_paddr);</div><div class='ctx'> 		arvif-&gt;beacon_buf = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1016,6 +1031,26 @@ static inline int ath10k_vdev_setup_sync(struct ath10k *ar)</div><div class='ctx'> 	return ar-&gt;last_wmi_vdev_start_status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int ath10k_vdev_delete_sync(struct ath10k *ar)</div><div class='add'>+{</div><div class='add'>+	unsigned long time_left;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(WMI_SERVICE_SYNC_DELETE_CMDS, ar-&gt;wmi.svc_map))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH10K_FLAG_CRASH_FLUSH, &amp;ar-&gt;dev_flags))</div><div class='add'>+		return -ESHUTDOWN;</div><div class='add'>+</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;ar-&gt;vdev_delete_done,</div><div class='add'>+						ATH10K_VDEV_DELETE_TIMEOUT_HZ);</div><div class='add'>+	if (time_left == 0)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath10k_monitor_vdev_start(struct ath10k *ar, int vdev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfg80211_chan_def *chandef = NULL;</div><div class='hunk'>@@ -1048,7 +1083,7 @@ static int ath10k_monitor_vdev_start(struct ath10k *ar, int vdev_id)</div><div class='ctx'> 	arg.channel.min_power = 0;</div><div class='ctx'> 	arg.channel.max_power = channel-&gt;max_power * 2;</div><div class='ctx'> 	arg.channel.max_reg_power = channel-&gt;max_reg_power * 2;</div><div class='del'>-	arg.channel.max_antenna_gain = channel-&gt;max_antenna_gain * 2;</div><div class='add'>+	arg.channel.max_antenna_gain = channel-&gt;max_antenna_gain;</div><div class='ctx'> </div><div class='ctx'> 	reinit_completion(&amp;ar-&gt;vdev_setup_done);</div><div class='ctx'> 	reinit_completion(&amp;ar-&gt;vdev_delete_done);</div><div class='hunk'>@@ -1238,7 +1273,7 @@ static bool ath10k_mac_monitor_vdev_is_needed(struct ath10k *ar)</div><div class='ctx'> 	return ar-&gt;monitor ||</div><div class='ctx'> 	       (!test_bit(ATH10K_FW_FEATURE_ALLOWS_MESH_BCAST,</div><div class='ctx'> 			  ar-&gt;running_fw-&gt;fw_file.fw_features) &amp;&amp;</div><div class='del'>-		(ar-&gt;filter_flags &amp; FIF_OTHER_BSS)) ||</div><div class='add'>+		(ar-&gt;filter_flags &amp; (FIF_OTHER_BSS | FIF_MCAST_ACTION))) ||</div><div class='ctx'> 	       test_bit(ATH10K_CAC_RUNNING, &amp;ar-&gt;dev_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1431,7 +1466,7 @@ static void ath10k_recalc_radar_detection(struct ath10k *ar)</div><div class='ctx'> 		 * by indicating that radar was detected.</div><div class='ctx'> 		 */</div><div class='ctx'> 		ath10k_warn(ar, "failed to start CAC: %d\n", ret);</div><div class='del'>-		ieee80211_radar_detected(ar-&gt;hw);</div><div class='add'>+		ieee80211_radar_detected(ar-&gt;hw, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1494,7 +1529,7 @@ static int ath10k_vdev_start_restart(struct ath10k_vif *arvif,</div><div class='ctx'> 	arg.channel.min_power = 0;</div><div class='ctx'> 	arg.channel.max_power = chandef-&gt;chan-&gt;max_power * 2;</div><div class='ctx'> 	arg.channel.max_reg_power = chandef-&gt;chan-&gt;max_reg_power * 2;</div><div class='del'>-	arg.channel.max_antenna_gain = chandef-&gt;chan-&gt;max_antenna_gain * 2;</div><div class='add'>+	arg.channel.max_antenna_gain = chandef-&gt;chan-&gt;max_antenna_gain;</div><div class='ctx'> </div><div class='ctx'> 	if (arvif-&gt;vdev_type == WMI_VDEV_TYPE_AP) {</div><div class='ctx'> 		arg.ssid = arvif-&gt;u.ap.ssid;</div><div class='hunk'>@@ -1505,8 +1540,8 @@ static int ath10k_vdev_start_restart(struct ath10k_vif *arvif,</div><div class='ctx'> 		arg.channel.chan_radar =</div><div class='ctx'> 			!!(chandef-&gt;chan-&gt;flags &amp; IEEE80211_CHAN_RADAR);</div><div class='ctx'> 	} else if (arvif-&gt;vdev_type == WMI_VDEV_TYPE_IBSS) {</div><div class='del'>-		arg.ssid = arvif-&gt;vif-&gt;bss_conf.ssid;</div><div class='del'>-		arg.ssid_len = arvif-&gt;vif-&gt;bss_conf.ssid_len;</div><div class='add'>+		arg.ssid = arvif-&gt;vif-&gt;cfg.ssid;</div><div class='add'>+		arg.ssid_len = arvif-&gt;vif-&gt;cfg.ssid_len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_MAC,</div><div class='hunk'>@@ -1626,7 +1661,7 @@ static int ath10k_mac_setup_bcn_tmpl(struct ath10k_vif *arvif)</div><div class='ctx'> 	    arvif-&gt;vdev_type != WMI_VDEV_TYPE_IBSS)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bcn = ieee80211_beacon_get_template(hw, vif, &amp;offs);</div><div class='add'>+	bcn = ieee80211_beacon_get_template(hw, vif, &amp;offs, 0);</div><div class='ctx'> 	if (!bcn) {</div><div class='ctx'> 		ath10k_warn(ar, "failed to get beacon template from mac80211\n");</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -1819,8 +1854,7 @@ static void ath10k_control_beaconing(struct ath10k_vif *arvif,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath10k_control_ibss(struct ath10k_vif *arvif,</div><div class='del'>-				struct ieee80211_bss_conf *info,</div><div class='del'>-				const u8 self_peer[ETH_ALEN])</div><div class='add'>+				struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = arvif-&gt;ar;</div><div class='ctx'> 	u32 vdev_param;</div><div class='hunk'>@@ -1828,7 +1862,7 @@ static void ath10k_control_ibss(struct ath10k_vif *arvif,</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;arvif-&gt;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='del'>-	if (!info-&gt;ibss_joined) {</div><div class='add'>+	if (!vif-&gt;cfg.ibss_joined) {</div><div class='ctx'> 		if (is_zero_ether_addr(arvif-&gt;bssid))</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='hunk'>@@ -2024,14 +2058,14 @@ static void ath10k_mac_vif_ap_csa_count_down(struct ath10k_vif *arvif)</div><div class='ctx'> 	if (arvif-&gt;vdev_type != WMI_VDEV_TYPE_AP)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!vif-&gt;csa_active)</div><div class='add'>+	if (!vif-&gt;bss_conf.csa_active)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!arvif-&gt;is_up)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!ieee80211_beacon_cntdwn_is_complete(vif)) {</div><div class='del'>-		ieee80211_beacon_update_cntdwn(vif);</div><div class='add'>+	if (!ieee80211_beacon_cntdwn_is_complete(vif, 0)) {</div><div class='add'>+		ieee80211_beacon_update_cntdwn(vif, 0);</div><div class='ctx'> </div><div class='ctx'> 		ret = ath10k_mac_setup_bcn_tmpl(arvif);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -2043,7 +2077,7 @@ static void ath10k_mac_vif_ap_csa_count_down(struct ath10k_vif *arvif)</div><div class='ctx'> 			ath10k_warn(ar, "failed to update prb tmpl during csa: %d\n",</div><div class='ctx'> 				    ret);</div><div class='ctx'> 	} else {</div><div class='del'>-		ieee80211_csa_finish(vif);</div><div class='add'>+		ieee80211_csa_finish(vif, 0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2159,7 +2193,7 @@ static void ath10k_peer_assoc_h_basic(struct ath10k *ar,</div><div class='ctx'> 	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='del'>-		aid = vif-&gt;bss_conf.aid;</div><div class='add'>+		aid = vif-&gt;cfg.aid;</div><div class='ctx'> 	else</div><div class='ctx'> 		aid = sta-&gt;aid;</div><div class='ctx'> </div><div class='hunk'>@@ -2189,7 +2223,8 @@ static void ath10k_peer_assoc_h_crypto(struct ath10k *ar,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	bss = cfg80211_get_bss(ar-&gt;hw-&gt;wiphy, def.chan, info-&gt;bssid,</div><div class='del'>-			       info-&gt;ssid_len ? info-&gt;ssid : NULL, info-&gt;ssid_len,</div><div class='add'>+			       vif-&gt;cfg.ssid_len ? vif-&gt;cfg.ssid : NULL,</div><div class='add'>+			       vif-&gt;cfg.ssid_len,</div><div class='ctx'> 			       IEEE80211_BSS_TYPE_ANY, IEEE80211_PRIVACY_ANY);</div><div class='ctx'> 	if (bss) {</div><div class='ctx'> 		const struct cfg80211_bss_ies *ies;</div><div class='hunk'>@@ -2247,7 +2282,7 @@ static void ath10k_peer_assoc_h_rates(struct ath10k *ar,</div><div class='ctx'> </div><div class='ctx'> 	band = def.chan-&gt;band;</div><div class='ctx'> 	sband = ar-&gt;hw-&gt;wiphy-&gt;bands[band];</div><div class='del'>-	ratemask = sta-&gt;supp_rates[band];</div><div class='add'>+	ratemask = sta-&gt;deflink.supp_rates[band];</div><div class='ctx'> 	ratemask &amp;= arvif-&gt;bitrate_mask.control[band].legacy;</div><div class='ctx'> 	rates = sband-&gt;bitrates;</div><div class='ctx'> </div><div class='hunk'>@@ -2292,7 +2327,7 @@ static void ath10k_peer_assoc_h_ht(struct ath10k *ar,</div><div class='ctx'> 				   struct ieee80211_sta *sta,</div><div class='ctx'> 				   struct wmi_peer_assoc_complete_arg *arg)</div><div class='ctx'> {</div><div class='del'>-	const struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='add'>+	const struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;deflink.ht_cap;</div><div class='ctx'> 	struct ath10k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct cfg80211_chan_def def;</div><div class='ctx'> 	enum nl80211_band band;</div><div class='hunk'>@@ -2331,7 +2366,7 @@ static void ath10k_peer_assoc_h_ht(struct ath10k *ar,</div><div class='ctx'> 	if (ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_LDPC_CODING)</div><div class='ctx'> 		arg-&gt;peer_flags |= ar-&gt;wmi.peer_flags-&gt;ldbc;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;bandwidth &gt;= IEEE80211_STA_RX_BW_40) {</div><div class='add'>+	if (sta-&gt;deflink.bandwidth &gt;= IEEE80211_STA_RX_BW_40) {</div><div class='ctx'> 		arg-&gt;peer_flags |= ar-&gt;wmi.peer_flags-&gt;bw40;</div><div class='ctx'> 		arg-&gt;peer_rate_caps |= WMI_RC_CW40_FLAG;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2384,7 +2419,8 @@ static void ath10k_peer_assoc_h_ht(struct ath10k *ar,</div><div class='ctx'> 			arg-&gt;peer_ht_rates.rates[i] = i;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		arg-&gt;peer_ht_rates.num_rates = n;</div><div class='del'>-		arg-&gt;peer_num_spatial_streams = min(sta-&gt;rx_nss, max_nss);</div><div class='add'>+		arg-&gt;peer_num_spatial_streams = min(sta-&gt;deflink.rx_nss,</div><div class='add'>+						    max_nss);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_MAC, "mac ht peer %pM mcs cnt %d nss %d\n",</div><div class='hunk'>@@ -2541,7 +2577,7 @@ static void ath10k_peer_assoc_h_vht(struct ath10k *ar,</div><div class='ctx'> 				    struct ieee80211_sta *sta,</div><div class='ctx'> 				    struct wmi_peer_assoc_complete_arg *arg)</div><div class='ctx'> {</div><div class='del'>-	const struct ieee80211_sta_vht_cap *vht_cap = &amp;sta-&gt;vht_cap;</div><div class='add'>+	const struct ieee80211_sta_vht_cap *vht_cap = &amp;sta-&gt;deflink.vht_cap;</div><div class='ctx'> 	struct ath10k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='ctx'> 	struct cfg80211_chan_def def;</div><div class='hunk'>@@ -2583,10 +2619,10 @@ static void ath10k_peer_assoc_h_vht(struct ath10k *ar,</div><div class='ctx'> 				 (1U &lt;&lt; (IEEE80211_HT_MAX_AMPDU_FACTOR +</div><div class='ctx'> 					ampdu_factor)) - 1);</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_80)</div><div class='add'>+	if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_80)</div><div class='ctx'> 		arg-&gt;peer_flags |= ar-&gt;wmi.peer_flags-&gt;bw80;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_160)</div><div class='add'>+	if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_160)</div><div class='ctx'> 		arg-&gt;peer_flags |= ar-&gt;wmi.peer_flags-&gt;bw160;</div><div class='ctx'> </div><div class='ctx'> 	/* Calculate peer NSS capability from VHT capabilities if STA</div><div class='hunk'>@@ -2600,7 +2636,7 @@ static void ath10k_peer_assoc_h_vht(struct ath10k *ar,</div><div class='ctx'> 		    vht_mcs_mask[i])</div><div class='ctx'> 			max_nss = i + 1;</div><div class='ctx'> 	}</div><div class='del'>-	arg-&gt;peer_num_spatial_streams = min(sta-&gt;rx_nss, max_nss);</div><div class='add'>+	arg-&gt;peer_num_spatial_streams = min(sta-&gt;deflink.rx_nss, max_nss);</div><div class='ctx'> 	arg-&gt;peer_vht_rates.rx_max_rate =</div><div class='ctx'> 		__le16_to_cpu(vht_cap-&gt;vht_mcs.rx_highest);</div><div class='ctx'> 	arg-&gt;peer_vht_rates.rx_mcs_set =</div><div class='hunk'>@@ -2680,15 +2716,17 @@ static void ath10k_peer_assoc_h_qos(struct ath10k *ar,</div><div class='ctx'> </div><div class='ctx'> static bool ath10k_mac_sta_has_ofdm_only(struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	return sta-&gt;supp_rates[NL80211_BAND_2GHZ] &gt;&gt;</div><div class='add'>+	return sta-&gt;deflink.supp_rates[NL80211_BAND_2GHZ] &gt;&gt;</div><div class='ctx'> 	       ATH10K_MAC_FIRST_OFDM_RATE_IDX;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static enum wmi_phy_mode ath10k_mac_get_phymode_vht(struct ath10k *ar,</div><div class='ctx'> 						    struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_160) {</div><div class='del'>-		switch (sta-&gt;vht_cap.cap &amp; IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) {</div><div class='add'>+	struct ieee80211_sta_vht_cap *vht_cap = &amp;sta-&gt;deflink.vht_cap;</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_160) {</div><div class='add'>+		switch (vht_cap-&gt;cap &amp; IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) {</div><div class='ctx'> 		case IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ:</div><div class='ctx'> 			return MODE_11AC_VHT160;</div><div class='ctx'> 		case IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ:</div><div class='hunk'>@@ -2699,13 +2737,13 @@ static enum wmi_phy_mode ath10k_mac_get_phymode_vht(struct ath10k *ar,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_80)</div><div class='add'>+	if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_80)</div><div class='ctx'> 		return MODE_11AC_VHT80;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='add'>+	if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='ctx'> 		return MODE_11AC_VHT40;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_20)</div><div class='add'>+	if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_20)</div><div class='ctx'> 		return MODE_11AC_VHT20;</div><div class='ctx'> </div><div class='ctx'> 	return MODE_UNKNOWN;</div><div class='hunk'>@@ -2732,15 +2770,15 @@ static void ath10k_peer_assoc_h_phymode(struct ath10k *ar,</div><div class='ctx'> </div><div class='ctx'> 	switch (band) {</div><div class='ctx'> 	case NL80211_BAND_2GHZ:</div><div class='del'>-		if (sta-&gt;vht_cap.vht_supported &amp;&amp;</div><div class='add'>+		if (sta-&gt;deflink.vht_cap.vht_supported &amp;&amp;</div><div class='ctx'> 		    !ath10k_peer_assoc_h_vht_masked(vht_mcs_mask)) {</div><div class='del'>-			if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='add'>+			if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='ctx'> 				phymode = MODE_11AC_VHT40;</div><div class='ctx'> 			else</div><div class='ctx'> 				phymode = MODE_11AC_VHT20;</div><div class='del'>-		} else if (sta-&gt;ht_cap.ht_supported &amp;&amp;</div><div class='add'>+		} else if (sta-&gt;deflink.ht_cap.ht_supported &amp;&amp;</div><div class='ctx'> 			   !ath10k_peer_assoc_h_ht_masked(ht_mcs_mask)) {</div><div class='del'>-			if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='add'>+			if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='ctx'> 				phymode = MODE_11NG_HT40;</div><div class='ctx'> 			else</div><div class='ctx'> 				phymode = MODE_11NG_HT20;</div><div class='hunk'>@@ -2755,12 +2793,12 @@ static void ath10k_peer_assoc_h_phymode(struct ath10k *ar,</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Check VHT first.</div><div class='ctx'> 		 */</div><div class='del'>-		if (sta-&gt;vht_cap.vht_supported &amp;&amp;</div><div class='add'>+		if (sta-&gt;deflink.vht_cap.vht_supported &amp;&amp;</div><div class='ctx'> 		    !ath10k_peer_assoc_h_vht_masked(vht_mcs_mask)) {</div><div class='ctx'> 			phymode = ath10k_mac_get_phymode_vht(ar, sta);</div><div class='del'>-		} else if (sta-&gt;ht_cap.ht_supported &amp;&amp;</div><div class='add'>+		} else if (sta-&gt;deflink.ht_cap.ht_supported &amp;&amp;</div><div class='ctx'> 			   !ath10k_peer_assoc_h_ht_masked(ht_mcs_mask)) {</div><div class='del'>-			if (sta-&gt;bandwidth &gt;= IEEE80211_STA_RX_BW_40)</div><div class='add'>+			if (sta-&gt;deflink.bandwidth &gt;= IEEE80211_STA_RX_BW_40)</div><div class='ctx'> 				phymode = MODE_11NA_HT40;</div><div class='ctx'> 			else</div><div class='ctx'> 				phymode = MODE_11NA_HT20;</div><div class='hunk'>@@ -3075,8 +3113,8 @@ static void ath10k_bss_assoc(struct ieee80211_hw *hw,</div><div class='ctx'> 	/* ap_sta must be accessed only within rcu section which must be left</div><div class='ctx'> 	 * before calling ath10k_setup_peer_smps() which might sleep.</div><div class='ctx'> 	 */</div><div class='del'>-	ht_cap = ap_sta-&gt;ht_cap;</div><div class='del'>-	vht_cap = ap_sta-&gt;vht_cap;</div><div class='add'>+	ht_cap = ap_sta-&gt;deflink.ht_cap;</div><div class='add'>+	vht_cap = ap_sta-&gt;deflink.vht_cap;</div><div class='ctx'> </div><div class='ctx'> 	ret = ath10k_peer_assoc_prepare(ar, vif, ap_sta, &amp;peer_arg);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -3111,11 +3149,11 @@ static void ath10k_bss_assoc(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_MAC,</div><div class='ctx'> 		   "mac vdev %d up (associated) bssid %pM aid %d\n",</div><div class='del'>-		   arvif-&gt;vdev_id, bss_conf-&gt;bssid, bss_conf-&gt;aid);</div><div class='add'>+		   arvif-&gt;vdev_id, bss_conf-&gt;bssid, vif-&gt;cfg.aid);</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(arvif-&gt;is_up);</div><div class='ctx'> </div><div class='del'>-	arvif-&gt;aid = bss_conf-&gt;aid;</div><div class='add'>+	arvif-&gt;aid = vif-&gt;cfg.aid;</div><div class='ctx'> 	ether_addr_copy(arvif-&gt;bssid, bss_conf-&gt;bssid);</div><div class='ctx'> </div><div class='ctx'> 	ret = ath10k_wmi_pdev_set_param(ar,</div><div class='hunk'>@@ -3274,7 +3312,7 @@ static int ath10k_station_assoc(struct ath10k *ar,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!reassoc) {</div><div class='ctx'> 		ret = ath10k_setup_peer_smps(ar, arvif, sta-&gt;addr,</div><div class='del'>-					     &amp;sta-&gt;ht_cap);</div><div class='add'>+					     &amp;sta-&gt;deflink.ht_cap);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ath10k_warn(ar, "failed to setup peer SMPS for vdev %d: %d\n",</div><div class='ctx'> 				    arvif-&gt;vdev_id, ret);</div><div class='hunk'>@@ -3354,7 +3392,7 @@ static int ath10k_update_channel_list(struct ath10k *ar)</div><div class='ctx'> 	struct ieee80211_supported_band **bands;</div><div class='ctx'> 	enum nl80211_band band;</div><div class='ctx'> 	struct ieee80211_channel *channel;</div><div class='del'>-	struct wmi_scan_chan_list_arg arg = {0};</div><div class='add'>+	struct wmi_scan_chan_list_arg arg = {};</div><div class='ctx'> 	struct wmi_channel_arg *ch;</div><div class='ctx'> 	bool passive;</div><div class='ctx'> 	int len;</div><div class='hunk'>@@ -3422,7 +3460,7 @@ static int ath10k_update_channel_list(struct ath10k *ar)</div><div class='ctx'> 			ch-&gt;min_power = 0;</div><div class='ctx'> 			ch-&gt;max_power = channel-&gt;max_power * 2;</div><div class='ctx'> 			ch-&gt;max_reg_power = channel-&gt;max_reg_power * 2;</div><div class='del'>-			ch-&gt;max_antenna_gain = channel-&gt;max_antenna_gain * 2;</div><div class='add'>+			ch-&gt;max_antenna_gain = channel-&gt;max_antenna_gain;</div><div class='ctx'> 			ch-&gt;reg_class_id = 0; /* FIXME */</div><div class='ctx'> </div><div class='ctx'> 			/* FIXME: why use only legacy modes, why not any</div><div class='hunk'>@@ -3706,6 +3744,9 @@ ath10k_mac_tx_h_get_txmode(struct ath10k *ar,</div><div class='ctx'> 	const struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(skb);</div><div class='ctx'> 	__le16 fc = hdr-&gt;frame_control;</div><div class='ctx'> </div><div class='add'>+	if (IEEE80211_SKB_CB(skb)-&gt;flags &amp; IEEE80211_TX_CTL_HW_80211_ENCAP)</div><div class='add'>+		return ATH10K_HW_TXRX_ETHERNET;</div><div class='add'>+</div><div class='ctx'> 	if (!vif || vif-&gt;type == NL80211_IFTYPE_MONITOR)</div><div class='ctx'> 		return ATH10K_HW_TXRX_RAW;</div><div class='ctx'> </div><div class='hunk'>@@ -3866,6 +3907,12 @@ static void ath10k_mac_tx_h_fill_cb(struct ath10k *ar,</div><div class='ctx'> 	bool noack = false;</div><div class='ctx'> </div><div class='ctx'> 	cb-&gt;flags = 0;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;flags &amp; IEEE80211_TX_CTL_HW_80211_ENCAP) {</div><div class='add'>+		cb-&gt;flags |= ATH10K_SKB_F_QOS;	/* Assume data frames are QoS */</div><div class='add'>+		goto finish_cb_fill;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!ath10k_tx_h_use_hwcrypto(vif, skb))</div><div class='ctx'> 		cb-&gt;flags |= ATH10K_SKB_F_NO_HWCRYPT;</div><div class='ctx'> </div><div class='hunk'>@@ -3904,6 +3951,7 @@ static void ath10k_mac_tx_h_fill_cb(struct ath10k *ar,</div><div class='ctx'> 		cb-&gt;flags |= ATH10K_SKB_F_RAW_TX;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+finish_cb_fill:</div><div class='ctx'> 	cb-&gt;vif = vif;</div><div class='ctx'> 	cb-&gt;txq = txq;</div><div class='ctx'> 	cb-&gt;airtime_est = airtime;</div><div class='hunk'>@@ -4027,20 +4075,24 @@ static int ath10k_mac_tx(struct ath10k *ar,</div><div class='ctx'> 		ath10k_tx_h_seq_no(vif, skb);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ATH10K_HW_TXRX_ETHERNET:</div><div class='del'>-		ath10k_tx_h_8023(skb);</div><div class='add'>+		/* Convert 802.11-&gt;802.3 header only if the frame was earlier</div><div class='add'>+		 * encapsulated to 802.11 by mac80211. Otherwise pass it as is.</div><div class='add'>+		 */</div><div class='add'>+		if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_HW_80211_ENCAP))</div><div class='add'>+			ath10k_tx_h_8023(skb);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ATH10K_HW_TXRX_RAW:</div><div class='ctx'> 		if (!test_bit(ATH10K_FLAG_RAW_MODE, &amp;ar-&gt;dev_flags) &amp;&amp;</div><div class='ctx'> 		    !(skb_cb-&gt;flags &amp; ATH10K_SKB_F_RAW_TX)) {</div><div class='ctx'> 			WARN_ON_ONCE(1);</div><div class='ctx'> 			ieee80211_free_txskb(hw, skb);</div><div class='del'>-			return -ENOTSUPP;</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!noque_offchan &amp;&amp; info-&gt;flags &amp; IEEE80211_TX_CTL_TX_OFFCHAN) {</div><div class='ctx'> 		if (!ath10k_mac_tx_frm_has_freq(ar)) {</div><div class='del'>-			ath10k_dbg(ar, ATH10K_DBG_MAC, "mac queued offchannel skb %pK len %d\n",</div><div class='add'>+			ath10k_dbg(ar, ATH10K_DBG_MAC, "mac queued offchannel skb %p len %d\n",</div><div class='ctx'> 				   skb, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 			skb_queue_tail(&amp;ar-&gt;offchan_tx_queue, skb);</div><div class='hunk'>@@ -4103,7 +4155,7 @@ void ath10k_offchan_tx_work(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 		mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='del'>-		ath10k_dbg(ar, ATH10K_DBG_MAC, "mac offchannel skb %pK len %d\n",</div><div class='add'>+		ath10k_dbg(ar, ATH10K_DBG_MAC, "mac offchannel skb %p len %d\n",</div><div class='ctx'> 			   skb, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 		hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='hunk'>@@ -4114,11 +4166,10 @@ void ath10k_offchan_tx_work(struct work_struct *work)</div><div class='ctx'> 		peer = ath10k_peer_find(ar, vdev_id, peer_addr);</div><div class='ctx'> 		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> </div><div class='del'>-		if (peer)</div><div class='add'>+		if (peer) {</div><div class='ctx'> 			ath10k_warn(ar, "peer %pM on vdev %d already present\n",</div><div class='ctx'> 				    peer_addr, vdev_id);</div><div class='del'>-</div><div class='del'>-		if (!peer) {</div><div class='add'>+		} else {</div><div class='ctx'> 			ret = ath10k_peer_create(ar, NULL, NULL, vdev_id,</div><div class='ctx'> 						 peer_addr,</div><div class='ctx'> 						 WMI_PEER_TYPE_DEFAULT);</div><div class='hunk'>@@ -4159,7 +4210,7 @@ void ath10k_offchan_tx_work(struct work_struct *work)</div><div class='ctx'> 		time_left =</div><div class='ctx'> 		wait_for_completion_timeout(&amp;ar-&gt;offchan_tx_completed, 3 * HZ);</div><div class='ctx'> 		if (time_left == 0)</div><div class='del'>-			ath10k_warn(ar, "timed out waiting for offchannel skb %pK, len: %d\n",</div><div class='add'>+			ath10k_warn(ar, "timed out waiting for offchannel skb %p, len: %d\n",</div><div class='ctx'> 				    skb, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 		if (!peer &amp;&amp; tmp_peer_created) {</div><div class='hunk'>@@ -4476,18 +4527,21 @@ void __ath10k_scan_finish(struct ath10k *ar)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ATH10K_SCAN_RUNNING:</div><div class='ctx'> 	case ATH10K_SCAN_ABORTING:</div><div class='add'>+		if (ar-&gt;scan.is_roc &amp;&amp; ar-&gt;scan.roc_notify)</div><div class='add'>+			ieee80211_remain_on_channel_expired(ar-&gt;hw);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case ATH10K_SCAN_STARTING:</div><div class='ctx'> 		if (!ar-&gt;scan.is_roc) {</div><div class='ctx'> 			struct cfg80211_scan_info info = {</div><div class='del'>-				.aborted = (ar-&gt;scan.state ==</div><div class='del'>-					    ATH10K_SCAN_ABORTING),</div><div class='add'>+				.aborted = ((ar-&gt;scan.state ==</div><div class='add'>+					    ATH10K_SCAN_ABORTING) ||</div><div class='add'>+					    (ar-&gt;scan.state ==</div><div class='add'>+					    ATH10K_SCAN_STARTING)),</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			ieee80211_scan_completed(ar-&gt;hw, &amp;info);</div><div class='del'>-		} else if (ar-&gt;scan.roc_notify) {</div><div class='del'>-			ieee80211_remain_on_channel_expired(ar-&gt;hw);</div><div class='ctx'> 		}</div><div class='del'>-		fallthrough;</div><div class='del'>-	case ATH10K_SCAN_STARTING:</div><div class='add'>+</div><div class='ctx'> 		ar-&gt;scan.state = ATH10K_SCAN_IDLE;</div><div class='ctx'> 		ar-&gt;scan_channel = NULL;</div><div class='ctx'> 		ar-&gt;scan.roc_freq = 0;</div><div class='hunk'>@@ -4639,12 +4693,10 @@ static void ath10k_mac_op_tx(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct ieee80211_vif *vif = info-&gt;control.vif;</div><div class='ctx'> 	struct ieee80211_sta *sta = control-&gt;sta;</div><div class='ctx'> 	struct ieee80211_txq *txq = NULL;</div><div class='del'>-	struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='ctx'> 	enum ath10k_hw_txrx_mode txmode;</div><div class='ctx'> 	enum ath10k_mac_tx_path txpath;</div><div class='ctx'> 	bool is_htt;</div><div class='ctx'> 	bool is_mgmt;</div><div class='del'>-	bool is_presp;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u16 airtime;</div><div class='ctx'> </div><div class='hunk'>@@ -4658,8 +4710,14 @@ static void ath10k_mac_op_tx(struct ieee80211_hw *hw,</div><div class='ctx'> 	is_mgmt = (txpath == ATH10K_MAC_TX_HTT_MGMT);</div><div class='ctx'> </div><div class='ctx'> 	if (is_htt) {</div><div class='add'>+		bool is_presp = false;</div><div class='add'>+</div><div class='ctx'> 		spin_lock_bh(&amp;ar-&gt;htt.tx_lock);</div><div class='del'>-		is_presp = ieee80211_is_probe_resp(hdr-&gt;frame_control);</div><div class='add'>+		if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_HW_80211_ENCAP)) {</div><div class='add'>+			struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+			is_presp = ieee80211_is_probe_resp(hdr-&gt;frame_control);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		ret = ath10k_htt_tx_inc_pending(htt);</div><div class='ctx'> 		if (ret) {</div><div class='hunk'>@@ -4701,13 +4759,14 @@ static void ath10k_mac_op_wake_tx_queue(struct ieee80211_hw *hw,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = hw-&gt;priv;</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 ac;</div><div class='add'>+	u8 ac = txq-&gt;ac;</div><div class='ctx'> </div><div class='ctx'> 	ath10k_htt_tx_txq_update(hw, txq);</div><div class='ctx'> 	if (ar-&gt;htt.tx_q_state.mode != HTT_TX_MODE_SWITCH_PUSH)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ac = txq-&gt;ac;</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;queue_lock[ac]);</div><div class='add'>+</div><div class='ctx'> 	ieee80211_txq_schedule_start(hw, ac);</div><div class='ctx'> 	txq = ieee80211_next_txq(hw, ac);</div><div class='ctx'> 	if (!txq)</div><div class='hunk'>@@ -4722,6 +4781,7 @@ static void ath10k_mac_op_wake_tx_queue(struct ieee80211_hw *hw,</div><div class='ctx'> 	ath10k_htt_tx_txq_update(hw, txq);</div><div class='ctx'> out:</div><div class='ctx'> 	ieee80211_txq_schedule_end(hw, ac);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;queue_lock[ac]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Must not be called with conf_mutex held as workers can use that also. */</div><div class='hunk'>@@ -4768,7 +4828,8 @@ void ath10k_halt(struct ath10k *ar)</div><div class='ctx'> 	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath10k_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant)</div><div class='add'>+static int ath10k_get_antenna(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+			      u32 *tx_ant, u32 *rx_ant)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -4831,7 +4892,7 @@ static int ath10k_mac_get_vht_cap_bf_sound_dim(struct ath10k *ar)</div><div class='ctx'> </div><div class='ctx'> static struct ieee80211_sta_vht_cap ath10k_create_vht_cap(struct ath10k *ar)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sta_vht_cap vht_cap = {0};</div><div class='add'>+	struct ieee80211_sta_vht_cap vht_cap = {};</div><div class='ctx'> 	struct ath10k_hw_params *hw = &amp;ar-&gt;hw_params;</div><div class='ctx'> 	u16 mcs_map;</div><div class='ctx'> 	u32 val;</div><div class='hunk'>@@ -4889,7 +4950,7 @@ static struct ieee80211_sta_vht_cap ath10k_create_vht_cap(struct ath10k *ar)</div><div class='ctx'> static struct ieee80211_sta_ht_cap ath10k_get_ht_cap(struct ath10k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct ieee80211_sta_ht_cap ht_cap = {0};</div><div class='add'>+	struct ieee80211_sta_ht_cap ht_cap = {};</div><div class='ctx'> </div><div class='ctx'> 	if (!(ar-&gt;ht_cap_info &amp; WMI_HT_CAP_ENABLED))</div><div class='ctx'> 		return ht_cap;</div><div class='hunk'>@@ -5015,7 +5076,8 @@ static int __ath10k_set_antenna(struct ath10k *ar, u32 tx_ant, u32 rx_ant)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath10k_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)</div><div class='add'>+static int ath10k_set_antenna(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+			      u32 tx_ant, u32 rx_ant)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = hw-&gt;priv;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -5120,7 +5182,7 @@ static int ath10k_start(struct ieee80211_hw *hw)</div><div class='ctx'> 	struct ath10k *ar = hw-&gt;priv;</div><div class='ctx'> 	u32 param;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	struct wmi_bb_timing_cfg_arg bb_timing = {0};</div><div class='add'>+	struct wmi_bb_timing_cfg_arg bb_timing = {};</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This makes sense only when restarting hw. It is harmless to call</div><div class='hunk'>@@ -5332,16 +5394,32 @@ err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath10k_stop(struct ieee80211_hw *hw)</div><div class='add'>+static void ath10k_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = hw-&gt;priv;</div><div class='add'>+	u32 opt;</div><div class='ctx'> </div><div class='ctx'> 	ath10k_drain_tx(ar);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> 	if (ar-&gt;state != ATH10K_STATE_OFF) {</div><div class='del'>-		if (!ar-&gt;hw_rfkill_on)</div><div class='del'>-			ath10k_halt(ar);</div><div class='add'>+		if (!ar-&gt;hw_rfkill_on) {</div><div class='add'>+			/* If the current driver state is RESTARTING but not yet</div><div class='add'>+			 * fully RESTARTED because of incoming suspend event,</div><div class='add'>+			 * then ath10k_halt() is already called via</div><div class='add'>+			 * ath10k_core_restart() and should not be called here.</div><div class='add'>+			 */</div><div class='add'>+			if (ar-&gt;state != ATH10K_STATE_RESTARTING) {</div><div class='add'>+				ath10k_halt(ar);</div><div class='add'>+			} else {</div><div class='add'>+				/* Suspending here, because when in RESTARTING</div><div class='add'>+				 * state, ath10k_core_stop() skips</div><div class='add'>+				 * ath10k_wait_for_suspend().</div><div class='add'>+				 */</div><div class='add'>+				opt = WMI_PDEV_SUSPEND_AND_DISABLE_INTR;</div><div class='add'>+				ath10k_wait_for_suspend(ar, opt);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		ar-&gt;state = ATH10K_STATE_OFF;</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='hunk'>@@ -5349,6 +5427,7 @@ static void ath10k_stop(struct ieee80211_hw *hw)</div><div class='ctx'> 	cancel_work_sync(&amp;ar-&gt;set_coverage_class_work);</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;ar-&gt;scan.timeout);</div><div class='ctx'> 	cancel_work_sync(&amp;ar-&gt;restart_work);</div><div class='add'>+	cancel_work_sync(&amp;ar-&gt;recovery_check_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath10k_config_ps(struct ath10k *ar)</div><div class='hunk'>@@ -5369,7 +5448,7 @@ static int ath10k_config_ps(struct ath10k *ar)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath10k_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+static int ath10k_config(struct ieee80211_hw *hw, int radio_idx, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = hw-&gt;priv;</div><div class='ctx'> 	struct ieee80211_conf *conf = &amp;hw-&gt;conf;</div><div class='hunk'>@@ -5443,6 +5522,30 @@ static int ath10k_mac_set_txbf_conf(struct ath10k_vif *arvif)</div><div class='ctx'> 					 ar-&gt;wmi.vdev_param-&gt;txbf, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ath10k_update_vif_offload(struct ieee80211_hw *hw,</div><div class='add'>+				      struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ath10k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct ath10k *ar = hw-&gt;priv;</div><div class='add'>+	u32 vdev_param;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ath10k_frame_mode != ATH10K_HW_TXRX_ETHERNET ||</div><div class='add'>+	    ar-&gt;wmi.vdev_param-&gt;tx_encap_type == WMI_VDEV_PARAM_UNSUPPORTED ||</div><div class='add'>+	     (vif-&gt;type != NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+	      vif-&gt;type != NL80211_IFTYPE_AP))</div><div class='add'>+		vif-&gt;offload_flags &amp;= ~IEEE80211_OFFLOAD_ENCAP_ENABLED;</div><div class='add'>+</div><div class='add'>+	vdev_param = ar-&gt;wmi.vdev_param-&gt;tx_encap_type;</div><div class='add'>+	ret = ath10k_wmi_vdev_set_param(ar, arvif-&gt;vdev_id, vdev_param,</div><div class='add'>+					ATH10K_HW_TXRX_NATIVE_WIFI);</div><div class='add'>+	/* 10.X firmware does not support this VDEV parameter. Do not warn */</div><div class='add'>+	if (ret &amp;&amp; ret != -EOPNOTSUPP) {</div><div class='add'>+		ath10k_warn(ar, "failed to set vdev %i TX encapsulation: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * TODO:</div><div class='ctx'>  * Figure out how to handle WMI_VDEV_SUBTYPE_P2P_DEVICE,</div><div class='hunk'>@@ -5576,10 +5679,25 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_ADHOC ||</div><div class='ctx'> 	    vif-&gt;type == NL80211_IFTYPE_MESH_POINT ||</div><div class='ctx'> 	    vif-&gt;type == NL80211_IFTYPE_AP) {</div><div class='del'>-		arvif-&gt;beacon_buf = dma_alloc_coherent(ar-&gt;dev,</div><div class='del'>-						       IEEE80211_MAX_FRAME_LEN,</div><div class='del'>-						       &amp;arvif-&gt;beacon_paddr,</div><div class='del'>-						       GFP_ATOMIC);</div><div class='add'>+		if (ar-&gt;bus_param.dev_type == ATH10K_DEV_TYPE_HL) {</div><div class='add'>+			arvif-&gt;beacon_buf = kmalloc(IEEE80211_MAX_FRAME_LEN,</div><div class='add'>+						    GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+			/* Using a kernel pointer in place of a dma_addr_t</div><div class='add'>+			 * token can lead to undefined behavior if that</div><div class='add'>+			 * makes it into cache management functions. Use a</div><div class='add'>+			 * known-invalid address token instead, which</div><div class='add'>+			 * avoids the warning and makes it easier to catch</div><div class='add'>+			 * bugs if it does end up getting used.</div><div class='add'>+			 */</div><div class='add'>+			arvif-&gt;beacon_paddr = DMA_MAPPING_ERROR;</div><div class='add'>+		} else {</div><div class='add'>+			arvif-&gt;beacon_buf =</div><div class='add'>+				dma_alloc_coherent(ar-&gt;dev,</div><div class='add'>+						   IEEE80211_MAX_FRAME_LEN,</div><div class='add'>+						   &amp;arvif-&gt;beacon_paddr,</div><div class='add'>+						   GFP_ATOMIC);</div><div class='add'>+		}</div><div class='ctx'> 		if (!arvif-&gt;beacon_buf) {</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 			ath10k_warn(ar, "failed to allocate beacon buffer: %d\n",</div><div class='hunk'>@@ -5592,6 +5710,7 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	if (arvif-&gt;nohwcrypt &amp;&amp;</div><div class='ctx'> 	    !test_bit(ATH10K_FLAG_RAW_MODE, &amp;ar-&gt;dev_flags)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='ctx'> 		ath10k_warn(ar, "cryptmode module param needed for sw crypto\n");</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5636,15 +5755,7 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	arvif-&gt;def_wep_key_idx = -1;</div><div class='ctx'> </div><div class='del'>-	vdev_param = ar-&gt;wmi.vdev_param-&gt;tx_encap_type;</div><div class='del'>-	ret = ath10k_wmi_vdev_set_param(ar, arvif-&gt;vdev_id, vdev_param,</div><div class='del'>-					ATH10K_HW_TXRX_NATIVE_WIFI);</div><div class='del'>-	/* 10.X firmware does not support this VDEV parameter. Do not warn */</div><div class='del'>-	if (ret &amp;&amp; ret != -EOPNOTSUPP) {</div><div class='del'>-		ath10k_warn(ar, "failed to set vdev %i TX encapsulation: %d\n",</div><div class='del'>-			    arvif-&gt;vdev_id, ret);</div><div class='del'>-		goto err_vdev_delete;</div><div class='del'>-	}</div><div class='add'>+	ath10k_update_vif_offload(hw, vif);</div><div class='ctx'> </div><div class='ctx'> 	/* Configuring number of spatial stream for monitor interface is causing</div><div class='ctx'> 	 * target assert in qca9888 and qca6174.</div><div class='hunk'>@@ -5793,8 +5904,12 @@ err_vdev_delete:</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='ctx'> 	if (arvif-&gt;beacon_buf) {</div><div class='del'>-		dma_free_coherent(ar-&gt;dev, IEEE80211_MAX_FRAME_LEN,</div><div class='del'>-				  arvif-&gt;beacon_buf, arvif-&gt;beacon_paddr);</div><div class='add'>+		if (ar-&gt;bus_param.dev_type == ATH10K_DEV_TYPE_HL)</div><div class='add'>+			kfree(arvif-&gt;beacon_buf);</div><div class='add'>+		else</div><div class='add'>+			dma_free_coherent(ar-&gt;dev, IEEE80211_MAX_FRAME_LEN,</div><div class='add'>+					  arvif-&gt;beacon_buf,</div><div class='add'>+					  arvif-&gt;beacon_paddr);</div><div class='ctx'> 		arvif-&gt;beacon_buf = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5817,7 +5932,6 @@ static void ath10k_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct ath10k *ar = hw-&gt;priv;</div><div class='ctx'> 	struct ath10k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct ath10k_peer *peer;</div><div class='del'>-	unsigned long time_left;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -5857,13 +5971,10 @@ static void ath10k_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 		ath10k_warn(ar, "failed to delete WMI vdev %i: %d\n",</div><div class='ctx'> 			    arvif-&gt;vdev_id, ret);</div><div class='ctx'> </div><div class='del'>-	if (test_bit(WMI_SERVICE_SYNC_DELETE_CMDS, ar-&gt;wmi.svc_map)) {</div><div class='del'>-		time_left = wait_for_completion_timeout(&amp;ar-&gt;vdev_delete_done,</div><div class='del'>-							ATH10K_VDEV_DELETE_TIMEOUT_HZ);</div><div class='del'>-		if (time_left == 0) {</div><div class='del'>-			ath10k_warn(ar, "Timeout in receiving vdev delete response\n");</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+	ret = ath10k_vdev_delete_sync(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath10k_warn(ar, "Error in receiving vdev delete response: %d\n", ret);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Some firmware revisions don't notify host about self-peer removal</div><div class='hunk'>@@ -5944,11 +6055,15 @@ static void ath10k_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = hw-&gt;priv;</div><div class='ctx'> 	int ret;</div><div class='add'>+	unsigned int supported = SUPPORTED_FILTERS;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='del'>-	changed_flags &amp;= SUPPORTED_FILTERS;</div><div class='del'>-	*total_flags &amp;= SUPPORTED_FILTERS;</div><div class='add'>+	if (ar-&gt;hw_params.mcast_frame_registration)</div><div class='add'>+		supported |= FIF_MCAST_ACTION;</div><div class='add'>+</div><div class='add'>+	*total_flags &amp;= supported;</div><div class='add'>+</div><div class='ctx'> 	ar-&gt;filter_flags = *total_flags;</div><div class='ctx'> </div><div class='ctx'> 	ret = ath10k_monitor_recalc(ar);</div><div class='hunk'>@@ -5992,7 +6107,7 @@ static void ath10k_recalculate_mgmt_rate(struct ath10k *ar,</div><div class='ctx'> static void ath10k_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 				    struct ieee80211_vif *vif,</div><div class='ctx'> 				    struct ieee80211_bss_conf *info,</div><div class='del'>-				    u32 changed)</div><div class='add'>+				    u64 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = hw-&gt;priv;</div><div class='ctx'> 	struct ath10k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='hunk'>@@ -6006,7 +6121,7 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_IBSS)</div><div class='del'>-		ath10k_control_ibss(arvif, info, vif-&gt;addr);</div><div class='add'>+		ath10k_control_ibss(arvif, vif);</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_BEACON_INT) {</div><div class='ctx'> 		arvif-&gt;beacon_interval = info-&gt;beacon_int;</div><div class='hunk'>@@ -6041,9 +6156,8 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 		if (ieee80211_vif_is_mesh(vif)) {</div><div class='ctx'> 			/* mesh doesn't use SSID but firmware needs it */</div><div class='del'>-			strncpy(arvif-&gt;u.ap.ssid, "mesh",</div><div class='del'>-				sizeof(arvif-&gt;u.ap.ssid));</div><div class='ctx'> 			arvif-&gt;u.ap.ssid_len = 4;</div><div class='add'>+			memcpy(arvif-&gt;u.ap.ssid, "mesh", arvif-&gt;u.ap.ssid_len);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -6071,9 +6185,10 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_SSID &amp;&amp;</div><div class='ctx'> 	    vif-&gt;type == NL80211_IFTYPE_AP) {</div><div class='del'>-		arvif-&gt;u.ap.ssid_len = info-&gt;ssid_len;</div><div class='del'>-		if (info-&gt;ssid_len)</div><div class='del'>-			memcpy(arvif-&gt;u.ap.ssid, info-&gt;ssid, info-&gt;ssid_len);</div><div class='add'>+		arvif-&gt;u.ap.ssid_len = vif-&gt;cfg.ssid_len;</div><div class='add'>+		if (vif-&gt;cfg.ssid_len)</div><div class='add'>+			memcpy(arvif-&gt;u.ap.ssid, vif-&gt;cfg.ssid,</div><div class='add'>+			       vif-&gt;cfg.ssid_len);</div><div class='ctx'> 		arvif-&gt;u.ap.hidden_ssid = info-&gt;hidden_ssid;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -6150,7 +6265,7 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_ASSOC) {</div><div class='del'>-		if (info-&gt;assoc) {</div><div class='add'>+		if (vif-&gt;cfg.assoc) {</div><div class='ctx'> 			/* Workaround: Make sure monitor vdev is not running</div><div class='ctx'> 			 * when associating to prevent some firmware revisions</div><div class='ctx'> 			 * (e.g. 10.1 and 10.2) from crashing.</div><div class='hunk'>@@ -6175,7 +6290,7 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_PS) {</div><div class='del'>-		arvif-&gt;ps = vif-&gt;bss_conf.ps;</div><div class='add'>+		arvif-&gt;ps = vif-&gt;cfg.ps;</div><div class='ctx'> </div><div class='ctx'> 		ret = ath10k_config_ps(ar);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -6232,7 +6347,8 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath10k_mac_op_set_coverage_class(struct ieee80211_hw *hw, s16 value)</div><div class='add'>+static void ath10k_mac_op_set_coverage_class(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+					     s16 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -6243,7 +6359,7 @@ static void ath10k_mac_op_set_coverage_class(struct ieee80211_hw *hw, s16 value)</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	ar-&gt;hw_params.hw_ops-&gt;set_coverage_class(ar, value);</div><div class='add'>+	ar-&gt;hw_params.hw_ops-&gt;set_coverage_class(ar, -1, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct ath10k_mac_tdls_iter_data {</div><div class='hunk'>@@ -6282,7 +6398,7 @@ static int ath10k_hw_scan(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct ath10k *ar = hw-&gt;priv;</div><div class='ctx'> 	struct ath10k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct cfg80211_scan_request *req = &amp;hw_req-&gt;req;</div><div class='del'>-	struct wmi_start_scan_arg arg;</div><div class='add'>+	struct wmi_start_scan_arg *arg = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 scan_timeout;</div><div class='hunk'>@@ -6315,55 +6431,61 @@ static int ath10k_hw_scan(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto exit;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;arg, 0, sizeof(arg));</div><div class='del'>-	ath10k_wmi_start_scan_init(ar, &amp;arg);</div><div class='del'>-	arg.vdev_id = arvif-&gt;vdev_id;</div><div class='del'>-	arg.scan_id = ATH10K_SCAN_ID;</div><div class='add'>+	arg = kzalloc(sizeof(*arg), GFP_KERNEL);</div><div class='add'>+	if (!arg) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath10k_wmi_start_scan_init(ar, arg);</div><div class='add'>+	arg-&gt;vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+	arg-&gt;scan_id = ATH10K_SCAN_ID;</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;ie_len) {</div><div class='del'>-		arg.ie_len = req-&gt;ie_len;</div><div class='del'>-		memcpy(arg.ie, req-&gt;ie, arg.ie_len);</div><div class='add'>+		arg-&gt;ie_len = req-&gt;ie_len;</div><div class='add'>+		memcpy(arg-&gt;ie, req-&gt;ie, arg-&gt;ie_len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;n_ssids) {</div><div class='del'>-		arg.n_ssids = req-&gt;n_ssids;</div><div class='del'>-		for (i = 0; i &lt; arg.n_ssids; i++) {</div><div class='del'>-			arg.ssids[i].len  = req-&gt;ssids[i].ssid_len;</div><div class='del'>-			arg.ssids[i].ssid = req-&gt;ssids[i].ssid;</div><div class='add'>+		arg-&gt;n_ssids = req-&gt;n_ssids;</div><div class='add'>+		for (i = 0; i &lt; arg-&gt;n_ssids; i++) {</div><div class='add'>+			arg-&gt;ssids[i].len  = req-&gt;ssids[i].ssid_len;</div><div class='add'>+			arg-&gt;ssids[i].ssid = req-&gt;ssids[i].ssid;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		arg.scan_ctrl_flags |= WMI_SCAN_FLAG_PASSIVE;</div><div class='add'>+		arg-&gt;scan_ctrl_flags |= WMI_SCAN_FLAG_PASSIVE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;flags &amp; NL80211_SCAN_FLAG_RANDOM_ADDR) {</div><div class='del'>-		arg.scan_ctrl_flags |=  WMI_SCAN_ADD_SPOOFED_MAC_IN_PROBE_REQ;</div><div class='del'>-		ether_addr_copy(arg.mac_addr.addr, req-&gt;mac_addr);</div><div class='del'>-		ether_addr_copy(arg.mac_mask.addr, req-&gt;mac_addr_mask);</div><div class='add'>+		arg-&gt;scan_ctrl_flags |=  WMI_SCAN_ADD_SPOOFED_MAC_IN_PROBE_REQ;</div><div class='add'>+		ether_addr_copy(arg-&gt;mac_addr.addr, req-&gt;mac_addr);</div><div class='add'>+		ether_addr_copy(arg-&gt;mac_mask.addr, req-&gt;mac_addr_mask);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;n_channels) {</div><div class='del'>-		arg.n_channels = req-&gt;n_channels;</div><div class='del'>-		for (i = 0; i &lt; arg.n_channels; i++)</div><div class='del'>-			arg.channels[i] = req-&gt;channels[i]-&gt;center_freq;</div><div class='add'>+		arg-&gt;n_channels = req-&gt;n_channels;</div><div class='add'>+		for (i = 0; i &lt; arg-&gt;n_channels; i++)</div><div class='add'>+			arg-&gt;channels[i] = req-&gt;channels[i]-&gt;center_freq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* if duration is set, default dwell times will be overwritten */</div><div class='ctx'> 	if (req-&gt;duration) {</div><div class='del'>-		arg.dwell_time_active = req-&gt;duration;</div><div class='del'>-		arg.dwell_time_passive = req-&gt;duration;</div><div class='del'>-		arg.burst_duration_ms = req-&gt;duration;</div><div class='add'>+		arg-&gt;dwell_time_active = req-&gt;duration;</div><div class='add'>+		arg-&gt;dwell_time_passive = req-&gt;duration;</div><div class='add'>+		arg-&gt;burst_duration_ms = req-&gt;duration;</div><div class='ctx'> </div><div class='del'>-		scan_timeout = min_t(u32, arg.max_rest_time *</div><div class='del'>-				(arg.n_channels - 1) + (req-&gt;duration +</div><div class='add'>+		scan_timeout = min_t(u32, arg-&gt;max_rest_time *</div><div class='add'>+				(arg-&gt;n_channels - 1) + (req-&gt;duration +</div><div class='ctx'> 				ATH10K_SCAN_CHANNEL_SWITCH_WMI_EVT_OVERHEAD) *</div><div class='del'>-				arg.n_channels, arg.max_scan_time + 200);</div><div class='del'>-</div><div class='add'>+				arg-&gt;n_channels, arg-&gt;max_scan_time);</div><div class='ctx'> 	} else {</div><div class='del'>-		/* Add a 200ms margin to account for event/command processing */</div><div class='del'>-		scan_timeout = arg.max_scan_time + 200;</div><div class='add'>+		scan_timeout = arg-&gt;max_scan_time;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ath10k_start_scan(ar, &amp;arg);</div><div class='add'>+	/* Add a 200ms margin to account for event/command processing */</div><div class='add'>+	scan_timeout += 200;</div><div class='add'>+</div><div class='add'>+	ret = ath10k_start_scan(ar, arg);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath10k_warn(ar, "failed to start hw scan: %d\n", ret);</div><div class='ctx'> 		spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='hunk'>@@ -6375,6 +6497,8 @@ static int ath10k_hw_scan(struct ieee80211_hw *hw,</div><div class='ctx'> 				     msecs_to_jiffies(scan_timeout));</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='add'>+	kfree(arg);</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -6762,10 +6886,10 @@ static int ath10k_sta_set_txpwr(struct ieee80211_hw *hw,</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	s16 txpwr;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;txpwr.type == NL80211_TX_POWER_AUTOMATIC) {</div><div class='add'>+	if (sta-&gt;deflink.txpwr.type == NL80211_TX_POWER_AUTOMATIC) {</div><div class='ctx'> 		txpwr = 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		txpwr = sta-&gt;txpwr.power;</div><div class='add'>+		txpwr = sta-&gt;deflink.txpwr.power;</div><div class='ctx'> 		if (!txpwr)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -6885,26 +7009,29 @@ static int ath10k_mac_validate_rate_mask(struct ath10k *ar,</div><div class='ctx'> 					 struct ieee80211_sta *sta,</div><div class='ctx'> 					 u32 rate_ctrl_flag, u8 nss)</div><div class='ctx'> {</div><div class='del'>-	if (nss &gt; sta-&gt;rx_nss) {</div><div class='add'>+	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;deflink.ht_cap;</div><div class='add'>+	struct ieee80211_sta_vht_cap *vht_cap = &amp;sta-&gt;deflink.vht_cap;</div><div class='add'>+</div><div class='add'>+	if (nss &gt; sta-&gt;deflink.rx_nss) {</div><div class='ctx'> 		ath10k_warn(ar, "Invalid nss field, configured %u limit %u\n",</div><div class='del'>-			    nss, sta-&gt;rx_nss);</div><div class='add'>+			    nss, sta-&gt;deflink.rx_nss);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ATH10K_HW_PREAMBLE(rate_ctrl_flag) == WMI_RATE_PREAMBLE_VHT) {</div><div class='del'>-		if (!sta-&gt;vht_cap.vht_supported) {</div><div class='add'>+		if (!vht_cap-&gt;vht_supported) {</div><div class='ctx'> 			ath10k_warn(ar, "Invalid VHT rate for sta %pM\n",</div><div class='ctx'> 				    sta-&gt;addr);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (ATH10K_HW_PREAMBLE(rate_ctrl_flag) == WMI_RATE_PREAMBLE_HT) {</div><div class='del'>-		if (!sta-&gt;ht_cap.ht_supported || sta-&gt;vht_cap.vht_supported) {</div><div class='add'>+		if (!ht_cap-&gt;ht_supported || vht_cap-&gt;vht_supported) {</div><div class='ctx'> 			ath10k_warn(ar, "Invalid HT rate for sta %pM\n",</div><div class='ctx'> 				    sta-&gt;addr);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		if (sta-&gt;ht_cap.ht_supported || sta-&gt;vht_cap.vht_supported)</div><div class='add'>+		if (ht_cap-&gt;ht_supported || vht_cap-&gt;vht_supported)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -6975,7 +7102,7 @@ static int ath10k_mac_set_tid_config(struct ath10k *ar, struct ieee80211_sta *st</div><div class='ctx'> </div><div class='ctx'> 	if (sta) {</div><div class='ctx'> 		if (!sta-&gt;wme)</div><div class='del'>-			return -ENOTSUPP;</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 		arsta = (struct ath10k_sta *)sta-&gt;drv_priv;</div><div class='ctx'> </div><div class='hunk'>@@ -7506,7 +7633,7 @@ static int ath10k_sta_state(struct ieee80211_hw *hw,</div><div class='ctx'> 		 * Existing station deletion.</div><div class='ctx'> 		 */</div><div class='ctx'> 		ath10k_dbg(ar, ATH10K_DBG_STA,</div><div class='del'>-			   "mac vdev %d peer delete %pM sta %pK (sta gone)\n",</div><div class='add'>+			   "mac vdev %d peer delete %pM sta %p (sta gone)\n",</div><div class='ctx'> 			   arvif-&gt;vdev_id, sta-&gt;addr, sta);</div><div class='ctx'> </div><div class='ctx'> 		if (sta-&gt;tdls) {</div><div class='hunk'>@@ -7533,17 +7660,14 @@ static int ath10k_sta_state(struct ieee80211_hw *hw,</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			if (peer-&gt;sta == sta) {</div><div class='del'>-				ath10k_warn(ar, "found sta peer %pM (ptr %pK id %d) entry on vdev %i after it was supposedly removed\n",</div><div class='add'>+				ath10k_warn(ar, "found sta peer %pM (ptr %p id %d) entry on vdev %i after it was supposedly removed\n",</div><div class='ctx'> 					    sta-&gt;addr, peer, i, arvif-&gt;vdev_id);</div><div class='ctx'> 				peer-&gt;sta = NULL;</div><div class='ctx'> </div><div class='ctx'> 				/* Clean up the peer object as well since we</div><div class='ctx'> 				 * must have failed to do this above.</div><div class='ctx'> 				 */</div><div class='del'>-				list_del(&amp;peer-&gt;list);</div><div class='del'>-				ar-&gt;peer_map[i] = NULL;</div><div class='del'>-				kfree(peer);</div><div class='del'>-				ar-&gt;num_peers--;</div><div class='add'>+				ath10k_peer_map_cleanup(ar, peer);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='hunk'>@@ -7733,7 +7857,8 @@ exit:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath10k_conf_tx(struct ieee80211_hw *hw,</div><div class='del'>-			  struct ieee80211_vif *vif, u16 ac,</div><div class='add'>+			  struct ieee80211_vif *vif,</div><div class='add'>+			  unsigned int link_id, u16 ac,</div><div class='ctx'> 			  const struct ieee80211_tx_queue_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = hw-&gt;priv;</div><div class='hunk'>@@ -7810,7 +7935,7 @@ static int ath10k_remain_on_channel(struct ieee80211_hw *hw,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = hw-&gt;priv;</div><div class='ctx'> 	struct ath10k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='del'>-	struct wmi_start_scan_arg arg;</div><div class='add'>+	struct wmi_start_scan_arg *arg = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u32 scan_time_msec;</div><div class='ctx'> </div><div class='hunk'>@@ -7847,20 +7972,25 @@ static int ath10k_remain_on_channel(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	scan_time_msec = ar-&gt;hw-&gt;wiphy-&gt;max_remain_on_channel_duration * 2;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;arg, 0, sizeof(arg));</div><div class='del'>-	ath10k_wmi_start_scan_init(ar, &amp;arg);</div><div class='del'>-	arg.vdev_id = arvif-&gt;vdev_id;</div><div class='del'>-	arg.scan_id = ATH10K_SCAN_ID;</div><div class='del'>-	arg.n_channels = 1;</div><div class='del'>-	arg.channels[0] = chan-&gt;center_freq;</div><div class='del'>-	arg.dwell_time_active = scan_time_msec;</div><div class='del'>-	arg.dwell_time_passive = scan_time_msec;</div><div class='del'>-	arg.max_scan_time = scan_time_msec;</div><div class='del'>-	arg.scan_ctrl_flags |= WMI_SCAN_FLAG_PASSIVE;</div><div class='del'>-	arg.scan_ctrl_flags |= WMI_SCAN_FILTER_PROBE_REQ;</div><div class='del'>-	arg.burst_duration_ms = duration;</div><div class='del'>-</div><div class='del'>-	ret = ath10k_start_scan(ar, &amp;arg);</div><div class='add'>+	arg = kzalloc(sizeof(*arg), GFP_KERNEL);</div><div class='add'>+	if (!arg) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath10k_wmi_start_scan_init(ar, arg);</div><div class='add'>+	arg-&gt;vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+	arg-&gt;scan_id = ATH10K_SCAN_ID;</div><div class='add'>+	arg-&gt;n_channels = 1;</div><div class='add'>+	arg-&gt;channels[0] = chan-&gt;center_freq;</div><div class='add'>+	arg-&gt;dwell_time_active = scan_time_msec;</div><div class='add'>+	arg-&gt;dwell_time_passive = scan_time_msec;</div><div class='add'>+	arg-&gt;max_scan_time = scan_time_msec;</div><div class='add'>+	arg-&gt;scan_ctrl_flags |= WMI_SCAN_FLAG_PASSIVE;</div><div class='add'>+	arg-&gt;scan_ctrl_flags |= WMI_SCAN_FILTER_PROBE_REQ;</div><div class='add'>+	arg-&gt;burst_duration_ms = duration;</div><div class='add'>+</div><div class='add'>+	ret = ath10k_start_scan(ar, arg);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath10k_warn(ar, "failed to start roc scan: %d\n", ret);</div><div class='ctx'> 		spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='hunk'>@@ -7886,6 +8016,8 @@ static int ath10k_remain_on_channel(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> exit:</div><div class='add'>+	kfree(arg);</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -7915,7 +8047,8 @@ static int ath10k_cancel_remain_on_channel(struct ieee80211_hw *hw,</div><div class='ctx'>  * in ath10k, but device-specific in mac80211.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int ath10k_set_rts_threshold(struct ieee80211_hw *hw, u32 value)</div><div class='add'>+static int ath10k_set_rts_threshold(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+				    u32 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = hw-&gt;priv;</div><div class='ctx'> 	struct ath10k_vif *arvif;</div><div class='hunk'>@@ -7938,7 +8071,8 @@ static int ath10k_set_rts_threshold(struct ieee80211_hw *hw, u32 value)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath10k_mac_op_set_frag_threshold(struct ieee80211_hw *hw, u32 value)</div><div class='add'>+static int ath10k_mac_op_set_frag_threshold(struct ieee80211_hw *hw,</div><div class='add'>+					    int radio_idx, u32 value)</div><div class='ctx'> {</div><div class='ctx'> 	/* Even though there's a WMI enum for fragmentation threshold no known</div><div class='ctx'> 	 * firmware actually implements it. Moreover it is not possible to rely</div><div class='hunk'>@@ -8011,7 +8145,7 @@ static void ath10k_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> </div><div class='ctx'> /* TODO: Implement this function properly</div><div class='ctx'>  * For now it is needed to reply to Probe Requests in IBSS mode.</div><div class='del'>- * Propably we need this information from FW.</div><div class='add'>+ * Probably we need this information from FW.</div><div class='ctx'>  */</div><div class='ctx'> static int ath10k_tx_last_beacon(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='hunk'>@@ -8022,6 +8156,7 @@ static void ath10k_reconfig_complete(struct ieee80211_hw *hw,</div><div class='ctx'> 				     enum ieee80211_reconfig_type reconfig_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = hw-&gt;priv;</div><div class='add'>+	struct ath10k_vif *arvif;</div><div class='ctx'> </div><div class='ctx'> 	if (reconfig_type != IEEE80211_RECONFIG_TYPE_RESTART)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -8035,7 +8170,18 @@ static void ath10k_reconfig_complete(struct ieee80211_hw *hw,</div><div class='ctx'> 		ath10k_info(ar, "device successfully recovered\n");</div><div class='ctx'> 		ar-&gt;state = ATH10K_STATE_ON;</div><div class='ctx'> 		ieee80211_wake_queues(ar-&gt;hw);</div><div class='del'>-		clear_bit(ATH10K_FLAG_RESTARTING, &amp;ar-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+		/* Clear recovery state. */</div><div class='add'>+		complete(&amp;ar-&gt;driver_recovery);</div><div class='add'>+		atomic_set(&amp;ar-&gt;fail_cont_count, 0);</div><div class='add'>+		atomic_set(&amp;ar-&gt;pending_recovery, 0);</div><div class='add'>+</div><div class='add'>+		if (ar-&gt;hw_params.hw_restart_disconnect) {</div><div class='add'>+			list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+				if (arvif-&gt;is_up &amp;&amp; arvif-&gt;vdev_type == WMI_VDEV_TYPE_STA)</div><div class='add'>+					ieee80211_hw_restart_disconnect(arvif-&gt;vif);</div><div class='add'>+				}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='hunk'>@@ -8247,7 +8393,7 @@ static bool ath10k_mac_set_vht_bitrate_mask_fixup(struct ath10k *ar,</div><div class='ctx'> 	u8 rate = arvif-&gt;vht_pfr;</div><div class='ctx'> </div><div class='ctx'> 	/* skip non vht and multiple rate peers */</div><div class='del'>-	if (!sta-&gt;vht_cap.vht_supported || arvif-&gt;vht_num_rates != 1)</div><div class='add'>+	if (!sta-&gt;deflink.vht_cap.vht_supported || arvif-&gt;vht_num_rates != 1)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	err = ath10k_wmi_peer_set_param(ar, arvif-&gt;vdev_id, sta-&gt;addr,</div><div class='hunk'>@@ -8288,7 +8434,7 @@ static void ath10k_mac_clr_bitrate_mask_iter(void *data,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* clear vht peers only */</div><div class='del'>-	if (arsta-&gt;arvif != arvif || !sta-&gt;vht_cap.vht_supported)</div><div class='add'>+	if (arsta-&gt;arvif != arvif || !sta-&gt;deflink.vht_cap.vht_supported)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	err = ath10k_wmi_peer_set_param(ar, arvif-&gt;vdev_id, sta-&gt;addr,</div><div class='hunk'>@@ -8411,9 +8557,10 @@ exit:</div><div class='ctx'> </div><div class='ctx'> static void ath10k_sta_rc_update(struct ieee80211_hw *hw,</div><div class='ctx'> 				 struct ieee80211_vif *vif,</div><div class='del'>-				 struct ieee80211_sta *sta,</div><div class='add'>+				 struct ieee80211_link_sta *link_sta,</div><div class='ctx'> 				 u32 changed)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sta *sta = link_sta-&gt;sta;</div><div class='ctx'> 	struct ath10k *ar = hw-&gt;priv;</div><div class='ctx'> 	struct ath10k_sta *arsta = (struct ath10k_sta *)sta-&gt;drv_priv;</div><div class='ctx'> 	struct ath10k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='hunk'>@@ -8432,13 +8579,14 @@ static void ath10k_sta_rc_update(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_STA,</div><div class='ctx'> 		   "mac sta rc update for %pM changed %08x bw %d nss %d smps %d\n",</div><div class='del'>-		   sta-&gt;addr, changed, sta-&gt;bandwidth, sta-&gt;rx_nss,</div><div class='del'>-		   sta-&gt;smps_mode);</div><div class='add'>+		   sta-&gt;addr, changed, sta-&gt;deflink.bandwidth,</div><div class='add'>+		   sta-&gt;deflink.rx_nss,</div><div class='add'>+		   sta-&gt;deflink.smps_mode);</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; IEEE80211_RC_BW_CHANGED) {</div><div class='ctx'> 		bw = WMI_PEER_CHWIDTH_20MHZ;</div><div class='ctx'> </div><div class='del'>-		switch (sta-&gt;bandwidth) {</div><div class='add'>+		switch (sta-&gt;deflink.bandwidth) {</div><div class='ctx'> 		case IEEE80211_STA_RX_BW_20:</div><div class='ctx'> 			bw = WMI_PEER_CHWIDTH_20MHZ;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -8453,7 +8601,7 @@ static void ath10k_sta_rc_update(struct ieee80211_hw *hw,</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			ath10k_warn(ar, "Invalid bandwidth %d in rc update for %pM\n",</div><div class='del'>-				    sta-&gt;bandwidth, sta-&gt;addr);</div><div class='add'>+				    sta-&gt;deflink.bandwidth, sta-&gt;addr);</div><div class='ctx'> 			bw = WMI_PEER_CHWIDTH_20MHZ;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -8462,12 +8610,12 @@ static void ath10k_sta_rc_update(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; IEEE80211_RC_NSS_CHANGED)</div><div class='del'>-		arsta-&gt;nss = sta-&gt;rx_nss;</div><div class='add'>+		arsta-&gt;nss = sta-&gt;deflink.rx_nss;</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; IEEE80211_RC_SMPS_CHANGED) {</div><div class='ctx'> 		smps = WMI_PEER_SMPS_PS_NONE;</div><div class='ctx'> </div><div class='del'>-		switch (sta-&gt;smps_mode) {</div><div class='add'>+		switch (sta-&gt;deflink.smps_mode) {</div><div class='ctx'> 		case IEEE80211_SMPS_AUTOMATIC:</div><div class='ctx'> 		case IEEE80211_SMPS_OFF:</div><div class='ctx'> 			smps = WMI_PEER_SMPS_PS_NONE;</div><div class='hunk'>@@ -8480,7 +8628,7 @@ static void ath10k_sta_rc_update(struct ieee80211_hw *hw,</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IEEE80211_SMPS_NUM_MODES:</div><div class='ctx'> 			ath10k_warn(ar, "Invalid smps %d in sta rc update for %pM\n",</div><div class='del'>-				    sta-&gt;smps_mode, sta-&gt;addr);</div><div class='add'>+				    sta-&gt;deflink.smps_mode, sta-&gt;addr);</div><div class='ctx'> 			smps = WMI_PEER_SMPS_PS_NONE;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -8699,7 +8847,7 @@ ath10k_mac_op_add_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct ath10k *ar = hw-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_MAC,</div><div class='del'>-		   "mac chanctx add freq %u width %d ptr %pK\n",</div><div class='add'>+		   "mac chanctx add freq %u width %d ptr %p\n",</div><div class='ctx'> 		   ctx-&gt;def.chan-&gt;center_freq, ctx-&gt;def.width, ctx);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='hunk'>@@ -8723,7 +8871,7 @@ ath10k_mac_op_remove_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct ath10k *ar = hw-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_MAC,</div><div class='del'>-		   "mac chanctx remove freq %u width %d ptr %pK\n",</div><div class='add'>+		   "mac chanctx remove freq %u width %d ptr %p\n",</div><div class='ctx'> 		   ctx-&gt;def.chan-&gt;center_freq, ctx-&gt;def.width, ctx);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='hunk'>@@ -8751,7 +8899,7 @@ ath10k_mac_change_chanctx_cnt_iter(void *data, u8 *mac,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k_mac_change_chanctx_arg *arg = data;</div><div class='ctx'> </div><div class='del'>-	if (rcu_access_pointer(vif-&gt;chanctx_conf) != arg-&gt;ctx)</div><div class='add'>+	if (rcu_access_pointer(vif-&gt;bss_conf.chanctx_conf) != arg-&gt;ctx)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	arg-&gt;n_vifs++;</div><div class='hunk'>@@ -8764,7 +8912,7 @@ ath10k_mac_change_chanctx_fill_iter(void *data, u8 *mac,</div><div class='ctx'> 	struct ath10k_mac_change_chanctx_arg *arg = data;</div><div class='ctx'> 	struct ieee80211_chanctx_conf *ctx;</div><div class='ctx'> </div><div class='del'>-	ctx = rcu_access_pointer(vif-&gt;chanctx_conf);</div><div class='add'>+	ctx = rcu_access_pointer(vif-&gt;bss_conf.chanctx_conf);</div><div class='ctx'> 	if (ctx != arg-&gt;ctx)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -8788,7 +8936,7 @@ ath10k_mac_op_change_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_MAC,</div><div class='del'>-		   "mac chanctx change freq %u width %d ptr %pK changed %x\n",</div><div class='add'>+		   "mac chanctx change freq %u width %d ptr %p changed %x\n",</div><div class='ctx'> 		   ctx-&gt;def.chan-&gt;center_freq, ctx-&gt;def.width, ctx, changed);</div><div class='ctx'> </div><div class='ctx'> 	/* This shouldn't really happen because channel switching should use</div><div class='hunk'>@@ -8837,6 +8985,7 @@ unlock:</div><div class='ctx'> static int</div><div class='ctx'> ath10k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> 				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_bss_conf *link_conf,</div><div class='ctx'> 				 struct ieee80211_chanctx_conf *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = hw-&gt;priv;</div><div class='hunk'>@@ -8846,7 +8995,7 @@ ath10k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_MAC,</div><div class='del'>-		   "mac chanctx assign ptr %pK vdev_id %i\n",</div><div class='add'>+		   "mac chanctx assign ptr %p vdev_id %i\n",</div><div class='ctx'> 		   ctx, arvif-&gt;vdev_id);</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(arvif-&gt;is_started)) {</div><div class='hunk'>@@ -8916,6 +9065,7 @@ err:</div><div class='ctx'> static void</div><div class='ctx'> ath10k_mac_op_unassign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> 				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_bss_conf *link_conf,</div><div class='ctx'> 				   struct ieee80211_chanctx_conf *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = hw-&gt;priv;</div><div class='hunk'>@@ -8925,7 +9075,7 @@ ath10k_mac_op_unassign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_MAC,</div><div class='del'>-		   "mac chanctx unassign ptr %pK vdev_id %i\n",</div><div class='add'>+		   "mac chanctx unassign ptr %p vdev_id %i\n",</div><div class='ctx'> 		   ctx, arvif-&gt;vdev_id);</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(!arvif-&gt;is_started);</div><div class='hunk'>@@ -9022,7 +9172,7 @@ static const struct ath10k_index_vht_data_rate_type supported_vht_mcs_rate_nss1[</div><div class='ctx'> 	{6,  {2633, 2925}, {1215, 1350}, {585,  650} },</div><div class='ctx'> 	{7,  {2925, 3250}, {1350, 1500}, {650,  722} },</div><div class='ctx'> 	{8,  {3510, 3900}, {1620, 1800}, {780,  867} },</div><div class='del'>-	{9,  {3900, 4333}, {1800, 2000}, {780,  867} }</div><div class='add'>+	{9,  {3900, 4333}, {1800, 2000}, {865,  960} }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*MCS parameters with Nss = 2 */</div><div class='hunk'>@@ -9037,7 +9187,7 @@ static const struct ath10k_index_vht_data_rate_type supported_vht_mcs_rate_nss2[</div><div class='ctx'> 	{6,  {5265, 5850}, {2430, 2700}, {1170, 1300} },</div><div class='ctx'> 	{7,  {5850, 6500}, {2700, 3000}, {1300, 1444} },</div><div class='ctx'> 	{8,  {7020, 7800}, {3240, 3600}, {1560, 1733} },</div><div class='del'>-	{9,  {7800, 8667}, {3600, 4000}, {1560, 1733} }</div><div class='add'>+	{9,  {7800, 8667}, {3600, 4000}, {1730, 1920} }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void ath10k_mac_get_rate_flags_ht(struct ath10k *ar, u32 rate, u8 nss, u8 mcs,</div><div class='hunk'>@@ -9328,6 +9478,7 @@ static const struct ieee80211_ops ath10k_ops = {</div><div class='ctx'> 	.stop				= ath10k_stop,</div><div class='ctx'> 	.config				= ath10k_config,</div><div class='ctx'> 	.add_interface			= ath10k_add_interface,</div><div class='add'>+	.update_vif_offload		= ath10k_update_vif_offload,</div><div class='ctx'> 	.remove_interface		= ath10k_remove_interface,</div><div class='ctx'> 	.configure_filter		= ath10k_configure_filter,</div><div class='ctx'> 	.bss_info_changed		= ath10k_bss_info_changed,</div><div class='hunk'>@@ -9350,7 +9501,7 @@ static const struct ieee80211_ops ath10k_ops = {</div><div class='ctx'> 	.reconfig_complete		= ath10k_reconfig_complete,</div><div class='ctx'> 	.get_survey			= ath10k_get_survey,</div><div class='ctx'> 	.set_bitrate_mask		= ath10k_mac_op_set_bitrate_mask,</div><div class='del'>-	.sta_rc_update			= ath10k_sta_rc_update,</div><div class='add'>+	.link_sta_rc_update		= ath10k_sta_rc_update,</div><div class='ctx'> 	.offset_tsf			= ath10k_offset_tsf,</div><div class='ctx'> 	.ampdu_action			= ath10k_ampdu_action,</div><div class='ctx'> 	.get_et_sset_count		= ath10k_debug_get_et_sset_count,</div><div class='hunk'>@@ -9596,7 +9747,7 @@ static const struct ieee80211_iface_limit ath10k_tlv_if_limit_ibss[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* FIXME: This is not thouroughly tested. These combinations may over- or</div><div class='add'>+/* FIXME: This is not thoroughly tested. These combinations may over- or</div><div class='ctx'>  * underestimate hw/fw capabilities.</div><div class='ctx'>  */</div><div class='ctx'> static struct ieee80211_iface_combination ath10k_tlv_if_comb[] = {</div><div class='hunk'>@@ -9836,7 +9987,7 @@ int ath10k_mac_register(struct ath10k *ar)</div><div class='ctx'> 		WLAN_CIPHER_SUITE_BIP_GMAC_128,</div><div class='ctx'> 		WLAN_CIPHER_SUITE_BIP_GMAC_256,</div><div class='ctx'> </div><div class='del'>-		/* Only QCA99x0 and QCA4019 varients support GCMP-128, GCMP-256</div><div class='add'>+		/* Only QCA99x0 and QCA4019 variants support GCMP-128, GCMP-256</div><div class='ctx'> 		 * and CCMP-256 in hardware.</div><div class='ctx'> 		 */</div><div class='ctx'> 		WLAN_CIPHER_SUITE_GCMP,</div><div class='hunk'>@@ -9997,6 +10148,12 @@ int ath10k_mac_register(struct ath10k *ar)</div><div class='ctx'> 	if (test_bit(WMI_SERVICE_TDLS_UAPSD_BUFFER_STA, ar-&gt;wmi.svc_map))</div><div class='ctx'> 		ieee80211_hw_set(ar-&gt;hw, SUPPORTS_TDLS_BUFFER_STA);</div><div class='ctx'> </div><div class='add'>+	if (ath10k_frame_mode == ATH10K_HW_TXRX_ETHERNET) {</div><div class='add'>+		if (ar-&gt;wmi.vdev_param-&gt;tx_encap_type !=</div><div class='add'>+		    WMI_VDEV_PARAM_UNSUPPORTED)</div><div class='add'>+			ieee80211_hw_set(ar-&gt;hw, SUPPORTS_TX_ENCAP_OFFLOAD);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ar-&gt;hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;</div><div class='ctx'> 	ar-&gt;hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;</div><div class='ctx'> 	ar-&gt;hw-&gt;wiphy-&gt;max_remain_on_channel_duration = 5000;</div><div class='hunk'>@@ -10018,6 +10175,10 @@ int ath10k_mac_register(struct ath10k *ar)</div><div class='ctx'> 			      NL80211_EXT_FEATURE_SET_SCAN_DWELL);</div><div class='ctx'> 	wiphy_ext_feature_set(ar-&gt;hw-&gt;wiphy, NL80211_EXT_FEATURE_AQL);</div><div class='ctx'> </div><div class='add'>+	if (ar-&gt;hw_params.mcast_frame_registration)</div><div class='add'>+		wiphy_ext_feature_set(ar-&gt;hw-&gt;wiphy,</div><div class='add'>+				      NL80211_EXT_FEATURE_MULTICAST_REGISTRATIONS);</div><div class='add'>+</div><div class='ctx'> 	if (test_bit(WMI_SERVICE_TX_DATA_ACK_RSSI, ar-&gt;wmi.svc_map) ||</div><div class='ctx'> 	    test_bit(WMI_SERVICE_HTT_MGMT_TX_COMP_VALID_FLAGS, ar-&gt;wmi.svc_map))</div><div class='ctx'> 		wiphy_ext_feature_set(ar-&gt;hw-&gt;wiphy,</div><div class='hunk'>@@ -10182,7 +10343,8 @@ int ath10k_mac_register(struct ath10k *ar)</div><div class='ctx'> 		ar-&gt;hw-&gt;wiphy-&gt;software_iftypes |= BIT(NL80211_IFTYPE_AP_VLAN);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ath_is_world_regd(&amp;ar-&gt;ath_common.regulatory)) {</div><div class='add'>+	if (!ath_is_world_regd(&amp;ar-&gt;ath_common.reg_world_copy) &amp;&amp;</div><div class='add'>+	    !ath_is_world_regd(&amp;ar-&gt;ath_common.regulatory)) {</div><div class='ctx'> 		ret = regulatory_hint(ar-&gt;hw-&gt;wiphy,</div><div class='ctx'> 				      ar-&gt;ath_common.regulatory.alpha2);</div><div class='ctx'> 		if (ret)</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c<br/>index e7fde635e0ee..97b49bf4ad80 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/pci.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/pci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/pci.c</a></div><div class='hunk'>@@ -2,6 +2,8 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2005-2011 Atheros Communications Inc.</div><div class='ctx'>  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.</div><div class='add'>+ * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -62,7 +64,7 @@ static const struct pci_device_id ath10k_pci_id_table[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(ATHEROS, QCA9984_1_0_DEVICE_ID) }, /* PCI-E QCA9984 V1 */</div><div class='ctx'> 	{ PCI_VDEVICE(ATHEROS, QCA9377_1_0_DEVICE_ID) }, /* PCI-E QCA9377 V1 */</div><div class='ctx'> 	{ PCI_VDEVICE(ATHEROS, QCA9887_1_0_DEVICE_ID) }, /* PCI-E QCA9887 */</div><div class='del'>-	{0}</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct ath10k_pci_supp_chip ath10k_pci_supp_chips[] = {</div><div class='hunk'>@@ -590,7 +592,7 @@ skip:</div><div class='ctx'> </div><div class='ctx'> static void ath10k_pci_ps_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ath10k_pci *ar_pci = from_timer(ar_pci, t, ps_timer);</div><div class='add'>+	struct ath10k_pci *ar_pci = timer_container_of(ar_pci, t, ps_timer);</div><div class='ctx'> 	struct ath10k *ar = ar_pci-&gt;ar;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -618,7 +620,7 @@ static void ath10k_pci_sleep_sync(struct ath10k *ar)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;ar_pci-&gt;ps_timer);</div><div class='add'>+	timer_delete_sync(&amp;ar_pci-&gt;ps_timer);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;ar_pci-&gt;ps_lock, flags);</div><div class='ctx'> 	WARN_ON(ar_pci-&gt;ps_wake_refcount &gt; 0);</div><div class='hunk'>@@ -720,7 +722,7 @@ bool ath10k_pci_irq_pending(struct ath10k *ar)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath10k_pci_disable_and_clear_legacy_irq(struct ath10k *ar)</div><div class='add'>+void ath10k_pci_disable_and_clear_intx_irq(struct ath10k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	/* IMPORTANT: INTR_CLR register has to be set after</div><div class='ctx'> 	 * INTR_ENABLE is set to 0, otherwise interrupt can not be</div><div class='hunk'>@@ -738,7 +740,7 @@ void ath10k_pci_disable_and_clear_legacy_irq(struct ath10k *ar)</div><div class='ctx'> 				PCIE_INTR_ENABLE_ADDRESS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath10k_pci_enable_legacy_irq(struct ath10k *ar)</div><div class='add'>+void ath10k_pci_enable_intx_irq(struct ath10k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	ath10k_pci_write32(ar, SOC_CORE_BASE_ADDRESS +</div><div class='ctx'> 			   PCIE_INTR_ENABLE_ADDRESS,</div><div class='hunk'>@@ -843,7 +845,8 @@ void ath10k_pci_rx_post(struct ath10k *ar)</div><div class='ctx'> </div><div class='ctx'> void ath10k_pci_rx_replenish_retry(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ath10k_pci *ar_pci = from_timer(ar_pci, t, rx_post_retry);</div><div class='add'>+	struct ath10k_pci *ar_pci = timer_container_of(ar_pci, t,</div><div class='add'>+						       rx_post_retry);</div><div class='ctx'> 	struct ath10k *ar = ar_pci-&gt;ar;</div><div class='ctx'> </div><div class='ctx'> 	ath10k_pci_rx_post(ar);</div><div class='hunk'>@@ -888,7 +891,7 @@ static u32 ath10k_pci_targ_cpu_to_ce_addr(struct ath10k *ar, u32 addr)</div><div class='ctx'> 	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON_ONCE(!ar_pci-&gt;targ_cpu_to_ce_addr))</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	return ar_pci-&gt;targ_cpu_to_ce_addr(ar, addr);</div><div class='ctx'> }</div><div class='hunk'>@@ -1244,7 +1247,7 @@ static void ath10k_pci_process_htt_rx_cb(struct ath10k_ce_pipe *ce_state,</div><div class='ctx'> 	unsigned int nbytes, max_nbytes, nentries;</div><div class='ctx'> 	int orig_len;</div><div class='ctx'> </div><div class='del'>-	/* No need to aquire ce_lock for CE5, since this is the only place CE5</div><div class='add'>+	/* No need to acquire ce_lock for CE5, since this is the only place CE5</div><div class='ctx'> 	 * is processed other than init and deinit. Before releasing CE5</div><div class='ctx'> 	 * buffers, interrupts are disabled. Thus CE5 access is serialized.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1636,7 +1639,7 @@ static int ath10k_pci_dump_memory_generic(struct ath10k *ar,</div><div class='ctx'> 						      buf,</div><div class='ctx'> 						      current_region-&gt;len);</div><div class='ctx'> </div><div class='del'>-	/* No individiual memory sections defined so we can</div><div class='add'>+	/* No individual memory sections defined so we can</div><div class='ctx'> 	 * copy the entire memory region.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = ath10k_pci_diag_read_mem(ar,</div><div class='hunk'>@@ -1816,7 +1819,7 @@ static void ath10k_pci_rx_retry_sync(struct ath10k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;ar_pci-&gt;rx_post_retry);</div><div class='add'>+	timer_delete_sync(&amp;ar_pci-&gt;rx_post_retry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ath10k_pci_hif_map_service_to_pipe(struct ath10k *ar, u16 service_id,</div><div class='hunk'>@@ -1934,7 +1937,7 @@ static void ath10k_pci_irq_msi_fw_unmask(struct ath10k *ar)</div><div class='ctx'> static void ath10k_pci_irq_disable(struct ath10k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	ath10k_ce_disable_interrupts(ar);</div><div class='del'>-	ath10k_pci_disable_and_clear_legacy_irq(ar);</div><div class='add'>+	ath10k_pci_disable_and_clear_intx_irq(ar);</div><div class='ctx'> 	ath10k_pci_irq_msi_fw_mask(ar);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1948,7 +1951,7 @@ static void ath10k_pci_irq_sync(struct ath10k *ar)</div><div class='ctx'> static void ath10k_pci_irq_enable(struct ath10k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	ath10k_ce_enable_interrupts(ar);</div><div class='del'>-	ath10k_pci_enable_legacy_irq(ar);</div><div class='add'>+	ath10k_pci_enable_intx_irq(ar);</div><div class='ctx'> 	ath10k_pci_irq_msi_fw_unmask(ar);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1963,8 +1966,9 @@ static int ath10k_pci_hif_start(struct ath10k *ar)</div><div class='ctx'> 	ath10k_pci_irq_enable(ar);</div><div class='ctx'> 	ath10k_pci_rx_post(ar);</div><div class='ctx'> </div><div class='del'>-	pcie_capability_write_word(ar_pci-&gt;pdev, PCI_EXP_LNKCTL,</div><div class='del'>-				   ar_pci-&gt;link_ctl);</div><div class='add'>+	pcie_capability_clear_and_set_word(ar_pci-&gt;pdev, PCI_EXP_LNKCTL,</div><div class='add'>+					   PCI_EXP_LNKCTL_ASPMC,</div><div class='add'>+					   ar_pci-&gt;link_ctl &amp; PCI_EXP_LNKCTL_ASPMC);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2666,7 +2670,7 @@ static int ath10k_pci_safe_chip_reset(struct ath10k *ar)</div><div class='ctx'> 	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);</div><div class='ctx'> </div><div class='ctx'> 	if (!ar_pci-&gt;pci_soft_reset)</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	return ar_pci-&gt;pci_soft_reset(ar);</div><div class='ctx'> }</div><div class='hunk'>@@ -2806,7 +2810,7 @@ static int ath10k_pci_chip_reset(struct ath10k *ar)</div><div class='ctx'> 	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(!ar_pci-&gt;pci_hard_reset))</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	return ar_pci-&gt;pci_hard_reset(ar);</div><div class='ctx'> }</div><div class='hunk'>@@ -2821,8 +2825,8 @@ static int ath10k_pci_hif_power_up(struct ath10k *ar,</div><div class='ctx'> </div><div class='ctx'> 	pcie_capability_read_word(ar_pci-&gt;pdev, PCI_EXP_LNKCTL,</div><div class='ctx'> 				  &amp;ar_pci-&gt;link_ctl);</div><div class='del'>-	pcie_capability_write_word(ar_pci-&gt;pdev, PCI_EXP_LNKCTL,</div><div class='del'>-				   ar_pci-&gt;link_ctl &amp; ~PCI_EXP_LNKCTL_ASPMC);</div><div class='add'>+	pcie_capability_clear_word(ar_pci-&gt;pdev, PCI_EXP_LNKCTL,</div><div class='add'>+				   PCI_EXP_LNKCTL_ASPMC);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Bring the target up cleanly.</div><div class='hunk'>@@ -3109,11 +3113,11 @@ static irqreturn_t ath10k_pci_interrupt_handler(int irq, void *arg)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((ar_pci-&gt;oper_irq_mode == ATH10K_PCI_IRQ_LEGACY) &amp;&amp;</div><div class='add'>+	if ((ar_pci-&gt;oper_irq_mode == ATH10K_PCI_IRQ_INTX) &amp;&amp;</div><div class='ctx'> 	    !ath10k_pci_irq_pending(ar))</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-	ath10k_pci_disable_and_clear_legacy_irq(ar);</div><div class='add'>+	ath10k_pci_disable_and_clear_intx_irq(ar);</div><div class='ctx'> 	ath10k_pci_irq_msi_fw_mask(ar);</div><div class='ctx'> 	napi_schedule(&amp;ar-&gt;napi);</div><div class='ctx'> </div><div class='hunk'>@@ -3147,10 +3151,10 @@ static int ath10k_pci_napi_poll(struct napi_struct *ctx, int budget)</div><div class='ctx'> 		 * immediate servicing.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (ath10k_ce_interrupt_summary(ar)) {</div><div class='del'>-			napi_reschedule(ctx);</div><div class='add'>+			napi_schedule(ctx);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		ath10k_pci_enable_legacy_irq(ar);</div><div class='add'>+		ath10k_pci_enable_intx_irq(ar);</div><div class='ctx'> 		ath10k_pci_irq_msi_fw_unmask(ar);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3175,7 +3179,7 @@ static int ath10k_pci_request_irq_msi(struct ath10k *ar)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath10k_pci_request_irq_legacy(struct ath10k *ar)</div><div class='add'>+static int ath10k_pci_request_irq_intx(struct ath10k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -3197,8 +3201,8 @@ static int ath10k_pci_request_irq(struct ath10k *ar)</div><div class='ctx'> 	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);</div><div class='ctx'> </div><div class='ctx'> 	switch (ar_pci-&gt;oper_irq_mode) {</div><div class='del'>-	case ATH10K_PCI_IRQ_LEGACY:</div><div class='del'>-		return ath10k_pci_request_irq_legacy(ar);</div><div class='add'>+	case ATH10K_PCI_IRQ_INTX:</div><div class='add'>+		return ath10k_pci_request_irq_intx(ar);</div><div class='ctx'> 	case ATH10K_PCI_IRQ_MSI:</div><div class='ctx'> 		return ath10k_pci_request_irq_msi(ar);</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -3215,8 +3219,7 @@ static void ath10k_pci_free_irq(struct ath10k *ar)</div><div class='ctx'> </div><div class='ctx'> void ath10k_pci_init_napi(struct ath10k *ar)</div><div class='ctx'> {</div><div class='del'>-	netif_napi_add(&amp;ar-&gt;napi_dev, &amp;ar-&gt;napi, ath10k_pci_napi_poll,</div><div class='del'>-		       ATH10K_NAPI_BUDGET);</div><div class='add'>+	netif_napi_add(ar-&gt;napi_dev, &amp;ar-&gt;napi, ath10k_pci_napi_poll);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath10k_pci_init_irq(struct ath10k *ar)</div><div class='hunk'>@@ -3231,7 +3234,7 @@ static int ath10k_pci_init_irq(struct ath10k *ar)</div><div class='ctx'> 			    ath10k_pci_irq_mode);</div><div class='ctx'> </div><div class='ctx'> 	/* Try MSI */</div><div class='del'>-	if (ath10k_pci_irq_mode != ATH10K_PCI_IRQ_LEGACY) {</div><div class='add'>+	if (ath10k_pci_irq_mode != ATH10K_PCI_IRQ_INTX) {</div><div class='ctx'> 		ar_pci-&gt;oper_irq_mode = ATH10K_PCI_IRQ_MSI;</div><div class='ctx'> 		ret = pci_enable_msi(ar_pci-&gt;pdev);</div><div class='ctx'> 		if (ret == 0)</div><div class='hunk'>@@ -3249,7 +3252,7 @@ static int ath10k_pci_init_irq(struct ath10k *ar)</div><div class='ctx'> 	 * For now, fix the race by repeating the write in below</div><div class='ctx'> 	 * synchronization checking.</div><div class='ctx'> 	 */</div><div class='del'>-	ar_pci-&gt;oper_irq_mode = ATH10K_PCI_IRQ_LEGACY;</div><div class='add'>+	ar_pci-&gt;oper_irq_mode = ATH10K_PCI_IRQ_INTX;</div><div class='ctx'> </div><div class='ctx'> 	ath10k_pci_write32(ar, SOC_CORE_BASE_ADDRESS + PCIE_INTR_ENABLE_ADDRESS,</div><div class='ctx'> 			   PCIE_INTR_FIRMWARE_MASK | PCIE_INTR_CE_MASK_ALL);</div><div class='hunk'>@@ -3257,7 +3260,7 @@ static int ath10k_pci_init_irq(struct ath10k *ar)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath10k_pci_deinit_irq_legacy(struct ath10k *ar)</div><div class='add'>+static void ath10k_pci_deinit_irq_intx(struct ath10k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	ath10k_pci_write32(ar, SOC_CORE_BASE_ADDRESS + PCIE_INTR_ENABLE_ADDRESS,</div><div class='ctx'> 			   0);</div><div class='hunk'>@@ -3268,8 +3271,8 @@ static int ath10k_pci_deinit_irq(struct ath10k *ar)</div><div class='ctx'> 	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);</div><div class='ctx'> </div><div class='ctx'> 	switch (ar_pci-&gt;oper_irq_mode) {</div><div class='del'>-	case ATH10K_PCI_IRQ_LEGACY:</div><div class='del'>-		ath10k_pci_deinit_irq_legacy(ar);</div><div class='add'>+	case ATH10K_PCI_IRQ_INTX:</div><div class='add'>+		ath10k_pci_deinit_irq_intx(ar);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		pci_disable_msi(ar_pci-&gt;pdev);</div><div class='hunk'>@@ -3306,14 +3309,14 @@ int ath10k_pci_wait_for_target_init(struct ath10k *ar)</div><div class='ctx'> 		if (val &amp; FW_IND_INITIALIZED)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (ar_pci-&gt;oper_irq_mode == ATH10K_PCI_IRQ_LEGACY)</div><div class='add'>+		if (ar_pci-&gt;oper_irq_mode == ATH10K_PCI_IRQ_INTX)</div><div class='ctx'> 			/* Fix potential race by repeating CORE_BASE writes */</div><div class='del'>-			ath10k_pci_enable_legacy_irq(ar);</div><div class='add'>+			ath10k_pci_enable_intx_irq(ar);</div><div class='ctx'> </div><div class='ctx'> 		mdelay(10);</div><div class='ctx'> 	} while (time_before(jiffies, timeout));</div><div class='ctx'> </div><div class='del'>-	ath10k_pci_disable_and_clear_legacy_irq(ar);</div><div class='add'>+	ath10k_pci_disable_and_clear_intx_irq(ar);</div><div class='ctx'> 	ath10k_pci_irq_msi_fw_mask(ar);</div><div class='ctx'> </div><div class='ctx'> 	if (val == 0xffffffff) {</div><div class='hunk'>@@ -3393,19 +3396,12 @@ static int ath10k_pci_claim(struct ath10k *ar)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Target expects 32 bit DMA. Enforce it. */</div><div class='del'>-	ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='add'>+	ret = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath10k_err(ar, "failed to set dma mask to 32-bit: %d\n", ret);</div><div class='ctx'> 		goto err_region;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='del'>-	if (ret) {</div><div class='del'>-		ath10k_err(ar, "failed to set consistent dma mask to 32-bit: %d\n",</div><div class='del'>-			   ret);</div><div class='del'>-		goto err_region;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='ctx'> 	/* Arrange for access to Target SoC registers. */</div><div class='hunk'>@@ -3414,15 +3410,12 @@ static int ath10k_pci_claim(struct ath10k *ar)</div><div class='ctx'> 	if (!ar_pci-&gt;mem) {</div><div class='ctx'> 		ath10k_err(ar, "failed to iomap BAR%d\n", BAR_NUM);</div><div class='ctx'> 		ret = -EIO;</div><div class='del'>-		goto err_master;</div><div class='add'>+		goto err_region;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot pci_mem 0x%pK\n", ar_pci-&gt;mem);</div><div class='add'>+	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot pci_mem 0x%p\n", ar_pci-&gt;mem);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-err_master:</div><div class='del'>-	pci_clear_master(pdev);</div><div class='del'>-</div><div class='ctx'> err_region:</div><div class='ctx'> 	pci_release_region(pdev, BAR_NUM);</div><div class='ctx'> </div><div class='hunk'>@@ -3439,7 +3432,6 @@ static void ath10k_pci_release(struct ath10k *ar)</div><div class='ctx'> </div><div class='ctx'> 	pci_iounmap(pdev, ar_pci-&gt;mem);</div><div class='ctx'> 	pci_release_region(pdev, BAR_NUM);</div><div class='del'>-	pci_clear_master(pdev);</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3604,7 +3596,7 @@ static int ath10k_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON(1);</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ar = ath10k_core_create(sizeof(*ar_pci), &amp;pdev-&gt;dev, ATH10K_BUS_PCI,</div><div class='hunk'>@@ -3685,8 +3677,10 @@ static int ath10k_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 			ath10k_pci_soc_read32(ar, SOC_CHIP_ID_ADDRESS);</div><div class='ctx'> 		if (bus_params.chip_id != 0xffffffff) {</div><div class='ctx'> 			if (!ath10k_pci_chip_is_supported(pdev-&gt;device,</div><div class='del'>-							  bus_params.chip_id))</div><div class='add'>+							  bus_params.chip_id)) {</div><div class='add'>+				ret = -ENODEV;</div><div class='ctx'> 				goto err_unsupported;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3697,11 +3691,15 @@ static int ath10k_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bus_params.chip_id = ath10k_pci_soc_read32(ar, SOC_CHIP_ID_ADDRESS);</div><div class='del'>-	if (bus_params.chip_id == 0xffffffff)</div><div class='add'>+	if (bus_params.chip_id == 0xffffffff) {</div><div class='add'>+		ret = -ENODEV;</div><div class='ctx'> 		goto err_unsupported;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!ath10k_pci_chip_is_supported(pdev-&gt;device, bus_params.chip_id))</div><div class='del'>-		goto err_free_irq;</div><div class='add'>+	if (!ath10k_pci_chip_is_supported(pdev-&gt;device, bus_params.chip_id)) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto err_unsupported;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ath10k_core_register(ar, &amp;bus_params);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -3794,18 +3792,22 @@ static struct pci_driver ath10k_pci_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init ath10k_pci_init(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	int ret1, ret2;</div><div class='ctx'> </div><div class='del'>-	ret = pci_register_driver(&amp;ath10k_pci_driver);</div><div class='del'>-	if (ret)</div><div class='add'>+	ret1 = pci_register_driver(&amp;ath10k_pci_driver);</div><div class='add'>+	if (ret1)</div><div class='ctx'> 		printk(KERN_ERR "failed to register ath10k pci driver: %d\n",</div><div class='del'>-		       ret);</div><div class='add'>+		       ret1);</div><div class='ctx'> </div><div class='del'>-	ret = ath10k_ahb_init();</div><div class='del'>-	if (ret)</div><div class='del'>-		printk(KERN_ERR "ahb init failed: %d\n", ret);</div><div class='add'>+	ret2 = ath10k_ahb_init();</div><div class='add'>+	if (ret2)</div><div class='add'>+		printk(KERN_ERR "ahb init failed: %d\n", ret2);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	if (ret1 &amp;&amp; ret2)</div><div class='add'>+		return ret1;</div><div class='add'>+</div><div class='add'>+	/* registered to at least one bus */</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> module_init(ath10k_pci_init);</div><div class='ctx'> </div><div class='hunk'>@@ -3818,7 +3820,7 @@ static void __exit ath10k_pci_exit(void)</div><div class='ctx'> module_exit(ath10k_pci_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Qualcomm Atheros");</div><div class='del'>-MODULE_DESCRIPTION("Driver support for Qualcomm Atheros 802.11ac WLAN PCIe/AHB devices");</div><div class='add'>+MODULE_DESCRIPTION("Driver support for Qualcomm Atheros PCIe/AHB 802.11ac WLAN devices");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> </div><div class='ctx'> /* QCA988x 2.0 firmware files */</div><div class='hunk'>@@ -3826,28 +3828,28 @@ MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_FW_API2_FILE);</div><div class='ctx'> MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_FW_API3_FILE);</div><div class='ctx'> MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_FW_API4_FILE);</div><div class='ctx'> MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_FW_API5_FILE);</div><div class='del'>-MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" QCA988X_HW_2_0_BOARD_DATA_FILE);</div><div class='add'>+MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_BOARD_DATA_FILE);</div><div class='ctx'> MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_BOARD_API2_FILE);</div><div class='ctx'> </div><div class='ctx'> /* QCA9887 1.0 firmware files */</div><div class='ctx'> MODULE_FIRMWARE(QCA9887_HW_1_0_FW_DIR "/" ATH10K_FW_API5_FILE);</div><div class='del'>-MODULE_FIRMWARE(QCA9887_HW_1_0_FW_DIR "/" QCA9887_HW_1_0_BOARD_DATA_FILE);</div><div class='add'>+MODULE_FIRMWARE(QCA9887_HW_1_0_FW_DIR "/" ATH10K_BOARD_DATA_FILE);</div><div class='ctx'> MODULE_FIRMWARE(QCA9887_HW_1_0_FW_DIR "/" ATH10K_BOARD_API2_FILE);</div><div class='ctx'> </div><div class='ctx'> /* QCA6174 2.1 firmware files */</div><div class='ctx'> MODULE_FIRMWARE(QCA6174_HW_2_1_FW_DIR "/" ATH10K_FW_API4_FILE);</div><div class='ctx'> MODULE_FIRMWARE(QCA6174_HW_2_1_FW_DIR "/" ATH10K_FW_API5_FILE);</div><div class='del'>-MODULE_FIRMWARE(QCA6174_HW_2_1_FW_DIR "/" QCA6174_HW_2_1_BOARD_DATA_FILE);</div><div class='add'>+MODULE_FIRMWARE(QCA6174_HW_2_1_FW_DIR "/" ATH10K_BOARD_DATA_FILE);</div><div class='ctx'> MODULE_FIRMWARE(QCA6174_HW_2_1_FW_DIR "/" ATH10K_BOARD_API2_FILE);</div><div class='ctx'> </div><div class='ctx'> /* QCA6174 3.1 firmware files */</div><div class='ctx'> MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_FW_API4_FILE);</div><div class='ctx'> MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_FW_API5_FILE);</div><div class='ctx'> MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_FW_API6_FILE);</div><div class='del'>-MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" QCA6174_HW_3_0_BOARD_DATA_FILE);</div><div class='add'>+MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_BOARD_DATA_FILE);</div><div class='ctx'> MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_BOARD_API2_FILE);</div><div class='ctx'> </div><div class='ctx'> /* QCA9377 1.0 firmware files */</div><div class='ctx'> MODULE_FIRMWARE(QCA9377_HW_1_0_FW_DIR "/" ATH10K_FW_API6_FILE);</div><div class='ctx'> MODULE_FIRMWARE(QCA9377_HW_1_0_FW_DIR "/" ATH10K_FW_API5_FILE);</div><div class='del'>-MODULE_FIRMWARE(QCA9377_HW_1_0_FW_DIR "/" QCA9377_HW_1_0_BOARD_DATA_FILE);</div><div class='add'>+MODULE_FIRMWARE(QCA9377_HW_1_0_FW_DIR "/" ATH10K_BOARD_DATA_FILE);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/pci.h b/drivers/net/wireless/ath/ath10k/pci.h<br/>index 862d0901c5b8..4c3f536f2ea1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/pci.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/pci.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/pci.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/pci.h</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2005-2011 Atheros Communications Inc.</div><div class='ctx'>  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.</div><div class='add'>+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _PCI_H_</div><div class='hunk'>@@ -81,7 +82,7 @@ struct ath10k_pci_pipe {</div><div class='ctx'> 	/* Handle of underlying Copy Engine */</div><div class='ctx'> 	struct ath10k_ce_pipe *ce_hdl;</div><div class='ctx'> </div><div class='del'>-	/* Our pipe number; facilitiates use of pipe_info ptrs. */</div><div class='add'>+	/* Our pipe number; facilitates use of pipe_info ptrs. */</div><div class='ctx'> 	u8 pipe_num;</div><div class='ctx'> </div><div class='ctx'> 	/* Convenience back pointer to hif_ce_state. */</div><div class='hunk'>@@ -100,7 +101,7 @@ struct ath10k_pci_supp_chip {</div><div class='ctx'> </div><div class='ctx'> enum ath10k_pci_irq_mode {</div><div class='ctx'> 	ATH10K_PCI_IRQ_AUTO = 0,</div><div class='del'>-	ATH10K_PCI_IRQ_LEGACY = 1,</div><div class='add'>+	ATH10K_PCI_IRQ_INTX = 1,</div><div class='ctx'> 	ATH10K_PCI_IRQ_MSI = 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -235,7 +236,6 @@ u16 ath10k_pci_hif_get_free_queue_number(struct ath10k *ar, u8 pipe);</div><div class='ctx'> void ath10k_pci_hif_power_down(struct ath10k *ar);</div><div class='ctx'> int ath10k_pci_alloc_pipes(struct ath10k *ar);</div><div class='ctx'> void ath10k_pci_free_pipes(struct ath10k *ar);</div><div class='del'>-void ath10k_pci_free_pipes(struct ath10k *ar);</div><div class='ctx'> void ath10k_pci_rx_replenish_retry(struct timer_list *t);</div><div class='ctx'> void ath10k_pci_ce_deinit(struct ath10k *ar);</div><div class='ctx'> void ath10k_pci_init_napi(struct ath10k *ar);</div><div class='hunk'>@@ -243,9 +243,9 @@ int ath10k_pci_init_pipes(struct ath10k *ar);</div><div class='ctx'> int ath10k_pci_init_config(struct ath10k *ar);</div><div class='ctx'> void ath10k_pci_rx_post(struct ath10k *ar);</div><div class='ctx'> void ath10k_pci_flush(struct ath10k *ar);</div><div class='del'>-void ath10k_pci_enable_legacy_irq(struct ath10k *ar);</div><div class='add'>+void ath10k_pci_enable_intx_irq(struct ath10k *ar);</div><div class='ctx'> bool ath10k_pci_irq_pending(struct ath10k *ar);</div><div class='del'>-void ath10k_pci_disable_and_clear_legacy_irq(struct ath10k *ar);</div><div class='add'>+void ath10k_pci_disable_and_clear_intx_irq(struct ath10k *ar);</div><div class='ctx'> void ath10k_pci_irq_msi_fw_mask(struct ath10k *ar);</div><div class='ctx'> int ath10k_pci_wait_for_target_init(struct ath10k *ar);</div><div class='ctx'> int ath10k_pci_setup_resource(struct ath10k *ar);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/qmi.c b/drivers/net/wireless/ath/ath10k/qmi.c<br/>index 07e478f9a808..8275345631a0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/qmi.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/qmi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/qmi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/qmi.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: ISC</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='hunk'>@@ -13,7 +14,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/net.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/qcom_scm.h&gt;</div><div class='add'>+#include &lt;linux/firmware/qcom/qcom_scm.h&gt;</div><div class='add'>+#include &lt;linux/soc/qcom/smem.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -22,13 +24,17 @@</div><div class='ctx'> </div><div class='ctx'> #define ATH10K_QMI_CLIENT_ID		0x4b4e454c</div><div class='ctx'> #define ATH10K_QMI_TIMEOUT		30</div><div class='add'>+#define SMEM_IMAGE_VERSION_TABLE       469</div><div class='add'>+#define SMEM_IMAGE_TABLE_CNSS_INDEX     13</div><div class='add'>+#define SMEM_IMAGE_VERSION_ENTRY_SIZE	128</div><div class='add'>+#define SMEM_IMAGE_VERSION_NAME_SIZE	75</div><div class='ctx'> </div><div class='ctx'> static int ath10k_qmi_map_msa_permission(struct ath10k_qmi *qmi,</div><div class='ctx'> 					 struct ath10k_msa_mem_info *mem_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct qcom_scm_vmperm dst_perms[3];</div><div class='ctx'> 	struct ath10k *ar = qmi-&gt;ar;</div><div class='del'>-	unsigned int src_perms;</div><div class='add'>+	u64 src_perms;</div><div class='ctx'> 	u32 perm_count;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -60,7 +66,7 @@ static int ath10k_qmi_unmap_msa_permission(struct ath10k_qmi *qmi,</div><div class='ctx'> {</div><div class='ctx'> 	struct qcom_scm_vmperm dst_perms;</div><div class='ctx'> 	struct ath10k *ar = qmi-&gt;ar;</div><div class='del'>-	unsigned int src_perms;</div><div class='add'>+	u64 src_perms;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	src_perms = BIT(QCOM_SCM_VMID_MSS_MSA) | BIT(QCOM_SCM_VMID_WLAN);</div><div class='hunk'>@@ -536,6 +542,33 @@ int ath10k_qmi_wlan_disable(struct ath10k *ar)</div><div class='ctx'> 	return ath10k_qmi_mode_send_sync_msg(ar, QMI_WLFW_OFF_V01);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ath10k_qmi_add_wlan_ver_smem(struct ath10k *ar, const char *fw_build_id)</div><div class='add'>+{</div><div class='add'>+	u8 *table_ptr;</div><div class='add'>+	size_t smem_item_size;</div><div class='add'>+	const u32 smem_img_idx_wlan = SMEM_IMAGE_TABLE_CNSS_INDEX *</div><div class='add'>+				      SMEM_IMAGE_VERSION_ENTRY_SIZE;</div><div class='add'>+</div><div class='add'>+	table_ptr = qcom_smem_get(QCOM_SMEM_HOST_ANY,</div><div class='add'>+				  SMEM_IMAGE_VERSION_TABLE,</div><div class='add'>+				  &amp;smem_item_size);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(table_ptr)) {</div><div class='add'>+		ath10k_err(ar, "smem image version table not found\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (smem_img_idx_wlan + SMEM_IMAGE_VERSION_ENTRY_SIZE &gt;</div><div class='add'>+	    smem_item_size) {</div><div class='add'>+		ath10k_err(ar, "smem block size too small: %zu\n",</div><div class='add'>+			   smem_item_size);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	strscpy(table_ptr + smem_img_idx_wlan, fw_build_id,</div><div class='add'>+		SMEM_IMAGE_VERSION_NAME_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath10k_qmi_cap_send_sync_msg(struct ath10k_qmi *qmi)</div><div class='ctx'> {</div><div class='ctx'> 	struct wlfw_cap_resp_msg_v01 *resp;</div><div class='hunk'>@@ -590,12 +623,12 @@ static int ath10k_qmi_cap_send_sync_msg(struct ath10k_qmi *qmi)</div><div class='ctx'> </div><div class='ctx'> 	if (resp-&gt;fw_version_info_valid) {</div><div class='ctx'> 		qmi-&gt;fw_version = resp-&gt;fw_version_info.fw_version;</div><div class='del'>-		strlcpy(qmi-&gt;fw_build_timestamp, resp-&gt;fw_version_info.fw_build_timestamp,</div><div class='add'>+		strscpy(qmi-&gt;fw_build_timestamp, resp-&gt;fw_version_info.fw_build_timestamp,</div><div class='ctx'> 			sizeof(qmi-&gt;fw_build_timestamp));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (resp-&gt;fw_build_id_valid)</div><div class='del'>-		strlcpy(qmi-&gt;fw_build_id, resp-&gt;fw_build_id,</div><div class='add'>+		strscpy(qmi-&gt;fw_build_id, resp-&gt;fw_build_id,</div><div class='ctx'> 			MAX_BUILD_ID_LEN + 1);</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(ATH10K_SNOC_FLAG_REGISTERED, &amp;ar_snoc-&gt;flags)) {</div><div class='hunk'>@@ -606,6 +639,9 @@ static int ath10k_qmi_cap_send_sync_msg(struct ath10k_qmi *qmi)</div><div class='ctx'> 			    qmi-&gt;fw_version, qmi-&gt;fw_build_timestamp, qmi-&gt;fw_build_id);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (resp-&gt;fw_build_id_valid)</div><div class='add'>+		ath10k_qmi_add_wlan_ver_smem(ar, qmi-&gt;fw_build_id);</div><div class='add'>+</div><div class='ctx'> 	kfree(resp);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -618,7 +654,7 @@ static int ath10k_qmi_host_cap_send_sync(struct ath10k_qmi *qmi)</div><div class='ctx'> {</div><div class='ctx'> 	struct wlfw_host_cap_resp_msg_v01 resp = {};</div><div class='ctx'> 	struct wlfw_host_cap_req_msg_v01 req = {};</div><div class='del'>-	struct qmi_elem_info *req_ei;</div><div class='add'>+	const struct qmi_elem_info *req_ei;</div><div class='ctx'> 	struct ath10k *ar = qmi-&gt;ar;</div><div class='ctx'> 	struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);</div><div class='ctx'> 	struct qmi_txn txn;</div><div class='hunk'>@@ -792,7 +828,7 @@ static void ath10k_qmi_event_server_arrive(struct ath10k_qmi *qmi)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * HACK: sleep for a while inbetween receiving the msa info response</div><div class='add'>+	 * HACK: sleep for a while between receiving the msa info response</div><div class='ctx'> 	 * and the XPU update to prevent SDM845 from crashing due to a security</div><div class='ctx'> 	 * violation, when running MPSS.AT.4.0.c2-01184-SDM845_GEN_PACK-1.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -864,7 +900,8 @@ static void ath10k_qmi_event_server_exit(struct ath10k_qmi *qmi)</div><div class='ctx'> </div><div class='ctx'> 	ath10k_qmi_remove_msa_permission(qmi);</div><div class='ctx'> 	ath10k_core_free_board_files(ar);</div><div class='del'>-	if (!test_bit(ATH10K_SNOC_FLAG_UNREGISTERING, &amp;ar_snoc-&gt;flags))</div><div class='add'>+	if (!test_bit(ATH10K_SNOC_FLAG_UNREGISTERING, &amp;ar_snoc-&gt;flags) &amp;&amp;</div><div class='add'>+	    !test_bit(ATH10K_SNOC_FLAG_MODEM_STOPPED, &amp;ar_snoc-&gt;flags))</div><div class='ctx'> 		ath10k_snoc_fw_crashed_dump(ar);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_snoc_fw_indication(ar, ATH10K_QMI_EVENT_FW_DOWN_IND);</div><div class='hunk'>@@ -949,7 +986,7 @@ static int ath10k_qmi_new_server(struct qmi_handle *qmi_hdl,</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_QMI, "wifi fw qmi service found\n");</div><div class='ctx'> </div><div class='del'>-	ret = kernel_connect(qmi_hdl-&gt;sock, (struct sockaddr *)&amp;qmi-&gt;sq,</div><div class='add'>+	ret = kernel_connect(qmi_hdl-&gt;sock, (struct sockaddr_unsized *)&amp;qmi-&gt;sq,</div><div class='ctx'> 			     sizeof(qmi-&gt;sq), 0);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath10k_err(ar, "failed to connect to a remote QMI service port\n");</div><div class='hunk'>@@ -1003,6 +1040,10 @@ static void ath10k_qmi_driver_event_work(struct work_struct *work)</div><div class='ctx'> 		switch (event-&gt;type) {</div><div class='ctx'> 		case ATH10K_QMI_EVENT_SERVER_ARRIVE:</div><div class='ctx'> 			ath10k_qmi_event_server_arrive(qmi);</div><div class='add'>+			if (qmi-&gt;no_msa_ready_indicator) {</div><div class='add'>+				ath10k_info(ar, "qmi not waiting for msa_ready indicator");</div><div class='add'>+				ath10k_qmi_event_msa_ready(qmi);</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ATH10K_QMI_EVENT_SERVER_EXIT:</div><div class='ctx'> 			ath10k_qmi_event_server_exit(qmi);</div><div class='hunk'>@@ -1011,6 +1052,10 @@ static void ath10k_qmi_driver_event_work(struct work_struct *work)</div><div class='ctx'> 			ath10k_qmi_event_fw_ready_ind(qmi);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ATH10K_QMI_EVENT_MSA_READY_IND:</div><div class='add'>+			if (qmi-&gt;no_msa_ready_indicator) {</div><div class='add'>+				ath10k_warn(ar, "qmi unexpected msa_ready indicator");</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 			ath10k_qmi_event_msa_ready(qmi);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -1040,14 +1085,16 @@ int ath10k_qmi_init(struct ath10k *ar, u32 msa_size)</div><div class='ctx'> 	if (of_property_read_bool(dev-&gt;of_node, "qcom,msa-fixed-perm"))</div><div class='ctx'> 		qmi-&gt;msa_fixed_perm = true;</div><div class='ctx'> </div><div class='add'>+	if (of_property_read_bool(dev-&gt;of_node, "qcom,no-msa-ready-indicator"))</div><div class='add'>+		qmi-&gt;no_msa_ready_indicator = true;</div><div class='add'>+</div><div class='ctx'> 	ret = qmi_handle_init(&amp;qmi-&gt;qmi_hdl,</div><div class='ctx'> 			      WLFW_BDF_DOWNLOAD_REQ_MSG_V01_MAX_MSG_LEN,</div><div class='ctx'> 			      &amp;ath10k_qmi_ops, qmi_msg_handler);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	qmi-&gt;event_wq = alloc_workqueue("ath10k_qmi_driver_event",</div><div class='del'>-					WQ_UNBOUND, 1);</div><div class='add'>+	qmi-&gt;event_wq = alloc_ordered_workqueue("ath10k_qmi_driver_event", 0);</div><div class='ctx'> 	if (!qmi-&gt;event_wq) {</div><div class='ctx'> 		ath10k_err(ar, "failed to allocate workqueue\n");</div><div class='ctx'> 		ret = -EFAULT;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/qmi.h b/drivers/net/wireless/ath/ath10k/qmi.h<br/>index 89464239fe96..0816eb4e4a18 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/qmi.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/qmi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/qmi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/qmi.h</a></div><div class='hunk'>@@ -107,6 +107,7 @@ struct ath10k_qmi {</div><div class='ctx'> 	char fw_build_timestamp[MAX_TIMESTAMP_LEN + 1];</div><div class='ctx'> 	struct ath10k_qmi_cal_data cal_data[MAX_NUM_CAL_V01];</div><div class='ctx'> 	bool msa_fixed_perm;</div><div class='add'>+	bool no_msa_ready_indicator;</div><div class='ctx'> 	enum ath10k_qmi_state state;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.c b/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.c<br/>index 86fcf4e1de5f..0e85c75d2278 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.c</a></div><div class='hunk'>@@ -1,13 +1,14 @@</div><div class='ctx'> // SPDX-License-Identifier: ISC</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/soc/qcom/qmi.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include "qmi_wlfw_v01.h"</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info wlfw_ce_tgt_pipe_cfg_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info wlfw_ce_tgt_pipe_cfg_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_UNSIGNED_4_BYTE,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -56,7 +57,7 @@ static struct qmi_elem_info wlfw_ce_tgt_pipe_cfg_s_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info wlfw_ce_svc_pipe_cfg_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info wlfw_ce_svc_pipe_cfg_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_UNSIGNED_4_BYTE,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -87,7 +88,7 @@ static struct qmi_elem_info wlfw_ce_svc_pipe_cfg_s_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info wlfw_shadow_reg_cfg_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info wlfw_shadow_reg_cfg_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_UNSIGNED_2_BYTE,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -109,7 +110,7 @@ static struct qmi_elem_info wlfw_shadow_reg_cfg_s_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info wlfw_shadow_reg_v2_cfg_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info wlfw_shadow_reg_v2_cfg_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_UNSIGNED_4_BYTE,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -122,7 +123,7 @@ static struct qmi_elem_info wlfw_shadow_reg_v2_cfg_s_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info wlfw_memory_region_info_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info wlfw_memory_region_info_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_UNSIGNED_8_BYTE,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -153,7 +154,7 @@ static struct qmi_elem_info wlfw_memory_region_info_s_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info wlfw_mem_cfg_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info wlfw_mem_cfg_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_UNSIGNED_8_BYTE,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -184,7 +185,7 @@ static struct qmi_elem_info wlfw_mem_cfg_s_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info wlfw_mem_seg_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info wlfw_mem_seg_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_UNSIGNED_4_BYTE,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -225,7 +226,7 @@ static struct qmi_elem_info wlfw_mem_seg_s_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info wlfw_mem_seg_resp_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info wlfw_mem_seg_resp_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_UNSIGNED_8_BYTE,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -256,7 +257,7 @@ static struct qmi_elem_info wlfw_mem_seg_resp_s_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info wlfw_rf_chip_info_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info wlfw_rf_chip_info_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_UNSIGNED_4_BYTE,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -278,7 +279,7 @@ static struct qmi_elem_info wlfw_rf_chip_info_s_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info wlfw_rf_board_info_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info wlfw_rf_board_info_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_UNSIGNED_4_BYTE,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -291,7 +292,7 @@ static struct qmi_elem_info wlfw_rf_board_info_s_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info wlfw_soc_info_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info wlfw_soc_info_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_UNSIGNED_4_BYTE,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -304,7 +305,7 @@ static struct qmi_elem_info wlfw_soc_info_s_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info wlfw_fw_version_info_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info wlfw_fw_version_info_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_UNSIGNED_4_BYTE,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -326,7 +327,7 @@ static struct qmi_elem_info wlfw_fw_version_info_s_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_OPT_FLAG,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -528,7 +529,7 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_ind_register_resp_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_ind_register_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_STRUCT,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -560,15 +561,15 @@ struct qmi_elem_info wlfw_ind_register_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_fw_ready_ind_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_fw_ready_ind_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_msa_ready_ind_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_msa_ready_ind_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_pin_connect_result_ind_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_pin_connect_result_ind_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_OPT_FLAG,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -626,7 +627,7 @@ struct qmi_elem_info wlfw_pin_connect_result_ind_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_wlan_mode_req_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_wlan_mode_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_SIGNED_4_BYTE_ENUM,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -657,7 +658,7 @@ struct qmi_elem_info wlfw_wlan_mode_req_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_wlan_mode_resp_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_wlan_mode_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_STRUCT,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -671,7 +672,7 @@ struct qmi_elem_info wlfw_wlan_mode_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_OPT_FLAG,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -805,7 +806,7 @@ struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_wlan_cfg_resp_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_wlan_cfg_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_STRUCT,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -819,11 +820,11 @@ struct qmi_elem_info wlfw_wlan_cfg_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_cap_req_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_cap_req_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_STRUCT,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -949,7 +950,7 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_UNSIGNED_1_BYTE,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1079,7 +1080,7 @@ struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_bdf_download_resp_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_bdf_download_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_STRUCT,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1093,7 +1094,7 @@ struct qmi_elem_info wlfw_bdf_download_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_cal_report_req_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_cal_report_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_DATA_LEN,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1133,7 +1134,7 @@ struct qmi_elem_info wlfw_cal_report_req_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_cal_report_resp_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_cal_report_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_STRUCT,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1147,7 +1148,7 @@ struct qmi_elem_info wlfw_cal_report_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_initiate_cal_download_ind_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_initiate_cal_download_ind_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_SIGNED_4_BYTE_ENUM,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1160,7 +1161,7 @@ struct qmi_elem_info wlfw_initiate_cal_download_ind_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_cal_download_req_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_cal_download_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_UNSIGNED_1_BYTE,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1272,7 +1273,7 @@ struct qmi_elem_info wlfw_cal_download_req_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_cal_download_resp_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_cal_download_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_STRUCT,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1286,7 +1287,7 @@ struct qmi_elem_info wlfw_cal_download_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_initiate_cal_update_ind_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_initiate_cal_update_ind_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_SIGNED_4_BYTE_ENUM,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1308,7 +1309,7 @@ struct qmi_elem_info wlfw_initiate_cal_update_ind_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_cal_update_req_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_cal_update_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_SIGNED_4_BYTE_ENUM,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1330,7 +1331,7 @@ struct qmi_elem_info wlfw_cal_update_req_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_STRUCT,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1443,7 +1444,7 @@ struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_msa_info_req_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_msa_info_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_UNSIGNED_8_BYTE,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1465,7 +1466,7 @@ struct qmi_elem_info wlfw_msa_info_req_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_msa_info_resp_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_msa_info_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_STRUCT,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1498,11 +1499,11 @@ struct qmi_elem_info wlfw_msa_info_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_msa_ready_req_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_msa_ready_req_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_msa_ready_resp_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_msa_ready_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_STRUCT,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1516,7 +1517,7 @@ struct qmi_elem_info wlfw_msa_ready_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_ini_req_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_ini_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_OPT_FLAG,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1538,7 +1539,7 @@ struct qmi_elem_info wlfw_ini_req_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_ini_resp_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_ini_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_STRUCT,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1552,7 +1553,7 @@ struct qmi_elem_info wlfw_ini_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_athdiag_read_req_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_athdiag_read_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_UNSIGNED_4_BYTE,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1583,7 +1584,7 @@ struct qmi_elem_info wlfw_athdiag_read_req_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_athdiag_read_resp_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_athdiag_read_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_STRUCT,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1624,7 +1625,7 @@ struct qmi_elem_info wlfw_athdiag_read_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_athdiag_write_req_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_athdiag_write_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_UNSIGNED_4_BYTE,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1664,7 +1665,7 @@ struct qmi_elem_info wlfw_athdiag_write_req_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_athdiag_write_resp_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_athdiag_write_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_STRUCT,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1678,7 +1679,7 @@ struct qmi_elem_info wlfw_athdiag_write_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_vbatt_req_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_vbatt_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_UNSIGNED_8_BYTE,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1691,7 +1692,7 @@ struct qmi_elem_info wlfw_vbatt_req_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_vbatt_resp_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_vbatt_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_STRUCT,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1705,7 +1706,7 @@ struct qmi_elem_info wlfw_vbatt_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_mac_addr_req_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_mac_addr_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_OPT_FLAG,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1727,7 +1728,7 @@ struct qmi_elem_info wlfw_mac_addr_req_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_mac_addr_resp_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_mac_addr_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_STRUCT,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1741,7 +1742,7 @@ struct qmi_elem_info wlfw_mac_addr_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_OPT_FLAG,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -1988,7 +1989,7 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_host_cap_8bit_req_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_host_cap_8bit_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_OPT_FLAG,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -2010,7 +2011,7 @@ struct qmi_elem_info wlfw_host_cap_8bit_req_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_host_cap_resp_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_host_cap_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_STRUCT,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -2024,7 +2025,7 @@ struct qmi_elem_info wlfw_host_cap_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_request_mem_ind_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_request_mem_ind_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_DATA_LEN,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -2047,7 +2048,7 @@ struct qmi_elem_info wlfw_request_mem_ind_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_respond_mem_req_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_respond_mem_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_DATA_LEN,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -2070,7 +2071,7 @@ struct qmi_elem_info wlfw_respond_mem_req_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_respond_mem_resp_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_respond_mem_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_STRUCT,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -2084,15 +2085,15 @@ struct qmi_elem_info wlfw_respond_mem_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_mem_ready_ind_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_mem_ready_ind_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_fw_init_done_ind_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_fw_init_done_ind_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_rejuvenate_ind_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_rejuvenate_ind_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_OPT_FLAG,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -2168,11 +2169,11 @@ struct qmi_elem_info wlfw_rejuvenate_ind_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_rejuvenate_ack_req_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_rejuvenate_ack_req_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_rejuvenate_ack_resp_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_rejuvenate_ack_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_STRUCT,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -2186,7 +2187,7 @@ struct qmi_elem_info wlfw_rejuvenate_ack_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_dynamic_feature_mask_req_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_dynamic_feature_mask_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_OPT_FLAG,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -2208,7 +2209,7 @@ struct qmi_elem_info wlfw_dynamic_feature_mask_req_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_dynamic_feature_mask_resp_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_dynamic_feature_mask_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_STRUCT,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -2258,7 +2259,7 @@ struct qmi_elem_info wlfw_dynamic_feature_mask_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_m3_info_req_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_m3_info_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_UNSIGNED_8_BYTE,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -2280,7 +2281,7 @@ struct qmi_elem_info wlfw_m3_info_req_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_m3_info_resp_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_m3_info_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_STRUCT,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='hunk'>@@ -2294,7 +2295,7 @@ struct qmi_elem_info wlfw_m3_info_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct qmi_elem_info wlfw_xo_cal_ind_msg_v01_ei[] = {</div><div class='add'>+const struct qmi_elem_info wlfw_xo_cal_ind_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type      = QMI_UNSIGNED_1_BYTE,</div><div class='ctx'> 		.elem_len       = 1,</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h b/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h<br/>index 4d107e1364a8..9f311f3bc9e7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: ISC */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef WCN3990_QMI_SVC_V01_H</div><div class='hunk'>@@ -215,7 +216,7 @@ struct wlfw_ind_register_req_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_IND_REGISTER_REQ_MSG_V01_MAX_MSG_LEN 50</div><div class='del'>-extern struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_ind_register_resp_msg_v01 {</div><div class='ctx'> 	struct qmi_response_type_v01 resp;</div><div class='hunk'>@@ -224,21 +225,21 @@ struct wlfw_ind_register_resp_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_IND_REGISTER_RESP_MSG_V01_MAX_MSG_LEN 18</div><div class='del'>-extern struct qmi_elem_info wlfw_ind_register_resp_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_ind_register_resp_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_fw_ready_ind_msg_v01 {</div><div class='ctx'> 	char placeholder;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_FW_READY_IND_MSG_V01_MAX_MSG_LEN 0</div><div class='del'>-extern struct qmi_elem_info wlfw_fw_ready_ind_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_fw_ready_ind_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_msa_ready_ind_msg_v01 {</div><div class='ctx'> 	char placeholder;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_MSA_READY_IND_MSG_V01_MAX_MSG_LEN 0</div><div class='del'>-extern struct qmi_elem_info wlfw_msa_ready_ind_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_msa_ready_ind_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_pin_connect_result_ind_msg_v01 {</div><div class='ctx'> 	u8 pwr_pin_result_valid;</div><div class='hunk'>@@ -250,7 +251,7 @@ struct wlfw_pin_connect_result_ind_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_PIN_CONNECT_RESULT_IND_MSG_V01_MAX_MSG_LEN 21</div><div class='del'>-extern struct qmi_elem_info wlfw_pin_connect_result_ind_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_pin_connect_result_ind_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_wlan_mode_req_msg_v01 {</div><div class='ctx'> 	enum wlfw_driver_mode_enum_v01 mode;</div><div class='hunk'>@@ -259,14 +260,14 @@ struct wlfw_wlan_mode_req_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_WLAN_MODE_REQ_MSG_V01_MAX_MSG_LEN 11</div><div class='del'>-extern struct qmi_elem_info wlfw_wlan_mode_req_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_wlan_mode_req_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_wlan_mode_resp_msg_v01 {</div><div class='ctx'> 	struct qmi_response_type_v01 resp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_WLAN_MODE_RESP_MSG_V01_MAX_MSG_LEN 7</div><div class='del'>-extern struct qmi_elem_info wlfw_wlan_mode_resp_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_wlan_mode_resp_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_wlan_cfg_req_msg_v01 {</div><div class='ctx'> 	u8 host_version_valid;</div><div class='hunk'>@@ -286,21 +287,21 @@ struct wlfw_wlan_cfg_req_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_WLAN_CFG_REQ_MSG_V01_MAX_MSG_LEN 803</div><div class='del'>-extern struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_wlan_cfg_resp_msg_v01 {</div><div class='ctx'> 	struct qmi_response_type_v01 resp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_WLAN_CFG_RESP_MSG_V01_MAX_MSG_LEN 7</div><div class='del'>-extern struct qmi_elem_info wlfw_wlan_cfg_resp_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_wlan_cfg_resp_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_cap_req_msg_v01 {</div><div class='ctx'> 	char placeholder;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_CAP_REQ_MSG_V01_MAX_MSG_LEN 0</div><div class='del'>-extern struct qmi_elem_info wlfw_cap_req_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_cap_req_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_cap_resp_msg_v01 {</div><div class='ctx'> 	struct qmi_response_type_v01 resp;</div><div class='hunk'>@@ -319,7 +320,7 @@ struct wlfw_cap_resp_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_CAP_RESP_MSG_V01_MAX_MSG_LEN 207</div><div class='del'>-extern struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_bdf_download_req_msg_v01 {</div><div class='ctx'> 	u8 valid;</div><div class='hunk'>@@ -339,14 +340,14 @@ struct wlfw_bdf_download_req_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_BDF_DOWNLOAD_REQ_MSG_V01_MAX_MSG_LEN 6182</div><div class='del'>-extern struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_bdf_download_resp_msg_v01 {</div><div class='ctx'> 	struct qmi_response_type_v01 resp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_BDF_DOWNLOAD_RESP_MSG_V01_MAX_MSG_LEN 7</div><div class='del'>-extern struct qmi_elem_info wlfw_bdf_download_resp_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_bdf_download_resp_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_cal_report_req_msg_v01 {</div><div class='ctx'> 	u32 meta_data_len;</div><div class='hunk'>@@ -356,21 +357,21 @@ struct wlfw_cal_report_req_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_CAL_REPORT_REQ_MSG_V01_MAX_MSG_LEN 28</div><div class='del'>-extern struct qmi_elem_info wlfw_cal_report_req_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_cal_report_req_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_cal_report_resp_msg_v01 {</div><div class='ctx'> 	struct qmi_response_type_v01 resp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_CAL_REPORT_RESP_MSG_V01_MAX_MSG_LEN 7</div><div class='del'>-extern struct qmi_elem_info wlfw_cal_report_resp_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_cal_report_resp_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_initiate_cal_download_ind_msg_v01 {</div><div class='ctx'> 	enum wlfw_cal_temp_id_enum_v01 cal_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_INITIATE_CAL_DOWNLOAD_IND_MSG_V01_MAX_MSG_LEN 7</div><div class='del'>-extern struct qmi_elem_info wlfw_initiate_cal_download_ind_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_initiate_cal_download_ind_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_cal_download_req_msg_v01 {</div><div class='ctx'> 	u8 valid;</div><div class='hunk'>@@ -388,14 +389,14 @@ struct wlfw_cal_download_req_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_CAL_DOWNLOAD_REQ_MSG_V01_MAX_MSG_LEN 6178</div><div class='del'>-extern struct qmi_elem_info wlfw_cal_download_req_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_cal_download_req_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_cal_download_resp_msg_v01 {</div><div class='ctx'> 	struct qmi_response_type_v01 resp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_CAL_DOWNLOAD_RESP_MSG_V01_MAX_MSG_LEN 7</div><div class='del'>-extern struct qmi_elem_info wlfw_cal_download_resp_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_cal_download_resp_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_initiate_cal_update_ind_msg_v01 {</div><div class='ctx'> 	enum wlfw_cal_temp_id_enum_v01 cal_id;</div><div class='hunk'>@@ -403,7 +404,7 @@ struct wlfw_initiate_cal_update_ind_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_INITIATE_CAL_UPDATE_IND_MSG_V01_MAX_MSG_LEN 14</div><div class='del'>-extern struct qmi_elem_info wlfw_initiate_cal_update_ind_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_initiate_cal_update_ind_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_cal_update_req_msg_v01 {</div><div class='ctx'> 	enum wlfw_cal_temp_id_enum_v01 cal_id;</div><div class='hunk'>@@ -411,7 +412,7 @@ struct wlfw_cal_update_req_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_CAL_UPDATE_REQ_MSG_V01_MAX_MSG_LEN 14</div><div class='del'>-extern struct qmi_elem_info wlfw_cal_update_req_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_cal_update_req_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_cal_update_resp_msg_v01 {</div><div class='ctx'> 	struct qmi_response_type_v01 resp;</div><div class='hunk'>@@ -429,7 +430,7 @@ struct wlfw_cal_update_resp_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_CAL_UPDATE_RESP_MSG_V01_MAX_MSG_LEN 6181</div><div class='del'>-extern struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_msa_info_req_msg_v01 {</div><div class='ctx'> 	u64 msa_addr;</div><div class='hunk'>@@ -437,7 +438,7 @@ struct wlfw_msa_info_req_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_MSA_INFO_REQ_MSG_V01_MAX_MSG_LEN 18</div><div class='del'>-extern struct qmi_elem_info wlfw_msa_info_req_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_msa_info_req_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_msa_info_resp_msg_v01 {</div><div class='ctx'> 	struct qmi_response_type_v01 resp;</div><div class='hunk'>@@ -446,21 +447,21 @@ struct wlfw_msa_info_resp_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_MSA_INFO_RESP_MSG_V01_MAX_MSG_LEN 37</div><div class='del'>-extern struct qmi_elem_info wlfw_msa_info_resp_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_msa_info_resp_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_msa_ready_req_msg_v01 {</div><div class='ctx'> 	char placeholder;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_MSA_READY_REQ_MSG_V01_MAX_MSG_LEN 0</div><div class='del'>-extern struct qmi_elem_info wlfw_msa_ready_req_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_msa_ready_req_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_msa_ready_resp_msg_v01 {</div><div class='ctx'> 	struct qmi_response_type_v01 resp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_MSA_READY_RESP_MSG_V01_MAX_MSG_LEN 7</div><div class='del'>-extern struct qmi_elem_info wlfw_msa_ready_resp_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_msa_ready_resp_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_ini_req_msg_v01 {</div><div class='ctx'> 	u8 enablefwlog_valid;</div><div class='hunk'>@@ -468,14 +469,14 @@ struct wlfw_ini_req_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_INI_REQ_MSG_V01_MAX_MSG_LEN 4</div><div class='del'>-extern struct qmi_elem_info wlfw_ini_req_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_ini_req_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_ini_resp_msg_v01 {</div><div class='ctx'> 	struct qmi_response_type_v01 resp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_INI_RESP_MSG_V01_MAX_MSG_LEN 7</div><div class='del'>-extern struct qmi_elem_info wlfw_ini_resp_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_ini_resp_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_athdiag_read_req_msg_v01 {</div><div class='ctx'> 	u32 offset;</div><div class='hunk'>@@ -484,7 +485,7 @@ struct wlfw_athdiag_read_req_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_ATHDIAG_READ_REQ_MSG_V01_MAX_MSG_LEN 21</div><div class='del'>-extern struct qmi_elem_info wlfw_athdiag_read_req_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_athdiag_read_req_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_athdiag_read_resp_msg_v01 {</div><div class='ctx'> 	struct qmi_response_type_v01 resp;</div><div class='hunk'>@@ -494,7 +495,7 @@ struct wlfw_athdiag_read_resp_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_ATHDIAG_READ_RESP_MSG_V01_MAX_MSG_LEN 6156</div><div class='del'>-extern struct qmi_elem_info wlfw_athdiag_read_resp_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_athdiag_read_resp_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_athdiag_write_req_msg_v01 {</div><div class='ctx'> 	u32 offset;</div><div class='hunk'>@@ -504,28 +505,28 @@ struct wlfw_athdiag_write_req_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_ATHDIAG_WRITE_REQ_MSG_V01_MAX_MSG_LEN 6163</div><div class='del'>-extern struct qmi_elem_info wlfw_athdiag_write_req_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_athdiag_write_req_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_athdiag_write_resp_msg_v01 {</div><div class='ctx'> 	struct qmi_response_type_v01 resp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_ATHDIAG_WRITE_RESP_MSG_V01_MAX_MSG_LEN 7</div><div class='del'>-extern struct qmi_elem_info wlfw_athdiag_write_resp_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_athdiag_write_resp_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_vbatt_req_msg_v01 {</div><div class='ctx'> 	u64 voltage_uv;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_VBATT_REQ_MSG_V01_MAX_MSG_LEN 11</div><div class='del'>-extern struct qmi_elem_info wlfw_vbatt_req_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_vbatt_req_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_vbatt_resp_msg_v01 {</div><div class='ctx'> 	struct qmi_response_type_v01 resp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_VBATT_RESP_MSG_V01_MAX_MSG_LEN 7</div><div class='del'>-extern struct qmi_elem_info wlfw_vbatt_resp_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_vbatt_resp_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_mac_addr_req_msg_v01 {</div><div class='ctx'> 	u8 mac_addr_valid;</div><div class='hunk'>@@ -533,14 +534,14 @@ struct wlfw_mac_addr_req_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_MAC_ADDR_REQ_MSG_V01_MAX_MSG_LEN 9</div><div class='del'>-extern struct qmi_elem_info wlfw_mac_addr_req_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_mac_addr_req_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_mac_addr_resp_msg_v01 {</div><div class='ctx'> 	struct qmi_response_type_v01 resp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_MAC_ADDR_RESP_MSG_V01_MAX_MSG_LEN 7</div><div class='del'>-extern struct qmi_elem_info wlfw_mac_addr_resp_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_mac_addr_resp_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> #define QMI_WLFW_MAX_NUM_GPIO_V01 32</div><div class='ctx'> struct wlfw_host_cap_req_msg_v01 {</div><div class='hunk'>@@ -574,15 +575,15 @@ struct wlfw_host_cap_req_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_HOST_CAP_REQ_MSG_V01_MAX_MSG_LEN 189</div><div class='del'>-extern struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[];</div><div class='del'>-extern struct qmi_elem_info wlfw_host_cap_8bit_req_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_host_cap_8bit_req_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_host_cap_resp_msg_v01 {</div><div class='ctx'> 	struct qmi_response_type_v01 resp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_HOST_CAP_RESP_MSG_V01_MAX_MSG_LEN 7</div><div class='del'>-extern struct qmi_elem_info wlfw_host_cap_resp_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_host_cap_resp_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_request_mem_ind_msg_v01 {</div><div class='ctx'> 	u32 mem_seg_len;</div><div class='hunk'>@@ -590,7 +591,7 @@ struct wlfw_request_mem_ind_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_REQUEST_MEM_IND_MSG_V01_MAX_MSG_LEN 564</div><div class='del'>-extern struct qmi_elem_info wlfw_request_mem_ind_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_request_mem_ind_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_respond_mem_req_msg_v01 {</div><div class='ctx'> 	u32 mem_seg_len;</div><div class='hunk'>@@ -598,28 +599,28 @@ struct wlfw_respond_mem_req_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_RESPOND_MEM_REQ_MSG_V01_MAX_MSG_LEN 260</div><div class='del'>-extern struct qmi_elem_info wlfw_respond_mem_req_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_respond_mem_req_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_respond_mem_resp_msg_v01 {</div><div class='ctx'> 	struct qmi_response_type_v01 resp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_RESPOND_MEM_RESP_MSG_V01_MAX_MSG_LEN 7</div><div class='del'>-extern struct qmi_elem_info wlfw_respond_mem_resp_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_respond_mem_resp_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_mem_ready_ind_msg_v01 {</div><div class='ctx'> 	char placeholder;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_MEM_READY_IND_MSG_V01_MAX_MSG_LEN 0</div><div class='del'>-extern struct qmi_elem_info wlfw_mem_ready_ind_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_mem_ready_ind_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_fw_init_done_ind_msg_v01 {</div><div class='ctx'> 	char placeholder;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_FW_INIT_DONE_IND_MSG_V01_MAX_MSG_LEN 0</div><div class='del'>-extern struct qmi_elem_info wlfw_fw_init_done_ind_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_fw_init_done_ind_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_rejuvenate_ind_msg_v01 {</div><div class='ctx'> 	u8 cause_for_rejuvenation_valid;</div><div class='hunk'>@@ -633,21 +634,21 @@ struct wlfw_rejuvenate_ind_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_REJUVENATE_IND_MSG_V01_MAX_MSG_LEN 144</div><div class='del'>-extern struct qmi_elem_info wlfw_rejuvenate_ind_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_rejuvenate_ind_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_rejuvenate_ack_req_msg_v01 {</div><div class='ctx'> 	char placeholder;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_REJUVENATE_ACK_REQ_MSG_V01_MAX_MSG_LEN 0</div><div class='del'>-extern struct qmi_elem_info wlfw_rejuvenate_ack_req_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_rejuvenate_ack_req_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_rejuvenate_ack_resp_msg_v01 {</div><div class='ctx'> 	struct qmi_response_type_v01 resp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_REJUVENATE_ACK_RESP_MSG_V01_MAX_MSG_LEN 7</div><div class='del'>-extern struct qmi_elem_info wlfw_rejuvenate_ack_resp_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_rejuvenate_ack_resp_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_dynamic_feature_mask_req_msg_v01 {</div><div class='ctx'> 	u8 mask_valid;</div><div class='hunk'>@@ -655,7 +656,7 @@ struct wlfw_dynamic_feature_mask_req_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_DYNAMIC_FEATURE_MASK_REQ_MSG_V01_MAX_MSG_LEN 11</div><div class='del'>-extern struct qmi_elem_info wlfw_dynamic_feature_mask_req_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_dynamic_feature_mask_req_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_dynamic_feature_mask_resp_msg_v01 {</div><div class='ctx'> 	struct qmi_response_type_v01 resp;</div><div class='hunk'>@@ -666,7 +667,7 @@ struct wlfw_dynamic_feature_mask_resp_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_DYNAMIC_FEATURE_MASK_RESP_MSG_V01_MAX_MSG_LEN 29</div><div class='del'>-extern struct qmi_elem_info wlfw_dynamic_feature_mask_resp_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_dynamic_feature_mask_resp_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_m3_info_req_msg_v01 {</div><div class='ctx'> 	u64 addr;</div><div class='hunk'>@@ -674,20 +675,20 @@ struct wlfw_m3_info_req_msg_v01 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_M3_INFO_REQ_MSG_V01_MAX_MSG_LEN 18</div><div class='del'>-extern struct qmi_elem_info wlfw_m3_info_req_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_m3_info_req_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_m3_info_resp_msg_v01 {</div><div class='ctx'> 	struct qmi_response_type_v01 resp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_M3_INFO_RESP_MSG_V01_MAX_MSG_LEN 7</div><div class='del'>-extern struct qmi_elem_info wlfw_m3_info_resp_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_m3_info_resp_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> struct wlfw_xo_cal_ind_msg_v01 {</div><div class='ctx'> 	u8 xo_cal_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define WLFW_XO_CAL_IND_MSG_V01_MAX_MSG_LEN 4</div><div class='del'>-extern struct qmi_elem_info wlfw_xo_cal_ind_msg_v01_ei[];</div><div class='add'>+extern const struct qmi_elem_info wlfw_xo_cal_ind_msg_v01_ei[];</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/rx_desc.h b/drivers/net/wireless/ath/ath10k/rx_desc.h<br/>index f2b6bf8f0d60..564293df1e9a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/rx_desc.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/rx_desc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/rx_desc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/rx_desc.h</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2005-2011 Atheros Communications Inc.</div><div class='ctx'>  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.</div><div class='add'>+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _RX_DESC_H_</div><div class='hunk'>@@ -196,17 +197,31 @@ struct rx_attention {</div><div class='ctx'>  *		descriptor.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-struct rx_frag_info {</div><div class='add'>+struct rx_frag_info_common {</div><div class='ctx'> 	u8 ring0_more_count;</div><div class='ctx'> 	u8 ring1_more_count;</div><div class='ctx'> 	u8 ring2_more_count;</div><div class='ctx'> 	u8 ring3_more_count;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct rx_frag_info_wcn3990 {</div><div class='ctx'> 	u8 ring4_more_count;</div><div class='ctx'> 	u8 ring5_more_count;</div><div class='ctx'> 	u8 ring6_more_count;</div><div class='ctx'> 	u8 ring7_more_count;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct rx_frag_info {</div><div class='add'>+	struct rx_frag_info_common common;</div><div class='add'>+	union {</div><div class='add'>+		struct rx_frag_info_wcn3990 wcn3990;</div><div class='add'>+	} __packed;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct rx_frag_info_v1 {</div><div class='add'>+	struct rx_frag_info_common common;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * ring0_more_count</div><div class='ctx'>  *		Indicates the number of more buffers associated with RX DMA</div><div class='hunk'>@@ -434,7 +449,7 @@ struct rx_mpdu_end {</div><div class='ctx'>  *     - 4 bytes for WEP</div><div class='ctx'>  *     - 8 bytes for TKIP, AES</div><div class='ctx'>  *  [padding to 4 bytes]</div><div class='del'>- *  c) A-MSDU subframe header (14 bytes) if appliable</div><div class='add'>+ *  c) A-MSDU subframe header (14 bytes) if applicable</div><div class='ctx'>  *  d) LLC/SNAP (RFC1042, 8 bytes)</div><div class='ctx'>  *</div><div class='ctx'>  * In case of A-MSDU only first frame in sequence contains (a) and (b).</div><div class='hunk'>@@ -474,11 +489,17 @@ struct rx_msdu_start_wcn3990 {</div><div class='ctx'> struct rx_msdu_start {</div><div class='ctx'> 	struct rx_msdu_start_common common;</div><div class='ctx'> 	union {</div><div class='del'>-		struct rx_msdu_start_qca99x0 qca99x0;</div><div class='ctx'> 		struct rx_msdu_start_wcn3990 wcn3990;</div><div class='ctx'> 	} __packed;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct rx_msdu_start_v1 {</div><div class='add'>+	struct rx_msdu_start_common common;</div><div class='add'>+	union {</div><div class='add'>+		struct rx_msdu_start_qca99x0 qca99x0;</div><div class='add'>+	} __packed;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * msdu_length</div><div class='ctx'>  *		MSDU length in bytes after decapsulation.  This field is</div><div class='hunk'>@@ -612,11 +633,17 @@ struct rx_msdu_end_wcn3990 {</div><div class='ctx'> struct rx_msdu_end {</div><div class='ctx'> 	struct rx_msdu_end_common common;</div><div class='ctx'> 	union {</div><div class='del'>-		struct rx_msdu_end_qca99x0 qca99x0;</div><div class='ctx'> 		struct rx_msdu_end_wcn3990 wcn3990;</div><div class='ctx'> 	} __packed;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct rx_msdu_end_v1 {</div><div class='add'>+	struct rx_msdu_end_common common;</div><div class='add'>+	union {</div><div class='add'>+		struct rx_msdu_end_qca99x0 qca99x0;</div><div class='add'>+	} __packed;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *ip_hdr_chksum</div><div class='ctx'>  *		This can include the IP header checksum or the pseudo header</div><div class='hunk'>@@ -1136,11 +1163,17 @@ struct rx_ppdu_end_wcn3990 {</div><div class='ctx'> struct rx_ppdu_end {</div><div class='ctx'> 	struct rx_ppdu_end_common common;</div><div class='ctx'> 	union {</div><div class='add'>+		struct rx_ppdu_end_wcn3990 wcn3990;</div><div class='add'>+	} __packed;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct rx_ppdu_end_v1 {</div><div class='add'>+	struct rx_ppdu_end_common common;</div><div class='add'>+	union {</div><div class='ctx'> 		struct rx_ppdu_end_qca988x qca988x;</div><div class='ctx'> 		struct rx_ppdu_end_qca6174 qca6174;</div><div class='ctx'> 		struct rx_ppdu_end_qca99x0 qca99x0;</div><div class='ctx'> 		struct rx_ppdu_end_qca9984 qca9984;</div><div class='del'>-		struct rx_ppdu_end_wcn3990 wcn3990;</div><div class='ctx'> 	} __packed;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -1282,7 +1315,19 @@ struct fw_rx_desc_base {</div><div class='ctx'> #define FW_RX_DESC_UDP              (1 &lt;&lt; 6)</div><div class='ctx'> </div><div class='ctx'> struct fw_rx_desc_hl {</div><div class='del'>-	u8 info0;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+		u8 discard:1,</div><div class='add'>+		   forward:1,</div><div class='add'>+		   any_err:1,</div><div class='add'>+		   dup_err:1,</div><div class='add'>+		   reserved:1,</div><div class='add'>+		   inspect:1,</div><div class='add'>+		   extension:2;</div><div class='add'>+		} bits;</div><div class='add'>+		u8 info0;</div><div class='add'>+	} u;</div><div class='add'>+</div><div class='ctx'> 	u8 version;</div><div class='ctx'> 	u8 len;</div><div class='ctx'> 	u8 flags;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c<br/>index b746052737e0..c06d50db40b8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/sdio.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/sdio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/sdio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/sdio.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  * Copyright (c) 2004-2011 Atheros Communications Inc.</div><div class='ctx'>  * Copyright (c) 2011-2012,2017 Qualcomm Atheros, Inc.</div><div class='ctx'>  * Copyright (c) 2016-2017 Erik Stromdahl &lt;erik.stromdahl@gmail.com&gt;</div><div class='add'>+ * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -1057,7 +1058,7 @@ static int ath10k_sdio_mbox_proc_pending_irqs(struct ath10k *ar,</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	/* An optimization to bypass reading the IRQ status registers</div><div class='del'>-	 * unecessarily which can re-wake the target, if upper layers</div><div class='add'>+	 * unnecessarily which can re-wake the target, if upper layers</div><div class='ctx'> 	 * determine that we are in a low-throughput mode, we can rely on</div><div class='ctx'> 	 * taking another interrupt rather than re-checking the status</div><div class='ctx'> 	 * registers which can re-wake the target.</div><div class='hunk'>@@ -1363,8 +1364,11 @@ static void ath10k_rx_indication_async_work(struct work_struct *work)</div><div class='ctx'> 		ep-&gt;ep_ops.ep_rx_complete(ar, skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (test_bit(ATH10K_FLAG_CORE_REGISTERED, &amp;ar-&gt;dev_flags))</div><div class='add'>+	if (test_bit(ATH10K_FLAG_CORE_REGISTERED, &amp;ar-&gt;dev_flags)) {</div><div class='add'>+		local_bh_disable();</div><div class='ctx'> 		napi_schedule(&amp;ar-&gt;napi);</div><div class='add'>+		local_bh_enable();</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath10k_sdio_read_rtc_state(struct ath10k_sdio *ar_sdio, unsigned char *state)</div><div class='hunk'>@@ -1443,7 +1447,8 @@ release:</div><div class='ctx'> </div><div class='ctx'> static void ath10k_sdio_sleep_timer_handler(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ath10k_sdio *ar_sdio = from_timer(ar_sdio, t, sleep_timer);</div><div class='add'>+	struct ath10k_sdio *ar_sdio = timer_container_of(ar_sdio, t,</div><div class='add'>+							 sleep_timer);</div><div class='ctx'> </div><div class='ctx'> 	ar_sdio-&gt;mbox_state = SDIO_MBOX_REQUEST_TO_SLEEP_STATE;</div><div class='ctx'> 	queue_work(ar_sdio-&gt;workqueue, &amp;ar_sdio-&gt;wr_async_work);</div><div class='hunk'>@@ -1617,7 +1622,7 @@ static void ath10k_sdio_hif_power_down(struct ath10k *ar)</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_BOOT, "sdio power off\n");</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;ar_sdio-&gt;sleep_timer);</div><div class='add'>+	timer_delete_sync(&amp;ar_sdio-&gt;sleep_timer);</div><div class='ctx'> 	ath10k_sdio_set_mbox_sleep(ar, true);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable the card */</div><div class='hunk'>@@ -1630,7 +1635,7 @@ static void ath10k_sdio_hif_power_down(struct ath10k *ar)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = mmc_hw_reset(ar_sdio-&gt;func-&gt;card-&gt;host);</div><div class='add'>+	ret = mmc_hw_reset(ar_sdio-&gt;func-&gt;card);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		ath10k_warn(ar, "unable to reset sdio: %d\n", ret);</div><div class='ctx'> </div><div class='hunk'>@@ -1840,7 +1845,7 @@ static int ath10k_sdio_get_htt_tx_complete(struct ath10k *ar)</div><div class='ctx'> 	ret = ath10k_sdio_diag_read32(ar, addr, &amp;val);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath10k_warn(ar,</div><div class='del'>-			    "unable to read hi_acs_flags for htt tx comple : %d\n", ret);</div><div class='add'>+			    "unable to read hi_acs_flags for htt tx complete: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2386,7 +2391,7 @@ static int ath10k_sdio_dump_memory_generic(struct ath10k *ar,</div><div class='ctx'> 						      buf,</div><div class='ctx'> 						      current_region-&gt;len);</div><div class='ctx'> </div><div class='del'>-	/* No individiual memory sections defined so we can</div><div class='add'>+	/* No individual memory sections defined so we can</div><div class='ctx'> 	 * copy the entire memory region.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (fast_dump)</div><div class='hunk'>@@ -2528,8 +2533,7 @@ static int ath10k_sdio_probe(struct sdio_func *func,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(&amp;ar-&gt;napi_dev, &amp;ar-&gt;napi, ath10k_sdio_napi_poll,</div><div class='del'>-		       ATH10K_NAPI_BUDGET);</div><div class='add'>+	netif_napi_add(ar-&gt;napi_dev, &amp;ar-&gt;napi, ath10k_sdio_napi_poll);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_BOOT,</div><div class='ctx'> 		   "sdio new func %d vendor 0x%x device 0x%x block 0x%x/0x%x\n",</div><div class='hunk'>@@ -2645,10 +2649,9 @@ static void ath10k_sdio_remove(struct sdio_func *func)</div><div class='ctx'> </div><div class='ctx'> 	netif_napi_del(&amp;ar-&gt;napi);</div><div class='ctx'> </div><div class='del'>-	ath10k_core_destroy(ar);</div><div class='del'>-</div><div class='del'>-	flush_workqueue(ar_sdio-&gt;workqueue);</div><div class='ctx'> 	destroy_workqueue(ar_sdio-&gt;workqueue);</div><div class='add'>+</div><div class='add'>+	ath10k_core_destroy(ar);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct sdio_device_id ath10k_sdio_devices[] = {</div><div class='hunk'>@@ -2665,29 +2668,10 @@ static struct sdio_driver ath10k_sdio_driver = {</div><div class='ctx'> 	.probe = ath10k_sdio_probe,</div><div class='ctx'> 	.remove = ath10k_sdio_remove,</div><div class='ctx'> 	.drv = {</div><div class='del'>-		.owner = THIS_MODULE,</div><div class='ctx'> 		.pm = ATH10K_SDIO_PM_OPS,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init ath10k_sdio_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = sdio_register_driver(&amp;ath10k_sdio_driver);</div><div class='del'>-	if (ret)</div><div class='del'>-		pr_err("sdio driver registration failed: %d\n", ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ath10k_sdio_exit(void)</div><div class='del'>-{</div><div class='del'>-	sdio_unregister_driver(&amp;ath10k_sdio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ath10k_sdio_init);</div><div class='del'>-module_exit(ath10k_sdio_exit);</div><div class='add'>+module_sdio_driver(ath10k_sdio_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Qualcomm Atheros");</div><div class='ctx'> MODULE_DESCRIPTION("Driver support for Qualcomm Atheros 802.11ac WLAN SDIO devices");</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c<br/>index ea00fbb15601..b3f6424c17d3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/snoc.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/snoc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/snoc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/snoc.c</a></div><div class='hunk'>@@ -12,7 +12,8 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/property.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/consumer.h&gt;</div><div class='del'>-#include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/remoteproc/qcom_rproc.h&gt;</div><div class='add'>+#include &lt;linux/of_reserved_mem.h&gt;</div><div class='ctx'> #include &lt;linux/iommu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ce.h"</div><div class='hunk'>@@ -643,7 +644,8 @@ static void ath10k_snoc_htt_rx_cb(struct ath10k_ce_pipe *ce_state)</div><div class='ctx'> </div><div class='ctx'> static void ath10k_snoc_rx_replenish_retry(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ath10k_snoc *ar_snoc = from_timer(ar_snoc, t, rx_post_retry);</div><div class='add'>+	struct ath10k_snoc *ar_snoc = timer_container_of(ar_snoc, t,</div><div class='add'>+							 rx_post_retry);</div><div class='ctx'> 	struct ath10k *ar = ar_snoc-&gt;ar;</div><div class='ctx'> </div><div class='ctx'> 	ath10k_snoc_rx_post(ar);</div><div class='hunk'>@@ -827,12 +829,20 @@ static void ath10k_snoc_hif_get_default_pipe(struct ath10k *ar,</div><div class='ctx'> </div><div class='ctx'> static inline void ath10k_snoc_irq_disable(struct ath10k *ar)</div><div class='ctx'> {</div><div class='del'>-	ath10k_ce_disable_interrupts(ar);</div><div class='add'>+	struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	for (id = 0; id &lt; CE_COUNT_MAX; id++)</div><div class='add'>+		disable_irq(ar_snoc-&gt;ce_irqs[id].irq_line);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void ath10k_snoc_irq_enable(struct ath10k *ar)</div><div class='ctx'> {</div><div class='del'>-	ath10k_ce_enable_interrupts(ar);</div><div class='add'>+	struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	for (id = 0; id &lt; CE_COUNT_MAX; id++)</div><div class='add'>+		enable_irq(ar_snoc-&gt;ce_irqs[id].irq_line);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath10k_snoc_rx_pipe_cleanup(struct ath10k_snoc_pipe *snoc_pipe)</div><div class='hunk'>@@ -902,7 +912,7 @@ static void ath10k_snoc_buffer_cleanup(struct ath10k *ar)</div><div class='ctx'> 	struct ath10k_snoc_pipe *pipe_info;</div><div class='ctx'> 	int pipe_num;</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;ar_snoc-&gt;rx_post_retry);</div><div class='add'>+	timer_delete_sync(&amp;ar_snoc-&gt;rx_post_retry);</div><div class='ctx'> 	for (pipe_num = 0; pipe_num &lt; CE_COUNT; pipe_num++) {</div><div class='ctx'> 		pipe_info = &amp;ar_snoc-&gt;pipe_info[pipe_num];</div><div class='ctx'> 		ath10k_snoc_rx_pipe_cleanup(pipe_info);</div><div class='hunk'>@@ -926,8 +936,11 @@ static int ath10k_snoc_hif_start(struct ath10k *ar)</div><div class='ctx'> </div><div class='ctx'> 	bitmap_clear(ar_snoc-&gt;pending_ce_irqs, 0, CE_COUNT_MAX);</div><div class='ctx'> </div><div class='add'>+	netif_threaded_enable(ar-&gt;napi_dev);</div><div class='ctx'> 	ath10k_core_napi_enable(ar);</div><div class='del'>-	ath10k_snoc_irq_enable(ar);</div><div class='add'>+	/* IRQs are left enabled when we restart due to a firmware crash */</div><div class='add'>+	if (!test_bit(ATH10K_SNOC_FLAG_RECOVERY, &amp;ar_snoc-&gt;flags))</div><div class='add'>+		ath10k_snoc_irq_enable(ar);</div><div class='ctx'> 	ath10k_snoc_rx_post(ar);</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(ATH10K_SNOC_FLAG_RECOVERY, &amp;ar_snoc-&gt;flags);</div><div class='hunk'>@@ -1088,6 +1101,8 @@ static int ath10k_snoc_hif_power_up(struct ath10k *ar,</div><div class='ctx'> 		goto err_free_rri;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath10k_ce_enable_interrupts(ar);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_free_rri:</div><div class='hunk'>@@ -1241,20 +1256,18 @@ static int ath10k_snoc_napi_poll(struct napi_struct *ctx, int budget)</div><div class='ctx'> </div><div class='ctx'> static void ath10k_snoc_init_napi(struct ath10k *ar)</div><div class='ctx'> {</div><div class='del'>-	netif_napi_add(&amp;ar-&gt;napi_dev, &amp;ar-&gt;napi, ath10k_snoc_napi_poll,</div><div class='del'>-		       ATH10K_NAPI_BUDGET);</div><div class='add'>+	netif_napi_add(ar-&gt;napi_dev, &amp;ar-&gt;napi, ath10k_snoc_napi_poll);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath10k_snoc_request_irq(struct ath10k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);</div><div class='del'>-	int irqflags = IRQF_TRIGGER_RISING;</div><div class='ctx'> 	int ret, id;</div><div class='ctx'> </div><div class='ctx'> 	for (id = 0; id &lt; CE_COUNT_MAX; id++) {</div><div class='ctx'> 		ret = request_irq(ar_snoc-&gt;ce_irqs[id].irq_line,</div><div class='ctx'> 				  ath10k_snoc_per_engine_handler,</div><div class='del'>-				  irqflags, ce_name[id], ar);</div><div class='add'>+				  IRQF_NO_AUTOEN, ce_name[id], ar);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ath10k_err(ar,</div><div class='ctx'> 				   "failed to register IRQ handler for CE %d: %d\n",</div><div class='hunk'>@@ -1305,13 +1318,10 @@ static int ath10k_snoc_resource_init(struct ath10k *ar)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; CE_COUNT; i++) {</div><div class='del'>-		res = platform_get_resource(ar_snoc-&gt;dev, IORESOURCE_IRQ, i);</div><div class='del'>-		if (!res) {</div><div class='del'>-			ath10k_err(ar, "failed to get IRQ%d\n", i);</div><div class='del'>-			ret = -ENODEV;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		ar_snoc-&gt;ce_irqs[i].irq_line = res-&gt;start;</div><div class='add'>+		ret = platform_get_irq(ar_snoc-&gt;dev, i);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		ar_snoc-&gt;ce_irqs[i].irq_line = ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = device_property_read_u32(&amp;pdev-&gt;dev, "qcom,xo-cal-data",</div><div class='hunk'>@@ -1322,10 +1332,8 @@ static int ath10k_snoc_resource_init(struct ath10k *ar)</div><div class='ctx'> 		ath10k_dbg(ar, ATH10K_DBG_SNOC, "xo cal data %x\n",</div><div class='ctx'> 			   ar_snoc-&gt;xo_cal_data);</div><div class='ctx'> 	}</div><div class='del'>-	ret = 0;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath10k_snoc_quirks_init(struct ath10k *ar)</div><div class='hunk'>@@ -1333,6 +1341,9 @@ static void ath10k_snoc_quirks_init(struct ath10k *ar)</div><div class='ctx'> 	struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);</div><div class='ctx'> 	struct device *dev = &amp;ar_snoc-&gt;dev-&gt;dev;</div><div class='ctx'> </div><div class='add'>+	/* ignore errors, keep NULL if there is no property */</div><div class='add'>+	of_property_read_string(dev-&gt;of_node, "firmware-name", &amp;ar-&gt;board_name);</div><div class='add'>+</div><div class='ctx'> 	if (of_property_read_bool(dev-&gt;of_node, "qcom,snoc-host-cap-8bit-quirk"))</div><div class='ctx'> 		set_bit(ATH10K_SNOC_FLAG_8BIT_HOST_CAP_QUIRK, &amp;ar_snoc-&gt;flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -1477,22 +1488,82 @@ void ath10k_snoc_fw_crashed_dump(struct ath10k *ar)</div><div class='ctx'> 	mutex_unlock(&amp;ar-&gt;dump_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ath10k_snoc_modem_notify(struct notifier_block *nb, unsigned long action,</div><div class='add'>+				    void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath10k_snoc *ar_snoc = container_of(nb, struct ath10k_snoc, nb);</div><div class='add'>+	struct ath10k *ar = ar_snoc-&gt;ar;</div><div class='add'>+	struct qcom_ssr_notify_data *notify_data = data;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case QCOM_SSR_BEFORE_POWERUP:</div><div class='add'>+		ath10k_dbg(ar, ATH10K_DBG_SNOC, "received modem starting event\n");</div><div class='add'>+		clear_bit(ATH10K_SNOC_FLAG_MODEM_STOPPED, &amp;ar_snoc-&gt;flags);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case QCOM_SSR_AFTER_POWERUP:</div><div class='add'>+		ath10k_dbg(ar, ATH10K_DBG_SNOC, "received modem running event\n");</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case QCOM_SSR_BEFORE_SHUTDOWN:</div><div class='add'>+		ath10k_dbg(ar, ATH10K_DBG_SNOC, "received modem %s event\n",</div><div class='add'>+			   notify_data-&gt;crashed ? "crashed" : "stopping");</div><div class='add'>+		if (!notify_data-&gt;crashed)</div><div class='add'>+			set_bit(ATH10K_SNOC_FLAG_MODEM_STOPPED, &amp;ar_snoc-&gt;flags);</div><div class='add'>+		else</div><div class='add'>+			clear_bit(ATH10K_SNOC_FLAG_MODEM_STOPPED, &amp;ar_snoc-&gt;flags);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case QCOM_SSR_AFTER_SHUTDOWN:</div><div class='add'>+		ath10k_dbg(ar, ATH10K_DBG_SNOC, "received modem offline event\n");</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		ath10k_err(ar, "received unrecognized event %lu\n", action);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath10k_modem_init(struct ath10k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);</div><div class='add'>+	void *notifier;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ar_snoc-&gt;nb.notifier_call = ath10k_snoc_modem_notify;</div><div class='add'>+</div><div class='add'>+	notifier = qcom_register_ssr_notifier("mpss", &amp;ar_snoc-&gt;nb);</div><div class='add'>+	if (IS_ERR(notifier)) {</div><div class='add'>+		ret = PTR_ERR(notifier);</div><div class='add'>+		ath10k_err(ar, "failed to initialize modem notifier: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar_snoc-&gt;notifier = notifier;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath10k_modem_deinit(struct ath10k *ar)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);</div><div class='add'>+</div><div class='add'>+	ret = qcom_unregister_ssr_notifier(ar_snoc-&gt;notifier, &amp;ar_snoc-&gt;nb);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath10k_err(ar, "error %d unregistering notifier\n", ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath10k_setup_msa_resources(struct ath10k *ar, u32 msa_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = ar-&gt;dev;</div><div class='del'>-	struct device_node *node;</div><div class='ctx'> 	struct resource r;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	node = of_parse_phandle(dev-&gt;of_node, "memory-region", 0);</div><div class='del'>-	if (node) {</div><div class='del'>-		ret = of_address_to_resource(node, 0, &amp;r);</div><div class='del'>-		if (ret) {</div><div class='del'>-			dev_err(dev, "failed to resolve msa fixed region\n");</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-		of_node_put(node);</div><div class='del'>-</div><div class='add'>+	ret = of_reserved_mem_region_to_resource(dev-&gt;of_node, 0, &amp;r);</div><div class='add'>+	if (!ret) {</div><div class='ctx'> 		ar-&gt;msa.paddr = r.start;</div><div class='ctx'> 		ar-&gt;msa.mem_size = resource_size(&amp;r);</div><div class='ctx'> 		ar-&gt;msa.vaddr = devm_memremap(dev, ar-&gt;msa.paddr,</div><div class='hunk'>@@ -1559,10 +1630,10 @@ static int ath10k_fw_init(struct ath10k *ar)</div><div class='ctx'> </div><div class='ctx'> 	ar_snoc-&gt;fw.dev = &amp;pdev-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	iommu_dom = iommu_domain_alloc(&amp;platform_bus_type);</div><div class='del'>-	if (!iommu_dom) {</div><div class='add'>+	iommu_dom = iommu_paging_domain_alloc(ar_snoc-&gt;fw.dev);</div><div class='add'>+	if (IS_ERR(iommu_dom)) {</div><div class='ctx'> 		ath10k_err(ar, "failed to allocate iommu domain\n");</div><div class='del'>-		ret = -ENOMEM;</div><div class='add'>+		ret = PTR_ERR(iommu_dom);</div><div class='ctx'> 		goto err_unregister;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1577,7 +1648,7 @@ static int ath10k_fw_init(struct ath10k *ar)</div><div class='ctx'> </div><div class='ctx'> 	ret = iommu_map(iommu_dom, ar_snoc-&gt;fw.fw_start_addr,</div><div class='ctx'> 			ar-&gt;msa.paddr, ar-&gt;msa.mem_size,</div><div class='del'>-			IOMMU_READ | IOMMU_WRITE);</div><div class='add'>+			IOMMU_READ | IOMMU_WRITE, GFP_KERNEL);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath10k_err(ar, "failed to map firmware region: %d\n", ret);</div><div class='ctx'> 		goto err_iommu_detach;</div><div class='hunk'>@@ -1740,10 +1811,17 @@ static int ath10k_snoc_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err_fw_deinit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = ath10k_modem_init(ar);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_qmi_deinit;</div><div class='add'>+</div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_SNOC, "snoc probe\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+err_qmi_deinit:</div><div class='add'>+	ath10k_qmi_deinit(ar);</div><div class='add'>+</div><div class='ctx'> err_fw_deinit:</div><div class='ctx'> 	ath10k_fw_deinit(ar);</div><div class='ctx'> </div><div class='hunk'>@@ -1771,13 +1849,14 @@ static int ath10k_snoc_free_resources(struct ath10k *ar)</div><div class='ctx'> 	ath10k_fw_deinit(ar);</div><div class='ctx'> 	ath10k_snoc_free_irq(ar);</div><div class='ctx'> 	ath10k_snoc_release_resource(ar);</div><div class='add'>+	ath10k_modem_deinit(ar);</div><div class='ctx'> 	ath10k_qmi_deinit(ar);</div><div class='ctx'> 	ath10k_core_destroy(ar);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath10k_snoc_remove(struct platform_device *pdev)</div><div class='add'>+static void ath10k_snoc_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);</div><div class='hunk'>@@ -1790,8 +1869,6 @@ static int ath10k_snoc_remove(struct platform_device *pdev)</div><div class='ctx'> 		wait_for_completion_timeout(&amp;ar-&gt;driver_recovery, 3 * HZ);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_snoc_free_resources(ar);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath10k_snoc_shutdown(struct platform_device *pdev)</div><div class='hunk'>@@ -1803,11 +1880,11 @@ static void ath10k_snoc_shutdown(struct platform_device *pdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver ath10k_snoc_driver = {</div><div class='del'>-	.probe  = ath10k_snoc_probe,</div><div class='add'>+	.probe = ath10k_snoc_probe,</div><div class='ctx'> 	.remove = ath10k_snoc_remove,</div><div class='del'>-	.shutdown =  ath10k_snoc_shutdown,</div><div class='add'>+	.shutdown = ath10k_snoc_shutdown,</div><div class='ctx'> 	.driver = {</div><div class='del'>-		.name   = "ath10k_snoc",</div><div class='add'>+		.name = "ath10k_snoc",</div><div class='ctx'> 		.of_match_table = ath10k_snoc_dt_match,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/snoc.h b/drivers/net/wireless/ath/ath10k/snoc.h<br/>index 5095d1893681..d4bce1707696 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/snoc.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/snoc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/snoc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/snoc.h</a></div><div class='hunk'>@@ -6,6 +6,8 @@</div><div class='ctx'> #ifndef _SNOC_H_</div><div class='ctx'> #define _SNOC_H_</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "hw.h"</div><div class='ctx'> #include "ce.h"</div><div class='ctx'> #include "qmi.h"</div><div class='hunk'>@@ -45,6 +47,7 @@ struct ath10k_snoc_ce_irq {</div><div class='ctx'> enum ath10k_snoc_flags {</div><div class='ctx'> 	ATH10K_SNOC_FLAG_REGISTERED,</div><div class='ctx'> 	ATH10K_SNOC_FLAG_UNREGISTERING,</div><div class='add'>+	ATH10K_SNOC_FLAG_MODEM_STOPPED,</div><div class='ctx'> 	ATH10K_SNOC_FLAG_RECOVERY,</div><div class='ctx'> 	ATH10K_SNOC_FLAG_8BIT_HOST_CAP_QUIRK,</div><div class='ctx'> };</div><div class='hunk'>@@ -75,6 +78,8 @@ struct ath10k_snoc {</div><div class='ctx'> 	struct clk_bulk_data *clks;</div><div class='ctx'> 	size_t num_clks;</div><div class='ctx'> 	struct ath10k_qmi *qmi;</div><div class='add'>+	struct notifier_block nb;</div><div class='add'>+	void *notifier;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	bool xo_cal_supported;</div><div class='ctx'> 	u32 xo_cal_data;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/spectral.c b/drivers/net/wireless/ath/ath10k/spectral.c<br/>index 68254a967ccb..2240994390ed 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/spectral.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/spectral.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/spectral.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/spectral.c</a></div><div class='hunk'>@@ -384,16 +384,11 @@ static ssize_t write_file_spectral_count(struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = file-&gt;private_data;</div><div class='ctx'> 	unsigned long val;</div><div class='del'>-	char buf[32];</div><div class='del'>-	ssize_t len;</div><div class='del'>-</div><div class='del'>-	len = min(count, sizeof(buf) - 1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, len))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	buf[len] = '\0';</div><div class='del'>-	if (kstrtoul(buf, 0, &amp;val))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ret = kstrtoul_from_user(user_buf, count, 0, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (val &gt; 255)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -440,16 +435,11 @@ static ssize_t write_file_spectral_bins(struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k *ar = file-&gt;private_data;</div><div class='ctx'> 	unsigned long val;</div><div class='del'>-	char buf[32];</div><div class='del'>-	ssize_t len;</div><div class='del'>-</div><div class='del'>-	len = min(count, sizeof(buf) - 1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, len))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	buf[len] = '\0';</div><div class='del'>-	if (kstrtoul(buf, 0, &amp;val))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ret = kstrtoul_from_user(user_buf, count, 0, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (val &lt; 64 || val &gt; SPECTRAL_ATH10K_MAX_NUM_BINS)</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/swap.h b/drivers/net/wireless/ath/ath10k/swap.h<br/>index 25e0ad36ddb1..b4733b5ded34 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/swap.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/swap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/swap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/swap.h</a></div><div class='hunk'>@@ -17,7 +17,7 @@ struct ath10k_fw_file;</div><div class='ctx'> struct ath10k_swap_code_seg_tlv {</div><div class='ctx'> 	__le32 address;</div><div class='ctx'> 	__le32 length;</div><div class='del'>-	u8 data[0];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct ath10k_swap_code_seg_tail {</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/targaddrs.h b/drivers/net/wireless/ath/ath10k/targaddrs.h<br/>index ec556bb88d65..ba37e6c7ced0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/targaddrs.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/targaddrs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/targaddrs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/targaddrs.h</a></div><div class='hunk'>@@ -491,4 +491,7 @@ struct host_interest {</div><div class='ctx'> #define QCA4019_BOARD_DATA_SZ	  12064</div><div class='ctx'> #define QCA4019_BOARD_EXT_DATA_SZ 0</div><div class='ctx'> </div><div class='add'>+#define WCN3990_BOARD_DATA_SZ	  26328</div><div class='add'>+#define WCN3990_BOARD_EXT_DATA_SZ 0</div><div class='add'>+</div><div class='ctx'> #endif /* __TARGADDRS_H__ */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/testmode.c b/drivers/net/wireless/ath/ath10k/testmode.c<br/>index 7a9b9bbcdbfc..d3bd385694d6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/testmode.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/testmode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/testmode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/testmode.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: ISC</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2014-2017 Qualcomm Atheros, Inc.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "testmode.h"</div><div class='hunk'>@@ -10,12 +11,17 @@</div><div class='ctx'> </div><div class='ctx'> #include "debug.h"</div><div class='ctx'> #include "wmi.h"</div><div class='add'>+#include "wmi-tlv.h"</div><div class='ctx'> #include "hif.h"</div><div class='ctx'> #include "hw.h"</div><div class='ctx'> #include "core.h"</div><div class='ctx'> </div><div class='ctx'> #include "testmode_i.h"</div><div class='ctx'> </div><div class='add'>+#define ATH10K_FTM_SEG_NONE			((u32)-1)</div><div class='add'>+#define ATH10K_FTM_SEGHDR_CURRENT_SEQ		GENMASK(3, 0)</div><div class='add'>+#define ATH10K_FTM_SEGHDR_TOTAL_SEGMENTS	GENMASK(7, 4)</div><div class='add'>+</div><div class='ctx'> static const struct nla_policy ath10k_tm_policy[ATH10K_TM_ATTR_MAX + 1] = {</div><div class='ctx'> 	[ATH10K_TM_ATTR_CMD]		= { .type = NLA_U32 },</div><div class='ctx'> 	[ATH10K_TM_ATTR_DATA]		= { .type = NLA_BINARY,</div><div class='hunk'>@@ -25,41 +31,19 @@ static const struct nla_policy ath10k_tm_policy[ATH10K_TM_ATTR_MAX + 1] = {</div><div class='ctx'> 	[ATH10K_TM_ATTR_VERSION_MINOR]	= { .type = NLA_U32 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Returns true if callee consumes the skb and the skb should be discarded.</div><div class='del'>- * Returns false if skb is not used. Does not sleep.</div><div class='del'>- */</div><div class='del'>-bool ath10k_tm_event_wmi(struct ath10k *ar, u32 cmd_id, struct sk_buff *skb)</div><div class='add'>+static void ath10k_tm_event_unsegmented(struct ath10k *ar, u32 cmd_id,</div><div class='add'>+					struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *nl_skb;</div><div class='del'>-	bool consumed;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ath10k_dbg(ar, ATH10K_DBG_TESTMODE,</div><div class='del'>-		   "testmode event wmi cmd_id %d skb %pK skb-&gt;len %d\n",</div><div class='del'>-		   cmd_id, skb, skb-&gt;len);</div><div class='del'>-</div><div class='del'>-	ath10k_dbg_dump(ar, ATH10K_DBG_TESTMODE, NULL, "", skb-&gt;data, skb-&gt;len);</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='del'>-</div><div class='del'>-	if (!ar-&gt;testmode.utf_monitor) {</div><div class='del'>-		consumed = false;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Only testmode.c should be handling events from utf firmware,</div><div class='del'>-	 * otherwise all sort of problems will arise as mac80211 operations</div><div class='del'>-	 * are not initialised.</div><div class='del'>-	 */</div><div class='del'>-	consumed = true;</div><div class='del'>-</div><div class='ctx'> 	nl_skb = cfg80211_testmode_alloc_event_skb(ar-&gt;hw-&gt;wiphy,</div><div class='ctx'> 						   2 * sizeof(u32) + skb-&gt;len,</div><div class='ctx'> 						   GFP_ATOMIC);</div><div class='ctx'> 	if (!nl_skb) {</div><div class='ctx'> 		ath10k_warn(ar,</div><div class='ctx'> 			    "failed to allocate skb for testmode wmi event\n");</div><div class='del'>-		goto out;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = nla_put_u32(nl_skb, ATH10K_TM_ATTR_CMD, ATH10K_TM_CMD_WMI);</div><div class='hunk'>@@ -68,7 +52,7 @@ bool ath10k_tm_event_wmi(struct ath10k *ar, u32 cmd_id, struct sk_buff *skb)</div><div class='ctx'> 			    "failed to put testmode wmi event cmd attribute: %d\n",</div><div class='ctx'> 			    ret);</div><div class='ctx'> 		kfree_skb(nl_skb);</div><div class='del'>-		goto out;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = nla_put_u32(nl_skb, ATH10K_TM_ATTR_WMI_CMDID, cmd_id);</div><div class='hunk'>@@ -77,7 +61,7 @@ bool ath10k_tm_event_wmi(struct ath10k *ar, u32 cmd_id, struct sk_buff *skb)</div><div class='ctx'> 			    "failed to put testmode wmi event cmd_id: %d\n",</div><div class='ctx'> 			    ret);</div><div class='ctx'> 		kfree_skb(nl_skb);</div><div class='del'>-		goto out;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = nla_put(nl_skb, ATH10K_TM_ATTR_DATA, skb-&gt;len, skb-&gt;data);</div><div class='hunk'>@@ -86,10 +70,122 @@ bool ath10k_tm_event_wmi(struct ath10k *ar, u32 cmd_id, struct sk_buff *skb)</div><div class='ctx'> 			    "failed to copy skb to testmode wmi event: %d\n",</div><div class='ctx'> 			    ret);</div><div class='ctx'> 		kfree_skb(nl_skb);</div><div class='del'>-		goto out;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cfg80211_testmode_event(nl_skb, GFP_ATOMIC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath10k_tm_event_segmented(struct ath10k *ar, u32 cmd_id, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct wmi_ftm_cmd *ftm = (struct wmi_ftm_cmd *)skb-&gt;data;</div><div class='add'>+	u8 total_segments, current_seq;</div><div class='add'>+	struct sk_buff *nl_skb;</div><div class='add'>+	u8 const *buf_pos;</div><div class='add'>+	u16 datalen;</div><div class='add'>+	u32 data_pos;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &lt; sizeof(*ftm)) {</div><div class='add'>+		ath10k_warn(ar, "Invalid ftm event length: %d\n", skb-&gt;len);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	current_seq = FIELD_GET(ATH10K_FTM_SEGHDR_CURRENT_SEQ,</div><div class='add'>+				__le32_to_cpu(ftm-&gt;seg_hdr.segmentinfo));</div><div class='add'>+	total_segments = FIELD_GET(ATH10K_FTM_SEGHDR_TOTAL_SEGMENTS,</div><div class='add'>+				   __le32_to_cpu(ftm-&gt;seg_hdr.segmentinfo));</div><div class='add'>+	datalen = skb-&gt;len - sizeof(*ftm);</div><div class='add'>+	buf_pos = ftm-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (current_seq == 0) {</div><div class='add'>+		ar-&gt;testmode.expected_seq = 0;</div><div class='add'>+		ar-&gt;testmode.data_pos = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data_pos = ar-&gt;testmode.data_pos;</div><div class='add'>+</div><div class='add'>+	if ((data_pos + datalen) &gt; ATH_FTM_EVENT_MAX_BUF_LENGTH) {</div><div class='add'>+		ath10k_warn(ar, "Invalid ftm event length at %u: %u\n",</div><div class='add'>+			    data_pos, datalen);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;ar-&gt;testmode.eventdata[data_pos], buf_pos, datalen);</div><div class='add'>+	data_pos += datalen;</div><div class='add'>+</div><div class='add'>+	if (++ar-&gt;testmode.expected_seq != total_segments) {</div><div class='add'>+		ar-&gt;testmode.data_pos = data_pos;</div><div class='add'>+		ath10k_dbg(ar, ATH10K_DBG_TESTMODE, "partial data received %u/%u\n",</div><div class='add'>+			   current_seq + 1, total_segments);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath10k_dbg(ar, ATH10K_DBG_TESTMODE, "total data length %u\n", data_pos);</div><div class='add'>+</div><div class='add'>+	nl_skb = cfg80211_testmode_alloc_event_skb(ar-&gt;hw-&gt;wiphy,</div><div class='add'>+						   2 * sizeof(u32) + data_pos,</div><div class='add'>+						   GFP_ATOMIC);</div><div class='add'>+	if (!nl_skb) {</div><div class='add'>+		ath10k_warn(ar, "failed to allocate skb for testmode wmi event\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = nla_put_u32(nl_skb, ATH10K_TM_ATTR_CMD, ATH10K_TM_CMD_TLV);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath10k_warn(ar, "failed to put testmode wmi event attribute: %d\n", ret);</div><div class='add'>+		kfree_skb(nl_skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = nla_put_u32(nl_skb, ATH10K_TM_ATTR_WMI_CMDID, cmd_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath10k_warn(ar, "failed to put testmode wmi event cmd_id: %d\n", ret);</div><div class='add'>+		kfree_skb(nl_skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = nla_put(nl_skb, ATH10K_TM_ATTR_DATA, data_pos, &amp;ar-&gt;testmode.eventdata[0]);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath10k_warn(ar, "failed to copy skb to testmode wmi event: %d\n", ret);</div><div class='add'>+		kfree_skb(nl_skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cfg80211_testmode_event(nl_skb, GFP_ATOMIC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Returns true if callee consumes the skb and the skb should be discarded.</div><div class='add'>+ * Returns false if skb is not used. Does not sleep.</div><div class='add'>+ */</div><div class='add'>+bool ath10k_tm_event_wmi(struct ath10k *ar, u32 cmd_id, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	bool consumed;</div><div class='add'>+</div><div class='add'>+	ath10k_dbg(ar, ATH10K_DBG_TESTMODE,</div><div class='add'>+		   "testmode event wmi cmd_id %d skb %p skb-&gt;len %d\n",</div><div class='add'>+		   cmd_id, skb, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	ath10k_dbg_dump(ar, ATH10K_DBG_TESTMODE, NULL, "", skb-&gt;data, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	if (!ar-&gt;testmode.utf_monitor) {</div><div class='add'>+		consumed = false;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Only testmode.c should be handling events from utf firmware,</div><div class='add'>+	 * otherwise all sort of problems will arise as mac80211 operations</div><div class='add'>+	 * are not initialised.</div><div class='add'>+	 */</div><div class='add'>+	consumed = true;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;testmode.expected_seq != ATH10K_FTM_SEG_NONE)</div><div class='add'>+		ath10k_tm_event_segmented(ar, cmd_id, skb);</div><div class='add'>+	else</div><div class='add'>+		ath10k_tm_event_unsegmented(ar, cmd_id, skb);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='hunk'>@@ -281,12 +377,18 @@ static int ath10k_tm_cmd_utf_start(struct ath10k *ar, struct nlattr *tb[])</div><div class='ctx'> 		goto err_release_utf_mode_fw;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ar-&gt;testmode.eventdata = kzalloc(ATH_FTM_EVENT_MAX_BUF_LENGTH, GFP_KERNEL);</div><div class='add'>+	if (!ar-&gt;testmode.eventdata) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_power_down;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = ath10k_core_start(ar, ATH10K_FIRMWARE_MODE_UTF,</div><div class='ctx'> 				&amp;ar-&gt;testmode.utf_mode_fw);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath10k_err(ar, "failed to start core (testmode): %d\n", ret);</div><div class='ctx'> 		ar-&gt;state = ATH10K_STATE_OFF;</div><div class='del'>-		goto err_power_down;</div><div class='add'>+		goto err_release_eventdata;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;state = ATH10K_STATE_UTF;</div><div class='hunk'>@@ -302,6 +404,10 @@ static int ath10k_tm_cmd_utf_start(struct ath10k *ar, struct nlattr *tb[])</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+err_release_eventdata:</div><div class='add'>+	kfree(ar-&gt;testmode.eventdata);</div><div class='add'>+	ar-&gt;testmode.eventdata = NULL;</div><div class='add'>+</div><div class='ctx'> err_power_down:</div><div class='ctx'> 	ath10k_hif_power_down(ar);</div><div class='ctx'> </div><div class='hunk'>@@ -341,6 +447,9 @@ static void __ath10k_tm_cmd_utf_stop(struct ath10k *ar)</div><div class='ctx'> 	release_firmware(ar-&gt;testmode.utf_mode_fw.fw_file.firmware);</div><div class='ctx'> 	ar-&gt;testmode.utf_mode_fw.fw_file.firmware = NULL;</div><div class='ctx'> </div><div class='add'>+	kfree(ar-&gt;testmode.eventdata);</div><div class='add'>+	ar-&gt;testmode.eventdata = NULL;</div><div class='add'>+</div><div class='ctx'> 	ar-&gt;state = ATH10K_STATE_OFF;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -397,7 +506,7 @@ static int ath10k_tm_cmd_wmi(struct ath10k *ar, struct nlattr *tb[])</div><div class='ctx'> 	cmd_id = nla_get_u32(tb[ATH10K_TM_ATTR_WMI_CMDID]);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_TESTMODE,</div><div class='del'>-		   "testmode cmd wmi cmd_id %d buf %pK buf_len %d\n",</div><div class='add'>+		   "testmode cmd wmi cmd_id %d buf %p buf_len %d\n",</div><div class='ctx'> 		   cmd_id, buf, buf_len);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg_dump(ar, ATH10K_DBG_TESTMODE, NULL, "", buf, buf_len);</div><div class='hunk'>@@ -424,6 +533,85 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ath10k_tm_cmd_tlv(struct ath10k *ar, struct nlattr *tb[])</div><div class='add'>+{</div><div class='add'>+	u16 total_bytes, num_segments;</div><div class='add'>+	u32 cmd_id, buf_len;</div><div class='add'>+	u8 segnumber = 0;</div><div class='add'>+	u8 *bufpos;</div><div class='add'>+	void *buf;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;state != ATH10K_STATE_UTF) {</div><div class='add'>+		ret = -ENETDOWN;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buf = nla_data(tb[ATH10K_TM_ATTR_DATA]);</div><div class='add'>+	buf_len = nla_len(tb[ATH10K_TM_ATTR_DATA]);</div><div class='add'>+	cmd_id = WMI_PDEV_UTF_CMDID;</div><div class='add'>+</div><div class='add'>+	ath10k_dbg(ar, ATH10K_DBG_TESTMODE,</div><div class='add'>+		   "cmd wmi ftm cmd_id %d buffer length %d\n",</div><div class='add'>+		   cmd_id, buf_len);</div><div class='add'>+	ath10k_dbg_dump(ar, ATH10K_DBG_TESTMODE, NULL, "", buf, buf_len);</div><div class='add'>+</div><div class='add'>+	bufpos = buf;</div><div class='add'>+	total_bytes = buf_len;</div><div class='add'>+	num_segments = total_bytes / MAX_WMI_UTF_LEN;</div><div class='add'>+	ar-&gt;testmode.expected_seq = 0;</div><div class='add'>+</div><div class='add'>+	if (buf_len - (num_segments * MAX_WMI_UTF_LEN))</div><div class='add'>+		num_segments++;</div><div class='add'>+</div><div class='add'>+	while (buf_len) {</div><div class='add'>+		u16 chunk_len = min_t(u16, buf_len, MAX_WMI_UTF_LEN);</div><div class='add'>+		struct wmi_ftm_cmd *ftm_cmd;</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+		u32 hdr_info;</div><div class='add'>+		u8 seginfo;</div><div class='add'>+</div><div class='add'>+		skb = ath10k_wmi_alloc_skb(ar, (chunk_len +</div><div class='add'>+					   sizeof(struct wmi_ftm_cmd)));</div><div class='add'>+		if (!skb) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ftm_cmd = (struct wmi_ftm_cmd *)skb-&gt;data;</div><div class='add'>+		hdr_info = FIELD_PREP(WMI_TLV_TAG, WMI_TLV_TAG_ARRAY_BYTE) |</div><div class='add'>+			   FIELD_PREP(WMI_TLV_LEN, (chunk_len +</div><div class='add'>+				      sizeof(struct wmi_ftm_seg_hdr)));</div><div class='add'>+		ftm_cmd-&gt;tlv_header = __cpu_to_le32(hdr_info);</div><div class='add'>+		ftm_cmd-&gt;seg_hdr.len = __cpu_to_le32(total_bytes);</div><div class='add'>+		ftm_cmd-&gt;seg_hdr.msgref = __cpu_to_le32(ar-&gt;testmode.ftm_msgref);</div><div class='add'>+		seginfo = FIELD_PREP(ATH10K_FTM_SEGHDR_TOTAL_SEGMENTS, num_segments) |</div><div class='add'>+			  FIELD_PREP(ATH10K_FTM_SEGHDR_CURRENT_SEQ, segnumber);</div><div class='add'>+		ftm_cmd-&gt;seg_hdr.segmentinfo = __cpu_to_le32(seginfo);</div><div class='add'>+		segnumber++;</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;ftm_cmd-&gt;data, bufpos, chunk_len);</div><div class='add'>+</div><div class='add'>+		ret = ath10k_wmi_cmd_send(ar, skb, cmd_id);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath10k_warn(ar, "failed to send wmi ftm command: %d\n", ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buf_len -= chunk_len;</div><div class='add'>+		bufpos += chunk_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;testmode.ftm_msgref++;</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int ath10k_tm_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 		  void *data, int len)</div><div class='ctx'> {</div><div class='hunk'>@@ -439,9 +627,14 @@ int ath10k_tm_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	if (!tb[ATH10K_TM_ATTR_CMD])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	ar-&gt;testmode.expected_seq = ATH10K_FTM_SEG_NONE;</div><div class='add'>+</div><div class='ctx'> 	switch (nla_get_u32(tb[ATH10K_TM_ATTR_CMD])) {</div><div class='ctx'> 	case ATH10K_TM_CMD_GET_VERSION:</div><div class='del'>-		return ath10k_tm_cmd_get_version(ar, tb);</div><div class='add'>+		if (!tb[ATH10K_TM_ATTR_DATA])</div><div class='add'>+			return ath10k_tm_cmd_get_version(ar, tb);</div><div class='add'>+		else /* ATH10K_TM_CMD_TLV */</div><div class='add'>+			return ath10k_tm_cmd_tlv(ar, tb);</div><div class='ctx'> 	case ATH10K_TM_CMD_UTF_START:</div><div class='ctx'> 		return ath10k_tm_cmd_utf_start(ar, tb);</div><div class='ctx'> 	case ATH10K_TM_CMD_UTF_STOP:</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/testmode_i.h b/drivers/net/wireless/ath/ath10k/testmode_i.h<br/>index ee1cb27c1d60..1603f5276682 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/testmode_i.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/testmode_i.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/testmode_i.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/testmode_i.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: ISC */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2014,2017 Qualcomm Atheros, Inc.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* "API" level of the ath10k testmode interface. Bump it after every</div><div class='hunk'>@@ -14,6 +15,7 @@</div><div class='ctx'> #define ATH10K_TESTMODE_VERSION_MINOR 0</div><div class='ctx'> </div><div class='ctx'> #define ATH10K_TM_DATA_MAX_LEN		5000</div><div class='add'>+#define ATH_FTM_EVENT_MAX_BUF_LENGTH	2048</div><div class='ctx'> </div><div class='ctx'> enum ath10k_tm_attr {</div><div class='ctx'> 	__ATH10K_TM_ATTR_INVALID	= 0,</div><div class='hunk'>@@ -57,4 +59,17 @@ enum ath10k_tm_cmd {</div><div class='ctx'> 	 * ATH10K_TM_ATTR_DATA.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ATH10K_TM_CMD_WMI = 3,</div><div class='add'>+</div><div class='add'>+	/* The command used to transmit a test command to the firmware</div><div class='add'>+	 * and the event to receive test events from the firmware. The data</div><div class='add'>+	 * received only contain the TLV payload, need to add the tlv header</div><div class='add'>+	 * and send the cmd to firmware with command id WMI_PDEV_UTF_CMDID.</div><div class='add'>+	 * The data payload size could be large and the driver needs to</div><div class='add'>+	 * send segmented data to firmware.</div><div class='add'>+	 *</div><div class='add'>+	 * This legacy testmode command shares the same value as the get-version</div><div class='add'>+	 * command. To distinguish between them, we check whether the data attribute</div><div class='add'>+	 * is present.</div><div class='add'>+	 */</div><div class='add'>+	ATH10K_TM_CMD_TLV = ATH10K_TM_CMD_GET_VERSION,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/thermal.c b/drivers/net/wireless/ath/ath10k/thermal.c<br/>index 36c9a1364253..8b15ec07b107 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/thermal.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/thermal.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/thermal.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/thermal.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: ISC</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2014-2015 Qualcomm Atheros, Inc.</div><div class='add'>+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='hunk'>@@ -98,8 +99,8 @@ static ssize_t ath10k_thermal_show_temp(struct device *dev,</div><div class='ctx'> 	temperature = ar-&gt;thermal.temperature;</div><div class='ctx'> 	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> </div><div class='del'>-	/* display in millidegree celcius */</div><div class='del'>-	ret = snprintf(buf, PAGE_SIZE, "%d\n", temperature * 1000);</div><div class='add'>+	/* display in millidegree celsius */</div><div class='add'>+	ret = sysfs_emit(buf, "%d\n", temperature * 1000);</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/thermal.h b/drivers/net/wireless/ath/ath10k/thermal.h<br/>index 5fdb020f4da3..1f4de9fbf2b3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/thermal.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/thermal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/thermal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/thermal.h</a></div><div class='hunk'>@@ -19,7 +19,7 @@ struct ath10k_thermal {</div><div class='ctx'> 	/* protected by conf_mutex */</div><div class='ctx'> 	u32 throttle_state;</div><div class='ctx'> 	u32 quiet_period;</div><div class='del'>-	/* temperature value in Celcius degree</div><div class='add'>+	/* temperature value in Celsius degree</div><div class='ctx'> 	 * protected by data_lock</div><div class='ctx'> 	 */</div><div class='ctx'> 	int temperature;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/trace.c b/drivers/net/wireless/ath/ath10k/trace.c<br/>index c7d4c97e6079..421ec47c59bd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/trace.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/trace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/trace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/trace.c</a></div><div class='hunk'>@@ -1,8 +1,10 @@</div><div class='ctx'> // SPDX-License-Identifier: ISC</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2012 Qualcomm Atheros, Inc.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CREATE_TRACE_POINTS</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/trace.h b/drivers/net/wireless/ath/ath10k/trace.h<br/>index 4714c86bb501..68b78ca17eaa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/trace.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/trace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/trace.h</a></div><div class='hunk'>@@ -52,15 +52,12 @@ DECLARE_EVENT_CLASS(ath10k_log_event,</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		__string(device, dev_name(ar-&gt;dev))</div><div class='ctx'> 		__string(driver, dev_driver_string(ar-&gt;dev))</div><div class='del'>-		__dynamic_array(char, msg, ATH10K_MSG_MAX)</div><div class='add'>+		__vstring(msg, vaf-&gt;fmt, vaf-&gt;va)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(device, dev_name(ar-&gt;dev));</div><div class='del'>-		__assign_str(driver, dev_driver_string(ar-&gt;dev));</div><div class='del'>-		WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),</div><div class='del'>-				       ATH10K_MSG_MAX,</div><div class='del'>-				       vaf-&gt;fmt,</div><div class='del'>-				       *vaf-&gt;va) &gt;= ATH10K_MSG_MAX);</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='add'>+		__assign_vstr(msg, vaf-&gt;fmt, vaf-&gt;va);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk(</div><div class='ctx'> 		"%s %s %s",</div><div class='hunk'>@@ -92,16 +89,13 @@ TRACE_EVENT(ath10k_log_dbg,</div><div class='ctx'> 		__string(device, dev_name(ar-&gt;dev))</div><div class='ctx'> 		__string(driver, dev_driver_string(ar-&gt;dev))</div><div class='ctx'> 		__field(unsigned int, level)</div><div class='del'>-		__dynamic_array(char, msg, ATH10K_MSG_MAX)</div><div class='add'>+		__vstring(msg, vaf-&gt;fmt, vaf-&gt;va)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(device, dev_name(ar-&gt;dev));</div><div class='del'>-		__assign_str(driver, dev_driver_string(ar-&gt;dev));</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='ctx'> 		__entry-&gt;level = level;</div><div class='del'>-		WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),</div><div class='del'>-				       ATH10K_MSG_MAX,</div><div class='del'>-				       vaf-&gt;fmt,</div><div class='del'>-				       *vaf-&gt;va) &gt;= ATH10K_MSG_MAX);</div><div class='add'>+		__assign_vstr(msg, vaf-&gt;fmt, vaf-&gt;va);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk(</div><div class='ctx'> 		"%s %s %s",</div><div class='hunk'>@@ -127,10 +121,10 @@ TRACE_EVENT(ath10k_log_dbg_dump,</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(device, dev_name(ar-&gt;dev));</div><div class='del'>-		__assign_str(driver, dev_driver_string(ar-&gt;dev));</div><div class='del'>-		__assign_str(msg, msg);</div><div class='del'>-		__assign_str(prefix, prefix);</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='add'>+		__assign_str(msg);</div><div class='add'>+		__assign_str(prefix);</div><div class='ctx'> 		__entry-&gt;buf_len = buf_len;</div><div class='ctx'> 		memcpy(__get_dynamic_array(buf), buf, buf_len);</div><div class='ctx'> 	),</div><div class='hunk'>@@ -158,8 +152,8 @@ TRACE_EVENT(ath10k_wmi_cmd,</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(device, dev_name(ar-&gt;dev));</div><div class='del'>-		__assign_str(driver, dev_driver_string(ar-&gt;dev));</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='ctx'> 		__entry-&gt;id = id;</div><div class='ctx'> 		__entry-&gt;buf_len = buf_len;</div><div class='ctx'> 		memcpy(__get_dynamic_array(buf), buf, buf_len);</div><div class='hunk'>@@ -188,8 +182,8 @@ TRACE_EVENT(ath10k_wmi_event,</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(device, dev_name(ar-&gt;dev));</div><div class='del'>-		__assign_str(driver, dev_driver_string(ar-&gt;dev));</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='ctx'> 		__entry-&gt;id = id;</div><div class='ctx'> 		__entry-&gt;buf_len = buf_len;</div><div class='ctx'> 		memcpy(__get_dynamic_array(buf), buf, buf_len);</div><div class='hunk'>@@ -217,8 +211,8 @@ TRACE_EVENT(ath10k_htt_stats,</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(device, dev_name(ar-&gt;dev));</div><div class='del'>-		__assign_str(driver, dev_driver_string(ar-&gt;dev));</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='ctx'> 		__entry-&gt;buf_len = buf_len;</div><div class='ctx'> 		memcpy(__get_dynamic_array(buf), buf, buf_len);</div><div class='ctx'> 	),</div><div class='hunk'>@@ -245,8 +239,8 @@ TRACE_EVENT(ath10k_wmi_dbglog,</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(device, dev_name(ar-&gt;dev));</div><div class='del'>-		__assign_str(driver, dev_driver_string(ar-&gt;dev));</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='ctx'> 		__entry-&gt;hw_type = ar-&gt;hw_rev;</div><div class='ctx'> 		__entry-&gt;buf_len = buf_len;</div><div class='ctx'> 		memcpy(__get_dynamic_array(buf), buf, buf_len);</div><div class='hunk'>@@ -275,8 +269,8 @@ TRACE_EVENT(ath10k_htt_pktlog,</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(device, dev_name(ar-&gt;dev));</div><div class='del'>-		__assign_str(driver, dev_driver_string(ar-&gt;dev));</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='ctx'> 		__entry-&gt;hw_type = ar-&gt;hw_rev;</div><div class='ctx'> 		__entry-&gt;buf_len = buf_len;</div><div class='ctx'> 		memcpy(__get_dynamic_array(pktlog), buf, buf_len);</div><div class='hunk'>@@ -307,8 +301,8 @@ TRACE_EVENT(ath10k_htt_tx,</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(device, dev_name(ar-&gt;dev));</div><div class='del'>-		__assign_str(driver, dev_driver_string(ar-&gt;dev));</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='ctx'> 		__entry-&gt;msdu_id = msdu_id;</div><div class='ctx'> 		__entry-&gt;msdu_len = msdu_len;</div><div class='ctx'> 		__entry-&gt;vdev_id = vdev_id;</div><div class='hunk'>@@ -338,8 +332,8 @@ TRACE_EVENT(ath10k_txrx_tx_unref,</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(device, dev_name(ar-&gt;dev));</div><div class='del'>-		__assign_str(driver, dev_driver_string(ar-&gt;dev));</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='ctx'> 		__entry-&gt;msdu_id = msdu_id;</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='hunk'>@@ -364,8 +358,8 @@ DECLARE_EVENT_CLASS(ath10k_hdr_event,</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(device, dev_name(ar-&gt;dev));</div><div class='del'>-		__assign_str(driver, dev_driver_string(ar-&gt;dev));</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='ctx'> 		__entry-&gt;len = ath10k_frm_hdr_len(data, len);</div><div class='ctx'> 		memcpy(__get_dynamic_array(data), data, __entry-&gt;len);</div><div class='ctx'> 	),</div><div class='hunk'>@@ -392,8 +386,8 @@ DECLARE_EVENT_CLASS(ath10k_payload_event,</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(device, dev_name(ar-&gt;dev));</div><div class='del'>-		__assign_str(driver, dev_driver_string(ar-&gt;dev));</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='ctx'> 		__entry-&gt;len = len - ath10k_frm_hdr_len(data, len);</div><div class='ctx'> 		memcpy(__get_dynamic_array(payload),</div><div class='ctx'> 		       data + ath10k_frm_hdr_len(data, len), __entry-&gt;len);</div><div class='hunk'>@@ -441,8 +435,8 @@ TRACE_EVENT(ath10k_htt_rx_desc,</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(device, dev_name(ar-&gt;dev));</div><div class='del'>-		__assign_str(driver, dev_driver_string(ar-&gt;dev));</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='ctx'> 		__entry-&gt;hw_type = ar-&gt;hw_rev;</div><div class='ctx'> 		__entry-&gt;len = len;</div><div class='ctx'> 		memcpy(__get_dynamic_array(rxdesc), data, len);</div><div class='hunk'>@@ -478,8 +472,8 @@ TRACE_EVENT(ath10k_wmi_diag_container,</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(device, dev_name(ar-&gt;dev));</div><div class='del'>-		__assign_str(driver, dev_driver_string(ar-&gt;dev));</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='ctx'> 		__entry-&gt;type = type;</div><div class='ctx'> 		__entry-&gt;timestamp = timestamp;</div><div class='ctx'> 		__entry-&gt;code = code;</div><div class='hunk'>@@ -511,8 +505,8 @@ TRACE_EVENT(ath10k_wmi_diag,</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(device, dev_name(ar-&gt;dev));</div><div class='del'>-		__assign_str(driver, dev_driver_string(ar-&gt;dev));</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='ctx'> 		__entry-&gt;len = len;</div><div class='ctx'> 		memcpy(__get_dynamic_array(data), data, len);</div><div class='ctx'> 	),</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c<br/>index 7c9ea0c073d8..493bfb410aff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/txrx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/txrx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/txrx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/txrx.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@ static void ath10k_report_offchan_tx(struct ath10k *ar, struct sk_buff *skb)</div><div class='ctx'> 	complete(&amp;ar-&gt;offchan_tx_completed);</div><div class='ctx'> 	ar-&gt;offchan_tx_skb = NULL; /* just for sanity */</div><div class='ctx'> </div><div class='del'>-	ath10k_dbg(ar, ATH10K_DBG_HTT, "completed offchannel skb %pK\n", skb);</div><div class='add'>+	ath10k_dbg(ar, ATH10K_DBG_HTT, "completed offchannel skb %p\n", skb);</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -43,6 +43,7 @@ out:</div><div class='ctx'> int ath10k_txrx_tx_unref(struct ath10k_htt *htt,</div><div class='ctx'> 			 const struct htt_tx_done *tx_done)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_tx_status status;</div><div class='ctx'> 	struct ath10k *ar = htt-&gt;ar;</div><div class='ctx'> 	struct device *dev = ar-&gt;dev;</div><div class='ctx'> 	struct ieee80211_tx_info *info;</div><div class='hunk'>@@ -82,8 +83,6 @@ int ath10k_txrx_tx_unref(struct ath10k_htt *htt,</div><div class='ctx'> 	flags = skb_cb-&gt;flags;</div><div class='ctx'> 	ath10k_htt_tx_free_msdu_id(htt, tx_done-&gt;msdu_id);</div><div class='ctx'> 	ath10k_htt_tx_dec_pending(htt);</div><div class='del'>-	if (htt-&gt;num_pending_tx == 0)</div><div class='del'>-		wake_up(&amp;htt-&gt;empty_tx_wq);</div><div class='ctx'> 	spin_unlock_bh(&amp;htt-&gt;tx_lock);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='hunk'>@@ -127,10 +126,22 @@ int ath10k_txrx_tx_unref(struct ath10k_htt *htt,</div><div class='ctx'> 	    tx_done-&gt;ack_rssi != ATH10K_INVALID_RSSI) {</div><div class='ctx'> 		info-&gt;status.ack_signal = ATH10K_DEFAULT_NOISE_FLOOR +</div><div class='ctx'> 						tx_done-&gt;ack_rssi;</div><div class='del'>-		info-&gt;status.is_valid_ack_signal = true;</div><div class='add'>+		info-&gt;status.flags |= IEEE80211_TX_STATUS_ACK_SIGNAL_VALID;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ieee80211_tx_status(htt-&gt;ar-&gt;hw, msdu);</div><div class='add'>+	memset(&amp;status, 0, sizeof(status));</div><div class='add'>+	status.skb = msdu;</div><div class='add'>+	status.info = info;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	if (txq)</div><div class='add'>+		status.sta = txq-&gt;sta;</div><div class='add'>+</div><div class='add'>+	ieee80211_tx_status_ext(htt-&gt;ar-&gt;hw, &amp;status);</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 	/* we do not own the msdu anymore */</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/usb.c b/drivers/net/wireless/ath/ath10k/usb.c<br/>index 19b9c27e30e2..1732a4f98418 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/usb.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/usb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/usb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/usb.c</a></div><div class='hunk'>@@ -131,7 +131,7 @@ static void ath10k_usb_recv_complete(struct urb *urb)</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_USB_BULK,</div><div class='del'>-		   "usb recv pipe %d stat %d len %d urb 0x%pK\n",</div><div class='add'>+		   "usb recv pipe %d stat %d len %d urb 0x%p\n",</div><div class='ctx'> 		   pipe-&gt;logical_pipe_num, urb-&gt;status, urb-&gt;actual_length,</div><div class='ctx'> 		   urb);</div><div class='ctx'> </div><div class='hunk'>@@ -230,7 +230,7 @@ static void ath10k_usb_post_recv_transfers(struct ath10k *ar,</div><div class='ctx'> 				  ath10k_usb_recv_complete, urb_context);</div><div class='ctx'> </div><div class='ctx'> 		ath10k_dbg(ar, ATH10K_DBG_USB_BULK,</div><div class='del'>-			   "usb bulk recv submit %d 0x%x ep 0x%2.2x len %d buf 0x%pK\n",</div><div class='add'>+			   "usb bulk recv submit %d 0x%x ep 0x%2.2x len %d buf 0x%p\n",</div><div class='ctx'> 			   recv_pipe-&gt;logical_pipe_num,</div><div class='ctx'> 			   recv_pipe-&gt;usb_pipe_handle, recv_pipe-&gt;ep_address,</div><div class='ctx'> 			   ATH10K_USB_RX_BUFFER_SIZE, urb_context-&gt;skb);</div><div class='hunk'>@@ -345,6 +345,12 @@ static void ath10k_usb_rx_complete(struct ath10k *ar, struct sk_buff *skb)</div><div class='ctx'> 	ep-&gt;ep_ops.ep_rx_complete(ar, skb);</div><div class='ctx'> 	/* The RX complete handler now owns the skb... */</div><div class='ctx'> </div><div class='add'>+	if (test_bit(ATH10K_FLAG_CORE_REGISTERED, &amp;ar-&gt;dev_flags)) {</div><div class='add'>+		local_bh_disable();</div><div class='add'>+		napi_schedule(&amp;ar-&gt;napi);</div><div class='add'>+		local_bh_enable();</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> out_free_skb:</div><div class='hunk'>@@ -387,6 +393,7 @@ static int ath10k_usb_hif_start(struct ath10k *ar)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct ath10k_usb *ar_usb = ath10k_usb_priv(ar);</div><div class='ctx'> </div><div class='add'>+	ath10k_core_napi_enable(ar);</div><div class='ctx'> 	ath10k_usb_start_recv_pipes(ar);</div><div class='ctx'> </div><div class='ctx'> 	/* set the TX resource avail threshold for each TX pipe */</div><div class='hunk'>@@ -462,6 +469,7 @@ err:</div><div class='ctx'> static void ath10k_usb_hif_stop(struct ath10k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	ath10k_usb_flush_all(ar);</div><div class='add'>+	ath10k_core_napi_sync_disable(ar);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 ath10k_usb_hif_get_free_queue_number(struct ath10k *ar, u8 pipe_id)</div><div class='hunk'>@@ -525,7 +533,7 @@ static int ath10k_usb_submit_ctrl_in(struct ath10k *ar,</div><div class='ctx'> 			      req,</div><div class='ctx'> 			      USB_DIR_IN | USB_TYPE_VENDOR |</div><div class='ctx'> 			      USB_RECIP_DEVICE, value, index, buf,</div><div class='del'>-			      size, 2 * HZ);</div><div class='add'>+			      size, 2000);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		ath10k_warn(ar, "Failed to read usb control message: %d\n",</div><div class='hunk'>@@ -853,6 +861,11 @@ static int ath10k_usb_setup_pipe_resources(struct ath10k *ar,</div><div class='ctx'> 				   le16_to_cpu(endpoint-&gt;wMaxPacketSize),</div><div class='ctx'> 				   endpoint-&gt;bInterval);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		/* Ignore broken descriptors. */</div><div class='add'>+		if (usb_endpoint_maxp(endpoint) == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		urbcount = 0;</div><div class='ctx'> </div><div class='ctx'> 		pipe_num =</div><div class='hunk'>@@ -961,6 +974,20 @@ err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ath10k_usb_napi_poll(struct napi_struct *ctx, int budget)</div><div class='add'>+{</div><div class='add'>+	struct ath10k *ar = container_of(ctx, struct ath10k, napi);</div><div class='add'>+	int done;</div><div class='add'>+</div><div class='add'>+	done = ath10k_htt_rx_hl_indication(ar, budget);</div><div class='add'>+	ath10k_dbg(ar, ATH10K_DBG_USB, "napi poll: done: %d, budget:%d\n", done, budget);</div><div class='add'>+</div><div class='add'>+	if (done &lt; budget)</div><div class='add'>+		napi_complete_done(ctx, done);</div><div class='add'>+</div><div class='add'>+	return done;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* ath10k usb driver registered functions */</div><div class='ctx'> static int ath10k_usb_probe(struct usb_interface *interface,</div><div class='ctx'> 			    const struct usb_device_id *id)</div><div class='hunk'>@@ -987,6 +1014,8 @@ static int ath10k_usb_probe(struct usb_interface *interface,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	netif_napi_add(ar-&gt;napi_dev, &amp;ar-&gt;napi, ath10k_usb_napi_poll);</div><div class='add'>+</div><div class='ctx'> 	usb_get_dev(dev);</div><div class='ctx'> 	vendor_id = le16_to_cpu(dev-&gt;descriptor.idVendor);</div><div class='ctx'> 	product_id = le16_to_cpu(dev-&gt;descriptor.idProduct);</div><div class='hunk'>@@ -1008,6 +1037,7 @@ static int ath10k_usb_probe(struct usb_interface *interface,</div><div class='ctx'> 	bus_params.dev_type = ATH10K_DEV_TYPE_HL;</div><div class='ctx'> 	/* TODO: don't know yet how to get chip_id with USB */</div><div class='ctx'> 	bus_params.chip_id = 0;</div><div class='add'>+	bus_params.hl_msdu_ids = true;</div><div class='ctx'> 	ret = ath10k_core_register(ar, &amp;bus_params);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath10k_warn(ar, "failed to register driver core: %d\n", ret);</div><div class='hunk'>@@ -1039,6 +1069,7 @@ static void ath10k_usb_remove(struct usb_interface *interface)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ath10k_core_unregister(ar_usb-&gt;ar);</div><div class='add'>+	netif_napi_del(&amp;ar_usb-&gt;ar-&gt;napi);</div><div class='ctx'> 	ath10k_usb_destroy(ar_usb-&gt;ar);</div><div class='ctx'> 	usb_put_dev(interface_to_usbdev(interface));</div><div class='ctx'> 	ath10k_core_destroy(ar_usb-&gt;ar);</div><div class='hunk'>@@ -1095,5 +1126,5 @@ static struct usb_driver ath10k_usb_driver = {</div><div class='ctx'> module_usb_driver(ath10k_usb_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Atheros Communications, Inc.");</div><div class='del'>-MODULE_DESCRIPTION("Driver support for Qualcomm Atheros 802.11ac WLAN USB devices");</div><div class='add'>+MODULE_DESCRIPTION("Driver support for Qualcomm Atheros USB 802.11ac WLAN devices");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/usb.h b/drivers/net/wireless/ath/ath10k/usb.h<br/>index 34d683e8fc18..7e4cfbb673c9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/usb.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/usb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/usb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/usb.h</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  * Copyright (c) 2004-2011 Atheros Communications Inc.</div><div class='ctx'>  * Copyright (c) 2011-2012 Qualcomm Atheros, Inc.</div><div class='ctx'>  * Copyright (c) 2016-2017 Erik Stromdahl &lt;erik.stromdahl@gmail.com&gt;</div><div class='add'>+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _USB_H_</div><div class='hunk'>@@ -26,7 +27,7 @@</div><div class='ctx'> #define ATH10K_USB_EP_ADDR_APP_DATA_MP_OUT      0x03</div><div class='ctx'> #define ATH10K_USB_EP_ADDR_APP_DATA_HP_OUT      0x04</div><div class='ctx'> </div><div class='del'>-/* diagnostic command defnitions */</div><div class='add'>+/* diagnostic command definitions */</div><div class='ctx'> #define ATH10K_USB_CONTROL_REQ_SEND_BMI_CMD        1</div><div class='ctx'> #define ATH10K_USB_CONTROL_REQ_RECV_BMI_RESP       2</div><div class='ctx'> #define ATH10K_USB_CONTROL_REQ_DIAG_CMD            3</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/wmi-ops.h b/drivers/net/wireless/ath/ath10k/wmi-ops.h<br/>index aa57d807491c..f3f6b5954b27 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/wmi-ops.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/wmi-ops.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/wmi-ops.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/wmi-ops.h</a></div><div class='hunk'>@@ -226,7 +226,10 @@ struct wmi_ops {</div><div class='ctx'> 			 const struct wmi_bb_timing_cfg_arg *arg);</div><div class='ctx'> 	struct sk_buff *(*gen_per_peer_per_tid_cfg)(struct ath10k *ar,</div><div class='ctx'> 						    const struct wmi_per_peer_per_tid_cfg_arg *arg);</div><div class='add'>+	struct sk_buff *(*gen_gpio_config)(struct ath10k *ar, u32 gpio_num,</div><div class='add'>+					   u32 input, u32 pull_type, u32 intr_mode);</div><div class='ctx'> </div><div class='add'>+	struct sk_buff *(*gen_gpio_output)(struct ath10k *ar, u32 gpio_num, u32 set);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id);</div><div class='hunk'>@@ -1122,6 +1125,35 @@ ath10k_wmi_force_fw_hang(struct ath10k *ar,</div><div class='ctx'> 	return ath10k_wmi_cmd_send(ar, skb, ar-&gt;wmi.cmd-&gt;force_fw_hang_cmdid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int ath10k_wmi_gpio_config(struct ath10k *ar, u32 gpio_num,</div><div class='add'>+					 u32 input, u32 pull_type, u32 intr_mode)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (!ar-&gt;wmi.ops-&gt;gen_gpio_config)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	skb = ar-&gt;wmi.ops-&gt;gen_gpio_config(ar, gpio_num, input, pull_type, intr_mode);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+</div><div class='add'>+	return ath10k_wmi_cmd_send(ar, skb, ar-&gt;wmi.cmd-&gt;gpio_config_cmdid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath10k_wmi_gpio_output(struct ath10k *ar, u32 gpio_num, u32 set)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (!ar-&gt;wmi.ops-&gt;gen_gpio_config)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	skb = ar-&gt;wmi.ops-&gt;gen_gpio_output(ar, gpio_num, set);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+</div><div class='add'>+	return ath10k_wmi_cmd_send(ar, skb, ar-&gt;wmi.cmd-&gt;gpio_output_cmdid);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int</div><div class='ctx'> ath10k_wmi_dbglog_cfg(struct ath10k *ar, u64 module_enable, u32 log_level)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.c b/drivers/net/wireless/ath/ath10k/wmi-tlv.c<br/>index 7efbe03fbca8..16d07d619b4d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/wmi-tlv.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/wmi-tlv.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/wmi-tlv.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/wmi-tlv.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  * Copyright (c) 2005-2011 Atheros Communications Inc.</div><div class='ctx'>  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.</div><div class='ctx'>  * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "debug.h"</div><div class='hunk'>@@ -205,7 +206,7 @@ static int ath10k_wmi_tlv_event_bcn_tx_status(struct ath10k *ar,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	arvif = ath10k_get_arvif(ar, vdev_id);</div><div class='del'>-	if (arvif &amp;&amp; arvif-&gt;is_up &amp;&amp; arvif-&gt;vif-&gt;csa_active)</div><div class='add'>+	if (arvif &amp;&amp; arvif-&gt;is_up &amp;&amp; arvif-&gt;vif-&gt;bss_conf.csa_active)</div><div class='ctx'> 		ieee80211_queue_work(ar-&gt;hw, &amp;arvif-&gt;ap_csa_work);</div><div class='ctx'> </div><div class='ctx'> 	kfree(tb);</div><div class='hunk'>@@ -584,7 +585,14 @@ static void ath10k_wmi_event_tdls_peer(struct ath10k *ar, struct sk_buff *skb)</div><div class='ctx'> 			ath10k_warn(ar, "did not find station from tdls peer event");</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		arvif = ath10k_get_arvif(ar, __le32_to_cpu(ev-&gt;vdev_id));</div><div class='add'>+		if (!arvif) {</div><div class='add'>+			ath10k_warn(ar, "no vif for vdev_id %d found",</div><div class='add'>+				    __le32_to_cpu(ev-&gt;vdev_id));</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		ieee80211_tdls_oper_request(</div><div class='ctx'> 					arvif-&gt;vif, station-&gt;addr,</div><div class='ctx'> 					NL80211_TDLS_TEARDOWN,</div><div class='hunk'>@@ -844,6 +852,10 @@ ath10k_wmi_tlv_op_pull_mgmt_tx_compl_ev(struct ath10k *ar, struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ev = tb[WMI_TLV_TAG_STRUCT_MGMT_TX_COMPL_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	arg-&gt;desc_id = ev-&gt;desc_id;</div><div class='ctx'> 	arg-&gt;status = ev-&gt;status;</div><div class='hunk'>@@ -1340,7 +1352,7 @@ static int ath10k_wmi_tlv_op_pull_svc_rdy_ev(struct ath10k *ar,</div><div class='ctx'> 	    __le32_to_cpu(ev-&gt;abi.abi_ver_ns1) != WMI_TLV_ABI_VER_NS1 ||</div><div class='ctx'> 	    __le32_to_cpu(ev-&gt;abi.abi_ver_ns2) != WMI_TLV_ABI_VER_NS2 ||</div><div class='ctx'> 	    __le32_to_cpu(ev-&gt;abi.abi_ver_ns3) != WMI_TLV_ABI_VER_NS3) {</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	arg-&gt;min_tx_power = ev-&gt;hw_min_tx_power;</div><div class='hunk'>@@ -2112,9 +2124,9 @@ static int ath10k_wmi_tlv_op_get_vdev_subtype(struct ath10k *ar,</div><div class='ctx'> 	case WMI_VDEV_SUBTYPE_MESH_11S:</div><div class='ctx'> 		return WMI_TLV_VDEV_SUBTYPE_MESH_11S;</div><div class='ctx'> 	case WMI_VDEV_SUBTYPE_MESH_NON_11S:</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='del'>-	return -ENOTSUPP;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *</div><div class='hunk'>@@ -3031,9 +3043,14 @@ ath10k_wmi_tlv_op_cleanup_mgmt_tx_send(struct ath10k *ar,</div><div class='ctx'> 				       struct sk_buff *msdu)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath10k_skb_cb *cb = ATH10K_SKB_CB(msdu);</div><div class='add'>+	struct ath10k_mgmt_tx_pkt_addr *pkt_addr;</div><div class='ctx'> 	struct ath10k_wmi *wmi = &amp;ar-&gt;wmi;</div><div class='ctx'> </div><div class='del'>-	idr_remove(&amp;wmi-&gt;mgmt_pending_tx, cb-&gt;msdu_id);</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	pkt_addr = idr_remove(&amp;wmi-&gt;mgmt_pending_tx, cb-&gt;msdu_id);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	kfree(pkt_addr);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -4594,6 +4611,8 @@ static const struct wmi_ops wmi_tlv_ops = {</div><div class='ctx'> 	.gen_echo = ath10k_wmi_tlv_op_gen_echo,</div><div class='ctx'> 	.gen_vdev_spectral_conf = ath10k_wmi_tlv_op_gen_vdev_spectral_conf,</div><div class='ctx'> 	.gen_vdev_spectral_enable = ath10k_wmi_tlv_op_gen_vdev_spectral_enable,</div><div class='add'>+	/* .gen_gpio_config not implemented */</div><div class='add'>+	/* .gen_gpio_output not implemented */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct wmi_peer_flags_map wmi_tlv_peer_flags_map = {</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.h b/drivers/net/wireless/ath/ath10k/wmi-tlv.h<br/>index b39c9b78b32b..8a2f87d0a3a3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/wmi-tlv.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/wmi-tlv.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/wmi-tlv.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/wmi-tlv.h</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  * Copyright (c) 2005-2011 Atheros Communications Inc.</div><div class='ctx'>  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.</div><div class='ctx'>  * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022, 2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef _WMI_TLV_H</div><div class='ctx'> #define _WMI_TLV_H</div><div class='hunk'>@@ -1813,7 +1814,7 @@ struct wmi_tlv_pdev_get_temp_cmd {</div><div class='ctx'> </div><div class='ctx'> struct wmi_tlv_pdev_temperature_event {</div><div class='ctx'> 	__le32 tlv_hdr;</div><div class='del'>-	/* temperature value in Celcius degree */</div><div class='add'>+	/* temperature value in Celsius degree */</div><div class='ctx'> 	__le32 temperature;</div><div class='ctx'> 	__le32 pdev_id;</div><div class='ctx'> } __packed;</div><div class='hunk'>@@ -2342,7 +2343,7 @@ struct wmi_tlv_adaptive_qcs {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * wmi_tlv_tx_pause_id - firmware tx queue pause reason types</div><div class='add'>+ * enum wmi_tlv_tx_pause_id - firmware tx queue pause reason types</div><div class='ctx'>  *</div><div class='ctx'>  * @WMI_TLV_TX_PAUSE_ID_MCC: used for by multi-channel firmware scheduler.</div><div class='ctx'>  *		Only vdev_map is valid.</div><div class='hunk'>@@ -2548,7 +2549,7 @@ struct nlo_channel_prediction_cfg {</div><div class='ctx'> </div><div class='ctx'> 	/* Preconfigured stationary threshold.</div><div class='ctx'> 	 * Lesser value means more conservative. Bigger value means more aggressive.</div><div class='del'>-	 * Maximum is 100 and mininum is 0.</div><div class='add'>+	 * Maximum is 100 and minimum is 0.</div><div class='ctx'> 	 */</div><div class='ctx'> 	__le32 stationary_threshold;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c<br/>index d48b922215eb..b4aad6604d6d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/wmi.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/wmi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/wmi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/wmi.c</a></div><div class='hunk'>@@ -3,6 +3,8 @@</div><div class='ctx'>  * Copyright (c) 2005-2011 Atheros Communications Inc.</div><div class='ctx'>  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.</div><div class='ctx'>  * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='hunk'>@@ -1762,12 +1764,32 @@ void ath10k_wmi_put_wmi_channel(struct ath10k *ar, struct wmi_channel *ch,</div><div class='ctx'> </div><div class='ctx'> int ath10k_wmi_wait_for_service_ready(struct ath10k *ar)</div><div class='ctx'> {</div><div class='del'>-	unsigned long time_left;</div><div class='add'>+	unsigned long time_left, i;</div><div class='ctx'> </div><div class='ctx'> 	time_left = wait_for_completion_timeout(&amp;ar-&gt;wmi.service_ready,</div><div class='ctx'> 						WMI_SERVICE_READY_TIMEOUT_HZ);</div><div class='del'>-	if (!time_left)</div><div class='del'>-		return -ETIMEDOUT;</div><div class='add'>+	if (!time_left) {</div><div class='add'>+		/* Sometimes the PCI HIF doesn't receive interrupt</div><div class='add'>+		 * for the service ready message even if the buffer</div><div class='add'>+		 * was completed. PCIe sniffer shows that it's</div><div class='add'>+		 * because the corresponding CE ring doesn't fires</div><div class='add'>+		 * it. Workaround here by polling CE rings once.</div><div class='add'>+		 */</div><div class='add'>+		ath10k_warn(ar, "failed to receive service ready completion, polling..\n");</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; CE_COUNT; i++)</div><div class='add'>+			ath10k_hif_send_complete_check(ar, i, 1);</div><div class='add'>+</div><div class='add'>+		time_left = wait_for_completion_timeout(&amp;ar-&gt;wmi.service_ready,</div><div class='add'>+							WMI_SERVICE_READY_TIMEOUT_HZ);</div><div class='add'>+		if (!time_left) {</div><div class='add'>+			ath10k_warn(ar, "polling timed out\n");</div><div class='add'>+			return -ETIMEDOUT;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath10k_warn(ar, "service ready completion received, continuing normally\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1916,10 +1938,16 @@ int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id)</div><div class='ctx'> 	if (cmd_id == WMI_CMD_UNSUPPORTED) {</div><div class='ctx'> 		ath10k_warn(ar, "wmi command %d is not supported by firmware\n",</div><div class='ctx'> 			    cmd_id);</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wait_event_timeout(ar-&gt;wmi.tx_credits_wq, ({</div><div class='add'>+		if (ar-&gt;state == ATH10K_STATE_WEDGED) {</div><div class='add'>+			ret = -ESHUTDOWN;</div><div class='add'>+			ath10k_dbg(ar, ATH10K_DBG_WMI,</div><div class='add'>+				   "drop wmi command %d, hardware is wedged\n", cmd_id);</div><div class='add'>+		}</div><div class='ctx'> 		/* try to send pending beacons first. they take priority */</div><div class='ctx'> 		ath10k_wmi_tx_beacons_nowait(ar);</div><div class='ctx'> </div><div class='hunk'>@@ -2008,7 +2036,7 @@ ath10k_wmi_op_gen_mgmt_tx(struct ath10k *ar, struct sk_buff *msdu)</div><div class='ctx'> 	ether_addr_copy(cmd-&gt;hdr.peer_macaddr.addr, ieee80211_get_DA(hdr));</div><div class='ctx'> 	memcpy(cmd-&gt;buf, msdu-&gt;data, msdu-&gt;len);</div><div class='ctx'> </div><div class='del'>-	ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi mgmt tx skb %pK len %d ftype %02x stype %02x\n",</div><div class='add'>+	ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi mgmt tx skb %p len %d ftype %02x stype %02x\n",</div><div class='ctx'> 		   msdu, skb-&gt;len, fc &amp; IEEE80211_FCTL_FTYPE,</div><div class='ctx'> 		   fc &amp; IEEE80211_FCTL_STYPE);</div><div class='ctx'> 	trace_ath10k_tx_hdr(ar, skb-&gt;data, skb-&gt;len);</div><div class='hunk'>@@ -2420,6 +2448,7 @@ wmi_process_mgmt_tx_comp(struct ath10k *ar, struct mgmt_tx_compl_params *param)</div><div class='ctx'> 	dma_unmap_single(ar-&gt;dev, pkt_addr-&gt;paddr,</div><div class='ctx'> 			 msdu-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> 	info = IEEE80211_SKB_CB(msdu);</div><div class='add'>+	kfree(pkt_addr);</div><div class='ctx'> </div><div class='ctx'> 	if (param-&gt;status) {</div><div class='ctx'> 		info-&gt;flags &amp;= ~IEEE80211_TX_STAT_ACK;</div><div class='hunk'>@@ -2427,7 +2456,7 @@ wmi_process_mgmt_tx_comp(struct ath10k *ar, struct mgmt_tx_compl_params *param)</div><div class='ctx'> 		info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='ctx'> 		info-&gt;status.ack_signal = ATH10K_DEFAULT_NOISE_FLOOR +</div><div class='ctx'> 					  param-&gt;ack_rssi;</div><div class='del'>-		info-&gt;status.is_valid_ack_signal = true;</div><div class='add'>+		info-&gt;status.flags |= IEEE80211_TX_STATUS_ACK_SIGNAL_VALID;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_tx_status_irqsafe(ar-&gt;hw, msdu);</div><div class='hunk'>@@ -2610,8 +2639,12 @@ int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb)</div><div class='ctx'> 	if (ieee80211_is_beacon(hdr-&gt;frame_control))</div><div class='ctx'> 		ath10k_mac_handle_beacon(ar, skb);</div><div class='ctx'> </div><div class='add'>+	if (ieee80211_is_beacon(hdr-&gt;frame_control) ||</div><div class='add'>+	    ieee80211_is_probe_resp(hdr-&gt;frame_control))</div><div class='add'>+		status-&gt;boottime_ns = ktime_get_boottime_ns();</div><div class='add'>+</div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_MGMT,</div><div class='del'>-		   "event mgmt rx skb %pK len %d ftype %02x stype %02x\n",</div><div class='add'>+		   "event mgmt rx skb %p len %d ftype %02x stype %02x\n",</div><div class='ctx'> 		   skb, skb-&gt;len,</div><div class='ctx'> 		   fc &amp; IEEE80211_FCTL_FTYPE, fc &amp; IEEE80211_FCTL_STYPE);</div><div class='ctx'> </div><div class='hunk'>@@ -2795,7 +2828,7 @@ void ath10k_wmi_event_chan_info(struct ath10k *ar, struct sk_buff *skb)</div><div class='ctx'> 	switch (ar-&gt;scan.state) {</div><div class='ctx'> 	case ATH10K_SCAN_IDLE:</div><div class='ctx'> 	case ATH10K_SCAN_STARTING:</div><div class='del'>-		ath10k_warn(ar, "received chan info event without a scan request, ignoring\n");</div><div class='add'>+		ath10k_dbg(ar, ATH10K_DBG_WMI, "received chan info event without a scan request, ignoring\n");</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	case ATH10K_SCAN_RUNNING:</div><div class='ctx'> 	case ATH10K_SCAN_ABORTING:</div><div class='hunk'>@@ -2867,7 +2900,7 @@ void ath10k_wmi_pull_pdev_stats_tx(const struct wmi_pdev_stats_tx *src,</div><div class='ctx'> 	dst-&gt;hw_reaped = __le32_to_cpu(src-&gt;hw_reaped);</div><div class='ctx'> 	dst-&gt;underrun = __le32_to_cpu(src-&gt;underrun);</div><div class='ctx'> 	dst-&gt;tx_abort = __le32_to_cpu(src-&gt;tx_abort);</div><div class='del'>-	dst-&gt;mpdus_requed = __le32_to_cpu(src-&gt;mpdus_requed);</div><div class='add'>+	dst-&gt;mpdus_requeued = __le32_to_cpu(src-&gt;mpdus_requeued);</div><div class='ctx'> 	dst-&gt;tx_ko = __le32_to_cpu(src-&gt;tx_ko);</div><div class='ctx'> 	dst-&gt;data_rc = __le32_to_cpu(src-&gt;data_rc);</div><div class='ctx'> 	dst-&gt;self_triggers = __le32_to_cpu(src-&gt;self_triggers);</div><div class='hunk'>@@ -2895,7 +2928,7 @@ ath10k_wmi_10_4_pull_pdev_stats_tx(const struct wmi_10_4_pdev_stats_tx *src,</div><div class='ctx'> 	dst-&gt;hw_reaped = __le32_to_cpu(src-&gt;hw_reaped);</div><div class='ctx'> 	dst-&gt;underrun = __le32_to_cpu(src-&gt;underrun);</div><div class='ctx'> 	dst-&gt;tx_abort = __le32_to_cpu(src-&gt;tx_abort);</div><div class='del'>-	dst-&gt;mpdus_requed = __le32_to_cpu(src-&gt;mpdus_requed);</div><div class='add'>+	dst-&gt;mpdus_requeued = __le32_to_cpu(src-&gt;mpdus_requeued);</div><div class='ctx'> 	dst-&gt;tx_ko = __le32_to_cpu(src-&gt;tx_ko);</div><div class='ctx'> 	dst-&gt;data_rc = __le32_to_cpu(src-&gt;data_rc);</div><div class='ctx'> 	dst-&gt;self_triggers = __le32_to_cpu(src-&gt;self_triggers);</div><div class='hunk'>@@ -3551,7 +3584,7 @@ static void ath10k_wmi_update_tim(struct ath10k *ar,</div><div class='ctx'> 	__le32 t;</div><div class='ctx'> 	u32 v, tim_len;</div><div class='ctx'> </div><div class='del'>-	/* When FW reports 0 in tim_len, ensure atleast first byte</div><div class='add'>+	/* When FW reports 0 in tim_len, ensure at least first byte</div><div class='ctx'> 	 * in tim_bitmap is considered for pvm calculation.</div><div class='ctx'> 	 */</div><div class='ctx'> 	tim_len = tim_info-&gt;tim_len ? __le32_to_cpu(tim_info-&gt;tim_len) : 1;</div><div class='hunk'>@@ -3878,13 +3911,13 @@ void ath10k_wmi_event_host_swba(struct ath10k *ar, struct sk_buff *skb)</div><div class='ctx'> 		 * Once CSA counter is completed stop sending beacons until</div><div class='ctx'> 		 * actual channel switch is done</div><div class='ctx'> 		 */</div><div class='del'>-		if (arvif-&gt;vif-&gt;csa_active &amp;&amp;</div><div class='del'>-		    ieee80211_beacon_cntdwn_is_complete(arvif-&gt;vif)) {</div><div class='del'>-			ieee80211_csa_finish(arvif-&gt;vif);</div><div class='add'>+		if (arvif-&gt;vif-&gt;bss_conf.csa_active &amp;&amp;</div><div class='add'>+		    ieee80211_beacon_cntdwn_is_complete(arvif-&gt;vif, 0)) {</div><div class='add'>+			ieee80211_csa_finish(arvif-&gt;vif, 0);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		bcn = ieee80211_beacon_get(ar-&gt;hw, arvif-&gt;vif);</div><div class='add'>+		bcn = ieee80211_beacon_get(ar-&gt;hw, arvif-&gt;vif, 0);</div><div class='ctx'> 		if (!bcn) {</div><div class='ctx'> 			ath10k_warn(ar, "could not get mac80211 beacon\n");</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -3965,7 +3998,7 @@ static void ath10k_radar_detected(struct ath10k *ar)</div><div class='ctx'> 	if (ar-&gt;dfs_block_radar_events)</div><div class='ctx'> 		ath10k_info(ar, "DFS Radar detected, but ignored as requested\n");</div><div class='ctx'> 	else</div><div class='del'>-		ieee80211_radar_detected(ar-&gt;hw);</div><div class='add'>+		ieee80211_radar_detected(ar-&gt;hw, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath10k_radar_confirmation_work(struct work_struct *work)</div><div class='hunk'>@@ -6922,14 +6955,14 @@ void ath10k_wmi_put_start_scan_common(struct wmi_start_scan_common *cmn,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-ath10k_wmi_put_start_scan_tlvs(struct wmi_start_scan_tlvs *tlvs,</div><div class='add'>+ath10k_wmi_put_start_scan_tlvs(u8 *tlvs,</div><div class='ctx'> 			       const struct wmi_start_scan_arg *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_ie_data *ie;</div><div class='ctx'> 	struct wmi_chan_list *channels;</div><div class='ctx'> 	struct wmi_ssid_list *ssids;</div><div class='ctx'> 	struct wmi_bssid_list *bssids;</div><div class='del'>-	void *ptr = tlvs-&gt;tlvs;</div><div class='add'>+	void *ptr = tlvs;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (arg-&gt;n_channels) {</div><div class='hunk'>@@ -7007,7 +7040,7 @@ ath10k_wmi_op_gen_start_scan(struct ath10k *ar,</div><div class='ctx'> 	cmd = (struct wmi_start_scan_cmd *)skb-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	ath10k_wmi_put_start_scan_common(&amp;cmd-&gt;common, arg);</div><div class='del'>-	ath10k_wmi_put_start_scan_tlvs(&amp;cmd-&gt;tlvs, arg);</div><div class='add'>+	ath10k_wmi_put_start_scan_tlvs(cmd-&gt;tlvs, arg);</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;burst_duration_ms = __cpu_to_le32(0);</div><div class='ctx'> </div><div class='hunk'>@@ -7036,7 +7069,7 @@ ath10k_wmi_10x_op_gen_start_scan(struct ath10k *ar,</div><div class='ctx'> 	cmd = (struct wmi_10x_start_scan_cmd *)skb-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	ath10k_wmi_put_start_scan_common(&amp;cmd-&gt;common, arg);</div><div class='del'>-	ath10k_wmi_put_start_scan_tlvs(&amp;cmd-&gt;tlvs, arg);</div><div class='add'>+	ath10k_wmi_put_start_scan_tlvs(cmd-&gt;tlvs, arg);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi 10x start scan\n");</div><div class='ctx'> 	return skb;</div><div class='hunk'>@@ -7468,6 +7501,49 @@ ath10k_wmi_op_gen_peer_set_param(struct ath10k *ar, u32 vdev_id,</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct sk_buff *ath10k_wmi_op_gen_gpio_config(struct ath10k *ar,</div><div class='add'>+						     u32 gpio_num, u32 input,</div><div class='add'>+						     u32 pull_type, u32 intr_mode)</div><div class='add'>+{</div><div class='add'>+	struct wmi_gpio_config_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_gpio_config_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;pull_type = __cpu_to_le32(pull_type);</div><div class='add'>+	cmd-&gt;gpio_num = __cpu_to_le32(gpio_num);</div><div class='add'>+	cmd-&gt;input = __cpu_to_le32(input);</div><div class='add'>+	cmd-&gt;intr_mode = __cpu_to_le32(intr_mode);</div><div class='add'>+</div><div class='add'>+	ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi gpio_config gpio_num 0x%08x input 0x%08x pull_type 0x%08x intr_mode 0x%08x\n",</div><div class='add'>+		   gpio_num, input, pull_type, intr_mode);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ath10k_wmi_op_gen_gpio_output(struct ath10k *ar,</div><div class='add'>+						     u32 gpio_num, u32 set)</div><div class='add'>+{</div><div class='add'>+	struct wmi_gpio_output_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_gpio_output_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;gpio_num = __cpu_to_le32(gpio_num);</div><div class='add'>+	cmd-&gt;set = __cpu_to_le32(set);</div><div class='add'>+</div><div class='add'>+	ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi gpio_output gpio_num 0x%08x set 0x%08x\n",</div><div class='add'>+		   gpio_num, set);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct sk_buff *</div><div class='ctx'> ath10k_wmi_op_gen_set_psmode(struct ath10k *ar, u32 vdev_id,</div><div class='ctx'> 			     enum wmi_sta_ps_mode psmode)</div><div class='hunk'>@@ -8160,28 +8236,6 @@ ath10k_wmi_10_2_4_op_gen_pdev_get_tpc_config(struct ath10k *ar, u32 param)</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-size_t ath10k_wmi_fw_stats_num_peers(struct list_head *head)</div><div class='del'>-{</div><div class='del'>-	struct ath10k_fw_stats_peer *i;</div><div class='del'>-	size_t num = 0;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(i, head, list)</div><div class='del'>-		++num;</div><div class='del'>-</div><div class='del'>-	return num;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-size_t ath10k_wmi_fw_stats_num_vdevs(struct list_head *head)</div><div class='del'>-{</div><div class='del'>-	struct ath10k_fw_stats_vdev *i;</div><div class='del'>-	size_t num = 0;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(i, head, list)</div><div class='del'>-		++num;</div><div class='del'>-</div><div class='del'>-	return num;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> ath10k_wmi_fw_pdev_base_stats_fill(const struct ath10k_fw_stats_pdev *pdev,</div><div class='ctx'> 				   char *buf, u32 *length)</div><div class='hunk'>@@ -8270,7 +8324,7 @@ ath10k_wmi_fw_pdev_tx_stats_fill(const struct ath10k_fw_stats_pdev *pdev,</div><div class='ctx'> 	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='ctx'> 			 "PPDUs cleaned", pdev-&gt;tx_abort);</div><div class='ctx'> 	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='del'>-			 "MPDUs requed", pdev-&gt;mpdus_requed);</div><div class='add'>+			 "MPDUs requeued", pdev-&gt;mpdus_requeued);</div><div class='ctx'> 	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='ctx'> 			 "Excessive retries", pdev-&gt;tx_ko);</div><div class='ctx'> 	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='hunk'>@@ -8458,8 +8512,8 @@ void ath10k_wmi_main_op_fw_stats_fill(struct ath10k *ar,</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	num_peers = ath10k_wmi_fw_stats_num_peers(&amp;fw_stats-&gt;peers);</div><div class='del'>-	num_vdevs = ath10k_wmi_fw_stats_num_vdevs(&amp;fw_stats-&gt;vdevs);</div><div class='add'>+	num_peers = list_count_nodes(&amp;fw_stats-&gt;peers);</div><div class='add'>+	num_vdevs = list_count_nodes(&amp;fw_stats-&gt;vdevs);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_wmi_fw_pdev_base_stats_fill(pdev, buf, &amp;len);</div><div class='ctx'> 	ath10k_wmi_fw_pdev_tx_stats_fill(pdev, buf, &amp;len);</div><div class='hunk'>@@ -8516,8 +8570,8 @@ void ath10k_wmi_10x_op_fw_stats_fill(struct ath10k *ar,</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	num_peers = ath10k_wmi_fw_stats_num_peers(&amp;fw_stats-&gt;peers);</div><div class='del'>-	num_vdevs = ath10k_wmi_fw_stats_num_vdevs(&amp;fw_stats-&gt;vdevs);</div><div class='add'>+	num_peers = list_count_nodes(&amp;fw_stats-&gt;peers);</div><div class='add'>+	num_vdevs = list_count_nodes(&amp;fw_stats-&gt;vdevs);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_wmi_fw_pdev_base_stats_fill(pdev, buf, &amp;len);</div><div class='ctx'> 	ath10k_wmi_fw_pdev_extra_stats_fill(pdev, buf, &amp;len);</div><div class='hunk'>@@ -8664,8 +8718,8 @@ void ath10k_wmi_10_4_op_fw_stats_fill(struct ath10k *ar,</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	num_peers = ath10k_wmi_fw_stats_num_peers(&amp;fw_stats-&gt;peers);</div><div class='del'>-	num_vdevs = ath10k_wmi_fw_stats_num_vdevs(&amp;fw_stats-&gt;vdevs);</div><div class='add'>+	num_peers = list_count_nodes(&amp;fw_stats-&gt;peers);</div><div class='add'>+	num_vdevs = list_count_nodes(&amp;fw_stats-&gt;vdevs);</div><div class='ctx'> </div><div class='ctx'> 	ath10k_wmi_fw_pdev_base_stats_fill(pdev, buf, &amp;len);</div><div class='ctx'> 	ath10k_wmi_fw_pdev_extra_stats_fill(pdev, buf, &amp;len);</div><div class='hunk'>@@ -8750,9 +8804,9 @@ int ath10k_wmi_op_get_vdev_subtype(struct ath10k *ar,</div><div class='ctx'> 		return WMI_VDEV_SUBTYPE_LEGACY_PROXY_STA;</div><div class='ctx'> 	case WMI_VDEV_SUBTYPE_MESH_11S:</div><div class='ctx'> 	case WMI_VDEV_SUBTYPE_MESH_NON_11S:</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='del'>-	return -ENOTSUPP;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath10k_wmi_10_2_4_op_get_vdev_subtype(struct ath10k *ar,</div><div class='hunk'>@@ -8772,9 +8826,9 @@ static int ath10k_wmi_10_2_4_op_get_vdev_subtype(struct ath10k *ar,</div><div class='ctx'> 	case WMI_VDEV_SUBTYPE_MESH_11S:</div><div class='ctx'> 		return WMI_VDEV_SUBTYPE_10_2_4_MESH_11S;</div><div class='ctx'> 	case WMI_VDEV_SUBTYPE_MESH_NON_11S:</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='del'>-	return -ENOTSUPP;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath10k_wmi_10_4_op_get_vdev_subtype(struct ath10k *ar,</div><div class='hunk'>@@ -8796,7 +8850,7 @@ static int ath10k_wmi_10_4_op_get_vdev_subtype(struct ath10k *ar,</div><div class='ctx'> 	case WMI_VDEV_SUBTYPE_MESH_NON_11S:</div><div class='ctx'> 		return WMI_VDEV_SUBTYPE_10_4_MESH_NON_11S;</div><div class='ctx'> 	}</div><div class='del'>-	return -ENOTSUPP;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *</div><div class='hunk'>@@ -8935,8 +8989,6 @@ ath10k_wmi_10_4_gen_tdls_peer_update(struct ath10k *ar,</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	memset(skb-&gt;data, 0, sizeof(*cmd));</div><div class='del'>-</div><div class='ctx'> 	cmd = (struct wmi_10_4_tdls_peer_update_cmd *)skb-&gt;data;</div><div class='ctx'> 	cmd-&gt;vdev_id = __cpu_to_le32(arg-&gt;vdev_id);</div><div class='ctx'> 	ether_addr_copy(cmd-&gt;peer_macaddr.addr, arg-&gt;addr);</div><div class='hunk'>@@ -9156,6 +9208,9 @@ static const struct wmi_ops wmi_ops = {</div><div class='ctx'> 	.fw_stats_fill = ath10k_wmi_main_op_fw_stats_fill,</div><div class='ctx'> 	.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,</div><div class='ctx'> 	.gen_echo = ath10k_wmi_op_gen_echo,</div><div class='add'>+	.gen_gpio_config = ath10k_wmi_op_gen_gpio_config,</div><div class='add'>+	.gen_gpio_output = ath10k_wmi_op_gen_gpio_output,</div><div class='add'>+</div><div class='ctx'> 	/* .gen_bcn_tmpl not implemented */</div><div class='ctx'> 	/* .gen_prb_tmpl not implemented */</div><div class='ctx'> 	/* .gen_p2p_go_bcn_ie not implemented */</div><div class='hunk'>@@ -9226,6 +9281,8 @@ static const struct wmi_ops wmi_10_1_ops = {</div><div class='ctx'> 	.fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill,</div><div class='ctx'> 	.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,</div><div class='ctx'> 	.gen_echo = ath10k_wmi_op_gen_echo,</div><div class='add'>+	.gen_gpio_config = ath10k_wmi_op_gen_gpio_config,</div><div class='add'>+	.gen_gpio_output = ath10k_wmi_op_gen_gpio_output,</div><div class='ctx'> 	/* .gen_bcn_tmpl not implemented */</div><div class='ctx'> 	/* .gen_prb_tmpl not implemented */</div><div class='ctx'> 	/* .gen_p2p_go_bcn_ie not implemented */</div><div class='hunk'>@@ -9298,6 +9355,8 @@ static const struct wmi_ops wmi_10_2_ops = {</div><div class='ctx'> 	.gen_delba_send = ath10k_wmi_op_gen_delba_send,</div><div class='ctx'> 	.fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill,</div><div class='ctx'> 	.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,</div><div class='add'>+	.gen_gpio_config = ath10k_wmi_op_gen_gpio_config,</div><div class='add'>+	.gen_gpio_output = ath10k_wmi_op_gen_gpio_output,</div><div class='ctx'> 	/* .gen_pdev_enable_adaptive_cca not implemented */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -9369,6 +9428,8 @@ static const struct wmi_ops wmi_10_2_4_ops = {</div><div class='ctx'> 		ath10k_wmi_op_gen_pdev_enable_adaptive_cca,</div><div class='ctx'> 	.get_vdev_subtype = ath10k_wmi_10_2_4_op_get_vdev_subtype,</div><div class='ctx'> 	.gen_bb_timing = ath10k_wmi_10_2_4_op_gen_bb_timing,</div><div class='add'>+	.gen_gpio_config = ath10k_wmi_op_gen_gpio_config,</div><div class='add'>+	.gen_gpio_output = ath10k_wmi_op_gen_gpio_output,</div><div class='ctx'> 	/* .gen_bcn_tmpl not implemented */</div><div class='ctx'> 	/* .gen_prb_tmpl not implemented */</div><div class='ctx'> 	/* .gen_p2p_go_bcn_ie not implemented */</div><div class='hunk'>@@ -9450,6 +9511,8 @@ static const struct wmi_ops wmi_10_4_ops = {</div><div class='ctx'> 	.gen_pdev_bss_chan_info_req = ath10k_wmi_10_2_op_gen_pdev_bss_chan_info,</div><div class='ctx'> 	.gen_echo = ath10k_wmi_op_gen_echo,</div><div class='ctx'> 	.gen_pdev_get_tpc_config = ath10k_wmi_10_2_4_op_gen_pdev_get_tpc_config,</div><div class='add'>+	.gen_gpio_config = ath10k_wmi_op_gen_gpio_config,</div><div class='add'>+	.gen_gpio_output = ath10k_wmi_op_gen_gpio_output,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int ath10k_wmi_attach(struct ath10k *ar)</div><div class='hunk'>@@ -9557,6 +9620,7 @@ static int ath10k_wmi_mgmt_tx_clean_up_pending(int msdu_id, void *ptr,</div><div class='ctx'> 	dma_unmap_single(ar-&gt;dev, pkt_addr-&gt;paddr,</div><div class='ctx'> 			 msdu-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> 	ieee80211_free_txskb(ar-&gt;hw, msdu);</div><div class='add'>+	kfree(pkt_addr);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h<br/>index d870f7067cb7..7f50a1de6b97 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/wmi.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/wmi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/wmi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/wmi.h</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  * Copyright (c) 2005-2011 Atheros Communications Inc.</div><div class='ctx'>  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.</div><div class='ctx'>  * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _WMI_H_</div><div class='hunk'>@@ -2066,7 +2067,9 @@ struct wmi_channel {</div><div class='ctx'> 	union {</div><div class='ctx'> 		__le32 reginfo1;</div><div class='ctx'> 		struct {</div><div class='add'>+			/* note: power unit is 1 dBm */</div><div class='ctx'> 			u8 antenna_max;</div><div class='add'>+			/* note: power unit is 0.5 dBm */</div><div class='ctx'> 			u8 max_tx_power;</div><div class='ctx'> 		} __packed;</div><div class='ctx'> 	} __packed;</div><div class='hunk'>@@ -2086,6 +2089,7 @@ struct wmi_channel_arg {</div><div class='ctx'> 	u32 min_power;</div><div class='ctx'> 	u32 max_power;</div><div class='ctx'> 	u32 max_reg_power;</div><div class='add'>+	/* note: power unit is 1 dBm */</div><div class='ctx'> 	u32 max_antenna_gain;</div><div class='ctx'> 	u32 reg_class_id;</div><div class='ctx'> 	enum wmi_phy_mode mode;</div><div class='hunk'>@@ -3004,8 +3008,11 @@ enum wmi_coex_version {</div><div class='ctx'>  * @WMI_10_4_TDLS_UAPSD_SLEEP_STA: TDLS sleep sta support enable/disable</div><div class='ctx'>  * @WMI_10_4_TDLS_CONN_TRACKER_IN_HOST_MODE: TDLS connection tracker in host</div><div class='ctx'>  *	enable/disable</div><div class='del'>- * @WMI_10_4_TDLS_EXPLICIT_MODE_ONLY:Explicit TDLS mode enable/disable</div><div class='add'>+ * @WMI_10_4_TDLS_EXPLICIT_MODE_ONLY: Explicit TDLS mode enable/disable</div><div class='ctx'>  * @WMI_10_4_TX_DATA_ACK_RSSI: Enable DATA ACK RSSI if firmware is capable</div><div class='add'>+ * @WMI_10_4_EXT_PEER_TID_CONFIGS_SUPPORT:  Firmware supports Extended Peer</div><div class='add'>+ *	TID configuration for QoS related settings</div><div class='add'>+ * @WMI_10_4_REPORT_AIRTIME: Firmware supports transmit airtime reporting</div><div class='ctx'>  */</div><div class='ctx'> enum wmi_10_4_feature_mask {</div><div class='ctx'> 	WMI_10_4_LTEU_SUPPORT			= BIT(0),</div><div class='hunk'>@@ -3027,6 +3034,41 @@ enum wmi_10_4_feature_mask {</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* WMI_GPIO_CONFIG_CMDID */</div><div class='add'>+enum {</div><div class='add'>+	WMI_GPIO_PULL_NONE,</div><div class='add'>+	WMI_GPIO_PULL_UP,</div><div class='add'>+	WMI_GPIO_PULL_DOWN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	WMI_GPIO_INTTYPE_DISABLE,</div><div class='add'>+	WMI_GPIO_INTTYPE_RISING_EDGE,</div><div class='add'>+	WMI_GPIO_INTTYPE_FALLING_EDGE,</div><div class='add'>+	WMI_GPIO_INTTYPE_BOTH_EDGE,</div><div class='add'>+	WMI_GPIO_INTTYPE_LEVEL_LOW,</div><div class='add'>+	WMI_GPIO_INTTYPE_LEVEL_HIGH</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* WMI_GPIO_CONFIG_CMDID */</div><div class='add'>+struct wmi_gpio_config_cmd {</div><div class='add'>+	__le32 gpio_num;             /* GPIO number to be setup */</div><div class='add'>+	__le32 input;                /* 0 - Output/ 1 - Input */</div><div class='add'>+	__le32 pull_type;            /* Pull type defined above */</div><div class='add'>+	__le32 intr_mode;            /* Interrupt mode defined above (Input) */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* WMI_GPIO_OUTPUT_CMDID */</div><div class='add'>+struct wmi_gpio_output_cmd {</div><div class='add'>+	__le32 gpio_num;    /* GPIO number to be setup */</div><div class='add'>+	__le32 set;         /* Set the GPIO pin*/</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* WMI_GPIO_INPUT_EVENTID */</div><div class='add'>+struct wmi_gpio_input_event {</div><div class='add'>+	__le32 gpio_num;    /* GPIO number which changed state */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct wmi_ext_resource_config_10_4_cmd {</div><div class='ctx'> 	/* contains enum wmi_host_platform_type */</div><div class='ctx'> 	__le32 host_platform_config;</div><div class='hunk'>@@ -3065,7 +3107,10 @@ struct host_memory_chunk {</div><div class='ctx'> struct wmi_host_mem_chunks {</div><div class='ctx'> 	__le32 count;</div><div class='ctx'> 	/* some fw revisions require at least 1 chunk regardless of count */</div><div class='del'>-	struct host_memory_chunk items[1];</div><div class='add'>+	union {</div><div class='add'>+		struct host_memory_chunk item;</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct host_memory_chunk, items);</div><div class='add'>+	};</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_init_cmd {</div><div class='hunk'>@@ -3167,7 +3212,7 @@ struct wmi_start_scan_common {</div><div class='ctx'> 	/* dwell time in msec on passive channels */</div><div class='ctx'> 	__le32 dwell_time_passive;</div><div class='ctx'> 	/*</div><div class='del'>-	 * min time in msec on the BSS channel,only valid if atleast one</div><div class='add'>+	 * min time in msec on the BSS channel,only valid if at least one</div><div class='ctx'> 	 * VDEV is active</div><div class='ctx'> 	 */</div><div class='ctx'> 	__le32 min_rest_time;</div><div class='hunk'>@@ -3193,7 +3238,7 @@ struct wmi_start_scan_common {</div><div class='ctx'> 	 * and bssid_list</div><div class='ctx'> 	 */</div><div class='ctx'> 	__le32 repeat_probe_time;</div><div class='del'>-	/* time in msec between 2 consequetive probe requests with in a set. */</div><div class='add'>+	/* time in msec between 2 consecutive probe requests with in a set. */</div><div class='ctx'> 	__le32 probe_spacing_time;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * data inactivity time in msec on bss channel that will be used by</div><div class='hunk'>@@ -3211,23 +3256,16 @@ struct wmi_start_scan_common {</div><div class='ctx'> 	__le32 scan_ctrl_flags;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct wmi_start_scan_tlvs {</div><div class='del'>-	/* TLV parameters. These includes channel list, ssid list, bssid list,</div><div class='del'>-	 * extra ies.</div><div class='del'>-	 */</div><div class='del'>-	u8 tlvs[0];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='ctx'> struct wmi_start_scan_cmd {</div><div class='ctx'> 	struct wmi_start_scan_common common;</div><div class='ctx'> 	__le32 burst_duration_ms;</div><div class='del'>-	struct wmi_start_scan_tlvs tlvs;</div><div class='add'>+	u8 tlvs[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* This is the definition from 10.X firmware branch */</div><div class='ctx'> struct wmi_10x_start_scan_cmd {</div><div class='ctx'> 	struct wmi_start_scan_common common;</div><div class='del'>-	struct wmi_start_scan_tlvs tlvs;</div><div class='add'>+	u8 tlvs[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_ssid_arg {</div><div class='hunk'>@@ -3475,7 +3513,9 @@ struct wmi_phyerr_event {</div><div class='ctx'> 	__le32 num_phyerrs;</div><div class='ctx'> 	__le32 tsf_l32;</div><div class='ctx'> 	__le32 tsf_u32;</div><div class='del'>-	struct wmi_phyerr phyerrs[];</div><div class='add'>+</div><div class='add'>+	/* array of struct wmi_phyerr */</div><div class='add'>+	u8 phyerrs[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_10_4_phyerr_event {</div><div class='hunk'>@@ -3849,9 +3889,9 @@ enum wmi_pdev_param {</div><div class='ctx'> 	 * retransmitting frames.</div><div class='ctx'> 	 */</div><div class='ctx'> 	WMI_PDEV_PARAM_DYNAMIC_BW,</div><div class='del'>-	/* Non aggregrate/ 11g sw retry threshold.0-disable */</div><div class='add'>+	/* Non aggregate/ 11g sw retry threshold.0-disable */</div><div class='ctx'> 	WMI_PDEV_PARAM_NON_AGG_SW_RETRY_TH,</div><div class='del'>-	/* aggregrate sw retry threshold. 0-disable*/</div><div class='add'>+	/* aggregate sw retry threshold. 0-disable*/</div><div class='ctx'> 	WMI_PDEV_PARAM_AGG_SW_RETRY_TH,</div><div class='ctx'> 	/* Station kickout threshold (non of consecutive failures).0-disable */</div><div class='ctx'> 	WMI_PDEV_PARAM_STA_KICKOUT_TH,</div><div class='hunk'>@@ -3948,9 +3988,9 @@ enum wmi_10x_pdev_param {</div><div class='ctx'> 	WMI_10X_PDEV_PARAM_PROTECTION_MODE,</div><div class='ctx'> 	/* Dynamic bandwidth 0: disable 1: enable */</div><div class='ctx'> 	WMI_10X_PDEV_PARAM_DYNAMIC_BW,</div><div class='del'>-	/* Non aggregrate/ 11g sw retry threshold.0-disable */</div><div class='add'>+	/* Non aggregate/ 11g sw retry threshold.0-disable */</div><div class='ctx'> 	WMI_10X_PDEV_PARAM_NON_AGG_SW_RETRY_TH,</div><div class='del'>-	/* aggregrate sw retry threshold. 0-disable*/</div><div class='add'>+	/* aggregate sw retry threshold. 0-disable*/</div><div class='ctx'> 	WMI_10X_PDEV_PARAM_AGG_SW_RETRY_TH,</div><div class='ctx'> 	/* Station kickout threshold (non of consecutive failures).0-disable */</div><div class='ctx'> 	WMI_10X_PDEV_PARAM_STA_KICKOUT_TH,</div><div class='hunk'>@@ -4254,13 +4294,6 @@ struct wmi_peer_sta_ps_state_chg_event {</div><div class='ctx'> 	__le32 peer_ps_state;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct wmi_pdev_chanlist_update_event {</div><div class='del'>-	/* number of channels */</div><div class='del'>-	__le32 num_chan;</div><div class='del'>-	/* array of channels */</div><div class='del'>-	struct wmi_channel channel_list[1];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='ctx'> #define WMI_MAX_DEBUG_MESG (sizeof(u32) * 32)</div><div class='ctx'> </div><div class='ctx'> struct wmi_debug_mesg_event {</div><div class='hunk'>@@ -4371,8 +4404,8 @@ struct wmi_pdev_stats_tx {</div><div class='ctx'> 	/* Num PPDUs cleaned up in TX abort */</div><div class='ctx'> 	__le32 tx_abort;</div><div class='ctx'> </div><div class='del'>-	/* Num MPDUs requed by SW */</div><div class='del'>-	__le32 mpdus_requed;</div><div class='add'>+	/* Num MPDUs requeued by SW */</div><div class='add'>+	__le32 mpdus_requeued;</div><div class='ctx'> </div><div class='ctx'> 	/* excessive retries */</div><div class='ctx'> 	__le32 tx_ko;</div><div class='hunk'>@@ -4392,7 +4425,7 @@ struct wmi_pdev_stats_tx {</div><div class='ctx'> 	/* wal pdev continuous xretry */</div><div class='ctx'> 	__le32 pdev_cont_xretry;</div><div class='ctx'> </div><div class='del'>-	/* wal pdev continous xretry */</div><div class='add'>+	/* wal pdev continuous xretry */</div><div class='ctx'> 	__le32 pdev_tx_timeout;</div><div class='ctx'> </div><div class='ctx'> 	/* wal pdev resets  */</div><div class='hunk'>@@ -4444,8 +4477,8 @@ struct wmi_10_4_pdev_stats_tx {</div><div class='ctx'> 	/* Num PPDUs cleaned up in TX abort */</div><div class='ctx'> 	__le32 tx_abort;</div><div class='ctx'> </div><div class='del'>-	/* Num MPDUs requed by SW */</div><div class='del'>-	__le32 mpdus_requed;</div><div class='add'>+	/* Num MPDUs requeued by SW */</div><div class='add'>+	__le32 mpdus_requeued;</div><div class='ctx'> </div><div class='ctx'> 	/* excessive retries */</div><div class='ctx'> 	__le32 tx_ko;</div><div class='hunk'>@@ -5235,7 +5268,7 @@ enum wmi_vdev_param {</div><div class='ctx'> 	 * scheduler.</div><div class='ctx'> 	 */</div><div class='ctx'> 	WMI_VDEV_OC_SCHEDULER_AIR_TIME_LIMIT,</div><div class='del'>-	/* enable/dsiable WDS for this VDEV  */</div><div class='add'>+	/* enable/disable WDS for this VDEV  */</div><div class='ctx'> 	WMI_VDEV_PARAM_WDS,</div><div class='ctx'> 	/* ATIM Window */</div><div class='ctx'> 	WMI_VDEV_PARAM_ATIM_WINDOW,</div><div class='hunk'>@@ -5367,7 +5400,7 @@ enum wmi_10x_vdev_param {</div><div class='ctx'> 	 * scheduler.</div><div class='ctx'> 	 */</div><div class='ctx'> 	WMI_10X_VDEV_OC_SCHEDULER_AIR_TIME_LIMIT,</div><div class='del'>-	/* enable/dsiable WDS for this VDEV  */</div><div class='add'>+	/* enable/disable WDS for this VDEV  */</div><div class='ctx'> 	WMI_10X_VDEV_PARAM_WDS,</div><div class='ctx'> 	/* ATIM Window */</div><div class='ctx'> 	WMI_10X_VDEV_PARAM_ATIM_WINDOW,</div><div class='hunk'>@@ -5787,30 +5820,6 @@ struct wmi_bcn_prb_info {</div><div class='ctx'> 	/* app IE */</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct wmi_bcn_tmpl_cmd {</div><div class='del'>-	/* unique id identifying the VDEV, generated by the caller */</div><div class='del'>-	__le32 vdev_id;</div><div class='del'>-	/* TIM IE offset from the beginning of the template. */</div><div class='del'>-	__le32 tim_ie_offset;</div><div class='del'>-	/* beacon probe capabilities and IEs */</div><div class='del'>-	struct wmi_bcn_prb_info bcn_prb_info;</div><div class='del'>-	/* beacon buffer length */</div><div class='del'>-	__le32 buf_len;</div><div class='del'>-	/* variable length data */</div><div class='del'>-	u8 data[1];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct wmi_prb_tmpl_cmd {</div><div class='del'>-	/* unique id identifying the VDEV, generated by the caller */</div><div class='del'>-	__le32 vdev_id;</div><div class='del'>-	/* beacon probe capabilities and IEs */</div><div class='del'>-	struct wmi_bcn_prb_info bcn_prb_info;</div><div class='del'>-	/* beacon buffer length */</div><div class='del'>-	__le32 buf_len;</div><div class='del'>-	/* Variable length data */</div><div class='del'>-	u8 data[1];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='ctx'> enum wmi_sta_ps_mode {</div><div class='ctx'> 	/* enable power save for the given STA VDEV */</div><div class='ctx'> 	WMI_STA_PS_MODE_DISABLED = 0,</div><div class='hunk'>@@ -5899,7 +5908,7 @@ enum wmi_sta_ps_param_tx_wake_threshold {</div><div class='ctx'> enum wmi_sta_ps_param_pspoll_count {</div><div class='ctx'> 	WMI_STA_PS_PSPOLL_COUNT_NO_MAX = 0,</div><div class='ctx'> 	/*</div><div class='del'>-	 * Values greater than 0 indicate the maximum numer of PS-Poll frames</div><div class='add'>+	 * Values greater than 0 indicate the maximum number of PS-Poll frames</div><div class='ctx'> 	 * FW will send before waking up.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='hunk'>@@ -6942,7 +6951,7 @@ struct wmi_echo_ev_arg {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct wmi_pdev_temperature_event {</div><div class='del'>-	/* temperature value in Celcius degree */</div><div class='add'>+	/* temperature value in Celsius degree */</div><div class='ctx'> 	__le32 temperature;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -7191,7 +7200,13 @@ struct wmi_tdls_peer_capabilities {</div><div class='ctx'> 	__le32 is_peer_responder;</div><div class='ctx'> 	__le32 pref_offchan_num;</div><div class='ctx'> 	__le32 pref_offchan_bw;</div><div class='del'>-	struct wmi_channel peer_chan_list[1];</div><div class='add'>+	union {</div><div class='add'>+		/* to match legacy implementation allocate room for</div><div class='add'>+		 * at least one record even if peer_chan_len is 0</div><div class='add'>+		 */</div><div class='add'>+		struct wmi_channel peer_chan_min_allocation;</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct wmi_channel, peer_chan_list);</div><div class='add'>+	};</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_10_4_tdls_peer_update_cmd {</div><div class='hunk'>@@ -7403,6 +7418,23 @@ struct wmi_pdev_bb_timing_cfg_cmd {</div><div class='ctx'> 	__le32 bb_xpa_timing;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct wmi_ftm_seg_hdr {</div><div class='add'>+	__le32 len;</div><div class='add'>+	__le32 msgref;</div><div class='add'>+	__le32 segmentinfo;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_ftm_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	struct wmi_ftm_seg_hdr seg_hdr;</div><div class='add'>+	u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_TLV_LEN      GENMASK(15, 0)</div><div class='add'>+#define WMI_TLV_TAG	 GENMASK(31, 16)</div><div class='add'>+#define MAX_WMI_UTF_LEN  252</div><div class='add'>+</div><div class='ctx'> struct ath10k;</div><div class='ctx'> struct ath10k_vif;</div><div class='ctx'> struct ath10k_fw_stats_pdev;</div><div class='hunk'>@@ -7418,7 +7450,6 @@ int ath10k_wmi_wait_for_unified_ready(struct ath10k *ar);</div><div class='ctx'> struct sk_buff *ath10k_wmi_alloc_skb(struct ath10k *ar, u32 len);</div><div class='ctx'> int ath10k_wmi_connect(struct ath10k *ar);</div><div class='ctx'> </div><div class='del'>-struct sk_buff *ath10k_wmi_alloc_skb(struct ath10k *ar, u32 len);</div><div class='ctx'> int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id);</div><div class='ctx'> int ath10k_wmi_cmd_send_nowait(struct ath10k *ar, struct sk_buff *skb,</div><div class='ctx'> 			       u32 cmd_id);</div><div class='hunk'>@@ -7498,8 +7529,6 @@ void ath10k_wmi_main_op_fw_stats_fill(struct ath10k *ar,</div><div class='ctx'> void ath10k_wmi_10x_op_fw_stats_fill(struct ath10k *ar,</div><div class='ctx'> 				     struct ath10k_fw_stats *fw_stats,</div><div class='ctx'> 				     char *buf);</div><div class='del'>-size_t ath10k_wmi_fw_stats_num_peers(struct list_head *head);</div><div class='del'>-size_t ath10k_wmi_fw_stats_num_vdevs(struct list_head *head);</div><div class='ctx'> void ath10k_wmi_10_4_op_fw_stats_fill(struct ath10k *ar,</div><div class='ctx'> 				      struct ath10k_fw_stats *fw_stats,</div><div class='ctx'> 				      char *buf);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath10k/wow.c b/drivers/net/wireless/ath/ath10k/wow.c<br/>index 7d65c115669f..aa7b2e703f3d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/wow.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath10k/wow.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath10k/wow.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath10k/wow.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2015-2017 Qualcomm Atheros, Inc.</div><div class='ctx'>  * Copyright (c) 2018, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "mac.h"</div><div class='hunk'>@@ -337,14 +338,15 @@ static int ath10k_vif_wow_set_wakeups(struct ath10k_vif *arvif,</div><div class='ctx'> 			if (patterns[i].mask[j / 8] &amp; BIT(j % 8))</div><div class='ctx'> 				bitmask[j] = 0xff;</div><div class='ctx'> 		old_pattern.mask = bitmask;</div><div class='del'>-		new_pattern = old_pattern;</div><div class='ctx'> </div><div class='ctx'> 		if (ar-&gt;wmi.rx_decap_mode == ATH10K_HW_TXRX_NATIVE_WIFI) {</div><div class='del'>-			if (patterns[i].pkt_offset &lt; ETH_HLEN)</div><div class='add'>+			if (patterns[i].pkt_offset &lt; ETH_HLEN) {</div><div class='ctx'> 				ath10k_wow_convert_8023_to_80211(&amp;new_pattern,</div><div class='ctx'> 								 &amp;old_pattern);</div><div class='del'>-			else</div><div class='add'>+			} else {</div><div class='add'>+				new_pattern = old_pattern;</div><div class='ctx'> 				new_pattern.pkt_offset += WOW_HDR_LEN - ETH_HLEN;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (WARN_ON(new_pattern.pattern_len &gt; WOW_MAX_PATTERN_SIZE))</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/Kconfig b/drivers/net/wireless/ath/ath11k/Kconfig<br/>index ad5cc6cac05b..659ef134ef16 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/Kconfig</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> config ATH11K</div><div class='ctx'> 	tristate "Qualcomm Technologies 802.11ax chipset support"</div><div class='ctx'> 	depends on MAC80211 &amp;&amp; HAS_DMA</div><div class='del'>-	depends on CRYPTO_MICHAEL_MIC</div><div class='add'>+	select CRYPTO_MICHAEL_MIC</div><div class='ctx'> 	select ATH_COMMON</div><div class='ctx'> 	select QCOM_QMI_HELPERS</div><div class='ctx'> 	help</div><div class='hunk'>@@ -24,6 +24,7 @@ config ATH11K_PCI</div><div class='ctx'> 	select MHI_BUS</div><div class='ctx'> 	select QRTR</div><div class='ctx'> 	select QRTR_MHI</div><div class='add'>+	select PCI_PWRCTRL_PWRSEQ if HAVE_PWRCTRL</div><div class='ctx'> 	help</div><div class='ctx'> 	  This module adds support for PCIE bus</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/Makefile b/drivers/net/wireless/ath/ath11k/Makefile<br/>index c1fce4159f1f..d9092414b362 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/Makefile</a></div><div class='hunk'>@@ -17,13 +17,17 @@ ath11k-y += core.o \</div><div class='ctx'> 	    peer.o \</div><div class='ctx'> 	    dbring.o \</div><div class='ctx'> 	    hw.o \</div><div class='del'>-	    wow.o</div><div class='add'>+	    pcic.o \</div><div class='add'>+	    fw.o \</div><div class='add'>+	    p2p.o</div><div class='ctx'> </div><div class='ctx'> ath11k-$(CONFIG_ATH11K_DEBUGFS) += debugfs.o debugfs_htt_stats.o debugfs_sta.o</div><div class='ctx'> ath11k-$(CONFIG_NL80211_TESTMODE) += testmode.o</div><div class='ctx'> ath11k-$(CONFIG_ATH11K_TRACING) += trace.o</div><div class='ctx'> ath11k-$(CONFIG_THERMAL) += thermal.o</div><div class='ctx'> ath11k-$(CONFIG_ATH11K_SPECTRAL) += spectral.o</div><div class='add'>+ath11k-$(CONFIG_PM) += wow.o</div><div class='add'>+ath11k-$(CONFIG_DEV_COREDUMP) += coredump.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_ATH11K_AHB) += ath11k_ahb.o</div><div class='ctx'> ath11k_ahb-y += ahb.o</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/ahb.c b/drivers/net/wireless/ath/ath11k/ahb.c<br/>index 8c9c781afc3e..8dfe9b40c126 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/ahb.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/ahb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/ahb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/ahb.c</a></div><div class='hunk'>@@ -1,17 +1,25 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='ctx'> #include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_reserved_mem.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/iommu.h&gt;</div><div class='ctx'> #include "ahb.h"</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> #include "hif.h"</div><div class='add'>+#include "qmi.h"</div><div class='ctx'> #include &lt;linux/remoteproc.h&gt;</div><div class='add'>+#include "pcic.h"</div><div class='add'>+#include &lt;linux/soc/qcom/smem.h&gt;</div><div class='add'>+#include &lt;linux/soc/qcom/smem_state.h&gt;</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id ath11k_ahb_of_match[] = {</div><div class='ctx'> 	/* TODO: Should we change the compatible string to something similar</div><div class='hunk'>@@ -23,18 +31,17 @@ static const struct of_device_id ath11k_ahb_of_match[] = {</div><div class='ctx'> 	{ .compatible = "qcom,ipq6018-wifi",</div><div class='ctx'> 	  .data = (void *)ATH11K_HW_IPQ6018_HW10,</div><div class='ctx'> 	},</div><div class='add'>+	{ .compatible = "qcom,wcn6750-wifi",</div><div class='add'>+	  .data = (void *)ATH11K_HW_WCN6750_HW10,</div><div class='add'>+	},</div><div class='add'>+	{ .compatible = "qcom,ipq5018-wifi",</div><div class='add'>+	  .data = (void *)ATH11K_HW_IPQ5018_HW10,</div><div class='add'>+	},</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(of, ath11k_ahb_of_match);</div><div class='ctx'> </div><div class='del'>-static const struct ath11k_bus_params ath11k_ahb_bus_params = {</div><div class='del'>-	.mhi_support = false,</div><div class='del'>-	.m3_fw_support = false,</div><div class='del'>-	.fixed_bdf_addr = true,</div><div class='del'>-	.fixed_mem_region = true,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define ATH11K_IRQ_CE0_OFFSET 4</div><div class='ctx'> </div><div class='ctx'> static const char *irq_name[ATH11K_IRQ_NUM_MAX] = {</div><div class='hunk'>@@ -134,6 +141,61 @@ enum ext_irq_num {</div><div class='ctx'> 	tcl2host_status_ring,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+ath11k_ahb_get_msi_irq_wcn6750(struct ath11k_base *ab, unsigned int vector)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;pci.msi.irqs[vector];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+ath11k_ahb_get_window_start_wcn6750(struct ath11k_base *ab, u32 offset)</div><div class='add'>+{</div><div class='add'>+	u32 window_start = 0;</div><div class='add'>+</div><div class='add'>+	/* If offset lies within DP register range, use 1st window */</div><div class='add'>+	if ((offset ^ HAL_SEQ_WCSS_UMAC_OFFSET) &lt; ATH11K_PCI_WINDOW_RANGE_MASK)</div><div class='add'>+		window_start = ATH11K_PCI_WINDOW_START;</div><div class='add'>+	/* If offset lies within CE register range, use 2nd window */</div><div class='add'>+	else if ((offset ^ HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab)) &lt;</div><div class='add'>+		 ATH11K_PCI_WINDOW_RANGE_MASK)</div><div class='add'>+		window_start = 2 * ATH11K_PCI_WINDOW_START;</div><div class='add'>+</div><div class='add'>+	return window_start;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath11k_ahb_window_write32_wcn6750(struct ath11k_base *ab, u32 offset, u32 value)</div><div class='add'>+{</div><div class='add'>+	u32 window_start;</div><div class='add'>+</div><div class='add'>+	/* WCN6750 uses static window based register access*/</div><div class='add'>+	window_start = ath11k_ahb_get_window_start_wcn6750(ab, offset);</div><div class='add'>+</div><div class='add'>+	iowrite32(value, ab-&gt;mem + window_start +</div><div class='add'>+		  (offset &amp; ATH11K_PCI_WINDOW_RANGE_MASK));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath11k_ahb_window_read32_wcn6750(struct ath11k_base *ab, u32 offset)</div><div class='add'>+{</div><div class='add'>+	u32 window_start;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* WCN6750 uses static window based register access */</div><div class='add'>+	window_start = ath11k_ahb_get_window_start_wcn6750(ab, offset);</div><div class='add'>+</div><div class='add'>+	val = ioread32(ab-&gt;mem + window_start +</div><div class='add'>+		       (offset &amp; ATH11K_PCI_WINDOW_RANGE_MASK));</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ath11k_pci_ops ath11k_ahb_pci_ops_wcn6750 = {</div><div class='add'>+	.wakeup = NULL,</div><div class='add'>+	.release = NULL,</div><div class='add'>+	.get_msi_irq = ath11k_ahb_get_msi_irq_wcn6750,</div><div class='add'>+	.window_write32 = ath11k_ahb_window_write32_wcn6750,</div><div class='add'>+	.window_read32 = ath11k_ahb_window_read32_wcn6750,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static inline u32 ath11k_ahb_read32(struct ath11k_base *ab, u32 offset)</div><div class='ctx'> {</div><div class='ctx'> 	return ioread32(ab-&gt;mem + offset);</div><div class='hunk'>@@ -175,8 +237,11 @@ static void __ath11k_ahb_ext_irq_disable(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> 		ath11k_ahb_ext_grp_disable(irq_grp);</div><div class='ctx'> </div><div class='del'>-		napi_synchronize(&amp;irq_grp-&gt;napi);</div><div class='del'>-		napi_disable(&amp;irq_grp-&gt;napi);</div><div class='add'>+		if (irq_grp-&gt;napi_enabled) {</div><div class='add'>+			napi_synchronize(&amp;irq_grp-&gt;napi);</div><div class='add'>+			napi_disable(&amp;irq_grp-&gt;napi);</div><div class='add'>+			irq_grp-&gt;napi_enabled = false;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -206,31 +271,43 @@ static void ath11k_ahb_clearbit32(struct ath11k_base *ab, u8 bit, u32 offset)</div><div class='ctx'> </div><div class='ctx'> static void ath11k_ahb_ce_irq_enable(struct ath11k_base *ab, u16 ce_id)</div><div class='ctx'> {</div><div class='del'>-	const struct ce_pipe_config *ce_config;</div><div class='add'>+	const struct ce_attr *ce_attr;</div><div class='add'>+	const struct ce_ie_addr *ce_ie_addr = ab-&gt;hw_params.ce_ie_addr;</div><div class='add'>+	u32 ie1_reg_addr, ie2_reg_addr, ie3_reg_addr;</div><div class='add'>+</div><div class='add'>+	ie1_reg_addr = ce_ie_addr-&gt;ie1_reg_addr + ATH11K_CE_OFFSET(ab);</div><div class='add'>+	ie2_reg_addr = ce_ie_addr-&gt;ie2_reg_addr + ATH11K_CE_OFFSET(ab);</div><div class='add'>+	ie3_reg_addr = ce_ie_addr-&gt;ie3_reg_addr + ATH11K_CE_OFFSET(ab);</div><div class='ctx'> </div><div class='del'>-	ce_config = &amp;ab-&gt;hw_params.target_ce_config[ce_id];</div><div class='del'>-	if (__le32_to_cpu(ce_config-&gt;pipedir) &amp; PIPEDIR_OUT)</div><div class='del'>-		ath11k_ahb_setbit32(ab, ce_id, CE_HOST_IE_ADDRESS);</div><div class='add'>+	ce_attr = &amp;ab-&gt;hw_params.host_ce_config[ce_id];</div><div class='add'>+	if (ce_attr-&gt;src_nentries)</div><div class='add'>+		ath11k_ahb_setbit32(ab, ce_id, ie1_reg_addr);</div><div class='ctx'> </div><div class='del'>-	if (__le32_to_cpu(ce_config-&gt;pipedir) &amp; PIPEDIR_IN) {</div><div class='del'>-		ath11k_ahb_setbit32(ab, ce_id, CE_HOST_IE_2_ADDRESS);</div><div class='add'>+	if (ce_attr-&gt;dest_nentries) {</div><div class='add'>+		ath11k_ahb_setbit32(ab, ce_id, ie2_reg_addr);</div><div class='ctx'> 		ath11k_ahb_setbit32(ab, ce_id + CE_HOST_IE_3_SHIFT,</div><div class='del'>-				    CE_HOST_IE_3_ADDRESS);</div><div class='add'>+				    ie3_reg_addr);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_ahb_ce_irq_disable(struct ath11k_base *ab, u16 ce_id)</div><div class='ctx'> {</div><div class='del'>-	const struct ce_pipe_config *ce_config;</div><div class='add'>+	const struct ce_attr *ce_attr;</div><div class='add'>+	const struct ce_ie_addr *ce_ie_addr = ab-&gt;hw_params.ce_ie_addr;</div><div class='add'>+	u32 ie1_reg_addr, ie2_reg_addr, ie3_reg_addr;</div><div class='ctx'> </div><div class='del'>-	ce_config = &amp;ab-&gt;hw_params.target_ce_config[ce_id];</div><div class='del'>-	if (__le32_to_cpu(ce_config-&gt;pipedir) &amp; PIPEDIR_OUT)</div><div class='del'>-		ath11k_ahb_clearbit32(ab, ce_id, CE_HOST_IE_ADDRESS);</div><div class='add'>+	ie1_reg_addr = ce_ie_addr-&gt;ie1_reg_addr + ATH11K_CE_OFFSET(ab);</div><div class='add'>+	ie2_reg_addr = ce_ie_addr-&gt;ie2_reg_addr + ATH11K_CE_OFFSET(ab);</div><div class='add'>+	ie3_reg_addr = ce_ie_addr-&gt;ie3_reg_addr + ATH11K_CE_OFFSET(ab);</div><div class='ctx'> </div><div class='del'>-	if (__le32_to_cpu(ce_config-&gt;pipedir) &amp; PIPEDIR_IN) {</div><div class='del'>-		ath11k_ahb_clearbit32(ab, ce_id, CE_HOST_IE_2_ADDRESS);</div><div class='add'>+	ce_attr = &amp;ab-&gt;hw_params.host_ce_config[ce_id];</div><div class='add'>+	if (ce_attr-&gt;src_nentries)</div><div class='add'>+		ath11k_ahb_clearbit32(ab, ce_id, ie1_reg_addr);</div><div class='add'>+</div><div class='add'>+	if (ce_attr-&gt;dest_nentries) {</div><div class='add'>+		ath11k_ahb_clearbit32(ab, ce_id, ie2_reg_addr);</div><div class='ctx'> 		ath11k_ahb_clearbit32(ab, ce_id + CE_HOST_IE_3_SHIFT,</div><div class='del'>-				      CE_HOST_IE_3_ADDRESS);</div><div class='add'>+				      ie3_reg_addr);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -300,7 +377,10 @@ static void ath11k_ahb_ext_irq_enable(struct ath11k_base *ab)</div><div class='ctx'> 	for (i = 0; i &lt; ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) {</div><div class='ctx'> 		struct ath11k_ext_irq_grp *irq_grp = &amp;ab-&gt;ext_irq_grp[i];</div><div class='ctx'> </div><div class='del'>-		napi_enable(&amp;irq_grp-&gt;napi);</div><div class='add'>+		if (!irq_grp-&gt;napi_enabled) {</div><div class='add'>+			napi_enable(&amp;irq_grp-&gt;napi);</div><div class='add'>+			irq_grp-&gt;napi_enabled = true;</div><div class='add'>+		}</div><div class='ctx'> 		ath11k_ahb_ext_grp_enable(irq_grp);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -317,7 +397,7 @@ static void ath11k_ahb_stop(struct ath11k_base *ab)</div><div class='ctx'> 		ath11k_ahb_ce_irqs_disable(ab);</div><div class='ctx'> 	ath11k_ahb_sync_ce_irqs(ab);</div><div class='ctx'> 	ath11k_ahb_kill_tasklets(ab);</div><div class='del'>-	del_timer_sync(&amp;ab-&gt;rx_replenish_retry);</div><div class='add'>+	timer_delete_sync(&amp;ab-&gt;rx_replenish_retry);</div><div class='ctx'> 	ath11k_ce_cleanup_pipes(ab);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -333,38 +413,13 @@ static int ath11k_ahb_power_up(struct ath11k_base *ab)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath11k_ahb_power_down(struct ath11k_base *ab)</div><div class='add'>+static void ath11k_ahb_power_down(struct ath11k_base *ab, bool is_suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab);</div><div class='ctx'> </div><div class='ctx'> 	rproc_shutdown(ab_ahb-&gt;tgt_rproc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_ahb_fwreset_from_cold_boot(struct ath11k_base *ab)</div><div class='del'>-{</div><div class='del'>-	int timeout;</div><div class='del'>-</div><div class='del'>-	if (ath11k_cold_boot_cal == 0 || ab-&gt;qmi.cal_done ||</div><div class='del'>-	    ab-&gt;hw_params.cold_boot_calib == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_AHB, "wait for cold boot done\n");</div><div class='del'>-	timeout = wait_event_timeout(ab-&gt;qmi.cold_boot_waitq,</div><div class='del'>-				     (ab-&gt;qmi.cal_done  == 1),</div><div class='del'>-				     ATH11K_COLD_BOOT_FW_RESET_DELAY);</div><div class='del'>-	if (timeout &lt;= 0) {</div><div class='del'>-		ath11k_cold_boot_cal = 0;</div><div class='del'>-		ath11k_warn(ab, "Coldboot Calibration failed timed out\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* reset the firmware */</div><div class='del'>-	ath11k_ahb_power_down(ab);</div><div class='del'>-	ath11k_ahb_power_up(ab);</div><div class='del'>-</div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_AHB, "exited from cold boot mode\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void ath11k_ahb_init_qmi_ce_config(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_qmi_ce_cfg *cfg = &amp;ab-&gt;qmi.ce_cfg;</div><div class='hunk'>@@ -385,6 +440,9 @@ static void ath11k_ahb_free_ext_irq(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> 		for (j = 0; j &lt; irq_grp-&gt;num_irq; j++)</div><div class='ctx'> 			free_irq(ab-&gt;irq_num[irq_grp-&gt;irqs[j]], irq_grp);</div><div class='add'>+</div><div class='add'>+		netif_napi_del(&amp;irq_grp-&gt;napi);</div><div class='add'>+		free_netdev(irq_grp-&gt;napi_ndev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -393,6 +451,9 @@ static void ath11k_ahb_free_irq(struct ath11k_base *ab)</div><div class='ctx'> 	int irq_idx;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (ab-&gt;hw_params.hybrid_bus_type)</div><div class='add'>+		return ath11k_pcic_free_irq(ab);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ab-&gt;hw_params.ce_count; i++) {</div><div class='ctx'> 		if (ath11k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -460,7 +521,7 @@ static irqreturn_t ath11k_ahb_ext_interrupt_handler(int irq, void *arg)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_ahb_ext_irq_config(struct ath11k_base *ab)</div><div class='add'>+static int ath11k_ahb_config_ext_irq(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_hw_params *hw = &amp;ab-&gt;hw_params;</div><div class='ctx'> 	int i, j;</div><div class='hunk'>@@ -473,9 +534,13 @@ static int ath11k_ahb_ext_irq_config(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> 		irq_grp-&gt;ab = ab;</div><div class='ctx'> 		irq_grp-&gt;grp_id = i;</div><div class='del'>-		init_dummy_netdev(&amp;irq_grp-&gt;napi_ndev);</div><div class='del'>-		netif_napi_add(&amp;irq_grp-&gt;napi_ndev, &amp;irq_grp-&gt;napi,</div><div class='del'>-			       ath11k_ahb_ext_grp_napi_poll, NAPI_POLL_WEIGHT);</div><div class='add'>+</div><div class='add'>+		irq_grp-&gt;napi_ndev = alloc_netdev_dummy(0);</div><div class='add'>+		if (!irq_grp-&gt;napi_ndev)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		netif_napi_add(irq_grp-&gt;napi_ndev, &amp;irq_grp-&gt;napi,</div><div class='add'>+			       ath11k_ahb_ext_grp_napi_poll);</div><div class='ctx'> </div><div class='ctx'> 		for (j = 0; j &lt; ATH11K_EXT_IRQ_NUM_MAX; j++) {</div><div class='ctx'> 			if (ab-&gt;hw_params.ring_mask-&gt;tx[i] &amp; BIT(j)) {</div><div class='hunk'>@@ -547,6 +612,9 @@ static int ath11k_ahb_config_irq(struct ath11k_base *ab)</div><div class='ctx'> 	int irq, irq_idx, i;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (ab-&gt;hw_params.hybrid_bus_type)</div><div class='add'>+		return ath11k_pcic_config_irq(ab);</div><div class='add'>+</div><div class='ctx'> 	/* Configure CE irqs */</div><div class='ctx'> 	for (i = 0; i &lt; ab-&gt;hw_params.ce_count; i++) {</div><div class='ctx'> 		struct ath11k_ce_pipe *ce_pipe = &amp;ab-&gt;ce.ce_pipe[i];</div><div class='hunk'>@@ -568,7 +636,7 @@ static int ath11k_ahb_config_irq(struct ath11k_base *ab)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Configure external interrupts */</div><div class='del'>-	ret = ath11k_ahb_ext_irq_config(ab);</div><div class='add'>+	ret = ath11k_ahb_config_ext_irq(ab);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -616,11 +684,90 @@ static int ath11k_ahb_map_service_to_pipe(struct ath11k_base *ab, u16 service_id</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct ath11k_hif_ops ath11k_ahb_hif_ops = {</div><div class='add'>+static int ath11k_ahb_hif_suspend(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab);</div><div class='add'>+	u32 wake_irq;</div><div class='add'>+	u32 value = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!device_may_wakeup(ab-&gt;dev))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	wake_irq = ab-&gt;irq_num[ATH11K_PCI_IRQ_CE0_OFFSET + ATH11K_PCI_CE_WAKE_IRQ];</div><div class='add'>+</div><div class='add'>+	ret = enable_irq_wake(wake_irq);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_err(ab, "failed to enable wakeup irq :%d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	value = u32_encode_bits(ab_ahb-&gt;smp2p_info.seq_no++,</div><div class='add'>+				ATH11K_AHB_SMP2P_SMEM_SEQ_NO);</div><div class='add'>+	value |= u32_encode_bits(ATH11K_AHB_POWER_SAVE_ENTER,</div><div class='add'>+				 ATH11K_AHB_SMP2P_SMEM_MSG);</div><div class='add'>+</div><div class='add'>+	ret = qcom_smem_state_update_bits(ab_ahb-&gt;smp2p_info.smem_state,</div><div class='add'>+					  ATH11K_AHB_SMP2P_SMEM_VALUE_MASK, value);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_err(ab, "failed to send smp2p power save enter cmd :%d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_AHB, "device suspended\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_ahb_hif_resume(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab);</div><div class='add'>+	u32 wake_irq;</div><div class='add'>+	u32 value = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!device_may_wakeup(ab-&gt;dev))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	wake_irq = ab-&gt;irq_num[ATH11K_PCI_IRQ_CE0_OFFSET + ATH11K_PCI_CE_WAKE_IRQ];</div><div class='add'>+</div><div class='add'>+	ret = disable_irq_wake(wake_irq);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_err(ab, "failed to disable wakeup irq: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;ab-&gt;wow.wakeup_completed);</div><div class='add'>+</div><div class='add'>+	value = u32_encode_bits(ab_ahb-&gt;smp2p_info.seq_no++,</div><div class='add'>+				ATH11K_AHB_SMP2P_SMEM_SEQ_NO);</div><div class='add'>+	value |= u32_encode_bits(ATH11K_AHB_POWER_SAVE_EXIT,</div><div class='add'>+				 ATH11K_AHB_SMP2P_SMEM_MSG);</div><div class='add'>+</div><div class='add'>+	ret = qcom_smem_state_update_bits(ab_ahb-&gt;smp2p_info.smem_state,</div><div class='add'>+					  ATH11K_AHB_SMP2P_SMEM_VALUE_MASK, value);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_err(ab, "failed to send smp2p power save enter cmd :%d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = wait_for_completion_timeout(&amp;ab-&gt;wow.wakeup_completed, 3 * HZ);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		ath11k_warn(ab, "timed out while waiting for wow wakeup completion\n");</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_AHB, "device resumed\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ath11k_hif_ops ath11k_ahb_hif_ops_ipq8074 = {</div><div class='ctx'> 	.start = ath11k_ahb_start,</div><div class='ctx'> 	.stop = ath11k_ahb_stop,</div><div class='ctx'> 	.read32 = ath11k_ahb_read32,</div><div class='ctx'> 	.write32 = ath11k_ahb_write32,</div><div class='add'>+	.read = NULL,</div><div class='ctx'> 	.irq_enable = ath11k_ahb_ext_irq_enable,</div><div class='ctx'> 	.irq_disable = ath11k_ahb_ext_irq_disable,</div><div class='ctx'> 	.map_service_to_pipe = ath11k_ahb_map_service_to_pipe,</div><div class='hunk'>@@ -628,6 +775,25 @@ static const struct ath11k_hif_ops ath11k_ahb_hif_ops = {</div><div class='ctx'> 	.power_up = ath11k_ahb_power_up,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct ath11k_hif_ops ath11k_ahb_hif_ops_wcn6750 = {</div><div class='add'>+	.start = ath11k_pcic_start,</div><div class='add'>+	.stop = ath11k_pcic_stop,</div><div class='add'>+	.read32 = ath11k_pcic_read32,</div><div class='add'>+	.write32 = ath11k_pcic_write32,</div><div class='add'>+	.read = NULL,</div><div class='add'>+	.irq_enable = ath11k_pcic_ext_irq_enable,</div><div class='add'>+	.irq_disable = ath11k_pcic_ext_irq_disable,</div><div class='add'>+	.get_msi_address =  ath11k_pcic_get_msi_address,</div><div class='add'>+	.get_user_msi_vector = ath11k_pcic_get_user_msi_assignment,</div><div class='add'>+	.map_service_to_pipe = ath11k_pcic_map_service_to_pipe,</div><div class='add'>+	.power_down = ath11k_ahb_power_down,</div><div class='add'>+	.power_up = ath11k_ahb_power_up,</div><div class='add'>+	.suspend = ath11k_ahb_hif_suspend,</div><div class='add'>+	.resume = ath11k_ahb_hif_resume,</div><div class='add'>+	.ce_irq_enable = ath11k_pci_enable_ce_irqs_except_wake_irq,</div><div class='add'>+	.ce_irq_disable = ath11k_pci_disable_ce_irqs_except_wake_irq,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int ath11k_core_get_rproc(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab);</div><div class='hunk'>@@ -642,34 +808,330 @@ static int ath11k_core_get_rproc(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> 	prproc = rproc_get_by_phandle(rproc_phandle);</div><div class='ctx'> 	if (!prproc) {</div><div class='del'>-		ath11k_err(ab, "failed to get rproc\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_AHB, "failed to get rproc, deferring\n");</div><div class='add'>+		return -EPROBE_DEFER;</div><div class='ctx'> 	}</div><div class='ctx'> 	ab_ahb-&gt;tgt_rproc = prproc;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_ahb_probe(struct platform_device *pdev)</div><div class='add'>+static int ath11k_ahb_setup_msi_resources(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_base *ab;</div><div class='del'>-	const struct of_device_id *of_id;</div><div class='del'>-	struct resource *mem_res;</div><div class='del'>-	void __iomem *mem;</div><div class='add'>+	struct platform_device *pdev = ab-&gt;pdev;</div><div class='add'>+	phys_addr_t msi_addr_pa;</div><div class='add'>+	dma_addr_t msi_addr_iova;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	int int_prop;</div><div class='ctx'> 	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_pcic_init_msi_config(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_err(ab, "failed to init msi config: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	of_id = of_match_device(ath11k_ahb_of_match, &amp;pdev-&gt;dev);</div><div class='del'>-	if (!of_id) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to find matching device tree id\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!res) {</div><div class='add'>+		ath11k_err(ab, "failed to fetch msi_addr\n");</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	msi_addr_pa = res-&gt;start;</div><div class='add'>+	msi_addr_iova = dma_map_resource(ab-&gt;dev, msi_addr_pa, PAGE_SIZE,</div><div class='add'>+					 DMA_FROM_DEVICE, 0);</div><div class='add'>+	if (dma_mapping_error(ab-&gt;dev, msi_addr_iova))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ab-&gt;pci.msi.addr_lo = lower_32_bits(msi_addr_iova);</div><div class='add'>+	ab-&gt;pci.msi.addr_hi = upper_32_bits(msi_addr_iova);</div><div class='add'>+</div><div class='add'>+	ret = of_property_read_u32_index(ab-&gt;dev-&gt;of_node, "interrupts", 1, &amp;int_prop);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ab-&gt;pci.msi.ep_base_data = int_prop + 32;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;pci.msi.config-&gt;total_vectors; i++) {</div><div class='add'>+		ret = platform_get_irq(pdev, i);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ab-&gt;pci.msi.irqs[i] = ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_bit(ATH11K_FLAG_MULTI_MSI_VECTORS, &amp;ab-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_ahb_setup_smp2p_handle(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab);</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;hw_params.smp2p_wow_exit)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ab_ahb-&gt;smp2p_info.smem_state = qcom_smem_state_get(ab-&gt;dev, "wlan-smp2p-out",</div><div class='add'>+							    &amp;ab_ahb-&gt;smp2p_info.smem_bit);</div><div class='add'>+	if (IS_ERR(ab_ahb-&gt;smp2p_info.smem_state)) {</div><div class='add'>+		ath11k_err(ab, "failed to fetch smem state: %ld\n",</div><div class='add'>+			   PTR_ERR(ab_ahb-&gt;smp2p_info.smem_state));</div><div class='add'>+		return PTR_ERR(ab_ahb-&gt;smp2p_info.smem_state);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_ahb_release_smp2p_handle(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab);</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;hw_params.smp2p_wow_exit)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	qcom_smem_state_put(ab_ahb-&gt;smp2p_info.smem_state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_ahb_setup_resources(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = ab-&gt;pdev;</div><div class='add'>+	struct resource *mem_res;</div><div class='add'>+	void __iomem *mem;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params.hybrid_bus_type)</div><div class='add'>+		return ath11k_ahb_setup_msi_resources(ab);</div><div class='add'>+</div><div class='ctx'> 	mem = devm_platform_get_and_ioremap_resource(pdev, 0, &amp;mem_res);</div><div class='ctx'> 	if (IS_ERR(mem)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "ioremap error\n");</div><div class='ctx'> 		return PTR_ERR(mem);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ab-&gt;mem = mem;</div><div class='add'>+	ab-&gt;mem_len = resource_size(mem_res);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_ahb_setup_msa_resources(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab);</div><div class='add'>+	struct device *dev = ab-&gt;dev;</div><div class='add'>+	struct resource r;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = of_reserved_mem_region_to_resource(dev-&gt;of_node, 0, &amp;r);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "failed to resolve msa fixed region\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab_ahb-&gt;fw.msa_paddr = r.start;</div><div class='add'>+	ab_ahb-&gt;fw.msa_size = resource_size(&amp;r);</div><div class='add'>+</div><div class='add'>+	ret = of_reserved_mem_region_to_resource(dev-&gt;of_node, 1, &amp;r);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "failed to resolve ce fixed region\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab_ahb-&gt;fw.ce_paddr = r.start;</div><div class='add'>+	ab_ahb-&gt;fw.ce_size = resource_size(&amp;r);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_ahb_ce_remap(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	const struct ce_remap *ce_remap = ab-&gt;hw_params.ce_remap;</div><div class='add'>+	struct platform_device *pdev = ab-&gt;pdev;</div><div class='add'>+</div><div class='add'>+	if (!ce_remap) {</div><div class='add'>+		/* no separate CE register space */</div><div class='add'>+		ab-&gt;mem_ce = ab-&gt;mem;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ce register space is moved out of wcss unlike ipq8074 or ipq6018</div><div class='add'>+	 * and the space is not contiguous, hence remapping the CE registers</div><div class='add'>+	 * to a new space for accessing them.</div><div class='add'>+	 */</div><div class='add'>+	ab-&gt;mem_ce = ioremap(ce_remap-&gt;base, ce_remap-&gt;size);</div><div class='add'>+	if (!ab-&gt;mem_ce) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "ce ioremap error\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_ahb_ce_unmap(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	if (ab-&gt;hw_params.ce_remap)</div><div class='add'>+		iounmap(ab-&gt;mem_ce);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_ahb_fw_resources_init(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab);</div><div class='add'>+	struct device *host_dev = ab-&gt;dev;</div><div class='add'>+	struct platform_device_info info = {};</div><div class='add'>+	struct iommu_domain *iommu_dom;</div><div class='add'>+	struct platform_device *pdev;</div><div class='add'>+	struct device_node *node;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Chipsets not requiring MSA need not initialize</div><div class='add'>+	 * MSA resources, return success in such cases.</div><div class='add'>+	 */</div><div class='add'>+	if (!ab-&gt;hw_params.fixed_fw_mem)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	node = of_get_child_by_name(host_dev-&gt;of_node, "wifi-firmware");</div><div class='add'>+	if (!node) {</div><div class='add'>+		ab_ahb-&gt;fw.use_tz = true;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_ahb_setup_msa_resources(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_err(ab, "failed to setup msa resources\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info.fwnode = &amp;node-&gt;fwnode;</div><div class='add'>+	info.parent = host_dev;</div><div class='add'>+	info.name = node-&gt;name;</div><div class='add'>+	info.dma_mask = DMA_BIT_MASK(32);</div><div class='add'>+</div><div class='add'>+	pdev = platform_device_register_full(&amp;info);</div><div class='add'>+	if (IS_ERR(pdev)) {</div><div class='add'>+		of_node_put(node);</div><div class='add'>+		return PTR_ERR(pdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = of_dma_configure(&amp;pdev-&gt;dev, node, true);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_err(ab, "dma configure fail: %d\n", ret);</div><div class='add'>+		goto err_unregister;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab_ahb-&gt;fw.dev = &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	iommu_dom = iommu_paging_domain_alloc(ab_ahb-&gt;fw.dev);</div><div class='add'>+	if (IS_ERR(iommu_dom)) {</div><div class='add'>+		ath11k_err(ab, "failed to allocate iommu domain\n");</div><div class='add'>+		ret = PTR_ERR(iommu_dom);</div><div class='add'>+		goto err_unregister;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iommu_attach_device(iommu_dom, ab_ahb-&gt;fw.dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_err(ab, "could not attach device: %d\n", ret);</div><div class='add'>+		goto err_iommu_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iommu_map(iommu_dom, ab_ahb-&gt;fw.msa_paddr,</div><div class='add'>+			ab_ahb-&gt;fw.msa_paddr, ab_ahb-&gt;fw.msa_size,</div><div class='add'>+			IOMMU_READ | IOMMU_WRITE, GFP_KERNEL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_err(ab, "failed to map firmware region: %d\n", ret);</div><div class='add'>+		goto err_iommu_detach;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iommu_map(iommu_dom, ab_ahb-&gt;fw.ce_paddr,</div><div class='add'>+			ab_ahb-&gt;fw.ce_paddr, ab_ahb-&gt;fw.ce_size,</div><div class='add'>+			IOMMU_READ | IOMMU_WRITE, GFP_KERNEL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_err(ab, "failed to map firmware CE region: %d\n", ret);</div><div class='add'>+		goto err_iommu_unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab_ahb-&gt;fw.use_tz = false;</div><div class='add'>+	ab_ahb-&gt;fw.iommu_domain = iommu_dom;</div><div class='add'>+	of_node_put(node);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_iommu_unmap:</div><div class='add'>+	iommu_unmap(iommu_dom, ab_ahb-&gt;fw.msa_paddr, ab_ahb-&gt;fw.msa_size);</div><div class='add'>+</div><div class='add'>+err_iommu_detach:</div><div class='add'>+	iommu_detach_device(iommu_dom, ab_ahb-&gt;fw.dev);</div><div class='add'>+</div><div class='add'>+err_iommu_free:</div><div class='add'>+	iommu_domain_free(iommu_dom);</div><div class='add'>+</div><div class='add'>+err_unregister:</div><div class='add'>+	platform_device_unregister(pdev);</div><div class='add'>+	of_node_put(node);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_ahb_fw_resource_deinit(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab);</div><div class='add'>+	struct iommu_domain *iommu;</div><div class='add'>+	size_t unmapped_size;</div><div class='add'>+</div><div class='add'>+	/* Chipsets not requiring MSA would have not initialized</div><div class='add'>+	 * MSA resources, return success in such cases.</div><div class='add'>+	 */</div><div class='add'>+	if (!ab-&gt;hw_params.fixed_fw_mem)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (ab_ahb-&gt;fw.use_tz)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	iommu = ab_ahb-&gt;fw.iommu_domain;</div><div class='add'>+</div><div class='add'>+	unmapped_size = iommu_unmap(iommu, ab_ahb-&gt;fw.msa_paddr, ab_ahb-&gt;fw.msa_size);</div><div class='add'>+	if (unmapped_size != ab_ahb-&gt;fw.msa_size)</div><div class='add'>+		ath11k_err(ab, "failed to unmap firmware: %zu\n",</div><div class='add'>+			   unmapped_size);</div><div class='add'>+</div><div class='add'>+	unmapped_size = iommu_unmap(iommu, ab_ahb-&gt;fw.ce_paddr, ab_ahb-&gt;fw.ce_size);</div><div class='add'>+	if (unmapped_size != ab_ahb-&gt;fw.ce_size)</div><div class='add'>+		ath11k_err(ab, "failed to unmap firmware CE memory: %zu\n",</div><div class='add'>+			   unmapped_size);</div><div class='add'>+</div><div class='add'>+	iommu_detach_device(iommu, ab_ahb-&gt;fw.dev);</div><div class='add'>+	iommu_domain_free(iommu);</div><div class='add'>+</div><div class='add'>+	platform_device_unregister(to_platform_device(ab_ahb-&gt;fw.dev));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_ahb_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab;</div><div class='add'>+	const struct ath11k_hif_ops *hif_ops;</div><div class='add'>+	const struct ath11k_pci_ops *pci_ops;</div><div class='add'>+	enum ath11k_hw_rev hw_rev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	hw_rev = (uintptr_t)device_get_match_data(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	switch (hw_rev) {</div><div class='add'>+	case ATH11K_HW_IPQ8074:</div><div class='add'>+	case ATH11K_HW_IPQ6018_HW10:</div><div class='add'>+	case ATH11K_HW_IPQ5018_HW10:</div><div class='add'>+		hif_ops = &amp;ath11k_ahb_hif_ops_ipq8074;</div><div class='add'>+		pci_ops = NULL;</div><div class='add'>+		break;</div><div class='add'>+	case ATH11K_HW_WCN6750_HW10:</div><div class='add'>+		hif_ops = &amp;ath11k_ahb_hif_ops_wcn6750;</div><div class='add'>+		pci_ops = &amp;ath11k_ahb_pci_ops_wcn6750;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "unsupported device type %d\n", hw_rev);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to set 32-bit consistent dma\n");</div><div class='hunk'>@@ -677,28 +1139,48 @@ static int ath11k_ahb_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ab = ath11k_core_alloc(&amp;pdev-&gt;dev, sizeof(struct ath11k_ahb),</div><div class='del'>-			       ATH11K_BUS_AHB,</div><div class='del'>-			       &amp;ath11k_ahb_bus_params);</div><div class='add'>+			       ATH11K_BUS_AHB);</div><div class='ctx'> 	if (!ab) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to allocate ath11k base\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ab-&gt;hif.ops = &amp;ath11k_ahb_hif_ops;</div><div class='add'>+	ab-&gt;hif.ops = hif_ops;</div><div class='ctx'> 	ab-&gt;pdev = pdev;</div><div class='del'>-	ab-&gt;hw_rev = (enum ath11k_hw_rev)of_id-&gt;data;</div><div class='del'>-	ab-&gt;mem = mem;</div><div class='del'>-	ab-&gt;mem_len = resource_size(mem_res);</div><div class='add'>+	ab-&gt;hw_rev = hw_rev;</div><div class='add'>+	ab-&gt;fw_mode = ATH11K_FIRMWARE_MODE_NORMAL;</div><div class='ctx'> 	platform_set_drvdata(pdev, ab);</div><div class='ctx'> </div><div class='add'>+	ret = ath11k_pcic_register_pci_ops(ab, pci_ops);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_err(ab, "failed to register PCI ops: %d\n", ret);</div><div class='add'>+		goto err_core_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = ath11k_core_pre_init(ab);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_core_free;</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_hal_srng_init(ab);</div><div class='add'>+	ret = ath11k_ahb_setup_resources(ab);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_core_free;</div><div class='ctx'> </div><div class='add'>+	ret = ath11k_ahb_ce_remap(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_core_free;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_ahb_fw_resources_init(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_ce_unmap;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_ahb_setup_smp2p_handle(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_fw_deinit;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_hal_srng_init(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_release_smp2p_handle;</div><div class='add'>+</div><div class='ctx'> 	ret = ath11k_ce_alloc_pipes(ab);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_err(ab, "failed to allocate ce pipes: %d\n", ret);</div><div class='hunk'>@@ -725,7 +1207,7 @@ static int ath11k_ahb_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err_ce_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_ahb_fwreset_from_cold_boot(ab);</div><div class='add'>+	ath11k_qmi_fwreset_from_cold_boot(ab);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -735,6 +1217,15 @@ err_ce_free:</div><div class='ctx'> err_hal_srng_deinit:</div><div class='ctx'> 	ath11k_hal_srng_deinit(ab);</div><div class='ctx'> </div><div class='add'>+err_release_smp2p_handle:</div><div class='add'>+	ath11k_ahb_release_smp2p_handle(ab);</div><div class='add'>+</div><div class='add'>+err_fw_deinit:</div><div class='add'>+	ath11k_ahb_fw_resource_deinit(ab);</div><div class='add'>+</div><div class='add'>+err_ce_unmap:</div><div class='add'>+	ath11k_ahb_ce_unmap(ab);</div><div class='add'>+</div><div class='ctx'> err_core_free:</div><div class='ctx'> 	ath11k_core_free(ab);</div><div class='ctx'> 	platform_set_drvdata(pdev, NULL);</div><div class='hunk'>@@ -742,20 +1233,10 @@ err_core_free:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_ahb_remove(struct platform_device *pdev)</div><div class='add'>+static void ath11k_ahb_remove_prepare(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_base *ab = platform_get_drvdata(pdev);</div><div class='ctx'> 	unsigned long left;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(ATH11K_FLAG_QMI_FAIL, &amp;ab-&gt;dev_flags)) {</div><div class='del'>-		ath11k_ahb_power_down(ab);</div><div class='del'>-		ath11k_debugfs_soc_destroy(ab);</div><div class='del'>-		ath11k_qmi_deinit_service(ab);</div><div class='del'>-		goto qmi_fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reinit_completion(&amp;ab-&gt;driver_recovery);</div><div class='del'>-</div><div class='ctx'> 	if (test_bit(ATH11K_FLAG_RECOVERY, &amp;ab-&gt;dev_flags)) {</div><div class='ctx'> 		left = wait_for_completion_timeout(&amp;ab-&gt;driver_recovery,</div><div class='ctx'> 						   ATH11K_AHB_RECOVERY_TIMEOUT);</div><div class='hunk'>@@ -765,38 +1246,74 @@ static int ath11k_ahb_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	set_bit(ATH11K_FLAG_UNREGISTERING, &amp;ab-&gt;dev_flags);</div><div class='ctx'> 	cancel_work_sync(&amp;ab-&gt;restart_work);</div><div class='add'>+	cancel_work_sync(&amp;ab-&gt;qmi.event_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_ahb_free_resources(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = ab-&gt;pdev;</div><div class='ctx'> </div><div class='del'>-	ath11k_core_deinit(ab);</div><div class='del'>-qmi_fail:</div><div class='ctx'> 	ath11k_ahb_free_irq(ab);</div><div class='ctx'> 	ath11k_hal_srng_deinit(ab);</div><div class='add'>+	ath11k_ahb_release_smp2p_handle(ab);</div><div class='add'>+	ath11k_ahb_fw_resource_deinit(ab);</div><div class='ctx'> 	ath11k_ce_free_pipes(ab);</div><div class='add'>+	ath11k_ahb_ce_unmap(ab);</div><div class='add'>+</div><div class='ctx'> 	ath11k_core_free(ab);</div><div class='ctx'> 	platform_set_drvdata(pdev, NULL);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+static void ath11k_ahb_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH11K_FLAG_QMI_FAIL, &amp;ab-&gt;dev_flags)) {</div><div class='add'>+		ath11k_ahb_power_down(ab, false);</div><div class='add'>+		ath11k_debugfs_soc_destroy(ab);</div><div class='add'>+		ath11k_qmi_deinit_service(ab);</div><div class='add'>+		goto qmi_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_ahb_remove_prepare(ab);</div><div class='add'>+	ath11k_core_deinit(ab);</div><div class='add'>+</div><div class='add'>+qmi_fail:</div><div class='add'>+	ath11k_fw_destroy(ab);</div><div class='add'>+	ath11k_ahb_free_resources(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_ahb_shutdown(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	/* platform shutdown() &amp; remove() are mutually exclusive.</div><div class='add'>+	 * remove() is invoked during rmmod &amp; shutdown() during</div><div class='add'>+	 * system reboot/shutdown.</div><div class='add'>+	 */</div><div class='add'>+	ath11k_ahb_remove_prepare(ab);</div><div class='add'>+</div><div class='add'>+	if (!(test_bit(ATH11K_FLAG_REGISTERED, &amp;ab-&gt;dev_flags)))</div><div class='add'>+		goto free_resources;</div><div class='add'>+</div><div class='add'>+	ath11k_core_deinit(ab);</div><div class='add'>+</div><div class='add'>+free_resources:</div><div class='add'>+	ath11k_fw_destroy(ab);</div><div class='add'>+	ath11k_ahb_free_resources(ab);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver ath11k_ahb_driver = {</div><div class='del'>-	.driver         = {</div><div class='del'>-		.name   = "ath11k",</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "ath11k",</div><div class='ctx'> 		.of_match_table = ath11k_ahb_of_match,</div><div class='ctx'> 	},</div><div class='del'>-	.probe  = ath11k_ahb_probe,</div><div class='add'>+	.probe = ath11k_ahb_probe,</div><div class='ctx'> 	.remove = ath11k_ahb_remove,</div><div class='add'>+	.shutdown = ath11k_ahb_shutdown,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ath11k_ahb_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ath11k_ahb_driver);</div><div class='del'>-}</div><div class='del'>-module_init(ath11k_ahb_init);</div><div class='del'>-</div><div class='del'>-static void ath11k_ahb_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ath11k_ahb_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(ath11k_ahb_exit);</div><div class='add'>+module_platform_driver(ath11k_ahb_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Driver support for Qualcomm Technologies 802.11ax WLAN AHB devices");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/ahb.h b/drivers/net/wireless/ath/ath11k/ahb.h<br/>index 51e6e4a5f686..415ddfd26654 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/ahb.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/ahb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/ahb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/ahb.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef ATH11K_AHB_H</div><div class='ctx'> #define ATH11K_AHB_H</div><div class='hunk'>@@ -8,10 +9,34 @@</div><div class='ctx'> #include "core.h"</div><div class='ctx'> </div><div class='ctx'> #define ATH11K_AHB_RECOVERY_TIMEOUT (3 * HZ)</div><div class='add'>+</div><div class='add'>+#define ATH11K_AHB_SMP2P_SMEM_MSG		GENMASK(15, 0)</div><div class='add'>+#define ATH11K_AHB_SMP2P_SMEM_SEQ_NO		GENMASK(31, 16)</div><div class='add'>+#define ATH11K_AHB_SMP2P_SMEM_VALUE_MASK	0xFFFFFFFF</div><div class='add'>+</div><div class='add'>+enum ath11k_ahb_smp2p_msg_id {</div><div class='add'>+	ATH11K_AHB_POWER_SAVE_ENTER = 1,</div><div class='add'>+	ATH11K_AHB_POWER_SAVE_EXIT,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ath11k_base;</div><div class='ctx'> </div><div class='ctx'> struct ath11k_ahb {</div><div class='ctx'> 	struct rproc *tgt_rproc;</div><div class='add'>+	struct {</div><div class='add'>+		struct device *dev;</div><div class='add'>+		struct iommu_domain *iommu_domain;</div><div class='add'>+		dma_addr_t msa_paddr;</div><div class='add'>+		u32 msa_size;</div><div class='add'>+		dma_addr_t ce_paddr;</div><div class='add'>+		u32 ce_size;</div><div class='add'>+		bool use_tz;</div><div class='add'>+	} fw;</div><div class='add'>+	struct {</div><div class='add'>+		unsigned short seq_no;</div><div class='add'>+		unsigned int smem_bit;</div><div class='add'>+		struct qcom_smem_state *smem_state;</div><div class='add'>+	} smp2p_info;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct ath11k_ahb *ath11k_ahb_priv(struct ath11k_base *ab)</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/ce.c b/drivers/net/wireless/ath/ath11k/ce.c<br/>index de8b632b058c..a7a163621b21 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/ce.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/ce.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/ce.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/ce.c</a></div><div class='hunk'>@@ -1,8 +1,11 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include "dp_rx.h"</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> #include "hif.h"</div><div class='hunk'>@@ -14,6 +17,7 @@ const struct ce_attr ath11k_host_ce_config_ipq8074[] = {</div><div class='ctx'> 		.src_nentries = 16,</div><div class='ctx'> 		.src_sz_max = 2048,</div><div class='ctx'> 		.dest_nentries = 0,</div><div class='add'>+		.send_cb = ath11k_htc_tx_completion_handler,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	/* CE1: target-&gt;host HTT + HTC control */</div><div class='hunk'>@@ -40,6 +44,7 @@ const struct ce_attr ath11k_host_ce_config_ipq8074[] = {</div><div class='ctx'> 		.src_nentries = 32,</div><div class='ctx'> 		.src_sz_max = 2048,</div><div class='ctx'> 		.dest_nentries = 0,</div><div class='add'>+		.send_cb = ath11k_htc_tx_completion_handler,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	/* CE4: host-&gt;target HTT */</div><div class='hunk'>@@ -73,11 +78,12 @@ const struct ce_attr ath11k_host_ce_config_ipq8074[] = {</div><div class='ctx'> 		.src_nentries = 32,</div><div class='ctx'> 		.src_sz_max = 2048,</div><div class='ctx'> 		.dest_nentries = 0,</div><div class='add'>+		.send_cb = ath11k_htc_tx_completion_handler,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	/* CE8: target autonomous hif_memcpy */</div><div class='ctx'> 	{</div><div class='del'>-		.flags = CE_ATTR_FLAGS,</div><div class='add'>+		.flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,</div><div class='ctx'> 		.src_nentries = 0,</div><div class='ctx'> 		.src_sz_max = 0,</div><div class='ctx'> 		.dest_nentries = 0,</div><div class='hunk'>@@ -89,6 +95,7 @@ const struct ce_attr ath11k_host_ce_config_ipq8074[] = {</div><div class='ctx'> 		.src_nentries = 32,</div><div class='ctx'> 		.src_sz_max = 2048,</div><div class='ctx'> 		.dest_nentries = 0,</div><div class='add'>+		.send_cb = ath11k_htc_tx_completion_handler,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	/* CE10: target-&gt;host HTT */</div><div class='hunk'>@@ -142,6 +149,7 @@ const struct ce_attr ath11k_host_ce_config_qca6390[] = {</div><div class='ctx'> 		.src_nentries = 32,</div><div class='ctx'> 		.src_sz_max = 2048,</div><div class='ctx'> 		.dest_nentries = 0,</div><div class='add'>+		.send_cb = ath11k_htc_tx_completion_handler,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	/* CE4: host-&gt;target HTT */</div><div class='hunk'>@@ -175,6 +183,7 @@ const struct ce_attr ath11k_host_ce_config_qca6390[] = {</div><div class='ctx'> 		.src_nentries = 32,</div><div class='ctx'> 		.src_sz_max = 2048,</div><div class='ctx'> 		.dest_nentries = 0,</div><div class='add'>+		.send_cb = ath11k_htc_tx_completion_handler,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	/* CE8: target autonomous hif_memcpy */</div><div class='hunk'>@@ -220,6 +229,7 @@ const struct ce_attr ath11k_host_ce_config_qcn9074[] = {</div><div class='ctx'> 		.src_nentries = 32,</div><div class='ctx'> 		.src_sz_max = 2048,</div><div class='ctx'> 		.dest_nentries = 0,</div><div class='add'>+		.send_cb = ath11k_htc_tx_completion_handler,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	/* CE4: host-&gt;target HTT */</div><div class='hunk'>@@ -242,7 +252,7 @@ const struct ce_attr ath11k_host_ce_config_qcn9074[] = {</div><div class='ctx'> </div><div class='ctx'> static bool ath11k_ce_need_shadow_fix(int ce_id)</div><div class='ctx'> {</div><div class='del'>-	/* only ce4 needs shadow workaroud*/</div><div class='add'>+	/* only ce4 needs shadow workaround */</div><div class='ctx'> 	if (ce_id == 4)</div><div class='ctx'> 		return true;</div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -344,7 +354,8 @@ static int ath11k_ce_rx_post_pipe(struct ath11k_ce_pipe *pipe)</div><div class='ctx'> 		ret = ath11k_ce_rx_buf_enqueue_pipe(pipe, skb, paddr);</div><div class='ctx'> </div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ath11k_warn(ab, "failed to enqueue rx buf: %d\n", ret);</div><div class='add'>+			ath11k_dbg(ab, ATH11K_DBG_CE, "failed to enqueue rx buf: %d\n",</div><div class='add'>+				   ret);</div><div class='ctx'> 			dma_unmap_single(ab-&gt;dev, paddr,</div><div class='ctx'> 					 skb-&gt;len + skb_tailroom(skb),</div><div class='ctx'> 					 DMA_FROM_DEVICE);</div><div class='hunk'>@@ -386,10 +397,6 @@ static int ath11k_ce_completed_recv_next(struct ath11k_ce_pipe *pipe,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*nbytes = ath11k_hal_ce_dst_status_get_length(desc);</div><div class='del'>-	if (*nbytes == 0) {</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	*skb = pipe-&gt;dest_ring-&gt;skb[sw_index];</div><div class='ctx'> 	pipe-&gt;dest_ring-&gt;skb[sw_index] = NULL;</div><div class='hunk'>@@ -422,8 +429,8 @@ static void ath11k_ce_recv_process_cb(struct ath11k_ce_pipe *pipe)</div><div class='ctx'> 		dma_unmap_single(ab-&gt;dev, ATH11K_SKB_RXCB(skb)-&gt;paddr,</div><div class='ctx'> 				 max_nbytes, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='del'>-		if (unlikely(max_nbytes &lt; nbytes)) {</div><div class='del'>-			ath11k_warn(ab, "rxed more than expected (nbytes %d, max %d)",</div><div class='add'>+		if (unlikely(max_nbytes &lt; nbytes || nbytes == 0)) {</div><div class='add'>+			ath11k_warn(ab, "unexpected rx length (nbytes %d, max %d)",</div><div class='ctx'> 				    nbytes, max_nbytes);</div><div class='ctx'> 			dev_kfree_skb_any(skb);</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -434,7 +441,7 @@ static void ath11k_ce_recv_process_cb(struct ath11k_ce_pipe *pipe)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while ((skb = __skb_dequeue(&amp;list))) {</div><div class='del'>-		ath11k_dbg(ab, ATH11K_DBG_AHB, "rx ce pipe %d len %d\n",</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_CE, "rx ce pipe %d len %d\n",</div><div class='ctx'> 			   pipe-&gt;pipe_num, skb-&gt;len);</div><div class='ctx'> 		pipe-&gt;recv_cb(ab, skb);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -489,18 +496,32 @@ err_unlock:</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath11k_ce_send_done_cb(struct ath11k_ce_pipe *pipe)</div><div class='add'>+static void ath11k_ce_tx_process_cb(struct ath11k_ce_pipe *pipe)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = pipe-&gt;ab;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	struct sk_buff_head list;</div><div class='ctx'> </div><div class='add'>+	__skb_queue_head_init(&amp;list);</div><div class='ctx'> 	while (!IS_ERR(skb = ath11k_ce_completed_send_next(pipe))) {</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		dma_unmap_single(ab-&gt;dev, ATH11K_SKB_CB(skb)-&gt;paddr, skb-&gt;len,</div><div class='ctx'> 				 DMA_TO_DEVICE);</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='add'>+</div><div class='add'>+		if ((!pipe-&gt;send_cb) || ab-&gt;hw_params.credit_flow) {</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		__skb_queue_tail(&amp;list, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;list))) {</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_CE, "tx ce pipe %d len %d\n",</div><div class='add'>+			   pipe-&gt;pipe_num, skb-&gt;len);</div><div class='add'>+		pipe-&gt;send_cb(ab, skb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -534,7 +555,7 @@ static int ath11k_ce_init_ring(struct ath11k_base *ab,</div><div class='ctx'> 			       struct ath11k_ce_ring *ce_ring,</div><div class='ctx'> 			       int ce_id, enum hal_ring_type type)</div><div class='ctx'> {</div><div class='del'>-	struct hal_srng_params params = { 0 };</div><div class='add'>+	struct hal_srng_params params = {};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	params.ring_base_paddr = ce_ring-&gt;base_addr_ce_space;</div><div class='hunk'>@@ -636,7 +657,7 @@ static int ath11k_ce_alloc_pipe(struct ath11k_base *ab, int ce_id)</div><div class='ctx'> 	pipe-&gt;attr_flags = attr-&gt;flags;</div><div class='ctx'> </div><div class='ctx'> 	if (attr-&gt;src_nentries) {</div><div class='del'>-		pipe-&gt;send_cb = ath11k_ce_send_done_cb;</div><div class='add'>+		pipe-&gt;send_cb = attr-&gt;send_cb;</div><div class='ctx'> 		nentries = roundup_pow_of_two(attr-&gt;src_nentries);</div><div class='ctx'> 		desc_sz = ath11k_hal_ce_get_desc_size(HAL_CE_DESC_SRC);</div><div class='ctx'> 		ring = ath11k_ce_alloc_ring(ab, nentries, desc_sz);</div><div class='hunk'>@@ -667,9 +688,10 @@ static int ath11k_ce_alloc_pipe(struct ath11k_base *ab, int ce_id)</div><div class='ctx'> void ath11k_ce_per_engine_service(struct ath11k_base *ab, u16 ce_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_ce_pipe *pipe = &amp;ab-&gt;ce.ce_pipe[ce_id];</div><div class='add'>+	const struct ce_attr *attr = &amp;ab-&gt;hw_params.host_ce_config[ce_id];</div><div class='ctx'> </div><div class='del'>-	if (pipe-&gt;send_cb)</div><div class='del'>-		pipe-&gt;send_cb(pipe);</div><div class='add'>+	if (attr-&gt;src_nentries)</div><div class='add'>+		ath11k_ce_tx_process_cb(pipe);</div><div class='ctx'> </div><div class='ctx'> 	if (pipe-&gt;recv_cb)</div><div class='ctx'> 		ath11k_ce_recv_process_cb(pipe);</div><div class='hunk'>@@ -678,9 +700,10 @@ void ath11k_ce_per_engine_service(struct ath11k_base *ab, u16 ce_id)</div><div class='ctx'> void ath11k_ce_poll_send_completed(struct ath11k_base *ab, u8 pipe_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_ce_pipe *pipe = &amp;ab-&gt;ce.ce_pipe[pipe_id];</div><div class='add'>+	const struct ce_attr *attr =  &amp;ab-&gt;hw_params.host_ce_config[pipe_id];</div><div class='ctx'> </div><div class='del'>-	if ((pipe-&gt;attr_flags &amp; CE_ATTR_DIS_INTR) &amp;&amp; pipe-&gt;send_cb)</div><div class='del'>-		pipe-&gt;send_cb(pipe);</div><div class='add'>+	if ((pipe-&gt;attr_flags &amp; CE_ATTR_DIS_INTR) &amp;&amp; attr-&gt;src_nentries)</div><div class='add'>+		ath11k_ce_tx_process_cb(pipe);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ath11k_ce_per_engine_service);</div><div class='ctx'> </div><div class='hunk'>@@ -884,7 +907,7 @@ EXPORT_SYMBOL(ath11k_ce_rx_post_buf);</div><div class='ctx'> </div><div class='ctx'> void ath11k_ce_rx_replenish_retry(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_base *ab = from_timer(ab, t, rx_replenish_retry);</div><div class='add'>+	struct ath11k_base *ab = timer_container_of(ab, t, rx_replenish_retry);</div><div class='ctx'> </div><div class='ctx'> 	ath11k_ce_rx_post_buf(ab);</div><div class='ctx'> }</div><div class='hunk'>@@ -895,9 +918,6 @@ int ath11k_ce_init_pipes(struct ath11k_base *ab)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ath11k_ce_get_shadow_config(ab, &amp;ab-&gt;qmi.ce_cfg.shadow_reg_v2,</div><div class='del'>-				    &amp;ab-&gt;qmi.ce_cfg.shadow_reg_v2_len);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; ab-&gt;hw_params.ce_count; i++) {</div><div class='ctx'> 		pipe = &amp;ab-&gt;ce.ce_pipe[i];</div><div class='ctx'> </div><div class='hunk'>@@ -953,6 +973,7 @@ int ath11k_ce_init_pipes(struct ath11k_base *ab)</div><div class='ctx'> void ath11k_ce_free_pipes(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_ce_pipe *pipe;</div><div class='add'>+	struct ath11k_ce_ring *ce_ring;</div><div class='ctx'> 	int desc_sz;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -964,22 +985,24 @@ void ath11k_ce_free_pipes(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> 		if (pipe-&gt;src_ring) {</div><div class='ctx'> 			desc_sz = ath11k_hal_ce_get_desc_size(HAL_CE_DESC_SRC);</div><div class='add'>+			ce_ring = pipe-&gt;src_ring;</div><div class='ctx'> 			dma_free_coherent(ab-&gt;dev,</div><div class='ctx'> 					  pipe-&gt;src_ring-&gt;nentries * desc_sz +</div><div class='ctx'> 					  CE_DESC_RING_ALIGN,</div><div class='del'>-					  pipe-&gt;src_ring-&gt;base_addr_owner_space,</div><div class='del'>-					  pipe-&gt;src_ring-&gt;base_addr_ce_space);</div><div class='add'>+					  ce_ring-&gt;base_addr_owner_space_unaligned,</div><div class='add'>+					  ce_ring-&gt;base_addr_ce_space_unaligned);</div><div class='ctx'> 			kfree(pipe-&gt;src_ring);</div><div class='ctx'> 			pipe-&gt;src_ring = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (pipe-&gt;dest_ring) {</div><div class='ctx'> 			desc_sz = ath11k_hal_ce_get_desc_size(HAL_CE_DESC_DST);</div><div class='add'>+			ce_ring = pipe-&gt;dest_ring;</div><div class='ctx'> 			dma_free_coherent(ab-&gt;dev,</div><div class='ctx'> 					  pipe-&gt;dest_ring-&gt;nentries * desc_sz +</div><div class='ctx'> 					  CE_DESC_RING_ALIGN,</div><div class='del'>-					  pipe-&gt;dest_ring-&gt;base_addr_owner_space,</div><div class='del'>-					  pipe-&gt;dest_ring-&gt;base_addr_ce_space);</div><div class='add'>+					  ce_ring-&gt;base_addr_owner_space_unaligned,</div><div class='add'>+					  ce_ring-&gt;base_addr_ce_space_unaligned);</div><div class='ctx'> 			kfree(pipe-&gt;dest_ring);</div><div class='ctx'> 			pipe-&gt;dest_ring = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -987,11 +1010,12 @@ void ath11k_ce_free_pipes(struct ath11k_base *ab)</div><div class='ctx'> 		if (pipe-&gt;status_ring) {</div><div class='ctx'> 			desc_sz =</div><div class='ctx'> 			  ath11k_hal_ce_get_desc_size(HAL_CE_DESC_DST_STATUS);</div><div class='add'>+			ce_ring = pipe-&gt;status_ring;</div><div class='ctx'> 			dma_free_coherent(ab-&gt;dev,</div><div class='ctx'> 					  pipe-&gt;status_ring-&gt;nentries * desc_sz +</div><div class='ctx'> 					  CE_DESC_RING_ALIGN,</div><div class='del'>-					  pipe-&gt;status_ring-&gt;base_addr_owner_space,</div><div class='del'>-					  pipe-&gt;status_ring-&gt;base_addr_ce_space);</div><div class='add'>+					  ce_ring-&gt;base_addr_owner_space_unaligned,</div><div class='add'>+					  ce_ring-&gt;base_addr_ce_space_unaligned);</div><div class='ctx'> 			kfree(pipe-&gt;status_ring);</div><div class='ctx'> 			pipe-&gt;status_ring = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1017,7 +1041,7 @@ int ath11k_ce_alloc_pipes(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> 		ret = ath11k_ce_alloc_pipe(ab, i);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			/* Free any parial successful allocation */</div><div class='add'>+			/* Free any partial successful allocation */</div><div class='ctx'> 			ath11k_ce_free_pipes(ab);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/ce.h b/drivers/net/wireless/ath/ath11k/ce.h<br/>index 713f766cac22..bcde2fcf02cf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/ce.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/ce.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/ce.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/ce.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022, 2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef ATH11K_CE_H</div><div class='hunk'>@@ -49,6 +50,11 @@ void ath11k_ce_byte_swap(void *mem, u32 len);</div><div class='ctx'> #define CE_HOST_IE_2_ADDRESS	0x00A18040</div><div class='ctx'> #define CE_HOST_IE_3_ADDRESS	CE_HOST_IE_ADDRESS</div><div class='ctx'> </div><div class='add'>+/* CE IE registers are different for IPQ5018 */</div><div class='add'>+#define CE_HOST_IPQ5018_IE_ADDRESS		0x0841804C</div><div class='add'>+#define CE_HOST_IPQ5018_IE_2_ADDRESS		0x08418050</div><div class='add'>+#define CE_HOST_IPQ5018_IE_3_ADDRESS		CE_HOST_IPQ5018_IE_ADDRESS</div><div class='add'>+</div><div class='ctx'> #define CE_HOST_IE_3_SHIFT	0xC</div><div class='ctx'> </div><div class='ctx'> #define CE_RING_IDX_INCR(nentries_mask, idx) (((idx) + 1) &amp; (nentries_mask))</div><div class='hunk'>@@ -84,6 +90,17 @@ struct ce_pipe_config {</div><div class='ctx'> 	__le32 reserved;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct ce_ie_addr {</div><div class='add'>+	u32 ie1_reg_addr;</div><div class='add'>+	u32 ie2_reg_addr;</div><div class='add'>+	u32 ie3_reg_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ce_remap {</div><div class='add'>+	u32 base;</div><div class='add'>+	u32 size;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ce_attr {</div><div class='ctx'> 	/* CE_ATTR_* values */</div><div class='ctx'> 	unsigned int flags;</div><div class='hunk'>@@ -101,6 +118,7 @@ struct ce_attr {</div><div class='ctx'> 	unsigned int dest_nentries;</div><div class='ctx'> </div><div class='ctx'> 	void (*recv_cb)(struct ath11k_base *, struct sk_buff *);</div><div class='add'>+	void (*send_cb)(struct ath11k_base *, struct sk_buff *);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define CE_DESC_RING_ALIGN 8</div><div class='hunk'>@@ -128,7 +146,7 @@ struct ath11k_ce_ring {</div><div class='ctx'> 	/* Host address space */</div><div class='ctx'> 	void *base_addr_owner_space_unaligned;</div><div class='ctx'> 	/* CE address space */</div><div class='del'>-	u32 base_addr_ce_space_unaligned;</div><div class='add'>+	dma_addr_t base_addr_ce_space_unaligned;</div><div class='ctx'> </div><div class='ctx'> 	/* Actual start of descriptors.</div><div class='ctx'> 	 * Aligned to descriptor-size boundary.</div><div class='hunk'>@@ -138,13 +156,13 @@ struct ath11k_ce_ring {</div><div class='ctx'> 	void *base_addr_owner_space;</div><div class='ctx'> </div><div class='ctx'> 	/* CE address space */</div><div class='del'>-	u32 base_addr_ce_space;</div><div class='add'>+	dma_addr_t base_addr_ce_space;</div><div class='ctx'> </div><div class='ctx'> 	/* HAL ring id */</div><div class='ctx'> 	u32 hal_ring_id;</div><div class='ctx'> </div><div class='ctx'> 	/* keep last */</div><div class='del'>-	struct sk_buff *skb[0];</div><div class='add'>+	struct sk_buff *skb[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ath11k_ce_pipe {</div><div class='hunk'>@@ -154,7 +172,7 @@ struct ath11k_ce_pipe {</div><div class='ctx'> 	unsigned int buf_sz;</div><div class='ctx'> 	unsigned int rx_buf_needed;</div><div class='ctx'> </div><div class='del'>-	void (*send_cb)(struct ath11k_ce_pipe *);</div><div class='add'>+	void (*send_cb)(struct ath11k_base *, struct sk_buff *);</div><div class='ctx'> 	void (*recv_cb)(struct ath11k_base *, struct sk_buff *);</div><div class='ctx'> </div><div class='ctx'> 	struct tasklet_struct intr_tq;</div><div class='hunk'>@@ -186,9 +204,6 @@ int ath11k_ce_alloc_pipes(struct ath11k_base *ab);</div><div class='ctx'> void ath11k_ce_free_pipes(struct ath11k_base *ab);</div><div class='ctx'> int ath11k_ce_get_attr_flags(struct ath11k_base *ab, int ce_id);</div><div class='ctx'> void ath11k_ce_poll_send_completed(struct ath11k_base *ab, u8 pipe_id);</div><div class='del'>-int ath11k_ce_map_service_to_pipe(struct ath11k_base *ab, u16 service_id,</div><div class='del'>-				  u8 *ul_pipe, u8 *dl_pipe);</div><div class='del'>-int ath11k_ce_attr_attach(struct ath11k_base *ab);</div><div class='ctx'> void ath11k_ce_get_shadow_config(struct ath11k_base *ab,</div><div class='ctx'> 				 u32 **shadow_cfg, u32 *shadow_cfg_len);</div><div class='ctx'> void ath11k_ce_stop_shadow_timers(struct ath11k_base *ab);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c<br/>index 77ce3347ab86..812686173ac8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/core.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/core.c</a></div><div class='hunk'>@@ -1,19 +1,24 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/remoteproc.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "dp_tx.h"</div><div class='ctx'> #include "dp_rx.h"</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> #include "hif.h"</div><div class='ctx'> #include "wow.h"</div><div class='add'>+#include "fw.h"</div><div class='ctx'> </div><div class='ctx'> unsigned int ath11k_debug_mask;</div><div class='ctx'> EXPORT_SYMBOL(ath11k_debug_mask);</div><div class='hunk'>@@ -30,6 +35,10 @@ module_param_named(frame_mode, ath11k_frame_mode, uint, 0644);</div><div class='ctx'> MODULE_PARM_DESC(frame_mode,</div><div class='ctx'> 		 "Datapath frame mode (0: raw, 1: native wifi (default), 2: ethernet)");</div><div class='ctx'> </div><div class='add'>+bool ath11k_ftm_mode;</div><div class='add'>+module_param_named(ftm_mode, ath11k_ftm_mode, bool, 0444);</div><div class='add'>+MODULE_PARM_DESC(ftm_mode, "Boots up in factory test mode");</div><div class='add'>+</div><div class='ctx'> static const struct ath11k_hw_params ath11k_hw_params[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.hw_rev = ATH11K_HW_IPQ8074,</div><div class='hunk'>@@ -37,7 +46,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {</div><div class='ctx'> 		.fw = {</div><div class='ctx'> 			.dir = "IPQ8074/hw2.0",</div><div class='ctx'> 			.board_size = 256 * 1024,</div><div class='del'>-			.cal_size = 256 * 1024,</div><div class='add'>+			.cal_offset = 128 * 1024,</div><div class='ctx'> 		},</div><div class='ctx'> 		.max_radios = 3,</div><div class='ctx'> 		.bdf_addr = 0x4B0C0000,</div><div class='hunk'>@@ -52,24 +61,71 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {</div><div class='ctx'> 		.target_ce_count = 11,</div><div class='ctx'> 		.svc_to_ce_map = ath11k_target_service_to_ce_map_wlan_ipq8074,</div><div class='ctx'> 		.svc_to_ce_map_len = 21,</div><div class='add'>+		.ce_ie_addr = &amp;ath11k_ce_ie_addr_ipq8074,</div><div class='ctx'> 		.single_pdev_only = false,</div><div class='ctx'> 		.rxdma1_enable = true,</div><div class='del'>-		.num_rxmda_per_pdev = 1,</div><div class='add'>+		.num_rxdma_per_pdev = 1,</div><div class='ctx'> 		.rx_mac_buf_ring = false,</div><div class='ctx'> 		.vdev_start_delay = false,</div><div class='ctx'> 		.htt_peer_map_v2 = true,</div><div class='del'>-		.tcl_0_only = false,</div><div class='del'>-		.spectral_fft_sz = 2,</div><div class='add'>+</div><div class='add'>+		.spectral = {</div><div class='add'>+			.fft_sz = 2,</div><div class='add'>+			/* HW bug, expected BIN size is 2 bytes but HW report as 4 bytes.</div><div class='add'>+			 * so added pad size as 2 bytes to compensate the BIN size</div><div class='add'>+			 */</div><div class='add'>+			.fft_pad_sz = 2,</div><div class='add'>+			.summary_pad_sz = 0,</div><div class='add'>+			.fft_hdr_len = 16,</div><div class='add'>+			.max_fft_bins = 512,</div><div class='add'>+			.fragment_160mhz = true,</div><div class='add'>+		},</div><div class='ctx'> </div><div class='ctx'> 		.interface_modes = BIT(NL80211_IFTYPE_STATION) |</div><div class='ctx'> 					BIT(NL80211_IFTYPE_AP) |</div><div class='ctx'> 					BIT(NL80211_IFTYPE_MESH_POINT),</div><div class='ctx'> 		.supports_monitor = true,</div><div class='add'>+		.full_monitor_mode = false,</div><div class='ctx'> 		.supports_shadow_regs = false,</div><div class='ctx'> 		.idle_ps = false,</div><div class='del'>-		.cold_boot_calib = true,</div><div class='add'>+		.supports_sta_ps = false,</div><div class='add'>+		.coldboot_cal_mm = true,</div><div class='add'>+		.coldboot_cal_ftm = true,</div><div class='add'>+		.cbcal_restart_fw = true,</div><div class='add'>+		.fw_mem_mode = 0,</div><div class='add'>+		.num_vdevs = 16 + 1,</div><div class='add'>+		.num_peers = 512,</div><div class='ctx'> 		.supports_suspend = false,</div><div class='ctx'> 		.hal_desc_sz = sizeof(struct hal_rx_desc_ipq8074),</div><div class='add'>+		.supports_regdb = false,</div><div class='add'>+		.fix_l1ss = true,</div><div class='add'>+		.credit_flow = false,</div><div class='add'>+		.max_tx_ring = DP_TCL_NUM_RING_MAX,</div><div class='add'>+		.hal_params = &amp;ath11k_hw_hal_params_ipq8074,</div><div class='add'>+		.supports_dynamic_smps_6ghz = false,</div><div class='add'>+		.alloc_cacheable_memory = true,</div><div class='add'>+		.supports_rssi_stats = false,</div><div class='add'>+		.fw_wmi_diag_event = false,</div><div class='add'>+		.current_cc_support = false,</div><div class='add'>+		.dbr_debug_support = true,</div><div class='add'>+		.global_reset = false,</div><div class='add'>+		.bios_sar_capa = NULL,</div><div class='add'>+		.m3_fw_support = false,</div><div class='add'>+		.fixed_bdf_addr = true,</div><div class='add'>+		.fixed_mem_region = true,</div><div class='add'>+		.static_window_map = false,</div><div class='add'>+		.hybrid_bus_type = false,</div><div class='add'>+		.fixed_fw_mem = false,</div><div class='add'>+		.support_off_channel_tx = false,</div><div class='add'>+		.supports_multi_bssid = false,</div><div class='add'>+</div><div class='add'>+		.sram_dump = {},</div><div class='add'>+</div><div class='add'>+		.tcl_ring_retry = true,</div><div class='add'>+		.tx_ring_size = DP_TCL_DATA_RING_SIZE,</div><div class='add'>+		.smp2p_wow_exit = false,</div><div class='add'>+		.support_dual_stations = false,</div><div class='add'>+		.pdev_suspend = false,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.hw_rev = ATH11K_HW_IPQ6018_HW10,</div><div class='hunk'>@@ -77,7 +133,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {</div><div class='ctx'> 		.fw = {</div><div class='ctx'> 			.dir = "IPQ6018/hw1.0",</div><div class='ctx'> 			.board_size = 256 * 1024,</div><div class='del'>-			.cal_size = 256 * 1024,</div><div class='add'>+			.cal_offset = 128 * 1024,</div><div class='ctx'> 		},</div><div class='ctx'> 		.max_radios = 2,</div><div class='ctx'> 		.bdf_addr = 0x4ABC0000,</div><div class='hunk'>@@ -92,24 +148,69 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {</div><div class='ctx'> 		.target_ce_count = 11,</div><div class='ctx'> 		.svc_to_ce_map = ath11k_target_service_to_ce_map_wlan_ipq6018,</div><div class='ctx'> 		.svc_to_ce_map_len = 19,</div><div class='add'>+		.ce_ie_addr = &amp;ath11k_ce_ie_addr_ipq8074,</div><div class='ctx'> 		.single_pdev_only = false,</div><div class='ctx'> 		.rxdma1_enable = true,</div><div class='del'>-		.num_rxmda_per_pdev = 1,</div><div class='add'>+		.num_rxdma_per_pdev = 1,</div><div class='ctx'> 		.rx_mac_buf_ring = false,</div><div class='ctx'> 		.vdev_start_delay = false,</div><div class='ctx'> 		.htt_peer_map_v2 = true,</div><div class='del'>-		.tcl_0_only = false,</div><div class='del'>-		.spectral_fft_sz = 4,</div><div class='add'>+</div><div class='add'>+		.spectral = {</div><div class='add'>+			.fft_sz = 4,</div><div class='add'>+			.fft_pad_sz = 0,</div><div class='add'>+			.summary_pad_sz = 0,</div><div class='add'>+			.fft_hdr_len = 16,</div><div class='add'>+			.max_fft_bins = 512,</div><div class='add'>+			.fragment_160mhz = true,</div><div class='add'>+		},</div><div class='ctx'> </div><div class='ctx'> 		.interface_modes = BIT(NL80211_IFTYPE_STATION) |</div><div class='ctx'> 					BIT(NL80211_IFTYPE_AP) |</div><div class='ctx'> 					BIT(NL80211_IFTYPE_MESH_POINT),</div><div class='ctx'> 		.supports_monitor = true,</div><div class='add'>+		.full_monitor_mode = false,</div><div class='ctx'> 		.supports_shadow_regs = false,</div><div class='ctx'> 		.idle_ps = false,</div><div class='del'>-		.cold_boot_calib = true,</div><div class='add'>+		.supports_sta_ps = false,</div><div class='add'>+		.coldboot_cal_mm = true,</div><div class='add'>+		.coldboot_cal_ftm = true,</div><div class='add'>+		.cbcal_restart_fw = true,</div><div class='add'>+		.fw_mem_mode = 0,</div><div class='add'>+		.num_vdevs = 16 + 1,</div><div class='add'>+		.num_peers = 512,</div><div class='ctx'> 		.supports_suspend = false,</div><div class='ctx'> 		.hal_desc_sz = sizeof(struct hal_rx_desc_ipq8074),</div><div class='add'>+		.supports_regdb = false,</div><div class='add'>+		.fix_l1ss = true,</div><div class='add'>+		.credit_flow = false,</div><div class='add'>+		.max_tx_ring = DP_TCL_NUM_RING_MAX,</div><div class='add'>+		.hal_params = &amp;ath11k_hw_hal_params_ipq8074,</div><div class='add'>+		.supports_dynamic_smps_6ghz = false,</div><div class='add'>+		.alloc_cacheable_memory = true,</div><div class='add'>+		.supports_rssi_stats = false,</div><div class='add'>+		.fw_wmi_diag_event = false,</div><div class='add'>+		.current_cc_support = false,</div><div class='add'>+		.dbr_debug_support = true,</div><div class='add'>+		.global_reset = false,</div><div class='add'>+		.bios_sar_capa = NULL,</div><div class='add'>+		.m3_fw_support = false,</div><div class='add'>+		.fixed_bdf_addr = true,</div><div class='add'>+		.fixed_mem_region = true,</div><div class='add'>+		.static_window_map = false,</div><div class='add'>+		.hybrid_bus_type = false,</div><div class='add'>+		.fixed_fw_mem = false,</div><div class='add'>+		.support_off_channel_tx = false,</div><div class='add'>+		.supports_multi_bssid = false,</div><div class='add'>+</div><div class='add'>+		.sram_dump = {},</div><div class='add'>+</div><div class='add'>+		.tcl_ring_retry = true,</div><div class='add'>+		.tx_ring_size = DP_TCL_DATA_RING_SIZE,</div><div class='add'>+		.smp2p_wow_exit = false,</div><div class='add'>+		.support_fw_mac_sequence = false,</div><div class='add'>+		.support_dual_stations = false,</div><div class='add'>+		.pdev_suspend = false,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "qca6390 hw2.0",</div><div class='hunk'>@@ -117,7 +218,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {</div><div class='ctx'> 		.fw = {</div><div class='ctx'> 			.dir = "QCA6390/hw2.0",</div><div class='ctx'> 			.board_size = 256 * 1024,</div><div class='del'>-			.cal_size = 256 * 1024,</div><div class='add'>+			.cal_offset = 128 * 1024,</div><div class='ctx'> 		},</div><div class='ctx'> 		.max_radios = 3,</div><div class='ctx'> 		.bdf_addr = 0x4B0C0000,</div><div class='hunk'>@@ -132,23 +233,74 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {</div><div class='ctx'> 		.target_ce_count = 9,</div><div class='ctx'> 		.svc_to_ce_map = ath11k_target_service_to_ce_map_wlan_qca6390,</div><div class='ctx'> 		.svc_to_ce_map_len = 14,</div><div class='add'>+		.ce_ie_addr = &amp;ath11k_ce_ie_addr_ipq8074,</div><div class='ctx'> 		.single_pdev_only = true,</div><div class='ctx'> 		.rxdma1_enable = false,</div><div class='del'>-		.num_rxmda_per_pdev = 2,</div><div class='add'>+		.num_rxdma_per_pdev = 2,</div><div class='ctx'> 		.rx_mac_buf_ring = true,</div><div class='ctx'> 		.vdev_start_delay = true,</div><div class='ctx'> 		.htt_peer_map_v2 = false,</div><div class='del'>-		.tcl_0_only = true,</div><div class='del'>-		.spectral_fft_sz = 0,</div><div class='add'>+</div><div class='add'>+		.spectral = {</div><div class='add'>+			.fft_sz = 0,</div><div class='add'>+			.fft_pad_sz = 0,</div><div class='add'>+			.summary_pad_sz = 0,</div><div class='add'>+			.fft_hdr_len = 0,</div><div class='add'>+			.max_fft_bins = 0,</div><div class='add'>+			.fragment_160mhz = false,</div><div class='add'>+		},</div><div class='ctx'> </div><div class='ctx'> 		.interface_modes = BIT(NL80211_IFTYPE_STATION) |</div><div class='del'>-					BIT(NL80211_IFTYPE_AP),</div><div class='add'>+					BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+					BIT(NL80211_IFTYPE_P2P_DEVICE) |</div><div class='add'>+					BIT(NL80211_IFTYPE_P2P_CLIENT) |</div><div class='add'>+					BIT(NL80211_IFTYPE_P2P_GO),</div><div class='ctx'> 		.supports_monitor = false,</div><div class='add'>+		.full_monitor_mode = false,</div><div class='ctx'> 		.supports_shadow_regs = true,</div><div class='ctx'> 		.idle_ps = true,</div><div class='del'>-		.cold_boot_calib = false,</div><div class='add'>+		.supports_sta_ps = true,</div><div class='add'>+		.coldboot_cal_mm = false,</div><div class='add'>+		.coldboot_cal_ftm = false,</div><div class='add'>+		.cbcal_restart_fw = false,</div><div class='add'>+		.fw_mem_mode = 0,</div><div class='add'>+		.num_vdevs = 2 + 1,</div><div class='add'>+		.num_peers = 512,</div><div class='ctx'> 		.supports_suspend = true,</div><div class='ctx'> 		.hal_desc_sz = sizeof(struct hal_rx_desc_ipq8074),</div><div class='add'>+		.supports_regdb = false,</div><div class='add'>+		.fix_l1ss = true,</div><div class='add'>+		.credit_flow = true,</div><div class='add'>+		.max_tx_ring = DP_TCL_NUM_RING_MAX_QCA6390,</div><div class='add'>+		.hal_params = &amp;ath11k_hw_hal_params_qca6390,</div><div class='add'>+		.supports_dynamic_smps_6ghz = false,</div><div class='add'>+		.alloc_cacheable_memory = false,</div><div class='add'>+		.supports_rssi_stats = true,</div><div class='add'>+		.fw_wmi_diag_event = true,</div><div class='add'>+		.current_cc_support = true,</div><div class='add'>+		.dbr_debug_support = false,</div><div class='add'>+		.global_reset = true,</div><div class='add'>+		.bios_sar_capa = NULL,</div><div class='add'>+		.m3_fw_support = true,</div><div class='add'>+		.fixed_bdf_addr = false,</div><div class='add'>+		.fixed_mem_region = false,</div><div class='add'>+		.static_window_map = false,</div><div class='add'>+		.hybrid_bus_type = false,</div><div class='add'>+		.fixed_fw_mem = false,</div><div class='add'>+		.support_off_channel_tx = true,</div><div class='add'>+		.supports_multi_bssid = true,</div><div class='add'>+</div><div class='add'>+		.sram_dump = {</div><div class='add'>+			.start = 0x01400000,</div><div class='add'>+			.end = 0x0171ffff,</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.tcl_ring_retry = true,</div><div class='add'>+		.tx_ring_size = DP_TCL_DATA_RING_SIZE,</div><div class='add'>+		.smp2p_wow_exit = false,</div><div class='add'>+		.support_fw_mac_sequence = true,</div><div class='add'>+		.support_dual_stations = true,</div><div class='add'>+		.pdev_suspend = false,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "qcn9074 hw1.0",</div><div class='hunk'>@@ -156,7 +308,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {</div><div class='ctx'> 		.fw = {</div><div class='ctx'> 			.dir = "QCN9074/hw1.0",</div><div class='ctx'> 			.board_size = 256 * 1024,</div><div class='del'>-			.cal_size = 256 * 1024,</div><div class='add'>+			.cal_offset = 128 * 1024,</div><div class='ctx'> 		},</div><div class='ctx'> 		.max_radios = 1,</div><div class='ctx'> 		.single_pdev_only = false,</div><div class='hunk'>@@ -171,35 +323,765 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {</div><div class='ctx'> 		.target_ce_count = 9,</div><div class='ctx'> 		.svc_to_ce_map = ath11k_target_service_to_ce_map_wlan_qcn9074,</div><div class='ctx'> 		.svc_to_ce_map_len = 18,</div><div class='add'>+		.ce_ie_addr = &amp;ath11k_ce_ie_addr_ipq8074,</div><div class='ctx'> 		.rxdma1_enable = true,</div><div class='del'>-		.num_rxmda_per_pdev = 1,</div><div class='add'>+		.num_rxdma_per_pdev = 1,</div><div class='ctx'> 		.rx_mac_buf_ring = false,</div><div class='ctx'> 		.vdev_start_delay = false,</div><div class='ctx'> 		.htt_peer_map_v2 = true,</div><div class='del'>-		.tcl_0_only = false,</div><div class='add'>+</div><div class='add'>+		.spectral = {</div><div class='add'>+			.fft_sz = 2,</div><div class='add'>+			.fft_pad_sz = 0,</div><div class='add'>+			.summary_pad_sz = 16,</div><div class='add'>+			.fft_hdr_len = 24,</div><div class='add'>+			.max_fft_bins = 1024,</div><div class='add'>+			.fragment_160mhz = false,</div><div class='add'>+		},</div><div class='add'>+</div><div class='ctx'> 		.interface_modes = BIT(NL80211_IFTYPE_STATION) |</div><div class='ctx'> 					BIT(NL80211_IFTYPE_AP) |</div><div class='ctx'> 					BIT(NL80211_IFTYPE_MESH_POINT),</div><div class='ctx'> 		.supports_monitor = true,</div><div class='add'>+		.full_monitor_mode = true,</div><div class='ctx'> 		.supports_shadow_regs = false,</div><div class='ctx'> 		.idle_ps = false,</div><div class='del'>-		.cold_boot_calib = false,</div><div class='add'>+		.supports_sta_ps = false,</div><div class='add'>+		.coldboot_cal_mm = false,</div><div class='add'>+		.coldboot_cal_ftm = true,</div><div class='add'>+		.cbcal_restart_fw = true,</div><div class='add'>+		.fw_mem_mode = 2,</div><div class='add'>+		.num_vdevs = 8,</div><div class='add'>+		.num_peers = 128,</div><div class='add'>+		.supports_suspend = false,</div><div class='add'>+		.hal_desc_sz = sizeof(struct hal_rx_desc_qcn9074),</div><div class='add'>+		.supports_regdb = false,</div><div class='add'>+		.fix_l1ss = true,</div><div class='add'>+		.credit_flow = false,</div><div class='add'>+		.max_tx_ring = DP_TCL_NUM_RING_MAX,</div><div class='add'>+		.hal_params = &amp;ath11k_hw_hal_params_ipq8074,</div><div class='add'>+		.supports_dynamic_smps_6ghz = true,</div><div class='add'>+		.alloc_cacheable_memory = true,</div><div class='add'>+		.supports_rssi_stats = false,</div><div class='add'>+		.fw_wmi_diag_event = false,</div><div class='add'>+		.current_cc_support = false,</div><div class='add'>+		.dbr_debug_support = true,</div><div class='add'>+		.global_reset = false,</div><div class='add'>+		.bios_sar_capa = NULL,</div><div class='add'>+		.m3_fw_support = true,</div><div class='add'>+		.fixed_bdf_addr = false,</div><div class='add'>+		.fixed_mem_region = false,</div><div class='add'>+		.static_window_map = true,</div><div class='add'>+		.hybrid_bus_type = false,</div><div class='add'>+		.fixed_fw_mem = false,</div><div class='add'>+		.support_off_channel_tx = false,</div><div class='add'>+		.supports_multi_bssid = false,</div><div class='add'>+</div><div class='add'>+		.sram_dump = {},</div><div class='add'>+</div><div class='add'>+		.tcl_ring_retry = true,</div><div class='add'>+		.tx_ring_size = DP_TCL_DATA_RING_SIZE,</div><div class='add'>+		.smp2p_wow_exit = false,</div><div class='add'>+		.support_fw_mac_sequence = false,</div><div class='add'>+		.support_dual_stations = false,</div><div class='add'>+		.pdev_suspend = false,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "wcn6855 hw2.0",</div><div class='add'>+		.hw_rev = ATH11K_HW_WCN6855_HW20,</div><div class='add'>+		.fw = {</div><div class='add'>+			.dir = "WCN6855/hw2.0",</div><div class='add'>+			.board_size = 256 * 1024,</div><div class='add'>+			.cal_offset = 128 * 1024,</div><div class='add'>+		},</div><div class='add'>+		.max_radios = 3,</div><div class='add'>+		.bdf_addr = 0x4B0C0000,</div><div class='add'>+		.hw_ops = &amp;wcn6855_ops,</div><div class='add'>+		.ring_mask = &amp;ath11k_hw_ring_mask_qca6390,</div><div class='add'>+		.internal_sleep_clock = true,</div><div class='add'>+		.regs = &amp;wcn6855_regs,</div><div class='add'>+		.qmi_service_ins_id = ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_QCA6390,</div><div class='add'>+		.host_ce_config = ath11k_host_ce_config_qca6390,</div><div class='add'>+		.ce_count = 9,</div><div class='add'>+		.target_ce_config = ath11k_target_ce_config_wlan_qca6390,</div><div class='add'>+		.target_ce_count = 9,</div><div class='add'>+		.svc_to_ce_map = ath11k_target_service_to_ce_map_wlan_qca6390,</div><div class='add'>+		.svc_to_ce_map_len = 14,</div><div class='add'>+		.ce_ie_addr = &amp;ath11k_ce_ie_addr_ipq8074,</div><div class='add'>+		.single_pdev_only = true,</div><div class='add'>+		.rxdma1_enable = false,</div><div class='add'>+		.num_rxdma_per_pdev = 2,</div><div class='add'>+		.rx_mac_buf_ring = true,</div><div class='add'>+		.vdev_start_delay = true,</div><div class='add'>+		.htt_peer_map_v2 = false,</div><div class='add'>+</div><div class='add'>+		.spectral = {</div><div class='add'>+			.fft_sz = 0,</div><div class='add'>+			.fft_pad_sz = 0,</div><div class='add'>+			.summary_pad_sz = 0,</div><div class='add'>+			.fft_hdr_len = 0,</div><div class='add'>+			.max_fft_bins = 0,</div><div class='add'>+			.fragment_160mhz = false,</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.interface_modes = BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+					BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+					BIT(NL80211_IFTYPE_P2P_DEVICE) |</div><div class='add'>+					BIT(NL80211_IFTYPE_P2P_CLIENT) |</div><div class='add'>+					BIT(NL80211_IFTYPE_P2P_GO),</div><div class='add'>+		.supports_monitor = false,</div><div class='add'>+		.full_monitor_mode = false,</div><div class='add'>+		.supports_shadow_regs = true,</div><div class='add'>+		.idle_ps = true,</div><div class='add'>+		.supports_sta_ps = true,</div><div class='add'>+		.coldboot_cal_mm = false,</div><div class='add'>+		.coldboot_cal_ftm = false,</div><div class='add'>+		.cbcal_restart_fw = false,</div><div class='add'>+		.fw_mem_mode = 0,</div><div class='add'>+		.num_vdevs = 2 + 1,</div><div class='add'>+		.num_peers = 512,</div><div class='add'>+		.supports_suspend = true,</div><div class='add'>+		.hal_desc_sz = sizeof(struct hal_rx_desc_wcn6855),</div><div class='add'>+		.supports_regdb = true,</div><div class='add'>+		.fix_l1ss = false,</div><div class='add'>+		.credit_flow = true,</div><div class='add'>+		.max_tx_ring = DP_TCL_NUM_RING_MAX_QCA6390,</div><div class='add'>+		.hal_params = &amp;ath11k_hw_hal_params_qca6390,</div><div class='add'>+		.supports_dynamic_smps_6ghz = false,</div><div class='add'>+		.alloc_cacheable_memory = false,</div><div class='add'>+		.supports_rssi_stats = true,</div><div class='add'>+		.fw_wmi_diag_event = true,</div><div class='add'>+		.current_cc_support = true,</div><div class='add'>+		.dbr_debug_support = false,</div><div class='add'>+		.global_reset = true,</div><div class='add'>+		.bios_sar_capa = &amp;ath11k_hw_sar_capa_wcn6855,</div><div class='add'>+		.m3_fw_support = true,</div><div class='add'>+		.fixed_bdf_addr = false,</div><div class='add'>+		.fixed_mem_region = false,</div><div class='add'>+		.static_window_map = false,</div><div class='add'>+		.hybrid_bus_type = false,</div><div class='add'>+		.fixed_fw_mem = false,</div><div class='add'>+		.support_off_channel_tx = true,</div><div class='add'>+		.supports_multi_bssid = true,</div><div class='add'>+</div><div class='add'>+		.sram_dump = {</div><div class='add'>+			.start = 0x01400000,</div><div class='add'>+			.end = 0x0177ffff,</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.tcl_ring_retry = true,</div><div class='add'>+		.tx_ring_size = DP_TCL_DATA_RING_SIZE,</div><div class='add'>+		.smp2p_wow_exit = false,</div><div class='add'>+		.support_fw_mac_sequence = true,</div><div class='add'>+		.support_dual_stations = true,</div><div class='add'>+		.pdev_suspend = false,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "wcn6855 hw2.1",</div><div class='add'>+		.hw_rev = ATH11K_HW_WCN6855_HW21,</div><div class='add'>+		.fw = {</div><div class='add'>+			.dir = "WCN6855/hw2.1",</div><div class='add'>+			.board_size = 256 * 1024,</div><div class='add'>+			.cal_offset = 128 * 1024,</div><div class='add'>+		},</div><div class='add'>+		.max_radios = 3,</div><div class='add'>+		.bdf_addr = 0x4B0C0000,</div><div class='add'>+		.hw_ops = &amp;wcn6855_ops,</div><div class='add'>+		.ring_mask = &amp;ath11k_hw_ring_mask_qca6390,</div><div class='add'>+		.internal_sleep_clock = true,</div><div class='add'>+		.regs = &amp;wcn6855_regs,</div><div class='add'>+		.qmi_service_ins_id = ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_QCA6390,</div><div class='add'>+		.host_ce_config = ath11k_host_ce_config_qca6390,</div><div class='add'>+		.ce_count = 9,</div><div class='add'>+		.target_ce_config = ath11k_target_ce_config_wlan_qca6390,</div><div class='add'>+		.target_ce_count = 9,</div><div class='add'>+		.svc_to_ce_map = ath11k_target_service_to_ce_map_wlan_qca6390,</div><div class='add'>+		.svc_to_ce_map_len = 14,</div><div class='add'>+		.single_pdev_only = true,</div><div class='add'>+		.rxdma1_enable = false,</div><div class='add'>+		.num_rxdma_per_pdev = 2,</div><div class='add'>+		.rx_mac_buf_ring = true,</div><div class='add'>+		.vdev_start_delay = true,</div><div class='add'>+		.htt_peer_map_v2 = false,</div><div class='add'>+</div><div class='add'>+		.spectral = {</div><div class='add'>+			.fft_sz = 0,</div><div class='add'>+			.fft_pad_sz = 0,</div><div class='add'>+			.summary_pad_sz = 0,</div><div class='add'>+			.fft_hdr_len = 0,</div><div class='add'>+			.max_fft_bins = 0,</div><div class='add'>+			.fragment_160mhz = false,</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.interface_modes = BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+					BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+					BIT(NL80211_IFTYPE_P2P_DEVICE) |</div><div class='add'>+					BIT(NL80211_IFTYPE_P2P_CLIENT) |</div><div class='add'>+					BIT(NL80211_IFTYPE_P2P_GO),</div><div class='add'>+		.supports_monitor = false,</div><div class='add'>+		.supports_shadow_regs = true,</div><div class='add'>+		.idle_ps = true,</div><div class='add'>+		.supports_sta_ps = true,</div><div class='add'>+		.coldboot_cal_mm = false,</div><div class='add'>+		.coldboot_cal_ftm = false,</div><div class='add'>+		.cbcal_restart_fw = false,</div><div class='add'>+		.fw_mem_mode = 0,</div><div class='add'>+		.num_vdevs = 2 + 1,</div><div class='add'>+		.num_peers = 512,</div><div class='add'>+		.supports_suspend = true,</div><div class='add'>+		.hal_desc_sz = sizeof(struct hal_rx_desc_wcn6855),</div><div class='add'>+		.supports_regdb = true,</div><div class='add'>+		.fix_l1ss = false,</div><div class='add'>+		.credit_flow = true,</div><div class='add'>+		.max_tx_ring = DP_TCL_NUM_RING_MAX_QCA6390,</div><div class='add'>+		.hal_params = &amp;ath11k_hw_hal_params_qca6390,</div><div class='add'>+		.supports_dynamic_smps_6ghz = false,</div><div class='add'>+		.alloc_cacheable_memory = false,</div><div class='add'>+		.supports_rssi_stats = true,</div><div class='add'>+		.fw_wmi_diag_event = true,</div><div class='add'>+		.current_cc_support = true,</div><div class='add'>+		.dbr_debug_support = false,</div><div class='add'>+		.global_reset = true,</div><div class='add'>+		.bios_sar_capa = &amp;ath11k_hw_sar_capa_wcn6855,</div><div class='add'>+		.m3_fw_support = true,</div><div class='add'>+		.fixed_bdf_addr = false,</div><div class='add'>+		.fixed_mem_region = false,</div><div class='add'>+		.static_window_map = false,</div><div class='add'>+		.hybrid_bus_type = false,</div><div class='add'>+		.fixed_fw_mem = false,</div><div class='add'>+		.support_off_channel_tx = true,</div><div class='add'>+		.supports_multi_bssid = true,</div><div class='add'>+</div><div class='add'>+		.sram_dump = {</div><div class='add'>+			.start = 0x01400000,</div><div class='add'>+			.end = 0x0177ffff,</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.tcl_ring_retry = true,</div><div class='add'>+		.tx_ring_size = DP_TCL_DATA_RING_SIZE,</div><div class='add'>+		.smp2p_wow_exit = false,</div><div class='add'>+		.support_fw_mac_sequence = true,</div><div class='add'>+		.support_dual_stations = true,</div><div class='add'>+		.pdev_suspend = false,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "wcn6750 hw1.0",</div><div class='add'>+		.hw_rev = ATH11K_HW_WCN6750_HW10,</div><div class='add'>+		.fw = {</div><div class='add'>+			.dir = "WCN6750/hw1.0",</div><div class='add'>+			.board_size = 256 * 1024,</div><div class='add'>+			.cal_offset = 128 * 1024,</div><div class='add'>+		},</div><div class='add'>+		.max_radios = 1,</div><div class='add'>+		.bdf_addr = 0x4B0C0000,</div><div class='add'>+		.hw_ops = &amp;wcn6750_ops,</div><div class='add'>+		.ring_mask = &amp;ath11k_hw_ring_mask_wcn6750,</div><div class='add'>+		.internal_sleep_clock = false,</div><div class='add'>+		.regs = &amp;wcn6750_regs,</div><div class='add'>+		.qmi_service_ins_id = ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_WCN6750,</div><div class='add'>+		.host_ce_config = ath11k_host_ce_config_qca6390,</div><div class='add'>+		.ce_count = 9,</div><div class='add'>+		.target_ce_config = ath11k_target_ce_config_wlan_qca6390,</div><div class='add'>+		.target_ce_count = 9,</div><div class='add'>+		.svc_to_ce_map = ath11k_target_service_to_ce_map_wlan_qca6390,</div><div class='add'>+		.svc_to_ce_map_len = 14,</div><div class='add'>+		.ce_ie_addr = &amp;ath11k_ce_ie_addr_ipq8074,</div><div class='add'>+		.single_pdev_only = true,</div><div class='add'>+		.rxdma1_enable = false,</div><div class='add'>+		.num_rxdma_per_pdev = 1,</div><div class='add'>+		.rx_mac_buf_ring = true,</div><div class='add'>+		.vdev_start_delay = true,</div><div class='add'>+		.htt_peer_map_v2 = false,</div><div class='add'>+</div><div class='add'>+		.spectral = {</div><div class='add'>+			.fft_sz = 0,</div><div class='add'>+			.fft_pad_sz = 0,</div><div class='add'>+			.summary_pad_sz = 0,</div><div class='add'>+			.fft_hdr_len = 0,</div><div class='add'>+			.max_fft_bins = 0,</div><div class='add'>+			.fragment_160mhz = false,</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.interface_modes = BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+					BIT(NL80211_IFTYPE_AP),</div><div class='add'>+		.supports_monitor = false,</div><div class='add'>+		.supports_shadow_regs = true,</div><div class='add'>+		.idle_ps = true,</div><div class='add'>+		.supports_sta_ps = true,</div><div class='add'>+		.coldboot_cal_mm = true,</div><div class='add'>+		.coldboot_cal_ftm = true,</div><div class='add'>+		.cbcal_restart_fw = false,</div><div class='add'>+		.fw_mem_mode = 0,</div><div class='add'>+		.num_vdevs = 3,</div><div class='add'>+		.num_peers = 512,</div><div class='ctx'> 		.supports_suspend = false,</div><div class='ctx'> 		.hal_desc_sz = sizeof(struct hal_rx_desc_qcn9074),</div><div class='add'>+		.supports_regdb = true,</div><div class='add'>+		.fix_l1ss = false,</div><div class='add'>+		.credit_flow = true,</div><div class='add'>+		.max_tx_ring = DP_TCL_NUM_RING_MAX,</div><div class='add'>+		.hal_params = &amp;ath11k_hw_hal_params_wcn6750,</div><div class='add'>+		.supports_dynamic_smps_6ghz = false,</div><div class='add'>+		.alloc_cacheable_memory = false,</div><div class='add'>+		.supports_rssi_stats = true,</div><div class='add'>+		.fw_wmi_diag_event = true,</div><div class='add'>+		.current_cc_support = true,</div><div class='add'>+		.dbr_debug_support = false,</div><div class='add'>+		.global_reset = false,</div><div class='add'>+		.bios_sar_capa = &amp;ath11k_hw_sar_capa_wcn6855,</div><div class='add'>+		.m3_fw_support = false,</div><div class='add'>+		.fixed_bdf_addr = false,</div><div class='add'>+		.fixed_mem_region = false,</div><div class='add'>+		.static_window_map = true,</div><div class='add'>+		.hybrid_bus_type = true,</div><div class='add'>+		.fixed_fw_mem = true,</div><div class='add'>+		.support_off_channel_tx = true,</div><div class='add'>+		.supports_multi_bssid = true,</div><div class='add'>+</div><div class='add'>+		.sram_dump = {},</div><div class='add'>+</div><div class='add'>+		.tcl_ring_retry = false,</div><div class='add'>+		.tx_ring_size = DP_TCL_DATA_RING_SIZE_WCN6750,</div><div class='add'>+		.smp2p_wow_exit = true,</div><div class='add'>+		.support_fw_mac_sequence = true,</div><div class='add'>+		.support_dual_stations = false,</div><div class='add'>+		.pdev_suspend = true,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.hw_rev = ATH11K_HW_IPQ5018_HW10,</div><div class='add'>+		.name = "ipq5018 hw1.0",</div><div class='add'>+		.fw = {</div><div class='add'>+			.dir = "IPQ5018/hw1.0",</div><div class='add'>+			.board_size = 256 * 1024,</div><div class='add'>+			.cal_offset = 128 * 1024,</div><div class='add'>+		},</div><div class='add'>+		.max_radios = MAX_RADIOS_5018,</div><div class='add'>+		.bdf_addr = 0x4BA00000,</div><div class='add'>+		/* hal_desc_sz and hw ops are similar to qcn9074 */</div><div class='add'>+		.hal_desc_sz = sizeof(struct hal_rx_desc_qcn9074),</div><div class='add'>+		.qmi_service_ins_id = ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_IPQ8074,</div><div class='add'>+		.ring_mask = &amp;ath11k_hw_ring_mask_ipq8074,</div><div class='add'>+		.credit_flow = false,</div><div class='add'>+		.max_tx_ring = 1,</div><div class='add'>+		.spectral = {</div><div class='add'>+			.fft_sz = 2,</div><div class='add'>+			.fft_pad_sz = 0,</div><div class='add'>+			.summary_pad_sz = 16,</div><div class='add'>+			.fft_hdr_len = 24,</div><div class='add'>+			.max_fft_bins = 1024,</div><div class='add'>+		},</div><div class='add'>+		.internal_sleep_clock = false,</div><div class='add'>+		.regs = &amp;ipq5018_regs,</div><div class='add'>+		.hw_ops = &amp;ipq5018_ops,</div><div class='add'>+		.host_ce_config = ath11k_host_ce_config_qcn9074,</div><div class='add'>+		.ce_count = CE_CNT_5018,</div><div class='add'>+		.target_ce_config = ath11k_target_ce_config_wlan_ipq5018,</div><div class='add'>+		.target_ce_count = TARGET_CE_CNT_5018,</div><div class='add'>+		.svc_to_ce_map = ath11k_target_service_to_ce_map_wlan_ipq5018,</div><div class='add'>+		.svc_to_ce_map_len = SVC_CE_MAP_LEN_5018,</div><div class='add'>+		.ce_ie_addr = &amp;ath11k_ce_ie_addr_ipq5018,</div><div class='add'>+		.ce_remap = &amp;ath11k_ce_remap_ipq5018,</div><div class='add'>+		.rxdma1_enable = true,</div><div class='add'>+		.num_rxdma_per_pdev = RXDMA_PER_PDEV_5018,</div><div class='add'>+		.rx_mac_buf_ring = false,</div><div class='add'>+		.vdev_start_delay = false,</div><div class='add'>+		.htt_peer_map_v2 = true,</div><div class='add'>+		.interface_modes = BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+			BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+			BIT(NL80211_IFTYPE_MESH_POINT),</div><div class='add'>+		.supports_monitor = false,</div><div class='add'>+		.supports_sta_ps = false,</div><div class='add'>+		.supports_shadow_regs = false,</div><div class='add'>+		.fw_mem_mode = 0,</div><div class='add'>+		.num_vdevs = 16 + 1,</div><div class='add'>+		.num_peers = 512,</div><div class='add'>+		.supports_regdb = false,</div><div class='add'>+		.idle_ps = false,</div><div class='add'>+		.supports_suspend = false,</div><div class='add'>+		.hal_params = &amp;ath11k_hw_hal_params_ipq8074,</div><div class='add'>+		.single_pdev_only = false,</div><div class='add'>+		.coldboot_cal_mm = true,</div><div class='add'>+		.coldboot_cal_ftm = true,</div><div class='add'>+		.cbcal_restart_fw = true,</div><div class='add'>+		.fix_l1ss = true,</div><div class='add'>+		.supports_dynamic_smps_6ghz = false,</div><div class='add'>+		.alloc_cacheable_memory = true,</div><div class='add'>+		.supports_rssi_stats = false,</div><div class='add'>+		.fw_wmi_diag_event = false,</div><div class='add'>+		.current_cc_support = false,</div><div class='add'>+		.dbr_debug_support = true,</div><div class='add'>+		.global_reset = false,</div><div class='add'>+		.bios_sar_capa = NULL,</div><div class='add'>+		.m3_fw_support = false,</div><div class='add'>+		.fixed_bdf_addr = true,</div><div class='add'>+		.fixed_mem_region = true,</div><div class='add'>+		.static_window_map = false,</div><div class='add'>+		.hybrid_bus_type = false,</div><div class='add'>+		.fixed_fw_mem = false,</div><div class='add'>+		.support_off_channel_tx = false,</div><div class='add'>+		.supports_multi_bssid = false,</div><div class='add'>+</div><div class='add'>+		.sram_dump = {},</div><div class='add'>+</div><div class='add'>+		.tcl_ring_retry = true,</div><div class='add'>+		.tx_ring_size = DP_TCL_DATA_RING_SIZE,</div><div class='add'>+		.smp2p_wow_exit = false,</div><div class='add'>+		.support_fw_mac_sequence = false,</div><div class='add'>+		.support_dual_stations = false,</div><div class='add'>+		.pdev_suspend = false,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "qca2066 hw2.1",</div><div class='add'>+		.hw_rev = ATH11K_HW_QCA2066_HW21,</div><div class='add'>+		.fw = {</div><div class='add'>+			.dir = "QCA2066/hw2.1",</div><div class='add'>+			.board_size = 256 * 1024,</div><div class='add'>+			.cal_offset = 128 * 1024,</div><div class='add'>+		},</div><div class='add'>+		.max_radios = 3,</div><div class='add'>+		.bdf_addr = 0x4B0C0000,</div><div class='add'>+		.hw_ops = &amp;wcn6855_ops,</div><div class='add'>+		.ring_mask = &amp;ath11k_hw_ring_mask_qca6390,</div><div class='add'>+		.internal_sleep_clock = true,</div><div class='add'>+		.regs = &amp;wcn6855_regs,</div><div class='add'>+		.qmi_service_ins_id = ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_QCA6390,</div><div class='add'>+		.host_ce_config = ath11k_host_ce_config_qca6390,</div><div class='add'>+		.ce_count = 9,</div><div class='add'>+		.target_ce_config = ath11k_target_ce_config_wlan_qca6390,</div><div class='add'>+		.target_ce_count = 9,</div><div class='add'>+		.svc_to_ce_map = ath11k_target_service_to_ce_map_wlan_qca6390,</div><div class='add'>+		.svc_to_ce_map_len = 14,</div><div class='add'>+		.ce_ie_addr = &amp;ath11k_ce_ie_addr_ipq8074,</div><div class='add'>+		.single_pdev_only = true,</div><div class='add'>+		.rxdma1_enable = false,</div><div class='add'>+		.num_rxdma_per_pdev = 2,</div><div class='add'>+		.rx_mac_buf_ring = true,</div><div class='add'>+		.vdev_start_delay = true,</div><div class='add'>+		.htt_peer_map_v2 = false,</div><div class='add'>+</div><div class='add'>+		.spectral = {</div><div class='add'>+			.fft_sz = 0,</div><div class='add'>+			.fft_pad_sz = 0,</div><div class='add'>+			.summary_pad_sz = 0,</div><div class='add'>+			.fft_hdr_len = 0,</div><div class='add'>+			.max_fft_bins = 0,</div><div class='add'>+			.fragment_160mhz = false,</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.interface_modes = BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+					BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+					BIT(NL80211_IFTYPE_P2P_DEVICE) |</div><div class='add'>+					BIT(NL80211_IFTYPE_P2P_CLIENT) |</div><div class='add'>+					BIT(NL80211_IFTYPE_P2P_GO),</div><div class='add'>+		.supports_monitor = false,</div><div class='add'>+		.full_monitor_mode = false,</div><div class='add'>+		.supports_shadow_regs = true,</div><div class='add'>+		.idle_ps = true,</div><div class='add'>+		.supports_sta_ps = true,</div><div class='add'>+		.coldboot_cal_mm = false,</div><div class='add'>+		.coldboot_cal_ftm = false,</div><div class='add'>+		.cbcal_restart_fw = false,</div><div class='add'>+		.fw_mem_mode = 0,</div><div class='add'>+		.num_vdevs = 2 + 1,</div><div class='add'>+		.num_peers = 512,</div><div class='add'>+		.supports_suspend = true,</div><div class='add'>+		.hal_desc_sz = sizeof(struct hal_rx_desc_wcn6855),</div><div class='add'>+		.supports_regdb = true,</div><div class='add'>+		.fix_l1ss = false,</div><div class='add'>+		.credit_flow = true,</div><div class='add'>+		.max_tx_ring = DP_TCL_NUM_RING_MAX_QCA6390,</div><div class='add'>+		.hal_params = &amp;ath11k_hw_hal_params_qca6390,</div><div class='add'>+		.supports_dynamic_smps_6ghz = false,</div><div class='add'>+		.alloc_cacheable_memory = false,</div><div class='add'>+		.supports_rssi_stats = true,</div><div class='add'>+		.fw_wmi_diag_event = true,</div><div class='add'>+		.current_cc_support = true,</div><div class='add'>+		.dbr_debug_support = false,</div><div class='add'>+		.global_reset = true,</div><div class='add'>+		.bios_sar_capa = &amp;ath11k_hw_sar_capa_wcn6855,</div><div class='add'>+		.m3_fw_support = true,</div><div class='add'>+		.fixed_bdf_addr = false,</div><div class='add'>+		.fixed_mem_region = false,</div><div class='add'>+		.static_window_map = false,</div><div class='add'>+		.hybrid_bus_type = false,</div><div class='add'>+		.fixed_fw_mem = false,</div><div class='add'>+		.support_off_channel_tx = true,</div><div class='add'>+		.supports_multi_bssid = true,</div><div class='add'>+</div><div class='add'>+		.sram_dump = {</div><div class='add'>+			.start = 0x01400000,</div><div class='add'>+			.end = 0x0177ffff,</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.tcl_ring_retry = true,</div><div class='add'>+		.tx_ring_size = DP_TCL_DATA_RING_SIZE,</div><div class='add'>+		.smp2p_wow_exit = false,</div><div class='add'>+		.support_fw_mac_sequence = true,</div><div class='add'>+		.support_dual_stations = true,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "qca6698aq hw2.1",</div><div class='add'>+		.hw_rev = ATH11K_HW_QCA6698AQ_HW21,</div><div class='add'>+		.fw = {</div><div class='add'>+			.dir = "QCA6698AQ/hw2.1",</div><div class='add'>+			.board_size = 256 * 1024,</div><div class='add'>+			.cal_offset = 128 * 1024,</div><div class='add'>+		},</div><div class='add'>+		.max_radios = 3,</div><div class='add'>+		.bdf_addr = 0x4B0C0000,</div><div class='add'>+		.hw_ops = &amp;wcn6855_ops,</div><div class='add'>+		.ring_mask = &amp;ath11k_hw_ring_mask_qca6390,</div><div class='add'>+		.internal_sleep_clock = true,</div><div class='add'>+		.regs = &amp;wcn6855_regs,</div><div class='add'>+		.qmi_service_ins_id = ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_QCA6390,</div><div class='add'>+		.host_ce_config = ath11k_host_ce_config_qca6390,</div><div class='add'>+		.ce_count = 9,</div><div class='add'>+		.target_ce_config = ath11k_target_ce_config_wlan_qca6390,</div><div class='add'>+		.target_ce_count = 9,</div><div class='add'>+		.svc_to_ce_map = ath11k_target_service_to_ce_map_wlan_qca6390,</div><div class='add'>+		.svc_to_ce_map_len = 14,</div><div class='add'>+		.single_pdev_only = true,</div><div class='add'>+		.rxdma1_enable = false,</div><div class='add'>+		.num_rxdma_per_pdev = 2,</div><div class='add'>+		.rx_mac_buf_ring = true,</div><div class='add'>+		.vdev_start_delay = true,</div><div class='add'>+		.htt_peer_map_v2 = false,</div><div class='add'>+</div><div class='add'>+		.spectral = {</div><div class='add'>+			.fft_sz = 0,</div><div class='add'>+			.fft_pad_sz = 0,</div><div class='add'>+			.summary_pad_sz = 0,</div><div class='add'>+			.fft_hdr_len = 0,</div><div class='add'>+			.max_fft_bins = 0,</div><div class='add'>+			.fragment_160mhz = false,</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.interface_modes = BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+					BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+					BIT(NL80211_IFTYPE_P2P_DEVICE) |</div><div class='add'>+					BIT(NL80211_IFTYPE_P2P_CLIENT) |</div><div class='add'>+					BIT(NL80211_IFTYPE_P2P_GO),</div><div class='add'>+		.supports_monitor = false,</div><div class='add'>+		.supports_shadow_regs = true,</div><div class='add'>+		.idle_ps = true,</div><div class='add'>+		.supports_sta_ps = true,</div><div class='add'>+		.coldboot_cal_mm = false,</div><div class='add'>+		.coldboot_cal_ftm = false,</div><div class='add'>+		.cbcal_restart_fw = false,</div><div class='add'>+		.fw_mem_mode = 0,</div><div class='add'>+		.num_vdevs = 2 + 1,</div><div class='add'>+		.num_peers = 512,</div><div class='add'>+		.supports_suspend = true,</div><div class='add'>+		.hal_desc_sz = sizeof(struct hal_rx_desc_wcn6855),</div><div class='add'>+		.supports_regdb = true,</div><div class='add'>+		.fix_l1ss = false,</div><div class='add'>+		.credit_flow = true,</div><div class='add'>+		.max_tx_ring = DP_TCL_NUM_RING_MAX_QCA6390,</div><div class='add'>+		.hal_params = &amp;ath11k_hw_hal_params_qca6390,</div><div class='add'>+		.supports_dynamic_smps_6ghz = false,</div><div class='add'>+		.alloc_cacheable_memory = false,</div><div class='add'>+		.supports_rssi_stats = true,</div><div class='add'>+		.fw_wmi_diag_event = true,</div><div class='add'>+		.current_cc_support = true,</div><div class='add'>+		.dbr_debug_support = false,</div><div class='add'>+		.global_reset = true,</div><div class='add'>+		.bios_sar_capa = &amp;ath11k_hw_sar_capa_wcn6855,</div><div class='add'>+		.m3_fw_support = true,</div><div class='add'>+		.fixed_bdf_addr = false,</div><div class='add'>+		.fixed_mem_region = false,</div><div class='add'>+		.static_window_map = false,</div><div class='add'>+		.hybrid_bus_type = false,</div><div class='add'>+		.fixed_fw_mem = false,</div><div class='add'>+		.support_off_channel_tx = true,</div><div class='add'>+		.supports_multi_bssid = true,</div><div class='add'>+</div><div class='add'>+		.sram_dump = {</div><div class='add'>+			.start = 0x01400000,</div><div class='add'>+			.end = 0x0177ffff,</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.tcl_ring_retry = true,</div><div class='add'>+		.tx_ring_size = DP_TCL_DATA_RING_SIZE,</div><div class='add'>+		.smp2p_wow_exit = false,</div><div class='add'>+		.support_fw_mac_sequence = true,</div><div class='add'>+		.support_dual_stations = true,</div><div class='add'>+		.pdev_suspend = false,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int ath11k_core_suspend(struct ath11k_base *ab)</div><div class='add'>+static const struct dmi_system_id ath11k_pm_quirk_table[] = {</div><div class='add'>+	{</div><div class='add'>+		.driver_data = (void *)ATH11K_PM_WOW,</div><div class='add'>+		.matches = { /* X13 G4 AMD #1 */</div><div class='add'>+			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "21J3"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.driver_data = (void *)ATH11K_PM_WOW,</div><div class='add'>+		.matches = { /* X13 G4 AMD #2 */</div><div class='add'>+			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "21J4"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.driver_data = (void *)ATH11K_PM_WOW,</div><div class='add'>+		.matches = { /* T14 G4 AMD #1 */</div><div class='add'>+			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "21K3"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.driver_data = (void *)ATH11K_PM_WOW,</div><div class='add'>+		.matches = { /* T14 G4 AMD #2 */</div><div class='add'>+			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "21K4"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.driver_data = (void *)ATH11K_PM_WOW,</div><div class='add'>+		.matches = { /* P14s G4 AMD #1 */</div><div class='add'>+			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "21K5"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.driver_data = (void *)ATH11K_PM_WOW,</div><div class='add'>+		.matches = { /* P14s G4 AMD #2 */</div><div class='add'>+			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "21K6"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.driver_data = (void *)ATH11K_PM_WOW,</div><div class='add'>+		.matches = { /* T16 G2 AMD #1 */</div><div class='add'>+			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "21K7"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.driver_data = (void *)ATH11K_PM_WOW,</div><div class='add'>+		.matches = { /* T16 G2 AMD #2 */</div><div class='add'>+			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "21K8"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.driver_data = (void *)ATH11K_PM_WOW,</div><div class='add'>+		.matches = { /* P16s G2 AMD #1 */</div><div class='add'>+			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "21K9"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.driver_data = (void *)ATH11K_PM_WOW,</div><div class='add'>+		.matches = { /* P16s G2 AMD #2 */</div><div class='add'>+			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "21KA"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.driver_data = (void *)ATH11K_PM_WOW,</div><div class='add'>+		.matches = { /* T14s G4 AMD #1 */</div><div class='add'>+			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "21F8"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.driver_data = (void *)ATH11K_PM_WOW,</div><div class='add'>+		.matches = { /* T14s G4 AMD #2 */</div><div class='add'>+			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "21F9"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath11k_fw_stats_pdevs_free(struct list_head *head)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	struct ath11k_fw_stats_pdev *i, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(i, tmp, head, list) {</div><div class='add'>+		list_del(&amp;i-&gt;list);</div><div class='add'>+		kfree(i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_fw_stats_vdevs_free(struct list_head *head)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_fw_stats_vdev *i, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(i, tmp, head, list) {</div><div class='add'>+		list_del(&amp;i-&gt;list);</div><div class='add'>+		kfree(i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_fw_stats_bcn_free(struct list_head *head)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_fw_stats_bcn *i, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(i, tmp, head, list) {</div><div class='add'>+		list_del(&amp;i-&gt;list);</div><div class='add'>+		kfree(i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_fw_stats_init(struct ath11k *ar)</div><div class='add'>+{</div><div class='add'>+	INIT_LIST_HEAD(&amp;ar-&gt;fw_stats.pdevs);</div><div class='add'>+	INIT_LIST_HEAD(&amp;ar-&gt;fw_stats.vdevs);</div><div class='add'>+	INIT_LIST_HEAD(&amp;ar-&gt;fw_stats.bcn);</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;ar-&gt;fw_stats_complete);</div><div class='add'>+	init_completion(&amp;ar-&gt;fw_stats_done);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_fw_stats_free(struct ath11k_fw_stats *stats)</div><div class='add'>+{</div><div class='add'>+	ath11k_fw_stats_pdevs_free(&amp;stats-&gt;pdevs);</div><div class='add'>+	ath11k_fw_stats_vdevs_free(&amp;stats-&gt;vdevs);</div><div class='add'>+	ath11k_fw_stats_bcn_free(&amp;stats-&gt;bcn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool ath11k_core_coldboot_cal_support(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	if (!ath11k_cold_boot_cal)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (ath11k_ftm_mode)</div><div class='add'>+		return ab-&gt;hw_params.coldboot_cal_ftm;</div><div class='add'>+</div><div class='add'>+	else</div><div class='add'>+		return ab-&gt;hw_params.coldboot_cal_mm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Check if we need to continue with suspend/resume operation.</div><div class='add'>+ * Return:</div><div class='add'>+ *	a negative value: error happens and don't continue.</div><div class='add'>+ *	0:  no error but don't continue.</div><div class='add'>+ *	positive value: no error and do continue.</div><div class='add'>+ */</div><div class='add'>+static int ath11k_core_continue_suspend_resume(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar;</div><div class='ctx'> </div><div class='ctx'> 	if (!ab-&gt;hw_params.supports_suspend)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	/* TODO: there can frames in queues so for now add delay as a hack.</div><div class='del'>-	 * Need to implement to handle and remove this delay.</div><div class='add'>+	/* so far single_pdev_only chips have supports_suspend as true</div><div class='add'>+	 * so pass 0 as a dummy pdev_id here.</div><div class='ctx'> 	 */</div><div class='del'>-	msleep(500);</div><div class='add'>+	ar = ab-&gt;pdevs[0].ar;</div><div class='add'>+	if (!ar || ar-&gt;state != ATH11K_STATE_OFF)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_core_suspend_wow(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_dp_rx_pktlog_stop(ab, true);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -208,6 +1090,15 @@ int ath11k_core_suspend(struct ath11k_base *ab)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* So far only single_pdev_only devices can reach here,</div><div class='add'>+	 * so it is valid to handle the first, and the only, pdev.</div><div class='add'>+	 */</div><div class='add'>+	ret = ath11k_mac_wait_tx_complete(ab-&gt;pdevs[0].ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to wait tx complete: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = ath11k_wow_enable(ab);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ab, "failed to enable wow during suspend: %d\n", ret);</div><div class='hunk'>@@ -235,14 +1126,146 @@ int ath11k_core_suspend(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int ath11k_core_suspend_default(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_dp_rx_pktlog_stop(ab, true);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to stop dp rx (and timer) pktlog during suspend: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* So far only single_pdev_only devices can reach here,</div><div class='add'>+	 * so it is valid to handle the first, and the only, pdev.</div><div class='add'>+	 */</div><div class='add'>+	ret = ath11k_mac_wait_tx_complete(ab-&gt;pdevs[0].ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to wait tx complete: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_dp_rx_pktlog_stop(ab, false);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to stop dp rx pktlog during suspend: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_ce_stop_shadow_timers(ab);</div><div class='add'>+	ath11k_dp_stop_shadow_timers(ab);</div><div class='add'>+</div><div class='add'>+	/* PM framework skips suspend_late/resume_early callbacks</div><div class='add'>+	 * if other devices report errors in their suspend callbacks.</div><div class='add'>+	 * However ath11k_core_resume() would still be called because</div><div class='add'>+	 * here we return success thus kernel put us on dpm_suspended_list.</div><div class='add'>+	 * Since we won't go through a power down/up cycle, there is</div><div class='add'>+	 * no chance to call complete(&amp;ab-&gt;restart_completed) in</div><div class='add'>+	 * ath11k_core_restart(), making ath11k_core_resume() timeout.</div><div class='add'>+	 * So call it here to avoid this issue. This also works in case</div><div class='add'>+	 * no error happens thus suspend_late/resume_early get called,</div><div class='add'>+	 * because it will be reinitialized in ath11k_core_resume_early().</div><div class='add'>+	 */</div><div class='add'>+	complete(&amp;ab-&gt;restart_completed);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_core_suspend(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_core_continue_suspend_resume(ab);</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;actual_pm_policy == ATH11K_PM_WOW)</div><div class='add'>+		return ath11k_core_suspend_wow(ab);</div><div class='add'>+</div><div class='add'>+	return ath11k_core_suspend_default(ab);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(ath11k_core_suspend);</div><div class='ctx'> </div><div class='del'>-int ath11k_core_resume(struct ath11k_base *ab)</div><div class='add'>+int ath11k_core_suspend_late(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!ab-&gt;hw_params.supports_suspend)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+	ret = ath11k_core_continue_suspend_resume(ab);</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;actual_pm_policy == ATH11K_PM_WOW)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ath11k_hif_irq_disable(ab);</div><div class='add'>+	ath11k_hif_ce_irq_disable(ab);</div><div class='add'>+</div><div class='add'>+	ath11k_hif_power_down(ab, true);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_core_suspend_late);</div><div class='add'>+</div><div class='add'>+int ath11k_core_resume_early(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_core_continue_suspend_resume(ab);</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;actual_pm_policy == ATH11K_PM_WOW)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;ab-&gt;restart_completed);</div><div class='add'>+	ret = ath11k_hif_power_up(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath11k_warn(ab, "failed to power up hif during resume: %d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_core_resume_early);</div><div class='add'>+</div><div class='add'>+static int ath11k_core_resume_default(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar;</div><div class='add'>+	long time_left;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;ab-&gt;restart_completed,</div><div class='add'>+						ATH11K_RESET_TIMEOUT_HZ);</div><div class='add'>+	if (time_left == 0) {</div><div class='add'>+		ath11k_warn(ab, "timeout while waiting for restart complete");</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* So far only single_pdev_only devices can reach here,</div><div class='add'>+	 * so it is valid to handle the first, and the only, pdev.</div><div class='add'>+	 */</div><div class='add'>+	ar = ab-&gt;pdevs[0].ar;</div><div class='add'>+	if (ab-&gt;hw_params.current_cc_support &amp;&amp;</div><div class='add'>+	    ar-&gt;alpha2[0] != 0 &amp;&amp; ar-&gt;alpha2[1] != 0) {</div><div class='add'>+		ret = ath11k_reg_set_cc(ar);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ab, "failed to set country code during resume: %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_dp_rx_pktlog_start(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath11k_warn(ab, "failed to start rx pktlog during resume: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_core_resume_wow(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_hif_resume(ab);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -268,8 +1291,113 @@ int ath11k_core_resume(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int ath11k_core_resume(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_core_continue_suspend_resume(ab);</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;actual_pm_policy == ATH11K_PM_WOW)</div><div class='add'>+		return ath11k_core_resume_wow(ab);</div><div class='add'>+</div><div class='add'>+	return ath11k_core_resume_default(ab);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(ath11k_core_resume);</div><div class='ctx'> </div><div class='add'>+static void ath11k_core_check_cc_code_bdfext(const struct dmi_header *hdr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = data;</div><div class='add'>+	const char *magic = ATH11K_SMBIOS_BDF_EXT_MAGIC;</div><div class='add'>+	struct ath11k_smbios_bdf *smbios = (struct ath11k_smbios_bdf *)hdr;</div><div class='add'>+	ssize_t copied;</div><div class='add'>+	size_t len;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;qmi.target.bdf_ext[0] != '\0')</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;type != ATH11K_SMBIOS_BDF_EXT_TYPE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;length != ATH11K_SMBIOS_BDF_EXT_LENGTH) {</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_BOOT,</div><div class='add'>+			   "wrong smbios bdf ext type length (%d).\n",</div><div class='add'>+			   hdr-&gt;length);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	switch (smbios-&gt;country_code_flag) {</div><div class='add'>+	case ATH11K_SMBIOS_CC_ISO:</div><div class='add'>+		ab-&gt;new_alpha2[0] = (smbios-&gt;cc_code &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+		ab-&gt;new_alpha2[1] = smbios-&gt;cc_code &amp; 0xff;</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_BOOT, "smbios cc_code %c%c\n",</div><div class='add'>+			   ab-&gt;new_alpha2[0], ab-&gt;new_alpha2[1]);</div><div class='add'>+		break;</div><div class='add'>+	case ATH11K_SMBIOS_CC_WW:</div><div class='add'>+		ab-&gt;new_alpha2[0] = '0';</div><div class='add'>+		ab-&gt;new_alpha2[1] = '0';</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_BOOT, "smbios worldwide regdomain\n");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_BOOT, "ignore smbios country code setting %d\n",</div><div class='add'>+			   smbios-&gt;country_code_flag);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	if (!smbios-&gt;bdf_enabled) {</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_BOOT, "bdf variant name not found.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Only one string exists (per spec) */</div><div class='add'>+	if (memcmp(smbios-&gt;bdf_ext, magic, strlen(magic)) != 0) {</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_BOOT,</div><div class='add'>+			   "bdf variant magic does not match.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = min_t(size_t,</div><div class='add'>+		    strlen(smbios-&gt;bdf_ext), sizeof(ab-&gt;qmi.target.bdf_ext));</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		if (!isascii(smbios-&gt;bdf_ext[i]) || !isprint(smbios-&gt;bdf_ext[i])) {</div><div class='add'>+			ath11k_dbg(ab, ATH11K_DBG_BOOT,</div><div class='add'>+				   "bdf variant name contains non ascii chars.\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy extension name without magic prefix */</div><div class='add'>+	copied = strscpy(ab-&gt;qmi.target.bdf_ext, smbios-&gt;bdf_ext + strlen(magic),</div><div class='add'>+			 sizeof(ab-&gt;qmi.target.bdf_ext));</div><div class='add'>+	if (copied &lt; 0) {</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_BOOT,</div><div class='add'>+			   "bdf variant string is longer than the buffer can accommodate\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_BOOT,</div><div class='add'>+		   "found and validated bdf variant smbios_type 0x%x bdf %s\n",</div><div class='add'>+		   ATH11K_SMBIOS_BDF_EXT_TYPE, ab-&gt;qmi.target.bdf_ext);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_core_check_smbios(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ab-&gt;qmi.target.bdf_ext[0] = '\0';</div><div class='add'>+	dmi_walk(ath11k_core_check_cc_code_bdfext, ab);</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;qmi.target.bdf_ext[0] == '\0')</div><div class='add'>+		return -ENODATA;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int ath11k_core_check_dt(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	size_t max_len = sizeof(ab-&gt;qmi.target.bdf_ext);</div><div class='hunk'>@@ -280,9 +1408,12 @@ int ath11k_core_check_dt(struct ath11k_base *ab)</div><div class='ctx'> 	if (!node)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	of_property_read_string(node, "qcom,ath11k-calibration-variant",</div><div class='add'>+	of_property_read_string(node, "qcom,calibration-variant",</div><div class='ctx'> 				&amp;variant);</div><div class='ctx'> 	if (!variant)</div><div class='add'>+		of_property_read_string(node, "qcom,ath11k-calibration-variant",</div><div class='add'>+					&amp;variant);</div><div class='add'>+	if (!variant)</div><div class='ctx'> 		return -ENODATA;</div><div class='ctx'> </div><div class='ctx'> 	if (strscpy(ab-&gt;qmi.target.bdf_ext, variant, max_len) &lt; 0)</div><div class='hunk'>@@ -293,27 +1424,92 @@ int ath11k_core_check_dt(struct ath11k_base *ab)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_core_create_board_name(struct ath11k_base *ab, char *name,</div><div class='del'>-					 size_t name_len)</div><div class='add'>+enum ath11k_bdf_name_type {</div><div class='add'>+	ATH11K_BDF_NAME_FULL,</div><div class='add'>+	ATH11K_BDF_NAME_BUS_NAME,</div><div class='add'>+	ATH11K_BDF_NAME_CHIP_ID,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __ath11k_core_create_board_name(struct ath11k_base *ab, char *name,</div><div class='add'>+					   size_t name_len, bool with_variant,</div><div class='add'>+					   enum ath11k_bdf_name_type name_type)</div><div class='ctx'> {</div><div class='ctx'> 	/* strlen(',variant=') + strlen(ab-&gt;qmi.target.bdf_ext) */</div><div class='del'>-	char variant[9 + ATH11K_QMI_BDF_EXT_STR_LENGTH] = { 0 };</div><div class='add'>+	char variant[9 + ATH11K_QMI_BDF_EXT_STR_LENGTH] = {};</div><div class='ctx'> </div><div class='del'>-	if (ab-&gt;qmi.target.bdf_ext[0] != '\0')</div><div class='add'>+	if (with_variant &amp;&amp; ab-&gt;qmi.target.bdf_ext[0] != '\0')</div><div class='ctx'> 		scnprintf(variant, sizeof(variant), ",variant=%s",</div><div class='ctx'> 			  ab-&gt;qmi.target.bdf_ext);</div><div class='ctx'> </div><div class='del'>-	scnprintf(name, name_len,</div><div class='del'>-		  "bus=%s,qmi-chip-id=%d,qmi-board-id=%d%s",</div><div class='del'>-		  ath11k_bus_str(ab-&gt;hif.bus),</div><div class='del'>-		  ab-&gt;qmi.target.chip_id,</div><div class='del'>-		  ab-&gt;qmi.target.board_id, variant);</div><div class='add'>+	switch (ab-&gt;id.bdf_search) {</div><div class='add'>+	case ATH11K_BDF_SEARCH_BUS_AND_BOARD:</div><div class='add'>+		switch (name_type) {</div><div class='add'>+		case ATH11K_BDF_NAME_FULL:</div><div class='add'>+			scnprintf(name, name_len,</div><div class='add'>+				  "bus=%s,vendor=%04x,device=%04x,subsystem-vendor=%04x,subsystem-device=%04x,qmi-chip-id=%d,qmi-board-id=%d%s",</div><div class='add'>+				  ath11k_bus_str(ab-&gt;hif.bus),</div><div class='add'>+				  ab-&gt;id.vendor, ab-&gt;id.device,</div><div class='add'>+				  ab-&gt;id.subsystem_vendor,</div><div class='add'>+				  ab-&gt;id.subsystem_device,</div><div class='add'>+				  ab-&gt;qmi.target.chip_id,</div><div class='add'>+				  ab-&gt;qmi.target.board_id,</div><div class='add'>+				  variant);</div><div class='add'>+			break;</div><div class='add'>+		case ATH11K_BDF_NAME_BUS_NAME:</div><div class='add'>+			scnprintf(name, name_len,</div><div class='add'>+				  "bus=%s",</div><div class='add'>+				  ath11k_bus_str(ab-&gt;hif.bus));</div><div class='add'>+			break;</div><div class='add'>+		case ATH11K_BDF_NAME_CHIP_ID:</div><div class='add'>+			scnprintf(name, name_len,</div><div class='add'>+				  "bus=%s,qmi-chip-id=%d",</div><div class='add'>+				  ath11k_bus_str(ab-&gt;hif.bus),</div><div class='add'>+				  ab-&gt;qmi.target.chip_id);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		scnprintf(name, name_len,</div><div class='add'>+			  "bus=%s,qmi-chip-id=%d,qmi-board-id=%d%s",</div><div class='add'>+			  ath11k_bus_str(ab-&gt;hif.bus),</div><div class='add'>+			  ab-&gt;qmi.target.chip_id,</div><div class='add'>+			  ab-&gt;qmi.target.board_id, variant);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_BOOT, "boot using board name '%s'\n", name);</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_BOOT, "using board name '%s'\n", name);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ath11k_core_create_board_name(struct ath11k_base *ab, char *name,</div><div class='add'>+					 size_t name_len)</div><div class='add'>+{</div><div class='add'>+	return __ath11k_core_create_board_name(ab, name, name_len, true,</div><div class='add'>+					       ATH11K_BDF_NAME_FULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_core_create_fallback_board_name(struct ath11k_base *ab, char *name,</div><div class='add'>+						  size_t name_len)</div><div class='add'>+{</div><div class='add'>+	return __ath11k_core_create_board_name(ab, name, name_len, false,</div><div class='add'>+					       ATH11K_BDF_NAME_FULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_core_create_bus_type_board_name(struct ath11k_base *ab, char *name,</div><div class='add'>+						  size_t name_len)</div><div class='add'>+{</div><div class='add'>+	return __ath11k_core_create_board_name(ab, name, name_len, false,</div><div class='add'>+					       ATH11K_BDF_NAME_BUS_NAME);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_core_create_chip_id_board_name(struct ath11k_base *ab, char *name,</div><div class='add'>+						 size_t name_len)</div><div class='add'>+{</div><div class='add'>+	return __ath11k_core_create_board_name(ab, name, name_len, false,</div><div class='add'>+					       ATH11K_BDF_NAME_CHIP_ID);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct firmware *ath11k_core_firmware_request(struct ath11k_base *ab,</div><div class='ctx'> 						    const char *file)</div><div class='ctx'> {</div><div class='hunk'>@@ -330,7 +1526,7 @@ const struct firmware *ath11k_core_firmware_request(struct ath11k_base *ab,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_BOOT, "boot firmware request %s size %zu\n",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_BOOT, "firmware request %s size %zu\n",</div><div class='ctx'> 		   path, fw-&gt;size);</div><div class='ctx'> </div><div class='ctx'> 	return fw;</div><div class='hunk'>@@ -348,7 +1544,9 @@ static int ath11k_core_parse_bd_ie_board(struct ath11k_base *ab,</div><div class='ctx'> 					 struct ath11k_board_data *bd,</div><div class='ctx'> 					 const void *buf, size_t buf_len,</div><div class='ctx'> 					 const char *boardname,</div><div class='del'>-					 int bd_ie_type)</div><div class='add'>+					 int ie_id,</div><div class='add'>+					 int name_id,</div><div class='add'>+					 int data_id)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ath11k_fw_ie *hdr;</div><div class='ctx'> 	bool name_match_found;</div><div class='hunk'>@@ -358,7 +1556,7 @@ static int ath11k_core_parse_bd_ie_board(struct ath11k_base *ab,</div><div class='ctx'> </div><div class='ctx'> 	name_match_found = false;</div><div class='ctx'> </div><div class='del'>-	/* go through ATH11K_BD_IE_BOARD_ elements */</div><div class='add'>+	/* go through ATH11K_BD_IE_BOARD_/ATH11K_BD_IE_REGDB_ elements */</div><div class='ctx'> 	while (buf_len &gt; sizeof(struct ath11k_fw_ie)) {</div><div class='ctx'> 		hdr = buf;</div><div class='ctx'> 		board_ie_id = le32_to_cpu(hdr-&gt;id);</div><div class='hunk'>@@ -369,48 +1567,50 @@ static int ath11k_core_parse_bd_ie_board(struct ath11k_base *ab,</div><div class='ctx'> 		buf += sizeof(*hdr);</div><div class='ctx'> </div><div class='ctx'> 		if (buf_len &lt; ALIGN(board_ie_len, 4)) {</div><div class='del'>-			ath11k_err(ab, "invalid ATH11K_BD_IE_BOARD length: %zu &lt; %zu\n",</div><div class='add'>+			ath11k_err(ab, "invalid %s length: %zu &lt; %zu\n",</div><div class='add'>+				   ath11k_bd_ie_type_str(ie_id),</div><div class='ctx'> 				   buf_len, ALIGN(board_ie_len, 4));</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		switch (board_ie_id) {</div><div class='del'>-		case ATH11K_BD_IE_BOARD_NAME:</div><div class='add'>+		if (board_ie_id == name_id) {</div><div class='ctx'> 			ath11k_dbg_dump(ab, ATH11K_DBG_BOOT, "board name", "",</div><div class='ctx'> 					board_ie_data, board_ie_len);</div><div class='ctx'> </div><div class='ctx'> 			if (board_ie_len != strlen(boardname))</div><div class='del'>-				break;</div><div class='add'>+				goto next;</div><div class='ctx'> </div><div class='ctx'> 			ret = memcmp(board_ie_data, boardname, strlen(boardname));</div><div class='ctx'> 			if (ret)</div><div class='del'>-				break;</div><div class='add'>+				goto next;</div><div class='ctx'> </div><div class='ctx'> 			name_match_found = true;</div><div class='ctx'> 			ath11k_dbg(ab, ATH11K_DBG_BOOT,</div><div class='del'>-				   "boot found match for name '%s'",</div><div class='add'>+				   "found match %s for name '%s'",</div><div class='add'>+				   ath11k_bd_ie_type_str(ie_id),</div><div class='ctx'> 				   boardname);</div><div class='del'>-			break;</div><div class='del'>-		case ATH11K_BD_IE_BOARD_DATA:</div><div class='add'>+		} else if (board_ie_id == data_id) {</div><div class='ctx'> 			if (!name_match_found)</div><div class='ctx'> 				/* no match found */</div><div class='del'>-				break;</div><div class='add'>+				goto next;</div><div class='ctx'> </div><div class='ctx'> 			ath11k_dbg(ab, ATH11K_DBG_BOOT,</div><div class='del'>-				   "boot found board data for '%s'", boardname);</div><div class='add'>+				   "found %s for '%s'",</div><div class='add'>+				   ath11k_bd_ie_type_str(ie_id),</div><div class='add'>+				   boardname);</div><div class='ctx'> </div><div class='ctx'> 			bd-&gt;data = board_ie_data;</div><div class='ctx'> 			bd-&gt;len = board_ie_len;</div><div class='ctx'> </div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 			goto out;</div><div class='del'>-		default:</div><div class='del'>-			ath11k_warn(ab, "unknown ATH11K_BD_IE_BOARD found: %d\n",</div><div class='add'>+		} else {</div><div class='add'>+			ath11k_warn(ab, "unknown %s id found: %d\n",</div><div class='add'>+				    ath11k_bd_ie_type_str(ie_id),</div><div class='ctx'> 				    board_ie_id);</div><div class='del'>-			break;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='add'>+next:</div><div class='ctx'> 		/* jump over the padding */</div><div class='ctx'> 		board_ie_len = ALIGN(board_ie_len, 4);</div><div class='ctx'> </div><div class='hunk'>@@ -427,7 +1627,10 @@ out:</div><div class='ctx'> </div><div class='ctx'> static int ath11k_core_fetch_board_data_api_n(struct ath11k_base *ab,</div><div class='ctx'> 					      struct ath11k_board_data *bd,</div><div class='del'>-					      const char *boardname)</div><div class='add'>+					      const char *boardname,</div><div class='add'>+					      int ie_id_match,</div><div class='add'>+					      int name_id,</div><div class='add'>+					      int data_id)</div><div class='ctx'> {</div><div class='ctx'> 	size_t len, magic_len;</div><div class='ctx'> 	const u8 *data;</div><div class='hunk'>@@ -488,25 +1691,27 @@ static int ath11k_core_fetch_board_data_api_n(struct ath11k_base *ab,</div><div class='ctx'> 		if (len &lt; ALIGN(ie_len, 4)) {</div><div class='ctx'> 			ath11k_err(ab, "invalid length for board ie_id %d ie_len %zu len %zu\n",</div><div class='ctx'> 				   ie_id, ie_len, len);</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		switch (ie_id) {</div><div class='del'>-		case ATH11K_BD_IE_BOARD:</div><div class='add'>+		if (ie_id == ie_id_match) {</div><div class='ctx'> 			ret = ath11k_core_parse_bd_ie_board(ab, bd, data,</div><div class='ctx'> 							    ie_len,</div><div class='ctx'> 							    boardname,</div><div class='del'>-							    ATH11K_BD_IE_BOARD);</div><div class='add'>+							    ie_id_match,</div><div class='add'>+							    name_id,</div><div class='add'>+							    data_id);</div><div class='ctx'> 			if (ret == -ENOENT)</div><div class='ctx'> 				/* no match found, continue */</div><div class='del'>-				break;</div><div class='add'>+				goto next;</div><div class='ctx'> 			else if (ret)</div><div class='ctx'> 				/* there was an error, bail out */</div><div class='ctx'> 				goto err;</div><div class='ctx'> 			/* either found or error, so stop searching */</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='add'>+next:</div><div class='ctx'> 		/* jump over the padding */</div><div class='ctx'> 		ie_len = ALIGN(ie_len, 4);</div><div class='ctx'> </div><div class='hunk'>@@ -516,8 +1721,9 @@ static int ath11k_core_fetch_board_data_api_n(struct ath11k_base *ab,</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	if (!bd-&gt;data || !bd-&gt;len) {</div><div class='del'>-		ath11k_err(ab,</div><div class='del'>-			   "failed to fetch board data for %s from %s\n",</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_BOOT,</div><div class='add'>+			   "failed to fetch %s for %s from %s\n",</div><div class='add'>+			   ath11k_bd_ie_type_str(ie_id_match),</div><div class='ctx'> 			   boardname, filepath);</div><div class='ctx'> 		ret = -ENODATA;</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -530,10 +1736,12 @@ err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_core_fetch_board_data_api_1(struct ath11k_base *ab,</div><div class='del'>-					      struct ath11k_board_data *bd)</div><div class='add'>+int ath11k_core_fetch_board_data_api_1(struct ath11k_base *ab,</div><div class='add'>+				       struct ath11k_board_data *bd,</div><div class='add'>+				       const char *name)</div><div class='ctx'> {</div><div class='del'>-	bd-&gt;fw = ath11k_core_firmware_request(ab, ATH11K_DEFAULT_BOARD_FILE);</div><div class='add'>+	bd-&gt;fw = ath11k_core_firmware_request(ab, name);</div><div class='add'>+</div><div class='ctx'> 	if (IS_ERR(bd-&gt;fw))</div><div class='ctx'> 		return PTR_ERR(bd-&gt;fw);</div><div class='ctx'> </div><div class='hunk'>@@ -543,34 +1751,149 @@ static int ath11k_core_fetch_board_data_api_1(struct ath11k_base *ab,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define BOARD_NAME_SIZE 100</div><div class='add'>+#define BOARD_NAME_SIZE 200</div><div class='ctx'> int ath11k_core_fetch_bdf(struct ath11k_base *ab, struct ath11k_board_data *bd)</div><div class='ctx'> {</div><div class='del'>-	char boardname[BOARD_NAME_SIZE];</div><div class='del'>-	int ret;</div><div class='add'>+	char *boardname = NULL, *fallback_boardname = NULL, *chip_id_boardname = NULL;</div><div class='add'>+	char *filename, filepath[100];</div><div class='add'>+	int bd_api;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	filename = ATH11K_BOARD_API2_FILE;</div><div class='add'>+	boardname = kzalloc(BOARD_NAME_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!boardname) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_core_create_board_name(ab, boardname, BOARD_NAME_SIZE);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_err(ab, "failed to create board name: %d", ret);</div><div class='del'>-		return ret;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bd_api = 2;</div><div class='add'>+	ret = ath11k_core_fetch_board_data_api_n(ab, bd, boardname,</div><div class='add'>+						 ATH11K_BD_IE_BOARD,</div><div class='add'>+						 ATH11K_BD_IE_BOARD_NAME,</div><div class='add'>+						 ATH11K_BD_IE_BOARD_DATA);</div><div class='add'>+	if (!ret)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	fallback_boardname = kzalloc(BOARD_NAME_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!fallback_boardname) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_core_create_fallback_board_name(ab, fallback_boardname,</div><div class='add'>+						     BOARD_NAME_SIZE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_err(ab, "failed to create fallback board name: %d", ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_core_fetch_board_data_api_n(ab, bd, fallback_boardname,</div><div class='add'>+						 ATH11K_BD_IE_BOARD,</div><div class='add'>+						 ATH11K_BD_IE_BOARD_NAME,</div><div class='add'>+						 ATH11K_BD_IE_BOARD_DATA);</div><div class='add'>+	if (!ret)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	chip_id_boardname = kzalloc(BOARD_NAME_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!chip_id_boardname) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_core_create_chip_id_board_name(ab, chip_id_boardname,</div><div class='add'>+						    BOARD_NAME_SIZE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_err(ab, "failed to create chip id board name: %d", ret);</div><div class='add'>+		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ab-&gt;bd_api = 2;</div><div class='del'>-	ret = ath11k_core_fetch_board_data_api_n(ab, bd, boardname);</div><div class='add'>+	ret = ath11k_core_fetch_board_data_api_n(ab, bd, chip_id_boardname,</div><div class='add'>+						 ATH11K_BD_IE_BOARD,</div><div class='add'>+						 ATH11K_BD_IE_BOARD_NAME,</div><div class='add'>+						 ATH11K_BD_IE_BOARD_DATA);</div><div class='add'>+</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		goto success;</div><div class='add'>+		goto exit;</div><div class='ctx'> </div><div class='del'>-	ab-&gt;bd_api = 1;</div><div class='del'>-	ret = ath11k_core_fetch_board_data_api_1(ab, bd);</div><div class='add'>+	bd_api = 1;</div><div class='add'>+	ret = ath11k_core_fetch_board_data_api_1(ab, bd, ATH11K_DEFAULT_BOARD_FILE);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ath11k_err(ab, "failed to fetch board-2.bin or board.bin from %s\n",</div><div class='add'>+		ath11k_core_create_firmware_path(ab, filename,</div><div class='add'>+						 filepath, sizeof(filepath));</div><div class='add'>+		ath11k_err(ab, "failed to fetch board data for %s from %s\n",</div><div class='add'>+			   boardname, filepath);</div><div class='add'>+		if (memcmp(boardname, fallback_boardname, strlen(boardname)))</div><div class='add'>+			ath11k_err(ab, "failed to fetch board data for %s from %s\n",</div><div class='add'>+				   fallback_boardname, filepath);</div><div class='add'>+</div><div class='add'>+		ath11k_err(ab, "failed to fetch board data for %s from %s\n",</div><div class='add'>+			   chip_id_boardname, filepath);</div><div class='add'>+</div><div class='add'>+		ath11k_err(ab, "failed to fetch board.bin from %s\n",</div><div class='ctx'> 			   ab-&gt;hw_params.fw.dir);</div><div class='del'>-		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-success:</div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_BOOT, "using board api %d\n", ab-&gt;bd_api);</div><div class='del'>-	return 0;</div><div class='add'>+exit:</div><div class='add'>+	kfree(boardname);</div><div class='add'>+	kfree(fallback_boardname);</div><div class='add'>+	kfree(chip_id_boardname);</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_BOOT, "using board api %d\n", bd_api);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_core_fetch_regdb(struct ath11k_base *ab, struct ath11k_board_data *bd)</div><div class='add'>+{</div><div class='add'>+	char boardname[BOARD_NAME_SIZE], default_boardname[BOARD_NAME_SIZE];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_core_create_board_name(ab, boardname, BOARD_NAME_SIZE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_BOOT,</div><div class='add'>+			   "failed to create board name for regdb: %d", ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_core_fetch_board_data_api_n(ab, bd, boardname,</div><div class='add'>+						 ATH11K_BD_IE_REGDB,</div><div class='add'>+						 ATH11K_BD_IE_REGDB_NAME,</div><div class='add'>+						 ATH11K_BD_IE_REGDB_DATA);</div><div class='add'>+	if (!ret)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_core_create_bus_type_board_name(ab, default_boardname,</div><div class='add'>+						     BOARD_NAME_SIZE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_BOOT,</div><div class='add'>+			   "failed to create default board name for regdb: %d", ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_core_fetch_board_data_api_n(ab, bd, default_boardname,</div><div class='add'>+						 ATH11K_BD_IE_REGDB,</div><div class='add'>+						 ATH11K_BD_IE_REGDB_NAME,</div><div class='add'>+						 ATH11K_BD_IE_REGDB_DATA);</div><div class='add'>+	if (!ret)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_core_fetch_board_data_api_1(ab, bd, ATH11K_REGDB_FILE_NAME);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_BOOT, "failed to fetch %s from %s\n",</div><div class='add'>+			   ATH11K_REGDB_FILE_NAME, ab-&gt;hw_params.fw.dir);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	if (!ret)</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_BOOT, "fetched regdb\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_core_stop(struct ath11k_base *ab)</div><div class='hunk'>@@ -589,6 +1912,11 @@ static int ath11k_core_soc_create(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (ath11k_ftm_mode) {</div><div class='add'>+		ab-&gt;fw_mode = ATH11K_FIRMWARE_MODE_FTM;</div><div class='add'>+		ath11k_info(ab, "Booting in factory test mode\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = ath11k_qmi_init_service(ab);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_err(ab, "failed to initialize qmi :%d\n", ret);</div><div class='hunk'>@@ -634,23 +1962,23 @@ static int ath11k_core_pdev_create(struct ath11k_base *ab)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_mac_register(ab);</div><div class='add'>+	ret = ath11k_dp_pdev_alloc(ab);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ath11k_err(ab, "failed register the radio with mac80211: %d\n", ret);</div><div class='add'>+		ath11k_err(ab, "failed to attach DP pdev: %d\n", ret);</div><div class='ctx'> 		goto err_pdev_debug;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_dp_pdev_alloc(ab);</div><div class='add'>+	ret = ath11k_mac_register(ab);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ath11k_err(ab, "failed to attach DP pdev: %d\n", ret);</div><div class='del'>-		goto err_mac_unregister;</div><div class='add'>+		ath11k_err(ab, "failed register the radio with mac80211: %d\n", ret);</div><div class='add'>+		goto err_dp_pdev_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_thermal_register(ab);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_err(ab, "could not register thermal device: %d\n",</div><div class='ctx'> 			   ret);</div><div class='del'>-		goto err_dp_pdev_free;</div><div class='add'>+		goto err_mac_unregister;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_spectral_init(ab);</div><div class='hunk'>@@ -663,41 +1991,70 @@ static int ath11k_core_pdev_create(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> err_thermal_unregister:</div><div class='ctx'> 	ath11k_thermal_unregister(ab);</div><div class='del'>-err_dp_pdev_free:</div><div class='del'>-	ath11k_dp_pdev_free(ab);</div><div class='ctx'> err_mac_unregister:</div><div class='ctx'> 	ath11k_mac_unregister(ab);</div><div class='add'>+err_dp_pdev_free:</div><div class='add'>+	ath11k_dp_pdev_free(ab);</div><div class='ctx'> err_pdev_debug:</div><div class='ctx'> 	ath11k_debugfs_pdev_destroy(ab);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ath11k_core_pdev_suspend_target(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar;</div><div class='add'>+	struct ath11k_pdev *pdev;</div><div class='add'>+	unsigned long time_left;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;hw_params.pdev_suspend)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		pdev = &amp;ab-&gt;pdevs[i];</div><div class='add'>+		ar = pdev-&gt;ar;</div><div class='add'>+</div><div class='add'>+		reinit_completion(&amp;ab-&gt;htc_suspend);</div><div class='add'>+</div><div class='add'>+		ret = ath11k_wmi_pdev_suspend(ar, WMI_PDEV_SUSPEND_AND_DISABLE_INTR,</div><div class='add'>+					      pdev-&gt;pdev_id);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ab, "could not suspend target :%d\n", ret);</div><div class='add'>+			/* pointless to try other pdevs */</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		time_left = wait_for_completion_timeout(&amp;ab-&gt;htc_suspend, 3 * HZ);</div><div class='add'>+</div><div class='add'>+		if (!time_left) {</div><div class='add'>+			ath11k_warn(ab, "suspend timed out - target pause event never came\n");</div><div class='add'>+			/* pointless to try other pdevs */</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath11k_core_pdev_destroy(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	ath11k_spectral_deinit(ab);</div><div class='ctx'> 	ath11k_thermal_unregister(ab);</div><div class='ctx'> 	ath11k_mac_unregister(ab);</div><div class='add'>+	ath11k_core_pdev_suspend_target(ab);</div><div class='ctx'> 	ath11k_hif_irq_disable(ab);</div><div class='ctx'> 	ath11k_dp_pdev_free(ab);</div><div class='ctx'> 	ath11k_debugfs_pdev_destroy(ab);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_core_start(struct ath11k_base *ab,</div><div class='del'>-			     enum ath11k_firmware_mode mode)</div><div class='add'>+static int ath11k_core_start(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_qmi_firmware_start(ab, mode);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ath11k_err(ab, "failed to attach wmi: %d\n", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ret = ath11k_wmi_attach(ab);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_err(ab, "failed to attach wmi: %d\n", ret);</div><div class='del'>-		goto err_firmware_stop;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_htc_init(ab);</div><div class='hunk'>@@ -772,7 +2129,7 @@ static int ath11k_core_start(struct ath11k_base *ab,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* put hardware to DBS mode */</div><div class='del'>-	if (ab-&gt;hw_params.single_pdev_only) {</div><div class='add'>+	if (ab-&gt;hw_params.single_pdev_only &amp;&amp; ab-&gt;hw_params.num_rxdma_per_pdev &gt; 1) {</div><div class='ctx'> 		ret = ath11k_wmi_set_hw_mode(ab, WMI_HOST_HW_MODE_DBS);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ath11k_err(ab, "failed to send dbs mode: %d\n", ret);</div><div class='hunk'>@@ -797,28 +2154,31 @@ err_hif_stop:</div><div class='ctx'> 	ath11k_hif_stop(ab);</div><div class='ctx'> err_wmi_detach:</div><div class='ctx'> 	ath11k_wmi_detach(ab);</div><div class='del'>-err_firmware_stop:</div><div class='del'>-	ath11k_qmi_firmware_stop(ab);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath11k_core_qmi_firmware_ready(struct ath11k_base *ab)</div><div class='add'>+static int ath11k_core_start_firmware(struct ath11k_base *ab,</div><div class='add'>+				      enum ath11k_firmware_mode mode)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_ce_init_pipes(ab);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ath11k_err(ab, "failed to initialize CE: %d\n", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='add'>+	ath11k_ce_get_shadow_config(ab, &amp;ab-&gt;qmi.ce_cfg.shadow_reg_v2,</div><div class='add'>+				    &amp;ab-&gt;qmi.ce_cfg.shadow_reg_v2_len);</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_dp_alloc(ab);</div><div class='add'>+	ret = ath11k_qmi_firmware_start(ab, mode);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ath11k_err(ab, "failed to init DP: %d\n", ret);</div><div class='add'>+		ath11k_err(ab, "failed to send firmware start: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_core_qmi_firmware_ready(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	switch (ath11k_crypto_mode) {</div><div class='ctx'> 	case ATH11K_CRYPT_MODE_SW:</div><div class='ctx'> 		set_bit(ATH11K_FLAG_HW_CRYPTO_DISABLED, &amp;ab-&gt;dev_flags);</div><div class='hunk'>@@ -833,11 +2193,29 @@ int ath11k_core_qmi_firmware_ready(struct ath11k_base *ab)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = ath11k_core_start_firmware(ab, ab-&gt;fw_mode);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_err(ab, "failed to start firmware: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_ce_init_pipes(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_err(ab, "failed to initialize CE: %d\n", ret);</div><div class='add'>+		goto err_firmware_stop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_dp_alloc(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_err(ab, "failed to init DP: %d\n", ret);</div><div class='add'>+		goto err_firmware_stop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (ath11k_frame_mode == ATH11K_HW_TXRX_RAW)</div><div class='ctx'> 		set_bit(ATH11K_FLAG_RAW_MODE, &amp;ab-&gt;dev_flags);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ab-&gt;core_lock);</div><div class='del'>-	ret = ath11k_core_start(ab, ATH11K_FIRMWARE_MODE_NORMAL);</div><div class='add'>+	ret = ath11k_core_start(ab);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_err(ab, "failed to start core: %d\n", ret);</div><div class='ctx'> 		goto err_dp_free;</div><div class='hunk'>@@ -859,6 +2237,9 @@ err_core_stop:</div><div class='ctx'> err_dp_free:</div><div class='ctx'> 	ath11k_dp_free(ab);</div><div class='ctx'> 	mutex_unlock(&amp;ab-&gt;core_lock);</div><div class='add'>+err_firmware_stop:</div><div class='add'>+	ath11k_qmi_firmware_stop(ab);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -868,22 +2249,17 @@ static int ath11k_core_reconfigure_on_crash(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ab-&gt;core_lock);</div><div class='ctx'> 	ath11k_thermal_unregister(ab);</div><div class='del'>-	ath11k_hif_irq_disable(ab);</div><div class='ctx'> 	ath11k_dp_pdev_free(ab);</div><div class='ctx'> 	ath11k_spectral_deinit(ab);</div><div class='del'>-	ath11k_hif_stop(ab);</div><div class='add'>+	ath11k_ce_cleanup_pipes(ab);</div><div class='ctx'> 	ath11k_wmi_detach(ab);</div><div class='ctx'> 	ath11k_dp_pdev_reo_cleanup(ab);</div><div class='ctx'> 	mutex_unlock(&amp;ab-&gt;core_lock);</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dp_free(ab);</div><div class='del'>-	ath11k_hal_srng_deinit(ab);</div><div class='add'>+	ath11k_hal_srng_clear(ab);</div><div class='ctx'> </div><div class='del'>-	ab-&gt;free_vdev_map = (1LL &lt;&lt; (ab-&gt;num_radios * TARGET_NUM_VDEVS)) - 1;</div><div class='del'>-</div><div class='del'>-	ret = ath11k_hal_srng_init(ab);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	ab-&gt;free_vdev_map = (1LL &lt;&lt; (ab-&gt;num_radios * TARGET_NUM_VDEVS(ab))) - 1;</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(ATH11K_FLAG_CRASH_FLUSH, &amp;ab-&gt;dev_flags);</div><div class='ctx'> </div><div class='hunk'>@@ -903,6 +2279,7 @@ err_hal_srng_deinit:</div><div class='ctx'> void ath11k_core_halt(struct ath11k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct list_head *pos, *n;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -912,20 +2289,52 @@ void ath11k_core_halt(struct ath11k *ar)</div><div class='ctx'> 	ath11k_mac_scan_finish(ar);</div><div class='ctx'> 	ath11k_mac_peer_cleanup_all(ar);</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;ar-&gt;scan.timeout);</div><div class='add'>+	cancel_work_sync(&amp;ar-&gt;channel_update_work);</div><div class='ctx'> 	cancel_work_sync(&amp;ar-&gt;regd_update_work);</div><div class='add'>+	cancel_work_sync(&amp;ab-&gt;update_11d_work);</div><div class='ctx'> </div><div class='ctx'> 	rcu_assign_pointer(ab-&gt;pdevs_active[ar-&gt;pdev_idx], NULL);</div><div class='ctx'> 	synchronize_rcu();</div><div class='del'>-	INIT_LIST_HEAD(&amp;ar-&gt;arvifs);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	list_for_each_safe(pos, n, &amp;ar-&gt;arvifs)</div><div class='add'>+		list_del_init(pos);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='ctx'> 	idr_init(&amp;ar-&gt;txmgmt_idr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath11k_core_restart(struct work_struct *work)</div><div class='add'>+static void ath11k_update_11d(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = container_of(work, struct ath11k_base, update_11d_work);</div><div class='add'>+	struct ath11k *ar;</div><div class='add'>+	struct ath11k_pdev *pdev;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		pdev = &amp;ab-&gt;pdevs[i];</div><div class='add'>+		ar = pdev-&gt;ar;</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		memcpy(&amp;ar-&gt;alpha2, &amp;ab-&gt;new_alpha2, 2);</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_WMI, "update 11d new cc %c%c for pdev %d\n",</div><div class='add'>+			   ar-&gt;alpha2[0], ar-&gt;alpha2[1], i);</div><div class='add'>+</div><div class='add'>+		ret = ath11k_reg_set_cc(ar);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath11k_warn(ar-&gt;ab,</div><div class='add'>+				    "pdev id %d failed set current country code: %d\n",</div><div class='add'>+				    i, ret);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_core_pre_reconfigure_recovery(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_base *ab = container_of(work, struct ath11k_base, restart_work);</div><div class='ctx'> 	struct ath11k *ar;</div><div class='ctx'> 	struct ath11k_pdev *pdev;</div><div class='del'>-	int i, ret = 0;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='ctx'> 	ab-&gt;stats.fw_crash_counter++;</div><div class='hunk'>@@ -934,13 +2343,17 @@ static void ath11k_core_restart(struct work_struct *work)</div><div class='ctx'> 	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='ctx'> 		pdev = &amp;ab-&gt;pdevs[i];</div><div class='ctx'> 		ar = pdev-&gt;ar;</div><div class='del'>-		if (!ar || ar-&gt;state == ATH11K_STATE_OFF)</div><div class='add'>+		if (!ar || ar-&gt;state == ATH11K_STATE_OFF ||</div><div class='add'>+		    ar-&gt;state == ATH11K_STATE_FTM)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		ieee80211_stop_queues(ar-&gt;hw);</div><div class='ctx'> 		ath11k_mac_drain_tx(ar);</div><div class='add'>+		ar-&gt;state_11d = ATH11K_11D_IDLE;</div><div class='add'>+		complete(&amp;ar-&gt;completed_11d_scan);</div><div class='ctx'> 		complete(&amp;ar-&gt;scan.started);</div><div class='del'>-		complete(&amp;ar-&gt;scan.completed);</div><div class='add'>+		complete_all(&amp;ar-&gt;scan.completed);</div><div class='add'>+		complete(&amp;ar-&gt;scan.on_channel);</div><div class='ctx'> 		complete(&amp;ar-&gt;peer_assoc_done);</div><div class='ctx'> 		complete(&amp;ar-&gt;peer_delete_done);</div><div class='ctx'> 		complete(&amp;ar-&gt;install_key_done);</div><div class='hunk'>@@ -953,16 +2366,24 @@ static void ath11k_core_restart(struct work_struct *work)</div><div class='ctx'> 		idr_for_each(&amp;ar-&gt;txmgmt_idr,</div><div class='ctx'> 			     ath11k_mac_tx_mgmt_pending_free, ar);</div><div class='ctx'> 		idr_destroy(&amp;ar-&gt;txmgmt_idr);</div><div class='add'>+		wake_up(&amp;ar-&gt;txmgmt_empty_waitq);</div><div class='add'>+</div><div class='add'>+		ar-&gt;monitor_vdev_id = -1;</div><div class='add'>+		clear_bit(ATH11K_FLAG_MONITOR_STARTED, &amp;ar-&gt;monitor_flags);</div><div class='add'>+		clear_bit(ATH11K_FLAG_MONITOR_VDEV_CREATED, &amp;ar-&gt;monitor_flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wake_up(&amp;ab-&gt;wmi_ab.tx_credits_wq);</div><div class='ctx'> 	wake_up(&amp;ab-&gt;peer_mapping_wq);</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_core_reconfigure_on_crash(ab);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ath11k_err(ab, "failed to reconfigure driver on crash recovery\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	reinit_completion(&amp;ab-&gt;driver_recovery);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_core_post_reconfigure_recovery(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar;</div><div class='add'>+	struct ath11k_pdev *pdev;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='ctx'> 		pdev = &amp;ab-&gt;pdevs[i];</div><div class='hunk'>@@ -992,12 +2413,111 @@ static void ath11k_core_restart(struct work_struct *work)</div><div class='ctx'> 			ath11k_warn(ab,</div><div class='ctx'> 				    "device is wedged, will not restart radio %d\n", i);</div><div class='ctx'> 			break;</div><div class='add'>+		case ATH11K_STATE_FTM:</div><div class='add'>+			ath11k_dbg(ab, ATH11K_DBG_TESTMODE,</div><div class='add'>+				   "fw mode reset done radio %d\n", i);</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> 	}</div><div class='ctx'> 	complete(&amp;ab-&gt;driver_recovery);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ath11k_core_restart(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = container_of(work, struct ath11k_base, restart_work);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_core_reconfigure_on_crash(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_err(ab, "failed to reconfigure driver on crash recovery\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;is_reset)</div><div class='add'>+		complete_all(&amp;ab-&gt;reconfigure_complete);</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;is_reset)</div><div class='add'>+		ath11k_core_post_reconfigure_recovery(ab);</div><div class='add'>+</div><div class='add'>+	complete(&amp;ab-&gt;restart_completed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_core_reset(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = container_of(work, struct ath11k_base, reset_work);</div><div class='add'>+	int reset_count, fail_cont_count;</div><div class='add'>+	long time_left;</div><div class='add'>+</div><div class='add'>+	if (!(test_bit(ATH11K_FLAG_REGISTERED, &amp;ab-&gt;dev_flags))) {</div><div class='add'>+		ath11k_warn(ab, "ignore reset dev flags 0x%lx\n", ab-&gt;dev_flags);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Sometimes the recovery will fail and then the next all recovery fail,</div><div class='add'>+	 * this is to avoid infinite recovery since it can not recovery success.</div><div class='add'>+	 */</div><div class='add'>+	fail_cont_count = atomic_read(&amp;ab-&gt;fail_cont_count);</div><div class='add'>+</div><div class='add'>+	if (fail_cont_count &gt;= ATH11K_RESET_MAX_FAIL_COUNT_FINAL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (fail_cont_count &gt;= ATH11K_RESET_MAX_FAIL_COUNT_FIRST &amp;&amp;</div><div class='add'>+	    time_before(jiffies, ab-&gt;reset_fail_timeout))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	reset_count = atomic_inc_return(&amp;ab-&gt;reset_count);</div><div class='add'>+</div><div class='add'>+	if (reset_count &gt; 1) {</div><div class='add'>+		/* Sometimes it happened another reset worker before the previous one</div><div class='add'>+		 * completed, then the second reset worker will destroy the previous one,</div><div class='add'>+		 * thus below is to avoid that.</div><div class='add'>+		 */</div><div class='add'>+		ath11k_warn(ab, "already resetting count %d\n", reset_count);</div><div class='add'>+</div><div class='add'>+		reinit_completion(&amp;ab-&gt;reset_complete);</div><div class='add'>+		time_left = wait_for_completion_timeout(&amp;ab-&gt;reset_complete,</div><div class='add'>+							ATH11K_RESET_TIMEOUT_HZ);</div><div class='add'>+</div><div class='add'>+		if (time_left) {</div><div class='add'>+			ath11k_dbg(ab, ATH11K_DBG_BOOT, "to skip reset\n");</div><div class='add'>+			atomic_dec(&amp;ab-&gt;reset_count);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ab-&gt;reset_fail_timeout = jiffies + ATH11K_RESET_FAIL_TIMEOUT_HZ;</div><div class='add'>+		/* Record the continuous recovery fail count when recovery failed*/</div><div class='add'>+		atomic_inc(&amp;ab-&gt;fail_cont_count);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_BOOT, "reset starting\n");</div><div class='add'>+</div><div class='add'>+	ab-&gt;is_reset = true;</div><div class='add'>+	atomic_set(&amp;ab-&gt;recovery_count, 0);</div><div class='add'>+	reinit_completion(&amp;ab-&gt;recovery_start);</div><div class='add'>+	atomic_set(&amp;ab-&gt;recovery_start_count, 0);</div><div class='add'>+</div><div class='add'>+	ath11k_coredump_collect(ab);</div><div class='add'>+	ath11k_core_pre_reconfigure_recovery(ab);</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;ab-&gt;reconfigure_complete);</div><div class='add'>+	ath11k_core_post_reconfigure_recovery(ab);</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_BOOT, "waiting recovery start...\n");</div><div class='add'>+</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;ab-&gt;recovery_start,</div><div class='add'>+						ATH11K_RECOVER_START_TIMEOUT_HZ);</div><div class='add'>+</div><div class='add'>+	ath11k_hif_irq_disable(ab);</div><div class='add'>+	ath11k_hif_ce_irq_disable(ab);</div><div class='add'>+</div><div class='add'>+	ath11k_hif_power_down(ab, false);</div><div class='add'>+	ath11k_hif_power_up(ab);</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_BOOT, "reset started\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath11k_init_hw_params(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ath11k_hw_params *hw_params = NULL;</div><div class='hunk'>@@ -1032,21 +2552,84 @@ int ath11k_core_pre_init(struct ath11k_base *ab)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = ath11k_fw_pre_init(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_err(ab, "failed to pre init firmware: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ath11k_core_pre_init);</div><div class='ctx'> </div><div class='add'>+static int ath11k_core_pm_notify(struct notifier_block *nb,</div><div class='add'>+				 unsigned long action, void *nouse)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = container_of(nb, struct ath11k_base,</div><div class='add'>+					      pm_nb);</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case PM_SUSPEND_PREPARE:</div><div class='add'>+		ab-&gt;actual_pm_policy = ab-&gt;pm_policy;</div><div class='add'>+		break;</div><div class='add'>+	case PM_HIBERNATION_PREPARE:</div><div class='add'>+		ab-&gt;actual_pm_policy = ATH11K_PM_DEFAULT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_core_pm_notifier_register(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ab-&gt;pm_nb.notifier_call = ath11k_core_pm_notify;</div><div class='add'>+	return register_pm_notifier(&amp;ab-&gt;pm_nb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_core_pm_notifier_unregister(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = unregister_pm_notifier(&amp;ab-&gt;pm_nb);</div><div class='add'>+	if (ret)</div><div class='add'>+		/* just warn here, there is nothing can be done in fail case */</div><div class='add'>+		ath11k_warn(ab, "failed to unregister PM notifier %d\n", ret);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_core_pm_notifier_unregister);</div><div class='add'>+</div><div class='ctx'> int ath11k_core_init(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='add'>+	const struct dmi_system_id *dmi_id;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	dmi_id = dmi_first_match(ath11k_pm_quirk_table);</div><div class='add'>+	if (dmi_id)</div><div class='add'>+		ab-&gt;pm_policy = (kernel_ulong_t)dmi_id-&gt;driver_data;</div><div class='add'>+	else</div><div class='add'>+		ab-&gt;pm_policy = ATH11K_PM_DEFAULT;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_BOOT, "pm policy %u\n", ab-&gt;pm_policy);</div><div class='add'>+</div><div class='add'>+	ret = ath11k_core_pm_notifier_register(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_err(ab, "failed to register PM notifier: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = ath11k_core_soc_create(ab);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_err(ab, "failed to create soc core: %d\n", ret);</div><div class='del'>-		return ret;</div><div class='add'>+		goto err_unregister_pm_notifier;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_unregister_pm_notifier:</div><div class='add'>+	ath11k_core_pm_notifier_unregister(ab);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ath11k_core_init);</div><div class='ctx'> </div><div class='hunk'>@@ -1059,21 +2642,24 @@ void ath11k_core_deinit(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;ab-&gt;core_lock);</div><div class='ctx'> </div><div class='del'>-	ath11k_hif_power_down(ab);</div><div class='add'>+	ath11k_hif_power_down(ab, false);</div><div class='ctx'> 	ath11k_mac_destroy(ab);</div><div class='ctx'> 	ath11k_core_soc_destroy(ab);</div><div class='add'>+	ath11k_core_pm_notifier_unregister(ab);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ath11k_core_deinit);</div><div class='ctx'> </div><div class='ctx'> void ath11k_core_free(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='add'>+	destroy_workqueue(ab-&gt;workqueue_aux);</div><div class='add'>+	destroy_workqueue(ab-&gt;workqueue);</div><div class='add'>+</div><div class='ctx'> 	kfree(ab);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ath11k_core_free);</div><div class='ctx'> </div><div class='ctx'> struct ath11k_base *ath11k_core_alloc(struct device *dev, size_t priv_size,</div><div class='del'>-				      enum ath11k_bus bus,</div><div class='del'>-				      const struct ath11k_bus_params *bus_params)</div><div class='add'>+				      enum ath11k_bus bus)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab;</div><div class='ctx'> </div><div class='hunk'>@@ -1087,24 +2673,38 @@ struct ath11k_base *ath11k_core_alloc(struct device *dev, size_t priv_size,</div><div class='ctx'> 	if (!ab-&gt;workqueue)</div><div class='ctx'> 		goto err_sc_free;</div><div class='ctx'> </div><div class='add'>+	ab-&gt;workqueue_aux = create_singlethread_workqueue("ath11k_aux_wq");</div><div class='add'>+	if (!ab-&gt;workqueue_aux)</div><div class='add'>+		goto err_free_wq;</div><div class='add'>+</div><div class='ctx'> 	mutex_init(&amp;ab-&gt;core_lock);</div><div class='add'>+	mutex_init(&amp;ab-&gt;tbl_mtx_lock);</div><div class='ctx'> 	spin_lock_init(&amp;ab-&gt;base_lock);</div><div class='add'>+	mutex_init(&amp;ab-&gt;vdev_id_11d_lock);</div><div class='add'>+	init_completion(&amp;ab-&gt;reset_complete);</div><div class='add'>+	init_completion(&amp;ab-&gt;reconfigure_complete);</div><div class='add'>+	init_completion(&amp;ab-&gt;recovery_start);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ab-&gt;peers);</div><div class='ctx'> 	init_waitqueue_head(&amp;ab-&gt;peer_mapping_wq);</div><div class='ctx'> 	init_waitqueue_head(&amp;ab-&gt;wmi_ab.tx_credits_wq);</div><div class='ctx'> 	init_waitqueue_head(&amp;ab-&gt;qmi.cold_boot_waitq);</div><div class='ctx'> 	INIT_WORK(&amp;ab-&gt;restart_work, ath11k_core_restart);</div><div class='add'>+	INIT_WORK(&amp;ab-&gt;update_11d_work, ath11k_update_11d);</div><div class='add'>+	INIT_WORK(&amp;ab-&gt;reset_work, ath11k_core_reset);</div><div class='add'>+	INIT_WORK(&amp;ab-&gt;dump_work, ath11k_coredump_upload);</div><div class='ctx'> 	timer_setup(&amp;ab-&gt;rx_replenish_retry, ath11k_ce_rx_replenish_retry, 0);</div><div class='ctx'> 	init_completion(&amp;ab-&gt;htc_suspend);</div><div class='ctx'> 	init_completion(&amp;ab-&gt;wow.wakeup_completed);</div><div class='add'>+	init_completion(&amp;ab-&gt;restart_completed);</div><div class='ctx'> </div><div class='ctx'> 	ab-&gt;dev = dev;</div><div class='del'>-	ab-&gt;bus_params = *bus_params;</div><div class='ctx'> 	ab-&gt;hif.bus = bus;</div><div class='ctx'> </div><div class='ctx'> 	return ab;</div><div class='ctx'> </div><div class='add'>+err_free_wq:</div><div class='add'>+	destroy_workqueue(ab-&gt;workqueue);</div><div class='ctx'> err_sc_free:</div><div class='ctx'> 	kfree(ab);</div><div class='ctx'> 	return NULL;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h<br/>index 55af982deca7..e8780b05ce11 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/core.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/core.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/core.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/core.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef ATH11K_CORE_H</div><div class='hunk'>@@ -10,6 +11,14 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/dmi.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/rhashtable.h&gt;</div><div class='add'>+#include &lt;linux/average.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/suspend.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "qmi.h"</div><div class='ctx'> #include "htc.h"</div><div class='ctx'> #include "wmi.h"</div><div class='hunk'>@@ -23,6 +32,9 @@</div><div class='ctx'> #include "thermal.h"</div><div class='ctx'> #include "dbring.h"</div><div class='ctx'> #include "spectral.h"</div><div class='add'>+#include "wow.h"</div><div class='add'>+#include "fw.h"</div><div class='add'>+#include "coredump.h"</div><div class='ctx'> </div><div class='ctx'> #define SM(_v, _f) (((_v) &lt;&lt; _f##_LSB) &amp; _f##_MASK)</div><div class='ctx'> </div><div class='hunk'>@@ -36,9 +48,27 @@</div><div class='ctx'> #define ATH11K_INVALID_HW_MAC_ID	0xFF</div><div class='ctx'> #define ATH11K_CONNECTION_LOSS_HZ	(3 * HZ)</div><div class='ctx'> </div><div class='add'>+/* SMBIOS type containing Board Data File Name Extension */</div><div class='add'>+#define ATH11K_SMBIOS_BDF_EXT_TYPE 0xF8</div><div class='add'>+</div><div class='add'>+/* SMBIOS type structure length (excluding strings-set) */</div><div class='add'>+#define ATH11K_SMBIOS_BDF_EXT_LENGTH 0x9</div><div class='add'>+</div><div class='add'>+/* The magic used by QCA spec */</div><div class='add'>+#define ATH11K_SMBIOS_BDF_EXT_MAGIC "BDF_"</div><div class='add'>+</div><div class='ctx'> extern unsigned int ath11k_frame_mode;</div><div class='add'>+extern bool ath11k_ftm_mode;</div><div class='add'>+</div><div class='add'>+#define ATH11K_SCAN_TIMEOUT_HZ (20 * HZ)</div><div class='ctx'> </div><div class='ctx'> #define ATH11K_MON_TIMER_INTERVAL  10</div><div class='add'>+#define ATH11K_RESET_TIMEOUT_HZ (20 * HZ)</div><div class='add'>+#define ATH11K_RESET_MAX_FAIL_COUNT_FIRST 3</div><div class='add'>+#define ATH11K_RESET_MAX_FAIL_COUNT_FINAL 5</div><div class='add'>+#define ATH11K_RESET_FAIL_TIMEOUT_HZ (20 * HZ)</div><div class='add'>+#define ATH11K_RECONFIGURE_TIMEOUT_HZ (10 * HZ)</div><div class='add'>+#define ATH11K_RECOVER_START_TIMEOUT_HZ (20 * HZ)</div><div class='ctx'> </div><div class='ctx'> enum ath11k_supported_bw {</div><div class='ctx'> 	ATH11K_BW_20	= 0,</div><div class='hunk'>@@ -47,6 +77,11 @@ enum ath11k_supported_bw {</div><div class='ctx'> 	ATH11K_BW_160	= 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum ath11k_bdf_search {</div><div class='add'>+	ATH11K_BDF_SEARCH_DEFAULT,</div><div class='add'>+	ATH11K_BDF_SEARCH_BUS_AND_BOARD,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum wme_ac {</div><div class='ctx'> 	WME_AC_BE,</div><div class='ctx'> 	WME_AC_BK,</div><div class='hunk'>@@ -93,6 +128,8 @@ struct ath11k_skb_rxcb {</div><div class='ctx'> 	bool is_first_msdu;</div><div class='ctx'> 	bool is_last_msdu;</div><div class='ctx'> 	bool is_continuation;</div><div class='add'>+	bool is_mcbc;</div><div class='add'>+	bool is_eapol;</div><div class='ctx'> 	struct hal_rx_desc *rx_desc;</div><div class='ctx'> 	u8 err_rel_src;</div><div class='ctx'> 	u8 err_code;</div><div class='hunk'>@@ -100,6 +137,8 @@ struct ath11k_skb_rxcb {</div><div class='ctx'> 	u8 unmapped;</div><div class='ctx'> 	u8 is_frag;</div><div class='ctx'> 	u8 tid;</div><div class='add'>+	u16 peer_id;</div><div class='add'>+	u16 seq_no;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ath11k_hw_rev {</div><div class='hunk'>@@ -107,6 +146,12 @@ enum ath11k_hw_rev {</div><div class='ctx'> 	ATH11K_HW_QCA6390_HW20,</div><div class='ctx'> 	ATH11K_HW_IPQ6018_HW10,</div><div class='ctx'> 	ATH11K_HW_QCN9074_HW10,</div><div class='add'>+	ATH11K_HW_WCN6855_HW20,</div><div class='add'>+	ATH11K_HW_WCN6855_HW21,</div><div class='add'>+	ATH11K_HW_WCN6750_HW10,</div><div class='add'>+	ATH11K_HW_IPQ5018_HW10,</div><div class='add'>+	ATH11K_HW_QCA2066_HW21,</div><div class='add'>+	ATH11K_HW_QCA6698AQ_HW21,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ath11k_firmware_mode {</div><div class='hunk'>@@ -131,10 +176,44 @@ struct ath11k_ext_irq_grp {</div><div class='ctx'> 	u32 num_irq;</div><div class='ctx'> 	u32 grp_id;</div><div class='ctx'> 	u64 timestamp;</div><div class='add'>+	bool napi_enabled;</div><div class='ctx'> 	struct napi_struct napi;</div><div class='del'>-	struct net_device napi_ndev;</div><div class='add'>+	struct net_device *napi_ndev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath11k_smbios_cc_type {</div><div class='add'>+	/* disable country code setting from SMBIOS */</div><div class='add'>+	ATH11K_SMBIOS_CC_DISABLE = 0,</div><div class='add'>+</div><div class='add'>+	/* set country code by ANSI country name, based on ISO3166-1 alpha2 */</div><div class='add'>+	ATH11K_SMBIOS_CC_ISO = 1,</div><div class='add'>+</div><div class='add'>+	/* worldwide regdomain */</div><div class='add'>+	ATH11K_SMBIOS_CC_WW = 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct ath11k_smbios_bdf {</div><div class='add'>+	struct dmi_header hdr;</div><div class='add'>+</div><div class='add'>+	u8 features_disabled;</div><div class='add'>+</div><div class='add'>+	/* enum ath11k_smbios_cc_type */</div><div class='add'>+	u8 country_code_flag;</div><div class='add'>+</div><div class='add'>+	/* To set specific country, you need to set country code</div><div class='add'>+	 * flag=ATH11K_SMBIOS_CC_ISO first, then if country is United</div><div class='add'>+	 * States, then country code value = 0x5553 ("US",'U' = 0x55, 'S'=</div><div class='add'>+	 * 0x53). To set country to INDONESIA, then country code value =</div><div class='add'>+	 * 0x4944 ("IN", 'I'=0x49, 'D'=0x44). If country code flag =</div><div class='add'>+	 * ATH11K_SMBIOS_CC_WW, then you can use worldwide regulatory</div><div class='add'>+	 * setting.</div><div class='add'>+	 */</div><div class='add'>+	u16 cc_code;</div><div class='add'>+</div><div class='add'>+	u8 bdf_enabled;</div><div class='add'>+	u8 bdf_ext[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> #define HEHANDLE_CAP_PHYINFO_SIZE       3</div><div class='ctx'> #define HECAP_PHYINFO_SIZE              9</div><div class='ctx'> #define HECAP_MACINFO_SIZE              5</div><div class='hunk'>@@ -161,6 +240,13 @@ struct ath11k_he {</div><div class='ctx'> </div><div class='ctx'> #define MAX_RADIOS 3</div><div class='ctx'> </div><div class='add'>+/* ipq5018 hw param macros */</div><div class='add'>+#define MAX_RADIOS_5018	1</div><div class='add'>+#define CE_CNT_5018	6</div><div class='add'>+#define TARGET_CE_CNT_5018	9</div><div class='add'>+#define SVC_CE_MAP_LEN_5018	17</div><div class='add'>+#define RXDMA_PER_PDEV_5018	1</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	WMI_HOST_TP_SCALE_MAX   = 0,</div><div class='ctx'> 	WMI_HOST_TP_SCALE_50    = 1,</div><div class='hunk'>@@ -177,6 +263,12 @@ enum ath11k_scan_state {</div><div class='ctx'> 	ATH11K_SCAN_ABORTING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum ath11k_11d_state {</div><div class='add'>+	ATH11K_11D_IDLE,</div><div class='add'>+	ATH11K_11D_PREPARING,</div><div class='add'>+	ATH11K_11D_RUNNING,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum ath11k_dev_flags {</div><div class='ctx'> 	ATH11K_CAC_RUNNING,</div><div class='ctx'> 	ATH11K_FLAG_CORE_REGISTERED,</div><div class='hunk'>@@ -189,10 +281,80 @@ enum ath11k_dev_flags {</div><div class='ctx'> 	ATH11K_FLAG_REGISTERED,</div><div class='ctx'> 	ATH11K_FLAG_QMI_FAIL,</div><div class='ctx'> 	ATH11K_FLAG_HTC_SUSPEND_COMPLETE,</div><div class='add'>+	ATH11K_FLAG_CE_IRQ_ENABLED,</div><div class='add'>+	ATH11K_FLAG_EXT_IRQ_ENABLED,</div><div class='add'>+	ATH11K_FLAG_FIXED_MEM_RGN,</div><div class='add'>+	ATH11K_FLAG_DEVICE_INIT_DONE,</div><div class='add'>+	ATH11K_FLAG_MULTI_MSI_VECTORS,</div><div class='add'>+	ATH11K_FLAG_FTM_SEGMENTED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ath11k_monitor_flags {</div><div class='del'>-	ATH11K_FLAG_MONITOR_ENABLED,</div><div class='add'>+	ATH11K_FLAG_MONITOR_CONF_ENABLED,</div><div class='add'>+	ATH11K_FLAG_MONITOR_STARTED,</div><div class='add'>+	ATH11K_FLAG_MONITOR_VDEV_CREATED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH11K_IPV6_UC_TYPE     0</div><div class='add'>+#define ATH11K_IPV6_AC_TYPE     1</div><div class='add'>+</div><div class='add'>+#define ATH11K_IPV6_MAX_COUNT   16</div><div class='add'>+#define ATH11K_IPV4_MAX_COUNT   2</div><div class='add'>+</div><div class='add'>+struct ath11k_arp_ns_offload {</div><div class='add'>+	u8  ipv4_addr[ATH11K_IPV4_MAX_COUNT][4];</div><div class='add'>+	u32 ipv4_count;</div><div class='add'>+	u32 ipv6_count;</div><div class='add'>+	u8  ipv6_addr[ATH11K_IPV6_MAX_COUNT][16];</div><div class='add'>+	u8  self_ipv6_addr[ATH11K_IPV6_MAX_COUNT][16];</div><div class='add'>+	u8  ipv6_type[ATH11K_IPV6_MAX_COUNT];</div><div class='add'>+	bool ipv6_valid[ATH11K_IPV6_MAX_COUNT];</div><div class='add'>+	u8  mac_addr[ETH_ALEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath11k_rekey_data {</div><div class='add'>+	u8 kck[NL80211_KCK_LEN];</div><div class='add'>+	u8 kek[NL80211_KCK_LEN];</div><div class='add'>+	u64 replay_ctr;</div><div class='add'>+	bool enable_offload;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ath11k_chan_power_info - TPE containing power info per channel chunk</div><div class='add'>+ * @chan_cfreq: channel center freq (MHz)</div><div class='add'>+ * e.g.</div><div class='add'>+ * channel 37/20 MHz,  it is 6135</div><div class='add'>+ * channel 37/40 MHz,  it is 6125</div><div class='add'>+ * channel 37/80 MHz,  it is 6145</div><div class='add'>+ * channel 37/160 MHz, it is 6185</div><div class='add'>+ * @tx_power: transmit power (dBm)</div><div class='add'>+ */</div><div class='add'>+struct ath11k_chan_power_info {</div><div class='add'>+	u16 chan_cfreq;</div><div class='add'>+	s8 tx_power;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ath11k only deals with 160 MHz, so 8 subchannels */</div><div class='add'>+#define ATH11K_NUM_PWR_LEVELS	8</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ath11k_reg_tpc_power_info - regulatory TPC power info</div><div class='add'>+ * @is_psd_power: is PSD power or not</div><div class='add'>+ * @eirp_power: Maximum EIRP power (dBm), valid only if power is PSD</div><div class='add'>+ * @ap_power_type: type of power (SP/LPI/VLP)</div><div class='add'>+ * @num_pwr_levels: number of power levels</div><div class='add'>+ * @reg_max: Array of maximum TX power (dBm) per PSD value</div><div class='add'>+ * @tpe: TPE values processed from TPE IE</div><div class='add'>+ * @chan_power_info: power info to send to firmware</div><div class='add'>+ */</div><div class='add'>+struct ath11k_reg_tpc_power_info {</div><div class='add'>+	bool is_psd_power;</div><div class='add'>+	u8 eirp_power;</div><div class='add'>+	enum wmi_reg_6ghz_ap_type ap_power_type;</div><div class='add'>+	u8 num_pwr_levels;</div><div class='add'>+	u8 reg_max[ATH11K_NUM_PWR_LEVELS];</div><div class='add'>+	s8 tpe[ATH11K_NUM_PWR_LEVELS];</div><div class='add'>+	struct ath11k_chan_power_info chan_power_info[ATH11K_NUM_PWR_LEVELS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ath11k_vif {</div><div class='hunk'>@@ -210,8 +372,8 @@ struct ath11k_vif {</div><div class='ctx'> 	struct ath11k *ar;</div><div class='ctx'> 	struct ieee80211_vif *vif;</div><div class='ctx'> </div><div class='del'>-	u16 tx_seq_no;</div><div class='ctx'> 	struct wmi_wmm_params_all_arg wmm_params;</div><div class='add'>+	struct wmi_wmm_params_all_arg muedca_params;</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct {</div><div class='hunk'>@@ -232,16 +394,33 @@ struct ath11k_vif {</div><div class='ctx'> </div><div class='ctx'> 	bool is_started;</div><div class='ctx'> 	bool is_up;</div><div class='add'>+	bool ftm_responder;</div><div class='ctx'> 	bool spectral_enabled;</div><div class='add'>+	bool ps;</div><div class='ctx'> 	u32 aid;</div><div class='ctx'> 	u8 bssid[ETH_ALEN];</div><div class='ctx'> 	struct cfg80211_bitrate_mask bitrate_mask;</div><div class='ctx'> 	struct delayed_work connection_loss_work;</div><div class='add'>+	struct work_struct bcn_tx_work;</div><div class='ctx'> 	int num_legacy_stations;</div><div class='ctx'> 	int rtscts_prot_mode;</div><div class='ctx'> 	int txpower;</div><div class='ctx'> 	bool rsnie_present;</div><div class='ctx'> 	bool wpaie_present;</div><div class='add'>+	bool bcca_zero_sent;</div><div class='add'>+	bool do_not_send_tmpl;</div><div class='add'>+	struct ath11k_arp_ns_offload arp_ns_offload;</div><div class='add'>+	struct ath11k_rekey_data rekey_data;</div><div class='add'>+	u32 num_stations;</div><div class='add'>+	bool reinstall_group_keys;</div><div class='add'>+</div><div class='add'>+	struct ath11k_reg_tpc_power_info reg_tpc_info;</div><div class='add'>+</div><div class='add'>+	/* Must be last - ends in a flexible-array member.</div><div class='add'>+	 *</div><div class='add'>+	 * FIXME: Driver should not copy struct ieee80211_chanctx_conf,</div><div class='add'>+	 * especially because it has a flexible array. Find a better way.</div><div class='add'>+	 */</div><div class='ctx'> 	struct ieee80211_chanctx_conf chanctx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -350,6 +529,8 @@ struct ath11k_per_ppdu_tx_stats {</div><div class='ctx'> 	u32 retry_bytes;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+DECLARE_EWMA(avg_rssi, 10, 8)</div><div class='add'>+</div><div class='ctx'> struct ath11k_sta {</div><div class='ctx'> 	struct ath11k_vif *arvif;</div><div class='ctx'> </div><div class='hunk'>@@ -361,11 +542,16 @@ struct ath11k_sta {</div><div class='ctx'> 	enum hal_pn_type pn_type;</div><div class='ctx'> </div><div class='ctx'> 	struct work_struct update_wk;</div><div class='add'>+	struct work_struct set_4addr_wk;</div><div class='ctx'> 	struct rate_info txrate;</div><div class='add'>+	u32 peer_nss;</div><div class='ctx'> 	struct rate_info last_txrate;</div><div class='ctx'> 	u64 rx_duration;</div><div class='ctx'> 	u64 tx_duration;</div><div class='ctx'> 	u8 rssi_comb;</div><div class='add'>+	struct ewma_avg_rssi avg_rssi;</div><div class='add'>+	s8 rssi_beacon;</div><div class='add'>+	s8 chain_signal[IEEE80211_MAX_CHAINS];</div><div class='ctx'> 	struct ath11k_htt_tx_stats *tx_stats;</div><div class='ctx'> 	struct ath11k_rx_peer_stats *rx_stats;</div><div class='ctx'> </div><div class='hunk'>@@ -373,13 +559,25 @@ struct ath11k_sta {</div><div class='ctx'> 	/* protected by conf_mutex */</div><div class='ctx'> 	bool aggr_mode;</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	bool use_4addr_set;</div><div class='add'>+	u16 tcl_metadata;</div><div class='add'>+</div><div class='add'>+	/* Protected with ar-&gt;data_lock */</div><div class='add'>+	enum ath11k_wmi_peer_ps_state peer_ps_state;</div><div class='add'>+	u64 ps_start_time;</div><div class='add'>+	u64 ps_start_jiffies;</div><div class='add'>+	u64 ps_total_duration;</div><div class='add'>+	bool peer_current_ps_valid;</div><div class='add'>+</div><div class='add'>+	u32 bw_prev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define ATH11K_MIN_5G_FREQ 4150</div><div class='del'>-#define ATH11K_MIN_6G_FREQ 5945</div><div class='add'>+#define ATH11K_MIN_6G_FREQ 5925</div><div class='ctx'> #define ATH11K_MAX_6G_FREQ 7115</div><div class='del'>-#define ATH11K_NUM_CHANS 100</div><div class='del'>-#define ATH11K_MAX_5G_CHAN 173</div><div class='add'>+#define ATH11K_NUM_CHANS 102</div><div class='add'>+#define ATH11K_MAX_5G_CHAN 177</div><div class='ctx'> </div><div class='ctx'> enum ath11k_state {</div><div class='ctx'> 	ATH11K_STATE_OFF,</div><div class='hunk'>@@ -387,12 +585,17 @@ enum ath11k_state {</div><div class='ctx'> 	ATH11K_STATE_RESTARTING,</div><div class='ctx'> 	ATH11K_STATE_RESTARTED,</div><div class='ctx'> 	ATH11K_STATE_WEDGED,</div><div class='add'>+	ATH11K_STATE_FTM,</div><div class='ctx'> 	/* Add other states as required */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Antenna noise floor */</div><div class='ctx'> #define ATH11K_DEFAULT_NOISE_FLOOR -95</div><div class='ctx'> </div><div class='add'>+#define ATH11K_INVALID_RSSI_FULL -1</div><div class='add'>+</div><div class='add'>+#define ATH11K_INVALID_RSSI_EMPTY -128</div><div class='add'>+</div><div class='ctx'> struct ath11k_fw_stats {</div><div class='ctx'> 	struct dentry *debugfs_fwstats;</div><div class='ctx'> 	u32 pdev_id;</div><div class='hunk'>@@ -400,6 +603,8 @@ struct ath11k_fw_stats {</div><div class='ctx'> 	struct list_head pdevs;</div><div class='ctx'> 	struct list_head vdevs;</div><div class='ctx'> 	struct list_head bcn;</div><div class='add'>+	u32 num_vdev_recvd;</div><div class='add'>+	u32 num_bcn_recvd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ath11k_dbg_htt_stats {</div><div class='hunk'>@@ -410,19 +615,21 @@ struct ath11k_dbg_htt_stats {</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define MAX_MODULE_ID_BITMAP_WORDS	16</div><div class='add'>+</div><div class='ctx'> struct ath11k_debug {</div><div class='ctx'> 	struct dentry *debugfs_pdev;</div><div class='ctx'> 	struct ath11k_dbg_htt_stats htt_stats;</div><div class='ctx'> 	u32 extd_tx_stats;</div><div class='del'>-	struct ath11k_fw_stats fw_stats;</div><div class='del'>-	struct completion fw_stats_complete;</div><div class='del'>-	bool fw_stats_done;</div><div class='ctx'> 	u32 extd_rx_stats;</div><div class='ctx'> 	u32 pktlog_filter;</div><div class='ctx'> 	u32 pktlog_mode;</div><div class='ctx'> 	u32 pktlog_peer_valid;</div><div class='ctx'> 	u8 pktlog_peer_addr[ETH_ALEN];</div><div class='ctx'> 	u32 rx_filter;</div><div class='add'>+	u32 mem_offset;</div><div class='add'>+	u32 module_id_bitmap[MAX_MODULE_ID_BITMAP_WORDS];</div><div class='add'>+	struct ath11k_debug_dbr *dbr_debug[WMI_DIRECT_BUF_MAX];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ath11k_per_peer_tx_stats {</div><div class='hunk'>@@ -444,12 +651,9 @@ struct ath11k {</div><div class='ctx'> 	struct ath11k_base *ab;</div><div class='ctx'> 	struct ath11k_pdev *pdev;</div><div class='ctx'> 	struct ieee80211_hw *hw;</div><div class='del'>-	struct ieee80211_ops *ops;</div><div class='ctx'> 	struct ath11k_pdev_wmi *wmi;</div><div class='ctx'> 	struct ath11k_pdev_dp dp;</div><div class='ctx'> 	u8 mac_addr[ETH_ALEN];</div><div class='del'>-	u32 ht_cap_info;</div><div class='del'>-	u32 vht_cap_info;</div><div class='ctx'> 	struct ath11k_he ar_he;</div><div class='ctx'> 	enum ath11k_state state;</div><div class='ctx'> 	bool supports_6ghz;</div><div class='hunk'>@@ -483,14 +687,13 @@ struct ath11k {</div><div class='ctx'> 	u32 chan_tx_pwr;</div><div class='ctx'> 	u32 num_stations;</div><div class='ctx'> 	u32 max_num_stations;</div><div class='del'>-	bool monitor_present;</div><div class='ctx'> 	/* To synchronize concurrent synchronous mac80211 callback operations,</div><div class='ctx'> 	 * concurrent debugfs configuration and concurrent FW statistics events.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct mutex conf_mutex;</div><div class='ctx'> 	/* protects the radio specific data like debug stats, ppdu_stats_info stats,</div><div class='ctx'> 	 * vdev_stop_status info, scan data, ath11k_sta info, ath11k_vif info,</div><div class='del'>-	 * channel context data, survey info, test mode data.</div><div class='add'>+	 * channel context data, survey info, test mode data, channel_update_queue.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spinlock_t data_lock;</div><div class='ctx'> </div><div class='hunk'>@@ -529,6 +732,7 @@ struct ath11k {</div><div class='ctx'> 	/* protects txmgmt_idr data */</div><div class='ctx'> 	spinlock_t txmgmt_idr_lock;</div><div class='ctx'> 	atomic_t num_pending_mgmt_tx;</div><div class='add'>+	wait_queue_head_t txmgmt_empty_waitq;</div><div class='ctx'> </div><div class='ctx'> 	/* cycle count is reported twice for each visited channel during scan.</div><div class='ctx'> 	 * access protected by data_lock</div><div class='hunk'>@@ -547,10 +751,16 @@ struct ath11k {</div><div class='ctx'> 	struct completion bss_survey_done;</div><div class='ctx'> </div><div class='ctx'> 	struct work_struct regd_update_work;</div><div class='add'>+	struct work_struct channel_update_work;</div><div class='add'>+	/* protected with data_lock */</div><div class='add'>+	struct list_head channel_update_queue;</div><div class='ctx'> </div><div class='ctx'> 	struct work_struct wmi_mgmt_tx_work;</div><div class='ctx'> 	struct sk_buff_head wmi_mgmt_tx_queue;</div><div class='ctx'> </div><div class='add'>+	struct ath11k_wow wow;</div><div class='add'>+	struct completion target_suspend;</div><div class='add'>+	bool target_suspend_ack;</div><div class='ctx'> 	struct ath11k_per_peer_tx_stats peer_tx_stats;</div><div class='ctx'> 	struct list_head ppdu_stats_info;</div><div class='ctx'> 	u32 ppdu_stat_list_depth;</div><div class='hunk'>@@ -558,6 +768,9 @@ struct ath11k {</div><div class='ctx'> 	struct ath11k_per_peer_tx_stats cached_stats;</div><div class='ctx'> 	u32 last_ppdu_id;</div><div class='ctx'> 	u32 cached_ppdu_id;</div><div class='add'>+	int monitor_vdev_id;</div><div class='add'>+	struct completion fw_mode_reset;</div><div class='add'>+	u8 ftm_msgref;</div><div class='ctx'> #ifdef CONFIG_ATH11K_DEBUGFS</div><div class='ctx'> 	struct ath11k_debug debug;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -566,6 +779,22 @@ struct ath11k {</div><div class='ctx'> #endif</div><div class='ctx'> 	bool dfs_block_radar_events;</div><div class='ctx'> 	struct ath11k_thermal thermal;</div><div class='add'>+	u32 vdev_id_11d_scan;</div><div class='add'>+	struct completion completed_11d_scan;</div><div class='add'>+	enum ath11k_11d_state state_11d;</div><div class='add'>+	bool regdom_set_by_user;</div><div class='add'>+	int hw_rate_code;</div><div class='add'>+	u8 twt_enabled;</div><div class='add'>+	bool nlo_enabled;</div><div class='add'>+	u8 alpha2[REG_ALPHA2_LEN + 1];</div><div class='add'>+	struct ath11k_fw_stats fw_stats;</div><div class='add'>+	struct completion fw_stats_complete;</div><div class='add'>+	struct completion fw_stats_done;</div><div class='add'>+</div><div class='add'>+	/* protected by conf_mutex */</div><div class='add'>+	bool ps_state_enable;</div><div class='add'>+	bool ps_timekeeper_enable;</div><div class='add'>+	s8 max_allowed_tx_power;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ath11k_band_cap {</div><div class='hunk'>@@ -590,6 +819,8 @@ struct ath11k_pdev_cap {</div><div class='ctx'> 	u32 tx_chain_mask_shift;</div><div class='ctx'> 	u32 rx_chain_mask_shift;</div><div class='ctx'> 	struct ath11k_band_cap band[NUM_NL80211_BANDS];</div><div class='add'>+	bool nss_ratio_enabled;</div><div class='add'>+	u8 nss_ratio_info;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ath11k_pdev {</div><div class='hunk'>@@ -605,12 +836,12 @@ struct ath11k_board_data {</div><div class='ctx'> 	size_t len;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct ath11k_bus_params {</div><div class='del'>-	bool mhi_support;</div><div class='del'>-	bool m3_fw_support;</div><div class='del'>-	bool fixed_bdf_addr;</div><div class='del'>-	bool fixed_mem_region;</div><div class='del'>-	bool static_window_map;</div><div class='add'>+struct ath11k_pci_ops {</div><div class='add'>+	int (*wakeup)(struct ath11k_base *ab);</div><div class='add'>+	void (*release)(struct ath11k_base *ab);</div><div class='add'>+	int (*get_msi_irq)(struct ath11k_base *ab, unsigned int vector);</div><div class='add'>+	void (*window_write32)(struct ath11k_base *ab, u32 offset, u32 value);</div><div class='add'>+	u32 (*window_read32)(struct ath11k_base *ab, u32 offset);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* IPQ8074 HW channel counters frequency value in hertz */</div><div class='hunk'>@@ -654,9 +885,28 @@ struct ath11k_soc_dp_stats {</div><div class='ctx'> 	struct ath11k_dp_ring_bp_stats bp_stats;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct ath11k_msi_user {</div><div class='add'>+	char *name;</div><div class='add'>+	int num_vectors;</div><div class='add'>+	u32 base_vector;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath11k_msi_config {</div><div class='add'>+	int total_vectors;</div><div class='add'>+	int total_users;</div><div class='add'>+	struct ath11k_msi_user *users;</div><div class='add'>+	u16 hw_rev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath11k_pm_policy {</div><div class='add'>+	ATH11K_PM_DEFAULT,</div><div class='add'>+	ATH11K_PM_WOW,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Master structure to hold the hw data which may be used in core module */</div><div class='ctx'> struct ath11k_base {</div><div class='ctx'> 	enum ath11k_hw_rev hw_rev;</div><div class='add'>+	enum ath11k_firmware_mode fw_mode;</div><div class='ctx'> 	struct platform_device *pdev;</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct ath11k_qmi qmi;</div><div class='hunk'>@@ -666,11 +916,16 @@ struct ath11k_base {</div><div class='ctx'> 	/* HW channel counters frequency value in hertz common to all MACs */</div><div class='ctx'> 	u32 cc_freq_hz;</div><div class='ctx'> </div><div class='add'>+	struct ath11k_dump_file_data *dump_data;</div><div class='add'>+	size_t ath11k_coredump_len;</div><div class='add'>+	struct work_struct dump_work;</div><div class='add'>+</div><div class='ctx'> 	struct ath11k_htc htc;</div><div class='ctx'> </div><div class='ctx'> 	struct ath11k_dp dp;</div><div class='ctx'> </div><div class='ctx'> 	void __iomem *mem;</div><div class='add'>+	void __iomem *mem_ce;</div><div class='ctx'> 	unsigned long mem_len;</div><div class='ctx'> </div><div class='ctx'> 	struct {</div><div class='hunk'>@@ -690,42 +945,54 @@ struct ath11k_base {</div><div class='ctx'> 	/* Protects data like peers */</div><div class='ctx'> 	spinlock_t base_lock;</div><div class='ctx'> 	struct ath11k_pdev pdevs[MAX_RADIOS];</div><div class='add'>+	struct {</div><div class='add'>+		enum WMI_HOST_WLAN_BAND supported_bands;</div><div class='add'>+		u32 pdev_id;</div><div class='add'>+	} target_pdev_ids[MAX_RADIOS];</div><div class='add'>+	u8 target_pdev_count;</div><div class='ctx'> 	struct ath11k_pdev __rcu *pdevs_active[MAX_RADIOS];</div><div class='ctx'> 	struct ath11k_hal_reg_capabilities_ext hal_reg_cap[MAX_RADIOS];</div><div class='ctx'> 	unsigned long long free_vdev_map;</div><div class='add'>+</div><div class='add'>+	/* To synchronize rhash tbl write operation */</div><div class='add'>+	struct mutex tbl_mtx_lock;</div><div class='add'>+</div><div class='add'>+	/* The rhashtable containing struct ath11k_peer keyed by mac addr */</div><div class='add'>+	struct rhashtable *rhead_peer_addr;</div><div class='add'>+	struct rhashtable_params rhash_peer_addr_param;</div><div class='add'>+</div><div class='add'>+	/* The rhashtable containing struct ath11k_peer keyed by id  */</div><div class='add'>+	struct rhashtable *rhead_peer_id;</div><div class='add'>+	struct rhashtable_params rhash_peer_id_param;</div><div class='add'>+</div><div class='ctx'> 	struct list_head peers;</div><div class='ctx'> 	wait_queue_head_t peer_mapping_wq;</div><div class='ctx'> 	u8 mac_addr[ETH_ALEN];</div><div class='del'>-	bool wmi_ready;</div><div class='del'>-	u32 wlan_init_status;</div><div class='ctx'> 	int irq_num[ATH11K_IRQ_NUM_MAX];</div><div class='ctx'> 	struct ath11k_ext_irq_grp ext_irq_grp[ATH11K_EXT_IRQ_GRP_NUM_MAX];</div><div class='del'>-	struct napi_struct *napi;</div><div class='ctx'> 	struct ath11k_targ_cap target_caps;</div><div class='ctx'> 	u32 ext_service_bitmap[WMI_SERVICE_EXT_BM_SIZE];</div><div class='ctx'> 	bool pdevs_macaddr_valid;</div><div class='del'>-	int bd_api;</div><div class='ctx'> </div><div class='ctx'> 	struct ath11k_hw_params hw_params;</div><div class='del'>-	struct ath11k_bus_params bus_params;</div><div class='ctx'> </div><div class='ctx'> 	const struct firmware *cal_file;</div><div class='ctx'> </div><div class='ctx'> 	/* Below regd's are protected by ab-&gt;data_lock */</div><div class='ctx'> 	/* This is the regd set for every radio</div><div class='del'>-	 * by the firmware during initializatin</div><div class='add'>+	 * by the firmware during initialization</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct ieee80211_regdomain *default_regd[MAX_RADIOS];</div><div class='ctx'> 	/* This regd is set during dynamic country setting</div><div class='ctx'> 	 * This may or may not be used during the runtime</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct ieee80211_regdomain *new_regd[MAX_RADIOS];</div><div class='add'>+	struct cur_regulatory_info *reg_info_store;</div><div class='ctx'> </div><div class='ctx'> 	/* Current DFS Regulatory */</div><div class='ctx'> 	enum ath11k_dfs_region dfs_region;</div><div class='ctx'> #ifdef CONFIG_ATH11K_DEBUGFS</div><div class='ctx'> 	struct dentry *debugfs_soc;</div><div class='del'>-	struct dentry *debugfs_ath11k;</div><div class='ctx'> #endif</div><div class='ctx'> 	struct ath11k_soc_dp_stats soc_stats;</div><div class='ctx'> </div><div class='hunk'>@@ -733,6 +1000,20 @@ struct ath11k_base {</div><div class='ctx'> 	struct completion driver_recovery;</div><div class='ctx'> 	struct workqueue_struct *workqueue;</div><div class='ctx'> 	struct work_struct restart_work;</div><div class='add'>+	struct work_struct update_11d_work;</div><div class='add'>+	u8 new_alpha2[3];</div><div class='add'>+	struct workqueue_struct *workqueue_aux;</div><div class='add'>+	struct work_struct reset_work;</div><div class='add'>+	atomic_t reset_count;</div><div class='add'>+	atomic_t recovery_count;</div><div class='add'>+	atomic_t recovery_start_count;</div><div class='add'>+	bool is_reset;</div><div class='add'>+	struct completion reset_complete;</div><div class='add'>+	struct completion reconfigure_complete;</div><div class='add'>+	struct completion recovery_start;</div><div class='add'>+	/* continuous recovery fail count */</div><div class='add'>+	atomic_t fail_cont_count;</div><div class='add'>+	unsigned long reset_fail_timeout;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		/* protected by data_lock */</div><div class='ctx'> 		u32 fw_crash_counter;</div><div class='hunk'>@@ -742,12 +1023,60 @@ struct ath11k_base {</div><div class='ctx'> 	struct ath11k_dbring_cap *db_caps;</div><div class='ctx'> 	u32 num_db_cap;</div><div class='ctx'> </div><div class='add'>+	/* To synchronize 11d scan vdev id */</div><div class='add'>+	struct mutex vdev_id_11d_lock;</div><div class='ctx'> 	struct timer_list mon_reap_timer;</div><div class='ctx'> </div><div class='ctx'> 	struct completion htc_suspend;</div><div class='ctx'> </div><div class='add'>+	struct {</div><div class='add'>+		enum ath11k_bdf_search bdf_search;</div><div class='add'>+		u32 vendor;</div><div class='add'>+		u32 device;</div><div class='add'>+		u32 subsystem_vendor;</div><div class='add'>+		u32 subsystem_device;</div><div class='add'>+	} id;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			const struct ath11k_msi_config *config;</div><div class='add'>+			u32 ep_base_data;</div><div class='add'>+			u32 irqs[32];</div><div class='add'>+			u32 addr_lo;</div><div class='add'>+			u32 addr_hi;</div><div class='add'>+		} msi;</div><div class='add'>+</div><div class='add'>+		const struct ath11k_pci_ops *ops;</div><div class='add'>+	} pci;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u32 api_version;</div><div class='add'>+</div><div class='add'>+		const struct firmware *fw;</div><div class='add'>+		const u8 *amss_data;</div><div class='add'>+		size_t amss_len;</div><div class='add'>+		const u8 *m3_data;</div><div class='add'>+		size_t m3_len;</div><div class='add'>+</div><div class='add'>+		DECLARE_BITMAP(fw_features, ATH11K_FW_FEATURE_COUNT);</div><div class='add'>+	} fw;</div><div class='add'>+</div><div class='add'>+	struct completion restart_completed;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NL80211_TESTMODE</div><div class='add'>+	struct {</div><div class='add'>+		u32 data_pos;</div><div class='add'>+		u32 expected_seq;</div><div class='add'>+		u8 *eventdata;</div><div class='add'>+	} testmode;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	enum ath11k_pm_policy pm_policy;</div><div class='add'>+	enum ath11k_pm_policy actual_pm_policy;</div><div class='add'>+	struct notifier_block pm_nb;</div><div class='add'>+</div><div class='ctx'> 	/* must be last */</div><div class='del'>-	u8 drv_priv[0] __aligned(sizeof(void *));</div><div class='add'>+	u8 drv_priv[] __aligned(sizeof(void *));</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ath11k_fw_stats_pdev {</div><div class='hunk'>@@ -793,12 +1122,15 @@ struct ath11k_fw_stats_pdev {</div><div class='ctx'> 	s32 hw_reaped;</div><div class='ctx'> 	/* Num underruns */</div><div class='ctx'> 	s32 underrun;</div><div class='add'>+	/* Num hw paused */</div><div class='add'>+	u32 hw_paused;</div><div class='ctx'> 	/* Num PPDUs cleaned up in TX abort */</div><div class='ctx'> 	s32 tx_abort;</div><div class='del'>-	/* Num MPDUs requed by SW */</div><div class='del'>-	s32 mpdus_requed;</div><div class='add'>+	/* Num MPDUs requeued by SW */</div><div class='add'>+	s32 mpdus_requeued;</div><div class='ctx'> 	/* excessive retries */</div><div class='ctx'> 	u32 tx_ko;</div><div class='add'>+	u32 tx_xretry;</div><div class='ctx'> 	/* data hw rate code */</div><div class='ctx'> 	u32 data_rc;</div><div class='ctx'> 	/* Scheduler self triggers */</div><div class='hunk'>@@ -819,6 +1151,30 @@ struct ath11k_fw_stats_pdev {</div><div class='ctx'> 	u32 phy_underrun;</div><div class='ctx'> 	/* MPDU is more than txop limit */</div><div class='ctx'> 	u32 txop_ovf;</div><div class='add'>+	/* Num sequences posted */</div><div class='add'>+	u32 seq_posted;</div><div class='add'>+	/* Num sequences failed in queueing */</div><div class='add'>+	u32 seq_failed_queueing;</div><div class='add'>+	/* Num sequences completed */</div><div class='add'>+	u32 seq_completed;</div><div class='add'>+	/* Num sequences restarted */</div><div class='add'>+	u32 seq_restarted;</div><div class='add'>+	/* Num of MU sequences posted */</div><div class='add'>+	u32 mu_seq_posted;</div><div class='add'>+	/* Num MPDUs flushed by SW, HWPAUSED, SW TXABORT</div><div class='add'>+	 * (Reset,channel change)</div><div class='add'>+	 */</div><div class='add'>+	s32 mpdus_sw_flush;</div><div class='add'>+	/* Num MPDUs filtered by HW, all filter condition (TTL expired) */</div><div class='add'>+	s32 mpdus_hw_filter;</div><div class='add'>+	/* Num MPDUs truncated by PDG (TXOP, TBTT,</div><div class='add'>+	 * PPDU_duration based on rate, dyn_bw)</div><div class='add'>+	 */</div><div class='add'>+	s32 mpdus_truncated;</div><div class='add'>+	/* Num MPDUs that was tried but didn't receive ACK or BA */</div><div class='add'>+	s32 mpdus_ack_failed;</div><div class='add'>+	/* Num MPDUs that was dropped du to expiry. */</div><div class='add'>+	s32 mpdus_expired;</div><div class='ctx'> </div><div class='ctx'> 	/* PDEV RX stats */</div><div class='ctx'> 	/* Cnts any change in ring routing mid-ppdu */</div><div class='hunk'>@@ -844,6 +1200,8 @@ struct ath11k_fw_stats_pdev {</div><div class='ctx'> 	s32 phy_err_drop;</div><div class='ctx'> 	/* Number of mpdu errors - FCS, MIC, ENC etc. */</div><div class='ctx'> 	s32 mpdu_errs;</div><div class='add'>+	/* Num overflow errors */</div><div class='add'>+	s32 rx_ovfl_errs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ath11k_fw_stats_vdev {</div><div class='hunk'>@@ -873,6 +1231,12 @@ struct ath11k_fw_stats_bcn {</div><div class='ctx'> 	u32 tx_bcn_outage_cnt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+void ath11k_fw_stats_init(struct ath11k *ar);</div><div class='add'>+void ath11k_fw_stats_pdevs_free(struct list_head *head);</div><div class='add'>+void ath11k_fw_stats_vdevs_free(struct list_head *head);</div><div class='add'>+void ath11k_fw_stats_bcn_free(struct list_head *head);</div><div class='add'>+void ath11k_fw_stats_free(struct ath11k_fw_stats *stats);</div><div class='add'>+</div><div class='ctx'> extern const struct ce_pipe_config ath11k_target_ce_config_wlan_ipq8074[];</div><div class='ctx'> extern const struct service_to_pipe ath11k_target_service_to_ce_map_wlan_ipq8074[];</div><div class='ctx'> extern const struct service_to_pipe ath11k_target_service_to_ce_map_wlan_ipq6018[];</div><div class='hunk'>@@ -880,6 +1244,9 @@ extern const struct service_to_pipe ath11k_target_service_to_ce_map_wlan_ipq6018</div><div class='ctx'> extern const struct ce_pipe_config ath11k_target_ce_config_wlan_qca6390[];</div><div class='ctx'> extern const struct service_to_pipe ath11k_target_service_to_ce_map_wlan_qca6390[];</div><div class='ctx'> </div><div class='add'>+extern const struct ce_pipe_config ath11k_target_ce_config_wlan_ipq5018[];</div><div class='add'>+extern const struct service_to_pipe ath11k_target_service_to_ce_map_wlan_ipq5018[];</div><div class='add'>+</div><div class='ctx'> extern const struct ce_pipe_config ath11k_target_ce_config_wlan_qcn9074[];</div><div class='ctx'> extern const struct service_to_pipe ath11k_target_service_to_ce_map_wlan_qcn9074[];</div><div class='ctx'> int ath11k_core_qmi_firmware_ready(struct ath11k_base *ab);</div><div class='hunk'>@@ -887,17 +1254,24 @@ int ath11k_core_pre_init(struct ath11k_base *ab);</div><div class='ctx'> int ath11k_core_init(struct ath11k_base *ath11k);</div><div class='ctx'> void ath11k_core_deinit(struct ath11k_base *ath11k);</div><div class='ctx'> struct ath11k_base *ath11k_core_alloc(struct device *dev, size_t priv_size,</div><div class='del'>-				      enum ath11k_bus bus,</div><div class='del'>-				      const struct ath11k_bus_params *bus_params);</div><div class='add'>+				      enum ath11k_bus bus);</div><div class='ctx'> void ath11k_core_free(struct ath11k_base *ath11k);</div><div class='ctx'> int ath11k_core_fetch_bdf(struct ath11k_base *ath11k,</div><div class='ctx'> 			  struct ath11k_board_data *bd);</div><div class='add'>+int ath11k_core_fetch_regdb(struct ath11k_base *ab, struct ath11k_board_data *bd);</div><div class='add'>+int ath11k_core_fetch_board_data_api_1(struct ath11k_base *ab,</div><div class='add'>+				       struct ath11k_board_data *bd,</div><div class='add'>+				       const char *name);</div><div class='ctx'> void ath11k_core_free_bdf(struct ath11k_base *ab, struct ath11k_board_data *bd);</div><div class='ctx'> int ath11k_core_check_dt(struct ath11k_base *ath11k);</div><div class='del'>-</div><div class='add'>+int ath11k_core_check_smbios(struct ath11k_base *ab);</div><div class='ctx'> void ath11k_core_halt(struct ath11k *ar);</div><div class='add'>+int ath11k_core_resume_early(struct ath11k_base *ab);</div><div class='ctx'> int ath11k_core_resume(struct ath11k_base *ab);</div><div class='ctx'> int ath11k_core_suspend(struct ath11k_base *ab);</div><div class='add'>+int ath11k_core_suspend_late(struct ath11k_base *ab);</div><div class='add'>+void ath11k_core_pre_reconfigure_recovery(struct ath11k_base *ab);</div><div class='add'>+bool ath11k_core_coldboot_cal_support(struct ath11k_base *ab);</div><div class='ctx'> </div><div class='ctx'> const struct firmware *ath11k_core_firmware_request(struct ath11k_base *ab,</div><div class='ctx'> 						    const char *filename);</div><div class='hunk'>@@ -936,6 +1310,11 @@ static inline struct ath11k_vif *ath11k_vif_to_arvif(struct ieee80211_vif *vif)</div><div class='ctx'> 	return (struct ath11k_vif *)vif-&gt;drv_priv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct ath11k_sta *ath11k_sta_to_arsta(struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	return (struct ath11k_sta *)sta-&gt;drv_priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct ath11k *ath11k_ab_to_ar(struct ath11k_base *ab,</div><div class='ctx'> 					     int mac_id)</div><div class='ctx'> {</div><div class='hunk'>@@ -946,8 +1325,16 @@ static inline void ath11k_core_create_firmware_path(struct ath11k_base *ab,</div><div class='ctx'> 						    const char *filename,</div><div class='ctx'> 						    void *buf, size_t buf_len)</div><div class='ctx'> {</div><div class='del'>-	snprintf(buf, buf_len, "%s/%s/%s", ATH11K_FW_DIR,</div><div class='del'>-		 ab-&gt;hw_params.fw.dir, filename);</div><div class='add'>+	const char *fw_name = NULL;</div><div class='add'>+</div><div class='add'>+	of_property_read_string(ab-&gt;dev-&gt;of_node, "firmware-name", &amp;fw_name);</div><div class='add'>+</div><div class='add'>+	if (fw_name &amp;&amp; strncmp(filename, "board", 5))</div><div class='add'>+		snprintf(buf, buf_len, "%s/%s/%s/%s", ATH11K_FW_DIR,</div><div class='add'>+			 ab-&gt;hw_params.fw.dir, fw_name, filename);</div><div class='add'>+	else</div><div class='add'>+		snprintf(buf, buf_len, "%s/%s/%s", ATH11K_FW_DIR,</div><div class='add'>+			 ab-&gt;hw_params.fw.dir, filename);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline const char *ath11k_bus_str(enum ath11k_bus bus)</div><div class='hunk'>@@ -962,4 +1349,6 @@ static inline const char *ath11k_bus_str(enum ath11k_bus bus)</div><div class='ctx'> 	return "unknown";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void ath11k_core_pm_notifier_unregister(struct ath11k_base *ab);</div><div class='add'>+</div><div class='ctx'> #endif /* _CORE_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/coredump.c b/drivers/net/wireless/ath/ath11k/coredump.c<br/>new file mode 100644<br/>index 000000000000..1949d57b007a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/coredump.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/coredump.c</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/devcoredump.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include "hif.h"</div><div class='add'>+#include "coredump.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+enum</div><div class='add'>+ath11k_fw_crash_dump_type ath11k_coredump_get_dump_type(int type)</div><div class='add'>+{</div><div class='add'>+	enum ath11k_fw_crash_dump_type dump_type;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case HOST_DDR_REGION_TYPE:</div><div class='add'>+		dump_type = FW_CRASH_DUMP_REMOTE_MEM_DATA;</div><div class='add'>+		break;</div><div class='add'>+	case M3_DUMP_REGION_TYPE:</div><div class='add'>+		dump_type = FW_CRASH_DUMP_M3_DUMP;</div><div class='add'>+		break;</div><div class='add'>+	case PAGEABLE_MEM_REGION_TYPE:</div><div class='add'>+		dump_type = FW_CRASH_DUMP_PAGEABLE_DATA;</div><div class='add'>+		break;</div><div class='add'>+	case BDF_MEM_REGION_TYPE:</div><div class='add'>+	case CALDB_MEM_REGION_TYPE:</div><div class='add'>+		dump_type = FW_CRASH_DUMP_NONE;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dump_type = FW_CRASH_DUMP_TYPE_MAX;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dump_type;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_coredump_get_dump_type);</div><div class='add'>+</div><div class='add'>+void ath11k_coredump_upload(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = container_of(work, struct ath11k_base, dump_work);</div><div class='add'>+</div><div class='add'>+	ath11k_info(ab, "Uploading coredump\n");</div><div class='add'>+	/* dev_coredumpv() takes ownership of the buffer */</div><div class='add'>+	dev_coredumpv(ab-&gt;dev, ab-&gt;dump_data, ab-&gt;ath11k_coredump_len, GFP_KERNEL);</div><div class='add'>+	ab-&gt;dump_data = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_coredump_collect(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath11k_hif_coredump_download(ab);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/coredump.h b/drivers/net/wireless/ath/ath11k/coredump.h<br/>new file mode 100644<br/>index 000000000000..3960d9385261<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/coredump.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/coredump.h</a></div><div class='hunk'>@@ -0,0 +1,79 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ATH11K_COREDUMP_H_</div><div class='add'>+#define _ATH11K_COREDUMP_H_</div><div class='add'>+</div><div class='add'>+#define ATH11K_FW_CRASH_DUMP_V2      2</div><div class='add'>+</div><div class='add'>+enum ath11k_fw_crash_dump_type {</div><div class='add'>+	FW_CRASH_DUMP_PAGING_DATA,</div><div class='add'>+	FW_CRASH_DUMP_RDDM_DATA,</div><div class='add'>+	FW_CRASH_DUMP_REMOTE_MEM_DATA,</div><div class='add'>+	FW_CRASH_DUMP_PAGEABLE_DATA,</div><div class='add'>+	FW_CRASH_DUMP_M3_DUMP,</div><div class='add'>+	FW_CRASH_DUMP_NONE,</div><div class='add'>+</div><div class='add'>+	/* keep last */</div><div class='add'>+	FW_CRASH_DUMP_TYPE_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define COREDUMP_TLV_HDR_SIZE 8</div><div class='add'>+</div><div class='add'>+struct ath11k_tlv_dump_data {</div><div class='add'>+	/* see ath11k_fw_crash_dump_type above */</div><div class='add'>+	__le32 type;</div><div class='add'>+</div><div class='add'>+	/* in bytes */</div><div class='add'>+	__le32 tlv_len;</div><div class='add'>+</div><div class='add'>+	/* pad to 32-bit boundaries as needed */</div><div class='add'>+	u8 tlv_data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath11k_dump_file_data {</div><div class='add'>+	/* "ATH11K-FW-DUMP" */</div><div class='add'>+	char df_magic[16];</div><div class='add'>+	/* total dump len in bytes */</div><div class='add'>+	__le32 len;</div><div class='add'>+	/* file dump version */</div><div class='add'>+	__le32 version;</div><div class='add'>+	/* pci device id */</div><div class='add'>+	__le32 chip_id;</div><div class='add'>+	/* qrtr instance id */</div><div class='add'>+	__le32 qrtr_id;</div><div class='add'>+	/* pci domain id */</div><div class='add'>+	__le32 bus_id;</div><div class='add'>+	guid_t guid;</div><div class='add'>+	/* time-of-day stamp */</div><div class='add'>+	__le64 tv_sec;</div><div class='add'>+	/* time-of-day stamp, nano-seconds */</div><div class='add'>+	__le64 tv_nsec;</div><div class='add'>+	/* room for growth w/out changing binary format */</div><div class='add'>+	u8 unused[128];</div><div class='add'>+	u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEV_COREDUMP</div><div class='add'>+enum ath11k_fw_crash_dump_type ath11k_coredump_get_dump_type(int type);</div><div class='add'>+void ath11k_coredump_upload(struct work_struct *work);</div><div class='add'>+void ath11k_coredump_collect(struct ath11k_base *ab);</div><div class='add'>+#else</div><div class='add'>+static inline enum</div><div class='add'>+ath11k_fw_crash_dump_type ath11k_coredump_get_dump_type(int type)</div><div class='add'>+{</div><div class='add'>+	return FW_CRASH_DUMP_TYPE_MAX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath11k_coredump_upload(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath11k_coredump_collect(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/dbring.c b/drivers/net/wireless/ath/ath11k/dbring.c<br/>index 5e1f5437b418..520d8b8662a2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/dbring.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/dbring.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/dbring.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/dbring.c</a></div><div class='hunk'>@@ -1,15 +1,46 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> </div><div class='add'>+#define ATH11K_DB_MAGIC_VALUE 0xdeadbeaf</div><div class='add'>+</div><div class='add'>+int ath11k_dbring_validate_buffer(struct ath11k *ar, void *buffer, u32 size)</div><div class='add'>+{</div><div class='add'>+	u32 *temp;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	size = size &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+	for (idx = 0, temp = buffer; idx &lt; size; idx++, temp++) {</div><div class='add'>+		if (*temp == ATH11K_DB_MAGIC_VALUE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_dbring_fill_magic_value(struct ath11k *ar,</div><div class='add'>+					   void *buffer, u32 size)</div><div class='add'>+{</div><div class='add'>+	/* memset32 function fills buffer payload with the ATH11K_DB_MAGIC_VALUE</div><div class='add'>+	 * and the variable size is expected to be the number of u32 values</div><div class='add'>+	 * to be stored, not the number of bytes.</div><div class='add'>+	 */</div><div class='add'>+	size = size / sizeof(u32);</div><div class='add'>+</div><div class='add'>+	memset32(buffer, ATH11K_DB_MAGIC_VALUE, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath11k_dbring_bufs_replenish(struct ath11k *ar,</div><div class='ctx'> 					struct ath11k_dbring *ring,</div><div class='ctx'> 					struct ath11k_dbring_element *buff,</div><div class='del'>-					gfp_t gfp)</div><div class='add'>+					enum wmi_direct_buffer_module id)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='ctx'> 	struct hal_srng *srng;</div><div class='hunk'>@@ -27,6 +58,7 @@ static int ath11k_dbring_bufs_replenish(struct ath11k *ar,</div><div class='ctx'> </div><div class='ctx'> 	ptr_unaligned = buff-&gt;payload;</div><div class='ctx'> 	ptr_aligned = PTR_ALIGN(ptr_unaligned, ring-&gt;buf_align);</div><div class='add'>+	ath11k_dbring_fill_magic_value(ar, ptr_aligned, ring-&gt;buf_sz);</div><div class='ctx'> 	paddr = dma_map_single(ab-&gt;dev, ptr_aligned, ring-&gt;buf_sz,</div><div class='ctx'> 			       DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='hunk'>@@ -35,7 +67,7 @@ static int ath11k_dbring_bufs_replenish(struct ath11k *ar,</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ring-&gt;idr_lock);</div><div class='del'>-	buf_id = idr_alloc(&amp;ring-&gt;bufs_idr, buff, 0, ring-&gt;bufs_max, gfp);</div><div class='add'>+	buf_id = idr_alloc(&amp;ring-&gt;bufs_idr, buff, 0, ring-&gt;bufs_max, GFP_ATOMIC);</div><div class='ctx'> 	spin_unlock_bh(&amp;ring-&gt;idr_lock);</div><div class='ctx'> 	if (buf_id &lt; 0) {</div><div class='ctx'> 		ret = -ENOBUFS;</div><div class='hunk'>@@ -55,6 +87,7 @@ static int ath11k_dbring_bufs_replenish(struct ath11k *ar,</div><div class='ctx'> </div><div class='ctx'> 	ath11k_hal_rx_buf_addr_info_set(desc, paddr, cookie, 0);</div><div class='ctx'> </div><div class='add'>+	ath11k_debugfs_add_dbring_entry(ar, id, ATH11K_DBG_DBR_EVENT_REPLENISH, srng);</div><div class='ctx'> 	ath11k_hal_srng_access_end(ab, srng);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -73,7 +106,7 @@ err:</div><div class='ctx'> </div><div class='ctx'> static int ath11k_dbring_fill_bufs(struct ath11k *ar,</div><div class='ctx'> 				   struct ath11k_dbring *ring,</div><div class='del'>-				   gfp_t gfp)</div><div class='add'>+				   enum wmi_direct_buffer_module id)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_dbring_element *buff;</div><div class='ctx'> 	struct hal_srng *srng;</div><div class='hunk'>@@ -89,17 +122,23 @@ static int ath11k_dbring_fill_bufs(struct ath11k *ar,</div><div class='ctx'> 	req_entries = min(num_free, ring-&gt;bufs_max);</div><div class='ctx'> 	num_remain = req_entries;</div><div class='ctx'> 	align = ring-&gt;buf_align;</div><div class='del'>-	size = sizeof(*buff) + ring-&gt;buf_sz + align - 1;</div><div class='add'>+	size = ring-&gt;buf_sz + align - 1;</div><div class='ctx'> </div><div class='ctx'> 	while (num_remain &gt; 0) {</div><div class='del'>-		buff = kzalloc(size, gfp);</div><div class='add'>+		buff = kzalloc(sizeof(*buff), GFP_ATOMIC);</div><div class='ctx'> 		if (!buff)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		ret = ath11k_dbring_bufs_replenish(ar, ring, buff, gfp);</div><div class='add'>+		buff-&gt;payload = kzalloc(size, GFP_ATOMIC);</div><div class='add'>+		if (!buff-&gt;payload) {</div><div class='add'>+			kfree(buff);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ret = ath11k_dbring_bufs_replenish(ar, ring, buff, id);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ath11k_warn(ar-&gt;ab, "failed to replenish db ring num_remain %d req_ent %d\n",</div><div class='ctx'> 				    num_remain, req_entries);</div><div class='add'>+			kfree(buff-&gt;payload);</div><div class='ctx'> 			kfree(buff);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -115,7 +154,7 @@ int ath11k_dbring_wmi_cfg_setup(struct ath11k *ar,</div><div class='ctx'> 				struct ath11k_dbring *ring,</div><div class='ctx'> 				enum wmi_direct_buffer_module id)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_wmi_pdev_dma_ring_cfg_req_cmd param = {0};</div><div class='add'>+	struct ath11k_wmi_pdev_dma_ring_cfg_req_cmd param = {};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (id &gt;= WMI_DIRECT_BUF_MAX)</div><div class='hunk'>@@ -176,7 +215,7 @@ int ath11k_dbring_buf_setup(struct ath11k *ar,</div><div class='ctx'> 	ring-&gt;hp_addr = ath11k_hal_srng_get_hp_addr(ar-&gt;ab, srng);</div><div class='ctx'> 	ring-&gt;tp_addr = ath11k_hal_srng_get_tp_addr(ar-&gt;ab, srng);</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_dbring_fill_bufs(ar, ring, GFP_KERNEL);</div><div class='add'>+	ret = ath11k_dbring_fill_bufs(ar, ring, db_cap-&gt;id);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -236,7 +275,7 @@ int ath11k_dbring_buffer_release_event(struct ath11k_base *ab,</div><div class='ctx'> 	struct ath11k_buffer_addr desc;</div><div class='ctx'> 	u8 *vaddr_unalign;</div><div class='ctx'> 	u32 num_entry, num_buff_reaped;</div><div class='del'>-	u8 pdev_idx, rbm;</div><div class='add'>+	u8 pdev_idx, rbm, module_id;</div><div class='ctx'> 	u32 cookie;</div><div class='ctx'> 	int buf_id;</div><div class='ctx'> 	int size;</div><div class='hunk'>@@ -244,6 +283,7 @@ int ath11k_dbring_buffer_release_event(struct ath11k_base *ab,</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	pdev_idx = ev-&gt;fixed.pdev_id;</div><div class='add'>+	module_id = ev-&gt;fixed.module_id;</div><div class='ctx'> </div><div class='ctx'> 	if (pdev_idx &gt;= ab-&gt;num_radios) {</div><div class='ctx'> 		ath11k_warn(ab, "Invalid pdev id %d\n", pdev_idx);</div><div class='hunk'>@@ -284,7 +324,7 @@ int ath11k_dbring_buffer_release_event(struct ath11k_base *ab,</div><div class='ctx'> </div><div class='ctx'> 	srng = &amp;ab-&gt;hal.srng_list[ring-&gt;refill_srng.ring_id];</div><div class='ctx'> 	num_entry = ev-&gt;fixed.num_buf_release_entry;</div><div class='del'>-	size = sizeof(*buff) + ring-&gt;buf_sz + ring-&gt;buf_align - 1;</div><div class='add'>+	size = ring-&gt;buf_sz + ring-&gt;buf_align - 1;</div><div class='ctx'> 	num_buff_reaped = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='hunk'>@@ -312,6 +352,9 @@ int ath11k_dbring_buffer_release_event(struct ath11k_base *ab,</div><div class='ctx'> 		dma_unmap_single(ab-&gt;dev, buff-&gt;paddr, ring-&gt;buf_sz,</div><div class='ctx'> 				 DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='add'>+		ath11k_debugfs_add_dbring_entry(ar, module_id,</div><div class='add'>+						ATH11K_DBG_DBR_EVENT_RX, srng);</div><div class='add'>+</div><div class='ctx'> 		if (ring-&gt;handler) {</div><div class='ctx'> 			vaddr_unalign = buff-&gt;payload;</div><div class='ctx'> 			handler_data.data = PTR_ALIGN(vaddr_unalign,</div><div class='hunk'>@@ -321,8 +364,9 @@ int ath11k_dbring_buffer_release_event(struct ath11k_base *ab,</div><div class='ctx'> 			ring-&gt;handler(ar, &amp;handler_data);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		memset(buff, 0, size);</div><div class='del'>-		ath11k_dbring_bufs_replenish(ar, ring, buff, GFP_ATOMIC);</div><div class='add'>+		buff-&gt;paddr = 0;</div><div class='add'>+		memset(buff-&gt;payload, 0, size);</div><div class='add'>+		ath11k_dbring_bufs_replenish(ar, ring, buff, module_id);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='hunk'>@@ -348,6 +392,7 @@ void ath11k_dbring_buf_cleanup(struct ath11k *ar, struct ath11k_dbring *ring)</div><div class='ctx'> 		idr_remove(&amp;ring-&gt;bufs_idr, buf_id);</div><div class='ctx'> 		dma_unmap_single(ar-&gt;ab-&gt;dev, buff-&gt;paddr,</div><div class='ctx'> 				 ring-&gt;buf_sz, DMA_FROM_DEVICE);</div><div class='add'>+		kfree(buff-&gt;payload);</div><div class='ctx'> 		kfree(buff);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/dbring.h b/drivers/net/wireless/ath/ath11k/dbring.h<br/>index f7fce9ef9c36..2f93b78a50df 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/dbring.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/dbring.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/dbring.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/dbring.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef ATH11K_DBRING_H</div><div class='hunk'>@@ -13,7 +14,7 @@</div><div class='ctx'> </div><div class='ctx'> struct ath11k_dbring_element {</div><div class='ctx'> 	dma_addr_t paddr;</div><div class='del'>-	u8 payload[0];</div><div class='add'>+	u8 *payload;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ath11k_dbring_data {</div><div class='hunk'>@@ -76,4 +77,6 @@ int ath11k_dbring_get_cap(struct ath11k_base *ab,</div><div class='ctx'> 			  struct ath11k_dbring_cap *db_cap);</div><div class='ctx'> void ath11k_dbring_srng_cleanup(struct ath11k *ar, struct ath11k_dbring *ring);</div><div class='ctx'> void ath11k_dbring_buf_cleanup(struct ath11k *ar, struct ath11k_dbring *ring);</div><div class='add'>+int ath11k_dbring_validate_buffer(struct ath11k *ar, void *data, u32 size);</div><div class='add'>+</div><div class='ctx'> #endif /* ATH11K_DBRING_H */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/debug.c b/drivers/net/wireless/ath/ath11k/debug.c<br/>index c86de95fbdc5..37d23a559ba3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/debug.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/debug.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/debug.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/debug.c</a></div><div class='hunk'>@@ -1,8 +1,11 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "debug.h"</div><div class='hunk'>@@ -17,7 +20,7 @@ void ath11k_info(struct ath11k_base *ab, const char *fmt, ...)</div><div class='ctx'> 	va_start(args, fmt);</div><div class='ctx'> 	vaf.va = &amp;args;</div><div class='ctx'> 	dev_info(ab-&gt;dev, "%pV", &amp;vaf);</div><div class='del'>-	/* TODO: Trace the log */</div><div class='add'>+	trace_ath11k_log_info(ab, &amp;vaf);</div><div class='ctx'> 	va_end(args);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ath11k_info);</div><div class='hunk'>@@ -32,7 +35,7 @@ void ath11k_err(struct ath11k_base *ab, const char *fmt, ...)</div><div class='ctx'> 	va_start(args, fmt);</div><div class='ctx'> 	vaf.va = &amp;args;</div><div class='ctx'> 	dev_err(ab-&gt;dev, "%pV", &amp;vaf);</div><div class='del'>-	/* TODO: Trace the log */</div><div class='add'>+	trace_ath11k_log_err(ab, &amp;vaf);</div><div class='ctx'> 	va_end(args);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ath11k_err);</div><div class='hunk'>@@ -47,7 +50,7 @@ void ath11k_warn(struct ath11k_base *ab, const char *fmt, ...)</div><div class='ctx'> 	va_start(args, fmt);</div><div class='ctx'> 	vaf.va = &amp;args;</div><div class='ctx'> 	dev_warn_ratelimited(ab-&gt;dev, "%pV", &amp;vaf);</div><div class='del'>-	/* TODO: Trace the log */</div><div class='add'>+	trace_ath11k_log_warn(ab, &amp;vaf);</div><div class='ctx'> 	va_end(args);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ath11k_warn);</div><div class='hunk'>@@ -66,9 +69,9 @@ void __ath11k_dbg(struct ath11k_base *ab, enum ath11k_debug_mask mask,</div><div class='ctx'> 	vaf.va = &amp;args;</div><div class='ctx'> </div><div class='ctx'> 	if (ath11k_debug_mask &amp; mask)</div><div class='del'>-		dev_printk(KERN_DEBUG, ab-&gt;dev, "%pV", &amp;vaf);</div><div class='add'>+		dev_printk(KERN_DEBUG, ab-&gt;dev, "%s %pV", ath11k_dbg_str(mask), &amp;vaf);</div><div class='ctx'> </div><div class='del'>-	/* TODO: trace log */</div><div class='add'>+	trace_ath11k_log_dbg(ab, mask, &amp;vaf);</div><div class='ctx'> </div><div class='ctx'> 	va_end(args);</div><div class='ctx'> }</div><div class='hunk'>@@ -100,6 +103,10 @@ void ath11k_dbg_dump(struct ath11k_base *ab,</div><div class='ctx'> 			dev_printk(KERN_DEBUG, ab-&gt;dev, "%s\n", linebuf);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* tracing code doesn't like null strings */</div><div class='add'>+	trace_ath11k_log_dbg_dump(ab, msg ? msg : "", prefix ? prefix : "",</div><div class='add'>+				  buf, len);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ath11k_dbg_dump);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/debug.h b/drivers/net/wireless/ath/ath11k/debug.h<br/>index 659a275e2eb3..cc8934d15697 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/debug.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/debug.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/debug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/debug.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _ATH11K_DEBUG_H_</div><div class='hunk'>@@ -21,13 +22,57 @@ enum ath11k_debug_mask {</div><div class='ctx'> 	ATH11K_DBG_MGMT		= 0x00000100,</div><div class='ctx'> 	ATH11K_DBG_REG		= 0x00000200,</div><div class='ctx'> 	ATH11K_DBG_TESTMODE	= 0x00000400,</div><div class='del'>-	ATH11k_DBG_HAL		= 0x00000800,</div><div class='add'>+	ATH11K_DBG_HAL		= 0x00000800,</div><div class='ctx'> 	ATH11K_DBG_PCI		= 0x00001000,</div><div class='del'>-	ATH11K_DBG_DP_TX	= 0x00001000,</div><div class='del'>-	ATH11K_DBG_DP_RX	= 0x00002000,</div><div class='del'>-	ATH11K_DBG_ANY		= 0xffffffff,</div><div class='add'>+	ATH11K_DBG_DP_TX	= 0x00002000,</div><div class='add'>+	ATH11K_DBG_DP_RX	= 0x00004000,</div><div class='add'>+	ATH11K_DBG_CE		= 0x00008000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline const char *ath11k_dbg_str(enum ath11k_debug_mask mask)</div><div class='add'>+{</div><div class='add'>+	switch (mask) {</div><div class='add'>+	case ATH11K_DBG_AHB:</div><div class='add'>+		return "ahb";</div><div class='add'>+	case ATH11K_DBG_WMI:</div><div class='add'>+		return "wmi";</div><div class='add'>+	case ATH11K_DBG_HTC:</div><div class='add'>+		return "htc";</div><div class='add'>+	case ATH11K_DBG_DP_HTT:</div><div class='add'>+		return "dp_htt";</div><div class='add'>+	case ATH11K_DBG_MAC:</div><div class='add'>+		return "mac";</div><div class='add'>+	case ATH11K_DBG_BOOT:</div><div class='add'>+		return "boot";</div><div class='add'>+	case ATH11K_DBG_QMI:</div><div class='add'>+		return "qmi";</div><div class='add'>+	case ATH11K_DBG_DATA:</div><div class='add'>+		return "data";</div><div class='add'>+	case ATH11K_DBG_MGMT:</div><div class='add'>+		return "mgmt";</div><div class='add'>+	case ATH11K_DBG_REG:</div><div class='add'>+		return "reg";</div><div class='add'>+	case ATH11K_DBG_TESTMODE:</div><div class='add'>+		return "testmode";</div><div class='add'>+	case ATH11K_DBG_HAL:</div><div class='add'>+		return "hal";</div><div class='add'>+	case ATH11K_DBG_PCI:</div><div class='add'>+		return "pci";</div><div class='add'>+	case ATH11K_DBG_DP_TX:</div><div class='add'>+		return "dp_tx";</div><div class='add'>+	case ATH11K_DBG_DP_RX:</div><div class='add'>+		return "dp_rx";</div><div class='add'>+	case ATH11K_DBG_CE:</div><div class='add'>+		return "ce";</div><div class='add'>+</div><div class='add'>+	/* no default handler to allow compiler to check that the</div><div class='add'>+	 * enum is fully handled</div><div class='add'>+	 */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "&lt;?&gt;";</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> __printf(2, 3) void ath11k_info(struct ath11k_base *ab, const char *fmt, ...);</div><div class='ctx'> __printf(2, 3) void ath11k_err(struct ath11k_base *ab, const char *fmt, ...);</div><div class='ctx'> __printf(2, 3) void ath11k_warn(struct ath11k_base *ab, const char *fmt, ...);</div><div class='hunk'>@@ -60,7 +105,8 @@ static inline void ath11k_dbg_dump(struct ath11k_base *ab,</div><div class='ctx'> </div><div class='ctx'> #define ath11k_dbg(ar, dbg_mask, fmt, ...)			\</div><div class='ctx'> do {								\</div><div class='del'>-	if (ath11k_debug_mask &amp; dbg_mask)			\</div><div class='add'>+	if ((ath11k_debug_mask &amp; dbg_mask) ||			\</div><div class='add'>+	    trace_ath11k_log_dbg_enabled())			\</div><div class='ctx'> 		__ath11k_dbg(ar, dbg_mask, fmt, ##__VA_ARGS__);	\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/debugfs.c b/drivers/net/wireless/ath/ath11k/debugfs.c<br/>index 554feaf1ed5c..977f945b6e66 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/debugfs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/debugfs.c</a></div><div class='hunk'>@@ -1,8 +1,13 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "debugfs.h"</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='hunk'>@@ -12,6 +17,7 @@</div><div class='ctx'> #include "dp_tx.h"</div><div class='ctx'> #include "debugfs_htt_stats.h"</div><div class='ctx'> #include "peer.h"</div><div class='add'>+#include "hif.h"</div><div class='ctx'> </div><div class='ctx'> static const char *htt_bp_umac_ring[HTT_SW_UMAC_RING_IDX_MAX] = {</div><div class='ctx'> 	"REO2SW1_RING",</div><div class='hunk'>@@ -50,183 +56,71 @@ static const char *htt_bp_lmac_ring[HTT_SW_LMAC_RING_IDX_MAX] = {</div><div class='ctx'> 	"MONITOR_DEST_RING",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void ath11k_fw_stats_pdevs_free(struct list_head *head)</div><div class='del'>-{</div><div class='del'>-	struct ath11k_fw_stats_pdev *i, *tmp;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(i, tmp, head, list) {</div><div class='del'>-		list_del(&amp;i-&gt;list);</div><div class='del'>-		kfree(i);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ath11k_fw_stats_vdevs_free(struct list_head *head)</div><div class='del'>-{</div><div class='del'>-	struct ath11k_fw_stats_vdev *i, *tmp;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(i, tmp, head, list) {</div><div class='del'>-		list_del(&amp;i-&gt;list);</div><div class='del'>-		kfree(i);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ath11k_fw_stats_bcn_free(struct list_head *head)</div><div class='add'>+void ath11k_debugfs_add_dbring_entry(struct ath11k *ar,</div><div class='add'>+				     enum wmi_direct_buffer_module id,</div><div class='add'>+				     enum ath11k_dbg_dbr_event event,</div><div class='add'>+				     struct hal_srng *srng)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_fw_stats_bcn *i, *tmp;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(i, tmp, head, list) {</div><div class='del'>-		list_del(&amp;i-&gt;list);</div><div class='del'>-		kfree(i);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+	struct ath11k_debug_dbr *dbr_debug;</div><div class='add'>+	struct ath11k_dbg_dbr_data *dbr_data;</div><div class='add'>+	struct ath11k_dbg_dbr_entry *entry;</div><div class='ctx'> </div><div class='del'>-static void ath11k_debugfs_fw_stats_reset(struct ath11k *ar)</div><div class='del'>-{</div><div class='del'>-	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='del'>-	ar-&gt;debug.fw_stats_done = false;</div><div class='del'>-	ath11k_fw_stats_pdevs_free(&amp;ar-&gt;debug.fw_stats.pdevs);</div><div class='del'>-	ath11k_fw_stats_vdevs_free(&amp;ar-&gt;debug.fw_stats.vdevs);</div><div class='del'>-	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='del'>-}</div><div class='add'>+	if (id &gt;= WMI_DIRECT_BUF_MAX || event &gt;= ATH11K_DBG_DBR_EVENT_MAX)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-void ath11k_debugfs_fw_stats_process(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct ath11k_fw_stats stats = {};</div><div class='del'>-	struct ath11k *ar;</div><div class='del'>-	struct ath11k_pdev *pdev;</div><div class='del'>-	bool is_end;</div><div class='del'>-	static unsigned int num_vdev, num_bcn;</div><div class='del'>-	size_t total_vdevs_started = 0;</div><div class='del'>-	int i, ret;</div><div class='add'>+	dbr_debug = ar-&gt;debug.dbr_debug[id];</div><div class='add'>+	if (!dbr_debug)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;stats.pdevs);</div><div class='del'>-	INIT_LIST_HEAD(&amp;stats.vdevs);</div><div class='del'>-	INIT_LIST_HEAD(&amp;stats.bcn);</div><div class='add'>+	if (!dbr_debug-&gt;dbr_debug_enabled)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_wmi_pull_fw_stats(ab, skb, &amp;stats);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ath11k_warn(ab, "failed to pull fw stats: %d\n", ret);</div><div class='del'>-		goto free;</div><div class='del'>-	}</div><div class='add'>+	dbr_data = &amp;dbr_debug-&gt;dbr_dbg_data;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	ar = ath11k_mac_get_ar_by_pdev_id(ab, stats.pdev_id);</div><div class='del'>-	if (!ar) {</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		ath11k_warn(ab, "failed to get ar for pdev_id %d: %d\n",</div><div class='del'>-			    stats.pdev_id, ret);</div><div class='del'>-		goto free;</div><div class='del'>-	}</div><div class='add'>+	spin_lock_bh(&amp;dbr_data-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	if (dbr_data-&gt;entries) {</div><div class='add'>+		entry = &amp;dbr_data-&gt;entries[dbr_data-&gt;dbr_debug_idx];</div><div class='add'>+		entry-&gt;hp = srng-&gt;u.src_ring.hp;</div><div class='add'>+		entry-&gt;tp = *srng-&gt;u.src_ring.tp_addr;</div><div class='add'>+		entry-&gt;timestamp = jiffies;</div><div class='add'>+		entry-&gt;event = event;</div><div class='ctx'> </div><div class='del'>-	if (stats.stats_id == WMI_REQUEST_PDEV_STAT) {</div><div class='del'>-		list_splice_tail_init(&amp;stats.pdevs, &amp;ar-&gt;debug.fw_stats.pdevs);</div><div class='del'>-		ar-&gt;debug.fw_stats_done = true;</div><div class='del'>-		goto complete;</div><div class='add'>+		dbr_data-&gt;dbr_debug_idx++;</div><div class='add'>+		if (dbr_data-&gt;dbr_debug_idx ==</div><div class='add'>+		    dbr_data-&gt;num_ring_debug_entries)</div><div class='add'>+			dbr_data-&gt;dbr_debug_idx = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (stats.stats_id == WMI_REQUEST_VDEV_STAT) {</div><div class='del'>-		if (list_empty(&amp;stats.vdevs)) {</div><div class='del'>-			ath11k_warn(ab, "empty vdev stats");</div><div class='del'>-			goto complete;</div><div class='del'>-		}</div><div class='del'>-		/* FW sends all the active VDEV stats irrespective of PDEV,</div><div class='del'>-		 * hence limit until the count of all VDEVs started</div><div class='del'>-		 */</div><div class='del'>-		for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='del'>-			pdev = rcu_dereference(ab-&gt;pdevs_active[i]);</div><div class='del'>-			if (pdev &amp;&amp; pdev-&gt;ar)</div><div class='del'>-				total_vdevs_started += ar-&gt;num_started_vdevs;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		is_end = ((++num_vdev) == total_vdevs_started);</div><div class='del'>-</div><div class='del'>-		list_splice_tail_init(&amp;stats.vdevs,</div><div class='del'>-				      &amp;ar-&gt;debug.fw_stats.vdevs);</div><div class='add'>+	spin_unlock_bh(&amp;dbr_data-&gt;lock);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		if (is_end) {</div><div class='del'>-			ar-&gt;debug.fw_stats_done = true;</div><div class='del'>-			num_vdev = 0;</div><div class='del'>-		}</div><div class='del'>-		goto complete;</div><div class='del'>-	}</div><div class='add'>+void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats *stats)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = ar-&gt;ab;</div><div class='add'>+	bool is_end = true;</div><div class='ctx'> </div><div class='del'>-	if (stats.stats_id == WMI_REQUEST_BCN_STAT) {</div><div class='del'>-		if (list_empty(&amp;stats.bcn)) {</div><div class='add'>+	/* WMI_REQUEST_PDEV_STAT, WMI_REQUEST_RSSI_PER_CHAIN_STAT and</div><div class='add'>+	 * WMI_REQUEST_VDEV_STAT requests have been already processed.</div><div class='add'>+	 */</div><div class='add'>+	if (stats-&gt;stats_id == WMI_REQUEST_BCN_STAT) {</div><div class='add'>+		if (list_empty(&amp;stats-&gt;bcn)) {</div><div class='ctx'> 			ath11k_warn(ab, "empty bcn stats");</div><div class='del'>-			goto complete;</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Mark end until we reached the count of all started VDEVs</div><div class='ctx'> 		 * within the PDEV</div><div class='ctx'> 		 */</div><div class='del'>-		is_end = ((++num_bcn) == ar-&gt;num_started_vdevs);</div><div class='add'>+		if (ar-&gt;num_started_vdevs)</div><div class='add'>+			is_end = ((++ar-&gt;fw_stats.num_bcn_recvd) ==</div><div class='add'>+				  ar-&gt;num_started_vdevs);</div><div class='ctx'> </div><div class='del'>-		list_splice_tail_init(&amp;stats.bcn,</div><div class='del'>-				      &amp;ar-&gt;debug.fw_stats.bcn);</div><div class='add'>+		list_splice_tail_init(&amp;stats-&gt;bcn,</div><div class='add'>+				      &amp;ar-&gt;fw_stats.bcn);</div><div class='ctx'> </div><div class='del'>-		if (is_end) {</div><div class='del'>-			ar-&gt;debug.fw_stats_done = true;</div><div class='del'>-			num_bcn = 0;</div><div class='del'>-		}</div><div class='add'>+		if (is_end)</div><div class='add'>+			complete(&amp;ar-&gt;fw_stats_done);</div><div class='ctx'> 	}</div><div class='del'>-complete:</div><div class='del'>-	complete(&amp;ar-&gt;debug.fw_stats_complete);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='del'>-</div><div class='del'>-free:</div><div class='del'>-	ath11k_fw_stats_pdevs_free(&amp;stats.pdevs);</div><div class='del'>-	ath11k_fw_stats_vdevs_free(&amp;stats.vdevs);</div><div class='del'>-	ath11k_fw_stats_bcn_free(&amp;stats.bcn);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ath11k_debugfs_fw_stats_request(struct ath11k *ar,</div><div class='del'>-					   struct stats_request_params *req_param)</div><div class='del'>-{</div><div class='del'>-	struct ath11k_base *ab = ar-&gt;ab;</div><div class='del'>-	unsigned long timeout, time_left;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='del'>-</div><div class='del'>-	/* FW stats can get split when exceeding the stats data buffer limit.</div><div class='del'>-	 * In that case, since there is no end marking for the back-to-back</div><div class='del'>-	 * received 'update stats' event, we keep a 3 seconds timeout in case,</div><div class='del'>-	 * fw_stats_done is not marked yet</div><div class='del'>-	 */</div><div class='del'>-	timeout = jiffies + msecs_to_jiffies(3 * HZ);</div><div class='del'>-</div><div class='del'>-	ath11k_debugfs_fw_stats_reset(ar);</div><div class='del'>-</div><div class='del'>-	reinit_completion(&amp;ar-&gt;debug.fw_stats_complete);</div><div class='del'>-</div><div class='del'>-	ret = ath11k_wmi_send_stats_request_cmd(ar, req_param);</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		ath11k_warn(ab, "could not request fw stats (%d)\n",</div><div class='del'>-			    ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	time_left =</div><div class='del'>-	wait_for_completion_timeout(&amp;ar-&gt;debug.fw_stats_complete,</div><div class='del'>-				    1 * HZ);</div><div class='del'>-	if (!time_left)</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-		if (time_after(jiffies, timeout))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='del'>-		if (ar-&gt;debug.fw_stats_done) {</div><div class='del'>-			spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath11k_open_pdev_stats(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -254,14 +148,13 @@ static int ath11k_open_pdev_stats(struct inode *inode, struct file *file)</div><div class='ctx'> 	req_param.vdev_id = 0;</div><div class='ctx'> 	req_param.stats_id = WMI_REQUEST_PDEV_STAT;</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_debugfs_fw_stats_request(ar, &amp;req_param);</div><div class='add'>+	ret = ath11k_mac_fw_stats_request(ar, &amp;req_param);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ab, "failed to request fw pdev stats: %d\n", ret);</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_wmi_fw_stats_fill(ar, &amp;ar-&gt;debug.fw_stats, req_param.stats_id,</div><div class='del'>-				 buf);</div><div class='add'>+	ath11k_wmi_fw_stats_fill(ar, &amp;ar-&gt;fw_stats, req_param.stats_id, buf);</div><div class='ctx'> </div><div class='ctx'> 	file-&gt;private_data = buf;</div><div class='ctx'> </div><div class='hunk'>@@ -326,14 +219,13 @@ static int ath11k_open_vdev_stats(struct inode *inode, struct file *file)</div><div class='ctx'> 	req_param.vdev_id = 0;</div><div class='ctx'> 	req_param.stats_id = WMI_REQUEST_VDEV_STAT;</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_debugfs_fw_stats_request(ar, &amp;req_param);</div><div class='add'>+	ret = ath11k_mac_fw_stats_request(ar, &amp;req_param);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab, "failed to request fw vdev stats: %d\n", ret);</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_wmi_fw_stats_fill(ar, &amp;ar-&gt;debug.fw_stats, req_param.stats_id,</div><div class='del'>-				 buf);</div><div class='add'>+	ath11k_wmi_fw_stats_fill(ar, &amp;ar-&gt;fw_stats, req_param.stats_id, buf);</div><div class='ctx'> </div><div class='ctx'> 	file-&gt;private_data = buf;</div><div class='ctx'> </div><div class='hunk'>@@ -403,21 +295,20 @@ static int ath11k_open_bcn_stats(struct inode *inode, struct file *file)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		req_param.vdev_id = arvif-&gt;vdev_id;</div><div class='del'>-		ret = ath11k_debugfs_fw_stats_request(ar, &amp;req_param);</div><div class='add'>+		ret = ath11k_mac_fw_stats_request(ar, &amp;req_param);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ath11k_warn(ar-&gt;ab, "failed to request fw bcn stats: %d\n", ret);</div><div class='ctx'> 			goto err_free;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_wmi_fw_stats_fill(ar, &amp;ar-&gt;debug.fw_stats, req_param.stats_id,</div><div class='del'>-				 buf);</div><div class='add'>+	ath11k_wmi_fw_stats_fill(ar, &amp;ar-&gt;fw_stats, req_param.stats_id, buf);</div><div class='ctx'> </div><div class='ctx'> 	/* since beacon stats request is looped for all active VDEVs, saved fw</div><div class='ctx'> 	 * stats is not freed for each request until done for all active VDEVs</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='del'>-	ath11k_fw_stats_bcn_free(&amp;ar-&gt;debug.fw_stats.bcn);</div><div class='add'>+	ath11k_fw_stats_bcn_free(&amp;ar-&gt;fw_stats.bcn);</div><div class='ctx'> 	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> </div><div class='ctx'> 	file-&gt;private_data = buf;</div><div class='hunk'>@@ -484,7 +375,7 @@ static ssize_t ath11k_write_simulate_fw_crash(struct file *file,</div><div class='ctx'> 	struct ath11k_base *ab = file-&gt;private_data;</div><div class='ctx'> 	struct ath11k_pdev *pdev;</div><div class='ctx'> 	struct ath11k *ar = ab-&gt;pdevs[0].ar;</div><div class='del'>-	char buf[32] = {0};</div><div class='add'>+	char buf[32] = {};</div><div class='ctx'> 	ssize_t rc;</div><div class='ctx'> 	int i, ret, radioup = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -518,6 +409,10 @@ static ssize_t ath11k_write_simulate_fw_crash(struct file *file,</div><div class='ctx'> 		ret = ath11k_wmi_force_fw_hang_cmd(ar,</div><div class='ctx'> 						   ATH11K_WMI_FW_HANG_ASSERT_TYPE,</div><div class='ctx'> 						   ATH11K_WMI_FW_HANG_DELAY);</div><div class='add'>+	} else if (!strcmp(buf, "hw-restart")) {</div><div class='add'>+		ath11k_info(ab, "user requested hw restart\n");</div><div class='add'>+		queue_work(ab-&gt;workqueue_aux, &amp;ab-&gt;reset_work);</div><div class='add'>+		ret = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto exit;</div><div class='hunk'>@@ -578,7 +473,7 @@ static ssize_t ath11k_read_enable_extd_tx_stats(struct file *file,</div><div class='ctx'> 						size_t count, loff_t *ppos)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='del'>-	char buf[32] = {0};</div><div class='add'>+	char buf[32] = {};</div><div class='ctx'> 	struct ath11k *ar = file-&gt;private_data;</div><div class='ctx'> 	int len = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -602,7 +497,7 @@ static ssize_t ath11k_write_extd_rx_stats(struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = file-&gt;private_data;</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='del'>-	struct htt_rx_ring_tlv_filter tlv_filter = {0};</div><div class='add'>+	struct htt_rx_ring_tlv_filter tlv_filter = {};</div><div class='ctx'> 	u32 enable, rx_filter = 0, ring_id;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -627,6 +522,12 @@ static ssize_t ath11k_write_extd_rx_stats(struct file *file,</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (test_bit(ATH11K_FLAG_MONITOR_STARTED, &amp;ar-&gt;monitor_flags)) {</div><div class='add'>+		ar-&gt;debug.extd_rx_stats = enable;</div><div class='add'>+		ret = count;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (enable) {</div><div class='ctx'> 		rx_filter =  HTT_RX_FILTER_TLV_FLAGS_MPDU_START;</div><div class='ctx'> 		rx_filter |= HTT_RX_FILTER_TLV_FLAGS_PPDU_START;</div><div class='hunk'>@@ -647,7 +548,7 @@ static ssize_t ath11k_write_extd_rx_stats(struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;debug.rx_filter = tlv_filter.rx_filter;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ab-&gt;hw_params.num_rxmda_per_pdev; i++) {</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.num_rxdma_per_pdev; i++) {</div><div class='ctx'> 		ring_id = ar-&gt;dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id;</div><div class='ctx'> 		ret = ath11k_dp_tx_htt_rx_filter_setup(ar-&gt;ab, ring_id, ar-&gt;dp.mac_id,</div><div class='ctx'> 						       HAL_RXDMA_MONITOR_STATUS,</div><div class='hunk'>@@ -806,7 +707,7 @@ static ssize_t ath11k_debugfs_dump_soc_dp_stats(struct file *file,</div><div class='ctx'> 	len += scnprintf(buf + len, size - len, "\nSOC TX STATS:\n");</div><div class='ctx'> 	len += scnprintf(buf + len, size - len, "\nTCL Ring Full Failures:\n");</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; DP_TCL_NUM_RING_MAX; i++)</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.max_tx_ring; i++)</div><div class='ctx'> 		len += scnprintf(buf + len, size - len, "ring%d: %u\n",</div><div class='ctx'> 				 i, soc_stats-&gt;tx_err.desc_na[i]);</div><div class='ctx'> </div><div class='hunk'>@@ -831,21 +732,141 @@ static const struct file_operations fops_soc_dp_stats = {</div><div class='ctx'> 	.llseek = default_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static ssize_t ath11k_write_fw_dbglog(struct file *file,</div><div class='add'>+				      const char __user *user_buf,</div><div class='add'>+				      size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = file-&gt;private_data;</div><div class='add'>+	char buf[128] = {};</div><div class='add'>+	struct ath11k_fw_dbglog dbglog;</div><div class='add'>+	unsigned int param, mod_id_index, is_end;</div><div class='add'>+	u64 value;</div><div class='add'>+	int ret, num;</div><div class='add'>+</div><div class='add'>+	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos,</div><div class='add'>+				     user_buf, count);</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	num = sscanf(buf, "%u %llx %u %u", &amp;param, &amp;value, &amp;mod_id_index, &amp;is_end);</div><div class='add'>+</div><div class='add'>+	if (num &lt; 2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+	if (param == WMI_DEBUG_LOG_PARAM_MOD_ENABLE_BITMAP ||</div><div class='add'>+	    param == WMI_DEBUG_LOG_PARAM_WOW_MOD_ENABLE_BITMAP) {</div><div class='add'>+		if (num != 4 || mod_id_index &gt; (MAX_MODULE_ID_BITMAP_WORDS - 1)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		ar-&gt;debug.module_id_bitmap[mod_id_index] = upper_32_bits(value);</div><div class='add'>+		if (!is_end) {</div><div class='add'>+			ret = count;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (num != 2) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dbglog.param = param;</div><div class='add'>+	dbglog.value = lower_32_bits(value);</div><div class='add'>+	ret = ath11k_wmi_fw_dbglog_cfg(ar, ar-&gt;debug.module_id_bitmap, &amp;dbglog);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "fw dbglog config failed from debugfs: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = count;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_fw_dbglog = {</div><div class='add'>+	.write = ath11k_write_fw_dbglog,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ath11k_open_sram_dump(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = inode-&gt;i_private;</div><div class='add'>+	u8 *buf;</div><div class='add'>+	u32 start, end;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	start = ab-&gt;hw_params.sram_dump.start;</div><div class='add'>+	end = ab-&gt;hw_params.sram_dump.end;</div><div class='add'>+</div><div class='add'>+	buf = vmalloc(end - start + 1);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_hif_read(ab, buf, start, end);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to dump sram: %d\n", ret);</div><div class='add'>+		vfree(buf);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	file-&gt;private_data = buf;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath11k_read_sram_dump(struct file *file,</div><div class='add'>+				     char __user *user_buf,</div><div class='add'>+				     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = file-&gt;f_inode-&gt;i_private;</div><div class='add'>+	const char *buf = file-&gt;private_data;</div><div class='add'>+	int len;</div><div class='add'>+	u32 start, end;</div><div class='add'>+</div><div class='add'>+	start = ab-&gt;hw_params.sram_dump.start;</div><div class='add'>+	end = ab-&gt;hw_params.sram_dump.end;</div><div class='add'>+	len = end - start + 1;</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_release_sram_dump(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	vfree(file-&gt;private_data);</div><div class='add'>+	file-&gt;private_data = NULL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_sram_dump = {</div><div class='add'>+	.open = ath11k_open_sram_dump,</div><div class='add'>+	.read = ath11k_read_sram_dump,</div><div class='add'>+	.release = ath11k_release_sram_dump,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int ath11k_debugfs_pdev_create(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	if (test_bit(ATH11K_FLAG_REGISTERED, &amp;ab-&gt;dev_flags))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ab-&gt;debugfs_soc = debugfs_create_dir(ab-&gt;hw_params.name, ab-&gt;debugfs_ath11k);</div><div class='del'>-	if (IS_ERR(ab-&gt;debugfs_soc))</div><div class='del'>-		return PTR_ERR(ab-&gt;debugfs_soc);</div><div class='del'>-</div><div class='ctx'> 	debugfs_create_file("simulate_fw_crash", 0600, ab-&gt;debugfs_soc, ab,</div><div class='ctx'> 			    &amp;fops_simulate_fw_crash);</div><div class='ctx'> </div><div class='del'>-	debugfs_create_file("soc_dp_stats", 0600, ab-&gt;debugfs_soc, ab,</div><div class='add'>+	debugfs_create_file("soc_dp_stats", 0400, ab-&gt;debugfs_soc, ab,</div><div class='ctx'> 			    &amp;fops_soc_dp_stats);</div><div class='ctx'> </div><div class='add'>+	if (ab-&gt;hw_params.sram_dump.start != 0)</div><div class='add'>+		debugfs_create_file("sram", 0400, ab-&gt;debugfs_soc, ab,</div><div class='add'>+				    &amp;fops_sram_dump);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -857,15 +878,51 @@ void ath11k_debugfs_pdev_destroy(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> int ath11k_debugfs_soc_create(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='del'>-	ab-&gt;debugfs_ath11k = debugfs_create_dir("ath11k", NULL);</div><div class='add'>+	struct dentry *root;</div><div class='add'>+	bool dput_needed;</div><div class='add'>+	char name[64];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	root = debugfs_lookup("ath11k", NULL);</div><div class='add'>+	if (!root) {</div><div class='add'>+		root = debugfs_create_dir("ath11k", NULL);</div><div class='add'>+		if (IS_ERR_OR_NULL(root))</div><div class='add'>+			return PTR_ERR(root);</div><div class='add'>+</div><div class='add'>+		dput_needed = false;</div><div class='add'>+	} else {</div><div class='add'>+		/* a dentry from lookup() needs dput() after we don't use it */</div><div class='add'>+		dput_needed = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	scnprintf(name, sizeof(name), "%s-%s", ath11k_bus_str(ab-&gt;hif.bus),</div><div class='add'>+		  dev_name(ab-&gt;dev));</div><div class='add'>+</div><div class='add'>+	ab-&gt;debugfs_soc = debugfs_create_dir(name, root);</div><div class='add'>+	if (IS_ERR_OR_NULL(ab-&gt;debugfs_soc)) {</div><div class='add'>+		ret = PTR_ERR(ab-&gt;debugfs_soc);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (dput_needed)</div><div class='add'>+		dput(root);</div><div class='ctx'> </div><div class='del'>-	return PTR_ERR_OR_ZERO(ab-&gt;debugfs_ath11k);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ath11k_debugfs_soc_destroy(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='del'>-	debugfs_remove_recursive(ab-&gt;debugfs_ath11k);</div><div class='del'>-	ab-&gt;debugfs_ath11k = NULL;</div><div class='add'>+	debugfs_remove_recursive(ab-&gt;debugfs_soc);</div><div class='add'>+	ab-&gt;debugfs_soc = NULL;</div><div class='add'>+</div><div class='add'>+	/* We are not removing ath11k directory on purpose, even if it</div><div class='add'>+	 * would be empty. This simplifies the directory handling and it's</div><div class='add'>+	 * a minor cosmetic issue to leave an empty ath11k directory to</div><div class='add'>+	 * debugfs.</div><div class='add'>+	 */</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ath11k_debugfs_soc_destroy);</div><div class='ctx'> </div><div class='hunk'>@@ -874,7 +931,7 @@ void ath11k_debugfs_fw_stats_init(struct ath11k *ar)</div><div class='ctx'> 	struct dentry *fwstats_dir = debugfs_create_dir("fw_stats",</div><div class='ctx'> 							ar-&gt;debug.debugfs_pdev);</div><div class='ctx'> </div><div class='del'>-	ar-&gt;debug.fw_stats.debugfs_fwstats = fwstats_dir;</div><div class='add'>+	ar-&gt;fw_stats.debugfs_fwstats = fwstats_dir;</div><div class='ctx'> </div><div class='ctx'> 	/* all stats debugfs files created are under "fw_stats" directory</div><div class='ctx'> 	 * created per PDEV</div><div class='hunk'>@@ -885,12 +942,6 @@ void ath11k_debugfs_fw_stats_init(struct ath11k *ar)</div><div class='ctx'> 			    &amp;fops_vdev_stats);</div><div class='ctx'> 	debugfs_create_file("beacon_stats", 0600, fwstats_dir, ar,</div><div class='ctx'> 			    &amp;fops_bcn_stats);</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;ar-&gt;debug.fw_stats.pdevs);</div><div class='del'>-	INIT_LIST_HEAD(&amp;ar-&gt;debug.fw_stats.vdevs);</div><div class='del'>-	INIT_LIST_HEAD(&amp;ar-&gt;debug.fw_stats.bcn);</div><div class='del'>-</div><div class='del'>-	init_completion(&amp;ar-&gt;debug.fw_stats_complete);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t ath11k_write_pktlog_filter(struct file *file,</div><div class='hunk'>@@ -899,10 +950,10 @@ static ssize_t ath11k_write_pktlog_filter(struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = file-&gt;private_data;</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='del'>-	struct htt_rx_ring_tlv_filter tlv_filter = {0};</div><div class='add'>+	struct htt_rx_ring_tlv_filter tlv_filter = {};</div><div class='ctx'> 	u32 rx_filter = 0, ring_id, filter, mode;</div><div class='del'>-	u8 buf[128] = {0};</div><div class='del'>-	int i, ret;</div><div class='add'>+	u8 buf[128] = {};</div><div class='add'>+	int i, ret, rx_buf_sz = 0;</div><div class='ctx'> 	ssize_t rc;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='hunk'>@@ -940,6 +991,17 @@ static ssize_t ath11k_write_pktlog_filter(struct file *file,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Clear rx filter set for monitor mode and rx status */</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.num_rxdma_per_pdev; i++) {</div><div class='add'>+		ring_id = ar-&gt;dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id;</div><div class='add'>+		ret = ath11k_dp_tx_htt_rx_filter_setup(ar-&gt;ab, ring_id, ar-&gt;dp.mac_id,</div><div class='add'>+						       HAL_RXDMA_MONITOR_STATUS,</div><div class='add'>+						       rx_buf_sz, &amp;tlv_filter);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to set rx filter for monitor status ring\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> #define HTT_RX_FILTER_TLV_LITE_MODE \</div><div class='ctx'> 			(HTT_RX_FILTER_TLV_FLAGS_PPDU_START | \</div><div class='ctx'> 			HTT_RX_FILTER_TLV_FLAGS_PPDU_END | \</div><div class='hunk'>@@ -955,6 +1017,7 @@ static ssize_t ath11k_write_pktlog_filter(struct file *file,</div><div class='ctx'> 			    HTT_RX_FILTER_TLV_FLAGS_MPDU_END |</div><div class='ctx'> 			    HTT_RX_FILTER_TLV_FLAGS_PACKET_HEADER |</div><div class='ctx'> 			    HTT_RX_FILTER_TLV_FLAGS_ATTENTION;</div><div class='add'>+		rx_buf_sz = DP_RX_BUFFER_SIZE;</div><div class='ctx'> 	} else if (mode == ATH11K_PKTLOG_MODE_LITE) {</div><div class='ctx'> 		ret = ath11k_dp_tx_htt_h2t_ppdu_stats_req(ar,</div><div class='ctx'> 							  HTT_PPDU_STATS_TAG_PKTLOG);</div><div class='hunk'>@@ -964,7 +1027,12 @@ static ssize_t ath11k_write_pktlog_filter(struct file *file,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		rx_filter = HTT_RX_FILTER_TLV_LITE_MODE;</div><div class='add'>+		rx_buf_sz = DP_RX_BUFFER_SIZE_LITE;</div><div class='ctx'> 	} else {</div><div class='add'>+		rx_buf_sz = DP_RX_BUFFER_SIZE;</div><div class='add'>+		tlv_filter = ath11k_mac_mon_status_filter_default;</div><div class='add'>+		rx_filter = tlv_filter.rx_filter;</div><div class='add'>+</div><div class='ctx'> 		ret = ath11k_dp_tx_htt_h2t_ppdu_stats_req(ar,</div><div class='ctx'> 							  HTT_PPDU_STATS_TAG_DEFAULT);</div><div class='ctx'> 		if (ret) {</div><div class='hunk'>@@ -983,12 +1051,12 @@ static ssize_t ath11k_write_pktlog_filter(struct file *file,</div><div class='ctx'> 					       HTT_RX_FP_DATA_FILTER_FLASG3;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ab-&gt;hw_params.num_rxmda_per_pdev; i++) {</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.num_rxdma_per_pdev; i++) {</div><div class='ctx'> 		ring_id = ar-&gt;dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id;</div><div class='ctx'> 		ret = ath11k_dp_tx_htt_rx_filter_setup(ab, ring_id,</div><div class='ctx'> 						       ar-&gt;dp.mac_id + i,</div><div class='ctx'> 						       HAL_RXDMA_MONITOR_STATUS,</div><div class='del'>-						       DP_RX_BUFFER_SIZE, &amp;tlv_filter);</div><div class='add'>+						       rx_buf_sz, &amp;tlv_filter);</div><div class='ctx'> </div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ath11k_warn(ab, "failed to set rx filter for monitor status ring\n");</div><div class='hunk'>@@ -996,8 +1064,8 @@ static ssize_t ath11k_write_pktlog_filter(struct file *file,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_WMI, "pktlog filter %d mode %s\n",</div><div class='del'>-		   filter, ((mode == ATH11K_PKTLOG_MODE_FULL) ? "full" : "lite"));</div><div class='add'>+	ath11k_info(ab, "pktlog mode %s\n",</div><div class='add'>+		    ((mode == ATH11K_PKTLOG_MODE_FULL) ? "full" : "lite"));</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;debug.pktlog_filter = filter;</div><div class='ctx'> 	ar-&gt;debug.pktlog_mode = mode;</div><div class='hunk'>@@ -1013,7 +1081,7 @@ static ssize_t ath11k_read_pktlog_filter(struct file *file,</div><div class='ctx'> 					 size_t count, loff_t *ppos)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='del'>-	char buf[32] = {0};</div><div class='add'>+	char buf[32] = {};</div><div class='ctx'> 	struct ath11k *ar = file-&gt;private_data;</div><div class='ctx'> 	int len = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1051,13 +1119,363 @@ static const struct file_operations fops_simulate_radar = {</div><div class='ctx'> 	.open = simple_open</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static ssize_t ath11k_debug_dump_dbr_entries(struct file *file,</div><div class='add'>+					     char __user *user_buf,</div><div class='add'>+					     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_dbg_dbr_data *dbr_dbg_data = file-&gt;private_data;</div><div class='add'>+	static const char * const event_id_to_string[] = {"empty", "Rx", "Replenish"};</div><div class='add'>+	int size = ATH11K_DEBUG_DBR_ENTRIES_MAX * 100;</div><div class='add'>+	char *buf;</div><div class='add'>+	int i, ret;</div><div class='add'>+	int len = 0;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len,</div><div class='add'>+			 "-----------------------------------------\n");</div><div class='add'>+	len += scnprintf(buf + len, size - len,</div><div class='add'>+			 "| idx |  hp  |  tp  | timestamp |  event |\n");</div><div class='add'>+	len += scnprintf(buf + len, size - len,</div><div class='add'>+			 "-----------------------------------------\n");</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dbr_dbg_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dbr_dbg_data-&gt;num_ring_debug_entries; i++) {</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='add'>+				 "|%4u|%8u|%8u|%11llu|%8s|\n", i,</div><div class='add'>+				 dbr_dbg_data-&gt;entries[i].hp,</div><div class='add'>+				 dbr_dbg_data-&gt;entries[i].tp,</div><div class='add'>+				 dbr_dbg_data-&gt;entries[i].timestamp,</div><div class='add'>+				 event_id_to_string[dbr_dbg_data-&gt;entries[i].event]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;dbr_dbg_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+	kfree(buf);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_debug_dump_dbr_entries = {</div><div class='add'>+	.read = ath11k_debug_dump_dbr_entries,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ath11k_debugfs_dbr_dbg_destroy(struct ath11k *ar, int dbr_id)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_debug_dbr *dbr_debug;</div><div class='add'>+	struct ath11k_dbg_dbr_data *dbr_dbg_data;</div><div class='add'>+</div><div class='add'>+	if (!ar-&gt;debug.dbr_debug[dbr_id])</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dbr_debug = ar-&gt;debug.dbr_debug[dbr_id];</div><div class='add'>+	dbr_dbg_data = &amp;dbr_debug-&gt;dbr_dbg_data;</div><div class='add'>+</div><div class='add'>+	debugfs_remove_recursive(dbr_debug-&gt;dbr_debugfs);</div><div class='add'>+	kfree(dbr_dbg_data-&gt;entries);</div><div class='add'>+	kfree(dbr_debug);</div><div class='add'>+	ar-&gt;debug.dbr_debug[dbr_id] = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_debugfs_dbr_dbg_init(struct ath11k *ar, int dbr_id)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_debug_dbr *dbr_debug;</div><div class='add'>+	struct ath11k_dbg_dbr_data *dbr_dbg_data;</div><div class='add'>+	static const char * const dbr_id_to_str[] = {"spectral", "CFR"};</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;debug.dbr_debug[dbr_id])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ar-&gt;debug.dbr_debug[dbr_id] = kzalloc(sizeof(*dbr_debug),</div><div class='add'>+					      GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!ar-&gt;debug.dbr_debug[dbr_id])</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dbr_debug = ar-&gt;debug.dbr_debug[dbr_id];</div><div class='add'>+	dbr_dbg_data = &amp;dbr_debug-&gt;dbr_dbg_data;</div><div class='add'>+</div><div class='add'>+	if (dbr_debug-&gt;dbr_debugfs)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dbr_debug-&gt;dbr_debugfs = debugfs_create_dir(dbr_id_to_str[dbr_id],</div><div class='add'>+						    ar-&gt;debug.debugfs_pdev);</div><div class='add'>+	if (IS_ERR_OR_NULL(dbr_debug-&gt;dbr_debugfs)) {</div><div class='add'>+		if (IS_ERR(dbr_debug-&gt;dbr_debugfs))</div><div class='add'>+			return PTR_ERR(dbr_debug-&gt;dbr_debugfs);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dbr_debug-&gt;dbr_debug_enabled = true;</div><div class='add'>+	dbr_dbg_data-&gt;num_ring_debug_entries = ATH11K_DEBUG_DBR_ENTRIES_MAX;</div><div class='add'>+	dbr_dbg_data-&gt;dbr_debug_idx = 0;</div><div class='add'>+	dbr_dbg_data-&gt;entries = kcalloc(ATH11K_DEBUG_DBR_ENTRIES_MAX,</div><div class='add'>+					sizeof(struct ath11k_dbg_dbr_entry),</div><div class='add'>+					GFP_KERNEL);</div><div class='add'>+	if (!dbr_dbg_data-&gt;entries)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;dbr_dbg_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("dump_dbr_debug", 0444, dbr_debug-&gt;dbr_debugfs,</div><div class='add'>+			    dbr_dbg_data, &amp;fops_debug_dump_dbr_entries);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath11k_debugfs_write_enable_dbr_dbg(struct file *file,</div><div class='add'>+						   const char __user *ubuf,</div><div class='add'>+						   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = file-&gt;private_data;</div><div class='add'>+	char buf[32] = {};</div><div class='add'>+	u32 dbr_id, enable;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;state != ATH11K_STATE_ON) {</div><div class='add'>+		ret = -ENETDOWN;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, ubuf, count);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	buf[ret] = '\0';</div><div class='add'>+	ret = sscanf(buf, "%u %u", &amp;dbr_id, &amp;enable);</div><div class='add'>+	if (ret != 2 || dbr_id &gt; 1 || enable &gt; 1) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "usage: echo &lt;dbr_id&gt; &lt;val&gt; dbr_id:0-Spectral 1-CFR val:0-disable 1-enable\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		ret = ath11k_debugfs_dbr_dbg_init(ar, dbr_id);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "db ring module debugfs init failed: %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		ath11k_debugfs_dbr_dbg_destroy(ar, dbr_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = count;</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_dbr_debug = {</div><div class='add'>+	.write = ath11k_debugfs_write_enable_dbr_dbg,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t ath11k_write_ps_timekeeper_enable(struct file *file,</div><div class='add'>+						 const char __user *user_buf,</div><div class='add'>+						 size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = file-&gt;private_data;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	u8 ps_timekeeper_enable;</div><div class='add'>+</div><div class='add'>+	if (kstrtou8_from_user(user_buf, count, 0, &amp;ps_timekeeper_enable))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;state != ATH11K_STATE_ON) {</div><div class='add'>+		ret = -ENETDOWN;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ar-&gt;ps_state_enable) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;ps_timekeeper_enable = !!ps_timekeeper_enable;</div><div class='add'>+	ret = count;</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath11k_read_ps_timekeeper_enable(struct file *file,</div><div class='add'>+						char __user *user_buf,</div><div class='add'>+						size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = file-&gt;private_data;</div><div class='add'>+	char buf[32];</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+	len = scnprintf(buf, sizeof(buf), "%d\n", ar-&gt;ps_timekeeper_enable);</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_ps_timekeeper_enable = {</div><div class='add'>+	.read = ath11k_read_ps_timekeeper_enable,</div><div class='add'>+	.write = ath11k_write_ps_timekeeper_enable,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ath11k_reset_peer_ps_duration(void *data,</div><div class='add'>+					  struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = data;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	arsta-&gt;ps_total_duration = 0;</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath11k_write_reset_ps_duration(struct file *file,</div><div class='add'>+					      const  char __user *user_buf,</div><div class='add'>+					      size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = file-&gt;private_data;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 reset_ps_duration;</div><div class='add'>+</div><div class='add'>+	if (kstrtou8_from_user(user_buf, count, 0, &amp;reset_ps_duration))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;state != ATH11K_STATE_ON) {</div><div class='add'>+		ret = -ENETDOWN;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ar-&gt;ps_state_enable) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_stations_atomic(ar-&gt;hw,</div><div class='add'>+					  ath11k_reset_peer_ps_duration,</div><div class='add'>+					  ar);</div><div class='add'>+</div><div class='add'>+	ret = count;</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_reset_ps_duration = {</div><div class='add'>+	.write = ath11k_write_reset_ps_duration,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ath11k_peer_ps_state_disable(void *data,</div><div class='add'>+					 struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = data;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	arsta-&gt;peer_ps_state = WMI_PEER_PS_STATE_DISABLED;</div><div class='add'>+	arsta-&gt;ps_start_time = 0;</div><div class='add'>+	arsta-&gt;ps_total_duration = 0;</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath11k_write_ps_state_enable(struct file *file,</div><div class='add'>+					    const char __user *user_buf,</div><div class='add'>+					    size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = file-&gt;private_data;</div><div class='add'>+	struct ath11k_pdev *pdev = ar-&gt;pdev;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 param;</div><div class='add'>+	u8 ps_state_enable;</div><div class='add'>+</div><div class='add'>+	if (kstrtou8_from_user(user_buf, count, 0, &amp;ps_state_enable))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	ps_state_enable = !!ps_state_enable;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;ps_state_enable == ps_state_enable) {</div><div class='add'>+		ret = count;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	param = WMI_PDEV_PEER_STA_PS_STATECHG_ENABLE;</div><div class='add'>+	ret = ath11k_wmi_pdev_set_param(ar, param, ps_state_enable, pdev-&gt;pdev_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to enable ps_state_enable: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	ar-&gt;ps_state_enable = ps_state_enable;</div><div class='add'>+</div><div class='add'>+	if (!ar-&gt;ps_state_enable) {</div><div class='add'>+		ar-&gt;ps_timekeeper_enable = false;</div><div class='add'>+		ieee80211_iterate_stations_atomic(ar-&gt;hw,</div><div class='add'>+						  ath11k_peer_ps_state_disable,</div><div class='add'>+						  ar);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = count;</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath11k_read_ps_state_enable(struct file *file,</div><div class='add'>+					   char __user *user_buf,</div><div class='add'>+					   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = file-&gt;private_data;</div><div class='add'>+	char buf[32];</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+	len = scnprintf(buf, sizeof(buf), "%d\n", ar-&gt;ps_state_enable);</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_ps_state_enable = {</div><div class='add'>+	.read = ath11k_read_ps_state_enable,</div><div class='add'>+	.write = ath11k_write_ps_state_enable,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int ath11k_debugfs_register(struct ath11k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='del'>-	char pdev_name[5];</div><div class='del'>-	char buf[100] = {0};</div><div class='add'>+	char pdev_name[10];</div><div class='add'>+	char buf[100] = {};</div><div class='ctx'> </div><div class='del'>-	snprintf(pdev_name, sizeof(pdev_name), "%s%d", "mac", ar-&gt;pdev_idx);</div><div class='add'>+	snprintf(pdev_name, sizeof(pdev_name), "%s%u", "mac", ar-&gt;pdev_idx);</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;debug.debugfs_pdev = debugfs_create_dir(pdev_name, ab-&gt;debugfs_soc);</div><div class='ctx'> 	if (IS_ERR(ar-&gt;debug.debugfs_pdev))</div><div class='hunk'>@@ -1080,6 +1498,9 @@ int ath11k_debugfs_register(struct ath11k *ar)</div><div class='ctx'> 	debugfs_create_file("pktlog_filter", 0644,</div><div class='ctx'> 			    ar-&gt;debug.debugfs_pdev, ar,</div><div class='ctx'> 			    &amp;fops_pktlog_filter);</div><div class='add'>+	debugfs_create_file("fw_dbglog_config", 0600,</div><div class='add'>+			    ar-&gt;debug.debugfs_pdev, ar,</div><div class='add'>+			    &amp;fops_fw_dbglog);</div><div class='ctx'> </div><div class='ctx'> 	if (ar-&gt;hw-&gt;wiphy-&gt;bands[NL80211_BAND_5GHZ]) {</div><div class='ctx'> 		debugfs_create_file("dfs_simulate_radar", 0200,</div><div class='hunk'>@@ -1090,9 +1511,293 @@ int ath11k_debugfs_register(struct ath11k *ar)</div><div class='ctx'> 				    &amp;ar-&gt;dfs_block_radar_events);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (ab-&gt;hw_params.dbr_debug_support)</div><div class='add'>+		debugfs_create_file("enable_dbr_debug", 0200, ar-&gt;debug.debugfs_pdev,</div><div class='add'>+				    ar, &amp;fops_dbr_debug);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("ps_state_enable", 0600, ar-&gt;debug.debugfs_pdev, ar,</div><div class='add'>+			    &amp;fops_ps_state_enable);</div><div class='add'>+</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_PEER_POWER_SAVE_DURATION_SUPPORT,</div><div class='add'>+		     ar-&gt;ab-&gt;wmi_ab.svc_map)) {</div><div class='add'>+		debugfs_create_file("ps_timekeeper_enable", 0600,</div><div class='add'>+				    ar-&gt;debug.debugfs_pdev, ar,</div><div class='add'>+				    &amp;fops_ps_timekeeper_enable);</div><div class='add'>+</div><div class='add'>+		debugfs_create_file("reset_ps_duration", 0200,</div><div class='add'>+				    ar-&gt;debug.debugfs_pdev, ar,</div><div class='add'>+				    &amp;fops_reset_ps_duration);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ath11k_debugfs_unregister(struct ath11k *ar)</div><div class='ctx'> {</div><div class='add'>+	struct ath11k_debug_dbr *dbr_debug;</div><div class='add'>+	struct ath11k_dbg_dbr_data *dbr_dbg_data;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WMI_DIRECT_BUF_MAX; i++) {</div><div class='add'>+		dbr_debug = ar-&gt;debug.dbr_debug[i];</div><div class='add'>+		if (!dbr_debug)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dbr_dbg_data = &amp;dbr_debug-&gt;dbr_dbg_data;</div><div class='add'>+		kfree(dbr_dbg_data-&gt;entries);</div><div class='add'>+		debugfs_remove_recursive(dbr_debug-&gt;dbr_debugfs);</div><div class='add'>+		kfree(dbr_debug);</div><div class='add'>+		ar-&gt;debug.dbr_debug[i] = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath11k_write_twt_add_dialog(struct file *file,</div><div class='add'>+					   const char __user *ubuf,</div><div class='add'>+					   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_vif *arvif = file-&gt;private_data;</div><div class='add'>+	struct wmi_twt_add_dialog_params params = {};</div><div class='add'>+	struct wmi_twt_enable_params twt_params = {};</div><div class='add'>+	struct ath11k *ar = arvif-&gt;ar;</div><div class='add'>+	u8 buf[128] = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;twt_enabled == 0) {</div><div class='add'>+		ath11k_err(ar-&gt;ab, "twt support is not enabled\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, ubuf, count);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	buf[ret] = '\0';</div><div class='add'>+	ret = sscanf(buf,</div><div class='add'>+		     "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %u %u %u %u %u %hhu %hhu %hhu %hhu %hhu",</div><div class='add'>+		     &amp;params.peer_macaddr[0],</div><div class='add'>+		     &amp;params.peer_macaddr[1],</div><div class='add'>+		     &amp;params.peer_macaddr[2],</div><div class='add'>+		     &amp;params.peer_macaddr[3],</div><div class='add'>+		     &amp;params.peer_macaddr[4],</div><div class='add'>+		     &amp;params.peer_macaddr[5],</div><div class='add'>+		     &amp;params.dialog_id,</div><div class='add'>+		     &amp;params.wake_intvl_us,</div><div class='add'>+		     &amp;params.wake_intvl_mantis,</div><div class='add'>+		     &amp;params.wake_dura_us,</div><div class='add'>+		     &amp;params.sp_offset_us,</div><div class='add'>+		     &amp;params.twt_cmd,</div><div class='add'>+		     &amp;params.flag_bcast,</div><div class='add'>+		     &amp;params.flag_trigger,</div><div class='add'>+		     &amp;params.flag_flow_type,</div><div class='add'>+		     &amp;params.flag_protection);</div><div class='add'>+	if (ret != 16)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* In the case of station vif, TWT is entirely handled by</div><div class='add'>+	 * the firmware based on the input parameters in the TWT enable</div><div class='add'>+	 * WMI command that is sent to the target during assoc.</div><div class='add'>+	 * For manually testing the TWT feature, we need to first disable</div><div class='add'>+	 * TWT and send enable command again with TWT input parameter</div><div class='add'>+	 * sta_cong_timer_ms set to 0.</div><div class='add'>+	 */</div><div class='add'>+	if (arvif-&gt;vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='add'>+		ath11k_wmi_send_twt_disable_cmd(ar, ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+</div><div class='add'>+		ath11k_wmi_fill_default_twt_params(&amp;twt_params);</div><div class='add'>+		twt_params.sta_cong_timer_ms = 0;</div><div class='add'>+</div><div class='add'>+		ath11k_wmi_send_twt_enable_cmd(ar, ar-&gt;pdev-&gt;pdev_id, &amp;twt_params);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	params.vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_send_twt_add_dialog_cmd(arvif-&gt;ar, &amp;params);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_twt_add_dialog;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+</div><div class='add'>+err_twt_add_dialog:</div><div class='add'>+	if (arvif-&gt;vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='add'>+		ath11k_wmi_send_twt_disable_cmd(ar, ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+		ath11k_wmi_fill_default_twt_params(&amp;twt_params);</div><div class='add'>+		ath11k_wmi_send_twt_enable_cmd(ar, ar-&gt;pdev-&gt;pdev_id, &amp;twt_params);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath11k_write_twt_del_dialog(struct file *file,</div><div class='add'>+					   const char __user *ubuf,</div><div class='add'>+					   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_vif *arvif = file-&gt;private_data;</div><div class='add'>+	struct wmi_twt_del_dialog_params params = {};</div><div class='add'>+	struct wmi_twt_enable_params twt_params = {};</div><div class='add'>+	struct ath11k *ar = arvif-&gt;ar;</div><div class='add'>+	u8 buf[64] = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;twt_enabled == 0) {</div><div class='add'>+		ath11k_err(ar-&gt;ab, "twt support is not enabled\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, ubuf, count);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	buf[ret] = '\0';</div><div class='add'>+	ret = sscanf(buf, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %u",</div><div class='add'>+		     &amp;params.peer_macaddr[0],</div><div class='add'>+		     &amp;params.peer_macaddr[1],</div><div class='add'>+		     &amp;params.peer_macaddr[2],</div><div class='add'>+		     &amp;params.peer_macaddr[3],</div><div class='add'>+		     &amp;params.peer_macaddr[4],</div><div class='add'>+		     &amp;params.peer_macaddr[5],</div><div class='add'>+		     &amp;params.dialog_id);</div><div class='add'>+	if (ret != 7)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	params.vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_send_twt_del_dialog_cmd(arvif-&gt;ar, &amp;params);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='add'>+		ath11k_wmi_send_twt_disable_cmd(ar, ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+		ath11k_wmi_fill_default_twt_params(&amp;twt_params);</div><div class='add'>+		ath11k_wmi_send_twt_enable_cmd(ar, ar-&gt;pdev-&gt;pdev_id, &amp;twt_params);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath11k_write_twt_pause_dialog(struct file *file,</div><div class='add'>+					     const char __user *ubuf,</div><div class='add'>+					     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_vif *arvif = file-&gt;private_data;</div><div class='add'>+	struct wmi_twt_pause_dialog_params params = {};</div><div class='add'>+	u8 buf[64] = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;ar-&gt;twt_enabled == 0) {</div><div class='add'>+		ath11k_err(arvif-&gt;ar-&gt;ab, "twt support is not enabled\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, ubuf, count);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	buf[ret] = '\0';</div><div class='add'>+	ret = sscanf(buf, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %u",</div><div class='add'>+		     &amp;params.peer_macaddr[0],</div><div class='add'>+		     &amp;params.peer_macaddr[1],</div><div class='add'>+		     &amp;params.peer_macaddr[2],</div><div class='add'>+		     &amp;params.peer_macaddr[3],</div><div class='add'>+		     &amp;params.peer_macaddr[4],</div><div class='add'>+		     &amp;params.peer_macaddr[5],</div><div class='add'>+		     &amp;params.dialog_id);</div><div class='add'>+	if (ret != 7)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	params.vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_send_twt_pause_dialog_cmd(arvif-&gt;ar, &amp;params);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath11k_write_twt_resume_dialog(struct file *file,</div><div class='add'>+					      const char __user *ubuf,</div><div class='add'>+					      size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_vif *arvif = file-&gt;private_data;</div><div class='add'>+	struct wmi_twt_resume_dialog_params params = {};</div><div class='add'>+	u8 buf[64] = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;ar-&gt;twt_enabled == 0) {</div><div class='add'>+		ath11k_err(arvif-&gt;ar-&gt;ab, "twt support is not enabled\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, ubuf, count);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	buf[ret] = '\0';</div><div class='add'>+	ret = sscanf(buf, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %u %u %u",</div><div class='add'>+		     &amp;params.peer_macaddr[0],</div><div class='add'>+		     &amp;params.peer_macaddr[1],</div><div class='add'>+		     &amp;params.peer_macaddr[2],</div><div class='add'>+		     &amp;params.peer_macaddr[3],</div><div class='add'>+		     &amp;params.peer_macaddr[4],</div><div class='add'>+		     &amp;params.peer_macaddr[5],</div><div class='add'>+		     &amp;params.dialog_id,</div><div class='add'>+		     &amp;params.sp_offset_us,</div><div class='add'>+		     &amp;params.next_twt_size);</div><div class='add'>+	if (ret != 9)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	params.vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_send_twt_resume_dialog_cmd(arvif-&gt;ar, &amp;params);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations ath11k_fops_twt_add_dialog = {</div><div class='add'>+	.write = ath11k_write_twt_add_dialog,</div><div class='add'>+	.open = simple_open</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations ath11k_fops_twt_del_dialog = {</div><div class='add'>+	.write = ath11k_write_twt_del_dialog,</div><div class='add'>+	.open = simple_open</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations ath11k_fops_twt_pause_dialog = {</div><div class='add'>+	.write = ath11k_write_twt_pause_dialog,</div><div class='add'>+	.open = simple_open</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations ath11k_fops_twt_resume_dialog = {</div><div class='add'>+	.write = ath11k_write_twt_resume_dialog,</div><div class='add'>+	.open = simple_open</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath11k_debugfs_op_vif_add(struct ieee80211_hw *hw,</div><div class='add'>+			       struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='add'>+	struct ath11k_base *ab = arvif-&gt;ar-&gt;ab;</div><div class='add'>+	struct dentry *debugfs_twt;</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;vif-&gt;type != NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+	    !(arvif-&gt;vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+	      test_bit(WMI_TLV_SERVICE_STA_TWT, ab-&gt;wmi_ab.svc_map)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	debugfs_twt = debugfs_create_dir("twt",</div><div class='add'>+					 arvif-&gt;vif-&gt;debugfs_dir);</div><div class='add'>+	debugfs_create_file("add_dialog", 0200, debugfs_twt,</div><div class='add'>+			    arvif, &amp;ath11k_fops_twt_add_dialog);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("del_dialog", 0200, debugfs_twt,</div><div class='add'>+			    arvif, &amp;ath11k_fops_twt_del_dialog);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("pause_dialog", 0200, debugfs_twt,</div><div class='add'>+			    arvif, &amp;ath11k_fops_twt_pause_dialog);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("resume_dialog", 0200, debugfs_twt,</div><div class='add'>+			    arvif, &amp;ath11k_fops_twt_resume_dialog);</div><div class='ctx'> }</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/debugfs.h b/drivers/net/wireless/ath/ath11k/debugfs.h<br/>index e5346af71f24..ed7fec177588 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/debugfs.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/debugfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/debugfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/debugfs.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2022, 2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _ATH11K_DEBUGFS_H_</div><div class='hunk'>@@ -38,11 +39,45 @@ enum ath11k_dbg_htt_ext_stats_type {</div><div class='ctx'> 	ATH11K_DBG_HTT_EXT_STATS_TX_SOUNDING_INFO           =  22,</div><div class='ctx'> 	ATH11K_DBG_HTT_EXT_STATS_PDEV_OBSS_PD_STATS	    =  23,</div><div class='ctx'> 	ATH11K_DBG_HTT_EXT_STATS_RING_BACKPRESSURE_STATS    =  24,</div><div class='add'>+	ATH11K_DBG_HTT_EXT_STATS_PEER_CTRL_PATH_TXRX_STATS  =  29,</div><div class='add'>+	ATH11K_DBG_HTT_EXT_STATS_PDEV_TX_RATE_TXBF_STATS    =  31,</div><div class='add'>+	ATH11K_DBG_HTT_EXT_STATS_TXBF_OFDMA		    =  32,</div><div class='add'>+	ATH11K_DBG_HTT_EXT_PHY_COUNTERS_AND_PHY_STATS	    =  37,</div><div class='ctx'> </div><div class='ctx'> 	/* keep this last */</div><div class='ctx'> 	ATH11K_DBG_HTT_NUM_EXT_STATS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define ATH11K_DEBUG_DBR_ENTRIES_MAX 512</div><div class='add'>+</div><div class='add'>+enum ath11k_dbg_dbr_event {</div><div class='add'>+	ATH11K_DBG_DBR_EVENT_INVALID,</div><div class='add'>+	ATH11K_DBG_DBR_EVENT_RX,</div><div class='add'>+	ATH11K_DBG_DBR_EVENT_REPLENISH,</div><div class='add'>+	ATH11K_DBG_DBR_EVENT_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath11k_dbg_dbr_entry {</div><div class='add'>+	u32 hp;</div><div class='add'>+	u32 tp;</div><div class='add'>+	u64 timestamp;</div><div class='add'>+	enum ath11k_dbg_dbr_event event;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath11k_dbg_dbr_data {</div><div class='add'>+	/* protects ath11k_db_ring_debug data */</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	struct ath11k_dbg_dbr_entry *entries;</div><div class='add'>+	u32 dbr_debug_idx;</div><div class='add'>+	u32 num_ring_debug_entries;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath11k_debug_dbr {</div><div class='add'>+	struct ath11k_dbg_dbr_data dbr_dbg_data;</div><div class='add'>+	struct dentry *dbr_debugfs;</div><div class='add'>+	bool dbr_debug_enabled;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct debug_htt_stats_req {</div><div class='ctx'> 	bool done;</div><div class='ctx'> 	u8 pdev_id;</div><div class='hunk'>@@ -84,6 +119,7 @@ enum ath11k_pktlog_mode {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ath11k_pktlog_enum {</div><div class='add'>+	ATH11K_PKTLOG_TYPE_INVALID      = 0,</div><div class='ctx'> 	ATH11K_PKTLOG_TYPE_TX_CTRL      = 1,</div><div class='ctx'> 	ATH11K_PKTLOG_TYPE_TX_STAT      = 2,</div><div class='ctx'> 	ATH11K_PKTLOG_TYPE_TX_MSDU_ID   = 3,</div><div class='hunk'>@@ -103,6 +139,130 @@ enum ath11k_dbg_aggr_mode {</div><div class='ctx'> 	ATH11K_DBG_AGGR_MODE_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum fw_dbglog_wlan_module_id {</div><div class='add'>+	WLAN_MODULE_ID_MIN = 0,</div><div class='add'>+	WLAN_MODULE_INF = WLAN_MODULE_ID_MIN,</div><div class='add'>+	WLAN_MODULE_WMI,</div><div class='add'>+	WLAN_MODULE_STA_PWRSAVE,</div><div class='add'>+	WLAN_MODULE_WHAL,</div><div class='add'>+	WLAN_MODULE_COEX,</div><div class='add'>+	WLAN_MODULE_ROAM,</div><div class='add'>+	WLAN_MODULE_RESMGR_CHAN_MANAGER,</div><div class='add'>+	WLAN_MODULE_RESMGR,</div><div class='add'>+	WLAN_MODULE_VDEV_MGR,</div><div class='add'>+	WLAN_MODULE_SCAN,</div><div class='add'>+	WLAN_MODULE_RATECTRL,</div><div class='add'>+	WLAN_MODULE_AP_PWRSAVE,</div><div class='add'>+	WLAN_MODULE_BLOCKACK,</div><div class='add'>+	WLAN_MODULE_MGMT_TXRX,</div><div class='add'>+	WLAN_MODULE_DATA_TXRX,</div><div class='add'>+	WLAN_MODULE_HTT,</div><div class='add'>+	WLAN_MODULE_HOST,</div><div class='add'>+	WLAN_MODULE_BEACON,</div><div class='add'>+	WLAN_MODULE_OFFLOAD,</div><div class='add'>+	WLAN_MODULE_WAL,</div><div class='add'>+	WLAN_WAL_MODULE_DE,</div><div class='add'>+	WLAN_MODULE_PCIELP,</div><div class='add'>+	WLAN_MODULE_RTT,</div><div class='add'>+	WLAN_MODULE_RESOURCE,</div><div class='add'>+	WLAN_MODULE_DCS,</div><div class='add'>+	WLAN_MODULE_CACHEMGR,</div><div class='add'>+	WLAN_MODULE_ANI,</div><div class='add'>+	WLAN_MODULE_P2P,</div><div class='add'>+	WLAN_MODULE_CSA,</div><div class='add'>+	WLAN_MODULE_NLO,</div><div class='add'>+	WLAN_MODULE_CHATTER,</div><div class='add'>+	WLAN_MODULE_WOW,</div><div class='add'>+	WLAN_MODULE_WAL_VDEV,</div><div class='add'>+	WLAN_MODULE_WAL_PDEV,</div><div class='add'>+	WLAN_MODULE_TEST,</div><div class='add'>+	WLAN_MODULE_STA_SMPS,</div><div class='add'>+	WLAN_MODULE_SWBMISS,</div><div class='add'>+	WLAN_MODULE_WMMAC,</div><div class='add'>+	WLAN_MODULE_TDLS,</div><div class='add'>+	WLAN_MODULE_HB,</div><div class='add'>+	WLAN_MODULE_TXBF,</div><div class='add'>+	WLAN_MODULE_BATCH_SCAN,</div><div class='add'>+	WLAN_MODULE_THERMAL_MGR,</div><div class='add'>+	WLAN_MODULE_PHYERR_DFS,</div><div class='add'>+	WLAN_MODULE_RMC,</div><div class='add'>+	WLAN_MODULE_STATS,</div><div class='add'>+	WLAN_MODULE_NAN,</div><div class='add'>+	WLAN_MODULE_IBSS_PWRSAVE,</div><div class='add'>+	WLAN_MODULE_HIF_UART,</div><div class='add'>+	WLAN_MODULE_LPI,</div><div class='add'>+	WLAN_MODULE_EXTSCAN,</div><div class='add'>+	WLAN_MODULE_UNIT_TEST,</div><div class='add'>+	WLAN_MODULE_MLME,</div><div class='add'>+	WLAN_MODULE_SUPPL,</div><div class='add'>+	WLAN_MODULE_ERE,</div><div class='add'>+	WLAN_MODULE_OCB,</div><div class='add'>+	WLAN_MODULE_RSSI_MONITOR,</div><div class='add'>+	WLAN_MODULE_WPM,</div><div class='add'>+	WLAN_MODULE_CSS,</div><div class='add'>+	WLAN_MODULE_PPS,</div><div class='add'>+	WLAN_MODULE_SCAN_CH_PREDICT,</div><div class='add'>+	WLAN_MODULE_MAWC,</div><div class='add'>+	WLAN_MODULE_CMC_QMIC,</div><div class='add'>+	WLAN_MODULE_EGAP,</div><div class='add'>+	WLAN_MODULE_NAN20,</div><div class='add'>+	WLAN_MODULE_QBOOST,</div><div class='add'>+	WLAN_MODULE_P2P_LISTEN_OFFLOAD,</div><div class='add'>+	WLAN_MODULE_HALPHY,</div><div class='add'>+	WLAN_WAL_MODULE_ENQ,</div><div class='add'>+	WLAN_MODULE_GNSS,</div><div class='add'>+	WLAN_MODULE_WAL_MEM,</div><div class='add'>+	WLAN_MODULE_SCHED_ALGO,</div><div class='add'>+	WLAN_MODULE_TX,</div><div class='add'>+	WLAN_MODULE_RX,</div><div class='add'>+	WLAN_MODULE_WLM,</div><div class='add'>+	WLAN_MODULE_RU_ALLOCATOR,</div><div class='add'>+	WLAN_MODULE_11K_OFFLOAD,</div><div class='add'>+	WLAN_MODULE_STA_TWT,</div><div class='add'>+	WLAN_MODULE_AP_TWT,</div><div class='add'>+	WLAN_MODULE_UL_OFDMA,</div><div class='add'>+	WLAN_MODULE_HPCS_PULSE,</div><div class='add'>+	WLAN_MODULE_DTF,</div><div class='add'>+	WLAN_MODULE_QUIET_IE,</div><div class='add'>+	WLAN_MODULE_SHMEM_MGR,</div><div class='add'>+	WLAN_MODULE_CFIR,</div><div class='add'>+	WLAN_MODULE_CODE_COVER,</div><div class='add'>+	WLAN_MODULE_SHO,</div><div class='add'>+	WLAN_MODULE_MLO_MGR,</div><div class='add'>+	WLAN_MODULE_PEER_INIT,</div><div class='add'>+	WLAN_MODULE_STA_MLO_PS,</div><div class='add'>+</div><div class='add'>+	WLAN_MODULE_ID_MAX,</div><div class='add'>+	WLAN_MODULE_ID_INVALID = WLAN_MODULE_ID_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum fw_dbglog_log_level {</div><div class='add'>+	ATH11K_FW_DBGLOG_ML = 0,</div><div class='add'>+	ATH11K_FW_DBGLOG_VERBOSE = 0,</div><div class='add'>+	ATH11K_FW_DBGLOG_INFO,</div><div class='add'>+	ATH11K_FW_DBGLOG_INFO_LVL_1,</div><div class='add'>+	ATH11K_FW_DBGLOG_INFO_LVL_2,</div><div class='add'>+	ATH11K_FW_DBGLOG_WARN,</div><div class='add'>+	ATH11K_FW_DBGLOG_ERR,</div><div class='add'>+	ATH11K_FW_DBGLOG_LVL_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath11k_fw_dbglog {</div><div class='add'>+	enum wmi_debug_log_param param;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			/* log_level values are given in enum fw_dbglog_log_level */</div><div class='add'>+			u16 log_level;</div><div class='add'>+			/* module_id values are given in  enum fw_dbglog_wlan_module_id */</div><div class='add'>+			u16 module_id;</div><div class='add'>+		};</div><div class='add'>+		/* value is either log_level&amp;module_id/vdev_id/vdev_id_bitmap/log_level</div><div class='add'>+		 * according to param</div><div class='add'>+		 */</div><div class='add'>+		u32 value;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_ATH11K_DEBUGFS</div><div class='ctx'> int ath11k_debugfs_soc_create(struct ath11k_base *ab);</div><div class='ctx'> void ath11k_debugfs_soc_destroy(struct ath11k_base *ab);</div><div class='hunk'>@@ -110,7 +270,7 @@ int ath11k_debugfs_pdev_create(struct ath11k_base *ab);</div><div class='ctx'> void ath11k_debugfs_pdev_destroy(struct ath11k_base *ab);</div><div class='ctx'> int ath11k_debugfs_register(struct ath11k *ar);</div><div class='ctx'> void ath11k_debugfs_unregister(struct ath11k *ar);</div><div class='del'>-void ath11k_debugfs_fw_stats_process(struct ath11k_base *ab, struct sk_buff *skb);</div><div class='add'>+void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats *stats);</div><div class='ctx'> </div><div class='ctx'> void ath11k_debugfs_fw_stats_init(struct ath11k *ar);</div><div class='ctx'> </div><div class='hunk'>@@ -145,6 +305,13 @@ static inline int ath11k_debugfs_rx_filter(struct ath11k *ar)</div><div class='ctx'> 	return ar-&gt;debug.rx_filter;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void ath11k_debugfs_op_vif_add(struct ieee80211_hw *hw,</div><div class='add'>+			       struct ieee80211_vif *vif);</div><div class='add'>+void ath11k_debugfs_add_dbring_entry(struct ath11k *ar,</div><div class='add'>+				     enum wmi_direct_buffer_module id,</div><div class='add'>+				     enum ath11k_dbg_dbr_event event,</div><div class='add'>+				     struct hal_srng *srng);</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> static inline int ath11k_debugfs_soc_create(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='hunk'>@@ -173,8 +340,8 @@ static inline void ath11k_debugfs_unregister(struct ath11k *ar)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ath11k_debugfs_fw_stats_process(struct ath11k_base *ab,</div><div class='del'>-						   struct sk_buff *skb)</div><div class='add'>+static inline void ath11k_debugfs_fw_stats_process(struct ath11k *ar,</div><div class='add'>+						   struct ath11k_fw_stats *stats)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -212,6 +379,13 @@ static inline int ath11k_debugfs_rx_filter(struct ath11k *ar)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_MAC80211_DEBUGFS*/</div><div class='add'>+static inline void</div><div class='add'>+ath11k_debugfs_add_dbring_entry(struct ath11k *ar,</div><div class='add'>+				enum wmi_direct_buffer_module id,</div><div class='add'>+				enum ath11k_dbg_dbr_event event,</div><div class='add'>+				struct hal_srng *srng)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_ATH11K_DEBUGFS*/</div><div class='ctx'> </div><div class='ctx'> #endif /* _ATH11K_DEBUGFS_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/debugfs_htt_stats.c b/drivers/net/wireless/ath/ath11k/debugfs_htt_stats.c<br/>index ec93f14e6d2a..11d28c42227e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/debugfs_htt_stats.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/debugfs_htt_stats.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/debugfs_htt_stats.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/debugfs_htt_stats.c</a></div><div class='hunk'>@@ -1,6 +1,8 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='hunk'>@@ -10,23 +12,28 @@</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> #include "debugfs_htt_stats.h"</div><div class='ctx'> </div><div class='del'>-#define HTT_DBG_OUT(buf, len, fmt, ...) \</div><div class='del'>-			scnprintf(buf, len, fmt "\n", ##__VA_ARGS__)</div><div class='del'>-</div><div class='del'>-#define HTT_MAX_STRING_LEN 256</div><div class='ctx'> #define HTT_MAX_PRINT_CHAR_PER_ELEM 15</div><div class='ctx'> </div><div class='ctx'> #define HTT_TLV_HDR_LEN 4</div><div class='ctx'> </div><div class='del'>-#define ARRAY_TO_STRING(out, arr, len)							\</div><div class='add'>+#define PRINT_ARRAY_TO_BUF(out, buflen, arr, str, len, newline)				\</div><div class='ctx'> 	do {										\</div><div class='del'>-		int index = 0; u8 i;							\</div><div class='add'>+		int index = 0; u8 i; const char *str_val = str;				\</div><div class='add'>+		const char *new_line = newline;						\</div><div class='add'>+		if (str_val) {								\</div><div class='add'>+			index += scnprintf((out + buflen),				\</div><div class='add'>+				 (ATH11K_HTT_STATS_BUF_SIZE - buflen),			\</div><div class='add'>+				 "%s = ", str_val);					\</div><div class='add'>+		}									\</div><div class='ctx'> 		for (i = 0; i &lt; len; i++) {						\</div><div class='del'>-			index += scnprintf(out + index, HTT_MAX_STRING_LEN - index,	\</div><div class='del'>-					  " %u:%u,", i, arr[i]);			\</div><div class='del'>-			if (index &lt; 0 || index &gt;= HTT_MAX_STRING_LEN)			\</div><div class='del'>-				break;							\</div><div class='add'>+			index += scnprintf((out + buflen) + index,			\</div><div class='add'>+				 (ATH11K_HTT_STATS_BUF_SIZE - buflen) - index,		\</div><div class='add'>+				 " %u:%u,", i, arr[i]);					\</div><div class='ctx'> 		}									\</div><div class='add'>+		index += scnprintf((out + buflen) + index,				\</div><div class='add'>+			 (ATH11K_HTT_STATS_BUF_SIZE - buflen) - index,			\</div><div class='add'>+			  "%s", new_line);						\</div><div class='add'>+		buflen += index;							\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> static inline void htt_print_stats_string_tlv(const void *tag_buf,</div><div class='hunk'>@@ -38,22 +45,20 @@ static inline void htt_print_stats_string_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> 	u8  i;</div><div class='del'>-	u16 index = 0;</div><div class='del'>-	char data[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> </div><div class='ctx'> 	tag_len = tag_len &gt;&gt; 2;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_STATS_STRING_TLV:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_STATS_STRING_TLV:\n");</div><div class='ctx'> </div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "data = ");</div><div class='ctx'> 	for (i = 0; i &lt; tag_len; i++) {</div><div class='del'>-		index += scnprintf(&amp;data[index],</div><div class='del'>-				HTT_MAX_STRING_LEN - index,</div><div class='del'>-				"%.*s", 4, (char *)&amp;(htt_stats_buf-&gt;data[i]));</div><div class='del'>-		if (index &gt;= HTT_MAX_STRING_LEN)</div><div class='del'>-			break;</div><div class='add'>+		len += scnprintf(buf + len,</div><div class='add'>+				 buf_len - len,</div><div class='add'>+				 "%.*s", 4, (char *)&amp;(htt_stats_buf-&gt;data[i]));</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "data = %s\n", data);</div><div class='add'>+	/* New lines are added for better display */</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -71,107 +76,107 @@ static inline void htt_print_tx_pdev_stats_cmn_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_PDEV_STATS_CMN_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mac_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mac_id__word &amp; 0xFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "hw_queued = %u",</div><div class='del'>-			   htt_stats_buf-&gt;hw_queued);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "hw_reaped = %u",</div><div class='del'>-			   htt_stats_buf-&gt;hw_reaped);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "underrun = %u",</div><div class='del'>-			   htt_stats_buf-&gt;underrun);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "hw_paused = %u",</div><div class='del'>-			   htt_stats_buf-&gt;hw_paused);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "hw_flush = %u",</div><div class='del'>-			   htt_stats_buf-&gt;hw_flush);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "hw_filt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;hw_filt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_abort = %u",</div><div class='del'>-			   htt_stats_buf-&gt;tx_abort);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdu_requeued = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdu_requed);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_xretry = %u",</div><div class='del'>-			   htt_stats_buf-&gt;tx_xretry);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "data_rc = %u",</div><div class='del'>-			   htt_stats_buf-&gt;data_rc);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdu_dropped_xretry = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdu_dropped_xretry);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "illegal_rate_phy_err = %u",</div><div class='del'>-			   htt_stats_buf-&gt;illgl_rate_phy_err);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "cont_xretry = %u",</div><div class='del'>-			   htt_stats_buf-&gt;cont_xretry);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_timeout = %u",</div><div class='del'>-			   htt_stats_buf-&gt;tx_timeout);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "pdev_resets = %u",</div><div class='del'>-			   htt_stats_buf-&gt;pdev_resets);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "phy_underrun = %u",</div><div class='del'>-			   htt_stats_buf-&gt;phy_underrun);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "txop_ovf = %u",</div><div class='del'>-			   htt_stats_buf-&gt;txop_ovf);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "seq_posted = %u",</div><div class='del'>-			   htt_stats_buf-&gt;seq_posted);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "seq_failed_queueing = %u",</div><div class='del'>-			   htt_stats_buf-&gt;seq_failed_queueing);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "seq_completed = %u",</div><div class='del'>-			   htt_stats_buf-&gt;seq_completed);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "seq_restarted = %u",</div><div class='del'>-			   htt_stats_buf-&gt;seq_restarted);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mu_seq_posted = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mu_seq_posted);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "seq_switch_hw_paused = %u",</div><div class='del'>-			   htt_stats_buf-&gt;seq_switch_hw_paused);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "next_seq_posted_dsr = %u",</div><div class='del'>-			   htt_stats_buf-&gt;next_seq_posted_dsr);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "seq_posted_isr = %u",</div><div class='del'>-			   htt_stats_buf-&gt;seq_posted_isr);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "seq_ctrl_cached = %u",</div><div class='del'>-			   htt_stats_buf-&gt;seq_ctrl_cached);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdu_count_tqm = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdu_count_tqm);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "msdu_count_tqm = %u",</div><div class='del'>-			   htt_stats_buf-&gt;msdu_count_tqm);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdu_removed_tqm = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdu_removed_tqm);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "msdu_removed_tqm = %u",</div><div class='del'>-			   htt_stats_buf-&gt;msdu_removed_tqm);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdus_sw_flush = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdus_sw_flush);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdus_hw_filter = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdus_hw_filter);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdus_truncated = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdus_truncated);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdus_ack_failed = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdus_ack_failed);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdus_expired = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdus_expired);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdus_seq_hw_retry = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdus_seq_hw_retry);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ack_tlv_proc = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ack_tlv_proc);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "coex_abort_mpdu_cnt_valid = %u",</div><div class='del'>-			   htt_stats_buf-&gt;coex_abort_mpdu_cnt_valid);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "coex_abort_mpdu_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;coex_abort_mpdu_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_total_ppdus_tried_ota = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_total_ppdus_tried_ota);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_data_ppdus_tried_ota = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_data_ppdus_tried_ota);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "local_ctrl_mgmt_enqued = %u",</div><div class='del'>-			   htt_stats_buf-&gt;local_ctrl_mgmt_enqued);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "local_ctrl_mgmt_freed = %u",</div><div class='del'>-			   htt_stats_buf-&gt;local_ctrl_mgmt_freed);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "local_data_enqued = %u",</div><div class='del'>-			   htt_stats_buf-&gt;local_data_enqued);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "local_data_freed = %u",</div><div class='del'>-			   htt_stats_buf-&gt;local_data_freed);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdu_tried = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdu_tried);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "isr_wait_seq_posted = %u",</div><div class='del'>-			   htt_stats_buf-&gt;isr_wait_seq_posted);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_active_dur_us_low = %u",</div><div class='del'>-			   htt_stats_buf-&gt;tx_active_dur_us_low);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_active_dur_us_high = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;tx_active_dur_us_high);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_PDEV_STATS_CMN_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf-&gt;mac_id__word));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hw_queued = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;hw_queued);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hw_reaped = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;hw_reaped);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "underrun = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;underrun);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hw_paused = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;hw_paused);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hw_flush = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;hw_flush);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hw_filt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;hw_filt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_abort = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;tx_abort);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_requeued = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdu_requeued);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_xretry = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;tx_xretry);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "data_rc = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;data_rc);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_dropped_xretry = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdu_dropped_xretry);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "illegal_rate_phy_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;illgl_rate_phy_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "cont_xretry = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;cont_xretry);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_timeout = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;tx_timeout);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pdev_resets = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;pdev_resets);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_underrun = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;phy_underrun);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "txop_ovf = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;txop_ovf);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "seq_posted = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;seq_posted);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "seq_failed_queueing = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;seq_failed_queueing);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "seq_completed = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;seq_completed);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "seq_restarted = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;seq_restarted);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mu_seq_posted = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mu_seq_posted);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "seq_switch_hw_paused = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;seq_switch_hw_paused);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "next_seq_posted_dsr = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;next_seq_posted_dsr);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "seq_posted_isr = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;seq_posted_isr);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "seq_ctrl_cached = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;seq_ctrl_cached);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_count_tqm = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdu_count_tqm);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "msdu_count_tqm = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;msdu_count_tqm);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_removed_tqm = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdu_removed_tqm);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "msdu_removed_tqm = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;msdu_removed_tqm);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdus_sw_flush = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdus_sw_flush);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdus_hw_filter = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdus_hw_filter);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdus_truncated = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdus_truncated);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdus_ack_failed = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdus_ack_failed);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdus_expired = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdus_expired);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdus_seq_hw_retry = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdus_seq_hw_retry);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ack_tlv_proc = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ack_tlv_proc);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "coex_abort_mpdu_cnt_valid = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;coex_abort_mpdu_cnt_valid);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "coex_abort_mpdu_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;coex_abort_mpdu_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_total_ppdus_tried_ota = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_total_ppdus_tried_ota);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_data_ppdus_tried_ota = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_data_ppdus_tried_ota);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "local_ctrl_mgmt_enqued = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;local_ctrl_mgmt_enqued);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "local_ctrl_mgmt_freed = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;local_ctrl_mgmt_freed);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "local_data_enqued = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;local_data_enqued);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "local_data_freed = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;local_data_freed);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_tried = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdu_tried);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "isr_wait_seq_posted = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;isr_wait_seq_posted);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_active_dur_us_low = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;tx_active_dur_us_low);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_active_dur_us_high = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;tx_active_dur_us_high);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -190,13 +195,12 @@ htt_print_tx_pdev_stats_urrn_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char urrn_stats[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> 	u16 num_elems = min_t(u16, (tag_len &gt;&gt; 2), HTT_TX_PDEV_MAX_URRN_STATS);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_PDEV_STATS_URRN_TLV_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_PDEV_STATS_URRN_TLV_V:\n");</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(urrn_stats, htt_stats_buf-&gt;urrn_stats, num_elems);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "urrn_stats = %s\n", urrn_stats);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;urrn_stats, "urrn_stats",</div><div class='add'>+			   num_elems, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -215,13 +219,12 @@ htt_print_tx_pdev_stats_flush_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char flush_errs[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> 	u16 num_elems = min_t(u16, (tag_len &gt;&gt; 2), HTT_TX_PDEV_MAX_FLUSH_REASON_STATS);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_PDEV_STATS_FLUSH_TLV_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_PDEV_STATS_FLUSH_TLV_V:\n");</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(flush_errs, htt_stats_buf-&gt;flush_errs, num_elems);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "flush_errs = %s\n", flush_errs);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;flush_errs, "flush_errs",</div><div class='add'>+			   num_elems, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -240,14 +243,12 @@ htt_print_tx_pdev_stats_sifs_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char sifs_status[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> 	u16 num_elems = min_t(u16, (tag_len &gt;&gt; 2), HTT_TX_PDEV_MAX_SIFS_BURST_STATS);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_PDEV_STATS_SIFS_TLV_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_PDEV_STATS_SIFS_TLV_V:\n");</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(sifs_status, htt_stats_buf-&gt;sifs_status, num_elems);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sifs_status = %s\n",</div><div class='del'>-			   sifs_status);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;sifs_status, "sifs_status",</div><div class='add'>+			   num_elems, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -266,13 +267,12 @@ htt_print_tx_pdev_stats_phy_err_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char phy_errs[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> 	u16 num_elems = min_t(u16, (tag_len &gt;&gt; 2), HTT_TX_PDEV_MAX_PHY_ERR_STATS);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_PDEV_STATS_PHY_ERR_TLV_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_PDEV_STATS_PHY_ERR_TLV_V:\n");</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(phy_errs, htt_stats_buf-&gt;phy_errs, num_elems);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "phy_errs = %s\n", phy_errs);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;phy_errs, "phy_errs",</div><div class='add'>+			   num_elems, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -291,15 +291,13 @@ htt_print_tx_pdev_stats_sifs_hist_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char sifs_hist_status[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> 	u16 num_elems = min_t(u16, (tag_len &gt;&gt; 2), HTT_TX_PDEV_MAX_SIFS_BURST_HIST_STATS);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_TX_PDEV_STATS_SIFS_HIST_TLV_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_PDEV_STATS_SIFS_HIST_TLV_V:\n");</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(sifs_hist_status, htt_stats_buf-&gt;sifs_hist_status, num_elems);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sifs_hist_status = %s\n",</div><div class='del'>-			   sifs_hist_status);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;sifs_hist_status,</div><div class='add'>+			   "sifs_hist_status", num_elems, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -318,23 +316,23 @@ htt_print_tx_pdev_stats_tx_ppdu_stats_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_TX_PDEV_STATS_TX_PPDU_STATS_TLV_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_PDEV_STATS_TX_PPDU_STATS_TLV_V:\n");</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_data_ppdus_legacy_su = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_data_ppdus_legacy_su);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_data_ppdus_legacy_su = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_data_ppdus_legacy_su);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_data_ppdus_ac_su = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_data_ppdus_ac_su);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_data_ppdus_ac_su = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_data_ppdus_ac_su);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_data_ppdus_ax_su = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_data_ppdus_ax_su);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_data_ppdus_ax_su = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_data_ppdus_ax_su);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_data_ppdus_ac_su_txbf = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_data_ppdus_ac_su_txbf);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_data_ppdus_ac_su_txbf = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_data_ppdus_ac_su_txbf);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_data_ppdus_ax_su_txbf = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;num_data_ppdus_ax_su_txbf);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_data_ppdus_ax_su_txbf = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_data_ppdus_ax_su_txbf);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -353,25 +351,15 @@ htt_print_tx_pdev_stats_tried_mpdu_cnt_hist_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char tried_mpdu_cnt_hist[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> 	u32  num_elements = ((tag_len - sizeof(htt_stats_buf-&gt;hist_bin_size)) &gt;&gt; 2);</div><div class='del'>-	u32  required_buffer_size = HTT_MAX_PRINT_CHAR_PER_ELEM * num_elements;</div><div class='del'>-</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_TX_PDEV_STATS_TRIED_MPDU_CNT_HIST_TLV_V:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "TRIED_MPDU_CNT_HIST_BIN_SIZE : %u",</div><div class='del'>-			   htt_stats_buf-&gt;hist_bin_size);</div><div class='del'>-</div><div class='del'>-	if (required_buffer_size &lt; HTT_MAX_STRING_LEN) {</div><div class='del'>-		ARRAY_TO_STRING(tried_mpdu_cnt_hist,</div><div class='del'>-				htt_stats_buf-&gt;tried_mpdu_cnt_hist,</div><div class='del'>-				num_elements);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len, "tried_mpdu_cnt_hist = %s\n",</div><div class='del'>-				   tried_mpdu_cnt_hist);</div><div class='del'>-	} else {</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "INSUFFICIENT PRINT BUFFER\n");</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_PDEV_STATS_TRIED_MPDU_CNT_HIST_TLV_V:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "TRIED_MPDU_CNT_HIST_BIN_SIZE : %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;hist_bin_size);</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;tried_mpdu_cnt_hist,</div><div class='add'>+			   "tried_mpdu_cnt_hist", num_elements, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -388,16 +376,16 @@ static inline void htt_print_hw_stats_intr_misc_tlv(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char hw_intr_name[HTT_STATS_MAX_HW_INTR_NAME_LEN + 1] = {0};</div><div class='add'>+	char hw_intr_name[HTT_STATS_MAX_HW_INTR_NAME_LEN + 1] = {};</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_HW_STATS_INTR_MISC_TLV:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_HW_STATS_INTR_MISC_TLV:\n");</div><div class='ctx'> 	memcpy(hw_intr_name, &amp;(htt_stats_buf-&gt;hw_intr_name[0]),</div><div class='ctx'> 	       HTT_STATS_MAX_HW_INTR_NAME_LEN);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "hw_intr_name = %s ", hw_intr_name);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mask = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mask);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "count = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hw_intr_name = %s\n", hw_intr_name);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mask = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mask);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "count = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;count);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -415,15 +403,15 @@ htt_print_hw_stats_wd_timeout_tlv(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char hw_module_name[HTT_STATS_MAX_HW_MODULE_NAME_LEN + 1] = {0};</div><div class='add'>+	char hw_module_name[HTT_STATS_MAX_HW_MODULE_NAME_LEN + 1] = {};</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_HW_STATS_WD_TIMEOUT_TLV:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_HW_STATS_WD_TIMEOUT_TLV:\n");</div><div class='ctx'> 	memcpy(hw_module_name, &amp;(htt_stats_buf-&gt;hw_module_name[0]),</div><div class='ctx'> 	       HTT_STATS_MAX_HW_MODULE_NAME_LEN);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "hw_module_name = %s ",</div><div class='del'>-			   hw_module_name);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "count = %u",</div><div class='del'>-			   htt_stats_buf-&gt;count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hw_module_name = %s\n",</div><div class='add'>+			 hw_module_name);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;count);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -441,29 +429,29 @@ static inline void htt_print_hw_stats_pdev_errs_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_HW_STATS_PDEV_ERRS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mac_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mac_id__word &amp; 0xFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_abort = %u",</div><div class='del'>-			   htt_stats_buf-&gt;tx_abort);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_abort_fail_count = %u",</div><div class='del'>-			   htt_stats_buf-&gt;tx_abort_fail_count);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_abort = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rx_abort);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_abort_fail_count = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rx_abort_fail_count);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "warm_reset = %u",</div><div class='del'>-			   htt_stats_buf-&gt;warm_reset);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "cold_reset = %u",</div><div class='del'>-			   htt_stats_buf-&gt;cold_reset);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_flush = %u",</div><div class='del'>-			   htt_stats_buf-&gt;tx_flush);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_glb_reset = %u",</div><div class='del'>-			   htt_stats_buf-&gt;tx_glb_reset);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_txq_reset = %u",</div><div class='del'>-			   htt_stats_buf-&gt;tx_txq_reset);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_timeout_reset = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;rx_timeout_reset);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_HW_STATS_PDEV_ERRS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf-&gt;mac_id__word));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_abort = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;tx_abort);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_abort_fail_count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;tx_abort_fail_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_abort = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_abort);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_abort_fail_count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_abort_fail_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "warm_reset = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;warm_reset);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "cold_reset = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;cold_reset);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_flush = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;tx_flush);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_glb_reset = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;tx_glb_reset);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_txq_reset = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;tx_txq_reset);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_timeout_reset = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_timeout_reset);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -481,35 +469,36 @@ static inline void htt_print_msdu_flow_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_MSDU_FLOW_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "last_update_timestamp = %u",</div><div class='del'>-			   htt_stats_buf-&gt;last_update_timestamp);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "last_add_timestamp = %u",</div><div class='del'>-			   htt_stats_buf-&gt;last_add_timestamp);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "last_remove_timestamp = %u",</div><div class='del'>-			   htt_stats_buf-&gt;last_remove_timestamp);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "total_processed_msdu_count = %u",</div><div class='del'>-			   htt_stats_buf-&gt;total_processed_msdu_count);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "cur_msdu_count_in_flowq = %u",</div><div class='del'>-			   htt_stats_buf-&gt;cur_msdu_count_in_flowq);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sw_peer_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;sw_peer_id);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_flow_no = %u",</div><div class='del'>-			   htt_stats_buf-&gt;tx_flow_no__tid_num__drop_rule &amp; 0xFFFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tid_num = %u",</div><div class='del'>-			   (htt_stats_buf-&gt;tx_flow_no__tid_num__drop_rule &amp; 0xF0000) &gt;&gt;</div><div class='del'>-			   16);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "drop_rule = %u",</div><div class='del'>-			   (htt_stats_buf-&gt;tx_flow_no__tid_num__drop_rule &amp; 0x100000) &gt;&gt;</div><div class='del'>-			   20);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "last_cycle_enqueue_count = %u",</div><div class='del'>-			   htt_stats_buf-&gt;last_cycle_enqueue_count);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "last_cycle_dequeue_count = %u",</div><div class='del'>-			   htt_stats_buf-&gt;last_cycle_dequeue_count);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "last_cycle_drop_count = %u",</div><div class='del'>-			   htt_stats_buf-&gt;last_cycle_drop_count);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "current_drop_th = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;current_drop_th);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_MSDU_FLOW_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "last_update_timestamp = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;last_update_timestamp);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "last_add_timestamp = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;last_add_timestamp);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "last_remove_timestamp = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;last_remove_timestamp);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "total_processed_msdu_count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;total_processed_msdu_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "cur_msdu_count_in_flowq = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;cur_msdu_count_in_flowq);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sw_peer_id = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;sw_peer_id);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_flow_no = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_MSDU_FLOW_STATS_TX_FLOW_NO,</div><div class='add'>+				   htt_stats_buf-&gt;tx_flow_no__tid_num__drop_rule));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tid_num = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_MSDU_FLOW_STATS_TID_NUM,</div><div class='add'>+				   htt_stats_buf-&gt;tx_flow_no__tid_num__drop_rule));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "drop_rule = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_MSDU_FLOW_STATS_DROP_RULE,</div><div class='add'>+				   htt_stats_buf-&gt;tx_flow_no__tid_num__drop_rule));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "last_cycle_enqueue_count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;last_cycle_enqueue_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "last_cycle_dequeue_count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;last_cycle_dequeue_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "last_cycle_drop_count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;last_cycle_drop_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "current_drop_th = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;current_drop_th);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -526,40 +515,43 @@ static inline void htt_print_tx_tid_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char tid_name[MAX_HTT_TID_NAME + 1] = {0};</div><div class='add'>+	char tid_name[MAX_HTT_TID_NAME + 1] = {};</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_TID_STATS_TLV:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_TID_STATS_TLV:\n");</div><div class='ctx'> 	memcpy(tid_name, &amp;(htt_stats_buf-&gt;tid_name[0]), MAX_HTT_TID_NAME);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tid_name = %s ", tid_name);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sw_peer_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;sw_peer_id__tid_num &amp; 0xFFFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tid_num = %u",</div><div class='del'>-			   (htt_stats_buf-&gt;sw_peer_id__tid_num &amp; 0xFFFF0000) &gt;&gt; 16);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_sched_pending = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_sched_pending__num_ppdu_in_hwq &amp; 0xFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_ppdu_in_hwq = %u",</div><div class='del'>-			   (htt_stats_buf-&gt;num_sched_pending__num_ppdu_in_hwq &amp;</div><div class='del'>-			   0xFF00) &gt;&gt; 8);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tid_flags = 0x%x",</div><div class='del'>-			   htt_stats_buf-&gt;tid_flags);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "hw_queued = %u",</div><div class='del'>-			   htt_stats_buf-&gt;hw_queued);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "hw_reaped = %u",</div><div class='del'>-			   htt_stats_buf-&gt;hw_reaped);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdus_hw_filter = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdus_hw_filter);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "qdepth_bytes = %u",</div><div class='del'>-			   htt_stats_buf-&gt;qdepth_bytes);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "qdepth_num_msdu = %u",</div><div class='del'>-			   htt_stats_buf-&gt;qdepth_num_msdu);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "qdepth_num_mpdu = %u",</div><div class='del'>-			   htt_stats_buf-&gt;qdepth_num_mpdu);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "last_scheduled_tsmp = %u",</div><div class='del'>-			   htt_stats_buf-&gt;last_scheduled_tsmp);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "pause_module_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;pause_module_id);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "block_module_id = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;block_module_id);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tid_name = %s\n", tid_name);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sw_peer_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_TX_TID_STATS_SW_PEER_ID,</div><div class='add'>+				   htt_stats_buf-&gt;sw_peer_id__tid_num));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tid_num = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_TX_TID_STATS_TID_NUM,</div><div class='add'>+				   htt_stats_buf-&gt;sw_peer_id__tid_num));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_sched_pending = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_TX_TID_STATS_NUM_SCHED_PENDING,</div><div class='add'>+				   htt_stats_buf-&gt;num_sched_pending__num_ppdu_in_hwq));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_ppdu_in_hwq = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_TX_TID_STATS_NUM_PPDU_IN_HWQ,</div><div class='add'>+				   htt_stats_buf-&gt;num_sched_pending__num_ppdu_in_hwq));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tid_flags = 0x%x\n",</div><div class='add'>+			 htt_stats_buf-&gt;tid_flags);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hw_queued = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;hw_queued);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hw_reaped = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;hw_reaped);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdus_hw_filter = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdus_hw_filter);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "qdepth_bytes = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;qdepth_bytes);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "qdepth_num_msdu = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;qdepth_num_msdu);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "qdepth_num_mpdu = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;qdepth_num_mpdu);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "last_scheduled_tsmp = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;last_scheduled_tsmp);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pause_module_id = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;pause_module_id);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "block_module_id = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;block_module_id);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -576,44 +568,47 @@ static inline void htt_print_tx_tid_stats_v1_tlv(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char tid_name[MAX_HTT_TID_NAME + 1] = {0};</div><div class='add'>+	char tid_name[MAX_HTT_TID_NAME + 1] = {};</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_TID_STATS_V1_TLV:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_TID_STATS_V1_TLV:\n");</div><div class='ctx'> 	memcpy(tid_name, &amp;(htt_stats_buf-&gt;tid_name[0]), MAX_HTT_TID_NAME);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tid_name = %s ", tid_name);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sw_peer_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;sw_peer_id__tid_num &amp; 0xFFFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tid_num = %u",</div><div class='del'>-			   (htt_stats_buf-&gt;sw_peer_id__tid_num &amp; 0xFFFF0000) &gt;&gt; 16);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_sched_pending = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_sched_pending__num_ppdu_in_hwq &amp; 0xFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_ppdu_in_hwq = %u",</div><div class='del'>-			   (htt_stats_buf-&gt;num_sched_pending__num_ppdu_in_hwq &amp;</div><div class='del'>-			   0xFF00) &gt;&gt; 8);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tid_flags = 0x%x",</div><div class='del'>-			   htt_stats_buf-&gt;tid_flags);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "max_qdepth_bytes = %u",</div><div class='del'>-			   htt_stats_buf-&gt;max_qdepth_bytes);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "max_qdepth_n_msdus = %u",</div><div class='del'>-			   htt_stats_buf-&gt;max_qdepth_n_msdus);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rsvd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rsvd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "qdepth_bytes = %u",</div><div class='del'>-			   htt_stats_buf-&gt;qdepth_bytes);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "qdepth_num_msdu = %u",</div><div class='del'>-			   htt_stats_buf-&gt;qdepth_num_msdu);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "qdepth_num_mpdu = %u",</div><div class='del'>-			   htt_stats_buf-&gt;qdepth_num_mpdu);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "last_scheduled_tsmp = %u",</div><div class='del'>-			   htt_stats_buf-&gt;last_scheduled_tsmp);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "pause_module_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;pause_module_id);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "block_module_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;block_module_id);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "allow_n_flags = 0x%x",</div><div class='del'>-			   htt_stats_buf-&gt;allow_n_flags);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sendn_frms_allowed = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;sendn_frms_allowed);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tid_name = %s\n", tid_name);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sw_peer_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_TX_TID_STATS_V1_SW_PEER_ID,</div><div class='add'>+				   htt_stats_buf-&gt;sw_peer_id__tid_num));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tid_num = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_TX_TID_STATS_V1_TID_NUM,</div><div class='add'>+				   htt_stats_buf-&gt;sw_peer_id__tid_num));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_sched_pending = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_TX_TID_STATS_V1_NUM_SCHED_PENDING,</div><div class='add'>+				   htt_stats_buf-&gt;num_sched_pending__num_ppdu_in_hwq));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_ppdu_in_hwq = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_TX_TID_STATS_V1_NUM_PPDU_IN_HWQ,</div><div class='add'>+				   htt_stats_buf-&gt;num_sched_pending__num_ppdu_in_hwq));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tid_flags = 0x%x\n",</div><div class='add'>+			 htt_stats_buf-&gt;tid_flags);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "max_qdepth_bytes = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;max_qdepth_bytes);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "max_qdepth_n_msdus = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;max_qdepth_n_msdus);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rsvd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rsvd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "qdepth_bytes = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;qdepth_bytes);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "qdepth_num_msdu = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;qdepth_num_msdu);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "qdepth_num_mpdu = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;qdepth_num_mpdu);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "last_scheduled_tsmp = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;last_scheduled_tsmp);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pause_module_id = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;pause_module_id);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "block_module_id = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;block_module_id);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "allow_n_flags = 0x%x\n",</div><div class='add'>+			 htt_stats_buf-&gt;allow_n_flags);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sendn_frms_allowed = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;sendn_frms_allowed);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -630,23 +625,25 @@ static inline void htt_print_rx_tid_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char tid_name[MAX_HTT_TID_NAME + 1] = {0};</div><div class='del'>-</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_RX_TID_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sw_peer_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;sw_peer_id__tid_num &amp; 0xFFFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tid_num = %u",</div><div class='del'>-			   (htt_stats_buf-&gt;sw_peer_id__tid_num &amp; 0xFFFF0000) &gt;&gt; 16);</div><div class='add'>+	char tid_name[MAX_HTT_TID_NAME + 1] = {};</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_RX_TID_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sw_peer_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_RX_TID_STATS_SW_PEER_ID,</div><div class='add'>+				   htt_stats_buf-&gt;sw_peer_id__tid_num));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tid_num = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_RX_TID_STATS_TID_NUM,</div><div class='add'>+				   htt_stats_buf-&gt;sw_peer_id__tid_num));</div><div class='ctx'> 	memcpy(tid_name, &amp;(htt_stats_buf-&gt;tid_name[0]), MAX_HTT_TID_NAME);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tid_name = %s ", tid_name);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "dup_in_reorder = %u",</div><div class='del'>-			   htt_stats_buf-&gt;dup_in_reorder);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "dup_past_outside_window = %u",</div><div class='del'>-			   htt_stats_buf-&gt;dup_past_outside_window);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "dup_past_within_window = %u",</div><div class='del'>-			   htt_stats_buf-&gt;dup_past_within_window);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rxdesc_err_decrypt = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;rxdesc_err_decrypt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tid_name = %s\n", tid_name);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "dup_in_reorder = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;dup_in_reorder);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "dup_past_outside_window = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;dup_past_outside_window);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "dup_past_within_window = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;dup_past_within_window);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rxdesc_err_decrypt = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;rxdesc_err_decrypt);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -663,16 +660,14 @@ static inline void htt_print_counter_tlv(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char counter_name[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_COUNTER_TLV:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_COUNTER_TLV:\n");</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(counter_name,</div><div class='del'>-			htt_stats_buf-&gt;counter_name,</div><div class='del'>-			HTT_MAX_COUNTER_NAME);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "counter_name = %s ", counter_name);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "count = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;count);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;counter_name,</div><div class='add'>+			   "counter_name",</div><div class='add'>+			   HTT_MAX_COUNTER_NAME, "\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "count = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;count);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -690,35 +685,35 @@ static inline void htt_print_peer_stats_cmn_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_PEER_STATS_CMN_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ppdu_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ppdu_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdu_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdu_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "msdu_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;msdu_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "pause_bitmap = %u",</div><div class='del'>-			   htt_stats_buf-&gt;pause_bitmap);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "block_bitmap = %u",</div><div class='del'>-			   htt_stats_buf-&gt;block_bitmap);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "last_rssi = %d",</div><div class='del'>-			   htt_stats_buf-&gt;rssi);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "enqueued_count = %llu",</div><div class='del'>-			   htt_stats_buf-&gt;peer_enqueued_count_low |</div><div class='del'>-			   ((u64)htt_stats_buf-&gt;peer_enqueued_count_high &lt;&lt; 32));</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "dequeued_count = %llu",</div><div class='del'>-			   htt_stats_buf-&gt;peer_dequeued_count_low |</div><div class='del'>-			   ((u64)htt_stats_buf-&gt;peer_dequeued_count_high &lt;&lt; 32));</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "dropped_count = %llu",</div><div class='del'>-			   htt_stats_buf-&gt;peer_dropped_count_low |</div><div class='del'>-			   ((u64)htt_stats_buf-&gt;peer_dropped_count_high &lt;&lt; 32));</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "transmitted_ppdu_bytes = %llu",</div><div class='del'>-			   htt_stats_buf-&gt;ppdu_transmitted_bytes_low |</div><div class='del'>-			   ((u64)htt_stats_buf-&gt;ppdu_transmitted_bytes_high &lt;&lt; 32));</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ttl_removed_count = %u",</div><div class='del'>-			   htt_stats_buf-&gt;peer_ttl_removed_count);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "inactive_time = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;inactive_time);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_PEER_STATS_CMN_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ppdu_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ppdu_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdu_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "msdu_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;msdu_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pause_bitmap = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;pause_bitmap);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "block_bitmap = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;block_bitmap);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "last_rssi = %d\n",</div><div class='add'>+			 htt_stats_buf-&gt;rssi);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "enqueued_count = %llu\n",</div><div class='add'>+			 htt_stats_buf-&gt;peer_enqueued_count_low |</div><div class='add'>+			 ((u64)htt_stats_buf-&gt;peer_enqueued_count_high &lt;&lt; 32));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "dequeued_count = %llu\n",</div><div class='add'>+			 htt_stats_buf-&gt;peer_dequeued_count_low |</div><div class='add'>+			 ((u64)htt_stats_buf-&gt;peer_dequeued_count_high &lt;&lt; 32));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "dropped_count = %llu\n",</div><div class='add'>+			 htt_stats_buf-&gt;peer_dropped_count_low |</div><div class='add'>+			 ((u64)htt_stats_buf-&gt;peer_dropped_count_high &lt;&lt; 32));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "transmitted_ppdu_bytes = %llu\n",</div><div class='add'>+			 htt_stats_buf-&gt;ppdu_transmitted_bytes_low |</div><div class='add'>+			 ((u64)htt_stats_buf-&gt;ppdu_transmitted_bytes_high &lt;&lt; 32));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ttl_removed_count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;peer_ttl_removed_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "inactive_time = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;inactive_time);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -736,29 +731,38 @@ static inline void htt_print_peer_details_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_PEER_DETAILS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "peer_type = %u",</div><div class='del'>-			   htt_stats_buf-&gt;peer_type);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sw_peer_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;sw_peer_id);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "vdev_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;vdev_pdev_ast_idx &amp; 0xFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "pdev_id = %u",</div><div class='del'>-			   (htt_stats_buf-&gt;vdev_pdev_ast_idx &amp; 0xFF00) &gt;&gt; 8);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ast_idx = %u",</div><div class='del'>-			   (htt_stats_buf-&gt;vdev_pdev_ast_idx &amp; 0xFFFF0000) &gt;&gt; 16);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "mac_addr = %02x:%02x:%02x:%02x:%02x:%02x",</div><div class='del'>-			   htt_stats_buf-&gt;mac_addr.mac_addr_l32 &amp; 0xFF,</div><div class='del'>-			   (htt_stats_buf-&gt;mac_addr.mac_addr_l32 &amp; 0xFF00) &gt;&gt; 8,</div><div class='del'>-			   (htt_stats_buf-&gt;mac_addr.mac_addr_l32 &amp; 0xFF0000) &gt;&gt; 16,</div><div class='del'>-			   (htt_stats_buf-&gt;mac_addr.mac_addr_l32 &amp; 0xFF000000) &gt;&gt; 24,</div><div class='del'>-			   (htt_stats_buf-&gt;mac_addr.mac_addr_h16 &amp; 0xFF),</div><div class='del'>-			   (htt_stats_buf-&gt;mac_addr.mac_addr_h16 &amp; 0xFF00) &gt;&gt; 8);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "peer_flags = 0x%x",</div><div class='del'>-			   htt_stats_buf-&gt;peer_flags);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "qpeer_flags = 0x%x\n",</div><div class='del'>-			   htt_stats_buf-&gt;qpeer_flags);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_PEER_DETAILS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "peer_type = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;peer_type);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sw_peer_id = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;sw_peer_id);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "vdev_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_PEER_DETAILS_VDEV_ID,</div><div class='add'>+				   htt_stats_buf-&gt;vdev_pdev_ast_idx));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pdev_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_PEER_DETAILS_PDEV_ID,</div><div class='add'>+				   htt_stats_buf-&gt;vdev_pdev_ast_idx));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ast_idx = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_PEER_DETAILS_AST_IDX,</div><div class='add'>+				   htt_stats_buf-&gt;vdev_pdev_ast_idx));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "mac_addr = %02lx:%02lx:%02lx:%02lx:%02lx:%02lx\n",</div><div class='add'>+			 FIELD_GET(HTT_MAC_ADDR_L32_0,</div><div class='add'>+				   htt_stats_buf-&gt;mac_addr.mac_addr_l32),</div><div class='add'>+			 FIELD_GET(HTT_MAC_ADDR_L32_1,</div><div class='add'>+				   htt_stats_buf-&gt;mac_addr.mac_addr_l32),</div><div class='add'>+			 FIELD_GET(HTT_MAC_ADDR_L32_2,</div><div class='add'>+				   htt_stats_buf-&gt;mac_addr.mac_addr_l32),</div><div class='add'>+			 FIELD_GET(HTT_MAC_ADDR_L32_3,</div><div class='add'>+				   htt_stats_buf-&gt;mac_addr.mac_addr_l32),</div><div class='add'>+			 FIELD_GET(HTT_MAC_ADDR_H16_0,</div><div class='add'>+				   htt_stats_buf-&gt;mac_addr.mac_addr_h16),</div><div class='add'>+			 FIELD_GET(HTT_MAC_ADDR_H16_1,</div><div class='add'>+				   htt_stats_buf-&gt;mac_addr.mac_addr_h16));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "peer_flags = 0x%x\n",</div><div class='add'>+			 htt_stats_buf-&gt;peer_flags);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "qpeer_flags = 0x%x\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;qpeer_flags);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -775,74 +779,40 @@ static inline void htt_print_tx_peer_rate_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char str_buf[HTT_MAX_STRING_LEN] = {0};</div><div class='del'>-	char *tx_gi[HTT_TX_PEER_STATS_NUM_GI_COUNTERS] = {NULL};</div><div class='ctx'> 	u8 j;</div><div class='ctx'> </div><div class='del'>-	for (j = 0; j &lt; HTT_TX_PEER_STATS_NUM_GI_COUNTERS; j++) {</div><div class='del'>-		tx_gi[j] = kmalloc(HTT_MAX_STRING_LEN, GFP_ATOMIC);</div><div class='del'>-		if (!tx_gi[j])</div><div class='del'>-			goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_PEER_RATE_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_ldpc = %u",</div><div class='del'>-			   htt_stats_buf-&gt;tx_ldpc);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rts_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rts_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ack_rssi = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ack_rssi);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;tx_mcs,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_mcs = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;tx_su_mcs,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_su_mcs = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;tx_mu_mcs,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_mu_mcs = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf,</div><div class='del'>-			htt_stats_buf-&gt;tx_nss,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_nss = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf,</div><div class='del'>-			htt_stats_buf-&gt;tx_bw,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_BW_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_bw = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;tx_stbc,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_stbc = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;tx_pream,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_PREAMBLE_TYPES);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_pream = %s ", str_buf);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_PEER_RATE_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_ldpc = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;tx_ldpc);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rts_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rts_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ack_rssi = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ack_rssi);</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;tx_mcs, "tx_mcs",</div><div class='add'>+			   HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;tx_su_mcs, "tx_su_mcs",</div><div class='add'>+			   HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;tx_mu_mcs, "tx_mu_mcs",</div><div class='add'>+			   HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;tx_nss, "tx_nss",</div><div class='add'>+			   HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;tx_bw, "tx_bw",</div><div class='add'>+			   HTT_TX_PDEV_STATS_NUM_BW_COUNTERS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;tx_stbc, "tx_stbc",</div><div class='add'>+			   HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;tx_pream, "tx_pream",</div><div class='add'>+			   HTT_TX_PDEV_STATS_NUM_PREAMBLE_TYPES, "\n");</div><div class='ctx'> </div><div class='ctx'> 	for (j = 0; j &lt; HTT_TX_PEER_STATS_NUM_GI_COUNTERS; j++) {</div><div class='del'>-		ARRAY_TO_STRING(tx_gi[j],</div><div class='del'>-				htt_stats_buf-&gt;tx_gi[j],</div><div class='del'>-				HTT_TX_PEER_STATS_NUM_MCS_COUNTERS);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_gi[%u] = %s ",</div><div class='del'>-				j, tx_gi[j]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "tx_gi[%u] = ", j);</div><div class='add'>+		PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;tx_gi[j], NULL,</div><div class='add'>+				   HTT_TX_PEER_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf,</div><div class='del'>-			htt_stats_buf-&gt;tx_dcm,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_DCM_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_dcm = %s\n", str_buf);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;tx_dcm, "tx_dcm",</div><div class='add'>+			   HTT_TX_PDEV_STATS_NUM_DCM_COUNTERS, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -850,10 +820,6 @@ static inline void htt_print_tx_peer_rate_stats_tlv(const void *tag_buf,</div><div class='ctx'> 		buf[len] = 0;</div><div class='ctx'> </div><div class='ctx'> 	stats_req-&gt;buf_len = len;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	for (j = 0; j &lt; HTT_TX_PEER_STATS_NUM_GI_COUNTERS; j++)</div><div class='del'>-		kfree(tx_gi[j]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void htt_print_rx_peer_rate_stats_tlv(const void *tag_buf,</div><div class='hunk'>@@ -864,79 +830,48 @@ static inline void htt_print_rx_peer_rate_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> 	u8 j;</div><div class='del'>-	char *rssi_chain[HTT_RX_PEER_STATS_NUM_SPATIAL_STREAMS] = {NULL};</div><div class='del'>-	char *rx_gi[HTT_RX_PEER_STATS_NUM_GI_COUNTERS] = {NULL};</div><div class='del'>-	char str_buf[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> </div><div class='del'>-	for (j = 0; j &lt; HTT_RX_PEER_STATS_NUM_SPATIAL_STREAMS; j++) {</div><div class='del'>-		rssi_chain[j] = kmalloc(HTT_MAX_STRING_LEN, GFP_ATOMIC);</div><div class='del'>-		if (!rssi_chain[j])</div><div class='del'>-			goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (j = 0; j &lt; HTT_RX_PEER_STATS_NUM_GI_COUNTERS; j++) {</div><div class='del'>-		rx_gi[j] = kmalloc(HTT_MAX_STRING_LEN, GFP_ATOMIC);</div><div class='del'>-		if (!rx_gi[j])</div><div class='del'>-			goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_RX_PEER_RATE_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "nsts = %u",</div><div class='del'>-			   htt_stats_buf-&gt;nsts);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_ldpc = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rx_ldpc);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rts_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rts_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rssi_mgmt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rssi_mgmt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rssi_data = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rssi_data);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rssi_comb = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rssi_comb);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;rx_mcs,</div><div class='del'>-			HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_mcs = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;rx_nss,</div><div class='del'>-			HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_nss = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;rx_dcm,</div><div class='del'>-			HTT_RX_PDEV_STATS_NUM_DCM_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_dcm = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;rx_stbc,</div><div class='del'>-			HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_stbc = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;rx_bw,</div><div class='del'>-			HTT_RX_PDEV_STATS_NUM_BW_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_bw = %s ", str_buf);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_RX_PEER_RATE_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "nsts = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;nsts);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_ldpc = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_ldpc);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rts_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rts_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rssi_mgmt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rssi_mgmt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rssi_data = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rssi_data);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rssi_comb = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rssi_comb);</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_mcs, "rx_mcs",</div><div class='add'>+			   HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_nss, "rx_nss",</div><div class='add'>+			   HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_dcm, "rx_dcm",</div><div class='add'>+			   HTT_RX_PDEV_STATS_NUM_DCM_COUNTERS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_stbc, "rx_stbc",</div><div class='add'>+			   HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_bw, "rx_bw",</div><div class='add'>+			   HTT_RX_PDEV_STATS_NUM_BW_COUNTERS, "\n");</div><div class='ctx'> </div><div class='ctx'> 	for (j = 0; j &lt; HTT_RX_PEER_STATS_NUM_SPATIAL_STREAMS; j++) {</div><div class='del'>-		ARRAY_TO_STRING(rssi_chain[j], htt_stats_buf-&gt;rssi_chain[j],</div><div class='del'>-				HTT_RX_PEER_STATS_NUM_BW_COUNTERS);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len, "rssi_chain[%u] = %s ",</div><div class='del'>-				   j, rssi_chain[j]);</div><div class='add'>+		len += scnprintf(buf + len, (buf_len - len),</div><div class='add'>+				 "rssi_chain[%u] = ", j);</div><div class='add'>+		PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rssi_chain[j], NULL,</div><div class='add'>+				   HTT_RX_PEER_STATS_NUM_BW_COUNTERS, "\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (j = 0; j &lt; HTT_RX_PEER_STATS_NUM_GI_COUNTERS; j++) {</div><div class='del'>-		ARRAY_TO_STRING(rx_gi[j], htt_stats_buf-&gt;rx_gi[j],</div><div class='del'>-				HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_gi[%u] = %s ",</div><div class='del'>-				j, rx_gi[j]);</div><div class='add'>+		len += scnprintf(buf + len, (buf_len - len),</div><div class='add'>+				 "rx_gi[%u] = ", j);</div><div class='add'>+		PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_gi[j], NULL,</div><div class='add'>+				   HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;rx_pream,</div><div class='del'>-			HTT_RX_PDEV_STATS_NUM_PREAMBLE_TYPES);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_pream = %s\n", str_buf);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_pream, "rx_pream",</div><div class='add'>+			   HTT_RX_PDEV_STATS_NUM_PREAMBLE_TYPES, "\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -944,13 +879,6 @@ static inline void htt_print_rx_peer_rate_stats_tlv(const void *tag_buf,</div><div class='ctx'> 		buf[len] = 0;</div><div class='ctx'> </div><div class='ctx'> 	stats_req-&gt;buf_len = len;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	for (j = 0; j &lt; HTT_RX_PEER_STATS_NUM_SPATIAL_STREAMS; j++)</div><div class='del'>-		kfree(rssi_chain[j]);</div><div class='del'>-</div><div class='del'>-	for (j = 0; j &lt; HTT_RX_PEER_STATS_NUM_GI_COUNTERS; j++)</div><div class='del'>-		kfree(rx_gi[j]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='hunk'>@@ -962,13 +890,13 @@ htt_print_tx_hwq_mu_mimo_sch_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_HWQ_MU_MIMO_SCH_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mu_mimo_sch_posted = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mu_mimo_sch_posted);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mu_mimo_sch_failed = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mu_mimo_sch_failed);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mu_mimo_ppdu_posted = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;mu_mimo_ppdu_posted);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_HWQ_MU_MIMO_SCH_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mu_mimo_sch_posted = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mu_mimo_sch_posted);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mu_mimo_sch_failed = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mu_mimo_sch_failed);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mu_mimo_ppdu_posted = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;mu_mimo_ppdu_posted);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -987,22 +915,22 @@ htt_print_tx_hwq_mu_mimo_mpdu_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_TX_HWQ_MU_MIMO_MPDU_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mu_mimo_mpdus_queued_usr = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mu_mimo_mpdus_queued_usr);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mu_mimo_mpdus_tried_usr = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mu_mimo_mpdus_tried_usr);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mu_mimo_mpdus_failed_usr = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mu_mimo_mpdus_failed_usr);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mu_mimo_mpdus_requeued_usr = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mu_mimo_mpdus_requeued_usr);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mu_mimo_err_no_ba_usr = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mu_mimo_err_no_ba_usr);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mu_mimo_mpdu_underrun_usr = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mu_mimo_mpdu_underrun_usr);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mu_mimo_ampdu_underrun_usr = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;mu_mimo_ampdu_underrun_usr);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_HWQ_MU_MIMO_MPDU_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mu_mimo_mpdus_queued_usr = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mu_mimo_mpdus_queued_usr);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mu_mimo_mpdus_tried_usr = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mu_mimo_mpdus_tried_usr);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mu_mimo_mpdus_failed_usr = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mu_mimo_mpdus_failed_usr);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mu_mimo_mpdus_requeued_usr = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mu_mimo_mpdus_requeued_usr);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mu_mimo_err_no_ba_usr = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mu_mimo_err_no_ba_usr);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mu_mimo_mpdu_underrun_usr = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mu_mimo_mpdu_underrun_usr);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mu_mimo_ampdu_underrun_usr = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;mu_mimo_ampdu_underrun_usr);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -1021,11 +949,13 @@ htt_print_tx_hwq_mu_mimo_cmn_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_HWQ_MU_MIMO_CMN_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mac_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mac_id__hwq_id__word &amp; 0xFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "hwq_id = %u\n",</div><div class='del'>-			   (htt_stats_buf-&gt;mac_id__hwq_id__word &amp; 0xFF00) &gt;&gt; 8);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_HWQ_MU_MIMO_CMN_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_TX_HWQ_STATS_MAC_ID,</div><div class='add'>+				   htt_stats_buf-&gt;mac_id__hwq_id__word));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hwq_id = %lu\n\n",</div><div class='add'>+			 FIELD_GET(HTT_TX_HWQ_STATS_HWQ_ID,</div><div class='add'>+				   htt_stats_buf-&gt;mac_id__hwq_id__word));</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -1044,51 +974,53 @@ htt_print_tx_hwq_stats_cmn_tlv(const void *tag_buf, struct debug_htt_stats_req *</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: HKDBG */</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_HWQ_STATS_CMN_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mac_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mac_id__hwq_id__word &amp; 0xFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "hwq_id = %u",</div><div class='del'>-			   (htt_stats_buf-&gt;mac_id__hwq_id__word &amp; 0xFF00) &gt;&gt; 8);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "xretry = %u",</div><div class='del'>-			   htt_stats_buf-&gt;xretry);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "underrun_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;underrun_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "flush_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;flush_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "filt_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;filt_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "null_mpdu_bmap = %u",</div><div class='del'>-			   htt_stats_buf-&gt;null_mpdu_bmap);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "user_ack_failure = %u",</div><div class='del'>-			   htt_stats_buf-&gt;user_ack_failure);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ack_tlv_proc = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ack_tlv_proc);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sched_id_proc = %u",</div><div class='del'>-			   htt_stats_buf-&gt;sched_id_proc);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "null_mpdu_tx_count = %u",</div><div class='del'>-			   htt_stats_buf-&gt;null_mpdu_tx_count);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdu_bmap_not_recvd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdu_bmap_not_recvd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_bar = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_bar);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rts = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rts);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "cts2self = %u",</div><div class='del'>-			   htt_stats_buf-&gt;cts2self);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "qos_null = %u",</div><div class='del'>-			   htt_stats_buf-&gt;qos_null);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdu_tried_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdu_tried_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdu_queued_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdu_queued_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdu_ack_fail_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdu_ack_fail_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdu_filt_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdu_filt_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "false_mpdu_ack_count = %u",</div><div class='del'>-			   htt_stats_buf-&gt;false_mpdu_ack_count);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "txq_timeout = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;txq_timeout);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_HWQ_STATS_CMN_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_TX_HWQ_STATS_MAC_ID,</div><div class='add'>+				   htt_stats_buf-&gt;mac_id__hwq_id__word));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hwq_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_TX_HWQ_STATS_HWQ_ID,</div><div class='add'>+				   htt_stats_buf-&gt;mac_id__hwq_id__word));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "xretry = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;xretry);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "underrun_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;underrun_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "flush_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;flush_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "filt_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;filt_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "null_mpdu_bmap = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;null_mpdu_bmap);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "user_ack_failure = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;user_ack_failure);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ack_tlv_proc = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ack_tlv_proc);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sched_id_proc = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;sched_id_proc);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "null_mpdu_tx_count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;null_mpdu_tx_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_bmap_not_recvd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdu_bmap_not_recvd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_bar = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_bar);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rts = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rts);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "cts2self = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;cts2self);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "qos_null = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;qos_null);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_tried_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdu_tried_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_queued_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdu_queued_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_ack_fail_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdu_ack_fail_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_filt_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdu_filt_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "false_mpdu_ack_count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;false_mpdu_ack_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "txq_timeout = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;txq_timeout);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -1108,17 +1040,14 @@ htt_print_tx_hwq_difs_latency_stats_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> 	u16 data_len = min_t(u16, (tag_len &gt;&gt; 2), HTT_TX_HWQ_MAX_DIFS_LATENCY_BINS);</div><div class='del'>-	char difs_latency_hist[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_TX_HWQ_DIFS_LATENCY_STATS_TLV_V:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "hist_intvl = %u",</div><div class='del'>-			htt_stats_buf-&gt;hist_intvl);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_HWQ_DIFS_LATENCY_STATS_TLV_V:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hist_intvl = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;hist_intvl);</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(difs_latency_hist, htt_stats_buf-&gt;difs_latency_hist,</div><div class='del'>-			data_len);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "difs_latency_hist = %s\n",</div><div class='del'>-			difs_latency_hist);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;difs_latency_hist,</div><div class='add'>+			   "difs_latency_hist", data_len, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -1138,16 +1067,14 @@ htt_print_tx_hwq_cmd_result_stats_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> 	u16 data_len;</div><div class='del'>-	char cmd_result[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> </div><div class='ctx'> 	data_len = min_t(u16, (tag_len &gt;&gt; 2), HTT_TX_HWQ_MAX_CMD_RESULT_STATS);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_TX_HWQ_CMD_RESULT_STATS_TLV_V:");</div><div class='del'>-</div><div class='del'>-	ARRAY_TO_STRING(cmd_result, htt_stats_buf-&gt;cmd_result, data_len);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_HWQ_CMD_RESULT_STATS_TLV_V:\n");</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "cmd_result = %s\n", cmd_result);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;cmd_result, "cmd_result",</div><div class='add'>+			   data_len, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -1167,15 +1094,13 @@ htt_print_tx_hwq_cmd_stall_stats_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> 	u16 num_elems;</div><div class='del'>-	char cmd_stall_status[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> </div><div class='ctx'> 	num_elems = min_t(u16, (tag_len &gt;&gt; 2), HTT_TX_HWQ_MAX_CMD_STALL_STATS);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_HWQ_CMD_STALL_STATS_TLV_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_HWQ_CMD_STALL_STATS_TLV_V:\n");</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(cmd_stall_status, htt_stats_buf-&gt;cmd_stall_status, num_elems);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "cmd_stall_status = %s\n",</div><div class='del'>-			   cmd_stall_status);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;cmd_stall_status,</div><div class='add'>+			   "cmd_stall_status", num_elems, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -1195,15 +1120,14 @@ htt_print_tx_hwq_fes_result_stats_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> 	u16 num_elems;</div><div class='del'>-	char fes_result[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> </div><div class='ctx'> 	num_elems = min_t(u16, (tag_len &gt;&gt; 2), HTT_TX_HWQ_MAX_FES_RESULT_STATS);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_TX_HWQ_FES_RESULT_STATS_TLV_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_HWQ_FES_RESULT_STATS_TLV_V:\n");</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(fes_result, htt_stats_buf-&gt;fes_result, num_elems);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fes_result = %s\n", fes_result);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;fes_result, "fes_result",</div><div class='add'>+			   num_elems, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -1222,27 +1146,16 @@ htt_print_tx_hwq_tried_mpdu_cnt_hist_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char tried_mpdu_cnt_hist[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> 	u32  num_elements = ((tag_len -</div><div class='ctx'> 			    sizeof(htt_stats_buf-&gt;hist_bin_size)) &gt;&gt; 2);</div><div class='del'>-	u32  required_buffer_size = HTT_MAX_PRINT_CHAR_PER_ELEM * num_elements;</div><div class='del'>-</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_TX_HWQ_TRIED_MPDU_CNT_HIST_TLV_V:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "TRIED_MPDU_CNT_HIST_BIN_SIZE : %u",</div><div class='del'>-			   htt_stats_buf-&gt;hist_bin_size);</div><div class='del'>-</div><div class='del'>-	if (required_buffer_size &lt; HTT_MAX_STRING_LEN) {</div><div class='del'>-		ARRAY_TO_STRING(tried_mpdu_cnt_hist,</div><div class='del'>-				htt_stats_buf-&gt;tried_mpdu_cnt_hist,</div><div class='del'>-				num_elements);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "tried_mpdu_cnt_hist = %s\n",</div><div class='del'>-				   tried_mpdu_cnt_hist);</div><div class='del'>-	} else {</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "INSUFFICIENT PRINT BUFFER ");</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_HWQ_TRIED_MPDU_CNT_HIST_TLV_V:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "TRIED_MPDU_CNT_HIST_BIN_SIZE : %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;hist_bin_size);</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;tried_mpdu_cnt_hist,</div><div class='add'>+			   "tried_mpdu_cnt_hist", num_elements, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -1261,23 +1174,14 @@ htt_print_tx_hwq_txop_used_cnt_hist_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char txop_used_cnt_hist[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> 	u32 num_elements = tag_len &gt;&gt; 2;</div><div class='del'>-	u32  required_buffer_size = HTT_MAX_PRINT_CHAR_PER_ELEM * num_elements;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_TX_HWQ_TXOP_USED_CNT_HIST_TLV_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_HWQ_TXOP_USED_CNT_HIST_TLV_V:\n");</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;txop_used_cnt_hist,</div><div class='add'>+			   "txop_used_cnt_hist", num_elements, "\n\n");</div><div class='ctx'> </div><div class='del'>-	if (required_buffer_size &lt; HTT_MAX_STRING_LEN) {</div><div class='del'>-		ARRAY_TO_STRING(txop_used_cnt_hist,</div><div class='del'>-				htt_stats_buf-&gt;txop_used_cnt_hist,</div><div class='del'>-				num_elements);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len, "txop_used_cnt_hist = %s\n",</div><div class='del'>-				   txop_used_cnt_hist);</div><div class='del'>-	} else {</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "INSUFFICIENT PRINT BUFFER ");</div><div class='del'>-	}</div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1300,86 +1204,86 @@ static inline void htt_print_tx_sounding_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	const u32 *cbf_160 = htt_stats_buf-&gt;cbf_160;</div><div class='ctx'> </div><div class='ctx'> 	if (htt_stats_buf-&gt;tx_sounding_mode == HTT_TX_AC_SOUNDING_MODE) {</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "\nHTT_TX_AC_SOUNDING_STATS_TLV:\n");</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "ac_cbf_20 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u ",</div><div class='del'>-				   cbf_20[HTT_IMPLICIT_TXBF_STEER_STATS],</div><div class='del'>-				   cbf_20[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS],</div><div class='del'>-				   cbf_20[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS],</div><div class='del'>-				   cbf_20[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS],</div><div class='del'>-				   cbf_20[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "ac_cbf_40 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u",</div><div class='del'>-				   cbf_40[HTT_IMPLICIT_TXBF_STEER_STATS],</div><div class='del'>-				   cbf_40[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS],</div><div class='del'>-				   cbf_40[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS],</div><div class='del'>-				   cbf_40[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS],</div><div class='del'>-				   cbf_40[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "ac_cbf_80 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u",</div><div class='del'>-				   cbf_80[HTT_IMPLICIT_TXBF_STEER_STATS],</div><div class='del'>-				   cbf_80[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS],</div><div class='del'>-				   cbf_80[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS],</div><div class='del'>-				   cbf_80[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS],</div><div class='del'>-				   cbf_80[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "ac_cbf_160 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u",</div><div class='del'>-				   cbf_160[HTT_IMPLICIT_TXBF_STEER_STATS],</div><div class='del'>-				   cbf_160[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS],</div><div class='del'>-				   cbf_160[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS],</div><div class='del'>-				   cbf_160[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS],</div><div class='del'>-				   cbf_160[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "\nHTT_TX_AC_SOUNDING_STATS_TLV:\n\n");</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ac_cbf_20 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u\n",</div><div class='add'>+				 cbf_20[HTT_IMPLICIT_TXBF_STEER_STATS],</div><div class='add'>+				 cbf_20[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS],</div><div class='add'>+				 cbf_20[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS],</div><div class='add'>+				 cbf_20[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS],</div><div class='add'>+				 cbf_20[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ac_cbf_40 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u\n",</div><div class='add'>+				 cbf_40[HTT_IMPLICIT_TXBF_STEER_STATS],</div><div class='add'>+				 cbf_40[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS],</div><div class='add'>+				 cbf_40[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS],</div><div class='add'>+				 cbf_40[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS],</div><div class='add'>+				 cbf_40[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ac_cbf_80 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u\n",</div><div class='add'>+				 cbf_80[HTT_IMPLICIT_TXBF_STEER_STATS],</div><div class='add'>+				 cbf_80[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS],</div><div class='add'>+				 cbf_80[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS],</div><div class='add'>+				 cbf_80[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS],</div><div class='add'>+				 cbf_80[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ac_cbf_160 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u\n",</div><div class='add'>+				 cbf_160[HTT_IMPLICIT_TXBF_STEER_STATS],</div><div class='add'>+				 cbf_160[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS],</div><div class='add'>+				 cbf_160[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS],</div><div class='add'>+				 cbf_160[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS],</div><div class='add'>+				 cbf_160[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; HTT_TX_PDEV_STATS_NUM_AC_MUMIMO_USER_STATS; i++) {</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "Sounding User %u = 20MHz: %u, 40MHz : %u, 80MHz: %u, 160MHz: %u ",</div><div class='del'>-					   i,</div><div class='del'>-					   htt_stats_buf-&gt;sounding[0],</div><div class='del'>-					   htt_stats_buf-&gt;sounding[1],</div><div class='del'>-					   htt_stats_buf-&gt;sounding[2],</div><div class='del'>-					   htt_stats_buf-&gt;sounding[3]);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "Sounding User %u = 20MHz: %u, 40MHz : %u, 80MHz: %u, 160MHz: %u\n",</div><div class='add'>+					 i,</div><div class='add'>+					 htt_stats_buf-&gt;sounding[0],</div><div class='add'>+					 htt_stats_buf-&gt;sounding[1],</div><div class='add'>+					 htt_stats_buf-&gt;sounding[2],</div><div class='add'>+					 htt_stats_buf-&gt;sounding[3]);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (htt_stats_buf-&gt;tx_sounding_mode == HTT_TX_AX_SOUNDING_MODE) {</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "\nHTT_TX_AX_SOUNDING_STATS_TLV:\n");</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "ax_cbf_20 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u ",</div><div class='del'>-				   cbf_20[HTT_IMPLICIT_TXBF_STEER_STATS],</div><div class='del'>-				   cbf_20[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS],</div><div class='del'>-				   cbf_20[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS],</div><div class='del'>-				   cbf_20[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS],</div><div class='del'>-				   cbf_20[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "ax_cbf_40 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u",</div><div class='del'>-				   cbf_40[HTT_IMPLICIT_TXBF_STEER_STATS],</div><div class='del'>-				   cbf_40[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS],</div><div class='del'>-				   cbf_40[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS],</div><div class='del'>-				   cbf_40[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS],</div><div class='del'>-				   cbf_40[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "ax_cbf_80 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u",</div><div class='del'>-				   cbf_80[HTT_IMPLICIT_TXBF_STEER_STATS],</div><div class='del'>-				   cbf_80[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS],</div><div class='del'>-				   cbf_80[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS],</div><div class='del'>-				   cbf_80[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS],</div><div class='del'>-				   cbf_80[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "ax_cbf_160 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u",</div><div class='del'>-				   cbf_160[HTT_IMPLICIT_TXBF_STEER_STATS],</div><div class='del'>-				   cbf_160[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS],</div><div class='del'>-				   cbf_160[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS],</div><div class='del'>-				   cbf_160[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS],</div><div class='del'>-				   cbf_160[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "\nHTT_TX_AX_SOUNDING_STATS_TLV:\n");</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_cbf_20 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u\n",</div><div class='add'>+				 cbf_20[HTT_IMPLICIT_TXBF_STEER_STATS],</div><div class='add'>+				 cbf_20[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS],</div><div class='add'>+				 cbf_20[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS],</div><div class='add'>+				 cbf_20[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS],</div><div class='add'>+				 cbf_20[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_cbf_40 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u\n",</div><div class='add'>+				 cbf_40[HTT_IMPLICIT_TXBF_STEER_STATS],</div><div class='add'>+				 cbf_40[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS],</div><div class='add'>+				 cbf_40[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS],</div><div class='add'>+				 cbf_40[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS],</div><div class='add'>+				 cbf_40[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_cbf_80 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u\n",</div><div class='add'>+				 cbf_80[HTT_IMPLICIT_TXBF_STEER_STATS],</div><div class='add'>+				 cbf_80[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS],</div><div class='add'>+				 cbf_80[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS],</div><div class='add'>+				 cbf_80[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS],</div><div class='add'>+				 cbf_80[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_cbf_160 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u\n",</div><div class='add'>+				 cbf_160[HTT_IMPLICIT_TXBF_STEER_STATS],</div><div class='add'>+				 cbf_160[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS],</div><div class='add'>+				 cbf_160[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS],</div><div class='add'>+				 cbf_160[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS],</div><div class='add'>+				 cbf_160[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS; i++) {</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "Sounding User %u = 20MHz: %u, 40MHz : %u, 80MHz: %u, 160MHz: %u ",</div><div class='del'>-					   i,</div><div class='del'>-					   htt_stats_buf-&gt;sounding[0],</div><div class='del'>-					   htt_stats_buf-&gt;sounding[1],</div><div class='del'>-					   htt_stats_buf-&gt;sounding[2],</div><div class='del'>-					   htt_stats_buf-&gt;sounding[3]);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "Sounding User %u = 20MHz: %u, 40MHz : %u, 80MHz: %u, 160MHz: %u\n",</div><div class='add'>+					 i,</div><div class='add'>+					 htt_stats_buf-&gt;sounding[0],</div><div class='add'>+					 htt_stats_buf-&gt;sounding[1],</div><div class='add'>+					 htt_stats_buf-&gt;sounding[2],</div><div class='add'>+					 htt_stats_buf-&gt;sounding[3]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1400,31 +1304,31 @@ htt_print_tx_selfgen_cmn_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_SELFGEN_CMN_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mac_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mac_id__word &amp; 0xFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "su_bar = %u",</div><div class='del'>-			   htt_stats_buf-&gt;su_bar);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rts = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rts);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "cts2self = %u",</div><div class='del'>-			   htt_stats_buf-&gt;cts2self);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "qos_null = %u",</div><div class='del'>-			   htt_stats_buf-&gt;qos_null);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "delayed_bar_1 = %u",</div><div class='del'>-			   htt_stats_buf-&gt;delayed_bar_1);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "delayed_bar_2 = %u",</div><div class='del'>-			   htt_stats_buf-&gt;delayed_bar_2);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "delayed_bar_3 = %u",</div><div class='del'>-			   htt_stats_buf-&gt;delayed_bar_3);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "delayed_bar_4 = %u",</div><div class='del'>-			   htt_stats_buf-&gt;delayed_bar_4);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "delayed_bar_5 = %u",</div><div class='del'>-			   htt_stats_buf-&gt;delayed_bar_5);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "delayed_bar_6 = %u",</div><div class='del'>-			   htt_stats_buf-&gt;delayed_bar_6);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "delayed_bar_7 = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;delayed_bar_7);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_SELFGEN_CMN_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf-&gt;mac_id__word));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "su_bar = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;su_bar);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rts = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rts);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "cts2self = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;cts2self);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "qos_null = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;qos_null);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "delayed_bar_1 = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;delayed_bar_1);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "delayed_bar_2 = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;delayed_bar_2);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "delayed_bar_3 = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;delayed_bar_3);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "delayed_bar_4 = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;delayed_bar_4);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "delayed_bar_5 = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;delayed_bar_5);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "delayed_bar_6 = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;delayed_bar_6);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "delayed_bar_7 = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;delayed_bar_7);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -1443,21 +1347,21 @@ htt_print_tx_selfgen_ac_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_SELFGEN_AC_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ac_su_ndpa = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ac_su_ndpa);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ac_su_ndp = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ac_su_ndp);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ac_mu_mimo_ndpa = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ac_mu_mimo_ndpa);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ac_mu_mimo_ndp = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ac_mu_mimo_ndp);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ac_mu_mimo_brpoll_1 = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ac_mu_mimo_brpoll_1);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ac_mu_mimo_brpoll_2 = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ac_mu_mimo_brpoll_2);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ac_mu_mimo_brpoll_3 = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;ac_mu_mimo_brpoll_3);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_SELFGEN_AC_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_su_ndpa = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ac_su_ndpa);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_su_ndp = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ac_su_ndp);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_ndpa = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ac_mu_mimo_ndpa);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_ndp = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ac_mu_mimo_ndp);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_brpoll_1 = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ac_mu_mimo_brpoll_1);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_brpoll_2 = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ac_mu_mimo_brpoll_2);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_brpoll_3 = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;ac_mu_mimo_brpoll_3);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -1476,37 +1380,39 @@ htt_print_tx_selfgen_ax_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_SELFGEN_AX_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_su_ndpa = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_su_ndpa);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_su_ndp = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_su_ndp);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_mimo_ndpa = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_mimo_ndpa);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_mimo_ndp = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_mimo_ndp);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_mimo_brpoll_1 = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_mimo_brpoll_1);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_mimo_brpoll_2 = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_mimo_brpoll_2);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_mimo_brpoll_3 = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_mimo_brpoll_3);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_mimo_brpoll_4 = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_mimo_brpoll_4);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_mimo_brpoll_5 = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_mimo_brpoll_5);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_mimo_brpoll_6 = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_mimo_brpoll_6);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_mimo_brpoll_7 = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_mimo_brpoll_7);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_basic_trigger = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_basic_trigger);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_bsr_trigger = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_bsr_trigger);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_bar_trigger = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_bar_trigger);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_rts_trigger = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_rts_trigger);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_SELFGEN_AX_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_su_ndpa = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_su_ndpa);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_su_ndp = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_su_ndp);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_ndpa = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_mimo_ndpa);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_ndp = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_mimo_ndp);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brpoll_1 = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_mimo_brpoll_1);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brpoll_2 = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_mimo_brpoll_2);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brpoll_3 = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_mimo_brpoll_3);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brpoll_4 = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_mimo_brpoll_4);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brpoll_5 = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_mimo_brpoll_5);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brpoll_6 = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_mimo_brpoll_6);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brpoll_7 = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_mimo_brpoll_7);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_basic_trigger = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_basic_trigger);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_ulmumimo_trigger = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_ulmumimo_trigger);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_bsr_trigger = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_bsr_trigger);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_bar_trigger = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_bar_trigger);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_rts_trigger = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_rts_trigger);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -1525,21 +1431,21 @@ htt_print_tx_selfgen_ac_err_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_SELFGEN_AC_ERR_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ac_su_ndp_err = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ac_su_ndp_err);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ac_su_ndpa_err = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ac_su_ndpa_err);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ac_mu_mimo_ndpa_err = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ac_mu_mimo_ndpa_err);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ac_mu_mimo_ndp_err = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ac_mu_mimo_ndp_err);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ac_mu_mimo_brp1_err = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ac_mu_mimo_brp1_err);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ac_mu_mimo_brp2_err = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ac_mu_mimo_brp2_err);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ac_mu_mimo_brp3_err = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;ac_mu_mimo_brp3_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_SELFGEN_AC_ERR_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_su_ndp_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ac_su_ndp_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_su_ndpa_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ac_su_ndpa_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_ndpa_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ac_mu_mimo_ndpa_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_ndp_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ac_mu_mimo_ndp_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_brp1_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ac_mu_mimo_brp1_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_brp2_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ac_mu_mimo_brp2_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_brp3_err = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;ac_mu_mimo_brp3_err);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -1558,37 +1464,39 @@ htt_print_tx_selfgen_ax_err_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_SELFGEN_AX_ERR_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_su_ndp_err = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_su_ndp_err);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_su_ndpa_err = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_su_ndpa_err);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_mimo_ndpa_err = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_mimo_ndpa_err);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_mimo_ndp_err = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_mimo_ndp_err);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_mimo_brp1_err = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_mimo_brp1_err);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_mimo_brp2_err = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_mimo_brp2_err);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_mimo_brp3_err = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_mimo_brp3_err);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_mimo_brp4_err = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_mimo_brp4_err);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_mimo_brp5_err = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_mimo_brp5_err);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_mimo_brp6_err = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_mimo_brp6_err);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_mimo_brp7_err = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_mimo_brp7_err);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_basic_trigger_err = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_basic_trigger_err);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_bsr_trigger_err = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_bsr_trigger_err);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_bar_trigger_err = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_bar_trigger_err);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_rts_trigger_err = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_rts_trigger_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_SELFGEN_AX_ERR_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_su_ndp_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_su_ndp_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_su_ndpa_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_su_ndpa_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_ndpa_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_mimo_ndpa_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_ndp_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_mimo_ndp_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brp1_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_mimo_brp1_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brp2_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_mimo_brp2_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brp3_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_mimo_brp3_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brp4_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_mimo_brp4_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brp5_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_mimo_brp5_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brp6_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_mimo_brp6_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brp7_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_mimo_brp7_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_basic_trigger_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_basic_trigger_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_ulmumimo_trigger_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_ulmumimo_trigger_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_bsr_trigger_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_bsr_trigger_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_bar_trigger_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_bar_trigger_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_rts_trigger_err = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_rts_trigger_err);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -1608,35 +1516,69 @@ htt_print_tx_pdev_mu_mimo_sch_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> 	u8 i;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_TX_PDEV_MU_MIMO_SCH_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mu_mimo_sch_posted = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mu_mimo_sch_posted);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mu_mimo_sch_failed = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mu_mimo_sch_failed);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mu_mimo_ppdu_posted = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;mu_mimo_ppdu_posted);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_PDEV_MU_MIMO_SCH_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mu_mimo_sch_posted = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mu_mimo_sch_posted);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mu_mimo_sch_failed = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mu_mimo_sch_failed);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mu_mimo_ppdu_posted = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;mu_mimo_ppdu_posted);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HTT_TX_PDEV_STATS_NUM_AC_MUMIMO_USER_STATS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ac_mu_mimo_sch_posted_per_group_index %u = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ac_mu_mimo_sch_posted_per_grp_sz[i]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_mu_mimo_sch_posted_per_group_index %u = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_mu_mimo_sch_posted_per_grp_sz[i]);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "11ac MU_MIMO SCH STATS:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "11ac MU_MIMO SCH STATS:\n");</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; HTT_TX_PDEV_STATS_NUM_AC_MUMIMO_USER_STATS; i++)</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "ac_mu_mimo_sch_nusers_%u = %u",</div><div class='del'>-				   i, htt_stats_buf-&gt;ac_mu_mimo_sch_nusers[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ac_mu_mimo_sch_nusers_%u = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ac_mu_mimo_sch_nusers[i]);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "\n11ax MU_MIMO SCH STATS:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n11ax MU_MIMO SCH STATS:\n");</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS; i++)</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "ax_mu_mimo_sch_nusers_%u = %u",</div><div class='del'>-				   i, htt_stats_buf-&gt;ax_mu_mimo_sch_nusers[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_mu_mimo_sch_nusers_%u = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_mu_mimo_sch_nusers[i]);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n11ax OFDMA SCH STATS:\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS; i++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ofdma_sch_nusers_%u = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ofdma_sch_nusers[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ul_ofdma_basic_sch_nusers_%u = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ul_ofdma_basic_sch_nusers[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ul_ofdma_bsr_sch_nusers_%u = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ul_ofdma_bsr_sch_nusers[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ul_ofdma_sch_bar_nusers_%u = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ul_ofdma_bar_sch_nusers[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ul_ofdma_brp_sch_nusers_%u = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ul_ofdma_brp_sch_nusers[i]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "\n11ax OFDMA SCH STATS:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n11ax UL MUMIO SCH STATS:\n");</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS; i++)</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "ax_ofdma_sch_nusers_%u = %u",</div><div class='del'>-				   i, htt_stats_buf-&gt;ax_ofdma_sch_nusers[i]);</div><div class='add'>+	for (i = 0; i &lt; HTT_TX_PDEV_STATS_NUM_UL_MUMIMO_USER_STATS; i++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ul_mumimo_basic_sch_nusers_%u = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ul_mumimo_basic_sch_nusers[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ul_mumimo_brp_sch_nusers_%u = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ul_mumimo_brp_sch_nusers[i]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -1657,114 +1599,114 @@ htt_print_tx_pdev_mu_mimo_mpdu_stats_tlv(const void *tag_buf,</div><div class='ctx'> </div><div class='ctx'> 	if (htt_stats_buf-&gt;tx_sched_mode == HTT_STATS_TX_SCHED_MODE_MU_MIMO_AC) {</div><div class='ctx'> 		if (!htt_stats_buf-&gt;user_index)</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "HTT_TX_PDEV_MU_MIMO_AC_MPDU_STATS:\n");</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "HTT_TX_PDEV_MU_MIMO_AC_MPDU_STATS:\n");</div><div class='ctx'> </div><div class='ctx'> 		if (htt_stats_buf-&gt;user_index &lt;</div><div class='ctx'> 		    HTT_TX_PDEV_STATS_NUM_AC_MUMIMO_USER_STATS) {</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "ac_mu_mimo_mpdus_queued_usr_%u = %u",</div><div class='del'>-					   htt_stats_buf-&gt;user_index,</div><div class='del'>-					   htt_stats_buf-&gt;mpdus_queued_usr);</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "ac_mu_mimo_mpdus_tried_usr_%u = %u",</div><div class='del'>-					   htt_stats_buf-&gt;user_index,</div><div class='del'>-					   htt_stats_buf-&gt;mpdus_tried_usr);</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "ac_mu_mimo_mpdus_failed_usr_%u = %u",</div><div class='del'>-					   htt_stats_buf-&gt;user_index,</div><div class='del'>-					   htt_stats_buf-&gt;mpdus_failed_usr);</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "ac_mu_mimo_mpdus_requeued_usr_%u = %u",</div><div class='del'>-					   htt_stats_buf-&gt;user_index,</div><div class='del'>-					   htt_stats_buf-&gt;mpdus_requeued_usr);</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "ac_mu_mimo_err_no_ba_usr_%u = %u",</div><div class='del'>-					   htt_stats_buf-&gt;user_index,</div><div class='del'>-					   htt_stats_buf-&gt;err_no_ba_usr);</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "ac_mu_mimo_mpdu_underrun_usr_%u = %u",</div><div class='del'>-					   htt_stats_buf-&gt;user_index,</div><div class='del'>-					   htt_stats_buf-&gt;mpdu_underrun_usr);</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "ac_mu_mimo_ampdu_underrun_usr_%u = %u\n",</div><div class='del'>-					   htt_stats_buf-&gt;user_index,</div><div class='del'>-					   htt_stats_buf-&gt;ampdu_underrun_usr);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ac_mu_mimo_mpdus_queued_usr_%u = %u\n",</div><div class='add'>+					 htt_stats_buf-&gt;user_index,</div><div class='add'>+					 htt_stats_buf-&gt;mpdus_queued_usr);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ac_mu_mimo_mpdus_tried_usr_%u = %u\n",</div><div class='add'>+					 htt_stats_buf-&gt;user_index,</div><div class='add'>+					 htt_stats_buf-&gt;mpdus_tried_usr);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ac_mu_mimo_mpdus_failed_usr_%u = %u\n",</div><div class='add'>+					 htt_stats_buf-&gt;user_index,</div><div class='add'>+					 htt_stats_buf-&gt;mpdus_failed_usr);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ac_mu_mimo_mpdus_requeued_usr_%u = %u\n",</div><div class='add'>+					 htt_stats_buf-&gt;user_index,</div><div class='add'>+					 htt_stats_buf-&gt;mpdus_requeued_usr);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ac_mu_mimo_err_no_ba_usr_%u = %u\n",</div><div class='add'>+					 htt_stats_buf-&gt;user_index,</div><div class='add'>+					 htt_stats_buf-&gt;err_no_ba_usr);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ac_mu_mimo_mpdu_underrun_usr_%u = %u\n",</div><div class='add'>+					 htt_stats_buf-&gt;user_index,</div><div class='add'>+					 htt_stats_buf-&gt;mpdu_underrun_usr);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ac_mu_mimo_ampdu_underrun_usr_%u = %u\n\n",</div><div class='add'>+					 htt_stats_buf-&gt;user_index,</div><div class='add'>+					 htt_stats_buf-&gt;ampdu_underrun_usr);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (htt_stats_buf-&gt;tx_sched_mode == HTT_STATS_TX_SCHED_MODE_MU_MIMO_AX) {</div><div class='ctx'> 		if (!htt_stats_buf-&gt;user_index)</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "HTT_TX_PDEV_MU_MIMO_AX_MPDU_STATS:\n");</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "HTT_TX_PDEV_MU_MIMO_AX_MPDU_STATS:\n");</div><div class='ctx'> </div><div class='ctx'> 		if (htt_stats_buf-&gt;user_index &lt;</div><div class='ctx'> 		    HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS) {</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "ax_mu_mimo_mpdus_queued_usr_%u = %u",</div><div class='del'>-					   htt_stats_buf-&gt;user_index,</div><div class='del'>-					   htt_stats_buf-&gt;mpdus_queued_usr);</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "ax_mu_mimo_mpdus_tried_usr_%u = %u",</div><div class='del'>-					   htt_stats_buf-&gt;user_index,</div><div class='del'>-					   htt_stats_buf-&gt;mpdus_tried_usr);</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "ax_mu_mimo_mpdus_failed_usr_%u = %u",</div><div class='del'>-					   htt_stats_buf-&gt;user_index,</div><div class='del'>-					   htt_stats_buf-&gt;mpdus_failed_usr);</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "ax_mu_mimo_mpdus_requeued_usr_%u = %u",</div><div class='del'>-					   htt_stats_buf-&gt;user_index,</div><div class='del'>-					   htt_stats_buf-&gt;mpdus_requeued_usr);</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "ax_mu_mimo_err_no_ba_usr_%u = %u",</div><div class='del'>-					   htt_stats_buf-&gt;user_index,</div><div class='del'>-					   htt_stats_buf-&gt;err_no_ba_usr);</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "ax_mu_mimo_mpdu_underrun_usr_%u = %u",</div><div class='del'>-					   htt_stats_buf-&gt;user_index,</div><div class='del'>-					   htt_stats_buf-&gt;mpdu_underrun_usr);</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "ax_mu_mimo_ampdu_underrun_usr_%u = %u\n",</div><div class='del'>-					   htt_stats_buf-&gt;user_index,</div><div class='del'>-					   htt_stats_buf-&gt;ampdu_underrun_usr);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_mimo_mpdus_queued_usr_%u = %u\n",</div><div class='add'>+					 htt_stats_buf-&gt;user_index,</div><div class='add'>+					 htt_stats_buf-&gt;mpdus_queued_usr);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_mimo_mpdus_tried_usr_%u = %u\n",</div><div class='add'>+					 htt_stats_buf-&gt;user_index,</div><div class='add'>+					 htt_stats_buf-&gt;mpdus_tried_usr);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_mimo_mpdus_failed_usr_%u = %u\n",</div><div class='add'>+					 htt_stats_buf-&gt;user_index,</div><div class='add'>+					 htt_stats_buf-&gt;mpdus_failed_usr);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_mimo_mpdus_requeued_usr_%u = %u\n",</div><div class='add'>+					 htt_stats_buf-&gt;user_index,</div><div class='add'>+					 htt_stats_buf-&gt;mpdus_requeued_usr);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_mimo_err_no_ba_usr_%u = %u\n",</div><div class='add'>+					 htt_stats_buf-&gt;user_index,</div><div class='add'>+					 htt_stats_buf-&gt;err_no_ba_usr);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_mimo_mpdu_underrun_usr_%u = %u\n",</div><div class='add'>+					 htt_stats_buf-&gt;user_index,</div><div class='add'>+					 htt_stats_buf-&gt;mpdu_underrun_usr);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_mimo_ampdu_underrun_usr_%u = %u\n\n",</div><div class='add'>+					 htt_stats_buf-&gt;user_index,</div><div class='add'>+					 htt_stats_buf-&gt;ampdu_underrun_usr);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (htt_stats_buf-&gt;tx_sched_mode == HTT_STATS_TX_SCHED_MODE_MU_OFDMA_AX) {</div><div class='ctx'> 		if (!htt_stats_buf-&gt;user_index)</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "HTT_TX_PDEV_AX_MU_OFDMA_MPDU_STATS:\n");</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "HTT_TX_PDEV_AX_MU_OFDMA_MPDU_STATS:\n");</div><div class='ctx'> </div><div class='ctx'> 		if (htt_stats_buf-&gt;user_index &lt; HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS) {</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "ax_mu_ofdma_mpdus_queued_usr_%u = %u",</div><div class='del'>-					   htt_stats_buf-&gt;user_index,</div><div class='del'>-					   htt_stats_buf-&gt;mpdus_queued_usr);</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "ax_mu_ofdma_mpdus_tried_usr_%u = %u",</div><div class='del'>-					   htt_stats_buf-&gt;user_index,</div><div class='del'>-					   htt_stats_buf-&gt;mpdus_tried_usr);</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "ax_mu_ofdma_mpdus_failed_usr_%u = %u",</div><div class='del'>-					   htt_stats_buf-&gt;user_index,</div><div class='del'>-					   htt_stats_buf-&gt;mpdus_failed_usr);</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "ax_mu_ofdma_mpdus_requeued_usr_%u = %u",</div><div class='del'>-					   htt_stats_buf-&gt;user_index,</div><div class='del'>-					   htt_stats_buf-&gt;mpdus_requeued_usr);</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "ax_mu_ofdma_err_no_ba_usr_%u = %u",</div><div class='del'>-					   htt_stats_buf-&gt;user_index,</div><div class='del'>-					   htt_stats_buf-&gt;err_no_ba_usr);</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "ax_mu_ofdma_mpdu_underrun_usr_%u = %u",</div><div class='del'>-					   htt_stats_buf-&gt;user_index,</div><div class='del'>-					   htt_stats_buf-&gt;mpdu_underrun_usr);</div><div class='del'>-			len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-					   "ax_mu_ofdma_ampdu_underrun_usr_%u = %u\n",</div><div class='del'>-					   htt_stats_buf-&gt;user_index,</div><div class='del'>-					   htt_stats_buf-&gt;ampdu_underrun_usr);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_ofdma_mpdus_queued_usr_%u = %u\n",</div><div class='add'>+					 htt_stats_buf-&gt;user_index,</div><div class='add'>+					 htt_stats_buf-&gt;mpdus_queued_usr);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_ofdma_mpdus_tried_usr_%u = %u\n",</div><div class='add'>+					 htt_stats_buf-&gt;user_index,</div><div class='add'>+					 htt_stats_buf-&gt;mpdus_tried_usr);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_ofdma_mpdus_failed_usr_%u = %u\n",</div><div class='add'>+					 htt_stats_buf-&gt;user_index,</div><div class='add'>+					 htt_stats_buf-&gt;mpdus_failed_usr);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_ofdma_mpdus_requeued_usr_%u = %u\n",</div><div class='add'>+					 htt_stats_buf-&gt;user_index,</div><div class='add'>+					 htt_stats_buf-&gt;mpdus_requeued_usr);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_ofdma_err_no_ba_usr_%u = %u\n",</div><div class='add'>+					 htt_stats_buf-&gt;user_index,</div><div class='add'>+					 htt_stats_buf-&gt;err_no_ba_usr);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_ofdma_mpdu_underrun_usr_%u = %u\n",</div><div class='add'>+					 htt_stats_buf-&gt;user_index,</div><div class='add'>+					 htt_stats_buf-&gt;mpdu_underrun_usr);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_ofdma_ampdu_underrun_usr_%u = %u\n\n",</div><div class='add'>+					 htt_stats_buf-&gt;user_index,</div><div class='add'>+					 htt_stats_buf-&gt;ampdu_underrun_usr);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1785,15 +1727,12 @@ htt_print_sched_txq_cmd_posted_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char sched_cmd_posted[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> 	u16 num_elements = min_t(u16, (tag_len &gt;&gt; 2), HTT_TX_PDEV_SCHED_TX_MODE_MAX);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_SCHED_TXQ_CMD_POSTED_TLV_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_SCHED_TXQ_CMD_POSTED_TLV_V:\n");</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(sched_cmd_posted, htt_stats_buf-&gt;sched_cmd_posted,</div><div class='del'>-			num_elements);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sched_cmd_posted = %s\n",</div><div class='del'>-			   sched_cmd_posted);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;sched_cmd_posted,</div><div class='add'>+			   "sched_cmd_posted", num_elements, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -1812,15 +1751,12 @@ htt_print_sched_txq_cmd_reaped_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char sched_cmd_reaped[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> 	u16 num_elements = min_t(u16, (tag_len &gt;&gt; 2), HTT_TX_PDEV_SCHED_TX_MODE_MAX);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_SCHED_TXQ_CMD_REAPED_TLV_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_SCHED_TXQ_CMD_REAPED_TLV_V:\n");</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(sched_cmd_reaped, htt_stats_buf-&gt;sched_cmd_reaped,</div><div class='del'>-			num_elements);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sched_cmd_reaped = %s\n",</div><div class='del'>-			   sched_cmd_reaped);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;sched_cmd_reaped,</div><div class='add'>+			   "sched_cmd_reaped", num_elements, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -1839,18 +1775,15 @@ htt_print_sched_txq_sched_order_su_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char sched_order_su[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> 	/* each entry is u32, i.e. 4 bytes */</div><div class='ctx'> 	u32 sched_order_su_num_entries =</div><div class='ctx'> 		min_t(u32, (tag_len &gt;&gt; 2), HTT_TX_PDEV_NUM_SCHED_ORDER_LOG);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_SCHED_TXQ_SCHED_ORDER_SU_TLV_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_SCHED_TXQ_SCHED_ORDER_SU_TLV_V:\n");</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(sched_order_su, htt_stats_buf-&gt;sched_order_su,</div><div class='del'>-			sched_order_su_num_entries);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sched_order_su = %s\n",</div><div class='del'>-			   sched_order_su);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;sched_order_su, "sched_order_su",</div><div class='add'>+			   sched_order_su_num_entries, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -1869,17 +1802,15 @@ htt_print_sched_txq_sched_ineligibility_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char sched_ineligibility[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> 	/* each entry is u32, i.e. 4 bytes */</div><div class='ctx'> 	u32 sched_ineligibility_num_entries = tag_len &gt;&gt; 2;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_SCHED_TXQ_SCHED_INELIGIBILITY_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_SCHED_TXQ_SCHED_INELIGIBILITY_V:\n");</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(sched_ineligibility, htt_stats_buf-&gt;sched_ineligibility,</div><div class='del'>-			sched_ineligibility_num_entries);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sched_ineligibility = %s\n",</div><div class='del'>-			   sched_ineligibility);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;sched_ineligibility,</div><div class='add'>+			   "sched_ineligibility", sched_ineligibility_num_entries,</div><div class='add'>+			   "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -1898,54 +1829,56 @@ htt_print_tx_pdev_stats_sched_per_txq_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_TX_PDEV_STATS_SCHED_PER_TXQ_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mac_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mac_id__txq_id__word &amp; 0xFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "txq_id = %u",</div><div class='del'>-			   (htt_stats_buf-&gt;mac_id__txq_id__word &amp; 0xFF00) &gt;&gt; 8);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sched_policy = %u",</div><div class='del'>-			   htt_stats_buf-&gt;sched_policy);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "last_sched_cmd_posted_timestamp = %u",</div><div class='del'>-			   htt_stats_buf-&gt;last_sched_cmd_posted_timestamp);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "last_sched_cmd_compl_timestamp = %u",</div><div class='del'>-			   htt_stats_buf-&gt;last_sched_cmd_compl_timestamp);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sched_2_tac_lwm_count = %u",</div><div class='del'>-			   htt_stats_buf-&gt;sched_2_tac_lwm_count);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sched_2_tac_ring_full = %u",</div><div class='del'>-			   htt_stats_buf-&gt;sched_2_tac_ring_full);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sched_cmd_post_failure = %u",</div><div class='del'>-			   htt_stats_buf-&gt;sched_cmd_post_failure);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_active_tids = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_active_tids);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_ps_schedules = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_ps_schedules);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sched_cmds_pending = %u",</div><div class='del'>-			   htt_stats_buf-&gt;sched_cmds_pending);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_tid_register = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_tid_register);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_tid_unregister = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_tid_unregister);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_qstats_queried = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_qstats_queried);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "qstats_update_pending = %u",</div><div class='del'>-			   htt_stats_buf-&gt;qstats_update_pending);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "last_qstats_query_timestamp = %u",</div><div class='del'>-			   htt_stats_buf-&gt;last_qstats_query_timestamp);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_tqm_cmdq_full = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_tqm_cmdq_full);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_de_sched_algo_trigger = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_de_sched_algo_trigger);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_rt_sched_algo_trigger = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_rt_sched_algo_trigger);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_tqm_sched_algo_trigger = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_tqm_sched_algo_trigger);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "notify_sched = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;notify_sched);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "dur_based_sendn_term = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;dur_based_sendn_term);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_PDEV_STATS_SCHED_PER_TXQ_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_TX_PDEV_STATS_SCHED_PER_TXQ_MAC_ID,</div><div class='add'>+				   htt_stats_buf-&gt;mac_id__txq_id__word));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "txq_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_TX_PDEV_STATS_SCHED_PER_TXQ_ID,</div><div class='add'>+				   htt_stats_buf-&gt;mac_id__txq_id__word));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sched_policy = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;sched_policy);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "last_sched_cmd_posted_timestamp = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;last_sched_cmd_posted_timestamp);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "last_sched_cmd_compl_timestamp = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;last_sched_cmd_compl_timestamp);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sched_2_tac_lwm_count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;sched_2_tac_lwm_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sched_2_tac_ring_full = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;sched_2_tac_ring_full);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sched_cmd_post_failure = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;sched_cmd_post_failure);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_active_tids = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_active_tids);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_ps_schedules = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_ps_schedules);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sched_cmds_pending = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;sched_cmds_pending);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_tid_register = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_tid_register);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_tid_unregister = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_tid_unregister);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_qstats_queried = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_qstats_queried);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "qstats_update_pending = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;qstats_update_pending);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "last_qstats_query_timestamp = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;last_qstats_query_timestamp);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_tqm_cmdq_full = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_tqm_cmdq_full);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_de_sched_algo_trigger = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_de_sched_algo_trigger);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_rt_sched_algo_trigger = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_rt_sched_algo_trigger);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_tqm_sched_algo_trigger = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_tqm_sched_algo_trigger);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "notify_sched = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;notify_sched);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "dur_based_sendn_term = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;dur_based_sendn_term);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -1963,11 +1896,11 @@ static inline void htt_print_stats_tx_sched_cmn_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_STATS_TX_SCHED_CMN_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mac_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mac_id__word &amp; 0xFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "current_timestamp = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;current_timestamp);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_STATS_TX_SCHED_CMN_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf-&gt;mac_id__word));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "current_timestamp = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;current_timestamp);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -1986,16 +1919,13 @@ htt_print_tx_tqm_gen_mpdu_stats_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char gen_mpdu_end_reason[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> 	u16 num_elements = min_t(u16, (tag_len &gt;&gt; 2),</div><div class='ctx'> 				 HTT_TX_TQM_MAX_LIST_MPDU_END_REASON);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_TQM_GEN_MPDU_STATS_TLV_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_TQM_GEN_MPDU_STATS_TLV_V:\n");</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(gen_mpdu_end_reason, htt_stats_buf-&gt;gen_mpdu_end_reason,</div><div class='del'>-			num_elements);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "gen_mpdu_end_reason = %s\n",</div><div class='del'>-			   gen_mpdu_end_reason);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;gen_mpdu_end_reason,</div><div class='add'>+			   "gen_mpdu_end_reason", num_elements, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -2014,16 +1944,14 @@ htt_print_tx_tqm_list_mpdu_stats_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char list_mpdu_end_reason[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> 	u16 num_elems = min_t(u16, (tag_len &gt;&gt; 2), HTT_TX_TQM_MAX_LIST_MPDU_END_REASON);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_TX_TQM_LIST_MPDU_STATS_TLV_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_TQM_LIST_MPDU_STATS_TLV_V:\n");</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;list_mpdu_end_reason,</div><div class='add'>+			   "list_mpdu_end_reason", num_elems, "\n\n");</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(list_mpdu_end_reason, htt_stats_buf-&gt;list_mpdu_end_reason,</div><div class='del'>-			num_elems);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "list_mpdu_end_reason = %s\n",</div><div class='del'>-			   list_mpdu_end_reason);</div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -2041,16 +1969,13 @@ htt_print_tx_tqm_list_mpdu_cnt_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char list_mpdu_cnt_hist[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> 	u16 num_elems = min_t(u16, (tag_len &gt;&gt; 2),</div><div class='ctx'> 			      HTT_TX_TQM_MAX_LIST_MPDU_CNT_HISTOGRAM_BINS);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_TQM_LIST_MPDU_CNT_TLV_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_TQM_LIST_MPDU_CNT_TLV_V:\n");</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(list_mpdu_cnt_hist, htt_stats_buf-&gt;list_mpdu_cnt_hist,</div><div class='del'>-			num_elems);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "list_mpdu_cnt_hist = %s\n",</div><div class='del'>-			   list_mpdu_cnt_hist);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;list_mpdu_cnt_hist,</div><div class='add'>+			   "list_mpdu_cnt_hist", num_elems, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -2069,69 +1994,69 @@ htt_print_tx_tqm_pdev_stats_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_TQM_PDEV_STATS_TLV_V:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "msdu_count = %u",</div><div class='del'>-			   htt_stats_buf-&gt;msdu_count);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdu_count = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdu_count);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "remove_msdu = %u",</div><div class='del'>-			   htt_stats_buf-&gt;remove_msdu);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "remove_mpdu = %u",</div><div class='del'>-			   htt_stats_buf-&gt;remove_mpdu);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "remove_msdu_ttl = %u",</div><div class='del'>-			   htt_stats_buf-&gt;remove_msdu_ttl);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "send_bar = %u",</div><div class='del'>-			   htt_stats_buf-&gt;send_bar);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "bar_sync = %u",</div><div class='del'>-			   htt_stats_buf-&gt;bar_sync);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "notify_mpdu = %u",</div><div class='del'>-			   htt_stats_buf-&gt;notify_mpdu);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sync_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;sync_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "write_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;write_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "hwsch_trigger = %u",</div><div class='del'>-			   htt_stats_buf-&gt;hwsch_trigger);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ack_tlv_proc = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ack_tlv_proc);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "gen_mpdu_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;gen_mpdu_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "gen_list_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;gen_list_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "remove_mpdu_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;remove_mpdu_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "remove_mpdu_tried_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;remove_mpdu_tried_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdu_queue_stats_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdu_queue_stats_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdu_head_info_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdu_head_info_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "msdu_flow_stats_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;msdu_flow_stats_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "remove_msdu_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;remove_msdu_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "remove_msdu_ttl_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;remove_msdu_ttl_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "flush_cache_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;flush_cache_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "update_mpduq_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;update_mpduq_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "enqueue = %u",</div><div class='del'>-			   htt_stats_buf-&gt;enqueue);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "enqueue_notify = %u",</div><div class='del'>-			   htt_stats_buf-&gt;enqueue_notify);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "notify_mpdu_at_head = %u",</div><div class='del'>-			   htt_stats_buf-&gt;notify_mpdu_at_head);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "notify_mpdu_state_valid = %u",</div><div class='del'>-			   htt_stats_buf-&gt;notify_mpdu_state_valid);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sched_udp_notify1 = %u",</div><div class='del'>-			   htt_stats_buf-&gt;sched_udp_notify1);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sched_udp_notify2 = %u",</div><div class='del'>-			   htt_stats_buf-&gt;sched_udp_notify2);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sched_nonudp_notify1 = %u",</div><div class='del'>-			   htt_stats_buf-&gt;sched_nonudp_notify1);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sched_nonudp_notify2 = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;sched_nonudp_notify2);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_TQM_PDEV_STATS_TLV_V:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "msdu_count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;msdu_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdu_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "remove_msdu = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;remove_msdu);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "remove_mpdu = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;remove_mpdu);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "remove_msdu_ttl = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;remove_msdu_ttl);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "send_bar = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;send_bar);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "bar_sync = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;bar_sync);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "notify_mpdu = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;notify_mpdu);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sync_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;sync_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "write_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;write_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hwsch_trigger = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;hwsch_trigger);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ack_tlv_proc = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ack_tlv_proc);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "gen_mpdu_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;gen_mpdu_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "gen_list_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;gen_list_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "remove_mpdu_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;remove_mpdu_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "remove_mpdu_tried_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;remove_mpdu_tried_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_queue_stats_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdu_queue_stats_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_head_info_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdu_head_info_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "msdu_flow_stats_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;msdu_flow_stats_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "remove_msdu_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;remove_msdu_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "remove_msdu_ttl_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;remove_msdu_ttl_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "flush_cache_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;flush_cache_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "update_mpduq_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;update_mpduq_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "enqueue = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;enqueue);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "enqueue_notify = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;enqueue_notify);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "notify_mpdu_at_head = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;notify_mpdu_at_head);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "notify_mpdu_state_valid = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;notify_mpdu_state_valid);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sched_udp_notify1 = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;sched_udp_notify1);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sched_udp_notify2 = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;sched_udp_notify2);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sched_nonudp_notify1 = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;sched_nonudp_notify1);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sched_nonudp_notify2 = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;sched_nonudp_notify2);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -2149,23 +2074,23 @@ static inline void htt_print_tx_tqm_cmn_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_TQM_CMN_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mac_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mac_id__word &amp; 0xFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "max_cmdq_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;max_cmdq_id);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "list_mpdu_cnt_hist_intvl = %u",</div><div class='del'>-			   htt_stats_buf-&gt;list_mpdu_cnt_hist_intvl);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "add_msdu = %u",</div><div class='del'>-			   htt_stats_buf-&gt;add_msdu);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "q_empty = %u",</div><div class='del'>-			   htt_stats_buf-&gt;q_empty);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "q_not_empty = %u",</div><div class='del'>-			   htt_stats_buf-&gt;q_not_empty);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "drop_notification = %u",</div><div class='del'>-			   htt_stats_buf-&gt;drop_notification);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "desc_threshold = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;desc_threshold);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_TQM_CMN_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf-&gt;mac_id__word));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "max_cmdq_id = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;max_cmdq_id);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "list_mpdu_cnt_hist_intvl = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;list_mpdu_cnt_hist_intvl);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "add_msdu = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;add_msdu);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "q_empty = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;q_empty);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "q_not_empty = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;q_not_empty);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "drop_notification = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;drop_notification);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "desc_threshold = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;desc_threshold);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -2183,13 +2108,13 @@ static inline void htt_print_tx_tqm_error_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_TQM_ERROR_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "q_empty_failure = %u",</div><div class='del'>-			   htt_stats_buf-&gt;q_empty_failure);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "q_not_empty_failure = %u",</div><div class='del'>-			   htt_stats_buf-&gt;q_not_empty_failure);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "add_msdu_failure = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;add_msdu_failure);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_TQM_ERROR_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "q_empty_failure = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;q_empty_failure);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "q_not_empty_failure = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;q_not_empty_failure);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "add_msdu_failure = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;add_msdu_failure);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -2207,33 +2132,35 @@ static inline void htt_print_tx_tqm_cmdq_status_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_TQM_CMDQ_STATUS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mac_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mac_id__cmdq_id__word &amp; 0xFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "cmdq_id = %u\n",</div><div class='del'>-			   (htt_stats_buf-&gt;mac_id__cmdq_id__word &amp; 0xFF00) &gt;&gt; 8);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sync_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;sync_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "write_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;write_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "gen_mpdu_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;gen_mpdu_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdu_queue_stats_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdu_queue_stats_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdu_head_info_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdu_head_info_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "msdu_flow_stats_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;msdu_flow_stats_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "remove_mpdu_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;remove_mpdu_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "remove_msdu_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;remove_msdu_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "flush_cache_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;flush_cache_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "update_mpduq_cmd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;update_mpduq_cmd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "update_msduq_cmd = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;update_msduq_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_TQM_CMDQ_STATUS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_TX_TQM_CMDQ_STATUS_MAC_ID,</div><div class='add'>+				   htt_stats_buf-&gt;mac_id__cmdq_id__word));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "cmdq_id = %lu\n\n",</div><div class='add'>+			 FIELD_GET(HTT_TX_TQM_CMDQ_STATUS_CMDQ_ID,</div><div class='add'>+				   htt_stats_buf-&gt;mac_id__cmdq_id__word));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sync_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;sync_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "write_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;write_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "gen_mpdu_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;gen_mpdu_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_queue_stats_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdu_queue_stats_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_head_info_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdu_head_info_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "msdu_flow_stats_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;msdu_flow_stats_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "remove_mpdu_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;remove_mpdu_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "remove_msdu_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;remove_msdu_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "flush_cache_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;flush_cache_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "update_mpduq_cmd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;update_mpduq_cmd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "update_msduq_cmd = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;update_msduq_cmd);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -2252,20 +2179,20 @@ htt_print_tx_de_eapol_packets_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_TX_DE_EAPOL_PACKETS_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "m1_packets = %u",</div><div class='del'>-			   htt_stats_buf-&gt;m1_packets);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "m2_packets = %u",</div><div class='del'>-			   htt_stats_buf-&gt;m2_packets);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "m3_packets = %u",</div><div class='del'>-			   htt_stats_buf-&gt;m3_packets);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "m4_packets = %u",</div><div class='del'>-			   htt_stats_buf-&gt;m4_packets);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "g1_packets = %u",</div><div class='del'>-			   htt_stats_buf-&gt;g1_packets);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "g2_packets = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;g2_packets);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			   "HTT_TX_DE_EAPOL_PACKETS_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "m1_packets = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;m1_packets);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "m2_packets = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;m2_packets);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "m3_packets = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;m3_packets);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "m4_packets = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;m4_packets);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "g1_packets = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;g1_packets);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "g2_packets = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;g2_packets);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -2284,34 +2211,34 @@ htt_print_tx_de_classify_failed_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_TX_DE_CLASSIFY_FAILED_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ap_bss_peer_not_found = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ap_bss_peer_not_found);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ap_bcast_mcast_no_peer = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ap_bcast_mcast_no_peer);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sta_delete_in_progress = %u",</div><div class='del'>-			   htt_stats_buf-&gt;sta_delete_in_progress);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ibss_no_bss_peer = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ibss_no_bss_peer);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "invalid_vdev_type = %u",</div><div class='del'>-			   htt_stats_buf-&gt;invalid_vdev_type);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "invalid_ast_peer_entry = %u",</div><div class='del'>-			   htt_stats_buf-&gt;invalid_ast_peer_entry);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "peer_entry_invalid = %u",</div><div class='del'>-			   htt_stats_buf-&gt;peer_entry_invalid);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ethertype_not_ip = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ethertype_not_ip);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "eapol_lookup_failed = %u",</div><div class='del'>-			   htt_stats_buf-&gt;eapol_lookup_failed);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "qpeer_not_allow_data = %u",</div><div class='del'>-			   htt_stats_buf-&gt;qpeer_not_allow_data);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fse_tid_override = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fse_tid_override);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ipv6_jumbogram_zero_length = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ipv6_jumbogram_zero_length);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "qos_to_non_qos_in_prog = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;qos_to_non_qos_in_prog);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			   "HTT_TX_DE_CLASSIFY_FAILED_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ap_bss_peer_not_found = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ap_bss_peer_not_found);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ap_bcast_mcast_no_peer = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ap_bcast_mcast_no_peer);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sta_delete_in_progress = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;sta_delete_in_progress);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ibss_no_bss_peer = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ibss_no_bss_peer);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "invalid_vdev_type = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;invalid_vdev_type);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "invalid_ast_peer_entry = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;invalid_ast_peer_entry);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "peer_entry_invalid = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;peer_entry_invalid);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ethertype_not_ip = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ethertype_not_ip);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "eapol_lookup_failed = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;eapol_lookup_failed);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "qpeer_not_allow_data = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;qpeer_not_allow_data);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_tid_override = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fse_tid_override);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ipv6_jumbogram_zero_length = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ipv6_jumbogram_zero_length);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "qos_to_non_qos_in_prog = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;qos_to_non_qos_in_prog);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -2330,73 +2257,73 @@ htt_print_tx_de_classify_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_DE_CLASSIFY_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "arp_packets = %u",</div><div class='del'>-			   htt_stats_buf-&gt;arp_packets);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "igmp_packets = %u",</div><div class='del'>-			   htt_stats_buf-&gt;igmp_packets);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "dhcp_packets = %u",</div><div class='del'>-			   htt_stats_buf-&gt;dhcp_packets);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "host_inspected = %u",</div><div class='del'>-			   htt_stats_buf-&gt;host_inspected);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "htt_included = %u",</div><div class='del'>-			   htt_stats_buf-&gt;htt_included);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "htt_valid_mcs = %u",</div><div class='del'>-			   htt_stats_buf-&gt;htt_valid_mcs);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "htt_valid_nss = %u",</div><div class='del'>-			   htt_stats_buf-&gt;htt_valid_nss);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "htt_valid_preamble_type = %u",</div><div class='del'>-			   htt_stats_buf-&gt;htt_valid_preamble_type);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "htt_valid_chainmask = %u",</div><div class='del'>-			   htt_stats_buf-&gt;htt_valid_chainmask);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "htt_valid_guard_interval = %u",</div><div class='del'>-			   htt_stats_buf-&gt;htt_valid_guard_interval);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "htt_valid_retries = %u",</div><div class='del'>-			   htt_stats_buf-&gt;htt_valid_retries);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "htt_valid_bw_info = %u",</div><div class='del'>-			   htt_stats_buf-&gt;htt_valid_bw_info);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "htt_valid_power = %u",</div><div class='del'>-			   htt_stats_buf-&gt;htt_valid_power);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "htt_valid_key_flags = 0x%x",</div><div class='del'>-			   htt_stats_buf-&gt;htt_valid_key_flags);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "htt_valid_no_encryption = %u",</div><div class='del'>-			   htt_stats_buf-&gt;htt_valid_no_encryption);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fse_entry_count = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fse_entry_count);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fse_priority_be = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fse_priority_be);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fse_priority_high = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fse_priority_high);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fse_priority_low = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fse_priority_low);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fse_traffic_ptrn_be = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fse_traffic_ptrn_be);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fse_traffic_ptrn_over_sub = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fse_traffic_ptrn_over_sub);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fse_traffic_ptrn_bursty = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fse_traffic_ptrn_bursty);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fse_traffic_ptrn_interactive = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fse_traffic_ptrn_interactive);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fse_traffic_ptrn_periodic = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fse_traffic_ptrn_periodic);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fse_hwqueue_alloc = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fse_hwqueue_alloc);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fse_hwqueue_created = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fse_hwqueue_created);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fse_hwqueue_send_to_host = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fse_hwqueue_send_to_host);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mcast_entry = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mcast_entry);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "bcast_entry = %u",</div><div class='del'>-			   htt_stats_buf-&gt;bcast_entry);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "htt_update_peer_cache = %u",</div><div class='del'>-			   htt_stats_buf-&gt;htt_update_peer_cache);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "htt_learning_frame = %u",</div><div class='del'>-			   htt_stats_buf-&gt;htt_learning_frame);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fse_invalid_peer = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fse_invalid_peer);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mec_notify = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;mec_notify);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_DE_CLASSIFY_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "arp_packets = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;arp_packets);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "igmp_packets = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;igmp_packets);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "dhcp_packets = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;dhcp_packets);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "host_inspected = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;host_inspected);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_included = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;htt_included);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_valid_mcs = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;htt_valid_mcs);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_valid_nss = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;htt_valid_nss);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_valid_preamble_type = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;htt_valid_preamble_type);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_valid_chainmask = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;htt_valid_chainmask);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_valid_guard_interval = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;htt_valid_guard_interval);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_valid_retries = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;htt_valid_retries);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_valid_bw_info = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;htt_valid_bw_info);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_valid_power = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;htt_valid_power);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_valid_key_flags = 0x%x\n",</div><div class='add'>+			 htt_stats_buf-&gt;htt_valid_key_flags);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_valid_no_encryption = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;htt_valid_no_encryption);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_entry_count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fse_entry_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_priority_be = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fse_priority_be);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_priority_high = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fse_priority_high);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_priority_low = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fse_priority_low);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_traffic_ptrn_be = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fse_traffic_ptrn_be);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_traffic_ptrn_over_sub = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fse_traffic_ptrn_over_sub);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_traffic_ptrn_bursty = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fse_traffic_ptrn_bursty);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_traffic_ptrn_interactive = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fse_traffic_ptrn_interactive);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_traffic_ptrn_periodic = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fse_traffic_ptrn_periodic);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_hwqueue_alloc = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fse_hwqueue_alloc);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_hwqueue_created = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fse_hwqueue_created);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_hwqueue_send_to_host = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fse_hwqueue_send_to_host);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mcast_entry = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mcast_entry);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "bcast_entry = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;bcast_entry);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_update_peer_cache = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;htt_update_peer_cache);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_learning_frame = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;htt_learning_frame);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_invalid_peer = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fse_invalid_peer);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mec_notify = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;mec_notify);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -2415,24 +2342,24 @@ htt_print_tx_de_classify_status_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_TX_DE_CLASSIFY_STATUS_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "eok = %u",</div><div class='del'>-			   htt_stats_buf-&gt;eok);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "classify_done = %u",</div><div class='del'>-			   htt_stats_buf-&gt;classify_done);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "lookup_failed = %u",</div><div class='del'>-			   htt_stats_buf-&gt;lookup_failed);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "send_host_dhcp = %u",</div><div class='del'>-			   htt_stats_buf-&gt;send_host_dhcp);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "send_host_mcast = %u",</div><div class='del'>-			   htt_stats_buf-&gt;send_host_mcast);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "send_host_unknown_dest = %u",</div><div class='del'>-			   htt_stats_buf-&gt;send_host_unknown_dest);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "send_host = %u",</div><div class='del'>-			   htt_stats_buf-&gt;send_host);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "status_invalid = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;status_invalid);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			   "HTT_TX_DE_CLASSIFY_STATUS_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "eok = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;eok);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "classify_done = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;classify_done);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "lookup_failed = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;lookup_failed);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "send_host_dhcp = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;send_host_dhcp);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "send_host_mcast = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;send_host_mcast);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "send_host_unknown_dest = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;send_host_unknown_dest);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "send_host = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;send_host);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "status_invalid = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;status_invalid);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -2451,14 +2378,14 @@ htt_print_tx_de_enqueue_packets_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_TX_DE_ENQUEUE_PACKETS_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "enqueued_pkts = %u",</div><div class='del'>-			htt_stats_buf-&gt;enqueued_pkts);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "to_tqm = %u",</div><div class='del'>-			htt_stats_buf-&gt;to_tqm);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "to_tqm_bypass = %u\n",</div><div class='del'>-			htt_stats_buf-&gt;to_tqm_bypass);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_DE_ENQUEUE_PACKETS_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "enqueued_pkts = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;enqueued_pkts);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "to_tqm = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;to_tqm);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "to_tqm_bypass = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;to_tqm_bypass);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -2477,14 +2404,14 @@ htt_print_tx_de_enqueue_discard_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_TX_DE_ENQUEUE_DISCARD_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "discarded_pkts = %u",</div><div class='del'>-			   htt_stats_buf-&gt;discarded_pkts);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "local_frames = %u",</div><div class='del'>-			   htt_stats_buf-&gt;local_frames);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "is_ext_msdu = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;is_ext_msdu);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_DE_ENQUEUE_DISCARD_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "discarded_pkts = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;discarded_pkts);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "local_frames = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;local_frames);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "is_ext_msdu = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;is_ext_msdu);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -2502,17 +2429,17 @@ static inline void htt_print_tx_de_compl_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_DE_COMPL_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tcl_dummy_frame = %u",</div><div class='del'>-			   htt_stats_buf-&gt;tcl_dummy_frame);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tqm_dummy_frame = %u",</div><div class='del'>-			   htt_stats_buf-&gt;tqm_dummy_frame);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tqm_notify_frame = %u",</div><div class='del'>-			   htt_stats_buf-&gt;tqm_notify_frame);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fw2wbm_enq = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fw2wbm_enq);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tqm_bypass_frame = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;tqm_bypass_frame);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_DE_COMPL_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tcl_dummy_frame = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;tcl_dummy_frame);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tqm_dummy_frame = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;tqm_dummy_frame);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tqm_notify_frame = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;tqm_notify_frame);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fw2wbm_enq = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fw2wbm_enq);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tqm_bypass_frame = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;tqm_bypass_frame);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -2531,24 +2458,13 @@ htt_print_tx_de_fw2wbm_ring_full_hist_tlv(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char fw2wbm_ring_full_hist[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> 	u16  num_elements = tag_len &gt;&gt; 2;</div><div class='del'>-	u32  required_buffer_size = HTT_MAX_PRINT_CHAR_PER_ELEM * num_elements;</div><div class='del'>-</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_TX_DE_FW2WBM_RING_FULL_HIST_TLV");</div><div class='del'>-</div><div class='del'>-	if (required_buffer_size &lt; HTT_MAX_STRING_LEN) {</div><div class='del'>-		ARRAY_TO_STRING(fw2wbm_ring_full_hist,</div><div class='del'>-				htt_stats_buf-&gt;fw2wbm_ring_full_hist,</div><div class='del'>-				num_elements);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "fw2wbm_ring_full_hist = %s\n",</div><div class='del'>-				   fw2wbm_ring_full_hist);</div><div class='del'>-	} else {</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "INSUFFICIENT PRINT BUFFER ");</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_DE_FW2WBM_RING_FULL_HIST_TLV");</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;fw2wbm_ring_full_hist,</div><div class='add'>+			   "fw2wbm_ring_full_hist", num_elements, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -2566,21 +2482,21 @@ htt_print_tx_de_cmn_stats_tlv(const void *tag_buf, struct debug_htt_stats_req *s</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_DE_CMN_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mac_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mac_id__word &amp; 0xFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tcl2fw_entry_count = %u",</div><div class='del'>-			   htt_stats_buf-&gt;tcl2fw_entry_count);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "not_to_fw = %u",</div><div class='del'>-			   htt_stats_buf-&gt;not_to_fw);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "invalid_pdev_vdev_peer = %u",</div><div class='del'>-			   htt_stats_buf-&gt;invalid_pdev_vdev_peer);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tcl_res_invalid_addrx = %u",</div><div class='del'>-			   htt_stats_buf-&gt;tcl_res_invalid_addrx);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "wbm2fw_entry_count = %u",</div><div class='del'>-			   htt_stats_buf-&gt;wbm2fw_entry_count);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "invalid_pdev = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;invalid_pdev);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_DE_CMN_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf-&gt;mac_id__word));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tcl2fw_entry_count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;tcl2fw_entry_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "not_to_fw = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;not_to_fw);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "invalid_pdev_vdev_peer = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;invalid_pdev_vdev_peer);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tcl_res_invalid_addrx = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;tcl_res_invalid_addrx);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "wbm2fw_entry_count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;wbm2fw_entry_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "invalid_pdev = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;invalid_pdev);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -2597,52 +2513,51 @@ static inline void htt_print_ring_if_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char low_wm_hit_count[HTT_MAX_STRING_LEN] = {0};</div><div class='del'>-	char high_wm_hit_count[HTT_MAX_STRING_LEN] = {0};</div><div class='del'>-</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_RING_IF_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "base_addr = %u",</div><div class='del'>-			   htt_stats_buf-&gt;base_addr);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "elem_size = %u",</div><div class='del'>-			   htt_stats_buf-&gt;elem_size);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_elems = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_elems__prefetch_tail_idx &amp; 0xFFFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "prefetch_tail_idx = %u",</div><div class='del'>-			   (htt_stats_buf-&gt;num_elems__prefetch_tail_idx &amp;</div><div class='del'>-			   0xFFFF0000) &gt;&gt; 16);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "head_idx = %u",</div><div class='del'>-			   htt_stats_buf-&gt;head_idx__tail_idx &amp; 0xFFFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tail_idx = %u",</div><div class='del'>-			   (htt_stats_buf-&gt;head_idx__tail_idx &amp; 0xFFFF0000) &gt;&gt; 16);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "shadow_head_idx = %u",</div><div class='del'>-			   htt_stats_buf-&gt;shadow_head_idx__shadow_tail_idx &amp; 0xFFFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "shadow_tail_idx = %u",</div><div class='del'>-			   (htt_stats_buf-&gt;shadow_head_idx__shadow_tail_idx &amp;</div><div class='del'>-			   0xFFFF0000) &gt;&gt; 16);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_tail_incr = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_tail_incr);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "lwm_thresh = %u",</div><div class='del'>-			   htt_stats_buf-&gt;lwm_thresh__hwm_thresh &amp; 0xFFFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "hwm_thresh = %u",</div><div class='del'>-			   (htt_stats_buf-&gt;lwm_thresh__hwm_thresh &amp; 0xFFFF0000) &gt;&gt; 16);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "overrun_hit_count = %u",</div><div class='del'>-			   htt_stats_buf-&gt;overrun_hit_count);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "underrun_hit_count = %u",</div><div class='del'>-			   htt_stats_buf-&gt;underrun_hit_count);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "prod_blockwait_count = %u",</div><div class='del'>-			   htt_stats_buf-&gt;prod_blockwait_count);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "cons_blockwait_count = %u",</div><div class='del'>-			   htt_stats_buf-&gt;cons_blockwait_count);</div><div class='del'>-</div><div class='del'>-	ARRAY_TO_STRING(low_wm_hit_count, htt_stats_buf-&gt;low_wm_hit_count,</div><div class='del'>-			HTT_STATS_LOW_WM_BINS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "low_wm_hit_count = %s ",</div><div class='del'>-			   low_wm_hit_count);</div><div class='del'>-</div><div class='del'>-	ARRAY_TO_STRING(high_wm_hit_count, htt_stats_buf-&gt;high_wm_hit_count,</div><div class='del'>-			HTT_STATS_HIGH_WM_BINS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "high_wm_hit_count = %s\n",</div><div class='del'>-			   high_wm_hit_count);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_RING_IF_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "base_addr = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;base_addr);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "elem_size = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;elem_size);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_elems = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_RING_IF_STATS_NUM_ELEMS,</div><div class='add'>+				   htt_stats_buf-&gt;num_elems__prefetch_tail_idx));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "prefetch_tail_idx = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_RING_IF_STATS_PREFETCH_TAIL_INDEX,</div><div class='add'>+				   htt_stats_buf-&gt;num_elems__prefetch_tail_idx));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "head_idx = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_RING_IF_STATS_HEAD_IDX,</div><div class='add'>+				   htt_stats_buf-&gt;head_idx__tail_idx));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tail_idx = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_RING_IF_STATS_TAIL_IDX,</div><div class='add'>+				   htt_stats_buf-&gt;head_idx__tail_idx));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "shadow_head_idx = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_RING_IF_STATS_SHADOW_HEAD_IDX,</div><div class='add'>+				   htt_stats_buf-&gt;shadow_head_idx__shadow_tail_idx));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "shadow_tail_idx = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_RING_IF_STATS_SHADOW_TAIL_IDX,</div><div class='add'>+				   htt_stats_buf-&gt;shadow_head_idx__shadow_tail_idx));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_tail_incr = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_tail_incr);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "lwm_thresh = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_RING_IF_STATS_LWM_THRESH,</div><div class='add'>+				   htt_stats_buf-&gt;lwm_thresh__hwm_thresh));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hwm_thresh = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_RING_IF_STATS_HWM_THRESH,</div><div class='add'>+				   htt_stats_buf-&gt;lwm_thresh__hwm_thresh));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "overrun_hit_count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;overrun_hit_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "underrun_hit_count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;underrun_hit_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "prod_blockwait_count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;prod_blockwait_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "cons_blockwait_count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;cons_blockwait_count);</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;low_wm_hit_count,</div><div class='add'>+			   "low_wm_hit_count", HTT_STATS_LOW_WM_BINS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;high_wm_hit_count,</div><div class='add'>+			   "high_wm_hit_count", HTT_STATS_HIGH_WM_BINS, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -2660,11 +2575,11 @@ static inline void htt_print_ring_if_cmn_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_RING_IF_CMN_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mac_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mac_id__word &amp; 0xFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_records = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;num_records);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_RING_IF_CMN_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf-&gt;mac_id__word));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_records = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_records);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -2682,16 +2597,12 @@ static inline void htt_print_sfm_client_user_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char dwords_used_by_user_n[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> 	u16 num_elems = tag_len &gt;&gt; 2;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_SFM_CLIENT_USER_TLV_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_SFM_CLIENT_USER_TLV_V:\n");</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(dwords_used_by_user_n,</div><div class='del'>-			htt_stats_buf-&gt;dwords_used_by_user_n,</div><div class='del'>-			num_elems);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "dwords_used_by_user_n = %s\n",</div><div class='del'>-			   dwords_used_by_user_n);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;dwords_used_by_user_n,</div><div class='add'>+			   "dwords_used_by_user_n", num_elems, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -2709,21 +2620,21 @@ static inline void htt_print_sfm_client_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_SFM_CLIENT_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "client_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;client_id);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "buf_min = %u",</div><div class='del'>-			   htt_stats_buf-&gt;buf_min);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "buf_max = %u",</div><div class='del'>-			   htt_stats_buf-&gt;buf_max);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "buf_busy = %u",</div><div class='del'>-			   htt_stats_buf-&gt;buf_busy);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "buf_alloc = %u",</div><div class='del'>-			   htt_stats_buf-&gt;buf_alloc);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "buf_avail = %u",</div><div class='del'>-			   htt_stats_buf-&gt;buf_avail);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_users = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;num_users);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_SFM_CLIENT_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "client_id = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;client_id);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "buf_min = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;buf_min);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "buf_max = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;buf_max);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "buf_busy = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;buf_busy);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "buf_alloc = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;buf_alloc);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "buf_avail = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;buf_avail);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_users = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_users);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -2741,17 +2652,17 @@ static inline void htt_print_sfm_cmn_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_SFM_CMN_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mac_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mac_id__word &amp; 0xFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "buf_total = %u",</div><div class='del'>-			   htt_stats_buf-&gt;buf_total);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mem_empty = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mem_empty);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "deallocate_bufs = %u",</div><div class='del'>-			   htt_stats_buf-&gt;deallocate_bufs);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_records = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;num_records);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_SFM_CMN_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf-&gt;mac_id__word));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "buf_total = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;buf_total);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mem_empty = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mem_empty);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "deallocate_bufs = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;deallocate_bufs);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_records = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_records);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -2769,42 +2680,51 @@ static inline void htt_print_sring_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_SRING_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mac_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mac_id__ring_id__arena__ep &amp; 0xFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ring_id = %u",</div><div class='del'>-			   (htt_stats_buf-&gt;mac_id__ring_id__arena__ep &amp; 0xFF00) &gt;&gt; 8);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "arena = %u",</div><div class='del'>-			   (htt_stats_buf-&gt;mac_id__ring_id__arena__ep &amp; 0xFF0000) &gt;&gt; 16);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ep = %u",</div><div class='del'>-			   (htt_stats_buf-&gt;mac_id__ring_id__arena__ep &amp; 0x1000000) &gt;&gt; 24);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "base_addr_lsb = 0x%x",</div><div class='del'>-			   htt_stats_buf-&gt;base_addr_lsb);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "base_addr_msb = 0x%x",</div><div class='del'>-			   htt_stats_buf-&gt;base_addr_msb);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ring_size = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ring_size);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "elem_size = %u",</div><div class='del'>-			   htt_stats_buf-&gt;elem_size);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_avail_words = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_avail_words__num_valid_words &amp; 0xFFFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_valid_words = %u",</div><div class='del'>-			   (htt_stats_buf-&gt;num_avail_words__num_valid_words &amp;</div><div class='del'>-			   0xFFFF0000) &gt;&gt; 16);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "head_ptr = %u",</div><div class='del'>-			   htt_stats_buf-&gt;head_ptr__tail_ptr &amp; 0xFFFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tail_ptr = %u",</div><div class='del'>-			   (htt_stats_buf-&gt;head_ptr__tail_ptr &amp; 0xFFFF0000) &gt;&gt; 16);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "consumer_empty = %u",</div><div class='del'>-			   htt_stats_buf-&gt;consumer_empty__producer_full &amp; 0xFFFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "producer_full = %u",</div><div class='del'>-			   (htt_stats_buf-&gt;consumer_empty__producer_full &amp;</div><div class='del'>-			   0xFFFF0000) &gt;&gt; 16);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "prefetch_count = %u",</div><div class='del'>-			   htt_stats_buf-&gt;prefetch_count__internal_tail_ptr &amp; 0xFFFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "internal_tail_ptr = %u\n",</div><div class='del'>-			   (htt_stats_buf-&gt;prefetch_count__internal_tail_ptr &amp;</div><div class='del'>-			   0xFFFF0000) &gt;&gt; 16);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_SRING_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_SRING_STATS_MAC_ID,</div><div class='add'>+				   htt_stats_buf-&gt;mac_id__ring_id__arena__ep));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ring_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_SRING_STATS_RING_ID,</div><div class='add'>+				   htt_stats_buf-&gt;mac_id__ring_id__arena__ep));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "arena = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_SRING_STATS_ARENA,</div><div class='add'>+				   htt_stats_buf-&gt;mac_id__ring_id__arena__ep));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ep = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_SRING_STATS_EP,</div><div class='add'>+				   htt_stats_buf-&gt;mac_id__ring_id__arena__ep));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "base_addr_lsb = 0x%x\n",</div><div class='add'>+			 htt_stats_buf-&gt;base_addr_lsb);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "base_addr_msb = 0x%x\n",</div><div class='add'>+			 htt_stats_buf-&gt;base_addr_msb);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ring_size = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ring_size);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "elem_size = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;elem_size);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_avail_words = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_SRING_STATS_NUM_AVAIL_WORDS,</div><div class='add'>+				   htt_stats_buf-&gt;num_avail_words__num_valid_words));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_valid_words = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_SRING_STATS_NUM_VALID_WORDS,</div><div class='add'>+				   htt_stats_buf-&gt;num_avail_words__num_valid_words));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "head_ptr = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_SRING_STATS_HEAD_PTR,</div><div class='add'>+				   htt_stats_buf-&gt;head_ptr__tail_ptr));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tail_ptr = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_SRING_STATS_TAIL_PTR,</div><div class='add'>+				   htt_stats_buf-&gt;head_ptr__tail_ptr));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "consumer_empty = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_SRING_STATS_CONSUMER_EMPTY,</div><div class='add'>+				   htt_stats_buf-&gt;consumer_empty__producer_full));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "producer_full = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_SRING_STATS_PRODUCER_FULL,</div><div class='add'>+				   htt_stats_buf-&gt;consumer_empty__producer_full));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "prefetch_count = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_SRING_STATS_PREFETCH_COUNT,</div><div class='add'>+				   htt_stats_buf-&gt;prefetch_count__internal_tail_ptr));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "internal_tail_ptr = %lu\n\n",</div><div class='add'>+			 FIELD_GET(HTT_SRING_STATS_INTERNAL_TAIL_PTR,</div><div class='add'>+				   htt_stats_buf-&gt;prefetch_count__internal_tail_ptr));</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -2822,9 +2742,9 @@ static inline void htt_print_sring_cmn_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_SRING_CMN_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_records = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;num_records);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_SRING_CMN_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_records = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_records);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -2842,165 +2762,115 @@ static inline void htt_print_tx_pdev_rate_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> 	u8 j;</div><div class='del'>-	char str_buf[HTT_MAX_STRING_LEN] = {0};</div><div class='del'>-	char *tx_gi[HTT_TX_PEER_STATS_NUM_GI_COUNTERS] = {NULL};</div><div class='del'>-</div><div class='del'>-	for (j = 0; j &lt; HTT_TX_PEER_STATS_NUM_GI_COUNTERS; j++) {</div><div class='del'>-		tx_gi[j] = kmalloc(HTT_MAX_STRING_LEN, GFP_ATOMIC);</div><div class='del'>-		if (!tx_gi[j])</div><div class='del'>-			goto fail;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_TX_PDEV_RATE_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mac_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mac_id__word &amp; 0xFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_ldpc = %u",</div><div class='del'>-			   htt_stats_buf-&gt;tx_ldpc);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ac_mu_mimo_tx_ldpc = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ac_mu_mimo_tx_ldpc);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_mimo_tx_ldpc = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ax_mu_mimo_tx_ldpc);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ofdma_tx_ldpc = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ofdma_tx_ldpc);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rts_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rts_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rts_success = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rts_success);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ack_rssi = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ack_rssi);</div><div class='del'>-</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "Legacy CCK Rates: 1 Mbps: %u, 2 Mbps: %u, 5.5 Mbps: %u, 11 Mbps: %u",</div><div class='del'>-			   htt_stats_buf-&gt;tx_legacy_cck_rate[0],</div><div class='del'>-			   htt_stats_buf-&gt;tx_legacy_cck_rate[1],</div><div class='del'>-			   htt_stats_buf-&gt;tx_legacy_cck_rate[2],</div><div class='del'>-			   htt_stats_buf-&gt;tx_legacy_cck_rate[3]);</div><div class='del'>-</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "Legacy OFDM Rates: 6 Mbps: %u, 9 Mbps: %u, 12 Mbps: %u, 18 Mbps: %u\n"</div><div class='del'>-			   "                   24 Mbps: %u, 36 Mbps: %u, 48 Mbps: %u, 54 Mbps: %u",</div><div class='del'>-			   htt_stats_buf-&gt;tx_legacy_ofdm_rate[0],</div><div class='del'>-			   htt_stats_buf-&gt;tx_legacy_ofdm_rate[1],</div><div class='del'>-			   htt_stats_buf-&gt;tx_legacy_ofdm_rate[2],</div><div class='del'>-			   htt_stats_buf-&gt;tx_legacy_ofdm_rate[3],</div><div class='del'>-			   htt_stats_buf-&gt;tx_legacy_ofdm_rate[4],</div><div class='del'>-			   htt_stats_buf-&gt;tx_legacy_ofdm_rate[5],</div><div class='del'>-			   htt_stats_buf-&gt;tx_legacy_ofdm_rate[6],</div><div class='del'>-			   htt_stats_buf-&gt;tx_legacy_ofdm_rate[7]);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;tx_mcs,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_mcs = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;ac_mu_mimo_tx_mcs,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ac_mu_mimo_tx_mcs = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;ax_mu_mimo_tx_mcs,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_mimo_tx_mcs = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;ofdma_tx_mcs,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ofdma_tx_mcs = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;tx_nss,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_nss = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;ac_mu_mimo_tx_nss,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ac_mu_mimo_tx_nss = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;ax_mu_mimo_tx_nss,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_mimo_tx_nss = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;ofdma_tx_nss,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ofdma_tx_nss = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;tx_bw,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_BW_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_bw = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;ac_mu_mimo_tx_bw,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_BW_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ac_mu_mimo_tx_bw = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;ax_mu_mimo_tx_bw,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_BW_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ax_mu_mimo_tx_bw = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;ofdma_tx_bw,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_BW_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ofdma_tx_bw = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;tx_stbc,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_stbc = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;tx_pream,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_PREAMBLE_TYPES);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_pream = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HE LTF: 1x: %u, 2x: %u, 4x: %u",</div><div class='del'>-			   htt_stats_buf-&gt;tx_he_ltf[1],</div><div class='del'>-			   htt_stats_buf-&gt;tx_he_ltf[2],</div><div class='del'>-			   htt_stats_buf-&gt;tx_he_ltf[3]);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_PDEV_RATE_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf-&gt;mac_id__word));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_ldpc = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;tx_ldpc);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_tx_ldpc = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ac_mu_mimo_tx_ldpc);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_tx_ldpc = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ax_mu_mimo_tx_ldpc);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ofdma_tx_ldpc = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ofdma_tx_ldpc);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rts_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rts_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rts_success = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rts_success);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ack_rssi = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ack_rssi);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "Legacy CCK Rates: 1 Mbps: %u, 2 Mbps: %u, 5.5 Mbps: %u, 11 Mbps: %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;tx_legacy_cck_rate[0],</div><div class='add'>+			 htt_stats_buf-&gt;tx_legacy_cck_rate[1],</div><div class='add'>+			 htt_stats_buf-&gt;tx_legacy_cck_rate[2],</div><div class='add'>+			 htt_stats_buf-&gt;tx_legacy_cck_rate[3]);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "Legacy OFDM Rates: 6 Mbps: %u, 9 Mbps: %u, 12 Mbps: %u, 18 Mbps: %u\n"</div><div class='add'>+			 "                   24 Mbps: %u, 36 Mbps: %u, 48 Mbps: %u, 54 Mbps: %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;tx_legacy_ofdm_rate[0],</div><div class='add'>+			 htt_stats_buf-&gt;tx_legacy_ofdm_rate[1],</div><div class='add'>+			 htt_stats_buf-&gt;tx_legacy_ofdm_rate[2],</div><div class='add'>+			 htt_stats_buf-&gt;tx_legacy_ofdm_rate[3],</div><div class='add'>+			 htt_stats_buf-&gt;tx_legacy_ofdm_rate[4],</div><div class='add'>+			 htt_stats_buf-&gt;tx_legacy_ofdm_rate[5],</div><div class='add'>+			 htt_stats_buf-&gt;tx_legacy_ofdm_rate[6],</div><div class='add'>+			 htt_stats_buf-&gt;tx_legacy_ofdm_rate[7]);</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;tx_mcs, "tx_mcs",</div><div class='add'>+			   HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;ac_mu_mimo_tx_mcs,</div><div class='add'>+			   "ac_mu_mimo_tx_mcs", HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;ax_mu_mimo_tx_mcs,</div><div class='add'>+			   "ax_mu_mimo_tx_mcs", HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;ofdma_tx_mcs, "ofdma_tx_mcs",</div><div class='add'>+			   HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;tx_nss, "tx_nss",</div><div class='add'>+			   HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;ac_mu_mimo_tx_nss,</div><div class='add'>+			   "ac_mu_mimo_tx_nss",</div><div class='add'>+			   HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;ax_mu_mimo_tx_nss,</div><div class='add'>+			   "ax_mu_mimo_tx_nss",</div><div class='add'>+			   HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;ofdma_tx_nss, "ofdma_tx_nss",</div><div class='add'>+			   HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;tx_bw, "tx_bw",</div><div class='add'>+			   HTT_TX_PDEV_STATS_NUM_BW_COUNTERS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;ac_mu_mimo_tx_bw,</div><div class='add'>+			   "ac_mu_mimo_tx_bw", HTT_TX_PDEV_STATS_NUM_BW_COUNTERS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;ax_mu_mimo_tx_bw,</div><div class='add'>+			   "ax_mu_mimo_tx_bw",</div><div class='add'>+			   HTT_TX_PDEV_STATS_NUM_BW_COUNTERS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;ofdma_tx_bw, "ofdma_tx_bw",</div><div class='add'>+			   HTT_TX_PDEV_STATS_NUM_BW_COUNTERS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;tx_stbc, "tx_stbc",</div><div class='add'>+			   HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;tx_pream, "tx_pream",</div><div class='add'>+			   HTT_TX_PDEV_STATS_NUM_PREAMBLE_TYPES, "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HE LTF: 1x: %u, 2x: %u, 4x: %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;tx_he_ltf[1],</div><div class='add'>+			 htt_stats_buf-&gt;tx_he_ltf[2],</div><div class='add'>+			 htt_stats_buf-&gt;tx_he_ltf[3]);</div><div class='ctx'> </div><div class='ctx'> 	/* SU GI Stats */</div><div class='ctx'> 	for (j = 0; j &lt; HTT_TX_PDEV_STATS_NUM_GI_COUNTERS; j++) {</div><div class='del'>-		ARRAY_TO_STRING(tx_gi[j], htt_stats_buf-&gt;tx_gi[j],</div><div class='del'>-				HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_gi[%u] = %s ",</div><div class='del'>-				   j, tx_gi[j]);</div><div class='add'>+		len += scnprintf(buf + len, (buf_len - len),</div><div class='add'>+				 "tx_gi[%u] = ", j);</div><div class='add'>+		PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;tx_gi[j], NULL,</div><div class='add'>+				   HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* AC MU-MIMO GI Stats */</div><div class='ctx'> 	for (j = 0; j &lt; HTT_TX_PDEV_STATS_NUM_GI_COUNTERS; j++) {</div><div class='del'>-		ARRAY_TO_STRING(tx_gi[j], htt_stats_buf-&gt;ac_mu_mimo_tx_gi[j],</div><div class='del'>-				HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "ac_mu_mimo_tx_gi[%u] = %s ",</div><div class='del'>-				   j, tx_gi[j]);</div><div class='add'>+		len += scnprintf(buf + len, (buf_len - len),</div><div class='add'>+				 "ac_mu_mimo_tx_gi[%u] = ", j);</div><div class='add'>+		PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;ac_mu_mimo_tx_gi[j],</div><div class='add'>+				   NULL, HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* AX MU-MIMO GI Stats */</div><div class='ctx'> 	for (j = 0; j &lt; HTT_TX_PDEV_STATS_NUM_GI_COUNTERS; j++) {</div><div class='del'>-		ARRAY_TO_STRING(tx_gi[j], htt_stats_buf-&gt;ax_mu_mimo_tx_gi[j],</div><div class='del'>-				HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "ax_mu_mimo_tx_gi[%u] = %s ",</div><div class='del'>-				   j, tx_gi[j]);</div><div class='add'>+		len += scnprintf(buf + len, (buf_len - len),</div><div class='add'>+				 "ax_mu_mimo_tx_gi[%u] = ", j);</div><div class='add'>+		PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;ax_mu_mimo_tx_gi[j],</div><div class='add'>+				   NULL, HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* DL OFDMA GI Stats */</div><div class='ctx'> 	for (j = 0; j &lt; HTT_TX_PDEV_STATS_NUM_GI_COUNTERS; j++) {</div><div class='del'>-		ARRAY_TO_STRING(tx_gi[j], htt_stats_buf-&gt;ofdma_tx_gi[j],</div><div class='del'>-				HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len, "ofdma_tx_gi[%u] = %s ",</div><div class='del'>-				   j, tx_gi[j]);</div><div class='add'>+		len += scnprintf(buf + len, (buf_len - len),</div><div class='add'>+				 "ofdma_tx_gi[%u] = ", j);</div><div class='add'>+		PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;ofdma_tx_gi[j], NULL,</div><div class='add'>+				   HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;tx_dcm,</div><div class='del'>-			HTT_TX_PDEV_STATS_NUM_DCM_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_dcm = %s\n", str_buf);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;tx_dcm, "tx_dcm",</div><div class='add'>+			   HTT_TX_PDEV_STATS_NUM_DCM_COUNTERS, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -3008,9 +2878,6 @@ static inline void htt_print_tx_pdev_rate_stats_tlv(const void *tag_buf,</div><div class='ctx'> 		buf[len] = 0;</div><div class='ctx'> </div><div class='ctx'> 	stats_req-&gt;buf_len = len;</div><div class='del'>-fail:</div><div class='del'>-	for (j = 0; j &lt; HTT_TX_PEER_STATS_NUM_GI_COUNTERS; j++)</div><div class='del'>-		kfree(tx_gi[j]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void htt_print_rx_pdev_rate_stats_tlv(const void *tag_buf,</div><div class='hunk'>@@ -3021,226 +2888,215 @@ static inline void htt_print_rx_pdev_rate_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> 	u8 i, j;</div><div class='del'>-	u16 index = 0;</div><div class='del'>-	char *rssi_chain[HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS] = {NULL};</div><div class='del'>-	char *rx_gi[HTT_RX_PDEV_STATS_NUM_GI_COUNTERS] = {NULL};</div><div class='del'>-	char str_buf[HTT_MAX_STRING_LEN] = {0};</div><div class='del'>-	char *rx_pilot_evm_db[HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS] = {NULL};</div><div class='del'>-</div><div class='del'>-	for (j = 0; j &lt; HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS; j++) {</div><div class='del'>-		rssi_chain[j] = kmalloc(HTT_MAX_STRING_LEN, GFP_ATOMIC);</div><div class='del'>-		if (!rssi_chain[j])</div><div class='del'>-			goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (j = 0; j &lt; HTT_RX_PDEV_STATS_NUM_GI_COUNTERS; j++) {</div><div class='del'>-		rx_gi[j] = kmalloc(HTT_MAX_STRING_LEN, GFP_ATOMIC);</div><div class='del'>-		if (!rx_gi[j])</div><div class='del'>-			goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (j = 0; j &lt; HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS; j++) {</div><div class='del'>-		rx_pilot_evm_db[j] = kmalloc(HTT_MAX_STRING_LEN, GFP_ATOMIC);</div><div class='del'>-		if (!rx_pilot_evm_db[j])</div><div class='del'>-			goto fail;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_RX_PDEV_RATE_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mac_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mac_id__word &amp; 0xFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "nsts = %u",</div><div class='del'>-			   htt_stats_buf-&gt;nsts);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_ldpc = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rx_ldpc);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rts_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rts_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rssi_mgmt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rssi_mgmt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rssi_data = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rssi_data);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rssi_comb = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rssi_comb);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rssi_in_dbm = %d",</div><div class='del'>-			   htt_stats_buf-&gt;rssi_in_dbm);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;rx_mcs,</div><div class='del'>-			HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_mcs = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;rx_nss,</div><div class='del'>-			HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_nss = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;rx_dcm,</div><div class='del'>-			HTT_RX_PDEV_STATS_NUM_DCM_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_dcm = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;rx_stbc,</div><div class='del'>-			HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_stbc = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;rx_bw,</div><div class='del'>-			HTT_RX_PDEV_STATS_NUM_BW_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_bw = %s ", str_buf);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_evm_nss_count = %u",</div><div class='del'>-			htt_stats_buf-&gt;nss_count);</div><div class='del'>-</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_evm_pilot_count = %u",</div><div class='del'>-			htt_stats_buf-&gt;pilot_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_RX_PDEV_RATE_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf-&gt;mac_id__word));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "nsts = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;nsts);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_ldpc = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_ldpc);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rts_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rts_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rssi_mgmt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rssi_mgmt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rssi_data = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rssi_data);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rssi_comb = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rssi_comb);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rssi_in_dbm = %d\n",</div><div class='add'>+			 htt_stats_buf-&gt;rssi_in_dbm);</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_mcs, "rx_mcs",</div><div class='add'>+			   HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_nss, "rx_nss",</div><div class='add'>+			   HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_dcm, "rx_dcm",</div><div class='add'>+			   HTT_RX_PDEV_STATS_NUM_DCM_COUNTERS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_stbc, "rx_stbc",</div><div class='add'>+			   HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_bw, "rx_bw",</div><div class='add'>+			   HTT_RX_PDEV_STATS_NUM_BW_COUNTERS, "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_evm_nss_count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;nss_count);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_evm_pilot_count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;pilot_count);</div><div class='ctx'> </div><div class='ctx'> 	for (j = 0; j &lt; HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS; j++) {</div><div class='del'>-		index = 0;</div><div class='del'>-</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "pilot_evm_db[%u] = ", j);</div><div class='ctx'> 		for (i = 0; i &lt; HTT_RX_PDEV_STATS_RXEVM_MAX_PILOTS_PER_NSS; i++)</div><div class='del'>-			index += scnprintf(&amp;rx_pilot_evm_db[j][index],</div><div class='del'>-					  HTT_MAX_STRING_LEN - index,</div><div class='del'>-					  " %u:%d,",</div><div class='del'>-					  i,</div><div class='del'>-					  htt_stats_buf-&gt;rx_pilot_evm_db[j][i]);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len, "pilot_evm_dB[%u] = %s ",</div><div class='del'>-				   j, rx_pilot_evm_db[j]);</div><div class='add'>+			len += scnprintf(buf + len,</div><div class='add'>+					 buf_len - len,</div><div class='add'>+					 " %u:%d,",</div><div class='add'>+					 i,</div><div class='add'>+					 htt_stats_buf-&gt;rx_pilot_evm_db[j][i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	index = 0;</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "pilot_evm_db_mean = ");</div><div class='ctx'> 	for (i = 0; i &lt; HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS; i++)</div><div class='del'>-		index += scnprintf(&amp;str_buf[index],</div><div class='del'>-				  HTT_MAX_STRING_LEN - index,</div><div class='del'>-				  " %u:%d,", i, htt_stats_buf-&gt;rx_pilot_evm_db_mean[i]);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "pilot_evm_dB_mean = %s ", str_buf);</div><div class='add'>+		len += scnprintf(buf + len,</div><div class='add'>+				 buf_len - len,</div><div class='add'>+				 " %u:%d,", i,</div><div class='add'>+				 htt_stats_buf-&gt;rx_pilot_evm_db_mean[i]);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='ctx'> </div><div class='ctx'> 	for (j = 0; j &lt; HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS; j++) {</div><div class='del'>-		ARRAY_TO_STRING(rssi_chain[j], htt_stats_buf-&gt;rssi_chain[j],</div><div class='del'>-				HTT_RX_PDEV_STATS_NUM_BW_COUNTERS);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len, "rssi_chain[%u] = %s ",</div><div class='del'>-				   j, rssi_chain[j]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "rssi_chain[%u] = ", j);</div><div class='add'>+		PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rssi_chain[j], NULL,</div><div class='add'>+				   HTT_RX_PDEV_STATS_NUM_BW_COUNTERS, "\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (j = 0; j &lt; HTT_RX_PDEV_STATS_NUM_GI_COUNTERS; j++) {</div><div class='del'>-		ARRAY_TO_STRING(rx_gi[j], htt_stats_buf-&gt;rx_gi[j],</div><div class='del'>-				HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_gi[%u] = %s ",</div><div class='del'>-				   j, rx_gi[j]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "rx_gi[%u] = ", j);</div><div class='add'>+		PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_gi[j], NULL,</div><div class='add'>+				   HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;rx_pream,</div><div class='del'>-			HTT_RX_PDEV_STATS_NUM_PREAMBLE_TYPES);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_pream = %s", str_buf);</div><div class='del'>-</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_11ax_su_ext = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rx_11ax_su_ext);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_11ac_mumimo = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rx_11ac_mumimo);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_11ax_mumimo = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rx_11ax_mumimo);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_11ax_ofdma = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rx_11ax_ofdma);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "txbf = %u",</div><div class='del'>-			   htt_stats_buf-&gt;txbf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;rx_legacy_cck_rate,</div><div class='del'>-			HTT_RX_PDEV_STATS_NUM_LEGACY_CCK_STATS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_legacy_cck_rate = %s ",</div><div class='del'>-			   str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;rx_legacy_ofdm_rate,</div><div class='del'>-			HTT_RX_PDEV_STATS_NUM_LEGACY_OFDM_STATS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_legacy_ofdm_rate = %s ",</div><div class='del'>-			   str_buf);</div><div class='del'>-</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_active_dur_us_low = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rx_active_dur_us_low);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_active_dur_us_high = %u",</div><div class='del'>-			htt_stats_buf-&gt;rx_active_dur_us_high);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_11ax_ul_ofdma = %u",</div><div class='del'>-			htt_stats_buf-&gt;rx_11ax_ul_ofdma);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;ul_ofdma_rx_mcs,</div><div class='del'>-			HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ul_ofdma_rx_mcs = %s ", str_buf);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_pream, "rx_pream",</div><div class='add'>+			   HTT_RX_PDEV_STATS_NUM_PREAMBLE_TYPES, "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_11ax_su_ext = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_11ax_su_ext);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_11ac_mumimo = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_11ac_mumimo);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_11ax_mumimo = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_11ax_mumimo);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_11ax_ofdma = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_11ax_ofdma);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "txbf = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;txbf);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nrx_su_ndpa = %u",</div><div class='add'>+			 htt_stats_buf-&gt;rx_su_ndpa);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_11ax_su_txbf_mcs,</div><div class='add'>+			   "rx_11ax_su_txbf_mcs", HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS,</div><div class='add'>+			   "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nrx_mu_ndpa = %u",</div><div class='add'>+			 htt_stats_buf-&gt;rx_mu_ndpa);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_11ax_mu_txbf_mcs,</div><div class='add'>+			   "rx_11ax_mu_txbf_mcs", HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS,</div><div class='add'>+			   "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nrx_br_poll = %u",</div><div class='add'>+			 htt_stats_buf-&gt;rx_br_poll);</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_legacy_cck_rate,</div><div class='add'>+			   "rx_legacy_cck_rate",</div><div class='add'>+			   HTT_RX_PDEV_STATS_NUM_LEGACY_CCK_STATS, "\n");</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_legacy_ofdm_rate,</div><div class='add'>+			   "rx_legacy_ofdm_rate",</div><div class='add'>+			   HTT_RX_PDEV_STATS_NUM_LEGACY_OFDM_STATS, "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_active_dur_us_low = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_active_dur_us_low);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_active_dur_us_high = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_active_dur_us_high);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_11ax_ul_ofdma = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_11ax_ul_ofdma);</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;ul_ofdma_rx_mcs,</div><div class='add'>+			   "ul_ofdma_rx_mcs",</div><div class='add'>+			   HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='ctx'> </div><div class='ctx'> 	for (j = 0; j &lt; HTT_RX_PDEV_STATS_NUM_GI_COUNTERS; j++) {</div><div class='del'>-		ARRAY_TO_STRING(rx_gi[j], htt_stats_buf-&gt;ul_ofdma_rx_gi[j],</div><div class='del'>-				HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len, "ul_ofdma_rx_gi[%u] = %s ",</div><div class='del'>-				   j, rx_gi[j]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ul_ofdma_rx_gi[%u] = ", j);</div><div class='add'>+		PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;ul_ofdma_rx_gi[j], NULL,</div><div class='add'>+				   HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;ul_ofdma_rx_nss,</div><div class='del'>-			HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ul_ofdma_rx_nss = %s ", str_buf);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;ul_ofdma_rx_nss,</div><div class='add'>+			   "ul_ofdma_rx_nss",</div><div class='add'>+			   HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS, "\n");</div><div class='ctx'> </div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;ul_ofdma_rx_bw,</div><div class='del'>-			HTT_RX_PDEV_STATS_NUM_BW_COUNTERS);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ul_ofdma_rx_bw = %s ", str_buf);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;ul_ofdma_rx_bw, "ul_ofdma_rx_bw",</div><div class='add'>+			   HTT_RX_PDEV_STATS_NUM_BW_COUNTERS, "\n");</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ul_ofdma_rx_stbc = %u",</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ul_ofdma_rx_stbc = %u\n",</div><div class='ctx'> 			htt_stats_buf-&gt;ul_ofdma_rx_stbc);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ul_ofdma_rx_ldpc = %u",</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ul_ofdma_rx_ldpc = %u\n",</div><div class='ctx'> 			htt_stats_buf-&gt;ul_ofdma_rx_ldpc);</div><div class='ctx'> </div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;rx_ulofdma_non_data_ppdu,</div><div class='del'>-			HTT_RX_PDEV_MAX_OFDMA_NUM_USER);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_ulofdma_non_data_ppdu = %s ",</div><div class='del'>-			   str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;rx_ulofdma_data_ppdu,</div><div class='del'>-			HTT_RX_PDEV_MAX_OFDMA_NUM_USER);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_ulofdma_data_ppdu = %s ",</div><div class='del'>-			   str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;rx_ulofdma_mpdu_ok,</div><div class='del'>-			HTT_RX_PDEV_MAX_OFDMA_NUM_USER);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_ulofdma_mpdu_ok = %s ", str_buf);</div><div class='del'>-</div><div class='del'>-	memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='del'>-	ARRAY_TO_STRING(str_buf, htt_stats_buf-&gt;rx_ulofdma_mpdu_fail,</div><div class='del'>-			HTT_RX_PDEV_MAX_OFDMA_NUM_USER);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_ulofdma_mpdu_fail = %s",</div><div class='del'>-			   str_buf);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_ulofdma_non_data_ppdu,</div><div class='add'>+			   "rx_ulofdma_non_data_ppdu",</div><div class='add'>+			   HTT_RX_PDEV_MAX_OFDMA_NUM_USER, "\n");</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_ulofdma_data_ppdu,</div><div class='add'>+			   "rx_ulofdma_data_ppdu", HTT_RX_PDEV_MAX_OFDMA_NUM_USER, "\n");</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_ulofdma_mpdu_ok,</div><div class='add'>+			   "rx_ulofdma_mpdu_ok", HTT_RX_PDEV_MAX_OFDMA_NUM_USER, "\n");</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_ulofdma_mpdu_fail,</div><div class='add'>+			   "rx_ulofdma_mpdu_fail", HTT_RX_PDEV_MAX_OFDMA_NUM_USER, "\n");</div><div class='ctx'> </div><div class='ctx'> 	for (j = 0; j &lt; HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS; j++) {</div><div class='del'>-		index = 0;</div><div class='del'>-		memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "rx_ul_fd_rssi: nss[%u] = ", j);</div><div class='ctx'> 		for (i = 0; i &lt; HTT_RX_PDEV_MAX_OFDMA_NUM_USER; i++)</div><div class='del'>-			index += scnprintf(&amp;str_buf[index],</div><div class='del'>-					  HTT_MAX_STRING_LEN - index,</div><div class='del'>-					  " %u:%d,",</div><div class='del'>-					  i, htt_stats_buf-&gt;rx_ul_fd_rssi[j][i]);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "rx_ul_fd_rssi: nss[%u] = %s", j, str_buf);</div><div class='add'>+			len += scnprintf(buf + len,</div><div class='add'>+					 buf_len - len,</div><div class='add'>+					 " %u:%d,",</div><div class='add'>+					 i, htt_stats_buf-&gt;rx_ul_fd_rssi[j][i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "per_chain_rssi_pkt_type = %#x",</div><div class='del'>-			   htt_stats_buf-&gt;per_chain_rssi_pkt_type);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_ulofdma_non_data_nusers,</div><div class='add'>+			   "rx_ulofdma_non_data_nusers", HTT_RX_PDEV_MAX_OFDMA_NUM_USER,</div><div class='add'>+			   "\n");</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_ulofdma_data_nusers,</div><div class='add'>+			   "rx_ulofdma_data_nusers", HTT_RX_PDEV_MAX_OFDMA_NUM_USER,</div><div class='add'>+			   "\n");</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_11ax_dl_ofdma_mcs,</div><div class='add'>+			   "rx_11ax_dl_ofdma_mcs", HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS,</div><div class='add'>+			   "\n");</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_11ax_dl_ofdma_ru,</div><div class='add'>+			   "rx_11ax_dl_ofdma_ru", HTT_RX_PDEV_STATS_NUM_RU_SIZE_COUNTERS,</div><div class='add'>+			   "\n");</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_ulmumimo_non_data_ppdu,</div><div class='add'>+			   "rx_ulmumimo_non_data_ppdu", HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER,</div><div class='add'>+			   "\n");</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_ulmumimo_data_ppdu,</div><div class='add'>+			   "rx_ulmumimo_data_ppdu", HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER,</div><div class='add'>+			   "\n");</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_ulmumimo_mpdu_ok,</div><div class='add'>+			   "rx_ulmumimo_mpdu_ok", HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER,</div><div class='add'>+			   "\n");</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rx_ulmumimo_mpdu_fail,</div><div class='add'>+			   "rx_ulmumimo_mpdu_fail", HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER,</div><div class='add'>+			   "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "per_chain_rssi_pkt_type = %#x\n",</div><div class='add'>+			 htt_stats_buf-&gt;per_chain_rssi_pkt_type);</div><div class='ctx'> </div><div class='ctx'> 	for (j = 0; j &lt; HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS; j++) {</div><div class='del'>-		index = 0;</div><div class='del'>-		memset(str_buf, 0x0, HTT_MAX_STRING_LEN);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "rx_per_chain_rssi_in_dbm[%u] = ", j);</div><div class='ctx'> 		for (i = 0; i &lt; HTT_RX_PDEV_STATS_NUM_BW_COUNTERS; i++)</div><div class='del'>-			index += scnprintf(&amp;str_buf[index],</div><div class='del'>-					  HTT_MAX_STRING_LEN - index,</div><div class='del'>-					  " %u:%d,",</div><div class='del'>-					  i,</div><div class='del'>-					  htt_stats_buf-&gt;rx_per_chain_rssi_in_dbm[j][i]);</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "rx_per_chain_rssi_in_dbm[%u] = %s ", j, str_buf);</div><div class='add'>+			len += scnprintf(buf + len,</div><div class='add'>+					 buf_len - len,</div><div class='add'>+					 " %u:%d,",</div><div class='add'>+					 i,</div><div class='add'>+					 htt_stats_buf-&gt;rx_per_chain_rssi_in_dbm[j][i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='ctx'> 	}</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -3248,16 +3104,6 @@ static inline void htt_print_rx_pdev_rate_stats_tlv(const void *tag_buf,</div><div class='ctx'> 		buf[len] = 0;</div><div class='ctx'> </div><div class='ctx'> 	stats_req-&gt;buf_len = len;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	for (j = 0; j &lt; HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS; j++)</div><div class='del'>-		kfree(rssi_chain[j]);</div><div class='del'>-</div><div class='del'>-	for (j = 0; j &lt; HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS; j++)</div><div class='del'>-		kfree(rx_pilot_evm_db[j]);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; HTT_RX_PDEV_STATS_NUM_GI_COUNTERS; i++)</div><div class='del'>-		kfree(rx_gi[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void htt_print_rx_soc_fw_stats_tlv(const void *tag_buf,</div><div class='hunk'>@@ -3268,34 +3114,34 @@ static inline void htt_print_rx_soc_fw_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_RX_SOC_FW_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fw_reo_ring_data_msdu = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fw_reo_ring_data_msdu);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fw_to_host_data_msdu_bcmc = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fw_to_host_data_msdu_bcmc);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fw_to_host_data_msdu_uc = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fw_to_host_data_msdu_uc);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "ofld_remote_data_buf_recycle_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ofld_remote_data_buf_recycle_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "ofld_remote_free_buf_indication_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ofld_remote_free_buf_indication_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "ofld_buf_to_host_data_msdu_uc = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ofld_buf_to_host_data_msdu_uc);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "reo_fw_ring_to_host_data_msdu_uc = %u",</div><div class='del'>-			   htt_stats_buf-&gt;reo_fw_ring_to_host_data_msdu_uc);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "wbm_sw_ring_reap = %u",</div><div class='del'>-			   htt_stats_buf-&gt;wbm_sw_ring_reap);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "wbm_forward_to_host_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;wbm_forward_to_host_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "wbm_target_recycle_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;wbm_target_recycle_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "target_refill_ring_recycle_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;target_refill_ring_recycle_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_RX_SOC_FW_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fw_reo_ring_data_msdu = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fw_reo_ring_data_msdu);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fw_to_host_data_msdu_bcmc = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fw_to_host_data_msdu_bcmc);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fw_to_host_data_msdu_uc = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fw_to_host_data_msdu_uc);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "ofld_remote_data_buf_recycle_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ofld_remote_data_buf_recycle_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "ofld_remote_free_buf_indication_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ofld_remote_free_buf_indication_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "ofld_buf_to_host_data_msdu_uc = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ofld_buf_to_host_data_msdu_uc);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "reo_fw_ring_to_host_data_msdu_uc = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;reo_fw_ring_to_host_data_msdu_uc);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "wbm_sw_ring_reap = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;wbm_sw_ring_reap);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "wbm_forward_to_host_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;wbm_forward_to_host_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "wbm_target_recycle_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;wbm_target_recycle_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "target_refill_ring_recycle_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;target_refill_ring_recycle_cnt);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -3314,17 +3160,13 @@ htt_print_rx_soc_fw_refill_ring_empty_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char refill_ring_empty_cnt[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> 	u16 num_elems = min_t(u16, (tag_len &gt;&gt; 2), HTT_RX_STATS_REFILL_MAX_RING);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_RX_SOC_FW_REFILL_RING_EMPTY_TLV_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_RX_SOC_FW_REFILL_RING_EMPTY_TLV_V:\n");</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(refill_ring_empty_cnt,</div><div class='del'>-			htt_stats_buf-&gt;refill_ring_empty_cnt,</div><div class='del'>-			num_elems);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "refill_ring_empty_cnt = %s\n",</div><div class='del'>-			   refill_ring_empty_cnt);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;refill_ring_empty_cnt,</div><div class='add'>+			   "refill_ring_empty_cnt", num_elems, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -3344,17 +3186,13 @@ htt_print_rx_soc_fw_refill_ring_num_rxdma_err_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char rxdma_err_cnt[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> 	u16 num_elems = min_t(u16, (tag_len &gt;&gt; 2), HTT_RX_RXDMA_MAX_ERR_CODE);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_RX_SOC_FW_REFILL_RING_NUM_RXDMA_ERR_TLV_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_RX_SOC_FW_REFILL_RING_NUM_RXDMA_ERR_TLV_V:\n");</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(rxdma_err_cnt,</div><div class='del'>-			htt_stats_buf-&gt;rxdma_err,</div><div class='del'>-			num_elems);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rxdma_err = %s\n",</div><div class='del'>-			   rxdma_err_cnt);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;rxdma_err, "rxdma_err",</div><div class='add'>+			   num_elems, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -3373,17 +3211,13 @@ htt_print_rx_soc_fw_refill_ring_num_reo_err_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char reo_err_cnt[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> 	u16 num_elems = min_t(u16, (tag_len &gt;&gt; 2), HTT_RX_REO_MAX_ERR_CODE);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_RX_SOC_FW_REFILL_RING_NUM_REO_ERR_TLV_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_RX_SOC_FW_REFILL_RING_NUM_REO_ERR_TLV_V:\n");</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(reo_err_cnt,</div><div class='del'>-			htt_stats_buf-&gt;reo_err,</div><div class='del'>-			num_elems);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "reo_err = %s\n",</div><div class='del'>-			   reo_err_cnt);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;reo_err, "reo_err",</div><div class='add'>+			   num_elems, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -3402,27 +3236,27 @@ htt_print_rx_reo_debug_stats_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_RX_REO_RESOURCE_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sample_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;sample_id);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "total_max = %u",</div><div class='del'>-			   htt_stats_buf-&gt;total_max);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "total_avg = %u",</div><div class='del'>-			   htt_stats_buf-&gt;total_avg);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "total_sample = %u",</div><div class='del'>-			   htt_stats_buf-&gt;total_sample);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "non_zeros_avg = %u",</div><div class='del'>-			   htt_stats_buf-&gt;non_zeros_avg);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "non_zeros_sample = %u",</div><div class='del'>-			   htt_stats_buf-&gt;non_zeros_sample);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "last_non_zeros_max = %u",</div><div class='del'>-			   htt_stats_buf-&gt;last_non_zeros_max);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "last_non_zeros_min %u",</div><div class='del'>-			   htt_stats_buf-&gt;last_non_zeros_min);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "last_non_zeros_avg %u",</div><div class='del'>-			   htt_stats_buf-&gt;last_non_zeros_avg);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "last_non_zeros_sample %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;last_non_zeros_sample);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_RX_REO_RESOURCE_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sample_id = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;sample_id);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "total_max = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;total_max);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "total_avg = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;total_avg);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "total_sample = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;total_sample);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "non_zeros_avg = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;non_zeros_avg);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "non_zeros_sample = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;non_zeros_sample);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "last_non_zeros_max = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;last_non_zeros_max);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "last_non_zeros_min %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;last_non_zeros_min);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "last_non_zeros_avg %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;last_non_zeros_avg);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "last_non_zeros_sample %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;last_non_zeros_sample);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -3441,17 +3275,13 @@ htt_print_rx_soc_fw_refill_ring_num_refill_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char refill_ring_num_refill[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> 	u16 num_elems = min_t(u16, (tag_len &gt;&gt; 2), HTT_RX_STATS_REFILL_MAX_RING);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_RX_SOC_FW_REFILL_RING_NUM_REFILL_TLV_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_RX_SOC_FW_REFILL_RING_NUM_REFILL_TLV_V:\n");</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(refill_ring_num_refill,</div><div class='del'>-			htt_stats_buf-&gt;refill_ring_num_refill,</div><div class='del'>-			num_elems);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "refill_ring_num_refill = %s\n",</div><div class='del'>-			   refill_ring_num_refill);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;refill_ring_num_refill,</div><div class='add'>+			   "refill_ring_num_refill", num_elems, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -3468,113 +3298,106 @@ static inline void htt_print_rx_pdev_fw_stats_tlv(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char fw_ring_mgmt_subtype[HTT_MAX_STRING_LEN] = {0};</div><div class='del'>-	char fw_ring_ctrl_subtype[HTT_MAX_STRING_LEN] = {0};</div><div class='del'>-</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_RX_PDEV_FW_STATS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mac_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mac_id__word &amp; 0xFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ppdu_recvd = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ppdu_recvd);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdu_cnt_fcs_ok = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdu_cnt_fcs_ok);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdu_cnt_fcs_err = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mpdu_cnt_fcs_err);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tcp_msdu_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;tcp_msdu_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "tcp_ack_msdu_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;tcp_ack_msdu_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "udp_msdu_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;udp_msdu_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "other_msdu_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;other_msdu_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fw_ring_mpdu_ind = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fw_ring_mpdu_ind);</div><div class='del'>-</div><div class='del'>-	ARRAY_TO_STRING(fw_ring_mgmt_subtype,</div><div class='del'>-			htt_stats_buf-&gt;fw_ring_mgmt_subtype,</div><div class='del'>-			HTT_STATS_SUBTYPE_MAX);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fw_ring_mgmt_subtype = %s ",</div><div class='del'>-			   fw_ring_mgmt_subtype);</div><div class='del'>-</div><div class='del'>-	ARRAY_TO_STRING(fw_ring_ctrl_subtype,</div><div class='del'>-			htt_stats_buf-&gt;fw_ring_ctrl_subtype,</div><div class='del'>-			HTT_STATS_SUBTYPE_MAX);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fw_ring_ctrl_subtype = %s ",</div><div class='del'>-			   fw_ring_ctrl_subtype);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fw_ring_mcast_data_msdu = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fw_ring_mcast_data_msdu);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fw_ring_bcast_data_msdu = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fw_ring_bcast_data_msdu);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fw_ring_ucast_data_msdu = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fw_ring_ucast_data_msdu);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fw_ring_null_data_msdu = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fw_ring_null_data_msdu);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fw_ring_mpdu_drop = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fw_ring_mpdu_drop);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "ofld_local_data_ind_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ofld_local_data_ind_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "ofld_local_data_buf_recycle_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;ofld_local_data_buf_recycle_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "drx_local_data_ind_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;drx_local_data_ind_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "drx_local_data_buf_recycle_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;drx_local_data_buf_recycle_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "local_nondata_ind_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;local_nondata_ind_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "local_nondata_buf_recycle_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;local_nondata_buf_recycle_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fw_status_buf_ring_refill_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fw_status_buf_ring_refill_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fw_status_buf_ring_empty_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fw_status_buf_ring_empty_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fw_pkt_buf_ring_refill_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fw_pkt_buf_ring_refill_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fw_pkt_buf_ring_empty_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fw_pkt_buf_ring_empty_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fw_link_buf_ring_refill_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fw_link_buf_ring_refill_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fw_link_buf_ring_empty_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;fw_link_buf_ring_empty_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "host_pkt_buf_ring_refill_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;host_pkt_buf_ring_refill_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "host_pkt_buf_ring_empty_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;host_pkt_buf_ring_empty_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mon_pkt_buf_ring_refill_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mon_pkt_buf_ring_refill_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mon_pkt_buf_ring_empty_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mon_pkt_buf_ring_empty_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "mon_status_buf_ring_refill_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mon_status_buf_ring_refill_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mon_status_buf_ring_empty_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mon_status_buf_ring_empty_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mon_desc_buf_ring_refill_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mon_desc_buf_ring_refill_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mon_desc_buf_ring_empty_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mon_desc_buf_ring_empty_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mon_dest_ring_update_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mon_dest_ring_update_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mon_dest_ring_full_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mon_dest_ring_full_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_suspend_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rx_suspend_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_suspend_fail_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rx_suspend_fail_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_resume_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rx_resume_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_resume_fail_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rx_resume_fail_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_ring_switch_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rx_ring_switch_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_ring_restore_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rx_ring_restore_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_flush_cnt = %u",</div><div class='del'>-			   htt_stats_buf-&gt;rx_flush_cnt);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "rx_recovery_reset_cnt = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;rx_recovery_reset_cnt);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_RX_PDEV_FW_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf-&gt;mac_id__word));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ppdu_recvd = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ppdu_recvd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_cnt_fcs_ok = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdu_cnt_fcs_ok);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_cnt_fcs_err = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mpdu_cnt_fcs_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tcp_msdu_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;tcp_msdu_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tcp_ack_msdu_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;tcp_ack_msdu_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "udp_msdu_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;udp_msdu_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "other_msdu_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;other_msdu_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fw_ring_mpdu_ind = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fw_ring_mpdu_ind);</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;fw_ring_mgmt_subtype,</div><div class='add'>+			   "fw_ring_mgmt_subtype", HTT_STATS_SUBTYPE_MAX, "\n");</div><div class='add'>+</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;fw_ring_ctrl_subtype,</div><div class='add'>+			   "fw_ring_ctrl_subtype", HTT_STATS_SUBTYPE_MAX, "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fw_ring_mcast_data_msdu = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fw_ring_mcast_data_msdu);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fw_ring_bcast_data_msdu = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fw_ring_bcast_data_msdu);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fw_ring_ucast_data_msdu = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fw_ring_ucast_data_msdu);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fw_ring_null_data_msdu = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fw_ring_null_data_msdu);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fw_ring_mpdu_drop = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fw_ring_mpdu_drop);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ofld_local_data_ind_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ofld_local_data_ind_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "ofld_local_data_buf_recycle_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;ofld_local_data_buf_recycle_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "drx_local_data_ind_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;drx_local_data_ind_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "drx_local_data_buf_recycle_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;drx_local_data_buf_recycle_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "local_nondata_ind_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;local_nondata_ind_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "local_nondata_buf_recycle_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;local_nondata_buf_recycle_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fw_status_buf_ring_refill_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fw_status_buf_ring_refill_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fw_status_buf_ring_empty_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fw_status_buf_ring_empty_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fw_pkt_buf_ring_refill_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fw_pkt_buf_ring_refill_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fw_pkt_buf_ring_empty_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fw_pkt_buf_ring_empty_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fw_link_buf_ring_refill_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fw_link_buf_ring_refill_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fw_link_buf_ring_empty_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fw_link_buf_ring_empty_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "host_pkt_buf_ring_refill_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;host_pkt_buf_ring_refill_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "host_pkt_buf_ring_empty_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;host_pkt_buf_ring_empty_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mon_pkt_buf_ring_refill_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mon_pkt_buf_ring_refill_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mon_pkt_buf_ring_empty_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mon_pkt_buf_ring_empty_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "mon_status_buf_ring_refill_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mon_status_buf_ring_refill_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mon_status_buf_ring_empty_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mon_status_buf_ring_empty_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mon_desc_buf_ring_refill_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mon_desc_buf_ring_refill_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mon_desc_buf_ring_empty_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mon_desc_buf_ring_empty_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mon_dest_ring_update_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mon_dest_ring_update_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mon_dest_ring_full_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mon_dest_ring_full_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_suspend_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_suspend_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_suspend_fail_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_suspend_fail_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_resume_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_resume_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_resume_fail_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_resume_fail_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_ring_switch_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_ring_switch_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_ring_restore_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_ring_restore_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_flush_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_flush_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_recovery_reset_cnt = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_recovery_reset_cnt);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -3592,16 +3415,12 @@ htt_print_rx_pdev_fw_ring_mpdu_err_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char fw_ring_mpdu_err[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_RX_PDEV_FW_RING_MPDU_ERR_TLV_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_RX_PDEV_FW_RING_MPDU_ERR_TLV_V:\n");</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(fw_ring_mpdu_err,</div><div class='del'>-			htt_stats_buf-&gt;fw_ring_mpdu_err,</div><div class='del'>-			HTT_RX_STATS_RXDMA_MAX_ERR);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fw_ring_mpdu_err = %s\n",</div><div class='del'>-			   fw_ring_mpdu_err);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;fw_ring_mpdu_err,</div><div class='add'>+			   "fw_ring_mpdu_err", HTT_RX_STATS_RXDMA_MAX_ERR, "\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -3620,15 +3439,12 @@ htt_print_rx_pdev_fw_mpdu_drop_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char fw_mpdu_drop[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> 	u16 num_elems = min_t(u16, (tag_len &gt;&gt; 2), HTT_RX_STATS_FW_DROP_REASON_MAX);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_RX_PDEV_FW_MPDU_DROP_TLV_V:");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_RX_PDEV_FW_MPDU_DROP_TLV_V:\n");</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(fw_mpdu_drop,</div><div class='del'>-			htt_stats_buf-&gt;fw_mpdu_drop,</div><div class='del'>-			num_elems);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "fw_mpdu_drop = %s\n", fw_mpdu_drop);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;fw_mpdu_drop, "fw_mpdu_drop",</div><div class='add'>+			   num_elems, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -3646,18 +3462,15 @@ htt_print_rx_pdev_fw_stats_phy_err_tlv(const void *tag_buf,</div><div class='ctx'> 	u8 *buf = stats_req-&gt;buf;</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='del'>-	char phy_errs[HTT_MAX_STRING_LEN] = {0};</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_RX_PDEV_FW_STATS_PHY_ERR_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mac_id__word = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mac_id__word);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "total_phy_err_nct = %u",</div><div class='del'>-			   htt_stats_buf-&gt;total_phy_err_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_RX_PDEV_FW_STATS_PHY_ERR_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id__word = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mac_id__word);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "total_phy_err_nct = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;total_phy_err_cnt);</div><div class='ctx'> </div><div class='del'>-	ARRAY_TO_STRING(phy_errs,</div><div class='del'>-			htt_stats_buf-&gt;phy_err,</div><div class='del'>-			HTT_STATS_PHY_ERR_MAX);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "phy_errs = %s\n", phy_errs);</div><div class='add'>+	PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf-&gt;phy_err, "phy_errs",</div><div class='add'>+			   HTT_STATS_PHY_ERR_MAX, "\n\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -3676,20 +3489,20 @@ htt_print_pdev_cca_stats_hist_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "\nHTT_PDEV_CCA_STATS_HIST_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "chan_num = %u",</div><div class='del'>-			   htt_stats_buf-&gt;chan_num);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_records = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_records);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "valid_cca_counters_bitmap = 0x%x",</div><div class='del'>-			   htt_stats_buf-&gt;valid_cca_counters_bitmap);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "collection_interval = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;collection_interval);</div><div class='del'>-</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "HTT_PDEV_STATS_CCA_COUNTERS_TLV:(in usec)");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "|  tx_frame|   rx_frame|   rx_clear| my_rx_frame|        cnt| med_rx_idle| med_tx_idle_global|   cca_obss|");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nHTT_PDEV_CCA_STATS_HIST_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "chan_num = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;chan_num);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_records = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_records);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "valid_cca_counters_bitmap = 0x%x\n",</div><div class='add'>+			 htt_stats_buf-&gt;valid_cca_counters_bitmap);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "collection_interval = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;collection_interval);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_PDEV_STATS_CCA_COUNTERS_TLV:(in usec)\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "|  tx_frame|   rx_frame|   rx_clear| my_rx_frame|        cnt| med_rx_idle| med_tx_idle_global|   cca_obss|\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -3708,16 +3521,16 @@ htt_print_pdev_stats_cca_counters_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "|%10u| %10u| %10u| %11u| %10u| %11u| %18u| %10u|",</div><div class='del'>-			   htt_stats_buf-&gt;tx_frame_usec,</div><div class='del'>-			   htt_stats_buf-&gt;rx_frame_usec,</div><div class='del'>-			   htt_stats_buf-&gt;rx_clear_usec,</div><div class='del'>-			   htt_stats_buf-&gt;my_rx_frame_usec,</div><div class='del'>-			   htt_stats_buf-&gt;usec_cnt,</div><div class='del'>-			   htt_stats_buf-&gt;med_rx_idle_usec,</div><div class='del'>-			   htt_stats_buf-&gt;med_tx_idle_global_usec,</div><div class='del'>-			   htt_stats_buf-&gt;cca_obss_usec);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "|%10u| %10u| %10u| %11u| %10u| %11u| %18u| %10u|\n",</div><div class='add'>+			 htt_stats_buf-&gt;tx_frame_usec,</div><div class='add'>+			 htt_stats_buf-&gt;rx_frame_usec,</div><div class='add'>+			 htt_stats_buf-&gt;rx_clear_usec,</div><div class='add'>+			 htt_stats_buf-&gt;my_rx_frame_usec,</div><div class='add'>+			 htt_stats_buf-&gt;usec_cnt,</div><div class='add'>+			 htt_stats_buf-&gt;med_rx_idle_usec,</div><div class='add'>+			 htt_stats_buf-&gt;med_tx_idle_global_usec,</div><div class='add'>+			 htt_stats_buf-&gt;cca_obss_usec);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -3735,32 +3548,32 @@ static inline void htt_print_hw_stats_whal_tx_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_HW_STATS_WHAL_TX_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "mac_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;mac_id__word &amp; 0xFF);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "last_unpause_ppdu_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;last_unpause_ppdu_id);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "hwsch_unpause_wait_tqm_write = %u",</div><div class='del'>-			   htt_stats_buf-&gt;hwsch_unpause_wait_tqm_write);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "hwsch_dummy_tlv_skipped = %u",</div><div class='del'>-			   htt_stats_buf-&gt;hwsch_dummy_tlv_skipped);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "hwsch_misaligned_offset_received = %u",</div><div class='del'>-			   htt_stats_buf-&gt;hwsch_misaligned_offset_received);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "hwsch_reset_count = %u",</div><div class='del'>-			   htt_stats_buf-&gt;hwsch_reset_count);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "hwsch_dev_reset_war = %u",</div><div class='del'>-			   htt_stats_buf-&gt;hwsch_dev_reset_war);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "hwsch_delayed_pause = %u",</div><div class='del'>-			   htt_stats_buf-&gt;hwsch_delayed_pause);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "hwsch_long_delayed_pause = %u",</div><div class='del'>-			   htt_stats_buf-&gt;hwsch_long_delayed_pause);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sch_rx_ppdu_no_response = %u",</div><div class='del'>-			   htt_stats_buf-&gt;sch_rx_ppdu_no_response);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sch_selfgen_response = %u",</div><div class='del'>-			   htt_stats_buf-&gt;sch_selfgen_response);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sch_rx_sifs_resp_trigger= %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;sch_rx_sifs_resp_trigger);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_HW_STATS_WHAL_TX_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n",</div><div class='add'>+			 FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf-&gt;mac_id__word));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "last_unpause_ppdu_id = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;last_unpause_ppdu_id);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hwsch_unpause_wait_tqm_write = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;hwsch_unpause_wait_tqm_write);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hwsch_dummy_tlv_skipped = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;hwsch_dummy_tlv_skipped);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "hwsch_misaligned_offset_received = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;hwsch_misaligned_offset_received);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hwsch_reset_count = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;hwsch_reset_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hwsch_dev_reset_war = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;hwsch_dev_reset_war);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hwsch_delayed_pause = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;hwsch_delayed_pause);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hwsch_long_delayed_pause = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;hwsch_long_delayed_pause);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sch_rx_ppdu_no_response = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;sch_rx_ppdu_no_response);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sch_selfgen_response = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;sch_selfgen_response);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sch_rx_sifs_resp_trigger= %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;sch_rx_sifs_resp_trigger);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -3779,11 +3592,11 @@ htt_print_pdev_stats_twt_sessions_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_PDEV_STATS_TWT_SESSIONS_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "pdev_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;pdev_id);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_sessions = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;num_sessions);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_PDEV_STATS_TWT_SESSIONS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pdev_id = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;pdev_id);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_sessions = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_sessions);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -3802,27 +3615,33 @@ htt_print_pdev_stats_twt_session_tlv(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "HTT_PDEV_STATS_TWT_SESSION_TLV:");</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "vdev_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;vdev_id);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "peer_mac = %02x:%02x:%02x:%02x:%02x:%02x",</div><div class='del'>-			   htt_stats_buf-&gt;peer_mac.mac_addr_l32 &amp; 0xFF,</div><div class='del'>-			   (htt_stats_buf-&gt;peer_mac.mac_addr_l32 &amp; 0xFF00) &gt;&gt; 8,</div><div class='del'>-			   (htt_stats_buf-&gt;peer_mac.mac_addr_l32 &amp; 0xFF0000) &gt;&gt; 16,</div><div class='del'>-			   (htt_stats_buf-&gt;peer_mac.mac_addr_l32 &amp; 0xFF000000) &gt;&gt; 24,</div><div class='del'>-			   (htt_stats_buf-&gt;peer_mac.mac_addr_h16 &amp; 0xFF),</div><div class='del'>-			   (htt_stats_buf-&gt;peer_mac.mac_addr_h16 &amp; 0xFF00) &gt;&gt; 8);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "flow_id_flags = %u",</div><div class='del'>-			   htt_stats_buf-&gt;flow_id_flags);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "dialog_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;dialog_id);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "wake_dura_us = %u",</div><div class='del'>-			   htt_stats_buf-&gt;wake_dura_us);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "wake_intvl_us = %u",</div><div class='del'>-			   htt_stats_buf-&gt;wake_intvl_us);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "sp_offset_us = %u\n",</div><div class='del'>-			   htt_stats_buf-&gt;sp_offset_us);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_PDEV_STATS_TWT_SESSION_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "vdev_id = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;vdev_id);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "peer_mac = %02lx:%02lx:%02lx:%02lx:%02lx:%02lx\n",</div><div class='add'>+			 FIELD_GET(HTT_MAC_ADDR_L32_0,</div><div class='add'>+				   htt_stats_buf-&gt;peer_mac.mac_addr_l32),</div><div class='add'>+			 FIELD_GET(HTT_MAC_ADDR_L32_1,</div><div class='add'>+				   htt_stats_buf-&gt;peer_mac.mac_addr_l32),</div><div class='add'>+			 FIELD_GET(HTT_MAC_ADDR_L32_2,</div><div class='add'>+				   htt_stats_buf-&gt;peer_mac.mac_addr_l32),</div><div class='add'>+			 FIELD_GET(HTT_MAC_ADDR_L32_3,</div><div class='add'>+				   htt_stats_buf-&gt;peer_mac.mac_addr_l32),</div><div class='add'>+			 FIELD_GET(HTT_MAC_ADDR_H16_0,</div><div class='add'>+				   htt_stats_buf-&gt;peer_mac.mac_addr_h16),</div><div class='add'>+			 FIELD_GET(HTT_MAC_ADDR_H16_1,</div><div class='add'>+				   htt_stats_buf-&gt;peer_mac.mac_addr_h16));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "flow_id_flags = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;flow_id_flags);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "dialog_id = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;dialog_id);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "wake_dura_us = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;wake_dura_us);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "wake_intvl_us = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;wake_intvl_us);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sp_offset_us = %u\n\n",</div><div class='add'>+			 htt_stats_buf-&gt;sp_offset_us);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -3841,21 +3660,21 @@ htt_print_pdev_obss_pd_stats_tlv_v(const void *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "OBSS Tx success PPDU = %u",</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "OBSS Tx success PPDU = %u\n",</div><div class='ctx'> 			   htt_stats_buf-&gt;num_obss_tx_ppdu_success);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "OBSS Tx failures PPDU = %u\n",</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "OBSS Tx failures PPDU = %u\n",</div><div class='ctx'> 			   htt_stats_buf-&gt;num_obss_tx_ppdu_failure);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "Non-SRG Opportunities = %u\n",</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "Non-SRG Opportunities = %u\n",</div><div class='ctx'> 			   htt_stats_buf-&gt;num_non_srg_opportunities);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "Non-SRG tried PPDU = %u\n",</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "Non-SRG tried PPDU = %u\n",</div><div class='ctx'> 			   htt_stats_buf-&gt;num_non_srg_ppdu_tried);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "Non-SRG success PPDU = %u\n",</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "Non-SRG success PPDU = %u\n",</div><div class='ctx'> 			   htt_stats_buf-&gt;num_non_srg_ppdu_success);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "SRG Opportunities = %u\n",</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "SRG Opportunities = %u\n",</div><div class='ctx'> 			   htt_stats_buf-&gt;num_srg_opportunities);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "SRG tried PPDU = %u\n",</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "SRG tried PPDU = %u\n",</div><div class='ctx'> 			   htt_stats_buf-&gt;num_srg_ppdu_tried);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "SRG success PPDU = %u\n",</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "SRG success PPDU = %u\n\n",</div><div class='ctx'> 			   htt_stats_buf-&gt;num_srg_ppdu_success);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len)</div><div class='hunk'>@@ -3878,25 +3697,25 @@ static inline void htt_print_backpressure_stats_tlv_v(const u32 *tag_buf,</div><div class='ctx'> 	u32 len = stats_req-&gt;buf_len;</div><div class='ctx'> 	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "pdev_id = %u",</div><div class='del'>-			   htt_stats_buf-&gt;pdev_id);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "current_head_idx = %u",</div><div class='del'>-			   htt_stats_buf-&gt;current_head_idx);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "current_tail_idx = %u",</div><div class='del'>-			   htt_stats_buf-&gt;current_tail_idx);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len, "num_htt_msgs_sent = %u",</div><div class='del'>-			   htt_stats_buf-&gt;num_htt_msgs_sent);</div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "backpressure_time_ms = %u",</div><div class='del'>-			   htt_stats_buf-&gt;backpressure_time_ms);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pdev_id = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;pdev_id);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "current_head_idx = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;current_head_idx);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "current_tail_idx = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;current_tail_idx);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_htt_msgs_sent = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;num_htt_msgs_sent);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "backpressure_time_ms = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;backpressure_time_ms);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 5; i++)</div><div class='del'>-		len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-				   "backpressure_hist_%u = %u",</div><div class='del'>-				   i + 1, htt_stats_buf-&gt;backpressure_hist[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "backpressure_hist_%u = %u\n",</div><div class='add'>+				 i + 1, htt_stats_buf-&gt;backpressure_hist[i]);</div><div class='ctx'> </div><div class='del'>-	len += HTT_DBG_OUT(buf + len, buf_len - len,</div><div class='del'>-			   "============================");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "============================\n");</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt;= buf_len) {</div><div class='ctx'> 		buf[buf_len - 1] = 0;</div><div class='hunk'>@@ -3907,6 +3726,442 @@ static inline void htt_print_backpressure_stats_tlv_v(const u32 *tag_buf,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline</div><div class='add'>+void htt_print_pdev_tx_rate_txbf_stats_tlv(const void *tag_buf,</div><div class='add'>+					   struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct htt_pdev_txrate_txbf_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_STATS_PDEV_TX_RATE_TXBF_STATS:\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_ol_mcs = ");</div><div class='add'>+	for (i = 0; i &lt; HTT_TX_TXBF_RATE_STATS_NUM_MCS_COUNTERS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "%d:%u,", i, htt_stats_buf-&gt;tx_su_ol_mcs[i]);</div><div class='add'>+	len--;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\ntx_ibf_mcs = ");</div><div class='add'>+	for (i = 0; i &lt; HTT_TX_TXBF_RATE_STATS_NUM_MCS_COUNTERS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "%d:%u,", i, htt_stats_buf-&gt;tx_su_ibf_mcs[i]);</div><div class='add'>+	len--;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\ntx_txbf_mcs =");</div><div class='add'>+	for (i = 0; i &lt; HTT_TX_TXBF_RATE_STATS_NUM_MCS_COUNTERS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "%d:%u,", i, htt_stats_buf-&gt;tx_su_txbf_mcs[i]);</div><div class='add'>+	len--;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\ntx_ol_nss = ");</div><div class='add'>+	for (i = 0; i &lt; HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "%d:%u,", i, htt_stats_buf-&gt;tx_su_ol_nss[i]);</div><div class='add'>+	len--;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\ntx_ibf_nss = ");</div><div class='add'>+	for (i = 0; i &lt; HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "%d:%u,", i, htt_stats_buf-&gt;tx_su_ibf_nss[i]);</div><div class='add'>+	len--;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\ntx_txbf_nss = ");</div><div class='add'>+	for (i = 0; i &lt; HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "%d:%u,", i, htt_stats_buf-&gt;tx_su_txbf_nss[i]);</div><div class='add'>+	len--;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\ntx_ol_bw = ");</div><div class='add'>+	for (i = 0; i &lt; HTT_TX_TXBF_RATE_STATS_NUM_BW_COUNTERS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "%d:%u,", i, htt_stats_buf-&gt;tx_su_ol_bw[i]);</div><div class='add'>+	len--;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\ntx_ibf_bw = ");</div><div class='add'>+	for (i = 0; i &lt; HTT_TX_TXBF_RATE_STATS_NUM_BW_COUNTERS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "%d:%u,", i, htt_stats_buf-&gt;tx_su_ibf_bw[i]);</div><div class='add'>+	len--;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\ntx_txbf_bw = ");</div><div class='add'>+	for (i = 0; i &lt; HTT_TX_TXBF_RATE_STATS_NUM_BW_COUNTERS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "%d:%u,", i, htt_stats_buf-&gt;tx_su_txbf_bw[i]);</div><div class='add'>+	len--;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void htt_print_txbf_ofdma_ndpa_stats_tlv(const void *tag_buf,</div><div class='add'>+					 struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct htt_txbf_ofdma_ndpa_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TXBF_OFDMA_NDPA_STATS_TLV:\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS; i++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ofdma_ndpa_queued_user%d = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ofdma_ndpa_queued[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ofdma_ndpa_tried_user%d = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ofdma_ndpa_tried[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ofdma_ndpa_flushed_user%d = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ofdma_ndpa_flushed[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ofdma_ndpa_err_user%d = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ofdma_ndpa_err[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void htt_print_txbf_ofdma_ndp_stats_tlv(const void *tag_buf,</div><div class='add'>+					struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct htt_txbf_ofdma_ndp_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TXBF_OFDMA_NDP_STATS_TLV:\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS; i++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ofdma_ndp_queued_user%d = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ofdma_ndp_queued[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ofdma_ndp_tried_user%d = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ofdma_ndp_tried[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ofdma_ndp_flushed_user%d = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ofdma_ndp_flushed[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ofdma_ndp_err_user%d = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ofdma_ndp_err[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void htt_print_txbf_ofdma_brp_stats_tlv(const void *tag_buf,</div><div class='add'>+					struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct htt_txbf_ofdma_brp_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TXBF_OFDMA_BRP_STATS_TLV:\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS; i++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ofdma_brpoll_queued_user%d = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ofdma_brpoll_queued[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ofdma_brpoll_tried_user%d = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ofdma_brpoll_tried[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ofdma_brpoll_flushed_user%d = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ofdma_brpoll_flushed[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ofdma_brp_err_user%d = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ofdma_brp_err[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ofdma_brp_err_num_cbf_rcvd_user%d = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ofdma_brp_err_num_cbf_rcvd[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void htt_print_txbf_ofdma_steer_stats_tlv(const void *tag_buf,</div><div class='add'>+					  struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct htt_txbf_ofdma_steer_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TXBF_OFDMA_STEER_STATS_TLV:\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS; i++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ofdma_num_ppdu_steer_user%d = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ofdma_num_ppdu_steer[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ofdma_num_ppdu_ol_user%d = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ofdma_num_ppdu_ol[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ofdma_num_usrs_prefetch_user%d = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ofdma_num_usrs_prefetch[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ofdma_num_usrs_sound_user%d = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ofdma_num_usrs_sound[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ofdma_num_usrs_force_sound_user%d = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;ax_ofdma_num_usrs_force_sound[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void htt_print_phy_counters_tlv(const void *tag_buf,</div><div class='add'>+				struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct htt_phy_counters_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_PHY_COUNTERS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_ofdma_timing_err_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_ofdma_timing_err_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_cck_fail_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_cck_fail_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mactx_abort_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;mactx_abort_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "macrx_abort_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;macrx_abort_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phytx_abort_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;phytx_abort_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phyrx_abort_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;phyrx_abort_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phyrx_defer_abort_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;phyrx_defer_abort_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_gain_adj_lstf_event_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_gain_adj_lstf_event_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_gain_adj_non_legacy_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_gain_adj_non_legacy_cnt);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HTT_MAX_RX_PKT_CNT; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "rx_pkt_cnt[%d] = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;rx_pkt_cnt[i]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HTT_MAX_RX_PKT_CRC_PASS_CNT; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "rx_pkt_crc_pass_cnt[%d] = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;rx_pkt_crc_pass_cnt[i]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HTT_MAX_PER_BLK_ERR_CNT; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "per_blk_err_cnt[%d] = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;per_blk_err_cnt[i]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HTT_MAX_RX_OTA_ERR_CNT; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "rx_ota_err_cnt[%d] = %u\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;rx_ota_err_cnt[i]);</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void htt_print_phy_stats_tlv(const void *tag_buf,</div><div class='add'>+			     struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct htt_phy_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_PHY_STATS_TLV:\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HTT_STATS_MAX_CHAINS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "nf_chain[%d] = %d\n",</div><div class='add'>+				 i, htt_stats_buf-&gt;nf_chain[i]);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "false_radar_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;false_radar_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "radar_cs_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;radar_cs_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ani_level = %d\n",</div><div class='add'>+			 htt_stats_buf-&gt;ani_level);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fw_run_time = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;fw_run_time);</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+htt_print_phy_reset_counters_tlv(const void *tag_buf,</div><div class='add'>+				 u16 tag_len,</div><div class='add'>+				 struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct htt_phy_reset_counters_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_PHY_RESET_COUNTERS_TLV:\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pdev_id = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;pdev_id);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "cf_active_low_fail_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;cf_active_low_fail_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "cf_active_low_pass_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;cf_active_low_pass_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_off_through_vreg_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;phy_off_through_vreg_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "force_calibration_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;force_calibration_cnt);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rf_mode_switch_phy_off_cnt = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;rf_mode_switch_phy_off_cnt);</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+htt_print_phy_reset_stats_tlv(const void *tag_buf,</div><div class='add'>+			      u16 tag_len,</div><div class='add'>+			      struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct htt_phy_reset_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_PHY_RESET_STATS_TLV:\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pdev_id = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;pdev_id);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "chan_mhz = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;chan_mhz);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "chan_band_center_freq1 = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;chan_band_center_freq1);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "chan_band_center_freq2 = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;chan_band_center_freq2);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "chan_phy_mode = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;chan_phy_mode);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "chan_flags = 0x%0x\n",</div><div class='add'>+			 htt_stats_buf-&gt;chan_flags);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "chan_num = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;chan_num);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "reset_cause = 0x%0x\n",</div><div class='add'>+			 htt_stats_buf-&gt;reset_cause);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "prev_reset_cause = 0x%0x\n",</div><div class='add'>+			 htt_stats_buf-&gt;prev_reset_cause);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_warm_reset_src = 0x%0x\n",</div><div class='add'>+			 htt_stats_buf-&gt;phy_warm_reset_src);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_gain_tbl_mode = %d\n",</div><div class='add'>+			 htt_stats_buf-&gt;rx_gain_tbl_mode);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "xbar_val = 0x%0x\n",</div><div class='add'>+			 htt_stats_buf-&gt;xbar_val);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "force_calibration = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;force_calibration);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phyrf_mode = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;phyrf_mode);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_homechan = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;phy_homechan);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_tx_ch_mask = 0x%0x\n",</div><div class='add'>+			 htt_stats_buf-&gt;phy_tx_ch_mask);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_rx_ch_mask = 0x%0x\n",</div><div class='add'>+			 htt_stats_buf-&gt;phy_rx_ch_mask);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phybb_ini_mask = 0x%0x\n",</div><div class='add'>+			 htt_stats_buf-&gt;phybb_ini_mask);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phyrf_ini_mask = 0x%0x\n",</div><div class='add'>+			 htt_stats_buf-&gt;phyrf_ini_mask);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_dfs_en_mask = 0x%0x\n",</div><div class='add'>+			 htt_stats_buf-&gt;phy_dfs_en_mask);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_sscan_en_mask = 0x%0x\n",</div><div class='add'>+			 htt_stats_buf-&gt;phy_sscan_en_mask);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_synth_sel_mask = 0x%0x\n",</div><div class='add'>+			 htt_stats_buf-&gt;phy_synth_sel_mask);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_adfs_freq = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;phy_adfs_freq);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "cck_fir_settings = 0x%0x\n",</div><div class='add'>+			 htt_stats_buf-&gt;cck_fir_settings);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_dyn_pri_chan = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;phy_dyn_pri_chan);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "cca_thresh = 0x%0x\n",</div><div class='add'>+			 htt_stats_buf-&gt;cca_thresh);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "dyn_cca_status = %u\n",</div><div class='add'>+			 htt_stats_buf-&gt;dyn_cca_status);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rxdesense_thresh_hw = 0x%x\n",</div><div class='add'>+			 htt_stats_buf-&gt;rxdesense_thresh_hw);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rxdesense_thresh_sw = 0x%x\n",</div><div class='add'>+			 htt_stats_buf-&gt;rxdesense_thresh_sw);</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void htt_print_peer_ctrl_path_txrx_stats_tlv(const void *tag_buf,</div><div class='add'>+					     struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct htt_peer_ctrl_path_txrx_stats_tlv *htt_stat_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	int i;</div><div class='add'>+	const char *mgmt_frm_type[ATH11K_STATS_MGMT_FRM_TYPE_MAX - 1] = {</div><div class='add'>+		"assoc_req", "assoc_resp",</div><div class='add'>+		"reassoc_req", "reassoc_resp",</div><div class='add'>+		"probe_req", "probe_resp",</div><div class='add'>+		"timing_advertisement", "reserved",</div><div class='add'>+		"beacon", "atim", "disassoc",</div><div class='add'>+		"auth", "deauth", "action", "action_no_ack"};</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_STATS_PEER_CTRL_PATH_TXRX_STATS_TAG:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "peer_mac_addr = %02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='add'>+			 htt_stat_buf-&gt;peer_mac_addr[0], htt_stat_buf-&gt;peer_mac_addr[1],</div><div class='add'>+			 htt_stat_buf-&gt;peer_mac_addr[2], htt_stat_buf-&gt;peer_mac_addr[3],</div><div class='add'>+			 htt_stat_buf-&gt;peer_mac_addr[4], htt_stat_buf-&gt;peer_mac_addr[5]);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "peer_tx_mgmt_subtype:\n");</div><div class='add'>+	for (i = 0; i &lt; ATH11K_STATS_MGMT_FRM_TYPE_MAX - 1; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%s:%u\n",</div><div class='add'>+				 mgmt_frm_type[i],</div><div class='add'>+				 htt_stat_buf-&gt;peer_rx_mgmt_subtype[i]);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "peer_rx_mgmt_subtype:\n");</div><div class='add'>+	for (i = 0; i &lt; ATH11K_STATS_MGMT_FRM_TYPE_MAX - 1; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%s:%u\n",</div><div class='add'>+				 mgmt_frm_type[i],</div><div class='add'>+				 htt_stat_buf-&gt;peer_rx_mgmt_subtype[i]);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath11k_dbg_htt_ext_stats_parse(struct ath11k_base *ab,</div><div class='ctx'> 					  u16 tag, u16 len, const void *tag_buf,</div><div class='ctx'> 					  void *user_data)</div><div class='hunk'>@@ -4258,6 +4513,36 @@ static int ath11k_dbg_htt_ext_stats_parse(struct ath11k_base *ab,</div><div class='ctx'> 	case HTT_STATS_RING_BACKPRESSURE_STATS_TAG:</div><div class='ctx'> 		htt_print_backpressure_stats_tlv_v(tag_buf, user_data);</div><div class='ctx'> 		break;</div><div class='add'>+	case HTT_STATS_PDEV_TX_RATE_TXBF_STATS_TAG:</div><div class='add'>+		htt_print_pdev_tx_rate_txbf_stats_tlv(tag_buf, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TXBF_OFDMA_NDPA_STATS_TAG:</div><div class='add'>+		htt_print_txbf_ofdma_ndpa_stats_tlv(tag_buf, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TXBF_OFDMA_NDP_STATS_TAG:</div><div class='add'>+		htt_print_txbf_ofdma_ndp_stats_tlv(tag_buf, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TXBF_OFDMA_BRP_STATS_TAG:</div><div class='add'>+		htt_print_txbf_ofdma_brp_stats_tlv(tag_buf, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TXBF_OFDMA_STEER_STATS_TAG:</div><div class='add'>+		htt_print_txbf_ofdma_steer_stats_tlv(tag_buf, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PHY_COUNTERS_TAG:</div><div class='add'>+		htt_print_phy_counters_tlv(tag_buf, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PHY_STATS_TAG:</div><div class='add'>+		htt_print_phy_stats_tlv(tag_buf, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PHY_RESET_COUNTERS_TAG:</div><div class='add'>+		htt_print_phy_reset_counters_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PHY_RESET_STATS_TAG:</div><div class='add'>+		htt_print_phy_reset_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PEER_CTRL_PATH_TXRX_STATS_TAG:</div><div class='add'>+		htt_print_peer_ctrl_path_txrx_stats_tlv(tag_buf, stats_req);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4345,8 +4630,7 @@ static ssize_t ath11k_write_htt_stats_type(struct file *file,</div><div class='ctx'> 	if (type &gt;= ATH11K_DBG_HTT_NUM_EXT_STATS)</div><div class='ctx'> 		return -E2BIG;</div><div class='ctx'> </div><div class='del'>-	if (type == ATH11K_DBG_HTT_EXT_STATS_RESET ||</div><div class='del'>-	    type == ATH11K_DBG_HTT_EXT_STATS_PEER_INFO)</div><div class='add'>+	if (type == ATH11K_DBG_HTT_EXT_STATS_RESET)</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;debug.htt_stats.type = type;</div><div class='hunk'>@@ -4407,6 +4691,15 @@ static int ath11k_prep_htt_stats_cfg_params(struct ath11k *ar, u8 type,</div><div class='ctx'> 	case ATH11K_DBG_HTT_EXT_STATS_TX_SOUNDING_INFO:</div><div class='ctx'> 		cfg_params-&gt;cfg0 = HTT_STAT_DEFAULT_CFG0_ACTIVE_VDEVS;</div><div class='ctx'> 		break;</div><div class='add'>+	case ATH11K_DBG_HTT_EXT_STATS_PEER_CTRL_PATH_TXRX_STATS:</div><div class='add'>+		cfg_params-&gt;cfg0 = HTT_STAT_PEER_INFO_MAC_ADDR;</div><div class='add'>+		cfg_params-&gt;cfg1 |= FIELD_PREP(GENMASK(7, 0), mac_addr[0]);</div><div class='add'>+		cfg_params-&gt;cfg1 |= FIELD_PREP(GENMASK(15, 8), mac_addr[1]);</div><div class='add'>+		cfg_params-&gt;cfg1 |= FIELD_PREP(GENMASK(23, 16), mac_addr[2]);</div><div class='add'>+		cfg_params-&gt;cfg1 |= FIELD_PREP(GENMASK(31, 24), mac_addr[3]);</div><div class='add'>+		cfg_params-&gt;cfg2 |= FIELD_PREP(GENMASK(7, 0), mac_addr[4]);</div><div class='add'>+		cfg_params-&gt;cfg2 |= FIELD_PREP(GENMASK(15, 8), mac_addr[5]);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4420,7 +4713,7 @@ int ath11k_debugfs_htt_stats_req(struct ath11k *ar)</div><div class='ctx'> 	u8 type = stats_req-&gt;type;</div><div class='ctx'> 	u64 cookie = 0;</div><div class='ctx'> 	int ret, pdev_id = ar-&gt;pdev-&gt;pdev_id;</div><div class='del'>-	struct htt_ext_stats_cfg_params cfg_params = { 0 };</div><div class='add'>+	struct htt_ext_stats_cfg_params cfg_params = {};</div><div class='ctx'> </div><div class='ctx'> 	init_completion(&amp;stats_req-&gt;cmpln);</div><div class='ctx'> </div><div class='hunk'>@@ -4464,7 +4757,9 @@ static int ath11k_open_htt_stats(struct inode *inode, struct file *file)</div><div class='ctx'> 	u8 type = ar-&gt;debug.htt_stats.type;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (type == ATH11K_DBG_HTT_EXT_STATS_RESET)</div><div class='add'>+	if (type == ATH11K_DBG_HTT_EXT_STATS_RESET ||</div><div class='add'>+	    type == ATH11K_DBG_HTT_EXT_STATS_PEER_INFO ||</div><div class='add'>+	    type == ATH11K_DBG_HTT_EXT_STATS_PEER_CTRL_PATH_TXRX_STATS)</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='hunk'>@@ -4558,7 +4853,7 @@ static ssize_t ath11k_write_htt_stats_reset(struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = file-&gt;private_data;</div><div class='ctx'> 	u8 type;</div><div class='del'>-	struct htt_ext_stats_cfg_params cfg_params = { 0 };</div><div class='add'>+	struct htt_ext_stats_cfg_params cfg_params = {};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = kstrtou8_from_user(user_buf, count, 0, &amp;type);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/debugfs_htt_stats.h b/drivers/net/wireless/ath/ath11k/debugfs_htt_stats.h<br/>index 567a26d485a9..476689bbd4da 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/debugfs_htt_stats.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/debugfs_htt_stats.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/debugfs_htt_stats.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/debugfs_htt_stats.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef DEBUG_HTT_STATS_H</div><div class='hunk'>@@ -102,6 +103,16 @@ enum htt_tlv_tag_t {</div><div class='ctx'> 	HTT_STATS_PDEV_OBSS_PD_TAG                          = 88,</div><div class='ctx'> 	HTT_STATS_HW_WAR_TAG				    = 89,</div><div class='ctx'> 	HTT_STATS_RING_BACKPRESSURE_STATS_TAG		    = 90,</div><div class='add'>+	HTT_STATS_PEER_CTRL_PATH_TXRX_STATS_TAG		    = 101,</div><div class='add'>+	HTT_STATS_PDEV_TX_RATE_TXBF_STATS_TAG		    = 108,</div><div class='add'>+	HTT_STATS_TXBF_OFDMA_NDPA_STATS_TAG		    = 113,</div><div class='add'>+	HTT_STATS_TXBF_OFDMA_NDP_STATS_TAG		    = 114,</div><div class='add'>+	HTT_STATS_TXBF_OFDMA_BRP_STATS_TAG		    = 115,</div><div class='add'>+	HTT_STATS_TXBF_OFDMA_STEER_STATS_TAG		    = 116,</div><div class='add'>+	HTT_STATS_PHY_COUNTERS_TAG			    = 121,</div><div class='add'>+	HTT_STATS_PHY_STATS_TAG				    = 122,</div><div class='add'>+	HTT_STATS_PHY_RESET_COUNTERS_TAG		    = 123,</div><div class='add'>+	HTT_STATS_PHY_RESET_STATS_TAG			    = 124,</div><div class='ctx'> </div><div class='ctx'> 	HTT_STATS_MAX_TAG,</div><div class='ctx'> };</div><div class='hunk'>@@ -134,9 +145,12 @@ enum htt_tx_pdev_underrun_enum {</div><div class='ctx'> /* Bytes stored in little endian order */</div><div class='ctx'> /* Length should be multiple of DWORD */</div><div class='ctx'> struct htt_stats_string_tlv {</div><div class='del'>-	u32 data[0]; /* Can be variable length */</div><div class='add'>+	 /* Can be variable length */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, data);</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+#define HTT_STATS_MAC_ID	GENMASK(7, 0)</div><div class='add'>+</div><div class='ctx'> /* == TX PDEV STATS == */</div><div class='ctx'> struct htt_tx_pdev_stats_cmn_tlv {</div><div class='ctx'> 	u32 mac_id__word;</div><div class='hunk'>@@ -147,7 +161,7 @@ struct htt_tx_pdev_stats_cmn_tlv {</div><div class='ctx'> 	u32 hw_flush;</div><div class='ctx'> 	u32 hw_filt;</div><div class='ctx'> 	u32 tx_abort;</div><div class='del'>-	u32 mpdu_requed;</div><div class='add'>+	u32 mpdu_requeued;</div><div class='ctx'> 	u32 tx_xretry;</div><div class='ctx'> 	u32 data_rc;</div><div class='ctx'> 	u32 mpdu_dropped_xretry;</div><div class='hunk'>@@ -194,27 +208,32 @@ struct htt_tx_pdev_stats_cmn_tlv {</div><div class='ctx'> </div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size */</div><div class='ctx'> struct htt_tx_pdev_stats_urrn_tlv_v {</div><div class='del'>-	u32 urrn_stats[0]; /* HTT_TX_PDEV_MAX_URRN_STATS */</div><div class='add'>+	/* HTT_TX_PDEV_MAX_URRN_STATS */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, urrn_stats);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size */</div><div class='ctx'> struct htt_tx_pdev_stats_flush_tlv_v {</div><div class='del'>-	u32 flush_errs[0]; /* HTT_TX_PDEV_MAX_FLUSH_REASON_STATS */</div><div class='add'>+	/* HTT_TX_PDEV_MAX_FLUSH_REASON_STATS */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, flush_errs);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size */</div><div class='ctx'> struct htt_tx_pdev_stats_sifs_tlv_v {</div><div class='del'>-	u32 sifs_status[0]; /* HTT_TX_PDEV_MAX_SIFS_BURST_STATS */</div><div class='add'>+	/* HTT_TX_PDEV_MAX_SIFS_BURST_STATS */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, sifs_status);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size */</div><div class='ctx'> struct htt_tx_pdev_stats_phy_err_tlv_v {</div><div class='del'>-	u32  phy_errs[0]; /* HTT_TX_PDEV_MAX_PHY_ERR_STATS */</div><div class='add'>+	/* HTT_TX_PDEV_MAX_PHY_ERR_STATS */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, phy_errs);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size */</div><div class='ctx'> struct htt_tx_pdev_stats_sifs_hist_tlv_v {</div><div class='del'>-	u32 sifs_hist_status[0]; /* HTT_TX_PDEV_SIFS_BURST_HIST_STATS */</div><div class='add'>+	/* HTT_TX_PDEV_SIFS_BURST_HIST_STATS */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, sifs_hist_status);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct htt_tx_pdev_stats_tx_ppdu_stats_tlv_v {</div><div class='hunk'>@@ -290,6 +309,10 @@ struct htt_hw_stats_whal_tx_tlv {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ============ PEER STATS ============ */</div><div class='add'>+#define	HTT_MSDU_FLOW_STATS_TX_FLOW_NO	GENMASK(15, 0)</div><div class='add'>+#define	HTT_MSDU_FLOW_STATS_TID_NUM	GENMASK(19, 16)</div><div class='add'>+#define	HTT_MSDU_FLOW_STATS_DROP_RULE	BIT(20)</div><div class='add'>+</div><div class='ctx'> struct htt_msdu_flow_stats_tlv {</div><div class='ctx'> 	u32 last_update_timestamp;</div><div class='ctx'> 	u32 last_add_timestamp;</div><div class='hunk'>@@ -306,6 +329,11 @@ struct htt_msdu_flow_stats_tlv {</div><div class='ctx'> </div><div class='ctx'> #define MAX_HTT_TID_NAME 8</div><div class='ctx'> </div><div class='add'>+#define	HTT_TX_TID_STATS_SW_PEER_ID		GENMASK(15, 0)</div><div class='add'>+#define	HTT_TX_TID_STATS_TID_NUM		GENMASK(31, 16)</div><div class='add'>+#define	HTT_TX_TID_STATS_NUM_SCHED_PENDING	GENMASK(7, 0)</div><div class='add'>+#define	HTT_TX_TID_STATS_NUM_PPDU_IN_HWQ	GENMASK(15, 8)</div><div class='add'>+</div><div class='ctx'> /* Tidq stats */</div><div class='ctx'> struct htt_tx_tid_stats_tlv {</div><div class='ctx'> 	/* Stored as little endian */</div><div class='hunk'>@@ -326,6 +354,11 @@ struct htt_tx_tid_stats_tlv {</div><div class='ctx'> 	u32 tid_tx_airtime;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define	HTT_TX_TID_STATS_V1_SW_PEER_ID		GENMASK(15, 0)</div><div class='add'>+#define	HTT_TX_TID_STATS_V1_TID_NUM		GENMASK(31, 16)</div><div class='add'>+#define	HTT_TX_TID_STATS_V1_NUM_SCHED_PENDING	GENMASK(7, 0)</div><div class='add'>+#define	HTT_TX_TID_STATS_V1_NUM_PPDU_IN_HWQ	GENMASK(15, 8)</div><div class='add'>+</div><div class='ctx'> /* Tidq stats */</div><div class='ctx'> struct htt_tx_tid_stats_v1_tlv {</div><div class='ctx'> 	/* Stored as little endian */</div><div class='hunk'>@@ -348,6 +381,9 @@ struct htt_tx_tid_stats_v1_tlv {</div><div class='ctx'> 	u32 sendn_frms_allowed;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define	HTT_RX_TID_STATS_SW_PEER_ID	GENMASK(15, 0)</div><div class='add'>+#define	HTT_RX_TID_STATS_TID_NUM	GENMASK(31, 16)</div><div class='add'>+</div><div class='ctx'> struct htt_rx_tid_stats_tlv {</div><div class='ctx'> 	u32 sw_peer_id__tid_num;</div><div class='ctx'> 	u8 tid_name[MAX_HTT_TID_NAME];</div><div class='hunk'>@@ -386,6 +422,10 @@ struct htt_peer_stats_cmn_tlv {</div><div class='ctx'> 	u32 inactive_time;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define HTT_PEER_DETAILS_VDEV_ID	GENMASK(7, 0)</div><div class='add'>+#define HTT_PEER_DETAILS_PDEV_ID	GENMASK(15, 8)</div><div class='add'>+#define HTT_PEER_DETAILS_AST_IDX	GENMASK(31, 16)</div><div class='add'>+</div><div class='ctx'> struct htt_peer_details_tlv {</div><div class='ctx'> 	u32 peer_type;</div><div class='ctx'> 	u32 sw_peer_id;</div><div class='hunk'>@@ -510,6 +550,9 @@ struct htt_tx_hwq_mu_mimo_mpdu_stats_tlv {</div><div class='ctx'> 	u32 mu_mimo_ampdu_underrun_usr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define	HTT_TX_HWQ_STATS_MAC_ID	GENMASK(7, 0)</div><div class='add'>+#define	HTT_TX_HWQ_STATS_HWQ_ID	GENMASK(15, 8)</div><div class='add'>+</div><div class='ctx'> struct htt_tx_hwq_mu_mimo_cmn_stats_tlv {</div><div class='ctx'> 	u32 mac_id__hwq_id__word;</div><div class='ctx'> };</div><div class='hunk'>@@ -555,20 +598,20 @@ struct htt_tx_hwq_difs_latency_stats_tlv_v {</div><div class='ctx'> </div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size */</div><div class='ctx'> struct htt_tx_hwq_cmd_result_stats_tlv_v {</div><div class='del'>-	/* Histogram of sched cmd result */</div><div class='del'>-	u32 cmd_result[0]; /* HTT_TX_HWQ_MAX_CMD_RESULT_STATS */</div><div class='add'>+	/* Histogram of sched cmd result, HTT_TX_HWQ_MAX_CMD_RESULT_STATS */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, cmd_result);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size */</div><div class='ctx'> struct htt_tx_hwq_cmd_stall_stats_tlv_v {</div><div class='del'>-	/* Histogram of various pause conitions */</div><div class='del'>-	u32 cmd_stall_status[0]; /* HTT_TX_HWQ_MAX_CMD_STALL_STATS */</div><div class='add'>+	/* Histogram of various pause conitions, HTT_TX_HWQ_MAX_CMD_STALL_STATS */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, cmd_stall_status);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size */</div><div class='ctx'> struct htt_tx_hwq_fes_result_stats_tlv_v {</div><div class='del'>-	/* Histogram of number of user fes result */</div><div class='del'>-	u32 fes_result[0]; /* HTT_TX_HWQ_MAX_FES_RESULT_STATS */</div><div class='add'>+	/* Histogram of number of user fes result, HTT_TX_HWQ_MAX_FES_RESULT_STATS */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, fes_result);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size</div><div class='hunk'>@@ -595,13 +638,13 @@ struct htt_tx_hwq_tried_mpdu_cnt_hist_tlv_v {</div><div class='ctx'>  * completing the burst, we identify the txop used in the burst and</div><div class='ctx'>  * incr the corresponding bin.</div><div class='ctx'>  * Each bin represents 1ms &amp; we have 10 bins in this histogram.</div><div class='del'>- * they are deined in FW using the following macros</div><div class='add'>+ * they are defined in FW using the following macros</div><div class='ctx'>  * #define WAL_MAX_TXOP_USED_CNT_HISTOGRAM 10</div><div class='ctx'>  * #define WAL_TXOP_USED_HISTOGRAM_INTERVAL 1000 ( 1 ms )</div><div class='ctx'>  */</div><div class='ctx'> struct htt_tx_hwq_txop_used_cnt_hist_tlv_v {</div><div class='del'>-	/* Histogram of txop used cnt */</div><div class='del'>-	u32 txop_used_cnt_hist[0]; /* HTT_TX_HWQ_TXOP_USED_CNT_HIST */</div><div class='add'>+	/* Histogram of txop used cnt,  HTT_TX_HWQ_TXOP_USED_CNT_HIST */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, txop_used_cnt_hist);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* == TX SELFGEN STATS == */</div><div class='hunk'>@@ -648,6 +691,7 @@ struct htt_tx_selfgen_ax_stats_tlv {</div><div class='ctx'> 	u32 ax_bsr_trigger;</div><div class='ctx'> 	u32 ax_mu_bar_trigger;</div><div class='ctx'> 	u32 ax_mu_rts_trigger;</div><div class='add'>+	u32 ax_ulmumimo_trigger;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct htt_tx_selfgen_ac_err_stats_tlv {</div><div class='hunk'>@@ -678,12 +722,14 @@ struct htt_tx_selfgen_ax_err_stats_tlv {</div><div class='ctx'> 	u32 ax_bsr_trigger_err;</div><div class='ctx'> 	u32 ax_mu_bar_trigger_err;</div><div class='ctx'> 	u32 ax_mu_rts_trigger_err;</div><div class='add'>+	u32 ax_ulmumimo_trigger_err;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* == TX MU STATS == */</div><div class='ctx'> #define HTT_TX_PDEV_STATS_NUM_AC_MUMIMO_USER_STATS 4</div><div class='ctx'> #define HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS 8</div><div class='ctx'> #define HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS    74</div><div class='add'>+#define HTT_TX_PDEV_STATS_NUM_UL_MUMIMO_USER_STATS 8</div><div class='ctx'> </div><div class='ctx'> struct htt_tx_pdev_mu_mimo_sch_stats_tlv {</div><div class='ctx'> 	/* mu-mimo sw sched cmd stats */</div><div class='hunk'>@@ -700,6 +746,24 @@ struct htt_tx_pdev_mu_mimo_sch_stats_tlv {</div><div class='ctx'> 	u32 ac_mu_mimo_sch_nusers[HTT_TX_PDEV_STATS_NUM_AC_MUMIMO_USER_STATS];</div><div class='ctx'> 	u32 ax_mu_mimo_sch_nusers[HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS];</div><div class='ctx'> 	u32 ax_ofdma_sch_nusers[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS];</div><div class='add'>+	u32 ax_ul_ofdma_basic_sch_nusers[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS];</div><div class='add'>+	u32 ax_ul_ofdma_bsr_sch_nusers[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS];</div><div class='add'>+	u32 ax_ul_ofdma_bar_sch_nusers[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS];</div><div class='add'>+	u32 ax_ul_ofdma_brp_sch_nusers[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS];</div><div class='add'>+</div><div class='add'>+	/* UL MU-MIMO */</div><div class='add'>+	/* ax_ul_mumimo_basic_sch_nusers[i] is the number of basic triggers sent</div><div class='add'>+	 * for (i+1) users</div><div class='add'>+	 */</div><div class='add'>+	u32 ax_ul_mumimo_basic_sch_nusers[HTT_TX_PDEV_STATS_NUM_UL_MUMIMO_USER_STATS];</div><div class='add'>+</div><div class='add'>+	/* ax_ul_mumimo_brp_sch_nusers[i] is the number of brp triggers sent</div><div class='add'>+	 * for (i+1) users</div><div class='add'>+	 */</div><div class='add'>+	u32 ax_ul_mumimo_brp_sch_nusers[HTT_TX_PDEV_STATS_NUM_UL_MUMIMO_USER_STATS];</div><div class='add'>+</div><div class='add'>+	u32 ac_mu_mimo_sch_posted_per_grp_sz[HTT_TX_PDEV_STATS_NUM_AC_MUMIMO_USER_STATS];</div><div class='add'>+	u32 ax_mu_mimo_sch_posted_per_grp_sz[HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct htt_tx_pdev_mu_mimo_mpdu_stats_tlv {</div><div class='hunk'>@@ -748,17 +812,20 @@ struct htt_tx_pdev_mpdu_stats_tlv {</div><div class='ctx'> /* == TX SCHED STATS == */</div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size */</div><div class='ctx'> struct htt_sched_txq_cmd_posted_tlv_v {</div><div class='del'>-	u32 sched_cmd_posted[0]; /* HTT_TX_PDEV_SCHED_TX_MODE_MAX */</div><div class='add'>+	/* HTT_TX_PDEV_SCHED_TX_MODE_MAX */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, sched_cmd_posted);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size */</div><div class='ctx'> struct htt_sched_txq_cmd_reaped_tlv_v {</div><div class='del'>-	u32 sched_cmd_reaped[0]; /* HTT_TX_PDEV_SCHED_TX_MODE_MAX */</div><div class='add'>+	/* HTT_TX_PDEV_SCHED_TX_MODE_MAX */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, sched_cmd_reaped);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size */</div><div class='ctx'> struct htt_sched_txq_sched_order_su_tlv_v {</div><div class='del'>-	u32 sched_order_su[0]; /* HTT_TX_PDEV_NUM_SCHED_ORDER_LOG */</div><div class='add'>+	/* HTT_TX_PDEV_NUM_SCHED_ORDER_LOG */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, sched_order_su);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum htt_sched_txq_sched_ineligibility_tlv_enum {</div><div class='hunk'>@@ -786,9 +853,12 @@ enum htt_sched_txq_sched_ineligibility_tlv_enum {</div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size */</div><div class='ctx'> struct htt_sched_txq_sched_ineligibility_tlv_v {</div><div class='ctx'> 	/* indexed by htt_sched_txq_sched_ineligibility_tlv_enum */</div><div class='del'>-	u32 sched_ineligibility[0];</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, sched_ineligibility);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define	HTT_TX_PDEV_STATS_SCHED_PER_TXQ_MAC_ID	GENMASK(7, 0)</div><div class='add'>+#define	HTT_TX_PDEV_STATS_SCHED_PER_TXQ_ID	GENMASK(15, 8)</div><div class='add'>+</div><div class='ctx'> struct htt_tx_pdev_stats_sched_per_txq_tlv {</div><div class='ctx'> 	u32 mac_id__txq_id__word;</div><div class='ctx'> 	u32 sched_policy;</div><div class='hunk'>@@ -829,18 +899,20 @@ struct htt_stats_tx_sched_cmn_tlv {</div><div class='ctx'> </div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size */</div><div class='ctx'> struct htt_tx_tqm_gen_mpdu_stats_tlv_v {</div><div class='del'>-	u32 gen_mpdu_end_reason[0]; /* HTT_TX_TQM_MAX_GEN_MPDU_END_REASON */</div><div class='add'>+	/* HTT_TX_TQM_MAX_GEN_MPDU_END_REASON */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, gen_mpdu_end_reason);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size */</div><div class='ctx'> struct htt_tx_tqm_list_mpdu_stats_tlv_v {</div><div class='del'>-	u32 list_mpdu_end_reason[0]; /* HTT_TX_TQM_MAX_LIST_MPDU_END_REASON */</div><div class='add'>+	 /* HTT_TX_TQM_MAX_LIST_MPDU_END_REASON */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, list_mpdu_end_reason);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size */</div><div class='ctx'> struct htt_tx_tqm_list_mpdu_cnt_tlv_v {</div><div class='del'>-	u32 list_mpdu_cnt_hist[0];</div><div class='del'>-			/* HTT_TX_TQM_MAX_LIST_MPDU_CNT_HISTOGRAM_BINS */</div><div class='add'>+	/* HTT_TX_TQM_MAX_LIST_MPDU_CNT_HISTOGRAM_BINS */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, list_mpdu_cnt_hist);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct htt_tx_tqm_pdev_stats_tlv_v {</div><div class='hunk'>@@ -910,6 +982,9 @@ struct htt_tx_tqm_error_stats_tlv {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* == TQM CMDQ stats == */</div><div class='add'>+#define	HTT_TX_TQM_CMDQ_STATUS_MAC_ID	GENMASK(7, 0)</div><div class='add'>+#define	HTT_TX_TQM_CMDQ_STATUS_CMDQ_ID	GENMASK(15, 8)</div><div class='add'>+</div><div class='ctx'> struct htt_tx_tqm_cmdq_status_tlv {</div><div class='ctx'> 	u32 mac_id__cmdq_id__word;</div><div class='ctx'> 	u32 sync_cmd;</div><div class='hunk'>@@ -1036,7 +1111,7 @@ struct htt_tx_de_compl_stats_tlv {</div><div class='ctx'>  *                               ENTRIES_PER_BIN_COUNT)</div><div class='ctx'>  */</div><div class='ctx'> struct htt_tx_de_fw2wbm_ring_full_hist_tlv {</div><div class='del'>-	u32 fw2wbm_ring_full_hist[0];</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, fw2wbm_ring_full_hist);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct htt_tx_de_cmn_stats_tlv {</div><div class='hunk'>@@ -1055,6 +1130,15 @@ struct htt_tx_de_cmn_stats_tlv {</div><div class='ctx'> #define HTT_STATS_LOW_WM_BINS      5</div><div class='ctx'> #define HTT_STATS_HIGH_WM_BINS     5</div><div class='ctx'> </div><div class='add'>+#define HTT_RING_IF_STATS_NUM_ELEMS		GENMASK(15, 0)</div><div class='add'>+#define	HTT_RING_IF_STATS_PREFETCH_TAIL_INDEX	GENMASK(31, 16)</div><div class='add'>+#define HTT_RING_IF_STATS_HEAD_IDX		GENMASK(15, 0)</div><div class='add'>+#define HTT_RING_IF_STATS_TAIL_IDX		GENMASK(31, 16)</div><div class='add'>+#define HTT_RING_IF_STATS_SHADOW_HEAD_IDX	GENMASK(15, 0)</div><div class='add'>+#define HTT_RING_IF_STATS_SHADOW_TAIL_IDX	GENMASK(31, 16)</div><div class='add'>+#define HTT_RING_IF_STATS_LWM_THRESH		GENMASK(15, 0)</div><div class='add'>+#define HTT_RING_IF_STATS_HWM_THRESH		GENMASK(31, 16)</div><div class='add'>+</div><div class='ctx'> struct htt_ring_if_stats_tlv {</div><div class='ctx'> 	u32 base_addr; /* DWORD aligned base memory address of the ring */</div><div class='ctx'> 	u32 elem_size;</div><div class='hunk'>@@ -1080,7 +1164,7 @@ struct htt_ring_if_cmn_tlv {</div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size */</div><div class='ctx'> struct htt_sfm_client_user_tlv_v {</div><div class='ctx'> 	/* Number of DWORDS used per user and per client */</div><div class='del'>-	u32 dwords_used_by_user_n[0];</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, dwords_used_by_user_n);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct htt_sfm_client_tlv {</div><div class='hunk'>@@ -1117,6 +1201,19 @@ struct htt_sfm_cmn_tlv {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* == SRNG STATS == */</div><div class='add'>+#define	HTT_SRING_STATS_MAC_ID			GENMASK(7, 0)</div><div class='add'>+#define HTT_SRING_STATS_RING_ID			GENMASK(15, 8)</div><div class='add'>+#define HTT_SRING_STATS_ARENA			GENMASK(23, 16)</div><div class='add'>+#define HTT_SRING_STATS_EP			BIT(24)</div><div class='add'>+#define HTT_SRING_STATS_NUM_AVAIL_WORDS		GENMASK(15, 0)</div><div class='add'>+#define HTT_SRING_STATS_NUM_VALID_WORDS		GENMASK(31, 16)</div><div class='add'>+#define HTT_SRING_STATS_HEAD_PTR		GENMASK(15, 0)</div><div class='add'>+#define HTT_SRING_STATS_TAIL_PTR		GENMASK(31, 16)</div><div class='add'>+#define HTT_SRING_STATS_CONSUMER_EMPTY		GENMASK(15, 0)</div><div class='add'>+#define HTT_SRING_STATS_PRODUCER_FULL		GENMASK(31, 16)</div><div class='add'>+#define HTT_SRING_STATS_PREFETCH_COUNT		GENMASK(15, 0)</div><div class='add'>+#define HTT_SRING_STATS_INTERNAL_TAIL_PTR	GENMASK(31, 16)</div><div class='add'>+</div><div class='ctx'> struct htt_sring_stats_tlv {</div><div class='ctx'> 	u32 mac_id__ring_id__arena__ep;</div><div class='ctx'> 	u32 base_addr_lsb; /* DWORD aligned base memory address of the ring */</div><div class='hunk'>@@ -1235,6 +1332,8 @@ struct htt_tx_pdev_rate_stats_tlv {</div><div class='ctx'> #define HTT_RX_PDEV_STATS_NUM_PREAMBLE_TYPES       HTT_STATS_PREAM_COUNT</div><div class='ctx'> #define HTT_RX_PDEV_MAX_OFDMA_NUM_USER             8</div><div class='ctx'> #define HTT_RX_PDEV_STATS_RXEVM_MAX_PILOTS_PER_NSS 16</div><div class='add'>+#define HTT_RX_PDEV_STATS_NUM_RU_SIZE_COUNTERS     6</div><div class='add'>+#define HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER          8</div><div class='ctx'> </div><div class='ctx'> struct htt_rx_pdev_rate_stats_tlv {</div><div class='ctx'> 	u32 mac_id__word;</div><div class='hunk'>@@ -1313,6 +1412,21 @@ struct htt_rx_pdev_rate_stats_tlv {</div><div class='ctx'> 	u32 per_chain_rssi_pkt_type;</div><div class='ctx'> 	s8 rx_per_chain_rssi_in_dbm[HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS]</div><div class='ctx'> 				   [HTT_RX_PDEV_STATS_NUM_BW_COUNTERS];</div><div class='add'>+</div><div class='add'>+	u32 rx_su_ndpa;</div><div class='add'>+	u32 rx_11ax_su_txbf_mcs[HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	u32 rx_mu_ndpa;</div><div class='add'>+	u32 rx_11ax_mu_txbf_mcs[HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	u32 rx_br_poll;</div><div class='add'>+	u32 rx_11ax_dl_ofdma_mcs[HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	u32 rx_11ax_dl_ofdma_ru[HTT_RX_PDEV_STATS_NUM_RU_SIZE_COUNTERS];</div><div class='add'>+</div><div class='add'>+	u32 rx_ulmumimo_non_data_ppdu[HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER];</div><div class='add'>+	u32 rx_ulmumimo_data_ppdu[HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER];</div><div class='add'>+	u32 rx_ulmumimo_mpdu_ok[HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER];</div><div class='add'>+	u32 rx_ulmumimo_mpdu_fail[HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER];</div><div class='add'>+	u32 rx_ulofdma_non_data_nusers[HTT_RX_PDEV_MAX_OFDMA_NUM_USER];</div><div class='add'>+	u32 rx_ulofdma_data_nusers[HTT_RX_PDEV_MAX_OFDMA_NUM_USER];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* == RX PDEV/SOC STATS == */</div><div class='hunk'>@@ -1335,12 +1449,14 @@ struct htt_rx_soc_fw_stats_tlv {</div><div class='ctx'> </div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size */</div><div class='ctx'> struct htt_rx_soc_fw_refill_ring_empty_tlv_v {</div><div class='del'>-	u32 refill_ring_empty_cnt[0]; /* HTT_RX_STATS_REFILL_MAX_RING */</div><div class='add'>+	/* HTT_RX_STATS_REFILL_MAX_RING */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, refill_ring_empty_cnt);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size */</div><div class='ctx'> struct htt_rx_soc_fw_refill_ring_num_refill_tlv_v {</div><div class='del'>-	u32 refill_ring_num_refill[0]; /* HTT_RX_STATS_REFILL_MAX_RING */</div><div class='add'>+	/* HTT_RX_STATS_REFILL_MAX_RING */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, refill_ring_num_refill);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* RXDMA error code from WBM released packets */</div><div class='hunk'>@@ -1372,7 +1488,7 @@ enum htt_rx_rxdma_error_code_enum {</div><div class='ctx'> </div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size */</div><div class='ctx'> struct htt_rx_soc_fw_refill_ring_num_rxdma_err_tlv_v {</div><div class='del'>-	u32 rxdma_err[0]; /* HTT_RX_RXDMA_MAX_ERR_CODE */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, rxdma_err); /* HTT_RX_RXDMA_MAX_ERR_CODE */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* REO error code from WBM released packets */</div><div class='hunk'>@@ -1404,7 +1520,7 @@ enum htt_rx_reo_error_code_enum {</div><div class='ctx'> </div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size */</div><div class='ctx'> struct htt_rx_soc_fw_refill_ring_num_reo_err_tlv_v {</div><div class='del'>-	u32 reo_err[0]; /* HTT_RX_REO_MAX_ERR_CODE */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, reo_err); /* HTT_RX_REO_MAX_ERR_CODE */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* == RX PDEV STATS == */</div><div class='hunk'>@@ -1521,13 +1637,13 @@ struct htt_rx_pdev_fw_stats_phy_err_tlv {</div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size */</div><div class='ctx'> struct htt_rx_pdev_fw_ring_mpdu_err_tlv_v {</div><div class='ctx'> 	/* Num error MPDU for each RxDMA error type  */</div><div class='del'>-	u32 fw_ring_mpdu_err[0]; /* HTT_RX_STATS_RXDMA_MAX_ERR */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, fw_ring_mpdu_err); /* HTT_RX_STATS_RXDMA_MAX_ERR */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* NOTE: Variable length TLV, use length spec to infer array size */</div><div class='ctx'> struct htt_rx_pdev_fw_mpdu_drop_tlv_v {</div><div class='ctx'> 	/* Num MPDU dropped  */</div><div class='del'>-	u32 fw_mpdu_drop[0]; /* HTT_RX_STATS_FW_DROP_REASON_MAX */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u32, fw_mpdu_drop); /* HTT_RX_STATS_FW_DROP_REASON_MAX */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define HTT_PDEV_CCA_STATS_TX_FRAME_INFO_PRESENT               (0x1)</div><div class='hunk'>@@ -1696,6 +1812,211 @@ struct htt_ring_backpressure_stats_tlv {</div><div class='ctx'> 	u32 backpressure_hist[5];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define HTT_TX_TXBF_RATE_STATS_NUM_MCS_COUNTERS 14</div><div class='add'>+#define HTT_TX_TXBF_RATE_STATS_NUM_BW_COUNTERS 5</div><div class='add'>+#define HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS 8</div><div class='add'>+</div><div class='add'>+struct htt_pdev_txrate_txbf_stats_tlv {</div><div class='add'>+	/* SU TxBF TX MCS stats */</div><div class='add'>+	u32 tx_su_txbf_mcs[HTT_TX_TXBF_RATE_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	/* Implicit BF TX MCS stats */</div><div class='add'>+	u32 tx_su_ibf_mcs[HTT_TX_TXBF_RATE_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	/* Open loop TX MCS stats */</div><div class='add'>+	u32 tx_su_ol_mcs[HTT_TX_TXBF_RATE_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	/* SU TxBF TX NSS stats */</div><div class='add'>+	u32 tx_su_txbf_nss[HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS];</div><div class='add'>+	/* Implicit BF TX NSS stats */</div><div class='add'>+	u32 tx_su_ibf_nss[HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS];</div><div class='add'>+	/* Open loop TX NSS stats */</div><div class='add'>+	u32 tx_su_ol_nss[HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS];</div><div class='add'>+	/* SU TxBF TX BW stats */</div><div class='add'>+	u32 tx_su_txbf_bw[HTT_TX_TXBF_RATE_STATS_NUM_BW_COUNTERS];</div><div class='add'>+	/* Implicit BF TX BW stats */</div><div class='add'>+	u32 tx_su_ibf_bw[HTT_TX_TXBF_RATE_STATS_NUM_BW_COUNTERS];</div><div class='add'>+	/* Open loop TX BW stats */</div><div class='add'>+	u32 tx_su_ol_bw[HTT_TX_TXBF_RATE_STATS_NUM_BW_COUNTERS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct htt_txbf_ofdma_ndpa_stats_tlv {</div><div class='add'>+	/* 11AX HE OFDMA NDPA frame queued to the HW */</div><div class='add'>+	u32 ax_ofdma_ndpa_queued[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS];</div><div class='add'>+	/* 11AX HE OFDMA NDPA frame sent over the air */</div><div class='add'>+	u32 ax_ofdma_ndpa_tried[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS];</div><div class='add'>+	/* 11AX HE OFDMA NDPA frame flushed by HW */</div><div class='add'>+	u32 ax_ofdma_ndpa_flushed[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS];</div><div class='add'>+	/* 11AX HE OFDMA NDPA frame completed with error(s) */</div><div class='add'>+	u32 ax_ofdma_ndpa_err[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct htt_txbf_ofdma_ndp_stats_tlv {</div><div class='add'>+	/* 11AX HE OFDMA NDP frame queued to the HW */</div><div class='add'>+	u32 ax_ofdma_ndp_queued[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS];</div><div class='add'>+	/* 11AX HE OFDMA NDPA frame sent over the air */</div><div class='add'>+	u32 ax_ofdma_ndp_tried[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS];</div><div class='add'>+	/* 11AX HE OFDMA NDPA frame flushed by HW */</div><div class='add'>+	u32 ax_ofdma_ndp_flushed[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS];</div><div class='add'>+	/* 11AX HE OFDMA NDPA frame completed with error(s) */</div><div class='add'>+	u32 ax_ofdma_ndp_err[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct htt_txbf_ofdma_brp_stats_tlv {</div><div class='add'>+	/* 11AX HE OFDMA MU BRPOLL frame queued to the HW */</div><div class='add'>+	u32 ax_ofdma_brpoll_queued[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS];</div><div class='add'>+	/* 11AX HE OFDMA MU BRPOLL frame sent over the air */</div><div class='add'>+	u32 ax_ofdma_brpoll_tried[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS];</div><div class='add'>+	/* 11AX HE OFDMA MU BRPOLL frame flushed by HW */</div><div class='add'>+	u32 ax_ofdma_brpoll_flushed[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS];</div><div class='add'>+	/* 11AX HE OFDMA MU BRPOLL frame completed with error(s) */</div><div class='add'>+	u32 ax_ofdma_brp_err[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS];</div><div class='add'>+	/* Number of CBF(s) received when 11AX HE OFDMA MU BRPOLL frame</div><div class='add'>+	 * completed with error(s).</div><div class='add'>+	 */</div><div class='add'>+	u32 ax_ofdma_brp_err_num_cbf_rcvd[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS + 1];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct htt_txbf_ofdma_steer_stats_tlv {</div><div class='add'>+	/* 11AX HE OFDMA PPDUs that were sent over the air with steering (TXBF + OFDMA) */</div><div class='add'>+	u32 ax_ofdma_num_ppdu_steer[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS];</div><div class='add'>+	/* 11AX HE OFDMA PPDUs that were sent over the air in open loop */</div><div class='add'>+	u32 ax_ofdma_num_ppdu_ol[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS];</div><div class='add'>+	/* 11AX HE OFDMA number of users for which CBF prefetch was</div><div class='add'>+	 * initiated to PHY HW during TX.</div><div class='add'>+	 */</div><div class='add'>+	u32 ax_ofdma_num_usrs_prefetch[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS];</div><div class='add'>+	/* 11AX HE OFDMA number of users for which sounding was initiated during TX */</div><div class='add'>+	u32 ax_ofdma_num_usrs_sound[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS];</div><div class='add'>+	/* 11AX HE OFDMA number of users for which sounding was forced during TX */</div><div class='add'>+	u32 ax_ofdma_num_usrs_force_sound[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HTT_MAX_RX_PKT_CNT 8</div><div class='add'>+#define HTT_MAX_RX_PKT_CRC_PASS_CNT 8</div><div class='add'>+#define HTT_MAX_PER_BLK_ERR_CNT 20</div><div class='add'>+#define HTT_MAX_RX_OTA_ERR_CNT 14</div><div class='add'>+#define HTT_STATS_MAX_CHAINS 8</div><div class='add'>+#define ATH11K_STATS_MGMT_FRM_TYPE_MAX 16</div><div class='add'>+</div><div class='add'>+struct htt_phy_counters_tlv {</div><div class='add'>+	/* number of RXTD OFDMA OTA error counts except power surge and drop */</div><div class='add'>+	u32 rx_ofdma_timing_err_cnt;</div><div class='add'>+	/* rx_cck_fail_cnt:</div><div class='add'>+	 * number of cck error counts due to rx reception failure because of</div><div class='add'>+	 * timing error in cck</div><div class='add'>+	 */</div><div class='add'>+	u32 rx_cck_fail_cnt;</div><div class='add'>+	/* number of times tx abort initiated by mac */</div><div class='add'>+	u32 mactx_abort_cnt;</div><div class='add'>+	/* number of times rx abort initiated by mac */</div><div class='add'>+	u32 macrx_abort_cnt;</div><div class='add'>+	/* number of times tx abort initiated by phy */</div><div class='add'>+	u32 phytx_abort_cnt;</div><div class='add'>+	/* number of times rx abort initiated by phy */</div><div class='add'>+	u32 phyrx_abort_cnt;</div><div class='add'>+	/* number of rx deferred count initiated by phy */</div><div class='add'>+	u32 phyrx_defer_abort_cnt;</div><div class='add'>+	/* number of sizing events generated at LSTF */</div><div class='add'>+	u32 rx_gain_adj_lstf_event_cnt;</div><div class='add'>+	/* number of sizing events generated at non-legacy LTF */</div><div class='add'>+	u32 rx_gain_adj_non_legacy_cnt;</div><div class='add'>+	/* rx_pkt_cnt -</div><div class='add'>+	 * Received EOP (end-of-packet) count per packet type;</div><div class='add'>+	 * [0] = 11a; [1] = 11b; [2] = 11n; [3] = 11ac; [4] = 11ax; [5] = GF</div><div class='add'>+	 * [6-7]=RSVD</div><div class='add'>+	 */</div><div class='add'>+	u32 rx_pkt_cnt[HTT_MAX_RX_PKT_CNT];</div><div class='add'>+	/* rx_pkt_crc_pass_cnt -</div><div class='add'>+	 * Received EOP (end-of-packet) count per packet type;</div><div class='add'>+	 * [0] = 11a; [1] = 11b; [2] = 11n; [3] = 11ac; [4] = 11ax; [5] = GF</div><div class='add'>+	 * [6-7]=RSVD</div><div class='add'>+	 */</div><div class='add'>+	u32 rx_pkt_crc_pass_cnt[HTT_MAX_RX_PKT_CRC_PASS_CNT];</div><div class='add'>+	/* per_blk_err_cnt -</div><div class='add'>+	 * Error count per error source;</div><div class='add'>+	 * [0] = unknown; [1] = LSIG; [2] = HTSIG; [3] = VHTSIG; [4] = HESIG;</div><div class='add'>+	 * [5] = RXTD_OTA; [6] = RXTD_FATAL; [7] = DEMF; [8] = ROBE;</div><div class='add'>+	 * [9] = PMI; [10] = TXFD; [11] = TXTD; [12] = PHYRF</div><div class='add'>+	 * [13-19]=RSVD</div><div class='add'>+	 */</div><div class='add'>+	u32 per_blk_err_cnt[HTT_MAX_PER_BLK_ERR_CNT];</div><div class='add'>+	/* rx_ota_err_cnt -</div><div class='add'>+	 * RXTD OTA (over-the-air) error count per error reason;</div><div class='add'>+	 * [0] = voting fail; [1] = weak det fail; [2] = strong sig fail;</div><div class='add'>+	 * [3] = cck fail; [4] = power surge; [5] = power drop;</div><div class='add'>+	 * [6] = btcf timing timeout error; [7] = btcf packet detect error;</div><div class='add'>+	 * [8] = coarse timing timeout error</div><div class='add'>+	 * [9-13]=RSVD</div><div class='add'>+	 */</div><div class='add'>+	u32 rx_ota_err_cnt[HTT_MAX_RX_OTA_ERR_CNT];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct htt_phy_stats_tlv {</div><div class='add'>+	/* per chain hw noise floor values in dBm */</div><div class='add'>+	s32 nf_chain[HTT_STATS_MAX_CHAINS];</div><div class='add'>+	/* number of false radars detected */</div><div class='add'>+	u32 false_radar_cnt;</div><div class='add'>+	/* number of channel switches happened due to radar detection */</div><div class='add'>+	u32 radar_cs_cnt;</div><div class='add'>+	/* ani_level -</div><div class='add'>+	 * ANI level (noise interference) corresponds to the channel</div><div class='add'>+	 * the desense levels range from -5 to 15 in dB units,</div><div class='add'>+	 * higher values indicating more noise interference.</div><div class='add'>+	 */</div><div class='add'>+	s32 ani_level;</div><div class='add'>+	/* running time in minutes since FW boot */</div><div class='add'>+	u32 fw_run_time;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct htt_phy_reset_counters_tlv {</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+	u32 cf_active_low_fail_cnt;</div><div class='add'>+	u32 cf_active_low_pass_cnt;</div><div class='add'>+	u32 phy_off_through_vreg_cnt;</div><div class='add'>+	u32 force_calibration_cnt;</div><div class='add'>+	u32 rf_mode_switch_phy_off_cnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct htt_phy_reset_stats_tlv {</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+	u32 chan_mhz;</div><div class='add'>+	u32 chan_band_center_freq1;</div><div class='add'>+	u32 chan_band_center_freq2;</div><div class='add'>+	u32 chan_phy_mode;</div><div class='add'>+	u32 chan_flags;</div><div class='add'>+	u32 chan_num;</div><div class='add'>+	u32 reset_cause;</div><div class='add'>+	u32 prev_reset_cause;</div><div class='add'>+	u32 phy_warm_reset_src;</div><div class='add'>+	u32 rx_gain_tbl_mode;</div><div class='add'>+	u32 xbar_val;</div><div class='add'>+	u32 force_calibration;</div><div class='add'>+	u32 phyrf_mode;</div><div class='add'>+	u32 phy_homechan;</div><div class='add'>+	u32 phy_tx_ch_mask;</div><div class='add'>+	u32 phy_rx_ch_mask;</div><div class='add'>+	u32 phybb_ini_mask;</div><div class='add'>+	u32 phyrf_ini_mask;</div><div class='add'>+	u32 phy_dfs_en_mask;</div><div class='add'>+	u32 phy_sscan_en_mask;</div><div class='add'>+	u32 phy_synth_sel_mask;</div><div class='add'>+	u32 phy_adfs_freq;</div><div class='add'>+	u32 cck_fir_settings;</div><div class='add'>+	u32 phy_dyn_pri_chan;</div><div class='add'>+	u32 cca_thresh;</div><div class='add'>+	u32 dyn_cca_status;</div><div class='add'>+	u32 rxdesense_thresh_hw;</div><div class='add'>+	u32 rxdesense_thresh_sw;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct htt_peer_ctrl_path_txrx_stats_tlv {</div><div class='add'>+	/* peer mac address */</div><div class='add'>+	u8 peer_mac_addr[ETH_ALEN];</div><div class='add'>+	u8 rsvd[2];</div><div class='add'>+	/* Num of tx mgmt frames with subtype on peer level */</div><div class='add'>+	u32 peer_tx_mgmt_subtype[ATH11K_STATS_MGMT_FRM_TYPE_MAX];</div><div class='add'>+	/* Num of rx mgmt frames with subtype on peer level */</div><div class='add'>+	u32 peer_rx_mgmt_subtype[ATH11K_STATS_MGMT_FRM_TYPE_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_ATH11K_DEBUGFS</div><div class='ctx'> </div><div class='ctx'> void ath11k_debugfs_htt_stats_init(struct ath11k *ar);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/debugfs_sta.c b/drivers/net/wireless/ath/ath11k/debugfs_sta.c<br/>index 270c0edbb10f..d89d0f28d890 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/debugfs_sta.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/debugfs_sta.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/debugfs_sta.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/debugfs_sta.c</a></div><div class='hunk'>@@ -1,6 +1,8 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='hunk'>@@ -126,85 +128,9 @@ void ath11k_debugfs_sta_add_tx_stats(struct ath11k_sta *arsta,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ath11k_debugfs_sta_update_txcompl(struct ath11k *ar,</div><div class='del'>-				       struct sk_buff *msdu,</div><div class='ctx'> 				       struct hal_tx_status *ts)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_base *ab = ar-&gt;ab;</div><div class='del'>-	struct ath11k_per_peer_tx_stats *peer_stats = &amp;ar-&gt;cached_stats;</div><div class='del'>-	enum hal_tx_rate_stats_pkt_type pkt_type;</div><div class='del'>-	enum hal_tx_rate_stats_sgi sgi;</div><div class='del'>-	enum hal_tx_rate_stats_bw bw;</div><div class='del'>-	struct ath11k_peer *peer;</div><div class='del'>-	struct ath11k_sta *arsta;</div><div class='del'>-	struct ieee80211_sta *sta;</div><div class='del'>-	u16 rate;</div><div class='del'>-	u8 rate_idx = 0;</div><div class='del'>-	int ret;</div><div class='del'>-	u8 mcs;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='del'>-	peer = ath11k_peer_find_by_id(ab, ts-&gt;peer_id);</div><div class='del'>-	if (!peer || !peer-&gt;sta) {</div><div class='del'>-		ath11k_warn(ab, "failed to find the peer\n");</div><div class='del'>-		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sta = peer-&gt;sta;</div><div class='del'>-	arsta = (struct ath11k_sta *)sta-&gt;drv_priv;</div><div class='del'>-</div><div class='del'>-	memset(&amp;arsta-&gt;txrate, 0, sizeof(arsta-&gt;txrate));</div><div class='del'>-	pkt_type = FIELD_GET(HAL_TX_RATE_STATS_INFO0_PKT_TYPE,</div><div class='del'>-			     ts-&gt;rate_stats);</div><div class='del'>-	mcs = FIELD_GET(HAL_TX_RATE_STATS_INFO0_MCS,</div><div class='del'>-			ts-&gt;rate_stats);</div><div class='del'>-	sgi = FIELD_GET(HAL_TX_RATE_STATS_INFO0_SGI,</div><div class='del'>-			ts-&gt;rate_stats);</div><div class='del'>-	bw = FIELD_GET(HAL_TX_RATE_STATS_INFO0_BW, ts-&gt;rate_stats);</div><div class='del'>-</div><div class='del'>-	if (pkt_type == HAL_TX_RATE_STATS_PKT_TYPE_11A ||</div><div class='del'>-	    pkt_type == HAL_TX_RATE_STATS_PKT_TYPE_11B) {</div><div class='del'>-		ret = ath11k_mac_hw_ratecode_to_legacy_rate(mcs,</div><div class='del'>-							    pkt_type,</div><div class='del'>-							    &amp;rate_idx,</div><div class='del'>-							    &amp;rate);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto err_out;</div><div class='del'>-		arsta-&gt;txrate.legacy = rate;</div><div class='del'>-	} else if (pkt_type == HAL_TX_RATE_STATS_PKT_TYPE_11N) {</div><div class='del'>-		if (mcs &gt; 7) {</div><div class='del'>-			ath11k_warn(ab, "Invalid HT mcs index %d\n", mcs);</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		arsta-&gt;txrate.mcs = mcs + 8 * (arsta-&gt;last_txrate.nss - 1);</div><div class='del'>-		arsta-&gt;txrate.flags = RATE_INFO_FLAGS_MCS;</div><div class='del'>-		if (sgi)</div><div class='del'>-			arsta-&gt;txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;</div><div class='del'>-	} else if (pkt_type == HAL_TX_RATE_STATS_PKT_TYPE_11AC) {</div><div class='del'>-		if (mcs &gt; 9) {</div><div class='del'>-			ath11k_warn(ab, "Invalid VHT mcs index %d\n", mcs);</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		arsta-&gt;txrate.mcs = mcs;</div><div class='del'>-		arsta-&gt;txrate.flags = RATE_INFO_FLAGS_VHT_MCS;</div><div class='del'>-		if (sgi)</div><div class='del'>-			arsta-&gt;txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;</div><div class='del'>-	} else if (pkt_type == HAL_TX_RATE_STATS_PKT_TYPE_11AX) {</div><div class='del'>-		/* TODO */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	arsta-&gt;txrate.nss = arsta-&gt;last_txrate.nss;</div><div class='del'>-	arsta-&gt;txrate.bw = ath11k_mac_bw_to_mac80211_bw(bw);</div><div class='del'>-</div><div class='del'>-	ath11k_debugfs_sta_add_tx_stats(arsta, peer_stats, rate_idx);</div><div class='del'>-</div><div class='del'>-err_out:</div><div class='del'>-	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	ath11k_dp_tx_update_txcompl(ar, ts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t ath11k_dbg_sta_dump_tx_stats(struct file *file,</div><div class='hunk'>@@ -212,7 +138,7 @@ static ssize_t ath11k_dbg_sta_dump_tx_stats(struct file *file,</div><div class='ctx'> 					    size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sta *sta = file-&gt;private_data;</div><div class='del'>-	struct ath11k_sta *arsta = (struct ath11k_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='ctx'> 	struct ath11k *ar = arsta-&gt;arvif-&gt;ar;</div><div class='ctx'> 	struct ath11k_htt_data_stats *stats;</div><div class='ctx'> 	static const char *str_name[ATH11K_STATS_TYPE_MAX] = {"succ", "fail",</div><div class='hunk'>@@ -319,7 +245,7 @@ static ssize_t ath11k_dbg_sta_dump_rx_stats(struct file *file,</div><div class='ctx'> 					    size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sta *sta = file-&gt;private_data;</div><div class='del'>-	struct ath11k_sta *arsta = (struct ath11k_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='ctx'> 	struct ath11k *ar = arsta-&gt;arvif-&gt;ar;</div><div class='ctx'> 	struct ath11k_rx_peer_stats *rx_stats = arsta-&gt;rx_stats;</div><div class='ctx'> 	int len = 0, i, retval = 0;</div><div class='hunk'>@@ -416,18 +342,24 @@ static int</div><div class='ctx'> ath11k_dbg_sta_open_htt_peer_stats(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sta *sta = inode-&gt;i_private;</div><div class='del'>-	struct ath11k_sta *arsta = (struct ath11k_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='ctx'> 	struct ath11k *ar = arsta-&gt;arvif-&gt;ar;</div><div class='ctx'> 	struct debug_htt_stats_req *stats_req;</div><div class='add'>+	int type = ar-&gt;debug.htt_stats.type;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if ((type != ATH11K_DBG_HTT_EXT_STATS_PEER_INFO &amp;&amp;</div><div class='add'>+	     type != ATH11K_DBG_HTT_EXT_STATS_PEER_CTRL_PATH_TXRX_STATS) ||</div><div class='add'>+	    type == ATH11K_DBG_HTT_EXT_STATS_RESET)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='ctx'> 	stats_req = vzalloc(sizeof(*stats_req) + ATH11K_HTT_STATS_BUF_SIZE);</div><div class='ctx'> 	if (!stats_req)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> 	ar-&gt;debug.htt_stats.stats_req = stats_req;</div><div class='del'>-	stats_req-&gt;type = ATH11K_DBG_HTT_EXT_STATS_PEER_INFO;</div><div class='add'>+	stats_req-&gt;type = type;</div><div class='ctx'> 	memcpy(stats_req-&gt;peer_addr, sta-&gt;addr, ETH_ALEN);</div><div class='ctx'> 	ret = ath11k_debugfs_htt_stats_req(ar);</div><div class='ctx'> 	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='hunk'>@@ -446,7 +378,7 @@ static int</div><div class='ctx'> ath11k_dbg_sta_release_htt_peer_stats(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sta *sta = inode-&gt;i_private;</div><div class='del'>-	struct ath11k_sta *arsta = (struct ath11k_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='ctx'> 	struct ath11k *ar = arsta-&gt;arvif-&gt;ar;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='hunk'>@@ -483,7 +415,7 @@ static ssize_t ath11k_dbg_sta_write_peer_pktlog(struct file *file,</div><div class='ctx'> 						size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sta *sta = file-&gt;private_data;</div><div class='del'>-	struct ath11k_sta *arsta = (struct ath11k_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='ctx'> 	struct ath11k *ar = arsta-&gt;arvif-&gt;ar;</div><div class='ctx'> 	int ret, enable;</div><div class='ctx'> </div><div class='hunk'>@@ -523,9 +455,9 @@ static ssize_t ath11k_dbg_sta_read_peer_pktlog(struct file *file,</div><div class='ctx'> 					       size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sta *sta = file-&gt;private_data;</div><div class='del'>-	struct ath11k_sta *arsta = (struct ath11k_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='ctx'> 	struct ath11k *ar = arsta-&gt;arvif-&gt;ar;</div><div class='del'>-	char buf[32] = {0};</div><div class='add'>+	char buf[32] = {};</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='hunk'>@@ -550,11 +482,11 @@ static ssize_t ath11k_dbg_sta_write_delba(struct file *file,</div><div class='ctx'> 					  size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sta *sta = file-&gt;private_data;</div><div class='del'>-	struct ath11k_sta *arsta = (struct ath11k_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='ctx'> 	struct ath11k *ar = arsta-&gt;arvif-&gt;ar;</div><div class='ctx'> 	u32 tid, initiator, reason;</div><div class='ctx'> 	int ret;</div><div class='del'>-	char buf[64] = {0};</div><div class='add'>+	char buf[64] = {};</div><div class='ctx'> </div><div class='ctx'> 	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos,</div><div class='ctx'> 				     user_buf, count);</div><div class='hunk'>@@ -601,11 +533,11 @@ static ssize_t ath11k_dbg_sta_write_addba_resp(struct file *file,</div><div class='ctx'> 					       size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sta *sta = file-&gt;private_data;</div><div class='del'>-	struct ath11k_sta *arsta = (struct ath11k_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='ctx'> 	struct ath11k *ar = arsta-&gt;arvif-&gt;ar;</div><div class='ctx'> 	u32 tid, status;</div><div class='ctx'> 	int ret;</div><div class='del'>-	char buf[64] = {0};</div><div class='add'>+	char buf[64] = {};</div><div class='ctx'> </div><div class='ctx'> 	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos,</div><div class='ctx'> 				     user_buf, count);</div><div class='hunk'>@@ -651,11 +583,11 @@ static ssize_t ath11k_dbg_sta_write_addba(struct file *file,</div><div class='ctx'> 					  size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sta *sta = file-&gt;private_data;</div><div class='del'>-	struct ath11k_sta *arsta = (struct ath11k_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='ctx'> 	struct ath11k *ar = arsta-&gt;arvif-&gt;ar;</div><div class='ctx'> 	u32 tid, buf_size;</div><div class='ctx'> 	int ret;</div><div class='del'>-	char buf[64] = {0};</div><div class='add'>+	char buf[64] = {};</div><div class='ctx'> </div><div class='ctx'> 	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos,</div><div class='ctx'> 				     user_buf, count);</div><div class='hunk'>@@ -702,7 +634,7 @@ static ssize_t ath11k_dbg_sta_read_aggr_mode(struct file *file,</div><div class='ctx'> 					     size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sta *sta = file-&gt;private_data;</div><div class='del'>-	struct ath11k_sta *arsta = (struct ath11k_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='ctx'> 	struct ath11k *ar = arsta-&gt;arvif-&gt;ar;</div><div class='ctx'> 	char buf[64];</div><div class='ctx'> 	int len = 0;</div><div class='hunk'>@@ -722,7 +654,7 @@ static ssize_t ath11k_dbg_sta_write_aggr_mode(struct file *file,</div><div class='ctx'> 					      size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sta *sta = file-&gt;private_data;</div><div class='del'>-	struct ath11k_sta *arsta = (struct ath11k_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='ctx'> 	struct ath11k *ar = arsta-&gt;arvif-&gt;ar;</div><div class='ctx'> 	u32 aggr_mode;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -767,9 +699,9 @@ ath11k_write_htt_peer_stats_reset(struct file *file,</div><div class='ctx'> 				  size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sta *sta = file-&gt;private_data;</div><div class='del'>-	struct ath11k_sta *arsta = (struct ath11k_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='ctx'> 	struct ath11k *ar = arsta-&gt;arvif-&gt;ar;</div><div class='del'>-	struct htt_ext_stats_cfg_params cfg_params = { 0 };</div><div class='add'>+	struct htt_ext_stats_cfg_params cfg_params = {};</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u8 type;</div><div class='ctx'> </div><div class='hunk'>@@ -821,6 +753,102 @@ static const struct file_operations fops_htt_peer_stats_reset = {</div><div class='ctx'> 	.llseek = default_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static ssize_t ath11k_dbg_sta_read_peer_ps_state(struct file *file,</div><div class='add'>+						 char __user *user_buf,</div><div class='add'>+						 size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = file-&gt;private_data;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='add'>+	struct ath11k *ar = arsta-&gt;arvif-&gt;ar;</div><div class='add'>+	char buf[20];</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	len = scnprintf(buf, sizeof(buf), "%d\n", arsta-&gt;peer_ps_state);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_peer_ps_state = {</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.read = ath11k_dbg_sta_read_peer_ps_state,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t ath11k_dbg_sta_read_current_ps_duration(struct file *file,</div><div class='add'>+						       char __user *user_buf,</div><div class='add'>+						       size_t count,</div><div class='add'>+						       loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = file-&gt;private_data;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='add'>+	struct ath11k *ar = arsta-&gt;arvif-&gt;ar;</div><div class='add'>+	u64 time_since_station_in_power_save;</div><div class='add'>+	char buf[20];</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	if (arsta-&gt;peer_ps_state == WMI_PEER_PS_STATE_ON &amp;&amp;</div><div class='add'>+	    arsta-&gt;peer_current_ps_valid)</div><div class='add'>+		time_since_station_in_power_save = jiffies_to_msecs(jiffies</div><div class='add'>+						- arsta-&gt;ps_start_jiffies);</div><div class='add'>+	else</div><div class='add'>+		time_since_station_in_power_save = 0;</div><div class='add'>+</div><div class='add'>+	len = scnprintf(buf, sizeof(buf), "%llu\n",</div><div class='add'>+			time_since_station_in_power_save);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_current_ps_duration = {</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.read = ath11k_dbg_sta_read_current_ps_duration,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t ath11k_dbg_sta_read_total_ps_duration(struct file *file,</div><div class='add'>+						     char __user *user_buf,</div><div class='add'>+						     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = file-&gt;private_data;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='add'>+	struct ath11k *ar = arsta-&gt;arvif-&gt;ar;</div><div class='add'>+	char buf[20];</div><div class='add'>+	u64 power_save_duration;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	if (arsta-&gt;peer_ps_state == WMI_PEER_PS_STATE_ON &amp;&amp;</div><div class='add'>+	    arsta-&gt;peer_current_ps_valid)</div><div class='add'>+		power_save_duration = jiffies_to_msecs(jiffies</div><div class='add'>+						- arsta-&gt;ps_start_jiffies)</div><div class='add'>+						+ arsta-&gt;ps_total_duration;</div><div class='add'>+	else</div><div class='add'>+		power_save_duration = arsta-&gt;ps_total_duration;</div><div class='add'>+</div><div class='add'>+	len = scnprintf(buf, sizeof(buf), "%llu\n", power_save_duration);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_total_ps_duration = {</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.read = ath11k_dbg_sta_read_total_ps_duration,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void ath11k_debugfs_sta_op_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 			       struct ieee80211_sta *sta, struct dentry *dir)</div><div class='ctx'> {</div><div class='hunk'>@@ -848,4 +876,15 @@ void ath11k_debugfs_sta_op_add(struct ieee80211_hw *hw, struct ieee80211_vif *vi</div><div class='ctx'> 		     ar-&gt;ab-&gt;wmi_ab.svc_map))</div><div class='ctx'> 		debugfs_create_file("htt_peer_stats_reset", 0600, dir, sta,</div><div class='ctx'> 				    &amp;fops_htt_peer_stats_reset);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("peer_ps_state", 0400, dir, sta,</div><div class='add'>+			    &amp;fops_peer_ps_state);</div><div class='add'>+</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_PEER_POWER_SAVE_DURATION_SUPPORT,</div><div class='add'>+		     ar-&gt;ab-&gt;wmi_ab.svc_map)) {</div><div class='add'>+		debugfs_create_file("current_ps_duration", 0440, dir, sta,</div><div class='add'>+				    &amp;fops_current_ps_duration);</div><div class='add'>+		debugfs_create_file("total_ps_duration", 0440, dir, sta,</div><div class='add'>+				    &amp;fops_total_ps_duration);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/debugfs_sta.h b/drivers/net/wireless/ath/ath11k/debugfs_sta.h<br/>index 18dc65d9edcf..ace877e19275 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/debugfs_sta.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/debugfs_sta.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/debugfs_sta.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/debugfs_sta.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _ATH11K_DEBUGFS_STA_H_</div><div class='hunk'>@@ -19,7 +20,6 @@ void ath11k_debugfs_sta_add_tx_stats(struct ath11k_sta *arsta,</div><div class='ctx'> 				     struct ath11k_per_peer_tx_stats *peer_stats,</div><div class='ctx'> 				     u8 legacy_rate_idx);</div><div class='ctx'> void ath11k_debugfs_sta_update_txcompl(struct ath11k *ar,</div><div class='del'>-				       struct sk_buff *msdu,</div><div class='ctx'> 				       struct hal_tx_status *ts);</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_ATH11K_DEBUGFS */</div><div class='hunk'>@@ -34,7 +34,6 @@ ath11k_debugfs_sta_add_tx_stats(struct ath11k_sta *arsta,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void ath11k_debugfs_sta_update_txcompl(struct ath11k *ar,</div><div class='del'>-						     struct sk_buff *msdu,</div><div class='ctx'> 						     struct hal_tx_status *ts)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/dp.c b/drivers/net/wireless/ath/ath11k/dp.c<br/>index 04f6c4e0658b..56b1a657e0b0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/dp.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/dp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/dp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/dp.c</a></div><div class='hunk'>@@ -1,9 +1,12 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/hash.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "dp_tx.h"</div><div class='ctx'> #include "hal_tx.h"</div><div class='hunk'>@@ -35,6 +38,7 @@ void ath11k_dp_peer_cleanup(struct ath11k *ar, int vdev_id, const u8 *addr)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_peer_rx_tid_cleanup(ar, peer);</div><div class='add'>+	peer-&gt;dp_setup_done = false;</div><div class='ctx'> 	crypto_free_shash(peer-&gt;tfm_mmic);</div><div class='ctx'> 	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -71,7 +75,8 @@ int ath11k_dp_peer_setup(struct ath11k *ar, int vdev_id, const u8 *addr)</div><div class='ctx'> 	ret = ath11k_peer_rx_frag_setup(ar, addr, vdev_id);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ab, "failed to setup rx defrag context\n");</div><div class='del'>-		return ret;</div><div class='add'>+		tid--;</div><div class='add'>+		goto peer_clean;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: Setup other peer specific resource used in data path */</div><div class='hunk'>@@ -101,8 +106,12 @@ void ath11k_dp_srng_cleanup(struct ath11k_base *ab, struct dp_srng *ring)</div><div class='ctx'> 	if (!ring-&gt;vaddr_unaligned)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	dma_free_coherent(ab-&gt;dev, ring-&gt;size, ring-&gt;vaddr_unaligned,</div><div class='del'>-			  ring-&gt;paddr_unaligned);</div><div class='add'>+	if (ring-&gt;cached)</div><div class='add'>+		dma_free_noncoherent(ab-&gt;dev, ring-&gt;size, ring-&gt;vaddr_unaligned,</div><div class='add'>+				     ring-&gt;paddr_unaligned, DMA_FROM_DEVICE);</div><div class='add'>+	else</div><div class='add'>+		dma_free_coherent(ab-&gt;dev, ring-&gt;size, ring-&gt;vaddr_unaligned,</div><div class='add'>+				  ring-&gt;paddr_unaligned);</div><div class='ctx'> </div><div class='ctx'> 	ring-&gt;vaddr_unaligned = NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -128,13 +137,11 @@ static int ath11k_dp_srng_calculate_msi_group(struct ath11k_base *ab,</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case HAL_WBM2SW_RELEASE:</div><div class='del'>-		if (ring_num &lt; 3) {</div><div class='del'>-			grp_mask = &amp;ab-&gt;hw_params.ring_mask-&gt;tx[0];</div><div class='del'>-		} else if (ring_num == 3) {</div><div class='add'>+		if (ring_num == DP_RX_RELEASE_RING_NUM) {</div><div class='ctx'> 			grp_mask = &amp;ab-&gt;hw_params.ring_mask-&gt;rx_wbm_rel[0];</div><div class='ctx'> 			ring_num = 0;</div><div class='ctx'> 		} else {</div><div class='del'>-			return -ENOENT;</div><div class='add'>+			grp_mask = &amp;ab-&gt;hw_params.ring_mask-&gt;tx[0];</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HAL_REO_EXCEPTION:</div><div class='hunk'>@@ -218,10 +225,11 @@ int ath11k_dp_srng_setup(struct ath11k_base *ab, struct dp_srng *ring,</div><div class='ctx'> 			 enum hal_ring_type type, int ring_num,</div><div class='ctx'> 			 int mac_id, int num_entries)</div><div class='ctx'> {</div><div class='del'>-	struct hal_srng_params params = { 0 };</div><div class='add'>+	struct hal_srng_params params = {};</div><div class='ctx'> 	int entry_sz = ath11k_hal_srng_get_entrysize(ab, type);</div><div class='ctx'> 	int max_entries = ath11k_hal_srng_get_max_entries(ab, type);</div><div class='ctx'> 	int ret;</div><div class='add'>+	bool cached = false;</div><div class='ctx'> </div><div class='ctx'> 	if (max_entries &lt; 0 || entry_sz &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -230,9 +238,29 @@ int ath11k_dp_srng_setup(struct ath11k_base *ab, struct dp_srng *ring,</div><div class='ctx'> 		num_entries = max_entries;</div><div class='ctx'> </div><div class='ctx'> 	ring-&gt;size = (num_entries * entry_sz) + HAL_RING_BASE_ALIGN - 1;</div><div class='del'>-	ring-&gt;vaddr_unaligned = dma_alloc_coherent(ab-&gt;dev, ring-&gt;size,</div><div class='del'>-						   &amp;ring-&gt;paddr_unaligned,</div><div class='del'>-						   GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params.alloc_cacheable_memory) {</div><div class='add'>+		/* Allocate the reo dst and tx completion rings from cacheable memory */</div><div class='add'>+		switch (type) {</div><div class='add'>+		case HAL_REO_DST:</div><div class='add'>+		case HAL_WBM2SW_RELEASE:</div><div class='add'>+			cached = true;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			cached = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cached)</div><div class='add'>+		ring-&gt;vaddr_unaligned = dma_alloc_noncoherent(ab-&gt;dev, ring-&gt;size,</div><div class='add'>+							      &amp;ring-&gt;paddr_unaligned,</div><div class='add'>+							      DMA_FROM_DEVICE,</div><div class='add'>+							      GFP_KERNEL);</div><div class='add'>+	else</div><div class='add'>+		ring-&gt;vaddr_unaligned = dma_alloc_coherent(ab-&gt;dev, ring-&gt;size,</div><div class='add'>+							   &amp;ring-&gt;paddr_unaligned,</div><div class='add'>+							   GFP_KERNEL);</div><div class='add'>+</div><div class='ctx'> 	if (!ring-&gt;vaddr_unaligned)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -292,6 +320,11 @@ int ath11k_dp_srng_setup(struct ath11k_base *ab, struct dp_srng *ring,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (cached) {</div><div class='add'>+		params.flags |= HAL_SRNG_FLAGS_CACHED;</div><div class='add'>+		ring-&gt;cached = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = ath11k_hal_srng_setup(ab, type, ring_num, mac_id, &amp;params);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		ath11k_warn(ab, "failed to setup srng: %d ring_id %d\n",</div><div class='hunk'>@@ -311,7 +344,7 @@ void ath11k_dp_stop_shadow_timers(struct ath11k_base *ab)</div><div class='ctx'> 	if (!ab-&gt;hw_params.supports_shadow_regs)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; DP_TCL_NUM_RING_MAX; i++)</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.max_tx_ring; i++)</div><div class='ctx'> 		ath11k_dp_shadow_stop_timer(ab, &amp;ab-&gt;dp.tx_ring_timer[i]);</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dp_shadow_stop_timer(ab, &amp;ab-&gt;dp.reo_cmd_timer);</div><div class='hunk'>@@ -326,7 +359,7 @@ static void ath11k_dp_srng_common_cleanup(struct ath11k_base *ab)</div><div class='ctx'> 	ath11k_dp_srng_cleanup(ab, &amp;dp-&gt;wbm_desc_rel_ring);</div><div class='ctx'> 	ath11k_dp_srng_cleanup(ab, &amp;dp-&gt;tcl_cmd_ring);</div><div class='ctx'> 	ath11k_dp_srng_cleanup(ab, &amp;dp-&gt;tcl_status_ring);</div><div class='del'>-	for (i = 0; i &lt; DP_TCL_NUM_RING_MAX; i++) {</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.max_tx_ring; i++) {</div><div class='ctx'> 		ath11k_dp_srng_cleanup(ab, &amp;dp-&gt;tx_ring[i].tcl_data_ring);</div><div class='ctx'> 		ath11k_dp_srng_cleanup(ab, &amp;dp-&gt;tx_ring[i].tcl_comp_ring);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -342,7 +375,7 @@ static int ath11k_dp_srng_common_setup(struct ath11k_base *ab)</div><div class='ctx'> 	struct ath11k_dp *dp = &amp;ab-&gt;dp;</div><div class='ctx'> 	struct hal_srng *srng;</div><div class='ctx'> 	int i, ret;</div><div class='del'>-	u32 ring_hash_map;</div><div class='add'>+	u8 tcl_num, wbm_num;</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_dp_srng_setup(ab, &amp;dp-&gt;wbm_desc_rel_ring,</div><div class='ctx'> 				   HAL_SW2WBM_RELEASE, 0, 0,</div><div class='hunk'>@@ -367,10 +400,13 @@ static int ath11k_dp_srng_common_setup(struct ath11k_base *ab)</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; DP_TCL_NUM_RING_MAX; i++) {</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.max_tx_ring; i++) {</div><div class='add'>+		tcl_num = ab-&gt;hw_params.hal_params-&gt;tcl2wbm_rbm_map[i].tcl_ring_num;</div><div class='add'>+		wbm_num = ab-&gt;hw_params.hal_params-&gt;tcl2wbm_rbm_map[i].wbm_ring_num;</div><div class='add'>+</div><div class='ctx'> 		ret = ath11k_dp_srng_setup(ab, &amp;dp-&gt;tx_ring[i].tcl_data_ring,</div><div class='del'>-					   HAL_TCL_DATA, i, 0,</div><div class='del'>-					   DP_TCL_DATA_RING_SIZE);</div><div class='add'>+					   HAL_TCL_DATA, tcl_num, 0,</div><div class='add'>+					   ab-&gt;hw_params.tx_ring_size);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ath11k_warn(ab, "failed to set up tcl_data ring (%d) :%d\n",</div><div class='ctx'> 				    i, ret);</div><div class='hunk'>@@ -378,7 +414,7 @@ static int ath11k_dp_srng_common_setup(struct ath11k_base *ab)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = ath11k_dp_srng_setup(ab, &amp;dp-&gt;tx_ring[i].tcl_comp_ring,</div><div class='del'>-					   HAL_WBM2SW_RELEASE, i, 0,</div><div class='add'>+					   HAL_WBM2SW_RELEASE, wbm_num, 0,</div><div class='ctx'> 					   DP_TX_COMP_RING_SIZE);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ath11k_warn(ab, "failed to set up tcl_comp ring (%d) :%d\n",</div><div class='hunk'>@@ -403,7 +439,7 @@ static int ath11k_dp_srng_common_setup(struct ath11k_base *ab)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_dp_srng_setup(ab, &amp;dp-&gt;rx_rel_ring, HAL_WBM2SW_RELEASE,</div><div class='del'>-				   3, 0, DP_RX_RELEASE_RING_SIZE);</div><div class='add'>+				   DP_RX_RELEASE_RING_NUM, 0, DP_RX_RELEASE_RING_SIZE);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ab, "failed to set up rx_rel ring :%d\n", ret);</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -439,20 +475,9 @@ static int ath11k_dp_srng_common_setup(struct ath11k_base *ab)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* When hash based routing of rx packet is enabled, 32 entries to map</div><div class='del'>-	 * the hash values to the ring will be configured. Each hash entry uses</div><div class='del'>-	 * three bits to map to a particular ring. The ring mapping will be</div><div class='del'>-	 * 0:TCL, 1:SW1, 2:SW2, 3:SW3, 4:SW4, 5:Release, 6:FW and 7:Not used.</div><div class='add'>+	 * the hash values to the ring will be configured.</div><div class='ctx'> 	 */</div><div class='del'>-	ring_hash_map = HAL_HASH_ROUTING_RING_SW1 &lt;&lt; 0 |</div><div class='del'>-			HAL_HASH_ROUTING_RING_SW2 &lt;&lt; 3 |</div><div class='del'>-			HAL_HASH_ROUTING_RING_SW3 &lt;&lt; 6 |</div><div class='del'>-			HAL_HASH_ROUTING_RING_SW4 &lt;&lt; 9 |</div><div class='del'>-			HAL_HASH_ROUTING_RING_SW1 &lt;&lt; 12 |</div><div class='del'>-			HAL_HASH_ROUTING_RING_SW2 &lt;&lt; 15 |</div><div class='del'>-			HAL_HASH_ROUTING_RING_SW3 &lt;&lt; 18 |</div><div class='del'>-			HAL_HASH_ROUTING_RING_SW4 &lt;&lt; 21;</div><div class='del'>-</div><div class='del'>-	ath11k_hal_reo_hw_setup(ab, ring_hash_map);</div><div class='add'>+	ab-&gt;hw_params.hw_ops-&gt;reo_setup(ab);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -751,15 +776,16 @@ int ath11k_dp_service_srng(struct ath11k_base *ab,</div><div class='ctx'> 			   int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct napi_struct *napi = &amp;irq_grp-&gt;napi;</div><div class='add'>+	const struct ath11k_hw_hal_params *hal_params;</div><div class='ctx'> 	int grp_id = irq_grp-&gt;grp_id;</div><div class='ctx'> 	int work_done = 0;</div><div class='del'>-	int i = 0, j;</div><div class='add'>+	int i, j;</div><div class='ctx'> 	int tot_work_done = 0;</div><div class='ctx'> </div><div class='del'>-	while (ab-&gt;hw_params.ring_mask-&gt;tx[grp_id] &gt;&gt; i) {</div><div class='del'>-		if (ab-&gt;hw_params.ring_mask-&gt;tx[grp_id] &amp; BIT(i))</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.max_tx_ring; i++) {</div><div class='add'>+		if (BIT(ab-&gt;hw_params.hal_params-&gt;tcl2wbm_rbm_map[i].wbm_ring_num) &amp;</div><div class='add'>+		    ab-&gt;hw_params.ring_mask-&gt;tx[grp_id])</div><div class='ctx'> 			ath11k_dp_tx_completion_handler(ab, i);</div><div class='del'>-		i++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ab-&gt;hw_params.ring_mask-&gt;rx_err[grp_id]) {</div><div class='hunk'>@@ -793,8 +819,8 @@ int ath11k_dp_service_srng(struct ath11k_base *ab,</div><div class='ctx'> </div><div class='ctx'> 	if (ab-&gt;hw_params.ring_mask-&gt;rx_mon_status[grp_id]) {</div><div class='ctx'> 		for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='del'>-			for (j = 0; j &lt; ab-&gt;hw_params.num_rxmda_per_pdev; j++) {</div><div class='del'>-				int id = i * ab-&gt;hw_params.num_rxmda_per_pdev + j;</div><div class='add'>+			for (j = 0; j &lt; ab-&gt;hw_params.num_rxdma_per_pdev; j++) {</div><div class='add'>+				int id = i * ab-&gt;hw_params.num_rxdma_per_pdev + j;</div><div class='ctx'> </div><div class='ctx'> 				if (ab-&gt;hw_params.ring_mask-&gt;rx_mon_status[grp_id] &amp;</div><div class='ctx'> 					BIT(id)) {</div><div class='hunk'>@@ -816,8 +842,8 @@ int ath11k_dp_service_srng(struct ath11k_base *ab,</div><div class='ctx'> 		ath11k_dp_process_reo_status(ab);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='del'>-		for (j = 0; j &lt; ab-&gt;hw_params.num_rxmda_per_pdev; j++) {</div><div class='del'>-			int id = i * ab-&gt;hw_params.num_rxmda_per_pdev + j;</div><div class='add'>+		for (j = 0; j &lt; ab-&gt;hw_params.num_rxdma_per_pdev; j++) {</div><div class='add'>+			int id = i * ab-&gt;hw_params.num_rxdma_per_pdev + j;</div><div class='ctx'> </div><div class='ctx'> 			if (ab-&gt;hw_params.ring_mask-&gt;rxdma2host[grp_id] &amp; BIT(id)) {</div><div class='ctx'> 				work_done = ath11k_dp_process_rxdma_err(ab, id, budget);</div><div class='hunk'>@@ -833,8 +859,9 @@ int ath11k_dp_service_srng(struct ath11k_base *ab,</div><div class='ctx'> 				struct ath11k_pdev_dp *dp = &amp;ar-&gt;dp;</div><div class='ctx'> 				struct dp_rxdma_ring *rx_ring = &amp;dp-&gt;rx_refill_buf_ring;</div><div class='ctx'> </div><div class='add'>+				hal_params = ab-&gt;hw_params.hal_params;</div><div class='ctx'> 				ath11k_dp_rxbufs_replenish(ab, id, rx_ring, 0,</div><div class='del'>-							   HAL_RX_BUF_RBM_SW3_BM);</div><div class='add'>+							   hal_params-&gt;rx_buf_rbm);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -850,7 +877,7 @@ void ath11k_dp_pdev_free(struct ath11k_base *ab)</div><div class='ctx'> 	struct ath11k *ar;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;ab-&gt;mon_reap_timer);</div><div class='add'>+	timer_delete_sync(&amp;ab-&gt;mon_reap_timer);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='ctx'> 		ar = ab-&gt;pdevs[i].ar;</div><div class='hunk'>@@ -875,7 +902,7 @@ void ath11k_dp_pdev_pre_alloc(struct ath11k_base *ab)</div><div class='ctx'> 		spin_lock_init(&amp;dp-&gt;rx_refill_buf_ring.idr_lock);</div><div class='ctx'> 		atomic_set(&amp;dp-&gt;num_tx_pending, 0);</div><div class='ctx'> 		init_waitqueue_head(&amp;dp-&gt;tx_empty_waitq);</div><div class='del'>-		for (j = 0; j &lt; ab-&gt;hw_params.num_rxmda_per_pdev; j++) {</div><div class='add'>+		for (j = 0; j &lt; ab-&gt;hw_params.num_rxdma_per_pdev; j++) {</div><div class='ctx'> 			idr_init(&amp;dp-&gt;rx_mon_status_refill_ring[j].bufs_idr);</div><div class='ctx'> 			spin_lock_init(&amp;dp-&gt;rx_mon_status_refill_ring[j].idr_lock);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -945,7 +972,7 @@ static void ath11k_dp_update_vdev_search(struct ath11k_vif *arvif)</div><div class='ctx'> {</div><div class='ctx'> 	 /* When v2_map_support is true:for STA mode, enable address</div><div class='ctx'> 	  * search index, tcl uses ast_hash value in the descriptor.</div><div class='del'>-	  * When v2_map_support is false: for STA mode, dont' enable</div><div class='add'>+	  * When v2_map_support is false: for STA mode, don't enable</div><div class='ctx'> 	  * address search index.</div><div class='ctx'> 	  */</div><div class='ctx'> 	switch (arvif-&gt;vdev_type) {</div><div class='hunk'>@@ -985,7 +1012,7 @@ void ath11k_dp_vdev_tx_attach(struct ath11k *ar, struct ath11k_vif *arvif)</div><div class='ctx'> </div><div class='ctx'> static int ath11k_dp_tx_pending_cleanup(int buf_id, void *skb, void *ctx)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_base *ab = (struct ath11k_base *)ctx;</div><div class='add'>+	struct ath11k_base *ab = ctx;</div><div class='ctx'> 	struct sk_buff *msdu = skb;</div><div class='ctx'> </div><div class='ctx'> 	dma_unmap_single(ab-&gt;dev, ATH11K_SKB_CB(msdu)-&gt;paddr, msdu-&gt;len,</div><div class='hunk'>@@ -1008,7 +1035,7 @@ void ath11k_dp_free(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dp_reo_cmd_list_cleanup(ab);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; DP_TCL_NUM_RING_MAX; i++) {</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.max_tx_ring; i++) {</div><div class='ctx'> 		spin_lock_bh(&amp;dp-&gt;tx_ring[i].tx_idr_lock);</div><div class='ctx'> 		idr_for_each(&amp;dp-&gt;tx_ring[i].txbuf_idr,</div><div class='ctx'> 			     ath11k_dp_tx_pending_cleanup, ab);</div><div class='hunk'>@@ -1033,6 +1060,7 @@ int ath11k_dp_alloc(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dp-&gt;reo_cmd_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dp-&gt;reo_cmd_cache_flush_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dp-&gt;dp_full_mon_mpdu_list);</div><div class='ctx'> 	spin_lock_init(&amp;dp-&gt;reo_cmd_lock);</div><div class='ctx'> </div><div class='ctx'> 	dp-&gt;reo_cmd_cache_flush_count = 0;</div><div class='hunk'>@@ -1058,7 +1086,7 @@ int ath11k_dp_alloc(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> 	size = sizeof(struct hal_wbm_release_ring) * DP_TX_COMP_RING_SIZE;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; DP_TCL_NUM_RING_MAX; i++) {</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.max_tx_ring; i++) {</div><div class='ctx'> 		idr_init(&amp;dp-&gt;tx_ring[i].txbuf_idr);</div><div class='ctx'> 		spin_lock_init(&amp;dp-&gt;tx_ring[i].tx_idr_lock);</div><div class='ctx'> 		dp-&gt;tx_ring[i].tcl_data_ring_id = i;</div><div class='hunk'>@@ -1091,8 +1119,9 @@ fail_link_desc_cleanup:</div><div class='ctx'> </div><div class='ctx'> static void ath11k_dp_shadow_timer_handler(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_hp_update_timer *update_timer = from_timer(update_timer,</div><div class='del'>-								 t, timer);</div><div class='add'>+	struct ath11k_hp_update_timer *update_timer = timer_container_of(update_timer,</div><div class='add'>+									 t,</div><div class='add'>+									 timer);</div><div class='ctx'> 	struct ath11k_base *ab = update_timer-&gt;ab;</div><div class='ctx'> 	struct hal_srng	*srng = &amp;ab-&gt;hal.srng_list[update_timer-&gt;ring_id];</div><div class='ctx'> </div><div class='hunk'>@@ -1144,7 +1173,7 @@ void ath11k_dp_shadow_stop_timer(struct ath11k_base *ab,</div><div class='ctx'> 	if (!update_timer-&gt;init)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;update_timer-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;update_timer-&gt;timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ath11k_dp_shadow_init_timer(struct ath11k_base *ab,</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/dp.h b/drivers/net/wireless/ath/ath11k/dp.h<br/>index ee768ccce46e..7a55afd33be8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/dp.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/dp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/dp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/dp.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2023, 2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef ATH11K_DP_H</div><div class='hunk'>@@ -19,7 +20,6 @@ struct ath11k_ext_irq_grp;</div><div class='ctx'> </div><div class='ctx'> struct dp_rx_tid {</div><div class='ctx'> 	u8 tid;</div><div class='del'>-	u32 *vaddr;</div><div class='ctx'> 	dma_addr_t paddr;</div><div class='ctx'> 	u32 size;</div><div class='ctx'> 	u32 ba_win_sz;</div><div class='hunk'>@@ -36,6 +36,9 @@ struct dp_rx_tid {</div><div class='ctx'> 	/* Timer info related to fragments */</div><div class='ctx'> 	struct timer_list frag_timer;</div><div class='ctx'> 	struct ath11k_base *ab;</div><div class='add'>+	u32 *vaddr_unaligned;</div><div class='add'>+	dma_addr_t paddr_unaligned;</div><div class='add'>+	u32 unaligned_size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define DP_REO_DESC_FREE_THRESHOLD  64</div><div class='hunk'>@@ -64,6 +67,7 @@ struct dp_srng {</div><div class='ctx'> 	dma_addr_t paddr;</div><div class='ctx'> 	int size;</div><div class='ctx'> 	u32 ring_id;</div><div class='add'>+	u8 cached;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dp_rxdma_ring {</div><div class='hunk'>@@ -88,6 +92,19 @@ struct dp_tx_ring {</div><div class='ctx'> 	int tx_status_tail;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum dp_mon_status_buf_state {</div><div class='add'>+	/* PPDU id matches in dst ring and status ring */</div><div class='add'>+	DP_MON_STATUS_MATCH,</div><div class='add'>+	/* status ring dma is not done */</div><div class='add'>+	DP_MON_STATUS_NO_DMA,</div><div class='add'>+	/* status ring is lagging, reap status ring */</div><div class='add'>+	DP_MON_STATUS_LAG,</div><div class='add'>+	/* status ring is leading, reap dst ring and drop */</div><div class='add'>+	DP_MON_STATUS_LEAD,</div><div class='add'>+	/* replinish monitor status ring */</div><div class='add'>+	DP_MON_STATUS_REPLINISH,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ath11k_pdev_mon_stats {</div><div class='ctx'> 	u32 status_ppdu_state;</div><div class='ctx'> 	u32 status_ppdu_start;</div><div class='hunk'>@@ -101,6 +118,14 @@ struct ath11k_pdev_mon_stats {</div><div class='ctx'> 	u32 dest_mpdu_drop;</div><div class='ctx'> 	u32 dup_mon_linkdesc_cnt;</div><div class='ctx'> 	u32 dup_mon_buf_cnt;</div><div class='add'>+	u32 dest_mon_stuck;</div><div class='add'>+	u32 dest_mon_not_reaped;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dp_full_mon_mpdu {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct sk_buff *head;</div><div class='add'>+	struct sk_buff *tail;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dp_link_desc_bank {</div><div class='hunk'>@@ -134,15 +159,19 @@ struct ath11k_mon_data {</div><div class='ctx'> 	u32 mon_last_buf_cookie;</div><div class='ctx'> 	u64 mon_last_linkdesc_paddr;</div><div class='ctx'> 	u16 chan_noise_floor;</div><div class='del'>-</div><div class='add'>+	bool hold_mon_dst_ring;</div><div class='add'>+	enum dp_mon_status_buf_state buf_state;</div><div class='add'>+	dma_addr_t mon_status_paddr;</div><div class='add'>+	struct dp_full_mon_mpdu *mon_mpdu;</div><div class='add'>+	struct hal_sw_mon_ring_entries sw_mon_entries;</div><div class='ctx'> 	struct ath11k_pdev_mon_stats rx_mon_stats;</div><div class='ctx'> 	/* lock for monitor data */</div><div class='ctx'> 	spinlock_t mon_lock;</div><div class='del'>-	struct sk_buff_head rx_status_q;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ath11k_pdev_dp {</div><div class='ctx'> 	u32 mac_id;</div><div class='add'>+	u32 mon_dest_ring_stuck_cnt;</div><div class='ctx'> 	atomic_t num_tx_pending;</div><div class='ctx'> 	wait_queue_head_t tx_empty_waitq;</div><div class='ctx'> 	struct dp_rxdma_ring rx_refill_buf_ring;</div><div class='hunk'>@@ -170,11 +199,13 @@ struct ath11k_pdev_dp {</div><div class='ctx'> #define DP_BA_WIN_SZ_MAX	256</div><div class='ctx'> </div><div class='ctx'> #define DP_TCL_NUM_RING_MAX	3</div><div class='add'>+#define DP_TCL_NUM_RING_MAX_QCA6390	1</div><div class='ctx'> </div><div class='ctx'> #define DP_IDLE_SCATTER_BUFS_MAX 16</div><div class='ctx'> </div><div class='ctx'> #define DP_WBM_RELEASE_RING_SIZE	64</div><div class='ctx'> #define DP_TCL_DATA_RING_SIZE		512</div><div class='add'>+#define DP_TCL_DATA_RING_SIZE_WCN6750	2048</div><div class='ctx'> #define DP_TX_COMP_RING_SIZE		32768</div><div class='ctx'> #define DP_TX_IDR_SIZE			DP_TX_COMP_RING_SIZE</div><div class='ctx'> #define DP_TCL_CMD_RING_SIZE		32</div><div class='hunk'>@@ -184,7 +215,7 @@ struct ath11k_pdev_dp {</div><div class='ctx'> #define DP_REO_REINJECT_RING_SIZE	32</div><div class='ctx'> #define DP_RX_RELEASE_RING_SIZE		1024</div><div class='ctx'> #define DP_REO_EXCEPTION_RING_SIZE	128</div><div class='del'>-#define DP_REO_CMD_RING_SIZE		128</div><div class='add'>+#define DP_REO_CMD_RING_SIZE		256</div><div class='ctx'> #define DP_REO_STATUS_RING_SIZE		2048</div><div class='ctx'> #define DP_RXDMA_BUF_RING_SIZE		4096</div><div class='ctx'> #define DP_RXDMA_REFILL_RING_SIZE	2048</div><div class='hunk'>@@ -194,7 +225,10 @@ struct ath11k_pdev_dp {</div><div class='ctx'> #define DP_RXDMA_MONITOR_DST_RING_SIZE	2048</div><div class='ctx'> #define DP_RXDMA_MONITOR_DESC_RING_SIZE	4096</div><div class='ctx'> </div><div class='add'>+#define DP_RX_RELEASE_RING_NUM	3</div><div class='add'>+</div><div class='ctx'> #define DP_RX_BUFFER_SIZE	2048</div><div class='add'>+#define	DP_RX_BUFFER_SIZE_LITE  1024</div><div class='ctx'> #define DP_RX_BUFFER_ALIGN_SIZE	128</div><div class='ctx'> </div><div class='ctx'> #define DP_RXDMA_BUF_COOKIE_BUF_ID	GENMASK(17, 0)</div><div class='hunk'>@@ -242,6 +276,7 @@ struct ath11k_dp {</div><div class='ctx'> 	struct hal_wbm_idle_scatter_list scatter_list[DP_IDLE_SCATTER_BUFS_MAX];</div><div class='ctx'> 	struct list_head reo_cmd_list;</div><div class='ctx'> 	struct list_head reo_cmd_cache_flush_list;</div><div class='add'>+	struct list_head dp_full_mon_mpdu_list;</div><div class='ctx'> 	u32 reo_cmd_cache_flush_count;</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * protects access to below fields,</div><div class='hunk'>@@ -269,12 +304,16 @@ struct ath11k_dp {</div><div class='ctx'> </div><div class='ctx'> #define HTT_TX_WBM_COMP_STATUS_OFFSET 8</div><div class='ctx'> </div><div class='del'>-/* HTT tx completion is overlayed in wbm_release_ring */</div><div class='add'>+#define HTT_INVALID_PEER_ID	0xffff</div><div class='add'>+</div><div class='add'>+/* HTT tx completion is overlaid in wbm_release_ring */</div><div class='ctx'> #define HTT_TX_WBM_COMP_INFO0_STATUS		GENMASK(12, 9)</div><div class='ctx'> #define HTT_TX_WBM_COMP_INFO0_REINJECT_REASON	GENMASK(16, 13)</div><div class='ctx'> #define HTT_TX_WBM_COMP_INFO0_REINJECT_REASON	GENMASK(16, 13)</div><div class='ctx'> </div><div class='ctx'> #define HTT_TX_WBM_COMP_INFO1_ACK_RSSI		GENMASK(31, 24)</div><div class='add'>+#define HTT_TX_WBM_COMP_INFO2_SW_PEER_ID	GENMASK(15, 0)</div><div class='add'>+#define HTT_TX_WBM_COMP_INFO2_VALID		BIT(21)</div><div class='ctx'> </div><div class='ctx'> struct htt_tx_wbm_completion {</div><div class='ctx'> 	u32 info0;</div><div class='hunk'>@@ -289,6 +328,7 @@ enum htt_h2t_msg_type {</div><div class='ctx'> 	HTT_H2T_MSG_TYPE_RX_RING_SELECTION_CFG	= 0xc,</div><div class='ctx'> 	HTT_H2T_MSG_TYPE_EXT_STATS_CFG		= 0x10,</div><div class='ctx'> 	HTT_H2T_MSG_TYPE_PPDU_STATS_CFG		= 0x11,</div><div class='add'>+	HTT_H2T_MSG_TYPE_RX_FULL_MONITOR_MODE	= 0x17,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define HTT_VER_REQ_INFO_MSG_ID		GENMASK(7, 0)</div><div class='hunk'>@@ -435,7 +475,7 @@ enum htt_srng_ring_id {</div><div class='ctx'>  *                     3'b010: 4 usec</div><div class='ctx'>  *                     3'b011: 8 usec (default)</div><div class='ctx'>  *                     3'b100: 16 usec</div><div class='del'>- *                     Others: Reserverd</div><div class='add'>+ *                     Others: Reserved</div><div class='ctx'>  *           b'19    - response_required:</div><div class='ctx'>  *                     Host needs HTT_T2H_MSG_TYPE_SRING_SETUP_DONE as response</div><div class='ctx'>  *           b'20:31 - reserved:  reserved for future use</div><div class='hunk'>@@ -515,7 +555,8 @@ struct htt_ppdu_stats_cfg_cmd {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define HTT_PPDU_STATS_CFG_MSG_TYPE		GENMASK(7, 0)</div><div class='del'>-#define HTT_PPDU_STATS_CFG_PDEV_ID		GENMASK(15, 8)</div><div class='add'>+#define HTT_PPDU_STATS_CFG_SOC_STATS		BIT(8)</div><div class='add'>+#define HTT_PPDU_STATS_CFG_PDEV_ID		GENMASK(15, 9)</div><div class='ctx'> #define HTT_PPDU_STATS_CFG_TLV_TYPE_BITMASK	GENMASK(31, 16)</div><div class='ctx'> </div><div class='ctx'> enum htt_ppdu_stats_tag_type {</div><div class='hunk'>@@ -595,7 +636,7 @@ enum htt_ppdu_stats_tag_type {</div><div class='ctx'>  *          b'24    - status_swap: 1 is to swap status TLV</div><div class='ctx'>  *          b'25    - pkt_swap:  1 is to swap packet TLV</div><div class='ctx'>  *          b'26:31 - rsvd1:  reserved for future use</div><div class='del'>- * dword1 - b'0:16  - ring_buffer_size: size of bufferes referenced by rx ring,</div><div class='add'>+ * dword1 - b'0:16  - ring_buffer_size: size of buffers referenced by rx ring,</div><div class='ctx'>  *                    in byte units.</div><div class='ctx'>  *                    Valid only for HW_TO_SW_RING and SW_TO_HW_RING</div><div class='ctx'>  *        - b'16:31 - rsvd2: Reserved for future use</div><div class='hunk'>@@ -953,6 +994,32 @@ struct htt_rx_ring_tlv_filter {</div><div class='ctx'> 	u32 pkt_filter_flags3; /* DATA */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define HTT_RX_FULL_MON_MODE_CFG_CMD_INFO0_MSG_TYPE	GENMASK(7, 0)</div><div class='add'>+#define HTT_RX_FULL_MON_MODE_CFG_CMD_INFO0_PDEV_ID	GENMASK(15, 8)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_FULL_MON_MODE_CFG_CMD_CFG_ENABLE			BIT(0)</div><div class='add'>+#define HTT_RX_FULL_MON_MODE_CFG_CMD_CFG_ZERO_MPDUS_END		BIT(1)</div><div class='add'>+#define HTT_RX_FULL_MON_MODE_CFG_CMD_CFG_NON_ZERO_MPDUS_END	BIT(2)</div><div class='add'>+#define HTT_RX_FULL_MON_MODE_CFG_CMD_CFG_RELEASE_RING		GENMASK(10, 3)</div><div class='add'>+</div><div class='add'>+/* Enumeration for full monitor mode destination ring select</div><div class='add'>+ * 0 - REO destination ring select</div><div class='add'>+ * 1 - FW destination ring select</div><div class='add'>+ * 2 - SW destination ring select</div><div class='add'>+ * 3 - Release destination ring select</div><div class='add'>+ */</div><div class='add'>+enum htt_rx_full_mon_release_ring {</div><div class='add'>+	HTT_RX_MON_RING_REO,</div><div class='add'>+	HTT_RX_MON_RING_FW,</div><div class='add'>+	HTT_RX_MON_RING_SW,</div><div class='add'>+	HTT_RX_MON_RING_RELEASE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct htt_rx_full_monitor_mode_cfg_cmd {</div><div class='add'>+	u32 info0;</div><div class='add'>+	u32 cfg;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> /* HTT message target-&gt;host */</div><div class='ctx'> </div><div class='ctx'> enum htt_t2h_msg_type {</div><div class='hunk'>@@ -1114,12 +1181,12 @@ struct ath11k_htt_ppdu_stats_msg {</div><div class='ctx'> 	u32 ppdu_id;</div><div class='ctx'> 	u32 timestamp;</div><div class='ctx'> 	u32 rsvd;</div><div class='del'>-	u8 data[0];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct htt_tlv {</div><div class='ctx'> 	u32 header;</div><div class='del'>-	u8 value[0];</div><div class='add'>+	u8 value[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define HTT_TLV_TAG			GENMASK(11, 0)</div><div class='hunk'>@@ -1239,18 +1306,6 @@ struct htt_ppdu_stats_user_rate {</div><div class='ctx'> #define HTT_TX_INFO_PEERID(_flags) \</div><div class='ctx'> 			FIELD_GET(HTT_PPDU_STATS_TX_INFO_FLAGS_PEERID_M, _flags)</div><div class='ctx'> </div><div class='del'>-struct htt_tx_ppdu_stats_info {</div><div class='del'>-	struct htt_tlv tlv_hdr;</div><div class='del'>-	u32 tx_success_bytes;</div><div class='del'>-	u32 tx_retry_bytes;</div><div class='del'>-	u32 tx_failed_bytes;</div><div class='del'>-	u32 flags; /* %HTT_PPDU_STATS_TX_INFO_FLAGS_ */</div><div class='del'>-	u16 tx_success_msdus;</div><div class='del'>-	u16 tx_retry_msdus;</div><div class='del'>-	u16 tx_failed_msdus;</div><div class='del'>-	u16 tx_duration; /* united in us */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='ctx'> enum  htt_ppdu_stats_usr_compln_status {</div><div class='ctx'> 	HTT_PPDU_STATS_USER_STATUS_OK,</div><div class='ctx'> 	HTT_PPDU_STATS_USER_STATUS_FILTERED,</div><div class='hunk'>@@ -1298,17 +1353,6 @@ struct htt_ppdu_stats_usr_cmpltn_ack_ba_status {</div><div class='ctx'> 	u32 success_bytes;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct htt_ppdu_stats_usr_cmn_array {</div><div class='del'>-	struct htt_tlv tlv_hdr;</div><div class='del'>-	u32 num_ppdu_stats;</div><div class='del'>-	/* tx_ppdu_stats_info is filled by multiple struct htt_tx_ppdu_stats_info</div><div class='del'>-	 * elements.</div><div class='del'>-	 * tx_ppdu_stats_info is variable length, with length =</div><div class='del'>-	 *     number_of_ppdu_stats * sizeof (struct htt_tx_ppdu_stats_info)</div><div class='del'>-	 */</div><div class='del'>-	struct htt_tx_ppdu_stats_info tx_ppdu_info[0];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='ctx'> struct htt_ppdu_user_stats {</div><div class='ctx'> 	u16 peer_id;</div><div class='ctx'> 	u32 tlv_flags;</div><div class='hunk'>@@ -1332,8 +1376,7 @@ struct htt_ppdu_stats_info {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * @brief target -&gt; host packet log message</div><div class='add'>+/* @brief target -&gt; host packet log message</div><div class='ctx'>  *</div><div class='ctx'>  * @details</div><div class='ctx'>  * The following field definitions describe the format of the packet log</div><div class='hunk'>@@ -1368,11 +1411,10 @@ struct htt_ppdu_stats_info {</div><div class='ctx'>  */</div><div class='ctx'> struct htt_pktlog_msg {</div><div class='ctx'> 	u32 hdr;</div><div class='del'>-	u8 payload[0];</div><div class='add'>+	u8 payload[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * @brief host -&gt; target FW extended statistics retrieve</div><div class='add'>+/* @brief host -&gt; target FW extended statistics retrieve</div><div class='ctx'>  *</div><div class='ctx'>  * @details</div><div class='ctx'>  * The following field definitions describe the format of the HTT host</div><div class='hunk'>@@ -1507,8 +1549,7 @@ struct htt_ext_stats_cfg_params {</div><div class='ctx'> 	u32 cfg3;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * @brief target -&gt; host extended statistics upload</div><div class='add'>+/* @brief target -&gt; host extended statistics upload</div><div class='ctx'>  *</div><div class='ctx'>  * @details</div><div class='ctx'>  * The following field definitions describe the format of the HTT target</div><div class='hunk'>@@ -1589,9 +1630,16 @@ struct ath11k_htt_extd_stats_msg {</div><div class='ctx'> 	u32 info0;</div><div class='ctx'> 	u64 cookie;</div><div class='ctx'> 	u32 info1;</div><div class='del'>-	u8 data[0];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+#define	HTT_MAC_ADDR_L32_0	GENMASK(7, 0)</div><div class='add'>+#define	HTT_MAC_ADDR_L32_1	GENMASK(15, 8)</div><div class='add'>+#define	HTT_MAC_ADDR_L32_2	GENMASK(23, 16)</div><div class='add'>+#define	HTT_MAC_ADDR_L32_3	GENMASK(31, 24)</div><div class='add'>+#define	HTT_MAC_ADDR_H16_0	GENMASK(7, 0)</div><div class='add'>+#define	HTT_MAC_ADDR_H16_1	GENMASK(15, 8)</div><div class='add'>+</div><div class='ctx'> struct htt_mac_addr {</div><div class='ctx'> 	u32 mac_addr_l32;</div><div class='ctx'> 	u32 mac_addr_h16;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c<br/>index 1d9aa1bb6b6e..b9e976ddcbbf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/dp_rx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/dp_rx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/dp_rx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/dp_rx.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/ieee80211.h&gt;</div><div class='hunk'>@@ -20,13 +21,15 @@</div><div class='ctx'> </div><div class='ctx'> #define ATH11K_DP_RX_FRAGMENT_TIMEOUT_MS (2 * HZ)</div><div class='ctx'> </div><div class='del'>-static u8 *ath11k_dp_rx_h_80211_hdr(struct ath11k_base *ab, struct hal_rx_desc *desc)</div><div class='add'>+static inline</div><div class='add'>+u8 *ath11k_dp_rx_h_80211_hdr(struct ath11k_base *ab, struct hal_rx_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	return ab-&gt;hw_params.hw_ops-&gt;rx_desc_get_hdr_status(desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static enum hal_encrypt_type ath11k_dp_rx_h_mpdu_start_enctype(struct ath11k_base *ab,</div><div class='del'>-							       struct hal_rx_desc *desc)</div><div class='add'>+static inline</div><div class='add'>+enum hal_encrypt_type ath11k_dp_rx_h_mpdu_start_enctype(struct ath11k_base *ab,</div><div class='add'>+							struct hal_rx_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	if (!ab-&gt;hw_params.hw_ops-&gt;rx_desc_encrypt_valid(desc))</div><div class='ctx'> 		return HAL_ENCRYPT_TYPE_OPEN;</div><div class='hunk'>@@ -34,32 +37,41 @@ static enum hal_encrypt_type ath11k_dp_rx_h_mpdu_start_enctype(struct ath11k_bas</div><div class='ctx'> 	return ab-&gt;hw_params.hw_ops-&gt;rx_desc_get_encrypt_type(desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 ath11k_dp_rx_h_msdu_start_decap_type(struct ath11k_base *ab,</div><div class='del'>-					       struct hal_rx_desc *desc)</div><div class='add'>+static inline u8 ath11k_dp_rx_h_msdu_start_decap_type(struct ath11k_base *ab,</div><div class='add'>+						      struct hal_rx_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	return ab-&gt;hw_params.hw_ops-&gt;rx_desc_get_decap_type(desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 ath11k_dp_rx_h_msdu_start_mesh_ctl_present(struct ath11k_base *ab,</div><div class='del'>-						     struct hal_rx_desc *desc)</div><div class='add'>+static inline</div><div class='add'>+bool ath11k_dp_rx_h_msdu_start_ldpc_support(struct ath11k_base *ab,</div><div class='add'>+					    struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hw_params.hw_ops-&gt;rx_desc_get_ldpc_support(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+u8 ath11k_dp_rx_h_msdu_start_mesh_ctl_present(struct ath11k_base *ab,</div><div class='add'>+					      struct hal_rx_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	return ab-&gt;hw_params.hw_ops-&gt;rx_desc_get_mesh_ctl(desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ath11k_dp_rx_h_mpdu_start_seq_ctrl_valid(struct ath11k_base *ab,</div><div class='del'>-						     struct hal_rx_desc *desc)</div><div class='add'>+static inline</div><div class='add'>+bool ath11k_dp_rx_h_mpdu_start_seq_ctrl_valid(struct ath11k_base *ab,</div><div class='add'>+					      struct hal_rx_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	return ab-&gt;hw_params.hw_ops-&gt;rx_desc_get_mpdu_seq_ctl_vld(desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ath11k_dp_rx_h_mpdu_start_fc_valid(struct ath11k_base *ab,</div><div class='del'>-					       struct hal_rx_desc *desc)</div><div class='add'>+static inline bool ath11k_dp_rx_h_mpdu_start_fc_valid(struct ath11k_base *ab,</div><div class='add'>+						      struct hal_rx_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	return ab-&gt;hw_params.hw_ops-&gt;rx_desc_get_mpdu_fc_valid(desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ath11k_dp_rx_h_mpdu_start_more_frags(struct ath11k_base *ab,</div><div class='del'>-						 struct sk_buff *skb)</div><div class='add'>+static inline bool ath11k_dp_rx_h_mpdu_start_more_frags(struct ath11k_base *ab,</div><div class='add'>+							struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='ctx'> </div><div class='hunk'>@@ -67,8 +79,8 @@ static bool ath11k_dp_rx_h_mpdu_start_more_frags(struct ath11k_base *ab,</div><div class='ctx'> 	return ieee80211_has_morefrags(hdr-&gt;frame_control);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u16 ath11k_dp_rx_h_mpdu_start_frag_no(struct ath11k_base *ab,</div><div class='del'>-					     struct sk_buff *skb)</div><div class='add'>+static inline u16 ath11k_dp_rx_h_mpdu_start_frag_no(struct ath11k_base *ab,</div><div class='add'>+						    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='ctx'> </div><div class='hunk'>@@ -76,37 +88,37 @@ static u16 ath11k_dp_rx_h_mpdu_start_frag_no(struct ath11k_base *ab,</div><div class='ctx'> 	return le16_to_cpu(hdr-&gt;seq_ctrl) &amp; IEEE80211_SCTL_FRAG;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u16 ath11k_dp_rx_h_mpdu_start_seq_no(struct ath11k_base *ab,</div><div class='del'>-					    struct hal_rx_desc *desc)</div><div class='add'>+static inline u16 ath11k_dp_rx_h_mpdu_start_seq_no(struct ath11k_base *ab,</div><div class='add'>+						   struct hal_rx_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	return ab-&gt;hw_params.hw_ops-&gt;rx_desc_get_mpdu_start_seq_no(desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *ath11k_dp_rx_get_attention(struct ath11k_base *ab,</div><div class='del'>-					struct hal_rx_desc *desc)</div><div class='add'>+static inline void *ath11k_dp_rx_get_attention(struct ath11k_base *ab,</div><div class='add'>+					       struct hal_rx_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	return ab-&gt;hw_params.hw_ops-&gt;rx_desc_get_attention(desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ath11k_dp_rx_h_attn_msdu_done(struct rx_attention *attn)</div><div class='add'>+static inline bool ath11k_dp_rx_h_attn_msdu_done(struct rx_attention *attn)</div><div class='ctx'> {</div><div class='ctx'> 	return !!FIELD_GET(RX_ATTENTION_INFO2_MSDU_DONE,</div><div class='ctx'> 			   __le32_to_cpu(attn-&gt;info2));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ath11k_dp_rx_h_attn_l4_cksum_fail(struct rx_attention *attn)</div><div class='add'>+static inline bool ath11k_dp_rx_h_attn_l4_cksum_fail(struct rx_attention *attn)</div><div class='ctx'> {</div><div class='ctx'> 	return !!FIELD_GET(RX_ATTENTION_INFO1_TCP_UDP_CKSUM_FAIL,</div><div class='ctx'> 			   __le32_to_cpu(attn-&gt;info1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ath11k_dp_rx_h_attn_ip_cksum_fail(struct rx_attention *attn)</div><div class='add'>+static inline bool ath11k_dp_rx_h_attn_ip_cksum_fail(struct rx_attention *attn)</div><div class='ctx'> {</div><div class='ctx'> 	return !!FIELD_GET(RX_ATTENTION_INFO1_IP_CKSUM_FAIL,</div><div class='ctx'> 			   __le32_to_cpu(attn-&gt;info1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ath11k_dp_rx_h_attn_is_decrypted(struct rx_attention *attn)</div><div class='add'>+static inline bool ath11k_dp_rx_h_attn_is_decrypted(struct rx_attention *attn)</div><div class='ctx'> {</div><div class='ctx'> 	return (FIELD_GET(RX_ATTENTION_INFO2_DCRYPT_STATUS_CODE,</div><div class='ctx'> 			  __le32_to_cpu(attn-&gt;info2)) ==</div><div class='hunk'>@@ -142,68 +154,80 @@ static u32 ath11k_dp_rx_h_attn_mpdu_err(struct rx_attention *attn)</div><div class='ctx'> 	return errmap;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u16 ath11k_dp_rx_h_msdu_start_msdu_len(struct ath11k_base *ab,</div><div class='del'>-					      struct hal_rx_desc *desc)</div><div class='add'>+static bool ath11k_dp_rx_h_attn_msdu_len_err(struct ath11k_base *ab,</div><div class='add'>+					     struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	struct rx_attention *rx_attention;</div><div class='add'>+	u32 errmap;</div><div class='add'>+</div><div class='add'>+	rx_attention = ath11k_dp_rx_get_attention(ab, desc);</div><div class='add'>+	errmap = ath11k_dp_rx_h_attn_mpdu_err(rx_attention);</div><div class='add'>+</div><div class='add'>+	return errmap &amp; DP_RX_MPDU_ERR_MSDU_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 ath11k_dp_rx_h_msdu_start_msdu_len(struct ath11k_base *ab,</div><div class='add'>+						     struct hal_rx_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	return ab-&gt;hw_params.hw_ops-&gt;rx_desc_get_msdu_len(desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 ath11k_dp_rx_h_msdu_start_sgi(struct ath11k_base *ab,</div><div class='del'>-					struct hal_rx_desc *desc)</div><div class='add'>+static inline u8 ath11k_dp_rx_h_msdu_start_sgi(struct ath11k_base *ab,</div><div class='add'>+					       struct hal_rx_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	return ab-&gt;hw_params.hw_ops-&gt;rx_desc_get_msdu_sgi(desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 ath11k_dp_rx_h_msdu_start_rate_mcs(struct ath11k_base *ab,</div><div class='del'>-					     struct hal_rx_desc *desc)</div><div class='add'>+static inline u8 ath11k_dp_rx_h_msdu_start_rate_mcs(struct ath11k_base *ab,</div><div class='add'>+						    struct hal_rx_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	return ab-&gt;hw_params.hw_ops-&gt;rx_desc_get_msdu_rate_mcs(desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 ath11k_dp_rx_h_msdu_start_rx_bw(struct ath11k_base *ab,</div><div class='del'>-					  struct hal_rx_desc *desc)</div><div class='add'>+static inline u8 ath11k_dp_rx_h_msdu_start_rx_bw(struct ath11k_base *ab,</div><div class='add'>+						 struct hal_rx_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	return ab-&gt;hw_params.hw_ops-&gt;rx_desc_get_msdu_rx_bw(desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 ath11k_dp_rx_h_msdu_start_freq(struct ath11k_base *ab,</div><div class='del'>-					  struct hal_rx_desc *desc)</div><div class='add'>+static inline u32 ath11k_dp_rx_h_msdu_start_freq(struct ath11k_base *ab,</div><div class='add'>+						 struct hal_rx_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	return ab-&gt;hw_params.hw_ops-&gt;rx_desc_get_msdu_freq(desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 ath11k_dp_rx_h_msdu_start_pkt_type(struct ath11k_base *ab,</div><div class='del'>-					     struct hal_rx_desc *desc)</div><div class='add'>+static inline u8 ath11k_dp_rx_h_msdu_start_pkt_type(struct ath11k_base *ab,</div><div class='add'>+						    struct hal_rx_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	return ab-&gt;hw_params.hw_ops-&gt;rx_desc_get_msdu_pkt_type(desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 ath11k_dp_rx_h_msdu_start_nss(struct ath11k_base *ab,</div><div class='del'>-					struct hal_rx_desc *desc)</div><div class='add'>+static inline u8 ath11k_dp_rx_h_msdu_start_nss(struct ath11k_base *ab,</div><div class='add'>+					       struct hal_rx_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	return hweight8(ab-&gt;hw_params.hw_ops-&gt;rx_desc_get_msdu_nss(desc));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 ath11k_dp_rx_h_mpdu_start_tid(struct ath11k_base *ab,</div><div class='del'>-					struct hal_rx_desc *desc)</div><div class='add'>+static inline u8 ath11k_dp_rx_h_mpdu_start_tid(struct ath11k_base *ab,</div><div class='add'>+					       struct hal_rx_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	return ab-&gt;hw_params.hw_ops-&gt;rx_desc_get_mpdu_tid(desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u16 ath11k_dp_rx_h_mpdu_start_peer_id(struct ath11k_base *ab,</div><div class='del'>-					     struct hal_rx_desc *desc)</div><div class='add'>+static inline u16 ath11k_dp_rx_h_mpdu_start_peer_id(struct ath11k_base *ab,</div><div class='add'>+						    struct hal_rx_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	return ab-&gt;hw_params.hw_ops-&gt;rx_desc_get_mpdu_peer_id(desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 ath11k_dp_rx_h_msdu_end_l3pad(struct ath11k_base *ab,</div><div class='del'>-					struct hal_rx_desc *desc)</div><div class='add'>+static inline u8 ath11k_dp_rx_h_msdu_end_l3pad(struct ath11k_base *ab,</div><div class='add'>+					       struct hal_rx_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	return ab-&gt;hw_params.hw_ops-&gt;rx_desc_get_l3_pad_bytes(desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ath11k_dp_rx_h_msdu_end_first_msdu(struct ath11k_base *ab,</div><div class='del'>-					       struct hal_rx_desc *desc)</div><div class='add'>+static inline bool ath11k_dp_rx_h_msdu_end_first_msdu(struct ath11k_base *ab,</div><div class='add'>+						      struct hal_rx_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	return ab-&gt;hw_params.hw_ops-&gt;rx_desc_get_first_msdu(desc);</div><div class='ctx'> }</div><div class='hunk'>@@ -221,14 +245,14 @@ static void ath11k_dp_rx_desc_end_tlv_copy(struct ath11k_base *ab,</div><div class='ctx'> 	ab-&gt;hw_params.hw_ops-&gt;rx_desc_copy_attn_end_tlv(fdesc, ldesc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 ath11k_dp_rxdesc_get_mpdulen_err(struct rx_attention *attn)</div><div class='add'>+static inline u32 ath11k_dp_rxdesc_get_mpdulen_err(struct rx_attention *attn)</div><div class='ctx'> {</div><div class='ctx'> 	return FIELD_GET(RX_ATTENTION_INFO1_MPDU_LEN_ERR,</div><div class='ctx'> 			 __le32_to_cpu(attn-&gt;info1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 *ath11k_dp_rxdesc_get_80211hdr(struct ath11k_base *ab,</div><div class='del'>-					 struct hal_rx_desc *rx_desc)</div><div class='add'>+static inline u8 *ath11k_dp_rxdesc_get_80211hdr(struct ath11k_base *ab,</div><div class='add'>+						struct hal_rx_desc *rx_desc)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *rx_pkt_hdr;</div><div class='ctx'> </div><div class='hunk'>@@ -237,8 +261,8 @@ static u8 *ath11k_dp_rxdesc_get_80211hdr(struct ath11k_base *ab,</div><div class='ctx'> 	return rx_pkt_hdr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ath11k_dp_rxdesc_mpdu_valid(struct ath11k_base *ab,</div><div class='del'>-					struct hal_rx_desc *rx_desc)</div><div class='add'>+static inline bool ath11k_dp_rxdesc_mpdu_valid(struct ath11k_base *ab,</div><div class='add'>+					       struct hal_rx_desc *rx_desc)</div><div class='ctx'> {</div><div class='ctx'> 	u32 tlv_tag;</div><div class='ctx'> </div><div class='hunk'>@@ -247,25 +271,47 @@ static bool ath11k_dp_rxdesc_mpdu_valid(struct ath11k_base *ab,</div><div class='ctx'> 	return tlv_tag == HAL_RX_MPDU_START;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 ath11k_dp_rxdesc_get_ppduid(struct ath11k_base *ab,</div><div class='del'>-				       struct hal_rx_desc *rx_desc)</div><div class='add'>+static inline u32 ath11k_dp_rxdesc_get_ppduid(struct ath11k_base *ab,</div><div class='add'>+					      struct hal_rx_desc *rx_desc)</div><div class='ctx'> {</div><div class='ctx'> 	return ab-&gt;hw_params.hw_ops-&gt;rx_desc_get_mpdu_ppdu_id(rx_desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath11k_dp_rxdesc_set_msdu_len(struct ath11k_base *ab,</div><div class='del'>-					  struct hal_rx_desc *desc,</div><div class='del'>-					  u16 len)</div><div class='add'>+static inline void ath11k_dp_rxdesc_set_msdu_len(struct ath11k_base *ab,</div><div class='add'>+						 struct hal_rx_desc *desc,</div><div class='add'>+						 u16 len)</div><div class='ctx'> {</div><div class='ctx'> 	ab-&gt;hw_params.hw_ops-&gt;rx_desc_set_msdu_len(desc, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ath11k_dp_rx_h_attn_is_mcbc(struct ath11k_base *ab,</div><div class='add'>+					struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	struct rx_attention *attn = ath11k_dp_rx_get_attention(ab, desc);</div><div class='add'>+</div><div class='add'>+	return ath11k_dp_rx_h_msdu_end_first_msdu(ab, desc) &amp;&amp;</div><div class='add'>+		(!!FIELD_GET(RX_ATTENTION_INFO1_MCAST_BCAST,</div><div class='add'>+		 __le32_to_cpu(attn-&gt;info1)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath11k_dp_rxdesc_mac_addr2_valid(struct ath11k_base *ab,</div><div class='add'>+					     struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hw_params.hw_ops-&gt;rx_desc_mac_addr2_valid(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *ath11k_dp_rxdesc_mpdu_start_addr2(struct ath11k_base *ab,</div><div class='add'>+					     struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hw_params.hw_ops-&gt;rx_desc_mpdu_start_addr2(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath11k_dp_service_mon_ring(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_base *ab = from_timer(ab, t, mon_reap_timer);</div><div class='add'>+	struct ath11k_base *ab = timer_container_of(ab, t, mon_reap_timer);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ab-&gt;hw_params.num_rxmda_per_pdev; i++)</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.num_rxdma_per_pdev; i++)</div><div class='ctx'> 		ath11k_dp_rx_process_mon_rings(ab, i, NULL, DP_MON_SERVICE_BUDGET);</div><div class='ctx'> </div><div class='ctx'> 	mod_timer(&amp;ab-&gt;mon_reap_timer, jiffies +</div><div class='hunk'>@@ -278,7 +324,7 @@ static int ath11k_dp_purge_mon_ring(struct ath11k_base *ab)</div><div class='ctx'> 	unsigned long timeout = jiffies + msecs_to_jiffies(DP_MON_PURGE_TIMEOUT_MS);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		for (i = 0; i &lt; ab-&gt;hw_params.num_rxmda_per_pdev; i++)</div><div class='add'>+		for (i = 0; i &lt; ab-&gt;hw_params.num_rxdma_per_pdev; i++)</div><div class='ctx'> 			reaped += ath11k_dp_rx_process_mon_rings(ab, i,</div><div class='ctx'> 								 NULL,</div><div class='ctx'> 								 DP_MON_SERVICE_BUDGET);</div><div class='hunk'>@@ -344,10 +390,10 @@ int ath11k_dp_rxbufs_replenish(struct ath11k_base *ab, int mac_id,</div><div class='ctx'> 			goto fail_free_skb;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='del'>-		buf_id = idr_alloc(&amp;rx_ring-&gt;bufs_idr, skb, 0,</div><div class='del'>-				   rx_ring-&gt;bufs_max * 3, GFP_ATOMIC);</div><div class='add'>+		buf_id = idr_alloc(&amp;rx_ring-&gt;bufs_idr, skb, 1,</div><div class='add'>+				   (rx_ring-&gt;bufs_max * 3) + 1, GFP_ATOMIC);</div><div class='ctx'> 		spin_unlock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='del'>-		if (buf_id &lt; 0)</div><div class='add'>+		if (buf_id &lt;= 0)</div><div class='ctx'> 			goto fail_dma_unmap;</div><div class='ctx'> </div><div class='ctx'> 		desc = ath11k_hal_srng_src_get_next_entry(ab, srng);</div><div class='hunk'>@@ -390,7 +436,6 @@ fail_free_skb:</div><div class='ctx'> static int ath11k_dp_rxdma_buf_ring_free(struct ath11k *ar,</div><div class='ctx'> 					 struct dp_rxdma_ring *rx_ring)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_pdev_dp *dp = &amp;ar-&gt;dp;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int buf_id;</div><div class='ctx'> </div><div class='hunk'>@@ -408,28 +453,6 @@ static int ath11k_dp_rxdma_buf_ring_free(struct ath11k *ar,</div><div class='ctx'> 	idr_destroy(&amp;rx_ring-&gt;bufs_idr);</div><div class='ctx'> 	spin_unlock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='ctx'> </div><div class='del'>-	/* if rxdma1_enable is false, mon_status_refill_ring</div><div class='del'>-	 * isn't setup, so don't clean.</div><div class='del'>-	 */</div><div class='del'>-	if (!ar-&gt;ab-&gt;hw_params.rxdma1_enable)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	rx_ring = &amp;dp-&gt;rx_mon_status_refill_ring[0];</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='del'>-	idr_for_each_entry(&amp;rx_ring-&gt;bufs_idr, skb, buf_id) {</div><div class='del'>-		idr_remove(&amp;rx_ring-&gt;bufs_idr, buf_id);</div><div class='del'>-		/* XXX: Understand where internal driver does this dma_unmap</div><div class='del'>-		 * of rxdma_buffer.</div><div class='del'>-		 */</div><div class='del'>-		dma_unmap_single(ar-&gt;ab-&gt;dev, ATH11K_SKB_RXCB(skb)-&gt;paddr,</div><div class='del'>-				 skb-&gt;len + skb_tailroom(skb), DMA_BIDIRECTIONAL);</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	idr_destroy(&amp;rx_ring-&gt;bufs_idr);</div><div class='del'>-	spin_unlock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -445,7 +468,7 @@ static int ath11k_dp_rxdma_pdev_buf_free(struct ath11k *ar)</div><div class='ctx'> 	rx_ring = &amp;dp-&gt;rxdma_mon_buf_ring;</div><div class='ctx'> 	ath11k_dp_rxdma_buf_ring_free(ar, rx_ring);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ab-&gt;hw_params.num_rxmda_per_pdev; i++) {</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.num_rxdma_per_pdev; i++) {</div><div class='ctx'> 		rx_ring = &amp;dp-&gt;rx_mon_status_refill_ring[i];</div><div class='ctx'> 		ath11k_dp_rxdma_buf_ring_free(ar, rx_ring);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -465,7 +488,7 @@ static int ath11k_dp_rxdma_ring_buf_setup(struct ath11k *ar,</div><div class='ctx'> </div><div class='ctx'> 	rx_ring-&gt;bufs_max = num_entries;</div><div class='ctx'> 	ath11k_dp_rxbufs_replenish(ar-&gt;ab, dp-&gt;mac_id, rx_ring, num_entries,</div><div class='del'>-				   HAL_RX_BUF_RBM_SW3_BM);</div><div class='add'>+				   ar-&gt;ab-&gt;hw_params.hal_params-&gt;rx_buf_rbm);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -483,7 +506,7 @@ static int ath11k_dp_rxdma_pdev_buf_setup(struct ath11k *ar)</div><div class='ctx'> 		ath11k_dp_rxdma_ring_buf_setup(ar, rx_ring, HAL_RXDMA_MONITOR_BUF);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ab-&gt;hw_params.num_rxmda_per_pdev; i++) {</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.num_rxdma_per_pdev; i++) {</div><div class='ctx'> 		rx_ring = &amp;dp-&gt;rx_mon_status_refill_ring[i];</div><div class='ctx'> 		ath11k_dp_rxdma_ring_buf_setup(ar, rx_ring, HAL_RXDMA_MONITOR_STATUS);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -499,7 +522,7 @@ static void ath11k_dp_rx_pdev_srng_free(struct ath11k *ar)</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dp_srng_cleanup(ab, &amp;dp-&gt;rx_refill_buf_ring.refill_buf_ring);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ab-&gt;hw_params.num_rxmda_per_pdev; i++) {</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.num_rxdma_per_pdev; i++) {</div><div class='ctx'> 		if (ab-&gt;hw_params.rx_mac_buf_ring)</div><div class='ctx'> 			ath11k_dp_srng_cleanup(ab, &amp;dp-&gt;rx_mac_buf_ring[i]);</div><div class='ctx'> </div><div class='hunk'>@@ -562,7 +585,7 @@ static int ath11k_dp_rx_pdev_srng_alloc(struct ath11k *ar)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ar-&gt;ab-&gt;hw_params.rx_mac_buf_ring) {</div><div class='del'>-		for (i = 0; i &lt; ab-&gt;hw_params.num_rxmda_per_pdev; i++) {</div><div class='add'>+		for (i = 0; i &lt; ab-&gt;hw_params.num_rxdma_per_pdev; i++) {</div><div class='ctx'> 			ret = ath11k_dp_srng_setup(ar-&gt;ab,</div><div class='ctx'> 						   &amp;dp-&gt;rx_mac_buf_ring[i],</div><div class='ctx'> 						   HAL_RXDMA_BUF, 1,</div><div class='hunk'>@@ -575,7 +598,7 @@ static int ath11k_dp_rx_pdev_srng_alloc(struct ath11k *ar)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ab-&gt;hw_params.num_rxmda_per_pdev; i++) {</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.num_rxdma_per_pdev; i++) {</div><div class='ctx'> 		ret = ath11k_dp_srng_setup(ar-&gt;ab, &amp;dp-&gt;rxdma_err_dst_ring[i],</div><div class='ctx'> 					   HAL_RXDMA_DST, 0, dp-&gt;mac_id + i,</div><div class='ctx'> 					   DP_RXDMA_ERR_DST_RING_SIZE);</div><div class='hunk'>@@ -585,7 +608,7 @@ static int ath11k_dp_rx_pdev_srng_alloc(struct ath11k *ar)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ab-&gt;hw_params.num_rxmda_per_pdev; i++) {</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.num_rxdma_per_pdev; i++) {</div><div class='ctx'> 		srng = &amp;dp-&gt;rx_mon_status_refill_ring[i].refill_buf_ring;</div><div class='ctx'> 		ret = ath11k_dp_srng_setup(ar-&gt;ab,</div><div class='ctx'> 					   srng,</div><div class='hunk'>@@ -646,13 +669,18 @@ void ath11k_dp_reo_cmd_list_cleanup(struct ath11k_base *ab)</div><div class='ctx'> 	struct ath11k_dp *dp = &amp;ab-&gt;dp;</div><div class='ctx'> 	struct dp_reo_cmd *cmd, *tmp;</div><div class='ctx'> 	struct dp_reo_cache_flush_elem *cmd_cache, *tmp_cache;</div><div class='add'>+	struct dp_rx_tid *rx_tid;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;dp-&gt;reo_cmd_lock);</div><div class='ctx'> 	list_for_each_entry_safe(cmd, tmp, &amp;dp-&gt;reo_cmd_list, list) {</div><div class='ctx'> 		list_del(&amp;cmd-&gt;list);</div><div class='del'>-		dma_unmap_single(ab-&gt;dev, cmd-&gt;data.paddr,</div><div class='del'>-				 cmd-&gt;data.size, DMA_BIDIRECTIONAL);</div><div class='del'>-		kfree(cmd-&gt;data.vaddr);</div><div class='add'>+		rx_tid = &amp;cmd-&gt;data;</div><div class='add'>+		if (rx_tid-&gt;vaddr_unaligned) {</div><div class='add'>+			dma_free_noncoherent(ab-&gt;dev, rx_tid-&gt;unaligned_size,</div><div class='add'>+					     rx_tid-&gt;vaddr_unaligned,</div><div class='add'>+					     rx_tid-&gt;paddr_unaligned, DMA_BIDIRECTIONAL);</div><div class='add'>+			rx_tid-&gt;vaddr_unaligned = NULL;</div><div class='add'>+		}</div><div class='ctx'> 		kfree(cmd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -660,9 +688,13 @@ void ath11k_dp_reo_cmd_list_cleanup(struct ath11k_base *ab)</div><div class='ctx'> 				 &amp;dp-&gt;reo_cmd_cache_flush_list, list) {</div><div class='ctx'> 		list_del(&amp;cmd_cache-&gt;list);</div><div class='ctx'> 		dp-&gt;reo_cmd_cache_flush_count--;</div><div class='del'>-		dma_unmap_single(ab-&gt;dev, cmd_cache-&gt;data.paddr,</div><div class='del'>-				 cmd_cache-&gt;data.size, DMA_BIDIRECTIONAL);</div><div class='del'>-		kfree(cmd_cache-&gt;data.vaddr);</div><div class='add'>+		rx_tid = &amp;cmd_cache-&gt;data;</div><div class='add'>+		if (rx_tid-&gt;vaddr_unaligned) {</div><div class='add'>+			dma_free_noncoherent(ab-&gt;dev, rx_tid-&gt;unaligned_size,</div><div class='add'>+					     rx_tid-&gt;vaddr_unaligned,</div><div class='add'>+					     rx_tid-&gt;paddr_unaligned, DMA_BIDIRECTIONAL);</div><div class='add'>+			rx_tid-&gt;vaddr_unaligned = NULL;</div><div class='add'>+		}</div><div class='ctx'> 		kfree(cmd_cache);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;dp-&gt;reo_cmd_lock);</div><div class='hunk'>@@ -676,16 +708,18 @@ static void ath11k_dp_reo_cmd_free(struct ath11k_dp *dp, void *ctx,</div><div class='ctx'> 	if (status != HAL_REO_CMD_SUCCESS)</div><div class='ctx'> 		ath11k_warn(dp-&gt;ab, "failed to flush rx tid hw desc, tid %d status %d\n",</div><div class='ctx'> 			    rx_tid-&gt;tid, status);</div><div class='del'>-</div><div class='del'>-	dma_unmap_single(dp-&gt;ab-&gt;dev, rx_tid-&gt;paddr, rx_tid-&gt;size,</div><div class='del'>-			 DMA_BIDIRECTIONAL);</div><div class='del'>-	kfree(rx_tid-&gt;vaddr);</div><div class='add'>+	if (rx_tid-&gt;vaddr_unaligned) {</div><div class='add'>+		dma_free_noncoherent(dp-&gt;ab-&gt;dev, rx_tid-&gt;unaligned_size,</div><div class='add'>+				     rx_tid-&gt;vaddr_unaligned,</div><div class='add'>+				     rx_tid-&gt;paddr_unaligned, DMA_BIDIRECTIONAL);</div><div class='add'>+		rx_tid-&gt;vaddr_unaligned = NULL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_dp_reo_cache_flush(struct ath11k_base *ab,</div><div class='ctx'> 				      struct dp_rx_tid *rx_tid)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_hal_reo_cmd cmd = {0};</div><div class='add'>+	struct ath11k_hal_reo_cmd cmd = {};</div><div class='ctx'> 	unsigned long tot_desc_sz, desc_sz;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -715,9 +749,10 @@ static void ath11k_dp_reo_cache_flush(struct ath11k_base *ab,</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_err(ab, "failed to send HAL_REO_CMD_FLUSH_CACHE cmd, tid %d (%d)\n",</div><div class='ctx'> 			   rx_tid-&gt;tid, ret);</div><div class='del'>-		dma_unmap_single(ab-&gt;dev, rx_tid-&gt;paddr, rx_tid-&gt;size,</div><div class='del'>-				 DMA_BIDIRECTIONAL);</div><div class='del'>-		kfree(rx_tid-&gt;vaddr);</div><div class='add'>+		dma_free_noncoherent(ab-&gt;dev, rx_tid-&gt;unaligned_size,</div><div class='add'>+				     rx_tid-&gt;vaddr_unaligned,</div><div class='add'>+				     rx_tid-&gt;paddr_unaligned, DMA_BIDIRECTIONAL);</div><div class='add'>+		rx_tid-&gt;vaddr_unaligned = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -767,21 +802,24 @@ static void ath11k_dp_rx_tid_del_func(struct ath11k_dp *dp, void *ctx,</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> free_desc:</div><div class='del'>-	dma_unmap_single(ab-&gt;dev, rx_tid-&gt;paddr, rx_tid-&gt;size,</div><div class='del'>-			 DMA_BIDIRECTIONAL);</div><div class='del'>-	kfree(rx_tid-&gt;vaddr);</div><div class='add'>+	dma_free_noncoherent(ab-&gt;dev, rx_tid-&gt;unaligned_size,</div><div class='add'>+			     rx_tid-&gt;vaddr_unaligned,</div><div class='add'>+			     rx_tid-&gt;paddr_unaligned, DMA_BIDIRECTIONAL);</div><div class='add'>+	rx_tid-&gt;vaddr_unaligned = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ath11k_peer_rx_tid_delete(struct ath11k *ar,</div><div class='ctx'> 			       struct ath11k_peer *peer, u8 tid)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_hal_reo_cmd cmd = {0};</div><div class='add'>+	struct ath11k_hal_reo_cmd cmd = {};</div><div class='ctx'> 	struct dp_rx_tid *rx_tid = &amp;peer-&gt;rx_tid[tid];</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!rx_tid-&gt;active)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	rx_tid-&gt;active = false;</div><div class='add'>+</div><div class='ctx'> 	cmd.flag = HAL_REO_CMD_FLG_NEED_STATUS;</div><div class='ctx'> 	cmd.addr_lo = lower_32_bits(rx_tid-&gt;paddr);</div><div class='ctx'> 	cmd.addr_hi = upper_32_bits(rx_tid-&gt;paddr);</div><div class='hunk'>@@ -790,14 +828,19 @@ void ath11k_peer_rx_tid_delete(struct ath11k *ar,</div><div class='ctx'> 					HAL_REO_CMD_UPDATE_RX_QUEUE, &amp;cmd,</div><div class='ctx'> 					ath11k_dp_rx_tid_del_func);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ath11k_err(ar-&gt;ab, "failed to send HAL_REO_CMD_UPDATE_RX_QUEUE cmd, tid %d (%d)\n",</div><div class='del'>-			   tid, ret);</div><div class='del'>-		dma_unmap_single(ar-&gt;ab-&gt;dev, rx_tid-&gt;paddr, rx_tid-&gt;size,</div><div class='del'>-				 DMA_BIDIRECTIONAL);</div><div class='del'>-		kfree(rx_tid-&gt;vaddr);</div><div class='add'>+		if (ret != -ESHUTDOWN)</div><div class='add'>+			ath11k_err(ar-&gt;ab, "failed to send HAL_REO_CMD_UPDATE_RX_QUEUE cmd, tid %d (%d)\n",</div><div class='add'>+				   tid, ret);</div><div class='add'>+		dma_free_noncoherent(ar-&gt;ab-&gt;dev, rx_tid-&gt;unaligned_size,</div><div class='add'>+				     rx_tid-&gt;vaddr_unaligned,</div><div class='add'>+				     rx_tid-&gt;paddr_unaligned, DMA_BIDIRECTIONAL);</div><div class='add'>+		rx_tid-&gt;vaddr_unaligned = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rx_tid-&gt;active = false;</div><div class='add'>+	rx_tid-&gt;paddr = 0;</div><div class='add'>+	rx_tid-&gt;paddr_unaligned = 0;</div><div class='add'>+	rx_tid-&gt;size = 0;</div><div class='add'>+	rx_tid-&gt;unaligned_size = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath11k_dp_rx_link_desc_return(struct ath11k_base *ab,</div><div class='hunk'>@@ -852,6 +895,24 @@ static void ath11k_dp_rx_frags_cleanup(struct dp_rx_tid *rx_tid, bool rel_link_d</div><div class='ctx'> 	__skb_queue_purge(&amp;rx_tid-&gt;rx_frags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void ath11k_peer_frags_flush(struct ath11k *ar, struct ath11k_peer *peer)</div><div class='add'>+{</div><div class='add'>+	struct dp_rx_tid *rx_tid;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= IEEE80211_NUM_TIDS; i++) {</div><div class='add'>+		rx_tid = &amp;peer-&gt;rx_tid[i];</div><div class='add'>+</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+		timer_delete_sync(&amp;rx_tid-&gt;frag_timer);</div><div class='add'>+		spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+		ath11k_dp_rx_frags_cleanup(rx_tid, true);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void ath11k_peer_rx_tid_cleanup(struct ath11k *ar, struct ath11k_peer *peer)</div><div class='ctx'> {</div><div class='ctx'> 	struct dp_rx_tid *rx_tid;</div><div class='hunk'>@@ -866,7 +927,7 @@ void ath11k_peer_rx_tid_cleanup(struct ath11k *ar, struct ath11k_peer *peer)</div><div class='ctx'> 		ath11k_dp_rx_frags_cleanup(rx_tid, true);</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='del'>-		del_timer_sync(&amp;rx_tid-&gt;frag_timer);</div><div class='add'>+		timer_delete_sync(&amp;rx_tid-&gt;frag_timer);</div><div class='ctx'> 		spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -877,7 +938,7 @@ static int ath11k_peer_rx_tid_reo_update(struct ath11k *ar,</div><div class='ctx'> 					 u32 ba_win_sz, u16 ssn,</div><div class='ctx'> 					 bool update_ssn)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_hal_reo_cmd cmd = {0};</div><div class='add'>+	struct ath11k_hal_reo_cmd cmd = {};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	cmd.addr_lo = lower_32_bits(rx_tid-&gt;paddr);</div><div class='hunk'>@@ -923,9 +984,9 @@ static void ath11k_dp_rx_tid_mem_free(struct ath11k_base *ab,</div><div class='ctx'> 	if (!rx_tid-&gt;active)</div><div class='ctx'> 		goto unlock_exit;</div><div class='ctx'> </div><div class='del'>-	dma_unmap_single(ab-&gt;dev, rx_tid-&gt;paddr, rx_tid-&gt;size,</div><div class='del'>-			 DMA_BIDIRECTIONAL);</div><div class='del'>-	kfree(rx_tid-&gt;vaddr);</div><div class='add'>+	dma_free_noncoherent(ab-&gt;dev, rx_tid-&gt;unaligned_size, rx_tid-&gt;vaddr_unaligned,</div><div class='add'>+			     rx_tid-&gt;paddr_unaligned, DMA_BIDIRECTIONAL);</div><div class='add'>+	rx_tid-&gt;vaddr_unaligned = NULL;</div><div class='ctx'> </div><div class='ctx'> 	rx_tid-&gt;active = false;</div><div class='ctx'> </div><div class='hunk'>@@ -940,9 +1001,8 @@ int ath11k_peer_rx_tid_setup(struct ath11k *ar, const u8 *peer_mac, int vdev_id,</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='ctx'> 	struct ath11k_peer *peer;</div><div class='ctx'> 	struct dp_rx_tid *rx_tid;</div><div class='del'>-	u32 hw_desc_sz;</div><div class='del'>-	u32 *addr_aligned;</div><div class='del'>-	void *vaddr;</div><div class='add'>+	u32 hw_desc_sz, *vaddr;</div><div class='add'>+	void *vaddr_unaligned;</div><div class='ctx'> 	dma_addr_t paddr;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -950,7 +1010,8 @@ int ath11k_peer_rx_tid_setup(struct ath11k *ar, const u8 *peer_mac, int vdev_id,</div><div class='ctx'> </div><div class='ctx'> 	peer = ath11k_peer_find(ab, vdev_id, peer_mac);</div><div class='ctx'> 	if (!peer) {</div><div class='del'>-		ath11k_warn(ab, "failed to find the peer to set up rx tid\n");</div><div class='add'>+		ath11k_warn(ab, "failed to find the peer %pM to set up rx tid\n",</div><div class='add'>+			    peer_mac);</div><div class='ctx'> 		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -963,7 +1024,8 @@ int ath11k_peer_rx_tid_setup(struct ath11k *ar, const u8 *peer_mac, int vdev_id,</div><div class='ctx'> 						    ba_win_sz, ssn, true);</div><div class='ctx'> 		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ath11k_warn(ab, "failed to update reo for rx tid %d\n", tid);</div><div class='add'>+			ath11k_warn(ab, "failed to update reo for peer %pM rx tid %d\n: %d",</div><div class='add'>+				    peer_mac, tid, ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -971,8 +1033,8 @@ int ath11k_peer_rx_tid_setup(struct ath11k *ar, const u8 *peer_mac, int vdev_id,</div><div class='ctx'> 							     peer_mac, paddr,</div><div class='ctx'> 							     tid, 1, ba_win_sz);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			ath11k_warn(ab, "failed to send wmi command to update rx reorder queue, tid :%d (%d)\n",</div><div class='del'>-				    tid, ret);</div><div class='add'>+			ath11k_warn(ab, "failed to send wmi rx reorder queue for peer %pM tid %d: %d\n",</div><div class='add'>+				    peer_mac, tid, ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -988,54 +1050,48 @@ int ath11k_peer_rx_tid_setup(struct ath11k *ar, const u8 *peer_mac, int vdev_id,</div><div class='ctx'> 	else</div><div class='ctx'> 		hw_desc_sz = ath11k_hal_reo_qdesc_size(DP_BA_WIN_SZ_MAX, tid);</div><div class='ctx'> </div><div class='del'>-	vaddr = kzalloc(hw_desc_sz + HAL_LINK_DESC_ALIGN - 1, GFP_ATOMIC);</div><div class='del'>-	if (!vaddr) {</div><div class='add'>+	rx_tid-&gt;unaligned_size = hw_desc_sz + HAL_LINK_DESC_ALIGN - 1;</div><div class='add'>+	vaddr_unaligned = dma_alloc_noncoherent(ab-&gt;dev, rx_tid-&gt;unaligned_size, &amp;paddr,</div><div class='add'>+						DMA_BIDIRECTIONAL, GFP_ATOMIC);</div><div class='add'>+	if (!vaddr_unaligned) {</div><div class='ctx'> 		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	addr_aligned = PTR_ALIGN(vaddr, HAL_LINK_DESC_ALIGN);</div><div class='del'>-</div><div class='del'>-	ath11k_hal_reo_qdesc_setup(addr_aligned, tid, ba_win_sz,</div><div class='del'>-				   ssn, pn_type);</div><div class='del'>-</div><div class='del'>-	paddr = dma_map_single(ab-&gt;dev, addr_aligned, hw_desc_sz,</div><div class='del'>-			       DMA_BIDIRECTIONAL);</div><div class='del'>-</div><div class='del'>-	ret = dma_mapping_error(ab-&gt;dev, paddr);</div><div class='del'>-	if (ret) {</div><div class='del'>-		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='del'>-		goto err_mem_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rx_tid-&gt;vaddr = vaddr;</div><div class='del'>-	rx_tid-&gt;paddr = paddr;</div><div class='add'>+	rx_tid-&gt;vaddr_unaligned = vaddr_unaligned;</div><div class='add'>+	vaddr = PTR_ALIGN(vaddr_unaligned, HAL_LINK_DESC_ALIGN);</div><div class='add'>+	rx_tid-&gt;paddr_unaligned = paddr;</div><div class='add'>+	rx_tid-&gt;paddr = rx_tid-&gt;paddr_unaligned + ((unsigned long)vaddr -</div><div class='add'>+			(unsigned long)rx_tid-&gt;vaddr_unaligned);</div><div class='add'>+	ath11k_hal_reo_qdesc_setup(vaddr, tid, ba_win_sz, ssn, pn_type);</div><div class='ctx'> 	rx_tid-&gt;size = hw_desc_sz;</div><div class='ctx'> 	rx_tid-&gt;active = true;</div><div class='ctx'> </div><div class='add'>+	/* After dma_alloc_noncoherent, vaddr is being modified for reo qdesc setup.</div><div class='add'>+	 * Since these changes are not reflected in the device, driver now needs to</div><div class='add'>+	 * explicitly call dma_sync_single_for_device.</div><div class='add'>+	 */</div><div class='add'>+	dma_sync_single_for_device(ab-&gt;dev, rx_tid-&gt;paddr,</div><div class='add'>+				   rx_tid-&gt;size,</div><div class='add'>+				   DMA_TO_DEVICE);</div><div class='ctx'> 	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_wmi_peer_rx_reorder_queue_setup(ar, vdev_id, peer_mac,</div><div class='del'>-						     paddr, tid, 1, ba_win_sz);</div><div class='add'>+	ret = ath11k_wmi_peer_rx_reorder_queue_setup(ar, vdev_id, peer_mac, rx_tid-&gt;paddr,</div><div class='add'>+						     tid, 1, ba_win_sz);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ath11k_warn(ar-&gt;ab, "failed to setup rx reorder queue, tid :%d (%d)\n",</div><div class='del'>-			    tid, ret);</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to setup rx reorder queue for peer %pM tid %d: %d\n",</div><div class='add'>+			    peer_mac, tid, ret);</div><div class='ctx'> 		ath11k_dp_rx_tid_mem_free(ab, peer_mac, vdev_id, tid);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='del'>-</div><div class='del'>-err_mem_free:</div><div class='del'>-	kfree(vaddr);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ath11k_dp_rx_ampdu_start(struct ath11k *ar,</div><div class='ctx'> 			     struct ieee80211_ampdu_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='del'>-	struct ath11k_sta *arsta = (void *)params-&gt;sta-&gt;drv_priv;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(params-&gt;sta);</div><div class='ctx'> 	int vdev_id = arsta-&gt;arvif-&gt;vdev_id;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1053,7 +1109,7 @@ int ath11k_dp_rx_ampdu_stop(struct ath11k *ar,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='ctx'> 	struct ath11k_peer *peer;</div><div class='del'>-	struct ath11k_sta *arsta = (void *)params-&gt;sta-&gt;drv_priv;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(params-&gt;sta);</div><div class='ctx'> 	int vdev_id = arsta-&gt;arvif-&gt;vdev_id;</div><div class='ctx'> 	dma_addr_t paddr;</div><div class='ctx'> 	bool active;</div><div class='hunk'>@@ -1101,7 +1157,7 @@ int ath11k_dp_peer_rx_pn_replay_config(struct ath11k_vif *arvif,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = arvif-&gt;ar;</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='del'>-	struct ath11k_hal_reo_cmd cmd = {0};</div><div class='add'>+	struct ath11k_hal_reo_cmd cmd = {};</div><div class='ctx'> 	struct ath11k_peer *peer;</div><div class='ctx'> 	struct dp_rx_tid *rx_tid;</div><div class='ctx'> 	u8 tid;</div><div class='hunk'>@@ -1192,7 +1248,7 @@ static int ath11k_htt_tlv_ppdu_stats_parse(struct ath11k_base *ab,</div><div class='ctx'> 	int cur_user;</div><div class='ctx'> 	u16 peer_id;</div><div class='ctx'> </div><div class='del'>-	ppdu_info = (struct htt_ppdu_stats_info *)data;</div><div class='add'>+	ppdu_info = data;</div><div class='ctx'> </div><div class='ctx'> 	switch (tag) {</div><div class='ctx'> 	case HTT_PPDU_STATS_TAG_COMMON:</div><div class='hunk'>@@ -1304,25 +1360,6 @@ int ath11k_dp_htt_tlv_iter(struct ath11k_base *ab, const void *ptr, size_t len,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u32 ath11k_he_gi_to_nl80211_he_gi(u8 sgi)</div><div class='del'>-{</div><div class='del'>-	u32 ret = 0;</div><div class='del'>-</div><div class='del'>-	switch (sgi) {</div><div class='del'>-	case RX_MSDU_START_SGI_0_8_US:</div><div class='del'>-		ret = NL80211_RATE_INFO_HE_GI_0_8;</div><div class='del'>-		break;</div><div class='del'>-	case RX_MSDU_START_SGI_1_6_US:</div><div class='del'>-		ret = NL80211_RATE_INFO_HE_GI_1_6;</div><div class='del'>-		break;</div><div class='del'>-	case RX_MSDU_START_SGI_3_2_US:</div><div class='del'>-		ret = NL80211_RATE_INFO_HE_GI_3_2;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> ath11k_update_per_peer_tx_stats(struct ath11k *ar,</div><div class='ctx'> 				struct htt_ppdu_stats *ppdu_stats, u8 user)</div><div class='hunk'>@@ -1343,9 +1380,6 @@ ath11k_update_per_peer_tx_stats(struct ath11k *ar,</div><div class='ctx'> 	u8 tid = HTT_PPDU_STATS_NON_QOS_TID;</div><div class='ctx'> 	bool is_ampdu = false;</div><div class='ctx'> </div><div class='del'>-	if (!usr_stats)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	if (!(usr_stats-&gt;tlv_flags &amp; BIT(HTT_PPDU_STATS_TAG_USR_RATE)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -1378,11 +1412,6 @@ ath11k_update_per_peer_tx_stats(struct ath11k *ar,</div><div class='ctx'> 	 * Firmware rate's control to be skipped for this?</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	if (flags == WMI_RATE_PREAMBLE_HE &amp;&amp; mcs &gt; 11) {</div><div class='del'>-		ath11k_warn(ab, "Invalid HE mcs %d peer stats",  mcs);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (flags == WMI_RATE_PREAMBLE_HE &amp;&amp; mcs &gt; ATH11K_HE_MCS_MAX) {</div><div class='ctx'> 		ath11k_warn(ab, "Invalid HE mcs %d peer stats",  mcs);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1419,7 +1448,7 @@ ath11k_update_per_peer_tx_stats(struct ath11k *ar,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sta = peer-&gt;sta;</div><div class='del'>-	arsta = (struct ath11k_sta *)sta-&gt;drv_priv;</div><div class='add'>+	arsta = ath11k_sta_to_arsta(sta);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;arsta-&gt;txrate, 0, sizeof(arsta-&gt;txrate));</div><div class='ctx'> </div><div class='hunk'>@@ -1446,14 +1475,15 @@ ath11k_update_per_peer_tx_stats(struct ath11k *ar,</div><div class='ctx'> 		arsta-&gt;txrate.mcs = mcs;</div><div class='ctx'> 		arsta-&gt;txrate.flags = RATE_INFO_FLAGS_HE_MCS;</div><div class='ctx'> 		arsta-&gt;txrate.he_dcm = dcm;</div><div class='del'>-		arsta-&gt;txrate.he_gi = ath11k_he_gi_to_nl80211_he_gi(sgi);</div><div class='del'>-		arsta-&gt;txrate.he_ru_alloc = ath11k_he_ru_tones_to_nl80211_he_ru_alloc(</div><div class='del'>-						(user_rate-&gt;ru_end -</div><div class='add'>+		arsta-&gt;txrate.he_gi = ath11k_mac_he_gi_to_nl80211_he_gi(sgi);</div><div class='add'>+		arsta-&gt;txrate.he_ru_alloc = ath11k_mac_phy_he_ru_to_nl80211_he_ru_alloc</div><div class='add'>+						((user_rate-&gt;ru_end -</div><div class='ctx'> 						 user_rate-&gt;ru_start) + 1);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	arsta-&gt;txrate.nss = nss;</div><div class='add'>+</div><div class='ctx'> 	arsta-&gt;txrate.bw = ath11k_mac_bw_to_mac80211_bw(bw);</div><div class='ctx'> 	arsta-&gt;tx_duration += tx_duration;</div><div class='ctx'> 	memcpy(&amp;arsta-&gt;last_txrate, &amp;arsta-&gt;txrate, sizeof(struct rate_info));</div><div class='hunk'>@@ -1494,13 +1524,12 @@ struct htt_ppdu_stats_info *ath11k_dp_htt_get_ppdu_desc(struct ath11k *ar,</div><div class='ctx'> {</div><div class='ctx'> 	struct htt_ppdu_stats_info *ppdu_info;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='ctx'> 	if (!list_empty(&amp;ar-&gt;ppdu_stats_info)) {</div><div class='ctx'> 		list_for_each_entry(ppdu_info, &amp;ar-&gt;ppdu_stats_info, list) {</div><div class='del'>-			if (ppdu_info-&gt;ppdu_id == ppdu_id) {</div><div class='del'>-				spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+			if (ppdu_info-&gt;ppdu_id == ppdu_id)</div><div class='ctx'> 				return ppdu_info;</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (ar-&gt;ppdu_stat_list_depth &gt; HTT_PPDU_DESC_MAX_DEPTH) {</div><div class='hunk'>@@ -1512,16 +1541,13 @@ struct htt_ppdu_stats_info *ath11k_dp_htt_get_ppdu_desc(struct ath11k *ar,</div><div class='ctx'> 			kfree(ppdu_info);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> </div><div class='ctx'> 	ppdu_info = kzalloc(sizeof(*ppdu_info), GFP_ATOMIC);</div><div class='ctx'> 	if (!ppdu_info)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> 	list_add_tail(&amp;ppdu_info-&gt;list, &amp;ar-&gt;ppdu_stats_info);</div><div class='ctx'> 	ar-&gt;ppdu_stat_list_depth++;</div><div class='del'>-	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> </div><div class='ctx'> 	return ppdu_info;</div><div class='ctx'> }</div><div class='hunk'>@@ -1545,16 +1571,17 @@ static int ath11k_htt_pull_ppdu_stats(struct ath11k_base *ab,</div><div class='ctx'> 	ar = ath11k_mac_get_ar_by_pdev_id(ab, pdev_id);</div><div class='ctx'> 	if (!ar) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='del'>-		goto exit;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ath11k_debugfs_is_pktlog_lite_mode_enabled(ar))</div><div class='ctx'> 		trace_ath11k_htt_ppdu_stats(ar, skb-&gt;data, len);</div><div class='ctx'> </div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> 	ppdu_info = ath11k_dp_htt_get_ppdu_desc(ar, ppdu_id);</div><div class='ctx'> 	if (!ppdu_info) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='del'>-		goto exit;</div><div class='add'>+		goto out_unlock_data;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ppdu_info-&gt;ppdu_id = ppdu_id;</div><div class='hunk'>@@ -1563,10 +1590,13 @@ static int ath11k_htt_pull_ppdu_stats(struct ath11k_base *ab,</div><div class='ctx'> 				     (void *)ppdu_info);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ab, "Failed to parse tlv %d\n", ret);</div><div class='del'>-		goto exit;</div><div class='add'>+		goto out_unlock_data;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-exit:</div><div class='add'>+out_unlock_data:</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1580,14 +1610,20 @@ static void ath11k_htt_pktlog(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> 	u8 pdev_id;</div><div class='ctx'> </div><div class='ctx'> 	pdev_id = FIELD_GET(HTT_T2H_PPDU_STATS_INFO_PDEV_ID, data-&gt;hdr);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='ctx'> 	ar = ath11k_mac_get_ar_by_pdev_id(ab, pdev_id);</div><div class='ctx'> 	if (!ar) {</div><div class='ctx'> 		ath11k_warn(ab, "invalid pdev id %d on htt pktlog\n", pdev_id);</div><div class='del'>-		return;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	trace_ath11k_htt_pktlog(ar, data-&gt;payload, hdr-&gt;size,</div><div class='ctx'> 				ar-&gt;ab-&gt;pktlog_defs_checksum);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_htt_backpressure_event_handler(struct ath11k_base *ab,</div><div class='hunk'>@@ -1610,7 +1646,7 @@ static void ath11k_htt_backpressure_event_handler(struct ath11k_base *ab,</div><div class='ctx'> </div><div class='ctx'> 	backpressure_time = *data;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "htt backpressure event, pdev %d, ring type %d,ring id %d, hp %d tp %d, backpressure time %d\n",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "backpressure event, pdev %d, ring type %d,ring id %d, hp %d tp %d, backpressure time %d\n",</div><div class='ctx'> 		   pdev_id, ring_type, ring_id, hp, tp, backpressure_time);</div><div class='ctx'> </div><div class='ctx'> 	if (ring_type == HTT_BACKPRESSURE_UMAC_RING_TYPE) {</div><div class='hunk'>@@ -1832,8 +1868,7 @@ static void ath11k_dp_rx_h_csum_offload(struct ath11k *ar, struct sk_buff *msdu)</div><div class='ctx'> 			  CHECKSUM_NONE : CHECKSUM_UNNECESSARY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_dp_rx_crypto_mic_len(struct ath11k *ar,</div><div class='del'>-				       enum hal_encrypt_type enctype)</div><div class='add'>+int ath11k_dp_rx_crypto_mic_len(struct ath11k *ar, enum hal_encrypt_type enctype)</div><div class='ctx'> {</div><div class='ctx'> 	switch (enctype) {</div><div class='ctx'> 	case HAL_ENCRYPT_TYPE_OPEN:</div><div class='hunk'>@@ -2133,6 +2168,7 @@ static void ath11k_dp_rx_h_undecap(struct ath11k *ar, struct sk_buff *msdu,</div><div class='ctx'> {</div><div class='ctx'> 	u8 *first_hdr;</div><div class='ctx'> 	u8 decap;</div><div class='add'>+	struct ethhdr *ehdr;</div><div class='ctx'> </div><div class='ctx'> 	first_hdr = ath11k_dp_rx_h_80211_hdr(ar-&gt;ab, rx_desc);</div><div class='ctx'> 	decap = ath11k_dp_rx_h_msdu_start_decap_type(ar-&gt;ab, rx_desc);</div><div class='hunk'>@@ -2147,9 +2183,22 @@ static void ath11k_dp_rx_h_undecap(struct ath11k *ar, struct sk_buff *msdu,</div><div class='ctx'> 					   decrypted);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DP_RX_DECAP_TYPE_ETHERNET2_DIX:</div><div class='del'>-		/* TODO undecap support for middle/last msdu's of amsdu */</div><div class='del'>-		ath11k_dp_rx_h_undecap_eth(ar, msdu, first_hdr,</div><div class='del'>-					   enctype, status);</div><div class='add'>+		ehdr = (struct ethhdr *)msdu-&gt;data;</div><div class='add'>+</div><div class='add'>+		/* mac80211 allows fast path only for authorized STA */</div><div class='add'>+		if (ehdr-&gt;h_proto == cpu_to_be16(ETH_P_PAE)) {</div><div class='add'>+			ATH11K_SKB_RXCB(msdu)-&gt;is_eapol = true;</div><div class='add'>+			ath11k_dp_rx_h_undecap_eth(ar, msdu, first_hdr,</div><div class='add'>+						   enctype, status);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* PN for mcast packets will be validated in mac80211;</div><div class='add'>+		 * remove eth header and add 802.11 header.</div><div class='add'>+		 */</div><div class='add'>+		if (ATH11K_SKB_RXCB(msdu)-&gt;is_mcbc &amp;&amp; decrypted)</div><div class='add'>+			ath11k_dp_rx_h_undecap_eth(ar, msdu, first_hdr,</div><div class='add'>+						   enctype, status);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DP_RX_DECAP_TYPE_8023:</div><div class='ctx'> 		/* TODO: Handle undecap for these formats */</div><div class='hunk'>@@ -2157,35 +2206,62 @@ static void ath11k_dp_rx_h_undecap(struct ath11k *ar, struct sk_buff *msdu,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct ath11k_peer *</div><div class='add'>+ath11k_dp_rx_h_find_peer(struct ath11k_base *ab, struct sk_buff *msdu)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_skb_rxcb *rxcb = ATH11K_SKB_RXCB(msdu);</div><div class='add'>+	struct hal_rx_desc *rx_desc = rxcb-&gt;rx_desc;</div><div class='add'>+	struct ath11k_peer *peer = NULL;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	if (rxcb-&gt;peer_id)</div><div class='add'>+		peer = ath11k_peer_find_by_id(ab, rxcb-&gt;peer_id);</div><div class='add'>+</div><div class='add'>+	if (peer)</div><div class='add'>+		return peer;</div><div class='add'>+</div><div class='add'>+	if (!rx_desc || !(ath11k_dp_rxdesc_mac_addr2_valid(ab, rx_desc)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	peer = ath11k_peer_find_by_addr(ab,</div><div class='add'>+					ath11k_dp_rxdesc_mpdu_start_addr2(ab, rx_desc));</div><div class='add'>+	return peer;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath11k_dp_rx_h_mpdu(struct ath11k *ar,</div><div class='ctx'> 				struct sk_buff *msdu,</div><div class='ctx'> 				struct hal_rx_desc *rx_desc,</div><div class='ctx'> 				struct ieee80211_rx_status *rx_status)</div><div class='ctx'> {</div><div class='del'>-	bool  fill_crypto_hdr, mcast;</div><div class='add'>+	bool  fill_crypto_hdr;</div><div class='ctx'> 	enum hal_encrypt_type enctype;</div><div class='ctx'> 	bool is_decrypted = false;</div><div class='add'>+	struct ath11k_skb_rxcb *rxcb;</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='ctx'> 	struct ath11k_peer *peer;</div><div class='ctx'> 	struct rx_attention *rx_attention;</div><div class='ctx'> 	u32 err_bitmap;</div><div class='ctx'> </div><div class='del'>-	hdr = (struct ieee80211_hdr *)msdu-&gt;data;</div><div class='del'>-</div><div class='ctx'> 	/* PN for multicast packets will be checked in mac80211 */</div><div class='add'>+	rxcb = ATH11K_SKB_RXCB(msdu);</div><div class='add'>+	fill_crypto_hdr = ath11k_dp_rx_h_attn_is_mcbc(ar-&gt;ab, rx_desc);</div><div class='add'>+	rxcb-&gt;is_mcbc = fill_crypto_hdr;</div><div class='ctx'> </div><div class='del'>-	mcast = is_multicast_ether_addr(hdr-&gt;addr1);</div><div class='del'>-	fill_crypto_hdr = mcast;</div><div class='add'>+	if (rxcb-&gt;is_mcbc) {</div><div class='add'>+		rxcb-&gt;peer_id = ath11k_dp_rx_h_mpdu_start_peer_id(ar-&gt;ab, rx_desc);</div><div class='add'>+		rxcb-&gt;seq_no = ath11k_dp_rx_h_mpdu_start_seq_no(ar-&gt;ab, rx_desc);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='del'>-	peer = ath11k_peer_find_by_addr(ar-&gt;ab, hdr-&gt;addr2);</div><div class='add'>+	peer = ath11k_dp_rx_h_find_peer(ar-&gt;ab, msdu);</div><div class='ctx'> 	if (peer) {</div><div class='del'>-		if (mcast)</div><div class='add'>+		if (rxcb-&gt;is_mcbc)</div><div class='ctx'> 			enctype = peer-&gt;sec_type_grp;</div><div class='ctx'> 		else</div><div class='ctx'> 			enctype = peer-&gt;sec_type;</div><div class='ctx'> 	} else {</div><div class='del'>-		enctype = HAL_ENCRYPT_TYPE_OPEN;</div><div class='add'>+		enctype = ath11k_dp_rx_h_mpdu_start_enctype(ar-&gt;ab, rx_desc);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -2224,8 +2300,11 @@ static void ath11k_dp_rx_h_mpdu(struct ath11k *ar,</div><div class='ctx'> 	if (!is_decrypted || fill_crypto_hdr)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	hdr = (void *)msdu-&gt;data;</div><div class='del'>-	hdr-&gt;frame_control &amp;= ~__cpu_to_le16(IEEE80211_FCTL_PROTECTED);</div><div class='add'>+	if (ath11k_dp_rx_h_msdu_start_decap_type(ar-&gt;ab, rx_desc) !=</div><div class='add'>+	    DP_RX_DECAP_TYPE_ETHERNET2_DIX) {</div><div class='add'>+		hdr = (void *)msdu-&gt;data;</div><div class='add'>+		hdr-&gt;frame_control &amp;= ~__cpu_to_le16(IEEE80211_FCTL_PROTECTED);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_dp_rx_h_rate(struct ath11k *ar, struct hal_rx_desc *rx_desc,</div><div class='hunk'>@@ -2236,7 +2315,7 @@ static void ath11k_dp_rx_h_rate(struct ath11k *ar, struct hal_rx_desc *rx_desc,</div><div class='ctx'> 	u8 bw;</div><div class='ctx'> 	u8 rate_mcs, nss;</div><div class='ctx'> 	u8 sgi;</div><div class='del'>-	bool is_cck;</div><div class='add'>+	bool is_cck, is_ldpc;</div><div class='ctx'> </div><div class='ctx'> 	pkt_type = ath11k_dp_rx_h_msdu_start_pkt_type(ar-&gt;ab, rx_desc);</div><div class='ctx'> 	bw = ath11k_dp_rx_h_msdu_start_rx_bw(ar-&gt;ab, rx_desc);</div><div class='hunk'>@@ -2278,6 +2357,9 @@ static void ath11k_dp_rx_h_rate(struct ath11k *ar, struct hal_rx_desc *rx_desc,</div><div class='ctx'> 		if (sgi)</div><div class='ctx'> 			rx_status-&gt;enc_flags |= RX_ENC_FLAG_SHORT_GI;</div><div class='ctx'> 		rx_status-&gt;bw = ath11k_mac_bw_to_mac80211_bw(bw);</div><div class='add'>+		is_ldpc = ath11k_dp_rx_h_msdu_start_ldpc_support(ar-&gt;ab, rx_desc);</div><div class='add'>+		if (is_ldpc)</div><div class='add'>+			rx_status-&gt;enc_flags |= RX_ENC_FLAG_LDPC;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case RX_MSDU_START_PKT_TYPE_11AX:</div><div class='ctx'> 		rx_status-&gt;rate_idx = rate_mcs;</div><div class='hunk'>@@ -2289,7 +2371,7 @@ static void ath11k_dp_rx_h_rate(struct ath11k *ar, struct hal_rx_desc *rx_desc,</div><div class='ctx'> 		}</div><div class='ctx'> 		rx_status-&gt;encoding = RX_ENC_HE;</div><div class='ctx'> 		rx_status-&gt;nss = nss;</div><div class='del'>-		rx_status-&gt;he_gi = ath11k_he_gi_to_nl80211_he_gi(sgi);</div><div class='add'>+		rx_status-&gt;he_gi = ath11k_mac_he_gi_to_nl80211_he_gi(sgi);</div><div class='ctx'> 		rx_status-&gt;bw = ath11k_mac_bw_to_mac80211_bw(bw);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2314,11 +2396,13 @@ static void ath11k_dp_rx_h_ppdu(struct ath11k *ar, struct hal_rx_desc *rx_desc,</div><div class='ctx'> 	channel_num = meta_data;</div><div class='ctx'> 	center_freq = meta_data &gt;&gt; 16;</div><div class='ctx'> </div><div class='del'>-	if (center_freq &gt;= 5935 &amp;&amp; center_freq &lt;= 7105) {</div><div class='add'>+	if (center_freq &gt;= ATH11K_MIN_6G_FREQ &amp;&amp;</div><div class='add'>+	    center_freq &lt;= ATH11K_MAX_6G_FREQ) {</div><div class='ctx'> 		rx_status-&gt;band = NL80211_BAND_6GHZ;</div><div class='add'>+		rx_status-&gt;freq = center_freq;</div><div class='ctx'> 	} else if (channel_num &gt;= 1 &amp;&amp; channel_num &lt;= 14) {</div><div class='ctx'> 		rx_status-&gt;band = NL80211_BAND_2GHZ;</div><div class='del'>-	} else if (channel_num &gt;= 36 &amp;&amp; channel_num &lt;= 173) {</div><div class='add'>+	} else if (channel_num &gt;= 36 &amp;&amp; channel_num &lt;= 177) {</div><div class='ctx'> 		rx_status-&gt;band = NL80211_BAND_5GHZ;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='hunk'>@@ -2333,57 +2417,56 @@ static void ath11k_dp_rx_h_ppdu(struct ath11k *ar, struct hal_rx_desc *rx_desc,</div><div class='ctx'> 				rx_desc, sizeof(struct hal_rx_desc));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rx_status-&gt;freq = ieee80211_channel_to_frequency(channel_num,</div><div class='del'>-							 rx_status-&gt;band);</div><div class='add'>+	if (rx_status-&gt;band != NL80211_BAND_6GHZ)</div><div class='add'>+		rx_status-&gt;freq = ieee80211_channel_to_frequency(channel_num,</div><div class='add'>+								 rx_status-&gt;band);</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dp_rx_h_rate(ar, rx_desc, rx_status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static char *ath11k_print_get_tid(struct ieee80211_hdr *hdr, char *out,</div><div class='del'>-				  size_t size)</div><div class='del'>-{</div><div class='del'>-	u8 *qc;</div><div class='del'>-	int tid;</div><div class='del'>-</div><div class='del'>-	if (!ieee80211_is_data_qos(hdr-&gt;frame_control))</div><div class='del'>-		return "";</div><div class='del'>-</div><div class='del'>-	qc = ieee80211_get_qos_ctl(hdr);</div><div class='del'>-	tid = *qc &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='del'>-	snprintf(out, size, "tid %d", tid);</div><div class='del'>-</div><div class='del'>-	return out;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void ath11k_dp_rx_deliver_msdu(struct ath11k *ar, struct napi_struct *napi,</div><div class='del'>-				      struct sk_buff *msdu)</div><div class='add'>+				      struct sk_buff *msdu,</div><div class='add'>+				      struct ieee80211_rx_status *status)</div><div class='ctx'> {</div><div class='ctx'> 	static const struct ieee80211_radiotap_he known = {</div><div class='ctx'> 		.data1 = cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_DATA_MCS_KNOWN |</div><div class='ctx'> 				     IEEE80211_RADIOTAP_HE_DATA1_BW_RU_ALLOC_KNOWN),</div><div class='ctx'> 		.data2 = cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA2_GI_KNOWN),</div><div class='ctx'> 	};</div><div class='del'>-	struct ieee80211_rx_status *status;</div><div class='del'>-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)msdu-&gt;data;</div><div class='add'>+	struct ieee80211_rx_status *rx_status;</div><div class='ctx'> 	struct ieee80211_radiotap_he *he = NULL;</div><div class='del'>-	char tid[32];</div><div class='add'>+	struct ieee80211_sta *pubsta = NULL;</div><div class='add'>+	struct ath11k_peer *peer;</div><div class='add'>+	struct ath11k_skb_rxcb *rxcb = ATH11K_SKB_RXCB(msdu);</div><div class='add'>+	u8 decap = DP_RX_DECAP_TYPE_RAW;</div><div class='add'>+	bool is_mcbc = rxcb-&gt;is_mcbc;</div><div class='add'>+	bool is_eapol = rxcb-&gt;is_eapol;</div><div class='ctx'> </div><div class='del'>-	status = IEEE80211_SKB_RXCB(msdu);</div><div class='del'>-	if (status-&gt;encoding == RX_ENC_HE) {</div><div class='add'>+	if (status-&gt;encoding == RX_ENC_HE &amp;&amp;</div><div class='add'>+	    !(status-&gt;flag &amp; RX_FLAG_RADIOTAP_HE) &amp;&amp;</div><div class='add'>+	    !(status-&gt;flag &amp; RX_FLAG_SKIP_MONITOR)) {</div><div class='ctx'> 		he = skb_push(msdu, sizeof(known));</div><div class='ctx'> 		memcpy(he, &amp;known, sizeof(known));</div><div class='ctx'> 		status-&gt;flag |= RX_FLAG_RADIOTAP_HE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!(status-&gt;flag &amp; RX_FLAG_ONLY_MONITOR))</div><div class='add'>+		decap = ath11k_dp_rx_h_msdu_start_decap_type(ar-&gt;ab, rxcb-&gt;rx_desc);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+	peer = ath11k_dp_rx_h_find_peer(ar-&gt;ab, msdu);</div><div class='add'>+	if (peer &amp;&amp; peer-&gt;sta)</div><div class='add'>+		pubsta = peer-&gt;sta;</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_DATA,</div><div class='del'>-		   "rx skb %pK len %u peer %pM %s %s sn %u %s%s%s%s%s%s%s %srate_idx %u vht_nss %u freq %u band %u flag 0x%x fcs-err %i mic-err %i amsdu-more %i\n",</div><div class='add'>+		   "rx skb %p len %u peer %pM %d %s sn %u %s%s%s%s%s%s%s %srate_idx %u vht_nss %u freq %u band %u flag 0x%x fcs-err %i mic-err %i amsdu-more %i\n",</div><div class='ctx'> 		   msdu,</div><div class='ctx'> 		   msdu-&gt;len,</div><div class='del'>-		   ieee80211_get_SA(hdr),</div><div class='del'>-		   ath11k_print_get_tid(hdr, tid, sizeof(tid)),</div><div class='del'>-		   is_multicast_ether_addr(ieee80211_get_DA(hdr)) ?</div><div class='del'>-							"mcast" : "ucast",</div><div class='del'>-		   (__le16_to_cpu(hdr-&gt;seq_ctrl) &amp; IEEE80211_SCTL_SEQ) &gt;&gt; 4,</div><div class='add'>+		   peer ? peer-&gt;addr : NULL,</div><div class='add'>+		   rxcb-&gt;tid,</div><div class='add'>+		   is_mcbc ? "mcast" : "ucast",</div><div class='add'>+		   rxcb-&gt;seq_no,</div><div class='ctx'> 		   (status-&gt;encoding == RX_ENC_LEGACY) ? "legacy" : "",</div><div class='ctx'> 		   (status-&gt;encoding == RX_ENC_HT) ? "ht" : "",</div><div class='ctx'> 		   (status-&gt;encoding == RX_ENC_VHT) ? "vht" : "",</div><div class='hunk'>@@ -2403,22 +2486,32 @@ static void ath11k_dp_rx_deliver_msdu(struct ath11k *ar, struct napi_struct *nap</div><div class='ctx'> 	ath11k_dbg_dump(ar-&gt;ab, ATH11K_DBG_DP_RX, NULL, "dp rx msdu: ",</div><div class='ctx'> 			msdu-&gt;data, msdu-&gt;len);</div><div class='ctx'> </div><div class='add'>+	rx_status = IEEE80211_SKB_RXCB(msdu);</div><div class='add'>+	*rx_status = *status;</div><div class='add'>+</div><div class='ctx'> 	/* TODO: trace rx packet */</div><div class='ctx'> </div><div class='del'>-	ieee80211_rx_napi(ar-&gt;hw, NULL, msdu, napi);</div><div class='add'>+	/* PN for multicast packets are not validate in HW,</div><div class='add'>+	 * so skip 802.3 rx path</div><div class='add'>+	 * Also, fast_rx expects the STA to be authorized, hence</div><div class='add'>+	 * eapol packets are sent in slow path.</div><div class='add'>+	 */</div><div class='add'>+	if (decap == DP_RX_DECAP_TYPE_ETHERNET2_DIX &amp;&amp; !is_eapol &amp;&amp;</div><div class='add'>+	    !(is_mcbc &amp;&amp; rx_status-&gt;flag &amp; RX_FLAG_DECRYPTED))</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_8023;</div><div class='add'>+</div><div class='add'>+	ieee80211_rx_napi(ar-&gt;hw, pubsta, msdu, napi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath11k_dp_rx_process_msdu(struct ath11k *ar,</div><div class='ctx'> 				     struct sk_buff *msdu,</div><div class='del'>-				     struct sk_buff_head *msdu_list)</div><div class='add'>+				     struct sk_buff_head *msdu_list,</div><div class='add'>+				     struct ieee80211_rx_status *rx_status)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='ctx'> 	struct hal_rx_desc *rx_desc, *lrx_desc;</div><div class='ctx'> 	struct rx_attention *rx_attention;</div><div class='del'>-	struct ieee80211_rx_status rx_status = {0};</div><div class='del'>-	struct ieee80211_rx_status *status;</div><div class='ctx'> 	struct ath11k_skb_rxcb *rxcb;</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='ctx'> 	struct sk_buff *last_buf;</div><div class='ctx'> 	u8 l3_pad_bytes;</div><div class='ctx'> 	u8 *hdr_status;</div><div class='hunk'>@@ -2435,6 +2528,12 @@ static int ath11k_dp_rx_process_msdu(struct ath11k *ar,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rx_desc = (struct hal_rx_desc *)msdu-&gt;data;</div><div class='add'>+	if (ath11k_dp_rx_h_attn_msdu_len_err(ab, rx_desc)) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "msdu len not valid\n");</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto free_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	lrx_desc = (struct hal_rx_desc *)last_buf-&gt;data;</div><div class='ctx'> 	rx_attention = ath11k_dp_rx_get_attention(ab, lrx_desc);</div><div class='ctx'> 	if (!ath11k_dp_rx_h_attn_msdu_done(rx_attention)) {</div><div class='hunk'>@@ -2474,19 +2573,11 @@ static int ath11k_dp_rx_process_msdu(struct ath11k *ar,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hdr = (struct ieee80211_hdr *)msdu-&gt;data;</div><div class='del'>-</div><div class='del'>-	/* Process only data frames */</div><div class='del'>-	if (!ieee80211_is_data(hdr-&gt;frame_control))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ath11k_dp_rx_h_ppdu(ar, rx_desc, &amp;rx_status);</div><div class='del'>-	ath11k_dp_rx_h_mpdu(ar, msdu, rx_desc, &amp;rx_status);</div><div class='add'>+	ath11k_dp_rx_h_ppdu(ar, rx_desc, rx_status);</div><div class='add'>+	ath11k_dp_rx_h_mpdu(ar, msdu, rx_desc, rx_status);</div><div class='ctx'> </div><div class='del'>-	rx_status.flag |= RX_FLAG_SKIP_MONITOR | RX_FLAG_DUP_VALIDATED;</div><div class='add'>+	rx_status-&gt;flag |= RX_FLAG_SKIP_MONITOR | RX_FLAG_DUP_VALIDATED;</div><div class='ctx'> </div><div class='del'>-	status = IEEE80211_SKB_RXCB(msdu);</div><div class='del'>-	*status = rx_status;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> free_out:</div><div class='hunk'>@@ -2496,46 +2587,38 @@ free_out:</div><div class='ctx'> static void ath11k_dp_rx_process_received_packets(struct ath11k_base *ab,</div><div class='ctx'> 						  struct napi_struct *napi,</div><div class='ctx'> 						  struct sk_buff_head *msdu_list,</div><div class='del'>-						  int *quota, int ring_id)</div><div class='add'>+						  int mac_id)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_skb_rxcb *rxcb;</div><div class='ctx'> 	struct sk_buff *msdu;</div><div class='ctx'> 	struct ath11k *ar;</div><div class='del'>-	u8 mac_id;</div><div class='add'>+	struct ieee80211_rx_status rx_status = {};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_queue_empty(msdu_list))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	while (*quota &amp;&amp; (msdu = __skb_dequeue(msdu_list))) {</div><div class='del'>-		rxcb = ATH11K_SKB_RXCB(msdu);</div><div class='del'>-		mac_id = rxcb-&gt;mac_id;</div><div class='del'>-		ar = ab-&gt;pdevs[mac_id].ar;</div><div class='del'>-		if (!rcu_dereference(ab-&gt;pdevs_active[mac_id])) {</div><div class='del'>-			dev_kfree_skb_any(msdu);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='add'>+	if (unlikely(!rcu_access_pointer(ab-&gt;pdevs_active[mac_id]))) {</div><div class='add'>+		__skb_queue_purge(msdu_list);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (test_bit(ATH11K_CAC_RUNNING, &amp;ar-&gt;dev_flags)) {</div><div class='del'>-			dev_kfree_skb_any(msdu);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='add'>+	ar = ab-&gt;pdevs[mac_id].ar;</div><div class='add'>+	if (unlikely(test_bit(ATH11K_CAC_RUNNING, &amp;ar-&gt;dev_flags))) {</div><div class='add'>+		__skb_queue_purge(msdu_list);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		ret = ath11k_dp_rx_process_msdu(ar, msdu, msdu_list);</div><div class='del'>-		if (ret) {</div><div class='add'>+	while ((msdu = __skb_dequeue(msdu_list))) {</div><div class='add'>+		ret = ath11k_dp_rx_process_msdu(ar, msdu, msdu_list, &amp;rx_status);</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			ath11k_dbg(ab, ATH11K_DBG_DATA,</div><div class='ctx'> 				   "Unable to process msdu %d", ret);</div><div class='ctx'> 			dev_kfree_skb_any(msdu);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ath11k_dp_rx_deliver_msdu(ar, napi, msdu);</div><div class='del'>-		(*quota)--;</div><div class='add'>+		ath11k_dp_rx_deliver_msdu(ar, napi, msdu, &amp;rx_status);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ath11k_dp_process_rx(struct ath11k_base *ab, int ring_id,</div><div class='hunk'>@@ -2543,44 +2626,47 @@ int ath11k_dp_process_rx(struct ath11k_base *ab, int ring_id,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_dp *dp = &amp;ab-&gt;dp;</div><div class='ctx'> 	struct dp_rxdma_ring *rx_ring;</div><div class='del'>-	int num_buffs_reaped[MAX_RADIOS] = {0};</div><div class='del'>-	struct sk_buff_head msdu_list;</div><div class='add'>+	int num_buffs_reaped[MAX_RADIOS] = {};</div><div class='add'>+	struct sk_buff_head msdu_list[MAX_RADIOS];</div><div class='ctx'> 	struct ath11k_skb_rxcb *rxcb;</div><div class='ctx'> 	int total_msdu_reaped = 0;</div><div class='ctx'> 	struct hal_srng *srng;</div><div class='ctx'> 	struct sk_buff *msdu;</div><div class='del'>-	int quota = budget;</div><div class='ctx'> 	bool done = false;</div><div class='ctx'> 	int buf_id, mac_id;</div><div class='ctx'> 	struct ath11k *ar;</div><div class='del'>-	u32 *rx_desc;</div><div class='add'>+	struct hal_reo_dest_ring *desc;</div><div class='add'>+	enum hal_reo_dest_ring_push_reason push_reason;</div><div class='add'>+	u32 cookie;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	__skb_queue_head_init(&amp;msdu_list);</div><div class='add'>+	for (i = 0; i &lt; MAX_RADIOS; i++)</div><div class='add'>+		__skb_queue_head_init(&amp;msdu_list[i]);</div><div class='ctx'> </div><div class='ctx'> 	srng = &amp;ab-&gt;hal.srng_list[dp-&gt;reo_dst_ring[ring_id].ring_id];</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	ath11k_hal_srng_access_begin(ab, srng);</div><div class='del'>-</div><div class='ctx'> try_again:</div><div class='del'>-	while ((rx_desc = ath11k_hal_srng_dst_get_next_entry(ab, srng))) {</div><div class='del'>-		struct hal_reo_dest_ring desc = *(struct hal_reo_dest_ring *)rx_desc;</div><div class='del'>-		enum hal_reo_dest_ring_push_reason push_reason;</div><div class='del'>-		u32 cookie;</div><div class='add'>+	ath11k_hal_srng_access_begin(ab, srng);</div><div class='ctx'> </div><div class='add'>+	while (likely(desc =</div><div class='add'>+	      (struct hal_reo_dest_ring *)ath11k_hal_srng_dst_get_next_entry(ab,</div><div class='add'>+									     srng))) {</div><div class='ctx'> 		cookie = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE,</div><div class='del'>-				   desc.buf_addr_info.info1);</div><div class='add'>+				   desc-&gt;buf_addr_info.info1);</div><div class='ctx'> 		buf_id = FIELD_GET(DP_RXDMA_BUF_COOKIE_BUF_ID,</div><div class='ctx'> 				   cookie);</div><div class='ctx'> 		mac_id = FIELD_GET(DP_RXDMA_BUF_COOKIE_PDEV_ID, cookie);</div><div class='ctx'> </div><div class='add'>+		if (unlikely(buf_id == 0))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		ar = ab-&gt;pdevs[mac_id].ar;</div><div class='ctx'> 		rx_ring = &amp;ar-&gt;dp.rx_refill_buf_ring;</div><div class='ctx'> 		spin_lock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='ctx'> 		msdu = idr_find(&amp;rx_ring-&gt;bufs_idr, buf_id);</div><div class='del'>-		if (!msdu) {</div><div class='add'>+		if (unlikely(!msdu)) {</div><div class='ctx'> 			ath11k_warn(ab, "frame rx with invalid buf_id %d\n",</div><div class='ctx'> 				    buf_id);</div><div class='ctx'> 			spin_unlock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='hunk'>@@ -2596,33 +2682,41 @@ try_again:</div><div class='ctx'> 				 DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		num_buffs_reaped[mac_id]++;</div><div class='del'>-		total_msdu_reaped++;</div><div class='ctx'> </div><div class='ctx'> 		push_reason = FIELD_GET(HAL_REO_DEST_RING_INFO0_PUSH_REASON,</div><div class='del'>-					desc.info0);</div><div class='del'>-		if (push_reason !=</div><div class='del'>-		    HAL_REO_DEST_RING_PUSH_REASON_ROUTING_INSTRUCTION) {</div><div class='add'>+					desc-&gt;info0);</div><div class='add'>+		if (unlikely(push_reason !=</div><div class='add'>+			     HAL_REO_DEST_RING_PUSH_REASON_ROUTING_INSTRUCTION)) {</div><div class='ctx'> 			dev_kfree_skb_any(msdu);</div><div class='del'>-			ab-&gt;soc_stats.hal_reo_error[dp-&gt;reo_dst_ring[ring_id].ring_id]++;</div><div class='add'>+			ab-&gt;soc_stats.hal_reo_error[ring_id]++;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		rxcb-&gt;is_first_msdu = !!(desc.rx_msdu_info.info0 &amp;</div><div class='add'>+		rxcb-&gt;is_first_msdu = !!(desc-&gt;rx_msdu_info.info0 &amp;</div><div class='ctx'> 					 RX_MSDU_DESC_INFO0_FIRST_MSDU_IN_MPDU);</div><div class='del'>-		rxcb-&gt;is_last_msdu = !!(desc.rx_msdu_info.info0 &amp;</div><div class='add'>+		rxcb-&gt;is_last_msdu = !!(desc-&gt;rx_msdu_info.info0 &amp;</div><div class='ctx'> 					RX_MSDU_DESC_INFO0_LAST_MSDU_IN_MPDU);</div><div class='del'>-		rxcb-&gt;is_continuation = !!(desc.rx_msdu_info.info0 &amp;</div><div class='add'>+		rxcb-&gt;is_continuation = !!(desc-&gt;rx_msdu_info.info0 &amp;</div><div class='ctx'> 					   RX_MSDU_DESC_INFO0_MSDU_CONTINUATION);</div><div class='del'>-		rxcb-&gt;mac_id = mac_id;</div><div class='add'>+		rxcb-&gt;peer_id = FIELD_GET(RX_MPDU_DESC_META_DATA_PEER_ID,</div><div class='add'>+					  desc-&gt;rx_mpdu_info.meta_data);</div><div class='add'>+		rxcb-&gt;seq_no = FIELD_GET(RX_MPDU_DESC_INFO0_SEQ_NUM,</div><div class='add'>+					 desc-&gt;rx_mpdu_info.info0);</div><div class='ctx'> 		rxcb-&gt;tid = FIELD_GET(HAL_REO_DEST_RING_INFO0_RX_QUEUE_NUM,</div><div class='del'>-				      desc.info0);</div><div class='add'>+				      desc-&gt;info0);</div><div class='ctx'> </div><div class='del'>-		__skb_queue_tail(&amp;msdu_list, msdu);</div><div class='add'>+		rxcb-&gt;mac_id = mac_id;</div><div class='add'>+		__skb_queue_tail(&amp;msdu_list[mac_id], msdu);</div><div class='ctx'> </div><div class='del'>-		if (total_msdu_reaped &gt;= quota &amp;&amp; !rxcb-&gt;is_continuation) {</div><div class='add'>+		if (rxcb-&gt;is_continuation) {</div><div class='add'>+			done = false;</div><div class='add'>+		} else {</div><div class='add'>+			total_msdu_reaped++;</div><div class='ctx'> 			done = true;</div><div class='del'>-			break;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (total_msdu_reaped &gt;= budget)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Hw might have updated the head pointer after we cached it.</div><div class='hunk'>@@ -2631,7 +2725,7 @@ try_again:</div><div class='ctx'> 	 * head pointer so that we can reap complete MPDU in the current</div><div class='ctx'> 	 * rx processing.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!done &amp;&amp; ath11k_hal_srng_dst_num_free(ab, srng, true)) {</div><div class='add'>+	if (unlikely(!done &amp;&amp; ath11k_hal_srng_dst_num_free(ab, srng, true))) {</div><div class='ctx'> 		ath11k_hal_srng_access_end(ab, srng);</div><div class='ctx'> 		goto try_again;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2640,25 +2734,23 @@ try_again:</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if (!total_msdu_reaped)</div><div class='add'>+	if (unlikely(!total_msdu_reaped))</div><div class='ctx'> 		goto exit;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='ctx'> 		if (!num_buffs_reaped[i])</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		ath11k_dp_rx_process_received_packets(ab, napi, &amp;msdu_list[i], i);</div><div class='add'>+</div><div class='ctx'> 		ar = ab-&gt;pdevs[i].ar;</div><div class='ctx'> 		rx_ring = &amp;ar-&gt;dp.rx_refill_buf_ring;</div><div class='ctx'> </div><div class='ctx'> 		ath11k_dp_rxbufs_replenish(ab, i, rx_ring, num_buffs_reaped[i],</div><div class='del'>-					   HAL_RX_BUF_RBM_SW3_BM);</div><div class='add'>+					   ab-&gt;hw_params.hal_params-&gt;rx_buf_rbm);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	ath11k_dp_rx_process_received_packets(ab, napi, &amp;msdu_list,</div><div class='del'>-					      &amp;quota, ring_id);</div><div class='del'>-</div><div class='ctx'> exit:</div><div class='del'>-	return budget - quota;</div><div class='add'>+	return total_msdu_reaped;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_dp_rx_update_peer_stats(struct ath11k_sta *arsta,</div><div class='hunk'>@@ -2666,10 +2758,14 @@ static void ath11k_dp_rx_update_peer_stats(struct ath11k_sta *arsta,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_rx_peer_stats *rx_stats = arsta-&gt;rx_stats;</div><div class='ctx'> 	u32 num_msdu;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!rx_stats)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	arsta-&gt;rssi_comb = ppdu_info-&gt;rssi_comb;</div><div class='add'>+	ewma_avg_rssi_add(&amp;arsta-&gt;avg_rssi, ppdu_info-&gt;rssi_comb);</div><div class='add'>+</div><div class='ctx'> 	num_msdu = ppdu_info-&gt;tcp_msdu_count + ppdu_info-&gt;tcp_ack_msdu_count +</div><div class='ctx'> 		   ppdu_info-&gt;udp_msdu_count + ppdu_info-&gt;other_msdu_count;</div><div class='ctx'> </div><div class='hunk'>@@ -2726,7 +2822,12 @@ static void ath11k_dp_rx_update_peer_stats(struct ath11k_sta *arsta,</div><div class='ctx'> 	rx_stats-&gt;dcm_count += ppdu_info-&gt;dcm;</div><div class='ctx'> 	rx_stats-&gt;ru_alloc_cnt[ppdu_info-&gt;ru_alloc] += num_msdu;</div><div class='ctx'> </div><div class='del'>-	arsta-&gt;rssi_comb = ppdu_info-&gt;rssi_comb;</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(arsta-&gt;chain_signal) &gt;</div><div class='add'>+			     ARRAY_SIZE(ppdu_info-&gt;rssi_chain_pri20));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(arsta-&gt;chain_signal); i++)</div><div class='add'>+		arsta-&gt;chain_signal[i] = ppdu_info-&gt;rssi_chain_pri20[i];</div><div class='add'>+</div><div class='ctx'> 	rx_stats-&gt;rx_duration += ppdu_info-&gt;rx_duration;</div><div class='ctx'> 	arsta-&gt;rx_duration = rx_stats-&gt;rx_duration;</div><div class='ctx'> }</div><div class='hunk'>@@ -2840,12 +2941,92 @@ fail_desc_get:</div><div class='ctx'> 	return req_entries - num_remain;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define ATH11K_DP_RX_FULL_MON_PPDU_ID_WRAP 32535</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath11k_dp_rx_mon_update_status_buf_state(struct ath11k_mon_data *pmon,</div><div class='add'>+					 struct hal_tlv_hdr *tlv)</div><div class='add'>+{</div><div class='add'>+	struct hal_rx_ppdu_start *ppdu_start;</div><div class='add'>+	u16 ppdu_id_diff, ppdu_id, tlv_len;</div><div class='add'>+	u8 *ptr;</div><div class='add'>+</div><div class='add'>+	/* PPDU id is part of second tlv, move ptr to second tlv */</div><div class='add'>+	tlv_len = FIELD_GET(HAL_TLV_HDR_LEN, tlv-&gt;tl);</div><div class='add'>+	ptr = (u8 *)tlv;</div><div class='add'>+	ptr += sizeof(*tlv) + tlv_len;</div><div class='add'>+	tlv = (struct hal_tlv_hdr *)ptr;</div><div class='add'>+</div><div class='add'>+	if (FIELD_GET(HAL_TLV_HDR_TAG, tlv-&gt;tl) != HAL_RX_PPDU_START)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*tlv);</div><div class='add'>+	ppdu_start = (struct hal_rx_ppdu_start *)ptr;</div><div class='add'>+	ppdu_id = FIELD_GET(HAL_RX_PPDU_START_INFO0_PPDU_ID,</div><div class='add'>+			    __le32_to_cpu(ppdu_start-&gt;info0));</div><div class='add'>+</div><div class='add'>+	if (pmon-&gt;sw_mon_entries.ppdu_id &lt; ppdu_id) {</div><div class='add'>+		pmon-&gt;buf_state = DP_MON_STATUS_LEAD;</div><div class='add'>+		ppdu_id_diff = ppdu_id - pmon-&gt;sw_mon_entries.ppdu_id;</div><div class='add'>+		if (ppdu_id_diff &gt; ATH11K_DP_RX_FULL_MON_PPDU_ID_WRAP)</div><div class='add'>+			pmon-&gt;buf_state = DP_MON_STATUS_LAG;</div><div class='add'>+	} else if (pmon-&gt;sw_mon_entries.ppdu_id &gt; ppdu_id) {</div><div class='add'>+		pmon-&gt;buf_state = DP_MON_STATUS_LAG;</div><div class='add'>+		ppdu_id_diff = pmon-&gt;sw_mon_entries.ppdu_id - ppdu_id;</div><div class='add'>+		if (ppdu_id_diff &gt; ATH11K_DP_RX_FULL_MON_PPDU_ID_WRAP)</div><div class='add'>+			pmon-&gt;buf_state = DP_MON_STATUS_LEAD;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum dp_mon_status_buf_state</div><div class='add'>+ath11k_dp_rx_mon_buf_done(struct ath11k_base *ab, struct hal_srng *srng,</div><div class='add'>+			  struct dp_rxdma_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_skb_rxcb *rxcb;</div><div class='add'>+	struct hal_tlv_hdr *tlv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	void *status_desc;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	u32 cookie;</div><div class='add'>+	int buf_id;</div><div class='add'>+	u8 rbm;</div><div class='add'>+</div><div class='add'>+	status_desc = ath11k_hal_srng_src_next_peek(ab, srng);</div><div class='add'>+	if (!status_desc)</div><div class='add'>+		return DP_MON_STATUS_NO_DMA;</div><div class='add'>+</div><div class='add'>+	ath11k_hal_rx_buf_addr_info_get(status_desc, &amp;paddr, &amp;cookie, &amp;rbm);</div><div class='add'>+</div><div class='add'>+	buf_id = FIELD_GET(DP_RXDMA_BUF_COOKIE_BUF_ID, cookie);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+	skb = idr_find(&amp;rx_ring-&gt;bufs_idr, buf_id);</div><div class='add'>+	spin_unlock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		return DP_MON_STATUS_NO_DMA;</div><div class='add'>+</div><div class='add'>+	rxcb = ATH11K_SKB_RXCB(skb);</div><div class='add'>+	dma_sync_single_for_cpu(ab-&gt;dev, rxcb-&gt;paddr,</div><div class='add'>+				skb-&gt;len + skb_tailroom(skb),</div><div class='add'>+				DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+	tlv = (struct hal_tlv_hdr *)skb-&gt;data;</div><div class='add'>+	if (FIELD_GET(HAL_TLV_HDR_TAG, tlv-&gt;tl) != HAL_RX_STATUS_BUFFER_DONE)</div><div class='add'>+		return DP_MON_STATUS_NO_DMA;</div><div class='add'>+</div><div class='add'>+	return DP_MON_STATUS_REPLINISH;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath11k_dp_rx_reap_mon_status_ring(struct ath11k_base *ab, int mac_id,</div><div class='ctx'> 					     int *budget, struct sk_buff_head *skb_list)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar;</div><div class='add'>+	const struct ath11k_hw_hal_params *hal_params;</div><div class='add'>+	enum dp_mon_status_buf_state reap_status;</div><div class='ctx'> 	struct ath11k_pdev_dp *dp;</div><div class='ctx'> 	struct dp_rxdma_ring *rx_ring;</div><div class='add'>+	struct ath11k_mon_data *pmon;</div><div class='ctx'> 	struct hal_srng *srng;</div><div class='ctx'> 	void *rx_mon_status_desc;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -2859,6 +3040,7 @@ static int ath11k_dp_rx_reap_mon_status_ring(struct ath11k_base *ab, int mac_id,</div><div class='ctx'> </div><div class='ctx'> 	ar = ab-&gt;pdevs[ath11k_hw_mac_id_to_pdev_id(&amp;ab-&gt;hw_params, mac_id)].ar;</div><div class='ctx'> 	dp = &amp;ar-&gt;dp;</div><div class='add'>+	pmon = &amp;dp-&gt;mon_data;</div><div class='ctx'> 	srng_id = ath11k_hw_mac_id_to_srng_id(&amp;ab-&gt;hw_params, mac_id);</div><div class='ctx'> 	rx_ring = &amp;dp-&gt;rx_mon_status_refill_ring[srng_id];</div><div class='ctx'> </div><div class='hunk'>@@ -2871,8 +3053,10 @@ static int ath11k_dp_rx_reap_mon_status_ring(struct ath11k_base *ab, int mac_id,</div><div class='ctx'> 		*budget -= 1;</div><div class='ctx'> 		rx_mon_status_desc =</div><div class='ctx'> 			ath11k_hal_srng_src_peek(ab, srng);</div><div class='del'>-		if (!rx_mon_status_desc)</div><div class='add'>+		if (!rx_mon_status_desc) {</div><div class='add'>+			pmon-&gt;buf_state = DP_MON_STATUS_REPLINISH;</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		ath11k_hal_rx_buf_addr_info_get(rx_mon_status_desc, &amp;paddr,</div><div class='ctx'> 						&amp;cookie, &amp;rbm);</div><div class='hunk'>@@ -2881,41 +3065,86 @@ static int ath11k_dp_rx_reap_mon_status_ring(struct ath11k_base *ab, int mac_id,</div><div class='ctx'> </div><div class='ctx'> 			spin_lock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='ctx'> 			skb = idr_find(&amp;rx_ring-&gt;bufs_idr, buf_id);</div><div class='add'>+			spin_unlock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+</div><div class='ctx'> 			if (!skb) {</div><div class='ctx'> 				ath11k_warn(ab, "rx monitor status with invalid buf_id %d\n",</div><div class='ctx'> 					    buf_id);</div><div class='del'>-				spin_unlock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+				pmon-&gt;buf_state = DP_MON_STATUS_REPLINISH;</div><div class='ctx'> 				goto move_next;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			idr_remove(&amp;rx_ring-&gt;bufs_idr, buf_id);</div><div class='del'>-			spin_unlock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='del'>-</div><div class='ctx'> 			rxcb = ATH11K_SKB_RXCB(skb);</div><div class='ctx'> </div><div class='del'>-			dma_unmap_single(ab-&gt;dev, rxcb-&gt;paddr,</div><div class='del'>-					 skb-&gt;len + skb_tailroom(skb),</div><div class='del'>-					 DMA_FROM_DEVICE);</div><div class='add'>+			dma_sync_single_for_cpu(ab-&gt;dev, rxcb-&gt;paddr,</div><div class='add'>+						skb-&gt;len + skb_tailroom(skb),</div><div class='add'>+						DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 			tlv = (struct hal_tlv_hdr *)skb-&gt;data;</div><div class='ctx'> 			if (FIELD_GET(HAL_TLV_HDR_TAG, tlv-&gt;tl) !=</div><div class='ctx'> 					HAL_RX_STATUS_BUFFER_DONE) {</div><div class='del'>-				ath11k_warn(ab, "mon status DONE not set %lx\n",</div><div class='add'>+				ath11k_warn(ab, "mon status DONE not set %lx, buf_id %d\n",</div><div class='ctx'> 					    FIELD_GET(HAL_TLV_HDR_TAG,</div><div class='del'>-						      tlv-&gt;tl));</div><div class='add'>+						      tlv-&gt;tl), buf_id);</div><div class='add'>+				/* RxDMA status done bit might not be set even</div><div class='add'>+				 * though tp is moved by HW.</div><div class='add'>+				 */</div><div class='add'>+</div><div class='add'>+				/* If done status is missing:</div><div class='add'>+				 * 1. As per MAC team's suggestion,</div><div class='add'>+				 *    when HP + 1 entry is peeked and if DMA</div><div class='add'>+				 *    is not done and if HP + 2 entry's DMA done</div><div class='add'>+				 *    is set. skip HP + 1 entry and</div><div class='add'>+				 *    start processing in next interrupt.</div><div class='add'>+				 * 2. If HP + 2 entry's DMA done is not set,</div><div class='add'>+				 *    poll onto HP + 1 entry DMA done to be set.</div><div class='add'>+				 *    Check status for same buffer for next time</div><div class='add'>+				 *    dp_rx_mon_status_srng_process</div><div class='add'>+				 */</div><div class='add'>+</div><div class='add'>+				reap_status = ath11k_dp_rx_mon_buf_done(ab, srng,</div><div class='add'>+									rx_ring);</div><div class='add'>+				if (reap_status == DP_MON_STATUS_NO_DMA)</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				spin_lock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+				idr_remove(&amp;rx_ring-&gt;bufs_idr, buf_id);</div><div class='add'>+				spin_unlock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+</div><div class='add'>+				dma_unmap_single(ab-&gt;dev, rxcb-&gt;paddr,</div><div class='add'>+						 skb-&gt;len + skb_tailroom(skb),</div><div class='add'>+						 DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='ctx'> 				dev_kfree_skb_any(skb);</div><div class='add'>+				pmon-&gt;buf_state = DP_MON_STATUS_REPLINISH;</div><div class='ctx'> 				goto move_next;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='add'>+			spin_lock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+			idr_remove(&amp;rx_ring-&gt;bufs_idr, buf_id);</div><div class='add'>+			spin_unlock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+			if (ab-&gt;hw_params.full_monitor_mode) {</div><div class='add'>+				ath11k_dp_rx_mon_update_status_buf_state(pmon, tlv);</div><div class='add'>+				if (paddr == pmon-&gt;mon_status_paddr)</div><div class='add'>+					pmon-&gt;buf_state = DP_MON_STATUS_MATCH;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			dma_unmap_single(ab-&gt;dev, rxcb-&gt;paddr,</div><div class='add'>+					 skb-&gt;len + skb_tailroom(skb),</div><div class='add'>+					 DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='ctx'> 			__skb_queue_tail(skb_list, skb);</div><div class='add'>+		} else {</div><div class='add'>+			pmon-&gt;buf_state = DP_MON_STATUS_REPLINISH;</div><div class='ctx'> 		}</div><div class='ctx'> move_next:</div><div class='ctx'> 		skb = ath11k_dp_rx_alloc_mon_status_buf(ab, rx_ring,</div><div class='ctx'> 							&amp;buf_id);</div><div class='ctx'> </div><div class='ctx'> 		if (!skb) {</div><div class='add'>+			hal_params = ab-&gt;hw_params.hal_params;</div><div class='ctx'> 			ath11k_hal_rx_buf_addr_info_set(rx_mon_status_desc, 0, 0,</div><div class='del'>-							HAL_RX_BUF_RBM_SW3_BM);</div><div class='add'>+							hal_params-&gt;rx_buf_rbm);</div><div class='ctx'> 			num_buffs_reaped++;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2925,7 +3154,8 @@ move_next:</div><div class='ctx'> 			 FIELD_PREP(DP_RXDMA_BUF_COOKIE_BUF_ID, buf_id);</div><div class='ctx'> </div><div class='ctx'> 		ath11k_hal_rx_buf_addr_info_set(rx_mon_status_desc, rxcb-&gt;paddr,</div><div class='del'>-						cookie, HAL_RX_BUF_RBM_SW3_BM);</div><div class='add'>+						cookie,</div><div class='add'>+						ab-&gt;hw_params.hal_params-&gt;rx_buf_rbm);</div><div class='ctx'> 		ath11k_hal_srng_src_get_next_entry(ab, srng);</div><div class='ctx'> 		num_buffs_reaped++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2935,72 +3165,10 @@ move_next:</div><div class='ctx'> 	return num_buffs_reaped;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath11k_dp_rx_process_mon_status(struct ath11k_base *ab, int mac_id,</div><div class='del'>-				    struct napi_struct *napi, int budget)</div><div class='del'>-{</div><div class='del'>-	struct ath11k *ar = ath11k_ab_to_ar(ab, mac_id);</div><div class='del'>-	enum hal_rx_mon_status hal_status;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct sk_buff_head skb_list;</div><div class='del'>-	struct hal_rx_mon_ppdu_info ppdu_info;</div><div class='del'>-	struct ath11k_peer *peer;</div><div class='del'>-	struct ath11k_sta *arsta;</div><div class='del'>-	int num_buffs_reaped = 0;</div><div class='del'>-</div><div class='del'>-	__skb_queue_head_init(&amp;skb_list);</div><div class='del'>-</div><div class='del'>-	num_buffs_reaped = ath11k_dp_rx_reap_mon_status_ring(ab, mac_id, &amp;budget,</div><div class='del'>-							     &amp;skb_list);</div><div class='del'>-	if (!num_buffs_reaped)</div><div class='del'>-		goto exit;</div><div class='del'>-</div><div class='del'>-	while ((skb = __skb_dequeue(&amp;skb_list))) {</div><div class='del'>-		memset(&amp;ppdu_info, 0, sizeof(ppdu_info));</div><div class='del'>-		ppdu_info.peer_id = HAL_INVALID_PEERID;</div><div class='del'>-</div><div class='del'>-		if (ath11k_debugfs_is_pktlog_rx_stats_enabled(ar))</div><div class='del'>-			trace_ath11k_htt_rxdesc(ar, skb-&gt;data, DP_RX_BUFFER_SIZE);</div><div class='del'>-</div><div class='del'>-		hal_status = ath11k_hal_rx_parse_mon_status(ab, &amp;ppdu_info, skb);</div><div class='del'>-</div><div class='del'>-		if (ppdu_info.peer_id == HAL_INVALID_PEERID ||</div><div class='del'>-		    hal_status != HAL_RX_MON_STATUS_PPDU_DONE) {</div><div class='del'>-			dev_kfree_skb_any(skb);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='del'>-		peer = ath11k_peer_find_by_id(ab, ppdu_info.peer_id);</div><div class='del'>-</div><div class='del'>-		if (!peer || !peer-&gt;sta) {</div><div class='del'>-			ath11k_dbg(ab, ATH11K_DBG_DATA,</div><div class='del'>-				   "failed to find the peer with peer_id %d\n",</div><div class='del'>-				   ppdu_info.peer_id);</div><div class='del'>-			spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-			dev_kfree_skb_any(skb);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		arsta = (struct ath11k_sta *)peer-&gt;sta-&gt;drv_priv;</div><div class='del'>-		ath11k_dp_rx_update_peer_stats(arsta, &amp;ppdu_info);</div><div class='del'>-</div><div class='del'>-		if (ath11k_debugfs_is_pktlog_peer_valid(ar, peer-&gt;addr))</div><div class='del'>-			trace_ath11k_htt_rxdesc(ar, skb-&gt;data, DP_RX_BUFFER_SIZE);</div><div class='del'>-</div><div class='del'>-		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='del'>-	}</div><div class='del'>-exit:</div><div class='del'>-	return num_buffs_reaped;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void ath11k_dp_rx_frag_timer(struct timer_list *timer)</div><div class='ctx'> {</div><div class='del'>-	struct dp_rx_tid *rx_tid = from_timer(rx_tid, timer, frag_timer);</div><div class='add'>+	struct dp_rx_tid *rx_tid = timer_container_of(rx_tid, timer,</div><div class='add'>+						      frag_timer);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;rx_tid-&gt;ab-&gt;base_lock);</div><div class='ctx'> 	if (rx_tid-&gt;last_frag_no &amp;&amp;</div><div class='hunk'>@@ -3021,8 +3189,11 @@ int ath11k_peer_rx_frag_setup(struct ath11k *ar, const u8 *peer_mac, int vdev_id</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	tfm = crypto_alloc_shash("michael_mic", 0, 0);</div><div class='del'>-	if (IS_ERR(tfm))</div><div class='add'>+	if (IS_ERR(tfm)) {</div><div class='add'>+		ath11k_warn(ab, "failed to allocate michael_mic shash: %ld\n",</div><div class='add'>+			    PTR_ERR(tfm));</div><div class='ctx'> 		return PTR_ERR(tfm);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -3030,6 +3201,7 @@ int ath11k_peer_rx_frag_setup(struct ath11k *ar, const u8 *peer_mac, int vdev_id</div><div class='ctx'> 	if (!peer) {</div><div class='ctx'> 		ath11k_warn(ab, "failed to find the peer to set up fragment info\n");</div><div class='ctx'> 		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		crypto_free_shash(tfm);</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3041,6 +3213,7 @@ int ath11k_peer_rx_frag_setup(struct ath11k *ar, const u8 *peer_mac, int vdev_id</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	peer-&gt;tfm_mmic = tfm;</div><div class='add'>+	peer-&gt;dp_setup_done = true;</div><div class='ctx'> 	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3051,7 +3224,7 @@ static int ath11k_dp_rx_h_michael_mic(struct crypto_shash *tfm, u8 *key,</div><div class='ctx'> 				      size_t data_len, u8 *mic)</div><div class='ctx'> {</div><div class='ctx'> 	SHASH_DESC_ON_STACK(desc, tfm);</div><div class='del'>-	u8 mic_hdr[16] = {0};</div><div class='add'>+	u8 mic_hdr[16] = {};</div><div class='ctx'> 	u8 tid = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -3287,7 +3460,7 @@ static int ath11k_dp_rx_h_defrag_reo_reinject(struct ath11k *ar, struct dp_rx_ti</div><div class='ctx'> </div><div class='ctx'> 	paddr = dma_map_single(ab-&gt;dev, defrag_skb-&gt;data,</div><div class='ctx'> 			       defrag_skb-&gt;len + skb_tailroom(defrag_skb),</div><div class='del'>-			       DMA_FROM_DEVICE);</div><div class='add'>+			       DMA_TO_DEVICE);</div><div class='ctx'> 	if (dma_mapping_error(ab-&gt;dev, paddr))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -3304,9 +3477,10 @@ static int ath11k_dp_rx_h_defrag_reo_reinject(struct ath11k *ar, struct dp_rx_ti</div><div class='ctx'> 	cookie = FIELD_PREP(DP_RXDMA_BUF_COOKIE_PDEV_ID, dp-&gt;mac_id) |</div><div class='ctx'> 		 FIELD_PREP(DP_RXDMA_BUF_COOKIE_BUF_ID, buf_id);</div><div class='ctx'> </div><div class='del'>-	ath11k_hal_rx_buf_addr_info_set(msdu0, paddr, cookie, HAL_RX_BUF_RBM_SW3_BM);</div><div class='add'>+	ath11k_hal_rx_buf_addr_info_set(msdu0, paddr, cookie,</div><div class='add'>+					ab-&gt;hw_params.hal_params-&gt;rx_buf_rbm);</div><div class='ctx'> </div><div class='del'>-	/* Fill mpdu details into reo entrace ring */</div><div class='add'>+	/* Fill mpdu details into reo entrance ring */</div><div class='ctx'> 	srng = &amp;ab-&gt;hal.srng_list[ab-&gt;dp.reo_reinject_ring.ring_id];</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='hunk'>@@ -3352,7 +3526,7 @@ err_free_idr:</div><div class='ctx'> 	spin_unlock_bh(&amp;rx_refill_ring-&gt;idr_lock);</div><div class='ctx'> err_unmap_dma:</div><div class='ctx'> 	dma_unmap_single(ab-&gt;dev, paddr, defrag_skb-&gt;len + skb_tailroom(defrag_skb),</div><div class='del'>-			 DMA_FROM_DEVICE);</div><div class='add'>+			 DMA_TO_DEVICE);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3450,6 +3624,7 @@ static int ath11k_dp_rx_frag_h_mpdu(struct ath11k *ar,</div><div class='ctx'> 	u8 tid;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	bool more_frags;</div><div class='add'>+	bool is_mcbc;</div><div class='ctx'> </div><div class='ctx'> 	rx_desc = (struct hal_rx_desc *)msdu-&gt;data;</div><div class='ctx'> 	peer_id = ath11k_dp_rx_h_mpdu_start_peer_id(ar-&gt;ab, rx_desc);</div><div class='hunk'>@@ -3457,6 +3632,11 @@ static int ath11k_dp_rx_frag_h_mpdu(struct ath11k *ar,</div><div class='ctx'> 	seqno = ath11k_dp_rx_h_mpdu_start_seq_no(ar-&gt;ab, rx_desc);</div><div class='ctx'> 	frag_no = ath11k_dp_rx_h_mpdu_start_frag_no(ar-&gt;ab, msdu);</div><div class='ctx'> 	more_frags = ath11k_dp_rx_h_mpdu_start_more_frags(ar-&gt;ab, msdu);</div><div class='add'>+	is_mcbc = ath11k_dp_rx_h_attn_is_mcbc(ar-&gt;ab, rx_desc);</div><div class='add'>+</div><div class='add'>+	/* Multicast/Broadcast fragments are not expected */</div><div class='add'>+	if (is_mcbc)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!ath11k_dp_rx_h_mpdu_start_seq_ctrl_valid(ar-&gt;ab, rx_desc) ||</div><div class='ctx'> 	    !ath11k_dp_rx_h_mpdu_start_fc_valid(ar-&gt;ab, rx_desc) ||</div><div class='hunk'>@@ -3479,6 +3659,13 @@ static int ath11k_dp_rx_frag_h_mpdu(struct ath11k *ar,</div><div class='ctx'> 		ret = -ENOENT;</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='add'>+	if (!peer-&gt;dp_setup_done) {</div><div class='add'>+		ath11k_warn(ab, "The peer %pM [%d] has uninitialized datapath\n",</div><div class='add'>+			    peer-&gt;addr, peer_id);</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rx_tid = &amp;peer-&gt;rx_tid[tid];</div><div class='ctx'> </div><div class='ctx'> 	if ((!skb_queue_empty(&amp;rx_tid-&gt;rx_frags) &amp;&amp; seqno != rx_tid-&gt;cur_sn) ||</div><div class='hunk'>@@ -3494,7 +3681,7 @@ static int ath11k_dp_rx_frag_h_mpdu(struct ath11k *ar,</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (frag_no &gt; __fls(rx_tid-&gt;rx_frag_bitmap))</div><div class='add'>+	if (!rx_tid-&gt;rx_frag_bitmap || (frag_no &gt; __fls(rx_tid-&gt;rx_frag_bitmap)))</div><div class='ctx'> 		__skb_queue_tail(&amp;rx_tid-&gt;rx_frags, msdu);</div><div class='ctx'> 	else</div><div class='ctx'> 		ath11k_dp_rx_h_sort_frags(ar, &amp;rx_tid-&gt;rx_frags, msdu);</div><div class='hunk'>@@ -3524,7 +3711,7 @@ static int ath11k_dp_rx_frag_h_mpdu(struct ath11k *ar,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='del'>-	del_timer_sync(&amp;rx_tid-&gt;frag_timer);</div><div class='add'>+	timer_delete_sync(&amp;rx_tid-&gt;frag_timer);</div><div class='ctx'> 	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='ctx'> </div><div class='ctx'> 	peer = ath11k_peer_find_by_id(ab, peer_id);</div><div class='hunk'>@@ -3631,7 +3818,7 @@ int ath11k_dp_process_rx_err(struct ath11k_base *ab, struct napi_struct *napi,</div><div class='ctx'> 	struct dp_link_desc_bank *link_desc_banks;</div><div class='ctx'> 	enum hal_rx_buf_return_buf_manager rbm;</div><div class='ctx'> 	int tot_n_bufs_reaped, quota, ret, i;</div><div class='del'>-	int n_bufs_reaped[MAX_RADIOS] = {0};</div><div class='add'>+	int n_bufs_reaped[MAX_RADIOS] = {};</div><div class='ctx'> 	struct dp_rxdma_ring *rx_ring;</div><div class='ctx'> 	struct dp_srng *reo_except;</div><div class='ctx'> 	u32 desc_bank, num_msdus;</div><div class='hunk'>@@ -3675,6 +3862,7 @@ int ath11k_dp_process_rx_err(struct ath11k_base *ab, struct napi_struct *napi,</div><div class='ctx'> 		ath11k_hal_rx_msdu_link_info_get(link_desc_va, &amp;num_msdus, msdu_cookies,</div><div class='ctx'> 						 &amp;rbm);</div><div class='ctx'> 		if (rbm != HAL_RX_BUF_RBM_WBM_IDLE_DESC_LIST &amp;&amp;</div><div class='add'>+		    rbm != HAL_RX_BUF_RBM_SW1_BM &amp;&amp;</div><div class='ctx'> 		    rbm != HAL_RX_BUF_RBM_SW3_BM) {</div><div class='ctx'> 			ab-&gt;soc_stats.invalid_rbm++;</div><div class='ctx'> 			ath11k_warn(ab, "invalid return buffer manager %d\n", rbm);</div><div class='hunk'>@@ -3731,7 +3919,7 @@ exit:</div><div class='ctx'> 		rx_ring = &amp;ar-&gt;dp.rx_refill_buf_ring;</div><div class='ctx'> </div><div class='ctx'> 		ath11k_dp_rxbufs_replenish(ab, i, rx_ring, n_bufs_reaped[i],</div><div class='del'>-					   HAL_RX_BUF_RBM_SW3_BM);</div><div class='add'>+					   ab-&gt;hw_params.hal_params-&gt;rx_buf_rbm);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return tot_n_bufs_reaped;</div><div class='hunk'>@@ -3911,8 +4099,7 @@ static void ath11k_dp_rx_wbm_err(struct ath11k *ar,</div><div class='ctx'> 				 struct sk_buff_head *msdu_list)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_skb_rxcb *rxcb = ATH11K_SKB_RXCB(msdu);</div><div class='del'>-	struct ieee80211_rx_status rxs = {0};</div><div class='del'>-	struct ieee80211_rx_status *status;</div><div class='add'>+	struct ieee80211_rx_status rxs = {};</div><div class='ctx'> 	bool drop = true;</div><div class='ctx'> </div><div class='ctx'> 	switch (rxcb-&gt;err_rel_src) {</div><div class='hunk'>@@ -3932,10 +4119,7 @@ static void ath11k_dp_rx_wbm_err(struct ath11k *ar,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	status = IEEE80211_SKB_RXCB(msdu);</div><div class='del'>-	*status = rxs;</div><div class='del'>-</div><div class='del'>-	ath11k_dp_rx_deliver_msdu(ar, napi, msdu);</div><div class='add'>+	ath11k_dp_rx_deliver_msdu(ar, napi, msdu, &amp;rxs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ath11k_dp_rx_process_wbm_err(struct ath11k_base *ab,</div><div class='hunk'>@@ -3951,7 +4135,7 @@ int ath11k_dp_rx_process_wbm_err(struct ath11k_base *ab,</div><div class='ctx'> 	struct ath11k_skb_rxcb *rxcb;</div><div class='ctx'> 	u32 *rx_desc;</div><div class='ctx'> 	int buf_id, mac_id;</div><div class='del'>-	int num_buffs_reaped[MAX_RADIOS] = {0};</div><div class='add'>+	int num_buffs_reaped[MAX_RADIOS] = {};</div><div class='ctx'> 	int total_num_buffs_reaped = 0;</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> </div><div class='hunk'>@@ -4031,7 +4215,7 @@ int ath11k_dp_rx_process_wbm_err(struct ath11k_base *ab,</div><div class='ctx'> 		rx_ring = &amp;ar-&gt;dp.rx_refill_buf_ring;</div><div class='ctx'> </div><div class='ctx'> 		ath11k_dp_rxbufs_replenish(ab, i, rx_ring, num_buffs_reaped[i],</div><div class='del'>-					   HAL_RX_BUF_RBM_SW3_BM);</div><div class='add'>+					   ab-&gt;hw_params.hal_params-&gt;rx_buf_rbm);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='hunk'>@@ -4140,7 +4324,7 @@ int ath11k_dp_process_rxdma_err(struct ath11k_base *ab, int mac_id, int budget)</div><div class='ctx'> </div><div class='ctx'> 	if (num_buf_freed)</div><div class='ctx'> 		ath11k_dp_rxbufs_replenish(ab, mac_id, rx_ring, num_buf_freed,</div><div class='del'>-					   HAL_RX_BUF_RBM_SW3_BM);</div><div class='add'>+					   ab-&gt;hw_params.hal_params-&gt;rx_buf_rbm);</div><div class='ctx'> </div><div class='ctx'> 	return budget - quota;</div><div class='ctx'> }</div><div class='hunk'>@@ -4261,7 +4445,7 @@ int ath11k_dp_rx_pdev_alloc(struct ath11k_base *ab, int mac_id)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ab-&gt;hw_params.rx_mac_buf_ring) {</div><div class='del'>-		for (i = 0; i &lt; ab-&gt;hw_params.num_rxmda_per_pdev; i++) {</div><div class='add'>+		for (i = 0; i &lt; ab-&gt;hw_params.num_rxdma_per_pdev; i++) {</div><div class='ctx'> 			ring_id = dp-&gt;rx_mac_buf_ring[i].ring_id;</div><div class='ctx'> 			ret = ath11k_dp_tx_htt_srng_setup(ab, ring_id,</div><div class='ctx'> 							  mac_id + i, HAL_RXDMA_BUF);</div><div class='hunk'>@@ -4273,7 +4457,7 @@ int ath11k_dp_rx_pdev_alloc(struct ath11k_base *ab, int mac_id)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ab-&gt;hw_params.num_rxmda_per_pdev; i++) {</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.num_rxdma_per_pdev; i++) {</div><div class='ctx'> 		ring_id = dp-&gt;rxdma_err_dst_ring[i].ring_id;</div><div class='ctx'> 		ret = ath11k_dp_tx_htt_srng_setup(ab, ring_id,</div><div class='ctx'> 						  mac_id + i, HAL_RXDMA_DST);</div><div class='hunk'>@@ -4313,7 +4497,7 @@ int ath11k_dp_rx_pdev_alloc(struct ath11k_base *ab, int mac_id)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> config_refill_ring:</div><div class='del'>-	for (i = 0; i &lt; ab-&gt;hw_params.num_rxmda_per_pdev; i++) {</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.num_rxdma_per_pdev; i++) {</div><div class='ctx'> 		ring_id = dp-&gt;rx_mon_status_refill_ring[i].refill_buf_ring.ring_id;</div><div class='ctx'> 		ret = ath11k_dp_tx_htt_srng_setup(ab, ring_id, mac_id + i,</div><div class='ctx'> 						  HAL_RXDMA_MONITOR_STATUS);</div><div class='hunk'>@@ -4363,8 +4547,7 @@ int ath11k_dp_rx_monitor_link_desc_return(struct ath11k *ar,</div><div class='ctx'> 	src_srng_desc = ath11k_hal_srng_src_get_next_entry(ar-&gt;ab, hal_srng);</div><div class='ctx'> </div><div class='ctx'> 	if (src_srng_desc) {</div><div class='del'>-		struct ath11k_buffer_addr *src_desc =</div><div class='del'>-				(struct ath11k_buffer_addr *)src_srng_desc;</div><div class='add'>+		struct ath11k_buffer_addr *src_desc = src_srng_desc;</div><div class='ctx'> </div><div class='ctx'> 		*src_desc = *((struct ath11k_buffer_addr *)p_last_buf_addr_info);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -4383,8 +4566,7 @@ void ath11k_dp_rx_mon_next_link_desc_get(void *rx_msdu_link_desc,</div><div class='ctx'> 					 u8 *rbm,</div><div class='ctx'> 					 void **pp_buf_addr_info)</div><div class='ctx'> {</div><div class='del'>-	struct hal_rx_msdu_link *msdu_link =</div><div class='del'>-			(struct hal_rx_msdu_link *)rx_msdu_link_desc;</div><div class='add'>+	struct hal_rx_msdu_link *msdu_link = rx_msdu_link_desc;</div><div class='ctx'> 	struct ath11k_buffer_addr *buf_addr_info;</div><div class='ctx'> </div><div class='ctx'> 	buf_addr_info = (struct ath11k_buffer_addr *)&amp;msdu_link-&gt;buf_addr_info;</div><div class='hunk'>@@ -4425,7 +4607,7 @@ static void ath11k_hal_rx_msdu_list_get(struct ath11k *ar,</div><div class='ctx'> 	u32 first = FIELD_PREP(RX_MSDU_DESC_INFO0_FIRST_MSDU_IN_MPDU, 1);</div><div class='ctx'> 	u8  tmp  = 0;</div><div class='ctx'> </div><div class='del'>-	msdu_link = (struct hal_rx_msdu_link *)msdu_link_desc;</div><div class='add'>+	msdu_link = msdu_link_desc;</div><div class='ctx'> 	msdu_details = &amp;msdu_link-&gt;msdu_link[0];</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; HAL_RX_NUM_MSDU_DESC; i++) {</div><div class='hunk'>@@ -4433,7 +4615,6 @@ static void ath11k_hal_rx_msdu_list_get(struct ath11k *ar,</div><div class='ctx'> 			      msdu_details[i].buf_addr_info.info0) == 0) {</div><div class='ctx'> 			msdu_desc_info = &amp;msdu_details[i - 1].rx_msdu_info;</div><div class='ctx'> 			msdu_desc_info-&gt;info0 |= last;</div><div class='del'>-			;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		msdu_desc_info = &amp;msdu_details[i].rx_msdu_info;</div><div class='hunk'>@@ -4499,11 +4680,12 @@ static void ath11k_dp_mon_get_buf_len(struct hal_rx_msdu_desc_info *info,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32</div><div class='del'>-ath11k_dp_rx_mon_mpdu_pop(struct ath11k *ar, int mac_id,</div><div class='del'>-			  void *ring_entry, struct sk_buff **head_msdu,</div><div class='del'>-			  struct sk_buff **tail_msdu, u32 *npackets,</div><div class='del'>-			  u32 *ppdu_id)</div><div class='add'>+/* clang stack usage explodes if this is inlined */</div><div class='add'>+static noinline_for_stack</div><div class='add'>+u32 ath11k_dp_rx_mon_mpdu_pop(struct ath11k *ar, int mac_id,</div><div class='add'>+			      void *ring_entry, struct sk_buff **head_msdu,</div><div class='add'>+			      struct sk_buff **tail_msdu, u32 *npackets,</div><div class='add'>+			      u32 *ppdu_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_pdev_dp *dp = &amp;ar-&gt;dp;</div><div class='ctx'> 	struct ath11k_mon_data *pmon = (struct ath11k_mon_data *)&amp;dp-&gt;mon_data;</div><div class='hunk'>@@ -4522,8 +4704,7 @@ ath11k_dp_rx_mon_mpdu_pop(struct ath11k *ar, int mac_id,</div><div class='ctx'> 	bool is_frag, is_first_msdu;</div><div class='ctx'> 	bool drop_mpdu = false;</div><div class='ctx'> 	struct ath11k_skb_rxcb *rxcb;</div><div class='del'>-	struct hal_reo_entrance_ring *ent_desc =</div><div class='del'>-			(struct hal_reo_entrance_ring *)ring_entry;</div><div class='add'>+	struct hal_reo_entrance_ring *ent_desc = ring_entry;</div><div class='ctx'> 	int buf_id;</div><div class='ctx'> 	u32 rx_link_buf_info[2];</div><div class='ctx'> 	u8 rbm;</div><div class='hunk'>@@ -4591,7 +4772,7 @@ ath11k_dp_rx_mon_mpdu_pop(struct ath11k *ar, int mac_id,</div><div class='ctx'> 			if (!msdu) {</div><div class='ctx'> 				ath11k_dbg(ar-&gt;ab, ATH11K_DBG_DATA,</div><div class='ctx'> 					   "msdu_pop: invalid buf_id %d\n", buf_id);</div><div class='del'>-				break;</div><div class='add'>+				goto next_msdu;</div><div class='ctx'> 			}</div><div class='ctx'> 			rxcb = ATH11K_SKB_RXCB(msdu);</div><div class='ctx'> 			if (!rxcb-&gt;unmapped) {</div><div class='hunk'>@@ -4708,24 +4889,26 @@ static struct sk_buff *</div><div class='ctx'> ath11k_dp_rx_mon_merg_msdus(struct ath11k *ar,</div><div class='ctx'> 			    u32 mac_id, struct sk_buff *head_msdu,</div><div class='ctx'> 			    struct sk_buff *last_msdu,</div><div class='del'>-			    struct ieee80211_rx_status *rxs)</div><div class='add'>+			    struct ieee80211_rx_status *rxs, bool *fcs_err)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='del'>-	struct sk_buff *msdu, *mpdu_buf, *prev_buf;</div><div class='del'>-	u32 wifi_hdr_len;</div><div class='add'>+	struct sk_buff *msdu, *prev_buf;</div><div class='ctx'> 	struct hal_rx_desc *rx_desc;</div><div class='ctx'> 	char *hdr_desc;</div><div class='ctx'> 	u8 *dest, decap_format;</div><div class='ctx'> 	struct ieee80211_hdr_3addr *wh;</div><div class='ctx'> 	struct rx_attention *rx_attention;</div><div class='del'>-</div><div class='del'>-	mpdu_buf = NULL;</div><div class='add'>+	u32 err_bitmap;</div><div class='ctx'> </div><div class='ctx'> 	if (!head_msdu)</div><div class='ctx'> 		goto err_merge_fail;</div><div class='ctx'> </div><div class='ctx'> 	rx_desc = (struct hal_rx_desc *)head_msdu-&gt;data;</div><div class='ctx'> 	rx_attention = ath11k_dp_rx_get_attention(ab, rx_desc);</div><div class='add'>+	err_bitmap = ath11k_dp_rx_h_attn_mpdu_err(rx_attention);</div><div class='add'>+</div><div class='add'>+	if (err_bitmap &amp; DP_RX_MPDU_ERR_FCS)</div><div class='add'>+		*fcs_err = true;</div><div class='ctx'> </div><div class='ctx'> 	if (ath11k_dp_rxdesc_get_mpdulen_err(rx_attention))</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -4751,38 +4934,27 @@ ath11k_dp_rx_mon_merg_msdus(struct ath11k *ar,</div><div class='ctx'> </div><div class='ctx'> 		skb_trim(prev_buf, prev_buf-&gt;len - HAL_RX_FCS_LEN);</div><div class='ctx'> 	} else if (decap_format == DP_RX_DECAP_TYPE_NATIVE_WIFI) {</div><div class='del'>-		__le16 qos_field;</div><div class='ctx'> 		u8 qos_pkt = 0;</div><div class='ctx'> </div><div class='ctx'> 		rx_desc = (struct hal_rx_desc *)head_msdu-&gt;data;</div><div class='ctx'> 		hdr_desc = ath11k_dp_rxdesc_get_80211hdr(ab, rx_desc);</div><div class='ctx'> </div><div class='ctx'> 		/* Base size */</div><div class='del'>-		wifi_hdr_len = sizeof(struct ieee80211_hdr_3addr);</div><div class='ctx'> 		wh = (struct ieee80211_hdr_3addr *)hdr_desc;</div><div class='ctx'> </div><div class='del'>-		if (ieee80211_is_data_qos(wh-&gt;frame_control)) {</div><div class='del'>-			struct ieee80211_qos_hdr *qwh =</div><div class='del'>-					(struct ieee80211_qos_hdr *)hdr_desc;</div><div class='del'>-</div><div class='del'>-			qos_field = qwh-&gt;qos_ctrl;</div><div class='add'>+		if (ieee80211_is_data_qos(wh-&gt;frame_control))</div><div class='ctx'> 			qos_pkt = 1;</div><div class='del'>-		}</div><div class='add'>+</div><div class='ctx'> 		msdu = head_msdu;</div><div class='ctx'> </div><div class='ctx'> 		while (msdu) {</div><div class='del'>-			rx_desc = (struct hal_rx_desc *)msdu-&gt;data;</div><div class='del'>-			hdr_desc = ath11k_dp_rxdesc_get_80211hdr(ab, rx_desc);</div><div class='del'>-</div><div class='add'>+			ath11k_dp_rx_msdus_set_payload(ar, msdu);</div><div class='ctx'> 			if (qos_pkt) {</div><div class='ctx'> 				dest = skb_push(msdu, sizeof(__le16));</div><div class='ctx'> 				if (!dest)</div><div class='ctx'> 					goto err_merge_fail;</div><div class='del'>-				memcpy(dest, hdr_desc, wifi_hdr_len);</div><div class='del'>-				memcpy(dest + wifi_hdr_len,</div><div class='del'>-				       (u8 *)&amp;qos_field, sizeof(__le16));</div><div class='add'>+				memcpy(dest, hdr_desc, sizeof(struct ieee80211_qos_hdr));</div><div class='ctx'> 			}</div><div class='del'>-			ath11k_dp_rx_msdus_set_payload(ar, msdu);</div><div class='ctx'> 			prev_buf = msdu;</div><div class='ctx'> 			msdu = msdu-&gt;next;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4791,7 +4963,7 @@ ath11k_dp_rx_mon_merg_msdus(struct ath11k *ar,</div><div class='ctx'> 			goto err_merge_fail;</div><div class='ctx'> </div><div class='ctx'> 		ath11k_dbg(ab, ATH11K_DBG_DATA,</div><div class='del'>-			   "mpdu_buf %pK mpdu_buf-&gt;len %u",</div><div class='add'>+			   "mpdu_buf %p mpdu_buf-&gt;len %u",</div><div class='ctx'> 			   prev_buf, prev_buf-&gt;len);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ath11k_dbg(ab, ATH11K_DBG_DATA,</div><div class='hunk'>@@ -4803,26 +4975,111 @@ ath11k_dp_rx_mon_merg_msdus(struct ath11k *ar,</div><div class='ctx'> 	return head_msdu;</div><div class='ctx'> </div><div class='ctx'> err_merge_fail:</div><div class='del'>-	if (mpdu_buf &amp;&amp; decap_format != DP_RX_DECAP_TYPE_RAW) {</div><div class='del'>-		ath11k_dbg(ab, ATH11K_DBG_DATA,</div><div class='del'>-			   "err_merge_fail mpdu_buf %pK", mpdu_buf);</div><div class='del'>-		/* Free the head buffer */</div><div class='del'>-		dev_kfree_skb_any(mpdu_buf);</div><div class='del'>-	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+ath11k_dp_rx_update_radiotap_he(struct hal_rx_mon_ppdu_info *rx_status,</div><div class='add'>+				u8 *rtap_buf)</div><div class='add'>+{</div><div class='add'>+	u32 rtap_len = 0;</div><div class='add'>+</div><div class='add'>+	put_unaligned_le16(rx_status-&gt;he_data1, &amp;rtap_buf[rtap_len]);</div><div class='add'>+	rtap_len += 2;</div><div class='add'>+</div><div class='add'>+	put_unaligned_le16(rx_status-&gt;he_data2, &amp;rtap_buf[rtap_len]);</div><div class='add'>+	rtap_len += 2;</div><div class='add'>+</div><div class='add'>+	put_unaligned_le16(rx_status-&gt;he_data3, &amp;rtap_buf[rtap_len]);</div><div class='add'>+	rtap_len += 2;</div><div class='add'>+</div><div class='add'>+	put_unaligned_le16(rx_status-&gt;he_data4, &amp;rtap_buf[rtap_len]);</div><div class='add'>+	rtap_len += 2;</div><div class='add'>+</div><div class='add'>+	put_unaligned_le16(rx_status-&gt;he_data5, &amp;rtap_buf[rtap_len]);</div><div class='add'>+	rtap_len += 2;</div><div class='add'>+</div><div class='add'>+	put_unaligned_le16(rx_status-&gt;he_data6, &amp;rtap_buf[rtap_len]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath11k_dp_rx_update_radiotap_he_mu(struct hal_rx_mon_ppdu_info *rx_status,</div><div class='add'>+				   u8 *rtap_buf)</div><div class='add'>+{</div><div class='add'>+	u32 rtap_len = 0;</div><div class='add'>+</div><div class='add'>+	put_unaligned_le16(rx_status-&gt;he_flags1, &amp;rtap_buf[rtap_len]);</div><div class='add'>+	rtap_len += 2;</div><div class='add'>+</div><div class='add'>+	put_unaligned_le16(rx_status-&gt;he_flags2, &amp;rtap_buf[rtap_len]);</div><div class='add'>+	rtap_len += 2;</div><div class='add'>+</div><div class='add'>+	rtap_buf[rtap_len] = rx_status-&gt;he_RU[0];</div><div class='add'>+	rtap_len += 1;</div><div class='add'>+</div><div class='add'>+	rtap_buf[rtap_len] = rx_status-&gt;he_RU[1];</div><div class='add'>+	rtap_len += 1;</div><div class='add'>+</div><div class='add'>+	rtap_buf[rtap_len] = rx_status-&gt;he_RU[2];</div><div class='add'>+	rtap_len += 1;</div><div class='add'>+</div><div class='add'>+	rtap_buf[rtap_len] = rx_status-&gt;he_RU[3];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_update_radiotap(struct ath11k *ar,</div><div class='add'>+				   struct hal_rx_mon_ppdu_info *ppduinfo,</div><div class='add'>+				   struct sk_buff *mon_skb,</div><div class='add'>+				   struct ieee80211_rx_status *rxs)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	u8 *ptr = NULL;</div><div class='add'>+</div><div class='add'>+	rxs-&gt;flag |= RX_FLAG_MACTIME_START;</div><div class='add'>+	rxs-&gt;signal = ppduinfo-&gt;rssi_comb + ATH11K_DEFAULT_NOISE_FLOOR;</div><div class='add'>+</div><div class='add'>+	if (ppduinfo-&gt;nss)</div><div class='add'>+		rxs-&gt;nss = ppduinfo-&gt;nss;</div><div class='add'>+</div><div class='add'>+	if (ppduinfo-&gt;he_mu_flags) {</div><div class='add'>+		rxs-&gt;flag |= RX_FLAG_RADIOTAP_HE_MU;</div><div class='add'>+		rxs-&gt;encoding = RX_ENC_HE;</div><div class='add'>+		ptr = skb_push(mon_skb, sizeof(struct ieee80211_radiotap_he_mu));</div><div class='add'>+		ath11k_dp_rx_update_radiotap_he_mu(ppduinfo, ptr);</div><div class='add'>+	} else if (ppduinfo-&gt;he_flags) {</div><div class='add'>+		rxs-&gt;flag |= RX_FLAG_RADIOTAP_HE;</div><div class='add'>+		rxs-&gt;encoding = RX_ENC_HE;</div><div class='add'>+		ptr = skb_push(mon_skb, sizeof(struct ieee80211_radiotap_he));</div><div class='add'>+		ath11k_dp_rx_update_radiotap_he(ppduinfo, ptr);</div><div class='add'>+		rxs-&gt;rate_idx = ppduinfo-&gt;rate;</div><div class='add'>+	} else if (ppduinfo-&gt;vht_flags) {</div><div class='add'>+		rxs-&gt;encoding = RX_ENC_VHT;</div><div class='add'>+		rxs-&gt;rate_idx = ppduinfo-&gt;rate;</div><div class='add'>+	} else if (ppduinfo-&gt;ht_flags) {</div><div class='add'>+		rxs-&gt;encoding = RX_ENC_HT;</div><div class='add'>+		rxs-&gt;rate_idx = ppduinfo-&gt;rate;</div><div class='add'>+	} else {</div><div class='add'>+		rxs-&gt;encoding = RX_ENC_LEGACY;</div><div class='add'>+		sband = &amp;ar-&gt;mac.sbands[rxs-&gt;band];</div><div class='add'>+		rxs-&gt;rate_idx = ath11k_mac_hw_rate_to_idx(sband, ppduinfo-&gt;rate,</div><div class='add'>+							  ppduinfo-&gt;cck_flag);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rxs-&gt;mactime = ppduinfo-&gt;tsft;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath11k_dp_rx_mon_deliver(struct ath11k *ar, u32 mac_id,</div><div class='ctx'> 				    struct sk_buff *head_msdu,</div><div class='add'>+				    struct hal_rx_mon_ppdu_info *ppduinfo,</div><div class='ctx'> 				    struct sk_buff *tail_msdu,</div><div class='ctx'> 				    struct napi_struct *napi)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_pdev_dp *dp = &amp;ar-&gt;dp;</div><div class='ctx'> 	struct sk_buff *mon_skb, *skb_next, *header;</div><div class='del'>-	struct ieee80211_rx_status *rxs = &amp;dp-&gt;rx_status, *status;</div><div class='add'>+	struct ieee80211_rx_status *rxs = &amp;dp-&gt;rx_status;</div><div class='add'>+	bool fcs_err = false;</div><div class='ctx'> </div><div class='ctx'> 	mon_skb = ath11k_dp_rx_mon_merg_msdus(ar, mac_id, head_msdu,</div><div class='del'>-					      tail_msdu, rxs);</div><div class='add'>+					      tail_msdu, rxs, &amp;fcs_err);</div><div class='ctx'> </div><div class='ctx'> 	if (!mon_skb)</div><div class='ctx'> 		goto mon_deliver_fail;</div><div class='hunk'>@@ -4830,6 +5087,10 @@ static int ath11k_dp_rx_mon_deliver(struct ath11k *ar, u32 mac_id,</div><div class='ctx'> 	header = mon_skb;</div><div class='ctx'> </div><div class='ctx'> 	rxs-&gt;flag = 0;</div><div class='add'>+</div><div class='add'>+	if (fcs_err)</div><div class='add'>+		rxs-&gt;flag = RX_FLAG_FAILED_FCS_CRC;</div><div class='add'>+</div><div class='ctx'> 	do {</div><div class='ctx'> 		skb_next = mon_skb-&gt;next;</div><div class='ctx'> 		if (!skb_next)</div><div class='hunk'>@@ -4844,11 +5105,9 @@ static int ath11k_dp_rx_mon_deliver(struct ath11k *ar, u32 mac_id,</div><div class='ctx'> 			rxs-&gt;flag |= RX_FLAG_ALLOW_SAME_PN;</div><div class='ctx'> 		}</div><div class='ctx'> 		rxs-&gt;flag |= RX_FLAG_ONLY_MONITOR;</div><div class='add'>+		ath11k_update_radiotap(ar, ppduinfo, mon_skb, rxs);</div><div class='ctx'> </div><div class='del'>-		status = IEEE80211_SKB_RXCB(mon_skb);</div><div class='del'>-		*status = *rxs;</div><div class='del'>-</div><div class='del'>-		ath11k_dp_rx_deliver_msdu(ar, napi, mon_skb);</div><div class='add'>+		ath11k_dp_rx_deliver_msdu(ar, napi, mon_skb, rxs);</div><div class='ctx'> 		mon_skb = skb_next;</div><div class='ctx'> 	} while (mon_skb);</div><div class='ctx'> 	rxs-&gt;flag = 0;</div><div class='hunk'>@@ -4865,18 +5124,26 @@ mon_deliver_fail:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* The destination ring processing is stuck if the destination is not</div><div class='add'>+ * moving while status ring moves 16 PPDU. The destination ring processing</div><div class='add'>+ * skips this destination ring PPDU as a workaround.</div><div class='add'>+ */</div><div class='add'>+#define MON_DEST_RING_STUCK_MAX_CNT 16</div><div class='add'>+</div><div class='ctx'> static void ath11k_dp_rx_mon_dest_process(struct ath11k *ar, int mac_id,</div><div class='ctx'> 					  u32 quota, struct napi_struct *napi)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_pdev_dp *dp = &amp;ar-&gt;dp;</div><div class='ctx'> 	struct ath11k_mon_data *pmon = (struct ath11k_mon_data *)&amp;dp-&gt;mon_data;</div><div class='add'>+	const struct ath11k_hw_hal_params *hal_params;</div><div class='ctx'> 	void *ring_entry;</div><div class='del'>-	void *mon_dst_srng;</div><div class='add'>+	struct hal_srng *mon_dst_srng;</div><div class='ctx'> 	u32 ppdu_id;</div><div class='ctx'> 	u32 rx_bufs_used;</div><div class='ctx'> 	u32 ring_id;</div><div class='ctx'> 	struct ath11k_pdev_mon_stats *rx_mon_stats;</div><div class='ctx'> 	u32	 npackets = 0;</div><div class='add'>+	u32 mpdu_rx_bufs_used;</div><div class='ctx'> </div><div class='ctx'> 	if (ar-&gt;ab-&gt;hw_params.rxdma1_enable)</div><div class='ctx'> 		ring_id = dp-&gt;rxdma_mon_dst_ring.ring_id;</div><div class='hunk'>@@ -4885,15 +5152,9 @@ static void ath11k_dp_rx_mon_dest_process(struct ath11k *ar, int mac_id,</div><div class='ctx'> </div><div class='ctx'> 	mon_dst_srng = &amp;ar-&gt;ab-&gt;hal.srng_list[ring_id];</div><div class='ctx'> </div><div class='del'>-	if (!mon_dst_srng) {</div><div class='del'>-		ath11k_warn(ar-&gt;ab,</div><div class='del'>-			    "HAL Monitor Destination Ring Init Failed -- %pK",</div><div class='del'>-			    mon_dst_srng);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	spin_lock_bh(&amp;pmon-&gt;mon_lock);</div><div class='ctx'> </div><div class='add'>+	spin_lock_bh(&amp;mon_dst_srng-&gt;lock);</div><div class='ctx'> 	ath11k_hal_srng_access_begin(ar-&gt;ab, mon_dst_srng);</div><div class='ctx'> </div><div class='ctx'> 	ppdu_id = pmon-&gt;mon_ppdu_info.ppdu_id;</div><div class='hunk'>@@ -4906,20 +5167,44 @@ static void ath11k_dp_rx_mon_dest_process(struct ath11k *ar, int mac_id,</div><div class='ctx'> 		head_msdu = NULL;</div><div class='ctx'> 		tail_msdu = NULL;</div><div class='ctx'> </div><div class='del'>-		rx_bufs_used += ath11k_dp_rx_mon_mpdu_pop(ar, mac_id, ring_entry,</div><div class='del'>-							  &amp;head_msdu,</div><div class='del'>-							  &amp;tail_msdu,</div><div class='del'>-							  &amp;npackets, &amp;ppdu_id);</div><div class='add'>+		mpdu_rx_bufs_used = ath11k_dp_rx_mon_mpdu_pop(ar, mac_id, ring_entry,</div><div class='add'>+							      &amp;head_msdu,</div><div class='add'>+							      &amp;tail_msdu,</div><div class='add'>+							      &amp;npackets, &amp;ppdu_id);</div><div class='add'>+</div><div class='add'>+		rx_bufs_used += mpdu_rx_bufs_used;</div><div class='add'>+</div><div class='add'>+		if (mpdu_rx_bufs_used) {</div><div class='add'>+			dp-&gt;mon_dest_ring_stuck_cnt = 0;</div><div class='add'>+		} else {</div><div class='add'>+			dp-&gt;mon_dest_ring_stuck_cnt++;</div><div class='add'>+			rx_mon_stats-&gt;dest_mon_not_reaped++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (dp-&gt;mon_dest_ring_stuck_cnt &gt; MON_DEST_RING_STUCK_MAX_CNT) {</div><div class='add'>+			rx_mon_stats-&gt;dest_mon_stuck++;</div><div class='add'>+			ath11k_dbg(ar-&gt;ab, ATH11K_DBG_DATA,</div><div class='add'>+				   "status ring ppdu_id=%d dest ring ppdu_id=%d mon_dest_ring_stuck_cnt=%d dest_mon_not_reaped=%u dest_mon_stuck=%u\n",</div><div class='add'>+				   pmon-&gt;mon_ppdu_info.ppdu_id, ppdu_id,</div><div class='add'>+				   dp-&gt;mon_dest_ring_stuck_cnt,</div><div class='add'>+				   rx_mon_stats-&gt;dest_mon_not_reaped,</div><div class='add'>+				   rx_mon_stats-&gt;dest_mon_stuck);</div><div class='add'>+			pmon-&gt;mon_ppdu_info.ppdu_id = ppdu_id;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (ppdu_id != pmon-&gt;mon_ppdu_info.ppdu_id) {</div><div class='ctx'> 			pmon-&gt;mon_ppdu_status = DP_PPDU_STATUS_START;</div><div class='ctx'> 			ath11k_dbg(ar-&gt;ab, ATH11K_DBG_DATA,</div><div class='del'>-				   "dest_rx: new ppdu_id %x != status ppdu_id %x",</div><div class='del'>-				   ppdu_id, pmon-&gt;mon_ppdu_info.ppdu_id);</div><div class='add'>+				   "dest_rx: new ppdu_id %x != status ppdu_id %x dest_mon_not_reaped = %u dest_mon_stuck = %u\n",</div><div class='add'>+				   ppdu_id, pmon-&gt;mon_ppdu_info.ppdu_id,</div><div class='add'>+				   rx_mon_stats-&gt;dest_mon_not_reaped,</div><div class='add'>+				   rx_mon_stats-&gt;dest_mon_stuck);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (head_msdu &amp;&amp; tail_msdu) {</div><div class='ctx'> 			ath11k_dp_rx_mon_deliver(ar, dp-&gt;mac_id, head_msdu,</div><div class='add'>+						 &amp;pmon-&gt;mon_ppdu_info,</div><div class='ctx'> 						 tail_msdu, napi);</div><div class='ctx'> 			rx_mon_stats-&gt;dest_mpdu_done++;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4928,70 +5213,473 @@ static void ath11k_dp_rx_mon_dest_process(struct ath11k *ar, int mac_id,</div><div class='ctx'> 								mon_dst_srng);</div><div class='ctx'> 	}</div><div class='ctx'> 	ath11k_hal_srng_access_end(ar-&gt;ab, mon_dst_srng);</div><div class='add'>+	spin_unlock_bh(&amp;mon_dst_srng-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;pmon-&gt;mon_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (rx_bufs_used) {</div><div class='ctx'> 		rx_mon_stats-&gt;dest_ppdu_done++;</div><div class='add'>+		hal_params = ar-&gt;ab-&gt;hw_params.hal_params;</div><div class='add'>+</div><div class='ctx'> 		if (ar-&gt;ab-&gt;hw_params.rxdma1_enable)</div><div class='ctx'> 			ath11k_dp_rxbufs_replenish(ar-&gt;ab, dp-&gt;mac_id,</div><div class='ctx'> 						   &amp;dp-&gt;rxdma_mon_buf_ring,</div><div class='ctx'> 						   rx_bufs_used,</div><div class='del'>-						   HAL_RX_BUF_RBM_SW3_BM);</div><div class='add'>+						   hal_params-&gt;rx_buf_rbm);</div><div class='ctx'> 		else</div><div class='ctx'> 			ath11k_dp_rxbufs_replenish(ar-&gt;ab, dp-&gt;mac_id,</div><div class='ctx'> 						   &amp;dp-&gt;rx_refill_buf_ring,</div><div class='ctx'> 						   rx_bufs_used,</div><div class='del'>-						   HAL_RX_BUF_RBM_SW3_BM);</div><div class='add'>+						   hal_params-&gt;rx_buf_rbm);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_dp_rx_process_mon_status(struct ath11k_base *ab, int mac_id,</div><div class='add'>+				    struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = ath11k_ab_to_ar(ab, mac_id);</div><div class='add'>+	enum hal_rx_mon_status hal_status;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct sk_buff_head skb_list;</div><div class='add'>+	struct ath11k_peer *peer;</div><div class='add'>+	struct ath11k_sta *arsta;</div><div class='add'>+	int num_buffs_reaped = 0;</div><div class='add'>+	u32 rx_buf_sz;</div><div class='add'>+	u16 log_type;</div><div class='add'>+	struct ath11k_mon_data *pmon = (struct ath11k_mon_data *)&amp;ar-&gt;dp.mon_data;</div><div class='add'>+	struct ath11k_pdev_mon_stats *rx_mon_stats = &amp;pmon-&gt;rx_mon_stats;</div><div class='add'>+	struct hal_rx_mon_ppdu_info *ppdu_info = &amp;pmon-&gt;mon_ppdu_info;</div><div class='add'>+</div><div class='add'>+	__skb_queue_head_init(&amp;skb_list);</div><div class='add'>+</div><div class='add'>+	num_buffs_reaped = ath11k_dp_rx_reap_mon_status_ring(ab, mac_id, &amp;budget,</div><div class='add'>+							     &amp;skb_list);</div><div class='add'>+	if (!num_buffs_reaped)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	memset(ppdu_info, 0, sizeof(*ppdu_info));</div><div class='add'>+	ppdu_info-&gt;peer_id = HAL_INVALID_PEERID;</div><div class='add'>+</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;skb_list))) {</div><div class='add'>+		if (ath11k_debugfs_is_pktlog_lite_mode_enabled(ar)) {</div><div class='add'>+			log_type = ATH11K_PKTLOG_TYPE_LITE_RX;</div><div class='add'>+			rx_buf_sz = DP_RX_BUFFER_SIZE_LITE;</div><div class='add'>+		} else if (ath11k_debugfs_is_pktlog_rx_stats_enabled(ar)) {</div><div class='add'>+			log_type = ATH11K_PKTLOG_TYPE_RX_STATBUF;</div><div class='add'>+			rx_buf_sz = DP_RX_BUFFER_SIZE;</div><div class='add'>+		} else {</div><div class='add'>+			log_type = ATH11K_PKTLOG_TYPE_INVALID;</div><div class='add'>+			rx_buf_sz = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (log_type != ATH11K_PKTLOG_TYPE_INVALID)</div><div class='add'>+			trace_ath11k_htt_rxdesc(ar, skb-&gt;data, log_type, rx_buf_sz);</div><div class='add'>+</div><div class='add'>+		memset(ppdu_info, 0, sizeof(*ppdu_info));</div><div class='add'>+		ppdu_info-&gt;peer_id = HAL_INVALID_PEERID;</div><div class='add'>+		hal_status = ath11k_hal_rx_parse_mon_status(ab, ppdu_info, skb);</div><div class='add'>+</div><div class='add'>+		if (test_bit(ATH11K_FLAG_MONITOR_STARTED, &amp;ar-&gt;monitor_flags) &amp;&amp;</div><div class='add'>+		    pmon-&gt;mon_ppdu_status == DP_PPDU_STATUS_START &amp;&amp;</div><div class='add'>+		    hal_status == HAL_TLV_STATUS_PPDU_DONE) {</div><div class='add'>+			rx_mon_stats-&gt;status_ppdu_done++;</div><div class='add'>+			pmon-&gt;mon_ppdu_status = DP_PPDU_STATUS_DONE;</div><div class='add'>+			if (!ab-&gt;hw_params.full_monitor_mode) {</div><div class='add'>+				ath11k_dp_rx_mon_dest_process(ar, mac_id,</div><div class='add'>+							      budget, napi);</div><div class='add'>+				pmon-&gt;mon_ppdu_status = DP_PPDU_STATUS_START;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ppdu_info-&gt;peer_id == HAL_INVALID_PEERID ||</div><div class='add'>+		    hal_status != HAL_RX_MON_STATUS_PPDU_DONE) {</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		peer = ath11k_peer_find_by_id(ab, ppdu_info-&gt;peer_id);</div><div class='add'>+</div><div class='add'>+		if (!peer || !peer-&gt;sta) {</div><div class='add'>+			ath11k_dbg(ab, ATH11K_DBG_DATA,</div><div class='add'>+				   "failed to find the peer with peer_id %d\n",</div><div class='add'>+				   ppdu_info-&gt;peer_id);</div><div class='add'>+			goto next_skb;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		arsta = ath11k_sta_to_arsta(peer-&gt;sta);</div><div class='add'>+		ath11k_dp_rx_update_peer_stats(arsta, ppdu_info);</div><div class='add'>+</div><div class='add'>+		if (ath11k_debugfs_is_pktlog_peer_valid(ar, peer-&gt;addr))</div><div class='add'>+			trace_ath11k_htt_rxdesc(ar, skb-&gt;data, log_type, rx_buf_sz);</div><div class='add'>+</div><div class='add'>+next_skb:</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		memset(ppdu_info, 0, sizeof(*ppdu_info));</div><div class='add'>+		ppdu_info-&gt;peer_id = HAL_INVALID_PEERID;</div><div class='ctx'> 	}</div><div class='add'>+exit:</div><div class='add'>+	return num_buffs_reaped;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath11k_dp_rx_mon_status_process_tlv(struct ath11k *ar,</div><div class='del'>-						int mac_id, u32 quota,</div><div class='del'>-						struct napi_struct *napi)</div><div class='add'>+static u32</div><div class='add'>+ath11k_dp_rx_full_mon_mpdu_pop(struct ath11k *ar,</div><div class='add'>+			       void *ring_entry, struct sk_buff **head_msdu,</div><div class='add'>+			       struct sk_buff **tail_msdu,</div><div class='add'>+			       struct hal_sw_mon_ring_entries *sw_mon_entries)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_pdev_dp *dp = &amp;ar-&gt;dp;</div><div class='del'>-	struct ath11k_mon_data *pmon = (struct ath11k_mon_data *)&amp;dp-&gt;mon_data;</div><div class='del'>-	struct hal_rx_mon_ppdu_info *ppdu_info;</div><div class='del'>-	struct sk_buff *status_skb;</div><div class='del'>-	u32 tlv_status = HAL_TLV_STATUS_BUF_DONE;</div><div class='add'>+	struct ath11k_mon_data *pmon = &amp;dp-&gt;mon_data;</div><div class='add'>+	struct dp_rxdma_ring *rx_ring = &amp;dp-&gt;rxdma_mon_buf_ring;</div><div class='add'>+	struct sk_buff *msdu = NULL, *last = NULL;</div><div class='add'>+	struct hal_sw_monitor_ring *sw_desc = ring_entry;</div><div class='add'>+	struct hal_rx_msdu_list msdu_list;</div><div class='add'>+	struct hal_rx_desc *rx_desc;</div><div class='add'>+	struct ath11k_skb_rxcb *rxcb;</div><div class='add'>+	void *rx_msdu_link_desc;</div><div class='add'>+	void *p_buf_addr_info, *p_last_buf_addr_info;</div><div class='add'>+	int buf_id, i = 0;</div><div class='add'>+	u32 rx_buf_size, rx_pkt_offset, l2_hdr_offset;</div><div class='add'>+	u32 rx_bufs_used = 0, msdu_cnt = 0;</div><div class='add'>+	u32 total_len = 0, frag_len = 0, sw_cookie;</div><div class='add'>+	u16 num_msdus = 0;</div><div class='add'>+	u8 rxdma_err, rbm;</div><div class='add'>+	bool is_frag, is_first_msdu;</div><div class='add'>+	bool drop_mpdu = false;</div><div class='add'>+</div><div class='add'>+	ath11k_hal_rx_sw_mon_ring_buf_paddr_get(ring_entry, sw_mon_entries);</div><div class='add'>+</div><div class='add'>+	sw_cookie = sw_mon_entries-&gt;mon_dst_sw_cookie;</div><div class='add'>+	sw_mon_entries-&gt;end_of_ppdu = false;</div><div class='add'>+	sw_mon_entries-&gt;drop_ppdu = false;</div><div class='add'>+	p_last_buf_addr_info = sw_mon_entries-&gt;dst_buf_addr_info;</div><div class='add'>+	msdu_cnt = sw_mon_entries-&gt;msdu_cnt;</div><div class='add'>+</div><div class='add'>+	sw_mon_entries-&gt;end_of_ppdu =</div><div class='add'>+		FIELD_GET(HAL_SW_MON_RING_INFO0_END_OF_PPDU, sw_desc-&gt;info0);</div><div class='add'>+	if (sw_mon_entries-&gt;end_of_ppdu)</div><div class='add'>+		return rx_bufs_used;</div><div class='add'>+</div><div class='add'>+	if (FIELD_GET(HAL_SW_MON_RING_INFO0_RXDMA_PUSH_REASON,</div><div class='add'>+		      sw_desc-&gt;info0) ==</div><div class='add'>+		      HAL_REO_DEST_RING_PUSH_REASON_ERR_DETECTED) {</div><div class='add'>+		rxdma_err =</div><div class='add'>+			FIELD_GET(HAL_SW_MON_RING_INFO0_RXDMA_ERROR_CODE,</div><div class='add'>+				  sw_desc-&gt;info0);</div><div class='add'>+		if (rxdma_err == HAL_REO_ENTR_RING_RXDMA_ECODE_FLUSH_REQUEST_ERR ||</div><div class='add'>+		    rxdma_err == HAL_REO_ENTR_RING_RXDMA_ECODE_MPDU_LEN_ERR ||</div><div class='add'>+		    rxdma_err == HAL_REO_ENTR_RING_RXDMA_ECODE_OVERFLOW_ERR) {</div><div class='add'>+			pmon-&gt;rx_mon_stats.dest_mpdu_drop++;</div><div class='add'>+			drop_mpdu = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	is_frag = false;</div><div class='add'>+	is_first_msdu = true;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		rx_msdu_link_desc =</div><div class='add'>+			(u8 *)pmon-&gt;link_desc_banks[sw_cookie].vaddr +</div><div class='add'>+			(sw_mon_entries-&gt;mon_dst_paddr -</div><div class='add'>+			 pmon-&gt;link_desc_banks[sw_cookie].paddr);</div><div class='add'>+</div><div class='add'>+		ath11k_hal_rx_msdu_list_get(ar, rx_msdu_link_desc, &amp;msdu_list,</div><div class='add'>+					    &amp;num_msdus);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; num_msdus; i++) {</div><div class='add'>+			buf_id = FIELD_GET(DP_RXDMA_BUF_COOKIE_BUF_ID,</div><div class='add'>+					   msdu_list.sw_cookie[i]);</div><div class='add'>+</div><div class='add'>+			spin_lock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+			msdu = idr_find(&amp;rx_ring-&gt;bufs_idr, buf_id);</div><div class='add'>+			if (!msdu) {</div><div class='add'>+				ath11k_dbg(ar-&gt;ab, ATH11K_DBG_DATA,</div><div class='add'>+					   "full mon msdu_pop: invalid buf_id %d\n",</div><div class='add'>+					    buf_id);</div><div class='add'>+				spin_unlock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+				goto next_msdu;</div><div class='add'>+			}</div><div class='add'>+			idr_remove(&amp;rx_ring-&gt;bufs_idr, buf_id);</div><div class='add'>+			spin_unlock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+</div><div class='add'>+			rxcb = ATH11K_SKB_RXCB(msdu);</div><div class='add'>+			if (!rxcb-&gt;unmapped) {</div><div class='add'>+				dma_unmap_single(ar-&gt;ab-&gt;dev, rxcb-&gt;paddr,</div><div class='add'>+						 msdu-&gt;len +</div><div class='add'>+						 skb_tailroom(msdu),</div><div class='add'>+						 DMA_FROM_DEVICE);</div><div class='add'>+				rxcb-&gt;unmapped = 1;</div><div class='add'>+			}</div><div class='add'>+			if (drop_mpdu) {</div><div class='add'>+				ath11k_dbg(ar-&gt;ab, ATH11K_DBG_DATA,</div><div class='add'>+					   "full mon: i %d drop msdu %p *ppdu_id %x\n",</div><div class='add'>+					   i, msdu, sw_mon_entries-&gt;ppdu_id);</div><div class='add'>+				dev_kfree_skb_any(msdu);</div><div class='add'>+				msdu_cnt--;</div><div class='add'>+				goto next_msdu;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			rx_desc = (struct hal_rx_desc *)msdu-&gt;data;</div><div class='add'>+</div><div class='add'>+			rx_pkt_offset = sizeof(struct hal_rx_desc);</div><div class='add'>+			l2_hdr_offset = ath11k_dp_rx_h_msdu_end_l3pad(ar-&gt;ab, rx_desc);</div><div class='add'>+</div><div class='add'>+			if (is_first_msdu) {</div><div class='add'>+				if (!ath11k_dp_rxdesc_mpdu_valid(ar-&gt;ab, rx_desc)) {</div><div class='add'>+					drop_mpdu = true;</div><div class='add'>+					dev_kfree_skb_any(msdu);</div><div class='add'>+					msdu = NULL;</div><div class='add'>+					goto next_msdu;</div><div class='add'>+				}</div><div class='add'>+				is_first_msdu = false;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ath11k_dp_mon_get_buf_len(&amp;msdu_list.msdu_info[i],</div><div class='add'>+						  &amp;is_frag, &amp;total_len,</div><div class='add'>+						  &amp;frag_len, &amp;msdu_cnt);</div><div class='add'>+</div><div class='add'>+			rx_buf_size = rx_pkt_offset + l2_hdr_offset + frag_len;</div><div class='add'>+</div><div class='add'>+			ath11k_dp_pkt_set_pktlen(msdu, rx_buf_size);</div><div class='add'>+</div><div class='add'>+			if (!(*head_msdu))</div><div class='add'>+				*head_msdu = msdu;</div><div class='add'>+			else if (last)</div><div class='add'>+				last-&gt;next = msdu;</div><div class='add'>+</div><div class='add'>+			last = msdu;</div><div class='add'>+next_msdu:</div><div class='add'>+			rx_bufs_used++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath11k_dp_rx_mon_next_link_desc_get(rx_msdu_link_desc,</div><div class='add'>+						    &amp;sw_mon_entries-&gt;mon_dst_paddr,</div><div class='add'>+						    &amp;sw_mon_entries-&gt;mon_dst_sw_cookie,</div><div class='add'>+						    &amp;rbm,</div><div class='add'>+						    &amp;p_buf_addr_info);</div><div class='add'>+</div><div class='add'>+		if (ath11k_dp_rx_monitor_link_desc_return(ar,</div><div class='add'>+							  p_last_buf_addr_info,</div><div class='add'>+							  dp-&gt;mac_id))</div><div class='add'>+			ath11k_dbg(ar-&gt;ab, ATH11K_DBG_DATA,</div><div class='add'>+				   "full mon: dp_rx_monitor_link_desc_return failed\n");</div><div class='add'>+</div><div class='add'>+		p_last_buf_addr_info = p_buf_addr_info;</div><div class='add'>+</div><div class='add'>+	} while (sw_mon_entries-&gt;mon_dst_paddr &amp;&amp; msdu_cnt);</div><div class='add'>+</div><div class='add'>+	if (last)</div><div class='add'>+		last-&gt;next = NULL;</div><div class='add'>+</div><div class='add'>+	*tail_msdu = msdu;</div><div class='add'>+</div><div class='add'>+	return rx_bufs_used;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_dp_rx_full_mon_prepare_mpdu(struct ath11k_dp *dp,</div><div class='add'>+					      struct dp_full_mon_mpdu *mon_mpdu,</div><div class='add'>+					      struct sk_buff *head,</div><div class='add'>+					      struct sk_buff *tail)</div><div class='add'>+{</div><div class='add'>+	mon_mpdu = kzalloc(sizeof(*mon_mpdu), GFP_ATOMIC);</div><div class='add'>+	if (!mon_mpdu)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;mon_mpdu-&gt;list, &amp;dp-&gt;dp_full_mon_mpdu_list);</div><div class='add'>+	mon_mpdu-&gt;head = head;</div><div class='add'>+	mon_mpdu-&gt;tail = tail;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_dp_rx_full_mon_drop_ppdu(struct ath11k_dp *dp,</div><div class='add'>+					    struct dp_full_mon_mpdu *mon_mpdu)</div><div class='add'>+{</div><div class='add'>+	struct dp_full_mon_mpdu *tmp;</div><div class='add'>+	struct sk_buff *tmp_msdu, *skb_next;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;dp-&gt;dp_full_mon_mpdu_list))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(mon_mpdu, tmp, &amp;dp-&gt;dp_full_mon_mpdu_list, list) {</div><div class='add'>+		list_del(&amp;mon_mpdu-&gt;list);</div><div class='add'>+</div><div class='add'>+		tmp_msdu = mon_mpdu-&gt;head;</div><div class='add'>+		while (tmp_msdu) {</div><div class='add'>+			skb_next = tmp_msdu-&gt;next;</div><div class='add'>+			dev_kfree_skb_any(tmp_msdu);</div><div class='add'>+			tmp_msdu = skb_next;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		kfree(mon_mpdu);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_dp_rx_full_mon_deliver_ppdu(struct ath11k *ar,</div><div class='add'>+					      int mac_id,</div><div class='add'>+					      struct ath11k_mon_data *pmon,</div><div class='add'>+					      struct napi_struct *napi)</div><div class='add'>+{</div><div class='ctx'> 	struct ath11k_pdev_mon_stats *rx_mon_stats;</div><div class='add'>+	struct dp_full_mon_mpdu *tmp;</div><div class='add'>+	struct dp_full_mon_mpdu *mon_mpdu = pmon-&gt;mon_mpdu;</div><div class='add'>+	struct sk_buff *head_msdu, *tail_msdu;</div><div class='add'>+	struct ath11k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath11k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	ppdu_info = &amp;pmon-&gt;mon_ppdu_info;</div><div class='ctx'> 	rx_mon_stats = &amp;pmon-&gt;rx_mon_stats;</div><div class='ctx'> </div><div class='del'>-	if (pmon-&gt;mon_ppdu_status != DP_PPDU_STATUS_START)</div><div class='del'>-		return;</div><div class='add'>+	list_for_each_entry_safe(mon_mpdu, tmp, &amp;dp-&gt;dp_full_mon_mpdu_list, list) {</div><div class='add'>+		list_del(&amp;mon_mpdu-&gt;list);</div><div class='add'>+		head_msdu = mon_mpdu-&gt;head;</div><div class='add'>+		tail_msdu = mon_mpdu-&gt;tail;</div><div class='add'>+		if (head_msdu &amp;&amp; tail_msdu) {</div><div class='add'>+			ret = ath11k_dp_rx_mon_deliver(ar, mac_id, head_msdu,</div><div class='add'>+						       &amp;pmon-&gt;mon_ppdu_info,</div><div class='add'>+						       tail_msdu, napi);</div><div class='add'>+			rx_mon_stats-&gt;dest_mpdu_done++;</div><div class='add'>+			ath11k_dbg(ar-&gt;ab, ATH11K_DBG_DATA, "full mon: deliver ppdu\n");</div><div class='add'>+		}</div><div class='add'>+		kfree(mon_mpdu);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	while (!skb_queue_empty(&amp;pmon-&gt;rx_status_q)) {</div><div class='del'>-		status_skb = skb_dequeue(&amp;pmon-&gt;rx_status_q);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		tlv_status = ath11k_hal_rx_parse_mon_status(ar-&gt;ab, ppdu_info,</div><div class='del'>-							    status_skb);</div><div class='del'>-		if (tlv_status == HAL_TLV_STATUS_PPDU_DONE) {</div><div class='del'>-			rx_mon_stats-&gt;status_ppdu_done++;</div><div class='del'>-			pmon-&gt;mon_ppdu_status = DP_PPDU_STATUS_DONE;</div><div class='del'>-			ath11k_dp_rx_mon_dest_process(ar, mac_id, quota, napi);</div><div class='del'>-			pmon-&gt;mon_ppdu_status = DP_PPDU_STATUS_START;</div><div class='add'>+static int</div><div class='add'>+ath11k_dp_rx_process_full_mon_status_ring(struct ath11k_base *ab, int mac_id,</div><div class='add'>+					  struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = ab-&gt;pdevs[mac_id].ar;</div><div class='add'>+	struct ath11k_pdev_dp *dp = &amp;ar-&gt;dp;</div><div class='add'>+	struct ath11k_mon_data *pmon = &amp;dp-&gt;mon_data;</div><div class='add'>+	struct hal_sw_mon_ring_entries *sw_mon_entries;</div><div class='add'>+	int quota = 0, work = 0, count;</div><div class='add'>+</div><div class='add'>+	sw_mon_entries = &amp;pmon-&gt;sw_mon_entries;</div><div class='add'>+</div><div class='add'>+	while (pmon-&gt;hold_mon_dst_ring) {</div><div class='add'>+		quota = ath11k_dp_rx_process_mon_status(ab, mac_id,</div><div class='add'>+							napi, 1);</div><div class='add'>+		if (pmon-&gt;buf_state == DP_MON_STATUS_MATCH) {</div><div class='add'>+			count = sw_mon_entries-&gt;status_buf_count;</div><div class='add'>+			if (count &gt; 1) {</div><div class='add'>+				quota += ath11k_dp_rx_process_mon_status(ab, mac_id,</div><div class='add'>+									 napi, count);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ath11k_dp_rx_full_mon_deliver_ppdu(ar, dp-&gt;mac_id,</div><div class='add'>+							   pmon, napi);</div><div class='add'>+			pmon-&gt;hold_mon_dst_ring = false;</div><div class='add'>+		} else if (!pmon-&gt;mon_status_paddr ||</div><div class='add'>+			   pmon-&gt;buf_state == DP_MON_STATUS_LEAD) {</div><div class='add'>+			sw_mon_entries-&gt;drop_ppdu = true;</div><div class='add'>+			pmon-&gt;hold_mon_dst_ring = false;</div><div class='ctx'> 		}</div><div class='del'>-		dev_kfree_skb_any(status_skb);</div><div class='add'>+</div><div class='add'>+		if (!quota)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		work += quota;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (sw_mon_entries-&gt;drop_ppdu)</div><div class='add'>+		ath11k_dp_rx_full_mon_drop_ppdu(&amp;ab-&gt;dp, pmon-&gt;mon_mpdu);</div><div class='add'>+</div><div class='add'>+	return work;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_dp_mon_process_rx(struct ath11k_base *ab, int mac_id,</div><div class='del'>-				    struct napi_struct *napi, int budget)</div><div class='add'>+static int ath11k_dp_full_mon_process_rx(struct ath11k_base *ab, int mac_id,</div><div class='add'>+					 struct napi_struct *napi, int budget)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k *ar = ath11k_ab_to_ar(ab, mac_id);</div><div class='add'>+	struct ath11k *ar = ab-&gt;pdevs[mac_id].ar;</div><div class='ctx'> 	struct ath11k_pdev_dp *dp = &amp;ar-&gt;dp;</div><div class='del'>-	struct ath11k_mon_data *pmon = (struct ath11k_mon_data *)&amp;dp-&gt;mon_data;</div><div class='del'>-	int num_buffs_reaped = 0;</div><div class='add'>+	struct ath11k_mon_data *pmon = &amp;dp-&gt;mon_data;</div><div class='add'>+	struct hal_sw_mon_ring_entries *sw_mon_entries;</div><div class='add'>+	struct ath11k_pdev_mon_stats *rx_mon_stats;</div><div class='add'>+	struct sk_buff *head_msdu, *tail_msdu;</div><div class='add'>+	struct hal_srng *mon_dst_srng;</div><div class='add'>+	void *ring_entry;</div><div class='add'>+	u32 rx_bufs_used = 0, mpdu_rx_bufs_used;</div><div class='add'>+	int quota = 0, ret;</div><div class='add'>+	bool break_dst_ring = false;</div><div class='ctx'> </div><div class='del'>-	num_buffs_reaped = ath11k_dp_rx_reap_mon_status_ring(ar-&gt;ab, mac_id, &amp;budget,</div><div class='del'>-							     &amp;pmon-&gt;rx_status_q);</div><div class='del'>-	if (num_buffs_reaped)</div><div class='del'>-		ath11k_dp_rx_mon_status_process_tlv(ar, mac_id, budget, napi);</div><div class='add'>+	spin_lock_bh(&amp;pmon-&gt;mon_lock);</div><div class='ctx'> </div><div class='del'>-	return num_buffs_reaped;</div><div class='add'>+	sw_mon_entries = &amp;pmon-&gt;sw_mon_entries;</div><div class='add'>+	rx_mon_stats = &amp;pmon-&gt;rx_mon_stats;</div><div class='add'>+</div><div class='add'>+	if (pmon-&gt;hold_mon_dst_ring) {</div><div class='add'>+		spin_unlock_bh(&amp;pmon-&gt;mon_lock);</div><div class='add'>+		goto reap_status_ring;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mon_dst_srng = &amp;ar-&gt;ab-&gt;hal.srng_list[dp-&gt;rxdma_mon_dst_ring.ring_id];</div><div class='add'>+	spin_lock_bh(&amp;mon_dst_srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ath11k_hal_srng_access_begin(ar-&gt;ab, mon_dst_srng);</div><div class='add'>+	while ((ring_entry = ath11k_hal_srng_dst_peek(ar-&gt;ab, mon_dst_srng))) {</div><div class='add'>+		head_msdu = NULL;</div><div class='add'>+		tail_msdu = NULL;</div><div class='add'>+</div><div class='add'>+		mpdu_rx_bufs_used = ath11k_dp_rx_full_mon_mpdu_pop(ar, ring_entry,</div><div class='add'>+								   &amp;head_msdu,</div><div class='add'>+								   &amp;tail_msdu,</div><div class='add'>+								   sw_mon_entries);</div><div class='add'>+		rx_bufs_used += mpdu_rx_bufs_used;</div><div class='add'>+</div><div class='add'>+		if (!sw_mon_entries-&gt;end_of_ppdu) {</div><div class='add'>+			if (head_msdu) {</div><div class='add'>+				ret = ath11k_dp_rx_full_mon_prepare_mpdu(&amp;ab-&gt;dp,</div><div class='add'>+									 pmon-&gt;mon_mpdu,</div><div class='add'>+									 head_msdu,</div><div class='add'>+									 tail_msdu);</div><div class='add'>+				if (ret)</div><div class='add'>+					break_dst_ring = true;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			goto next_entry;</div><div class='add'>+		} else {</div><div class='add'>+			if (!sw_mon_entries-&gt;ppdu_id &amp;&amp;</div><div class='add'>+			    !sw_mon_entries-&gt;mon_status_paddr) {</div><div class='add'>+				break_dst_ring = true;</div><div class='add'>+				goto next_entry;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rx_mon_stats-&gt;dest_ppdu_done++;</div><div class='add'>+		pmon-&gt;mon_ppdu_status = DP_PPDU_STATUS_START;</div><div class='add'>+		pmon-&gt;buf_state = DP_MON_STATUS_LAG;</div><div class='add'>+		pmon-&gt;mon_status_paddr = sw_mon_entries-&gt;mon_status_paddr;</div><div class='add'>+		pmon-&gt;hold_mon_dst_ring = true;</div><div class='add'>+next_entry:</div><div class='add'>+		ring_entry = ath11k_hal_srng_dst_get_next_entry(ar-&gt;ab,</div><div class='add'>+								mon_dst_srng);</div><div class='add'>+		if (break_dst_ring)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_hal_srng_access_end(ar-&gt;ab, mon_dst_srng);</div><div class='add'>+	spin_unlock_bh(&amp;mon_dst_srng-&gt;lock);</div><div class='add'>+	spin_unlock_bh(&amp;pmon-&gt;mon_lock);</div><div class='add'>+</div><div class='add'>+	if (rx_bufs_used) {</div><div class='add'>+		ath11k_dp_rxbufs_replenish(ar-&gt;ab, dp-&gt;mac_id,</div><div class='add'>+					   &amp;dp-&gt;rxdma_mon_buf_ring,</div><div class='add'>+					   rx_bufs_used,</div><div class='add'>+					   HAL_RX_BUF_RBM_SW3_BM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+reap_status_ring:</div><div class='add'>+	quota = ath11k_dp_rx_process_full_mon_status_ring(ab, mac_id,</div><div class='add'>+							  napi, budget);</div><div class='add'>+</div><div class='add'>+	return quota;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ath11k_dp_rx_process_mon_rings(struct ath11k_base *ab, int mac_id,</div><div class='hunk'>@@ -5000,10 +5688,12 @@ int ath11k_dp_rx_process_mon_rings(struct ath11k_base *ab, int mac_id,</div><div class='ctx'> 	struct ath11k *ar = ath11k_ab_to_ar(ab, mac_id);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(ATH11K_FLAG_MONITOR_ENABLED, &amp;ar-&gt;monitor_flags))</div><div class='del'>-		ret = ath11k_dp_mon_process_rx(ab, mac_id, napi, budget);</div><div class='add'>+	if (test_bit(ATH11K_FLAG_MONITOR_STARTED, &amp;ar-&gt;monitor_flags) &amp;&amp;</div><div class='add'>+	    ab-&gt;hw_params.full_monitor_mode)</div><div class='add'>+		ret = ath11k_dp_full_mon_process_rx(ab, mac_id, napi, budget);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = ath11k_dp_rx_process_mon_status(ab, mac_id, napi, budget);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5012,8 +5702,6 @@ static int ath11k_dp_rx_pdev_mon_status_attach(struct ath11k *ar)</div><div class='ctx'> 	struct ath11k_pdev_dp *dp = &amp;ar-&gt;dp;</div><div class='ctx'> 	struct ath11k_mon_data *pmon = (struct ath11k_mon_data *)&amp;dp-&gt;mon_data;</div><div class='ctx'> </div><div class='del'>-	skb_queue_head_init(&amp;pmon-&gt;rx_status_q);</div><div class='del'>-</div><div class='ctx'> 	pmon-&gt;mon_ppdu_status = DP_PPDU_STATUS_START;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;pmon-&gt;rx_mon_stats, 0,</div><div class='hunk'>@@ -5093,7 +5781,7 @@ int ath11k_dp_rx_pktlog_stop(struct ath11k_base *ab, bool stop_timer)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (stop_timer)</div><div class='del'>-		del_timer_sync(&amp;ab-&gt;mon_reap_timer);</div><div class='add'>+		timer_delete_sync(&amp;ab-&gt;mon_reap_timer);</div><div class='ctx'> </div><div class='ctx'> 	/* reap all the monitor related rings */</div><div class='ctx'> 	ret = ath11k_dp_purge_mon_ring(ab);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.h b/drivers/net/wireless/ath/ath11k/dp_rx.h<br/>index bf399312b5ff..c322e30caa96 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/dp_rx.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/dp_rx.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/dp_rx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/dp_rx.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef ATH11K_DP_RX_H</div><div class='ctx'> #define ATH11K_DP_RX_H</div><div class='hunk'>@@ -49,6 +50,7 @@ int ath11k_dp_peer_rx_pn_replay_config(struct ath11k_vif *arvif,</div><div class='ctx'> 				       const u8 *peer_addr,</div><div class='ctx'> 				       enum set_key_cmd key_cmd,</div><div class='ctx'> 				       struct ieee80211_key_conf *key);</div><div class='add'>+void ath11k_peer_frags_flush(struct ath11k *ar, struct ath11k_peer *peer);</div><div class='ctx'> void ath11k_peer_rx_tid_cleanup(struct ath11k *ar, struct ath11k_peer *peer);</div><div class='ctx'> void ath11k_peer_rx_tid_delete(struct ath11k *ar,</div><div class='ctx'> 			       struct ath11k_peer *peer, u8 tid);</div><div class='hunk'>@@ -94,4 +96,6 @@ int ath11k_peer_rx_frag_setup(struct ath11k *ar, const u8 *peer_mac, int vdev_id</div><div class='ctx'> int ath11k_dp_rx_pktlog_start(struct ath11k_base *ab);</div><div class='ctx'> int ath11k_dp_rx_pktlog_stop(struct ath11k_base *ab, bool stop_timer);</div><div class='ctx'> </div><div class='add'>+int ath11k_dp_rx_crypto_mic_len(struct ath11k *ar, enum hal_encrypt_type enctype);</div><div class='add'>+</div><div class='ctx'> #endif /* ATH11K_DP_RX_H */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/dp_tx.c b/drivers/net/wireless/ath/ath11k/dp_tx.c<br/>index 8bba5234f81f..562aba66582f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/dp_tx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/dp_tx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/dp_tx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/dp_tx.c</a></div><div class='hunk'>@@ -1,6 +1,8 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='hunk'>@@ -9,6 +11,7 @@</div><div class='ctx'> #include "debugfs_sta.h"</div><div class='ctx'> #include "hw.h"</div><div class='ctx'> #include "peer.h"</div><div class='add'>+#include "mac.h"</div><div class='ctx'> </div><div class='ctx'> static enum hal_tcl_encap_type</div><div class='ctx'> ath11k_dp_tx_get_encap_type(struct ath11k_vif *arvif, struct sk_buff *skb)</div><div class='hunk'>@@ -78,11 +81,11 @@ enum hal_encrypt_type ath11k_dp_tx_get_encrypt_type(u32 cipher)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ath11k_dp_tx(struct ath11k *ar, struct ath11k_vif *arvif,</div><div class='del'>-		 struct sk_buff *skb)</div><div class='add'>+		 struct ath11k_sta *arsta, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='ctx'> 	struct ath11k_dp *dp = &amp;ab-&gt;dp;</div><div class='del'>-	struct hal_tx_info ti = {0};</div><div class='add'>+	struct hal_tx_info ti = {};</div><div class='ctx'> 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='ctx'> 	struct ath11k_skb_cb *skb_cb = ATH11K_SKB_CB(skb);</div><div class='ctx'> 	struct hal_srng *tcl_ring;</div><div class='hunk'>@@ -92,34 +95,26 @@ int ath11k_dp_tx(struct ath11k *ar, struct ath11k_vif *arvif,</div><div class='ctx'> 	u8 pool_id;</div><div class='ctx'> 	u8 hal_ring_id;</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 ring_selector = 0, ring_map = 0;</div><div class='add'>+	u32 ring_selector = 0;</div><div class='add'>+	u8 ring_map = 0;</div><div class='ctx'> 	bool tcl_ring_retry;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(ATH11K_FLAG_CRASH_FLUSH, &amp;ar-&gt;ab-&gt;dev_flags))</div><div class='add'>+	if (unlikely(test_bit(ATH11K_FLAG_CRASH_FLUSH, &amp;ar-&gt;ab-&gt;dev_flags)))</div><div class='ctx'> 		return -ESHUTDOWN;</div><div class='ctx'> </div><div class='del'>-	if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_HW_80211_ENCAP) &amp;&amp;</div><div class='del'>-	    !ieee80211_is_data(hdr-&gt;frame_control))</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+	if (unlikely(!(info-&gt;flags &amp; IEEE80211_TX_CTL_HW_80211_ENCAP) &amp;&amp;</div><div class='add'>+		     !ieee80211_is_data(hdr-&gt;frame_control)))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	pool_id = skb_get_queue_mapping(skb) &amp; (ATH11K_HW_MAX_QUEUES - 1);</div><div class='ctx'> </div><div class='del'>-	/* Let the default ring selection be based on current processor</div><div class='del'>-	 * number, where one of the 3 tcl rings are selected based on</div><div class='del'>-	 * the smp_processor_id(). In case that ring</div><div class='del'>-	 * is full/busy, we resort to other available rings.</div><div class='del'>-	 * If all rings are full, we drop the packet.</div><div class='del'>-	 * //TODO Add throttling logic when all rings are full</div><div class='del'>-	 */</div><div class='del'>-	ring_selector = smp_processor_id();</div><div class='add'>+	ring_selector = ab-&gt;hw_params.hw_ops-&gt;get_ring_selector(skb);</div><div class='ctx'> </div><div class='ctx'> tcl_ring_sel:</div><div class='ctx'> 	tcl_ring_retry = false;</div><div class='del'>-	/* For some chip, it can only use tcl0 to tx */</div><div class='del'>-	if (ar-&gt;ab-&gt;hw_params.tcl_0_only)</div><div class='del'>-		ti.ring_id = 0;</div><div class='del'>-	else</div><div class='del'>-		ti.ring_id = ring_selector % DP_TCL_NUM_RING_MAX;</div><div class='add'>+</div><div class='add'>+	ti.ring_id = ring_selector % ab-&gt;hw_params.max_tx_ring;</div><div class='add'>+	ti.rbm_id = ab-&gt;hw_params.hal_params-&gt;tcl2wbm_rbm_map[ti.ring_id].rbm_id;</div><div class='ctx'> </div><div class='ctx'> 	ring_map |= BIT(ti.ring_id);</div><div class='ctx'> </div><div class='hunk'>@@ -130,8 +125,9 @@ tcl_ring_sel:</div><div class='ctx'> 			DP_TX_IDR_SIZE - 1, GFP_ATOMIC);</div><div class='ctx'> 	spin_unlock_bh(&amp;tx_ring-&gt;tx_idr_lock);</div><div class='ctx'> </div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		if (ring_map == (BIT(DP_TCL_NUM_RING_MAX) - 1)) {</div><div class='add'>+	if (unlikely(ret &lt; 0)) {</div><div class='add'>+		if (ring_map == (BIT(ab-&gt;hw_params.max_tx_ring) - 1) ||</div><div class='add'>+		    !ab-&gt;hw_params.tcl_ring_retry) {</div><div class='ctx'> 			atomic_inc(&amp;ab-&gt;soc_stats.tx_err.misc_fail);</div><div class='ctx'> 			return -ENOSPC;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -145,9 +141,17 @@ tcl_ring_sel:</div><div class='ctx'> 		     FIELD_PREP(DP_TX_DESC_ID_MSDU_ID, ret) |</div><div class='ctx'> 		     FIELD_PREP(DP_TX_DESC_ID_POOL_ID, pool_id);</div><div class='ctx'> 	ti.encap_type = ath11k_dp_tx_get_encap_type(arvif, skb);</div><div class='del'>-	ti.meta_data_flags = arvif-&gt;tcl_metadata;</div><div class='ctx'> </div><div class='del'>-	if (ti.encap_type == HAL_TCL_ENCAP_TYPE_RAW) {</div><div class='add'>+	if (ieee80211_has_a4(hdr-&gt;frame_control) &amp;&amp;</div><div class='add'>+	    is_multicast_ether_addr(hdr-&gt;addr3) &amp;&amp; arsta &amp;&amp;</div><div class='add'>+	    arsta-&gt;use_4addr_set) {</div><div class='add'>+		ti.meta_data_flags = arsta-&gt;tcl_metadata;</div><div class='add'>+		ti.flags0 |= FIELD_PREP(HAL_TCL_DATA_CMD_INFO1_TO_FW, 1);</div><div class='add'>+	} else {</div><div class='add'>+		ti.meta_data_flags = arvif-&gt;tcl_metadata;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(ti.encap_type == HAL_TCL_ENCAP_TYPE_RAW)) {</div><div class='ctx'> 		if (skb_cb-&gt;flags &amp; ATH11K_SKB_CIPHER_SET) {</div><div class='ctx'> 			ti.encrypt_type =</div><div class='ctx'> 				ath11k_dp_tx_get_encrypt_type(skb_cb-&gt;cipher);</div><div class='hunk'>@@ -168,8 +172,8 @@ tcl_ring_sel:</div><div class='ctx'> 	ti.bss_ast_idx = arvif-&gt;ast_idx;</div><div class='ctx'> 	ti.dscp_tid_tbl_idx = 0;</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL &amp;&amp;</div><div class='del'>-	    ti.encap_type != HAL_TCL_ENCAP_TYPE_RAW) {</div><div class='add'>+	if (likely(skb-&gt;ip_summed == CHECKSUM_PARTIAL &amp;&amp;</div><div class='add'>+		   ti.encap_type != HAL_TCL_ENCAP_TYPE_RAW)) {</div><div class='ctx'> 		ti.flags0 |= FIELD_PREP(HAL_TCL_DATA_CMD_INFO1_IP4_CKSUM_EN, 1) |</div><div class='ctx'> 			     FIELD_PREP(HAL_TCL_DATA_CMD_INFO1_UDP4_CKSUM_EN, 1) |</div><div class='ctx'> 			     FIELD_PREP(HAL_TCL_DATA_CMD_INFO1_UDP6_CKSUM_EN, 1) |</div><div class='hunk'>@@ -206,7 +210,7 @@ tcl_ring_sel:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ti.paddr = dma_map_single(ab-&gt;dev, skb-&gt;data, skb-&gt;len, DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(ab-&gt;dev, ti.paddr)) {</div><div class='add'>+	if (unlikely(dma_mapping_error(ab-&gt;dev, ti.paddr))) {</div><div class='ctx'> 		atomic_inc(&amp;ab-&gt;soc_stats.tx_err.misc_fail);</div><div class='ctx'> 		ath11k_warn(ab, "failed to DMA map data Tx buffer\n");</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -226,7 +230,7 @@ tcl_ring_sel:</div><div class='ctx'> 	ath11k_hal_srng_access_begin(ab, tcl_ring);</div><div class='ctx'> </div><div class='ctx'> 	hal_tcl_desc = (void *)ath11k_hal_srng_src_get_next_entry(ab, tcl_ring);</div><div class='del'>-	if (!hal_tcl_desc) {</div><div class='add'>+	if (unlikely(!hal_tcl_desc)) {</div><div class='ctx'> 		/* NOTE: It is highly unlikely we'll be running out of tcl_ring</div><div class='ctx'> 		 * desc because the desc is directly enqueued onto hw queue.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -235,13 +239,13 @@ tcl_ring_sel:</div><div class='ctx'> 		spin_unlock_bh(&amp;tcl_ring-&gt;lock);</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		/* Checking for available tcl descritors in another ring in</div><div class='add'>+		/* Checking for available tcl descriptors in another ring in</div><div class='ctx'> 		 * case of failure due to full tcl ring now, is better than</div><div class='ctx'> 		 * checking this ring earlier for each pkt tx.</div><div class='ctx'> 		 * Restart ring selection if some rings are not checked yet.</div><div class='ctx'> 		 */</div><div class='del'>-		if (ring_map != (BIT(DP_TCL_NUM_RING_MAX) - 1) &amp;&amp;</div><div class='del'>-		    !ar-&gt;ab-&gt;hw_params.tcl_0_only) {</div><div class='add'>+		if (unlikely(ring_map != (BIT(ab-&gt;hw_params.max_tx_ring)) - 1) &amp;&amp;</div><div class='add'>+		    ab-&gt;hw_params.tcl_ring_retry &amp;&amp; ab-&gt;hw_params.max_tx_ring &gt; 1) {</div><div class='ctx'> 			tcl_ring_retry = true;</div><div class='ctx'> 			ring_selector++;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -288,20 +292,18 @@ static void ath11k_dp_tx_free_txbuf(struct ath11k_base *ab, u8 mac_id,</div><div class='ctx'> 	struct sk_buff *msdu;</div><div class='ctx'> 	struct ath11k_skb_cb *skb_cb;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;tx_ring-&gt;tx_idr_lock);</div><div class='del'>-	msdu = idr_find(&amp;tx_ring-&gt;txbuf_idr, msdu_id);</div><div class='del'>-	if (!msdu) {</div><div class='add'>+	spin_lock(&amp;tx_ring-&gt;tx_idr_lock);</div><div class='add'>+	msdu = idr_remove(&amp;tx_ring-&gt;txbuf_idr, msdu_id);</div><div class='add'>+	spin_unlock(&amp;tx_ring-&gt;tx_idr_lock);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!msdu)) {</div><div class='ctx'> 		ath11k_warn(ab, "tx completion for unknown msdu_id %d\n",</div><div class='ctx'> 			    msdu_id);</div><div class='del'>-		spin_unlock_bh(&amp;tx_ring-&gt;tx_idr_lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_cb = ATH11K_SKB_CB(msdu);</div><div class='ctx'> </div><div class='del'>-	idr_remove(&amp;tx_ring-&gt;txbuf_idr, msdu_id);</div><div class='del'>-	spin_unlock_bh(&amp;tx_ring-&gt;tx_idr_lock);</div><div class='del'>-</div><div class='ctx'> 	dma_unmap_single(ab-&gt;dev, skb_cb-&gt;paddr, msdu-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> 	dev_kfree_skb_any(msdu);</div><div class='ctx'> </div><div class='hunk'>@@ -315,17 +317,20 @@ ath11k_dp_tx_htt_tx_complete_buf(struct ath11k_base *ab,</div><div class='ctx'> 				 struct dp_tx_ring *tx_ring,</div><div class='ctx'> 				 struct ath11k_dp_htt_wbm_tx_status *ts)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_tx_status status = {};</div><div class='ctx'> 	struct sk_buff *msdu;</div><div class='ctx'> 	struct ieee80211_tx_info *info;</div><div class='ctx'> 	struct ath11k_skb_cb *skb_cb;</div><div class='ctx'> 	struct ath11k *ar;</div><div class='add'>+	struct ath11k_peer *peer;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;tx_ring-&gt;tx_idr_lock);</div><div class='del'>-	msdu = idr_find(&amp;tx_ring-&gt;txbuf_idr, ts-&gt;msdu_id);</div><div class='del'>-	if (!msdu) {</div><div class='add'>+	spin_lock(&amp;tx_ring-&gt;tx_idr_lock);</div><div class='add'>+	msdu = idr_remove(&amp;tx_ring-&gt;txbuf_idr, ts-&gt;msdu_id);</div><div class='add'>+	spin_unlock(&amp;tx_ring-&gt;tx_idr_lock);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!msdu)) {</div><div class='ctx'> 		ath11k_warn(ab, "htt tx completion for unknown msdu_id %d\n",</div><div class='ctx'> 			    ts-&gt;msdu_id);</div><div class='del'>-		spin_unlock_bh(&amp;tx_ring-&gt;tx_idr_lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -334,28 +339,51 @@ ath11k_dp_tx_htt_tx_complete_buf(struct ath11k_base *ab,</div><div class='ctx'> </div><div class='ctx'> 	ar = skb_cb-&gt;ar;</div><div class='ctx'> </div><div class='del'>-	idr_remove(&amp;tx_ring-&gt;txbuf_idr, ts-&gt;msdu_id);</div><div class='del'>-	spin_unlock_bh(&amp;tx_ring-&gt;tx_idr_lock);</div><div class='del'>-</div><div class='ctx'> 	if (atomic_dec_and_test(&amp;ar-&gt;dp.num_tx_pending))</div><div class='ctx'> 		wake_up(&amp;ar-&gt;dp.tx_empty_waitq);</div><div class='ctx'> </div><div class='ctx'> 	dma_unmap_single(ab-&gt;dev, skb_cb-&gt;paddr, msdu-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='add'>+	if (!skb_cb-&gt;vif) {</div><div class='add'>+		ieee80211_free_txskb(ar-&gt;hw, msdu);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	memset(&amp;info-&gt;status, 0, sizeof(info-&gt;status));</div><div class='ctx'> </div><div class='ctx'> 	if (ts-&gt;acked) {</div><div class='ctx'> 		if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)) {</div><div class='ctx'> 			info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='del'>-			info-&gt;status.ack_signal = ATH11K_DEFAULT_NOISE_FLOOR +</div><div class='del'>-						  ts-&gt;ack_rssi;</div><div class='del'>-			info-&gt;status.is_valid_ack_signal = true;</div><div class='add'>+			info-&gt;status.ack_signal = ts-&gt;ack_rssi;</div><div class='add'>+</div><div class='add'>+			if (!test_bit(WMI_TLV_SERVICE_HW_DB2DBM_CONVERSION_SUPPORT,</div><div class='add'>+				      ab-&gt;wmi_ab.svc_map))</div><div class='add'>+				info-&gt;status.ack_signal += ATH11K_DEFAULT_NOISE_FLOOR;</div><div class='add'>+</div><div class='add'>+			info-&gt;status.flags |=</div><div class='add'>+				IEEE80211_TX_STATUS_ACK_SIGNAL_VALID;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			info-&gt;flags |= IEEE80211_TX_STAT_NOACK_TRANSMITTED;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ieee80211_tx_status(ar-&gt;hw, msdu);</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	peer = ath11k_peer_find_by_id(ab, ts-&gt;peer_id);</div><div class='add'>+	if (!peer || !peer-&gt;sta) {</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_DATA,</div><div class='add'>+			   "dp_tx: failed to find the peer with peer_id %d\n",</div><div class='add'>+			    ts-&gt;peer_id);</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		ieee80211_free_txskb(ar-&gt;hw, msdu);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	status.sta = peer-&gt;sta;</div><div class='add'>+	status.info = info;</div><div class='add'>+	status.skb = msdu;</div><div class='add'>+</div><div class='add'>+	ieee80211_tx_status_ext(ar-&gt;hw, &amp;status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -364,7 +392,7 @@ ath11k_dp_tx_process_htt_tx_complete(struct ath11k_base *ab,</div><div class='ctx'> 				     u32 msdu_id, struct dp_tx_ring *tx_ring)</div><div class='ctx'> {</div><div class='ctx'> 	struct htt_tx_wbm_completion *status_desc;</div><div class='del'>-	struct ath11k_dp_htt_wbm_tx_status ts = {0};</div><div class='add'>+	struct ath11k_dp_htt_wbm_tx_status ts = {};</div><div class='ctx'> 	enum hal_wbm_htt_tx_comp_status wbm_status;</div><div class='ctx'> </div><div class='ctx'> 	status_desc = desc + HTT_TX_WBM_COMP_STATUS_OFFSET;</div><div class='hunk'>@@ -379,7 +407,15 @@ ath11k_dp_tx_process_htt_tx_complete(struct ath11k_base *ab,</div><div class='ctx'> 		ts.msdu_id = msdu_id;</div><div class='ctx'> 		ts.ack_rssi = FIELD_GET(HTT_TX_WBM_COMP_INFO1_ACK_RSSI,</div><div class='ctx'> 					status_desc-&gt;info1);</div><div class='add'>+</div><div class='add'>+		if (FIELD_GET(HTT_TX_WBM_COMP_INFO2_VALID, status_desc-&gt;info2))</div><div class='add'>+			ts.peer_id = FIELD_GET(HTT_TX_WBM_COMP_INFO2_SW_PEER_ID,</div><div class='add'>+					       status_desc-&gt;info2);</div><div class='add'>+		else</div><div class='add'>+			ts.peer_id = HTT_INVALID_PEER_ID;</div><div class='add'>+</div><div class='ctx'> 		ath11k_dp_tx_htt_tx_complete_buf(ab, tx_ring, &amp;ts);</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HAL_WBM_REL_HTT_TX_COMP_STATUS_REINJ:</div><div class='ctx'> 	case HAL_WBM_REL_HTT_TX_COMP_STATUS_INSPECT:</div><div class='hunk'>@@ -413,13 +449,117 @@ static void ath11k_dp_tx_cache_peer_stats(struct ath11k *ar,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void ath11k_dp_tx_update_txcompl(struct ath11k *ar, struct hal_tx_status *ts)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath11k_per_peer_tx_stats *peer_stats = &amp;ar-&gt;cached_stats;</div><div class='add'>+	enum hal_tx_rate_stats_pkt_type pkt_type;</div><div class='add'>+	enum hal_tx_rate_stats_sgi sgi;</div><div class='add'>+	enum hal_tx_rate_stats_bw bw;</div><div class='add'>+	struct ath11k_peer *peer;</div><div class='add'>+	struct ath11k_sta *arsta;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	u16 rate, ru_tones;</div><div class='add'>+	u8 mcs, rate_idx = 0, ofdma;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	peer = ath11k_peer_find_by_id(ab, ts-&gt;peer_id);</div><div class='add'>+	if (!peer || !peer-&gt;sta) {</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_DP_TX,</div><div class='add'>+			   "failed to find the peer by id %u\n", ts-&gt;peer_id);</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sta = peer-&gt;sta;</div><div class='add'>+	arsta = ath11k_sta_to_arsta(sta);</div><div class='add'>+</div><div class='add'>+	memset(&amp;arsta-&gt;txrate, 0, sizeof(arsta-&gt;txrate));</div><div class='add'>+	pkt_type = FIELD_GET(HAL_TX_RATE_STATS_INFO0_PKT_TYPE,</div><div class='add'>+			     ts-&gt;rate_stats);</div><div class='add'>+	mcs = FIELD_GET(HAL_TX_RATE_STATS_INFO0_MCS,</div><div class='add'>+			ts-&gt;rate_stats);</div><div class='add'>+	sgi = FIELD_GET(HAL_TX_RATE_STATS_INFO0_SGI,</div><div class='add'>+			ts-&gt;rate_stats);</div><div class='add'>+	bw = FIELD_GET(HAL_TX_RATE_STATS_INFO0_BW, ts-&gt;rate_stats);</div><div class='add'>+	ru_tones = FIELD_GET(HAL_TX_RATE_STATS_INFO0_TONES_IN_RU, ts-&gt;rate_stats);</div><div class='add'>+	ofdma = FIELD_GET(HAL_TX_RATE_STATS_INFO0_OFDMA_TX, ts-&gt;rate_stats);</div><div class='add'>+</div><div class='add'>+	/* This is to prefer choose the real NSS value arsta-&gt;last_txrate.nss,</div><div class='add'>+	 * if it is invalid, then choose the NSS value while assoc.</div><div class='add'>+	 */</div><div class='add'>+	if (arsta-&gt;last_txrate.nss)</div><div class='add'>+		arsta-&gt;txrate.nss = arsta-&gt;last_txrate.nss;</div><div class='add'>+	else</div><div class='add'>+		arsta-&gt;txrate.nss = arsta-&gt;peer_nss;</div><div class='add'>+</div><div class='add'>+	if (pkt_type == HAL_TX_RATE_STATS_PKT_TYPE_11A ||</div><div class='add'>+	    pkt_type == HAL_TX_RATE_STATS_PKT_TYPE_11B) {</div><div class='add'>+		ret = ath11k_mac_hw_ratecode_to_legacy_rate(mcs,</div><div class='add'>+							    pkt_type,</div><div class='add'>+							    &amp;rate_idx,</div><div class='add'>+							    &amp;rate);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto err_out;</div><div class='add'>+		arsta-&gt;txrate.legacy = rate;</div><div class='add'>+	} else if (pkt_type == HAL_TX_RATE_STATS_PKT_TYPE_11N) {</div><div class='add'>+		if (mcs &gt; 7) {</div><div class='add'>+			ath11k_warn(ab, "Invalid HT mcs index %d\n", mcs);</div><div class='add'>+			goto err_out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (arsta-&gt;txrate.nss != 0)</div><div class='add'>+			arsta-&gt;txrate.mcs = mcs + 8 * (arsta-&gt;txrate.nss - 1);</div><div class='add'>+		arsta-&gt;txrate.flags = RATE_INFO_FLAGS_MCS;</div><div class='add'>+		if (sgi)</div><div class='add'>+			arsta-&gt;txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;</div><div class='add'>+	} else if (pkt_type == HAL_TX_RATE_STATS_PKT_TYPE_11AC) {</div><div class='add'>+		if (mcs &gt; 9) {</div><div class='add'>+			ath11k_warn(ab, "Invalid VHT mcs index %d\n", mcs);</div><div class='add'>+			goto err_out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		arsta-&gt;txrate.mcs = mcs;</div><div class='add'>+		arsta-&gt;txrate.flags = RATE_INFO_FLAGS_VHT_MCS;</div><div class='add'>+		if (sgi)</div><div class='add'>+			arsta-&gt;txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;</div><div class='add'>+	} else if (pkt_type == HAL_TX_RATE_STATS_PKT_TYPE_11AX) {</div><div class='add'>+		if (mcs &gt; 11) {</div><div class='add'>+			ath11k_warn(ab, "Invalid HE mcs index %d\n", mcs);</div><div class='add'>+			goto err_out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		arsta-&gt;txrate.mcs = mcs;</div><div class='add'>+		arsta-&gt;txrate.flags = RATE_INFO_FLAGS_HE_MCS;</div><div class='add'>+		arsta-&gt;txrate.he_gi = ath11k_mac_he_gi_to_nl80211_he_gi(sgi);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arsta-&gt;txrate.bw = ath11k_mac_bw_to_mac80211_bw(bw);</div><div class='add'>+	if (ofdma &amp;&amp; pkt_type == HAL_TX_RATE_STATS_PKT_TYPE_11AX) {</div><div class='add'>+		arsta-&gt;txrate.bw = RATE_INFO_BW_HE_RU;</div><div class='add'>+		arsta-&gt;txrate.he_ru_alloc =</div><div class='add'>+			ath11k_mac_he_ru_tones_to_nl80211_he_ru_alloc(ru_tones);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ath11k_debugfs_is_extd_tx_stats_enabled(ar))</div><div class='add'>+		ath11k_debugfs_sta_add_tx_stats(arsta, peer_stats, rate_idx);</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath11k_dp_tx_complete_msdu(struct ath11k *ar,</div><div class='ctx'> 				       struct sk_buff *msdu,</div><div class='ctx'> 				       struct hal_tx_status *ts)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_tx_status status = {};</div><div class='add'>+	struct ieee80211_rate_status status_rate = {};</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='ctx'> 	struct ieee80211_tx_info *info;</div><div class='ctx'> 	struct ath11k_skb_cb *skb_cb;</div><div class='add'>+	struct ath11k_peer *peer;</div><div class='add'>+	struct ath11k_sta *arsta;</div><div class='add'>+	struct rate_info rate;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON_ONCE(ts-&gt;buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM)) {</div><div class='ctx'> 		/* Must not happen */</div><div class='hunk'>@@ -430,16 +570,14 @@ static void ath11k_dp_tx_complete_msdu(struct ath11k *ar,</div><div class='ctx'> </div><div class='ctx'> 	dma_unmap_single(ab-&gt;dev, skb_cb-&gt;paddr, msdu-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	if (!rcu_dereference(ab-&gt;pdevs_active[ar-&gt;pdev_idx])) {</div><div class='del'>-		dev_kfree_skb_any(msdu);</div><div class='del'>-		goto exit;</div><div class='add'>+	if (unlikely(!rcu_access_pointer(ab-&gt;pdevs_active[ar-&gt;pdev_idx]))) {</div><div class='add'>+		ieee80211_free_txskb(ar-&gt;hw, msdu);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!skb_cb-&gt;vif) {</div><div class='del'>-		dev_kfree_skb_any(msdu);</div><div class='del'>-		goto exit;</div><div class='add'>+	if (unlikely(!skb_cb-&gt;vif)) {</div><div class='add'>+		ieee80211_free_txskb(ar-&gt;hw, msdu);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	info = IEEE80211_SKB_CB(msdu);</div><div class='hunk'>@@ -451,16 +589,21 @@ static void ath11k_dp_tx_complete_msdu(struct ath11k *ar,</div><div class='ctx'> 	if (ts-&gt;status == HAL_WBM_TQM_REL_REASON_FRAME_ACKED &amp;&amp;</div><div class='ctx'> 	    !(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)) {</div><div class='ctx'> 		info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='del'>-		info-&gt;status.ack_signal = ATH11K_DEFAULT_NOISE_FLOOR +</div><div class='del'>-					  ts-&gt;ack_rssi;</div><div class='del'>-		info-&gt;status.is_valid_ack_signal = true;</div><div class='add'>+		info-&gt;status.ack_signal = ts-&gt;ack_rssi;</div><div class='add'>+</div><div class='add'>+		if (!test_bit(WMI_TLV_SERVICE_HW_DB2DBM_CONVERSION_SUPPORT,</div><div class='add'>+			      ab-&gt;wmi_ab.svc_map))</div><div class='add'>+			info-&gt;status.ack_signal += ATH11K_DEFAULT_NOISE_FLOOR;</div><div class='add'>+</div><div class='add'>+		info-&gt;status.flags |= IEEE80211_TX_STATUS_ACK_SIGNAL_VALID;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ts-&gt;status == HAL_WBM_TQM_REL_REASON_CMD_REMOVE_TX &amp;&amp;</div><div class='ctx'> 	    (info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK))</div><div class='ctx'> 		info-&gt;flags |= IEEE80211_TX_STAT_NOACK_TRANSMITTED;</div><div class='ctx'> </div><div class='del'>-	if (ath11k_debugfs_is_extd_tx_stats_enabled(ar)) {</div><div class='add'>+	if (unlikely(ath11k_debugfs_is_extd_tx_stats_enabled(ar)) ||</div><div class='add'>+	    ab-&gt;hw_params.single_pdev_only) {</div><div class='ctx'> 		if (ts-&gt;flags &amp; HAL_TX_STATUS_FLAGS_FIRST_MSDU) {</div><div class='ctx'> 			if (ar-&gt;last_ppdu_id == 0) {</div><div class='ctx'> 				ar-&gt;last_ppdu_id = ts-&gt;ppdu_id;</div><div class='hunk'>@@ -468,12 +611,12 @@ static void ath11k_dp_tx_complete_msdu(struct ath11k *ar,</div><div class='ctx'> 				   ar-&gt;cached_ppdu_id == ar-&gt;last_ppdu_id) {</div><div class='ctx'> 				ar-&gt;cached_ppdu_id = ar-&gt;last_ppdu_id;</div><div class='ctx'> 				ar-&gt;cached_stats.is_ampdu = true;</div><div class='del'>-				ath11k_debugfs_sta_update_txcompl(ar, msdu, ts);</div><div class='add'>+				ath11k_dp_tx_update_txcompl(ar, ts);</div><div class='ctx'> 				memset(&amp;ar-&gt;cached_stats, 0,</div><div class='ctx'> 				       sizeof(struct ath11k_per_peer_tx_stats));</div><div class='ctx'> 			} else {</div><div class='ctx'> 				ar-&gt;cached_stats.is_ampdu = false;</div><div class='del'>-				ath11k_debugfs_sta_update_txcompl(ar, msdu, ts);</div><div class='add'>+				ath11k_dp_tx_update_txcompl(ar, ts);</div><div class='ctx'> 				memset(&amp;ar-&gt;cached_stats, 0,</div><div class='ctx'> 				       sizeof(struct ath11k_per_peer_tx_stats));</div><div class='ctx'> 			}</div><div class='hunk'>@@ -483,15 +626,31 @@ static void ath11k_dp_tx_complete_msdu(struct ath11k *ar,</div><div class='ctx'> 		ath11k_dp_tx_cache_peer_stats(ar, msdu, ts);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* NOTE: Tx rate status reporting. Tx completion status does not have</div><div class='del'>-	 * necessary information (for example nss) to build the tx rate.</div><div class='del'>-	 * Might end up reporting it out-of-band from HTT stats.</div><div class='del'>-	 */</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	peer = ath11k_peer_find_by_id(ab, ts-&gt;peer_id);</div><div class='add'>+	if (!peer || !peer-&gt;sta) {</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_DATA,</div><div class='add'>+			   "dp_tx: failed to find the peer with peer_id %d\n",</div><div class='add'>+			    ts-&gt;peer_id);</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		ieee80211_free_txskb(ar-&gt;hw, msdu);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	arsta = ath11k_sta_to_arsta(peer-&gt;sta);</div><div class='add'>+	status.sta = peer-&gt;sta;</div><div class='add'>+	status.skb = msdu;</div><div class='add'>+	status.info = info;</div><div class='add'>+	rate = arsta-&gt;last_txrate;</div><div class='add'>+</div><div class='add'>+	status_rate.rate_idx = rate;</div><div class='add'>+	status_rate.try_count = 1;</div><div class='add'>+</div><div class='add'>+	status.rates = &amp;status_rate;</div><div class='add'>+	status.n_rates = 1;</div><div class='ctx'> </div><div class='del'>-	ieee80211_tx_status(ar-&gt;hw, msdu);</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='ctx'> </div><div class='del'>-exit:</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	ieee80211_tx_status_ext(ar-&gt;hw, &amp;status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void ath11k_dp_tx_status_parse(struct ath11k_base *ab,</div><div class='hunk'>@@ -500,11 +659,11 @@ static inline void ath11k_dp_tx_status_parse(struct ath11k_base *ab,</div><div class='ctx'> {</div><div class='ctx'> 	ts-&gt;buf_rel_source =</div><div class='ctx'> 		FIELD_GET(HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE, desc-&gt;info0);</div><div class='del'>-	if (ts-&gt;buf_rel_source != HAL_WBM_REL_SRC_MODULE_FW &amp;&amp;</div><div class='del'>-	    ts-&gt;buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM)</div><div class='add'>+	if (unlikely(ts-&gt;buf_rel_source != HAL_WBM_REL_SRC_MODULE_FW &amp;&amp;</div><div class='add'>+		     ts-&gt;buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (ts-&gt;buf_rel_source == HAL_WBM_REL_SRC_MODULE_FW)</div><div class='add'>+	if (unlikely(ts-&gt;buf_rel_source == HAL_WBM_REL_SRC_MODULE_FW))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ts-&gt;status = FIELD_GET(HAL_WBM_RELEASE_INFO0_TQM_RELEASE_REASON,</div><div class='hunk'>@@ -532,7 +691,7 @@ void ath11k_dp_tx_completion_handler(struct ath11k_base *ab, int ring_id)</div><div class='ctx'> 	int hal_ring_id = dp-&gt;tx_ring[ring_id].tcl_comp_ring.ring_id;</div><div class='ctx'> 	struct hal_srng *status_ring = &amp;ab-&gt;hal.srng_list[hal_ring_id];</div><div class='ctx'> 	struct sk_buff *msdu;</div><div class='del'>-	struct hal_tx_status ts = { 0 };</div><div class='add'>+	struct hal_tx_status ts = {};</div><div class='ctx'> 	struct dp_tx_ring *tx_ring = &amp;dp-&gt;tx_ring[ring_id];</div><div class='ctx'> 	u32 *desc;</div><div class='ctx'> 	u32 msdu_id;</div><div class='hunk'>@@ -551,8 +710,9 @@ void ath11k_dp_tx_completion_handler(struct ath11k_base *ab, int ring_id)</div><div class='ctx'> 			ATH11K_TX_COMPL_NEXT(tx_ring-&gt;tx_status_head);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((ath11k_hal_srng_dst_peek(ab, status_ring) != NULL) &amp;&amp;</div><div class='del'>-	    (ATH11K_TX_COMPL_NEXT(tx_ring-&gt;tx_status_head) == tx_ring-&gt;tx_status_tail)) {</div><div class='add'>+	if (unlikely((ath11k_hal_srng_dst_peek(ab, status_ring) != NULL) &amp;&amp;</div><div class='add'>+		     (ATH11K_TX_COMPL_NEXT(tx_ring-&gt;tx_status_head) ==</div><div class='add'>+		      tx_ring-&gt;tx_status_tail))) {</div><div class='ctx'> 		/* TODO: Process pending tx_status messages when kfifo_is_full() */</div><div class='ctx'> 		ath11k_warn(ab, "Unable to process some of the tx_status ring desc because status_fifo is full\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -575,7 +735,7 @@ void ath11k_dp_tx_completion_handler(struct ath11k_base *ab, int ring_id)</div><div class='ctx'> 		mac_id = FIELD_GET(DP_TX_DESC_ID_MAC_ID, desc_id);</div><div class='ctx'> 		msdu_id = FIELD_GET(DP_TX_DESC_ID_MSDU_ID, desc_id);</div><div class='ctx'> </div><div class='del'>-		if (ts.buf_rel_source == HAL_WBM_REL_SRC_MODULE_FW) {</div><div class='add'>+		if (unlikely(ts.buf_rel_source == HAL_WBM_REL_SRC_MODULE_FW)) {</div><div class='ctx'> 			ath11k_dp_tx_process_htt_tx_complete(ab,</div><div class='ctx'> 							     (void *)tx_status,</div><div class='ctx'> 							     mac_id, msdu_id,</div><div class='hunk'>@@ -583,16 +743,16 @@ void ath11k_dp_tx_completion_handler(struct ath11k_base *ab, int ring_id)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		spin_lock_bh(&amp;tx_ring-&gt;tx_idr_lock);</div><div class='del'>-		msdu = idr_find(&amp;tx_ring-&gt;txbuf_idr, msdu_id);</div><div class='del'>-		if (!msdu) {</div><div class='add'>+		spin_lock(&amp;tx_ring-&gt;tx_idr_lock);</div><div class='add'>+		msdu = idr_remove(&amp;tx_ring-&gt;txbuf_idr, msdu_id);</div><div class='add'>+		if (unlikely(!msdu)) {</div><div class='ctx'> 			ath11k_warn(ab, "tx completion for unknown msdu_id %d\n",</div><div class='ctx'> 				    msdu_id);</div><div class='del'>-			spin_unlock_bh(&amp;tx_ring-&gt;tx_idr_lock);</div><div class='add'>+			spin_unlock(&amp;tx_ring-&gt;tx_idr_lock);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		idr_remove(&amp;tx_ring-&gt;txbuf_idr, msdu_id);</div><div class='del'>-		spin_unlock_bh(&amp;tx_ring-&gt;tx_idr_lock);</div><div class='add'>+</div><div class='add'>+		spin_unlock(&amp;tx_ring-&gt;tx_idr_lock);</div><div class='ctx'> </div><div class='ctx'> 		ar = ab-&gt;pdevs[mac_id].ar;</div><div class='ctx'> </div><div class='hunk'>@@ -614,6 +774,9 @@ int ath11k_dp_tx_send_reo_cmd(struct ath11k_base *ab, struct dp_rx_tid *rx_tid,</div><div class='ctx'> 	struct hal_srng *cmd_ring;</div><div class='ctx'> 	int cmd_num;</div><div class='ctx'> </div><div class='add'>+	if (test_bit(ATH11K_FLAG_CRASH_FLUSH, &amp;ab-&gt;dev_flags))</div><div class='add'>+		return -ESHUTDOWN;</div><div class='add'>+</div><div class='ctx'> 	cmd_ring = &amp;ab-&gt;hal.srng_list[dp-&gt;reo_cmd_ring.ring_id];</div><div class='ctx'> 	cmd_num = ath11k_hal_reo_cmd_send(ab, cmd_ring, type, cmd);</div><div class='ctx'> </div><div class='hunk'>@@ -629,7 +792,7 @@ int ath11k_dp_tx_send_reo_cmd(struct ath11k_base *ab, struct dp_rx_tid *rx_tid,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Can this be optimized so that we keep the pending command list only</div><div class='del'>-	 * for tid delete command to free up the resoruce on the command status</div><div class='add'>+	 * for tid delete command to free up the resource on the command status</div><div class='ctx'> 	 * indication?</div><div class='ctx'> 	 */</div><div class='ctx'> 	dp_cmd = kzalloc(sizeof(*dp_cmd), GFP_ATOMIC);</div><div class='hunk'>@@ -810,14 +973,10 @@ int ath11k_dp_tx_htt_srng_setup(struct ath11k_base *ab, u32 ring_id,</div><div class='ctx'> 				params.low_threshold);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11k_DBG_HAL,</div><div class='del'>-		   "%s msi_addr_lo:0x%x, msi_addr_hi:0x%x, msi_data:0x%x\n",</div><div class='del'>-		   __func__, cmd-&gt;ring_msi_addr_lo, cmd-&gt;ring_msi_addr_hi,</div><div class='del'>-		   cmd-&gt;msi_data);</div><div class='del'>-</div><div class='del'>-	ath11k_dbg(ab, ATH11k_DBG_HAL,</div><div class='del'>-		   "ring_id:%d, ring_type:%d, intr_info:0x%x, flags:0x%x\n",</div><div class='del'>-		   ring_id, ring_type, cmd-&gt;intr_info, cmd-&gt;info2);</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_DP_TX,</div><div class='add'>+		   "htt srng setup msi_addr_lo 0x%x msi_addr_hi 0x%x msi_data 0x%x ring_id %d ring_type %d intr_info 0x%x flags 0x%x\n",</div><div class='add'>+		   cmd-&gt;ring_msi_addr_lo, cmd-&gt;ring_msi_addr_hi,</div><div class='add'>+		   cmd-&gt;msi_data, ring_id, ring_type, cmd-&gt;intr_info, cmd-&gt;info2);</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_htc_send(&amp;ab-&gt;htc, ab-&gt;dp.eid, skb);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -868,7 +1027,7 @@ int ath11k_dp_tx_htt_h2t_ver_req_msg(struct ath11k_base *ab)</div><div class='ctx'> 	if (dp-&gt;htt_tgt_ver_major != HTT_TARGET_VERSION_MAJOR) {</div><div class='ctx'> 		ath11k_err(ab, "unsupported htt major version %d supported version is %d\n",</div><div class='ctx'> 			   dp-&gt;htt_tgt_ver_major, HTT_TARGET_VERSION_MAJOR);</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -885,7 +1044,7 @@ int ath11k_dp_tx_htt_h2t_ppdu_stats_req(struct ath11k *ar, u32 mask)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ab-&gt;hw_params.num_rxmda_per_pdev; i++) {</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.num_rxdma_per_pdev; i++) {</div><div class='ctx'> 		skb = ath11k_htc_alloc_skb(ab, len);</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -895,7 +1054,7 @@ int ath11k_dp_tx_htt_h2t_ppdu_stats_req(struct ath11k *ar, u32 mask)</div><div class='ctx'> 		cmd-&gt;msg = FIELD_PREP(HTT_PPDU_STATS_CFG_MSG_TYPE,</div><div class='ctx'> 				      HTT_H2T_MSG_TYPE_PPDU_STATS_CFG);</div><div class='ctx'> </div><div class='del'>-		pdev_mask = 1 &lt;&lt; (i + 1);</div><div class='add'>+		pdev_mask = 1 &lt;&lt; (ar-&gt;pdev_idx + i);</div><div class='ctx'> 		cmd-&gt;msg |= FIELD_PREP(HTT_PPDU_STATS_CFG_PDEV_ID, pdev_mask);</div><div class='ctx'> 		cmd-&gt;msg |= FIELD_PREP(HTT_PPDU_STATS_CFG_TLV_TYPE_BITMASK, mask);</div><div class='ctx'> </div><div class='hunk'>@@ -985,6 +1144,7 @@ ath11k_dp_tx_htt_h2t_ext_stats_req(struct ath11k *ar, u8 type,</div><div class='ctx'> 	struct ath11k_dp *dp = &amp;ab-&gt;dp;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct htt_ext_stats_cfg_cmd *cmd;</div><div class='add'>+	u32 pdev_id;</div><div class='ctx'> 	int len = sizeof(*cmd);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -998,7 +1158,12 @@ ath11k_dp_tx_htt_h2t_ext_stats_req(struct ath11k *ar, u8 type,</div><div class='ctx'> 	memset(cmd, 0, sizeof(*cmd));</div><div class='ctx'> 	cmd-&gt;hdr.msg_type = HTT_H2T_MSG_TYPE_EXT_STATS_CFG;</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;hdr.pdev_mask = 1 &lt;&lt; ar-&gt;pdev-&gt;pdev_id;</div><div class='add'>+	if (ab-&gt;hw_params.single_pdev_only)</div><div class='add'>+		pdev_id = ath11k_mac_get_target_pdev_id(ar);</div><div class='add'>+	else</div><div class='add'>+		pdev_id = ar-&gt;pdev-&gt;pdev_id;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;hdr.pdev_mask = 1 &lt;&lt; pdev_id;</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;hdr.stats_type = type;</div><div class='ctx'> 	cmd-&gt;cfg_param0 = cfg_params-&gt;cfg0;</div><div class='hunk'>@@ -1023,9 +1188,18 @@ int ath11k_dp_tx_htt_monitor_mode_ring_config(struct ath11k *ar, bool reset)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_pdev_dp *dp = &amp;ar-&gt;dp;</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='del'>-	struct htt_rx_ring_tlv_filter tlv_filter = {0};</div><div class='add'>+	struct htt_rx_ring_tlv_filter tlv_filter = {};</div><div class='ctx'> 	int ret = 0, ring_id = 0, i;</div><div class='ctx'> </div><div class='add'>+	if (ab-&gt;hw_params.full_monitor_mode) {</div><div class='add'>+		ret = ath11k_dp_tx_htt_rx_full_mon_setup(ab,</div><div class='add'>+							 dp-&gt;mac_id, !reset);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			ath11k_err(ab, "failed to setup full monitor %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ring_id = dp-&gt;rxdma_mon_buf_ring.refill_buf_ring.ring_id;</div><div class='ctx'> </div><div class='ctx'> 	if (!reset) {</div><div class='hunk'>@@ -1053,7 +1227,7 @@ int ath11k_dp_tx_htt_monitor_mode_ring_config(struct ath11k *ar, bool reset)</div><div class='ctx'> 						       &amp;tlv_filter);</div><div class='ctx'> 	} else if (!reset) {</div><div class='ctx'> 		/* set in monitor mode only */</div><div class='del'>-		for (i = 0; i &lt; ab-&gt;hw_params.num_rxmda_per_pdev; i++) {</div><div class='add'>+		for (i = 0; i &lt; ab-&gt;hw_params.num_rxdma_per_pdev; i++) {</div><div class='ctx'> 			ring_id = dp-&gt;rx_mac_buf_ring[i].ring_id;</div><div class='ctx'> 			ret = ath11k_dp_tx_htt_rx_filter_setup(ar-&gt;ab, ring_id,</div><div class='ctx'> 							       dp-&gt;mac_id + i,</div><div class='hunk'>@@ -1066,14 +1240,18 @@ int ath11k_dp_tx_htt_monitor_mode_ring_config(struct ath11k *ar, bool reset)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ab-&gt;hw_params.num_rxmda_per_pdev; i++) {</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.num_rxdma_per_pdev; i++) {</div><div class='ctx'> 		ring_id = dp-&gt;rx_mon_status_refill_ring[i].refill_buf_ring.ring_id;</div><div class='del'>-		if (!reset)</div><div class='add'>+		if (!reset) {</div><div class='ctx'> 			tlv_filter.rx_filter =</div><div class='ctx'> 					HTT_RX_MON_FILTER_TLV_FLAGS_MON_STATUS_RING;</div><div class='del'>-		else</div><div class='add'>+		} else {</div><div class='ctx'> 			tlv_filter = ath11k_mac_mon_status_filter_default;</div><div class='ctx'> </div><div class='add'>+			if (ath11k_debugfs_is_extd_rx_stats_enabled(ar))</div><div class='add'>+				tlv_filter.rx_filter = ath11k_debugfs_rx_filter(ar);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		ret = ath11k_dp_tx_htt_rx_filter_setup(ab, ring_id,</div><div class='ctx'> 						       dp-&gt;mac_id + i,</div><div class='ctx'> 						       HAL_RXDMA_MONITOR_STATUS,</div><div class='hunk'>@@ -1087,3 +1265,42 @@ int ath11k_dp_tx_htt_monitor_mode_ring_config(struct ath11k *ar, bool reset)</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int ath11k_dp_tx_htt_rx_full_mon_setup(struct ath11k_base *ab, int mac_id,</div><div class='add'>+				       bool config)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_full_monitor_mode_cfg_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret, len = sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	skb = ath11k_htc_alloc_skb(ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	skb_put(skb, len);</div><div class='add'>+	cmd = (struct htt_rx_full_monitor_mode_cfg_cmd *)skb-&gt;data;</div><div class='add'>+	memset(cmd, 0, sizeof(*cmd));</div><div class='add'>+	cmd-&gt;info0 = FIELD_PREP(HTT_RX_FULL_MON_MODE_CFG_CMD_INFO0_MSG_TYPE,</div><div class='add'>+				HTT_H2T_MSG_TYPE_RX_FULL_MONITOR_MODE);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;info0 |= FIELD_PREP(HTT_RX_FULL_MON_MODE_CFG_CMD_INFO0_PDEV_ID, mac_id);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;cfg = HTT_RX_FULL_MON_MODE_CFG_CMD_CFG_ENABLE |</div><div class='add'>+		   FIELD_PREP(HTT_RX_FULL_MON_MODE_CFG_CMD_CFG_RELEASE_RING,</div><div class='add'>+			      HTT_RX_MON_RING_SW);</div><div class='add'>+	if (config) {</div><div class='add'>+		cmd-&gt;cfg |= HTT_RX_FULL_MON_MODE_CFG_CMD_CFG_ZERO_MPDUS_END |</div><div class='add'>+			    HTT_RX_FULL_MON_MODE_CFG_CMD_CFG_NON_ZERO_MPDUS_END;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_htc_send(&amp;ab-&gt;htc, ab-&gt;dp.eid, skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free:</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/dp_tx.h b/drivers/net/wireless/ath/ath11k/dp_tx.h<br/>index f8a9f9c8e444..795fe3b8fa0d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/dp_tx.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/dp_tx.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/dp_tx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/dp_tx.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021, 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef ATH11K_DP_TX_H</div><div class='hunk'>@@ -12,12 +13,14 @@</div><div class='ctx'> struct ath11k_dp_htt_wbm_tx_status {</div><div class='ctx'> 	u32 msdu_id;</div><div class='ctx'> 	bool acked;</div><div class='del'>-	int ack_rssi;</div><div class='add'>+	s8 ack_rssi;</div><div class='add'>+	u16 peer_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+void ath11k_dp_tx_update_txcompl(struct ath11k *ar, struct hal_tx_status *ts);</div><div class='ctx'> int ath11k_dp_tx_htt_h2t_ver_req_msg(struct ath11k_base *ab);</div><div class='ctx'> int ath11k_dp_tx(struct ath11k *ar, struct ath11k_vif *arvif,</div><div class='del'>-		 struct sk_buff *skb);</div><div class='add'>+		 struct ath11k_sta *arsta, struct sk_buff *skb);</div><div class='ctx'> void ath11k_dp_tx_completion_handler(struct ath11k_base *ab, int ring_id);</div><div class='ctx'> int ath11k_dp_tx_send_reo_cmd(struct ath11k_base *ab, struct dp_rx_tid *rx_tid,</div><div class='ctx'> 			      enum hal_reo_cmd_type type,</div><div class='hunk'>@@ -37,4 +40,6 @@ int ath11k_dp_tx_htt_rx_filter_setup(struct ath11k_base *ab, u32 ring_id,</div><div class='ctx'> 				     int rx_buf_size,</div><div class='ctx'> 				     struct htt_rx_ring_tlv_filter *tlv_filter);</div><div class='ctx'> </div><div class='add'>+int ath11k_dp_tx_htt_rx_full_mon_setup(struct ath11k_base *ab, int mac_id,</div><div class='add'>+				       bool config);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/fw.c b/drivers/net/wireless/ath/ath11k/fw.c<br/>new file mode 100644<br/>index 000000000000..07d775a7b528<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/fw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/fw.c</a></div><div class='hunk'>@@ -0,0 +1,171 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include "core.h"</div><div class='add'>+</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+static int ath11k_fw_request_firmware_api_n(struct ath11k_base *ab,</div><div class='add'>+					    const char *name)</div><div class='add'>+{</div><div class='add'>+	size_t magic_len, len, ie_len;</div><div class='add'>+	int ie_id, i, index, bit, ret;</div><div class='add'>+	struct ath11k_fw_ie *hdr;</div><div class='add'>+	const u8 *data;</div><div class='add'>+	__le32 *timestamp;</div><div class='add'>+</div><div class='add'>+	ab-&gt;fw.fw = ath11k_core_firmware_request(ab, name);</div><div class='add'>+	if (IS_ERR(ab-&gt;fw.fw)) {</div><div class='add'>+		ret = PTR_ERR(ab-&gt;fw.fw);</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_BOOT, "failed to load %s: %d\n", name, ret);</div><div class='add'>+		ab-&gt;fw.fw = NULL;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data = ab-&gt;fw.fw-&gt;data;</div><div class='add'>+	len = ab-&gt;fw.fw-&gt;size;</div><div class='add'>+</div><div class='add'>+	/* magic also includes the null byte, check that as well */</div><div class='add'>+	magic_len = strlen(ATH11K_FIRMWARE_MAGIC) + 1;</div><div class='add'>+</div><div class='add'>+	if (len &lt; magic_len) {</div><div class='add'>+		ath11k_err(ab, "firmware image too small to contain magic: %zu\n",</div><div class='add'>+			   len);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (memcmp(data, ATH11K_FIRMWARE_MAGIC, magic_len) != 0) {</div><div class='add'>+		ath11k_err(ab, "Invalid firmware magic\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* jump over the padding */</div><div class='add'>+	magic_len = ALIGN(magic_len, 4);</div><div class='add'>+</div><div class='add'>+	/* make sure there's space for padding */</div><div class='add'>+	if (magic_len &gt; len) {</div><div class='add'>+		ath11k_err(ab, "No space for padding after magic\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len -= magic_len;</div><div class='add'>+	data += magic_len;</div><div class='add'>+</div><div class='add'>+	/* loop elements */</div><div class='add'>+	while (len &gt; sizeof(struct ath11k_fw_ie)) {</div><div class='add'>+		hdr = (struct ath11k_fw_ie *)data;</div><div class='add'>+</div><div class='add'>+		ie_id = le32_to_cpu(hdr-&gt;id);</div><div class='add'>+		ie_len = le32_to_cpu(hdr-&gt;len);</div><div class='add'>+</div><div class='add'>+		len -= sizeof(*hdr);</div><div class='add'>+		data += sizeof(*hdr);</div><div class='add'>+</div><div class='add'>+		if (len &lt; ie_len) {</div><div class='add'>+			ath11k_err(ab, "Invalid length for FW IE %d (%zu &lt; %zu)\n",</div><div class='add'>+				   ie_id, len, ie_len);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (ie_id) {</div><div class='add'>+		case ATH11K_FW_IE_TIMESTAMP:</div><div class='add'>+			if (ie_len != sizeof(u32))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			timestamp = (__le32 *)data;</div><div class='add'>+</div><div class='add'>+			ath11k_dbg(ab, ATH11K_DBG_BOOT, "found fw timestamp %d\n",</div><div class='add'>+				   le32_to_cpup(timestamp));</div><div class='add'>+			break;</div><div class='add'>+		case ATH11K_FW_IE_FEATURES:</div><div class='add'>+			ath11k_dbg(ab, ATH11K_DBG_BOOT,</div><div class='add'>+				   "found firmware features ie (%zd B)\n",</div><div class='add'>+				   ie_len);</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; ATH11K_FW_FEATURE_COUNT; i++) {</div><div class='add'>+				index = i / 8;</div><div class='add'>+				bit = i % 8;</div><div class='add'>+</div><div class='add'>+				if (index == ie_len)</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				if (data[index] &amp; (1 &lt;&lt; bit))</div><div class='add'>+					__set_bit(i, ab-&gt;fw.fw_features);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ath11k_dbg_dump(ab, ATH11K_DBG_BOOT, "features", "",</div><div class='add'>+					ab-&gt;fw.fw_features,</div><div class='add'>+					sizeof(ab-&gt;fw.fw_features));</div><div class='add'>+			break;</div><div class='add'>+		case ATH11K_FW_IE_AMSS_IMAGE:</div><div class='add'>+			ath11k_dbg(ab, ATH11K_DBG_BOOT,</div><div class='add'>+				   "found fw image ie (%zd B)\n",</div><div class='add'>+				   ie_len);</div><div class='add'>+</div><div class='add'>+			ab-&gt;fw.amss_data = data;</div><div class='add'>+			ab-&gt;fw.amss_len = ie_len;</div><div class='add'>+			break;</div><div class='add'>+		case ATH11K_FW_IE_M3_IMAGE:</div><div class='add'>+			ath11k_dbg(ab, ATH11K_DBG_BOOT,</div><div class='add'>+				   "found m3 image ie (%zd B)\n",</div><div class='add'>+				   ie_len);</div><div class='add'>+</div><div class='add'>+			ab-&gt;fw.m3_data = data;</div><div class='add'>+			ab-&gt;fw.m3_len = ie_len;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ath11k_warn(ab, "Unknown FW IE: %u\n", ie_id);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* jump over the padding */</div><div class='add'>+		ie_len = ALIGN(ie_len, 4);</div><div class='add'>+</div><div class='add'>+		/* make sure there's space for padding */</div><div class='add'>+		if (ie_len &gt; len)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		len -= ie_len;</div><div class='add'>+		data += ie_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	release_firmware(ab-&gt;fw.fw);</div><div class='add'>+	ab-&gt;fw.fw = NULL;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_fw_pre_init(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_fw_request_firmware_api_n(ab, ATH11K_FW_API2_FILE);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		ab-&gt;fw.api_version = 2;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab-&gt;fw.api_version = 1;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_BOOT, "using fw api %d\n",</div><div class='add'>+		   ab-&gt;fw.api_version);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_fw_destroy(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	release_firmware(ab-&gt;fw.fw);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_fw_destroy);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/fw.h b/drivers/net/wireless/ath/ath11k/fw.h<br/>new file mode 100644<br/>index 000000000000..d9893ceb2c3d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/fw.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/fw.h</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH11K_FW_H</div><div class='add'>+#define ATH11K_FW_H</div><div class='add'>+</div><div class='add'>+#define ATH11K_FW_API2_FILE		"firmware-2.bin"</div><div class='add'>+#define ATH11K_FIRMWARE_MAGIC		"QCOM-ATH11K-FW"</div><div class='add'>+</div><div class='add'>+enum ath11k_fw_ie_type {</div><div class='add'>+	ATH11K_FW_IE_TIMESTAMP = 0,</div><div class='add'>+	ATH11K_FW_IE_FEATURES = 1,</div><div class='add'>+	ATH11K_FW_IE_AMSS_IMAGE = 2,</div><div class='add'>+	ATH11K_FW_IE_M3_IMAGE = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath11k_fw_features {</div><div class='add'>+	/* keep last */</div><div class='add'>+	ATH11K_FW_FEATURE_COUNT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ath11k_fw_pre_init(struct ath11k_base *ab);</div><div class='add'>+void ath11k_fw_destroy(struct ath11k_base *ab);</div><div class='add'>+</div><div class='add'>+#endif /* ATH11K_FW_H */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/hal.c b/drivers/net/wireless/ath/ath11k/hal.c<br/>index 08e3c72d9237..0c797b8d0a27 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/hal.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/hal.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/hal.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/hal.c</a></div><div class='hunk'>@@ -1,8 +1,11 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include "hal_tx.h"</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> #include "hal_desc.h"</div><div class='hunk'>@@ -125,7 +128,7 @@ static const struct hal_srng_config hw_srng_config_template[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{ /* WBM2SW_RELEASE */</div><div class='ctx'> 		.start_ring_id = HAL_SRNG_RING_ID_WBM2SW0_RELEASE,</div><div class='del'>-		.max_rings = 4,</div><div class='add'>+		.max_rings = 5,</div><div class='ctx'> 		.entry_size = sizeof(struct hal_wbm_release_ring) &gt;&gt; 2,</div><div class='ctx'> 		.lmac_ring = false,</div><div class='ctx'> 		.ring_dir = HAL_SRNG_DIR_DST,</div><div class='hunk'>@@ -382,6 +385,16 @@ static void ath11k_hal_srng_src_hw_init(struct ath11k_base *ab,</div><div class='ctx'> 	val = FIELD_PREP(HAL_REO1_RING_ID_ENTRY_SIZE, srng-&gt;entry_size);</div><div class='ctx'> 	ath11k_hif_write32(ab, reg_base + HAL_TCL1_RING_ID_OFFSET(ab), val);</div><div class='ctx'> </div><div class='add'>+	if (srng-&gt;ring_id == HAL_SRNG_RING_ID_WBM_IDLE_LINK) {</div><div class='add'>+		ath11k_hif_write32(ab, reg_base, (u32)srng-&gt;ring_base_paddr);</div><div class='add'>+		val = FIELD_PREP(HAL_TCL1_RING_BASE_MSB_RING_BASE_ADDR_MSB,</div><div class='add'>+				 ((u64)srng-&gt;ring_base_paddr &gt;&gt;</div><div class='add'>+				 HAL_ADDR_MSB_REG_SHIFT)) |</div><div class='add'>+			FIELD_PREP(HAL_TCL1_RING_BASE_MSB_RING_SIZE,</div><div class='add'>+				   (srng-&gt;entry_size * srng-&gt;num_entries));</div><div class='add'>+		ath11k_hif_write32(ab, reg_base + HAL_TCL1_RING_BASE_MSB_OFFSET(ab), val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* interrupt setup */</div><div class='ctx'> 	/* NOTE: IPQ8074 v2 requires the interrupt timer threshold in the</div><div class='ctx'> 	 * unit of 8 usecs instead of 1 usec (as required by v1).</div><div class='hunk'>@@ -560,7 +573,7 @@ u32 ath11k_hal_ce_get_desc_size(enum hal_ce_desc type)</div><div class='ctx'> void ath11k_hal_ce_src_set_desc(void *buf, dma_addr_t paddr, u32 len, u32 id,</div><div class='ctx'> 				u8 byte_swap_data)</div><div class='ctx'> {</div><div class='del'>-	struct hal_ce_srng_src_desc *desc = (struct hal_ce_srng_src_desc *)buf;</div><div class='add'>+	struct hal_ce_srng_src_desc *desc = buf;</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;buffer_addr_low = paddr &amp; HAL_ADDR_LSB_REG_MASK;</div><div class='ctx'> 	desc-&gt;buffer_addr_info =</div><div class='hunk'>@@ -575,8 +588,7 @@ void ath11k_hal_ce_src_set_desc(void *buf, dma_addr_t paddr, u32 len, u32 id,</div><div class='ctx'> </div><div class='ctx'> void ath11k_hal_ce_dst_set_desc(void *buf, dma_addr_t paddr)</div><div class='ctx'> {</div><div class='del'>-	struct hal_ce_srng_dest_desc *desc =</div><div class='del'>-		(struct hal_ce_srng_dest_desc *)buf;</div><div class='add'>+	struct hal_ce_srng_dest_desc *desc = buf;</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;buffer_addr_low = paddr &amp; HAL_ADDR_LSB_REG_MASK;</div><div class='ctx'> 	desc-&gt;buffer_addr_info =</div><div class='hunk'>@@ -586,8 +598,7 @@ void ath11k_hal_ce_dst_set_desc(void *buf, dma_addr_t paddr)</div><div class='ctx'> </div><div class='ctx'> u32 ath11k_hal_ce_dst_status_get_length(void *buf)</div><div class='ctx'> {</div><div class='del'>-	struct hal_ce_srng_dst_status_desc *desc =</div><div class='del'>-		(struct hal_ce_srng_dst_status_desc *)buf;</div><div class='add'>+	struct hal_ce_srng_dst_status_desc *desc = buf;</div><div class='ctx'> 	u32 len;</div><div class='ctx'> </div><div class='ctx'> 	len = FIELD_GET(HAL_CE_DST_STATUS_DESC_FLAGS_LEN, desc-&gt;flags);</div><div class='hunk'>@@ -617,6 +628,36 @@ u32 *ath11k_hal_srng_dst_peek(struct ath11k_base *ab, struct hal_srng *srng)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 *ath11k_hal_srng_dst_peek_with_dma(struct ath11k_base *ab,</div><div class='add'>+					      struct hal_srng *srng, dma_addr_t *paddr)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (srng-&gt;u.dst_ring.tp != srng-&gt;u.dst_ring.cached_hp) {</div><div class='add'>+		*paddr = srng-&gt;ring_base_paddr +</div><div class='add'>+			  sizeof(*srng-&gt;ring_base_vaddr) * srng-&gt;u.dst_ring.tp;</div><div class='add'>+		return srng-&gt;ring_base_vaddr + srng-&gt;u.dst_ring.tp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_hal_srng_prefetch_desc(struct ath11k_base *ab,</div><div class='add'>+					  struct hal_srng *srng)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t desc_paddr;</div><div class='add'>+	u32 *desc;</div><div class='add'>+</div><div class='add'>+	/* prefetch only if desc is available */</div><div class='add'>+	desc = ath11k_hal_srng_dst_peek_with_dma(ab, srng, &amp;desc_paddr);</div><div class='add'>+	if (likely(desc)) {</div><div class='add'>+		dma_sync_single_for_cpu(ab-&gt;dev, desc_paddr,</div><div class='add'>+					(srng-&gt;entry_size * sizeof(u32)),</div><div class='add'>+					DMA_FROM_DEVICE);</div><div class='add'>+		prefetch(desc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> u32 *ath11k_hal_srng_dst_get_next_entry(struct ath11k_base *ab,</div><div class='ctx'> 					struct hal_srng *srng)</div><div class='ctx'> {</div><div class='hunk'>@@ -629,8 +670,15 @@ u32 *ath11k_hal_srng_dst_get_next_entry(struct ath11k_base *ab,</div><div class='ctx'> </div><div class='ctx'> 	desc = srng-&gt;ring_base_vaddr + srng-&gt;u.dst_ring.tp;</div><div class='ctx'> </div><div class='del'>-	srng-&gt;u.dst_ring.tp = (srng-&gt;u.dst_ring.tp + srng-&gt;entry_size) %</div><div class='del'>-			      srng-&gt;ring_size;</div><div class='add'>+	srng-&gt;u.dst_ring.tp += srng-&gt;entry_size;</div><div class='add'>+</div><div class='add'>+	/* wrap around to start of ring*/</div><div class='add'>+	if (srng-&gt;u.dst_ring.tp == srng-&gt;ring_size)</div><div class='add'>+		srng-&gt;u.dst_ring.tp = 0;</div><div class='add'>+</div><div class='add'>+	/* Try to prefetch the next descriptor in the ring */</div><div class='add'>+	if (srng-&gt;flags &amp; HAL_SRNG_FLAGS_CACHED)</div><div class='add'>+		ath11k_hal_srng_prefetch_desc(ab, srng);</div><div class='ctx'> </div><div class='ctx'> 	return desc;</div><div class='ctx'> }</div><div class='hunk'>@@ -750,6 +798,20 @@ u32 *ath11k_hal_srng_src_get_next_reaped(struct ath11k_base *ab,</div><div class='ctx'> 	return desc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+u32 *ath11k_hal_srng_src_next_peek(struct ath11k_base *ab, struct hal_srng *srng)</div><div class='add'>+{</div><div class='add'>+	u32 next_hp;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	next_hp = (srng-&gt;u.src_ring.hp + srng-&gt;entry_size) % srng-&gt;ring_size;</div><div class='add'>+</div><div class='add'>+	if (next_hp != srng-&gt;u.src_ring.cached_tp)</div><div class='add'>+		return srng-&gt;ring_base_vaddr + next_hp;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> u32 *ath11k_hal_srng_src_peek(struct ath11k_base *ab, struct hal_srng *srng)</div><div class='ctx'> {</div><div class='ctx'> 	lockdep_assert_held(&amp;srng-&gt;lock);</div><div class='hunk'>@@ -763,13 +825,28 @@ u32 *ath11k_hal_srng_src_peek(struct ath11k_base *ab, struct hal_srng *srng)</div><div class='ctx'> </div><div class='ctx'> void ath11k_hal_srng_access_begin(struct ath11k_base *ab, struct hal_srng *srng)</div><div class='ctx'> {</div><div class='add'>+	u32 hp;</div><div class='add'>+</div><div class='ctx'> 	lockdep_assert_held(&amp;srng-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if (srng-&gt;ring_dir == HAL_SRNG_DIR_SRC)</div><div class='add'>+	if (srng-&gt;ring_dir == HAL_SRNG_DIR_SRC) {</div><div class='ctx'> 		srng-&gt;u.src_ring.cached_tp =</div><div class='ctx'> 			*(volatile u32 *)srng-&gt;u.src_ring.tp_addr;</div><div class='del'>-	else</div><div class='del'>-		srng-&gt;u.dst_ring.cached_hp = *srng-&gt;u.dst_ring.hp_addr;</div><div class='add'>+	} else {</div><div class='add'>+		hp = READ_ONCE(*srng-&gt;u.dst_ring.hp_addr);</div><div class='add'>+</div><div class='add'>+		if (hp != srng-&gt;u.dst_ring.cached_hp) {</div><div class='add'>+			srng-&gt;u.dst_ring.cached_hp = hp;</div><div class='add'>+			/* Make sure descriptor is read after the head</div><div class='add'>+			 * pointer.</div><div class='add'>+			 */</div><div class='add'>+			dma_rmb();</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Try to prefetch the next descriptor in the ring */</div><div class='add'>+		if (srng-&gt;flags &amp; HAL_SRNG_FLAGS_CACHED)</div><div class='add'>+			ath11k_hal_srng_prefetch_desc(ab, srng);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Update cached ring head/tail pointers to HW. ath11k_hal_srng_access_begin()</div><div class='hunk'>@@ -779,7 +856,6 @@ void ath11k_hal_srng_access_end(struct ath11k_base *ab, struct hal_srng *srng)</div><div class='ctx'> {</div><div class='ctx'> 	lockdep_assert_held(&amp;srng-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	/* TODO: See if we need a write memory barrier here */</div><div class='ctx'> 	if (srng-&gt;flags &amp; HAL_SRNG_FLAGS_LMAC_RING) {</div><div class='ctx'> 		/* For LMAC rings, ring pointer updates are done through FW and</div><div class='ctx'> 		 * hence written to a shared memory location that is read by FW</div><div class='hunk'>@@ -787,21 +863,37 @@ void ath11k_hal_srng_access_end(struct ath11k_base *ab, struct hal_srng *srng)</div><div class='ctx'> 		if (srng-&gt;ring_dir == HAL_SRNG_DIR_SRC) {</div><div class='ctx'> 			srng-&gt;u.src_ring.last_tp =</div><div class='ctx'> 				*(volatile u32 *)srng-&gt;u.src_ring.tp_addr;</div><div class='del'>-			*srng-&gt;u.src_ring.hp_addr = srng-&gt;u.src_ring.hp;</div><div class='add'>+			/* Make sure descriptor is written before updating the</div><div class='add'>+			 * head pointer.</div><div class='add'>+			 */</div><div class='add'>+			dma_wmb();</div><div class='add'>+			WRITE_ONCE(*srng-&gt;u.src_ring.hp_addr, srng-&gt;u.src_ring.hp);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			srng-&gt;u.dst_ring.last_hp = *srng-&gt;u.dst_ring.hp_addr;</div><div class='del'>-			*srng-&gt;u.dst_ring.tp_addr = srng-&gt;u.dst_ring.tp;</div><div class='add'>+			/* Make sure descriptor is read before updating the</div><div class='add'>+			 * tail pointer.</div><div class='add'>+			 */</div><div class='add'>+			dma_mb();</div><div class='add'>+			WRITE_ONCE(*srng-&gt;u.dst_ring.tp_addr, srng-&gt;u.dst_ring.tp);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (srng-&gt;ring_dir == HAL_SRNG_DIR_SRC) {</div><div class='ctx'> 			srng-&gt;u.src_ring.last_tp =</div><div class='ctx'> 				*(volatile u32 *)srng-&gt;u.src_ring.tp_addr;</div><div class='add'>+			/* Assume implementation use an MMIO write accessor</div><div class='add'>+			 * which has the required wmb() so that the descriptor</div><div class='add'>+			 * is written before the updating the head pointer.</div><div class='add'>+			 */</div><div class='ctx'> 			ath11k_hif_write32(ab,</div><div class='ctx'> 					   (unsigned long)srng-&gt;u.src_ring.hp_addr -</div><div class='ctx'> 					   (unsigned long)ab-&gt;mem,</div><div class='ctx'> 					   srng-&gt;u.src_ring.hp);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			srng-&gt;u.dst_ring.last_hp = *srng-&gt;u.dst_ring.hp_addr;</div><div class='add'>+			/* Make sure descriptor is read before updating the</div><div class='add'>+			 * tail pointer.</div><div class='add'>+			 */</div><div class='add'>+			mb();</div><div class='ctx'> 			ath11k_hif_write32(ab,</div><div class='ctx'> 					   (unsigned long)srng-&gt;u.dst_ring.tp_addr -</div><div class='ctx'> 					   (unsigned long)ab-&gt;mem,</div><div class='hunk'>@@ -937,6 +1029,7 @@ int ath11k_hal_srng_setup(struct ath11k_base *ab, enum hal_ring_type type,</div><div class='ctx'> 	srng-&gt;msi_data = params-&gt;msi_data;</div><div class='ctx'> 	srng-&gt;initialized = 1;</div><div class='ctx'> 	spin_lock_init(&amp;srng-&gt;lock);</div><div class='add'>+	lockdep_set_class(&amp;srng-&gt;lock, hal-&gt;srng_key + ring_id);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; HAL_SRNG_NUM_REG_GRP; i++) {</div><div class='ctx'> 		srng-&gt;hwreg_base[i] = srng_config-&gt;reg_start[i] +</div><div class='hunk'>@@ -970,8 +1063,8 @@ int ath11k_hal_srng_setup(struct ath11k_base *ab, enum hal_ring_type type,</div><div class='ctx'> 				srng-&gt;u.src_ring.hp_addr =</div><div class='ctx'> 				(u32 *)((unsigned long)ab-&gt;mem + reg_base);</div><div class='ctx'> 			else</div><div class='del'>-				ath11k_dbg(ab, ATH11k_DBG_HAL,</div><div class='del'>-					   "hal type %d ring_num %d reg_base 0x%x shadow 0x%lx\n",</div><div class='add'>+				ath11k_dbg(ab, ATH11K_DBG_HAL,</div><div class='add'>+					   "type %d ring_num %d reg_base 0x%x shadow 0x%lx\n",</div><div class='ctx'> 					   type, ring_num,</div><div class='ctx'> 					   reg_base,</div><div class='ctx'> 					   (unsigned long)srng-&gt;u.src_ring.hp_addr -</div><div class='hunk'>@@ -1004,7 +1097,7 @@ int ath11k_hal_srng_setup(struct ath11k_base *ab, enum hal_ring_type type,</div><div class='ctx'> 				(u32 *)((unsigned long)ab-&gt;mem + reg_base +</div><div class='ctx'> 					(HAL_REO1_RING_TP(ab) - HAL_REO1_RING_HP(ab)));</div><div class='ctx'> 			else</div><div class='del'>-				ath11k_dbg(ab, ATH11k_DBG_HAL,</div><div class='add'>+				ath11k_dbg(ab, ATH11K_DBG_HAL,</div><div class='ctx'> 					   "type %d ring_num %d target_reg 0x%x shadow 0x%lx\n",</div><div class='ctx'> 					   type, ring_num,</div><div class='ctx'> 					   reg_base + (HAL_REO1_RING_TP(ab) -</div><div class='hunk'>@@ -1044,10 +1137,10 @@ static void ath11k_hal_srng_update_hp_tp_addr(struct ath11k_base *ab,</div><div class='ctx'> 	srng = &amp;hal-&gt;srng_list[ring_id];</div><div class='ctx'> </div><div class='ctx'> 	if (srng_config-&gt;ring_dir == HAL_SRNG_DIR_DST)</div><div class='del'>-		srng-&gt;u.dst_ring.tp_addr = (u32 *)(HAL_SHADOW_REG(shadow_cfg_idx) +</div><div class='add'>+		srng-&gt;u.dst_ring.tp_addr = (u32 *)(HAL_SHADOW_REG(ab, shadow_cfg_idx) +</div><div class='ctx'> 						   (unsigned long)ab-&gt;mem);</div><div class='ctx'> 	else</div><div class='del'>-		srng-&gt;u.src_ring.hp_addr = (u32 *)(HAL_SHADOW_REG(shadow_cfg_idx) +</div><div class='add'>+		srng-&gt;u.src_ring.hp_addr = (u32 *)(HAL_SHADOW_REG(ab, shadow_cfg_idx) +</div><div class='ctx'> 						   (unsigned long)ab-&gt;mem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1079,10 +1172,10 @@ int ath11k_hal_srng_update_shadow_config(struct ath11k_base *ab,</div><div class='ctx'> 	ath11k_hal_srng_update_hp_tp_addr(ab, shadow_cfg_idx, ring_type,</div><div class='ctx'> 					  ring_num);</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11k_DBG_HAL,</div><div class='del'>-		   "target_reg %x, shadow reg 0x%x shadow_idx 0x%x, ring_type %d, ring num %d",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_HAL,</div><div class='add'>+		   "update shadow config target_reg %x shadow reg 0x%x shadow_idx 0x%x ring_type %d ring num %d",</div><div class='ctx'> 		  target_reg,</div><div class='del'>-		  HAL_SHADOW_REG(shadow_cfg_idx),</div><div class='add'>+		  HAL_SHADOW_REG(ab, shadow_cfg_idx),</div><div class='ctx'> 		  shadow_cfg_idx,</div><div class='ctx'> 		  ring_type, ring_num);</div><div class='ctx'> </div><div class='hunk'>@@ -1125,8 +1218,8 @@ void ath11k_hal_srng_shadow_update_hp_tp(struct ath11k_base *ab,</div><div class='ctx'> {</div><div class='ctx'> 	lockdep_assert_held(&amp;srng-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	/* check whether the ring is emptry. Update the shadow</div><div class='del'>-	 * HP only when then ring isn't' empty.</div><div class='add'>+	/* check whether the ring is empty. Update the shadow</div><div class='add'>+	 * HP only when then ring isn't empty.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (srng-&gt;ring_dir == HAL_SRNG_DIR_SRC &amp;&amp;</div><div class='ctx'> 	    *srng-&gt;u.src_ring.tp_addr != srng-&gt;u.src_ring.hp)</div><div class='hunk'>@@ -1155,12 +1248,12 @@ static int ath11k_hal_srng_create_config(struct ath11k_base *ab)</div><div class='ctx'> 	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO_TCL_RING_HP(ab);</div><div class='ctx'> </div><div class='ctx'> 	s = &amp;hal-&gt;srng_config[HAL_REO_REINJECT];</div><div class='del'>-	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_SW2REO_RING_BASE_LSB;</div><div class='del'>-	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_SW2REO_RING_HP;</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_SW2REO_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_SW2REO_RING_HP(ab);</div><div class='ctx'> </div><div class='ctx'> 	s = &amp;hal-&gt;srng_config[HAL_REO_CMD];</div><div class='del'>-	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO_CMD_RING_BASE_LSB;</div><div class='del'>-	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO_CMD_HP;</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO_CMD_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO_CMD_HP(ab);</div><div class='ctx'> </div><div class='ctx'> 	s = &amp;hal-&gt;srng_config[HAL_REO_STATUS];</div><div class='ctx'> 	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO_STATUS_RING_BASE_LSB(ab);</div><div class='hunk'>@@ -1181,16 +1274,20 @@ static int ath11k_hal_srng_create_config(struct ath11k_base *ab)</div><div class='ctx'> 	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL_STATUS_RING_HP;</div><div class='ctx'> </div><div class='ctx'> 	s = &amp;hal-&gt;srng_config[HAL_CE_SRC];</div><div class='del'>-	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab) + HAL_CE_DST_RING_BASE_LSB;</div><div class='del'>-	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab) + HAL_CE_DST_RING_HP;</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab) + HAL_CE_DST_RING_BASE_LSB +</div><div class='add'>+		ATH11K_CE_OFFSET(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab) + HAL_CE_DST_RING_HP +</div><div class='add'>+		ATH11K_CE_OFFSET(ab);</div><div class='ctx'> 	s-&gt;reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_SRC_REG(ab) -</div><div class='ctx'> 		HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab);</div><div class='ctx'> 	s-&gt;reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_SRC_REG(ab) -</div><div class='ctx'> 		HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab);</div><div class='ctx'> </div><div class='ctx'> 	s = &amp;hal-&gt;srng_config[HAL_CE_DST];</div><div class='del'>-	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_RING_BASE_LSB;</div><div class='del'>-	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_RING_HP;</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_RING_BASE_LSB +</div><div class='add'>+		ATH11K_CE_OFFSET(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_RING_HP +</div><div class='add'>+		ATH11K_CE_OFFSET(ab);</div><div class='ctx'> 	s-&gt;reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) -</div><div class='ctx'> 		HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab);</div><div class='ctx'> 	s-&gt;reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) -</div><div class='hunk'>@@ -1198,8 +1295,9 @@ static int ath11k_hal_srng_create_config(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> 	s = &amp;hal-&gt;srng_config[HAL_CE_DST_STATUS];</div><div class='ctx'> 	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) +</div><div class='del'>-		HAL_CE_DST_STATUS_RING_BASE_LSB;</div><div class='del'>-	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_STATUS_RING_HP;</div><div class='add'>+		HAL_CE_DST_STATUS_RING_BASE_LSB + ATH11K_CE_OFFSET(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_STATUS_RING_HP +</div><div class='add'>+		ATH11K_CE_OFFSET(ab);</div><div class='ctx'> 	s-&gt;reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) -</div><div class='ctx'> 		HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab);</div><div class='ctx'> 	s-&gt;reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) -</div><div class='hunk'>@@ -1223,6 +1321,24 @@ static int ath11k_hal_srng_create_config(struct ath11k_base *ab)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ath11k_hal_register_srng_key(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_hal *hal = &amp;ab-&gt;hal;</div><div class='add'>+	u32 ring_id;</div><div class='add'>+</div><div class='add'>+	for (ring_id = 0; ring_id &lt; HAL_SRNG_RING_ID_MAX; ring_id++)</div><div class='add'>+		lockdep_register_key(hal-&gt;srng_key + ring_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_hal_unregister_srng_key(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_hal *hal = &amp;ab-&gt;hal;</div><div class='add'>+	u32 ring_id;</div><div class='add'>+</div><div class='add'>+	for (ring_id = 0; ring_id &lt; HAL_SRNG_RING_ID_MAX; ring_id++)</div><div class='add'>+		lockdep_unregister_key(hal-&gt;srng_key + ring_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int ath11k_hal_srng_init(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_hal *hal = &amp;ab-&gt;hal;</div><div class='hunk'>@@ -1242,6 +1358,8 @@ int ath11k_hal_srng_init(struct ath11k_base *ab)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_free_cont_rdp;</div><div class='ctx'> </div><div class='add'>+	ath11k_hal_register_srng_key(ab);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_free_cont_rdp:</div><div class='hunk'>@@ -1255,13 +1373,35 @@ EXPORT_SYMBOL(ath11k_hal_srng_init);</div><div class='ctx'> void ath11k_hal_srng_deinit(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_hal *hal = &amp;ab-&gt;hal;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HAL_SRNG_RING_ID_MAX; i++)</div><div class='add'>+		ab-&gt;hal.srng_list[i].initialized = 0;</div><div class='ctx'> </div><div class='add'>+	ath11k_hal_unregister_srng_key(ab);</div><div class='ctx'> 	ath11k_hal_free_cont_rdp(ab);</div><div class='ctx'> 	ath11k_hal_free_cont_wrp(ab);</div><div class='ctx'> 	kfree(hal-&gt;srng_config);</div><div class='add'>+	hal-&gt;srng_config = NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ath11k_hal_srng_deinit);</div><div class='ctx'> </div><div class='add'>+void ath11k_hal_srng_clear(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	/* No need to memset rdp and wrp memory since each individual</div><div class='add'>+	 * segment would get cleared in ath11k_hal_srng_src_hw_init()</div><div class='add'>+	 * and ath11k_hal_srng_dst_hw_init().</div><div class='add'>+	 */</div><div class='add'>+	memset(ab-&gt;hal.srng_list, 0,</div><div class='add'>+	       sizeof(ab-&gt;hal.srng_list));</div><div class='add'>+	memset(ab-&gt;hal.shadow_reg_addr, 0,</div><div class='add'>+	       sizeof(ab-&gt;hal.shadow_reg_addr));</div><div class='add'>+	ab-&gt;hal.avail_blk_resource = 0;</div><div class='add'>+	ab-&gt;hal.current_blk_index = 0;</div><div class='add'>+	ab-&gt;hal.num_shadow_reg_configured = 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_hal_srng_clear);</div><div class='add'>+</div><div class='ctx'> void ath11k_hal_dump_srng_stats(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	struct hal_srng *srng;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/hal.h b/drivers/net/wireless/ath/ath11k/hal.h<br/>index 91d1428b8b94..82603a389bb9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/hal.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/hal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/hal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/hal.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef ATH11K_HAL_H</div><div class='hunk'>@@ -31,25 +32,25 @@ struct ath11k_base;</div><div class='ctx'> #define HAL_DSCP_TID_TBL_SIZE			24</div><div class='ctx'> </div><div class='ctx'> /* calculate the register address from bar0 of shadow register x */</div><div class='del'>-#define HAL_SHADOW_BASE_ADDR			0x000008fc</div><div class='add'>+#define HAL_SHADOW_BASE_ADDR(ab)		ab-&gt;hw_params.regs-&gt;hal_shadow_base_addr</div><div class='ctx'> #define HAL_SHADOW_NUM_REGS			36</div><div class='ctx'> #define HAL_HP_OFFSET_IN_REG_START		1</div><div class='ctx'> #define HAL_OFFSET_FROM_HP_TO_TP		4</div><div class='ctx'> </div><div class='del'>-#define HAL_SHADOW_REG(x) (HAL_SHADOW_BASE_ADDR + (4 * (x)))</div><div class='add'>+#define HAL_SHADOW_REG(ab, x) (HAL_SHADOW_BASE_ADDR(ab) + (4 * (x)))</div><div class='ctx'> </div><div class='ctx'> /* WCSS Relative address */</div><div class='ctx'> #define HAL_SEQ_WCSS_UMAC_OFFSET		0x00a00000</div><div class='ctx'> #define HAL_SEQ_WCSS_UMAC_REO_REG		0x00a38000</div><div class='ctx'> #define HAL_SEQ_WCSS_UMAC_TCL_REG		0x00a44000</div><div class='del'>-#define HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(x) \</div><div class='del'>-		(ab-&gt;hw_params.regs-&gt;hal_seq_wcss_umac_ce0_src_reg)</div><div class='del'>-#define HAL_SEQ_WCSS_UMAC_CE0_DST_REG(x) \</div><div class='del'>-		(ab-&gt;hw_params.regs-&gt;hal_seq_wcss_umac_ce0_dst_reg)</div><div class='del'>-#define HAL_SEQ_WCSS_UMAC_CE1_SRC_REG(x) \</div><div class='del'>-		(ab-&gt;hw_params.regs-&gt;hal_seq_wcss_umac_ce1_src_reg)</div><div class='del'>-#define HAL_SEQ_WCSS_UMAC_CE1_DST_REG(x) \</div><div class='del'>-		(ab-&gt;hw_params.regs-&gt;hal_seq_wcss_umac_ce1_dst_reg)</div><div class='add'>+#define HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab) \</div><div class='add'>+		((ab)-&gt;hw_params.regs-&gt;hal_seq_wcss_umac_ce0_src_reg)</div><div class='add'>+#define HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) \</div><div class='add'>+		((ab)-&gt;hw_params.regs-&gt;hal_seq_wcss_umac_ce0_dst_reg)</div><div class='add'>+#define HAL_SEQ_WCSS_UMAC_CE1_SRC_REG(ab) \</div><div class='add'>+		((ab)-&gt;hw_params.regs-&gt;hal_seq_wcss_umac_ce1_src_reg)</div><div class='add'>+#define HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) \</div><div class='add'>+		((ab)-&gt;hw_params.regs-&gt;hal_seq_wcss_umac_ce1_dst_reg)</div><div class='ctx'> #define HAL_SEQ_WCSS_UMAC_WBM_REG		0x00a34000</div><div class='ctx'> </div><div class='ctx'> #define HAL_CE_WFSS_CE_REG_BASE			0x01b80000</div><div class='hunk'>@@ -120,6 +121,7 @@ struct ath11k_base;</div><div class='ctx'> #define HAL_REO1_DEST_RING_CTRL_IX_1		0x00000008</div><div class='ctx'> #define HAL_REO1_DEST_RING_CTRL_IX_2		0x0000000c</div><div class='ctx'> #define HAL_REO1_DEST_RING_CTRL_IX_3		0x00000010</div><div class='add'>+#define HAL_REO1_MISC_CTL(ab)			ab-&gt;hw_params.regs-&gt;hal_reo1_misc_ctl</div><div class='ctx'> #define HAL_REO1_RING_BASE_LSB(ab)		ab-&gt;hw_params.regs-&gt;hal_reo1_ring_base_lsb</div><div class='ctx'> #define HAL_REO1_RING_BASE_MSB(ab)		ab-&gt;hw_params.regs-&gt;hal_reo1_ring_base_msb</div><div class='ctx'> #define HAL_REO1_RING_ID(ab)			ab-&gt;hw_params.regs-&gt;hal_reo1_ring_id</div><div class='hunk'>@@ -179,16 +181,18 @@ struct ath11k_base;</div><div class='ctx'> #define HAL_REO_TCL_RING_HP(ab)			ab-&gt;hw_params.regs-&gt;hal_reo_tcl_ring_hp</div><div class='ctx'> </div><div class='ctx'> /* REO CMD R0 address */</div><div class='del'>-#define HAL_REO_CMD_RING_BASE_LSB		0x00000194</div><div class='add'>+#define HAL_REO_CMD_RING_BASE_LSB(ab) \</div><div class='add'>+	ab-&gt;hw_params.regs-&gt;hal_reo_cmd_ring_base_lsb</div><div class='ctx'> </div><div class='ctx'> /* REO CMD R2 address */</div><div class='del'>-#define HAL_REO_CMD_HP				0x00003020</div><div class='add'>+#define HAL_REO_CMD_HP(ab)			ab-&gt;hw_params.regs-&gt;hal_reo_cmd_ring_hp</div><div class='ctx'> </div><div class='ctx'> /* SW2REO R0 address */</div><div class='del'>-#define HAL_SW2REO_RING_BASE_LSB		0x000001ec</div><div class='add'>+#define HAL_SW2REO_RING_BASE_LSB(ab) \</div><div class='add'>+	ab-&gt;hw_params.regs-&gt;hal_sw2reo_ring_base_lsb</div><div class='ctx'> </div><div class='ctx'> /* SW2REO R2 address */</div><div class='del'>-#define HAL_SW2REO_RING_HP			0x00003028</div><div class='add'>+#define HAL_SW2REO_RING_HP(ab)			ab-&gt;hw_params.regs-&gt;hal_sw2reo_ring_hp</div><div class='ctx'> </div><div class='ctx'> /* CE ring R0 address */</div><div class='ctx'> #define HAL_CE_DST_RING_BASE_LSB		0x00000000</div><div class='hunk'>@@ -205,10 +209,10 @@ struct ath11k_base;</div><div class='ctx'> #define HAL_REO_STATUS_HP(ab)			ab-&gt;hw_params.regs-&gt;hal_reo_status_hp</div><div class='ctx'> </div><div class='ctx'> /* WBM Idle R0 address */</div><div class='del'>-#define HAL_WBM_IDLE_LINK_RING_BASE_LSB(x) \</div><div class='del'>-		(ab-&gt;hw_params.regs-&gt;hal_wbm_idle_link_ring_base_lsb)</div><div class='del'>-#define HAL_WBM_IDLE_LINK_RING_MISC_ADDR(x) \</div><div class='del'>-		(ab-&gt;hw_params.regs-&gt;hal_wbm_idle_link_ring_misc)</div><div class='add'>+#define HAL_WBM_IDLE_LINK_RING_BASE_LSB(ab) \</div><div class='add'>+		((ab)-&gt;hw_params.regs-&gt;hal_wbm_idle_link_ring_base_lsb)</div><div class='add'>+#define HAL_WBM_IDLE_LINK_RING_MISC_ADDR(ab) \</div><div class='add'>+		((ab)-&gt;hw_params.regs-&gt;hal_wbm_idle_link_ring_misc)</div><div class='ctx'> #define HAL_WBM_R0_IDLE_LIST_CONTROL_ADDR	0x00000048</div><div class='ctx'> #define HAL_WBM_R0_IDLE_LIST_SIZE_ADDR		0x0000004c</div><div class='ctx'> #define HAL_WBM_SCATTERED_RING_BASE_LSB		0x00000058</div><div class='hunk'>@@ -223,23 +227,23 @@ struct ath11k_base;</div><div class='ctx'> #define HAL_WBM_IDLE_LINK_RING_HP		0x000030b0</div><div class='ctx'> </div><div class='ctx'> /* SW2WBM R0 release address */</div><div class='del'>-#define HAL_WBM_RELEASE_RING_BASE_LSB(x) \</div><div class='del'>-		(ab-&gt;hw_params.regs-&gt;hal_wbm_release_ring_base_lsb)</div><div class='add'>+#define HAL_WBM_RELEASE_RING_BASE_LSB(ab) \</div><div class='add'>+		((ab)-&gt;hw_params.regs-&gt;hal_wbm_release_ring_base_lsb)</div><div class='ctx'> </div><div class='ctx'> /* SW2WBM R2 release address */</div><div class='ctx'> #define HAL_WBM_RELEASE_RING_HP			0x00003018</div><div class='ctx'> </div><div class='ctx'> /* WBM2SW R0 release address */</div><div class='del'>-#define HAL_WBM0_RELEASE_RING_BASE_LSB(x) \</div><div class='del'>-		(ab-&gt;hw_params.regs-&gt;hal_wbm0_release_ring_base_lsb)</div><div class='del'>-#define HAL_WBM1_RELEASE_RING_BASE_LSB(x) \</div><div class='del'>-		(ab-&gt;hw_params.regs-&gt;hal_wbm1_release_ring_base_lsb)</div><div class='add'>+#define HAL_WBM0_RELEASE_RING_BASE_LSB(ab) \</div><div class='add'>+		((ab)-&gt;hw_params.regs-&gt;hal_wbm0_release_ring_base_lsb)</div><div class='add'>+#define HAL_WBM1_RELEASE_RING_BASE_LSB(ab) \</div><div class='add'>+		((ab)-&gt;hw_params.regs-&gt;hal_wbm1_release_ring_base_lsb)</div><div class='ctx'> </div><div class='ctx'> /* WBM2SW R2 release address */</div><div class='ctx'> #define HAL_WBM0_RELEASE_RING_HP		0x000030c0</div><div class='ctx'> #define HAL_WBM1_RELEASE_RING_HP		0x000030c8</div><div class='ctx'> </div><div class='del'>-/* TCL ring feild mask and offset */</div><div class='add'>+/* TCL ring field mask and offset */</div><div class='ctx'> #define HAL_TCL1_RING_BASE_MSB_RING_SIZE		GENMASK(27, 8)</div><div class='ctx'> #define HAL_TCL1_RING_BASE_MSB_RING_BASE_ADDR_MSB	GENMASK(7, 0)</div><div class='ctx'> #define HAL_TCL1_RING_ID_ENTRY_SIZE			GENMASK(7, 0)</div><div class='hunk'>@@ -264,7 +268,7 @@ struct ath11k_base;</div><div class='ctx'> #define HAL_TCL1_RING_FIELD_DSCP_TID_MAP6		GENMASK(20, 18)</div><div class='ctx'> #define HAL_TCL1_RING_FIELD_DSCP_TID_MAP7		GENMASK(23, 21)</div><div class='ctx'> </div><div class='del'>-/* REO ring feild mask and offset */</div><div class='add'>+/* REO ring field mask and offset */</div><div class='ctx'> #define HAL_REO1_RING_BASE_MSB_RING_SIZE		GENMASK(27, 8)</div><div class='ctx'> #define HAL_REO1_RING_BASE_MSB_RING_BASE_ADDR_MSB	GENMASK(7, 0)</div><div class='ctx'> #define HAL_REO1_RING_ID_RING_ID			GENMASK(15, 8)</div><div class='hunk'>@@ -280,6 +284,7 @@ struct ath11k_base;</div><div class='ctx'> #define HAL_REO1_GEN_ENABLE_FRAG_DST_RING		GENMASK(25, 23)</div><div class='ctx'> #define HAL_REO1_GEN_ENABLE_AGING_LIST_ENABLE		BIT(2)</div><div class='ctx'> #define HAL_REO1_GEN_ENABLE_AGING_FLUSH_ENABLE		BIT(3)</div><div class='add'>+#define HAL_REO1_MISC_CTL_FRAGMENT_DST_RING		GENMASK(20, 17)</div><div class='ctx'> </div><div class='ctx'> /* CE ring bit field mask and shift */</div><div class='ctx'> #define HAL_CE_DST_R0_DEST_CTRL_MAX_LEN			GENMASK(15, 0)</div><div class='hunk'>@@ -316,6 +321,10 @@ struct ath11k_base;</div><div class='ctx'> #define HAL_WBM2SW_RELEASE_RING_BASE_MSB_RING_SIZE	0x000fffff</div><div class='ctx'> #define HAL_RXDMA_RING_MAX_SIZE				0x0000ffff</div><div class='ctx'> </div><div class='add'>+/* IPQ5018 ce registers */</div><div class='add'>+#define HAL_IPQ5018_CE_WFSS_REG_BASE		0x08400000</div><div class='add'>+#define HAL_IPQ5018_CE_SIZE			0x200000</div><div class='add'>+</div><div class='ctx'> /* Add any other errors here and return them in</div><div class='ctx'>  * ath11k_hal_rx_desc_get_err().</div><div class='ctx'>  */</div><div class='hunk'>@@ -384,6 +393,7 @@ enum hal_srng_ring_id {</div><div class='ctx'> 	HAL_SRNG_RING_ID_WBM2SW1_RELEASE,</div><div class='ctx'> 	HAL_SRNG_RING_ID_WBM2SW2_RELEASE,</div><div class='ctx'> 	HAL_SRNG_RING_ID_WBM2SW3_RELEASE,</div><div class='add'>+	HAL_SRNG_RING_ID_WBM2SW4_RELEASE,</div><div class='ctx'> </div><div class='ctx'> 	HAL_SRNG_RING_ID_UMAC_ID_END = 127,</div><div class='ctx'> 	HAL_SRNG_RING_ID_LMAC1_ID_START,</div><div class='hunk'>@@ -445,13 +455,13 @@ enum hal_ring_type {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum hal_reo_cmd_type: Enum for REO command type</div><div class='del'>- * @CMD_GET_QUEUE_STATS: Get REO queue status/stats</div><div class='del'>- * @CMD_FLUSH_QUEUE: Flush all frames in REO queue</div><div class='del'>- * @CMD_FLUSH_CACHE: Flush descriptor entries in the cache</div><div class='del'>- * @CMD_UNBLOCK_CACHE: Unblock a descriptor's address that was blocked</div><div class='add'>+ * @HAL_REO_CMD_GET_QUEUE_STATS: Get REO queue status/stats</div><div class='add'>+ * @HAL_REO_CMD_FLUSH_QUEUE: Flush all frames in REO queue</div><div class='add'>+ * @HAL_REO_CMD_FLUSH_CACHE: Flush descriptor entries in the cache</div><div class='add'>+ * @HAL_REO_CMD_UNBLOCK_CACHE: Unblock a descriptor's address that was blocked</div><div class='ctx'>  *      earlier with a 'REO_FLUSH_CACHE' command</div><div class='del'>- * @CMD_FLUSH_TIMEOUT_LIST: Flush buffers/descriptors from timeout list</div><div class='del'>- * @CMD_UPDATE_RX_REO_QUEUE: Update REO queue settings</div><div class='add'>+ * @HAL_REO_CMD_FLUSH_TIMEOUT_LIST: Flush buffers/descriptors from timeout list</div><div class='add'>+ * @HAL_REO_CMD_UPDATE_RX_QUEUE: Update REO queue settings</div><div class='ctx'>  */</div><div class='ctx'> enum hal_reo_cmd_type {</div><div class='ctx'> 	HAL_REO_CMD_GET_QUEUE_STATS     = 0,</div><div class='hunk'>@@ -511,7 +521,9 @@ enum hal_srng_dir {</div><div class='ctx'> #define HAL_SRNG_FLAGS_DATA_TLV_SWAP		0x00000020</div><div class='ctx'> #define HAL_SRNG_FLAGS_LOW_THRESH_INTR_EN	0x00010000</div><div class='ctx'> #define HAL_SRNG_FLAGS_MSI_INTR			0x00020000</div><div class='add'>+#define HAL_SRNG_FLAGS_CACHED                   0x20000000</div><div class='ctx'> #define HAL_SRNG_FLAGS_LMAC_RING		0x80000000</div><div class='add'>+#define HAL_SRNG_FLAGS_REMAP_CE_RING        0x10000000</div><div class='ctx'> </div><div class='ctx'> #define HAL_SRNG_TLV_HDR_TAG		GENMASK(9, 1)</div><div class='ctx'> #define HAL_SRNG_TLV_HDR_LEN		GENMASK(25, 10)</div><div class='hunk'>@@ -629,7 +641,7 @@ struct hal_srng {</div><div class='ctx'> 	} u;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Interrupt mitigation - Batch threshold in terms of numer of frames */</div><div class='add'>+/* Interrupt mitigation - Batch threshold in terms of number of frames */</div><div class='ctx'> #define HAL_SRNG_INT_BATCH_THRESHOLD_TX 256</div><div class='ctx'> #define HAL_SRNG_INT_BATCH_THRESHOLD_RX 128</div><div class='ctx'> #define HAL_SRNG_INT_BATCH_THRESHOLD_OTHER 1</div><div class='hunk'>@@ -652,7 +664,7 @@ struct hal_srng_config {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum hal_rx_buf_return_buf_manager</div><div class='add'>+ * enum hal_rx_buf_return_buf_manager - manager for returned rx buffers</div><div class='ctx'>  *</div><div class='ctx'>  * @HAL_RX_BUF_RBM_WBM_IDLE_BUF_LIST: Buffer returned to WBM idle buffer list</div><div class='ctx'>  * @HAL_RX_BUF_RBM_WBM_IDLE_DESC_LIST: Descriptor returned to WBM idle</div><div class='hunk'>@@ -662,6 +674,7 @@ struct hal_srng_config {</div><div class='ctx'>  * @HAL_RX_BUF_RBM_SW1_BM: For Tx completion -- returned to host</div><div class='ctx'>  * @HAL_RX_BUF_RBM_SW2_BM: For Tx completion -- returned to host</div><div class='ctx'>  * @HAL_RX_BUF_RBM_SW3_BM: For Rx release -- returned to host</div><div class='add'>+ * @HAL_RX_BUF_RBM_SW4_BM: For Tx completion -- returned to host</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> enum hal_rx_buf_return_buf_manager {</div><div class='hunk'>@@ -672,6 +685,7 @@ enum hal_rx_buf_return_buf_manager {</div><div class='ctx'> 	HAL_RX_BUF_RBM_SW1_BM,</div><div class='ctx'> 	HAL_RX_BUF_RBM_SW2_BM,</div><div class='ctx'> 	HAL_RX_BUF_RBM_SW3_BM,</div><div class='add'>+	HAL_RX_BUF_RBM_SW4_BM,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define HAL_SRNG_DESC_LOOP_CNT		0xf0000000</div><div class='hunk'>@@ -686,7 +700,7 @@ enum hal_rx_buf_return_buf_manager {</div><div class='ctx'> #define HAL_REO_CMD_FLG_UNBLK_RESOURCE		BIT(7)</div><div class='ctx'> #define HAL_REO_CMD_FLG_UNBLK_CACHE		BIT(8)</div><div class='ctx'> </div><div class='del'>-/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO0_UPD_* feilds */</div><div class='add'>+/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO0_UPD_* fields */</div><div class='ctx'> #define HAL_REO_CMD_UPD0_RX_QUEUE_NUM		BIT(8)</div><div class='ctx'> #define HAL_REO_CMD_UPD0_VLD			BIT(9)</div><div class='ctx'> #define HAL_REO_CMD_UPD0_ALDC			BIT(10)</div><div class='hunk'>@@ -711,7 +725,7 @@ enum hal_rx_buf_return_buf_manager {</div><div class='ctx'> #define HAL_REO_CMD_UPD0_PN_VALID		BIT(29)</div><div class='ctx'> #define HAL_REO_CMD_UPD0_PN			BIT(30)</div><div class='ctx'> </div><div class='del'>-/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO1_* feilds */</div><div class='add'>+/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO1_* fields */</div><div class='ctx'> #define HAL_REO_CMD_UPD1_VLD			BIT(16)</div><div class='ctx'> #define HAL_REO_CMD_UPD1_ALDC			GENMASK(18, 17)</div><div class='ctx'> #define HAL_REO_CMD_UPD1_DIS_DUP_DETECTION	BIT(19)</div><div class='hunk'>@@ -727,7 +741,7 @@ enum hal_rx_buf_return_buf_manager {</div><div class='ctx'> #define HAL_REO_CMD_UPD1_PN_HANDLE_ENABLE	BIT(30)</div><div class='ctx'> #define HAL_REO_CMD_UPD1_IGNORE_AMPDU_FLG	BIT(31)</div><div class='ctx'> </div><div class='del'>-/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO2_* feilds */</div><div class='add'>+/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO2_* fields */</div><div class='ctx'> #define HAL_REO_CMD_UPD2_SVLD			BIT(10)</div><div class='ctx'> #define HAL_REO_CMD_UPD2_SSN			GENMASK(22, 11)</div><div class='ctx'> #define HAL_REO_CMD_UPD2_SEQ_2K_ERR		BIT(23)</div><div class='hunk'>@@ -867,8 +881,7 @@ struct hal_reo_status {</div><div class='ctx'> 	} u;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * HAL context to be used to access SRNG APIs (currently used by data path</div><div class='add'>+/* HAL context to be used to access SRNG APIs (currently used by data path</div><div class='ctx'>  * and transport (CE) modules)</div><div class='ctx'>  */</div><div class='ctx'> struct ath11k_hal {</div><div class='hunk'>@@ -899,6 +912,8 @@ struct ath11k_hal {</div><div class='ctx'> 	/* shadow register configuration */</div><div class='ctx'> 	u32 shadow_reg_addr[HAL_SHADOW_NUM_REGS];</div><div class='ctx'> 	int num_shadow_reg_configured;</div><div class='add'>+</div><div class='add'>+	struct lock_class_key srng_key[HAL_SRNG_RING_ID_MAX];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> u32 ath11k_hal_reo_qdesc_size(u32 ba_window_size, u8 tid);</div><div class='hunk'>@@ -906,7 +921,6 @@ void ath11k_hal_reo_qdesc_setup(void *vaddr, int tid, u32 ba_window_size,</div><div class='ctx'> 				u32 start_seq, enum hal_pn_type type);</div><div class='ctx'> void ath11k_hal_reo_init_cmd_ring(struct ath11k_base *ab,</div><div class='ctx'> 				  struct hal_srng *srng);</div><div class='del'>-void ath11k_hal_reo_hw_setup(struct ath11k_base *ab, u32 ring_hash_map);</div><div class='ctx'> void ath11k_hal_setup_link_idle_list(struct ath11k_base *ab,</div><div class='ctx'> 				     struct hal_wbm_idle_scatter_list *sbuf,</div><div class='ctx'> 				     u32 nsbufs, u32 tot_link_desc,</div><div class='hunk'>@@ -933,6 +947,8 @@ u32 *ath11k_hal_srng_dst_peek(struct ath11k_base *ab, struct hal_srng *srng);</div><div class='ctx'> int ath11k_hal_srng_dst_num_free(struct ath11k_base *ab, struct hal_srng *srng,</div><div class='ctx'> 				 bool sync_hw_ptr);</div><div class='ctx'> u32 *ath11k_hal_srng_src_peek(struct ath11k_base *ab, struct hal_srng *srng);</div><div class='add'>+u32 *ath11k_hal_srng_src_next_peek(struct ath11k_base *ab,</div><div class='add'>+				   struct hal_srng *srng);</div><div class='ctx'> u32 *ath11k_hal_srng_src_get_next_reaped(struct ath11k_base *ab,</div><div class='ctx'> 					 struct hal_srng *srng);</div><div class='ctx'> u32 *ath11k_hal_srng_src_reap_next(struct ath11k_base *ab,</div><div class='hunk'>@@ -949,6 +965,7 @@ int ath11k_hal_srng_setup(struct ath11k_base *ab, enum hal_ring_type type,</div><div class='ctx'> 			  struct hal_srng_params *params);</div><div class='ctx'> int ath11k_hal_srng_init(struct ath11k_base *ath11k);</div><div class='ctx'> void ath11k_hal_srng_deinit(struct ath11k_base *ath11k);</div><div class='add'>+void ath11k_hal_srng_clear(struct ath11k_base *ab);</div><div class='ctx'> void ath11k_hal_dump_srng_stats(struct ath11k_base *ab);</div><div class='ctx'> void ath11k_hal_srng_get_shadow_config(struct ath11k_base *ab,</div><div class='ctx'> 				       u32 **cfg, u32 *len);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/hal_desc.h b/drivers/net/wireless/ath/ath11k/hal_desc.h<br/>index d54ec6aa6281..b2fd180bd28e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/hal_desc.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/hal_desc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/hal_desc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/hal_desc.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> #include "core.h"</div><div class='ctx'> </div><div class='hunk'>@@ -474,6 +475,7 @@ enum hal_tlv_tag {</div><div class='ctx'> </div><div class='ctx'> #define HAL_TLV_HDR_TAG		GENMASK(9, 1)</div><div class='ctx'> #define HAL_TLV_HDR_LEN		GENMASK(25, 10)</div><div class='add'>+#define HAL_TLV_USR_ID		GENMASK(31, 26)</div><div class='ctx'> </div><div class='ctx'> #define HAL_TLV_ALIGN	4</div><div class='ctx'> </div><div class='hunk'>@@ -496,6 +498,8 @@ struct hal_tlv_hdr {</div><div class='ctx'> #define RX_MPDU_DESC_INFO0_DA_IDX_TIMEOUT	BIT(29)</div><div class='ctx'> #define RX_MPDU_DESC_INFO0_RAW_MPDU		BIT(30)</div><div class='ctx'> </div><div class='add'>+#define RX_MPDU_DESC_META_DATA_PEER_ID		GENMASK(15, 0)</div><div class='add'>+</div><div class='ctx'> struct rx_mpdu_desc {</div><div class='ctx'> 	u32 info0; /* %RX_MPDU_DESC_INFO */</div><div class='ctx'> 	u32 meta_data;</div><div class='hunk'>@@ -604,7 +608,7 @@ struct rx_msdu_desc {</div><div class='ctx'>  *</div><div class='ctx'>  * msdu_continuation</div><div class='ctx'>  *		When set, this MSDU buffer was not able to hold the entire MSDU.</div><div class='del'>- *		The next buffer will therefor contain additional information</div><div class='add'>+ *		The next buffer will therefore contain additional information</div><div class='ctx'>  *		related to this MSDU.</div><div class='ctx'>  *</div><div class='ctx'>  * msdu_length</div><div class='hunk'>@@ -640,7 +644,7 @@ struct rx_msdu_desc {</div><div class='ctx'>  *</div><div class='ctx'>  * da_idx_timeout</div><div class='ctx'>  *		Indicates, an unsuccessful MAC destination address search due</div><div class='del'>- *		to the expiration of search timer fot this MSDU.</div><div class='add'>+ *		to the expiration of search timer for this MSDU.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> enum hal_reo_dest_ring_buffer_type {</div><div class='hunk'>@@ -856,6 +860,25 @@ struct hal_reo_entrance_ring {</div><div class='ctx'>  *		this ring has looped around the ring.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define HAL_SW_MON_RING_INFO0_RXDMA_PUSH_REASON	GENMASK(1, 0)</div><div class='add'>+#define HAL_SW_MON_RING_INFO0_RXDMA_ERROR_CODE	GENMASK(6, 2)</div><div class='add'>+#define HAL_SW_MON_RING_INFO0_MPDU_FRAG_NUMBER	GENMASK(10, 7)</div><div class='add'>+#define HAL_SW_MON_RING_INFO0_FRAMELESS_BAR	BIT(11)</div><div class='add'>+#define HAL_SW_MON_RING_INFO0_STATUS_BUF_CNT	GENMASK(15, 12)</div><div class='add'>+#define HAL_SW_MON_RING_INFO0_END_OF_PPDU	BIT(16)</div><div class='add'>+</div><div class='add'>+#define HAL_SW_MON_RING_INFO1_PHY_PPDU_ID	GENMASK(15, 0)</div><div class='add'>+#define HAL_SW_MON_RING_INFO1_RING_ID		GENMASK(27, 20)</div><div class='add'>+#define HAL_SW_MON_RING_INFO1_LOOPING_COUNT	GENMASK(31, 28)</div><div class='add'>+</div><div class='add'>+struct hal_sw_monitor_ring {</div><div class='add'>+	struct ath11k_buffer_addr buf_addr_info;</div><div class='add'>+	struct rx_mpdu_desc rx_mpdu_info;</div><div class='add'>+	struct ath11k_buffer_addr status_buf_addr_info;</div><div class='add'>+	u32 info0;</div><div class='add'>+	u32 info1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> #define HAL_REO_CMD_HDR_INFO0_CMD_NUMBER	GENMASK(15, 0)</div><div class='ctx'> #define HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED	BIT(16)</div><div class='ctx'> </div><div class='hunk'>@@ -1656,7 +1679,7 @@ struct hal_wbm_release_ring {</div><div class='ctx'>  *	Producer: SW/TQM/RXDMA/REO/SWITCH</div><div class='ctx'>  *	Consumer: WBM/SW/FW</div><div class='ctx'>  *</div><div class='del'>- * HTT tx status is overlayed on wbm_release ring on 4-byte words 2, 3, 4 and 5</div><div class='add'>+ * HTT tx status is overlaid on wbm_release ring on 4-byte words 2, 3, 4 and 5</div><div class='ctx'>  * for software based completions.</div><div class='ctx'>  *</div><div class='ctx'>  * buf_addr_info</div><div class='hunk'>@@ -2137,7 +2160,7 @@ struct hal_reo_status_hdr {</div><div class='ctx'>  *		commands.</div><div class='ctx'>  *</div><div class='ctx'>  * execution_time (in us)</div><div class='del'>- *		The amount of time REO took to excecute the command. Note that</div><div class='add'>+ *		The amount of time REO took to execute the command. Note that</div><div class='ctx'>  *		this time does not include the duration of the command waiting</div><div class='ctx'>  *		in the command ring, before the execution started.</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/hal_rx.c b/drivers/net/wireless/ath/ath11k/hal_rx.c<br/>index fac2396edf32..753bd93f0212 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/hal_rx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/hal_rx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/hal_rx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/hal_rx.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "debug.h"</div><div class='hunk'>@@ -29,8 +30,7 @@ static int ath11k_hal_reo_cmd_queue_stats(struct hal_tlv_hdr *tlv,</div><div class='ctx'> 		  FIELD_PREP(HAL_TLV_HDR_LEN, sizeof(*desc));</div><div class='ctx'> </div><div class='ctx'> 	desc = (struct hal_reo_get_queue_stats *)tlv-&gt;value;</div><div class='del'>-	memset(&amp;desc-&gt;queue_addr_lo, 0,</div><div class='del'>-	       (sizeof(*desc) - sizeof(struct hal_reo_cmd_hdr)));</div><div class='add'>+	memset_startat(desc, 0, queue_addr_lo);</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;cmd.info0 &amp;= ~HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED;</div><div class='ctx'> 	if (cmd-&gt;flag &amp; HAL_REO_CMD_FLG_NEED_STATUS)</div><div class='hunk'>@@ -62,8 +62,7 @@ static int ath11k_hal_reo_cmd_flush_cache(struct ath11k_hal *hal, struct hal_tlv</div><div class='ctx'> 		  FIELD_PREP(HAL_TLV_HDR_LEN, sizeof(*desc));</div><div class='ctx'> </div><div class='ctx'> 	desc = (struct hal_reo_flush_cache *)tlv-&gt;value;</div><div class='del'>-	memset(&amp;desc-&gt;cache_addr_lo, 0,</div><div class='del'>-	       (sizeof(*desc) - sizeof(struct hal_reo_cmd_hdr)));</div><div class='add'>+	memset_startat(desc, 0, cache_addr_lo);</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;cmd.info0 &amp;= ~HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED;</div><div class='ctx'> 	if (cmd-&gt;flag &amp; HAL_REO_CMD_FLG_NEED_STATUS)</div><div class='hunk'>@@ -101,8 +100,7 @@ static int ath11k_hal_reo_cmd_update_rx_queue(struct hal_tlv_hdr *tlv,</div><div class='ctx'> 		  FIELD_PREP(HAL_TLV_HDR_LEN, sizeof(*desc));</div><div class='ctx'> </div><div class='ctx'> 	desc = (struct hal_reo_update_rx_queue *)tlv-&gt;value;</div><div class='del'>-	memset(&amp;desc-&gt;queue_addr_lo, 0,</div><div class='del'>-	       (sizeof(*desc) - sizeof(struct hal_reo_cmd_hdr)));</div><div class='add'>+	memset_startat(desc, 0, queue_addr_lo);</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;cmd.info0 &amp;= ~HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED;</div><div class='ctx'> 	if (cmd-&gt;flag &amp; HAL_REO_CMD_FLG_NEED_STATUS)</div><div class='hunk'>@@ -248,7 +246,7 @@ int ath11k_hal_reo_cmd_send(struct ath11k_base *ab, struct hal_srng *srng,</div><div class='ctx'> 	case HAL_REO_CMD_UNBLOCK_CACHE:</div><div class='ctx'> 	case HAL_REO_CMD_FLUSH_TIMEOUT_LIST:</div><div class='ctx'> 		ath11k_warn(ab, "Unsupported reo command %d\n", type);</div><div class='del'>-		ret = -ENOTSUPP;</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ath11k_warn(ab, "Unknown reo command %d\n", type);</div><div class='hunk'>@@ -268,7 +266,7 @@ out:</div><div class='ctx'> void ath11k_hal_rx_buf_addr_info_set(void *desc, dma_addr_t paddr,</div><div class='ctx'> 				     u32 cookie, u8 manager)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_buffer_addr *binfo = (struct ath11k_buffer_addr *)desc;</div><div class='add'>+	struct ath11k_buffer_addr *binfo = desc;</div><div class='ctx'> 	u32 paddr_lo, paddr_hi;</div><div class='ctx'> </div><div class='ctx'> 	paddr_lo = lower_32_bits(paddr);</div><div class='hunk'>@@ -282,7 +280,7 @@ void ath11k_hal_rx_buf_addr_info_set(void *desc, dma_addr_t paddr,</div><div class='ctx'> void ath11k_hal_rx_buf_addr_info_get(void *desc, dma_addr_t *paddr,</div><div class='ctx'> 				     u32 *cookie, u8 *rbm)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_buffer_addr *binfo = (struct ath11k_buffer_addr *)desc;</div><div class='add'>+	struct ath11k_buffer_addr *binfo = desc;</div><div class='ctx'> </div><div class='ctx'> 	*paddr =</div><div class='ctx'> 		(((u64)FIELD_GET(BUFFER_ADDR_INFO1_ADDR, binfo-&gt;info1)) &lt;&lt; 32) |</div><div class='hunk'>@@ -295,7 +293,7 @@ void ath11k_hal_rx_msdu_link_info_get(void *link_desc, u32 *num_msdus,</div><div class='ctx'> 				      u32 *msdu_cookies,</div><div class='ctx'> 				      enum hal_rx_buf_return_buf_manager *rbm)</div><div class='ctx'> {</div><div class='del'>-	struct hal_rx_msdu_link *link = (struct hal_rx_msdu_link *)link_desc;</div><div class='add'>+	struct hal_rx_msdu_link *link = link_desc;</div><div class='ctx'> 	struct hal_rx_msdu_details *msdu;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -356,6 +354,7 @@ int ath11k_hal_wbm_desc_parse_err(struct ath11k_base *ab, void *desc,</div><div class='ctx'> 	struct hal_wbm_release_ring *wbm_desc = desc;</div><div class='ctx'> 	enum hal_wbm_rel_desc_type type;</div><div class='ctx'> 	enum hal_wbm_rel_src_module rel_src;</div><div class='add'>+	enum hal_rx_buf_return_buf_manager ret_buf_mgr;</div><div class='ctx'> </div><div class='ctx'> 	type = FIELD_GET(HAL_WBM_RELEASE_INFO0_DESC_TYPE,</div><div class='ctx'> 			 wbm_desc-&gt;info0);</div><div class='hunk'>@@ -371,8 +370,10 @@ int ath11k_hal_wbm_desc_parse_err(struct ath11k_base *ab, void *desc,</div><div class='ctx'> 	    rel_src != HAL_WBM_REL_SRC_MODULE_REO)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (FIELD_GET(BUFFER_ADDR_INFO1_RET_BUF_MGR,</div><div class='del'>-		      wbm_desc-&gt;buf_addr_info.info1) != HAL_RX_BUF_RBM_SW3_BM) {</div><div class='add'>+	ret_buf_mgr = FIELD_GET(BUFFER_ADDR_INFO1_RET_BUF_MGR,</div><div class='add'>+				wbm_desc-&gt;buf_addr_info.info1);</div><div class='add'>+	if (ret_buf_mgr != HAL_RX_BUF_RBM_SW1_BM &amp;&amp;</div><div class='add'>+	    ret_buf_mgr != HAL_RX_BUF_RBM_SW3_BM) {</div><div class='ctx'> 		ab-&gt;soc_stats.invalid_rbm++;</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -443,52 +444,54 @@ void ath11k_hal_reo_status_queue_stats(struct ath11k_base *ab, u32 *reo_desc,</div><div class='ctx'> 				FIELD_GET(HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS,</div><div class='ctx'> 					  desc-&gt;hdr.info0);</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11k_DBG_HAL, "Queue stats status:\n");</div><div class='del'>-	ath11k_dbg(ab, ATH11k_DBG_HAL, "header: cmd_num %d status %d\n",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_HAL, "Queue stats status:\n");</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_HAL, "header: cmd_num %d status %d\n",</div><div class='ctx'> 		   status-&gt;uniform_hdr.cmd_num,</div><div class='ctx'> 		   status-&gt;uniform_hdr.cmd_status);</div><div class='del'>-	ath11k_dbg(ab, ATH11k_DBG_HAL, "ssn %ld cur_idx %ld\n",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_HAL, "ssn %ld cur_idx %ld\n",</div><div class='ctx'> 		   FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO0_SSN,</div><div class='ctx'> 			     desc-&gt;info0),</div><div class='ctx'> 		   FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO0_CUR_IDX,</div><div class='ctx'> 			     desc-&gt;info0));</div><div class='del'>-	ath11k_dbg(ab, ATH11k_DBG_HAL, "pn = [%08x, %08x, %08x, %08x]\n",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_HAL, "pn = [%08x, %08x, %08x, %08x]\n",</div><div class='ctx'> 		   desc-&gt;pn[0], desc-&gt;pn[1], desc-&gt;pn[2], desc-&gt;pn[3]);</div><div class='del'>-	ath11k_dbg(ab, ATH11k_DBG_HAL, "last_rx: enqueue_tstamp %08x dequeue_tstamp %08x\n",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_HAL,</div><div class='add'>+		   "last_rx: enqueue_tstamp %08x dequeue_tstamp %08x\n",</div><div class='ctx'> 		   desc-&gt;last_rx_enqueue_timestamp,</div><div class='ctx'> 		   desc-&gt;last_rx_dequeue_timestamp);</div><div class='del'>-	ath11k_dbg(ab, ATH11k_DBG_HAL, "rx_bitmap [%08x %08x %08x %08x %08x %08x %08x %08x]\n",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_HAL,</div><div class='add'>+		   "rx_bitmap [%08x %08x %08x %08x %08x %08x %08x %08x]\n",</div><div class='ctx'> 		   desc-&gt;rx_bitmap[0], desc-&gt;rx_bitmap[1], desc-&gt;rx_bitmap[2],</div><div class='ctx'> 		   desc-&gt;rx_bitmap[3], desc-&gt;rx_bitmap[4], desc-&gt;rx_bitmap[5],</div><div class='ctx'> 		   desc-&gt;rx_bitmap[6], desc-&gt;rx_bitmap[7]);</div><div class='del'>-	ath11k_dbg(ab, ATH11k_DBG_HAL, "count: cur_mpdu %ld cur_msdu %ld\n",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_HAL, "count: cur_mpdu %ld cur_msdu %ld\n",</div><div class='ctx'> 		   FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO1_MPDU_COUNT,</div><div class='ctx'> 			     desc-&gt;info1),</div><div class='ctx'> 		   FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO1_MSDU_COUNT,</div><div class='ctx'> 			     desc-&gt;info1));</div><div class='del'>-	ath11k_dbg(ab, ATH11k_DBG_HAL, "fwd_timeout %ld fwd_bar %ld dup_count %ld\n",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_HAL, "fwd_timeout %ld fwd_bar %ld dup_count %ld\n",</div><div class='ctx'> 		   FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO2_TIMEOUT_COUNT,</div><div class='ctx'> 			     desc-&gt;info2),</div><div class='ctx'> 		   FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO2_FDTB_COUNT,</div><div class='ctx'> 			     desc-&gt;info2),</div><div class='ctx'> 		   FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO2_DUPLICATE_COUNT,</div><div class='ctx'> 			     desc-&gt;info2));</div><div class='del'>-	ath11k_dbg(ab, ATH11k_DBG_HAL, "frames_in_order %ld bar_rcvd %ld\n",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_HAL, "frames_in_order %ld bar_rcvd %ld\n",</div><div class='ctx'> 		   FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO3_FIO_COUNT,</div><div class='ctx'> 			     desc-&gt;info3),</div><div class='ctx'> 		   FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO3_BAR_RCVD_CNT,</div><div class='ctx'> 			     desc-&gt;info3));</div><div class='del'>-	ath11k_dbg(ab, ATH11k_DBG_HAL, "num_mpdus %d num_msdus %d total_bytes %d\n",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_HAL, "num_mpdus %d num_msdus %d total_bytes %d\n",</div><div class='ctx'> 		   desc-&gt;num_mpdu_frames, desc-&gt;num_msdu_frames,</div><div class='ctx'> 		   desc-&gt;total_bytes);</div><div class='del'>-	ath11k_dbg(ab, ATH11k_DBG_HAL, "late_rcvd %ld win_jump_2k %ld hole_cnt %ld\n",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_HAL, "late_rcvd %ld win_jump_2k %ld hole_cnt %ld\n",</div><div class='ctx'> 		   FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO4_LATE_RX_MPDU,</div><div class='ctx'> 			     desc-&gt;info4),</div><div class='ctx'> 		   FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO4_WINDOW_JMP2K,</div><div class='ctx'> 			     desc-&gt;info4),</div><div class='ctx'> 		   FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO4_HOLE_COUNT,</div><div class='ctx'> 			     desc-&gt;info4));</div><div class='del'>-	ath11k_dbg(ab, ATH11k_DBG_HAL, "looping count %ld\n",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_HAL, "looping count %ld\n",</div><div class='ctx'> 		   FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO5_LOOPING_CNT,</div><div class='ctx'> 			     desc-&gt;info5));</div><div class='ctx'> }</div><div class='hunk'>@@ -698,7 +701,7 @@ u32 ath11k_hal_reo_qdesc_size(u32 ba_window_size, u8 tid)</div><div class='ctx'> void ath11k_hal_reo_qdesc_setup(void *vaddr, int tid, u32 ba_window_size,</div><div class='ctx'> 				u32 start_seq, enum hal_pn_type type)</div><div class='ctx'> {</div><div class='del'>-	struct hal_rx_reo_queue *qdesc = (struct hal_rx_reo_queue *)vaddr;</div><div class='add'>+	struct hal_rx_reo_queue *qdesc = vaddr;</div><div class='ctx'> 	struct hal_rx_reo_queue_ext *ext_desc;</div><div class='ctx'> </div><div class='ctx'> 	memset(qdesc, 0, sizeof(*qdesc));</div><div class='hunk'>@@ -756,21 +759,23 @@ void ath11k_hal_reo_qdesc_setup(void *vaddr, int tid, u32 ba_window_size,</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: HW queue descriptors are currently allocated for max BA</div><div class='ctx'> 	 * window size for all QOS TIDs so that same descriptor can be used</div><div class='del'>-	 * later when ADDBA request is recevied. This should be changed to</div><div class='add'>+	 * later when ADDBA request is received. This should be changed to</div><div class='ctx'> 	 * allocate HW queue descriptors based on BA window size being</div><div class='ctx'> 	 * negotiated (0 for non BA cases), and reallocate when BA window</div><div class='ctx'> 	 * size changes and also send WMI message to FW to change the REO</div><div class='ctx'> 	 * queue descriptor in Rx peer entry as part of dp_rx_tid_update.</div><div class='ctx'> 	 */</div><div class='del'>-	memset(ext_desc, 0, 3 * sizeof(*ext_desc));</div><div class='add'>+	memset(ext_desc, 0, sizeof(*ext_desc));</div><div class='ctx'> 	ath11k_hal_reo_set_desc_hdr(&amp;ext_desc-&gt;desc_hdr, HAL_DESC_REO_OWNED,</div><div class='ctx'> 				    HAL_DESC_REO_QUEUE_EXT_DESC,</div><div class='ctx'> 				    REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_1);</div><div class='ctx'> 	ext_desc++;</div><div class='add'>+	memset(ext_desc, 0, sizeof(*ext_desc));</div><div class='ctx'> 	ath11k_hal_reo_set_desc_hdr(&amp;ext_desc-&gt;desc_hdr, HAL_DESC_REO_OWNED,</div><div class='ctx'> 				    HAL_DESC_REO_QUEUE_EXT_DESC,</div><div class='ctx'> 				    REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_2);</div><div class='ctx'> 	ext_desc++;</div><div class='add'>+	memset(ext_desc, 0, sizeof(*ext_desc));</div><div class='ctx'> 	ath11k_hal_reo_set_desc_hdr(&amp;ext_desc-&gt;desc_hdr, HAL_DESC_REO_OWNED,</div><div class='ctx'> 				    HAL_DESC_REO_QUEUE_EXT_DESC,</div><div class='ctx'> 				    REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_3);</div><div class='hunk'>@@ -801,49 +806,79 @@ void ath11k_hal_reo_init_cmd_ring(struct ath11k_base *ab,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath11k_hal_reo_hw_setup(struct ath11k_base *ab, u32 ring_hash_map)</div><div class='add'>+#define HAL_MAX_UL_MU_USERS	37</div><div class='add'>+static inline void</div><div class='add'>+ath11k_hal_rx_handle_ofdma_info(void *rx_tlv,</div><div class='add'>+				struct hal_rx_user_status *rx_user_status)</div><div class='ctx'> {</div><div class='del'>-	u32 reo_base = HAL_SEQ_WCSS_UMAC_REO_REG;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	val = ath11k_hif_read32(ab, reo_base + HAL_REO1_GEN_ENABLE);</div><div class='del'>-</div><div class='del'>-	val &amp;= ~HAL_REO1_GEN_ENABLE_FRAG_DST_RING;</div><div class='del'>-	val |= FIELD_PREP(HAL_REO1_GEN_ENABLE_FRAG_DST_RING,</div><div class='del'>-			  HAL_SRNG_RING_ID_REO2SW1) |</div><div class='del'>-	       FIELD_PREP(HAL_REO1_GEN_ENABLE_AGING_LIST_ENABLE, 1) |</div><div class='del'>-	       FIELD_PREP(HAL_REO1_GEN_ENABLE_AGING_FLUSH_ENABLE, 1);</div><div class='del'>-	ath11k_hif_write32(ab, reo_base + HAL_REO1_GEN_ENABLE, val);</div><div class='del'>-</div><div class='del'>-	ath11k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_0(ab),</div><div class='del'>-			   HAL_DEFAULT_REO_TIMEOUT_USEC);</div><div class='del'>-	ath11k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_1(ab),</div><div class='del'>-			   HAL_DEFAULT_REO_TIMEOUT_USEC);</div><div class='del'>-	ath11k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_2(ab),</div><div class='del'>-			   HAL_DEFAULT_REO_TIMEOUT_USEC);</div><div class='del'>-	ath11k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_3(ab),</div><div class='del'>-			   HAL_DEFAULT_REO_TIMEOUT_USEC);</div><div class='del'>-</div><div class='del'>-	ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_0,</div><div class='del'>-			   FIELD_PREP(HAL_REO_DEST_RING_CTRL_HASH_RING_MAP,</div><div class='del'>-				      ring_hash_map));</div><div class='del'>-	ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_1,</div><div class='del'>-			   FIELD_PREP(HAL_REO_DEST_RING_CTRL_HASH_RING_MAP,</div><div class='del'>-				      ring_hash_map));</div><div class='del'>-	ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_2,</div><div class='del'>-			   FIELD_PREP(HAL_REO_DEST_RING_CTRL_HASH_RING_MAP,</div><div class='del'>-				      ring_hash_map));</div><div class='del'>-	ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_3,</div><div class='del'>-			   FIELD_PREP(HAL_REO_DEST_RING_CTRL_HASH_RING_MAP,</div><div class='del'>-				      ring_hash_map));</div><div class='add'>+	struct hal_rx_ppdu_end_user_stats *ppdu_end_user = rx_tlv;</div><div class='add'>+</div><div class='add'>+	rx_user_status-&gt;ul_ofdma_user_v0_word0 = __le32_to_cpu(ppdu_end_user-&gt;info6);</div><div class='add'>+</div><div class='add'>+	rx_user_status-&gt;ul_ofdma_user_v0_word1 = __le32_to_cpu(ppdu_end_user-&gt;info10);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+ath11k_hal_rx_populate_byte_count(void *rx_tlv, void *ppduinfo,</div><div class='add'>+				  struct hal_rx_user_status *rx_user_status)</div><div class='add'>+{</div><div class='add'>+	struct hal_rx_ppdu_end_user_stats *ppdu_end_user = rx_tlv;</div><div class='add'>+</div><div class='add'>+	rx_user_status-&gt;mpdu_ok_byte_count =</div><div class='add'>+		FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO8_MPDU_OK_BYTE_COUNT,</div><div class='add'>+			  __le32_to_cpu(ppdu_end_user-&gt;info8));</div><div class='add'>+	rx_user_status-&gt;mpdu_err_byte_count =</div><div class='add'>+		FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO9_MPDU_ERR_BYTE_COUNT,</div><div class='add'>+			  __le32_to_cpu(ppdu_end_user-&gt;info9));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+ath11k_hal_rx_populate_mu_user_info(void *rx_tlv, struct hal_rx_mon_ppdu_info *ppdu_info,</div><div class='add'>+				    struct hal_rx_user_status *rx_user_status)</div><div class='add'>+{</div><div class='add'>+	rx_user_status-&gt;ast_index = ppdu_info-&gt;ast_index;</div><div class='add'>+	rx_user_status-&gt;tid = ppdu_info-&gt;tid;</div><div class='add'>+	rx_user_status-&gt;tcp_msdu_count =</div><div class='add'>+		ppdu_info-&gt;tcp_msdu_count;</div><div class='add'>+	rx_user_status-&gt;udp_msdu_count =</div><div class='add'>+		ppdu_info-&gt;udp_msdu_count;</div><div class='add'>+	rx_user_status-&gt;other_msdu_count =</div><div class='add'>+		ppdu_info-&gt;other_msdu_count;</div><div class='add'>+	rx_user_status-&gt;frame_control = ppdu_info-&gt;frame_control;</div><div class='add'>+	rx_user_status-&gt;frame_control_info_valid =</div><div class='add'>+		ppdu_info-&gt;frame_control_info_valid;</div><div class='add'>+	rx_user_status-&gt;data_sequence_control_info_valid =</div><div class='add'>+		ppdu_info-&gt;data_sequence_control_info_valid;</div><div class='add'>+	rx_user_status-&gt;first_data_seq_ctrl =</div><div class='add'>+		ppdu_info-&gt;first_data_seq_ctrl;</div><div class='add'>+	rx_user_status-&gt;preamble_type = ppdu_info-&gt;preamble_type;</div><div class='add'>+	rx_user_status-&gt;ht_flags = ppdu_info-&gt;ht_flags;</div><div class='add'>+	rx_user_status-&gt;vht_flags = ppdu_info-&gt;vht_flags;</div><div class='add'>+	rx_user_status-&gt;he_flags = ppdu_info-&gt;he_flags;</div><div class='add'>+	rx_user_status-&gt;rs_flags = ppdu_info-&gt;rs_flags;</div><div class='add'>+</div><div class='add'>+	rx_user_status-&gt;mpdu_cnt_fcs_ok =</div><div class='add'>+		ppdu_info-&gt;num_mpdu_fcs_ok;</div><div class='add'>+	rx_user_status-&gt;mpdu_cnt_fcs_err =</div><div class='add'>+		ppdu_info-&gt;num_mpdu_fcs_err;</div><div class='add'>+</div><div class='add'>+	ath11k_hal_rx_populate_byte_count(rx_tlv, ppdu_info, rx_user_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath11k_hal_rx_mpduinfo_get_peerid(struct ath11k_base *ab,</div><div class='add'>+					     struct hal_rx_mpdu_info *mpdu_info)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hw_params.hw_ops-&gt;mpdu_info_get_peerid(mpdu_info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static enum hal_rx_mon_status</div><div class='ctx'> ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab,</div><div class='ctx'> 				   struct hal_rx_mon_ppdu_info *ppdu_info,</div><div class='del'>-				   u32 tlv_tag, u8 *tlv_data)</div><div class='add'>+				   u32 tlv_tag, u8 *tlv_data, u32 userid)</div><div class='ctx'> {</div><div class='del'>-	u32 info0, info1;</div><div class='add'>+	u32 info0, info1, value;</div><div class='add'>+	u8 he_dcm = 0, he_stbc = 0;</div><div class='add'>+	u16 he_gi = 0, he_ltf = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (tlv_tag) {</div><div class='ctx'> 	case HAL_RX_PPDU_START: {</div><div class='hunk'>@@ -864,9 +899,12 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab,</div><div class='ctx'> 		info0 = __le32_to_cpu(eu_stats-&gt;info0);</div><div class='ctx'> 		info1 = __le32_to_cpu(eu_stats-&gt;info1);</div><div class='ctx'> </div><div class='add'>+		ppdu_info-&gt;ast_index =</div><div class='add'>+			FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO2_AST_INDEX,</div><div class='add'>+				  __le32_to_cpu(eu_stats-&gt;info2));</div><div class='ctx'> 		ppdu_info-&gt;tid =</div><div class='del'>-			ffs(FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO6_TID_BITMAP,</div><div class='del'>-				      __le32_to_cpu(eu_stats-&gt;info6))) - 1;</div><div class='add'>+			ffs(FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO7_TID_BITMAP,</div><div class='add'>+				      __le32_to_cpu(eu_stats-&gt;info7))) - 1;</div><div class='ctx'> 		ppdu_info-&gt;tcp_msdu_count =</div><div class='ctx'> 			FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO4_TCP_MSDU_CNT,</div><div class='ctx'> 				  __le32_to_cpu(eu_stats-&gt;info4));</div><div class='hunk'>@@ -887,6 +925,44 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab,</div><div class='ctx'> 		ppdu_info-&gt;num_mpdu_fcs_err =</div><div class='ctx'> 			FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO0_MPDU_CNT_FCS_ERR,</div><div class='ctx'> 				  info0);</div><div class='add'>+		switch (ppdu_info-&gt;preamble_type) {</div><div class='add'>+		case HAL_RX_PREAMBLE_11N:</div><div class='add'>+			ppdu_info-&gt;ht_flags = 1;</div><div class='add'>+			break;</div><div class='add'>+		case HAL_RX_PREAMBLE_11AC:</div><div class='add'>+			ppdu_info-&gt;vht_flags = 1;</div><div class='add'>+			break;</div><div class='add'>+		case HAL_RX_PREAMBLE_11AX:</div><div class='add'>+			ppdu_info-&gt;he_flags = 1;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (userid &lt; HAL_MAX_UL_MU_USERS) {</div><div class='add'>+			struct hal_rx_user_status *rxuser_stats =</div><div class='add'>+				&amp;ppdu_info-&gt;userstats;</div><div class='add'>+</div><div class='add'>+			ath11k_hal_rx_handle_ofdma_info(tlv_data, rxuser_stats);</div><div class='add'>+			ath11k_hal_rx_populate_mu_user_info(tlv_data, ppdu_info,</div><div class='add'>+							    rxuser_stats);</div><div class='add'>+		}</div><div class='add'>+		ppdu_info-&gt;userstats.mpdu_fcs_ok_bitmap[0] =</div><div class='add'>+					__le32_to_cpu(eu_stats-&gt;rsvd1[0]);</div><div class='add'>+		ppdu_info-&gt;userstats.mpdu_fcs_ok_bitmap[1] =</div><div class='add'>+					__le32_to_cpu(eu_stats-&gt;rsvd1[1]);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case HAL_RX_PPDU_END_USER_STATS_EXT: {</div><div class='add'>+		struct hal_rx_ppdu_end_user_stats_ext *eu_stats =</div><div class='add'>+			(struct hal_rx_ppdu_end_user_stats_ext *)tlv_data;</div><div class='add'>+		ppdu_info-&gt;userstats.mpdu_fcs_ok_bitmap[2] = eu_stats-&gt;info1;</div><div class='add'>+		ppdu_info-&gt;userstats.mpdu_fcs_ok_bitmap[3] = eu_stats-&gt;info2;</div><div class='add'>+		ppdu_info-&gt;userstats.mpdu_fcs_ok_bitmap[4] = eu_stats-&gt;info3;</div><div class='add'>+		ppdu_info-&gt;userstats.mpdu_fcs_ok_bitmap[5] = eu_stats-&gt;info4;</div><div class='add'>+		ppdu_info-&gt;userstats.mpdu_fcs_ok_bitmap[6] = eu_stats-&gt;info5;</div><div class='add'>+		ppdu_info-&gt;userstats.mpdu_fcs_ok_bitmap[7] = eu_stats-&gt;info6;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case HAL_PHYRX_HT_SIG: {</div><div class='hunk'>@@ -953,7 +1029,7 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab,</div><div class='ctx'> 		info1 = __le32_to_cpu(vht_sig-&gt;info1);</div><div class='ctx'> </div><div class='ctx'> 		ppdu_info-&gt;ldpc = FIELD_GET(HAL_RX_VHT_SIG_A_INFO_INFO1_SU_MU_CODING,</div><div class='del'>-					    info0);</div><div class='add'>+					    info1);</div><div class='ctx'> 		ppdu_info-&gt;mcs = FIELD_GET(HAL_RX_VHT_SIG_A_INFO_INFO1_MCS,</div><div class='ctx'> 					   info1);</div><div class='ctx'> 		gi_setting = FIELD_GET(HAL_RX_VHT_SIG_A_INFO_INFO1_GI_SETTING,</div><div class='hunk'>@@ -985,50 +1061,151 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab,</div><div class='ctx'> 		else</div><div class='ctx'> 			ppdu_info-&gt;reception_type =</div><div class='ctx'> 				HAL_RX_RECEPTION_TYPE_MU_MIMO;</div><div class='add'>+		ppdu_info-&gt;vht_flag_values5 = group_id;</div><div class='add'>+		ppdu_info-&gt;vht_flag_values3[0] = (((ppdu_info-&gt;mcs) &lt;&lt; 4) |</div><div class='add'>+						   ppdu_info-&gt;nss);</div><div class='add'>+		ppdu_info-&gt;vht_flag_values2 = ppdu_info-&gt;bw;</div><div class='add'>+		ppdu_info-&gt;vht_flag_values4 =</div><div class='add'>+			FIELD_GET(HAL_RX_VHT_SIG_A_INFO_INFO1_SU_MU_CODING, info1);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case HAL_PHYRX_HE_SIG_A_SU: {</div><div class='ctx'> 		struct hal_rx_he_sig_a_su_info *he_sig_a =</div><div class='ctx'> 			(struct hal_rx_he_sig_a_su_info *)tlv_data;</div><div class='del'>-		u32 nsts, cp_ltf, dcm;</div><div class='ctx'> </div><div class='add'>+		ppdu_info-&gt;he_flags = 1;</div><div class='ctx'> 		info0 = __le32_to_cpu(he_sig_a-&gt;info0);</div><div class='ctx'> 		info1 = __le32_to_cpu(he_sig_a-&gt;info1);</div><div class='ctx'> </div><div class='del'>-		ppdu_info-&gt;mcs =</div><div class='del'>-			FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO0_TRANSMIT_MCS,</div><div class='del'>-				  info0);</div><div class='del'>-		ppdu_info-&gt;bw =</div><div class='del'>-			FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO0_TRANSMIT_BW,</div><div class='del'>-				  info0);</div><div class='del'>-		ppdu_info-&gt;ldpc = FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO1_CODING, info0);</div><div class='del'>-		ppdu_info-&gt;is_stbc = info1 &amp;</div><div class='del'>-				     HAL_RX_HE_SIG_A_SU_INFO_INFO1_STBC;</div><div class='del'>-		ppdu_info-&gt;beamformed = info1 &amp;</div><div class='del'>-					HAL_RX_HE_SIG_A_SU_INFO_INFO1_TXBF;</div><div class='del'>-		dcm = info0 &amp; HAL_RX_HE_SIG_A_SU_INFO_INFO0_DCM;</div><div class='del'>-		cp_ltf = FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO0_CP_LTF_SIZE,</div><div class='del'>-				   info0);</div><div class='del'>-		nsts = FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO0_NSTS, info0);</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO0_FORMAT_IND, info0);</div><div class='ctx'> </div><div class='del'>-		switch (cp_ltf) {</div><div class='add'>+		if (value == 0)</div><div class='add'>+			ppdu_info-&gt;he_data1 = IEEE80211_RADIOTAP_HE_DATA1_FORMAT_TRIG;</div><div class='add'>+		else</div><div class='add'>+			ppdu_info-&gt;he_data1 = IEEE80211_RADIOTAP_HE_DATA1_FORMAT_SU;</div><div class='add'>+</div><div class='add'>+		ppdu_info-&gt;he_data1 |=</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA1_BSS_COLOR_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA1_BEAM_CHANGE_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA1_UL_DL_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA1_DATA_MCS_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA1_DATA_DCM_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA1_CODING_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA1_LDPC_XSYMSEG_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA1_STBC_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA1_BW_RU_ALLOC_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA1_DOPPLER_KNOWN;</div><div class='add'>+</div><div class='add'>+		ppdu_info-&gt;he_data2 |=</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA2_GI_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA2_TXBF_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA2_PE_DISAMBIG_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA2_TXOP_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA2_NUM_LTF_SYMS_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA2_PRE_FEC_PAD_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA2_MIDAMBLE_KNOWN;</div><div class='add'>+</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO0_BSS_COLOR, info0);</div><div class='add'>+		ppdu_info-&gt;he_data3 =</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA3_BSS_COLOR, value);</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO0_BEAM_CHANGE, info0);</div><div class='add'>+		ppdu_info-&gt;he_data3 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA3_BEAM_CHANGE, value);</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO0_DL_UL_FLAG, info0);</div><div class='add'>+		ppdu_info-&gt;he_data3 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA3_UL_DL, value);</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO0_TRANSMIT_MCS, info0);</div><div class='add'>+		ppdu_info-&gt;mcs = value;</div><div class='add'>+		ppdu_info-&gt;he_data3 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA3_DATA_MCS, value);</div><div class='add'>+</div><div class='add'>+		he_dcm = FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO0_DCM, info0);</div><div class='add'>+		ppdu_info-&gt;dcm = he_dcm;</div><div class='add'>+		ppdu_info-&gt;he_data3 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA3_DATA_DCM, he_dcm);</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO1_CODING, info1);</div><div class='add'>+		ppdu_info-&gt;ldpc = (value == HAL_RX_SU_MU_CODING_LDPC) ? 1 : 0;</div><div class='add'>+		ppdu_info-&gt;he_data3 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA3_CODING, value);</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO1_LDPC_EXTRA, info1);</div><div class='add'>+		ppdu_info-&gt;he_data3 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA3_LDPC_XSYMSEG, value);</div><div class='add'>+		he_stbc = FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO1_STBC, info1);</div><div class='add'>+		ppdu_info-&gt;is_stbc = he_stbc;</div><div class='add'>+		ppdu_info-&gt;he_data3 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA3_STBC, he_stbc);</div><div class='add'>+</div><div class='add'>+		/* data4 */</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO0_SPATIAL_REUSE, info0);</div><div class='add'>+		ppdu_info-&gt;he_data4 =</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA4_SU_MU_SPTL_REUSE, value);</div><div class='add'>+</div><div class='add'>+		/* data5 */</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO0_TRANSMIT_BW, info0);</div><div class='add'>+		ppdu_info-&gt;bw = value;</div><div class='add'>+		ppdu_info-&gt;he_data5 =</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC, value);</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO0_CP_LTF_SIZE, info0);</div><div class='add'>+		switch (value) {</div><div class='ctx'> 		case 0:</div><div class='add'>+				he_gi = HE_GI_0_8;</div><div class='add'>+				he_ltf = HE_LTF_1_X;</div><div class='add'>+				break;</div><div class='ctx'> 		case 1:</div><div class='del'>-			ppdu_info-&gt;gi = HAL_RX_GI_0_8_US;</div><div class='del'>-			break;</div><div class='add'>+				he_gi = HE_GI_0_8;</div><div class='add'>+				he_ltf = HE_LTF_2_X;</div><div class='add'>+				break;</div><div class='ctx'> 		case 2:</div><div class='del'>-			ppdu_info-&gt;gi = HAL_RX_GI_1_6_US;</div><div class='del'>-			break;</div><div class='add'>+				he_gi = HE_GI_1_6;</div><div class='add'>+				he_ltf = HE_LTF_2_X;</div><div class='add'>+				break;</div><div class='ctx'> 		case 3:</div><div class='del'>-			if (dcm &amp;&amp; ppdu_info-&gt;is_stbc)</div><div class='del'>-				ppdu_info-&gt;gi = HAL_RX_GI_0_8_US;</div><div class='del'>-			else</div><div class='del'>-				ppdu_info-&gt;gi = HAL_RX_GI_3_2_US;</div><div class='del'>-			break;</div><div class='add'>+				if (he_dcm &amp;&amp; he_stbc) {</div><div class='add'>+					he_gi = HE_GI_0_8;</div><div class='add'>+					he_ltf = HE_LTF_4_X;</div><div class='add'>+				} else {</div><div class='add'>+					he_gi = HE_GI_3_2;</div><div class='add'>+					he_ltf = HE_LTF_4_X;</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='ctx'> 		}</div><div class='add'>+		ppdu_info-&gt;gi = he_gi;</div><div class='add'>+		he_gi = (he_gi != 0) ? he_gi - 1 : 0;</div><div class='add'>+		ppdu_info-&gt;he_data5 |= FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA5_GI, he_gi);</div><div class='add'>+		ppdu_info-&gt;ltf_size = he_ltf;</div><div class='add'>+		ppdu_info-&gt;he_data5 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE,</div><div class='add'>+				   (he_ltf == HE_LTF_4_X) ? he_ltf - 1 : he_ltf);</div><div class='add'>+</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO0_NSTS, info0);</div><div class='add'>+		ppdu_info-&gt;he_data5 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA5_NUM_LTF_SYMS, value);</div><div class='add'>+</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO1_PKT_EXT_FACTOR, info1);</div><div class='add'>+		ppdu_info-&gt;he_data5 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA5_PRE_FEC_PAD, value);</div><div class='add'>+</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO1_TXBF, info1);</div><div class='add'>+		ppdu_info-&gt;beamformed = value;</div><div class='add'>+		ppdu_info-&gt;he_data5 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA5_TXBF, value);</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO1_PKT_EXT_PE_DISAM, info1);</div><div class='add'>+		ppdu_info-&gt;he_data5 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA5_PE_DISAMBIG, value);</div><div class='add'>+</div><div class='add'>+		/* data6 */</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO0_NSTS, info0);</div><div class='add'>+		value++;</div><div class='add'>+		ppdu_info-&gt;nss = value;</div><div class='add'>+		ppdu_info-&gt;he_data6 =</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA6_NSTS, value);</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO1_DOPPLER_IND, info1);</div><div class='add'>+		ppdu_info-&gt;he_data6 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA6_DOPPLER, value);</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_SU_INFO_INFO1_TXOP_DURATION, info1);</div><div class='add'>+		ppdu_info-&gt;he_data6 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA6_TXOP, value);</div><div class='ctx'> </div><div class='del'>-		ppdu_info-&gt;nss = nsts + 1;</div><div class='del'>-		ppdu_info-&gt;dcm = dcm;</div><div class='ctx'> 		ppdu_info-&gt;reception_type = HAL_RX_RECEPTION_TYPE_SU;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1036,29 +1213,142 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab,</div><div class='ctx'> 		struct hal_rx_he_sig_a_mu_dl_info *he_sig_a_mu_dl =</div><div class='ctx'> 			(struct hal_rx_he_sig_a_mu_dl_info *)tlv_data;</div><div class='ctx'> </div><div class='del'>-		u32 cp_ltf;</div><div class='del'>-</div><div class='ctx'> 		info0 = __le32_to_cpu(he_sig_a_mu_dl-&gt;info0);</div><div class='ctx'> 		info1 = __le32_to_cpu(he_sig_a_mu_dl-&gt;info1);</div><div class='ctx'> </div><div class='del'>-		ppdu_info-&gt;bw =</div><div class='del'>-			FIELD_GET(HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_TRANSMIT_BW,</div><div class='del'>-				  info0);</div><div class='del'>-		cp_ltf = FIELD_GET(HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_CP_LTF_SIZE,</div><div class='del'>-				   info0);</div><div class='del'>-</div><div class='del'>-		switch (cp_ltf) {</div><div class='add'>+		ppdu_info-&gt;he_mu_flags = 1;</div><div class='add'>+</div><div class='add'>+		ppdu_info-&gt;he_data1 = IEEE80211_RADIOTAP_HE_DATA1_FORMAT_MU;</div><div class='add'>+		ppdu_info-&gt;he_data1 |=</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA1_BSS_COLOR_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA1_UL_DL_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA1_LDPC_XSYMSEG_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA1_STBC_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA1_BW_RU_ALLOC_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA1_DOPPLER_KNOWN;</div><div class='add'>+</div><div class='add'>+		ppdu_info-&gt;he_data2 =</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA2_GI_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA2_NUM_LTF_SYMS_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA2_PRE_FEC_PAD_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA2_PE_DISAMBIG_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA2_TXOP_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA2_MIDAMBLE_KNOWN;</div><div class='add'>+</div><div class='add'>+		/*data3*/</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_BSS_COLOR, info0);</div><div class='add'>+		ppdu_info-&gt;he_data3 =</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA3_BSS_COLOR, value);</div><div class='add'>+</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_UL_FLAG, info0);</div><div class='add'>+		ppdu_info-&gt;he_data3 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA3_UL_DL, value);</div><div class='add'>+</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_MU_DL_INFO_INFO1_LDPC_EXTRA, info1);</div><div class='add'>+		ppdu_info-&gt;he_data3 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA3_LDPC_XSYMSEG, value);</div><div class='add'>+</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_MU_DL_INFO_INFO1_STBC, info1);</div><div class='add'>+		he_stbc = value;</div><div class='add'>+		ppdu_info-&gt;he_data3 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA3_STBC, value);</div><div class='add'>+</div><div class='add'>+		/*data4*/</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_SPATIAL_REUSE, info0);</div><div class='add'>+		ppdu_info-&gt;he_data4 =</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA4_SU_MU_SPTL_REUSE, value);</div><div class='add'>+</div><div class='add'>+		/*data5*/</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_TRANSMIT_BW, info0);</div><div class='add'>+		ppdu_info-&gt;bw = value;</div><div class='add'>+		ppdu_info-&gt;he_data5 =</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC, value);</div><div class='add'>+</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_CP_LTF_SIZE, info0);</div><div class='add'>+		switch (value) {</div><div class='ctx'> 		case 0:</div><div class='add'>+			he_gi = HE_GI_0_8;</div><div class='add'>+			he_ltf = HE_LTF_4_X;</div><div class='add'>+			break;</div><div class='ctx'> 		case 1:</div><div class='del'>-			ppdu_info-&gt;gi = HAL_RX_GI_0_8_US;</div><div class='add'>+			he_gi = HE_GI_0_8;</div><div class='add'>+			he_ltf = HE_LTF_2_X;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 2:</div><div class='del'>-			ppdu_info-&gt;gi = HAL_RX_GI_1_6_US;</div><div class='add'>+			he_gi = HE_GI_1_6;</div><div class='add'>+			he_ltf = HE_LTF_2_X;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 3:</div><div class='del'>-			ppdu_info-&gt;gi = HAL_RX_GI_3_2_US;</div><div class='add'>+			he_gi = HE_GI_3_2;</div><div class='add'>+			he_ltf = HE_LTF_4_X;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		ppdu_info-&gt;gi = he_gi;</div><div class='add'>+		he_gi = (he_gi != 0) ? he_gi - 1 : 0;</div><div class='add'>+		ppdu_info-&gt;he_data5 |= FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA5_GI, he_gi);</div><div class='add'>+		ppdu_info-&gt;ltf_size = he_ltf;</div><div class='add'>+		ppdu_info-&gt;he_data5 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE,</div><div class='add'>+				   (he_ltf == HE_LTF_4_X) ? he_ltf - 1 : he_ltf);</div><div class='add'>+</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_MU_DL_INFO_INFO1_NUM_LTF_SYMB, info1);</div><div class='add'>+		ppdu_info-&gt;he_data5 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA5_NUM_LTF_SYMS, value);</div><div class='add'>+</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_MU_DL_INFO_INFO1_PKT_EXT_FACTOR,</div><div class='add'>+				  info1);</div><div class='add'>+		ppdu_info-&gt;he_data5 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA5_PRE_FEC_PAD, value);</div><div class='add'>+</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_MU_DL_INFO_INFO1_PKT_EXT_PE_DISAM,</div><div class='add'>+				  info1);</div><div class='add'>+		ppdu_info-&gt;he_data5 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA5_PE_DISAMBIG, value);</div><div class='add'>+</div><div class='add'>+		/*data6*/</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_DOPPLER_INDICATION,</div><div class='add'>+				  info0);</div><div class='add'>+		ppdu_info-&gt;he_data6 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA6_DOPPLER, value);</div><div class='add'>+</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_MU_DL_INFO_INFO1_TXOP_DURATION, info1);</div><div class='add'>+		ppdu_info-&gt;he_data6 |=</div><div class='add'>+				FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA6_TXOP, value);</div><div class='add'>+</div><div class='add'>+		/* HE-MU Flags */</div><div class='add'>+		/* HE-MU-flags1 */</div><div class='add'>+		ppdu_info-&gt;he_flags1 =</div><div class='add'>+			IEEE80211_RADIOTAP_HE_MU_FLAGS1_SIG_B_MCS_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_MU_FLAGS1_SIG_B_DCM_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_MU_FLAGS1_SIG_B_COMP_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_MU_FLAGS1_SIG_B_SYMS_USERS_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_MU_FLAGS1_CH1_RU_KNOWN;</div><div class='add'>+</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_MCS_OF_SIGB, info0);</div><div class='add'>+		ppdu_info-&gt;he_flags1 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_MU_FLAGS1_SIG_B_MCS_KNOWN,</div><div class='add'>+				   value);</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_DCM_OF_SIGB, info0);</div><div class='add'>+		ppdu_info-&gt;he_flags1 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_MU_FLAGS1_SIG_B_DCM_KNOWN,</div><div class='add'>+				   value);</div><div class='add'>+</div><div class='add'>+		/* HE-MU-flags2 */</div><div class='add'>+		ppdu_info-&gt;he_flags2 =</div><div class='add'>+			IEEE80211_RADIOTAP_HE_MU_FLAGS2_BW_FROM_SIG_A_BW_KNOWN;</div><div class='add'>+</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_TRANSMIT_BW, info0);</div><div class='add'>+		ppdu_info-&gt;he_flags2 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_MU_FLAGS2_BW_FROM_SIG_A_BW,</div><div class='add'>+				   value);</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_COMP_MODE_SIGB, info0);</div><div class='add'>+		ppdu_info-&gt;he_flags2 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_MU_FLAGS2_SIG_B_COMP, value);</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_NUM_SIGB_SYMB, info0);</div><div class='add'>+		value = value - 1;</div><div class='add'>+		ppdu_info-&gt;he_flags2 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_MU_FLAGS2_SIG_B_SYMS_USERS,</div><div class='add'>+				   value);</div><div class='ctx'> </div><div class='ctx'> 		ppdu_info-&gt;is_stbc = info1 &amp;</div><div class='ctx'> 				     HAL_RX_HE_SIG_A_MU_DL_INFO_INFO1_STBC;</div><div class='hunk'>@@ -1074,7 +1364,9 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab,</div><div class='ctx'> </div><div class='ctx'> 		ru_tones = FIELD_GET(HAL_RX_HE_SIG_B1_MU_INFO_INFO0_RU_ALLOCATION,</div><div class='ctx'> 				     info0);</div><div class='del'>-		ppdu_info-&gt;ru_alloc = ath11k_he_ru_tones_to_nl80211_he_ru_alloc(ru_tones);</div><div class='add'>+		ppdu_info-&gt;ru_alloc =</div><div class='add'>+			ath11k_mac_phy_he_ru_to_nl80211_he_ru_alloc(ru_tones);</div><div class='add'>+		ppdu_info-&gt;he_RU[0] = ru_tones;</div><div class='ctx'> 		ppdu_info-&gt;reception_type = HAL_RX_RECEPTION_TYPE_MU_MIMO;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1084,14 +1376,25 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab,</div><div class='ctx'> </div><div class='ctx'> 		info0 = __le32_to_cpu(he_sig_b2_mu-&gt;info0);</div><div class='ctx'> </div><div class='add'>+		ppdu_info-&gt;he_data1 |= IEEE80211_RADIOTAP_HE_DATA1_DATA_MCS_KNOWN |</div><div class='add'>+				       IEEE80211_RADIOTAP_HE_DATA1_CODING_KNOWN;</div><div class='add'>+</div><div class='ctx'> 		ppdu_info-&gt;mcs =</div><div class='del'>-			FIELD_GET(HAL_RX_HE_SIG_B2_MU_INFO_INFO0_STA_MCS,</div><div class='del'>-				  info0);</div><div class='add'>+			FIELD_GET(HAL_RX_HE_SIG_B2_MU_INFO_INFO0_STA_MCS, info0);</div><div class='add'>+		ppdu_info-&gt;he_data3 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA3_DATA_MCS, ppdu_info-&gt;mcs);</div><div class='add'>+</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_B2_MU_INFO_INFO0_STA_CODING, info0);</div><div class='add'>+		ppdu_info-&gt;ldpc = value;</div><div class='add'>+		ppdu_info-&gt;he_data3 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA3_CODING, value);</div><div class='add'>+</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_B2_MU_INFO_INFO0_STA_ID, info0);</div><div class='add'>+		ppdu_info-&gt;he_data4 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA4_MU_STA_ID, value);</div><div class='add'>+</div><div class='ctx'> 		ppdu_info-&gt;nss =</div><div class='del'>-			FIELD_GET(HAL_RX_HE_SIG_B2_MU_INFO_INFO0_STA_NSTS,</div><div class='del'>-				  info0) + 1;</div><div class='del'>-		ppdu_info-&gt;ldpc = FIELD_GET(HAL_RX_HE_SIG_B2_MU_INFO_INFO0_STA_CODING,</div><div class='del'>-					    info0);</div><div class='add'>+			FIELD_GET(HAL_RX_HE_SIG_B2_MU_INFO_INFO0_STA_NSTS, info0) + 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case HAL_PHYRX_HE_SIG_B2_OFDMA: {</div><div class='hunk'>@@ -1100,21 +1403,47 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab,</div><div class='ctx'> </div><div class='ctx'> 		info0 = __le32_to_cpu(he_sig_b2_ofdma-&gt;info0);</div><div class='ctx'> </div><div class='add'>+		ppdu_info-&gt;he_data1 |=</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA1_DATA_MCS_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA1_DATA_DCM_KNOWN |</div><div class='add'>+			IEEE80211_RADIOTAP_HE_DATA1_CODING_KNOWN;</div><div class='add'>+</div><div class='add'>+		/* HE-data2 */</div><div class='add'>+		ppdu_info-&gt;he_data2 |= IEEE80211_RADIOTAP_HE_DATA2_TXBF_KNOWN;</div><div class='add'>+</div><div class='ctx'> 		ppdu_info-&gt;mcs =</div><div class='ctx'> 			FIELD_GET(HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_MCS,</div><div class='ctx'> 				  info0);</div><div class='add'>+		ppdu_info-&gt;he_data3 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA3_DATA_MCS, ppdu_info-&gt;mcs);</div><div class='add'>+</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_DCM, info0);</div><div class='add'>+		he_dcm = value;</div><div class='add'>+		ppdu_info-&gt;he_data3 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA3_DATA_DCM, value);</div><div class='add'>+</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_CODING, info0);</div><div class='add'>+		ppdu_info-&gt;ldpc = value;</div><div class='add'>+		ppdu_info-&gt;he_data3 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA3_CODING, value);</div><div class='add'>+</div><div class='add'>+		/* HE-data4 */</div><div class='add'>+		value = FIELD_GET(HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_ID, info0);</div><div class='add'>+		ppdu_info-&gt;he_data4 |=</div><div class='add'>+			FIELD_PREP(IEEE80211_RADIOTAP_HE_DATA4_MU_STA_ID, value);</div><div class='add'>+</div><div class='ctx'> 		ppdu_info-&gt;nss =</div><div class='ctx'> 			FIELD_GET(HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_NSTS,</div><div class='ctx'> 				  info0) + 1;</div><div class='ctx'> 		ppdu_info-&gt;beamformed =</div><div class='del'>-			info0 &amp;</div><div class='del'>-			HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_TXBF;</div><div class='del'>-		ppdu_info-&gt;ldpc = FIELD_GET(HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_CODING,</div><div class='del'>-					    info0);</div><div class='add'>+			info0 &amp; HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_TXBF;</div><div class='ctx'> 		ppdu_info-&gt;reception_type = HAL_RX_RECEPTION_TYPE_MU_OFDMA;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case HAL_PHYRX_RSSI_LEGACY: {</div><div class='add'>+		int i;</div><div class='add'>+		bool db2dbm = test_bit(WMI_TLV_SERVICE_HW_DB2DBM_CONVERSION_SUPPORT,</div><div class='add'>+				       ab-&gt;wmi_ab.svc_map);</div><div class='ctx'> 		struct hal_rx_phyrx_rssi_legacy_info *rssi =</div><div class='ctx'> 			(struct hal_rx_phyrx_rssi_legacy_info *)tlv_data;</div><div class='ctx'> </div><div class='hunk'>@@ -1123,17 +1452,24 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab,</div><div class='ctx'> 		 * PHYRX_OTHER_RECEIVE_INFO TLV.</div><div class='ctx'> 		 */</div><div class='ctx'> 		ppdu_info-&gt;rssi_comb =</div><div class='del'>-			FIELD_GET(HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO1_RSSI_COMB,</div><div class='add'>+			FIELD_GET(HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO0_RSSI_COMB,</div><div class='ctx'> 				  __le32_to_cpu(rssi-&gt;info0));</div><div class='add'>+</div><div class='add'>+		if (db2dbm) {</div><div class='add'>+			for (i = 0; i &lt; ARRAY_SIZE(rssi-&gt;preamble); i++) {</div><div class='add'>+				ppdu_info-&gt;rssi_chain_pri20[i] =</div><div class='add'>+					le32_get_bits(rssi-&gt;preamble[i].rssi_2040,</div><div class='add'>+						      HAL_RX_PHYRX_RSSI_PREAMBLE_PRI20);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case HAL_RX_MPDU_START: {</div><div class='ctx'> 		struct hal_rx_mpdu_info *mpdu_info =</div><div class='del'>-			(struct hal_rx_mpdu_info *)tlv_data;</div><div class='add'>+				(struct hal_rx_mpdu_info *)tlv_data;</div><div class='ctx'> 		u16 peer_id;</div><div class='ctx'> </div><div class='del'>-		peer_id = FIELD_GET(HAL_RX_MPDU_INFO_INFO0_PEERID,</div><div class='del'>-				    __le32_to_cpu(mpdu_info-&gt;info0));</div><div class='add'>+		peer_id = ath11k_hal_rx_mpduinfo_get_peerid(ab, mpdu_info);</div><div class='ctx'> 		if (peer_id)</div><div class='ctx'> 			ppdu_info-&gt;peer_id = peer_id;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1144,6 +1480,9 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab,</div><div class='ctx'> 		ppdu_info-&gt;rx_duration =</div><div class='ctx'> 			FIELD_GET(HAL_RX_PPDU_END_DURATION,</div><div class='ctx'> 				  __le32_to_cpu(ppdu_rx_duration-&gt;info0));</div><div class='add'>+		ppdu_info-&gt;tsft = __le32_to_cpu(ppdu_rx_duration-&gt;rsvd0[1]);</div><div class='add'>+		ppdu_info-&gt;tsft = (ppdu_info-&gt;tsft &lt;&lt; 32) |</div><div class='add'>+					__le32_to_cpu(ppdu_rx_duration-&gt;rsvd0[0]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case HAL_DUMMY:</div><div class='hunk'>@@ -1167,12 +1506,14 @@ ath11k_hal_rx_parse_mon_status(struct ath11k_base *ab,</div><div class='ctx'> 	enum hal_rx_mon_status hal_status = HAL_RX_MON_STATUS_BUF_DONE;</div><div class='ctx'> 	u16 tlv_tag;</div><div class='ctx'> 	u16 tlv_len;</div><div class='add'>+	u32 tlv_userid = 0;</div><div class='ctx'> 	u8 *ptr = skb-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		tlv = (struct hal_tlv_hdr *)ptr;</div><div class='ctx'> 		tlv_tag = FIELD_GET(HAL_TLV_HDR_TAG, tlv-&gt;tl);</div><div class='ctx'> 		tlv_len = FIELD_GET(HAL_TLV_HDR_LEN, tlv-&gt;tl);</div><div class='add'>+		tlv_userid = FIELD_GET(HAL_TLV_USR_ID, tlv-&gt;tl);</div><div class='ctx'> 		ptr += sizeof(*tlv);</div><div class='ctx'> </div><div class='ctx'> 		/* The actual length of PPDU_END is the combined length of many PHY</div><div class='hunk'>@@ -1184,7 +1525,7 @@ ath11k_hal_rx_parse_mon_status(struct ath11k_base *ab,</div><div class='ctx'> 			tlv_len = sizeof(struct hal_rx_rxpcu_classification_overview);</div><div class='ctx'> </div><div class='ctx'> 		hal_status = ath11k_hal_rx_parse_mon_status_tlv(ab, ppdu_info,</div><div class='del'>-								tlv_tag, ptr);</div><div class='add'>+								tlv_tag, ptr, tlv_userid);</div><div class='ctx'> 		ptr += tlv_len;</div><div class='ctx'> 		ptr = PTR_ALIGN(ptr, HAL_TLV_ALIGN);</div><div class='ctx'> </div><div class='hunk'>@@ -1199,8 +1540,7 @@ void ath11k_hal_rx_reo_ent_buf_paddr_get(void *rx_desc, dma_addr_t *paddr,</div><div class='ctx'> 					 u32 *sw_cookie, void **pp_buf_addr,</div><div class='ctx'> 					 u8 *rbm, u32 *msdu_cnt)</div><div class='ctx'> {</div><div class='del'>-	struct hal_reo_entrance_ring *reo_ent_ring =</div><div class='del'>-		(struct hal_reo_entrance_ring *)rx_desc;</div><div class='add'>+	struct hal_reo_entrance_ring *reo_ent_ring = rx_desc;</div><div class='ctx'> 	struct ath11k_buffer_addr *buf_addr_info;</div><div class='ctx'> 	struct rx_mpdu_desc *rx_mpdu_desc_info_details;</div><div class='ctx'> </div><div class='hunk'>@@ -1224,3 +1564,47 @@ void ath11k_hal_rx_reo_ent_buf_paddr_get(void *rx_desc, dma_addr_t *paddr,</div><div class='ctx'> </div><div class='ctx'> 	*pp_buf_addr = (void *)buf_addr_info;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+ath11k_hal_rx_sw_mon_ring_buf_paddr_get(void *rx_desc,</div><div class='add'>+					struct hal_sw_mon_ring_entries *sw_mon_entries)</div><div class='add'>+{</div><div class='add'>+	struct hal_sw_monitor_ring *sw_mon_ring = rx_desc;</div><div class='add'>+	struct ath11k_buffer_addr *buf_addr_info;</div><div class='add'>+	struct ath11k_buffer_addr *status_buf_addr_info;</div><div class='add'>+	struct rx_mpdu_desc *rx_mpdu_desc_info_details;</div><div class='add'>+</div><div class='add'>+	rx_mpdu_desc_info_details = &amp;sw_mon_ring-&gt;rx_mpdu_info;</div><div class='add'>+</div><div class='add'>+	sw_mon_entries-&gt;msdu_cnt = FIELD_GET(RX_MPDU_DESC_INFO0_MSDU_COUNT,</div><div class='add'>+					     rx_mpdu_desc_info_details-&gt;info0);</div><div class='add'>+</div><div class='add'>+	buf_addr_info = &amp;sw_mon_ring-&gt;buf_addr_info;</div><div class='add'>+	status_buf_addr_info = &amp;sw_mon_ring-&gt;status_buf_addr_info;</div><div class='add'>+</div><div class='add'>+	sw_mon_entries-&gt;mon_dst_paddr = (((u64)FIELD_GET(BUFFER_ADDR_INFO1_ADDR,</div><div class='add'>+					buf_addr_info-&gt;info1)) &lt;&lt; 32) |</div><div class='add'>+					FIELD_GET(BUFFER_ADDR_INFO0_ADDR,</div><div class='add'>+						  buf_addr_info-&gt;info0);</div><div class='add'>+</div><div class='add'>+	sw_mon_entries-&gt;mon_status_paddr =</div><div class='add'>+			(((u64)FIELD_GET(BUFFER_ADDR_INFO1_ADDR,</div><div class='add'>+					 status_buf_addr_info-&gt;info1)) &lt;&lt; 32) |</div><div class='add'>+				FIELD_GET(BUFFER_ADDR_INFO0_ADDR,</div><div class='add'>+					  status_buf_addr_info-&gt;info0);</div><div class='add'>+</div><div class='add'>+	sw_mon_entries-&gt;mon_dst_sw_cookie = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE,</div><div class='add'>+						      buf_addr_info-&gt;info1);</div><div class='add'>+</div><div class='add'>+	sw_mon_entries-&gt;mon_status_sw_cookie = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE,</div><div class='add'>+							 status_buf_addr_info-&gt;info1);</div><div class='add'>+</div><div class='add'>+	sw_mon_entries-&gt;status_buf_count = FIELD_GET(HAL_SW_MON_RING_INFO0_STATUS_BUF_CNT,</div><div class='add'>+						     sw_mon_ring-&gt;info0);</div><div class='add'>+</div><div class='add'>+	sw_mon_entries-&gt;dst_buf_addr_info = buf_addr_info;</div><div class='add'>+	sw_mon_entries-&gt;status_buf_addr_info = status_buf_addr_info;</div><div class='add'>+</div><div class='add'>+	sw_mon_entries-&gt;ppdu_id =</div><div class='add'>+		FIELD_GET(HAL_SW_MON_RING_INFO1_PHY_PPDU_ID, sw_mon_ring-&gt;info1);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/hal_rx.h b/drivers/net/wireless/ath/ath11k/hal_rx.h<br/>index d464a270c049..0fa9aef9d533 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/hal_rx.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/hal_rx.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/hal_rx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/hal_rx.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef ATH11K_HAL_RX_H</div><div class='hunk'>@@ -65,10 +66,6 @@ enum hal_rx_reception_type {</div><div class='ctx'> 	HAL_RX_RECEPTION_TYPE_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define HAL_TLV_STATUS_PPDU_NOT_DONE            0</div><div class='del'>-#define HAL_TLV_STATUS_PPDU_DONE                1</div><div class='del'>-#define HAL_TLV_STATUS_BUF_DONE                 2</div><div class='del'>-#define HAL_TLV_STATUS_PPDU_NON_STD_DONE        3</div><div class='ctx'> #define HAL_RX_FCS_LEN                          4</div><div class='ctx'> </div><div class='ctx'> enum hal_rx_mon_status {</div><div class='hunk'>@@ -77,6 +74,54 @@ enum hal_rx_mon_status {</div><div class='ctx'> 	HAL_RX_MON_STATUS_BUF_DONE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct hal_rx_user_status {</div><div class='add'>+	u32 mcs:4,</div><div class='add'>+	nss:3,</div><div class='add'>+	ofdma_info_valid:1,</div><div class='add'>+	dl_ofdma_ru_start_index:7,</div><div class='add'>+	dl_ofdma_ru_width:7,</div><div class='add'>+	dl_ofdma_ru_size:8;</div><div class='add'>+	u32 ul_ofdma_user_v0_word0;</div><div class='add'>+	u32 ul_ofdma_user_v0_word1;</div><div class='add'>+	u32 ast_index;</div><div class='add'>+	u32 tid;</div><div class='add'>+	u16 tcp_msdu_count;</div><div class='add'>+	u16 udp_msdu_count;</div><div class='add'>+	u16 other_msdu_count;</div><div class='add'>+	u16 frame_control;</div><div class='add'>+	u8 frame_control_info_valid;</div><div class='add'>+	u8 data_sequence_control_info_valid;</div><div class='add'>+	u16 first_data_seq_ctrl;</div><div class='add'>+	u32 preamble_type;</div><div class='add'>+	u16 ht_flags;</div><div class='add'>+	u16 vht_flags;</div><div class='add'>+	u16 he_flags;</div><div class='add'>+	u8 rs_flags;</div><div class='add'>+	u32 mpdu_cnt_fcs_ok;</div><div class='add'>+	u32 mpdu_cnt_fcs_err;</div><div class='add'>+	u32 mpdu_fcs_ok_bitmap[8];</div><div class='add'>+	u32 mpdu_ok_byte_count;</div><div class='add'>+	u32 mpdu_err_byte_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_TLV_STATUS_PPDU_NOT_DONE    HAL_RX_MON_STATUS_PPDU_NOT_DONE</div><div class='add'>+#define HAL_TLV_STATUS_PPDU_DONE        HAL_RX_MON_STATUS_PPDU_DONE</div><div class='add'>+#define HAL_TLV_STATUS_BUF_DONE         HAL_RX_MON_STATUS_BUF_DONE</div><div class='add'>+</div><div class='add'>+struct hal_sw_mon_ring_entries {</div><div class='add'>+	dma_addr_t mon_dst_paddr;</div><div class='add'>+	dma_addr_t mon_status_paddr;</div><div class='add'>+	u32 mon_dst_sw_cookie;</div><div class='add'>+	u32 mon_status_sw_cookie;</div><div class='add'>+	void *dst_buf_addr_info;</div><div class='add'>+	void *status_buf_addr_info;</div><div class='add'>+	u16 ppdu_id;</div><div class='add'>+	u8 status_buf_count;</div><div class='add'>+	u8 msdu_cnt;</div><div class='add'>+	bool end_of_ppdu;</div><div class='add'>+	bool drop_ppdu;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct hal_rx_mon_ppdu_info {</div><div class='ctx'> 	u32 ppdu_id;</div><div class='ctx'> 	u32 ppdu_ts;</div><div class='hunk'>@@ -93,16 +138,59 @@ struct hal_rx_mon_ppdu_info {</div><div class='ctx'> 	u8 mcs;</div><div class='ctx'> 	u8 nss;</div><div class='ctx'> 	u8 bw;</div><div class='add'>+	u8 vht_flag_values1;</div><div class='add'>+	u8 vht_flag_values2;</div><div class='add'>+	u8 vht_flag_values3[4];</div><div class='add'>+	u8 vht_flag_values4;</div><div class='add'>+	u8 vht_flag_values5;</div><div class='add'>+	u16 vht_flag_values6;</div><div class='ctx'> 	u8 is_stbc;</div><div class='ctx'> 	u8 gi;</div><div class='ctx'> 	u8 ldpc;</div><div class='ctx'> 	u8 beamformed;</div><div class='ctx'> 	u8 rssi_comb;</div><div class='del'>-	u8 tid;</div><div class='add'>+	u8 rssi_chain_pri20[HAL_RX_MAX_NSS];</div><div class='add'>+	u16 tid;</div><div class='add'>+	u16 ht_flags;</div><div class='add'>+	u16 vht_flags;</div><div class='add'>+	u16 he_flags;</div><div class='add'>+	u16 he_mu_flags;</div><div class='ctx'> 	u8 dcm;</div><div class='ctx'> 	u8 ru_alloc;</div><div class='ctx'> 	u8 reception_type;</div><div class='add'>+	u64 tsft;</div><div class='ctx'> 	u64 rx_duration;</div><div class='add'>+	u16 frame_control;</div><div class='add'>+	u32 ast_index;</div><div class='add'>+	u8 rs_fcs_err;</div><div class='add'>+	u8 rs_flags;</div><div class='add'>+	u8 cck_flag;</div><div class='add'>+	u8 ofdm_flag;</div><div class='add'>+	u8 ulofdma_flag;</div><div class='add'>+	u8 frame_control_info_valid;</div><div class='add'>+	u16 he_per_user_1;</div><div class='add'>+	u16 he_per_user_2;</div><div class='add'>+	u8 he_per_user_position;</div><div class='add'>+	u8 he_per_user_known;</div><div class='add'>+	u16 he_flags1;</div><div class='add'>+	u16 he_flags2;</div><div class='add'>+	u8 he_RU[4];</div><div class='add'>+	u16 he_data1;</div><div class='add'>+	u16 he_data2;</div><div class='add'>+	u16 he_data3;</div><div class='add'>+	u16 he_data4;</div><div class='add'>+	u16 he_data5;</div><div class='add'>+	u16 he_data6;</div><div class='add'>+	u32 ppdu_len;</div><div class='add'>+	u32 prev_ppdu_id;</div><div class='add'>+	u32 device_id;</div><div class='add'>+	u16 first_data_seq_ctrl;</div><div class='add'>+	u8 monitor_direct_used;</div><div class='add'>+	u8 data_sequence_control_info_valid;</div><div class='add'>+	u8 ltf_size;</div><div class='add'>+	u8 rxpcu_filter_pass;</div><div class='add'>+	char rssi_chain[8][8];</div><div class='add'>+	struct hal_rx_user_status userstats;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define HAL_RX_PPDU_START_INFO0_PPDU_ID		GENMASK(15, 0)</div><div class='hunk'>@@ -132,8 +220,11 @@ struct hal_rx_ppdu_start {</div><div class='ctx'> #define HAL_RX_PPDU_END_USER_STATS_INFO5_OTHER_MSDU_CNT		GENMASK(15, 0)</div><div class='ctx'> #define HAL_RX_PPDU_END_USER_STATS_INFO5_TCP_ACK_MSDU_CNT	GENMASK(31, 16)</div><div class='ctx'> </div><div class='del'>-#define HAL_RX_PPDU_END_USER_STATS_INFO6_TID_BITMAP		GENMASK(15, 0)</div><div class='del'>-#define HAL_RX_PPDU_END_USER_STATS_INFO6_TID_EOSP_BITMAP	GENMASK(31, 16)</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO7_TID_BITMAP		GENMASK(15, 0)</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO7_TID_EOSP_BITMAP	GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO8_MPDU_OK_BYTE_COUNT	GENMASK(24, 0)</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO9_MPDU_ERR_BYTE_COUNT	GENMASK(24, 0)</div><div class='ctx'> </div><div class='ctx'> struct hal_rx_ppdu_end_user_stats {</div><div class='ctx'> 	__le32 rsvd0[2];</div><div class='hunk'>@@ -146,7 +237,23 @@ struct hal_rx_ppdu_end_user_stats {</div><div class='ctx'> 	__le32 info4;</div><div class='ctx'> 	__le32 info5;</div><div class='ctx'> 	__le32 info6;</div><div class='del'>-	__le32 rsvd2[11];</div><div class='add'>+	__le32 info7;</div><div class='add'>+	__le32 rsvd2[4];</div><div class='add'>+	__le32 info8;</div><div class='add'>+	__le32 rsvd3;</div><div class='add'>+	__le32 info9;</div><div class='add'>+	__le32 rsvd4[2];</div><div class='add'>+	__le32 info10;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hal_rx_ppdu_end_user_stats_ext {</div><div class='add'>+	u32 info0;</div><div class='add'>+	u32 info1;</div><div class='add'>+	u32 info2;</div><div class='add'>+	u32 info3;</div><div class='add'>+	u32 info4;</div><div class='add'>+	u32 info5;</div><div class='add'>+	u32 info6;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define HAL_RX_HT_SIG_INFO_INFO0_MCS		GENMASK(6, 0)</div><div class='hunk'>@@ -197,25 +304,62 @@ enum hal_rx_vht_sig_a_gi_setting {</div><div class='ctx'> 	HAL_RX_VHT_SIG_A_SHORT_GI_AMBIGUITY = 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define HAL_RX_SU_MU_CODING_LDPC 0x01</div><div class='add'>+</div><div class='add'>+#define HE_GI_0_8 0</div><div class='add'>+#define HE_GI_0_4 1</div><div class='add'>+#define HE_GI_1_6 2</div><div class='add'>+#define HE_GI_3_2 3</div><div class='add'>+</div><div class='add'>+#define HE_LTF_1_X 0</div><div class='add'>+#define HE_LTF_2_X 1</div><div class='add'>+#define HE_LTF_4_X 2</div><div class='add'>+#define HE_LTF_UNKNOWN 3</div><div class='add'>+</div><div class='ctx'> #define HAL_RX_HE_SIG_A_SU_INFO_INFO0_TRANSMIT_MCS	GENMASK(6, 3)</div><div class='ctx'> #define HAL_RX_HE_SIG_A_SU_INFO_INFO0_DCM		BIT(7)</div><div class='ctx'> #define HAL_RX_HE_SIG_A_SU_INFO_INFO0_TRANSMIT_BW	GENMASK(20, 19)</div><div class='ctx'> #define HAL_RX_HE_SIG_A_SU_INFO_INFO0_CP_LTF_SIZE	GENMASK(22, 21)</div><div class='ctx'> #define HAL_RX_HE_SIG_A_SU_INFO_INFO0_NSTS		GENMASK(25, 23)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO0_BSS_COLOR		GENMASK(13, 8)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO0_SPATIAL_REUSE	GENMASK(18, 15)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO0_FORMAT_IND	BIT(0)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO0_BEAM_CHANGE	BIT(1)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO0_DL_UL_FLAG	BIT(2)</div><div class='ctx'> </div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO1_TXOP_DURATION	GENMASK(6, 0)</div><div class='ctx'> #define HAL_RX_HE_SIG_A_SU_INFO_INFO1_CODING		BIT(7)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO1_LDPC_EXTRA	BIT(8)</div><div class='ctx'> #define HAL_RX_HE_SIG_A_SU_INFO_INFO1_STBC		BIT(9)</div><div class='ctx'> #define HAL_RX_HE_SIG_A_SU_INFO_INFO1_TXBF		BIT(10)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO1_PKT_EXT_FACTOR	GENMASK(12, 11)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO1_PKT_EXT_PE_DISAM	BIT(13)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO1_DOPPLER_IND	BIT(15)</div><div class='ctx'> </div><div class='ctx'> struct hal_rx_he_sig_a_su_info {</div><div class='ctx'> 	__le32 info0;</div><div class='ctx'> 	__le32 info1;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-#define HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_TRANSMIT_BW	GENMASK(17, 15)</div><div class='del'>-#define HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_CP_LTF_SIZE	GENMASK(24, 23)</div><div class='del'>-</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_UL_FLAG		BIT(1)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_MCS_OF_SIGB		GENMASK(3, 1)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_DCM_OF_SIGB		BIT(4)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_BSS_COLOR		GENMASK(10, 5)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_SPATIAL_REUSE	GENMASK(14, 11)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_TRANSMIT_BW		GENMASK(17, 15)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_NUM_SIGB_SYMB	GENMASK(21, 18)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_COMP_MODE_SIGB	BIT(22)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_CP_LTF_SIZE		GENMASK(24, 23)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO_INFO0_DOPPLER_INDICATION	BIT(25)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO_INFO1_TXOP_DURATION	GENMASK(6, 0)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO_INFO1_CODING		BIT(7)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO_INFO1_NUM_LTF_SYMB	GENMASK(10, 8)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO_INFO1_LDPC_EXTRA		BIT(11)</div><div class='ctx'> #define HAL_RX_HE_SIG_A_MU_DL_INFO_INFO1_STBC		BIT(12)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO_INFO1_TXBF		BIT(10)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO_INFO1_PKT_EXT_FACTOR	GENMASK(14, 13)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO_INFO1_PKT_EXT_PE_DISAM	BIT(15)</div><div class='ctx'> </div><div class='ctx'> struct hal_rx_he_sig_a_mu_dl_info {</div><div class='ctx'> 	__le32 info0;</div><div class='hunk'>@@ -228,6 +372,7 @@ struct hal_rx_he_sig_b1_mu_info {</div><div class='ctx'> 	__le32 info0;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+#define HAL_RX_HE_SIG_B2_MU_INFO_INFO0_STA_ID		GENMASK(10, 0)</div><div class='ctx'> #define HAL_RX_HE_SIG_B2_MU_INFO_INFO0_STA_MCS		GENMASK(18, 15)</div><div class='ctx'> #define HAL_RX_HE_SIG_B2_MU_INFO_INFO0_STA_CODING	BIT(20)</div><div class='ctx'> #define HAL_RX_HE_SIG_B2_MU_INFO_INFO0_STA_NSTS		GENMASK(31, 29)</div><div class='hunk'>@@ -236,6 +381,7 @@ struct hal_rx_he_sig_b2_mu_info {</div><div class='ctx'> 	__le32 info0;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+#define HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_ID	GENMASK(10, 0)</div><div class='ctx'> #define HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_NSTS	GENMASK(13, 11)</div><div class='ctx'> #define HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_TXBF	BIT(19)</div><div class='ctx'> #define HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_MCS	GENMASK(18, 15)</div><div class='hunk'>@@ -246,18 +392,54 @@ struct hal_rx_he_sig_b2_ofdma_info {</div><div class='ctx'> 	__le32 info0;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-#define HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO1_RSSI_COMB	GENMASK(15, 8)</div><div class='add'>+#define HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO0_RSSI_COMB	GENMASK(15, 8)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_PHYRX_RSSI_PREAMBLE_PRI20	GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+struct hal_rx_phyrx_chain_rssi {</div><div class='add'>+	__le32 rssi_2040;</div><div class='add'>+	__le32 rssi_80;</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct hal_rx_phyrx_rssi_legacy_info {</div><div class='del'>-	__le32 rsvd[35];</div><div class='add'>+	__le32 rsvd[3];</div><div class='add'>+	struct hal_rx_phyrx_chain_rssi pre_rssi[HAL_RX_MAX_NSS];</div><div class='add'>+	struct hal_rx_phyrx_chain_rssi preamble[HAL_RX_MAX_NSS];</div><div class='ctx'> 	__le32 info0;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define HAL_RX_MPDU_INFO_INFO0_PEERID	GENMASK(31, 16)</div><div class='del'>-struct hal_rx_mpdu_info {</div><div class='add'>+#define HAL_RX_MPDU_INFO_INFO0_PEERID_WCN6855	GENMASK(15, 0)</div><div class='add'>+#define HAL_RX_MPDU_INFO_INFO1_MPDU_LEN		GENMASK(13, 0)</div><div class='add'>+</div><div class='add'>+struct hal_rx_mpdu_info_ipq8074 {</div><div class='ctx'> 	__le32 rsvd0;</div><div class='ctx'> 	__le32 info0;</div><div class='del'>-	__le32 rsvd1[21];</div><div class='add'>+	__le32 rsvd1[11];</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 rsvd2[9];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hal_rx_mpdu_info_qcn9074 {</div><div class='add'>+	__le32 rsvd0[10];</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 rsvd1[2];</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 rsvd2[9];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hal_rx_mpdu_info_wcn6855 {</div><div class='add'>+	__le32 rsvd0[8];</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 rsvd1[14];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hal_rx_mpdu_info {</div><div class='add'>+	union {</div><div class='add'>+		struct hal_rx_mpdu_info_ipq8074 ipq8074;</div><div class='add'>+		struct hal_rx_mpdu_info_qcn9074 qcn9074;</div><div class='add'>+		struct hal_rx_mpdu_info_wcn6855 wcn6855;</div><div class='add'>+	} u;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define HAL_RX_PPDU_END_DURATION	GENMASK(23, 0)</div><div class='hunk'>@@ -323,38 +505,14 @@ void ath11k_hal_rx_reo_ent_buf_paddr_get(void *rx_desc,</div><div class='ctx'> 					 dma_addr_t *paddr, u32 *sw_cookie,</div><div class='ctx'> 					 void **pp_buf_addr_info, u8 *rbm,</div><div class='ctx'> 					 u32 *msdu_cnt);</div><div class='add'>+void</div><div class='add'>+ath11k_hal_rx_sw_mon_ring_buf_paddr_get(void *rx_desc,</div><div class='add'>+					struct hal_sw_mon_ring_entries *sw_mon_ent);</div><div class='ctx'> enum hal_rx_mon_status</div><div class='ctx'> ath11k_hal_rx_parse_mon_status(struct ath11k_base *ab,</div><div class='ctx'> 			       struct hal_rx_mon_ppdu_info *ppdu_info,</div><div class='ctx'> 			       struct sk_buff *skb);</div><div class='ctx'> </div><div class='del'>-static inline u32 ath11k_he_ru_tones_to_nl80211_he_ru_alloc(u16 ru_tones)</div><div class='del'>-{</div><div class='del'>-	u32 ret = 0;</div><div class='del'>-</div><div class='del'>-	switch (ru_tones) {</div><div class='del'>-	case RU_26:</div><div class='del'>-		ret = NL80211_RATE_INFO_HE_RU_ALLOC_26;</div><div class='del'>-		break;</div><div class='del'>-	case RU_52:</div><div class='del'>-		ret = NL80211_RATE_INFO_HE_RU_ALLOC_52;</div><div class='del'>-		break;</div><div class='del'>-	case RU_106:</div><div class='del'>-		ret = NL80211_RATE_INFO_HE_RU_ALLOC_106;</div><div class='del'>-		break;</div><div class='del'>-	case RU_242:</div><div class='del'>-		ret = NL80211_RATE_INFO_HE_RU_ALLOC_242;</div><div class='del'>-		break;</div><div class='del'>-	case RU_484:</div><div class='del'>-		ret = NL80211_RATE_INFO_HE_RU_ALLOC_484;</div><div class='del'>-		break;</div><div class='del'>-	case RU_996:</div><div class='del'>-		ret = NL80211_RATE_INFO_HE_RU_ALLOC_996;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_0 0xDDBEEF</div><div class='ctx'> #define REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_1 0xADBEEF</div><div class='ctx'> #define REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_2 0xBDBEEF</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/hal_tx.c b/drivers/net/wireless/ath/ath11k/hal_tx.c<br/>index c8929de8ce6c..b919df6ce743 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/hal_tx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/hal_tx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/hal_tx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/hal_tx.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "hal_desc.h"</div><div class='hunk'>@@ -36,7 +37,7 @@ static const u8 dscp_tid_map[DSCP_TID_MAP_TBL_ENTRY_SIZE] = {</div><div class='ctx'> void ath11k_hal_tx_cmd_desc_setup(struct ath11k_base *ab, void *cmd,</div><div class='ctx'> 				  struct hal_tx_info *ti)</div><div class='ctx'> {</div><div class='del'>-	struct hal_tcl_data_cmd *tcl_cmd = (struct hal_tcl_data_cmd *)cmd;</div><div class='add'>+	struct hal_tcl_data_cmd *tcl_cmd = cmd;</div><div class='ctx'> </div><div class='ctx'> 	tcl_cmd-&gt;buf_addr_info.info0 =</div><div class='ctx'> 		FIELD_PREP(BUFFER_ADDR_INFO0_ADDR, ti-&gt;paddr);</div><div class='hunk'>@@ -44,8 +45,7 @@ void ath11k_hal_tx_cmd_desc_setup(struct ath11k_base *ab, void *cmd,</div><div class='ctx'> 		FIELD_PREP(BUFFER_ADDR_INFO1_ADDR,</div><div class='ctx'> 			   ((uint64_t)ti-&gt;paddr &gt;&gt; HAL_ADDR_MSB_REG_SHIFT));</div><div class='ctx'> 	tcl_cmd-&gt;buf_addr_info.info1 |=</div><div class='del'>-		FIELD_PREP(BUFFER_ADDR_INFO1_RET_BUF_MGR,</div><div class='del'>-			   (ti-&gt;ring_id + HAL_RX_BUF_RBM_SW0_BM)) |</div><div class='add'>+		FIELD_PREP(BUFFER_ADDR_INFO1_RET_BUF_MGR, ti-&gt;rbm_id) |</div><div class='ctx'> 		FIELD_PREP(BUFFER_ADDR_INFO1_SW_COOKIE, ti-&gt;desc_id);</div><div class='ctx'> </div><div class='ctx'> 	tcl_cmd-&gt;info0 =</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/hal_tx.h b/drivers/net/wireless/ath/ath11k/hal_tx.h<br/>index 36f4f6f6cbc2..46d17abd808b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/hal_tx.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/hal_tx.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/hal_tx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/hal_tx.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022, 2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef ATH11K_HAL_TX_H</div><div class='hunk'>@@ -35,6 +36,7 @@ struct hal_tx_info {</div><div class='ctx'> 	u8 lmac_id;</div><div class='ctx'> 	u8 dscp_tid_tbl_idx;</div><div class='ctx'> 	bool enable_mesh;</div><div class='add'>+	u8 rbm_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* TODO: Check if the actual desc macros can be used instead */</div><div class='hunk'>@@ -52,7 +54,7 @@ struct hal_tx_info {</div><div class='ctx'> struct hal_tx_status {</div><div class='ctx'> 	enum hal_wbm_rel_src_module buf_rel_source;</div><div class='ctx'> 	enum hal_wbm_tqm_rel_reason status;</div><div class='del'>-	u8 ack_rssi;</div><div class='add'>+	s8 ack_rssi;</div><div class='ctx'> 	u32 flags; /* %HAL_TX_STATUS_FLAGS_ */</div><div class='ctx'> 	u32 ppdu_id;</div><div class='ctx'> 	u8 try_cnt;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/hif.h b/drivers/net/wireless/ath/ath11k/hif.h<br/>index e9366f786fbb..cd9c4b838246 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/hif.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/hif.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/hif.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/hif.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _HIF_H_</div><div class='hunk'>@@ -9,17 +10,18 @@</div><div class='ctx'> #include "core.h"</div><div class='ctx'> </div><div class='ctx'> struct ath11k_hif_ops {</div><div class='del'>-	u32 (*read32)(struct ath11k_base *sc, u32 address);</div><div class='del'>-	void (*write32)(struct ath11k_base *sc, u32 address, u32 data);</div><div class='del'>-	void (*irq_enable)(struct ath11k_base *sc);</div><div class='del'>-	void (*irq_disable)(struct ath11k_base *sc);</div><div class='del'>-	int (*start)(struct ath11k_base *sc);</div><div class='del'>-	void (*stop)(struct ath11k_base *sc);</div><div class='del'>-	int (*power_up)(struct ath11k_base *sc);</div><div class='del'>-	void (*power_down)(struct ath11k_base *sc);</div><div class='add'>+	u32 (*read32)(struct ath11k_base *ab, u32 address);</div><div class='add'>+	void (*write32)(struct ath11k_base *ab, u32 address, u32 data);</div><div class='add'>+	int (*read)(struct ath11k_base *ab, void *buf, u32 start, u32 end);</div><div class='add'>+	void (*irq_enable)(struct ath11k_base *ab);</div><div class='add'>+	void (*irq_disable)(struct ath11k_base *ab);</div><div class='add'>+	int (*start)(struct ath11k_base *ab);</div><div class='add'>+	void (*stop)(struct ath11k_base *ab);</div><div class='add'>+	int (*power_up)(struct ath11k_base *ab);</div><div class='add'>+	void (*power_down)(struct ath11k_base *ab, bool is_suspend);</div><div class='ctx'> 	int (*suspend)(struct ath11k_base *ab);</div><div class='ctx'> 	int (*resume)(struct ath11k_base *ab);</div><div class='del'>-	int (*map_service_to_pipe)(struct ath11k_base *sc, u16 service_id,</div><div class='add'>+	int (*map_service_to_pipe)(struct ath11k_base *ab, u16 service_id,</div><div class='ctx'> 				   u8 *ul_pipe, u8 *dl_pipe);</div><div class='ctx'> 	int (*get_user_msi_vector)(struct ath11k_base *ab, char *user_name,</div><div class='ctx'> 				   int *num_vectors, u32 *user_base_data,</div><div class='hunk'>@@ -29,6 +31,7 @@ struct ath11k_hif_ops {</div><div class='ctx'> 	void (*ce_irq_enable)(struct ath11k_base *ab);</div><div class='ctx'> 	void (*ce_irq_disable)(struct ath11k_base *ab);</div><div class='ctx'> 	void (*get_ce_msi_idx)(struct ath11k_base *ab, u32 ce_id, u32 *msi_idx);</div><div class='add'>+	void (*coredump_download)(struct ath11k_base *ab);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void ath11k_hif_ce_irq_enable(struct ath11k_base *ab)</div><div class='hunk'>@@ -43,34 +46,40 @@ static inline void ath11k_hif_ce_irq_disable(struct ath11k_base *ab)</div><div class='ctx'> 		ab-&gt;hif.ops-&gt;ce_irq_disable(ab);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ath11k_hif_start(struct ath11k_base *sc)</div><div class='add'>+static inline int ath11k_hif_start(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='del'>-	return sc-&gt;hif.ops-&gt;start(sc);</div><div class='add'>+	return ab-&gt;hif.ops-&gt;start(ab);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ath11k_hif_stop(struct ath11k_base *sc)</div><div class='add'>+static inline void ath11k_hif_stop(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='del'>-	sc-&gt;hif.ops-&gt;stop(sc);</div><div class='add'>+	ab-&gt;hif.ops-&gt;stop(ab);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ath11k_hif_irq_enable(struct ath11k_base *sc)</div><div class='add'>+static inline void ath11k_hif_irq_enable(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='del'>-	sc-&gt;hif.ops-&gt;irq_enable(sc);</div><div class='add'>+	ab-&gt;hif.ops-&gt;irq_enable(ab);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ath11k_hif_irq_disable(struct ath11k_base *sc)</div><div class='add'>+static inline void ath11k_hif_irq_disable(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='del'>-	sc-&gt;hif.ops-&gt;irq_disable(sc);</div><div class='add'>+	ab-&gt;hif.ops-&gt;irq_disable(ab);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ath11k_hif_power_up(struct ath11k_base *sc)</div><div class='add'>+static inline int ath11k_hif_power_up(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='del'>-	return sc-&gt;hif.ops-&gt;power_up(sc);</div><div class='add'>+	if (!ab-&gt;hif.ops-&gt;power_up)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ab-&gt;hif.ops-&gt;power_up(ab);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ath11k_hif_power_down(struct ath11k_base *sc)</div><div class='add'>+static inline void ath11k_hif_power_down(struct ath11k_base *ab, bool is_suspend)</div><div class='ctx'> {</div><div class='del'>-	sc-&gt;hif.ops-&gt;power_down(sc);</div><div class='add'>+	if (!ab-&gt;hif.ops-&gt;power_down)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ab-&gt;hif.ops-&gt;power_down(ab, is_suspend);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int ath11k_hif_suspend(struct ath11k_base *ab)</div><div class='hunk'>@@ -89,20 +98,29 @@ static inline int ath11k_hif_resume(struct ath11k_base *ab)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u32 ath11k_hif_read32(struct ath11k_base *sc, u32 address)</div><div class='add'>+static inline u32 ath11k_hif_read32(struct ath11k_base *ab, u32 address)</div><div class='ctx'> {</div><div class='del'>-	return sc-&gt;hif.ops-&gt;read32(sc, address);</div><div class='add'>+	return ab-&gt;hif.ops-&gt;read32(ab, address);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ath11k_hif_write32(struct ath11k_base *sc, u32 address, u32 data)</div><div class='add'>+static inline void ath11k_hif_write32(struct ath11k_base *ab, u32 address, u32 data)</div><div class='ctx'> {</div><div class='del'>-	sc-&gt;hif.ops-&gt;write32(sc, address, data);</div><div class='add'>+	ab-&gt;hif.ops-&gt;write32(ab, address, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ath11k_hif_map_service_to_pipe(struct ath11k_base *sc, u16 service_id,</div><div class='add'>+static inline int ath11k_hif_read(struct ath11k_base *ab, void *buf,</div><div class='add'>+				  u32 start, u32 end)</div><div class='add'>+{</div><div class='add'>+	if (!ab-&gt;hif.ops-&gt;read)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ab-&gt;hif.ops-&gt;read(ab, buf, start, end);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath11k_hif_map_service_to_pipe(struct ath11k_base *ab, u16 service_id,</div><div class='ctx'> 						 u8 *ul_pipe, u8 *dl_pipe)</div><div class='ctx'> {</div><div class='del'>-	return sc-&gt;hif.ops-&gt;map_service_to_pipe(sc, service_id, ul_pipe, dl_pipe);</div><div class='add'>+	return ab-&gt;hif.ops-&gt;map_service_to_pipe(ab, service_id, ul_pipe, dl_pipe);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int ath11k_get_user_msi_vector(struct ath11k_base *ab, char *user_name,</div><div class='hunk'>@@ -134,4 +152,11 @@ static inline void ath11k_get_ce_msi_idx(struct ath11k_base *ab, u32 ce_id,</div><div class='ctx'> 	else</div><div class='ctx'> 		*msi_data_idx = ce_id;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline void ath11k_hif_coredump_download(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	if (ab-&gt;hif.ops-&gt;coredump_download)</div><div class='add'>+		ab-&gt;hif.ops-&gt;coredump_download(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _HIF_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/htc.c b/drivers/net/wireless/ath/ath11k/htc.c<br/>index 54b1d34724d7..4571d01cc33d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/htc.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/htc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/htc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/htc.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='hunk'>@@ -46,7 +47,6 @@ static struct sk_buff *ath11k_htc_build_tx_ctrl_skb(void *ab)</div><div class='ctx'> 	skb_cb = ATH11K_SKB_CB(skb);</div><div class='ctx'> 	memset(skb_cb, 0, sizeof(*skb_cb));</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_HTC, "%s: skb %pK\n", __func__, skb);</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -81,6 +81,8 @@ int ath11k_htc_send(struct ath11k_htc *htc,</div><div class='ctx'> 	struct ath11k_base *ab = htc-&gt;ab;</div><div class='ctx'> 	int credits = 0;</div><div class='ctx'> 	int ret;</div><div class='add'>+	bool credit_flow_enabled = (ab-&gt;hw_params.credit_flow &amp;&amp;</div><div class='add'>+				    ep-&gt;tx_credit_flow_enabled);</div><div class='ctx'> </div><div class='ctx'> 	if (eid &gt;= ATH11K_HTC_EP_COUNT) {</div><div class='ctx'> 		ath11k_warn(ab, "Invalid endpoint id: %d\n", eid);</div><div class='hunk'>@@ -89,12 +91,12 @@ int ath11k_htc_send(struct ath11k_htc *htc,</div><div class='ctx'> </div><div class='ctx'> 	skb_push(skb, sizeof(struct ath11k_htc_hdr));</div><div class='ctx'> </div><div class='del'>-	if (ep-&gt;tx_credit_flow_enabled) {</div><div class='add'>+	if (credit_flow_enabled) {</div><div class='ctx'> 		credits = DIV_ROUND_UP(skb-&gt;len, htc-&gt;target_credit_size);</div><div class='ctx'> 		spin_lock_bh(&amp;htc-&gt;tx_lock);</div><div class='ctx'> 		if (ep-&gt;tx_credits &lt; credits) {</div><div class='ctx'> 			ath11k_dbg(ab, ATH11K_DBG_HTC,</div><div class='del'>-				   "htc insufficient credits ep %d required %d available %d\n",</div><div class='add'>+				   "ep %d insufficient credits required %d total %d\n",</div><div class='ctx'> 				   eid, credits, ep-&gt;tx_credits);</div><div class='ctx'> 			spin_unlock_bh(&amp;htc-&gt;tx_lock);</div><div class='ctx'> 			ret = -EAGAIN;</div><div class='hunk'>@@ -102,7 +104,7 @@ int ath11k_htc_send(struct ath11k_htc *htc,</div><div class='ctx'> 		}</div><div class='ctx'> 		ep-&gt;tx_credits -= credits;</div><div class='ctx'> 		ath11k_dbg(ab, ATH11K_DBG_HTC,</div><div class='del'>-			   "htc ep %d consumed %d credits (total %d)\n",</div><div class='add'>+			   "ep %d credits consumed %d total %d\n",</div><div class='ctx'> 			   eid, credits, ep-&gt;tx_credits);</div><div class='ctx'> 		spin_unlock_bh(&amp;htc-&gt;tx_lock);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -117,6 +119,9 @@ int ath11k_htc_send(struct ath11k_htc *htc,</div><div class='ctx'> 		goto err_credits;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_HTC, "tx skb %p eid %d paddr %pad\n",</div><div class='add'>+		   skb, skb_cb-&gt;eid, &amp;skb_cb-&gt;paddr);</div><div class='add'>+</div><div class='ctx'> 	ret = ath11k_ce_send(htc-&gt;ab, skb, ep-&gt;ul_pipe_id, ep-&gt;eid);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_unmap;</div><div class='hunk'>@@ -126,11 +131,11 @@ int ath11k_htc_send(struct ath11k_htc *htc,</div><div class='ctx'> err_unmap:</div><div class='ctx'> 	dma_unmap_single(dev, skb_cb-&gt;paddr, skb-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> err_credits:</div><div class='del'>-	if (ep-&gt;tx_credit_flow_enabled) {</div><div class='add'>+	if (credit_flow_enabled) {</div><div class='ctx'> 		spin_lock_bh(&amp;htc-&gt;tx_lock);</div><div class='ctx'> 		ep-&gt;tx_credits += credits;</div><div class='ctx'> 		ath11k_dbg(ab, ATH11K_DBG_HTC,</div><div class='del'>-			   "htc ep %d reverted %d credits back (total %d)\n",</div><div class='add'>+			   "ep %d credits reverted %d total %d\n",</div><div class='ctx'> 			   eid, credits, ep-&gt;tx_credits);</div><div class='ctx'> 		spin_unlock_bh(&amp;htc-&gt;tx_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -165,7 +170,7 @@ ath11k_htc_process_credit_report(struct ath11k_htc *htc,</div><div class='ctx'> 		ep = &amp;htc-&gt;endpoint[report-&gt;eid];</div><div class='ctx'> 		ep-&gt;tx_credits += report-&gt;credits;</div><div class='ctx'> </div><div class='del'>-		ath11k_dbg(ab, ATH11K_DBG_HTC, "htc ep %d got %d credits (total %d)\n",</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_HTC, "ep %d credits got %d total %d\n",</div><div class='ctx'> 			   report-&gt;eid, report-&gt;credits, ep-&gt;tx_credits);</div><div class='ctx'> </div><div class='ctx'> 		if (ep-&gt;ep_ops.ep_tx_credits) {</div><div class='hunk'>@@ -203,23 +208,25 @@ static int ath11k_htc_process_trailer(struct ath11k_htc *htc,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		switch (record-&gt;hdr.id) {</div><div class='del'>-		case ATH11K_HTC_RECORD_CREDITS:</div><div class='del'>-			len = sizeof(struct ath11k_htc_credit_report);</div><div class='del'>-			if (record-&gt;hdr.len &lt; len) {</div><div class='del'>-				ath11k_warn(ab, "Credit report too long\n");</div><div class='del'>-				status = -EINVAL;</div><div class='add'>+		if (ab-&gt;hw_params.credit_flow) {</div><div class='add'>+			switch (record-&gt;hdr.id) {</div><div class='add'>+			case ATH11K_HTC_RECORD_CREDITS:</div><div class='add'>+				len = sizeof(struct ath11k_htc_credit_report);</div><div class='add'>+				if (record-&gt;hdr.len &lt; len) {</div><div class='add'>+					ath11k_warn(ab, "Credit report too long\n");</div><div class='add'>+					status = -EINVAL;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				ath11k_htc_process_credit_report(htc,</div><div class='add'>+								 record-&gt;credit_report,</div><div class='add'>+								 record-&gt;hdr.len,</div><div class='add'>+								 src_eid);</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				ath11k_warn(ab, "Unhandled record: id:%d length:%d\n",</div><div class='add'>+					    record-&gt;hdr.id, record-&gt;hdr.len);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			ath11k_htc_process_credit_report(htc,</div><div class='del'>-							 record-&gt;credit_report,</div><div class='del'>-							 record-&gt;hdr.len,</div><div class='del'>-							 src_eid);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ath11k_warn(ab, "Unhandled record: id:%d length:%d\n",</div><div class='del'>-				    record-&gt;hdr.id, record-&gt;hdr.len);</div><div class='del'>-			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (status)</div><div class='hunk'>@@ -235,7 +242,7 @@ static int ath11k_htc_process_trailer(struct ath11k_htc *htc,</div><div class='ctx'> </div><div class='ctx'> static void ath11k_htc_suspend_complete(struct ath11k_base *ab, bool ack)</div><div class='ctx'> {</div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_BOOT, "boot suspend complete %d\n", ack);</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_BOOT, "suspend complete %d\n", ack);</div><div class='ctx'> </div><div class='ctx'> 	if (ack)</div><div class='ctx'> 		set_bit(ATH11K_FLAG_HTC_SUSPEND_COMPLETE, &amp;ab-&gt;dev_flags);</div><div class='hunk'>@@ -245,6 +252,36 @@ static void ath11k_htc_suspend_complete(struct ath11k_base *ab, bool ack)</div><div class='ctx'> 	complete(&amp;ab-&gt;htc_suspend);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void ath11k_htc_tx_completion_handler(struct ath11k_base *ab,</div><div class='add'>+				      struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_htc *htc = &amp;ab-&gt;htc;</div><div class='add'>+	struct ath11k_htc_ep *ep;</div><div class='add'>+	void (*ep_tx_complete)(struct ath11k_base *, struct sk_buff *);</div><div class='add'>+	u8 eid;</div><div class='add'>+</div><div class='add'>+	eid = ATH11K_SKB_CB(skb)-&gt;eid;</div><div class='add'>+	if (eid &gt;= ATH11K_HTC_EP_COUNT) {</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ep = &amp;htc-&gt;endpoint[eid];</div><div class='add'>+	spin_lock_bh(&amp;htc-&gt;tx_lock);</div><div class='add'>+	ep_tx_complete = ep-&gt;ep_ops.ep_tx_complete;</div><div class='add'>+	spin_unlock_bh(&amp;htc-&gt;tx_lock);</div><div class='add'>+	if (!ep_tx_complete) {</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	ep_tx_complete(htc-&gt;ab, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_htc_wakeup_from_suspend(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_BOOT, "wakeup from suspend is received\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void ath11k_htc_rx_completion_handler(struct ath11k_base *ab,</div><div class='ctx'> 				      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -253,7 +290,7 @@ void ath11k_htc_rx_completion_handler(struct ath11k_base *ab,</div><div class='ctx'> 	struct ath11k_htc_hdr *hdr;</div><div class='ctx'> 	struct ath11k_htc_ep *ep;</div><div class='ctx'> 	u16 payload_len;</div><div class='del'>-	u32 trailer_len = 0;</div><div class='add'>+	u32 message_id, trailer_len = 0;</div><div class='ctx'> 	size_t min_len;</div><div class='ctx'> 	u8 eid;</div><div class='ctx'> 	bool trailer_present;</div><div class='hunk'>@@ -288,6 +325,9 @@ void ath11k_htc_rx_completion_handler(struct ath11k_base *ab,</div><div class='ctx'> 	trailer_present = (FIELD_GET(HTC_HDR_FLAGS, hdr-&gt;htc_info)) &amp;</div><div class='ctx'> 			  ATH11K_HTC_FLAG_TRAILER_PRESENT;</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_HTC, "rx ep %d skb %p trailer_present %d\n",</div><div class='add'>+		   eid, skb, trailer_present);</div><div class='add'>+</div><div class='ctx'> 	if (trailer_present) {</div><div class='ctx'> 		u8 *trailer;</div><div class='ctx'> </div><div class='hunk'>@@ -320,7 +360,12 @@ void ath11k_htc_rx_completion_handler(struct ath11k_base *ab,</div><div class='ctx'> 	if (eid == ATH11K_HTC_EP_0) {</div><div class='ctx'> 		struct ath11k_htc_msg *msg = (struct ath11k_htc_msg *)skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-		switch (FIELD_GET(HTC_MSG_MESSAGEID, msg-&gt;msg_svc_id)) {</div><div class='add'>+		message_id = FIELD_GET(HTC_MSG_MESSAGEID, msg-&gt;msg_svc_id);</div><div class='add'>+</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_HTC, "rx ep %d skb %p message_id %d\n",</div><div class='add'>+			   eid, skb, message_id);</div><div class='add'>+</div><div class='add'>+		switch (message_id) {</div><div class='ctx'> 		case ATH11K_HTC_MSG_READY_ID:</div><div class='ctx'> 		case ATH11K_HTC_MSG_CONNECT_SERVICE_RESP_ID:</div><div class='ctx'> 			/* handle HTC control message */</div><div class='hunk'>@@ -349,6 +394,7 @@ void ath11k_htc_rx_completion_handler(struct ath11k_base *ab,</div><div class='ctx'> 			ath11k_htc_suspend_complete(ab, false);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ATH11K_HTC_MSG_WAKEUP_FROM_SUSPEND_ID:</div><div class='add'>+			ath11k_htc_wakeup_from_suspend(ab);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			ath11k_warn(ab, "ignoring unsolicited htc ep0 event %ld\n",</div><div class='hunk'>@@ -358,8 +404,6 @@ void ath11k_htc_rx_completion_handler(struct ath11k_base *ab,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_HTC, "htc rx completion ep %d skb %pK\n",</div><div class='del'>-		   eid, skb);</div><div class='ctx'> 	ep-&gt;ep_ops.ep_rx_complete(ab, skb);</div><div class='ctx'> </div><div class='ctx'> 	/* poll tx completion for interrupt disabled CE's */</div><div class='hunk'>@@ -453,7 +497,7 @@ static u8 ath11k_htc_get_credit_allocation(struct ath11k_htc *htc,</div><div class='ctx'> static int ath11k_htc_setup_target_buffer_assignments(struct ath11k_htc *htc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_htc_svc_tx_credits *serv_entry;</div><div class='del'>-	u32 svc_id[] = {</div><div class='add'>+	static const u32 svc_id[] = {</div><div class='ctx'> 		ATH11K_HTC_SVC_ID_WMI_CONTROL,</div><div class='ctx'> 		ATH11K_HTC_SVC_ID_WMI_CONTROL_MAC1,</div><div class='ctx'> 		ATH11K_HTC_SVC_ID_WMI_CONTROL_MAC2,</div><div class='hunk'>@@ -529,7 +573,7 @@ int ath11k_htc_wait_target(struct ath11k_htc *htc)</div><div class='ctx'> 	htc-&gt;target_credit_size = credit_size;</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_HTC,</div><div class='del'>-		   "Target ready! transmit resources: %d size:%d\n",</div><div class='add'>+		   "target ready total_transmit_credits %d target_credit_size %d\n",</div><div class='ctx'> 		   htc-&gt;total_transmit_credits, htc-&gt;target_credit_size);</div><div class='ctx'> </div><div class='ctx'> 	if ((htc-&gt;total_transmit_credits == 0) ||</div><div class='hunk'>@@ -580,7 +624,7 @@ int ath11k_htc_connect_service(struct ath11k_htc *htc,</div><div class='ctx'> 						    conn_req-&gt;service_id);</div><div class='ctx'> 	if (!tx_alloc)</div><div class='ctx'> 		ath11k_dbg(ab, ATH11K_DBG_BOOT,</div><div class='del'>-			   "boot htc service %s does not allocate target credits\n",</div><div class='add'>+			   "htc service %s does not allocate target credits\n",</div><div class='ctx'> 			   htc_service_name(conn_req-&gt;service_id));</div><div class='ctx'> </div><div class='ctx'> 	skb = ath11k_htc_build_tx_ctrl_skb(htc-&gt;ab);</div><div class='hunk'>@@ -607,6 +651,11 @@ int ath11k_htc_connect_service(struct ath11k_htc *htc,</div><div class='ctx'> 		disable_credit_flow_ctrl = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!ab-&gt;hw_params.credit_flow) {</div><div class='add'>+		flags |= ATH11K_HTC_CONN_FLAGS_DISABLE_CREDIT_FLOW_CTRL;</div><div class='add'>+		disable_credit_flow_ctrl = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	req_msg-&gt;flags_len = FIELD_PREP(HTC_SVC_MSG_CONNECTIONFLAGS, flags);</div><div class='ctx'> 	req_msg-&gt;msg_svc_id |= FIELD_PREP(HTC_SVC_MSG_SERVICE_ID,</div><div class='ctx'> 					  conn_req-&gt;service_id);</div><div class='hunk'>@@ -640,7 +689,7 @@ int ath11k_htc_connect_service(struct ath11k_htc *htc,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_HTC,</div><div class='del'>-		   "HTC Service %s connect response: status: 0x%lx, assigned ep: 0x%lx\n",</div><div class='add'>+		   "service %s connect response status 0x%lx assigned ep 0x%lx\n",</div><div class='ctx'> 		   htc_service_name(service_id),</div><div class='ctx'> 		   FIELD_GET(HTC_SVC_RESP_MSG_STATUS, resp_msg-&gt;flags_len),</div><div class='ctx'> 		   FIELD_GET(HTC_SVC_RESP_MSG_ENDPOINTID, resp_msg-&gt;flags_len));</div><div class='hunk'>@@ -700,14 +749,14 @@ setup:</div><div class='ctx'> 		return status;</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_BOOT,</div><div class='del'>-		   "boot htc service '%s' ul pipe %d dl pipe %d eid %d ready\n",</div><div class='add'>+		   "htc service '%s' ul pipe %d dl pipe %d eid %d ready\n",</div><div class='ctx'> 		   htc_service_name(ep-&gt;service_id), ep-&gt;ul_pipe_id,</div><div class='ctx'> 		   ep-&gt;dl_pipe_id, ep-&gt;eid);</div><div class='ctx'> </div><div class='ctx'> 	if (disable_credit_flow_ctrl &amp;&amp; ep-&gt;tx_credit_flow_enabled) {</div><div class='ctx'> 		ep-&gt;tx_credit_flow_enabled = false;</div><div class='ctx'> 		ath11k_dbg(ab, ATH11K_DBG_BOOT,</div><div class='del'>-			   "boot htc service '%s' eid %d TX flow control disabled\n",</div><div class='add'>+			   "htc service '%s' eid %d tx flow control disabled\n",</div><div class='ctx'> 			   htc_service_name(ep-&gt;service_id), assigned_eid);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -732,7 +781,10 @@ int ath11k_htc_start(struct ath11k_htc *htc)</div><div class='ctx'> 	msg-&gt;msg_id = FIELD_PREP(HTC_MSG_MESSAGEID,</div><div class='ctx'> 				 ATH11K_HTC_MSG_SETUP_COMPLETE_EX_ID);</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_HTC, "HTC is using TX credit flow control\n");</div><div class='add'>+	if (ab-&gt;hw_params.credit_flow)</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_HTC, "using tx credit flow control\n");</div><div class='add'>+	else</div><div class='add'>+		msg-&gt;flags |= ATH11K_GLOBAL_DISABLE_CREDIT_FLOW;</div><div class='ctx'> </div><div class='ctx'> 	status = ath11k_htc_send(htc, ATH11K_HTC_EP_0, skb);</div><div class='ctx'> 	if (status) {</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/htc.h b/drivers/net/wireless/ath/ath11k/htc.h<br/>index 6c8a469d7f9d..86f77eacaea7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/htc.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/htc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/htc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/htc.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef ATH11K_HTC_H</div><div class='hunk'>@@ -83,8 +84,8 @@ enum ath11k_htc_conn_flags {</div><div class='ctx'> 	ATH11K_HTC_CONN_FLAGS_THRESHOLD_LEVEL_ONE_HALF      = 0x1,</div><div class='ctx'> 	ATH11K_HTC_CONN_FLAGS_THRESHOLD_LEVEL_THREE_FOURTHS = 0x2,</div><div class='ctx'> 	ATH11K_HTC_CONN_FLAGS_THRESHOLD_LEVEL_UNITY         = 0x3,</div><div class='del'>-	ATH11K_HTC_CONN_FLAGS_REDUCE_CREDIT_DRIBBLE    = 1 &lt;&lt; 2,</div><div class='del'>-	ATH11K_HTC_CONN_FLAGS_DISABLE_CREDIT_FLOW_CTRL = 1 &lt;&lt; 3</div><div class='add'>+	ATH11K_HTC_CONN_FLAGS_REDUCE_CREDIT_DRIBBLE	    = 0x4,</div><div class='add'>+	ATH11K_HTC_CONN_FLAGS_DISABLE_CREDIT_FLOW_CTRL	    = 0x8,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ath11k_htc_conn_svc_status {</div><div class='hunk'>@@ -116,6 +117,8 @@ struct ath11k_htc_conn_svc_resp {</div><div class='ctx'> 	u32 svc_meta_pad;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+#define ATH11K_GLOBAL_DISABLE_CREDIT_FLOW BIT(1)</div><div class='add'>+</div><div class='ctx'> struct ath11k_htc_setup_complete_extended {</div><div class='ctx'> 	u32 msg_id;</div><div class='ctx'> 	u32 flags;</div><div class='hunk'>@@ -148,22 +151,7 @@ struct ath11k_htc_credit_report {</div><div class='ctx'> </div><div class='ctx'> struct ath11k_htc_record {</div><div class='ctx'> 	struct ath11k_htc_record_hdr hdr;</div><div class='del'>-	union {</div><div class='del'>-		struct ath11k_htc_credit_report credit_report[0];</div><div class='del'>-		u8 pauload[0];</div><div class='del'>-	};</div><div class='del'>-} __packed __aligned(4);</div><div class='del'>-</div><div class='del'>-/* note: the trailer offset is dynamic depending</div><div class='del'>- * on payload length. this is only a struct layout draft</div><div class='del'>- */</div><div class='del'>-struct ath11k_htc_frame {</div><div class='del'>-	struct ath11k_htc_hdr hdr;</div><div class='del'>-	union {</div><div class='del'>-		struct ath11k_htc_msg msg;</div><div class='del'>-		u8 payload[0];</div><div class='del'>-	};</div><div class='del'>-	struct ath11k_htc_record trailer[0];</div><div class='add'>+	struct ath11k_htc_credit_report credit_report[];</div><div class='ctx'> } __packed __aligned(4);</div><div class='ctx'> </div><div class='ctx'> enum ath11k_htc_svc_gid {</div><div class='hunk'>@@ -305,5 +293,6 @@ int ath11k_htc_send(struct ath11k_htc *htc, enum ath11k_htc_ep_id eid,</div><div class='ctx'> struct sk_buff *ath11k_htc_alloc_skb(struct ath11k_base *ar, int size);</div><div class='ctx'> void ath11k_htc_rx_completion_handler(struct ath11k_base *ar,</div><div class='ctx'> 				      struct sk_buff *skb);</div><div class='del'>-</div><div class='add'>+void ath11k_htc_tx_completion_handler(struct ath11k_base *ab,</div><div class='add'>+				      struct sk_buff *skb);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/hw.c b/drivers/net/wireless/ath/ath11k/hw.c<br/>index 377ae8d5b58f..caa6dc12a790 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/hw.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/hw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/hw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/hw.c</a></div><div class='hunk'>@@ -1,15 +1,18 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/bitfield.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "hw.h"</div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "ce.h"</div><div class='add'>+#include "hif.h"</div><div class='add'>+#include "hal.h"</div><div class='add'>+#include "hw.h"</div><div class='ctx'> </div><div class='ctx'> /* Map from pdev index to hw mac index */</div><div class='ctx'> static u8 ath11k_hw_ipq8074_mac_from_pdev_id(int pdev_idx)</div><div class='hunk'>@@ -45,10 +48,17 @@ static void ath11k_hw_qcn9074_tx_mesh_enable(struct ath11k_base *ab,</div><div class='ctx'> 				     true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ath11k_hw_wcn6855_tx_mesh_enable(struct ath11k_base *ab,</div><div class='add'>+					     struct hal_tcl_data_cmd *tcl_cmd)</div><div class='add'>+{</div><div class='add'>+	tcl_cmd-&gt;info3 |= FIELD_PREP(HAL_QCN9074_TCL_DATA_CMD_INFO3_MESH_ENABLE,</div><div class='add'>+				     true);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath11k_init_wmi_config_qca6390(struct ath11k_base *ab,</div><div class='ctx'> 					   struct target_resource_config *config)</div><div class='ctx'> {</div><div class='del'>-	config-&gt;num_vdevs = 4;</div><div class='add'>+	config-&gt;num_vdevs = ab-&gt;hw_params.num_vdevs;</div><div class='ctx'> 	config-&gt;num_peers = 16;</div><div class='ctx'> 	config-&gt;num_tids = 32;</div><div class='ctx'> </div><div class='hunk'>@@ -89,23 +99,70 @@ static void ath11k_init_wmi_config_qca6390(struct ath11k_base *ab,</div><div class='ctx'> 	config-&gt;num_multicast_filter_entries = 0x20;</div><div class='ctx'> 	config-&gt;num_wow_filters = 0x16;</div><div class='ctx'> 	config-&gt;num_keep_alive_pattern = 0;</div><div class='add'>+	config-&gt;flag1 |= WMI_RSRC_CFG_FLAG1_BSS_CHANNEL_INFO_64;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_hw_ipq8074_reo_setup(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	u32 reo_base = HAL_SEQ_WCSS_UMAC_REO_REG;</div><div class='add'>+	u32 val;</div><div class='add'>+	/* Each hash entry uses three bits to map to a particular ring. */</div><div class='add'>+	u32 ring_hash_map = HAL_HASH_ROUTING_RING_SW1 &lt;&lt; 0 |</div><div class='add'>+		HAL_HASH_ROUTING_RING_SW2 &lt;&lt; 3 |</div><div class='add'>+		HAL_HASH_ROUTING_RING_SW3 &lt;&lt; 6 |</div><div class='add'>+		HAL_HASH_ROUTING_RING_SW4 &lt;&lt; 9 |</div><div class='add'>+		HAL_HASH_ROUTING_RING_SW1 &lt;&lt; 12 |</div><div class='add'>+		HAL_HASH_ROUTING_RING_SW2 &lt;&lt; 15 |</div><div class='add'>+		HAL_HASH_ROUTING_RING_SW3 &lt;&lt; 18 |</div><div class='add'>+		HAL_HASH_ROUTING_RING_SW4 &lt;&lt; 21;</div><div class='add'>+</div><div class='add'>+	val = ath11k_hif_read32(ab, reo_base + HAL_REO1_GEN_ENABLE);</div><div class='add'>+</div><div class='add'>+	val &amp;= ~HAL_REO1_GEN_ENABLE_FRAG_DST_RING;</div><div class='add'>+	val |= FIELD_PREP(HAL_REO1_GEN_ENABLE_FRAG_DST_RING,</div><div class='add'>+			HAL_SRNG_RING_ID_REO2SW1) |</div><div class='add'>+		FIELD_PREP(HAL_REO1_GEN_ENABLE_AGING_LIST_ENABLE, 1) |</div><div class='add'>+		FIELD_PREP(HAL_REO1_GEN_ENABLE_AGING_FLUSH_ENABLE, 1);</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_GEN_ENABLE, val);</div><div class='add'>+</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_0(ab),</div><div class='add'>+			   HAL_DEFAULT_REO_TIMEOUT_USEC);</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_1(ab),</div><div class='add'>+			   HAL_DEFAULT_REO_TIMEOUT_USEC);</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_2(ab),</div><div class='add'>+			   HAL_DEFAULT_REO_TIMEOUT_USEC);</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_3(ab),</div><div class='add'>+			   HAL_DEFAULT_REO_TIMEOUT_USEC);</div><div class='add'>+</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_0,</div><div class='add'>+			   FIELD_PREP(HAL_REO_DEST_RING_CTRL_HASH_RING_MAP,</div><div class='add'>+				      ring_hash_map));</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_1,</div><div class='add'>+			   FIELD_PREP(HAL_REO_DEST_RING_CTRL_HASH_RING_MAP,</div><div class='add'>+				      ring_hash_map));</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_2,</div><div class='add'>+			   FIELD_PREP(HAL_REO_DEST_RING_CTRL_HASH_RING_MAP,</div><div class='add'>+				      ring_hash_map));</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_3,</div><div class='add'>+			   FIELD_PREP(HAL_REO_DEST_RING_CTRL_HASH_RING_MAP,</div><div class='add'>+				      ring_hash_map));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_init_wmi_config_ipq8074(struct ath11k_base *ab,</div><div class='ctx'> 					   struct target_resource_config *config)</div><div class='ctx'> {</div><div class='del'>-	config-&gt;num_vdevs = ab-&gt;num_radios * TARGET_NUM_VDEVS;</div><div class='add'>+	config-&gt;num_vdevs = ab-&gt;num_radios * TARGET_NUM_VDEVS(ab);</div><div class='ctx'> </div><div class='ctx'> 	if (ab-&gt;num_radios == 2) {</div><div class='del'>-		config-&gt;num_peers = TARGET_NUM_PEERS(DBS);</div><div class='del'>-		config-&gt;num_tids = TARGET_NUM_TIDS(DBS);</div><div class='add'>+		config-&gt;num_peers = TARGET_NUM_PEERS(ab, DBS);</div><div class='add'>+		config-&gt;num_tids = TARGET_NUM_TIDS(ab, DBS);</div><div class='ctx'> 	} else if (ab-&gt;num_radios == 3) {</div><div class='del'>-		config-&gt;num_peers = TARGET_NUM_PEERS(DBS_SBS);</div><div class='del'>-		config-&gt;num_tids = TARGET_NUM_TIDS(DBS_SBS);</div><div class='add'>+		config-&gt;num_peers = TARGET_NUM_PEERS(ab, DBS_SBS);</div><div class='add'>+		config-&gt;num_tids = TARGET_NUM_TIDS(ab, DBS_SBS);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Control should not reach here */</div><div class='del'>-		config-&gt;num_peers = TARGET_NUM_PEERS(SINGLE);</div><div class='del'>-		config-&gt;num_tids = TARGET_NUM_TIDS(SINGLE);</div><div class='add'>+		config-&gt;num_peers = TARGET_NUM_PEERS(ab, SINGLE);</div><div class='add'>+		config-&gt;num_tids = TARGET_NUM_TIDS(ab, SINGLE);</div><div class='ctx'> 	}</div><div class='ctx'> 	config-&gt;num_offload_peers = TARGET_NUM_OFFLD_PEERS;</div><div class='ctx'> 	config-&gt;num_offload_reorder_buffs = TARGET_NUM_OFFLD_REORDER_BUFFS;</div><div class='hunk'>@@ -143,6 +200,11 @@ static void ath11k_init_wmi_config_ipq8074(struct ath11k_base *ab,</div><div class='ctx'> 	config-&gt;peer_map_unmap_v2_support = 1;</div><div class='ctx'> 	config-&gt;twt_ap_pdev_count = ab-&gt;num_radios;</div><div class='ctx'> 	config-&gt;twt_ap_sta_count = 1000;</div><div class='add'>+	config-&gt;flag1 |= WMI_RSRC_CFG_FLAG1_BSS_CHANNEL_INFO_64;</div><div class='add'>+	config-&gt;flag1 |= WMI_RSRC_CFG_FLAG1_ACK_RSSI;</div><div class='add'>+	config-&gt;ema_max_vap_cnt = ab-&gt;num_radios;</div><div class='add'>+	config-&gt;ema_max_profile_period = TARGET_EMA_MAX_PROFILE_PERIOD;</div><div class='add'>+	config-&gt;beacon_tx_offload_max_vdev += config-&gt;ema_max_vap_cnt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath11k_hw_mac_id_to_pdev_id_ipq8074(struct ath11k_hw_params *hw,</div><div class='hunk'>@@ -216,6 +278,12 @@ static u8 ath11k_hw_ipq8074_rx_desc_get_mesh_ctl(struct hal_rx_desc *desc)</div><div class='ctx'> 			 __le32_to_cpu(desc-&gt;u.ipq8074.msdu_start.info2));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ath11k_hw_ipq8074_rx_desc_get_ldpc_support(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(RX_MSDU_START_INFO2_LDPC,</div><div class='add'>+			 __le32_to_cpu(desc-&gt;u.ipq8074.msdu_start.info2));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool ath11k_hw_ipq8074_rx_desc_get_mpdu_seq_ctl_vld(struct hal_rx_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	return !!FIELD_GET(RX_MPDU_START_INFO1_MPDU_SEQ_CTRL_VALID,</div><div class='hunk'>@@ -318,6 +386,17 @@ static void ath11k_hw_ipq8074_rx_desc_set_msdu_len(struct hal_rx_desc *desc, u16</div><div class='ctx'> 	desc-&gt;u.ipq8074.msdu_start.info1 = __cpu_to_le32(info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ath11k_hw_ipq8074_rx_desc_mac_addr2_valid(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return __le32_to_cpu(desc-&gt;u.ipq8074.mpdu_start.info1) &amp;</div><div class='add'>+	       RX_MPDU_START_INFO1_MAC_ADDR2_VALID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return desc-&gt;u.ipq8074.mpdu_start.addr2;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static</div><div class='ctx'> struct rx_attention *ath11k_hw_ipq8074_rx_desc_get_attention(struct hal_rx_desc *desc)</div><div class='ctx'> {</div><div class='hunk'>@@ -376,6 +455,12 @@ static u8 ath11k_hw_qcn9074_rx_desc_get_mesh_ctl(struct hal_rx_desc *desc)</div><div class='ctx'> 			 __le32_to_cpu(desc-&gt;u.qcn9074.msdu_start.info2));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ath11k_hw_qcn9074_rx_desc_get_ldpc_support(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(RX_MSDU_START_INFO2_LDPC,</div><div class='add'>+			 __le32_to_cpu(desc-&gt;u.qcn9074.msdu_start.info2));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool ath11k_hw_qcn9074_rx_desc_get_mpdu_seq_ctl_vld(struct hal_rx_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	return !!FIELD_GET(RX_MPDU_START_INFO11_MPDU_SEQ_CTRL_VALID,</div><div class='hunk'>@@ -489,6 +574,332 @@ static u8 *ath11k_hw_qcn9074_rx_desc_get_msdu_payload(struct hal_rx_desc *desc)</div><div class='ctx'> 	return &amp;desc-&gt;u.qcn9074.msdu_payload[0];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ath11k_hw_ipq9074_rx_desc_mac_addr2_valid(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return __le32_to_cpu(desc-&gt;u.qcn9074.mpdu_start.info11) &amp;</div><div class='add'>+	       RX_MPDU_START_INFO11_MAC_ADDR2_VALID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *ath11k_hw_ipq9074_rx_desc_mpdu_start_addr2(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return desc-&gt;u.qcn9074.mpdu_start.addr2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath11k_hw_wcn6855_rx_desc_get_first_msdu(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!FIELD_GET(RX_MSDU_END_INFO2_FIRST_MSDU_WCN6855,</div><div class='add'>+			   __le32_to_cpu(desc-&gt;u.wcn6855.msdu_end.info2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath11k_hw_wcn6855_rx_desc_get_last_msdu(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!FIELD_GET(RX_MSDU_END_INFO2_LAST_MSDU_WCN6855,</div><div class='add'>+			   __le32_to_cpu(desc-&gt;u.wcn6855.msdu_end.info2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath11k_hw_wcn6855_rx_desc_get_l3_pad_bytes(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(RX_MSDU_END_INFO2_L3_HDR_PADDING,</div><div class='add'>+			 __le32_to_cpu(desc-&gt;u.wcn6855.msdu_end.info2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *ath11k_hw_wcn6855_rx_desc_get_hdr_status(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return desc-&gt;u.wcn6855.hdr_status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath11k_hw_wcn6855_rx_desc_encrypt_valid(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return __le32_to_cpu(desc-&gt;u.wcn6855.mpdu_start.info1) &amp;</div><div class='add'>+	       RX_MPDU_START_INFO1_ENCRYPT_INFO_VALID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath11k_hw_wcn6855_rx_desc_get_encrypt_type(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(RX_MPDU_START_INFO2_ENC_TYPE,</div><div class='add'>+			 __le32_to_cpu(desc-&gt;u.wcn6855.mpdu_start.info2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath11k_hw_wcn6855_rx_desc_get_decap_type(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(RX_MSDU_START_INFO2_DECAP_FORMAT,</div><div class='add'>+			 __le32_to_cpu(desc-&gt;u.wcn6855.msdu_start.info2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath11k_hw_wcn6855_rx_desc_get_mesh_ctl(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(RX_MSDU_START_INFO2_MESH_CTRL_PRESENT,</div><div class='add'>+			 __le32_to_cpu(desc-&gt;u.wcn6855.msdu_start.info2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath11k_hw_wcn6855_rx_desc_get_mpdu_seq_ctl_vld(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!FIELD_GET(RX_MPDU_START_INFO1_MPDU_SEQ_CTRL_VALID,</div><div class='add'>+			   __le32_to_cpu(desc-&gt;u.wcn6855.mpdu_start.info1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath11k_hw_wcn6855_rx_desc_get_mpdu_fc_valid(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!FIELD_GET(RX_MPDU_START_INFO1_MPDU_FCTRL_VALID,</div><div class='add'>+			   __le32_to_cpu(desc-&gt;u.wcn6855.mpdu_start.info1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath11k_hw_wcn6855_rx_desc_get_mpdu_start_seq_no(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(RX_MPDU_START_INFO1_MPDU_SEQ_NUM,</div><div class='add'>+			 __le32_to_cpu(desc-&gt;u.wcn6855.mpdu_start.info1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath11k_hw_wcn6855_rx_desc_get_msdu_len(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(RX_MSDU_START_INFO1_MSDU_LENGTH,</div><div class='add'>+			 __le32_to_cpu(desc-&gt;u.wcn6855.msdu_start.info1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath11k_hw_wcn6855_rx_desc_get_msdu_sgi(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(RX_MSDU_START_INFO3_SGI,</div><div class='add'>+			 __le32_to_cpu(desc-&gt;u.wcn6855.msdu_start.info3));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath11k_hw_wcn6855_rx_desc_get_msdu_rate_mcs(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(RX_MSDU_START_INFO3_RATE_MCS,</div><div class='add'>+			 __le32_to_cpu(desc-&gt;u.wcn6855.msdu_start.info3));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath11k_hw_wcn6855_rx_desc_get_msdu_rx_bw(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(RX_MSDU_START_INFO3_RECV_BW,</div><div class='add'>+			 __le32_to_cpu(desc-&gt;u.wcn6855.msdu_start.info3));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath11k_hw_wcn6855_rx_desc_get_msdu_freq(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return __le32_to_cpu(desc-&gt;u.wcn6855.msdu_start.phy_meta_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath11k_hw_wcn6855_rx_desc_get_msdu_pkt_type(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(RX_MSDU_START_INFO3_PKT_TYPE,</div><div class='add'>+			 __le32_to_cpu(desc-&gt;u.wcn6855.msdu_start.info3));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath11k_hw_wcn6855_rx_desc_get_msdu_nss(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(RX_MSDU_START_INFO3_MIMO_SS_BITMAP,</div><div class='add'>+			 __le32_to_cpu(desc-&gt;u.wcn6855.msdu_start.info3));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath11k_hw_wcn6855_rx_desc_get_mpdu_tid(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(RX_MPDU_START_INFO2_TID_WCN6855,</div><div class='add'>+			 __le32_to_cpu(desc-&gt;u.wcn6855.mpdu_start.info2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath11k_hw_wcn6855_rx_desc_get_mpdu_peer_id(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return __le16_to_cpu(desc-&gt;u.wcn6855.mpdu_start.sw_peer_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_hw_wcn6855_rx_desc_copy_attn_end(struct hal_rx_desc *fdesc,</div><div class='add'>+						    struct hal_rx_desc *ldesc)</div><div class='add'>+{</div><div class='add'>+	memcpy((u8 *)&amp;fdesc-&gt;u.wcn6855.msdu_end, (u8 *)&amp;ldesc-&gt;u.wcn6855.msdu_end,</div><div class='add'>+	       sizeof(struct rx_msdu_end_wcn6855));</div><div class='add'>+	memcpy((u8 *)&amp;fdesc-&gt;u.wcn6855.attention, (u8 *)&amp;ldesc-&gt;u.wcn6855.attention,</div><div class='add'>+	       sizeof(struct rx_attention));</div><div class='add'>+	memcpy((u8 *)&amp;fdesc-&gt;u.wcn6855.mpdu_end, (u8 *)&amp;ldesc-&gt;u.wcn6855.mpdu_end,</div><div class='add'>+	       sizeof(struct rx_mpdu_end));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath11k_hw_wcn6855_rx_desc_get_mpdu_start_tag(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(HAL_TLV_HDR_TAG,</div><div class='add'>+			 __le32_to_cpu(desc-&gt;u.wcn6855.mpdu_start_tag));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath11k_hw_wcn6855_rx_desc_get_mpdu_ppdu_id(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return __le16_to_cpu(desc-&gt;u.wcn6855.mpdu_start.phy_ppdu_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_hw_wcn6855_rx_desc_set_msdu_len(struct hal_rx_desc *desc, u16 len)</div><div class='add'>+{</div><div class='add'>+	u32 info = __le32_to_cpu(desc-&gt;u.wcn6855.msdu_start.info1);</div><div class='add'>+</div><div class='add'>+	info &amp;= ~RX_MSDU_START_INFO1_MSDU_LENGTH;</div><div class='add'>+	info |= FIELD_PREP(RX_MSDU_START_INFO1_MSDU_LENGTH, len);</div><div class='add'>+</div><div class='add'>+	desc-&gt;u.wcn6855.msdu_start.info1 = __cpu_to_le32(info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+struct rx_attention *ath11k_hw_wcn6855_rx_desc_get_attention(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return &amp;desc-&gt;u.wcn6855.attention;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *ath11k_hw_wcn6855_rx_desc_get_msdu_payload(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return &amp;desc-&gt;u.wcn6855.msdu_payload[0];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath11k_hw_wcn6855_rx_desc_mac_addr2_valid(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return __le32_to_cpu(desc-&gt;u.wcn6855.mpdu_start.info1) &amp;</div><div class='add'>+	       RX_MPDU_START_INFO1_MAC_ADDR2_VALID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *ath11k_hw_wcn6855_rx_desc_mpdu_start_addr2(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return desc-&gt;u.wcn6855.mpdu_start.addr2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_hw_wcn6855_reo_setup(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	u32 reo_base = HAL_SEQ_WCSS_UMAC_REO_REG;</div><div class='add'>+	u32 val;</div><div class='add'>+	/* Each hash entry uses four bits to map to a particular ring. */</div><div class='add'>+	u32 ring_hash_map = HAL_HASH_ROUTING_RING_SW1 &lt;&lt; 0 |</div><div class='add'>+		HAL_HASH_ROUTING_RING_SW2 &lt;&lt; 4 |</div><div class='add'>+		HAL_HASH_ROUTING_RING_SW3 &lt;&lt; 8 |</div><div class='add'>+		HAL_HASH_ROUTING_RING_SW4 &lt;&lt; 12 |</div><div class='add'>+		HAL_HASH_ROUTING_RING_SW1 &lt;&lt; 16 |</div><div class='add'>+		HAL_HASH_ROUTING_RING_SW2 &lt;&lt; 20 |</div><div class='add'>+		HAL_HASH_ROUTING_RING_SW3 &lt;&lt; 24 |</div><div class='add'>+		HAL_HASH_ROUTING_RING_SW4 &lt;&lt; 28;</div><div class='add'>+</div><div class='add'>+	val = ath11k_hif_read32(ab, reo_base + HAL_REO1_GEN_ENABLE);</div><div class='add'>+	val |= FIELD_PREP(HAL_REO1_GEN_ENABLE_AGING_LIST_ENABLE, 1) |</div><div class='add'>+		FIELD_PREP(HAL_REO1_GEN_ENABLE_AGING_FLUSH_ENABLE, 1);</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_GEN_ENABLE, val);</div><div class='add'>+</div><div class='add'>+	val = ath11k_hif_read32(ab, reo_base + HAL_REO1_MISC_CTL(ab));</div><div class='add'>+	val &amp;= ~HAL_REO1_MISC_CTL_FRAGMENT_DST_RING;</div><div class='add'>+	val |= FIELD_PREP(HAL_REO1_MISC_CTL_FRAGMENT_DST_RING, HAL_SRNG_RING_ID_REO2SW1);</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_MISC_CTL(ab), val);</div><div class='add'>+</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_0(ab),</div><div class='add'>+			   HAL_DEFAULT_REO_TIMEOUT_USEC);</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_1(ab),</div><div class='add'>+			   HAL_DEFAULT_REO_TIMEOUT_USEC);</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_2(ab),</div><div class='add'>+			   HAL_DEFAULT_REO_TIMEOUT_USEC);</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_3(ab),</div><div class='add'>+			   HAL_DEFAULT_REO_TIMEOUT_USEC);</div><div class='add'>+</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_2,</div><div class='add'>+			   ring_hash_map);</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_3,</div><div class='add'>+			   ring_hash_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_hw_ipq5018_reo_setup(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	u32 reo_base = HAL_SEQ_WCSS_UMAC_REO_REG;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* Each hash entry uses three bits to map to a particular ring. */</div><div class='add'>+	u32 ring_hash_map = HAL_HASH_ROUTING_RING_SW1 &lt;&lt; 0 |</div><div class='add'>+		HAL_HASH_ROUTING_RING_SW2 &lt;&lt; 4 |</div><div class='add'>+		HAL_HASH_ROUTING_RING_SW3 &lt;&lt; 8 |</div><div class='add'>+		HAL_HASH_ROUTING_RING_SW4 &lt;&lt; 12 |</div><div class='add'>+		HAL_HASH_ROUTING_RING_SW1 &lt;&lt; 16 |</div><div class='add'>+		HAL_HASH_ROUTING_RING_SW2 &lt;&lt; 20 |</div><div class='add'>+		HAL_HASH_ROUTING_RING_SW3 &lt;&lt; 24 |</div><div class='add'>+		HAL_HASH_ROUTING_RING_SW4 &lt;&lt; 28;</div><div class='add'>+</div><div class='add'>+	val = ath11k_hif_read32(ab, reo_base + HAL_REO1_GEN_ENABLE);</div><div class='add'>+</div><div class='add'>+	val &amp;= ~HAL_REO1_GEN_ENABLE_FRAG_DST_RING;</div><div class='add'>+	val |= FIELD_PREP(HAL_REO1_GEN_ENABLE_FRAG_DST_RING,</div><div class='add'>+			HAL_SRNG_RING_ID_REO2SW1) |</div><div class='add'>+		FIELD_PREP(HAL_REO1_GEN_ENABLE_AGING_LIST_ENABLE, 1) |</div><div class='add'>+		FIELD_PREP(HAL_REO1_GEN_ENABLE_AGING_FLUSH_ENABLE, 1);</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_GEN_ENABLE, val);</div><div class='add'>+</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_0(ab),</div><div class='add'>+			   HAL_DEFAULT_REO_TIMEOUT_USEC);</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_1(ab),</div><div class='add'>+			   HAL_DEFAULT_REO_TIMEOUT_USEC);</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_2(ab),</div><div class='add'>+			   HAL_DEFAULT_REO_TIMEOUT_USEC);</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_3(ab),</div><div class='add'>+			   HAL_DEFAULT_REO_TIMEOUT_USEC);</div><div class='add'>+</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_0,</div><div class='add'>+			   ring_hash_map);</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_1,</div><div class='add'>+			   ring_hash_map);</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_2,</div><div class='add'>+			   ring_hash_map);</div><div class='add'>+	ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_3,</div><div class='add'>+			   ring_hash_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16</div><div class='add'>+ath11k_hw_ipq8074_mpdu_info_get_peerid(struct hal_rx_mpdu_info *mpdu_info)</div><div class='add'>+{</div><div class='add'>+	u16 peer_id = 0;</div><div class='add'>+</div><div class='add'>+	peer_id = FIELD_GET(HAL_RX_MPDU_INFO_INFO0_PEERID,</div><div class='add'>+			    __le32_to_cpu(mpdu_info-&gt;u.ipq8074.info0));</div><div class='add'>+</div><div class='add'>+	return peer_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16</div><div class='add'>+ath11k_hw_qcn9074_mpdu_info_get_peerid(struct hal_rx_mpdu_info *mpdu_info)</div><div class='add'>+{</div><div class='add'>+	u16 peer_id = 0;</div><div class='add'>+</div><div class='add'>+	peer_id = FIELD_GET(HAL_RX_MPDU_INFO_INFO0_PEERID,</div><div class='add'>+			    __le32_to_cpu(mpdu_info-&gt;u.qcn9074.info0));</div><div class='add'>+</div><div class='add'>+	return peer_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16</div><div class='add'>+ath11k_hw_wcn6855_mpdu_info_get_peerid(struct hal_rx_mpdu_info *mpdu_info)</div><div class='add'>+{</div><div class='add'>+	u16 peer_id = 0;</div><div class='add'>+</div><div class='add'>+	peer_id = FIELD_GET(HAL_RX_MPDU_INFO_INFO0_PEERID_WCN6855,</div><div class='add'>+			    __le32_to_cpu(mpdu_info-&gt;u.wcn6855.info0));</div><div class='add'>+	return peer_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath11k_hw_wcn6855_rx_desc_get_ldpc_support(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(RX_MSDU_START_INFO2_LDPC,</div><div class='add'>+			 __le32_to_cpu(desc-&gt;u.wcn6855.msdu_start.info2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath11k_hw_ipq8074_get_tcl_ring_selector(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	/* Let the default ring selection be based on current processor</div><div class='add'>+	 * number, where one of the 3 tcl rings are selected based on</div><div class='add'>+	 * the smp_processor_id(). In case that ring</div><div class='add'>+	 * is full/busy, we resort to other available rings.</div><div class='add'>+	 * If all rings are full, we drop the packet.</div><div class='add'>+	 *</div><div class='add'>+	 * TODO: Add throttling logic when all rings are full</div><div class='add'>+	 */</div><div class='add'>+	return smp_processor_id();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath11k_hw_wcn6750_get_tcl_ring_selector(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	/* Select the TCL ring based on the flow hash of the SKB instead</div><div class='add'>+	 * of CPU ID. Since applications pumping the traffic can be scheduled</div><div class='add'>+	 * on multiple CPUs, there is a chance that packets of the same flow</div><div class='add'>+	 * could end on different TCL rings, this could sometimes results in</div><div class='add'>+	 * an out of order arrival of the packets at the receiver.</div><div class='add'>+	 */</div><div class='add'>+	return skb_get_hash(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct ath11k_hw_ops ipq8074_ops = {</div><div class='ctx'> 	.get_hw_mac_from_pdev_id = ath11k_hw_ipq8074_mac_from_pdev_id,</div><div class='ctx'> 	.wmi_init_config = ath11k_init_wmi_config_ipq8074,</div><div class='hunk'>@@ -503,6 +914,7 @@ const struct ath11k_hw_ops ipq8074_ops = {</div><div class='ctx'> 	.rx_desc_get_encrypt_type = ath11k_hw_ipq8074_rx_desc_get_encrypt_type,</div><div class='ctx'> 	.rx_desc_get_decap_type = ath11k_hw_ipq8074_rx_desc_get_decap_type,</div><div class='ctx'> 	.rx_desc_get_mesh_ctl = ath11k_hw_ipq8074_rx_desc_get_mesh_ctl,</div><div class='add'>+	.rx_desc_get_ldpc_support = ath11k_hw_ipq8074_rx_desc_get_ldpc_support,</div><div class='ctx'> 	.rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_ipq8074_rx_desc_get_mpdu_seq_ctl_vld,</div><div class='ctx'> 	.rx_desc_get_mpdu_fc_valid = ath11k_hw_ipq8074_rx_desc_get_mpdu_fc_valid,</div><div class='ctx'> 	.rx_desc_get_mpdu_start_seq_no = ath11k_hw_ipq8074_rx_desc_get_mpdu_start_seq_no,</div><div class='hunk'>@@ -521,6 +933,11 @@ const struct ath11k_hw_ops ipq8074_ops = {</div><div class='ctx'> 	.rx_desc_set_msdu_len = ath11k_hw_ipq8074_rx_desc_set_msdu_len,</div><div class='ctx'> 	.rx_desc_get_attention = ath11k_hw_ipq8074_rx_desc_get_attention,</div><div class='ctx'> 	.rx_desc_get_msdu_payload = ath11k_hw_ipq8074_rx_desc_get_msdu_payload,</div><div class='add'>+	.reo_setup = ath11k_hw_ipq8074_reo_setup,</div><div class='add'>+	.mpdu_info_get_peerid = ath11k_hw_ipq8074_mpdu_info_get_peerid,</div><div class='add'>+	.rx_desc_mac_addr2_valid = ath11k_hw_ipq8074_rx_desc_mac_addr2_valid,</div><div class='add'>+	.rx_desc_mpdu_start_addr2 = ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2,</div><div class='add'>+	.get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct ath11k_hw_ops ipq6018_ops = {</div><div class='hunk'>@@ -537,6 +954,7 @@ const struct ath11k_hw_ops ipq6018_ops = {</div><div class='ctx'> 	.rx_desc_get_encrypt_type = ath11k_hw_ipq8074_rx_desc_get_encrypt_type,</div><div class='ctx'> 	.rx_desc_get_decap_type = ath11k_hw_ipq8074_rx_desc_get_decap_type,</div><div class='ctx'> 	.rx_desc_get_mesh_ctl = ath11k_hw_ipq8074_rx_desc_get_mesh_ctl,</div><div class='add'>+	.rx_desc_get_ldpc_support = ath11k_hw_ipq8074_rx_desc_get_ldpc_support,</div><div class='ctx'> 	.rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_ipq8074_rx_desc_get_mpdu_seq_ctl_vld,</div><div class='ctx'> 	.rx_desc_get_mpdu_fc_valid = ath11k_hw_ipq8074_rx_desc_get_mpdu_fc_valid,</div><div class='ctx'> 	.rx_desc_get_mpdu_start_seq_no = ath11k_hw_ipq8074_rx_desc_get_mpdu_start_seq_no,</div><div class='hunk'>@@ -555,6 +973,11 @@ const struct ath11k_hw_ops ipq6018_ops = {</div><div class='ctx'> 	.rx_desc_set_msdu_len = ath11k_hw_ipq8074_rx_desc_set_msdu_len,</div><div class='ctx'> 	.rx_desc_get_attention = ath11k_hw_ipq8074_rx_desc_get_attention,</div><div class='ctx'> 	.rx_desc_get_msdu_payload = ath11k_hw_ipq8074_rx_desc_get_msdu_payload,</div><div class='add'>+	.reo_setup = ath11k_hw_ipq8074_reo_setup,</div><div class='add'>+	.mpdu_info_get_peerid = ath11k_hw_ipq8074_mpdu_info_get_peerid,</div><div class='add'>+	.rx_desc_mac_addr2_valid = ath11k_hw_ipq8074_rx_desc_mac_addr2_valid,</div><div class='add'>+	.rx_desc_mpdu_start_addr2 = ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2,</div><div class='add'>+	.get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct ath11k_hw_ops qca6390_ops = {</div><div class='hunk'>@@ -571,6 +994,7 @@ const struct ath11k_hw_ops qca6390_ops = {</div><div class='ctx'> 	.rx_desc_get_encrypt_type = ath11k_hw_ipq8074_rx_desc_get_encrypt_type,</div><div class='ctx'> 	.rx_desc_get_decap_type = ath11k_hw_ipq8074_rx_desc_get_decap_type,</div><div class='ctx'> 	.rx_desc_get_mesh_ctl = ath11k_hw_ipq8074_rx_desc_get_mesh_ctl,</div><div class='add'>+	.rx_desc_get_ldpc_support = ath11k_hw_ipq8074_rx_desc_get_ldpc_support,</div><div class='ctx'> 	.rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_ipq8074_rx_desc_get_mpdu_seq_ctl_vld,</div><div class='ctx'> 	.rx_desc_get_mpdu_fc_valid = ath11k_hw_ipq8074_rx_desc_get_mpdu_fc_valid,</div><div class='ctx'> 	.rx_desc_get_mpdu_start_seq_no = ath11k_hw_ipq8074_rx_desc_get_mpdu_start_seq_no,</div><div class='hunk'>@@ -589,6 +1013,11 @@ const struct ath11k_hw_ops qca6390_ops = {</div><div class='ctx'> 	.rx_desc_set_msdu_len = ath11k_hw_ipq8074_rx_desc_set_msdu_len,</div><div class='ctx'> 	.rx_desc_get_attention = ath11k_hw_ipq8074_rx_desc_get_attention,</div><div class='ctx'> 	.rx_desc_get_msdu_payload = ath11k_hw_ipq8074_rx_desc_get_msdu_payload,</div><div class='add'>+	.reo_setup = ath11k_hw_ipq8074_reo_setup,</div><div class='add'>+	.mpdu_info_get_peerid = ath11k_hw_ipq8074_mpdu_info_get_peerid,</div><div class='add'>+	.rx_desc_mac_addr2_valid = ath11k_hw_ipq8074_rx_desc_mac_addr2_valid,</div><div class='add'>+	.rx_desc_mpdu_start_addr2 = ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2,</div><div class='add'>+	.get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct ath11k_hw_ops qcn9074_ops = {</div><div class='hunk'>@@ -605,6 +1034,128 @@ const struct ath11k_hw_ops qcn9074_ops = {</div><div class='ctx'> 	.rx_desc_get_encrypt_type = ath11k_hw_qcn9074_rx_desc_get_encrypt_type,</div><div class='ctx'> 	.rx_desc_get_decap_type = ath11k_hw_qcn9074_rx_desc_get_decap_type,</div><div class='ctx'> 	.rx_desc_get_mesh_ctl = ath11k_hw_qcn9074_rx_desc_get_mesh_ctl,</div><div class='add'>+	.rx_desc_get_ldpc_support = ath11k_hw_qcn9074_rx_desc_get_ldpc_support,</div><div class='add'>+	.rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_qcn9074_rx_desc_get_mpdu_seq_ctl_vld,</div><div class='add'>+	.rx_desc_get_mpdu_fc_valid = ath11k_hw_qcn9074_rx_desc_get_mpdu_fc_valid,</div><div class='add'>+	.rx_desc_get_mpdu_start_seq_no = ath11k_hw_qcn9074_rx_desc_get_mpdu_start_seq_no,</div><div class='add'>+	.rx_desc_get_msdu_len = ath11k_hw_qcn9074_rx_desc_get_msdu_len,</div><div class='add'>+	.rx_desc_get_msdu_sgi = ath11k_hw_qcn9074_rx_desc_get_msdu_sgi,</div><div class='add'>+	.rx_desc_get_msdu_rate_mcs = ath11k_hw_qcn9074_rx_desc_get_msdu_rate_mcs,</div><div class='add'>+	.rx_desc_get_msdu_rx_bw = ath11k_hw_qcn9074_rx_desc_get_msdu_rx_bw,</div><div class='add'>+	.rx_desc_get_msdu_freq = ath11k_hw_qcn9074_rx_desc_get_msdu_freq,</div><div class='add'>+	.rx_desc_get_msdu_pkt_type = ath11k_hw_qcn9074_rx_desc_get_msdu_pkt_type,</div><div class='add'>+	.rx_desc_get_msdu_nss = ath11k_hw_qcn9074_rx_desc_get_msdu_nss,</div><div class='add'>+	.rx_desc_get_mpdu_tid = ath11k_hw_qcn9074_rx_desc_get_mpdu_tid,</div><div class='add'>+	.rx_desc_get_mpdu_peer_id = ath11k_hw_qcn9074_rx_desc_get_mpdu_peer_id,</div><div class='add'>+	.rx_desc_copy_attn_end_tlv = ath11k_hw_qcn9074_rx_desc_copy_attn_end,</div><div class='add'>+	.rx_desc_get_mpdu_start_tag = ath11k_hw_qcn9074_rx_desc_get_mpdu_start_tag,</div><div class='add'>+	.rx_desc_get_mpdu_ppdu_id = ath11k_hw_qcn9074_rx_desc_get_mpdu_ppdu_id,</div><div class='add'>+	.rx_desc_set_msdu_len = ath11k_hw_qcn9074_rx_desc_set_msdu_len,</div><div class='add'>+	.rx_desc_get_attention = ath11k_hw_qcn9074_rx_desc_get_attention,</div><div class='add'>+	.rx_desc_get_msdu_payload = ath11k_hw_qcn9074_rx_desc_get_msdu_payload,</div><div class='add'>+	.reo_setup = ath11k_hw_ipq8074_reo_setup,</div><div class='add'>+	.mpdu_info_get_peerid = ath11k_hw_qcn9074_mpdu_info_get_peerid,</div><div class='add'>+	.rx_desc_mac_addr2_valid = ath11k_hw_ipq9074_rx_desc_mac_addr2_valid,</div><div class='add'>+	.rx_desc_mpdu_start_addr2 = ath11k_hw_ipq9074_rx_desc_mpdu_start_addr2,</div><div class='add'>+	.get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct ath11k_hw_ops wcn6855_ops = {</div><div class='add'>+	.get_hw_mac_from_pdev_id = ath11k_hw_ipq8074_mac_from_pdev_id,</div><div class='add'>+	.wmi_init_config = ath11k_init_wmi_config_qca6390,</div><div class='add'>+	.mac_id_to_pdev_id = ath11k_hw_mac_id_to_pdev_id_qca6390,</div><div class='add'>+	.mac_id_to_srng_id = ath11k_hw_mac_id_to_srng_id_qca6390,</div><div class='add'>+	.tx_mesh_enable = ath11k_hw_wcn6855_tx_mesh_enable,</div><div class='add'>+	.rx_desc_get_first_msdu = ath11k_hw_wcn6855_rx_desc_get_first_msdu,</div><div class='add'>+	.rx_desc_get_last_msdu = ath11k_hw_wcn6855_rx_desc_get_last_msdu,</div><div class='add'>+	.rx_desc_get_l3_pad_bytes = ath11k_hw_wcn6855_rx_desc_get_l3_pad_bytes,</div><div class='add'>+	.rx_desc_get_hdr_status = ath11k_hw_wcn6855_rx_desc_get_hdr_status,</div><div class='add'>+	.rx_desc_encrypt_valid = ath11k_hw_wcn6855_rx_desc_encrypt_valid,</div><div class='add'>+	.rx_desc_get_encrypt_type = ath11k_hw_wcn6855_rx_desc_get_encrypt_type,</div><div class='add'>+	.rx_desc_get_decap_type = ath11k_hw_wcn6855_rx_desc_get_decap_type,</div><div class='add'>+	.rx_desc_get_mesh_ctl = ath11k_hw_wcn6855_rx_desc_get_mesh_ctl,</div><div class='add'>+	.rx_desc_get_ldpc_support = ath11k_hw_wcn6855_rx_desc_get_ldpc_support,</div><div class='add'>+	.rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_wcn6855_rx_desc_get_mpdu_seq_ctl_vld,</div><div class='add'>+	.rx_desc_get_mpdu_fc_valid = ath11k_hw_wcn6855_rx_desc_get_mpdu_fc_valid,</div><div class='add'>+	.rx_desc_get_mpdu_start_seq_no = ath11k_hw_wcn6855_rx_desc_get_mpdu_start_seq_no,</div><div class='add'>+	.rx_desc_get_msdu_len = ath11k_hw_wcn6855_rx_desc_get_msdu_len,</div><div class='add'>+	.rx_desc_get_msdu_sgi = ath11k_hw_wcn6855_rx_desc_get_msdu_sgi,</div><div class='add'>+	.rx_desc_get_msdu_rate_mcs = ath11k_hw_wcn6855_rx_desc_get_msdu_rate_mcs,</div><div class='add'>+	.rx_desc_get_msdu_rx_bw = ath11k_hw_wcn6855_rx_desc_get_msdu_rx_bw,</div><div class='add'>+	.rx_desc_get_msdu_freq = ath11k_hw_wcn6855_rx_desc_get_msdu_freq,</div><div class='add'>+	.rx_desc_get_msdu_pkt_type = ath11k_hw_wcn6855_rx_desc_get_msdu_pkt_type,</div><div class='add'>+	.rx_desc_get_msdu_nss = ath11k_hw_wcn6855_rx_desc_get_msdu_nss,</div><div class='add'>+	.rx_desc_get_mpdu_tid = ath11k_hw_wcn6855_rx_desc_get_mpdu_tid,</div><div class='add'>+	.rx_desc_get_mpdu_peer_id = ath11k_hw_wcn6855_rx_desc_get_mpdu_peer_id,</div><div class='add'>+	.rx_desc_copy_attn_end_tlv = ath11k_hw_wcn6855_rx_desc_copy_attn_end,</div><div class='add'>+	.rx_desc_get_mpdu_start_tag = ath11k_hw_wcn6855_rx_desc_get_mpdu_start_tag,</div><div class='add'>+	.rx_desc_get_mpdu_ppdu_id = ath11k_hw_wcn6855_rx_desc_get_mpdu_ppdu_id,</div><div class='add'>+	.rx_desc_set_msdu_len = ath11k_hw_wcn6855_rx_desc_set_msdu_len,</div><div class='add'>+	.rx_desc_get_attention = ath11k_hw_wcn6855_rx_desc_get_attention,</div><div class='add'>+	.rx_desc_get_msdu_payload = ath11k_hw_wcn6855_rx_desc_get_msdu_payload,</div><div class='add'>+	.reo_setup = ath11k_hw_wcn6855_reo_setup,</div><div class='add'>+	.mpdu_info_get_peerid = ath11k_hw_wcn6855_mpdu_info_get_peerid,</div><div class='add'>+	.rx_desc_mac_addr2_valid = ath11k_hw_wcn6855_rx_desc_mac_addr2_valid,</div><div class='add'>+	.rx_desc_mpdu_start_addr2 = ath11k_hw_wcn6855_rx_desc_mpdu_start_addr2,</div><div class='add'>+	.get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct ath11k_hw_ops wcn6750_ops = {</div><div class='add'>+	.get_hw_mac_from_pdev_id = ath11k_hw_ipq8074_mac_from_pdev_id,</div><div class='add'>+	.wmi_init_config = ath11k_init_wmi_config_qca6390,</div><div class='add'>+	.mac_id_to_pdev_id = ath11k_hw_mac_id_to_pdev_id_qca6390,</div><div class='add'>+	.mac_id_to_srng_id = ath11k_hw_mac_id_to_srng_id_qca6390,</div><div class='add'>+	.tx_mesh_enable = ath11k_hw_qcn9074_tx_mesh_enable,</div><div class='add'>+	.rx_desc_get_first_msdu = ath11k_hw_qcn9074_rx_desc_get_first_msdu,</div><div class='add'>+	.rx_desc_get_last_msdu = ath11k_hw_qcn9074_rx_desc_get_last_msdu,</div><div class='add'>+	.rx_desc_get_l3_pad_bytes = ath11k_hw_qcn9074_rx_desc_get_l3_pad_bytes,</div><div class='add'>+	.rx_desc_get_hdr_status = ath11k_hw_qcn9074_rx_desc_get_hdr_status,</div><div class='add'>+	.rx_desc_encrypt_valid = ath11k_hw_qcn9074_rx_desc_encrypt_valid,</div><div class='add'>+	.rx_desc_get_encrypt_type = ath11k_hw_qcn9074_rx_desc_get_encrypt_type,</div><div class='add'>+	.rx_desc_get_decap_type = ath11k_hw_qcn9074_rx_desc_get_decap_type,</div><div class='add'>+	.rx_desc_get_mesh_ctl = ath11k_hw_qcn9074_rx_desc_get_mesh_ctl,</div><div class='add'>+	.rx_desc_get_ldpc_support = ath11k_hw_qcn9074_rx_desc_get_ldpc_support,</div><div class='add'>+	.rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_qcn9074_rx_desc_get_mpdu_seq_ctl_vld,</div><div class='add'>+	.rx_desc_get_mpdu_fc_valid = ath11k_hw_qcn9074_rx_desc_get_mpdu_fc_valid,</div><div class='add'>+	.rx_desc_get_mpdu_start_seq_no = ath11k_hw_qcn9074_rx_desc_get_mpdu_start_seq_no,</div><div class='add'>+	.rx_desc_get_msdu_len = ath11k_hw_qcn9074_rx_desc_get_msdu_len,</div><div class='add'>+	.rx_desc_get_msdu_sgi = ath11k_hw_qcn9074_rx_desc_get_msdu_sgi,</div><div class='add'>+	.rx_desc_get_msdu_rate_mcs = ath11k_hw_qcn9074_rx_desc_get_msdu_rate_mcs,</div><div class='add'>+	.rx_desc_get_msdu_rx_bw = ath11k_hw_qcn9074_rx_desc_get_msdu_rx_bw,</div><div class='add'>+	.rx_desc_get_msdu_freq = ath11k_hw_qcn9074_rx_desc_get_msdu_freq,</div><div class='add'>+	.rx_desc_get_msdu_pkt_type = ath11k_hw_qcn9074_rx_desc_get_msdu_pkt_type,</div><div class='add'>+	.rx_desc_get_msdu_nss = ath11k_hw_qcn9074_rx_desc_get_msdu_nss,</div><div class='add'>+	.rx_desc_get_mpdu_tid = ath11k_hw_qcn9074_rx_desc_get_mpdu_tid,</div><div class='add'>+	.rx_desc_get_mpdu_peer_id = ath11k_hw_qcn9074_rx_desc_get_mpdu_peer_id,</div><div class='add'>+	.rx_desc_copy_attn_end_tlv = ath11k_hw_qcn9074_rx_desc_copy_attn_end,</div><div class='add'>+	.rx_desc_get_mpdu_start_tag = ath11k_hw_qcn9074_rx_desc_get_mpdu_start_tag,</div><div class='add'>+	.rx_desc_get_mpdu_ppdu_id = ath11k_hw_qcn9074_rx_desc_get_mpdu_ppdu_id,</div><div class='add'>+	.rx_desc_set_msdu_len = ath11k_hw_qcn9074_rx_desc_set_msdu_len,</div><div class='add'>+	.rx_desc_get_attention = ath11k_hw_qcn9074_rx_desc_get_attention,</div><div class='add'>+	.rx_desc_get_msdu_payload = ath11k_hw_qcn9074_rx_desc_get_msdu_payload,</div><div class='add'>+	.reo_setup = ath11k_hw_wcn6855_reo_setup,</div><div class='add'>+	.mpdu_info_get_peerid = ath11k_hw_ipq8074_mpdu_info_get_peerid,</div><div class='add'>+	.rx_desc_mac_addr2_valid = ath11k_hw_ipq9074_rx_desc_mac_addr2_valid,</div><div class='add'>+	.rx_desc_mpdu_start_addr2 = ath11k_hw_ipq9074_rx_desc_mpdu_start_addr2,</div><div class='add'>+	.get_ring_selector = ath11k_hw_wcn6750_get_tcl_ring_selector,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IPQ5018 hw ops is similar to QCN9074 except for the dest ring remap */</div><div class='add'>+const struct ath11k_hw_ops ipq5018_ops = {</div><div class='add'>+	.get_hw_mac_from_pdev_id = ath11k_hw_ipq6018_mac_from_pdev_id,</div><div class='add'>+	.wmi_init_config = ath11k_init_wmi_config_ipq8074,</div><div class='add'>+	.mac_id_to_pdev_id = ath11k_hw_mac_id_to_pdev_id_ipq8074,</div><div class='add'>+	.mac_id_to_srng_id = ath11k_hw_mac_id_to_srng_id_ipq8074,</div><div class='add'>+	.tx_mesh_enable = ath11k_hw_qcn9074_tx_mesh_enable,</div><div class='add'>+	.rx_desc_get_first_msdu = ath11k_hw_qcn9074_rx_desc_get_first_msdu,</div><div class='add'>+	.rx_desc_get_last_msdu = ath11k_hw_qcn9074_rx_desc_get_last_msdu,</div><div class='add'>+	.rx_desc_get_l3_pad_bytes = ath11k_hw_qcn9074_rx_desc_get_l3_pad_bytes,</div><div class='add'>+	.rx_desc_get_hdr_status = ath11k_hw_qcn9074_rx_desc_get_hdr_status,</div><div class='add'>+	.rx_desc_encrypt_valid = ath11k_hw_qcn9074_rx_desc_encrypt_valid,</div><div class='add'>+	.rx_desc_get_encrypt_type = ath11k_hw_qcn9074_rx_desc_get_encrypt_type,</div><div class='add'>+	.rx_desc_get_decap_type = ath11k_hw_qcn9074_rx_desc_get_decap_type,</div><div class='add'>+	.rx_desc_get_mesh_ctl = ath11k_hw_qcn9074_rx_desc_get_mesh_ctl,</div><div class='add'>+	.rx_desc_get_ldpc_support = ath11k_hw_qcn9074_rx_desc_get_ldpc_support,</div><div class='ctx'> 	.rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_qcn9074_rx_desc_get_mpdu_seq_ctl_vld,</div><div class='ctx'> 	.rx_desc_get_mpdu_fc_valid = ath11k_hw_qcn9074_rx_desc_get_mpdu_fc_valid,</div><div class='ctx'> 	.rx_desc_get_mpdu_start_seq_no = ath11k_hw_qcn9074_rx_desc_get_mpdu_start_seq_no,</div><div class='hunk'>@@ -622,12 +1173,19 @@ const struct ath11k_hw_ops qcn9074_ops = {</div><div class='ctx'> 	.rx_desc_get_mpdu_ppdu_id = ath11k_hw_qcn9074_rx_desc_get_mpdu_ppdu_id,</div><div class='ctx'> 	.rx_desc_set_msdu_len = ath11k_hw_qcn9074_rx_desc_set_msdu_len,</div><div class='ctx'> 	.rx_desc_get_attention = ath11k_hw_qcn9074_rx_desc_get_attention,</div><div class='add'>+	.reo_setup = ath11k_hw_ipq5018_reo_setup,</div><div class='ctx'> 	.rx_desc_get_msdu_payload = ath11k_hw_qcn9074_rx_desc_get_msdu_payload,</div><div class='add'>+	.mpdu_info_get_peerid = ath11k_hw_ipq8074_mpdu_info_get_peerid,</div><div class='add'>+	.rx_desc_mac_addr2_valid = ath11k_hw_ipq9074_rx_desc_mac_addr2_valid,</div><div class='add'>+	.rx_desc_mpdu_start_addr2 = ath11k_hw_ipq9074_rx_desc_mpdu_start_addr2,</div><div class='add'>+	.get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define ATH11K_TX_RING_MASK_0 0x1</div><div class='del'>-#define ATH11K_TX_RING_MASK_1 0x2</div><div class='del'>-#define ATH11K_TX_RING_MASK_2 0x4</div><div class='add'>+#define ATH11K_TX_RING_MASK_0 BIT(0)</div><div class='add'>+#define ATH11K_TX_RING_MASK_1 BIT(1)</div><div class='add'>+#define ATH11K_TX_RING_MASK_2 BIT(2)</div><div class='add'>+#define ATH11K_TX_RING_MASK_3 BIT(3)</div><div class='add'>+#define ATH11K_TX_RING_MASK_4 BIT(4)</div><div class='ctx'> </div><div class='ctx'> #define ATH11K_RX_RING_MASK_0 0x1</div><div class='ctx'> #define ATH11K_RX_RING_MASK_1 0x2</div><div class='hunk'>@@ -678,6 +1236,7 @@ const struct ath11k_hw_ring_mask ath11k_hw_ring_mask_ipq8074 = {</div><div class='ctx'> 		ATH11K_RX_WBM_REL_RING_MASK_0,</div><div class='ctx'> 	},</div><div class='ctx'> 	.reo_status = {</div><div class='add'>+		0, 0, 0,</div><div class='ctx'> 		ATH11K_REO_STATUS_RING_MASK_0,</div><div class='ctx'> 	},</div><div class='ctx'> 	.rxdma2host = {</div><div class='hunk'>@@ -695,8 +1254,6 @@ const struct ath11k_hw_ring_mask ath11k_hw_ring_mask_ipq8074 = {</div><div class='ctx'> const struct ath11k_hw_ring_mask ath11k_hw_ring_mask_qca6390 = {</div><div class='ctx'> 	.tx  = {</div><div class='ctx'> 		ATH11K_TX_RING_MASK_0,</div><div class='del'>-		ATH11K_TX_RING_MASK_1,</div><div class='del'>-		ATH11K_TX_RING_MASK_2,</div><div class='ctx'> 	},</div><div class='ctx'> 	.rx_mon_status = {</div><div class='ctx'> 		0, 0, 0, 0,</div><div class='hunk'>@@ -1476,6 +2033,251 @@ const struct ath11k_hw_ring_mask ath11k_hw_ring_mask_qcn9074 = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+const struct ath11k_hw_ring_mask ath11k_hw_ring_mask_wcn6750 = {</div><div class='add'>+	.tx  = {</div><div class='add'>+		ATH11K_TX_RING_MASK_0,</div><div class='add'>+		0,</div><div class='add'>+		ATH11K_TX_RING_MASK_2,</div><div class='add'>+		0,</div><div class='add'>+		ATH11K_TX_RING_MASK_4,</div><div class='add'>+	},</div><div class='add'>+	.rx_mon_status = {</div><div class='add'>+		0, 0, 0, 0, 0, 0,</div><div class='add'>+		ATH11K_RX_MON_STATUS_RING_MASK_0,</div><div class='add'>+	},</div><div class='add'>+	.rx = {</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+		ATH11K_RX_RING_MASK_0,</div><div class='add'>+		ATH11K_RX_RING_MASK_1,</div><div class='add'>+		ATH11K_RX_RING_MASK_2,</div><div class='add'>+		ATH11K_RX_RING_MASK_3,</div><div class='add'>+	},</div><div class='add'>+	.rx_err = {</div><div class='add'>+		0, ATH11K_RX_ERR_RING_MASK_0,</div><div class='add'>+	},</div><div class='add'>+	.rx_wbm_rel = {</div><div class='add'>+		0, ATH11K_RX_WBM_REL_RING_MASK_0,</div><div class='add'>+	},</div><div class='add'>+	.reo_status = {</div><div class='add'>+		0, ATH11K_REO_STATUS_RING_MASK_0,</div><div class='add'>+	},</div><div class='add'>+	.rxdma2host = {</div><div class='add'>+		ATH11K_RXDMA2HOST_RING_MASK_0,</div><div class='add'>+		ATH11K_RXDMA2HOST_RING_MASK_1,</div><div class='add'>+		ATH11K_RXDMA2HOST_RING_MASK_2,</div><div class='add'>+	},</div><div class='add'>+	.host2rxdma = {</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Target firmware's Copy Engine configuration for IPQ5018 */</div><div class='add'>+const struct ce_pipe_config ath11k_target_ce_config_wlan_ipq5018[] = {</div><div class='add'>+	/* CE0: host-&gt;target HTC control and raw streams */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(0),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE1: target-&gt;host HTT + HTC control */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(1),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE2: target-&gt;host WMI */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(2),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE3: host-&gt;target WMI */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(3),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE4: host-&gt;target HTT */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(4),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		.nentries = __cpu_to_le32(256),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(256),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS | CE_ATTR_DIS_INTR),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE5: target-&gt;host Pktlog */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(5),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE6: Reserved for target autonomous hif_memcpy */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(6),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_INOUT),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(16384),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE7 used only by Host */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(7),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(0x2000),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE8 target-&gt;host used only by IPA */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(8),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_INOUT),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(16384),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Map from service/endpoint to Copy Engine for IPQ5018.</div><div class='add'>+ * This table is derived from the CE TABLE, above.</div><div class='add'>+ * It is passed to the Target at startup for use by firmware.</div><div class='add'>+ */</div><div class='add'>+const struct service_to_pipe ath11k_target_service_to_ce_map_wlan_ipq5018[] = {</div><div class='add'>+	{</div><div class='add'>+		.service_id = __cpu_to_le32(ATH11K_HTC_SVC_ID_WMI_DATA_VO),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		.pipenum = __cpu_to_le32(3),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.service_id = __cpu_to_le32(ATH11K_HTC_SVC_ID_WMI_DATA_VO),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		.pipenum = __cpu_to_le32(2),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.service_id = __cpu_to_le32(ATH11K_HTC_SVC_ID_WMI_DATA_BK),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		.pipenum = __cpu_to_le32(3),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.service_id = __cpu_to_le32(ATH11K_HTC_SVC_ID_WMI_DATA_BK),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		.pipenum = __cpu_to_le32(2),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.service_id = __cpu_to_le32(ATH11K_HTC_SVC_ID_WMI_DATA_BE),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		.pipenum = __cpu_to_le32(3),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.service_id = __cpu_to_le32(ATH11K_HTC_SVC_ID_WMI_DATA_BE),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		.pipenum = __cpu_to_le32(2),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.service_id = __cpu_to_le32(ATH11K_HTC_SVC_ID_WMI_DATA_VI),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		.pipenum = __cpu_to_le32(3),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.service_id = __cpu_to_le32(ATH11K_HTC_SVC_ID_WMI_DATA_VI),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		.pipenum = __cpu_to_le32(2),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.service_id = __cpu_to_le32(ATH11K_HTC_SVC_ID_WMI_CONTROL),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		.pipenum = __cpu_to_le32(3),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.service_id = __cpu_to_le32(ATH11K_HTC_SVC_ID_WMI_CONTROL),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		.pipenum = __cpu_to_le32(2),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		.service_id = __cpu_to_le32(ATH11K_HTC_SVC_ID_RSVD_CTRL),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		.pipenum = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.service_id = __cpu_to_le32(ATH11K_HTC_SVC_ID_RSVD_CTRL),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		.pipenum = __cpu_to_le32(1),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		.service_id = __cpu_to_le32(ATH11K_HTC_SVC_ID_TEST_RAW_STREAMS),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		.pipenum = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.service_id = __cpu_to_le32(ATH11K_HTC_SVC_ID_TEST_RAW_STREAMS),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		.pipenum = __cpu_to_le32(1),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.service_id = __cpu_to_le32(ATH11K_HTC_SVC_ID_HTT_DATA_MSG),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		.pipenum = __cpu_to_le32(4),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.service_id = __cpu_to_le32(ATH11K_HTC_SVC_ID_HTT_DATA_MSG),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		.pipenum = __cpu_to_le32(1),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.service_id = __cpu_to_le32(ATH11K_HTC_SVC_ID_PKT_LOG),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		.pipenum = __cpu_to_le32(5),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+       /* (Additions here) */</div><div class='add'>+</div><div class='add'>+	{ /* terminator entry */ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct ce_ie_addr ath11k_ce_ie_addr_ipq8074 = {</div><div class='add'>+	.ie1_reg_addr = CE_HOST_IE_ADDRESS,</div><div class='add'>+	.ie2_reg_addr = CE_HOST_IE_2_ADDRESS,</div><div class='add'>+	.ie3_reg_addr = CE_HOST_IE_3_ADDRESS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct ce_ie_addr ath11k_ce_ie_addr_ipq5018 = {</div><div class='add'>+	.ie1_reg_addr = CE_HOST_IPQ5018_IE_ADDRESS - HAL_IPQ5018_CE_WFSS_REG_BASE,</div><div class='add'>+	.ie2_reg_addr = CE_HOST_IPQ5018_IE_2_ADDRESS - HAL_IPQ5018_CE_WFSS_REG_BASE,</div><div class='add'>+	.ie3_reg_addr = CE_HOST_IPQ5018_IE_3_ADDRESS - HAL_IPQ5018_CE_WFSS_REG_BASE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct ce_remap ath11k_ce_remap_ipq5018 = {</div><div class='add'>+	.base = HAL_IPQ5018_CE_WFSS_REG_BASE,</div><div class='add'>+	.size = HAL_IPQ5018_CE_SIZE,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> const struct ath11k_hw_regs ipq8074_regs = {</div><div class='ctx'> 	/* SW2TCL(x) R0 ring configuration address */</div><div class='ctx'> 	.hal_tcl1_ring_base_lsb = 0x00000510,</div><div class='hunk'>@@ -1521,10 +2323,18 @@ const struct ath11k_hw_regs ipq8074_regs = {</div><div class='ctx'> 	.hal_reo_tcl_ring_base_lsb = 0x000003fc,</div><div class='ctx'> 	.hal_reo_tcl_ring_hp = 0x00003058,</div><div class='ctx'> </div><div class='add'>+	/* REO CMD ring address */</div><div class='add'>+	.hal_reo_cmd_ring_base_lsb = 0x00000194,</div><div class='add'>+	.hal_reo_cmd_ring_hp = 0x00003020,</div><div class='add'>+</div><div class='ctx'> 	/* REO status address */</div><div class='ctx'> 	.hal_reo_status_ring_base_lsb = 0x00000504,</div><div class='ctx'> 	.hal_reo_status_hp = 0x00003070,</div><div class='ctx'> </div><div class='add'>+	/* SW2REO ring address */</div><div class='add'>+	.hal_sw2reo_ring_base_lsb = 0x000001ec,</div><div class='add'>+	.hal_sw2reo_ring_hp = 0x00003028,</div><div class='add'>+</div><div class='ctx'> 	/* WCSS relative address */</div><div class='ctx'> 	.hal_seq_wcss_umac_ce0_src_reg = 0x00a00000,</div><div class='ctx'> 	.hal_seq_wcss_umac_ce0_dst_reg = 0x00a01000,</div><div class='hunk'>@@ -1545,6 +2355,12 @@ const struct ath11k_hw_regs ipq8074_regs = {</div><div class='ctx'> 	/* PCIe base address */</div><div class='ctx'> 	.pcie_qserdes_sysclk_en_sel = 0x0,</div><div class='ctx'> 	.pcie_pcs_osc_dtct_config_base = 0x0,</div><div class='add'>+</div><div class='add'>+	/* Shadow register area */</div><div class='add'>+	.hal_shadow_base_addr = 0x0,</div><div class='add'>+</div><div class='add'>+	/* REO misc control register, not used in IPQ8074 */</div><div class='add'>+	.hal_reo1_misc_ctl = 0x0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct ath11k_hw_regs qca6390_regs = {</div><div class='hunk'>@@ -1592,10 +2408,18 @@ const struct ath11k_hw_regs qca6390_regs = {</div><div class='ctx'> 	.hal_reo_tcl_ring_base_lsb = 0x000003a4,</div><div class='ctx'> 	.hal_reo_tcl_ring_hp = 0x00003050,</div><div class='ctx'> </div><div class='add'>+	/* REO CMD ring address */</div><div class='add'>+	.hal_reo_cmd_ring_base_lsb = 0x00000194,</div><div class='add'>+	.hal_reo_cmd_ring_hp = 0x00003020,</div><div class='add'>+</div><div class='ctx'> 	/* REO status address */</div><div class='ctx'> 	.hal_reo_status_ring_base_lsb = 0x000004ac,</div><div class='ctx'> 	.hal_reo_status_hp = 0x00003068,</div><div class='ctx'> </div><div class='add'>+	/* SW2REO ring address */</div><div class='add'>+	.hal_sw2reo_ring_base_lsb = 0x000001ec,</div><div class='add'>+	.hal_sw2reo_ring_hp = 0x00003028,</div><div class='add'>+</div><div class='ctx'> 	/* WCSS relative address */</div><div class='ctx'> 	.hal_seq_wcss_umac_ce0_src_reg = 0x00a00000,</div><div class='ctx'> 	.hal_seq_wcss_umac_ce0_dst_reg = 0x00a01000,</div><div class='hunk'>@@ -1616,6 +2440,12 @@ const struct ath11k_hw_regs qca6390_regs = {</div><div class='ctx'> 	/* PCIe base address */</div><div class='ctx'> 	.pcie_qserdes_sysclk_en_sel = 0x01e0c0ac,</div><div class='ctx'> 	.pcie_pcs_osc_dtct_config_base = 0x01e0c628,</div><div class='add'>+</div><div class='add'>+	/* Shadow register area */</div><div class='add'>+	.hal_shadow_base_addr = 0x000008fc,</div><div class='add'>+</div><div class='add'>+	/* REO misc control register, not used in QCA6390 */</div><div class='add'>+	.hal_reo1_misc_ctl = 0x0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct ath11k_hw_regs qcn9074_regs = {</div><div class='hunk'>@@ -1663,10 +2493,18 @@ const struct ath11k_hw_regs qcn9074_regs = {</div><div class='ctx'> 	.hal_reo_tcl_ring_base_lsb = 0x000003fc,</div><div class='ctx'> 	.hal_reo_tcl_ring_hp = 0x00003058,</div><div class='ctx'> </div><div class='add'>+	/* REO CMD ring address */</div><div class='add'>+	.hal_reo_cmd_ring_base_lsb = 0x00000194,</div><div class='add'>+	.hal_reo_cmd_ring_hp = 0x00003020,</div><div class='add'>+</div><div class='ctx'> 	/* REO status address */</div><div class='ctx'> 	.hal_reo_status_ring_base_lsb = 0x00000504,</div><div class='ctx'> 	.hal_reo_status_hp = 0x00003070,</div><div class='ctx'> </div><div class='add'>+	/* SW2REO ring address */</div><div class='add'>+	.hal_sw2reo_ring_base_lsb = 0x000001ec,</div><div class='add'>+	.hal_sw2reo_ring_hp = 0x00003028,</div><div class='add'>+</div><div class='ctx'> 	/* WCSS relative address */</div><div class='ctx'> 	.hal_seq_wcss_umac_ce0_src_reg = 0x01b80000,</div><div class='ctx'> 	.hal_seq_wcss_umac_ce0_dst_reg = 0x01b81000,</div><div class='hunk'>@@ -1687,4 +2525,334 @@ const struct ath11k_hw_regs qcn9074_regs = {</div><div class='ctx'> 	/* PCIe base address */</div><div class='ctx'> 	.pcie_qserdes_sysclk_en_sel = 0x01e0e0a8,</div><div class='ctx'> 	.pcie_pcs_osc_dtct_config_base = 0x01e0f45c,</div><div class='add'>+</div><div class='add'>+	/* Shadow register area */</div><div class='add'>+	.hal_shadow_base_addr = 0x0,</div><div class='add'>+</div><div class='add'>+	/* REO misc control register, not used in QCN9074 */</div><div class='add'>+	.hal_reo1_misc_ctl = 0x0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct ath11k_hw_regs wcn6855_regs = {</div><div class='add'>+	/* SW2TCL(x) R0 ring configuration address */</div><div class='add'>+	.hal_tcl1_ring_base_lsb = 0x00000690,</div><div class='add'>+	.hal_tcl1_ring_base_msb = 0x00000694,</div><div class='add'>+	.hal_tcl1_ring_id = 0x00000698,</div><div class='add'>+	.hal_tcl1_ring_misc = 0x000006a0,</div><div class='add'>+	.hal_tcl1_ring_tp_addr_lsb = 0x000006ac,</div><div class='add'>+	.hal_tcl1_ring_tp_addr_msb = 0x000006b0,</div><div class='add'>+	.hal_tcl1_ring_consumer_int_setup_ix0 = 0x000006c0,</div><div class='add'>+	.hal_tcl1_ring_consumer_int_setup_ix1 = 0x000006c4,</div><div class='add'>+	.hal_tcl1_ring_msi1_base_lsb = 0x000006d8,</div><div class='add'>+	.hal_tcl1_ring_msi1_base_msb = 0x000006dc,</div><div class='add'>+	.hal_tcl1_ring_msi1_data = 0x000006e0,</div><div class='add'>+	.hal_tcl2_ring_base_lsb = 0x000006e8,</div><div class='add'>+	.hal_tcl_ring_base_lsb = 0x00000798,</div><div class='add'>+</div><div class='add'>+	/* TCL STATUS ring address */</div><div class='add'>+	.hal_tcl_status_ring_base_lsb = 0x000008a0,</div><div class='add'>+</div><div class='add'>+	/* REO2SW(x) R0 ring configuration address */</div><div class='add'>+	.hal_reo1_ring_base_lsb = 0x00000244,</div><div class='add'>+	.hal_reo1_ring_base_msb = 0x00000248,</div><div class='add'>+	.hal_reo1_ring_id = 0x0000024c,</div><div class='add'>+	.hal_reo1_ring_misc = 0x00000254,</div><div class='add'>+	.hal_reo1_ring_hp_addr_lsb = 0x00000258,</div><div class='add'>+	.hal_reo1_ring_hp_addr_msb = 0x0000025c,</div><div class='add'>+	.hal_reo1_ring_producer_int_setup = 0x00000268,</div><div class='add'>+	.hal_reo1_ring_msi1_base_lsb = 0x0000028c,</div><div class='add'>+	.hal_reo1_ring_msi1_base_msb = 0x00000290,</div><div class='add'>+	.hal_reo1_ring_msi1_data = 0x00000294,</div><div class='add'>+	.hal_reo2_ring_base_lsb = 0x0000029c,</div><div class='add'>+	.hal_reo1_aging_thresh_ix_0 = 0x000005bc,</div><div class='add'>+	.hal_reo1_aging_thresh_ix_1 = 0x000005c0,</div><div class='add'>+	.hal_reo1_aging_thresh_ix_2 = 0x000005c4,</div><div class='add'>+	.hal_reo1_aging_thresh_ix_3 = 0x000005c8,</div><div class='add'>+</div><div class='add'>+	/* REO2SW(x) R2 ring pointers (head/tail) address */</div><div class='add'>+	.hal_reo1_ring_hp = 0x00003030,</div><div class='add'>+	.hal_reo1_ring_tp = 0x00003034,</div><div class='add'>+	.hal_reo2_ring_hp = 0x00003038,</div><div class='add'>+</div><div class='add'>+	/* REO2TCL R0 ring configuration address */</div><div class='add'>+	.hal_reo_tcl_ring_base_lsb = 0x00000454,</div><div class='add'>+	.hal_reo_tcl_ring_hp = 0x00003060,</div><div class='add'>+</div><div class='add'>+	/* REO CMD ring address */</div><div class='add'>+	.hal_reo_cmd_ring_base_lsb = 0x00000194,</div><div class='add'>+	.hal_reo_cmd_ring_hp = 0x00003020,</div><div class='add'>+</div><div class='add'>+	/* REO status address */</div><div class='add'>+	.hal_reo_status_ring_base_lsb = 0x0000055c,</div><div class='add'>+	.hal_reo_status_hp = 0x00003078,</div><div class='add'>+</div><div class='add'>+	/* SW2REO ring address */</div><div class='add'>+	.hal_sw2reo_ring_base_lsb = 0x000001ec,</div><div class='add'>+	.hal_sw2reo_ring_hp = 0x00003028,</div><div class='add'>+</div><div class='add'>+	/* WCSS relative address */</div><div class='add'>+	.hal_seq_wcss_umac_ce0_src_reg = 0x1b80000,</div><div class='add'>+	.hal_seq_wcss_umac_ce0_dst_reg = 0x1b81000,</div><div class='add'>+	.hal_seq_wcss_umac_ce1_src_reg = 0x1b82000,</div><div class='add'>+	.hal_seq_wcss_umac_ce1_dst_reg = 0x1b83000,</div><div class='add'>+</div><div class='add'>+	/* WBM Idle address */</div><div class='add'>+	.hal_wbm_idle_link_ring_base_lsb = 0x00000870,</div><div class='add'>+	.hal_wbm_idle_link_ring_misc = 0x00000880,</div><div class='add'>+</div><div class='add'>+	/* SW2WBM release address */</div><div class='add'>+	.hal_wbm_release_ring_base_lsb = 0x000001e8,</div><div class='add'>+</div><div class='add'>+	/* WBM2SW release address */</div><div class='add'>+	.hal_wbm0_release_ring_base_lsb = 0x00000920,</div><div class='add'>+	.hal_wbm1_release_ring_base_lsb = 0x00000978,</div><div class='add'>+</div><div class='add'>+	/* PCIe base address */</div><div class='add'>+	.pcie_qserdes_sysclk_en_sel = 0x01e0c0ac,</div><div class='add'>+	.pcie_pcs_osc_dtct_config_base = 0x01e0c628,</div><div class='add'>+</div><div class='add'>+	/* Shadow register area */</div><div class='add'>+	.hal_shadow_base_addr = 0x000008fc,</div><div class='add'>+</div><div class='add'>+	/* REO misc control register, used for fragment</div><div class='add'>+	 * destination ring config in WCN6855.</div><div class='add'>+	 */</div><div class='add'>+	.hal_reo1_misc_ctl = 0x00000630,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct ath11k_hw_regs wcn6750_regs = {</div><div class='add'>+	/* SW2TCL(x) R0 ring configuration address */</div><div class='add'>+	.hal_tcl1_ring_base_lsb = 0x00000694,</div><div class='add'>+	.hal_tcl1_ring_base_msb = 0x00000698,</div><div class='add'>+	.hal_tcl1_ring_id = 0x0000069c,</div><div class='add'>+	.hal_tcl1_ring_misc = 0x000006a4,</div><div class='add'>+	.hal_tcl1_ring_tp_addr_lsb = 0x000006b0,</div><div class='add'>+	.hal_tcl1_ring_tp_addr_msb = 0x000006b4,</div><div class='add'>+	.hal_tcl1_ring_consumer_int_setup_ix0 = 0x000006c4,</div><div class='add'>+	.hal_tcl1_ring_consumer_int_setup_ix1 = 0x000006c8,</div><div class='add'>+	.hal_tcl1_ring_msi1_base_lsb = 0x000006dc,</div><div class='add'>+	.hal_tcl1_ring_msi1_base_msb = 0x000006e0,</div><div class='add'>+	.hal_tcl1_ring_msi1_data = 0x000006e4,</div><div class='add'>+	.hal_tcl2_ring_base_lsb = 0x000006ec,</div><div class='add'>+	.hal_tcl_ring_base_lsb = 0x0000079c,</div><div class='add'>+</div><div class='add'>+	/* TCL STATUS ring address */</div><div class='add'>+	.hal_tcl_status_ring_base_lsb = 0x000008a4,</div><div class='add'>+</div><div class='add'>+	/* REO2SW(x) R0 ring configuration address */</div><div class='add'>+	.hal_reo1_ring_base_lsb = 0x000001ec,</div><div class='add'>+	.hal_reo1_ring_base_msb = 0x000001f0,</div><div class='add'>+	.hal_reo1_ring_id = 0x000001f4,</div><div class='add'>+	.hal_reo1_ring_misc = 0x000001fc,</div><div class='add'>+	.hal_reo1_ring_hp_addr_lsb = 0x00000200,</div><div class='add'>+	.hal_reo1_ring_hp_addr_msb = 0x00000204,</div><div class='add'>+	.hal_reo1_ring_producer_int_setup = 0x00000210,</div><div class='add'>+	.hal_reo1_ring_msi1_base_lsb = 0x00000234,</div><div class='add'>+	.hal_reo1_ring_msi1_base_msb = 0x00000238,</div><div class='add'>+	.hal_reo1_ring_msi1_data = 0x0000023c,</div><div class='add'>+	.hal_reo2_ring_base_lsb = 0x00000244,</div><div class='add'>+	.hal_reo1_aging_thresh_ix_0 = 0x00000564,</div><div class='add'>+	.hal_reo1_aging_thresh_ix_1 = 0x00000568,</div><div class='add'>+	.hal_reo1_aging_thresh_ix_2 = 0x0000056c,</div><div class='add'>+	.hal_reo1_aging_thresh_ix_3 = 0x00000570,</div><div class='add'>+</div><div class='add'>+	/* REO2SW(x) R2 ring pointers (head/tail) address */</div><div class='add'>+	.hal_reo1_ring_hp = 0x00003028,</div><div class='add'>+	.hal_reo1_ring_tp = 0x0000302c,</div><div class='add'>+	.hal_reo2_ring_hp = 0x00003030,</div><div class='add'>+</div><div class='add'>+	/* REO2TCL R0 ring configuration address */</div><div class='add'>+	.hal_reo_tcl_ring_base_lsb = 0x000003fc,</div><div class='add'>+	.hal_reo_tcl_ring_hp = 0x00003058,</div><div class='add'>+</div><div class='add'>+	/* REO CMD ring address */</div><div class='add'>+	.hal_reo_cmd_ring_base_lsb = 0x000000e4,</div><div class='add'>+	.hal_reo_cmd_ring_hp = 0x00003010,</div><div class='add'>+</div><div class='add'>+	/* REO status address */</div><div class='add'>+	.hal_reo_status_ring_base_lsb = 0x00000504,</div><div class='add'>+	.hal_reo_status_hp = 0x00003070,</div><div class='add'>+</div><div class='add'>+	/* SW2REO ring address */</div><div class='add'>+	.hal_sw2reo_ring_base_lsb = 0x0000013c,</div><div class='add'>+	.hal_sw2reo_ring_hp = 0x00003018,</div><div class='add'>+</div><div class='add'>+	/* WCSS relative address */</div><div class='add'>+	.hal_seq_wcss_umac_ce0_src_reg = 0x01b80000,</div><div class='add'>+	.hal_seq_wcss_umac_ce0_dst_reg = 0x01b81000,</div><div class='add'>+	.hal_seq_wcss_umac_ce1_src_reg = 0x01b82000,</div><div class='add'>+	.hal_seq_wcss_umac_ce1_dst_reg = 0x01b83000,</div><div class='add'>+</div><div class='add'>+	/* WBM Idle address */</div><div class='add'>+	.hal_wbm_idle_link_ring_base_lsb = 0x00000874,</div><div class='add'>+	.hal_wbm_idle_link_ring_misc = 0x00000884,</div><div class='add'>+</div><div class='add'>+	/* SW2WBM release address */</div><div class='add'>+	.hal_wbm_release_ring_base_lsb = 0x000001ec,</div><div class='add'>+</div><div class='add'>+	/* WBM2SW release address */</div><div class='add'>+	.hal_wbm0_release_ring_base_lsb = 0x00000924,</div><div class='add'>+	.hal_wbm1_release_ring_base_lsb = 0x0000097c,</div><div class='add'>+</div><div class='add'>+	/* PCIe base address */</div><div class='add'>+	.pcie_qserdes_sysclk_en_sel = 0x0,</div><div class='add'>+	.pcie_pcs_osc_dtct_config_base = 0x0,</div><div class='add'>+</div><div class='add'>+	/* Shadow register area */</div><div class='add'>+	.hal_shadow_base_addr = 0x00000504,</div><div class='add'>+</div><div class='add'>+	/* REO misc control register, used for fragment</div><div class='add'>+	 * destination ring config in WCN6750.</div><div class='add'>+	 */</div><div class='add'>+	.hal_reo1_misc_ctl = 0x000005d8,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ath11k_hw_tcl2wbm_rbm_map ath11k_hw_tcl2wbm_rbm_map_ipq8074[] = {</div><div class='add'>+	{</div><div class='add'>+		.tcl_ring_num = 0,</div><div class='add'>+		.wbm_ring_num = 0,</div><div class='add'>+		.rbm_id = HAL_RX_BUF_RBM_SW0_BM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.tcl_ring_num = 1,</div><div class='add'>+		.wbm_ring_num = 1,</div><div class='add'>+		.rbm_id = HAL_RX_BUF_RBM_SW1_BM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.tcl_ring_num = 2,</div><div class='add'>+		.wbm_ring_num = 2,</div><div class='add'>+		.rbm_id = HAL_RX_BUF_RBM_SW2_BM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ath11k_hw_tcl2wbm_rbm_map ath11k_hw_tcl2wbm_rbm_map_wcn6750[] = {</div><div class='add'>+	{</div><div class='add'>+		.tcl_ring_num = 0,</div><div class='add'>+		.wbm_ring_num = 0,</div><div class='add'>+		.rbm_id = HAL_RX_BUF_RBM_SW0_BM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.tcl_ring_num = 1,</div><div class='add'>+		.wbm_ring_num = 4,</div><div class='add'>+		.rbm_id = HAL_RX_BUF_RBM_SW4_BM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.tcl_ring_num = 2,</div><div class='add'>+		.wbm_ring_num = 2,</div><div class='add'>+		.rbm_id = HAL_RX_BUF_RBM_SW2_BM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct ath11k_hw_regs ipq5018_regs = {</div><div class='add'>+	/* SW2TCL(x) R0 ring configuration address */</div><div class='add'>+	.hal_tcl1_ring_base_lsb = 0x00000694,</div><div class='add'>+	.hal_tcl1_ring_base_msb = 0x00000698,</div><div class='add'>+	.hal_tcl1_ring_id =	0x0000069c,</div><div class='add'>+	.hal_tcl1_ring_misc = 0x000006a4,</div><div class='add'>+	.hal_tcl1_ring_tp_addr_lsb = 0x000006b0,</div><div class='add'>+	.hal_tcl1_ring_tp_addr_msb = 0x000006b4,</div><div class='add'>+	.hal_tcl1_ring_consumer_int_setup_ix0 = 0x000006c4,</div><div class='add'>+	.hal_tcl1_ring_consumer_int_setup_ix1 = 0x000006c8,</div><div class='add'>+	.hal_tcl1_ring_msi1_base_lsb = 0x000006dc,</div><div class='add'>+	.hal_tcl1_ring_msi1_base_msb = 0x000006e0,</div><div class='add'>+	.hal_tcl1_ring_msi1_data = 0x000006e4,</div><div class='add'>+	.hal_tcl2_ring_base_lsb = 0x000006ec,</div><div class='add'>+	.hal_tcl_ring_base_lsb = 0x0000079c,</div><div class='add'>+</div><div class='add'>+	/* TCL STATUS ring address */</div><div class='add'>+	.hal_tcl_status_ring_base_lsb = 0x000008a4,</div><div class='add'>+</div><div class='add'>+	/* REO2SW(x) R0 ring configuration address */</div><div class='add'>+	.hal_reo1_ring_base_lsb = 0x000001ec,</div><div class='add'>+	.hal_reo1_ring_base_msb = 0x000001f0,</div><div class='add'>+	.hal_reo1_ring_id = 0x000001f4,</div><div class='add'>+	.hal_reo1_ring_misc = 0x000001fc,</div><div class='add'>+	.hal_reo1_ring_hp_addr_lsb = 0x00000200,</div><div class='add'>+	.hal_reo1_ring_hp_addr_msb = 0x00000204,</div><div class='add'>+	.hal_reo1_ring_producer_int_setup = 0x00000210,</div><div class='add'>+	.hal_reo1_ring_msi1_base_lsb = 0x00000234,</div><div class='add'>+	.hal_reo1_ring_msi1_base_msb = 0x00000238,</div><div class='add'>+	.hal_reo1_ring_msi1_data = 0x0000023c,</div><div class='add'>+	.hal_reo2_ring_base_lsb = 0x00000244,</div><div class='add'>+	.hal_reo1_aging_thresh_ix_0 = 0x00000564,</div><div class='add'>+	.hal_reo1_aging_thresh_ix_1 = 0x00000568,</div><div class='add'>+	.hal_reo1_aging_thresh_ix_2 = 0x0000056c,</div><div class='add'>+	.hal_reo1_aging_thresh_ix_3 = 0x00000570,</div><div class='add'>+</div><div class='add'>+	/* REO2SW(x) R2 ring pointers (head/tail) address */</div><div class='add'>+	.hal_reo1_ring_hp = 0x00003028,</div><div class='add'>+	.hal_reo1_ring_tp = 0x0000302c,</div><div class='add'>+	.hal_reo2_ring_hp = 0x00003030,</div><div class='add'>+</div><div class='add'>+	/* REO2TCL R0 ring configuration address */</div><div class='add'>+	.hal_reo_tcl_ring_base_lsb = 0x000003fc,</div><div class='add'>+	.hal_reo_tcl_ring_hp = 0x00003058,</div><div class='add'>+</div><div class='add'>+	/* SW2REO ring address */</div><div class='add'>+	.hal_sw2reo_ring_base_lsb = 0x0000013c,</div><div class='add'>+	.hal_sw2reo_ring_hp = 0x00003018,</div><div class='add'>+</div><div class='add'>+	/* REO CMD ring address */</div><div class='add'>+	.hal_reo_cmd_ring_base_lsb = 0x000000e4,</div><div class='add'>+	.hal_reo_cmd_ring_hp = 0x00003010,</div><div class='add'>+</div><div class='add'>+	/* REO status address */</div><div class='add'>+	.hal_reo_status_ring_base_lsb = 0x00000504,</div><div class='add'>+	.hal_reo_status_hp = 0x00003070,</div><div class='add'>+</div><div class='add'>+	/* WCSS relative address */</div><div class='add'>+	.hal_seq_wcss_umac_ce0_src_reg = 0x08400000</div><div class='add'>+		- HAL_IPQ5018_CE_WFSS_REG_BASE,</div><div class='add'>+	.hal_seq_wcss_umac_ce0_dst_reg = 0x08401000</div><div class='add'>+		- HAL_IPQ5018_CE_WFSS_REG_BASE,</div><div class='add'>+	.hal_seq_wcss_umac_ce1_src_reg = 0x08402000</div><div class='add'>+		- HAL_IPQ5018_CE_WFSS_REG_BASE,</div><div class='add'>+	.hal_seq_wcss_umac_ce1_dst_reg = 0x08403000</div><div class='add'>+		- HAL_IPQ5018_CE_WFSS_REG_BASE,</div><div class='add'>+</div><div class='add'>+	/* WBM Idle address */</div><div class='add'>+	.hal_wbm_idle_link_ring_base_lsb = 0x00000874,</div><div class='add'>+	.hal_wbm_idle_link_ring_misc = 0x00000884,</div><div class='add'>+</div><div class='add'>+	/* SW2WBM release address */</div><div class='add'>+	.hal_wbm_release_ring_base_lsb = 0x000001ec,</div><div class='add'>+</div><div class='add'>+	/* WBM2SW release address */</div><div class='add'>+	.hal_wbm0_release_ring_base_lsb = 0x00000924,</div><div class='add'>+	.hal_wbm1_release_ring_base_lsb = 0x0000097c,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct ath11k_hw_hal_params ath11k_hw_hal_params_ipq8074 = {</div><div class='add'>+	.rx_buf_rbm = HAL_RX_BUF_RBM_SW3_BM,</div><div class='add'>+	.tcl2wbm_rbm_map = ath11k_hw_tcl2wbm_rbm_map_ipq8074,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct ath11k_hw_hal_params ath11k_hw_hal_params_qca6390 = {</div><div class='add'>+	.rx_buf_rbm = HAL_RX_BUF_RBM_SW1_BM,</div><div class='add'>+	.tcl2wbm_rbm_map = ath11k_hw_tcl2wbm_rbm_map_ipq8074,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct ath11k_hw_hal_params ath11k_hw_hal_params_wcn6750 = {</div><div class='add'>+	.rx_buf_rbm = HAL_RX_BUF_RBM_SW1_BM,</div><div class='add'>+	.tcl2wbm_rbm_map = ath11k_hw_tcl2wbm_rbm_map_wcn6750,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct cfg80211_sar_freq_ranges ath11k_hw_sar_freq_ranges_wcn6855[] = {</div><div class='add'>+	{.start_freq = 2402, .end_freq = 2482 },  /* 2G ch1~ch13 */</div><div class='add'>+	{.start_freq = 5150, .end_freq = 5250 },  /* 5G UNII-1 ch32~ch48 */</div><div class='add'>+	{.start_freq = 5250, .end_freq = 5725 },  /* 5G UNII-2 ch50~ch144 */</div><div class='add'>+	{.start_freq = 5725, .end_freq = 5810 },  /* 5G UNII-3 ch149~ch161 */</div><div class='add'>+	{.start_freq = 5815, .end_freq = 5895 },  /* 5G UNII-4 ch163~ch177 */</div><div class='add'>+	{.start_freq = 5925, .end_freq = 6165 },  /* 6G UNII-5 Ch1, Ch2 ~ Ch41 */</div><div class='add'>+	{.start_freq = 6165, .end_freq = 6425 },  /* 6G UNII-5 ch45~ch93 */</div><div class='add'>+	{.start_freq = 6425, .end_freq = 6525 },  /* 6G UNII-6 ch97~ch113 */</div><div class='add'>+	{.start_freq = 6525, .end_freq = 6705 },  /* 6G UNII-7 ch117~ch149 */</div><div class='add'>+	{.start_freq = 6705, .end_freq = 6875 },  /* 6G UNII-7 ch153~ch185 */</div><div class='add'>+	{.start_freq = 6875, .end_freq = 7125 },  /* 6G UNII-8 ch189~ch233 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct cfg80211_sar_capa ath11k_hw_sar_capa_wcn6855 = {</div><div class='add'>+	.type = NL80211_SAR_TYPE_POWER,</div><div class='add'>+	.num_freq_ranges = (ARRAY_SIZE(ath11k_hw_sar_freq_ranges_wcn6855)),</div><div class='add'>+	.freq_ranges = ath11k_hw_sar_freq_ranges_wcn6855,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/hw.h b/drivers/net/wireless/ath/ath11k/hw.h<br/>index c81a6328361d..52d9f4c13b13 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/hw.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/hw.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/hw.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/hw.h</a></div><div class='hunk'>@@ -1,36 +1,38 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef ATH11K_HW_H</div><div class='ctx'> #define ATH11K_HW_H</div><div class='ctx'> </div><div class='add'>+#include "hal.h"</div><div class='ctx'> #include "wmi.h"</div><div class='ctx'> </div><div class='ctx'> /* Target configuration defines */</div><div class='ctx'> </div><div class='ctx'> /* Num VDEVS per radio */</div><div class='del'>-#define TARGET_NUM_VDEVS	(16 + 1)</div><div class='add'>+#define TARGET_NUM_VDEVS(ab)	(ab-&gt;hw_params.num_vdevs)</div><div class='ctx'> </div><div class='del'>-#define TARGET_NUM_PEERS_PDEV	(512 + TARGET_NUM_VDEVS)</div><div class='add'>+#define TARGET_NUM_PEERS_PDEV(ab) (ab-&gt;hw_params.num_peers + TARGET_NUM_VDEVS(ab))</div><div class='ctx'> </div><div class='ctx'> /* Num of peers for Single Radio mode */</div><div class='del'>-#define TARGET_NUM_PEERS_SINGLE		(TARGET_NUM_PEERS_PDEV)</div><div class='add'>+#define TARGET_NUM_PEERS_SINGLE(ab) (TARGET_NUM_PEERS_PDEV(ab))</div><div class='ctx'> </div><div class='ctx'> /* Num of peers for DBS */</div><div class='del'>-#define TARGET_NUM_PEERS_DBS		(2 * TARGET_NUM_PEERS_PDEV)</div><div class='add'>+#define TARGET_NUM_PEERS_DBS(ab) (2 * TARGET_NUM_PEERS_PDEV(ab))</div><div class='ctx'> </div><div class='ctx'> /* Num of peers for DBS_SBS */</div><div class='del'>-#define TARGET_NUM_PEERS_DBS_SBS	(3 * TARGET_NUM_PEERS_PDEV)</div><div class='add'>+#define TARGET_NUM_PEERS_DBS_SBS(ab)	(3 * TARGET_NUM_PEERS_PDEV(ab))</div><div class='ctx'> </div><div class='ctx'> /* Max num of stations (per radio) */</div><div class='del'>-#define TARGET_NUM_STATIONS	512</div><div class='add'>+#define TARGET_NUM_STATIONS(ab)	(ab-&gt;hw_params.num_peers)</div><div class='ctx'> </div><div class='del'>-#define TARGET_NUM_PEERS(x)	TARGET_NUM_PEERS_##x</div><div class='add'>+#define TARGET_NUM_PEERS(ab, x)	TARGET_NUM_PEERS_##x(ab)</div><div class='ctx'> #define TARGET_NUM_PEER_KEYS	2</div><div class='del'>-#define TARGET_NUM_TIDS(x)	(2 * TARGET_NUM_PEERS(x) + \</div><div class='del'>-				 4 * TARGET_NUM_VDEVS + 8)</div><div class='add'>+#define TARGET_NUM_TIDS(ab, x)	(2 * TARGET_NUM_PEERS(ab, x) +	\</div><div class='add'>+				 4 * TARGET_NUM_VDEVS(ab) + 8)</div><div class='ctx'> </div><div class='ctx'> #define TARGET_AST_SKID_LIMIT	16</div><div class='ctx'> #define TARGET_NUM_OFFLD_PEERS	4</div><div class='hunk'>@@ -62,6 +64,7 @@</div><div class='ctx'> #define TARGET_NUM_WDS_ENTRIES		32</div><div class='ctx'> #define TARGET_DMA_BURST_SIZE		1</div><div class='ctx'> #define TARGET_RX_BATCHMODE		1</div><div class='add'>+#define TARGET_EMA_MAX_PROFILE_PERIOD	8</div><div class='ctx'> </div><div class='ctx'> #define ATH11K_HW_MAX_QUEUES		4</div><div class='ctx'> #define ATH11K_QUEUE_LEN		4096</div><div class='hunk'>@@ -76,6 +79,9 @@</div><div class='ctx'> #define ATH11K_DEFAULT_CAL_FILE		"caldata.bin"</div><div class='ctx'> #define ATH11K_AMSS_FILE		"amss.bin"</div><div class='ctx'> #define ATH11K_M3_FILE			"m3.bin"</div><div class='add'>+#define ATH11K_REGDB_FILE_NAME		"regdb.bin"</div><div class='add'>+</div><div class='add'>+#define ATH11K_CE_OFFSET(ab)	(ab-&gt;mem_ce - ab-&gt;mem)</div><div class='ctx'> </div><div class='ctx'> enum ath11k_hw_rate_cck {</div><div class='ctx'> 	ATH11K_HW_RATE_CCK_LP_11M = 0,</div><div class='hunk'>@@ -119,6 +125,17 @@ struct ath11k_hw_ring_mask {</div><div class='ctx'> 	u8 host2rxdma[ATH11K_EXT_IRQ_GRP_NUM_MAX];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct ath11k_hw_tcl2wbm_rbm_map {</div><div class='add'>+	u8 tcl_ring_num;</div><div class='add'>+	u8 wbm_ring_num;</div><div class='add'>+	u8 rbm_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath11k_hw_hal_params {</div><div class='add'>+	enum hal_rx_buf_return_buf_manager rx_buf_rbm;</div><div class='add'>+	const struct ath11k_hw_tcl2wbm_rbm_map *tcl2wbm_rbm_map;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ath11k_hw_params {</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	u16 hw_rev;</div><div class='hunk'>@@ -128,7 +145,7 @@ struct ath11k_hw_params {</div><div class='ctx'> 	struct {</div><div class='ctx'> 		const char *dir;</div><div class='ctx'> 		size_t board_size;</div><div class='del'>-		size_t cal_size;</div><div class='add'>+		size_t cal_offset;</div><div class='ctx'> 	} fw;</div><div class='ctx'> </div><div class='ctx'> 	const struct ath11k_hw_ops *hw_ops;</div><div class='hunk'>@@ -144,24 +161,73 @@ struct ath11k_hw_params {</div><div class='ctx'> 	u32 target_ce_count;</div><div class='ctx'> 	const struct service_to_pipe *svc_to_ce_map;</div><div class='ctx'> 	u32 svc_to_ce_map_len;</div><div class='add'>+	const struct ce_ie_addr *ce_ie_addr;</div><div class='add'>+	const struct ce_remap *ce_remap;</div><div class='ctx'> </div><div class='ctx'> 	bool single_pdev_only;</div><div class='ctx'> </div><div class='ctx'> 	bool rxdma1_enable;</div><div class='del'>-	int num_rxmda_per_pdev;</div><div class='add'>+	int num_rxdma_per_pdev;</div><div class='ctx'> 	bool rx_mac_buf_ring;</div><div class='ctx'> 	bool vdev_start_delay;</div><div class='ctx'> 	bool htt_peer_map_v2;</div><div class='del'>-	bool tcl_0_only;</div><div class='del'>-	u8 spectral_fft_sz;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u8 fft_sz;</div><div class='add'>+		u8 fft_pad_sz;</div><div class='add'>+		u8 summary_pad_sz;</div><div class='add'>+		u8 fft_hdr_len;</div><div class='add'>+		u16 max_fft_bins;</div><div class='add'>+		bool fragment_160mhz;</div><div class='add'>+	} spectral;</div><div class='ctx'> </div><div class='ctx'> 	u16 interface_modes;</div><div class='ctx'> 	bool supports_monitor;</div><div class='add'>+	bool full_monitor_mode;</div><div class='ctx'> 	bool supports_shadow_regs;</div><div class='ctx'> 	bool idle_ps;</div><div class='del'>-	bool cold_boot_calib;</div><div class='add'>+	bool supports_sta_ps;</div><div class='add'>+	bool coldboot_cal_mm;</div><div class='add'>+	bool coldboot_cal_ftm;</div><div class='add'>+	bool cbcal_restart_fw;</div><div class='add'>+	int fw_mem_mode;</div><div class='add'>+	u32 num_vdevs;</div><div class='add'>+	u32 num_peers;</div><div class='ctx'> 	bool supports_suspend;</div><div class='ctx'> 	u32 hal_desc_sz;</div><div class='add'>+	bool supports_regdb;</div><div class='add'>+	bool fix_l1ss;</div><div class='add'>+	bool credit_flow;</div><div class='add'>+	u8 max_tx_ring;</div><div class='add'>+	const struct ath11k_hw_hal_params *hal_params;</div><div class='add'>+	bool supports_dynamic_smps_6ghz;</div><div class='add'>+	bool alloc_cacheable_memory;</div><div class='add'>+	bool supports_rssi_stats;</div><div class='add'>+	bool fw_wmi_diag_event;</div><div class='add'>+	bool current_cc_support;</div><div class='add'>+	bool dbr_debug_support;</div><div class='add'>+	bool global_reset;</div><div class='add'>+	const struct cfg80211_sar_capa *bios_sar_capa;</div><div class='add'>+	bool m3_fw_support;</div><div class='add'>+	bool fixed_bdf_addr;</div><div class='add'>+	bool fixed_mem_region;</div><div class='add'>+	bool static_window_map;</div><div class='add'>+	bool hybrid_bus_type;</div><div class='add'>+	bool fixed_fw_mem;</div><div class='add'>+	bool support_off_channel_tx;</div><div class='add'>+	bool supports_multi_bssid;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u32 start;</div><div class='add'>+		u32 end;</div><div class='add'>+	} sram_dump;</div><div class='add'>+</div><div class='add'>+	bool tcl_ring_retry;</div><div class='add'>+	u32 tx_ring_size;</div><div class='add'>+	bool smp2p_wow_exit;</div><div class='add'>+	bool support_fw_mac_sequence;</div><div class='add'>+	bool support_dual_stations;</div><div class='add'>+	bool pdev_suspend;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ath11k_hw_ops {</div><div class='hunk'>@@ -180,6 +246,7 @@ struct ath11k_hw_ops {</div><div class='ctx'> 	u32 (*rx_desc_get_encrypt_type)(struct hal_rx_desc *desc);</div><div class='ctx'> 	u8 (*rx_desc_get_decap_type)(struct hal_rx_desc *desc);</div><div class='ctx'> 	u8 (*rx_desc_get_mesh_ctl)(struct hal_rx_desc *desc);</div><div class='add'>+	bool (*rx_desc_get_ldpc_support)(struct hal_rx_desc *desc);</div><div class='ctx'> 	bool (*rx_desc_get_mpdu_seq_ctl_vld)(struct hal_rx_desc *desc);</div><div class='ctx'> 	bool (*rx_desc_get_mpdu_fc_valid)(struct hal_rx_desc *desc);</div><div class='ctx'> 	u16 (*rx_desc_get_mpdu_start_seq_no)(struct hal_rx_desc *desc);</div><div class='hunk'>@@ -199,16 +266,34 @@ struct ath11k_hw_ops {</div><div class='ctx'> 	void (*rx_desc_set_msdu_len)(struct hal_rx_desc *desc, u16 len);</div><div class='ctx'> 	struct rx_attention *(*rx_desc_get_attention)(struct hal_rx_desc *desc);</div><div class='ctx'> 	u8 *(*rx_desc_get_msdu_payload)(struct hal_rx_desc *desc);</div><div class='add'>+	void (*reo_setup)(struct ath11k_base *ab);</div><div class='add'>+	u16 (*mpdu_info_get_peerid)(struct hal_rx_mpdu_info *mpdu_info);</div><div class='add'>+	bool (*rx_desc_mac_addr2_valid)(struct hal_rx_desc *desc);</div><div class='add'>+	u8* (*rx_desc_mpdu_start_addr2)(struct hal_rx_desc *desc);</div><div class='add'>+	u32 (*get_ring_selector)(struct sk_buff *skb);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern const struct ath11k_hw_ops ipq8074_ops;</div><div class='ctx'> extern const struct ath11k_hw_ops ipq6018_ops;</div><div class='ctx'> extern const struct ath11k_hw_ops qca6390_ops;</div><div class='ctx'> extern const struct ath11k_hw_ops qcn9074_ops;</div><div class='add'>+extern const struct ath11k_hw_ops wcn6855_ops;</div><div class='add'>+extern const struct ath11k_hw_ops wcn6750_ops;</div><div class='add'>+extern const struct ath11k_hw_ops ipq5018_ops;</div><div class='ctx'> </div><div class='ctx'> extern const struct ath11k_hw_ring_mask ath11k_hw_ring_mask_ipq8074;</div><div class='ctx'> extern const struct ath11k_hw_ring_mask ath11k_hw_ring_mask_qca6390;</div><div class='ctx'> extern const struct ath11k_hw_ring_mask ath11k_hw_ring_mask_qcn9074;</div><div class='add'>+extern const struct ath11k_hw_ring_mask ath11k_hw_ring_mask_wcn6750;</div><div class='add'>+</div><div class='add'>+extern const struct ce_ie_addr ath11k_ce_ie_addr_ipq8074;</div><div class='add'>+extern const struct ce_ie_addr ath11k_ce_ie_addr_ipq5018;</div><div class='add'>+</div><div class='add'>+extern const struct ce_remap ath11k_ce_remap_ipq5018;</div><div class='add'>+</div><div class='add'>+extern const struct ath11k_hw_hal_params ath11k_hw_hal_params_ipq8074;</div><div class='add'>+extern const struct ath11k_hw_hal_params ath11k_hw_hal_params_qca6390;</div><div class='add'>+extern const struct ath11k_hw_hal_params ath11k_hw_hal_params_wcn6750;</div><div class='ctx'> </div><div class='ctx'> static inline</div><div class='ctx'> int ath11k_hw_get_mac_from_pdev_id(struct ath11k_hw_params *hw,</div><div class='hunk'>@@ -249,10 +334,16 @@ enum ath11k_bd_ie_board_type {</div><div class='ctx'> 	ATH11K_BD_IE_BOARD_DATA = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum ath11k_bd_ie_regdb_type {</div><div class='add'>+	ATH11K_BD_IE_REGDB_NAME = 0,</div><div class='add'>+	ATH11K_BD_IE_REGDB_DATA = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum ath11k_bd_ie_type {</div><div class='ctx'> 	/* contains sub IEs of enum ath11k_bd_ie_board_type */</div><div class='ctx'> 	ATH11K_BD_IE_BOARD = 0,</div><div class='del'>-	ATH11K_BD_IE_BOARD_EXT = 1,</div><div class='add'>+	/* contains sub IEs of enum ath11k_bd_ie_regdb_type */</div><div class='add'>+	ATH11K_BD_IE_REGDB = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ath11k_hw_regs {</div><div class='hunk'>@@ -298,6 +389,12 @@ struct ath11k_hw_regs {</div><div class='ctx'> 	u32 hal_reo_status_ring_base_lsb;</div><div class='ctx'> 	u32 hal_reo_status_hp;</div><div class='ctx'> </div><div class='add'>+	u32 hal_reo_cmd_ring_base_lsb;</div><div class='add'>+	u32 hal_reo_cmd_ring_hp;</div><div class='add'>+</div><div class='add'>+	u32 hal_sw2reo_ring_base_lsb;</div><div class='add'>+	u32 hal_sw2reo_ring_hp;</div><div class='add'>+</div><div class='ctx'> 	u32 hal_seq_wcss_umac_ce0_src_reg;</div><div class='ctx'> 	u32 hal_seq_wcss_umac_ce0_dst_reg;</div><div class='ctx'> 	u32 hal_seq_wcss_umac_ce1_src_reg;</div><div class='hunk'>@@ -313,10 +410,30 @@ struct ath11k_hw_regs {</div><div class='ctx'> </div><div class='ctx'> 	u32 pcie_qserdes_sysclk_en_sel;</div><div class='ctx'> 	u32 pcie_pcs_osc_dtct_config_base;</div><div class='add'>+</div><div class='add'>+	u32 hal_shadow_base_addr;</div><div class='add'>+	u32 hal_reo1_misc_ctl;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern const struct ath11k_hw_regs ipq8074_regs;</div><div class='ctx'> extern const struct ath11k_hw_regs qca6390_regs;</div><div class='ctx'> extern const struct ath11k_hw_regs qcn9074_regs;</div><div class='add'>+extern const struct ath11k_hw_regs wcn6855_regs;</div><div class='add'>+extern const struct ath11k_hw_regs wcn6750_regs;</div><div class='add'>+extern const struct ath11k_hw_regs ipq5018_regs;</div><div class='add'>+</div><div class='add'>+static inline const char *ath11k_bd_ie_type_str(enum ath11k_bd_ie_type type)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case ATH11K_BD_IE_BOARD:</div><div class='add'>+		return "board data";</div><div class='add'>+	case ATH11K_BD_IE_REGDB:</div><div class='add'>+		return "regdb data";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "unknown";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern const struct cfg80211_sar_capa ath11k_hw_sar_capa_wcn6855;</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c<br/>index 4df425dd31a2..3276fe443502 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/mac.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/mac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/mac.c</a></div><div class='hunk'>@@ -1,10 +1,17 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='add'>+#include &lt;net/cfg80211.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/inetdevice.h&gt;</div><div class='add'>+#include &lt;net/if_inet6.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "mac.h"</div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "debug.h"</div><div class='hunk'>@@ -15,6 +22,8 @@</div><div class='ctx'> #include "testmode.h"</div><div class='ctx'> #include "peer.h"</div><div class='ctx'> #include "debugfs_sta.h"</div><div class='add'>+#include "hif.h"</div><div class='add'>+#include "wow.h"</div><div class='ctx'> </div><div class='ctx'> #define CHAN2G(_channel, _freq, _flags) { \</div><div class='ctx'> 	.band                   = NL80211_BAND_2GHZ, \</div><div class='hunk'>@@ -88,6 +97,7 @@ static const struct ieee80211_channel ath11k_5ghz_channels[] = {</div><div class='ctx'> 	CHAN5G(165, 5825, 0),</div><div class='ctx'> 	CHAN5G(169, 5845, 0),</div><div class='ctx'> 	CHAN5G(173, 5865, 0),</div><div class='add'>+	CHAN5G(177, 5885, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct ieee80211_channel ath11k_6ghz_channels[] = {</div><div class='hunk'>@@ -150,6 +160,9 @@ static const struct ieee80211_channel ath11k_6ghz_channels[] = {</div><div class='ctx'> 	CHAN6G(225, 7075, 0),</div><div class='ctx'> 	CHAN6G(229, 7095, 0),</div><div class='ctx'> 	CHAN6G(233, 7115, 0),</div><div class='add'>+</div><div class='add'>+	/* new addition in IEEE Std 802.11ax-2021 */</div><div class='add'>+	CHAN6G(2, 5935, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ieee80211_rate ath11k_legacy_rates[] = {</div><div class='hunk'>@@ -230,7 +243,10 @@ const struct htt_rx_ring_tlv_filter ath11k_mac_mon_status_filter_default = {</div><div class='ctx'> #define ath11k_a_rates (ath11k_legacy_rates + 4)</div><div class='ctx'> #define ath11k_a_rates_size (ARRAY_SIZE(ath11k_legacy_rates) - 4)</div><div class='ctx'> </div><div class='del'>-#define ATH11K_MAC_SCAN_TIMEOUT_MSECS 200 /* in msecs */</div><div class='add'>+#define ATH11K_MAC_SCAN_CMD_EVT_OVERHEAD		200 /* in msecs */</div><div class='add'>+</div><div class='add'>+/* Overhead due to the processing of channel switch events from FW */</div><div class='add'>+#define ATH11K_SCAN_CHANNEL_SWITCH_WMI_EVT_OVERHEAD	10 /* in msecs */</div><div class='ctx'> </div><div class='ctx'> static const u32 ath11k_smps_map[] = {</div><div class='ctx'> 	[WLAN_HT_CAP_SM_PS_STATIC] = WMI_PEER_SMPS_STATIC,</div><div class='hunk'>@@ -239,8 +255,92 @@ static const u32 ath11k_smps_map[] = {</div><div class='ctx'> 	[WLAN_HT_CAP_SM_PS_DISABLED] = WMI_PEER_SMPS_PS_NONE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ath11k_start_vdev_delay(struct ieee80211_hw *hw,</div><div class='del'>-				   struct ieee80211_vif *vif);</div><div class='add'>+enum nl80211_he_ru_alloc ath11k_mac_phy_he_ru_to_nl80211_he_ru_alloc(u16 ru_phy)</div><div class='add'>+{</div><div class='add'>+	enum nl80211_he_ru_alloc ret;</div><div class='add'>+</div><div class='add'>+	switch (ru_phy) {</div><div class='add'>+	case RU_26:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_RU_ALLOC_26;</div><div class='add'>+		break;</div><div class='add'>+	case RU_52:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_RU_ALLOC_52;</div><div class='add'>+		break;</div><div class='add'>+	case RU_106:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_RU_ALLOC_106;</div><div class='add'>+		break;</div><div class='add'>+	case RU_242:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_RU_ALLOC_242;</div><div class='add'>+		break;</div><div class='add'>+	case RU_484:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_RU_ALLOC_484;</div><div class='add'>+		break;</div><div class='add'>+	case RU_996:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_RU_ALLOC_996;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_RU_ALLOC_26;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum nl80211_he_ru_alloc ath11k_mac_he_ru_tones_to_nl80211_he_ru_alloc(u16 ru_tones)</div><div class='add'>+{</div><div class='add'>+	enum nl80211_he_ru_alloc ret;</div><div class='add'>+</div><div class='add'>+	switch (ru_tones) {</div><div class='add'>+	case 26:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_RU_ALLOC_26;</div><div class='add'>+		break;</div><div class='add'>+	case 52:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_RU_ALLOC_52;</div><div class='add'>+		break;</div><div class='add'>+	case 106:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_RU_ALLOC_106;</div><div class='add'>+		break;</div><div class='add'>+	case 242:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_RU_ALLOC_242;</div><div class='add'>+		break;</div><div class='add'>+	case 484:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_RU_ALLOC_484;</div><div class='add'>+		break;</div><div class='add'>+	case 996:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_RU_ALLOC_996;</div><div class='add'>+		break;</div><div class='add'>+	case (996 * 2):</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_RU_ALLOC_2x996;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_RU_ALLOC_26;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum nl80211_he_gi ath11k_mac_he_gi_to_nl80211_he_gi(u8 sgi)</div><div class='add'>+{</div><div class='add'>+	enum nl80211_he_gi ret;</div><div class='add'>+</div><div class='add'>+	switch (sgi) {</div><div class='add'>+	case RX_MSDU_START_SGI_0_8_US:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_GI_0_8;</div><div class='add'>+		break;</div><div class='add'>+	case RX_MSDU_START_SGI_1_6_US:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_GI_1_6;</div><div class='add'>+		break;</div><div class='add'>+	case RX_MSDU_START_SGI_3_2_US:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_GI_3_2;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_GI_0_8;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> u8 ath11k_mac_bw_to_mac80211_bw(u8 bw)</div><div class='ctx'> {</div><div class='hunk'>@@ -331,7 +431,7 @@ u8 ath11k_mac_bitrate_to_idx(const struct ieee80211_supported_band *sband,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32</div><div class='del'>-ath11k_mac_max_ht_nss(const u8 ht_mcs_mask[IEEE80211_HT_MCS_MASK_LEN])</div><div class='add'>+ath11k_mac_max_ht_nss(const u8 *ht_mcs_mask)</div><div class='ctx'> {</div><div class='ctx'> 	int nss;</div><div class='ctx'> </div><div class='hunk'>@@ -343,7 +443,7 @@ ath11k_mac_max_ht_nss(const u8 ht_mcs_mask[IEEE80211_HT_MCS_MASK_LEN])</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32</div><div class='del'>-ath11k_mac_max_vht_nss(const u16 vht_mcs_mask[NL80211_VHT_NSS_MAX])</div><div class='add'>+ath11k_mac_max_vht_nss(const u16 *vht_mcs_mask)</div><div class='ctx'> {</div><div class='ctx'> 	int nss;</div><div class='ctx'> </div><div class='hunk'>@@ -354,6 +454,18 @@ ath11k_mac_max_vht_nss(const u16 vht_mcs_mask[NL80211_VHT_NSS_MAX])</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32</div><div class='add'>+ath11k_mac_max_he_nss(const u16 *he_mcs_mask)</div><div class='add'>+{</div><div class='add'>+	int nss;</div><div class='add'>+</div><div class='add'>+	for (nss = NL80211_HE_NSS_MAX - 1; nss &gt;= 0; nss--)</div><div class='add'>+		if (he_mcs_mask[nss])</div><div class='add'>+			return nss + 1;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u8 ath11k_parse_mpdudensity(u8 mpdudensity)</div><div class='ctx'> {</div><div class='ctx'> /* 802.11n D2.0 defined values for "Minimum MPDU Start Spacing":</div><div class='hunk'>@@ -395,7 +507,7 @@ static int ath11k_mac_vif_chan(struct ieee80211_vif *vif,</div><div class='ctx'> 	struct ieee80211_chanctx_conf *conf;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	conf = rcu_dereference(vif-&gt;chanctx_conf);</div><div class='add'>+	conf = rcu_dereference(vif-&gt;bss_conf.chanctx_conf);</div><div class='ctx'> 	if (!conf) {</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		return -ENOENT;</div><div class='hunk'>@@ -452,7 +564,7 @@ static void ath11k_get_arvif_iter(void *data, u8 *mac,</div><div class='ctx'> 				  struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_vif_iter *arvif_iter = data;</div><div class='del'>-	struct ath11k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> </div><div class='ctx'> 	if (arvif-&gt;vdev_id == arvif_iter-&gt;vdev_id)</div><div class='ctx'> 		arvif_iter-&gt;arvif = arvif;</div><div class='hunk'>@@ -488,7 +600,8 @@ struct ath11k_vif *ath11k_mac_get_arvif_by_vdev_id(struct ath11k_base *ab,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='ctx'> 		pdev = rcu_dereference(ab-&gt;pdevs_active[i]);</div><div class='del'>-		if (pdev &amp;&amp; pdev-&gt;ar) {</div><div class='add'>+		if (pdev &amp;&amp; pdev-&gt;ar &amp;&amp;</div><div class='add'>+		    (pdev-&gt;ar-&gt;allocated_vdev_map &amp; (1LL &lt;&lt; vdev_id))) {</div><div class='ctx'> 			arvif = ath11k_mac_get_arvif(pdev-&gt;ar, vdev_id);</div><div class='ctx'> 			if (arvif)</div><div class='ctx'> 				return arvif;</div><div class='hunk'>@@ -528,7 +641,10 @@ struct ath11k *ath11k_mac_get_ar_by_pdev_id(struct ath11k_base *ab, u32 pdev_id)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='del'>-		pdev = rcu_dereference(ab-&gt;pdevs_active[i]);</div><div class='add'>+		if (ab-&gt;fw_mode == ATH11K_FIRMWARE_MODE_FTM)</div><div class='add'>+			pdev = &amp;ab-&gt;pdevs[i];</div><div class='add'>+		else</div><div class='add'>+			pdev = rcu_dereference(ab-&gt;pdevs_active[i]);</div><div class='ctx'> </div><div class='ctx'> 		if (pdev &amp;&amp; pdev-&gt;pdev_id == pdev_id)</div><div class='ctx'> 			return (pdev-&gt;ar ? pdev-&gt;ar : NULL);</div><div class='hunk'>@@ -537,6 +653,67 @@ struct ath11k *ath11k_mac_get_ar_by_pdev_id(struct ath11k_base *ab, u32 pdev_id)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct ath11k_vif *ath11k_mac_get_vif_up(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar;</div><div class='add'>+	struct ath11k_pdev *pdev;</div><div class='add'>+	struct ath11k_vif *arvif;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		pdev = &amp;ab-&gt;pdevs[i];</div><div class='add'>+		ar = pdev-&gt;ar;</div><div class='add'>+		list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+			if (arvif-&gt;is_up)</div><div class='add'>+				return arvif;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath11k_mac_band_match(enum nl80211_band band1, enum WMI_HOST_WLAN_BAND band2)</div><div class='add'>+{</div><div class='add'>+	return (((band1 == NL80211_BAND_2GHZ) &amp;&amp; (band2 &amp; WMI_HOST_WLAN_2G_CAP)) ||</div><div class='add'>+		(((band1 == NL80211_BAND_5GHZ) || (band1 == NL80211_BAND_6GHZ)) &amp;&amp;</div><div class='add'>+		   (band2 &amp; WMI_HOST_WLAN_5G_CAP)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 ath11k_mac_get_target_pdev_id_from_vif(struct ath11k_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ath11k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ieee80211_vif *vif = arvif-&gt;vif;</div><div class='add'>+	struct cfg80211_chan_def def;</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	u8 pdev_id = ab-&gt;target_pdev_ids[0].pdev_id;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ath11k_mac_vif_chan(vif, &amp;def)))</div><div class='add'>+		return pdev_id;</div><div class='add'>+</div><div class='add'>+	band = def.chan-&gt;band;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;target_pdev_count; i++) {</div><div class='add'>+		if (ath11k_mac_band_match(band, ab-&gt;target_pdev_ids[i].supported_bands))</div><div class='add'>+			return ab-&gt;target_pdev_ids[i].pdev_id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return pdev_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 ath11k_mac_get_target_pdev_id(struct ath11k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_vif *arvif;</div><div class='add'>+</div><div class='add'>+	arvif = ath11k_mac_get_vif_up(ar-&gt;ab);</div><div class='add'>+</div><div class='add'>+	if (arvif)</div><div class='add'>+		return ath11k_mac_get_target_pdev_id_from_vif(arvif);</div><div class='add'>+	else</div><div class='add'>+		return ar-&gt;ab-&gt;target_pdev_ids[0].pdev_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath11k_pdev_caps_update(struct ath11k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='hunk'>@@ -639,7 +816,7 @@ static int ath11k_recalc_rtscts_prot(struct ath11k_vif *arvif)</div><div class='ctx'> </div><div class='ctx'> 	arvif-&gt;rtscts_prot_mode = rts_cts;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "mac vdev %d recalc rts/cts prot %d\n",</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "vdev %d recalc rts/cts prot %d\n",</div><div class='ctx'> 		   arvif-&gt;vdev_id, rts_cts);</div><div class='ctx'> </div><div class='ctx'> 	ret =  ath11k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='hunk'>@@ -703,78 +880,755 @@ void ath11k_mac_peer_cleanup_all(struct ath11k *ar)</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;ab-&gt;tbl_mtx_lock);</div><div class='ctx'> 	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='ctx'> 	list_for_each_entry_safe(peer, tmp, &amp;ab-&gt;peers, list) {</div><div class='ctx'> 		ath11k_peer_rx_tid_cleanup(ar, peer);</div><div class='add'>+		ath11k_peer_rhash_delete(ab, peer);</div><div class='ctx'> 		list_del(&amp;peer-&gt;list);</div><div class='ctx'> 		kfree(peer);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	mutex_unlock(&amp;ab-&gt;tbl_mtx_lock);</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;num_peers = 0;</div><div class='ctx'> 	ar-&gt;num_stations = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_monitor_vdev_up(struct ath11k *ar, int vdev_id)</div><div class='add'>+static inline int ath11k_mac_vdev_setup_sync(struct ath11k *ar)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH11K_FLAG_CRASH_FLUSH, &amp;ar-&gt;ab-&gt;dev_flags))</div><div class='add'>+		return -ESHUTDOWN;</div><div class='add'>+</div><div class='add'>+	if (!wait_for_completion_timeout(&amp;ar-&gt;vdev_setup_done,</div><div class='add'>+					 ATH11K_VDEV_SETUP_TIMEOUT_HZ))</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	return ar-&gt;last_wmi_vdev_start_status ? -EINVAL : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath11k_mac_get_any_chandef_iter(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_chanctx_conf *conf,</div><div class='add'>+				void *data)</div><div class='add'>+{</div><div class='add'>+	struct cfg80211_chan_def **def = data;</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_wmi_vdev_up(ar, vdev_id, 0, ar-&gt;mac_addr);</div><div class='add'>+	*def = &amp;conf-&gt;def;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_monitor_vdev_start(struct ath11k *ar, int vdev_id,</div><div class='add'>+					 struct cfg80211_chan_def *chandef)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_channel *channel;</div><div class='add'>+	struct wmi_vdev_start_req_arg arg = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	channel = chandef-&gt;chan;</div><div class='add'>+</div><div class='add'>+	arg.vdev_id = vdev_id;</div><div class='add'>+	arg.channel.freq = channel-&gt;center_freq;</div><div class='add'>+	arg.channel.band_center_freq1 = chandef-&gt;center_freq1;</div><div class='add'>+	arg.channel.band_center_freq2 = chandef-&gt;center_freq2;</div><div class='add'>+</div><div class='add'>+	arg.channel.mode = ath11k_phymodes[chandef-&gt;chan-&gt;band][chandef-&gt;width];</div><div class='add'>+	arg.channel.chan_radar = !!(channel-&gt;flags &amp; IEEE80211_CHAN_RADAR);</div><div class='add'>+</div><div class='add'>+	arg.channel.min_power = 0;</div><div class='add'>+	arg.channel.max_power = channel-&gt;max_power;</div><div class='add'>+	arg.channel.max_reg_power = channel-&gt;max_reg_power;</div><div class='add'>+	arg.channel.max_antenna_gain = channel-&gt;max_antenna_gain;</div><div class='add'>+</div><div class='add'>+	arg.pref_tx_streams = ar-&gt;num_tx_chains;</div><div class='add'>+	arg.pref_rx_streams = ar-&gt;num_rx_chains;</div><div class='add'>+</div><div class='add'>+	arg.channel.passive = !!(chandef-&gt;chan-&gt;flags &amp; IEEE80211_CHAN_NO_IR);</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;ar-&gt;vdev_setup_done);</div><div class='add'>+	reinit_completion(&amp;ar-&gt;vdev_delete_done);</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_vdev_start(ar, &amp;arg, false);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ath11k_warn(ar-&gt;ab, "failed to put up monitor vdev %i: %d\n",</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to request monitor vdev %i start: %d\n",</div><div class='add'>+			    vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_mac_vdev_setup_sync(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to synchronize setup for monitor vdev %i start: %d\n",</div><div class='ctx'> 			    vdev_id, ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "mac monitor vdev %i started\n",</div><div class='add'>+	ret = ath11k_wmi_vdev_up(ar, vdev_id, 0, ar-&gt;mac_addr, NULL, 0, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to put up monitor vdev %i: %d\n",</div><div class='add'>+			    vdev_id, ret);</div><div class='add'>+		goto vdev_stop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "monitor vdev %i started\n",</div><div class='ctx'> 		   vdev_id);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+vdev_stop:</div><div class='add'>+	reinit_completion(&amp;ar-&gt;vdev_setup_done);</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_vdev_stop(ar, vdev_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to stop monitor vdev %i after start failure: %d\n",</div><div class='add'>+			    vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_mac_vdev_setup_sync(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to synchronize setup for vdev %i stop: %d\n",</div><div class='add'>+			    vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_mac_op_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+static int ath11k_mac_monitor_vdev_stop(struct ath11k *ar)</div><div class='ctx'> {</div><div class='del'>-	/* mac80211 requires this op to be present and that's why</div><div class='del'>-	 * there's an empty function, this can be extended when</div><div class='del'>-	 * required.</div><div class='del'>-	 */</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;ar-&gt;vdev_setup_done);</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_vdev_stop(ar, ar-&gt;monitor_vdev_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to request monitor vdev %i stop: %d\n",</div><div class='add'>+			    ar-&gt;monitor_vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_mac_vdev_setup_sync(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to synchronize monitor vdev %i stop: %d\n",</div><div class='add'>+			    ar-&gt;monitor_vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_vdev_down(ar, ar-&gt;monitor_vdev_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to put down monitor vdev %i: %d\n",</div><div class='add'>+			    ar-&gt;monitor_vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "monitor vdev %i stopped\n",</div><div class='add'>+		   ar-&gt;monitor_vdev_id);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_mac_setup_bcn_tmpl(struct ath11k_vif *arvif)</div><div class='add'>+static int ath11k_mac_monitor_vdev_create(struct ath11k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_pdev *pdev = ar-&gt;pdev;</div><div class='add'>+	struct vdev_create_params param = {};</div><div class='add'>+	int bit, ret;</div><div class='add'>+	u8 tmp_addr[6] = {};</div><div class='add'>+	u16 nss;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH11K_FLAG_MONITOR_VDEV_CREATED, &amp;ar-&gt;monitor_flags))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;ab-&gt;free_vdev_map == 0) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to find free vdev id for monitor vdev\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bit = __ffs64(ar-&gt;ab-&gt;free_vdev_map);</div><div class='add'>+</div><div class='add'>+	ar-&gt;monitor_vdev_id = bit;</div><div class='add'>+</div><div class='add'>+	param.if_id = ar-&gt;monitor_vdev_id;</div><div class='add'>+	param.type = WMI_VDEV_TYPE_MONITOR;</div><div class='add'>+	param.subtype = WMI_VDEV_SUBTYPE_NONE;</div><div class='add'>+	param.pdev_id = pdev-&gt;pdev_id;</div><div class='add'>+</div><div class='add'>+	if (pdev-&gt;cap.supported_bands &amp; WMI_HOST_WLAN_2G_CAP) {</div><div class='add'>+		param.chains[NL80211_BAND_2GHZ].tx = ar-&gt;num_tx_chains;</div><div class='add'>+		param.chains[NL80211_BAND_2GHZ].rx = ar-&gt;num_rx_chains;</div><div class='add'>+	}</div><div class='add'>+	if (pdev-&gt;cap.supported_bands &amp; WMI_HOST_WLAN_5G_CAP) {</div><div class='add'>+		param.chains[NL80211_BAND_5GHZ].tx = ar-&gt;num_tx_chains;</div><div class='add'>+		param.chains[NL80211_BAND_5GHZ].rx = ar-&gt;num_rx_chains;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_vdev_create(ar, tmp_addr, &amp;param);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to request monitor vdev %i creation: %d\n",</div><div class='add'>+			    ar-&gt;monitor_vdev_id, ret);</div><div class='add'>+		ar-&gt;monitor_vdev_id = -1;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nss = get_num_chains(ar-&gt;cfg_tx_chainmask) ? : 1;</div><div class='add'>+	ret = ath11k_wmi_vdev_set_param_cmd(ar, ar-&gt;monitor_vdev_id,</div><div class='add'>+					    WMI_VDEV_PARAM_NSS, nss);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to set vdev %d chainmask 0x%x, nss %d :%d\n",</div><div class='add'>+			    ar-&gt;monitor_vdev_id, ar-&gt;cfg_tx_chainmask, nss, ret);</div><div class='add'>+		goto err_vdev_del;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_mac_txpower_recalc(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to recalc txpower for monitor vdev %d: %d\n",</div><div class='add'>+			    ar-&gt;monitor_vdev_id, ret);</div><div class='add'>+		goto err_vdev_del;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;allocated_vdev_map |= 1LL &lt;&lt; ar-&gt;monitor_vdev_id;</div><div class='add'>+	ar-&gt;ab-&gt;free_vdev_map &amp;= ~(1LL &lt;&lt; ar-&gt;monitor_vdev_id);</div><div class='add'>+	ar-&gt;num_created_vdevs++;</div><div class='add'>+	set_bit(ATH11K_FLAG_MONITOR_VDEV_CREATED, &amp;ar-&gt;monitor_flags);</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "monitor vdev %d created\n",</div><div class='add'>+		   ar-&gt;monitor_vdev_id);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_vdev_del:</div><div class='add'>+	ath11k_wmi_vdev_delete(ar, ar-&gt;monitor_vdev_id);</div><div class='add'>+	ar-&gt;monitor_vdev_id = -1;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_monitor_vdev_delete(struct ath11k *ar)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned long time_left;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(ATH11K_FLAG_MONITOR_VDEV_CREATED, &amp;ar-&gt;monitor_flags))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;ar-&gt;vdev_delete_done);</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_vdev_delete(ar, ar-&gt;monitor_vdev_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to request wmi monitor vdev %i removal: %d\n",</div><div class='add'>+			    ar-&gt;monitor_vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;ar-&gt;vdev_delete_done,</div><div class='add'>+						ATH11K_VDEV_DELETE_TIMEOUT_HZ);</div><div class='add'>+	if (time_left == 0) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "Timeout in receiving vdev delete response\n");</div><div class='add'>+	} else {</div><div class='add'>+		ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "monitor vdev %d deleted\n",</div><div class='add'>+			   ar-&gt;monitor_vdev_id);</div><div class='add'>+</div><div class='add'>+		ar-&gt;allocated_vdev_map &amp;= ~(1LL &lt;&lt; ar-&gt;monitor_vdev_id);</div><div class='add'>+		ar-&gt;ab-&gt;free_vdev_map |= 1LL &lt;&lt; (ar-&gt;monitor_vdev_id);</div><div class='add'>+		ar-&gt;num_created_vdevs--;</div><div class='add'>+		ar-&gt;monitor_vdev_id = -1;</div><div class='add'>+		clear_bit(ATH11K_FLAG_MONITOR_VDEV_CREATED, &amp;ar-&gt;monitor_flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_monitor_start(struct ath11k *ar)</div><div class='add'>+{</div><div class='add'>+	struct cfg80211_chan_def *chandef = NULL;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH11K_FLAG_MONITOR_STARTED, &amp;ar-&gt;monitor_flags))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ieee80211_iter_chan_contexts_atomic(ar-&gt;hw,</div><div class='add'>+					    ath11k_mac_get_any_chandef_iter,</div><div class='add'>+					    &amp;chandef);</div><div class='add'>+	if (!chandef)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_mac_monitor_vdev_start(ar, ar-&gt;monitor_vdev_id, chandef);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to start monitor vdev: %d\n", ret);</div><div class='add'>+		ath11k_mac_monitor_vdev_delete(ar);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_bit(ATH11K_FLAG_MONITOR_STARTED, &amp;ar-&gt;monitor_flags);</div><div class='add'>+</div><div class='add'>+	ar-&gt;num_started_vdevs++;</div><div class='add'>+	ret = ath11k_dp_tx_htt_monitor_mode_ring_config(ar, false);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to configure htt monitor mode ring during start: %d",</div><div class='add'>+			    ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "monitor started\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_monitor_stop(struct ath11k *ar)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(ATH11K_FLAG_MONITOR_STARTED, &amp;ar-&gt;monitor_flags))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_mac_monitor_vdev_stop(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to stop monitor vdev: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clear_bit(ATH11K_FLAG_MONITOR_STARTED, &amp;ar-&gt;monitor_flags);</div><div class='add'>+	ar-&gt;num_started_vdevs--;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_dp_tx_htt_monitor_mode_ring_config(ar, true);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to configure htt monitor mode ring during stop: %d",</div><div class='add'>+			    ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "monitor stopped ret %d\n", ret);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_vif_setup_ps(struct ath11k_vif *arvif)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = arvif-&gt;ar;</div><div class='del'>-	struct ath11k_base *ab = ar-&gt;ab;</div><div class='del'>-	struct ieee80211_hw *hw = ar-&gt;hw;</div><div class='ctx'> 	struct ieee80211_vif *vif = arvif-&gt;vif;</div><div class='del'>-	struct ieee80211_mutable_offsets offs = {};</div><div class='del'>-	struct sk_buff *bcn;</div><div class='del'>-	struct ieee80211_mgmt *mgmt;</div><div class='del'>-	u8 *ies;</div><div class='add'>+	struct ieee80211_conf *conf = &amp;ar-&gt;hw-&gt;conf;</div><div class='add'>+	enum wmi_sta_powersave_param param;</div><div class='add'>+	enum wmi_sta_ps_mode psmode;</div><div class='ctx'> 	int ret;</div><div class='add'>+	int timeout;</div><div class='add'>+	bool enable_ps;</div><div class='ctx'> </div><div class='del'>-	if (arvif-&gt;vdev_type != WMI_VDEV_TYPE_AP)</div><div class='add'>+	lockdep_assert_held(&amp;arvif-&gt;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bcn = ieee80211_beacon_get_template(hw, vif, &amp;offs);</div><div class='del'>-	if (!bcn) {</div><div class='del'>-		ath11k_warn(ab, "failed to get beacon template from mac80211\n");</div><div class='del'>-		return -EPERM;</div><div class='add'>+	enable_ps = arvif-&gt;ps;</div><div class='add'>+</div><div class='add'>+	if (enable_ps) {</div><div class='add'>+		psmode = WMI_STA_PS_MODE_ENABLED;</div><div class='add'>+		param = WMI_STA_PS_PARAM_INACTIVITY_TIME;</div><div class='add'>+</div><div class='add'>+		timeout = conf-&gt;dynamic_ps_timeout;</div><div class='add'>+		if (timeout == 0) {</div><div class='add'>+			/* firmware doesn't like 0 */</div><div class='add'>+			timeout = ieee80211_tu_to_usec(vif-&gt;bss_conf.beacon_int) / 1000;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ath11k_wmi_set_sta_ps_param(ar, arvif-&gt;vdev_id, param,</div><div class='add'>+						  timeout);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to set inactivity time for vdev %d: %i\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		psmode = WMI_STA_PS_MODE_DISABLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "vdev %d psmode %s\n",</div><div class='add'>+		   arvif-&gt;vdev_id, psmode ? "enable" : "disable");</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_pdev_set_ps_mode(ar, arvif-&gt;vdev_id, psmode);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to set sta power save mode %d for vdev %d: %d\n",</div><div class='add'>+			    psmode, arvif-&gt;vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_config_ps(struct ath11k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_vif *arvif;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+		ret = ath11k_mac_vif_setup_ps(arvif);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to setup powersave: %d\n", ret);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_op_config(struct ieee80211_hw *hw, int radio_idx, u32 changed)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = hw-&gt;priv;</div><div class='add'>+	struct ieee80211_conf *conf = &amp;hw-&gt;conf;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	if (changed &amp; IEEE80211_CONF_CHANGE_MONITOR) {</div><div class='add'>+		if (conf-&gt;flags &amp; IEEE80211_CONF_MONITOR) {</div><div class='add'>+			set_bit(ATH11K_FLAG_MONITOR_CONF_ENABLED, &amp;ar-&gt;monitor_flags);</div><div class='add'>+</div><div class='add'>+			if (test_bit(ATH11K_FLAG_MONITOR_VDEV_CREATED,</div><div class='add'>+				     &amp;ar-&gt;monitor_flags))</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='add'>+			ret = ath11k_mac_monitor_vdev_create(ar);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath11k_warn(ar-&gt;ab, "failed to create monitor vdev: %d",</div><div class='add'>+					    ret);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ret = ath11k_mac_monitor_start(ar);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath11k_warn(ar-&gt;ab, "failed to start monitor: %d",</div><div class='add'>+					    ret);</div><div class='add'>+				goto err_mon_del;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			clear_bit(ATH11K_FLAG_MONITOR_CONF_ENABLED, &amp;ar-&gt;monitor_flags);</div><div class='add'>+</div><div class='add'>+			if (!test_bit(ATH11K_FLAG_MONITOR_VDEV_CREATED,</div><div class='add'>+				      &amp;ar-&gt;monitor_flags))</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='add'>+			ret = ath11k_mac_monitor_stop(ar);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath11k_warn(ar-&gt;ab, "failed to stop monitor: %d",</div><div class='add'>+					    ret);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ret = ath11k_mac_monitor_vdev_delete(ar);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath11k_warn(ar-&gt;ab, "failed to delete monitor vdev: %d",</div><div class='add'>+					    ret);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+err_mon_del:</div><div class='add'>+	ath11k_mac_monitor_vdev_delete(ar);</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_mac_setup_nontx_vif_rsnie(struct ath11k_vif *arvif,</div><div class='add'>+					     bool tx_arvif_rsnie_present,</div><div class='add'>+					     const u8 *profile, u8 profile_len)</div><div class='add'>+{</div><div class='add'>+	if (cfg80211_find_ie(WLAN_EID_RSN, profile, profile_len)) {</div><div class='add'>+		arvif-&gt;rsnie_present = true;</div><div class='add'>+	} else if (tx_arvif_rsnie_present) {</div><div class='add'>+		int i;</div><div class='add'>+		u8 nie_len;</div><div class='add'>+		const u8 *nie = cfg80211_find_ext_ie(WLAN_EID_EXT_NON_INHERITANCE,</div><div class='add'>+						     profile, profile_len);</div><div class='add'>+		if (!nie)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		nie_len = nie[1];</div><div class='add'>+		nie += 2;</div><div class='add'>+		for (i = 0; i &lt; nie_len; i++) {</div><div class='add'>+			if (nie[i] == WLAN_EID_RSN) {</div><div class='add'>+				arvif-&gt;rsnie_present = false;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath11k_mac_set_nontx_vif_params(struct ath11k_vif *tx_arvif,</div><div class='add'>+					    struct ath11k_vif *arvif,</div><div class='add'>+					    struct sk_buff *bcn)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_mgmt *mgmt;</div><div class='add'>+	const u8 *ies, *profile, *next_profile;</div><div class='add'>+	int ies_len;</div><div class='ctx'> </div><div class='ctx'> 	ies = bcn-&gt;data + ieee80211_get_hdrlen_from_skb(bcn);</div><div class='add'>+	mgmt = (struct ieee80211_mgmt *)bcn-&gt;data;</div><div class='add'>+	ies += sizeof(mgmt-&gt;u.beacon);</div><div class='add'>+	ies_len = skb_tail_pointer(bcn) - ies;</div><div class='add'>+</div><div class='add'>+	ies = cfg80211_find_ie(WLAN_EID_MULTIPLE_BSSID, ies, ies_len);</div><div class='add'>+	arvif-&gt;rsnie_present = tx_arvif-&gt;rsnie_present;</div><div class='add'>+</div><div class='add'>+	while (ies) {</div><div class='add'>+		u8 mbssid_len;</div><div class='add'>+</div><div class='add'>+		ies_len -= (2 + ies[1]);</div><div class='add'>+		mbssid_len = ies[1] - 1;</div><div class='add'>+		profile = &amp;ies[3];</div><div class='add'>+</div><div class='add'>+		while (mbssid_len) {</div><div class='add'>+			u8 profile_len;</div><div class='add'>+</div><div class='add'>+			profile_len = profile[1];</div><div class='add'>+			next_profile = profile + (2 + profile_len);</div><div class='add'>+			mbssid_len -= (2 + profile_len);</div><div class='add'>+</div><div class='add'>+			profile += 2;</div><div class='add'>+			profile_len -= (2 + profile[1]);</div><div class='add'>+			profile += (2 + profile[1]); /* nontx capabilities */</div><div class='add'>+			profile_len -= (2 + profile[1]);</div><div class='add'>+			profile += (2 + profile[1]); /* SSID */</div><div class='add'>+			if (profile[2] == arvif-&gt;vif-&gt;bss_conf.bssid_index) {</div><div class='add'>+				profile_len -= 5;</div><div class='add'>+				profile = profile + 5;</div><div class='add'>+				ath11k_mac_setup_nontx_vif_rsnie(arvif,</div><div class='add'>+								 tx_arvif-&gt;rsnie_present,</div><div class='add'>+								 profile,</div><div class='add'>+								 profile_len);</div><div class='add'>+				return true;</div><div class='add'>+			}</div><div class='add'>+			profile = next_profile;</div><div class='add'>+		}</div><div class='add'>+		ies = cfg80211_find_ie(WLAN_EID_MULTIPLE_BSSID, profile,</div><div class='add'>+				       ies_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_setup_bcn_p2p_ie(struct ath11k_vif *arvif,</div><div class='add'>+				       struct sk_buff *bcn)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ieee80211_mgmt *mgmt;</div><div class='add'>+	const u8 *p2p_ie;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mgmt = (void *)bcn-&gt;data;</div><div class='add'>+	p2p_ie = cfg80211_find_vendor_ie(WLAN_OUI_WFA, WLAN_OUI_TYPE_WFA_P2P,</div><div class='add'>+					 mgmt-&gt;u.beacon.variable,</div><div class='add'>+					 bcn-&gt;len - (mgmt-&gt;u.beacon.variable -</div><div class='add'>+						     bcn-&gt;data));</div><div class='add'>+	if (!p2p_ie)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_p2p_go_bcn_ie(ar, arvif-&gt;vdev_id, p2p_ie);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to submit P2P GO bcn ie for vdev %i: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_remove_vendor_ie(struct sk_buff *skb, unsigned int oui,</div><div class='add'>+				       u8 oui_type, size_t ie_offset)</div><div class='add'>+{</div><div class='add'>+	size_t len;</div><div class='add'>+	const u8 *next, *end;</div><div class='add'>+	u8 *ie;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(skb-&gt;len &lt; ie_offset))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ie = (u8 *)cfg80211_find_vendor_ie(oui, oui_type,</div><div class='add'>+					   skb-&gt;data + ie_offset,</div><div class='add'>+					   skb-&gt;len - ie_offset);</div><div class='add'>+	if (!ie)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	len = ie[1] + 2;</div><div class='add'>+	end = skb-&gt;data + skb-&gt;len;</div><div class='add'>+	next = ie + len;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(next &gt; end))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memmove(ie, next, end - next);</div><div class='add'>+	skb_trim(skb, skb-&gt;len - len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_set_vif_params(struct ath11k_vif *arvif,</div><div class='add'>+				     struct sk_buff *bcn)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = arvif-&gt;ar-&gt;ab;</div><div class='add'>+	struct ieee80211_mgmt *mgmt;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u8 *ies;</div><div class='add'>+</div><div class='add'>+	ies = bcn-&gt;data + ieee80211_get_hdrlen_from_skb(bcn);</div><div class='add'>+	mgmt = (struct ieee80211_mgmt *)bcn-&gt;data;</div><div class='ctx'> 	ies += sizeof(mgmt-&gt;u.beacon);</div><div class='ctx'> </div><div class='ctx'> 	if (cfg80211_find_ie(WLAN_EID_RSN, ies, (skb_tail_pointer(bcn) - ies)))</div><div class='ctx'> 		arvif-&gt;rsnie_present = true;</div><div class='add'>+	else</div><div class='add'>+		arvif-&gt;rsnie_present = false;</div><div class='ctx'> </div><div class='ctx'> 	if (cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT,</div><div class='ctx'> 				    WLAN_OUI_TYPE_MICROSOFT_WPA,</div><div class='ctx'> 				    ies, (skb_tail_pointer(bcn) - ies)))</div><div class='ctx'> 		arvif-&gt;wpaie_present = true;</div><div class='add'>+	else</div><div class='add'>+		arvif-&gt;wpaie_present = false;</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;vdev_subtype != WMI_VDEV_SUBTYPE_P2P_GO)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_mac_setup_bcn_p2p_ie(arvif, bcn);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to setup P2P GO bcn ie: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* P2P IE is inserted by firmware automatically (as</div><div class='add'>+	 * configured above) so remove it from the base beacon</div><div class='add'>+	 * template to avoid duplicate P2P IEs in beacon frames.</div><div class='add'>+	 */</div><div class='add'>+	ret = ath11k_mac_remove_vendor_ie(bcn, WLAN_OUI_WFA,</div><div class='add'>+					  WLAN_OUI_TYPE_WFA_P2P,</div><div class='add'>+					  offsetof(struct ieee80211_mgmt,</div><div class='add'>+						   u.beacon.variable));</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to remove P2P vendor ie: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_wmi_bcn_tmpl(ar, arvif-&gt;vdev_id, &amp;offs, bcn);</div><div class='add'>+static struct ath11k_vif *ath11k_mac_get_tx_arvif(struct ath11k_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_bss_conf *link_conf, *tx_bss_conf;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(arvif-&gt;ar-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	link_conf = &amp;arvif-&gt;vif-&gt;bss_conf;</div><div class='add'>+	tx_bss_conf = wiphy_dereference(arvif-&gt;ar-&gt;hw-&gt;wiphy, link_conf-&gt;tx_bss_conf);</div><div class='add'>+	if (tx_bss_conf)</div><div class='add'>+		return ath11k_vif_to_arvif(tx_bss_conf-&gt;vif);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_setup_bcn_tmpl_ema(struct ath11k_vif *arvif,</div><div class='add'>+					 struct ath11k_vif *tx_arvif)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_ema_beacons *beacons;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	bool nontx_vif_params_set = false;</div><div class='add'>+	u32 params = 0;</div><div class='add'>+	u8 i = 0;</div><div class='add'>+</div><div class='add'>+	beacons = ieee80211_beacon_get_template_ema_list(tx_arvif-&gt;ar-&gt;hw,</div><div class='add'>+							 tx_arvif-&gt;vif, 0);</div><div class='add'>+	if (!beacons || !beacons-&gt;cnt) {</div><div class='add'>+		ath11k_warn(arvif-&gt;ar-&gt;ab,</div><div class='add'>+			    "failed to get ema beacon templates from mac80211\n");</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tx_arvif == arvif) {</div><div class='add'>+		if (ath11k_mac_set_vif_params(tx_arvif, beacons-&gt;bcn[0].skb))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		arvif-&gt;wpaie_present = tx_arvif-&gt;wpaie_present;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; beacons-&gt;cnt; i++) {</div><div class='add'>+		if (tx_arvif != arvif &amp;&amp; !nontx_vif_params_set)</div><div class='add'>+			nontx_vif_params_set =</div><div class='add'>+				ath11k_mac_set_nontx_vif_params(tx_arvif, arvif,</div><div class='add'>+								beacons-&gt;bcn[i].skb);</div><div class='add'>+</div><div class='add'>+		params = beacons-&gt;cnt;</div><div class='add'>+		params |= (i &lt;&lt; WMI_EMA_TMPL_IDX_SHIFT);</div><div class='add'>+		params |= ((!i ? 1 : 0) &lt;&lt; WMI_EMA_FIRST_TMPL_SHIFT);</div><div class='add'>+		params |= ((i + 1 == beacons-&gt;cnt ? 1 : 0) &lt;&lt; WMI_EMA_LAST_TMPL_SHIFT);</div><div class='add'>+</div><div class='add'>+		ret = ath11k_wmi_bcn_tmpl(tx_arvif-&gt;ar, tx_arvif-&gt;vdev_id,</div><div class='add'>+					  &amp;beacons-&gt;bcn[i].offs,</div><div class='add'>+					  beacons-&gt;bcn[i].skb, params);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(tx_arvif-&gt;ar-&gt;ab,</div><div class='add'>+				    "failed to set ema beacon template id %i error %d\n",</div><div class='add'>+				    i, ret);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ieee80211_beacon_free_ema_list(beacons);</div><div class='add'>+</div><div class='add'>+	if (tx_arvif != arvif &amp;&amp; !nontx_vif_params_set)</div><div class='add'>+		return -EINVAL; /* Profile not found in the beacons */</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_setup_bcn_tmpl_mbssid(struct ath11k_vif *arvif,</div><div class='add'>+					    struct ath11k_vif *tx_arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ath11k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ieee80211_hw *hw = ar-&gt;hw;</div><div class='add'>+	struct ieee80211_vif *vif = arvif-&gt;vif;</div><div class='add'>+	struct ieee80211_mutable_offsets offs = {};</div><div class='add'>+	struct sk_buff *bcn;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (tx_arvif != arvif) {</div><div class='add'>+		ar = tx_arvif-&gt;ar;</div><div class='add'>+		ab = ar-&gt;ab;</div><div class='add'>+		hw = ar-&gt;hw;</div><div class='add'>+		vif = tx_arvif-&gt;vif;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bcn = ieee80211_beacon_get_template(hw, vif, &amp;offs, 0);</div><div class='add'>+	if (!bcn) {</div><div class='add'>+		ath11k_warn(ab, "failed to get beacon template from mac80211\n");</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tx_arvif == arvif) {</div><div class='add'>+		if (ath11k_mac_set_vif_params(tx_arvif, bcn))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else if (!ath11k_mac_set_nontx_vif_params(tx_arvif, arvif, bcn)) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_bcn_tmpl(ar, arvif-&gt;vdev_id, &amp;offs, bcn, 0);</div><div class='ctx'> 	kfree_skb(bcn);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -784,10 +1638,57 @@ static int ath11k_mac_setup_bcn_tmpl(struct ath11k_vif *arvif)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ath11k_mac_setup_bcn_tmpl(struct ath11k_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = arvif-&gt;vif;</div><div class='add'>+	struct ath11k_vif *tx_arvif;</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;vdev_type != WMI_VDEV_TYPE_AP)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Target does not expect beacon templates for the already up</div><div class='add'>+	 * non-transmitting interfaces, and results in a crash if sent.</div><div class='add'>+	 */</div><div class='add'>+	tx_arvif = ath11k_mac_get_tx_arvif(arvif);</div><div class='add'>+	if (tx_arvif) {</div><div class='add'>+		if (arvif != tx_arvif &amp;&amp; arvif-&gt;is_up)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;bss_conf.ema_ap)</div><div class='add'>+			return ath11k_mac_setup_bcn_tmpl_ema(arvif, tx_arvif);</div><div class='add'>+	} else {</div><div class='add'>+		tx_arvif = arvif;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ath11k_mac_setup_bcn_tmpl_mbssid(arvif, tx_arvif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_mac_bcn_tx_event(struct ath11k_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = arvif-&gt;vif;</div><div class='add'>+</div><div class='add'>+	if (!vif-&gt;bss_conf.color_change_active &amp;&amp; !arvif-&gt;bcca_zero_sent)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;bss_conf.color_change_active &amp;&amp;</div><div class='add'>+	    ieee80211_beacon_cntdwn_is_complete(vif, 0)) {</div><div class='add'>+		arvif-&gt;bcca_zero_sent = true;</div><div class='add'>+		ieee80211_color_change_finish(vif, 0);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arvif-&gt;bcca_zero_sent = false;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;bss_conf.color_change_active)</div><div class='add'>+		ieee80211_beacon_update_cntdwn(vif, 0);</div><div class='add'>+	ath11k_mac_setup_bcn_tmpl(arvif);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath11k_control_beaconing(struct ath11k_vif *arvif,</div><div class='ctx'> 				     struct ieee80211_bss_conf *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ath11k_vif *tx_arvif;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;arvif-&gt;ar-&gt;conf_mutex);</div><div class='hunk'>@@ -810,14 +1711,16 @@ static void ath11k_control_beaconing(struct ath11k_vif *arvif,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	arvif-&gt;tx_seq_no = 0x1000;</div><div class='del'>-</div><div class='ctx'> 	arvif-&gt;aid = 0;</div><div class='ctx'> </div><div class='ctx'> 	ether_addr_copy(arvif-&gt;bssid, info-&gt;bssid);</div><div class='ctx'> </div><div class='add'>+	tx_arvif = ath11k_mac_get_tx_arvif(arvif);</div><div class='ctx'> 	ret = ath11k_wmi_vdev_up(arvif-&gt;ar, arvif-&gt;vdev_id, arvif-&gt;aid,</div><div class='del'>-				 arvif-&gt;bssid);</div><div class='add'>+				 arvif-&gt;bssid,</div><div class='add'>+				 tx_arvif ? tx_arvif-&gt;bssid : NULL,</div><div class='add'>+				 info-&gt;bssid_index,</div><div class='add'>+				 1 &lt;&lt; info-&gt;bssid_indicator);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab, "failed to bring up vdev %d: %i\n",</div><div class='ctx'> 			    arvif-&gt;vdev_id, ret);</div><div class='hunk'>@@ -826,7 +1729,7 @@ static void ath11k_control_beaconing(struct ath11k_vif *arvif,</div><div class='ctx'> </div><div class='ctx'> 	arvif-&gt;is_up = true;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "mac vdev %d up\n", arvif-&gt;vdev_id);</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "vdev %d up\n", arvif-&gt;vdev_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_mac_handle_beacon_iter(void *data, u8 *mac,</div><div class='hunk'>@@ -834,7 +1737,7 @@ static void ath11k_mac_handle_beacon_iter(void *data, u8 *mac,</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb = data;</div><div class='ctx'> 	struct ieee80211_mgmt *mgmt = (void *)skb-&gt;data;</div><div class='del'>-	struct ath11k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -857,7 +1760,7 @@ static void ath11k_mac_handle_beacon_miss_iter(void *data, u8 *mac,</div><div class='ctx'> 					       struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	u32 *vdev_id = data;</div><div class='del'>-	struct ath11k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> 	struct ath11k *ar = arvif-&gt;ar;</div><div class='ctx'> 	struct ieee80211_hw *hw = ar-&gt;hw;</div><div class='ctx'> </div><div class='hunk'>@@ -903,13 +1806,13 @@ static void ath11k_peer_assoc_h_basic(struct ath11k *ar,</div><div class='ctx'> 				      struct ieee80211_sta *sta,</div><div class='ctx'> 				      struct peer_assoc_params *arg)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> 	u32 aid;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='del'>-		aid = vif-&gt;bss_conf.aid;</div><div class='add'>+		aid = vif-&gt;cfg.aid;</div><div class='ctx'> 	else</div><div class='ctx'> 		aid = sta-&gt;aid;</div><div class='ctx'> </div><div class='hunk'>@@ -931,7 +1834,7 @@ static void ath11k_peer_assoc_h_crypto(struct ath11k *ar,</div><div class='ctx'> 	struct ieee80211_bss_conf *info = &amp;vif-&gt;bss_conf;</div><div class='ctx'> 	struct cfg80211_chan_def def;</div><div class='ctx'> 	struct cfg80211_bss *bss;</div><div class='del'>-	struct ath11k_vif *arvif = (struct ath11k_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> 	const u8 *rsnie = NULL;</div><div class='ctx'> 	const u8 *wpaie = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -989,7 +1892,7 @@ static void ath11k_peer_assoc_h_rates(struct ath11k *ar,</div><div class='ctx'> 				      struct ieee80211_sta *sta,</div><div class='ctx'> 				      struct peer_assoc_params *arg)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> 	struct wmi_rate_set_arg *rateset = &amp;arg-&gt;peer_legacy_rates;</div><div class='ctx'> 	struct cfg80211_chan_def def;</div><div class='ctx'> 	const struct ieee80211_supported_band *sband;</div><div class='hunk'>@@ -1006,7 +1909,7 @@ static void ath11k_peer_assoc_h_rates(struct ath11k *ar,</div><div class='ctx'> </div><div class='ctx'> 	band = def.chan-&gt;band;</div><div class='ctx'> 	sband = ar-&gt;hw-&gt;wiphy-&gt;bands[band];</div><div class='del'>-	ratemask = sta-&gt;supp_rates[band];</div><div class='add'>+	ratemask = sta-&gt;deflink.supp_rates[band];</div><div class='ctx'> 	ratemask &amp;= arvif-&gt;bitrate_mask.control[band].legacy;</div><div class='ctx'> 	rates = sband-&gt;bitrates;</div><div class='ctx'> </div><div class='hunk'>@@ -1023,7 +1926,7 @@ static void ath11k_peer_assoc_h_rates(struct ath11k *ar,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='del'>-ath11k_peer_assoc_h_ht_masked(const u8 ht_mcs_mask[IEEE80211_HT_MCS_MASK_LEN])</div><div class='add'>+ath11k_peer_assoc_h_ht_masked(const u8 *ht_mcs_mask)</div><div class='ctx'> {</div><div class='ctx'> 	int nss;</div><div class='ctx'> </div><div class='hunk'>@@ -1035,7 +1938,7 @@ ath11k_peer_assoc_h_ht_masked(const u8 ht_mcs_mask[IEEE80211_HT_MCS_MASK_LEN])</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='del'>-ath11k_peer_assoc_h_vht_masked(const u16 vht_mcs_mask[NL80211_VHT_NSS_MAX])</div><div class='add'>+ath11k_peer_assoc_h_vht_masked(const u16 *vht_mcs_mask)</div><div class='ctx'> {</div><div class='ctx'> 	int nss;</div><div class='ctx'> </div><div class='hunk'>@@ -1051,8 +1954,8 @@ static void ath11k_peer_assoc_h_ht(struct ath11k *ar,</div><div class='ctx'> 				   struct ieee80211_sta *sta,</div><div class='ctx'> 				   struct peer_assoc_params *arg)</div><div class='ctx'> {</div><div class='del'>-	const struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='del'>-	struct ath11k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='add'>+	const struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;deflink.ht_cap;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> 	struct cfg80211_chan_def def;</div><div class='ctx'> 	enum nl80211_band band;</div><div class='ctx'> 	const u8 *ht_mcs_mask;</div><div class='hunk'>@@ -1088,11 +1991,19 @@ static void ath11k_peer_assoc_h_ht(struct ath11k *ar,</div><div class='ctx'> 	if (ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_LDPC_CODING)</div><div class='ctx'> 		arg-&gt;ldpc_flag = true;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;bandwidth &gt;= IEEE80211_STA_RX_BW_40) {</div><div class='add'>+	if (sta-&gt;deflink.bandwidth &gt;= IEEE80211_STA_RX_BW_40) {</div><div class='ctx'> 		arg-&gt;bw_40 = true;</div><div class='ctx'> 		arg-&gt;peer_rate_caps |= WMI_HOST_RC_CW40_FLAG;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* As firmware handles this two flags (IEEE80211_HT_CAP_SGI_20</div><div class='add'>+	 * and IEEE80211_HT_CAP_SGI_40) for enabling SGI, we reset</div><div class='add'>+	 * both flags if guard interval is Default GI</div><div class='add'>+	 */</div><div class='add'>+	if (arvif-&gt;bitrate_mask.control[band].gi == NL80211_TXRATE_DEFAULT_GI)</div><div class='add'>+		arg-&gt;peer_ht_caps &amp;= ~(IEEE80211_HT_CAP_SGI_20 |</div><div class='add'>+				IEEE80211_HT_CAP_SGI_40);</div><div class='add'>+</div><div class='ctx'> 	if (arvif-&gt;bitrate_mask.control[band].gi != NL80211_TXRATE_FORCE_LGI) {</div><div class='ctx'> 		if (ht_cap-&gt;cap &amp; (IEEE80211_HT_CAP_SGI_20 |</div><div class='ctx'> 		    IEEE80211_HT_CAP_SGI_40))</div><div class='hunk'>@@ -1138,10 +2049,10 @@ static void ath11k_peer_assoc_h_ht(struct ath11k *ar,</div><div class='ctx'> 			arg-&gt;peer_ht_rates.rates[i] = i;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		arg-&gt;peer_ht_rates.num_rates = n;</div><div class='del'>-		arg-&gt;peer_nss = min(sta-&gt;rx_nss, max_nss);</div><div class='add'>+		arg-&gt;peer_nss = min(sta-&gt;deflink.rx_nss, max_nss);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "mac ht peer %pM mcs cnt %d nss %d\n",</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "ht peer %pM mcs cnt %d nss %d\n",</div><div class='ctx'> 		   arg-&gt;peer_mac,</div><div class='ctx'> 		   arg-&gt;peer_ht_rates.num_rates,</div><div class='ctx'> 		   arg-&gt;peer_nss);</div><div class='hunk'>@@ -1207,19 +2118,49 @@ ath11k_peer_assoc_h_vht_limit(u16 tx_mcs_set,</div><div class='ctx'> 	return tx_mcs_set;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u8 ath11k_get_nss_160mhz(struct ath11k *ar,</div><div class='add'>+				u8 max_nss)</div><div class='add'>+{</div><div class='add'>+	u8 nss_ratio_info = ar-&gt;pdev-&gt;cap.nss_ratio_info;</div><div class='add'>+	u8 max_sup_nss = 0;</div><div class='add'>+</div><div class='add'>+	switch (nss_ratio_info) {</div><div class='add'>+	case WMI_NSS_RATIO_1BY2_NSS:</div><div class='add'>+		max_sup_nss = max_nss &gt;&gt; 1;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_NSS_RATIO_3BY4_NSS:</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "WMI_NSS_RATIO_3BY4_NSS not supported\n");</div><div class='add'>+		break;</div><div class='add'>+	case WMI_NSS_RATIO_1_NSS:</div><div class='add'>+		max_sup_nss = max_nss;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_NSS_RATIO_2_NSS:</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "WMI_NSS_RATIO_2_NSS not supported\n");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "invalid nss ratio received from firmware: %d\n",</div><div class='add'>+			    nss_ratio_info);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return max_sup_nss;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath11k_peer_assoc_h_vht(struct ath11k *ar,</div><div class='ctx'> 				    struct ieee80211_vif *vif,</div><div class='ctx'> 				    struct ieee80211_sta *sta,</div><div class='ctx'> 				    struct peer_assoc_params *arg)</div><div class='ctx'> {</div><div class='del'>-	const struct ieee80211_sta_vht_cap *vht_cap = &amp;sta-&gt;vht_cap;</div><div class='del'>-	struct ath11k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='add'>+	const struct ieee80211_sta_vht_cap *vht_cap = &amp;sta-&gt;deflink.vht_cap;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> 	struct cfg80211_chan_def def;</div><div class='ctx'> 	enum nl80211_band band;</div><div class='del'>-	const u16 *vht_mcs_mask;</div><div class='add'>+	u16 *vht_mcs_mask;</div><div class='ctx'> 	u8 ampdu_factor;</div><div class='ctx'> 	u8 max_nss, vht_mcs;</div><div class='del'>-	int i;</div><div class='add'>+	int i, vht_nss, nss_idx;</div><div class='add'>+	bool user_rate_valid = true;</div><div class='add'>+	u32 rx_nss, tx_nss, nss_160;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(ath11k_mac_vif_chan(vif, &amp;def)))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1256,16 +2197,34 @@ static void ath11k_peer_assoc_h_vht(struct ath11k *ar,</div><div class='ctx'> 				 (1U &lt;&lt; (IEEE80211_HT_MAX_AMPDU_FACTOR +</div><div class='ctx'> 					ampdu_factor)) - 1);</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_80)</div><div class='add'>+	if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_80)</div><div class='ctx'> 		arg-&gt;bw_80 = true;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_160)</div><div class='add'>+	if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_160)</div><div class='ctx'> 		arg-&gt;bw_160 = true;</div><div class='ctx'> </div><div class='add'>+	vht_nss =  ath11k_mac_max_vht_nss(vht_mcs_mask);</div><div class='add'>+</div><div class='add'>+	if (vht_nss &gt; sta-&gt;deflink.rx_nss) {</div><div class='add'>+		user_rate_valid = false;</div><div class='add'>+		for (nss_idx = sta-&gt;deflink.rx_nss - 1; nss_idx &gt;= 0; nss_idx--) {</div><div class='add'>+			if (vht_mcs_mask[nss_idx]) {</div><div class='add'>+				user_rate_valid = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!user_rate_valid) {</div><div class='add'>+		ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "setting vht range mcs value to peer supported nss %d for peer %pM\n",</div><div class='add'>+			   sta-&gt;deflink.rx_nss, sta-&gt;addr);</div><div class='add'>+		vht_mcs_mask[sta-&gt;deflink.rx_nss - 1] = vht_mcs_mask[vht_nss - 1];</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Calculate peer NSS capability from VHT capabilities if STA</div><div class='ctx'> 	 * supports VHT.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0, max_nss = 0, vht_mcs = 0; i &lt; NL80211_VHT_NSS_MAX; i++) {</div><div class='add'>+	for (i = 0, max_nss = 0; i &lt; NL80211_VHT_NSS_MAX; i++) {</div><div class='ctx'> 		vht_mcs = __le16_to_cpu(vht_cap-&gt;vht_mcs.rx_mcs_map) &gt;&gt;</div><div class='ctx'> 			  (2 * i) &amp; 3;</div><div class='ctx'> </div><div class='hunk'>@@ -1273,15 +2232,15 @@ static void ath11k_peer_assoc_h_vht(struct ath11k *ar,</div><div class='ctx'> 		    vht_mcs_mask[i])</div><div class='ctx'> 			max_nss = i + 1;</div><div class='ctx'> 	}</div><div class='del'>-	arg-&gt;peer_nss = min(sta-&gt;rx_nss, max_nss);</div><div class='add'>+	arg-&gt;peer_nss = min(sta-&gt;deflink.rx_nss, max_nss);</div><div class='ctx'> 	arg-&gt;rx_max_rate = __le16_to_cpu(vht_cap-&gt;vht_mcs.rx_highest);</div><div class='ctx'> 	arg-&gt;rx_mcs_set = __le16_to_cpu(vht_cap-&gt;vht_mcs.rx_mcs_map);</div><div class='add'>+	arg-&gt;rx_mcs_set = ath11k_peer_assoc_h_vht_limit(arg-&gt;rx_mcs_set, vht_mcs_mask);</div><div class='ctx'> 	arg-&gt;tx_max_rate = __le16_to_cpu(vht_cap-&gt;vht_mcs.tx_highest);</div><div class='del'>-	arg-&gt;tx_mcs_set = ath11k_peer_assoc_h_vht_limit(</div><div class='del'>-		__le16_to_cpu(vht_cap-&gt;vht_mcs.tx_mcs_map), vht_mcs_mask);</div><div class='add'>+	arg-&gt;tx_mcs_set = __le16_to_cpu(vht_cap-&gt;vht_mcs.tx_mcs_map);</div><div class='ctx'> </div><div class='ctx'> 	/* In IPQ8074 platform, VHT mcs rate 10 and 11 is enabled by default.</div><div class='del'>-	 * VHT mcs rate 10 and 11 is not suppoerted in 11ac standard.</div><div class='add'>+	 * VHT mcs rate 10 and 11 is not supported in 11ac standard.</div><div class='ctx'> 	 * so explicitly disable the VHT MCS rate 10 and 11 in 11ac mode.</div><div class='ctx'> 	 */</div><div class='ctx'> 	arg-&gt;tx_mcs_set &amp;= ~IEEE80211_VHT_MCS_SUPPORT_0_11_MASK;</div><div class='hunk'>@@ -1294,10 +2253,95 @@ static void ath11k_peer_assoc_h_vht(struct ath11k *ar,</div><div class='ctx'> 	/* TODO:  Check */</div><div class='ctx'> 	arg-&gt;tx_max_mcs_nss = 0xFF;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "mac vht peer %pM max_mpdu %d flags 0x%x\n",</div><div class='del'>-		   sta-&gt;addr, arg-&gt;peer_max_mpdu, arg-&gt;peer_flags);</div><div class='add'>+	if (arg-&gt;peer_phymode == MODE_11AC_VHT160 ||</div><div class='add'>+	    arg-&gt;peer_phymode == MODE_11AC_VHT80_80) {</div><div class='add'>+		tx_nss = ath11k_get_nss_160mhz(ar, max_nss);</div><div class='add'>+		rx_nss = min(arg-&gt;peer_nss, tx_nss);</div><div class='add'>+		arg-&gt;peer_bw_rxnss_override = ATH11K_BW_NSS_MAP_ENABLE;</div><div class='add'>+</div><div class='add'>+		if (!rx_nss) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "invalid max_nss\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (arg-&gt;peer_phymode == MODE_11AC_VHT160)</div><div class='add'>+			nss_160 = FIELD_PREP(ATH11K_PEER_RX_NSS_160MHZ, rx_nss - 1);</div><div class='add'>+		else</div><div class='add'>+			nss_160 = FIELD_PREP(ATH11K_PEER_RX_NSS_80_80MHZ, rx_nss - 1);</div><div class='ctx'> </div><div class='del'>-	/* TODO: rxnss_override */</div><div class='add'>+		arg-&gt;peer_bw_rxnss_override |= nss_160;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='add'>+		   "vht peer %pM max_mpdu %d flags 0x%x nss_override 0x%x\n",</div><div class='add'>+		   sta-&gt;addr, arg-&gt;peer_max_mpdu, arg-&gt;peer_flags,</div><div class='add'>+		   arg-&gt;peer_bw_rxnss_override);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_get_max_he_mcs_map(u16 mcs_map, int nss)</div><div class='add'>+{</div><div class='add'>+	switch ((mcs_map &gt;&gt; (2 * nss)) &amp; 0x3) {</div><div class='add'>+	case IEEE80211_HE_MCS_SUPPORT_0_7: return BIT(8) - 1;</div><div class='add'>+	case IEEE80211_HE_MCS_SUPPORT_0_9: return BIT(10) - 1;</div><div class='add'>+	case IEEE80211_HE_MCS_SUPPORT_0_11: return BIT(12) - 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath11k_peer_assoc_h_he_limit(u16 tx_mcs_set,</div><div class='add'>+					const u16 he_mcs_limit[NL80211_HE_NSS_MAX])</div><div class='add'>+{</div><div class='add'>+	int idx_limit;</div><div class='add'>+	int nss;</div><div class='add'>+	u16 mcs_map;</div><div class='add'>+	u16 mcs;</div><div class='add'>+</div><div class='add'>+	for (nss = 0; nss &lt; NL80211_HE_NSS_MAX; nss++) {</div><div class='add'>+		mcs_map = ath11k_mac_get_max_he_mcs_map(tx_mcs_set, nss) &amp;</div><div class='add'>+			he_mcs_limit[nss];</div><div class='add'>+</div><div class='add'>+		if (mcs_map)</div><div class='add'>+			idx_limit = fls(mcs_map) - 1;</div><div class='add'>+		else</div><div class='add'>+			idx_limit = -1;</div><div class='add'>+</div><div class='add'>+		switch (idx_limit) {</div><div class='add'>+		case 0 ... 7:</div><div class='add'>+			mcs = IEEE80211_HE_MCS_SUPPORT_0_7;</div><div class='add'>+			break;</div><div class='add'>+		case 8:</div><div class='add'>+		case 9:</div><div class='add'>+			mcs = IEEE80211_HE_MCS_SUPPORT_0_9;</div><div class='add'>+			break;</div><div class='add'>+		case 10:</div><div class='add'>+		case 11:</div><div class='add'>+			mcs = IEEE80211_HE_MCS_SUPPORT_0_11;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			WARN_ON(1);</div><div class='add'>+			fallthrough;</div><div class='add'>+		case -1:</div><div class='add'>+			mcs = IEEE80211_HE_MCS_NOT_SUPPORTED;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tx_mcs_set &amp;= ~(0x3 &lt;&lt; (nss * 2));</div><div class='add'>+		tx_mcs_set |= mcs &lt;&lt; (nss * 2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return tx_mcs_set;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+ath11k_peer_assoc_h_he_masked(const u16 *he_mcs_mask)</div><div class='add'>+{</div><div class='add'>+	int nss;</div><div class='add'>+</div><div class='add'>+	for (nss = 0; nss &lt; NL80211_HE_NSS_MAX; nss++)</div><div class='add'>+		if (he_mcs_mask[nss])</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_peer_assoc_h_he(struct ath11k *ar,</div><div class='hunk'>@@ -1305,19 +2349,82 @@ static void ath11k_peer_assoc_h_he(struct ath11k *ar,</div><div class='ctx'> 				   struct ieee80211_sta *sta,</div><div class='ctx'> 				   struct peer_assoc_params *arg)</div><div class='ctx'> {</div><div class='del'>-	const struct ieee80211_sta_he_cap *he_cap = &amp;sta-&gt;he_cap;</div><div class='del'>-	u8 ampdu_factor;</div><div class='del'>-	u16 v;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='add'>+	struct cfg80211_chan_def def;</div><div class='add'>+	const struct ieee80211_sta_he_cap *he_cap = &amp;sta-&gt;deflink.he_cap;</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	u16 he_mcs_mask[NL80211_HE_NSS_MAX];</div><div class='add'>+	u8 max_nss, he_mcs;</div><div class='add'>+	u16 he_tx_mcs = 0, v = 0;</div><div class='add'>+	int i, he_nss, nss_idx;</div><div class='add'>+	bool user_rate_valid = true;</div><div class='add'>+	u32 rx_nss, tx_nss, nss_160;</div><div class='add'>+	u8 ampdu_factor, rx_mcs_80, rx_mcs_160;</div><div class='add'>+	u16 mcs_160_map, mcs_80_map;</div><div class='add'>+	bool support_160;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ath11k_mac_vif_chan(vif, &amp;def)))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!he_cap-&gt;has_he)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	band = def.chan-&gt;band;</div><div class='add'>+	memcpy(he_mcs_mask, arvif-&gt;bitrate_mask.control[band].he_mcs,</div><div class='add'>+	       sizeof(he_mcs_mask));</div><div class='add'>+</div><div class='add'>+	if (ath11k_peer_assoc_h_he_masked(he_mcs_mask))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	arg-&gt;he_flag = true;</div><div class='add'>+	support_160 = !!(he_cap-&gt;he_cap_elem.phy_cap_info[0] &amp;</div><div class='add'>+		  IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G);</div><div class='add'>+</div><div class='add'>+	/* Supported HE-MCS and NSS Set of peer he_cap is intersection with self he_cp */</div><div class='add'>+	mcs_160_map = le16_to_cpu(he_cap-&gt;he_mcs_nss_supp.rx_mcs_160);</div><div class='add'>+	mcs_80_map = le16_to_cpu(he_cap-&gt;he_mcs_nss_supp.rx_mcs_80);</div><div class='add'>+</div><div class='add'>+	/* Initialize rx_mcs_160 to 9 which is an invalid value */</div><div class='add'>+	rx_mcs_160 = 9;</div><div class='add'>+	if (support_160) {</div><div class='add'>+		for (i = 7; i &gt;= 0; i--) {</div><div class='add'>+			u8 mcs_160 = (mcs_160_map &gt;&gt; (2 * i)) &amp; 3;</div><div class='add'>+</div><div class='add'>+			if (mcs_160 != IEEE80211_VHT_MCS_NOT_SUPPORTED) {</div><div class='add'>+				rx_mcs_160 = i + 1;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize rx_mcs_80 to 9 which is an invalid value */</div><div class='add'>+	rx_mcs_80 = 9;</div><div class='add'>+	for (i = 7; i &gt;= 0; i--) {</div><div class='add'>+		u8 mcs_80 = (mcs_80_map &gt;&gt; (2 * i)) &amp; 3;</div><div class='add'>+</div><div class='add'>+		if (mcs_80 != IEEE80211_VHT_MCS_NOT_SUPPORTED) {</div><div class='add'>+			rx_mcs_80 = i + 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;arg-&gt;peer_he_cap_macinfo, he_cap-&gt;he_cap_elem.mac_cap_info,</div><div class='del'>-	       sizeof(arg-&gt;peer_he_cap_macinfo));</div><div class='del'>-	memcpy(&amp;arg-&gt;peer_he_cap_phyinfo, he_cap-&gt;he_cap_elem.phy_cap_info,</div><div class='del'>-	       sizeof(arg-&gt;peer_he_cap_phyinfo));</div><div class='add'>+	if (support_160)</div><div class='add'>+		max_nss = min(rx_mcs_80, rx_mcs_160);</div><div class='add'>+	else</div><div class='add'>+		max_nss = rx_mcs_80;</div><div class='add'>+</div><div class='add'>+	arg-&gt;peer_nss = min(sta-&gt;deflink.rx_nss, max_nss);</div><div class='add'>+</div><div class='add'>+	memcpy_and_pad(&amp;arg-&gt;peer_he_cap_macinfo,</div><div class='add'>+		       sizeof(arg-&gt;peer_he_cap_macinfo),</div><div class='add'>+		       he_cap-&gt;he_cap_elem.mac_cap_info,</div><div class='add'>+		       sizeof(he_cap-&gt;he_cap_elem.mac_cap_info),</div><div class='add'>+		       0);</div><div class='add'>+	memcpy_and_pad(&amp;arg-&gt;peer_he_cap_phyinfo,</div><div class='add'>+		       sizeof(arg-&gt;peer_he_cap_phyinfo),</div><div class='add'>+		       he_cap-&gt;he_cap_elem.phy_cap_info,</div><div class='add'>+		       sizeof(he_cap-&gt;he_cap_elem.phy_cap_info),</div><div class='add'>+		       0);</div><div class='ctx'> 	arg-&gt;peer_he_ops = vif-&gt;bss_conf.he_oper.params;</div><div class='ctx'> </div><div class='ctx'> 	/* the top most byte is used to indicate BSS color info */</div><div class='hunk'>@@ -1338,10 +2445,10 @@ static void ath11k_peer_assoc_h_he(struct ath11k *ar,</div><div class='ctx'> 				   IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK);</div><div class='ctx'> </div><div class='ctx'> 	if (ampdu_factor) {</div><div class='del'>-		if (sta-&gt;vht_cap.vht_supported)</div><div class='add'>+		if (sta-&gt;deflink.vht_cap.vht_supported)</div><div class='ctx'> 			arg-&gt;peer_max_mpdu = (1 &lt;&lt; (IEEE80211_HE_VHT_MAX_AMPDU_FACTOR +</div><div class='ctx'> 						    ampdu_factor)) - 1;</div><div class='del'>-		else if (sta-&gt;ht_cap.ht_supported)</div><div class='add'>+		else if (sta-&gt;deflink.ht_cap.ht_supported)</div><div class='ctx'> 			arg-&gt;peer_max_mpdu = (1 &lt;&lt; (IEEE80211_HE_HT_MAX_AMPDU_FACTOR +</div><div class='ctx'> 						    ampdu_factor)) - 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1382,50 +2489,172 @@ static void ath11k_peer_assoc_h_he(struct ath11k *ar,</div><div class='ctx'> 	if (he_cap-&gt;he_cap_elem.mac_cap_info[0] &amp; IEEE80211_HE_MAC_CAP0_TWT_REQ)</div><div class='ctx'> 		arg-&gt;twt_requester = true;</div><div class='ctx'> </div><div class='del'>-	switch (sta-&gt;bandwidth) {</div><div class='add'>+	he_nss =  ath11k_mac_max_he_nss(he_mcs_mask);</div><div class='add'>+</div><div class='add'>+	if (he_nss &gt; sta-&gt;deflink.rx_nss) {</div><div class='add'>+		user_rate_valid = false;</div><div class='add'>+		for (nss_idx = sta-&gt;deflink.rx_nss - 1; nss_idx &gt;= 0; nss_idx--) {</div><div class='add'>+			if (he_mcs_mask[nss_idx]) {</div><div class='add'>+				user_rate_valid = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!user_rate_valid) {</div><div class='add'>+		ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "setting he range mcs value to peer supported nss %d for peer %pM\n",</div><div class='add'>+			   sta-&gt;deflink.rx_nss, sta-&gt;addr);</div><div class='add'>+		he_mcs_mask[sta-&gt;deflink.rx_nss - 1] = he_mcs_mask[he_nss - 1];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (sta-&gt;deflink.bandwidth) {</div><div class='ctx'> 	case IEEE80211_STA_RX_BW_160:</div><div class='ctx'> 		if (he_cap-&gt;he_cap_elem.phy_cap_info[0] &amp;</div><div class='ctx'> 		    IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G) {</div><div class='ctx'> 			v = le16_to_cpu(he_cap-&gt;he_mcs_nss_supp.rx_mcs_80p80);</div><div class='add'>+			v = ath11k_peer_assoc_h_he_limit(v, he_mcs_mask);</div><div class='ctx'> 			arg-&gt;peer_he_rx_mcs_set[WMI_HECAP_TXRX_MCS_NSS_IDX_80_80] = v;</div><div class='ctx'> </div><div class='ctx'> 			v = le16_to_cpu(he_cap-&gt;he_mcs_nss_supp.tx_mcs_80p80);</div><div class='ctx'> 			arg-&gt;peer_he_tx_mcs_set[WMI_HECAP_TXRX_MCS_NSS_IDX_80_80] = v;</div><div class='ctx'> </div><div class='ctx'> 			arg-&gt;peer_he_mcs_count++;</div><div class='add'>+			he_tx_mcs = v;</div><div class='ctx'> 		}</div><div class='ctx'> 		v = le16_to_cpu(he_cap-&gt;he_mcs_nss_supp.rx_mcs_160);</div><div class='add'>+		v = ath11k_peer_assoc_h_he_limit(v, he_mcs_mask);</div><div class='ctx'> 		arg-&gt;peer_he_rx_mcs_set[WMI_HECAP_TXRX_MCS_NSS_IDX_160] = v;</div><div class='ctx'> </div><div class='ctx'> 		v = le16_to_cpu(he_cap-&gt;he_mcs_nss_supp.tx_mcs_160);</div><div class='ctx'> 		arg-&gt;peer_he_tx_mcs_set[WMI_HECAP_TXRX_MCS_NSS_IDX_160] = v;</div><div class='ctx'> </div><div class='ctx'> 		arg-&gt;peer_he_mcs_count++;</div><div class='add'>+		if (!he_tx_mcs)</div><div class='add'>+			he_tx_mcs = v;</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		v = le16_to_cpu(he_cap-&gt;he_mcs_nss_supp.rx_mcs_80);</div><div class='add'>+		v = ath11k_peer_assoc_h_he_limit(v, he_mcs_mask);</div><div class='ctx'> 		arg-&gt;peer_he_rx_mcs_set[WMI_HECAP_TXRX_MCS_NSS_IDX_80] = v;</div><div class='ctx'> </div><div class='ctx'> 		v = le16_to_cpu(he_cap-&gt;he_mcs_nss_supp.tx_mcs_80);</div><div class='ctx'> 		arg-&gt;peer_he_tx_mcs_set[WMI_HECAP_TXRX_MCS_NSS_IDX_80] = v;</div><div class='ctx'> </div><div class='ctx'> 		arg-&gt;peer_he_mcs_count++;</div><div class='add'>+		if (!he_tx_mcs)</div><div class='add'>+			he_tx_mcs = v;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Calculate peer NSS capability from HE capabilities if STA</div><div class='add'>+	 * supports HE.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0, max_nss = 0; i &lt; NL80211_HE_NSS_MAX; i++) {</div><div class='add'>+		he_mcs = he_tx_mcs &gt;&gt; (2 * i) &amp; 3;</div><div class='add'>+</div><div class='add'>+		/* In case of fixed rates, MCS Range in he_tx_mcs might have</div><div class='add'>+		 * unsupported range, with he_mcs_mask set, so check either of them</div><div class='add'>+		 * to find nss.</div><div class='add'>+		 */</div><div class='add'>+		if (he_mcs != IEEE80211_HE_MCS_NOT_SUPPORTED ||</div><div class='add'>+		    he_mcs_mask[i])</div><div class='add'>+			max_nss = i + 1;</div><div class='add'>+	}</div><div class='add'>+	arg-&gt;peer_nss = min(sta-&gt;deflink.rx_nss, max_nss);</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;peer_phymode == MODE_11AX_HE160 ||</div><div class='add'>+	    arg-&gt;peer_phymode == MODE_11AX_HE80_80) {</div><div class='add'>+		tx_nss = ath11k_get_nss_160mhz(ar, max_nss);</div><div class='add'>+		rx_nss = min(arg-&gt;peer_nss, tx_nss);</div><div class='add'>+		arg-&gt;peer_bw_rxnss_override = ATH11K_BW_NSS_MAP_ENABLE;</div><div class='add'>+</div><div class='add'>+		if (!rx_nss) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "invalid max_nss\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (arg-&gt;peer_phymode == MODE_11AX_HE160)</div><div class='add'>+			nss_160 = FIELD_PREP(ATH11K_PEER_RX_NSS_160MHZ, rx_nss - 1);</div><div class='add'>+		else</div><div class='add'>+			nss_160 = FIELD_PREP(ATH11K_PEER_RX_NSS_80_80MHZ, rx_nss - 1);</div><div class='add'>+</div><div class='add'>+		arg-&gt;peer_bw_rxnss_override |= nss_160;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='add'>+		   "he peer %pM nss %d mcs cnt %d nss_override 0x%x\n",</div><div class='add'>+		   sta-&gt;addr, arg-&gt;peer_nss,</div><div class='add'>+		   arg-&gt;peer_he_mcs_count,</div><div class='add'>+		   arg-&gt;peer_bw_rxnss_override);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_peer_assoc_h_he_6ghz(struct ath11k *ar,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					struct ieee80211_sta *sta,</div><div class='add'>+					struct peer_assoc_params *arg)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_sta_he_cap *he_cap = &amp;sta-&gt;deflink.he_cap;</div><div class='add'>+	struct cfg80211_chan_def def;</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	u8  ampdu_factor;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ath11k_mac_vif_chan(vif, &amp;def)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	band = def.chan-&gt;band;</div><div class='add'>+</div><div class='add'>+	if (!arg-&gt;he_flag || band != NL80211_BAND_6GHZ || !sta-&gt;deflink.he_6ghz_capa.capa)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='add'>+		arg-&gt;bw_40 = true;</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_80)</div><div class='add'>+		arg-&gt;bw_80 = true;</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_160)</div><div class='add'>+		arg-&gt;bw_160 = true;</div><div class='add'>+</div><div class='add'>+	arg-&gt;peer_he_caps_6ghz = le16_to_cpu(sta-&gt;deflink.he_6ghz_capa.capa);</div><div class='add'>+	arg-&gt;peer_mpdu_density =</div><div class='add'>+		ath11k_parse_mpdudensity(FIELD_GET(IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START,</div><div class='add'>+						   arg-&gt;peer_he_caps_6ghz));</div><div class='add'>+</div><div class='add'>+	/* From IEEE Std 802.11ax-2021 - Section 10.12.2: An HE STA shall be capable of</div><div class='add'>+	 * receiving A-MPDU where the A-MPDU pre-EOF padding length is up to the value</div><div class='add'>+	 * indicated by the Maximum A-MPDU Length Exponent Extension field in the HE</div><div class='add'>+	 * Capabilities element and the Maximum A-MPDU Length Exponent field in HE 6 GHz</div><div class='add'>+	 * Band Capabilities element in the 6 GHz band.</div><div class='add'>+	 *</div><div class='add'>+	 * Here, we are extracting the Max A-MPDU Exponent Extension from HE caps and</div><div class='add'>+	 * factor is the Maximum A-MPDU Length Exponent from HE 6 GHZ Band capability.</div><div class='add'>+	 */</div><div class='add'>+	ampdu_factor = FIELD_GET(IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK,</div><div class='add'>+				 he_cap-&gt;he_cap_elem.mac_cap_info[3]) +</div><div class='add'>+			FIELD_GET(IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP,</div><div class='add'>+				  arg-&gt;peer_he_caps_6ghz);</div><div class='add'>+</div><div class='add'>+	arg-&gt;peer_max_mpdu = (1u &lt;&lt; (IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR +</div><div class='add'>+				     ampdu_factor)) - 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_peer_assoc_h_smps(struct ieee80211_sta *sta,</div><div class='ctx'> 				     struct peer_assoc_params *arg)</div><div class='ctx'> {</div><div class='del'>-	const struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='add'>+	const struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;deflink.ht_cap;</div><div class='ctx'> 	int smps;</div><div class='ctx'> </div><div class='del'>-	if (!ht_cap-&gt;ht_supported)</div><div class='add'>+	if (!ht_cap-&gt;ht_supported &amp;&amp; !sta-&gt;deflink.he_6ghz_capa.capa)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	smps = ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_SM_PS;</div><div class='del'>-	smps &gt;&gt;= IEEE80211_HT_CAP_SM_PS_SHIFT;</div><div class='add'>+	if (ht_cap-&gt;ht_supported) {</div><div class='add'>+		smps = ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_SM_PS;</div><div class='add'>+		smps &gt;&gt;= IEEE80211_HT_CAP_SM_PS_SHIFT;</div><div class='add'>+	} else {</div><div class='add'>+		smps = le16_get_bits(sta-&gt;deflink.he_6ghz_capa.capa,</div><div class='add'>+				     IEEE80211_HE_6GHZ_CAP_SM_PS);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	switch (smps) {</div><div class='ctx'> 	case WLAN_HT_CAP_SM_PS_STATIC:</div><div class='hunk'>@@ -1447,7 +2676,7 @@ static void ath11k_peer_assoc_h_qos(struct ath11k *ar,</div><div class='ctx'> 				    struct ieee80211_sta *sta,</div><div class='ctx'> 				    struct peer_assoc_params *arg)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> </div><div class='ctx'> 	switch (arvif-&gt;vdev_type) {</div><div class='ctx'> 	case WMI_VDEV_TYPE_AP:</div><div class='hunk'>@@ -1474,7 +2703,7 @@ static void ath11k_peer_assoc_h_qos(struct ath11k *ar,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "mac peer %pM qos %d\n",</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "peer %pM qos %d\n",</div><div class='ctx'> 		   sta-&gt;addr, arg-&gt;qos_flag);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1491,7 +2720,7 @@ static int ath11k_peer_assoc_qos_ap(struct ath11k *ar,</div><div class='ctx'> </div><div class='ctx'> 	params.vdev_id = arvif-&gt;vdev_id;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "mac uapsd_queues 0x%x max_sp %d\n",</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "uapsd_queues 0x%x max_sp %d\n",</div><div class='ctx'> 		   sta-&gt;uapsd_queues, sta-&gt;max_sp);</div><div class='ctx'> </div><div class='ctx'> 	uapsd = 0;</div><div class='hunk'>@@ -1547,15 +2776,15 @@ err:</div><div class='ctx'> </div><div class='ctx'> static bool ath11k_mac_sta_has_ofdm_only(struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	return sta-&gt;supp_rates[NL80211_BAND_2GHZ] &gt;&gt;</div><div class='add'>+	return sta-&gt;deflink.supp_rates[NL80211_BAND_2GHZ] &gt;&gt;</div><div class='ctx'> 	       ATH11K_MAC_FIRST_OFDM_RATE_IDX;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static enum wmi_phy_mode ath11k_mac_get_phymode_vht(struct ath11k *ar,</div><div class='ctx'> 						    struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_160) {</div><div class='del'>-		switch (sta-&gt;vht_cap.cap &amp;</div><div class='add'>+	if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_160) {</div><div class='add'>+		switch (sta-&gt;deflink.vht_cap.cap &amp;</div><div class='ctx'> 			IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) {</div><div class='ctx'> 		case IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ:</div><div class='ctx'> 			return MODE_11AC_VHT160;</div><div class='hunk'>@@ -1567,13 +2796,13 @@ static enum wmi_phy_mode ath11k_mac_get_phymode_vht(struct ath11k *ar,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_80)</div><div class='add'>+	if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_80)</div><div class='ctx'> 		return MODE_11AC_VHT80;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='add'>+	if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='ctx'> 		return MODE_11AC_VHT40;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_20)</div><div class='add'>+	if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_20)</div><div class='ctx'> 		return MODE_11AC_VHT20;</div><div class='ctx'> </div><div class='ctx'> 	return MODE_UNKNOWN;</div><div class='hunk'>@@ -1582,24 +2811,24 @@ static enum wmi_phy_mode ath11k_mac_get_phymode_vht(struct ath11k *ar,</div><div class='ctx'> static enum wmi_phy_mode ath11k_mac_get_phymode_he(struct ath11k *ar,</div><div class='ctx'> 						   struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_160) {</div><div class='del'>-		if (sta-&gt;he_cap.he_cap_elem.phy_cap_info[0] &amp;</div><div class='add'>+	if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_160) {</div><div class='add'>+		if (sta-&gt;deflink.he_cap.he_cap_elem.phy_cap_info[0] &amp;</div><div class='ctx'> 		     IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G)</div><div class='ctx'> 			return MODE_11AX_HE160;</div><div class='del'>-		else if (sta-&gt;he_cap.he_cap_elem.phy_cap_info[0] &amp;</div><div class='del'>-		     IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G)</div><div class='add'>+		else if (sta-&gt;deflink.he_cap.he_cap_elem.phy_cap_info[0] &amp;</div><div class='add'>+			 IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G)</div><div class='ctx'> 			return MODE_11AX_HE80_80;</div><div class='ctx'> 		/* not sure if this is a valid case? */</div><div class='ctx'> 		return MODE_11AX_HE160;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_80)</div><div class='add'>+	if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_80)</div><div class='ctx'> 		return MODE_11AX_HE80;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='add'>+	if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='ctx'> 		return MODE_11AX_HE40;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_20)</div><div class='add'>+	if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_20)</div><div class='ctx'> 		return MODE_11AX_HE20;</div><div class='ctx'> </div><div class='ctx'> 	return MODE_UNKNOWN;</div><div class='hunk'>@@ -1610,11 +2839,12 @@ static void ath11k_peer_assoc_h_phymode(struct ath11k *ar,</div><div class='ctx'> 					struct ieee80211_sta *sta,</div><div class='ctx'> 					struct peer_assoc_params *arg)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> 	struct cfg80211_chan_def def;</div><div class='ctx'> 	enum nl80211_band band;</div><div class='ctx'> 	const u8 *ht_mcs_mask;</div><div class='ctx'> 	const u16 *vht_mcs_mask;</div><div class='add'>+	const u16 *he_mcs_mask;</div><div class='ctx'> 	enum wmi_phy_mode phymode = MODE_UNKNOWN;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(ath11k_mac_vif_chan(vif, &amp;def)))</div><div class='hunk'>@@ -1623,25 +2853,27 @@ static void ath11k_peer_assoc_h_phymode(struct ath11k *ar,</div><div class='ctx'> 	band = def.chan-&gt;band;</div><div class='ctx'> 	ht_mcs_mask = arvif-&gt;bitrate_mask.control[band].ht_mcs;</div><div class='ctx'> 	vht_mcs_mask = arvif-&gt;bitrate_mask.control[band].vht_mcs;</div><div class='add'>+	he_mcs_mask = arvif-&gt;bitrate_mask.control[band].he_mcs;</div><div class='ctx'> </div><div class='ctx'> 	switch (band) {</div><div class='ctx'> 	case NL80211_BAND_2GHZ:</div><div class='del'>-		if (sta-&gt;he_cap.has_he) {</div><div class='del'>-			if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_80)</div><div class='add'>+		if (sta-&gt;deflink.he_cap.has_he &amp;&amp;</div><div class='add'>+		    !ath11k_peer_assoc_h_he_masked(he_mcs_mask)) {</div><div class='add'>+			if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_80)</div><div class='ctx'> 				phymode = MODE_11AX_HE80_2G;</div><div class='del'>-			else if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='add'>+			else if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='ctx'> 				phymode = MODE_11AX_HE40_2G;</div><div class='ctx'> 			else</div><div class='ctx'> 				phymode = MODE_11AX_HE20_2G;</div><div class='del'>-		} else if (sta-&gt;vht_cap.vht_supported &amp;&amp;</div><div class='del'>-		    !ath11k_peer_assoc_h_vht_masked(vht_mcs_mask)) {</div><div class='del'>-			if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='add'>+		} else if (sta-&gt;deflink.vht_cap.vht_supported &amp;&amp;</div><div class='add'>+			   !ath11k_peer_assoc_h_vht_masked(vht_mcs_mask)) {</div><div class='add'>+			if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='ctx'> 				phymode = MODE_11AC_VHT40;</div><div class='ctx'> 			else</div><div class='ctx'> 				phymode = MODE_11AC_VHT20;</div><div class='del'>-		} else if (sta-&gt;ht_cap.ht_supported &amp;&amp;</div><div class='add'>+		} else if (sta-&gt;deflink.ht_cap.ht_supported &amp;&amp;</div><div class='ctx'> 			   !ath11k_peer_assoc_h_ht_masked(ht_mcs_mask)) {</div><div class='del'>-			if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='add'>+			if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='ctx'> 				phymode = MODE_11NG_HT40;</div><div class='ctx'> 			else</div><div class='ctx'> 				phymode = MODE_11NG_HT20;</div><div class='hunk'>@@ -1654,14 +2886,15 @@ static void ath11k_peer_assoc_h_phymode(struct ath11k *ar,</div><div class='ctx'> 	case NL80211_BAND_5GHZ:</div><div class='ctx'> 	case NL80211_BAND_6GHZ:</div><div class='ctx'> 		/* Check HE first */</div><div class='del'>-		if (sta-&gt;he_cap.has_he) {</div><div class='add'>+		if (sta-&gt;deflink.he_cap.has_he &amp;&amp;</div><div class='add'>+		    !ath11k_peer_assoc_h_he_masked(he_mcs_mask)) {</div><div class='ctx'> 			phymode = ath11k_mac_get_phymode_he(ar, sta);</div><div class='del'>-		} else if (sta-&gt;vht_cap.vht_supported &amp;&amp;</div><div class='del'>-		    !ath11k_peer_assoc_h_vht_masked(vht_mcs_mask)) {</div><div class='add'>+		} else if (sta-&gt;deflink.vht_cap.vht_supported &amp;&amp;</div><div class='add'>+			   !ath11k_peer_assoc_h_vht_masked(vht_mcs_mask)) {</div><div class='ctx'> 			phymode = ath11k_mac_get_phymode_vht(ar, sta);</div><div class='del'>-		} else if (sta-&gt;ht_cap.ht_supported &amp;&amp;</div><div class='add'>+		} else if (sta-&gt;deflink.ht_cap.ht_supported &amp;&amp;</div><div class='ctx'> 			   !ath11k_peer_assoc_h_ht_masked(ht_mcs_mask)) {</div><div class='del'>-			if (sta-&gt;bandwidth &gt;= IEEE80211_STA_RX_BW_40)</div><div class='add'>+			if (sta-&gt;deflink.bandwidth &gt;= IEEE80211_STA_RX_BW_40)</div><div class='ctx'> 				phymode = MODE_11NA_HT40;</div><div class='ctx'> 			else</div><div class='ctx'> 				phymode = MODE_11NA_HT20;</div><div class='hunk'>@@ -1673,7 +2906,7 @@ static void ath11k_peer_assoc_h_phymode(struct ath11k *ar,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "mac peer %pM phymode %s\n",</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "peer %pM phymode %s\n",</div><div class='ctx'> 		   sta-&gt;addr, ath11k_wmi_phymode_str(phymode));</div><div class='ctx'> </div><div class='ctx'> 	arg-&gt;peer_phymode = phymode;</div><div class='hunk'>@@ -1686,8 +2919,12 @@ static void ath11k_peer_assoc_prepare(struct ath11k *ar,</div><div class='ctx'> 				      struct peer_assoc_params *arg,</div><div class='ctx'> 				      bool reassoc)</div><div class='ctx'> {</div><div class='add'>+	struct ath11k_sta *arsta;</div><div class='add'>+</div><div class='ctx'> 	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='add'>+	arsta = ath11k_sta_to_arsta(sta);</div><div class='add'>+</div><div class='ctx'> 	memset(arg, 0, sizeof(*arg));</div><div class='ctx'> </div><div class='ctx'> 	reinit_completion(&amp;ar-&gt;peer_assoc_done);</div><div class='hunk'>@@ -1696,27 +2933,35 @@ static void ath11k_peer_assoc_prepare(struct ath11k *ar,</div><div class='ctx'> 	ath11k_peer_assoc_h_basic(ar, vif, sta, arg);</div><div class='ctx'> 	ath11k_peer_assoc_h_crypto(ar, vif, sta, arg);</div><div class='ctx'> 	ath11k_peer_assoc_h_rates(ar, vif, sta, arg);</div><div class='add'>+	ath11k_peer_assoc_h_phymode(ar, vif, sta, arg);</div><div class='ctx'> 	ath11k_peer_assoc_h_ht(ar, vif, sta, arg);</div><div class='ctx'> 	ath11k_peer_assoc_h_vht(ar, vif, sta, arg);</div><div class='ctx'> 	ath11k_peer_assoc_h_he(ar, vif, sta, arg);</div><div class='add'>+	ath11k_peer_assoc_h_he_6ghz(ar, vif, sta, arg);</div><div class='ctx'> 	ath11k_peer_assoc_h_qos(ar, vif, sta, arg);</div><div class='del'>-	ath11k_peer_assoc_h_phymode(ar, vif, sta, arg);</div><div class='ctx'> 	ath11k_peer_assoc_h_smps(sta, arg);</div><div class='ctx'> </div><div class='add'>+	arsta-&gt;peer_nss = arg-&gt;peer_nss;</div><div class='add'>+</div><div class='ctx'> 	/* TODO: amsdu_disable req? */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath11k_setup_peer_smps(struct ath11k *ar, struct ath11k_vif *arvif,</div><div class='ctx'> 				  const u8 *addr,</div><div class='del'>-				  const struct ieee80211_sta_ht_cap *ht_cap)</div><div class='add'>+				  const struct ieee80211_sta_ht_cap *ht_cap,</div><div class='add'>+				  u16 he_6ghz_capa)</div><div class='ctx'> {</div><div class='ctx'> 	int smps;</div><div class='ctx'> </div><div class='del'>-	if (!ht_cap-&gt;ht_supported)</div><div class='add'>+	if (!ht_cap-&gt;ht_supported &amp;&amp; !he_6ghz_capa)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	smps = ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_SM_PS;</div><div class='del'>-	smps &gt;&gt;= IEEE80211_HT_CAP_SM_PS_SHIFT;</div><div class='add'>+	if (ht_cap-&gt;ht_supported) {</div><div class='add'>+		smps = ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_SM_PS;</div><div class='add'>+		smps &gt;&gt;= IEEE80211_HT_CAP_SM_PS_SHIFT;</div><div class='add'>+	} else {</div><div class='add'>+		smps = FIELD_GET(IEEE80211_HE_6GHZ_CAP_SM_PS, he_6ghz_capa);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (smps &gt;= ARRAY_SIZE(ath11k_smps_map))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1726,19 +2971,133 @@ static int ath11k_setup_peer_smps(struct ath11k *ar, struct ath11k_vif *arvif,</div><div class='ctx'> 					 ath11k_smps_map[smps]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ath11k_mac_set_he_txbf_conf(struct ath11k_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = arvif-&gt;ar;</div><div class='add'>+	u32 param, value;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!arvif-&gt;vif-&gt;bss_conf.he_support)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	param = WMI_VDEV_PARAM_SET_HEMU_MODE;</div><div class='add'>+	value = 0;</div><div class='add'>+	if (arvif-&gt;vif-&gt;bss_conf.he_su_beamformer) {</div><div class='add'>+		value |= FIELD_PREP(HE_MODE_SU_TX_BFER, HE_SU_BFER_ENABLE);</div><div class='add'>+		if (arvif-&gt;vif-&gt;bss_conf.he_mu_beamformer &amp;&amp;</div><div class='add'>+		    arvif-&gt;vdev_type == WMI_VDEV_TYPE_AP)</div><div class='add'>+			value |= FIELD_PREP(HE_MODE_MU_TX_BFER, HE_MU_BFER_ENABLE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;vif-&gt;type != NL80211_IFTYPE_MESH_POINT) {</div><div class='add'>+		value |= FIELD_PREP(HE_MODE_DL_OFDMA, HE_DL_MUOFDMA_ENABLE) |</div><div class='add'>+			 FIELD_PREP(HE_MODE_UL_OFDMA, HE_UL_MUOFDMA_ENABLE);</div><div class='add'>+</div><div class='add'>+		if (arvif-&gt;vif-&gt;bss_conf.he_full_ul_mumimo)</div><div class='add'>+			value |= FIELD_PREP(HE_MODE_UL_MUMIMO, HE_UL_MUMIMO_ENABLE);</div><div class='add'>+</div><div class='add'>+		if (arvif-&gt;vif-&gt;bss_conf.he_su_beamformee)</div><div class='add'>+			value |= FIELD_PREP(HE_MODE_SU_TX_BFEE, HE_SU_BFEE_ENABLE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id, param, value);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to set vdev %d HE MU mode: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	param = WMI_VDEV_PARAM_SET_HE_SOUNDING_MODE;</div><div class='add'>+	value =	FIELD_PREP(HE_VHT_SOUNDING_MODE, HE_VHT_SOUNDING_MODE_ENABLE) |</div><div class='add'>+		FIELD_PREP(HE_TRIG_NONTRIG_SOUNDING_MODE,</div><div class='add'>+			   HE_TRIG_NONTRIG_SOUNDING_MODE_ENABLE);</div><div class='add'>+	ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+					    param, value);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to set vdev %d sounding mode: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath11k_mac_vif_recalc_sta_he_txbf(struct ath11k *ar,</div><div class='add'>+					      struct ieee80211_vif *vif,</div><div class='add'>+					      struct ieee80211_sta_he_cap *he_cap)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='add'>+	struct ieee80211_he_cap_elem he_cap_elem = {};</div><div class='add'>+	struct ieee80211_sta_he_cap *cap_band = NULL;</div><div class='add'>+	struct cfg80211_chan_def def;</div><div class='add'>+	u32 param = WMI_VDEV_PARAM_SET_HEMU_MODE;</div><div class='add'>+	u32 hemode = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!vif-&gt;bss_conf.he_support)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ath11k_mac_vif_chan(vif, &amp;def)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (def.chan-&gt;band == NL80211_BAND_2GHZ)</div><div class='add'>+		cap_band = &amp;ar-&gt;mac.iftype[NL80211_BAND_2GHZ][vif-&gt;type].he_cap;</div><div class='add'>+	else</div><div class='add'>+		cap_band = &amp;ar-&gt;mac.iftype[NL80211_BAND_5GHZ][vif-&gt;type].he_cap;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;he_cap_elem, &amp;cap_band-&gt;he_cap_elem, sizeof(he_cap_elem));</div><div class='add'>+</div><div class='add'>+	if (HECAP_PHY_SUBFME_GET(he_cap_elem.phy_cap_info)) {</div><div class='add'>+		if (HECAP_PHY_SUBFMR_GET(he_cap-&gt;he_cap_elem.phy_cap_info))</div><div class='add'>+			hemode |= FIELD_PREP(HE_MODE_SU_TX_BFEE, HE_SU_BFEE_ENABLE);</div><div class='add'>+		if (HECAP_PHY_MUBFMR_GET(he_cap-&gt;he_cap_elem.phy_cap_info))</div><div class='add'>+			hemode |= FIELD_PREP(HE_MODE_MU_TX_BFEE, HE_MU_BFEE_ENABLE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_MESH_POINT) {</div><div class='add'>+		hemode |= FIELD_PREP(HE_MODE_DL_OFDMA, HE_DL_MUOFDMA_ENABLE) |</div><div class='add'>+			  FIELD_PREP(HE_MODE_UL_OFDMA, HE_UL_MUOFDMA_ENABLE);</div><div class='add'>+</div><div class='add'>+		if (HECAP_PHY_ULMUMIMO_GET(he_cap_elem.phy_cap_info))</div><div class='add'>+			if (HECAP_PHY_ULMUMIMO_GET(he_cap-&gt;he_cap_elem.phy_cap_info))</div><div class='add'>+				hemode |= FIELD_PREP(HE_MODE_UL_MUMIMO,</div><div class='add'>+						     HE_UL_MUMIMO_ENABLE);</div><div class='add'>+</div><div class='add'>+		if (FIELD_GET(HE_MODE_MU_TX_BFEE, hemode))</div><div class='add'>+			hemode |= FIELD_PREP(HE_MODE_SU_TX_BFEE, HE_SU_BFEE_ENABLE);</div><div class='add'>+</div><div class='add'>+		if (FIELD_GET(HE_MODE_MU_TX_BFER, hemode))</div><div class='add'>+			hemode |= FIELD_PREP(HE_MODE_SU_TX_BFER, HE_SU_BFER_ENABLE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id, param, hemode);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to submit vdev param txbf 0x%x: %d\n",</div><div class='add'>+			    hemode, ret);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath11k_bss_assoc(struct ieee80211_hw *hw,</div><div class='ctx'> 			     struct ieee80211_vif *vif,</div><div class='ctx'> 			     struct ieee80211_bss_conf *bss_conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = hw-&gt;priv;</div><div class='del'>-	struct ath11k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> 	struct peer_assoc_params peer_arg;</div><div class='ctx'> 	struct ieee80211_sta *ap_sta;</div><div class='add'>+	struct ath11k_peer *peer;</div><div class='add'>+	bool is_auth = false;</div><div class='add'>+	struct ieee80211_sta_he_cap  he_cap;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "mac vdev %i assoc bssid %pM aid %d\n",</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "vdev %i assoc bssid %pM aid %d\n",</div><div class='ctx'> 		   arvif-&gt;vdev_id, arvif-&gt;bssid, arvif-&gt;aid);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='hunk'>@@ -1751,10 +3110,21 @@ static void ath11k_bss_assoc(struct ieee80211_hw *hw,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* he_cap here is updated at assoc success for sta mode only */</div><div class='add'>+	he_cap  = ap_sta-&gt;deflink.he_cap;</div><div class='add'>+</div><div class='ctx'> 	ath11k_peer_assoc_prepare(ar, vif, ap_sta, &amp;peer_arg, false);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='add'>+	if (!ath11k_mac_vif_recalc_sta_he_txbf(ar, vif, &amp;he_cap)) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to recalc he txbf for vdev %i on bss %pM\n",</div><div class='add'>+			    arvif-&gt;vdev_id, bss_conf-&gt;bssid);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	peer_arg.is_assoc = true;</div><div class='add'>+</div><div class='ctx'> 	ret = ath11k_wmi_send_peer_assoc_cmd(ar, &amp;peer_arg);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab, "failed to run peer assoc for %pM vdev %i: %d\n",</div><div class='hunk'>@@ -1769,7 +3139,8 @@ static void ath11k_bss_assoc(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_setup_peer_smps(ar, arvif, bss_conf-&gt;bssid,</div><div class='del'>-				     &amp;ap_sta-&gt;ht_cap);</div><div class='add'>+				     &amp;ap_sta-&gt;deflink.ht_cap,</div><div class='add'>+				     le16_to_cpu(ap_sta-&gt;deflink.he_6ghz_capa.capa));</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab, "failed to setup peer SMPS for vdev %d: %d\n",</div><div class='ctx'> 			    arvif-&gt;vdev_id, ret);</div><div class='hunk'>@@ -1778,10 +3149,11 @@ static void ath11k_bss_assoc(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(arvif-&gt;is_up);</div><div class='ctx'> </div><div class='del'>-	arvif-&gt;aid = bss_conf-&gt;aid;</div><div class='add'>+	arvif-&gt;aid = vif-&gt;cfg.aid;</div><div class='ctx'> 	ether_addr_copy(arvif-&gt;bssid, bss_conf-&gt;bssid);</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_wmi_vdev_up(ar, arvif-&gt;vdev_id, arvif-&gt;aid, arvif-&gt;bssid);</div><div class='add'>+	ret = ath11k_wmi_vdev_up(ar, arvif-&gt;vdev_id, arvif-&gt;aid, arvif-&gt;bssid,</div><div class='add'>+				 NULL, 0, 0);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab, "failed to set vdev %d up: %d\n",</div><div class='ctx'> 			    arvif-&gt;vdev_id, ret);</div><div class='hunk'>@@ -1789,36 +3161,55 @@ static void ath11k_bss_assoc(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	arvif-&gt;is_up = true;</div><div class='add'>+	arvif-&gt;rekey_data.enable_offload = false;</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='del'>-		   "mac vdev %d up (associated) bssid %pM aid %d\n",</div><div class='del'>-		   arvif-&gt;vdev_id, bss_conf-&gt;bssid, bss_conf-&gt;aid);</div><div class='add'>+		   "vdev %d up (associated) bssid %pM aid %d\n",</div><div class='add'>+		   arvif-&gt;vdev_id, bss_conf-&gt;bssid, vif-&gt;cfg.aid);</div><div class='ctx'> </div><div class='del'>-	/* Authorize BSS Peer */</div><div class='del'>-	ret = ath11k_wmi_set_peer_param(ar, arvif-&gt;bssid,</div><div class='del'>-					arvif-&gt;vdev_id,</div><div class='del'>-					WMI_PEER_AUTHORIZE,</div><div class='del'>-					1);</div><div class='del'>-	if (ret)</div><div class='del'>-		ath11k_warn(ar-&gt;ab, "Unable to authorize BSS peer: %d\n", ret);</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	peer = ath11k_peer_find(ar-&gt;ab, arvif-&gt;vdev_id, arvif-&gt;bssid);</div><div class='add'>+	if (peer &amp;&amp; peer-&gt;is_authorized)</div><div class='add'>+		is_auth = true;</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	if (is_auth) {</div><div class='add'>+		ret = ath11k_wmi_set_peer_param(ar, arvif-&gt;bssid,</div><div class='add'>+						arvif-&gt;vdev_id,</div><div class='add'>+						WMI_PEER_AUTHORIZE,</div><div class='add'>+						1);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "Unable to authorize BSS peer: %d\n", ret);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_wmi_send_obss_spr_cmd(ar, arvif-&gt;vdev_id,</div><div class='ctx'> 					   &amp;bss_conf-&gt;he_obss_pd);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab, "failed to set vdev %i OBSS PD parameters: %d\n",</div><div class='ctx'> 			    arvif-&gt;vdev_id, ret);</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+					    WMI_VDEV_PARAM_DTIM_POLICY,</div><div class='add'>+					    WMI_DTIM_POLICY_STICK);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to set vdev %d dtim policy: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+</div><div class='add'>+	ath11k_mac_11d_scan_stop_all(ar-&gt;ab);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_bss_disassoc(struct ieee80211_hw *hw,</div><div class='ctx'> 				struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = hw-&gt;priv;</div><div class='del'>-	struct ath11k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "mac vdev %i disassoc bssid %pM\n",</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "vdev %i disassoc bssid %pM\n",</div><div class='ctx'> 		   arvif-&gt;vdev_id, arvif-&gt;bssid);</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_wmi_vdev_down(ar, arvif-&gt;vdev_id);</div><div class='hunk'>@@ -1828,6 +3219,8 @@ static void ath11k_bss_disassoc(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	arvif-&gt;is_up = false;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;arvif-&gt;rekey_data, 0, sizeof(arvif-&gt;rekey_data));</div><div class='add'>+</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;arvif-&gt;connection_loss_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1860,7 +3253,7 @@ static void ath11k_recalculate_mgmt_rate(struct ath11k *ar,</div><div class='ctx'> 					 struct ieee80211_vif *vif,</div><div class='ctx'> 					 struct cfg80211_chan_def *def)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> 	const struct ieee80211_supported_band *sband;</div><div class='ctx'> 	u8 basic_rate_idx;</div><div class='ctx'> 	int hw_rate_code;</div><div class='hunk'>@@ -1886,6 +3279,11 @@ static void ath11k_recalculate_mgmt_rate(struct ath11k *ar,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab, "failed to set mgmt tx rate %d\n", ret);</div><div class='ctx'> </div><div class='add'>+	/* For WCN6855, firmware will clear this param when vdev starts, hence</div><div class='add'>+	 * cache it here so that we can reconfigure it once vdev starts.</div><div class='add'>+	 */</div><div class='add'>+	ar-&gt;hw_rate_code = hw_rate_code;</div><div class='add'>+</div><div class='ctx'> 	vdev_param = WMI_VDEV_PARAM_BEACON_RATE;</div><div class='ctx'> 	ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id, vdev_param,</div><div class='ctx'> 					    hw_rate_code);</div><div class='hunk'>@@ -1950,7 +3348,7 @@ static int ath11k_mac_config_obss_pd(struct ath11k *ar,</div><div class='ctx'> </div><div class='ctx'> 	/* Set and enable SRG/non-SRG OBSS PD Threshold */</div><div class='ctx'> 	param_id = WMI_PDEV_PARAM_SET_CMD_OBSS_PD_THRESHOLD;</div><div class='del'>-	if (test_bit(ATH11K_FLAG_MONITOR_ENABLED, &amp;ar-&gt;monitor_flags)) {</div><div class='add'>+	if (test_bit(ATH11K_FLAG_MONITOR_STARTED, &amp;ar-&gt;monitor_flags)) {</div><div class='ctx'> 		ret = ath11k_wmi_pdev_set_param(ar, param_id, 0, pdev_id);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			ath11k_warn(ar-&gt;ab,</div><div class='hunk'>@@ -1960,7 +3358,7 @@ static int ath11k_mac_config_obss_pd(struct ath11k *ar,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='del'>-		   "mac obss pd sr_ctrl %x non_srg_thres %u srg_max %u\n",</div><div class='add'>+		   "obss pd sr_ctrl %x non_srg_thres %u srg_max %u\n",</div><div class='ctx'> 		   he_obss_pd-&gt;sr_ctrl, he_obss_pd-&gt;non_srg_max_offset,</div><div class='ctx'> 		   he_obss_pd-&gt;max_offset);</div><div class='ctx'> </div><div class='hunk'>@@ -2061,7 +3459,7 @@ static int ath11k_mac_config_obss_pd(struct ath11k *ar,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Enable all patial BSSID mask for SRG */</div><div class='add'>+	/* Enable all partial BSSID mask for SRG */</div><div class='ctx'> 	ret = ath11k_wmi_pdev_srg_obss_bssid_enable_bitmap(ar, bitmap);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab,</div><div class='hunk'>@@ -2079,7 +3477,7 @@ static int ath11k_mac_config_obss_pd(struct ath11k *ar,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Enable all patial BSSID mask for non-SRG */</div><div class='add'>+	/* Enable all partial BSSID mask for non-SRG */</div><div class='ctx'> 	ret = ath11k_wmi_pdev_non_srg_obss_bssid_enable_bitmap(ar, bitmap);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab,</div><div class='hunk'>@@ -2091,10 +3489,22 @@ static int ath11k_mac_config_obss_pd(struct ath11k *ar,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ath11k_mac_supports_station_tpc(struct ath11k *ar,</div><div class='add'>+					    struct ath11k_vif *arvif,</div><div class='add'>+					    const struct cfg80211_chan_def *chandef)</div><div class='add'>+{</div><div class='add'>+	return ath11k_wmi_supports_6ghz_cc_ext(ar) &amp;&amp;</div><div class='add'>+		test_bit(WMI_TLV_SERVICE_EXT_TPC_REG_SUPPORT, ar-&gt;ab-&gt;wmi_ab.svc_map) &amp;&amp;</div><div class='add'>+		arvif-&gt;vdev_type == WMI_VDEV_TYPE_STA &amp;&amp;</div><div class='add'>+		arvif-&gt;vdev_subtype == WMI_VDEV_SUBTYPE_NONE &amp;&amp;</div><div class='add'>+		chandef-&gt;chan &amp;&amp;</div><div class='add'>+		chandef-&gt;chan-&gt;band == NL80211_BAND_6GHZ;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 					   struct ieee80211_vif *vif,</div><div class='ctx'> 					   struct ieee80211_bss_conf *info,</div><div class='del'>-					   u32 changed)</div><div class='add'>+					   u64 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = hw-&gt;priv;</div><div class='ctx'> 	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='hunk'>@@ -2108,7 +3518,8 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	u16 bitrate;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u8 rateidx;</div><div class='del'>-	u32 rate;</div><div class='add'>+	u32 rate, param;</div><div class='add'>+	u32 ipv4_cnt;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -2141,10 +3552,31 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 				   "Set staggered beacon mode for VDEV: %d\n",</div><div class='ctx'> 				   arvif-&gt;vdev_id);</div><div class='ctx'> </div><div class='del'>-		ret = ath11k_mac_setup_bcn_tmpl(arvif);</div><div class='del'>-		if (ret)</div><div class='del'>-			ath11k_warn(ar-&gt;ab, "failed to update bcn template: %d\n",</div><div class='del'>-				    ret);</div><div class='add'>+		if (!arvif-&gt;do_not_send_tmpl || !arvif-&gt;bcca_zero_sent) {</div><div class='add'>+			ret = ath11k_mac_setup_bcn_tmpl(arvif);</div><div class='add'>+			if (ret)</div><div class='add'>+				ath11k_warn(ar-&gt;ab, "failed to update bcn template: %d\n",</div><div class='add'>+					    ret);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (arvif-&gt;bcca_zero_sent)</div><div class='add'>+			arvif-&gt;do_not_send_tmpl = true;</div><div class='add'>+		else</div><div class='add'>+			arvif-&gt;do_not_send_tmpl = false;</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;bss_conf.he_support) {</div><div class='add'>+			ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+							    WMI_VDEV_PARAM_BA_MODE,</div><div class='add'>+							    WMI_BA_MODE_BUFFER_SIZE_256);</div><div class='add'>+			if (ret)</div><div class='add'>+				ath11k_warn(ar-&gt;ab,</div><div class='add'>+					    "failed to set BA BUFFER SIZE 256 for vdev: %d\n",</div><div class='add'>+					    arvif-&gt;vdev_id);</div><div class='add'>+			else</div><div class='add'>+				ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='add'>+					   "Set BA BUFFER SIZE 256 for VDEV: %d\n",</div><div class='add'>+					   arvif-&gt;vdev_id);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; (BSS_CHANGED_BEACON_INFO | BSS_CHANGED_BEACON)) {</div><div class='hunk'>@@ -2166,9 +3598,10 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_SSID &amp;&amp;</div><div class='ctx'> 	    vif-&gt;type == NL80211_IFTYPE_AP) {</div><div class='del'>-		arvif-&gt;u.ap.ssid_len = info-&gt;ssid_len;</div><div class='del'>-		if (info-&gt;ssid_len)</div><div class='del'>-			memcpy(arvif-&gt;u.ap.ssid, info-&gt;ssid, info-&gt;ssid_len);</div><div class='add'>+		arvif-&gt;u.ap.ssid_len = vif-&gt;cfg.ssid_len;</div><div class='add'>+		if (vif-&gt;cfg.ssid_len)</div><div class='add'>+			memcpy(arvif-&gt;u.ap.ssid, vif-&gt;cfg.ssid,</div><div class='add'>+			       vif-&gt;cfg.ssid_len);</div><div class='ctx'> 		arvif-&gt;u.ap.hidden_ssid = info-&gt;hidden_ssid;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2176,18 +3609,12 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 		ether_addr_copy(arvif-&gt;bssid, info-&gt;bssid);</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_BEACON_ENABLED) {</div><div class='add'>+		if (info-&gt;enable_beacon)</div><div class='add'>+			ath11k_mac_set_he_txbf_conf(arvif);</div><div class='ctx'> 		ath11k_control_beaconing(arvif, info);</div><div class='ctx'> </div><div class='ctx'> 		if (arvif-&gt;is_up &amp;&amp; vif-&gt;bss_conf.he_support &amp;&amp;</div><div class='ctx'> 		    vif-&gt;bss_conf.he_oper.params) {</div><div class='del'>-			ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='del'>-							    WMI_VDEV_PARAM_BA_MODE,</div><div class='del'>-							    WMI_BA_MODE_BUFFER_SIZE_256);</div><div class='del'>-			if (ret)</div><div class='del'>-				ath11k_warn(ar-&gt;ab,</div><div class='del'>-					    "failed to set BA BUFFER SIZE 256 for vdev: %d\n",</div><div class='del'>-					    arvif-&gt;vdev_id);</div><div class='del'>-</div><div class='ctx'> 			param_id = WMI_VDEV_PARAM_HEOPS_0_31;</div><div class='ctx'> 			param_value = vif-&gt;bss_conf.he_oper.params;</div><div class='ctx'> 			ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='hunk'>@@ -2264,20 +3691,29 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_ASSOC) {</div><div class='del'>-		if (info-&gt;assoc)</div><div class='add'>+		if (vif-&gt;cfg.assoc)</div><div class='ctx'> 			ath11k_bss_assoc(hw, vif, info);</div><div class='ctx'> 		else</div><div class='ctx'> 			ath11k_bss_disassoc(hw, vif);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_TXPOWER) {</div><div class='del'>-		ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "mac vdev_id %i txpower %d\n",</div><div class='add'>+		ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "vdev_id %i txpower %d\n",</div><div class='ctx'> 			   arvif-&gt;vdev_id, info-&gt;txpower);</div><div class='del'>-</div><div class='ctx'> 		arvif-&gt;txpower = info-&gt;txpower;</div><div class='ctx'> 		ath11k_mac_txpower_recalc(ar);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (changed &amp; BSS_CHANGED_PS &amp;&amp;</div><div class='add'>+	    ar-&gt;ab-&gt;hw_params.supports_sta_ps) {</div><div class='add'>+		arvif-&gt;ps = vif-&gt;cfg.ps;</div><div class='add'>+</div><div class='add'>+		ret = ath11k_mac_config_ps(ar);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to setup ps on vdev %i: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_MCAST_RATE &amp;&amp;</div><div class='ctx'> 	    !ath11k_mac_vif_chan(arvif-&gt;vif, &amp;def)) {</div><div class='ctx'> 		band = def.chan-&gt;band;</div><div class='hunk'>@@ -2302,7 +3738,7 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 		rate = ATH11K_HW_RATE_CODE(hw_value, 0, preamble);</div><div class='ctx'> </div><div class='ctx'> 		ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='del'>-			   "mac vdev %d mcast_rate %x\n",</div><div class='add'>+			   "vdev %d mcast_rate %x\n",</div><div class='ctx'> 			   arvif-&gt;vdev_id, rate);</div><div class='ctx'> </div><div class='ctx'> 		vdev_param = WMI_VDEV_PARAM_MCAST_DATA_RATE;</div><div class='hunk'>@@ -2327,10 +3763,15 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 		ath11k_recalculate_mgmt_rate(ar, vif, &amp;def);</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_TWT) {</div><div class='del'>-		if (info-&gt;twt_requester || info-&gt;twt_responder)</div><div class='del'>-			ath11k_wmi_send_twt_enable_cmd(ar, ar-&gt;pdev-&gt;pdev_id);</div><div class='del'>-		else</div><div class='add'>+		struct wmi_twt_enable_params twt_params = {};</div><div class='add'>+</div><div class='add'>+		if (info-&gt;twt_requester || info-&gt;twt_responder) {</div><div class='add'>+			ath11k_wmi_fill_default_twt_params(&amp;twt_params);</div><div class='add'>+			ath11k_wmi_send_twt_enable_cmd(ar, ar-&gt;pdev-&gt;pdev_id,</div><div class='add'>+						       &amp;twt_params);</div><div class='add'>+		} else {</div><div class='ctx'> 			ath11k_wmi_send_twt_disable_cmd(ar, ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_HE_OBSS_PD)</div><div class='hunk'>@@ -2345,6 +3786,25 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				ath11k_warn(ar-&gt;ab, "failed to set bss color collision on vdev %i: %d\n",</div><div class='ctx'> 					    arvif-&gt;vdev_id,  ret);</div><div class='add'>+</div><div class='add'>+			param_id = WMI_VDEV_PARAM_BSS_COLOR;</div><div class='add'>+			if (info-&gt;he_bss_color.enabled)</div><div class='add'>+				param_value = info-&gt;he_bss_color.color &lt;&lt;</div><div class='add'>+						IEEE80211_HE_OPERATION_BSS_COLOR_OFFSET;</div><div class='add'>+			else</div><div class='add'>+				param_value = IEEE80211_HE_OPERATION_BSS_COLOR_DISABLED;</div><div class='add'>+</div><div class='add'>+			ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+							    param_id,</div><div class='add'>+							    param_value);</div><div class='add'>+			if (ret)</div><div class='add'>+				ath11k_warn(ar-&gt;ab,</div><div class='add'>+					    "failed to set bss color param on vdev %i: %d\n",</div><div class='add'>+					    arvif-&gt;vdev_id,  ret);</div><div class='add'>+</div><div class='add'>+			ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='add'>+				   "bss color param 0x%x set on vdev %i\n",</div><div class='add'>+				   param_value, arvif-&gt;vdev_id);</div><div class='ctx'> 		} else if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='ctx'> 			ret = ath11k_wmi_send_bss_color_change_enable_cmd(ar,</div><div class='ctx'> 									  arvif-&gt;vdev_id,</div><div class='hunk'>@@ -2361,10 +3821,37 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (changed &amp; BSS_CHANGED_FTM_RESPONDER &amp;&amp;</div><div class='add'>+	    arvif-&gt;ftm_responder != info-&gt;ftm_responder &amp;&amp;</div><div class='add'>+	    test_bit(WMI_TLV_SERVICE_RTT, ar-&gt;ab-&gt;wmi_ab.svc_map) &amp;&amp;</div><div class='add'>+	    (vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='add'>+	     vif-&gt;type == NL80211_IFTYPE_MESH_POINT)) {</div><div class='add'>+		arvif-&gt;ftm_responder = info-&gt;ftm_responder;</div><div class='add'>+		param = WMI_VDEV_PARAM_ENABLE_DISABLE_RTT_RESPONDER_ROLE;</div><div class='add'>+		ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id, param,</div><div class='add'>+						    arvif-&gt;ftm_responder);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "Failed to set ftm responder %i: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_FILS_DISCOVERY ||</div><div class='ctx'> 	    changed &amp; BSS_CHANGED_UNSOL_BCAST_PROBE_RESP)</div><div class='ctx'> 		ath11k_mac_fils_discovery(arvif, info);</div><div class='ctx'> </div><div class='add'>+	if (changed &amp; BSS_CHANGED_ARP_FILTER) {</div><div class='add'>+		ipv4_cnt = min(vif-&gt;cfg.arp_addr_cnt, ATH11K_IPV4_MAX_COUNT);</div><div class='add'>+		memcpy(arvif-&gt;arp_ns_offload.ipv4_addr,</div><div class='add'>+		       vif-&gt;cfg.arp_addr_list,</div><div class='add'>+		       ipv4_cnt * sizeof(u32));</div><div class='add'>+		memcpy(arvif-&gt;arp_ns_offload.mac_addr, vif-&gt;addr, ETH_ALEN);</div><div class='add'>+		arvif-&gt;arp_ns_offload.ipv4_count = ipv4_cnt;</div><div class='add'>+</div><div class='add'>+		ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "arp_addr_cnt %d vif-&gt;addr %pM, offload_addr %pI4\n",</div><div class='add'>+			   vif-&gt;cfg.arp_addr_cnt,</div><div class='add'>+			   vif-&gt;addr, arvif-&gt;arp_ns_offload.ipv4_addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2377,23 +3864,26 @@ void __ath11k_mac_scan_finish(struct ath11k *ar)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ATH11K_SCAN_RUNNING:</div><div class='ctx'> 	case ATH11K_SCAN_ABORTING:</div><div class='add'>+		if (ar-&gt;scan.is_roc &amp;&amp; ar-&gt;scan.roc_notify)</div><div class='add'>+			ieee80211_remain_on_channel_expired(ar-&gt;hw);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case ATH11K_SCAN_STARTING:</div><div class='ctx'> 		if (!ar-&gt;scan.is_roc) {</div><div class='ctx'> 			struct cfg80211_scan_info info = {</div><div class='del'>-				.aborted = (ar-&gt;scan.state ==</div><div class='del'>-					    ATH11K_SCAN_ABORTING),</div><div class='add'>+				.aborted = ((ar-&gt;scan.state ==</div><div class='add'>+					    ATH11K_SCAN_ABORTING) ||</div><div class='add'>+					    (ar-&gt;scan.state ==</div><div class='add'>+					    ATH11K_SCAN_STARTING)),</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			ieee80211_scan_completed(ar-&gt;hw, &amp;info);</div><div class='del'>-		} else if (ar-&gt;scan.roc_notify) {</div><div class='del'>-			ieee80211_remain_on_channel_expired(ar-&gt;hw);</div><div class='ctx'> 		}</div><div class='del'>-		fallthrough;</div><div class='del'>-	case ATH11K_SCAN_STARTING:</div><div class='add'>+</div><div class='ctx'> 		ar-&gt;scan.state = ATH11K_SCAN_IDLE;</div><div class='ctx'> 		ar-&gt;scan_channel = NULL;</div><div class='ctx'> 		ar-&gt;scan.roc_freq = 0;</div><div class='ctx'> 		cancel_delayed_work(&amp;ar-&gt;scan.timeout);</div><div class='del'>-		complete(&amp;ar-&gt;scan.completed);</div><div class='add'>+		complete_all(&amp;ar-&gt;scan.completed);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -2497,6 +3987,7 @@ static int ath11k_start_scan(struct ath11k *ar,</div><div class='ctx'> 			     struct scan_req_params *arg)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+	unsigned long timeout = 1 * HZ;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -2507,7 +3998,14 @@ static int ath11k_start_scan(struct ath11k *ar,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = wait_for_completion_timeout(&amp;ar-&gt;scan.started, 1 * HZ);</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_11D_OFFLOAD, ar-&gt;ab-&gt;wmi_ab.svc_map)) {</div><div class='add'>+		timeout = 5 * HZ;</div><div class='add'>+</div><div class='add'>+		if (ar-&gt;supports_6ghz)</div><div class='add'>+			timeout += 5 * HZ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = wait_for_completion_timeout(&amp;ar-&gt;scan.started, timeout);</div><div class='ctx'> 	if (ret == 0) {</div><div class='ctx'> 		ret = ath11k_scan_stop(ar);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -2530,6 +4028,150 @@ static int ath11k_start_scan(struct ath11k *ar,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ath11k_mac_fw_stats_reset(struct ath11k *ar)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	ath11k_fw_stats_pdevs_free(&amp;ar-&gt;fw_stats.pdevs);</div><div class='add'>+	ath11k_fw_stats_vdevs_free(&amp;ar-&gt;fw_stats.vdevs);</div><div class='add'>+	ar-&gt;fw_stats.num_vdev_recvd = 0;</div><div class='add'>+	ar-&gt;fw_stats.num_bcn_recvd = 0;</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_mac_fw_stats_request(struct ath11k *ar,</div><div class='add'>+				struct stats_request_params *req_param)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = ar-&gt;ab;</div><div class='add'>+	unsigned long time_left;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	ath11k_mac_fw_stats_reset(ar);</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;ar-&gt;fw_stats_complete);</div><div class='add'>+	reinit_completion(&amp;ar-&gt;fw_stats_done);</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_send_stats_request_cmd(ar, req_param);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "could not request fw stats (%d)\n",</div><div class='add'>+			    ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;ar-&gt;fw_stats_complete, 1 * HZ);</div><div class='add'>+	if (!time_left)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	/* FW stats can get split when exceeding the stats data buffer limit.</div><div class='add'>+	 * In that case, since there is no end marking for the back-to-back</div><div class='add'>+	 * received 'update stats' event, we keep a 3 seconds timeout in case,</div><div class='add'>+	 * fw_stats_done is not marked yet</div><div class='add'>+	 */</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;ar-&gt;fw_stats_done, 3 * HZ);</div><div class='add'>+	if (!time_left)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_get_fw_stats(struct ath11k *ar, u32 pdev_id,</div><div class='add'>+				   u32 vdev_id, u32 stats_id)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct stats_request_params req_param;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;state != ATH11K_STATE_ON)</div><div class='add'>+		return -ENETDOWN;</div><div class='add'>+</div><div class='add'>+	req_param.pdev_id = pdev_id;</div><div class='add'>+	req_param.vdev_id = vdev_id;</div><div class='add'>+	req_param.stats_id = stats_id;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_mac_fw_stats_request(ar, &amp;req_param);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath11k_warn(ab, "failed to request fw stats: %d\n", ret);</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "debug get fw stat pdev id %d vdev id %d stats id 0x%x\n",</div><div class='add'>+		   pdev_id, vdev_id, stats_id);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_handle_get_txpower(struct ath11k *ar,</div><div class='add'>+					 struct ieee80211_vif *vif,</div><div class='add'>+					 int *dbm)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath11k_fw_stats_pdev *pdev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Final Tx power is minimum of Target Power, CTL power, Regulatory</div><div class='add'>+	 * Power, PSD EIRP Power. We just know the Regulatory power from the</div><div class='add'>+	 * regulatory rules obtained. FW knows all these power and sets the min</div><div class='add'>+	 * of these. Hence, we request the FW pdev stats in which FW reports</div><div class='add'>+	 * the minimum of all vdev's channel Tx power.</div><div class='add'>+	 */</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	/* Firmware doesn't provide Tx power during CAC hence no need to fetch</div><div class='add'>+	 * the stats.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(ATH11K_CAC_RUNNING, &amp;ar-&gt;dev_flags))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_mac_get_fw_stats(ar, ar-&gt;pdev-&gt;pdev_id, 0,</div><div class='add'>+				      WMI_REQUEST_PDEV_STAT);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to request fw pdev stats: %d\n", ret);</div><div class='add'>+		goto err_fallback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	pdev = list_first_entry_or_null(&amp;ar-&gt;fw_stats.pdevs,</div><div class='add'>+					struct ath11k_fw_stats_pdev, list);</div><div class='add'>+	if (!pdev) {</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		goto err_fallback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* tx power is set as 2 units per dBm in FW. */</div><div class='add'>+	*dbm = pdev-&gt;chan_tx_power / 2;</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "txpower from firmware %d, reported %d dBm\n",</div><div class='add'>+		   pdev-&gt;chan_tx_power, *dbm);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_fallback:</div><div class='add'>+	/* We didn't get txpower from FW. Hence, relying on vif-&gt;bss_conf.txpower */</div><div class='add'>+	*dbm = vif-&gt;bss_conf.txpower;</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "txpower from firmware NaN, reported %d dBm\n",</div><div class='add'>+		   *dbm);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_op_get_txpower(struct ieee80211_hw *hw,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     unsigned int link_id,</div><div class='add'>+				     int *dbm)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = hw-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+	ret = ath11k_mac_handle_get_txpower(ar, vif, dbm);</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath11k_mac_op_hw_scan(struct ieee80211_hw *hw,</div><div class='ctx'> 				 struct ieee80211_vif *vif,</div><div class='ctx'> 				 struct ieee80211_scan_request *hw_req)</div><div class='hunk'>@@ -2537,9 +4179,22 @@ static int ath11k_mac_op_hw_scan(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct ath11k *ar = hw-&gt;priv;</div><div class='ctx'> 	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> 	struct cfg80211_scan_request *req = &amp;hw_req-&gt;req;</div><div class='del'>-	struct scan_req_params arg;</div><div class='add'>+	struct scan_req_params *arg = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int i;</div><div class='add'>+	u32 scan_timeout;</div><div class='add'>+</div><div class='add'>+	/* Firmwares advertising the support of triggering 11D algorithm</div><div class='add'>+	 * on the scan results of a regular scan expects driver to send</div><div class='add'>+	 * WMI_11D_SCAN_START_CMDID before sending WMI_START_SCAN_CMDID.</div><div class='add'>+	 * With this feature, separate 11D scan can be avoided since</div><div class='add'>+	 * regdomain can be determined with the scan results of the</div><div class='add'>+	 * regular scan.</div><div class='add'>+	 */</div><div class='add'>+	if (ar-&gt;state_11d == ATH11K_11D_PREPARING &amp;&amp;</div><div class='add'>+	    test_bit(WMI_TLV_SERVICE_SUPPORT_11D_FOR_HOST_SCAN,</div><div class='add'>+		     ar-&gt;ab-&gt;wmi_ab.svc_map))</div><div class='add'>+		ath11k_mac_11d_scan_start(ar, arvif-&gt;vdev_id);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -2564,35 +4219,102 @@ static int ath11k_mac_op_hw_scan(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto exit;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;arg, 0, sizeof(arg));</div><div class='del'>-	ath11k_wmi_start_scan_init(ar, &amp;arg);</div><div class='del'>-	arg.vdev_id = arvif-&gt;vdev_id;</div><div class='del'>-	arg.scan_id = ATH11K_SCAN_ID;</div><div class='add'>+	arg = kzalloc(sizeof(*arg), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!arg) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_wmi_start_scan_init(ar, arg);</div><div class='add'>+	arg-&gt;vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+	arg-&gt;scan_id = ATH11K_SCAN_ID;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;ab-&gt;hw_params.single_pdev_only)</div><div class='add'>+		arg-&gt;scan_f_filter_prb_req = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;ie_len) {</div><div class='del'>-		arg.extraie.len = req-&gt;ie_len;</div><div class='del'>-		arg.extraie.ptr = kzalloc(req-&gt;ie_len, GFP_KERNEL);</div><div class='del'>-		memcpy(arg.extraie.ptr, req-&gt;ie, req-&gt;ie_len);</div><div class='add'>+		arg-&gt;extraie.ptr = kmemdup(req-&gt;ie, req-&gt;ie_len, GFP_KERNEL);</div><div class='add'>+		if (!arg-&gt;extraie.ptr) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		arg-&gt;extraie.len = req-&gt;ie_len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;n_ssids) {</div><div class='del'>-		arg.num_ssids = req-&gt;n_ssids;</div><div class='del'>-		for (i = 0; i &lt; arg.num_ssids; i++) {</div><div class='del'>-			arg.ssid[i].length  = req-&gt;ssids[i].ssid_len;</div><div class='del'>-			memcpy(&amp;arg.ssid[i].ssid, req-&gt;ssids[i].ssid,</div><div class='add'>+		arg-&gt;num_ssids = req-&gt;n_ssids;</div><div class='add'>+		for (i = 0; i &lt; arg-&gt;num_ssids; i++) {</div><div class='add'>+			arg-&gt;ssid[i].length  = req-&gt;ssids[i].ssid_len;</div><div class='add'>+			memcpy(&amp;arg-&gt;ssid[i].ssid, req-&gt;ssids[i].ssid,</div><div class='ctx'> 			       req-&gt;ssids[i].ssid_len);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		arg.scan_flags |= WMI_SCAN_FLAG_PASSIVE;</div><div class='add'>+		arg-&gt;scan_f_passive = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;n_channels) {</div><div class='del'>-		arg.num_chan = req-&gt;n_channels;</div><div class='del'>-		for (i = 0; i &lt; arg.num_chan; i++)</div><div class='del'>-			arg.chan_list[i] = req-&gt;channels[i]-&gt;center_freq;</div><div class='add'>+		arg-&gt;num_chan = req-&gt;n_channels;</div><div class='add'>+		arg-&gt;chan_list = kcalloc(arg-&gt;num_chan, sizeof(*arg-&gt;chan_list),</div><div class='add'>+					 GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+		if (!arg-&gt;chan_list) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; arg-&gt;num_chan; i++) {</div><div class='add'>+			if (test_bit(WMI_TLV_SERVICE_SCAN_CONFIG_PER_CHANNEL,</div><div class='add'>+				     ar-&gt;ab-&gt;wmi_ab.svc_map)) {</div><div class='add'>+				arg-&gt;chan_list[i] =</div><div class='add'>+					u32_encode_bits(req-&gt;channels[i]-&gt;center_freq,</div><div class='add'>+							WMI_SCAN_CONFIG_PER_CHANNEL_MASK);</div><div class='add'>+</div><div class='add'>+				/* If NL80211_SCAN_FLAG_COLOCATED_6GHZ is set in scan</div><div class='add'>+				 * flags, then scan all PSC channels in 6 GHz band and</div><div class='add'>+				 * those non-PSC channels where RNR IE is found during</div><div class='add'>+				 * the legacy 2.4/5 GHz scan.</div><div class='add'>+				 * If NL80211_SCAN_FLAG_COLOCATED_6GHZ is not set,</div><div class='add'>+				 * then all channels in 6 GHz will be scanned.</div><div class='add'>+				 */</div><div class='add'>+				if (req-&gt;channels[i]-&gt;band == NL80211_BAND_6GHZ &amp;&amp;</div><div class='add'>+				    req-&gt;flags &amp; NL80211_SCAN_FLAG_COLOCATED_6GHZ &amp;&amp;</div><div class='add'>+				    !cfg80211_channel_is_psc(req-&gt;channels[i]))</div><div class='add'>+					arg-&gt;chan_list[i] |=</div><div class='add'>+						WMI_SCAN_CH_FLAG_SCAN_ONLY_IF_RNR_FOUND;</div><div class='add'>+			} else {</div><div class='add'>+				arg-&gt;chan_list[i] = req-&gt;channels[i]-&gt;center_freq;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (req-&gt;flags &amp; NL80211_SCAN_FLAG_RANDOM_ADDR) {</div><div class='add'>+		arg-&gt;scan_f_add_spoofed_mac_in_probe = 1;</div><div class='add'>+		ether_addr_copy(arg-&gt;mac_addr.addr, req-&gt;mac_addr);</div><div class='add'>+		ether_addr_copy(arg-&gt;mac_mask.addr, req-&gt;mac_addr_mask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if duration is set, default dwell times will be overwritten */</div><div class='add'>+	if (req-&gt;duration) {</div><div class='add'>+		arg-&gt;dwell_time_active = req-&gt;duration;</div><div class='add'>+		arg-&gt;dwell_time_active_2g = req-&gt;duration;</div><div class='add'>+		arg-&gt;dwell_time_active_6g = req-&gt;duration;</div><div class='add'>+		arg-&gt;dwell_time_passive = req-&gt;duration;</div><div class='add'>+		arg-&gt;dwell_time_passive_6g = req-&gt;duration;</div><div class='add'>+		arg-&gt;burst_duration = req-&gt;duration;</div><div class='add'>+</div><div class='add'>+		scan_timeout = min_t(u32, arg-&gt;max_rest_time *</div><div class='add'>+				(arg-&gt;num_chan - 1) + (req-&gt;duration +</div><div class='add'>+				ATH11K_SCAN_CHANNEL_SWITCH_WMI_EVT_OVERHEAD) *</div><div class='add'>+				arg-&gt;num_chan, arg-&gt;max_scan_time);</div><div class='add'>+	} else {</div><div class='add'>+		scan_timeout = arg-&gt;max_scan_time;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_start_scan(ar, &amp;arg);</div><div class='add'>+	/* Add a margin to account for event/command processing */</div><div class='add'>+	scan_timeout += ATH11K_MAC_SCAN_CMD_EVT_OVERHEAD;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_start_scan(ar, arg);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab, "failed to start hw scan: %d\n", ret);</div><div class='ctx'> 		spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='hunk'>@@ -2600,16 +4322,21 @@ static int ath11k_mac_op_hw_scan(struct ieee80211_hw *hw,</div><div class='ctx'> 		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Add a 200ms margin to account for event/command processing */</div><div class='ctx'> 	ieee80211_queue_delayed_work(ar-&gt;hw, &amp;ar-&gt;scan.timeout,</div><div class='del'>-				     msecs_to_jiffies(arg.max_scan_time +</div><div class='del'>-						      ATH11K_MAC_SCAN_TIMEOUT_MSECS));</div><div class='add'>+				     msecs_to_jiffies(scan_timeout));</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='del'>-	if (req-&gt;ie_len)</div><div class='del'>-		kfree(arg.extraie.ptr);</div><div class='add'>+	if (arg) {</div><div class='add'>+		kfree(arg-&gt;chan_list);</div><div class='add'>+		kfree(arg-&gt;extraie.ptr);</div><div class='add'>+		kfree(arg);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;state_11d == ATH11K_11D_PREPARING)</div><div class='add'>+		ath11k_mac_11d_scan_start(ar, arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2649,15 +4376,14 @@ static int ath11k_install_key(struct ath11k_vif *arvif,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (cmd == DISABLE_KEY) {</div><div class='del'>-		/* TODO: Check if FW expects  value other than NONE for del */</div><div class='del'>-		/* arg.key_cipher = WMI_CIPHER_NONE; */</div><div class='del'>-		arg.key_len = 0;</div><div class='add'>+		arg.key_cipher = WMI_CIPHER_NONE;</div><div class='ctx'> 		arg.key_data = NULL;</div><div class='ctx'> 		goto install;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (key-&gt;cipher) {</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP_256:</div><div class='ctx'> 		arg.key_cipher = WMI_CIPHER_AES_CCM;</div><div class='ctx'> 		/* TODO: Re-check if flag is valid */</div><div class='ctx'> 		key-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_IV_MGMT;</div><div class='hunk'>@@ -2667,12 +4393,10 @@ static int ath11k_install_key(struct ath11k_vif *arvif,</div><div class='ctx'> 		arg.key_txmic_len = 8;</div><div class='ctx'> 		arg.key_rxmic_len = 8;</div><div class='ctx'> 		break;</div><div class='del'>-	case WLAN_CIPHER_SUITE_CCMP_256:</div><div class='del'>-		arg.key_cipher = WMI_CIPHER_AES_CCM;</div><div class='del'>-		break;</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_GCMP:</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='ctx'> 		arg.key_cipher = WMI_CIPHER_AES_GCM;</div><div class='add'>+		key-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_IV_MGMT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab, "cipher %d is not supported\n", key-&gt;cipher);</div><div class='hunk'>@@ -2737,6 +4461,40 @@ static int ath11k_clear_peer_keys(struct ath11k_vif *arvif,</div><div class='ctx'> 	return first_errno;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ath11k_set_group_keys(struct ath11k_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ath11k_base *ab = ar-&gt;ab;</div><div class='add'>+	const u8 *addr = arvif-&gt;bssid;</div><div class='add'>+	int i, ret, first_errno = 0;</div><div class='add'>+	struct ath11k_peer *peer;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	peer = ath11k_peer_find(ab, arvif-&gt;vdev_id, addr);</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	if (!peer)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(peer-&gt;keys); i++) {</div><div class='add'>+		struct ieee80211_key_conf *key = peer-&gt;keys[i];</div><div class='add'>+</div><div class='add'>+		if (!key || (key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = ath11k_install_key(arvif, key, SET_KEY, addr,</div><div class='add'>+					 WMI_KEY_GROUP);</div><div class='add'>+		if (ret &lt; 0 &amp;&amp; first_errno == 0)</div><div class='add'>+			first_errno = ret;</div><div class='add'>+</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			ath11k_warn(ab, "failed to set group key of idx %d for vdev %d: %d\n",</div><div class='add'>+				    i, arvif-&gt;vdev_id, ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return first_errno;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath11k_mac_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 				 struct ieee80211_vif *vif, struct ieee80211_sta *sta,</div><div class='ctx'> 				 struct ieee80211_key_conf *key)</div><div class='hunk'>@@ -2746,6 +4504,7 @@ static int ath11k_mac_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> 	struct ath11k_peer *peer;</div><div class='ctx'> 	struct ath11k_sta *arsta;</div><div class='add'>+	bool is_ap_with_no_sta;</div><div class='ctx'> 	const u8 *peer_addr;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u32 flags = 0;</div><div class='hunk'>@@ -2779,6 +4538,12 @@ static int ath11k_mac_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='ctx'> 	peer = ath11k_peer_find(ab, arvif-&gt;vdev_id, peer_addr);</div><div class='add'>+</div><div class='add'>+	/* flush the fragments cache during key (re)install to</div><div class='add'>+	 * ensure all frags in the new frag list belong to the same key.</div><div class='add'>+	 */</div><div class='add'>+	if (peer &amp;&amp; sta &amp;&amp; cmd == SET_KEY)</div><div class='add'>+		ath11k_peer_frags_flush(ar, peer);</div><div class='ctx'> 	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!peer) {</div><div class='hunk'>@@ -2796,20 +4561,61 @@ static int ath11k_mac_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE)</div><div class='del'>-		flags |= WMI_KEY_PAIRWISE;</div><div class='add'>+		flags = WMI_KEY_PAIRWISE;</div><div class='ctx'> 	else</div><div class='del'>-		flags |= WMI_KEY_GROUP;</div><div class='add'>+		flags = WMI_KEY_GROUP;</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_install_key(arvif, key, cmd, peer_addr, flags);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ath11k_warn(ab, "ath11k_install_key failed (%d)\n", ret);</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='add'>+		   "%s for peer %pM on vdev %d flags 0x%X, type = %d, num_sta %d\n",</div><div class='add'>+		   cmd == SET_KEY ? "SET_KEY" : "DEL_KEY", peer_addr, arvif-&gt;vdev_id,</div><div class='add'>+		   flags, arvif-&gt;vdev_type, arvif-&gt;num_stations);</div><div class='add'>+</div><div class='add'>+	/* Allow group key clearing only in AP mode when no stations are</div><div class='add'>+	 * associated. There is a known race condition in firmware where</div><div class='add'>+	 * group addressed packets may be dropped if the key is cleared</div><div class='add'>+	 * and immediately set again during rekey.</div><div class='add'>+	 *</div><div class='add'>+	 * During GTK rekey, mac80211 issues a clear key (if the old key</div><div class='add'>+	 * exists) followed by an install key operation for same key</div><div class='add'>+	 * index. This causes ath11k to send two WMI commands in quick</div><div class='add'>+	 * succession: one to clear the old key and another to install the</div><div class='add'>+	 * new key in the same slot.</div><div class='add'>+	 *</div><div class='add'>+	 * Under certain conditions—especially under high load or time</div><div class='add'>+	 * sensitive scenarios, firmware may process these commands</div><div class='add'>+	 * asynchronously in a way that firmware assumes the key is</div><div class='add'>+	 * cleared whereas hardware has a valid key. This inconsistency</div><div class='add'>+	 * between hardware and firmware leads to group addressed packet</div><div class='add'>+	 * drops after rekey.</div><div class='add'>+	 * Only setting the same key again can restore a valid key in</div><div class='add'>+	 * firmware and allow packets to be transmitted.</div><div class='add'>+	 *</div><div class='add'>+	 * There is a use case where an AP can transition from Secure mode</div><div class='add'>+	 * to open mode without a vdev restart by just deleting all</div><div class='add'>+	 * associated peers and clearing key, Hence allow clear key for</div><div class='add'>+	 * that case alone. Mark arvif-&gt;reinstall_group_keys in such cases</div><div class='add'>+	 * and reinstall the same key when the first peer is added,</div><div class='add'>+	 * allowing firmware to recover from the race if it had occurred.</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_dp_peer_rx_pn_replay_config(arvif, peer_addr, cmd, key);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ath11k_warn(ab, "failed to offload PN replay detection %d\n", ret);</div><div class='del'>-		goto exit;</div><div class='add'>+	is_ap_with_no_sta = (vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+			     !arvif-&gt;num_stations);</div><div class='add'>+	if (flags == WMI_KEY_PAIRWISE || cmd == SET_KEY || is_ap_with_no_sta) {</div><div class='add'>+		ret = ath11k_install_key(arvif, key, cmd, peer_addr, flags);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ab, "ath11k_install_key failed (%d)\n", ret);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ath11k_dp_peer_rx_pn_replay_config(arvif, peer_addr, cmd, key);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ab, "failed to offload PN replay detection %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (flags == WMI_KEY_GROUP &amp;&amp; cmd == SET_KEY &amp;&amp; is_ap_with_no_sta)</div><div class='add'>+			arvif-&gt;reinstall_group_keys = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='hunk'>@@ -2834,7 +4640,7 @@ static int ath11k_mac_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 		ath11k_warn(ab, "peer %pM disappeared!\n", peer_addr);</div><div class='ctx'> </div><div class='ctx'> 	if (sta) {</div><div class='del'>-		arsta = (struct ath11k_sta *)sta-&gt;drv_priv;</div><div class='add'>+		arsta = ath11k_sta_to_arsta(sta);</div><div class='ctx'> </div><div class='ctx'> 		switch (key-&gt;cipher) {</div><div class='ctx'> 		case WLAN_CIPHER_SUITE_TKIP:</div><div class='hunk'>@@ -2861,6 +4667,20 @@ exit:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='add'>+ath11k_mac_bitrate_mask_num_ht_rates(struct ath11k *ar,</div><div class='add'>+				     enum nl80211_band band,</div><div class='add'>+				     const struct cfg80211_bitrate_mask *mask)</div><div class='add'>+{</div><div class='add'>+	int num_rates = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mask-&gt;control[band].ht_mcs); i++)</div><div class='add'>+		num_rates += hweight8(mask-&gt;control[band].ht_mcs[i]);</div><div class='add'>+</div><div class='add'>+	return num_rates;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='ctx'> ath11k_mac_bitrate_mask_num_vht_rates(struct ath11k *ar,</div><div class='ctx'> 				      enum nl80211_band band,</div><div class='ctx'> 				      const struct cfg80211_bitrate_mask *mask)</div><div class='hunk'>@@ -2875,6 +4695,20 @@ ath11k_mac_bitrate_mask_num_vht_rates(struct ath11k *ar,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='add'>+ath11k_mac_bitrate_mask_num_he_rates(struct ath11k *ar,</div><div class='add'>+				     enum nl80211_band band,</div><div class='add'>+				     const struct cfg80211_bitrate_mask *mask)</div><div class='add'>+{</div><div class='add'>+	int num_rates = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mask-&gt;control[band].he_mcs); i++)</div><div class='add'>+		num_rates += hweight16(mask-&gt;control[band].he_mcs[i]);</div><div class='add'>+</div><div class='add'>+	return num_rates;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='ctx'> ath11k_mac_set_peer_vht_fixed_rate(struct ath11k_vif *arvif,</div><div class='ctx'> 				   struct ieee80211_sta *sta,</div><div class='ctx'> 				   const struct cfg80211_bitrate_mask *mask,</div><div class='hunk'>@@ -2902,6 +4736,10 @@ ath11k_mac_set_peer_vht_fixed_rate(struct ath11k_vif *arvif,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Avoid updating invalid nss as fixed rate*/</div><div class='add'>+	if (nss &gt; sta-&gt;deflink.rx_nss)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='ctx'> 		   "Setting Fixed VHT Rate for peer %pM. Device will not switch to any other selected rates",</div><div class='ctx'> 		   sta-&gt;addr);</div><div class='hunk'>@@ -2920,6 +4758,105 @@ ath11k_mac_set_peer_vht_fixed_rate(struct ath11k_vif *arvif,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+ath11k_mac_set_peer_he_fixed_rate(struct ath11k_vif *arvif,</div><div class='add'>+				  struct ieee80211_sta *sta,</div><div class='add'>+				  const struct cfg80211_bitrate_mask *mask,</div><div class='add'>+				  enum nl80211_band band)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = arvif-&gt;ar;</div><div class='add'>+	u8 he_rate, nss;</div><div class='add'>+	u32 rate_code;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	nss = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mask-&gt;control[band].he_mcs); i++) {</div><div class='add'>+		if (hweight16(mask-&gt;control[band].he_mcs[i]) == 1) {</div><div class='add'>+			nss = i + 1;</div><div class='add'>+			he_rate = ffs(mask-&gt;control[band].he_mcs[i]) - 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!nss) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "No single he fixed rate found to set for %pM",</div><div class='add'>+			    sta-&gt;addr);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Avoid updating invalid nss as fixed rate */</div><div class='add'>+	if (nss &gt; sta-&gt;deflink.rx_nss)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='add'>+		   "setting fixed he rate for peer %pM, device will not switch to any other selected rates",</div><div class='add'>+		   sta-&gt;addr);</div><div class='add'>+</div><div class='add'>+	rate_code = ATH11K_HW_RATE_CODE(he_rate, nss - 1,</div><div class='add'>+					WMI_RATE_PREAMBLE_HE);</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_set_peer_param(ar, sta-&gt;addr,</div><div class='add'>+					arvif-&gt;vdev_id,</div><div class='add'>+					WMI_PEER_PARAM_FIXED_RATE,</div><div class='add'>+					rate_code);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath11k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to update sta %pM fixed rate %d: %d\n",</div><div class='add'>+			    sta-&gt;addr, rate_code, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath11k_mac_set_peer_ht_fixed_rate(struct ath11k_vif *arvif,</div><div class='add'>+				  struct ieee80211_sta *sta,</div><div class='add'>+				  const struct cfg80211_bitrate_mask *mask,</div><div class='add'>+				  enum nl80211_band band)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = arvif-&gt;ar;</div><div class='add'>+	u8 ht_rate, nss = 0;</div><div class='add'>+	u32 rate_code;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mask-&gt;control[band].ht_mcs); i++) {</div><div class='add'>+		if (hweight8(mask-&gt;control[band].ht_mcs[i]) == 1) {</div><div class='add'>+			nss = i + 1;</div><div class='add'>+			ht_rate = ffs(mask-&gt;control[band].ht_mcs[i]) - 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!nss) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "No single HT Fixed rate found to set for %pM",</div><div class='add'>+			    sta-&gt;addr);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Avoid updating invalid nss as fixed rate*/</div><div class='add'>+	if (nss &gt; sta-&gt;deflink.rx_nss)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='add'>+		   "Setting Fixed HT Rate for peer %pM. Device will not switch to any other selected rates",</div><div class='add'>+		   sta-&gt;addr);</div><div class='add'>+</div><div class='add'>+	rate_code = ATH11K_HW_RATE_CODE(ht_rate, nss - 1,</div><div class='add'>+					WMI_RATE_PREAMBLE_HT);</div><div class='add'>+	ret = ath11k_wmi_set_peer_param(ar, sta-&gt;addr,</div><div class='add'>+					arvif-&gt;vdev_id,</div><div class='add'>+					WMI_PEER_PARAM_FIXED_RATE,</div><div class='add'>+					rate_code);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath11k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to update STA %pM HT Fixed Rate %d: %d\n",</div><div class='add'>+			    sta-&gt;addr, rate_code, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath11k_station_assoc(struct ath11k *ar,</div><div class='ctx'> 				struct ieee80211_vif *vif,</div><div class='ctx'> 				struct ieee80211_sta *sta,</div><div class='hunk'>@@ -2931,7 +4868,7 @@ static int ath11k_station_assoc(struct ath11k *ar,</div><div class='ctx'> 	struct cfg80211_chan_def def;</div><div class='ctx'> 	enum nl80211_band band;</div><div class='ctx'> 	struct cfg80211_bitrate_mask *mask;</div><div class='del'>-	u8 num_vht_rates;</div><div class='add'>+	u8 num_ht_rates, num_vht_rates, num_he_rates;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -2943,6 +4880,7 @@ static int ath11k_station_assoc(struct ath11k *ar,</div><div class='ctx'> </div><div class='ctx'> 	ath11k_peer_assoc_prepare(ar, vif, sta, &amp;peer_arg, reassoc);</div><div class='ctx'> </div><div class='add'>+	peer_arg.is_assoc = true;</div><div class='ctx'> 	ret = ath11k_wmi_send_peer_assoc_cmd(ar, &amp;peer_arg);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab, "failed to run peer assoc for STA %pM vdev %i: %d\n",</div><div class='hunk'>@@ -2957,17 +4895,29 @@ static int ath11k_station_assoc(struct ath11k *ar,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	num_vht_rates = ath11k_mac_bitrate_mask_num_vht_rates(ar, band, mask);</div><div class='add'>+	num_he_rates = ath11k_mac_bitrate_mask_num_he_rates(ar, band, mask);</div><div class='add'>+	num_ht_rates = ath11k_mac_bitrate_mask_num_ht_rates(ar, band, mask);</div><div class='ctx'> </div><div class='del'>-	/* If single VHT rate is configured (by set_bitrate_mask()),</div><div class='del'>-	 * peer_assoc will disable VHT. This is now enabled by a peer specific</div><div class='add'>+	/* If single VHT/HE rate is configured (by set_bitrate_mask()),</div><div class='add'>+	 * peer_assoc will disable VHT/HE. This is now enabled by a peer specific</div><div class='ctx'> 	 * fixed param.</div><div class='ctx'> 	 * Note that all other rates and NSS will be disabled for this peer.</div><div class='ctx'> 	 */</div><div class='del'>-	if (sta-&gt;vht_cap.vht_supported &amp;&amp; num_vht_rates == 1) {</div><div class='add'>+	if (sta-&gt;deflink.vht_cap.vht_supported &amp;&amp; num_vht_rates == 1) {</div><div class='ctx'> 		ret = ath11k_mac_set_peer_vht_fixed_rate(arvif, sta, mask,</div><div class='ctx'> 							 band);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='add'>+	} else if (sta-&gt;deflink.he_cap.has_he &amp;&amp; num_he_rates == 1) {</div><div class='add'>+		ret = ath11k_mac_set_peer_he_fixed_rate(arvif, sta, mask,</div><div class='add'>+							band);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	} else if (sta-&gt;deflink.ht_cap.ht_supported &amp;&amp; num_ht_rates == 1) {</div><div class='add'>+		ret = ath11k_mac_set_peer_ht_fixed_rate(arvif, sta, mask,</div><div class='add'>+							band);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Re-assoc is run only to update supported rates for given station. It</div><div class='hunk'>@@ -2977,7 +4927,8 @@ static int ath11k_station_assoc(struct ath11k *ar,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_setup_peer_smps(ar, arvif, sta-&gt;addr,</div><div class='del'>-				     &amp;sta-&gt;ht_cap);</div><div class='add'>+				     &amp;sta-&gt;deflink.ht_cap,</div><div class='add'>+				     le16_to_cpu(sta-&gt;deflink.he_6ghz_capa.capa));</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab, "failed to setup peer SMPS for vdev %d: %d\n",</div><div class='ctx'> 			    arvif-&gt;vdev_id, ret);</div><div class='hunk'>@@ -3007,7 +4958,7 @@ static int ath11k_station_disassoc(struct ath11k *ar,</div><div class='ctx'> 				   struct ieee80211_vif *vif,</div><div class='ctx'> 				   struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='hunk'>@@ -3028,6 +4979,14 @@ static int ath11k_station_disassoc(struct ath11k *ar,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 ath11k_mac_max_nss(const u8 *ht_mcs_mask, const u16 *vht_mcs_mask,</div><div class='add'>+			      const u16 *he_mcs_mask)</div><div class='add'>+{</div><div class='add'>+	return max3(ath11k_mac_max_ht_nss(ht_mcs_mask),</div><div class='add'>+		    ath11k_mac_max_vht_nss(vht_mcs_mask),</div><div class='add'>+		    ath11k_mac_max_he_nss(he_mcs_mask));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath11k_sta_rc_update_wk(struct work_struct *wk)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar;</div><div class='hunk'>@@ -3038,10 +4997,12 @@ static void ath11k_sta_rc_update_wk(struct work_struct *wk)</div><div class='ctx'> 	enum nl80211_band band;</div><div class='ctx'> 	const u8 *ht_mcs_mask;</div><div class='ctx'> 	const u16 *vht_mcs_mask;</div><div class='del'>-	u32 changed, bw, nss, smps;</div><div class='del'>-	int err, num_vht_rates;</div><div class='add'>+	const u16 *he_mcs_mask;</div><div class='add'>+	u32 changed, bw, nss, smps, bw_prev;</div><div class='add'>+	int err, num_ht_rates, num_vht_rates, num_he_rates;</div><div class='ctx'> 	const struct cfg80211_bitrate_mask *mask;</div><div class='ctx'> 	struct peer_assoc_params peer_arg;</div><div class='add'>+	enum wmi_phy_mode peer_phymode;</div><div class='ctx'> </div><div class='ctx'> 	arsta = container_of(wk, struct ath11k_sta, update_wk);</div><div class='ctx'> 	sta = container_of((void *)arsta, struct ieee80211_sta, drv_priv);</div><div class='hunk'>@@ -3054,6 +5015,7 @@ static void ath11k_sta_rc_update_wk(struct work_struct *wk)</div><div class='ctx'> 	band = def.chan-&gt;band;</div><div class='ctx'> 	ht_mcs_mask = arvif-&gt;bitrate_mask.control[band].ht_mcs;</div><div class='ctx'> 	vht_mcs_mask = arvif-&gt;bitrate_mask.control[band].vht_mcs;</div><div class='add'>+	he_mcs_mask = arvif-&gt;bitrate_mask.control[band].he_mcs;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -3061,6 +5023,7 @@ static void ath11k_sta_rc_update_wk(struct work_struct *wk)</div><div class='ctx'> 	arsta-&gt;changed = 0;</div><div class='ctx'> </div><div class='ctx'> 	bw = arsta-&gt;bw;</div><div class='add'>+	bw_prev = arsta-&gt;bw_prev;</div><div class='ctx'> 	nss = arsta-&gt;nss;</div><div class='ctx'> 	smps = arsta-&gt;smps;</div><div class='ctx'> </div><div class='hunk'>@@ -3069,19 +5032,65 @@ static void ath11k_sta_rc_update_wk(struct work_struct *wk)</div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='ctx'> 	nss = max_t(u32, 1, nss);</div><div class='del'>-	nss = min(nss, max(ath11k_mac_max_ht_nss(ht_mcs_mask),</div><div class='del'>-			   ath11k_mac_max_vht_nss(vht_mcs_mask)));</div><div class='add'>+	nss = min(nss, ath11k_mac_max_nss(ht_mcs_mask, vht_mcs_mask, he_mcs_mask));</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; IEEE80211_RC_BW_CHANGED) {</div><div class='del'>-		err = ath11k_wmi_set_peer_param(ar, sta-&gt;addr, arvif-&gt;vdev_id,</div><div class='del'>-						WMI_PEER_CHWIDTH, bw);</div><div class='del'>-		if (err)</div><div class='del'>-			ath11k_warn(ar-&gt;ab, "failed to update STA %pM peer bw %d: %d\n",</div><div class='del'>-				    sta-&gt;addr, bw, err);</div><div class='add'>+		/* Get the peer phymode */</div><div class='add'>+		ath11k_peer_assoc_h_phymode(ar, arvif-&gt;vif, sta, &amp;peer_arg);</div><div class='add'>+		peer_phymode = peer_arg.peer_phymode;</div><div class='add'>+</div><div class='add'>+		ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "update sta %pM peer bw %d phymode %d\n",</div><div class='add'>+			   sta-&gt;addr, bw, peer_phymode);</div><div class='add'>+</div><div class='add'>+		if (bw &gt; bw_prev) {</div><div class='add'>+			/* BW is upgraded. In this case we send WMI_PEER_PHYMODE</div><div class='add'>+			 * followed by WMI_PEER_CHWIDTH</div><div class='add'>+			 */</div><div class='add'>+			ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "BW upgrade for sta %pM new BW %d, old BW %d\n",</div><div class='add'>+				   sta-&gt;addr, bw, bw_prev);</div><div class='add'>+</div><div class='add'>+			err = ath11k_wmi_set_peer_param(ar, sta-&gt;addr, arvif-&gt;vdev_id,</div><div class='add'>+							WMI_PEER_PHYMODE, peer_phymode);</div><div class='add'>+</div><div class='add'>+			if (err) {</div><div class='add'>+				ath11k_warn(ar-&gt;ab, "failed to update STA %pM peer phymode %d: %d\n",</div><div class='add'>+					    sta-&gt;addr, peer_phymode, err);</div><div class='add'>+				goto err_rc_bw_changed;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			err = ath11k_wmi_set_peer_param(ar, sta-&gt;addr, arvif-&gt;vdev_id,</div><div class='add'>+							WMI_PEER_CHWIDTH, bw);</div><div class='add'>+</div><div class='add'>+			if (err)</div><div class='add'>+				ath11k_warn(ar-&gt;ab, "failed to update STA %pM peer bw %d: %d\n",</div><div class='add'>+					    sta-&gt;addr, bw, err);</div><div class='add'>+		} else {</div><div class='add'>+			/* BW is downgraded. In this case we send WMI_PEER_CHWIDTH</div><div class='add'>+			 * followed by WMI_PEER_PHYMODE</div><div class='add'>+			 */</div><div class='add'>+			ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "BW downgrade for sta %pM new BW %d,old BW %d\n",</div><div class='add'>+				   sta-&gt;addr, bw, bw_prev);</div><div class='add'>+</div><div class='add'>+			err = ath11k_wmi_set_peer_param(ar, sta-&gt;addr, arvif-&gt;vdev_id,</div><div class='add'>+							WMI_PEER_CHWIDTH, bw);</div><div class='add'>+</div><div class='add'>+			if (err) {</div><div class='add'>+				ath11k_warn(ar-&gt;ab, "failed to update STA %pM peer bw %d: %d\n",</div><div class='add'>+					    sta-&gt;addr, bw, err);</div><div class='add'>+				goto err_rc_bw_changed;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			err = ath11k_wmi_set_peer_param(ar, sta-&gt;addr, arvif-&gt;vdev_id,</div><div class='add'>+							WMI_PEER_PHYMODE, peer_phymode);</div><div class='add'>+</div><div class='add'>+			if (err)</div><div class='add'>+				ath11k_warn(ar-&gt;ab, "failed to update STA %pM peer phymode %d: %d\n",</div><div class='add'>+					    sta-&gt;addr, peer_phymode, err);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; IEEE80211_RC_NSS_CHANGED) {</div><div class='del'>-		ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "mac update sta %pM nss %d\n",</div><div class='add'>+		ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "update sta %pM nss %d\n",</div><div class='ctx'> 			   sta-&gt;addr, nss);</div><div class='ctx'> </div><div class='ctx'> 		err = ath11k_wmi_set_peer_param(ar, sta-&gt;addr, arvif-&gt;vdev_id,</div><div class='hunk'>@@ -3092,7 +5101,7 @@ static void ath11k_sta_rc_update_wk(struct work_struct *wk)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; IEEE80211_RC_SMPS_CHANGED) {</div><div class='del'>-		ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "mac update sta %pM smps %d\n",</div><div class='add'>+		ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "update sta %pM smps %d\n",</div><div class='ctx'> 			   sta-&gt;addr, smps);</div><div class='ctx'> </div><div class='ctx'> 		err = ath11k_wmi_set_peer_param(ar, sta-&gt;addr, arvif-&gt;vdev_id,</div><div class='hunk'>@@ -3104,8 +5113,12 @@ static void ath11k_sta_rc_update_wk(struct work_struct *wk)</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; IEEE80211_RC_SUPP_RATES_CHANGED) {</div><div class='ctx'> 		mask = &amp;arvif-&gt;bitrate_mask;</div><div class='add'>+		num_ht_rates = ath11k_mac_bitrate_mask_num_ht_rates(ar, band,</div><div class='add'>+								    mask);</div><div class='ctx'> 		num_vht_rates = ath11k_mac_bitrate_mask_num_vht_rates(ar, band,</div><div class='ctx'> 								      mask);</div><div class='add'>+		num_he_rates = ath11k_mac_bitrate_mask_num_he_rates(ar, band,</div><div class='add'>+								    mask);</div><div class='ctx'> </div><div class='ctx'> 		/* Peer_assoc_prepare will reject vht rates in</div><div class='ctx'> 		 * bitrate_mask if its not available in range format and</div><div class='hunk'>@@ -3118,17 +5131,35 @@ static void ath11k_sta_rc_update_wk(struct work_struct *wk)</div><div class='ctx'> 		 * TODO: Check RATEMASK_CMDID to support auto rates selection</div><div class='ctx'> 		 * across HT/VHT and for multiple VHT MCS support.</div><div class='ctx'> 		 */</div><div class='del'>-		if (sta-&gt;vht_cap.vht_supported &amp;&amp; num_vht_rates == 1) {</div><div class='add'>+		if (sta-&gt;deflink.vht_cap.vht_supported &amp;&amp; num_vht_rates == 1) {</div><div class='ctx'> 			ath11k_mac_set_peer_vht_fixed_rate(arvif, sta, mask,</div><div class='ctx'> 							   band);</div><div class='add'>+		} else if (sta-&gt;deflink.he_cap.has_he &amp;&amp; num_he_rates == 1) {</div><div class='add'>+			ath11k_mac_set_peer_he_fixed_rate(arvif, sta, mask,</div><div class='add'>+							  band);</div><div class='add'>+		} else if (sta-&gt;deflink.ht_cap.ht_supported &amp;&amp; num_ht_rates == 1) {</div><div class='add'>+			ath11k_mac_set_peer_ht_fixed_rate(arvif, sta, mask,</div><div class='add'>+							  band);</div><div class='ctx'> 		} else {</div><div class='del'>-			/* If the peer is non-VHT or no fixed VHT rate</div><div class='add'>+			/* If the peer is non-VHT/HE or no fixed VHT/HE rate</div><div class='ctx'> 			 * is provided in the new bitrate mask we set the</div><div class='del'>-			 * other rates using peer_assoc command.</div><div class='add'>+			 * other rates using peer_assoc command. Also clear</div><div class='add'>+			 * the peer fixed rate settings as it has higher proprity</div><div class='add'>+			 * than peer assoc</div><div class='ctx'> 			 */</div><div class='add'>+			err = ath11k_wmi_set_peer_param(ar, sta-&gt;addr,</div><div class='add'>+							arvif-&gt;vdev_id,</div><div class='add'>+							WMI_PEER_PARAM_FIXED_RATE,</div><div class='add'>+							WMI_FIXED_RATE_NONE);</div><div class='add'>+			if (err)</div><div class='add'>+				ath11k_warn(ar-&gt;ab,</div><div class='add'>+					    "failed to disable peer fixed rate for sta %pM: %d\n",</div><div class='add'>+					    sta-&gt;addr, err);</div><div class='add'>+</div><div class='ctx'> 			ath11k_peer_assoc_prepare(ar, arvif-&gt;vif, sta,</div><div class='ctx'> 						  &amp;peer_arg, true);</div><div class='ctx'> </div><div class='add'>+			peer_arg.is_assoc = false;</div><div class='ctx'> 			err = ath11k_wmi_send_peer_assoc_cmd(ar, &amp;peer_arg);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				ath11k_warn(ar-&gt;ab, "failed to run peer assoc for STA %pM vdev %i: %d\n",</div><div class='hunk'>@@ -3140,9 +5171,35 @@ static void ath11k_sta_rc_update_wk(struct work_struct *wk)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+err_rc_bw_changed:</div><div class='ctx'> 	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ath11k_sta_set_4addr_wk(struct work_struct *wk)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar;</div><div class='add'>+	struct ath11k_vif *arvif;</div><div class='add'>+	struct ath11k_sta *arsta;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	arsta = container_of(wk, struct ath11k_sta, set_4addr_wk);</div><div class='add'>+	sta = container_of((void *)arsta, struct ieee80211_sta, drv_priv);</div><div class='add'>+	arvif = arsta-&gt;arvif;</div><div class='add'>+	ar = arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='add'>+		   "setting USE_4ADDR for peer %pM\n", sta-&gt;addr);</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_set_peer_param(ar, sta-&gt;addr,</div><div class='add'>+					arvif-&gt;vdev_id,</div><div class='add'>+					WMI_PEER_USE_4ADDR, 1);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to set peer %pM 4addr capability: %d\n",</div><div class='add'>+			    sta-&gt;addr, ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath11k_mac_inc_num_stations(struct ath11k_vif *arvif,</div><div class='ctx'> 				       struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='hunk'>@@ -3157,6 +5214,7 @@ static int ath11k_mac_inc_num_stations(struct ath11k_vif *arvif,</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;num_stations++;</div><div class='add'>+	arvif-&gt;num_stations++;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3172,180 +5230,35 @@ static void ath11k_mac_dec_num_stations(struct ath11k_vif *arvif,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;num_stations--;</div><div class='add'>+	arvif-&gt;num_stations--;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_mac_station_add(struct ath11k *ar,</div><div class='del'>-				  struct ieee80211_vif *vif,</div><div class='del'>-				  struct ieee80211_sta *sta)</div><div class='add'>+static u32 ath11k_mac_ieee80211_sta_bw_to_wmi(struct ath11k *ar,</div><div class='add'>+					      struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_base *ab = ar-&gt;ab;</div><div class='del'>-	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='del'>-	struct ath11k_sta *arsta = (struct ath11k_sta *)sta-&gt;drv_priv;</div><div class='del'>-	struct peer_create_params peer_param;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='del'>-</div><div class='del'>-	ret = ath11k_mac_inc_num_stations(arvif, sta);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ath11k_warn(ab, "refusing to associate station: too many connected already (%d)\n",</div><div class='del'>-			    ar-&gt;max_num_stations);</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	arsta-&gt;rx_stats = kzalloc(sizeof(*arsta-&gt;rx_stats), GFP_KERNEL);</div><div class='del'>-	if (!arsta-&gt;rx_stats) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto dec_num_station;</div><div class='del'>-	}</div><div class='add'>+	u32 bw = WMI_PEER_CHWIDTH_20MHZ;</div><div class='ctx'> </div><div class='del'>-	peer_param.vdev_id = arvif-&gt;vdev_id;</div><div class='del'>-	peer_param.peer_addr = sta-&gt;addr;</div><div class='del'>-	peer_param.peer_type = WMI_PEER_TYPE_DEFAULT;</div><div class='del'>-</div><div class='del'>-	ret = ath11k_peer_create(ar, arvif, sta, &amp;peer_param);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ath11k_warn(ab, "Failed to add peer: %pM for VDEV: %d\n",</div><div class='del'>-			    sta-&gt;addr, arvif-&gt;vdev_id);</div><div class='del'>-		goto free_rx_stats;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_MAC, "Added peer: %pM for VDEV: %d\n",</div><div class='del'>-		   sta-&gt;addr, arvif-&gt;vdev_id);</div><div class='del'>-</div><div class='del'>-	if (ath11k_debugfs_is_extd_tx_stats_enabled(ar)) {</div><div class='del'>-		arsta-&gt;tx_stats = kzalloc(sizeof(*arsta-&gt;tx_stats), GFP_KERNEL);</div><div class='del'>-		if (!arsta-&gt;tx_stats) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto free_peer;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ieee80211_vif_is_mesh(vif)) {</div><div class='del'>-		ret = ath11k_wmi_set_peer_param(ar, sta-&gt;addr,</div><div class='del'>-						arvif-&gt;vdev_id,</div><div class='del'>-						WMI_PEER_USE_4ADDR, 1);</div><div class='del'>-		if (ret) {</div><div class='del'>-			ath11k_warn(ab, "failed to STA %pM 4addr capability: %d\n",</div><div class='del'>-				    sta-&gt;addr, ret);</div><div class='del'>-			goto free_tx_stats;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = ath11k_dp_peer_setup(ar, arvif-&gt;vdev_id, sta-&gt;addr);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ath11k_warn(ab, "failed to setup dp for peer %pM on vdev %i (%d)\n",</div><div class='del'>-			    sta-&gt;addr, arvif-&gt;vdev_id, ret);</div><div class='del'>-		goto free_tx_stats;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ab-&gt;hw_params.vdev_start_delay &amp;&amp;</div><div class='del'>-	    !arvif-&gt;is_started &amp;&amp;</div><div class='del'>-	    arvif-&gt;vdev_type != WMI_VDEV_TYPE_AP) {</div><div class='del'>-		ret = ath11k_start_vdev_delay(ar-&gt;hw, vif);</div><div class='del'>-		if (ret) {</div><div class='del'>-			ath11k_warn(ab, "failed to delay vdev start: %d\n", ret);</div><div class='del'>-			goto free_tx_stats;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-free_tx_stats:</div><div class='del'>-	kfree(arsta-&gt;tx_stats);</div><div class='del'>-	arsta-&gt;tx_stats = NULL;</div><div class='del'>-free_peer:</div><div class='del'>-	ath11k_peer_delete(ar, arvif-&gt;vdev_id, sta-&gt;addr);</div><div class='del'>-free_rx_stats:</div><div class='del'>-	kfree(arsta-&gt;rx_stats);</div><div class='del'>-	arsta-&gt;rx_stats = NULL;</div><div class='del'>-dec_num_station:</div><div class='del'>-	ath11k_mac_dec_num_stations(arvif, sta);</div><div class='del'>-exit:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ath11k_mac_op_sta_state(struct ieee80211_hw *hw,</div><div class='del'>-				   struct ieee80211_vif *vif,</div><div class='del'>-				   struct ieee80211_sta *sta,</div><div class='del'>-				   enum ieee80211_sta_state old_state,</div><div class='del'>-				   enum ieee80211_sta_state new_state)</div><div class='del'>-{</div><div class='del'>-	struct ath11k *ar = hw-&gt;priv;</div><div class='del'>-	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='del'>-	struct ath11k_sta *arsta = (struct ath11k_sta *)sta-&gt;drv_priv;</div><div class='del'>-	struct ath11k_peer *peer;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/* cancel must be done outside the mutex to avoid deadlock */</div><div class='del'>-	if ((old_state == IEEE80211_STA_NONE &amp;&amp;</div><div class='del'>-	     new_state == IEEE80211_STA_NOTEXIST))</div><div class='del'>-		cancel_work_sync(&amp;arsta-&gt;update_wk);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='del'>-</div><div class='del'>-	if (old_state == IEEE80211_STA_NOTEXIST &amp;&amp;</div><div class='del'>-	    new_state == IEEE80211_STA_NONE) {</div><div class='del'>-		memset(arsta, 0, sizeof(*arsta));</div><div class='del'>-		arsta-&gt;arvif = arvif;</div><div class='del'>-		INIT_WORK(&amp;arsta-&gt;update_wk, ath11k_sta_rc_update_wk);</div><div class='del'>-</div><div class='del'>-		ret = ath11k_mac_station_add(ar, vif, sta);</div><div class='del'>-		if (ret)</div><div class='del'>-			ath11k_warn(ar-&gt;ab, "Failed to add station: %pM for VDEV: %d\n",</div><div class='del'>-				    sta-&gt;addr, arvif-&gt;vdev_id);</div><div class='del'>-	} else if ((old_state == IEEE80211_STA_NONE &amp;&amp;</div><div class='del'>-		    new_state == IEEE80211_STA_NOTEXIST)) {</div><div class='del'>-		ath11k_dp_peer_cleanup(ar, arvif-&gt;vdev_id, sta-&gt;addr);</div><div class='del'>-</div><div class='del'>-		ret = ath11k_peer_delete(ar, arvif-&gt;vdev_id, sta-&gt;addr);</div><div class='del'>-		if (ret)</div><div class='del'>-			ath11k_warn(ar-&gt;ab, "Failed to delete peer: %pM for VDEV: %d\n",</div><div class='del'>-				    sta-&gt;addr, arvif-&gt;vdev_id);</div><div class='del'>-		else</div><div class='del'>-			ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "Removed peer: %pM for VDEV: %d\n",</div><div class='del'>-				   sta-&gt;addr, arvif-&gt;vdev_id);</div><div class='del'>-</div><div class='del'>-		ath11k_mac_dec_num_stations(arvif, sta);</div><div class='del'>-		spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='del'>-		peer = ath11k_peer_find(ar-&gt;ab, arvif-&gt;vdev_id, sta-&gt;addr);</div><div class='del'>-		if (peer &amp;&amp; peer-&gt;sta == sta) {</div><div class='del'>-			ath11k_warn(ar-&gt;ab, "Found peer entry %pM n vdev %i after it was supposedly removed\n",</div><div class='del'>-				    vif-&gt;addr, arvif-&gt;vdev_id);</div><div class='del'>-			peer-&gt;sta = NULL;</div><div class='del'>-			list_del(&amp;peer-&gt;list);</div><div class='del'>-			kfree(peer);</div><div class='del'>-			ar-&gt;num_peers--;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='del'>-</div><div class='del'>-		kfree(arsta-&gt;tx_stats);</div><div class='del'>-		arsta-&gt;tx_stats = NULL;</div><div class='del'>-</div><div class='del'>-		kfree(arsta-&gt;rx_stats);</div><div class='del'>-		arsta-&gt;rx_stats = NULL;</div><div class='del'>-	} else if (old_state == IEEE80211_STA_AUTH &amp;&amp;</div><div class='del'>-		   new_state == IEEE80211_STA_ASSOC &amp;&amp;</div><div class='del'>-		   (vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='del'>-		    vif-&gt;type == NL80211_IFTYPE_MESH_POINT ||</div><div class='del'>-		    vif-&gt;type == NL80211_IFTYPE_ADHOC)) {</div><div class='del'>-		ret = ath11k_station_assoc(ar, vif, sta, false);</div><div class='del'>-		if (ret)</div><div class='del'>-			ath11k_warn(ar-&gt;ab, "Failed to associate station: %pM\n",</div><div class='del'>-				    sta-&gt;addr);</div><div class='del'>-	} else if (old_state == IEEE80211_STA_ASSOC &amp;&amp;</div><div class='del'>-		   new_state == IEEE80211_STA_AUTH &amp;&amp;</div><div class='del'>-		   (vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='del'>-		    vif-&gt;type == NL80211_IFTYPE_MESH_POINT ||</div><div class='del'>-		    vif-&gt;type == NL80211_IFTYPE_ADHOC)) {</div><div class='del'>-		ret = ath11k_station_disassoc(ar, vif, sta);</div><div class='del'>-		if (ret)</div><div class='del'>-			ath11k_warn(ar-&gt;ab, "Failed to disassociate station: %pM\n",</div><div class='del'>-				    sta-&gt;addr);</div><div class='add'>+	switch (sta-&gt;deflink.bandwidth) {</div><div class='add'>+	case IEEE80211_STA_RX_BW_20:</div><div class='add'>+		bw = WMI_PEER_CHWIDTH_20MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_STA_RX_BW_40:</div><div class='add'>+		bw = WMI_PEER_CHWIDTH_40MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_STA_RX_BW_80:</div><div class='add'>+		bw = WMI_PEER_CHWIDTH_80MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_STA_RX_BW_160:</div><div class='add'>+		bw = WMI_PEER_CHWIDTH_160MHZ;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "Invalid bandwidth %d for %pM\n",</div><div class='add'>+			    sta-&gt;deflink.bandwidth, sta-&gt;addr);</div><div class='add'>+		bw = WMI_PEER_CHWIDTH_20MHZ;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='del'>-	return ret;</div><div class='add'>+	return bw;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath11k_mac_op_sta_set_txpwr(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -3353,14 +5266,14 @@ static int ath11k_mac_op_sta_set_txpwr(struct ieee80211_hw *hw,</div><div class='ctx'> 				       struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = hw-&gt;priv;</div><div class='del'>-	struct ath11k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	s16 txpwr;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;txpwr.type == NL80211_TX_POWER_AUTOMATIC) {</div><div class='add'>+	if (sta-&gt;deflink.txpwr.type == NL80211_TX_POWER_AUTOMATIC) {</div><div class='ctx'> 		txpwr = 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		txpwr = sta-&gt;txpwr.power;</div><div class='add'>+		txpwr = sta-&gt;deflink.txpwr.power;</div><div class='ctx'> 		if (!txpwr)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3383,14 +5296,28 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ath11k_mac_op_sta_set_4addr(struct ieee80211_hw *hw,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					struct ieee80211_sta *sta, bool enabled)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = hw-&gt;priv;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='add'>+</div><div class='add'>+	if (enabled &amp;&amp; !arsta-&gt;use_4addr_set) {</div><div class='add'>+		ieee80211_queue_work(ar-&gt;hw, &amp;arsta-&gt;set_4addr_wk);</div><div class='add'>+		arsta-&gt;use_4addr_set = true;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath11k_mac_op_sta_rc_update(struct ieee80211_hw *hw,</div><div class='ctx'> 					struct ieee80211_vif *vif,</div><div class='del'>-					struct ieee80211_sta *sta,</div><div class='add'>+					struct ieee80211_link_sta *link_sta,</div><div class='ctx'> 					u32 changed)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sta *sta = link_sta-&gt;sta;</div><div class='ctx'> 	struct ath11k *ar = hw-&gt;priv;</div><div class='del'>-	struct ath11k_sta *arsta = (struct ath11k_sta *)sta-&gt;drv_priv;</div><div class='del'>-	struct ath11k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> 	struct ath11k_peer *peer;</div><div class='ctx'> 	u32 bw, smps;</div><div class='ctx'> </div><div class='hunk'>@@ -3407,45 +5334,26 @@ static void ath11k_mac_op_sta_rc_update(struct ieee80211_hw *hw,</div><div class='ctx'> 	spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='del'>-		   "mac sta rc update for %pM changed %08x bw %d nss %d smps %d\n",</div><div class='del'>-		   sta-&gt;addr, changed, sta-&gt;bandwidth, sta-&gt;rx_nss,</div><div class='del'>-		   sta-&gt;smps_mode);</div><div class='add'>+		   "sta rc update for %pM changed %08x bw %d nss %d smps %d\n",</div><div class='add'>+		   sta-&gt;addr, changed, sta-&gt;deflink.bandwidth,</div><div class='add'>+		   sta-&gt;deflink.rx_nss,</div><div class='add'>+		   sta-&gt;deflink.smps_mode);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; IEEE80211_RC_BW_CHANGED) {</div><div class='del'>-		bw = WMI_PEER_CHWIDTH_20MHZ;</div><div class='del'>-</div><div class='del'>-		switch (sta-&gt;bandwidth) {</div><div class='del'>-		case IEEE80211_STA_RX_BW_20:</div><div class='del'>-			bw = WMI_PEER_CHWIDTH_20MHZ;</div><div class='del'>-			break;</div><div class='del'>-		case IEEE80211_STA_RX_BW_40:</div><div class='del'>-			bw = WMI_PEER_CHWIDTH_40MHZ;</div><div class='del'>-			break;</div><div class='del'>-		case IEEE80211_STA_RX_BW_80:</div><div class='del'>-			bw = WMI_PEER_CHWIDTH_80MHZ;</div><div class='del'>-			break;</div><div class='del'>-		case IEEE80211_STA_RX_BW_160:</div><div class='del'>-			bw = WMI_PEER_CHWIDTH_160MHZ;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ath11k_warn(ar-&gt;ab, "Invalid bandwidth %d in rc update for %pM\n",</div><div class='del'>-				    sta-&gt;bandwidth, sta-&gt;addr);</div><div class='del'>-			bw = WMI_PEER_CHWIDTH_20MHZ;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='add'>+		bw = ath11k_mac_ieee80211_sta_bw_to_wmi(ar, sta);</div><div class='add'>+		arsta-&gt;bw_prev = arsta-&gt;bw;</div><div class='ctx'> 		arsta-&gt;bw = bw;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; IEEE80211_RC_NSS_CHANGED)</div><div class='del'>-		arsta-&gt;nss = sta-&gt;rx_nss;</div><div class='add'>+		arsta-&gt;nss = sta-&gt;deflink.rx_nss;</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; IEEE80211_RC_SMPS_CHANGED) {</div><div class='ctx'> 		smps = WMI_PEER_SMPS_PS_NONE;</div><div class='ctx'> </div><div class='del'>-		switch (sta-&gt;smps_mode) {</div><div class='add'>+		switch (sta-&gt;deflink.smps_mode) {</div><div class='ctx'> 		case IEEE80211_SMPS_AUTOMATIC:</div><div class='ctx'> 		case IEEE80211_SMPS_OFF:</div><div class='ctx'> 			smps = WMI_PEER_SMPS_PS_NONE;</div><div class='hunk'>@@ -3458,7 +5366,7 @@ static void ath11k_mac_op_sta_rc_update(struct ieee80211_hw *hw,</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			ath11k_warn(ar-&gt;ab, "Invalid smps %d in sta rc update for %pM\n",</div><div class='del'>-				    sta-&gt;smps_mode, sta-&gt;addr);</div><div class='add'>+				    sta-&gt;deflink.smps_mode, sta-&gt;addr);</div><div class='ctx'> 			smps = WMI_PEER_SMPS_PS_NONE;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3530,12 +5438,52 @@ exit:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ath11k_mac_op_conf_tx_mu_edca(struct ieee80211_hw *hw,</div><div class='add'>+					 struct ieee80211_vif *vif,</div><div class='add'>+					 unsigned int link_id, u16 ac,</div><div class='add'>+					 const struct ieee80211_tx_queue_params *params)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='add'>+	struct ath11k *ar = hw-&gt;priv;</div><div class='add'>+	struct wmi_wmm_params_arg *p;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (ac) {</div><div class='add'>+	case IEEE80211_AC_VO:</div><div class='add'>+		p = &amp;arvif-&gt;muedca_params.ac_vo;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AC_VI:</div><div class='add'>+		p = &amp;arvif-&gt;muedca_params.ac_vi;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AC_BE:</div><div class='add'>+		p = &amp;arvif-&gt;muedca_params.ac_be;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AC_BK:</div><div class='add'>+		p = &amp;arvif-&gt;muedca_params.ac_bk;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "error ac: %d", ac);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p-&gt;cwmin = u8_get_bits(params-&gt;mu_edca_param_rec.ecw_min_max, GENMASK(3, 0));</div><div class='add'>+	p-&gt;cwmax = u8_get_bits(params-&gt;mu_edca_param_rec.ecw_min_max, GENMASK(7, 4));</div><div class='add'>+	p-&gt;aifs = u8_get_bits(params-&gt;mu_edca_param_rec.aifsn, GENMASK(3, 0));</div><div class='add'>+	p-&gt;txop = params-&gt;mu_edca_param_rec.mu_edca_timer;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_send_wmm_update_cmd_tlv(ar, arvif-&gt;vdev_id,</div><div class='add'>+						 &amp;arvif-&gt;muedca_params,</div><div class='add'>+						 WMI_WMM_PARAM_TYPE_11AX_MU_EDCA);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath11k_mac_op_conf_tx(struct ieee80211_hw *hw,</div><div class='del'>-				 struct ieee80211_vif *vif, u16 ac,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 unsigned int link_id, u16 ac,</div><div class='ctx'> 				 const struct ieee80211_tx_queue_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = hw-&gt;priv;</div><div class='del'>-	struct ath11k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> 	struct wmi_wmm_params_arg *p = NULL;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -3567,12 +5515,22 @@ static int ath11k_mac_op_conf_tx(struct ieee80211_hw *hw,</div><div class='ctx'> 	p-&gt;txop = params-&gt;txop;</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_wmi_send_wmm_update_cmd_tlv(ar, arvif-&gt;vdev_id,</div><div class='del'>-						 &amp;arvif-&gt;wmm_params);</div><div class='add'>+						 &amp;arvif-&gt;wmm_params,</div><div class='add'>+						 WMI_WMM_PARAM_TYPE_LEGACY);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab, "failed to set wmm params: %d\n", ret);</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (params-&gt;mu_edca) {</div><div class='add'>+		ret = ath11k_mac_op_conf_tx_mu_edca(hw, vif, link_id, ac,</div><div class='add'>+						    params);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to set mu_edca params: %d\n", ret);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = ath11k_conf_tx_uapsd(ar, vif, ac, params-&gt;uapsd);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -3587,7 +5545,7 @@ static struct ieee80211_sta_ht_cap</div><div class='ctx'> ath11k_create_ht_cap(struct ath11k *ar, u32 ar_ht_cap, u32 rate_cap_rx_chainmask)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct ieee80211_sta_ht_cap ht_cap = {0};</div><div class='add'>+	struct ieee80211_sta_ht_cap ht_cap = {};</div><div class='ctx'> 	u32 ar_vht_cap = ar-&gt;pdev-&gt;cap.vht_cap;</div><div class='ctx'> </div><div class='ctx'> 	if (!(ar_ht_cap &amp; WMI_HT_CAP_ENABLED))</div><div class='hunk'>@@ -3701,7 +5659,7 @@ static int ath11k_mac_set_txbf_conf(struct ath11k_vif *arvif)</div><div class='ctx'> static void ath11k_set_vht_txbf_cap(struct ath11k *ar, u32 *vht_cap)</div><div class='ctx'> {</div><div class='ctx'> 	bool subfer, subfee;</div><div class='del'>-	int sound_dim = 0;</div><div class='add'>+	int sound_dim = 0, nsts = 0;</div><div class='ctx'> </div><div class='ctx'> 	subfer = !!(*vht_cap &amp; (IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE));</div><div class='ctx'> 	subfee = !!(*vht_cap &amp; (IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE));</div><div class='hunk'>@@ -3711,6 +5669,11 @@ static void ath11k_set_vht_txbf_cap(struct ath11k *ar, u32 *vht_cap)</div><div class='ctx'> 		subfer = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (ar-&gt;num_rx_chains &lt; 2) {</div><div class='add'>+		*vht_cap &amp;= ~(IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE);</div><div class='add'>+		subfee = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* If SU Beaformer is not set, then disable MU Beamformer Capability */</div><div class='ctx'> 	if (!subfer)</div><div class='ctx'> 		*vht_cap &amp;= ~(IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE);</div><div class='hunk'>@@ -3723,7 +5686,9 @@ static void ath11k_set_vht_txbf_cap(struct ath11k *ar, u32 *vht_cap)</div><div class='ctx'> 	sound_dim &gt;&gt;= IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_SHIFT;</div><div class='ctx'> 	*vht_cap &amp;= ~IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK;</div><div class='ctx'> </div><div class='del'>-	/* TODO: Need to check invalid STS and Sound_dim values set by FW? */</div><div class='add'>+	nsts = (*vht_cap &amp; IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK);</div><div class='add'>+	nsts &gt;&gt;= IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT;</div><div class='add'>+	*vht_cap &amp;= ~IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK;</div><div class='ctx'> </div><div class='ctx'> 	/* Enable Sounding Dimension Field only if SU BF is enabled */</div><div class='ctx'> 	if (subfer) {</div><div class='hunk'>@@ -3735,28 +5700,30 @@ static void ath11k_set_vht_txbf_cap(struct ath11k *ar, u32 *vht_cap)</div><div class='ctx'> 		*vht_cap |= sound_dim;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Use the STS advertised by FW unless SU Beamformee is not supported*/</div><div class='del'>-	if (!subfee)</div><div class='del'>-		*vht_cap &amp;= ~(IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK);</div><div class='add'>+	/* Enable Beamformee STS Field only if SU BF is enabled */</div><div class='add'>+	if (subfee) {</div><div class='add'>+		nsts &lt;&lt;= IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT;</div><div class='add'>+		nsts &amp;=  IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK;</div><div class='add'>+		*vht_cap |= nsts;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ieee80211_sta_vht_cap</div><div class='ctx'> ath11k_create_vht_cap(struct ath11k *ar, u32 rate_cap_tx_chainmask,</div><div class='ctx'> 		      u32 rate_cap_rx_chainmask)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sta_vht_cap vht_cap = {0};</div><div class='add'>+	struct ieee80211_sta_vht_cap vht_cap = {};</div><div class='ctx'> 	u16 txmcs_map, rxmcs_map;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	vht_cap.vht_supported = 1;</div><div class='ctx'> 	vht_cap.cap = ar-&gt;pdev-&gt;cap.vht_cap;</div><div class='ctx'> </div><div class='del'>-	ath11k_set_vht_txbf_cap(ar, &amp;vht_cap.cap);</div><div class='add'>+	if (ar-&gt;pdev-&gt;cap.nss_ratio_enabled)</div><div class='add'>+		vht_cap.vht_mcs.tx_highest |=</div><div class='add'>+			cpu_to_le16(IEEE80211_VHT_EXT_NSS_BW_CAPABLE);</div><div class='ctx'> </div><div class='del'>-	/* TODO: Enable back VHT160 mode once association issues are fixed */</div><div class='del'>-	/* Disabling VHT160 and VHT80+80 modes */</div><div class='del'>-	vht_cap.cap &amp;= ~IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK;</div><div class='del'>-	vht_cap.cap &amp;= ~IEEE80211_VHT_CAP_SHORT_GI_160;</div><div class='add'>+	ath11k_set_vht_txbf_cap(ar, &amp;vht_cap.cap);</div><div class='ctx'> </div><div class='ctx'> 	rxmcs_map = 0;</div><div class='ctx'> 	txmcs_map = 0;</div><div class='hunk'>@@ -3802,7 +5769,9 @@ static void ath11k_mac_setup_ht_vht_cap(struct ath11k *ar,</div><div class='ctx'> 						    rate_cap_rx_chainmask);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cap-&gt;supported_bands &amp; WMI_HOST_WLAN_5G_CAP &amp;&amp; !ar-&gt;supports_6ghz) {</div><div class='add'>+	if (cap-&gt;supported_bands &amp; WMI_HOST_WLAN_5G_CAP &amp;&amp;</div><div class='add'>+	    (ar-&gt;ab-&gt;hw_params.single_pdev_only ||</div><div class='add'>+	     !ar-&gt;supports_6ghz)) {</div><div class='ctx'> 		band = &amp;ar-&gt;mac.sbands[NL80211_BAND_5GHZ];</div><div class='ctx'> 		ht_cap = cap-&gt;band[NL80211_BAND_5GHZ].ht_cap_info;</div><div class='ctx'> 		if (ht_cap_info)</div><div class='hunk'>@@ -3952,6 +5921,43 @@ static __le16 ath11k_mac_setup_he_6ghz_cap(struct ath11k_pdev_cap *pcap,</div><div class='ctx'> 	return cpu_to_le16(bcap-&gt;he_6ghz_capa);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ath11k_mac_set_hemcsmap(struct ath11k *ar,</div><div class='add'>+				    struct ath11k_pdev_cap *cap,</div><div class='add'>+				    struct ieee80211_sta_he_cap *he_cap,</div><div class='add'>+				    int band)</div><div class='add'>+{</div><div class='add'>+	u16 txmcs_map, rxmcs_map;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	rxmcs_map = 0;</div><div class='add'>+	txmcs_map = 0;</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		if (i &lt; ar-&gt;num_tx_chains &amp;&amp;</div><div class='add'>+		    (ar-&gt;cfg_tx_chainmask &gt;&gt; cap-&gt;tx_chain_mask_shift) &amp; BIT(i))</div><div class='add'>+			txmcs_map |= IEEE80211_HE_MCS_SUPPORT_0_11 &lt;&lt; (i * 2);</div><div class='add'>+		else</div><div class='add'>+			txmcs_map |= IEEE80211_HE_MCS_NOT_SUPPORTED &lt;&lt; (i * 2);</div><div class='add'>+</div><div class='add'>+		if (i &lt; ar-&gt;num_rx_chains &amp;&amp;</div><div class='add'>+		    (ar-&gt;cfg_rx_chainmask &gt;&gt; cap-&gt;tx_chain_mask_shift) &amp; BIT(i))</div><div class='add'>+			rxmcs_map |= IEEE80211_HE_MCS_SUPPORT_0_11 &lt;&lt; (i * 2);</div><div class='add'>+		else</div><div class='add'>+			rxmcs_map |= IEEE80211_HE_MCS_NOT_SUPPORTED &lt;&lt; (i * 2);</div><div class='add'>+	}</div><div class='add'>+	he_cap-&gt;he_mcs_nss_supp.rx_mcs_80 =</div><div class='add'>+		cpu_to_le16(rxmcs_map &amp; 0xffff);</div><div class='add'>+	he_cap-&gt;he_mcs_nss_supp.tx_mcs_80 =</div><div class='add'>+		cpu_to_le16(txmcs_map &amp; 0xffff);</div><div class='add'>+	he_cap-&gt;he_mcs_nss_supp.rx_mcs_160 =</div><div class='add'>+		cpu_to_le16(rxmcs_map &amp; 0xffff);</div><div class='add'>+	he_cap-&gt;he_mcs_nss_supp.tx_mcs_160 =</div><div class='add'>+		cpu_to_le16(txmcs_map &amp; 0xffff);</div><div class='add'>+	he_cap-&gt;he_mcs_nss_supp.rx_mcs_80p80 =</div><div class='add'>+		cpu_to_le16(rxmcs_map &amp; 0xffff);</div><div class='add'>+	he_cap-&gt;he_mcs_nss_supp.tx_mcs_80p80 =</div><div class='add'>+		cpu_to_le16(txmcs_map &amp; 0xffff);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath11k_mac_copy_he_cap(struct ath11k *ar,</div><div class='ctx'> 				  struct ath11k_pdev_cap *cap,</div><div class='ctx'> 				  struct ieee80211_sband_iftype_data *data,</div><div class='hunk'>@@ -4009,18 +6015,7 @@ static int ath11k_mac_copy_he_cap(struct ath11k *ar,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		he_cap-&gt;he_mcs_nss_supp.rx_mcs_80 =</div><div class='del'>-			cpu_to_le16(band_cap-&gt;he_mcs &amp; 0xffff);</div><div class='del'>-		he_cap-&gt;he_mcs_nss_supp.tx_mcs_80 =</div><div class='del'>-			cpu_to_le16(band_cap-&gt;he_mcs &amp; 0xffff);</div><div class='del'>-		he_cap-&gt;he_mcs_nss_supp.rx_mcs_160 =</div><div class='del'>-			cpu_to_le16((band_cap-&gt;he_mcs &gt;&gt; 16) &amp; 0xffff);</div><div class='del'>-		he_cap-&gt;he_mcs_nss_supp.tx_mcs_160 =</div><div class='del'>-			cpu_to_le16((band_cap-&gt;he_mcs &gt;&gt; 16) &amp; 0xffff);</div><div class='del'>-		he_cap-&gt;he_mcs_nss_supp.rx_mcs_80p80 =</div><div class='del'>-			cpu_to_le16((band_cap-&gt;he_mcs &gt;&gt; 16) &amp; 0xffff);</div><div class='del'>-		he_cap-&gt;he_mcs_nss_supp.tx_mcs_80p80 =</div><div class='del'>-			cpu_to_le16((band_cap-&gt;he_mcs &gt;&gt; 16) &amp; 0xffff);</div><div class='add'>+		ath11k_mac_set_hemcsmap(ar, cap, he_cap, band);</div><div class='ctx'> </div><div class='ctx'> 		memset(he_cap-&gt;ppe_thres, 0, sizeof(he_cap-&gt;ppe_thres));</div><div class='ctx'> 		if (he_cap_elem-&gt;phy_cap_info[6] &amp;</div><div class='hunk'>@@ -4049,8 +6044,9 @@ static void ath11k_mac_setup_he_cap(struct ath11k *ar,</div><div class='ctx'> 					       ar-&gt;mac.iftype[NL80211_BAND_2GHZ],</div><div class='ctx'> 					       NL80211_BAND_2GHZ);</div><div class='ctx'> 		band = &amp;ar-&gt;mac.sbands[NL80211_BAND_2GHZ];</div><div class='del'>-		band-&gt;iftype_data = ar-&gt;mac.iftype[NL80211_BAND_2GHZ];</div><div class='del'>-		band-&gt;n_iftype_data = count;</div><div class='add'>+		_ieee80211_set_sband_iftype_data(band,</div><div class='add'>+						 ar-&gt;mac.iftype[NL80211_BAND_2GHZ],</div><div class='add'>+						 count);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cap-&gt;supported_bands &amp; WMI_HOST_WLAN_5G_CAP) {</div><div class='hunk'>@@ -4058,8 +6054,9 @@ static void ath11k_mac_setup_he_cap(struct ath11k *ar,</div><div class='ctx'> 					       ar-&gt;mac.iftype[NL80211_BAND_5GHZ],</div><div class='ctx'> 					       NL80211_BAND_5GHZ);</div><div class='ctx'> 		band = &amp;ar-&gt;mac.sbands[NL80211_BAND_5GHZ];</div><div class='del'>-		band-&gt;iftype_data = ar-&gt;mac.iftype[NL80211_BAND_5GHZ];</div><div class='del'>-		band-&gt;n_iftype_data = count;</div><div class='add'>+		_ieee80211_set_sband_iftype_data(band,</div><div class='add'>+						 ar-&gt;mac.iftype[NL80211_BAND_5GHZ],</div><div class='add'>+						 count);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cap-&gt;supported_bands &amp; WMI_HOST_WLAN_5G_CAP &amp;&amp;</div><div class='hunk'>@@ -4068,8 +6065,9 @@ static void ath11k_mac_setup_he_cap(struct ath11k *ar,</div><div class='ctx'> 					       ar-&gt;mac.iftype[NL80211_BAND_6GHZ],</div><div class='ctx'> 					       NL80211_BAND_6GHZ);</div><div class='ctx'> 		band = &amp;ar-&gt;mac.sbands[NL80211_BAND_6GHZ];</div><div class='del'>-		band-&gt;iftype_data = ar-&gt;mac.iftype[NL80211_BAND_6GHZ];</div><div class='del'>-		band-&gt;n_iftype_data = count;</div><div class='add'>+		_ieee80211_set_sband_iftype_data(band,</div><div class='add'>+						 ar-&gt;mac.iftype[NL80211_BAND_6GHZ],</div><div class='add'>+						 count);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4119,23 +6117,47 @@ static int __ath11k_set_antenna(struct ath11k *ar, u32 tx_ant, u32 rx_ant)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath11k_mac_tx_mgmt_pending_free(int buf_id, void *skb, void *ctx)</div><div class='add'>+static void ath11k_mgmt_over_wmi_tx_drop(struct ath11k *ar, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *msdu = skb;</div><div class='add'>+	int num_mgmt;</div><div class='add'>+</div><div class='add'>+	ieee80211_free_txskb(ar-&gt;hw, skb);</div><div class='add'>+</div><div class='add'>+	num_mgmt = atomic_dec_if_positive(&amp;ar-&gt;num_pending_mgmt_tx);</div><div class='add'>+</div><div class='add'>+	if (num_mgmt &lt; 0)</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+</div><div class='add'>+	if (!num_mgmt)</div><div class='add'>+		wake_up(&amp;ar-&gt;txmgmt_empty_waitq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_mac_tx_mgmt_free(struct ath11k *ar, int buf_id)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *msdu;</div><div class='ctx'> 	struct ieee80211_tx_info *info;</div><div class='del'>-	struct ath11k *ar = ctx;</div><div class='del'>-	struct ath11k_base *ab = ar-&gt;ab;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ar-&gt;txmgmt_idr_lock);</div><div class='del'>-	idr_remove(&amp;ar-&gt;txmgmt_idr, buf_id);</div><div class='add'>+	msdu = idr_remove(&amp;ar-&gt;txmgmt_idr, buf_id);</div><div class='ctx'> 	spin_unlock_bh(&amp;ar-&gt;txmgmt_idr_lock);</div><div class='del'>-	dma_unmap_single(ab-&gt;dev, ATH11K_SKB_CB(msdu)-&gt;paddr, msdu-&gt;len,</div><div class='add'>+</div><div class='add'>+	if (!msdu)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dma_unmap_single(ar-&gt;ab-&gt;dev, ATH11K_SKB_CB(msdu)-&gt;paddr, msdu-&gt;len,</div><div class='ctx'> 			 DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	info = IEEE80211_SKB_CB(msdu);</div><div class='ctx'> 	memset(&amp;info-&gt;status, 0, sizeof(info-&gt;status));</div><div class='ctx'> </div><div class='del'>-	ieee80211_free_txskb(ar-&gt;hw, msdu);</div><div class='add'>+	ath11k_mgmt_over_wmi_tx_drop(ar, msdu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_mac_tx_mgmt_pending_free(int buf_id, void *skb, void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = ctx;</div><div class='add'>+</div><div class='add'>+	ath11k_mac_tx_mgmt_free(ar, buf_id);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -4144,17 +6166,10 @@ static int ath11k_mac_vif_txmgmt_idr_remove(int buf_id, void *skb, void *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_vif *vif = ctx;</div><div class='ctx'> 	struct ath11k_skb_cb *skb_cb = ATH11K_SKB_CB((struct sk_buff *)skb);</div><div class='del'>-	struct sk_buff *msdu = skb;</div><div class='ctx'> 	struct ath11k *ar = skb_cb-&gt;ar;</div><div class='del'>-	struct ath11k_base *ab = ar-&gt;ab;</div><div class='ctx'> </div><div class='del'>-	if (skb_cb-&gt;vif == vif) {</div><div class='del'>-		spin_lock_bh(&amp;ar-&gt;txmgmt_idr_lock);</div><div class='del'>-		idr_remove(&amp;ar-&gt;txmgmt_idr, buf_id);</div><div class='del'>-		spin_unlock_bh(&amp;ar-&gt;txmgmt_idr_lock);</div><div class='del'>-		dma_unmap_single(ab-&gt;dev, skb_cb-&gt;paddr, msdu-&gt;len,</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-	}</div><div class='add'>+	if (skb_cb-&gt;vif == vif)</div><div class='add'>+		ath11k_mac_tx_mgmt_free(ar, buf_id);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -4164,15 +6179,24 @@ static int ath11k_mac_mgmt_tx_wmi(struct ath11k *ar, struct ath11k_vif *arvif,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='ctx'> 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	struct ath11k_skb_cb *skb_cb = ATH11K_SKB_CB(skb);</div><div class='ctx'> 	struct ieee80211_tx_info *info;</div><div class='add'>+	enum hal_encrypt_type enctype;</div><div class='add'>+	unsigned int mic_len;</div><div class='ctx'> 	dma_addr_t paddr;</div><div class='ctx'> 	int buf_id;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	ATH11K_SKB_CB(skb)-&gt;ar = ar;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_bh(&amp;ar-&gt;txmgmt_idr_lock);</div><div class='ctx'> 	buf_id = idr_alloc(&amp;ar-&gt;txmgmt_idr, skb, 0,</div><div class='ctx'> 			   ATH11K_TX_MGMT_NUM_PENDING_MAX, GFP_ATOMIC);</div><div class='ctx'> 	spin_unlock_bh(&amp;ar-&gt;txmgmt_idr_lock);</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='add'>+		   "tx mgmt frame, buf id %d\n", buf_id);</div><div class='add'>+</div><div class='ctx'> 	if (buf_id &lt; 0)</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> </div><div class='hunk'>@@ -4182,7 +6206,12 @@ static int ath11k_mac_mgmt_tx_wmi(struct ath11k *ar, struct ath11k_vif *arvif,</div><div class='ctx'> 		     ieee80211_is_deauth(hdr-&gt;frame_control) ||</div><div class='ctx'> 		     ieee80211_is_disassoc(hdr-&gt;frame_control)) &amp;&amp;</div><div class='ctx'> 		     ieee80211_has_protected(hdr-&gt;frame_control)) {</div><div class='del'>-			skb_put(skb, IEEE80211_CCMP_MIC_LEN);</div><div class='add'>+			if (!(skb_cb-&gt;flags &amp; ATH11K_SKB_CIPHER_SET))</div><div class='add'>+				ath11k_warn(ab, "WMI management tx frame without ATH11K_SKB_CIPHER_SET");</div><div class='add'>+</div><div class='add'>+			enctype = ath11k_dp_tx_get_encrypt_type(skb_cb-&gt;cipher);</div><div class='add'>+			mic_len = ath11k_dp_rx_crypto_mic_len(ar, enctype);</div><div class='add'>+			skb_put(skb, mic_len);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4219,7 +6248,160 @@ static void ath11k_mgmt_over_wmi_tx_purge(struct ath11k *ar)</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='ctx'> 	while ((skb = skb_dequeue(&amp;ar-&gt;wmi_mgmt_tx_queue)) != NULL)</div><div class='del'>-		ieee80211_free_txskb(ar-&gt;hw, skb);</div><div class='add'>+		ath11k_mgmt_over_wmi_tx_drop(ar, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_mgmt_action_frame_fill_elem_data(struct ath11k_vif *arvif,</div><div class='add'>+						       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	u8 category, *buf, iv_len, action_code, dialog_token;</div><div class='add'>+	int cur_tx_power, max_tx_power;</div><div class='add'>+	struct ath11k *ar = arvif-&gt;ar;</div><div class='add'>+	struct cfg80211_chan_def def;</div><div class='add'>+	struct ath11k_skb_cb *skb_cb;</div><div class='add'>+	struct ieee80211_mgmt *mgmt;</div><div class='add'>+	unsigned int remaining_len;</div><div class='add'>+	bool has_protected;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	/* make sure category field is present */</div><div class='add'>+	if (skb-&gt;len &lt; IEEE80211_MIN_ACTION_SIZE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	remaining_len = skb-&gt;len - IEEE80211_MIN_ACTION_SIZE;</div><div class='add'>+	has_protected = ieee80211_has_protected(hdr-&gt;frame_control);</div><div class='add'>+</div><div class='add'>+	/* In case of SW crypto and hdr protected (PMF), packet will already be encrypted,</div><div class='add'>+	 * we can't put in data in this case</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(ATH11K_FLAG_HW_CRYPTO_DISABLED, &amp;ar-&gt;ab-&gt;dev_flags) &amp;&amp;</div><div class='add'>+	    has_protected)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mgmt = (struct ieee80211_mgmt *)hdr;</div><div class='add'>+	buf = (u8 *)&amp;mgmt-&gt;u.action;</div><div class='add'>+</div><div class='add'>+	/* FCTL_PROTECTED frame might have extra space added for HDR_LEN. Offset that</div><div class='add'>+	 * many bytes if it is there</div><div class='add'>+	 */</div><div class='add'>+	if (has_protected) {</div><div class='add'>+		skb_cb = ATH11K_SKB_CB(skb);</div><div class='add'>+</div><div class='add'>+		switch (skb_cb-&gt;cipher) {</div><div class='add'>+		/* Cipher suite having flag %IEEE80211_KEY_FLAG_GENERATE_IV_MGMT set in</div><div class='add'>+		 * key needs to be processed. See ath11k_install_key()</div><div class='add'>+		 */</div><div class='add'>+		case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+		case WLAN_CIPHER_SUITE_CCMP_256:</div><div class='add'>+		case WLAN_CIPHER_SUITE_GCMP:</div><div class='add'>+		case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='add'>+			iv_len = IEEE80211_CCMP_HDR_LEN;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+			iv_len = 0;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (remaining_len &lt; iv_len)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		buf += iv_len;</div><div class='add'>+		remaining_len -= iv_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	category = *buf++;</div><div class='add'>+	/* category code is already taken care in %IEEE80211_MIN_ACTION_SIZE hence</div><div class='add'>+	 * no need to adjust remaining_len</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	switch (category) {</div><div class='add'>+	case WLAN_CATEGORY_RADIO_MEASUREMENT:</div><div class='add'>+		/* need action code and dialog token */</div><div class='add'>+		if (remaining_len &lt; 2)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/* Packet Format:</div><div class='add'>+		 *	Action Code | Dialog Token | Variable Len (based on Action Code)</div><div class='add'>+		 */</div><div class='add'>+		action_code = *buf++;</div><div class='add'>+		dialog_token = *buf++;</div><div class='add'>+		remaining_len -= 2;</div><div class='add'>+</div><div class='add'>+		if (ath11k_mac_vif_chan(arvif-&gt;vif, &amp;def))</div><div class='add'>+			return -ENOENT;</div><div class='add'>+</div><div class='add'>+		cur_tx_power = arvif-&gt;vif-&gt;bss_conf.txpower;</div><div class='add'>+		max_tx_power = min(def.chan-&gt;max_reg_power, (int)ar-&gt;max_tx_power / 2);</div><div class='add'>+		ath11k_mac_handle_get_txpower(ar, arvif-&gt;vif, &amp;cur_tx_power);</div><div class='add'>+</div><div class='add'>+		switch (action_code) {</div><div class='add'>+		case WLAN_RM_ACTION_LINK_MEASUREMENT_REQUEST:</div><div class='add'>+			/* need variable fields to be present in len */</div><div class='add'>+			if (remaining_len &lt; 2)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			/* Variable length format as defined in IEEE 802.11-2024,</div><div class='add'>+			 * Figure 9-1187-Link Measurement Request frame Action field</div><div class='add'>+			 * format.</div><div class='add'>+			 *	Transmit Power | Max Tx Power</div><div class='add'>+			 * We fill both of these.</div><div class='add'>+			 */</div><div class='add'>+			*buf++ = cur_tx_power;</div><div class='add'>+			*buf = max_tx_power;</div><div class='add'>+</div><div class='add'>+			ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='add'>+				   "RRM: Link Measurement Req dialog_token %u cur_tx_power %d max_tx_power %d\n",</div><div class='add'>+				   dialog_token, cur_tx_power, max_tx_power);</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_RM_ACTION_LINK_MEASUREMENT_REPORT:</div><div class='add'>+			/* need variable fields to be present in len */</div><div class='add'>+			if (remaining_len &lt; 3)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			/* Variable length format as defined in IEEE 802.11-2024,</div><div class='add'>+			 * Figure 9-1188-Link Measurement Report frame Action field format</div><div class='add'>+			 *	TPC Report | Variable Fields</div><div class='add'>+			 *</div><div class='add'>+			 * TPC Report Format:</div><div class='add'>+			 *	Element ID | Len | Tx Power | Link Margin</div><div class='add'>+			 *</div><div class='add'>+			 * We fill Tx power in the TPC Report (2nd index)</div><div class='add'>+			 */</div><div class='add'>+			buf[2] = cur_tx_power;</div><div class='add'>+</div><div class='add'>+			/* TODO: At present, Link margin data is not present so can't</div><div class='add'>+			 * really fill it now. Once it is available, it can be added</div><div class='add'>+			 * here</div><div class='add'>+			 */</div><div class='add'>+			ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='add'>+				   "RRM: Link Measurement Report dialog_token %u cur_tx_power %d\n",</div><div class='add'>+				   dialog_token, cur_tx_power);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* nothing to fill */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_mgmt_frame_fill_elem_data(struct ath11k_vif *arvif,</div><div class='add'>+						struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_is_action(hdr-&gt;frame_control))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ath11k_mac_mgmt_action_frame_fill_elem_data(arvif, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_mgmt_over_wmi_tx_work(struct work_struct *work)</div><div class='hunk'>@@ -4234,28 +6416,44 @@ static void ath11k_mgmt_over_wmi_tx_work(struct work_struct *work)</div><div class='ctx'> 		skb_cb = ATH11K_SKB_CB(skb);</div><div class='ctx'> 		if (!skb_cb-&gt;vif) {</div><div class='ctx'> 			ath11k_warn(ar-&gt;ab, "no vif found for mgmt frame\n");</div><div class='del'>-			ieee80211_free_txskb(ar-&gt;hw, skb);</div><div class='add'>+			ath11k_mgmt_over_wmi_tx_drop(ar, skb);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		arvif = ath11k_vif_to_arvif(skb_cb-&gt;vif);</div><div class='del'>-		if (ar-&gt;allocated_vdev_map &amp; (1LL &lt;&lt; arvif-&gt;vdev_id) &amp;&amp;</div><div class='del'>-		    arvif-&gt;is_started) {</div><div class='add'>+		mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+		if (ar-&gt;allocated_vdev_map &amp; (1LL &lt;&lt; arvif-&gt;vdev_id)) {</div><div class='add'>+			/* Fill in the data which is required to be filled by the driver</div><div class='add'>+			 * For example: Max Tx power in Link Measurement Request/Report</div><div class='add'>+			 */</div><div class='add'>+			ret = ath11k_mac_mgmt_frame_fill_elem_data(arvif, skb);</div><div class='add'>+			if (ret) {</div><div class='add'>+				/* If we couldn't fill the data due to any reason,</div><div class='add'>+				 * let's not discard transmitting the packet.</div><div class='add'>+				 */</div><div class='add'>+				ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='add'>+					   "Failed to fill the required data for the mgmt packet err %d\n",</div><div class='add'>+					   ret);</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			ret = ath11k_mac_mgmt_tx_wmi(ar, arvif, skb);</div><div class='ctx'> 			if (ret) {</div><div class='ctx'> 				ath11k_warn(ar-&gt;ab, "failed to tx mgmt frame, vdev_id %d :%d\n",</div><div class='ctx'> 					    arvif-&gt;vdev_id, ret);</div><div class='del'>-				ieee80211_free_txskb(ar-&gt;hw, skb);</div><div class='add'>+				ath11k_mgmt_over_wmi_tx_drop(ar, skb);</div><div class='ctx'> 			} else {</div><div class='del'>-				atomic_inc(&amp;ar-&gt;num_pending_mgmt_tx);</div><div class='add'>+				ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='add'>+					   "tx mgmt frame, vdev_id %d\n",</div><div class='add'>+					   arvif-&gt;vdev_id);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ath11k_warn(ar-&gt;ab,</div><div class='ctx'> 				    "dropping mgmt frame for vdev %d, is_started %d\n",</div><div class='ctx'> 				    arvif-&gt;vdev_id,</div><div class='ctx'> 				    arvif-&gt;is_started);</div><div class='del'>-			ieee80211_free_txskb(ar-&gt;hw, skb);</div><div class='add'>+			ath11k_mgmt_over_wmi_tx_drop(ar, skb);</div><div class='ctx'> 		}</div><div class='add'>+		mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4285,7 +6483,8 @@ static int ath11k_mac_mgmt_tx(struct ath11k *ar, struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_tail(q, skb);</div><div class='del'>-	ieee80211_queue_work(ar-&gt;hw, &amp;ar-&gt;wmi_mgmt_tx_work);</div><div class='add'>+	atomic_inc(&amp;ar-&gt;num_pending_mgmt_tx);</div><div class='add'>+	queue_work(ar-&gt;ab-&gt;workqueue_aux, &amp;ar-&gt;wmi_mgmt_tx_work);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -4301,6 +6500,7 @@ static void ath11k_mac_op_tx(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='ctx'> 	struct ieee80211_key_conf *key = info-&gt;control.hw_key;</div><div class='add'>+	struct ath11k_sta *arsta = NULL;</div><div class='ctx'> 	u32 info_flags = info-&gt;flags;</div><div class='ctx'> 	bool is_prb_rsp;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -4326,8 +6526,11 @@ static void ath11k_mac_op_tx(struct ieee80211_hw *hw,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_dp_tx(ar, arvif, skb);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (control-&gt;sta)</div><div class='add'>+		arsta = ath11k_sta_to_arsta(control-&gt;sta);</div><div class='add'>+</div><div class='add'>+	ret = ath11k_dp_tx(ar, arvif, arsta, skb);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab, "failed to transmit frame %d\n", ret);</div><div class='ctx'> 		ieee80211_free_txskb(ar-&gt;hw, skb);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4344,7 +6547,7 @@ void ath11k_mac_drain_tx(struct ath11k *ar)</div><div class='ctx'> </div><div class='ctx'> static int ath11k_mac_config_mon_status_default(struct ath11k *ar, bool enable)</div><div class='ctx'> {</div><div class='del'>-	struct htt_rx_ring_tlv_filter tlv_filter = {0};</div><div class='add'>+	struct htt_rx_ring_tlv_filter tlv_filter = {};</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='ctx'> 	int i, ret = 0;</div><div class='ctx'> 	u32 ring_id;</div><div class='hunk'>@@ -4355,7 +6558,7 @@ static int ath11k_mac_config_mon_status_default(struct ath11k *ar, bool enable)</div><div class='ctx'> 			tlv_filter.rx_filter = ath11k_debugfs_rx_filter(ar);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ab-&gt;hw_params.num_rxmda_per_pdev; i++) {</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.num_rxdma_per_pdev; i++) {</div><div class='ctx'> 		ring_id = ar-&gt;dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id;</div><div class='ctx'> 		ret = ath11k_dp_tx_htt_rx_filter_setup(ar-&gt;ab, ring_id,</div><div class='ctx'> 						       ar-&gt;dp.mac_id + i,</div><div class='hunk'>@@ -4371,6 +6574,27 @@ static int ath11k_mac_config_mon_status_default(struct ath11k *ar, bool enable)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ath11k_mac_wait_reconfigure(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int recovery_start_count;</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;is_reset)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	recovery_start_count = atomic_inc_return(&amp;ab-&gt;recovery_start_count);</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_MAC, "recovery start count %d\n", recovery_start_count);</div><div class='add'>+</div><div class='add'>+	if (recovery_start_count == ab-&gt;num_radios) {</div><div class='add'>+		complete(&amp;ab-&gt;recovery_start);</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_MAC, "recovery started success\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_MAC, "waiting reconfigure...\n");</div><div class='add'>+</div><div class='add'>+	wait_for_completion_timeout(&amp;ab-&gt;reconfigure_complete,</div><div class='add'>+				    ATH11K_RECONFIGURE_TIMEOUT_HZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath11k_mac_op_start(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = hw-&gt;priv;</div><div class='hunk'>@@ -4378,6 +6602,11 @@ static int ath11k_mac_op_start(struct ieee80211_hw *hw)</div><div class='ctx'> 	struct ath11k_pdev *pdev = ar-&gt;pdev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (ath11k_ftm_mode) {</div><div class='add'>+		ath11k_warn(ab, "mac operations not supported in factory test mode\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ath11k_mac_drain_tx(ar);</div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -4387,10 +6616,12 @@ static int ath11k_mac_op_start(struct ieee80211_hw *hw)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ATH11K_STATE_RESTARTING:</div><div class='ctx'> 		ar-&gt;state = ATH11K_STATE_RESTARTED;</div><div class='add'>+		ath11k_mac_wait_reconfigure(ab);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ATH11K_STATE_RESTARTED:</div><div class='ctx'> 	case ATH11K_STATE_WEDGED:</div><div class='ctx'> 	case ATH11K_STATE_ON:</div><div class='add'>+	case ATH11K_STATE_FTM:</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -4411,6 +6642,14 @@ static int ath11k_mac_op_start(struct ieee80211_hw *hw)</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_SPOOF_MAC_SUPPORT, ar-&gt;wmi-&gt;wmi_ab-&gt;svc_map)) {</div><div class='add'>+		ret = ath11k_wmi_scan_prob_req_oui(ar, ar-&gt;mac_addr);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_err(ab, "failed to set prob req oui: %i\n", ret);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = ath11k_wmi_pdev_set_param(ar, WMI_PDEV_PARAM_ARP_AC_OVERRIDE,</div><div class='ctx'> 					0, pdev-&gt;pdev_id);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -4445,7 +6684,7 @@ static int ath11k_mac_op_start(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: Do we need to enable ANI? */</div><div class='ctx'> </div><div class='del'>-	ath11k_reg_update_chan_list(ar);</div><div class='add'>+	ath11k_reg_update_chan_list(ar, false);</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;num_started_vdevs = 0;</div><div class='ctx'> 	ar-&gt;num_created_vdevs = 0;</div><div class='hunk'>@@ -4489,10 +6728,11 @@ err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath11k_mac_op_stop(struct ieee80211_hw *hw)</div><div class='add'>+static void ath11k_mac_op_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = hw-&gt;priv;</div><div class='ctx'> 	struct htt_ppdu_stats_info *ppdu_stats, *tmp;</div><div class='add'>+	struct scan_chan_list_params *params;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ath11k_mac_drain_tx(ar);</div><div class='hunk'>@@ -4508,13 +6748,29 @@ static void ath11k_mac_op_stop(struct ieee80211_hw *hw)</div><div class='ctx'> 	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='ctx'> 	cancel_delayed_work_sync(&amp;ar-&gt;scan.timeout);</div><div class='add'>+	cancel_work_sync(&amp;ar-&gt;channel_update_work);</div><div class='ctx'> 	cancel_work_sync(&amp;ar-&gt;regd_update_work);</div><div class='add'>+	cancel_work_sync(&amp;ar-&gt;ab-&gt;update_11d_work);</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;state_11d == ATH11K_11D_PREPARING) {</div><div class='add'>+		ar-&gt;state_11d = ATH11K_11D_IDLE;</div><div class='add'>+		complete(&amp;ar-&gt;completed_11d_scan);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='ctx'> 	list_for_each_entry_safe(ppdu_stats, tmp, &amp;ar-&gt;ppdu_stats_info, list) {</div><div class='ctx'> 		list_del(&amp;ppdu_stats-&gt;list);</div><div class='ctx'> 		kfree(ppdu_stats);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	while ((params = list_first_entry_or_null(&amp;ar-&gt;channel_update_queue,</div><div class='add'>+						  struct scan_chan_list_params,</div><div class='add'>+						  list))) {</div><div class='add'>+		list_del(&amp;params-&gt;list);</div><div class='add'>+		kfree(params);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> </div><div class='ctx'> 	rcu_assign_pointer(ar-&gt;ab-&gt;pdevs_active[ar-&gt;pdev_idx], NULL);</div><div class='hunk'>@@ -4524,17 +6780,59 @@ static void ath11k_mac_op_stop(struct ieee80211_hw *hw)</div><div class='ctx'> 	atomic_set(&amp;ar-&gt;num_pending_mgmt_tx, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-ath11k_mac_setup_vdev_create_params(struct ath11k_vif *arvif,</div><div class='del'>-				    struct vdev_create_params *params)</div><div class='add'>+static int ath11k_mac_setup_vdev_params_mbssid(struct ath11k_vif *arvif,</div><div class='add'>+					       u32 *flags, u32 *tx_vdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ath11k_vif *tx_arvif;</div><div class='add'>+</div><div class='add'>+	*tx_vdev_id = 0;</div><div class='add'>+	tx_arvif = ath11k_mac_get_tx_arvif(arvif);</div><div class='add'>+	if (!tx_arvif) {</div><div class='add'>+		*flags = WMI_HOST_VDEV_FLAGS_NON_MBSSID_AP;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;vif-&gt;bss_conf.nontransmitted) {</div><div class='add'>+		if (ar-&gt;hw-&gt;wiphy != tx_arvif-&gt;ar-&gt;hw-&gt;wiphy)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		*flags = WMI_HOST_VDEV_FLAGS_NON_TRANSMIT_AP;</div><div class='add'>+		*tx_vdev_id = tx_arvif-&gt;vdev_id;</div><div class='add'>+	} else if (tx_arvif == arvif) {</div><div class='add'>+		*flags = WMI_HOST_VDEV_FLAGS_TRANSMIT_AP;</div><div class='add'>+	} else {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;vif-&gt;bss_conf.ema_ap)</div><div class='add'>+		*flags |= WMI_HOST_VDEV_FLAGS_EMA_MODE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_setup_vdev_create_params(struct ath11k_vif *arvif,</div><div class='add'>+					       struct vdev_create_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = arvif-&gt;ar;</div><div class='ctx'> 	struct ath11k_pdev *pdev = ar-&gt;pdev;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	params-&gt;if_id = arvif-&gt;vdev_id;</div><div class='ctx'> 	params-&gt;type = arvif-&gt;vdev_type;</div><div class='ctx'> 	params-&gt;subtype = arvif-&gt;vdev_subtype;</div><div class='ctx'> 	params-&gt;pdev_id = pdev-&gt;pdev_id;</div><div class='add'>+	params-&gt;mbssid_flags = 0;</div><div class='add'>+	params-&gt;mbssid_tx_vdev_id = 0;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(WMI_TLV_SERVICE_MBSS_PARAM_IN_VDEV_START_SUPPORT,</div><div class='add'>+		      ar-&gt;ab-&gt;wmi_ab.svc_map)) {</div><div class='add'>+		ret = ath11k_mac_setup_vdev_params_mbssid(arvif,</div><div class='add'>+							  &amp;params-&gt;mbssid_flags,</div><div class='add'>+							  &amp;params-&gt;mbssid_tx_vdev_id);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (pdev-&gt;cap.supported_bands &amp; WMI_HOST_WLAN_2G_CAP) {</div><div class='ctx'> 		params-&gt;chains[NL80211_BAND_2GHZ].tx = ar-&gt;num_tx_chains;</div><div class='hunk'>@@ -4549,69 +6847,7 @@ ath11k_mac_setup_vdev_create_params(struct ath11k_vif *arvif,</div><div class='ctx'> 		params-&gt;chains[NL80211_BAND_6GHZ].tx = ar-&gt;num_tx_chains;</div><div class='ctx'> 		params-&gt;chains[NL80211_BAND_6GHZ].rx = ar-&gt;num_rx_chains;</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32</div><div class='del'>-ath11k_mac_prepare_he_mode(struct ath11k_pdev *pdev, u32 viftype)</div><div class='del'>-{</div><div class='del'>-	struct ath11k_pdev_cap *pdev_cap = &amp;pdev-&gt;cap;</div><div class='del'>-	struct ath11k_band_cap *cap_band = NULL;</div><div class='del'>-	u32 *hecap_phy_ptr = NULL;</div><div class='del'>-	u32 hemode = 0;</div><div class='del'>-</div><div class='del'>-	if (pdev-&gt;cap.supported_bands &amp; WMI_HOST_WLAN_2G_CAP)</div><div class='del'>-		cap_band = &amp;pdev_cap-&gt;band[NL80211_BAND_2GHZ];</div><div class='del'>-	else</div><div class='del'>-		cap_band = &amp;pdev_cap-&gt;band[NL80211_BAND_5GHZ];</div><div class='del'>-</div><div class='del'>-	hecap_phy_ptr = &amp;cap_band-&gt;he_cap_phy_info[0];</div><div class='del'>-</div><div class='del'>-	hemode = FIELD_PREP(HE_MODE_SU_TX_BFEE, HE_SU_BFEE_ENABLE) |</div><div class='del'>-		 FIELD_PREP(HE_MODE_SU_TX_BFER, HECAP_PHY_SUBFMR_GET(hecap_phy_ptr)) |</div><div class='del'>-		 FIELD_PREP(HE_MODE_UL_MUMIMO, HECAP_PHY_ULMUMIMO_GET(hecap_phy_ptr));</div><div class='del'>-</div><div class='del'>-	/* TODO WDS and other modes */</div><div class='del'>-	if (viftype == NL80211_IFTYPE_AP) {</div><div class='del'>-		hemode |= FIELD_PREP(HE_MODE_MU_TX_BFER,</div><div class='del'>-			  HECAP_PHY_MUBFMR_GET(hecap_phy_ptr)) |</div><div class='del'>-			  FIELD_PREP(HE_MODE_DL_OFDMA, HE_DL_MUOFDMA_ENABLE) |</div><div class='del'>-			  FIELD_PREP(HE_MODE_UL_OFDMA, HE_UL_MUOFDMA_ENABLE);</div><div class='del'>-	} else {</div><div class='del'>-		hemode |= FIELD_PREP(HE_MODE_MU_TX_BFEE, HE_MU_BFEE_ENABLE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return hemode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ath11k_set_he_mu_sounding_mode(struct ath11k *ar,</div><div class='del'>-					  struct ath11k_vif *arvif)</div><div class='del'>-{</div><div class='del'>-	u32 param_id, param_value;</div><div class='del'>-	struct ath11k_base *ab = ar-&gt;ab;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	param_id = WMI_VDEV_PARAM_SET_HEMU_MODE;</div><div class='del'>-	param_value = ath11k_mac_prepare_he_mode(ar-&gt;pdev, arvif-&gt;vif-&gt;type);</div><div class='del'>-	ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='del'>-					    param_id, param_value);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ath11k_warn(ab, "failed to set vdev %d HE MU mode: %d param_value %x\n",</div><div class='del'>-			    arvif-&gt;vdev_id, ret, param_value);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	param_id = WMI_VDEV_PARAM_SET_HE_SOUNDING_MODE;</div><div class='del'>-	param_value =</div><div class='del'>-		FIELD_PREP(HE_VHT_SOUNDING_MODE, HE_VHT_SOUNDING_MODE_ENABLE) |</div><div class='del'>-		FIELD_PREP(HE_TRIG_NONTRIG_SOUNDING_MODE,</div><div class='del'>-			   HE_TRIG_NONTRIG_SOUNDING_MODE_ENABLE);</div><div class='del'>-	ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='del'>-					    param_id, param_value);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ath11k_warn(ab, "failed to set vdev %d HE MU mode: %d\n",</div><div class='del'>-			    arvif-&gt;vdev_id, ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_mac_op_update_vif_offload(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -4627,7 +6863,8 @@ static void ath11k_mac_op_update_vif_offload(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (ath11k_frame_mode != ATH11K_HW_TXRX_ETHERNET ||</div><div class='ctx'> 	    (vif-&gt;type != NL80211_IFTYPE_STATION &amp;&amp;</div><div class='ctx'> 	     vif-&gt;type != NL80211_IFTYPE_AP))</div><div class='del'>-		vif-&gt;offload_flags &amp;= ~IEEE80211_OFFLOAD_ENCAP_ENABLED;</div><div class='add'>+		vif-&gt;offload_flags &amp;= ~(IEEE80211_OFFLOAD_ENCAP_ENABLED |</div><div class='add'>+					IEEE80211_OFFLOAD_DECAP_ENABLED);</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;offload_flags &amp; IEEE80211_OFFLOAD_ENCAP_ENABLED)</div><div class='ctx'> 		param_value = ATH11K_HW_TXRX_ETHERNET;</div><div class='hunk'>@@ -4643,6 +6880,184 @@ static void ath11k_mac_op_update_vif_offload(struct ieee80211_hw *hw,</div><div class='ctx'> 			    arvif-&gt;vdev_id, ret);</div><div class='ctx'> 		vif-&gt;offload_flags &amp;= ~IEEE80211_OFFLOAD_ENCAP_ENABLED;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	param_id = WMI_VDEV_PARAM_RX_DECAP_TYPE;</div><div class='add'>+	if (vif-&gt;offload_flags &amp; IEEE80211_OFFLOAD_DECAP_ENABLED)</div><div class='add'>+		param_value = ATH11K_HW_TXRX_ETHERNET;</div><div class='add'>+	else if (test_bit(ATH11K_FLAG_RAW_MODE, &amp;ab-&gt;dev_flags))</div><div class='add'>+		param_value = ATH11K_HW_TXRX_RAW;</div><div class='add'>+	else</div><div class='add'>+		param_value = ATH11K_HW_TXRX_NATIVE_WIFI;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+					    param_id, param_value);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to set vdev %d rx decap mode: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		vif-&gt;offload_flags &amp;= ~IEEE80211_OFFLOAD_DECAP_ENABLED;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath11k_mac_vif_ap_active_any(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar;</div><div class='add'>+	struct ath11k_pdev *pdev;</div><div class='add'>+	struct ath11k_vif *arvif;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		pdev = &amp;ab-&gt;pdevs[i];</div><div class='add'>+		ar = pdev-&gt;ar;</div><div class='add'>+		list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+			if (arvif-&gt;is_up &amp;&amp; arvif-&gt;vdev_type == WMI_VDEV_TYPE_AP)</div><div class='add'>+				return true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_mac_11d_scan_start(struct ath11k *ar, u32 vdev_id)</div><div class='add'>+{</div><div class='add'>+	struct wmi_11d_scan_start_params param;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;ab-&gt;vdev_id_11d_lock);</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "vdev id for 11d scan %d\n",</div><div class='add'>+		   ar-&gt;vdev_id_11d_scan);</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;regdom_set_by_user)</div><div class='add'>+		goto fin;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;vdev_id_11d_scan != ATH11K_11D_INVALID_VDEV_ID)</div><div class='add'>+		goto fin;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(WMI_TLV_SERVICE_11D_OFFLOAD, ar-&gt;ab-&gt;wmi_ab.svc_map))</div><div class='add'>+		goto fin;</div><div class='add'>+</div><div class='add'>+	if (ath11k_mac_vif_ap_active_any(ar-&gt;ab))</div><div class='add'>+		goto fin;</div><div class='add'>+</div><div class='add'>+	param.vdev_id = vdev_id;</div><div class='add'>+	param.start_interval_msec = 0;</div><div class='add'>+	param.scan_period_msec = ATH11K_SCAN_11D_INTERVAL;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "start 11d scan\n");</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_send_11d_scan_start_cmd(ar, &amp;param);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to start 11d scan vdev %d ret: %d\n",</div><div class='add'>+			    vdev_id, ret);</div><div class='add'>+	} else {</div><div class='add'>+		ar-&gt;vdev_id_11d_scan = vdev_id;</div><div class='add'>+		if (ar-&gt;state_11d == ATH11K_11D_PREPARING)</div><div class='add'>+			ar-&gt;state_11d = ATH11K_11D_RUNNING;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+fin:</div><div class='add'>+	if (ar-&gt;state_11d == ATH11K_11D_PREPARING) {</div><div class='add'>+		ar-&gt;state_11d = ATH11K_11D_IDLE;</div><div class='add'>+		complete(&amp;ar-&gt;completed_11d_scan);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;ab-&gt;vdev_id_11d_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_mac_11d_scan_stop(struct ath11k *ar)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(WMI_TLV_SERVICE_11D_OFFLOAD, ar-&gt;ab-&gt;wmi_ab.svc_map))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "stop 11d scan\n");</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;ab-&gt;vdev_id_11d_lock);</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "stop 11d vdev id %d\n",</div><div class='add'>+		   ar-&gt;vdev_id_11d_scan);</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;state_11d == ATH11K_11D_PREPARING) {</div><div class='add'>+		ar-&gt;state_11d = ATH11K_11D_IDLE;</div><div class='add'>+		complete(&amp;ar-&gt;completed_11d_scan);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;vdev_id_11d_scan != ATH11K_11D_INVALID_VDEV_ID) {</div><div class='add'>+		vdev_id = ar-&gt;vdev_id_11d_scan;</div><div class='add'>+</div><div class='add'>+		ret = ath11k_wmi_send_11d_scan_stop_cmd(ar, vdev_id);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab,</div><div class='add'>+				    "failed to stopt 11d scan vdev %d ret: %d\n",</div><div class='add'>+				    vdev_id, ret);</div><div class='add'>+		} else {</div><div class='add'>+			ar-&gt;vdev_id_11d_scan = ATH11K_11D_INVALID_VDEV_ID;</div><div class='add'>+			ar-&gt;state_11d = ATH11K_11D_IDLE;</div><div class='add'>+			complete(&amp;ar-&gt;completed_11d_scan);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;ab-&gt;vdev_id_11d_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_mac_11d_scan_stop_all(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar;</div><div class='add'>+	struct ath11k_pdev *pdev;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_MAC, "stop soc 11d scan\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		pdev = &amp;ab-&gt;pdevs[i];</div><div class='add'>+		ar = pdev-&gt;ar;</div><div class='add'>+</div><div class='add'>+		ath11k_mac_11d_scan_stop(ar);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_vdev_delete(struct ath11k *ar, struct ath11k_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	unsigned long time_left;</div><div class='add'>+	struct ieee80211_vif *vif = arvif-&gt;vif;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;ar-&gt;vdev_delete_done);</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_vdev_delete(ar, arvif-&gt;vdev_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to delete WMI vdev %d: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;ar-&gt;vdev_delete_done,</div><div class='add'>+						ATH11K_VDEV_DELETE_TIMEOUT_HZ);</div><div class='add'>+	if (time_left == 0) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "Timeout in receiving vdev delete response\n");</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;ab-&gt;free_vdev_map |= 1LL &lt;&lt; (arvif-&gt;vdev_id);</div><div class='add'>+	ar-&gt;allocated_vdev_map &amp;= ~(1LL &lt;&lt; arvif-&gt;vdev_id);</div><div class='add'>+	ar-&gt;num_created_vdevs--;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "vdev %pM deleted, vdev_id %d\n",</div><div class='add'>+		   vif-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_mac_bcn_tx_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_vif *arvif = container_of(work, struct ath11k_vif,</div><div class='add'>+						bcn_tx_work);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;arvif-&gt;ar-&gt;conf_mutex);</div><div class='add'>+	ath11k_mac_bcn_tx_event(arvif);</div><div class='add'>+	mutex_unlock(&amp;arvif-&gt;ar-&gt;conf_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -4651,12 +7066,12 @@ static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct ath11k *ar = hw-&gt;priv;</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='ctx'> 	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='del'>-	struct vdev_create_params vdev_param = {0};</div><div class='add'>+	struct vdev_create_params vdev_param = {};</div><div class='ctx'> 	struct peer_create_params peer_param;</div><div class='ctx'> 	u32 param_id, param_value;</div><div class='ctx'> 	u16 nss;</div><div class='ctx'> 	int i;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret, fbret;</div><div class='ctx'> 	int bit;</div><div class='ctx'> </div><div class='ctx'> 	vif-&gt;driver_flags |= IEEE80211_VIF_SUPPORTS_UAPSD;</div><div class='hunk'>@@ -4670,9 +7085,9 @@ static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;num_created_vdevs &gt; (TARGET_NUM_VDEVS - 1)) {</div><div class='del'>-		ath11k_warn(ab, "failed to create vdev, reached max vdev limit %d\n",</div><div class='del'>-			    TARGET_NUM_VDEVS);</div><div class='add'>+	if (ar-&gt;num_created_vdevs &gt; (TARGET_NUM_VDEVS(ab) - 1)) {</div><div class='add'>+		ath11k_warn(ab, "failed to create vdev %u, reached max vdev limit %d\n",</div><div class='add'>+			    ar-&gt;num_created_vdevs, TARGET_NUM_VDEVS(ab));</div><div class='ctx'> 		ret = -EBUSY;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4683,15 +7098,19 @@ static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	arvif-&gt;vif = vif;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;arvif-&gt;list);</div><div class='add'>+	INIT_WORK(&amp;arvif-&gt;bcn_tx_work, ath11k_mac_bcn_tx_work);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;arvif-&gt;connection_loss_work,</div><div class='ctx'> 			  ath11k_mac_vif_sta_connection_loss_work);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(arvif-&gt;bitrate_mask.control); i++) {</div><div class='ctx'> 		arvif-&gt;bitrate_mask.control[i].legacy = 0xffffffff;</div><div class='add'>+		arvif-&gt;bitrate_mask.control[i].gi = NL80211_TXRATE_FORCE_SGI;</div><div class='ctx'> 		memset(arvif-&gt;bitrate_mask.control[i].ht_mcs, 0xff,</div><div class='ctx'> 		       sizeof(arvif-&gt;bitrate_mask.control[i].ht_mcs));</div><div class='ctx'> 		memset(arvif-&gt;bitrate_mask.control[i].vht_mcs, 0xff,</div><div class='ctx'> 		       sizeof(arvif-&gt;bitrate_mask.control[i].vht_mcs));</div><div class='add'>+		memset(arvif-&gt;bitrate_mask.control[i].he_mcs, 0xff,</div><div class='add'>+		       sizeof(arvif-&gt;bitrate_mask.control[i].he_mcs));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bit = __ffs64(ab-&gt;free_vdev_map);</div><div class='hunk'>@@ -4703,22 +7122,32 @@ static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	case NL80211_IFTYPE_UNSPECIFIED:</div><div class='ctx'> 	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 		arvif-&gt;vdev_type = WMI_VDEV_TYPE_STA;</div><div class='add'>+		if (vif-&gt;p2p)</div><div class='add'>+			arvif-&gt;vdev_subtype = WMI_VDEV_SUBTYPE_P2P_CLIENT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_MESH_POINT:</div><div class='ctx'> 		arvif-&gt;vdev_subtype = WMI_VDEV_SUBTYPE_MESH_11S;</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='ctx'> 		arvif-&gt;vdev_type = WMI_VDEV_TYPE_AP;</div><div class='add'>+		if (vif-&gt;p2p)</div><div class='add'>+			arvif-&gt;vdev_subtype = WMI_VDEV_SUBTYPE_P2P_GO;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_MONITOR:</div><div class='ctx'> 		arvif-&gt;vdev_type = WMI_VDEV_TYPE_MONITOR;</div><div class='add'>+		ar-&gt;monitor_vdev_id = bit;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_P2P_DEVICE:</div><div class='add'>+		arvif-&gt;vdev_type = WMI_VDEV_TYPE_STA;</div><div class='add'>+		arvif-&gt;vdev_subtype = WMI_VDEV_SUBTYPE_P2P_DEVICE;</div><div class='ctx'> 		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "mac add interface id %d type %d subtype %d map %llx\n",</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "add interface id %d type %d subtype %d map %llx\n",</div><div class='ctx'> 		   arvif-&gt;vdev_id, arvif-&gt;vdev_type, arvif-&gt;vdev_subtype,</div><div class='ctx'> 		   ab-&gt;free_vdev_map);</div><div class='ctx'> </div><div class='hunk'>@@ -4726,7 +7155,12 @@ static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(vif-&gt;hw_queue); i++)</div><div class='ctx'> 		vif-&gt;hw_queue[i] = i % (ATH11K_HW_MAX_QUEUES - 1);</div><div class='ctx'> </div><div class='del'>-	ath11k_mac_setup_vdev_create_params(arvif, &amp;vdev_param);</div><div class='add'>+	ret = ath11k_mac_setup_vdev_create_params(arvif, &amp;vdev_param);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to create vdev parameters %d: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_wmi_vdev_create(ar, vif-&gt;addr, &amp;vdev_param);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -4774,6 +7208,8 @@ static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 				    arvif-&gt;vdev_id, ret);</div><div class='ctx'> 			goto err_peer_del;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		ath11k_mac_11d_scan_stop_all(ar-&gt;ab);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_VDEV_TYPE_STA:</div><div class='ctx'> 		param_id = WMI_STA_PS_PARAM_RX_WAKE_POLICY;</div><div class='hunk'>@@ -4806,12 +7242,21 @@ static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 			goto err_peer_del;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = ath11k_wmi_pdev_set_ps_mode(ar, arvif-&gt;vdev_id, false);</div><div class='add'>+		ret = ath11k_wmi_pdev_set_ps_mode(ar, arvif-&gt;vdev_id,</div><div class='add'>+						  WMI_STA_PS_MODE_DISABLED);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ath11k_warn(ar-&gt;ab, "failed to disable vdev %d ps mode: %d\n",</div><div class='ctx'> 				    arvif-&gt;vdev_id, ret);</div><div class='ctx'> 			goto err_peer_del;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (test_bit(WMI_TLV_SERVICE_11D_OFFLOAD, ab-&gt;wmi_ab.svc_map)) {</div><div class='add'>+			reinit_completion(&amp;ar-&gt;completed_11d_scan);</div><div class='add'>+			ar-&gt;state_11d = ATH11K_11D_PREPARING;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case WMI_VDEV_TYPE_MONITOR:</div><div class='add'>+		set_bit(ATH11K_FLAG_MONITOR_VDEV_CREATED, &amp;ar-&gt;monitor_flags);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -4833,35 +7278,38 @@ static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dp_vdev_tx_attach(ar, arvif);</div><div class='ctx'> </div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_MONITOR &amp;&amp;</div><div class='add'>+	    test_bit(ATH11K_FLAG_MONITOR_CONF_ENABLED, &amp;ar-&gt;monitor_flags)) {</div><div class='add'>+		ret = ath11k_mac_monitor_vdev_create(ar);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to create monitor vdev during add interface: %d",</div><div class='add'>+				    ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ath11k_wmi_supports_6ghz_cc_ext(ar)) {</div><div class='add'>+		struct cur_regulatory_info *reg_info;</div><div class='add'>+</div><div class='add'>+		reg_info = &amp;ab-&gt;reg_info_store[ar-&gt;pdev_idx];</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_MAC, "interface added to change reg rules\n");</div><div class='add'>+		ath11k_reg_handle_chan_list(ab, reg_info, IEEE80211_REG_LPI_AP);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_peer_del:</div><div class='ctx'> 	if (arvif-&gt;vdev_type == WMI_VDEV_TYPE_AP) {</div><div class='del'>-		reinit_completion(&amp;ar-&gt;peer_delete_done);</div><div class='del'>-</div><div class='del'>-		ret = ath11k_wmi_send_peer_delete_cmd(ar, vif-&gt;addr,</div><div class='del'>-						      arvif-&gt;vdev_id);</div><div class='del'>-		if (ret) {</div><div class='del'>-			ath11k_warn(ar-&gt;ab, "failed to delete peer vdev_id %d addr %pM\n",</div><div class='del'>-				    arvif-&gt;vdev_id, vif-&gt;addr);</div><div class='add'>+		fbret = ath11k_peer_delete(ar, arvif-&gt;vdev_id, vif-&gt;addr);</div><div class='add'>+		if (fbret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "fallback fail to delete peer addr %pM vdev_id %d ret %d\n",</div><div class='add'>+				    vif-&gt;addr, arvif-&gt;vdev_id, fbret);</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		ret = ath11k_wait_for_peer_delete_done(ar, arvif-&gt;vdev_id,</div><div class='del'>-						       vif-&gt;addr);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		ar-&gt;num_peers--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err_vdev_del:</div><div class='del'>-	ath11k_wmi_vdev_delete(ar, arvif-&gt;vdev_id);</div><div class='del'>-	ar-&gt;num_created_vdevs--;</div><div class='del'>-	ar-&gt;allocated_vdev_map &amp;= ~(1LL &lt;&lt; arvif-&gt;vdev_id);</div><div class='del'>-	ab-&gt;free_vdev_map |= 1LL &lt;&lt; arvif-&gt;vdev_id;</div><div class='add'>+	ath11k_mac_vdev_delete(ar, arvif);</div><div class='ctx'> 	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> 	list_del(&amp;arvif-&gt;list);</div><div class='ctx'> 	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='hunk'>@@ -4874,8 +7322,8 @@ err:</div><div class='ctx'> </div><div class='ctx'> static int ath11k_mac_vif_unref(int buf_id, void *skb, void *ctx)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_vif *vif = (struct ieee80211_vif *)ctx;</div><div class='del'>-	struct ath11k_skb_cb *skb_cb = ATH11K_SKB_CB((struct sk_buff *)skb);</div><div class='add'>+	struct ieee80211_vif *vif = ctx;</div><div class='add'>+	struct ath11k_skb_cb *skb_cb = ATH11K_SKB_CB(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (skb_cb-&gt;vif == vif)</div><div class='ctx'> 		skb_cb-&gt;vif = NULL;</div><div class='hunk'>@@ -4889,17 +7337,25 @@ static void ath11k_mac_op_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct ath11k *ar = hw-&gt;priv;</div><div class='ctx'> 	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='del'>-	unsigned long time_left;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	cancel_delayed_work_sync(&amp;arvif-&gt;connection_loss_work);</div><div class='add'>+	cancel_work_sync(&amp;arvif-&gt;bcn_tx_work);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_MAC, "mac remove interface (vdev %d)\n",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_MAC, "remove interface (vdev %d)\n",</div><div class='ctx'> 		   arvif-&gt;vdev_id);</div><div class='ctx'> </div><div class='add'>+	ret = ath11k_spectral_vif_stop(arvif);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath11k_warn(ab, "failed to stop spectral for vdev %i: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;vdev_type == WMI_VDEV_TYPE_STA)</div><div class='add'>+		ath11k_mac_11d_scan_stop(ar);</div><div class='add'>+</div><div class='ctx'> 	if (arvif-&gt;vdev_type == WMI_VDEV_TYPE_AP) {</div><div class='ctx'> 		ret = ath11k_peer_delete(ar, arvif-&gt;vdev_id, vif-&gt;addr);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -4907,29 +7363,25 @@ static void ath11k_mac_op_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 				    arvif-&gt;vdev_id, ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	reinit_completion(&amp;ar-&gt;vdev_delete_done);</div><div class='del'>-</div><div class='del'>-	ret = ath11k_wmi_vdev_delete(ar, arvif-&gt;vdev_id);</div><div class='add'>+	ret = ath11k_mac_vdev_delete(ar, arvif);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ath11k_warn(ab, "failed to delete WMI vdev %d: %d\n",</div><div class='add'>+		ath11k_warn(ab, "failed to delete vdev %d: %d\n",</div><div class='ctx'> 			    arvif-&gt;vdev_id, ret);</div><div class='ctx'> 		goto err_vdev_del;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	time_left = wait_for_completion_timeout(&amp;ar-&gt;vdev_delete_done,</div><div class='del'>-						ATH11K_VDEV_DELETE_TIMEOUT_HZ);</div><div class='del'>-	if (time_left == 0) {</div><div class='del'>-		ath11k_warn(ab, "Timeout in receiving vdev delete response\n");</div><div class='del'>-		goto err_vdev_del;</div><div class='add'>+	if (arvif-&gt;vdev_type == WMI_VDEV_TYPE_MONITOR) {</div><div class='add'>+		clear_bit(ATH11K_FLAG_MONITOR_VDEV_CREATED, &amp;ar-&gt;monitor_flags);</div><div class='add'>+		ar-&gt;monitor_vdev_id = -1;</div><div class='add'>+	} else if (test_bit(ATH11K_FLAG_MONITOR_VDEV_CREATED, &amp;ar-&gt;monitor_flags) &amp;&amp;</div><div class='add'>+		   !test_bit(ATH11K_FLAG_MONITOR_STARTED, &amp;ar-&gt;monitor_flags)) {</div><div class='add'>+		ret = ath11k_mac_monitor_vdev_delete(ar);</div><div class='add'>+		if (ret)</div><div class='add'>+			/* continue even if there's an error */</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to delete vdev monitor during remove interface: %d",</div><div class='add'>+				    ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ab-&gt;free_vdev_map |= 1LL &lt;&lt; (arvif-&gt;vdev_id);</div><div class='del'>-	ar-&gt;allocated_vdev_map &amp;= ~(1LL &lt;&lt; arvif-&gt;vdev_id);</div><div class='del'>-	ar-&gt;num_created_vdevs--;</div><div class='del'>-</div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_MAC, "vdev %pM deleted, vdev_id %d\n",</div><div class='del'>-		   vif-&gt;addr, arvif-&gt;vdev_id);</div><div class='del'>-</div><div class='ctx'> err_vdev_del:</div><div class='ctx'> 	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> 	list_del(&amp;arvif-&gt;list);</div><div class='hunk'>@@ -4940,7 +7392,7 @@ err_vdev_del:</div><div class='ctx'> 	idr_for_each(&amp;ar-&gt;txmgmt_idr,</div><div class='ctx'> 		     ath11k_mac_vif_txmgmt_idr_remove, vif);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; DP_TCL_NUM_RING_MAX; i++) {</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.max_tx_ring; i++) {</div><div class='ctx'> 		spin_lock_bh(&amp;ab-&gt;dp.tx_ring[i].tx_idr_lock);</div><div class='ctx'> 		idr_for_each(&amp;ab-&gt;dp.tx_ring[i].txbuf_idr,</div><div class='ctx'> 			     ath11k_mac_vif_unref, vif);</div><div class='hunk'>@@ -4949,9 +7401,8 @@ err_vdev_del:</div><div class='ctx'> </div><div class='ctx'> 	/* Recalc txpower for remaining vdev */</div><div class='ctx'> 	ath11k_mac_txpower_recalc(ar);</div><div class='del'>-	clear_bit(ATH11K_FLAG_MONITOR_ENABLED, &amp;ar-&gt;monitor_flags);</div><div class='ctx'> </div><div class='del'>-	/* TODO: recal traffic pause state based on the available vdevs */</div><div class='add'>+	/* TODO: recalc traffic pause state based on the available vdevs */</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> }</div><div class='hunk'>@@ -4972,36 +7423,17 @@ static void ath11k_mac_op_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> 					   u64 multicast)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = hw-&gt;priv;</div><div class='del'>-	bool reset_flag = false;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='del'>-	changed_flags &amp;= SUPPORTED_FILTERS;</div><div class='ctx'> 	*total_flags &amp;= SUPPORTED_FILTERS;</div><div class='ctx'> 	ar-&gt;filter_flags = *total_flags;</div><div class='ctx'> </div><div class='del'>-	/* For monitor mode */</div><div class='del'>-	reset_flag = !(ar-&gt;filter_flags &amp; FIF_BCN_PRBRESP_PROMISC);</div><div class='del'>-</div><div class='del'>-	ret = ath11k_dp_tx_htt_monitor_mode_ring_config(ar, reset_flag);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		if (!reset_flag)</div><div class='del'>-			set_bit(ATH11K_FLAG_MONITOR_ENABLED, &amp;ar-&gt;monitor_flags);</div><div class='del'>-		else</div><div class='del'>-			clear_bit(ATH11K_FLAG_MONITOR_ENABLED, &amp;ar-&gt;monitor_flags);</div><div class='del'>-	} else {</div><div class='del'>-		ath11k_warn(ar-&gt;ab,</div><div class='del'>-			    "fail to set monitor filter: %d\n", ret);</div><div class='del'>-	}</div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='del'>-		   "changed_flags:0x%x, total_flags:0x%x, reset_flag:%d\n",</div><div class='del'>-		   changed_flags, *total_flags, reset_flag);</div><div class='del'>-</div><div class='ctx'> 	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_mac_op_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant)</div><div class='add'>+static int ath11k_mac_op_get_antenna(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+				     u32 *tx_ant, u32 *rx_ant)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -5015,7 +7447,8 @@ static int ath11k_mac_op_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_mac_op_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)</div><div class='add'>+static int ath11k_mac_op_set_antenna(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+				     u32 tx_ant, u32 rx_ant)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = hw-&gt;priv;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -5067,7 +7500,7 @@ static int ath11k_mac_op_add_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_MAC,</div><div class='del'>-		   "mac chanctx add freq %u width %d ptr %pK\n",</div><div class='add'>+		   "chanctx add freq %u width %d ptr %p\n",</div><div class='ctx'> 		   ctx-&gt;def.chan-&gt;center_freq, ctx-&gt;def.width, ctx);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='hunk'>@@ -5091,7 +7524,7 @@ static void ath11k_mac_op_remove_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_MAC,</div><div class='del'>-		   "mac chanctx remove freq %u width %d ptr %pK\n",</div><div class='add'>+		   "chanctx remove freq %u width %d ptr %p\n",</div><div class='ctx'> 		   ctx-&gt;def.chan-&gt;center_freq, ctx-&gt;def.width, ctx);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='hunk'>@@ -5106,30 +7539,17 @@ static void ath11k_mac_op_remove_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> 	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ath11k_mac_vdev_setup_sync(struct ath11k *ar)</div><div class='del'>-{</div><div class='del'>-	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='del'>-</div><div class='del'>-	if (test_bit(ATH11K_FLAG_CRASH_FLUSH, &amp;ar-&gt;ab-&gt;dev_flags))</div><div class='del'>-		return -ESHUTDOWN;</div><div class='del'>-</div><div class='del'>-	if (!wait_for_completion_timeout(&amp;ar-&gt;vdev_setup_done,</div><div class='del'>-					 ATH11K_VDEV_SETUP_TIMEOUT_HZ))</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-	return ar-&gt;last_wmi_vdev_start_status ? -EINVAL : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int</div><div class='ctx'> ath11k_mac_vdev_start_restart(struct ath11k_vif *arvif,</div><div class='del'>-			      const struct cfg80211_chan_def *chandef,</div><div class='add'>+			      struct ieee80211_chanctx_conf *ctx,</div><div class='ctx'> 			      bool restart)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = arvif-&gt;ar;</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='ctx'> 	struct wmi_vdev_start_req_arg arg = {};</div><div class='del'>-	int he_support = arvif-&gt;vif-&gt;bss_conf.he_support;</div><div class='add'>+	const struct cfg80211_chan_def *chandef = &amp;ctx-&gt;def;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	unsigned int dfs_cac_time;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -5146,13 +7566,24 @@ ath11k_mac_vdev_start_restart(struct ath11k_vif *arvif,</div><div class='ctx'> 		ath11k_phymodes[chandef-&gt;chan-&gt;band][chandef-&gt;width];</div><div class='ctx'> </div><div class='ctx'> 	arg.channel.min_power = 0;</div><div class='del'>-	arg.channel.max_power = chandef-&gt;chan-&gt;max_power * 2;</div><div class='del'>-	arg.channel.max_reg_power = chandef-&gt;chan-&gt;max_reg_power * 2;</div><div class='del'>-	arg.channel.max_antenna_gain = chandef-&gt;chan-&gt;max_antenna_gain * 2;</div><div class='add'>+	arg.channel.max_power = chandef-&gt;chan-&gt;max_power;</div><div class='add'>+	arg.channel.max_reg_power = chandef-&gt;chan-&gt;max_reg_power;</div><div class='add'>+	arg.channel.max_antenna_gain = chandef-&gt;chan-&gt;max_antenna_gain;</div><div class='ctx'> </div><div class='ctx'> 	arg.pref_tx_streams = ar-&gt;num_tx_chains;</div><div class='ctx'> 	arg.pref_rx_streams = ar-&gt;num_rx_chains;</div><div class='ctx'> </div><div class='add'>+	arg.mbssid_flags = 0;</div><div class='add'>+	arg.mbssid_tx_vdev_id = 0;</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_MBSS_PARAM_IN_VDEV_START_SUPPORT,</div><div class='add'>+		     ar-&gt;ab-&gt;wmi_ab.svc_map)) {</div><div class='add'>+		ret = ath11k_mac_setup_vdev_params_mbssid(arvif,</div><div class='add'>+							  &amp;arg.mbssid_flags,</div><div class='add'>+							  &amp;arg.mbssid_tx_vdev_id);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (arvif-&gt;vdev_type == WMI_VDEV_TYPE_AP) {</div><div class='ctx'> 		arg.ssid = arvif-&gt;u.ap.ssid;</div><div class='ctx'> 		arg.ssid_len = arvif-&gt;u.ap.ssid_len;</div><div class='hunk'>@@ -5162,29 +7593,19 @@ ath11k_mac_vdev_start_restart(struct ath11k_vif *arvif,</div><div class='ctx'> 		arg.channel.chan_radar =</div><div class='ctx'> 			!!(chandef-&gt;chan-&gt;flags &amp; IEEE80211_CHAN_RADAR);</div><div class='ctx'> </div><div class='del'>-		arg.channel.freq2_radar =</div><div class='del'>-			!!(chandef-&gt;chan-&gt;flags &amp; IEEE80211_CHAN_RADAR);</div><div class='add'>+		arg.channel.freq2_radar = ctx-&gt;radar_enabled;</div><div class='ctx'> </div><div class='ctx'> 		arg.channel.passive = arg.channel.chan_radar;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='ctx'> 		arg.regdomain = ar-&gt;ab-&gt;dfs_region;</div><div class='ctx'> 		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='del'>-</div><div class='del'>-		if (he_support) {</div><div class='del'>-			ret = ath11k_set_he_mu_sounding_mode(ar, arvif);</div><div class='del'>-			if (ret) {</div><div class='del'>-				ath11k_warn(ar-&gt;ab, "failed to set he mode vdev %i\n",</div><div class='del'>-					    arg.vdev_id);</div><div class='del'>-				return ret;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	arg.channel.passive |= !!(chandef-&gt;chan-&gt;flags &amp; IEEE80211_CHAN_NO_IR);</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_MAC,</div><div class='del'>-		   "mac vdev %d start center_freq %d phymode %s\n",</div><div class='add'>+		   "vdev %d start center_freq %d phymode %s\n",</div><div class='ctx'> 		   arg.vdev_id, arg.channel.freq,</div><div class='ctx'> 		   ath11k_wmi_phymode_str(arg.channel.mode));</div><div class='ctx'> </div><div class='hunk'>@@ -5202,24 +7623,36 @@ ath11k_mac_vdev_start_restart(struct ath11k_vif *arvif,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ar-&gt;num_started_vdevs++;</div><div class='add'>+	/* TODO: For now we only set TPC power here. However when</div><div class='add'>+	 * channel changes, say CSA, it should be updated again.</div><div class='add'>+	 */</div><div class='add'>+	if (ath11k_mac_supports_station_tpc(ar, arvif, chandef)) {</div><div class='add'>+		ath11k_mac_fill_reg_tpc_info(ar, arvif-&gt;vif, &amp;arvif-&gt;chanctx);</div><div class='add'>+		ath11k_wmi_send_vdev_set_tpc_power(ar, arvif-&gt;vdev_id,</div><div class='add'>+						   &amp;arvif-&gt;reg_tpc_info);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!restart)</div><div class='add'>+		ar-&gt;num_started_vdevs++;</div><div class='add'>+</div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_MAC,  "vdev %pM started, vdev_id %d\n",</div><div class='ctx'> 		   arvif-&gt;vif-&gt;addr, arvif-&gt;vdev_id);</div><div class='ctx'> </div><div class='del'>-	/* Enable CAC Flag in the driver by checking the channel DFS cac time,</div><div class='del'>-	 * i.e dfs_cac_ms value which will be valid only for radar channels</div><div class='del'>-	 * and state as NL80211_DFS_USABLE which indicates CAC needs to be</div><div class='add'>+	/* Enable CAC Flag in the driver by checking the all sub-channel's DFS</div><div class='add'>+	 * state as NL80211_DFS_USABLE which indicates CAC needs to be</div><div class='ctx'> 	 * done before channel usage. This flags is used to drop rx packets.</div><div class='ctx'> 	 * during CAC.</div><div class='ctx'> 	 */</div><div class='ctx'> 	/* TODO Set the flag for other interface types as required */</div><div class='del'>-	if (arvif-&gt;vdev_type == WMI_VDEV_TYPE_AP &amp;&amp;</div><div class='del'>-	    chandef-&gt;chan-&gt;dfs_cac_ms &amp;&amp;</div><div class='del'>-	    chandef-&gt;chan-&gt;dfs_state == NL80211_DFS_USABLE) {</div><div class='add'>+	if (arvif-&gt;vdev_type == WMI_VDEV_TYPE_AP &amp;&amp; ctx-&gt;radar_enabled &amp;&amp;</div><div class='add'>+	    cfg80211_chandef_dfs_usable(ar-&gt;hw-&gt;wiphy, chandef)) {</div><div class='ctx'> 		set_bit(ATH11K_CAC_RUNNING, &amp;ar-&gt;dev_flags);</div><div class='add'>+		dfs_cac_time = cfg80211_chandef_dfs_cac_time(ar-&gt;hw-&gt;wiphy,</div><div class='add'>+							     chandef);</div><div class='ctx'> 		ath11k_dbg(ab, ATH11K_DBG_MAC,</div><div class='del'>-			   "CAC Started in chan_freq %d for vdev %d\n",</div><div class='del'>-			   arg.channel.freq, arg.vdev_id);</div><div class='add'>+			   "cac started dfs_cac_time %u center_freq %d center_freq1 %d for vdev %d\n",</div><div class='add'>+			   dfs_cac_time, arg.channel.freq, chandef-&gt;center_freq1,</div><div class='add'>+			   arg.vdev_id);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_mac_set_txbf_conf(arvif);</div><div class='hunk'>@@ -5271,15 +7704,15 @@ err:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath11k_mac_vdev_start(struct ath11k_vif *arvif,</div><div class='del'>-				 const struct cfg80211_chan_def *chandef)</div><div class='add'>+				 struct ieee80211_chanctx_conf *ctx)</div><div class='ctx'> {</div><div class='del'>-	return ath11k_mac_vdev_start_restart(arvif, chandef, false);</div><div class='add'>+	return ath11k_mac_vdev_start_restart(arvif, ctx, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath11k_mac_vdev_restart(struct ath11k_vif *arvif,</div><div class='del'>-				   const struct cfg80211_chan_def *chandef)</div><div class='add'>+				   struct ieee80211_chanctx_conf *ctx)</div><div class='ctx'> {</div><div class='del'>-	return ath11k_mac_vdev_start_restart(arvif, chandef, true);</div><div class='add'>+	return ath11k_mac_vdev_start_restart(arvif, ctx, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct ath11k_mac_change_chanctx_arg {</div><div class='hunk'>@@ -5295,7 +7728,7 @@ ath11k_mac_change_chanctx_cnt_iter(void *data, u8 *mac,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_mac_change_chanctx_arg *arg = data;</div><div class='ctx'> </div><div class='del'>-	if (rcu_access_pointer(vif-&gt;chanctx_conf) != arg-&gt;ctx)</div><div class='add'>+	if (rcu_access_pointer(vif-&gt;bss_conf.chanctx_conf) != arg-&gt;ctx)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	arg-&gt;n_vifs++;</div><div class='hunk'>@@ -5308,7 +7741,7 @@ ath11k_mac_change_chanctx_fill_iter(void *data, u8 *mac,</div><div class='ctx'> 	struct ath11k_mac_change_chanctx_arg *arg = data;</div><div class='ctx'> 	struct ieee80211_chanctx_conf *ctx;</div><div class='ctx'> </div><div class='del'>-	ctx = rcu_access_pointer(vif-&gt;chanctx_conf);</div><div class='add'>+	ctx = rcu_access_pointer(vif-&gt;bss_conf.chanctx_conf);</div><div class='ctx'> 	if (ctx != arg-&gt;ctx)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -5327,70 +7760,88 @@ ath11k_mac_update_vif_chan(struct ath11k *ar,</div><div class='ctx'> 			   int n_vifs)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='del'>-	struct ath11k_vif *arvif;</div><div class='add'>+	struct ath11k_vif *arvif, *tx_arvif;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int i;</div><div class='add'>+	bool monitor_vif = false;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; n_vifs; i++) {</div><div class='del'>-		arvif = (void *)vifs[i].vif-&gt;drv_priv;</div><div class='del'>-</div><div class='del'>-		ath11k_dbg(ab, ATH11K_DBG_MAC,</div><div class='del'>-			   "mac chanctx switch vdev_id %i freq %u-&gt;%u width %d-&gt;%d\n",</div><div class='del'>-			   arvif-&gt;vdev_id,</div><div class='del'>-			   vifs[i].old_ctx-&gt;def.chan-&gt;center_freq,</div><div class='del'>-			   vifs[i].new_ctx-&gt;def.chan-&gt;center_freq,</div><div class='del'>-			   vifs[i].old_ctx-&gt;def.width,</div><div class='del'>-			   vifs[i].new_ctx-&gt;def.width);</div><div class='del'>-</div><div class='del'>-		if (WARN_ON(!arvif-&gt;is_started))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (WARN_ON(!arvif-&gt;is_up))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ret = ath11k_wmi_vdev_down(ar, arvif-&gt;vdev_id);</div><div class='del'>-		if (ret) {</div><div class='del'>-			ath11k_warn(ab, "failed to down vdev %d: %d\n",</div><div class='del'>-				    arvif-&gt;vdev_id, ret);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* All relevant vdevs are downed and associated channel resources</div><div class='add'>+	/* Associated channel resources of all relevant vdevs</div><div class='ctx'> 	 * should be available for the channel switch now.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: Update ar-&gt;rx_channel */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; n_vifs; i++) {</div><div class='del'>-		arvif = (void *)vifs[i].vif-&gt;drv_priv;</div><div class='add'>+		arvif = ath11k_vif_to_arvif(vifs[i].vif);</div><div class='ctx'> </div><div class='ctx'> 		if (WARN_ON(!arvif-&gt;is_started))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (WARN_ON(!arvif-&gt;is_up))</div><div class='add'>+		/* change_chanctx can be called even before vdev_up from</div><div class='add'>+		 * ieee80211_start_ap-&gt;ieee80211_vif_use_channel-&gt;</div><div class='add'>+		 * ieee80211_recalc_radar_chanctx.</div><div class='add'>+		 *</div><div class='add'>+		 * Firmware expect vdev_restart only if vdev is up.</div><div class='add'>+		 * If vdev is down then it expect vdev_stop-&gt;vdev_start.</div><div class='add'>+		 */</div><div class='add'>+		if (arvif-&gt;is_up) {</div><div class='add'>+			ret = ath11k_mac_vdev_restart(arvif, vifs[i].new_ctx);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath11k_warn(ab, "failed to restart vdev %d: %d\n",</div><div class='add'>+					    arvif-&gt;vdev_id, ret);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			ret = ath11k_mac_vdev_stop(arvif);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath11k_warn(ab, "failed to stop vdev %d: %d\n",</div><div class='add'>+					    arvif-&gt;vdev_id, ret);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ret = ath11k_mac_vdev_start(arvif, vifs[i].new_ctx);</div><div class='add'>+			if (ret)</div><div class='add'>+				ath11k_warn(ab, "failed to start vdev %d: %d\n",</div><div class='add'>+					    arvif-&gt;vdev_id, ret);</div><div class='add'>+</div><div class='ctx'> 			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		ret = ath11k_mac_setup_bcn_tmpl(arvif);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			ath11k_warn(ab, "failed to update bcn tmpl during csa: %d\n",</div><div class='ctx'> 				    ret);</div><div class='ctx'> </div><div class='del'>-		ret = ath11k_mac_vdev_restart(arvif, &amp;vifs[i].new_ctx-&gt;def);</div><div class='add'>+		tx_arvif = ath11k_mac_get_tx_arvif(arvif);</div><div class='add'>+		ret = ath11k_wmi_vdev_up(arvif-&gt;ar, arvif-&gt;vdev_id, arvif-&gt;aid,</div><div class='add'>+					 arvif-&gt;bssid,</div><div class='add'>+					 tx_arvif ? tx_arvif-&gt;bssid : NULL,</div><div class='add'>+					 arvif-&gt;vif-&gt;bss_conf.bssid_index,</div><div class='add'>+					 1 &lt;&lt; arvif-&gt;vif-&gt;bss_conf.bssid_indicator);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ath11k_warn(ab, "failed to restart vdev %d: %d\n",</div><div class='add'>+			ath11k_warn(ab, "failed to bring vdev up %d: %d\n",</div><div class='ctx'> 				    arvif-&gt;vdev_id, ret);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		ret = ath11k_wmi_vdev_up(arvif-&gt;ar, arvif-&gt;vdev_id, arvif-&gt;aid,</div><div class='del'>-					 arvif-&gt;bssid);</div><div class='add'>+	/* Restart the internal monitor vdev on new channel */</div><div class='add'>+	if (!monitor_vif &amp;&amp;</div><div class='add'>+	    test_bit(ATH11K_FLAG_MONITOR_VDEV_CREATED, &amp;ar-&gt;monitor_flags)) {</div><div class='add'>+		ret = ath11k_mac_monitor_stop(ar);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ath11k_warn(ab, "failed to bring vdev up %d: %d\n",</div><div class='del'>-				    arvif-&gt;vdev_id, ret);</div><div class='del'>-			continue;</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to stop monitor during vif channel update: %d",</div><div class='add'>+				    ret);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ath11k_mac_monitor_start(ar);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to start monitor during vif channel update: %d",</div><div class='add'>+				    ret);</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -5434,7 +7885,7 @@ static void ath11k_mac_op_change_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_MAC,</div><div class='del'>-		   "mac chanctx change freq %u width %d ptr %pK changed %x\n",</div><div class='add'>+		   "chanctx change freq %u width %d ptr %p changed %x\n",</div><div class='ctx'> 		   ctx-&gt;def.chan-&gt;center_freq, ctx-&gt;def.width, ctx, changed);</div><div class='ctx'> </div><div class='ctx'> 	/* This shouldn't really happen because channel switching should use</div><div class='hunk'>@@ -5443,7 +7894,8 @@ static void ath11k_mac_op_change_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (WARN_ON(changed &amp; IEEE80211_CHANCTX_CHANGE_CHANNEL))</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='del'>-	if (changed &amp; IEEE80211_CHANCTX_CHANGE_WIDTH)</div><div class='add'>+	if (changed &amp; IEEE80211_CHANCTX_CHANGE_WIDTH ||</div><div class='add'>+	    changed &amp; IEEE80211_CHANCTX_CHANGE_RADAR)</div><div class='ctx'> 		ath11k_mac_update_active_vif_chan(ar, ctx);</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: Recalc radar detection */</div><div class='hunk'>@@ -5452,18 +7904,18 @@ unlock:</div><div class='ctx'> 	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_start_vdev_delay(struct ieee80211_hw *hw,</div><div class='del'>-				   struct ieee80211_vif *vif)</div><div class='add'>+static int ath11k_mac_start_vdev_delay(struct ieee80211_hw *hw,</div><div class='add'>+				       struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = hw-&gt;priv;</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='del'>-	struct ath11k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(arvif-&gt;is_started))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_mac_vdev_start(arvif, &amp;arvif-&gt;chanctx.def);</div><div class='add'>+	ret = ath11k_mac_vdev_start(arvif, &amp;arvif-&gt;chanctx);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ab, "failed to start vdev %i addr %pM on freq %d: %d\n",</div><div class='ctx'> 			    arvif-&gt;vdev_id, vif-&gt;addr,</div><div class='hunk'>@@ -5471,8 +7923,22 @@ static int ath11k_start_vdev_delay(struct ieee80211_hw *hw,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Reconfigure hardware rate code since it is cleared by firmware.</div><div class='add'>+	 */</div><div class='add'>+	if (ar-&gt;hw_rate_code &gt; 0) {</div><div class='add'>+		u32 vdev_param = WMI_VDEV_PARAM_MGMT_RATE;</div><div class='add'>+</div><div class='add'>+		ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id, vdev_param,</div><div class='add'>+						    ar-&gt;hw_rate_code);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to set mgmt tx rate %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (arvif-&gt;vdev_type == WMI_VDEV_TYPE_MONITOR) {</div><div class='del'>-		ret = ath11k_monitor_vdev_up(ar, arvif-&gt;vdev_id);</div><div class='add'>+		ret = ath11k_wmi_vdev_up(ar, arvif-&gt;vdev_id, 0, ar-&gt;mac_addr,</div><div class='add'>+					 NULL, 0, 0);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ath11k_warn(ab, "failed put monitor up: %d\n", ret);</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -5485,23 +7951,452 @@ static int ath11k_start_vdev_delay(struct ieee80211_hw *hw,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ath11k_mac_stop_vdev_early(struct ieee80211_hw *hw,</div><div class='add'>+				      struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = hw-&gt;priv;</div><div class='add'>+	struct ath11k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!arvif-&gt;is_started))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_mac_vdev_stop(arvif);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to stop vdev %i: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arvif-&gt;is_started = false;</div><div class='add'>+</div><div class='add'>+	/* TODO: Setup ps and cts/rts protection */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath11k_mac_get_num_pwr_levels(struct cfg80211_chan_def *chan_def)</div><div class='add'>+{</div><div class='add'>+	if (chan_def-&gt;chan-&gt;flags &amp; IEEE80211_CHAN_PSD) {</div><div class='add'>+		switch (chan_def-&gt;width) {</div><div class='add'>+		case NL80211_CHAN_WIDTH_20:</div><div class='add'>+			return 1;</div><div class='add'>+		case NL80211_CHAN_WIDTH_40:</div><div class='add'>+			return 2;</div><div class='add'>+		case NL80211_CHAN_WIDTH_80:</div><div class='add'>+			return 4;</div><div class='add'>+		case NL80211_CHAN_WIDTH_80P80:</div><div class='add'>+		case NL80211_CHAN_WIDTH_160:</div><div class='add'>+			return 8;</div><div class='add'>+		default:</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		switch (chan_def-&gt;width) {</div><div class='add'>+		case NL80211_CHAN_WIDTH_20:</div><div class='add'>+			return 1;</div><div class='add'>+		case NL80211_CHAN_WIDTH_40:</div><div class='add'>+			return 2;</div><div class='add'>+		case NL80211_CHAN_WIDTH_80:</div><div class='add'>+			return 3;</div><div class='add'>+		case NL80211_CHAN_WIDTH_80P80:</div><div class='add'>+		case NL80211_CHAN_WIDTH_160:</div><div class='add'>+			return 4;</div><div class='add'>+		default:</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath11k_mac_get_6ghz_start_frequency(struct cfg80211_chan_def *chan_def)</div><div class='add'>+{</div><div class='add'>+	u16 diff_seq;</div><div class='add'>+</div><div class='add'>+	/* It is to get the lowest channel number's center frequency of the chan.</div><div class='add'>+	 * For example,</div><div class='add'>+	 * bandwidth=40 MHz, center frequency is 5965, lowest channel is 1</div><div class='add'>+	 * with center frequency 5955, its diff is 5965 - 5955 = 10.</div><div class='add'>+	 * bandwidth=80 MHz, center frequency is 5985, lowest channel is 1</div><div class='add'>+	 * with center frequency 5955, its diff is 5985 - 5955 = 30.</div><div class='add'>+	 * bandwidth=160 MHz, center frequency is 6025, lowest channel is 1</div><div class='add'>+	 * with center frequency 5955, its diff is 6025 - 5955 = 70.</div><div class='add'>+	 */</div><div class='add'>+	switch (chan_def-&gt;width) {</div><div class='add'>+	case NL80211_CHAN_WIDTH_160:</div><div class='add'>+		diff_seq = 70;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_80:</div><div class='add'>+	case NL80211_CHAN_WIDTH_80P80:</div><div class='add'>+		diff_seq = 30;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_40:</div><div class='add'>+		diff_seq = 10;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		diff_seq = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return chan_def-&gt;center_freq1 - diff_seq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath11k_mac_get_seg_freq(struct cfg80211_chan_def *chan_def,</div><div class='add'>+				   u16 start_seq, u8 seq)</div><div class='add'>+{</div><div class='add'>+	u16 seg_seq;</div><div class='add'>+</div><div class='add'>+	/* It is to get the center frequency of the specific bandwidth.</div><div class='add'>+	 * start_seq means the lowest channel number's center frequency.</div><div class='add'>+	 * seq 0/1/2/3 means 20 MHz/40 MHz/80 MHz/160 MHz&amp;80P80.</div><div class='add'>+	 * For example,</div><div class='add'>+	 * lowest channel is 1, its center frequency 5955,</div><div class='add'>+	 * center frequency is 5955 when bandwidth=20 MHz, its diff is 5955 - 5955 = 0.</div><div class='add'>+	 * lowest channel is 1, its center frequency 5955,</div><div class='add'>+	 * center frequency is 5965 when bandwidth=40 MHz, its diff is 5965 - 5955 = 10.</div><div class='add'>+	 * lowest channel is 1, its center frequency 5955,</div><div class='add'>+	 * center frequency is 5985 when bandwidth=80 MHz, its diff is 5985 - 5955 = 30.</div><div class='add'>+	 * lowest channel is 1, its center frequency 5955,</div><div class='add'>+	 * center frequency is 6025 when bandwidth=160 MHz, its diff is 6025 - 5955 = 70.</div><div class='add'>+	 */</div><div class='add'>+	if (chan_def-&gt;width == NL80211_CHAN_WIDTH_80P80 &amp;&amp; seq == 3)</div><div class='add'>+		return chan_def-&gt;center_freq2;</div><div class='add'>+</div><div class='add'>+	seg_seq = 10 * (BIT(seq) - 1);</div><div class='add'>+	return seg_seq + start_seq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_mac_get_psd_channel(struct ath11k *ar,</div><div class='add'>+				       u16 step_freq,</div><div class='add'>+				       u16 *start_freq,</div><div class='add'>+				       u16 *center_freq,</div><div class='add'>+				       u8 i,</div><div class='add'>+				       struct ieee80211_channel **temp_chan,</div><div class='add'>+				       s8 *tx_power)</div><div class='add'>+{</div><div class='add'>+	/* It is to get the center frequency for each 20 MHz.</div><div class='add'>+	 * For example, if the chan is 160 MHz and center frequency is 6025,</div><div class='add'>+	 * then it include 8 channels, they are 1/5/9/13/17/21/25/29,</div><div class='add'>+	 * channel number 1's center frequency is 5955, it is parameter start_freq.</div><div class='add'>+	 * parameter i is the step of the 8 channels. i is 0~7 for the 8 channels.</div><div class='add'>+	 * the channel 1/5/9/13/17/21/25/29 maps i=0/1/2/3/4/5/6/7,</div><div class='add'>+	 * and maps its center frequency is 5955/5975/5995/6015/6035/6055/6075/6095,</div><div class='add'>+	 * the gap is 20 for each channel, parameter step_freq means the gap.</div><div class='add'>+	 * after get the center frequency of each channel, it is easy to find the</div><div class='add'>+	 * struct ieee80211_channel of it and get the max_reg_power.</div><div class='add'>+	 */</div><div class='add'>+	*center_freq = *start_freq + i * step_freq;</div><div class='add'>+	*temp_chan = ieee80211_get_channel(ar-&gt;hw-&gt;wiphy, *center_freq);</div><div class='add'>+	*tx_power = (*temp_chan)-&gt;max_reg_power;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_mac_get_eirp_power(struct ath11k *ar,</div><div class='add'>+				      u16 *start_freq,</div><div class='add'>+				      u16 *center_freq,</div><div class='add'>+				      u8 i,</div><div class='add'>+				      struct ieee80211_channel **temp_chan,</div><div class='add'>+				      struct cfg80211_chan_def *def,</div><div class='add'>+				      s8 *tx_power)</div><div class='add'>+{</div><div class='add'>+	/* It is to get the center frequency for 20 MHz/40 MHz/80 MHz/</div><div class='add'>+	 * 160 MHz&amp;80P80 bandwidth, and then plus 10 to the center frequency,</div><div class='add'>+	 * it is the center frequency of a channel number.</div><div class='add'>+	 * For example, when configured channel number is 1.</div><div class='add'>+	 * center frequency is 5965 when bandwidth=40 MHz, after plus 10, it is 5975,</div><div class='add'>+	 * then it is channel number 5.</div><div class='add'>+	 * center frequency is 5985 when bandwidth=80 MHz, after plus 10, it is 5995,</div><div class='add'>+	 * then it is channel number 9.</div><div class='add'>+	 * center frequency is 6025 when bandwidth=160 MHz, after plus 10, it is 6035,</div><div class='add'>+	 * then it is channel number 17.</div><div class='add'>+	 * after get the center frequency of each channel, it is easy to find the</div><div class='add'>+	 * struct ieee80211_channel of it and get the max_reg_power.</div><div class='add'>+	 */</div><div class='add'>+	*center_freq = ath11k_mac_get_seg_freq(def, *start_freq, i);</div><div class='add'>+</div><div class='add'>+	/* For the 20 MHz, its center frequency is same with same channel */</div><div class='add'>+	if (i != 0)</div><div class='add'>+		*center_freq += 10;</div><div class='add'>+</div><div class='add'>+	*temp_chan = ieee80211_get_channel(ar-&gt;hw-&gt;wiphy, *center_freq);</div><div class='add'>+	*tx_power = (*temp_chan)-&gt;max_reg_power;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_mac_fill_reg_tpc_info(struct ath11k *ar,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='add'>+	struct ieee80211_bss_conf *bss_conf = &amp;vif-&gt;bss_conf;</div><div class='add'>+	struct ath11k_reg_tpc_power_info *reg_tpc_info = &amp;arvif-&gt;reg_tpc_info;</div><div class='add'>+	struct ieee80211_channel *chan, *temp_chan;</div><div class='add'>+	u8 pwr_lvl_idx, num_pwr_levels, pwr_reduction;</div><div class='add'>+	bool is_psd_power = false, is_tpe_present = false;</div><div class='add'>+	s8 max_tx_power[ATH11K_NUM_PWR_LEVELS],</div><div class='add'>+		psd_power, tx_power;</div><div class='add'>+	s8 eirp_power = 0;</div><div class='add'>+	u16 start_freq, center_freq;</div><div class='add'>+</div><div class='add'>+	chan = ctx-&gt;def.chan;</div><div class='add'>+	start_freq = ath11k_mac_get_6ghz_start_frequency(&amp;ctx-&gt;def);</div><div class='add'>+	pwr_reduction = bss_conf-&gt;pwr_reduction;</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;reg_tpc_info.num_pwr_levels) {</div><div class='add'>+		is_tpe_present = true;</div><div class='add'>+		num_pwr_levels = arvif-&gt;reg_tpc_info.num_pwr_levels;</div><div class='add'>+	} else {</div><div class='add'>+		num_pwr_levels =</div><div class='add'>+			ath11k_mac_get_num_pwr_levels(&amp;bss_conf-&gt;chanreq.oper);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (pwr_lvl_idx = 0; pwr_lvl_idx &lt; num_pwr_levels; pwr_lvl_idx++) {</div><div class='add'>+		/* STA received TPE IE*/</div><div class='add'>+		if (is_tpe_present) {</div><div class='add'>+			/* local power is PSD power*/</div><div class='add'>+			if (chan-&gt;flags &amp; IEEE80211_CHAN_PSD) {</div><div class='add'>+				/* Connecting AP is psd power */</div><div class='add'>+				if (reg_tpc_info-&gt;is_psd_power) {</div><div class='add'>+					is_psd_power = true;</div><div class='add'>+					ath11k_mac_get_psd_channel(ar, 20,</div><div class='add'>+								   &amp;start_freq,</div><div class='add'>+								   &amp;center_freq,</div><div class='add'>+								   pwr_lvl_idx,</div><div class='add'>+								   &amp;temp_chan,</div><div class='add'>+								   &amp;tx_power);</div><div class='add'>+					psd_power = temp_chan-&gt;psd;</div><div class='add'>+					eirp_power = tx_power;</div><div class='add'>+					max_tx_power[pwr_lvl_idx] =</div><div class='add'>+						min_t(s8,</div><div class='add'>+						      psd_power,</div><div class='add'>+						      reg_tpc_info-&gt;tpe[pwr_lvl_idx]);</div><div class='add'>+				/* Connecting AP is not psd power */</div><div class='add'>+				} else {</div><div class='add'>+					ath11k_mac_get_eirp_power(ar,</div><div class='add'>+								  &amp;start_freq,</div><div class='add'>+								  &amp;center_freq,</div><div class='add'>+								  pwr_lvl_idx,</div><div class='add'>+								  &amp;temp_chan,</div><div class='add'>+								  &amp;ctx-&gt;def,</div><div class='add'>+								  &amp;tx_power);</div><div class='add'>+					psd_power = temp_chan-&gt;psd;</div><div class='add'>+					/* convert psd power to EIRP power based</div><div class='add'>+					 * on channel width</div><div class='add'>+					 */</div><div class='add'>+					tx_power =</div><div class='add'>+						min_t(s8, tx_power,</div><div class='add'>+						      psd_power + 13 + pwr_lvl_idx * 3);</div><div class='add'>+					max_tx_power[pwr_lvl_idx] =</div><div class='add'>+						min_t(s8,</div><div class='add'>+						      tx_power,</div><div class='add'>+						      reg_tpc_info-&gt;tpe[pwr_lvl_idx]);</div><div class='add'>+				}</div><div class='add'>+			/* local power is not PSD power */</div><div class='add'>+			} else {</div><div class='add'>+				/* Connecting AP is psd power */</div><div class='add'>+				if (reg_tpc_info-&gt;is_psd_power) {</div><div class='add'>+					is_psd_power = true;</div><div class='add'>+					ath11k_mac_get_psd_channel(ar, 20,</div><div class='add'>+								   &amp;start_freq,</div><div class='add'>+								   &amp;center_freq,</div><div class='add'>+								   pwr_lvl_idx,</div><div class='add'>+								   &amp;temp_chan,</div><div class='add'>+								   &amp;tx_power);</div><div class='add'>+					eirp_power = tx_power;</div><div class='add'>+					max_tx_power[pwr_lvl_idx] =</div><div class='add'>+						reg_tpc_info-&gt;tpe[pwr_lvl_idx];</div><div class='add'>+				/* Connecting AP is not psd power */</div><div class='add'>+				} else {</div><div class='add'>+					ath11k_mac_get_eirp_power(ar,</div><div class='add'>+								  &amp;start_freq,</div><div class='add'>+								  &amp;center_freq,</div><div class='add'>+								  pwr_lvl_idx,</div><div class='add'>+								  &amp;temp_chan,</div><div class='add'>+								  &amp;ctx-&gt;def,</div><div class='add'>+								  &amp;tx_power);</div><div class='add'>+					max_tx_power[pwr_lvl_idx] =</div><div class='add'>+						min_t(s8,</div><div class='add'>+						      tx_power,</div><div class='add'>+						      reg_tpc_info-&gt;tpe[pwr_lvl_idx]);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		/* STA not received TPE IE */</div><div class='add'>+		} else {</div><div class='add'>+			/* local power is PSD power*/</div><div class='add'>+			if (chan-&gt;flags &amp; IEEE80211_CHAN_PSD) {</div><div class='add'>+				is_psd_power = true;</div><div class='add'>+				ath11k_mac_get_psd_channel(ar, 20,</div><div class='add'>+							   &amp;start_freq,</div><div class='add'>+							   &amp;center_freq,</div><div class='add'>+							   pwr_lvl_idx,</div><div class='add'>+							   &amp;temp_chan,</div><div class='add'>+							   &amp;tx_power);</div><div class='add'>+				psd_power = temp_chan-&gt;psd;</div><div class='add'>+				eirp_power = tx_power;</div><div class='add'>+				max_tx_power[pwr_lvl_idx] = psd_power;</div><div class='add'>+			} else {</div><div class='add'>+				ath11k_mac_get_eirp_power(ar,</div><div class='add'>+							  &amp;start_freq,</div><div class='add'>+							  &amp;center_freq,</div><div class='add'>+							  pwr_lvl_idx,</div><div class='add'>+							  &amp;temp_chan,</div><div class='add'>+							  &amp;ctx-&gt;def,</div><div class='add'>+							  &amp;tx_power);</div><div class='add'>+				max_tx_power[pwr_lvl_idx] = tx_power;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (is_psd_power) {</div><div class='add'>+			/* If AP local power constraint is present */</div><div class='add'>+			if (pwr_reduction)</div><div class='add'>+				eirp_power = eirp_power - pwr_reduction;</div><div class='add'>+</div><div class='add'>+			/* If firmware updated max tx power is non zero, then take</div><div class='add'>+			 * the min of firmware updated ap tx power</div><div class='add'>+			 * and max power derived from above mentioned parameters.</div><div class='add'>+			 */</div><div class='add'>+			ath11k_dbg(ab, ATH11K_DBG_MAC,</div><div class='add'>+				   "eirp power : %d firmware report power : %d\n",</div><div class='add'>+				   eirp_power, ar-&gt;max_allowed_tx_power);</div><div class='add'>+			/* Firmware reports lower max_allowed_tx_power during vdev</div><div class='add'>+			 * start response. In case of 6 GHz, firmware is not aware</div><div class='add'>+			 * of EIRP power unless driver sets EIRP power through WMI</div><div class='add'>+			 * TPC command. So radio which does not support idle power</div><div class='add'>+			 * save can set maximum calculated EIRP power directly to</div><div class='add'>+			 * firmware through TPC command without min comparison with</div><div class='add'>+			 * vdev start response's max_allowed_tx_power.</div><div class='add'>+			 */</div><div class='add'>+			if (ar-&gt;max_allowed_tx_power &amp;&amp; ab-&gt;hw_params.idle_ps)</div><div class='add'>+				eirp_power = min_t(s8,</div><div class='add'>+						   eirp_power,</div><div class='add'>+						   ar-&gt;max_allowed_tx_power);</div><div class='add'>+		} else {</div><div class='add'>+			/* If AP local power constraint is present */</div><div class='add'>+			if (pwr_reduction)</div><div class='add'>+				max_tx_power[pwr_lvl_idx] =</div><div class='add'>+					max_tx_power[pwr_lvl_idx] - pwr_reduction;</div><div class='add'>+			/* If firmware updated max tx power is non zero, then take</div><div class='add'>+			 * the min of firmware updated ap tx power</div><div class='add'>+			 * and max power derived from above mentioned parameters.</div><div class='add'>+			 */</div><div class='add'>+			if (ar-&gt;max_allowed_tx_power &amp;&amp; ab-&gt;hw_params.idle_ps)</div><div class='add'>+				max_tx_power[pwr_lvl_idx] =</div><div class='add'>+					min_t(s8,</div><div class='add'>+					      max_tx_power[pwr_lvl_idx],</div><div class='add'>+					      ar-&gt;max_allowed_tx_power);</div><div class='add'>+		}</div><div class='add'>+		reg_tpc_info-&gt;chan_power_info[pwr_lvl_idx].chan_cfreq = center_freq;</div><div class='add'>+		reg_tpc_info-&gt;chan_power_info[pwr_lvl_idx].tx_power =</div><div class='add'>+			max_tx_power[pwr_lvl_idx];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg_tpc_info-&gt;num_pwr_levels = num_pwr_levels;</div><div class='add'>+	reg_tpc_info-&gt;is_psd_power = is_psd_power;</div><div class='add'>+	reg_tpc_info-&gt;eirp_power = eirp_power;</div><div class='add'>+	reg_tpc_info-&gt;ap_power_type =</div><div class='add'>+		ath11k_reg_ap_pwr_convert(vif-&gt;bss_conf.power_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_mac_parse_tx_pwr_env(struct ath11k *ar,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='add'>+	struct ieee80211_bss_conf *bss_conf = &amp;vif-&gt;bss_conf;</div><div class='add'>+	struct ieee80211_parsed_tpe_eirp *non_psd = NULL;</div><div class='add'>+	struct ieee80211_parsed_tpe_psd *psd = NULL;</div><div class='add'>+	enum wmi_reg_6ghz_client_type client_type;</div><div class='add'>+	struct cur_regulatory_info *reg_info;</div><div class='add'>+	u8 local_tpe_count, reg_tpe_count;</div><div class='add'>+	bool use_local_tpe;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	reg_info = &amp;ab-&gt;reg_info_store[ar-&gt;pdev_idx];</div><div class='add'>+	client_type = reg_info-&gt;client_type;</div><div class='add'>+</div><div class='add'>+	local_tpe_count =</div><div class='add'>+		bss_conf-&gt;tpe.max_local[client_type].valid +</div><div class='add'>+		bss_conf-&gt;tpe.psd_local[client_type].valid;</div><div class='add'>+	reg_tpe_count =</div><div class='add'>+		bss_conf-&gt;tpe.max_reg_client[client_type].valid +</div><div class='add'>+		bss_conf-&gt;tpe.psd_reg_client[client_type].valid;</div><div class='add'>+</div><div class='add'>+	if (!reg_tpe_count &amp;&amp; !local_tpe_count) {</div><div class='add'>+		ath11k_warn(ab,</div><div class='add'>+			    "no transmit power envelope match client power type %d\n",</div><div class='add'>+			    client_type);</div><div class='add'>+		return;</div><div class='add'>+	} else if (!reg_tpe_count) {</div><div class='add'>+		use_local_tpe = true;</div><div class='add'>+	} else {</div><div class='add'>+		use_local_tpe = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (use_local_tpe) {</div><div class='add'>+		psd = &amp;bss_conf-&gt;tpe.psd_local[client_type];</div><div class='add'>+		if (!psd-&gt;valid)</div><div class='add'>+			psd = NULL;</div><div class='add'>+		non_psd = &amp;bss_conf-&gt;tpe.max_local[client_type];</div><div class='add'>+		if (!non_psd-&gt;valid)</div><div class='add'>+			non_psd = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		psd = &amp;bss_conf-&gt;tpe.psd_reg_client[client_type];</div><div class='add'>+		if (!psd-&gt;valid)</div><div class='add'>+			psd = NULL;</div><div class='add'>+		non_psd = &amp;bss_conf-&gt;tpe.max_reg_client[client_type];</div><div class='add'>+		if (!non_psd-&gt;valid)</div><div class='add'>+			non_psd = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (non_psd &amp;&amp; !psd) {</div><div class='add'>+		arvif-&gt;reg_tpc_info.is_psd_power = false;</div><div class='add'>+		arvif-&gt;reg_tpc_info.eirp_power = 0;</div><div class='add'>+</div><div class='add'>+		arvif-&gt;reg_tpc_info.num_pwr_levels = non_psd-&gt;count;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; arvif-&gt;reg_tpc_info.num_pwr_levels; i++) {</div><div class='add'>+			ath11k_dbg(ab, ATH11K_DBG_MAC,</div><div class='add'>+				   "non PSD power[%d] : %d\n",</div><div class='add'>+				   i, non_psd-&gt;power[i]);</div><div class='add'>+			arvif-&gt;reg_tpc_info.tpe[i] = non_psd-&gt;power[i] / 2;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (psd) {</div><div class='add'>+		arvif-&gt;reg_tpc_info.is_psd_power = true;</div><div class='add'>+		arvif-&gt;reg_tpc_info.num_pwr_levels = psd-&gt;count;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; arvif-&gt;reg_tpc_info.num_pwr_levels; i++) {</div><div class='add'>+			ath11k_dbg(ab, ATH11K_DBG_MAC,</div><div class='add'>+				   "TPE PSD power[%d] : %d\n",</div><div class='add'>+				   i, psd-&gt;power[i]);</div><div class='add'>+			arvif-&gt;reg_tpc_info.tpe[i] = psd-&gt;power[i] / 2;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> 				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_bss_conf *link_conf,</div><div class='ctx'> 				 struct ieee80211_chanctx_conf *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = hw-&gt;priv;</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='del'>-	struct ath11k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct peer_create_params param;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_MAC,</div><div class='del'>-		   "mac chanctx assign ptr %pK vdev_id %i\n",</div><div class='add'>+		   "chanctx assign ptr %p vdev_id %i\n",</div><div class='ctx'> 		   ctx, arvif-&gt;vdev_id);</div><div class='ctx'> </div><div class='add'>+	if (ath11k_wmi_supports_6ghz_cc_ext(ar) &amp;&amp;</div><div class='add'>+	    ctx-&gt;def.chan-&gt;band == NL80211_BAND_6GHZ &amp;&amp;</div><div class='add'>+	    arvif-&gt;vdev_type == WMI_VDEV_TYPE_STA) {</div><div class='add'>+		arvif-&gt;chanctx = *ctx;</div><div class='add'>+		ath11k_mac_parse_tx_pwr_env(ar, vif, ctx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* for QCA6390 bss peer must be created before vdev_start */</div><div class='ctx'> 	if (ab-&gt;hw_params.vdev_start_delay &amp;&amp;</div><div class='ctx'> 	    arvif-&gt;vdev_type != WMI_VDEV_TYPE_AP &amp;&amp;</div><div class='hunk'>@@ -5517,35 +8412,39 @@ ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ab-&gt;hw_params.vdev_start_delay &amp;&amp;</div><div class='del'>-	    arvif-&gt;vdev_type != WMI_VDEV_TYPE_AP &amp;&amp;</div><div class='del'>-	    arvif-&gt;vdev_type != WMI_VDEV_TYPE_MONITOR) {</div><div class='del'>-		param.vdev_id = arvif-&gt;vdev_id;</div><div class='del'>-		param.peer_type = WMI_PEER_TYPE_DEFAULT;</div><div class='del'>-		param.peer_addr = ar-&gt;mac_addr;</div><div class='del'>-</div><div class='del'>-		ret = ath11k_peer_create(ar, arvif, NULL, &amp;param);</div><div class='add'>+	if (arvif-&gt;vdev_type == WMI_VDEV_TYPE_MONITOR) {</div><div class='add'>+		ret = ath11k_mac_monitor_start(ar);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ath11k_warn(ab, "failed to create peer after vdev start delay: %d",</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to start monitor during vif channel context assignment: %d",</div><div class='ctx'> 				    ret);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_mac_vdev_start(arvif, &amp;ctx-&gt;def);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ath11k_warn(ab, "failed to start vdev %i addr %pM on freq %d: %d\n",</div><div class='del'>-			    arvif-&gt;vdev_id, vif-&gt;addr,</div><div class='del'>-			    ctx-&gt;def.chan-&gt;center_freq, ret);</div><div class='add'>+		arvif-&gt;is_started = true;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (arvif-&gt;vdev_type == WMI_VDEV_TYPE_MONITOR) {</div><div class='del'>-		ret = ath11k_monitor_vdev_up(ar, arvif-&gt;vdev_id);</div><div class='del'>-		if (ret)</div><div class='add'>+</div><div class='add'>+	if (!arvif-&gt;is_started) {</div><div class='add'>+		ret = ath11k_mac_vdev_start(arvif, ctx);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ab, "failed to start vdev %i addr %pM on freq %d: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, vif-&gt;addr,</div><div class='add'>+				    ctx-&gt;def.chan-&gt;center_freq, ret);</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		arvif-&gt;is_started = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	arvif-&gt;is_started = true;</div><div class='add'>+	if (arvif-&gt;vdev_type != WMI_VDEV_TYPE_MONITOR &amp;&amp;</div><div class='add'>+	    test_bit(ATH11K_FLAG_MONITOR_VDEV_CREATED, &amp;ar-&gt;monitor_flags)) {</div><div class='add'>+		ret = ath11k_mac_monitor_start(ar);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to start monitor during vif channel context assignment: %d",</div><div class='add'>+				    ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: Setup ps and cts/rts protection */</div><div class='ctx'> </div><div class='hunk'>@@ -5560,37 +8459,70 @@ out:</div><div class='ctx'> static void</div><div class='ctx'> ath11k_mac_op_unassign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> 				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_bss_conf *link_conf,</div><div class='ctx'> 				   struct ieee80211_chanctx_conf *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = hw-&gt;priv;</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='del'>-	struct ath11k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='add'>+	struct ath11k_peer *peer;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_MAC,</div><div class='del'>-		   "mac chanctx unassign ptr %pK vdev_id %i\n",</div><div class='add'>+		   "chanctx unassign ptr %p vdev_id %i\n",</div><div class='ctx'> 		   ctx, arvif-&gt;vdev_id);</div><div class='ctx'> </div><div class='del'>-	WARN_ON(!arvif-&gt;is_started);</div><div class='del'>-</div><div class='ctx'> 	if (ab-&gt;hw_params.vdev_start_delay &amp;&amp;</div><div class='del'>-	    arvif-&gt;vdev_type == WMI_VDEV_TYPE_MONITOR &amp;&amp;</div><div class='del'>-	    ath11k_peer_find_by_addr(ab, ar-&gt;mac_addr))</div><div class='del'>-		ath11k_peer_delete(ar, arvif-&gt;vdev_id, ar-&gt;mac_addr);</div><div class='add'>+	    arvif-&gt;vdev_type == WMI_VDEV_TYPE_MONITOR) {</div><div class='add'>+		spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		peer = ath11k_peer_find_by_addr(ab, ar-&gt;mac_addr);</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		if (peer)</div><div class='add'>+			ath11k_peer_delete(ar, arvif-&gt;vdev_id, ar-&gt;mac_addr);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_mac_vdev_stop(arvif);</div><div class='del'>-	if (ret)</div><div class='del'>-		ath11k_warn(ab, "failed to stop vdev %i: %d\n",</div><div class='del'>-			    arvif-&gt;vdev_id, ret);</div><div class='add'>+	if (arvif-&gt;vdev_type == WMI_VDEV_TYPE_MONITOR) {</div><div class='add'>+		ret = ath11k_mac_monitor_stop(ar);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to stop monitor during vif channel context unassignment: %d",</div><div class='add'>+				    ret);</div><div class='add'>+			mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	arvif-&gt;is_started = false;</div><div class='add'>+		arvif-&gt;is_started = false;</div><div class='add'>+		mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;is_started) {</div><div class='add'>+		ret = ath11k_mac_vdev_stop(arvif);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath11k_warn(ab, "failed to stop vdev %i: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+</div><div class='add'>+		arvif-&gt;is_started = false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (ab-&gt;hw_params.vdev_start_delay &amp;&amp;</div><div class='ctx'> 	    arvif-&gt;vdev_type == WMI_VDEV_TYPE_MONITOR)</div><div class='ctx'> 		ath11k_wmi_vdev_down(ar, arvif-&gt;vdev_id);</div><div class='ctx'> </div><div class='add'>+	if (arvif-&gt;vdev_type != WMI_VDEV_TYPE_MONITOR &amp;&amp;</div><div class='add'>+	    ar-&gt;num_started_vdevs == 1 &amp;&amp;</div><div class='add'>+	    test_bit(ATH11K_FLAG_MONITOR_VDEV_CREATED, &amp;ar-&gt;monitor_flags)) {</div><div class='add'>+		ret = ath11k_mac_monitor_stop(ar);</div><div class='add'>+		if (ret)</div><div class='add'>+			/* continue even if there's an error */</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to stop monitor during vif channel context unassignment: %d",</div><div class='add'>+				    ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;vdev_type == WMI_VDEV_TYPE_STA)</div><div class='add'>+		ath11k_mac_11d_scan_start(ar, arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5605,7 +8537,7 @@ ath11k_mac_op_switch_vif_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='del'>-		   "mac chanctx switch n_vifs %d mode %d\n",</div><div class='add'>+		   "chanctx switch n_vifs %d mode %d\n",</div><div class='ctx'> 		   n_vifs, mode);</div><div class='ctx'> 	ath11k_mac_update_vif_chan(ar, vifs, n_vifs);</div><div class='ctx'> </div><div class='hunk'>@@ -5640,7 +8572,8 @@ ath11k_set_vdev_param_to_all_vifs(struct ath11k *ar, int param, u32 value)</div><div class='ctx'> /* mac80211 stores device specific RTS/Fragmentation threshold value,</div><div class='ctx'>  * this is set interface specific to firmware from ath11k driver</div><div class='ctx'>  */</div><div class='del'>-static int ath11k_mac_op_set_rts_threshold(struct ieee80211_hw *hw, u32 value)</div><div class='add'>+static int ath11k_mac_op_set_rts_threshold(struct ieee80211_hw *hw,</div><div class='add'>+					   int radio_idx, u32 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = hw-&gt;priv;</div><div class='ctx'> 	int param_id = WMI_VDEV_PARAM_RTS_THRESHOLD;</div><div class='hunk'>@@ -5648,7 +8581,8 @@ static int ath11k_mac_op_set_rts_threshold(struct ieee80211_hw *hw, u32 value)</div><div class='ctx'> 	return ath11k_set_vdev_param_to_all_vifs(ar, param_id, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_mac_op_set_frag_threshold(struct ieee80211_hw *hw, u32 value)</div><div class='add'>+static int ath11k_mac_op_set_frag_threshold(struct ieee80211_hw *hw,</div><div class='add'>+					    int radio_idx, u32 value)</div><div class='ctx'> {</div><div class='ctx'> 	/* Even though there's a WMI vdev param for fragmentation threshold no</div><div class='ctx'> 	 * known firmware actually implements it. Moreover it is not possible to</div><div class='hunk'>@@ -5663,34 +8597,47 @@ static int ath11k_mac_op_set_frag_threshold(struct ieee80211_hw *hw, u32 value)</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath11k_mac_op_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-				u32 queues, bool drop)</div><div class='add'>+static int ath11k_mac_flush_tx_complete(struct ath11k *ar)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k *ar = hw-&gt;priv;</div><div class='ctx'> 	long time_left;</div><div class='del'>-</div><div class='del'>-	if (drop)</div><div class='del'>-		return;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	time_left = wait_event_timeout(ar-&gt;dp.tx_empty_waitq,</div><div class='ctx'> 				       (atomic_read(&amp;ar-&gt;dp.num_tx_pending) == 0),</div><div class='ctx'> 				       ATH11K_FLUSH_TIMEOUT);</div><div class='del'>-	if (time_left == 0)</div><div class='del'>-		ath11k_warn(ar-&gt;ab, "failed to flush transmit queue %ld\n", time_left);</div><div class='add'>+	if (time_left == 0) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to flush transmit queue, data pkts pending %d\n",</div><div class='add'>+			    atomic_read(&amp;ar-&gt;dp.num_tx_pending));</div><div class='add'>+		ret = -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	time_left = wait_event_timeout(ar-&gt;txmgmt_empty_waitq,</div><div class='add'>+				       (atomic_read(&amp;ar-&gt;num_pending_mgmt_tx) == 0),</div><div class='add'>+				       ATH11K_FLUSH_TIMEOUT);</div><div class='add'>+	if (time_left == 0) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to flush mgmt transmit queue, mgmt pkts pending %d\n",</div><div class='add'>+			    atomic_read(&amp;ar-&gt;num_pending_mgmt_tx));</div><div class='add'>+		ret = -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-ath11k_mac_bitrate_mask_num_ht_rates(struct ath11k *ar,</div><div class='del'>-				     enum nl80211_band band,</div><div class='del'>-				     const struct cfg80211_bitrate_mask *mask)</div><div class='add'>+int ath11k_mac_wait_tx_complete(struct ath11k *ar)</div><div class='ctx'> {</div><div class='del'>-	int num_rates = 0;</div><div class='del'>-	int i;</div><div class='add'>+	ath11k_mac_drain_tx(ar);</div><div class='add'>+	return ath11k_mac_flush_tx_complete(ar);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(mask-&gt;control[band].ht_mcs); i++)</div><div class='del'>-		num_rates += hweight16(mask-&gt;control[band].ht_mcs[i]);</div><div class='add'>+static void ath11k_mac_op_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+				u32 queues, bool drop)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = hw-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	return num_rates;</div><div class='add'>+	if (drop)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ath11k_mac_flush_tx_complete(ar);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='hunk'>@@ -5708,19 +8655,40 @@ ath11k_mac_has_single_legacy_rate(struct ath11k *ar,</div><div class='ctx'> 	if (ath11k_mac_bitrate_mask_num_vht_rates(ar, band, mask))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='add'>+	if (ath11k_mac_bitrate_mask_num_he_rates(ar, band, mask))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	return num_rates == 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __le16</div><div class='add'>+ath11k_mac_get_tx_mcs_map(const struct ieee80211_sta_he_cap *he_cap)</div><div class='add'>+{</div><div class='add'>+	if (he_cap-&gt;he_cap_elem.phy_cap_info[0] &amp;</div><div class='add'>+	    IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G)</div><div class='add'>+		return he_cap-&gt;he_mcs_nss_supp.tx_mcs_80p80;</div><div class='add'>+</div><div class='add'>+	if (he_cap-&gt;he_cap_elem.phy_cap_info[0] &amp;</div><div class='add'>+	    IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G)</div><div class='add'>+		return he_cap-&gt;he_mcs_nss_supp.tx_mcs_160;</div><div class='add'>+</div><div class='add'>+	return he_cap-&gt;he_mcs_nss_supp.tx_mcs_80;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool</div><div class='ctx'> ath11k_mac_bitrate_mask_get_single_nss(struct ath11k *ar,</div><div class='add'>+				       struct ath11k_vif *arvif,</div><div class='ctx'> 				       enum nl80211_band band,</div><div class='ctx'> 				       const struct cfg80211_bitrate_mask *mask,</div><div class='ctx'> 				       int *nss)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_supported_band *sband = &amp;ar-&gt;mac.sbands[band];</div><div class='ctx'> 	u16 vht_mcs_map = le16_to_cpu(sband-&gt;vht_cap.vht_mcs.tx_mcs_map);</div><div class='add'>+	const struct ieee80211_sta_he_cap *he_cap;</div><div class='add'>+	u16 he_mcs_map = 0;</div><div class='ctx'> 	u8 ht_nss_mask = 0;</div><div class='ctx'> 	u8 vht_nss_mask = 0;</div><div class='add'>+	u8 he_nss_mask = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* No need to consider legacy here. Basic rates are always present</div><div class='hunk'>@@ -5747,7 +8715,24 @@ ath11k_mac_bitrate_mask_get_single_nss(struct ath11k *ar,</div><div class='ctx'> 			return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ht_nss_mask != vht_nss_mask)</div><div class='add'>+	he_cap = ieee80211_get_he_iftype_cap_vif(sband, arvif-&gt;vif);</div><div class='add'>+	if (!he_cap)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	he_mcs_map = le16_to_cpu(ath11k_mac_get_tx_mcs_map(he_cap));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mask-&gt;control[band].he_mcs); i++) {</div><div class='add'>+		if (mask-&gt;control[band].he_mcs[i] == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (mask-&gt;control[band].he_mcs[i] ==</div><div class='add'>+		    ath11k_mac_get_max_he_mcs_map(he_mcs_map, i))</div><div class='add'>+			he_nss_mask |= BIT(i);</div><div class='add'>+		else</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ht_nss_mask != vht_nss_mask || ht_nss_mask != he_nss_mask)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (ht_nss_mask == 0)</div><div class='hunk'>@@ -5794,42 +8779,125 @@ ath11k_mac_get_single_legacy_rate(struct ath11k *ar,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_mac_set_fixed_rate_params(struct ath11k_vif *arvif,</div><div class='del'>-					    u32 rate, u8 nss, u8 sgi, u8 ldpc)</div><div class='add'>+static int</div><div class='add'>+ath11k_mac_set_fixed_rate_gi_ltf(struct ath11k_vif *arvif, u8 he_gi, u8 he_ltf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = arvif-&gt;ar;</div><div class='del'>-	u32 vdev_param;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+	/* 0.8 = 0, 1.6 = 2 and 3.2 = 3. */</div><div class='add'>+	if (he_gi &amp;&amp; he_gi != 0xFF)</div><div class='add'>+		he_gi += 1;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "mac set fixed rate params vdev %i rate 0x%02x nss %u sgi %u\n",</div><div class='del'>-		   arvif-&gt;vdev_id, rate, nss, sgi);</div><div class='add'>+	ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+					    WMI_VDEV_PARAM_SGI, he_gi);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to set he gi %d: %d\n",</div><div class='add'>+			    he_gi, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	/* start from 1 */</div><div class='add'>+	if (he_ltf != 0xFF)</div><div class='add'>+		he_ltf += 1;</div><div class='ctx'> </div><div class='del'>-	vdev_param = WMI_VDEV_PARAM_FIXED_RATE;</div><div class='ctx'> 	ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='del'>-					    vdev_param, rate);</div><div class='add'>+					    WMI_VDEV_PARAM_HE_LTF, he_ltf);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ath11k_warn(ar-&gt;ab, "failed to set fixed rate param 0x%02x: %d\n",</div><div class='del'>-			    rate, ret);</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to set he ltf %d: %d\n",</div><div class='add'>+			    he_ltf, ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vdev_param = WMI_VDEV_PARAM_NSS;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath11k_mac_set_auto_rate_gi_ltf(struct ath11k_vif *arvif, u16 he_gi, u8 he_ltf)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = arvif-&gt;ar;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 he_ar_gi_ltf;</div><div class='add'>+</div><div class='add'>+	if (he_gi != 0xFF) {</div><div class='add'>+		switch (he_gi) {</div><div class='add'>+		case NL80211_RATE_INFO_HE_GI_0_8:</div><div class='add'>+			he_gi = WMI_AUTORATE_800NS_GI;</div><div class='add'>+			break;</div><div class='add'>+		case NL80211_RATE_INFO_HE_GI_1_6:</div><div class='add'>+			he_gi = WMI_AUTORATE_1600NS_GI;</div><div class='add'>+			break;</div><div class='add'>+		case NL80211_RATE_INFO_HE_GI_3_2:</div><div class='add'>+			he_gi = WMI_AUTORATE_3200NS_GI;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "invalid he gi: %d\n", he_gi);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (he_ltf != 0xFF) {</div><div class='add'>+		switch (he_ltf) {</div><div class='add'>+		case NL80211_RATE_INFO_HE_1XLTF:</div><div class='add'>+			he_ltf = WMI_HE_AUTORATE_LTF_1X;</div><div class='add'>+			break;</div><div class='add'>+		case NL80211_RATE_INFO_HE_2XLTF:</div><div class='add'>+			he_ltf = WMI_HE_AUTORATE_LTF_2X;</div><div class='add'>+			break;</div><div class='add'>+		case NL80211_RATE_INFO_HE_4XLTF:</div><div class='add'>+			he_ltf = WMI_HE_AUTORATE_LTF_4X;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "invalid he ltf: %d\n", he_ltf);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	he_ar_gi_ltf = he_gi | he_ltf;</div><div class='ctx'> 	ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='del'>-					    vdev_param, nss);</div><div class='add'>+					    WMI_VDEV_PARAM_AUTORATE_MISC_CFG,</div><div class='add'>+					    he_ar_gi_ltf);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ath11k_warn(ar-&gt;ab, "failed to set nss param %d: %d\n",</div><div class='del'>-			    nss, ret);</div><div class='add'>+		ath11k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to set he autorate gi %u ltf %u: %d\n",</div><div class='add'>+			    he_gi, he_ltf, ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vdev_param = WMI_VDEV_PARAM_SGI;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_set_rate_params(struct ath11k_vif *arvif,</div><div class='add'>+				      u32 rate, u8 nss, u8 sgi, u8 ldpc,</div><div class='add'>+				      u8 he_gi, u8 he_ltf, bool he_fixed_rate)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = arvif-&gt;ar;</div><div class='add'>+	u32 vdev_param;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='add'>+		   "set rate params vdev %i rate 0x%02x nss 0x%02x sgi 0x%02x ldpc 0x%02x he_gi 0x%02x he_ltf 0x%02x he_fixed_rate %d\n",</div><div class='add'>+		   arvif-&gt;vdev_id, rate, nss, sgi, ldpc, he_gi,</div><div class='add'>+		   he_ltf, he_fixed_rate);</div><div class='add'>+</div><div class='add'>+	if (!arvif-&gt;vif-&gt;bss_conf.he_support) {</div><div class='add'>+		vdev_param = WMI_VDEV_PARAM_FIXED_RATE;</div><div class='add'>+		ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+						    vdev_param, rate);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to set fixed rate param 0x%02x: %d\n",</div><div class='add'>+				    rate, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vdev_param = WMI_VDEV_PARAM_NSS;</div><div class='ctx'> 	ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='del'>-					    vdev_param, sgi);</div><div class='add'>+					    vdev_param, nss);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ath11k_warn(ar-&gt;ab, "failed to set sgi param %d: %d\n",</div><div class='del'>-			    sgi, ret);</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to set nss param %d: %d\n",</div><div class='add'>+			    nss, ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5842,6 +8910,35 @@ static int ath11k_mac_set_fixed_rate_params(struct ath11k_vif *arvif,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (arvif-&gt;vif-&gt;bss_conf.he_support) {</div><div class='add'>+		if (he_fixed_rate) {</div><div class='add'>+			ret = ath11k_mac_set_fixed_rate_gi_ltf(arvif, he_gi,</div><div class='add'>+							       he_ltf);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath11k_warn(ar-&gt;ab, "failed to set fixed rate gi ltf: %d\n",</div><div class='add'>+					    ret);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			ret = ath11k_mac_set_auto_rate_gi_ltf(arvif, he_gi,</div><div class='add'>+							      he_ltf);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath11k_warn(ar-&gt;ab, "failed to set auto rate gi ltf: %d\n",</div><div class='add'>+					    ret);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		vdev_param = WMI_VDEV_PARAM_SGI;</div><div class='add'>+		ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+						    vdev_param, sgi);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to set sgi param %d: %d\n",</div><div class='add'>+				    sgi, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5870,11 +8967,36 @@ ath11k_mac_vht_mcs_range_present(struct ath11k *ar,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool</div><div class='add'>+ath11k_mac_he_mcs_range_present(struct ath11k *ar,</div><div class='add'>+				enum nl80211_band band,</div><div class='add'>+				const struct cfg80211_bitrate_mask *mask)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u16 he_mcs;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NL80211_HE_NSS_MAX; i++) {</div><div class='add'>+		he_mcs = mask-&gt;control[band].he_mcs[i];</div><div class='add'>+</div><div class='add'>+		switch (he_mcs) {</div><div class='add'>+		case 0:</div><div class='add'>+		case BIT(8) - 1:</div><div class='add'>+		case BIT(10) - 1:</div><div class='add'>+		case BIT(12) - 1:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath11k_mac_set_bitrate_mask_iter(void *data,</div><div class='ctx'> 					     struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_vif *arvif = data;</div><div class='del'>-	struct ath11k_sta *arsta = (struct ath11k_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='ctx'> 	struct ath11k *ar = arvif-&gt;ar;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='hunk'>@@ -5901,17 +9023,73 @@ static void ath11k_mac_disable_peer_fixed_rate(void *data,</div><div class='ctx'> 			    sta-&gt;addr, ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool</div><div class='add'>+ath11k_mac_validate_vht_he_fixed_rate_settings(struct ath11k *ar, enum nl80211_band band,</div><div class='add'>+					       const struct cfg80211_bitrate_mask *mask)</div><div class='add'>+{</div><div class='add'>+	bool he_fixed_rate = false, vht_fixed_rate = false;</div><div class='add'>+	struct ath11k_peer *peer;</div><div class='add'>+	const u16 *vht_mcs_mask, *he_mcs_mask;</div><div class='add'>+	struct ieee80211_link_sta *deflink;</div><div class='add'>+	u8 vht_nss, he_nss;</div><div class='add'>+	bool ret = true;</div><div class='add'>+</div><div class='add'>+	vht_mcs_mask = mask-&gt;control[band].vht_mcs;</div><div class='add'>+	he_mcs_mask = mask-&gt;control[band].he_mcs;</div><div class='add'>+</div><div class='add'>+	if (ath11k_mac_bitrate_mask_num_vht_rates(ar, band, mask) == 1)</div><div class='add'>+		vht_fixed_rate = true;</div><div class='add'>+</div><div class='add'>+	if (ath11k_mac_bitrate_mask_num_he_rates(ar, band, mask) == 1)</div><div class='add'>+		he_fixed_rate = true;</div><div class='add'>+</div><div class='add'>+	if (!vht_fixed_rate &amp;&amp; !he_fixed_rate)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	vht_nss = ath11k_mac_max_vht_nss(vht_mcs_mask);</div><div class='add'>+	he_nss =  ath11k_mac_max_he_nss(he_mcs_mask);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+	list_for_each_entry(peer, &amp;ar-&gt;ab-&gt;peers, list) {</div><div class='add'>+		if (peer-&gt;sta) {</div><div class='add'>+			deflink = &amp;peer-&gt;sta-&gt;deflink;</div><div class='add'>+</div><div class='add'>+			if (vht_fixed_rate &amp;&amp; (!deflink-&gt;vht_cap.vht_supported ||</div><div class='add'>+					       deflink-&gt;rx_nss &lt; vht_nss)) {</div><div class='add'>+				ret = false;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (he_fixed_rate &amp;&amp; (!deflink-&gt;he_cap.has_he ||</div><div class='add'>+					      deflink-&gt;rx_nss &lt; he_nss)) {</div><div class='add'>+				ret = false;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> ath11k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw,</div><div class='ctx'> 			       struct ieee80211_vif *vif,</div><div class='ctx'> 			       const struct cfg80211_bitrate_mask *mask)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_vif *arvif = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='ctx'> 	struct cfg80211_chan_def def;</div><div class='add'>+	struct ath11k_pdev_cap *cap;</div><div class='ctx'> 	struct ath11k *ar = arvif-&gt;ar;</div><div class='ctx'> 	enum nl80211_band band;</div><div class='ctx'> 	const u8 *ht_mcs_mask;</div><div class='ctx'> 	const u16 *vht_mcs_mask;</div><div class='add'>+	const u16 *he_mcs_mask;</div><div class='add'>+	u8 he_ltf = 0;</div><div class='add'>+	u8 he_gi = 0;</div><div class='ctx'> 	u32 rate;</div><div class='ctx'> 	u8 nss;</div><div class='ctx'> 	u8 sgi;</div><div class='hunk'>@@ -5919,21 +9097,27 @@ ath11k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw,</div><div class='ctx'> 	int single_nss;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int num_rates;</div><div class='add'>+	bool he_fixed_rate = false;</div><div class='ctx'> </div><div class='ctx'> 	if (ath11k_mac_vif_chan(vif, &amp;def))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	band = def.chan-&gt;band;</div><div class='add'>+	cap = &amp;ar-&gt;pdev-&gt;cap;</div><div class='ctx'> 	ht_mcs_mask = mask-&gt;control[band].ht_mcs;</div><div class='ctx'> 	vht_mcs_mask = mask-&gt;control[band].vht_mcs;</div><div class='del'>-	ldpc = !!(ar-&gt;ht_cap_info &amp; WMI_HT_CAP_LDPC);</div><div class='add'>+	he_mcs_mask = mask-&gt;control[band].he_mcs;</div><div class='add'>+	ldpc = !!(cap-&gt;band[band].ht_cap_info &amp; WMI_HT_CAP_TX_LDPC);</div><div class='ctx'> </div><div class='ctx'> 	sgi = mask-&gt;control[band].gi;</div><div class='ctx'> 	if (sgi == NL80211_TXRATE_FORCE_LGI)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	he_gi = mask-&gt;control[band].he_gi;</div><div class='add'>+	he_ltf = mask-&gt;control[band].he_ltf;</div><div class='add'>+</div><div class='ctx'> 	/* mac80211 doesn't support sending a fixed HT/VHT MCS alone, rather it</div><div class='del'>-	 * requires passing atleast one of used basic rates along with them.</div><div class='add'>+	 * requires passing at least one of used basic rates along with them.</div><div class='ctx'> 	 * Fixed rate setting across different preambles(legacy, HT, VHT) is</div><div class='ctx'> 	 * not supported by the FW. Hence use of FIXED_RATE vdev param is not</div><div class='ctx'> 	 * suitable for setting single HT/VHT rates.</div><div class='hunk'>@@ -5948,18 +9132,27 @@ ath11k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw,</div><div class='ctx'> 				    arvif-&gt;vdev_id, ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='del'>-		ieee80211_iterate_stations_atomic(ar-&gt;hw,</div><div class='del'>-						  ath11k_mac_disable_peer_fixed_rate,</div><div class='del'>-						  arvif);</div><div class='del'>-	} else if (ath11k_mac_bitrate_mask_get_single_nss(ar, band, mask,</div><div class='add'>+		ieee80211_iterate_stations_mtx(ar-&gt;hw,</div><div class='add'>+					       ath11k_mac_disable_peer_fixed_rate,</div><div class='add'>+					       arvif);</div><div class='add'>+	} else if (ath11k_mac_bitrate_mask_get_single_nss(ar, arvif, band, mask,</div><div class='ctx'> 							  &amp;single_nss)) {</div><div class='ctx'> 		rate = WMI_FIXED_RATE_NONE;</div><div class='ctx'> 		nss = single_nss;</div><div class='add'>+		mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+		arvif-&gt;bitrate_mask = *mask;</div><div class='add'>+		ieee80211_iterate_stations_atomic(ar-&gt;hw,</div><div class='add'>+						  ath11k_mac_set_bitrate_mask_iter,</div><div class='add'>+						  arvif);</div><div class='add'>+		mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		rate = WMI_FIXED_RATE_NONE;</div><div class='add'>+</div><div class='add'>+		if (!ath11k_mac_validate_vht_he_fixed_rate_settings(ar, band, mask))</div><div class='add'>+			ath11k_warn(ar-&gt;ab,</div><div class='add'>+				    "could not update fixed rate settings to all peers due to mcs/nss incompatibility\n");</div><div class='ctx'> 		nss = min_t(u32, ar-&gt;num_tx_chains,</div><div class='del'>-			    max(ath11k_mac_max_ht_nss(ht_mcs_mask),</div><div class='del'>-				ath11k_mac_max_vht_nss(vht_mcs_mask)));</div><div class='add'>+			    ath11k_mac_max_nss(ht_mcs_mask, vht_mcs_mask, he_mcs_mask));</div><div class='ctx'> </div><div class='ctx'> 		/* If multiple rates across different preambles are given</div><div class='ctx'> 		 * we can reconfigure this info with all peers using PEER_ASSOC</div><div class='hunk'>@@ -5990,15 +9183,27 @@ ath11k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw,</div><div class='ctx'> 			 * RATEMASK CMD</div><div class='ctx'> 			 */</div><div class='ctx'> 			ath11k_warn(ar-&gt;ab,</div><div class='del'>-				    "Setting more than one MCS Value in bitrate mask not supported\n");</div><div class='add'>+				    "setting %d mcs values in bitrate mask not supported\n",</div><div class='add'>+				num_rates);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ieee80211_iterate_stations_atomic(ar-&gt;hw,</div><div class='del'>-						  ath11k_mac_disable_peer_fixed_rate,</div><div class='del'>-						  arvif);</div><div class='add'>+		num_rates = ath11k_mac_bitrate_mask_num_he_rates(ar, band,</div><div class='add'>+								 mask);</div><div class='add'>+		if (num_rates == 1)</div><div class='add'>+			he_fixed_rate = true;</div><div class='add'>+</div><div class='add'>+		if (!ath11k_mac_he_mcs_range_present(ar, band, mask) &amp;&amp;</div><div class='add'>+		    num_rates &gt; 1) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab,</div><div class='add'>+				    "Setting more than one HE MCS Value in bitrate mask not supported\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+		ieee80211_iterate_stations_mtx(ar-&gt;hw,</div><div class='add'>+					       ath11k_mac_disable_peer_fixed_rate,</div><div class='add'>+					       arvif);</div><div class='ctx'> </div><div class='ctx'> 		arvif-&gt;bitrate_mask = *mask;</div><div class='ctx'> 		ieee80211_iterate_stations_atomic(ar-&gt;hw,</div><div class='hunk'>@@ -6010,9 +9215,10 @@ ath11k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_mac_set_fixed_rate_params(arvif, rate, nss, sgi, ldpc);</div><div class='add'>+	ret = ath11k_mac_set_rate_params(arvif, rate, nss, sgi, ldpc, he_gi,</div><div class='add'>+					 he_ltf, he_fixed_rate);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ath11k_warn(ar-&gt;ab, "failed to set fixed rate params on vdev %i: %d\n",</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to set rate params on vdev %i: %d\n",</div><div class='ctx'> 			    arvif-&gt;vdev_id, ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -6026,6 +9232,9 @@ ath11k_mac_op_reconfig_complete(struct ieee80211_hw *hw,</div><div class='ctx'> 				enum ieee80211_reconfig_type reconfig_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = hw-&gt;priv;</div><div class='add'>+	struct ath11k_base *ab = ar-&gt;ab;</div><div class='add'>+	int recovery_count;</div><div class='add'>+	struct ath11k_vif *arvif;</div><div class='ctx'> </div><div class='ctx'> 	if (reconfig_type != IEEE80211_RECONFIG_TYPE_RESTART)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -6037,6 +9246,32 @@ ath11k_mac_op_reconfig_complete(struct ieee80211_hw *hw,</div><div class='ctx'> 			    ar-&gt;pdev-&gt;pdev_id);</div><div class='ctx'> 		ar-&gt;state = ATH11K_STATE_ON;</div><div class='ctx'> 		ieee80211_wake_queues(ar-&gt;hw);</div><div class='add'>+</div><div class='add'>+		if (ar-&gt;ab-&gt;hw_params.current_cc_support &amp;&amp;</div><div class='add'>+		    ar-&gt;alpha2[0] != 0 &amp;&amp; ar-&gt;alpha2[1] != 0)</div><div class='add'>+			ath11k_reg_set_cc(ar);</div><div class='add'>+</div><div class='add'>+		if (ab-&gt;is_reset) {</div><div class='add'>+			recovery_count = atomic_inc_return(&amp;ab-&gt;recovery_count);</div><div class='add'>+			ath11k_dbg(ab, ATH11K_DBG_BOOT,</div><div class='add'>+				   "recovery count %d\n", recovery_count);</div><div class='add'>+			/* When there are multiple radios in an SOC,</div><div class='add'>+			 * the recovery has to be done for each radio</div><div class='add'>+			 */</div><div class='add'>+			if (recovery_count == ab-&gt;num_radios) {</div><div class='add'>+				atomic_dec(&amp;ab-&gt;reset_count);</div><div class='add'>+				complete(&amp;ab-&gt;reset_complete);</div><div class='add'>+				ab-&gt;is_reset = false;</div><div class='add'>+				atomic_set(&amp;ab-&gt;fail_cont_count, 0);</div><div class='add'>+				ath11k_dbg(ab, ATH11K_DBG_BOOT, "reset success\n");</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (ar-&gt;ab-&gt;hw_params.support_fw_mac_sequence) {</div><div class='add'>+			list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+				if (arvif-&gt;is_up &amp;&amp; arvif-&gt;vdev_type == WMI_VDEV_TYPE_STA)</div><div class='add'>+					ieee80211_hw_restart_disconnect(arvif-&gt;vif);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='hunk'>@@ -6097,7 +9332,13 @@ static int ath11k_mac_op_get_survey(struct ieee80211_hw *hw, int idx,</div><div class='ctx'> </div><div class='ctx'> 	if (!sband)</div><div class='ctx'> 		sband = hw-&gt;wiphy-&gt;bands[NL80211_BAND_5GHZ];</div><div class='add'>+	if (sband &amp;&amp; idx &gt;= sband-&gt;n_channels) {</div><div class='add'>+		idx -= sband-&gt;n_channels;</div><div class='add'>+		sband = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	if (!sband)</div><div class='add'>+		sband = hw-&gt;wiphy-&gt;bands[NL80211_BAND_6GHZ];</div><div class='ctx'> 	if (!sband || idx &gt;= sband-&gt;n_channels) {</div><div class='ctx'> 		ret = -ENOENT;</div><div class='ctx'> 		goto exit;</div><div class='hunk'>@@ -6119,12 +9360,45 @@ exit:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ath11k_mac_put_chain_rssi(struct station_info *sinfo,</div><div class='add'>+				      struct ath11k_sta *arsta,</div><div class='add'>+				      char *pre,</div><div class='add'>+				      bool clear)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = arsta-&gt;arvif-&gt;ar;</div><div class='add'>+	int i;</div><div class='add'>+	s8 rssi;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(sinfo-&gt;chain_signal); i++) {</div><div class='add'>+		sinfo-&gt;chains &amp;= ~BIT(i);</div><div class='add'>+		rssi = arsta-&gt;chain_signal[i];</div><div class='add'>+		if (clear)</div><div class='add'>+			arsta-&gt;chain_signal[i] = ATH11K_INVALID_RSSI_FULL;</div><div class='add'>+</div><div class='add'>+		ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='add'>+			   "sta statistics %s rssi[%d] %d\n", pre, i, rssi);</div><div class='add'>+</div><div class='add'>+		if (rssi != ATH11K_DEFAULT_NOISE_FLOOR &amp;&amp;</div><div class='add'>+		    rssi != ATH11K_INVALID_RSSI_FULL &amp;&amp;</div><div class='add'>+		    rssi != ATH11K_INVALID_RSSI_EMPTY &amp;&amp;</div><div class='add'>+		    rssi != 0) {</div><div class='add'>+			sinfo-&gt;chain_signal[i] = rssi;</div><div class='add'>+			sinfo-&gt;chains |= BIT(i);</div><div class='add'>+			sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath11k_mac_op_sta_statistics(struct ieee80211_hw *hw,</div><div class='ctx'> 					 struct ieee80211_vif *vif,</div><div class='ctx'> 					 struct ieee80211_sta *sta,</div><div class='ctx'> 					 struct station_info *sinfo)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_sta *arsta = (struct ath11k_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='add'>+	struct ath11k *ar = arsta-&gt;arvif-&gt;ar;</div><div class='add'>+	s8 signal;</div><div class='add'>+	bool db2dbm = test_bit(WMI_TLV_SERVICE_HW_DB2DBM_CONVERSION_SUPPORT,</div><div class='add'>+			       ar-&gt;ab-&gt;wmi_ab.svc_map);</div><div class='ctx'> </div><div class='ctx'> 	sinfo-&gt;rx_duration = arsta-&gt;rx_duration;</div><div class='ctx'> 	sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_RX_DURATION);</div><div class='hunk'>@@ -6132,29 +9406,663 @@ static void ath11k_mac_op_sta_statistics(struct ieee80211_hw *hw,</div><div class='ctx'> 	sinfo-&gt;tx_duration = arsta-&gt;tx_duration;</div><div class='ctx'> 	sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_TX_DURATION);</div><div class='ctx'> </div><div class='del'>-	if (!arsta-&gt;txrate.legacy &amp;&amp; !arsta-&gt;txrate.nss)</div><div class='del'>-		return;</div><div class='add'>+	if (arsta-&gt;txrate.legacy || arsta-&gt;txrate.nss) {</div><div class='add'>+		if (arsta-&gt;txrate.legacy) {</div><div class='add'>+			sinfo-&gt;txrate.legacy = arsta-&gt;txrate.legacy;</div><div class='add'>+		} else {</div><div class='add'>+			sinfo-&gt;txrate.mcs = arsta-&gt;txrate.mcs;</div><div class='add'>+			sinfo-&gt;txrate.nss = arsta-&gt;txrate.nss;</div><div class='add'>+			sinfo-&gt;txrate.bw = arsta-&gt;txrate.bw;</div><div class='add'>+			sinfo-&gt;txrate.he_gi = arsta-&gt;txrate.he_gi;</div><div class='add'>+			sinfo-&gt;txrate.he_dcm = arsta-&gt;txrate.he_dcm;</div><div class='add'>+			sinfo-&gt;txrate.he_ru_alloc = arsta-&gt;txrate.he_ru_alloc;</div><div class='add'>+		}</div><div class='add'>+		sinfo-&gt;txrate.flags = arsta-&gt;txrate.flags;</div><div class='add'>+		sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (arsta-&gt;txrate.legacy) {</div><div class='del'>-		sinfo-&gt;txrate.legacy = arsta-&gt;txrate.legacy;</div><div class='del'>-	} else {</div><div class='del'>-		sinfo-&gt;txrate.mcs = arsta-&gt;txrate.mcs;</div><div class='del'>-		sinfo-&gt;txrate.nss = arsta-&gt;txrate.nss;</div><div class='del'>-		sinfo-&gt;txrate.bw = arsta-&gt;txrate.bw;</div><div class='del'>-		sinfo-&gt;txrate.he_gi = arsta-&gt;txrate.he_gi;</div><div class='del'>-		sinfo-&gt;txrate.he_dcm = arsta-&gt;txrate.he_dcm;</div><div class='del'>-		sinfo-&gt;txrate.he_ru_alloc = arsta-&gt;txrate.he_ru_alloc;</div><div class='add'>+	ath11k_mac_put_chain_rssi(sinfo, arsta, "ppdu", false);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+	if (!(sinfo-&gt;filled &amp; BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL)) &amp;&amp;</div><div class='add'>+	    arsta-&gt;arvif-&gt;vdev_type == WMI_VDEV_TYPE_STA &amp;&amp;</div><div class='add'>+	    ar-&gt;ab-&gt;hw_params.supports_rssi_stats &amp;&amp;</div><div class='add'>+	    !ath11k_mac_get_fw_stats(ar, ar-&gt;pdev-&gt;pdev_id, 0,</div><div class='add'>+				     WMI_REQUEST_RSSI_PER_CHAIN_STAT)) {</div><div class='add'>+		ath11k_mac_put_chain_rssi(sinfo, arsta, "fw stats", true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	signal = arsta-&gt;rssi_comb;</div><div class='add'>+	if (!signal &amp;&amp;</div><div class='add'>+	    arsta-&gt;arvif-&gt;vdev_type == WMI_VDEV_TYPE_STA &amp;&amp;</div><div class='add'>+	    ar-&gt;ab-&gt;hw_params.supports_rssi_stats &amp;&amp;</div><div class='add'>+	    !(ath11k_mac_get_fw_stats(ar, ar-&gt;pdev-&gt;pdev_id, 0,</div><div class='add'>+				      WMI_REQUEST_VDEV_STAT)))</div><div class='add'>+		signal = arsta-&gt;rssi_beacon;</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC,</div><div class='add'>+		   "sta statistics db2dbm %u rssi comb %d rssi beacon %d\n",</div><div class='add'>+		   db2dbm, arsta-&gt;rssi_comb, arsta-&gt;rssi_beacon);</div><div class='add'>+</div><div class='add'>+	if (signal) {</div><div class='add'>+		sinfo-&gt;signal = db2dbm ? signal : signal + ATH11K_DEFAULT_NOISE_FLOOR;</div><div class='add'>+		sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sinfo-&gt;signal_avg = ewma_avg_rssi_read(&amp;arsta-&gt;avg_rssi);</div><div class='add'>+</div><div class='add'>+	if (!db2dbm)</div><div class='add'>+		sinfo-&gt;signal_avg += ATH11K_DEFAULT_NOISE_FLOOR;</div><div class='add'>+</div><div class='add'>+	sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+static void ath11k_generate_ns_mc_addr(struct ath11k *ar,</div><div class='add'>+				       struct ath11k_arp_ns_offload *offload)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; offload-&gt;ipv6_count; i++) {</div><div class='add'>+		offload-&gt;self_ipv6_addr[i][0] = 0xff;</div><div class='add'>+		offload-&gt;self_ipv6_addr[i][1] = 0x02;</div><div class='add'>+		offload-&gt;self_ipv6_addr[i][11] = 0x01;</div><div class='add'>+		offload-&gt;self_ipv6_addr[i][12] = 0xff;</div><div class='add'>+		offload-&gt;self_ipv6_addr[i][13] =</div><div class='add'>+					offload-&gt;ipv6_addr[i][13];</div><div class='add'>+		offload-&gt;self_ipv6_addr[i][14] =</div><div class='add'>+					offload-&gt;ipv6_addr[i][14];</div><div class='add'>+		offload-&gt;self_ipv6_addr[i][15] =</div><div class='add'>+					offload-&gt;ipv6_addr[i][15];</div><div class='add'>+		ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "NS solicited addr %pI6\n",</div><div class='add'>+			   offload-&gt;self_ipv6_addr[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_mac_op_ipv6_changed(struct ieee80211_hw *hw,</div><div class='add'>+				       struct ieee80211_vif *vif,</div><div class='add'>+				       struct inet6_dev *idev)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = hw-&gt;priv;</div><div class='add'>+	struct ath11k_arp_ns_offload *offload;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='add'>+	struct inet6_ifaddr *ifa6;</div><div class='add'>+	struct ifacaddr6 *ifaca6;</div><div class='add'>+	u32 count, scope;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "op ipv6 changed\n");</div><div class='add'>+</div><div class='add'>+	offload = &amp;arvif-&gt;arp_ns_offload;</div><div class='add'>+	count = 0;</div><div class='add'>+</div><div class='add'>+	/* The _ipv6_changed() is called with RCU lock already held in</div><div class='add'>+	 * atomic_notifier_call_chain(), so we don't need to call</div><div class='add'>+	 * rcu_read_lock() again here. But note that with CONFIG_PREEMPT_RT</div><div class='add'>+	 * enabled, read_lock_bh() also calls rcu_read_lock(). This is OK</div><div class='add'>+	 * because RCU read critical section is allowed to get nested.</div><div class='add'>+	 */</div><div class='add'>+	read_lock_bh(&amp;idev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	memset(offload-&gt;ipv6_addr, 0, sizeof(offload-&gt;ipv6_addr));</div><div class='add'>+	memset(offload-&gt;self_ipv6_addr, 0, sizeof(offload-&gt;self_ipv6_addr));</div><div class='add'>+	memcpy(offload-&gt;mac_addr, vif-&gt;addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	/* get unicast address */</div><div class='add'>+	list_for_each_entry(ifa6, &amp;idev-&gt;addr_list, if_list) {</div><div class='add'>+		if (count &gt;= ATH11K_IPV6_MAX_COUNT)</div><div class='add'>+			goto generate;</div><div class='add'>+</div><div class='add'>+		if (ifa6-&gt;flags &amp; IFA_F_DADFAILED)</div><div class='add'>+			continue;</div><div class='add'>+		scope = ipv6_addr_src_scope(&amp;ifa6-&gt;addr);</div><div class='add'>+		if (scope == IPV6_ADDR_SCOPE_LINKLOCAL ||</div><div class='add'>+		    scope == IPV6_ADDR_SCOPE_GLOBAL) {</div><div class='add'>+			memcpy(offload-&gt;ipv6_addr[count], &amp;ifa6-&gt;addr.s6_addr,</div><div class='add'>+			       sizeof(ifa6-&gt;addr.s6_addr));</div><div class='add'>+			offload-&gt;ipv6_type[count] = ATH11K_IPV6_UC_TYPE;</div><div class='add'>+			ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "count %d ipv6 uc %pI6 scope %d\n",</div><div class='add'>+				   count, offload-&gt;ipv6_addr[count],</div><div class='add'>+				   scope);</div><div class='add'>+			count++;</div><div class='add'>+		} else {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "Unsupported ipv6 scope: %d\n", scope);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	sinfo-&gt;txrate.flags = arsta-&gt;txrate.flags;</div><div class='del'>-	sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);</div><div class='ctx'> </div><div class='del'>-	/* TODO: Use real NF instead of default one. */</div><div class='del'>-	sinfo-&gt;signal = arsta-&gt;rssi_comb + ATH11K_DEFAULT_NOISE_FLOOR;</div><div class='del'>-	sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL);</div><div class='add'>+	/* get anycast address */</div><div class='add'>+	for (ifaca6 = rcu_dereference(idev-&gt;ac_list); ifaca6;</div><div class='add'>+	     ifaca6 = rcu_dereference(ifaca6-&gt;aca_next)) {</div><div class='add'>+		if (count &gt;= ATH11K_IPV6_MAX_COUNT)</div><div class='add'>+			goto generate;</div><div class='add'>+</div><div class='add'>+		scope = ipv6_addr_src_scope(&amp;ifaca6-&gt;aca_addr);</div><div class='add'>+		if (scope == IPV6_ADDR_SCOPE_LINKLOCAL ||</div><div class='add'>+		    scope == IPV6_ADDR_SCOPE_GLOBAL) {</div><div class='add'>+			memcpy(offload-&gt;ipv6_addr[count], &amp;ifaca6-&gt;aca_addr,</div><div class='add'>+			       sizeof(ifaca6-&gt;aca_addr));</div><div class='add'>+			offload-&gt;ipv6_type[count] = ATH11K_IPV6_AC_TYPE;</div><div class='add'>+			ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "count %d ipv6 ac %pI6 scope %d\n",</div><div class='add'>+				   count, offload-&gt;ipv6_addr[count],</div><div class='add'>+				   scope);</div><div class='add'>+			count++;</div><div class='add'>+		} else {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "Unsupported ipv scope: %d\n", scope);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+generate:</div><div class='add'>+	offload-&gt;ipv6_count = count;</div><div class='add'>+	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* generate ns multicast address */</div><div class='add'>+	ath11k_generate_ns_mc_addr(ar, offload);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void ath11k_mac_op_set_rekey_data(struct ieee80211_hw *hw,</div><div class='add'>+					 struct ieee80211_vif *vif,</div><div class='add'>+					 struct cfg80211_gtk_rekey_data *data)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = hw-&gt;priv;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='add'>+	struct ath11k_rekey_data *rekey_data = &amp;arvif-&gt;rekey_data;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "set rekey data vdev %d\n",</div><div class='add'>+		   arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	memcpy(rekey_data-&gt;kck, data-&gt;kck, NL80211_KCK_LEN);</div><div class='add'>+	memcpy(rekey_data-&gt;kek, data-&gt;kek, NL80211_KEK_LEN);</div><div class='add'>+</div><div class='add'>+	/* The supplicant works on big-endian, the firmware expects it on</div><div class='add'>+	 * little endian.</div><div class='add'>+	 */</div><div class='add'>+	rekey_data-&gt;replay_ctr = get_unaligned_be64(data-&gt;replay_ctr);</div><div class='add'>+</div><div class='add'>+	arvif-&gt;rekey_data.enable_offload = true;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg_dump(ar-&gt;ab, ATH11K_DBG_MAC, "kck", NULL,</div><div class='add'>+			rekey_data-&gt;kck, NL80211_KCK_LEN);</div><div class='add'>+	ath11k_dbg_dump(ar-&gt;ab, ATH11K_DBG_MAC, "kek", NULL,</div><div class='add'>+			rekey_data-&gt;kck, NL80211_KEK_LEN);</div><div class='add'>+	ath11k_dbg_dump(ar-&gt;ab, ATH11K_DBG_MAC, "replay ctr", NULL,</div><div class='add'>+			&amp;rekey_data-&gt;replay_ctr, sizeof(rekey_data-&gt;replay_ctr));</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_op_set_bios_sar_specs(struct ieee80211_hw *hw,</div><div class='add'>+					    const struct cfg80211_sar_specs *sar)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = hw-&gt;priv;</div><div class='add'>+	const struct cfg80211_sar_sub_specs *sspec;</div><div class='add'>+	int ret, index;</div><div class='add'>+	u8 *sar_tbl;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	if (!sar || sar-&gt;type != NL80211_SAR_TYPE_POWER ||</div><div class='add'>+	    sar-&gt;num_sub_specs == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(WMI_TLV_SERVICE_BIOS_SAR_SUPPORT, ar-&gt;ab-&gt;wmi_ab.svc_map) ||</div><div class='add'>+	    !ar-&gt;ab-&gt;hw_params.bios_sar_capa) {</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_pdev_set_bios_geo_table_param(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to set geo table: %d\n", ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sar_tbl = kzalloc(BIOS_SAR_TABLE_LEN, GFP_KERNEL);</div><div class='add'>+	if (!sar_tbl) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sspec = sar-&gt;sub_specs;</div><div class='add'>+	for (i = 0; i &lt; sar-&gt;num_sub_specs; i++) {</div><div class='add'>+		if (sspec-&gt;freq_range_index &gt;= (BIOS_SAR_TABLE_LEN &gt;&gt; 1)) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "Ignore bad frequency index %u, max allowed %u\n",</div><div class='add'>+				    sspec-&gt;freq_range_index, BIOS_SAR_TABLE_LEN &gt;&gt; 1);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* chain0 and chain1 share same power setting */</div><div class='add'>+		sar_tbl[sspec-&gt;freq_range_index] = sspec-&gt;power;</div><div class='add'>+		index = sspec-&gt;freq_range_index + (BIOS_SAR_TABLE_LEN &gt;&gt; 1);</div><div class='add'>+		sar_tbl[index] = sspec-&gt;power;</div><div class='add'>+		ath11k_dbg(ar-&gt;ab, ATH11K_DBG_MAC, "sar tbl[%d] = %d\n",</div><div class='add'>+			   sspec-&gt;freq_range_index, sar_tbl[sspec-&gt;freq_range_index]);</div><div class='add'>+		sspec++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_pdev_set_bios_sar_table_param(ar, sar_tbl);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to set sar power: %d", ret);</div><div class='add'>+</div><div class='add'>+	kfree(sar_tbl);</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_op_cancel_remain_on_channel(struct ieee80211_hw *hw,</div><div class='add'>+						  struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	ar-&gt;scan.roc_notify = false;</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	ath11k_scan_abort(ar);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;ar-&gt;scan.timeout);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_op_remain_on_channel(struct ieee80211_hw *hw,</div><div class='add'>+					   struct ieee80211_vif *vif,</div><div class='add'>+					   struct ieee80211_channel *chan,</div><div class='add'>+					   int duration,</div><div class='add'>+					   enum ieee80211_roc_type type)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = hw-&gt;priv;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='add'>+	struct scan_req_params *arg;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 scan_time_msec;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	switch (ar-&gt;scan.state) {</div><div class='add'>+	case ATH11K_SCAN_IDLE:</div><div class='add'>+		reinit_completion(&amp;ar-&gt;scan.started);</div><div class='add'>+		reinit_completion(&amp;ar-&gt;scan.completed);</div><div class='add'>+		reinit_completion(&amp;ar-&gt;scan.on_channel);</div><div class='add'>+		ar-&gt;scan.state = ATH11K_SCAN_STARTING;</div><div class='add'>+		ar-&gt;scan.is_roc = true;</div><div class='add'>+		ar-&gt;scan.vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+		ar-&gt;scan.roc_freq = chan-&gt;center_freq;</div><div class='add'>+		ar-&gt;scan.roc_notify = true;</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	case ATH11K_SCAN_STARTING:</div><div class='add'>+	case ATH11K_SCAN_RUNNING:</div><div class='add'>+	case ATH11K_SCAN_ABORTING:</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	scan_time_msec = ar-&gt;hw-&gt;wiphy-&gt;max_remain_on_channel_duration * 2;</div><div class='add'>+</div><div class='add'>+	arg = kzalloc(sizeof(*arg), GFP_KERNEL);</div><div class='add'>+	if (!arg) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	ath11k_wmi_start_scan_init(ar, arg);</div><div class='add'>+	arg-&gt;num_chan = 1;</div><div class='add'>+	arg-&gt;chan_list = kcalloc(arg-&gt;num_chan, sizeof(*arg-&gt;chan_list),</div><div class='add'>+				 GFP_KERNEL);</div><div class='add'>+	if (!arg-&gt;chan_list) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto free_arg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arg-&gt;vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+	arg-&gt;scan_id = ATH11K_SCAN_ID;</div><div class='add'>+	arg-&gt;chan_list[0] = chan-&gt;center_freq;</div><div class='add'>+	arg-&gt;dwell_time_active = scan_time_msec;</div><div class='add'>+	arg-&gt;dwell_time_passive = scan_time_msec;</div><div class='add'>+	arg-&gt;max_scan_time = scan_time_msec;</div><div class='add'>+	arg-&gt;scan_f_passive = 1;</div><div class='add'>+	arg-&gt;burst_duration = duration;</div><div class='add'>+</div><div class='add'>+	if (!ar-&gt;ab-&gt;hw_params.single_pdev_only)</div><div class='add'>+		arg-&gt;scan_f_filter_prb_req = 1;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_start_scan(ar, arg);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to start roc scan: %d\n", ret);</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		ar-&gt;scan.state = ATH11K_SCAN_IDLE;</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		goto free_chan_list;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = wait_for_completion_timeout(&amp;ar-&gt;scan.on_channel, 3 * HZ);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to switch to channel for roc scan\n");</div><div class='add'>+		ret = ath11k_scan_stop(ar);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to stop scan: %d\n", ret);</div><div class='add'>+		ret = -ETIMEDOUT;</div><div class='add'>+		goto free_chan_list;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ieee80211_queue_delayed_work(ar-&gt;hw, &amp;ar-&gt;scan.timeout,</div><div class='add'>+				     msecs_to_jiffies(duration));</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+free_chan_list:</div><div class='add'>+	kfree(arg-&gt;chan_list);</div><div class='add'>+free_arg:</div><div class='add'>+	kfree(arg);</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_station_add(struct ath11k *ar,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='add'>+	struct peer_create_params peer_param;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	ret = ath11k_mac_inc_num_stations(arvif, sta);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "refusing to associate station: too many connected already (%d)\n",</div><div class='add'>+			    ar-&gt;max_num_stations);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Driver allows the DEL KEY followed by SET KEY sequence for</div><div class='add'>+	 * group keys for only when there is no clients associated, if at</div><div class='add'>+	 * all firmware has entered the race during that window,</div><div class='add'>+	 * reinstalling the same key when the first sta connects will allow</div><div class='add'>+	 * firmware to recover from the race.</div><div class='add'>+	 */</div><div class='add'>+	if (arvif-&gt;num_stations == 1 &amp;&amp; arvif-&gt;reinstall_group_keys) {</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_MAC, "set group keys on 1st station add for vdev %d\n",</div><div class='add'>+			   arvif-&gt;vdev_id);</div><div class='add'>+		ret = ath11k_set_group_keys(arvif);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto dec_num_station;</div><div class='add'>+		arvif-&gt;reinstall_group_keys = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arsta-&gt;rx_stats = kzalloc(sizeof(*arsta-&gt;rx_stats), GFP_KERNEL);</div><div class='add'>+	if (!arsta-&gt;rx_stats) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto dec_num_station;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	peer_param.vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+	peer_param.peer_addr = sta-&gt;addr;</div><div class='add'>+	peer_param.peer_type = WMI_PEER_TYPE_DEFAULT;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_peer_create(ar, arvif, sta, &amp;peer_param);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "Failed to add peer: %pM for VDEV: %d\n",</div><div class='add'>+			    sta-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+		goto free_rx_stats;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_MAC, "Added peer: %pM for VDEV: %d\n",</div><div class='add'>+		   sta-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	if (ath11k_debugfs_is_extd_tx_stats_enabled(ar)) {</div><div class='add'>+		arsta-&gt;tx_stats = kzalloc(sizeof(*arsta-&gt;tx_stats), GFP_KERNEL);</div><div class='add'>+		if (!arsta-&gt;tx_stats) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto free_peer;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_is_mesh(vif)) {</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_MAC,</div><div class='add'>+			   "setting USE_4ADDR for mesh STA %pM\n", sta-&gt;addr);</div><div class='add'>+		ret = ath11k_wmi_set_peer_param(ar, sta-&gt;addr,</div><div class='add'>+						arvif-&gt;vdev_id,</div><div class='add'>+						WMI_PEER_USE_4ADDR, 1);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ab, "failed to set mesh STA %pM 4addr capability: %d\n",</div><div class='add'>+				    sta-&gt;addr, ret);</div><div class='add'>+			goto free_tx_stats;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_dp_peer_setup(ar, arvif-&gt;vdev_id, sta-&gt;addr);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to setup dp for peer %pM on vdev %i (%d)\n",</div><div class='add'>+			    sta-&gt;addr, arvif-&gt;vdev_id, ret);</div><div class='add'>+		goto free_tx_stats;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params.vdev_start_delay &amp;&amp;</div><div class='add'>+	    !arvif-&gt;is_started &amp;&amp;</div><div class='add'>+	    arvif-&gt;vdev_type != WMI_VDEV_TYPE_AP) {</div><div class='add'>+		ret = ath11k_mac_start_vdev_delay(ar-&gt;hw, vif);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ab, "failed to delay vdev start: %d\n", ret);</div><div class='add'>+			goto free_tx_stats;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ewma_avg_rssi_init(&amp;arsta-&gt;avg_rssi);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_tx_stats:</div><div class='add'>+	kfree(arsta-&gt;tx_stats);</div><div class='add'>+	arsta-&gt;tx_stats = NULL;</div><div class='add'>+free_peer:</div><div class='add'>+	ath11k_peer_delete(ar, arvif-&gt;vdev_id, sta-&gt;addr);</div><div class='add'>+free_rx_stats:</div><div class='add'>+	kfree(arsta-&gt;rx_stats);</div><div class='add'>+	arsta-&gt;rx_stats = NULL;</div><div class='add'>+dec_num_station:</div><div class='add'>+	ath11k_mac_dec_num_stations(arvif, sta);</div><div class='add'>+exit:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_station_remove(struct ath11k *ar,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params.vdev_start_delay &amp;&amp;</div><div class='add'>+	    arvif-&gt;is_started &amp;&amp;</div><div class='add'>+	    arvif-&gt;vdev_type != WMI_VDEV_TYPE_AP) {</div><div class='add'>+		ret = ath11k_mac_stop_vdev_early(ar-&gt;hw, vif);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ab, "failed to do early vdev stop: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dp_peer_cleanup(ar, arvif-&gt;vdev_id, sta-&gt;addr);</div><div class='add'>+</div><div class='add'>+	ret = ath11k_peer_delete(ar, arvif-&gt;vdev_id, sta-&gt;addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath11k_warn(ab, "Failed to delete peer: %pM for VDEV: %d\n",</div><div class='add'>+			    sta-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+	else</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_MAC, "Removed peer: %pM for VDEV: %d\n",</div><div class='add'>+			   sta-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	ath11k_mac_dec_num_stations(arvif, sta);</div><div class='add'>+</div><div class='add'>+	kfree(arsta-&gt;tx_stats);</div><div class='add'>+	arsta-&gt;tx_stats = NULL;</div><div class='add'>+</div><div class='add'>+	kfree(arsta-&gt;rx_stats);</div><div class='add'>+	arsta-&gt;rx_stats = NULL;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_mac_op_sta_state(struct ieee80211_hw *hw,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_sta *sta,</div><div class='add'>+				   enum ieee80211_sta_state old_state,</div><div class='add'>+				   enum ieee80211_sta_state new_state)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = hw-&gt;priv;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='add'>+	struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);</div><div class='add'>+	enum ieee80211_ap_reg_power power_type;</div><div class='add'>+	struct cur_regulatory_info *reg_info;</div><div class='add'>+	struct ath11k_peer *peer;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* cancel must be done outside the mutex to avoid deadlock */</div><div class='add'>+	if ((old_state == IEEE80211_STA_NONE &amp;&amp;</div><div class='add'>+	     new_state == IEEE80211_STA_NOTEXIST)) {</div><div class='add'>+		cancel_work_sync(&amp;arsta-&gt;update_wk);</div><div class='add'>+		cancel_work_sync(&amp;arsta-&gt;set_4addr_wk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	if (old_state == IEEE80211_STA_NOTEXIST &amp;&amp;</div><div class='add'>+	    new_state == IEEE80211_STA_NONE) {</div><div class='add'>+		memset(arsta, 0, sizeof(*arsta));</div><div class='add'>+		arsta-&gt;arvif = arvif;</div><div class='add'>+		arsta-&gt;peer_ps_state = WMI_PEER_PS_STATE_DISABLED;</div><div class='add'>+		INIT_WORK(&amp;arsta-&gt;update_wk, ath11k_sta_rc_update_wk);</div><div class='add'>+		INIT_WORK(&amp;arsta-&gt;set_4addr_wk, ath11k_sta_set_4addr_wk);</div><div class='add'>+</div><div class='add'>+		ret = ath11k_mac_station_add(ar, vif, sta);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "Failed to add station: %pM for VDEV: %d\n",</div><div class='add'>+				    sta-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+	} else if ((old_state == IEEE80211_STA_NONE &amp;&amp;</div><div class='add'>+		    new_state == IEEE80211_STA_NOTEXIST)) {</div><div class='add'>+		ret = ath11k_mac_station_remove(ar, vif, sta);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "Failed to remove station: %pM for VDEV: %d\n",</div><div class='add'>+				    sta-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;ar-&gt;ab-&gt;tbl_mtx_lock);</div><div class='add'>+		spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+		peer = ath11k_peer_find(ar-&gt;ab, arvif-&gt;vdev_id, sta-&gt;addr);</div><div class='add'>+		if (peer &amp;&amp; peer-&gt;sta == sta) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "Found peer entry %pM n vdev %i after it was supposedly removed\n",</div><div class='add'>+				    vif-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+			ath11k_peer_rhash_delete(ar-&gt;ab, peer);</div><div class='add'>+			peer-&gt;sta = NULL;</div><div class='add'>+			list_del(&amp;peer-&gt;list);</div><div class='add'>+			kfree(peer);</div><div class='add'>+			ar-&gt;num_peers--;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+		mutex_unlock(&amp;ar-&gt;ab-&gt;tbl_mtx_lock);</div><div class='add'>+	} else if (old_state == IEEE80211_STA_AUTH &amp;&amp;</div><div class='add'>+		   new_state == IEEE80211_STA_ASSOC &amp;&amp;</div><div class='add'>+		   (vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='add'>+		    vif-&gt;type == NL80211_IFTYPE_MESH_POINT ||</div><div class='add'>+		    vif-&gt;type == NL80211_IFTYPE_ADHOC)) {</div><div class='add'>+		ret = ath11k_station_assoc(ar, vif, sta, false);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "Failed to associate station: %pM\n",</div><div class='add'>+				    sta-&gt;addr);</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		/* Set arsta bw and prev bw */</div><div class='add'>+		arsta-&gt;bw = ath11k_mac_ieee80211_sta_bw_to_wmi(ar, sta);</div><div class='add'>+		arsta-&gt;bw_prev = arsta-&gt;bw;</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	} else if (old_state == IEEE80211_STA_ASSOC &amp;&amp;</div><div class='add'>+		   new_state == IEEE80211_STA_AUTHORIZED) {</div><div class='add'>+		spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+		peer = ath11k_peer_find(ar-&gt;ab, arvif-&gt;vdev_id, sta-&gt;addr);</div><div class='add'>+		if (peer)</div><div class='add'>+			peer-&gt;is_authorized = true;</div><div class='add'>+</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; arvif-&gt;is_up) {</div><div class='add'>+			ret = ath11k_wmi_set_peer_param(ar, sta-&gt;addr,</div><div class='add'>+							arvif-&gt;vdev_id,</div><div class='add'>+							WMI_PEER_AUTHORIZE,</div><div class='add'>+							1);</div><div class='add'>+			if (ret)</div><div class='add'>+				ath11k_warn(ar-&gt;ab, "Unable to authorize peer %pM vdev %d: %d\n",</div><div class='add'>+					    sta-&gt;addr, arvif-&gt;vdev_id, ret);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!ret &amp;&amp;</div><div class='add'>+		    ath11k_wmi_supports_6ghz_cc_ext(ar) &amp;&amp;</div><div class='add'>+		    arvif-&gt;vdev_type == WMI_VDEV_TYPE_STA &amp;&amp;</div><div class='add'>+		    arvif-&gt;chanctx.def.chan &amp;&amp;</div><div class='add'>+		    arvif-&gt;chanctx.def.chan-&gt;band == NL80211_BAND_6GHZ) {</div><div class='add'>+			reg_info = &amp;ar-&gt;ab-&gt;reg_info_store[ar-&gt;pdev_idx];</div><div class='add'>+			power_type = vif-&gt;bss_conf.power_type;</div><div class='add'>+</div><div class='add'>+			if (power_type == IEEE80211_REG_UNSET_AP) {</div><div class='add'>+				ath11k_warn(ar-&gt;ab, "invalid power type %d\n",</div><div class='add'>+					    power_type);</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+			} else {</div><div class='add'>+				ret = ath11k_reg_handle_chan_list(ar-&gt;ab,</div><div class='add'>+								  reg_info,</div><div class='add'>+								  power_type);</div><div class='add'>+				if (ret)</div><div class='add'>+					ath11k_warn(ar-&gt;ab,</div><div class='add'>+						    "failed to handle chan list with power type %d\n",</div><div class='add'>+						    power_type);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else if (old_state == IEEE80211_STA_AUTHORIZED &amp;&amp;</div><div class='add'>+		   new_state == IEEE80211_STA_ASSOC) {</div><div class='add'>+		spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+		peer = ath11k_peer_find(ar-&gt;ab, arvif-&gt;vdev_id, sta-&gt;addr);</div><div class='add'>+		if (peer)</div><div class='add'>+			peer-&gt;is_authorized = false;</div><div class='add'>+</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+	} else if (old_state == IEEE80211_STA_ASSOC &amp;&amp;</div><div class='add'>+		   new_state == IEEE80211_STA_AUTH &amp;&amp;</div><div class='add'>+		   (vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='add'>+		    vif-&gt;type == NL80211_IFTYPE_MESH_POINT ||</div><div class='add'>+		    vif-&gt;type == NL80211_IFTYPE_ADHOC)) {</div><div class='add'>+		ret = ath11k_station_disassoc(ar, vif, sta);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "Failed to disassociate station: %pM\n",</div><div class='add'>+				    sta-&gt;addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ieee80211_ops ath11k_ops = {</div><div class='ctx'> 	.tx				= ath11k_mac_op_tx,</div><div class='add'>+	.wake_tx_queue			= ieee80211_handle_wake_tx_queue,</div><div class='ctx'> 	.start                          = ath11k_mac_op_start,</div><div class='ctx'> 	.stop                           = ath11k_mac_op_stop,</div><div class='ctx'> 	.reconfig_complete              = ath11k_mac_op_reconfig_complete,</div><div class='hunk'>@@ -6167,9 +10075,11 @@ static const struct ieee80211_ops ath11k_ops = {</div><div class='ctx'> 	.hw_scan                        = ath11k_mac_op_hw_scan,</div><div class='ctx'> 	.cancel_hw_scan                 = ath11k_mac_op_cancel_hw_scan,</div><div class='ctx'> 	.set_key                        = ath11k_mac_op_set_key,</div><div class='add'>+	.set_rekey_data	                = ath11k_mac_op_set_rekey_data,</div><div class='ctx'> 	.sta_state                      = ath11k_mac_op_sta_state,</div><div class='add'>+	.sta_set_4addr                  = ath11k_mac_op_sta_set_4addr,</div><div class='ctx'> 	.sta_set_txpwr			= ath11k_mac_op_sta_set_txpwr,</div><div class='del'>-	.sta_rc_update			= ath11k_mac_op_sta_rc_update,</div><div class='add'>+	.link_sta_rc_update		= ath11k_mac_op_sta_rc_update,</div><div class='ctx'> 	.conf_tx                        = ath11k_mac_op_conf_tx,</div><div class='ctx'> 	.set_antenna			= ath11k_mac_op_set_antenna,</div><div class='ctx'> 	.get_antenna			= ath11k_mac_op_get_antenna,</div><div class='hunk'>@@ -6187,9 +10097,26 @@ static const struct ieee80211_ops ath11k_ops = {</div><div class='ctx'> 	.flush				= ath11k_mac_op_flush,</div><div class='ctx'> 	.sta_statistics			= ath11k_mac_op_sta_statistics,</div><div class='ctx'> 	CFG80211_TESTMODE_CMD(ath11k_tm_cmd)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend			= ath11k_wow_op_suspend,</div><div class='add'>+	.resume				= ath11k_wow_op_resume,</div><div class='add'>+	.set_wakeup			= ath11k_wow_op_set_wakeup,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_ATH11K_DEBUGFS</div><div class='add'>+	.vif_add_debugfs		= ath11k_debugfs_op_vif_add,</div><div class='ctx'> 	.sta_add_debugfs		= ath11k_debugfs_sta_op_add,</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	.ipv6_addr_change = ath11k_mac_op_ipv6_changed,</div><div class='add'>+#endif</div><div class='add'>+	.get_txpower                    = ath11k_mac_op_get_txpower,</div><div class='add'>+</div><div class='add'>+	.set_sar_specs			= ath11k_mac_op_set_bios_sar_specs,</div><div class='add'>+	.remain_on_channel		= ath11k_mac_op_remain_on_channel,</div><div class='add'>+	.cancel_remain_on_channel	= ath11k_mac_op_cancel_remain_on_channel,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void ath11k_mac_update_ch_list(struct ath11k *ar,</div><div class='hunk'>@@ -6228,7 +10155,7 @@ static int ath11k_mac_setup_channels_rates(struct ath11k *ar,</div><div class='ctx'> 					   u32 supported_bands)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_supported_band *band;</div><div class='del'>-	struct ath11k_hal_reg_capabilities_ext *reg_cap;</div><div class='add'>+	struct ath11k_hal_reg_capabilities_ext *reg_cap, *temp_reg_cap;</div><div class='ctx'> 	void *channels;</div><div class='ctx'> 	u32 phy_id;</div><div class='ctx'> </div><div class='hunk'>@@ -6238,6 +10165,7 @@ static int ath11k_mac_setup_channels_rates(struct ath11k *ar,</div><div class='ctx'> 		     ATH11K_NUM_CHANS);</div><div class='ctx'> </div><div class='ctx'> 	reg_cap = &amp;ar-&gt;ab-&gt;hal_reg_cap[ar-&gt;pdev_idx];</div><div class='add'>+	temp_reg_cap = reg_cap;</div><div class='ctx'> </div><div class='ctx'> 	if (supported_bands &amp; WMI_HOST_WLAN_2G_CAP) {</div><div class='ctx'> 		channels = kmemdup(ath11k_2ghz_channels,</div><div class='hunk'>@@ -6256,15 +10184,15 @@ static int ath11k_mac_setup_channels_rates(struct ath11k *ar,</div><div class='ctx'> </div><div class='ctx'> 		if (ar-&gt;ab-&gt;hw_params.single_pdev_only) {</div><div class='ctx'> 			phy_id = ath11k_get_phy_id(ar, WMI_HOST_WLAN_2G_CAP);</div><div class='del'>-			reg_cap = &amp;ar-&gt;ab-&gt;hal_reg_cap[phy_id];</div><div class='add'>+			temp_reg_cap = &amp;ar-&gt;ab-&gt;hal_reg_cap[phy_id];</div><div class='ctx'> 		}</div><div class='ctx'> 		ath11k_mac_update_ch_list(ar, band,</div><div class='del'>-					  reg_cap-&gt;low_2ghz_chan,</div><div class='del'>-					  reg_cap-&gt;high_2ghz_chan);</div><div class='add'>+					  temp_reg_cap-&gt;low_2ghz_chan,</div><div class='add'>+					  temp_reg_cap-&gt;high_2ghz_chan);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (supported_bands &amp; WMI_HOST_WLAN_5G_CAP) {</div><div class='del'>-		if (reg_cap-&gt;high_5ghz_chan &gt;= ATH11K_MAX_6G_FREQ) {</div><div class='add'>+		if (reg_cap-&gt;high_5ghz_chan &gt;= ATH11K_MIN_6G_FREQ) {</div><div class='ctx'> 			channels = kmemdup(ath11k_6ghz_channels,</div><div class='ctx'> 					   sizeof(ath11k_6ghz_channels), GFP_KERNEL);</div><div class='ctx'> 			if (!channels) {</div><div class='hunk'>@@ -6280,9 +10208,15 @@ static int ath11k_mac_setup_channels_rates(struct ath11k *ar,</div><div class='ctx'> 			band-&gt;n_bitrates = ath11k_a_rates_size;</div><div class='ctx'> 			band-&gt;bitrates = ath11k_a_rates;</div><div class='ctx'> 			ar-&gt;hw-&gt;wiphy-&gt;bands[NL80211_BAND_6GHZ] = band;</div><div class='add'>+</div><div class='add'>+			if (ar-&gt;ab-&gt;hw_params.single_pdev_only) {</div><div class='add'>+				phy_id = ath11k_get_phy_id(ar, WMI_HOST_WLAN_5G_CAP);</div><div class='add'>+				temp_reg_cap = &amp;ar-&gt;ab-&gt;hal_reg_cap[phy_id];</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			ath11k_mac_update_ch_list(ar, band,</div><div class='del'>-						  reg_cap-&gt;low_5ghz_chan,</div><div class='del'>-						  reg_cap-&gt;high_5ghz_chan);</div><div class='add'>+						  temp_reg_cap-&gt;low_5ghz_chan,</div><div class='add'>+						  temp_reg_cap-&gt;high_5ghz_chan);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (reg_cap-&gt;low_5ghz_chan &lt; ATH11K_MIN_6G_FREQ) {</div><div class='hunk'>@@ -6305,30 +10239,68 @@ static int ath11k_mac_setup_channels_rates(struct ath11k *ar,</div><div class='ctx'> </div><div class='ctx'> 			if (ar-&gt;ab-&gt;hw_params.single_pdev_only) {</div><div class='ctx'> 				phy_id = ath11k_get_phy_id(ar, WMI_HOST_WLAN_5G_CAP);</div><div class='del'>-				reg_cap = &amp;ar-&gt;ab-&gt;hal_reg_cap[phy_id];</div><div class='add'>+				temp_reg_cap = &amp;ar-&gt;ab-&gt;hal_reg_cap[phy_id];</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			ath11k_mac_update_ch_list(ar, band,</div><div class='del'>-						  reg_cap-&gt;low_5ghz_chan,</div><div class='del'>-						  reg_cap-&gt;high_5ghz_chan);</div><div class='add'>+						  temp_reg_cap-&gt;low_5ghz_chan,</div><div class='add'>+						  temp_reg_cap-&gt;high_5ghz_chan);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ath11k_mac_setup_mac_address_list(struct ath11k *ar)</div><div class='add'>+{</div><div class='add'>+	struct mac_address *addresses;</div><div class='add'>+	u16 n_addresses;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!ar-&gt;ab-&gt;hw_params.support_dual_stations)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	n_addresses = ar-&gt;ab-&gt;hw_params.num_vdevs;</div><div class='add'>+	addresses = kcalloc(n_addresses, sizeof(*addresses), GFP_KERNEL);</div><div class='add'>+	if (!addresses)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memcpy(addresses[0].addr, ar-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+	for (i = 1; i &lt; n_addresses; i++) {</div><div class='add'>+		memcpy(addresses[i].addr, ar-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+		/* set Local Administered Address bit */</div><div class='add'>+		addresses[i].addr[0] |= 0x2;</div><div class='add'>+</div><div class='add'>+		addresses[i].addr[0] += (i - 1) &lt;&lt; 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;hw-&gt;wiphy-&gt;addresses = addresses;</div><div class='add'>+	ar-&gt;hw-&gt;wiphy-&gt;n_addresses = n_addresses;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath11k_mac_setup_iface_combinations(struct ath11k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = ar-&gt;ab;</div><div class='ctx'> 	struct ieee80211_iface_combination *combinations;</div><div class='ctx'> 	struct ieee80211_iface_limit *limits;</div><div class='del'>-	int n_limits;</div><div class='add'>+	int n_limits, n_combos;</div><div class='add'>+	bool p2p;</div><div class='ctx'> </div><div class='del'>-	combinations = kzalloc(sizeof(*combinations), GFP_KERNEL);</div><div class='add'>+	p2p = ab-&gt;hw_params.interface_modes &amp; BIT(NL80211_IFTYPE_P2P_DEVICE);</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params.support_dual_stations)</div><div class='add'>+		n_combos = 2;</div><div class='add'>+	else</div><div class='add'>+		n_combos = 1;</div><div class='add'>+</div><div class='add'>+	combinations = kcalloc(n_combos, sizeof(*combinations), GFP_KERNEL);</div><div class='ctx'> 	if (!combinations)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	n_limits = 2;</div><div class='add'>+	if (p2p)</div><div class='add'>+		n_limits = 3;</div><div class='add'>+	else</div><div class='add'>+		n_limits = 2;</div><div class='ctx'> </div><div class='ctx'> 	limits = kcalloc(n_limits, sizeof(*limits), GFP_KERNEL);</div><div class='ctx'> 	if (!limits) {</div><div class='hunk'>@@ -6338,46 +10310,68 @@ static int ath11k_mac_setup_iface_combinations(struct ath11k *ar)</div><div class='ctx'> </div><div class='ctx'> 	limits[0].max = 1;</div><div class='ctx'> 	limits[0].types |= BIT(NL80211_IFTYPE_STATION);</div><div class='del'>-</div><div class='ctx'> 	limits[1].max = 16;</div><div class='ctx'> 	limits[1].types |= BIT(NL80211_IFTYPE_AP);</div><div class='del'>-</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_MAC80211_MESH) &amp;&amp;</div><div class='ctx'> 	    ab-&gt;hw_params.interface_modes &amp; BIT(NL80211_IFTYPE_MESH_POINT))</div><div class='ctx'> 		limits[1].types |= BIT(NL80211_IFTYPE_MESH_POINT);</div><div class='ctx'> </div><div class='ctx'> 	combinations[0].limits = limits;</div><div class='ctx'> 	combinations[0].n_limits = n_limits;</div><div class='del'>-	combinations[0].max_interfaces = 16;</div><div class='del'>-	combinations[0].num_different_channels = 1;</div><div class='ctx'> 	combinations[0].beacon_int_infra_match = true;</div><div class='ctx'> 	combinations[0].beacon_int_min_gcd = 100;</div><div class='add'>+	combinations[0].max_interfaces = 16;</div><div class='add'>+	combinations[0].num_different_channels = 1;</div><div class='ctx'> 	combinations[0].radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |</div><div class='ctx'> 						BIT(NL80211_CHAN_WIDTH_20) |</div><div class='ctx'> 						BIT(NL80211_CHAN_WIDTH_40) |</div><div class='del'>-						BIT(NL80211_CHAN_WIDTH_80);</div><div class='add'>+						BIT(NL80211_CHAN_WIDTH_80) |</div><div class='add'>+						BIT(NL80211_CHAN_WIDTH_80P80) |</div><div class='add'>+						BIT(NL80211_CHAN_WIDTH_160);</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params.support_dual_stations) {</div><div class='add'>+		limits[0].max = 2;</div><div class='add'>+</div><div class='add'>+		combinations[1].limits = limits;</div><div class='add'>+		combinations[1].n_limits = n_limits;</div><div class='add'>+		combinations[1].beacon_int_infra_match = true;</div><div class='add'>+		combinations[1].beacon_int_min_gcd = 100;</div><div class='add'>+		combinations[1].max_interfaces = ab-&gt;hw_params.num_vdevs;</div><div class='add'>+		combinations[1].num_different_channels = 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (p2p) {</div><div class='add'>+		limits[1].types |= BIT(NL80211_IFTYPE_P2P_CLIENT) |</div><div class='add'>+			BIT(NL80211_IFTYPE_P2P_GO);</div><div class='add'>+		limits[2].max = 1;</div><div class='add'>+		limits[2].types |= BIT(NL80211_IFTYPE_P2P_DEVICE);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;hw-&gt;wiphy-&gt;iface_combinations = combinations;</div><div class='del'>-	ar-&gt;hw-&gt;wiphy-&gt;n_iface_combinations = 1;</div><div class='add'>+	ar-&gt;hw-&gt;wiphy-&gt;n_iface_combinations = n_combos;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const u8 ath11k_if_types_ext_capa[] = {</div><div class='ctx'> 	[0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING,</div><div class='add'>+	[2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT,</div><div class='ctx'> 	[7] = WLAN_EXT_CAPA8_OPMODE_NOTIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const u8 ath11k_if_types_ext_capa_sta[] = {</div><div class='ctx'> 	[0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING,</div><div class='add'>+	[2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT,</div><div class='ctx'> 	[7] = WLAN_EXT_CAPA8_OPMODE_NOTIF,</div><div class='ctx'> 	[9] = WLAN_EXT_CAPA10_TWT_REQUESTER_SUPPORT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const u8 ath11k_if_types_ext_capa_ap[] = {</div><div class='ctx'> 	[0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING,</div><div class='add'>+	[2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT,</div><div class='ctx'> 	[7] = WLAN_EXT_CAPA8_OPMODE_NOTIF,</div><div class='ctx'> 	[9] = WLAN_EXT_CAPA10_TWT_RESPONDER_SUPPORT,</div><div class='add'>+	[10] = WLAN_EXT_CAPA11_EMA_SUPPORT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct wiphy_iftype_ext_capab ath11k_iftypes_ext_capa[] = {</div><div class='hunk'>@@ -6402,6 +10396,7 @@ static const struct wiphy_iftype_ext_capab ath11k_iftypes_ext_capa[] = {</div><div class='ctx'> </div><div class='ctx'> static void __ath11k_mac_unregister(struct ath11k *ar)</div><div class='ctx'> {</div><div class='add'>+	cancel_work_sync(&amp;ar-&gt;channel_update_work);</div><div class='ctx'> 	cancel_work_sync(&amp;ar-&gt;regd_update_work);</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_unregister_hw(ar-&gt;hw);</div><div class='hunk'>@@ -6416,6 +10411,8 @@ static void __ath11k_mac_unregister(struct ath11k *ar)</div><div class='ctx'> 	kfree(ar-&gt;hw-&gt;wiphy-&gt;iface_combinations[0].limits);</div><div class='ctx'> 	kfree(ar-&gt;hw-&gt;wiphy-&gt;iface_combinations);</div><div class='ctx'> </div><div class='add'>+	kfree(ar-&gt;hw-&gt;wiphy-&gt;addresses);</div><div class='add'>+</div><div class='ctx'> 	SET_IEEE80211_DEV(ar-&gt;hw, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6433,6 +10430,8 @@ void ath11k_mac_unregister(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> 		__ath11k_mac_unregister(ar);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	ath11k_peer_rhash_tbl_destroy(ab);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __ath11k_mac_register(struct ath11k *ar)</div><div class='hunk'>@@ -6456,6 +10455,7 @@ static int __ath11k_mac_register(struct ath11k *ar)</div><div class='ctx'> 	ath11k_pdev_caps_update(ar);</div><div class='ctx'> </div><div class='ctx'> 	SET_IEEE80211_PERM_ADDR(ar-&gt;hw, ar-&gt;mac_addr);</div><div class='add'>+	ath11k_mac_setup_mac_address_list(ar);</div><div class='ctx'> </div><div class='ctx'> 	SET_IEEE80211_DEV(ar-&gt;hw, ab-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -6464,6 +10464,7 @@ static int __ath11k_mac_register(struct ath11k *ar)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='add'>+	wiphy_read_of_freq_limits(ar-&gt;hw-&gt;wiphy);</div><div class='ctx'> 	ath11k_mac_setup_ht_vht_cap(ar, cap, &amp;ht_cap);</div><div class='ctx'> 	ath11k_mac_setup_he_cap(ar, cap);</div><div class='ctx'> </div><div class='hunk'>@@ -6478,6 +10479,14 @@ static int __ath11k_mac_register(struct ath11k *ar)</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;hw-&gt;wiphy-&gt;interface_modes = ab-&gt;hw_params.interface_modes;</div><div class='ctx'> </div><div class='add'>+	if (ab-&gt;hw_params.single_pdev_only &amp;&amp; ar-&gt;supports_6ghz)</div><div class='add'>+		ieee80211_hw_set(ar-&gt;hw, SINGLE_SCAN_ON_ALL_BANDS);</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params.supports_multi_bssid) {</div><div class='add'>+		ieee80211_hw_set(ar-&gt;hw, SUPPORTS_MULTI_BSSID);</div><div class='add'>+		ieee80211_hw_set(ar-&gt;hw, SUPPORTS_ONLY_HE_MULTI_BSSID);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ieee80211_hw_set(ar-&gt;hw, SIGNAL_DBM);</div><div class='ctx'> 	ieee80211_hw_set(ar-&gt;hw, SUPPORTS_PS);</div><div class='ctx'> 	ieee80211_hw_set(ar-&gt;hw, SUPPORTS_DYNAMIC_PS);</div><div class='hunk'>@@ -6493,8 +10502,16 @@ static int __ath11k_mac_register(struct ath11k *ar)</div><div class='ctx'> 	ieee80211_hw_set(ar-&gt;hw, QUEUE_CONTROL);</div><div class='ctx'> 	ieee80211_hw_set(ar-&gt;hw, SUPPORTS_TX_FRAG);</div><div class='ctx'> 	ieee80211_hw_set(ar-&gt;hw, REPORTS_LOW_ACK);</div><div class='del'>-	ieee80211_hw_set(ar-&gt;hw, SUPPORTS_TX_ENCAP_OFFLOAD);</div><div class='del'>-	if (ht_cap &amp; WMI_HT_CAP_ENABLED) {</div><div class='add'>+</div><div class='add'>+	if (ath11k_frame_mode == ATH11K_HW_TXRX_ETHERNET) {</div><div class='add'>+		ieee80211_hw_set(ar-&gt;hw, SUPPORTS_TX_ENCAP_OFFLOAD);</div><div class='add'>+		ieee80211_hw_set(ar-&gt;hw, SUPPORTS_RX_DECAP_OFFLOAD);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cap-&gt;nss_ratio_enabled)</div><div class='add'>+		ieee80211_hw_set(ar-&gt;hw, SUPPORTS_VHT_EXT_NSS_BW);</div><div class='add'>+</div><div class='add'>+	if ((ht_cap &amp; WMI_HT_CAP_ENABLED) || ar-&gt;supports_6ghz) {</div><div class='ctx'> 		ieee80211_hw_set(ar-&gt;hw, AMPDU_AGGREGATION);</div><div class='ctx'> 		ieee80211_hw_set(ar-&gt;hw, TX_AMPDU_SETUP_IN_HW);</div><div class='ctx'> 		ieee80211_hw_set(ar-&gt;hw, SUPPORTS_REORDERING_BUFFER);</div><div class='hunk'>@@ -6509,7 +10526,8 @@ static int __ath11k_mac_register(struct ath11k *ar)</div><div class='ctx'> 	 * for each band for a dual band capable radio. It will be tricky to</div><div class='ctx'> 	 * handle it when the ht capability different for each band.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ht_cap &amp; WMI_HT_CAP_DYNAMIC_SMPS)</div><div class='add'>+	if (ht_cap &amp; WMI_HT_CAP_DYNAMIC_SMPS ||</div><div class='add'>+	    (ar-&gt;supports_6ghz &amp;&amp; ab-&gt;hw_params.supports_dynamic_smps_6ghz))</div><div class='ctx'> 		ar-&gt;hw-&gt;wiphy-&gt;features |= NL80211_FEATURE_DYNAMIC_SMPS;</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;hw-&gt;wiphy-&gt;max_scan_ssids = WLAN_SCAN_PARAMS_MAX_SSID;</div><div class='hunk'>@@ -6525,21 +10543,57 @@ static int __ath11k_mac_register(struct ath11k *ar)</div><div class='ctx'> 	ar-&gt;hw-&gt;wiphy-&gt;features |= NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE |</div><div class='ctx'> 				   NL80211_FEATURE_AP_SCAN;</div><div class='ctx'> </div><div class='del'>-	ar-&gt;max_num_stations = TARGET_NUM_STATIONS;</div><div class='del'>-	ar-&gt;max_num_peers = TARGET_NUM_PEERS_PDEV;</div><div class='add'>+	ar-&gt;hw-&gt;wiphy-&gt;features |= NL80211_FEATURE_TX_POWER_INSERTION;</div><div class='add'>+</div><div class='add'>+	ar-&gt;max_num_stations = TARGET_NUM_STATIONS(ab);</div><div class='add'>+	ar-&gt;max_num_peers = TARGET_NUM_PEERS_PDEV(ab);</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;hw-&gt;wiphy-&gt;max_ap_assoc_sta = ar-&gt;max_num_stations;</div><div class='ctx'> </div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_SPOOF_MAC_SUPPORT, ar-&gt;wmi-&gt;wmi_ab-&gt;svc_map)) {</div><div class='add'>+		ar-&gt;hw-&gt;wiphy-&gt;features |=</div><div class='add'>+			NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_NLO, ar-&gt;wmi-&gt;wmi_ab-&gt;svc_map)) {</div><div class='add'>+		ar-&gt;hw-&gt;wiphy-&gt;max_sched_scan_ssids = WMI_PNO_MAX_SUPP_NETWORKS;</div><div class='add'>+		ar-&gt;hw-&gt;wiphy-&gt;max_match_sets = WMI_PNO_MAX_SUPP_NETWORKS;</div><div class='add'>+		ar-&gt;hw-&gt;wiphy-&gt;max_sched_scan_ie_len = WMI_PNO_MAX_IE_LENGTH;</div><div class='add'>+		ar-&gt;hw-&gt;wiphy-&gt;max_sched_scan_plans = WMI_PNO_MAX_SCHED_SCAN_PLANS;</div><div class='add'>+		ar-&gt;hw-&gt;wiphy-&gt;max_sched_scan_plan_interval =</div><div class='add'>+			WMI_PNO_MAX_SCHED_SCAN_PLAN_INT;</div><div class='add'>+		ar-&gt;hw-&gt;wiphy-&gt;max_sched_scan_plan_iterations =</div><div class='add'>+			WMI_PNO_MAX_SCHED_SCAN_PLAN_ITRNS;</div><div class='add'>+		ar-&gt;hw-&gt;wiphy-&gt;features |= NL80211_FEATURE_ND_RANDOM_MAC_ADDR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wow_init(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to init wow: %d\n", ret);</div><div class='add'>+		goto err_free_if_combs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_TX_DATA_MGMT_ACK_RSSI,</div><div class='add'>+		     ar-&gt;ab-&gt;wmi_ab.svc_map))</div><div class='add'>+		wiphy_ext_feature_set(ar-&gt;hw-&gt;wiphy,</div><div class='add'>+				      NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT);</div><div class='add'>+</div><div class='ctx'> 	ar-&gt;hw-&gt;queues = ATH11K_HW_MAX_QUEUES;</div><div class='ctx'> 	ar-&gt;hw-&gt;wiphy-&gt;tx_queue_len = ATH11K_QUEUE_LEN;</div><div class='ctx'> 	ar-&gt;hw-&gt;offchannel_tx_hw_queue = ATH11K_HW_MAX_QUEUES - 1;</div><div class='del'>-	ar-&gt;hw-&gt;max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF;</div><div class='add'>+	ar-&gt;hw-&gt;max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF_HE;</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;hw-&gt;vif_data_size = sizeof(struct ath11k_vif);</div><div class='ctx'> 	ar-&gt;hw-&gt;sta_data_size = sizeof(struct ath11k_sta);</div><div class='ctx'> </div><div class='ctx'> 	wiphy_ext_feature_set(ar-&gt;hw-&gt;wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);</div><div class='ctx'> 	wiphy_ext_feature_set(ar-&gt;hw-&gt;wiphy, NL80211_EXT_FEATURE_STA_TX_PWR);</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_BSS_COLOR_OFFLOAD,</div><div class='add'>+		     ar-&gt;ab-&gt;wmi_ab.svc_map)) {</div><div class='add'>+		wiphy_ext_feature_set(ar-&gt;hw-&gt;wiphy,</div><div class='add'>+				      NL80211_EXT_FEATURE_BSS_COLOR);</div><div class='add'>+		ieee80211_hw_set(ar-&gt;hw, DETECTS_COLOR_COLLISION);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;hw-&gt;wiphy-&gt;cipher_suites = cipher_suites;</div><div class='ctx'> 	ar-&gt;hw-&gt;wiphy-&gt;n_cipher_suites = ARRAY_SIZE(cipher_suites);</div><div class='hunk'>@@ -6555,6 +10609,16 @@ static int __ath11k_mac_register(struct ath11k *ar)</div><div class='ctx'> 				      NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	wiphy_ext_feature_set(ar-&gt;hw-&gt;wiphy,</div><div class='add'>+			      NL80211_EXT_FEATURE_SET_SCAN_DWELL);</div><div class='add'>+</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_RTT, ar-&gt;ab-&gt;wmi_ab.svc_map))</div><div class='add'>+		wiphy_ext_feature_set(ar-&gt;hw-&gt;wiphy,</div><div class='add'>+				      NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER);</div><div class='add'>+</div><div class='add'>+	ar-&gt;hw-&gt;wiphy-&gt;mbssid_max_interfaces = TARGET_NUM_VDEVS(ab);</div><div class='add'>+	ar-&gt;hw-&gt;wiphy-&gt;ema_max_profile_periodicity = TARGET_EMA_MAX_PROFILE_PERIOD;</div><div class='add'>+</div><div class='ctx'> 	ath11k_reg_init(ar);</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(ATH11K_FLAG_RAW_MODE, &amp;ab-&gt;dev_flags)) {</div><div class='hunk'>@@ -6563,6 +10627,10 @@ static int __ath11k_mac_register(struct ath11k *ar)</div><div class='ctx'> 		ieee80211_hw_set(ar-&gt;hw, SUPPORT_FAST_XMIT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_BIOS_SAR_SUPPORT, ar-&gt;ab-&gt;wmi_ab.svc_map) &amp;&amp;</div><div class='add'>+	    ab-&gt;hw_params.bios_sar_capa)</div><div class='add'>+		ar-&gt;hw-&gt;wiphy-&gt;sar_capa = ab-&gt;hw_params.bios_sar_capa;</div><div class='add'>+</div><div class='ctx'> 	ret = ieee80211_register_hw(ar-&gt;hw);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_err(ar-&gt;ab, "ieee80211 registration failed: %d\n", ret);</div><div class='hunk'>@@ -6578,12 +10646,20 @@ static int __ath11k_mac_register(struct ath11k *ar)</div><div class='ctx'> 		ar-&gt;hw-&gt;wiphy-&gt;interface_modes &amp;= ~BIT(NL80211_IFTYPE_MONITOR);</div><div class='ctx'> </div><div class='ctx'> 	/* Apply the regd received during initialization */</div><div class='del'>-	ret = ath11k_regd_update(ar, true);</div><div class='add'>+	ret = ath11k_regd_update(ar);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_err(ar-&gt;ab, "ath11k regd update failed: %d\n", ret);</div><div class='ctx'> 		goto err_unregister_hw;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (ab-&gt;hw_params.current_cc_support &amp;&amp; ab-&gt;new_alpha2[0]) {</div><div class='add'>+		memcpy(&amp;ar-&gt;alpha2, ab-&gt;new_alpha2, 2);</div><div class='add'>+		ret = ath11k_reg_set_cc(ar);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath11k_warn(ar-&gt;ab,</div><div class='add'>+				    "failed set cc code for mac register: %d\n", ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = ath11k_debugfs_register(ar);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_err(ar-&gt;ab, "debugfs registration failed: %d\n", ret);</div><div class='hunk'>@@ -6615,32 +10691,44 @@ int ath11k_mac_register(struct ath11k_base *ab)</div><div class='ctx'> 	struct ath11k_pdev *pdev;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int ret;</div><div class='add'>+	u8 mac_addr[ETH_ALEN] = {};</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(ATH11K_FLAG_REGISTERED, &amp;ab-&gt;dev_flags))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	/* Initialize channel counters frequency value in hertz */</div><div class='add'>+	ab-&gt;cc_freq_hz = IPQ8074_CC_FREQ_HERTZ;</div><div class='add'>+	ab-&gt;free_vdev_map = (1LL &lt;&lt; (ab-&gt;num_radios * TARGET_NUM_VDEVS(ab))) - 1;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_peer_rhash_tbl_init(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	device_get_mac_address(ab-&gt;dev, mac_addr);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='ctx'> 		pdev = &amp;ab-&gt;pdevs[i];</div><div class='ctx'> 		ar = pdev-&gt;ar;</div><div class='ctx'> 		if (ab-&gt;pdevs_macaddr_valid) {</div><div class='ctx'> 			ether_addr_copy(ar-&gt;mac_addr, pdev-&gt;mac_addr);</div><div class='ctx'> 		} else {</div><div class='del'>-			ether_addr_copy(ar-&gt;mac_addr, ab-&gt;mac_addr);</div><div class='add'>+			if (is_zero_ether_addr(mac_addr))</div><div class='add'>+				ether_addr_copy(ar-&gt;mac_addr, ab-&gt;mac_addr);</div><div class='add'>+			else</div><div class='add'>+				ether_addr_copy(ar-&gt;mac_addr, mac_addr);</div><div class='ctx'> 			ar-&gt;mac_addr[4] += i;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		idr_init(&amp;ar-&gt;txmgmt_idr);</div><div class='add'>+		spin_lock_init(&amp;ar-&gt;txmgmt_idr_lock);</div><div class='add'>+</div><div class='ctx'> 		ret = __ath11k_mac_register(ar);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto err_cleanup;</div><div class='ctx'> </div><div class='del'>-		idr_init(&amp;ar-&gt;txmgmt_idr);</div><div class='del'>-		spin_lock_init(&amp;ar-&gt;txmgmt_idr_lock);</div><div class='add'>+		init_waitqueue_head(&amp;ar-&gt;txmgmt_empty_waitq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Initialize channel counters frequency value in hertz */</div><div class='del'>-	ab-&gt;cc_freq_hz = IPQ8074_CC_FREQ_HERTZ;</div><div class='del'>-	ab-&gt;free_vdev_map = (1LL &lt;&lt; (ab-&gt;num_radios * TARGET_NUM_VDEVS)) - 1;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_cleanup:</div><div class='hunk'>@@ -6650,6 +10738,8 @@ err_cleanup:</div><div class='ctx'> 		__ath11k_mac_unregister(ar);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_peer_rhash_tbl_destroy(ab);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6704,14 +10794,25 @@ int ath11k_mac_allocate(struct ath11k_base *ab)</div><div class='ctx'> 		init_completion(&amp;ar-&gt;bss_survey_done);</div><div class='ctx'> 		init_completion(&amp;ar-&gt;scan.started);</div><div class='ctx'> 		init_completion(&amp;ar-&gt;scan.completed);</div><div class='add'>+		init_completion(&amp;ar-&gt;scan.on_channel);</div><div class='ctx'> 		init_completion(&amp;ar-&gt;thermal.wmi_sync);</div><div class='ctx'> </div><div class='ctx'> 		INIT_DELAYED_WORK(&amp;ar-&gt;scan.timeout, ath11k_scan_timeout_work);</div><div class='add'>+		INIT_WORK(&amp;ar-&gt;channel_update_work, ath11k_regd_update_chan_list_work);</div><div class='add'>+		INIT_LIST_HEAD(&amp;ar-&gt;channel_update_queue);</div><div class='ctx'> 		INIT_WORK(&amp;ar-&gt;regd_update_work, ath11k_regd_update_work);</div><div class='ctx'> </div><div class='ctx'> 		INIT_WORK(&amp;ar-&gt;wmi_mgmt_tx_work, ath11k_mgmt_over_wmi_tx_work);</div><div class='ctx'> 		skb_queue_head_init(&amp;ar-&gt;wmi_mgmt_tx_queue);</div><div class='del'>-		clear_bit(ATH11K_FLAG_MONITOR_ENABLED, &amp;ar-&gt;monitor_flags);</div><div class='add'>+</div><div class='add'>+		clear_bit(ATH11K_FLAG_MONITOR_STARTED, &amp;ar-&gt;monitor_flags);</div><div class='add'>+</div><div class='add'>+		ar-&gt;monitor_vdev_id = -1;</div><div class='add'>+		clear_bit(ATH11K_FLAG_MONITOR_VDEV_CREATED, &amp;ar-&gt;monitor_flags);</div><div class='add'>+		ar-&gt;vdev_id_11d_scan = ATH11K_11D_INVALID_VDEV_ID;</div><div class='add'>+		init_completion(&amp;ar-&gt;completed_11d_scan);</div><div class='add'>+</div><div class='add'>+		ath11k_fw_stats_init(ar);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -6734,7 +10835,39 @@ void ath11k_mac_destroy(struct ath11k_base *ab)</div><div class='ctx'> 		if (!ar)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		ath11k_fw_stats_free(&amp;ar-&gt;fw_stats);</div><div class='ctx'> 		ieee80211_free_hw(ar-&gt;hw);</div><div class='ctx'> 		pdev-&gt;ar = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int ath11k_mac_vif_set_keepalive(struct ath11k_vif *arvif,</div><div class='add'>+				 enum wmi_sta_keepalive_method method,</div><div class='add'>+				 u32 interval)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = arvif-&gt;ar;</div><div class='add'>+	struct wmi_sta_keepalive_arg arg = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;vdev_type != WMI_VDEV_TYPE_STA)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(WMI_TLV_SERVICE_STA_KEEP_ALIVE, ar-&gt;ab-&gt;wmi_ab.svc_map))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	arg.vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+	arg.enabled = 1;</div><div class='add'>+	arg.method = method;</div><div class='add'>+	arg.interval = interval;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_sta_keepalive(ar, &amp;arg);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to set keepalive on vdev %i: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/mac.h b/drivers/net/wireless/ath/ath11k/mac.h<br/>index 4bc59bdaf244..5e61eea1bb03 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/mac.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/mac.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/mac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/mac.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2023, 2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef ATH11K_MAC_H</div><div class='hunk'>@@ -8,6 +9,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='ctx'> #include &lt;net/cfg80211.h&gt;</div><div class='add'>+#include "wmi.h"</div><div class='ctx'> </div><div class='ctx'> struct ath11k;</div><div class='ctx'> struct ath11k_base;</div><div class='hunk'>@@ -115,6 +117,9 @@ struct ath11k_generic_iter {</div><div class='ctx'> #define WMI_MAX_SPATIAL_STREAM			3</div><div class='ctx'> </div><div class='ctx'> #define ATH11K_CHAN_WIDTH_NUM			8</div><div class='add'>+#define ATH11K_BW_NSS_MAP_ENABLE		BIT(31)</div><div class='add'>+#define ATH11K_PEER_RX_NSS_160MHZ		GENMASK(2, 0)</div><div class='add'>+#define ATH11K_PEER_RX_NSS_80_80MHZ		GENMASK(5, 3)</div><div class='ctx'> </div><div class='ctx'> #define ATH11K_OBSS_PD_MAX_THRESHOLD			-82</div><div class='ctx'> #define ATH11K_OBSS_PD_NON_SRG_MAX_THRESHOLD		-62</div><div class='hunk'>@@ -124,6 +129,13 @@ struct ath11k_generic_iter {</div><div class='ctx'> </div><div class='ctx'> extern const struct htt_rx_ring_tlv_filter ath11k_mac_mon_status_filter_default;</div><div class='ctx'> </div><div class='add'>+#define ATH11K_SCAN_11D_INTERVAL		600000</div><div class='add'>+#define ATH11K_11D_INVALID_VDEV_ID		0xFFFF</div><div class='add'>+</div><div class='add'>+void ath11k_mac_11d_scan_start(struct ath11k *ar, u32 vdev_id);</div><div class='add'>+void ath11k_mac_11d_scan_stop(struct ath11k *ar);</div><div class='add'>+void ath11k_mac_11d_scan_stop_all(struct ath11k_base *ab);</div><div class='add'>+</div><div class='ctx'> void ath11k_mac_destroy(struct ath11k_base *ab);</div><div class='ctx'> void ath11k_mac_unregister(struct ath11k_base *ab);</div><div class='ctx'> int ath11k_mac_register(struct ath11k_base *ab);</div><div class='hunk'>@@ -141,6 +153,10 @@ void ath11k_mac_scan_finish(struct ath11k *ar);</div><div class='ctx'> struct ath11k_vif *ath11k_mac_get_arvif(struct ath11k *ar, u32 vdev_id);</div><div class='ctx'> struct ath11k_vif *ath11k_mac_get_arvif_by_vdev_id(struct ath11k_base *ab,</div><div class='ctx'> 						   u32 vdev_id);</div><div class='add'>+u8 ath11k_mac_get_target_pdev_id(struct ath11k *ar);</div><div class='add'>+u8 ath11k_mac_get_target_pdev_id_from_vif(struct ath11k_vif *arvif);</div><div class='add'>+struct ath11k_vif *ath11k_mac_get_vif_up(struct ath11k_base *ab);</div><div class='add'>+</div><div class='ctx'> struct ath11k *ath11k_mac_get_ar_by_vdev_id(struct ath11k_base *ab, u32 vdev_id);</div><div class='ctx'> struct ath11k *ath11k_mac_get_ar_by_pdev_id(struct ath11k_base *ab, u32 pdev_id);</div><div class='ctx'> </div><div class='hunk'>@@ -148,8 +164,21 @@ void ath11k_mac_drain_tx(struct ath11k *ar);</div><div class='ctx'> void ath11k_mac_peer_cleanup_all(struct ath11k *ar);</div><div class='ctx'> int ath11k_mac_tx_mgmt_pending_free(int buf_id, void *skb, void *ctx);</div><div class='ctx'> u8 ath11k_mac_bw_to_mac80211_bw(u8 bw);</div><div class='add'>+enum nl80211_he_gi ath11k_mac_he_gi_to_nl80211_he_gi(u8 sgi);</div><div class='add'>+enum nl80211_he_ru_alloc ath11k_mac_phy_he_ru_to_nl80211_he_ru_alloc(u16 ru_phy);</div><div class='add'>+enum nl80211_he_ru_alloc ath11k_mac_he_ru_tones_to_nl80211_he_ru_alloc(u16 ru_tones);</div><div class='ctx'> enum ath11k_supported_bw ath11k_mac_mac80211_bw_to_ath11k_bw(enum rate_info_bw bw);</div><div class='ctx'> enum hal_encrypt_type ath11k_dp_tx_get_encrypt_type(u32 cipher);</div><div class='ctx'> void ath11k_mac_handle_beacon(struct ath11k *ar, struct sk_buff *skb);</div><div class='ctx'> void ath11k_mac_handle_beacon_miss(struct ath11k *ar, u32 vdev_id);</div><div class='add'>+void ath11k_mac_bcn_tx_event(struct ath11k_vif *arvif);</div><div class='add'>+int ath11k_mac_wait_tx_complete(struct ath11k *ar);</div><div class='add'>+int ath11k_mac_vif_set_keepalive(struct ath11k_vif *arvif,</div><div class='add'>+				 enum wmi_sta_keepalive_method method,</div><div class='add'>+				 u32 interval);</div><div class='add'>+void ath11k_mac_fill_reg_tpc_info(struct ath11k *ar,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  struct ieee80211_chanctx_conf *ctx);</div><div class='add'>+int ath11k_mac_fw_stats_request(struct ath11k *ar,</div><div class='add'>+				struct stats_request_params *req_param);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/mhi.c b/drivers/net/wireless/ath/ath11k/mhi.c<br/>index 27b394d115e2..acd76e9392d3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/mhi.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/mhi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/mhi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/mhi.c</a></div><div class='hunk'>@@ -1,45 +1,27 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='del'>-/* Copyright (c) 2020 The Linux Foundation. All rights reserved. */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/msi.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> #include "mhi.h"</div><div class='ctx'> #include "pci.h"</div><div class='add'>+#include "pcic.h"</div><div class='ctx'> </div><div class='del'>-#define MHI_TIMEOUT_DEFAULT_MS	90000</div><div class='add'>+#define MHI_TIMEOUT_DEFAULT_MS	20000</div><div class='add'>+#define RDDM_DUMP_SIZE	0x420000</div><div class='add'>+#define MHI_CB_INVALID	0xff</div><div class='ctx'> </div><div class='del'>-static struct mhi_channel_config ath11k_mhi_channels_qca6390[] = {</div><div class='del'>-	{</div><div class='del'>-		.num = 0,</div><div class='del'>-		.name = "LOOPBACK",</div><div class='del'>-		.num_elements = 32,</div><div class='del'>-		.event_ring = 0,</div><div class='del'>-		.dir = DMA_TO_DEVICE,</div><div class='del'>-		.ee_mask = 0x4,</div><div class='del'>-		.pollcfg = 0,</div><div class='del'>-		.doorbell = MHI_DB_BRST_DISABLE,</div><div class='del'>-		.lpm_notify = false,</div><div class='del'>-		.offload_channel = false,</div><div class='del'>-		.doorbell_mode_switch = false,</div><div class='del'>-		.auto_queue = false,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.num = 1,</div><div class='del'>-		.name = "LOOPBACK",</div><div class='del'>-		.num_elements = 32,</div><div class='del'>-		.event_ring = 0,</div><div class='del'>-		.dir = DMA_FROM_DEVICE,</div><div class='del'>-		.ee_mask = 0x4,</div><div class='del'>-		.pollcfg = 0,</div><div class='del'>-		.doorbell = MHI_DB_BRST_DISABLE,</div><div class='del'>-		.lpm_notify = false,</div><div class='del'>-		.offload_channel = false,</div><div class='del'>-		.doorbell_mode_switch = false,</div><div class='del'>-		.auto_queue = false,</div><div class='del'>-	},</div><div class='add'>+static const struct mhi_channel_config ath11k_mhi_channels_qca6390[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.num = 20,</div><div class='ctx'> 		.name = "IPCR",</div><div class='hunk'>@@ -93,46 +75,18 @@ static struct mhi_event_config ath11k_mhi_events_qca6390[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct mhi_controller_config ath11k_mhi_config_qca6390 = {</div><div class='add'>+static const struct mhi_controller_config ath11k_mhi_config_qca6390 = {</div><div class='ctx'> 	.max_channels = 128,</div><div class='ctx'> 	.timeout_ms = 2000,</div><div class='ctx'> 	.use_bounce_buf = false,</div><div class='del'>-	.buf_len = 0,</div><div class='add'>+	.buf_len = 8192,</div><div class='ctx'> 	.num_channels = ARRAY_SIZE(ath11k_mhi_channels_qca6390),</div><div class='ctx'> 	.ch_cfg = ath11k_mhi_channels_qca6390,</div><div class='ctx'> 	.num_events = ARRAY_SIZE(ath11k_mhi_events_qca6390),</div><div class='ctx'> 	.event_cfg = ath11k_mhi_events_qca6390,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct mhi_channel_config ath11k_mhi_channels_qcn9074[] = {</div><div class='del'>-	{</div><div class='del'>-		.num = 0,</div><div class='del'>-		.name = "LOOPBACK",</div><div class='del'>-		.num_elements = 32,</div><div class='del'>-		.event_ring = 1,</div><div class='del'>-		.dir = DMA_TO_DEVICE,</div><div class='del'>-		.ee_mask = 0x14,</div><div class='del'>-		.pollcfg = 0,</div><div class='del'>-		.doorbell = MHI_DB_BRST_DISABLE,</div><div class='del'>-		.lpm_notify = false,</div><div class='del'>-		.offload_channel = false,</div><div class='del'>-		.doorbell_mode_switch = false,</div><div class='del'>-		.auto_queue = false,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.num = 1,</div><div class='del'>-		.name = "LOOPBACK",</div><div class='del'>-		.num_elements = 32,</div><div class='del'>-		.event_ring = 1,</div><div class='del'>-		.dir = DMA_FROM_DEVICE,</div><div class='del'>-		.ee_mask = 0x14,</div><div class='del'>-		.pollcfg = 0,</div><div class='del'>-		.doorbell = MHI_DB_BRST_DISABLE,</div><div class='del'>-		.lpm_notify = false,</div><div class='del'>-		.offload_channel = false,</div><div class='del'>-		.doorbell_mode_switch = false,</div><div class='del'>-		.auto_queue = false,</div><div class='del'>-	},</div><div class='add'>+static const struct mhi_channel_config ath11k_mhi_channels_qcn9074[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.num = 20,</div><div class='ctx'> 		.name = "IPCR",</div><div class='hunk'>@@ -186,7 +140,7 @@ static struct mhi_event_config ath11k_mhi_events_qcn9074[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct mhi_controller_config ath11k_mhi_config_qcn9074 = {</div><div class='add'>+static const struct mhi_controller_config ath11k_mhi_config_qcn9074 = {</div><div class='ctx'> 	.max_channels = 30,</div><div class='ctx'> 	.timeout_ms = 10000,</div><div class='ctx'> 	.use_bounce_buf = false,</div><div class='hunk'>@@ -201,37 +155,36 @@ void ath11k_mhi_set_mhictrl_reset(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	val = ath11k_pci_read32(ab, MHISTATUS);</div><div class='add'>+	val = ath11k_pcic_read32(ab, MHISTATUS);</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_PCI, "MHISTATUS 0x%x\n", val);</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_PCI, "mhistatus 0x%x\n", val);</div><div class='ctx'> </div><div class='del'>-	/* Observed on QCA6390 that after SOC_GLOBAL_RESET, MHISTATUS</div><div class='del'>-	 * has SYSERR bit set and thus need to set MHICTRL_RESET</div><div class='del'>-	 * to clear SYSERR.</div><div class='add'>+	/* After SOC_GLOBAL_RESET, MHISTATUS may still have SYSERR bit set</div><div class='add'>+	 * and thus need to set MHICTRL_RESET to clear SYSERR.</div><div class='ctx'> 	 */</div><div class='del'>-	ath11k_pci_write32(ab, MHICTRL, MHICTRL_RESET_MASK);</div><div class='add'>+	ath11k_pcic_write32(ab, MHICTRL, MHICTRL_RESET_MASK);</div><div class='ctx'> </div><div class='ctx'> 	mdelay(10);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_mhi_reset_txvecdb(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='del'>-	ath11k_pci_write32(ab, PCIE_TXVECDB, 0);</div><div class='add'>+	ath11k_pcic_write32(ab, PCIE_TXVECDB, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_mhi_reset_txvecstatus(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='del'>-	ath11k_pci_write32(ab, PCIE_TXVECSTATUS, 0);</div><div class='add'>+	ath11k_pcic_write32(ab, PCIE_TXVECSTATUS, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_mhi_reset_rxvecdb(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='del'>-	ath11k_pci_write32(ab, PCIE_RXVECDB, 0);</div><div class='add'>+	ath11k_pcic_write32(ab, PCIE_RXVECDB, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_mhi_reset_rxvecstatus(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='del'>-	ath11k_pci_write32(ab, PCIE_RXVECSTATUS, 0);</div><div class='add'>+	ath11k_pcic_write32(ab, PCIE_RXVECSTATUS, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ath11k_mhi_clear_vector(struct ath11k_base *ab)</div><div class='hunk'>@@ -248,23 +201,28 @@ static int ath11k_mhi_get_msi(struct ath11k_pci *ab_pci)</div><div class='ctx'> 	u32 user_base_data, base_vector;</div><div class='ctx'> 	int ret, num_vectors, i;</div><div class='ctx'> 	int *irq;</div><div class='add'>+	unsigned int msi_data;</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_pci_get_user_msi_assignment(ab_pci,</div><div class='del'>-						 "MHI", &amp;num_vectors,</div><div class='del'>-						 &amp;user_base_data, &amp;base_vector);</div><div class='add'>+	ret = ath11k_pcic_get_user_msi_assignment(ab, "MHI", &amp;num_vectors,</div><div class='add'>+						  &amp;user_base_data, &amp;base_vector);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_PCI, "Number of assigned MSI for MHI is %d, base vector is %d\n",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_PCI, "num_vectors %d base_vector %d\n",</div><div class='ctx'> 		   num_vectors, base_vector);</div><div class='ctx'> </div><div class='ctx'> 	irq = kcalloc(num_vectors, sizeof(int), GFP_KERNEL);</div><div class='ctx'> 	if (!irq)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; num_vectors; i++)</div><div class='del'>-		irq[i] = ath11k_pci_get_msi_irq(ab-&gt;dev,</div><div class='del'>-						base_vector + i);</div><div class='add'>+	for (i = 0; i &lt; num_vectors; i++) {</div><div class='add'>+		msi_data = base_vector;</div><div class='add'>+</div><div class='add'>+		if (test_bit(ATH11K_FLAG_MULTI_MSI_VECTORS, &amp;ab-&gt;dev_flags))</div><div class='add'>+			msi_data += i;</div><div class='add'>+</div><div class='add'>+		irq[i] = ath11k_pci_get_msi_irq(ab, msi_data);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ab_pci-&gt;mhi_ctrl-&gt;irq = irq;</div><div class='ctx'> 	ab_pci-&gt;mhi_ctrl-&gt;nr_irqs = num_vectors;</div><div class='hunk'>@@ -281,18 +239,62 @@ static void ath11k_mhi_op_runtime_put(struct mhi_controller *mhi_cntrl)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static char *ath11k_mhi_op_callback_to_str(enum mhi_callback reason)</div><div class='add'>+{</div><div class='add'>+	switch (reason) {</div><div class='add'>+	case MHI_CB_IDLE:</div><div class='add'>+		return "MHI_CB_IDLE";</div><div class='add'>+	case MHI_CB_PENDING_DATA:</div><div class='add'>+		return "MHI_CB_PENDING_DATA";</div><div class='add'>+	case MHI_CB_LPM_ENTER:</div><div class='add'>+		return "MHI_CB_LPM_ENTER";</div><div class='add'>+	case MHI_CB_LPM_EXIT:</div><div class='add'>+		return "MHI_CB_LPM_EXIT";</div><div class='add'>+	case MHI_CB_EE_RDDM:</div><div class='add'>+		return "MHI_CB_EE_RDDM";</div><div class='add'>+	case MHI_CB_EE_MISSION_MODE:</div><div class='add'>+		return "MHI_CB_EE_MISSION_MODE";</div><div class='add'>+	case MHI_CB_SYS_ERROR:</div><div class='add'>+		return "MHI_CB_SYS_ERROR";</div><div class='add'>+	case MHI_CB_FATAL_ERROR:</div><div class='add'>+		return "MHI_CB_FATAL_ERROR";</div><div class='add'>+	case MHI_CB_BW_REQ:</div><div class='add'>+		return "MHI_CB_BW_REQ";</div><div class='add'>+	default:</div><div class='add'>+		return "UNKNOWN";</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void ath11k_mhi_op_status_cb(struct mhi_controller *mhi_cntrl,</div><div class='ctx'> 				    enum mhi_callback cb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = dev_get_drvdata(mhi_cntrl-&gt;cntrl_dev);</div><div class='add'>+	struct ath11k_pci *ab_pci = ath11k_pci_priv(ab);</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_BOOT, "notify status reason %s\n",</div><div class='add'>+		   ath11k_mhi_op_callback_to_str(cb));</div><div class='ctx'> </div><div class='ctx'> 	switch (cb) {</div><div class='ctx'> 	case MHI_CB_SYS_ERROR:</div><div class='ctx'> 		ath11k_warn(ab, "firmware crashed: MHI_CB_SYS_ERROR\n");</div><div class='ctx'> 		break;</div><div class='add'>+	case MHI_CB_EE_RDDM:</div><div class='add'>+		ath11k_warn(ab, "firmware crashed: MHI_CB_EE_RDDM\n");</div><div class='add'>+		if (ab_pci-&gt;mhi_pre_cb == MHI_CB_EE_RDDM) {</div><div class='add'>+			ath11k_dbg(ab, ATH11K_DBG_BOOT,</div><div class='add'>+				   "do not queue again for consecutive RDDM event\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(test_bit(ATH11K_FLAG_UNREGISTERING, &amp;ab-&gt;dev_flags)))</div><div class='add'>+			queue_work(ab-&gt;workqueue_aux, &amp;ab-&gt;reset_work);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	ab_pci-&gt;mhi_pre_cb = cb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath11k_mhi_op_read_reg(struct mhi_controller *mhi_cntrl,</div><div class='hunk'>@@ -311,35 +313,74 @@ static void ath11k_mhi_op_write_reg(struct mhi_controller *mhi_cntrl,</div><div class='ctx'> 	writel(val, addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ath11k_mhi_read_addr_from_dt(struct mhi_controller *mhi_ctrl)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	struct resource res;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	np = of_find_node_by_type(NULL, "memory");</div><div class='add'>+	if (!np)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	ret = of_address_to_resource(np, 0, &amp;res);</div><div class='add'>+	of_node_put(np);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mhi_ctrl-&gt;iova_start = res.start + 0x1000000;</div><div class='add'>+	mhi_ctrl-&gt;iova_stop = res.end;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int ath11k_mhi_register(struct ath11k_pci *ab_pci)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = ab_pci-&gt;ab;</div><div class='ctx'> 	struct mhi_controller *mhi_ctrl;</div><div class='del'>-	struct mhi_controller_config *ath11k_mhi_config;</div><div class='add'>+	const struct mhi_controller_config *ath11k_mhi_config;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mhi_ctrl = mhi_alloc_controller();</div><div class='ctx'> 	if (!mhi_ctrl)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ath11k_core_create_firmware_path(ab, ATH11K_AMSS_FILE,</div><div class='del'>-					 ab_pci-&gt;amss_path,</div><div class='del'>-					 sizeof(ab_pci-&gt;amss_path));</div><div class='del'>-</div><div class='ctx'> 	ab_pci-&gt;mhi_ctrl = mhi_ctrl;</div><div class='ctx'> 	mhi_ctrl-&gt;cntrl_dev = ab-&gt;dev;</div><div class='del'>-	mhi_ctrl-&gt;fw_image = ab_pci-&gt;amss_path;</div><div class='ctx'> 	mhi_ctrl-&gt;regs = ab-&gt;mem;</div><div class='add'>+	mhi_ctrl-&gt;reg_len = ab-&gt;mem_len;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;fw.amss_data &amp;&amp; ab-&gt;fw.amss_len &gt; 0) {</div><div class='add'>+		/* use MHI firmware file from firmware-N.bin */</div><div class='add'>+		mhi_ctrl-&gt;fw_data = ab-&gt;fw.amss_data;</div><div class='add'>+		mhi_ctrl-&gt;fw_sz = ab-&gt;fw.amss_len;</div><div class='add'>+	} else {</div><div class='add'>+		/* use the old separate mhi.bin MHI firmware file */</div><div class='add'>+		ath11k_core_create_firmware_path(ab, ATH11K_AMSS_FILE,</div><div class='add'>+						 ab_pci-&gt;amss_path,</div><div class='add'>+						 sizeof(ab_pci-&gt;amss_path));</div><div class='add'>+		mhi_ctrl-&gt;fw_image = ab_pci-&gt;amss_path;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_mhi_get_msi(ab_pci);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_err(ab, "failed to get msi for mhi\n");</div><div class='del'>-		mhi_free_controller(mhi_ctrl);</div><div class='del'>-		return ret;</div><div class='add'>+		goto free_controller;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!test_bit(ATH11K_FLAG_MULTI_MSI_VECTORS, &amp;ab-&gt;dev_flags))</div><div class='add'>+		mhi_ctrl-&gt;irq_flags = IRQF_SHARED | IRQF_NOBALANCING;</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH11K_FLAG_FIXED_MEM_RGN, &amp;ab-&gt;dev_flags)) {</div><div class='add'>+		ret = ath11k_mhi_read_addr_from_dt(mhi_ctrl);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto free_controller;</div><div class='add'>+	} else {</div><div class='add'>+		mhi_ctrl-&gt;iova_start = 0;</div><div class='add'>+		mhi_ctrl-&gt;iova_stop = ab_pci-&gt;dma_mask;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mhi_ctrl-&gt;iova_start = 0;</div><div class='del'>-	mhi_ctrl-&gt;iova_stop = 0xffffffff;</div><div class='add'>+	mhi_ctrl-&gt;rddm_size = RDDM_DUMP_SIZE;</div><div class='ctx'> 	mhi_ctrl-&gt;sbl_size = SZ_512K;</div><div class='ctx'> 	mhi_ctrl-&gt;seg_len = SZ_512K;</div><div class='ctx'> 	mhi_ctrl-&gt;fbc_download = true;</div><div class='hunk'>@@ -354,23 +395,32 @@ int ath11k_mhi_register(struct ath11k_pci *ab_pci)</div><div class='ctx'> 		ath11k_mhi_config = &amp;ath11k_mhi_config_qcn9074;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ATH11K_HW_QCA6390_HW20:</div><div class='add'>+	case ATH11K_HW_WCN6855_HW20:</div><div class='add'>+	case ATH11K_HW_WCN6855_HW21:</div><div class='add'>+	case ATH11K_HW_QCA2066_HW21:</div><div class='add'>+	case ATH11K_HW_QCA6698AQ_HW21:</div><div class='ctx'> 		ath11k_mhi_config = &amp;ath11k_mhi_config_qca6390;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ath11k_err(ab, "failed assign mhi_config for unknown hw rev %d\n",</div><div class='ctx'> 			   ab-&gt;hw_rev);</div><div class='del'>-		mhi_free_controller(mhi_ctrl);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto free_controller;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ab_pci-&gt;mhi_pre_cb = MHI_CB_INVALID;</div><div class='ctx'> 	ret = mhi_register_controller(mhi_ctrl, ath11k_mhi_config);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_err(ab, "failed to register to mhi bus, err = %d\n", ret);</div><div class='del'>-		mhi_free_controller(mhi_ctrl);</div><div class='del'>-		return ret;</div><div class='add'>+		goto free_controller;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+free_controller:</div><div class='add'>+	mhi_free_controller(mhi_ctrl);</div><div class='add'>+	ab_pci-&gt;mhi_ctrl = NULL;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ath11k_mhi_unregister(struct ath11k_pci *ab_pci)</div><div class='hunk'>@@ -382,212 +432,75 @@ void ath11k_mhi_unregister(struct ath11k_pci *ab_pci)</div><div class='ctx'> 	mhi_free_controller(mhi_ctrl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static char *ath11k_mhi_state_to_str(enum ath11k_mhi_state mhi_state)</div><div class='del'>-{</div><div class='del'>-	switch (mhi_state) {</div><div class='del'>-	case ATH11K_MHI_INIT:</div><div class='del'>-		return "INIT";</div><div class='del'>-	case ATH11K_MHI_DEINIT:</div><div class='del'>-		return "DEINIT";</div><div class='del'>-	case ATH11K_MHI_POWER_ON:</div><div class='del'>-		return "POWER_ON";</div><div class='del'>-	case ATH11K_MHI_POWER_OFF:</div><div class='del'>-		return "POWER_OFF";</div><div class='del'>-	case ATH11K_MHI_FORCE_POWER_OFF:</div><div class='del'>-		return "FORCE_POWER_OFF";</div><div class='del'>-	case ATH11K_MHI_SUSPEND:</div><div class='del'>-		return "SUSPEND";</div><div class='del'>-	case ATH11K_MHI_RESUME:</div><div class='del'>-		return "RESUME";</div><div class='del'>-	case ATH11K_MHI_TRIGGER_RDDM:</div><div class='del'>-		return "TRIGGER_RDDM";</div><div class='del'>-	case ATH11K_MHI_RDDM_DONE:</div><div class='del'>-		return "RDDM_DONE";</div><div class='del'>-	default:</div><div class='del'>-		return "UNKNOWN";</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void ath11k_mhi_set_state_bit(struct ath11k_pci *ab_pci,</div><div class='del'>-				     enum ath11k_mhi_state mhi_state)</div><div class='add'>+int ath11k_mhi_start(struct ath11k_pci *ab_pci)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = ab_pci-&gt;ab;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	switch (mhi_state) {</div><div class='del'>-	case ATH11K_MHI_INIT:</div><div class='del'>-		set_bit(ATH11K_MHI_INIT, &amp;ab_pci-&gt;mhi_state);</div><div class='del'>-		break;</div><div class='del'>-	case ATH11K_MHI_DEINIT:</div><div class='del'>-		clear_bit(ATH11K_MHI_INIT, &amp;ab_pci-&gt;mhi_state);</div><div class='del'>-		break;</div><div class='del'>-	case ATH11K_MHI_POWER_ON:</div><div class='del'>-		set_bit(ATH11K_MHI_POWER_ON, &amp;ab_pci-&gt;mhi_state);</div><div class='del'>-		break;</div><div class='del'>-	case ATH11K_MHI_POWER_OFF:</div><div class='del'>-	case ATH11K_MHI_FORCE_POWER_OFF:</div><div class='del'>-		clear_bit(ATH11K_MHI_POWER_ON, &amp;ab_pci-&gt;mhi_state);</div><div class='del'>-		clear_bit(ATH11K_MHI_TRIGGER_RDDM, &amp;ab_pci-&gt;mhi_state);</div><div class='del'>-		clear_bit(ATH11K_MHI_RDDM_DONE, &amp;ab_pci-&gt;mhi_state);</div><div class='del'>-		break;</div><div class='del'>-	case ATH11K_MHI_SUSPEND:</div><div class='del'>-		set_bit(ATH11K_MHI_SUSPEND, &amp;ab_pci-&gt;mhi_state);</div><div class='del'>-		break;</div><div class='del'>-	case ATH11K_MHI_RESUME:</div><div class='del'>-		clear_bit(ATH11K_MHI_SUSPEND, &amp;ab_pci-&gt;mhi_state);</div><div class='del'>-		break;</div><div class='del'>-	case ATH11K_MHI_TRIGGER_RDDM:</div><div class='del'>-		set_bit(ATH11K_MHI_TRIGGER_RDDM, &amp;ab_pci-&gt;mhi_state);</div><div class='del'>-		break;</div><div class='del'>-	case ATH11K_MHI_RDDM_DONE:</div><div class='del'>-		set_bit(ATH11K_MHI_RDDM_DONE, &amp;ab_pci-&gt;mhi_state);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ath11k_err(ab, "unhandled mhi state (%d)\n", mhi_state);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+	ab_pci-&gt;mhi_ctrl-&gt;timeout_ms = MHI_TIMEOUT_DEFAULT_MS;</div><div class='ctx'> </div><div class='del'>-static int ath11k_mhi_check_state_bit(struct ath11k_pci *ab_pci,</div><div class='del'>-				      enum ath11k_mhi_state mhi_state)</div><div class='del'>-{</div><div class='del'>-	struct ath11k_base *ab = ab_pci-&gt;ab;</div><div class='add'>+	ret = mhi_prepare_for_power_up(ab_pci-&gt;mhi_ctrl);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to prepare mhi: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	switch (mhi_state) {</div><div class='del'>-	case ATH11K_MHI_INIT:</div><div class='del'>-		if (!test_bit(ATH11K_MHI_INIT, &amp;ab_pci-&gt;mhi_state))</div><div class='del'>-			return 0;</div><div class='del'>-		break;</div><div class='del'>-	case ATH11K_MHI_DEINIT:</div><div class='del'>-	case ATH11K_MHI_POWER_ON:</div><div class='del'>-		if (test_bit(ATH11K_MHI_INIT, &amp;ab_pci-&gt;mhi_state) &amp;&amp;</div><div class='del'>-		    !test_bit(ATH11K_MHI_POWER_ON, &amp;ab_pci-&gt;mhi_state))</div><div class='del'>-			return 0;</div><div class='del'>-		break;</div><div class='del'>-	case ATH11K_MHI_FORCE_POWER_OFF:</div><div class='del'>-		if (test_bit(ATH11K_MHI_POWER_ON, &amp;ab_pci-&gt;mhi_state))</div><div class='del'>-			return 0;</div><div class='del'>-		break;</div><div class='del'>-	case ATH11K_MHI_POWER_OFF:</div><div class='del'>-	case ATH11K_MHI_SUSPEND:</div><div class='del'>-		if (test_bit(ATH11K_MHI_POWER_ON, &amp;ab_pci-&gt;mhi_state) &amp;&amp;</div><div class='del'>-		    !test_bit(ATH11K_MHI_SUSPEND, &amp;ab_pci-&gt;mhi_state))</div><div class='del'>-			return 0;</div><div class='del'>-		break;</div><div class='del'>-	case ATH11K_MHI_RESUME:</div><div class='del'>-		if (test_bit(ATH11K_MHI_SUSPEND, &amp;ab_pci-&gt;mhi_state))</div><div class='del'>-			return 0;</div><div class='del'>-		break;</div><div class='del'>-	case ATH11K_MHI_TRIGGER_RDDM:</div><div class='del'>-		if (test_bit(ATH11K_MHI_POWER_ON, &amp;ab_pci-&gt;mhi_state) &amp;&amp;</div><div class='del'>-		    !test_bit(ATH11K_MHI_TRIGGER_RDDM, &amp;ab_pci-&gt;mhi_state))</div><div class='del'>-			return 0;</div><div class='del'>-		break;</div><div class='del'>-	case ATH11K_MHI_RDDM_DONE:</div><div class='del'>-		return 0;</div><div class='del'>-	default:</div><div class='del'>-		ath11k_err(ab, "unhandled mhi state: %s(%d)\n",</div><div class='del'>-			   ath11k_mhi_state_to_str(mhi_state), mhi_state);</div><div class='add'>+	ret = mhi_sync_power_up(ab_pci-&gt;mhi_ctrl);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to power up mhi: %d", ret);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_err(ab, "failed to set mhi state %s(%d) in current mhi state (0x%lx)\n",</div><div class='del'>-		   ath11k_mhi_state_to_str(mhi_state), mhi_state,</div><div class='del'>-		   ab_pci-&gt;mhi_state);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_mhi_stop(struct ath11k_pci *ab_pci, bool is_suspend)</div><div class='add'>+{</div><div class='add'>+	/* During suspend we need to use mhi_power_down_keep_dev()</div><div class='add'>+	 * workaround, otherwise ath11k_core_resume() will timeout</div><div class='add'>+	 * during resume.</div><div class='add'>+	 */</div><div class='add'>+	if (is_suspend)</div><div class='add'>+		mhi_power_down_keep_dev(ab_pci-&gt;mhi_ctrl, true);</div><div class='add'>+	else</div><div class='add'>+		mhi_power_down(ab_pci-&gt;mhi_ctrl, true);</div><div class='ctx'> </div><div class='del'>-	return -EINVAL;</div><div class='add'>+	mhi_unprepare_after_power_down(ab_pci-&gt;mhi_ctrl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_mhi_set_state(struct ath11k_pci *ab_pci,</div><div class='del'>-				enum ath11k_mhi_state mhi_state)</div><div class='add'>+int ath11k_mhi_suspend(struct ath11k_pci *ab_pci)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = ab_pci-&gt;ab;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_mhi_check_state_bit(ab_pci, mhi_state);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_PCI, "setting mhi state: %s(%d)\n",</div><div class='del'>-		   ath11k_mhi_state_to_str(mhi_state), mhi_state);</div><div class='del'>-</div><div class='del'>-	switch (mhi_state) {</div><div class='del'>-	case ATH11K_MHI_INIT:</div><div class='del'>-		ret = mhi_prepare_for_power_up(ab_pci-&gt;mhi_ctrl);</div><div class='del'>-		break;</div><div class='del'>-	case ATH11K_MHI_DEINIT:</div><div class='del'>-		mhi_unprepare_after_power_down(ab_pci-&gt;mhi_ctrl);</div><div class='del'>-		ret = 0;</div><div class='del'>-		break;</div><div class='del'>-	case ATH11K_MHI_POWER_ON:</div><div class='del'>-		ret = mhi_async_power_up(ab_pci-&gt;mhi_ctrl);</div><div class='del'>-		break;</div><div class='del'>-	case ATH11K_MHI_POWER_OFF:</div><div class='del'>-		mhi_power_down(ab_pci-&gt;mhi_ctrl, true);</div><div class='del'>-		ret = 0;</div><div class='del'>-		break;</div><div class='del'>-	case ATH11K_MHI_FORCE_POWER_OFF:</div><div class='del'>-		mhi_power_down(ab_pci-&gt;mhi_ctrl, false);</div><div class='del'>-		ret = 0;</div><div class='del'>-		break;</div><div class='del'>-	case ATH11K_MHI_SUSPEND:</div><div class='del'>-		ret = mhi_pm_suspend(ab_pci-&gt;mhi_ctrl);</div><div class='del'>-		break;</div><div class='del'>-	case ATH11K_MHI_RESUME:</div><div class='del'>-		ret = mhi_pm_resume(ab_pci-&gt;mhi_ctrl);</div><div class='del'>-		break;</div><div class='del'>-	case ATH11K_MHI_TRIGGER_RDDM:</div><div class='del'>-		ret = mhi_force_rddm_mode(ab_pci-&gt;mhi_ctrl);</div><div class='del'>-		break;</div><div class='del'>-	case ATH11K_MHI_RDDM_DONE:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ath11k_err(ab, "unhandled MHI state (%d)\n", mhi_state);</div><div class='del'>-		ret = -EINVAL;</div><div class='add'>+	ret = mhi_pm_suspend(ab_pci-&gt;mhi_ctrl);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to suspend mhi: %d", ret);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ath11k_mhi_set_state_bit(ab_pci, mhi_state);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	ath11k_err(ab, "failed to set mhi state: %s(%d)\n",</div><div class='del'>-		   ath11k_mhi_state_to_str(mhi_state), mhi_state);</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath11k_mhi_start(struct ath11k_pci *ab_pci)</div><div class='add'>+int ath11k_mhi_resume(struct ath11k_pci *ab_pci)</div><div class='ctx'> {</div><div class='add'>+	struct ath11k_base *ab = ab_pci-&gt;ab;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ab_pci-&gt;mhi_ctrl-&gt;timeout_ms = MHI_TIMEOUT_DEFAULT_MS;</div><div class='del'>-</div><div class='del'>-	ret = ath11k_mhi_set_state(ab_pci, ATH11K_MHI_INIT);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = ath11k_mhi_set_state(ab_pci, ATH11K_MHI_POWER_ON);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+	/* Do force MHI resume as some devices like QCA6390, WCN6855</div><div class='add'>+	 * are not in M3 state but they are functional. So just ignore</div><div class='add'>+	 * the MHI state while resuming.</div><div class='add'>+	 */</div><div class='add'>+	ret = mhi_pm_resume_force(ab_pci-&gt;mhi_ctrl);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to resume mhi: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ath11k_mhi_stop(struct ath11k_pci *ab_pci)</div><div class='del'>-{</div><div class='del'>-	ath11k_mhi_set_state(ab_pci, ATH11K_MHI_POWER_OFF);</div><div class='del'>-	ath11k_mhi_set_state(ab_pci, ATH11K_MHI_DEINIT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ath11k_mhi_suspend(struct ath11k_pci *ab_pci)</div><div class='del'>-{</div><div class='del'>-	ath11k_mhi_set_state(ab_pci, ATH11K_MHI_SUSPEND);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath11k_mhi_resume(struct ath11k_pci *ab_pci)</div><div class='add'>+void ath11k_mhi_coredump(struct mhi_controller *mhi_ctrl, bool in_panic)</div><div class='ctx'> {</div><div class='del'>-	ath11k_mhi_set_state(ab_pci, ATH11K_MHI_RESUME);</div><div class='add'>+	mhi_download_rddm_image(mhi_ctrl, in_panic);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/mhi.h b/drivers/net/wireless/ath/ath11k/mhi.h<br/>index 488dada5d31c..5c5c2b03c81f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/mhi.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/mhi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/mhi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/mhi.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022, 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef _ATH11K_MHI_H</div><div class='ctx'> #define _ATH11K_MHI_H</div><div class='hunk'>@@ -16,27 +17,15 @@</div><div class='ctx'> #define MHICTRL					0x38</div><div class='ctx'> #define MHICTRL_RESET_MASK			0x2</div><div class='ctx'> </div><div class='del'>-enum ath11k_mhi_state {</div><div class='del'>-	ATH11K_MHI_INIT,</div><div class='del'>-	ATH11K_MHI_DEINIT,</div><div class='del'>-	ATH11K_MHI_POWER_ON,</div><div class='del'>-	ATH11K_MHI_POWER_OFF,</div><div class='del'>-	ATH11K_MHI_FORCE_POWER_OFF,</div><div class='del'>-	ATH11K_MHI_SUSPEND,</div><div class='del'>-	ATH11K_MHI_RESUME,</div><div class='del'>-	ATH11K_MHI_TRIGGER_RDDM,</div><div class='del'>-	ATH11K_MHI_RDDM,</div><div class='del'>-	ATH11K_MHI_RDDM_DONE,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> int ath11k_mhi_start(struct ath11k_pci *ar_pci);</div><div class='del'>-void ath11k_mhi_stop(struct ath11k_pci *ar_pci);</div><div class='add'>+void ath11k_mhi_stop(struct ath11k_pci *ar_pci, bool is_suspend);</div><div class='ctx'> int ath11k_mhi_register(struct ath11k_pci *ar_pci);</div><div class='ctx'> void ath11k_mhi_unregister(struct ath11k_pci *ar_pci);</div><div class='ctx'> void ath11k_mhi_set_mhictrl_reset(struct ath11k_base *ab);</div><div class='ctx'> void ath11k_mhi_clear_vector(struct ath11k_base *ab);</div><div class='ctx'> </div><div class='del'>-void ath11k_mhi_suspend(struct ath11k_pci *ar_pci);</div><div class='del'>-void ath11k_mhi_resume(struct ath11k_pci *ar_pci);</div><div class='add'>+int ath11k_mhi_suspend(struct ath11k_pci *ar_pci);</div><div class='add'>+int ath11k_mhi_resume(struct ath11k_pci *ar_pci);</div><div class='add'>+void ath11k_mhi_coredump(struct mhi_controller *mhi_ctrl, bool in_panic);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/p2p.c b/drivers/net/wireless/ath/ath11k/p2p.c<br/>new file mode 100644<br/>index 000000000000..01e14523f1fe<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/p2p.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/p2p.c</a></div><div class='hunk'>@@ -0,0 +1,149 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "wmi.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+#include "p2p.h"</div><div class='add'>+</div><div class='add'>+static void ath11k_p2p_noa_ie_fill(u8 *data, size_t len,</div><div class='add'>+				   const struct ath11k_wmi_p2p_noa_info *noa)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_p2p_noa_attr *noa_attr;</div><div class='add'>+	u8 noa_descriptors, ctwindow;</div><div class='add'>+	bool oppps;</div><div class='add'>+	__le16 *noa_attr_len;</div><div class='add'>+	u16 attr_len;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ctwindow = u32_get_bits(noa-&gt;noa_attr, WMI_P2P_NOA_INFO_CTWIN_TU);</div><div class='add'>+	oppps = u32_get_bits(noa-&gt;noa_attr, WMI_P2P_NOA_INFO_OPP_PS);</div><div class='add'>+	noa_descriptors = u32_get_bits(noa-&gt;noa_attr,</div><div class='add'>+				       WMI_P2P_NOA_INFO_DESC_NUM);</div><div class='add'>+</div><div class='add'>+	/* P2P IE */</div><div class='add'>+	data[0] = WLAN_EID_VENDOR_SPECIFIC;</div><div class='add'>+	data[1] = len - 2;</div><div class='add'>+	data[2] = (WLAN_OUI_WFA &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	data[3] = (WLAN_OUI_WFA &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	data[4] = (WLAN_OUI_WFA &gt;&gt; 0) &amp; 0xff;</div><div class='add'>+	data[5] = WLAN_OUI_TYPE_WFA_P2P;</div><div class='add'>+</div><div class='add'>+	/* NOA ATTR */</div><div class='add'>+	data[6] = IEEE80211_P2P_ATTR_ABSENCE_NOTICE;</div><div class='add'>+	noa_attr_len = (__le16 *)&amp;data[7]; /* 2 bytes */</div><div class='add'>+	noa_attr = (struct ieee80211_p2p_noa_attr *)&amp;data[9];</div><div class='add'>+</div><div class='add'>+	noa_attr-&gt;index = u32_get_bits(noa-&gt;noa_attr,</div><div class='add'>+				       WMI_P2P_NOA_INFO_INDEX);</div><div class='add'>+	noa_attr-&gt;oppps_ctwindow = ctwindow;</div><div class='add'>+	if (oppps)</div><div class='add'>+		noa_attr-&gt;oppps_ctwindow |= IEEE80211_P2P_OPPPS_ENABLE_BIT;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; noa_descriptors; i++) {</div><div class='add'>+		noa_attr-&gt;desc[i].count = noa-&gt;descriptors[i].type_count;</div><div class='add'>+		noa_attr-&gt;desc[i].duration =</div><div class='add'>+			cpu_to_le32(noa-&gt;descriptors[i].duration);</div><div class='add'>+		noa_attr-&gt;desc[i].interval =</div><div class='add'>+			cpu_to_le32(noa-&gt;descriptors[i].interval);</div><div class='add'>+		noa_attr-&gt;desc[i].start_time =</div><div class='add'>+			cpu_to_le32(noa-&gt;descriptors[i].start_time);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	attr_len = 2; /* index + oppps_ctwindow */</div><div class='add'>+	attr_len += noa_descriptors * sizeof(struct ieee80211_p2p_noa_desc);</div><div class='add'>+	*noa_attr_len = __cpu_to_le16(attr_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t</div><div class='add'>+ath11k_p2p_noa_ie_len_compute(const struct ath11k_wmi_p2p_noa_info *noa)</div><div class='add'>+{</div><div class='add'>+	size_t len = 0;</div><div class='add'>+	u8 noa_descriptors = u32_get_bits(noa-&gt;noa_attr,</div><div class='add'>+					  WMI_P2P_NOA_INFO_DESC_NUM);</div><div class='add'>+</div><div class='add'>+	if (!(noa_descriptors) &amp;&amp;</div><div class='add'>+	    !(u32_get_bits(noa-&gt;noa_attr, WMI_P2P_NOA_INFO_OPP_PS)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	len += 1 + 1 + 4; /* EID + len + OUI */</div><div class='add'>+	len += 1 + 2; /* noa attr + attr len */</div><div class='add'>+	len += 1 + 1; /* index + oppps_ctwindow */</div><div class='add'>+	len += noa_descriptors *</div><div class='add'>+		sizeof(struct ieee80211_p2p_noa_desc);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_p2p_noa_ie_assign(struct ath11k_vif *arvif, void *ie,</div><div class='add'>+				     size_t len)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	kfree(arvif-&gt;u.ap.noa_data);</div><div class='add'>+</div><div class='add'>+	arvif-&gt;u.ap.noa_data = ie;</div><div class='add'>+	arvif-&gt;u.ap.noa_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __ath11k_p2p_noa_update(struct ath11k_vif *arvif,</div><div class='add'>+				    const struct ath11k_wmi_p2p_noa_info *noa)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = arvif-&gt;ar;</div><div class='add'>+	void *ie;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	ath11k_p2p_noa_ie_assign(arvif, NULL, 0);</div><div class='add'>+</div><div class='add'>+	len = ath11k_p2p_noa_ie_len_compute(noa);</div><div class='add'>+	if (!len)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ie = kmalloc(len, GFP_ATOMIC);</div><div class='add'>+	if (!ie)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ath11k_p2p_noa_ie_fill(ie, len, noa);</div><div class='add'>+	ath11k_p2p_noa_ie_assign(arvif, ie, len); }</div><div class='add'>+</div><div class='add'>+void ath11k_p2p_noa_update(struct ath11k_vif *arvif,</div><div class='add'>+			   const struct ath11k_wmi_p2p_noa_info *noa)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	__ath11k_p2p_noa_update(arvif, noa);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_p2p_noa_update_vdev_iter(void *data, u8 *mac,</div><div class='add'>+					    struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);</div><div class='add'>+	struct ath11k_p2p_noa_arg *arg = data;</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;vdev_id != arg-&gt;vdev_id)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ath11k_p2p_noa_update(arvif, arg-&gt;noa);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_p2p_noa_update_by_vdev_id(struct ath11k *ar, u32 vdev_id,</div><div class='add'>+				      const struct ath11k_wmi_p2p_noa_info *noa)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_p2p_noa_arg arg = {</div><div class='add'>+		.vdev_id = vdev_id,</div><div class='add'>+		.noa = noa,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_atomic(ar-&gt;hw,</div><div class='add'>+						   IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						   ath11k_p2p_noa_update_vdev_iter,</div><div class='add'>+						   &amp;arg);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/p2p.h b/drivers/net/wireless/ath/ath11k/p2p.h<br/>new file mode 100644<br/>index 000000000000..d907940a9b09<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/p2p.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/p2p.h</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH11K_P2P_H</div><div class='add'>+#define ATH11K_P2P_H</div><div class='add'>+</div><div class='add'>+#include "wmi.h"</div><div class='add'>+</div><div class='add'>+struct ath11k_wmi_p2p_noa_info;</div><div class='add'>+</div><div class='add'>+struct ath11k_p2p_noa_arg {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	const struct ath11k_wmi_p2p_noa_info *noa;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath11k_p2p_noa_update(struct ath11k_vif *arvif,</div><div class='add'>+			   const struct ath11k_wmi_p2p_noa_info *noa);</div><div class='add'>+void ath11k_p2p_noa_update_by_vdev_id(struct ath11k *ar, u32 vdev_id,</div><div class='add'>+				      const struct ath11k_wmi_p2p_noa_info *noa);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/pci.c b/drivers/net/wireless/ath/ath11k/pci.c<br/>index 0f31eb566fb6..7114eca8810d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/pci.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/pci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/pci.c</a></div><div class='hunk'>@@ -1,262 +1,204 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/msi.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pci.h"</div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "hif.h"</div><div class='ctx'> #include "mhi.h"</div><div class='ctx'> #include "debug.h"</div><div class='add'>+#include "pcic.h"</div><div class='add'>+#include "qmi.h"</div><div class='ctx'> </div><div class='ctx'> #define ATH11K_PCI_BAR_NUM		0</div><div class='del'>-#define ATH11K_PCI_DMA_MASK		32</div><div class='del'>-</div><div class='del'>-#define ATH11K_PCI_IRQ_CE0_OFFSET		3</div><div class='del'>-</div><div class='del'>-#define WINDOW_ENABLE_BIT		0x40000000</div><div class='del'>-#define WINDOW_REG_ADDRESS		0x310c</div><div class='del'>-#define WINDOW_VALUE_MASK		GENMASK(24, 19)</div><div class='del'>-#define WINDOW_START			0x80000</div><div class='del'>-#define WINDOW_RANGE_MASK		GENMASK(18, 0)</div><div class='add'>+#define ATH11K_PCI_DMA_MASK		36</div><div class='add'>+#define ATH11K_PCI_COHERENT_DMA_MASK	32</div><div class='ctx'> </div><div class='ctx'> #define TCSR_SOC_HW_VERSION		0x0224</div><div class='del'>-#define TCSR_SOC_HW_VERSION_MAJOR_MASK	GENMASK(16, 8)</div><div class='add'>+#define TCSR_SOC_HW_VERSION_MAJOR_MASK	GENMASK(11, 8)</div><div class='ctx'> #define TCSR_SOC_HW_VERSION_MINOR_MASK	GENMASK(7, 0)</div><div class='ctx'> </div><div class='del'>-/* BAR0 + 4k is always accessible, and no</div><div class='del'>- * need to force wakeup.</div><div class='del'>- * 4K - 32 = 0xFE0</div><div class='del'>- */</div><div class='del'>-#define ACCESS_ALWAYS_OFF 0xFE0</div><div class='del'>-</div><div class='ctx'> #define QCA6390_DEVICE_ID		0x1101</div><div class='ctx'> #define QCN9074_DEVICE_ID		0x1104</div><div class='add'>+#define WCN6855_DEVICE_ID		0x1103</div><div class='add'>+</div><div class='add'>+#define TCSR_SOC_HW_SUB_VER	0x1910010</div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id ath11k_pci_id_table[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(QCOM, QCA6390_DEVICE_ID) },</div><div class='del'>-	/* TODO: add QCN9074_DEVICE_ID) once firmware issues are resolved */</div><div class='del'>-	{0}</div><div class='add'>+	{ PCI_VDEVICE(QCOM, WCN6855_DEVICE_ID) },</div><div class='add'>+	{ PCI_VDEVICE(QCOM, QCN9074_DEVICE_ID) },</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, ath11k_pci_id_table);</div><div class='ctx'> </div><div class='del'>-static const struct ath11k_bus_params ath11k_pci_bus_params = {</div><div class='del'>-	.mhi_support = true,</div><div class='del'>-	.m3_fw_support = true,</div><div class='del'>-	.fixed_bdf_addr = false,</div><div class='del'>-	.fixed_mem_region = false,</div><div class='del'>-};</div><div class='add'>+static int ath11k_pci_bus_wake_up(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_pci *ab_pci = ath11k_pci_priv(ab);</div><div class='ctx'> </div><div class='del'>-static const struct ath11k_msi_config ath11k_msi_config[] = {</div><div class='del'>-	{</div><div class='del'>-		.total_vectors = 32,</div><div class='del'>-		.total_users = 4,</div><div class='del'>-		.users = (struct ath11k_msi_user[]) {</div><div class='del'>-			{ .name = "MHI", .num_vectors = 3, .base_vector = 0 },</div><div class='del'>-			{ .name = "CE", .num_vectors = 10, .base_vector = 3 },</div><div class='del'>-			{ .name = "WAKE", .num_vectors = 1, .base_vector = 13 },</div><div class='del'>-			{ .name = "DP", .num_vectors = 18, .base_vector = 14 },</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.total_vectors = 16,</div><div class='del'>-		.total_users = 3,</div><div class='del'>-		.users = (struct ath11k_msi_user[]) {</div><div class='del'>-			{ .name = "MHI", .num_vectors = 3, .base_vector = 0 },</div><div class='del'>-			{ .name = "CE", .num_vectors = 5, .base_vector = 3 },</div><div class='del'>-			{ .name = "DP", .num_vectors = 8, .base_vector = 8 },</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-};</div><div class='add'>+	return mhi_device_get_sync(ab_pci-&gt;mhi_ctrl-&gt;mhi_dev);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static const char *irq_name[ATH11K_IRQ_NUM_MAX] = {</div><div class='del'>-	"bhi",</div><div class='del'>-	"mhi-er0",</div><div class='del'>-	"mhi-er1",</div><div class='del'>-	"ce0",</div><div class='del'>-	"ce1",</div><div class='del'>-	"ce2",</div><div class='del'>-	"ce3",</div><div class='del'>-	"ce4",</div><div class='del'>-	"ce5",</div><div class='del'>-	"ce6",</div><div class='del'>-	"ce7",</div><div class='del'>-	"ce8",</div><div class='del'>-	"ce9",</div><div class='del'>-	"ce10",</div><div class='del'>-	"ce11",</div><div class='del'>-	"host2wbm-desc-feed",</div><div class='del'>-	"host2reo-re-injection",</div><div class='del'>-	"host2reo-command",</div><div class='del'>-	"host2rxdma-monitor-ring3",</div><div class='del'>-	"host2rxdma-monitor-ring2",</div><div class='del'>-	"host2rxdma-monitor-ring1",</div><div class='del'>-	"reo2ost-exception",</div><div class='del'>-	"wbm2host-rx-release",</div><div class='del'>-	"reo2host-status",</div><div class='del'>-	"reo2host-destination-ring4",</div><div class='del'>-	"reo2host-destination-ring3",</div><div class='del'>-	"reo2host-destination-ring2",</div><div class='del'>-	"reo2host-destination-ring1",</div><div class='del'>-	"rxdma2host-monitor-destination-mac3",</div><div class='del'>-	"rxdma2host-monitor-destination-mac2",</div><div class='del'>-	"rxdma2host-monitor-destination-mac1",</div><div class='del'>-	"ppdu-end-interrupts-mac3",</div><div class='del'>-	"ppdu-end-interrupts-mac2",</div><div class='del'>-	"ppdu-end-interrupts-mac1",</div><div class='del'>-	"rxdma2host-monitor-status-ring-mac3",</div><div class='del'>-	"rxdma2host-monitor-status-ring-mac2",</div><div class='del'>-	"rxdma2host-monitor-status-ring-mac1",</div><div class='del'>-	"host2rxdma-host-buf-ring-mac3",</div><div class='del'>-	"host2rxdma-host-buf-ring-mac2",</div><div class='del'>-	"host2rxdma-host-buf-ring-mac1",</div><div class='del'>-	"rxdma2host-destination-ring-mac3",</div><div class='del'>-	"rxdma2host-destination-ring-mac2",</div><div class='del'>-	"rxdma2host-destination-ring-mac1",</div><div class='del'>-	"host2tcl-input-ring4",</div><div class='del'>-	"host2tcl-input-ring3",</div><div class='del'>-	"host2tcl-input-ring2",</div><div class='del'>-	"host2tcl-input-ring1",</div><div class='del'>-	"wbm2host-tx-completions-ring3",</div><div class='del'>-	"wbm2host-tx-completions-ring2",</div><div class='del'>-	"wbm2host-tx-completions-ring1",</div><div class='del'>-	"tcl2host-status-ring",</div><div class='del'>-};</div><div class='add'>+static void ath11k_pci_bus_release(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_pci *ab_pci = ath11k_pci_priv(ab);</div><div class='add'>+</div><div class='add'>+	mhi_device_put(ab_pci-&gt;mhi_ctrl-&gt;mhi_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath11k_pci_get_window_start(struct ath11k_base *ab, u32 offset)</div><div class='add'>+{</div><div class='add'>+	if (!ab-&gt;hw_params.static_window_map)</div><div class='add'>+		return ATH11K_PCI_WINDOW_START;</div><div class='add'>+</div><div class='add'>+	if ((offset ^ HAL_SEQ_WCSS_UMAC_OFFSET) &lt; ATH11K_PCI_WINDOW_RANGE_MASK)</div><div class='add'>+		/* if offset lies within DP register range, use 3rd window */</div><div class='add'>+		return 3 * ATH11K_PCI_WINDOW_START;</div><div class='add'>+	else if ((offset ^ HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab)) &lt;</div><div class='add'>+		 ATH11K_PCI_WINDOW_RANGE_MASK)</div><div class='add'>+		 /* if offset lies within CE register range, use 2nd window */</div><div class='add'>+		return 2 * ATH11K_PCI_WINDOW_START;</div><div class='add'>+	else</div><div class='add'>+		return ATH11K_PCI_WINDOW_START;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline void ath11k_pci_select_window(struct ath11k_pci *ab_pci, u32 offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = ab_pci-&gt;ab;</div><div class='ctx'> </div><div class='del'>-	u32 window = FIELD_GET(WINDOW_VALUE_MASK, offset);</div><div class='add'>+	u32 window = FIELD_GET(ATH11K_PCI_WINDOW_VALUE_MASK, offset);</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ab_pci-&gt;window_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (window != ab_pci-&gt;register_window) {</div><div class='del'>-		iowrite32(WINDOW_ENABLE_BIT | window,</div><div class='del'>-			  ab-&gt;mem + WINDOW_REG_ADDRESS);</div><div class='del'>-		ioread32(ab-&gt;mem + WINDOW_REG_ADDRESS);</div><div class='add'>+		iowrite32(ATH11K_PCI_WINDOW_ENABLE_BIT | window,</div><div class='add'>+			  ab-&gt;mem + ATH11K_PCI_WINDOW_REG_ADDRESS);</div><div class='add'>+		ioread32(ab-&gt;mem + ATH11K_PCI_WINDOW_REG_ADDRESS);</div><div class='ctx'> 		ab_pci-&gt;register_window = window;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ath11k_pci_select_static_window(struct ath11k_pci *ab_pci)</div><div class='add'>+static void</div><div class='add'>+ath11k_pci_window_write32(struct ath11k_base *ab, u32 offset, u32 value)</div><div class='ctx'> {</div><div class='del'>-	u32 umac_window = FIELD_GET(WINDOW_VALUE_MASK, HAL_SEQ_WCSS_UMAC_OFFSET);</div><div class='del'>-	u32 ce_window = FIELD_GET(WINDOW_VALUE_MASK, HAL_CE_WFSS_CE_REG_BASE);</div><div class='del'>-	u32 window;</div><div class='add'>+	struct ath11k_pci *ab_pci = ath11k_pci_priv(ab);</div><div class='add'>+	u32 window_start;</div><div class='ctx'> </div><div class='del'>-	window = (umac_window &lt;&lt; 12) | (ce_window &lt;&lt; 6);</div><div class='add'>+	window_start = ath11k_pci_get_window_start(ab, offset);</div><div class='ctx'> </div><div class='del'>-	iowrite32(WINDOW_ENABLE_BIT | window, ab_pci-&gt;ab-&gt;mem + WINDOW_REG_ADDRESS);</div><div class='add'>+	if (window_start == ATH11K_PCI_WINDOW_START) {</div><div class='add'>+		spin_lock_bh(&amp;ab_pci-&gt;window_lock);</div><div class='add'>+		ath11k_pci_select_window(ab_pci, offset);</div><div class='add'>+		iowrite32(value, ab-&gt;mem + window_start +</div><div class='add'>+			  (offset &amp; ATH11K_PCI_WINDOW_RANGE_MASK));</div><div class='add'>+		spin_unlock_bh(&amp;ab_pci-&gt;window_lock);</div><div class='add'>+	} else {</div><div class='add'>+		iowrite32(value, ab-&gt;mem + window_start +</div><div class='add'>+			  (offset &amp; ATH11K_PCI_WINDOW_RANGE_MASK));</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u32 ath11k_pci_get_window_start(struct ath11k_base *ab,</div><div class='del'>-					      u32 offset)</div><div class='add'>+static u32 ath11k_pci_window_read32(struct ath11k_base *ab, u32 offset)</div><div class='ctx'> {</div><div class='del'>-	u32 window_start;</div><div class='add'>+	struct ath11k_pci *ab_pci = ath11k_pci_priv(ab);</div><div class='add'>+	u32 window_start, val;</div><div class='ctx'> </div><div class='del'>-	/* If offset lies within DP register range, use 3rd window */</div><div class='del'>-	if ((offset ^ HAL_SEQ_WCSS_UMAC_OFFSET) &lt; WINDOW_RANGE_MASK)</div><div class='del'>-		window_start = 3 * WINDOW_START;</div><div class='del'>-	/* If offset lies within CE register range, use 2nd window */</div><div class='del'>-	else if ((offset ^ HAL_CE_WFSS_CE_REG_BASE) &lt; WINDOW_RANGE_MASK)</div><div class='del'>-		window_start = 2 * WINDOW_START;</div><div class='del'>-	else</div><div class='del'>-		window_start = WINDOW_START;</div><div class='add'>+	window_start = ath11k_pci_get_window_start(ab, offset);</div><div class='add'>+</div><div class='add'>+	if (window_start == ATH11K_PCI_WINDOW_START) {</div><div class='add'>+		spin_lock_bh(&amp;ab_pci-&gt;window_lock);</div><div class='add'>+		ath11k_pci_select_window(ab_pci, offset);</div><div class='add'>+		val = ioread32(ab-&gt;mem + window_start +</div><div class='add'>+			       (offset &amp; ATH11K_PCI_WINDOW_RANGE_MASK));</div><div class='add'>+		spin_unlock_bh(&amp;ab_pci-&gt;window_lock);</div><div class='add'>+	} else {</div><div class='add'>+		val = ioread32(ab-&gt;mem + window_start +</div><div class='add'>+			       (offset &amp; ATH11K_PCI_WINDOW_RANGE_MASK));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return window_start;</div><div class='add'>+	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath11k_pci_write32(struct ath11k_base *ab, u32 offset, u32 value)</div><div class='add'>+int ath11k_pci_get_msi_irq(struct ath11k_base *ab, unsigned int vector)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_pci *ab_pci = ath11k_pci_priv(ab);</div><div class='del'>-	u32 window_start;</div><div class='add'>+	struct pci_dev *pci_dev = to_pci_dev(ab-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	/* for offset beyond BAR + 4K - 32, may</div><div class='del'>-	 * need to wakeup MHI to access.</div><div class='del'>-	 */</div><div class='del'>-	if (test_bit(ATH11K_PCI_FLAG_INIT_DONE, &amp;ab_pci-&gt;flags) &amp;&amp;</div><div class='del'>-	    offset &gt;= ACCESS_ALWAYS_OFF)</div><div class='del'>-		mhi_device_get_sync(ab_pci-&gt;mhi_ctrl-&gt;mhi_dev);</div><div class='add'>+	return pci_irq_vector(pci_dev, vector);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (offset &lt; WINDOW_START) {</div><div class='del'>-		iowrite32(value, ab-&gt;mem  + offset);</div><div class='del'>-	} else {</div><div class='del'>-		if (ab-&gt;bus_params.static_window_map)</div><div class='del'>-			window_start = ath11k_pci_get_window_start(ab, offset);</div><div class='del'>-		else</div><div class='del'>-			window_start = WINDOW_START;</div><div class='del'>-</div><div class='del'>-		if (window_start == WINDOW_START) {</div><div class='del'>-			spin_lock_bh(&amp;ab_pci-&gt;window_lock);</div><div class='del'>-			ath11k_pci_select_window(ab_pci, offset);</div><div class='del'>-			iowrite32(value, ab-&gt;mem + window_start +</div><div class='del'>-				  (offset &amp; WINDOW_RANGE_MASK));</div><div class='del'>-			spin_unlock_bh(&amp;ab_pci-&gt;window_lock);</div><div class='del'>-		} else {</div><div class='del'>-			iowrite32(value, ab-&gt;mem + window_start +</div><div class='del'>-				  (offset &amp; WINDOW_RANGE_MASK));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+static const struct ath11k_pci_ops ath11k_pci_ops_qca6390 = {</div><div class='add'>+	.wakeup = ath11k_pci_bus_wake_up,</div><div class='add'>+	.release = ath11k_pci_bus_release,</div><div class='add'>+	.get_msi_irq = ath11k_pci_get_msi_irq,</div><div class='add'>+	.window_write32 = ath11k_pci_window_write32,</div><div class='add'>+	.window_read32 = ath11k_pci_window_read32,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	if (test_bit(ATH11K_PCI_FLAG_INIT_DONE, &amp;ab_pci-&gt;flags) &amp;&amp;</div><div class='del'>-	    offset &gt;= ACCESS_ALWAYS_OFF)</div><div class='del'>-		mhi_device_put(ab_pci-&gt;mhi_ctrl-&gt;mhi_dev);</div><div class='add'>+static const struct ath11k_pci_ops ath11k_pci_ops_qcn9074 = {</div><div class='add'>+	.wakeup = NULL,</div><div class='add'>+	.release = NULL,</div><div class='add'>+	.get_msi_irq = ath11k_pci_get_msi_irq,</div><div class='add'>+	.window_write32 = ath11k_pci_window_write32,</div><div class='add'>+	.window_read32 = ath11k_pci_window_read32,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ath11k_msi_config msi_config_one_msi = {</div><div class='add'>+	.total_vectors = 1,</div><div class='add'>+	.total_users = 4,</div><div class='add'>+	.users = (struct ath11k_msi_user[]) {</div><div class='add'>+		{ .name = "MHI", .num_vectors = 3, .base_vector = 0 },</div><div class='add'>+		{ .name = "CE", .num_vectors = 1, .base_vector = 0 },</div><div class='add'>+		{ .name = "WAKE", .num_vectors = 1, .base_vector = 0 },</div><div class='add'>+		{ .name = "DP", .num_vectors = 1, .base_vector = 0 },</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void ath11k_pci_select_static_window(struct ath11k_pci *ab_pci)</div><div class='add'>+{</div><div class='add'>+	u32 umac_window;</div><div class='add'>+	u32 ce_window;</div><div class='add'>+	u32 window;</div><div class='add'>+</div><div class='add'>+	umac_window = FIELD_GET(ATH11K_PCI_WINDOW_VALUE_MASK, HAL_SEQ_WCSS_UMAC_OFFSET);</div><div class='add'>+	ce_window = FIELD_GET(ATH11K_PCI_WINDOW_VALUE_MASK, HAL_CE_WFSS_CE_REG_BASE);</div><div class='add'>+	window = (umac_window &lt;&lt; 12) | (ce_window &lt;&lt; 6);</div><div class='add'>+</div><div class='add'>+	iowrite32(ATH11K_PCI_WINDOW_ENABLE_BIT | window,</div><div class='add'>+		  ab_pci-&gt;ab-&gt;mem + ATH11K_PCI_WINDOW_REG_ADDRESS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 ath11k_pci_read32(struct ath11k_base *ab, u32 offset)</div><div class='add'>+static void ath11k_pci_restore_window(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_pci *ab_pci = ath11k_pci_priv(ab);</div><div class='del'>-	u32 val, window_start;</div><div class='ctx'> </div><div class='del'>-	/* for offset beyond BAR + 4K - 32, may</div><div class='del'>-	 * need to wakeup MHI to access.</div><div class='del'>-	 */</div><div class='del'>-	if (test_bit(ATH11K_PCI_FLAG_INIT_DONE, &amp;ab_pci-&gt;flags) &amp;&amp;</div><div class='del'>-	    offset &gt;= ACCESS_ALWAYS_OFF)</div><div class='del'>-		mhi_device_get_sync(ab_pci-&gt;mhi_ctrl-&gt;mhi_dev);</div><div class='del'>-</div><div class='del'>-	if (offset &lt; WINDOW_START) {</div><div class='del'>-		val = ioread32(ab-&gt;mem + offset);</div><div class='del'>-	} else {</div><div class='del'>-		if (ab-&gt;bus_params.static_window_map)</div><div class='del'>-			window_start = ath11k_pci_get_window_start(ab, offset);</div><div class='del'>-		else</div><div class='del'>-			window_start = WINDOW_START;</div><div class='del'>-</div><div class='del'>-		if (window_start == WINDOW_START) {</div><div class='del'>-			spin_lock_bh(&amp;ab_pci-&gt;window_lock);</div><div class='del'>-			ath11k_pci_select_window(ab_pci, offset);</div><div class='del'>-			val = ioread32(ab-&gt;mem + window_start +</div><div class='del'>-				       (offset &amp; WINDOW_RANGE_MASK));</div><div class='del'>-			spin_unlock_bh(&amp;ab_pci-&gt;window_lock);</div><div class='del'>-		} else {</div><div class='del'>-			val = ioread32(ab-&gt;mem + window_start +</div><div class='del'>-				       (offset &amp; WINDOW_RANGE_MASK));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	spin_lock_bh(&amp;ab_pci-&gt;window_lock);</div><div class='ctx'> </div><div class='del'>-	if (test_bit(ATH11K_PCI_FLAG_INIT_DONE, &amp;ab_pci-&gt;flags) &amp;&amp;</div><div class='del'>-	    offset &gt;= ACCESS_ALWAYS_OFF)</div><div class='del'>-		mhi_device_put(ab_pci-&gt;mhi_ctrl-&gt;mhi_dev);</div><div class='add'>+	iowrite32(ATH11K_PCI_WINDOW_ENABLE_BIT | ab_pci-&gt;register_window,</div><div class='add'>+		  ab-&gt;mem + ATH11K_PCI_WINDOW_REG_ADDRESS);</div><div class='add'>+	ioread32(ab-&gt;mem + ATH11K_PCI_WINDOW_REG_ADDRESS);</div><div class='ctx'> </div><div class='del'>-	return val;</div><div class='add'>+	spin_unlock_bh(&amp;ab_pci-&gt;window_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_pci_soc_global_reset(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val, delay;</div><div class='ctx'> </div><div class='del'>-	val = ath11k_pci_read32(ab, PCIE_SOC_GLOBAL_RESET);</div><div class='add'>+	val = ath11k_pcic_read32(ab, PCIE_SOC_GLOBAL_RESET);</div><div class='ctx'> </div><div class='ctx'> 	val |= PCIE_SOC_GLOBAL_RESET_V;</div><div class='ctx'> </div><div class='del'>-	ath11k_pci_write32(ab, PCIE_SOC_GLOBAL_RESET, val);</div><div class='add'>+	ath11k_pcic_write32(ab, PCIE_SOC_GLOBAL_RESET, val);</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: exact time to sleep is uncertain */</div><div class='ctx'> 	delay = 10;</div><div class='hunk'>@@ -265,13 +207,18 @@ static void ath11k_pci_soc_global_reset(struct ath11k_base *ab)</div><div class='ctx'> 	/* Need to toggle V bit back otherwise stuck in reset status */</div><div class='ctx'> 	val &amp;= ~PCIE_SOC_GLOBAL_RESET_V;</div><div class='ctx'> </div><div class='del'>-	ath11k_pci_write32(ab, PCIE_SOC_GLOBAL_RESET, val);</div><div class='add'>+	ath11k_pcic_write32(ab, PCIE_SOC_GLOBAL_RESET, val);</div><div class='ctx'> </div><div class='ctx'> 	mdelay(delay);</div><div class='ctx'> </div><div class='del'>-	val = ath11k_pci_read32(ab, PCIE_SOC_GLOBAL_RESET);</div><div class='add'>+	val = ath11k_pcic_read32(ab, PCIE_SOC_GLOBAL_RESET);</div><div class='ctx'> 	if (val == 0xffffffff)</div><div class='ctx'> 		ath11k_warn(ab, "link down error during global reset\n");</div><div class='add'>+</div><div class='add'>+	/* Restore window register as its content is cleared during</div><div class='add'>+	 * hardware global reset, such that it aligns with host cache.</div><div class='add'>+	 */</div><div class='add'>+	ath11k_pci_restore_window(ab);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_pci_clear_dbg_registers(struct ath11k_base *ab)</div><div class='hunk'>@@ -279,11 +226,11 @@ static void ath11k_pci_clear_dbg_registers(struct ath11k_base *ab)</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	/* read cookie */</div><div class='del'>-	val = ath11k_pci_read32(ab, PCIE_Q6_COOKIE_ADDR);</div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_PCI, "cookie:0x%x\n", val);</div><div class='add'>+	val = ath11k_pcic_read32(ab, PCIE_Q6_COOKIE_ADDR);</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_PCI, "pcie_q6_cookie_addr 0x%x\n", val);</div><div class='ctx'> </div><div class='del'>-	val = ath11k_pci_read32(ab, WLAON_WARM_SW_ENTRY);</div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_PCI, "WLAON_WARM_SW_ENTRY 0x%x\n", val);</div><div class='add'>+	val = ath11k_pcic_read32(ab, WLAON_WARM_SW_ENTRY);</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_PCI, "wlaon_warm_sw_entry 0x%x\n", val);</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: exact time to sleep is uncertain */</div><div class='ctx'> 	mdelay(10);</div><div class='hunk'>@@ -291,17 +238,17 @@ static void ath11k_pci_clear_dbg_registers(struct ath11k_base *ab)</div><div class='ctx'> 	/* write 0 to WLAON_WARM_SW_ENTRY to prevent Q6 from</div><div class='ctx'> 	 * continuing warm path and entering dead loop.</div><div class='ctx'> 	 */</div><div class='del'>-	ath11k_pci_write32(ab, WLAON_WARM_SW_ENTRY, 0);</div><div class='add'>+	ath11k_pcic_write32(ab, WLAON_WARM_SW_ENTRY, 0);</div><div class='ctx'> 	mdelay(10);</div><div class='ctx'> </div><div class='del'>-	val = ath11k_pci_read32(ab, WLAON_WARM_SW_ENTRY);</div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_PCI, "WLAON_WARM_SW_ENTRY 0x%x\n", val);</div><div class='add'>+	val = ath11k_pcic_read32(ab, WLAON_WARM_SW_ENTRY);</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_PCI, "wlaon_warm_sw_entry 0x%x\n", val);</div><div class='ctx'> </div><div class='ctx'> 	/* A read clear register. clear the register to prevent</div><div class='ctx'> 	 * Q6 from entering wrong code path.</div><div class='ctx'> 	 */</div><div class='del'>-	val = ath11k_pci_read32(ab, WLAON_SOC_RESET_CAUSE_REG);</div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_PCI, "soc reset cause:%d\n", val);</div><div class='add'>+	val = ath11k_pcic_read32(ab, WLAON_SOC_RESET_CAUSE_REG);</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_PCI, "soc reset cause %d\n", val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath11k_pci_set_link_reg(struct ath11k_base *ab,</div><div class='hunk'>@@ -310,14 +257,14 @@ static int ath11k_pci_set_link_reg(struct ath11k_base *ab,</div><div class='ctx'> 	u32 v;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	v = ath11k_pci_read32(ab, offset);</div><div class='add'>+	v = ath11k_pcic_read32(ab, offset);</div><div class='ctx'> 	if ((v &amp; mask) == value)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		ath11k_pci_write32(ab, offset, (v &amp; ~mask) | value);</div><div class='add'>+		ath11k_pcic_write32(ab, offset, (v &amp; ~mask) | value);</div><div class='ctx'> </div><div class='del'>-		v = ath11k_pci_read32(ab, offset);</div><div class='add'>+		v = ath11k_pcic_read32(ab, offset);</div><div class='ctx'> 		if ((v &amp; mask) == value)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -378,25 +325,25 @@ static void ath11k_pci_enable_ltssm(struct ath11k_base *ab)</div><div class='ctx'> 	u32 val;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	val = ath11k_pci_read32(ab, PCIE_PCIE_PARF_LTSSM);</div><div class='add'>+	val = ath11k_pcic_read32(ab, PCIE_PCIE_PARF_LTSSM);</div><div class='ctx'> </div><div class='ctx'> 	/* PCIE link seems very unstable after the Hot Reset*/</div><div class='ctx'> 	for (i = 0; val != PARM_LTSSM_VALUE &amp;&amp; i &lt; 5; i++) {</div><div class='ctx'> 		if (val == 0xffffffff)</div><div class='ctx'> 			mdelay(5);</div><div class='ctx'> </div><div class='del'>-		ath11k_pci_write32(ab, PCIE_PCIE_PARF_LTSSM, PARM_LTSSM_VALUE);</div><div class='del'>-		val = ath11k_pci_read32(ab, PCIE_PCIE_PARF_LTSSM);</div><div class='add'>+		ath11k_pcic_write32(ab, PCIE_PCIE_PARF_LTSSM, PARM_LTSSM_VALUE);</div><div class='add'>+		val = ath11k_pcic_read32(ab, PCIE_PCIE_PARF_LTSSM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_PCI, "pci ltssm 0x%x\n", val);</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_PCI, "ltssm 0x%x\n", val);</div><div class='ctx'> </div><div class='del'>-	val = ath11k_pci_read32(ab, GCC_GCC_PCIE_HOT_RST);</div><div class='add'>+	val = ath11k_pcic_read32(ab, GCC_GCC_PCIE_HOT_RST);</div><div class='ctx'> 	val |= GCC_GCC_PCIE_HOT_RST_VAL;</div><div class='del'>-	ath11k_pci_write32(ab, GCC_GCC_PCIE_HOT_RST, val);</div><div class='del'>-	val = ath11k_pci_read32(ab, GCC_GCC_PCIE_HOT_RST);</div><div class='add'>+	ath11k_pcic_write32(ab, GCC_GCC_PCIE_HOT_RST, val);</div><div class='add'>+	val = ath11k_pcic_read32(ab, GCC_GCC_PCIE_HOT_RST);</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_PCI, "pci pcie_hot_rst 0x%x\n", val);</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_PCI, "pcie_hot_rst 0x%x\n", val);</div><div class='ctx'> </div><div class='ctx'> 	mdelay(5);</div><div class='ctx'> }</div><div class='hunk'>@@ -408,420 +355,40 @@ static void ath11k_pci_clear_all_intrs(struct ath11k_base *ab)</div><div class='ctx'> 	 * So when download SBL again, SBL will open Interrupt and</div><div class='ctx'> 	 * receive it, and crash immediately.</div><div class='ctx'> 	 */</div><div class='del'>-	ath11k_pci_write32(ab, PCIE_PCIE_INT_ALL_CLEAR, PCIE_INT_CLEAR_ALL);</div><div class='add'>+	ath11k_pcic_write32(ab, PCIE_PCIE_INT_ALL_CLEAR, PCIE_INT_CLEAR_ALL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_pci_set_wlaon_pwr_ctrl(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	val = ath11k_pci_read32(ab, WLAON_QFPROM_PWR_CTRL_REG);</div><div class='add'>+	val = ath11k_pcic_read32(ab, WLAON_QFPROM_PWR_CTRL_REG);</div><div class='ctx'> 	val &amp;= ~QFPROM_PWR_CTRL_VDD4BLOW_MASK;</div><div class='del'>-	ath11k_pci_write32(ab, WLAON_QFPROM_PWR_CTRL_REG, val);</div><div class='add'>+	ath11k_pcic_write32(ab, WLAON_QFPROM_PWR_CTRL_REG, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_pci_force_wake(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='del'>-	ath11k_pci_write32(ab, PCIE_SOC_WAKE_PCIE_LOCAL_REG, 1);</div><div class='add'>+	ath11k_pcic_write32(ab, PCIE_SOC_WAKE_PCIE_LOCAL_REG, 1);</div><div class='ctx'> 	mdelay(5);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_pci_sw_reset(struct ath11k_base *ab, bool power_on)</div><div class='ctx'> {</div><div class='add'>+	mdelay(100);</div><div class='add'>+</div><div class='ctx'> 	if (power_on) {</div><div class='ctx'> 		ath11k_pci_enable_ltssm(ab);</div><div class='ctx'> 		ath11k_pci_clear_all_intrs(ab);</div><div class='ctx'> 		ath11k_pci_set_wlaon_pwr_ctrl(ab);</div><div class='del'>-		ath11k_pci_fix_l1ss(ab);</div><div class='add'>+		if (ab-&gt;hw_params.fix_l1ss)</div><div class='add'>+			ath11k_pci_fix_l1ss(ab);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_mhi_clear_vector(ab);</div><div class='add'>+	ath11k_pci_clear_dbg_registers(ab);</div><div class='ctx'> 	ath11k_pci_soc_global_reset(ab);</div><div class='ctx'> 	ath11k_mhi_set_mhictrl_reset(ab);</div><div class='del'>-	ath11k_pci_clear_dbg_registers(ab);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ath11k_pci_get_msi_irq(struct device *dev, unsigned int vector)</div><div class='del'>-{</div><div class='del'>-	struct pci_dev *pci_dev = to_pci_dev(dev);</div><div class='del'>-</div><div class='del'>-	return pci_irq_vector(pci_dev, vector);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ath11k_pci_get_msi_address(struct ath11k_base *ab, u32 *msi_addr_lo,</div><div class='del'>-				       u32 *msi_addr_hi)</div><div class='del'>-{</div><div class='del'>-	struct ath11k_pci *ab_pci = ath11k_pci_priv(ab);</div><div class='del'>-	struct pci_dev *pci_dev = to_pci_dev(ab-&gt;dev);</div><div class='del'>-</div><div class='del'>-	pci_read_config_dword(pci_dev, pci_dev-&gt;msi_cap + PCI_MSI_ADDRESS_LO,</div><div class='del'>-			      msi_addr_lo);</div><div class='del'>-</div><div class='del'>-	if (test_bit(ATH11K_PCI_FLAG_IS_MSI_64, &amp;ab_pci-&gt;flags)) {</div><div class='del'>-		pci_read_config_dword(pci_dev, pci_dev-&gt;msi_cap + PCI_MSI_ADDRESS_HI,</div><div class='del'>-				      msi_addr_hi);</div><div class='del'>-	} else {</div><div class='del'>-		*msi_addr_hi = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ath11k_pci_get_user_msi_assignment(struct ath11k_pci *ab_pci, char *user_name,</div><div class='del'>-				       int *num_vectors, u32 *user_base_data,</div><div class='del'>-				       u32 *base_vector)</div><div class='del'>-{</div><div class='del'>-	struct ath11k_base *ab = ab_pci-&gt;ab;</div><div class='del'>-	const struct ath11k_msi_config *msi_config = ab_pci-&gt;msi_config;</div><div class='del'>-	int idx;</div><div class='del'>-</div><div class='del'>-	for (idx = 0; idx &lt; msi_config-&gt;total_users; idx++) {</div><div class='del'>-		if (strcmp(user_name, msi_config-&gt;users[idx].name) == 0) {</div><div class='del'>-			*num_vectors = msi_config-&gt;users[idx].num_vectors;</div><div class='del'>-			*user_base_data = msi_config-&gt;users[idx].base_vector</div><div class='del'>-				+ ab_pci-&gt;msi_ep_base_data;</div><div class='del'>-			*base_vector = msi_config-&gt;users[idx].base_vector;</div><div class='del'>-</div><div class='del'>-			ath11k_dbg(ab, ATH11K_DBG_PCI, "Assign MSI to user: %s, num_vectors: %d, user_base_data: %u, base_vector: %u\n",</div><div class='del'>-				   user_name, *num_vectors, *user_base_data,</div><div class='del'>-				   *base_vector);</div><div class='del'>-</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ath11k_err(ab, "Failed to find MSI assignment for %s!\n", user_name);</div><div class='del'>-</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ath11k_pci_get_ce_msi_idx(struct ath11k_base *ab, u32 ce_id,</div><div class='del'>-				      u32 *msi_idx)</div><div class='del'>-{</div><div class='del'>-	u32 i, msi_data_idx;</div><div class='del'>-</div><div class='del'>-	for (i = 0, msi_data_idx = 0; i &lt; ab-&gt;hw_params.ce_count; i++) {</div><div class='del'>-		if (ath11k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (ce_id == i)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		msi_data_idx++;</div><div class='del'>-	}</div><div class='del'>-	*msi_idx = msi_data_idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ath11k_get_user_msi_assignment(struct ath11k_base *ab, char *user_name,</div><div class='del'>-					  int *num_vectors, u32 *user_base_data,</div><div class='del'>-					  u32 *base_vector)</div><div class='del'>-{</div><div class='del'>-	struct ath11k_pci *ab_pci = ath11k_pci_priv(ab);</div><div class='del'>-</div><div class='del'>-	return ath11k_pci_get_user_msi_assignment(ab_pci, user_name,</div><div class='del'>-						  num_vectors, user_base_data,</div><div class='del'>-						  base_vector);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ath11k_pci_free_ext_irq(struct ath11k_base *ab)</div><div class='del'>-{</div><div class='del'>-	int i, j;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) {</div><div class='del'>-		struct ath11k_ext_irq_grp *irq_grp = &amp;ab-&gt;ext_irq_grp[i];</div><div class='del'>-</div><div class='del'>-		for (j = 0; j &lt; irq_grp-&gt;num_irq; j++)</div><div class='del'>-			free_irq(ab-&gt;irq_num[irq_grp-&gt;irqs[j]], irq_grp);</div><div class='del'>-</div><div class='del'>-		netif_napi_del(&amp;irq_grp-&gt;napi);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ath11k_pci_free_irq(struct ath11k_base *ab)</div><div class='del'>-{</div><div class='del'>-	int i, irq_idx;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ab-&gt;hw_params.ce_count; i++) {</div><div class='del'>-		if (ath11k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='del'>-			continue;</div><div class='del'>-		irq_idx = ATH11K_PCI_IRQ_CE0_OFFSET + i;</div><div class='del'>-		free_irq(ab-&gt;irq_num[irq_idx], &amp;ab-&gt;ce.ce_pipe[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ath11k_pci_free_ext_irq(ab);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ath11k_pci_ce_irq_enable(struct ath11k_base *ab, u16 ce_id)</div><div class='del'>-{</div><div class='del'>-	u32 irq_idx;</div><div class='del'>-</div><div class='del'>-	irq_idx = ATH11K_PCI_IRQ_CE0_OFFSET + ce_id;</div><div class='del'>-	enable_irq(ab-&gt;irq_num[irq_idx]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ath11k_pci_ce_irq_disable(struct ath11k_base *ab, u16 ce_id)</div><div class='del'>-{</div><div class='del'>-	u32 irq_idx;</div><div class='del'>-</div><div class='del'>-	irq_idx = ATH11K_PCI_IRQ_CE0_OFFSET + ce_id;</div><div class='del'>-	disable_irq_nosync(ab-&gt;irq_num[irq_idx]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ath11k_pci_ce_irqs_disable(struct ath11k_base *ab)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ab-&gt;hw_params.ce_count; i++) {</div><div class='del'>-		if (ath11k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='del'>-			continue;</div><div class='del'>-		ath11k_pci_ce_irq_disable(ab, i);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ath11k_pci_sync_ce_irqs(struct ath11k_base *ab)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int irq_idx;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ab-&gt;hw_params.ce_count; i++) {</div><div class='del'>-		if (ath11k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		irq_idx = ATH11K_PCI_IRQ_CE0_OFFSET + i;</div><div class='del'>-		synchronize_irq(ab-&gt;irq_num[irq_idx]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ath11k_pci_ce_tasklet(struct tasklet_struct *t)</div><div class='del'>-{</div><div class='del'>-	struct ath11k_ce_pipe *ce_pipe = from_tasklet(ce_pipe, t, intr_tq);</div><div class='del'>-</div><div class='del'>-	ath11k_ce_per_engine_service(ce_pipe-&gt;ab, ce_pipe-&gt;pipe_num);</div><div class='del'>-</div><div class='del'>-	ath11k_pci_ce_irq_enable(ce_pipe-&gt;ab, ce_pipe-&gt;pipe_num);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t ath11k_pci_ce_interrupt_handler(int irq, void *arg)</div><div class='del'>-{</div><div class='del'>-	struct ath11k_ce_pipe *ce_pipe = arg;</div><div class='del'>-</div><div class='del'>-	/* last interrupt received for this CE */</div><div class='del'>-	ce_pipe-&gt;timestamp = jiffies;</div><div class='del'>-</div><div class='del'>-	ath11k_pci_ce_irq_disable(ce_pipe-&gt;ab, ce_pipe-&gt;pipe_num);</div><div class='del'>-	tasklet_schedule(&amp;ce_pipe-&gt;intr_tq);</div><div class='del'>-</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ath11k_pci_ext_grp_disable(struct ath11k_ext_irq_grp *irq_grp)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; irq_grp-&gt;num_irq; i++)</div><div class='del'>-		disable_irq_nosync(irq_grp-&gt;ab-&gt;irq_num[irq_grp-&gt;irqs[i]]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __ath11k_pci_ext_irq_disable(struct ath11k_base *sc)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) {</div><div class='del'>-		struct ath11k_ext_irq_grp *irq_grp = &amp;sc-&gt;ext_irq_grp[i];</div><div class='del'>-</div><div class='del'>-		ath11k_pci_ext_grp_disable(irq_grp);</div><div class='del'>-</div><div class='del'>-		napi_synchronize(&amp;irq_grp-&gt;napi);</div><div class='del'>-		napi_disable(&amp;irq_grp-&gt;napi);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ath11k_pci_ext_grp_enable(struct ath11k_ext_irq_grp *irq_grp)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; irq_grp-&gt;num_irq; i++)</div><div class='del'>-		enable_irq(irq_grp-&gt;ab-&gt;irq_num[irq_grp-&gt;irqs[i]]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ath11k_pci_ext_irq_enable(struct ath11k_base *ab)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) {</div><div class='del'>-		struct ath11k_ext_irq_grp *irq_grp = &amp;ab-&gt;ext_irq_grp[i];</div><div class='del'>-</div><div class='del'>-		napi_enable(&amp;irq_grp-&gt;napi);</div><div class='del'>-		ath11k_pci_ext_grp_enable(irq_grp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ath11k_pci_sync_ext_irqs(struct ath11k_base *ab)</div><div class='del'>-{</div><div class='del'>-	int i, j, irq_idx;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) {</div><div class='del'>-		struct ath11k_ext_irq_grp *irq_grp = &amp;ab-&gt;ext_irq_grp[i];</div><div class='del'>-</div><div class='del'>-		for (j = 0; j &lt; irq_grp-&gt;num_irq; j++) {</div><div class='del'>-			irq_idx = irq_grp-&gt;irqs[j];</div><div class='del'>-			synchronize_irq(ab-&gt;irq_num[irq_idx]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ath11k_pci_ext_irq_disable(struct ath11k_base *ab)</div><div class='del'>-{</div><div class='del'>-	__ath11k_pci_ext_irq_disable(ab);</div><div class='del'>-	ath11k_pci_sync_ext_irqs(ab);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ath11k_pci_ext_grp_napi_poll(struct napi_struct *napi, int budget)</div><div class='del'>-{</div><div class='del'>-	struct ath11k_ext_irq_grp *irq_grp = container_of(napi,</div><div class='del'>-						struct ath11k_ext_irq_grp,</div><div class='del'>-						napi);</div><div class='del'>-	struct ath11k_base *ab = irq_grp-&gt;ab;</div><div class='del'>-	int work_done;</div><div class='del'>-</div><div class='del'>-	work_done = ath11k_dp_service_srng(ab, irq_grp, budget);</div><div class='del'>-	if (work_done &lt; budget) {</div><div class='del'>-		napi_complete_done(napi, work_done);</div><div class='del'>-		ath11k_pci_ext_grp_enable(irq_grp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (work_done &gt; budget)</div><div class='del'>-		work_done = budget;</div><div class='del'>-</div><div class='del'>-	return work_done;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t ath11k_pci_ext_interrupt_handler(int irq, void *arg)</div><div class='del'>-{</div><div class='del'>-	struct ath11k_ext_irq_grp *irq_grp = arg;</div><div class='del'>-</div><div class='del'>-	ath11k_dbg(irq_grp-&gt;ab, ATH11K_DBG_PCI, "ext irq:%d\n", irq);</div><div class='del'>-</div><div class='del'>-	/* last interrupt received for this group */</div><div class='del'>-	irq_grp-&gt;timestamp = jiffies;</div><div class='del'>-</div><div class='del'>-	ath11k_pci_ext_grp_disable(irq_grp);</div><div class='del'>-</div><div class='del'>-	napi_schedule(&amp;irq_grp-&gt;napi);</div><div class='del'>-</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ath11k_pci_ext_irq_config(struct ath11k_base *ab)</div><div class='del'>-{</div><div class='del'>-	int i, j, ret, num_vectors = 0;</div><div class='del'>-	u32 user_base_data = 0, base_vector = 0, base_idx;</div><div class='del'>-</div><div class='del'>-	base_idx = ATH11K_PCI_IRQ_CE0_OFFSET + CE_COUNT_MAX;</div><div class='del'>-	ret = ath11k_pci_get_user_msi_assignment(ath11k_pci_priv(ab), "DP",</div><div class='del'>-						 &amp;num_vectors,</div><div class='del'>-						 &amp;user_base_data,</div><div class='del'>-						 &amp;base_vector);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) {</div><div class='del'>-		struct ath11k_ext_irq_grp *irq_grp = &amp;ab-&gt;ext_irq_grp[i];</div><div class='del'>-		u32 num_irq = 0;</div><div class='del'>-</div><div class='del'>-		irq_grp-&gt;ab = ab;</div><div class='del'>-		irq_grp-&gt;grp_id = i;</div><div class='del'>-		init_dummy_netdev(&amp;irq_grp-&gt;napi_ndev);</div><div class='del'>-		netif_napi_add(&amp;irq_grp-&gt;napi_ndev, &amp;irq_grp-&gt;napi,</div><div class='del'>-			       ath11k_pci_ext_grp_napi_poll, NAPI_POLL_WEIGHT);</div><div class='del'>-</div><div class='del'>-		if (ab-&gt;hw_params.ring_mask-&gt;tx[i] ||</div><div class='del'>-		    ab-&gt;hw_params.ring_mask-&gt;rx[i] ||</div><div class='del'>-		    ab-&gt;hw_params.ring_mask-&gt;rx_err[i] ||</div><div class='del'>-		    ab-&gt;hw_params.ring_mask-&gt;rx_wbm_rel[i] ||</div><div class='del'>-		    ab-&gt;hw_params.ring_mask-&gt;reo_status[i] ||</div><div class='del'>-		    ab-&gt;hw_params.ring_mask-&gt;rxdma2host[i] ||</div><div class='del'>-		    ab-&gt;hw_params.ring_mask-&gt;host2rxdma[i] ||</div><div class='del'>-		    ab-&gt;hw_params.ring_mask-&gt;rx_mon_status[i]) {</div><div class='del'>-			num_irq = 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		irq_grp-&gt;num_irq = num_irq;</div><div class='del'>-		irq_grp-&gt;irqs[0] = base_idx + i;</div><div class='del'>-</div><div class='del'>-		for (j = 0; j &lt; irq_grp-&gt;num_irq; j++) {</div><div class='del'>-			int irq_idx = irq_grp-&gt;irqs[j];</div><div class='del'>-			int vector = (i % num_vectors) + base_vector;</div><div class='del'>-			int irq = ath11k_pci_get_msi_irq(ab-&gt;dev, vector);</div><div class='del'>-</div><div class='del'>-			ab-&gt;irq_num[irq_idx] = irq;</div><div class='del'>-</div><div class='del'>-			ath11k_dbg(ab, ATH11K_DBG_PCI,</div><div class='del'>-				   "irq:%d group:%d\n", irq, i);</div><div class='del'>-</div><div class='del'>-			irq_set_status_flags(irq, IRQ_DISABLE_UNLAZY);</div><div class='del'>-			ret = request_irq(irq, ath11k_pci_ext_interrupt_handler,</div><div class='del'>-					  IRQF_SHARED,</div><div class='del'>-					  "DP_EXT_IRQ", irq_grp);</div><div class='del'>-			if (ret) {</div><div class='del'>-				ath11k_err(ab, "failed request irq %d: %d\n",</div><div class='del'>-					   vector, ret);</div><div class='del'>-				return ret;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			disable_irq_nosync(ab-&gt;irq_num[irq_idx]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ath11k_pci_config_irq(struct ath11k_base *ab)</div><div class='del'>-{</div><div class='del'>-	struct ath11k_ce_pipe *ce_pipe;</div><div class='del'>-	u32 msi_data_start;</div><div class='del'>-	u32 msi_data_count, msi_data_idx;</div><div class='del'>-	u32 msi_irq_start;</div><div class='del'>-	unsigned int msi_data;</div><div class='del'>-	int irq, i, ret, irq_idx;</div><div class='del'>-</div><div class='del'>-	ret = ath11k_pci_get_user_msi_assignment(ath11k_pci_priv(ab),</div><div class='del'>-						 "CE", &amp;msi_data_count,</div><div class='del'>-						 &amp;msi_data_start, &amp;msi_irq_start);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Configure CE irqs */</div><div class='del'>-	for (i = 0, msi_data_idx = 0; i &lt; ab-&gt;hw_params.ce_count; i++) {</div><div class='del'>-		if (ath11k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		msi_data = (msi_data_idx % msi_data_count) + msi_irq_start;</div><div class='del'>-		irq = ath11k_pci_get_msi_irq(ab-&gt;dev, msi_data);</div><div class='del'>-		ce_pipe = &amp;ab-&gt;ce.ce_pipe[i];</div><div class='del'>-</div><div class='del'>-		irq_idx = ATH11K_PCI_IRQ_CE0_OFFSET + i;</div><div class='del'>-</div><div class='del'>-		tasklet_setup(&amp;ce_pipe-&gt;intr_tq, ath11k_pci_ce_tasklet);</div><div class='del'>-</div><div class='del'>-		ret = request_irq(irq, ath11k_pci_ce_interrupt_handler,</div><div class='del'>-				  IRQF_SHARED, irq_name[irq_idx],</div><div class='del'>-				  ce_pipe);</div><div class='del'>-		if (ret) {</div><div class='del'>-			ath11k_err(ab, "failed to request irq %d: %d\n",</div><div class='del'>-				   irq_idx, ret);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ab-&gt;irq_num[irq_idx] = irq;</div><div class='del'>-		msi_data_idx++;</div><div class='del'>-</div><div class='del'>-		ath11k_pci_ce_irq_disable(ab, i);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = ath11k_pci_ext_irq_config(ab);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_pci_init_qmi_ce_config(struct ath11k_base *ab)</div><div class='hunk'>@@ -839,38 +406,62 @@ static void ath11k_pci_init_qmi_ce_config(struct ath11k_base *ab)</div><div class='ctx'> 				    &amp;cfg-&gt;shadow_reg_v2_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath11k_pci_ce_irqs_enable(struct ath11k_base *ab)</div><div class='add'>+static void ath11k_pci_msi_config(struct ath11k_pci *ab_pci, bool enable)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	struct pci_dev *dev = ab_pci-&gt;pdev;</div><div class='add'>+	u16 control;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ab-&gt;hw_params.ce_count; i++) {</div><div class='del'>-		if (ath11k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='del'>-			continue;</div><div class='del'>-		ath11k_pci_ce_irq_enable(ab, i);</div><div class='del'>-	}</div><div class='add'>+	pci_read_config_word(dev, dev-&gt;msi_cap + PCI_MSI_FLAGS, &amp;control);</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		control |= PCI_MSI_FLAGS_ENABLE;</div><div class='add'>+	else</div><div class='add'>+		control &amp;= ~PCI_MSI_FLAGS_ENABLE;</div><div class='add'>+</div><div class='add'>+	pci_write_config_word(dev, dev-&gt;msi_cap + PCI_MSI_FLAGS, control);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_pci_msi_enable(struct ath11k_pci *ab_pci)</div><div class='add'>+{</div><div class='add'>+	ath11k_pci_msi_config(ab_pci, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_pci_msi_disable(struct ath11k_pci *ab_pci)</div><div class='add'>+{</div><div class='add'>+	ath11k_pci_msi_config(ab_pci, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_pci_enable_msi(struct ath11k_pci *ab_pci)</div><div class='add'>+static int ath11k_pci_alloc_msi(struct ath11k_pci *ab_pci)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = ab_pci-&gt;ab;</div><div class='del'>-	const struct ath11k_msi_config *msi_config = ab_pci-&gt;msi_config;</div><div class='add'>+	const struct ath11k_msi_config *msi_config = ab-&gt;pci.msi.config;</div><div class='add'>+	struct pci_dev *pci_dev = ab_pci-&gt;pdev;</div><div class='ctx'> 	struct msi_desc *msi_desc;</div><div class='ctx'> 	int num_vectors;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	num_vectors = pci_alloc_irq_vectors(ab_pci-&gt;pdev,</div><div class='add'>+	num_vectors = pci_alloc_irq_vectors(pci_dev,</div><div class='ctx'> 					    msi_config-&gt;total_vectors,</div><div class='ctx'> 					    msi_config-&gt;total_vectors,</div><div class='ctx'> 					    PCI_IRQ_MSI);</div><div class='del'>-	if (num_vectors != msi_config-&gt;total_vectors) {</div><div class='del'>-		ath11k_err(ab, "failed to get %d MSI vectors, only %d available",</div><div class='del'>-			   msi_config-&gt;total_vectors, num_vectors);</div><div class='del'>-</div><div class='del'>-		if (num_vectors &gt;= 0)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		else</div><div class='del'>-			return num_vectors;</div><div class='add'>+	if (num_vectors == msi_config-&gt;total_vectors) {</div><div class='add'>+		set_bit(ATH11K_FLAG_MULTI_MSI_VECTORS, &amp;ab-&gt;dev_flags);</div><div class='add'>+	} else {</div><div class='add'>+		num_vectors = pci_alloc_irq_vectors(ab_pci-&gt;pdev,</div><div class='add'>+						    1,</div><div class='add'>+						    1,</div><div class='add'>+						    PCI_IRQ_MSI);</div><div class='add'>+		if (num_vectors &lt; 0) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto reset_msi_config;</div><div class='add'>+		}</div><div class='add'>+		clear_bit(ATH11K_FLAG_MULTI_MSI_VECTORS, &amp;ab-&gt;dev_flags);</div><div class='add'>+		ab-&gt;pci.msi.config = &amp;msi_config_one_msi;</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_PCI, "request one msi vector\n");</div><div class='ctx'> 	}</div><div class='add'>+	ath11k_info(ab, "MSI vectors: %d\n", num_vectors);</div><div class='add'>+</div><div class='add'>+	ath11k_pci_msi_disable(ab_pci);</div><div class='ctx'> </div><div class='ctx'> 	msi_desc = irq_get_msi_desc(ab_pci-&gt;pdev-&gt;irq);</div><div class='ctx'> 	if (!msi_desc) {</div><div class='hunk'>@@ -879,25 +470,53 @@ static int ath11k_pci_enable_msi(struct ath11k_pci *ab_pci)</div><div class='ctx'> 		goto free_msi_vector;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ab_pci-&gt;msi_ep_base_data = msi_desc-&gt;msg.data;</div><div class='del'>-	if (msi_desc-&gt;msi_attrib.is_64)</div><div class='del'>-		set_bit(ATH11K_PCI_FLAG_IS_MSI_64, &amp;ab_pci-&gt;flags);</div><div class='add'>+	ab-&gt;pci.msi.ep_base_data = msi_desc-&gt;msg.data;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_PCI, "msi base data is %d\n", ab_pci-&gt;msi_ep_base_data);</div><div class='add'>+	pci_read_config_dword(pci_dev, pci_dev-&gt;msi_cap + PCI_MSI_ADDRESS_LO,</div><div class='add'>+			      &amp;ab-&gt;pci.msi.addr_lo);</div><div class='add'>+</div><div class='add'>+	if (msi_desc-&gt;pci.msi_attrib.is_64) {</div><div class='add'>+		pci_read_config_dword(pci_dev, pci_dev-&gt;msi_cap + PCI_MSI_ADDRESS_HI,</div><div class='add'>+				      &amp;ab-&gt;pci.msi.addr_hi);</div><div class='add'>+	} else {</div><div class='add'>+		ab-&gt;pci.msi.addr_hi = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_PCI, "msi base data is %d\n", ab-&gt;pci.msi.ep_base_data);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> free_msi_vector:</div><div class='ctx'> 	pci_free_irq_vectors(ab_pci-&gt;pdev);</div><div class='ctx'> </div><div class='add'>+reset_msi_config:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath11k_pci_disable_msi(struct ath11k_pci *ab_pci)</div><div class='add'>+static void ath11k_pci_free_msi(struct ath11k_pci *ab_pci)</div><div class='ctx'> {</div><div class='ctx'> 	pci_free_irq_vectors(ab_pci-&gt;pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ath11k_pci_config_msi_data(struct ath11k_pci *ab_pci)</div><div class='add'>+{</div><div class='add'>+	struct msi_desc *msi_desc;</div><div class='add'>+</div><div class='add'>+	msi_desc = irq_get_msi_desc(ab_pci-&gt;pdev-&gt;irq);</div><div class='add'>+	if (!msi_desc) {</div><div class='add'>+		ath11k_err(ab_pci-&gt;ab, "msi_desc is NULL!\n");</div><div class='add'>+		pci_free_irq_vectors(ab_pci-&gt;pdev);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab_pci-&gt;ab-&gt;pci.msi.ep_base_data = msi_desc-&gt;msg.data;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab_pci-&gt;ab, ATH11K_DBG_PCI, "after request_irq msi_ep_base_data %d\n",</div><div class='add'>+		   ab_pci-&gt;ab-&gt;pci.msi.ep_base_data);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath11k_pci_claim(struct ath11k_pci *ab_pci, struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = ab_pci-&gt;ab;</div><div class='hunk'>@@ -930,17 +549,21 @@ static int ath11k_pci_claim(struct ath11k_pci *ab_pci, struct pci_dev *pdev)</div><div class='ctx'> 		goto disable_device;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(ATH11K_PCI_DMA_MASK));</div><div class='add'>+	ret = dma_set_mask(&amp;pdev-&gt;dev,</div><div class='add'>+			   DMA_BIT_MASK(ATH11K_PCI_DMA_MASK));</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_err(ab, "failed to set pci dma mask to %d: %d\n",</div><div class='ctx'> 			   ATH11K_PCI_DMA_MASK, ret);</div><div class='ctx'> 		goto release_region;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(ATH11K_PCI_DMA_MASK));</div><div class='add'>+	ab_pci-&gt;dma_mask = DMA_BIT_MASK(ATH11K_PCI_DMA_MASK);</div><div class='add'>+</div><div class='add'>+	ret = dma_set_coherent_mask(&amp;pdev-&gt;dev,</div><div class='add'>+				    DMA_BIT_MASK(ATH11K_PCI_COHERENT_DMA_MASK));</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ath11k_err(ab, "failed to set pci consistent dma mask to %d: %d\n",</div><div class='del'>-			   ATH11K_PCI_DMA_MASK, ret);</div><div class='add'>+		ath11k_err(ab, "failed to set pci coherent dma mask to %d: %d\n",</div><div class='add'>+			   ATH11K_PCI_COHERENT_DMA_MASK, ret);</div><div class='ctx'> 		goto release_region;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -951,14 +574,14 @@ static int ath11k_pci_claim(struct ath11k_pci *ab_pci, struct pci_dev *pdev)</div><div class='ctx'> 	if (!ab-&gt;mem) {</div><div class='ctx'> 		ath11k_err(ab, "failed to map pci bar %d\n", ATH11K_PCI_BAR_NUM);</div><div class='ctx'> 		ret = -EIO;</div><div class='del'>-		goto clear_master;</div><div class='add'>+		goto release_region;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_BOOT, "boot pci_mem 0x%pK\n", ab-&gt;mem);</div><div class='add'>+	ab-&gt;mem_ce = ab-&gt;mem;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_BOOT, "pci_mem 0x%p\n", ab-&gt;mem);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-clear_master:</div><div class='del'>-	pci_clear_master(pdev);</div><div class='ctx'> release_region:</div><div class='ctx'> 	pci_release_region(pdev, ATH11K_PCI_BAR_NUM);</div><div class='ctx'> disable_device:</div><div class='hunk'>@@ -974,7 +597,6 @@ static void ath11k_pci_free_region(struct ath11k_pci *ab_pci)</div><div class='ctx'> </div><div class='ctx'> 	pci_iounmap(pci_dev, ab-&gt;mem);</div><div class='ctx'> 	ab-&gt;mem = NULL;</div><div class='del'>-	pci_clear_master(pci_dev);</div><div class='ctx'> 	pci_release_region(pci_dev, ATH11K_PCI_BAR_NUM);</div><div class='ctx'> 	if (pci_is_enabled(pci_dev))</div><div class='ctx'> 		pci_disable_device(pci_dev);</div><div class='hunk'>@@ -987,14 +609,14 @@ static void ath11k_pci_aspm_disable(struct ath11k_pci *ab_pci)</div><div class='ctx'> 	pcie_capability_read_word(ab_pci-&gt;pdev, PCI_EXP_LNKCTL,</div><div class='ctx'> 				  &amp;ab_pci-&gt;link_ctl);</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_PCI, "pci link_ctl 0x%04x L0s %d L1 %d\n",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_PCI, "link_ctl 0x%04x L0s %d L1 %d\n",</div><div class='ctx'> 		   ab_pci-&gt;link_ctl,</div><div class='ctx'> 		   u16_get_bits(ab_pci-&gt;link_ctl, PCI_EXP_LNKCTL_ASPM_L0S),</div><div class='ctx'> 		   u16_get_bits(ab_pci-&gt;link_ctl, PCI_EXP_LNKCTL_ASPM_L1));</div><div class='ctx'> </div><div class='ctx'> 	/* disable L0s and L1 */</div><div class='del'>-	pcie_capability_write_word(ab_pci-&gt;pdev, PCI_EXP_LNKCTL,</div><div class='del'>-				   ab_pci-&gt;link_ctl &amp; ~PCI_EXP_LNKCTL_ASPMC);</div><div class='add'>+	pcie_capability_clear_word(ab_pci-&gt;pdev, PCI_EXP_LNKCTL,</div><div class='add'>+				   PCI_EXP_LNKCTL_ASPMC);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(ATH11K_PCI_ASPM_RESTORE, &amp;ab_pci-&gt;flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -1002,17 +624,200 @@ static void ath11k_pci_aspm_disable(struct ath11k_pci *ab_pci)</div><div class='ctx'> static void ath11k_pci_aspm_restore(struct ath11k_pci *ab_pci)</div><div class='ctx'> {</div><div class='ctx'> 	if (test_and_clear_bit(ATH11K_PCI_ASPM_RESTORE, &amp;ab_pci-&gt;flags))</div><div class='del'>-		pcie_capability_write_word(ab_pci-&gt;pdev, PCI_EXP_LNKCTL,</div><div class='del'>-					   ab_pci-&gt;link_ctl);</div><div class='add'>+		pcie_capability_clear_and_set_word(ab_pci-&gt;pdev, PCI_EXP_LNKCTL,</div><div class='add'>+						   PCI_EXP_LNKCTL_ASPMC,</div><div class='add'>+						   ab_pci-&gt;link_ctl &amp;</div><div class='add'>+						   PCI_EXP_LNKCTL_ASPMC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEV_COREDUMP</div><div class='add'>+static int ath11k_pci_coredump_calculate_size(struct ath11k_base *ab, u32 *dump_seg_sz)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_pci *ab_pci = ath11k_pci_priv(ab);</div><div class='add'>+	struct mhi_controller *mhi_ctrl = ab_pci-&gt;mhi_ctrl;</div><div class='add'>+	struct image_info *rddm_img, *fw_img;</div><div class='add'>+	struct ath11k_tlv_dump_data *dump_tlv;</div><div class='add'>+	enum ath11k_fw_crash_dump_type mem_type;</div><div class='add'>+	u32 len = 0, rddm_tlv_sz = 0, paging_tlv_sz = 0;</div><div class='add'>+	struct ath11k_dump_file_data *file_data;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	rddm_img = mhi_ctrl-&gt;rddm_image;</div><div class='add'>+	if (!rddm_img) {</div><div class='add'>+		ath11k_err(ab, "No RDDM dump found\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fw_img = mhi_ctrl-&gt;fbc_image;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; fw_img-&gt;entries ; i++) {</div><div class='add'>+		if (!fw_img-&gt;mhi_buf[i].buf)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		paging_tlv_sz += fw_img-&gt;mhi_buf[i].len;</div><div class='add'>+	}</div><div class='add'>+	dump_seg_sz[FW_CRASH_DUMP_PAGING_DATA] = paging_tlv_sz;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rddm_img-&gt;entries; i++) {</div><div class='add'>+		if (!rddm_img-&gt;mhi_buf[i].buf)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		rddm_tlv_sz += rddm_img-&gt;mhi_buf[i].len;</div><div class='add'>+	}</div><div class='add'>+	dump_seg_sz[FW_CRASH_DUMP_RDDM_DATA] = rddm_tlv_sz;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;qmi.mem_seg_count; i++) {</div><div class='add'>+		mem_type = ath11k_coredump_get_dump_type(ab-&gt;qmi.target_mem[i].type);</div><div class='add'>+</div><div class='add'>+		if (mem_type == FW_CRASH_DUMP_NONE)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (mem_type == FW_CRASH_DUMP_TYPE_MAX) {</div><div class='add'>+			ath11k_dbg(ab, ATH11K_DBG_PCI,</div><div class='add'>+				   "target mem region type %d not supported",</div><div class='add'>+				   ab-&gt;qmi.target_mem[i].type);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!ab-&gt;qmi.target_mem[i].anyaddr)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dump_seg_sz[mem_type] += ab-&gt;qmi.target_mem[i].size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; FW_CRASH_DUMP_TYPE_MAX; i++) {</div><div class='add'>+		if (!dump_seg_sz[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		len += sizeof(*dump_tlv) + dump_seg_sz[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len)</div><div class='add'>+		len += sizeof(*file_data);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_pci_coredump_download(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_pci *ab_pci = ath11k_pci_priv(ab);</div><div class='add'>+	struct mhi_controller *mhi_ctrl = ab_pci-&gt;mhi_ctrl;</div><div class='add'>+	struct image_info *rddm_img, *fw_img;</div><div class='add'>+	struct timespec64 timestamp;</div><div class='add'>+	int i, len, mem_idx;</div><div class='add'>+	enum ath11k_fw_crash_dump_type mem_type;</div><div class='add'>+	struct ath11k_dump_file_data *file_data;</div><div class='add'>+	struct ath11k_tlv_dump_data *dump_tlv;</div><div class='add'>+	size_t hdr_len = sizeof(*file_data);</div><div class='add'>+	void *buf;</div><div class='add'>+	u32 dump_seg_sz[FW_CRASH_DUMP_TYPE_MAX] = {};</div><div class='add'>+</div><div class='add'>+	ath11k_mhi_coredump(mhi_ctrl, false);</div><div class='add'>+</div><div class='add'>+	len = ath11k_pci_coredump_calculate_size(ab, dump_seg_sz);</div><div class='add'>+	if (!len) {</div><div class='add'>+		ath11k_warn(ab, "No crash dump data found for devcoredump");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rddm_img = mhi_ctrl-&gt;rddm_image;</div><div class='add'>+	fw_img = mhi_ctrl-&gt;fbc_image;</div><div class='add'>+</div><div class='add'>+	/* dev_coredumpv() requires vmalloc data */</div><div class='add'>+	buf = vzalloc(len);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ab-&gt;dump_data = buf;</div><div class='add'>+	ab-&gt;ath11k_coredump_len = len;</div><div class='add'>+	file_data = ab-&gt;dump_data;</div><div class='add'>+	strscpy(file_data-&gt;df_magic, "ATH11K-FW-DUMP", sizeof(file_data-&gt;df_magic));</div><div class='add'>+	file_data-&gt;len = cpu_to_le32(len);</div><div class='add'>+	file_data-&gt;version = cpu_to_le32(ATH11K_FW_CRASH_DUMP_V2);</div><div class='add'>+	file_data-&gt;chip_id = cpu_to_le32(ab_pci-&gt;dev_id);</div><div class='add'>+	file_data-&gt;qrtr_id = cpu_to_le32(ab_pci-&gt;ab-&gt;qmi.service_ins_id);</div><div class='add'>+	file_data-&gt;bus_id = cpu_to_le32(pci_domain_nr(ab_pci-&gt;pdev-&gt;bus));</div><div class='add'>+	guid_gen(&amp;file_data-&gt;guid);</div><div class='add'>+	ktime_get_real_ts64(&amp;timestamp);</div><div class='add'>+	file_data-&gt;tv_sec = cpu_to_le64(timestamp.tv_sec);</div><div class='add'>+	file_data-&gt;tv_nsec = cpu_to_le64(timestamp.tv_nsec);</div><div class='add'>+	buf += hdr_len;</div><div class='add'>+	dump_tlv = buf;</div><div class='add'>+	dump_tlv-&gt;type = cpu_to_le32(FW_CRASH_DUMP_PAGING_DATA);</div><div class='add'>+	dump_tlv-&gt;tlv_len = cpu_to_le32(dump_seg_sz[FW_CRASH_DUMP_PAGING_DATA]);</div><div class='add'>+	buf += COREDUMP_TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	/* append all segments together as they are all part of a single contiguous</div><div class='add'>+	 * block of memory</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; fw_img-&gt;entries ; i++) {</div><div class='add'>+		if (!fw_img-&gt;mhi_buf[i].buf)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		memcpy_fromio(buf, (void const __iomem *)fw_img-&gt;mhi_buf[i].buf,</div><div class='add'>+			      fw_img-&gt;mhi_buf[i].len);</div><div class='add'>+		buf += fw_img-&gt;mhi_buf[i].len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dump_tlv = buf;</div><div class='add'>+	dump_tlv-&gt;type = cpu_to_le32(FW_CRASH_DUMP_RDDM_DATA);</div><div class='add'>+	dump_tlv-&gt;tlv_len = cpu_to_le32(dump_seg_sz[FW_CRASH_DUMP_RDDM_DATA]);</div><div class='add'>+	buf += COREDUMP_TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	/* append all segments together as they are all part of a single contiguous</div><div class='add'>+	 * block of memory</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; rddm_img-&gt;entries; i++) {</div><div class='add'>+		if (!rddm_img-&gt;mhi_buf[i].buf)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		memcpy_fromio(buf, (void const __iomem *)rddm_img-&gt;mhi_buf[i].buf,</div><div class='add'>+			      rddm_img-&gt;mhi_buf[i].len);</div><div class='add'>+		buf += rddm_img-&gt;mhi_buf[i].len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mem_idx = FW_CRASH_DUMP_REMOTE_MEM_DATA;</div><div class='add'>+	for (; mem_idx &lt; FW_CRASH_DUMP_TYPE_MAX; mem_idx++) {</div><div class='add'>+		if (mem_idx == FW_CRASH_DUMP_NONE)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ab-&gt;qmi.mem_seg_count; i++) {</div><div class='add'>+			mem_type = ath11k_coredump_get_dump_type</div><div class='add'>+						(ab-&gt;qmi.target_mem[i].type);</div><div class='add'>+</div><div class='add'>+			if (mem_type != mem_idx)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (!ab-&gt;qmi.target_mem[i].anyaddr) {</div><div class='add'>+				ath11k_dbg(ab, ATH11K_DBG_PCI,</div><div class='add'>+					   "Skipping mem region type %d",</div><div class='add'>+					   ab-&gt;qmi.target_mem[i].type);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			dump_tlv = buf;</div><div class='add'>+			dump_tlv-&gt;type = cpu_to_le32(mem_idx);</div><div class='add'>+			dump_tlv-&gt;tlv_len = cpu_to_le32(dump_seg_sz[mem_idx]);</div><div class='add'>+			buf += COREDUMP_TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+			memcpy_fromio(buf, ab-&gt;qmi.target_mem[i].iaddr,</div><div class='add'>+				      ab-&gt;qmi.target_mem[i].size);</div><div class='add'>+</div><div class='add'>+			buf += ab-&gt;qmi.target_mem[i].size;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	queue_work(ab-&gt;workqueue, &amp;ab-&gt;dump_work);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int ath11k_pci_power_up(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_pci *ab_pci = ath11k_pci_priv(ab);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ab_pci-&gt;register_window = 0;</div><div class='del'>-	clear_bit(ATH11K_PCI_FLAG_INIT_DONE, &amp;ab_pci-&gt;flags);</div><div class='add'>+	clear_bit(ATH11K_FLAG_DEVICE_INIT_DONE, &amp;ab-&gt;dev_flags);</div><div class='ctx'> 	ath11k_pci_sw_reset(ab_pci-&gt;ab, true);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable ASPM during firmware download due to problems switching</div><div class='hunk'>@@ -1020,19 +825,21 @@ static int ath11k_pci_power_up(struct ath11k_base *ab)</div><div class='ctx'> 	 */</div><div class='ctx'> 	ath11k_pci_aspm_disable(ab_pci);</div><div class='ctx'> </div><div class='add'>+	ath11k_pci_msi_enable(ab_pci);</div><div class='add'>+</div><div class='ctx'> 	ret = ath11k_mhi_start(ab_pci);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_err(ab, "failed to start mhi: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ab-&gt;bus_params.static_window_map)</div><div class='add'>+	if (ab-&gt;hw_params.static_window_map)</div><div class='ctx'> 		ath11k_pci_select_static_window(ab_pci);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath11k_pci_power_down(struct ath11k_base *ab)</div><div class='add'>+static void ath11k_pci_power_down(struct ath11k_base *ab, bool is_suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_pci *ab_pci = ath11k_pci_priv(ab);</div><div class='ctx'> </div><div class='hunk'>@@ -1040,8 +847,11 @@ static void ath11k_pci_power_down(struct ath11k_base *ab)</div><div class='ctx'> 	ath11k_pci_aspm_restore(ab_pci);</div><div class='ctx'> </div><div class='ctx'> 	ath11k_pci_force_wake(ab_pci-&gt;ab);</div><div class='del'>-	ath11k_mhi_stop(ab_pci);</div><div class='del'>-	clear_bit(ATH11K_PCI_FLAG_INIT_DONE, &amp;ab_pci-&gt;flags);</div><div class='add'>+</div><div class='add'>+	ath11k_pci_msi_disable(ab_pci);</div><div class='add'>+</div><div class='add'>+	ath11k_mhi_stop(ab_pci, is_suspend);</div><div class='add'>+	clear_bit(ATH11K_FLAG_DEVICE_INIT_DONE, &amp;ab-&gt;dev_flags);</div><div class='ctx'> 	ath11k_pci_sw_reset(ab_pci-&gt;ab, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1049,143 +859,100 @@ static int ath11k_pci_hif_suspend(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_pci *ar_pci = ath11k_pci_priv(ab);</div><div class='ctx'> </div><div class='del'>-	ath11k_mhi_suspend(ar_pci);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return ath11k_mhi_suspend(ar_pci);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath11k_pci_hif_resume(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_pci *ar_pci = ath11k_pci_priv(ab);</div><div class='ctx'> </div><div class='del'>-	ath11k_mhi_resume(ar_pci);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ath11k_pci_kill_tasklets(struct ath11k_base *ab)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ab-&gt;hw_params.ce_count; i++) {</div><div class='del'>-		struct ath11k_ce_pipe *ce_pipe = &amp;ab-&gt;ce.ce_pipe[i];</div><div class='del'>-</div><div class='del'>-		if (ath11k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		tasklet_kill(&amp;ce_pipe-&gt;intr_tq);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ath11k_pci_ce_irq_disable_sync(struct ath11k_base *ab)</div><div class='del'>-{</div><div class='del'>-	ath11k_pci_ce_irqs_disable(ab);</div><div class='del'>-	ath11k_pci_sync_ce_irqs(ab);</div><div class='del'>-	ath11k_pci_kill_tasklets(ab);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ath11k_pci_stop(struct ath11k_base *ab)</div><div class='del'>-{</div><div class='del'>-	ath11k_pci_ce_irq_disable_sync(ab);</div><div class='del'>-	ath11k_ce_cleanup_pipes(ab);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ath11k_pci_start(struct ath11k_base *ab)</div><div class='del'>-{</div><div class='del'>-	struct ath11k_pci *ab_pci = ath11k_pci_priv(ab);</div><div class='del'>-</div><div class='del'>-	set_bit(ATH11K_PCI_FLAG_INIT_DONE, &amp;ab_pci-&gt;flags);</div><div class='del'>-</div><div class='del'>-	ath11k_pci_aspm_restore(ab_pci);</div><div class='del'>-</div><div class='del'>-	ath11k_pci_ce_irqs_enable(ab);</div><div class='del'>-	ath11k_ce_rx_post_buf(ab);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return ath11k_mhi_resume(ar_pci);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_pci_hif_ce_irq_enable(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='del'>-	ath11k_pci_ce_irqs_enable(ab);</div><div class='add'>+	ath11k_pcic_ce_irqs_enable(ab);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_pci_hif_ce_irq_disable(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='del'>-	ath11k_pci_ce_irq_disable_sync(ab);</div><div class='add'>+	ath11k_pcic_ce_irq_disable_sync(ab);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_pci_map_service_to_pipe(struct ath11k_base *ab, u16 service_id,</div><div class='del'>-					  u8 *ul_pipe, u8 *dl_pipe)</div><div class='add'>+static int ath11k_pci_start(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='del'>-	const struct service_to_pipe *entry;</div><div class='del'>-	bool ul_set = false, dl_set = false;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ab-&gt;hw_params.svc_to_ce_map_len; i++) {</div><div class='del'>-		entry = &amp;ab-&gt;hw_params.svc_to_ce_map[i];</div><div class='del'>-</div><div class='del'>-		if (__le32_to_cpu(entry-&gt;service_id) != service_id)</div><div class='del'>-			continue;</div><div class='add'>+	struct ath11k_pci *ab_pci = ath11k_pci_priv(ab);</div><div class='ctx'> </div><div class='del'>-		switch (__le32_to_cpu(entry-&gt;pipedir)) {</div><div class='del'>-		case PIPEDIR_NONE:</div><div class='del'>-			break;</div><div class='del'>-		case PIPEDIR_IN:</div><div class='del'>-			WARN_ON(dl_set);</div><div class='del'>-			*dl_pipe = __le32_to_cpu(entry-&gt;pipenum);</div><div class='del'>-			dl_set = true;</div><div class='del'>-			break;</div><div class='del'>-		case PIPEDIR_OUT:</div><div class='del'>-			WARN_ON(ul_set);</div><div class='del'>-			*ul_pipe = __le32_to_cpu(entry-&gt;pipenum);</div><div class='del'>-			ul_set = true;</div><div class='del'>-			break;</div><div class='del'>-		case PIPEDIR_INOUT:</div><div class='del'>-			WARN_ON(dl_set);</div><div class='del'>-			WARN_ON(ul_set);</div><div class='del'>-			*dl_pipe = __le32_to_cpu(entry-&gt;pipenum);</div><div class='del'>-			*ul_pipe = __le32_to_cpu(entry-&gt;pipenum);</div><div class='del'>-			dl_set = true;</div><div class='del'>-			ul_set = true;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	/* TODO: for now don't restore ASPM in case of single MSI</div><div class='add'>+	 * vector as MHI register reading in M2 causes system hang.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(ATH11K_FLAG_MULTI_MSI_VECTORS, &amp;ab-&gt;dev_flags))</div><div class='add'>+		ath11k_pci_aspm_restore(ab_pci);</div><div class='add'>+	else</div><div class='add'>+		ath11k_info(ab, "leaving PCI ASPM disabled to avoid MHI M2 problems\n");</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(!ul_set || !dl_set))</div><div class='del'>-		return -ENOENT;</div><div class='add'>+	ath11k_pcic_start(ab);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ath11k_hif_ops ath11k_pci_hif_ops = {</div><div class='ctx'> 	.start = ath11k_pci_start,</div><div class='del'>-	.stop = ath11k_pci_stop,</div><div class='del'>-	.read32 = ath11k_pci_read32,</div><div class='del'>-	.write32 = ath11k_pci_write32,</div><div class='add'>+	.stop = ath11k_pcic_stop,</div><div class='add'>+	.read32 = ath11k_pcic_read32,</div><div class='add'>+	.write32 = ath11k_pcic_write32,</div><div class='add'>+	.read = ath11k_pcic_read,</div><div class='ctx'> 	.power_down = ath11k_pci_power_down,</div><div class='ctx'> 	.power_up = ath11k_pci_power_up,</div><div class='ctx'> 	.suspend = ath11k_pci_hif_suspend,</div><div class='ctx'> 	.resume = ath11k_pci_hif_resume,</div><div class='del'>-	.irq_enable = ath11k_pci_ext_irq_enable,</div><div class='del'>-	.irq_disable = ath11k_pci_ext_irq_disable,</div><div class='del'>-	.get_msi_address =  ath11k_pci_get_msi_address,</div><div class='del'>-	.get_user_msi_vector = ath11k_get_user_msi_assignment,</div><div class='del'>-	.map_service_to_pipe = ath11k_pci_map_service_to_pipe,</div><div class='add'>+	.irq_enable = ath11k_pcic_ext_irq_enable,</div><div class='add'>+	.irq_disable = ath11k_pcic_ext_irq_disable,</div><div class='add'>+	.get_msi_address =  ath11k_pcic_get_msi_address,</div><div class='add'>+	.get_user_msi_vector = ath11k_pcic_get_user_msi_assignment,</div><div class='add'>+	.map_service_to_pipe = ath11k_pcic_map_service_to_pipe,</div><div class='ctx'> 	.ce_irq_enable = ath11k_pci_hif_ce_irq_enable,</div><div class='ctx'> 	.ce_irq_disable = ath11k_pci_hif_ce_irq_disable,</div><div class='del'>-	.get_ce_msi_idx = ath11k_pci_get_ce_msi_idx,</div><div class='add'>+	.get_ce_msi_idx = ath11k_pcic_get_ce_msi_idx,</div><div class='add'>+#ifdef CONFIG_DEV_COREDUMP</div><div class='add'>+	.coredump_download = ath11k_pci_coredump_download,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void ath11k_pci_read_hw_version(struct ath11k_base *ab, u32 *major, u32 *minor)</div><div class='add'>+{</div><div class='add'>+	u32 soc_hw_version;</div><div class='add'>+</div><div class='add'>+	soc_hw_version = ath11k_pcic_read32(ab, TCSR_SOC_HW_VERSION);</div><div class='add'>+	*major = FIELD_GET(TCSR_SOC_HW_VERSION_MAJOR_MASK,</div><div class='add'>+			   soc_hw_version);</div><div class='add'>+	*minor = FIELD_GET(TCSR_SOC_HW_VERSION_MINOR_MASK,</div><div class='add'>+			   soc_hw_version);</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_PCI, "tcsr_soc_hw_version major %d minor %d\n",</div><div class='add'>+		   *major, *minor);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_pci_set_irq_affinity_hint(struct ath11k_pci *ab_pci,</div><div class='add'>+					    const struct cpumask *m)</div><div class='add'>+{</div><div class='add'>+	if (test_bit(ATH11K_FLAG_MULTI_MSI_VECTORS, &amp;ab_pci-&gt;ab-&gt;dev_flags))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return irq_set_affinity_and_hint(ab_pci-&gt;pdev-&gt;irq, m);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath11k_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 			    const struct pci_device_id *pci_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab;</div><div class='ctx'> 	struct ath11k_pci *ab_pci;</div><div class='del'>-	u32 soc_hw_version, soc_hw_version_major, soc_hw_version_minor;</div><div class='add'>+	u32 soc_hw_version_major, soc_hw_version_minor;</div><div class='ctx'> 	int ret;</div><div class='add'>+	u32 sub_version;</div><div class='add'>+</div><div class='add'>+	ab = ath11k_core_alloc(&amp;pdev-&gt;dev, sizeof(*ab_pci), ATH11K_BUS_PCI);</div><div class='ctx'> </div><div class='del'>-	ab = ath11k_core_alloc(&amp;pdev-&gt;dev, sizeof(*ab_pci), ATH11K_BUS_PCI,</div><div class='del'>-			       &amp;ath11k_pci_bus_params);</div><div class='ctx'> 	if (!ab) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to allocate ath11k base\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -1198,26 +965,42 @@ static int ath11k_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	ab_pci-&gt;ab = ab;</div><div class='ctx'> 	ab_pci-&gt;pdev = pdev;</div><div class='ctx'> 	ab-&gt;hif.ops = &amp;ath11k_pci_hif_ops;</div><div class='add'>+	ab-&gt;fw_mode = ATH11K_FIRMWARE_MODE_NORMAL;</div><div class='ctx'> 	pci_set_drvdata(pdev, ab);</div><div class='ctx'> 	spin_lock_init(&amp;ab_pci-&gt;window_lock);</div><div class='ctx'> </div><div class='add'>+	/* Set fixed_mem_region to true for platforms support reserved memory</div><div class='add'>+	 * from DT. If memory is reserved from DT for FW, ath11k driver need not</div><div class='add'>+	 * allocate memory.</div><div class='add'>+	 */</div><div class='add'>+	if (of_property_present(ab-&gt;dev-&gt;of_node, "memory-region"))</div><div class='add'>+		set_bit(ATH11K_FLAG_FIXED_MEM_RGN, &amp;ab-&gt;dev_flags);</div><div class='add'>+</div><div class='ctx'> 	ret = ath11k_pci_claim(ab_pci, pdev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_err(ab, "failed to claim device: %d\n", ret);</div><div class='ctx'> 		goto err_free_core;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_BOOT, "pci probe %04x:%04x %04x:%04x\n",</div><div class='add'>+		   pdev-&gt;vendor, pdev-&gt;device,</div><div class='add'>+		   pdev-&gt;subsystem_vendor, pdev-&gt;subsystem_device);</div><div class='add'>+</div><div class='add'>+	ab-&gt;id.vendor = pdev-&gt;vendor;</div><div class='add'>+	ab-&gt;id.device = pdev-&gt;device;</div><div class='add'>+	ab-&gt;id.subsystem_vendor = pdev-&gt;subsystem_vendor;</div><div class='add'>+	ab-&gt;id.subsystem_device = pdev-&gt;subsystem_device;</div><div class='add'>+</div><div class='ctx'> 	switch (pci_dev-&gt;device) {</div><div class='ctx'> 	case QCA6390_DEVICE_ID:</div><div class='del'>-		soc_hw_version = ath11k_pci_read32(ab, TCSR_SOC_HW_VERSION);</div><div class='del'>-		soc_hw_version_major = FIELD_GET(TCSR_SOC_HW_VERSION_MAJOR_MASK,</div><div class='del'>-						 soc_hw_version);</div><div class='del'>-		soc_hw_version_minor = FIELD_GET(TCSR_SOC_HW_VERSION_MINOR_MASK,</div><div class='del'>-						 soc_hw_version);</div><div class='del'>-</div><div class='del'>-		ath11k_dbg(ab, ATH11K_DBG_PCI, "pci tcsr_soc_hw_version major %d minor %d\n",</div><div class='del'>-			   soc_hw_version_major, soc_hw_version_minor);</div><div class='add'>+		ret = ath11k_pcic_register_pci_ops(ab, &amp;ath11k_pci_ops_qca6390);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_err(ab, "failed to register PCI ops: %d\n", ret);</div><div class='add'>+			goto err_pci_free_region;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='add'>+		ath11k_pci_read_hw_version(ab, &amp;soc_hw_version_major,</div><div class='add'>+					   &amp;soc_hw_version_minor);</div><div class='ctx'> 		switch (soc_hw_version_major) {</div><div class='ctx'> 		case 2:</div><div class='ctx'> 			ab-&gt;hw_rev = ATH11K_HW_QCA6390_HW20;</div><div class='hunk'>@@ -1228,13 +1011,64 @@ static int ath11k_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 			ret = -EOPNOTSUPP;</div><div class='ctx'> 			goto err_pci_free_region;</div><div class='ctx'> 		}</div><div class='del'>-		ab_pci-&gt;msi_config = &amp;ath11k_msi_config[0];</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='ctx'> 	case QCN9074_DEVICE_ID:</div><div class='del'>-		ab_pci-&gt;msi_config = &amp;ath11k_msi_config[1];</div><div class='del'>-		ab-&gt;bus_params.static_window_map = true;</div><div class='add'>+		ret = ath11k_pcic_register_pci_ops(ab, &amp;ath11k_pci_ops_qcn9074);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_err(ab, "failed to register PCI ops: %d\n", ret);</div><div class='add'>+			goto err_pci_free_region;</div><div class='add'>+		}</div><div class='ctx'> 		ab-&gt;hw_rev = ATH11K_HW_QCN9074_HW10;</div><div class='ctx'> 		break;</div><div class='add'>+	case WCN6855_DEVICE_ID:</div><div class='add'>+		ret = ath11k_pcic_register_pci_ops(ab, &amp;ath11k_pci_ops_qca6390);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_err(ab, "failed to register PCI ops: %d\n", ret);</div><div class='add'>+			goto err_pci_free_region;</div><div class='add'>+		}</div><div class='add'>+		ab-&gt;id.bdf_search = ATH11K_BDF_SEARCH_BUS_AND_BOARD;</div><div class='add'>+		ath11k_pci_read_hw_version(ab, &amp;soc_hw_version_major,</div><div class='add'>+					   &amp;soc_hw_version_minor);</div><div class='add'>+		switch (soc_hw_version_major) {</div><div class='add'>+		case 2:</div><div class='add'>+			switch (soc_hw_version_minor) {</div><div class='add'>+			case 0x00:</div><div class='add'>+			case 0x01:</div><div class='add'>+				ab-&gt;hw_rev = ATH11K_HW_WCN6855_HW20;</div><div class='add'>+				break;</div><div class='add'>+			case 0x10:</div><div class='add'>+			case 0x11:</div><div class='add'>+				sub_version = ath11k_pcic_read32(ab, TCSR_SOC_HW_SUB_VER);</div><div class='add'>+				ath11k_dbg(ab, ATH11K_DBG_PCI, "sub_version 0x%x\n",</div><div class='add'>+					   sub_version);</div><div class='add'>+				switch (sub_version) {</div><div class='add'>+				case 0x1019A0E1:</div><div class='add'>+				case 0x1019B0E1:</div><div class='add'>+				case 0x1019C0E1:</div><div class='add'>+				case 0x1019D0E1:</div><div class='add'>+					ab-&gt;hw_rev = ATH11K_HW_QCA2066_HW21;</div><div class='add'>+					break;</div><div class='add'>+				case 0x001e60e1:</div><div class='add'>+					ab-&gt;hw_rev = ATH11K_HW_QCA6698AQ_HW21;</div><div class='add'>+					break;</div><div class='add'>+				default:</div><div class='add'>+					ab-&gt;hw_rev = ATH11K_HW_WCN6855_HW21;</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				goto unsupported_wcn6855_soc;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+unsupported_wcn6855_soc:</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "Unsupported WCN6855 SOC hardware version: %d %d\n",</div><div class='add'>+				soc_hw_version_major, soc_hw_version_minor);</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='add'>+			goto err_pci_free_region;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Unknown PCI device found: 0x%x\n",</div><div class='ctx'> 			pci_dev-&gt;device);</div><div class='hunk'>@@ -1242,7 +1076,13 @@ static int ath11k_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 		goto err_pci_free_region;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_pci_enable_msi(ab_pci);</div><div class='add'>+	ret = ath11k_pcic_init_msi_config(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_err(ab, "failed to init msi config: %d\n", ret);</div><div class='add'>+		goto err_pci_free_region;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_pci_alloc_msi(ab_pci);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_err(ab, "failed to enable msi: %d\n", ret);</div><div class='ctx'> 		goto err_pci_free_region;</div><div class='hunk'>@@ -1252,10 +1092,16 @@ static int ath11k_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_pci_disable_msi;</div><div class='ctx'> </div><div class='add'>+	ret = ath11k_pci_set_irq_affinity_hint(ab_pci, cpumask_of(0));</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_err(ab, "failed to set irq affinity %d\n", ret);</div><div class='add'>+		goto err_pci_disable_msi;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = ath11k_mhi_register(ab_pci);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_err(ab, "failed to register mhi: %d\n", ret);</div><div class='del'>-		goto err_pci_disable_msi;</div><div class='add'>+		goto err_irq_affinity_cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_hal_srng_init(ab);</div><div class='hunk'>@@ -1270,21 +1116,35 @@ static int ath11k_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	ath11k_pci_init_qmi_ce_config(ab);</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_pci_config_irq(ab);</div><div class='add'>+	ret = ath11k_pcic_config_irq(ab);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_err(ab, "failed to config irq: %d\n", ret);</div><div class='ctx'> 		goto err_ce_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* kernel may allocate a dummy vector before request_irq and</div><div class='add'>+	 * then allocate a real vector when request_irq is called.</div><div class='add'>+	 * So get msi_data here again to avoid spurious interrupt</div><div class='add'>+	 * as msi_data will configured to srngs.</div><div class='add'>+	 */</div><div class='add'>+	ret = ath11k_pci_config_msi_data(ab_pci);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_err(ab, "failed to config msi_data: %d\n", ret);</div><div class='add'>+		goto err_free_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = ath11k_core_init(ab);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_err(ab, "failed to init core: %d\n", ret);</div><div class='ctx'> 		goto err_free_irq;</div><div class='ctx'> 	}</div><div class='add'>+	ath11k_qmi_fwreset_from_cold_boot(ab);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_free_irq:</div><div class='del'>-	ath11k_pci_free_irq(ab);</div><div class='add'>+	/* __free_irq() expects the caller to have cleared the affinity hint */</div><div class='add'>+	ath11k_pci_set_irq_affinity_hint(ab_pci, NULL);</div><div class='add'>+	ath11k_pcic_free_irq(ab);</div><div class='ctx'> </div><div class='ctx'> err_ce_free:</div><div class='ctx'> 	ath11k_ce_free_pipes(ab);</div><div class='hunk'>@@ -1295,8 +1155,11 @@ err_hal_srng_deinit:</div><div class='ctx'> err_mhi_unregister:</div><div class='ctx'> 	ath11k_mhi_unregister(ab_pci);</div><div class='ctx'> </div><div class='add'>+err_irq_affinity_cleanup:</div><div class='add'>+	ath11k_pci_set_irq_affinity_hint(ab_pci, NULL);</div><div class='add'>+</div><div class='ctx'> err_pci_disable_msi:</div><div class='del'>-	ath11k_pci_disable_msi(ab_pci);</div><div class='add'>+	ath11k_pci_free_msi(ab_pci);</div><div class='ctx'> </div><div class='ctx'> err_pci_free_region:</div><div class='ctx'> 	ath11k_pci_free_region(ab_pci);</div><div class='hunk'>@@ -1312,22 +1175,28 @@ static void ath11k_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> 	struct ath11k_base *ab = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct ath11k_pci *ab_pci = ath11k_pci_priv(ab);</div><div class='ctx'> </div><div class='add'>+	ath11k_pci_set_irq_affinity_hint(ab_pci, NULL);</div><div class='add'>+</div><div class='ctx'> 	if (test_bit(ATH11K_FLAG_QMI_FAIL, &amp;ab-&gt;dev_flags)) {</div><div class='del'>-		ath11k_pci_power_down(ab);</div><div class='add'>+		ath11k_pci_power_down(ab, false);</div><div class='ctx'> 		ath11k_debugfs_soc_destroy(ab);</div><div class='ctx'> 		ath11k_qmi_deinit_service(ab);</div><div class='add'>+		ath11k_core_pm_notifier_unregister(ab);</div><div class='ctx'> 		goto qmi_fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	set_bit(ATH11K_FLAG_UNREGISTERING, &amp;ab-&gt;dev_flags);</div><div class='ctx'> </div><div class='add'>+	cancel_work_sync(&amp;ab-&gt;reset_work);</div><div class='add'>+	cancel_work_sync(&amp;ab-&gt;dump_work);</div><div class='ctx'> 	ath11k_core_deinit(ab);</div><div class='ctx'> </div><div class='ctx'> qmi_fail:</div><div class='add'>+	ath11k_fw_destroy(ab);</div><div class='ctx'> 	ath11k_mhi_unregister(ab_pci);</div><div class='ctx'> </div><div class='del'>-	ath11k_pci_free_irq(ab);</div><div class='del'>-	ath11k_pci_disable_msi(ab_pci);</div><div class='add'>+	ath11k_pcic_free_irq(ab);</div><div class='add'>+	ath11k_pci_free_msi(ab_pci);</div><div class='ctx'> 	ath11k_pci_free_region(ab_pci);</div><div class='ctx'> </div><div class='ctx'> 	ath11k_hal_srng_deinit(ab);</div><div class='hunk'>@@ -1338,8 +1207,10 @@ qmi_fail:</div><div class='ctx'> static void ath11k_pci_shutdown(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = pci_get_drvdata(pdev);</div><div class='add'>+	struct ath11k_pci *ab_pci = ath11k_pci_priv(ab);</div><div class='ctx'> </div><div class='del'>-	ath11k_pci_power_down(ab);</div><div class='add'>+	ath11k_pci_set_irq_affinity_hint(ab_pci, NULL);</div><div class='add'>+	ath11k_pci_power_down(ab, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __maybe_unused int ath11k_pci_pm_suspend(struct device *dev)</div><div class='hunk'>@@ -1347,11 +1218,16 @@ static __maybe_unused int ath11k_pci_pm_suspend(struct device *dev)</div><div class='ctx'> 	struct ath11k_base *ab = dev_get_drvdata(dev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (test_bit(ATH11K_FLAG_QMI_FAIL, &amp;ab-&gt;dev_flags)) {</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_BOOT, "boot skipping pci suspend as qmi is not initialised\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = ath11k_core_suspend(ab);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		ath11k_warn(ab, "failed to suspend core: %d\n", ret);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __maybe_unused int ath11k_pci_pm_resume(struct device *dev)</div><div class='hunk'>@@ -1359,6 +1235,11 @@ static __maybe_unused int ath11k_pci_pm_resume(struct device *dev)</div><div class='ctx'> 	struct ath11k_base *ab = dev_get_drvdata(dev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (test_bit(ATH11K_FLAG_QMI_FAIL, &amp;ab-&gt;dev_flags)) {</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_BOOT, "boot skipping pci resume as qmi is not initialised\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = ath11k_core_resume(ab);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		ath11k_warn(ab, "failed to resume core: %d\n", ret);</div><div class='hunk'>@@ -1366,9 +1247,39 @@ static __maybe_unused int ath11k_pci_pm_resume(struct device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SIMPLE_DEV_PM_OPS(ath11k_pci_pm_ops,</div><div class='del'>-			 ath11k_pci_pm_suspend,</div><div class='del'>-			 ath11k_pci_pm_resume);</div><div class='add'>+static __maybe_unused int ath11k_pci_pm_suspend_late(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = dev_get_drvdata(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_core_suspend_late(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath11k_warn(ab, "failed to late suspend core: %d\n", ret);</div><div class='add'>+</div><div class='add'>+	/* Similar to ath11k_pci_pm_suspend(), we return success here</div><div class='add'>+	 * even error happens, to allow system suspend/hibernation survive.</div><div class='add'>+	 */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __maybe_unused int ath11k_pci_pm_resume_early(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = dev_get_drvdata(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_core_resume_early(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath11k_warn(ab, "failed to early resume core: %d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops __maybe_unused ath11k_pci_pm_ops = {</div><div class='add'>+	SET_SYSTEM_SLEEP_PM_OPS(ath11k_pci_pm_suspend,</div><div class='add'>+				ath11k_pci_pm_resume)</div><div class='add'>+	SET_LATE_SYSTEM_SLEEP_PM_OPS(ath11k_pci_pm_suspend_late,</div><div class='add'>+				     ath11k_pci_pm_resume_early)</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver ath11k_pci_driver = {</div><div class='ctx'> 	.name = "ath11k_pci",</div><div class='hunk'>@@ -1401,10 +1312,11 @@ static void ath11k_pci_exit(void)</div><div class='ctx'> </div><div class='ctx'> module_exit(ath11k_pci_exit);</div><div class='ctx'> </div><div class='del'>-MODULE_DESCRIPTION("Driver support for Qualcomm Technologies 802.11ax WLAN PCIe devices");</div><div class='add'>+MODULE_DESCRIPTION("Driver support for Qualcomm Technologies PCIe 802.11ax WLAN devices");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> </div><div class='del'>-/* QCA639x 2.0 firmware files */</div><div class='del'>-MODULE_FIRMWARE(ATH11K_FW_DIR "/QCA6390/hw2.0/" ATH11K_BOARD_API2_FILE);</div><div class='del'>-MODULE_FIRMWARE(ATH11K_FW_DIR "/QCA6390/hw2.0/" ATH11K_AMSS_FILE);</div><div class='del'>-MODULE_FIRMWARE(ATH11K_FW_DIR "/QCA6390/hw2.0/" ATH11K_M3_FILE);</div><div class='add'>+/* firmware files */</div><div class='add'>+MODULE_FIRMWARE(ATH11K_FW_DIR "/QCA6390/hw2.0/*");</div><div class='add'>+MODULE_FIRMWARE(ATH11K_FW_DIR "/QCN9074/hw1.0/*");</div><div class='add'>+MODULE_FIRMWARE(ATH11K_FW_DIR "/WCN6855/hw2.0/*");</div><div class='add'>+MODULE_FIRMWARE(ATH11K_FW_DIR "/WCN6855/hw2.1/*");</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/pci.h b/drivers/net/wireless/ath/ath11k/pci.h<br/>index f3e645891d19..1e3005a4b64c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/pci.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/pci.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/pci.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/pci.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef _ATH11K_PCI_H</div><div class='ctx'> #define _ATH11K_PCI_H</div><div class='hunk'>@@ -34,39 +35,25 @@</div><div class='ctx'> #define PCIE_SMLH_REQ_RST_LINK_DOWN		0x2</div><div class='ctx'> #define PCIE_INT_CLEAR_ALL			0xffffffff</div><div class='ctx'> </div><div class='del'>-#define PCIE_QSERDES_COM_SYSCLK_EN_SEL_REG(x) \</div><div class='del'>-		(ab-&gt;hw_params.regs-&gt;pcie_qserdes_sysclk_en_sel)</div><div class='add'>+#define PCIE_QSERDES_COM_SYSCLK_EN_SEL_REG(ab) \</div><div class='add'>+		((ab)-&gt;hw_params.regs-&gt;pcie_qserdes_sysclk_en_sel)</div><div class='ctx'> #define PCIE_QSERDES_COM_SYSCLK_EN_SEL_VAL	0x10</div><div class='ctx'> #define PCIE_QSERDES_COM_SYSCLK_EN_SEL_MSK	0xffffffff</div><div class='del'>-#define PCIE_PCS_OSC_DTCT_CONFIG1_REG(x) \</div><div class='del'>-		(ab-&gt;hw_params.regs-&gt;pcie_pcs_osc_dtct_config_base)</div><div class='add'>+#define PCIE_PCS_OSC_DTCT_CONFIG1_REG(ab) \</div><div class='add'>+		((ab)-&gt;hw_params.regs-&gt;pcie_pcs_osc_dtct_config_base)</div><div class='ctx'> #define PCIE_PCS_OSC_DTCT_CONFIG1_VAL		0x02</div><div class='del'>-#define PCIE_PCS_OSC_DTCT_CONFIG2_REG(x) \</div><div class='del'>-		(ab-&gt;hw_params.regs-&gt;pcie_pcs_osc_dtct_config_base + 0x4)</div><div class='add'>+#define PCIE_PCS_OSC_DTCT_CONFIG2_REG(ab) \</div><div class='add'>+		((ab)-&gt;hw_params.regs-&gt;pcie_pcs_osc_dtct_config_base + 0x4)</div><div class='ctx'> #define PCIE_PCS_OSC_DTCT_CONFIG2_VAL		0x52</div><div class='del'>-#define PCIE_PCS_OSC_DTCT_CONFIG4_REG(x) \</div><div class='del'>-		(ab-&gt;hw_params.regs-&gt;pcie_pcs_osc_dtct_config_base + 0xc)</div><div class='add'>+#define PCIE_PCS_OSC_DTCT_CONFIG4_REG(ab) \</div><div class='add'>+		((ab)-&gt;hw_params.regs-&gt;pcie_pcs_osc_dtct_config_base + 0xc)</div><div class='ctx'> #define PCIE_PCS_OSC_DTCT_CONFIG4_VAL		0xff</div><div class='ctx'> #define PCIE_PCS_OSC_DTCT_CONFIG_MSK		0x000000ff</div><div class='ctx'> </div><div class='ctx'> #define WLAON_QFPROM_PWR_CTRL_REG		0x01f8031c</div><div class='ctx'> #define QFPROM_PWR_CTRL_VDD4BLOW_MASK		0x4</div><div class='ctx'> </div><div class='del'>-struct ath11k_msi_user {</div><div class='del'>-	char *name;</div><div class='del'>-	int num_vectors;</div><div class='del'>-	u32 base_vector;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ath11k_msi_config {</div><div class='del'>-	int total_vectors;</div><div class='del'>-	int total_users;</div><div class='del'>-	struct ath11k_msi_user *users;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> enum ath11k_pci_flags {</div><div class='del'>-	ATH11K_PCI_FLAG_INIT_DONE,</div><div class='del'>-	ATH11K_PCI_FLAG_IS_MSI_64,</div><div class='ctx'> 	ATH11K_PCI_ASPM_RESTORE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -75,10 +62,9 @@ struct ath11k_pci {</div><div class='ctx'> 	struct ath11k_base *ab;</div><div class='ctx'> 	u16 dev_id;</div><div class='ctx'> 	char amss_path[100];</div><div class='del'>-	u32 msi_ep_base_data;</div><div class='ctx'> 	struct mhi_controller *mhi_ctrl;</div><div class='ctx'> 	const struct ath11k_msi_config *msi_config;</div><div class='del'>-	unsigned long mhi_state;</div><div class='add'>+	enum mhi_callback mhi_pre_cb;</div><div class='ctx'> 	u32 register_window;</div><div class='ctx'> </div><div class='ctx'> 	/* protects register_window above */</div><div class='hunk'>@@ -87,6 +73,7 @@ struct ath11k_pci {</div><div class='ctx'> 	/* enum ath11k_pci_flags */</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u16 link_ctl;</div><div class='add'>+	u64 dma_mask;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct ath11k_pci *ath11k_pci_priv(struct ath11k_base *ab)</div><div class='hunk'>@@ -94,11 +81,5 @@ static inline struct ath11k_pci *ath11k_pci_priv(struct ath11k_base *ab)</div><div class='ctx'> 	return (struct ath11k_pci *)ab-&gt;drv_priv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath11k_pci_get_user_msi_assignment(struct ath11k_pci *ar_pci, char *user_name,</div><div class='del'>-				       int *num_vectors, u32 *user_base_data,</div><div class='del'>-				       u32 *base_vector);</div><div class='del'>-int ath11k_pci_get_msi_irq(struct device *dev, unsigned int vector);</div><div class='del'>-void ath11k_pci_write32(struct ath11k_base *ab, u32 offset, u32 value);</div><div class='del'>-u32 ath11k_pci_read32(struct ath11k_base *ab, u32 offset);</div><div class='del'>-</div><div class='add'>+int ath11k_pci_get_msi_irq(struct ath11k_base *ab, unsigned int vector);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/pcic.c b/drivers/net/wireless/ath/ath11k/pcic.c<br/>new file mode 100644<br/>index 000000000000..fc6e7da05c60<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/pcic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/pcic.c</a></div><div class='hunk'>@@ -0,0 +1,865 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "pcic.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+static const char *irq_name[ATH11K_IRQ_NUM_MAX] = {</div><div class='add'>+	"bhi",</div><div class='add'>+	"mhi-er0",</div><div class='add'>+	"mhi-er1",</div><div class='add'>+	"ce0",</div><div class='add'>+	"ce1",</div><div class='add'>+	"ce2",</div><div class='add'>+	"ce3",</div><div class='add'>+	"ce4",</div><div class='add'>+	"ce5",</div><div class='add'>+	"ce6",</div><div class='add'>+	"ce7",</div><div class='add'>+	"ce8",</div><div class='add'>+	"ce9",</div><div class='add'>+	"ce10",</div><div class='add'>+	"ce11",</div><div class='add'>+	"host2wbm-desc-feed",</div><div class='add'>+	"host2reo-re-injection",</div><div class='add'>+	"host2reo-command",</div><div class='add'>+	"host2rxdma-monitor-ring3",</div><div class='add'>+	"host2rxdma-monitor-ring2",</div><div class='add'>+	"host2rxdma-monitor-ring1",</div><div class='add'>+	"reo2ost-exception",</div><div class='add'>+	"wbm2host-rx-release",</div><div class='add'>+	"reo2host-status",</div><div class='add'>+	"reo2host-destination-ring4",</div><div class='add'>+	"reo2host-destination-ring3",</div><div class='add'>+	"reo2host-destination-ring2",</div><div class='add'>+	"reo2host-destination-ring1",</div><div class='add'>+	"rxdma2host-monitor-destination-mac3",</div><div class='add'>+	"rxdma2host-monitor-destination-mac2",</div><div class='add'>+	"rxdma2host-monitor-destination-mac1",</div><div class='add'>+	"ppdu-end-interrupts-mac3",</div><div class='add'>+	"ppdu-end-interrupts-mac2",</div><div class='add'>+	"ppdu-end-interrupts-mac1",</div><div class='add'>+	"rxdma2host-monitor-status-ring-mac3",</div><div class='add'>+	"rxdma2host-monitor-status-ring-mac2",</div><div class='add'>+	"rxdma2host-monitor-status-ring-mac1",</div><div class='add'>+	"host2rxdma-host-buf-ring-mac3",</div><div class='add'>+	"host2rxdma-host-buf-ring-mac2",</div><div class='add'>+	"host2rxdma-host-buf-ring-mac1",</div><div class='add'>+	"rxdma2host-destination-ring-mac3",</div><div class='add'>+	"rxdma2host-destination-ring-mac2",</div><div class='add'>+	"rxdma2host-destination-ring-mac1",</div><div class='add'>+	"host2tcl-input-ring4",</div><div class='add'>+	"host2tcl-input-ring3",</div><div class='add'>+	"host2tcl-input-ring2",</div><div class='add'>+	"host2tcl-input-ring1",</div><div class='add'>+	"wbm2host-tx-completions-ring3",</div><div class='add'>+	"wbm2host-tx-completions-ring2",</div><div class='add'>+	"wbm2host-tx-completions-ring1",</div><div class='add'>+	"tcl2host-status-ring",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ath11k_msi_config ath11k_msi_config[] = {</div><div class='add'>+	{</div><div class='add'>+		.total_vectors = 32,</div><div class='add'>+		.total_users = 4,</div><div class='add'>+		.users = (struct ath11k_msi_user[]) {</div><div class='add'>+			{ .name = "MHI", .num_vectors = 3, .base_vector = 0 },</div><div class='add'>+			{ .name = "CE", .num_vectors = 10, .base_vector = 3 },</div><div class='add'>+			{ .name = "WAKE", .num_vectors = 1, .base_vector = 13 },</div><div class='add'>+			{ .name = "DP", .num_vectors = 18, .base_vector = 14 },</div><div class='add'>+		},</div><div class='add'>+		.hw_rev = ATH11K_HW_QCA6390_HW20,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.total_vectors = 16,</div><div class='add'>+		.total_users = 3,</div><div class='add'>+		.users = (struct ath11k_msi_user[]) {</div><div class='add'>+			{ .name = "MHI", .num_vectors = 3, .base_vector = 0 },</div><div class='add'>+			{ .name = "CE", .num_vectors = 5, .base_vector = 3 },</div><div class='add'>+			{ .name = "DP", .num_vectors = 8, .base_vector = 8 },</div><div class='add'>+		},</div><div class='add'>+		.hw_rev = ATH11K_HW_QCN9074_HW10,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.total_vectors = 32,</div><div class='add'>+		.total_users = 4,</div><div class='add'>+		.users = (struct ath11k_msi_user[]) {</div><div class='add'>+			{ .name = "MHI", .num_vectors = 3, .base_vector = 0 },</div><div class='add'>+			{ .name = "CE", .num_vectors = 10, .base_vector = 3 },</div><div class='add'>+			{ .name = "WAKE", .num_vectors = 1, .base_vector = 13 },</div><div class='add'>+			{ .name = "DP", .num_vectors = 18, .base_vector = 14 },</div><div class='add'>+		},</div><div class='add'>+		.hw_rev = ATH11K_HW_WCN6855_HW20,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.total_vectors = 32,</div><div class='add'>+		.total_users = 4,</div><div class='add'>+		.users = (struct ath11k_msi_user[]) {</div><div class='add'>+			{ .name = "MHI", .num_vectors = 3, .base_vector = 0 },</div><div class='add'>+			{ .name = "CE", .num_vectors = 10, .base_vector = 3 },</div><div class='add'>+			{ .name = "WAKE", .num_vectors = 1, .base_vector = 13 },</div><div class='add'>+			{ .name = "DP", .num_vectors = 18, .base_vector = 14 },</div><div class='add'>+		},</div><div class='add'>+		.hw_rev = ATH11K_HW_WCN6855_HW21,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.total_vectors = 28,</div><div class='add'>+		.total_users = 2,</div><div class='add'>+		.users = (struct ath11k_msi_user[]) {</div><div class='add'>+			{ .name = "CE", .num_vectors = 10, .base_vector = 0 },</div><div class='add'>+			{ .name = "DP", .num_vectors = 18, .base_vector = 10 },</div><div class='add'>+		},</div><div class='add'>+		.hw_rev = ATH11K_HW_WCN6750_HW10,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.total_vectors = 32,</div><div class='add'>+		.total_users = 4,</div><div class='add'>+		.users = (struct ath11k_msi_user[]) {</div><div class='add'>+			{ .name = "MHI", .num_vectors = 3, .base_vector = 0 },</div><div class='add'>+			{ .name = "CE", .num_vectors = 10, .base_vector = 3 },</div><div class='add'>+			{ .name = "WAKE", .num_vectors = 1, .base_vector = 13 },</div><div class='add'>+			{ .name = "DP", .num_vectors = 18, .base_vector = 14 },</div><div class='add'>+		},</div><div class='add'>+		.hw_rev = ATH11K_HW_QCA2066_HW21,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.total_vectors = 32,</div><div class='add'>+		.total_users = 4,</div><div class='add'>+		.users = (struct ath11k_msi_user[]) {</div><div class='add'>+			{ .name = "MHI", .num_vectors = 3, .base_vector = 0 },</div><div class='add'>+			{ .name = "CE", .num_vectors = 10, .base_vector = 3 },</div><div class='add'>+			{ .name = "WAKE", .num_vectors = 1, .base_vector = 13 },</div><div class='add'>+			{ .name = "DP", .num_vectors = 18, .base_vector = 14 },</div><div class='add'>+		},</div><div class='add'>+		.hw_rev = ATH11K_HW_QCA6698AQ_HW21,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ath11k_pcic_init_msi_config(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	const struct ath11k_msi_config *msi_config;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ath11k_msi_config); i++) {</div><div class='add'>+		msi_config = &amp;ath11k_msi_config[i];</div><div class='add'>+</div><div class='add'>+		if (msi_config-&gt;hw_rev == ab-&gt;hw_rev)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i == ARRAY_SIZE(ath11k_msi_config)) {</div><div class='add'>+		ath11k_err(ab, "failed to fetch msi config, unsupported hw version: 0x%x\n",</div><div class='add'>+			   ab-&gt;hw_rev);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab-&gt;pci.msi.config = msi_config;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_pcic_init_msi_config);</div><div class='add'>+</div><div class='add'>+static void __ath11k_pcic_write32(struct ath11k_base *ab, u32 offset, u32 value)</div><div class='add'>+{</div><div class='add'>+	if (offset &lt; ATH11K_PCI_WINDOW_START)</div><div class='add'>+		iowrite32(value, ab-&gt;mem  + offset);</div><div class='add'>+	else</div><div class='add'>+		ab-&gt;pci.ops-&gt;window_write32(ab, offset, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_pcic_write32(struct ath11k_base *ab, u32 offset, u32 value)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	bool wakeup_required;</div><div class='add'>+</div><div class='add'>+	/* for offset beyond BAR + 4K - 32, may</div><div class='add'>+	 * need to wakeup the device to access.</div><div class='add'>+	 */</div><div class='add'>+	wakeup_required = test_bit(ATH11K_FLAG_DEVICE_INIT_DONE, &amp;ab-&gt;dev_flags) &amp;&amp;</div><div class='add'>+			  offset &gt;= ATH11K_PCI_ACCESS_ALWAYS_OFF;</div><div class='add'>+	if (wakeup_required &amp;&amp; ab-&gt;pci.ops-&gt;wakeup)</div><div class='add'>+		ret = ab-&gt;pci.ops-&gt;wakeup(ab);</div><div class='add'>+</div><div class='add'>+	__ath11k_pcic_write32(ab, offset, value);</div><div class='add'>+</div><div class='add'>+	if (wakeup_required &amp;&amp; !ret &amp;&amp; ab-&gt;pci.ops-&gt;release)</div><div class='add'>+		ab-&gt;pci.ops-&gt;release(ab);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_pcic_write32);</div><div class='add'>+</div><div class='add'>+static u32 __ath11k_pcic_read32(struct ath11k_base *ab, u32 offset)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (offset &lt; ATH11K_PCI_WINDOW_START)</div><div class='add'>+		val = ioread32(ab-&gt;mem + offset);</div><div class='add'>+	else</div><div class='add'>+		val = ab-&gt;pci.ops-&gt;window_read32(ab, offset);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 ath11k_pcic_read32(struct ath11k_base *ab, u32 offset)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u32 val;</div><div class='add'>+	bool wakeup_required;</div><div class='add'>+</div><div class='add'>+	/* for offset beyond BAR + 4K - 32, may</div><div class='add'>+	 * need to wakeup the device to access.</div><div class='add'>+	 */</div><div class='add'>+	wakeup_required = test_bit(ATH11K_FLAG_DEVICE_INIT_DONE, &amp;ab-&gt;dev_flags) &amp;&amp;</div><div class='add'>+			  offset &gt;= ATH11K_PCI_ACCESS_ALWAYS_OFF;</div><div class='add'>+	if (wakeup_required &amp;&amp; ab-&gt;pci.ops-&gt;wakeup)</div><div class='add'>+		ret = ab-&gt;pci.ops-&gt;wakeup(ab);</div><div class='add'>+</div><div class='add'>+	val = __ath11k_pcic_read32(ab, offset);</div><div class='add'>+</div><div class='add'>+	if (wakeup_required &amp;&amp; !ret &amp;&amp; ab-&gt;pci.ops-&gt;release)</div><div class='add'>+		ab-&gt;pci.ops-&gt;release(ab);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_pcic_read32);</div><div class='add'>+</div><div class='add'>+int ath11k_pcic_read(struct ath11k_base *ab, void *buf, u32 start, u32 end)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	bool wakeup_required;</div><div class='add'>+	u32 *data = buf;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	/* for offset beyond BAR + 4K - 32, may</div><div class='add'>+	 * need to wakeup the device to access.</div><div class='add'>+	 */</div><div class='add'>+	wakeup_required = test_bit(ATH11K_FLAG_DEVICE_INIT_DONE, &amp;ab-&gt;dev_flags) &amp;&amp;</div><div class='add'>+			  end &gt;= ATH11K_PCI_ACCESS_ALWAYS_OFF;</div><div class='add'>+	if (wakeup_required &amp;&amp; ab-&gt;pci.ops-&gt;wakeup) {</div><div class='add'>+		ret = ab-&gt;pci.ops-&gt;wakeup(ab);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ab,</div><div class='add'>+				    "wakeup failed, data may be invalid: %d",</div><div class='add'>+				    ret);</div><div class='add'>+			/* Even though wakeup() failed, continue processing rather</div><div class='add'>+			 * than returning because some parts of the data may still</div><div class='add'>+			 * be valid and useful in some cases, e.g. could give us</div><div class='add'>+			 * some clues on firmware crash.</div><div class='add'>+			 * Mislead due to invalid data could be avoided because we</div><div class='add'>+			 * are aware of the wakeup failure.</div><div class='add'>+			 */</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = start; i &lt; end + 1; i += 4)</div><div class='add'>+		*data++ = __ath11k_pcic_read32(ab, i);</div><div class='add'>+</div><div class='add'>+	if (wakeup_required &amp;&amp; ab-&gt;pci.ops-&gt;release)</div><div class='add'>+		ab-&gt;pci.ops-&gt;release(ab);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_pcic_read);</div><div class='add'>+</div><div class='add'>+void ath11k_pcic_get_msi_address(struct ath11k_base *ab, u32 *msi_addr_lo,</div><div class='add'>+				 u32 *msi_addr_hi)</div><div class='add'>+{</div><div class='add'>+	*msi_addr_lo = ab-&gt;pci.msi.addr_lo;</div><div class='add'>+	*msi_addr_hi = ab-&gt;pci.msi.addr_hi;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_pcic_get_msi_address);</div><div class='add'>+</div><div class='add'>+int ath11k_pcic_get_user_msi_assignment(struct ath11k_base *ab, char *user_name,</div><div class='add'>+					int *num_vectors, u32 *user_base_data,</div><div class='add'>+					u32 *base_vector)</div><div class='add'>+{</div><div class='add'>+	const struct ath11k_msi_config *msi_config = ab-&gt;pci.msi.config;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; msi_config-&gt;total_users; idx++) {</div><div class='add'>+		if (strcmp(user_name, msi_config-&gt;users[idx].name) == 0) {</div><div class='add'>+			*num_vectors = msi_config-&gt;users[idx].num_vectors;</div><div class='add'>+			*base_vector =  msi_config-&gt;users[idx].base_vector;</div><div class='add'>+			*user_base_data = *base_vector + ab-&gt;pci.msi.ep_base_data;</div><div class='add'>+</div><div class='add'>+			ath11k_dbg(ab, ATH11K_DBG_PCI,</div><div class='add'>+				   "msi assignment %s num_vectors %d user_base_data %u base_vector %u\n",</div><div class='add'>+				   user_name, *num_vectors, *user_base_data,</div><div class='add'>+				   *base_vector);</div><div class='add'>+</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_err(ab, "Failed to find MSI assignment for %s!\n", user_name);</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_pcic_get_user_msi_assignment);</div><div class='add'>+</div><div class='add'>+void ath11k_pcic_get_ce_msi_idx(struct ath11k_base *ab, u32 ce_id, u32 *msi_idx)</div><div class='add'>+{</div><div class='add'>+	u32 i, msi_data_idx;</div><div class='add'>+</div><div class='add'>+	for (i = 0, msi_data_idx = 0; i &lt; ab-&gt;hw_params.ce_count; i++) {</div><div class='add'>+		if (ath11k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (ce_id == i)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		msi_data_idx++;</div><div class='add'>+	}</div><div class='add'>+	*msi_idx = msi_data_idx;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_pcic_get_ce_msi_idx);</div><div class='add'>+</div><div class='add'>+static void ath11k_pcic_free_ext_irq(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) {</div><div class='add'>+		struct ath11k_ext_irq_grp *irq_grp = &amp;ab-&gt;ext_irq_grp[i];</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; irq_grp-&gt;num_irq; j++)</div><div class='add'>+			free_irq(ab-&gt;irq_num[irq_grp-&gt;irqs[j]], irq_grp);</div><div class='add'>+</div><div class='add'>+		netif_napi_del(&amp;irq_grp-&gt;napi);</div><div class='add'>+		free_netdev(irq_grp-&gt;napi_ndev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_pcic_free_irq(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i, irq_idx;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.ce_count; i++) {</div><div class='add'>+		if (ath11k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='add'>+			continue;</div><div class='add'>+		irq_idx = ATH11K_PCI_IRQ_CE0_OFFSET + i;</div><div class='add'>+		free_irq(ab-&gt;irq_num[irq_idx], &amp;ab-&gt;ce.ce_pipe[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_pcic_free_ext_irq(ab);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_pcic_free_irq);</div><div class='add'>+</div><div class='add'>+static void ath11k_pcic_ce_irq_enable(struct ath11k_base *ab, u16 ce_id)</div><div class='add'>+{</div><div class='add'>+	u32 irq_idx;</div><div class='add'>+</div><div class='add'>+	/* In case of one MSI vector, we handle irq enable/disable in a</div><div class='add'>+	 * uniform way since we only have one irq</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(ATH11K_FLAG_MULTI_MSI_VECTORS, &amp;ab-&gt;dev_flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	irq_idx = ATH11K_PCI_IRQ_CE0_OFFSET + ce_id;</div><div class='add'>+	enable_irq(ab-&gt;irq_num[irq_idx]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_pcic_ce_irq_disable(struct ath11k_base *ab, u16 ce_id)</div><div class='add'>+{</div><div class='add'>+	u32 irq_idx;</div><div class='add'>+</div><div class='add'>+	/* In case of one MSI vector, we handle irq enable/disable in a</div><div class='add'>+	 * uniform way since we only have one irq</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(ATH11K_FLAG_MULTI_MSI_VECTORS, &amp;ab-&gt;dev_flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	irq_idx = ATH11K_PCI_IRQ_CE0_OFFSET + ce_id;</div><div class='add'>+	disable_irq_nosync(ab-&gt;irq_num[irq_idx]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_pcic_ce_irqs_disable(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	clear_bit(ATH11K_FLAG_CE_IRQ_ENABLED, &amp;ab-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.ce_count; i++) {</div><div class='add'>+		if (ath11k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='add'>+			continue;</div><div class='add'>+		ath11k_pcic_ce_irq_disable(ab, i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_pcic_sync_ce_irqs(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int irq_idx;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.ce_count; i++) {</div><div class='add'>+		if (ath11k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		irq_idx = ATH11K_PCI_IRQ_CE0_OFFSET + i;</div><div class='add'>+		synchronize_irq(ab-&gt;irq_num[irq_idx]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_pcic_ce_tasklet(struct tasklet_struct *t)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_ce_pipe *ce_pipe = from_tasklet(ce_pipe, t, intr_tq);</div><div class='add'>+	int irq_idx = ATH11K_PCI_IRQ_CE0_OFFSET + ce_pipe-&gt;pipe_num;</div><div class='add'>+</div><div class='add'>+	ath11k_ce_per_engine_service(ce_pipe-&gt;ab, ce_pipe-&gt;pipe_num);</div><div class='add'>+</div><div class='add'>+	enable_irq(ce_pipe-&gt;ab-&gt;irq_num[irq_idx]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t ath11k_pcic_ce_interrupt_handler(int irq, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_ce_pipe *ce_pipe = arg;</div><div class='add'>+	struct ath11k_base *ab = ce_pipe-&gt;ab;</div><div class='add'>+	int irq_idx = ATH11K_PCI_IRQ_CE0_OFFSET + ce_pipe-&gt;pipe_num;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(ATH11K_FLAG_CE_IRQ_ENABLED, &amp;ab-&gt;dev_flags))</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+</div><div class='add'>+	/* last interrupt received for this CE */</div><div class='add'>+	ce_pipe-&gt;timestamp = jiffies;</div><div class='add'>+</div><div class='add'>+	disable_irq_nosync(ab-&gt;irq_num[irq_idx]);</div><div class='add'>+</div><div class='add'>+	tasklet_schedule(&amp;ce_pipe-&gt;intr_tq);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_pcic_ext_grp_disable(struct ath11k_ext_irq_grp *irq_grp)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = irq_grp-&gt;ab;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* In case of one MSI vector, we handle irq enable/disable</div><div class='add'>+	 * in a uniform way since we only have one irq</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(ATH11K_FLAG_MULTI_MSI_VECTORS, &amp;ab-&gt;dev_flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; irq_grp-&gt;num_irq; i++)</div><div class='add'>+		disable_irq_nosync(irq_grp-&gt;ab-&gt;irq_num[irq_grp-&gt;irqs[i]]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __ath11k_pcic_ext_irq_disable(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	clear_bit(ATH11K_FLAG_EXT_IRQ_ENABLED, &amp;ab-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) {</div><div class='add'>+		struct ath11k_ext_irq_grp *irq_grp = &amp;ab-&gt;ext_irq_grp[i];</div><div class='add'>+</div><div class='add'>+		ath11k_pcic_ext_grp_disable(irq_grp);</div><div class='add'>+</div><div class='add'>+		if (irq_grp-&gt;napi_enabled) {</div><div class='add'>+			napi_synchronize(&amp;irq_grp-&gt;napi);</div><div class='add'>+			napi_disable(&amp;irq_grp-&gt;napi);</div><div class='add'>+			irq_grp-&gt;napi_enabled = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_pcic_ext_grp_enable(struct ath11k_ext_irq_grp *irq_grp)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = irq_grp-&gt;ab;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* In case of one MSI vector, we handle irq enable/disable in a</div><div class='add'>+	 * uniform way since we only have one irq</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(ATH11K_FLAG_MULTI_MSI_VECTORS, &amp;ab-&gt;dev_flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; irq_grp-&gt;num_irq; i++)</div><div class='add'>+		enable_irq(irq_grp-&gt;ab-&gt;irq_num[irq_grp-&gt;irqs[i]]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_pcic_ext_irq_enable(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) {</div><div class='add'>+		struct ath11k_ext_irq_grp *irq_grp = &amp;ab-&gt;ext_irq_grp[i];</div><div class='add'>+</div><div class='add'>+		if (!irq_grp-&gt;napi_enabled) {</div><div class='add'>+			napi_enable(&amp;irq_grp-&gt;napi);</div><div class='add'>+			irq_grp-&gt;napi_enabled = true;</div><div class='add'>+		}</div><div class='add'>+		ath11k_pcic_ext_grp_enable(irq_grp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_bit(ATH11K_FLAG_EXT_IRQ_ENABLED, &amp;ab-&gt;dev_flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_pcic_ext_irq_enable);</div><div class='add'>+</div><div class='add'>+static void ath11k_pcic_sync_ext_irqs(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i, j, irq_idx;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) {</div><div class='add'>+		struct ath11k_ext_irq_grp *irq_grp = &amp;ab-&gt;ext_irq_grp[i];</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; irq_grp-&gt;num_irq; j++) {</div><div class='add'>+			irq_idx = irq_grp-&gt;irqs[j];</div><div class='add'>+			synchronize_irq(ab-&gt;irq_num[irq_idx]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_pcic_ext_irq_disable(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	__ath11k_pcic_ext_irq_disable(ab);</div><div class='add'>+	ath11k_pcic_sync_ext_irqs(ab);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_pcic_ext_irq_disable);</div><div class='add'>+</div><div class='add'>+static int ath11k_pcic_ext_grp_napi_poll(struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_ext_irq_grp *irq_grp = container_of(napi,</div><div class='add'>+						struct ath11k_ext_irq_grp,</div><div class='add'>+						napi);</div><div class='add'>+	struct ath11k_base *ab = irq_grp-&gt;ab;</div><div class='add'>+	int work_done;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	work_done = ath11k_dp_service_srng(ab, irq_grp, budget);</div><div class='add'>+	if (work_done &lt; budget) {</div><div class='add'>+		napi_complete_done(napi, work_done);</div><div class='add'>+		for (i = 0; i &lt; irq_grp-&gt;num_irq; i++)</div><div class='add'>+			enable_irq(irq_grp-&gt;ab-&gt;irq_num[irq_grp-&gt;irqs[i]]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (work_done &gt; budget)</div><div class='add'>+		work_done = budget;</div><div class='add'>+</div><div class='add'>+	return work_done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t ath11k_pcic_ext_interrupt_handler(int irq, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_ext_irq_grp *irq_grp = arg;</div><div class='add'>+	struct ath11k_base *ab = irq_grp-&gt;ab;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(ATH11K_FLAG_EXT_IRQ_ENABLED, &amp;ab-&gt;dev_flags))</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(irq_grp-&gt;ab, ATH11K_DBG_PCI, "ext irq %d\n", irq);</div><div class='add'>+</div><div class='add'>+	/* last interrupt received for this group */</div><div class='add'>+	irq_grp-&gt;timestamp = jiffies;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; irq_grp-&gt;num_irq; i++)</div><div class='add'>+		disable_irq_nosync(irq_grp-&gt;ab-&gt;irq_num[irq_grp-&gt;irqs[i]]);</div><div class='add'>+</div><div class='add'>+	napi_schedule(&amp;irq_grp-&gt;napi);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath11k_pcic_get_msi_irq(struct ath11k_base *ab, unsigned int vector)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;pci.ops-&gt;get_msi_irq(ab, vector);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_pcic_ext_irq_config(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i, j, n, ret, num_vectors = 0;</div><div class='add'>+	u32 user_base_data = 0, base_vector = 0;</div><div class='add'>+	struct ath11k_ext_irq_grp *irq_grp;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_pcic_get_user_msi_assignment(ab, "DP", &amp;num_vectors,</div><div class='add'>+						  &amp;user_base_data,</div><div class='add'>+						  &amp;base_vector);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	irq_flags = IRQF_SHARED;</div><div class='add'>+	if (!test_bit(ATH11K_FLAG_MULTI_MSI_VECTORS, &amp;ab-&gt;dev_flags))</div><div class='add'>+		irq_flags |= IRQF_NOBALANCING;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) {</div><div class='add'>+		irq_grp = &amp;ab-&gt;ext_irq_grp[i];</div><div class='add'>+		u32 num_irq = 0;</div><div class='add'>+</div><div class='add'>+		irq_grp-&gt;ab = ab;</div><div class='add'>+		irq_grp-&gt;grp_id = i;</div><div class='add'>+		irq_grp-&gt;napi_ndev = alloc_netdev_dummy(0);</div><div class='add'>+		if (!irq_grp-&gt;napi_ndev) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto fail_allocate;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		netif_napi_add(irq_grp-&gt;napi_ndev, &amp;irq_grp-&gt;napi,</div><div class='add'>+			       ath11k_pcic_ext_grp_napi_poll);</div><div class='add'>+</div><div class='add'>+		if (ab-&gt;hw_params.ring_mask-&gt;tx[i] ||</div><div class='add'>+		    ab-&gt;hw_params.ring_mask-&gt;rx[i] ||</div><div class='add'>+		    ab-&gt;hw_params.ring_mask-&gt;rx_err[i] ||</div><div class='add'>+		    ab-&gt;hw_params.ring_mask-&gt;rx_wbm_rel[i] ||</div><div class='add'>+		    ab-&gt;hw_params.ring_mask-&gt;reo_status[i] ||</div><div class='add'>+		    ab-&gt;hw_params.ring_mask-&gt;rxdma2host[i] ||</div><div class='add'>+		    ab-&gt;hw_params.ring_mask-&gt;host2rxdma[i] ||</div><div class='add'>+		    ab-&gt;hw_params.ring_mask-&gt;rx_mon_status[i]) {</div><div class='add'>+			num_irq = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		irq_grp-&gt;num_irq = num_irq;</div><div class='add'>+		irq_grp-&gt;irqs[0] = ATH11K_PCI_IRQ_DP_OFFSET + i;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; irq_grp-&gt;num_irq; j++) {</div><div class='add'>+			int irq_idx = irq_grp-&gt;irqs[j];</div><div class='add'>+			int vector = (i % num_vectors) + base_vector;</div><div class='add'>+			int irq = ath11k_pcic_get_msi_irq(ab, vector);</div><div class='add'>+</div><div class='add'>+			if (irq &lt; 0) {</div><div class='add'>+				ret = irq;</div><div class='add'>+				goto fail_irq;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ab-&gt;irq_num[irq_idx] = irq;</div><div class='add'>+</div><div class='add'>+			ath11k_dbg(ab, ATH11K_DBG_PCI,</div><div class='add'>+				   "irq %d group %d\n", irq, i);</div><div class='add'>+</div><div class='add'>+			irq_set_status_flags(irq, IRQ_DISABLE_UNLAZY);</div><div class='add'>+			ret = request_irq(irq, ath11k_pcic_ext_interrupt_handler,</div><div class='add'>+					  irq_flags, "DP_EXT_IRQ", irq_grp);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath11k_err(ab, "failed request irq %d: %d\n",</div><div class='add'>+					   vector, ret);</div><div class='add'>+				for (n = 0; n &lt;= i; n++) {</div><div class='add'>+					irq_grp = &amp;ab-&gt;ext_irq_grp[n];</div><div class='add'>+					free_netdev(irq_grp-&gt;napi_ndev);</div><div class='add'>+				}</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		ath11k_pcic_ext_grp_disable(irq_grp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+fail_irq:</div><div class='add'>+	/* i -&gt;napi_ndev was properly allocated. Free it also */</div><div class='add'>+	i += 1;</div><div class='add'>+fail_allocate:</div><div class='add'>+	for (n = 0; n &lt; i; n++) {</div><div class='add'>+		irq_grp = &amp;ab-&gt;ext_irq_grp[n];</div><div class='add'>+		free_netdev(irq_grp-&gt;napi_ndev);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_pcic_config_irq(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_ce_pipe *ce_pipe;</div><div class='add'>+	u32 msi_data_start;</div><div class='add'>+	u32 msi_data_count, msi_data_idx;</div><div class='add'>+	u32 msi_irq_start;</div><div class='add'>+	unsigned int msi_data;</div><div class='add'>+	int irq, i, ret, irq_idx;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_pcic_get_user_msi_assignment(ab, "CE", &amp;msi_data_count,</div><div class='add'>+						  &amp;msi_data_start, &amp;msi_irq_start);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	irq_flags = IRQF_SHARED;</div><div class='add'>+	if (!test_bit(ATH11K_FLAG_MULTI_MSI_VECTORS, &amp;ab-&gt;dev_flags))</div><div class='add'>+		irq_flags |= IRQF_NOBALANCING;</div><div class='add'>+</div><div class='add'>+	/* Configure CE irqs */</div><div class='add'>+	for (i = 0, msi_data_idx = 0; i &lt; ab-&gt;hw_params.ce_count; i++) {</div><div class='add'>+		if (ath11k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		msi_data = (msi_data_idx % msi_data_count) + msi_irq_start;</div><div class='add'>+		irq = ath11k_pcic_get_msi_irq(ab, msi_data);</div><div class='add'>+		if (irq &lt; 0)</div><div class='add'>+			return irq;</div><div class='add'>+</div><div class='add'>+		ce_pipe = &amp;ab-&gt;ce.ce_pipe[i];</div><div class='add'>+</div><div class='add'>+		irq_idx = ATH11K_PCI_IRQ_CE0_OFFSET + i;</div><div class='add'>+</div><div class='add'>+		tasklet_setup(&amp;ce_pipe-&gt;intr_tq, ath11k_pcic_ce_tasklet);</div><div class='add'>+</div><div class='add'>+		ret = request_irq(irq, ath11k_pcic_ce_interrupt_handler,</div><div class='add'>+				  irq_flags, irq_name[irq_idx], ce_pipe);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_err(ab, "failed to request irq %d: %d\n",</div><div class='add'>+				   irq_idx, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ab-&gt;irq_num[irq_idx] = irq;</div><div class='add'>+		msi_data_idx++;</div><div class='add'>+</div><div class='add'>+		ath11k_pcic_ce_irq_disable(ab, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_pcic_ext_irq_config(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_pcic_config_irq);</div><div class='add'>+</div><div class='add'>+void ath11k_pcic_ce_irqs_enable(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	set_bit(ATH11K_FLAG_CE_IRQ_ENABLED, &amp;ab-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.ce_count; i++) {</div><div class='add'>+		if (ath11k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='add'>+			continue;</div><div class='add'>+		ath11k_pcic_ce_irq_enable(ab, i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_pcic_ce_irqs_enable);</div><div class='add'>+</div><div class='add'>+static void ath11k_pcic_kill_tasklets(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.ce_count; i++) {</div><div class='add'>+		struct ath11k_ce_pipe *ce_pipe = &amp;ab-&gt;ce.ce_pipe[i];</div><div class='add'>+</div><div class='add'>+		if (ath11k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		tasklet_kill(&amp;ce_pipe-&gt;intr_tq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_pcic_ce_irq_disable_sync(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath11k_pcic_ce_irqs_disable(ab);</div><div class='add'>+	ath11k_pcic_sync_ce_irqs(ab);</div><div class='add'>+	ath11k_pcic_kill_tasklets(ab);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_pcic_ce_irq_disable_sync);</div><div class='add'>+</div><div class='add'>+void ath11k_pcic_stop(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath11k_pcic_ce_irq_disable_sync(ab);</div><div class='add'>+	ath11k_ce_cleanup_pipes(ab);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_pcic_stop);</div><div class='add'>+</div><div class='add'>+int ath11k_pcic_start(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	set_bit(ATH11K_FLAG_DEVICE_INIT_DONE, &amp;ab-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+	ath11k_pcic_ce_irqs_enable(ab);</div><div class='add'>+	ath11k_ce_rx_post_buf(ab);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_pcic_start);</div><div class='add'>+</div><div class='add'>+int ath11k_pcic_map_service_to_pipe(struct ath11k_base *ab, u16 service_id,</div><div class='add'>+				    u8 *ul_pipe, u8 *dl_pipe)</div><div class='add'>+{</div><div class='add'>+	const struct service_to_pipe *entry;</div><div class='add'>+	bool ul_set = false, dl_set = false;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.svc_to_ce_map_len; i++) {</div><div class='add'>+		entry = &amp;ab-&gt;hw_params.svc_to_ce_map[i];</div><div class='add'>+</div><div class='add'>+		if (__le32_to_cpu(entry-&gt;service_id) != service_id)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (__le32_to_cpu(entry-&gt;pipedir)) {</div><div class='add'>+		case PIPEDIR_NONE:</div><div class='add'>+			break;</div><div class='add'>+		case PIPEDIR_IN:</div><div class='add'>+			WARN_ON(dl_set);</div><div class='add'>+			*dl_pipe = __le32_to_cpu(entry-&gt;pipenum);</div><div class='add'>+			dl_set = true;</div><div class='add'>+			break;</div><div class='add'>+		case PIPEDIR_OUT:</div><div class='add'>+			WARN_ON(ul_set);</div><div class='add'>+			*ul_pipe = __le32_to_cpu(entry-&gt;pipenum);</div><div class='add'>+			ul_set = true;</div><div class='add'>+			break;</div><div class='add'>+		case PIPEDIR_INOUT:</div><div class='add'>+			WARN_ON(dl_set);</div><div class='add'>+			WARN_ON(ul_set);</div><div class='add'>+			*dl_pipe = __le32_to_cpu(entry-&gt;pipenum);</div><div class='add'>+			*ul_pipe = __le32_to_cpu(entry-&gt;pipenum);</div><div class='add'>+			dl_set = true;</div><div class='add'>+			ul_set = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!ul_set || !dl_set))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_pcic_map_service_to_pipe);</div><div class='add'>+</div><div class='add'>+int ath11k_pcic_register_pci_ops(struct ath11k_base *ab,</div><div class='add'>+				 const struct ath11k_pci_ops *pci_ops)</div><div class='add'>+{</div><div class='add'>+	if (!pci_ops)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Return error if mandatory pci_ops callbacks are missing */</div><div class='add'>+	if (!pci_ops-&gt;get_msi_irq || !pci_ops-&gt;window_write32 ||</div><div class='add'>+	    !pci_ops-&gt;window_read32)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ab-&gt;pci.ops = pci_ops;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_pcic_register_pci_ops);</div><div class='add'>+</div><div class='add'>+void ath11k_pci_enable_ce_irqs_except_wake_irq(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.ce_count; i++) {</div><div class='add'>+		if (ath11k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR ||</div><div class='add'>+		    i == ATH11K_PCI_CE_WAKE_IRQ)</div><div class='add'>+			continue;</div><div class='add'>+		ath11k_pcic_ce_irq_enable(ab, i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_pci_enable_ce_irqs_except_wake_irq);</div><div class='add'>+</div><div class='add'>+void ath11k_pci_disable_ce_irqs_except_wake_irq(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int irq_idx;</div><div class='add'>+	struct ath11k_ce_pipe *ce_pipe;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params.ce_count; i++) {</div><div class='add'>+		ce_pipe = &amp;ab-&gt;ce.ce_pipe[i];</div><div class='add'>+		irq_idx = ATH11K_PCI_IRQ_CE0_OFFSET + i;</div><div class='add'>+</div><div class='add'>+		if (ath11k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR ||</div><div class='add'>+		    i == ATH11K_PCI_CE_WAKE_IRQ)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		disable_irq_nosync(ab-&gt;irq_num[irq_idx]);</div><div class='add'>+		synchronize_irq(ab-&gt;irq_num[irq_idx]);</div><div class='add'>+		tasklet_kill(&amp;ce_pipe-&gt;intr_tq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_pci_disable_ce_irqs_except_wake_irq);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/pcic.h b/drivers/net/wireless/ath/ath11k/pcic.h<br/>new file mode 100644<br/>index 000000000000..ac012e88bf6d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/pcic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/pcic.h</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2022, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ATH11K_PCI_CMN_H</div><div class='add'>+#define _ATH11K_PCI_CMN_H</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+</div><div class='add'>+#define ATH11K_PCI_IRQ_CE0_OFFSET	3</div><div class='add'>+#define ATH11K_PCI_IRQ_DP_OFFSET	14</div><div class='add'>+</div><div class='add'>+#define ATH11K_PCI_CE_WAKE_IRQ	2</div><div class='add'>+</div><div class='add'>+#define ATH11K_PCI_WINDOW_ENABLE_BIT		0x40000000</div><div class='add'>+#define ATH11K_PCI_WINDOW_REG_ADDRESS		0x310c</div><div class='add'>+#define ATH11K_PCI_WINDOW_VALUE_MASK		GENMASK(24, 19)</div><div class='add'>+#define ATH11K_PCI_WINDOW_START			0x80000</div><div class='add'>+#define ATH11K_PCI_WINDOW_RANGE_MASK		GENMASK(18, 0)</div><div class='add'>+</div><div class='add'>+/* BAR0 + 4k is always accessible, and no</div><div class='add'>+ * need to force wakeup.</div><div class='add'>+ * 4K - 32 = 0xFE0</div><div class='add'>+ */</div><div class='add'>+#define ATH11K_PCI_ACCESS_ALWAYS_OFF 0xFE0</div><div class='add'>+</div><div class='add'>+int ath11k_pcic_get_user_msi_assignment(struct ath11k_base *ab, char *user_name,</div><div class='add'>+					int *num_vectors, u32 *user_base_data,</div><div class='add'>+					u32 *base_vector);</div><div class='add'>+void ath11k_pcic_write32(struct ath11k_base *ab, u32 offset, u32 value);</div><div class='add'>+u32 ath11k_pcic_read32(struct ath11k_base *ab, u32 offset);</div><div class='add'>+void ath11k_pcic_get_msi_address(struct ath11k_base *ab, u32 *msi_addr_lo,</div><div class='add'>+				 u32 *msi_addr_hi);</div><div class='add'>+void ath11k_pcic_get_ce_msi_idx(struct ath11k_base *ab, u32 ce_id, u32 *msi_idx);</div><div class='add'>+void ath11k_pcic_free_irq(struct ath11k_base *ab);</div><div class='add'>+int ath11k_pcic_config_irq(struct ath11k_base *ab);</div><div class='add'>+void ath11k_pcic_ext_irq_enable(struct ath11k_base *ab);</div><div class='add'>+void ath11k_pcic_ext_irq_disable(struct ath11k_base *ab);</div><div class='add'>+void ath11k_pcic_stop(struct ath11k_base *ab);</div><div class='add'>+int ath11k_pcic_start(struct ath11k_base *ab);</div><div class='add'>+int ath11k_pcic_map_service_to_pipe(struct ath11k_base *ab, u16 service_id,</div><div class='add'>+				    u8 *ul_pipe, u8 *dl_pipe);</div><div class='add'>+void ath11k_pcic_ce_irqs_enable(struct ath11k_base *ab);</div><div class='add'>+void ath11k_pcic_ce_irq_disable_sync(struct ath11k_base *ab);</div><div class='add'>+int ath11k_pcic_init_msi_config(struct ath11k_base *ab);</div><div class='add'>+int ath11k_pcic_register_pci_ops(struct ath11k_base *ab,</div><div class='add'>+				 const struct ath11k_pci_ops *pci_ops);</div><div class='add'>+int ath11k_pcic_read(struct ath11k_base *ab, void *buf, u32 start, u32 end);</div><div class='add'>+void ath11k_pci_enable_ce_irqs_except_wake_irq(struct ath11k_base *ab);</div><div class='add'>+void ath11k_pci_disable_ce_irqs_except_wake_irq(struct ath11k_base *ab);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/peer.c b/drivers/net/wireless/ath/ath11k/peer.c<br/>index f49abefa9618..6d0126c39301 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/peer.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/peer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/peer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/peer.c</a></div><div class='hunk'>@@ -1,23 +1,22 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "peer.h"</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> </div><div class='del'>-struct ath11k_peer *ath11k_peer_find(struct ath11k_base *ab, int vdev_id,</div><div class='del'>-				     const u8 *addr)</div><div class='add'>+static struct ath11k_peer *ath11k_peer_find_list_by_id(struct ath11k_base *ab,</div><div class='add'>+						       int peer_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_peer *peer;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ab-&gt;base_lock);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(peer, &amp;ab-&gt;peers, list) {</div><div class='del'>-		if (peer-&gt;vdev_id != vdev_id)</div><div class='del'>-			continue;</div><div class='del'>-		if (!ether_addr_equal(peer-&gt;addr, addr))</div><div class='add'>+		if (peer-&gt;peer_id != peer_id)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		return peer;</div><div class='hunk'>@@ -26,15 +25,15 @@ struct ath11k_peer *ath11k_peer_find(struct ath11k_base *ab, int vdev_id,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ath11k_peer *ath11k_peer_find_by_pdev_idx(struct ath11k_base *ab,</div><div class='del'>-							u8 pdev_idx, const u8 *addr)</div><div class='add'>+struct ath11k_peer *ath11k_peer_find(struct ath11k_base *ab, int vdev_id,</div><div class='add'>+				     const u8 *addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_peer *peer;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ab-&gt;base_lock);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(peer, &amp;ab-&gt;peers, list) {</div><div class='del'>-		if (peer-&gt;pdev_idx != pdev_idx)</div><div class='add'>+		if (peer-&gt;vdev_id != vdev_id)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (!ether_addr_equal(peer-&gt;addr, addr))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -52,14 +51,13 @@ struct ath11k_peer *ath11k_peer_find_by_addr(struct ath11k_base *ab,</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ab-&gt;base_lock);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(peer, &amp;ab-&gt;peers, list) {</div><div class='del'>-		if (!ether_addr_equal(peer-&gt;addr, addr))</div><div class='del'>-			continue;</div><div class='add'>+	if (!ab-&gt;rhead_peer_addr)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-		return peer;</div><div class='del'>-	}</div><div class='add'>+	peer = rhashtable_lookup_fast(ab-&gt;rhead_peer_addr, addr,</div><div class='add'>+				      ab-&gt;rhash_peer_addr_param);</div><div class='ctx'> </div><div class='del'>-	return NULL;</div><div class='add'>+	return peer;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct ath11k_peer *ath11k_peer_find_by_id(struct ath11k_base *ab,</div><div class='hunk'>@@ -69,11 +67,13 @@ struct ath11k_peer *ath11k_peer_find_by_id(struct ath11k_base *ab,</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ab-&gt;base_lock);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(peer, &amp;ab-&gt;peers, list)</div><div class='del'>-		if (peer_id == peer-&gt;peer_id)</div><div class='del'>-			return peer;</div><div class='add'>+	if (!ab-&gt;rhead_peer_id)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	return NULL;</div><div class='add'>+	peer = rhashtable_lookup_fast(ab-&gt;rhead_peer_id, &amp;peer_id,</div><div class='add'>+				      ab-&gt;rhash_peer_id_param);</div><div class='add'>+</div><div class='add'>+	return peer;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct ath11k_peer *ath11k_peer_find_by_vdev_id(struct ath11k_base *ab,</div><div class='hunk'>@@ -99,14 +99,14 @@ void ath11k_peer_unmap_event(struct ath11k_base *ab, u16 peer_id)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='ctx'> </div><div class='del'>-	peer = ath11k_peer_find_by_id(ab, peer_id);</div><div class='add'>+	peer = ath11k_peer_find_list_by_id(ab, peer_id);</div><div class='ctx'> 	if (!peer) {</div><div class='ctx'> 		ath11k_warn(ab, "peer-unmap-event: unknown peer id %d\n",</div><div class='ctx'> 			    peer_id);</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "htt peer unmap vdev %d peer %pM id %d\n",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "peer unmap vdev %d peer %pM id %d\n",</div><div class='ctx'> 		   peer-&gt;vdev_id, peer-&gt;addr, peer_id);</div><div class='ctx'> </div><div class='ctx'> 	list_del(&amp;peer-&gt;list);</div><div class='hunk'>@@ -138,7 +138,7 @@ void ath11k_peer_map_event(struct ath11k_base *ab, u8 vdev_id, u16 peer_id,</div><div class='ctx'> 		wake_up(&amp;ab-&gt;peer_mapping_wq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "htt peer map vdev %d peer %pM id %d\n",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "peer map vdev %d peer %pM id %d\n",</div><div class='ctx'> 		   vdev_id, mac_addr, peer_id);</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='hunk'>@@ -167,6 +167,76 @@ static int ath11k_wait_for_peer_common(struct ath11k_base *ab, int vdev_id,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int ath11k_peer_rhash_insert(struct ath11k_base *ab,</div><div class='add'>+					   struct rhashtable *rtbl,</div><div class='add'>+					   struct rhash_head *rhead,</div><div class='add'>+					   struct rhashtable_params *params,</div><div class='add'>+					   void *key)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_peer *tmp;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ab-&gt;tbl_mtx_lock);</div><div class='add'>+</div><div class='add'>+	tmp = rhashtable_lookup_get_insert_fast(rtbl, rhead, *params);</div><div class='add'>+</div><div class='add'>+	if (!tmp)</div><div class='add'>+		return 0;</div><div class='add'>+	else if (IS_ERR(tmp))</div><div class='add'>+		return PTR_ERR(tmp);</div><div class='add'>+	else</div><div class='add'>+		return -EEXIST;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath11k_peer_rhash_remove(struct ath11k_base *ab,</div><div class='add'>+					   struct rhashtable *rtbl,</div><div class='add'>+					   struct rhash_head *rhead,</div><div class='add'>+					   struct rhashtable_params *params)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ab-&gt;tbl_mtx_lock);</div><div class='add'>+</div><div class='add'>+	ret = rhashtable_remove_fast(rtbl, rhead, *params);</div><div class='add'>+	if (ret &amp;&amp; ret != -ENOENT)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_peer_rhash_add(struct ath11k_base *ab, struct ath11k_peer *peer)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ab-&gt;base_lock);</div><div class='add'>+	lockdep_assert_held(&amp;ab-&gt;tbl_mtx_lock);</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;rhead_peer_id || !ab-&gt;rhead_peer_addr)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_peer_rhash_insert(ab, ab-&gt;rhead_peer_id, &amp;peer-&gt;rhash_id,</div><div class='add'>+				       &amp;ab-&gt;rhash_peer_id_param, &amp;peer-&gt;peer_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to add peer %pM with id %d in rhash_id ret %d\n",</div><div class='add'>+			    peer-&gt;addr, peer-&gt;peer_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_peer_rhash_insert(ab, ab-&gt;rhead_peer_addr, &amp;peer-&gt;rhash_addr,</div><div class='add'>+				       &amp;ab-&gt;rhash_peer_addr_param, &amp;peer-&gt;addr);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to add peer %pM with id %d in rhash_addr ret %d\n",</div><div class='add'>+			    peer-&gt;addr, peer-&gt;peer_id, ret);</div><div class='add'>+		goto err_clean;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_clean:</div><div class='add'>+	ath11k_peer_rhash_remove(ab, ab-&gt;rhead_peer_id, &amp;peer-&gt;rhash_id,</div><div class='add'>+				 &amp;ab-&gt;rhash_peer_id_param);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void ath11k_peer_cleanup(struct ath11k *ar, u32 vdev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_peer *peer, *tmp;</div><div class='hunk'>@@ -174,6 +244,7 @@ void ath11k_peer_cleanup(struct ath11k *ar, u32 vdev_id)</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;ab-&gt;tbl_mtx_lock);</div><div class='ctx'> 	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='ctx'> 	list_for_each_entry_safe(peer, tmp, &amp;ab-&gt;peers, list) {</div><div class='ctx'> 		if (peer-&gt;vdev_id != vdev_id)</div><div class='hunk'>@@ -182,12 +253,14 @@ void ath11k_peer_cleanup(struct ath11k *ar, u32 vdev_id)</div><div class='ctx'> 		ath11k_warn(ab, "removing stale peer %pM from vdev_id %d\n",</div><div class='ctx'> 			    peer-&gt;addr, vdev_id);</div><div class='ctx'> </div><div class='add'>+		ath11k_peer_rhash_delete(ab, peer);</div><div class='ctx'> 		list_del(&amp;peer-&gt;list);</div><div class='ctx'> 		kfree(peer);</div><div class='ctx'> 		ar-&gt;num_peers--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	mutex_unlock(&amp;ab-&gt;tbl_mtx_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath11k_wait_for_peer_deleted(struct ath11k *ar, int vdev_id, const u8 *addr)</div><div class='hunk'>@@ -217,17 +290,51 @@ int ath11k_wait_for_peer_delete_done(struct ath11k *ar, u32 vdev_id,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath11k_peer_delete(struct ath11k *ar, u32 vdev_id, u8 *addr)</div><div class='add'>+static int __ath11k_peer_delete(struct ath11k *ar, u32 vdev_id, const u8 *addr)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+	struct ath11k_peer *peer;</div><div class='add'>+	struct ath11k_base *ab = ar-&gt;ab;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;ab-&gt;tbl_mtx_lock);</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	peer = ath11k_peer_find_by_addr(ab, addr);</div><div class='add'>+	/* Check if the found peer is what we want to remove.</div><div class='add'>+	 * While the sta is transitioning to another band we may</div><div class='add'>+	 * have 2 peer with the same addr assigned to different</div><div class='add'>+	 * vdev_id. Make sure we are deleting the correct peer.</div><div class='add'>+	 */</div><div class='add'>+	if (peer &amp;&amp; peer-&gt;vdev_id == vdev_id)</div><div class='add'>+		ath11k_peer_rhash_delete(ab, peer);</div><div class='add'>+</div><div class='add'>+	/* Fallback to peer list search if the correct peer can't be found.</div><div class='add'>+	 * Skip the deletion of the peer from the rhash since it has already</div><div class='add'>+	 * been deleted in peer add.</div><div class='add'>+	 */</div><div class='add'>+	if (!peer)</div><div class='add'>+		peer = ath11k_peer_find(ab, vdev_id, addr);</div><div class='add'>+</div><div class='add'>+	if (!peer) {</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		mutex_unlock(&amp;ab-&gt;tbl_mtx_lock);</div><div class='add'>+</div><div class='add'>+		ath11k_warn(ab,</div><div class='add'>+			    "failed to find peer vdev_id %d addr %pM in delete\n",</div><div class='add'>+			    vdev_id, addr);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	mutex_unlock(&amp;ab-&gt;tbl_mtx_lock);</div><div class='add'>+</div><div class='ctx'> 	reinit_completion(&amp;ar-&gt;peer_delete_done);</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_wmi_send_peer_delete_cmd(ar, addr, vdev_id);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ath11k_warn(ar-&gt;ab,</div><div class='add'>+		ath11k_warn(ab,</div><div class='ctx'> 			    "failed to delete peer vdev_id %d addr %pM ret %d\n",</div><div class='ctx'> 			    vdev_id, addr, ret);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -237,6 +344,19 @@ int ath11k_peer_delete(struct ath11k *ar, u32 vdev_id, u8 *addr)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_peer_delete(struct ath11k *ar, u32 vdev_id, u8 *addr)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	ret = __ath11k_peer_delete(ar, vdev_id, addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	ar-&gt;num_peers--;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -251,7 +371,8 @@ int ath11k_peer_create(struct ath11k *ar, struct ath11k_vif *arvif,</div><div class='ctx'> 		       struct ieee80211_sta *sta, struct peer_create_params *param)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_peer *peer;</div><div class='del'>-	int ret;</div><div class='add'>+	struct ath11k_sta *arsta;</div><div class='add'>+	int ret, fbret;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -261,13 +382,23 @@ int ath11k_peer_create(struct ath11k *ar, struct ath11k_vif *arvif,</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;ar-&gt;ab-&gt;tbl_mtx_lock);</div><div class='ctx'> 	spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='del'>-	peer = ath11k_peer_find_by_pdev_idx(ar-&gt;ab, ar-&gt;pdev_idx, param-&gt;peer_addr);</div><div class='add'>+	peer = ath11k_peer_find_by_addr(ar-&gt;ab, param-&gt;peer_addr);</div><div class='ctx'> 	if (peer) {</div><div class='del'>-		spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		if (peer-&gt;vdev_id == param-&gt;vdev_id) {</div><div class='add'>+			spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+			mutex_unlock(&amp;ar-&gt;ab-&gt;tbl_mtx_lock);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Assume sta is transitioning to another band.</div><div class='add'>+		 * Remove here the peer from rhash.</div><div class='add'>+		 */</div><div class='add'>+		ath11k_peer_rhash_delete(ar-&gt;ab, peer);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;ab-&gt;tbl_mtx_lock);</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_wmi_send_peer_create_cmd(ar, param);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -282,30 +413,25 @@ int ath11k_peer_create(struct ath11k *ar, struct ath11k_vif *arvif,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;ar-&gt;ab-&gt;tbl_mtx_lock);</div><div class='ctx'> 	spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='ctx'> </div><div class='ctx'> 	peer = ath11k_peer_find(ar-&gt;ab, param-&gt;vdev_id, param-&gt;peer_addr);</div><div class='ctx'> 	if (!peer) {</div><div class='ctx'> 		spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+		mutex_unlock(&amp;ar-&gt;ab-&gt;tbl_mtx_lock);</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab, "failed to find peer %pM on vdev %i after creation\n",</div><div class='ctx'> 			    param-&gt;peer_addr, param-&gt;vdev_id);</div><div class='ctx'> </div><div class='del'>-		reinit_completion(&amp;ar-&gt;peer_delete_done);</div><div class='del'>-</div><div class='del'>-		ret = ath11k_wmi_send_peer_delete_cmd(ar, param-&gt;peer_addr,</div><div class='del'>-						      param-&gt;vdev_id);</div><div class='del'>-		if (ret) {</div><div class='del'>-			ath11k_warn(ar-&gt;ab, "failed to delete peer vdev_id %d addr %pM\n",</div><div class='del'>-				    param-&gt;vdev_id, param-&gt;peer_addr);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = ath11k_wait_for_peer_delete_done(ar, param-&gt;vdev_id,</div><div class='del'>-						       param-&gt;peer_addr);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		return -ENOENT;</div><div class='add'>+	ret = ath11k_peer_rhash_add(ar-&gt;ab, peer);</div><div class='add'>+	if (ret) {</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+		mutex_unlock(&amp;ar-&gt;ab-&gt;tbl_mtx_lock);</div><div class='add'>+		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	peer-&gt;pdev_idx = ar-&gt;pdev_idx;</div><div class='hunk'>@@ -319,9 +445,226 @@ int ath11k_peer_create(struct ath11k *ar, struct ath11k_vif *arvif,</div><div class='ctx'> 	peer-&gt;sec_type = HAL_ENCRYPT_TYPE_OPEN;</div><div class='ctx'> 	peer-&gt;sec_type_grp = HAL_ENCRYPT_TYPE_OPEN;</div><div class='ctx'> </div><div class='add'>+	if (sta) {</div><div class='add'>+		arsta = ath11k_sta_to_arsta(sta);</div><div class='add'>+		arsta-&gt;tcl_metadata |= FIELD_PREP(HTT_TCL_META_DATA_TYPE, 0) |</div><div class='add'>+				       FIELD_PREP(HTT_TCL_META_DATA_PEER_ID,</div><div class='add'>+						  peer-&gt;peer_id);</div><div class='add'>+</div><div class='add'>+		/* set HTT extension valid bit to 0 by default */</div><div class='add'>+		arsta-&gt;tcl_metadata &amp;= ~HTT_TCL_META_DATA_VALID_HTT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ar-&gt;num_peers++;</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;ab-&gt;tbl_mtx_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	fbret = __ath11k_peer_delete(ar, param-&gt;vdev_id, param-&gt;peer_addr);</div><div class='add'>+	if (fbret)</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed peer %pM delete vdev_id %d fallback ret %d\n",</div><div class='add'>+			    param-&gt;peer_addr, param-&gt;vdev_id, fbret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_peer_rhash_delete(struct ath11k_base *ab, struct ath11k_peer *peer)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ab-&gt;base_lock);</div><div class='add'>+	lockdep_assert_held(&amp;ab-&gt;tbl_mtx_lock);</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;rhead_peer_id || !ab-&gt;rhead_peer_addr)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_peer_rhash_remove(ab, ab-&gt;rhead_peer_addr, &amp;peer-&gt;rhash_addr,</div><div class='add'>+				       &amp;ab-&gt;rhash_peer_addr_param);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to remove peer %pM id %d in rhash_addr ret %d\n",</div><div class='add'>+			    peer-&gt;addr, peer-&gt;peer_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_peer_rhash_remove(ab, ab-&gt;rhead_peer_id, &amp;peer-&gt;rhash_id,</div><div class='add'>+				       &amp;ab-&gt;rhash_peer_id_param);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to remove peer %pM id %d in rhash_id ret %d\n",</div><div class='add'>+			    peer-&gt;addr, peer-&gt;peer_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_peer_rhash_id_tbl_init(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct rhashtable_params *param;</div><div class='add'>+	struct rhashtable *rhash_id_tbl;</div><div class='add'>+	int ret;</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ab-&gt;tbl_mtx_lock);</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;rhead_peer_id)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	size = sizeof(*ab-&gt;rhead_peer_id);</div><div class='add'>+	rhash_id_tbl = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	if (!rhash_id_tbl) {</div><div class='add'>+		ath11k_warn(ab, "failed to init rhash id table due to no mem (size %zu)\n",</div><div class='add'>+			    size);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	param = &amp;ab-&gt;rhash_peer_id_param;</div><div class='add'>+</div><div class='add'>+	param-&gt;key_offset = offsetof(struct ath11k_peer, peer_id);</div><div class='add'>+	param-&gt;head_offset = offsetof(struct ath11k_peer, rhash_id);</div><div class='add'>+	param-&gt;key_len = sizeof_field(struct ath11k_peer, peer_id);</div><div class='add'>+	param-&gt;automatic_shrinking = true;</div><div class='add'>+	param-&gt;nelem_hint = ab-&gt;num_radios * TARGET_NUM_PEERS_PDEV(ab);</div><div class='add'>+</div><div class='add'>+	ret = rhashtable_init(rhash_id_tbl, param);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to init peer id rhash table %d\n", ret);</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;rhead_peer_id) {</div><div class='add'>+		ab-&gt;rhead_peer_id = rhash_id_tbl;</div><div class='add'>+	} else {</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		goto cleanup_tbl;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+cleanup_tbl:</div><div class='add'>+	rhashtable_destroy(rhash_id_tbl);</div><div class='add'>+err_free:</div><div class='add'>+	kfree(rhash_id_tbl);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_peer_rhash_addr_tbl_init(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct rhashtable_params *param;</div><div class='add'>+	struct rhashtable *rhash_addr_tbl;</div><div class='add'>+	int ret;</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ab-&gt;tbl_mtx_lock);</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;rhead_peer_addr)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	size = sizeof(*ab-&gt;rhead_peer_addr);</div><div class='add'>+	rhash_addr_tbl = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	if (!rhash_addr_tbl) {</div><div class='add'>+		ath11k_warn(ab, "failed to init rhash addr table due to no mem (size %zu)\n",</div><div class='add'>+			    size);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	param = &amp;ab-&gt;rhash_peer_addr_param;</div><div class='add'>+</div><div class='add'>+	param-&gt;key_offset = offsetof(struct ath11k_peer, addr);</div><div class='add'>+	param-&gt;head_offset = offsetof(struct ath11k_peer, rhash_addr);</div><div class='add'>+	param-&gt;key_len = sizeof_field(struct ath11k_peer, addr);</div><div class='add'>+	param-&gt;automatic_shrinking = true;</div><div class='add'>+	param-&gt;nelem_hint = ab-&gt;num_radios * TARGET_NUM_PEERS_PDEV(ab);</div><div class='add'>+</div><div class='add'>+	ret = rhashtable_init(rhash_addr_tbl, param);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to init peer addr rhash table %d\n", ret);</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;rhead_peer_addr) {</div><div class='add'>+		ab-&gt;rhead_peer_addr = rhash_addr_tbl;</div><div class='add'>+	} else {</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		goto cleanup_tbl;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+cleanup_tbl:</div><div class='add'>+	rhashtable_destroy(rhash_addr_tbl);</div><div class='add'>+err_free:</div><div class='add'>+	kfree(rhash_addr_tbl);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath11k_peer_rhash_id_tbl_destroy(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;ab-&gt;tbl_mtx_lock);</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;rhead_peer_id)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rhashtable_destroy(ab-&gt;rhead_peer_id);</div><div class='add'>+	kfree(ab-&gt;rhead_peer_id);</div><div class='add'>+	ab-&gt;rhead_peer_id = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath11k_peer_rhash_addr_tbl_destroy(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;ab-&gt;tbl_mtx_lock);</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;rhead_peer_addr)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rhashtable_destroy(ab-&gt;rhead_peer_addr);</div><div class='add'>+	kfree(ab-&gt;rhead_peer_addr);</div><div class='add'>+	ab-&gt;rhead_peer_addr = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_peer_rhash_tbl_init(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ab-&gt;tbl_mtx_lock);</div><div class='add'>+</div><div class='add'>+	ret = ath11k_peer_rhash_id_tbl_init(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_peer_rhash_addr_tbl_init(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto cleanup_tbl;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ab-&gt;tbl_mtx_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+cleanup_tbl:</div><div class='add'>+	ath11k_peer_rhash_id_tbl_destroy(ab);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;ab-&gt;tbl_mtx_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_peer_rhash_tbl_destroy(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;ab-&gt;tbl_mtx_lock);</div><div class='add'>+</div><div class='add'>+	ath11k_peer_rhash_addr_tbl_destroy(ab);</div><div class='add'>+	ath11k_peer_rhash_id_tbl_destroy(ab);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ab-&gt;tbl_mtx_lock);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/peer.h b/drivers/net/wireless/ath/ath11k/peer.h<br/>index 619db001be8e..3ad2f3355b14 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/peer.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/peer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/peer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/peer.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef ATH11K_PEER_H</div><div class='hunk'>@@ -20,6 +21,11 @@ struct ath11k_peer {</div><div class='ctx'> 	struct ieee80211_key_conf *keys[WMI_MAX_KEY_INDEX + 1];</div><div class='ctx'> 	struct dp_rx_tid rx_tid[IEEE80211_NUM_TIDS + 1];</div><div class='ctx'> </div><div class='add'>+	/* peer id based rhashtable list pointer */</div><div class='add'>+	struct rhash_head rhash_id;</div><div class='add'>+	/* peer addr based rhashtable list pointer */</div><div class='add'>+	struct rhash_head rhash_addr;</div><div class='add'>+</div><div class='ctx'> 	/* Info used in MMIC verification of</div><div class='ctx'> 	 * RX fragments</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -28,6 +34,8 @@ struct ath11k_peer {</div><div class='ctx'> 	u8 ucast_keyidx;</div><div class='ctx'> 	u16 sec_type;</div><div class='ctx'> 	u16 sec_type_grp;</div><div class='add'>+	bool is_authorized;</div><div class='add'>+	bool dp_setup_done;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void ath11k_peer_unmap_event(struct ath11k_base *ab, u16 peer_id);</div><div class='hunk'>@@ -46,5 +54,7 @@ int ath11k_wait_for_peer_delete_done(struct ath11k *ar, u32 vdev_id,</div><div class='ctx'> 				     const u8 *addr);</div><div class='ctx'> struct ath11k_peer *ath11k_peer_find_by_vdev_id(struct ath11k_base *ab,</div><div class='ctx'> 						int vdev_id);</div><div class='del'>-</div><div class='add'>+int ath11k_peer_rhash_tbl_init(struct ath11k_base *ab);</div><div class='add'>+void ath11k_peer_rhash_tbl_destroy(struct ath11k_base *ab);</div><div class='add'>+int ath11k_peer_rhash_delete(struct ath11k_base *ab, struct ath11k_peer *peer);</div><div class='ctx'> #endif /* _PEER_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/qmi.c b/drivers/net/wireless/ath/ath11k/qmi.c<br/>index b5e34d670715..ff6a97e328b8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/qmi.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/qmi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/qmi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/qmi.c</a></div><div class='hunk'>@@ -1,18 +1,29 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "qmi.h"</div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "debug.h"</div><div class='add'>+#include "hif.h"</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_reserved_mem.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/of_irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define SLEEP_CLOCK_SELECT_INTERNAL_BIT	0x02</div><div class='ctx'> #define HOST_CSTATE_BIT			0x04</div><div class='add'>+#define PLATFORM_CAP_PCIE_GLOBAL_RESET	0x08</div><div class='add'>+#define PLATFORM_CAP_PCIE_PME_D3COLD	0x10</div><div class='add'>+</div><div class='add'>+#define FW_BUILD_ID_MASK "QC_IMAGE_VERSION_STRING="</div><div class='ctx'> </div><div class='ctx'> bool ath11k_cold_boot_cal = 1;</div><div class='ctx'> EXPORT_SYMBOL(ath11k_cold_boot_cal);</div><div class='hunk'>@@ -20,7 +31,7 @@ module_param_named(cold_boot_cal, ath11k_cold_boot_cal, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(cold_boot_cal,</div><div class='ctx'> 		 "Decrease the channel switch time but increase the driver load time (Default: true)");</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_host_cap_req_msg_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_host_cap_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_OPT_FLAG,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -271,7 +282,7 @@ static struct qmi_elem_info qmi_wlanfw_host_cap_req_msg_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_host_cap_resp_msg_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_host_cap_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_STRUCT,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -288,7 +299,7 @@ static struct qmi_elem_info qmi_wlanfw_host_cap_resp_msg_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_ind_register_req_msg_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_ind_register_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_OPT_FLAG,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -513,7 +524,7 @@ static struct qmi_elem_info qmi_wlanfw_ind_register_req_msg_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_ind_register_resp_msg_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_ind_register_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_STRUCT,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -549,7 +560,7 @@ static struct qmi_elem_info qmi_wlanfw_ind_register_resp_msg_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_mem_cfg_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_mem_cfg_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_UNSIGNED_8_BYTE,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -581,7 +592,7 @@ static struct qmi_elem_info qmi_wlanfw_mem_cfg_s_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_mem_seg_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_mem_seg_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -623,7 +634,7 @@ static struct qmi_elem_info qmi_wlanfw_mem_seg_s_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_request_mem_ind_msg_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_request_mem_ind_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_DATA_LEN,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -650,7 +661,7 @@ static struct qmi_elem_info qmi_wlanfw_request_mem_ind_msg_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_mem_seg_resp_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_mem_seg_resp_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_UNSIGNED_8_BYTE,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -690,7 +701,7 @@ static struct qmi_elem_info qmi_wlanfw_mem_seg_resp_s_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_respond_mem_req_msg_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_respond_mem_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_DATA_LEN,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -717,7 +728,7 @@ static struct qmi_elem_info qmi_wlanfw_respond_mem_req_msg_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_respond_mem_resp_msg_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_respond_mem_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_STRUCT,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -735,7 +746,69 @@ static struct qmi_elem_info qmi_wlanfw_respond_mem_resp_msg_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_cap_req_msg_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_cap_req_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_device_info_req_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type      = QMI_EOTI,</div><div class='add'>+		.array_type     = NO_ARRAY,</div><div class='add'>+		.tlv_type       = QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlfw_device_info_resp_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_response_type_v01),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x02,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_device_info_resp_msg_v01,</div><div class='add'>+					   resp),</div><div class='add'>+		.ei_array	= qmi_response_type_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x10,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_device_info_resp_msg_v01,</div><div class='add'>+					   bar_addr_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_8_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u64),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x10,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_device_info_resp_msg_v01,</div><div class='add'>+					   bar_addr),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x11,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_device_info_resp_msg_v01,</div><div class='add'>+					   bar_size_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x11,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_device_info_resp_msg_v01,</div><div class='add'>+					   bar_size),</div><div class='add'>+	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_EOTI,</div><div class='ctx'> 		.array_type	= NO_ARRAY,</div><div class='hunk'>@@ -743,7 +816,7 @@ static struct qmi_elem_info qmi_wlanfw_cap_req_msg_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_rf_chip_info_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_rf_chip_info_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -769,7 +842,7 @@ static struct qmi_elem_info qmi_wlanfw_rf_chip_info_s_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_rf_board_info_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_rf_board_info_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -786,7 +859,7 @@ static struct qmi_elem_info qmi_wlanfw_rf_board_info_s_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_soc_info_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_soc_info_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -802,7 +875,7 @@ static struct qmi_elem_info qmi_wlanfw_soc_info_s_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_fw_version_info_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_fw_version_info_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -828,7 +901,7 @@ static struct qmi_elem_info qmi_wlanfw_fw_version_info_s_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_cap_resp_msg_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_cap_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_STRUCT,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -951,13 +1024,85 @@ static struct qmi_elem_info qmi_wlanfw_cap_resp_msg_v01_ei[] = {</div><div class='ctx'> 					   num_macs),</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.data_type      = QMI_OPT_FLAG,</div><div class='add'>+		.elem_len       = 1,</div><div class='add'>+		.elem_size      = sizeof(u8),</div><div class='add'>+		.array_type     = NO_ARRAY,</div><div class='add'>+		.tlv_type       = 0x16,</div><div class='add'>+		.offset         = offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   voltage_mv_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type      = QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len       = 1,</div><div class='add'>+		.elem_size      = sizeof(u32),</div><div class='add'>+		.array_type     = NO_ARRAY,</div><div class='add'>+		.tlv_type       = 0x16,</div><div class='add'>+		.offset         = offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   voltage_mv),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type      = QMI_OPT_FLAG,</div><div class='add'>+		.elem_len       = 1,</div><div class='add'>+		.elem_size      = sizeof(u8),</div><div class='add'>+		.array_type     = NO_ARRAY,</div><div class='add'>+		.tlv_type       = 0x17,</div><div class='add'>+		.offset         = offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   time_freq_hz_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type      = QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len       = 1,</div><div class='add'>+		.elem_size      = sizeof(u32),</div><div class='add'>+		.array_type     = NO_ARRAY,</div><div class='add'>+		.tlv_type       = 0x17,</div><div class='add'>+		.offset         = offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   time_freq_hz),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type      = QMI_OPT_FLAG,</div><div class='add'>+		.elem_len       = 1,</div><div class='add'>+		.elem_size      = sizeof(u8),</div><div class='add'>+		.array_type     = NO_ARRAY,</div><div class='add'>+		.tlv_type       = 0x18,</div><div class='add'>+		.offset         = offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   otp_version_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type      = QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len       = 1,</div><div class='add'>+		.elem_size      = sizeof(u32),</div><div class='add'>+		.array_type     = NO_ARRAY,</div><div class='add'>+		.tlv_type       = 0x18,</div><div class='add'>+		.offset         = offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   otp_version),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type      = QMI_OPT_FLAG,</div><div class='add'>+		.elem_len       = 1,</div><div class='add'>+		.elem_size      = sizeof(u8),</div><div class='add'>+		.array_type     = NO_ARRAY,</div><div class='add'>+		.tlv_type       = 0x19,</div><div class='add'>+		.offset         = offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   eeprom_read_timeout_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type      = QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len       = 1,</div><div class='add'>+		.elem_size      = sizeof(u32),</div><div class='add'>+		.array_type     = NO_ARRAY,</div><div class='add'>+		.tlv_type       = 0x19,</div><div class='add'>+		.offset         = offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   eeprom_read_timeout),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.data_type	= QMI_EOTI,</div><div class='ctx'> 		.array_type	= NO_ARRAY,</div><div class='ctx'> 		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_bdf_download_req_msg_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_bdf_download_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -1092,7 +1237,7 @@ static struct qmi_elem_info qmi_wlanfw_bdf_download_req_msg_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_bdf_download_resp_msg_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_bdf_download_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_STRUCT,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -1110,7 +1255,7 @@ static struct qmi_elem_info qmi_wlanfw_bdf_download_resp_msg_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_m3_info_req_msg_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_m3_info_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_UNSIGNED_8_BYTE,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -1134,7 +1279,7 @@ static struct qmi_elem_info qmi_wlanfw_m3_info_req_msg_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_m3_info_resp_msg_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_m3_info_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_STRUCT,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -1151,7 +1296,7 @@ static struct qmi_elem_info qmi_wlanfw_m3_info_resp_msg_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_ce_tgt_pipe_cfg_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_ce_tgt_pipe_cfg_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -1204,7 +1349,7 @@ static struct qmi_elem_info qmi_wlanfw_ce_tgt_pipe_cfg_s_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_ce_svc_pipe_cfg_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_ce_svc_pipe_cfg_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -1239,7 +1384,7 @@ static struct qmi_elem_info qmi_wlanfw_ce_svc_pipe_cfg_s_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_shadow_reg_cfg_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_shadow_reg_cfg_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_UNSIGNED_2_BYTE,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -1263,7 +1408,7 @@ static struct qmi_elem_info qmi_wlanfw_shadow_reg_cfg_s_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_shadow_reg_v2_cfg_s_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_shadow_reg_v2_cfg_s_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -1280,7 +1425,7 @@ static struct qmi_elem_info qmi_wlanfw_shadow_reg_v2_cfg_s_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_wlan_mode_req_msg_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_wlan_mode_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -1315,7 +1460,7 @@ static struct qmi_elem_info qmi_wlanfw_wlan_mode_req_msg_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_wlan_mode_resp_msg_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_wlan_mode_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_STRUCT,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -1333,7 +1478,7 @@ static struct qmi_elem_info qmi_wlanfw_wlan_mode_resp_msg_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_wlan_cfg_req_msg_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_wlan_cfg_req_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_OPT_FLAG,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -1472,7 +1617,7 @@ static struct qmi_elem_info qmi_wlanfw_wlan_cfg_req_msg_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_wlan_cfg_resp_msg_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_wlan_cfg_resp_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type	= QMI_STRUCT,</div><div class='ctx'> 		.elem_len	= 1,</div><div class='hunk'>@@ -1489,32 +1634,85 @@ static struct qmi_elem_info qmi_wlanfw_wlan_cfg_resp_msg_v01_ei[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_mem_ready_ind_msg_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_mem_ready_ind_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type = QMI_EOTI,</div><div class='ctx'> 		.array_type = NO_ARRAY,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_fw_ready_ind_msg_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_fw_ready_ind_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type = QMI_EOTI,</div><div class='ctx'> 		.array_type = NO_ARRAY,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct qmi_elem_info qmi_wlanfw_cold_boot_cal_done_ind_msg_v01_ei[] = {</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_cold_boot_cal_done_ind_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type = QMI_EOTI,</div><div class='add'>+		.array_type = NO_ARRAY,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_wlan_ini_req_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x10,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_ini_req_msg_v01,</div><div class='add'>+					   enablefwlog_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x10,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_ini_req_msg_v01,</div><div class='add'>+					   enablefwlog),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_wlan_ini_resp_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_response_type_v01),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x02,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_ini_resp_msg_v01,</div><div class='add'>+					   resp),</div><div class='add'>+		.ei_array	= qmi_response_type_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlfw_fw_init_done_ind_msg_v01_ei[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.data_type = QMI_EOTI,</div><div class='ctx'> 		.array_type = NO_ARRAY,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ath11k_qmi_host_cap_send(struct ath11k_base *ab)</div><div class='add'>+/* clang stack usage explodes if this is inlined */</div><div class='add'>+static noinline_for_stack</div><div class='add'>+int ath11k_qmi_host_cap_send(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	struct qmi_wlanfw_host_cap_req_msg_v01 req;</div><div class='ctx'> 	struct qmi_wlanfw_host_cap_resp_msg_v01 resp;</div><div class='del'>-	struct qmi_txn txn = {};</div><div class='add'>+	struct qmi_txn txn;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;req, 0, sizeof(req));</div><div class='hunk'>@@ -1527,7 +1725,7 @@ static int ath11k_qmi_host_cap_send(struct ath11k_base *ab)</div><div class='ctx'> 	req.bdf_support_valid = 1;</div><div class='ctx'> 	req.bdf_support = 1;</div><div class='ctx'> </div><div class='del'>-	if (ab-&gt;bus_params.m3_fw_support) {</div><div class='add'>+	if (ab-&gt;hw_params.m3_fw_support) {</div><div class='ctx'> 		req.m3_support_valid = 1;</div><div class='ctx'> 		req.m3_support = 1;</div><div class='ctx'> 		req.m3_cache_support_valid = 1;</div><div class='hunk'>@@ -1556,7 +1754,12 @@ static int ath11k_qmi_host_cap_send(struct ath11k_base *ab)</div><div class='ctx'> 		req.nm_modem |= SLEEP_CLOCK_SELECT_INTERNAL_BIT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi host cap request\n");</div><div class='add'>+	if (ab-&gt;hw_params.global_reset)</div><div class='add'>+		req.nm_modem |= PLATFORM_CAP_PCIE_GLOBAL_RESET;</div><div class='add'>+</div><div class='add'>+	req.nm_modem |= PLATFORM_CAP_PCIE_PME_D3COLD;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_QMI, "host cap request\n");</div><div class='ctx'> </div><div class='ctx'> 	ret = qmi_txn_init(&amp;ab-&gt;qmi.handle, &amp;txn,</div><div class='ctx'> 			   qmi_wlanfw_host_cap_resp_msg_v01_ei, &amp;resp);</div><div class='hunk'>@@ -1568,6 +1771,7 @@ static int ath11k_qmi_host_cap_send(struct ath11k_base *ab)</div><div class='ctx'> 			       QMI_WLANFW_HOST_CAP_REQ_MSG_V01_MAX_LEN,</div><div class='ctx'> 			       qmi_wlanfw_host_cap_req_msg_v01_ei, &amp;req);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='add'>+		qmi_txn_cancel(&amp;txn);</div><div class='ctx'> 		ath11k_warn(ab, "failed to send host capability request: %d\n", ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1609,10 +1813,6 @@ static int ath11k_qmi_fw_ind_register_send(struct ath11k_base *ab)</div><div class='ctx'> 	req-&gt;client_id = QMI_WLANFW_CLIENT_ID;</div><div class='ctx'> 	req-&gt;fw_ready_enable_valid = 1;</div><div class='ctx'> 	req-&gt;fw_ready_enable = 1;</div><div class='del'>-	req-&gt;request_mem_enable_valid = 1;</div><div class='del'>-	req-&gt;request_mem_enable = 1;</div><div class='del'>-	req-&gt;fw_mem_ready_enable_valid = 1;</div><div class='del'>-	req-&gt;fw_mem_ready_enable = 1;</div><div class='ctx'> 	req-&gt;cal_done_enable_valid = 1;</div><div class='ctx'> 	req-&gt;cal_done_enable = 1;</div><div class='ctx'> 	req-&gt;fw_init_done_enable_valid = 1;</div><div class='hunk'>@@ -1621,18 +1821,30 @@ static int ath11k_qmi_fw_ind_register_send(struct ath11k_base *ab)</div><div class='ctx'> 	req-&gt;pin_connect_result_enable_valid = 0;</div><div class='ctx'> 	req-&gt;pin_connect_result_enable = 0;</div><div class='ctx'> </div><div class='add'>+	/* WCN6750 doesn't request for DDR memory via QMI,</div><div class='add'>+	 * instead it uses a fixed 12MB reserved memory</div><div class='add'>+	 * region in DDR.</div><div class='add'>+	 */</div><div class='add'>+	if (!ab-&gt;hw_params.fixed_fw_mem) {</div><div class='add'>+		req-&gt;request_mem_enable_valid = 1;</div><div class='add'>+		req-&gt;request_mem_enable = 1;</div><div class='add'>+		req-&gt;fw_mem_ready_enable_valid = 1;</div><div class='add'>+		req-&gt;fw_mem_ready_enable = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = qmi_txn_init(handle, &amp;txn,</div><div class='ctx'> 			   qmi_wlanfw_ind_register_resp_msg_v01_ei, resp);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi indication register request\n");</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_QMI, "indication register request\n");</div><div class='ctx'> </div><div class='ctx'> 	ret = qmi_send_request(&amp;ab-&gt;qmi.handle, NULL, &amp;txn,</div><div class='ctx'> 			       QMI_WLANFW_IND_REGISTER_REQ_V01,</div><div class='ctx'> 			       QMI_WLANFW_IND_REGISTER_REQ_MSG_V01_MAX_LEN,</div><div class='ctx'> 			       qmi_wlanfw_ind_register_req_msg_v01_ei, req);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='add'>+		qmi_txn_cancel(&amp;txn);</div><div class='ctx'> 		ath11k_warn(ab, "failed to send indication register request: %d\n",</div><div class='ctx'> 			    ret);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1662,7 +1874,7 @@ static int ath11k_qmi_respond_fw_mem_request(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	struct qmi_wlanfw_respond_mem_req_msg_v01 *req;</div><div class='ctx'> 	struct qmi_wlanfw_respond_mem_resp_msg_v01 resp;</div><div class='del'>-	struct qmi_txn txn = {};</div><div class='add'>+	struct qmi_txn txn;</div><div class='ctx'> 	int ret = 0, i;</div><div class='ctx'> 	bool delayed;</div><div class='ctx'> </div><div class='hunk'>@@ -1674,12 +1886,14 @@ static int ath11k_qmi_respond_fw_mem_request(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> 	/* For QCA6390 by default FW requests a block of ~4M contiguous</div><div class='ctx'> 	 * DMA memory, it's hard to allocate from OS. So host returns</div><div class='del'>-	 * failure to FW and FW will then request mulitple blocks of small</div><div class='add'>+	 * failure to FW and FW will then request multiple blocks of small</div><div class='ctx'> 	 * chunk size memory.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!ab-&gt;bus_params.fixed_mem_region &amp;&amp; ab-&gt;qmi.target_mem_delayed) {</div><div class='add'>+	if (!(ab-&gt;hw_params.fixed_mem_region ||</div><div class='add'>+	      test_bit(ATH11K_FLAG_FIXED_MEM_RGN, &amp;ab-&gt;dev_flags)) &amp;&amp;</div><div class='add'>+	      ab-&gt;qmi.target_mem_delayed) {</div><div class='ctx'> 		delayed = true;</div><div class='del'>-		ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi delays mem_request %d\n",</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_QMI, "delays mem_request %d\n",</div><div class='ctx'> 			   ab-&gt;qmi.mem_seg_count);</div><div class='ctx'> 		memset(req, 0, sizeof(*req));</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1691,7 +1905,7 @@ static int ath11k_qmi_respond_fw_mem_request(struct ath11k_base *ab)</div><div class='ctx'> 			req-&gt;mem_seg[i].size = ab-&gt;qmi.target_mem[i].size;</div><div class='ctx'> 			req-&gt;mem_seg[i].type = ab-&gt;qmi.target_mem[i].type;</div><div class='ctx'> 			ath11k_dbg(ab, ATH11K_DBG_QMI,</div><div class='del'>-				   "qmi req mem_seg[%d] %pad %u %u\n", i,</div><div class='add'>+				   "req mem_seg[%d] %pad %u %u\n", i,</div><div class='ctx'> 				    &amp;ab-&gt;qmi.target_mem[i].paddr,</div><div class='ctx'> 				    ab-&gt;qmi.target_mem[i].size,</div><div class='ctx'> 				    ab-&gt;qmi.target_mem[i].type);</div><div class='hunk'>@@ -1703,7 +1917,7 @@ static int ath11k_qmi_respond_fw_mem_request(struct ath11k_base *ab)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi respond memory request delayed %i\n",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_QMI, "respond memory request delayed %i\n",</div><div class='ctx'> 		   delayed);</div><div class='ctx'> </div><div class='ctx'> 	ret = qmi_send_request(&amp;ab-&gt;qmi.handle, NULL, &amp;txn,</div><div class='hunk'>@@ -1711,6 +1925,7 @@ static int ath11k_qmi_respond_fw_mem_request(struct ath11k_base *ab)</div><div class='ctx'> 			       QMI_WLANFW_RESPOND_MEM_REQ_MSG_V01_MAX_LEN,</div><div class='ctx'> 			       qmi_wlanfw_respond_mem_req_msg_v01_ei, req);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='add'>+		qmi_txn_cancel(&amp;txn);</div><div class='ctx'> 		ath11k_warn(ab, "failed to respond qmi memory request: %d\n",</div><div class='ctx'> 			    ret);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1743,15 +1958,19 @@ static void ath11k_qmi_free_target_mem_chunk(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (ab-&gt;bus_params.fixed_mem_region)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; ab-&gt;qmi.mem_seg_count; i++) {</div><div class='del'>-		if (!ab-&gt;qmi.target_mem[i].vaddr)</div><div class='add'>+		if (!ab-&gt;qmi.target_mem[i].anyaddr)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (ab-&gt;hw_params.fixed_mem_region ||</div><div class='add'>+		    test_bit(ATH11K_FLAG_FIXED_MEM_RGN, &amp;ab-&gt;dev_flags)) {</div><div class='add'>+			iounmap(ab-&gt;qmi.target_mem[i].iaddr);</div><div class='add'>+			ab-&gt;qmi.target_mem[i].iaddr = NULL;</div><div class='ctx'> 			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		dma_free_coherent(ab-&gt;dev,</div><div class='del'>-				  ab-&gt;qmi.target_mem[i].size,</div><div class='add'>+				  ab-&gt;qmi.target_mem[i].prev_size,</div><div class='ctx'> 				  ab-&gt;qmi.target_mem[i].vaddr,</div><div class='ctx'> 				  ab-&gt;qmi.target_mem[i].paddr);</div><div class='ctx'> 		ab-&gt;qmi.target_mem[i].vaddr = NULL;</div><div class='hunk'>@@ -1767,14 +1986,38 @@ static int ath11k_qmi_alloc_target_mem_chunk(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ab-&gt;qmi.mem_seg_count; i++) {</div><div class='ctx'> 		chunk = &amp;ab-&gt;qmi.target_mem[i];</div><div class='add'>+</div><div class='add'>+		/* Firmware reloads in coldboot/firmware recovery.</div><div class='add'>+		 * in such case, no need to allocate memory for FW again.</div><div class='add'>+		 */</div><div class='add'>+		if (chunk-&gt;vaddr) {</div><div class='add'>+			if (chunk-&gt;prev_type == chunk-&gt;type &amp;&amp;</div><div class='add'>+			    chunk-&gt;prev_size == chunk-&gt;size)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (ab-&gt;qmi.mem_seg_count &lt;= ATH11K_QMI_FW_MEM_REQ_SEGMENT_CNT) {</div><div class='add'>+				ath11k_dbg(ab, ATH11K_DBG_QMI,</div><div class='add'>+					   "size/type mismatch (current %d %u) (prev %d %u), try later with small size\n",</div><div class='add'>+					    chunk-&gt;size, chunk-&gt;type,</div><div class='add'>+					    chunk-&gt;prev_size, chunk-&gt;prev_type);</div><div class='add'>+				ab-&gt;qmi.target_mem_delayed = true;</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* cannot reuse the existing chunk */</div><div class='add'>+			dma_free_coherent(ab-&gt;dev, chunk-&gt;prev_size,</div><div class='add'>+					  chunk-&gt;vaddr, chunk-&gt;paddr);</div><div class='add'>+			chunk-&gt;vaddr = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		chunk-&gt;vaddr = dma_alloc_coherent(ab-&gt;dev,</div><div class='ctx'> 						  chunk-&gt;size,</div><div class='ctx'> 						  &amp;chunk-&gt;paddr,</div><div class='del'>-						  GFP_KERNEL);</div><div class='add'>+						  GFP_KERNEL | __GFP_NOWARN);</div><div class='ctx'> 		if (!chunk-&gt;vaddr) {</div><div class='ctx'> 			if (ab-&gt;qmi.mem_seg_count &lt;= ATH11K_QMI_FW_MEM_REQ_SEGMENT_CNT) {</div><div class='ctx'> 				ath11k_dbg(ab, ATH11K_DBG_QMI,</div><div class='del'>-					   "qmi dma allocation failed (%d B type %u), will try later with small size\n",</div><div class='add'>+					   "dma allocation failed (%d B type %u), will try later with small size\n",</div><div class='ctx'> 					    chunk-&gt;size,</div><div class='ctx'> 					    chunk-&gt;type);</div><div class='ctx'> 				ath11k_qmi_free_target_mem_chunk(ab);</div><div class='hunk'>@@ -1787,6 +2030,8 @@ static int ath11k_qmi_alloc_target_mem_chunk(struct ath11k_base *ab)</div><div class='ctx'> 				   chunk-&gt;type);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='add'>+		chunk-&gt;prev_type = chunk-&gt;type;</div><div class='add'>+		chunk-&gt;prev_size = chunk-&gt;size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1794,13 +2039,42 @@ static int ath11k_qmi_alloc_target_mem_chunk(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> static int ath11k_qmi_assign_target_mem_chunk(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='del'>-	int i, idx;</div><div class='add'>+	struct device *dev = ab-&gt;dev;</div><div class='add'>+	struct resource res = {};</div><div class='add'>+	u32 host_ddr_sz;</div><div class='add'>+	int i, idx, ret;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0, idx = 0; i &lt; ab-&gt;qmi.mem_seg_count; i++) {</div><div class='ctx'> 		switch (ab-&gt;qmi.target_mem[i].type) {</div><div class='add'>+		case HOST_DDR_REGION_TYPE:</div><div class='add'>+			ret = of_reserved_mem_region_to_resource(dev-&gt;of_node, 0, &amp;res);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath11k_dbg(ab, ATH11K_DBG_QMI,</div><div class='add'>+					   "fail to get reg from hremote\n");</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (res.end - res.start + 1 &lt; ab-&gt;qmi.target_mem[i].size) {</div><div class='add'>+				ath11k_dbg(ab, ATH11K_DBG_QMI,</div><div class='add'>+					   "fail to assign memory of sz\n");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ab-&gt;qmi.target_mem[idx].paddr = res.start;</div><div class='add'>+			ab-&gt;qmi.target_mem[idx].iaddr =</div><div class='add'>+				ioremap(ab-&gt;qmi.target_mem[idx].paddr,</div><div class='add'>+					ab-&gt;qmi.target_mem[i].size);</div><div class='add'>+			if (!ab-&gt;qmi.target_mem[idx].iaddr)</div><div class='add'>+				return -EIO;</div><div class='add'>+</div><div class='add'>+			ab-&gt;qmi.target_mem[idx].size = ab-&gt;qmi.target_mem[i].size;</div><div class='add'>+			host_ddr_sz = ab-&gt;qmi.target_mem[i].size;</div><div class='add'>+			ab-&gt;qmi.target_mem[idx].type = ab-&gt;qmi.target_mem[i].type;</div><div class='add'>+			idx++;</div><div class='add'>+			break;</div><div class='ctx'> 		case BDF_MEM_REGION_TYPE:</div><div class='ctx'> 			ab-&gt;qmi.target_mem[idx].paddr = ab-&gt;hw_params.bdf_addr;</div><div class='del'>-			ab-&gt;qmi.target_mem[idx].vaddr = NULL;</div><div class='add'>+			ab-&gt;qmi.target_mem[idx].iaddr = NULL;</div><div class='ctx'> 			ab-&gt;qmi.target_mem[idx].size = ab-&gt;qmi.target_mem[i].size;</div><div class='ctx'> 			ab-&gt;qmi.target_mem[idx].type = ab-&gt;qmi.target_mem[i].type;</div><div class='ctx'> 			idx++;</div><div class='hunk'>@@ -1811,14 +2085,23 @@ static int ath11k_qmi_assign_target_mem_chunk(struct ath11k_base *ab)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (ath11k_cold_boot_cal &amp;&amp; ab-&gt;hw_params.cold_boot_calib) {</div><div class='del'>-				ab-&gt;qmi.target_mem[idx].paddr =</div><div class='del'>-						     ATH11K_QMI_CALDB_ADDRESS;</div><div class='del'>-				ab-&gt;qmi.target_mem[idx].vaddr =</div><div class='del'>-						     (void *)ATH11K_QMI_CALDB_ADDRESS;</div><div class='add'>+			if (ath11k_core_coldboot_cal_support(ab)) {</div><div class='add'>+				if (resource_size(&amp;res)) {</div><div class='add'>+					ab-&gt;qmi.target_mem[idx].paddr =</div><div class='add'>+							res.start + host_ddr_sz;</div><div class='add'>+					ab-&gt;qmi.target_mem[idx].iaddr =</div><div class='add'>+						ioremap(ab-&gt;qmi.target_mem[idx].paddr,</div><div class='add'>+							ab-&gt;qmi.target_mem[i].size);</div><div class='add'>+					if (!ab-&gt;qmi.target_mem[idx].iaddr)</div><div class='add'>+						return -EIO;</div><div class='add'>+				} else {</div><div class='add'>+					ab-&gt;qmi.target_mem[idx].paddr =</div><div class='add'>+						ATH11K_QMI_CALDB_ADDRESS;</div><div class='add'>+					ab-&gt;qmi.target_mem[idx].iaddr = NULL;</div><div class='add'>+				}</div><div class='ctx'> 			} else {</div><div class='ctx'> 				ab-&gt;qmi.target_mem[idx].paddr = 0;</div><div class='del'>-				ab-&gt;qmi.target_mem[idx].vaddr = NULL;</div><div class='add'>+				ab-&gt;qmi.target_mem[idx].iaddr = NULL;</div><div class='ctx'> 			}</div><div class='ctx'> 			ab-&gt;qmi.target_mem[idx].size = ab-&gt;qmi.target_mem[i].size;</div><div class='ctx'> 			ab-&gt;qmi.target_mem[idx].type = ab-&gt;qmi.target_mem[i].type;</div><div class='hunk'>@@ -1835,29 +2118,109 @@ static int ath11k_qmi_assign_target_mem_chunk(struct ath11k_base *ab)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ath11k_qmi_request_device_info(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct qmi_wlanfw_device_info_req_msg_v01 req = {};</div><div class='add'>+	struct qmi_wlanfw_device_info_resp_msg_v01 resp = {};</div><div class='add'>+	struct qmi_txn txn;</div><div class='add'>+	void __iomem *bar_addr_va;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* device info message req is only sent for hybrid bus devices */</div><div class='add'>+	if (!ab-&gt;hw_params.hybrid_bus_type)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = qmi_txn_init(&amp;ab-&gt;qmi.handle, &amp;txn,</div><div class='add'>+			   qmi_wlfw_device_info_resp_msg_v01_ei, &amp;resp);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = qmi_send_request(&amp;ab-&gt;qmi.handle, NULL, &amp;txn,</div><div class='add'>+			       QMI_WLANFW_DEVICE_INFO_REQ_V01,</div><div class='add'>+			       QMI_WLANFW_DEVICE_INFO_REQ_MSG_V01_MAX_LEN,</div><div class='add'>+			       qmi_wlanfw_device_info_req_msg_v01_ei, &amp;req);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		qmi_txn_cancel(&amp;txn);</div><div class='add'>+		ath11k_warn(ab, "failed to send qmi target device info request: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = qmi_txn_wait(&amp;txn, msecs_to_jiffies(ATH11K_QMI_WLANFW_TIMEOUT_MS));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath11k_warn(ab, "failed to wait qmi target device info request: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {</div><div class='add'>+		ath11k_warn(ab, "qmi device info request failed: %d %d\n",</div><div class='add'>+			    resp.resp.result, resp.resp.error);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!resp.bar_addr_valid || !resp.bar_size_valid) {</div><div class='add'>+		ath11k_warn(ab, "qmi device info response invalid: %d %d\n",</div><div class='add'>+			    resp.resp.result, resp.resp.error);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!resp.bar_addr ||</div><div class='add'>+	    resp.bar_size != ATH11K_QMI_DEVICE_BAR_SIZE) {</div><div class='add'>+		ath11k_warn(ab, "qmi device info invalid address and size: %llu %u\n",</div><div class='add'>+			    resp.bar_addr, resp.bar_size);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bar_addr_va = devm_ioremap(ab-&gt;dev, resp.bar_addr, resp.bar_size);</div><div class='add'>+</div><div class='add'>+	if (!bar_addr_va) {</div><div class='add'>+		ath11k_warn(ab, "qmi device info ioremap failed\n");</div><div class='add'>+		ab-&gt;mem_len = 0;</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab-&gt;mem = bar_addr_va;</div><div class='add'>+	ab-&gt;mem_len = resp.bar_size;</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;hw_params.ce_remap)</div><div class='add'>+		ab-&gt;mem_ce = ab-&gt;mem;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath11k_qmi_request_target_cap(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	struct qmi_wlanfw_cap_req_msg_v01 req;</div><div class='ctx'> 	struct qmi_wlanfw_cap_resp_msg_v01 resp;</div><div class='del'>-	struct qmi_txn txn = {};</div><div class='add'>+	struct qmi_txn txn;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int r;</div><div class='add'>+	char *fw_build_id;</div><div class='add'>+	int fw_build_id_mask_len;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;req, 0, sizeof(req));</div><div class='ctx'> 	memset(&amp;resp, 0, sizeof(resp));</div><div class='ctx'> </div><div class='del'>-	ret = qmi_txn_init(&amp;ab-&gt;qmi.handle, &amp;txn,</div><div class='del'>-			   qmi_wlanfw_cap_resp_msg_v01_ei, &amp;resp);</div><div class='add'>+	ret = qmi_txn_init(&amp;ab-&gt;qmi.handle, &amp;txn, qmi_wlanfw_cap_resp_msg_v01_ei,</div><div class='add'>+			   &amp;resp);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi target cap request\n");</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_QMI, "target cap request\n");</div><div class='ctx'> </div><div class='ctx'> 	ret = qmi_send_request(&amp;ab-&gt;qmi.handle, NULL, &amp;txn,</div><div class='ctx'> 			       QMI_WLANFW_CAP_REQ_V01,</div><div class='ctx'> 			       QMI_WLANFW_CAP_REQ_MSG_V01_MAX_LEN,</div><div class='ctx'> 			       qmi_wlanfw_cap_req_msg_v01_ei, &amp;req);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='add'>+		qmi_txn_cancel(&amp;txn);</div><div class='ctx'> 		ath11k_warn(ab, "failed to send qmi cap request: %d\n",</div><div class='ctx'> 			    ret);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1891,15 +2254,26 @@ static int ath11k_qmi_request_target_cap(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> 	if (resp.fw_version_info_valid) {</div><div class='ctx'> 		ab-&gt;qmi.target.fw_version = resp.fw_version_info.fw_version;</div><div class='del'>-		strlcpy(ab-&gt;qmi.target.fw_build_timestamp,</div><div class='add'>+		strscpy(ab-&gt;qmi.target.fw_build_timestamp,</div><div class='ctx'> 			resp.fw_version_info.fw_build_timestamp,</div><div class='ctx'> 			sizeof(ab-&gt;qmi.target.fw_build_timestamp));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (resp.fw_build_id_valid)</div><div class='del'>-		strlcpy(ab-&gt;qmi.target.fw_build_id, resp.fw_build_id,</div><div class='add'>+		strscpy(ab-&gt;qmi.target.fw_build_id, resp.fw_build_id,</div><div class='ctx'> 			sizeof(ab-&gt;qmi.target.fw_build_id));</div><div class='ctx'> </div><div class='add'>+	if (resp.eeprom_read_timeout_valid) {</div><div class='add'>+		ab-&gt;qmi.target.eeprom_caldata =</div><div class='add'>+					resp.eeprom_read_timeout;</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_QMI, "cal data supported from eeprom\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fw_build_id = ab-&gt;qmi.target.fw_build_id;</div><div class='add'>+	fw_build_id_mask_len = strlen(FW_BUILD_ID_MASK);</div><div class='add'>+	if (!strncmp(fw_build_id, FW_BUILD_ID_MASK, fw_build_id_mask_len))</div><div class='add'>+		fw_build_id = fw_build_id + fw_build_id_mask_len;</div><div class='add'>+</div><div class='ctx'> 	ath11k_info(ab, "chip_id 0x%x chip_family 0x%x board_id 0x%x soc_id 0x%x\n",</div><div class='ctx'> 		    ab-&gt;qmi.target.chip_id, ab-&gt;qmi.target.chip_family,</div><div class='ctx'> 		    ab-&gt;qmi.target.board_id, ab-&gt;qmi.target.soc_id);</div><div class='hunk'>@@ -1907,7 +2281,11 @@ static int ath11k_qmi_request_target_cap(struct ath11k_base *ab)</div><div class='ctx'> 	ath11k_info(ab, "fw_version 0x%x fw_build_timestamp %s fw_build_id %s",</div><div class='ctx'> 		    ab-&gt;qmi.target.fw_version,</div><div class='ctx'> 		    ab-&gt;qmi.target.fw_build_timestamp,</div><div class='del'>-		    ab-&gt;qmi.target.fw_build_id);</div><div class='add'>+		    fw_build_id);</div><div class='add'>+</div><div class='add'>+	r = ath11k_core_check_smbios(ab);</div><div class='add'>+	if (r)</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_QMI, "SMBIOS bdf variant name not set.\n");</div><div class='ctx'> </div><div class='ctx'> 	r = ath11k_core_check_dt(ab);</div><div class='ctx'> 	if (r)</div><div class='hunk'>@@ -1917,100 +2295,75 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-ath11k_qmi_prepare_bdf_download(struct ath11k_base *ab, int type,</div><div class='del'>-				struct qmi_wlanfw_bdf_download_req_msg_v01 *req,</div><div class='del'>-				void __iomem *bdf_addr)</div><div class='del'>-{</div><div class='del'>-	const struct firmware *fw_entry;</div><div class='del'>-	struct ath11k_board_data bd;</div><div class='del'>-	u32 fw_size;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case ATH11K_QMI_FILE_TYPE_BDF_GOLDEN:</div><div class='del'>-		memset(&amp;bd, 0, sizeof(bd));</div><div class='del'>-</div><div class='del'>-		ret = ath11k_core_fetch_bdf(ab, &amp;bd);</div><div class='del'>-		if (ret) {</div><div class='del'>-			ath11k_warn(ab, "failed to load board file: %d\n", ret);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		fw_size = min_t(u32, ab-&gt;hw_params.fw.board_size, bd.len);</div><div class='del'>-		memcpy_toio(bdf_addr, bd.data, fw_size);</div><div class='del'>-		ath11k_core_free_bdf(ab, &amp;bd);</div><div class='del'>-		break;</div><div class='del'>-	case ATH11K_QMI_FILE_TYPE_CALDATA:</div><div class='del'>-		fw_entry = ath11k_core_firmware_request(ab, ATH11K_DEFAULT_CAL_FILE);</div><div class='del'>-		if (IS_ERR(fw_entry)) {</div><div class='del'>-			ret = PTR_ERR(fw_entry);</div><div class='del'>-			ath11k_warn(ab, "failed to load %s: %d\n",</div><div class='del'>-				    ATH11K_DEFAULT_CAL_FILE, ret);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		fw_size = min_t(u32, ab-&gt;hw_params.fw.board_size,</div><div class='del'>-				fw_entry-&gt;size);</div><div class='del'>-</div><div class='del'>-		memcpy_toio(bdf_addr + ATH11K_QMI_CALDATA_OFFSET,</div><div class='del'>-			    fw_entry-&gt;data, fw_size);</div><div class='del'>-</div><div class='del'>-		release_firmware(fw_entry);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	req-&gt;total_size = fw_size;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ath11k_qmi_load_bdf_fixed_addr(struct ath11k_base *ab)</div><div class='add'>+static int ath11k_qmi_load_file_target_mem(struct ath11k_base *ab,</div><div class='add'>+					   const u8 *data, u32 len, u8 type)</div><div class='ctx'> {</div><div class='ctx'> 	struct qmi_wlanfw_bdf_download_req_msg_v01 *req;</div><div class='ctx'> 	struct qmi_wlanfw_bdf_download_resp_msg_v01 resp;</div><div class='del'>-	struct qmi_txn txn = {};</div><div class='add'>+	struct qmi_txn txn;</div><div class='add'>+	const u8 *temp = data;</div><div class='ctx'> 	void __iomem *bdf_addr = NULL;</div><div class='del'>-	int type, ret;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u32 remaining = len;</div><div class='ctx'> </div><div class='ctx'> 	req = kzalloc(sizeof(*req), GFP_KERNEL);</div><div class='ctx'> 	if (!req)</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	memset(&amp;resp, 0, sizeof(resp));</div><div class='ctx'> </div><div class='del'>-	bdf_addr = ioremap(ab-&gt;hw_params.bdf_addr, ATH11K_QMI_BDF_MAX_SIZE);</div><div class='del'>-	if (!bdf_addr) {</div><div class='del'>-		ath11k_warn(ab, "failed ioremap for board file\n");</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out;</div><div class='add'>+	if (ab-&gt;hw_params.fixed_bdf_addr) {</div><div class='add'>+		bdf_addr = ioremap(ab-&gt;hw_params.bdf_addr, ab-&gt;hw_params.fw.board_size);</div><div class='add'>+		if (!bdf_addr) {</div><div class='add'>+			ath11k_warn(ab, "qmi ioremap error for bdf_addr\n");</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			goto err_free_req;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (type = 0; type &lt; ATH11K_QMI_MAX_FILE_TYPE; type++) {</div><div class='add'>+	while (remaining) {</div><div class='ctx'> 		req-&gt;valid = 1;</div><div class='ctx'> 		req-&gt;file_id_valid = 1;</div><div class='ctx'> 		req-&gt;file_id = ab-&gt;qmi.target.board_id;</div><div class='ctx'> 		req-&gt;total_size_valid = 1;</div><div class='add'>+		req-&gt;total_size = remaining;</div><div class='ctx'> 		req-&gt;seg_id_valid = 1;</div><div class='del'>-		req-&gt;seg_id = type;</div><div class='del'>-		req-&gt;data_valid = 0;</div><div class='del'>-		req-&gt;data_len = ATH11K_QMI_MAX_BDF_FILE_NAME_SIZE;</div><div class='del'>-		req-&gt;bdf_type = 0;</div><div class='del'>-		req-&gt;bdf_type_valid = 0;</div><div class='add'>+		req-&gt;data_valid = 1;</div><div class='add'>+		req-&gt;bdf_type = type;</div><div class='add'>+		req-&gt;bdf_type_valid = 1;</div><div class='ctx'> 		req-&gt;end_valid = 1;</div><div class='del'>-		req-&gt;end = 1;</div><div class='add'>+		req-&gt;end = 0;</div><div class='ctx'> </div><div class='del'>-		ret = ath11k_qmi_prepare_bdf_download(ab, type, req, bdf_addr);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out_qmi_bdf;</div><div class='add'>+		if (remaining &gt; QMI_WLANFW_MAX_DATA_SIZE_V01) {</div><div class='add'>+			req-&gt;data_len = QMI_WLANFW_MAX_DATA_SIZE_V01;</div><div class='add'>+		} else {</div><div class='add'>+			req-&gt;data_len = remaining;</div><div class='add'>+			req-&gt;end = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ab-&gt;hw_params.fixed_bdf_addr ||</div><div class='add'>+		    type == ATH11K_QMI_FILE_TYPE_EEPROM) {</div><div class='add'>+			req-&gt;data_valid = 0;</div><div class='add'>+			req-&gt;end = 1;</div><div class='add'>+			req-&gt;data_len = ATH11K_QMI_MAX_BDF_FILE_NAME_SIZE;</div><div class='add'>+		} else {</div><div class='add'>+			memcpy(req-&gt;data, temp, req-&gt;data_len);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ab-&gt;hw_params.fixed_bdf_addr) {</div><div class='add'>+			if (type == ATH11K_QMI_FILE_TYPE_CALDATA)</div><div class='add'>+				bdf_addr += ab-&gt;hw_params.fw.cal_offset;</div><div class='add'>+</div><div class='add'>+			memcpy_toio(bdf_addr, temp, len);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		ret = qmi_txn_init(&amp;ab-&gt;qmi.handle, &amp;txn,</div><div class='ctx'> 				   qmi_wlanfw_bdf_download_resp_msg_v01_ei,</div><div class='ctx'> 				   &amp;resp);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out_qmi_bdf;</div><div class='add'>+			goto err_iounmap;</div><div class='ctx'> </div><div class='del'>-		ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi bdf download req fixed addr type %d\n",</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_QMI, "bdf download req fixed addr type %d\n",</div><div class='ctx'> 			   type);</div><div class='ctx'> </div><div class='ctx'> 		ret = qmi_send_request(&amp;ab-&gt;qmi.handle, NULL, &amp;txn,</div><div class='hunk'>@@ -2019,185 +2372,225 @@ static int ath11k_qmi_load_bdf_fixed_addr(struct ath11k_base *ab)</div><div class='ctx'> 				       qmi_wlanfw_bdf_download_req_msg_v01_ei, req);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			qmi_txn_cancel(&amp;txn);</div><div class='del'>-			goto out_qmi_bdf;</div><div class='add'>+			goto err_iounmap;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = qmi_txn_wait(&amp;txn, msecs_to_jiffies(ATH11K_QMI_WLANFW_TIMEOUT_MS));</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out_qmi_bdf;</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			ath11k_warn(ab, "failed to wait board file download request: %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+			goto err_iounmap;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {</div><div class='ctx'> 			ath11k_warn(ab, "board file download request failed: %d %d\n",</div><div class='ctx'> 				    resp.resp.result, resp.resp.error);</div><div class='ctx'> 			ret = -EINVAL;</div><div class='del'>-			goto out_qmi_bdf;</div><div class='add'>+			goto err_iounmap;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ab-&gt;hw_params.fixed_bdf_addr ||</div><div class='add'>+		    type == ATH11K_QMI_FILE_TYPE_EEPROM) {</div><div class='add'>+			remaining = 0;</div><div class='add'>+		} else {</div><div class='add'>+			remaining -= req-&gt;data_len;</div><div class='add'>+			temp += req-&gt;data_len;</div><div class='add'>+			req-&gt;seg_id++;</div><div class='add'>+			ath11k_dbg(ab, ATH11K_DBG_QMI, "bdf download request remaining %i\n",</div><div class='add'>+				   remaining);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out_qmi_bdf:</div><div class='del'>-	iounmap(bdf_addr);</div><div class='del'>-out:</div><div class='add'>+err_iounmap:</div><div class='add'>+	if (ab-&gt;hw_params.fixed_bdf_addr)</div><div class='add'>+		iounmap(bdf_addr);</div><div class='add'>+</div><div class='add'>+err_free_req:</div><div class='ctx'> 	kfree(req);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_qmi_load_bdf_qmi(struct ath11k_base *ab)</div><div class='add'>+static int ath11k_qmi_load_bdf_qmi(struct ath11k_base *ab,</div><div class='add'>+				   bool regdb)</div><div class='ctx'> {</div><div class='del'>-	struct qmi_wlanfw_bdf_download_req_msg_v01 *req;</div><div class='del'>-	struct qmi_wlanfw_bdf_download_resp_msg_v01 resp;</div><div class='add'>+	struct device *dev = ab-&gt;dev;</div><div class='add'>+	char filename[ATH11K_QMI_MAX_BDF_FILE_NAME_SIZE];</div><div class='add'>+	const struct firmware *fw_entry;</div><div class='ctx'> 	struct ath11k_board_data bd;</div><div class='del'>-	unsigned int remaining;</div><div class='del'>-	struct qmi_txn txn = {};</div><div class='del'>-	int ret;</div><div class='del'>-	const u8 *temp;</div><div class='del'>-	int bdf_type;</div><div class='del'>-</div><div class='del'>-	req = kzalloc(sizeof(*req), GFP_KERNEL);</div><div class='del'>-	if (!req)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	memset(&amp;resp, 0, sizeof(resp));</div><div class='add'>+	u32 fw_size, file_type;</div><div class='add'>+	int ret = 0, bdf_type;</div><div class='add'>+	const u8 *tmp;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;bd, 0, sizeof(bd));</div><div class='del'>-	ret = ath11k_core_fetch_bdf(ab, &amp;bd);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ath11k_warn(ab, "failed to fetch board file: %d\n", ret);</div><div class='del'>-		goto out;</div><div class='add'>+</div><div class='add'>+	if (regdb) {</div><div class='add'>+		ret = ath11k_core_fetch_regdb(ab, &amp;bd);</div><div class='add'>+	} else {</div><div class='add'>+		ret = ath11k_core_fetch_bdf(ab, &amp;bd);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath11k_warn(ab, "qmi failed to fetch board file: %d\n", ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	temp = bd.data;</div><div class='del'>-	remaining = bd.len;</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	if (bd.len &gt;= SELFMAG &amp;&amp; memcmp(bd.data, ELFMAG, SELFMAG) == 0)</div><div class='add'>+	if (regdb)</div><div class='add'>+		bdf_type = ATH11K_QMI_BDF_TYPE_REGDB;</div><div class='add'>+	else if (bd.len &gt;= SELFMAG &amp;&amp; memcmp(bd.data, ELFMAG, SELFMAG) == 0)</div><div class='ctx'> 		bdf_type = ATH11K_QMI_BDF_TYPE_ELF;</div><div class='ctx'> 	else</div><div class='ctx'> 		bdf_type = ATH11K_QMI_BDF_TYPE_BIN;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi bdf_type %d\n", bdf_type);</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_QMI, "bdf_type %d\n", bdf_type);</div><div class='ctx'> </div><div class='del'>-	while (remaining) {</div><div class='del'>-		req-&gt;valid = 1;</div><div class='del'>-		req-&gt;file_id_valid = 1;</div><div class='del'>-		req-&gt;file_id = ab-&gt;qmi.target.board_id;</div><div class='del'>-		req-&gt;total_size_valid = 1;</div><div class='del'>-		req-&gt;total_size = bd.len;</div><div class='del'>-		req-&gt;seg_id_valid = 1;</div><div class='del'>-		req-&gt;data_valid = 1;</div><div class='del'>-		req-&gt;data_len = ATH11K_QMI_MAX_BDF_FILE_NAME_SIZE;</div><div class='del'>-		req-&gt;bdf_type = bdf_type;</div><div class='del'>-		req-&gt;bdf_type_valid = 1;</div><div class='del'>-		req-&gt;end_valid = 1;</div><div class='del'>-		req-&gt;end = 0;</div><div class='add'>+	fw_size = min_t(u32, ab-&gt;hw_params.fw.board_size, bd.len);</div><div class='ctx'> </div><div class='del'>-		if (remaining &gt; QMI_WLANFW_MAX_DATA_SIZE_V01) {</div><div class='del'>-			req-&gt;data_len = QMI_WLANFW_MAX_DATA_SIZE_V01;</div><div class='del'>-		} else {</div><div class='del'>-			req-&gt;data_len = remaining;</div><div class='del'>-			req-&gt;end = 1;</div><div class='del'>-		}</div><div class='add'>+	ret = ath11k_qmi_load_file_target_mem(ab, bd.data, fw_size, bdf_type);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath11k_warn(ab, "qmi failed to load bdf file\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		memcpy(req-&gt;data, temp, req-&gt;data_len);</div><div class='add'>+	/* QCA6390/WCN6855 does not support cal data, skip it */</div><div class='add'>+	if (bdf_type == ATH11K_QMI_BDF_TYPE_ELF || bdf_type == ATH11K_QMI_BDF_TYPE_REGDB)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-		ret = qmi_txn_init(&amp;ab-&gt;qmi.handle, &amp;txn,</div><div class='del'>-				   qmi_wlanfw_bdf_download_resp_msg_v01_ei,</div><div class='del'>-				   &amp;resp);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out_qmi_bdf;</div><div class='add'>+	if (ab-&gt;qmi.target.eeprom_caldata) {</div><div class='add'>+		file_type = ATH11K_QMI_FILE_TYPE_EEPROM;</div><div class='add'>+		tmp = filename;</div><div class='add'>+		fw_size = ATH11K_QMI_MAX_BDF_FILE_NAME_SIZE;</div><div class='add'>+	} else {</div><div class='add'>+		file_type = ATH11K_QMI_FILE_TYPE_CALDATA;</div><div class='ctx'> </div><div class='del'>-		ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi bdf download request remaining %i\n",</div><div class='del'>-			   remaining);</div><div class='add'>+		/* cal-&lt;bus&gt;-&lt;id&gt;.bin */</div><div class='add'>+		snprintf(filename, sizeof(filename), "cal-%s-%s.bin",</div><div class='add'>+			 ath11k_bus_str(ab-&gt;hif.bus), dev_name(dev));</div><div class='add'>+		fw_entry = ath11k_core_firmware_request(ab, filename);</div><div class='add'>+		if (!IS_ERR(fw_entry))</div><div class='add'>+			goto success;</div><div class='ctx'> </div><div class='del'>-		ret = qmi_send_request(&amp;ab-&gt;qmi.handle, NULL, &amp;txn,</div><div class='del'>-				       QMI_WLANFW_BDF_DOWNLOAD_REQ_V01,</div><div class='del'>-				       QMI_WLANFW_BDF_DOWNLOAD_REQ_MSG_V01_MAX_LEN,</div><div class='del'>-				       qmi_wlanfw_bdf_download_req_msg_v01_ei, req);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			qmi_txn_cancel(&amp;txn);</div><div class='del'>-			goto out_qmi_bdf;</div><div class='add'>+		fw_entry = ath11k_core_firmware_request(ab, ATH11K_DEFAULT_CAL_FILE);</div><div class='add'>+		if (IS_ERR(fw_entry)) {</div><div class='add'>+			/* Caldata may not be present during first time calibration in</div><div class='add'>+			 * factory hence allow to boot without loading caldata in ftm mode</div><div class='add'>+			 */</div><div class='add'>+			if (ath11k_ftm_mode) {</div><div class='add'>+				ath11k_info(ab,</div><div class='add'>+					    "Booting without cal data file in factory test mode\n");</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+			ret = PTR_ERR(fw_entry);</div><div class='add'>+			ath11k_warn(ab,</div><div class='add'>+				    "qmi failed to load CAL data file:%s\n",</div><div class='add'>+				    filename);</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='add'>+success:</div><div class='add'>+		fw_size = min_t(u32, ab-&gt;hw_params.fw.board_size, fw_entry-&gt;size);</div><div class='add'>+		tmp = fw_entry-&gt;data;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		ret = qmi_txn_wait(&amp;txn, msecs_to_jiffies(ATH11K_QMI_WLANFW_TIMEOUT_MS));</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out_qmi_bdf;</div><div class='del'>-</div><div class='del'>-		if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {</div><div class='del'>-			ath11k_warn(ab, "bdf download request failed: %d %d\n",</div><div class='del'>-				    resp.resp.result, resp.resp.error);</div><div class='del'>-			ret = resp.resp.result;</div><div class='del'>-			goto out_qmi_bdf;</div><div class='del'>-		}</div><div class='del'>-		remaining -= req-&gt;data_len;</div><div class='del'>-		temp += req-&gt;data_len;</div><div class='del'>-		req-&gt;seg_id++;</div><div class='add'>+	ret = ath11k_qmi_load_file_target_mem(ab, tmp, fw_size, file_type);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath11k_warn(ab, "qmi failed to load caldata\n");</div><div class='add'>+		goto out_qmi_cal;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out_qmi_bdf:</div><div class='del'>-	ath11k_core_free_bdf(ab, &amp;bd);</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_QMI, "caldata type: %u\n", file_type);</div><div class='ctx'> </div><div class='add'>+out_qmi_cal:</div><div class='add'>+	if (!ab-&gt;qmi.target.eeprom_caldata)</div><div class='add'>+		release_firmware(fw_entry);</div><div class='ctx'> out:</div><div class='del'>-	kfree(req);</div><div class='add'>+	ath11k_core_free_bdf(ab, &amp;bd);</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_QMI, "BDF download sequence completed\n");</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath11k_qmi_m3_load(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	struct m3_mem_region *m3_mem = &amp;ab-&gt;qmi.m3_mem;</div><div class='del'>-	const struct firmware *fw;</div><div class='add'>+	const struct firmware *fw = NULL;</div><div class='add'>+	const void *m3_data;</div><div class='ctx'> 	char path[100];</div><div class='add'>+	size_t m3_len;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (m3_mem-&gt;vaddr || m3_mem-&gt;size)</div><div class='add'>+	if (m3_mem-&gt;vaddr)</div><div class='add'>+		/* m3 firmware buffer is already available in the DMA buffer */</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	fw = ath11k_core_firmware_request(ab, ATH11K_M3_FILE);</div><div class='del'>-	if (IS_ERR(fw)) {</div><div class='del'>-		ret = PTR_ERR(fw);</div><div class='del'>-		ath11k_core_create_firmware_path(ab, ATH11K_M3_FILE,</div><div class='del'>-						 path, sizeof(path));</div><div class='del'>-		ath11k_err(ab, "failed to load %s: %d\n", path, ret);</div><div class='del'>-		return ret;</div><div class='add'>+	if (ab-&gt;fw.m3_data &amp;&amp; ab-&gt;fw.m3_len &gt; 0) {</div><div class='add'>+		/* firmware-N.bin had a m3 firmware file so use that */</div><div class='add'>+		m3_data = ab-&gt;fw.m3_data;</div><div class='add'>+		m3_len = ab-&gt;fw.m3_len;</div><div class='add'>+	} else {</div><div class='add'>+		/* No m3 file in firmware-N.bin so try to request old</div><div class='add'>+		 * separate m3.bin.</div><div class='add'>+		 */</div><div class='add'>+		fw = ath11k_core_firmware_request(ab, ATH11K_M3_FILE);</div><div class='add'>+		if (IS_ERR(fw)) {</div><div class='add'>+			ret = PTR_ERR(fw);</div><div class='add'>+			ath11k_core_create_firmware_path(ab, ATH11K_M3_FILE,</div><div class='add'>+							 path, sizeof(path));</div><div class='add'>+			ath11k_err(ab, "failed to load %s: %d\n", path, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		m3_data = fw-&gt;data;</div><div class='add'>+		m3_len = fw-&gt;size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	m3_mem-&gt;vaddr = dma_alloc_coherent(ab-&gt;dev,</div><div class='del'>-					   fw-&gt;size, &amp;m3_mem-&gt;paddr,</div><div class='add'>+					   m3_len, &amp;m3_mem-&gt;paddr,</div><div class='ctx'> 					   GFP_KERNEL);</div><div class='ctx'> 	if (!m3_mem-&gt;vaddr) {</div><div class='ctx'> 		ath11k_err(ab, "failed to allocate memory for M3 with size %zu\n",</div><div class='del'>-			   fw-&gt;size);</div><div class='del'>-		release_firmware(fw);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+			   m3_len);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(m3_mem-&gt;vaddr, fw-&gt;data, fw-&gt;size);</div><div class='del'>-	m3_mem-&gt;size = fw-&gt;size;</div><div class='add'>+	memcpy(m3_mem-&gt;vaddr, m3_data, m3_len);</div><div class='add'>+	m3_mem-&gt;size = m3_len;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='ctx'> 	release_firmware(fw);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_qmi_m3_free(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	struct m3_mem_region *m3_mem = &amp;ab-&gt;qmi.m3_mem;</div><div class='ctx'> </div><div class='del'>-	if (!ab-&gt;bus_params.m3_fw_support || !m3_mem-&gt;vaddr)</div><div class='add'>+	if (!ab-&gt;hw_params.m3_fw_support || !m3_mem-&gt;vaddr)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	dma_free_coherent(ab-&gt;dev, m3_mem-&gt;size,</div><div class='ctx'> 			  m3_mem-&gt;vaddr, m3_mem-&gt;paddr);</div><div class='ctx'> 	m3_mem-&gt;vaddr = NULL;</div><div class='add'>+	m3_mem-&gt;size = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_qmi_wlanfw_m3_info_send(struct ath11k_base *ab)</div><div class='add'>+/* clang stack usage explodes if this is inlined */</div><div class='add'>+static noinline_for_stack</div><div class='add'>+int ath11k_qmi_wlanfw_m3_info_send(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	struct m3_mem_region *m3_mem = &amp;ab-&gt;qmi.m3_mem;</div><div class='ctx'> 	struct qmi_wlanfw_m3_info_req_msg_v01 req;</div><div class='ctx'> 	struct qmi_wlanfw_m3_info_resp_msg_v01 resp;</div><div class='del'>-	struct qmi_txn txn = {};</div><div class='add'>+	struct qmi_txn txn;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;req, 0, sizeof(req));</div><div class='ctx'> 	memset(&amp;resp, 0, sizeof(resp));</div><div class='ctx'> </div><div class='del'>-	if (ab-&gt;bus_params.m3_fw_support) {</div><div class='add'>+	if (ab-&gt;hw_params.m3_fw_support) {</div><div class='ctx'> 		ret = ath11k_qmi_m3_load(ab);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ath11k_err(ab, "failed to load m3 firmware: %d", ret);</div><div class='hunk'>@@ -2216,13 +2609,14 @@ static int ath11k_qmi_wlanfw_m3_info_send(struct ath11k_base *ab)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi m3 info req\n");</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_QMI, "m3 info req\n");</div><div class='ctx'> </div><div class='ctx'> 	ret = qmi_send_request(&amp;ab-&gt;qmi.handle, NULL, &amp;txn,</div><div class='ctx'> 			       QMI_WLANFW_M3_INFO_REQ_V01,</div><div class='ctx'> 			       QMI_WLANFW_M3_INFO_REQ_MSG_V01_MAX_MSG_LEN,</div><div class='ctx'> 			       qmi_wlanfw_m3_info_req_msg_v01_ei, &amp;req);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='add'>+		qmi_txn_cancel(&amp;txn);</div><div class='ctx'> 		ath11k_warn(ab, "failed to send m3 information request: %d\n",</div><div class='ctx'> 			    ret);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -2249,7 +2643,7 @@ static int ath11k_qmi_wlanfw_mode_send(struct ath11k_base *ab,</div><div class='ctx'> {</div><div class='ctx'> 	struct qmi_wlanfw_wlan_mode_req_msg_v01 req;</div><div class='ctx'> 	struct qmi_wlanfw_wlan_mode_resp_msg_v01 resp;</div><div class='del'>-	struct qmi_txn txn = {};</div><div class='add'>+	struct qmi_txn txn;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;req, 0, sizeof(req));</div><div class='hunk'>@@ -2264,13 +2658,14 @@ static int ath11k_qmi_wlanfw_mode_send(struct ath11k_base *ab,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi wlan mode req mode %d\n", mode);</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_QMI, "wlan mode req mode %d\n", mode);</div><div class='ctx'> </div><div class='ctx'> 	ret = qmi_send_request(&amp;ab-&gt;qmi.handle, NULL, &amp;txn,</div><div class='ctx'> 			       QMI_WLANFW_WLAN_MODE_REQ_V01,</div><div class='ctx'> 			       QMI_WLANFW_WLAN_MODE_REQ_MSG_V01_MAX_LEN,</div><div class='ctx'> 			       qmi_wlanfw_wlan_mode_req_msg_v01_ei, &amp;req);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='add'>+		qmi_txn_cancel(&amp;txn);</div><div class='ctx'> 		ath11k_warn(ab, "failed to send wlan mode request (mode %d): %d\n",</div><div class='ctx'> 			    mode, ret);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -2304,7 +2699,7 @@ static int ath11k_qmi_wlanfw_wlan_cfg_send(struct ath11k_base *ab)</div><div class='ctx'> 	struct qmi_wlanfw_wlan_cfg_resp_msg_v01 resp;</div><div class='ctx'> 	struct ce_pipe_config *ce_cfg;</div><div class='ctx'> 	struct service_to_pipe *svc_cfg;</div><div class='del'>-	struct qmi_txn txn = {};</div><div class='add'>+	struct qmi_txn txn;</div><div class='ctx'> 	int ret = 0, pipe_num;</div><div class='ctx'> </div><div class='ctx'> 	ce_cfg	= (struct ce_pipe_config *)ab-&gt;qmi.ce_cfg.tgt_ce;</div><div class='hunk'>@@ -2317,7 +2712,7 @@ static int ath11k_qmi_wlanfw_wlan_cfg_send(struct ath11k_base *ab)</div><div class='ctx'> 	memset(&amp;resp, 0, sizeof(resp));</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;host_version_valid = 1;</div><div class='del'>-	strlcpy(req-&gt;host_version, ATH11K_HOST_VERSION_STRING,</div><div class='add'>+	strscpy(req-&gt;host_version, ATH11K_HOST_VERSION_STRING,</div><div class='ctx'> 		sizeof(req-&gt;host_version));</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;tgt_cfg_valid = 1;</div><div class='hunk'>@@ -2358,13 +2753,14 @@ static int ath11k_qmi_wlanfw_wlan_cfg_send(struct ath11k_base *ab)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi wlan cfg req\n");</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_QMI, "wlan cfg req\n");</div><div class='ctx'> </div><div class='ctx'> 	ret = qmi_send_request(&amp;ab-&gt;qmi.handle, NULL, &amp;txn,</div><div class='ctx'> 			       QMI_WLANFW_WLAN_CFG_REQ_V01,</div><div class='ctx'> 			       QMI_WLANFW_WLAN_CFG_REQ_MSG_V01_MAX_LEN,</div><div class='ctx'> 			       qmi_wlanfw_wlan_cfg_req_msg_v01_ei, req);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='add'>+		qmi_txn_cancel(&amp;txn);</div><div class='ctx'> 		ath11k_warn(ab, "failed to send wlan config request: %d\n",</div><div class='ctx'> 			    ret);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -2388,11 +2784,53 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ath11k_qmi_wlanfw_wlan_ini_send(struct ath11k_base *ab, bool enable)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct qmi_txn txn;</div><div class='add'>+	struct qmi_wlanfw_wlan_ini_req_msg_v01 req = {};</div><div class='add'>+	struct qmi_wlanfw_wlan_ini_resp_msg_v01 resp = {};</div><div class='add'>+</div><div class='add'>+	req.enablefwlog_valid = true;</div><div class='add'>+	req.enablefwlog = enable ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	ret = qmi_txn_init(&amp;ab-&gt;qmi.handle, &amp;txn,</div><div class='add'>+			   qmi_wlanfw_wlan_ini_resp_msg_v01_ei, &amp;resp);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = qmi_send_request(&amp;ab-&gt;qmi.handle, NULL, &amp;txn,</div><div class='add'>+			       QMI_WLANFW_WLAN_INI_REQ_V01,</div><div class='add'>+			       QMI_WLANFW_WLAN_INI_REQ_MSG_V01_MAX_LEN,</div><div class='add'>+			       qmi_wlanfw_wlan_ini_req_msg_v01_ei, &amp;req);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath11k_warn(ab, "qmi failed to send wlan ini request, err = %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		qmi_txn_cancel(&amp;txn);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = qmi_txn_wait(&amp;txn, msecs_to_jiffies(ATH11K_QMI_WLANFW_TIMEOUT_MS));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath11k_warn(ab, "qmi failed wlan ini request, err = %d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {</div><div class='add'>+		ath11k_warn(ab, "qmi wlan ini request failed, result: %d, err: %d\n",</div><div class='add'>+			    resp.resp.result, resp.resp.error);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void ath11k_qmi_firmware_stop(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi firmware stop\n");</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_QMI, "firmware stop\n");</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_qmi_wlanfw_mode_send(ab, ATH11K_FIRMWARE_MODE_OFF);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -2406,7 +2844,15 @@ int ath11k_qmi_firmware_start(struct ath11k_base *ab,</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi firmware start\n");</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_QMI, "firmware start\n");</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params.fw_wmi_diag_event) {</div><div class='add'>+		ret = ath11k_qmi_wlanfw_wlan_ini_send(ab, true);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			ath11k_warn(ab, "qmi failed to send wlan fw ini:%d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_qmi_wlanfw_wlan_cfg_send(ab);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -2423,9 +2869,36 @@ int ath11k_qmi_firmware_start(struct ath11k_base *ab,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int ath11k_qmi_fwreset_from_cold_boot(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	long time_left;</div><div class='add'>+</div><div class='add'>+	if (!ath11k_core_coldboot_cal_support(ab) ||</div><div class='add'>+	    ab-&gt;hw_params.cbcal_restart_fw == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_QMI, "wait for cold boot done\n");</div><div class='add'>+</div><div class='add'>+	time_left = wait_event_timeout(ab-&gt;qmi.cold_boot_waitq,</div><div class='add'>+				       (ab-&gt;qmi.cal_done == 1),</div><div class='add'>+				       ATH11K_COLD_BOOT_FW_RESET_DELAY);</div><div class='add'>+</div><div class='add'>+	if (time_left &lt;= 0) {</div><div class='add'>+		ath11k_warn(ab, "Coldboot Calibration timed out\n");</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* reset the firmware */</div><div class='add'>+	ath11k_hif_power_down(ab, false);</div><div class='add'>+	ath11k_hif_power_up(ab);</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_QMI, "exit wait for cold boot done\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath11k_qmi_fwreset_from_cold_boot);</div><div class='add'>+</div><div class='ctx'> static int ath11k_qmi_process_coldboot_calibration(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='del'>-	int timeout;</div><div class='add'>+	long time_left;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_qmi_wlanfw_mode_send(ab, ATH11K_FIRMWARE_MODE_COLD_BOOT);</div><div class='hunk'>@@ -2436,10 +2909,10 @@ static int ath11k_qmi_process_coldboot_calibration(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_QMI, "Coldboot calibration wait started\n");</div><div class='ctx'> </div><div class='del'>-	timeout = wait_event_timeout(ab-&gt;qmi.cold_boot_waitq,</div><div class='del'>-				     (ab-&gt;qmi.cal_done  == 1),</div><div class='del'>-				     ATH11K_COLD_BOOT_FW_RESET_DELAY);</div><div class='del'>-	if (timeout &lt;= 0) {</div><div class='add'>+	time_left = wait_event_timeout(ab-&gt;qmi.cold_boot_waitq,</div><div class='add'>+				       (ab-&gt;qmi.cal_done  == 1),</div><div class='add'>+				       ATH11K_COLD_BOOT_FW_RESET_DELAY);</div><div class='add'>+	if (time_left &lt;= 0) {</div><div class='ctx'> 		ath11k_warn(ab, "coldboot calibration timed out\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2472,65 +2945,74 @@ ath11k_qmi_driver_event_post(struct ath11k_qmi *qmi,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_qmi_event_server_arrive(struct ath11k_qmi *qmi)</div><div class='add'>+static int ath11k_qmi_event_mem_request(struct ath11k_qmi *qmi)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = qmi-&gt;ab;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_qmi_fw_ind_register_send(ab);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		ath11k_warn(ab, "failed to send qmi firmware indication: %d\n",</div><div class='del'>-			    ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = ath11k_qmi_host_cap_send(ab);</div><div class='add'>+	ret = ath11k_qmi_respond_fw_mem_request(ab);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		ath11k_warn(ab, "failed to send qmi host cap: %d\n", ret);</div><div class='add'>+		ath11k_warn(ab, "qmi failed to respond fw mem req: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_qmi_event_mem_request(struct ath11k_qmi *qmi)</div><div class='add'>+static int ath11k_qmi_event_load_bdf(struct ath11k_qmi *qmi)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = qmi-&gt;ab;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_qmi_respond_fw_mem_request(ab);</div><div class='add'>+	ret = ath11k_qmi_request_target_cap(ab);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		ath11k_warn(ab, "qmi failed to respond fw mem req: %d\n", ret);</div><div class='add'>+		ath11k_warn(ab, "failed to request qmi target capabilities: %d\n",</div><div class='add'>+			    ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	ret = ath11k_qmi_request_device_info(ab);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath11k_warn(ab, "failed to request qmi device info: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params.supports_regdb)</div><div class='add'>+		ath11k_qmi_load_bdf_qmi(ab, true);</div><div class='add'>+</div><div class='add'>+	ret = ath11k_qmi_load_bdf_qmi(ab, false);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath11k_warn(ab, "failed to load board data file: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_qmi_event_load_bdf(struct ath11k_qmi *qmi)</div><div class='add'>+static int ath11k_qmi_event_server_arrive(struct ath11k_qmi *qmi)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_base *ab = qmi-&gt;ab;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_qmi_request_target_cap(ab);</div><div class='add'>+	ret = ath11k_qmi_fw_ind_register_send(ab);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		ath11k_warn(ab, "failed to request qmi target capabilities: %d\n",</div><div class='add'>+		ath11k_warn(ab, "failed to send qmi firmware indication: %d\n",</div><div class='ctx'> 			    ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ab-&gt;bus_params.fixed_bdf_addr)</div><div class='del'>-		ret = ath11k_qmi_load_bdf_fixed_addr(ab);</div><div class='del'>-	else</div><div class='del'>-		ret = ath11k_qmi_load_bdf_qmi(ab);</div><div class='add'>+	ret = ath11k_qmi_host_cap_send(ab);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		ath11k_warn(ab, "failed to load board data file: %d\n", ret);</div><div class='add'>+		ath11k_warn(ab, "failed to send qmi host cap: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_qmi_wlanfw_m3_info_send(ab);</div><div class='add'>+	if (!ab-&gt;hw_params.fixed_fw_mem)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_qmi_event_load_bdf(qmi);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		ath11k_warn(ab, "failed to send qmi m3 info req: %d\n", ret);</div><div class='add'>+		ath11k_warn(ab, "qmi failed to download BDF:%d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2547,7 +3029,7 @@ static void ath11k_qmi_msg_mem_request_cb(struct qmi_handle *qmi_hdl,</div><div class='ctx'> 	const struct qmi_wlanfw_request_mem_ind_msg_v01 *msg = data;</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi firmware request memory request\n");</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_QMI, "firmware request memory request\n");</div><div class='ctx'> </div><div class='ctx'> 	if (msg-&gt;mem_seg_len == 0 ||</div><div class='ctx'> 	    msg-&gt;mem_seg_len &gt; ATH11K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01)</div><div class='hunk'>@@ -2559,11 +3041,12 @@ static void ath11k_qmi_msg_mem_request_cb(struct qmi_handle *qmi_hdl,</div><div class='ctx'> 	for (i = 0; i &lt; qmi-&gt;mem_seg_count ; i++) {</div><div class='ctx'> 		ab-&gt;qmi.target_mem[i].type = msg-&gt;mem_seg[i].type;</div><div class='ctx'> 		ab-&gt;qmi.target_mem[i].size = msg-&gt;mem_seg[i].size;</div><div class='del'>-		ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi mem seg type %d size %d\n",</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_QMI, "mem seg type %d size %d\n",</div><div class='ctx'> 			   msg-&gt;mem_seg[i].type, msg-&gt;mem_seg[i].size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ab-&gt;bus_params.fixed_mem_region) {</div><div class='add'>+	if (ab-&gt;hw_params.fixed_mem_region ||</div><div class='add'>+	    test_bit(ATH11K_FLAG_FIXED_MEM_RGN, &amp;ab-&gt;dev_flags)) {</div><div class='ctx'> 		ret = ath11k_qmi_assign_target_mem_chunk(ab);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ath11k_warn(ab, "failed to assign qmi target memory: %d\n",</div><div class='hunk'>@@ -2590,7 +3073,7 @@ static void ath11k_qmi_msg_mem_ready_cb(struct qmi_handle *qmi_hdl,</div><div class='ctx'> 	struct ath11k_qmi *qmi = container_of(qmi_hdl, struct ath11k_qmi, handle);</div><div class='ctx'> 	struct ath11k_base *ab = qmi-&gt;ab;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi firmware memory ready indication\n");</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_QMI, "firmware memory ready indication\n");</div><div class='ctx'> 	ath11k_qmi_driver_event_post(qmi, ATH11K_QMI_EVENT_FW_MEM_READY, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2602,7 +3085,13 @@ static void ath11k_qmi_msg_fw_ready_cb(struct qmi_handle *qmi_hdl,</div><div class='ctx'> 	struct ath11k_qmi *qmi = container_of(qmi_hdl, struct ath11k_qmi, handle);</div><div class='ctx'> 	struct ath11k_base *ab = qmi-&gt;ab;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi firmware ready\n");</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_QMI, "firmware ready\n");</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;qmi.cal_done) {</div><div class='add'>+		ab-&gt;qmi.cal_done = 1;</div><div class='add'>+		wake_up(&amp;ab-&gt;qmi.cold_boot_waitq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ath11k_qmi_driver_event_post(qmi, ATH11K_QMI_EVENT_FW_READY, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2617,7 +3106,20 @@ static void ath11k_qmi_msg_cold_boot_cal_done_cb(struct qmi_handle *qmi_hdl,</div><div class='ctx'> </div><div class='ctx'> 	ab-&gt;qmi.cal_done = 1;</div><div class='ctx'> 	wake_up(&amp;ab-&gt;qmi.cold_boot_waitq);</div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi cold boot calibration done\n");</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_QMI, "cold boot calibration done\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_qmi_msg_fw_init_done_cb(struct qmi_handle *qmi_hdl,</div><div class='add'>+					   struct sockaddr_qrtr *sq,</div><div class='add'>+					   struct qmi_txn *txn,</div><div class='add'>+					   const void *decoded)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_qmi *qmi = container_of(qmi_hdl,</div><div class='add'>+					      struct ath11k_qmi, handle);</div><div class='add'>+	struct ath11k_base *ab = qmi-&gt;ab;</div><div class='add'>+</div><div class='add'>+	ath11k_qmi_driver_event_post(qmi, ATH11K_QMI_EVENT_FW_INIT_DONE, NULL);</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_QMI, "firmware init done\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct qmi_msg_handler ath11k_qmi_msg_handlers[] = {</div><div class='hunk'>@@ -2650,6 +3152,17 @@ static const struct qmi_msg_handler ath11k_qmi_msg_handlers[] = {</div><div class='ctx'> 			sizeof(struct qmi_wlanfw_fw_cold_cal_done_ind_msg_v01),</div><div class='ctx'> 		.fn = ath11k_qmi_msg_cold_boot_cal_done_cb,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.type = QMI_INDICATION,</div><div class='add'>+		.msg_id = QMI_WLFW_FW_INIT_DONE_IND_V01,</div><div class='add'>+		.ei = qmi_wlfw_fw_init_done_ind_msg_v01_ei,</div><div class='add'>+		.decoded_size =</div><div class='add'>+			sizeof(struct qmi_wlfw_fw_init_done_ind_msg_v01),</div><div class='add'>+		.fn = ath11k_qmi_msg_fw_init_done_cb,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* end of list */</div><div class='add'>+	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int ath11k_qmi_ops_new_server(struct qmi_handle *qmi_hdl,</div><div class='hunk'>@@ -2664,14 +3177,14 @@ static int ath11k_qmi_ops_new_server(struct qmi_handle *qmi_hdl,</div><div class='ctx'> 	sq-&gt;sq_node = service-&gt;node;</div><div class='ctx'> 	sq-&gt;sq_port = service-&gt;port;</div><div class='ctx'> </div><div class='del'>-	ret = kernel_connect(qmi_hdl-&gt;sock, (struct sockaddr *)sq,</div><div class='add'>+	ret = kernel_connect(qmi_hdl-&gt;sock, (struct sockaddr_unsized *)sq,</div><div class='ctx'> 			     sizeof(*sq), 0);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ab, "failed to connect to qmi remote service: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi wifi fw qmi service connected\n");</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_QMI, "wifi fw qmi service connected\n");</div><div class='ctx'> 	ath11k_qmi_driver_event_post(qmi, ATH11K_QMI_EVENT_SERVER_ARRIVE, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -2683,7 +3196,7 @@ static void ath11k_qmi_ops_del_server(struct qmi_handle *qmi_hdl,</div><div class='ctx'> 	struct ath11k_qmi *qmi = container_of(qmi_hdl, struct ath11k_qmi, handle);</div><div class='ctx'> 	struct ath11k_base *ab = qmi-&gt;ab;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi wifi fw del server\n");</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_QMI, "wifi fw del server\n");</div><div class='ctx'> 	ath11k_qmi_driver_event_post(qmi, ATH11K_QMI_EVENT_SERVER_EXIT, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2707,8 +3220,10 @@ static void ath11k_qmi_driver_event_work(struct work_struct *work)</div><div class='ctx'> 		list_del(&amp;event-&gt;list);</div><div class='ctx'> 		spin_unlock(&amp;qmi-&gt;event_lock);</div><div class='ctx'> </div><div class='del'>-		if (test_bit(ATH11K_FLAG_UNREGISTERING, &amp;ab-&gt;dev_flags))</div><div class='add'>+		if (test_bit(ATH11K_FLAG_UNREGISTERING, &amp;ab-&gt;dev_flags)) {</div><div class='add'>+			kfree(event);</div><div class='ctx'> 			return;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		switch (event-&gt;type) {</div><div class='ctx'> 		case ATH11K_QMI_EVENT_SERVER_ARRIVE:</div><div class='hunk'>@@ -2719,6 +3234,9 @@ static void ath11k_qmi_driver_event_work(struct work_struct *work)</div><div class='ctx'> 		case ATH11K_QMI_EVENT_SERVER_EXIT:</div><div class='ctx'> 			set_bit(ATH11K_FLAG_CRASH_FLUSH, &amp;ab-&gt;dev_flags);</div><div class='ctx'> 			set_bit(ATH11K_FLAG_RECOVERY, &amp;ab-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+			if (!ab-&gt;is_reset)</div><div class='add'>+				ath11k_core_pre_reconfigure_recovery(ab);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ATH11K_QMI_EVENT_REQUEST_MEM:</div><div class='ctx'> 			ret = ath11k_qmi_event_mem_request(qmi);</div><div class='hunk'>@@ -2727,29 +3245,60 @@ static void ath11k_qmi_driver_event_work(struct work_struct *work)</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ATH11K_QMI_EVENT_FW_MEM_READY:</div><div class='ctx'> 			ret = ath11k_qmi_event_load_bdf(qmi);</div><div class='del'>-			if (ret &lt; 0)</div><div class='add'>+			if (ret &lt; 0) {</div><div class='ctx'> 				set_bit(ATH11K_FLAG_QMI_FAIL, &amp;ab-&gt;dev_flags);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ret = ath11k_qmi_wlanfw_m3_info_send(ab);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				ath11k_warn(ab,</div><div class='add'>+					    "failed to send qmi m3 info req: %d\n", ret);</div><div class='add'>+				set_bit(ATH11K_FLAG_QMI_FAIL, &amp;ab-&gt;dev_flags);</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			break;</div><div class='del'>-		case ATH11K_QMI_EVENT_FW_READY:</div><div class='add'>+		case ATH11K_QMI_EVENT_FW_INIT_DONE:</div><div class='ctx'> 			clear_bit(ATH11K_FLAG_QMI_FAIL, &amp;ab-&gt;dev_flags);</div><div class='ctx'> 			if (test_bit(ATH11K_FLAG_REGISTERED, &amp;ab-&gt;dev_flags)) {</div><div class='del'>-				ath11k_hal_dump_srng_stats(ab);</div><div class='add'>+				if (ab-&gt;is_reset)</div><div class='add'>+					ath11k_hal_dump_srng_stats(ab);</div><div class='ctx'> 				queue_work(ab-&gt;workqueue, &amp;ab-&gt;restart_work);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (ath11k_cold_boot_cal &amp;&amp; ab-&gt;qmi.cal_done == 0 &amp;&amp;</div><div class='del'>-			    ab-&gt;hw_params.cold_boot_calib) {</div><div class='add'>+			if (ab-&gt;qmi.cal_done == 0 &amp;&amp;</div><div class='add'>+			    ath11k_core_coldboot_cal_support(ab)) {</div><div class='ctx'> 				ath11k_qmi_process_coldboot_calibration(ab);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				clear_bit(ATH11K_FLAG_CRASH_FLUSH,</div><div class='ctx'> 					  &amp;ab-&gt;dev_flags);</div><div class='ctx'> 				clear_bit(ATH11K_FLAG_RECOVERY, &amp;ab-&gt;dev_flags);</div><div class='del'>-				ath11k_core_qmi_firmware_ready(ab);</div><div class='add'>+				ret = ath11k_core_qmi_firmware_ready(ab);</div><div class='add'>+				if (ret) {</div><div class='add'>+					set_bit(ATH11K_FLAG_QMI_FAIL, &amp;ab-&gt;dev_flags);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='ctx'> 				set_bit(ATH11K_FLAG_REGISTERED, &amp;ab-&gt;dev_flags);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			break;</div><div class='add'>+		case ATH11K_QMI_EVENT_FW_READY:</div><div class='add'>+			/* For targets requiring a FW restart upon cold</div><div class='add'>+			 * boot completion, there is no need to process</div><div class='add'>+			 * FW ready; such targets will receive FW init</div><div class='add'>+			 * done message after FW restart.</div><div class='add'>+			 */</div><div class='add'>+			if (ab-&gt;hw_params.cbcal_restart_fw)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			clear_bit(ATH11K_FLAG_CRASH_FLUSH,</div><div class='add'>+				  &amp;ab-&gt;dev_flags);</div><div class='add'>+			clear_bit(ATH11K_FLAG_RECOVERY, &amp;ab-&gt;dev_flags);</div><div class='add'>+			ath11k_core_qmi_firmware_ready(ab);</div><div class='add'>+			set_bit(ATH11K_FLAG_REGISTERED, &amp;ab-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+			break;</div><div class='ctx'> 		case ATH11K_QMI_EVENT_COLD_BOOT_CAL_DONE:</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -2770,7 +3319,7 @@ int ath11k_qmi_init_service(struct ath11k_base *ab)</div><div class='ctx'> 	memset(&amp;ab-&gt;qmi.target_mem, 0, sizeof(struct target_mem_chunk));</div><div class='ctx'> 	ab-&gt;qmi.ab = ab;</div><div class='ctx'> </div><div class='del'>-	ab-&gt;qmi.target_mem_mode = ATH11K_QMI_TARGET_MEM_MODE_DEFAULT;</div><div class='add'>+	ab-&gt;qmi.target_mem_mode = ab-&gt;hw_params.fw_mem_mode;</div><div class='ctx'> 	ret = qmi_handle_init(&amp;ab-&gt;qmi.handle, ATH11K_QMI_RESP_LEN_MAX,</div><div class='ctx'> 			      &amp;ath11k_qmi_ops, ath11k_qmi_msg_handlers);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -2778,8 +3327,7 @@ int ath11k_qmi_init_service(struct ath11k_base *ab)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ab-&gt;qmi.event_wq = alloc_workqueue("ath11k_qmi_driver_event",</div><div class='del'>-					   WQ_UNBOUND, 1);</div><div class='add'>+	ab-&gt;qmi.event_wq = alloc_ordered_workqueue("ath11k_qmi_driver_event", 0);</div><div class='ctx'> 	if (!ab-&gt;qmi.event_wq) {</div><div class='ctx'> 		ath11k_err(ab, "failed to allocate workqueue\n");</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -2811,3 +3359,8 @@ void ath11k_qmi_deinit_service(struct ath11k_base *ab)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ath11k_qmi_deinit_service);</div><div class='ctx'> </div><div class='add'>+void ath11k_qmi_free_resource(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath11k_qmi_free_target_mem_chunk(ab);</div><div class='add'>+	ath11k_qmi_m3_free(ab);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/qmi.h b/drivers/net/wireless/ath/ath11k/qmi.h<br/>index 3d5930330703..7968ab122b65 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/qmi.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/qmi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/qmi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/qmi.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef ATH11K_QMI_H</div><div class='hunk'>@@ -10,11 +11,9 @@</div><div class='ctx'> #include &lt;linux/soc/qcom/qmi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define ATH11K_HOST_VERSION_STRING		"WIN"</div><div class='del'>-#define ATH11K_QMI_WLANFW_TIMEOUT_MS		5000</div><div class='add'>+#define ATH11K_QMI_WLANFW_TIMEOUT_MS		10000</div><div class='ctx'> #define ATH11K_QMI_MAX_BDF_FILE_NAME_SIZE	64</div><div class='ctx'> #define ATH11K_QMI_CALDB_ADDRESS		0x4BA00000</div><div class='del'>-#define ATH11K_QMI_BDF_MAX_SIZE			(256 * 1024)</div><div class='del'>-#define ATH11K_QMI_CALDATA_OFFSET		(128 * 1024)</div><div class='ctx'> #define ATH11K_QMI_WLANFW_MAX_BUILD_ID_LEN_V01	128</div><div class='ctx'> #define ATH11K_QMI_WLFW_SERVICE_ID_V01		0x45</div><div class='ctx'> #define ATH11K_QMI_WLFW_SERVICE_VERS_V01	0x01</div><div class='hunk'>@@ -22,34 +21,39 @@</div><div class='ctx'> #define ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_QCA6390	0x01</div><div class='ctx'> #define ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_IPQ8074	0x02</div><div class='ctx'> #define ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_QCN9074	0x07</div><div class='add'>+#define ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_WCN6750	0x03</div><div class='ctx'> #define ATH11K_QMI_WLANFW_MAX_TIMESTAMP_LEN_V01	32</div><div class='ctx'> #define ATH11K_QMI_RESP_LEN_MAX			8192</div><div class='ctx'> #define ATH11K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01	52</div><div class='ctx'> #define ATH11K_QMI_CALDB_SIZE			0x480000</div><div class='ctx'> #define ATH11K_QMI_BDF_EXT_STR_LENGTH		0x20</div><div class='del'>-#define ATH11K_QMI_FW_MEM_REQ_SEGMENT_CNT	3</div><div class='add'>+#define ATH11K_QMI_FW_MEM_REQ_SEGMENT_CNT	5</div><div class='ctx'> </div><div class='ctx'> #define QMI_WLFW_REQUEST_MEM_IND_V01		0x0035</div><div class='ctx'> #define QMI_WLFW_FW_MEM_READY_IND_V01		0x0037</div><div class='del'>-#define QMI_WLFW_COLD_BOOT_CAL_DONE_IND_V01	0x0021</div><div class='del'>-#define QMI_WLFW_FW_READY_IND_V01		0x0038</div><div class='add'>+#define QMI_WLFW_COLD_BOOT_CAL_DONE_IND_V01	0x003E</div><div class='add'>+#define QMI_WLFW_FW_READY_IND_V01		0x0021</div><div class='add'>+#define QMI_WLFW_FW_INIT_DONE_IND_V01		0x0038</div><div class='ctx'> </div><div class='ctx'> #define QMI_WLANFW_MAX_DATA_SIZE_V01		6144</div><div class='ctx'> #define ATH11K_FIRMWARE_MODE_OFF		4</div><div class='del'>-#define ATH11K_QMI_TARGET_MEM_MODE_DEFAULT	0</div><div class='del'>-#define ATH11K_COLD_BOOT_FW_RESET_DELAY		(40 * HZ)</div><div class='add'>+#define ATH11K_COLD_BOOT_FW_RESET_DELAY		(60 * HZ)</div><div class='add'>+</div><div class='add'>+#define ATH11K_QMI_DEVICE_BAR_SIZE		0x200000</div><div class='ctx'> </div><div class='ctx'> struct ath11k_base;</div><div class='ctx'> </div><div class='ctx'> enum ath11k_qmi_file_type {</div><div class='ctx'> 	ATH11K_QMI_FILE_TYPE_BDF_GOLDEN,</div><div class='del'>-	ATH11K_QMI_FILE_TYPE_CALDATA,</div><div class='add'>+	ATH11K_QMI_FILE_TYPE_CALDATA = 2,</div><div class='add'>+	ATH11K_QMI_FILE_TYPE_EEPROM,</div><div class='ctx'> 	ATH11K_QMI_MAX_FILE_TYPE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ath11k_qmi_bdf_type {</div><div class='ctx'> 	ATH11K_QMI_BDF_TYPE_BIN			= 0,</div><div class='ctx'> 	ATH11K_QMI_BDF_TYPE_ELF			= 1,</div><div class='add'>+	ATH11K_QMI_BDF_TYPE_REGDB		= 4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ath11k_qmi_event_type {</div><div class='hunk'>@@ -66,6 +70,7 @@ enum ath11k_qmi_event_type {</div><div class='ctx'> 	ATH11K_QMI_EVENT_FORCE_FW_ASSERT,</div><div class='ctx'> 	ATH11K_QMI_EVENT_POWER_UP,</div><div class='ctx'> 	ATH11K_QMI_EVENT_POWER_DOWN,</div><div class='add'>+	ATH11K_QMI_EVENT_FW_INIT_DONE,</div><div class='ctx'> 	ATH11K_QMI_EVENT_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -94,8 +99,14 @@ struct ath11k_qmi_event_msg {</div><div class='ctx'> struct target_mem_chunk {</div><div class='ctx'> 	u32 size;</div><div class='ctx'> 	u32 type;</div><div class='add'>+	u32 prev_size;</div><div class='add'>+	u32 prev_type;</div><div class='ctx'> 	dma_addr_t paddr;</div><div class='del'>-	u32 *vaddr;</div><div class='add'>+	union {</div><div class='add'>+		u32 *vaddr;</div><div class='add'>+		void __iomem *iaddr;</div><div class='add'>+		void *anyaddr;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct target_info {</div><div class='hunk'>@@ -104,6 +115,7 @@ struct target_info {</div><div class='ctx'> 	u32 board_id;</div><div class='ctx'> 	u32 soc_id;</div><div class='ctx'> 	u32 fw_version;</div><div class='add'>+	u32 eeprom_caldata;</div><div class='ctx'> 	char fw_build_timestamp[ATH11K_QMI_WLANFW_MAX_TIMESTAMP_LEN_V01 + 1];</div><div class='ctx'> 	char fw_build_id[ATH11K_QMI_WLANFW_MAX_BUILD_ID_LEN_V01 + 1];</div><div class='ctx'> 	char bdf_ext[ATH11K_QMI_BDF_EXT_STR_LENGTH];</div><div class='hunk'>@@ -135,7 +147,7 @@ struct ath11k_qmi {</div><div class='ctx'> 	wait_queue_head_t cold_boot_waitq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define QMI_WLANFW_HOST_CAP_REQ_MSG_V01_MAX_LEN		189</div><div class='add'>+#define QMI_WLANFW_HOST_CAP_REQ_MSG_V01_MAX_LEN		261</div><div class='ctx'> #define QMI_WLANFW_HOST_CAP_REQ_V01			0x0034</div><div class='ctx'> #define QMI_WLANFW_HOST_CAP_RESP_MSG_V01_MAX_LEN	7</div><div class='ctx'> #define QMI_WLFW_HOST_CAP_RESP_V01			0x0034</div><div class='hunk'>@@ -145,6 +157,7 @@ struct ath11k_qmi {</div><div class='ctx'> #define BDF_MEM_REGION_TYPE				0x2</div><div class='ctx'> #define M3_DUMP_REGION_TYPE				0x3</div><div class='ctx'> #define CALDB_MEM_REGION_TYPE				0x4</div><div class='add'>+#define PAGEABLE_MEM_REGION_TYPE			0x9</div><div class='ctx'> </div><div class='ctx'> struct qmi_wlanfw_host_cap_req_msg_v01 {</div><div class='ctx'> 	u8 num_clients_valid;</div><div class='hunk'>@@ -284,10 +297,16 @@ struct qmi_wlanfw_fw_cold_cal_done_ind_msg_v01 {</div><div class='ctx'> 	char placeholder;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define QMI_WLANFW_CAP_REQ_MSG_V01_MAX_LEN	0</div><div class='del'>-#define QMI_WLANFW_CAP_RESP_MSG_V01_MAX_LEN	207</div><div class='del'>-#define QMI_WLANFW_CAP_REQ_V01			0x0024</div><div class='del'>-#define QMI_WLANFW_CAP_RESP_V01			0x0024</div><div class='add'>+struct qmi_wlfw_fw_init_done_ind_msg_v01 {</div><div class='add'>+	char placeholder;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define QMI_WLANFW_CAP_REQ_MSG_V01_MAX_LEN		0</div><div class='add'>+#define QMI_WLANFW_CAP_RESP_MSG_V01_MAX_LEN		235</div><div class='add'>+#define QMI_WLANFW_CAP_REQ_V01				0x0024</div><div class='add'>+#define QMI_WLANFW_CAP_RESP_V01				0x0024</div><div class='add'>+#define QMI_WLANFW_DEVICE_INFO_REQ_V01			0x004C</div><div class='add'>+#define QMI_WLANFW_DEVICE_INFO_REQ_MSG_V01_MAX_LEN	0</div><div class='ctx'> </div><div class='ctx'> enum qmi_wlanfw_pipedir_enum_v01 {</div><div class='ctx'> 	QMI_WLFW_PIPEDIR_NONE_V01 = 0,</div><div class='hunk'>@@ -366,12 +385,32 @@ struct qmi_wlanfw_cap_resp_msg_v01 {</div><div class='ctx'> 	char fw_build_id[ATH11K_QMI_WLANFW_MAX_BUILD_ID_LEN_V01 + 1];</div><div class='ctx'> 	u8 num_macs_valid;</div><div class='ctx'> 	u8 num_macs;</div><div class='add'>+	u8 voltage_mv_valid;</div><div class='add'>+	u32 voltage_mv;</div><div class='add'>+	u8 time_freq_hz_valid;</div><div class='add'>+	u32 time_freq_hz;</div><div class='add'>+	u8 otp_version_valid;</div><div class='add'>+	u32 otp_version;</div><div class='add'>+	u8 eeprom_read_timeout_valid;</div><div class='add'>+	u32 eeprom_read_timeout;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct qmi_wlanfw_cap_req_msg_v01 {</div><div class='ctx'> 	char placeholder;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct qmi_wlanfw_device_info_req_msg_v01 {</div><div class='add'>+	char placeholder;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_device_info_resp_msg_v01 {</div><div class='add'>+	struct qmi_response_type_v01 resp;</div><div class='add'>+	u64 bar_addr;</div><div class='add'>+	u32 bar_size;</div><div class='add'>+	u8 bar_addr_valid;</div><div class='add'>+	u8 bar_size_valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define QMI_WLANFW_BDF_DOWNLOAD_REQ_MSG_V01_MAX_LEN	6182</div><div class='ctx'> #define QMI_WLANFW_BDF_DOWNLOAD_RESP_MSG_V01_MAX_LEN	7</div><div class='ctx'> #define QMI_WLANFW_BDF_DOWNLOAD_RESP_V01		0x0025</div><div class='hunk'>@@ -419,10 +458,12 @@ struct qmi_wlanfw_m3_info_resp_msg_v01 {</div><div class='ctx'> #define QMI_WLANFW_WLAN_MODE_RESP_MSG_V01_MAX_LEN	7</div><div class='ctx'> #define QMI_WLANFW_WLAN_CFG_REQ_MSG_V01_MAX_LEN		803</div><div class='ctx'> #define QMI_WLANFW_WLAN_CFG_RESP_MSG_V01_MAX_LEN	7</div><div class='add'>+#define QMI_WLANFW_WLAN_INI_REQ_MSG_V01_MAX_LEN		4</div><div class='ctx'> #define QMI_WLANFW_WLAN_MODE_REQ_V01			0x0022</div><div class='ctx'> #define QMI_WLANFW_WLAN_MODE_RESP_V01			0x0022</div><div class='ctx'> #define QMI_WLANFW_WLAN_CFG_REQ_V01			0x0023</div><div class='ctx'> #define QMI_WLANFW_WLAN_CFG_RESP_V01			0x0023</div><div class='add'>+#define QMI_WLANFW_WLAN_INI_REQ_V01			0x002F</div><div class='ctx'> #define QMI_WLANFW_MAX_STR_LEN_V01			16</div><div class='ctx'> #define QMI_WLANFW_MAX_NUM_CE_V01			12</div><div class='ctx'> #define QMI_WLANFW_MAX_NUM_SVC_V01			24</div><div class='hunk'>@@ -464,12 +505,22 @@ struct qmi_wlanfw_wlan_cfg_resp_msg_v01 {</div><div class='ctx'> 	struct qmi_response_type_v01 resp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct qmi_wlanfw_wlan_ini_req_msg_v01 {</div><div class='add'>+	/* Must be set to true if enablefwlog is being passed */</div><div class='add'>+	u8 enablefwlog_valid;</div><div class='add'>+	u8 enablefwlog;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_wlan_ini_resp_msg_v01 {</div><div class='add'>+	struct qmi_response_type_v01 resp;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int ath11k_qmi_firmware_start(struct ath11k_base *ab,</div><div class='ctx'> 			      u32 mode);</div><div class='ctx'> void ath11k_qmi_firmware_stop(struct ath11k_base *ab);</div><div class='del'>-void ath11k_qmi_event_work(struct work_struct *work);</div><div class='del'>-void ath11k_qmi_msg_recv_work(struct work_struct *work);</div><div class='ctx'> void ath11k_qmi_deinit_service(struct ath11k_base *ab);</div><div class='ctx'> int ath11k_qmi_init_service(struct ath11k_base *ab);</div><div class='add'>+void ath11k_qmi_free_resource(struct ath11k_base *ab);</div><div class='add'>+int ath11k_qmi_fwreset_from_cold_boot(struct ath11k_base *ab);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/reg.c b/drivers/net/wireless/ath/ath11k/reg.c<br/>index e1a1df169034..d62a2014315a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/reg.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/reg.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/reg.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/reg.c</a></div><div class='hunk'>@@ -1,7 +1,10 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> </div><div class='hunk'>@@ -52,6 +55,19 @@ ath11k_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request)</div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_REG,</div><div class='ctx'> 		   "Regulatory Notification received for %s\n", wiphy_name(wiphy));</div><div class='ctx'> </div><div class='add'>+	if (request-&gt;initiator == NL80211_REGDOM_SET_BY_DRIVER) {</div><div class='add'>+		ath11k_dbg(ar-&gt;ab, ATH11K_DBG_REG,</div><div class='add'>+			   "driver initiated regd update\n");</div><div class='add'>+		if (ar-&gt;state != ATH11K_STATE_ON)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		ret = ath11k_reg_update_chan_list(ar, true);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to update channel list: %d\n", ret);</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Currently supporting only General User Hints. Cell base user</div><div class='ctx'> 	 * hints to be handled later.</div><div class='ctx'> 	 * Hints from other sources like Core, Beacons are not expected for</div><div class='hunk'>@@ -74,21 +90,32 @@ ath11k_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Set the country code to the firmware and wait for</div><div class='add'>+	/* Set the country code to the firmware and will receive</div><div class='ctx'> 	 * the WMI_REG_CHAN_LIST_CC EVENT for updating the</div><div class='ctx'> 	 * reg info</div><div class='ctx'> 	 */</div><div class='del'>-	init_country_param.flags = ALPHA_IS_SET;</div><div class='del'>-	memcpy(&amp;init_country_param.cc_info.alpha2, request-&gt;alpha2, 2);</div><div class='del'>-	init_country_param.cc_info.alpha2[2] = 0;</div><div class='add'>+	if (ar-&gt;ab-&gt;hw_params.current_cc_support) {</div><div class='add'>+		memcpy(&amp;ar-&gt;alpha2, request-&gt;alpha2, 2);</div><div class='add'>+		ret = ath11k_reg_set_cc(ar);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath11k_warn(ar-&gt;ab,</div><div class='add'>+				    "failed set current country code: %d\n", ret);</div><div class='add'>+	} else {</div><div class='add'>+		init_country_param.flags = ALPHA_IS_SET;</div><div class='add'>+		memcpy(&amp;init_country_param.cc_info.alpha2, request-&gt;alpha2, 2);</div><div class='add'>+		init_country_param.cc_info.alpha2[2] = 0;</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_wmi_send_init_country_cmd(ar, init_country_param);</div><div class='del'>-	if (ret)</div><div class='del'>-		ath11k_warn(ar-&gt;ab,</div><div class='del'>-			    "INIT Country code set to fw failed : %d\n", ret);</div><div class='add'>+		ret = ath11k_wmi_send_init_country_cmd(ar, init_country_param);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath11k_warn(ar-&gt;ab,</div><div class='add'>+				    "INIT Country code set to fw failed : %d\n", ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_mac_11d_scan_stop(ar);</div><div class='add'>+	ar-&gt;regdom_set_by_user = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath11k_reg_update_chan_list(struct ath11k *ar)</div><div class='add'>+int ath11k_reg_update_chan_list(struct ath11k *ar, bool wait)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_supported_band **bands;</div><div class='ctx'> 	struct scan_chan_list_params *params;</div><div class='hunk'>@@ -97,8 +124,10 @@ int ath11k_reg_update_chan_list(struct ath11k *ar)</div><div class='ctx'> 	struct channel_param *ch;</div><div class='ctx'> 	enum nl80211_band band;</div><div class='ctx'> 	int num_channels = 0;</div><div class='del'>-	int params_len;</div><div class='del'>-	int i, ret;</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;state == ATH11K_STATE_RESTARTING)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	bands = hw-&gt;wiphy-&gt;bands;</div><div class='ctx'> 	for (band = 0; band &lt; NUM_NL80211_BANDS; band++) {</div><div class='hunk'>@@ -117,10 +146,8 @@ int ath11k_reg_update_chan_list(struct ath11k *ar)</div><div class='ctx'> 	if (WARN_ON(!num_channels))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	params_len = sizeof(struct scan_chan_list_params) +</div><div class='del'>-			num_channels * sizeof(struct channel_param);</div><div class='del'>-	params = kzalloc(params_len, GFP_KERNEL);</div><div class='del'>-</div><div class='add'>+	params = kzalloc(struct_size(params, ch_param, num_channels),</div><div class='add'>+			 GFP_KERNEL);</div><div class='ctx'> 	if (!params)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -179,6 +206,16 @@ int ath11k_reg_update_chan_list(struct ath11k *ar)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (wait) {</div><div class='add'>+		spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		list_add_tail(&amp;params-&gt;list, &amp;ar-&gt;channel_update_queue);</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+		queue_work(ar-&gt;ab-&gt;workqueue, &amp;ar-&gt;channel_update_work);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = ath11k_wmi_send_scan_chan_list_cmd(ar, params);</div><div class='ctx'> 	kfree(params);</div><div class='ctx'> </div><div class='hunk'>@@ -198,7 +235,7 @@ static void ath11k_copy_regd(struct ieee80211_regdomain *regd_orig,</div><div class='ctx'> 		       sizeof(struct ieee80211_reg_rule));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath11k_regd_update(struct ath11k *ar, bool init)</div><div class='add'>+int ath11k_regd_update(struct ath11k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_regdomain *regd, *regd_copy = NULL;</div><div class='ctx'> 	int ret, regd_len, pdev_id;</div><div class='hunk'>@@ -209,7 +246,10 @@ int ath11k_regd_update(struct ath11k *ar, bool init)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='ctx'> </div><div class='del'>-	if (init) {</div><div class='add'>+	/* Prefer the latest regd update over default if it's available */</div><div class='add'>+	if (ab-&gt;new_regd[pdev_id]) {</div><div class='add'>+		regd = ab-&gt;new_regd[pdev_id];</div><div class='add'>+	} else {</div><div class='ctx'> 		/* Apply the regd received during init through</div><div class='ctx'> 		 * WMI_REG_CHAN_LIST_CC event. In case of failure to</div><div class='ctx'> 		 * receive the regd, initialize with a default world</div><div class='hunk'>@@ -222,8 +262,6 @@ int ath11k_regd_update(struct ath11k *ar, bool init)</div><div class='ctx'> 				    "failed to receive default regd during init\n");</div><div class='ctx'> 			regd = (struct ieee80211_regdomain *)&amp;ath11k_world_regd;</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		regd = ab-&gt;new_regd[pdev_id];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!regd) {</div><div class='hunk'>@@ -246,23 +284,13 @@ int ath11k_regd_update(struct ath11k *ar, bool init)</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='del'>-	wiphy_lock(ar-&gt;hw-&gt;wiphy);</div><div class='del'>-	ret = regulatory_set_wiphy_regd_sync(ar-&gt;hw-&gt;wiphy, regd_copy);</div><div class='del'>-	wiphy_unlock(ar-&gt;hw-&gt;wiphy);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	ret = regulatory_set_wiphy_regd(ar-&gt;hw-&gt;wiphy, regd_copy);</div><div class='ctx'> </div><div class='ctx'> 	kfree(regd_copy);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;state == ATH11K_STATE_ON) {</div><div class='del'>-		ret = ath11k_reg_update_chan_list(ar);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> err:</div><div class='ctx'> 	ath11k_warn(ab, "failed to perform regd update : %d\n", ret);</div><div class='hunk'>@@ -315,6 +343,16 @@ static u32 ath11k_map_fw_reg_flags(u16 reg_flags)</div><div class='ctx'> 	return flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 ath11k_map_fw_phy_flags(u32 phy_flags)</div><div class='add'>+{</div><div class='add'>+	u32 flags = 0;</div><div class='add'>+</div><div class='add'>+	if (phy_flags &amp; ATH11K_REG_PHY_BITMAP_NO11AX)</div><div class='add'>+		flags |= NL80211_RRF_NO_HE;</div><div class='add'>+</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool</div><div class='ctx'> ath11k_reg_can_intersect(struct ieee80211_reg_rule *rule1,</div><div class='ctx'> 			 struct ieee80211_reg_rule *rule2)</div><div class='hunk'>@@ -377,6 +415,11 @@ static void ath11k_reg_intersect_rules(struct ieee80211_reg_rule *rule1,</div><div class='ctx'> 	/* Use the flags of both the rules */</div><div class='ctx'> 	new_rule-&gt;flags = rule1-&gt;flags | rule2-&gt;flags;</div><div class='ctx'> </div><div class='add'>+	if ((rule1-&gt;flags &amp; NL80211_RRF_PSD) &amp;&amp; (rule2-&gt;flags &amp; NL80211_RRF_PSD))</div><div class='add'>+		new_rule-&gt;psd = min_t(s8, rule1-&gt;psd, rule2-&gt;psd);</div><div class='add'>+	else</div><div class='add'>+		new_rule-&gt;flags &amp;= ~NL80211_RRF_PSD;</div><div class='add'>+</div><div class='ctx'> 	/* To be safe, lts use the max cac timeout of both rules */</div><div class='ctx'> 	new_rule-&gt;dfs_cac_ms = max_t(u32, rule1-&gt;dfs_cac_ms,</div><div class='ctx'> 				     rule2-&gt;dfs_cac_ms);</div><div class='hunk'>@@ -458,6 +501,9 @@ ath11k_reg_adjust_bw(u16 start_freq, u16 end_freq, u16 max_bw)</div><div class='ctx'> {</div><div class='ctx'> 	u16 bw;</div><div class='ctx'> </div><div class='add'>+	if (end_freq &lt;= start_freq)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	bw = end_freq - start_freq;</div><div class='ctx'> 	bw = min_t(u16, bw, max_bw);</div><div class='ctx'> </div><div class='hunk'>@@ -465,8 +511,10 @@ ath11k_reg_adjust_bw(u16 start_freq, u16 end_freq, u16 max_bw)</div><div class='ctx'> 		bw = 80;</div><div class='ctx'> 	else if (bw &gt;= 40 &amp;&amp; bw &lt; 80)</div><div class='ctx'> 		bw = 40;</div><div class='del'>-	else if (bw &lt; 40)</div><div class='add'>+	else if (bw &gt;= 20 &amp;&amp; bw &lt; 40)</div><div class='ctx'> 		bw = 20;</div><div class='add'>+	else</div><div class='add'>+		bw = 0;</div><div class='ctx'> </div><div class='ctx'> 	return bw;</div><div class='ctx'> }</div><div class='hunk'>@@ -474,13 +522,14 @@ ath11k_reg_adjust_bw(u16 start_freq, u16 end_freq, u16 max_bw)</div><div class='ctx'> static void</div><div class='ctx'> ath11k_reg_update_rule(struct ieee80211_reg_rule *reg_rule, u32 start_freq,</div><div class='ctx'> 		       u32 end_freq, u32 bw, u32 ant_gain, u32 reg_pwr,</div><div class='del'>-		       u32 reg_flags)</div><div class='add'>+		       s8 psd, u32 reg_flags)</div><div class='ctx'> {</div><div class='ctx'> 	reg_rule-&gt;freq_range.start_freq_khz = MHZ_TO_KHZ(start_freq);</div><div class='ctx'> 	reg_rule-&gt;freq_range.end_freq_khz = MHZ_TO_KHZ(end_freq);</div><div class='ctx'> 	reg_rule-&gt;freq_range.max_bandwidth_khz = MHZ_TO_KHZ(bw);</div><div class='ctx'> 	reg_rule-&gt;power_rule.max_antenna_gain = DBI_TO_MBI(ant_gain);</div><div class='ctx'> 	reg_rule-&gt;power_rule.max_eirp = DBM_TO_MBM(reg_pwr);</div><div class='add'>+	reg_rule-&gt;psd = psd;</div><div class='ctx'> 	reg_rule-&gt;flags = reg_flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -490,90 +539,143 @@ ath11k_reg_update_weather_radar_band(struct ath11k_base *ab,</div><div class='ctx'> 				     struct cur_reg_rule *reg_rule,</div><div class='ctx'> 				     u8 *rule_idx, u32 flags, u16 max_bw)</div><div class='ctx'> {</div><div class='add'>+	u32 start_freq;</div><div class='ctx'> 	u32 end_freq;</div><div class='ctx'> 	u16 bw;</div><div class='ctx'> 	u8 i;</div><div class='ctx'> </div><div class='ctx'> 	i = *rule_idx;</div><div class='ctx'> </div><div class='add'>+	/* there might be situations when even the input rule must be dropped */</div><div class='add'>+	i--;</div><div class='add'>+</div><div class='add'>+	/* frequencies below weather radar */</div><div class='ctx'> 	bw = ath11k_reg_adjust_bw(reg_rule-&gt;start_freq,</div><div class='ctx'> 				  ETSI_WEATHER_RADAR_BAND_LOW, max_bw);</div><div class='add'>+	if (bw &gt; 0) {</div><div class='add'>+		i++;</div><div class='ctx'> </div><div class='del'>-	ath11k_reg_update_rule(regd-&gt;reg_rules + i, reg_rule-&gt;start_freq,</div><div class='del'>-			       ETSI_WEATHER_RADAR_BAND_LOW, bw,</div><div class='del'>-			       reg_rule-&gt;ant_gain, reg_rule-&gt;reg_power,</div><div class='del'>-			       flags);</div><div class='add'>+		ath11k_reg_update_rule(regd-&gt;reg_rules + i,</div><div class='add'>+				       reg_rule-&gt;start_freq,</div><div class='add'>+				       ETSI_WEATHER_RADAR_BAND_LOW, bw,</div><div class='add'>+				       reg_rule-&gt;ant_gain, reg_rule-&gt;reg_power,</div><div class='add'>+				       reg_rule-&gt;psd_eirp, flags);</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_REG,</div><div class='del'>-		   "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n",</div><div class='del'>-		   i + 1, reg_rule-&gt;start_freq, ETSI_WEATHER_RADAR_BAND_LOW,</div><div class='del'>-		   bw, reg_rule-&gt;ant_gain, reg_rule-&gt;reg_power,</div><div class='del'>-		   regd-&gt;reg_rules[i].dfs_cac_ms,</div><div class='del'>-		   flags);</div><div class='del'>-</div><div class='del'>-	if (reg_rule-&gt;end_freq &gt; ETSI_WEATHER_RADAR_BAND_HIGH)</div><div class='del'>-		end_freq = ETSI_WEATHER_RADAR_BAND_HIGH;</div><div class='del'>-	else</div><div class='del'>-		end_freq = reg_rule-&gt;end_freq;</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_REG,</div><div class='add'>+			   "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n",</div><div class='add'>+			   i + 1, reg_rule-&gt;start_freq,</div><div class='add'>+			   ETSI_WEATHER_RADAR_BAND_LOW, bw, reg_rule-&gt;ant_gain,</div><div class='add'>+			   reg_rule-&gt;reg_power, regd-&gt;reg_rules[i].dfs_cac_ms,</div><div class='add'>+			   flags);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	bw = ath11k_reg_adjust_bw(ETSI_WEATHER_RADAR_BAND_LOW, end_freq,</div><div class='del'>-				  max_bw);</div><div class='add'>+	/* weather radar frequencies */</div><div class='add'>+	start_freq = max_t(u32, reg_rule-&gt;start_freq,</div><div class='add'>+			   ETSI_WEATHER_RADAR_BAND_LOW);</div><div class='add'>+	end_freq = min_t(u32, reg_rule-&gt;end_freq, ETSI_WEATHER_RADAR_BAND_HIGH);</div><div class='ctx'> </div><div class='del'>-	i++;</div><div class='add'>+	bw = ath11k_reg_adjust_bw(start_freq, end_freq, max_bw);</div><div class='add'>+	if (bw &gt; 0) {</div><div class='add'>+		i++;</div><div class='ctx'> </div><div class='del'>-	ath11k_reg_update_rule(regd-&gt;reg_rules + i,</div><div class='del'>-			       ETSI_WEATHER_RADAR_BAND_LOW, end_freq, bw,</div><div class='del'>-			       reg_rule-&gt;ant_gain, reg_rule-&gt;reg_power,</div><div class='del'>-			       flags);</div><div class='add'>+		ath11k_reg_update_rule(regd-&gt;reg_rules + i, start_freq,</div><div class='add'>+				       end_freq, bw, reg_rule-&gt;ant_gain,</div><div class='add'>+				       reg_rule-&gt;reg_power, reg_rule-&gt;psd_eirp, flags);</div><div class='ctx'> </div><div class='del'>-	regd-&gt;reg_rules[i].dfs_cac_ms = ETSI_WEATHER_RADAR_BAND_CAC_TIMEOUT;</div><div class='add'>+		regd-&gt;reg_rules[i].dfs_cac_ms = ETSI_WEATHER_RADAR_BAND_CAC_TIMEOUT;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_REG,</div><div class='del'>-		   "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n",</div><div class='del'>-		   i + 1, ETSI_WEATHER_RADAR_BAND_LOW, end_freq,</div><div class='del'>-		   bw, reg_rule-&gt;ant_gain, reg_rule-&gt;reg_power,</div><div class='del'>-		   regd-&gt;reg_rules[i].dfs_cac_ms,</div><div class='del'>-		   flags);</div><div class='del'>-</div><div class='del'>-	if (end_freq == reg_rule-&gt;end_freq) {</div><div class='del'>-		regd-&gt;n_reg_rules--;</div><div class='del'>-		*rule_idx = i;</div><div class='del'>-		return;</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_REG,</div><div class='add'>+			   "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n",</div><div class='add'>+			   i + 1, start_freq, end_freq, bw,</div><div class='add'>+			   reg_rule-&gt;ant_gain, reg_rule-&gt;reg_power,</div><div class='add'>+			   regd-&gt;reg_rules[i].dfs_cac_ms, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* frequencies above weather radar */</div><div class='ctx'> 	bw = ath11k_reg_adjust_bw(ETSI_WEATHER_RADAR_BAND_HIGH,</div><div class='ctx'> 				  reg_rule-&gt;end_freq, max_bw);</div><div class='add'>+	if (bw &gt; 0) {</div><div class='add'>+		i++;</div><div class='ctx'> </div><div class='del'>-	i++;</div><div class='del'>-</div><div class='del'>-	ath11k_reg_update_rule(regd-&gt;reg_rules + i, ETSI_WEATHER_RADAR_BAND_HIGH,</div><div class='del'>-			       reg_rule-&gt;end_freq, bw,</div><div class='del'>-			       reg_rule-&gt;ant_gain, reg_rule-&gt;reg_power,</div><div class='del'>-			       flags);</div><div class='add'>+		ath11k_reg_update_rule(regd-&gt;reg_rules + i,</div><div class='add'>+				       ETSI_WEATHER_RADAR_BAND_HIGH,</div><div class='add'>+				       reg_rule-&gt;end_freq, bw,</div><div class='add'>+				       reg_rule-&gt;ant_gain, reg_rule-&gt;reg_power,</div><div class='add'>+				       reg_rule-&gt;psd_eirp, flags);</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_REG,</div><div class='del'>-		   "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n",</div><div class='del'>-		   i + 1, ETSI_WEATHER_RADAR_BAND_HIGH, reg_rule-&gt;end_freq,</div><div class='del'>-		   bw, reg_rule-&gt;ant_gain, reg_rule-&gt;reg_power,</div><div class='del'>-		   regd-&gt;reg_rules[i].dfs_cac_ms,</div><div class='del'>-		   flags);</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_REG,</div><div class='add'>+			   "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n",</div><div class='add'>+			   i + 1, ETSI_WEATHER_RADAR_BAND_HIGH,</div><div class='add'>+			   reg_rule-&gt;end_freq, bw, reg_rule-&gt;ant_gain,</div><div class='add'>+			   reg_rule-&gt;reg_power, regd-&gt;reg_rules[i].dfs_cac_ms,</div><div class='add'>+			   flags);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	*rule_idx = i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+enum wmi_reg_6ghz_ap_type</div><div class='add'>+ath11k_reg_ap_pwr_convert(enum ieee80211_ap_reg_power power_type)</div><div class='add'>+{</div><div class='add'>+	switch (power_type) {</div><div class='add'>+	case IEEE80211_REG_LPI_AP:</div><div class='add'>+		return WMI_REG_INDOOR_AP;</div><div class='add'>+	case IEEE80211_REG_SP_AP:</div><div class='add'>+		return WMI_REG_STANDARD_POWER_AP;</div><div class='add'>+	case IEEE80211_REG_VLP_AP:</div><div class='add'>+		return WMI_REG_VERY_LOW_POWER_AP;</div><div class='add'>+	default:</div><div class='add'>+		return WMI_REG_MAX_AP_TYPE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct ieee80211_regdomain *</div><div class='ctx'> ath11k_reg_build_regd(struct ath11k_base *ab,</div><div class='del'>-		      struct cur_regulatory_info *reg_info, bool intersect)</div><div class='add'>+		      struct cur_regulatory_info *reg_info, bool intersect,</div><div class='add'>+		      enum wmi_vdev_type vdev_type,</div><div class='add'>+		      enum ieee80211_ap_reg_power power_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_regdomain *tmp_regd, *default_regd, *new_regd = NULL;</div><div class='del'>-	struct cur_reg_rule *reg_rule;</div><div class='del'>-	u8 i = 0, j = 0;</div><div class='add'>+	struct cur_reg_rule *reg_rule, *reg_rule_6ghz;</div><div class='add'>+	u8 i = 0, j = 0, k = 0;</div><div class='ctx'> 	u8 num_rules;</div><div class='ctx'> 	u16 max_bw;</div><div class='del'>-	u32 flags;</div><div class='add'>+	u32 flags, reg_6ghz_number, max_bw_6ghz;</div><div class='ctx'> 	char alpha2[3];</div><div class='ctx'> </div><div class='del'>-	num_rules = reg_info-&gt;num_5g_reg_rules + reg_info-&gt;num_2g_reg_rules;</div><div class='add'>+	num_rules = reg_info-&gt;num_5ghz_reg_rules + reg_info-&gt;num_2ghz_reg_rules;</div><div class='add'>+</div><div class='add'>+	if (reg_info-&gt;is_ext_reg_event) {</div><div class='add'>+		if (vdev_type == WMI_VDEV_TYPE_STA) {</div><div class='add'>+			enum wmi_reg_6ghz_ap_type ap_type;</div><div class='add'>+</div><div class='add'>+			ap_type = ath11k_reg_ap_pwr_convert(power_type);</div><div class='add'>+</div><div class='add'>+			if (ap_type == WMI_REG_MAX_AP_TYPE)</div><div class='add'>+				ap_type = WMI_REG_INDOOR_AP;</div><div class='add'>+</div><div class='add'>+			reg_6ghz_number = reg_info-&gt;num_6ghz_rules_client</div><div class='add'>+					[ap_type][WMI_REG_DEFAULT_CLIENT];</div><div class='add'>+</div><div class='add'>+			if (reg_6ghz_number == 0) {</div><div class='add'>+				ap_type = WMI_REG_INDOOR_AP;</div><div class='add'>+				reg_6ghz_number = reg_info-&gt;num_6ghz_rules_client</div><div class='add'>+						[ap_type][WMI_REG_DEFAULT_CLIENT];</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			reg_rule_6ghz = reg_info-&gt;reg_rules_6ghz_client_ptr</div><div class='add'>+					[ap_type][WMI_REG_DEFAULT_CLIENT];</div><div class='add'>+			max_bw_6ghz = reg_info-&gt;max_bw_6ghz_client</div><div class='add'>+					[ap_type][WMI_REG_DEFAULT_CLIENT];</div><div class='add'>+		} else {</div><div class='add'>+			reg_6ghz_number = reg_info-&gt;num_6ghz_rules_ap[WMI_REG_INDOOR_AP];</div><div class='add'>+			reg_rule_6ghz =</div><div class='add'>+				reg_info-&gt;reg_rules_6ghz_ap_ptr[WMI_REG_INDOOR_AP];</div><div class='add'>+			max_bw_6ghz = reg_info-&gt;max_bw_6ghz_ap[WMI_REG_INDOOR_AP];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		num_rules += reg_6ghz_number;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!num_rules)</div><div class='ctx'> 		goto ret;</div><div class='hunk'>@@ -594,24 +696,24 @@ ath11k_reg_build_regd(struct ath11k_base *ab,</div><div class='ctx'> 	tmp_regd-&gt;dfs_region = ath11k_map_fw_dfs_region(reg_info-&gt;dfs_region);</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_REG,</div><div class='del'>-		   "\r\nCountry %s, CFG Regdomain %s FW Regdomain %d, num_reg_rules %d\n",</div><div class='add'>+		   "Country %s, CFG Regdomain %s FW Regdomain %d, num_reg_rules %d\n",</div><div class='ctx'> 		   alpha2, ath11k_reg_get_regdom_str(tmp_regd-&gt;dfs_region),</div><div class='ctx'> 		   reg_info-&gt;dfs_region, num_rules);</div><div class='ctx'> 	/* Update reg_rules[] below. Firmware is expected to</div><div class='del'>-	 * send these rules in order(2G rules first and then 5G)</div><div class='add'>+	 * send these rules in order(2 GHz rules first and then 5 GHz)</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (; i &lt; num_rules; i++) {</div><div class='del'>-		if (reg_info-&gt;num_2g_reg_rules &amp;&amp;</div><div class='del'>-		    (i &lt; reg_info-&gt;num_2g_reg_rules)) {</div><div class='del'>-			reg_rule = reg_info-&gt;reg_rules_2g_ptr + i;</div><div class='add'>+		if (reg_info-&gt;num_2ghz_reg_rules &amp;&amp;</div><div class='add'>+		    (i &lt; reg_info-&gt;num_2ghz_reg_rules)) {</div><div class='add'>+			reg_rule = reg_info-&gt;reg_rules_2ghz_ptr + i;</div><div class='ctx'> 			max_bw = min_t(u16, reg_rule-&gt;max_bw,</div><div class='del'>-				       reg_info-&gt;max_bw_2g);</div><div class='add'>+				       reg_info-&gt;max_bw_2ghz);</div><div class='ctx'> 			flags = 0;</div><div class='del'>-		} else if (reg_info-&gt;num_5g_reg_rules &amp;&amp;</div><div class='del'>-			   (j &lt; reg_info-&gt;num_5g_reg_rules)) {</div><div class='del'>-			reg_rule = reg_info-&gt;reg_rules_5g_ptr + j++;</div><div class='add'>+		} else if (reg_info-&gt;num_5ghz_reg_rules &amp;&amp;</div><div class='add'>+			   (j &lt; reg_info-&gt;num_5ghz_reg_rules)) {</div><div class='add'>+			reg_rule = reg_info-&gt;reg_rules_5ghz_ptr + j++;</div><div class='ctx'> 			max_bw = min_t(u16, reg_rule-&gt;max_bw,</div><div class='del'>-				       reg_info-&gt;max_bw_5g);</div><div class='add'>+				       reg_info-&gt;max_bw_5ghz);</div><div class='ctx'> </div><div class='ctx'> 			/* FW doesn't pass NL80211_RRF_AUTO_BW flag for</div><div class='ctx'> 			 * BW Auto correction, we can enable this by default</div><div class='hunk'>@@ -620,17 +722,25 @@ ath11k_reg_build_regd(struct ath11k_base *ab,</div><div class='ctx'> 			 * per other BW rule flags we pass from here</div><div class='ctx'> 			 */</div><div class='ctx'> 			flags = NL80211_RRF_AUTO_BW;</div><div class='add'>+		} else if (reg_info-&gt;is_ext_reg_event &amp;&amp; reg_6ghz_number &amp;&amp;</div><div class='add'>+			   k &lt; reg_6ghz_number) {</div><div class='add'>+			reg_rule = reg_rule_6ghz + k++;</div><div class='add'>+			max_bw = min_t(u16, reg_rule-&gt;max_bw, max_bw_6ghz);</div><div class='add'>+			flags = NL80211_RRF_AUTO_BW;</div><div class='add'>+			if (reg_rule-&gt;psd_flag)</div><div class='add'>+				flags |= NL80211_RRF_PSD;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		flags |= ath11k_map_fw_reg_flags(reg_rule-&gt;flags);</div><div class='add'>+		flags |= ath11k_map_fw_phy_flags(reg_info-&gt;phybitmap);</div><div class='ctx'> </div><div class='ctx'> 		ath11k_reg_update_rule(tmp_regd-&gt;reg_rules + i,</div><div class='ctx'> 				       reg_rule-&gt;start_freq,</div><div class='ctx'> 				       reg_rule-&gt;end_freq, max_bw,</div><div class='ctx'> 				       reg_rule-&gt;ant_gain, reg_rule-&gt;reg_power,</div><div class='del'>-				       flags);</div><div class='add'>+				       reg_rule-&gt;psd_eirp, flags);</div><div class='ctx'> </div><div class='ctx'> 		/* Update dfs cac timeout if the dfs domain is ETSI and the</div><div class='ctx'> 		 * new rule covers weather radar band.</div><div class='hunk'>@@ -647,12 +757,21 @@ ath11k_reg_build_regd(struct ath11k_base *ab,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ath11k_dbg(ab, ATH11K_DBG_REG,</div><div class='del'>-			   "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n",</div><div class='del'>-			   i + 1, reg_rule-&gt;start_freq, reg_rule-&gt;end_freq,</div><div class='del'>-			   max_bw, reg_rule-&gt;ant_gain, reg_rule-&gt;reg_power,</div><div class='del'>-			   tmp_regd-&gt;reg_rules[i].dfs_cac_ms,</div><div class='del'>-			   flags);</div><div class='add'>+		if (reg_info-&gt;is_ext_reg_event) {</div><div class='add'>+			ath11k_dbg(ab, ATH11K_DBG_REG,</div><div class='add'>+				   "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d) (%d, %d)\n",</div><div class='add'>+				   i + 1, reg_rule-&gt;start_freq, reg_rule-&gt;end_freq,</div><div class='add'>+				   max_bw, reg_rule-&gt;ant_gain, reg_rule-&gt;reg_power,</div><div class='add'>+				   tmp_regd-&gt;reg_rules[i].dfs_cac_ms, flags,</div><div class='add'>+				   reg_rule-&gt;psd_flag, reg_rule-&gt;psd_eirp);</div><div class='add'>+		} else {</div><div class='add'>+			ath11k_dbg(ab, ATH11K_DBG_REG,</div><div class='add'>+				   "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n",</div><div class='add'>+				   i + 1, reg_rule-&gt;start_freq, reg_rule-&gt;end_freq,</div><div class='add'>+				   max_bw, reg_rule-&gt;ant_gain, reg_rule-&gt;reg_power,</div><div class='add'>+				   tmp_regd-&gt;reg_rules[i].dfs_cac_ms,</div><div class='add'>+				   flags);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tmp_regd-&gt;n_reg_rules = i;</div><div class='hunk'>@@ -677,13 +796,214 @@ ret:</div><div class='ctx'> 	return new_regd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void ath11k_regd_update_chan_list_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = container_of(work, struct ath11k,</div><div class='add'>+					 channel_update_work);</div><div class='add'>+	struct scan_chan_list_params *params;</div><div class='add'>+	struct list_head local_update_list;</div><div class='add'>+	int left;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;local_update_list);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	list_splice_tail_init(&amp;ar-&gt;channel_update_queue, &amp;local_update_list);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	while ((params = list_first_entry_or_null(&amp;local_update_list,</div><div class='add'>+						  struct scan_chan_list_params,</div><div class='add'>+						  list))) {</div><div class='add'>+		if (ar-&gt;state_11d != ATH11K_11D_IDLE) {</div><div class='add'>+			left = wait_for_completion_timeout(&amp;ar-&gt;completed_11d_scan,</div><div class='add'>+							   ATH11K_SCAN_TIMEOUT_HZ);</div><div class='add'>+			if (!left) {</div><div class='add'>+				ath11k_dbg(ar-&gt;ab, ATH11K_DBG_REG,</div><div class='add'>+					   "failed to receive 11d scan complete: timed out\n");</div><div class='add'>+				ar-&gt;state_11d = ATH11K_11D_IDLE;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ath11k_dbg(ar-&gt;ab, ATH11K_DBG_REG,</div><div class='add'>+				   "reg 11d scan wait left time %d\n", left);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((ar-&gt;scan.state == ATH11K_SCAN_STARTING ||</div><div class='add'>+		     ar-&gt;scan.state == ATH11K_SCAN_RUNNING)) {</div><div class='add'>+			left = wait_for_completion_timeout(&amp;ar-&gt;scan.completed,</div><div class='add'>+							   ATH11K_SCAN_TIMEOUT_HZ);</div><div class='add'>+			if (!left)</div><div class='add'>+				ath11k_dbg(ar-&gt;ab, ATH11K_DBG_REG,</div><div class='add'>+					   "failed to receive hw scan complete: timed out\n");</div><div class='add'>+</div><div class='add'>+			ath11k_dbg(ar-&gt;ab, ATH11K_DBG_REG,</div><div class='add'>+				   "reg hw scan wait left time %d\n", left);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath11k_wmi_send_scan_chan_list_cmd(ar, params);</div><div class='add'>+		list_del(&amp;params-&gt;list);</div><div class='add'>+		kfree(params);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath11k_reg_is_world_alpha(char *alpha)</div><div class='add'>+{</div><div class='add'>+	if (alpha[0] == '0' &amp;&amp; alpha[1] == '0')</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (alpha[0] == 'n' &amp;&amp; alpha[1] == 'a')</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum wmi_vdev_type ath11k_reg_get_ar_vdev_type(struct ath11k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_vif *arvif;</div><div class='add'>+</div><div class='add'>+	/* Currently each struct ath11k maps to one struct ieee80211_hw/wiphy</div><div class='add'>+	 * and one struct ieee80211_regdomain, so it could only store one group</div><div class='add'>+	 * reg rules. It means multi-interface concurrency in the same ath11k is</div><div class='add'>+	 * not support for the regdomain. So get the vdev type of the first entry</div><div class='add'>+	 * now. After concurrency support for the regdomain, this should change.</div><div class='add'>+	 */</div><div class='add'>+	arvif = list_first_entry_or_null(&amp;ar-&gt;arvifs, struct ath11k_vif, list);</div><div class='add'>+	if (arvif)</div><div class='add'>+		return arvif-&gt;vdev_type;</div><div class='add'>+</div><div class='add'>+	return WMI_VDEV_TYPE_UNSPEC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_reg_handle_chan_list(struct ath11k_base *ab,</div><div class='add'>+				struct cur_regulatory_info *reg_info,</div><div class='add'>+				enum ieee80211_ap_reg_power power_type)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_regdomain *regd;</div><div class='add'>+	bool intersect = false;</div><div class='add'>+	int pdev_idx;</div><div class='add'>+	struct ath11k *ar;</div><div class='add'>+	enum wmi_vdev_type vdev_type;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event reg handle chan list");</div><div class='add'>+</div><div class='add'>+	if (reg_info-&gt;status_code != REG_SET_CC_STATUS_PASS) {</div><div class='add'>+		/* In case of failure to set the requested ctry,</div><div class='add'>+		 * fw retains the current regd. We print a failure info</div><div class='add'>+		 * and return from here.</div><div class='add'>+		 */</div><div class='add'>+		ath11k_warn(ab, "Failed to set the requested Country regulatory setting\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pdev_idx = reg_info-&gt;phy_id;</div><div class='add'>+</div><div class='add'>+	/* Avoid default reg rule updates sent during FW recovery if</div><div class='add'>+	 * it is already available</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	if (test_bit(ATH11K_FLAG_RECOVERY, &amp;ab-&gt;dev_flags) &amp;&amp;</div><div class='add'>+	    ab-&gt;default_regd[pdev_idx]) {</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		goto retfail;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	if (pdev_idx &gt;= ab-&gt;num_radios) {</div><div class='add'>+		/* Process the event for phy0 only if single_pdev_only</div><div class='add'>+		 * is true. If pdev_idx is valid but not 0, discard the</div><div class='add'>+		 * event. Otherwise, it goes to fallback. In either case</div><div class='add'>+		 * ath11k_reg_reset_info() needs to be called to avoid</div><div class='add'>+		 * memory leak issue.</div><div class='add'>+		 */</div><div class='add'>+		ath11k_reg_reset_info(reg_info);</div><div class='add'>+</div><div class='add'>+		if (ab-&gt;hw_params.single_pdev_only &amp;&amp;</div><div class='add'>+		    pdev_idx &lt; ab-&gt;hw_params.num_rxdma_per_pdev)</div><div class='add'>+			return 0;</div><div class='add'>+		goto fallback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Avoid multiple overwrites to default regd, during core</div><div class='add'>+	 * stop-start after mac registration.</div><div class='add'>+	 */</div><div class='add'>+	if (ab-&gt;default_regd[pdev_idx] &amp;&amp; !ab-&gt;new_regd[pdev_idx] &amp;&amp;</div><div class='add'>+	    !memcmp((char *)ab-&gt;default_regd[pdev_idx]-&gt;alpha2,</div><div class='add'>+		    (char *)reg_info-&gt;alpha2, 2))</div><div class='add'>+		goto retfail;</div><div class='add'>+</div><div class='add'>+	/* Intersect new rules with default regd if a new country setting was</div><div class='add'>+	 * requested, i.e a default regd was already set during initialization</div><div class='add'>+	 * and the regd coming from this event has a valid country info.</div><div class='add'>+	 */</div><div class='add'>+	if (ab-&gt;default_regd[pdev_idx] &amp;&amp;</div><div class='add'>+	    !ath11k_reg_is_world_alpha((char *)</div><div class='add'>+		ab-&gt;default_regd[pdev_idx]-&gt;alpha2) &amp;&amp;</div><div class='add'>+	    !ath11k_reg_is_world_alpha((char *)reg_info-&gt;alpha2))</div><div class='add'>+		intersect = true;</div><div class='add'>+</div><div class='add'>+	ar = ab-&gt;pdevs[pdev_idx].ar;</div><div class='add'>+	vdev_type = ath11k_reg_get_ar_vdev_type(ar);</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "wmi handle chan list power type %d vdev type %d intersect %d\n",</div><div class='add'>+		   power_type, vdev_type, intersect);</div><div class='add'>+</div><div class='add'>+	regd = ath11k_reg_build_regd(ab, reg_info, intersect, vdev_type, power_type);</div><div class='add'>+	if (!regd) {</div><div class='add'>+		ath11k_warn(ab, "failed to build regd from reg_info\n");</div><div class='add'>+		goto fallback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (power_type == IEEE80211_REG_UNSET_AP) {</div><div class='add'>+		ath11k_reg_reset_info(&amp;ab-&gt;reg_info_store[pdev_idx]);</div><div class='add'>+		ab-&gt;reg_info_store[pdev_idx] = *reg_info;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	if (ab-&gt;default_regd[pdev_idx]) {</div><div class='add'>+		/* The initial rules from FW after WMI Init is to build</div><div class='add'>+		 * the default regd. From then on, any rules updated for</div><div class='add'>+		 * the pdev could be due to user reg changes.</div><div class='add'>+		 * Free previously built regd before assigning the newly</div><div class='add'>+		 * generated regd to ar. NULL pointer handling will be</div><div class='add'>+		 * taken care by kfree itself.</div><div class='add'>+		 */</div><div class='add'>+		ar = ab-&gt;pdevs[pdev_idx].ar;</div><div class='add'>+		kfree(ab-&gt;new_regd[pdev_idx]);</div><div class='add'>+		ab-&gt;new_regd[pdev_idx] = regd;</div><div class='add'>+		queue_work(ab-&gt;workqueue, &amp;ar-&gt;regd_update_work);</div><div class='add'>+	} else {</div><div class='add'>+		/* This regd would be applied during mac registration and is</div><div class='add'>+		 * held constant throughout for regd intersection purpose</div><div class='add'>+		 */</div><div class='add'>+		ab-&gt;default_regd[pdev_idx] = regd;</div><div class='add'>+	}</div><div class='add'>+	ab-&gt;dfs_region = reg_info-&gt;dfs_region;</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fallback:</div><div class='add'>+	/* Fallback to older reg (by sending previous country setting</div><div class='add'>+	 * again if fw has succeeded and we failed to process here.</div><div class='add'>+	 * The Regdomain should be uniform across driver and fw. Since the</div><div class='add'>+	 * FW has processed the command and sent a success status, we expect</div><div class='add'>+	 * this function to succeed as well. If it doesn't, CTRY needs to be</div><div class='add'>+	 * reverted at the fw and the old SCAN_CHAN_LIST cmd needs to be sent.</div><div class='add'>+	 */</div><div class='add'>+	/* TODO: This is rare, but still should also be handled */</div><div class='add'>+	WARN_ON(1);</div><div class='add'>+</div><div class='add'>+retfail:</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void ath11k_regd_update_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = container_of(work, struct ath11k,</div><div class='ctx'> 					 regd_update_work);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_regd_update(ar, false);</div><div class='add'>+	ret = ath11k_regd_update(ar);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		/* Firmware has already moved to the new regd. We need</div><div class='ctx'> 		 * to maintain channel consistency across FW, Host driver</div><div class='hunk'>@@ -697,15 +1017,50 @@ void ath11k_regd_update_work(struct work_struct *work)</div><div class='ctx'> void ath11k_reg_init(struct ath11k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	ar-&gt;hw-&gt;wiphy-&gt;regulatory_flags = REGULATORY_WIPHY_SELF_MANAGED;</div><div class='add'>+	ar-&gt;hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_NOTIFY_REGDOM_BY_DRIVER;</div><div class='ctx'> 	ar-&gt;hw-&gt;wiphy-&gt;reg_notifier = ath11k_reg_notifier;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void ath11k_reg_reset_info(struct cur_regulatory_info *reg_info)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	if (!reg_info)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	kfree(reg_info-&gt;reg_rules_2ghz_ptr);</div><div class='add'>+	kfree(reg_info-&gt;reg_rules_5ghz_ptr);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WMI_REG_CURRENT_MAX_AP_TYPE; i++) {</div><div class='add'>+		kfree(reg_info-&gt;reg_rules_6ghz_ap_ptr[i]);</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; WMI_REG_MAX_CLIENT_TYPE; j++)</div><div class='add'>+			kfree(reg_info-&gt;reg_rules_6ghz_client_ptr[i][j]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(reg_info, 0, sizeof(*reg_info));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void ath11k_reg_free(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++)</div><div class='add'>+		ath11k_reg_reset_info(&amp;ab-&gt;reg_info_store[i]);</div><div class='add'>+</div><div class='add'>+	kfree(ab-&gt;reg_info_store);</div><div class='add'>+	ab-&gt;reg_info_store = NULL;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ab-&gt;hw_params.max_radios; i++) {</div><div class='ctx'> 		kfree(ab-&gt;default_regd[i]);</div><div class='ctx'> 		kfree(ab-&gt;new_regd[i]);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int ath11k_reg_set_cc(struct ath11k *ar)</div><div class='add'>+{</div><div class='add'>+	struct wmi_set_current_country_params set_current_param = {};</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;set_current_param.alpha2, ar-&gt;alpha2, 2);</div><div class='add'>+	return ath11k_wmi_send_set_current_country_cmd(ar, &amp;set_current_param);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/reg.h b/drivers/net/wireless/ath/ath11k/reg.h<br/>index 65d56d44796f..72b483594015 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/reg.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/reg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/reg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/reg.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef ATH11K_REG_H</div><div class='hunk'>@@ -24,13 +25,26 @@ enum ath11k_dfs_region {</div><div class='ctx'> 	ATH11K_DFS_REG_UNDEF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Phy bitmaps */</div><div class='add'>+#define ATH11K_REG_PHY_BITMAP_NO11AX	BIT(5)</div><div class='add'>+</div><div class='ctx'> /* ATH11K Regulatory API's */</div><div class='ctx'> void ath11k_reg_init(struct ath11k *ar);</div><div class='add'>+void ath11k_reg_reset_info(struct cur_regulatory_info *reg_info);</div><div class='ctx'> void ath11k_reg_free(struct ath11k_base *ab);</div><div class='ctx'> void ath11k_regd_update_work(struct work_struct *work);</div><div class='add'>+void ath11k_regd_update_chan_list_work(struct work_struct *work);</div><div class='ctx'> struct ieee80211_regdomain *</div><div class='ctx'> ath11k_reg_build_regd(struct ath11k_base *ab,</div><div class='del'>-		      struct cur_regulatory_info *reg_info, bool intersect);</div><div class='del'>-int ath11k_regd_update(struct ath11k *ar, bool init);</div><div class='del'>-int ath11k_reg_update_chan_list(struct ath11k *ar);</div><div class='add'>+		      struct cur_regulatory_info *reg_info, bool intersect,</div><div class='add'>+		      enum wmi_vdev_type vdev_type,</div><div class='add'>+		      enum ieee80211_ap_reg_power power_type);</div><div class='add'>+int ath11k_regd_update(struct ath11k *ar);</div><div class='add'>+int ath11k_reg_update_chan_list(struct ath11k *ar, bool wait);</div><div class='add'>+enum wmi_reg_6ghz_ap_type</div><div class='add'>+ath11k_reg_ap_pwr_convert(enum ieee80211_ap_reg_power power_type);</div><div class='add'>+int ath11k_reg_handle_chan_list(struct ath11k_base *ab,</div><div class='add'>+				struct cur_regulatory_info *reg_info,</div><div class='add'>+				enum ieee80211_ap_reg_power power_type);</div><div class='add'>+int ath11k_reg_set_cc(struct ath11k *ar);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/rx_desc.h b/drivers/net/wireless/ath/ath11k/rx_desc.h<br/>index 0cdb4a1f816e..2da6da727278 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/rx_desc.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/rx_desc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/rx_desc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/rx_desc.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef ATH11K_RX_DESC_H</div><div class='ctx'> #define ATH11K_RX_DESC_H</div><div class='hunk'>@@ -368,6 +369,7 @@ struct rx_attention {</div><div class='ctx'> #define RX_MPDU_START_INFO2_BSSID_HIT		BIT(9)</div><div class='ctx'> #define RX_MPDU_START_INFO2_BSSID_NUM		GENMASK(13, 10)</div><div class='ctx'> #define RX_MPDU_START_INFO2_TID			GENMASK(17, 14)</div><div class='add'>+#define RX_MPDU_START_INFO2_TID_WCN6855		GENMASK(18, 15)</div><div class='ctx'> </div><div class='ctx'> #define RX_MPDU_START_INFO3_REO_DEST_IND		GENMASK(4, 0)</div><div class='ctx'> #define RX_MPDU_START_INFO3_FLOW_ID_TOEPLITZ		BIT(7)</div><div class='hunk'>@@ -546,6 +548,31 @@ struct rx_mpdu_start_qcn9074 {</div><div class='ctx'> 	__le32 ht_ctrl;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct rx_mpdu_start_wcn6855 {</div><div class='add'>+	__le32 info3;</div><div class='add'>+	__le32 reo_queue_desc_lo;</div><div class='add'>+	__le32 info4;</div><div class='add'>+	__le32 pn[4];</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le32 peer_meta_data;</div><div class='add'>+	__le16 info0;</div><div class='add'>+	__le16 phy_ppdu_id;</div><div class='add'>+	__le16 ast_index;</div><div class='add'>+	__le16 sw_peer_id;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 info5;</div><div class='add'>+	__le32 info6;</div><div class='add'>+	__le16 frame_ctrl;</div><div class='add'>+	__le16 duration;</div><div class='add'>+	u8 addr1[ETH_ALEN];</div><div class='add'>+	u8 addr2[ETH_ALEN];</div><div class='add'>+	u8 addr3[ETH_ALEN];</div><div class='add'>+	__le16 seq_ctrl;</div><div class='add'>+	u8 addr4[ETH_ALEN];</div><div class='add'>+	__le16 qos_ctrl;</div><div class='add'>+	__le32 ht_ctrl;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> /* rx_mpdu_start</div><div class='ctx'>  *</div><div class='ctx'>  * rxpcu_mpdu_filter_in_category</div><div class='hunk'>@@ -804,6 +831,20 @@ struct rx_msdu_start_qcn9074 {</div><div class='ctx'> 	__le16 vlan_stag_c1;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct rx_msdu_start_wcn6855 {</div><div class='add'>+	__le16 info0;</div><div class='add'>+	__le16 phy_ppdu_id;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le32 toeplitz_hash;</div><div class='add'>+	__le32 flow_id_toeplitz;</div><div class='add'>+	__le32 info3;</div><div class='add'>+	__le32 ppdu_start_timestamp;</div><div class='add'>+	__le32 phy_meta_data;</div><div class='add'>+	__le16 vlan_ctag_ci;</div><div class='add'>+	__le16 vlan_stag_ci;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> /* rx_msdu_start</div><div class='ctx'>  *</div><div class='ctx'>  * rxpcu_mpdu_filter_in_category</div><div class='hunk'>@@ -837,7 +878,7 @@ struct rx_msdu_start_qcn9074 {</div><div class='ctx'>  *</div><div class='ctx'>  * l4_offset</div><div class='ctx'>  *		Depending upon mode bit, this field either indicates the</div><div class='del'>- *		L4 offset nin bytes from the start of RX_HEADER (only valid</div><div class='add'>+ *		L4 offset in bytes from the start of RX_HEADER (only valid</div><div class='ctx'>  *		if either ipv4_proto or ipv6_proto is set to 1) or indicates</div><div class='ctx'>  *		the offset in bytes to the start of TCP or UDP header from</div><div class='ctx'>  *		the start of the IP header after decapsulation (Only valid if</div><div class='hunk'>@@ -988,7 +1029,9 @@ struct rx_msdu_start_qcn9074 {</div><div class='ctx'> </div><div class='ctx'> #define RX_MSDU_END_INFO2_REPORTED_MPDU_LEN	GENMASK(13, 0)</div><div class='ctx'> #define RX_MSDU_END_INFO2_FIRST_MSDU		BIT(14)</div><div class='add'>+#define RX_MSDU_END_INFO2_FIRST_MSDU_WCN6855	BIT(28)</div><div class='ctx'> #define RX_MSDU_END_INFO2_LAST_MSDU		BIT(15)</div><div class='add'>+#define RX_MSDU_END_INFO2_LAST_MSDU_WCN6855	BIT(29)</div><div class='ctx'> #define RX_MSDU_END_INFO2_SA_IDX_TIMEOUT	BIT(16)</div><div class='ctx'> #define RX_MSDU_END_INFO2_DA_IDX_TIMEOUT	BIT(17)</div><div class='ctx'> #define RX_MSDU_END_INFO2_MSDU_LIMIT_ERR	BIT(18)</div><div class='hunk'>@@ -1037,6 +1080,31 @@ struct rx_msdu_end_ipq8074 {</div><div class='ctx'> 	__le16 sa_sw_peer_id;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct rx_msdu_end_wcn6855 {</div><div class='add'>+	__le16 info0;</div><div class='add'>+	__le16 phy_ppdu_id;</div><div class='add'>+	__le16 ip_hdr_cksum;</div><div class='add'>+	__le16 reported_mpdu_len;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 ext_wapi_pn[2];</div><div class='add'>+	__le32 info4;</div><div class='add'>+	__le32 ipv6_options_crc;</div><div class='add'>+	__le32 tcp_seq_num;</div><div class='add'>+	__le32 tcp_ack_num;</div><div class='add'>+	__le16 info3;</div><div class='add'>+	__le16 window_size;</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le16 sa_idx;</div><div class='add'>+	__le16 da_idx;</div><div class='add'>+	__le32 info5;</div><div class='add'>+	__le32 fse_metadata;</div><div class='add'>+	__le16 cce_metadata;</div><div class='add'>+	__le16 sa_sw_peer_id;</div><div class='add'>+	__le32 rule_indication[2];</div><div class='add'>+	__le32 info6;</div><div class='add'>+	__le32 info7;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> #define RX_MSDU_END_MPDU_LENGTH_INFO		GENMASK(13, 0)</div><div class='ctx'> </div><div class='ctx'> #define RX_MSDU_END_INFO2_DA_OFFSET		GENMASK(5, 0)</div><div class='hunk'>@@ -1378,7 +1446,7 @@ struct hal_rx_desc_ipq8074 {</div><div class='ctx'> 	__le32 hdr_status_tag;</div><div class='ctx'> 	__le32 phy_ppdu_id;</div><div class='ctx'> 	u8 hdr_status[HAL_RX_DESC_HDR_STATUS_LEN];</div><div class='del'>-	u8 msdu_payload[0];</div><div class='add'>+	u8 msdu_payload[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct hal_rx_desc_qcn9074 {</div><div class='hunk'>@@ -1397,13 +1465,33 @@ struct hal_rx_desc_qcn9074 {</div><div class='ctx'> 	__le32 hdr_status_tag;</div><div class='ctx'> 	__le32 phy_ppdu_id;</div><div class='ctx'> 	u8 hdr_status[HAL_RX_DESC_HDR_STATUS_LEN];</div><div class='del'>-	u8 msdu_payload[0];</div><div class='add'>+	u8 msdu_payload[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hal_rx_desc_wcn6855 {</div><div class='add'>+	__le32 msdu_end_tag;</div><div class='add'>+	struct rx_msdu_end_wcn6855 msdu_end;</div><div class='add'>+	__le32 rx_attn_tag;</div><div class='add'>+	struct rx_attention attention;</div><div class='add'>+	__le32 msdu_start_tag;</div><div class='add'>+	struct rx_msdu_start_wcn6855 msdu_start;</div><div class='add'>+	u8 rx_padding0[HAL_RX_DESC_PADDING0_BYTES];</div><div class='add'>+	__le32 mpdu_start_tag;</div><div class='add'>+	struct rx_mpdu_start_wcn6855 mpdu_start;</div><div class='add'>+	__le32 mpdu_end_tag;</div><div class='add'>+	struct rx_mpdu_end mpdu_end;</div><div class='add'>+	u8 rx_padding1[HAL_RX_DESC_PADDING1_BYTES];</div><div class='add'>+	__le32 hdr_status_tag;</div><div class='add'>+	__le32 phy_ppdu_id;</div><div class='add'>+	u8 hdr_status[HAL_RX_DESC_HDR_STATUS_LEN];</div><div class='add'>+	u8 msdu_payload[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct hal_rx_desc {</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct hal_rx_desc_ipq8074 ipq8074;</div><div class='ctx'> 		struct hal_rx_desc_qcn9074 qcn9074;</div><div class='add'>+		struct hal_rx_desc_wcn6855 wcn6855;</div><div class='ctx'> 	} u;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/spectral.c b/drivers/net/wireless/ath/ath11k/spectral.c<br/>index 1afe67759659..b6b0516819a6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/spectral.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/spectral.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/spectral.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/spectral.c</a></div><div class='hunk'>@@ -1,6 +1,8 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/relay.h&gt;</div><div class='hunk'>@@ -11,27 +13,26 @@</div><div class='ctx'> #define ATH11K_SPECTRAL_EVENT_TIMEOUT_MS	1</div><div class='ctx'> </div><div class='ctx'> #define ATH11K_SPECTRAL_DWORD_SIZE		4</div><div class='del'>-/* HW bug, expected BIN size is 2 bytes but HW report as 4 bytes */</div><div class='del'>-#define ATH11K_SPECTRAL_BIN_SIZE		4</div><div class='del'>-#define ATH11K_SPECTRAL_ATH11K_MIN_BINS		64</div><div class='del'>-#define ATH11K_SPECTRAL_ATH11K_MIN_IB_BINS	32</div><div class='del'>-#define ATH11K_SPECTRAL_ATH11K_MAX_IB_BINS	256</div><div class='add'>+#define ATH11K_SPECTRAL_MIN_BINS		32</div><div class='add'>+#define ATH11K_SPECTRAL_MIN_IB_BINS		(ATH11K_SPECTRAL_MIN_BINS &gt;&gt; 1)</div><div class='add'>+#define ATH11K_SPECTRAL_MAX_IB_BINS(x)	((x)-&gt;hw_params.spectral.max_fft_bins &gt;&gt; 1)</div><div class='ctx'> </div><div class='ctx'> #define ATH11K_SPECTRAL_SCAN_COUNT_MAX		4095</div><div class='ctx'> </div><div class='ctx'> /* Max channel computed by sum of 2g and 5g band channels */</div><div class='ctx'> #define ATH11K_SPECTRAL_TOTAL_CHANNEL		41</div><div class='ctx'> #define ATH11K_SPECTRAL_SAMPLES_PER_CHANNEL	70</div><div class='del'>-#define ATH11K_SPECTRAL_PER_SAMPLE_SIZE		(sizeof(struct fft_sample_ath11k) + \</div><div class='del'>-						 ATH11K_SPECTRAL_ATH11K_MAX_IB_BINS)</div><div class='add'>+#define ATH11K_SPECTRAL_PER_SAMPLE_SIZE(x)	(sizeof(struct fft_sample_ath11k) + \</div><div class='add'>+						 ATH11K_SPECTRAL_MAX_IB_BINS(x))</div><div class='ctx'> #define ATH11K_SPECTRAL_TOTAL_SAMPLE		(ATH11K_SPECTRAL_TOTAL_CHANNEL * \</div><div class='ctx'> 						 ATH11K_SPECTRAL_SAMPLES_PER_CHANNEL)</div><div class='del'>-#define ATH11K_SPECTRAL_SUB_BUFF_SIZE		ATH11K_SPECTRAL_PER_SAMPLE_SIZE</div><div class='add'>+#define ATH11K_SPECTRAL_SUB_BUFF_SIZE(x)	ATH11K_SPECTRAL_PER_SAMPLE_SIZE(x)</div><div class='ctx'> #define ATH11K_SPECTRAL_NUM_SUB_BUF		ATH11K_SPECTRAL_TOTAL_SAMPLE</div><div class='ctx'> </div><div class='ctx'> #define ATH11K_SPECTRAL_20MHZ			20</div><div class='ctx'> #define ATH11K_SPECTRAL_40MHZ			40</div><div class='ctx'> #define ATH11K_SPECTRAL_80MHZ			80</div><div class='add'>+#define ATH11K_SPECTRAL_160MHZ			160</div><div class='ctx'> </div><div class='ctx'> #define ATH11K_SPECTRAL_SIGNATURE		0xFA</div><div class='ctx'> </div><div class='hunk'>@@ -109,7 +110,7 @@ struct spectral_search_fft_report {</div><div class='ctx'> 	__le32 info1;</div><div class='ctx'> 	__le32 info2;</div><div class='ctx'> 	__le32 reserve0;</div><div class='del'>-	u8 bins[0];</div><div class='add'>+	u8 bins[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct ath11k_spectral_search_report {</div><div class='hunk'>@@ -185,6 +186,8 @@ static int ath11k_spectral_scan_trigger(struct ath11k *ar)</div><div class='ctx'> 	if (ar-&gt;spectral.mode == ATH11K_SPECTRAL_DISABLED)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	ar-&gt;spectral.is_primary = true;</div><div class='add'>+</div><div class='ctx'> 	ret = ath11k_wmi_vdev_spectral_enable(ar, arvif-&gt;vdev_id,</div><div class='ctx'> 					      ATH11K_WMI_SPECTRAL_TRIGGER_CMD_CLEAR,</div><div class='ctx'> 					      ATH11K_WMI_SPECTRAL_ENABLE_CMD_ENABLE);</div><div class='hunk'>@@ -203,7 +206,7 @@ static int ath11k_spectral_scan_trigger(struct ath11k *ar)</div><div class='ctx'> static int ath11k_spectral_scan_config(struct ath11k *ar,</div><div class='ctx'> 				       enum ath11k_spectral_mode mode)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_wmi_vdev_spectral_conf_param param = { 0 };</div><div class='add'>+	struct ath11k_wmi_vdev_spectral_conf_param param = {};</div><div class='ctx'> 	struct ath11k_vif *arvif;</div><div class='ctx'> 	int ret, count;</div><div class='ctx'> </div><div class='hunk'>@@ -214,7 +217,10 @@ static int ath11k_spectral_scan_config(struct ath11k *ar,</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	arvif-&gt;spectral_enabled = (mode != ATH11K_SPECTRAL_DISABLED);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;spectral.lock);</div><div class='ctx'> 	ar-&gt;spectral.mode = mode;</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;spectral.lock);</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_wmi_vdev_spectral_enable(ar, arvif-&gt;vdev_id,</div><div class='ctx'> 					      ATH11K_WMI_SPECTRAL_TRIGGER_CMD_CLEAR,</div><div class='hunk'>@@ -378,16 +384,11 @@ static ssize_t ath11k_write_file_spectral_count(struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = file-&gt;private_data;</div><div class='ctx'> 	unsigned long val;</div><div class='del'>-	char buf[32];</div><div class='del'>-	ssize_t len;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	len = min(count, sizeof(buf) - 1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, len))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	buf[len] = '\0';</div><div class='del'>-	if (kstrtoul(buf, 0, &amp;val))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ret = kstrtoul_from_user(user_buf, count, 0, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (val &gt; ATH11K_SPECTRAL_SCAN_COUNT_MAX)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -433,19 +434,14 @@ static ssize_t ath11k_write_file_spectral_bins(struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = file-&gt;private_data;</div><div class='ctx'> 	unsigned long val;</div><div class='del'>-	char buf[32];</div><div class='del'>-	ssize_t len;</div><div class='del'>-</div><div class='del'>-	len = min(count, sizeof(buf) - 1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, len))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	buf[len] = '\0';</div><div class='del'>-	if (kstrtoul(buf, 0, &amp;val))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ret = kstrtoul_from_user(user_buf, count, 0, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (val &lt; ATH11K_SPECTRAL_ATH11K_MIN_BINS ||</div><div class='del'>-	    val &gt; SPECTRAL_ATH11K_MAX_NUM_BINS)</div><div class='add'>+	if (val &lt; ATH11K_SPECTRAL_MIN_BINS ||</div><div class='add'>+	    val &gt; ar-&gt;ab-&gt;hw_params.spectral.max_fft_bins)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!is_power_of_2(val))</div><div class='hunk'>@@ -581,22 +577,24 @@ int ath11k_spectral_process_fft(struct ath11k *ar,</div><div class='ctx'> 	struct spectral_tlv *tlv;</div><div class='ctx'> 	int tlv_len, bin_len, num_bins;</div><div class='ctx'> 	u16 length, freq;</div><div class='del'>-	u8 chan_width_mhz;</div><div class='add'>+	u8 chan_width_mhz, bin_sz;</div><div class='ctx'> 	int ret;</div><div class='add'>+	u32 check_length;</div><div class='add'>+	bool fragment_sample = false;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ar-&gt;spectral.lock);</div><div class='ctx'> </div><div class='del'>-	if (!ab-&gt;hw_params.spectral_fft_sz) {</div><div class='add'>+	if (!ab-&gt;hw_params.spectral.fft_sz) {</div><div class='ctx'> 		ath11k_warn(ab, "invalid bin size type for hw rev %d\n",</div><div class='ctx'> 			    ab-&gt;hw_rev);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tlv = (struct spectral_tlv *)data;</div><div class='add'>+	tlv = data;</div><div class='ctx'> 	tlv_len = FIELD_GET(SPECTRAL_TLV_HDR_LEN, __le32_to_cpu(tlv-&gt;header));</div><div class='ctx'> 	/* convert Dword into bytes */</div><div class='ctx'> 	tlv_len *= ATH11K_SPECTRAL_DWORD_SIZE;</div><div class='del'>-	bin_len = tlv_len - (sizeof(*fft_report) - sizeof(*tlv));</div><div class='add'>+	bin_len = tlv_len - ab-&gt;hw_params.spectral.fft_hdr_len;</div><div class='ctx'> </div><div class='ctx'> 	if (data_len &lt; (bin_len + sizeof(*fft_report))) {</div><div class='ctx'> 		ath11k_warn(ab, "mismatch in expected bin len %d and data len %d\n",</div><div class='hunk'>@@ -604,17 +602,25 @@ int ath11k_spectral_process_fft(struct ath11k *ar,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	num_bins = bin_len / ATH11K_SPECTRAL_BIN_SIZE;</div><div class='add'>+	bin_sz = ab-&gt;hw_params.spectral.fft_sz + ab-&gt;hw_params.spectral.fft_pad_sz;</div><div class='add'>+	num_bins = bin_len / bin_sz;</div><div class='ctx'> 	/* Only In-band bins are useful to user for visualize */</div><div class='ctx'> 	num_bins &gt;&gt;= 1;</div><div class='ctx'> </div><div class='del'>-	if (num_bins &lt; ATH11K_SPECTRAL_ATH11K_MIN_IB_BINS ||</div><div class='del'>-	    num_bins &gt; ATH11K_SPECTRAL_ATH11K_MAX_IB_BINS ||</div><div class='add'>+	if (num_bins &lt; ATH11K_SPECTRAL_MIN_IB_BINS ||</div><div class='add'>+	    num_bins &gt; ATH11K_SPECTRAL_MAX_IB_BINS(ab) ||</div><div class='ctx'> 	    !is_power_of_2(num_bins)) {</div><div class='ctx'> 		ath11k_warn(ab, "Invalid num of bins %d\n", num_bins);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	check_length = sizeof(*fft_report) + (num_bins * ab-&gt;hw_params.spectral.fft_sz);</div><div class='add'>+	ret = ath11k_dbring_validate_buffer(ar, data, check_length);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "found magic value in fft data, dropping\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = ath11k_spectral_pull_search(ar, data, &amp;search);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ab, "failed to pull search report %d\n", ret);</div><div class='hunk'>@@ -629,6 +635,13 @@ int ath11k_spectral_process_fft(struct ath11k *ar,</div><div class='ctx'> 	case ATH11K_SPECTRAL_80MHZ:</div><div class='ctx'> 		fft_sample-&gt;chan_width_mhz = chan_width_mhz;</div><div class='ctx'> 		break;</div><div class='add'>+	case ATH11K_SPECTRAL_160MHZ:</div><div class='add'>+		if (ab-&gt;hw_params.spectral.fragment_160mhz) {</div><div class='add'>+			chan_width_mhz /= 2;</div><div class='add'>+			fragment_sample = true;</div><div class='add'>+		}</div><div class='add'>+		fft_sample-&gt;chan_width_mhz = chan_width_mhz;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ath11k_warn(ab, "invalid channel width %d\n", chan_width_mhz);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -653,8 +666,19 @@ int ath11k_spectral_process_fft(struct ath11k *ar,</div><div class='ctx'> 	freq = summary-&gt;meta.freq2;</div><div class='ctx'> 	fft_sample-&gt;freq2 = __cpu_to_be16(freq);</div><div class='ctx'> </div><div class='add'>+	/* If freq2 is available then the spectral scan results are fragmented</div><div class='add'>+	 * as primary and secondary</div><div class='add'>+	 */</div><div class='add'>+	if (fragment_sample &amp;&amp; freq) {</div><div class='add'>+		if (!ar-&gt;spectral.is_primary)</div><div class='add'>+			fft_sample-&gt;freq1 = cpu_to_be16(freq);</div><div class='add'>+</div><div class='add'>+		/* We have to toggle the is_primary to handle the next report */</div><div class='add'>+		ar-&gt;spectral.is_primary = !ar-&gt;spectral.is_primary;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ath11k_spectral_parse_fft(fft_sample-&gt;data, fft_report-&gt;bins, num_bins,</div><div class='del'>-				  ab-&gt;hw_params.spectral_fft_sz);</div><div class='add'>+				  ab-&gt;hw_params.spectral.fft_sz);</div><div class='ctx'> </div><div class='ctx'> 	fft_sample-&gt;max_exp = ath11k_spectral_get_max_exp(fft_sample-&gt;max_index,</div><div class='ctx'> 							  search.peak_mag,</div><div class='hunk'>@@ -690,7 +714,7 @@ static int ath11k_spectral_process_data(struct ath11k *ar,</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sample_sz = sizeof(*fft_sample) + ATH11K_SPECTRAL_ATH11K_MAX_IB_BINS;</div><div class='add'>+	sample_sz = sizeof(*fft_sample) + ATH11K_SPECTRAL_MAX_IB_BINS(ab);</div><div class='ctx'> 	fft_sample = kmalloc(sample_sz, GFP_ATOMIC);</div><div class='ctx'> 	if (!fft_sample) {</div><div class='ctx'> 		ret = -ENOBUFS;</div><div class='hunk'>@@ -738,7 +762,8 @@ static int ath11k_spectral_process_data(struct ath11k *ar,</div><div class='ctx'> 			 * is 4 DWORD size (16 bytes).</div><div class='ctx'> 			 * Need to remove this workaround once HW bug fixed</div><div class='ctx'> 			 */</div><div class='del'>-			tlv_len = sizeof(*summary) - sizeof(*tlv);</div><div class='add'>+			tlv_len = sizeof(*summary) - sizeof(*tlv) +</div><div class='add'>+				  ab-&gt;hw_params.spectral.summary_pad_sz;</div><div class='ctx'> </div><div class='ctx'> 			if (tlv_len &lt; (sizeof(*summary) - sizeof(*tlv))) {</div><div class='ctx'> 				ath11k_warn(ab, "failed to parse spectral summary at bytes %d tlv_len:%d\n",</div><div class='hunk'>@@ -747,6 +772,12 @@ static int ath11k_spectral_process_data(struct ath11k *ar,</div><div class='ctx'> 				goto err;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='add'>+			ret = ath11k_dbring_validate_buffer(ar, data, tlv_len);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath11k_warn(ar-&gt;ab, "found magic value in spectral summary, dropping\n");</div><div class='add'>+				goto err;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			summary = (struct spectral_summary_fft_report *)tlv;</div><div class='ctx'> 			ath11k_spectral_pull_summary(ar, &amp;param-&gt;meta,</div><div class='ctx'> 						     summary, &amp;summ_rpt);</div><div class='hunk'>@@ -829,9 +860,6 @@ static inline void ath11k_spectral_ring_free(struct ath11k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_spectral *sp = &amp;ar-&gt;spectral;</div><div class='ctx'> </div><div class='del'>-	if (!sp-&gt;enabled)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	ath11k_dbring_srng_cleanup(ar, &amp;sp-&gt;rx_ring);</div><div class='ctx'> 	ath11k_dbring_buf_cleanup(ar, &amp;sp-&gt;rx_ring);</div><div class='ctx'> }</div><div class='hunk'>@@ -883,15 +911,16 @@ void ath11k_spectral_deinit(struct ath11k_base *ab)</div><div class='ctx'> 		if (!sp-&gt;enabled)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		ath11k_spectral_debug_unregister(ar);</div><div class='del'>-		ath11k_spectral_ring_free(ar);</div><div class='add'>+		mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+		ath11k_spectral_scan_config(ar, ATH11K_SPECTRAL_DISABLED);</div><div class='add'>+		mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;sp-&gt;lock);</div><div class='del'>-</div><div class='del'>-		sp-&gt;mode = ATH11K_SPECTRAL_DISABLED;</div><div class='ctx'> 		sp-&gt;enabled = false;</div><div class='del'>-</div><div class='ctx'> 		spin_unlock_bh(&amp;sp-&gt;lock);</div><div class='add'>+</div><div class='add'>+		ath11k_spectral_debug_unregister(ar);</div><div class='add'>+		ath11k_spectral_ring_free(ar);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -901,7 +930,7 @@ static inline int ath11k_spectral_debug_register(struct ath11k *ar)</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;spectral.rfs_scan = relay_open("spectral_scan",</div><div class='ctx'> 					   ar-&gt;debug.debugfs_pdev,</div><div class='del'>-					   ATH11K_SPECTRAL_SUB_BUFF_SIZE,</div><div class='add'>+					   ATH11K_SPECTRAL_SUB_BUFF_SIZE(ar-&gt;ab),</div><div class='ctx'> 					   ATH11K_SPECTRAL_NUM_SUB_BUF,</div><div class='ctx'> 					   &amp;rfs_scan_cb, NULL);</div><div class='ctx'> 	if (!ar-&gt;spectral.rfs_scan) {</div><div class='hunk'>@@ -962,7 +991,7 @@ int ath11k_spectral_init(struct ath11k_base *ab)</div><div class='ctx'> 		      ab-&gt;wmi_ab.svc_map))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!ab-&gt;hw_params.spectral_fft_sz)</div><div class='add'>+	if (!ab-&gt;hw_params.spectral.fft_sz)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/spectral.h b/drivers/net/wireless/ath/ath11k/spectral.h<br/>index 081744265f2a..789cff7c64a7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/spectral.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/spectral.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/spectral.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/spectral.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef ATH11K_SPECTRAL_H</div><div class='hunk'>@@ -35,6 +36,7 @@ struct ath11k_spectral {</div><div class='ctx'> 	u16 count;</div><div class='ctx'> 	u8 fft_size;</div><div class='ctx'> 	bool enabled;</div><div class='add'>+	bool is_primary;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ATH11K_SPECTRAL</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/testmode.c b/drivers/net/wireless/ath/ath11k/testmode.c<br/>index 4bf1931adbaa..a9751ea2a0b7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/testmode.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/testmode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/testmode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/testmode.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2023-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "testmode.h"</div><div class='hunk'>@@ -9,69 +10,176 @@</div><div class='ctx'> #include "wmi.h"</div><div class='ctx'> #include "hw.h"</div><div class='ctx'> #include "core.h"</div><div class='del'>-#include "testmode_i.h"</div><div class='del'>-</div><div class='del'>-static const struct nla_policy ath11k_tm_policy[ATH11K_TM_ATTR_MAX + 1] = {</div><div class='del'>-	[ATH11K_TM_ATTR_CMD]		= { .type = NLA_U32 },</div><div class='del'>-	[ATH11K_TM_ATTR_DATA]		= { .type = NLA_BINARY,</div><div class='del'>-					    .len = ATH11K_TM_DATA_MAX_LEN },</div><div class='del'>-	[ATH11K_TM_ATTR_WMI_CMDID]	= { .type = NLA_U32 },</div><div class='del'>-	[ATH11K_TM_ATTR_VERSION_MAJOR]	= { .type = NLA_U32 },</div><div class='del'>-	[ATH11K_TM_ATTR_VERSION_MINOR]	= { .type = NLA_U32 },</div><div class='add'>+#include "../testmode_i.h"</div><div class='add'>+</div><div class='add'>+#define ATH11K_FTM_SEGHDR_CURRENT_SEQ		GENMASK(3, 0)</div><div class='add'>+#define ATH11K_FTM_SEGHDR_TOTAL_SEGMENTS	GENMASK(7, 4)</div><div class='add'>+</div><div class='add'>+static const struct nla_policy ath11k_tm_policy[ATH_TM_ATTR_MAX + 1] = {</div><div class='add'>+	[ATH_TM_ATTR_CMD]		= { .type = NLA_U32 },</div><div class='add'>+	[ATH_TM_ATTR_DATA]		= { .type = NLA_BINARY,</div><div class='add'>+					    .len = ATH_TM_DATA_MAX_LEN },</div><div class='add'>+	[ATH_TM_ATTR_WMI_CMDID]		= { .type = NLA_U32 },</div><div class='add'>+	[ATH_TM_ATTR_VERSION_MAJOR]	= { .type = NLA_U32 },</div><div class='add'>+	[ATH_TM_ATTR_VERSION_MINOR]	= { .type = NLA_U32 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Returns true if callee consumes the skb and the skb should be discarded.</div><div class='del'>- * Returns false if skb is not used. Does not sleep.</div><div class='add'>+static struct ath11k *ath11k_tm_get_ar(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_pdev *pdev;</div><div class='add'>+	struct ath11k *ar = NULL;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		pdev = &amp;ab-&gt;pdevs[i];</div><div class='add'>+		ar = pdev-&gt;ar;</div><div class='add'>+</div><div class='add'>+		if (ar &amp;&amp; ar-&gt;state == ATH11K_STATE_FTM)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ar;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function handles unsegmented events. Data in various events are aggregated</div><div class='add'>+ * in application layer, this event is unsegmented from host perspective.</div><div class='ctx'>  */</div><div class='del'>-bool ath11k_tm_event_wmi(struct ath11k *ar, u32 cmd_id, struct sk_buff *skb)</div><div class='add'>+static void ath11k_tm_wmi_event_unsegmented(struct ath11k_base *ab, u32 cmd_id,</div><div class='add'>+					    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *nl_skb;</div><div class='del'>-	bool consumed;</div><div class='del'>-	int ret;</div><div class='add'>+	struct ath11k *ar;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_TESTMODE,</div><div class='del'>-		   "testmode event wmi cmd_id %d skb %pK skb-&gt;len %d\n",</div><div class='del'>-		   cmd_id, skb, skb-&gt;len);</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_TESTMODE,</div><div class='add'>+		   "event wmi cmd_id %d skb length %d\n",</div><div class='add'>+		   cmd_id, skb-&gt;len);</div><div class='add'>+	ath11k_dbg_dump(ab, ATH11K_DBG_TESTMODE, NULL, "", skb-&gt;data, skb-&gt;len);</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg_dump(ar-&gt;ab, ATH11K_DBG_TESTMODE, NULL, "", skb-&gt;data, skb-&gt;len);</div><div class='add'>+	ar = ath11k_tm_get_ar(ab);</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath11k_warn(ab, "testmode event not handled due to invalid pdev\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> </div><div class='del'>-	consumed = true;</div><div class='del'>-</div><div class='ctx'> 	nl_skb = cfg80211_testmode_alloc_event_skb(ar-&gt;hw-&gt;wiphy,</div><div class='del'>-						   2 * sizeof(u32) + skb-&gt;len,</div><div class='add'>+						   2 * nla_total_size(sizeof(u32)) +</div><div class='add'>+						   nla_total_size(skb-&gt;len),</div><div class='ctx'> 						   GFP_ATOMIC);</div><div class='ctx'> 	if (!nl_skb) {</div><div class='del'>-		ath11k_warn(ar-&gt;ab,</div><div class='del'>-			    "failed to allocate skb for testmode wmi event\n");</div><div class='add'>+		ath11k_warn(ab,</div><div class='add'>+			    "failed to allocate skb for unsegmented testmode wmi event\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = nla_put_u32(nl_skb, ATH11K_TM_ATTR_CMD, ATH11K_TM_CMD_WMI);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ath11k_warn(ar-&gt;ab,</div><div class='del'>-			    "failed to put testmode wmi event cmd attribute: %d\n",</div><div class='del'>-			    ret);</div><div class='add'>+	if (nla_put_u32(nl_skb, ATH_TM_ATTR_CMD, ATH_TM_CMD_WMI) ||</div><div class='add'>+	    nla_put_u32(nl_skb, ATH_TM_ATTR_WMI_CMDID, cmd_id) ||</div><div class='add'>+	    nla_put(nl_skb, ATH_TM_ATTR_DATA, skb-&gt;len, skb-&gt;data)) {</div><div class='add'>+		ath11k_warn(ab, "failed to populate testmode unsegmented event\n");</div><div class='ctx'> 		kfree_skb(nl_skb);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = nla_put_u32(nl_skb, ATH11K_TM_ATTR_WMI_CMDID, cmd_id);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ath11k_warn(ar-&gt;ab,</div><div class='del'>-			    "failed to put testmode wmi even cmd_id: %d\n",</div><div class='del'>-			    ret);</div><div class='del'>-		kfree_skb(nl_skb);</div><div class='add'>+	cfg80211_testmode_event(nl_skb, GFP_ATOMIC);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	ath11k_warn(ab, "Failed to send testmode event to higher layers\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function handles segmented events. Data of various events received</div><div class='add'>+ * from firmware is aggregated and sent to application layer</div><div class='add'>+ */</div><div class='add'>+static int ath11k_tm_process_event(struct ath11k_base *ab, u32 cmd_id,</div><div class='add'>+				   const struct wmi_ftm_event_msg *ftm_msg,</div><div class='add'>+				   u16 length)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *nl_skb;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct ath11k *ar;</div><div class='add'>+	u8 const *buf_pos;</div><div class='add'>+	u16 datalen;</div><div class='add'>+	u8 total_segments, current_seq;</div><div class='add'>+	u32 data_pos;</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_TESTMODE,</div><div class='add'>+		   "event wmi cmd_id %d ftm event msg %p datalen %d\n",</div><div class='add'>+		   cmd_id, ftm_msg, length);</div><div class='add'>+	ath11k_dbg_dump(ab, ATH11K_DBG_TESTMODE, NULL, "", ftm_msg, length);</div><div class='add'>+	pdev_id = DP_HW2SW_MACID(ftm_msg-&gt;seg_hdr.pdev_id);</div><div class='add'>+</div><div class='add'>+	if (pdev_id &gt;= ab-&gt;num_radios) {</div><div class='add'>+		ath11k_warn(ab, "testmode event not handled due to invalid pdev id: %d\n",</div><div class='add'>+			    pdev_id);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar = ab-&gt;pdevs[pdev_id].ar;</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath11k_warn(ab, "testmode event not handled due to absence of pdev\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	current_seq = FIELD_GET(ATH11K_FTM_SEGHDR_CURRENT_SEQ,</div><div class='add'>+				ftm_msg-&gt;seg_hdr.segmentinfo);</div><div class='add'>+	total_segments = FIELD_GET(ATH11K_FTM_SEGHDR_TOTAL_SEGMENTS,</div><div class='add'>+				   ftm_msg-&gt;seg_hdr.segmentinfo);</div><div class='add'>+	datalen = length - (sizeof(struct wmi_ftm_seg_hdr));</div><div class='add'>+	buf_pos = ftm_msg-&gt;data;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	if (current_seq == 0) {</div><div class='add'>+		ab-&gt;testmode.expected_seq = 0;</div><div class='add'>+		ab-&gt;testmode.data_pos = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data_pos = ab-&gt;testmode.data_pos;</div><div class='add'>+</div><div class='add'>+	if ((data_pos + datalen) &gt; ATH_FTM_EVENT_MAX_BUF_LENGTH) {</div><div class='add'>+		ath11k_warn(ab, "Invalid ftm event length at %d: %d\n",</div><div class='add'>+			    data_pos, datalen);</div><div class='add'>+		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = nla_put(nl_skb, ATH11K_TM_ATTR_DATA, skb-&gt;len, skb-&gt;data);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ath11k_warn(ar-&gt;ab,</div><div class='del'>-			    "failed to copy skb to testmode wmi event: %d\n",</div><div class='del'>-			    ret);</div><div class='add'>+	memcpy(&amp;ab-&gt;testmode.eventdata[data_pos], buf_pos, datalen);</div><div class='add'>+	data_pos += datalen;</div><div class='add'>+</div><div class='add'>+	if (++ab-&gt;testmode.expected_seq != total_segments) {</div><div class='add'>+		ab-&gt;testmode.data_pos = data_pos;</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_TESTMODE,</div><div class='add'>+			   "partial data received current_seq %d total_seg %d\n",</div><div class='add'>+			    current_seq, total_segments);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_TESTMODE,</div><div class='add'>+		   "total data length pos %d len %d\n",</div><div class='add'>+		    data_pos, ftm_msg-&gt;seg_hdr.len);</div><div class='add'>+	nl_skb = cfg80211_testmode_alloc_event_skb(ar-&gt;hw-&gt;wiphy,</div><div class='add'>+						   2 * nla_total_size(sizeof(u32)) +</div><div class='add'>+						   nla_total_size(data_pos),</div><div class='add'>+						   GFP_ATOMIC);</div><div class='add'>+	if (!nl_skb) {</div><div class='add'>+		ath11k_warn(ab,</div><div class='add'>+			    "failed to allocate skb for segmented testmode wmi event\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(nl_skb, ATH_TM_ATTR_CMD,</div><div class='add'>+			ATH_TM_CMD_WMI_FTM) ||</div><div class='add'>+	    nla_put_u32(nl_skb, ATH_TM_ATTR_WMI_CMDID, cmd_id) ||</div><div class='add'>+	    nla_put(nl_skb, ATH_TM_ATTR_DATA, data_pos,</div><div class='add'>+		    &amp;ab-&gt;testmode.eventdata[0])) {</div><div class='add'>+		ath11k_warn(ab, "failed to populate segmented testmode event");</div><div class='ctx'> 		kfree_skb(nl_skb);</div><div class='add'>+		ret = -ENOBUFS;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -79,8 +187,45 @@ bool ath11k_tm_event_wmi(struct ath11k *ar, u32 cmd_id, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_tm_wmi_event_segmented(struct ath11k_base *ab, u32 cmd_id,</div><div class='add'>+					  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_ftm_event_msg *ev;</div><div class='add'>+	u16 length;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	return consumed;</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath11k_warn(ab, "failed to parse ftm event tlv: %d\n", ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_ARRAY_BYTE];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath11k_warn(ab, "failed to fetch ftm msg\n");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	length = skb-&gt;len - TLV_HDR_SIZE;</div><div class='add'>+	ret = ath11k_tm_process_event(ab, cmd_id, ev, length);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath11k_warn(ab, "Failed to process ftm event\n");</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_tm_wmi_event(struct ath11k_base *ab, u32 cmd_id, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (test_bit(ATH11K_FLAG_FTM_SEGMENTED, &amp;ab-&gt;dev_flags))</div><div class='add'>+		ath11k_tm_wmi_event_segmented(ab, cmd_id, skb);</div><div class='add'>+	else</div><div class='add'>+		ath11k_tm_wmi_event_unsegmented(ab, cmd_id, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath11k_tm_cmd_get_version(struct ath11k *ar, struct nlattr *tb[])</div><div class='hunk'>@@ -89,24 +234,24 @@ static int ath11k_tm_cmd_get_version(struct ath11k *ar, struct nlattr *tb[])</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_TESTMODE,</div><div class='del'>-		   "testmode cmd get version_major %d version_minor %d\n",</div><div class='del'>-		   ATH11K_TESTMODE_VERSION_MAJOR,</div><div class='del'>-		   ATH11K_TESTMODE_VERSION_MINOR);</div><div class='add'>+		   "cmd get version_major %d version_minor %d\n",</div><div class='add'>+		   ATH_TESTMODE_VERSION_MAJOR,</div><div class='add'>+		   ATH_TESTMODE_VERSION_MINOR);</div><div class='ctx'> </div><div class='ctx'> 	skb = cfg80211_testmode_alloc_reply_skb(ar-&gt;hw-&gt;wiphy,</div><div class='ctx'> 						nla_total_size(sizeof(u32)));</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ret = nla_put_u32(skb, ATH11K_TM_ATTR_VERSION_MAJOR,</div><div class='del'>-			  ATH11K_TESTMODE_VERSION_MAJOR);</div><div class='add'>+	ret = nla_put_u32(skb, ATH_TM_ATTR_VERSION_MAJOR,</div><div class='add'>+			  ATH_TESTMODE_VERSION_MAJOR);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = nla_put_u32(skb, ATH11K_TM_ATTR_VERSION_MINOR,</div><div class='del'>-			  ATH11K_TESTMODE_VERSION_MINOR);</div><div class='add'>+	ret = nla_put_u32(skb, ATH_TM_ATTR_VERSION_MINOR,</div><div class='add'>+			  ATH_TESTMODE_VERSION_MINOR);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -115,38 +260,107 @@ static int ath11k_tm_cmd_get_version(struct ath11k *ar, struct nlattr *tb[])</div><div class='ctx'> 	return cfg80211_testmode_reply(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_tm_cmd_wmi(struct ath11k *ar, struct nlattr *tb[])</div><div class='add'>+static int ath11k_tm_cmd_testmode_start(struct ath11k *ar, struct nlattr *tb[])</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;state == ATH11K_STATE_FTM) {</div><div class='add'>+		ret = -EALREADY;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* start utf only when the driver is not in use  */</div><div class='add'>+	if (ar-&gt;state != ATH11K_STATE_OFF) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;ab-&gt;testmode.eventdata = kzalloc(ATH_FTM_EVENT_MAX_BUF_LENGTH,</div><div class='add'>+					     GFP_KERNEL);</div><div class='add'>+	if (!ar-&gt;ab-&gt;testmode.eventdata) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;state = ATH11K_STATE_FTM;</div><div class='add'>+	ar-&gt;ftm_msgref = 0;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_TESTMODE, "cmd start\n");</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_tm_cmd_wmi(struct ath11k *ar, struct nlattr *tb[],</div><div class='add'>+			     struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_pdev_wmi *wmi = ar-&gt;wmi;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	struct ath11k_vif *arvif;</div><div class='ctx'> 	u32 cmd_id, buf_len;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret, tag;</div><div class='ctx'> 	void *buf;</div><div class='add'>+	u32 *ptr;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;state != ATH11K_STATE_ON) {</div><div class='del'>-		ret = -ENETDOWN;</div><div class='add'>+	if (!tb[ATH_TM_ATTR_DATA]) {</div><div class='add'>+		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!tb[ATH11K_TM_ATTR_DATA]) {</div><div class='add'>+	if (!tb[ATH_TM_ATTR_WMI_CMDID]) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!tb[ATH11K_TM_ATTR_WMI_CMDID]) {</div><div class='add'>+	buf = nla_data(tb[ATH_TM_ATTR_DATA]);</div><div class='add'>+	buf_len = nla_len(tb[ATH_TM_ATTR_DATA]);</div><div class='add'>+	if (!buf_len) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "No data present in testmode wmi command\n");</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	buf = nla_data(tb[ATH11K_TM_ATTR_DATA]);</div><div class='del'>-	buf_len = nla_len(tb[ATH11K_TM_ATTR_DATA]);</div><div class='del'>-	cmd_id = nla_get_u32(tb[ATH11K_TM_ATTR_WMI_CMDID]);</div><div class='add'>+	cmd_id = nla_get_u32(tb[ATH_TM_ATTR_WMI_CMDID]);</div><div class='add'>+</div><div class='add'>+	/* Make sure that the buffer length is long enough to</div><div class='add'>+	 * hold TLV and pdev/vdev id.</div><div class='add'>+	 */</div><div class='add'>+	if (buf_len &lt; sizeof(struct wmi_tlv) + sizeof(u32)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptr = buf;</div><div class='add'>+	tag = FIELD_GET(WMI_TLV_TAG, *ptr);</div><div class='add'>+</div><div class='add'>+	/* pdev/vdev id start after TLV header */</div><div class='add'>+	ptr++;</div><div class='add'>+</div><div class='add'>+	if (tag == WMI_TAG_PDEV_SET_PARAM_CMD)</div><div class='add'>+		*ptr = ar-&gt;pdev-&gt;pdev_id;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;ab-&gt;fw_mode != ATH11K_FIRMWARE_MODE_FTM &amp;&amp;</div><div class='add'>+	    (tag == WMI_TAG_VDEV_SET_PARAM_CMD || tag == WMI_TAG_UNIT_TEST_CMD)) {</div><div class='add'>+		if (vif) {</div><div class='add'>+			arvif = ath11k_vif_to_arvif(vif);</div><div class='add'>+			*ptr = arvif-&gt;vdev_id;</div><div class='add'>+		} else {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_TESTMODE,</div><div class='del'>-		   "testmode cmd wmi cmd_id %d buf %pK buf_len %d\n",</div><div class='del'>-		   cmd_id, buf, buf_len);</div><div class='add'>+		   "cmd wmi cmd_id %d buf length %d\n",</div><div class='add'>+		   cmd_id, buf_len);</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg_dump(ar-&gt;ab, ATH11K_DBG_TESTMODE, NULL, "", buf, buf_len);</div><div class='ctx'> </div><div class='hunk'>@@ -173,26 +387,115 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ath11k_tm_cmd_wmi_ftm(struct ath11k *ar, struct nlattr *tb[])</div><div class='add'>+{</div><div class='add'>+	struct ath11k_pdev_wmi *wmi = ar-&gt;wmi;</div><div class='add'>+	struct ath11k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u32 cmd_id, buf_len, hdr_info;</div><div class='add'>+	int ret;</div><div class='add'>+	void *buf;</div><div class='add'>+	u8 segnumber = 0, seginfo;</div><div class='add'>+	u16 chunk_len, total_bytes, num_segments;</div><div class='add'>+	u8 *bufpos;</div><div class='add'>+	struct wmi_ftm_cmd *ftm_cmd;</div><div class='add'>+</div><div class='add'>+	set_bit(ATH11K_FLAG_FTM_SEGMENTED, &amp;ab-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;state != ATH11K_STATE_FTM) {</div><div class='add'>+		ret = -ENETDOWN;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!tb[ATH_TM_ATTR_DATA]) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buf = nla_data(tb[ATH_TM_ATTR_DATA]);</div><div class='add'>+	buf_len = nla_len(tb[ATH_TM_ATTR_DATA]);</div><div class='add'>+	cmd_id = WMI_PDEV_UTF_CMDID;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_TESTMODE,</div><div class='add'>+		   "cmd wmi ftm cmd_id %d buffer length %d\n",</div><div class='add'>+		   cmd_id, buf_len);</div><div class='add'>+	ath11k_dbg_dump(ar-&gt;ab, ATH11K_DBG_TESTMODE, NULL, "", buf, buf_len);</div><div class='add'>+</div><div class='add'>+	bufpos = buf;</div><div class='add'>+	total_bytes = buf_len;</div><div class='add'>+	num_segments = total_bytes / MAX_WMI_UTF_LEN;</div><div class='add'>+</div><div class='add'>+	if (buf_len - (num_segments * MAX_WMI_UTF_LEN))</div><div class='add'>+		num_segments++;</div><div class='add'>+</div><div class='add'>+	while (buf_len) {</div><div class='add'>+		chunk_len = min_t(u16, buf_len, MAX_WMI_UTF_LEN);</div><div class='add'>+</div><div class='add'>+		skb = ath11k_wmi_alloc_skb(wmi-&gt;wmi_ab, (chunk_len +</div><div class='add'>+					   sizeof(struct wmi_ftm_cmd)));</div><div class='add'>+		if (!skb) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ftm_cmd = (struct wmi_ftm_cmd *)skb-&gt;data;</div><div class='add'>+		hdr_info = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) |</div><div class='add'>+			   FIELD_PREP(WMI_TLV_LEN, (chunk_len +</div><div class='add'>+				      sizeof(struct wmi_ftm_seg_hdr)));</div><div class='add'>+		ftm_cmd-&gt;tlv_header = hdr_info;</div><div class='add'>+		ftm_cmd-&gt;seg_hdr.len = total_bytes;</div><div class='add'>+		ftm_cmd-&gt;seg_hdr.msgref = ar-&gt;ftm_msgref;</div><div class='add'>+		seginfo = FIELD_PREP(ATH11K_FTM_SEGHDR_TOTAL_SEGMENTS, num_segments) |</div><div class='add'>+			  FIELD_PREP(ATH11K_FTM_SEGHDR_CURRENT_SEQ, segnumber);</div><div class='add'>+		ftm_cmd-&gt;seg_hdr.segmentinfo = seginfo;</div><div class='add'>+		segnumber++;</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;ftm_cmd-&gt;data, bufpos, chunk_len);</div><div class='add'>+</div><div class='add'>+		ret = ath11k_wmi_cmd_send(wmi, skb, cmd_id);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to send wmi ftm command: %d\n", ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buf_len -= chunk_len;</div><div class='add'>+		bufpos += chunk_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;ftm_msgref++;</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int ath11k_tm_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 		  void *data, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar = hw-&gt;priv;</div><div class='del'>-	struct nlattr *tb[ATH11K_TM_ATTR_MAX + 1];</div><div class='add'>+	struct nlattr *tb[ATH_TM_ATTR_MAX + 1];</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = nla_parse(tb, ATH11K_TM_ATTR_MAX, data, len, ath11k_tm_policy,</div><div class='add'>+	ret = nla_parse(tb, ATH_TM_ATTR_MAX, data, len, ath11k_tm_policy,</div><div class='ctx'> 			NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (!tb[ATH11K_TM_ATTR_CMD])</div><div class='add'>+	if (!tb[ATH_TM_ATTR_CMD])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	switch (nla_get_u32(tb[ATH11K_TM_ATTR_CMD])) {</div><div class='del'>-	case ATH11K_TM_CMD_GET_VERSION:</div><div class='add'>+	switch (nla_get_u32(tb[ATH_TM_ATTR_CMD])) {</div><div class='add'>+	case ATH_TM_CMD_GET_VERSION:</div><div class='ctx'> 		return ath11k_tm_cmd_get_version(ar, tb);</div><div class='del'>-	case ATH11K_TM_CMD_WMI:</div><div class='del'>-		return ath11k_tm_cmd_wmi(ar, tb);</div><div class='add'>+	case ATH_TM_CMD_WMI:</div><div class='add'>+		return ath11k_tm_cmd_wmi(ar, tb, vif);</div><div class='add'>+	case ATH_TM_CMD_TESTMODE_START:</div><div class='add'>+		return ath11k_tm_cmd_testmode_start(ar, tb);</div><div class='add'>+	case ATH_TM_CMD_WMI_FTM:</div><div class='add'>+		return ath11k_tm_cmd_wmi_ftm(ar, tb);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/testmode.h b/drivers/net/wireless/ath/ath11k/testmode.h<br/>index aaa122ed9069..2f62f2c4422f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/testmode.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/testmode.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/testmode.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/testmode.h</a></div><div class='hunk'>@@ -1,22 +1,22 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NL80211_TESTMODE</div><div class='ctx'> </div><div class='del'>-bool ath11k_tm_event_wmi(struct ath11k *ar, u32 cmd_id, struct sk_buff *skb);</div><div class='add'>+void ath11k_tm_wmi_event(struct ath11k_base *ab, u32 cmd_id, struct sk_buff *skb);</div><div class='ctx'> int ath11k_tm_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 		  void *data, int len);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='del'>-static inline bool ath11k_tm_event_wmi(struct ath11k *ar, u32 cmd_id,</div><div class='add'>+static inline void ath11k_tm_wmi_event(struct ath11k_base *ab, u32 cmd_id,</div><div class='ctx'> 				       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int ath11k_tm_cmd(struct ieee80211_hw *hw,</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/testmode_i.h b/drivers/net/wireless/ath/ath11k/testmode_i.h<br/>deleted file mode 100644<br/>index 4bae2a9eeea4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/testmode_i.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/testmode_i.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,50 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* "API" level of the ath11k testmode interface. Bump it after every</div><div class='del'>- * incompatible interface change.</div><div class='del'>- */</div><div class='del'>-#define ATH11K_TESTMODE_VERSION_MAJOR 1</div><div class='del'>-</div><div class='del'>-/* Bump this after every _compatible_ interface change, for example</div><div class='del'>- * addition of a new command or an attribute.</div><div class='del'>- */</div><div class='del'>-#define ATH11K_TESTMODE_VERSION_MINOR 0</div><div class='del'>-</div><div class='del'>-#define ATH11K_TM_DATA_MAX_LEN		5000</div><div class='del'>-</div><div class='del'>-enum ath11k_tm_attr {</div><div class='del'>-	__ATH11K_TM_ATTR_INVALID		= 0,</div><div class='del'>-	ATH11K_TM_ATTR_CMD			= 1,</div><div class='del'>-	ATH11K_TM_ATTR_DATA			= 2,</div><div class='del'>-	ATH11K_TM_ATTR_WMI_CMDID		= 3,</div><div class='del'>-	ATH11K_TM_ATTR_VERSION_MAJOR		= 4,</div><div class='del'>-	ATH11K_TM_ATTR_VERSION_MINOR		= 5,</div><div class='del'>-	ATH11K_TM_ATTR_WMI_OP_VERSION		= 6,</div><div class='del'>-</div><div class='del'>-	/* keep last */</div><div class='del'>-	__ATH11K_TM_ATTR_AFTER_LAST,</div><div class='del'>-	ATH11K_TM_ATTR_MAX		= __ATH11K_TM_ATTR_AFTER_LAST - 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* All ath11k testmode interface commands specified in</div><div class='del'>- * ATH11K_TM_ATTR_CMD</div><div class='del'>- */</div><div class='del'>-enum ath11k_tm_cmd {</div><div class='del'>-	/* Returns the supported ath11k testmode interface version in</div><div class='del'>-	 * ATH11K_TM_ATTR_VERSION. Always guaranteed to work. User space</div><div class='del'>-	 * uses this to verify it's using the correct version of the</div><div class='del'>-	 * testmode interface</div><div class='del'>-	 */</div><div class='del'>-	ATH11K_TM_CMD_GET_VERSION = 0,</div><div class='del'>-</div><div class='del'>-	/* The command used to transmit a WMI command to the firmware and</div><div class='del'>-	 * the event to receive WMI events from the firmware. Without</div><div class='del'>-	 * struct wmi_cmd_hdr header, only the WMI payload. Command id is</div><div class='del'>-	 * provided with ATH11K_TM_ATTR_WMI_CMDID and payload in</div><div class='del'>-	 * ATH11K_TM_ATTR_DATA.</div><div class='del'>-	 */</div><div class='del'>-	ATH11K_TM_CMD_WMI = 1,</div><div class='del'>-};</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/thermal.c b/drivers/net/wireless/ath/ath11k/thermal.c<br/>index c96b26f39a25..18d6eab5cce3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/thermal.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/thermal.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/thermal.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/thermal.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='hunk'>@@ -99,8 +100,8 @@ static ssize_t ath11k_thermal_show_temp(struct device *dev,</div><div class='ctx'> 	temperature = ar-&gt;thermal.temperature;</div><div class='ctx'> 	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> </div><div class='del'>-	/* display in millidegree celcius */</div><div class='del'>-	ret = snprintf(buf, PAGE_SIZE, "%d\n", temperature * 1000);</div><div class='add'>+	/* display in millidegree Celsius */</div><div class='add'>+	ret = sysfs_emit(buf, "%d\n", temperature * 1000);</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -125,7 +126,7 @@ ATTRIBUTE_GROUPS(ath11k_hwmon);</div><div class='ctx'> </div><div class='ctx'> int ath11k_thermal_set_throttling(struct ath11k *ar, u32 throttle_state)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_base *sc = ar-&gt;ab;</div><div class='add'>+	struct ath11k_base *ab = ar-&gt;ab;</div><div class='ctx'> 	struct thermal_mitigation_params param;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -147,14 +148,14 @@ int ath11k_thermal_set_throttling(struct ath11k *ar, u32 throttle_state)</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_wmi_send_thermal_mitigation_param_cmd(ar, &amp;param);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ath11k_warn(sc, "failed to send thermal mitigation duty cycle %u ret %d\n",</div><div class='add'>+		ath11k_warn(ab, "failed to send thermal mitigation duty cycle %u ret %d\n",</div><div class='ctx'> 			    throttle_state, ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath11k_thermal_register(struct ath11k_base *sc)</div><div class='add'>+int ath11k_thermal_register(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	struct thermal_cooling_device *cdev;</div><div class='ctx'> 	struct device *hwmon_dev;</div><div class='hunk'>@@ -162,8 +163,11 @@ int ath11k_thermal_register(struct ath11k_base *sc)</div><div class='ctx'> 	struct ath11k_pdev *pdev;</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; sc-&gt;num_radios; i++) {</div><div class='del'>-		pdev = &amp;sc-&gt;pdevs[i];</div><div class='add'>+	if (test_bit(ATH11K_FLAG_REGISTERED, &amp;ab-&gt;dev_flags))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		pdev = &amp;ab-&gt;pdevs[i];</div><div class='ctx'> 		ar = pdev-&gt;ar;</div><div class='ctx'> 		if (!ar)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -172,7 +176,7 @@ int ath11k_thermal_register(struct ath11k_base *sc)</div><div class='ctx'> 						       &amp;ath11k_thermal_ops);</div><div class='ctx'> </div><div class='ctx'> 		if (IS_ERR(cdev)) {</div><div class='del'>-			ath11k_err(sc, "failed to setup thermal device result: %ld\n",</div><div class='add'>+			ath11k_err(ab, "failed to setup thermal device result: %ld\n",</div><div class='ctx'> 				   PTR_ERR(cdev));</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			goto err_thermal_destroy;</div><div class='hunk'>@@ -183,7 +187,7 @@ int ath11k_thermal_register(struct ath11k_base *sc)</div><div class='ctx'> 		ret = sysfs_create_link(&amp;ar-&gt;hw-&gt;wiphy-&gt;dev.kobj, &amp;cdev-&gt;device.kobj,</div><div class='ctx'> 					"cooling_device");</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ath11k_err(sc, "failed to create cooling device symlink\n");</div><div class='add'>+			ath11k_err(ab, "failed to create cooling device symlink\n");</div><div class='ctx'> 			goto err_thermal_destroy;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -204,18 +208,18 @@ int ath11k_thermal_register(struct ath11k_base *sc)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_thermal_destroy:</div><div class='del'>-	ath11k_thermal_unregister(sc);</div><div class='add'>+	ath11k_thermal_unregister(ab);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath11k_thermal_unregister(struct ath11k_base *sc)</div><div class='add'>+void ath11k_thermal_unregister(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar;</div><div class='ctx'> 	struct ath11k_pdev *pdev;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; sc-&gt;num_radios; i++) {</div><div class='del'>-		pdev = &amp;sc-&gt;pdevs[i];</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		pdev = &amp;ab-&gt;pdevs[i];</div><div class='ctx'> 		ar = pdev-&gt;ar;</div><div class='ctx'> 		if (!ar)</div><div class='ctx'> 			continue;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/thermal.h b/drivers/net/wireless/ath/ath11k/thermal.h<br/>index f9af55f3682d..cdaf4e01d92e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/thermal.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/thermal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/thermal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/thermal.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _ATH11K_THERMAL_</div><div class='hunk'>@@ -19,24 +20,24 @@ struct ath11k_thermal {</div><div class='ctx'> </div><div class='ctx'> 	/* protected by conf_mutex */</div><div class='ctx'> 	u32 throttle_state;</div><div class='del'>-	/* temperature value in Celcius degree</div><div class='add'>+	/* temperature value in Celsius degree</div><div class='ctx'> 	 * protected by data_lock</div><div class='ctx'> 	 */</div><div class='ctx'> 	int temperature;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if IS_REACHABLE(CONFIG_THERMAL)</div><div class='del'>-int ath11k_thermal_register(struct ath11k_base *sc);</div><div class='del'>-void ath11k_thermal_unregister(struct ath11k_base *sc);</div><div class='add'>+int ath11k_thermal_register(struct ath11k_base *ab);</div><div class='add'>+void ath11k_thermal_unregister(struct ath11k_base *ab);</div><div class='ctx'> int ath11k_thermal_set_throttling(struct ath11k *ar, u32 throttle_state);</div><div class='ctx'> void ath11k_thermal_event_temperature(struct ath11k *ar, int temperature);</div><div class='ctx'> #else</div><div class='del'>-static inline int ath11k_thermal_register(struct ath11k_base *sc)</div><div class='add'>+static inline int ath11k_thermal_register(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ath11k_thermal_unregister(struct ath11k_base *sc)</div><div class='add'>+static inline void ath11k_thermal_unregister(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/trace.c b/drivers/net/wireless/ath/ath11k/trace.c<br/>index f0cc49ba0387..44ff8e9eff5d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/trace.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/trace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/trace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/trace.c</a></div><div class='hunk'>@@ -1,9 +1,12 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CREATE_TRACE_POINTS</div><div class='ctx'> #include "trace.h"</div><div class='add'>+EXPORT_SYMBOL(__tracepoint_ath11k_log_dbg);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/trace.h b/drivers/net/wireless/ath/ath11k/trace.h<br/>index d2d2a3cb0826..75246b0a82e3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/trace.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/trace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/trace.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #if !defined(_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)</div><div class='hunk'>@@ -14,12 +15,24 @@</div><div class='ctx'> #if !defined(CONFIG_ATH11K_TRACING)</div><div class='ctx'> #undef TRACE_EVENT</div><div class='ctx'> #define TRACE_EVENT(name, proto, ...) \</div><div class='add'>+static inline void trace_ ## name(proto) {} \</div><div class='add'>+static inline bool trace_##name##_enabled(void) \</div><div class='add'>+{						\</div><div class='add'>+	return false;				\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#undef DECLARE_EVENT_CLASS</div><div class='add'>+#define DECLARE_EVENT_CLASS(...)</div><div class='add'>+#undef DEFINE_EVENT</div><div class='add'>+#define DEFINE_EVENT(evt_class, name, proto, ...) \</div><div class='ctx'> static inline void trace_ ## name(proto) {}</div><div class='ctx'> #endif /* !CONFIG_ATH11K_TRACING || __CHECKER__ */</div><div class='ctx'> </div><div class='ctx'> #undef TRACE_SYSTEM</div><div class='ctx'> #define TRACE_SYSTEM ath11k</div><div class='ctx'> </div><div class='add'>+#define ATH11K_MSG_MAX 400</div><div class='add'>+</div><div class='ctx'> TRACE_EVENT(ath11k_htt_pktlog,</div><div class='ctx'> 	    TP_PROTO(struct ath11k *ar, const void *buf, u16 buf_len,</div><div class='ctx'> 		     u32 pktlog_checksum),</div><div class='hunk'>@@ -35,8 +48,8 @@ TRACE_EVENT(ath11k_htt_pktlog,</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(device, dev_name(ar-&gt;ab-&gt;dev));</div><div class='del'>-		__assign_str(driver, dev_driver_string(ar-&gt;ab-&gt;dev));</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='ctx'> 		__entry-&gt;buf_len = buf_len;</div><div class='ctx'> 		__entry-&gt;pktlog_checksum = pktlog_checksum;</div><div class='ctx'> 		memcpy(__get_dynamic_array(pktlog), buf, buf_len);</div><div class='hunk'>@@ -64,8 +77,8 @@ TRACE_EVENT(ath11k_htt_ppdu_stats,</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(device, dev_name(ar-&gt;ab-&gt;dev));</div><div class='del'>-		__assign_str(driver, dev_driver_string(ar-&gt;ab-&gt;dev));</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='ctx'> 		__entry-&gt;len = len;</div><div class='ctx'> 		memcpy(__get_dynamic_array(ppdu), data, len);</div><div class='ctx'> 	),</div><div class='hunk'>@@ -79,32 +92,248 @@ TRACE_EVENT(ath11k_htt_ppdu_stats,</div><div class='ctx'> );</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(ath11k_htt_rxdesc,</div><div class='del'>-	    TP_PROTO(struct ath11k *ar, const void *data, size_t len),</div><div class='add'>+	    TP_PROTO(struct ath11k *ar, const void *data, size_t log_type, size_t len),</div><div class='ctx'> </div><div class='del'>-	TP_ARGS(ar, data, len),</div><div class='add'>+	TP_ARGS(ar, data, log_type, len),</div><div class='ctx'> </div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		__string(device, dev_name(ar-&gt;ab-&gt;dev))</div><div class='ctx'> 		__string(driver, dev_driver_string(ar-&gt;ab-&gt;dev))</div><div class='ctx'> 		__field(u16, len)</div><div class='add'>+		__field(u16, log_type)</div><div class='ctx'> 		__dynamic_array(u8, rxdesc, len)</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(device, dev_name(ar-&gt;ab-&gt;dev));</div><div class='del'>-		__assign_str(driver, dev_driver_string(ar-&gt;ab-&gt;dev));</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='ctx'> 		__entry-&gt;len = len;</div><div class='add'>+		__entry-&gt;log_type = log_type;</div><div class='ctx'> 		memcpy(__get_dynamic_array(rxdesc), data, len);</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_printk(</div><div class='del'>-		"%s %s rxdesc len %d",</div><div class='add'>+		"%s %s rxdesc len %d type %d",</div><div class='ctx'> 		__get_str(driver),</div><div class='ctx'> 		__get_str(device),</div><div class='del'>-		__entry-&gt;len</div><div class='add'>+		__entry-&gt;len,</div><div class='add'>+		__entry-&gt;log_type</div><div class='add'>+	 )</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(ath11k_log_event,</div><div class='add'>+		    TP_PROTO(struct ath11k_base *ab, struct va_format *vaf),</div><div class='add'>+	TP_ARGS(ab, vaf),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(device, dev_name(ab-&gt;dev))</div><div class='add'>+		__string(driver, dev_driver_string(ab-&gt;dev))</div><div class='add'>+		__vstring(msg, vaf-&gt;fmt, vaf-&gt;va)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='add'>+		__assign_vstr(msg, vaf-&gt;fmt, vaf-&gt;va);</div><div class='add'>+	),</div><div class='add'>+	TP_printk(</div><div class='add'>+		"%s %s %s",</div><div class='add'>+		__get_str(driver),</div><div class='add'>+		__get_str(device),</div><div class='add'>+		__get_str(msg)</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(ath11k_log_event, ath11k_log_err,</div><div class='add'>+	     TP_PROTO(struct ath11k_base *ab, struct va_format *vaf),</div><div class='add'>+	     TP_ARGS(ab, vaf)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(ath11k_log_event, ath11k_log_warn,</div><div class='add'>+	     TP_PROTO(struct ath11k_base *ab, struct va_format *vaf),</div><div class='add'>+	     TP_ARGS(ab, vaf)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(ath11k_log_event, ath11k_log_info,</div><div class='add'>+	     TP_PROTO(struct ath11k_base *ab, struct va_format *vaf),</div><div class='add'>+	     TP_ARGS(ab, vaf)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(ath11k_wmi_cmd,</div><div class='add'>+	    TP_PROTO(struct ath11k_base *ab, int id, const void *buf, size_t buf_len),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(ab, id, buf, buf_len),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(device, dev_name(ab-&gt;dev))</div><div class='add'>+		__string(driver, dev_driver_string(ab-&gt;dev))</div><div class='add'>+		__field(unsigned int, id)</div><div class='add'>+		__field(size_t, buf_len)</div><div class='add'>+		__dynamic_array(u8, buf, buf_len)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='add'>+		__entry-&gt;id = id;</div><div class='add'>+		__entry-&gt;buf_len = buf_len;</div><div class='add'>+		memcpy(__get_dynamic_array(buf), buf, buf_len);</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk(</div><div class='add'>+		"%s %s id %d len %zu",</div><div class='add'>+		__get_str(driver),</div><div class='add'>+		__get_str(device),</div><div class='add'>+		__entry-&gt;id,</div><div class='add'>+		__entry-&gt;buf_len</div><div class='ctx'> 	 )</div><div class='ctx'> );</div><div class='ctx'> </div><div class='add'>+TRACE_EVENT(ath11k_wmi_event,</div><div class='add'>+	    TP_PROTO(struct ath11k_base *ab, int id, const void *buf, size_t buf_len),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(ab, id, buf, buf_len),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(device, dev_name(ab-&gt;dev))</div><div class='add'>+		__string(driver, dev_driver_string(ab-&gt;dev))</div><div class='add'>+		__field(unsigned int, id)</div><div class='add'>+		__field(size_t, buf_len)</div><div class='add'>+		__dynamic_array(u8, buf, buf_len)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='add'>+		__entry-&gt;id = id;</div><div class='add'>+		__entry-&gt;buf_len = buf_len;</div><div class='add'>+		memcpy(__get_dynamic_array(buf), buf, buf_len);</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk(</div><div class='add'>+		"%s %s id %d len %zu",</div><div class='add'>+		__get_str(driver),</div><div class='add'>+		__get_str(device),</div><div class='add'>+		__entry-&gt;id,</div><div class='add'>+		__entry-&gt;buf_len</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(ath11k_log_dbg,</div><div class='add'>+	    TP_PROTO(struct ath11k_base *ab, unsigned int level, struct va_format *vaf),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(ab, level, vaf),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(device, dev_name(ab-&gt;dev))</div><div class='add'>+		__string(driver, dev_driver_string(ab-&gt;dev))</div><div class='add'>+		__field(unsigned int, level)</div><div class='add'>+		__dynamic_array(char, msg, ATH11K_MSG_MAX)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='add'>+		__entry-&gt;level = level;</div><div class='add'>+		WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),</div><div class='add'>+				       ATH11K_MSG_MAX, vaf-&gt;fmt,</div><div class='add'>+				       *vaf-&gt;va) &gt;= ATH11K_MSG_MAX);</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk(</div><div class='add'>+		"%s %s %s",</div><div class='add'>+		__get_str(driver),</div><div class='add'>+		__get_str(device),</div><div class='add'>+		__get_str(msg)</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(ath11k_log_dbg_dump,</div><div class='add'>+	    TP_PROTO(struct ath11k_base *ab, const char *msg, const char *prefix,</div><div class='add'>+		     const void *buf, size_t buf_len),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(ab, msg, prefix, buf, buf_len),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(device, dev_name(ab-&gt;dev))</div><div class='add'>+		__string(driver, dev_driver_string(ab-&gt;dev))</div><div class='add'>+		__string(msg, msg)</div><div class='add'>+		__string(prefix, prefix)</div><div class='add'>+		__field(size_t, buf_len)</div><div class='add'>+		__dynamic_array(u8, buf, buf_len)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='add'>+		__assign_str(msg);</div><div class='add'>+		__assign_str(prefix);</div><div class='add'>+		__entry-&gt;buf_len = buf_len;</div><div class='add'>+		memcpy(__get_dynamic_array(buf), buf, buf_len);</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk(</div><div class='add'>+		"%s %s %s/%s\n",</div><div class='add'>+		__get_str(driver),</div><div class='add'>+		__get_str(device),</div><div class='add'>+		__get_str(prefix),</div><div class='add'>+		__get_str(msg)</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(ath11k_wmi_diag,</div><div class='add'>+	    TP_PROTO(struct ath11k_base *ab, const void *data, size_t len),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(ab, data, len),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(device, dev_name(ab-&gt;dev))</div><div class='add'>+		__string(driver, dev_driver_string(ab-&gt;dev))</div><div class='add'>+		__field(u16, len)</div><div class='add'>+		__dynamic_array(u8, data, len)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='add'>+		__entry-&gt;len = len;</div><div class='add'>+		memcpy(__get_dynamic_array(data), data, len);</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk(</div><div class='add'>+		"%s %s tlv diag len %d",</div><div class='add'>+		__get_str(driver),</div><div class='add'>+		__get_str(device),</div><div class='add'>+		__entry-&gt;len</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(ath11k_ps_timekeeper,</div><div class='add'>+	    TP_PROTO(struct ath11k *ar, const void *peer_addr,</div><div class='add'>+		     u32 peer_ps_timestamp, u8 peer_ps_state),</div><div class='add'>+	TP_ARGS(ar, peer_addr, peer_ps_timestamp, peer_ps_state),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(__string(device, dev_name(ar-&gt;ab-&gt;dev))</div><div class='add'>+			 __string(driver, dev_driver_string(ar-&gt;ab-&gt;dev))</div><div class='add'>+			 __dynamic_array(u8, peer_addr, ETH_ALEN)</div><div class='add'>+			 __field(u8, peer_ps_state)</div><div class='add'>+			 __field(u32, peer_ps_timestamp)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(__assign_str(device);</div><div class='add'>+		       __assign_str(driver);</div><div class='add'>+		       memcpy(__get_dynamic_array(peer_addr), peer_addr,</div><div class='add'>+			      ETH_ALEN);</div><div class='add'>+		       __entry-&gt;peer_ps_state = peer_ps_state;</div><div class='add'>+		       __entry-&gt;peer_ps_timestamp = peer_ps_timestamp;</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk("%s %s %u %u",</div><div class='add'>+		  __get_str(driver),</div><div class='add'>+		  __get_str(device),</div><div class='add'>+		  __entry-&gt;peer_ps_state,</div><div class='add'>+		  __entry-&gt;peer_ps_timestamp</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='ctx'> #endif /* _TRACE_H_ || TRACE_HEADER_MULTI_READ*/</div><div class='ctx'> </div><div class='ctx'> /* we don't want to use include/trace/events */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c<br/>index 5ca2d80679b6..110035dae8a6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/wmi.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/wmi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/wmi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/wmi.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='hunk'>@@ -18,6 +19,8 @@</div><div class='ctx'> #include "mac.h"</div><div class='ctx'> #include "hw.h"</div><div class='ctx'> #include "peer.h"</div><div class='add'>+#include "testmode.h"</div><div class='add'>+#include "p2p.h"</div><div class='ctx'> </div><div class='ctx'> struct wmi_tlv_policy {</div><div class='ctx'> 	size_t min_len;</div><div class='hunk'>@@ -73,6 +76,20 @@ struct wmi_tlv_dma_buf_release_parse {</div><div class='ctx'> 	bool meta_data_done;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct wmi_tlv_fw_stats_parse {</div><div class='add'>+	const struct wmi_stats_event *ev;</div><div class='add'>+	const struct wmi_per_chain_rssi_stats *rssi;</div><div class='add'>+	struct ath11k_fw_stats *stats;</div><div class='add'>+	int rssi_num;</div><div class='add'>+	bool chain_rssi_done;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_tlv_mgmt_rx_parse {</div><div class='add'>+	const struct wmi_mgmt_rx_hdr *fixed;</div><div class='add'>+	const u8 *frame_buf;</div><div class='add'>+	bool frame_buf_done;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct wmi_tlv_policy wmi_tlv_policies[] = {</div><div class='ctx'> 	[WMI_TAG_ARRAY_BYTE]</div><div class='ctx'> 		= { .min_len = 0 },</div><div class='hunk'>@@ -96,6 +113,8 @@ static const struct wmi_tlv_policy wmi_tlv_policies[] = {</div><div class='ctx'> 		= { .min_len = sizeof(struct wmi_vdev_stopped_event) },</div><div class='ctx'> 	[WMI_TAG_REG_CHAN_LIST_CC_EVENT]</div><div class='ctx'> 		= { .min_len = sizeof(struct wmi_reg_chan_list_cc_event) },</div><div class='add'>+	[WMI_TAG_REG_CHAN_LIST_CC_EXT_EVENT]</div><div class='add'>+		= { .min_len = sizeof(struct wmi_reg_chan_list_cc_ext_event) },</div><div class='ctx'> 	[WMI_TAG_MGMT_RX_HDR]</div><div class='ctx'> 		= { .min_len = sizeof(struct wmi_mgmt_rx_hdr) },</div><div class='ctx'> 	[WMI_TAG_MGMT_TX_COMPL_EVENT]</div><div class='hunk'>@@ -128,6 +147,18 @@ static const struct wmi_tlv_policy wmi_tlv_policies[] = {</div><div class='ctx'> 		.min_len = sizeof(struct wmi_probe_resp_tx_status_event) },</div><div class='ctx'> 	[WMI_TAG_VDEV_DELETE_RESP_EVENT] = {</div><div class='ctx'> 		.min_len = sizeof(struct wmi_vdev_delete_resp_event) },</div><div class='add'>+	[WMI_TAG_OBSS_COLOR_COLLISION_EVT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_obss_color_collision_event) },</div><div class='add'>+	[WMI_TAG_11D_NEW_COUNTRY_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_11d_new_cc_ev) },</div><div class='add'>+	[WMI_TAG_PER_CHAIN_RSSI_STATS] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_per_chain_rssi_stats) },</div><div class='add'>+	[WMI_TAG_TWT_ADD_DIALOG_COMPLETE_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_twt_add_dialog_event) },</div><div class='add'>+	[WMI_TAG_P2P_NOA_INFO] = {</div><div class='add'>+		.min_len = sizeof(struct ath11k_wmi_p2p_noa_info) },</div><div class='add'>+	[WMI_TAG_P2P_NOA_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_p2p_noa_event) },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define PRIMAP(_hw_mode_) \</div><div class='hunk'>@@ -212,9 +243,8 @@ static int ath11k_wmi_tlv_parse(struct ath11k_base *ar, const void **tb,</div><div class='ctx'> 				   (void *)tb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const void **</div><div class='del'>-ath11k_wmi_tlv_parse_alloc(struct ath11k_base *ab, const void *ptr,</div><div class='del'>-			   size_t len, gfp_t gfp)</div><div class='add'>+const void **ath11k_wmi_tlv_parse_alloc(struct ath11k_base *ab,</div><div class='add'>+					struct sk_buff *skb, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	const void **tb;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -223,7 +253,7 @@ ath11k_wmi_tlv_parse_alloc(struct ath11k_base *ab, const void *ptr,</div><div class='ctx'> 	if (!tb)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_wmi_tlv_parse(ab, tb, ptr, len);</div><div class='add'>+	ret = ath11k_wmi_tlv_parse(ab, tb, skb-&gt;data, skb-&gt;len);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		kfree(tb);</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='hunk'>@@ -249,6 +279,8 @@ static int ath11k_wmi_cmd_send_nowait(struct ath11k_pdev_wmi *wmi, struct sk_buf</div><div class='ctx'> 	cmd_hdr = (struct wmi_cmd_hdr *)skb-&gt;data;</div><div class='ctx'> 	cmd_hdr-&gt;cmd_id = cmd;</div><div class='ctx'> </div><div class='add'>+	trace_ath11k_wmi_cmd(ab, cmd_id, skb-&gt;data, skb-&gt;len);</div><div class='add'>+</div><div class='ctx'> 	memset(skb_cb, 0, sizeof(*skb_cb));</div><div class='ctx'> 	ret = ath11k_htc_send(&amp;ab-&gt;htc, wmi-&gt;eid, skb);</div><div class='ctx'> </div><div class='hunk'>@@ -265,22 +297,40 @@ err_pull:</div><div class='ctx'> int ath11k_wmi_cmd_send(struct ath11k_pdev_wmi *wmi, struct sk_buff *skb,</div><div class='ctx'> 			u32 cmd_id)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_wmi_base *wmi_sc = wmi-&gt;wmi_ab;</div><div class='add'>+	struct ath11k_wmi_base *wmi_ab = wmi-&gt;wmi_ab;</div><div class='ctx'> 	int ret = -EOPNOTSUPP;</div><div class='add'>+	struct ath11k_base *ab = wmi_ab-&gt;ab;</div><div class='ctx'> </div><div class='ctx'> 	might_sleep();</div><div class='ctx'> </div><div class='del'>-	wait_event_timeout(wmi_sc-&gt;tx_credits_wq, ({</div><div class='del'>-		ret = ath11k_wmi_cmd_send_nowait(wmi, skb, cmd_id);</div><div class='add'>+	if (ab-&gt;hw_params.credit_flow) {</div><div class='add'>+		wait_event_timeout(wmi_ab-&gt;tx_credits_wq, ({</div><div class='add'>+			ret = ath11k_wmi_cmd_send_nowait(wmi, skb, cmd_id);</div><div class='ctx'> </div><div class='del'>-		if (ret &amp;&amp; test_bit(ATH11K_FLAG_CRASH_FLUSH, &amp;wmi_sc-&gt;ab-&gt;dev_flags))</div><div class='del'>-			ret = -ESHUTDOWN;</div><div class='add'>+			if (ret &amp;&amp; test_bit(ATH11K_FLAG_CRASH_FLUSH,</div><div class='add'>+					    &amp;wmi_ab-&gt;ab-&gt;dev_flags))</div><div class='add'>+				ret = -ESHUTDOWN;</div><div class='ctx'> </div><div class='del'>-		(ret != -EAGAIN);</div><div class='del'>-	}), WMI_SEND_TIMEOUT_HZ);</div><div class='add'>+			(ret != -EAGAIN);</div><div class='add'>+			}), WMI_SEND_TIMEOUT_HZ);</div><div class='add'>+	} else {</div><div class='add'>+		wait_event_timeout(wmi-&gt;tx_ce_desc_wq, ({</div><div class='add'>+			ret = ath11k_wmi_cmd_send_nowait(wmi, skb, cmd_id);</div><div class='add'>+</div><div class='add'>+			if (ret &amp;&amp; test_bit(ATH11K_FLAG_CRASH_FLUSH,</div><div class='add'>+					    &amp;wmi_ab-&gt;ab-&gt;dev_flags))</div><div class='add'>+				ret = -ESHUTDOWN;</div><div class='add'>+</div><div class='add'>+			(ret != -ENOBUFS);</div><div class='add'>+			}), WMI_SEND_TIMEOUT_HZ);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (ret == -EAGAIN)</div><div class='del'>-		ath11k_warn(wmi_sc-&gt;ab, "wmi command %d timeout\n", cmd_id);</div><div class='add'>+		ath11k_warn(wmi_ab-&gt;ab, "wmi command %d timeout\n", cmd_id);</div><div class='add'>+</div><div class='add'>+	if (ret == -ENOBUFS)</div><div class='add'>+		ath11k_warn(wmi_ab-&gt;ab, "ce desc not available for wmi command %d\n",</div><div class='add'>+			    cmd_id);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -315,6 +365,7 @@ ath11k_pull_mac_phy_cap_svc_ready_ext(struct ath11k_pdev_wmi *wmi_handle,</div><div class='ctx'> 				      struct ath11k_pdev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_mac_phy_capabilities *mac_phy_caps;</div><div class='add'>+	struct ath11k_base *ab = wmi_handle-&gt;wmi_ab-&gt;ab;</div><div class='ctx'> 	struct ath11k_band_cap *cap_band;</div><div class='ctx'> 	struct ath11k_pdev_cap *pdev_cap = &amp;pdev-&gt;cap;</div><div class='ctx'> 	u32 phy_map;</div><div class='hunk'>@@ -346,6 +397,14 @@ ath11k_pull_mac_phy_cap_svc_ready_ext(struct ath11k_pdev_wmi *wmi_handle,</div><div class='ctx'> 	pdev-&gt;pdev_id = mac_phy_caps-&gt;pdev_id;</div><div class='ctx'> 	pdev_cap-&gt;supported_bands |= mac_phy_caps-&gt;supported_bands;</div><div class='ctx'> 	pdev_cap-&gt;ampdu_density = mac_phy_caps-&gt;ampdu_density;</div><div class='add'>+	ab-&gt;target_pdev_ids[ab-&gt;target_pdev_count].supported_bands =</div><div class='add'>+		mac_phy_caps-&gt;supported_bands;</div><div class='add'>+	ab-&gt;target_pdev_ids[ab-&gt;target_pdev_count].pdev_id = mac_phy_caps-&gt;pdev_id;</div><div class='add'>+	ab-&gt;target_pdev_count++;</div><div class='add'>+</div><div class='add'>+	if (!(mac_phy_caps-&gt;supported_bands &amp; WMI_HOST_WLAN_2G_CAP) &amp;&amp;</div><div class='add'>+	    !(mac_phy_caps-&gt;supported_bands &amp; WMI_HOST_WLAN_5G_CAP))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Take non-zero tx/rx chainmask. If tx/rx chainmask differs from</div><div class='ctx'> 	 * band to band for a single radio, need to see how this should be</div><div class='hunk'>@@ -354,19 +413,23 @@ ath11k_pull_mac_phy_cap_svc_ready_ext(struct ath11k_pdev_wmi *wmi_handle,</div><div class='ctx'> 	if (mac_phy_caps-&gt;supported_bands &amp; WMI_HOST_WLAN_2G_CAP) {</div><div class='ctx'> 		pdev_cap-&gt;tx_chain_mask = mac_phy_caps-&gt;tx_chain_mask_2g;</div><div class='ctx'> 		pdev_cap-&gt;rx_chain_mask = mac_phy_caps-&gt;rx_chain_mask_2g;</div><div class='del'>-	} else if (mac_phy_caps-&gt;supported_bands &amp; WMI_HOST_WLAN_5G_CAP) {</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mac_phy_caps-&gt;supported_bands &amp; WMI_HOST_WLAN_5G_CAP) {</div><div class='ctx'> 		pdev_cap-&gt;vht_cap = mac_phy_caps-&gt;vht_cap_info_5g;</div><div class='ctx'> 		pdev_cap-&gt;vht_mcs = mac_phy_caps-&gt;vht_supp_mcs_5g;</div><div class='ctx'> 		pdev_cap-&gt;he_mcs = mac_phy_caps-&gt;he_supp_mcs_5g;</div><div class='ctx'> 		pdev_cap-&gt;tx_chain_mask = mac_phy_caps-&gt;tx_chain_mask_5g;</div><div class='ctx'> 		pdev_cap-&gt;rx_chain_mask = mac_phy_caps-&gt;rx_chain_mask_5g;</div><div class='del'>-	} else {</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		pdev_cap-&gt;nss_ratio_enabled =</div><div class='add'>+			WMI_NSS_RATIO_ENABLE_DISABLE_GET(mac_phy_caps-&gt;nss_ratio);</div><div class='add'>+		pdev_cap-&gt;nss_ratio_info =</div><div class='add'>+			WMI_NSS_RATIO_INFO_GET(mac_phy_caps-&gt;nss_ratio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* tx/rx chainmask reported from fw depends on the actual hw chains used,</div><div class='ctx'> 	 * For example, for 4x4 capable macphys, first 4 chains can be used for first</div><div class='del'>-	 * mac and the remaing 4 chains can be used for the second mac or vice-versa.</div><div class='add'>+	 * mac and the remaining 4 chains can be used for the second mac or vice-versa.</div><div class='ctx'> 	 * In this case, tx/rx chainmask 0xf will be advertised for first mac and 0xf0</div><div class='ctx'> 	 * will be advertised for second mac or vice-versa. Compute the shift value</div><div class='ctx'> 	 * for tx/rx chainmask which will be used to advertise supported ht/vht rates to</div><div class='hunk'>@@ -403,18 +466,18 @@ ath11k_pull_mac_phy_cap_svc_ready_ext(struct ath11k_pdev_wmi *wmi_handle,</div><div class='ctx'> 		       sizeof(u32) * PSOC_HOST_MAX_PHY_SIZE);</div><div class='ctx'> 		memcpy(&amp;cap_band-&gt;he_ppet, &amp;mac_phy_caps-&gt;he_ppet5g,</div><div class='ctx'> 		       sizeof(struct ath11k_ppe_threshold));</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	cap_band = &amp;pdev_cap-&gt;band[NL80211_BAND_6GHZ];</div><div class='del'>-	cap_band-&gt;max_bw_supported = mac_phy_caps-&gt;max_bw_supported_5g;</div><div class='del'>-	cap_band-&gt;ht_cap_info = mac_phy_caps-&gt;ht_cap_info_5g;</div><div class='del'>-	cap_band-&gt;he_cap_info[0] = mac_phy_caps-&gt;he_cap_info_5g;</div><div class='del'>-	cap_band-&gt;he_cap_info[1] = mac_phy_caps-&gt;he_cap_info_5g_ext;</div><div class='del'>-	cap_band-&gt;he_mcs = mac_phy_caps-&gt;he_supp_mcs_5g;</div><div class='del'>-	memcpy(cap_band-&gt;he_cap_phy_info, &amp;mac_phy_caps-&gt;he_cap_phy_info_5g,</div><div class='del'>-	       sizeof(u32) * PSOC_HOST_MAX_PHY_SIZE);</div><div class='del'>-	memcpy(&amp;cap_band-&gt;he_ppet, &amp;mac_phy_caps-&gt;he_ppet5g,</div><div class='del'>-	       sizeof(struct ath11k_ppe_threshold));</div><div class='add'>+		cap_band = &amp;pdev_cap-&gt;band[NL80211_BAND_6GHZ];</div><div class='add'>+		cap_band-&gt;max_bw_supported = mac_phy_caps-&gt;max_bw_supported_5g;</div><div class='add'>+		cap_band-&gt;ht_cap_info = mac_phy_caps-&gt;ht_cap_info_5g;</div><div class='add'>+		cap_band-&gt;he_cap_info[0] = mac_phy_caps-&gt;he_cap_info_5g;</div><div class='add'>+		cap_band-&gt;he_cap_info[1] = mac_phy_caps-&gt;he_cap_info_5g_ext;</div><div class='add'>+		cap_band-&gt;he_mcs = mac_phy_caps-&gt;he_supp_mcs_5g;</div><div class='add'>+		memcpy(cap_band-&gt;he_cap_phy_info, &amp;mac_phy_caps-&gt;he_cap_phy_info_5g,</div><div class='add'>+		       sizeof(u32) * PSOC_HOST_MAX_PHY_SIZE);</div><div class='add'>+		memcpy(&amp;cap_band-&gt;he_ppet, &amp;mac_phy_caps-&gt;he_ppet5g,</div><div class='add'>+		       sizeof(struct ath11k_ppe_threshold));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -548,13 +611,15 @@ static int ath11k_service_ready_event(struct ath11k_base *ab, struct sk_buff *sk</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event service ready");</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct sk_buff *ath11k_wmi_alloc_skb(struct ath11k_wmi_base *wmi_sc, u32 len)</div><div class='add'>+struct sk_buff *ath11k_wmi_alloc_skb(struct ath11k_wmi_base *wmi_ab, u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	struct ath11k_base *ab = wmi_sc-&gt;ab;</div><div class='add'>+	struct ath11k_base *ab = wmi_ab-&gt;ab;</div><div class='ctx'> 	u32 round_len = roundup(len, 4);</div><div class='ctx'> </div><div class='ctx'> 	skb = ath11k_htc_alloc_skb(ab, WMI_SKB_HEADROOM + round_len);</div><div class='hunk'>@@ -571,10 +636,25 @@ struct sk_buff *ath11k_wmi_alloc_skb(struct ath11k_wmi_base *wmi_sc, u32 len)</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 ath11k_wmi_mgmt_get_freq(struct ath11k *ar,</div><div class='add'>+				    struct ieee80211_tx_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_base *ab = ar-&gt;ab;</div><div class='add'>+	u32 freq = 0;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params.support_off_channel_tx &amp;&amp;</div><div class='add'>+	    ar-&gt;scan.is_roc &amp;&amp;</div><div class='add'>+	    (info-&gt;flags &amp; IEEE80211_TX_CTL_TX_OFFCHAN))</div><div class='add'>+		freq = ar-&gt;scan.roc_freq;</div><div class='add'>+</div><div class='add'>+	return freq;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int ath11k_wmi_mgmt_send(struct ath11k *ar, u32 vdev_id, u32 buf_id,</div><div class='ctx'> 			 struct sk_buff *frame)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_pdev_wmi *wmi = ar-&gt;wmi;</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(frame);</div><div class='ctx'> 	struct wmi_mgmt_send_cmd *cmd;</div><div class='ctx'> 	struct wmi_tlv *frame_tlv;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -595,7 +675,7 @@ int ath11k_wmi_mgmt_send(struct ath11k *ar, u32 vdev_id, u32 buf_id,</div><div class='ctx'> 			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='ctx'> 	cmd-&gt;vdev_id = vdev_id;</div><div class='ctx'> 	cmd-&gt;desc_id = buf_id;</div><div class='del'>-	cmd-&gt;chanfreq = 0;</div><div class='add'>+	cmd-&gt;chanfreq = ath11k_wmi_mgmt_get_freq(ar, info);</div><div class='ctx'> 	cmd-&gt;paddr_lo = lower_32_bits(ATH11K_SKB_CB(frame)-&gt;paddr);</div><div class='ctx'> 	cmd-&gt;paddr_hi = upper_32_bits(ATH11K_SKB_CB(frame)-&gt;paddr);</div><div class='ctx'> 	cmd-&gt;frame_len = frame-&gt;len;</div><div class='hunk'>@@ -617,6 +697,8 @@ int ath11k_wmi_mgmt_send(struct ath11k *ar, u32 vdev_id, u32 buf_id,</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "cmd mgmt tx send");</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -651,6 +733,9 @@ int ath11k_wmi_vdev_create(struct ath11k *ar, u8 *macaddr,</div><div class='ctx'> 	cmd-&gt;vdev_subtype = param-&gt;subtype;</div><div class='ctx'> 	cmd-&gt;num_cfg_txrx_streams = WMI_NUM_SUPPORTED_BAND_MAX;</div><div class='ctx'> 	cmd-&gt;pdev_id = param-&gt;pdev_id;</div><div class='add'>+	cmd-&gt;mbssid_flags = param-&gt;mbssid_flags;</div><div class='add'>+	cmd-&gt;mbssid_tx_vdev_id = param-&gt;mbssid_tx_vdev_id;</div><div class='add'>+</div><div class='ctx'> 	ether_addr_copy(cmd-&gt;vdev_macaddr.addr, macaddr);</div><div class='ctx'> </div><div class='ctx'> 	ptr = skb-&gt;data + sizeof(*cmd);</div><div class='hunk'>@@ -690,7 +775,7 @@ int ath11k_wmi_vdev_create(struct ath11k *ar, u8 *macaddr,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI vdev create: id %d type %d subtype %d macaddr %pM pdevid %d\n",</div><div class='add'>+		   "cmd vdev create id %d type %d subtype %d macaddr %pM pdevid %d\n",</div><div class='ctx'> 		   param-&gt;if_id, param-&gt;type, param-&gt;subtype,</div><div class='ctx'> 		   macaddr, param-&gt;pdev_id);</div><div class='ctx'> </div><div class='hunk'>@@ -719,7 +804,7 @@ int ath11k_wmi_vdev_delete(struct ath11k *ar, u8 vdev_id)</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "WMI vdev delete id %d\n", vdev_id);</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "cmd vdev delete id %d\n", vdev_id);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -747,7 +832,7 @@ int ath11k_wmi_vdev_stop(struct ath11k *ar, u8 vdev_id)</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "WMI vdev stop id 0x%x\n", vdev_id);</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "cmd vdev stop id 0x%x\n", vdev_id);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -775,7 +860,7 @@ int ath11k_wmi_vdev_down(struct ath11k *ar, u8 vdev_id)</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "WMI vdev down id 0x%x\n", vdev_id);</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "cmd vdev down id 0x%x\n", vdev_id);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -783,14 +868,27 @@ int ath11k_wmi_vdev_down(struct ath11k *ar, u8 vdev_id)</div><div class='ctx'> static void ath11k_wmi_put_wmi_channel(struct wmi_channel *chan,</div><div class='ctx'> 				       struct wmi_vdev_start_req_arg *arg)</div><div class='ctx'> {</div><div class='add'>+	u32 center_freq1 = arg-&gt;channel.band_center_freq1;</div><div class='add'>+</div><div class='ctx'> 	memset(chan, 0, sizeof(*chan));</div><div class='ctx'> </div><div class='ctx'> 	chan-&gt;mhz = arg-&gt;channel.freq;</div><div class='ctx'> 	chan-&gt;band_center_freq1 = arg-&gt;channel.band_center_freq1;</div><div class='del'>-	if (arg-&gt;channel.mode == MODE_11AC_VHT80_80)</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;channel.mode == MODE_11AX_HE160) {</div><div class='add'>+		if (arg-&gt;channel.freq &gt; arg-&gt;channel.band_center_freq1)</div><div class='add'>+			chan-&gt;band_center_freq1 = center_freq1 + 40;</div><div class='add'>+		else</div><div class='add'>+			chan-&gt;band_center_freq1 = center_freq1 - 40;</div><div class='add'>+</div><div class='add'>+		chan-&gt;band_center_freq2 = arg-&gt;channel.band_center_freq1;</div><div class='add'>+</div><div class='add'>+	} else if ((arg-&gt;channel.mode == MODE_11AC_VHT80_80) ||</div><div class='add'>+		   (arg-&gt;channel.mode == MODE_11AX_HE80_80)) {</div><div class='ctx'> 		chan-&gt;band_center_freq2 = arg-&gt;channel.band_center_freq2;</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='ctx'> 		chan-&gt;band_center_freq2 = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	chan-&gt;info |= FIELD_PREP(WMI_CHAN_INFO_MODE, arg-&gt;channel.mode);</div><div class='ctx'> 	if (arg-&gt;channel.passive)</div><div class='hunk'>@@ -855,6 +953,8 @@ int ath11k_wmi_vdev_start(struct ath11k *ar, struct wmi_vdev_start_req_arg *arg,</div><div class='ctx'> 	cmd-&gt;cac_duration_ms = arg-&gt;cac_duration_ms;</div><div class='ctx'> 	cmd-&gt;regdomain = arg-&gt;regdomain;</div><div class='ctx'> 	cmd-&gt;he_ops = arg-&gt;he_ops;</div><div class='add'>+	cmd-&gt;mbssid_flags = arg-&gt;mbssid_flags;</div><div class='add'>+	cmd-&gt;mbssid_tx_vdev_id = arg-&gt;mbssid_tx_vdev_id;</div><div class='ctx'> </div><div class='ctx'> 	if (!restart) {</div><div class='ctx'> 		if (arg-&gt;ssid) {</div><div class='hunk'>@@ -868,6 +968,8 @@ int ath11k_wmi_vdev_start(struct ath11k *ar, struct wmi_vdev_start_req_arg *arg,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;flags |= WMI_VDEV_START_LDPC_RX_ENABLED;</div><div class='add'>+	if (test_bit(ATH11K_FLAG_HW_CRYPTO_DISABLED, &amp;ar-&gt;ab-&gt;dev_flags))</div><div class='add'>+		cmd-&gt;flags |= WMI_VDEV_START_HW_ENCRYPTION_DISABLED;</div><div class='ctx'> </div><div class='ctx'> 	ptr = skb-&gt;data + sizeof(*cmd);</div><div class='ctx'> 	chan = ptr;</div><div class='hunk'>@@ -884,7 +986,7 @@ int ath11k_wmi_vdev_start(struct ath11k *ar, struct wmi_vdev_start_req_arg *arg,</div><div class='ctx'> 		      FIELD_PREP(WMI_TLV_LEN, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Note: This is a nested TLV containing:</div><div class='del'>-	 * [wmi_tlv][wmi_p2p_noa_descriptor][wmi_tlv]..</div><div class='add'>+	 * [wmi_tlv][ath11k_wmi_p2p_noa_descriptor][wmi_tlv]..</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	ptr += sizeof(*tlv);</div><div class='hunk'>@@ -901,20 +1003,25 @@ int ath11k_wmi_vdev_start(struct ath11k *ar, struct wmi_vdev_start_req_arg *arg,</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "vdev %s id 0x%x freq 0x%x mode 0x%x\n",</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "cmd vdev %s id 0x%x freq 0x%x mode 0x%x\n",</div><div class='ctx'> 		   restart ? "restart" : "start", arg-&gt;vdev_id,</div><div class='ctx'> 		   arg-&gt;channel.freq, arg-&gt;channel.mode);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath11k_wmi_vdev_up(struct ath11k *ar, u32 vdev_id, u32 aid, const u8 *bssid)</div><div class='add'>+int ath11k_wmi_vdev_up(struct ath11k *ar, u32 vdev_id, u32 aid, const u8 *bssid,</div><div class='add'>+		       u8 *tx_bssid, u32 nontx_profile_idx, u32 nontx_profile_cnt)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_pdev_wmi *wmi = ar-&gt;wmi;</div><div class='ctx'> 	struct wmi_vdev_up_cmd *cmd;</div><div class='add'>+	struct ieee80211_bss_conf *bss_conf;</div><div class='add'>+	struct ath11k_vif *arvif;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	arvif = ath11k_mac_get_arvif(ar, vdev_id);</div><div class='add'>+</div><div class='ctx'> 	skb = ath11k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -928,6 +1035,22 @@ int ath11k_wmi_vdev_up(struct ath11k *ar, u32 vdev_id, u32 aid, const u8 *bssid)</div><div class='ctx'> </div><div class='ctx'> 	ether_addr_copy(cmd-&gt;vdev_bssid.addr, bssid);</div><div class='ctx'> </div><div class='add'>+	cmd-&gt;nontx_profile_idx = nontx_profile_idx;</div><div class='add'>+	cmd-&gt;nontx_profile_cnt = nontx_profile_cnt;</div><div class='add'>+	if (tx_bssid)</div><div class='add'>+		ether_addr_copy(cmd-&gt;tx_vdev_bssid.addr, tx_bssid);</div><div class='add'>+</div><div class='add'>+	if (arvif &amp;&amp; arvif-&gt;vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='add'>+		bss_conf = &amp;arvif-&gt;vif-&gt;bss_conf;</div><div class='add'>+</div><div class='add'>+		if (bss_conf-&gt;nontransmitted) {</div><div class='add'>+			ether_addr_copy(cmd-&gt;tx_vdev_bssid.addr,</div><div class='add'>+					bss_conf-&gt;transmitter_bssid);</div><div class='add'>+			cmd-&gt;nontx_profile_idx = bss_conf-&gt;bssid_index;</div><div class='add'>+			cmd-&gt;nontx_profile_cnt = bss_conf-&gt;bssid_indicator;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_VDEV_UP_CMDID);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab, "failed to submit WMI_VDEV_UP cmd\n");</div><div class='hunk'>@@ -935,7 +1058,7 @@ int ath11k_wmi_vdev_up(struct ath11k *ar, u32 vdev_id, u32 aid, const u8 *bssid)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI mgmt vdev up id 0x%x assoc id %d bssid %pM\n",</div><div class='add'>+		   "cmd vdev up id 0x%x assoc id %d bssid %pM\n",</div><div class='ctx'> 		   vdev_id, aid, bssid);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -968,7 +1091,7 @@ int ath11k_wmi_send_peer_create_cmd(struct ath11k *ar,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI peer create vdev_id %d peer_addr %pM\n",</div><div class='add'>+		   "cmd peer create vdev_id %d peer_addr %pM\n",</div><div class='ctx'> 		   param-&gt;vdev_id, param-&gt;peer_addr);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -993,16 +1116,16 @@ int ath11k_wmi_send_peer_delete_cmd(struct ath11k *ar,</div><div class='ctx'> 	ether_addr_copy(cmd-&gt;peer_macaddr.addr, peer_addr);</div><div class='ctx'> 	cmd-&gt;vdev_id = vdev_id;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI peer delete vdev_id %d peer_addr %pM\n",</div><div class='del'>-		   vdev_id,  peer_addr);</div><div class='del'>-</div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PEER_DELETE_CMDID);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab, "failed to send WMI_PEER_DELETE cmd\n");</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd peer delete vdev_id %d peer_addr %pM\n",</div><div class='add'>+		   vdev_id,  peer_addr);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1031,11 +1154,6 @@ int ath11k_wmi_send_pdev_set_regdomain(struct ath11k *ar,</div><div class='ctx'> 	cmd-&gt;dfs_domain = param-&gt;dfs_domain;</div><div class='ctx'> 	cmd-&gt;pdev_id = param-&gt;pdev_id;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI pdev regd rd %d rd2g %d rd5g %d domain %d pdev id %d\n",</div><div class='del'>-		   param-&gt;current_rd_in_use, param-&gt;current_rd_2g,</div><div class='del'>-		   param-&gt;current_rd_5g, param-&gt;dfs_domain, param-&gt;pdev_id);</div><div class='del'>-</div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_SET_REGDOMAIN_CMDID);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab,</div><div class='hunk'>@@ -1043,6 +1161,11 @@ int ath11k_wmi_send_pdev_set_regdomain(struct ath11k *ar,</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd pdev regd rd %d rd2g %d rd5g %d domain %d pdev id %d\n",</div><div class='add'>+		   param-&gt;current_rd_in_use, param-&gt;current_rd_2g,</div><div class='add'>+		   param-&gt;current_rd_5g, param-&gt;dfs_domain, param-&gt;pdev_id);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1073,7 +1196,7 @@ int ath11k_wmi_set_peer_param(struct ath11k *ar, const u8 *peer_addr,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI vdev %d peer 0x%pM set param %d value %d\n",</div><div class='add'>+		   "cmd peer set param vdev %d peer 0x%pM set param %d value %d\n",</div><div class='ctx'> 		   vdev_id, peer_addr, param_id, param_val);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1108,7 +1231,7 @@ int ath11k_wmi_send_peer_flush_tids_cmd(struct ath11k *ar,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI peer flush vdev_id %d peer_addr %pM tids %08x\n",</div><div class='add'>+		   "cmd peer flush tids vdev_id %d peer_addr %pM tids %08x\n",</div><div class='ctx'> 		   param-&gt;vdev_id, peer_addr, param-&gt;peer_tid_bitmap);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1151,7 +1274,7 @@ int ath11k_wmi_peer_rx_reorder_queue_setup(struct ath11k *ar,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "wmi rx reorder queue setup addr %pM vdev_id %d tid %d\n",</div><div class='add'>+		   "cmd peer reorder queue setup addr %pM vdev_id %d tid %d\n",</div><div class='ctx'> 		   addr, vdev_id, tid);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1179,10 +1302,6 @@ ath11k_wmi_rx_reord_queue_remove(struct ath11k *ar,</div><div class='ctx'> 	cmd-&gt;vdev_id = param-&gt;vdev_id;</div><div class='ctx'> 	cmd-&gt;tid_mask = param-&gt;peer_tid_bitmap;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "%s: peer_macaddr %pM vdev_id %d, tid_map %d", __func__,</div><div class='del'>-		   param-&gt;peer_macaddr, param-&gt;vdev_id, param-&gt;peer_tid_bitmap);</div><div class='del'>-</div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb,</div><div class='ctx'> 				  WMI_PEER_REORDER_QUEUE_REMOVE_CMDID);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -1191,6 +1310,10 @@ ath11k_wmi_rx_reord_queue_remove(struct ath11k *ar,</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd peer reorder queue remove peer_macaddr %pM vdev_id %d tid_map %d",</div><div class='add'>+		   param-&gt;peer_macaddr, param-&gt;vdev_id, param-&gt;peer_tid_bitmap);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1220,13 +1343,14 @@ int ath11k_wmi_pdev_set_param(struct ath11k *ar, u32 param_id,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI pdev set param %d pdev id %d value %d\n",</div><div class='add'>+		   "cmd pdev set param %d pdev id %d value %d\n",</div><div class='ctx'> 		   param_id, pdev_id, param_value);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath11k_wmi_pdev_set_ps_mode(struct ath11k *ar, int vdev_id, u32 enable)</div><div class='add'>+int ath11k_wmi_pdev_set_ps_mode(struct ath11k *ar, int vdev_id,</div><div class='add'>+				enum wmi_sta_ps_mode psmode)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_pdev_wmi *wmi = ar-&gt;wmi;</div><div class='ctx'> 	struct wmi_pdev_set_ps_mode_cmd *cmd;</div><div class='hunk'>@@ -1241,7 +1365,7 @@ int ath11k_wmi_pdev_set_ps_mode(struct ath11k *ar, int vdev_id, u32 enable)</div><div class='ctx'> 	cmd-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_STA_POWERSAVE_MODE_CMD) |</div><div class='ctx'> 			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='ctx'> 	cmd-&gt;vdev_id = vdev_id;</div><div class='del'>-	cmd-&gt;sta_ps_mode = enable;</div><div class='add'>+	cmd-&gt;sta_ps_mode = psmode;</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_STA_POWERSAVE_MODE_CMDID);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -1250,8 +1374,8 @@ int ath11k_wmi_pdev_set_ps_mode(struct ath11k *ar, int vdev_id, u32 enable)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI vdev set psmode %d vdev id %d\n",</div><div class='del'>-		   enable, vdev_id);</div><div class='add'>+		   "cmd sta powersave mode psmode %d vdev id %d\n",</div><div class='add'>+		   psmode, vdev_id);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1283,7 +1407,7 @@ int ath11k_wmi_pdev_suspend(struct ath11k *ar, u32 suspend_opt,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI pdev suspend pdev_id %d\n", pdev_id);</div><div class='add'>+		   "cmd pdev suspend pdev_id %d\n", pdev_id);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1305,15 +1429,15 @@ int ath11k_wmi_pdev_resume(struct ath11k *ar, u32 pdev_id)</div><div class='ctx'> 			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='ctx'> 	cmd-&gt;pdev_id = pdev_id;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI pdev resume pdev id %d\n", pdev_id);</div><div class='del'>-</div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_RESUME_CMDID);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab, "failed to send WMI_PDEV_RESUME cmd\n");</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd pdev resume pdev id %d\n", pdev_id);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1339,9 +1463,7 @@ int ath11k_wmi_pdev_bss_chan_info_request(struct ath11k *ar,</div><div class='ctx'> 				     WMI_TAG_PDEV_BSS_CHAN_INFO_REQUEST) |</div><div class='ctx'> 			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='ctx'> 	cmd-&gt;req_type = type;</div><div class='del'>-</div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI bss chan info req type %d\n", type);</div><div class='add'>+	cmd-&gt;pdev_id = ar-&gt;pdev-&gt;pdev_id;</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb,</div><div class='ctx'> 				  WMI_PDEV_BSS_CHAN_INFO_REQUEST_CMDID);</div><div class='hunk'>@@ -1351,6 +1473,9 @@ int ath11k_wmi_pdev_bss_chan_info_request(struct ath11k *ar,</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd pdev bss chan info request type %d\n", type);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1383,7 +1508,7 @@ int ath11k_wmi_send_set_ap_ps_param_cmd(struct ath11k *ar, u8 *peer_addr,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI set ap ps vdev id %d peer %pM param %d value %d\n",</div><div class='add'>+		   "cmd ap ps peer param vdev id %d peer %pM param %d value %d\n",</div><div class='ctx'> 		   param-&gt;vdev_id, peer_addr, param-&gt;param, param-&gt;value);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1410,16 +1535,16 @@ int ath11k_wmi_set_sta_ps_param(struct ath11k *ar, u32 vdev_id,</div><div class='ctx'> 	cmd-&gt;param = param;</div><div class='ctx'> 	cmd-&gt;value = param_value;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI set sta ps vdev_id %d param %d value %d\n",</div><div class='del'>-		   vdev_id, param, param_value);</div><div class='del'>-</div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_STA_POWERSAVE_PARAM_CMDID);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab, "failed to send WMI_STA_POWERSAVE_PARAM_CMDID");</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd set powersave param vdev_id %d param %d value %d\n",</div><div class='add'>+		   vdev_id, param, param_value);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1449,6 +1574,9 @@ int ath11k_wmi_force_fw_hang_cmd(struct ath11k *ar, u32 type, u32 delay_time_ms)</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab, "Failed to send WMI_FORCE_FW_HANG_CMDID");</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "cmd force fw hang");</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1480,7 +1608,7 @@ int ath11k_wmi_vdev_set_param_cmd(struct ath11k *ar, u32 vdev_id,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI vdev id 0x%x set param %d value %d\n",</div><div class='add'>+		   "cmd vdev set param vdev 0x%x param %d value %d\n",</div><div class='ctx'> 		   vdev_id, param_id, param_value);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1513,7 +1641,7 @@ int ath11k_wmi_send_stats_request_cmd(struct ath11k *ar,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI request stats 0x%x vdev id %d pdev id %d\n",</div><div class='add'>+		   "cmd request stats 0x%x vdev id %d pdev id %d\n",</div><div class='ctx'> 		   param-&gt;stats_id, param-&gt;vdev_id, param-&gt;pdev_id);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1542,7 +1670,7 @@ int ath11k_wmi_send_pdev_temperature_cmd(struct ath11k *ar)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI pdev get temperature for pdev_id %d\n", ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+		   "cmd pdev get temperature for pdev_id %d\n", ar-&gt;pdev-&gt;pdev_id);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1567,10 +1695,6 @@ int ath11k_wmi_send_bcn_offload_control_cmd(struct ath11k *ar,</div><div class='ctx'> 	cmd-&gt;vdev_id = vdev_id;</div><div class='ctx'> 	cmd-&gt;bcn_ctrl_op = bcn_ctrl_op;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI bcn ctrl offload vdev id %d ctrl_op %d\n",</div><div class='del'>-		   vdev_id, bcn_ctrl_op);</div><div class='del'>-</div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_BCN_OFFLOAD_CTRL_CMDID);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab,</div><div class='hunk'>@@ -1578,12 +1702,55 @@ int ath11k_wmi_send_bcn_offload_control_cmd(struct ath11k *ar,</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd bcn offload ctrl vdev id %d ctrl_op %d\n",</div><div class='add'>+		   vdev_id, bcn_ctrl_op);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_wmi_p2p_go_bcn_ie(struct ath11k *ar, u32 vdev_id,</div><div class='add'>+			     const u8 *p2p_ie)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_pdev_wmi *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_p2p_go_set_beacon_ie_cmd *cmd;</div><div class='add'>+	size_t p2p_ie_len, aligned_len;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret, len;</div><div class='add'>+</div><div class='add'>+	p2p_ie_len = p2p_ie[1] + 2;</div><div class='add'>+	aligned_len = roundup(p2p_ie_len, 4);</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd) + TLV_HDR_SIZE + aligned_len;</div><div class='add'>+</div><div class='add'>+	skb = ath11k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_p2p_go_set_beacon_ie_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_P2P_GO_SET_BEACON_IE) |</div><div class='add'>+			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='add'>+	cmd-&gt;vdev_id = vdev_id;</div><div class='add'>+	cmd-&gt;ie_buf_len = p2p_ie_len;</div><div class='add'>+</div><div class='add'>+	tlv = (struct wmi_tlv *)cmd-&gt;tlv;</div><div class='add'>+	tlv-&gt;header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) |</div><div class='add'>+		      FIELD_PREP(WMI_TLV_LEN, aligned_len);</div><div class='add'>+	memcpy(tlv-&gt;value, p2p_ie, p2p_ie_len);</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_P2P_GO_SET_BEACON_IE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to send WMI_P2P_GO_SET_BEACON_IE\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ath11k_wmi_bcn_tmpl(struct ath11k *ar, u32 vdev_id,</div><div class='ctx'> 			struct ieee80211_mutable_offsets *offs,</div><div class='del'>-			struct sk_buff *bcn)</div><div class='add'>+			struct sk_buff *bcn, u32 ema_params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_pdev_wmi *wmi = ar-&gt;wmi;</div><div class='ctx'> 	struct wmi_bcn_tmpl_cmd *cmd;</div><div class='hunk'>@@ -1593,6 +1760,15 @@ int ath11k_wmi_bcn_tmpl(struct ath11k *ar, u32 vdev_id,</div><div class='ctx'> 	void *ptr;</div><div class='ctx'> 	int ret, len;</div><div class='ctx'> 	size_t aligned_len = roundup(bcn-&gt;len, 4);</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct ath11k_vif *arvif = ath11k_mac_get_arvif(ar, vdev_id);</div><div class='add'>+</div><div class='add'>+	if (!arvif) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to find arvif with vdev id %d\n", vdev_id);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vif = arvif-&gt;vif;</div><div class='ctx'> </div><div class='ctx'> 	len = sizeof(*cmd) + sizeof(*bcn_prb_info) + TLV_HDR_SIZE + aligned_len;</div><div class='ctx'> </div><div class='hunk'>@@ -1605,9 +1781,15 @@ int ath11k_wmi_bcn_tmpl(struct ath11k *ar, u32 vdev_id,</div><div class='ctx'> 			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='ctx'> 	cmd-&gt;vdev_id = vdev_id;</div><div class='ctx'> 	cmd-&gt;tim_ie_offset = offs-&gt;tim_offset;</div><div class='del'>-	cmd-&gt;csa_switch_count_offset = offs-&gt;cntdwn_counter_offs[0];</div><div class='del'>-	cmd-&gt;ext_csa_switch_count_offset = offs-&gt;cntdwn_counter_offs[1];</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;bss_conf.csa_active) {</div><div class='add'>+		cmd-&gt;csa_switch_count_offset = offs-&gt;cntdwn_counter_offs[0];</div><div class='add'>+		cmd-&gt;ext_csa_switch_count_offset = offs-&gt;cntdwn_counter_offs[1];</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	cmd-&gt;buf_len = bcn-&gt;len;</div><div class='add'>+	cmd-&gt;mbssid_ie_offset = offs-&gt;mbssid_off;</div><div class='add'>+	cmd-&gt;ema_params = ema_params;</div><div class='ctx'> </div><div class='ctx'> 	ptr = skb-&gt;data + sizeof(*cmd);</div><div class='ctx'> </div><div class='hunk'>@@ -1632,6 +1814,8 @@ int ath11k_wmi_bcn_tmpl(struct ath11k *ar, u32 vdev_id,</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "cmd bcn tmpl");</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1670,7 +1854,8 @@ int ath11k_wmi_vdev_install_key(struct ath11k *ar,</div><div class='ctx'> 	tlv = (struct wmi_tlv *)(skb-&gt;data + sizeof(*cmd));</div><div class='ctx'> 	tlv-&gt;header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) |</div><div class='ctx'> 		      FIELD_PREP(WMI_TLV_LEN, key_len_aligned);</div><div class='del'>-	memcpy(tlv-&gt;value, (u8 *)arg-&gt;key_data, key_len_aligned);</div><div class='add'>+	if (arg-&gt;key_data)</div><div class='add'>+		memcpy(tlv-&gt;value, (u8 *)arg-&gt;key_data, key_len_aligned);</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_VDEV_INSTALL_KEY_CMDID);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -1680,7 +1865,7 @@ int ath11k_wmi_vdev_install_key(struct ath11k *ar,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI vdev install key idx %d cipher %d len %d\n",</div><div class='add'>+		   "cmd vdev install key idx %d cipher %d len %d\n",</div><div class='ctx'> 		   arg-&gt;key_idx, arg-&gt;key_cipher, arg-&gt;key_len);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1743,7 +1928,7 @@ ath11k_wmi_copy_peer_flags(struct wmi_peer_assoc_complete_cmd *cmd,</div><div class='ctx'> 		cmd-&gt;peer_flags |= WMI_PEER_AUTH;</div><div class='ctx'> 	if (param-&gt;need_ptk_4_way) {</div><div class='ctx'> 		cmd-&gt;peer_flags |= WMI_PEER_NEED_PTK_4_WAY;</div><div class='del'>-		if (!hw_crypto_disabled)</div><div class='add'>+		if (!hw_crypto_disabled &amp;&amp; param-&gt;is_assoc)</div><div class='ctx'> 			cmd-&gt;peer_flags &amp;= ~WMI_PEER_AUTH;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (param-&gt;need_gtk_2_way)</div><div class='hunk'>@@ -1876,10 +2061,13 @@ int ath11k_wmi_send_peer_assoc_cmd(struct ath11k *ar,</div><div class='ctx'> 	cmd-&gt;peer_bw_rxnss_override |= param-&gt;peer_bw_rxnss_override;</div><div class='ctx'> </div><div class='ctx'> 	if (param-&gt;vht_capable) {</div><div class='del'>-		mcs-&gt;rx_max_rate = param-&gt;rx_max_rate;</div><div class='del'>-		mcs-&gt;rx_mcs_set = param-&gt;rx_mcs_set;</div><div class='del'>-		mcs-&gt;tx_max_rate = param-&gt;tx_max_rate;</div><div class='del'>-		mcs-&gt;tx_mcs_set = param-&gt;tx_mcs_set;</div><div class='add'>+		/* firmware interprets mcs-&gt;tx_mcs_set field as peer's</div><div class='add'>+		 * RX capability</div><div class='add'>+		 */</div><div class='add'>+		mcs-&gt;tx_max_rate = param-&gt;rx_max_rate;</div><div class='add'>+		mcs-&gt;tx_mcs_set = param-&gt;rx_mcs_set;</div><div class='add'>+		mcs-&gt;rx_max_rate = param-&gt;tx_max_rate;</div><div class='add'>+		mcs-&gt;rx_mcs_set = param-&gt;tx_mcs_set;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* HE Rates */</div><div class='hunk'>@@ -1903,6 +2091,9 @@ int ath11k_wmi_send_peer_assoc_cmd(struct ath11k *ar,</div><div class='ctx'> 				     FIELD_PREP(WMI_TLV_LEN,</div><div class='ctx'> 						sizeof(*he_mcs) - TLV_HDR_SIZE);</div><div class='ctx'> </div><div class='add'>+		/* firmware interprets mcs-&gt;rx_mcs_set field as peer's</div><div class='add'>+		 * RX capability</div><div class='add'>+		 */</div><div class='ctx'> 		he_mcs-&gt;rx_mcs_set = param-&gt;peer_he_rx_mcs_set[i];</div><div class='ctx'> 		he_mcs-&gt;tx_mcs_set = param-&gt;peer_he_tx_mcs_set[i];</div><div class='ctx'> 		ptr += sizeof(*he_mcs);</div><div class='hunk'>@@ -1916,7 +2107,7 @@ int ath11k_wmi_send_peer_assoc_cmd(struct ath11k *ar,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "wmi peer assoc vdev id %d assoc id %d peer mac %pM peer_flags %x rate_caps %x peer_caps %x listen_intval %d ht_caps %x max_mpdu %d nss %d phymode %d peer_mpdu_density %d vht_caps %x he cap_info %x he ops %x he cap_info_ext %x he phy %x %x %x peer_bw_rxnss_override %x\n",</div><div class='add'>+		   "cmd peer assoc vdev id %d assoc id %d peer mac %pM peer_flags %x rate_caps %x peer_caps %x listen_intval %d ht_caps %x max_mpdu %d nss %d phymode %d peer_mpdu_density %d vht_caps %x he cap_info %x he ops %x he cap_info_ext %x he phy %x %x %x peer_bw_rxnss_override %x\n",</div><div class='ctx'> 		   cmd-&gt;vdev_id, cmd-&gt;peer_associd, param-&gt;peer_mac,</div><div class='ctx'> 		   cmd-&gt;peer_flags, cmd-&gt;peer_rate_caps, cmd-&gt;peer_caps,</div><div class='ctx'> 		   cmd-&gt;peer_listen_intval, cmd-&gt;peer_ht_caps,</div><div class='hunk'>@@ -1936,7 +2127,10 @@ void ath11k_wmi_start_scan_init(struct ath11k *ar,</div><div class='ctx'> {</div><div class='ctx'> 	/* setup commonly used values */</div><div class='ctx'> 	arg-&gt;scan_req_id = 1;</div><div class='del'>-	arg-&gt;scan_priority = WMI_SCAN_PRIORITY_LOW;</div><div class='add'>+	if (ar-&gt;state_11d == ATH11K_11D_PREPARING)</div><div class='add'>+		arg-&gt;scan_priority = WMI_SCAN_PRIORITY_MEDIUM;</div><div class='add'>+	else</div><div class='add'>+		arg-&gt;scan_priority = WMI_SCAN_PRIORITY_LOW;</div><div class='ctx'> 	arg-&gt;dwell_time_active = 50;</div><div class='ctx'> 	arg-&gt;dwell_time_active_2g = 0;</div><div class='ctx'> 	arg-&gt;dwell_time_passive = 150;</div><div class='hunk'>@@ -1954,7 +2148,13 @@ void ath11k_wmi_start_scan_init(struct ath11k *ar,</div><div class='ctx'> 				  WMI_SCAN_EVENT_BSS_CHANNEL |</div><div class='ctx'> 				  WMI_SCAN_EVENT_FOREIGN_CHAN |</div><div class='ctx'> 				  WMI_SCAN_EVENT_DEQUEUED;</div><div class='del'>-	arg-&gt;scan_flags |= WMI_SCAN_CHAN_STAT_EVENT;</div><div class='add'>+	arg-&gt;scan_f_chan_stat_evnt = 1;</div><div class='add'>+</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_PASSIVE_SCAN_START_TIME_ENHANCE,</div><div class='add'>+		     ar-&gt;ab-&gt;wmi_ab.svc_map))</div><div class='add'>+		arg-&gt;scan_ctrl_flags_ext |=</div><div class='add'>+			WMI_SCAN_FLAG_EXT_PASSIVE_SCAN_START_TIME_ENHANCE;</div><div class='add'>+</div><div class='ctx'> 	arg-&gt;num_bssid = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* fill bssid_list[0] with 0xff, otherwise bssid and RA will be</div><div class='hunk'>@@ -2036,6 +2236,8 @@ ath11k_wmi_copy_scan_event_cntrl_flags(struct wmi_start_scan_cmd *cmd,</div><div class='ctx'> 	/* for adaptive scan mode using 3 bits (21 - 23 bits) */</div><div class='ctx'> 	WMI_SCAN_SET_DWELL_MODE(cmd-&gt;scan_ctrl_flags,</div><div class='ctx'> 				param-&gt;adaptive_dwell_time_mode);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;scan_ctrl_flags_ext = param-&gt;scan_ctrl_flags_ext;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ath11k_wmi_send_scan_start_cmd(struct ath11k *ar,</div><div class='hunk'>@@ -2050,7 +2252,7 @@ int ath11k_wmi_send_scan_start_cmd(struct ath11k *ar,</div><div class='ctx'> 	void *ptr;</div><div class='ctx'> 	int i, ret, len;</div><div class='ctx'> 	u32 *tmp_ptr;</div><div class='del'>-	u8 extraie_len_with_pad = 0;</div><div class='add'>+	u16 extraie_len_with_pad = 0;</div><div class='ctx'> 	struct hint_short_ssid *s_ssid = NULL;</div><div class='ctx'> 	struct hint_bssid *hint_bssid = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -2069,7 +2271,7 @@ int ath11k_wmi_send_scan_start_cmd(struct ath11k *ar,</div><div class='ctx'> 		len += sizeof(*bssid) * params-&gt;num_bssid;</div><div class='ctx'> </div><div class='ctx'> 	len += TLV_HDR_SIZE;</div><div class='del'>-	if (params-&gt;extraie.len)</div><div class='add'>+	if (params-&gt;extraie.len &amp;&amp; params-&gt;extraie.len &lt;= 0xFFFF)</div><div class='ctx'> 		extraie_len_with_pad =</div><div class='ctx'> 			roundup(params-&gt;extraie.len, sizeof(u32));</div><div class='ctx'> 	len += extraie_len_with_pad;</div><div class='hunk'>@@ -2118,6 +2320,8 @@ int ath11k_wmi_send_scan_start_cmd(struct ath11k *ar,</div><div class='ctx'> 	cmd-&gt;num_ssids = params-&gt;num_ssids;</div><div class='ctx'> 	cmd-&gt;ie_len = params-&gt;extraie.len;</div><div class='ctx'> 	cmd-&gt;n_probes = params-&gt;n_probes;</div><div class='add'>+	ether_addr_copy(cmd-&gt;mac_addr.addr, params-&gt;mac_addr.addr);</div><div class='add'>+	ether_addr_copy(cmd-&gt;mac_mask.addr, params-&gt;mac_mask.addr);</div><div class='ctx'> </div><div class='ctx'> 	ptr += sizeof(*cmd);</div><div class='ctx'> </div><div class='hunk'>@@ -2127,7 +2331,7 @@ int ath11k_wmi_send_scan_start_cmd(struct ath11k *ar,</div><div class='ctx'> 	tlv-&gt;header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_UINT32) |</div><div class='ctx'> 		      FIELD_PREP(WMI_TLV_LEN, len);</div><div class='ctx'> 	ptr += TLV_HDR_SIZE;</div><div class='del'>-	tmp_ptr = (u32 *)ptr;</div><div class='add'>+	tmp_ptr = ptr;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; params-&gt;num_chan; ++i)</div><div class='ctx'> 		tmp_ptr[i] = params-&gt;chan_list[i];</div><div class='hunk'>@@ -2176,7 +2380,7 @@ int ath11k_wmi_send_scan_start_cmd(struct ath11k *ar,</div><div class='ctx'> 		      FIELD_PREP(WMI_TLV_LEN, len);</div><div class='ctx'> 	ptr += TLV_HDR_SIZE;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;extraie.len)</div><div class='add'>+	if (extraie_len_with_pad)</div><div class='ctx'> 		memcpy(ptr, params-&gt;extraie.ptr,</div><div class='ctx'> 		       params-&gt;extraie.len);</div><div class='ctx'> </div><div class='hunk'>@@ -2220,9 +2424,75 @@ int ath11k_wmi_send_scan_start_cmd(struct ath11k *ar,</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "cmd start scan");</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int ath11k_wmi_send_vdev_set_tpc_power(struct ath11k *ar,</div><div class='add'>+				       u32 vdev_id,</div><div class='add'>+				       struct ath11k_reg_tpc_power_info *param)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_pdev_wmi *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_vdev_set_tpc_power_cmd *cmd;</div><div class='add'>+	struct wmi_vdev_ch_power_info *ch;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	u8 *ptr;</div><div class='add'>+	int i, ret, len, array_len;</div><div class='add'>+</div><div class='add'>+	array_len = sizeof(*ch) * param-&gt;num_pwr_levels;</div><div class='add'>+	len = sizeof(*cmd) + TLV_HDR_SIZE + array_len;</div><div class='add'>+</div><div class='add'>+	skb = ath11k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ptr = skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_vdev_set_tpc_power_cmd *)ptr;</div><div class='add'>+	cmd-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_VDEV_SET_TPC_POWER_CMD) |</div><div class='add'>+			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='add'>+	cmd-&gt;vdev_id = vdev_id;</div><div class='add'>+	cmd-&gt;psd_power = param-&gt;is_psd_power;</div><div class='add'>+	cmd-&gt;eirp_power = param-&gt;eirp_power;</div><div class='add'>+	cmd-&gt;power_type_6ghz = param-&gt;ap_power_type;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "tpc vdev id %d is psd power %d eirp power %d 6 ghz power type %d\n",</div><div class='add'>+		   vdev_id, param-&gt;is_psd_power, param-&gt;eirp_power, param-&gt;ap_power_type);</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*cmd);</div><div class='add'>+	tlv = (struct wmi_tlv *)ptr;</div><div class='add'>+	tlv-&gt;header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) |</div><div class='add'>+		      FIELD_PREP(WMI_TLV_LEN, array_len);</div><div class='add'>+</div><div class='add'>+	ptr += TLV_HDR_SIZE;</div><div class='add'>+	ch = (struct wmi_vdev_ch_power_info *)ptr;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; param-&gt;num_pwr_levels; i++, ch++) {</div><div class='add'>+		ch-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG,</div><div class='add'>+					    WMI_TAG_VDEV_CH_POWER_INFO) |</div><div class='add'>+				FIELD_PREP(WMI_TLV_LEN,</div><div class='add'>+					   sizeof(*ch) - TLV_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+		ch-&gt;chan_cfreq = param-&gt;chan_power_info[i].chan_cfreq;</div><div class='add'>+		ch-&gt;tx_power = param-&gt;chan_power_info[i].tx_power;</div><div class='add'>+</div><div class='add'>+		ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "tpc chan freq %d TX power %d\n",</div><div class='add'>+			   ch-&gt;chan_cfreq, ch-&gt;tx_power);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_VDEV_SET_TPC_POWER_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to send WMI_VDEV_SET_TPC_POWER_CMDID\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int ath11k_wmi_send_scan_stop_cmd(struct ath11k *ar,</div><div class='ctx'> 				  struct scan_cancel_param *param)</div><div class='ctx'> {</div><div class='hunk'>@@ -2268,6 +2538,8 @@ int ath11k_wmi_send_scan_stop_cmd(struct ath11k *ar,</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "cmd stop scan");</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2285,7 +2557,7 @@ int ath11k_wmi_send_scan_chan_list_cmd(struct ath11k *ar,</div><div class='ctx'> 	u16 num_send_chans, num_sends = 0, max_chan_limit = 0;</div><div class='ctx'> 	u32 *reg1, *reg2;</div><div class='ctx'> </div><div class='del'>-	tchan_info = &amp;chan_list-&gt;ch_param[0];</div><div class='add'>+	tchan_info = chan_list-&gt;ch_param;</div><div class='ctx'> 	while (chan_list-&gt;nallchans) {</div><div class='ctx'> 		len = sizeof(*cmd) + TLV_HDR_SIZE;</div><div class='ctx'> 		max_chan_limit = (wmi-&gt;wmi_ab-&gt;max_msg_len[ar-&gt;pdev_idx] - len) /</div><div class='hunk'>@@ -2312,7 +2584,7 @@ int ath11k_wmi_send_scan_chan_list_cmd(struct ath11k *ar,</div><div class='ctx'> 			cmd-&gt;flags |= WMI_APPEND_TO_EXISTING_CHAN_LIST_FLAG;</div><div class='ctx'> </div><div class='ctx'> 		ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-			   "WMI no.of chan = %d len = %d pdev_id = %d num_sends = %d\n",</div><div class='add'>+			   "no.of chan = %d len = %d pdev_id = %d num_sends = %d\n",</div><div class='ctx'> 			   num_send_chans, len, cmd-&gt;pdev_id, num_sends);</div><div class='ctx'> </div><div class='ctx'> 		ptr = skb-&gt;data + sizeof(*cmd);</div><div class='hunk'>@@ -2352,6 +2624,8 @@ int ath11k_wmi_send_scan_chan_list_cmd(struct ath11k *ar,</div><div class='ctx'> 				chan_info-&gt;info |= WMI_CHAN_INFO_QUARTER_RATE;</div><div class='ctx'> 			if (tchan_info-&gt;psc_channel)</div><div class='ctx'> 				chan_info-&gt;info |= WMI_CHAN_INFO_PSC;</div><div class='add'>+			if (tchan_info-&gt;dfs_set)</div><div class='add'>+				chan_info-&gt;info |= WMI_CHAN_INFO_DFS;</div><div class='ctx'> </div><div class='ctx'> 			chan_info-&gt;info |= FIELD_PREP(WMI_CHAN_INFO_MODE,</div><div class='ctx'> 						      tchan_info-&gt;phy_mode);</div><div class='hunk'>@@ -2365,9 +2639,11 @@ int ath11k_wmi_send_scan_chan_list_cmd(struct ath11k *ar,</div><div class='ctx'> 					    tchan_info-&gt;reg_class_id);</div><div class='ctx'> 			*reg2 |= FIELD_PREP(WMI_CHAN_REG_INFO2_ANT_MAX,</div><div class='ctx'> 					    tchan_info-&gt;antennamax);</div><div class='add'>+			*reg2 |= FIELD_PREP(WMI_CHAN_REG_INFO2_MAX_TX_PWR,</div><div class='add'>+					    tchan_info-&gt;maxregpower);</div><div class='ctx'> </div><div class='ctx'> 			ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-				   "WMI chan scan list chan[%d] = %u, chan_info-&gt;info %8x\n",</div><div class='add'>+				   "chan scan list chan[%d] = %u, chan_info-&gt;info %8x\n",</div><div class='ctx'> 				   i, chan_info-&gt;mhz, chan_info-&gt;info);</div><div class='ctx'> </div><div class='ctx'> 			ptr += sizeof(*chan_info);</div><div class='hunk'>@@ -2382,6 +2658,9 @@ int ath11k_wmi_send_scan_chan_list_cmd(struct ath11k *ar,</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "cmd scan chan list channels %d",</div><div class='add'>+			   num_send_chans);</div><div class='add'>+</div><div class='ctx'> 		num_sends++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2389,7 +2668,8 @@ int ath11k_wmi_send_scan_chan_list_cmd(struct ath11k *ar,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ath11k_wmi_send_wmm_update_cmd_tlv(struct ath11k *ar, u32 vdev_id,</div><div class='del'>-				       struct wmi_wmm_params_all_arg *param)</div><div class='add'>+				       struct wmi_wmm_params_all_arg *param,</div><div class='add'>+				       enum wmi_wmm_params_type wmm_param_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_pdev_wmi *wmi = ar-&gt;wmi;</div><div class='ctx'> 	struct wmi_vdev_set_wmm_params_cmd *cmd;</div><div class='hunk'>@@ -2408,7 +2688,7 @@ int ath11k_wmi_send_wmm_update_cmd_tlv(struct ath11k *ar, u32 vdev_id,</div><div class='ctx'> 			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;vdev_id = vdev_id;</div><div class='del'>-	cmd-&gt;wmm_param_type = 0;</div><div class='add'>+	cmd-&gt;wmm_param_type = wmm_param_type;</div><div class='ctx'> </div><div class='ctx'> 	for (ac = 0; ac &lt; WME_NUM_AC; ac++) {</div><div class='ctx'> 		switch (ac) {</div><div class='hunk'>@@ -2441,8 +2721,8 @@ int ath11k_wmi_send_wmm_update_cmd_tlv(struct ath11k *ar, u32 vdev_id,</div><div class='ctx'> 		wmm_param-&gt;no_ack = wmi_wmm_arg-&gt;no_ack;</div><div class='ctx'> </div><div class='ctx'> 		ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-			   "wmi wmm set ac %d aifs %d cwmin %d cwmax %d txop %d acm %d no_ack %d\n",</div><div class='del'>-			   ac, wmm_param-&gt;aifs, wmm_param-&gt;cwmin,</div><div class='add'>+			   "wmm set type %d ac %d aifs %d cwmin %d cwmax %d txop %d acm %d no_ack %d\n",</div><div class='add'>+			   wmm_param_type, ac, wmm_param-&gt;aifs, wmm_param-&gt;cwmin,</div><div class='ctx'> 			   wmm_param-&gt;cwmax, wmm_param-&gt;txoplimit,</div><div class='ctx'> 			   wmm_param-&gt;acm, wmm_param-&gt;no_ack);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2454,6 +2734,8 @@ int ath11k_wmi_send_wmm_update_cmd_tlv(struct ath11k *ar, u32 vdev_id,</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "cmd vdev set wmm params");</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2477,9 +2759,6 @@ int ath11k_wmi_send_dfs_phyerr_offload_enable_cmd(struct ath11k *ar,</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;pdev_id = pdev_id;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI dfs phy err offload enable pdev id %d\n", pdev_id);</div><div class='del'>-</div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb,</div><div class='ctx'> 				  WMI_PDEV_DFS_PHYERR_OFFLOAD_ENABLE_CMDID);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -2488,6 +2767,9 @@ int ath11k_wmi_send_dfs_phyerr_offload_enable_cmd(struct ath11k *ar,</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd pdev dfs phyerr offload enable pdev id %d\n", pdev_id);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2512,10 +2794,6 @@ int ath11k_wmi_delba_send(struct ath11k *ar, u32 vdev_id, const u8 *mac,</div><div class='ctx'> 	cmd-&gt;initiator = initiator;</div><div class='ctx'> 	cmd-&gt;reasoncode = reason;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "wmi delba send vdev_id 0x%X mac_addr %pM tid %u initiator %u reason %u\n",</div><div class='del'>-		   vdev_id, mac, tid, initiator, reason);</div><div class='del'>-</div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_DELBA_SEND_CMDID);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -2524,6 +2802,10 @@ int ath11k_wmi_delba_send(struct ath11k *ar, u32 vdev_id, const u8 *mac,</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd delba send vdev_id 0x%X mac_addr %pM tid %u initiator %u reason %u\n",</div><div class='add'>+		   vdev_id, mac, tid, initiator, reason);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2548,10 +2830,6 @@ int ath11k_wmi_addba_set_resp(struct ath11k *ar, u32 vdev_id, const u8 *mac,</div><div class='ctx'> 	cmd-&gt;tid = tid;</div><div class='ctx'> 	cmd-&gt;statuscode = status;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "wmi addba set resp vdev_id 0x%X mac_addr %pM tid %u status %u\n",</div><div class='del'>-		   vdev_id, mac, tid, status);</div><div class='del'>-</div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_ADDBA_SET_RESP_CMDID);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -2560,6 +2838,10 @@ int ath11k_wmi_addba_set_resp(struct ath11k *ar, u32 vdev_id, const u8 *mac,</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd addba set resp vdev_id 0x%X mac_addr %pM tid %u status %u\n",</div><div class='add'>+		   vdev_id, mac, tid, status);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2583,10 +2865,6 @@ int ath11k_wmi_addba_send(struct ath11k *ar, u32 vdev_id, const u8 *mac,</div><div class='ctx'> 	cmd-&gt;tid = tid;</div><div class='ctx'> 	cmd-&gt;buffersize = buf_size;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "wmi addba send vdev_id 0x%X mac_addr %pM tid %u bufsize %u\n",</div><div class='del'>-		   vdev_id, mac, tid, buf_size);</div><div class='del'>-</div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_ADDBA_SEND_CMDID);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -2595,6 +2873,10 @@ int ath11k_wmi_addba_send(struct ath11k *ar, u32 vdev_id, const u8 *mac,</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd addba send vdev_id 0x%X mac_addr %pM tid %u bufsize %u\n",</div><div class='add'>+		   vdev_id, mac, tid, buf_size);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2616,10 +2898,6 @@ int ath11k_wmi_addba_clear_resp(struct ath11k *ar, u32 vdev_id, const u8 *mac)</div><div class='ctx'> 	cmd-&gt;vdev_id = vdev_id;</div><div class='ctx'> 	ether_addr_copy(cmd-&gt;peer_macaddr.addr, mac);</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "wmi addba clear resp vdev_id 0x%X mac_addr %pM\n",</div><div class='del'>-		   vdev_id, mac);</div><div class='del'>-</div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_ADDBA_CLEAR_RESP_CMDID);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -2628,6 +2906,10 @@ int ath11k_wmi_addba_clear_resp(struct ath11k *ar, u32 vdev_id, const u8 *mac)</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd addba clear resp vdev_id 0x%X mac_addr %pM\n",</div><div class='add'>+		   vdev_id, mac);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2676,6 +2958,8 @@ int ath11k_wmi_pdev_peer_pktlog_filter(struct ath11k *ar, u8 *addr, u8 enable)</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "cmd pdev pktlog filter");</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2715,21 +2999,63 @@ ath11k_wmi_send_init_country_cmd(struct ath11k *ar,</div><div class='ctx'> 		cmd-&gt;cc_info.regdom_id = init_cc_params.cc_info.regdom_id;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "unknown cc params flags: 0x%x",</div><div class='add'>+			    init_cc_params.flags);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb,</div><div class='ctx'> 				  WMI_SET_INIT_COUNTRY_CMDID);</div><div class='del'>-</div><div class='del'>-out:</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab,</div><div class='ctx'> 			    "failed to send WMI_SET_INIT_COUNTRY CMD :%d\n",</div><div class='ctx'> 			    ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "cmd set init country");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_wmi_send_set_current_country_cmd(struct ath11k *ar,</div><div class='add'>+					    struct wmi_set_current_country_params *param)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_pdev_wmi *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_set_current_country_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath11k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_set_current_country_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header =</div><div class='add'>+		FIELD_PREP(WMI_TLV_TAG, WMI_TAG_SET_CURRENT_COUNTRY_CMD) |</div><div class='add'>+		FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;pdev_id = ar-&gt;pdev-&gt;pdev_id;</div><div class='add'>+	memcpy(&amp;cmd-&gt;new_alpha2, &amp;param-&gt;alpha2, 3);</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_SET_CURRENT_COUNTRY_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_SET_CURRENT_COUNTRY_CMDID: %d\n", ret);</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd set current country pdev id %d alpha2 %c%c\n",</div><div class='add'>+		   ar-&gt;pdev-&gt;pdev_id,</div><div class='add'>+		   param-&gt;alpha2[0],</div><div class='add'>+		   param-&gt;alpha2[1]);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2790,13 +3116,82 @@ ath11k_wmi_send_thermal_mitigation_param_cmd(struct ath11k *ar,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI vdev set thermal throt pdev_id %d enable %d dc %d dc_per_event %x levels %d\n",</div><div class='add'>+		   "cmd therm throt set conf pdev_id %d enable %d dc %d dc_per_event %x levels %d\n",</div><div class='ctx'> 		   ar-&gt;pdev-&gt;pdev_id, param-&gt;enable, param-&gt;dc,</div><div class='ctx'> 		   param-&gt;dc_per_event, THERMAL_LEVELS);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int ath11k_wmi_send_11d_scan_start_cmd(struct ath11k *ar,</div><div class='add'>+				       struct wmi_11d_scan_start_params *param)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_pdev_wmi *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_11d_scan_start_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath11k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_11d_scan_start_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header =</div><div class='add'>+		FIELD_PREP(WMI_TLV_TAG, WMI_TAG_11D_SCAN_START_CMD) |</div><div class='add'>+		FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = param-&gt;vdev_id;</div><div class='add'>+	cmd-&gt;scan_period_msec = param-&gt;scan_period_msec;</div><div class='add'>+	cmd-&gt;start_interval_msec = param-&gt;start_interval_msec;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_11D_SCAN_START_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_11D_SCAN_START_CMDID: %d\n", ret);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd 11d scan start vdev id %d period %d ms internal %d ms\n",</div><div class='add'>+		   cmd-&gt;vdev_id,</div><div class='add'>+		   cmd-&gt;scan_period_msec,</div><div class='add'>+		   cmd-&gt;start_interval_msec);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_wmi_send_11d_scan_stop_cmd(struct ath11k *ar, u32 vdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_pdev_wmi *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_11d_scan_stop_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath11k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_11d_scan_stop_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header =</div><div class='add'>+		FIELD_PREP(WMI_TLV_TAG, WMI_TAG_11D_SCAN_STOP_CMD) |</div><div class='add'>+		FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = vdev_id;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_11D_SCAN_STOP_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_11D_SCAN_STOP_CMDID: %d\n", ret);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd 11d scan stop vdev id %d\n",</div><div class='add'>+		   cmd-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int ath11k_wmi_pdev_pktlog_enable(struct ath11k *ar, u32 pktlog_filter)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_pdev_wmi *wmi = ar-&gt;wmi;</div><div class='hunk'>@@ -2824,6 +3219,8 @@ int ath11k_wmi_pdev_pktlog_enable(struct ath11k *ar, u32 pktlog_filter)</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "cmd pdev pktlog enable");</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2852,11 +3249,39 @@ int ath11k_wmi_pdev_pktlog_disable(struct ath11k *ar)</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "cmd pdev pktlog disable");</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int</div><div class='del'>-ath11k_wmi_send_twt_enable_cmd(struct ath11k *ar, u32 pdev_id)</div><div class='add'>+void ath11k_wmi_fill_default_twt_params(struct wmi_twt_enable_params *twt_params)</div><div class='add'>+{</div><div class='add'>+	twt_params-&gt;sta_cong_timer_ms = ATH11K_TWT_DEF_STA_CONG_TIMER_MS;</div><div class='add'>+	twt_params-&gt;default_slot_size = ATH11K_TWT_DEF_DEFAULT_SLOT_SIZE;</div><div class='add'>+	twt_params-&gt;congestion_thresh_setup = ATH11K_TWT_DEF_CONGESTION_THRESH_SETUP;</div><div class='add'>+	twt_params-&gt;congestion_thresh_teardown =</div><div class='add'>+		ATH11K_TWT_DEF_CONGESTION_THRESH_TEARDOWN;</div><div class='add'>+	twt_params-&gt;congestion_thresh_critical =</div><div class='add'>+		ATH11K_TWT_DEF_CONGESTION_THRESH_CRITICAL;</div><div class='add'>+	twt_params-&gt;interference_thresh_teardown =</div><div class='add'>+		ATH11K_TWT_DEF_INTERFERENCE_THRESH_TEARDOWN;</div><div class='add'>+	twt_params-&gt;interference_thresh_setup =</div><div class='add'>+		ATH11K_TWT_DEF_INTERFERENCE_THRESH_SETUP;</div><div class='add'>+	twt_params-&gt;min_no_sta_setup = ATH11K_TWT_DEF_MIN_NO_STA_SETUP;</div><div class='add'>+	twt_params-&gt;min_no_sta_teardown = ATH11K_TWT_DEF_MIN_NO_STA_TEARDOWN;</div><div class='add'>+	twt_params-&gt;no_of_bcast_mcast_slots = ATH11K_TWT_DEF_NO_OF_BCAST_MCAST_SLOTS;</div><div class='add'>+	twt_params-&gt;min_no_twt_slots = ATH11K_TWT_DEF_MIN_NO_TWT_SLOTS;</div><div class='add'>+	twt_params-&gt;max_no_sta_twt = ATH11K_TWT_DEF_MAX_NO_STA_TWT;</div><div class='add'>+	twt_params-&gt;mode_check_interval = ATH11K_TWT_DEF_MODE_CHECK_INTERVAL;</div><div class='add'>+	twt_params-&gt;add_sta_slot_interval = ATH11K_TWT_DEF_ADD_STA_SLOT_INTERVAL;</div><div class='add'>+	twt_params-&gt;remove_sta_slot_interval =</div><div class='add'>+		ATH11K_TWT_DEF_REMOVE_STA_SLOT_INTERVAL;</div><div class='add'>+	/* TODO add MBSSID support */</div><div class='add'>+	twt_params-&gt;mbss_support = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_wmi_send_twt_enable_cmd(struct ath11k *ar, u32 pdev_id,</div><div class='add'>+				   struct wmi_twt_enable_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k_pdev_wmi *wmi = ar-&gt;wmi;</div><div class='ctx'> 	struct ath11k_base *ab = wmi-&gt;wmi_ab-&gt;ab;</div><div class='hunk'>@@ -2874,36 +3299,35 @@ ath11k_wmi_send_twt_enable_cmd(struct ath11k *ar, u32 pdev_id)</div><div class='ctx'> 	cmd-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_TWT_ENABLE_CMD) |</div><div class='ctx'> 			  FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE);</div><div class='ctx'> 	cmd-&gt;pdev_id = pdev_id;</div><div class='del'>-	cmd-&gt;sta_cong_timer_ms = ATH11K_TWT_DEF_STA_CONG_TIMER_MS;</div><div class='del'>-	cmd-&gt;default_slot_size = ATH11K_TWT_DEF_DEFAULT_SLOT_SIZE;</div><div class='del'>-	cmd-&gt;congestion_thresh_setup = ATH11K_TWT_DEF_CONGESTION_THRESH_SETUP;</div><div class='del'>-	cmd-&gt;congestion_thresh_teardown =</div><div class='del'>-		ATH11K_TWT_DEF_CONGESTION_THRESH_TEARDOWN;</div><div class='del'>-	cmd-&gt;congestion_thresh_critical =</div><div class='del'>-		ATH11K_TWT_DEF_CONGESTION_THRESH_CRITICAL;</div><div class='del'>-	cmd-&gt;interference_thresh_teardown =</div><div class='del'>-		ATH11K_TWT_DEF_INTERFERENCE_THRESH_TEARDOWN;</div><div class='del'>-	cmd-&gt;interference_thresh_setup =</div><div class='del'>-		ATH11K_TWT_DEF_INTERFERENCE_THRESH_SETUP;</div><div class='del'>-	cmd-&gt;min_no_sta_setup = ATH11K_TWT_DEF_MIN_NO_STA_SETUP;</div><div class='del'>-	cmd-&gt;min_no_sta_teardown = ATH11K_TWT_DEF_MIN_NO_STA_TEARDOWN;</div><div class='del'>-	cmd-&gt;no_of_bcast_mcast_slots = ATH11K_TWT_DEF_NO_OF_BCAST_MCAST_SLOTS;</div><div class='del'>-	cmd-&gt;min_no_twt_slots = ATH11K_TWT_DEF_MIN_NO_TWT_SLOTS;</div><div class='del'>-	cmd-&gt;max_no_sta_twt = ATH11K_TWT_DEF_MAX_NO_STA_TWT;</div><div class='del'>-	cmd-&gt;mode_check_interval = ATH11K_TWT_DEF_MODE_CHECK_INTERVAL;</div><div class='del'>-	cmd-&gt;add_sta_slot_interval = ATH11K_TWT_DEF_ADD_STA_SLOT_INTERVAL;</div><div class='del'>-	cmd-&gt;remove_sta_slot_interval =</div><div class='del'>-		ATH11K_TWT_DEF_REMOVE_STA_SLOT_INTERVAL;</div><div class='del'>-	/* TODO add MBSSID support */</div><div class='del'>-	cmd-&gt;mbss_support = 0;</div><div class='del'>-</div><div class='del'>-	ret = ath11k_wmi_cmd_send(wmi, skb,</div><div class='del'>-				  WMI_TWT_ENABLE_CMDID);</div><div class='add'>+	cmd-&gt;sta_cong_timer_ms = params-&gt;sta_cong_timer_ms;</div><div class='add'>+	cmd-&gt;default_slot_size = params-&gt;default_slot_size;</div><div class='add'>+	cmd-&gt;congestion_thresh_setup = params-&gt;congestion_thresh_setup;</div><div class='add'>+	cmd-&gt;congestion_thresh_teardown = params-&gt;congestion_thresh_teardown;</div><div class='add'>+	cmd-&gt;congestion_thresh_critical = params-&gt;congestion_thresh_critical;</div><div class='add'>+	cmd-&gt;interference_thresh_teardown = params-&gt;interference_thresh_teardown;</div><div class='add'>+	cmd-&gt;interference_thresh_setup = params-&gt;interference_thresh_setup;</div><div class='add'>+	cmd-&gt;min_no_sta_setup = params-&gt;min_no_sta_setup;</div><div class='add'>+	cmd-&gt;min_no_sta_teardown = params-&gt;min_no_sta_teardown;</div><div class='add'>+	cmd-&gt;no_of_bcast_mcast_slots = params-&gt;no_of_bcast_mcast_slots;</div><div class='add'>+	cmd-&gt;min_no_twt_slots = params-&gt;min_no_twt_slots;</div><div class='add'>+	cmd-&gt;max_no_sta_twt = params-&gt;max_no_sta_twt;</div><div class='add'>+	cmd-&gt;mode_check_interval = params-&gt;mode_check_interval;</div><div class='add'>+	cmd-&gt;add_sta_slot_interval = params-&gt;add_sta_slot_interval;</div><div class='add'>+	cmd-&gt;remove_sta_slot_interval = params-&gt;remove_sta_slot_interval;</div><div class='add'>+	cmd-&gt;mbss_support = params-&gt;mbss_support;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_TWT_ENABLE_CMDID);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ab, "Failed to send WMI_TWT_ENABLE_CMDID");</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+	ar-&gt;twt_enabled = 1;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "cmd twt enable");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='hunk'>@@ -2926,13 +3350,194 @@ ath11k_wmi_send_twt_disable_cmd(struct ath11k *ar, u32 pdev_id)</div><div class='ctx'> 			  FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE);</div><div class='ctx'> 	cmd-&gt;pdev_id = pdev_id;</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_wmi_cmd_send(wmi, skb,</div><div class='del'>-				  WMI_TWT_DISABLE_CMDID);</div><div class='add'>+	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_TWT_DISABLE_CMDID);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ab, "Failed to send WMI_TWT_DISABLE_CMDID");</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "cmd twt disable");</div><div class='add'>+</div><div class='add'>+	ar-&gt;twt_enabled = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_wmi_send_twt_add_dialog_cmd(struct ath11k *ar,</div><div class='add'>+				       struct wmi_twt_add_dialog_params *params)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_pdev_wmi *wmi = ar-&gt;wmi;</div><div class='add'>+	struct ath11k_base *ab = wmi-&gt;wmi_ab-&gt;ab;</div><div class='add'>+	struct wmi_twt_add_dialog_params_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret, len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	skb = ath11k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_twt_add_dialog_params_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_TWT_ADD_DIALOG_CMD) |</div><div class='add'>+			  FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = params-&gt;vdev_id;</div><div class='add'>+	ether_addr_copy(cmd-&gt;peer_macaddr.addr, params-&gt;peer_macaddr);</div><div class='add'>+	cmd-&gt;dialog_id = params-&gt;dialog_id;</div><div class='add'>+	cmd-&gt;wake_intvl_us = params-&gt;wake_intvl_us;</div><div class='add'>+	cmd-&gt;wake_intvl_mantis = params-&gt;wake_intvl_mantis;</div><div class='add'>+	cmd-&gt;wake_dura_us = params-&gt;wake_dura_us;</div><div class='add'>+	cmd-&gt;sp_offset_us = params-&gt;sp_offset_us;</div><div class='add'>+	cmd-&gt;flags = params-&gt;twt_cmd;</div><div class='add'>+	if (params-&gt;flag_bcast)</div><div class='add'>+		cmd-&gt;flags |= WMI_TWT_ADD_DIALOG_FLAG_BCAST;</div><div class='add'>+	if (params-&gt;flag_trigger)</div><div class='add'>+		cmd-&gt;flags |= WMI_TWT_ADD_DIALOG_FLAG_TRIGGER;</div><div class='add'>+	if (params-&gt;flag_flow_type)</div><div class='add'>+		cmd-&gt;flags |= WMI_TWT_ADD_DIALOG_FLAG_FLOW_TYPE;</div><div class='add'>+	if (params-&gt;flag_protection)</div><div class='add'>+		cmd-&gt;flags |= WMI_TWT_ADD_DIALOG_FLAG_PROTECTION;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_TWT_ADD_DIALOG_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab,</div><div class='add'>+			    "failed to send wmi command to add twt dialog: %d",</div><div class='add'>+			    ret);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd twt add dialog vdev %u dialog id %u wake interval %u mantissa %u wake duration %u service period offset %u flags 0x%x\n",</div><div class='add'>+		   cmd-&gt;vdev_id, cmd-&gt;dialog_id, cmd-&gt;wake_intvl_us,</div><div class='add'>+		   cmd-&gt;wake_intvl_mantis, cmd-&gt;wake_dura_us, cmd-&gt;sp_offset_us,</div><div class='add'>+		   cmd-&gt;flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_wmi_send_twt_del_dialog_cmd(struct ath11k *ar,</div><div class='add'>+				       struct wmi_twt_del_dialog_params *params)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_pdev_wmi *wmi = ar-&gt;wmi;</div><div class='add'>+	struct ath11k_base *ab = wmi-&gt;wmi_ab-&gt;ab;</div><div class='add'>+	struct wmi_twt_del_dialog_params_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret, len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	skb = ath11k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_twt_del_dialog_params_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_TWT_DEL_DIALOG_CMD) |</div><div class='add'>+			  FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = params-&gt;vdev_id;</div><div class='add'>+	ether_addr_copy(cmd-&gt;peer_macaddr.addr, params-&gt;peer_macaddr);</div><div class='add'>+	cmd-&gt;dialog_id = params-&gt;dialog_id;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_TWT_DEL_DIALOG_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab,</div><div class='add'>+			    "failed to send wmi command to delete twt dialog: %d",</div><div class='add'>+			    ret);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd twt del dialog vdev %u dialog id %u\n",</div><div class='add'>+		   cmd-&gt;vdev_id, cmd-&gt;dialog_id);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_wmi_send_twt_pause_dialog_cmd(struct ath11k *ar,</div><div class='add'>+					 struct wmi_twt_pause_dialog_params *params)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_pdev_wmi *wmi = ar-&gt;wmi;</div><div class='add'>+	struct ath11k_base *ab = wmi-&gt;wmi_ab-&gt;ab;</div><div class='add'>+	struct wmi_twt_pause_dialog_params_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret, len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	skb = ath11k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_twt_pause_dialog_params_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG,</div><div class='add'>+				     WMI_TAG_TWT_PAUSE_DIALOG_CMD) |</div><div class='add'>+			  FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = params-&gt;vdev_id;</div><div class='add'>+	ether_addr_copy(cmd-&gt;peer_macaddr.addr, params-&gt;peer_macaddr);</div><div class='add'>+	cmd-&gt;dialog_id = params-&gt;dialog_id;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_TWT_PAUSE_DIALOG_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab,</div><div class='add'>+			    "failed to send wmi command to pause twt dialog: %d",</div><div class='add'>+			    ret);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd twt pause dialog vdev %u dialog id %u\n",</div><div class='add'>+		   cmd-&gt;vdev_id, cmd-&gt;dialog_id);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_wmi_send_twt_resume_dialog_cmd(struct ath11k *ar,</div><div class='add'>+					  struct wmi_twt_resume_dialog_params *params)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_pdev_wmi *wmi = ar-&gt;wmi;</div><div class='add'>+	struct ath11k_base *ab = wmi-&gt;wmi_ab-&gt;ab;</div><div class='add'>+	struct wmi_twt_resume_dialog_params_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret, len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	skb = ath11k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_twt_resume_dialog_params_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG,</div><div class='add'>+				     WMI_TAG_TWT_RESUME_DIALOG_CMD) |</div><div class='add'>+			  FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = params-&gt;vdev_id;</div><div class='add'>+	ether_addr_copy(cmd-&gt;peer_macaddr.addr, params-&gt;peer_macaddr);</div><div class='add'>+	cmd-&gt;dialog_id = params-&gt;dialog_id;</div><div class='add'>+	cmd-&gt;sp_offset_us = params-&gt;sp_offset_us;</div><div class='add'>+	cmd-&gt;next_twt_size = params-&gt;next_twt_size;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_TWT_RESUME_DIALOG_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab,</div><div class='add'>+			    "failed to send wmi command to resume twt dialog: %d",</div><div class='add'>+			    ret);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd twt resume dialog vdev %u dialog id %u service period offset %u next twt subfield size %u\n",</div><div class='add'>+		   cmd-&gt;vdev_id, cmd-&gt;dialog_id, cmd-&gt;sp_offset_us,</div><div class='add'>+		   cmd-&gt;next_twt_size);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='hunk'>@@ -2966,8 +3571,12 @@ ath11k_wmi_send_obss_spr_cmd(struct ath11k *ar, u32 vdev_id,</div><div class='ctx'> 		ath11k_warn(ab,</div><div class='ctx'> 			    "Failed to send WMI_PDEV_OBSS_PD_SPATIAL_REUSE_CMDID");</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "cmd pdev obss pd spatial reuse");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='hunk'>@@ -2992,19 +3601,20 @@ ath11k_wmi_pdev_set_srg_bss_color_bitmap(struct ath11k *ar, u32 *bitmap)</div><div class='ctx'> 	cmd-&gt;pdev_id = ar-&gt;pdev-&gt;pdev_id;</div><div class='ctx'> 	memcpy(cmd-&gt;bitmap, bitmap, sizeof(cmd-&gt;bitmap));</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "obss pd pdev_id %d bss color bitmap %08x %08x\n",</div><div class='del'>-		   cmd-&gt;pdev_id, cmd-&gt;bitmap[0], cmd-&gt;bitmap[1]);</div><div class='del'>-</div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb,</div><div class='ctx'> 				  WMI_PDEV_SET_SRG_BSS_COLOR_BITMAP_CMDID);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ab,</div><div class='ctx'> 			    "failed to send WMI_PDEV_SET_SRG_BSS_COLOR_BITMAP_CMDID");</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd pdev set srg bss color bitmap pdev_id %d bss color bitmap %08x %08x\n",</div><div class='add'>+		   cmd-&gt;pdev_id, cmd-&gt;bitmap[0], cmd-&gt;bitmap[1]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='hunk'>@@ -3030,19 +3640,20 @@ ath11k_wmi_pdev_set_srg_patial_bssid_bitmap(struct ath11k *ar, u32 *bitmap)</div><div class='ctx'> 	cmd-&gt;pdev_id = ar-&gt;pdev-&gt;pdev_id;</div><div class='ctx'> 	memcpy(cmd-&gt;bitmap, bitmap, sizeof(cmd-&gt;bitmap));</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "obss pd pdev_id %d partial bssid bitmap %08x %08x\n",</div><div class='del'>-		   cmd-&gt;pdev_id, cmd-&gt;bitmap[0], cmd-&gt;bitmap[1]);</div><div class='del'>-</div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb,</div><div class='ctx'> 				  WMI_PDEV_SET_SRG_PARTIAL_BSSID_BITMAP_CMDID);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ab,</div><div class='ctx'> 			    "failed to send WMI_PDEV_SET_SRG_PARTIAL_BSSID_BITMAP_CMDID");</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd pdev set srg partial bssid bitmap pdev_id %d partial bssid bitmap %08x %08x\n",</div><div class='add'>+		   cmd-&gt;pdev_id, cmd-&gt;bitmap[0], cmd-&gt;bitmap[1]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='hunk'>@@ -3068,19 +3679,20 @@ ath11k_wmi_pdev_srg_obss_color_enable_bitmap(struct ath11k *ar, u32 *bitmap)</div><div class='ctx'> 	cmd-&gt;pdev_id = ar-&gt;pdev-&gt;pdev_id;</div><div class='ctx'> 	memcpy(cmd-&gt;bitmap, bitmap, sizeof(cmd-&gt;bitmap));</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "obss pd srg pdev_id %d bss color enable bitmap %08x %08x\n",</div><div class='del'>-		   cmd-&gt;pdev_id, cmd-&gt;bitmap[0], cmd-&gt;bitmap[1]);</div><div class='del'>-</div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb,</div><div class='ctx'> 				  WMI_PDEV_SET_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ab,</div><div class='ctx'> 			    "failed to send WMI_PDEV_SET_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID");</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd pdev set srg obsscolor enable pdev_id %d bss color enable bitmap %08x %08x\n",</div><div class='add'>+		   cmd-&gt;pdev_id, cmd-&gt;bitmap[0], cmd-&gt;bitmap[1]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='hunk'>@@ -3106,19 +3718,20 @@ ath11k_wmi_pdev_srg_obss_bssid_enable_bitmap(struct ath11k *ar, u32 *bitmap)</div><div class='ctx'> 	cmd-&gt;pdev_id = ar-&gt;pdev-&gt;pdev_id;</div><div class='ctx'> 	memcpy(cmd-&gt;bitmap, bitmap, sizeof(cmd-&gt;bitmap));</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "obss pd srg pdev_id %d bssid enable bitmap %08x %08x\n",</div><div class='del'>-		   cmd-&gt;pdev_id, cmd-&gt;bitmap[0], cmd-&gt;bitmap[1]);</div><div class='del'>-</div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb,</div><div class='ctx'> 				  WMI_PDEV_SET_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ab,</div><div class='ctx'> 			    "failed to send WMI_PDEV_SET_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID");</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd pdev set srg obss bssid enable bitmap pdev_id %d bssid enable bitmap %08x %08x\n",</div><div class='add'>+		   cmd-&gt;pdev_id, cmd-&gt;bitmap[0], cmd-&gt;bitmap[1]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='hunk'>@@ -3144,19 +3757,20 @@ ath11k_wmi_pdev_non_srg_obss_color_enable_bitmap(struct ath11k *ar, u32 *bitmap)</div><div class='ctx'> 	cmd-&gt;pdev_id = ar-&gt;pdev-&gt;pdev_id;</div><div class='ctx'> 	memcpy(cmd-&gt;bitmap, bitmap, sizeof(cmd-&gt;bitmap));</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "obss pd non_srg pdev_id %d bss color enable bitmap %08x %08x\n",</div><div class='del'>-		   cmd-&gt;pdev_id, cmd-&gt;bitmap[0], cmd-&gt;bitmap[1]);</div><div class='del'>-</div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb,</div><div class='ctx'> 				  WMI_PDEV_SET_NON_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ab,</div><div class='ctx'> 			    "failed to send WMI_PDEV_SET_NON_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID");</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd pdev set non srg obss color enable bitmap pdev_id %d bss color enable bitmap %08x %08x\n",</div><div class='add'>+		   cmd-&gt;pdev_id, cmd-&gt;bitmap[0], cmd-&gt;bitmap[1]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='hunk'>@@ -3182,19 +3796,20 @@ ath11k_wmi_pdev_non_srg_obss_bssid_enable_bitmap(struct ath11k *ar, u32 *bitmap)</div><div class='ctx'> 	cmd-&gt;pdev_id = ar-&gt;pdev-&gt;pdev_id;</div><div class='ctx'> 	memcpy(cmd-&gt;bitmap, bitmap, sizeof(cmd-&gt;bitmap));</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "obss pd non_srg pdev_id %d bssid enable bitmap %08x %08x\n",</div><div class='del'>-		   cmd-&gt;pdev_id, cmd-&gt;bitmap[0], cmd-&gt;bitmap[1]);</div><div class='del'>-</div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb,</div><div class='ctx'> 				  WMI_PDEV_SET_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ab,</div><div class='ctx'> 			    "failed to send WMI_PDEV_SET_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID");</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd pdev set non srg obss bssid enable bitmap pdev_id %d bssid enable bitmap %08x %08x\n",</div><div class='add'>+		   cmd-&gt;pdev_id, cmd-&gt;bitmap[0], cmd-&gt;bitmap[1]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='hunk'>@@ -3227,18 +3842,20 @@ ath11k_wmi_send_obss_color_collision_cfg_cmd(struct ath11k *ar, u32 vdev_id,</div><div class='ctx'> 	cmd-&gt;free_slot_expiry_time_ms = 0;</div><div class='ctx'> 	cmd-&gt;flags = 0;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "wmi_send_obss_color_collision_cfg id %d type %d bss_color %d detect_period %d scan_period %d\n",</div><div class='del'>-		   cmd-&gt;vdev_id, cmd-&gt;evt_type, cmd-&gt;current_bss_color,</div><div class='del'>-		   cmd-&gt;detection_period_ms, cmd-&gt;scan_period_ms);</div><div class='del'>-</div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb,</div><div class='ctx'> 				  WMI_OBSS_COLOR_COLLISION_DET_CONFIG_CMDID);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ab, "Failed to send WMI_OBSS_COLOR_COLLISION_DET_CONFIG_CMDID");</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd obss color collision det config id %d type %d bss_color %d detect_period %d scan_period %d\n",</div><div class='add'>+		   cmd-&gt;vdev_id, cmd-&gt;evt_type, cmd-&gt;current_bss_color,</div><div class='add'>+		   cmd-&gt;detection_period_ms, cmd-&gt;scan_period_ms);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ath11k_wmi_send_bss_color_change_enable_cmd(struct ath11k *ar, u32 vdev_id,</div><div class='hunk'>@@ -3262,17 +3879,19 @@ int ath11k_wmi_send_bss_color_change_enable_cmd(struct ath11k *ar, u32 vdev_id,</div><div class='ctx'> 	cmd-&gt;vdev_id = vdev_id;</div><div class='ctx'> 	cmd-&gt;enable = enable ? 1 : 0;</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "wmi_send_bss_color_change_enable id %d enable %d\n",</div><div class='del'>-		   cmd-&gt;vdev_id, cmd-&gt;enable);</div><div class='del'>-</div><div class='ctx'> 	ret = ath11k_wmi_cmd_send(wmi, skb,</div><div class='ctx'> 				  WMI_BSS_COLOR_CHANGE_ENABLE_CMDID);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ab, "Failed to send WMI_BSS_COLOR_CHANGE_ENABLE_CMDID");</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cmd bss color change enable id %d enable %d\n",</div><div class='add'>+		   cmd-&gt;vdev_id, cmd-&gt;enable);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ath11k_wmi_fils_discovery_tmpl(struct ath11k *ar, u32 vdev_id,</div><div class='hunk'>@@ -3289,7 +3908,7 @@ int ath11k_wmi_fils_discovery_tmpl(struct ath11k *ar, u32 vdev_id,</div><div class='ctx'> 	len = sizeof(*cmd) + TLV_HDR_SIZE + aligned_len;</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI vdev %i set FILS discovery template\n", vdev_id);</div><div class='add'>+		   "vdev %i set FILS discovery template\n", vdev_id);</div><div class='ctx'> </div><div class='ctx'> 	skb = ath11k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='ctx'> 	if (!skb)</div><div class='hunk'>@@ -3314,8 +3933,12 @@ int ath11k_wmi_fils_discovery_tmpl(struct ath11k *ar, u32 vdev_id,</div><div class='ctx'> 			    "WMI vdev %i failed to send FILS discovery template command\n",</div><div class='ctx'> 			    vdev_id);</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "cmd fils discovery tmpl");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ath11k_wmi_probe_resp_tmpl(struct ath11k *ar, u32 vdev_id,</div><div class='hunk'>@@ -3330,7 +3953,7 @@ int ath11k_wmi_probe_resp_tmpl(struct ath11k *ar, u32 vdev_id,</div><div class='ctx'> 	size_t aligned_len = roundup(tmpl-&gt;len, 4);</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI vdev %i set probe response template\n", vdev_id);</div><div class='add'>+		   "vdev %i set probe response template\n", vdev_id);</div><div class='ctx'> </div><div class='ctx'> 	len = sizeof(*cmd) + sizeof(*probe_info) + TLV_HDR_SIZE + aligned_len;</div><div class='ctx'> </div><div class='hunk'>@@ -3367,8 +3990,12 @@ int ath11k_wmi_probe_resp_tmpl(struct ath11k *ar, u32 vdev_id,</div><div class='ctx'> 			    "WMI vdev %i failed to send probe response template command\n",</div><div class='ctx'> 			    vdev_id);</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "cmd ");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ath11k_wmi_fils_discovery(struct ath11k *ar, u32 vdev_id, u32 interval,</div><div class='hunk'>@@ -3379,7 +4006,7 @@ int ath11k_wmi_fils_discovery(struct ath11k *ar, u32 vdev_id, u32 interval,</div><div class='ctx'> 	struct wmi_fils_discovery_cmd *cmd;</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI vdev %i set %s interval to %u TU\n",</div><div class='add'>+		   "vdev %i set %s interval to %u TU\n",</div><div class='ctx'> 		   vdev_id, unsol_bcast_probe_resp_enabled ?</div><div class='ctx'> 		   "unsolicited broadcast probe response" : "FILS discovery",</div><div class='ctx'> 		   interval);</div><div class='hunk'>@@ -3402,8 +4029,65 @@ int ath11k_wmi_fils_discovery(struct ath11k *ar, u32 vdev_id, u32 interval,</div><div class='ctx'> 			    "WMI vdev %i failed to send FILS discovery enable/disable command\n",</div><div class='ctx'> 			    vdev_id);</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "cmd enable fils");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath11k_wmi_obss_color_collision_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_obss_color_collision_event *ev;</div><div class='add'>+	struct ath11k_vif *arvif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event obss color collision");</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_OBSS_COLOR_COLLISION_EVT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath11k_warn(ab, "failed to fetch obss color collision ev");</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arvif = ath11k_mac_get_arvif_by_vdev_id(ab, ev-&gt;vdev_id);</div><div class='add'>+	if (!arvif) {</div><div class='add'>+		ath11k_warn(ab, "failed to find arvif with vedv id %d in obss_color_collision_event\n",</div><div class='add'>+			    ev-&gt;vdev_id);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (ev-&gt;evt_type) {</div><div class='add'>+	case WMI_BSS_COLOR_COLLISION_DETECTION:</div><div class='add'>+		ieee80211_obss_color_collision_notify(arvif-&gt;vif, ev-&gt;obss_color_bitmap,</div><div class='add'>+						      0);</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+			   "OBSS color collision detected vdev:%d, event:%d, bitmap:%08llx\n",</div><div class='add'>+			   ev-&gt;vdev_id, ev-&gt;evt_type, ev-&gt;obss_color_bitmap);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_BSS_COLOR_COLLISION_DISABLE:</div><div class='add'>+	case WMI_BSS_COLOR_FREE_SLOT_TIMER_EXPIRY:</div><div class='add'>+	case WMI_BSS_COLOR_FREE_SLOT_AVAILABLE:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath11k_warn(ab, "received unknown obss color collision detection event\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	kfree(tb);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -3495,11 +4179,18 @@ ath11k_wmi_copy_resource_config(struct wmi_resource_config *wmi_cfg,</div><div class='ctx'> 	wmi_cfg-&gt;bpf_instruction_size = tg_cfg-&gt;bpf_instruction_size;</div><div class='ctx'> 	wmi_cfg-&gt;max_bssid_rx_filters = tg_cfg-&gt;max_bssid_rx_filters;</div><div class='ctx'> 	wmi_cfg-&gt;use_pdev_id = tg_cfg-&gt;use_pdev_id;</div><div class='del'>-	wmi_cfg-&gt;flag1 = tg_cfg-&gt;atf_config;</div><div class='add'>+	wmi_cfg-&gt;flag1 = tg_cfg-&gt;flag1;</div><div class='ctx'> 	wmi_cfg-&gt;peer_map_unmap_v2_support = tg_cfg-&gt;peer_map_unmap_v2_support;</div><div class='ctx'> 	wmi_cfg-&gt;sched_params = tg_cfg-&gt;sched_params;</div><div class='ctx'> 	wmi_cfg-&gt;twt_ap_pdev_count = tg_cfg-&gt;twt_ap_pdev_count;</div><div class='ctx'> 	wmi_cfg-&gt;twt_ap_sta_count = tg_cfg-&gt;twt_ap_sta_count;</div><div class='add'>+	wmi_cfg-&gt;host_service_flags &amp;=</div><div class='add'>+		~(1 &lt;&lt; WMI_CFG_HOST_SERVICE_FLAG_REG_CC_EXT);</div><div class='add'>+	wmi_cfg-&gt;host_service_flags |= (tg_cfg-&gt;is_reg_cc_ext_event_supported &lt;&lt;</div><div class='add'>+					WMI_CFG_HOST_SERVICE_FLAG_REG_CC_EXT);</div><div class='add'>+	wmi_cfg-&gt;flags2 = WMI_RSRC_CFG_FLAG2_CALC_NEXT_DTIM_COUNT_SET;</div><div class='add'>+	wmi_cfg-&gt;ema_max_vap_cnt = tg_cfg-&gt;ema_max_vap_cnt;</div><div class='add'>+	wmi_cfg-&gt;ema_max_profile_period = tg_cfg-&gt;ema_max_profile_period;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath11k_init_cmd_send(struct ath11k_pdev_wmi *wmi,</div><div class='hunk'>@@ -3557,7 +4248,7 @@ static int ath11k_init_cmd_send(struct ath11k_pdev_wmi *wmi,</div><div class='ctx'> 		host_mem_chunks[idx].req_id = param-&gt;mem_chunks[idx].req_id;</div><div class='ctx'> </div><div class='ctx'> 		ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='del'>-			   "WMI host mem chunk req_id %d paddr 0x%llx len %d\n",</div><div class='add'>+			   "host mem chunk req_id %d paddr 0x%llx len %d\n",</div><div class='ctx'> 			   param-&gt;mem_chunks[idx].req_id,</div><div class='ctx'> 			   (u64)param-&gt;mem_chunks[idx].paddr,</div><div class='ctx'> 			   param-&gt;mem_chunks[idx].len);</div><div class='hunk'>@@ -3572,7 +4263,7 @@ static int ath11k_init_cmd_send(struct ath11k_pdev_wmi *wmi,</div><div class='ctx'> 	ptr += TLV_HDR_SIZE + len;</div><div class='ctx'> </div><div class='ctx'> 	if (param-&gt;hw_mode_id != WMI_HOST_HW_MODE_MAX) {</div><div class='del'>-		hw_mode = (struct wmi_pdev_set_hw_mode_cmd_param *)ptr;</div><div class='add'>+		hw_mode = ptr;</div><div class='ctx'> 		hw_mode-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG,</div><div class='ctx'> 						 WMI_TAG_PDEV_SET_HW_MODE_CMD) |</div><div class='ctx'> 				      FIELD_PREP(WMI_TLV_LEN,</div><div class='hunk'>@@ -3592,7 +4283,7 @@ static int ath11k_init_cmd_send(struct ath11k_pdev_wmi *wmi,</div><div class='ctx'> 		len = sizeof(*band_to_mac);</div><div class='ctx'> </div><div class='ctx'> 		for (idx = 0; idx &lt; param-&gt;num_band_to_mac; idx++) {</div><div class='del'>-			band_to_mac = (void *)ptr;</div><div class='add'>+			band_to_mac = ptr;</div><div class='ctx'> </div><div class='ctx'> 			band_to_mac-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG,</div><div class='ctx'> 							     WMI_TAG_PDEV_BAND_TO_MAC) |</div><div class='hunk'>@@ -3611,9 +4302,12 @@ static int ath11k_init_cmd_send(struct ath11k_pdev_wmi *wmi,</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ab, "failed to send WMI_INIT_CMDID\n");</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "cmd wmi init");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ath11k_wmi_pdev_lro_cfg(struct ath11k *ar,</div><div class='hunk'>@@ -3644,7 +4338,7 @@ int ath11k_wmi_pdev_lro_cfg(struct ath11k *ar,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI lro cfg cmd pdev_id 0x%x\n", pdev_id);</div><div class='add'>+		   "cmd lro config pdev_id 0x%x\n", pdev_id);</div><div class='ctx'> 	return 0;</div><div class='ctx'> err:</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='hunk'>@@ -3702,14 +4396,17 @@ int ath11k_wmi_set_hw_mode(struct ath11k_base *ab,</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath11k_warn(ab, "failed to send WMI_PDEV_SET_HW_MODE_CMDID\n");</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "cmd pdev set hw mode %d", cmd-&gt;hw_mode_index);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ath11k_wmi_cmd_init(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_wmi_base *wmi_sc = &amp;ab-&gt;wmi_ab;</div><div class='add'>+	struct ath11k_wmi_base *wmi_ab = &amp;ab-&gt;wmi_ab;</div><div class='ctx'> 	struct wmi_init_cmd_param init_param;</div><div class='ctx'> 	struct target_resource_config  config;</div><div class='ctx'> </div><div class='hunk'>@@ -3718,12 +4415,16 @@ int ath11k_wmi_cmd_init(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> 	ab-&gt;hw_params.hw_ops-&gt;wmi_init_config(ab, &amp;config);</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;wmi_sc-&gt;wlan_resource_config, &amp;config, sizeof(config));</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_REG_CC_EXT_EVENT_SUPPORT,</div><div class='add'>+		     ab-&gt;wmi_ab.svc_map))</div><div class='add'>+		config.is_reg_cc_ext_event_supported = 1;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;wmi_ab-&gt;wlan_resource_config, &amp;config, sizeof(config));</div><div class='ctx'> </div><div class='del'>-	init_param.res_cfg = &amp;wmi_sc-&gt;wlan_resource_config;</div><div class='del'>-	init_param.num_mem_chunks = wmi_sc-&gt;num_mem_chunks;</div><div class='del'>-	init_param.hw_mode_id = wmi_sc-&gt;preferred_hw_mode;</div><div class='del'>-	init_param.mem_chunks = wmi_sc-&gt;mem_chunks;</div><div class='add'>+	init_param.res_cfg = &amp;wmi_ab-&gt;wlan_resource_config;</div><div class='add'>+	init_param.num_mem_chunks = wmi_ab-&gt;num_mem_chunks;</div><div class='add'>+	init_param.hw_mode_id = wmi_ab-&gt;preferred_hw_mode;</div><div class='add'>+	init_param.mem_chunks = wmi_ab-&gt;mem_chunks;</div><div class='ctx'> </div><div class='ctx'> 	if (ab-&gt;hw_params.single_pdev_only)</div><div class='ctx'> 		init_param.hw_mode_id = WMI_HOST_HW_MODE_MAX;</div><div class='hunk'>@@ -3731,7 +4432,7 @@ int ath11k_wmi_cmd_init(struct ath11k_base *ab)</div><div class='ctx'> 	init_param.num_band_to_mac = ab-&gt;num_radios;</div><div class='ctx'> 	ath11k_fill_band_to_mac_param(ab, init_param.band_to_mac);</div><div class='ctx'> </div><div class='del'>-	return ath11k_init_cmd_send(&amp;wmi_sc-&gt;wmi[0], &amp;init_param);</div><div class='add'>+	return ath11k_init_cmd_send(&amp;wmi_ab-&gt;wmi[0], &amp;init_param);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ath11k_wmi_vdev_spectral_conf(struct ath11k *ar,</div><div class='hunk'>@@ -3761,7 +4462,7 @@ int ath11k_wmi_vdev_spectral_conf(struct ath11k *ar,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI spectral scan config cmd vdev_id 0x%x\n",</div><div class='add'>+		   "cmd vdev spectral scan configure vdev_id 0x%x\n",</div><div class='ctx'> 		   param-&gt;vdev_id);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3799,7 +4500,7 @@ int ath11k_wmi_vdev_spectral_enable(struct ath11k *ar, u32 vdev_id,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI spectral enable cmd vdev id 0x%x\n",</div><div class='add'>+		   "cmd vdev spectral scan enable vdev id 0x%x\n",</div><div class='ctx'> 		   vdev_id);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3845,7 +4546,7 @@ int ath11k_wmi_pdev_dma_ring_cfg(struct ath11k *ar,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI DMA ring cfg req cmd pdev_id 0x%x\n",</div><div class='add'>+		   "cmd pdev dma ring cfg req pdev_id 0x%x\n",</div><div class='ctx'> 		   param-&gt;pdev_id);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3951,6 +4652,8 @@ static void ath11k_wmi_pdev_dma_ring_buf_release_event(struct ath11k_base *ab,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event pdev dma ring buf release");</div><div class='add'>+</div><div class='ctx'> 	param.fixed		= parse.fixed;</div><div class='ctx'> 	param.buf_entry		= parse.buf_entry;</div><div class='ctx'> 	param.num_buf_entry	= parse.num_buf_entry;</div><div class='hunk'>@@ -4046,8 +4749,8 @@ static int ath11k_wmi_tlv_mac_phy_caps_parse(struct ath11k_base *soc,</div><div class='ctx'> </div><div class='ctx'> 	len = min_t(u16, len, sizeof(struct wmi_mac_phy_capabilities));</div><div class='ctx'> 	if (!svc_rdy_ext-&gt;n_mac_phy_caps) {</div><div class='del'>-		svc_rdy_ext-&gt;mac_phy_caps = kzalloc((svc_rdy_ext-&gt;tot_phy_id) * len,</div><div class='del'>-						    GFP_ATOMIC);</div><div class='add'>+		svc_rdy_ext-&gt;mac_phy_caps = kcalloc(svc_rdy_ext-&gt;tot_phy_id,</div><div class='add'>+						    len, GFP_ATOMIC);</div><div class='ctx'> 		if (!svc_rdy_ext-&gt;mac_phy_caps)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4123,6 +4826,7 @@ static int ath11k_wmi_tlv_ext_soc_hal_reg_caps_parse(struct ath11k_base *soc,</div><div class='ctx'> 	svc_rdy_ext-&gt;param.num_phy = svc_rdy_ext-&gt;soc_hal_reg_caps-&gt;num_phy;</div><div class='ctx'> </div><div class='ctx'> 	soc-&gt;num_radios = 0;</div><div class='add'>+	soc-&gt;target_pdev_count = 0;</div><div class='ctx'> 	phy_id_map = svc_rdy_ext-&gt;pref_hw_mode_caps.phy_id_map;</div><div class='ctx'> </div><div class='ctx'> 	while (phy_id_map &amp;&amp; soc-&gt;num_radios &lt; MAX_RADIOS) {</div><div class='hunk'>@@ -4160,6 +4864,14 @@ static int ath11k_wmi_tlv_ext_soc_hal_reg_caps_parse(struct ath11k_base *soc,</div><div class='ctx'> 		soc-&gt;pdevs[0].pdev_id = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!soc-&gt;reg_info_store) {</div><div class='add'>+		soc-&gt;reg_info_store = kcalloc(soc-&gt;num_radios,</div><div class='add'>+					      sizeof(*soc-&gt;reg_info_store),</div><div class='add'>+					      GFP_ATOMIC);</div><div class='add'>+		if (!soc-&gt;reg_info_store)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4197,6 +4909,7 @@ static void ath11k_wmi_free_dbring_caps(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	kfree(ab-&gt;db_caps);</div><div class='ctx'> 	ab-&gt;db_caps = NULL;</div><div class='add'>+	ab-&gt;num_db_cap = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath11k_wmi_tlv_dma_ring_caps(struct ath11k_base *ab,</div><div class='hunk'>@@ -4344,6 +5057,8 @@ static int ath11k_service_ready_ext_event(struct ath11k_base *ab,</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event service ready ext");</div><div class='add'>+</div><div class='ctx'> 	if (!test_bit(WMI_TLV_SERVICE_EXT2_MSG, ab-&gt;wmi_ab.svc_map))</div><div class='ctx'> 		complete(&amp;ab-&gt;wmi_ab.service_ready);</div><div class='ctx'> </div><div class='hunk'>@@ -4394,6 +5109,8 @@ static int ath11k_service_ready_ext2_event(struct ath11k_base *ab,</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event service ready ext2");</div><div class='add'>+</div><div class='ctx'> 	complete(&amp;ab-&gt;wmi_ab.service_ready);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -4410,7 +5127,7 @@ static int ath11k_pull_vdev_start_resp_tlv(struct ath11k_base *ab, struct sk_buf</div><div class='ctx'> 	const struct wmi_vdev_start_resp_event *ev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, skb-&gt;data, skb-&gt;len, GFP_ATOMIC);</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='ctx'> 	if (IS_ERR(tb)) {</div><div class='ctx'> 		ret = PTR_ERR(tb);</div><div class='ctx'> 		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='hunk'>@@ -4435,11 +5152,32 @@ static int ath11k_pull_vdev_start_resp_tlv(struct ath11k_base *ab, struct sk_buf</div><div class='ctx'> 	vdev_rsp-&gt;mac_id = ev-&gt;mac_id;</div><div class='ctx'> 	vdev_rsp-&gt;cfgd_tx_streams = ev-&gt;cfgd_tx_streams;</div><div class='ctx'> 	vdev_rsp-&gt;cfgd_rx_streams = ev-&gt;cfgd_rx_streams;</div><div class='add'>+	vdev_rsp-&gt;max_allowed_tx_power = ev-&gt;max_allowed_tx_power;</div><div class='ctx'> </div><div class='ctx'> 	kfree(tb);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ath11k_print_reg_rule(struct ath11k_base *ab, const char *band,</div><div class='add'>+				  u32 num_reg_rules,</div><div class='add'>+				  struct cur_reg_rule *reg_rule_ptr)</div><div class='add'>+{</div><div class='add'>+	struct cur_reg_rule *reg_rule = reg_rule_ptr;</div><div class='add'>+	u32 count;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "number of reg rules in %s band: %d\n",</div><div class='add'>+		   band, num_reg_rules);</div><div class='add'>+</div><div class='add'>+	for (count = 0; count &lt; num_reg_rules; count++) {</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+			   "reg rule %d: (%d - %d @ %d) (%d, %d) (FLAGS %d)\n",</div><div class='add'>+			   count + 1, reg_rule-&gt;start_freq, reg_rule-&gt;end_freq,</div><div class='add'>+			   reg_rule-&gt;max_bw, reg_rule-&gt;ant_gain,</div><div class='add'>+			   reg_rule-&gt;reg_power, reg_rule-&gt;flags);</div><div class='add'>+		reg_rule++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct cur_reg_rule</div><div class='ctx'> *create_reg_rules_from_wmi(u32 num_reg_rules,</div><div class='ctx'> 			   struct wmi_regulatory_rule_struct *wmi_reg_rule)</div><div class='hunk'>@@ -4447,8 +5185,8 @@ static struct cur_reg_rule</div><div class='ctx'> 	struct cur_reg_rule *reg_rule_ptr;</div><div class='ctx'> 	u32 count;</div><div class='ctx'> </div><div class='del'>-	reg_rule_ptr =  kzalloc((num_reg_rules * sizeof(*reg_rule_ptr)),</div><div class='del'>-				GFP_ATOMIC);</div><div class='add'>+	reg_rule_ptr = kcalloc(num_reg_rules, sizeof(*reg_rule_ptr),</div><div class='add'>+			       GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 	if (!reg_rule_ptr)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -4484,12 +5222,12 @@ static int ath11k_pull_reg_chan_list_update_ev(struct ath11k_base *ab,</div><div class='ctx'> 	const void **tb;</div><div class='ctx'> 	const struct wmi_reg_chan_list_cc_event *chan_list_event_hdr;</div><div class='ctx'> 	struct wmi_regulatory_rule_struct *wmi_reg_rule;</div><div class='del'>-	u32 num_2g_reg_rules, num_5g_reg_rules;</div><div class='add'>+	u32 num_2ghz_reg_rules, num_5ghz_reg_rules;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_WMI, "processing regulatory channel list\n");</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, skb-&gt;data, skb-&gt;len, GFP_ATOMIC);</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='ctx'> 	if (IS_ERR(tb)) {</div><div class='ctx'> 		ret = PTR_ERR(tb);</div><div class='ctx'> 		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='hunk'>@@ -4503,10 +5241,10 @@ static int ath11k_pull_reg_chan_list_update_ev(struct ath11k_base *ab,</div><div class='ctx'> 		return -EPROTO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	reg_info-&gt;num_2g_reg_rules = chan_list_event_hdr-&gt;num_2g_reg_rules;</div><div class='del'>-	reg_info-&gt;num_5g_reg_rules = chan_list_event_hdr-&gt;num_5g_reg_rules;</div><div class='add'>+	reg_info-&gt;num_2ghz_reg_rules = chan_list_event_hdr-&gt;num_2ghz_reg_rules;</div><div class='add'>+	reg_info-&gt;num_5ghz_reg_rules = chan_list_event_hdr-&gt;num_5ghz_reg_rules;</div><div class='ctx'> </div><div class='del'>-	if (!(reg_info-&gt;num_2g_reg_rules + reg_info-&gt;num_5g_reg_rules)) {</div><div class='add'>+	if (!(reg_info-&gt;num_2ghz_reg_rules + reg_info-&gt;num_5ghz_reg_rules)) {</div><div class='ctx'> 		ath11k_warn(ab, "No regulatory rules available in the event info\n");</div><div class='ctx'> 		kfree(tb);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -4520,61 +5258,68 @@ static int ath11k_pull_reg_chan_list_update_ev(struct ath11k_base *ab,</div><div class='ctx'> 	reg_info-&gt;phy_id = chan_list_event_hdr-&gt;phy_id;</div><div class='ctx'> 	reg_info-&gt;ctry_code = chan_list_event_hdr-&gt;country_id;</div><div class='ctx'> 	reg_info-&gt;reg_dmn_pair = chan_list_event_hdr-&gt;domain_code;</div><div class='del'>-	if (chan_list_event_hdr-&gt;status_code == WMI_REG_SET_CC_STATUS_PASS)</div><div class='del'>-		reg_info-&gt;status_code = REG_SET_CC_STATUS_PASS;</div><div class='del'>-	else if (chan_list_event_hdr-&gt;status_code == WMI_REG_CURRENT_ALPHA2_NOT_FOUND)</div><div class='del'>-		reg_info-&gt;status_code = REG_CURRENT_ALPHA2_NOT_FOUND;</div><div class='del'>-	else if (chan_list_event_hdr-&gt;status_code == WMI_REG_INIT_ALPHA2_NOT_FOUND)</div><div class='del'>-		reg_info-&gt;status_code = REG_INIT_ALPHA2_NOT_FOUND;</div><div class='del'>-	else if (chan_list_event_hdr-&gt;status_code == WMI_REG_SET_CC_CHANGE_NOT_ALLOWED)</div><div class='del'>-		reg_info-&gt;status_code = REG_SET_CC_CHANGE_NOT_ALLOWED;</div><div class='del'>-	else if (chan_list_event_hdr-&gt;status_code == WMI_REG_SET_CC_STATUS_NO_MEMORY)</div><div class='del'>-		reg_info-&gt;status_code = REG_SET_CC_STATUS_NO_MEMORY;</div><div class='del'>-	else if (chan_list_event_hdr-&gt;status_code == WMI_REG_SET_CC_STATUS_FAIL)</div><div class='del'>-		reg_info-&gt;status_code = REG_SET_CC_STATUS_FAIL;</div><div class='del'>-</div><div class='del'>-	reg_info-&gt;min_bw_2g = chan_list_event_hdr-&gt;min_bw_2g;</div><div class='del'>-	reg_info-&gt;max_bw_2g = chan_list_event_hdr-&gt;max_bw_2g;</div><div class='del'>-	reg_info-&gt;min_bw_5g = chan_list_event_hdr-&gt;min_bw_5g;</div><div class='del'>-	reg_info-&gt;max_bw_5g = chan_list_event_hdr-&gt;max_bw_5g;</div><div class='del'>-</div><div class='del'>-	num_2g_reg_rules = reg_info-&gt;num_2g_reg_rules;</div><div class='del'>-	num_5g_reg_rules = reg_info-&gt;num_5g_reg_rules;</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "%s:cc %s dsf %d BW: min_2g %d max_2g %d min_5g %d max_5g %d",</div><div class='del'>-		   __func__, reg_info-&gt;alpha2, reg_info-&gt;dfs_region,</div><div class='del'>-		   reg_info-&gt;min_bw_2g, reg_info-&gt;max_bw_2g,</div><div class='del'>-		   reg_info-&gt;min_bw_5g, reg_info-&gt;max_bw_5g);</div><div class='add'>+		   "status_code %s",</div><div class='add'>+		   ath11k_cc_status_to_str(reg_info-&gt;status_code));</div><div class='add'>+</div><div class='add'>+	reg_info-&gt;status_code =</div><div class='add'>+		ath11k_wmi_cc_setting_code_to_reg(chan_list_event_hdr-&gt;status_code);</div><div class='add'>+</div><div class='add'>+	reg_info-&gt;is_ext_reg_event = false;</div><div class='add'>+</div><div class='add'>+	reg_info-&gt;min_bw_2ghz = chan_list_event_hdr-&gt;min_bw_2ghz;</div><div class='add'>+	reg_info-&gt;max_bw_2ghz = chan_list_event_hdr-&gt;max_bw_2ghz;</div><div class='add'>+	reg_info-&gt;min_bw_5ghz = chan_list_event_hdr-&gt;min_bw_5ghz;</div><div class='add'>+	reg_info-&gt;max_bw_5ghz = chan_list_event_hdr-&gt;max_bw_5ghz;</div><div class='add'>+</div><div class='add'>+	num_2ghz_reg_rules = reg_info-&gt;num_2ghz_reg_rules;</div><div class='add'>+	num_5ghz_reg_rules = reg_info-&gt;num_5ghz_reg_rules;</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "%s: num_2g_reg_rules %d num_5g_reg_rules %d", __func__,</div><div class='del'>-		   num_2g_reg_rules, num_5g_reg_rules);</div><div class='add'>+		   "cc %s dsf %d BW: min_2ghz %d max_2ghz %d min_5ghz %d max_5ghz %d",</div><div class='add'>+		   reg_info-&gt;alpha2, reg_info-&gt;dfs_region,</div><div class='add'>+		   reg_info-&gt;min_bw_2ghz, reg_info-&gt;max_bw_2ghz,</div><div class='add'>+		   reg_info-&gt;min_bw_5ghz, reg_info-&gt;max_bw_5ghz);</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "num_2ghz_reg_rules %d num_5ghz_reg_rules %d",</div><div class='add'>+		   num_2ghz_reg_rules, num_5ghz_reg_rules);</div><div class='ctx'> </div><div class='ctx'> 	wmi_reg_rule =</div><div class='ctx'> 		(struct wmi_regulatory_rule_struct *)((u8 *)chan_list_event_hdr</div><div class='ctx'> 						+ sizeof(*chan_list_event_hdr)</div><div class='ctx'> 						+ sizeof(struct wmi_tlv));</div><div class='ctx'> </div><div class='del'>-	if (num_2g_reg_rules) {</div><div class='del'>-		reg_info-&gt;reg_rules_2g_ptr = create_reg_rules_from_wmi(num_2g_reg_rules,</div><div class='del'>-								       wmi_reg_rule);</div><div class='del'>-		if (!reg_info-&gt;reg_rules_2g_ptr) {</div><div class='add'>+	if (num_2ghz_reg_rules) {</div><div class='add'>+		reg_info-&gt;reg_rules_2ghz_ptr =</div><div class='add'>+				create_reg_rules_from_wmi(num_2ghz_reg_rules,</div><div class='add'>+							  wmi_reg_rule);</div><div class='add'>+		if (!reg_info-&gt;reg_rules_2ghz_ptr) {</div><div class='ctx'> 			kfree(tb);</div><div class='del'>-			ath11k_warn(ab, "Unable to Allocate memory for 2g rules\n");</div><div class='add'>+			ath11k_warn(ab, "Unable to Allocate memory for 2 GHz rules\n");</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		ath11k_print_reg_rule(ab, "2 GHz",</div><div class='add'>+				      num_2ghz_reg_rules,</div><div class='add'>+				      reg_info-&gt;reg_rules_2ghz_ptr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (num_5g_reg_rules) {</div><div class='del'>-		wmi_reg_rule += num_2g_reg_rules;</div><div class='del'>-		reg_info-&gt;reg_rules_5g_ptr = create_reg_rules_from_wmi(num_5g_reg_rules,</div><div class='del'>-								       wmi_reg_rule);</div><div class='del'>-		if (!reg_info-&gt;reg_rules_5g_ptr) {</div><div class='add'>+	if (num_5ghz_reg_rules) {</div><div class='add'>+		wmi_reg_rule += num_2ghz_reg_rules;</div><div class='add'>+		reg_info-&gt;reg_rules_5ghz_ptr =</div><div class='add'>+				create_reg_rules_from_wmi(num_5ghz_reg_rules,</div><div class='add'>+							  wmi_reg_rule);</div><div class='add'>+		if (!reg_info-&gt;reg_rules_5ghz_ptr) {</div><div class='ctx'> 			kfree(tb);</div><div class='del'>-			ath11k_warn(ab, "Unable to Allocate memory for 5g rules\n");</div><div class='add'>+			ath11k_warn(ab, "Unable to Allocate memory for 5 GHz rules\n");</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		ath11k_print_reg_rule(ab, "5 GHz",</div><div class='add'>+				      num_5ghz_reg_rules,</div><div class='add'>+				      reg_info-&gt;reg_rules_5ghz_ptr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_WMI, "processed regulatory channel list\n");</div><div class='hunk'>@@ -4583,6 +5328,430 @@ static int ath11k_pull_reg_chan_list_update_ev(struct ath11k_base *ab,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct cur_reg_rule</div><div class='add'>+*create_ext_reg_rules_from_wmi(u32 num_reg_rules,</div><div class='add'>+			       struct wmi_regulatory_ext_rule *wmi_reg_rule)</div><div class='add'>+{</div><div class='add'>+	struct cur_reg_rule *reg_rule_ptr;</div><div class='add'>+	u32 count;</div><div class='add'>+</div><div class='add'>+	reg_rule_ptr =  kcalloc(num_reg_rules, sizeof(*reg_rule_ptr), GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+	if (!reg_rule_ptr)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	for (count = 0; count &lt; num_reg_rules; count++) {</div><div class='add'>+		reg_rule_ptr[count].start_freq =</div><div class='add'>+			u32_get_bits(wmi_reg_rule[count].freq_info,</div><div class='add'>+				     REG_RULE_START_FREQ);</div><div class='add'>+		reg_rule_ptr[count].end_freq =</div><div class='add'>+			u32_get_bits(wmi_reg_rule[count].freq_info,</div><div class='add'>+				     REG_RULE_END_FREQ);</div><div class='add'>+		reg_rule_ptr[count].max_bw =</div><div class='add'>+			u32_get_bits(wmi_reg_rule[count].bw_pwr_info,</div><div class='add'>+				     REG_RULE_MAX_BW);</div><div class='add'>+		reg_rule_ptr[count].reg_power =</div><div class='add'>+			u32_get_bits(wmi_reg_rule[count].bw_pwr_info,</div><div class='add'>+				     REG_RULE_REG_PWR);</div><div class='add'>+		reg_rule_ptr[count].ant_gain =</div><div class='add'>+			u32_get_bits(wmi_reg_rule[count].bw_pwr_info,</div><div class='add'>+				     REG_RULE_ANT_GAIN);</div><div class='add'>+		reg_rule_ptr[count].flags =</div><div class='add'>+			u32_get_bits(wmi_reg_rule[count].flag_info,</div><div class='add'>+				     REG_RULE_FLAGS);</div><div class='add'>+		reg_rule_ptr[count].psd_flag =</div><div class='add'>+			u32_get_bits(wmi_reg_rule[count].psd_power_info,</div><div class='add'>+				     REG_RULE_PSD_INFO);</div><div class='add'>+		reg_rule_ptr[count].psd_eirp =</div><div class='add'>+			u32_get_bits(wmi_reg_rule[count].psd_power_info,</div><div class='add'>+				     REG_RULE_PSD_EIRP);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return reg_rule_ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8</div><div class='add'>+ath11k_invalid_5ghz_reg_ext_rules_from_wmi(u32 num_reg_rules,</div><div class='add'>+					   const struct wmi_regulatory_ext_rule *rule)</div><div class='add'>+{</div><div class='add'>+	u8 num_invalid_5ghz_rules = 0;</div><div class='add'>+	u32 count, start_freq;</div><div class='add'>+</div><div class='add'>+	for (count = 0; count &lt; num_reg_rules; count++) {</div><div class='add'>+		start_freq = u32_get_bits(rule[count].freq_info,</div><div class='add'>+					  REG_RULE_START_FREQ);</div><div class='add'>+</div><div class='add'>+		if (start_freq &gt;= ATH11K_MIN_6G_FREQ)</div><div class='add'>+			num_invalid_5ghz_rules++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return num_invalid_5ghz_rules;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_pull_reg_chan_list_ext_update_ev(struct ath11k_base *ab,</div><div class='add'>+						   struct sk_buff *skb,</div><div class='add'>+						   struct cur_regulatory_info *reg_info)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_reg_chan_list_cc_ext_event *ev;</div><div class='add'>+	struct wmi_regulatory_ext_rule *ext_wmi_reg_rule;</div><div class='add'>+	u32 num_2ghz_reg_rules, num_5ghz_reg_rules;</div><div class='add'>+	u32 num_6ghz_reg_rules_ap[WMI_REG_CURRENT_MAX_AP_TYPE];</div><div class='add'>+	u32 num_6ghz_client[WMI_REG_CURRENT_MAX_AP_TYPE][WMI_REG_MAX_CLIENT_TYPE];</div><div class='add'>+	u32 total_reg_rules = 0;</div><div class='add'>+	int ret, i, j, num_invalid_5ghz_ext_rules = 0;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "processing regulatory ext channel list\n");</div><div class='add'>+</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_REG_CHAN_LIST_CC_EXT_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath11k_warn(ab, "failed to fetch reg chan list ext update ev\n");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg_info-&gt;num_2ghz_reg_rules = ev-&gt;num_2ghz_reg_rules;</div><div class='add'>+	reg_info-&gt;num_5ghz_reg_rules = ev-&gt;num_5ghz_reg_rules;</div><div class='add'>+	reg_info-&gt;num_6ghz_rules_ap[WMI_REG_INDOOR_AP] =</div><div class='add'>+			ev-&gt;num_6ghz_reg_rules_ap_lpi;</div><div class='add'>+	reg_info-&gt;num_6ghz_rules_ap[WMI_REG_STANDARD_POWER_AP] =</div><div class='add'>+			ev-&gt;num_6ghz_reg_rules_ap_sp;</div><div class='add'>+	reg_info-&gt;num_6ghz_rules_ap[WMI_REG_VERY_LOW_POWER_AP] =</div><div class='add'>+			ev-&gt;num_6ghz_reg_rules_ap_vlp;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WMI_REG_MAX_CLIENT_TYPE; i++) {</div><div class='add'>+		reg_info-&gt;num_6ghz_rules_client[WMI_REG_INDOOR_AP][i] =</div><div class='add'>+			ev-&gt;num_6ghz_reg_rules_client_lpi[i];</div><div class='add'>+		reg_info-&gt;num_6ghz_rules_client[WMI_REG_STANDARD_POWER_AP][i] =</div><div class='add'>+			ev-&gt;num_6ghz_reg_rules_client_sp[i];</div><div class='add'>+		reg_info-&gt;num_6ghz_rules_client[WMI_REG_VERY_LOW_POWER_AP][i] =</div><div class='add'>+			ev-&gt;num_6ghz_reg_rules_client_vlp[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	num_2ghz_reg_rules = reg_info-&gt;num_2ghz_reg_rules;</div><div class='add'>+	num_5ghz_reg_rules = reg_info-&gt;num_5ghz_reg_rules;</div><div class='add'>+</div><div class='add'>+	total_reg_rules += num_2ghz_reg_rules;</div><div class='add'>+	total_reg_rules += num_5ghz_reg_rules;</div><div class='add'>+</div><div class='add'>+	if ((num_2ghz_reg_rules &gt; MAX_REG_RULES) ||</div><div class='add'>+	    (num_5ghz_reg_rules &gt; MAX_REG_RULES)) {</div><div class='add'>+		ath11k_warn(ab, "Num reg rules for 2.4 GHz/5 GHz exceeds max limit (num_2ghz_reg_rules: %d num_5ghz_reg_rules: %d max_rules: %d)\n",</div><div class='add'>+			    num_2ghz_reg_rules, num_5ghz_reg_rules, MAX_REG_RULES);</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WMI_REG_CURRENT_MAX_AP_TYPE; i++) {</div><div class='add'>+		num_6ghz_reg_rules_ap[i] = reg_info-&gt;num_6ghz_rules_ap[i];</div><div class='add'>+</div><div class='add'>+		if (num_6ghz_reg_rules_ap[i] &gt; MAX_6GHZ_REG_RULES) {</div><div class='add'>+			ath11k_warn(ab, "Num 6 GHz reg rules for AP mode(%d) exceeds max limit (num_6ghz_reg_rules_ap: %d, max_rules: %d)\n",</div><div class='add'>+				    i, num_6ghz_reg_rules_ap[i], MAX_6GHZ_REG_RULES);</div><div class='add'>+			kfree(tb);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		total_reg_rules += num_6ghz_reg_rules_ap[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WMI_REG_MAX_CLIENT_TYPE; i++) {</div><div class='add'>+		num_6ghz_client[WMI_REG_INDOOR_AP][i] =</div><div class='add'>+			reg_info-&gt;num_6ghz_rules_client[WMI_REG_INDOOR_AP][i];</div><div class='add'>+		total_reg_rules += num_6ghz_client[WMI_REG_INDOOR_AP][i];</div><div class='add'>+</div><div class='add'>+		num_6ghz_client[WMI_REG_STANDARD_POWER_AP][i] =</div><div class='add'>+			reg_info-&gt;num_6ghz_rules_client[WMI_REG_STANDARD_POWER_AP][i];</div><div class='add'>+		total_reg_rules += num_6ghz_client[WMI_REG_STANDARD_POWER_AP][i];</div><div class='add'>+</div><div class='add'>+		num_6ghz_client[WMI_REG_VERY_LOW_POWER_AP][i] =</div><div class='add'>+			reg_info-&gt;num_6ghz_rules_client[WMI_REG_VERY_LOW_POWER_AP][i];</div><div class='add'>+		total_reg_rules += num_6ghz_client[WMI_REG_VERY_LOW_POWER_AP][i];</div><div class='add'>+</div><div class='add'>+		if ((num_6ghz_client[WMI_REG_INDOOR_AP][i] &gt; MAX_6GHZ_REG_RULES) ||</div><div class='add'>+		    (num_6ghz_client[WMI_REG_STANDARD_POWER_AP][i] &gt;</div><div class='add'>+							     MAX_6GHZ_REG_RULES) ||</div><div class='add'>+		    (num_6ghz_client[WMI_REG_VERY_LOW_POWER_AP][i] &gt;</div><div class='add'>+							     MAX_6GHZ_REG_RULES)) {</div><div class='add'>+			ath11k_warn(ab,</div><div class='add'>+				    "Num 6 GHz client reg rules exceeds max limit, for client(type: %d)\n",</div><div class='add'>+				    i);</div><div class='add'>+			kfree(tb);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!total_reg_rules) {</div><div class='add'>+		ath11k_warn(ab, "No reg rules available\n");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(reg_info-&gt;alpha2, &amp;ev-&gt;alpha2, REG_ALPHA2_LEN);</div><div class='add'>+</div><div class='add'>+	reg_info-&gt;dfs_region = ev-&gt;dfs_region;</div><div class='add'>+	reg_info-&gt;phybitmap = ev-&gt;phybitmap;</div><div class='add'>+	reg_info-&gt;num_phy = ev-&gt;num_phy;</div><div class='add'>+	reg_info-&gt;phy_id = ev-&gt;phy_id;</div><div class='add'>+	reg_info-&gt;ctry_code = ev-&gt;country_id;</div><div class='add'>+	reg_info-&gt;reg_dmn_pair = ev-&gt;domain_code;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "status_code %s",</div><div class='add'>+		   ath11k_cc_status_to_str(reg_info-&gt;status_code));</div><div class='add'>+</div><div class='add'>+	reg_info-&gt;status_code =</div><div class='add'>+		ath11k_wmi_cc_setting_code_to_reg(ev-&gt;status_code);</div><div class='add'>+</div><div class='add'>+	reg_info-&gt;is_ext_reg_event = true;</div><div class='add'>+</div><div class='add'>+	reg_info-&gt;min_bw_2ghz = ev-&gt;min_bw_2ghz;</div><div class='add'>+	reg_info-&gt;max_bw_2ghz = ev-&gt;max_bw_2ghz;</div><div class='add'>+	reg_info-&gt;min_bw_5ghz = ev-&gt;min_bw_5ghz;</div><div class='add'>+	reg_info-&gt;max_bw_5ghz = ev-&gt;max_bw_5ghz;</div><div class='add'>+</div><div class='add'>+	reg_info-&gt;min_bw_6ghz_ap[WMI_REG_INDOOR_AP] =</div><div class='add'>+			ev-&gt;min_bw_6ghz_ap_lpi;</div><div class='add'>+	reg_info-&gt;max_bw_6ghz_ap[WMI_REG_INDOOR_AP] =</div><div class='add'>+			ev-&gt;max_bw_6ghz_ap_lpi;</div><div class='add'>+	reg_info-&gt;min_bw_6ghz_ap[WMI_REG_STANDARD_POWER_AP] =</div><div class='add'>+			ev-&gt;min_bw_6ghz_ap_sp;</div><div class='add'>+	reg_info-&gt;max_bw_6ghz_ap[WMI_REG_STANDARD_POWER_AP] =</div><div class='add'>+			ev-&gt;max_bw_6ghz_ap_sp;</div><div class='add'>+	reg_info-&gt;min_bw_6ghz_ap[WMI_REG_VERY_LOW_POWER_AP] =</div><div class='add'>+			ev-&gt;min_bw_6ghz_ap_vlp;</div><div class='add'>+	reg_info-&gt;max_bw_6ghz_ap[WMI_REG_VERY_LOW_POWER_AP] =</div><div class='add'>+			ev-&gt;max_bw_6ghz_ap_vlp;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "6 GHz AP BW: LPI (%d - %d), SP (%d - %d), VLP (%d - %d)\n",</div><div class='add'>+		   reg_info-&gt;min_bw_6ghz_ap[WMI_REG_INDOOR_AP],</div><div class='add'>+		   reg_info-&gt;max_bw_6ghz_ap[WMI_REG_INDOOR_AP],</div><div class='add'>+		   reg_info-&gt;min_bw_6ghz_ap[WMI_REG_STANDARD_POWER_AP],</div><div class='add'>+		   reg_info-&gt;max_bw_6ghz_ap[WMI_REG_STANDARD_POWER_AP],</div><div class='add'>+		   reg_info-&gt;min_bw_6ghz_ap[WMI_REG_VERY_LOW_POWER_AP],</div><div class='add'>+		   reg_info-&gt;max_bw_6ghz_ap[WMI_REG_VERY_LOW_POWER_AP]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WMI_REG_MAX_CLIENT_TYPE; i++) {</div><div class='add'>+		reg_info-&gt;min_bw_6ghz_client[WMI_REG_INDOOR_AP][i] =</div><div class='add'>+				ev-&gt;min_bw_6ghz_client_lpi[i];</div><div class='add'>+		reg_info-&gt;max_bw_6ghz_client[WMI_REG_INDOOR_AP][i] =</div><div class='add'>+				ev-&gt;max_bw_6ghz_client_lpi[i];</div><div class='add'>+		reg_info-&gt;min_bw_6ghz_client[WMI_REG_STANDARD_POWER_AP][i] =</div><div class='add'>+				ev-&gt;min_bw_6ghz_client_sp[i];</div><div class='add'>+		reg_info-&gt;max_bw_6ghz_client[WMI_REG_STANDARD_POWER_AP][i] =</div><div class='add'>+				ev-&gt;max_bw_6ghz_client_sp[i];</div><div class='add'>+		reg_info-&gt;min_bw_6ghz_client[WMI_REG_VERY_LOW_POWER_AP][i] =</div><div class='add'>+				ev-&gt;min_bw_6ghz_client_vlp[i];</div><div class='add'>+		reg_info-&gt;max_bw_6ghz_client[WMI_REG_VERY_LOW_POWER_AP][i] =</div><div class='add'>+				ev-&gt;max_bw_6ghz_client_vlp[i];</div><div class='add'>+</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+			   "6 GHz %s BW: LPI (%d - %d), SP (%d - %d), VLP (%d - %d)\n",</div><div class='add'>+			   ath11k_6ghz_client_type_to_str(i),</div><div class='add'>+			   reg_info-&gt;min_bw_6ghz_client[WMI_REG_INDOOR_AP][i],</div><div class='add'>+			   reg_info-&gt;max_bw_6ghz_client[WMI_REG_INDOOR_AP][i],</div><div class='add'>+			   reg_info-&gt;min_bw_6ghz_client[WMI_REG_STANDARD_POWER_AP][i],</div><div class='add'>+			   reg_info-&gt;max_bw_6ghz_client[WMI_REG_STANDARD_POWER_AP][i],</div><div class='add'>+			   reg_info-&gt;min_bw_6ghz_client[WMI_REG_VERY_LOW_POWER_AP][i],</div><div class='add'>+			   reg_info-&gt;max_bw_6ghz_client[WMI_REG_VERY_LOW_POWER_AP][i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "cc_ext %s dfs %d BW: min_2ghz %d max_2ghz %d min_5ghz %d max_5ghz %d phy_bitmap 0x%x",</div><div class='add'>+		   reg_info-&gt;alpha2, reg_info-&gt;dfs_region,</div><div class='add'>+		   reg_info-&gt;min_bw_2ghz, reg_info-&gt;max_bw_2ghz,</div><div class='add'>+		   reg_info-&gt;min_bw_5ghz, reg_info-&gt;max_bw_5ghz,</div><div class='add'>+		   reg_info-&gt;phybitmap);</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "num_2ghz_reg_rules %d num_5ghz_reg_rules %d",</div><div class='add'>+		   num_2ghz_reg_rules, num_5ghz_reg_rules);</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "num_6ghz_reg_rules_ap_lpi: %d num_6ghz_reg_rules_ap_sp: %d num_6ghz_reg_rules_ap_vlp: %d",</div><div class='add'>+		   num_6ghz_reg_rules_ap[WMI_REG_INDOOR_AP],</div><div class='add'>+		   num_6ghz_reg_rules_ap[WMI_REG_STANDARD_POWER_AP],</div><div class='add'>+		   num_6ghz_reg_rules_ap[WMI_REG_VERY_LOW_POWER_AP]);</div><div class='add'>+</div><div class='add'>+	j = WMI_REG_DEFAULT_CLIENT;</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "6 GHz Regular client: num_6ghz_reg_rules_lpi: %d num_6ghz_reg_rules_sp: %d num_6ghz_reg_rules_vlp: %d",</div><div class='add'>+		   num_6ghz_client[WMI_REG_INDOOR_AP][j],</div><div class='add'>+		   num_6ghz_client[WMI_REG_STANDARD_POWER_AP][j],</div><div class='add'>+		   num_6ghz_client[WMI_REG_VERY_LOW_POWER_AP][j]);</div><div class='add'>+</div><div class='add'>+	j = WMI_REG_SUBORDINATE_CLIENT;</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "6 GHz Subordinate client: num_6ghz_reg_rules_lpi: %d num_6ghz_reg_rules_sp: %d num_6ghz_reg_rules_vlp: %d",</div><div class='add'>+		   num_6ghz_client[WMI_REG_INDOOR_AP][j],</div><div class='add'>+		   num_6ghz_client[WMI_REG_STANDARD_POWER_AP][j],</div><div class='add'>+		   num_6ghz_client[WMI_REG_VERY_LOW_POWER_AP][j]);</div><div class='add'>+</div><div class='add'>+	ext_wmi_reg_rule =</div><div class='add'>+		(struct wmi_regulatory_ext_rule *)((u8 *)ev + sizeof(*ev) +</div><div class='add'>+						   sizeof(struct wmi_tlv));</div><div class='add'>+	if (num_2ghz_reg_rules) {</div><div class='add'>+		reg_info-&gt;reg_rules_2ghz_ptr =</div><div class='add'>+			create_ext_reg_rules_from_wmi(num_2ghz_reg_rules,</div><div class='add'>+						      ext_wmi_reg_rule);</div><div class='add'>+</div><div class='add'>+		if (!reg_info-&gt;reg_rules_2ghz_ptr) {</div><div class='add'>+			kfree(tb);</div><div class='add'>+			ath11k_warn(ab, "Unable to Allocate memory for 2 GHz rules\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath11k_print_reg_rule(ab, "2 GHz",</div><div class='add'>+				      num_2ghz_reg_rules,</div><div class='add'>+				      reg_info-&gt;reg_rules_2ghz_ptr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ext_wmi_reg_rule += num_2ghz_reg_rules;</div><div class='add'>+</div><div class='add'>+	/* Firmware might include 6 GHz reg rule in 5 GHz rule list</div><div class='add'>+	 * for few countries along with separate 6 GHz rule.</div><div class='add'>+	 * Having same 6 GHz reg rule in 5 GHz and 6 GHz rules list</div><div class='add'>+	 * causes intersect check to be true, and same rules will be</div><div class='add'>+	 * shown multiple times in iw cmd.</div><div class='add'>+	 * Hence, avoid parsing 6 GHz rule from 5 GHz reg rule list</div><div class='add'>+	 */</div><div class='add'>+	num_invalid_5ghz_ext_rules =</div><div class='add'>+		ath11k_invalid_5ghz_reg_ext_rules_from_wmi(num_5ghz_reg_rules,</div><div class='add'>+							   ext_wmi_reg_rule);</div><div class='add'>+</div><div class='add'>+	if (num_invalid_5ghz_ext_rules) {</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+			   "CC: %s 5 GHz reg rules number %d from fw, %d number of invalid 5 GHz rules",</div><div class='add'>+			   reg_info-&gt;alpha2, reg_info-&gt;num_5ghz_reg_rules,</div><div class='add'>+			   num_invalid_5ghz_ext_rules);</div><div class='add'>+</div><div class='add'>+		num_5ghz_reg_rules = num_5ghz_reg_rules - num_invalid_5ghz_ext_rules;</div><div class='add'>+		reg_info-&gt;num_5ghz_reg_rules = num_5ghz_reg_rules;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (num_5ghz_reg_rules) {</div><div class='add'>+		reg_info-&gt;reg_rules_5ghz_ptr =</div><div class='add'>+			create_ext_reg_rules_from_wmi(num_5ghz_reg_rules,</div><div class='add'>+						      ext_wmi_reg_rule);</div><div class='add'>+</div><div class='add'>+		if (!reg_info-&gt;reg_rules_5ghz_ptr) {</div><div class='add'>+			kfree(tb);</div><div class='add'>+			ath11k_warn(ab, "Unable to Allocate memory for 5 GHz rules\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath11k_print_reg_rule(ab, "5 GHz",</div><div class='add'>+				      num_5ghz_reg_rules,</div><div class='add'>+				      reg_info-&gt;reg_rules_5ghz_ptr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We have adjusted the number of 5 GHz reg rules above. But still those</div><div class='add'>+	 * many rules needs to be adjusted in ext_wmi_reg_rule.</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE: num_invalid_5ghz_ext_rules will be 0 for rest other cases.</div><div class='add'>+	 */</div><div class='add'>+	ext_wmi_reg_rule += (num_5ghz_reg_rules + num_invalid_5ghz_ext_rules);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WMI_REG_CURRENT_MAX_AP_TYPE; i++) {</div><div class='add'>+		reg_info-&gt;reg_rules_6ghz_ap_ptr[i] =</div><div class='add'>+			create_ext_reg_rules_from_wmi(num_6ghz_reg_rules_ap[i],</div><div class='add'>+						      ext_wmi_reg_rule);</div><div class='add'>+</div><div class='add'>+		if (!reg_info-&gt;reg_rules_6ghz_ap_ptr[i]) {</div><div class='add'>+			kfree(tb);</div><div class='add'>+			ath11k_warn(ab, "Unable to Allocate memory for 6 GHz AP rules\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath11k_print_reg_rule(ab, ath11k_6ghz_ap_type_to_str(i),</div><div class='add'>+				      num_6ghz_reg_rules_ap[i],</div><div class='add'>+				      reg_info-&gt;reg_rules_6ghz_ap_ptr[i]);</div><div class='add'>+</div><div class='add'>+		ext_wmi_reg_rule += num_6ghz_reg_rules_ap[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; WMI_REG_CURRENT_MAX_AP_TYPE; j++) {</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+			   "6 GHz AP type %s", ath11k_6ghz_ap_type_to_str(j));</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; WMI_REG_MAX_CLIENT_TYPE; i++) {</div><div class='add'>+			reg_info-&gt;reg_rules_6ghz_client_ptr[j][i] =</div><div class='add'>+				create_ext_reg_rules_from_wmi(num_6ghz_client[j][i],</div><div class='add'>+							      ext_wmi_reg_rule);</div><div class='add'>+</div><div class='add'>+			if (!reg_info-&gt;reg_rules_6ghz_client_ptr[j][i]) {</div><div class='add'>+				kfree(tb);</div><div class='add'>+				ath11k_warn(ab, "Unable to Allocate memory for 6 GHz client rules\n");</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ath11k_print_reg_rule(ab,</div><div class='add'>+					      ath11k_6ghz_client_type_to_str(i),</div><div class='add'>+					      num_6ghz_client[j][i],</div><div class='add'>+					      reg_info-&gt;reg_rules_6ghz_client_ptr[j][i]);</div><div class='add'>+</div><div class='add'>+			ext_wmi_reg_rule += num_6ghz_client[j][i];</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg_info-&gt;client_type = ev-&gt;client_type;</div><div class='add'>+	reg_info-&gt;rnr_tpe_usable = ev-&gt;rnr_tpe_usable;</div><div class='add'>+	reg_info-&gt;unspecified_ap_usable =</div><div class='add'>+			ev-&gt;unspecified_ap_usable;</div><div class='add'>+	reg_info-&gt;domain_code_6ghz_ap[WMI_REG_INDOOR_AP] =</div><div class='add'>+			ev-&gt;domain_code_6ghz_ap_lpi;</div><div class='add'>+	reg_info-&gt;domain_code_6ghz_ap[WMI_REG_STANDARD_POWER_AP] =</div><div class='add'>+			ev-&gt;domain_code_6ghz_ap_sp;</div><div class='add'>+	reg_info-&gt;domain_code_6ghz_ap[WMI_REG_VERY_LOW_POWER_AP] =</div><div class='add'>+			ev-&gt;domain_code_6ghz_ap_vlp;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "6 GHz reg info client type %s rnr_tpe_usable %d unspecified_ap_usable %d AP sub domain: lpi %s, sp %s, vlp %s\n",</div><div class='add'>+		   ath11k_6ghz_client_type_to_str(reg_info-&gt;client_type),</div><div class='add'>+		   reg_info-&gt;rnr_tpe_usable,</div><div class='add'>+		   reg_info-&gt;unspecified_ap_usable,</div><div class='add'>+		   ath11k_sub_reg_6ghz_to_str(ev-&gt;domain_code_6ghz_ap_lpi),</div><div class='add'>+		   ath11k_sub_reg_6ghz_to_str(ev-&gt;domain_code_6ghz_ap_sp),</div><div class='add'>+		   ath11k_sub_reg_6ghz_to_str(ev-&gt;domain_code_6ghz_ap_vlp));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WMI_REG_MAX_CLIENT_TYPE; i++) {</div><div class='add'>+		reg_info-&gt;domain_code_6ghz_client[WMI_REG_INDOOR_AP][i] =</div><div class='add'>+				ev-&gt;domain_code_6ghz_client_lpi[i];</div><div class='add'>+		reg_info-&gt;domain_code_6ghz_client[WMI_REG_STANDARD_POWER_AP][i] =</div><div class='add'>+				ev-&gt;domain_code_6ghz_client_sp[i];</div><div class='add'>+		reg_info-&gt;domain_code_6ghz_client[WMI_REG_VERY_LOW_POWER_AP][i] =</div><div class='add'>+				ev-&gt;domain_code_6ghz_client_vlp[i];</div><div class='add'>+</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+			   "6 GHz client type %s client sub domain: lpi %s, sp %s, vlp %s\n",</div><div class='add'>+			   ath11k_6ghz_client_type_to_str(i),</div><div class='add'>+			   ath11k_sub_reg_6ghz_to_str(ev-&gt;domain_code_6ghz_client_lpi[i]),</div><div class='add'>+			   ath11k_sub_reg_6ghz_to_str(ev-&gt;domain_code_6ghz_client_sp[i]),</div><div class='add'>+			   ath11k_sub_reg_6ghz_to_str(ev-&gt;domain_code_6ghz_client_vlp[i])</div><div class='add'>+			  );</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg_info-&gt;domain_code_6ghz_super_id = ev-&gt;domain_code_6ghz_super_id;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "6 GHz client_type %s 6 GHz super domain %s",</div><div class='add'>+		   ath11k_6ghz_client_type_to_str(reg_info-&gt;client_type),</div><div class='add'>+		   ath11k_super_reg_6ghz_to_str(reg_info-&gt;domain_code_6ghz_super_id));</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "processed regulatory ext channel list\n");</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath11k_pull_peer_del_resp_ev(struct ath11k_base *ab, struct sk_buff *skb,</div><div class='ctx'> 					struct wmi_peer_delete_resp_event *peer_del_resp)</div><div class='ctx'> {</div><div class='hunk'>@@ -4590,7 +5759,7 @@ static int ath11k_pull_peer_del_resp_ev(struct ath11k_base *ab, struct sk_buff *</div><div class='ctx'> 	const struct wmi_peer_delete_resp_event *ev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, skb-&gt;data, skb-&gt;len, GFP_ATOMIC);</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='ctx'> 	if (IS_ERR(tb)) {</div><div class='ctx'> 		ret = PTR_ERR(tb);</div><div class='ctx'> 		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='hunk'>@@ -4622,7 +5791,7 @@ static int ath11k_pull_vdev_del_resp_ev(struct ath11k_base *ab,</div><div class='ctx'> 	const struct wmi_vdev_delete_resp_event *ev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, skb-&gt;data, skb-&gt;len, GFP_ATOMIC);</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='ctx'> 	if (IS_ERR(tb)) {</div><div class='ctx'> 		ret = PTR_ERR(tb);</div><div class='ctx'> 		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='hunk'>@@ -4642,15 +5811,15 @@ static int ath11k_pull_vdev_del_resp_ev(struct ath11k_base *ab,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_pull_bcn_tx_status_ev(struct ath11k_base *ab, void *evt_buf,</div><div class='del'>-					u32 len, u32 *vdev_id,</div><div class='del'>-					u32 *tx_status)</div><div class='add'>+static int ath11k_pull_bcn_tx_status_ev(struct ath11k_base *ab,</div><div class='add'>+					struct sk_buff *skb,</div><div class='add'>+					u32 *vdev_id, u32 *tx_status)</div><div class='ctx'> {</div><div class='ctx'> 	const void **tb;</div><div class='ctx'> 	const struct wmi_bcn_tx_status_event *ev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, evt_buf, len, GFP_ATOMIC);</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='ctx'> 	if (IS_ERR(tb)) {</div><div class='ctx'> 		ret = PTR_ERR(tb);</div><div class='ctx'> 		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='hunk'>@@ -4678,7 +5847,7 @@ static int ath11k_pull_vdev_stopped_param_tlv(struct ath11k_base *ab, struct sk_</div><div class='ctx'> 	const struct wmi_vdev_stopped_event *ev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, skb-&gt;data, skb-&gt;len, GFP_ATOMIC);</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='ctx'> 	if (IS_ERR(tb)) {</div><div class='ctx'> 		ret = PTR_ERR(tb);</div><div class='ctx'> 		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='hunk'>@@ -4698,28 +5867,49 @@ static int ath11k_pull_vdev_stopped_param_tlv(struct ath11k_base *ab, struct sk_</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ath11k_wmi_tlv_mgmt_rx_parse(struct ath11k_base *ab,</div><div class='add'>+					u16 tag, u16 len,</div><div class='add'>+					const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct wmi_tlv_mgmt_rx_parse *parse = data;</div><div class='add'>+</div><div class='add'>+	switch (tag) {</div><div class='add'>+	case WMI_TAG_MGMT_RX_HDR:</div><div class='add'>+		parse-&gt;fixed = ptr;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TAG_ARRAY_BYTE:</div><div class='add'>+		if (!parse-&gt;frame_buf_done) {</div><div class='add'>+			parse-&gt;frame_buf = ptr;</div><div class='add'>+			parse-&gt;frame_buf_done = true;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath11k_pull_mgmt_rx_params_tlv(struct ath11k_base *ab,</div><div class='ctx'> 					  struct sk_buff *skb,</div><div class='ctx'> 					  struct mgmt_rx_event_params *hdr)</div><div class='ctx'> {</div><div class='del'>-	const void **tb;</div><div class='add'>+	struct wmi_tlv_mgmt_rx_parse parse = { };</div><div class='ctx'> 	const struct wmi_mgmt_rx_hdr *ev;</div><div class='ctx'> 	const u8 *frame;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, skb-&gt;data, skb-&gt;len, GFP_ATOMIC);</div><div class='del'>-	if (IS_ERR(tb)) {</div><div class='del'>-		ret = PTR_ERR(tb);</div><div class='del'>-		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+	ret = ath11k_wmi_tlv_iter(ab, skb-&gt;data, skb-&gt;len,</div><div class='add'>+				  ath11k_wmi_tlv_mgmt_rx_parse,</div><div class='add'>+				  &amp;parse);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to parse mgmt rx tlv %d\n",</div><div class='add'>+			    ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ev = tb[WMI_TAG_MGMT_RX_HDR];</div><div class='del'>-	frame = tb[WMI_TAG_ARRAY_BYTE];</div><div class='add'>+	ev = parse.fixed;</div><div class='add'>+	frame = parse.frame_buf;</div><div class='ctx'> </div><div class='ctx'> 	if (!ev || !frame) {</div><div class='ctx'> 		ath11k_warn(ab, "failed to fetch mgmt rx hdr");</div><div class='del'>-		kfree(tb);</div><div class='ctx'> 		return -EPROTO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4738,7 +5928,6 @@ static int ath11k_pull_mgmt_rx_params_tlv(struct ath11k_base *ab,</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &lt; (frame - skb-&gt;data) + hdr-&gt;buf_len) {</div><div class='ctx'> 		ath11k_warn(ab, "invalid length in mgmt rx hdr ev");</div><div class='del'>-		kfree(tb);</div><div class='ctx'> 		return -EPROTO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4750,43 +5939,60 @@ static int ath11k_pull_mgmt_rx_params_tlv(struct ath11k_base *ab,</div><div class='ctx'> </div><div class='ctx'> 	ath11k_ce_byte_swap(skb-&gt;data, hdr-&gt;buf_len);</div><div class='ctx'> </div><div class='del'>-	kfree(tb);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wmi_process_mgmt_tx_comp(struct ath11k *ar, u32 desc_id,</div><div class='del'>-				    u32 status)</div><div class='add'>+static int wmi_process_mgmt_tx_comp(struct ath11k *ar,</div><div class='add'>+				    struct wmi_mgmt_tx_compl_event *tx_compl_param)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *msdu;</div><div class='ctx'> 	struct ieee80211_tx_info *info;</div><div class='ctx'> 	struct ath11k_skb_cb *skb_cb;</div><div class='add'>+	int num_mgmt;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ar-&gt;txmgmt_idr_lock);</div><div class='del'>-	msdu = idr_find(&amp;ar-&gt;txmgmt_idr, desc_id);</div><div class='add'>+	msdu = idr_find(&amp;ar-&gt;txmgmt_idr, tx_compl_param-&gt;desc_id);</div><div class='ctx'> </div><div class='ctx'> 	if (!msdu) {</div><div class='ctx'> 		ath11k_warn(ar-&gt;ab, "received mgmt tx compl for invalid msdu_id: %d\n",</div><div class='del'>-			    desc_id);</div><div class='add'>+			    tx_compl_param-&gt;desc_id);</div><div class='ctx'> 		spin_unlock_bh(&amp;ar-&gt;txmgmt_idr_lock);</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	idr_remove(&amp;ar-&gt;txmgmt_idr, desc_id);</div><div class='add'>+	idr_remove(&amp;ar-&gt;txmgmt_idr, tx_compl_param-&gt;desc_id);</div><div class='ctx'> 	spin_unlock_bh(&amp;ar-&gt;txmgmt_idr_lock);</div><div class='ctx'> </div><div class='ctx'> 	skb_cb = ATH11K_SKB_CB(msdu);</div><div class='ctx'> 	dma_unmap_single(ar-&gt;ab-&gt;dev, skb_cb-&gt;paddr, msdu-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	info = IEEE80211_SKB_CB(msdu);</div><div class='del'>-	if ((!(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)) &amp;&amp; !status)</div><div class='add'>+	memset(&amp;info-&gt;status, 0, sizeof(info-&gt;status));</div><div class='add'>+	info-&gt;status.rates[0].idx = -1;</div><div class='add'>+</div><div class='add'>+	if ((!(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)) &amp;&amp;</div><div class='add'>+	    !tx_compl_param-&gt;status) {</div><div class='ctx'> 		info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='add'>+		if (test_bit(WMI_TLV_SERVICE_TX_DATA_MGMT_ACK_RSSI,</div><div class='add'>+			     ar-&gt;ab-&gt;wmi_ab.svc_map))</div><div class='add'>+			info-&gt;status.ack_signal = tx_compl_param-&gt;ack_rssi;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_tx_status_irqsafe(ar-&gt;hw, msdu);</div><div class='ctx'> </div><div class='add'>+	num_mgmt = atomic_dec_if_positive(&amp;ar-&gt;num_pending_mgmt_tx);</div><div class='add'>+</div><div class='ctx'> 	/* WARN when we received this event without doing any mgmt tx */</div><div class='del'>-	if (atomic_dec_if_positive(&amp;ar-&gt;num_pending_mgmt_tx) &lt; 0)</div><div class='add'>+	if (num_mgmt &lt; 0)</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "mgmt tx comp pending %d desc id %d\n",</div><div class='add'>+		   num_mgmt, tx_compl_param-&gt;desc_id);</div><div class='add'>+</div><div class='add'>+	if (!num_mgmt)</div><div class='add'>+		wake_up(&amp;ar-&gt;txmgmt_empty_waitq);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4798,7 +6004,7 @@ static int ath11k_pull_mgmt_tx_compl_param_tlv(struct ath11k_base *ab,</div><div class='ctx'> 	const struct wmi_mgmt_tx_compl_event *ev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, skb-&gt;data, skb-&gt;len, GFP_ATOMIC);</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='ctx'> 	if (IS_ERR(tb)) {</div><div class='ctx'> 		ret = PTR_ERR(tb);</div><div class='ctx'> 		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='hunk'>@@ -4815,6 +6021,7 @@ static int ath11k_pull_mgmt_tx_compl_param_tlv(struct ath11k_base *ab,</div><div class='ctx'> 	param-&gt;pdev_id = ev-&gt;pdev_id;</div><div class='ctx'> 	param-&gt;desc_id = ev-&gt;desc_id;</div><div class='ctx'> 	param-&gt;status = ev-&gt;status;</div><div class='add'>+	param-&gt;ack_rssi = ev-&gt;ack_rssi;</div><div class='ctx'> </div><div class='ctx'> 	kfree(tb);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -4834,6 +6041,8 @@ static void ath11k_wmi_event_scan_started(struct ath11k *ar)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ATH11K_SCAN_STARTING:</div><div class='ctx'> 		ar-&gt;scan.state = ATH11K_SCAN_RUNNING;</div><div class='add'>+		if (ar-&gt;scan.is_roc)</div><div class='add'>+			ieee80211_ready_on_channel(ar-&gt;hw);</div><div class='ctx'> 		complete(&amp;ar-&gt;scan.started);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4916,6 +6125,8 @@ static void ath11k_wmi_event_scan_foreign_chan(struct ath11k *ar, u32 freq)</div><div class='ctx'> 	case ATH11K_SCAN_RUNNING:</div><div class='ctx'> 	case ATH11K_SCAN_ABORTING:</div><div class='ctx'> 		ar-&gt;scan_channel = ieee80211_get_channel(ar-&gt;hw-&gt;wiphy, freq);</div><div class='add'>+		if (ar-&gt;scan.is_roc &amp;&amp; ar-&gt;scan.roc_freq == freq)</div><div class='add'>+			complete(&amp;ar-&gt;scan.on_channel);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -4969,7 +6180,7 @@ static int ath11k_pull_scan_ev(struct ath11k_base *ab, struct sk_buff *skb,</div><div class='ctx'> 	const struct wmi_scan_event *ev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, skb-&gt;data, skb-&gt;len, GFP_ATOMIC);</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='ctx'> 	if (IS_ERR(tb)) {</div><div class='ctx'> 		ret = PTR_ERR(tb);</div><div class='ctx'> 		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='hunk'>@@ -5002,7 +6213,7 @@ static int ath11k_pull_peer_sta_kickout_ev(struct ath11k_base *ab, struct sk_buf</div><div class='ctx'> 	const struct wmi_peer_sta_kickout_event *ev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, skb-&gt;data, skb-&gt;len, GFP_ATOMIC);</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='ctx'> 	if (IS_ERR(tb)) {</div><div class='ctx'> 		ret = PTR_ERR(tb);</div><div class='ctx'> 		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='hunk'>@@ -5029,7 +6240,7 @@ static int ath11k_pull_roam_ev(struct ath11k_base *ab, struct sk_buff *skb,</div><div class='ctx'> 	const struct wmi_roam_event *ev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, skb-&gt;data, skb-&gt;len, GFP_ATOMIC);</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='ctx'> 	if (IS_ERR(tb)) {</div><div class='ctx'> 		ret = PTR_ERR(tb);</div><div class='ctx'> 		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='hunk'>@@ -5070,14 +6281,14 @@ exit:</div><div class='ctx'> 	return idx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_pull_chan_info_ev(struct ath11k_base *ab, u8 *evt_buf,</div><div class='del'>-				    u32 len, struct wmi_chan_info_event *ch_info_ev)</div><div class='add'>+static int ath11k_pull_chan_info_ev(struct ath11k_base *ab, struct sk_buff *skb,</div><div class='add'>+				    struct wmi_chan_info_event *ch_info_ev)</div><div class='ctx'> {</div><div class='ctx'> 	const void **tb;</div><div class='ctx'> 	const struct wmi_chan_info_event *ev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, evt_buf, len, GFP_ATOMIC);</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='ctx'> 	if (IS_ERR(tb)) {</div><div class='ctx'> 		ret = PTR_ERR(tb);</div><div class='ctx'> 		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='hunk'>@@ -5116,7 +6327,7 @@ ath11k_pull_pdev_bss_chan_info_ev(struct ath11k_base *ab, struct sk_buff *skb,</div><div class='ctx'> 	const struct wmi_pdev_bss_chan_info_event *ev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, skb-&gt;data, skb-&gt;len, GFP_ATOMIC);</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='ctx'> 	if (IS_ERR(tb)) {</div><div class='ctx'> 		ret = PTR_ERR(tb);</div><div class='ctx'> 		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='hunk'>@@ -5156,7 +6367,7 @@ ath11k_pull_vdev_install_key_compl_ev(struct ath11k_base *ab, struct sk_buff *sk</div><div class='ctx'> 	const struct wmi_vdev_install_key_compl_event *ev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, skb-&gt;data, skb-&gt;len, GFP_ATOMIC);</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='ctx'> 	if (IS_ERR(tb)) {</div><div class='ctx'> 		ret = PTR_ERR(tb);</div><div class='ctx'> 		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='hunk'>@@ -5187,7 +6398,7 @@ static int ath11k_pull_peer_assoc_conf_ev(struct ath11k_base *ab, struct sk_buff</div><div class='ctx'> 	const struct wmi_peer_assoc_conf_event *ev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, skb-&gt;data, skb-&gt;len, GFP_ATOMIC);</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='ctx'> 	if (IS_ERR(tb)) {</div><div class='ctx'> 		ret = PTR_ERR(tb);</div><div class='ctx'> 		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='hunk'>@@ -5234,9 +6445,11 @@ ath11k_wmi_pull_pdev_stats_tx(const struct wmi_pdev_stats_tx *src,</div><div class='ctx'> 	dst-&gt;hw_queued = src-&gt;hw_queued;</div><div class='ctx'> 	dst-&gt;hw_reaped = src-&gt;hw_reaped;</div><div class='ctx'> 	dst-&gt;underrun = src-&gt;underrun;</div><div class='add'>+	dst-&gt;hw_paused = src-&gt;hw_paused;</div><div class='ctx'> 	dst-&gt;tx_abort = src-&gt;tx_abort;</div><div class='del'>-	dst-&gt;mpdus_requed = src-&gt;mpdus_requed;</div><div class='add'>+	dst-&gt;mpdus_requeued = src-&gt;mpdus_requeued;</div><div class='ctx'> 	dst-&gt;tx_ko = src-&gt;tx_ko;</div><div class='add'>+	dst-&gt;tx_xretry = src-&gt;tx_xretry;</div><div class='ctx'> 	dst-&gt;data_rc = src-&gt;data_rc;</div><div class='ctx'> 	dst-&gt;self_triggers = src-&gt;self_triggers;</div><div class='ctx'> 	dst-&gt;sw_retry_failure = src-&gt;sw_retry_failure;</div><div class='hunk'>@@ -5247,6 +6460,16 @@ ath11k_wmi_pull_pdev_stats_tx(const struct wmi_pdev_stats_tx *src,</div><div class='ctx'> 	dst-&gt;stateless_tid_alloc_failure = src-&gt;stateless_tid_alloc_failure;</div><div class='ctx'> 	dst-&gt;phy_underrun = src-&gt;phy_underrun;</div><div class='ctx'> 	dst-&gt;txop_ovf = src-&gt;txop_ovf;</div><div class='add'>+	dst-&gt;seq_posted = src-&gt;seq_posted;</div><div class='add'>+	dst-&gt;seq_failed_queueing = src-&gt;seq_failed_queueing;</div><div class='add'>+	dst-&gt;seq_completed = src-&gt;seq_completed;</div><div class='add'>+	dst-&gt;seq_restarted = src-&gt;seq_restarted;</div><div class='add'>+	dst-&gt;mu_seq_posted = src-&gt;mu_seq_posted;</div><div class='add'>+	dst-&gt;mpdus_sw_flush = src-&gt;mpdus_sw_flush;</div><div class='add'>+	dst-&gt;mpdus_hw_filter = src-&gt;mpdus_hw_filter;</div><div class='add'>+	dst-&gt;mpdus_truncated = src-&gt;mpdus_truncated;</div><div class='add'>+	dst-&gt;mpdus_ack_failed = src-&gt;mpdus_ack_failed;</div><div class='add'>+	dst-&gt;mpdus_expired = src-&gt;mpdus_expired;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_wmi_pull_pdev_stats_rx(const struct wmi_pdev_stats_rx *src,</div><div class='hunk'>@@ -5266,6 +6489,7 @@ static void ath11k_wmi_pull_pdev_stats_rx(const struct wmi_pdev_stats_rx *src,</div><div class='ctx'> 	dst-&gt;phy_errs = src-&gt;phy_errs;</div><div class='ctx'> 	dst-&gt;phy_err_drop = src-&gt;phy_err_drop;</div><div class='ctx'> 	dst-&gt;mpdu_errs = src-&gt;mpdu_errs;</div><div class='add'>+	dst-&gt;rx_ovfl_errs = src-&gt;rx_ovfl_errs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -5309,47 +6533,107 @@ ath11k_wmi_pull_bcn_stats(const struct wmi_bcn_stats *src,</div><div class='ctx'> 	dst-&gt;tx_bcn_outage_cnt = src-&gt;tx_bcn_outage_cnt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath11k_wmi_pull_fw_stats(struct ath11k_base *ab, struct sk_buff *skb,</div><div class='del'>-			     struct ath11k_fw_stats *stats)</div><div class='add'>+static int ath11k_wmi_tlv_rssi_chain_parse(struct ath11k_base *ab,</div><div class='add'>+					   u16 tag, u16 len,</div><div class='add'>+					   const void *ptr, void *data)</div><div class='ctx'> {</div><div class='del'>-	const void **tb;</div><div class='del'>-	const struct wmi_stats_event *ev;</div><div class='del'>-	const void *data;</div><div class='del'>-	int i, ret;</div><div class='del'>-	u32 len = skb-&gt;len;</div><div class='add'>+	struct wmi_tlv_fw_stats_parse *parse = data;</div><div class='add'>+	const struct wmi_stats_event *ev = parse-&gt;ev;</div><div class='add'>+	struct ath11k_fw_stats *stats = parse-&gt;stats;</div><div class='add'>+	struct ath11k *ar;</div><div class='add'>+	struct ath11k_vif *arvif;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct ath11k_sta *arsta;</div><div class='add'>+	const struct wmi_rssi_stats *stats_rssi = (const struct wmi_rssi_stats *)ptr;</div><div class='add'>+	int j, ret = 0;</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, skb-&gt;data, len, GFP_ATOMIC);</div><div class='del'>-	if (IS_ERR(tb)) {</div><div class='del'>-		ret = PTR_ERR(tb);</div><div class='del'>-		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='del'>-		return ret;</div><div class='add'>+	if (tag != WMI_TAG_RSSI_STATS)</div><div class='add'>+		return -EPROTO;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	ar = ath11k_mac_get_ar_by_pdev_id(ab, ev-&gt;pdev_id);</div><div class='add'>+	stats-&gt;stats_id = WMI_REQUEST_RSSI_PER_CHAIN_STAT;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "stats vdev id %d mac %pM\n",</div><div class='add'>+		   stats_rssi-&gt;vdev_id, stats_rssi-&gt;peer_macaddr.addr);</div><div class='add'>+</div><div class='add'>+	arvif = ath11k_mac_get_arvif(ar, stats_rssi-&gt;vdev_id);</div><div class='add'>+	if (!arvif) {</div><div class='add'>+		ath11k_warn(ab, "not found vif for vdev id %d\n",</div><div class='add'>+			    stats_rssi-&gt;vdev_id);</div><div class='add'>+		ret = -EPROTO;</div><div class='add'>+		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ev = tb[WMI_TAG_STATS_EVENT];</div><div class='del'>-	data = tb[WMI_TAG_ARRAY_BYTE];</div><div class='del'>-	if (!ev || !data) {</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "stats bssid %pM vif %p\n",</div><div class='add'>+		   arvif-&gt;bssid, arvif-&gt;vif);</div><div class='add'>+</div><div class='add'>+	sta = ieee80211_find_sta_by_ifaddr(ar-&gt;hw,</div><div class='add'>+					   arvif-&gt;bssid,</div><div class='add'>+					   NULL);</div><div class='add'>+	if (!sta) {</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+			   "not found station of bssid %pM for rssi chain\n",</div><div class='add'>+			   arvif-&gt;bssid);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arsta = ath11k_sta_to_arsta(sta);</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(arsta-&gt;chain_signal) &gt;</div><div class='add'>+		     ARRAY_SIZE(stats_rssi-&gt;rssi_avg_beacon));</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; ARRAY_SIZE(arsta-&gt;chain_signal); j++) {</div><div class='add'>+		arsta-&gt;chain_signal[j] = stats_rssi-&gt;rssi_avg_beacon[j];</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+			   "stats beacon rssi[%d] %d data rssi[%d] %d\n",</div><div class='add'>+			   j,</div><div class='add'>+			   stats_rssi-&gt;rssi_avg_beacon[j],</div><div class='add'>+			   j,</div><div class='add'>+			   stats_rssi-&gt;rssi_avg_data[j]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_wmi_tlv_fw_stats_data_parse(struct ath11k_base *ab,</div><div class='add'>+					      struct wmi_tlv_fw_stats_parse *parse,</div><div class='add'>+					      const void *ptr,</div><div class='add'>+					      u16 len)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_fw_stats *stats = parse-&gt;stats;</div><div class='add'>+	const struct wmi_stats_event *ev = parse-&gt;ev;</div><div class='add'>+	struct ath11k *ar;</div><div class='add'>+	struct ath11k_vif *arvif;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct ath11k_sta *arsta;</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+	const void *data = ptr;</div><div class='add'>+</div><div class='add'>+	if (!ev) {</div><div class='ctx'> 		ath11k_warn(ab, "failed to fetch update stats ev");</div><div class='del'>-		kfree(tb);</div><div class='ctx'> 		return -EPROTO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "wmi stats update ev pdev_id %d pdev %i vdev %i bcn %i\n",</div><div class='del'>-		   ev-&gt;pdev_id,</div><div class='del'>-		   ev-&gt;num_pdev_stats, ev-&gt;num_vdev_stats,</div><div class='del'>-		   ev-&gt;num_bcn_stats);</div><div class='del'>-</div><div class='del'>-	stats-&gt;pdev_id = ev-&gt;pdev_id;</div><div class='ctx'> 	stats-&gt;stats_id = 0;</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	ar = ath11k_mac_get_ar_by_pdev_id(ab, ev-&gt;pdev_id);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ev-&gt;num_pdev_stats; i++) {</div><div class='ctx'> 		const struct wmi_pdev_stats *src;</div><div class='ctx'> 		struct ath11k_fw_stats_pdev *dst;</div><div class='ctx'> </div><div class='ctx'> 		src = data;</div><div class='ctx'> 		if (len &lt; sizeof(*src)) {</div><div class='del'>-			kfree(tb);</div><div class='del'>-			return -EPROTO;</div><div class='add'>+			ret = -EPROTO;</div><div class='add'>+			goto exit;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		stats-&gt;stats_id = WMI_REQUEST_PDEV_STAT;</div><div class='hunk'>@@ -5373,12 +6657,30 @@ int ath11k_wmi_pull_fw_stats(struct ath11k_base *ab, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 		src = data;</div><div class='ctx'> 		if (len &lt; sizeof(*src)) {</div><div class='del'>-			kfree(tb);</div><div class='del'>-			return -EPROTO;</div><div class='add'>+			ret = -EPROTO;</div><div class='add'>+			goto exit;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		stats-&gt;stats_id = WMI_REQUEST_VDEV_STAT;</div><div class='ctx'> </div><div class='add'>+		arvif = ath11k_mac_get_arvif(ar, src-&gt;vdev_id);</div><div class='add'>+		if (arvif) {</div><div class='add'>+			sta = ieee80211_find_sta_by_ifaddr(ar-&gt;hw,</div><div class='add'>+							   arvif-&gt;bssid,</div><div class='add'>+							   NULL);</div><div class='add'>+			if (sta) {</div><div class='add'>+				arsta = ath11k_sta_to_arsta(sta);</div><div class='add'>+				arsta-&gt;rssi_beacon = src-&gt;beacon_snr;</div><div class='add'>+				ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+					   "stats vdev id %d snr %d\n",</div><div class='add'>+					   src-&gt;vdev_id, src-&gt;beacon_snr);</div><div class='add'>+			} else {</div><div class='add'>+				ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+					   "not found station of bssid %pM for vdev stat\n",</div><div class='add'>+					   arvif-&gt;bssid);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		data += sizeof(*src);</div><div class='ctx'> 		len -= sizeof(*src);</div><div class='ctx'> </div><div class='hunk'>@@ -5396,8 +6698,8 @@ int ath11k_wmi_pull_fw_stats(struct ath11k_base *ab, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 		src = data;</div><div class='ctx'> 		if (len &lt; sizeof(*src)) {</div><div class='del'>-			kfree(tb);</div><div class='del'>-			return -EPROTO;</div><div class='add'>+			ret = -EPROTO;</div><div class='add'>+			goto exit;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		stats-&gt;stats_id = WMI_REQUEST_BCN_STAT;</div><div class='hunk'>@@ -5413,30 +6715,67 @@ int ath11k_wmi_pull_fw_stats(struct ath11k_base *ab, struct sk_buff *skb,</div><div class='ctx'> 		list_add_tail(&amp;dst-&gt;list, &amp;stats-&gt;bcn);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(tb);</div><div class='del'>-	return 0;</div><div class='add'>+exit:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-size_t ath11k_wmi_fw_stats_num_vdevs(struct list_head *head)</div><div class='add'>+static int ath11k_wmi_tlv_fw_stats_parse(struct ath11k_base *ab,</div><div class='add'>+					 u16 tag, u16 len,</div><div class='add'>+					 const void *ptr, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_fw_stats_vdev *i;</div><div class='del'>-	size_t num = 0;</div><div class='add'>+	struct wmi_tlv_fw_stats_parse *parse = data;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(i, head, list)</div><div class='del'>-		++num;</div><div class='add'>+	switch (tag) {</div><div class='add'>+	case WMI_TAG_STATS_EVENT:</div><div class='add'>+		parse-&gt;ev = (struct wmi_stats_event *)ptr;</div><div class='add'>+		parse-&gt;stats-&gt;pdev_id = parse-&gt;ev-&gt;pdev_id;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TAG_ARRAY_BYTE:</div><div class='add'>+		ret = ath11k_wmi_tlv_fw_stats_data_parse(ab, parse, ptr, len);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TAG_PER_CHAIN_RSSI_STATS:</div><div class='add'>+		parse-&gt;rssi = (struct wmi_per_chain_rssi_stats *)ptr;</div><div class='ctx'> </div><div class='del'>-	return num;</div><div class='add'>+		if (parse-&gt;ev-&gt;stats_id &amp; WMI_REQUEST_RSSI_PER_CHAIN_STAT)</div><div class='add'>+			parse-&gt;rssi_num = parse-&gt;rssi-&gt;num_per_chain_rssi_stats;</div><div class='add'>+</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+			   "stats id 0x%x num chain %d\n",</div><div class='add'>+			   parse-&gt;ev-&gt;stats_id,</div><div class='add'>+			   parse-&gt;rssi_num);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TAG_ARRAY_STRUCT:</div><div class='add'>+		if (parse-&gt;rssi_num &amp;&amp; !parse-&gt;chain_rssi_done) {</div><div class='add'>+			ret = ath11k_wmi_tlv_iter(ab, ptr, len,</div><div class='add'>+						  ath11k_wmi_tlv_rssi_chain_parse,</div><div class='add'>+						  parse);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath11k_warn(ab, "failed to parse rssi chain %d\n",</div><div class='add'>+					    ret);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+			parse-&gt;chain_rssi_done = true;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static size_t ath11k_wmi_fw_stats_num_bcn(struct list_head *head)</div><div class='add'>+int ath11k_wmi_pull_fw_stats(struct ath11k_base *ab, struct sk_buff *skb,</div><div class='add'>+			     struct ath11k_fw_stats *stats)</div><div class='ctx'> {</div><div class='del'>-	struct ath11k_fw_stats_bcn *i;</div><div class='del'>-	size_t num = 0;</div><div class='add'>+	struct wmi_tlv_fw_stats_parse parse = { };</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(i, head, list)</div><div class='del'>-		++num;</div><div class='add'>+	stats-&gt;stats_id = 0;</div><div class='add'>+	parse.stats = stats;</div><div class='ctx'> </div><div class='del'>-	return num;</div><div class='add'>+	return ath11k_wmi_tlv_iter(ab, skb-&gt;data, skb-&gt;len,</div><div class='add'>+				   ath11k_wmi_tlv_fw_stats_parse,</div><div class='add'>+				   &amp;parse);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -5503,11 +6842,15 @@ ath11k_wmi_fw_pdev_tx_stats_fill(const struct ath11k_fw_stats_pdev *pdev,</div><div class='ctx'> 	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='ctx'> 			 "Num underruns", pdev-&gt;underrun);</div><div class='ctx'> 	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "Num HW Paused", pdev-&gt;hw_paused);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='ctx'> 			 "PPDUs cleaned", pdev-&gt;tx_abort);</div><div class='ctx'> 	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='del'>-			 "MPDUs requed", pdev-&gt;mpdus_requed);</div><div class='add'>+			 "MPDUs requeued", pdev-&gt;mpdus_requeued);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			 "PPDU OK", pdev-&gt;tx_ko);</div><div class='ctx'> 	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='del'>-			 "Excessive retries", pdev-&gt;tx_ko);</div><div class='add'>+			 "Excessive retries", pdev-&gt;tx_xretry);</div><div class='ctx'> 	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='ctx'> 			 "HW rate", pdev-&gt;data_rc);</div><div class='ctx'> 	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='hunk'>@@ -5531,6 +6874,26 @@ ath11k_wmi_fw_pdev_tx_stats_fill(const struct ath11k_fw_stats_pdev *pdev,</div><div class='ctx'> 			 "PHY underrun", pdev-&gt;phy_underrun);</div><div class='ctx'> 	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='ctx'> 			 "MPDU is more than txop limit", pdev-&gt;txop_ovf);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			 "Num sequences posted", pdev-&gt;seq_posted);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			 "Num seq failed queueing ", pdev-&gt;seq_failed_queueing);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			 "Num sequences completed ", pdev-&gt;seq_completed);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			 "Num sequences restarted ", pdev-&gt;seq_restarted);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			 "Num of MU sequences posted ", pdev-&gt;mu_seq_posted);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			 "Num of MPDUS SW flushed ", pdev-&gt;mpdus_sw_flush);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			 "Num of MPDUS HW filtered ", pdev-&gt;mpdus_hw_filter);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			 "Num of MPDUS truncated ", pdev-&gt;mpdus_truncated);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			 "Num of MPDUS ACK failed ", pdev-&gt;mpdus_ack_failed);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			 "Num of MPDUS expired ", pdev-&gt;mpdus_expired);</div><div class='ctx'> 	*length = len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5575,6 +6938,8 @@ ath11k_wmi_fw_pdev_rx_stats_fill(const struct ath11k_fw_stats_pdev *pdev,</div><div class='ctx'> 			 "PHY errors drops", pdev-&gt;phy_err_drop);</div><div class='ctx'> 	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='ctx'> 			 "MPDU errors (FCS, MIC, ENC)", pdev-&gt;mpdu_errs);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "Overflow errors", pdev-&gt;rx_ovfl_errs);</div><div class='ctx'> 	*length = len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5723,7 +7088,7 @@ void ath11k_wmi_fw_stats_fill(struct ath11k *ar,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (stats_id == WMI_REQUEST_BCN_STAT) {</div><div class='del'>-		num_bcn = ath11k_wmi_fw_stats_num_bcn(&amp;fw_stats-&gt;bcn);</div><div class='add'>+		num_bcn = list_count_nodes(&amp;fw_stats-&gt;bcn);</div><div class='ctx'> </div><div class='ctx'> 		len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='ctx'> 		len += scnprintf(buf + len, buf_len - len, "%30s (%zu)\n",</div><div class='hunk'>@@ -5750,128 +7115,111 @@ static void ath11k_wmi_op_ep_tx_credits(struct ath11k_base *ab)</div><div class='ctx'> 	wake_up(&amp;ab-&gt;wmi_ab.tx_credits_wq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ath11k_reg_11d_new_cc_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct wmi_11d_new_cc_ev *ev;</div><div class='add'>+	struct ath11k *ar;</div><div class='add'>+	struct ath11k_pdev *pdev;</div><div class='add'>+	const void **tb;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_11D_NEW_COUNTRY_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		kfree(tb);</div><div class='add'>+		ath11k_warn(ab, "failed to fetch 11d new cc ev");</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	memcpy(&amp;ab-&gt;new_alpha2, &amp;ev-&gt;new_alpha2, 2);</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event 11d new cc %c%c\n",</div><div class='add'>+		   ab-&gt;new_alpha2[0],</div><div class='add'>+		   ab-&gt;new_alpha2[1]);</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		pdev = &amp;ab-&gt;pdevs[i];</div><div class='add'>+		ar = pdev-&gt;ar;</div><div class='add'>+		ar-&gt;state_11d = ATH11K_11D_IDLE;</div><div class='add'>+		complete(&amp;ar-&gt;completed_11d_scan);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	queue_work(ab-&gt;workqueue, &amp;ab-&gt;update_11d_work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath11k_wmi_htc_tx_complete(struct ath11k_base *ab,</div><div class='ctx'> 				       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct ath11k_pdev_wmi *wmi = NULL;</div><div class='add'>+	u32 i;</div><div class='add'>+	u8 wmi_ep_count;</div><div class='add'>+	u8 eid;</div><div class='add'>+</div><div class='add'>+	eid = ATH11K_SKB_CB(skb)-&gt;eid;</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static bool ath11k_reg_is_world_alpha(char *alpha)</div><div class='del'>-{</div><div class='del'>-	return alpha[0] == '0' &amp;&amp; alpha[1] == '0';</div><div class='add'>+	if (eid &gt;= ATH11K_HTC_EP_COUNT)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	wmi_ep_count = ab-&gt;htc.wmi_ep_count;</div><div class='add'>+	if (wmi_ep_count &gt; ab-&gt;hw_params.max_radios)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;htc.wmi_ep_count; i++) {</div><div class='add'>+		if (ab-&gt;wmi_ab.wmi[i].eid == eid) {</div><div class='add'>+			wmi = &amp;ab-&gt;wmi_ab.wmi[i];</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wmi)</div><div class='add'>+		wake_up(&amp;wmi-&gt;tx_ce_desc_wq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath11k_reg_chan_list_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='add'>+static int ath11k_reg_chan_list_event(struct ath11k_base *ab, struct sk_buff *skb,</div><div class='add'>+				      enum wmi_reg_chan_list_cmd_type id)</div><div class='ctx'> {</div><div class='del'>-	struct cur_regulatory_info *reg_info = NULL;</div><div class='del'>-	struct ieee80211_regdomain *regd = NULL;</div><div class='del'>-	bool intersect = false;</div><div class='del'>-	int ret = 0, pdev_idx;</div><div class='del'>-	struct ath11k *ar;</div><div class='add'>+	struct cur_regulatory_info *reg_info;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	reg_info = kzalloc(sizeof(*reg_info), GFP_ATOMIC);</div><div class='del'>-	if (!reg_info) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto fallback;</div><div class='del'>-	}</div><div class='add'>+	if (!reg_info)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ret = ath11k_pull_reg_chan_list_update_ev(ab, skb, reg_info);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ath11k_warn(ab, "failed to extract regulatory info from received event\n");</div><div class='del'>-		goto fallback;</div><div class='del'>-	}</div><div class='add'>+	if (id == WMI_REG_CHAN_LIST_CC_ID)</div><div class='add'>+		ret = ath11k_pull_reg_chan_list_update_ev(ab, skb, reg_info);</div><div class='add'>+	else</div><div class='add'>+		ret = ath11k_pull_reg_chan_list_ext_update_ev(ab, skb, reg_info);</div><div class='ctx'> </div><div class='del'>-	if (reg_info-&gt;status_code != REG_SET_CC_STATUS_PASS) {</div><div class='del'>-		/* In case of failure to set the requested ctry,</div><div class='del'>-		 * fw retains the current regd. We print a failure info</div><div class='del'>-		 * and return from here.</div><div class='del'>-		 */</div><div class='del'>-		ath11k_warn(ab, "Failed to set the requested Country regulatory setting\n");</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to extract regulatory info\n");</div><div class='ctx'> 		goto mem_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pdev_idx = reg_info-&gt;phy_id;</div><div class='del'>-</div><div class='del'>-	if (pdev_idx &gt;= ab-&gt;num_radios) {</div><div class='del'>-		/* Process the event for phy0 only if single_pdev_only</div><div class='del'>-		 * is true. If pdev_idx is valid but not 0, discard the</div><div class='del'>-		 * event. Otherwise, it goes to fallback.</div><div class='del'>-		 */</div><div class='del'>-		if (ab-&gt;hw_params.single_pdev_only &amp;&amp;</div><div class='del'>-		    pdev_idx &lt; ab-&gt;hw_params.num_rxmda_per_pdev)</div><div class='del'>-			goto mem_free;</div><div class='del'>-		else</div><div class='del'>-			goto fallback;</div><div class='add'>+	ret = ath11k_reg_handle_chan_list(ab, reg_info, IEEE80211_REG_UNSET_AP);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to process regulatory info %d\n", ret);</div><div class='add'>+		goto mem_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Avoid multiple overwrites to default regd, during core</div><div class='del'>-	 * stop-start after mac registration.</div><div class='del'>-	 */</div><div class='del'>-	if (ab-&gt;default_regd[pdev_idx] &amp;&amp; !ab-&gt;new_regd[pdev_idx] &amp;&amp;</div><div class='del'>-	    !memcmp((char *)ab-&gt;default_regd[pdev_idx]-&gt;alpha2,</div><div class='del'>-		    (char *)reg_info-&gt;alpha2, 2))</div><div class='del'>-		goto mem_free;</div><div class='add'>+	kfree(reg_info);</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='del'>-	/* Intersect new rules with default regd if a new country setting was</div><div class='del'>-	 * requested, i.e a default regd was already set during initialization</div><div class='del'>-	 * and the regd coming from this event has a valid country info.</div><div class='del'>-	 */</div><div class='del'>-	if (ab-&gt;default_regd[pdev_idx] &amp;&amp;</div><div class='del'>-	    !ath11k_reg_is_world_alpha((char *)</div><div class='del'>-		ab-&gt;default_regd[pdev_idx]-&gt;alpha2) &amp;&amp;</div><div class='del'>-	    !ath11k_reg_is_world_alpha((char *)reg_info-&gt;alpha2))</div><div class='del'>-		intersect = true;</div><div class='del'>-</div><div class='del'>-	regd = ath11k_reg_build_regd(ab, reg_info, intersect);</div><div class='del'>-	if (!regd) {</div><div class='del'>-		ath11k_warn(ab, "failed to build regd from reg_info\n");</div><div class='del'>-		goto fallback;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ab-&gt;base_lock);</div><div class='del'>-	if (test_bit(ATH11K_FLAG_REGISTERED, &amp;ab-&gt;dev_flags)) {</div><div class='del'>-		/* Once mac is registered, ar is valid and all CC events from</div><div class='del'>-		 * fw is considered to be received due to user requests</div><div class='del'>-		 * currently.</div><div class='del'>-		 * Free previously built regd before assigning the newly</div><div class='del'>-		 * generated regd to ar. NULL pointer handling will be</div><div class='del'>-		 * taken care by kfree itself.</div><div class='del'>-		 */</div><div class='del'>-		ar = ab-&gt;pdevs[pdev_idx].ar;</div><div class='del'>-		kfree(ab-&gt;new_regd[pdev_idx]);</div><div class='del'>-		ab-&gt;new_regd[pdev_idx] = regd;</div><div class='del'>-		ieee80211_queue_work(ar-&gt;hw, &amp;ar-&gt;regd_update_work);</div><div class='del'>-	} else {</div><div class='del'>-		/* Multiple events for the same *ar is not expected. But we</div><div class='del'>-		 * can still clear any previously stored default_regd if we</div><div class='del'>-		 * are receiving this event for the same radio by mistake.</div><div class='del'>-		 * NULL pointer handling will be taken care by kfree itself.</div><div class='del'>-		 */</div><div class='del'>-		kfree(ab-&gt;default_regd[pdev_idx]);</div><div class='del'>-		/* This regd would be applied during mac registration */</div><div class='del'>-		ab-&gt;default_regd[pdev_idx] = regd;</div><div class='del'>-	}</div><div class='del'>-	ab-&gt;dfs_region = reg_info-&gt;dfs_region;</div><div class='del'>-	spin_unlock(&amp;ab-&gt;base_lock);</div><div class='del'>-</div><div class='del'>-	goto mem_free;</div><div class='del'>-</div><div class='del'>-fallback:</div><div class='del'>-	/* Fallback to older reg (by sending previous country setting</div><div class='del'>-	 * again if fw has succeded and we failed to process here.</div><div class='del'>-	 * The Regdomain should be uniform across driver and fw. Since the</div><div class='del'>-	 * FW has processed the command and sent a success status, we expect</div><div class='del'>-	 * this function to succeed as well. If it doesn't, CTRY needs to be</div><div class='del'>-	 * reverted at the fw and the old SCAN_CHAN_LIST cmd needs to be sent.</div><div class='del'>-	 */</div><div class='del'>-	/* TODO: This is rare, but still should also be handled */</div><div class='del'>-	WARN_ON(1);</div><div class='ctx'> mem_free:</div><div class='del'>-	if (reg_info) {</div><div class='del'>-		kfree(reg_info-&gt;reg_rules_2g_ptr);</div><div class='del'>-		kfree(reg_info-&gt;reg_rules_5g_ptr);</div><div class='del'>-		kfree(reg_info);</div><div class='del'>-	}</div><div class='add'>+	ath11k_reg_reset_info(reg_info);</div><div class='add'>+	kfree(reg_info);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5890,14 +7238,12 @@ static int ath11k_wmi_tlv_rdy_parse(struct ath11k_base *ab, u16 tag, u16 len,</div><div class='ctx'> 		memset(&amp;fixed_param, 0, sizeof(fixed_param));</div><div class='ctx'> 		memcpy(&amp;fixed_param, (struct wmi_ready_event *)ptr,</div><div class='ctx'> 		       min_t(u16, sizeof(fixed_param), len));</div><div class='del'>-		ab-&gt;wlan_init_status = fixed_param.ready_event_min.status;</div><div class='ctx'> 		rdy_parse-&gt;num_extra_mac_addr =</div><div class='ctx'> 			fixed_param.ready_event_min.num_extra_mac_addr;</div><div class='ctx'> </div><div class='ctx'> 		ether_addr_copy(ab-&gt;mac_addr,</div><div class='ctx'> 				fixed_param.ready_event_min.mac_addr.addr);</div><div class='ctx'> 		ab-&gt;pktlog_defs_checksum = fixed_param.pktlog_defs_checksum;</div><div class='del'>-		ab-&gt;wmi_ready = true;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_TAG_ARRAY_FIXED_STRUCT:</div><div class='ctx'> 		addr_list = (struct wmi_mac_addr *)ptr;</div><div class='hunk'>@@ -5931,6 +7277,8 @@ static int ath11k_ready_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event ready");</div><div class='add'>+</div><div class='ctx'> 	complete(&amp;ab-&gt;wmi_ab.unified_ready);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -5945,6 +7293,8 @@ static void ath11k_peer_delete_resp_event(struct ath11k_base *ab, struct sk_buff</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event peer delete resp");</div><div class='add'>+</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	ar = ath11k_mac_get_ar_by_vdev_id(ab, peer_del_resp.vdev_id);</div><div class='ctx'> 	if (!ar) {</div><div class='hunk'>@@ -5984,7 +7334,7 @@ static void ath11k_vdev_delete_resp_event(struct ath11k_base *ab,</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_WMI, "vdev delete resp for vdev id %d\n",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event vdev delete resp for vdev id %d\n",</div><div class='ctx'> 		   vdev_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6015,6 +7365,8 @@ static void ath11k_vdev_start_resp_event(struct ath11k_base *ab, struct sk_buff</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event start resp event");</div><div class='add'>+</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	ar = ath11k_mac_get_ar_by_vdev_id(ab, vdev_start_resp.vdev_id);</div><div class='ctx'> 	if (!ar) {</div><div class='hunk'>@@ -6025,7 +7377,7 @@ static void ath11k_vdev_start_resp_event(struct ath11k_base *ab, struct sk_buff</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;last_wmi_vdev_start_status = 0;</div><div class='del'>-</div><div class='add'>+	ar-&gt;max_allowed_tx_power = vdev_start_resp.max_allowed_tx_power;</div><div class='ctx'> 	status = vdev_start_resp.status;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON_ONCE(status)) {</div><div class='hunk'>@@ -6044,13 +7396,129 @@ static void ath11k_vdev_start_resp_event(struct ath11k_base *ab, struct sk_buff</div><div class='ctx'> </div><div class='ctx'> static void ath11k_bcn_tx_status_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct ath11k_vif *arvif;</div><div class='ctx'> 	u32 vdev_id, tx_status;</div><div class='ctx'> </div><div class='del'>-	if (ath11k_pull_bcn_tx_status_ev(ab, skb-&gt;data, skb-&gt;len,</div><div class='del'>-					 &amp;vdev_id, &amp;tx_status) != 0) {</div><div class='add'>+	if (ath11k_pull_bcn_tx_status_ev(ab, skb, &amp;vdev_id, &amp;tx_status) != 0) {</div><div class='ctx'> 		ath11k_warn(ab, "failed to extract bcn tx status");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event offload bcn tx status");</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	arvif = ath11k_mac_get_arvif_by_vdev_id(ab, vdev_id);</div><div class='add'>+	if (!arvif) {</div><div class='add'>+		ath11k_warn(ab, "invalid vdev id %d in bcn_tx_status",</div><div class='add'>+			    vdev_id);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	queue_work(ab-&gt;workqueue, &amp;arvif-&gt;bcn_tx_work);</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_wmi_event_peer_sta_ps_state_chg(struct ath11k_base *ab,</div><div class='add'>+						   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct wmi_peer_sta_ps_state_chg_event *ev;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct ath11k_peer *peer;</div><div class='add'>+	struct ath11k *ar;</div><div class='add'>+	struct ath11k_sta *arsta;</div><div class='add'>+	const void **tb;</div><div class='add'>+	enum ath11k_wmi_peer_ps_state peer_previous_ps_state;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_PEER_STA_PS_STATECHANGE_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath11k_warn(ab, "failed to fetch sta ps change ev");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "event peer sta ps change ev addr %pM state %u sup_bitmap %x ps_valid %u ts %u\n",</div><div class='add'>+		   ev-&gt;peer_macaddr.addr, ev-&gt;peer_ps_state,</div><div class='add'>+		   ev-&gt;ps_supported_bitmap, ev-&gt;peer_ps_valid,</div><div class='add'>+		   ev-&gt;peer_ps_timestamp);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	peer = ath11k_peer_find_by_addr(ab, ev-&gt;peer_macaddr.addr);</div><div class='add'>+</div><div class='add'>+	if (!peer) {</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		ath11k_warn(ab, "peer not found %pM\n", ev-&gt;peer_macaddr.addr);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar = ath11k_mac_get_ar_by_vdev_id(ab, peer-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	if (!ar) {</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		ath11k_warn(ab, "invalid vdev id in peer sta ps state change ev %d",</div><div class='add'>+			    peer-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sta = peer-&gt;sta;</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	if (!sta) {</div><div class='add'>+		ath11k_warn(ab, "failed to find station entry %pM\n",</div><div class='add'>+			    ev-&gt;peer_macaddr.addr);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arsta = ath11k_sta_to_arsta(sta);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	peer_previous_ps_state = arsta-&gt;peer_ps_state;</div><div class='add'>+	arsta-&gt;peer_ps_state = ev-&gt;peer_ps_state;</div><div class='add'>+	arsta-&gt;peer_current_ps_valid = !!ev-&gt;peer_ps_valid;</div><div class='add'>+</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_PEER_POWER_SAVE_DURATION_SUPPORT,</div><div class='add'>+		     ar-&gt;ab-&gt;wmi_ab.svc_map)) {</div><div class='add'>+		if (!(ev-&gt;ps_supported_bitmap &amp; WMI_PEER_PS_VALID) ||</div><div class='add'>+		    !(ev-&gt;ps_supported_bitmap &amp; WMI_PEER_PS_STATE_TIMESTAMP) ||</div><div class='add'>+		    !ev-&gt;peer_ps_valid)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		if (arsta-&gt;peer_ps_state == WMI_PEER_PS_STATE_ON) {</div><div class='add'>+			arsta-&gt;ps_start_time = ev-&gt;peer_ps_timestamp;</div><div class='add'>+			arsta-&gt;ps_start_jiffies = jiffies;</div><div class='add'>+		} else if (arsta-&gt;peer_ps_state == WMI_PEER_PS_STATE_OFF &amp;&amp;</div><div class='add'>+			   peer_previous_ps_state == WMI_PEER_PS_STATE_ON) {</div><div class='add'>+			arsta-&gt;ps_total_duration = arsta-&gt;ps_total_duration +</div><div class='add'>+					(ev-&gt;peer_ps_timestamp - arsta-&gt;ps_start_time);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ar-&gt;ps_timekeeper_enable)</div><div class='add'>+			trace_ath11k_ps_timekeeper(ar, ev-&gt;peer_macaddr.addr,</div><div class='add'>+						   ev-&gt;peer_ps_timestamp,</div><div class='add'>+						   arsta-&gt;peer_ps_state);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+exit:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	kfree(tb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_vdev_stopped_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='hunk'>@@ -6063,6 +7531,8 @@ static void ath11k_vdev_stopped_event(struct ath11k_base *ab, struct sk_buff *sk</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event vdev stopped");</div><div class='add'>+</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	ar = ath11k_mac_get_ar_by_vdev_id(ab, vdev_id);</div><div class='ctx'> 	if (!ar) {</div><div class='hunk'>@@ -6081,7 +7551,7 @@ static void ath11k_vdev_stopped_event(struct ath11k_base *ab, struct sk_buff *sk</div><div class='ctx'> </div><div class='ctx'> static void ath11k_mgmt_rx_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct mgmt_rx_event_params rx_ev = {0};</div><div class='add'>+	struct mgmt_rx_event_params rx_ev = {};</div><div class='ctx'> 	struct ath11k *ar;</div><div class='ctx'> 	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='hunk'>@@ -6096,7 +7566,7 @@ static void ath11k_mgmt_rx_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	memset(status, 0, sizeof(*status));</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_MGMT, "mgmt rx event status %08x\n",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_MGMT, "event mgmt rx status %08x\n",</div><div class='ctx'> 		   rx_ev.status);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='hunk'>@@ -6119,8 +7589,10 @@ static void ath11k_mgmt_rx_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> 	if (rx_ev.status &amp; WMI_RX_STATUS_ERR_MIC)</div><div class='ctx'> 		status-&gt;flag |= RX_FLAG_MMIC_ERROR;</div><div class='ctx'> </div><div class='del'>-	if (rx_ev.chan_freq &gt;= ATH11K_MIN_6G_FREQ) {</div><div class='add'>+	if (rx_ev.chan_freq &gt;= ATH11K_MIN_6G_FREQ &amp;&amp;</div><div class='add'>+	    rx_ev.chan_freq &lt;= ATH11K_MAX_6G_FREQ) {</div><div class='ctx'> 		status-&gt;band = NL80211_BAND_6GHZ;</div><div class='add'>+		status-&gt;freq = rx_ev.chan_freq;</div><div class='ctx'> 	} else if (rx_ev.channel &gt;= 1 &amp;&amp; rx_ev.channel &lt;= 14) {</div><div class='ctx'> 		status-&gt;band = NL80211_BAND_2GHZ;</div><div class='ctx'> 	} else if (rx_ev.channel &gt;= 36 &amp;&amp; rx_ev.channel &lt;= ATH11K_MAX_5G_CHAN) {</div><div class='hunk'>@@ -6137,12 +7609,14 @@ static void ath11k_mgmt_rx_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> 	if (rx_ev.phy_mode == MODE_11B &amp;&amp;</div><div class='ctx'> 	    (status-&gt;band == NL80211_BAND_5GHZ || status-&gt;band == NL80211_BAND_6GHZ))</div><div class='ctx'> 		ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='del'>-			   "wmi mgmt rx 11b (CCK) on 5/6GHz, band = %d\n", status-&gt;band);</div><div class='add'>+			   "mgmt rx 11b (CCK) on 5/6GHz, band = %d\n", status-&gt;band);</div><div class='ctx'> </div><div class='ctx'> 	sband = &amp;ar-&gt;mac.sbands[status-&gt;band];</div><div class='ctx'> </div><div class='del'>-	status-&gt;freq = ieee80211_channel_to_frequency(rx_ev.channel,</div><div class='del'>-						      status-&gt;band);</div><div class='add'>+	if (status-&gt;band != NL80211_BAND_6GHZ)</div><div class='add'>+		status-&gt;freq = ieee80211_channel_to_frequency(rx_ev.channel,</div><div class='add'>+							      status-&gt;band);</div><div class='add'>+</div><div class='ctx'> 	status-&gt;signal = rx_ev.snr + ATH11K_DEFAULT_NOISE_FLOOR;</div><div class='ctx'> 	status-&gt;rate_idx = ath11k_mac_bitrate_to_idx(sband, rx_ev.rate / 100);</div><div class='ctx'> </div><div class='hunk'>@@ -6175,7 +7649,7 @@ static void ath11k_mgmt_rx_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> 		ath11k_mac_handle_beacon(ar, skb);</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_MGMT,</div><div class='del'>-		   "event mgmt rx skb %pK len %d ftype %02x stype %02x\n",</div><div class='add'>+		   "event mgmt rx skb %p len %d ftype %02x stype %02x\n",</div><div class='ctx'> 		   skb, skb-&gt;len,</div><div class='ctx'> 		   fc &amp; IEEE80211_FCTL_FTYPE, fc &amp; IEEE80211_FCTL_STYPE);</div><div class='ctx'> </div><div class='hunk'>@@ -6192,7 +7666,7 @@ exit:</div><div class='ctx'> </div><div class='ctx'> static void ath11k_mgmt_tx_compl_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct wmi_mgmt_tx_compl_event tx_compl_param = {0};</div><div class='add'>+	struct wmi_mgmt_tx_compl_event tx_compl_param = {};</div><div class='ctx'> 	struct ath11k *ar;</div><div class='ctx'> </div><div class='ctx'> 	if (ath11k_pull_mgmt_tx_compl_param_tlv(ab, skb, &amp;tx_compl_param) != 0) {</div><div class='hunk'>@@ -6208,20 +7682,20 @@ static void ath11k_mgmt_tx_compl_event(struct ath11k_base *ab, struct sk_buff *s</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wmi_process_mgmt_tx_comp(ar, tx_compl_param.desc_id,</div><div class='del'>-				 tx_compl_param.status);</div><div class='add'>+	wmi_process_mgmt_tx_comp(ar, &amp;tx_compl_param);</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_MGMT,</div><div class='del'>-		   "mgmt tx compl ev pdev_id %d, desc_id %d, status %d",</div><div class='add'>+		   "event mgmt tx compl ev pdev_id %d, desc_id %d, status %d ack_rssi %d",</div><div class='ctx'> 		   tx_compl_param.pdev_id, tx_compl_param.desc_id,</div><div class='del'>-		   tx_compl_param.status);</div><div class='add'>+		   tx_compl_param.status, tx_compl_param.ack_rssi);</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ath11k *ath11k_get_ar_on_scan_abort(struct ath11k_base *ab,</div><div class='del'>-						  u32 vdev_id)</div><div class='add'>+static struct ath11k *ath11k_get_ar_on_scan_state(struct ath11k_base *ab,</div><div class='add'>+						  u32 vdev_id,</div><div class='add'>+						  enum ath11k_scan_state state)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct ath11k_pdev *pdev;</div><div class='hunk'>@@ -6233,7 +7707,7 @@ static struct ath11k *ath11k_get_ar_on_scan_abort(struct ath11k_base *ab,</div><div class='ctx'> 			ar = pdev-&gt;ar;</div><div class='ctx'> </div><div class='ctx'> 			spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='del'>-			if (ar-&gt;scan.state == ATH11K_SCAN_ABORTING &amp;&amp;</div><div class='add'>+			if (ar-&gt;scan.state == state &amp;&amp;</div><div class='ctx'> 			    ar-&gt;scan.vdev_id == vdev_id) {</div><div class='ctx'> 				spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> 				return ar;</div><div class='hunk'>@@ -6247,7 +7721,7 @@ static struct ath11k *ath11k_get_ar_on_scan_abort(struct ath11k_base *ab,</div><div class='ctx'> static void ath11k_scan_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath11k *ar;</div><div class='del'>-	struct wmi_scan_event scan_ev = {0};</div><div class='add'>+	struct wmi_scan_event scan_ev = {};</div><div class='ctx'> </div><div class='ctx'> 	if (ath11k_pull_scan_ev(ab, skb, &amp;scan_ev) != 0) {</div><div class='ctx'> 		ath11k_warn(ab, "failed to extract scan event");</div><div class='hunk'>@@ -6263,10 +7737,15 @@ static void ath11k_scan_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> 	 * aborting scan's vdev id matches this event info.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (scan_ev.event_type == WMI_SCAN_EVENT_COMPLETED &amp;&amp;</div><div class='del'>-	    scan_ev.reason == WMI_SCAN_REASON_CANCELLED)</div><div class='del'>-		ar = ath11k_get_ar_on_scan_abort(ab, scan_ev.vdev_id);</div><div class='del'>-	else</div><div class='add'>+	    scan_ev.reason == WMI_SCAN_REASON_CANCELLED) {</div><div class='add'>+		ar = ath11k_get_ar_on_scan_state(ab, scan_ev.vdev_id,</div><div class='add'>+						 ATH11K_SCAN_ABORTING);</div><div class='add'>+		if (!ar)</div><div class='add'>+			ar = ath11k_get_ar_on_scan_state(ab, scan_ev.vdev_id,</div><div class='add'>+							 ATH11K_SCAN_RUNNING);</div><div class='add'>+	} else {</div><div class='ctx'> 		ar = ath11k_mac_get_ar_by_vdev_id(ab, scan_ev.vdev_id);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ar) {</div><div class='ctx'> 		ath11k_warn(ab, "Received scan event for unknown vdev");</div><div class='hunk'>@@ -6277,7 +7756,7 @@ static void ath11k_scan_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> 	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "scan event %s type %d reason %d freq %d req_id %d scan_id %d vdev_id %d state %s (%d)\n",</div><div class='add'>+		   "event scan %s type %d reason %d freq %d req_id %d scan_id %d vdev_id %d state %s (%d)\n",</div><div class='ctx'> 		   ath11k_wmi_event_scan_type_str(scan_ev.event_type, scan_ev.reason),</div><div class='ctx'> 		   scan_ev.event_type, scan_ev.reason, scan_ev.channel_freq,</div><div class='ctx'> 		   scan_ev.scan_req_id, scan_ev.scan_id, scan_ev.vdev_id,</div><div class='hunk'>@@ -6301,6 +7780,8 @@ static void ath11k_scan_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> 		ath11k_wmi_event_scan_start_failed(ar);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_SCAN_EVENT_DEQUEUED:</div><div class='add'>+		__ath11k_mac_scan_finish(ar);</div><div class='add'>+		break;</div><div class='ctx'> 	case WMI_SCAN_EVENT_PREEMPTED:</div><div class='ctx'> 	case WMI_SCAN_EVENT_RESTARTED:</div><div class='ctx'> 	case WMI_SCAN_EVENT_FOREIGN_CHAN_EXIT:</div><div class='hunk'>@@ -6319,6 +7800,7 @@ static void ath11k_peer_sta_kickout_event(struct ath11k_base *ab, struct sk_buff</div><div class='ctx'> 	struct ieee80211_sta *sta;</div><div class='ctx'> 	struct ath11k_peer *peer;</div><div class='ctx'> 	struct ath11k *ar;</div><div class='add'>+	u32 vdev_id;</div><div class='ctx'> </div><div class='ctx'> 	if (ath11k_pull_peer_sta_kickout_ev(ab, skb, &amp;arg) != 0) {</div><div class='ctx'> 		ath11k_warn(ab, "failed to extract peer sta kickout event");</div><div class='hunk'>@@ -6334,10 +7816,15 @@ static void ath11k_peer_sta_kickout_event(struct ath11k_base *ab, struct sk_buff</div><div class='ctx'> 	if (!peer) {</div><div class='ctx'> 		ath11k_warn(ab, "peer not found %pM\n",</div><div class='ctx'> 			    arg.mac_addr);</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ar = ath11k_mac_get_ar_by_vdev_id(ab, peer-&gt;vdev_id);</div><div class='add'>+	vdev_id = peer-&gt;vdev_id;</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	ar = ath11k_mac_get_ar_by_vdev_id(ab, vdev_id);</div><div class='ctx'> 	if (!ar) {</div><div class='ctx'> 		ath11k_warn(ab, "invalid vdev id in peer sta kickout ev %d",</div><div class='ctx'> 			    peer-&gt;vdev_id);</div><div class='hunk'>@@ -6352,13 +7839,12 @@ static void ath11k_peer_sta_kickout_event(struct ath11k_base *ab, struct sk_buff</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_WMI, "peer sta kickout event %pM",</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event peer sta kickout %pM",</div><div class='ctx'> 		   arg.mac_addr);</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_report_low_ack(sta, 10);</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='del'>-	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6373,7 +7859,7 @@ static void ath11k_roam_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "wmi roam event vdev %u reason 0x%08x rssi %d\n",</div><div class='add'>+		   "event roam vdev %u reason 0x%08x rssi %d\n",</div><div class='ctx'> 		   roam_ev.vdev_id, roam_ev.reason, roam_ev.rssi);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='hunk'>@@ -6407,20 +7893,20 @@ static void ath11k_roam_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> static void ath11k_chan_info_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct wmi_chan_info_event ch_info_ev = {0};</div><div class='add'>+	struct wmi_chan_info_event ch_info_ev = {};</div><div class='ctx'> 	struct ath11k *ar;</div><div class='ctx'> 	struct survey_info *survey;</div><div class='ctx'> 	int idx;</div><div class='ctx'> 	/* HW channel counters frequency value in hertz */</div><div class='ctx'> 	u32 cc_freq_hz = ab-&gt;cc_freq_hz;</div><div class='ctx'> </div><div class='del'>-	if (ath11k_pull_chan_info_ev(ab, skb-&gt;data, skb-&gt;len, &amp;ch_info_ev) != 0) {</div><div class='add'>+	if (ath11k_pull_chan_info_ev(ab, skb, &amp;ch_info_ev) != 0) {</div><div class='ctx'> 		ath11k_warn(ab, "failed to extract chan info event");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "chan info vdev_id %d err_code %d freq %d cmd_flags %d noise_floor %d rx_clear_count %d cycle_count %d mac_clk_mhz %d\n",</div><div class='add'>+		   "event chan info vdev_id %d err_code %d freq %d cmd_flags %d noise_floor %d rx_clear_count %d cycle_count %d mac_clk_mhz %d\n",</div><div class='ctx'> 		   ch_info_ev.vdev_id, ch_info_ev.err_code, ch_info_ev.freq,</div><div class='ctx'> 		   ch_info_ev.cmd_flags, ch_info_ev.noise_floor,</div><div class='ctx'> 		   ch_info_ev.rx_clear_count, ch_info_ev.cycle_count,</div><div class='hunk'>@@ -6509,7 +7995,7 @@ ath11k_pdev_bss_chan_info_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> 			bss_ch_info_ev.rx_bss_cycle_count_low;</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "pdev bss chan info:\n pdev_id: %d freq: %d noise: %d cycle: busy %llu total %llu tx %llu rx %llu rx_bss %llu\n",</div><div class='add'>+		   "event pdev bss chan info:\n pdev_id: %d freq: %d noise: %d cycle: busy %llu total %llu tx %llu rx %llu rx_bss %llu\n",</div><div class='ctx'> 		   bss_ch_info_ev.pdev_id, bss_ch_info_ev.freq,</div><div class='ctx'> 		   bss_ch_info_ev.noise_floor, busy, total,</div><div class='ctx'> 		   tx, rx, rx_bss);</div><div class='hunk'>@@ -6554,7 +8040,7 @@ exit:</div><div class='ctx'> static void ath11k_vdev_install_key_compl_event(struct ath11k_base *ab,</div><div class='ctx'> 						struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct wmi_vdev_install_key_complete_arg install_key_compl = {0};</div><div class='add'>+	struct wmi_vdev_install_key_complete_arg install_key_compl = {};</div><div class='ctx'> 	struct ath11k *ar;</div><div class='ctx'> </div><div class='ctx'> 	if (ath11k_pull_vdev_install_key_compl_ev(ab, skb, &amp;install_key_compl) != 0) {</div><div class='hunk'>@@ -6563,7 +8049,7 @@ static void ath11k_vdev_install_key_compl_event(struct ath11k_base *ab,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "vdev install key ev idx %d flags %08x macaddr %pM status %d\n",</div><div class='add'>+		   "event vdev install key ev idx %d flags %08x macaddr %pM status %d\n",</div><div class='ctx'> 		   install_key_compl.key_idx, install_key_compl.key_flags,</div><div class='ctx'> 		   install_key_compl.macaddr, install_key_compl.status);</div><div class='ctx'> </div><div class='hunk'>@@ -6588,52 +8074,71 @@ static void ath11k_vdev_install_key_compl_event(struct ath11k_base *ab,</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath11k_service_available_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='add'>+static int  ath11k_wmi_tlv_services_parser(struct ath11k_base *ab,</div><div class='add'>+					   u16 tag, u16 len,</div><div class='add'>+					   const void *ptr, void *data)</div><div class='ctx'> {</div><div class='del'>-	const void **tb;</div><div class='ctx'> 	const struct wmi_service_available_event *ev;</div><div class='del'>-	int ret;</div><div class='add'>+	u32 *wmi_ext2_service_bitmap;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, skb-&gt;data, skb-&gt;len, GFP_ATOMIC);</div><div class='del'>-	if (IS_ERR(tb)) {</div><div class='del'>-		ret = PTR_ERR(tb);</div><div class='del'>-		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	switch (tag) {</div><div class='add'>+	case WMI_TAG_SERVICE_AVAILABLE_EVENT:</div><div class='add'>+		ev = (struct wmi_service_available_event *)ptr;</div><div class='add'>+		for (i = 0, j = WMI_MAX_SERVICE;</div><div class='add'>+			i &lt; WMI_SERVICE_SEGMENT_BM_SIZE32 &amp;&amp; j &lt; WMI_MAX_EXT_SERVICE;</div><div class='add'>+			i++) {</div><div class='add'>+			do {</div><div class='add'>+				if (ev-&gt;wmi_service_segment_bitmap[i] &amp;</div><div class='add'>+				    BIT(j % WMI_AVAIL_SERVICE_BITS_IN_SIZE32))</div><div class='add'>+					set_bit(j, ab-&gt;wmi_ab.svc_map);</div><div class='add'>+			} while (++j % WMI_AVAIL_SERVICE_BITS_IN_SIZE32);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	ev = tb[WMI_TAG_SERVICE_AVAILABLE_EVENT];</div><div class='del'>-	if (!ev) {</div><div class='del'>-		ath11k_warn(ab, "failed to fetch svc available ev");</div><div class='del'>-		kfree(tb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+			   "wmi_ext_service_bitmap 0:0x%04x, 1:0x%04x, 2:0x%04x, 3:0x%04x",</div><div class='add'>+			   ev-&gt;wmi_service_segment_bitmap[0],</div><div class='add'>+			   ev-&gt;wmi_service_segment_bitmap[1],</div><div class='add'>+			   ev-&gt;wmi_service_segment_bitmap[2],</div><div class='add'>+			   ev-&gt;wmi_service_segment_bitmap[3]);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TAG_ARRAY_UINT32:</div><div class='add'>+		wmi_ext2_service_bitmap = (u32 *)ptr;</div><div class='add'>+		for (i = 0, j = WMI_MAX_EXT_SERVICE;</div><div class='add'>+			i &lt; WMI_SERVICE_SEGMENT_BM_SIZE32 &amp;&amp; j &lt; WMI_MAX_EXT2_SERVICE;</div><div class='add'>+			i++) {</div><div class='add'>+			do {</div><div class='add'>+				if (wmi_ext2_service_bitmap[i] &amp;</div><div class='add'>+				    BIT(j % WMI_AVAIL_SERVICE_BITS_IN_SIZE32))</div><div class='add'>+					set_bit(j, ab-&gt;wmi_ab.svc_map);</div><div class='add'>+			} while (++j % WMI_AVAIL_SERVICE_BITS_IN_SIZE32);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/* TODO: Use wmi_service_segment_offset information to get the service</div><div class='del'>-	 * especially when more services are advertised in multiple sevice</div><div class='del'>-	 * available events.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0, j = WMI_MAX_SERVICE;</div><div class='del'>-	     i &lt; WMI_SERVICE_SEGMENT_BM_SIZE32 &amp;&amp; j &lt; WMI_MAX_EXT_SERVICE;</div><div class='del'>-	     i++) {</div><div class='del'>-		do {</div><div class='del'>-			if (ev-&gt;wmi_service_segment_bitmap[i] &amp;</div><div class='del'>-			    BIT(j % WMI_AVAIL_SERVICE_BITS_IN_SIZE32))</div><div class='del'>-				set_bit(j, ab-&gt;wmi_ab.svc_map);</div><div class='del'>-		} while (++j % WMI_AVAIL_SERVICE_BITS_IN_SIZE32);</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+			   "wmi_ext2_service__bitmap  0:0x%04x, 1:0x%04x, 2:0x%04x, 3:0x%04x",</div><div class='add'>+			   wmi_ext2_service_bitmap[0], wmi_ext2_service_bitmap[1],</div><div class='add'>+			   wmi_ext2_service_bitmap[2], wmi_ext2_service_bitmap[3]);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "wmi_ext_service_bitmap 0:0x%x, 1:0x%x, 2:0x%x, 3:0x%x",</div><div class='del'>-		   ev-&gt;wmi_service_segment_bitmap[0], ev-&gt;wmi_service_segment_bitmap[1],</div><div class='del'>-		   ev-&gt;wmi_service_segment_bitmap[2], ev-&gt;wmi_service_segment_bitmap[3]);</div><div class='add'>+static void ath11k_service_available_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	kfree(tb);</div><div class='add'>+	ret = ath11k_wmi_tlv_iter(ab, skb-&gt;data, skb-&gt;len,</div><div class='add'>+				  ath11k_wmi_tlv_services_parser,</div><div class='add'>+				  NULL);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath11k_warn(ab, "failed to parse services available tlv %d\n", ret);</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event service available");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath11k_peer_assoc_conf_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct wmi_peer_assoc_conf_arg peer_assoc_conf = {0};</div><div class='add'>+	struct wmi_peer_assoc_conf_arg peer_assoc_conf = {};</div><div class='ctx'> 	struct ath11k *ar;</div><div class='ctx'> </div><div class='ctx'> 	if (ath11k_pull_peer_assoc_conf_ev(ab, skb, &amp;peer_assoc_conf) != 0) {</div><div class='hunk'>@@ -6642,7 +8147,7 @@ static void ath11k_peer_assoc_conf_event(struct ath11k_base *ab, struct sk_buff</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "peer assoc conf ev vdev id %d macaddr %pM\n",</div><div class='add'>+		   "event peer assoc conf ev vdev id %d macaddr %pM\n",</div><div class='ctx'> 		   peer_assoc_conf.vdev_id, peer_assoc_conf.macaddr);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='hunk'>@@ -6661,7 +8166,97 @@ static void ath11k_peer_assoc_conf_event(struct ath11k_base *ab, struct sk_buff</div><div class='ctx'> </div><div class='ctx'> static void ath11k_update_stats_event(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	ath11k_debugfs_fw_stats_process(ab, skb);</div><div class='add'>+	struct ath11k_fw_stats stats = {};</div><div class='add'>+	size_t total_vdevs_started = 0;</div><div class='add'>+	struct ath11k_pdev *pdev;</div><div class='add'>+	bool is_end = true;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	struct ath11k *ar;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;stats.pdevs);</div><div class='add'>+	INIT_LIST_HEAD(&amp;stats.vdevs);</div><div class='add'>+	INIT_LIST_HEAD(&amp;stats.bcn);</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_pull_fw_stats(ab, skb, &amp;stats);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ab, "failed to pull fw stats: %d\n", ret);</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event update stats");</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ar = ath11k_mac_get_ar_by_pdev_id(ab, stats.pdev_id);</div><div class='add'>+	if (!ar) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		ath11k_warn(ab, "failed to get ar for pdev_id %d: %d\n",</div><div class='add'>+			    stats.pdev_id, ret);</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	/* WMI_REQUEST_PDEV_STAT, WMI_REQUEST_VDEV_STAT and</div><div class='add'>+	 * WMI_REQUEST_RSSI_PER_CHAIN_STAT can be requested via mac ops or via</div><div class='add'>+	 * debugfs fw stats. Therefore, processing it separately.</div><div class='add'>+	 */</div><div class='add'>+	if (stats.stats_id == WMI_REQUEST_PDEV_STAT) {</div><div class='add'>+		list_splice_tail_init(&amp;stats.pdevs, &amp;ar-&gt;fw_stats.pdevs);</div><div class='add'>+		complete(&amp;ar-&gt;fw_stats_done);</div><div class='add'>+		goto complete;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (stats.stats_id == WMI_REQUEST_RSSI_PER_CHAIN_STAT) {</div><div class='add'>+		complete(&amp;ar-&gt;fw_stats_done);</div><div class='add'>+		goto complete;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (stats.stats_id == WMI_REQUEST_VDEV_STAT) {</div><div class='add'>+		if (list_empty(&amp;stats.vdevs)) {</div><div class='add'>+			ath11k_warn(ab, "empty vdev stats");</div><div class='add'>+			goto complete;</div><div class='add'>+		}</div><div class='add'>+		/* FW sends all the active VDEV stats irrespective of PDEV,</div><div class='add'>+		 * hence limit until the count of all VDEVs started</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+			pdev = rcu_dereference(ab-&gt;pdevs_active[i]);</div><div class='add'>+			if (pdev &amp;&amp; pdev-&gt;ar)</div><div class='add'>+				total_vdevs_started += ar-&gt;num_started_vdevs;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (total_vdevs_started)</div><div class='add'>+			is_end = ((++ar-&gt;fw_stats.num_vdev_recvd) ==</div><div class='add'>+				  total_vdevs_started);</div><div class='add'>+</div><div class='add'>+		list_splice_tail_init(&amp;stats.vdevs,</div><div class='add'>+				      &amp;ar-&gt;fw_stats.vdevs);</div><div class='add'>+</div><div class='add'>+		if (is_end)</div><div class='add'>+			complete(&amp;ar-&gt;fw_stats_done);</div><div class='add'>+</div><div class='add'>+		goto complete;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* WMI_REQUEST_BCN_STAT is currently requested only via debugfs fw stats.</div><div class='add'>+	 * Hence, processing it in debugfs context</div><div class='add'>+	 */</div><div class='add'>+	ath11k_debugfs_fw_stats_process(ar, &amp;stats);</div><div class='add'>+</div><div class='add'>+complete:</div><div class='add'>+	complete(&amp;ar-&gt;fw_stats_complete);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	/* Since the stats's pdev, vdev and beacon list are spliced and reinitialised</div><div class='add'>+	 * at this point, no need to free the individual list.</div><div class='add'>+	 */</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+free:</div><div class='add'>+	ath11k_fw_stats_free(&amp;stats);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* PDEV_CTL_FAILSAFE_CHECK_EVENT is received from FW when the frequency scanned</div><div class='hunk'>@@ -6674,7 +8269,7 @@ static void ath11k_pdev_ctl_failsafe_check_event(struct ath11k_base *ab,</div><div class='ctx'> 	const struct wmi_pdev_ctl_failsafe_chk_event *ev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, skb-&gt;data, skb-&gt;len, GFP_ATOMIC);</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='ctx'> 	if (IS_ERR(tb)) {</div><div class='ctx'> 		ret = PTR_ERR(tb);</div><div class='ctx'> 		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='hunk'>@@ -6689,7 +8284,7 @@ static void ath11k_pdev_ctl_failsafe_check_event(struct ath11k_base *ab,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "pdev ctl failsafe check ev status %d\n",</div><div class='add'>+		   "event pdev ctl failsafe check status %d\n",</div><div class='ctx'> 		   ev-&gt;ctl_failsafe_status);</div><div class='ctx'> </div><div class='ctx'> 	/* If ctl_failsafe_status is set to 1 FW will max out the Transmit power</div><div class='hunk'>@@ -6724,8 +8319,8 @@ ath11k_wmi_process_csa_switch_count_event(struct ath11k_base *ab,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (arvif-&gt;is_up &amp;&amp; arvif-&gt;vif-&gt;csa_active)</div><div class='del'>-			ieee80211_csa_finish(arvif-&gt;vif);</div><div class='add'>+		if (arvif-&gt;is_up &amp;&amp; arvif-&gt;vif-&gt;bss_conf.csa_active)</div><div class='add'>+			ieee80211_csa_finish(arvif-&gt;vif, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='hunk'>@@ -6739,7 +8334,7 @@ ath11k_wmi_pdev_csa_switch_count_status_event(struct ath11k_base *ab,</div><div class='ctx'> 	const u32 *vdev_ids;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, skb-&gt;data, skb-&gt;len, GFP_ATOMIC);</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='ctx'> 	if (IS_ERR(tb)) {</div><div class='ctx'> 		ret = PTR_ERR(tb);</div><div class='ctx'> 		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='hunk'>@@ -6756,7 +8351,7 @@ ath11k_wmi_pdev_csa_switch_count_status_event(struct ath11k_base *ab,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "pdev csa switch count %d for pdev %d, num_vdevs %d",</div><div class='add'>+		   "event pdev csa switch count %d for pdev %d, num_vdevs %d",</div><div class='ctx'> 		   ev-&gt;current_switch_count, ev-&gt;pdev_id,</div><div class='ctx'> 		   ev-&gt;num_vdevs);</div><div class='ctx'> </div><div class='hunk'>@@ -6773,7 +8368,7 @@ ath11k_wmi_pdev_dfs_radar_detected_event(struct ath11k_base *ab, struct sk_buff</div><div class='ctx'> 	struct ath11k *ar;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, skb-&gt;data, skb-&gt;len, GFP_ATOMIC);</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='ctx'> 	if (IS_ERR(tb)) {</div><div class='ctx'> 		ret = PTR_ERR(tb);</div><div class='ctx'> 		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='hunk'>@@ -6789,11 +8384,13 @@ ath11k_wmi_pdev_dfs_radar_detected_event(struct ath11k_base *ab, struct sk_buff</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "pdev dfs radar detected on pdev %d, detection mode %d, chan freq %d, chan_width %d, detector id %d, seg id %d, timestamp %d, chirp %d, freq offset %d, sidx %d",</div><div class='add'>+		   "event pdev dfs radar detected on pdev %d, detection mode %d, chan freq %d, chan_width %d, detector id %d, seg id %d, timestamp %d, chirp %d, freq offset %d, sidx %d",</div><div class='ctx'> 		   ev-&gt;pdev_id, ev-&gt;detection_mode, ev-&gt;chan_freq, ev-&gt;chan_width,</div><div class='ctx'> 		   ev-&gt;detector_id, ev-&gt;segment_id, ev-&gt;timestamp, ev-&gt;is_chirp,</div><div class='ctx'> 		   ev-&gt;freq_offset, ev-&gt;sidx);</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='ctx'> 	ar = ath11k_mac_get_ar_by_pdev_id(ab, ev-&gt;pdev_id);</div><div class='ctx'> </div><div class='ctx'> 	if (!ar) {</div><div class='hunk'>@@ -6808,9 +8405,11 @@ ath11k_wmi_pdev_dfs_radar_detected_event(struct ath11k_base *ab, struct sk_buff</div><div class='ctx'> 	if (ar-&gt;dfs_block_radar_events)</div><div class='ctx'> 		ath11k_info(ab, "DFS Radar detected, but ignored as requested\n");</div><div class='ctx'> 	else</div><div class='del'>-		ieee80211_radar_detected(ar-&gt;hw);</div><div class='add'>+		ieee80211_radar_detected(ar-&gt;hw, NULL);</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 	kfree(tb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6823,7 +8422,7 @@ ath11k_wmi_pdev_temperature_event(struct ath11k_base *ab,</div><div class='ctx'> 	const struct wmi_pdev_temperature_event *ev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, skb-&gt;data, skb-&gt;len, GFP_ATOMIC);</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='ctx'> 	if (IS_ERR(tb)) {</div><div class='ctx'> 		ret = PTR_ERR(tb);</div><div class='ctx'> 		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='hunk'>@@ -6837,18 +8436,22 @@ ath11k_wmi_pdev_temperature_event(struct ath11k_base *ab,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "pdev temperature ev temp %d pdev_id %d\n", ev-&gt;temp, ev-&gt;pdev_id);</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event pdev temperature ev temp %d pdev_id %d\n",</div><div class='add'>+		   ev-&gt;temp, ev-&gt;pdev_id);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	ar = ath11k_mac_get_ar_by_pdev_id(ab, ev-&gt;pdev_id);</div><div class='ctx'> 	if (!ar) {</div><div class='ctx'> 		ath11k_warn(ab, "invalid pdev id in pdev temperature ev %d", ev-&gt;pdev_id);</div><div class='del'>-		kfree(tb);</div><div class='del'>-		return;</div><div class='add'>+		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_thermal_event_temperature(ar, ev-&gt;temp);</div><div class='ctx'> </div><div class='add'>+exit:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 	kfree(tb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6859,7 +8462,7 @@ static void ath11k_fils_discovery_event(struct ath11k_base *ab,</div><div class='ctx'> 	const struct wmi_fils_discovery_event *ev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, skb-&gt;data, skb-&gt;len, GFP_ATOMIC);</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='ctx'> 	if (IS_ERR(tb)) {</div><div class='ctx'> 		ret = PTR_ERR(tb);</div><div class='ctx'> 		ath11k_warn(ab,</div><div class='hunk'>@@ -6868,6 +8471,8 @@ static void ath11k_fils_discovery_event(struct ath11k_base *ab,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event fils discovery");</div><div class='add'>+</div><div class='ctx'> 	ev = tb[WMI_TAG_HOST_SWFDA_EVENT];</div><div class='ctx'> 	if (!ev) {</div><div class='ctx'> 		ath11k_warn(ab, "failed to fetch FILS discovery event\n");</div><div class='hunk'>@@ -6889,7 +8494,7 @@ static void ath11k_probe_resp_tx_status_event(struct ath11k_base *ab,</div><div class='ctx'> 	const struct wmi_probe_resp_tx_status_event *ev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tb = ath11k_wmi_tlv_parse_alloc(ab, skb-&gt;data, skb-&gt;len, GFP_ATOMIC);</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='ctx'> 	if (IS_ERR(tb)) {</div><div class='ctx'> 		ret = PTR_ERR(tb);</div><div class='ctx'> 		ath11k_warn(ab,</div><div class='hunk'>@@ -6898,6 +8503,8 @@ static void ath11k_probe_resp_tx_status_event(struct ath11k_base *ab,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event probe resp tx status");</div><div class='add'>+</div><div class='ctx'> 	ev = tb[WMI_TAG_OFFLOAD_PRB_RSP_TX_STATUS_EVENT];</div><div class='ctx'> 	if (!ev) {</div><div class='ctx'> 		ath11k_warn(ab,</div><div class='hunk'>@@ -6964,9 +8571,187 @@ static void ath11k_wmi_event_wow_wakeup_host(struct ath11k_base *ab, struct sk_b</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event wow wakeup host");</div><div class='add'>+</div><div class='ctx'> 	complete(&amp;ab-&gt;wow.wakeup_completed);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+ath11k_wmi_diag_event(struct ath11k_base *ab,</div><div class='add'>+		      struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event diag");</div><div class='add'>+</div><div class='add'>+	trace_ath11k_wmi_diag(ab, skb-&gt;data, skb-&gt;len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *ath11k_wmi_twt_add_dialog_event_status(u32 status)</div><div class='add'>+{</div><div class='add'>+	switch (status) {</div><div class='add'>+	case WMI_ADD_TWT_STATUS_OK:</div><div class='add'>+		return "ok";</div><div class='add'>+	case WMI_ADD_TWT_STATUS_TWT_NOT_ENABLED:</div><div class='add'>+		return "twt disabled";</div><div class='add'>+	case WMI_ADD_TWT_STATUS_USED_DIALOG_ID:</div><div class='add'>+		return "dialog id in use";</div><div class='add'>+	case WMI_ADD_TWT_STATUS_INVALID_PARAM:</div><div class='add'>+		return "invalid parameters";</div><div class='add'>+	case WMI_ADD_TWT_STATUS_NOT_READY:</div><div class='add'>+		return "not ready";</div><div class='add'>+	case WMI_ADD_TWT_STATUS_NO_RESOURCE:</div><div class='add'>+		return "resource unavailable";</div><div class='add'>+	case WMI_ADD_TWT_STATUS_NO_ACK:</div><div class='add'>+		return "no ack";</div><div class='add'>+	case WMI_ADD_TWT_STATUS_NO_RESPONSE:</div><div class='add'>+		return "no response";</div><div class='add'>+	case WMI_ADD_TWT_STATUS_DENIED:</div><div class='add'>+		return "denied";</div><div class='add'>+	case WMI_ADD_TWT_STATUS_UNKNOWN_ERROR:</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		return "unknown error";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_wmi_twt_add_dialog_event(struct ath11k_base *ab,</div><div class='add'>+					    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_twt_add_dialog_event *ev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath11k_warn(ab,</div><div class='add'>+			    "failed to parse wmi twt add dialog status event tlv: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event twt add dialog");</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_TWT_ADD_DIALOG_COMPLETE_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath11k_warn(ab, "failed to fetch twt add dialog wmi event\n");</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ev-&gt;status)</div><div class='add'>+		ath11k_warn(ab,</div><div class='add'>+			    "wmi add twt dialog event vdev %d dialog id %d status %s\n",</div><div class='add'>+			    ev-&gt;vdev_id, ev-&gt;dialog_id,</div><div class='add'>+			    ath11k_wmi_twt_add_dialog_event_status(ev-&gt;status));</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	kfree(tb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_wmi_gtk_offload_status_event(struct ath11k_base *ab,</div><div class='add'>+						struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_gtk_offload_status_event *ev;</div><div class='add'>+	struct ath11k_vif *arvif;</div><div class='add'>+	__be64 replay_ctr_be;</div><div class='add'>+	u64    replay_ctr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath11k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_GTK_OFFLOAD_STATUS_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath11k_warn(ab, "failed to fetch gtk offload status ev");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	arvif = ath11k_mac_get_arvif_by_vdev_id(ab, ev-&gt;vdev_id);</div><div class='add'>+	if (!arvif) {</div><div class='add'>+		ath11k_warn(ab, "failed to get arvif for vdev_id:%d\n",</div><div class='add'>+			    ev-&gt;vdev_id);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI, "event gtk offload refresh_cnt %d\n",</div><div class='add'>+		   ev-&gt;refresh_cnt);</div><div class='add'>+	ath11k_dbg_dump(ab, ATH11K_DBG_WMI, "replay_cnt",</div><div class='add'>+			NULL, ev-&gt;replay_ctr.counter, GTK_REPLAY_COUNTER_BYTES);</div><div class='add'>+</div><div class='add'>+	replay_ctr =  ev-&gt;replay_ctr.word1;</div><div class='add'>+	replay_ctr = (replay_ctr &lt;&lt; 32) | ev-&gt;replay_ctr.word0;</div><div class='add'>+	arvif-&gt;rekey_data.replay_ctr = replay_ctr;</div><div class='add'>+</div><div class='add'>+	/* supplicant expects big-endian replay counter */</div><div class='add'>+	replay_ctr_be = cpu_to_be64(replay_ctr);</div><div class='add'>+</div><div class='add'>+	ieee80211_gtk_rekey_notify(arvif-&gt;vif, arvif-&gt;bssid,</div><div class='add'>+				   (void *)&amp;replay_ctr_be, GFP_ATOMIC);</div><div class='add'>+exit:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_wmi_p2p_noa_event(struct ath11k_base *ab,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_p2p_noa_event *ev;</div><div class='add'>+	const struct ath11k_wmi_p2p_noa_info *noa;</div><div class='add'>+	struct ath11k *ar;</div><div class='add'>+	int vdev_id;</div><div class='add'>+	u8 noa_descriptors;</div><div class='add'>+</div><div class='add'>+	tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ath11k_warn(ab, "failed to parse tlv: %ld\n", PTR_ERR(tb));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_P2P_NOA_EVENT];</div><div class='add'>+	noa = tb[WMI_TAG_P2P_NOA_INFO];</div><div class='add'>+</div><div class='add'>+	if (!ev || !noa)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	vdev_id = ev-&gt;vdev_id;</div><div class='add'>+	noa_descriptors = u32_get_bits(noa-&gt;noa_attr,</div><div class='add'>+				       WMI_P2P_NOA_INFO_DESC_NUM);</div><div class='add'>+</div><div class='add'>+	if (noa_descriptors &gt; WMI_P2P_MAX_NOA_DESCRIPTORS) {</div><div class='add'>+		ath11k_warn(ab, "invalid descriptor num %d in P2P NoA event\n",</div><div class='add'>+			    noa_descriptors);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "wmi tlv p2p noa vdev_id %i descriptors %u\n",</div><div class='add'>+		   vdev_id, noa_descriptors);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ar = ath11k_mac_get_ar_by_vdev_id(ab, vdev_id);</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath11k_warn(ab, "invalid vdev id %d in P2P NoA event\n",</div><div class='add'>+			    vdev_id);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_p2p_noa_update_by_vdev_id(ar, vdev_id, noa);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+out:</div><div class='add'>+	kfree(tb);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath11k_wmi_tlv_op_rx(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_cmd_hdr *cmd_hdr;</div><div class='hunk'>@@ -6975,6 +8760,8 @@ static void ath11k_wmi_tlv_op_rx(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> 	cmd_hdr = (struct wmi_cmd_hdr *)skb-&gt;data;</div><div class='ctx'> 	id = FIELD_GET(WMI_CMD_HDR_CMD_ID, (cmd_hdr-&gt;cmd_id));</div><div class='ctx'> </div><div class='add'>+	trace_ath11k_wmi_event(ab, id, skb-&gt;data, skb-&gt;len);</div><div class='add'>+</div><div class='ctx'> 	if (skb_pull(skb, sizeof(struct wmi_cmd_hdr)) == NULL)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -6990,7 +8777,10 @@ static void ath11k_wmi_tlv_op_rx(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> 		ath11k_service_ready_ext2_event(ab, skb);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_REG_CHAN_LIST_CC_EVENTID:</div><div class='del'>-		ath11k_reg_chan_list_event(ab, skb);</div><div class='add'>+		ath11k_reg_chan_list_event(ab, skb, WMI_REG_CHAN_LIST_CC_ID);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_REG_CHAN_LIST_CC_EXT_EVENTID:</div><div class='add'>+		ath11k_reg_chan_list_event(ab, skb, WMI_REG_CHAN_LIST_CC_EXT_ID);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_READY_EVENTID:</div><div class='ctx'> 		ath11k_ready_event(ab, skb);</div><div class='hunk'>@@ -7047,6 +8837,9 @@ static void ath11k_wmi_tlv_op_rx(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> 	case WMI_PDEV_CSA_SWITCH_COUNT_STATUS_EVENTID:</div><div class='ctx'> 		ath11k_wmi_pdev_csa_switch_count_status_event(ab, skb);</div><div class='ctx'> 		break;</div><div class='add'>+	case WMI_PDEV_UTF_EVENTID:</div><div class='add'>+		ath11k_tm_wmi_event(ab, id, skb);</div><div class='add'>+		break;</div><div class='ctx'> 	case WMI_PDEV_TEMPERATURE_EVENTID:</div><div class='ctx'> 		ath11k_wmi_pdev_temperature_event(ab, skb);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -7059,14 +8852,11 @@ static void ath11k_wmi_tlv_op_rx(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> 	case WMI_OFFLOAD_PROB_RESP_TX_STATUS_EVENTID:</div><div class='ctx'> 		ath11k_probe_resp_tx_status_event(ab, skb);</div><div class='ctx'> 		break;</div><div class='del'>-	/* add Unsupported events here */</div><div class='del'>-	case WMI_TBTTOFFSET_EXT_UPDATE_EVENTID:</div><div class='del'>-	case WMI_PEER_OPER_MODE_CHANGE_EVENTID:</div><div class='del'>-	case WMI_TWT_ENABLE_EVENTID:</div><div class='del'>-	case WMI_TWT_DISABLE_EVENTID:</div><div class='del'>-	case WMI_PDEV_DMA_RING_CFG_RSP_EVENTID:</div><div class='del'>-		ath11k_dbg(ab, ATH11K_DBG_WMI,</div><div class='del'>-			   "ignoring unsupported event 0x%x\n", id);</div><div class='add'>+	case WMI_OBSS_COLOR_COLLISION_DETECTION_EVENTID:</div><div class='add'>+		ath11k_wmi_obss_color_collision_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TWT_ADD_DIALOG_EVENTID:</div><div class='add'>+		ath11k_wmi_twt_add_dialog_event(ab, skb);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_PDEV_DFS_RADAR_DETECTION_EVENTID:</div><div class='ctx'> 		ath11k_wmi_pdev_dfs_radar_detected_event(ab, skb);</div><div class='hunk'>@@ -7077,9 +8867,23 @@ static void ath11k_wmi_tlv_op_rx(struct ath11k_base *ab, struct sk_buff *skb)</div><div class='ctx'> 	case WMI_WOW_WAKEUP_HOST_EVENTID:</div><div class='ctx'> 		ath11k_wmi_event_wow_wakeup_host(ab, skb);</div><div class='ctx'> 		break;</div><div class='del'>-	/* TODO: Add remaining events */</div><div class='add'>+	case WMI_11D_NEW_COUNTRY_EVENTID:</div><div class='add'>+		ath11k_reg_11d_new_cc_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_DIAG_EVENTID:</div><div class='add'>+		ath11k_wmi_diag_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_PEER_STA_PS_STATECHG_EVENTID:</div><div class='add'>+		ath11k_wmi_event_peer_sta_ps_state_chg(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_GTK_OFFLOAD_STATUS_EVENTID:</div><div class='add'>+		ath11k_wmi_gtk_offload_status_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_P2P_NOA_EVENTID:</div><div class='add'>+		ath11k_wmi_p2p_noa_event(ab, skb);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='del'>-		ath11k_dbg(ab, ATH11K_DBG_WMI, "Unknown eventid: 0x%x\n", id);</div><div class='add'>+		ath11k_dbg(ab, ATH11K_DBG_WMI, "unsupported event id 0x%x\n", id);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -7119,6 +8923,7 @@ static int ath11k_connect_pdev_htc_service(struct ath11k_base *ab,</div><div class='ctx'> 	ab-&gt;wmi_ab.wmi_endpoint_id[pdev_idx] = conn_resp.eid;</div><div class='ctx'> 	ab-&gt;wmi_ab.wmi[pdev_idx].eid = conn_resp.eid;</div><div class='ctx'> 	ab-&gt;wmi_ab.max_msg_len[pdev_idx] = conn_resp.max_msg_len;</div><div class='add'>+	init_waitqueue_head(&amp;ab-&gt;wmi_ab.wmi[pdev_idx].tx_ce_desc_wq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -7175,7 +8980,7 @@ ath11k_wmi_send_unit_test_cmd(struct ath11k *ar,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='del'>-		   "WMI unit test : module %d vdev %d n_args %d token %d\n",</div><div class='add'>+		   "cmd unit test module %d vdev %d n_args %d token %d\n",</div><div class='ctx'> 		   cmd-&gt;module_id, cmd-&gt;vdev_id, cmd-&gt;num_args,</div><div class='ctx'> 		   cmd-&gt;diag_token);</div><div class='ctx'> </div><div class='hunk'>@@ -7217,6 +9022,62 @@ int ath11k_wmi_simulate_radar(struct ath11k *ar)</div><div class='ctx'> 	return ath11k_wmi_send_unit_test_cmd(ar, wmi_ut, dfs_args);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int ath11k_wmi_fw_dbglog_cfg(struct ath11k *ar, u32 *module_id_bitmap,</div><div class='add'>+			     struct ath11k_fw_dbglog *dbglog)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_pdev_wmi *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_debug_log_config_cmd_fixed_param *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	int ret, len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd) + TLV_HDR_SIZE + (MAX_MODULE_ID_BITMAP_WORDS * sizeof(u32));</div><div class='add'>+	skb = ath11k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_debug_log_config_cmd_fixed_param *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_DEBUG_LOG_CONFIG_CMD) |</div><div class='add'>+			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='add'>+	cmd-&gt;dbg_log_param = dbglog-&gt;param;</div><div class='add'>+</div><div class='add'>+	tlv = (struct wmi_tlv *)((u8 *)cmd + sizeof(*cmd));</div><div class='add'>+	tlv-&gt;header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_UINT32) |</div><div class='add'>+		      FIELD_PREP(WMI_TLV_LEN, MAX_MODULE_ID_BITMAP_WORDS * sizeof(u32));</div><div class='add'>+</div><div class='add'>+	switch (dbglog-&gt;param) {</div><div class='add'>+	case WMI_DEBUG_LOG_PARAM_LOG_LEVEL:</div><div class='add'>+	case WMI_DEBUG_LOG_PARAM_VDEV_ENABLE:</div><div class='add'>+	case WMI_DEBUG_LOG_PARAM_VDEV_DISABLE:</div><div class='add'>+	case WMI_DEBUG_LOG_PARAM_VDEV_ENABLE_BITMAP:</div><div class='add'>+		cmd-&gt;value = dbglog-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_DEBUG_LOG_PARAM_MOD_ENABLE_BITMAP:</div><div class='add'>+	case WMI_DEBUG_LOG_PARAM_WOW_MOD_ENABLE_BITMAP:</div><div class='add'>+		cmd-&gt;value = dbglog-&gt;value;</div><div class='add'>+		memcpy(tlv-&gt;value, module_id_bitmap,</div><div class='add'>+		       MAX_MODULE_ID_BITMAP_WORDS * sizeof(u32));</div><div class='add'>+		/* clear current config to be used for next user config */</div><div class='add'>+		memset(module_id_bitmap, 0,</div><div class='add'>+		       MAX_MODULE_ID_BITMAP_WORDS * sizeof(u32));</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_DBGLOG_CFG_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_DBGLOG_CFG_CMDID\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "cmd dbglog cfg");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int ath11k_wmi_connect(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='ctx'> 	u32 i;</div><div class='hunk'>@@ -7270,7 +9131,7 @@ int ath11k_wmi_attach(struct ath11k_base *ab)</div><div class='ctx'> 	ab-&gt;wmi_ab.preferred_hw_mode = WMI_HOST_HW_MODE_MAX;</div><div class='ctx'> </div><div class='ctx'> 	/* It's overwritten when service_ext_ready is handled */</div><div class='del'>-	if (ab-&gt;hw_params.single_pdev_only)</div><div class='add'>+	if (ab-&gt;hw_params.single_pdev_only &amp;&amp; ab-&gt;hw_params.num_rxdma_per_pdev &gt; 1)</div><div class='ctx'> 		ab-&gt;wmi_ab.preferred_hw_mode = WMI_HOST_HW_MODE_SINGLE;</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: Init remaining wmi soc resources required */</div><div class='hunk'>@@ -7292,6 +9153,39 @@ void ath11k_wmi_detach(struct ath11k_base *ab)</div><div class='ctx'> 	ath11k_wmi_free_dbring_caps(ab);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int ath11k_wmi_hw_data_filter_cmd(struct ath11k *ar, u32 vdev_id,</div><div class='add'>+				  u32 filter_bitmap, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct wmi_hw_data_filter_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+	skb = ath11k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_hw_data_filter_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_HW_DATA_FILTER_CMD) |</div><div class='add'>+			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = vdev_id;</div><div class='add'>+	cmd-&gt;enable = enable;</div><div class='add'>+</div><div class='add'>+	/* Set all modes in case of disable */</div><div class='add'>+	if (cmd-&gt;enable)</div><div class='add'>+		cmd-&gt;hw_filter_bitmap = filter_bitmap;</div><div class='add'>+	else</div><div class='add'>+		cmd-&gt;hw_filter_bitmap = ((u32)~0U);</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "hw data filter enable %d filter_bitmap 0x%x\n",</div><div class='add'>+		   enable, filter_bitmap);</div><div class='add'>+</div><div class='add'>+	return ath11k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_HW_DATA_FILTER_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int ath11k_wmi_wow_host_wakeup_ind(struct ath11k *ar)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_wow_host_wakeup_ind *cmd;</div><div class='hunk'>@@ -7308,7 +9202,7 @@ int ath11k_wmi_wow_host_wakeup_ind(struct ath11k *ar)</div><div class='ctx'> 				     WMI_TAG_WOW_HOSTWAKEUP_FROM_SLEEP_CMD) |</div><div class='ctx'> 			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='ctx'> </div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "wmi tlv wow host wakeup ind\n");</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "tlv wow host wakeup ind\n");</div><div class='ctx'> </div><div class='ctx'> 	return ath11k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_WOW_HOSTWAKEUP_FROM_SLEEP_CMDID);</div><div class='ctx'> }</div><div class='hunk'>@@ -7330,7 +9224,686 @@ int ath11k_wmi_wow_enable(struct ath11k *ar)</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;enable = 1;</div><div class='ctx'> 	cmd-&gt;pause_iface_config = WOW_IFACE_PAUSE_ENABLED;</div><div class='del'>-	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "wmi tlv wow enable\n");</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "tlv wow enable\n");</div><div class='ctx'> </div><div class='ctx'> 	return ath11k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_WOW_ENABLE_CMDID);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int ath11k_wmi_scan_prob_req_oui(struct ath11k *ar,</div><div class='add'>+				 const u8 mac_addr[ETH_ALEN])</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct wmi_scan_prob_req_oui_cmd *cmd;</div><div class='add'>+	u32 prob_req_oui;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	prob_req_oui = (((u32)mac_addr[0]) &lt;&lt; 16) |</div><div class='add'>+		       (((u32)mac_addr[1]) &lt;&lt; 8) | mac_addr[2];</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+	skb = ath11k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_scan_prob_req_oui_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG,</div><div class='add'>+				     WMI_TAG_SCAN_PROB_REQ_OUI_CMD) |</div><div class='add'>+			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='add'>+	cmd-&gt;prob_req_oui = prob_req_oui;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "scan prob req oui %d\n",</div><div class='add'>+		   prob_req_oui);</div><div class='add'>+</div><div class='add'>+	return ath11k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_SCAN_PROB_REQ_OUI_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_wmi_wow_add_wakeup_event(struct ath11k *ar, u32 vdev_id,</div><div class='add'>+				    enum wmi_wow_wakeup_event event,</div><div class='add'>+				u32 enable)</div><div class='add'>+{</div><div class='add'>+	struct wmi_wow_add_del_event_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+	skb = ath11k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_wow_add_del_event_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_WOW_ADD_DEL_EVT_CMD) |</div><div class='add'>+			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = vdev_id;</div><div class='add'>+	cmd-&gt;is_add = enable;</div><div class='add'>+	cmd-&gt;event_bitmap = (1 &lt;&lt; event);</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "tlv wow add wakeup event %s enable %d vdev_id %d\n",</div><div class='add'>+		   wow_wakeup_event(event), enable, vdev_id);</div><div class='add'>+</div><div class='add'>+	return ath11k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_WOW_ENABLE_DISABLE_WAKE_EVENT_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_wmi_wow_add_pattern(struct ath11k *ar, u32 vdev_id, u32 pattern_id,</div><div class='add'>+			       const u8 *pattern, const u8 *mask,</div><div class='add'>+			   int pattern_len, int pattern_offset)</div><div class='add'>+{</div><div class='add'>+	struct wmi_wow_add_pattern_cmd *cmd;</div><div class='add'>+	struct wmi_wow_bitmap_pattern *bitmap;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u8 *ptr;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd) +</div><div class='add'>+	      sizeof(*tlv) +			/* array struct */</div><div class='add'>+	      sizeof(*bitmap) +			/* bitmap */</div><div class='add'>+	      sizeof(*tlv) +			/* empty ipv4 sync */</div><div class='add'>+	      sizeof(*tlv) +			/* empty ipv6 sync */</div><div class='add'>+	      sizeof(*tlv) +			/* empty magic */</div><div class='add'>+	      sizeof(*tlv) +			/* empty info timeout */</div><div class='add'>+	      sizeof(*tlv) + sizeof(u32);	/* ratelimit interval */</div><div class='add'>+</div><div class='add'>+	skb = ath11k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* cmd */</div><div class='add'>+	ptr = (u8 *)skb-&gt;data;</div><div class='add'>+	cmd = (struct wmi_wow_add_pattern_cmd *)ptr;</div><div class='add'>+	cmd-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG,</div><div class='add'>+				     WMI_TAG_WOW_ADD_PATTERN_CMD) |</div><div class='add'>+			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = vdev_id;</div><div class='add'>+	cmd-&gt;pattern_id = pattern_id;</div><div class='add'>+	cmd-&gt;pattern_type = WOW_BITMAP_PATTERN;</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	/* bitmap */</div><div class='add'>+	tlv = (struct wmi_tlv *)ptr;</div><div class='add'>+	tlv-&gt;header = FIELD_PREP(WMI_TLV_TAG,</div><div class='add'>+				 WMI_TAG_ARRAY_STRUCT) |</div><div class='add'>+		      FIELD_PREP(WMI_TLV_LEN, sizeof(*bitmap));</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*tlv);</div><div class='add'>+</div><div class='add'>+	bitmap = (struct wmi_wow_bitmap_pattern *)ptr;</div><div class='add'>+	bitmap-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG,</div><div class='add'>+					WMI_TAG_WOW_BITMAP_PATTERN_T) |</div><div class='add'>+			     FIELD_PREP(WMI_TLV_LEN, sizeof(*bitmap) - TLV_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+	memcpy(bitmap-&gt;patternbuf, pattern, pattern_len);</div><div class='add'>+	ath11k_ce_byte_swap(bitmap-&gt;patternbuf, roundup(pattern_len, 4));</div><div class='add'>+	memcpy(bitmap-&gt;bitmaskbuf, mask, pattern_len);</div><div class='add'>+	ath11k_ce_byte_swap(bitmap-&gt;bitmaskbuf, roundup(pattern_len, 4));</div><div class='add'>+	bitmap-&gt;pattern_offset = pattern_offset;</div><div class='add'>+	bitmap-&gt;pattern_len = pattern_len;</div><div class='add'>+	bitmap-&gt;bitmask_len = pattern_len;</div><div class='add'>+	bitmap-&gt;pattern_id = pattern_id;</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*bitmap);</div><div class='add'>+</div><div class='add'>+	/* ipv4 sync */</div><div class='add'>+	tlv = (struct wmi_tlv *)ptr;</div><div class='add'>+	tlv-&gt;header = FIELD_PREP(WMI_TLV_TAG,</div><div class='add'>+				 WMI_TAG_ARRAY_STRUCT) |</div><div class='add'>+		      FIELD_PREP(WMI_TLV_LEN, 0);</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*tlv);</div><div class='add'>+</div><div class='add'>+	/* ipv6 sync */</div><div class='add'>+	tlv = (struct wmi_tlv *)ptr;</div><div class='add'>+	tlv-&gt;header = FIELD_PREP(WMI_TLV_TAG,</div><div class='add'>+				 WMI_TAG_ARRAY_STRUCT) |</div><div class='add'>+		      FIELD_PREP(WMI_TLV_LEN, 0);</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*tlv);</div><div class='add'>+</div><div class='add'>+	/* magic */</div><div class='add'>+	tlv = (struct wmi_tlv *)ptr;</div><div class='add'>+	tlv-&gt;header = FIELD_PREP(WMI_TLV_TAG,</div><div class='add'>+				 WMI_TAG_ARRAY_STRUCT) |</div><div class='add'>+		      FIELD_PREP(WMI_TLV_LEN, 0);</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*tlv);</div><div class='add'>+</div><div class='add'>+	/* pattern info timeout */</div><div class='add'>+	tlv = (struct wmi_tlv *)ptr;</div><div class='add'>+	tlv-&gt;header = FIELD_PREP(WMI_TLV_TAG,</div><div class='add'>+				 WMI_TAG_ARRAY_UINT32) |</div><div class='add'>+		      FIELD_PREP(WMI_TLV_LEN, 0);</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*tlv);</div><div class='add'>+</div><div class='add'>+	/* ratelimit interval */</div><div class='add'>+	tlv = (struct wmi_tlv *)ptr;</div><div class='add'>+	tlv-&gt;header = FIELD_PREP(WMI_TLV_TAG,</div><div class='add'>+				 WMI_TAG_ARRAY_UINT32) |</div><div class='add'>+		      FIELD_PREP(WMI_TLV_LEN, sizeof(u32));</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "tlv wow add pattern vdev_id %d pattern_id %d pattern_offset %d\n",</div><div class='add'>+		   vdev_id, pattern_id, pattern_offset);</div><div class='add'>+</div><div class='add'>+	return ath11k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_WOW_ADD_WAKE_PATTERN_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_wmi_wow_del_pattern(struct ath11k *ar, u32 vdev_id, u32 pattern_id)</div><div class='add'>+{</div><div class='add'>+	struct wmi_wow_del_pattern_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+	skb = ath11k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_wow_del_pattern_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG,</div><div class='add'>+				     WMI_TAG_WOW_DEL_PATTERN_CMD) |</div><div class='add'>+			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = vdev_id;</div><div class='add'>+	cmd-&gt;pattern_id = pattern_id;</div><div class='add'>+	cmd-&gt;pattern_type = WOW_BITMAP_PATTERN;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "tlv wow del pattern vdev_id %d pattern_id %d\n",</div><div class='add'>+		   vdev_id, pattern_id);</div><div class='add'>+</div><div class='add'>+	return ath11k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_WOW_DEL_WAKE_PATTERN_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *</div><div class='add'>+ath11k_wmi_op_gen_config_pno_start(struct ath11k *ar,</div><div class='add'>+				   u32 vdev_id,</div><div class='add'>+				       struct wmi_pno_scan_req *pno)</div><div class='add'>+{</div><div class='add'>+	struct nlo_configured_parameters *nlo_list;</div><div class='add'>+	struct wmi_wow_nlo_config_cmd *cmd;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u32 *channel_list;</div><div class='add'>+	size_t len, nlo_list_len, channel_list_len;</div><div class='add'>+	u8 *ptr;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd) +</div><div class='add'>+	      sizeof(*tlv) +</div><div class='add'>+	      /* TLV place holder for array of structures</div><div class='add'>+	       * nlo_configured_parameters(nlo_list)</div><div class='add'>+	       */</div><div class='add'>+	      sizeof(*tlv);</div><div class='add'>+	      /* TLV place holder for array of uint32 channel_list */</div><div class='add'>+</div><div class='add'>+	channel_list_len = sizeof(u32) * pno-&gt;a_networks[0].channel_count;</div><div class='add'>+	len += channel_list_len;</div><div class='add'>+</div><div class='add'>+	nlo_list_len = sizeof(*nlo_list) * pno-&gt;uc_networks_count;</div><div class='add'>+	len += nlo_list_len;</div><div class='add'>+</div><div class='add'>+	skb = ath11k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	ptr = (u8 *)skb-&gt;data;</div><div class='add'>+	cmd = (struct wmi_wow_nlo_config_cmd *)ptr;</div><div class='add'>+	cmd-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_NLO_CONFIG_CMD) |</div><div class='add'>+			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = pno-&gt;vdev_id;</div><div class='add'>+	cmd-&gt;flags = WMI_NLO_CONFIG_START | WMI_NLO_CONFIG_SSID_HIDE_EN;</div><div class='add'>+</div><div class='add'>+	/* current FW does not support min-max range for dwell time */</div><div class='add'>+	cmd-&gt;active_dwell_time = pno-&gt;active_max_time;</div><div class='add'>+	cmd-&gt;passive_dwell_time = pno-&gt;passive_max_time;</div><div class='add'>+</div><div class='add'>+	if (pno-&gt;do_passive_scan)</div><div class='add'>+		cmd-&gt;flags |= WMI_NLO_CONFIG_SCAN_PASSIVE;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;fast_scan_period = pno-&gt;fast_scan_period;</div><div class='add'>+	cmd-&gt;slow_scan_period = pno-&gt;slow_scan_period;</div><div class='add'>+	cmd-&gt;fast_scan_max_cycles = pno-&gt;fast_scan_max_cycles;</div><div class='add'>+	cmd-&gt;delay_start_time = pno-&gt;delay_start_time;</div><div class='add'>+</div><div class='add'>+	if (pno-&gt;enable_pno_scan_randomization) {</div><div class='add'>+		cmd-&gt;flags |= WMI_NLO_CONFIG_SPOOFED_MAC_IN_PROBE_REQ |</div><div class='add'>+				WMI_NLO_CONFIG_RANDOM_SEQ_NO_IN_PROBE_REQ;</div><div class='add'>+		ether_addr_copy(cmd-&gt;mac_addr.addr, pno-&gt;mac_addr);</div><div class='add'>+		ether_addr_copy(cmd-&gt;mac_mask.addr, pno-&gt;mac_addr_mask);</div><div class='add'>+		ath11k_ce_byte_swap(cmd-&gt;mac_addr.addr, 8);</div><div class='add'>+		ath11k_ce_byte_swap(cmd-&gt;mac_mask.addr, 8);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	/* nlo_configured_parameters(nlo_list) */</div><div class='add'>+	cmd-&gt;no_of_ssids = pno-&gt;uc_networks_count;</div><div class='add'>+	tlv = (struct wmi_tlv *)ptr;</div><div class='add'>+	tlv-&gt;header = FIELD_PREP(WMI_TLV_TAG,</div><div class='add'>+				 WMI_TAG_ARRAY_STRUCT) |</div><div class='add'>+		      FIELD_PREP(WMI_TLV_LEN, nlo_list_len);</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*tlv);</div><div class='add'>+	nlo_list = (struct nlo_configured_parameters *)ptr;</div><div class='add'>+	for (i = 0; i &lt; cmd-&gt;no_of_ssids; i++) {</div><div class='add'>+		tlv = (struct wmi_tlv *)(&amp;nlo_list[i].tlv_header);</div><div class='add'>+		tlv-&gt;header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) |</div><div class='add'>+			      FIELD_PREP(WMI_TLV_LEN, sizeof(*nlo_list) - sizeof(*tlv));</div><div class='add'>+</div><div class='add'>+		nlo_list[i].ssid.valid = true;</div><div class='add'>+		nlo_list[i].ssid.ssid.ssid_len = pno-&gt;a_networks[i].ssid.ssid_len;</div><div class='add'>+		memcpy(nlo_list[i].ssid.ssid.ssid,</div><div class='add'>+		       pno-&gt;a_networks[i].ssid.ssid,</div><div class='add'>+		       nlo_list[i].ssid.ssid.ssid_len);</div><div class='add'>+		ath11k_ce_byte_swap(nlo_list[i].ssid.ssid.ssid,</div><div class='add'>+				    roundup(nlo_list[i].ssid.ssid.ssid_len, 4));</div><div class='add'>+</div><div class='add'>+		if (pno-&gt;a_networks[i].rssi_threshold &amp;&amp;</div><div class='add'>+		    pno-&gt;a_networks[i].rssi_threshold &gt; -300) {</div><div class='add'>+			nlo_list[i].rssi_cond.valid = true;</div><div class='add'>+			nlo_list[i].rssi_cond.rssi =</div><div class='add'>+				pno-&gt;a_networks[i].rssi_threshold;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nlo_list[i].bcast_nw_type.valid = true;</div><div class='add'>+		nlo_list[i].bcast_nw_type.bcast_nw_type =</div><div class='add'>+			pno-&gt;a_networks[i].bcast_nw_type;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptr += nlo_list_len;</div><div class='add'>+	cmd-&gt;num_of_channels = pno-&gt;a_networks[0].channel_count;</div><div class='add'>+	tlv = (struct wmi_tlv *)ptr;</div><div class='add'>+	tlv-&gt;header =  FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_UINT32) |</div><div class='add'>+		       FIELD_PREP(WMI_TLV_LEN, channel_list_len);</div><div class='add'>+	ptr += sizeof(*tlv);</div><div class='add'>+	channel_list = (u32 *)ptr;</div><div class='add'>+	for (i = 0; i &lt; cmd-&gt;num_of_channels; i++)</div><div class='add'>+		channel_list[i] = pno-&gt;a_networks[0].channels[i];</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "tlv start pno config vdev_id %d\n",</div><div class='add'>+		   vdev_id);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ath11k_wmi_op_gen_config_pno_stop(struct ath11k *ar,</div><div class='add'>+							 u32 vdev_id)</div><div class='add'>+{</div><div class='add'>+	struct wmi_wow_nlo_config_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+	skb = ath11k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_wow_nlo_config_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_NLO_CONFIG_CMD) |</div><div class='add'>+			  FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = vdev_id;</div><div class='add'>+	cmd-&gt;flags = WMI_NLO_CONFIG_STOP;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "tlv stop pno config vdev_id %d\n", vdev_id);</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_wmi_wow_config_pno(struct ath11k *ar, u32 vdev_id,</div><div class='add'>+			      struct wmi_pno_scan_req  *pno_scan)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (pno_scan-&gt;enable)</div><div class='add'>+		skb = ath11k_wmi_op_gen_config_pno_start(ar, vdev_id, pno_scan);</div><div class='add'>+	else</div><div class='add'>+		skb = ath11k_wmi_op_gen_config_pno_stop(ar, vdev_id);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR_OR_NULL(skb))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return ath11k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_NETWORK_LIST_OFFLOAD_CONFIG_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_wmi_fill_ns_offload(struct ath11k *ar,</div><div class='add'>+				       struct ath11k_arp_ns_offload *offload,</div><div class='add'>+				       u8 **ptr,</div><div class='add'>+				       bool enable,</div><div class='add'>+				       bool ext)</div><div class='add'>+{</div><div class='add'>+	struct wmi_ns_offload_tuple *ns;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	u8 *buf_ptr = *ptr;</div><div class='add'>+	u32 ns_cnt, ns_ext_tuples;</div><div class='add'>+	int i, max_offloads;</div><div class='add'>+</div><div class='add'>+	ns_cnt = offload-&gt;ipv6_count;</div><div class='add'>+</div><div class='add'>+	tlv  = (struct wmi_tlv *)buf_ptr;</div><div class='add'>+</div><div class='add'>+	if (ext) {</div><div class='add'>+		ns_ext_tuples = offload-&gt;ipv6_count - WMI_MAX_NS_OFFLOADS;</div><div class='add'>+		tlv-&gt;header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) |</div><div class='add'>+			      FIELD_PREP(WMI_TLV_LEN, ns_ext_tuples * sizeof(*ns));</div><div class='add'>+		i = WMI_MAX_NS_OFFLOADS;</div><div class='add'>+		max_offloads = offload-&gt;ipv6_count;</div><div class='add'>+	} else {</div><div class='add'>+		tlv-&gt;header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) |</div><div class='add'>+			      FIELD_PREP(WMI_TLV_LEN, WMI_MAX_NS_OFFLOADS * sizeof(*ns));</div><div class='add'>+		i = 0;</div><div class='add'>+		max_offloads = WMI_MAX_NS_OFFLOADS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buf_ptr += sizeof(*tlv);</div><div class='add'>+</div><div class='add'>+	for (; i &lt; max_offloads; i++) {</div><div class='add'>+		ns = (struct wmi_ns_offload_tuple *)buf_ptr;</div><div class='add'>+		ns-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_NS_OFFLOAD_TUPLE) |</div><div class='add'>+				 FIELD_PREP(WMI_TLV_LEN, sizeof(*ns) - TLV_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+		if (enable) {</div><div class='add'>+			if (i &lt; ns_cnt)</div><div class='add'>+				ns-&gt;flags |= WMI_NSOL_FLAGS_VALID;</div><div class='add'>+</div><div class='add'>+			memcpy(ns-&gt;target_ipaddr[0], offload-&gt;ipv6_addr[i], 16);</div><div class='add'>+			memcpy(ns-&gt;solicitation_ipaddr, offload-&gt;self_ipv6_addr[i], 16);</div><div class='add'>+			ath11k_ce_byte_swap(ns-&gt;target_ipaddr[0], 16);</div><div class='add'>+			ath11k_ce_byte_swap(ns-&gt;solicitation_ipaddr, 16);</div><div class='add'>+</div><div class='add'>+			if (offload-&gt;ipv6_type[i])</div><div class='add'>+				ns-&gt;flags |= WMI_NSOL_FLAGS_IS_IPV6_ANYCAST;</div><div class='add'>+</div><div class='add'>+			memcpy(ns-&gt;target_mac.addr, offload-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+			ath11k_ce_byte_swap(ns-&gt;target_mac.addr, 8);</div><div class='add'>+</div><div class='add'>+			if (ns-&gt;target_mac.word0 != 0 ||</div><div class='add'>+			    ns-&gt;target_mac.word1 != 0) {</div><div class='add'>+				ns-&gt;flags |= WMI_NSOL_FLAGS_MAC_VALID;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+				   "index %d ns_solicited %pI6 target %pI6",</div><div class='add'>+				   i, ns-&gt;solicitation_ipaddr,</div><div class='add'>+				   ns-&gt;target_ipaddr[0]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buf_ptr += sizeof(*ns);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*ptr = buf_ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath11k_wmi_fill_arp_offload(struct ath11k *ar,</div><div class='add'>+					struct ath11k_arp_ns_offload *offload,</div><div class='add'>+					u8 **ptr,</div><div class='add'>+					bool enable)</div><div class='add'>+{</div><div class='add'>+	struct wmi_arp_offload_tuple *arp;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	u8 *buf_ptr = *ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* fill arp tuple */</div><div class='add'>+	tlv = (struct wmi_tlv *)buf_ptr;</div><div class='add'>+	tlv-&gt;header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) |</div><div class='add'>+		      FIELD_PREP(WMI_TLV_LEN, WMI_MAX_ARP_OFFLOADS * sizeof(*arp));</div><div class='add'>+	buf_ptr += sizeof(*tlv);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WMI_MAX_ARP_OFFLOADS; i++) {</div><div class='add'>+		arp = (struct wmi_arp_offload_tuple *)buf_ptr;</div><div class='add'>+		arp-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARP_OFFLOAD_TUPLE) |</div><div class='add'>+				  FIELD_PREP(WMI_TLV_LEN, sizeof(*arp) - TLV_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+		if (enable &amp;&amp; i &lt; offload-&gt;ipv4_count) {</div><div class='add'>+			/* Copy the target ip addr and flags */</div><div class='add'>+			arp-&gt;flags = WMI_ARPOL_FLAGS_VALID;</div><div class='add'>+			memcpy(arp-&gt;target_ipaddr, offload-&gt;ipv4_addr[i], 4);</div><div class='add'>+			ath11k_ce_byte_swap(arp-&gt;target_ipaddr, 4);</div><div class='add'>+</div><div class='add'>+			ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "arp offload address %pI4",</div><div class='add'>+				   arp-&gt;target_ipaddr);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buf_ptr += sizeof(*arp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*ptr = buf_ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_wmi_arp_ns_offload(struct ath11k *ar,</div><div class='add'>+			      struct ath11k_vif *arvif, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_arp_ns_offload *offload;</div><div class='add'>+	struct wmi_set_arp_ns_offload_cmd *cmd;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u8 *buf_ptr;</div><div class='add'>+	size_t len;</div><div class='add'>+	u8 ns_cnt, ns_ext_tuples = 0;</div><div class='add'>+</div><div class='add'>+	offload = &amp;arvif-&gt;arp_ns_offload;</div><div class='add'>+	ns_cnt = offload-&gt;ipv6_count;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd) +</div><div class='add'>+	      sizeof(*tlv) +</div><div class='add'>+	      WMI_MAX_NS_OFFLOADS * sizeof(struct wmi_ns_offload_tuple) +</div><div class='add'>+	      sizeof(*tlv) +</div><div class='add'>+	      WMI_MAX_ARP_OFFLOADS * sizeof(struct wmi_arp_offload_tuple);</div><div class='add'>+</div><div class='add'>+	if (ns_cnt &gt; WMI_MAX_NS_OFFLOADS) {</div><div class='add'>+		ns_ext_tuples = ns_cnt - WMI_MAX_NS_OFFLOADS;</div><div class='add'>+		len += sizeof(*tlv) +</div><div class='add'>+		       ns_ext_tuples * sizeof(struct wmi_ns_offload_tuple);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = ath11k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	buf_ptr = skb-&gt;data;</div><div class='add'>+	cmd = (struct wmi_set_arp_ns_offload_cmd *)buf_ptr;</div><div class='add'>+	cmd-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG,</div><div class='add'>+				     WMI_TAG_SET_ARP_NS_OFFLOAD_CMD) |</div><div class='add'>+			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;flags = 0;</div><div class='add'>+	cmd-&gt;vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+	cmd-&gt;num_ns_ext_tuples = ns_ext_tuples;</div><div class='add'>+</div><div class='add'>+	buf_ptr += sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	ath11k_wmi_fill_ns_offload(ar, offload, &amp;buf_ptr, enable, 0);</div><div class='add'>+	ath11k_wmi_fill_arp_offload(ar, offload, &amp;buf_ptr, enable);</div><div class='add'>+</div><div class='add'>+	if (ns_ext_tuples)</div><div class='add'>+		ath11k_wmi_fill_ns_offload(ar, offload, &amp;buf_ptr, enable, 1);</div><div class='add'>+</div><div class='add'>+	return ath11k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_SET_ARP_NS_OFFLOAD_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_wmi_gtk_rekey_offload(struct ath11k *ar,</div><div class='add'>+				 struct ath11k_vif *arvif, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct wmi_gtk_rekey_offload_cmd *cmd;</div><div class='add'>+	struct ath11k_rekey_data *rekey_data = &amp;arvif-&gt;rekey_data;</div><div class='add'>+	int len;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	__le64 replay_ctr;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+	skb =  ath11k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_gtk_rekey_offload_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_GTK_OFFLOAD_CMD) |</div><div class='add'>+			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		cmd-&gt;flags = GTK_OFFLOAD_ENABLE_OPCODE;</div><div class='add'>+</div><div class='add'>+		/* the length in rekey_data and cmd is equal */</div><div class='add'>+		memcpy(cmd-&gt;kck, rekey_data-&gt;kck, sizeof(cmd-&gt;kck));</div><div class='add'>+		ath11k_ce_byte_swap(cmd-&gt;kck, GTK_OFFLOAD_KEK_BYTES);</div><div class='add'>+		memcpy(cmd-&gt;kek, rekey_data-&gt;kek, sizeof(cmd-&gt;kek));</div><div class='add'>+		ath11k_ce_byte_swap(cmd-&gt;kek, GTK_OFFLOAD_KEK_BYTES);</div><div class='add'>+</div><div class='add'>+		replay_ctr = cpu_to_le64(rekey_data-&gt;replay_ctr);</div><div class='add'>+		memcpy(cmd-&gt;replay_ctr, &amp;replay_ctr,</div><div class='add'>+		       sizeof(replay_ctr));</div><div class='add'>+		ath11k_ce_byte_swap(cmd-&gt;replay_ctr, GTK_REPLAY_COUNTER_BYTES);</div><div class='add'>+	} else {</div><div class='add'>+		cmd-&gt;flags = GTK_OFFLOAD_DISABLE_OPCODE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "offload gtk rekey vdev: %d %d\n",</div><div class='add'>+		   arvif-&gt;vdev_id, enable);</div><div class='add'>+	return ath11k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_GTK_OFFLOAD_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_wmi_gtk_rekey_getinfo(struct ath11k *ar,</div><div class='add'>+				 struct ath11k_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct wmi_gtk_rekey_offload_cmd *cmd;</div><div class='add'>+	int len;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+	skb =  ath11k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_gtk_rekey_offload_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_GTK_OFFLOAD_CMD) |</div><div class='add'>+			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+	cmd-&gt;flags = GTK_OFFLOAD_REQUEST_STATUS_OPCODE;</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI, "get gtk rekey vdev_id: %d\n",</div><div class='add'>+		   arvif-&gt;vdev_id);</div><div class='add'>+	return ath11k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_GTK_OFFLOAD_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_wmi_pdev_set_bios_sar_table_param(struct ath11k *ar, const u8 *sar_val)</div><div class='add'>+{	struct ath11k_pdev_wmi *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_pdev_set_sar_table_cmd *cmd;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u8 *buf_ptr;</div><div class='add'>+	u32 len, sar_len_aligned, rsvd_len_aligned;</div><div class='add'>+</div><div class='add'>+	sar_len_aligned = roundup(BIOS_SAR_TABLE_LEN, sizeof(u32));</div><div class='add'>+	rsvd_len_aligned = roundup(BIOS_SAR_RSVD1_LEN, sizeof(u32));</div><div class='add'>+	len = sizeof(*cmd) +</div><div class='add'>+	      TLV_HDR_SIZE + sar_len_aligned +</div><div class='add'>+	      TLV_HDR_SIZE + rsvd_len_aligned;</div><div class='add'>+</div><div class='add'>+	skb = ath11k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_pdev_set_sar_table_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PDEV_SET_BIOS_SAR_TABLE_CMD) |</div><div class='add'>+			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='add'>+	cmd-&gt;pdev_id = ar-&gt;pdev-&gt;pdev_id;</div><div class='add'>+	cmd-&gt;sar_len = BIOS_SAR_TABLE_LEN;</div><div class='add'>+	cmd-&gt;rsvd_len = BIOS_SAR_RSVD1_LEN;</div><div class='add'>+</div><div class='add'>+	buf_ptr = skb-&gt;data + sizeof(*cmd);</div><div class='add'>+	tlv = (struct wmi_tlv *)buf_ptr;</div><div class='add'>+	tlv-&gt;header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) |</div><div class='add'>+		      FIELD_PREP(WMI_TLV_LEN, sar_len_aligned);</div><div class='add'>+	buf_ptr += TLV_HDR_SIZE;</div><div class='add'>+	memcpy(buf_ptr, sar_val, BIOS_SAR_TABLE_LEN);</div><div class='add'>+</div><div class='add'>+	buf_ptr += sar_len_aligned;</div><div class='add'>+	tlv = (struct wmi_tlv *)buf_ptr;</div><div class='add'>+	tlv-&gt;header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) |</div><div class='add'>+		      FIELD_PREP(WMI_TLV_LEN, rsvd_len_aligned);</div><div class='add'>+</div><div class='add'>+	return ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_SET_BIOS_SAR_TABLE_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_wmi_pdev_set_bios_geo_table_param(struct ath11k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_pdev_wmi *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_pdev_set_geo_table_cmd *cmd;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u8 *buf_ptr;</div><div class='add'>+	u32 len, rsvd_len_aligned;</div><div class='add'>+</div><div class='add'>+	rsvd_len_aligned = roundup(BIOS_SAR_RSVD2_LEN, sizeof(u32));</div><div class='add'>+	len = sizeof(*cmd) + TLV_HDR_SIZE + rsvd_len_aligned;</div><div class='add'>+</div><div class='add'>+	skb = ath11k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_pdev_set_geo_table_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PDEV_SET_BIOS_GEO_TABLE_CMD) |</div><div class='add'>+			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='add'>+	cmd-&gt;pdev_id = ar-&gt;pdev-&gt;pdev_id;</div><div class='add'>+	cmd-&gt;rsvd_len = BIOS_SAR_RSVD2_LEN;</div><div class='add'>+</div><div class='add'>+	buf_ptr = skb-&gt;data + sizeof(*cmd);</div><div class='add'>+	tlv = (struct wmi_tlv *)buf_ptr;</div><div class='add'>+	tlv-&gt;header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) |</div><div class='add'>+		      FIELD_PREP(WMI_TLV_LEN, rsvd_len_aligned);</div><div class='add'>+</div><div class='add'>+	return ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_SET_BIOS_GEO_TABLE_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_wmi_sta_keepalive(struct ath11k *ar,</div><div class='add'>+			     const struct wmi_sta_keepalive_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_pdev_wmi *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_sta_keepalive_cmd *cmd;</div><div class='add'>+	struct wmi_sta_keepalive_arp_resp *arp;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd) + sizeof(*arp);</div><div class='add'>+	skb = ath11k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_sta_keepalive_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG,</div><div class='add'>+				     WMI_TAG_STA_KEEPALIVE_CMD) |</div><div class='add'>+				     FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);</div><div class='add'>+	cmd-&gt;vdev_id = arg-&gt;vdev_id;</div><div class='add'>+	cmd-&gt;enabled = arg-&gt;enabled;</div><div class='add'>+	cmd-&gt;interval = arg-&gt;interval;</div><div class='add'>+	cmd-&gt;method = arg-&gt;method;</div><div class='add'>+</div><div class='add'>+	arp = (struct wmi_sta_keepalive_arp_resp *)(cmd + 1);</div><div class='add'>+	arp-&gt;tlv_header = FIELD_PREP(WMI_TLV_TAG,</div><div class='add'>+				     WMI_TAG_STA_KEEPALIVE_ARP_RESPONSE) |</div><div class='add'>+			 FIELD_PREP(WMI_TLV_LEN, sizeof(*arp) - TLV_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;method == WMI_STA_KEEPALIVE_METHOD_UNSOLICITED_ARP_RESPONSE ||</div><div class='add'>+	    arg-&gt;method == WMI_STA_KEEPALIVE_METHOD_GRATUITOUS_ARP_REQUEST) {</div><div class='add'>+		arp-&gt;src_ip4_addr = arg-&gt;src_ip4_addr;</div><div class='add'>+		arp-&gt;dest_ip4_addr = arg-&gt;dest_ip4_addr;</div><div class='add'>+		ether_addr_copy(arp-&gt;dest_mac_addr.addr, arg-&gt;dest_mac_addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_dbg(ar-&gt;ab, ATH11K_DBG_WMI,</div><div class='add'>+		   "sta keepalive vdev %d enabled %d method %d interval %d\n",</div><div class='add'>+		   arg-&gt;vdev_id, arg-&gt;enabled, arg-&gt;method, arg-&gt;interval);</div><div class='add'>+</div><div class='add'>+	return ath11k_wmi_cmd_send(wmi, skb, WMI_STA_KEEPALIVE_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool ath11k_wmi_supports_6ghz_cc_ext(struct ath11k *ar)</div><div class='add'>+{</div><div class='add'>+	return test_bit(WMI_TLV_SERVICE_REG_CC_EXT_EVENT_SUPPORT,</div><div class='add'>+			ar-&gt;ab-&gt;wmi_ab.svc_map) &amp;&amp; ar-&gt;supports_6ghz;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h<br/>index 3ade1ddd35c9..0f0de24a3840 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/wmi.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/wmi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/wmi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/wmi.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef ATH11K_WMI_H</div><div class='hunk'>@@ -12,10 +13,13 @@</div><div class='ctx'> struct ath11k_base;</div><div class='ctx'> struct ath11k;</div><div class='ctx'> struct ath11k_fw_stats;</div><div class='add'>+struct ath11k_fw_dbglog;</div><div class='add'>+struct ath11k_vif;</div><div class='add'>+struct ath11k_reg_tpc_power_info;</div><div class='ctx'> </div><div class='ctx'> #define PSOC_HOST_MAX_NUM_SS (8)</div><div class='ctx'> </div><div class='del'>-/* defines to set Packet extension values whic can be 0 us, 8 usec or 16 usec */</div><div class='add'>+/* defines to set Packet extension values which can be 0 us, 8 usec or 16 usec */</div><div class='ctx'> #define MAX_HE_NSS               8</div><div class='ctx'> #define MAX_HE_MODULATION        8</div><div class='ctx'> #define MAX_HE_RU                4</div><div class='hunk'>@@ -56,16 +60,13 @@ struct wmi_tlv {</div><div class='ctx'> #define WLAN_SCAN_MAX_HINT_BSSID         10</div><div class='ctx'> #define MAX_RNR_BSS                    5</div><div class='ctx'> </div><div class='del'>-#define WLAN_SCAN_MAX_HINT_S_SSID        10</div><div class='del'>-#define WLAN_SCAN_MAX_HINT_BSSID         10</div><div class='del'>-#define MAX_RNR_BSS                    5</div><div class='del'>-</div><div class='ctx'> #define WLAN_SCAN_PARAMS_MAX_SSID    16</div><div class='ctx'> #define WLAN_SCAN_PARAMS_MAX_BSSID   4</div><div class='del'>-#define WLAN_SCAN_PARAMS_MAX_IE_LEN  256</div><div class='add'>+#define WLAN_SCAN_PARAMS_MAX_IE_LEN  512</div><div class='ctx'> </div><div class='ctx'> #define WMI_APPEND_TO_EXISTING_CHAN_LIST_FLAG 1</div><div class='ctx'> </div><div class='add'>+#define MAX_WMI_UTF_LEN 252</div><div class='ctx'> #define WMI_BA_MODE_BUFFER_SIZE_256  3</div><div class='ctx'> /*</div><div class='ctx'>  * HW mode config type replicated from FW header</div><div class='hunk'>@@ -113,10 +114,34 @@ enum wmi_host_hw_mode_priority {</div><div class='ctx'> 	WMI_HOST_HW_MODE_MAX_PRI</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum {</div><div class='add'>+enum WMI_HOST_WLAN_BAND {</div><div class='ctx'> 	WMI_HOST_WLAN_2G_CAP	= 0x1,</div><div class='ctx'> 	WMI_HOST_WLAN_5G_CAP	= 0x2,</div><div class='del'>-	WMI_HOST_WLAN_2G_5G_CAP	= 0x3,</div><div class='add'>+	WMI_HOST_WLAN_2G_5G_CAP	= WMI_HOST_WLAN_2G_CAP | WMI_HOST_WLAN_5G_CAP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Parameters used for WMI_VDEV_PARAM_AUTORATE_MISC_CFG command.</div><div class='add'>+ * Used only for HE auto rate mode.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	/* HE LTF related configuration */</div><div class='add'>+	WMI_HE_AUTORATE_LTF_1X = BIT(0),</div><div class='add'>+	WMI_HE_AUTORATE_LTF_2X = BIT(1),</div><div class='add'>+	WMI_HE_AUTORATE_LTF_4X = BIT(2),</div><div class='add'>+</div><div class='add'>+	/* HE GI related configuration */</div><div class='add'>+	WMI_AUTORATE_400NS_GI = BIT(8),</div><div class='add'>+	WMI_AUTORATE_800NS_GI = BIT(9),</div><div class='add'>+	WMI_AUTORATE_1600NS_GI = BIT(10),</div><div class='add'>+	WMI_AUTORATE_3200NS_GI = BIT(11),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	WMI_HOST_VDEV_FLAGS_NON_MBSSID_AP       = 0x00000001,</div><div class='add'>+	WMI_HOST_VDEV_FLAGS_TRANSMIT_AP         = 0x00000002,</div><div class='add'>+	WMI_HOST_VDEV_FLAGS_NON_TRANSMIT_AP     = 0x00000004,</div><div class='add'>+	WMI_HOST_VDEV_FLAGS_EMA_MODE            = 0x00000008,</div><div class='add'>+	WMI_HOST_VDEV_FLAGS_SCAN_MODE_VAP       = 0x00000010,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -267,6 +292,11 @@ enum wmi_tlv_cmd_id {</div><div class='ctx'> 	WMI_PDEV_SET_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID,</div><div class='ctx'> 	WMI_PDEV_SET_NON_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID,</div><div class='ctx'> 	WMI_PDEV_SET_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID,</div><div class='add'>+	WMI_PDEV_GET_TPC_STATS_CMDID,</div><div class='add'>+	WMI_PDEV_ENABLE_DURATION_BASED_TX_MODE_SELECTION_CMDID,</div><div class='add'>+	WMI_PDEV_GET_DPD_STATUS_CMDID,</div><div class='add'>+	WMI_PDEV_SET_BIOS_SAR_TABLE_CMDID,</div><div class='add'>+	WMI_PDEV_SET_BIOS_GEO_TABLE_CMDID,</div><div class='ctx'> 	WMI_VDEV_CREATE_CMDID = WMI_TLV_CMD(WMI_GRP_VDEV),</div><div class='ctx'> 	WMI_VDEV_DELETE_CMDID,</div><div class='ctx'> 	WMI_VDEV_START_REQUEST_CMDID,</div><div class='hunk'>@@ -294,6 +324,22 @@ enum wmi_tlv_cmd_id {</div><div class='ctx'> 	WMI_VDEV_SET_CUSTOM_AGGR_SIZE_CMDID,</div><div class='ctx'> 	WMI_VDEV_ENCRYPT_DECRYPT_DATA_REQ_CMDID,</div><div class='ctx'> 	WMI_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_CMDID,</div><div class='add'>+	WMI_VDEV_SET_ARP_STAT_CMDID,</div><div class='add'>+	WMI_VDEV_GET_ARP_STAT_CMDID,</div><div class='add'>+	WMI_VDEV_GET_TX_POWER_CMDID,</div><div class='add'>+	WMI_VDEV_LIMIT_OFFCHAN_CMDID,</div><div class='add'>+	WMI_VDEV_SET_CUSTOM_SW_RETRY_TH_CMDID,</div><div class='add'>+	WMI_VDEV_CHAINMASK_CONFIG_CMDID,</div><div class='add'>+	WMI_VDEV_GET_BCN_RECEPTION_STATS_CMDID,</div><div class='add'>+	WMI_VDEV_GET_MWS_COEX_INFO_CMDID,</div><div class='add'>+	WMI_VDEV_DELETE_ALL_PEER_CMDID,</div><div class='add'>+	WMI_VDEV_BSS_MAX_IDLE_TIME_CMDID,</div><div class='add'>+	WMI_VDEV_AUDIO_SYNC_TRIGGER_CMDID,</div><div class='add'>+	WMI_VDEV_AUDIO_SYNC_QTIMER_CMDID,</div><div class='add'>+	WMI_VDEV_SET_PCL_CMDID,</div><div class='add'>+	WMI_VDEV_GET_BIG_DATA_CMDID,</div><div class='add'>+	WMI_VDEV_GET_BIG_DATA_P2_CMDID,</div><div class='add'>+	WMI_VDEV_SET_TPC_POWER_CMDID,</div><div class='ctx'> 	WMI_PEER_CREATE_CMDID = WMI_TLV_CMD(WMI_GRP_PEER),</div><div class='ctx'> 	WMI_PEER_DELETE_CMDID,</div><div class='ctx'> 	WMI_PEER_FLUSH_TIDS_CMDID,</div><div class='hunk'>@@ -647,6 +693,9 @@ enum wmi_tlv_event_id {</div><div class='ctx'> 	WMI_PEER_RESERVED9_EVENTID,</div><div class='ctx'> 	WMI_PEER_RESERVED10_EVENTID,</div><div class='ctx'> 	WMI_PEER_OPER_MODE_CHANGE_EVENTID,</div><div class='add'>+	WMI_PEER_TX_PN_RESPONSE_EVENTID,</div><div class='add'>+	WMI_PEER_CFR_CAPTURE_EVENTID,</div><div class='add'>+	WMI_PEER_CREATE_CONF_EVENTID,</div><div class='ctx'> 	WMI_MGMT_RX_EVENTID = WMI_TLV_CMD(WMI_GRP_MGMT),</div><div class='ctx'> 	WMI_HOST_SWBA_EVENTID,</div><div class='ctx'> 	WMI_TBTTOFFSET_UPDATE_EVENTID,</div><div class='hunk'>@@ -755,6 +804,8 @@ enum wmi_tlv_event_id {</div><div class='ctx'> 	WMI_MDNS_STATS_EVENTID = WMI_TLV_CMD(WMI_GRP_MDNS_OFL),</div><div class='ctx'> 	WMI_SAP_OFL_ADD_STA_EVENTID = WMI_TLV_CMD(WMI_GRP_SAP_OFL),</div><div class='ctx'> 	WMI_SAP_OFL_DEL_STA_EVENTID,</div><div class='add'>+	WMI_OBSS_COLOR_COLLISION_DETECTION_EVENTID =</div><div class='add'>+		WMI_EVT_GRP_START_ID(WMI_GRP_OBSS_OFL),</div><div class='ctx'> 	WMI_OCB_SET_CONFIG_RESP_EVENTID = WMI_TLV_CMD(WMI_GRP_OCB),</div><div class='ctx'> 	WMI_OCB_GET_TSF_TIMER_RESP_EVENTID,</div><div class='ctx'> 	WMI_DCC_GET_STATS_RESP_EVENTID,</div><div class='hunk'>@@ -769,6 +820,7 @@ enum wmi_tlv_event_id {</div><div class='ctx'> 	WMI_RMC_NEW_LEADER_EVENTID = WMI_TLV_CMD(WMI_GRP_RMC),</div><div class='ctx'> 	WMI_REG_CHAN_LIST_CC_EVENTID = WMI_TLV_CMD(WMI_GRP_REGULATORY),</div><div class='ctx'> 	WMI_11D_NEW_COUNTRY_EVENTID,</div><div class='add'>+	WMI_REG_CHAN_LIST_CC_EXT_EVENTID,</div><div class='ctx'> 	WMI_NDI_CAP_RSP_EVENTID = WMI_TLV_CMD(WMI_GRP_PROTOTYPE),</div><div class='ctx'> 	WMI_NDP_INITIATOR_RSP_EVENTID,</div><div class='ctx'> 	WMI_NDP_RESPONDER_RSP_EVENTID,</div><div class='hunk'>@@ -1044,7 +1096,10 @@ enum wmi_tlv_vdev_param {</div><div class='ctx'> 	WMI_VDEV_PARAM_HE_RANGE_EXT,</div><div class='ctx'> 	WMI_VDEV_PARAM_ENABLE_BCAST_PROBE_RESPONSE,</div><div class='ctx'> 	WMI_VDEV_PARAM_FILS_MAX_CHANNEL_GUARD_TIME,</div><div class='add'>+	WMI_VDEV_PARAM_HE_LTF = 0x74,</div><div class='add'>+	WMI_VDEV_PARAM_ENABLE_DISABLE_RTT_RESPONDER_ROLE = 0x7d,</div><div class='ctx'> 	WMI_VDEV_PARAM_BA_MODE = 0x7e,</div><div class='add'>+	WMI_VDEV_PARAM_AUTORATE_MISC_CFG = 0x80,</div><div class='ctx'> 	WMI_VDEV_PARAM_SET_HE_SOUNDING_MODE = 0x87,</div><div class='ctx'> 	WMI_VDEV_PARAM_6GHZ_PARAMS = 0x99,</div><div class='ctx'> 	WMI_VDEV_PARAM_PROTOTYPE = 0x8000,</div><div class='hunk'>@@ -1054,25 +1109,27 @@ enum wmi_tlv_vdev_param {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum wmi_tlv_peer_flags {</div><div class='del'>-	WMI_TLV_PEER_AUTH = 0x00000001,</div><div class='del'>-	WMI_TLV_PEER_QOS = 0x00000002,</div><div class='del'>-	WMI_TLV_PEER_NEED_PTK_4_WAY = 0x00000004,</div><div class='del'>-	WMI_TLV_PEER_NEED_GTK_2_WAY = 0x00000010,</div><div class='del'>-	WMI_TLV_PEER_APSD = 0x00000800,</div><div class='del'>-	WMI_TLV_PEER_HT = 0x00001000,</div><div class='del'>-	WMI_TLV_PEER_40MHZ = 0x00002000,</div><div class='del'>-	WMI_TLV_PEER_STBC = 0x00008000,</div><div class='del'>-	WMI_TLV_PEER_LDPC = 0x00010000,</div><div class='del'>-	WMI_TLV_PEER_DYN_MIMOPS = 0x00020000,</div><div class='del'>-	WMI_TLV_PEER_STATIC_MIMOPS = 0x00040000,</div><div class='del'>-	WMI_TLV_PEER_SPATIAL_MUX = 0x00200000,</div><div class='del'>-	WMI_TLV_PEER_VHT = 0x02000000,</div><div class='del'>-	WMI_TLV_PEER_80MHZ = 0x04000000,</div><div class='del'>-	WMI_TLV_PEER_PMF = 0x08000000,</div><div class='add'>+	WMI_PEER_AUTH		= 0x00000001,</div><div class='add'>+	WMI_PEER_QOS		= 0x00000002,</div><div class='add'>+	WMI_PEER_NEED_PTK_4_WAY	= 0x00000004,</div><div class='add'>+	WMI_PEER_NEED_GTK_2_WAY	= 0x00000010,</div><div class='add'>+	WMI_PEER_HE		= 0x00000400,</div><div class='add'>+	WMI_PEER_APSD		= 0x00000800,</div><div class='add'>+	WMI_PEER_HT		= 0x00001000,</div><div class='add'>+	WMI_PEER_40MHZ		= 0x00002000,</div><div class='add'>+	WMI_PEER_STBC		= 0x00008000,</div><div class='add'>+	WMI_PEER_LDPC		= 0x00010000,</div><div class='add'>+	WMI_PEER_DYN_MIMOPS	= 0x00020000,</div><div class='add'>+	WMI_PEER_STATIC_MIMOPS	= 0x00040000,</div><div class='add'>+	WMI_PEER_SPATIAL_MUX	= 0x00200000,</div><div class='add'>+	WMI_PEER_TWT_REQ	= 0x00400000,</div><div class='add'>+	WMI_PEER_TWT_RESP	= 0x00800000,</div><div class='add'>+	WMI_PEER_VHT		= 0x02000000,</div><div class='add'>+	WMI_PEER_80MHZ		= 0x04000000,</div><div class='add'>+	WMI_PEER_PMF		= 0x08000000,</div><div class='ctx'> 	WMI_PEER_IS_P2P_CAPABLE = 0x20000000,</div><div class='ctx'> 	WMI_PEER_160MHZ         = 0x40000000,</div><div class='ctx'> 	WMI_PEER_SAFEMODE_EN    = 0x80000000,</div><div class='del'>-</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /** Enum list of TLV Tags for each parameter structure type. */</div><div class='hunk'>@@ -1184,7 +1241,7 @@ enum wmi_tlv_tag {</div><div class='ctx'> 	WMI_TAG_NS_OFFLOAD_TUPLE,</div><div class='ctx'> 	WMI_TAG_FTM_INTG_CMD,</div><div class='ctx'> 	WMI_TAG_STA_KEEPALIVE_CMD,</div><div class='del'>-	WMI_TAG_STA_KEEPALVE_ARP_RESPONSE,</div><div class='add'>+	WMI_TAG_STA_KEEPALIVE_ARP_RESPONSE,</div><div class='ctx'> 	WMI_TAG_P2P_SET_VENDOR_IE_DATA_CMD,</div><div class='ctx'> 	WMI_TAG_AP_PS_PEER_CMD,</div><div class='ctx'> 	WMI_TAG_PEER_RATE_RETRY_SCHED_CMD,</div><div class='hunk'>@@ -1834,6 +1891,12 @@ enum wmi_tlv_tag {</div><div class='ctx'> 	WMI_TAG_PDEV_SRG_OBSS_BSSID_ENABLE_BITMAP_CMD,</div><div class='ctx'> 	WMI_TAG_PDEV_NON_SRG_OBSS_COLOR_ENABLE_BITMAP_CMD,</div><div class='ctx'> 	WMI_TAG_PDEV_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMD,</div><div class='add'>+	WMI_TAG_REGULATORY_RULE_EXT_STRUCT = 0x3A9,</div><div class='add'>+	WMI_TAG_REG_CHAN_LIST_CC_EXT_EVENT,</div><div class='add'>+	WMI_TAG_VDEV_SET_TPC_POWER_CMD = 0x3B5,</div><div class='add'>+	WMI_TAG_VDEV_CH_POWER_INFO,</div><div class='add'>+	WMI_TAG_PDEV_SET_BIOS_SAR_TABLE_CMD = 0x3D8,</div><div class='add'>+	WMI_TAG_PDEV_SET_BIOS_GEO_TABLE_CMD,</div><div class='ctx'> 	WMI_TAG_MAX</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1967,6 +2030,7 @@ enum wmi_tlv_service {</div><div class='ctx'> 	WMI_TLV_SERVICE_ACK_TIMEOUT = 126,</div><div class='ctx'> 	WMI_TLV_SERVICE_PDEV_BSS_CHANNEL_INFO_64 = 127,</div><div class='ctx'> </div><div class='add'>+	/* The first 128 bits */</div><div class='ctx'> 	WMI_MAX_SERVICE = 128,</div><div class='ctx'> </div><div class='ctx'> 	WMI_TLV_SERVICE_CHAN_LOAD_INFO = 128,</div><div class='hunk'>@@ -2057,9 +2121,21 @@ enum wmi_tlv_service {</div><div class='ctx'> 	WMI_TLV_SERVICE_PER_PEER_HTT_STATS_RESET = 213,</div><div class='ctx'> 	WMI_TLV_SERVICE_FREQINFO_IN_METADATA = 219,</div><div class='ctx'> 	WMI_TLV_SERVICE_EXT2_MSG = 220,</div><div class='add'>+	WMI_TLV_SERVICE_PEER_POWER_SAVE_DURATION_SUPPORT = 246,</div><div class='ctx'> 	WMI_TLV_SERVICE_SRG_SRP_SPATIAL_REUSE_SUPPORT = 249,</div><div class='add'>+	WMI_TLV_SERVICE_MBSS_PARAM_IN_VDEV_START_SUPPORT = 253,</div><div class='add'>+	WMI_TLV_SERVICE_PASSIVE_SCAN_START_TIME_ENHANCE = 263,</div><div class='add'>+</div><div class='add'>+	/* The second 128 bits */</div><div class='add'>+	WMI_MAX_EXT_SERVICE = 256,</div><div class='add'>+	WMI_TLV_SERVICE_SCAN_CONFIG_PER_CHANNEL = 265,</div><div class='add'>+	WMI_TLV_SERVICE_EXT_TPC_REG_SUPPORT = 280,</div><div class='add'>+	WMI_TLV_SERVICE_REG_CC_EXT_EVENT_SUPPORT = 281,</div><div class='add'>+	WMI_TLV_SERVICE_BIOS_SAR_SUPPORT = 326,</div><div class='add'>+	WMI_TLV_SERVICE_SUPPORT_11D_FOR_HOST_SCAN = 357,</div><div class='ctx'> </div><div class='del'>-	WMI_MAX_EXT_SERVICE</div><div class='add'>+	/* The third 128 bits */</div><div class='add'>+	WMI_MAX_EXT2_SERVICE = 384</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -2128,6 +2204,31 @@ enum wmi_direct_buffer_module {</div><div class='ctx'> 	WMI_DIRECT_BUF_MAX</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* enum wmi_nss_ratio - NSS ratio received from FW during service ready ext</div><div class='add'>+ *			event</div><div class='add'>+ * WMI_NSS_RATIO_1BY2_NSS -Max nss of 160MHz is equals to half of the max nss</div><div class='add'>+ *			   of 80MHz</div><div class='add'>+ * WMI_NSS_RATIO_3BY4_NSS - Max nss of 160MHz is equals to 3/4 of the max nss</div><div class='add'>+ *			    of 80MHz</div><div class='add'>+ * WMI_NSS_RATIO_1_NSS - Max nss of 160MHz is equals to the max nss of 80MHz</div><div class='add'>+ * WMI_NSS_RATIO_2_NSS - Max nss of 160MHz is equals to two times the max</div><div class='add'>+ *			 nss of 80MHz</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum wmi_nss_ratio {</div><div class='add'>+	WMI_NSS_RATIO_1BY2_NSS = 0x0,</div><div class='add'>+	WMI_NSS_RATIO_3BY4_NSS = 0x1,</div><div class='add'>+	WMI_NSS_RATIO_1_NSS = 0x2,</div><div class='add'>+	WMI_NSS_RATIO_2_NSS = 0x3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_dtim_policy {</div><div class='add'>+	WMI_DTIM_POLICY_IGNORE = 1,</div><div class='add'>+	WMI_DTIM_POLICY_NORMAL = 2,</div><div class='add'>+	WMI_DTIM_POLICY_STICK  = 3,</div><div class='add'>+	WMI_DTIM_POLICY_AUTO   = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct wmi_host_pdev_band_to_mac {</div><div class='ctx'> 	u32 pdev_id;</div><div class='ctx'> 	u32 start_freq;</div><div class='hunk'>@@ -2244,6 +2345,12 @@ struct wmi_init_cmd {</div><div class='ctx'> 	u32 num_host_mem_chunks;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+#define WMI_RSRC_CFG_FLAG1_BSS_CHANNEL_INFO_64 BIT(5)</div><div class='add'>+#define WMI_RSRC_CFG_FLAG2_CALC_NEXT_DTIM_COUNT_SET BIT(9)</div><div class='add'>+#define WMI_RSRC_CFG_FLAG1_ACK_RSSI BIT(18)</div><div class='add'>+</div><div class='add'>+#define WMI_CFG_HOST_SERVICE_FLAG_REG_CC_EXT 4</div><div class='add'>+</div><div class='ctx'> struct wmi_resource_config {</div><div class='ctx'> 	u32 tlv_header;</div><div class='ctx'> 	u32 num_vdevs;</div><div class='hunk'>@@ -2303,6 +2410,18 @@ struct wmi_resource_config {</div><div class='ctx'> 	u32 sched_params;</div><div class='ctx'> 	u32 twt_ap_pdev_count;</div><div class='ctx'> 	u32 twt_ap_sta_count;</div><div class='add'>+	u32 max_nlo_ssids;</div><div class='add'>+	u32 num_pkt_filters;</div><div class='add'>+	u32 num_max_sta_vdevs;</div><div class='add'>+	u32 max_bssid_indicator;</div><div class='add'>+	u32 ul_resp_config;</div><div class='add'>+	u32 msdu_flow_override_config0;</div><div class='add'>+	u32 msdu_flow_override_config1;</div><div class='add'>+	u32 flags2;</div><div class='add'>+	u32 host_service_flags;</div><div class='add'>+	u32 max_rnr_neighbours;</div><div class='add'>+	u32 ema_max_vap_cnt;</div><div class='add'>+	u32 ema_max_profile_period;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_service_ready_event {</div><div class='hunk'>@@ -2370,6 +2489,12 @@ struct wmi_hw_mode_capabilities {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define WMI_MAX_HECAP_PHY_SIZE                 (3)</div><div class='add'>+#define WMI_NSS_RATIO_ENABLE_DISABLE_BITPOS    BIT(0)</div><div class='add'>+#define WMI_NSS_RATIO_ENABLE_DISABLE_GET(_val) \</div><div class='add'>+	FIELD_GET(WMI_NSS_RATIO_ENABLE_DISABLE_BITPOS, _val)</div><div class='add'>+#define WMI_NSS_RATIO_INFO_BITPOS              GENMASK(4, 1)</div><div class='add'>+#define WMI_NSS_RATIO_INFO_GET(_val) \</div><div class='add'>+	FIELD_GET(WMI_NSS_RATIO_INFO_BITPOS, _val)</div><div class='ctx'> </div><div class='ctx'> struct wmi_mac_phy_capabilities {</div><div class='ctx'> 	u32 hw_mode_id;</div><div class='hunk'>@@ -2403,6 +2528,12 @@ struct wmi_mac_phy_capabilities {</div><div class='ctx'> 	u32 he_cap_info_2g_ext;</div><div class='ctx'> 	u32 he_cap_info_5g_ext;</div><div class='ctx'> 	u32 he_cap_info_internal;</div><div class='add'>+	u32 wireless_modes;</div><div class='add'>+	u32 low_2ghz_chan_freq;</div><div class='add'>+	u32 high_2ghz_chan_freq;</div><div class='add'>+	u32 low_5ghz_chan_freq;</div><div class='add'>+	u32 high_5ghz_chan_freq;</div><div class='add'>+	u32 nss_ratio;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_hal_reg_capabilities_ext {</div><div class='hunk'>@@ -2467,8 +2598,8 @@ struct wmi_service_available_event {</div><div class='ctx'> struct ath11k_pdev_wmi {</div><div class='ctx'> 	struct ath11k_wmi_base *wmi_ab;</div><div class='ctx'> 	enum ath11k_htc_ep_id eid;</div><div class='del'>-	const struct wmi_peer_flags_map *peer_flags;</div><div class='ctx'> 	u32 rx_decap_mode;</div><div class='add'>+	wait_queue_head_t tx_ce_desc_wq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct vdev_create_params {</div><div class='hunk'>@@ -2480,6 +2611,8 @@ struct vdev_create_params {</div><div class='ctx'> 		u8 rx;</div><div class='ctx'> 	} chains[NUM_NL80211_BANDS];</div><div class='ctx'> 	u32 pdev_id;</div><div class='add'>+	u32 mbssid_flags;</div><div class='add'>+	u32 mbssid_tx_vdev_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct wmi_vdev_create_cmd {</div><div class='hunk'>@@ -2490,6 +2623,8 @@ struct wmi_vdev_create_cmd {</div><div class='ctx'> 	struct wmi_mac_addr vdev_macaddr;</div><div class='ctx'> 	u32 num_cfg_txrx_streams;</div><div class='ctx'> 	u32 pdev_id;</div><div class='add'>+	u32 mbssid_flags;</div><div class='add'>+	u32 mbssid_tx_vdev_id;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_vdev_txrx_streams {</div><div class='hunk'>@@ -2509,9 +2644,9 @@ struct wmi_vdev_up_cmd {</div><div class='ctx'> 	u32 vdev_id;</div><div class='ctx'> 	u32 vdev_assoc_id;</div><div class='ctx'> 	struct wmi_mac_addr vdev_bssid;</div><div class='del'>-	struct wmi_mac_addr trans_bssid;</div><div class='del'>-	u32 profile_idx;</div><div class='del'>-	u32 profile_num;</div><div class='add'>+	struct wmi_mac_addr tx_vdev_bssid;</div><div class='add'>+	u32 nontx_profile_idx;</div><div class='add'>+	u32 nontx_profile_cnt;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_vdev_stop_cmd {</div><div class='hunk'>@@ -2527,6 +2662,7 @@ struct wmi_vdev_down_cmd {</div><div class='ctx'> #define WMI_VDEV_START_HIDDEN_SSID  BIT(0)</div><div class='ctx'> #define WMI_VDEV_START_PMF_ENABLED  BIT(1)</div><div class='ctx'> #define WMI_VDEV_START_LDPC_RX_ENABLED BIT(3)</div><div class='add'>+#define WMI_VDEV_START_HW_ENCRYPTION_DISABLED BIT(4)</div><div class='ctx'> </div><div class='ctx'> struct wmi_ssid {</div><div class='ctx'> 	u32 ssid_len;</div><div class='hunk'>@@ -2552,6 +2688,9 @@ struct wmi_vdev_start_request_cmd {</div><div class='ctx'> 	u32 he_ops;</div><div class='ctx'> 	u32 cac_duration_ms;</div><div class='ctx'> 	u32 regdomain;</div><div class='add'>+	u32 min_data_rate;</div><div class='add'>+	u32 mbssid_flags;</div><div class='add'>+	u32 mbssid_tx_vdev_id;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define MGMT_TX_DL_FRM_LEN		     64</div><div class='hunk'>@@ -2721,6 +2860,9 @@ struct wmi_vdev_start_req_arg {</div><div class='ctx'> 	u32 pref_rx_streams;</div><div class='ctx'> 	u32 pref_tx_streams;</div><div class='ctx'> 	u32 num_noa_descriptors;</div><div class='add'>+	u32 min_data_rate;</div><div class='add'>+	u32 mbssid_flags;</div><div class='add'>+	u32 mbssid_tx_vdev_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct peer_create_params {</div><div class='hunk'>@@ -2771,36 +2913,40 @@ struct rx_reorder_queue_remove_params {</div><div class='ctx'> #define REG_RULE_MAX_BW				0x0000ffff</div><div class='ctx'> #define REG_RULE_REG_PWR			0x00ff0000</div><div class='ctx'> #define REG_RULE_ANT_GAIN			0xff000000</div><div class='add'>+#define REG_RULE_PSD_INFO			BIT(0)</div><div class='add'>+#define REG_RULE_PSD_EIRP			0xff0000</div><div class='ctx'> </div><div class='ctx'> #define WMI_VDEV_PARAM_TXBF_SU_TX_BFEE BIT(0)</div><div class='ctx'> #define WMI_VDEV_PARAM_TXBF_MU_TX_BFEE BIT(1)</div><div class='ctx'> #define WMI_VDEV_PARAM_TXBF_SU_TX_BFER BIT(2)</div><div class='ctx'> #define WMI_VDEV_PARAM_TXBF_MU_TX_BFER BIT(3)</div><div class='ctx'> </div><div class='del'>-#define HECAP_PHYDWORD_0	0</div><div class='del'>-#define HECAP_PHYDWORD_1	1</div><div class='del'>-#define HECAP_PHYDWORD_2	2</div><div class='add'>+#define HE_PHYCAP_BYTE_0	0</div><div class='add'>+#define HE_PHYCAP_BYTE_1	1</div><div class='add'>+#define HE_PHYCAP_BYTE_2	2</div><div class='add'>+#define HE_PHYCAP_BYTE_3	3</div><div class='add'>+#define HE_PHYCAP_BYTE_4	4</div><div class='ctx'> </div><div class='del'>-#define HECAP_PHY_SU_BFER		BIT(31)</div><div class='add'>+#define HECAP_PHY_SU_BFER		BIT(7)</div><div class='ctx'> #define HECAP_PHY_SU_BFEE		BIT(0)</div><div class='ctx'> #define HECAP_PHY_MU_BFER		BIT(1)</div><div class='del'>-#define HECAP_PHY_UL_MUMIMO		BIT(22)</div><div class='del'>-#define HECAP_PHY_UL_MUOFDMA		BIT(23)</div><div class='add'>+#define HECAP_PHY_UL_MUMIMO		BIT(6)</div><div class='add'>+#define HECAP_PHY_UL_MUOFDMA		BIT(7)</div><div class='ctx'> </div><div class='ctx'> #define HECAP_PHY_SUBFMR_GET(hecap_phy) \</div><div class='del'>-	FIELD_GET(HECAP_PHY_SU_BFER, hecap_phy[HECAP_PHYDWORD_0])</div><div class='add'>+	FIELD_GET(HECAP_PHY_SU_BFER, hecap_phy[HE_PHYCAP_BYTE_3])</div><div class='ctx'> </div><div class='ctx'> #define HECAP_PHY_SUBFME_GET(hecap_phy) \</div><div class='del'>-	FIELD_GET(HECAP_PHY_SU_BFEE, hecap_phy[HECAP_PHYDWORD_1])</div><div class='add'>+	FIELD_GET(HECAP_PHY_SU_BFEE, hecap_phy[HE_PHYCAP_BYTE_4])</div><div class='ctx'> </div><div class='ctx'> #define HECAP_PHY_MUBFMR_GET(hecap_phy) \</div><div class='del'>-	FIELD_GET(HECAP_PHY_MU_BFER, hecap_phy[HECAP_PHYDWORD_1])</div><div class='add'>+	FIELD_GET(HECAP_PHY_MU_BFER, hecap_phy[HE_PHYCAP_BYTE_4])</div><div class='ctx'> </div><div class='ctx'> #define HECAP_PHY_ULMUMIMO_GET(hecap_phy) \</div><div class='del'>-	FIELD_GET(HECAP_PHY_UL_MUMIMO, hecap_phy[HECAP_PHYDWORD_0])</div><div class='add'>+	FIELD_GET(HECAP_PHY_UL_MUMIMO, hecap_phy[HE_PHYCAP_BYTE_2])</div><div class='ctx'> </div><div class='ctx'> #define HECAP_PHY_ULOFDMA_GET(hecap_phy) \</div><div class='del'>-	FIELD_GET(HECAP_PHY_UL_MUOFDMA, hecap_phy[HECAP_PHYDWORD_0])</div><div class='add'>+	FIELD_GET(HECAP_PHY_UL_MUOFDMA, hecap_phy[HE_PHYCAP_BYTE_2])</div><div class='ctx'> </div><div class='ctx'> #define HE_MODE_SU_TX_BFEE	BIT(0)</div><div class='ctx'> #define HE_MODE_SU_TX_BFER	BIT(1)</div><div class='hunk'>@@ -2813,8 +2959,11 @@ struct rx_reorder_queue_remove_params {</div><div class='ctx'> #define HE_DL_MUOFDMA_ENABLE	1</div><div class='ctx'> #define HE_UL_MUOFDMA_ENABLE	1</div><div class='ctx'> #define HE_DL_MUMIMO_ENABLE	1</div><div class='add'>+#define HE_UL_MUMIMO_ENABLE	1</div><div class='ctx'> #define HE_MU_BFEE_ENABLE	1</div><div class='ctx'> #define HE_SU_BFEE_ENABLE	1</div><div class='add'>+#define HE_MU_BFER_ENABLE	1</div><div class='add'>+#define HE_SU_BFER_ENABLE	1</div><div class='ctx'> </div><div class='ctx'> #define HE_VHT_SOUNDING_MODE_ENABLE		1</div><div class='ctx'> #define HE_SU_MU_SOUNDING_MODE_ENABLE		1</div><div class='hunk'>@@ -2960,6 +3109,7 @@ struct wmi_pdev_bss_chan_info_req_cmd {</div><div class='ctx'> 	u32 tlv_header;</div><div class='ctx'> 	/* ref wmi_bss_chan_info_req_type */</div><div class='ctx'> 	u32 req_type;</div><div class='add'>+	u32 pdev_id;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_ap_ps_peer_cmd {</div><div class='hunk'>@@ -3022,10 +3172,6 @@ enum scan_dwelltime_adaptive_mode {</div><div class='ctx'> 	SCAN_DWELL_MODE_STATIC = 4</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define WLAN_SCAN_MAX_NUM_SSID          10</div><div class='del'>-#define WLAN_SCAN_MAX_NUM_BSSID         10</div><div class='del'>-#define WLAN_SCAN_MAX_NUM_CHANNELS      40</div><div class='del'>-</div><div class='ctx'> #define WLAN_SSID_MAX_LEN 32</div><div class='ctx'> </div><div class='ctx'> struct element_info {</div><div class='hunk'>@@ -3038,9 +3184,43 @@ struct wlan_ssid {</div><div class='ctx'> 	u8 ssid[WLAN_SSID_MAX_LEN];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct wmi_vdev_ch_power_info {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+</div><div class='add'>+	/* Channel center frequency (MHz) */</div><div class='add'>+	u32 chan_cfreq;</div><div class='add'>+</div><div class='add'>+	/* Unit: dBm, either PSD/EIRP power for this frequency or</div><div class='add'>+	 * incremental for non-PSD BW</div><div class='add'>+	 */</div><div class='add'>+	u32 tx_power;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_vdev_set_tpc_power_cmd {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+</div><div class='add'>+	/* Value: 0 or 1, is PSD power or not */</div><div class='add'>+	u32 psd_power;</div><div class='add'>+</div><div class='add'>+	 /* Maximum EIRP power (dBm units), valid only if power is PSD */</div><div class='add'>+	u32 eirp_power;</div><div class='add'>+</div><div class='add'>+	/* Type: WMI_6GHZ_REG_TYPE, used for halphy CTL lookup */</div><div class='add'>+	u32 power_type_6ghz;</div><div class='add'>+</div><div class='add'>+	/* This fixed_param TLV is followed by the below TLVs:</div><div class='add'>+	 * num_pwr_levels of wmi_vdev_ch_power_info</div><div class='add'>+	 * For PSD power, it is the PSD/EIRP power of the frequency (20 MHz chunks).</div><div class='add'>+	 * For non-PSD power, the power values are for 20, 40, and till</div><div class='add'>+	 * BSS BW power levels.</div><div class='add'>+	 * The num_pwr_levels will be checked by sw how many elements present</div><div class='add'>+	 * in the variable-length array.</div><div class='add'>+	 */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> #define WMI_IE_BITMAP_SIZE             8</div><div class='ctx'> </div><div class='del'>-#define WMI_SCAN_MAX_NUM_SSID                0x0A</div><div class='ctx'> /* prefix used by scan requestor ids on the host */</div><div class='ctx'> #define WMI_HOST_SCAN_REQUESTOR_ID_PREFIX 0xA000</div><div class='ctx'> </div><div class='hunk'>@@ -3048,10 +3228,6 @@ struct wlan_ssid {</div><div class='ctx'> /* host cycles through the lower 12 bits to generate ids */</div><div class='ctx'> #define WMI_HOST_SCAN_REQ_ID_PREFIX 0xA000</div><div class='ctx'> </div><div class='del'>-#define WLAN_SCAN_PARAMS_MAX_SSID    16</div><div class='del'>-#define WLAN_SCAN_PARAMS_MAX_BSSID   4</div><div class='del'>-#define WLAN_SCAN_PARAMS_MAX_IE_LEN  256</div><div class='del'>-</div><div class='ctx'> /* Values lower than this may be refused by some firmware revisions with a scan</div><div class='ctx'>  * completion with a timedout reason.</div><div class='ctx'>  */</div><div class='hunk'>@@ -3150,6 +3326,10 @@ struct  wmi_start_scan_cmd {</div><div class='ctx'> </div><div class='ctx'> #define WMI_SCAN_DWELL_MODE_MASK 0x00E00000</div><div class='ctx'> #define WMI_SCAN_DWELL_MODE_SHIFT        21</div><div class='add'>+#define WMI_SCAN_FLAG_EXT_PASSIVE_SCAN_START_TIME_ENHANCE   0x00000800</div><div class='add'>+</div><div class='add'>+#define WMI_SCAN_CONFIG_PER_CHANNEL_MASK	GENMASK(19, 0)</div><div class='add'>+#define WMI_SCAN_CH_FLAG_SCAN_ONLY_IF_RNR_FOUND	BIT(20)</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	WMI_SCAN_DWELL_MODE_DEFAULT      = 0,</div><div class='hunk'>@@ -3179,24 +3359,20 @@ struct scan_req_params {</div><div class='ctx'> 	u32 vdev_id;</div><div class='ctx'> 	u32 pdev_id;</div><div class='ctx'> 	enum wmi_scan_priority scan_priority;</div><div class='del'>-	union {</div><div class='del'>-		struct {</div><div class='del'>-			u32 scan_ev_started:1,</div><div class='del'>-			    scan_ev_completed:1,</div><div class='del'>-			    scan_ev_bss_chan:1,</div><div class='del'>-			    scan_ev_foreign_chan:1,</div><div class='del'>-			    scan_ev_dequeued:1,</div><div class='del'>-			    scan_ev_preempted:1,</div><div class='del'>-			    scan_ev_start_failed:1,</div><div class='del'>-			    scan_ev_restarted:1,</div><div class='del'>-			    scan_ev_foreign_chn_exit:1,</div><div class='del'>-			    scan_ev_invalid:1,</div><div class='del'>-			    scan_ev_gpio_timeout:1,</div><div class='del'>-			    scan_ev_suspended:1,</div><div class='del'>-			    scan_ev_resumed:1;</div><div class='del'>-		};</div><div class='del'>-		u32 scan_events;</div><div class='del'>-	};</div><div class='add'>+	u32 scan_ev_started:1,</div><div class='add'>+	    scan_ev_completed:1,</div><div class='add'>+	    scan_ev_bss_chan:1,</div><div class='add'>+	    scan_ev_foreign_chan:1,</div><div class='add'>+	    scan_ev_dequeued:1,</div><div class='add'>+	    scan_ev_preempted:1,</div><div class='add'>+	    scan_ev_start_failed:1,</div><div class='add'>+	    scan_ev_restarted:1,</div><div class='add'>+	    scan_ev_foreign_chn_exit:1,</div><div class='add'>+	    scan_ev_invalid:1,</div><div class='add'>+	    scan_ev_gpio_timeout:1,</div><div class='add'>+	    scan_ev_suspended:1,</div><div class='add'>+	    scan_ev_resumed:1;</div><div class='add'>+	u32 scan_ctrl_flags_ext;</div><div class='ctx'> 	u32 dwell_time_active;</div><div class='ctx'> 	u32 dwell_time_active_2g;</div><div class='ctx'> 	u32 dwell_time_passive;</div><div class='hunk'>@@ -3209,46 +3385,41 @@ struct scan_req_params {</div><div class='ctx'> 	u32 idle_time;</div><div class='ctx'> 	u32 max_scan_time;</div><div class='ctx'> 	u32 probe_delay;</div><div class='del'>-	union {</div><div class='del'>-		struct {</div><div class='del'>-			u32 scan_f_passive:1,</div><div class='del'>-			    scan_f_bcast_probe:1,</div><div class='del'>-			    scan_f_cck_rates:1,</div><div class='del'>-			    scan_f_ofdm_rates:1,</div><div class='del'>-			    scan_f_chan_stat_evnt:1,</div><div class='del'>-			    scan_f_filter_prb_req:1,</div><div class='del'>-			    scan_f_bypass_dfs_chn:1,</div><div class='del'>-			    scan_f_continue_on_err:1,</div><div class='del'>-			    scan_f_offchan_mgmt_tx:1,</div><div class='del'>-			    scan_f_offchan_data_tx:1,</div><div class='del'>-			    scan_f_promisc_mode:1,</div><div class='del'>-			    scan_f_capture_phy_err:1,</div><div class='del'>-			    scan_f_strict_passive_pch:1,</div><div class='del'>-			    scan_f_half_rate:1,</div><div class='del'>-			    scan_f_quarter_rate:1,</div><div class='del'>-			    scan_f_force_active_dfs_chn:1,</div><div class='del'>-			    scan_f_add_tpc_ie_in_probe:1,</div><div class='del'>-			    scan_f_add_ds_ie_in_probe:1,</div><div class='del'>-			    scan_f_add_spoofed_mac_in_probe:1,</div><div class='del'>-			    scan_f_add_rand_seq_in_probe:1,</div><div class='del'>-			    scan_f_en_ie_whitelist_in_probe:1,</div><div class='del'>-			    scan_f_forced:1,</div><div class='del'>-			    scan_f_2ghz:1,</div><div class='del'>-			    scan_f_5ghz:1,</div><div class='del'>-			    scan_f_80mhz:1;</div><div class='del'>-		};</div><div class='del'>-		u32 scan_flags;</div><div class='del'>-	};</div><div class='add'>+	u32 scan_f_passive:1,</div><div class='add'>+	    scan_f_bcast_probe:1,</div><div class='add'>+	    scan_f_cck_rates:1,</div><div class='add'>+	    scan_f_ofdm_rates:1,</div><div class='add'>+	    scan_f_chan_stat_evnt:1,</div><div class='add'>+	    scan_f_filter_prb_req:1,</div><div class='add'>+	    scan_f_bypass_dfs_chn:1,</div><div class='add'>+	    scan_f_continue_on_err:1,</div><div class='add'>+	    scan_f_offchan_mgmt_tx:1,</div><div class='add'>+	    scan_f_offchan_data_tx:1,</div><div class='add'>+	    scan_f_promisc_mode:1,</div><div class='add'>+	    scan_f_capture_phy_err:1,</div><div class='add'>+	    scan_f_strict_passive_pch:1,</div><div class='add'>+	    scan_f_half_rate:1,</div><div class='add'>+	    scan_f_quarter_rate:1,</div><div class='add'>+	    scan_f_force_active_dfs_chn:1,</div><div class='add'>+	    scan_f_add_tpc_ie_in_probe:1,</div><div class='add'>+	    scan_f_add_ds_ie_in_probe:1,</div><div class='add'>+	    scan_f_add_spoofed_mac_in_probe:1,</div><div class='add'>+	    scan_f_add_rand_seq_in_probe:1,</div><div class='add'>+	    scan_f_en_ie_whitelist_in_probe:1,</div><div class='add'>+	    scan_f_forced:1,</div><div class='add'>+	    scan_f_2ghz:1,</div><div class='add'>+	    scan_f_5ghz:1,</div><div class='add'>+	    scan_f_80mhz:1;</div><div class='ctx'> 	enum scan_dwelltime_adaptive_mode adaptive_dwell_time_mode;</div><div class='ctx'> 	u32 burst_duration;</div><div class='ctx'> 	u32 num_chan;</div><div class='ctx'> 	u32 num_bssid;</div><div class='ctx'> 	u32 num_ssids;</div><div class='ctx'> 	u32 n_probes;</div><div class='del'>-	u32 chan_list[WLAN_SCAN_MAX_NUM_CHANNELS];</div><div class='add'>+	u32 *chan_list;</div><div class='ctx'> 	u32 notify_scan_events;</div><div class='del'>-	struct wlan_ssid ssid[WLAN_SCAN_MAX_NUM_SSID];</div><div class='del'>-	struct wmi_mac_addr bssid_list[WLAN_SCAN_MAX_NUM_BSSID];</div><div class='add'>+	struct wlan_ssid ssid[WLAN_SCAN_PARAMS_MAX_SSID];</div><div class='add'>+	struct wmi_mac_addr bssid_list[WLAN_SCAN_PARAMS_MAX_BSSID];</div><div class='ctx'> 	struct element_info extraie;</div><div class='ctx'> 	struct element_info htcap;</div><div class='ctx'> 	struct element_info vhtcap;</div><div class='hunk'>@@ -3256,6 +3427,8 @@ struct scan_req_params {</div><div class='ctx'> 	u32 num_hint_bssid;</div><div class='ctx'> 	struct hint_short_ssid hint_s_ssid[WLAN_SCAN_MAX_HINT_S_SSID];</div><div class='ctx'> 	struct hint_bssid hint_bssid[WLAN_SCAN_MAX_HINT_BSSID];</div><div class='add'>+	struct wmi_mac_addr mac_addr;</div><div class='add'>+	struct wmi_mac_addr mac_mask;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct wmi_ssid_arg {</div><div class='hunk'>@@ -3267,34 +3440,6 @@ struct wmi_bssid_arg {</div><div class='ctx'> 	const u8 *bssid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct wmi_start_scan_arg {</div><div class='del'>-	u32 scan_id;</div><div class='del'>-	u32 scan_req_id;</div><div class='del'>-	u32 vdev_id;</div><div class='del'>-	u32 scan_priority;</div><div class='del'>-	u32 notify_scan_events;</div><div class='del'>-	u32 dwell_time_active;</div><div class='del'>-	u32 dwell_time_passive;</div><div class='del'>-	u32 min_rest_time;</div><div class='del'>-	u32 max_rest_time;</div><div class='del'>-	u32 repeat_probe_time;</div><div class='del'>-	u32 probe_spacing_time;</div><div class='del'>-	u32 idle_time;</div><div class='del'>-	u32 max_scan_time;</div><div class='del'>-	u32 probe_delay;</div><div class='del'>-	u32 scan_ctrl_flags;</div><div class='del'>-</div><div class='del'>-	u32 ie_len;</div><div class='del'>-	u32 n_channels;</div><div class='del'>-	u32 n_ssids;</div><div class='del'>-	u32 n_bssids;</div><div class='del'>-</div><div class='del'>-	u8 ie[WLAN_SCAN_PARAMS_MAX_IE_LEN];</div><div class='del'>-	u32 channels[64];</div><div class='del'>-	struct wmi_ssid_arg ssids[WLAN_SCAN_PARAMS_MAX_SSID];</div><div class='del'>-	struct wmi_bssid_arg bssids[WLAN_SCAN_PARAMS_MAX_BSSID];</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define WMI_SCAN_STOP_ONE       0x00000000</div><div class='ctx'> #define WMI_SCN_STOP_VAP_ALL    0x01000000</div><div class='ctx'> #define WMI_SCAN_STOP_ALL       0x04000000</div><div class='hunk'>@@ -3318,20 +3463,6 @@ struct scan_cancel_param {</div><div class='ctx'> 	u32 pdev_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct  wmi_bcn_send_from_host_cmd {</div><div class='del'>-	u32 tlv_header;</div><div class='del'>-	u32 vdev_id;</div><div class='del'>-	u32 data_len;</div><div class='del'>-	union {</div><div class='del'>-		u32 frag_ptr;</div><div class='del'>-		u32 frag_ptr_lo;</div><div class='del'>-	};</div><div class='del'>-	u32 frame_ctrl;</div><div class='del'>-	u32 dtim_flag;</div><div class='del'>-	u32 bcn_antenna;</div><div class='del'>-	u32 frag_ptr_hi;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define WMI_CHAN_INFO_MODE		GENMASK(5, 0)</div><div class='ctx'> #define WMI_CHAN_INFO_HT40_PLUS		BIT(6)</div><div class='ctx'> #define WMI_CHAN_INFO_PASSIVE		BIT(7)</div><div class='hunk'>@@ -3435,8 +3566,61 @@ struct wmi_get_pdev_temperature_cmd {</div><div class='ctx'> 	u32 pdev_id;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct wmi_ftm_seg_hdr {</div><div class='add'>+	u32 len;</div><div class='add'>+	u32 msgref;</div><div class='add'>+	u32 segmentinfo;</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_ftm_cmd {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	struct wmi_ftm_seg_hdr seg_hdr;</div><div class='add'>+	u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_ftm_event_msg {</div><div class='add'>+	struct wmi_ftm_seg_hdr seg_hdr;</div><div class='add'>+	u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_P2P_MAX_NOA_DESCRIPTORS		4</div><div class='add'>+</div><div class='add'>+struct wmi_p2p_noa_event {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath11k_wmi_p2p_noa_descriptor {</div><div class='add'>+	u32 type_count; /* 255: continuous schedule, 0: reserved */</div><div class='add'>+	u32 duration;  /* Absent period duration in micro seconds */</div><div class='add'>+	u32 interval;   /* Absent period interval in micro seconds */</div><div class='add'>+	u32 start_time; /* 32 bit tsf time when in starts */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_P2P_NOA_INFO_CHANGED_FLAG		BIT(0)</div><div class='add'>+#define WMI_P2P_NOA_INFO_INDEX			GENMASK(15, 8)</div><div class='add'>+#define WMI_P2P_NOA_INFO_OPP_PS			BIT(16)</div><div class='add'>+#define WMI_P2P_NOA_INFO_CTWIN_TU		GENMASK(23, 17)</div><div class='add'>+#define WMI_P2P_NOA_INFO_DESC_NUM		GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+struct ath11k_wmi_p2p_noa_info {</div><div class='add'>+	/* Bit 0 - Flag to indicate an update in NOA schedule</div><div class='add'>+	 * Bits 7-1 - Reserved</div><div class='add'>+	 * Bits 15-8 - Index (identifies the instance of NOA sub element)</div><div class='add'>+	 * Bit  16 - Opp PS state of the AP</div><div class='add'>+	 * Bits 23-17 -  Ctwindow in TUs</div><div class='add'>+	 * Bits 31-24 -  Number of NOA descriptors</div><div class='add'>+	 */</div><div class='add'>+	u32 noa_attr;</div><div class='add'>+	struct ath11k_wmi_p2p_noa_descriptor descriptors[WMI_P2P_MAX_NOA_DESCRIPTORS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> #define WMI_BEACON_TX_BUFFER_SIZE	512</div><div class='ctx'> </div><div class='add'>+#define WMI_EMA_TMPL_IDX_SHIFT            8</div><div class='add'>+#define WMI_EMA_FIRST_TMPL_SHIFT          16</div><div class='add'>+#define WMI_EMA_LAST_TMPL_SHIFT           24</div><div class='add'>+</div><div class='ctx'> struct wmi_bcn_tmpl_cmd {</div><div class='ctx'> 	u32 tlv_header;</div><div class='ctx'> 	u32 vdev_id;</div><div class='hunk'>@@ -3447,6 +3631,18 @@ struct wmi_bcn_tmpl_cmd {</div><div class='ctx'> 	u32 csa_event_bitmap;</div><div class='ctx'> 	u32 mbssid_ie_offset;</div><div class='ctx'> 	u32 esp_ie_offset;</div><div class='add'>+	u32 csc_switch_count_offset;</div><div class='add'>+	u32 csc_event_bitmap;</div><div class='add'>+	u32 mu_edca_ie_offset;</div><div class='add'>+	u32 feature_enable_bitmap;</div><div class='add'>+	u32 ema_params;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_p2p_go_set_beacon_ie_cmd {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 ie_buf_len;</div><div class='add'>+	u8 tlv[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_key_seq_counter {</div><div class='hunk'>@@ -3562,6 +3758,7 @@ struct peer_assoc_params {</div><div class='ctx'> 	u32 peer_he_tx_mcs_set[WMI_HOST_MAX_HE_RATE_SET];</div><div class='ctx'> 	bool twt_responder;</div><div class='ctx'> 	bool twt_requester;</div><div class='add'>+	bool is_assoc;</div><div class='ctx'> 	struct ath11k_ppe_threshold peer_ppet;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3606,9 +3803,10 @@ struct wmi_stop_scan_cmd {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct scan_chan_list_params {</div><div class='add'>+	struct list_head list;</div><div class='ctx'> 	u32 pdev_id;</div><div class='ctx'> 	u16 nallchans;</div><div class='del'>-	struct channel_param ch_param[1];</div><div class='add'>+	struct channel_param ch_param[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct wmi_scan_chan_list_cmd {</div><div class='hunk'>@@ -3618,6 +3816,11 @@ struct wmi_scan_chan_list_cmd {</div><div class='ctx'> 	u32 pdev_id;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct wmi_scan_prob_req_oui_cmd {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 prob_req_oui;</div><div class='add'>+}  __packed;</div><div class='add'>+</div><div class='ctx'> #define WMI_MGMT_SEND_DOWNLD_LEN	64</div><div class='ctx'> </div><div class='ctx'> #define WMI_TX_PARAMS_DWORD0_POWER		GENMASK(7, 0)</div><div class='hunk'>@@ -3711,6 +3914,16 @@ struct stats_request_params {</div><div class='ctx'> 	u32 pdev_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct wmi_set_current_country_params {</div><div class='add'>+	u8 alpha2[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_set_current_country_cmd {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+	u32 new_alpha2;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> enum set_init_cc_type {</div><div class='ctx'> 	WMI_COUNTRY_INFO_TYPE_ALPHA,</div><div class='ctx'> 	WMI_COUNTRY_INFO_TYPE_COUNTRY_CODE,</div><div class='hunk'>@@ -3744,6 +3957,28 @@ struct wmi_init_country_cmd {</div><div class='ctx'> 	} cc_info;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct wmi_11d_scan_start_params {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 scan_period_msec;</div><div class='add'>+	u32 start_interval_msec;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_11d_scan_start_cmd {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 scan_period_msec;</div><div class='add'>+	u32 start_interval_msec;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_11d_scan_stop_cmd {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_11d_new_cc_ev {</div><div class='add'>+	u32 new_alpha2;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> #define THERMAL_LEVELS  1</div><div class='ctx'> struct tt_level_config {</div><div class='ctx'> 	u32 tmplwm;</div><div class='hunk'>@@ -3866,31 +4101,6 @@ struct wmi_unit_test_cmd {</div><div class='ctx'> </div><div class='ctx'> #define MAX_SUPPORTED_RATES 128</div><div class='ctx'> </div><div class='del'>-#define WMI_PEER_AUTH		0x00000001</div><div class='del'>-#define WMI_PEER_QOS		0x00000002</div><div class='del'>-#define WMI_PEER_NEED_PTK_4_WAY	0x00000004</div><div class='del'>-#define WMI_PEER_NEED_GTK_2_WAY	0x00000010</div><div class='del'>-#define WMI_PEER_HE		0x00000400</div><div class='del'>-#define WMI_PEER_APSD		0x00000800</div><div class='del'>-#define WMI_PEER_HT		0x00001000</div><div class='del'>-#define WMI_PEER_40MHZ		0x00002000</div><div class='del'>-#define WMI_PEER_STBC		0x00008000</div><div class='del'>-#define WMI_PEER_LDPC		0x00010000</div><div class='del'>-#define WMI_PEER_DYN_MIMOPS	0x00020000</div><div class='del'>-#define WMI_PEER_STATIC_MIMOPS	0x00040000</div><div class='del'>-#define WMI_PEER_SPATIAL_MUX	0x00200000</div><div class='del'>-#define WMI_PEER_TWT_REQ	0x00400000</div><div class='del'>-#define WMI_PEER_TWT_RESP	0x00800000</div><div class='del'>-#define WMI_PEER_VHT		0x02000000</div><div class='del'>-#define WMI_PEER_80MHZ		0x04000000</div><div class='del'>-#define WMI_PEER_PMF		0x08000000</div><div class='del'>-/* TODO: Place holder for WLAN_PEER_F_PS_PRESEND_REQUIRED = 0x10000000.</div><div class='del'>- * Need to be cleaned up</div><div class='del'>- */</div><div class='del'>-#define WMI_PEER_IS_P2P_CAPABLE	0x20000000</div><div class='del'>-#define WMI_PEER_160MHZ		0x40000000</div><div class='del'>-#define WMI_PEER_SAFEMODE_EN	0x80000000</div><div class='del'>-</div><div class='ctx'> struct beacon_tmpl_params {</div><div class='ctx'> 	u8 vdev_id;</div><div class='ctx'> 	u32 tim_ie_offset;</div><div class='hunk'>@@ -3909,20 +4119,27 @@ struct wmi_rate_set {</div><div class='ctx'> struct wmi_vht_rate_set {</div><div class='ctx'> 	u32 tlv_header;</div><div class='ctx'> 	u32 rx_max_rate;</div><div class='add'>+	/* MCS at which the peer can transmit */</div><div class='ctx'> 	u32 rx_mcs_set;</div><div class='ctx'> 	u32 tx_max_rate;</div><div class='add'>+	/* MCS at which the peer can receive */</div><div class='ctx'> 	u32 tx_mcs_set;</div><div class='ctx'> 	u32 tx_max_mcs_nss;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_he_rate_set {</div><div class='ctx'> 	u32 tlv_header;</div><div class='add'>+</div><div class='add'>+	/* MCS at which the peer can receive */</div><div class='ctx'> 	u32 rx_mcs_set;</div><div class='add'>+</div><div class='add'>+	/* MCS at which the peer can transmit */</div><div class='ctx'> 	u32 tx_mcs_set;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define MAX_REG_RULES 10</div><div class='ctx'> #define REG_ALPHA2_LEN 2</div><div class='add'>+#define MAX_6GHZ_REG_RULES 5</div><div class='ctx'> </div><div class='ctx'> enum wmi_start_event_param {</div><div class='ctx'> 	WMI_VDEV_START_RESP_EVENT = 0,</div><div class='hunk'>@@ -3942,6 +4159,7 @@ struct wmi_vdev_start_resp_event {</div><div class='ctx'> 	};</div><div class='ctx'> 	u32 cfgd_tx_streams;</div><div class='ctx'> 	u32 cfgd_rx_streams;</div><div class='add'>+	s32 max_allowed_tx_power;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* VDEV start response status codes */</div><div class='hunk'>@@ -3953,16 +4171,6 @@ enum wmi_vdev_start_resp_status_code {</div><div class='ctx'> 	WMI_VDEV_START_RESPONSE_INVALID_REGDOMAIN = 4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-;</div><div class='del'>-enum cc_setting_code {</div><div class='del'>-	REG_SET_CC_STATUS_PASS = 0,</div><div class='del'>-	REG_CURRENT_ALPHA2_NOT_FOUND = 1,</div><div class='del'>-	REG_INIT_ALPHA2_NOT_FOUND = 2,</div><div class='del'>-	REG_SET_CC_CHANGE_NOT_ALLOWED = 3,</div><div class='del'>-	REG_SET_CC_STATUS_NO_MEMORY = 4,</div><div class='del'>-	REG_SET_CC_STATUS_FAIL = 5,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Regaulatory Rule Flags Passed by FW */</div><div class='ctx'> #define REGULATORY_CHAN_DISABLED     BIT(0)</div><div class='ctx'> #define REGULATORY_CHAN_NO_IR        BIT(1)</div><div class='hunk'>@@ -3976,15 +4184,216 @@ enum cc_setting_code {</div><div class='ctx'> #define REGULATORY_CHAN_NO_20MHZ     BIT(11)</div><div class='ctx'> #define REGULATORY_CHAN_NO_10MHZ     BIT(12)</div><div class='ctx'> </div><div class='del'>-enum {</div><div class='add'>+enum wmi_reg_chan_list_cmd_type {</div><div class='add'>+	WMI_REG_CHAN_LIST_CC_ID = 0,</div><div class='add'>+	WMI_REG_CHAN_LIST_CC_EXT_ID = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_reg_cc_setting_code {</div><div class='ctx'> 	WMI_REG_SET_CC_STATUS_PASS = 0,</div><div class='ctx'> 	WMI_REG_CURRENT_ALPHA2_NOT_FOUND = 1,</div><div class='ctx'> 	WMI_REG_INIT_ALPHA2_NOT_FOUND = 2,</div><div class='ctx'> 	WMI_REG_SET_CC_CHANGE_NOT_ALLOWED = 3,</div><div class='ctx'> 	WMI_REG_SET_CC_STATUS_NO_MEMORY = 4,</div><div class='ctx'> 	WMI_REG_SET_CC_STATUS_FAIL = 5,</div><div class='add'>+</div><div class='add'>+	/* add new setting code above, update in</div><div class='add'>+	 * @enum cc_setting_code as well.</div><div class='add'>+	 * Also handle it in ath11k_wmi_cc_setting_code_to_reg()</div><div class='add'>+	 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum cc_setting_code {</div><div class='add'>+	REG_SET_CC_STATUS_PASS = 0,</div><div class='add'>+	REG_CURRENT_ALPHA2_NOT_FOUND = 1,</div><div class='add'>+	REG_INIT_ALPHA2_NOT_FOUND = 2,</div><div class='add'>+	REG_SET_CC_CHANGE_NOT_ALLOWED = 3,</div><div class='add'>+	REG_SET_CC_STATUS_NO_MEMORY = 4,</div><div class='add'>+	REG_SET_CC_STATUS_FAIL = 5,</div><div class='add'>+</div><div class='add'>+	/* add new setting code above, update in</div><div class='add'>+	 * @enum wmi_reg_cc_setting_code as well.</div><div class='add'>+	 * Also handle it in ath11k_cc_status_to_str()</div><div class='add'>+	 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline enum cc_setting_code</div><div class='add'>+ath11k_wmi_cc_setting_code_to_reg(enum wmi_reg_cc_setting_code status_code)</div><div class='add'>+{</div><div class='add'>+	switch (status_code) {</div><div class='add'>+	case WMI_REG_SET_CC_STATUS_PASS:</div><div class='add'>+		return REG_SET_CC_STATUS_PASS;</div><div class='add'>+	case WMI_REG_CURRENT_ALPHA2_NOT_FOUND:</div><div class='add'>+		return REG_CURRENT_ALPHA2_NOT_FOUND;</div><div class='add'>+	case WMI_REG_INIT_ALPHA2_NOT_FOUND:</div><div class='add'>+		return REG_INIT_ALPHA2_NOT_FOUND;</div><div class='add'>+	case WMI_REG_SET_CC_CHANGE_NOT_ALLOWED:</div><div class='add'>+		return REG_SET_CC_CHANGE_NOT_ALLOWED;</div><div class='add'>+	case WMI_REG_SET_CC_STATUS_NO_MEMORY:</div><div class='add'>+		return REG_SET_CC_STATUS_NO_MEMORY;</div><div class='add'>+	case WMI_REG_SET_CC_STATUS_FAIL:</div><div class='add'>+		return REG_SET_CC_STATUS_FAIL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return REG_SET_CC_STATUS_FAIL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline const char *ath11k_cc_status_to_str(enum cc_setting_code code)</div><div class='add'>+{</div><div class='add'>+	switch (code) {</div><div class='add'>+	case REG_SET_CC_STATUS_PASS:</div><div class='add'>+		return "REG_SET_CC_STATUS_PASS";</div><div class='add'>+	case REG_CURRENT_ALPHA2_NOT_FOUND:</div><div class='add'>+		return "REG_CURRENT_ALPHA2_NOT_FOUND";</div><div class='add'>+	case REG_INIT_ALPHA2_NOT_FOUND:</div><div class='add'>+		return "REG_INIT_ALPHA2_NOT_FOUND";</div><div class='add'>+	case REG_SET_CC_CHANGE_NOT_ALLOWED:</div><div class='add'>+		return "REG_SET_CC_CHANGE_NOT_ALLOWED";</div><div class='add'>+	case REG_SET_CC_STATUS_NO_MEMORY:</div><div class='add'>+		return "REG_SET_CC_STATUS_NO_MEMORY";</div><div class='add'>+	case REG_SET_CC_STATUS_FAIL:</div><div class='add'>+		return "REG_SET_CC_STATUS_FAIL";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "Unknown CC status";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum wmi_reg_6ghz_ap_type {</div><div class='add'>+	WMI_REG_INDOOR_AP = 0,</div><div class='add'>+	WMI_REG_STANDARD_POWER_AP = 1,</div><div class='add'>+	WMI_REG_VERY_LOW_POWER_AP = 2,</div><div class='add'>+</div><div class='add'>+	/* add AP type above, handle in ath11k_6ghz_ap_type_to_str()</div><div class='add'>+	 */</div><div class='add'>+	WMI_REG_CURRENT_MAX_AP_TYPE,</div><div class='add'>+	WMI_REG_MAX_AP_TYPE = 7,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline const char *</div><div class='add'>+ath11k_6ghz_ap_type_to_str(enum wmi_reg_6ghz_ap_type type)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case WMI_REG_INDOOR_AP:</div><div class='add'>+		return "INDOOR AP";</div><div class='add'>+	case WMI_REG_STANDARD_POWER_AP:</div><div class='add'>+		return "STANDARD POWER AP";</div><div class='add'>+	case WMI_REG_VERY_LOW_POWER_AP:</div><div class='add'>+		return "VERY LOW POWER AP";</div><div class='add'>+	case WMI_REG_CURRENT_MAX_AP_TYPE:</div><div class='add'>+		return "CURRENT_MAX_AP_TYPE";</div><div class='add'>+	case WMI_REG_MAX_AP_TYPE:</div><div class='add'>+		return "MAX_AP_TYPE";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "unknown 6 GHz AP type";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum wmi_reg_6ghz_client_type {</div><div class='add'>+	WMI_REG_DEFAULT_CLIENT = 0,</div><div class='add'>+	WMI_REG_SUBORDINATE_CLIENT = 1,</div><div class='add'>+	WMI_REG_MAX_CLIENT_TYPE = 2,</div><div class='add'>+</div><div class='add'>+	/* add client type above, handle it in</div><div class='add'>+	 * ath11k_6ghz_client_type_to_str()</div><div class='add'>+	 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline const char *</div><div class='add'>+ath11k_6ghz_client_type_to_str(enum wmi_reg_6ghz_client_type type)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case WMI_REG_DEFAULT_CLIENT:</div><div class='add'>+		return "DEFAULT CLIENT";</div><div class='add'>+	case WMI_REG_SUBORDINATE_CLIENT:</div><div class='add'>+		return "SUBORDINATE CLIENT";</div><div class='add'>+	case WMI_REG_MAX_CLIENT_TYPE:</div><div class='add'>+		return "MAX_CLIENT_TYPE";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "unknown 6 GHz client type";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum reg_subdomains_6ghz {</div><div class='add'>+	EMPTY_6GHZ = 0x0,</div><div class='add'>+	FCC1_CLIENT_LPI_REGULAR_6GHZ = 0x01,</div><div class='add'>+	FCC1_CLIENT_SP_6GHZ = 0x02,</div><div class='add'>+	FCC1_AP_LPI_6GHZ = 0x03,</div><div class='add'>+	FCC1_CLIENT_LPI_SUBORDINATE = FCC1_AP_LPI_6GHZ,</div><div class='add'>+	FCC1_AP_SP_6GHZ = 0x04,</div><div class='add'>+	ETSI1_LPI_6GHZ = 0x10,</div><div class='add'>+	ETSI1_VLP_6GHZ = 0x11,</div><div class='add'>+	ETSI2_LPI_6GHZ = 0x12,</div><div class='add'>+	ETSI2_VLP_6GHZ = 0x13,</div><div class='add'>+	APL1_LPI_6GHZ = 0x20,</div><div class='add'>+	APL1_VLP_6GHZ = 0x21,</div><div class='add'>+</div><div class='add'>+	/* add sub-domain above, handle it in</div><div class='add'>+	 * ath11k_sub_reg_6ghz_to_str()</div><div class='add'>+	 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline const char *</div><div class='add'>+ath11k_sub_reg_6ghz_to_str(enum reg_subdomains_6ghz sub_id)</div><div class='add'>+{</div><div class='add'>+	switch (sub_id) {</div><div class='add'>+	case EMPTY_6GHZ:</div><div class='add'>+		return "N/A";</div><div class='add'>+	case FCC1_CLIENT_LPI_REGULAR_6GHZ:</div><div class='add'>+		return "FCC1_CLIENT_LPI_REGULAR_6GHZ";</div><div class='add'>+	case FCC1_CLIENT_SP_6GHZ:</div><div class='add'>+		return "FCC1_CLIENT_SP_6GHZ";</div><div class='add'>+	case FCC1_AP_LPI_6GHZ:</div><div class='add'>+		return "FCC1_AP_LPI_6GHZ/FCC1_CLIENT_LPI_SUBORDINATE";</div><div class='add'>+	case FCC1_AP_SP_6GHZ:</div><div class='add'>+		return "FCC1_AP_SP_6GHZ";</div><div class='add'>+	case ETSI1_LPI_6GHZ:</div><div class='add'>+		return "ETSI1_LPI_6GHZ";</div><div class='add'>+	case ETSI1_VLP_6GHZ:</div><div class='add'>+		return "ETSI1_VLP_6GHZ";</div><div class='add'>+	case ETSI2_LPI_6GHZ:</div><div class='add'>+		return "ETSI2_LPI_6GHZ";</div><div class='add'>+	case ETSI2_VLP_6GHZ:</div><div class='add'>+		return "ETSI2_VLP_6GHZ";</div><div class='add'>+	case APL1_LPI_6GHZ:</div><div class='add'>+		return "APL1_LPI_6GHZ";</div><div class='add'>+	case APL1_VLP_6GHZ:</div><div class='add'>+		return "APL1_VLP_6GHZ";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "unknown sub reg id";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum reg_super_domain_6ghz {</div><div class='add'>+	FCC1_6GHZ = 0x01,</div><div class='add'>+	ETSI1_6GHZ = 0x02,</div><div class='add'>+	ETSI2_6GHZ = 0x03,</div><div class='add'>+	APL1_6GHZ = 0x04,</div><div class='add'>+	FCC1_6GHZ_CL = 0x05,</div><div class='add'>+</div><div class='add'>+	/* add super domain above, handle it in</div><div class='add'>+	 * ath11k_super_reg_6ghz_to_str()</div><div class='add'>+	 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline const char *</div><div class='add'>+ath11k_super_reg_6ghz_to_str(enum reg_super_domain_6ghz domain_id)</div><div class='add'>+{</div><div class='add'>+	switch (domain_id) {</div><div class='add'>+	case FCC1_6GHZ:</div><div class='add'>+		return "FCC1_6GHZ";</div><div class='add'>+	case ETSI1_6GHZ:</div><div class='add'>+		return "ETSI1_6GHZ";</div><div class='add'>+	case ETSI2_6GHZ:</div><div class='add'>+		return "ETSI2_6GHZ";</div><div class='add'>+	case APL1_6GHZ:</div><div class='add'>+		return "APL1_6GHZ";</div><div class='add'>+	case FCC1_6GHZ_CL:</div><div class='add'>+		return "FCC1_6GHZ_CL";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "unknown domain id";</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct cur_reg_rule {</div><div class='ctx'> 	u16 start_freq;</div><div class='ctx'> 	u16 end_freq;</div><div class='hunk'>@@ -3992,6 +4401,8 @@ struct cur_reg_rule {</div><div class='ctx'> 	u8 reg_power;</div><div class='ctx'> 	u8 ant_gain;</div><div class='ctx'> 	u16 flags;</div><div class='add'>+	bool psd_flag;</div><div class='add'>+	s8 psd_eirp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cur_regulatory_info {</div><div class='hunk'>@@ -4003,14 +4414,30 @@ struct cur_regulatory_info {</div><div class='ctx'> 	u8 alpha2[REG_ALPHA2_LEN + 1];</div><div class='ctx'> 	u32 dfs_region;</div><div class='ctx'> 	u32 phybitmap;</div><div class='del'>-	u32 min_bw_2g;</div><div class='del'>-	u32 max_bw_2g;</div><div class='del'>-	u32 min_bw_5g;</div><div class='del'>-	u32 max_bw_5g;</div><div class='del'>-	u32 num_2g_reg_rules;</div><div class='del'>-	u32 num_5g_reg_rules;</div><div class='del'>-	struct cur_reg_rule *reg_rules_2g_ptr;</div><div class='del'>-	struct cur_reg_rule *reg_rules_5g_ptr;</div><div class='add'>+	u32 min_bw_2ghz;</div><div class='add'>+	u32 max_bw_2ghz;</div><div class='add'>+	u32 min_bw_5ghz;</div><div class='add'>+	u32 max_bw_5ghz;</div><div class='add'>+	u32 num_2ghz_reg_rules;</div><div class='add'>+	u32 num_5ghz_reg_rules;</div><div class='add'>+	struct cur_reg_rule *reg_rules_2ghz_ptr;</div><div class='add'>+	struct cur_reg_rule *reg_rules_5ghz_ptr;</div><div class='add'>+	bool is_ext_reg_event;</div><div class='add'>+	enum wmi_reg_6ghz_client_type client_type;</div><div class='add'>+	bool rnr_tpe_usable;</div><div class='add'>+	bool unspecified_ap_usable;</div><div class='add'>+	u8 domain_code_6ghz_ap[WMI_REG_CURRENT_MAX_AP_TYPE];</div><div class='add'>+	u8 domain_code_6ghz_client[WMI_REG_CURRENT_MAX_AP_TYPE][WMI_REG_MAX_CLIENT_TYPE];</div><div class='add'>+	u32 domain_code_6ghz_super_id;</div><div class='add'>+	u32 min_bw_6ghz_ap[WMI_REG_CURRENT_MAX_AP_TYPE];</div><div class='add'>+	u32 max_bw_6ghz_ap[WMI_REG_CURRENT_MAX_AP_TYPE];</div><div class='add'>+	u32 min_bw_6ghz_client[WMI_REG_CURRENT_MAX_AP_TYPE][WMI_REG_MAX_CLIENT_TYPE];</div><div class='add'>+	u32 max_bw_6ghz_client[WMI_REG_CURRENT_MAX_AP_TYPE][WMI_REG_MAX_CLIENT_TYPE];</div><div class='add'>+	u32 num_6ghz_rules_ap[WMI_REG_CURRENT_MAX_AP_TYPE];</div><div class='add'>+	u32 num_6ghz_rules_client[WMI_REG_CURRENT_MAX_AP_TYPE][WMI_REG_MAX_CLIENT_TYPE];</div><div class='add'>+	struct cur_reg_rule *reg_rules_6ghz_ap_ptr[WMI_REG_CURRENT_MAX_AP_TYPE];</div><div class='add'>+	struct cur_reg_rule *reg_rules_6ghz_client_ptr</div><div class='add'>+		[WMI_REG_CURRENT_MAX_AP_TYPE][WMI_REG_MAX_CLIENT_TYPE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct wmi_reg_chan_list_cc_event {</div><div class='hunk'>@@ -4022,12 +4449,12 @@ struct wmi_reg_chan_list_cc_event {</div><div class='ctx'> 	u32 domain_code;</div><div class='ctx'> 	u32 dfs_region;</div><div class='ctx'> 	u32 phybitmap;</div><div class='del'>-	u32 min_bw_2g;</div><div class='del'>-	u32 max_bw_2g;</div><div class='del'>-	u32 min_bw_5g;</div><div class='del'>-	u32 max_bw_5g;</div><div class='del'>-	u32 num_2g_reg_rules;</div><div class='del'>-	u32 num_5g_reg_rules;</div><div class='add'>+	u32 min_bw_2ghz;</div><div class='add'>+	u32 max_bw_2ghz;</div><div class='add'>+	u32 min_bw_5ghz;</div><div class='add'>+	u32 max_bw_5ghz;</div><div class='add'>+	u32 num_2ghz_reg_rules;</div><div class='add'>+	u32 num_5ghz_reg_rules;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_regulatory_rule_struct {</div><div class='hunk'>@@ -4037,6 +4464,61 @@ struct wmi_regulatory_rule_struct {</div><div class='ctx'> 	u32  flag_info;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define WMI_REG_CLIENT_MAX 4</div><div class='add'>+</div><div class='add'>+struct wmi_reg_chan_list_cc_ext_event {</div><div class='add'>+	u32 status_code;</div><div class='add'>+	u32 phy_id;</div><div class='add'>+	u32 alpha2;</div><div class='add'>+	u32 num_phy;</div><div class='add'>+	u32 country_id;</div><div class='add'>+	u32 domain_code;</div><div class='add'>+	u32 dfs_region;</div><div class='add'>+	u32 phybitmap;</div><div class='add'>+	u32 min_bw_2ghz;</div><div class='add'>+	u32 max_bw_2ghz;</div><div class='add'>+	u32 min_bw_5ghz;</div><div class='add'>+	u32 max_bw_5ghz;</div><div class='add'>+	u32 num_2ghz_reg_rules;</div><div class='add'>+	u32 num_5ghz_reg_rules;</div><div class='add'>+	u32 client_type;</div><div class='add'>+	u32 rnr_tpe_usable;</div><div class='add'>+	u32 unspecified_ap_usable;</div><div class='add'>+	u32 domain_code_6ghz_ap_lpi;</div><div class='add'>+	u32 domain_code_6ghz_ap_sp;</div><div class='add'>+	u32 domain_code_6ghz_ap_vlp;</div><div class='add'>+	u32 domain_code_6ghz_client_lpi[WMI_REG_CLIENT_MAX];</div><div class='add'>+	u32 domain_code_6ghz_client_sp[WMI_REG_CLIENT_MAX];</div><div class='add'>+	u32 domain_code_6ghz_client_vlp[WMI_REG_CLIENT_MAX];</div><div class='add'>+	u32 domain_code_6ghz_super_id;</div><div class='add'>+	u32 min_bw_6ghz_ap_sp;</div><div class='add'>+	u32 max_bw_6ghz_ap_sp;</div><div class='add'>+	u32 min_bw_6ghz_ap_lpi;</div><div class='add'>+	u32 max_bw_6ghz_ap_lpi;</div><div class='add'>+	u32 min_bw_6ghz_ap_vlp;</div><div class='add'>+	u32 max_bw_6ghz_ap_vlp;</div><div class='add'>+	u32 min_bw_6ghz_client_sp[WMI_REG_CLIENT_MAX];</div><div class='add'>+	u32 max_bw_6ghz_client_sp[WMI_REG_CLIENT_MAX];</div><div class='add'>+	u32 min_bw_6ghz_client_lpi[WMI_REG_CLIENT_MAX];</div><div class='add'>+	u32 max_bw_6ghz_client_lpi[WMI_REG_CLIENT_MAX];</div><div class='add'>+	u32 min_bw_6ghz_client_vlp[WMI_REG_CLIENT_MAX];</div><div class='add'>+	u32 max_bw_6ghz_client_vlp[WMI_REG_CLIENT_MAX];</div><div class='add'>+	u32 num_6ghz_reg_rules_ap_sp;</div><div class='add'>+	u32 num_6ghz_reg_rules_ap_lpi;</div><div class='add'>+	u32 num_6ghz_reg_rules_ap_vlp;</div><div class='add'>+	u32 num_6ghz_reg_rules_client_sp[WMI_REG_CLIENT_MAX];</div><div class='add'>+	u32 num_6ghz_reg_rules_client_lpi[WMI_REG_CLIENT_MAX];</div><div class='add'>+	u32 num_6ghz_reg_rules_client_vlp[WMI_REG_CLIENT_MAX];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_regulatory_ext_rule {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 freq_info;</div><div class='add'>+	u32 bw_pwr_info;</div><div class='add'>+	u32 flag_info;</div><div class='add'>+	u32 psd_power_info;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct wmi_vdev_delete_resp_event {</div><div class='ctx'> 	u32 vdev_id;</div><div class='ctx'> } __packed;</div><div class='hunk'>@@ -4056,7 +4538,6 @@ struct wmi_vdev_stopped_event {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_pdev_bss_chan_info_event {</div><div class='del'>-	u32 pdev_id;</div><div class='ctx'> 	u32 freq;	/* Units in MHz */</div><div class='ctx'> 	u32 noise_floor;	/* units are dBm */</div><div class='ctx'> 	/* rx clear - how often the channel was unused */</div><div class='hunk'>@@ -4074,6 +4555,7 @@ struct wmi_pdev_bss_chan_info_event {</div><div class='ctx'> 	/*rx_cycle cnt for my bss in 64bits format */</div><div class='ctx'> 	u32 rx_bss_cycle_count_low;</div><div class='ctx'> 	u32 rx_bss_cycle_count_high;</div><div class='add'>+	u32 pdev_id;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define WMI_VDEV_INSTALL_KEY_COMPL_STATUS_SUCCESS 0</div><div class='hunk'>@@ -4168,15 +4650,20 @@ struct wmi_pdev_stats_tx {</div><div class='ctx'> 	/* Num underruns */</div><div class='ctx'> 	s32 underrun;</div><div class='ctx'> </div><div class='add'>+	/* Num hw paused */</div><div class='add'>+	u32 hw_paused;</div><div class='add'>+</div><div class='ctx'> 	/* Num PPDUs cleaned up in TX abort */</div><div class='ctx'> 	s32 tx_abort;</div><div class='ctx'> </div><div class='del'>-	/* Num MPDUs requed by SW */</div><div class='del'>-	s32 mpdus_requed;</div><div class='add'>+	/* Num MPDUs requeued by SW */</div><div class='add'>+	s32 mpdus_requeued;</div><div class='ctx'> </div><div class='ctx'> 	/* excessive retries */</div><div class='ctx'> 	u32 tx_ko;</div><div class='ctx'> </div><div class='add'>+	u32 tx_xretry;</div><div class='add'>+</div><div class='ctx'> 	/* data hw rate code */</div><div class='ctx'> 	u32 data_rc;</div><div class='ctx'> </div><div class='hunk'>@@ -4206,6 +4693,40 @@ struct wmi_pdev_stats_tx {</div><div class='ctx'> </div><div class='ctx'> 	/* MPDU is more than txop limit */</div><div class='ctx'> 	u32 txop_ovf;</div><div class='add'>+</div><div class='add'>+	/* Num sequences posted */</div><div class='add'>+	u32 seq_posted;</div><div class='add'>+</div><div class='add'>+	/* Num sequences failed in queueing */</div><div class='add'>+	u32 seq_failed_queueing;</div><div class='add'>+</div><div class='add'>+	/* Num sequences completed */</div><div class='add'>+	u32 seq_completed;</div><div class='add'>+</div><div class='add'>+	/* Num sequences restarted */</div><div class='add'>+	u32 seq_restarted;</div><div class='add'>+</div><div class='add'>+	/* Num of MU sequences posted */</div><div class='add'>+	u32 mu_seq_posted;</div><div class='add'>+</div><div class='add'>+	/* Num MPDUs flushed by SW, HWPAUSED, SW TXABORT</div><div class='add'>+	 * (Reset,channel change)</div><div class='add'>+	 */</div><div class='add'>+	s32 mpdus_sw_flush;</div><div class='add'>+</div><div class='add'>+	/* Num MPDUs filtered by HW, all filter condition (TTL expired) */</div><div class='add'>+	s32 mpdus_hw_filter;</div><div class='add'>+</div><div class='add'>+	/* Num MPDUs truncated by PDG (TXOP, TBTT,</div><div class='add'>+	 * PPDU_duration based on rate, dyn_bw)</div><div class='add'>+	 */</div><div class='add'>+	s32 mpdus_truncated;</div><div class='add'>+</div><div class='add'>+	/* Num MPDUs that was tried but didn't receive ACK or BA */</div><div class='add'>+	s32 mpdus_ack_failed;</div><div class='add'>+</div><div class='add'>+	/* Num MPDUs that was dropped du to expiry. */</div><div class='add'>+	s32 mpdus_expired;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_pdev_stats_rx {</div><div class='hunk'>@@ -4240,6 +4761,9 @@ struct wmi_pdev_stats_rx {</div><div class='ctx'> </div><div class='ctx'> 	/* Number of mpdu errors - FCS, MIC, ENC etc. */</div><div class='ctx'> 	s32 mpdu_errs;</div><div class='add'>+</div><div class='add'>+	/* Num overflow errors */</div><div class='add'>+	s32 rx_ovfl_errs;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_pdev_stats {</div><div class='hunk'>@@ -4289,6 +4813,17 @@ struct wmi_stats_event {</div><div class='ctx'> 	u32 num_peer_extd2_stats;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct wmi_rssi_stats {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 rssi_avg_beacon[WMI_MAX_CHAINS];</div><div class='add'>+	u32 rssi_avg_data[WMI_MAX_CHAINS];</div><div class='add'>+	struct wmi_mac_addr peer_macaddr;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_per_chain_rssi_stats {</div><div class='add'>+	u32 num_per_chain_rssi_stats;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct wmi_pdev_ctl_failsafe_chk_event {</div><div class='ctx'> 	u32 pdev_id;</div><div class='ctx'> 	u32 ctl_failsafe_status;</div><div class='hunk'>@@ -4314,7 +4849,7 @@ struct wmi_pdev_radar_ev {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_pdev_temperature_event {</div><div class='del'>-	/* temperature value in Celcius degree */</div><div class='add'>+	/* temperature value in Celsius degree */</div><div class='ctx'> 	s32 temp;</div><div class='ctx'> 	u32 pdev_id;</div><div class='ctx'> } __packed;</div><div class='hunk'>@@ -4372,6 +4907,8 @@ struct wmi_mgmt_tx_compl_event {</div><div class='ctx'> 	u32 desc_id;</div><div class='ctx'> 	u32 status;</div><div class='ctx'> 	u32 pdev_id;</div><div class='add'>+	u32 ppdu_id;</div><div class='add'>+	u32 ack_rssi;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_scan_event {</div><div class='hunk'>@@ -4455,6 +4992,7 @@ struct ath11k_targ_cap {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum wmi_vdev_type {</div><div class='add'>+	WMI_VDEV_TYPE_UNSPEC =  0,</div><div class='ctx'> 	WMI_VDEV_TYPE_AP      = 1,</div><div class='ctx'> 	WMI_VDEV_TYPE_STA     = 2,</div><div class='ctx'> 	WMI_VDEV_TYPE_IBSS    = 3,</div><div class='hunk'>@@ -4540,7 +5078,7 @@ enum wmi_sta_ps_param_tx_wake_threshold {</div><div class='ctx'>  */</div><div class='ctx'> enum wmi_sta_ps_param_pspoll_count {</div><div class='ctx'> 	WMI_STA_PS_PSPOLL_COUNT_NO_MAX = 0,</div><div class='del'>-	/* Values greater than 0 indicate the maximum numer of PS-Poll frames</div><div class='add'>+	/* Values greater than 0 indicate the maximum number of PS-Poll frames</div><div class='ctx'> 	 * FW will send before waking up.</div><div class='ctx'> 	 */</div><div class='ctx'> };</div><div class='hunk'>@@ -4652,9 +5190,9 @@ enum wmi_rate_preamble {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum wmi_rtscts_prot_mode - Enable/Disable RTS/CTS and CTS2Self Protection.</div><div class='del'>- * @WMI_RTS_CTS_DISABLED : RTS/CTS protection is disabled.</div><div class='del'>- * @WMI_USE_RTS_CTS : RTS/CTS Enabled.</div><div class='del'>- * @WMI_USE_CTS2SELF : CTS to self protection Enabled.</div><div class='add'>+ * @WMI_RTS_CTS_DISABLED: RTS/CTS protection is disabled.</div><div class='add'>+ * @WMI_USE_RTS_CTS: RTS/CTS Enabled.</div><div class='add'>+ * @WMI_USE_CTS2SELF: CTS to self protection Enabled.</div><div class='ctx'>  */</div><div class='ctx'> enum wmi_rtscts_prot_mode {</div><div class='ctx'> 	WMI_RTS_CTS_DISABLED = 0,</div><div class='hunk'>@@ -4665,13 +5203,13 @@ enum wmi_rtscts_prot_mode {</div><div class='ctx'> /**</div><div class='ctx'>  * enum wmi_rtscts_profile - Selection of RTS CTS profile along with enabling</div><div class='ctx'>  *                           protection mode.</div><div class='del'>- * @WMI_RTSCTS_FOR_NO_RATESERIES - Neither of rate-series should use RTS-CTS</div><div class='del'>- * @WMI_RTSCTS_FOR_SECOND_RATESERIES - Only second rate-series will use RTS-CTS</div><div class='del'>- * @WMI_RTSCTS_ACROSS_SW_RETRIES - Only the second rate-series will use RTS-CTS,</div><div class='del'>- *                                 but if there's a sw retry, both the rate</div><div class='del'>- *                                 series will use RTS-CTS.</div><div class='del'>- * @WMI_RTSCTS_ERP - RTS/CTS used for ERP protection for every PPDU.</div><div class='del'>- * @WMI_RTSCTS_FOR_ALL_RATESERIES - Enable RTS-CTS for all rate series.</div><div class='add'>+ * @WMI_RTSCTS_FOR_NO_RATESERIES: Neither of rate-series should use RTS-CTS</div><div class='add'>+ * @WMI_RTSCTS_FOR_SECOND_RATESERIES: Only second rate-series will use RTS-CTS</div><div class='add'>+ * @WMI_RTSCTS_ACROSS_SW_RETRIES: Only the second rate-series will use RTS-CTS,</div><div class='add'>+ *                                but if there's a sw retry, both the rate</div><div class='add'>+ *                                series will use RTS-CTS.</div><div class='add'>+ * @WMI_RTSCTS_ERP: RTS/CTS used for ERP protection for every PPDU.</div><div class='add'>+ * @WMI_RTSCTS_FOR_ALL_RATESERIES: Enable RTS-CTS for all rate series.</div><div class='ctx'>  */</div><div class='ctx'> enum wmi_rtscts_profile {</div><div class='ctx'> 	WMI_RTSCTS_FOR_NO_RATESERIES = 0,</div><div class='hunk'>@@ -4765,6 +5303,25 @@ struct wmi_wmm_params_all_arg {</div><div class='ctx'> #define ATH11K_TWT_DEF_ADD_STA_SLOT_INTERVAL		1000</div><div class='ctx'> #define ATH11K_TWT_DEF_REMOVE_STA_SLOT_INTERVAL		5000</div><div class='ctx'> </div><div class='add'>+struct wmi_twt_enable_params {</div><div class='add'>+	u32 sta_cong_timer_ms;</div><div class='add'>+	u32 mbss_support;</div><div class='add'>+	u32 default_slot_size;</div><div class='add'>+	u32 congestion_thresh_setup;</div><div class='add'>+	u32 congestion_thresh_teardown;</div><div class='add'>+	u32 congestion_thresh_critical;</div><div class='add'>+	u32 interference_thresh_teardown;</div><div class='add'>+	u32 interference_thresh_setup;</div><div class='add'>+	u32 min_no_sta_setup;</div><div class='add'>+	u32 min_no_sta_teardown;</div><div class='add'>+	u32 no_of_bcast_mcast_slots;</div><div class='add'>+	u32 min_no_twt_slots;</div><div class='add'>+	u32 max_no_sta_twt;</div><div class='add'>+	u32 mode_check_interval;</div><div class='add'>+	u32 add_sta_slot_interval;</div><div class='add'>+	u32 remove_sta_slot_interval;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct wmi_twt_enable_params_cmd {</div><div class='ctx'> 	u32 tlv_header;</div><div class='ctx'> 	u32 pdev_id;</div><div class='hunk'>@@ -4791,6 +5348,112 @@ struct wmi_twt_disable_params_cmd {</div><div class='ctx'> 	u32 pdev_id;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+enum WMI_HOST_TWT_COMMAND {</div><div class='add'>+	WMI_HOST_TWT_COMMAND_REQUEST_TWT = 0,</div><div class='add'>+	WMI_HOST_TWT_COMMAND_SUGGEST_TWT,</div><div class='add'>+	WMI_HOST_TWT_COMMAND_DEMAND_TWT,</div><div class='add'>+	WMI_HOST_TWT_COMMAND_TWT_GROUPING,</div><div class='add'>+	WMI_HOST_TWT_COMMAND_ACCEPT_TWT,</div><div class='add'>+	WMI_HOST_TWT_COMMAND_ALTERNATE_TWT,</div><div class='add'>+	WMI_HOST_TWT_COMMAND_DICTATE_TWT,</div><div class='add'>+	WMI_HOST_TWT_COMMAND_REJECT_TWT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WMI_TWT_ADD_DIALOG_FLAG_BCAST           BIT(8)</div><div class='add'>+#define WMI_TWT_ADD_DIALOG_FLAG_TRIGGER         BIT(9)</div><div class='add'>+#define WMI_TWT_ADD_DIALOG_FLAG_FLOW_TYPE       BIT(10)</div><div class='add'>+#define WMI_TWT_ADD_DIALOG_FLAG_PROTECTION      BIT(11)</div><div class='add'>+</div><div class='add'>+struct wmi_twt_add_dialog_params_cmd {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	struct wmi_mac_addr peer_macaddr;</div><div class='add'>+	u32 dialog_id;</div><div class='add'>+	u32 wake_intvl_us;</div><div class='add'>+	u32 wake_intvl_mantis;</div><div class='add'>+	u32 wake_dura_us;</div><div class='add'>+	u32 sp_offset_us;</div><div class='add'>+	u32 flags;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_twt_add_dialog_params {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u8 peer_macaddr[ETH_ALEN];</div><div class='add'>+	u32 dialog_id;</div><div class='add'>+	u32 wake_intvl_us;</div><div class='add'>+	u32 wake_intvl_mantis;</div><div class='add'>+	u32 wake_dura_us;</div><div class='add'>+	u32 sp_offset_us;</div><div class='add'>+	u8 twt_cmd;</div><div class='add'>+	u8 flag_bcast;</div><div class='add'>+	u8 flag_trigger;</div><div class='add'>+	u8 flag_flow_type;</div><div class='add'>+	u8 flag_protection;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum  wmi_twt_add_dialog_status {</div><div class='add'>+	WMI_ADD_TWT_STATUS_OK,</div><div class='add'>+	WMI_ADD_TWT_STATUS_TWT_NOT_ENABLED,</div><div class='add'>+	WMI_ADD_TWT_STATUS_USED_DIALOG_ID,</div><div class='add'>+	WMI_ADD_TWT_STATUS_INVALID_PARAM,</div><div class='add'>+	WMI_ADD_TWT_STATUS_NOT_READY,</div><div class='add'>+	WMI_ADD_TWT_STATUS_NO_RESOURCE,</div><div class='add'>+	WMI_ADD_TWT_STATUS_NO_ACK,</div><div class='add'>+	WMI_ADD_TWT_STATUS_NO_RESPONSE,</div><div class='add'>+	WMI_ADD_TWT_STATUS_DENIED,</div><div class='add'>+	WMI_ADD_TWT_STATUS_UNKNOWN_ERROR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_twt_add_dialog_event {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	struct wmi_mac_addr peer_macaddr;</div><div class='add'>+	u32 dialog_id;</div><div class='add'>+	u32 status;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_twt_del_dialog_params {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u8 peer_macaddr[ETH_ALEN];</div><div class='add'>+	u32 dialog_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_twt_del_dialog_params_cmd {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	struct wmi_mac_addr peer_macaddr;</div><div class='add'>+	u32 dialog_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_twt_pause_dialog_params {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u8 peer_macaddr[ETH_ALEN];</div><div class='add'>+	u32 dialog_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_twt_pause_dialog_params_cmd {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	struct wmi_mac_addr peer_macaddr;</div><div class='add'>+	u32 dialog_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_twt_resume_dialog_params {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u8 peer_macaddr[ETH_ALEN];</div><div class='add'>+	u32 dialog_id;</div><div class='add'>+	u32 sp_offset_us;</div><div class='add'>+	u32 next_twt_size;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_twt_resume_dialog_params_cmd {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	struct wmi_mac_addr peer_macaddr;</div><div class='add'>+	u32 dialog_id;</div><div class='add'>+	u32 sp_offset_us;</div><div class='add'>+	u32 next_twt_size;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct wmi_obss_spatial_reuse_params_cmd {</div><div class='ctx'> 	u32 tlv_header;</div><div class='ctx'> 	u32 pdev_id;</div><div class='hunk'>@@ -4813,6 +5476,13 @@ struct wmi_pdev_obss_pd_bitmap_cmd {</div><div class='ctx'> #define ATH11K_BSS_COLOR_COLLISION_DETECTION_STA_PERIOD_MS	10000</div><div class='ctx'> #define ATH11K_BSS_COLOR_COLLISION_DETECTION_AP_PERIOD_MS	5000</div><div class='ctx'> </div><div class='add'>+enum wmi_bss_color_collision {</div><div class='add'>+	WMI_BSS_COLOR_COLLISION_DISABLE = 0,</div><div class='add'>+	WMI_BSS_COLOR_COLLISION_DETECTION,</div><div class='add'>+	WMI_BSS_COLOR_FREE_SLOT_TIMER_EXPIRY,</div><div class='add'>+	WMI_BSS_COLOR_FREE_SLOT_AVAILABLE,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct wmi_obss_color_collision_cfg_params_cmd {</div><div class='ctx'> 	u32 tlv_header;</div><div class='ctx'> 	u32 vdev_id;</div><div class='hunk'>@@ -4830,6 +5500,12 @@ struct wmi_bss_color_change_enable_params_cmd {</div><div class='ctx'> 	u32 enable;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct wmi_obss_color_collision_event {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 evt_type;</div><div class='add'>+	u64 obss_color_bitmap;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> #define ATH11K_IPV4_TH_SEED_SIZE 5</div><div class='ctx'> #define ATH11K_IPV6_TH_SEED_SIZE 11</div><div class='ctx'> </div><div class='hunk'>@@ -5014,7 +5690,7 @@ struct target_resource_config {</div><div class='ctx'> 	u32 vo_minfree;</div><div class='ctx'> 	u32 rx_batchmode;</div><div class='ctx'> 	u32 tt_support;</div><div class='del'>-	u32 atf_config;</div><div class='add'>+	u32 flag1;</div><div class='ctx'> 	u32 iphdr_pad_config;</div><div class='ctx'> 	u32 qwrap_config:16,</div><div class='ctx'> 	    alloc_frag_desc_for_data_pkt:16;</div><div class='hunk'>@@ -5039,15 +5715,51 @@ struct target_resource_config {</div><div class='ctx'> 	u32 sched_params;</div><div class='ctx'> 	u32 twt_ap_pdev_count;</div><div class='ctx'> 	u32 twt_ap_sta_count;</div><div class='add'>+	u8 is_reg_cc_ext_event_supported;</div><div class='add'>+	u32 ema_max_vap_cnt;</div><div class='add'>+	u32 ema_max_profile_period;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_debug_log_param {</div><div class='add'>+	WMI_DEBUG_LOG_PARAM_LOG_LEVEL = 0x1,</div><div class='add'>+	WMI_DEBUG_LOG_PARAM_VDEV_ENABLE,</div><div class='add'>+	WMI_DEBUG_LOG_PARAM_VDEV_DISABLE,</div><div class='add'>+	WMI_DEBUG_LOG_PARAM_VDEV_ENABLE_BITMAP,</div><div class='add'>+	WMI_DEBUG_LOG_PARAM_MOD_ENABLE_BITMAP,</div><div class='add'>+	WMI_DEBUG_LOG_PARAM_WOW_MOD_ENABLE_BITMAP,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define WMI_MAX_MEM_REQS 32</div><div class='add'>+struct wmi_debug_log_config_cmd_fixed_param {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 dbg_log_param;</div><div class='add'>+	u32 value;</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> #define MAX_RADIOS 3</div><div class='ctx'> </div><div class='ctx'> #define WMI_SERVICE_READY_TIMEOUT_HZ (5 * HZ)</div><div class='ctx'> #define WMI_SEND_TIMEOUT_HZ (3 * HZ)</div><div class='ctx'> </div><div class='add'>+enum ath11k_wmi_peer_ps_state {</div><div class='add'>+	WMI_PEER_PS_STATE_OFF,</div><div class='add'>+	WMI_PEER_PS_STATE_ON,</div><div class='add'>+	WMI_PEER_PS_STATE_DISABLED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_peer_ps_supported_bitmap {</div><div class='add'>+	/* Used to indicate that power save state change is valid */</div><div class='add'>+	WMI_PEER_PS_VALID = 0x1,</div><div class='add'>+	WMI_PEER_PS_STATE_TIMESTAMP = 0x2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_peer_sta_ps_state_chg_event {</div><div class='add'>+	struct wmi_mac_addr peer_macaddr;</div><div class='add'>+	u32 peer_ps_state;</div><div class='add'>+	u32 ps_supported_bitmap;</div><div class='add'>+	u32 peer_ps_valid;</div><div class='add'>+	u32 peer_ps_timestamp;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct ath11k_wmi_base {</div><div class='ctx'> 	struct ath11k_base *ab;</div><div class='ctx'> 	struct ath11k_pdev_wmi wmi[MAX_RADIOS];</div><div class='hunk'>@@ -5056,9 +5768,8 @@ struct ath11k_wmi_base {</div><div class='ctx'> </div><div class='ctx'> 	struct completion service_ready;</div><div class='ctx'> 	struct completion unified_ready;</div><div class='del'>-	DECLARE_BITMAP(svc_map, WMI_MAX_EXT_SERVICE);</div><div class='add'>+	DECLARE_BITMAP(svc_map, WMI_MAX_EXT2_SERVICE);</div><div class='ctx'> 	wait_queue_head_t tx_credits_wq;</div><div class='del'>-	const struct wmi_peer_flags_map *peer_flags;</div><div class='ctx'> 	u32 num_mem_chunks;</div><div class='ctx'> 	u32 rx_decap_mode;</div><div class='ctx'> 	struct wmi_host_mem_chunk mem_chunks[WMI_MAX_MEM_REQS];</div><div class='hunk'>@@ -5069,6 +5780,19 @@ struct ath11k_wmi_base {</div><div class='ctx'> 	struct ath11k_targ_cap *targ_cap;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Definition of HW data filtering */</div><div class='add'>+enum hw_data_filter_type {</div><div class='add'>+	WMI_HW_DATA_FILTER_DROP_NON_ARP_BC = BIT(0),</div><div class='add'>+	WMI_HW_DATA_FILTER_DROP_NON_ICMPV6_MC = BIT(1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_hw_data_filter_cmd {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 enable;</div><div class='add'>+	u32 hw_filter_bitmap;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> /* WOW structures */</div><div class='ctx'> enum wmi_wow_wakeup_event {</div><div class='ctx'> 	WOW_BMISS_EVENT = 0,</div><div class='hunk'>@@ -5213,6 +5937,45 @@ static inline const char *wow_reason(enum wmi_wow_wake_reason reason)</div><div class='ctx'> </div><div class='ctx'> #undef C2S</div><div class='ctx'> </div><div class='add'>+struct wmi_wow_ev_arg {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 flag;</div><div class='add'>+	enum wmi_wow_wake_reason wake_reason;</div><div class='add'>+	u32 data_len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_tlv_pattern_type {</div><div class='add'>+	WOW_PATTERN_MIN = 0,</div><div class='add'>+	WOW_BITMAP_PATTERN = WOW_PATTERN_MIN,</div><div class='add'>+	WOW_IPV4_SYNC_PATTERN,</div><div class='add'>+	WOW_IPV6_SYNC_PATTERN,</div><div class='add'>+	WOW_WILD_CARD_PATTERN,</div><div class='add'>+	WOW_TIMER_PATTERN,</div><div class='add'>+	WOW_MAGIC_PATTERN,</div><div class='add'>+	WOW_IPV6_RA_PATTERN,</div><div class='add'>+	WOW_IOAC_PKT_PATTERN,</div><div class='add'>+	WOW_IOAC_TMR_PATTERN,</div><div class='add'>+	WOW_PATTERN_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WOW_DEFAULT_BITMAP_PATTERN_SIZE		148</div><div class='add'>+#define WOW_DEFAULT_BITMASK_SIZE		148</div><div class='add'>+</div><div class='add'>+#define WOW_MIN_PATTERN_SIZE	1</div><div class='add'>+#define WOW_MAX_PATTERN_SIZE	148</div><div class='add'>+#define WOW_MAX_PKT_OFFSET	128</div><div class='add'>+#define WOW_HDR_LEN	(sizeof(struct ieee80211_hdr_3addr) + \</div><div class='add'>+	sizeof(struct rfc1042_hdr))</div><div class='add'>+#define WOW_MAX_REDUCE	(WOW_HDR_LEN - sizeof(struct ethhdr) - \</div><div class='add'>+	offsetof(struct ieee80211_hdr_3addr, addr1))</div><div class='add'>+</div><div class='add'>+struct wmi_wow_add_del_event_cmd {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 is_add;</div><div class='add'>+	u32 event_bitmap;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct wmi_wow_enable_cmd {</div><div class='ctx'> 	u32 tlv_header;</div><div class='ctx'> 	u32 enable;</div><div class='hunk'>@@ -5225,24 +5988,374 @@ struct wmi_wow_host_wakeup_ind {</div><div class='ctx'> 	u32 reserved;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct wmi_wow_ev_arg {</div><div class='add'>+struct wmi_tlv_wow_event_info {</div><div class='ctx'> 	u32 vdev_id;</div><div class='ctx'> 	u32 flag;</div><div class='del'>-	enum wmi_wow_wake_reason wake_reason;</div><div class='add'>+	u32 wake_reason;</div><div class='ctx'> 	u32 data_len;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_wow_bitmap_pattern {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u8 patternbuf[WOW_DEFAULT_BITMAP_PATTERN_SIZE];</div><div class='add'>+	u8 bitmaskbuf[WOW_DEFAULT_BITMASK_SIZE];</div><div class='add'>+	u32 pattern_offset;</div><div class='add'>+	u32 pattern_len;</div><div class='add'>+	u32 bitmask_len;</div><div class='add'>+	u32 pattern_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_wow_add_pattern_cmd {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 pattern_id;</div><div class='add'>+	u32 pattern_type;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_wow_del_pattern_cmd {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 pattern_id;</div><div class='add'>+	u32 pattern_type;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_PNO_MAX_SCHED_SCAN_PLANS      2</div><div class='add'>+#define WMI_PNO_MAX_SCHED_SCAN_PLAN_INT   7200</div><div class='add'>+#define WMI_PNO_MAX_SCHED_SCAN_PLAN_ITRNS 100</div><div class='add'>+#define WMI_PNO_MAX_NETW_CHANNELS         26</div><div class='add'>+#define WMI_PNO_MAX_NETW_CHANNELS_EX      60</div><div class='add'>+#define WMI_PNO_MAX_SUPP_NETWORKS         WLAN_SCAN_PARAMS_MAX_SSID</div><div class='add'>+#define WMI_PNO_MAX_IE_LENGTH             WLAN_SCAN_PARAMS_MAX_IE_LEN</div><div class='add'>+</div><div class='add'>+/* size based of dot11 declaration without extra IEs as we will not carry those for PNO */</div><div class='add'>+#define WMI_PNO_MAX_PB_REQ_SIZE    450</div><div class='add'>+</div><div class='add'>+#define WMI_PNO_24G_DEFAULT_CH     1</div><div class='add'>+#define WMI_PNO_5G_DEFAULT_CH      36</div><div class='add'>+</div><div class='add'>+#define WMI_ACTIVE_MAX_CHANNEL_TIME 40</div><div class='add'>+#define WMI_PASSIVE_MAX_CHANNEL_TIME   110</div><div class='add'>+</div><div class='add'>+/* SSID broadcast type */</div><div class='add'>+enum wmi_ssid_bcast_type {</div><div class='add'>+	BCAST_UNKNOWN      = 0,</div><div class='add'>+	BCAST_NORMAL       = 1,</div><div class='add'>+	BCAST_HIDDEN       = 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define WMI_NLO_MAX_SSIDS    16</div><div class='add'>+#define WMI_NLO_MAX_CHAN     48</div><div class='add'>+</div><div class='add'>+#define WMI_NLO_CONFIG_STOP                             BIT(0)</div><div class='add'>+#define WMI_NLO_CONFIG_START                            BIT(1)</div><div class='add'>+#define WMI_NLO_CONFIG_RESET                            BIT(2)</div><div class='add'>+#define WMI_NLO_CONFIG_SLOW_SCAN                        BIT(4)</div><div class='add'>+#define WMI_NLO_CONFIG_FAST_SCAN                        BIT(5)</div><div class='add'>+#define WMI_NLO_CONFIG_SSID_HIDE_EN                     BIT(6)</div><div class='add'>+</div><div class='add'>+/* This bit is used to indicate if EPNO or supplicant PNO is enabled.</div><div class='add'>+ * Only one of them can be enabled at a given time</div><div class='add'>+ */</div><div class='add'>+#define WMI_NLO_CONFIG_ENLO                             BIT(7)</div><div class='add'>+#define WMI_NLO_CONFIG_SCAN_PASSIVE                     BIT(8)</div><div class='add'>+#define WMI_NLO_CONFIG_ENLO_RESET                       BIT(9)</div><div class='add'>+#define WMI_NLO_CONFIG_SPOOFED_MAC_IN_PROBE_REQ         BIT(10)</div><div class='add'>+#define WMI_NLO_CONFIG_RANDOM_SEQ_NO_IN_PROBE_REQ       BIT(11)</div><div class='add'>+#define WMI_NLO_CONFIG_ENABLE_IE_WHITELIST_IN_PROBE_REQ BIT(12)</div><div class='add'>+#define WMI_NLO_CONFIG_ENABLE_CNLO_RSSI_CONFIG          BIT(13)</div><div class='add'>+</div><div class='add'>+struct wmi_nlo_ssid_param {</div><div class='add'>+	u32 valid;</div><div class='add'>+	struct wmi_ssid ssid;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_nlo_enc_param {</div><div class='add'>+	u32 valid;</div><div class='add'>+	u32 enc_type;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_nlo_auth_param {</div><div class='add'>+	u32 valid;</div><div class='add'>+	u32 auth_type;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_nlo_bcast_nw_param {</div><div class='add'>+	u32 valid;</div><div class='add'>+	u32 bcast_nw_type;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_nlo_rssi_param {</div><div class='add'>+	u32 valid;</div><div class='add'>+	s32 rssi;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct nlo_configured_parameters {</div><div class='add'>+	/* TLV tag and len;*/</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	struct wmi_nlo_ssid_param ssid;</div><div class='add'>+	struct wmi_nlo_enc_param enc_type;</div><div class='add'>+	struct wmi_nlo_auth_param auth_type;</div><div class='add'>+	struct wmi_nlo_rssi_param rssi_cond;</div><div class='add'>+</div><div class='add'>+	/* indicates if the SSID is hidden or not */</div><div class='add'>+	struct wmi_nlo_bcast_nw_param bcast_nw_type;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_network_type {</div><div class='add'>+	struct wmi_ssid ssid;</div><div class='add'>+	u32 authentication;</div><div class='add'>+	u32 encryption;</div><div class='add'>+	u32 bcast_nw_type;</div><div class='add'>+	u8 channel_count;</div><div class='add'>+	u16 channels[WMI_PNO_MAX_NETW_CHANNELS_EX];</div><div class='add'>+	s32 rssi_threshold;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_pno_scan_req {</div><div class='add'>+	u8 enable;</div><div class='add'>+	u8 vdev_id;</div><div class='add'>+	u8 uc_networks_count;</div><div class='add'>+	struct wmi_network_type a_networks[WMI_PNO_MAX_SUPP_NETWORKS];</div><div class='add'>+	u32 fast_scan_period;</div><div class='add'>+	u32 slow_scan_period;</div><div class='add'>+	u8 fast_scan_max_cycles;</div><div class='add'>+</div><div class='add'>+	bool do_passive_scan;</div><div class='add'>+</div><div class='add'>+	u32 delay_start_time;</div><div class='add'>+	u32 active_min_time;</div><div class='add'>+	u32 active_max_time;</div><div class='add'>+	u32 passive_min_time;</div><div class='add'>+	u32 passive_max_time;</div><div class='add'>+</div><div class='add'>+	/* mac address randomization attributes */</div><div class='add'>+	u32 enable_pno_scan_randomization;</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='add'>+	u8 mac_addr_mask[ETH_ALEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_wow_nlo_config_cmd {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 fast_scan_max_cycles;</div><div class='add'>+	u32 active_dwell_time;</div><div class='add'>+	u32 passive_dwell_time;</div><div class='add'>+	u32 probe_bundle_size;</div><div class='add'>+</div><div class='add'>+	/* ART = IRT */</div><div class='add'>+	u32 rest_time;</div><div class='add'>+</div><div class='add'>+	/* Max value that can be reached after SBM */</div><div class='add'>+	u32 max_rest_time;</div><div class='add'>+</div><div class='add'>+	/* SBM */</div><div class='add'>+	u32 scan_backoff_multiplier;</div><div class='add'>+</div><div class='add'>+	/* SCBM */</div><div class='add'>+	u32 fast_scan_period;</div><div class='add'>+</div><div class='add'>+	/* specific to windows */</div><div class='add'>+	u32 slow_scan_period;</div><div class='add'>+</div><div class='add'>+	u32 no_of_ssids;</div><div class='add'>+</div><div class='add'>+	u32 num_of_channels;</div><div class='add'>+</div><div class='add'>+	/* NLO scan start delay time in milliseconds */</div><div class='add'>+	u32 delay_start_time;</div><div class='add'>+</div><div class='add'>+	/* MAC Address to use in Probe Req as SA */</div><div class='add'>+	struct wmi_mac_addr mac_addr;</div><div class='add'>+</div><div class='add'>+	/* Mask on which MAC has to be randomized */</div><div class='add'>+	struct wmi_mac_addr mac_mask;</div><div class='add'>+</div><div class='add'>+	/* IE bitmap to use in Probe Req */</div><div class='add'>+	u32 ie_bitmap[8];</div><div class='add'>+</div><div class='add'>+	/* Number of vendor OUIs. In the TLV vendor_oui[] */</div><div class='add'>+	u32 num_vendor_oui;</div><div class='add'>+</div><div class='add'>+	/* Number of connected NLO band preferences */</div><div class='add'>+	u32 num_cnlo_band_pref;</div><div class='add'>+</div><div class='add'>+	/* The TLVs will follow.</div><div class='add'>+	 * nlo_configured_parameters nlo_list[];</div><div class='add'>+	 * u32 channel_list[num_of_channels];</div><div class='add'>+	 */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_MAX_NS_OFFLOADS           2</div><div class='add'>+#define WMI_MAX_ARP_OFFLOADS          2</div><div class='add'>+</div><div class='add'>+#define WMI_ARPOL_FLAGS_VALID              BIT(0)</div><div class='add'>+#define WMI_ARPOL_FLAGS_MAC_VALID          BIT(1)</div><div class='add'>+#define WMI_ARPOL_FLAGS_REMOTE_IP_VALID    BIT(2)</div><div class='add'>+</div><div class='add'>+struct wmi_arp_offload_tuple {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u8 target_ipaddr[4];</div><div class='add'>+	u8 remote_ipaddr[4];</div><div class='add'>+	struct wmi_mac_addr target_mac;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_NSOL_FLAGS_VALID               BIT(0)</div><div class='add'>+#define WMI_NSOL_FLAGS_MAC_VALID           BIT(1)</div><div class='add'>+#define WMI_NSOL_FLAGS_REMOTE_IP_VALID     BIT(2)</div><div class='add'>+#define WMI_NSOL_FLAGS_IS_IPV6_ANYCAST     BIT(3)</div><div class='add'>+</div><div class='add'>+#define WMI_NSOL_MAX_TARGET_IPS    2</div><div class='add'>+</div><div class='add'>+struct wmi_ns_offload_tuple {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u8 target_ipaddr[WMI_NSOL_MAX_TARGET_IPS][16];</div><div class='add'>+	u8 solicitation_ipaddr[16];</div><div class='add'>+	u8 remote_ipaddr[16];</div><div class='add'>+	struct wmi_mac_addr target_mac;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_set_arp_ns_offload_cmd {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 num_ns_ext_tuples;</div><div class='add'>+	/* The TLVs follow:</div><div class='add'>+	 * wmi_ns_offload_tuple  ns_tuples[WMI_MAX_NS_OFFLOADS];</div><div class='add'>+	 * wmi_arp_offload_tuple arp_tuples[WMI_MAX_ARP_OFFLOADS];</div><div class='add'>+	 * wmi_ns_offload_tuple  ns_ext_tuples[num_ns_ext_tuples];</div><div class='add'>+	 */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define GTK_OFFLOAD_OPCODE_MASK             0xFF000000</div><div class='add'>+#define GTK_OFFLOAD_ENABLE_OPCODE           0x01000000</div><div class='add'>+#define GTK_OFFLOAD_DISABLE_OPCODE          0x02000000</div><div class='add'>+#define GTK_OFFLOAD_REQUEST_STATUS_OPCODE   0x04000000</div><div class='add'>+</div><div class='add'>+#define GTK_OFFLOAD_KEK_BYTES       16</div><div class='add'>+#define GTK_OFFLOAD_KCK_BYTES       16</div><div class='add'>+#define GTK_REPLAY_COUNTER_BYTES    8</div><div class='add'>+#define WMI_MAX_KEY_LEN             32</div><div class='add'>+#define IGTK_PN_SIZE                6</div><div class='add'>+</div><div class='add'>+struct wmi_replayc_cnt {</div><div class='add'>+	union {</div><div class='add'>+		u8 counter[GTK_REPLAY_COUNTER_BYTES];</div><div class='add'>+		struct {</div><div class='add'>+			u32 word0;</div><div class='add'>+			u32 word1;</div><div class='add'>+		} __packed;</div><div class='add'>+	} __packed;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_gtk_offload_status_event {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u32 refresh_cnt;</div><div class='add'>+	struct wmi_replayc_cnt replay_ctr;</div><div class='add'>+	u8 igtk_key_index;</div><div class='add'>+	u8 igtk_key_length;</div><div class='add'>+	u8 igtk_key_rsc[IGTK_PN_SIZE];</div><div class='add'>+	u8 igtk_key[WMI_MAX_KEY_LEN];</div><div class='add'>+	u8 gtk_key_index;</div><div class='add'>+	u8 gtk_key_length;</div><div class='add'>+	u8 gtk_key_rsc[GTK_REPLAY_COUNTER_BYTES];</div><div class='add'>+	u8 gtk_key[WMI_MAX_KEY_LEN];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_gtk_rekey_offload_cmd {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u8 kek[GTK_OFFLOAD_KEK_BYTES];</div><div class='add'>+	u8 kck[GTK_OFFLOAD_KCK_BYTES];</div><div class='add'>+	u8 replay_ctr[GTK_REPLAY_COUNTER_BYTES];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define BIOS_SAR_TABLE_LEN	(22)</div><div class='add'>+#define BIOS_SAR_RSVD1_LEN	(6)</div><div class='add'>+#define BIOS_SAR_RSVD2_LEN	(18)</div><div class='add'>+</div><div class='add'>+struct wmi_pdev_set_sar_table_cmd {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+	u32 sar_len;</div><div class='add'>+	u32 rsvd_len;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_pdev_set_geo_table_cmd {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+	u32 rsvd_len;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_sta_keepalive_cmd {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 enabled;</div><div class='add'>+</div><div class='add'>+	/* WMI_STA_KEEPALIVE_METHOD_ */</div><div class='add'>+	u32 method;</div><div class='add'>+</div><div class='add'>+	/* in seconds */</div><div class='add'>+	u32 interval;</div><div class='add'>+</div><div class='add'>+	/* following this structure is the TLV for struct</div><div class='add'>+	 * wmi_sta_keepalive_arp_resp</div><div class='add'>+	 */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_sta_keepalive_arp_resp {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 src_ip4_addr;</div><div class='add'>+	u32 dest_ip4_addr;</div><div class='add'>+	struct wmi_mac_addr dest_mac_addr;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_sta_keepalive_arg {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 enabled;</div><div class='add'>+	u32 method;</div><div class='add'>+	u32 interval;</div><div class='add'>+	u32 src_ip4_addr;</div><div class='add'>+	u32 dest_ip4_addr;</div><div class='add'>+	const u8 dest_mac_addr[ETH_ALEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_sta_keepalive_method {</div><div class='add'>+	WMI_STA_KEEPALIVE_METHOD_NULL_FRAME = 1,</div><div class='add'>+	WMI_STA_KEEPALIVE_METHOD_UNSOLICITED_ARP_RESPONSE = 2,</div><div class='add'>+	WMI_STA_KEEPALIVE_METHOD_ETHERNET_LOOPBACK = 3,</div><div class='add'>+	WMI_STA_KEEPALIVE_METHOD_GRATUITOUS_ARP_REQUEST = 4,</div><div class='add'>+	WMI_STA_KEEPALIVE_METHOD_MGMT_VENDOR_ACTION = 5,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WMI_STA_KEEPALIVE_INTERVAL_DEFAULT	30</div><div class='add'>+#define WMI_STA_KEEPALIVE_INTERVAL_DISABLE	0</div><div class='add'>+</div><div class='add'>+enum wmi_wmm_params_type {</div><div class='add'>+	WMI_WMM_PARAM_TYPE_LEGACY = 0,</div><div class='add'>+	WMI_WMM_PARAM_TYPE_11AX_MU_EDCA = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const void **ath11k_wmi_tlv_parse_alloc(struct ath11k_base *ab,</div><div class='add'>+					struct sk_buff *skb, gfp_t gfp);</div><div class='ctx'> int ath11k_wmi_cmd_send(struct ath11k_pdev_wmi *wmi, struct sk_buff *skb,</div><div class='ctx'> 			u32 cmd_id);</div><div class='ctx'> struct sk_buff *ath11k_wmi_alloc_skb(struct ath11k_wmi_base *wmi_sc, u32 len);</div><div class='ctx'> int ath11k_wmi_mgmt_send(struct ath11k *ar, u32 vdev_id, u32 buf_id,</div><div class='ctx'> 			 struct sk_buff *frame);</div><div class='add'>+int ath11k_wmi_p2p_go_bcn_ie(struct ath11k *ar, u32 vdev_id,</div><div class='add'>+			     const u8 *p2p_ie);</div><div class='ctx'> int ath11k_wmi_bcn_tmpl(struct ath11k *ar, u32 vdev_id,</div><div class='ctx'> 			struct ieee80211_mutable_offsets *offs,</div><div class='del'>-			struct sk_buff *bcn);</div><div class='add'>+			struct sk_buff *bcn, u32 ema_param);</div><div class='ctx'> int ath11k_wmi_vdev_down(struct ath11k *ar, u8 vdev_id);</div><div class='ctx'> int ath11k_wmi_vdev_up(struct ath11k *ar, u32 vdev_id, u32 aid,</div><div class='del'>-		       const u8 *bssid);</div><div class='add'>+		       const u8 *bssid, u8 *tx_bssid, u32 nontx_profile_idx,</div><div class='add'>+		       u32 nontx_profile_cnt);</div><div class='ctx'> int ath11k_wmi_vdev_stop(struct ath11k *ar, u8 vdev_id);</div><div class='ctx'> int ath11k_wmi_vdev_start(struct ath11k *ar, struct wmi_vdev_start_req_arg *arg,</div><div class='ctx'> 			  bool restart);</div><div class='hunk'>@@ -5250,7 +6363,8 @@ int ath11k_wmi_set_peer_param(struct ath11k *ar, const u8 *peer_addr,</div><div class='ctx'> 			      u32 vdev_id, u32 param_id, u32 param_val);</div><div class='ctx'> int ath11k_wmi_pdev_set_param(struct ath11k *ar, u32 param_id,</div><div class='ctx'> 			      u32 param_value, u8 pdev_id);</div><div class='del'>-int ath11k_wmi_pdev_set_ps_mode(struct ath11k *ar, int vdev_id, u32 enable);</div><div class='add'>+int ath11k_wmi_pdev_set_ps_mode(struct ath11k *ar, int vdev_id,</div><div class='add'>+				enum wmi_sta_ps_mode psmode);</div><div class='ctx'> int ath11k_wmi_wait_for_unified_ready(struct ath11k_base *ab);</div><div class='ctx'> int ath11k_wmi_cmd_init(struct ath11k_base *ab);</div><div class='ctx'> int ath11k_wmi_wait_for_service_ready(struct ath11k_base *ab);</div><div class='hunk'>@@ -5282,7 +6396,8 @@ int ath11k_wmi_send_scan_start_cmd(struct ath11k *ar,</div><div class='ctx'> int ath11k_wmi_send_scan_stop_cmd(struct ath11k *ar,</div><div class='ctx'> 				  struct scan_cancel_param *param);</div><div class='ctx'> int ath11k_wmi_send_wmm_update_cmd_tlv(struct ath11k *ar, u32 vdev_id,</div><div class='del'>-				       struct wmi_wmm_params_all_arg *param);</div><div class='add'>+				       struct wmi_wmm_params_all_arg *param,</div><div class='add'>+				       enum wmi_wmm_params_type wmm_param_type);</div><div class='ctx'> int ath11k_wmi_pdev_suspend(struct ath11k *ar, u32 suspend_opt,</div><div class='ctx'> 			    u32 pdev_id);</div><div class='ctx'> int ath11k_wmi_pdev_resume(struct ath11k *ar, u32 pdev_id);</div><div class='hunk'>@@ -5314,9 +6429,16 @@ int ath11k_wmi_delba_send(struct ath11k *ar, u32 vdev_id, const u8 *mac,</div><div class='ctx'> 			  u32 tid, u32 initiator, u32 reason);</div><div class='ctx'> int ath11k_wmi_send_bcn_offload_control_cmd(struct ath11k *ar,</div><div class='ctx'> 					    u32 vdev_id, u32 bcn_ctrl_op);</div><div class='add'>+int ath11k_wmi_send_set_current_country_cmd(struct ath11k *ar,</div><div class='add'>+					    struct wmi_set_current_country_params *param);</div><div class='ctx'> int</div><div class='ctx'> ath11k_wmi_send_init_country_cmd(struct ath11k *ar,</div><div class='ctx'> 				 struct wmi_init_country_params init_cc_param);</div><div class='add'>+</div><div class='add'>+int ath11k_wmi_send_11d_scan_start_cmd(struct ath11k *ar,</div><div class='add'>+				       struct wmi_11d_scan_start_params *param);</div><div class='add'>+int ath11k_wmi_send_11d_scan_stop_cmd(struct ath11k *ar, u32 vdev_id);</div><div class='add'>+</div><div class='ctx'> int</div><div class='ctx'> ath11k_wmi_send_thermal_mitigation_param_cmd(struct ath11k *ar,</div><div class='ctx'> 					     struct thermal_mitigation_params *param);</div><div class='hunk'>@@ -5330,15 +6452,22 @@ int ath11k_wmi_send_pdev_set_regdomain(struct ath11k *ar,</div><div class='ctx'> 				       struct pdev_set_regdomain_params *param);</div><div class='ctx'> int ath11k_wmi_pull_fw_stats(struct ath11k_base *ab, struct sk_buff *skb,</div><div class='ctx'> 			     struct ath11k_fw_stats *stats);</div><div class='del'>-size_t ath11k_wmi_fw_stats_num_peers(struct list_head *head);</div><div class='del'>-size_t ath11k_wmi_fw_stats_num_peers_extd(struct list_head *head);</div><div class='del'>-size_t ath11k_wmi_fw_stats_num_vdevs(struct list_head *head);</div><div class='ctx'> void ath11k_wmi_fw_stats_fill(struct ath11k *ar,</div><div class='ctx'> 			      struct ath11k_fw_stats *fw_stats, u32 stats_id,</div><div class='ctx'> 			      char *buf);</div><div class='ctx'> int ath11k_wmi_simulate_radar(struct ath11k *ar);</div><div class='del'>-int ath11k_wmi_send_twt_enable_cmd(struct ath11k *ar, u32 pdev_id);</div><div class='add'>+void ath11k_wmi_fill_default_twt_params(struct wmi_twt_enable_params *twt_params);</div><div class='add'>+int ath11k_wmi_send_twt_enable_cmd(struct ath11k *ar, u32 pdev_id,</div><div class='add'>+				   struct wmi_twt_enable_params *params);</div><div class='ctx'> int ath11k_wmi_send_twt_disable_cmd(struct ath11k *ar, u32 pdev_id);</div><div class='add'>+int ath11k_wmi_send_twt_add_dialog_cmd(struct ath11k *ar,</div><div class='add'>+				       struct wmi_twt_add_dialog_params *params);</div><div class='add'>+int ath11k_wmi_send_twt_del_dialog_cmd(struct ath11k *ar,</div><div class='add'>+				       struct wmi_twt_del_dialog_params *params);</div><div class='add'>+int ath11k_wmi_send_twt_pause_dialog_cmd(struct ath11k *ar,</div><div class='add'>+					 struct wmi_twt_pause_dialog_params *params);</div><div class='add'>+int ath11k_wmi_send_twt_resume_dialog_cmd(struct ath11k *ar,</div><div class='add'>+					  struct wmi_twt_resume_dialog_params *params);</div><div class='ctx'> int ath11k_wmi_send_obss_spr_cmd(struct ath11k *ar, u32 vdev_id,</div><div class='ctx'> 				 struct ieee80211_he_obss_pd *he_obss_pd);</div><div class='ctx'> int ath11k_wmi_pdev_set_srg_bss_color_bitmap(struct ath11k *ar, u32 *bitmap);</div><div class='hunk'>@@ -5373,5 +6502,34 @@ int ath11k_wmi_set_hw_mode(struct ath11k_base *ab,</div><div class='ctx'> 			   enum wmi_host_hw_mode_config_type mode);</div><div class='ctx'> int ath11k_wmi_wow_host_wakeup_ind(struct ath11k *ar);</div><div class='ctx'> int ath11k_wmi_wow_enable(struct ath11k *ar);</div><div class='add'>+int ath11k_wmi_scan_prob_req_oui(struct ath11k *ar,</div><div class='add'>+				 const u8 mac_addr[ETH_ALEN]);</div><div class='add'>+int ath11k_wmi_fw_dbglog_cfg(struct ath11k *ar, u32 *module_id_bitmap,</div><div class='add'>+			     struct ath11k_fw_dbglog *dbglog);</div><div class='add'>+int ath11k_wmi_wow_config_pno(struct ath11k *ar, u32 vdev_id,</div><div class='add'>+			      struct wmi_pno_scan_req  *pno_scan);</div><div class='add'>+int ath11k_wmi_wow_del_pattern(struct ath11k *ar, u32 vdev_id, u32 pattern_id);</div><div class='add'>+int ath11k_wmi_wow_add_pattern(struct ath11k *ar, u32 vdev_id, u32 pattern_id,</div><div class='add'>+			       const u8 *pattern, const u8 *mask,</div><div class='add'>+			       int pattern_len, int pattern_offset);</div><div class='add'>+int ath11k_wmi_wow_add_wakeup_event(struct ath11k *ar, u32 vdev_id,</div><div class='add'>+				    enum wmi_wow_wakeup_event event,</div><div class='add'>+				    u32 enable);</div><div class='add'>+int ath11k_wmi_hw_data_filter_cmd(struct ath11k *ar, u32 vdev_id,</div><div class='add'>+				  u32 filter_bitmap, bool enable);</div><div class='add'>+int ath11k_wmi_arp_ns_offload(struct ath11k *ar,</div><div class='add'>+			      struct ath11k_vif *arvif, bool enable);</div><div class='add'>+int ath11k_wmi_gtk_rekey_offload(struct ath11k *ar,</div><div class='add'>+				 struct ath11k_vif *arvif, bool enable);</div><div class='add'>+int ath11k_wmi_gtk_rekey_getinfo(struct ath11k *ar,</div><div class='add'>+				 struct ath11k_vif *arvif);</div><div class='add'>+int ath11k_wmi_pdev_set_bios_sar_table_param(struct ath11k *ar, const u8 *sar_val);</div><div class='add'>+int ath11k_wmi_pdev_set_bios_geo_table_param(struct ath11k *ar);</div><div class='add'>+int ath11k_wmi_sta_keepalive(struct ath11k *ar,</div><div class='add'>+			     const struct wmi_sta_keepalive_arg *arg);</div><div class='add'>+bool ath11k_wmi_supports_6ghz_cc_ext(struct ath11k *ar);</div><div class='add'>+int ath11k_wmi_send_vdev_set_tpc_power(struct ath11k *ar,</div><div class='add'>+				       u32 vdev_id,</div><div class='add'>+				       struct ath11k_reg_tpc_power_info *param);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/wow.c b/drivers/net/wireless/ath/ath11k/wow.c<br/>index 43c62e99dd0e..b6f08755129f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/wow.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/wow.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/wow.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/wow.c</a></div><div class='hunk'>@@ -1,16 +1,30 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mac.h"</div><div class='add'>+</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "hif.h"</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> #include "wmi.h"</div><div class='ctx'> #include "wow.h"</div><div class='add'>+#include "dp_rx.h"</div><div class='add'>+</div><div class='add'>+static const struct wiphy_wowlan_support ath11k_wowlan_support = {</div><div class='add'>+	.flags = WIPHY_WOWLAN_DISCONNECT |</div><div class='add'>+		 WIPHY_WOWLAN_MAGIC_PKT |</div><div class='add'>+		 WIPHY_WOWLAN_SUPPORTS_GTK_REKEY |</div><div class='add'>+		 WIPHY_WOWLAN_GTK_REKEY_FAILURE,</div><div class='add'>+	.pattern_min_len = WOW_MIN_PATTERN_SIZE,</div><div class='add'>+	.pattern_max_len = WOW_MAX_PATTERN_SIZE,</div><div class='add'>+	.max_pkt_offset = WOW_MAX_PKT_OFFSET,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> int ath11k_wow_enable(struct ath11k_base *ab)</div><div class='ctx'> {</div><div class='hunk'>@@ -54,6 +68,13 @@ int ath11k_wow_wakeup(struct ath11k_base *ab)</div><div class='ctx'> 	struct ath11k *ar = ath11k_ab_to_ar(ab, 0);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	/* In the case of WCN6750, WoW wakeup is done</div><div class='add'>+	 * by sending SMP2P power save exit message</div><div class='add'>+	 * to the target processor.</div><div class='add'>+	 */</div><div class='add'>+	if (ab-&gt;hw_params.smp2p_wow_exit)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	reinit_completion(&amp;ab-&gt;wow.wakeup_completed);</div><div class='ctx'> </div><div class='ctx'> 	ret = ath11k_wmi_wow_host_wakeup_ind(ar);</div><div class='hunk'>@@ -71,3 +92,792 @@ int ath11k_wow_wakeup(struct ath11k_base *ab)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int ath11k_wow_vif_cleanup(struct ath11k_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = arvif-&gt;ar;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WOW_EVENT_MAX; i++) {</div><div class='add'>+		ret = ath11k_wmi_wow_add_wakeup_event(ar, arvif-&gt;vdev_id, i, 0);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to issue wow wakeup for event %s on vdev %i: %d\n",</div><div class='add'>+				    wow_wakeup_event(i), arvif-&gt;vdev_id, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ar-&gt;wow.max_num_patterns; i++) {</div><div class='add'>+		ret = ath11k_wmi_wow_del_pattern(ar, arvif-&gt;vdev_id, i);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to delete wow pattern %d for vdev %i: %d\n",</div><div class='add'>+				    i, arvif-&gt;vdev_id, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_wow_cleanup(struct ath11k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_vif *arvif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+		ret = ath11k_wow_vif_cleanup(arvif);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to clean wow wakeups on vdev %i: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Convert a 802.3 format to a 802.11 format.</div><div class='add'>+ *         +------------+-----------+--------+----------------+</div><div class='add'>+ * 802.3:  |dest mac(6B)|src mac(6B)|type(2B)|     body...    |</div><div class='add'>+ *         +------------+-----------+--------+----------------+</div><div class='add'>+ *                |__         |_______    |____________  |________</div><div class='add'>+ *                   |                |                |          |</div><div class='add'>+ *         +--+------------+----+-----------+---------------+-----------+</div><div class='add'>+ * 802.11: |4B|dest mac(6B)| 6B |src mac(6B)|  8B  |type(2B)|  body...  |</div><div class='add'>+ *         +--+------------+----+-----------+---------------+-----------+</div><div class='add'>+ */</div><div class='add'>+/* clang stack usage explodes if this is inlined */</div><div class='add'>+static noinline_for_stack</div><div class='add'>+void ath11k_wow_convert_8023_to_80211(struct cfg80211_pkt_pattern *new,</div><div class='add'>+				      const struct cfg80211_pkt_pattern *old)</div><div class='add'>+{</div><div class='add'>+	u8 hdr_8023_pattern[ETH_HLEN] = {};</div><div class='add'>+	u8 hdr_8023_bit_mask[ETH_HLEN] = {};</div><div class='add'>+	u8 hdr_80211_pattern[WOW_HDR_LEN] = {};</div><div class='add'>+	u8 hdr_80211_bit_mask[WOW_HDR_LEN] = {};</div><div class='add'>+	u8 bytemask[WOW_MAX_PATTERN_SIZE] = {};</div><div class='add'>+</div><div class='add'>+	int total_len = old-&gt;pkt_offset + old-&gt;pattern_len;</div><div class='add'>+	int hdr_80211_end_offset;</div><div class='add'>+</div><div class='add'>+	struct ieee80211_hdr_3addr *new_hdr_pattern =</div><div class='add'>+		(struct ieee80211_hdr_3addr *)hdr_80211_pattern;</div><div class='add'>+	struct ieee80211_hdr_3addr *new_hdr_mask =</div><div class='add'>+		(struct ieee80211_hdr_3addr *)hdr_80211_bit_mask;</div><div class='add'>+	struct ethhdr *old_hdr_pattern = (struct ethhdr *)hdr_8023_pattern;</div><div class='add'>+	struct ethhdr *old_hdr_mask = (struct ethhdr *)hdr_8023_bit_mask;</div><div class='add'>+	int hdr_len = sizeof(*new_hdr_pattern);</div><div class='add'>+</div><div class='add'>+	struct rfc1042_hdr *new_rfc_pattern =</div><div class='add'>+		(struct rfc1042_hdr *)(hdr_80211_pattern + hdr_len);</div><div class='add'>+	struct rfc1042_hdr *new_rfc_mask =</div><div class='add'>+		(struct rfc1042_hdr *)(hdr_80211_bit_mask + hdr_len);</div><div class='add'>+	int rfc_len = sizeof(*new_rfc_pattern);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* convert bitmask to bytemask */</div><div class='add'>+	for (i = 0; i &lt; old-&gt;pattern_len; i++)</div><div class='add'>+		if (old-&gt;mask[i / 8] &amp; BIT(i % 8))</div><div class='add'>+			bytemask[i] = 0xff;</div><div class='add'>+</div><div class='add'>+	memcpy(hdr_8023_pattern + old-&gt;pkt_offset,</div><div class='add'>+	       old-&gt;pattern, ETH_HLEN - old-&gt;pkt_offset);</div><div class='add'>+	memcpy(hdr_8023_bit_mask + old-&gt;pkt_offset,</div><div class='add'>+	       bytemask, ETH_HLEN - old-&gt;pkt_offset);</div><div class='add'>+</div><div class='add'>+	/* Copy destination address */</div><div class='add'>+	memcpy(new_hdr_pattern-&gt;addr1, old_hdr_pattern-&gt;h_dest, ETH_ALEN);</div><div class='add'>+	memcpy(new_hdr_mask-&gt;addr1, old_hdr_mask-&gt;h_dest, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	/* Copy source address */</div><div class='add'>+	memcpy(new_hdr_pattern-&gt;addr3, old_hdr_pattern-&gt;h_source, ETH_ALEN);</div><div class='add'>+	memcpy(new_hdr_mask-&gt;addr3, old_hdr_mask-&gt;h_source, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	/* Copy logic link type */</div><div class='add'>+	memcpy(&amp;new_rfc_pattern-&gt;snap_type,</div><div class='add'>+	       &amp;old_hdr_pattern-&gt;h_proto,</div><div class='add'>+	       sizeof(old_hdr_pattern-&gt;h_proto));</div><div class='add'>+	memcpy(&amp;new_rfc_mask-&gt;snap_type,</div><div class='add'>+	       &amp;old_hdr_mask-&gt;h_proto,</div><div class='add'>+	       sizeof(old_hdr_mask-&gt;h_proto));</div><div class='add'>+</div><div class='add'>+	/* Compute new pkt_offset */</div><div class='add'>+	if (old-&gt;pkt_offset &lt; ETH_ALEN)</div><div class='add'>+		new-&gt;pkt_offset = old-&gt;pkt_offset +</div><div class='add'>+			offsetof(struct ieee80211_hdr_3addr, addr1);</div><div class='add'>+	else if (old-&gt;pkt_offset &lt; offsetof(struct ethhdr, h_proto))</div><div class='add'>+		new-&gt;pkt_offset = old-&gt;pkt_offset +</div><div class='add'>+			offsetof(struct ieee80211_hdr_3addr, addr3) -</div><div class='add'>+			offsetof(struct ethhdr, h_source);</div><div class='add'>+	else</div><div class='add'>+		new-&gt;pkt_offset = old-&gt;pkt_offset + hdr_len + rfc_len - ETH_HLEN;</div><div class='add'>+</div><div class='add'>+	/* Compute new hdr end offset */</div><div class='add'>+	if (total_len &gt; ETH_HLEN)</div><div class='add'>+		hdr_80211_end_offset = hdr_len + rfc_len;</div><div class='add'>+	else if (total_len &gt; offsetof(struct ethhdr, h_proto))</div><div class='add'>+		hdr_80211_end_offset = hdr_len + rfc_len + total_len - ETH_HLEN;</div><div class='add'>+	else if (total_len &gt; ETH_ALEN)</div><div class='add'>+		hdr_80211_end_offset = total_len - ETH_ALEN +</div><div class='add'>+			offsetof(struct ieee80211_hdr_3addr, addr3);</div><div class='add'>+	else</div><div class='add'>+		hdr_80211_end_offset = total_len +</div><div class='add'>+			offsetof(struct ieee80211_hdr_3addr, addr1);</div><div class='add'>+</div><div class='add'>+	new-&gt;pattern_len = hdr_80211_end_offset - new-&gt;pkt_offset;</div><div class='add'>+</div><div class='add'>+	memcpy((u8 *)new-&gt;pattern,</div><div class='add'>+	       hdr_80211_pattern + new-&gt;pkt_offset,</div><div class='add'>+	       new-&gt;pattern_len);</div><div class='add'>+	memcpy((u8 *)new-&gt;mask,</div><div class='add'>+	       hdr_80211_bit_mask + new-&gt;pkt_offset,</div><div class='add'>+	       new-&gt;pattern_len);</div><div class='add'>+</div><div class='add'>+	if (total_len &gt; ETH_HLEN) {</div><div class='add'>+		/* Copy frame body */</div><div class='add'>+		memcpy((u8 *)new-&gt;pattern + new-&gt;pattern_len,</div><div class='add'>+		       (void *)old-&gt;pattern + ETH_HLEN - old-&gt;pkt_offset,</div><div class='add'>+		       total_len - ETH_HLEN);</div><div class='add'>+		memcpy((u8 *)new-&gt;mask + new-&gt;pattern_len,</div><div class='add'>+		       bytemask + ETH_HLEN - old-&gt;pkt_offset,</div><div class='add'>+		       total_len - ETH_HLEN);</div><div class='add'>+</div><div class='add'>+		new-&gt;pattern_len += total_len - ETH_HLEN;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_wmi_pno_check_and_convert(struct ath11k *ar, u32 vdev_id,</div><div class='add'>+					    struct cfg80211_sched_scan_request *nd_config,</div><div class='add'>+					    struct wmi_pno_scan_req *pno)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+	u8 ssid_len;</div><div class='add'>+</div><div class='add'>+	pno-&gt;enable = 1;</div><div class='add'>+	pno-&gt;vdev_id = vdev_id;</div><div class='add'>+	pno-&gt;uc_networks_count = nd_config-&gt;n_match_sets;</div><div class='add'>+</div><div class='add'>+	if (!pno-&gt;uc_networks_count ||</div><div class='add'>+	    pno-&gt;uc_networks_count &gt; WMI_PNO_MAX_SUPP_NETWORKS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (nd_config-&gt;n_channels &gt; WMI_PNO_MAX_NETW_CHANNELS_EX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Filling per profile params */</div><div class='add'>+	for (i = 0; i &lt; pno-&gt;uc_networks_count; i++) {</div><div class='add'>+		ssid_len = nd_config-&gt;match_sets[i].ssid.ssid_len;</div><div class='add'>+</div><div class='add'>+		if (ssid_len == 0 || ssid_len &gt; 32)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		pno-&gt;a_networks[i].ssid.ssid_len = ssid_len;</div><div class='add'>+</div><div class='add'>+		memcpy(pno-&gt;a_networks[i].ssid.ssid,</div><div class='add'>+		       nd_config-&gt;match_sets[i].ssid.ssid,</div><div class='add'>+		       nd_config-&gt;match_sets[i].ssid.ssid_len);</div><div class='add'>+		pno-&gt;a_networks[i].authentication = 0;</div><div class='add'>+		pno-&gt;a_networks[i].encryption     = 0;</div><div class='add'>+		pno-&gt;a_networks[i].bcast_nw_type  = 0;</div><div class='add'>+</div><div class='add'>+		/* Copying list of valid channel into request */</div><div class='add'>+		pno-&gt;a_networks[i].channel_count = nd_config-&gt;n_channels;</div><div class='add'>+		pno-&gt;a_networks[i].rssi_threshold = nd_config-&gt;match_sets[i].rssi_thold;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; nd_config-&gt;n_channels; j++) {</div><div class='add'>+			pno-&gt;a_networks[i].channels[j] =</div><div class='add'>+					nd_config-&gt;channels[j]-&gt;center_freq;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set scan to passive if no SSIDs are specified in the request */</div><div class='add'>+	if (nd_config-&gt;n_ssids == 0)</div><div class='add'>+		pno-&gt;do_passive_scan = true;</div><div class='add'>+	else</div><div class='add'>+		pno-&gt;do_passive_scan = false;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nd_config-&gt;n_ssids; i++) {</div><div class='add'>+		j = 0;</div><div class='add'>+		while (j &lt; pno-&gt;uc_networks_count) {</div><div class='add'>+			if (pno-&gt;a_networks[j].ssid.ssid_len ==</div><div class='add'>+				nd_config-&gt;ssids[i].ssid_len &amp;&amp;</div><div class='add'>+			(memcmp(pno-&gt;a_networks[j].ssid.ssid,</div><div class='add'>+				nd_config-&gt;ssids[i].ssid,</div><div class='add'>+				pno-&gt;a_networks[j].ssid.ssid_len) == 0)) {</div><div class='add'>+				pno-&gt;a_networks[j].bcast_nw_type = BCAST_HIDDEN;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			j++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nd_config-&gt;n_scan_plans == 2) {</div><div class='add'>+		pno-&gt;fast_scan_period = nd_config-&gt;scan_plans[0].interval * MSEC_PER_SEC;</div><div class='add'>+		pno-&gt;fast_scan_max_cycles = nd_config-&gt;scan_plans[0].iterations;</div><div class='add'>+		pno-&gt;slow_scan_period =</div><div class='add'>+			nd_config-&gt;scan_plans[1].interval * MSEC_PER_SEC;</div><div class='add'>+	} else if (nd_config-&gt;n_scan_plans == 1) {</div><div class='add'>+		pno-&gt;fast_scan_period = nd_config-&gt;scan_plans[0].interval * MSEC_PER_SEC;</div><div class='add'>+		pno-&gt;fast_scan_max_cycles = 1;</div><div class='add'>+		pno-&gt;slow_scan_period = nd_config-&gt;scan_plans[0].interval * MSEC_PER_SEC;</div><div class='add'>+	} else {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "Invalid number of scan plans %d !!",</div><div class='add'>+			    nd_config-&gt;n_scan_plans);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nd_config-&gt;flags &amp; NL80211_SCAN_FLAG_RANDOM_ADDR) {</div><div class='add'>+		/* enable mac randomization */</div><div class='add'>+		pno-&gt;enable_pno_scan_randomization = 1;</div><div class='add'>+		memcpy(pno-&gt;mac_addr, nd_config-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+		memcpy(pno-&gt;mac_addr_mask, nd_config-&gt;mac_addr_mask, ETH_ALEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pno-&gt;delay_start_time = nd_config-&gt;delay;</div><div class='add'>+</div><div class='add'>+	/* Current FW does not support min-max range for dwell time */</div><div class='add'>+	pno-&gt;active_max_time = WMI_ACTIVE_MAX_CHANNEL_TIME;</div><div class='add'>+	pno-&gt;passive_max_time = WMI_PASSIVE_MAX_CHANNEL_TIME;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_vif_wow_set_wakeups(struct ath11k_vif *arvif,</div><div class='add'>+				      struct cfg80211_wowlan *wowlan)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+	unsigned long wow_mask = 0;</div><div class='add'>+	struct ath11k *ar = arvif-&gt;ar;</div><div class='add'>+	const struct cfg80211_pkt_pattern *patterns = wowlan-&gt;patterns;</div><div class='add'>+	int pattern_id = 0;</div><div class='add'>+</div><div class='add'>+	/* Setup requested WOW features */</div><div class='add'>+	switch (arvif-&gt;vdev_type) {</div><div class='add'>+	case WMI_VDEV_TYPE_IBSS:</div><div class='add'>+		__set_bit(WOW_BEACON_EVENT, &amp;wow_mask);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case WMI_VDEV_TYPE_AP:</div><div class='add'>+		__set_bit(WOW_DEAUTH_RECVD_EVENT, &amp;wow_mask);</div><div class='add'>+		__set_bit(WOW_DISASSOC_RECVD_EVENT, &amp;wow_mask);</div><div class='add'>+		__set_bit(WOW_PROBE_REQ_WPS_IE_EVENT, &amp;wow_mask);</div><div class='add'>+		__set_bit(WOW_AUTH_REQ_EVENT, &amp;wow_mask);</div><div class='add'>+		__set_bit(WOW_ASSOC_REQ_EVENT, &amp;wow_mask);</div><div class='add'>+		__set_bit(WOW_HTT_EVENT, &amp;wow_mask);</div><div class='add'>+		__set_bit(WOW_RA_MATCH_EVENT, &amp;wow_mask);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_VDEV_TYPE_STA:</div><div class='add'>+		if (wowlan-&gt;disconnect) {</div><div class='add'>+			__set_bit(WOW_DEAUTH_RECVD_EVENT, &amp;wow_mask);</div><div class='add'>+			__set_bit(WOW_DISASSOC_RECVD_EVENT, &amp;wow_mask);</div><div class='add'>+			__set_bit(WOW_BMISS_EVENT, &amp;wow_mask);</div><div class='add'>+			__set_bit(WOW_CSA_IE_EVENT, &amp;wow_mask);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (wowlan-&gt;magic_pkt)</div><div class='add'>+			__set_bit(WOW_MAGIC_PKT_RECVD_EVENT, &amp;wow_mask);</div><div class='add'>+</div><div class='add'>+		if (wowlan-&gt;nd_config) {</div><div class='add'>+			struct wmi_pno_scan_req *pno;</div><div class='add'>+			int ret;</div><div class='add'>+</div><div class='add'>+			pno = kzalloc(sizeof(*pno), GFP_KERNEL);</div><div class='add'>+			if (!pno)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+</div><div class='add'>+			ar-&gt;nlo_enabled = true;</div><div class='add'>+</div><div class='add'>+			ret = ath11k_wmi_pno_check_and_convert(ar, arvif-&gt;vdev_id,</div><div class='add'>+							       wowlan-&gt;nd_config, pno);</div><div class='add'>+			if (!ret) {</div><div class='add'>+				ath11k_wmi_wow_config_pno(ar, arvif-&gt;vdev_id, pno);</div><div class='add'>+				__set_bit(WOW_NLO_DETECTED_EVENT, &amp;wow_mask);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			kfree(pno);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; wowlan-&gt;n_patterns; i++) {</div><div class='add'>+		u8 ath_pattern[WOW_MAX_PATTERN_SIZE] = {};</div><div class='add'>+		u8 ath_bitmask[WOW_MAX_PATTERN_SIZE] = {};</div><div class='add'>+		struct cfg80211_pkt_pattern new_pattern = {};</div><div class='add'>+</div><div class='add'>+		new_pattern.pattern = ath_pattern;</div><div class='add'>+		new_pattern.mask = ath_bitmask;</div><div class='add'>+		if (patterns[i].pattern_len &gt; WOW_MAX_PATTERN_SIZE)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (ar-&gt;wmi-&gt;wmi_ab-&gt;wlan_resource_config.rx_decap_mode ==</div><div class='add'>+		    ATH11K_HW_TXRX_NATIVE_WIFI) {</div><div class='add'>+			if (patterns[i].pkt_offset &lt; ETH_HLEN) {</div><div class='add'>+				ath11k_wow_convert_8023_to_80211(&amp;new_pattern,</div><div class='add'>+								 &amp;patterns[i]);</div><div class='add'>+			} else {</div><div class='add'>+				int j;</div><div class='add'>+</div><div class='add'>+				new_pattern = patterns[i];</div><div class='add'>+				new_pattern.mask = ath_bitmask;</div><div class='add'>+</div><div class='add'>+				/* convert bitmask to bytemask */</div><div class='add'>+				for (j = 0; j &lt; patterns[i].pattern_len; j++)</div><div class='add'>+					if (patterns[i].mask[j / 8] &amp; BIT(j % 8))</div><div class='add'>+						ath_bitmask[j] = 0xff;</div><div class='add'>+</div><div class='add'>+				new_pattern.pkt_offset += WOW_HDR_LEN - ETH_HLEN;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(new_pattern.pattern_len &gt; WOW_MAX_PATTERN_SIZE))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		ret = ath11k_wmi_wow_add_pattern(ar, arvif-&gt;vdev_id,</div><div class='add'>+						 pattern_id,</div><div class='add'>+						 new_pattern.pattern,</div><div class='add'>+						 new_pattern.mask,</div><div class='add'>+						 new_pattern.pattern_len,</div><div class='add'>+						 new_pattern.pkt_offset);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to add pattern %i to vdev %i: %d\n",</div><div class='add'>+				    pattern_id,</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pattern_id++;</div><div class='add'>+		__set_bit(WOW_PATTERN_MATCH_EVENT, &amp;wow_mask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WOW_EVENT_MAX; i++) {</div><div class='add'>+		if (!test_bit(i, &amp;wow_mask))</div><div class='add'>+			continue;</div><div class='add'>+		ret = ath11k_wmi_wow_add_wakeup_event(ar, arvif-&gt;vdev_id, i, 1);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to enable wakeup event %s on vdev %i: %d\n",</div><div class='add'>+				    wow_wakeup_event(i), arvif-&gt;vdev_id, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_wow_set_wakeups(struct ath11k *ar,</div><div class='add'>+				  struct cfg80211_wowlan *wowlan)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_vif *arvif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+		ret = ath11k_vif_wow_set_wakeups(arvif, wowlan);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to set wow wakeups on vdev %i: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_vif_wow_clean_nlo(struct ath11k_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct ath11k *ar = arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	switch (arvif-&gt;vdev_type) {</div><div class='add'>+	case WMI_VDEV_TYPE_STA:</div><div class='add'>+		if (ar-&gt;nlo_enabled) {</div><div class='add'>+			struct wmi_pno_scan_req *pno;</div><div class='add'>+</div><div class='add'>+			pno = kzalloc(sizeof(*pno), GFP_KERNEL);</div><div class='add'>+			if (!pno)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+</div><div class='add'>+			pno-&gt;enable = 0;</div><div class='add'>+			ar-&gt;nlo_enabled = false;</div><div class='add'>+			ret = ath11k_wmi_wow_config_pno(ar, arvif-&gt;vdev_id, pno);</div><div class='add'>+			kfree(pno);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_wow_nlo_cleanup(struct ath11k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_vif *arvif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+		ret = ath11k_vif_wow_clean_nlo(arvif);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to clean nlo settings on vdev %i: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_wow_set_hw_filter(struct ath11k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_vif *arvif;</div><div class='add'>+	u32 bitmap;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+		bitmap = WMI_HW_DATA_FILTER_DROP_NON_ICMPV6_MC |</div><div class='add'>+			WMI_HW_DATA_FILTER_DROP_NON_ARP_BC;</div><div class='add'>+		ret = ath11k_wmi_hw_data_filter_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+						    bitmap,</div><div class='add'>+						    true);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to set hw data filter on vdev %i: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_wow_clear_hw_filter(struct ath11k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_vif *arvif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+		ret = ath11k_wmi_hw_data_filter_cmd(ar, arvif-&gt;vdev_id, 0, false);</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to clear hw data filter on vdev %i: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_wow_arp_ns_offload(struct ath11k *ar, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_vif *arvif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+		if (arvif-&gt;vdev_type != WMI_VDEV_TYPE_STA)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = ath11k_wmi_arp_ns_offload(ar, arvif, enable);</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to set arp ns offload vdev %i: enable %d, ret %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, enable, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_gtk_rekey_offload(struct ath11k *ar, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_vif *arvif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+		if (arvif-&gt;vdev_type != WMI_VDEV_TYPE_STA ||</div><div class='add'>+		    !arvif-&gt;is_up ||</div><div class='add'>+		    !arvif-&gt;rekey_data.enable_offload)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* get rekey info before disable rekey offload */</div><div class='add'>+		if (!enable) {</div><div class='add'>+			ret = ath11k_wmi_gtk_rekey_getinfo(ar, arvif);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath11k_warn(ar-&gt;ab, "failed to request rekey info vdev %i, ret %d\n",</div><div class='add'>+					    arvif-&gt;vdev_id, ret);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ath11k_wmi_gtk_rekey_offload(ar, arvif, enable);</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "failed to offload gtk reky vdev %i: enable %d, ret %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, enable, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_wow_protocol_offload(struct ath11k *ar, bool enable)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wow_arp_ns_offload(ar, enable);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to offload ARP and NS %d %d\n",</div><div class='add'>+			    enable, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_gtk_rekey_offload(ar, enable);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to offload gtk rekey %d %d\n",</div><div class='add'>+			    enable, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath11k_wow_set_keepalive(struct ath11k *ar,</div><div class='add'>+				    enum wmi_sta_keepalive_method method,</div><div class='add'>+				    u32 interval)</div><div class='add'>+{</div><div class='add'>+	struct ath11k_vif *arvif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+		ret = ath11k_mac_vif_set_keepalive(arvif, method, interval);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_wow_op_suspend(struct ieee80211_hw *hw,</div><div class='add'>+			  struct cfg80211_wowlan *wowlan)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = hw-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath11k_mac_wait_tx_complete(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to wait tx complete: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	ret = ath11k_dp_rx_pktlog_stop(ar-&gt;ab, true);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to stop dp rx (and timer) pktlog during wow suspend: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret =  ath11k_wow_cleanup(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to clear wow wakeup events: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wow_set_wakeups(ar, wowlan);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to set wow wakeup events: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wow_protocol_offload(ar, true);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to set wow protocol offload events: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wow_set_hw_filter(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to set hw filter: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wow_set_keepalive(ar,</div><div class='add'>+				       WMI_STA_KEEPALIVE_METHOD_NULL_FRAME,</div><div class='add'>+				       WMI_STA_KEEPALIVE_INTERVAL_DEFAULT);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to enable wow keepalive: %d\n", ret);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wow_enable(ar-&gt;ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to start wow: %d\n", ret);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_dp_rx_pktlog_stop(ar-&gt;ab, false);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to stop dp rx pktlog during wow suspend: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_ce_stop_shadow_timers(ar-&gt;ab);</div><div class='add'>+	ath11k_dp_stop_shadow_timers(ar-&gt;ab);</div><div class='add'>+</div><div class='add'>+	ath11k_hif_irq_disable(ar-&gt;ab);</div><div class='add'>+	ath11k_hif_ce_irq_disable(ar-&gt;ab);</div><div class='add'>+</div><div class='add'>+	ret = ath11k_hif_suspend(ar-&gt;ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to suspend hif: %d\n", ret);</div><div class='add'>+		goto wakeup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	goto exit;</div><div class='add'>+</div><div class='add'>+wakeup:</div><div class='add'>+	ath11k_wow_wakeup(ar-&gt;ab);</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	ath11k_wow_cleanup(ar);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+	return ret ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath11k_wow_op_set_wakeup(struct ieee80211_hw *hw, bool enabled)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+	device_set_wakeup_enable(ar-&gt;ab-&gt;dev, enabled);</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_wow_op_resume(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct ath11k *ar = hw-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	ret = ath11k_hif_resume(ar-&gt;ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to resume hif: %d\n", ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath11k_hif_ce_irq_enable(ar-&gt;ab);</div><div class='add'>+	ath11k_hif_irq_enable(ar-&gt;ab);</div><div class='add'>+</div><div class='add'>+	ret = ath11k_dp_rx_pktlog_start(ar-&gt;ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to start rx pktlog from wow: %d\n", ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wow_wakeup(ar-&gt;ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to wakeup from wow: %d\n", ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wow_nlo_cleanup(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to cleanup nlo: %d\n", ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wow_clear_hw_filter(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to clear hw filter: %d\n", ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wow_protocol_offload(ar, false);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to clear wow protocol offload events: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath11k_wow_set_keepalive(ar,</div><div class='add'>+				       WMI_STA_KEEPALIVE_METHOD_NULL_FRAME,</div><div class='add'>+				       WMI_STA_KEEPALIVE_INTERVAL_DISABLE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath11k_warn(ar-&gt;ab, "failed to disable wow keepalive: %d\n", ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	if (ret) {</div><div class='add'>+		switch (ar-&gt;state) {</div><div class='add'>+		case ATH11K_STATE_ON:</div><div class='add'>+			ar-&gt;state = ATH11K_STATE_RESTARTING;</div><div class='add'>+			ret = 1;</div><div class='add'>+			break;</div><div class='add'>+		case ATH11K_STATE_OFF:</div><div class='add'>+		case ATH11K_STATE_RESTARTING:</div><div class='add'>+		case ATH11K_STATE_RESTARTED:</div><div class='add'>+		case ATH11K_STATE_WEDGED:</div><div class='add'>+		case ATH11K_STATE_FTM:</div><div class='add'>+			ath11k_warn(ar-&gt;ab, "encountered unexpected device state %d on resume, cannot recover\n",</div><div class='add'>+				    ar-&gt;state);</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ar-&gt;conf_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath11k_wow_init(struct ath11k *ar)</div><div class='add'>+{</div><div class='add'>+	if (!test_bit(WMI_TLV_SERVICE_WOW, ar-&gt;wmi-&gt;wmi_ab-&gt;svc_map))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ar-&gt;wow.wowlan_support = ath11k_wowlan_support;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;wmi-&gt;wmi_ab-&gt;wlan_resource_config.rx_decap_mode ==</div><div class='add'>+	    ATH11K_HW_TXRX_NATIVE_WIFI) {</div><div class='add'>+		ar-&gt;wow.wowlan_support.pattern_max_len -= WOW_MAX_REDUCE;</div><div class='add'>+		ar-&gt;wow.wowlan_support.max_pkt_offset -= WOW_MAX_REDUCE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_NLO, ar-&gt;wmi-&gt;wmi_ab-&gt;svc_map)) {</div><div class='add'>+		ar-&gt;wow.wowlan_support.flags |= WIPHY_WOWLAN_NET_DETECT;</div><div class='add'>+		ar-&gt;wow.wowlan_support.max_nd_match_sets = WMI_PNO_MAX_SUPP_NETWORKS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;wow.max_num_patterns = ATH11K_WOW_PATTERNS;</div><div class='add'>+	ar-&gt;wow.wowlan_support.n_patterns = ar-&gt;wow.max_num_patterns;</div><div class='add'>+	ar-&gt;hw-&gt;wiphy-&gt;wowlan = &amp;ar-&gt;wow.wowlan_support;</div><div class='add'>+</div><div class='add'>+	device_set_wakeup_capable(ar-&gt;ab-&gt;dev, true);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath11k/wow.h b/drivers/net/wireless/ath/ath11k/wow.h<br/>index dabc4ee63cf6..c85811e3f42b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/wow.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath11k/wow.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath11k/wow.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath11k/wow.h</a></div><div class='hunk'>@@ -1,10 +1,56 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#ifndef _WOW_H_</div><div class='add'>+#define _WOW_H_</div><div class='add'>+</div><div class='add'>+struct ath11k_wow {</div><div class='add'>+	u32 max_num_patterns;</div><div class='add'>+	struct completion wakeup_completed;</div><div class='add'>+	struct wiphy_wowlan_support wowlan_support;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rfc1042_hdr {</div><div class='add'>+	u8 llc_dsap;</div><div class='add'>+	u8 llc_ssap;</div><div class='add'>+	u8 llc_ctrl;</div><div class='add'>+	u8 snap_oui[3];</div><div class='add'>+	__be16 snap_type;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> #define ATH11K_WOW_RETRY_NUM		3</div><div class='ctx'> #define ATH11K_WOW_RETRY_WAIT_MS	200</div><div class='add'>+#define ATH11K_WOW_PATTERNS		22</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+int ath11k_wow_init(struct ath11k *ar);</div><div class='add'>+int ath11k_wow_op_suspend(struct ieee80211_hw *hw,</div><div class='add'>+			  struct cfg80211_wowlan *wowlan);</div><div class='add'>+int ath11k_wow_op_resume(struct ieee80211_hw *hw);</div><div class='add'>+void ath11k_wow_op_set_wakeup(struct ieee80211_hw *hw, bool enabled);</div><div class='ctx'> int ath11k_wow_enable(struct ath11k_base *ab);</div><div class='ctx'> int ath11k_wow_wakeup(struct ath11k_base *ab);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline int ath11k_wow_init(struct ath11k *ar)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath11k_wow_enable(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath11k_wow_wakeup(struct ath11k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+#endif /* _WOW_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/Kconfig b/drivers/net/wireless/ath/ath12k/Kconfig<br/>new file mode 100644<br/>index 000000000000..1ea1af1b8f6c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+# SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+config ATH12K</div><div class='add'>+	tristate "Qualcomm Technologies Wi-Fi 7 support (ath12k)"</div><div class='add'>+	depends on MAC80211 &amp;&amp; HAS_DMA &amp;&amp; PCI</div><div class='add'>+	select CRYPTO_MICHAEL_MIC</div><div class='add'>+	select QCOM_QMI_HELPERS</div><div class='add'>+	select MHI_BUS</div><div class='add'>+	select QRTR</div><div class='add'>+	select QRTR_MHI</div><div class='add'>+	select PCI_PWRCTRL_PWRSEQ if HAVE_PWRCTRL</div><div class='add'>+	help</div><div class='add'>+	  Enable support for Qualcomm Technologies Wi-Fi 7 (IEEE</div><div class='add'>+	  802.11be) family of chipsets, for example WCN7850 and</div><div class='add'>+	  QCN9274.</div><div class='add'>+</div><div class='add'>+	  If you choose to build a module, it'll be called ath12k.</div><div class='add'>+</div><div class='add'>+config ATH12K_AHB</div><div class='add'>+	bool "QTI ath12k AHB support"</div><div class='add'>+	depends on ATH12K &amp;&amp; REMOTEPROC</div><div class='add'>+	select QCOM_MDT_LOADER</div><div class='add'>+	select QCOM_SCM</div><div class='add'>+	help</div><div class='add'>+	  Enable support for Ath12k AHB bus chipsets, example IPQ5332.</div><div class='add'>+</div><div class='add'>+config ATH12K_DEBUG</div><div class='add'>+	bool "ath12k debugging"</div><div class='add'>+	depends on ATH12K</div><div class='add'>+	help</div><div class='add'>+	  Enable debug support, for example debug messages which must</div><div class='add'>+	  be enabled separately using the debug_mask module parameter.</div><div class='add'>+</div><div class='add'>+	  If unsure, say Y to make it easier to debug problems. But if</div><div class='add'>+	  you want optimal performance choose N.</div><div class='add'>+</div><div class='add'>+config ATH12K_DEBUGFS</div><div class='add'>+	bool "QTI ath12k debugfs support"</div><div class='add'>+	depends on ATH12K &amp;&amp; MAC80211_DEBUGFS</div><div class='add'>+	help</div><div class='add'>+	  Enable ath12k debugfs support</div><div class='add'>+</div><div class='add'>+	  If unsure, say Y to make it easier to debug problems. But if</div><div class='add'>+	  you want optimal performance choose N.</div><div class='add'>+</div><div class='add'>+config ATH12K_TRACING</div><div class='add'>+	bool "ath12k tracing support"</div><div class='add'>+	depends on ATH12K &amp;&amp; EVENT_TRACING</div><div class='add'>+	help</div><div class='add'>+	  Enable ath12k tracing infrastructure.</div><div class='add'>+</div><div class='add'>+	  If unsure, say Y to make it easier to debug problems. But if</div><div class='add'>+	  you want optimal performance choose N.</div><div class='add'>+</div><div class='add'>+config ATH12K_COREDUMP</div><div class='add'>+	bool "ath12k coredump"</div><div class='add'>+	depends on ATH12K</div><div class='add'>+	select WANT_DEV_COREDUMP</div><div class='add'>+	help</div><div class='add'>+	  Enable ath12k coredump collection</div><div class='add'>+</div><div class='add'>+	  If unsure, say Y to make it easier to debug problems. But if</div><div class='add'>+	  dump collection not required choose N.</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/Makefile b/drivers/net/wireless/ath/ath12k/Makefile<br/>new file mode 100644<br/>index 000000000000..d95ee525a6cd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/Makefile</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+# SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+obj-$(CONFIG_ATH12K) += ath12k.o</div><div class='add'>+ath12k-y += core.o \</div><div class='add'>+	    hal.o \</div><div class='add'>+	    hal_tx.o \</div><div class='add'>+	    hal_rx.o \</div><div class='add'>+	    wmi.o \</div><div class='add'>+	    mac.o \</div><div class='add'>+	    reg.o \</div><div class='add'>+	    htc.o \</div><div class='add'>+	    qmi.o \</div><div class='add'>+	    dp.o  \</div><div class='add'>+	    dp_tx.o \</div><div class='add'>+	    dp_rx.o \</div><div class='add'>+	    debug.o \</div><div class='add'>+	    ce.o \</div><div class='add'>+	    peer.o \</div><div class='add'>+	    dbring.o \</div><div class='add'>+	    hw.o \</div><div class='add'>+	    mhi.o \</div><div class='add'>+	    pci.o \</div><div class='add'>+	    dp_mon.o \</div><div class='add'>+	    fw.o \</div><div class='add'>+	    p2p.o</div><div class='add'>+</div><div class='add'>+ath12k-$(CONFIG_ATH12K_AHB) += ahb.o</div><div class='add'>+ath12k-$(CONFIG_ATH12K_DEBUGFS) += debugfs.o debugfs_htt_stats.o debugfs_sta.o</div><div class='add'>+ath12k-$(CONFIG_ACPI) += acpi.o</div><div class='add'>+ath12k-$(CONFIG_ATH12K_TRACING) += trace.o</div><div class='add'>+ath12k-$(CONFIG_PM) += wow.o</div><div class='add'>+ath12k-$(CONFIG_ATH12K_COREDUMP) += coredump.o</div><div class='add'>+ath12k-$(CONFIG_NL80211_TESTMODE) += testmode.o</div><div class='add'>+</div><div class='add'>+# for tracing framework to find trace.h</div><div class='add'>+CFLAGS_trace.o := -I$(src)</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/acpi.c b/drivers/net/wireless/ath/ath12k/acpi.c<br/>new file mode 100644<br/>index 000000000000..d81367ce6929<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/acpi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/acpi.c</a></div><div class='hunk'>@@ -0,0 +1,510 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "acpi.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+static int ath12k_acpi_dsm_get_data(struct ath12k_base *ab, int func)</div><div class='add'>+{</div><div class='add'>+	union acpi_object *obj;</div><div class='add'>+	acpi_handle root_handle;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	root_handle = ACPI_HANDLE(ab-&gt;dev);</div><div class='add'>+	if (!root_handle) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT, "invalid acpi handler\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	obj = acpi_evaluate_dsm(root_handle, ab-&gt;hw_params-&gt;acpi_guid, 0, func,</div><div class='add'>+				NULL);</div><div class='add'>+</div><div class='add'>+	if (!obj) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT, "acpi_evaluate_dsm() failed\n");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (obj-&gt;type == ACPI_TYPE_INTEGER) {</div><div class='add'>+		switch (func) {</div><div class='add'>+		case ATH12K_ACPI_DSM_FUNC_SUPPORT_FUNCS:</div><div class='add'>+			ab-&gt;acpi.func_bit = obj-&gt;integer.value;</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_ACPI_DSM_FUNC_DISABLE_FLAG:</div><div class='add'>+			ab-&gt;acpi.bit_flag = obj-&gt;integer.value;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else if (obj-&gt;type == ACPI_TYPE_STRING) {</div><div class='add'>+		switch (func) {</div><div class='add'>+		case ATH12K_ACPI_DSM_FUNC_BDF_EXT:</div><div class='add'>+			if (obj-&gt;string.length &lt;= ATH12K_ACPI_BDF_ANCHOR_STRING_LEN ||</div><div class='add'>+			    obj-&gt;string.length &gt; ATH12K_ACPI_BDF_MAX_LEN ||</div><div class='add'>+			    memcmp(obj-&gt;string.pointer, ATH12K_ACPI_BDF_ANCHOR_STRING,</div><div class='add'>+				   ATH12K_ACPI_BDF_ANCHOR_STRING_LEN)) {</div><div class='add'>+				ath12k_warn(ab, "invalid ACPI DSM BDF size: %d\n",</div><div class='add'>+					    obj-&gt;string.length);</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			memcpy(ab-&gt;acpi.bdf_string, obj-&gt;string.pointer,</div><div class='add'>+			       obj-&gt;buffer.length);</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else if (obj-&gt;type == ACPI_TYPE_BUFFER) {</div><div class='add'>+		switch (func) {</div><div class='add'>+		case ATH12K_ACPI_DSM_FUNC_SUPPORT_FUNCS:</div><div class='add'>+			if (obj-&gt;buffer.length &lt; ATH12K_ACPI_DSM_FUNC_MIN_BITMAP_SIZE ||</div><div class='add'>+			    obj-&gt;buffer.length &gt; ATH12K_ACPI_DSM_FUNC_MAX_BITMAP_SIZE) {</div><div class='add'>+				ath12k_warn(ab, "invalid ACPI DSM func size: %d\n",</div><div class='add'>+					    obj-&gt;buffer.length);</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ab-&gt;acpi.func_bit = 0;</div><div class='add'>+			for (i = 0; i &lt; obj-&gt;buffer.length; i++)</div><div class='add'>+				ab-&gt;acpi.func_bit += obj-&gt;buffer.pointer[i] &lt;&lt; (i * 8);</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_ACPI_DSM_FUNC_TAS_CFG:</div><div class='add'>+			if (obj-&gt;buffer.length != ATH12K_ACPI_DSM_TAS_CFG_SIZE) {</div><div class='add'>+				ath12k_warn(ab, "invalid ACPI DSM TAS config size: %d\n",</div><div class='add'>+					    obj-&gt;buffer.length);</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			memcpy(&amp;ab-&gt;acpi.tas_cfg, obj-&gt;buffer.pointer,</div><div class='add'>+			       obj-&gt;buffer.length);</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_ACPI_DSM_FUNC_TAS_DATA:</div><div class='add'>+			if (obj-&gt;buffer.length != ATH12K_ACPI_DSM_TAS_DATA_SIZE) {</div><div class='add'>+				ath12k_warn(ab, "invalid ACPI DSM TAS data size: %d\n",</div><div class='add'>+					    obj-&gt;buffer.length);</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			memcpy(&amp;ab-&gt;acpi.tas_sar_power_table, obj-&gt;buffer.pointer,</div><div class='add'>+			       obj-&gt;buffer.length);</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_ACPI_DSM_FUNC_BIOS_SAR:</div><div class='add'>+			if (obj-&gt;buffer.length != ATH12K_ACPI_DSM_BIOS_SAR_DATA_SIZE) {</div><div class='add'>+				ath12k_warn(ab, "invalid ACPI BIOS SAR data size: %d\n",</div><div class='add'>+					    obj-&gt;buffer.length);</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			memcpy(&amp;ab-&gt;acpi.bios_sar_data, obj-&gt;buffer.pointer,</div><div class='add'>+			       obj-&gt;buffer.length);</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_ACPI_DSM_FUNC_GEO_OFFSET:</div><div class='add'>+			if (obj-&gt;buffer.length != ATH12K_ACPI_DSM_GEO_OFFSET_DATA_SIZE) {</div><div class='add'>+				ath12k_warn(ab, "invalid ACPI GEO OFFSET data size: %d\n",</div><div class='add'>+					    obj-&gt;buffer.length);</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			memcpy(&amp;ab-&gt;acpi.geo_offset_data, obj-&gt;buffer.pointer,</div><div class='add'>+			       obj-&gt;buffer.length);</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_ACPI_DSM_FUNC_INDEX_CCA:</div><div class='add'>+			if (obj-&gt;buffer.length != ATH12K_ACPI_DSM_CCA_DATA_SIZE) {</div><div class='add'>+				ath12k_warn(ab, "invalid ACPI DSM CCA data size: %d\n",</div><div class='add'>+					    obj-&gt;buffer.length);</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			memcpy(&amp;ab-&gt;acpi.cca_data, obj-&gt;buffer.pointer,</div><div class='add'>+			       obj-&gt;buffer.length);</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_ACPI_DSM_FUNC_INDEX_BAND_EDGE:</div><div class='add'>+			if (obj-&gt;buffer.length != ATH12K_ACPI_DSM_BAND_EDGE_DATA_SIZE) {</div><div class='add'>+				ath12k_warn(ab, "invalid ACPI DSM band edge data size: %d\n",</div><div class='add'>+					    obj-&gt;buffer.length);</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			memcpy(&amp;ab-&gt;acpi.band_edge_power, obj-&gt;buffer.pointer,</div><div class='add'>+			       obj-&gt;buffer.length);</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		ath12k_warn(ab, "ACPI DSM method returned an unsupported object type: %d\n",</div><div class='add'>+			    obj-&gt;type);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	ACPI_FREE(obj);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_acpi_set_power_limit(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	const u8 *tas_sar_power_table = ab-&gt;acpi.tas_sar_power_table;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (tas_sar_power_table[0] != ATH12K_ACPI_TAS_DATA_VERSION ||</div><div class='add'>+	    tas_sar_power_table[1] != ATH12K_ACPI_TAS_DATA_ENABLE) {</div><div class='add'>+		ath12k_warn(ab, "latest ACPI TAS data is invalid\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_set_bios_cmd(ab, WMI_BIOS_PARAM_TAS_DATA_TYPE,</div><div class='add'>+				      tas_sar_power_table,</div><div class='add'>+				      ATH12K_ACPI_DSM_TAS_DATA_SIZE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to send ACPI TAS data table: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_acpi_set_bios_sar_power(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;acpi.bios_sar_data[0] != ATH12K_ACPI_POWER_LIMIT_VERSION ||</div><div class='add'>+	    ab-&gt;acpi.bios_sar_data[1] != ATH12K_ACPI_POWER_LIMIT_ENABLE_FLAG) {</div><div class='add'>+		ath12k_warn(ab, "invalid latest ACPI BIOS SAR data\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_set_bios_sar_cmd(ab, ab-&gt;acpi.bios_sar_data);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to set ACPI BIOS SAR table: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_acpi_dsm_notify(acpi_handle handle, u32 event, void *data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct ath12k_base *ab = data;</div><div class='add'>+</div><div class='add'>+	if (event == ATH12K_ACPI_NOTIFY_EVENT) {</div><div class='add'>+		ath12k_warn(ab, "unknown acpi notify %u\n", event);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;acpi.acpi_tas_enable) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT, "acpi_tas_enable is false\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_acpi_dsm_get_data(ab, ATH12K_ACPI_DSM_FUNC_TAS_DATA);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to update ACPI TAS data table: %d\n", ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_acpi_set_power_limit(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to set ACPI TAS power limit data: %d", ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;acpi.acpi_bios_sar_enable)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_acpi_dsm_get_data(ab, ATH12K_ACPI_DSM_FUNC_BIOS_SAR);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to update BIOS SAR: %d\n", ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_acpi_set_bios_sar_power(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to set BIOS SAR power limit: %d\n", ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_acpi_set_bios_sar_params(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_set_bios_sar_cmd(ab, ab-&gt;acpi.bios_sar_data);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to set ACPI BIOS SAR table: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_set_bios_geo_cmd(ab, ab-&gt;acpi.geo_offset_data);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to set ACPI BIOS GEO table: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_acpi_set_tas_params(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_set_bios_cmd(ab, WMI_BIOS_PARAM_TAS_CONFIG_TYPE,</div><div class='add'>+				      ab-&gt;acpi.tas_cfg,</div><div class='add'>+				      ATH12K_ACPI_DSM_TAS_CFG_SIZE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to send ACPI TAS config table parameter: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_set_bios_cmd(ab, WMI_BIOS_PARAM_TAS_DATA_TYPE,</div><div class='add'>+				      ab-&gt;acpi.tas_sar_power_table,</div><div class='add'>+				      ATH12K_ACPI_DSM_TAS_DATA_SIZE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to send ACPI TAS data table parameter: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool ath12k_acpi_get_disable_rfkill(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;acpi.acpi_disable_rfkill;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool ath12k_acpi_get_disable_11be(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;acpi.acpi_disable_11be;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_acpi_set_dsm_func(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 *buf;</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;hw_params-&gt;acpi_guid)</div><div class='add'>+		/* not supported with this hardware */</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;acpi.acpi_tas_enable) {</div><div class='add'>+		ret = ath12k_acpi_set_tas_params(ab);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to send ACPI TAS parameters: %d\n", ret);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;acpi.acpi_bios_sar_enable) {</div><div class='add'>+		ret = ath12k_acpi_set_bios_sar_params(ab);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to send ACPI BIOS SAR: %d\n", ret);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;acpi.acpi_cca_enable) {</div><div class='add'>+		buf = ab-&gt;acpi.cca_data + ATH12K_ACPI_CCA_THR_OFFSET_DATA_OFFSET;</div><div class='add'>+		ret = ath12k_wmi_set_bios_cmd(ab,</div><div class='add'>+					      WMI_BIOS_PARAM_CCA_THRESHOLD_TYPE,</div><div class='add'>+					      buf,</div><div class='add'>+					      ATH12K_ACPI_CCA_THR_OFFSET_LEN);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to set ACPI DSM CCA threshold: %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;acpi.acpi_band_edge_enable) {</div><div class='add'>+		ret = ath12k_wmi_set_bios_cmd(ab,</div><div class='add'>+					      WMI_BIOS_PARAM_TYPE_BANDEDGE,</div><div class='add'>+					      ab-&gt;acpi.band_edge_power,</div><div class='add'>+					      sizeof(ab-&gt;acpi.band_edge_power));</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab,</div><div class='add'>+				    "failed to set ACPI DSM band edge channel power: %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_acpi_start(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	acpi_status status;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ab-&gt;acpi.acpi_tas_enable = false;</div><div class='add'>+	ab-&gt;acpi.acpi_disable_11be = false;</div><div class='add'>+	ab-&gt;acpi.acpi_disable_rfkill = false;</div><div class='add'>+	ab-&gt;acpi.acpi_bios_sar_enable = false;</div><div class='add'>+	ab-&gt;acpi.acpi_cca_enable = false;</div><div class='add'>+	ab-&gt;acpi.acpi_band_edge_enable = false;</div><div class='add'>+	ab-&gt;acpi.acpi_enable_bdf = false;</div><div class='add'>+	ab-&gt;acpi.bdf_string[0] = '\0';</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;hw_params-&gt;acpi_guid)</div><div class='add'>+		/* not supported with this hardware */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_acpi_dsm_get_data(ab, ATH12K_ACPI_DSM_FUNC_SUPPORT_FUNCS);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT, "failed to get ACPI DSM data: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ATH12K_ACPI_FUNC_BIT_VALID(ab-&gt;acpi, ATH12K_ACPI_FUNC_BIT_DISABLE_FLAG)) {</div><div class='add'>+		ret = ath12k_acpi_dsm_get_data(ab, ATH12K_ACPI_DSM_FUNC_DISABLE_FLAG);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to get ACPI DISABLE FLAG: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ATH12K_ACPI_CHEK_BIT_VALID(ab-&gt;acpi,</div><div class='add'>+					       ATH12K_ACPI_DSM_DISABLE_11BE_BIT))</div><div class='add'>+			ab-&gt;acpi.acpi_disable_11be = true;</div><div class='add'>+</div><div class='add'>+		if (!ATH12K_ACPI_CHEK_BIT_VALID(ab-&gt;acpi,</div><div class='add'>+						ATH12K_ACPI_DSM_DISABLE_RFKILL_BIT))</div><div class='add'>+			ab-&gt;acpi.acpi_disable_rfkill = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ATH12K_ACPI_FUNC_BIT_VALID(ab-&gt;acpi, ATH12K_ACPI_FUNC_BIT_BDF_EXT)) {</div><div class='add'>+		ret = ath12k_acpi_dsm_get_data(ab, ATH12K_ACPI_DSM_FUNC_BDF_EXT);</div><div class='add'>+		if (ret || ab-&gt;acpi.bdf_string[0] == '\0') {</div><div class='add'>+			ath12k_warn(ab, "failed to get ACPI BDF EXT: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ab-&gt;acpi.acpi_enable_bdf = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ATH12K_ACPI_FUNC_BIT_VALID(ab-&gt;acpi, ATH12K_ACPI_FUNC_BIT_TAS_CFG)) {</div><div class='add'>+		ret = ath12k_acpi_dsm_get_data(ab, ATH12K_ACPI_DSM_FUNC_TAS_CFG);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to get ACPI TAS config table: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ATH12K_ACPI_FUNC_BIT_VALID(ab-&gt;acpi, ATH12K_ACPI_FUNC_BIT_TAS_DATA)) {</div><div class='add'>+		ret = ath12k_acpi_dsm_get_data(ab, ATH12K_ACPI_DSM_FUNC_TAS_DATA);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to get ACPI TAS data table: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ATH12K_ACPI_FUNC_BIT_VALID(ab-&gt;acpi, ATH12K_ACPI_FUNC_BIT_TAS_CFG) &amp;&amp;</div><div class='add'>+		    ab-&gt;acpi.tas_sar_power_table[0] == ATH12K_ACPI_TAS_DATA_VERSION &amp;&amp;</div><div class='add'>+		    ab-&gt;acpi.tas_sar_power_table[1] == ATH12K_ACPI_TAS_DATA_ENABLE)</div><div class='add'>+			ab-&gt;acpi.acpi_tas_enable = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ATH12K_ACPI_FUNC_BIT_VALID(ab-&gt;acpi, ATH12K_ACPI_FUNC_BIT_BIOS_SAR)) {</div><div class='add'>+		ret = ath12k_acpi_dsm_get_data(ab, ATH12K_ACPI_DSM_FUNC_BIOS_SAR);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to get ACPI bios sar data: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ATH12K_ACPI_FUNC_BIT_VALID(ab-&gt;acpi, ATH12K_ACPI_FUNC_BIT_GEO_OFFSET)) {</div><div class='add'>+		ret = ath12k_acpi_dsm_get_data(ab, ATH12K_ACPI_DSM_FUNC_GEO_OFFSET);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to get ACPI geo offset data: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ATH12K_ACPI_FUNC_BIT_VALID(ab-&gt;acpi, ATH12K_ACPI_FUNC_BIT_BIOS_SAR) &amp;&amp;</div><div class='add'>+		    ab-&gt;acpi.bios_sar_data[0] == ATH12K_ACPI_POWER_LIMIT_VERSION &amp;&amp;</div><div class='add'>+		    ab-&gt;acpi.bios_sar_data[1] == ATH12K_ACPI_POWER_LIMIT_ENABLE_FLAG &amp;&amp;</div><div class='add'>+		    !ab-&gt;acpi.acpi_tas_enable)</div><div class='add'>+			ab-&gt;acpi.acpi_bios_sar_enable = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ATH12K_ACPI_FUNC_BIT_VALID(ab-&gt;acpi, ATH12K_ACPI_FUNC_BIT_CCA)) {</div><div class='add'>+		ret = ath12k_acpi_dsm_get_data(ab, ATH12K_ACPI_DSM_FUNC_INDEX_CCA);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to get ACPI DSM CCA threshold configuration: %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ab-&gt;acpi.cca_data[0] == ATH12K_ACPI_CCA_THR_VERSION &amp;&amp;</div><div class='add'>+		    ab-&gt;acpi.cca_data[ATH12K_ACPI_CCA_THR_OFFSET_DATA_OFFSET] ==</div><div class='add'>+		    ATH12K_ACPI_CCA_THR_ENABLE_FLAG)</div><div class='add'>+			ab-&gt;acpi.acpi_cca_enable = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ATH12K_ACPI_FUNC_BIT_VALID(ab-&gt;acpi,</div><div class='add'>+				       ATH12K_ACPI_FUNC_BIT_BAND_EDGE_CHAN_POWER)) {</div><div class='add'>+		ret = ath12k_acpi_dsm_get_data(ab, ATH12K_ACPI_DSM_FUNC_INDEX_BAND_EDGE);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to get ACPI DSM band edge channel power: %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ab-&gt;acpi.band_edge_power[0] == ATH12K_ACPI_BAND_EDGE_VERSION &amp;&amp;</div><div class='add'>+		    ab-&gt;acpi.band_edge_power[1] == ATH12K_ACPI_BAND_EDGE_ENABLE_FLAG)</div><div class='add'>+			ab-&gt;acpi.acpi_band_edge_enable = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = acpi_install_notify_handler(ACPI_HANDLE(ab-&gt;dev),</div><div class='add'>+					     ACPI_DEVICE_NOTIFY,</div><div class='add'>+					     ath12k_acpi_dsm_notify, ab);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		ath12k_warn(ab, "failed to install DSM notify callback: %d\n", status);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab-&gt;acpi.started = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_acpi_check_bdf_variant_name(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	size_t max_len = sizeof(ab-&gt;qmi.target.bdf_ext);</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;acpi.acpi_enable_bdf)</div><div class='add'>+		return -ENODATA;</div><div class='add'>+</div><div class='add'>+	if (strscpy(ab-&gt;qmi.target.bdf_ext, ab-&gt;acpi.bdf_string + 4, max_len) &lt; 0)</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+			   "acpi bdf variant longer than the buffer (variant: %s)\n",</div><div class='add'>+			   ab-&gt;acpi.bdf_string);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_acpi_stop(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	if (!ab-&gt;acpi.started)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	acpi_remove_notify_handler(ACPI_HANDLE(ab-&gt;dev),</div><div class='add'>+				   ACPI_DEVICE_NOTIFY,</div><div class='add'>+				   ath12k_acpi_dsm_notify);</div><div class='add'>+</div><div class='add'>+	memset(&amp;ab-&gt;acpi, 0, sizeof(ab-&gt;acpi));</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/acpi.h b/drivers/net/wireless/ath/ath12k/acpi.h<br/>new file mode 100644<br/>index 000000000000..3a26fea6af1a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/acpi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/acpi.h</a></div><div class='hunk'>@@ -0,0 +1,114 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+#ifndef ATH12K_ACPI_H</div><div class='add'>+#define ATH12K_ACPI_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+</div><div class='add'>+#define ATH12K_ACPI_DSM_FUNC_SUPPORT_FUNCS	0</div><div class='add'>+#define ATH12K_ACPI_DSM_FUNC_DISABLE_FLAG	2</div><div class='add'>+#define ATH12K_ACPI_DSM_FUNC_BDF_EXT		3</div><div class='add'>+#define ATH12K_ACPI_DSM_FUNC_BIOS_SAR		4</div><div class='add'>+#define ATH12K_ACPI_DSM_FUNC_GEO_OFFSET		5</div><div class='add'>+#define ATH12K_ACPI_DSM_FUNC_INDEX_CCA		6</div><div class='add'>+#define ATH12K_ACPI_DSM_FUNC_TAS_CFG		8</div><div class='add'>+#define ATH12K_ACPI_DSM_FUNC_TAS_DATA		9</div><div class='add'>+#define ATH12K_ACPI_DSM_FUNC_INDEX_BAND_EDGE		10</div><div class='add'>+</div><div class='add'>+#define ATH12K_ACPI_FUNC_BIT_DISABLE_FLAG		BIT(1)</div><div class='add'>+#define ATH12K_ACPI_FUNC_BIT_BDF_EXT			BIT(2)</div><div class='add'>+#define ATH12K_ACPI_FUNC_BIT_BIOS_SAR			BIT(3)</div><div class='add'>+#define ATH12K_ACPI_FUNC_BIT_GEO_OFFSET			BIT(4)</div><div class='add'>+#define ATH12K_ACPI_FUNC_BIT_CCA			BIT(5)</div><div class='add'>+#define ATH12K_ACPI_FUNC_BIT_TAS_CFG			BIT(7)</div><div class='add'>+#define ATH12K_ACPI_FUNC_BIT_TAS_DATA			BIT(8)</div><div class='add'>+#define ATH12K_ACPI_FUNC_BIT_BAND_EDGE_CHAN_POWER	BIT(9)</div><div class='add'>+</div><div class='add'>+#define ATH12K_ACPI_NOTIFY_EVENT			0x86</div><div class='add'>+#define ATH12K_ACPI_FUNC_BIT_VALID(_acdata, _func)	(((_acdata).func_bit) &amp; (_func))</div><div class='add'>+#define ATH12K_ACPI_CHEK_BIT_VALID(_acdata, _func)	(((_acdata).bit_flag) &amp; (_func))</div><div class='add'>+</div><div class='add'>+#define ATH12K_ACPI_TAS_DATA_VERSION		0x1</div><div class='add'>+#define ATH12K_ACPI_TAS_DATA_ENABLE		0x1</div><div class='add'>+#define ATH12K_ACPI_POWER_LIMIT_VERSION		0x1</div><div class='add'>+#define ATH12K_ACPI_POWER_LIMIT_ENABLE_FLAG	0x1</div><div class='add'>+#define ATH12K_ACPI_CCA_THR_VERSION		0x1</div><div class='add'>+#define ATH12K_ACPI_CCA_THR_ENABLE_FLAG		0x1</div><div class='add'>+#define ATH12K_ACPI_BAND_EDGE_VERSION		0x1</div><div class='add'>+#define ATH12K_ACPI_BAND_EDGE_ENABLE_FLAG	0x1</div><div class='add'>+</div><div class='add'>+#define ATH12K_ACPI_GEO_OFFSET_DATA_OFFSET	1</div><div class='add'>+#define ATH12K_ACPI_DBS_BACKOFF_DATA_OFFSET	2</div><div class='add'>+#define ATH12K_ACPI_CCA_THR_OFFSET_DATA_OFFSET	5</div><div class='add'>+#define ATH12K_ACPI_BIOS_SAR_DBS_BACKOFF_LEN	10</div><div class='add'>+#define ATH12K_ACPI_POWER_LIMIT_DATA_OFFSET	12</div><div class='add'>+#define ATH12K_ACPI_BIOS_SAR_GEO_OFFSET_LEN	18</div><div class='add'>+#define ATH12K_ACPI_BIOS_SAR_TABLE_LEN		22</div><div class='add'>+#define ATH12K_ACPI_CCA_THR_OFFSET_LEN		36</div><div class='add'>+</div><div class='add'>+#define ATH12K_ACPI_DSM_TAS_DATA_SIZE			69</div><div class='add'>+#define ATH12K_ACPI_DSM_BAND_EDGE_DATA_SIZE		100</div><div class='add'>+#define ATH12K_ACPI_DSM_TAS_CFG_SIZE			108</div><div class='add'>+</div><div class='add'>+#define ATH12K_ACPI_DSM_FUNC_MIN_BITMAP_SIZE	1</div><div class='add'>+#define ATH12K_ACPI_DSM_FUNC_MAX_BITMAP_SIZE	4</div><div class='add'>+</div><div class='add'>+#define ATH12K_ACPI_DSM_DISABLE_11BE_BIT	BIT(0)</div><div class='add'>+#define ATH12K_ACPI_DSM_DISABLE_RFKILL_BIT	BIT(2)</div><div class='add'>+</div><div class='add'>+#define ATH12K_ACPI_BDF_ANCHOR_STRING_LEN	3</div><div class='add'>+#define ATH12K_ACPI_BDF_ANCHOR_STRING		"BDF"</div><div class='add'>+#define ATH12K_ACPI_BDF_MAX_LEN			100</div><div class='add'>+</div><div class='add'>+#define ATH12K_ACPI_DSM_GEO_OFFSET_DATA_SIZE (ATH12K_ACPI_GEO_OFFSET_DATA_OFFSET + \</div><div class='add'>+					      ATH12K_ACPI_BIOS_SAR_GEO_OFFSET_LEN)</div><div class='add'>+#define ATH12K_ACPI_DSM_BIOS_SAR_DATA_SIZE (ATH12K_ACPI_POWER_LIMIT_DATA_OFFSET + \</div><div class='add'>+					    ATH12K_ACPI_BIOS_SAR_TABLE_LEN)</div><div class='add'>+#define ATH12K_ACPI_DSM_CCA_DATA_SIZE (ATH12K_ACPI_CCA_THR_OFFSET_DATA_OFFSET + \</div><div class='add'>+				       ATH12K_ACPI_CCA_THR_OFFSET_LEN)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ACPI</div><div class='add'>+</div><div class='add'>+int ath12k_acpi_start(struct ath12k_base *ab);</div><div class='add'>+void ath12k_acpi_stop(struct ath12k_base *ab);</div><div class='add'>+bool ath12k_acpi_get_disable_rfkill(struct ath12k_base *ab);</div><div class='add'>+bool ath12k_acpi_get_disable_11be(struct ath12k_base *ab);</div><div class='add'>+void ath12k_acpi_set_dsm_func(struct ath12k_base *ab);</div><div class='add'>+int ath12k_acpi_check_bdf_variant_name(struct ath12k_base *ab);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline int ath12k_acpi_start(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_acpi_stop(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool ath12k_acpi_get_disable_rfkill(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool ath12k_acpi_get_disable_11be(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_acpi_set_dsm_func(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath12k_acpi_check_bdf_variant_name(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_ACPI */</div><div class='add'>+</div><div class='add'>+#endif /* ATH12K_ACPI_H */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/ahb.c b/drivers/net/wireless/ath/ath12k/ahb.c<br/>new file mode 100644<br/>index 000000000000..b30527c402f6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/ahb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/ahb.c</a></div><div class='hunk'>@@ -0,0 +1,1156 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/firmware/qcom/qcom_scm.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/remoteproc.h&gt;</div><div class='add'>+#include &lt;linux/soc/qcom/mdt_loader.h&gt;</div><div class='add'>+#include &lt;linux/soc/qcom/smem_state.h&gt;</div><div class='add'>+#include "ahb.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "hif.h"</div><div class='add'>+</div><div class='add'>+static const struct of_device_id ath12k_ahb_of_match[] = {</div><div class='add'>+	{ .compatible = "qcom,ipq5332-wifi",</div><div class='add'>+	  .data = (void *)ATH12K_HW_IPQ5332_HW10,</div><div class='add'>+	},</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(of, ath12k_ahb_of_match);</div><div class='add'>+</div><div class='add'>+#define ATH12K_IRQ_CE0_OFFSET 4</div><div class='add'>+#define ATH12K_MAX_UPDS 1</div><div class='add'>+#define ATH12K_UPD_IRQ_WRD_LEN  18</div><div class='add'>+static const char ath12k_userpd_irq[][9] = {"spawn",</div><div class='add'>+				     "ready",</div><div class='add'>+				     "stop-ack"};</div><div class='add'>+</div><div class='add'>+static const char *irq_name[ATH12K_IRQ_NUM_MAX] = {</div><div class='add'>+	"misc-pulse1",</div><div class='add'>+	"misc-latch",</div><div class='add'>+	"sw-exception",</div><div class='add'>+	"watchdog",</div><div class='add'>+	"ce0",</div><div class='add'>+	"ce1",</div><div class='add'>+	"ce2",</div><div class='add'>+	"ce3",</div><div class='add'>+	"ce4",</div><div class='add'>+	"ce5",</div><div class='add'>+	"ce6",</div><div class='add'>+	"ce7",</div><div class='add'>+	"ce8",</div><div class='add'>+	"ce9",</div><div class='add'>+	"ce10",</div><div class='add'>+	"ce11",</div><div class='add'>+	"host2wbm-desc-feed",</div><div class='add'>+	"host2reo-re-injection",</div><div class='add'>+	"host2reo-command",</div><div class='add'>+	"host2rxdma-monitor-ring3",</div><div class='add'>+	"host2rxdma-monitor-ring2",</div><div class='add'>+	"host2rxdma-monitor-ring1",</div><div class='add'>+	"reo2ost-exception",</div><div class='add'>+	"wbm2host-rx-release",</div><div class='add'>+	"reo2host-status",</div><div class='add'>+	"reo2host-destination-ring4",</div><div class='add'>+	"reo2host-destination-ring3",</div><div class='add'>+	"reo2host-destination-ring2",</div><div class='add'>+	"reo2host-destination-ring1",</div><div class='add'>+	"rxdma2host-monitor-destination-mac3",</div><div class='add'>+	"rxdma2host-monitor-destination-mac2",</div><div class='add'>+	"rxdma2host-monitor-destination-mac1",</div><div class='add'>+	"ppdu-end-interrupts-mac3",</div><div class='add'>+	"ppdu-end-interrupts-mac2",</div><div class='add'>+	"ppdu-end-interrupts-mac1",</div><div class='add'>+	"rxdma2host-monitor-status-ring-mac3",</div><div class='add'>+	"rxdma2host-monitor-status-ring-mac2",</div><div class='add'>+	"rxdma2host-monitor-status-ring-mac1",</div><div class='add'>+	"host2rxdma-host-buf-ring-mac3",</div><div class='add'>+	"host2rxdma-host-buf-ring-mac2",</div><div class='add'>+	"host2rxdma-host-buf-ring-mac1",</div><div class='add'>+	"rxdma2host-destination-ring-mac3",</div><div class='add'>+	"rxdma2host-destination-ring-mac2",</div><div class='add'>+	"rxdma2host-destination-ring-mac1",</div><div class='add'>+	"host2tcl-input-ring4",</div><div class='add'>+	"host2tcl-input-ring3",</div><div class='add'>+	"host2tcl-input-ring2",</div><div class='add'>+	"host2tcl-input-ring1",</div><div class='add'>+	"wbm2host-tx-completions-ring4",</div><div class='add'>+	"wbm2host-tx-completions-ring3",</div><div class='add'>+	"wbm2host-tx-completions-ring2",</div><div class='add'>+	"wbm2host-tx-completions-ring1",</div><div class='add'>+	"tcl2host-status-ring",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ext_irq_num {</div><div class='add'>+	host2wbm_desc_feed = 16,</div><div class='add'>+	host2reo_re_injection,</div><div class='add'>+	host2reo_command,</div><div class='add'>+	host2rxdma_monitor_ring3,</div><div class='add'>+	host2rxdma_monitor_ring2,</div><div class='add'>+	host2rxdma_monitor_ring1,</div><div class='add'>+	reo2host_exception,</div><div class='add'>+	wbm2host_rx_release,</div><div class='add'>+	reo2host_status,</div><div class='add'>+	reo2host_destination_ring4,</div><div class='add'>+	reo2host_destination_ring3,</div><div class='add'>+	reo2host_destination_ring2,</div><div class='add'>+	reo2host_destination_ring1,</div><div class='add'>+	rxdma2host_monitor_destination_mac3,</div><div class='add'>+	rxdma2host_monitor_destination_mac2,</div><div class='add'>+	rxdma2host_monitor_destination_mac1,</div><div class='add'>+	ppdu_end_interrupts_mac3,</div><div class='add'>+	ppdu_end_interrupts_mac2,</div><div class='add'>+	ppdu_end_interrupts_mac1,</div><div class='add'>+	rxdma2host_monitor_status_ring_mac3,</div><div class='add'>+	rxdma2host_monitor_status_ring_mac2,</div><div class='add'>+	rxdma2host_monitor_status_ring_mac1,</div><div class='add'>+	host2rxdma_host_buf_ring_mac3,</div><div class='add'>+	host2rxdma_host_buf_ring_mac2,</div><div class='add'>+	host2rxdma_host_buf_ring_mac1,</div><div class='add'>+	rxdma2host_destination_ring_mac3,</div><div class='add'>+	rxdma2host_destination_ring_mac2,</div><div class='add'>+	rxdma2host_destination_ring_mac1,</div><div class='add'>+	host2tcl_input_ring4,</div><div class='add'>+	host2tcl_input_ring3,</div><div class='add'>+	host2tcl_input_ring2,</div><div class='add'>+	host2tcl_input_ring1,</div><div class='add'>+	wbm2host_tx_completions_ring4,</div><div class='add'>+	wbm2host_tx_completions_ring3,</div><div class='add'>+	wbm2host_tx_completions_ring2,</div><div class='add'>+	wbm2host_tx_completions_ring1,</div><div class='add'>+	tcl2host_status_ring,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 ath12k_ahb_read32(struct ath12k_base *ab, u32 offset)</div><div class='add'>+{</div><div class='add'>+	if (ab-&gt;ce_remap &amp;&amp; offset &lt; HAL_SEQ_WCSS_CMEM_OFFSET)</div><div class='add'>+		return ioread32(ab-&gt;mem_ce + offset);</div><div class='add'>+	return ioread32(ab-&gt;mem + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_write32(struct ath12k_base *ab, u32 offset,</div><div class='add'>+			       u32 value)</div><div class='add'>+{</div><div class='add'>+	if (ab-&gt;ce_remap &amp;&amp; offset &lt; HAL_SEQ_WCSS_CMEM_OFFSET)</div><div class='add'>+		iowrite32(value, ab-&gt;mem_ce + offset);</div><div class='add'>+	else</div><div class='add'>+		iowrite32(value, ab-&gt;mem + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_cancel_workqueue(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;ce_count; i++) {</div><div class='add'>+		struct ath12k_ce_pipe *ce_pipe = &amp;ab-&gt;ce.ce_pipe[i];</div><div class='add'>+</div><div class='add'>+		if (ath12k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		cancel_work_sync(&amp;ce_pipe-&gt;intr_wq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_ext_grp_disable(struct ath12k_ext_irq_grp *irq_grp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; irq_grp-&gt;num_irq; i++)</div><div class='add'>+		disable_irq_nosync(irq_grp-&gt;ab-&gt;irq_num[irq_grp-&gt;irqs[i]]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __ath12k_ahb_ext_irq_disable(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) {</div><div class='add'>+		struct ath12k_ext_irq_grp *irq_grp = &amp;ab-&gt;ext_irq_grp[i];</div><div class='add'>+</div><div class='add'>+		ath12k_ahb_ext_grp_disable(irq_grp);</div><div class='add'>+		if (irq_grp-&gt;napi_enabled) {</div><div class='add'>+			napi_synchronize(&amp;irq_grp-&gt;napi);</div><div class='add'>+			napi_disable(&amp;irq_grp-&gt;napi);</div><div class='add'>+			irq_grp-&gt;napi_enabled = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_ext_grp_enable(struct ath12k_ext_irq_grp *irq_grp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; irq_grp-&gt;num_irq; i++)</div><div class='add'>+		enable_irq(irq_grp-&gt;ab-&gt;irq_num[irq_grp-&gt;irqs[i]]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_setbit32(struct ath12k_base *ab, u8 bit, u32 offset)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = ath12k_ahb_read32(ab, offset);</div><div class='add'>+	ath12k_ahb_write32(ab, offset, val | BIT(bit));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_clearbit32(struct ath12k_base *ab, u8 bit, u32 offset)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = ath12k_ahb_read32(ab, offset);</div><div class='add'>+	ath12k_ahb_write32(ab, offset, val &amp; ~BIT(bit));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_ce_irq_enable(struct ath12k_base *ab, u16 ce_id)</div><div class='add'>+{</div><div class='add'>+	const struct ce_attr *ce_attr;</div><div class='add'>+	const struct ce_ie_addr *ce_ie_addr = ab-&gt;hw_params-&gt;ce_ie_addr;</div><div class='add'>+	u32 ie1_reg_addr, ie2_reg_addr, ie3_reg_addr;</div><div class='add'>+</div><div class='add'>+	ie1_reg_addr = ce_ie_addr-&gt;ie1_reg_addr;</div><div class='add'>+	ie2_reg_addr = ce_ie_addr-&gt;ie2_reg_addr;</div><div class='add'>+	ie3_reg_addr = ce_ie_addr-&gt;ie3_reg_addr;</div><div class='add'>+</div><div class='add'>+	ce_attr = &amp;ab-&gt;hw_params-&gt;host_ce_config[ce_id];</div><div class='add'>+	if (ce_attr-&gt;src_nentries)</div><div class='add'>+		ath12k_ahb_setbit32(ab, ce_id, ie1_reg_addr);</div><div class='add'>+</div><div class='add'>+	if (ce_attr-&gt;dest_nentries) {</div><div class='add'>+		ath12k_ahb_setbit32(ab, ce_id, ie2_reg_addr);</div><div class='add'>+		ath12k_ahb_setbit32(ab, ce_id + CE_HOST_IE_3_SHIFT,</div><div class='add'>+				    ie3_reg_addr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_ce_irq_disable(struct ath12k_base *ab, u16 ce_id)</div><div class='add'>+{</div><div class='add'>+	const struct ce_attr *ce_attr;</div><div class='add'>+	const struct ce_ie_addr *ce_ie_addr = ab-&gt;hw_params-&gt;ce_ie_addr;</div><div class='add'>+	u32 ie1_reg_addr, ie2_reg_addr, ie3_reg_addr;</div><div class='add'>+</div><div class='add'>+	ie1_reg_addr = ce_ie_addr-&gt;ie1_reg_addr;</div><div class='add'>+	ie2_reg_addr = ce_ie_addr-&gt;ie2_reg_addr;</div><div class='add'>+	ie3_reg_addr = ce_ie_addr-&gt;ie3_reg_addr;</div><div class='add'>+</div><div class='add'>+	ce_attr = &amp;ab-&gt;hw_params-&gt;host_ce_config[ce_id];</div><div class='add'>+	if (ce_attr-&gt;src_nentries)</div><div class='add'>+		ath12k_ahb_clearbit32(ab, ce_id, ie1_reg_addr);</div><div class='add'>+</div><div class='add'>+	if (ce_attr-&gt;dest_nentries) {</div><div class='add'>+		ath12k_ahb_clearbit32(ab, ce_id, ie2_reg_addr);</div><div class='add'>+		ath12k_ahb_clearbit32(ab, ce_id + CE_HOST_IE_3_SHIFT,</div><div class='add'>+				      ie3_reg_addr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_sync_ce_irqs(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int irq_idx;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;ce_count; i++) {</div><div class='add'>+		if (ath12k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		irq_idx = ATH12K_IRQ_CE0_OFFSET + i;</div><div class='add'>+		synchronize_irq(ab-&gt;irq_num[irq_idx]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_sync_ext_irqs(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+	int irq_idx;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) {</div><div class='add'>+		struct ath12k_ext_irq_grp *irq_grp = &amp;ab-&gt;ext_irq_grp[i];</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; irq_grp-&gt;num_irq; j++) {</div><div class='add'>+			irq_idx = irq_grp-&gt;irqs[j];</div><div class='add'>+			synchronize_irq(ab-&gt;irq_num[irq_idx]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_ce_irqs_enable(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;ce_count; i++) {</div><div class='add'>+		if (ath12k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='add'>+			continue;</div><div class='add'>+		ath12k_ahb_ce_irq_enable(ab, i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_ce_irqs_disable(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;ce_count; i++) {</div><div class='add'>+		if (ath12k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='add'>+			continue;</div><div class='add'>+		ath12k_ahb_ce_irq_disable(ab, i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_ahb_start(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath12k_ahb_ce_irqs_enable(ab);</div><div class='add'>+	ath12k_ce_rx_post_buf(ab);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_ext_irq_enable(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ext_irq_grp *irq_grp;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) {</div><div class='add'>+		irq_grp = &amp;ab-&gt;ext_irq_grp[i];</div><div class='add'>+		if (!irq_grp-&gt;napi_enabled) {</div><div class='add'>+			napi_enable(&amp;irq_grp-&gt;napi);</div><div class='add'>+			irq_grp-&gt;napi_enabled = true;</div><div class='add'>+		}</div><div class='add'>+		ath12k_ahb_ext_grp_enable(irq_grp);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_ext_irq_disable(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	__ath12k_ahb_ext_irq_disable(ab);</div><div class='add'>+	ath12k_ahb_sync_ext_irqs(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_stop(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	if (!test_bit(ATH12K_FLAG_CRASH_FLUSH, &amp;ab-&gt;dev_flags))</div><div class='add'>+		ath12k_ahb_ce_irqs_disable(ab);</div><div class='add'>+	ath12k_ahb_sync_ce_irqs(ab);</div><div class='add'>+	ath12k_ahb_cancel_workqueue(ab);</div><div class='add'>+	timer_delete_sync(&amp;ab-&gt;rx_replenish_retry);</div><div class='add'>+	ath12k_ce_cleanup_pipes(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_ahb_power_up(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab);</div><div class='add'>+	char fw_name[ATH12K_USERPD_FW_NAME_LEN];</div><div class='add'>+	char fw2_name[ATH12K_USERPD_FW_NAME_LEN];</div><div class='add'>+	struct device *dev = ab-&gt;dev;</div><div class='add'>+	const struct firmware *fw, *fw2;</div><div class='add'>+	struct reserved_mem *rmem = NULL;</div><div class='add'>+	unsigned long time_left;</div><div class='add'>+	phys_addr_t mem_phys;</div><div class='add'>+	void *mem_region;</div><div class='add'>+	size_t mem_size;</div><div class='add'>+	u32 pasid;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	rmem = ath12k_core_get_reserved_mem(ab, 0);</div><div class='add'>+	if (!rmem)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	mem_phys = rmem-&gt;base;</div><div class='add'>+	mem_size = rmem-&gt;size;</div><div class='add'>+	mem_region = devm_memremap(dev, mem_phys, mem_size, MEMREMAP_WC);</div><div class='add'>+	if (IS_ERR(mem_region)) {</div><div class='add'>+		ath12k_err(ab, "unable to map memory region: %pa+%pa\n",</div><div class='add'>+			   &amp;rmem-&gt;base, &amp;rmem-&gt;size);</div><div class='add'>+		return PTR_ERR(mem_region);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snprintf(fw_name, sizeof(fw_name), "%s/%s/%s%d%s", ATH12K_FW_DIR,</div><div class='add'>+		 ab-&gt;hw_params-&gt;fw.dir, ATH12K_AHB_FW_PREFIX, ab_ahb-&gt;userpd_id,</div><div class='add'>+		 ATH12K_AHB_FW_SUFFIX);</div><div class='add'>+</div><div class='add'>+	ret = request_firmware(&amp;fw, fw_name, dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_err(ab, "request_firmware failed\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_AHB, "Booting fw image %s, size %zd\n", fw_name,</div><div class='add'>+		   fw-&gt;size);</div><div class='add'>+</div><div class='add'>+	if (!fw-&gt;size) {</div><div class='add'>+		ath12k_err(ab, "Invalid firmware size\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_fw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pasid = (u32_encode_bits(ab_ahb-&gt;userpd_id, ATH12K_USERPD_ID_MASK)) |</div><div class='add'>+		ATH12K_AHB_UPD_SWID;</div><div class='add'>+</div><div class='add'>+	/* Load FW image to a reserved memory location */</div><div class='add'>+	ret = qcom_mdt_load(dev, fw, fw_name, pasid, mem_region, mem_phys, mem_size,</div><div class='add'>+			    &amp;mem_phys);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "Failed to load MDT segments: %d\n", ret);</div><div class='add'>+		goto err_fw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snprintf(fw2_name, sizeof(fw2_name), "%s/%s/%s", ATH12K_FW_DIR,</div><div class='add'>+		 ab-&gt;hw_params-&gt;fw.dir, ATH12K_AHB_FW2);</div><div class='add'>+</div><div class='add'>+	ret = request_firmware(&amp;fw2, fw2_name, dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_err(ab, "request_firmware failed\n");</div><div class='add'>+		goto err_fw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_AHB, "Booting fw image %s, size %zd\n", fw2_name,</div><div class='add'>+		   fw2-&gt;size);</div><div class='add'>+</div><div class='add'>+	if (!fw2-&gt;size) {</div><div class='add'>+		ath12k_err(ab, "Invalid firmware size\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_fw2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = qcom_mdt_load_no_init(dev, fw2, fw2_name, mem_region, mem_phys,</div><div class='add'>+				    mem_size, &amp;mem_phys);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "Failed to load MDT segments: %d\n", ret);</div><div class='add'>+		goto err_fw2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Authenticate FW image using peripheral ID */</div><div class='add'>+	ret = qcom_scm_pas_auth_and_reset(pasid);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to boot the remote processor %d\n", ret);</div><div class='add'>+		goto err_fw2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Instruct Q6 to spawn userPD thread */</div><div class='add'>+	ret = qcom_smem_state_update_bits(ab_ahb-&gt;spawn_state, BIT(ab_ahb-&gt;spawn_bit),</div><div class='add'>+					  BIT(ab_ahb-&gt;spawn_bit));</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "Failed to update spawn state %d\n", ret);</div><div class='add'>+		goto err_fw2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;ab_ahb-&gt;userpd_spawned,</div><div class='add'>+						ATH12K_USERPD_SPAWN_TIMEOUT);</div><div class='add'>+	if (!time_left) {</div><div class='add'>+		ath12k_err(ab, "UserPD spawn wait timed out\n");</div><div class='add'>+		ret = -ETIMEDOUT;</div><div class='add'>+		goto err_fw2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;ab_ahb-&gt;userpd_ready,</div><div class='add'>+						ATH12K_USERPD_READY_TIMEOUT);</div><div class='add'>+	if (!time_left) {</div><div class='add'>+		ath12k_err(ab, "UserPD ready wait timed out\n");</div><div class='add'>+		ret = -ETIMEDOUT;</div><div class='add'>+		goto err_fw2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qcom_smem_state_update_bits(ab_ahb-&gt;spawn_state, BIT(ab_ahb-&gt;spawn_bit), 0);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_AHB, "UserPD%d is now UP\n", ab_ahb-&gt;userpd_id);</div><div class='add'>+</div><div class='add'>+err_fw2:</div><div class='add'>+	release_firmware(fw2);</div><div class='add'>+err_fw:</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_power_down(struct ath12k_base *ab, bool is_suspend)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab);</div><div class='add'>+	unsigned long time_left;</div><div class='add'>+	u32 pasid;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	qcom_smem_state_update_bits(ab_ahb-&gt;stop_state, BIT(ab_ahb-&gt;stop_bit),</div><div class='add'>+				    BIT(ab_ahb-&gt;stop_bit));</div><div class='add'>+</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;ab_ahb-&gt;userpd_stopped,</div><div class='add'>+						ATH12K_USERPD_STOP_TIMEOUT);</div><div class='add'>+	if (!time_left) {</div><div class='add'>+		ath12k_err(ab, "UserPD stop wait timed out\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qcom_smem_state_update_bits(ab_ahb-&gt;stop_state, BIT(ab_ahb-&gt;stop_bit), 0);</div><div class='add'>+</div><div class='add'>+	pasid = (u32_encode_bits(ab_ahb-&gt;userpd_id, ATH12K_USERPD_ID_MASK)) |</div><div class='add'>+		ATH12K_AHB_UPD_SWID;</div><div class='add'>+	/* Release the firmware */</div><div class='add'>+	ret = qcom_scm_pas_shutdown(pasid);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_err(ab, "scm pas shutdown failed for userPD%d: %d\n",</div><div class='add'>+			   ab_ahb-&gt;userpd_id, ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_init_qmi_ce_config(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_qmi_ce_cfg *cfg = &amp;ab-&gt;qmi.ce_cfg;</div><div class='add'>+</div><div class='add'>+	cfg-&gt;tgt_ce_len = ab-&gt;hw_params-&gt;target_ce_count;</div><div class='add'>+	cfg-&gt;tgt_ce = ab-&gt;hw_params-&gt;target_ce_config;</div><div class='add'>+	cfg-&gt;svc_to_ce_map_len = ab-&gt;hw_params-&gt;svc_to_ce_map_len;</div><div class='add'>+	cfg-&gt;svc_to_ce_map = ab-&gt;hw_params-&gt;svc_to_ce_map;</div><div class='add'>+	ab-&gt;qmi.service_ins_id = ab-&gt;hw_params-&gt;qmi_service_ins_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_ce_workqueue(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ce_pipe *ce_pipe = from_work(ce_pipe, work, intr_wq);</div><div class='add'>+</div><div class='add'>+	ath12k_ce_per_engine_service(ce_pipe-&gt;ab, ce_pipe-&gt;pipe_num);</div><div class='add'>+</div><div class='add'>+	ath12k_ahb_ce_irq_enable(ce_pipe-&gt;ab, ce_pipe-&gt;pipe_num);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t ath12k_ahb_ce_interrupt_handler(int irq, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ce_pipe *ce_pipe = arg;</div><div class='add'>+</div><div class='add'>+	/* last interrupt received for this CE */</div><div class='add'>+	ce_pipe-&gt;timestamp = jiffies;</div><div class='add'>+</div><div class='add'>+	ath12k_ahb_ce_irq_disable(ce_pipe-&gt;ab, ce_pipe-&gt;pipe_num);</div><div class='add'>+</div><div class='add'>+	queue_work(system_bh_wq, &amp;ce_pipe-&gt;intr_wq);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_ahb_ext_grp_napi_poll(struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ext_irq_grp *irq_grp = container_of(napi,</div><div class='add'>+						struct ath12k_ext_irq_grp,</div><div class='add'>+						napi);</div><div class='add'>+	struct ath12k_base *ab = irq_grp-&gt;ab;</div><div class='add'>+	int work_done;</div><div class='add'>+</div><div class='add'>+	work_done = ath12k_dp_service_srng(ab, irq_grp, budget);</div><div class='add'>+	if (work_done &lt; budget) {</div><div class='add'>+		napi_complete_done(napi, work_done);</div><div class='add'>+		ath12k_ahb_ext_grp_enable(irq_grp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (work_done &gt; budget)</div><div class='add'>+		work_done = budget;</div><div class='add'>+</div><div class='add'>+	return work_done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t ath12k_ahb_ext_interrupt_handler(int irq, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ext_irq_grp *irq_grp = arg;</div><div class='add'>+</div><div class='add'>+	/* last interrupt received for this group */</div><div class='add'>+	irq_grp-&gt;timestamp = jiffies;</div><div class='add'>+</div><div class='add'>+	ath12k_ahb_ext_grp_disable(irq_grp);</div><div class='add'>+</div><div class='add'>+	napi_schedule(&amp;irq_grp-&gt;napi);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_ahb_config_ext_irq(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_hw_ring_mask *ring_mask;</div><div class='add'>+	struct ath12k_ext_irq_grp *irq_grp;</div><div class='add'>+	const struct hal_ops *hal_ops;</div><div class='add'>+	int i, j, irq, irq_idx, ret;</div><div class='add'>+	u32 num_irq;</div><div class='add'>+</div><div class='add'>+	ring_mask = ab-&gt;hw_params-&gt;ring_mask;</div><div class='add'>+	hal_ops = ab-&gt;hw_params-&gt;hal_ops;</div><div class='add'>+	for (i = 0; i &lt; ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) {</div><div class='add'>+		irq_grp = &amp;ab-&gt;ext_irq_grp[i];</div><div class='add'>+		num_irq = 0;</div><div class='add'>+</div><div class='add'>+		irq_grp-&gt;ab = ab;</div><div class='add'>+		irq_grp-&gt;grp_id = i;</div><div class='add'>+</div><div class='add'>+		irq_grp-&gt;napi_ndev = alloc_netdev_dummy(0);</div><div class='add'>+		if (!irq_grp-&gt;napi_ndev)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		netif_napi_add(irq_grp-&gt;napi_ndev, &amp;irq_grp-&gt;napi,</div><div class='add'>+			       ath12k_ahb_ext_grp_napi_poll);</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; ATH12K_EXT_IRQ_NUM_MAX; j++) {</div><div class='add'>+			/* For TX ring, ensure that the ring mask and the</div><div class='add'>+			 * tcl_to_wbm_rbm_map point to the same ring number.</div><div class='add'>+			 */</div><div class='add'>+			if (ring_mask-&gt;tx[i] &amp;</div><div class='add'>+			    BIT(hal_ops-&gt;tcl_to_wbm_rbm_map[j].wbm_ring_num)) {</div><div class='add'>+				irq_grp-&gt;irqs[num_irq++] =</div><div class='add'>+					wbm2host_tx_completions_ring1 - j;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (ring_mask-&gt;rx[i] &amp; BIT(j)) {</div><div class='add'>+				irq_grp-&gt;irqs[num_irq++] =</div><div class='add'>+					reo2host_destination_ring1 - j;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (ring_mask-&gt;rx_err[i] &amp; BIT(j))</div><div class='add'>+				irq_grp-&gt;irqs[num_irq++] = reo2host_exception;</div><div class='add'>+</div><div class='add'>+			if (ring_mask-&gt;rx_wbm_rel[i] &amp; BIT(j))</div><div class='add'>+				irq_grp-&gt;irqs[num_irq++] = wbm2host_rx_release;</div><div class='add'>+</div><div class='add'>+			if (ring_mask-&gt;reo_status[i] &amp; BIT(j))</div><div class='add'>+				irq_grp-&gt;irqs[num_irq++] = reo2host_status;</div><div class='add'>+</div><div class='add'>+			if (ring_mask-&gt;rx_mon_dest[i] &amp; BIT(j))</div><div class='add'>+				irq_grp-&gt;irqs[num_irq++] =</div><div class='add'>+					rxdma2host_monitor_destination_mac1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		irq_grp-&gt;num_irq = num_irq;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; irq_grp-&gt;num_irq; j++) {</div><div class='add'>+			irq_idx = irq_grp-&gt;irqs[j];</div><div class='add'>+</div><div class='add'>+			irq = platform_get_irq_byname(ab-&gt;pdev,</div><div class='add'>+						      irq_name[irq_idx]);</div><div class='add'>+			ab-&gt;irq_num[irq_idx] = irq;</div><div class='add'>+			irq_set_status_flags(irq, IRQ_NOAUTOEN | IRQ_DISABLE_UNLAZY);</div><div class='add'>+			ret = devm_request_irq(ab-&gt;dev, irq,</div><div class='add'>+					       ath12k_ahb_ext_interrupt_handler,</div><div class='add'>+					       IRQF_TRIGGER_RISING,</div><div class='add'>+					       irq_name[irq_idx], irq_grp);</div><div class='add'>+			if (ret)</div><div class='add'>+				ath12k_warn(ab, "failed request_irq for %d\n", irq);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_ahb_config_irq(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int irq, irq_idx, i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Configure CE irqs */</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;ce_count; i++) {</div><div class='add'>+		struct ath12k_ce_pipe *ce_pipe = &amp;ab-&gt;ce.ce_pipe[i];</div><div class='add'>+</div><div class='add'>+		if (ath12k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		irq_idx = ATH12K_IRQ_CE0_OFFSET + i;</div><div class='add'>+</div><div class='add'>+		INIT_WORK(&amp;ce_pipe-&gt;intr_wq, ath12k_ahb_ce_workqueue);</div><div class='add'>+		irq = platform_get_irq_byname(ab-&gt;pdev, irq_name[irq_idx]);</div><div class='add'>+		ret = devm_request_irq(ab-&gt;dev, irq, ath12k_ahb_ce_interrupt_handler,</div><div class='add'>+				       IRQF_TRIGGER_RISING, irq_name[irq_idx],</div><div class='add'>+				       ce_pipe);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ab-&gt;irq_num[irq_idx] = irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Configure external interrupts */</div><div class='add'>+	ret = ath12k_ahb_config_ext_irq(ab);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_ahb_map_service_to_pipe(struct ath12k_base *ab, u16 service_id,</div><div class='add'>+					  u8 *ul_pipe, u8 *dl_pipe)</div><div class='add'>+{</div><div class='add'>+	const struct service_to_pipe *entry;</div><div class='add'>+	bool ul_set = false, dl_set = false;</div><div class='add'>+	u32 pipedir;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;svc_to_ce_map_len; i++) {</div><div class='add'>+		entry = &amp;ab-&gt;hw_params-&gt;svc_to_ce_map[i];</div><div class='add'>+</div><div class='add'>+		if (__le32_to_cpu(entry-&gt;service_id) != service_id)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		pipedir = __le32_to_cpu(entry-&gt;pipedir);</div><div class='add'>+		if (pipedir == PIPEDIR_IN || pipedir == PIPEDIR_INOUT) {</div><div class='add'>+			WARN_ON(dl_set);</div><div class='add'>+			*dl_pipe = __le32_to_cpu(entry-&gt;pipenum);</div><div class='add'>+			dl_set = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (pipedir == PIPEDIR_OUT || pipedir == PIPEDIR_INOUT) {</div><div class='add'>+			WARN_ON(ul_set);</div><div class='add'>+			*ul_pipe = __le32_to_cpu(entry-&gt;pipenum);</div><div class='add'>+			ul_set = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!ul_set || !dl_set))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ath12k_hif_ops ath12k_ahb_hif_ops_ipq5332 = {</div><div class='add'>+	.start = ath12k_ahb_start,</div><div class='add'>+	.stop = ath12k_ahb_stop,</div><div class='add'>+	.read32 = ath12k_ahb_read32,</div><div class='add'>+	.write32 = ath12k_ahb_write32,</div><div class='add'>+	.irq_enable = ath12k_ahb_ext_irq_enable,</div><div class='add'>+	.irq_disable = ath12k_ahb_ext_irq_disable,</div><div class='add'>+	.map_service_to_pipe = ath12k_ahb_map_service_to_pipe,</div><div class='add'>+	.power_up = ath12k_ahb_power_up,</div><div class='add'>+	.power_down = ath12k_ahb_power_down,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static irqreturn_t ath12k_userpd_irq_handler(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = data;</div><div class='add'>+	struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab);</div><div class='add'>+</div><div class='add'>+	if (irq == ab_ahb-&gt;userpd_irq_num[ATH12K_USERPD_SPAWN_IRQ]) {</div><div class='add'>+		complete(&amp;ab_ahb-&gt;userpd_spawned);</div><div class='add'>+	} else if (irq == ab_ahb-&gt;userpd_irq_num[ATH12K_USERPD_READY_IRQ]) {</div><div class='add'>+		complete(&amp;ab_ahb-&gt;userpd_ready);</div><div class='add'>+	} else if (irq == ab_ahb-&gt;userpd_irq_num[ATH12K_USERPD_STOP_ACK_IRQ])	{</div><div class='add'>+		complete(&amp;ab_ahb-&gt;userpd_stopped);</div><div class='add'>+	} else {</div><div class='add'>+		ath12k_err(ab, "Invalid userpd interrupt\n");</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_ahb_config_rproc_irq(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab);</div><div class='add'>+	int i, ret;</div><div class='add'>+	char *upd_irq_name;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH12K_USERPD_MAX_IRQ; i++) {</div><div class='add'>+		ab_ahb-&gt;userpd_irq_num[i] = platform_get_irq_byname(ab-&gt;pdev,</div><div class='add'>+								    ath12k_userpd_irq[i]);</div><div class='add'>+		if (ab_ahb-&gt;userpd_irq_num[i] &lt; 0)</div><div class='add'>+			return ab_ahb-&gt;userpd_irq_num[i];</div><div class='add'>+</div><div class='add'>+		upd_irq_name = devm_kzalloc(&amp;ab-&gt;pdev-&gt;dev, ATH12K_UPD_IRQ_WRD_LEN,</div><div class='add'>+					    GFP_KERNEL);</div><div class='add'>+		if (!upd_irq_name)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		scnprintf(upd_irq_name, ATH12K_UPD_IRQ_WRD_LEN, "UserPD%u-%s",</div><div class='add'>+			  ab_ahb-&gt;userpd_id, ath12k_userpd_irq[i]);</div><div class='add'>+		ret = devm_request_threaded_irq(&amp;ab-&gt;pdev-&gt;dev, ab_ahb-&gt;userpd_irq_num[i],</div><div class='add'>+						NULL, ath12k_userpd_irq_handler,</div><div class='add'>+						IRQF_TRIGGER_RISING | IRQF_ONESHOT,</div><div class='add'>+						upd_irq_name, ab);</div><div class='add'>+		if (ret)</div><div class='add'>+			return dev_err_probe(&amp;ab-&gt;pdev-&gt;dev, ret,</div><div class='add'>+					     "Request %s irq failed: %d\n",</div><div class='add'>+					     ath12k_userpd_irq[i], ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab_ahb-&gt;spawn_state = devm_qcom_smem_state_get(&amp;ab-&gt;pdev-&gt;dev, "spawn",</div><div class='add'>+						       &amp;ab_ahb-&gt;spawn_bit);</div><div class='add'>+	if (IS_ERR(ab_ahb-&gt;spawn_state))</div><div class='add'>+		return dev_err_probe(&amp;ab-&gt;pdev-&gt;dev, PTR_ERR(ab_ahb-&gt;spawn_state),</div><div class='add'>+				     "Failed to acquire spawn state\n");</div><div class='add'>+</div><div class='add'>+	ab_ahb-&gt;stop_state = devm_qcom_smem_state_get(&amp;ab-&gt;pdev-&gt;dev, "stop",</div><div class='add'>+						      &amp;ab_ahb-&gt;stop_bit);</div><div class='add'>+	if (IS_ERR(ab_ahb-&gt;stop_state))</div><div class='add'>+		return dev_err_probe(&amp;ab-&gt;pdev-&gt;dev, PTR_ERR(ab_ahb-&gt;stop_state),</div><div class='add'>+				     "Failed to acquire stop state\n");</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;ab_ahb-&gt;userpd_spawned);</div><div class='add'>+	init_completion(&amp;ab_ahb-&gt;userpd_ready);</div><div class='add'>+	init_completion(&amp;ab_ahb-&gt;userpd_stopped);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_ahb_root_pd_state_notifier(struct notifier_block *nb,</div><div class='add'>+					     const unsigned long event, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ahb *ab_ahb = container_of(nb, struct ath12k_ahb, root_pd_nb);</div><div class='add'>+	struct ath12k_base *ab = ab_ahb-&gt;ab;</div><div class='add'>+</div><div class='add'>+	if (event == ATH12K_RPROC_AFTER_POWERUP) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_AHB, "Root PD is UP\n");</div><div class='add'>+		complete(&amp;ab_ahb-&gt;rootpd_ready);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_ahb_register_rproc_notifier(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab);</div><div class='add'>+</div><div class='add'>+	ab_ahb-&gt;root_pd_nb.notifier_call = ath12k_ahb_root_pd_state_notifier;</div><div class='add'>+	init_completion(&amp;ab_ahb-&gt;rootpd_ready);</div><div class='add'>+</div><div class='add'>+	ab_ahb-&gt;root_pd_notifier = qcom_register_ssr_notifier(ab_ahb-&gt;tgt_rproc-&gt;name,</div><div class='add'>+							      &amp;ab_ahb-&gt;root_pd_nb);</div><div class='add'>+	if (IS_ERR(ab_ahb-&gt;root_pd_notifier))</div><div class='add'>+		return PTR_ERR(ab_ahb-&gt;root_pd_notifier);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_unregister_rproc_notifier(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab);</div><div class='add'>+</div><div class='add'>+	if (!ab_ahb-&gt;root_pd_notifier) {</div><div class='add'>+		ath12k_err(ab, "Rproc notifier not registered\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qcom_unregister_ssr_notifier(ab_ahb-&gt;root_pd_notifier,</div><div class='add'>+				     &amp;ab_ahb-&gt;root_pd_nb);</div><div class='add'>+	ab_ahb-&gt;root_pd_notifier = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_ahb_get_rproc(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab);</div><div class='add'>+	struct device *dev = ab-&gt;dev;</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	struct rproc *prproc;</div><div class='add'>+</div><div class='add'>+	np = of_parse_phandle(dev-&gt;of_node, "qcom,rproc", 0);</div><div class='add'>+	if (!np) {</div><div class='add'>+		ath12k_err(ab, "failed to get q6_rproc handle\n");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	prproc = rproc_get_by_phandle(np-&gt;phandle);</div><div class='add'>+	of_node_put(np);</div><div class='add'>+	if (!prproc)</div><div class='add'>+		return dev_err_probe(&amp;ab-&gt;pdev-&gt;dev, -EPROBE_DEFER,</div><div class='add'>+				     "failed to get rproc\n");</div><div class='add'>+</div><div class='add'>+	ab_ahb-&gt;tgt_rproc = prproc;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_ahb_boot_root_pd(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab);</div><div class='add'>+	unsigned long time_left;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = rproc_boot(ab_ahb-&gt;tgt_rproc);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_err(ab, "RootPD boot failed\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;ab_ahb-&gt;rootpd_ready,</div><div class='add'>+						ATH12K_ROOTPD_READY_TIMEOUT);</div><div class='add'>+	if (!time_left) {</div><div class='add'>+		ath12k_err(ab, "RootPD ready wait timed out\n");</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_ahb_configure_rproc(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_ahb_get_rproc(ab);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_ahb_register_rproc_notifier(ab);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ret = dev_err_probe(&amp;ab-&gt;pdev-&gt;dev, ret,</div><div class='add'>+				    "failed to register rproc notifier\n");</div><div class='add'>+		goto err_put_rproc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab_ahb-&gt;tgt_rproc-&gt;state != RPROC_RUNNING) {</div><div class='add'>+		ret = ath12k_ahb_boot_root_pd(ab);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			ath12k_err(ab, "failed to boot the remote processor Q6\n");</div><div class='add'>+			goto err_unreg_notifier;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ath12k_ahb_config_rproc_irq(ab);</div><div class='add'>+</div><div class='add'>+err_unreg_notifier:</div><div class='add'>+	ath12k_ahb_unregister_rproc_notifier(ab);</div><div class='add'>+</div><div class='add'>+err_put_rproc:</div><div class='add'>+	rproc_put(ab_ahb-&gt;tgt_rproc);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_deconfigure_rproc(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab);</div><div class='add'>+</div><div class='add'>+	ath12k_ahb_unregister_rproc_notifier(ab);</div><div class='add'>+	rproc_put(ab_ahb-&gt;tgt_rproc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_ahb_resource_init(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab);</div><div class='add'>+	struct platform_device *pdev = ab-&gt;pdev;</div><div class='add'>+	struct resource *mem_res;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ab-&gt;mem = devm_platform_get_and_ioremap_resource(pdev, 0, &amp;mem_res);</div><div class='add'>+	if (IS_ERR(ab-&gt;mem)) {</div><div class='add'>+		ret = dev_err_probe(&amp;pdev-&gt;dev, PTR_ERR(ab-&gt;mem), "ioremap error\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab-&gt;mem_len = resource_size(mem_res);</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;ce_remap) {</div><div class='add'>+		const struct ce_remap *ce_remap = ab-&gt;hw_params-&gt;ce_remap;</div><div class='add'>+		/* CE register space is moved out of WCSS and the space is not</div><div class='add'>+		 * contiguous, hence remapping the CE registers to a new space</div><div class='add'>+		 * for accessing them.</div><div class='add'>+		 */</div><div class='add'>+		ab-&gt;mem_ce = ioremap(ce_remap-&gt;base, ce_remap-&gt;size);</div><div class='add'>+		if (!ab-&gt;mem_ce) {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "ce ioremap error\n");</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto err_mem_unmap;</div><div class='add'>+		}</div><div class='add'>+		ab-&gt;ce_remap = true;</div><div class='add'>+		ab-&gt;ce_remap_base_addr = HAL_IPQ5332_CE_WFSS_REG_BASE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab_ahb-&gt;xo_clk = devm_clk_get(ab-&gt;dev, "xo");</div><div class='add'>+	if (IS_ERR(ab_ahb-&gt;xo_clk)) {</div><div class='add'>+		ret = dev_err_probe(&amp;pdev-&gt;dev, PTR_ERR(ab_ahb-&gt;xo_clk),</div><div class='add'>+				    "failed to get xo clock\n");</div><div class='add'>+		goto err_mem_ce_unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(ab_ahb-&gt;xo_clk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to enable gcc_xo_clk: %d\n", ret);</div><div class='add'>+		goto err_clock_deinit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_clock_deinit:</div><div class='add'>+	devm_clk_put(ab-&gt;dev, ab_ahb-&gt;xo_clk);</div><div class='add'>+</div><div class='add'>+err_mem_ce_unmap:</div><div class='add'>+	ab_ahb-&gt;xo_clk = NULL;</div><div class='add'>+	if (ab-&gt;hw_params-&gt;ce_remap)</div><div class='add'>+		iounmap(ab-&gt;mem_ce);</div><div class='add'>+</div><div class='add'>+err_mem_unmap:</div><div class='add'>+	ab-&gt;mem_ce = NULL;</div><div class='add'>+	devm_iounmap(ab-&gt;dev, ab-&gt;mem);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	ab-&gt;mem = NULL;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_resource_deinit(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab);</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;mem)</div><div class='add'>+		devm_iounmap(ab-&gt;dev, ab-&gt;mem);</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;mem_ce)</div><div class='add'>+		iounmap(ab-&gt;mem_ce);</div><div class='add'>+</div><div class='add'>+	ab-&gt;mem = NULL;</div><div class='add'>+	ab-&gt;mem_ce = NULL;</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(ab_ahb-&gt;xo_clk);</div><div class='add'>+	devm_clk_put(ab-&gt;dev, ab_ahb-&gt;xo_clk);</div><div class='add'>+	ab_ahb-&gt;xo_clk = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_ahb_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	const struct ath12k_hif_ops *hif_ops;</div><div class='add'>+	struct ath12k_ahb *ab_ahb;</div><div class='add'>+	enum ath12k_hw_rev hw_rev;</div><div class='add'>+	u32 addr, userpd_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to set 32-bit coherent dma\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab = ath12k_core_alloc(&amp;pdev-&gt;dev, sizeof(struct ath12k_ahb),</div><div class='add'>+			       ATH12K_BUS_AHB);</div><div class='add'>+	if (!ab)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hw_rev = (enum ath12k_hw_rev)(kernel_ulong_t)of_device_get_match_data(&amp;pdev-&gt;dev);</div><div class='add'>+	switch (hw_rev) {</div><div class='add'>+	case ATH12K_HW_IPQ5332_HW10:</div><div class='add'>+		hif_ops = &amp;ath12k_ahb_hif_ops_ipq5332;</div><div class='add'>+		userpd_id = ATH12K_IPQ5332_USERPD_ID;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto err_core_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab-&gt;hif.ops = hif_ops;</div><div class='add'>+	ab-&gt;pdev = pdev;</div><div class='add'>+	ab-&gt;hw_rev = hw_rev;</div><div class='add'>+	ab-&gt;target_mem_mode = ATH12K_QMI_MEMORY_MODE_DEFAULT;</div><div class='add'>+	platform_set_drvdata(pdev, ab);</div><div class='add'>+	ab_ahb = ath12k_ab_to_ahb(ab);</div><div class='add'>+	ab_ahb-&gt;ab = ab;</div><div class='add'>+	ab_ahb-&gt;userpd_id = userpd_id;</div><div class='add'>+</div><div class='add'>+	/* Set fixed_mem_region to true for platforms that support fixed memory</div><div class='add'>+	 * reservation from DT. If memory is reserved from DT for FW, ath12k driver</div><div class='add'>+	 * need not to allocate memory.</div><div class='add'>+	 */</div><div class='add'>+	if (!of_property_read_u32(ab-&gt;dev-&gt;of_node, "memory-region", &amp;addr))</div><div class='add'>+		set_bit(ATH12K_FLAG_FIXED_MEM_REGION, &amp;ab-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_pre_init(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_core_free;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_ahb_resource_init(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_core_free;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_hal_srng_init(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_resource_deinit;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_ce_alloc_pipes(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to allocate ce pipes: %d\n", ret);</div><div class='add'>+		goto err_hal_srng_deinit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_ahb_init_qmi_ce_config(ab);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_ahb_configure_rproc(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_ce_free;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_ahb_config_irq(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to configure irq: %d\n", ret);</div><div class='add'>+		goto err_rproc_deconfigure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_init(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to init core: %d\n", ret);</div><div class='add'>+		goto err_rproc_deconfigure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_rproc_deconfigure:</div><div class='add'>+	ath12k_ahb_deconfigure_rproc(ab);</div><div class='add'>+</div><div class='add'>+err_ce_free:</div><div class='add'>+	ath12k_ce_free_pipes(ab);</div><div class='add'>+</div><div class='add'>+err_hal_srng_deinit:</div><div class='add'>+	ath12k_hal_srng_deinit(ab);</div><div class='add'>+</div><div class='add'>+err_resource_deinit:</div><div class='add'>+	ath12k_ahb_resource_deinit(ab);</div><div class='add'>+</div><div class='add'>+err_core_free:</div><div class='add'>+	ath12k_core_free(ab);</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_remove_prepare(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	unsigned long left;</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_FLAG_RECOVERY, &amp;ab-&gt;dev_flags)) {</div><div class='add'>+		left = wait_for_completion_timeout(&amp;ab-&gt;driver_recovery,</div><div class='add'>+						   ATH12K_AHB_RECOVERY_TIMEOUT);</div><div class='add'>+		if (!left)</div><div class='add'>+			ath12k_warn(ab, "failed to receive recovery response completion\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_bit(ATH12K_FLAG_UNREGISTERING, &amp;ab-&gt;dev_flags);</div><div class='add'>+	cancel_work_sync(&amp;ab-&gt;restart_work);</div><div class='add'>+	cancel_work_sync(&amp;ab-&gt;qmi.event_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_free_resources(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = ab-&gt;pdev;</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_deinit(ab);</div><div class='add'>+	ath12k_ce_free_pipes(ab);</div><div class='add'>+	ath12k_ahb_resource_deinit(ab);</div><div class='add'>+	ath12k_ahb_deconfigure_rproc(ab);</div><div class='add'>+	ath12k_core_free(ab);</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahb_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_FLAG_QMI_FAIL, &amp;ab-&gt;dev_flags)) {</div><div class='add'>+		ath12k_ahb_power_down(ab, false);</div><div class='add'>+		goto qmi_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_ahb_remove_prepare(ab);</div><div class='add'>+	ath12k_core_hw_group_cleanup(ab-&gt;ag);</div><div class='add'>+qmi_fail:</div><div class='add'>+	ath12k_core_deinit(ab);</div><div class='add'>+	ath12k_ahb_free_resources(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver ath12k_ahb_driver = {</div><div class='add'>+	.driver         = {</div><div class='add'>+		.name   = "ath12k_ahb",</div><div class='add'>+		.of_match_table = ath12k_ahb_of_match,</div><div class='add'>+	},</div><div class='add'>+	.probe  = ath12k_ahb_probe,</div><div class='add'>+	.remove = ath12k_ahb_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ath12k_ahb_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;ath12k_ahb_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_ahb_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;ath12k_ahb_driver);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/ahb.h b/drivers/net/wireless/ath/ath12k/ahb.h<br/>new file mode 100644<br/>index 000000000000..d56244b20a6a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/ahb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/ahb.h</a></div><div class='hunk'>@@ -0,0 +1,80 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022-2025, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+#ifndef ATH12K_AHB_H</div><div class='add'>+#define ATH12K_AHB_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/remoteproc/qcom_rproc.h&gt;</div><div class='add'>+#include "core.h"</div><div class='add'>+</div><div class='add'>+#define ATH12K_AHB_RECOVERY_TIMEOUT (3 * HZ)</div><div class='add'>+</div><div class='add'>+#define ATH12K_AHB_SMP2P_SMEM_MSG		GENMASK(15, 0)</div><div class='add'>+#define ATH12K_AHB_SMP2P_SMEM_SEQ_NO		GENMASK(31, 16)</div><div class='add'>+#define ATH12K_AHB_SMP2P_SMEM_VALUE_MASK	0xFFFFFFFF</div><div class='add'>+#define ATH12K_PCI_CE_WAKE_IRQ			2</div><div class='add'>+#define ATH12K_PCI_IRQ_CE0_OFFSET		3</div><div class='add'>+#define ATH12K_ROOTPD_READY_TIMEOUT		(5 * HZ)</div><div class='add'>+#define ATH12K_RPROC_AFTER_POWERUP		QCOM_SSR_AFTER_POWERUP</div><div class='add'>+#define ATH12K_AHB_FW_PREFIX			"q6_fw"</div><div class='add'>+#define ATH12K_AHB_FW_SUFFIX			".mdt"</div><div class='add'>+#define ATH12K_AHB_FW2				"iu_fw.mdt"</div><div class='add'>+#define ATH12K_AHB_UPD_SWID			0x12</div><div class='add'>+#define ATH12K_USERPD_SPAWN_TIMEOUT		(5 * HZ)</div><div class='add'>+#define ATH12K_USERPD_READY_TIMEOUT		(10 * HZ)</div><div class='add'>+#define ATH12K_USERPD_STOP_TIMEOUT		(5 * HZ)</div><div class='add'>+#define ATH12K_USERPD_ID_MASK			GENMASK(9, 8)</div><div class='add'>+#define ATH12K_USERPD_FW_NAME_LEN		35</div><div class='add'>+</div><div class='add'>+enum ath12k_ahb_smp2p_msg_id {</div><div class='add'>+	ATH12K_AHB_POWER_SAVE_ENTER = 1,</div><div class='add'>+	ATH12K_AHB_POWER_SAVE_EXIT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_ahb_userpd_irq {</div><div class='add'>+	ATH12K_USERPD_SPAWN_IRQ,</div><div class='add'>+	ATH12K_USERPD_READY_IRQ,</div><div class='add'>+	ATH12K_USERPD_STOP_ACK_IRQ,</div><div class='add'>+	ATH12K_USERPD_MAX_IRQ,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_base;</div><div class='add'>+</div><div class='add'>+struct ath12k_ahb {</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	struct rproc *tgt_rproc;</div><div class='add'>+	struct clk *xo_clk;</div><div class='add'>+	struct completion rootpd_ready;</div><div class='add'>+	struct notifier_block root_pd_nb;</div><div class='add'>+	void *root_pd_notifier;</div><div class='add'>+	struct qcom_smem_state *spawn_state;</div><div class='add'>+	struct qcom_smem_state *stop_state;</div><div class='add'>+	struct completion userpd_spawned;</div><div class='add'>+	struct completion userpd_ready;</div><div class='add'>+	struct completion userpd_stopped;</div><div class='add'>+	u32 userpd_id;</div><div class='add'>+	u32 spawn_bit;</div><div class='add'>+	u32 stop_bit;</div><div class='add'>+	int userpd_irq_num[ATH12K_USERPD_MAX_IRQ];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct ath12k_ahb *ath12k_ab_to_ahb(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return (struct ath12k_ahb *)ab-&gt;drv_priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ATH12K_AHB</div><div class='add'>+int ath12k_ahb_init(void);</div><div class='add'>+void ath12k_ahb_exit(void);</div><div class='add'>+#else</div><div class='add'>+static inline int ath12k_ahb_init(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_ahb_exit(void) {};</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/ce.c b/drivers/net/wireless/ath/ath12k/ce.c<br/>new file mode 100644<br/>index 000000000000..9a63608838ac<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/ce.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/ce.c</a></div><div class='hunk'>@@ -0,0 +1,1051 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2022, 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "dp_rx.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "hif.h"</div><div class='add'>+</div><div class='add'>+const struct ce_attr ath12k_host_ce_config_qcn9274[] = {</div><div class='add'>+	/* CE0: host-&gt;target HTC control and raw streams */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS,</div><div class='add'>+		.src_nentries = 16,</div><div class='add'>+		.src_sz_max = 2048,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE1: target-&gt;host HTT + HTC control */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 2048,</div><div class='add'>+		.dest_nentries = 512,</div><div class='add'>+		.recv_cb = ath12k_htc_rx_completion_handler,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE2: target-&gt;host WMI */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 2048,</div><div class='add'>+		.dest_nentries = 128,</div><div class='add'>+		.recv_cb = ath12k_htc_rx_completion_handler,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE3: host-&gt;target WMI (mac0) */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS,</div><div class='add'>+		.src_nentries = 32,</div><div class='add'>+		.src_sz_max = 2048,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE4: host-&gt;target HTT */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,</div><div class='add'>+		.src_nentries = 2048,</div><div class='add'>+		.src_sz_max = 256,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE5: target-&gt;host pktlog */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 2048,</div><div class='add'>+		.dest_nentries = 512,</div><div class='add'>+		.recv_cb = ath12k_dp_htt_htc_t2h_msg_handler,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE6: target autonomous hif_memcpy */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 0,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE7: host-&gt;target WMI (mac1) */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS,</div><div class='add'>+		.src_nentries = 32,</div><div class='add'>+		.src_sz_max = 2048,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE8: target autonomous hif_memcpy */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 0,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE9: MHI */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 0,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE10: MHI */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 0,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE11: MHI */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 0,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE12: CV Prefetch */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 0,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE13: CV Prefetch */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 0,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE14: target-&gt;host dbg log */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 2048,</div><div class='add'>+		.dest_nentries = 512,</div><div class='add'>+		.recv_cb = ath12k_htc_rx_completion_handler,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE15: reserved for future use */</div><div class='add'>+	{</div><div class='add'>+		.flags = (CE_ATTR_FLAGS | CE_ATTR_DIS_INTR),</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 0,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct ce_attr ath12k_host_ce_config_wcn7850[] = {</div><div class='add'>+	/* CE0: host-&gt;target HTC control and raw streams */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS,</div><div class='add'>+		.src_nentries = 16,</div><div class='add'>+		.src_sz_max = 2048,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE1: target-&gt;host HTT + HTC control */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 2048,</div><div class='add'>+		.dest_nentries = 512,</div><div class='add'>+		.recv_cb = ath12k_htc_rx_completion_handler,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE2: target-&gt;host WMI */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 2048,</div><div class='add'>+		.dest_nentries = 64,</div><div class='add'>+		.recv_cb = ath12k_htc_rx_completion_handler,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE3: host-&gt;target WMI (mac0) */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS,</div><div class='add'>+		.src_nentries = 32,</div><div class='add'>+		.src_sz_max = 2048,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE4: host-&gt;target HTT */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,</div><div class='add'>+		.src_nentries = 2048,</div><div class='add'>+		.src_sz_max = 256,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE5: target-&gt;host pktlog */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 0,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE6: target autonomous hif_memcpy */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 0,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE7: host-&gt;target WMI (mac1) */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 2048,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE8: target autonomous hif_memcpy */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 0,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct ce_attr ath12k_host_ce_config_ipq5332[] = {</div><div class='add'>+	/* CE0: host-&gt;target HTC control and raw streams */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS,</div><div class='add'>+		.src_nentries = 16,</div><div class='add'>+		.src_sz_max = 2048,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+	/* CE1: target-&gt;host HTT + HTC control */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 2048,</div><div class='add'>+		.dest_nentries = 512,</div><div class='add'>+		.recv_cb = ath12k_htc_rx_completion_handler,</div><div class='add'>+	},</div><div class='add'>+	/* CE2: target-&gt;host WMI */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 2048,</div><div class='add'>+		.dest_nentries = 128,</div><div class='add'>+		.recv_cb = ath12k_htc_rx_completion_handler,</div><div class='add'>+	},</div><div class='add'>+	/* CE3: host-&gt;target WMI */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS,</div><div class='add'>+		.src_nentries = 32,</div><div class='add'>+		.src_sz_max = 2048,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+	/* CE4: host-&gt;target HTT */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,</div><div class='add'>+		.src_nentries = 2048,</div><div class='add'>+		.src_sz_max = 256,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+	/* CE5: target -&gt; host PKTLOG */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 2048,</div><div class='add'>+		.dest_nentries = 512,</div><div class='add'>+		.recv_cb = ath12k_dp_htt_htc_t2h_msg_handler,</div><div class='add'>+	},</div><div class='add'>+	/* CE6: Target autonomous HIF_memcpy */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 0,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+	/* CE7: CV Prefetch */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 0,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+	/* CE8: Target HIF memcpy (Generic HIF memcypy) */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 0,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+	/* CE9: WMI logging/CFR/Spectral/Radar */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 2048,</div><div class='add'>+		.dest_nentries = 128,</div><div class='add'>+	},</div><div class='add'>+	/* CE10: Unused */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 0,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+	/* CE11: Unused */</div><div class='add'>+	{</div><div class='add'>+		.flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,</div><div class='add'>+		.src_nentries = 0,</div><div class='add'>+		.src_sz_max = 0,</div><div class='add'>+		.dest_nentries = 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ath12k_ce_rx_buf_enqueue_pipe(struct ath12k_ce_pipe *pipe,</div><div class='add'>+					 struct sk_buff *skb, dma_addr_t paddr)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = pipe-&gt;ab;</div><div class='add'>+	struct ath12k_ce_ring *ring = pipe-&gt;dest_ring;</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	unsigned int write_index;</div><div class='add'>+	unsigned int nentries_mask = ring-&gt;nentries_mask;</div><div class='add'>+	struct hal_ce_srng_dest_desc *desc;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ab-&gt;ce.ce_lock);</div><div class='add'>+</div><div class='add'>+	write_index = ring-&gt;write_index;</div><div class='add'>+</div><div class='add'>+	srng = &amp;ab-&gt;hal.srng_list[ring-&gt;hal_ring_id];</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_begin(ab, srng);</div><div class='add'>+</div><div class='add'>+	if (unlikely(ath12k_hal_srng_src_num_free(ab, srng, false) &lt; 1)) {</div><div class='add'>+		ret = -ENOSPC;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc = ath12k_hal_srng_src_get_next_entry(ab, srng);</div><div class='add'>+	if (!desc) {</div><div class='add'>+		ret = -ENOSPC;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_hal_ce_dst_set_desc(desc, paddr);</div><div class='add'>+</div><div class='add'>+	ring-&gt;skb[write_index] = skb;</div><div class='add'>+	write_index = CE_RING_IDX_INCR(nentries_mask, write_index);</div><div class='add'>+	ring-&gt;write_index = write_index;</div><div class='add'>+</div><div class='add'>+	pipe-&gt;rx_buf_needed--;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+exit:</div><div class='add'>+	ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_ce_rx_post_pipe(struct ath12k_ce_pipe *pipe)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = pipe-&gt;ab;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!(pipe-&gt;dest_ring || pipe-&gt;status_ring))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;ce.ce_lock);</div><div class='add'>+	while (pipe-&gt;rx_buf_needed) {</div><div class='add'>+		skb = dev_alloc_skb(pipe-&gt;buf_sz);</div><div class='add'>+		if (!skb) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		WARN_ON_ONCE(!IS_ALIGNED((unsigned long)skb-&gt;data, 4));</div><div class='add'>+</div><div class='add'>+		paddr = dma_map_single(ab-&gt;dev, skb-&gt;data,</div><div class='add'>+				       skb-&gt;len + skb_tailroom(skb),</div><div class='add'>+				       DMA_FROM_DEVICE);</div><div class='add'>+		if (unlikely(dma_mapping_error(ab-&gt;dev, paddr))) {</div><div class='add'>+			ath12k_warn(ab, "failed to dma map ce rx buf\n");</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ATH12K_SKB_RXCB(skb)-&gt;paddr = paddr;</div><div class='add'>+</div><div class='add'>+		ret = ath12k_ce_rx_buf_enqueue_pipe(pipe, skb, paddr);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_CE, "failed to enqueue rx buf: %d\n",</div><div class='add'>+				   ret);</div><div class='add'>+			dma_unmap_single(ab-&gt;dev, paddr,</div><div class='add'>+					 skb-&gt;len + skb_tailroom(skb),</div><div class='add'>+					 DMA_FROM_DEVICE);</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;ce.ce_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_ce_completed_recv_next(struct ath12k_ce_pipe *pipe,</div><div class='add'>+					 struct sk_buff **skb, int *nbytes)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = pipe-&gt;ab;</div><div class='add'>+	struct hal_ce_srng_dst_status_desc *desc;</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	unsigned int sw_index;</div><div class='add'>+	unsigned int nentries_mask;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;ce.ce_lock);</div><div class='add'>+</div><div class='add'>+	sw_index = pipe-&gt;dest_ring-&gt;sw_index;</div><div class='add'>+	nentries_mask = pipe-&gt;dest_ring-&gt;nentries_mask;</div><div class='add'>+</div><div class='add'>+	srng = &amp;ab-&gt;hal.srng_list[pipe-&gt;status_ring-&gt;hal_ring_id];</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_begin(ab, srng);</div><div class='add'>+</div><div class='add'>+	desc = ath12k_hal_srng_dst_get_next_entry(ab, srng);</div><div class='add'>+	if (!desc) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*nbytes = ath12k_hal_ce_dst_status_get_length(desc);</div><div class='add'>+</div><div class='add'>+	*skb = pipe-&gt;dest_ring-&gt;skb[sw_index];</div><div class='add'>+	pipe-&gt;dest_ring-&gt;skb[sw_index] = NULL;</div><div class='add'>+</div><div class='add'>+	sw_index = CE_RING_IDX_INCR(nentries_mask, sw_index);</div><div class='add'>+	pipe-&gt;dest_ring-&gt;sw_index = sw_index;</div><div class='add'>+</div><div class='add'>+	pipe-&gt;rx_buf_needed++;</div><div class='add'>+err:</div><div class='add'>+	ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;ce.ce_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ce_recv_process_cb(struct ath12k_ce_pipe *pipe)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = pipe-&gt;ab;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct sk_buff_head list;</div><div class='add'>+	unsigned int nbytes, max_nbytes;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	__skb_queue_head_init(&amp;list);</div><div class='add'>+	while (ath12k_ce_completed_recv_next(pipe, &amp;skb, &amp;nbytes) == 0) {</div><div class='add'>+		max_nbytes = skb-&gt;len + skb_tailroom(skb);</div><div class='add'>+		dma_unmap_single(ab-&gt;dev, ATH12K_SKB_RXCB(skb)-&gt;paddr,</div><div class='add'>+				 max_nbytes, DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+		if (unlikely(max_nbytes &lt; nbytes || nbytes == 0)) {</div><div class='add'>+			ath12k_warn(ab, "unexpected rx length (nbytes %d, max %d)",</div><div class='add'>+				    nbytes, max_nbytes);</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb_put(skb, nbytes);</div><div class='add'>+		__skb_queue_tail(&amp;list, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;list))) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_CE, "rx ce pipe %d len %d\n",</div><div class='add'>+			   pipe-&gt;pipe_num, skb-&gt;len);</div><div class='add'>+		pipe-&gt;recv_cb(ab, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_ce_rx_post_pipe(pipe);</div><div class='add'>+	if (ret &amp;&amp; ret != -ENOSPC) {</div><div class='add'>+		ath12k_warn(ab, "failed to post rx buf to pipe: %d err: %d\n",</div><div class='add'>+			    pipe-&gt;pipe_num, ret);</div><div class='add'>+		mod_timer(&amp;ab-&gt;rx_replenish_retry,</div><div class='add'>+			  jiffies + ATH12K_CE_RX_POST_RETRY_JIFFIES);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ath12k_ce_completed_send_next(struct ath12k_ce_pipe *pipe)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = pipe-&gt;ab;</div><div class='add'>+	struct hal_ce_srng_src_desc *desc;</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	unsigned int sw_index;</div><div class='add'>+	unsigned int nentries_mask;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;ce.ce_lock);</div><div class='add'>+</div><div class='add'>+	sw_index = pipe-&gt;src_ring-&gt;sw_index;</div><div class='add'>+	nentries_mask = pipe-&gt;src_ring-&gt;nentries_mask;</div><div class='add'>+</div><div class='add'>+	srng = &amp;ab-&gt;hal.srng_list[pipe-&gt;src_ring-&gt;hal_ring_id];</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_begin(ab, srng);</div><div class='add'>+</div><div class='add'>+	desc = ath12k_hal_srng_src_reap_next(ab, srng);</div><div class='add'>+	if (!desc) {</div><div class='add'>+		skb = ERR_PTR(-EIO);</div><div class='add'>+		goto err_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = pipe-&gt;src_ring-&gt;skb[sw_index];</div><div class='add'>+</div><div class='add'>+	pipe-&gt;src_ring-&gt;skb[sw_index] = NULL;</div><div class='add'>+</div><div class='add'>+	sw_index = CE_RING_IDX_INCR(nentries_mask, sw_index);</div><div class='add'>+	pipe-&gt;src_ring-&gt;sw_index = sw_index;</div><div class='add'>+</div><div class='add'>+err_unlock:</div><div class='add'>+	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;ce.ce_lock);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ce_send_done_cb(struct ath12k_ce_pipe *pipe)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = pipe-&gt;ab;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	while (!IS_ERR(skb = ath12k_ce_completed_send_next(pipe))) {</div><div class='add'>+		if (!skb)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dma_unmap_single(ab-&gt;dev, ATH12K_SKB_CB(skb)-&gt;paddr, skb-&gt;len,</div><div class='add'>+				 DMA_TO_DEVICE);</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ce_srng_msi_ring_params_setup(struct ath12k_base *ab, u32 ce_id,</div><div class='add'>+						 struct hal_srng_params *ring_params)</div><div class='add'>+{</div><div class='add'>+	u32 msi_data_start;</div><div class='add'>+	u32 msi_data_count, msi_data_idx;</div><div class='add'>+	u32 msi_irq_start;</div><div class='add'>+	u32 addr_lo;</div><div class='add'>+	u32 addr_hi;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_hif_get_user_msi_vector(ab, "CE",</div><div class='add'>+					     &amp;msi_data_count, &amp;msi_data_start,</div><div class='add'>+					     &amp;msi_irq_start);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ath12k_hif_get_msi_address(ab, &amp;addr_lo, &amp;addr_hi);</div><div class='add'>+	ath12k_hif_get_ce_msi_idx(ab, ce_id, &amp;msi_data_idx);</div><div class='add'>+</div><div class='add'>+	ring_params-&gt;msi_addr = addr_lo;</div><div class='add'>+	ring_params-&gt;msi_addr |= (dma_addr_t)(((uint64_t)addr_hi) &lt;&lt; 32);</div><div class='add'>+	ring_params-&gt;msi_data = (msi_data_idx % msi_data_count) + msi_data_start;</div><div class='add'>+	ring_params-&gt;flags |= HAL_SRNG_FLAGS_MSI_INTR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_ce_init_ring(struct ath12k_base *ab,</div><div class='add'>+			       struct ath12k_ce_ring *ce_ring,</div><div class='add'>+			       int ce_id, enum hal_ring_type type)</div><div class='add'>+{</div><div class='add'>+	struct hal_srng_params params = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	params.ring_base_paddr = ce_ring-&gt;base_addr_ce_space;</div><div class='add'>+	params.ring_base_vaddr = ce_ring-&gt;base_addr_owner_space;</div><div class='add'>+	params.num_entries = ce_ring-&gt;nentries;</div><div class='add'>+</div><div class='add'>+	if (!(CE_ATTR_DIS_INTR &amp; ab-&gt;hw_params-&gt;host_ce_config[ce_id].flags))</div><div class='add'>+		ath12k_ce_srng_msi_ring_params_setup(ab, ce_id, &amp;params);</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case HAL_CE_SRC:</div><div class='add'>+		if (!(CE_ATTR_DIS_INTR &amp; ab-&gt;hw_params-&gt;host_ce_config[ce_id].flags))</div><div class='add'>+			params.intr_batch_cntr_thres_entries = 1;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_CE_DST:</div><div class='add'>+		params.max_buffer_len = ab-&gt;hw_params-&gt;host_ce_config[ce_id].src_sz_max;</div><div class='add'>+		if (!(ab-&gt;hw_params-&gt;host_ce_config[ce_id].flags &amp; CE_ATTR_DIS_INTR)) {</div><div class='add'>+			params.intr_timer_thres_us = 1024;</div><div class='add'>+			params.flags |= HAL_SRNG_FLAGS_LOW_THRESH_INTR_EN;</div><div class='add'>+			params.low_threshold = ce_ring-&gt;nentries - 3;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case HAL_CE_DST_STATUS:</div><div class='add'>+		if (!(ab-&gt;hw_params-&gt;host_ce_config[ce_id].flags &amp; CE_ATTR_DIS_INTR)) {</div><div class='add'>+			params.intr_batch_cntr_thres_entries = 1;</div><div class='add'>+			params.intr_timer_thres_us = 0x1000;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_warn(ab, "Invalid CE ring type %d\n", type);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TODO: Init other params needed by HAL to init the ring */</div><div class='add'>+</div><div class='add'>+	ret = ath12k_hal_srng_setup(ab, type, ce_id, 0, &amp;params);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_warn(ab, "failed to setup srng: %d ring_id %d\n",</div><div class='add'>+			    ret, ce_id);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ce_ring-&gt;hal_ring_id = ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ath12k_ce_ring *</div><div class='add'>+ath12k_ce_alloc_ring(struct ath12k_base *ab, int nentries, int desc_sz)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ce_ring *ce_ring;</div><div class='add'>+	dma_addr_t base_addr;</div><div class='add'>+</div><div class='add'>+	ce_ring = kzalloc(struct_size(ce_ring, skb, nentries), GFP_KERNEL);</div><div class='add'>+	if (!ce_ring)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	ce_ring-&gt;nentries = nentries;</div><div class='add'>+	ce_ring-&gt;nentries_mask = nentries - 1;</div><div class='add'>+</div><div class='add'>+	/* Legacy platforms that do not support cache</div><div class='add'>+	 * coherent DMA are unsupported</div><div class='add'>+	 */</div><div class='add'>+	ce_ring-&gt;base_addr_owner_space_unaligned =</div><div class='add'>+		dma_alloc_coherent(ab-&gt;dev,</div><div class='add'>+				   nentries * desc_sz + CE_DESC_RING_ALIGN,</div><div class='add'>+				   &amp;base_addr, GFP_KERNEL);</div><div class='add'>+	if (!ce_ring-&gt;base_addr_owner_space_unaligned) {</div><div class='add'>+		kfree(ce_ring);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ce_ring-&gt;base_addr_ce_space_unaligned = base_addr;</div><div class='add'>+</div><div class='add'>+	ce_ring-&gt;base_addr_owner_space =</div><div class='add'>+		PTR_ALIGN(ce_ring-&gt;base_addr_owner_space_unaligned,</div><div class='add'>+			  CE_DESC_RING_ALIGN);</div><div class='add'>+</div><div class='add'>+	ce_ring-&gt;base_addr_ce_space = ALIGN(ce_ring-&gt;base_addr_ce_space_unaligned,</div><div class='add'>+					    CE_DESC_RING_ALIGN);</div><div class='add'>+</div><div class='add'>+	return ce_ring;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_ce_alloc_pipe(struct ath12k_base *ab, int ce_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ce_pipe *pipe = &amp;ab-&gt;ce.ce_pipe[ce_id];</div><div class='add'>+	const struct ce_attr *attr = &amp;ab-&gt;hw_params-&gt;host_ce_config[ce_id];</div><div class='add'>+	struct ath12k_ce_ring *ring;</div><div class='add'>+	int nentries;</div><div class='add'>+	int desc_sz;</div><div class='add'>+</div><div class='add'>+	pipe-&gt;attr_flags = attr-&gt;flags;</div><div class='add'>+</div><div class='add'>+	if (attr-&gt;src_nentries) {</div><div class='add'>+		pipe-&gt;send_cb = ath12k_ce_send_done_cb;</div><div class='add'>+		nentries = roundup_pow_of_two(attr-&gt;src_nentries);</div><div class='add'>+		desc_sz = ath12k_hal_ce_get_desc_size(HAL_CE_DESC_SRC);</div><div class='add'>+		ring = ath12k_ce_alloc_ring(ab, nentries, desc_sz);</div><div class='add'>+		if (IS_ERR(ring))</div><div class='add'>+			return PTR_ERR(ring);</div><div class='add'>+		pipe-&gt;src_ring = ring;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (attr-&gt;dest_nentries) {</div><div class='add'>+		pipe-&gt;recv_cb = attr-&gt;recv_cb;</div><div class='add'>+		nentries = roundup_pow_of_two(attr-&gt;dest_nentries);</div><div class='add'>+		desc_sz = ath12k_hal_ce_get_desc_size(HAL_CE_DESC_DST);</div><div class='add'>+		ring = ath12k_ce_alloc_ring(ab, nentries, desc_sz);</div><div class='add'>+		if (IS_ERR(ring))</div><div class='add'>+			return PTR_ERR(ring);</div><div class='add'>+		pipe-&gt;dest_ring = ring;</div><div class='add'>+</div><div class='add'>+		desc_sz = ath12k_hal_ce_get_desc_size(HAL_CE_DESC_DST_STATUS);</div><div class='add'>+		ring = ath12k_ce_alloc_ring(ab, nentries, desc_sz);</div><div class='add'>+		if (IS_ERR(ring))</div><div class='add'>+			return PTR_ERR(ring);</div><div class='add'>+		pipe-&gt;status_ring = ring;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_ce_per_engine_service(struct ath12k_base *ab, u16 ce_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ce_pipe *pipe = &amp;ab-&gt;ce.ce_pipe[ce_id];</div><div class='add'>+</div><div class='add'>+	if (pipe-&gt;send_cb)</div><div class='add'>+		pipe-&gt;send_cb(pipe);</div><div class='add'>+</div><div class='add'>+	if (pipe-&gt;recv_cb)</div><div class='add'>+		ath12k_ce_recv_process_cb(pipe);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_ce_poll_send_completed(struct ath12k_base *ab, u8 pipe_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ce_pipe *pipe = &amp;ab-&gt;ce.ce_pipe[pipe_id];</div><div class='add'>+</div><div class='add'>+	if ((pipe-&gt;attr_flags &amp; CE_ATTR_DIS_INTR) &amp;&amp; pipe-&gt;send_cb)</div><div class='add'>+		pipe-&gt;send_cb(pipe);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_ce_send(struct ath12k_base *ab, struct sk_buff *skb, u8 pipe_id,</div><div class='add'>+		   u16 transfer_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ce_pipe *pipe = &amp;ab-&gt;ce.ce_pipe[pipe_id];</div><div class='add'>+	struct hal_ce_srng_src_desc *desc;</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	unsigned int write_index, sw_index;</div><div class='add'>+	unsigned int nentries_mask;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u8 byte_swap_data = 0;</div><div class='add'>+	int num_used;</div><div class='add'>+</div><div class='add'>+	/* Check if some entries could be regained by handling tx completion if</div><div class='add'>+	 * the CE has interrupts disabled and the used entries is more than the</div><div class='add'>+	 * defined usage threshold.</div><div class='add'>+	 */</div><div class='add'>+	if (pipe-&gt;attr_flags &amp; CE_ATTR_DIS_INTR) {</div><div class='add'>+		spin_lock_bh(&amp;ab-&gt;ce.ce_lock);</div><div class='add'>+		write_index = pipe-&gt;src_ring-&gt;write_index;</div><div class='add'>+</div><div class='add'>+		sw_index = pipe-&gt;src_ring-&gt;sw_index;</div><div class='add'>+</div><div class='add'>+		if (write_index &gt;= sw_index)</div><div class='add'>+			num_used = write_index - sw_index;</div><div class='add'>+		else</div><div class='add'>+			num_used = pipe-&gt;src_ring-&gt;nentries - sw_index +</div><div class='add'>+				   write_index;</div><div class='add'>+</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;ce.ce_lock);</div><div class='add'>+</div><div class='add'>+		if (num_used &gt; ATH12K_CE_USAGE_THRESHOLD)</div><div class='add'>+			ath12k_ce_poll_send_completed(ab, pipe-&gt;pipe_num);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_FLAG_CRASH_FLUSH, &amp;ab-&gt;dev_flags))</div><div class='add'>+		return -ESHUTDOWN;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;ce.ce_lock);</div><div class='add'>+</div><div class='add'>+	write_index = pipe-&gt;src_ring-&gt;write_index;</div><div class='add'>+	nentries_mask = pipe-&gt;src_ring-&gt;nentries_mask;</div><div class='add'>+</div><div class='add'>+	srng = &amp;ab-&gt;hal.srng_list[pipe-&gt;src_ring-&gt;hal_ring_id];</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_begin(ab, srng);</div><div class='add'>+</div><div class='add'>+	if (unlikely(ath12k_hal_srng_src_num_free(ab, srng, false) &lt; 1)) {</div><div class='add'>+		ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+		ret = -ENOBUFS;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc = ath12k_hal_srng_src_get_next_reaped(ab, srng);</div><div class='add'>+	if (!desc) {</div><div class='add'>+		ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+		ret = -ENOBUFS;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pipe-&gt;attr_flags &amp; CE_ATTR_BYTE_SWAP_DATA)</div><div class='add'>+		byte_swap_data = 1;</div><div class='add'>+</div><div class='add'>+	ath12k_hal_ce_src_set_desc(desc, ATH12K_SKB_CB(skb)-&gt;paddr,</div><div class='add'>+				   skb-&gt;len, transfer_id, byte_swap_data);</div><div class='add'>+</div><div class='add'>+	pipe-&gt;src_ring-&gt;skb[write_index] = skb;</div><div class='add'>+	pipe-&gt;src_ring-&gt;write_index = CE_RING_IDX_INCR(nentries_mask,</div><div class='add'>+						       write_index);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;ce.ce_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ce_rx_pipe_cleanup(struct ath12k_ce_pipe *pipe)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = pipe-&gt;ab;</div><div class='add'>+	struct ath12k_ce_ring *ring = pipe-&gt;dest_ring;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!(ring &amp;&amp; pipe-&gt;buf_sz))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ring-&gt;nentries; i++) {</div><div class='add'>+		skb = ring-&gt;skb[i];</div><div class='add'>+		if (!skb)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ring-&gt;skb[i] = NULL;</div><div class='add'>+		dma_unmap_single(ab-&gt;dev, ATH12K_SKB_RXCB(skb)-&gt;paddr,</div><div class='add'>+				 skb-&gt;len + skb_tailroom(skb), DMA_FROM_DEVICE);</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_ce_cleanup_pipes(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ce_pipe *pipe;</div><div class='add'>+	int pipe_num;</div><div class='add'>+</div><div class='add'>+	for (pipe_num = 0; pipe_num &lt; ab-&gt;hw_params-&gt;ce_count; pipe_num++) {</div><div class='add'>+		pipe = &amp;ab-&gt;ce.ce_pipe[pipe_num];</div><div class='add'>+		ath12k_ce_rx_pipe_cleanup(pipe);</div><div class='add'>+</div><div class='add'>+		/* Cleanup any src CE's which have interrupts disabled */</div><div class='add'>+		ath12k_ce_poll_send_completed(ab, pipe_num);</div><div class='add'>+</div><div class='add'>+		/* NOTE: Should we also clean up tx buffer in all pipes? */</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_ce_rx_post_buf(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ce_pipe *pipe;</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;ce_count; i++) {</div><div class='add'>+		pipe = &amp;ab-&gt;ce.ce_pipe[i];</div><div class='add'>+		ret = ath12k_ce_rx_post_pipe(pipe);</div><div class='add'>+		if (ret) {</div><div class='add'>+			if (ret == -ENOSPC)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			ath12k_warn(ab, "failed to post rx buf to pipe: %d err: %d\n",</div><div class='add'>+				    i, ret);</div><div class='add'>+			mod_timer(&amp;ab-&gt;rx_replenish_retry,</div><div class='add'>+				  jiffies + ATH12K_CE_RX_POST_RETRY_JIFFIES);</div><div class='add'>+</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_ce_rx_replenish_retry(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = timer_container_of(ab, t, rx_replenish_retry);</div><div class='add'>+</div><div class='add'>+	ath12k_ce_rx_post_buf(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ce_shadow_config(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;ce_count; i++) {</div><div class='add'>+		if (ab-&gt;hw_params-&gt;host_ce_config[i].src_nentries)</div><div class='add'>+			ath12k_hal_srng_update_shadow_config(ab, HAL_CE_SRC, i);</div><div class='add'>+</div><div class='add'>+		if (ab-&gt;hw_params-&gt;host_ce_config[i].dest_nentries) {</div><div class='add'>+			ath12k_hal_srng_update_shadow_config(ab, HAL_CE_DST, i);</div><div class='add'>+			ath12k_hal_srng_update_shadow_config(ab, HAL_CE_DST_STATUS, i);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_ce_get_shadow_config(struct ath12k_base *ab,</div><div class='add'>+				 u32 **shadow_cfg, u32 *shadow_cfg_len)</div><div class='add'>+{</div><div class='add'>+	if (!ab-&gt;hw_params-&gt;supports_shadow_regs)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_get_shadow_config(ab, shadow_cfg, shadow_cfg_len);</div><div class='add'>+</div><div class='add'>+	/* shadow is already configured */</div><div class='add'>+	if (*shadow_cfg_len)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* shadow isn't configured yet, configure now.</div><div class='add'>+	 * non-CE srngs are configured firstly, then</div><div class='add'>+	 * all CE srngs.</div><div class='add'>+	 */</div><div class='add'>+	ath12k_hal_srng_shadow_config(ab);</div><div class='add'>+	ath12k_ce_shadow_config(ab);</div><div class='add'>+</div><div class='add'>+	/* get the shadow configuration */</div><div class='add'>+	ath12k_hal_srng_get_shadow_config(ab, shadow_cfg, shadow_cfg_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_ce_init_pipes(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ce_pipe *pipe;</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ath12k_ce_get_shadow_config(ab, &amp;ab-&gt;qmi.ce_cfg.shadow_reg_v3,</div><div class='add'>+				    &amp;ab-&gt;qmi.ce_cfg.shadow_reg_v3_len);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;ce_count; i++) {</div><div class='add'>+		pipe = &amp;ab-&gt;ce.ce_pipe[i];</div><div class='add'>+</div><div class='add'>+		if (pipe-&gt;src_ring) {</div><div class='add'>+			ret = ath12k_ce_init_ring(ab, pipe-&gt;src_ring, i,</div><div class='add'>+						  HAL_CE_SRC);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_warn(ab, "failed to init src ring: %d\n",</div><div class='add'>+					    ret);</div><div class='add'>+				/* Should we clear any partial init */</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			pipe-&gt;src_ring-&gt;write_index = 0;</div><div class='add'>+			pipe-&gt;src_ring-&gt;sw_index = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (pipe-&gt;dest_ring) {</div><div class='add'>+			ret = ath12k_ce_init_ring(ab, pipe-&gt;dest_ring, i,</div><div class='add'>+						  HAL_CE_DST);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_warn(ab, "failed to init dest ring: %d\n",</div><div class='add'>+					    ret);</div><div class='add'>+				/* Should we clear any partial init */</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			pipe-&gt;rx_buf_needed = pipe-&gt;dest_ring-&gt;nentries ?</div><div class='add'>+					      pipe-&gt;dest_ring-&gt;nentries - 2 : 0;</div><div class='add'>+</div><div class='add'>+			pipe-&gt;dest_ring-&gt;write_index = 0;</div><div class='add'>+			pipe-&gt;dest_ring-&gt;sw_index = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (pipe-&gt;status_ring) {</div><div class='add'>+			ret = ath12k_ce_init_ring(ab, pipe-&gt;status_ring, i,</div><div class='add'>+						  HAL_CE_DST_STATUS);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_warn(ab, "failed to init dest status ing: %d\n",</div><div class='add'>+					    ret);</div><div class='add'>+				/* Should we clear any partial init */</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			pipe-&gt;status_ring-&gt;write_index = 0;</div><div class='add'>+			pipe-&gt;status_ring-&gt;sw_index = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_ce_free_pipes(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ce_pipe *pipe;</div><div class='add'>+	int desc_sz;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;ce_count; i++) {</div><div class='add'>+		pipe = &amp;ab-&gt;ce.ce_pipe[i];</div><div class='add'>+</div><div class='add'>+		if (pipe-&gt;src_ring) {</div><div class='add'>+			desc_sz = ath12k_hal_ce_get_desc_size(HAL_CE_DESC_SRC);</div><div class='add'>+			dma_free_coherent(ab-&gt;dev,</div><div class='add'>+					  pipe-&gt;src_ring-&gt;nentries * desc_sz +</div><div class='add'>+					  CE_DESC_RING_ALIGN,</div><div class='add'>+					  pipe-&gt;src_ring-&gt;base_addr_owner_space,</div><div class='add'>+					  pipe-&gt;src_ring-&gt;base_addr_ce_space);</div><div class='add'>+			kfree(pipe-&gt;src_ring);</div><div class='add'>+			pipe-&gt;src_ring = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (pipe-&gt;dest_ring) {</div><div class='add'>+			desc_sz = ath12k_hal_ce_get_desc_size(HAL_CE_DESC_DST);</div><div class='add'>+			dma_free_coherent(ab-&gt;dev,</div><div class='add'>+					  pipe-&gt;dest_ring-&gt;nentries * desc_sz +</div><div class='add'>+					  CE_DESC_RING_ALIGN,</div><div class='add'>+					  pipe-&gt;dest_ring-&gt;base_addr_owner_space,</div><div class='add'>+					  pipe-&gt;dest_ring-&gt;base_addr_ce_space);</div><div class='add'>+			kfree(pipe-&gt;dest_ring);</div><div class='add'>+			pipe-&gt;dest_ring = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (pipe-&gt;status_ring) {</div><div class='add'>+			desc_sz =</div><div class='add'>+			  ath12k_hal_ce_get_desc_size(HAL_CE_DESC_DST_STATUS);</div><div class='add'>+			dma_free_coherent(ab-&gt;dev,</div><div class='add'>+					  pipe-&gt;status_ring-&gt;nentries * desc_sz +</div><div class='add'>+					  CE_DESC_RING_ALIGN,</div><div class='add'>+					  pipe-&gt;status_ring-&gt;base_addr_owner_space,</div><div class='add'>+					  pipe-&gt;status_ring-&gt;base_addr_ce_space);</div><div class='add'>+			kfree(pipe-&gt;status_ring);</div><div class='add'>+			pipe-&gt;status_ring = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_ce_alloc_pipes(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ce_pipe *pipe;</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+	const struct ce_attr *attr;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;ab-&gt;ce.ce_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;ce_count; i++) {</div><div class='add'>+		attr = &amp;ab-&gt;hw_params-&gt;host_ce_config[i];</div><div class='add'>+		pipe = &amp;ab-&gt;ce.ce_pipe[i];</div><div class='add'>+		pipe-&gt;pipe_num = i;</div><div class='add'>+		pipe-&gt;ab = ab;</div><div class='add'>+		pipe-&gt;buf_sz = attr-&gt;src_sz_max;</div><div class='add'>+</div><div class='add'>+		ret = ath12k_ce_alloc_pipe(ab, i);</div><div class='add'>+		if (ret) {</div><div class='add'>+			/* Free any partial successful allocation */</div><div class='add'>+			ath12k_ce_free_pipes(ab);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_ce_get_attr_flags(struct ath12k_base *ab, int ce_id)</div><div class='add'>+{</div><div class='add'>+	if (ce_id &gt;= ab-&gt;hw_params-&gt;ce_count)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return ab-&gt;hw_params-&gt;host_ce_config[ce_id].flags;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/ce.h b/drivers/net/wireless/ath/ath12k/ce.h<br/>new file mode 100644<br/>index 000000000000..57f75899ee03<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/ce.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/ce.h</a></div><div class='hunk'>@@ -0,0 +1,193 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2022, 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH12K_CE_H</div><div class='add'>+#define ATH12K_CE_H</div><div class='add'>+</div><div class='add'>+#define CE_COUNT_MAX 16</div><div class='add'>+</div><div class='add'>+/* Byte swap data words */</div><div class='add'>+#define CE_ATTR_BYTE_SWAP_DATA 2</div><div class='add'>+</div><div class='add'>+/* no interrupt on copy completion */</div><div class='add'>+#define CE_ATTR_DIS_INTR		8</div><div class='add'>+</div><div class='add'>+/* Host software's Copy Engine configuration. */</div><div class='add'>+#define CE_ATTR_FLAGS 0</div><div class='add'>+</div><div class='add'>+/* Threshold to poll for tx completion in case of Interrupt disabled CE's */</div><div class='add'>+#define ATH12K_CE_USAGE_THRESHOLD 32</div><div class='add'>+</div><div class='add'>+/* Directions for interconnect pipe configuration.</div><div class='add'>+ * These definitions may be used during configuration and are shared</div><div class='add'>+ * between Host and Target.</div><div class='add'>+ *</div><div class='add'>+ * Pipe Directions are relative to the Host, so PIPEDIR_IN means</div><div class='add'>+ * "coming IN over air through Target to Host" as with a WiFi Rx operation.</div><div class='add'>+ * Conversely, PIPEDIR_OUT means "going OUT from Host through Target over air"</div><div class='add'>+ * as with a WiFi Tx operation. This is somewhat awkward for the "middle-man"</div><div class='add'>+ * Target since things that are "PIPEDIR_OUT" are coming IN to the Target</div><div class='add'>+ * over the interconnect.</div><div class='add'>+ */</div><div class='add'>+#define PIPEDIR_NONE		0</div><div class='add'>+#define PIPEDIR_IN		1 /* Target--&gt;Host, WiFi Rx direction */</div><div class='add'>+#define PIPEDIR_OUT		2 /* Host-&gt;Target, WiFi Tx direction */</div><div class='add'>+#define PIPEDIR_INOUT		3 /* bidirectional */</div><div class='add'>+#define PIPEDIR_INOUT_H2H	4 /* bidirectional, host to host */</div><div class='add'>+</div><div class='add'>+/* CE address/mask */</div><div class='add'>+#define CE_HOST_IE_ADDRESS	0x75804C</div><div class='add'>+#define CE_HOST_IE_2_ADDRESS	0x758050</div><div class='add'>+#define CE_HOST_IE_3_ADDRESS	CE_HOST_IE_ADDRESS</div><div class='add'>+</div><div class='add'>+#define CE_HOST_IE_3_SHIFT	0xC</div><div class='add'>+</div><div class='add'>+#define CE_RING_IDX_INCR(nentries_mask, idx) (((idx) + 1) &amp; (nentries_mask))</div><div class='add'>+</div><div class='add'>+#define ATH12K_CE_RX_POST_RETRY_JIFFIES 50</div><div class='add'>+</div><div class='add'>+struct ath12k_base;</div><div class='add'>+</div><div class='add'>+/* Establish a mapping between a service/direction and a pipe.</div><div class='add'>+ * Configuration information for a Copy Engine pipe and services.</div><div class='add'>+ * Passed from Host to Target through QMI message and must be in</div><div class='add'>+ * little endian format.</div><div class='add'>+ */</div><div class='add'>+struct service_to_pipe {</div><div class='add'>+	__le32 service_id;</div><div class='add'>+	__le32 pipedir;</div><div class='add'>+	__le32 pipenum;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Configuration information for a Copy Engine pipe.</div><div class='add'>+ * Passed from Host to Target through QMI message during startup (one per CE).</div><div class='add'>+ *</div><div class='add'>+ * NOTE: Structure is shared between Host software and Target firmware!</div><div class='add'>+ */</div><div class='add'>+struct ce_pipe_config {</div><div class='add'>+	__le32 pipenum;</div><div class='add'>+	__le32 pipedir;</div><div class='add'>+	__le32 nentries;</div><div class='add'>+	__le32 nbytes_max;</div><div class='add'>+	__le32 flags;</div><div class='add'>+	__le32 reserved;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ce_ie_addr {</div><div class='add'>+	u32 ie1_reg_addr;</div><div class='add'>+	u32 ie2_reg_addr;</div><div class='add'>+	u32 ie3_reg_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ce_remap {</div><div class='add'>+	u32 base;</div><div class='add'>+	u32 size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ce_attr {</div><div class='add'>+	/* CE_ATTR_* values */</div><div class='add'>+	unsigned int flags;</div><div class='add'>+</div><div class='add'>+	/* #entries in source ring - Must be a power of 2 */</div><div class='add'>+	unsigned int src_nentries;</div><div class='add'>+</div><div class='add'>+	/* Max source send size for this CE.</div><div class='add'>+	 * This is also the minimum size of a destination buffer.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int src_sz_max;</div><div class='add'>+</div><div class='add'>+	/* #entries in destination ring - Must be a power of 2 */</div><div class='add'>+	unsigned int dest_nentries;</div><div class='add'>+</div><div class='add'>+	void (*recv_cb)(struct ath12k_base *ab, struct sk_buff *skb);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CE_DESC_RING_ALIGN 8</div><div class='add'>+</div><div class='add'>+struct ath12k_ce_ring {</div><div class='add'>+	/* Number of entries in this ring; must be power of 2 */</div><div class='add'>+	unsigned int nentries;</div><div class='add'>+	unsigned int nentries_mask;</div><div class='add'>+</div><div class='add'>+	/* For dest ring, this is the next index to be processed</div><div class='add'>+	 * by software after it was/is received into.</div><div class='add'>+	 *</div><div class='add'>+	 * For src ring, this is the last descriptor that was sent</div><div class='add'>+	 * and completion processed by software.</div><div class='add'>+	 *</div><div class='add'>+	 * Regardless of src or dest ring, this is an invariant</div><div class='add'>+	 * (modulo ring size):</div><div class='add'>+	 *     write index &gt;= read index &gt;= sw_index</div><div class='add'>+	 */</div><div class='add'>+	unsigned int sw_index;</div><div class='add'>+	/* cached copy */</div><div class='add'>+	unsigned int write_index;</div><div class='add'>+</div><div class='add'>+	/* Start of DMA-coherent area reserved for descriptors */</div><div class='add'>+	/* Host address space */</div><div class='add'>+	void *base_addr_owner_space_unaligned;</div><div class='add'>+	/* CE address space */</div><div class='add'>+	dma_addr_t base_addr_ce_space_unaligned;</div><div class='add'>+</div><div class='add'>+	/* Actual start of descriptors.</div><div class='add'>+	 * Aligned to descriptor-size boundary.</div><div class='add'>+	 * Points into reserved DMA-coherent area, above.</div><div class='add'>+	 */</div><div class='add'>+	/* Host address space */</div><div class='add'>+	void *base_addr_owner_space;</div><div class='add'>+</div><div class='add'>+	/* CE address space */</div><div class='add'>+	dma_addr_t base_addr_ce_space;</div><div class='add'>+</div><div class='add'>+	/* HAL ring id */</div><div class='add'>+	u32 hal_ring_id;</div><div class='add'>+</div><div class='add'>+	/* keep last */</div><div class='add'>+	struct sk_buff *skb[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_ce_pipe {</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	u16 pipe_num;</div><div class='add'>+	unsigned int attr_flags;</div><div class='add'>+	unsigned int buf_sz;</div><div class='add'>+	unsigned int rx_buf_needed;</div><div class='add'>+</div><div class='add'>+	void (*send_cb)(struct ath12k_ce_pipe *pipe);</div><div class='add'>+	void (*recv_cb)(struct ath12k_base *ab, struct sk_buff *skb);</div><div class='add'>+</div><div class='add'>+	struct work_struct intr_wq;</div><div class='add'>+	struct ath12k_ce_ring *src_ring;</div><div class='add'>+	struct ath12k_ce_ring *dest_ring;</div><div class='add'>+	struct ath12k_ce_ring *status_ring;</div><div class='add'>+	u64 timestamp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_ce {</div><div class='add'>+	struct ath12k_ce_pipe ce_pipe[CE_COUNT_MAX];</div><div class='add'>+	/* Protects rings of all ce pipes */</div><div class='add'>+	spinlock_t ce_lock;</div><div class='add'>+	struct ath12k_hp_update_timer hp_timer[CE_COUNT_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct ce_attr ath12k_host_ce_config_qcn9274[];</div><div class='add'>+extern const struct ce_attr ath12k_host_ce_config_wcn7850[];</div><div class='add'>+extern const struct ce_attr ath12k_host_ce_config_ipq5332[];</div><div class='add'>+</div><div class='add'>+void ath12k_ce_cleanup_pipes(struct ath12k_base *ab);</div><div class='add'>+void ath12k_ce_rx_replenish_retry(struct timer_list *t);</div><div class='add'>+void ath12k_ce_per_engine_service(struct ath12k_base *ab, u16 ce_id);</div><div class='add'>+int ath12k_ce_send(struct ath12k_base *ab, struct sk_buff *skb, u8 pipe_id,</div><div class='add'>+		   u16 transfer_id);</div><div class='add'>+void ath12k_ce_rx_post_buf(struct ath12k_base *ab);</div><div class='add'>+int ath12k_ce_init_pipes(struct ath12k_base *ab);</div><div class='add'>+int ath12k_ce_alloc_pipes(struct ath12k_base *ab);</div><div class='add'>+void ath12k_ce_free_pipes(struct ath12k_base *ab);</div><div class='add'>+int ath12k_ce_get_attr_flags(struct ath12k_base *ab, int ce_id);</div><div class='add'>+void ath12k_ce_poll_send_completed(struct ath12k_base *ab, u8 pipe_id);</div><div class='add'>+void ath12k_ce_get_shadow_config(struct ath12k_base *ab,</div><div class='add'>+				 u32 **shadow_cfg, u32 *shadow_cfg_len);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/core.c b/drivers/net/wireless/ath/ath12k/core.c<br/>new file mode 100644<br/>index 000000000000..cc352eef1939<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/core.c</a></div><div class='hunk'>@@ -0,0 +1,2321 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/remoteproc.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_graph.h&gt;</div><div class='add'>+#include "ahb.h"</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "dp_tx.h"</div><div class='add'>+#include "dp_rx.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "debugfs.h"</div><div class='add'>+#include "fw.h"</div><div class='add'>+#include "hif.h"</div><div class='add'>+#include "pci.h"</div><div class='add'>+#include "wow.h"</div><div class='add'>+</div><div class='add'>+static int ahb_err, pci_err;</div><div class='add'>+unsigned int ath12k_debug_mask;</div><div class='add'>+module_param_named(debug_mask, ath12k_debug_mask, uint, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug_mask, "Debugging mask");</div><div class='add'>+</div><div class='add'>+bool ath12k_ftm_mode;</div><div class='add'>+module_param_named(ftm_mode, ath12k_ftm_mode, bool, 0444);</div><div class='add'>+MODULE_PARM_DESC(ftm_mode, "Boots up in factory test mode");</div><div class='add'>+</div><div class='add'>+/* protected with ath12k_hw_group_mutex */</div><div class='add'>+static struct list_head ath12k_hw_group_list = LIST_HEAD_INIT(ath12k_hw_group_list);</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(ath12k_hw_group_mutex);</div><div class='add'>+</div><div class='add'>+static const struct</div><div class='add'>+ath12k_mem_profile_based_param ath12k_mem_profile_based_param[] = {</div><div class='add'>+[ATH12K_QMI_MEMORY_MODE_DEFAULT] = {</div><div class='add'>+		.num_vdevs = 17,</div><div class='add'>+		.max_client_single = 512,</div><div class='add'>+		.max_client_dbs = 128,</div><div class='add'>+		.max_client_dbs_sbs = 128,</div><div class='add'>+		.dp_params = {</div><div class='add'>+			.tx_comp_ring_size = 32768,</div><div class='add'>+			.rxdma_monitor_buf_ring_size = 4096,</div><div class='add'>+			.rxdma_monitor_dst_ring_size = 8092,</div><div class='add'>+			.num_pool_tx_desc = 32768,</div><div class='add'>+			.rx_desc_count = 12288,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+[ATH12K_QMI_MEMORY_MODE_LOW_512_M] = {</div><div class='add'>+		.num_vdevs = 9,</div><div class='add'>+		.max_client_single = 128,</div><div class='add'>+		.max_client_dbs = 64,</div><div class='add'>+		.max_client_dbs_sbs = 64,</div><div class='add'>+		.dp_params = {</div><div class='add'>+			.tx_comp_ring_size = 16384,</div><div class='add'>+			.rxdma_monitor_buf_ring_size = 256,</div><div class='add'>+			.rxdma_monitor_dst_ring_size = 512,</div><div class='add'>+			.num_pool_tx_desc = 16384,</div><div class='add'>+			.rx_desc_count = 6144,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ath12k_core_rfkill_config(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int ret = 0, i;</div><div class='add'>+</div><div class='add'>+	if (!(ab-&gt;target_caps.sys_cap_info &amp; WMI_SYS_CAP_INFO_RFKILL))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (ath12k_acpi_get_disable_rfkill(ab))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		ar = ab-&gt;pdevs[i].ar;</div><div class='add'>+</div><div class='add'>+		ret = ath12k_mac_rfkill_config(ar);</div><div class='add'>+		if (ret &amp;&amp; ret != -EOPNOTSUPP) {</div><div class='add'>+			ath12k_warn(ab, "failed to configure rfkill: %d", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Check if we need to continue with suspend/resume operation.</div><div class='add'>+ * Return:</div><div class='add'>+ *	a negative value: error happens and don't continue.</div><div class='add'>+ *	0:  no error but don't continue.</div><div class='add'>+ *	positive value: no error and do continue.</div><div class='add'>+ */</div><div class='add'>+static int ath12k_core_continue_suspend_resume(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;hw_params-&gt;supports_suspend)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* so far single_pdev_only chips have supports_suspend as true</div><div class='add'>+	 * so pass 0 as a dummy pdev_id here.</div><div class='add'>+	 */</div><div class='add'>+	ar = ab-&gt;pdevs[0].ar;</div><div class='add'>+	if (!ar || !ar-&gt;ah || ar-&gt;ah-&gt;state != ATH12K_HW_STATE_OFF)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_core_suspend(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_continue_suspend_resume(ab);</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		ar = ab-&gt;pdevs[i].ar;</div><div class='add'>+		if (!ar)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		wiphy_lock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+		ret = ath12k_mac_wait_tx_complete(ar);</div><div class='add'>+		if (ret) {</div><div class='add'>+			wiphy_unlock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+			ath12k_warn(ab, "failed to wait tx complete: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		wiphy_unlock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* PM framework skips suspend_late/resume_early callbacks</div><div class='add'>+	 * if other devices report errors in their suspend callbacks.</div><div class='add'>+	 * However ath12k_core_resume() would still be called because</div><div class='add'>+	 * here we return success thus kernel put us on dpm_suspended_list.</div><div class='add'>+	 * Since we won't go through a power down/up cycle, there is</div><div class='add'>+	 * no chance to call complete(&amp;ab-&gt;restart_completed) in</div><div class='add'>+	 * ath12k_core_restart(), making ath12k_core_resume() timeout.</div><div class='add'>+	 * So call it here to avoid this issue. This also works in case</div><div class='add'>+	 * no error happens thus suspend_late/resume_early get called,</div><div class='add'>+	 * because it will be reinitialized in ath12k_core_resume_early().</div><div class='add'>+	 */</div><div class='add'>+	complete(&amp;ab-&gt;restart_completed);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath12k_core_suspend);</div><div class='add'>+</div><div class='add'>+int ath12k_core_suspend_late(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_continue_suspend_resume(ab);</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ath12k_acpi_stop(ab);</div><div class='add'>+</div><div class='add'>+	ath12k_hif_irq_disable(ab);</div><div class='add'>+	ath12k_hif_ce_irq_disable(ab);</div><div class='add'>+</div><div class='add'>+	ath12k_hif_power_down(ab, true);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath12k_core_suspend_late);</div><div class='add'>+</div><div class='add'>+int ath12k_core_resume_early(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_continue_suspend_resume(ab);</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;ab-&gt;restart_completed);</div><div class='add'>+	ret = ath12k_hif_power_up(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ab, "failed to power up hif during resume: %d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath12k_core_resume_early);</div><div class='add'>+</div><div class='add'>+int ath12k_core_resume(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	long time_left;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_continue_suspend_resume(ab);</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;ab-&gt;restart_completed,</div><div class='add'>+						ATH12K_RESET_TIMEOUT_HZ);</div><div class='add'>+	if (time_left == 0) {</div><div class='add'>+		ath12k_warn(ab, "timeout while waiting for restart complete");</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ath12k_core_resume);</div><div class='add'>+</div><div class='add'>+static int __ath12k_core_create_board_name(struct ath12k_base *ab, char *name,</div><div class='add'>+					   size_t name_len, bool with_variant,</div><div class='add'>+					   bool bus_type_mode, bool with_default)</div><div class='add'>+{</div><div class='add'>+	/* strlen(',variant=') + strlen(ab-&gt;qmi.target.bdf_ext) */</div><div class='add'>+	char variant[9 + ATH12K_QMI_BDF_EXT_STR_LENGTH] = {};</div><div class='add'>+</div><div class='add'>+	if (with_variant &amp;&amp; ab-&gt;qmi.target.bdf_ext[0] != '\0')</div><div class='add'>+		scnprintf(variant, sizeof(variant), ",variant=%s",</div><div class='add'>+			  ab-&gt;qmi.target.bdf_ext);</div><div class='add'>+</div><div class='add'>+	switch (ab-&gt;id.bdf_search) {</div><div class='add'>+	case ATH12K_BDF_SEARCH_BUS_AND_BOARD:</div><div class='add'>+		if (bus_type_mode)</div><div class='add'>+			scnprintf(name, name_len,</div><div class='add'>+				  "bus=%s",</div><div class='add'>+				  ath12k_bus_str(ab-&gt;hif.bus));</div><div class='add'>+		else</div><div class='add'>+			scnprintf(name, name_len,</div><div class='add'>+				  "bus=%s,vendor=%04x,device=%04x,subsystem-vendor=%04x,subsystem-device=%04x,qmi-chip-id=%d,qmi-board-id=%d%s",</div><div class='add'>+				  ath12k_bus_str(ab-&gt;hif.bus),</div><div class='add'>+				  ab-&gt;id.vendor, ab-&gt;id.device,</div><div class='add'>+				  ab-&gt;id.subsystem_vendor,</div><div class='add'>+				  ab-&gt;id.subsystem_device,</div><div class='add'>+				  ab-&gt;qmi.target.chip_id,</div><div class='add'>+				  ab-&gt;qmi.target.board_id,</div><div class='add'>+				  variant);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		scnprintf(name, name_len,</div><div class='add'>+			  "bus=%s,qmi-chip-id=%d,qmi-board-id=%d%s",</div><div class='add'>+			  ath12k_bus_str(ab-&gt;hif.bus),</div><div class='add'>+			  ab-&gt;qmi.target.chip_id,</div><div class='add'>+			  with_default ?</div><div class='add'>+			  ATH12K_BOARD_ID_DEFAULT : ab-&gt;qmi.target.board_id,</div><div class='add'>+			  variant);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_BOOT, "boot using board name '%s'\n", name);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_core_create_board_name(struct ath12k_base *ab, char *name,</div><div class='add'>+					 size_t name_len)</div><div class='add'>+{</div><div class='add'>+	return __ath12k_core_create_board_name(ab, name, name_len, true, false, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_core_create_fallback_board_name(struct ath12k_base *ab, char *name,</div><div class='add'>+						  size_t name_len)</div><div class='add'>+{</div><div class='add'>+	return __ath12k_core_create_board_name(ab, name, name_len, false, false, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_core_create_bus_type_board_name(struct ath12k_base *ab, char *name,</div><div class='add'>+						  size_t name_len)</div><div class='add'>+{</div><div class='add'>+	return __ath12k_core_create_board_name(ab, name, name_len, false, true, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct firmware *ath12k_core_firmware_request(struct ath12k_base *ab,</div><div class='add'>+						    const char *file)</div><div class='add'>+{</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	char path[100];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!file)</div><div class='add'>+		return ERR_PTR(-ENOENT);</div><div class='add'>+</div><div class='add'>+	ath12k_core_create_firmware_path(ab, file, path, sizeof(path));</div><div class='add'>+</div><div class='add'>+	ret = firmware_request_nowarn(&amp;fw, path, ab-&gt;dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_BOOT, "boot firmware request %s size %zu\n",</div><div class='add'>+		   path, fw-&gt;size);</div><div class='add'>+</div><div class='add'>+	return fw;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_core_free_bdf(struct ath12k_base *ab, struct ath12k_board_data *bd)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ERR(bd-&gt;fw))</div><div class='add'>+		release_firmware(bd-&gt;fw);</div><div class='add'>+</div><div class='add'>+	memset(bd, 0, sizeof(*bd));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_core_parse_bd_ie_board(struct ath12k_base *ab,</div><div class='add'>+					 struct ath12k_board_data *bd,</div><div class='add'>+					 const void *buf, size_t buf_len,</div><div class='add'>+					 const char *boardname,</div><div class='add'>+					 int ie_id,</div><div class='add'>+					 int name_id,</div><div class='add'>+					 int data_id)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_fw_ie *hdr;</div><div class='add'>+	bool name_match_found;</div><div class='add'>+	int ret, board_ie_id;</div><div class='add'>+	size_t board_ie_len;</div><div class='add'>+	const void *board_ie_data;</div><div class='add'>+</div><div class='add'>+	name_match_found = false;</div><div class='add'>+</div><div class='add'>+	/* go through ATH12K_BD_IE_BOARD_/ATH12K_BD_IE_REGDB_ elements */</div><div class='add'>+	while (buf_len &gt; sizeof(struct ath12k_fw_ie)) {</div><div class='add'>+		hdr = buf;</div><div class='add'>+		board_ie_id = le32_to_cpu(hdr-&gt;id);</div><div class='add'>+		board_ie_len = le32_to_cpu(hdr-&gt;len);</div><div class='add'>+		board_ie_data = hdr-&gt;data;</div><div class='add'>+</div><div class='add'>+		buf_len -= sizeof(*hdr);</div><div class='add'>+		buf += sizeof(*hdr);</div><div class='add'>+</div><div class='add'>+		if (buf_len &lt; ALIGN(board_ie_len, 4)) {</div><div class='add'>+			ath12k_err(ab, "invalid %s length: %zu &lt; %zu\n",</div><div class='add'>+				   ath12k_bd_ie_type_str(ie_id),</div><div class='add'>+				   buf_len, ALIGN(board_ie_len, 4));</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (board_ie_id == name_id) {</div><div class='add'>+			ath12k_dbg_dump(ab, ATH12K_DBG_BOOT, "board name", "",</div><div class='add'>+					board_ie_data, board_ie_len);</div><div class='add'>+</div><div class='add'>+			if (board_ie_len != strlen(boardname))</div><div class='add'>+				goto next;</div><div class='add'>+</div><div class='add'>+			ret = memcmp(board_ie_data, boardname, strlen(boardname));</div><div class='add'>+			if (ret)</div><div class='add'>+				goto next;</div><div class='add'>+</div><div class='add'>+			name_match_found = true;</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+				   "boot found match %s for name '%s'",</div><div class='add'>+				   ath12k_bd_ie_type_str(ie_id),</div><div class='add'>+				   boardname);</div><div class='add'>+		} else if (board_ie_id == data_id) {</div><div class='add'>+			if (!name_match_found)</div><div class='add'>+				/* no match found */</div><div class='add'>+				goto next;</div><div class='add'>+</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+				   "boot found %s for '%s'",</div><div class='add'>+				   ath12k_bd_ie_type_str(ie_id),</div><div class='add'>+				   boardname);</div><div class='add'>+</div><div class='add'>+			bd-&gt;data = board_ie_data;</div><div class='add'>+			bd-&gt;len = board_ie_len;</div><div class='add'>+</div><div class='add'>+			ret = 0;</div><div class='add'>+			goto out;</div><div class='add'>+		} else {</div><div class='add'>+			ath12k_warn(ab, "unknown %s id found: %d\n",</div><div class='add'>+				    ath12k_bd_ie_type_str(ie_id),</div><div class='add'>+				    board_ie_id);</div><div class='add'>+		}</div><div class='add'>+next:</div><div class='add'>+		/* jump over the padding */</div><div class='add'>+		board_ie_len = ALIGN(board_ie_len, 4);</div><div class='add'>+</div><div class='add'>+		buf_len -= board_ie_len;</div><div class='add'>+		buf += board_ie_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* no match found */</div><div class='add'>+	ret = -ENOENT;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_core_fetch_board_data_api_n(struct ath12k_base *ab,</div><div class='add'>+					      struct ath12k_board_data *bd,</div><div class='add'>+					      const char *boardname,</div><div class='add'>+					      int ie_id_match,</div><div class='add'>+					      int name_id,</div><div class='add'>+					      int data_id)</div><div class='add'>+{</div><div class='add'>+	size_t len, magic_len;</div><div class='add'>+	const u8 *data;</div><div class='add'>+	char *filename, filepath[100];</div><div class='add'>+	size_t ie_len;</div><div class='add'>+	struct ath12k_fw_ie *hdr;</div><div class='add'>+	int ret, ie_id;</div><div class='add'>+</div><div class='add'>+	filename = ATH12K_BOARD_API2_FILE;</div><div class='add'>+</div><div class='add'>+	if (!bd-&gt;fw)</div><div class='add'>+		bd-&gt;fw = ath12k_core_firmware_request(ab, filename);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(bd-&gt;fw))</div><div class='add'>+		return PTR_ERR(bd-&gt;fw);</div><div class='add'>+</div><div class='add'>+	data = bd-&gt;fw-&gt;data;</div><div class='add'>+	len = bd-&gt;fw-&gt;size;</div><div class='add'>+</div><div class='add'>+	ath12k_core_create_firmware_path(ab, filename,</div><div class='add'>+					 filepath, sizeof(filepath));</div><div class='add'>+</div><div class='add'>+	/* magic has extra null byte padded */</div><div class='add'>+	magic_len = strlen(ATH12K_BOARD_MAGIC) + 1;</div><div class='add'>+	if (len &lt; magic_len) {</div><div class='add'>+		ath12k_err(ab, "failed to find magic value in %s, file too short: %zu\n",</div><div class='add'>+			   filepath, len);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (memcmp(data, ATH12K_BOARD_MAGIC, magic_len)) {</div><div class='add'>+		ath12k_err(ab, "found invalid board magic\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* magic is padded to 4 bytes */</div><div class='add'>+	magic_len = ALIGN(magic_len, 4);</div><div class='add'>+	if (len &lt; magic_len) {</div><div class='add'>+		ath12k_err(ab, "failed: %s too small to contain board data, len: %zu\n",</div><div class='add'>+			   filepath, len);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data += magic_len;</div><div class='add'>+	len -= magic_len;</div><div class='add'>+</div><div class='add'>+	while (len &gt; sizeof(struct ath12k_fw_ie)) {</div><div class='add'>+		hdr = (struct ath12k_fw_ie *)data;</div><div class='add'>+		ie_id = le32_to_cpu(hdr-&gt;id);</div><div class='add'>+		ie_len = le32_to_cpu(hdr-&gt;len);</div><div class='add'>+</div><div class='add'>+		len -= sizeof(*hdr);</div><div class='add'>+		data = hdr-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (len &lt; ALIGN(ie_len, 4)) {</div><div class='add'>+			ath12k_err(ab, "invalid length for board ie_id %d ie_len %zu len %zu\n",</div><div class='add'>+				   ie_id, ie_len, len);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ie_id == ie_id_match) {</div><div class='add'>+			ret = ath12k_core_parse_bd_ie_board(ab, bd, data,</div><div class='add'>+							    ie_len,</div><div class='add'>+							    boardname,</div><div class='add'>+							    ie_id_match,</div><div class='add'>+							    name_id,</div><div class='add'>+							    data_id);</div><div class='add'>+			if (ret == -ENOENT)</div><div class='add'>+				/* no match found, continue */</div><div class='add'>+				goto next;</div><div class='add'>+			else if (ret)</div><div class='add'>+				/* there was an error, bail out */</div><div class='add'>+				goto err;</div><div class='add'>+			/* either found or error, so stop searching */</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+next:</div><div class='add'>+		/* jump over the padding */</div><div class='add'>+		ie_len = ALIGN(ie_len, 4);</div><div class='add'>+</div><div class='add'>+		len -= ie_len;</div><div class='add'>+		data += ie_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (!bd-&gt;data || !bd-&gt;len) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+			   "failed to fetch %s for %s from %s\n",</div><div class='add'>+			   ath12k_bd_ie_type_str(ie_id_match),</div><div class='add'>+			   boardname, filepath);</div><div class='add'>+		ret = -ENODATA;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	ath12k_core_free_bdf(ab, bd);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_core_fetch_board_data_api_1(struct ath12k_base *ab,</div><div class='add'>+				       struct ath12k_board_data *bd,</div><div class='add'>+				       char *filename)</div><div class='add'>+{</div><div class='add'>+	bd-&gt;fw = ath12k_core_firmware_request(ab, filename);</div><div class='add'>+	if (IS_ERR(bd-&gt;fw))</div><div class='add'>+		return PTR_ERR(bd-&gt;fw);</div><div class='add'>+</div><div class='add'>+	bd-&gt;data = bd-&gt;fw-&gt;data;</div><div class='add'>+	bd-&gt;len = bd-&gt;fw-&gt;size;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define BOARD_NAME_SIZE 200</div><div class='add'>+int ath12k_core_fetch_bdf(struct ath12k_base *ab, struct ath12k_board_data *bd)</div><div class='add'>+{</div><div class='add'>+	char boardname[BOARD_NAME_SIZE], fallback_boardname[BOARD_NAME_SIZE];</div><div class='add'>+	char *filename, filepath[100];</div><div class='add'>+	int bd_api;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	filename = ATH12K_BOARD_API2_FILE;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_create_board_name(ab, boardname, sizeof(boardname));</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to create board name: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bd_api = 2;</div><div class='add'>+	ret = ath12k_core_fetch_board_data_api_n(ab, bd, boardname,</div><div class='add'>+						 ATH12K_BD_IE_BOARD,</div><div class='add'>+						 ATH12K_BD_IE_BOARD_NAME,</div><div class='add'>+						 ATH12K_BD_IE_BOARD_DATA);</div><div class='add'>+	if (!ret)</div><div class='add'>+		goto success;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_create_fallback_board_name(ab, fallback_boardname,</div><div class='add'>+						     sizeof(fallback_boardname));</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to create fallback board name: %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_fetch_board_data_api_n(ab, bd, fallback_boardname,</div><div class='add'>+						 ATH12K_BD_IE_BOARD,</div><div class='add'>+						 ATH12K_BD_IE_BOARD_NAME,</div><div class='add'>+						 ATH12K_BD_IE_BOARD_DATA);</div><div class='add'>+	if (!ret)</div><div class='add'>+		goto success;</div><div class='add'>+</div><div class='add'>+	bd_api = 1;</div><div class='add'>+	ret = ath12k_core_fetch_board_data_api_1(ab, bd, ATH12K_DEFAULT_BOARD_FILE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_core_create_firmware_path(ab, filename,</div><div class='add'>+						 filepath, sizeof(filepath));</div><div class='add'>+		ath12k_err(ab, "failed to fetch board data for %s from %s\n",</div><div class='add'>+			   boardname, filepath);</div><div class='add'>+		if (memcmp(boardname, fallback_boardname, strlen(boardname)))</div><div class='add'>+			ath12k_err(ab, "failed to fetch board data for %s from %s\n",</div><div class='add'>+				   fallback_boardname, filepath);</div><div class='add'>+</div><div class='add'>+		ath12k_err(ab, "failed to fetch board.bin from %s\n",</div><div class='add'>+			   ab-&gt;hw_params-&gt;fw.dir);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+success:</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_BOOT, "using board api %d\n", bd_api);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_core_fetch_regdb(struct ath12k_base *ab, struct ath12k_board_data *bd)</div><div class='add'>+{</div><div class='add'>+	char boardname[BOARD_NAME_SIZE], default_boardname[BOARD_NAME_SIZE];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_create_board_name(ab, boardname, BOARD_NAME_SIZE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+			   "failed to create board name for regdb: %d", ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_fetch_board_data_api_n(ab, bd, boardname,</div><div class='add'>+						 ATH12K_BD_IE_REGDB,</div><div class='add'>+						 ATH12K_BD_IE_REGDB_NAME,</div><div class='add'>+						 ATH12K_BD_IE_REGDB_DATA);</div><div class='add'>+	if (!ret)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_create_bus_type_board_name(ab, default_boardname,</div><div class='add'>+						     BOARD_NAME_SIZE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+			   "failed to create default board name for regdb: %d", ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_fetch_board_data_api_n(ab, bd, default_boardname,</div><div class='add'>+						 ATH12K_BD_IE_REGDB,</div><div class='add'>+						 ATH12K_BD_IE_REGDB_NAME,</div><div class='add'>+						 ATH12K_BD_IE_REGDB_DATA);</div><div class='add'>+	if (!ret)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_fetch_board_data_api_1(ab, bd, ATH12K_REGDB_FILE_NAME);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT, "failed to fetch %s from %s\n",</div><div class='add'>+			   ATH12K_REGDB_FILE_NAME, ab-&gt;hw_params-&gt;fw.dir);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	if (!ret)</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT, "fetched regdb\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 ath12k_core_get_max_station_per_radio(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	if (ab-&gt;num_radios == 2)</div><div class='add'>+		return TARGET_NUM_STATIONS(ab, DBS);</div><div class='add'>+	if (ab-&gt;num_radios == 3)</div><div class='add'>+		return TARGET_NUM_STATIONS(ab, DBS_SBS);</div><div class='add'>+	return TARGET_NUM_STATIONS(ab, SINGLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 ath12k_core_get_max_peers_per_radio(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return ath12k_core_get_max_station_per_radio(ab) + TARGET_NUM_VDEVS(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct reserved_mem *ath12k_core_get_reserved_mem(struct ath12k_base *ab,</div><div class='add'>+						  int index)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = ab-&gt;dev;</div><div class='add'>+	struct reserved_mem *rmem;</div><div class='add'>+	struct device_node *node;</div><div class='add'>+</div><div class='add'>+	node = of_parse_phandle(dev-&gt;of_node, "memory-region", index);</div><div class='add'>+	if (!node) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+			   "failed to parse memory-region for index %d\n", index);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rmem = of_reserved_mem_lookup(node);</div><div class='add'>+	of_node_put(node);</div><div class='add'>+	if (!rmem) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+			   "unable to get memory-region for index %d\n", index);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rmem;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void ath12k_core_to_group_ref_get(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_group *ag = ab-&gt;ag;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_group_ref) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT, "core already attached to group %d\n",</div><div class='add'>+			   ag-&gt;id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab-&gt;hw_group_ref = true;</div><div class='add'>+	ag-&gt;num_started++;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_BOOT, "core attached to group %d, num_started %d\n",</div><div class='add'>+		   ag-&gt;id, ag-&gt;num_started);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void ath12k_core_to_group_ref_put(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_group *ag = ab-&gt;ag;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;hw_group_ref) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT, "core already de-attached from group %d\n",</div><div class='add'>+			   ag-&gt;id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab-&gt;hw_group_ref = false;</div><div class='add'>+	ag-&gt;num_started--;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_BOOT, "core de-attached from group %d, num_started %d\n",</div><div class='add'>+		   ag-&gt;id, ag-&gt;num_started);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_core_stop(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath12k_core_to_group_ref_put(ab);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(ATH12K_FLAG_CRASH_FLUSH, &amp;ab-&gt;dev_flags))</div><div class='add'>+		ath12k_qmi_firmware_stop(ab);</div><div class='add'>+</div><div class='add'>+	ath12k_acpi_stop(ab);</div><div class='add'>+</div><div class='add'>+	ath12k_dp_rx_pdev_reo_cleanup(ab);</div><div class='add'>+	ath12k_hif_stop(ab);</div><div class='add'>+	ath12k_wmi_detach(ab);</div><div class='add'>+	ath12k_dp_free(ab);</div><div class='add'>+</div><div class='add'>+	/* De-Init of components as needed */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_core_check_cc_code_bdfext(const struct dmi_header *hdr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = data;</div><div class='add'>+	const char *magic = ATH12K_SMBIOS_BDF_EXT_MAGIC;</div><div class='add'>+	struct ath12k_smbios_bdf *smbios = (struct ath12k_smbios_bdf *)hdr;</div><div class='add'>+	ssize_t copied;</div><div class='add'>+	size_t len;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;qmi.target.bdf_ext[0] != '\0')</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;type != ATH12K_SMBIOS_BDF_EXT_TYPE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;length != ATH12K_SMBIOS_BDF_EXT_LENGTH) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+			   "wrong smbios bdf ext type length (%d).\n",</div><div class='add'>+			   hdr-&gt;length);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	switch (smbios-&gt;country_code_flag) {</div><div class='add'>+	case ATH12K_SMBIOS_CC_ISO:</div><div class='add'>+		ab-&gt;new_alpha2[0] = u16_get_bits(smbios-&gt;cc_code &gt;&gt; 8, 0xff);</div><div class='add'>+		ab-&gt;new_alpha2[1] = u16_get_bits(smbios-&gt;cc_code, 0xff);</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT, "boot smbios cc_code %c%c\n",</div><div class='add'>+			   ab-&gt;new_alpha2[0], ab-&gt;new_alpha2[1]);</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_SMBIOS_CC_WW:</div><div class='add'>+		ab-&gt;new_alpha2[0] = '0';</div><div class='add'>+		ab-&gt;new_alpha2[1] = '0';</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT, "boot smbios worldwide regdomain\n");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT, "boot ignore smbios country code setting %d\n",</div><div class='add'>+			   smbios-&gt;country_code_flag);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	if (!smbios-&gt;bdf_enabled) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT, "bdf variant name not found.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Only one string exists (per spec) */</div><div class='add'>+	if (memcmp(smbios-&gt;bdf_ext, magic, strlen(magic)) != 0) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+			   "bdf variant magic does not match.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = min_t(size_t,</div><div class='add'>+		    strlen(smbios-&gt;bdf_ext), sizeof(ab-&gt;qmi.target.bdf_ext));</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		if (!isascii(smbios-&gt;bdf_ext[i]) || !isprint(smbios-&gt;bdf_ext[i])) {</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+				   "bdf variant name contains non ascii chars.\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy extension name without magic prefix */</div><div class='add'>+	copied = strscpy(ab-&gt;qmi.target.bdf_ext, smbios-&gt;bdf_ext + strlen(magic),</div><div class='add'>+			 sizeof(ab-&gt;qmi.target.bdf_ext));</div><div class='add'>+	if (copied &lt; 0) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+			   "bdf variant string is longer than the buffer can accommodate\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+		   "found and validated bdf variant smbios_type 0x%x bdf %s\n",</div><div class='add'>+		   ATH12K_SMBIOS_BDF_EXT_TYPE, ab-&gt;qmi.target.bdf_ext);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_core_check_smbios(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ab-&gt;qmi.target.bdf_ext[0] = '\0';</div><div class='add'>+	dmi_walk(ath12k_core_check_cc_code_bdfext, ab);</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;qmi.target.bdf_ext[0] == '\0')</div><div class='add'>+		return -ENODATA;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_core_soc_create(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ath12k_ftm_mode) {</div><div class='add'>+		ab-&gt;fw_mode = ATH12K_FIRMWARE_MODE_FTM;</div><div class='add'>+		ath12k_info(ab, "Booting in ftm mode\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_qmi_init_service(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to initialize qmi :%d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_debugfs_soc_create(ab);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_hif_power_up(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to power up :%d\n", ret);</div><div class='add'>+		goto err_qmi_deinit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_debugfs_pdev_create(ab);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_qmi_deinit:</div><div class='add'>+	ath12k_debugfs_soc_destroy(ab);</div><div class='add'>+	ath12k_qmi_deinit_service(ab);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_core_soc_destroy(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath12k_hif_power_down(ab, false);</div><div class='add'>+	ath12k_reg_free(ab);</div><div class='add'>+	ath12k_debugfs_soc_destroy(ab);</div><div class='add'>+	ath12k_qmi_deinit_service(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_core_pdev_create(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_pdev_alloc(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to attach DP pdev: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_core_pdev_destroy(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath12k_dp_pdev_free(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_core_start(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ab-&gt;core_lock);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_attach(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to attach wmi: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_htc_init(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to init htc: %d\n", ret);</div><div class='add'>+		goto err_wmi_detach;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_hif_start(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to start HIF: %d\n", ret);</div><div class='add'>+		goto err_wmi_detach;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_htc_wait_target(&amp;ab-&gt;htc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to connect to HTC: %d\n", ret);</div><div class='add'>+		goto err_hif_stop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_htt_connect(&amp;ab-&gt;dp);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to connect to HTT: %d\n", ret);</div><div class='add'>+		goto err_hif_stop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_connect(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to connect wmi: %d\n", ret);</div><div class='add'>+		goto err_hif_stop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_htc_start(&amp;ab-&gt;htc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to start HTC: %d\n", ret);</div><div class='add'>+		goto err_hif_stop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_wait_for_service_ready(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to receive wmi service ready event: %d\n",</div><div class='add'>+			   ret);</div><div class='add'>+		goto err_hif_stop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dp_cc_config(ab);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_rx_pdev_reo_setup(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to initialize reo destination rings: %d\n", ret);</div><div class='add'>+		goto err_hif_stop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dp_hal_rx_desc_init(ab);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_init(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to send wmi init cmd: %d\n", ret);</div><div class='add'>+		goto err_reo_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_wait_for_unified_ready(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to receive wmi unified ready event: %d\n",</div><div class='add'>+			   ret);</div><div class='add'>+		goto err_reo_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* put hardware to DBS mode */</div><div class='add'>+	if (ab-&gt;hw_params-&gt;single_pdev_only) {</div><div class='add'>+		ret = ath12k_wmi_set_hw_mode(ab, WMI_HOST_HW_MODE_DBS);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_err(ab, "failed to send dbs mode: %d\n", ret);</div><div class='add'>+			goto err_reo_cleanup;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_tx_htt_h2t_ver_req_msg(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to send htt version request message: %d\n",</div><div class='add'>+			   ret);</div><div class='add'>+		goto err_reo_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_acpi_set_dsm_func(ab);</div><div class='add'>+</div><div class='add'>+	/* Indicate the core start in the appropriate group */</div><div class='add'>+	ath12k_core_to_group_ref_get(ab);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_reo_cleanup:</div><div class='add'>+	ath12k_dp_rx_pdev_reo_cleanup(ab);</div><div class='add'>+err_hif_stop:</div><div class='add'>+	ath12k_hif_stop(ab);</div><div class='add'>+err_wmi_detach:</div><div class='add'>+	ath12k_wmi_detach(ab);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_core_device_cleanup(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;ab-&gt;core_lock);</div><div class='add'>+</div><div class='add'>+	ath12k_hif_irq_disable(ab);</div><div class='add'>+	ath12k_core_pdev_destroy(ab);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ab-&gt;core_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_core_hw_group_stop(struct ath12k_hw_group *ag)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	clear_bit(ATH12K_GROUP_FLAG_REGISTERED, &amp;ag-&gt;flags);</div><div class='add'>+</div><div class='add'>+	ath12k_mac_unregister(ag);</div><div class='add'>+</div><div class='add'>+	for (i = ag-&gt;num_devices - 1; i &gt;= 0; i--) {</div><div class='add'>+		ab = ag-&gt;ab[i];</div><div class='add'>+		if (!ab)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		clear_bit(ATH12K_FLAG_REGISTERED, &amp;ab-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+		ath12k_core_device_cleanup(ab);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_mac_destroy(ag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 ath12k_get_num_partner_link(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *partner_ab, *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_hw_group *ag = ab-&gt;ag;</div><div class='add'>+	struct ath12k_pdev *pdev;</div><div class='add'>+	u8 num_link = 0;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_devices; i++) {</div><div class='add'>+		partner_ab = ag-&gt;ab[i];</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; partner_ab-&gt;num_radios; j++) {</div><div class='add'>+			pdev = &amp;partner_ab-&gt;pdevs[j];</div><div class='add'>+</div><div class='add'>+			/* Avoid the self link */</div><div class='add'>+			if (ar == pdev-&gt;ar)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			num_link++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return num_link;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __ath12k_mac_mlo_ready(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	u8 num_link = ath12k_get_num_partner_link(ar);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (num_link == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_mlo_ready(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ar-&gt;ab, "MLO ready failed for pdev %d: %d\n",</div><div class='add'>+			   ar-&gt;pdev_idx, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mlo ready done for pdev %d\n",</div><div class='add'>+		   ar-&gt;pdev_idx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_mac_mlo_ready(struct ath12k_hw_group *ag)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int ret;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_hw; i++) {</div><div class='add'>+		ah = ag-&gt;ah[i];</div><div class='add'>+		if (!ah)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for_each_ar(ah, ar, j) {</div><div class='add'>+			ar = &amp;ah-&gt;radio[j];</div><div class='add'>+			ret = __ath12k_mac_mlo_ready(ar);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_core_mlo_setup(struct ath12k_hw_group *ag)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	if (!ag-&gt;mlo_capable)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_mlo_setup(ag);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_devices; i++)</div><div class='add'>+		ath12k_dp_partner_cc_init(ag-&gt;ab[i]);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_mlo_ready(ag);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_mlo_teardown;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_mlo_teardown:</div><div class='add'>+	ath12k_mac_mlo_teardown(ag);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_core_hw_group_start(struct ath12k_hw_group *ag)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_GROUP_FLAG_REGISTERED, &amp;ag-&gt;flags))</div><div class='add'>+		goto core_pdev_create;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_allocate(ag);</div><div class='add'>+	if (WARN_ON(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_mlo_setup(ag);</div><div class='add'>+	if (WARN_ON(ret))</div><div class='add'>+		goto err_mac_destroy;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_register(ag);</div><div class='add'>+	if (WARN_ON(ret))</div><div class='add'>+		goto err_mlo_teardown;</div><div class='add'>+</div><div class='add'>+	set_bit(ATH12K_GROUP_FLAG_REGISTERED, &amp;ag-&gt;flags);</div><div class='add'>+</div><div class='add'>+core_pdev_create:</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_devices; i++) {</div><div class='add'>+		ab = ag-&gt;ab[i];</div><div class='add'>+		if (!ab)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;ab-&gt;core_lock);</div><div class='add'>+</div><div class='add'>+		set_bit(ATH12K_FLAG_REGISTERED, &amp;ab-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+		ret = ath12k_core_pdev_create(ab);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_err(ab, "failed to create pdev core %d\n", ret);</div><div class='add'>+			mutex_unlock(&amp;ab-&gt;core_lock);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath12k_hif_irq_enable(ab);</div><div class='add'>+</div><div class='add'>+		ret = ath12k_core_rfkill_config(ab);</div><div class='add'>+		if (ret &amp;&amp; ret != -EOPNOTSUPP) {</div><div class='add'>+			mutex_unlock(&amp;ab-&gt;core_lock);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mutex_unlock(&amp;ab-&gt;core_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	ath12k_core_hw_group_stop(ag);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+err_mlo_teardown:</div><div class='add'>+	ath12k_mac_mlo_teardown(ag);</div><div class='add'>+</div><div class='add'>+err_mac_destroy:</div><div class='add'>+	ath12k_mac_destroy(ag);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_core_start_firmware(struct ath12k_base *ab,</div><div class='add'>+				      enum ath12k_firmware_mode mode)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ath12k_ce_get_shadow_config(ab, &amp;ab-&gt;qmi.ce_cfg.shadow_reg_v3,</div><div class='add'>+				    &amp;ab-&gt;qmi.ce_cfg.shadow_reg_v3_len);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_qmi_firmware_start(ab, mode);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to send firmware start: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+bool ath12k_core_hw_group_start_ready(struct ath12k_hw_group *ag)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return (ag-&gt;num_started == ag-&gt;num_devices);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_fw_stats_pdevs_free(struct list_head *head)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_fw_stats_pdev *i, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(i, tmp, head, list) {</div><div class='add'>+		list_del(&amp;i-&gt;list);</div><div class='add'>+		kfree(i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_fw_stats_bcn_free(struct list_head *head)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_fw_stats_bcn *i, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(i, tmp, head, list) {</div><div class='add'>+		list_del(&amp;i-&gt;list);</div><div class='add'>+		kfree(i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_fw_stats_vdevs_free(struct list_head *head)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_fw_stats_vdev *i, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(i, tmp, head, list) {</div><div class='add'>+		list_del(&amp;i-&gt;list);</div><div class='add'>+		kfree(i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_fw_stats_init(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	INIT_LIST_HEAD(&amp;ar-&gt;fw_stats.vdevs);</div><div class='add'>+	INIT_LIST_HEAD(&amp;ar-&gt;fw_stats.pdevs);</div><div class='add'>+	INIT_LIST_HEAD(&amp;ar-&gt;fw_stats.bcn);</div><div class='add'>+	init_completion(&amp;ar-&gt;fw_stats_complete);</div><div class='add'>+	init_completion(&amp;ar-&gt;fw_stats_done);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_fw_stats_free(struct ath12k_fw_stats *stats)</div><div class='add'>+{</div><div class='add'>+	ath12k_fw_stats_pdevs_free(&amp;stats-&gt;pdevs);</div><div class='add'>+	ath12k_fw_stats_vdevs_free(&amp;stats-&gt;vdevs);</div><div class='add'>+	ath12k_fw_stats_bcn_free(&amp;stats-&gt;bcn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_fw_stats_reset(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	ath12k_fw_stats_free(&amp;ar-&gt;fw_stats);</div><div class='add'>+	ar-&gt;fw_stats.num_vdev_recvd = 0;</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_core_trigger_partner(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_group *ag = ab-&gt;ag;</div><div class='add'>+	struct ath12k_base *partner_ab;</div><div class='add'>+	bool found = false;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_devices; i++) {</div><div class='add'>+		partner_ab = ag-&gt;ab[i];</div><div class='add'>+		if (!partner_ab)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (found)</div><div class='add'>+			ath12k_qmi_trigger_host_cap(partner_ab);</div><div class='add'>+</div><div class='add'>+		found = (partner_ab == ab);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_core_qmi_firmware_ready(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_group *ag = ath12k_ab_to_ag(ab);</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_start_firmware(ab, ab-&gt;fw_mode);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to start firmware: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_ce_init_pipes(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to initialize CE: %d\n", ret);</div><div class='add'>+		goto err_firmware_stop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_alloc(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to init DP: %d\n", ret);</div><div class='add'>+		goto err_firmware_stop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ag-&gt;mutex);</div><div class='add'>+	mutex_lock(&amp;ab-&gt;core_lock);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_start(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to start core: %d\n", ret);</div><div class='add'>+		goto err_dp_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ab-&gt;core_lock);</div><div class='add'>+</div><div class='add'>+	if (ath12k_core_hw_group_start_ready(ag)) {</div><div class='add'>+		ret = ath12k_core_hw_group_start(ag);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "unable to start hw group\n");</div><div class='add'>+			goto err_core_stop;</div><div class='add'>+		}</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT, "group %d started\n", ag-&gt;id);</div><div class='add'>+	} else {</div><div class='add'>+		ath12k_core_trigger_partner(ab);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_core_stop:</div><div class='add'>+	for (i = ag-&gt;num_devices - 1; i &gt;= 0; i--) {</div><div class='add'>+		ab = ag-&gt;ab[i];</div><div class='add'>+		if (!ab)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;ab-&gt;core_lock);</div><div class='add'>+		ath12k_core_stop(ab);</div><div class='add'>+		mutex_unlock(&amp;ab-&gt;core_lock);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;ag-&gt;mutex);</div><div class='add'>+	goto exit;</div><div class='add'>+</div><div class='add'>+err_dp_free:</div><div class='add'>+	ath12k_dp_free(ab);</div><div class='add'>+	mutex_unlock(&amp;ab-&gt;core_lock);</div><div class='add'>+	mutex_unlock(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+err_firmware_stop:</div><div class='add'>+	ath12k_qmi_firmware_stop(ab);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_core_reconfigure_on_crash(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret, total_vdev;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ab-&gt;core_lock);</div><div class='add'>+	ath12k_dp_pdev_free(ab);</div><div class='add'>+	ath12k_ce_cleanup_pipes(ab);</div><div class='add'>+	ath12k_wmi_detach(ab);</div><div class='add'>+	ath12k_dp_rx_pdev_reo_cleanup(ab);</div><div class='add'>+	mutex_unlock(&amp;ab-&gt;core_lock);</div><div class='add'>+</div><div class='add'>+	ath12k_dp_free(ab);</div><div class='add'>+	ath12k_hal_srng_deinit(ab);</div><div class='add'>+	total_vdev = ab-&gt;num_radios * TARGET_NUM_VDEVS(ab);</div><div class='add'>+	ab-&gt;free_vdev_map = (1LL &lt;&lt; total_vdev) - 1;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_hal_srng_init(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	clear_bit(ATH12K_FLAG_CRASH_FLUSH, &amp;ab-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_qmi_firmware_ready(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_hal_srng_deinit;</div><div class='add'>+</div><div class='add'>+	clear_bit(ATH12K_FLAG_RECOVERY, &amp;ab-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_hal_srng_deinit:</div><div class='add'>+	ath12k_hal_srng_deinit(ab);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_rfkill_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = container_of(work, struct ath12k_base, rfkill_work);</div><div class='add'>+	struct ath12k_hw_group *ag = ab-&gt;ag;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_hw *ah;</div><div class='add'>+	struct ieee80211_hw *hw;</div><div class='add'>+	bool rfkill_radio_on;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	rfkill_radio_on = ab-&gt;rfkill_radio_on;</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_hw; i++) {</div><div class='add'>+		ah = ath12k_ag_to_ah(ag, i);</div><div class='add'>+		if (!ah)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; ah-&gt;num_radio; j++) {</div><div class='add'>+			ar = &amp;ah-&gt;radio[j];</div><div class='add'>+			if (!ar)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			ath12k_mac_rfkill_enable_radio(ar, rfkill_radio_on);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		hw = ah-&gt;hw;</div><div class='add'>+		wiphy_rfkill_set_hw_state(hw-&gt;wiphy, !rfkill_radio_on);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_core_halt(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct list_head *pos, *n;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ar-&gt;num_created_vdevs = 0;</div><div class='add'>+	ar-&gt;allocated_vdev_map = 0;</div><div class='add'>+</div><div class='add'>+	ath12k_mac_scan_finish(ar);</div><div class='add'>+	ath12k_mac_peer_cleanup_all(ar);</div><div class='add'>+	cancel_delayed_work_sync(&amp;ar-&gt;scan.timeout);</div><div class='add'>+	cancel_work_sync(&amp;ar-&gt;regd_update_work);</div><div class='add'>+	cancel_work_sync(&amp;ar-&gt;regd_channel_update_work);</div><div class='add'>+	cancel_work_sync(&amp;ab-&gt;rfkill_work);</div><div class='add'>+	cancel_work_sync(&amp;ab-&gt;update_11d_work);</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(ab-&gt;pdevs_active[ar-&gt;pdev_idx], NULL);</div><div class='add'>+	synchronize_rcu();</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	list_for_each_safe(pos, n, &amp;ar-&gt;arvifs)</div><div class='add'>+		list_del_init(pos);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	idr_init(&amp;ar-&gt;txmgmt_idr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_core_pre_reconfigure_recovery(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_group *ag = ab-&gt;ag;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_hw *ah;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	ab-&gt;stats.fw_crash_counter++;</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;is_reset)</div><div class='add'>+		set_bit(ATH12K_FLAG_CRASH_FLUSH, &amp;ab-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_hw; i++) {</div><div class='add'>+		ah = ath12k_ag_to_ah(ag, i);</div><div class='add'>+		if (!ah || ah-&gt;state == ATH12K_HW_STATE_OFF ||</div><div class='add'>+		    ah-&gt;state == ATH12K_HW_STATE_TM)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		wiphy_lock(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+		/* If queue 0 is stopped, it is safe to assume that all</div><div class='add'>+		 * other queues are stopped by driver via</div><div class='add'>+		 * ieee80211_stop_queues() below. This means, there is</div><div class='add'>+		 * no need to stop it again and hence continue</div><div class='add'>+		 */</div><div class='add'>+		if (ieee80211_queue_stopped(ah-&gt;hw, 0)) {</div><div class='add'>+			wiphy_unlock(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ieee80211_stop_queues(ah-&gt;hw);</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; ah-&gt;num_radio; j++) {</div><div class='add'>+			ar = &amp;ah-&gt;radio[j];</div><div class='add'>+</div><div class='add'>+			ath12k_mac_drain_tx(ar);</div><div class='add'>+			ar-&gt;state_11d = ATH12K_11D_IDLE;</div><div class='add'>+			complete(&amp;ar-&gt;completed_11d_scan);</div><div class='add'>+			complete(&amp;ar-&gt;scan.started);</div><div class='add'>+			complete_all(&amp;ar-&gt;scan.completed);</div><div class='add'>+			complete(&amp;ar-&gt;scan.on_channel);</div><div class='add'>+			complete(&amp;ar-&gt;peer_assoc_done);</div><div class='add'>+			complete(&amp;ar-&gt;peer_delete_done);</div><div class='add'>+			complete(&amp;ar-&gt;install_key_done);</div><div class='add'>+			complete(&amp;ar-&gt;vdev_setup_done);</div><div class='add'>+			complete(&amp;ar-&gt;vdev_delete_done);</div><div class='add'>+			complete(&amp;ar-&gt;bss_survey_done);</div><div class='add'>+			complete_all(&amp;ar-&gt;regd_update_completed);</div><div class='add'>+</div><div class='add'>+			wake_up(&amp;ar-&gt;dp.tx_empty_waitq);</div><div class='add'>+			idr_for_each(&amp;ar-&gt;txmgmt_idr,</div><div class='add'>+				     ath12k_mac_tx_mgmt_pending_free, ar);</div><div class='add'>+			idr_destroy(&amp;ar-&gt;txmgmt_idr);</div><div class='add'>+			wake_up(&amp;ar-&gt;txmgmt_empty_waitq);</div><div class='add'>+</div><div class='add'>+			ar-&gt;monitor_vdev_id = -1;</div><div class='add'>+			ar-&gt;monitor_vdev_created = false;</div><div class='add'>+			ar-&gt;monitor_started = false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		wiphy_unlock(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wake_up(&amp;ab-&gt;wmi_ab.tx_credits_wq);</div><div class='add'>+	wake_up(&amp;ab-&gt;peer_mapping_wq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_update_11d(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = container_of(work, struct ath12k_base, update_11d_work);</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_pdev *pdev;</div><div class='add'>+	struct wmi_set_current_country_arg arg = {};</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	memcpy(&amp;arg.alpha2, &amp;ab-&gt;new_alpha2, 2);</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI, "update 11d new cc %c%c\n",</div><div class='add'>+		   arg.alpha2[0], arg.alpha2[1]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		pdev = &amp;ab-&gt;pdevs[i];</div><div class='add'>+		ar = pdev-&gt;ar;</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;ar-&gt;alpha2, &amp;arg.alpha2, 2);</div><div class='add'>+</div><div class='add'>+		reinit_completion(&amp;ar-&gt;regd_update_completed);</div><div class='add'>+</div><div class='add'>+		ret = ath12k_wmi_send_set_current_country_cmd(ar, &amp;arg);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "pdev id %d failed set current country code: %d\n",</div><div class='add'>+				    i, ret);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_core_post_reconfigure_recovery(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_group *ag = ab-&gt;ag;</div><div class='add'>+	struct ath12k_hw *ah;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_hw; i++) {</div><div class='add'>+		ah = ath12k_ag_to_ah(ag, i);</div><div class='add'>+		if (!ah || ah-&gt;state == ATH12K_HW_STATE_OFF)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		wiphy_lock(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+		mutex_lock(&amp;ah-&gt;hw_mutex);</div><div class='add'>+</div><div class='add'>+		switch (ah-&gt;state) {</div><div class='add'>+		case ATH12K_HW_STATE_ON:</div><div class='add'>+			ah-&gt;state = ATH12K_HW_STATE_RESTARTING;</div><div class='add'>+</div><div class='add'>+			for (j = 0; j &lt; ah-&gt;num_radio; j++) {</div><div class='add'>+				ar = &amp;ah-&gt;radio[j];</div><div class='add'>+				ath12k_core_halt(ar);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_HW_STATE_OFF:</div><div class='add'>+			ath12k_warn(ab,</div><div class='add'>+				    "cannot restart hw %d that hasn't been started\n",</div><div class='add'>+				    i);</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_HW_STATE_RESTARTING:</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_HW_STATE_RESTARTED:</div><div class='add'>+			ah-&gt;state = ATH12K_HW_STATE_WEDGED;</div><div class='add'>+			fallthrough;</div><div class='add'>+		case ATH12K_HW_STATE_WEDGED:</div><div class='add'>+			ath12k_warn(ab,</div><div class='add'>+				    "device is wedged, will not restart hw %d\n", i);</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_HW_STATE_TM:</div><div class='add'>+			ath12k_warn(ab, "fw mode reset done radio %d\n", i);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mutex_unlock(&amp;ah-&gt;hw_mutex);</div><div class='add'>+		wiphy_unlock(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	complete(&amp;ab-&gt;driver_recovery);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_core_restart(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = container_of(work, struct ath12k_base, restart_work);</div><div class='add'>+	struct ath12k_hw_group *ag = ab-&gt;ag;</div><div class='add'>+	struct ath12k_hw *ah;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_reconfigure_on_crash(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to reconfigure driver on crash recovery\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;is_reset) {</div><div class='add'>+		if (!test_bit(ATH12K_FLAG_REGISTERED, &amp;ab-&gt;dev_flags)) {</div><div class='add'>+			atomic_dec(&amp;ab-&gt;reset_count);</div><div class='add'>+			complete(&amp;ab-&gt;reset_complete);</div><div class='add'>+			ab-&gt;is_reset = false;</div><div class='add'>+			atomic_set(&amp;ab-&gt;fail_cont_count, 0);</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_BOOT, "reset success\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+		if (!ath12k_core_hw_group_start_ready(ag)) {</div><div class='add'>+			mutex_unlock(&amp;ag-&gt;mutex);</div><div class='add'>+			goto exit_restart;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ag-&gt;num_hw; i++) {</div><div class='add'>+			ah = ath12k_ag_to_ah(ag, i);</div><div class='add'>+			ieee80211_restart_hw(ah-&gt;hw);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mutex_unlock(&amp;ag-&gt;mutex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit_restart:</div><div class='add'>+	complete(&amp;ab-&gt;restart_completed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_core_reset(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = container_of(work, struct ath12k_base, reset_work);</div><div class='add'>+	struct ath12k_hw_group *ag = ab-&gt;ag;</div><div class='add'>+	int reset_count, fail_cont_count, i;</div><div class='add'>+	long time_left;</div><div class='add'>+</div><div class='add'>+	if (!(test_bit(ATH12K_FLAG_QMI_FW_READY_COMPLETE, &amp;ab-&gt;dev_flags))) {</div><div class='add'>+		ath12k_warn(ab, "ignore reset dev flags 0x%lx\n", ab-&gt;dev_flags);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Sometimes the recovery will fail and then the next all recovery fail,</div><div class='add'>+	 * this is to avoid infinite recovery since it can not recovery success</div><div class='add'>+	 */</div><div class='add'>+	fail_cont_count = atomic_read(&amp;ab-&gt;fail_cont_count);</div><div class='add'>+</div><div class='add'>+	if (fail_cont_count &gt;= ATH12K_RESET_MAX_FAIL_COUNT_FINAL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (fail_cont_count &gt;= ATH12K_RESET_MAX_FAIL_COUNT_FIRST &amp;&amp;</div><div class='add'>+	    time_before(jiffies, ab-&gt;reset_fail_timeout))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	reset_count = atomic_inc_return(&amp;ab-&gt;reset_count);</div><div class='add'>+</div><div class='add'>+	if (reset_count &gt; 1) {</div><div class='add'>+		/* Sometimes it happened another reset worker before the previous one</div><div class='add'>+		 * completed, then the second reset worker will destroy the previous one,</div><div class='add'>+		 * thus below is to avoid that.</div><div class='add'>+		 */</div><div class='add'>+		ath12k_warn(ab, "already resetting count %d\n", reset_count);</div><div class='add'>+</div><div class='add'>+		reinit_completion(&amp;ab-&gt;reset_complete);</div><div class='add'>+		time_left = wait_for_completion_timeout(&amp;ab-&gt;reset_complete,</div><div class='add'>+							ATH12K_RESET_TIMEOUT_HZ);</div><div class='add'>+		if (time_left) {</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_BOOT, "to skip reset\n");</div><div class='add'>+			atomic_dec(&amp;ab-&gt;reset_count);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ab-&gt;reset_fail_timeout = jiffies + ATH12K_RESET_FAIL_TIMEOUT_HZ;</div><div class='add'>+		/* Record the continuous recovery fail count when recovery failed*/</div><div class='add'>+		fail_cont_count = atomic_inc_return(&amp;ab-&gt;fail_cont_count);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_BOOT, "reset starting\n");</div><div class='add'>+</div><div class='add'>+	ab-&gt;is_reset = true;</div><div class='add'>+	atomic_set(&amp;ab-&gt;recovery_count, 0);</div><div class='add'>+</div><div class='add'>+	ath12k_coredump_collect(ab);</div><div class='add'>+	ath12k_core_pre_reconfigure_recovery(ab);</div><div class='add'>+</div><div class='add'>+	ath12k_core_post_reconfigure_recovery(ab);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_BOOT, "waiting recovery start...\n");</div><div class='add'>+</div><div class='add'>+	ath12k_hif_irq_disable(ab);</div><div class='add'>+	ath12k_hif_ce_irq_disable(ab);</div><div class='add'>+</div><div class='add'>+	ath12k_hif_power_down(ab, false);</div><div class='add'>+</div><div class='add'>+	/* prepare for power up */</div><div class='add'>+	ab-&gt;qmi.num_radios = U8_MAX;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ag-&gt;mutex);</div><div class='add'>+	ath12k_core_to_group_ref_put(ab);</div><div class='add'>+</div><div class='add'>+	if (ag-&gt;num_started &gt; 0) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+			   "waiting for %d partner device(s) to reset\n",</div><div class='add'>+			   ag-&gt;num_started);</div><div class='add'>+		mutex_unlock(&amp;ag-&gt;mutex);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Prepare MLO global memory region for power up */</div><div class='add'>+	ath12k_qmi_reset_mlo_mem(ag);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_devices; i++) {</div><div class='add'>+		ab = ag-&gt;ab[i];</div><div class='add'>+		if (!ab)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ath12k_hif_power_up(ab);</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT, "reset started\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ag-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum ath12k_qmi_mem_mode ath12k_core_get_memory_mode(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	unsigned long total_ram;</div><div class='add'>+	struct sysinfo si;</div><div class='add'>+</div><div class='add'>+	si_meminfo(&amp;si);</div><div class='add'>+	total_ram = si.totalram * si.mem_unit;</div><div class='add'>+</div><div class='add'>+	if (total_ram &lt; SZ_512M)</div><div class='add'>+		return ATH12K_QMI_MEMORY_MODE_LOW_512_M;</div><div class='add'>+</div><div class='add'>+	return ATH12K_QMI_MEMORY_MODE_DEFAULT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_core_pre_init(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_mem_profile_based_param *param;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_hw_init(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to init hw params: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	param = &amp;ath12k_mem_profile_based_param[ab-&gt;target_mem_mode];</div><div class='add'>+	ab-&gt;profile_param = param;</div><div class='add'>+	ath12k_fw_map(ab);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_core_panic_handler(struct notifier_block *nb,</div><div class='add'>+				     unsigned long action, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = container_of(nb, struct ath12k_base,</div><div class='add'>+					      panic_nb);</div><div class='add'>+</div><div class='add'>+	return ath12k_hif_panic_handler(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_core_panic_notifier_register(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ab-&gt;panic_nb.notifier_call = ath12k_core_panic_handler;</div><div class='add'>+</div><div class='add'>+	return atomic_notifier_chain_register(&amp;panic_notifier_list,</div><div class='add'>+					      &amp;ab-&gt;panic_nb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_core_panic_notifier_unregister(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	atomic_notifier_chain_unregister(&amp;panic_notifier_list,</div><div class='add'>+					 &amp;ab-&gt;panic_nb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+bool ath12k_core_hw_group_create_ready(struct ath12k_hw_group *ag)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return (ag-&gt;num_probed == ag-&gt;num_devices);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ath12k_hw_group *ath12k_core_hw_group_alloc(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_group *ag;</div><div class='add'>+	int count = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ath12k_hw_group_mutex);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(ag, &amp;ath12k_hw_group_list, list)</div><div class='add'>+		count++;</div><div class='add'>+</div><div class='add'>+	ag = kzalloc(sizeof(*ag), GFP_KERNEL);</div><div class='add'>+	if (!ag)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ag-&gt;id = count;</div><div class='add'>+	list_add(&amp;ag-&gt;list, &amp;ath12k_hw_group_list);</div><div class='add'>+	mutex_init(&amp;ag-&gt;mutex);</div><div class='add'>+	ag-&gt;mlo_capable = false;</div><div class='add'>+</div><div class='add'>+	return ag;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_core_hw_group_free(struct ath12k_hw_group *ag)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;ath12k_hw_group_mutex);</div><div class='add'>+</div><div class='add'>+	list_del(&amp;ag-&gt;list);</div><div class='add'>+	kfree(ag);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ath12k_hw_group_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ath12k_hw_group *ath12k_core_hw_group_find_by_dt(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_group *ag;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;dev-&gt;of_node)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(ag, &amp;ath12k_hw_group_list, list)</div><div class='add'>+		for (i = 0; i &lt; ag-&gt;num_devices; i++)</div><div class='add'>+			if (ag-&gt;wsi_node[i] == ab-&gt;dev-&gt;of_node)</div><div class='add'>+				return ag;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_core_get_wsi_info(struct ath12k_hw_group *ag,</div><div class='add'>+				    struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct device_node *wsi_dev = ab-&gt;dev-&gt;of_node, *next_wsi_dev;</div><div class='add'>+	struct device_node *tx_endpoint, *next_rx_endpoint;</div><div class='add'>+	int device_count = 0;</div><div class='add'>+</div><div class='add'>+	next_wsi_dev = wsi_dev;</div><div class='add'>+</div><div class='add'>+	if (!next_wsi_dev)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		ag-&gt;wsi_node[device_count] = next_wsi_dev;</div><div class='add'>+</div><div class='add'>+		tx_endpoint = of_graph_get_endpoint_by_regs(next_wsi_dev, 0, -1);</div><div class='add'>+		if (!tx_endpoint) {</div><div class='add'>+			of_node_put(next_wsi_dev);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		next_rx_endpoint = of_graph_get_remote_endpoint(tx_endpoint);</div><div class='add'>+		if (!next_rx_endpoint) {</div><div class='add'>+			of_node_put(next_wsi_dev);</div><div class='add'>+			of_node_put(tx_endpoint);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		of_node_put(tx_endpoint);</div><div class='add'>+		of_node_put(next_wsi_dev);</div><div class='add'>+</div><div class='add'>+		next_wsi_dev = of_graph_get_port_parent(next_rx_endpoint);</div><div class='add'>+		if (!next_wsi_dev) {</div><div class='add'>+			of_node_put(next_rx_endpoint);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		of_node_put(next_rx_endpoint);</div><div class='add'>+</div><div class='add'>+		device_count++;</div><div class='add'>+		if (device_count &gt; ATH12K_MAX_DEVICES) {</div><div class='add'>+			ath12k_warn(ab, "device count in DT %d is more than limit %d\n",</div><div class='add'>+				    device_count, ATH12K_MAX_DEVICES);</div><div class='add'>+			of_node_put(next_wsi_dev);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} while (wsi_dev != next_wsi_dev);</div><div class='add'>+</div><div class='add'>+	of_node_put(next_wsi_dev);</div><div class='add'>+	ag-&gt;num_devices = device_count;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_core_get_wsi_index(struct ath12k_hw_group *ag,</div><div class='add'>+				     struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i, wsi_controller_index = -1, node_index = -1;</div><div class='add'>+	bool control;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_devices; i++) {</div><div class='add'>+		control = of_property_read_bool(ag-&gt;wsi_node[i], "qcom,wsi-controller");</div><div class='add'>+		if (control)</div><div class='add'>+			wsi_controller_index = i;</div><div class='add'>+</div><div class='add'>+		if (ag-&gt;wsi_node[i] == ab-&gt;dev-&gt;of_node)</div><div class='add'>+			node_index = i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wsi_controller_index == -1) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT, "wsi controller is not defined in dt");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (node_index == -1) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT, "unable to get WSI node index");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab-&gt;wsi_info.index = (ag-&gt;num_devices + node_index - wsi_controller_index) %</div><div class='add'>+		ag-&gt;num_devices;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ath12k_hw_group *ath12k_core_hw_group_assign(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wsi_info *wsi = &amp;ab-&gt;wsi_info;</div><div class='add'>+	struct ath12k_hw_group *ag;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ath12k_hw_group_mutex);</div><div class='add'>+</div><div class='add'>+	if (ath12k_ftm_mode)</div><div class='add'>+		goto invalid_group;</div><div class='add'>+</div><div class='add'>+	/* The grouping of multiple devices will be done based on device tree file.</div><div class='add'>+	 * The platforms that do not have any valid group information would have</div><div class='add'>+	 * each device to be part of its own invalid group.</div><div class='add'>+	 *</div><div class='add'>+	 * We use group id ATH12K_INVALID_GROUP_ID for single device group</div><div class='add'>+	 * which didn't have dt entry or wrong dt entry, there could be many</div><div class='add'>+	 * groups with same group id, i.e ATH12K_INVALID_GROUP_ID. So</div><div class='add'>+	 * default group id of ATH12K_INVALID_GROUP_ID combined with</div><div class='add'>+	 * num devices in ath12k_hw_group determines if the group is</div><div class='add'>+	 * multi device or single device group</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	ag = ath12k_core_hw_group_find_by_dt(ab);</div><div class='add'>+	if (!ag) {</div><div class='add'>+		ag = ath12k_core_hw_group_alloc(ab);</div><div class='add'>+		if (!ag) {</div><div class='add'>+			ath12k_warn(ab, "unable to create new hw group\n");</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ath12k_core_get_wsi_info(ag, ab) ||</div><div class='add'>+		    ath12k_core_get_wsi_index(ag, ab)) {</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+				   "unable to get wsi info from dt, grouping single device");</div><div class='add'>+			ag-&gt;id = ATH12K_INVALID_GROUP_ID;</div><div class='add'>+			ag-&gt;num_devices = 1;</div><div class='add'>+			memset(ag-&gt;wsi_node, 0, sizeof(ag-&gt;wsi_node));</div><div class='add'>+			wsi-&gt;index = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		goto exit;</div><div class='add'>+	} else if (test_bit(ATH12K_GROUP_FLAG_UNREGISTER, &amp;ag-&gt;flags)) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT, "group id %d in unregister state\n",</div><div class='add'>+			   ag-&gt;id);</div><div class='add'>+		goto invalid_group;</div><div class='add'>+	} else {</div><div class='add'>+		if (ath12k_core_get_wsi_index(ag, ab))</div><div class='add'>+			goto invalid_group;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+invalid_group:</div><div class='add'>+	ag = ath12k_core_hw_group_alloc(ab);</div><div class='add'>+	if (!ag) {</div><div class='add'>+		ath12k_warn(ab, "unable to create new hw group\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ag-&gt;id = ATH12K_INVALID_GROUP_ID;</div><div class='add'>+	ag-&gt;num_devices = 1;</div><div class='add'>+	wsi-&gt;index = 0;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_BOOT, "single device added to hardware group\n");</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	if (ag-&gt;num_probed &gt;= ag-&gt;num_devices) {</div><div class='add'>+		ath12k_warn(ab, "unable to add new device to group, max limit reached\n");</div><div class='add'>+		goto invalid_group;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab-&gt;device_id = ag-&gt;num_probed++;</div><div class='add'>+	ag-&gt;ab[ab-&gt;device_id] = ab;</div><div class='add'>+	ab-&gt;ag = ag;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_BOOT, "wsi group-id %d num-devices %d index %d",</div><div class='add'>+		   ag-&gt;id, ag-&gt;num_devices, wsi-&gt;index);</div><div class='add'>+</div><div class='add'>+	return ag;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_core_hw_group_unassign(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_group *ag = ath12k_ab_to_ag(ab);</div><div class='add'>+	u8 device_id = ab-&gt;device_id;</div><div class='add'>+	int num_probed;</div><div class='add'>+</div><div class='add'>+	if (!ag)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(device_id &gt;= ag-&gt;num_devices)) {</div><div class='add'>+		mutex_unlock(&amp;ag-&gt;mutex);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ag-&gt;ab[device_id] != ab)) {</div><div class='add'>+		mutex_unlock(&amp;ag-&gt;mutex);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ag-&gt;ab[device_id] = NULL;</div><div class='add'>+	ab-&gt;ag = NULL;</div><div class='add'>+	ab-&gt;device_id = ATH12K_INVALID_DEVICE_ID;</div><div class='add'>+</div><div class='add'>+	if (ag-&gt;num_probed)</div><div class='add'>+		ag-&gt;num_probed--;</div><div class='add'>+</div><div class='add'>+	num_probed = ag-&gt;num_probed;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!num_probed)</div><div class='add'>+		ath12k_core_hw_group_free(ag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_core_hw_group_destroy(struct ath12k_hw_group *ag)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!ag))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_devices; i++) {</div><div class='add'>+		ab = ag-&gt;ab[i];</div><div class='add'>+		if (!ab)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ath12k_core_soc_destroy(ab);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_core_hw_group_cleanup(struct ath12k_hw_group *ag)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!ag)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_GROUP_FLAG_UNREGISTER, &amp;ag-&gt;flags)) {</div><div class='add'>+		mutex_unlock(&amp;ag-&gt;mutex);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_bit(ATH12K_GROUP_FLAG_UNREGISTER, &amp;ag-&gt;flags);</div><div class='add'>+</div><div class='add'>+	ath12k_core_hw_group_stop(ag);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_devices; i++) {</div><div class='add'>+		ab = ag-&gt;ab[i];</div><div class='add'>+		if (!ab)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;ab-&gt;core_lock);</div><div class='add'>+		ath12k_core_stop(ab);</div><div class='add'>+		mutex_unlock(&amp;ab-&gt;core_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ag-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_core_hw_group_create(struct ath12k_hw_group *ag)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_devices; i++) {</div><div class='add'>+		ab = ag-&gt;ab[i];</div><div class='add'>+		if (!ab)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;ab-&gt;core_lock);</div><div class='add'>+</div><div class='add'>+		ret = ath12k_core_soc_create(ab);</div><div class='add'>+		if (ret) {</div><div class='add'>+			mutex_unlock(&amp;ab-&gt;core_lock);</div><div class='add'>+			ath12k_err(ab, "failed to create soc %d core: %d\n", i, ret);</div><div class='add'>+			goto destroy;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mutex_unlock(&amp;ab-&gt;core_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+destroy:</div><div class='add'>+	for (i--; i &gt;= 0; i--) {</div><div class='add'>+		ab = ag-&gt;ab[i];</div><div class='add'>+		if (!ab)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;ab-&gt;core_lock);</div><div class='add'>+		ath12k_core_soc_destroy(ab);</div><div class='add'>+		mutex_unlock(&amp;ab-&gt;core_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_core_hw_group_set_mlo_capable(struct ath12k_hw_group *ag)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (ath12k_ftm_mode)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (ag-&gt;num_devices == 1) {</div><div class='add'>+		ab = ag-&gt;ab[0];</div><div class='add'>+		/* QCN9274 firmware uses firmware IE for MLO advertisement */</div><div class='add'>+		if (ab-&gt;fw.fw_features_valid) {</div><div class='add'>+			ag-&gt;mlo_capable =</div><div class='add'>+				ath12k_fw_feature_supported(ab, ATH12K_FW_FEATURE_MLO);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* while WCN7850 firmware uses QMI single_chip_mlo_support bit */</div><div class='add'>+		ag-&gt;mlo_capable = ab-&gt;single_chip_mlo_support;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ag-&gt;mlo_capable = true;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_devices; i++) {</div><div class='add'>+		ab = ag-&gt;ab[i];</div><div class='add'>+		if (!ab)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* even if 1 device's firmware feature indicates MLO</div><div class='add'>+		 * unsupported, make MLO unsupported for the whole group</div><div class='add'>+		 */</div><div class='add'>+		if (!ath12k_fw_feature_supported(ab, ATH12K_FW_FEATURE_MLO)) {</div><div class='add'>+			ag-&gt;mlo_capable = false;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_core_init(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_group *ag;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_panic_notifier_register(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ab, "failed to register panic handler: %d\n", ret);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ath12k_hw_group_mutex);</div><div class='add'>+</div><div class='add'>+	ag = ath12k_core_hw_group_assign(ab);</div><div class='add'>+	if (!ag) {</div><div class='add'>+		mutex_unlock(&amp;ath12k_hw_group_mutex);</div><div class='add'>+		ath12k_warn(ab, "unable to get hw group\n");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto err_unregister_notifier;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ath12k_hw_group_mutex);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_BOOT, "num devices %d num probed %d\n",</div><div class='add'>+		   ag-&gt;num_devices, ag-&gt;num_probed);</div><div class='add'>+</div><div class='add'>+	if (ath12k_core_hw_group_create_ready(ag)) {</div><div class='add'>+		ret = ath12k_core_hw_group_create(ag);</div><div class='add'>+		if (ret) {</div><div class='add'>+			mutex_unlock(&amp;ag-&gt;mutex);</div><div class='add'>+			ath12k_warn(ab, "unable to create hw group\n");</div><div class='add'>+			goto err_unassign_hw_group;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_unassign_hw_group:</div><div class='add'>+	ath12k_core_hw_group_unassign(ab);</div><div class='add'>+err_unregister_notifier:</div><div class='add'>+	ath12k_core_panic_notifier_unregister(ab);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_core_deinit(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath12k_core_hw_group_destroy(ab-&gt;ag);</div><div class='add'>+	ath12k_core_hw_group_unassign(ab);</div><div class='add'>+	ath12k_core_panic_notifier_unregister(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_core_free(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	timer_delete_sync(&amp;ab-&gt;rx_replenish_retry);</div><div class='add'>+	destroy_workqueue(ab-&gt;workqueue_aux);</div><div class='add'>+	destroy_workqueue(ab-&gt;workqueue);</div><div class='add'>+	kfree(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ath12k_base *ath12k_core_alloc(struct device *dev, size_t priv_size,</div><div class='add'>+				      enum ath12k_bus bus)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+</div><div class='add'>+	ab = kzalloc(sizeof(*ab) + priv_size, GFP_KERNEL);</div><div class='add'>+	if (!ab)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;ab-&gt;driver_recovery);</div><div class='add'>+</div><div class='add'>+	ab-&gt;workqueue = create_singlethread_workqueue("ath12k_wq");</div><div class='add'>+	if (!ab-&gt;workqueue)</div><div class='add'>+		goto err_sc_free;</div><div class='add'>+</div><div class='add'>+	ab-&gt;workqueue_aux = create_singlethread_workqueue("ath12k_aux_wq");</div><div class='add'>+	if (!ab-&gt;workqueue_aux)</div><div class='add'>+		goto err_free_wq;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;ab-&gt;core_lock);</div><div class='add'>+	spin_lock_init(&amp;ab-&gt;base_lock);</div><div class='add'>+	init_completion(&amp;ab-&gt;reset_complete);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;ab-&gt;peers);</div><div class='add'>+	init_waitqueue_head(&amp;ab-&gt;peer_mapping_wq);</div><div class='add'>+	init_waitqueue_head(&amp;ab-&gt;wmi_ab.tx_credits_wq);</div><div class='add'>+	INIT_WORK(&amp;ab-&gt;restart_work, ath12k_core_restart);</div><div class='add'>+	INIT_WORK(&amp;ab-&gt;reset_work, ath12k_core_reset);</div><div class='add'>+	INIT_WORK(&amp;ab-&gt;rfkill_work, ath12k_rfkill_work);</div><div class='add'>+	INIT_WORK(&amp;ab-&gt;dump_work, ath12k_coredump_upload);</div><div class='add'>+	INIT_WORK(&amp;ab-&gt;update_11d_work, ath12k_update_11d);</div><div class='add'>+</div><div class='add'>+	timer_setup(&amp;ab-&gt;rx_replenish_retry, ath12k_ce_rx_replenish_retry, 0);</div><div class='add'>+	init_completion(&amp;ab-&gt;htc_suspend);</div><div class='add'>+	init_completion(&amp;ab-&gt;restart_completed);</div><div class='add'>+	init_completion(&amp;ab-&gt;wow.wakeup_completed);</div><div class='add'>+</div><div class='add'>+	ab-&gt;dev = dev;</div><div class='add'>+	ab-&gt;hif.bus = bus;</div><div class='add'>+	ab-&gt;qmi.num_radios = U8_MAX;</div><div class='add'>+	ab-&gt;single_chip_mlo_support = false;</div><div class='add'>+</div><div class='add'>+	/* Device index used to identify the devices in a group.</div><div class='add'>+	 *</div><div class='add'>+	 * In Intra-device MLO, only one device present in a group,</div><div class='add'>+	 * so it is always zero.</div><div class='add'>+	 *</div><div class='add'>+	 * In Inter-device MLO, Multiple device present in a group,</div><div class='add'>+	 * expect non-zero value.</div><div class='add'>+	 */</div><div class='add'>+	ab-&gt;device_id = 0;</div><div class='add'>+</div><div class='add'>+	return ab;</div><div class='add'>+</div><div class='add'>+err_free_wq:</div><div class='add'>+	destroy_workqueue(ab-&gt;workqueue);</div><div class='add'>+err_sc_free:</div><div class='add'>+	kfree(ab);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_init(void)</div><div class='add'>+{</div><div class='add'>+	ahb_err = ath12k_ahb_init();</div><div class='add'>+	if (ahb_err)</div><div class='add'>+		pr_warn("Failed to initialize ath12k AHB device: %d\n", ahb_err);</div><div class='add'>+</div><div class='add'>+	pci_err = ath12k_pci_init();</div><div class='add'>+	if (pci_err)</div><div class='add'>+		pr_warn("Failed to initialize ath12k PCI device: %d\n", pci_err);</div><div class='add'>+</div><div class='add'>+	/* If both failed, return one of the failures (arbitrary) */</div><div class='add'>+	return ahb_err &amp;&amp; pci_err ? ahb_err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_exit(void)</div><div class='add'>+{</div><div class='add'>+	if (!pci_err)</div><div class='add'>+		ath12k_pci_exit();</div><div class='add'>+</div><div class='add'>+	if (!ahb_err)</div><div class='add'>+		ath12k_ahb_exit();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(ath12k_init);</div><div class='add'>+module_exit(ath12k_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Driver support for Qualcomm Technologies 802.11be WLAN devices");</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h<br/>new file mode 100644<br/>index 000000000000..3c1e0069be1e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/core.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/core.h</a></div><div class='hunk'>@@ -0,0 +1,1519 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH12K_CORE_H</div><div class='add'>+#define ATH12K_CORE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/dmi.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/of_reserved_mem.h&gt;</div><div class='add'>+#include &lt;linux/panic_notifier.h&gt;</div><div class='add'>+#include &lt;linux/average.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include "qmi.h"</div><div class='add'>+#include "htc.h"</div><div class='add'>+#include "wmi.h"</div><div class='add'>+#include "hal.h"</div><div class='add'>+#include "dp.h"</div><div class='add'>+#include "ce.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+#include "hw.h"</div><div class='add'>+#include "hal_rx.h"</div><div class='add'>+#include "reg.h"</div><div class='add'>+#include "dbring.h"</div><div class='add'>+#include "fw.h"</div><div class='add'>+#include "acpi.h"</div><div class='add'>+#include "wow.h"</div><div class='add'>+#include "debugfs_htt_stats.h"</div><div class='add'>+#include "coredump.h"</div><div class='add'>+</div><div class='add'>+#define SM(_v, _f) (((_v) &lt;&lt; _f##_LSB) &amp; _f##_MASK)</div><div class='add'>+</div><div class='add'>+#define ATH12K_TX_MGMT_NUM_PENDING_MAX	512</div><div class='add'>+</div><div class='add'>+#define ATH12K_TX_MGMT_TARGET_MAX_SUPPORT_WMI 64</div><div class='add'>+</div><div class='add'>+/* Pending management packets threshold for dropping probe responses */</div><div class='add'>+#define ATH12K_PRB_RSP_DROP_THRESHOLD ((ATH12K_TX_MGMT_TARGET_MAX_SUPPORT_WMI * 3) / 4)</div><div class='add'>+</div><div class='add'>+/* SMBIOS type containing Board Data File Name Extension */</div><div class='add'>+#define ATH12K_SMBIOS_BDF_EXT_TYPE 0xF8</div><div class='add'>+</div><div class='add'>+/* SMBIOS type structure length (excluding strings-set) */</div><div class='add'>+#define ATH12K_SMBIOS_BDF_EXT_LENGTH 0x9</div><div class='add'>+</div><div class='add'>+/* The magic used by QCA spec */</div><div class='add'>+#define ATH12K_SMBIOS_BDF_EXT_MAGIC "BDF_"</div><div class='add'>+</div><div class='add'>+#define ATH12K_INVALID_HW_MAC_ID	0xFF</div><div class='add'>+#define ATH12K_CONNECTION_LOSS_HZ	(3 * HZ)</div><div class='add'>+</div><div class='add'>+#define ATH12K_MON_TIMER_INTERVAL  10</div><div class='add'>+#define ATH12K_RESET_TIMEOUT_HZ			(20 * HZ)</div><div class='add'>+#define ATH12K_RESET_MAX_FAIL_COUNT_FIRST	3</div><div class='add'>+#define ATH12K_RESET_MAX_FAIL_COUNT_FINAL	5</div><div class='add'>+#define ATH12K_RESET_FAIL_TIMEOUT_HZ		(20 * HZ)</div><div class='add'>+#define ATH12K_RECONFIGURE_TIMEOUT_HZ		(10 * HZ)</div><div class='add'>+#define ATH12K_RECOVER_START_TIMEOUT_HZ		(20 * HZ)</div><div class='add'>+</div><div class='add'>+#define ATH12K_MAX_DEVICES 3</div><div class='add'>+#define ATH12K_GROUP_MAX_RADIO (ATH12K_MAX_DEVICES * MAX_RADIOS)</div><div class='add'>+#define ATH12K_INVALID_GROUP_ID  0xFF</div><div class='add'>+#define ATH12K_INVALID_DEVICE_ID 0xFF</div><div class='add'>+</div><div class='add'>+#define ATH12K_MAX_MLO_PEERS            256</div><div class='add'>+#define ATH12K_MLO_PEER_ID_INVALID      0xFFFF</div><div class='add'>+</div><div class='add'>+#define ATH12K_INVALID_RSSI_FULL -1</div><div class='add'>+#define ATH12K_INVALID_RSSI_EMPTY -128</div><div class='add'>+</div><div class='add'>+enum ath12k_bdf_search {</div><div class='add'>+	ATH12K_BDF_SEARCH_DEFAULT,</div><div class='add'>+	ATH12K_BDF_SEARCH_BUS_AND_BOARD,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wme_ac {</div><div class='add'>+	WME_AC_BE,</div><div class='add'>+	WME_AC_BK,</div><div class='add'>+	WME_AC_VI,</div><div class='add'>+	WME_AC_VO,</div><div class='add'>+	WME_NUM_AC</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_HT_MCS_MAX	7</div><div class='add'>+#define ATH12K_VHT_MCS_MAX	9</div><div class='add'>+#define ATH12K_HE_MCS_MAX	11</div><div class='add'>+#define ATH12K_EHT_MCS_MAX	15</div><div class='add'>+</div><div class='add'>+enum ath12k_crypt_mode {</div><div class='add'>+	/* Only use hardware crypto engine */</div><div class='add'>+	ATH12K_CRYPT_MODE_HW,</div><div class='add'>+	/* Only use software crypto */</div><div class='add'>+	ATH12K_CRYPT_MODE_SW,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline enum wme_ac ath12k_tid_to_ac(u32 tid)</div><div class='add'>+{</div><div class='add'>+	return (((tid == 0) || (tid == 3)) ? WME_AC_BE :</div><div class='add'>+		((tid == 1) || (tid == 2)) ? WME_AC_BK :</div><div class='add'>+		((tid == 4) || (tid == 5)) ? WME_AC_VI :</div><div class='add'>+		WME_AC_VO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64 ath12k_le32hilo_to_u64(__le32 hi, __le32 lo)</div><div class='add'>+{</div><div class='add'>+	u64 hi64 = le32_to_cpu(hi);</div><div class='add'>+	u64 lo64 = le32_to_cpu(lo);</div><div class='add'>+</div><div class='add'>+	return (hi64 &lt;&lt; 32) | lo64;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum ath12k_skb_flags {</div><div class='add'>+	ATH12K_SKB_HW_80211_ENCAP = BIT(0),</div><div class='add'>+	ATH12K_SKB_CIPHER_SET = BIT(1),</div><div class='add'>+	ATH12K_SKB_MLO_STA = BIT(2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_skb_cb {</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	dma_addr_t paddr_ext_desc;</div><div class='add'>+	u32 cipher;</div><div class='add'>+	u8 flags;</div><div class='add'>+	u8 link_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_skb_rxcb {</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	bool is_first_msdu;</div><div class='add'>+	bool is_last_msdu;</div><div class='add'>+	bool is_continuation;</div><div class='add'>+	bool is_mcbc;</div><div class='add'>+	bool is_eapol;</div><div class='add'>+	struct hal_rx_desc *rx_desc;</div><div class='add'>+	u8 err_rel_src;</div><div class='add'>+	u8 err_code;</div><div class='add'>+	u8 hw_link_id;</div><div class='add'>+	u8 unmapped;</div><div class='add'>+	u8 is_frag;</div><div class='add'>+	u8 tid;</div><div class='add'>+	u16 peer_id;</div><div class='add'>+	bool is_end_of_ppdu;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_hw_rev {</div><div class='add'>+	ATH12K_HW_QCN9274_HW10,</div><div class='add'>+	ATH12K_HW_QCN9274_HW20,</div><div class='add'>+	ATH12K_HW_WCN7850_HW20,</div><div class='add'>+	ATH12K_HW_IPQ5332_HW10,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_firmware_mode {</div><div class='add'>+	/* the default mode, standard 802.11 functionality */</div><div class='add'>+	ATH12K_FIRMWARE_MODE_NORMAL,</div><div class='add'>+</div><div class='add'>+	/* factory tests etc */</div><div class='add'>+	ATH12K_FIRMWARE_MODE_FTM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_IRQ_NUM_MAX 57</div><div class='add'>+#define ATH12K_EXT_IRQ_NUM_MAX	16</div><div class='add'>+#define ATH12K_MAX_TCL_RING_NUM	3</div><div class='add'>+</div><div class='add'>+struct ath12k_ext_irq_grp {</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	u32 irqs[ATH12K_EXT_IRQ_NUM_MAX];</div><div class='add'>+	u32 num_irq;</div><div class='add'>+	u32 grp_id;</div><div class='add'>+	u64 timestamp;</div><div class='add'>+	bool napi_enabled;</div><div class='add'>+	struct napi_struct napi;</div><div class='add'>+	struct net_device *napi_ndev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_smbios_cc_type {</div><div class='add'>+	/* disable country code setting from SMBIOS */</div><div class='add'>+	ATH12K_SMBIOS_CC_DISABLE = 0,</div><div class='add'>+</div><div class='add'>+	/* set country code by ANSI country name, based on ISO3166-1 alpha2 */</div><div class='add'>+	ATH12K_SMBIOS_CC_ISO = 1,</div><div class='add'>+</div><div class='add'>+	/* worldwide regdomain */</div><div class='add'>+	ATH12K_SMBIOS_CC_WW = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_smbios_bdf {</div><div class='add'>+	struct dmi_header hdr;</div><div class='add'>+	u8 features_disabled;</div><div class='add'>+</div><div class='add'>+	/* enum ath12k_smbios_cc_type */</div><div class='add'>+	u8 country_code_flag;</div><div class='add'>+</div><div class='add'>+	/* To set specific country, you need to set country code</div><div class='add'>+	 * flag=ATH12K_SMBIOS_CC_ISO first, then if country is United</div><div class='add'>+	 * States, then country code value = 0x5553 ("US",'U' = 0x55, 'S'=</div><div class='add'>+	 * 0x53). To set country to INDONESIA, then country code value =</div><div class='add'>+	 * 0x4944 ("IN", 'I'=0x49, 'D'=0x44). If country code flag =</div><div class='add'>+	 * ATH12K_SMBIOS_CC_WW, then you can use worldwide regulatory</div><div class='add'>+	 * setting.</div><div class='add'>+	 */</div><div class='add'>+	u16 cc_code;</div><div class='add'>+</div><div class='add'>+	u8 bdf_enabled;</div><div class='add'>+	u8 bdf_ext[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HEHANDLE_CAP_PHYINFO_SIZE       3</div><div class='add'>+#define HECAP_PHYINFO_SIZE              9</div><div class='add'>+#define HECAP_MACINFO_SIZE              5</div><div class='add'>+#define HECAP_TXRX_MCS_NSS_SIZE         2</div><div class='add'>+#define HECAP_PPET16_PPET8_MAX_SIZE     25</div><div class='add'>+</div><div class='add'>+#define HE_PPET16_PPET8_SIZE            8</div><div class='add'>+</div><div class='add'>+/* 802.11ax PPE (PPDU packet Extension) threshold */</div><div class='add'>+struct he_ppe_threshold {</div><div class='add'>+	u32 numss_m1;</div><div class='add'>+	u32 ru_mask;</div><div class='add'>+	u32 ppet16_ppet8_ru3_ru0[HE_PPET16_PPET8_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_he {</div><div class='add'>+	u8 hecap_macinfo[HECAP_MACINFO_SIZE];</div><div class='add'>+	u32 hecap_rxmcsnssmap;</div><div class='add'>+	u32 hecap_txmcsnssmap;</div><div class='add'>+	u32 hecap_phyinfo[HEHANDLE_CAP_PHYINFO_SIZE];</div><div class='add'>+	struct he_ppe_threshold   hecap_ppet;</div><div class='add'>+	u32 heop_param;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	WMI_HOST_TP_SCALE_MAX   = 0,</div><div class='add'>+	WMI_HOST_TP_SCALE_50    = 1,</div><div class='add'>+	WMI_HOST_TP_SCALE_25    = 2,</div><div class='add'>+	WMI_HOST_TP_SCALE_12    = 3,</div><div class='add'>+	WMI_HOST_TP_SCALE_MIN   = 4,</div><div class='add'>+	WMI_HOST_TP_SCALE_SIZE   = 5,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_scan_state {</div><div class='add'>+	ATH12K_SCAN_IDLE,</div><div class='add'>+	ATH12K_SCAN_STARTING,</div><div class='add'>+	ATH12K_SCAN_RUNNING,</div><div class='add'>+	ATH12K_SCAN_ABORTING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_11d_state {</div><div class='add'>+	ATH12K_11D_IDLE,</div><div class='add'>+	ATH12K_11D_PREPARING,</div><div class='add'>+	ATH12K_11D_RUNNING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_hw_group_flags {</div><div class='add'>+	ATH12K_GROUP_FLAG_REGISTERED,</div><div class='add'>+	ATH12K_GROUP_FLAG_UNREGISTER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_dev_flags {</div><div class='add'>+	ATH12K_FLAG_CAC_RUNNING,</div><div class='add'>+	ATH12K_FLAG_CRASH_FLUSH,</div><div class='add'>+	ATH12K_FLAG_RAW_MODE,</div><div class='add'>+	ATH12K_FLAG_HW_CRYPTO_DISABLED,</div><div class='add'>+	ATH12K_FLAG_RECOVERY,</div><div class='add'>+	ATH12K_FLAG_UNREGISTERING,</div><div class='add'>+	ATH12K_FLAG_REGISTERED,</div><div class='add'>+	ATH12K_FLAG_QMI_FAIL,</div><div class='add'>+	ATH12K_FLAG_HTC_SUSPEND_COMPLETE,</div><div class='add'>+	ATH12K_FLAG_CE_IRQ_ENABLED,</div><div class='add'>+	ATH12K_FLAG_EXT_IRQ_ENABLED,</div><div class='add'>+	ATH12K_FLAG_QMI_FW_READY_COMPLETE,</div><div class='add'>+	ATH12K_FLAG_FTM_SEGMENTED,</div><div class='add'>+	ATH12K_FLAG_FIXED_MEM_REGION,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_tx_conf {</div><div class='add'>+	bool changed;</div><div class='add'>+	u16 ac;</div><div class='add'>+	struct ieee80211_tx_queue_params tx_queue_params;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_key_conf {</div><div class='add'>+	enum set_key_cmd cmd;</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct ieee80211_key_conf *key;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_vif_cache {</div><div class='add'>+	struct ath12k_tx_conf tx_conf;</div><div class='add'>+	struct ath12k_key_conf key_conf;</div><div class='add'>+	u32 bss_conf_changed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_rekey_data {</div><div class='add'>+	u8 kck[NL80211_KCK_LEN];</div><div class='add'>+	u8 kek[NL80211_KCK_LEN];</div><div class='add'>+	u64 replay_ctr;</div><div class='add'>+	bool enable_offload;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_link_vif {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 beacon_interval;</div><div class='add'>+	u32 dtim_period;</div><div class='add'>+	u16 ast_hash;</div><div class='add'>+	u16 ast_idx;</div><div class='add'>+	u16 tcl_metadata;</div><div class='add'>+	u8 hal_addr_search_flags;</div><div class='add'>+	u8 search_type;</div><div class='add'>+</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+</div><div class='add'>+	int bank_id;</div><div class='add'>+	u8 vdev_id_check_en;</div><div class='add'>+	bool beacon_prot;</div><div class='add'>+</div><div class='add'>+	struct wmi_wmm_params_all_arg wmm_params;</div><div class='add'>+	struct list_head list;</div><div class='add'>+</div><div class='add'>+	bool is_created;</div><div class='add'>+	bool is_started;</div><div class='add'>+	bool is_up;</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	struct cfg80211_bitrate_mask bitrate_mask;</div><div class='add'>+	struct delayed_work connection_loss_work;</div><div class='add'>+	int num_legacy_stations;</div><div class='add'>+	int rtscts_prot_mode;</div><div class='add'>+	int txpower;</div><div class='add'>+	bool rsnie_present;</div><div class='add'>+	bool wpaie_present;</div><div class='add'>+	u8 vdev_stats_id;</div><div class='add'>+	u32 punct_bitmap;</div><div class='add'>+	u8 link_id;</div><div class='add'>+	struct ath12k_vif *ahvif;</div><div class='add'>+	struct ath12k_rekey_data rekey_data;</div><div class='add'>+	struct ath12k_link_stats link_stats;</div><div class='add'>+	spinlock_t link_stats_lock; /* Protects updates to link_stats */</div><div class='add'>+</div><div class='add'>+	u8 current_cntdown_counter;</div><div class='add'>+</div><div class='add'>+	/* only used in station mode */</div><div class='add'>+	bool is_sta_assoc_link;</div><div class='add'>+</div><div class='add'>+	struct ath12k_reg_tpc_power_info reg_tpc_info;</div><div class='add'>+</div><div class='add'>+	bool group_key_valid;</div><div class='add'>+	struct wmi_vdev_install_key_arg group_key;</div><div class='add'>+	bool pairwise_key_done;</div><div class='add'>+	u16 num_stations;</div><div class='add'>+	bool is_csa_in_progress;</div><div class='add'>+	struct wiphy_work bcn_tx_work;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_vif {</div><div class='add'>+	enum wmi_vdev_type vdev_type;</div><div class='add'>+	enum wmi_vdev_subtype vdev_subtype;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct ath12k_hw *ah;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u32 uapsd;</div><div class='add'>+		} sta;</div><div class='add'>+		struct {</div><div class='add'>+			/* 127 stations; wmi limit */</div><div class='add'>+			u8 tim_bitmap[16];</div><div class='add'>+			u8 tim_len;</div><div class='add'>+			u32 ssid_len;</div><div class='add'>+			u8 ssid[IEEE80211_MAX_SSID_LEN];</div><div class='add'>+			bool hidden_ssid;</div><div class='add'>+			/* P2P_IE with NoA attribute for P2P_GO case */</div><div class='add'>+			u32 noa_len;</div><div class='add'>+			u8 *noa_data;</div><div class='add'>+		} ap;</div><div class='add'>+	} u;</div><div class='add'>+</div><div class='add'>+	u32 aid;</div><div class='add'>+	u32 key_cipher;</div><div class='add'>+	u8 tx_encap_type;</div><div class='add'>+	bool ps;</div><div class='add'>+	atomic_t mcbc_gsn;</div><div class='add'>+</div><div class='add'>+	struct ath12k_link_vif deflink;</div><div class='add'>+	struct ath12k_link_vif __rcu *link[ATH12K_NUM_MAX_LINKS];</div><div class='add'>+	struct ath12k_vif_cache *cache[IEEE80211_MLD_MAX_NUM_LINKS];</div><div class='add'>+	/* indicates bitmap of link vif created in FW */</div><div class='add'>+	u32 links_map;</div><div class='add'>+	/* Must be last - ends in a flexible-array member.</div><div class='add'>+	 *</div><div class='add'>+	 * FIXME: Driver should not copy struct ieee80211_chanctx_conf,</div><div class='add'>+	 * especially because it has a flexible array. Find a better way.</div><div class='add'>+	 */</div><div class='add'>+	struct ieee80211_chanctx_conf chanctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_vif_iter {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_AST_IDX_INVALID	0xFFFF</div><div class='add'>+#define HAL_RX_MAX_MCS		12</div><div class='add'>+#define HAL_RX_MAX_MCS_HT	31</div><div class='add'>+#define HAL_RX_MAX_MCS_VHT	9</div><div class='add'>+#define HAL_RX_MAX_MCS_HE	11</div><div class='add'>+#define HAL_RX_MAX_MCS_BE	15</div><div class='add'>+#define HAL_RX_MAX_NSS		8</div><div class='add'>+#define HAL_RX_MAX_NUM_LEGACY_RATES 12</div><div class='add'>+</div><div class='add'>+#define ATH12K_SCAN_TIMEOUT_HZ (20 * HZ)</div><div class='add'>+</div><div class='add'>+struct ath12k_rx_peer_rate_stats {</div><div class='add'>+	u64 ht_mcs_count[HAL_RX_MAX_MCS_HT + 1];</div><div class='add'>+	u64 vht_mcs_count[HAL_RX_MAX_MCS_VHT + 1];</div><div class='add'>+	u64 he_mcs_count[HAL_RX_MAX_MCS_HE + 1];</div><div class='add'>+	u64 be_mcs_count[HAL_RX_MAX_MCS_BE + 1];</div><div class='add'>+	u64 nss_count[HAL_RX_MAX_NSS];</div><div class='add'>+	u64 bw_count[HAL_RX_BW_MAX];</div><div class='add'>+	u64 gi_count[HAL_RX_GI_MAX];</div><div class='add'>+	u64 legacy_count[HAL_RX_MAX_NUM_LEGACY_RATES];</div><div class='add'>+	u64 rx_rate[HAL_RX_BW_MAX][HAL_RX_GI_MAX][HAL_RX_MAX_NSS][HAL_RX_MAX_MCS_HT + 1];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_rx_peer_stats {</div><div class='add'>+	u64 num_msdu;</div><div class='add'>+	u64 num_mpdu_fcs_ok;</div><div class='add'>+	u64 num_mpdu_fcs_err;</div><div class='add'>+	u64 tcp_msdu_count;</div><div class='add'>+	u64 udp_msdu_count;</div><div class='add'>+	u64 other_msdu_count;</div><div class='add'>+	u64 ampdu_msdu_count;</div><div class='add'>+	u64 non_ampdu_msdu_count;</div><div class='add'>+	u64 stbc_count;</div><div class='add'>+	u64 beamformed_count;</div><div class='add'>+	u64 coding_count[HAL_RX_SU_MU_CODING_MAX];</div><div class='add'>+	u64 tid_count[IEEE80211_NUM_TIDS + 1];</div><div class='add'>+	u64 pream_cnt[HAL_RX_PREAMBLE_MAX];</div><div class='add'>+	u64 reception_type[HAL_RX_RECEPTION_TYPE_MAX];</div><div class='add'>+	u64 rx_duration;</div><div class='add'>+	u64 dcm_count;</div><div class='add'>+	u64 ru_alloc_cnt[HAL_RX_RU_ALLOC_TYPE_MAX];</div><div class='add'>+	struct ath12k_rx_peer_rate_stats pkt_stats;</div><div class='add'>+	struct ath12k_rx_peer_rate_stats byte_stats;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_HE_MCS_NUM       12</div><div class='add'>+#define ATH12K_VHT_MCS_NUM      10</div><div class='add'>+#define ATH12K_BW_NUM           5</div><div class='add'>+#define ATH12K_NSS_NUM          4</div><div class='add'>+#define ATH12K_LEGACY_NUM       12</div><div class='add'>+#define ATH12K_GI_NUM           4</div><div class='add'>+#define ATH12K_HT_MCS_NUM       32</div><div class='add'>+</div><div class='add'>+enum ath12k_pkt_rx_err {</div><div class='add'>+	ATH12K_PKT_RX_ERR_FCS,</div><div class='add'>+	ATH12K_PKT_RX_ERR_TKIP,</div><div class='add'>+	ATH12K_PKT_RX_ERR_CRYPT,</div><div class='add'>+	ATH12K_PKT_RX_ERR_PEER_IDX_INVAL,</div><div class='add'>+	ATH12K_PKT_RX_ERR_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_ampdu_subfrm_num {</div><div class='add'>+	ATH12K_AMPDU_SUBFRM_NUM_10,</div><div class='add'>+	ATH12K_AMPDU_SUBFRM_NUM_20,</div><div class='add'>+	ATH12K_AMPDU_SUBFRM_NUM_30,</div><div class='add'>+	ATH12K_AMPDU_SUBFRM_NUM_40,</div><div class='add'>+	ATH12K_AMPDU_SUBFRM_NUM_50,</div><div class='add'>+	ATH12K_AMPDU_SUBFRM_NUM_60,</div><div class='add'>+	ATH12K_AMPDU_SUBFRM_NUM_MORE,</div><div class='add'>+	ATH12K_AMPDU_SUBFRM_NUM_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_amsdu_subfrm_num {</div><div class='add'>+	ATH12K_AMSDU_SUBFRM_NUM_1,</div><div class='add'>+	ATH12K_AMSDU_SUBFRM_NUM_2,</div><div class='add'>+	ATH12K_AMSDU_SUBFRM_NUM_3,</div><div class='add'>+	ATH12K_AMSDU_SUBFRM_NUM_4,</div><div class='add'>+	ATH12K_AMSDU_SUBFRM_NUM_MORE,</div><div class='add'>+	ATH12K_AMSDU_SUBFRM_NUM_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_counter_type {</div><div class='add'>+	ATH12K_COUNTER_TYPE_BYTES,</div><div class='add'>+	ATH12K_COUNTER_TYPE_PKTS,</div><div class='add'>+	ATH12K_COUNTER_TYPE_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_stats_type {</div><div class='add'>+	ATH12K_STATS_TYPE_SUCC,</div><div class='add'>+	ATH12K_STATS_TYPE_FAIL,</div><div class='add'>+	ATH12K_STATS_TYPE_RETRY,</div><div class='add'>+	ATH12K_STATS_TYPE_AMPDU,</div><div class='add'>+	ATH12K_STATS_TYPE_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_data_stats {</div><div class='add'>+	u64 legacy[ATH12K_COUNTER_TYPE_MAX][ATH12K_LEGACY_NUM];</div><div class='add'>+	u64 ht[ATH12K_COUNTER_TYPE_MAX][ATH12K_HT_MCS_NUM];</div><div class='add'>+	u64 vht[ATH12K_COUNTER_TYPE_MAX][ATH12K_VHT_MCS_NUM];</div><div class='add'>+	u64 he[ATH12K_COUNTER_TYPE_MAX][ATH12K_HE_MCS_NUM];</div><div class='add'>+	u64 bw[ATH12K_COUNTER_TYPE_MAX][ATH12K_BW_NUM];</div><div class='add'>+	u64 nss[ATH12K_COUNTER_TYPE_MAX][ATH12K_NSS_NUM];</div><div class='add'>+	u64 gi[ATH12K_COUNTER_TYPE_MAX][ATH12K_GI_NUM];</div><div class='add'>+	u64 transmit_type[ATH12K_COUNTER_TYPE_MAX][HAL_RX_RECEPTION_TYPE_MAX];</div><div class='add'>+	u64 ru_loc[ATH12K_COUNTER_TYPE_MAX][HAL_RX_RU_ALLOC_TYPE_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_stats {</div><div class='add'>+	struct ath12k_htt_data_stats stats[ATH12K_STATS_TYPE_MAX];</div><div class='add'>+	u64 tx_duration;</div><div class='add'>+	u64 ba_fails;</div><div class='add'>+	u64 ack_fails;</div><div class='add'>+	u16 ru_start;</div><div class='add'>+	u16 ru_tones;</div><div class='add'>+	u32 mu_group[MAX_MU_GROUP_ID];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_per_ppdu_tx_stats {</div><div class='add'>+	u16 succ_pkts;</div><div class='add'>+	u16 failed_pkts;</div><div class='add'>+	u16 retry_pkts;</div><div class='add'>+	u32 succ_bytes;</div><div class='add'>+	u32 failed_bytes;</div><div class='add'>+	u32 retry_bytes;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wbm_tx_stats {</div><div class='add'>+	u64 wbm_tx_comp_stats[HAL_WBM_REL_HTT_TX_COMP_STATUS_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DECLARE_EWMA(avg_rssi, 10, 8)</div><div class='add'>+</div><div class='add'>+struct ath12k_link_sta {</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k_sta *ahsta;</div><div class='add'>+</div><div class='add'>+	/* link address similar to ieee80211_link_sta */</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+	/* the following are protected by ar-&gt;data_lock */</div><div class='add'>+	u32 changed; /* IEEE80211_RC_* */</div><div class='add'>+	u32 bw;</div><div class='add'>+	u32 nss;</div><div class='add'>+	u32 smps;</div><div class='add'>+</div><div class='add'>+	struct wiphy_work update_wk;</div><div class='add'>+	struct rate_info txrate;</div><div class='add'>+	struct rate_info last_txrate;</div><div class='add'>+	u64 rx_duration;</div><div class='add'>+	u64 tx_duration;</div><div class='add'>+	u8 rssi_comb;</div><div class='add'>+	struct ewma_avg_rssi avg_rssi;</div><div class='add'>+	u8 link_id;</div><div class='add'>+	struct ath12k_rx_peer_stats *rx_stats;</div><div class='add'>+	struct ath12k_wbm_tx_stats *wbm_tx_stats;</div><div class='add'>+	u32 bw_prev;</div><div class='add'>+	u32 peer_nss;</div><div class='add'>+	s8 rssi_beacon;</div><div class='add'>+	s8 chain_signal[IEEE80211_MAX_CHAINS];</div><div class='add'>+</div><div class='add'>+	/* For now the assoc link will be considered primary */</div><div class='add'>+	bool is_assoc_link;</div><div class='add'>+</div><div class='add'>+	 /* for firmware use only */</div><div class='add'>+	u8 link_idx;</div><div class='add'>+	u32 tx_retry_failed;</div><div class='add'>+	u32 tx_retry_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_reoq_buf {</div><div class='add'>+	void *vaddr;</div><div class='add'>+	dma_addr_t paddr_aligned;</div><div class='add'>+	u32 size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_sta {</div><div class='add'>+	struct ath12k_vif *ahvif;</div><div class='add'>+	enum hal_pn_type pn_type;</div><div class='add'>+	struct ath12k_link_sta deflink;</div><div class='add'>+	struct ath12k_link_sta __rcu *link[IEEE80211_MLD_MAX_NUM_LINKS];</div><div class='add'>+	/* indicates bitmap of link sta created in FW */</div><div class='add'>+	u16 links_map;</div><div class='add'>+	u8 assoc_link_id;</div><div class='add'>+	u16 ml_peer_id;</div><div class='add'>+	u8 num_peer;</div><div class='add'>+</div><div class='add'>+	enum ieee80211_sta_state state;</div><div class='add'>+</div><div class='add'>+	struct ath12k_reoq_buf reoq_bufs[IEEE80211_NUM_TIDS + 1];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_HALF_20MHZ_BW	10</div><div class='add'>+#define ATH12K_2GHZ_MIN_CENTER	2412</div><div class='add'>+#define ATH12K_2GHZ_MAX_CENTER	2484</div><div class='add'>+#define ATH12K_5GHZ_MIN_CENTER	4900</div><div class='add'>+#define ATH12K_5GHZ_MAX_CENTER	5920</div><div class='add'>+#define ATH12K_6GHZ_MIN_CENTER	5935</div><div class='add'>+#define ATH12K_6GHZ_MAX_CENTER	7115</div><div class='add'>+#define ATH12K_MIN_2GHZ_FREQ	(ATH12K_2GHZ_MIN_CENTER - ATH12K_HALF_20MHZ_BW - 1)</div><div class='add'>+#define ATH12K_MAX_2GHZ_FREQ	(ATH12K_2GHZ_MAX_CENTER + ATH12K_HALF_20MHZ_BW + 1)</div><div class='add'>+#define ATH12K_MIN_5GHZ_FREQ	(ATH12K_5GHZ_MIN_CENTER - ATH12K_HALF_20MHZ_BW)</div><div class='add'>+#define ATH12K_MAX_5GHZ_FREQ	(ATH12K_5GHZ_MAX_CENTER + ATH12K_HALF_20MHZ_BW)</div><div class='add'>+#define ATH12K_MIN_6GHZ_FREQ	(ATH12K_6GHZ_MIN_CENTER - ATH12K_HALF_20MHZ_BW)</div><div class='add'>+#define ATH12K_MAX_6GHZ_FREQ	(ATH12K_6GHZ_MAX_CENTER + ATH12K_HALF_20MHZ_BW)</div><div class='add'>+#define ATH12K_NUM_CHANS 101</div><div class='add'>+#define ATH12K_MAX_5GHZ_CHAN 173</div><div class='add'>+</div><div class='add'>+static inline bool ath12k_is_2ghz_channel_freq(u32 freq)</div><div class='add'>+{</div><div class='add'>+	return freq &gt;= ATH12K_MIN_2GHZ_FREQ &amp;&amp;</div><div class='add'>+	       freq &lt;= ATH12K_MAX_2GHZ_FREQ;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum ath12k_hw_state {</div><div class='add'>+	ATH12K_HW_STATE_OFF,</div><div class='add'>+	ATH12K_HW_STATE_ON,</div><div class='add'>+	ATH12K_HW_STATE_RESTARTING,</div><div class='add'>+	ATH12K_HW_STATE_RESTARTED,</div><div class='add'>+	ATH12K_HW_STATE_WEDGED,</div><div class='add'>+	ATH12K_HW_STATE_TM,</div><div class='add'>+	/* Add other states as required */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Antenna noise floor */</div><div class='add'>+#define ATH12K_DEFAULT_NOISE_FLOOR -95</div><div class='add'>+</div><div class='add'>+struct ath12k_ftm_event_obj {</div><div class='add'>+	u32 data_pos;</div><div class='add'>+	u32 expected_seq;</div><div class='add'>+	u8 *eventdata;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_fw_stats {</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+	u32 stats_id;</div><div class='add'>+	struct list_head pdevs;</div><div class='add'>+	struct list_head vdevs;</div><div class='add'>+	struct list_head bcn;</div><div class='add'>+	u32 num_vdev_recvd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_dbg_htt_stats {</div><div class='add'>+	enum ath12k_dbg_htt_ext_stats_type type;</div><div class='add'>+	u32 cfg_param[4];</div><div class='add'>+	u8 reset;</div><div class='add'>+	struct debug_htt_stats_req *stats_req;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_debug {</div><div class='add'>+	struct dentry *debugfs_pdev;</div><div class='add'>+	struct dentry *debugfs_pdev_symlink;</div><div class='add'>+	struct ath12k_dbg_htt_stats htt_stats;</div><div class='add'>+	enum wmi_halphy_ctrl_path_stats_id tpc_stats_type;</div><div class='add'>+	bool tpc_request;</div><div class='add'>+	struct completion tpc_complete;</div><div class='add'>+	struct wmi_tpc_stats_arg *tpc_stats;</div><div class='add'>+	u32 rx_filter;</div><div class='add'>+	bool extd_rx_stats;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_per_peer_tx_stats {</div><div class='add'>+	u32 succ_bytes;</div><div class='add'>+	u32 retry_bytes;</div><div class='add'>+	u32 failed_bytes;</div><div class='add'>+	u32 duration;</div><div class='add'>+	u16 succ_pkts;</div><div class='add'>+	u16 retry_pkts;</div><div class='add'>+	u16 failed_pkts;</div><div class='add'>+	u16 ru_start;</div><div class='add'>+	u16 ru_tones;</div><div class='add'>+	u8 ba_fails;</div><div class='add'>+	u8 ppdu_type;</div><div class='add'>+	u32 mu_grpid;</div><div class='add'>+	u32 mu_pos;</div><div class='add'>+	bool is_ampdu;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_pdev_rssi_offsets {</div><div class='add'>+	s32 temp_offset;</div><div class='add'>+	s8 min_nf_dbm;</div><div class='add'>+	/* Cache the sum here to avoid calculating it every time in hot path</div><div class='add'>+	 * noise_floor = min_nf_dbm + temp_offset</div><div class='add'>+	 */</div><div class='add'>+	s32 noise_floor;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_FLUSH_TIMEOUT (5 * HZ)</div><div class='add'>+#define ATH12K_VDEV_DELETE_TIMEOUT_HZ (5 * HZ)</div><div class='add'>+</div><div class='add'>+struct ath12k {</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	struct ath12k_pdev *pdev;</div><div class='add'>+	struct ath12k_hw *ah;</div><div class='add'>+	struct ath12k_wmi_pdev *wmi;</div><div class='add'>+	struct ath12k_pdev_dp dp;</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='add'>+	u32 ht_cap_info;</div><div class='add'>+	u32 vht_cap_info;</div><div class='add'>+	struct ath12k_he ar_he;</div><div class='add'>+	bool supports_6ghz;</div><div class='add'>+	struct {</div><div class='add'>+		struct completion started;</div><div class='add'>+		struct completion completed;</div><div class='add'>+		struct completion on_channel;</div><div class='add'>+		struct delayed_work timeout;</div><div class='add'>+		enum ath12k_scan_state state;</div><div class='add'>+		bool is_roc;</div><div class='add'>+		int roc_freq;</div><div class='add'>+		bool roc_notify;</div><div class='add'>+		struct wiphy_work vdev_clean_wk;</div><div class='add'>+		struct ath12k_link_vif *arvif;</div><div class='add'>+	} scan;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		struct ieee80211_supported_band sbands[NUM_NL80211_BANDS];</div><div class='add'>+		struct ieee80211_sband_iftype_data</div><div class='add'>+			iftype[NUM_NL80211_BANDS][NUM_NL80211_IFTYPES];</div><div class='add'>+	} mac;</div><div class='add'>+</div><div class='add'>+	unsigned long dev_flags;</div><div class='add'>+	unsigned int filter_flags;</div><div class='add'>+	u32 min_tx_power;</div><div class='add'>+	u32 max_tx_power;</div><div class='add'>+	u32 txpower_limit_2g;</div><div class='add'>+	u32 txpower_limit_5g;</div><div class='add'>+	u32 txpower_scale;</div><div class='add'>+	u32 power_scale;</div><div class='add'>+	u32 chan_tx_pwr;</div><div class='add'>+	u32 rts_threshold;</div><div class='add'>+	u32 num_stations;</div><div class='add'>+	u32 max_num_stations;</div><div class='add'>+</div><div class='add'>+	/* protects the radio specific data like debug stats, ppdu_stats_info stats,</div><div class='add'>+	 * vdev_stop_status info, scan data, ath12k_sta info, ath12k_link_vif info,</div><div class='add'>+	 * channel context data, survey info, test mode data, regd_channel_update_queue.</div><div class='add'>+	 */</div><div class='add'>+	spinlock_t data_lock;</div><div class='add'>+</div><div class='add'>+	struct list_head arvifs;</div><div class='add'>+	/* should never be NULL; needed for regular htt rx */</div><div class='add'>+	struct ieee80211_channel *rx_channel;</div><div class='add'>+</div><div class='add'>+	/* valid during scan; needed for mgmt rx during scan */</div><div class='add'>+	struct ieee80211_channel *scan_channel;</div><div class='add'>+</div><div class='add'>+	u8 cfg_tx_chainmask;</div><div class='add'>+	u8 cfg_rx_chainmask;</div><div class='add'>+	u8 num_rx_chains;</div><div class='add'>+	u8 num_tx_chains;</div><div class='add'>+	/* pdev_idx starts from 0 whereas pdev-&gt;pdev_id starts with 1 */</div><div class='add'>+	u8 pdev_idx;</div><div class='add'>+	u8 lmac_id;</div><div class='add'>+	u8 hw_link_id;</div><div class='add'>+</div><div class='add'>+	struct completion peer_assoc_done;</div><div class='add'>+	struct completion peer_delete_done;</div><div class='add'>+</div><div class='add'>+	int install_key_status;</div><div class='add'>+	struct completion install_key_done;</div><div class='add'>+</div><div class='add'>+	int last_wmi_vdev_start_status;</div><div class='add'>+	struct completion vdev_setup_done;</div><div class='add'>+	struct completion vdev_delete_done;</div><div class='add'>+</div><div class='add'>+	int num_peers;</div><div class='add'>+	int max_num_peers;</div><div class='add'>+	u32 num_started_vdevs;</div><div class='add'>+	u32 num_created_vdevs;</div><div class='add'>+	unsigned long long allocated_vdev_map;</div><div class='add'>+</div><div class='add'>+	struct idr txmgmt_idr;</div><div class='add'>+	/* protects txmgmt_idr data */</div><div class='add'>+	spinlock_t txmgmt_idr_lock;</div><div class='add'>+	atomic_t num_pending_mgmt_tx;</div><div class='add'>+	wait_queue_head_t txmgmt_empty_waitq;</div><div class='add'>+</div><div class='add'>+	/* cycle count is reported twice for each visited channel during scan.</div><div class='add'>+	 * access protected by data_lock</div><div class='add'>+	 */</div><div class='add'>+	u32 survey_last_rx_clear_count;</div><div class='add'>+	u32 survey_last_cycle_count;</div><div class='add'>+</div><div class='add'>+	/* Channel info events are expected to come in pairs without and with</div><div class='add'>+	 * COMPLETE flag set respectively for each channel visit during scan.</div><div class='add'>+	 *</div><div class='add'>+	 * However there are deviations from this rule. This flag is used to</div><div class='add'>+	 * avoid reporting garbage data.</div><div class='add'>+	 */</div><div class='add'>+	bool ch_info_can_report_survey;</div><div class='add'>+	struct survey_info survey[ATH12K_NUM_CHANS];</div><div class='add'>+	struct completion bss_survey_done;</div><div class='add'>+</div><div class='add'>+	struct work_struct regd_update_work;</div><div class='add'>+	struct work_struct regd_channel_update_work;</div><div class='add'>+	struct list_head regd_channel_update_queue;</div><div class='add'>+</div><div class='add'>+	struct wiphy_work wmi_mgmt_tx_work;</div><div class='add'>+	struct sk_buff_head wmi_mgmt_tx_queue;</div><div class='add'>+</div><div class='add'>+	struct ath12k_wow wow;</div><div class='add'>+	struct completion target_suspend;</div><div class='add'>+	bool target_suspend_ack;</div><div class='add'>+	struct ath12k_per_peer_tx_stats peer_tx_stats;</div><div class='add'>+	struct list_head ppdu_stats_info;</div><div class='add'>+	u32 ppdu_stat_list_depth;</div><div class='add'>+</div><div class='add'>+	struct ath12k_per_peer_tx_stats cached_stats;</div><div class='add'>+	u32 last_ppdu_id;</div><div class='add'>+	u32 cached_ppdu_id;</div><div class='add'>+#ifdef CONFIG_ATH12K_DEBUGFS</div><div class='add'>+	struct ath12k_debug debug;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	bool dfs_block_radar_events;</div><div class='add'>+	bool monitor_vdev_created;</div><div class='add'>+	bool monitor_started;</div><div class='add'>+	int monitor_vdev_id;</div><div class='add'>+</div><div class='add'>+	struct wiphy_radio_freq_range freq_range;</div><div class='add'>+</div><div class='add'>+	bool nlo_enabled;</div><div class='add'>+</div><div class='add'>+	/* Protected by wiphy::mtx lock. */</div><div class='add'>+	u32 vdev_id_11d_scan;</div><div class='add'>+	struct completion completed_11d_scan;</div><div class='add'>+	enum ath12k_11d_state state_11d;</div><div class='add'>+	u8 alpha2[REG_ALPHA2_LEN];</div><div class='add'>+	bool regdom_set_by_user;</div><div class='add'>+	struct completion regd_update_completed;</div><div class='add'>+</div><div class='add'>+	struct completion fw_stats_complete;</div><div class='add'>+	struct completion fw_stats_done;</div><div class='add'>+</div><div class='add'>+	struct completion mlo_setup_done;</div><div class='add'>+	u32 mlo_setup_status;</div><div class='add'>+	u8 ftm_msgref;</div><div class='add'>+	struct ath12k_fw_stats fw_stats;</div><div class='add'>+	unsigned long last_tx_power_update;</div><div class='add'>+</div><div class='add'>+	s8 max_allowed_tx_power;</div><div class='add'>+	struct ath12k_pdev_rssi_offsets rssi_info;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_hw {</div><div class='add'>+	struct ieee80211_hw *hw;</div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='add'>+	/* Protect the write operation of the hardware state ath12k_hw::state</div><div class='add'>+	 * between hardware start&lt;=&gt;reconfigure&lt;=&gt;stop transitions.</div><div class='add'>+	 */</div><div class='add'>+	struct mutex hw_mutex;</div><div class='add'>+	enum ath12k_hw_state state;</div><div class='add'>+	bool regd_updated;</div><div class='add'>+	bool use_6ghz_regd;</div><div class='add'>+</div><div class='add'>+	u8 num_radio;</div><div class='add'>+</div><div class='add'>+	DECLARE_BITMAP(free_ml_peer_id_map, ATH12K_MAX_MLO_PEERS);</div><div class='add'>+</div><div class='add'>+	/* protected by wiphy_lock() */</div><div class='add'>+	struct list_head ml_peers;</div><div class='add'>+</div><div class='add'>+	/* Keep last */</div><div class='add'>+	struct ath12k radio[] __aligned(sizeof(void *));</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_band_cap {</div><div class='add'>+	u32 phy_id;</div><div class='add'>+	u32 max_bw_supported;</div><div class='add'>+	u32 ht_cap_info;</div><div class='add'>+	u32 he_cap_info[2];</div><div class='add'>+	u32 he_mcs;</div><div class='add'>+	u32 he_cap_phy_info[PSOC_HOST_MAX_PHY_SIZE];</div><div class='add'>+	struct ath12k_wmi_ppe_threshold_arg he_ppet;</div><div class='add'>+	u16 he_6ghz_capa;</div><div class='add'>+	u32 eht_cap_mac_info[WMI_MAX_EHTCAP_MAC_SIZE];</div><div class='add'>+	u32 eht_cap_phy_info[WMI_MAX_EHTCAP_PHY_SIZE];</div><div class='add'>+	u32 eht_mcs_20_only;</div><div class='add'>+	u32 eht_mcs_80;</div><div class='add'>+	u32 eht_mcs_160;</div><div class='add'>+	u32 eht_mcs_320;</div><div class='add'>+	struct ath12k_wmi_ppe_threshold_arg eht_ppet;</div><div class='add'>+	u32 eht_cap_info_internal;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_pdev_cap {</div><div class='add'>+	u32 supported_bands;</div><div class='add'>+	u32 ampdu_density;</div><div class='add'>+	u32 vht_cap;</div><div class='add'>+	u32 vht_mcs;</div><div class='add'>+	u32 he_mcs;</div><div class='add'>+	u32 tx_chain_mask;</div><div class='add'>+	u32 rx_chain_mask;</div><div class='add'>+	u32 tx_chain_mask_shift;</div><div class='add'>+	u32 rx_chain_mask_shift;</div><div class='add'>+	struct ath12k_band_cap band[NUM_NL80211_BANDS];</div><div class='add'>+	u32 eml_cap;</div><div class='add'>+	u32 mld_cap;</div><div class='add'>+	bool nss_ratio_enabled;</div><div class='add'>+	u8 nss_ratio_info;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlo_timestamp {</div><div class='add'>+	u32 info;</div><div class='add'>+	u32 sync_timestamp_lo_us;</div><div class='add'>+	u32 sync_timestamp_hi_us;</div><div class='add'>+	u32 mlo_offset_lo;</div><div class='add'>+	u32 mlo_offset_hi;</div><div class='add'>+	u32 mlo_offset_clks;</div><div class='add'>+	u32 mlo_comp_clks;</div><div class='add'>+	u32 mlo_comp_timer;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_pdev {</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+	u32 hw_link_id;</div><div class='add'>+	struct ath12k_pdev_cap cap;</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='add'>+	struct mlo_timestamp timestamp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_fw_pdev {</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+	u32 phy_id;</div><div class='add'>+	u32 supported_bands;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_board_data {</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	const void *data;</div><div class='add'>+	size_t len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_device_dp_tx_err_stats {</div><div class='add'>+	/* TCL Ring Descriptor unavailable */</div><div class='add'>+	u32 desc_na[DP_TCL_NUM_RING_MAX];</div><div class='add'>+	/* Other failures during dp_tx due to mem allocation failure</div><div class='add'>+	 * idr unavailable etc.</div><div class='add'>+	 */</div><div class='add'>+	atomic_t misc_fail;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_device_dp_stats {</div><div class='add'>+	u32 err_ring_pkts;</div><div class='add'>+	u32 invalid_rbm;</div><div class='add'>+	u32 rxdma_error[HAL_REO_ENTR_RING_RXDMA_ECODE_MAX];</div><div class='add'>+	u32 reo_error[HAL_REO_DEST_RING_ERROR_CODE_MAX];</div><div class='add'>+	u32 hal_reo_error[DP_REO_DST_RING_MAX];</div><div class='add'>+	struct ath12k_device_dp_tx_err_stats tx_err;</div><div class='add'>+	u32 reo_rx[DP_REO_DST_RING_MAX][ATH12K_MAX_DEVICES];</div><div class='add'>+	u32 rx_wbm_rel_source[HAL_WBM_REL_SRC_MODULE_MAX][ATH12K_MAX_DEVICES];</div><div class='add'>+	u32 tqm_rel_reason[MAX_TQM_RELEASE_REASON];</div><div class='add'>+	u32 fw_tx_status[MAX_FW_TX_STATUS];</div><div class='add'>+	u32 tx_wbm_rel_source[HAL_WBM_REL_SRC_MODULE_MAX];</div><div class='add'>+	u32 tx_enqueued[DP_TCL_NUM_RING_MAX];</div><div class='add'>+	u32 tx_completed[DP_TCL_NUM_RING_MAX];</div><div class='add'>+	u32 reo_excep_msdu_buf_type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_reg_freq {</div><div class='add'>+	u32 start_freq;</div><div class='add'>+	u32 end_freq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_mlo_memory {</div><div class='add'>+	struct target_mem_chunk chunk[ATH12K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01];</div><div class='add'>+	int mlo_mem_size;</div><div class='add'>+	bool init_done;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_hw_link {</div><div class='add'>+	u8 device_id;</div><div class='add'>+	u8 pdev_idx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Holds info on the group of devices that are registered as a single</div><div class='add'>+ * wiphy, protected with struct ath12k_hw_group::mutex.</div><div class='add'>+ */</div><div class='add'>+struct ath12k_hw_group {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	u8 id;</div><div class='add'>+	u8 num_devices;</div><div class='add'>+	u8 num_probed;</div><div class='add'>+	u8 num_started;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct ath12k_base *ab[ATH12K_MAX_DEVICES];</div><div class='add'>+</div><div class='add'>+	/* protects access to this struct */</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+</div><div class='add'>+	/* Holds information of wiphy (hw) registration.</div><div class='add'>+	 *</div><div class='add'>+	 * In Multi/Single Link Operation case, all pdevs are registered as</div><div class='add'>+	 * a single wiphy. In other (legacy/Non-MLO) cases, each pdev is</div><div class='add'>+	 * registered as separate wiphys.</div><div class='add'>+	 */</div><div class='add'>+	struct ath12k_hw *ah[ATH12K_GROUP_MAX_RADIO];</div><div class='add'>+	u8 num_hw;</div><div class='add'>+	bool mlo_capable;</div><div class='add'>+	struct device_node *wsi_node[ATH12K_MAX_DEVICES];</div><div class='add'>+	struct ath12k_mlo_memory mlo_mem;</div><div class='add'>+	struct ath12k_hw_link hw_links[ATH12K_GROUP_MAX_RADIO];</div><div class='add'>+	bool hw_link_id_init_done;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Holds WSI info specific to each device, excluding WSI group info */</div><div class='add'>+struct ath12k_wsi_info {</div><div class='add'>+	u32 index;</div><div class='add'>+	u32 hw_link_id_base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_dp_profile_params {</div><div class='add'>+	u32 tx_comp_ring_size;</div><div class='add'>+	u32 rxdma_monitor_buf_ring_size;</div><div class='add'>+	u32 rxdma_monitor_dst_ring_size;</div><div class='add'>+	u32 num_pool_tx_desc;</div><div class='add'>+	u32 rx_desc_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_mem_profile_based_param {</div><div class='add'>+	u32 num_vdevs;</div><div class='add'>+	u32 max_client_single;</div><div class='add'>+	u32 max_client_dbs;</div><div class='add'>+	u32 max_client_dbs_sbs;</div><div class='add'>+	struct ath12k_dp_profile_params dp_params;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Master structure to hold the hw data which may be used in core module */</div><div class='add'>+struct ath12k_base {</div><div class='add'>+	enum ath12k_hw_rev hw_rev;</div><div class='add'>+	struct platform_device *pdev;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct ath12k_qmi qmi;</div><div class='add'>+	struct ath12k_wmi_base wmi_ab;</div><div class='add'>+	struct completion fw_ready;</div><div class='add'>+	u8 device_id;</div><div class='add'>+	int num_radios;</div><div class='add'>+	/* HW channel counters frequency value in hertz common to all MACs */</div><div class='add'>+	u32 cc_freq_hz;</div><div class='add'>+</div><div class='add'>+	struct ath12k_dump_file_data *dump_data;</div><div class='add'>+	size_t ath12k_coredump_len;</div><div class='add'>+	struct work_struct dump_work;</div><div class='add'>+</div><div class='add'>+	struct ath12k_htc htc;</div><div class='add'>+</div><div class='add'>+	struct ath12k_dp dp;</div><div class='add'>+</div><div class='add'>+	void __iomem *mem;</div><div class='add'>+	unsigned long mem_len;</div><div class='add'>+</div><div class='add'>+	void __iomem *mem_ce;</div><div class='add'>+	u32 ce_remap_base_addr;</div><div class='add'>+	bool ce_remap;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		enum ath12k_bus bus;</div><div class='add'>+		const struct ath12k_hif_ops *ops;</div><div class='add'>+	} hif;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		struct completion wakeup_completed;</div><div class='add'>+		u32 wmi_conf_rx_decap_mode;</div><div class='add'>+	} wow;</div><div class='add'>+</div><div class='add'>+	struct ath12k_ce ce;</div><div class='add'>+	struct timer_list rx_replenish_retry;</div><div class='add'>+	struct ath12k_hal hal;</div><div class='add'>+	/* To synchronize core_start/core_stop */</div><div class='add'>+	struct mutex core_lock;</div><div class='add'>+	/* Protects data like peers */</div><div class='add'>+	spinlock_t base_lock;</div><div class='add'>+</div><div class='add'>+	/* Single pdev device (struct ath12k_hw_params::single_pdev_only):</div><div class='add'>+	 *</div><div class='add'>+	 * Firmware maintains data for all bands but advertises a single</div><div class='add'>+	 * phy to the host which is stored as a single element in this</div><div class='add'>+	 * array.</div><div class='add'>+	 *</div><div class='add'>+	 * Other devices:</div><div class='add'>+	 *</div><div class='add'>+	 * This array will contain as many elements as the number of</div><div class='add'>+	 * radios.</div><div class='add'>+	 */</div><div class='add'>+	struct ath12k_pdev pdevs[MAX_RADIOS];</div><div class='add'>+</div><div class='add'>+	/* struct ath12k_hw_params::single_pdev_only devices use this to</div><div class='add'>+	 * store phy specific data</div><div class='add'>+	 */</div><div class='add'>+	struct ath12k_fw_pdev fw_pdev[MAX_RADIOS];</div><div class='add'>+	u8 fw_pdev_count;</div><div class='add'>+</div><div class='add'>+	struct ath12k_pdev __rcu *pdevs_active[MAX_RADIOS];</div><div class='add'>+</div><div class='add'>+	struct ath12k_wmi_hal_reg_capabilities_ext_arg hal_reg_cap[MAX_RADIOS];</div><div class='add'>+	unsigned long long free_vdev_map;</div><div class='add'>+	unsigned long long free_vdev_stats_id_map;</div><div class='add'>+	struct list_head peers;</div><div class='add'>+	wait_queue_head_t peer_mapping_wq;</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='add'>+	bool wmi_ready;</div><div class='add'>+	u32 wlan_init_status;</div><div class='add'>+	int irq_num[ATH12K_IRQ_NUM_MAX];</div><div class='add'>+	struct ath12k_ext_irq_grp ext_irq_grp[ATH12K_EXT_IRQ_GRP_NUM_MAX];</div><div class='add'>+	struct napi_struct *napi;</div><div class='add'>+	struct ath12k_wmi_target_cap_arg target_caps;</div><div class='add'>+	u32 ext_service_bitmap[WMI_SERVICE_EXT_BM_SIZE];</div><div class='add'>+	bool pdevs_macaddr_valid;</div><div class='add'>+</div><div class='add'>+	const struct ath12k_hw_params *hw_params;</div><div class='add'>+</div><div class='add'>+	const struct firmware *cal_file;</div><div class='add'>+</div><div class='add'>+	/* Below regd's are protected by ab-&gt;data_lock */</div><div class='add'>+	/* This is the regd set for every radio</div><div class='add'>+	 * by the firmware during initialization</div><div class='add'>+	 */</div><div class='add'>+	struct ieee80211_regdomain *default_regd[MAX_RADIOS];</div><div class='add'>+	/* This regd is set during dynamic country setting</div><div class='add'>+	 * This may or may not be used during the runtime</div><div class='add'>+	 */</div><div class='add'>+	struct ieee80211_regdomain *new_regd[MAX_RADIOS];</div><div class='add'>+</div><div class='add'>+	struct ath12k_reg_info *reg_info[MAX_RADIOS];</div><div class='add'>+</div><div class='add'>+	/* Current DFS Regulatory */</div><div class='add'>+	enum ath12k_dfs_region dfs_region;</div><div class='add'>+	struct ath12k_device_dp_stats device_stats;</div><div class='add'>+#ifdef CONFIG_ATH12K_DEBUGFS</div><div class='add'>+	struct dentry *debugfs_soc;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	unsigned long dev_flags;</div><div class='add'>+	struct completion driver_recovery;</div><div class='add'>+	struct workqueue_struct *workqueue;</div><div class='add'>+	struct work_struct restart_work;</div><div class='add'>+	struct workqueue_struct *workqueue_aux;</div><div class='add'>+	struct work_struct reset_work;</div><div class='add'>+	atomic_t reset_count;</div><div class='add'>+	atomic_t recovery_count;</div><div class='add'>+	bool is_reset;</div><div class='add'>+	struct completion reset_complete;</div><div class='add'>+	/* continuous recovery fail count */</div><div class='add'>+	atomic_t fail_cont_count;</div><div class='add'>+	unsigned long reset_fail_timeout;</div><div class='add'>+	struct work_struct update_11d_work;</div><div class='add'>+	u8 new_alpha2[2];</div><div class='add'>+	struct {</div><div class='add'>+		/* protected by data_lock */</div><div class='add'>+		u32 fw_crash_counter;</div><div class='add'>+	} stats;</div><div class='add'>+	u32 pktlog_defs_checksum;</div><div class='add'>+</div><div class='add'>+	struct ath12k_dbring_cap *db_caps;</div><div class='add'>+	u32 num_db_cap;</div><div class='add'>+</div><div class='add'>+	struct completion htc_suspend;</div><div class='add'>+</div><div class='add'>+	u64 fw_soc_drop_count;</div><div class='add'>+	bool static_window_map;</div><div class='add'>+</div><div class='add'>+	struct work_struct rfkill_work;</div><div class='add'>+	/* true means radio is on */</div><div class='add'>+	bool rfkill_radio_on;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		enum ath12k_bdf_search bdf_search;</div><div class='add'>+		u32 vendor;</div><div class='add'>+		u32 device;</div><div class='add'>+		u32 subsystem_vendor;</div><div class='add'>+		u32 subsystem_device;</div><div class='add'>+	} id;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u32 api_version;</div><div class='add'>+</div><div class='add'>+		const struct firmware *fw;</div><div class='add'>+		const u8 *amss_data;</div><div class='add'>+		size_t amss_len;</div><div class='add'>+		const u8 *amss_dualmac_data;</div><div class='add'>+		size_t amss_dualmac_len;</div><div class='add'>+		const u8 *m3_data;</div><div class='add'>+		size_t m3_len;</div><div class='add'>+</div><div class='add'>+		DECLARE_BITMAP(fw_features, ATH12K_FW_FEATURE_COUNT);</div><div class='add'>+		bool fw_features_valid;</div><div class='add'>+	} fw;</div><div class='add'>+</div><div class='add'>+	const struct hal_rx_ops *hal_rx_ops;</div><div class='add'>+</div><div class='add'>+	struct completion restart_completed;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ACPI</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		bool started;</div><div class='add'>+		u32 func_bit;</div><div class='add'>+		bool acpi_tas_enable;</div><div class='add'>+		bool acpi_bios_sar_enable;</div><div class='add'>+		bool acpi_disable_11be;</div><div class='add'>+		bool acpi_disable_rfkill;</div><div class='add'>+		bool acpi_cca_enable;</div><div class='add'>+		bool acpi_band_edge_enable;</div><div class='add'>+		bool acpi_enable_bdf;</div><div class='add'>+		u32 bit_flag;</div><div class='add'>+		char bdf_string[ATH12K_ACPI_BDF_MAX_LEN];</div><div class='add'>+		u8 tas_cfg[ATH12K_ACPI_DSM_TAS_CFG_SIZE];</div><div class='add'>+		u8 tas_sar_power_table[ATH12K_ACPI_DSM_TAS_DATA_SIZE];</div><div class='add'>+		u8 bios_sar_data[ATH12K_ACPI_DSM_BIOS_SAR_DATA_SIZE];</div><div class='add'>+		u8 geo_offset_data[ATH12K_ACPI_DSM_GEO_OFFSET_DATA_SIZE];</div><div class='add'>+		u8 cca_data[ATH12K_ACPI_DSM_CCA_DATA_SIZE];</div><div class='add'>+		u8 band_edge_power[ATH12K_ACPI_DSM_BAND_EDGE_DATA_SIZE];</div><div class='add'>+	} acpi;</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_ACPI */</div><div class='add'>+</div><div class='add'>+	struct notifier_block panic_nb;</div><div class='add'>+</div><div class='add'>+	struct ath12k_hw_group *ag;</div><div class='add'>+	struct ath12k_wsi_info wsi_info;</div><div class='add'>+	enum ath12k_firmware_mode fw_mode;</div><div class='add'>+	struct ath12k_ftm_event_obj ftm_event_obj;</div><div class='add'>+	bool hw_group_ref;</div><div class='add'>+</div><div class='add'>+	/* Denote whether MLO is possible within the device */</div><div class='add'>+	bool single_chip_mlo_support;</div><div class='add'>+</div><div class='add'>+	struct ath12k_reg_freq reg_freq_2ghz;</div><div class='add'>+	struct ath12k_reg_freq reg_freq_5ghz;</div><div class='add'>+	struct ath12k_reg_freq reg_freq_6ghz;</div><div class='add'>+	const struct ath12k_mem_profile_based_param *profile_param;</div><div class='add'>+	enum ath12k_qmi_mem_mode target_mem_mode;</div><div class='add'>+</div><div class='add'>+	/* must be last */</div><div class='add'>+	u8 drv_priv[] __aligned(sizeof(void *));</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_pdev_map {</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	u8 pdev_idx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_fw_stats_vdev {</div><div class='add'>+	struct list_head list;</div><div class='add'>+</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 beacon_snr;</div><div class='add'>+	u32 data_snr;</div><div class='add'>+	u32 num_tx_frames[WLAN_MAX_AC];</div><div class='add'>+	u32 num_rx_frames;</div><div class='add'>+	u32 num_tx_frames_retries[WLAN_MAX_AC];</div><div class='add'>+	u32 num_tx_frames_failures[WLAN_MAX_AC];</div><div class='add'>+	u32 num_rts_fail;</div><div class='add'>+	u32 num_rts_success;</div><div class='add'>+	u32 num_rx_err;</div><div class='add'>+	u32 num_rx_discard;</div><div class='add'>+	u32 num_tx_not_acked;</div><div class='add'>+	u32 tx_rate_history[MAX_TX_RATE_VALUES];</div><div class='add'>+	u32 beacon_rssi_history[MAX_TX_RATE_VALUES];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_fw_stats_bcn {</div><div class='add'>+	struct list_head list;</div><div class='add'>+</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 tx_bcn_succ_cnt;</div><div class='add'>+	u32 tx_bcn_outage_cnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_fw_stats_pdev {</div><div class='add'>+	struct list_head list;</div><div class='add'>+</div><div class='add'>+	/* PDEV stats */</div><div class='add'>+	s32 ch_noise_floor;</div><div class='add'>+	u32 tx_frame_count;</div><div class='add'>+	u32 rx_frame_count;</div><div class='add'>+	u32 rx_clear_count;</div><div class='add'>+	u32 cycle_count;</div><div class='add'>+	u32 phy_err_count;</div><div class='add'>+	u32 chan_tx_power;</div><div class='add'>+	u32 ack_rx_bad;</div><div class='add'>+	u32 rts_bad;</div><div class='add'>+	u32 rts_good;</div><div class='add'>+	u32 fcs_bad;</div><div class='add'>+	u32 no_beacons;</div><div class='add'>+	u32 mib_int_count;</div><div class='add'>+</div><div class='add'>+	/* PDEV TX stats */</div><div class='add'>+	s32 comp_queued;</div><div class='add'>+	s32 comp_delivered;</div><div class='add'>+	s32 msdu_enqued;</div><div class='add'>+	s32 mpdu_enqued;</div><div class='add'>+	s32 wmm_drop;</div><div class='add'>+	s32 local_enqued;</div><div class='add'>+	s32 local_freed;</div><div class='add'>+	s32 hw_queued;</div><div class='add'>+	s32 hw_reaped;</div><div class='add'>+	s32 underrun;</div><div class='add'>+	s32 tx_abort;</div><div class='add'>+	s32 mpdus_requed;</div><div class='add'>+	u32 tx_ko;</div><div class='add'>+	u32 data_rc;</div><div class='add'>+	u32 self_triggers;</div><div class='add'>+	u32 sw_retry_failure;</div><div class='add'>+	u32 illgl_rate_phy_err;</div><div class='add'>+	u32 pdev_cont_xretry;</div><div class='add'>+	u32 pdev_tx_timeout;</div><div class='add'>+	u32 pdev_resets;</div><div class='add'>+	u32 stateless_tid_alloc_failure;</div><div class='add'>+	u32 phy_underrun;</div><div class='add'>+	u32 txop_ovf;</div><div class='add'>+</div><div class='add'>+	/* PDEV RX stats */</div><div class='add'>+	s32 mid_ppdu_route_change;</div><div class='add'>+	s32 status_rcvd;</div><div class='add'>+	s32 r0_frags;</div><div class='add'>+	s32 r1_frags;</div><div class='add'>+	s32 r2_frags;</div><div class='add'>+	s32 r3_frags;</div><div class='add'>+	s32 htt_msdus;</div><div class='add'>+	s32 htt_mpdus;</div><div class='add'>+	s32 loc_msdus;</div><div class='add'>+	s32 loc_mpdus;</div><div class='add'>+	s32 oversize_amsdu;</div><div class='add'>+	s32 phy_errs;</div><div class='add'>+	s32 phy_err_drop;</div><div class='add'>+	s32 mpdu_errs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ath12k_core_qmi_firmware_ready(struct ath12k_base *ab);</div><div class='add'>+void ath12k_core_hw_group_cleanup(struct ath12k_hw_group *ag);</div><div class='add'>+int ath12k_core_pre_init(struct ath12k_base *ab);</div><div class='add'>+int ath12k_core_init(struct ath12k_base *ath12k);</div><div class='add'>+void ath12k_core_deinit(struct ath12k_base *ath12k);</div><div class='add'>+struct ath12k_base *ath12k_core_alloc(struct device *dev, size_t priv_size,</div><div class='add'>+				      enum ath12k_bus bus);</div><div class='add'>+void ath12k_core_free(struct ath12k_base *ath12k);</div><div class='add'>+int ath12k_core_fetch_board_data_api_1(struct ath12k_base *ab,</div><div class='add'>+				       struct ath12k_board_data *bd,</div><div class='add'>+				       char *filename);</div><div class='add'>+int ath12k_core_fetch_bdf(struct ath12k_base *ath12k,</div><div class='add'>+			  struct ath12k_board_data *bd);</div><div class='add'>+void ath12k_core_free_bdf(struct ath12k_base *ab, struct ath12k_board_data *bd);</div><div class='add'>+int ath12k_core_fetch_regdb(struct ath12k_base *ab, struct ath12k_board_data *bd);</div><div class='add'>+int ath12k_core_check_dt(struct ath12k_base *ath12k);</div><div class='add'>+int ath12k_core_check_smbios(struct ath12k_base *ab);</div><div class='add'>+void ath12k_core_halt(struct ath12k *ar);</div><div class='add'>+int ath12k_core_resume_early(struct ath12k_base *ab);</div><div class='add'>+int ath12k_core_resume(struct ath12k_base *ab);</div><div class='add'>+int ath12k_core_suspend(struct ath12k_base *ab);</div><div class='add'>+int ath12k_core_suspend_late(struct ath12k_base *ab);</div><div class='add'>+void ath12k_core_hw_group_unassign(struct ath12k_base *ab);</div><div class='add'>+u8 ath12k_get_num_partner_link(struct ath12k *ar);</div><div class='add'>+</div><div class='add'>+const struct firmware *ath12k_core_firmware_request(struct ath12k_base *ab,</div><div class='add'>+						    const char *filename);</div><div class='add'>+u32 ath12k_core_get_max_station_per_radio(struct ath12k_base *ab);</div><div class='add'>+u32 ath12k_core_get_max_peers_per_radio(struct ath12k_base *ab);</div><div class='add'>+</div><div class='add'>+void ath12k_core_hw_group_set_mlo_capable(struct ath12k_hw_group *ag);</div><div class='add'>+void ath12k_fw_stats_init(struct ath12k *ar);</div><div class='add'>+void ath12k_fw_stats_bcn_free(struct list_head *head);</div><div class='add'>+void ath12k_fw_stats_free(struct ath12k_fw_stats *stats);</div><div class='add'>+void ath12k_fw_stats_reset(struct ath12k *ar);</div><div class='add'>+struct reserved_mem *ath12k_core_get_reserved_mem(struct ath12k_base *ab,</div><div class='add'>+						  int index);</div><div class='add'>+enum ath12k_qmi_mem_mode ath12k_core_get_memory_mode(struct ath12k_base *ab);</div><div class='add'>+</div><div class='add'>+static inline const char *ath12k_scan_state_str(enum ath12k_scan_state state)</div><div class='add'>+{</div><div class='add'>+	switch (state) {</div><div class='add'>+	case ATH12K_SCAN_IDLE:</div><div class='add'>+		return "idle";</div><div class='add'>+	case ATH12K_SCAN_STARTING:</div><div class='add'>+		return "starting";</div><div class='add'>+	case ATH12K_SCAN_RUNNING:</div><div class='add'>+		return "running";</div><div class='add'>+	case ATH12K_SCAN_ABORTING:</div><div class='add'>+		return "aborting";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "unknown";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct ath12k_skb_cb *ATH12K_SKB_CB(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct ath12k_skb_cb) &gt;</div><div class='add'>+		     IEEE80211_TX_INFO_DRIVER_DATA_SIZE);</div><div class='add'>+	return (struct ath12k_skb_cb *)&amp;IEEE80211_SKB_CB(skb)-&gt;driver_data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct ath12k_skb_rxcb *ATH12K_SKB_RXCB(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct ath12k_skb_rxcb) &gt; sizeof(skb-&gt;cb));</div><div class='add'>+	return (struct ath12k_skb_rxcb *)skb-&gt;cb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct ath12k_vif *ath12k_vif_to_ahvif(struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	return (struct ath12k_vif *)vif-&gt;drv_priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct ath12k_sta *ath12k_sta_to_ahsta(struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	return (struct ath12k_sta *)sta-&gt;drv_priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct ieee80211_sta *ath12k_ahsta_to_sta(struct ath12k_sta *ahsta)</div><div class='add'>+{</div><div class='add'>+	return container_of((void *)ahsta, struct ieee80211_sta, drv_priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct ieee80211_vif *ath12k_ahvif_to_vif(struct ath12k_vif *ahvif)</div><div class='add'>+{</div><div class='add'>+	return container_of((void *)ahvif, struct ieee80211_vif, drv_priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct ath12k *ath12k_ab_to_ar(struct ath12k_base *ab,</div><div class='add'>+					     int mac_id)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;pdevs[ath12k_hw_mac_id_to_pdev_id(ab-&gt;hw_params, mac_id)].ar;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_core_create_firmware_path(struct ath12k_base *ab,</div><div class='add'>+						    const char *filename,</div><div class='add'>+						    void *buf, size_t buf_len)</div><div class='add'>+{</div><div class='add'>+	const char *fw_name = NULL;</div><div class='add'>+</div><div class='add'>+	of_property_read_string(ab-&gt;dev-&gt;of_node, "firmware-name", &amp;fw_name);</div><div class='add'>+</div><div class='add'>+	if (fw_name &amp;&amp; strncmp(filename, "board", 5))</div><div class='add'>+		snprintf(buf, buf_len, "%s/%s/%s/%s", ATH12K_FW_DIR,</div><div class='add'>+			 ab-&gt;hw_params-&gt;fw.dir, fw_name, filename);</div><div class='add'>+	else</div><div class='add'>+		snprintf(buf, buf_len, "%s/%s/%s", ATH12K_FW_DIR,</div><div class='add'>+			 ab-&gt;hw_params-&gt;fw.dir, filename);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline const char *ath12k_bus_str(enum ath12k_bus bus)</div><div class='add'>+{</div><div class='add'>+	switch (bus) {</div><div class='add'>+	case ATH12K_BUS_PCI:</div><div class='add'>+		return "pci";</div><div class='add'>+	case ATH12K_BUS_AHB:</div><div class='add'>+		return "ahb";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "unknown";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct ath12k_hw *ath12k_hw_to_ah(struct ieee80211_hw  *hw)</div><div class='add'>+{</div><div class='add'>+	return hw-&gt;priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct ath12k *ath12k_ah_to_ar(struct ath12k_hw *ah, u8 hw_link_id)</div><div class='add'>+{</div><div class='add'>+	if (WARN(hw_link_id &gt;= ah-&gt;num_radio,</div><div class='add'>+		 "bad hw link id %d, so switch to default link\n", hw_link_id))</div><div class='add'>+		hw_link_id = 0;</div><div class='add'>+</div><div class='add'>+	return &amp;ah-&gt;radio[hw_link_id];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct ath12k_hw *ath12k_ar_to_ah(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	return ar-&gt;ah;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct ieee80211_hw *ath12k_ar_to_hw(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	return ar-&gt;ah-&gt;hw;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define for_each_ar(ah, ar, index) \</div><div class='add'>+	for ((index) = 0; ((index) &lt; (ah)-&gt;num_radio &amp;&amp; \</div><div class='add'>+	     ((ar) = &amp;(ah)-&gt;radio[(index)])); (index)++)</div><div class='add'>+</div><div class='add'>+static inline struct ath12k_hw *ath12k_ag_to_ah(struct ath12k_hw_group *ag, int idx)</div><div class='add'>+{</div><div class='add'>+	return ag-&gt;ah[idx];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_ag_set_ah(struct ath12k_hw_group *ag, int idx,</div><div class='add'>+				    struct ath12k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	ag-&gt;ah[idx] = ah;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct ath12k_hw_group *ath12k_ab_to_ag(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;ag;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct ath12k_base *ath12k_ag_to_ab(struct ath12k_hw_group *ag,</div><div class='add'>+						  u8 device_id)</div><div class='add'>+{</div><div class='add'>+	return ag-&gt;ab[device_id];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline s32 ath12k_pdev_get_noise_floor(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	return ar-&gt;rssi_info.noise_floor;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _CORE_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/coredump.c b/drivers/net/wireless/ath/ath12k/coredump.c<br/>new file mode 100644<br/>index 000000000000..ce1beeb54836<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/coredump.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/coredump.c</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/devcoredump.h&gt;</div><div class='add'>+#include "hif.h"</div><div class='add'>+#include "coredump.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+enum</div><div class='add'>+ath12k_fw_crash_dump_type ath12k_coredump_get_dump_type(enum ath12k_qmi_target_mem type)</div><div class='add'>+{</div><div class='add'>+	enum ath12k_fw_crash_dump_type dump_type;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case HOST_DDR_REGION_TYPE:</div><div class='add'>+		dump_type = FW_CRASH_DUMP_REMOTE_MEM_DATA;</div><div class='add'>+		break;</div><div class='add'>+	case M3_DUMP_REGION_TYPE:</div><div class='add'>+		dump_type = FW_CRASH_DUMP_M3_DUMP;</div><div class='add'>+		break;</div><div class='add'>+	case PAGEABLE_MEM_REGION_TYPE:</div><div class='add'>+		dump_type = FW_CRASH_DUMP_PAGEABLE_DATA;</div><div class='add'>+		break;</div><div class='add'>+	case BDF_MEM_REGION_TYPE:</div><div class='add'>+	case CALDB_MEM_REGION_TYPE:</div><div class='add'>+		dump_type = FW_CRASH_DUMP_NONE;</div><div class='add'>+		break;</div><div class='add'>+	case MLO_GLOBAL_MEM_REGION_TYPE:</div><div class='add'>+		dump_type = FW_CRASH_DUMP_MLO_GLOBAL_DATA;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dump_type = FW_CRASH_DUMP_TYPE_MAX;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dump_type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_coredump_upload(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = container_of(work, struct ath12k_base, dump_work);</div><div class='add'>+</div><div class='add'>+	ath12k_info(ab, "Uploading coredump\n");</div><div class='add'>+	/* dev_coredumpv() takes ownership of the buffer */</div><div class='add'>+	dev_coredumpv(ab-&gt;dev, ab-&gt;dump_data, ab-&gt;ath12k_coredump_len, GFP_KERNEL);</div><div class='add'>+	ab-&gt;dump_data = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_coredump_collect(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath12k_hif_coredump_download(ab);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/coredump.h b/drivers/net/wireless/ath/ath12k/coredump.h<br/>new file mode 100644<br/>index 000000000000..13f46a605113<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/coredump.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/coredump.h</a></div><div class='hunk'>@@ -0,0 +1,81 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ATH12K_COREDUMP_H_</div><div class='add'>+#define _ATH12K_COREDUMP_H_</div><div class='add'>+</div><div class='add'>+#define ATH12K_FW_CRASH_DUMP_V2      2</div><div class='add'>+</div><div class='add'>+enum ath12k_fw_crash_dump_type {</div><div class='add'>+	FW_CRASH_DUMP_PAGING_DATA,</div><div class='add'>+	FW_CRASH_DUMP_RDDM_DATA,</div><div class='add'>+	FW_CRASH_DUMP_REMOTE_MEM_DATA,</div><div class='add'>+	FW_CRASH_DUMP_PAGEABLE_DATA,</div><div class='add'>+	FW_CRASH_DUMP_M3_DUMP,</div><div class='add'>+	FW_CRASH_DUMP_NONE,</div><div class='add'>+	FW_CRASH_DUMP_MLO_GLOBAL_DATA,</div><div class='add'>+</div><div class='add'>+	/* keep last */</div><div class='add'>+	FW_CRASH_DUMP_TYPE_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define COREDUMP_TLV_HDR_SIZE 8</div><div class='add'>+</div><div class='add'>+struct ath12k_tlv_dump_data {</div><div class='add'>+	/* see ath11k_fw_crash_dump_type above */</div><div class='add'>+	__le32 type;</div><div class='add'>+</div><div class='add'>+	/* in bytes */</div><div class='add'>+	__le32 tlv_len;</div><div class='add'>+</div><div class='add'>+	/* pad to 32-bit boundaries as needed */</div><div class='add'>+	u8 tlv_data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_dump_file_data {</div><div class='add'>+	/* "ATH12K-FW-DUMP" */</div><div class='add'>+	char df_magic[16];</div><div class='add'>+	/* total dump len in bytes */</div><div class='add'>+	__le32 len;</div><div class='add'>+	/* file dump version */</div><div class='add'>+	__le32 version;</div><div class='add'>+	/* pci device id */</div><div class='add'>+	__le32 chip_id;</div><div class='add'>+	/* qrtr instance id */</div><div class='add'>+	__le32 qrtr_id;</div><div class='add'>+	/* pci domain id */</div><div class='add'>+	__le32 bus_id;</div><div class='add'>+	guid_t guid;</div><div class='add'>+	/* time-of-day stamp */</div><div class='add'>+	__le64 tv_sec;</div><div class='add'>+	/* time-of-day stamp, nano-seconds */</div><div class='add'>+	__le64 tv_nsec;</div><div class='add'>+	/* room for growth w/out changing binary format */</div><div class='add'>+	u8 unused[128];</div><div class='add'>+	u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ATH12K_COREDUMP</div><div class='add'>+enum ath12k_fw_crash_dump_type ath12k_coredump_get_dump_type</div><div class='add'>+						(enum ath12k_qmi_target_mem type);</div><div class='add'>+void ath12k_coredump_upload(struct work_struct *work);</div><div class='add'>+void ath12k_coredump_collect(struct ath12k_base *ab);</div><div class='add'>+#else</div><div class='add'>+static inline enum ath12k_fw_crash_dump_type ath12k_coredump_get_dump_type</div><div class='add'>+							(enum ath12k_qmi_target_mem type)</div><div class='add'>+{</div><div class='add'>+	return FW_CRASH_DUMP_TYPE_MAX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_coredump_upload(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_coredump_collect(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/dbring.c b/drivers/net/wireless/ath/ath12k/dbring.c<br/>new file mode 100644<br/>index 000000000000..6604dacea2ae<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/dbring.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/dbring.c</a></div><div class='hunk'>@@ -0,0 +1,358 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+static int ath12k_dbring_bufs_replenish(struct ath12k *ar,</div><div class='add'>+					struct ath12k_dbring *ring,</div><div class='add'>+					struct ath12k_dbring_element *buff,</div><div class='add'>+					gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	void *ptr_aligned, *ptr_unaligned, *desc;</div><div class='add'>+	int ret;</div><div class='add'>+	int buf_id;</div><div class='add'>+	u32 cookie;</div><div class='add'>+</div><div class='add'>+	srng = &amp;ab-&gt;hal.srng_list[ring-&gt;refill_srng.ring_id];</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_begin(ab, srng);</div><div class='add'>+</div><div class='add'>+	ptr_unaligned = buff-&gt;payload;</div><div class='add'>+	ptr_aligned = PTR_ALIGN(ptr_unaligned, ring-&gt;buf_align);</div><div class='add'>+	paddr = dma_map_single(ab-&gt;dev, ptr_aligned, ring-&gt;buf_sz,</div><div class='add'>+			       DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+	ret = dma_mapping_error(ab-&gt;dev, paddr);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ring-&gt;idr_lock);</div><div class='add'>+	buf_id = idr_alloc(&amp;ring-&gt;bufs_idr, buff, 0, ring-&gt;bufs_max, gfp);</div><div class='add'>+	spin_unlock_bh(&amp;ring-&gt;idr_lock);</div><div class='add'>+	if (buf_id &lt; 0) {</div><div class='add'>+		ret = -ENOBUFS;</div><div class='add'>+		goto err_dma_unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc = ath12k_hal_srng_src_get_next_entry(ab, srng);</div><div class='add'>+	if (!desc) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto err_idr_remove;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buff-&gt;paddr = paddr;</div><div class='add'>+</div><div class='add'>+	cookie = u32_encode_bits(ar-&gt;pdev_idx, DP_RXDMA_BUF_COOKIE_PDEV_ID) |</div><div class='add'>+		 u32_encode_bits(buf_id, DP_RXDMA_BUF_COOKIE_BUF_ID);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_rx_buf_addr_info_set(desc, paddr, cookie, 0);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_idr_remove:</div><div class='add'>+	spin_lock_bh(&amp;ring-&gt;idr_lock);</div><div class='add'>+	idr_remove(&amp;ring-&gt;bufs_idr, buf_id);</div><div class='add'>+	spin_unlock_bh(&amp;ring-&gt;idr_lock);</div><div class='add'>+err_dma_unmap:</div><div class='add'>+	dma_unmap_single(ab-&gt;dev, paddr, ring-&gt;buf_sz,</div><div class='add'>+			 DMA_FROM_DEVICE);</div><div class='add'>+err:</div><div class='add'>+	ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dbring_fill_bufs(struct ath12k *ar,</div><div class='add'>+				   struct ath12k_dbring *ring,</div><div class='add'>+				   gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dbring_element *buff;</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	int num_remain, req_entries, num_free;</div><div class='add'>+	u32 align;</div><div class='add'>+	int size, ret;</div><div class='add'>+</div><div class='add'>+	srng = &amp;ab-&gt;hal.srng_list[ring-&gt;refill_srng.ring_id];</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	num_free = ath12k_hal_srng_src_num_free(ab, srng, true);</div><div class='add'>+	req_entries = min(num_free, ring-&gt;bufs_max);</div><div class='add'>+	num_remain = req_entries;</div><div class='add'>+	align = ring-&gt;buf_align;</div><div class='add'>+	size = sizeof(*buff) + ring-&gt;buf_sz + align - 1;</div><div class='add'>+</div><div class='add'>+	while (num_remain &gt; 0) {</div><div class='add'>+		buff = kzalloc(size, gfp);</div><div class='add'>+		if (!buff)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ret = ath12k_dbring_bufs_replenish(ar, ring, buff, gfp);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to replenish db ring num_remain %d req_ent %d\n",</div><div class='add'>+				    num_remain, req_entries);</div><div class='add'>+			kfree(buff);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		num_remain--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return num_remain;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dbring_wmi_cfg_setup(struct ath12k *ar,</div><div class='add'>+				struct ath12k_dbring *ring,</div><div class='add'>+				enum wmi_direct_buffer_module id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev_dma_ring_cfg_arg arg = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (id &gt;= WMI_DIRECT_BUF_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	arg.pdev_id = DP_SW2HW_MACID(ring-&gt;pdev_id);</div><div class='add'>+	arg.module_id = id;</div><div class='add'>+	arg.base_paddr_lo = lower_32_bits(ring-&gt;refill_srng.paddr);</div><div class='add'>+	arg.base_paddr_hi = upper_32_bits(ring-&gt;refill_srng.paddr);</div><div class='add'>+	arg.head_idx_paddr_lo = lower_32_bits(ring-&gt;hp_addr);</div><div class='add'>+	arg.head_idx_paddr_hi = upper_32_bits(ring-&gt;hp_addr);</div><div class='add'>+	arg.tail_idx_paddr_lo = lower_32_bits(ring-&gt;tp_addr);</div><div class='add'>+	arg.tail_idx_paddr_hi = upper_32_bits(ring-&gt;tp_addr);</div><div class='add'>+	arg.num_elems = ring-&gt;bufs_max;</div><div class='add'>+	arg.buf_size = ring-&gt;buf_sz;</div><div class='add'>+	arg.num_resp_per_event = ring-&gt;num_resp_per_event;</div><div class='add'>+	arg.event_timeout_ms = ring-&gt;event_timeout_ms;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_pdev_dma_ring_cfg(ar, &amp;arg);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to setup db ring cfg\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dbring_set_cfg(struct ath12k *ar, struct ath12k_dbring *ring,</div><div class='add'>+			  u32 num_resp_per_event, u32 event_timeout_ms,</div><div class='add'>+			  int (*handler)(struct ath12k *,</div><div class='add'>+					 struct ath12k_dbring_data *))</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(!ring))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ring-&gt;num_resp_per_event = num_resp_per_event;</div><div class='add'>+	ring-&gt;event_timeout_ms = event_timeout_ms;</div><div class='add'>+	ring-&gt;handler = handler;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dbring_buf_setup(struct ath12k *ar,</div><div class='add'>+			    struct ath12k_dbring *ring,</div><div class='add'>+			    struct ath12k_dbring_cap *db_cap)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	srng = &amp;ab-&gt;hal.srng_list[ring-&gt;refill_srng.ring_id];</div><div class='add'>+	ring-&gt;bufs_max = ring-&gt;refill_srng.size /</div><div class='add'>+		ath12k_hal_srng_get_entrysize(ab, HAL_RXDMA_DIR_BUF);</div><div class='add'>+</div><div class='add'>+	ring-&gt;buf_sz = db_cap-&gt;min_buf_sz;</div><div class='add'>+	ring-&gt;buf_align = db_cap-&gt;min_buf_align;</div><div class='add'>+	ring-&gt;pdev_id = db_cap-&gt;pdev_id;</div><div class='add'>+	ring-&gt;hp_addr = ath12k_hal_srng_get_hp_addr(ab, srng);</div><div class='add'>+	ring-&gt;tp_addr = ath12k_hal_srng_get_tp_addr(ab, srng);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dbring_fill_bufs(ar, ring, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dbring_srng_setup(struct ath12k *ar, struct ath12k_dbring *ring,</div><div class='add'>+			     int ring_num, int num_entries)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_srng_setup(ar-&gt;ab, &amp;ring-&gt;refill_srng, HAL_RXDMA_DIR_BUF,</div><div class='add'>+				   ring_num, ar-&gt;pdev_idx, num_entries);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to setup srng: %d ring_id %d\n",</div><div class='add'>+			    ret, ring_num);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	ath12k_dp_srng_cleanup(ar-&gt;ab, &amp;ring-&gt;refill_srng);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dbring_get_cap(struct ath12k_base *ab,</div><div class='add'>+			  u8 pdev_idx,</div><div class='add'>+			  enum wmi_direct_buffer_module id,</div><div class='add'>+			  struct ath12k_dbring_cap *db_cap)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;num_db_cap || !ab-&gt;db_caps)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (id &gt;= WMI_DIRECT_BUF_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_db_cap; i++) {</div><div class='add'>+		if (pdev_idx == ab-&gt;db_caps[i].pdev_id &amp;&amp;</div><div class='add'>+		    id == ab-&gt;db_caps[i].id) {</div><div class='add'>+			*db_cap = ab-&gt;db_caps[i];</div><div class='add'>+</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dbring_buffer_release_event(struct ath12k_base *ab,</div><div class='add'>+				       struct ath12k_dbring_buf_release_event *ev)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dbring *ring = NULL;</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_dbring_element *buff;</div><div class='add'>+	struct ath12k_dbring_data handler_data;</div><div class='add'>+	struct ath12k_buffer_addr desc;</div><div class='add'>+	u8 *vaddr_unalign;</div><div class='add'>+	u32 num_entry, num_buff_reaped;</div><div class='add'>+	u8 pdev_idx, rbm;</div><div class='add'>+	u32 cookie;</div><div class='add'>+	int buf_id;</div><div class='add'>+	int size;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	pdev_idx = le32_to_cpu(ev-&gt;fixed.pdev_id);</div><div class='add'>+</div><div class='add'>+	if (pdev_idx &gt;= ab-&gt;num_radios) {</div><div class='add'>+		ath12k_warn(ab, "Invalid pdev id %d\n", pdev_idx);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ev-&gt;fixed.num_buf_release_entry !=</div><div class='add'>+	    ev-&gt;fixed.num_meta_data_entry) {</div><div class='add'>+		ath12k_warn(ab, "Buffer entry %d mismatch meta entry %d\n",</div><div class='add'>+			    ev-&gt;fixed.num_buf_release_entry,</div><div class='add'>+			    ev-&gt;fixed.num_meta_data_entry);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar = ab-&gt;pdevs[pdev_idx].ar;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (!rcu_dereference(ab-&gt;pdevs_active[pdev_idx])) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto rcu_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (ev-&gt;fixed.module_id) {</div><div class='add'>+	case WMI_DIRECT_BUF_SPECTRAL:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ring = NULL;</div><div class='add'>+		ath12k_warn(ab, "Recv dma buffer release ev on unsupp module %d\n",</div><div class='add'>+			    ev-&gt;fixed.module_id);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ring) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto rcu_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	srng = &amp;ab-&gt;hal.srng_list[ring-&gt;refill_srng.ring_id];</div><div class='add'>+	num_entry = le32_to_cpu(ev-&gt;fixed.num_buf_release_entry);</div><div class='add'>+	size = sizeof(*buff) + ring-&gt;buf_sz + ring-&gt;buf_align - 1;</div><div class='add'>+	num_buff_reaped = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	while (num_buff_reaped &lt; num_entry) {</div><div class='add'>+		desc.info0 = ev-&gt;buf_entry[num_buff_reaped].paddr_lo;</div><div class='add'>+		desc.info1 = ev-&gt;buf_entry[num_buff_reaped].paddr_hi;</div><div class='add'>+		handler_data.meta = ev-&gt;meta_data[num_buff_reaped];</div><div class='add'>+</div><div class='add'>+		num_buff_reaped++;</div><div class='add'>+</div><div class='add'>+		ath12k_hal_rx_buf_addr_info_get(&amp;desc, &amp;paddr, &amp;cookie, &amp;rbm);</div><div class='add'>+</div><div class='add'>+		buf_id = u32_get_bits(cookie, DP_RXDMA_BUF_COOKIE_BUF_ID);</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;ring-&gt;idr_lock);</div><div class='add'>+		buff = idr_find(&amp;ring-&gt;bufs_idr, buf_id);</div><div class='add'>+		if (!buff) {</div><div class='add'>+			spin_unlock_bh(&amp;ring-&gt;idr_lock);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		idr_remove(&amp;ring-&gt;bufs_idr, buf_id);</div><div class='add'>+		spin_unlock_bh(&amp;ring-&gt;idr_lock);</div><div class='add'>+</div><div class='add'>+		dma_unmap_single(ab-&gt;dev, buff-&gt;paddr, ring-&gt;buf_sz,</div><div class='add'>+				 DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+		if (ring-&gt;handler) {</div><div class='add'>+			vaddr_unalign = buff-&gt;payload;</div><div class='add'>+			handler_data.data = PTR_ALIGN(vaddr_unalign,</div><div class='add'>+						      ring-&gt;buf_align);</div><div class='add'>+			handler_data.data_sz = ring-&gt;buf_sz;</div><div class='add'>+</div><div class='add'>+			ring-&gt;handler(ar, &amp;handler_data);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memset(buff, 0, size);</div><div class='add'>+		ath12k_dbring_bufs_replenish(ar, ring, buff, GFP_ATOMIC);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+rcu_unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dbring_srng_cleanup(struct ath12k *ar, struct ath12k_dbring *ring)</div><div class='add'>+{</div><div class='add'>+	ath12k_dp_srng_cleanup(ar-&gt;ab, &amp;ring-&gt;refill_srng);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dbring_buf_cleanup(struct ath12k *ar, struct ath12k_dbring *ring)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dbring_element *buff;</div><div class='add'>+	int buf_id;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ring-&gt;idr_lock);</div><div class='add'>+	idr_for_each_entry(&amp;ring-&gt;bufs_idr, buff, buf_id) {</div><div class='add'>+		idr_remove(&amp;ring-&gt;bufs_idr, buf_id);</div><div class='add'>+		dma_unmap_single(ar-&gt;ab-&gt;dev, buff-&gt;paddr,</div><div class='add'>+				 ring-&gt;buf_sz, DMA_FROM_DEVICE);</div><div class='add'>+		kfree(buff);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	idr_destroy(&amp;ring-&gt;bufs_idr);</div><div class='add'>+	spin_unlock_bh(&amp;ring-&gt;idr_lock);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/dbring.h b/drivers/net/wireless/ath/ath12k/dbring.h<br/>new file mode 100644<br/>index 000000000000..e1c0eba774ec<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/dbring.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/dbring.h</a></div><div class='hunk'>@@ -0,0 +1,80 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH12K_DBRING_H</div><div class='add'>+#define ATH12K_DBRING_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/idr.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include "dp.h"</div><div class='add'>+</div><div class='add'>+struct ath12k_dbring_element {</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	u8 payload[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_dbring_data {</div><div class='add'>+	void *data;</div><div class='add'>+	u32 data_sz;</div><div class='add'>+	struct ath12k_wmi_dma_buf_release_meta_data_params meta;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_dbring_buf_release_event {</div><div class='add'>+	struct ath12k_wmi_dma_buf_release_fixed_params fixed;</div><div class='add'>+	const struct ath12k_wmi_dma_buf_release_entry_params *buf_entry;</div><div class='add'>+	const struct ath12k_wmi_dma_buf_release_meta_data_params *meta_data;</div><div class='add'>+	u32 num_buf_entry;</div><div class='add'>+	u32 num_meta;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_dbring_cap {</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+	enum wmi_direct_buffer_module id;</div><div class='add'>+	u32 min_elem;</div><div class='add'>+	u32 min_buf_sz;</div><div class='add'>+	u32 min_buf_align;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_dbring {</div><div class='add'>+	struct dp_srng refill_srng;</div><div class='add'>+	struct idr bufs_idr;</div><div class='add'>+	/* Protects bufs_idr */</div><div class='add'>+	spinlock_t idr_lock;</div><div class='add'>+	dma_addr_t tp_addr;</div><div class='add'>+	dma_addr_t hp_addr;</div><div class='add'>+	int bufs_max;</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+	u32 buf_sz;</div><div class='add'>+	u32 buf_align;</div><div class='add'>+	u32 num_resp_per_event;</div><div class='add'>+	u32 event_timeout_ms;</div><div class='add'>+	int (*handler)(struct ath12k *ar, struct ath12k_dbring_data *data);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ath12k_dbring_set_cfg(struct ath12k *ar,</div><div class='add'>+			  struct ath12k_dbring *ring,</div><div class='add'>+			  u32 num_resp_per_event,</div><div class='add'>+			  u32 event_timeout_ms,</div><div class='add'>+			  int (*handler)(struct ath12k *,</div><div class='add'>+					 struct ath12k_dbring_data *));</div><div class='add'>+int ath12k_dbring_wmi_cfg_setup(struct ath12k *ar,</div><div class='add'>+				struct ath12k_dbring *ring,</div><div class='add'>+				enum wmi_direct_buffer_module id);</div><div class='add'>+int ath12k_dbring_buf_setup(struct ath12k *ar,</div><div class='add'>+			    struct ath12k_dbring *ring,</div><div class='add'>+			    struct ath12k_dbring_cap *db_cap);</div><div class='add'>+int ath12k_dbring_srng_setup(struct ath12k *ar, struct ath12k_dbring *ring,</div><div class='add'>+			     int ring_num, int num_entries);</div><div class='add'>+int ath12k_dbring_buffer_release_event(struct ath12k_base *ab,</div><div class='add'>+				       struct ath12k_dbring_buf_release_event *ev);</div><div class='add'>+int ath12k_dbring_get_cap(struct ath12k_base *ab,</div><div class='add'>+			  u8 pdev_idx,</div><div class='add'>+			  enum wmi_direct_buffer_module id,</div><div class='add'>+			  struct ath12k_dbring_cap *db_cap);</div><div class='add'>+void ath12k_dbring_srng_cleanup(struct ath12k *ar, struct ath12k_dbring *ring);</div><div class='add'>+void ath12k_dbring_buf_cleanup(struct ath12k *ar, struct ath12k_dbring *ring);</div><div class='add'>+#endif /* ATH12K_DBRING_H */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/debug.c b/drivers/net/wireless/ath/ath12k/debug.c<br/>new file mode 100644<br/>index 000000000000..5ce100cd9a9d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/debug.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/debug.c</a></div><div class='hunk'>@@ -0,0 +1,104 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+void ath12k_info(struct ath12k_base *ab, const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	struct va_format vaf = {</div><div class='add'>+		.fmt = fmt,</div><div class='add'>+	};</div><div class='add'>+	va_list args;</div><div class='add'>+</div><div class='add'>+	va_start(args, fmt);</div><div class='add'>+	vaf.va = &amp;args;</div><div class='add'>+	dev_info(ab-&gt;dev, "%pV", &amp;vaf);</div><div class='add'>+	/* TODO: Trace the log */</div><div class='add'>+	va_end(args);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_err(struct ath12k_base *ab, const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	struct va_format vaf = {</div><div class='add'>+		.fmt = fmt,</div><div class='add'>+	};</div><div class='add'>+	va_list args;</div><div class='add'>+</div><div class='add'>+	va_start(args, fmt);</div><div class='add'>+	vaf.va = &amp;args;</div><div class='add'>+	dev_err(ab-&gt;dev, "%pV", &amp;vaf);</div><div class='add'>+	/* TODO: Trace the log */</div><div class='add'>+	va_end(args);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __ath12k_warn(struct device *dev, const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	struct va_format vaf = {</div><div class='add'>+		.fmt = fmt,</div><div class='add'>+	};</div><div class='add'>+	va_list args;</div><div class='add'>+</div><div class='add'>+	va_start(args, fmt);</div><div class='add'>+	vaf.va = &amp;args;</div><div class='add'>+	dev_warn_ratelimited(dev, "%pV", &amp;vaf);</div><div class='add'>+	/* TODO: Trace the log */</div><div class='add'>+	va_end(args);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ATH12K_DEBUG</div><div class='add'>+</div><div class='add'>+void __ath12k_dbg(struct ath12k_base *ab, enum ath12k_debug_mask mask,</div><div class='add'>+		  const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	struct va_format vaf;</div><div class='add'>+	va_list args;</div><div class='add'>+</div><div class='add'>+	va_start(args, fmt);</div><div class='add'>+</div><div class='add'>+	vaf.fmt = fmt;</div><div class='add'>+	vaf.va = &amp;args;</div><div class='add'>+</div><div class='add'>+	if (likely(ab))</div><div class='add'>+		dev_printk(KERN_DEBUG, ab-&gt;dev, "%pV", &amp;vaf);</div><div class='add'>+	else</div><div class='add'>+		printk(KERN_DEBUG "ath12k: %pV", &amp;vaf);</div><div class='add'>+</div><div class='add'>+	/* TODO: trace log */</div><div class='add'>+</div><div class='add'>+	va_end(args);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dbg_dump(struct ath12k_base *ab,</div><div class='add'>+		     enum ath12k_debug_mask mask,</div><div class='add'>+		     const char *msg, const char *prefix,</div><div class='add'>+		     const void *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	char linebuf[256];</div><div class='add'>+	size_t linebuflen;</div><div class='add'>+	const void *ptr;</div><div class='add'>+</div><div class='add'>+	if (ath12k_debug_mask &amp; mask) {</div><div class='add'>+		if (msg)</div><div class='add'>+			__ath12k_dbg(ab, mask, "%s\n", msg);</div><div class='add'>+</div><div class='add'>+		for (ptr = buf; (ptr - buf) &lt; len; ptr += 16) {</div><div class='add'>+			linebuflen = 0;</div><div class='add'>+			linebuflen += scnprintf(linebuf + linebuflen,</div><div class='add'>+						sizeof(linebuf) - linebuflen,</div><div class='add'>+						"%s%08x: ",</div><div class='add'>+						(prefix ? prefix : ""),</div><div class='add'>+						(unsigned int)(ptr - buf));</div><div class='add'>+			hex_dump_to_buffer(ptr, len - (ptr - buf), 16, 1,</div><div class='add'>+					   linebuf + linebuflen,</div><div class='add'>+					   sizeof(linebuf) - linebuflen, true);</div><div class='add'>+			dev_dbg(ab-&gt;dev, "%s\n", linebuf);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_ATH12K_DEBUG */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/debug.h b/drivers/net/wireless/ath/ath12k/debug.h<br/>new file mode 100644<br/>index 000000000000..bf254e43a68d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/debug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/debug.h</a></div><div class='hunk'>@@ -0,0 +1,76 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2022, 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ATH12K_DEBUG_H_</div><div class='add'>+#define _ATH12K_DEBUG_H_</div><div class='add'>+</div><div class='add'>+#include "trace.h"</div><div class='add'>+</div><div class='add'>+enum ath12k_debug_mask {</div><div class='add'>+	ATH12K_DBG_AHB		= 0x00000001,</div><div class='add'>+	ATH12K_DBG_WMI		= 0x00000002,</div><div class='add'>+	ATH12K_DBG_HTC		= 0x00000004,</div><div class='add'>+	ATH12K_DBG_DP_HTT	= 0x00000008,</div><div class='add'>+	ATH12K_DBG_MAC		= 0x00000010,</div><div class='add'>+	ATH12K_DBG_BOOT		= 0x00000020,</div><div class='add'>+	ATH12K_DBG_QMI		= 0x00000040,</div><div class='add'>+	ATH12K_DBG_DATA		= 0x00000080,</div><div class='add'>+	ATH12K_DBG_MGMT		= 0x00000100,</div><div class='add'>+	ATH12K_DBG_REG		= 0x00000200,</div><div class='add'>+	ATH12K_DBG_TESTMODE	= 0x00000400,</div><div class='add'>+	ATH12K_DBG_HAL		= 0x00000800,</div><div class='add'>+	ATH12K_DBG_PCI		= 0x00001000,</div><div class='add'>+	ATH12K_DBG_DP_TX	= 0x00002000,</div><div class='add'>+	ATH12K_DBG_DP_RX	= 0x00004000,</div><div class='add'>+	ATH12K_DBG_WOW		= 0x00008000,</div><div class='add'>+	ATH12K_DBG_CE		= 0x00010000,</div><div class='add'>+	ATH12K_DBG_ANY		= 0xffffffff,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+__printf(2, 3) void ath12k_info(struct ath12k_base *ab, const char *fmt, ...);</div><div class='add'>+__printf(2, 3) void ath12k_err(struct ath12k_base *ab, const char *fmt, ...);</div><div class='add'>+__printf(2, 3) void __ath12k_warn(struct device *dev, const char *fmt, ...);</div><div class='add'>+</div><div class='add'>+#define ath12k_warn(ab, fmt, ...) __ath12k_warn((ab)-&gt;dev, fmt, ##__VA_ARGS__)</div><div class='add'>+#define ath12k_hw_warn(ah, fmt, ...) __ath12k_warn((ah)-&gt;dev, fmt, ##__VA_ARGS__)</div><div class='add'>+</div><div class='add'>+extern unsigned int ath12k_debug_mask;</div><div class='add'>+extern bool ath12k_ftm_mode;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ATH12K_DEBUG</div><div class='add'>+__printf(3, 4) void __ath12k_dbg(struct ath12k_base *ab,</div><div class='add'>+				 enum ath12k_debug_mask mask,</div><div class='add'>+				 const char *fmt, ...);</div><div class='add'>+void ath12k_dbg_dump(struct ath12k_base *ab,</div><div class='add'>+		     enum ath12k_debug_mask mask,</div><div class='add'>+		     const char *msg, const char *prefix,</div><div class='add'>+		     const void *buf, size_t len);</div><div class='add'>+#else /* CONFIG_ATH12K_DEBUG */</div><div class='add'>+static inline void __ath12k_dbg(struct ath12k_base *ab,</div><div class='add'>+				enum ath12k_debug_mask dbg_mask,</div><div class='add'>+				const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_dbg_dump(struct ath12k_base *ab,</div><div class='add'>+				   enum ath12k_debug_mask mask,</div><div class='add'>+				   const char *msg, const char *prefix,</div><div class='add'>+				   const void *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_ATH12K_DEBUG */</div><div class='add'>+</div><div class='add'>+#define ath12k_dbg(ab, dbg_mask, fmt, ...)			\</div><div class='add'>+do {								\</div><div class='add'>+	typeof(dbg_mask) mask = (dbg_mask);			\</div><div class='add'>+	if (ath12k_debug_mask &amp; mask)				\</div><div class='add'>+		__ath12k_dbg(ab, mask, fmt, ##__VA_ARGS__);	\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define ath12k_generic_dbg(dbg_mask, fmt, ...)			\</div><div class='add'>+	ath12k_dbg(NULL, dbg_mask, fmt, ##__VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#endif /* _ATH12K_DEBUG_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/debugfs.c b/drivers/net/wireless/ath/ath12k/debugfs.c<br/>new file mode 100644<br/>index 000000000000..d6a86f075d73<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/debugfs.c</a></div><div class='hunk'>@@ -0,0 +1,1515 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "dp_tx.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "debugfs.h"</div><div class='add'>+#include "debugfs_htt_stats.h"</div><div class='add'>+</div><div class='add'>+static ssize_t ath12k_write_simulate_radar(struct file *file,</div><div class='add'>+					   const char __user *user_buf,</div><div class='add'>+					   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = file-&gt;private_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	wiphy_lock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+	ret = ath12k_wmi_simulate_radar(ar);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	ret = count;</div><div class='add'>+exit:</div><div class='add'>+	wiphy_unlock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_simulate_radar = {</div><div class='add'>+	.write = ath12k_write_simulate_radar,</div><div class='add'>+	.open = simple_open</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t ath12k_read_simulate_fw_crash(struct file *file,</div><div class='add'>+					     char __user *user_buf,</div><div class='add'>+					     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	const char buf[] =</div><div class='add'>+		"To simulate firmware crash write one of the keywords to this file:\n"</div><div class='add'>+		"`assert` - send WMI_FORCE_FW_HANG_CMDID to firmware to cause assert.\n";</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, strlen(buf));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+ath12k_write_simulate_fw_crash(struct file *file,</div><div class='add'>+			       const char __user *user_buf,</div><div class='add'>+			       size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = file-&gt;private_data;</div><div class='add'>+	struct ath12k_pdev *pdev;</div><div class='add'>+	struct ath12k *ar = NULL;</div><div class='add'>+	char buf[32] = {};</div><div class='add'>+	int i, ret;</div><div class='add'>+	ssize_t rc;</div><div class='add'>+</div><div class='add'>+	/* filter partial writes and invalid commands */</div><div class='add'>+	if (*ppos != 0 || count &gt;= sizeof(buf) || count == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rc = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* drop the possible '\n' from the end */</div><div class='add'>+	if (buf[*ppos - 1] == '\n')</div><div class='add'>+		buf[*ppos - 1] = '\0';</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		pdev = &amp;ab-&gt;pdevs[i];</div><div class='add'>+		ar = pdev-&gt;ar;</div><div class='add'>+		if (ar)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ar)</div><div class='add'>+		return -ENETDOWN;</div><div class='add'>+</div><div class='add'>+	if (!strcmp(buf, "assert")) {</div><div class='add'>+		ath12k_info(ab, "simulating firmware assert crash\n");</div><div class='add'>+		ret = ath12k_wmi_force_fw_hang_cmd(ar,</div><div class='add'>+						   ATH12K_WMI_FW_HANG_ASSERT_TYPE,</div><div class='add'>+						   ATH12K_WMI_FW_HANG_DELAY);</div><div class='add'>+	} else {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to simulate firmware crash: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_simulate_fw_crash = {</div><div class='add'>+	.read = ath12k_read_simulate_fw_crash,</div><div class='add'>+	.write = ath12k_write_simulate_fw_crash,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t ath12k_write_tpc_stats_type(struct file *file,</div><div class='add'>+					   const char __user *user_buf,</div><div class='add'>+					   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = file-&gt;private_data;</div><div class='add'>+	u8 type;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtou8_from_user(user_buf, count, 0, &amp;type);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (type &gt;= WMI_HALPHY_PDEV_TX_STATS_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	ar-&gt;debug.tpc_stats_type = type;</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_debug_tpc_stats_request(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	enum wmi_halphy_ctrl_path_stats_id tpc_stats_sub_id;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;ar-&gt;debug.tpc_complete);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	ar-&gt;debug.tpc_request = true;</div><div class='add'>+	tpc_stats_sub_id = ar-&gt;debug.tpc_stats_type;</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_send_tpc_stats_request(ar, tpc_stats_sub_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to request pdev tpc stats: %d\n", ret);</div><div class='add'>+		spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		ar-&gt;debug.tpc_request = false;</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_get_tpc_ctl_mode_idx(struct wmi_tpc_stats_arg *tpc_stats,</div><div class='add'>+				       enum wmi_tpc_pream_bw pream_bw, int *mode_idx)</div><div class='add'>+{</div><div class='add'>+	u32 chan_freq = le32_to_cpu(tpc_stats-&gt;tpc_config.chan_freq);</div><div class='add'>+	u8 band;</div><div class='add'>+</div><div class='add'>+	band = ((chan_freq &gt; ATH12K_MIN_6GHZ_FREQ) ? NL80211_BAND_6GHZ :</div><div class='add'>+		((chan_freq &gt; ATH12K_MIN_5GHZ_FREQ) ? NL80211_BAND_5GHZ :</div><div class='add'>+		NL80211_BAND_2GHZ));</div><div class='add'>+</div><div class='add'>+	if (band == NL80211_BAND_5GHZ || band == NL80211_BAND_6GHZ) {</div><div class='add'>+		switch (pream_bw) {</div><div class='add'>+		case WMI_TPC_PREAM_HT20:</div><div class='add'>+		case WMI_TPC_PREAM_VHT20:</div><div class='add'>+			*mode_idx = ATH12K_TPC_STATS_CTL_MODE_HT_VHT20_5GHZ_6GHZ;</div><div class='add'>+			break;</div><div class='add'>+		case WMI_TPC_PREAM_HE20:</div><div class='add'>+		case WMI_TPC_PREAM_EHT20:</div><div class='add'>+			*mode_idx = ATH12K_TPC_STATS_CTL_MODE_HE_EHT20_5GHZ_6GHZ;</div><div class='add'>+			break;</div><div class='add'>+		case WMI_TPC_PREAM_HT40:</div><div class='add'>+		case WMI_TPC_PREAM_VHT40:</div><div class='add'>+			*mode_idx = ATH12K_TPC_STATS_CTL_MODE_HT_VHT40_5GHZ_6GHZ;</div><div class='add'>+			break;</div><div class='add'>+		case WMI_TPC_PREAM_HE40:</div><div class='add'>+		case WMI_TPC_PREAM_EHT40:</div><div class='add'>+			*mode_idx = ATH12K_TPC_STATS_CTL_MODE_HE_EHT40_5GHZ_6GHZ;</div><div class='add'>+			break;</div><div class='add'>+		case WMI_TPC_PREAM_VHT80:</div><div class='add'>+			*mode_idx = ATH12K_TPC_STATS_CTL_MODE_VHT80_5GHZ_6GHZ;</div><div class='add'>+			break;</div><div class='add'>+		case WMI_TPC_PREAM_EHT60:</div><div class='add'>+			*mode_idx = ATH12K_TPC_STATS_CTL_MODE_EHT80_SU_PUNC20;</div><div class='add'>+			break;</div><div class='add'>+		case WMI_TPC_PREAM_HE80:</div><div class='add'>+		case WMI_TPC_PREAM_EHT80:</div><div class='add'>+			*mode_idx = ATH12K_TPC_STATS_CTL_MODE_HE_EHT80_5GHZ_6GHZ;</div><div class='add'>+			break;</div><div class='add'>+		case WMI_TPC_PREAM_VHT160:</div><div class='add'>+			*mode_idx = ATH12K_TPC_STATS_CTL_MODE_VHT160_5GHZ_6GHZ;</div><div class='add'>+			break;</div><div class='add'>+		case WMI_TPC_PREAM_EHT120:</div><div class='add'>+		case WMI_TPC_PREAM_EHT140:</div><div class='add'>+			*mode_idx = ATH12K_TPC_STATS_CTL_MODE_EHT160_SU_PUNC20;</div><div class='add'>+			break;</div><div class='add'>+		case WMI_TPC_PREAM_HE160:</div><div class='add'>+		case WMI_TPC_PREAM_EHT160:</div><div class='add'>+			*mode_idx = ATH12K_TPC_STATS_CTL_MODE_HE_EHT160_5GHZ_6GHZ;</div><div class='add'>+			break;</div><div class='add'>+		case WMI_TPC_PREAM_EHT200:</div><div class='add'>+			*mode_idx = ATH12K_TPC_STATS_CTL_MODE_EHT320_SU_PUNC120;</div><div class='add'>+			break;</div><div class='add'>+		case WMI_TPC_PREAM_EHT240:</div><div class='add'>+			*mode_idx = ATH12K_TPC_STATS_CTL_MODE_EHT320_SU_PUNC80;</div><div class='add'>+			break;</div><div class='add'>+		case WMI_TPC_PREAM_EHT280:</div><div class='add'>+			*mode_idx = ATH12K_TPC_STATS_CTL_MODE_EHT320_SU_PUNC40;</div><div class='add'>+			break;</div><div class='add'>+		case WMI_TPC_PREAM_EHT320:</div><div class='add'>+			*mode_idx = ATH12K_TPC_STATS_CTL_MODE_HE_EHT320_5GHZ_6GHZ;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			/* for 5GHZ and 6GHZ, default case will be for OFDM */</div><div class='add'>+			*mode_idx = ATH12K_TPC_STATS_CTL_MODE_LEGACY_5GHZ_6GHZ;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		switch (pream_bw) {</div><div class='add'>+		case WMI_TPC_PREAM_OFDM:</div><div class='add'>+			*mode_idx = ATH12K_TPC_STATS_CTL_MODE_LEGACY_2GHZ;</div><div class='add'>+			break;</div><div class='add'>+		case WMI_TPC_PREAM_HT20:</div><div class='add'>+		case WMI_TPC_PREAM_VHT20:</div><div class='add'>+		case WMI_TPC_PREAM_HE20:</div><div class='add'>+		case WMI_TPC_PREAM_EHT20:</div><div class='add'>+			*mode_idx = ATH12K_TPC_STATS_CTL_MODE_HT20_2GHZ;</div><div class='add'>+			break;</div><div class='add'>+		case WMI_TPC_PREAM_HT40:</div><div class='add'>+		case WMI_TPC_PREAM_VHT40:</div><div class='add'>+		case WMI_TPC_PREAM_HE40:</div><div class='add'>+		case WMI_TPC_PREAM_EHT40:</div><div class='add'>+			*mode_idx = ATH12K_TPC_STATS_CTL_MODE_HT40_2GHZ;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			/* for 2GHZ, default case will be CCK */</div><div class='add'>+			*mode_idx = ATH12K_TPC_STATS_CTL_MODE_CCK_2GHZ;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static s16 ath12k_tpc_get_rate(struct ath12k *ar,</div><div class='add'>+			       struct wmi_tpc_stats_arg *tpc_stats,</div><div class='add'>+			       u32 rate_idx, u32 num_chains, u32 rate_code,</div><div class='add'>+			       enum wmi_tpc_pream_bw pream_bw,</div><div class='add'>+			       enum wmi_halphy_ctrl_path_stats_id type,</div><div class='add'>+			       u32 eht_rate_idx)</div><div class='add'>+{</div><div class='add'>+	u32 tot_nss, tot_modes, txbf_on_off, index_offset1, index_offset2, index_offset3;</div><div class='add'>+	u8 chain_idx, stm_idx, num_streams;</div><div class='add'>+	bool is_mu, txbf_enabled = 0;</div><div class='add'>+	s8 rates_ctl_min, tpc_ctl;</div><div class='add'>+	s16 rates, tpc, reg_pwr;</div><div class='add'>+	u16 rate1, rate2;</div><div class='add'>+	int mode, ret;</div><div class='add'>+</div><div class='add'>+	num_streams = 1 + ATH12K_HW_NSS(rate_code);</div><div class='add'>+	chain_idx = num_chains - 1;</div><div class='add'>+	stm_idx = num_streams - 1;</div><div class='add'>+	mode = -1;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_get_tpc_ctl_mode_idx(tpc_stats, pream_bw, &amp;mode);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "Invalid mode index received\n");</div><div class='add'>+		tpc = TPC_INVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (num_chains &lt; num_streams) {</div><div class='add'>+		tpc = TPC_INVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (le32_to_cpu(tpc_stats-&gt;tpc_config.num_tx_chain) &lt;= 1) {</div><div class='add'>+		tpc = TPC_INVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (type == WMI_HALPHY_PDEV_TX_SUTXBF_STATS ||</div><div class='add'>+	    type == WMI_HALPHY_PDEV_TX_MUTXBF_STATS)</div><div class='add'>+		txbf_enabled = 1;</div><div class='add'>+</div><div class='add'>+	if (type == WMI_HALPHY_PDEV_TX_MU_STATS ||</div><div class='add'>+	    type == WMI_HALPHY_PDEV_TX_MUTXBF_STATS) {</div><div class='add'>+		is_mu = true;</div><div class='add'>+	} else {</div><div class='add'>+		is_mu = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Below is the min calculation of ctl array, rates array and</div><div class='add'>+	 * regulator power table. tpc is minimum of all 3</div><div class='add'>+	 */</div><div class='add'>+	if (pream_bw &gt;= WMI_TPC_PREAM_EHT20 &amp;&amp; pream_bw &lt;= WMI_TPC_PREAM_EHT320) {</div><div class='add'>+		rate2 = tpc_stats-&gt;rates_array2.rate_array[eht_rate_idx];</div><div class='add'>+		if (is_mu)</div><div class='add'>+			rates = u32_get_bits(rate2, ATH12K_TPC_RATE_ARRAY_MU);</div><div class='add'>+		else</div><div class='add'>+			rates = u32_get_bits(rate2, ATH12K_TPC_RATE_ARRAY_SU);</div><div class='add'>+	} else {</div><div class='add'>+		rate1 = tpc_stats-&gt;rates_array1.rate_array[rate_idx];</div><div class='add'>+		if (is_mu)</div><div class='add'>+			rates = u32_get_bits(rate1, ATH12K_TPC_RATE_ARRAY_MU);</div><div class='add'>+		else</div><div class='add'>+			rates = u32_get_bits(rate1, ATH12K_TPC_RATE_ARRAY_SU);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tpc_stats-&gt;tlvs_rcvd &amp; WMI_TPC_CTL_PWR_ARRAY) {</div><div class='add'>+		tot_nss = le32_to_cpu(tpc_stats-&gt;ctl_array.tpc_ctl_pwr.d1);</div><div class='add'>+		tot_modes = le32_to_cpu(tpc_stats-&gt;ctl_array.tpc_ctl_pwr.d2);</div><div class='add'>+		txbf_on_off = le32_to_cpu(tpc_stats-&gt;ctl_array.tpc_ctl_pwr.d3);</div><div class='add'>+		index_offset1 = txbf_on_off * tot_modes * tot_nss;</div><div class='add'>+		index_offset2 = tot_modes * tot_nss;</div><div class='add'>+		index_offset3 = tot_nss;</div><div class='add'>+</div><div class='add'>+		tpc_ctl = *(tpc_stats-&gt;ctl_array.ctl_pwr_table +</div><div class='add'>+			    chain_idx * index_offset1 + txbf_enabled * index_offset2</div><div class='add'>+			    + mode * index_offset3 + stm_idx);</div><div class='add'>+	} else {</div><div class='add'>+		tpc_ctl = TPC_MAX;</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "ctl array for tpc stats not received from fw\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rates_ctl_min = min_t(s16, rates, tpc_ctl);</div><div class='add'>+</div><div class='add'>+	reg_pwr = tpc_stats-&gt;max_reg_allowed_power.reg_pwr_array[chain_idx];</div><div class='add'>+</div><div class='add'>+	if (reg_pwr &lt; 0)</div><div class='add'>+		reg_pwr = TPC_INVAL;</div><div class='add'>+</div><div class='add'>+	tpc = min_t(s16, rates_ctl_min, reg_pwr);</div><div class='add'>+</div><div class='add'>+	/* MODULATION_LIMIT is the maximum power limit,tpc should not exceed</div><div class='add'>+	 * modulation limit even if min tpc of all three array is greater</div><div class='add'>+	 * modulation limit</div><div class='add'>+	 */</div><div class='add'>+	tpc = min_t(s16, tpc, MODULATION_LIMIT);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return tpc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath12k_get_ratecode(u16 pream_idx, u16 nss, u16 mcs_rate)</div><div class='add'>+{</div><div class='add'>+	u16 mode_type = ~0;</div><div class='add'>+</div><div class='add'>+	/* Below assignments are just for printing purpose only */</div><div class='add'>+	switch (pream_idx) {</div><div class='add'>+	case WMI_TPC_PREAM_CCK:</div><div class='add'>+		mode_type = WMI_RATE_PREAMBLE_CCK;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TPC_PREAM_OFDM:</div><div class='add'>+		mode_type = WMI_RATE_PREAMBLE_OFDM;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TPC_PREAM_HT20:</div><div class='add'>+	case WMI_TPC_PREAM_HT40:</div><div class='add'>+		mode_type = WMI_RATE_PREAMBLE_HT;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TPC_PREAM_VHT20:</div><div class='add'>+	case WMI_TPC_PREAM_VHT40:</div><div class='add'>+	case WMI_TPC_PREAM_VHT80:</div><div class='add'>+	case WMI_TPC_PREAM_VHT160:</div><div class='add'>+		mode_type = WMI_RATE_PREAMBLE_VHT;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TPC_PREAM_HE20:</div><div class='add'>+	case WMI_TPC_PREAM_HE40:</div><div class='add'>+	case WMI_TPC_PREAM_HE80:</div><div class='add'>+	case WMI_TPC_PREAM_HE160:</div><div class='add'>+		mode_type = WMI_RATE_PREAMBLE_HE;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TPC_PREAM_EHT20:</div><div class='add'>+	case WMI_TPC_PREAM_EHT40:</div><div class='add'>+	case WMI_TPC_PREAM_EHT60:</div><div class='add'>+	case WMI_TPC_PREAM_EHT80:</div><div class='add'>+	case WMI_TPC_PREAM_EHT120:</div><div class='add'>+	case WMI_TPC_PREAM_EHT140:</div><div class='add'>+	case WMI_TPC_PREAM_EHT160:</div><div class='add'>+	case WMI_TPC_PREAM_EHT200:</div><div class='add'>+	case WMI_TPC_PREAM_EHT240:</div><div class='add'>+	case WMI_TPC_PREAM_EHT280:</div><div class='add'>+	case WMI_TPC_PREAM_EHT320:</div><div class='add'>+		mode_type = WMI_RATE_PREAMBLE_EHT;</div><div class='add'>+		if (mcs_rate == 0 || mcs_rate == 1)</div><div class='add'>+			mcs_rate += 14;</div><div class='add'>+		else</div><div class='add'>+			mcs_rate -= 2;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return mode_type;</div><div class='add'>+	}</div><div class='add'>+	return ((mode_type &lt;&lt; 8) | ((nss &amp; 0x7) &lt;&lt; 5) | (mcs_rate &amp; 0x1F));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_he_supports_extra_mcs(struct ath12k *ar, int freq)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pdev_cap *cap = &amp;ar-&gt;pdev-&gt;cap;</div><div class='add'>+	struct ath12k_band_cap *cap_band;</div><div class='add'>+	bool extra_mcs_supported;</div><div class='add'>+</div><div class='add'>+	if (freq &lt;= ATH12K_2GHZ_MAX_FREQUENCY)</div><div class='add'>+		cap_band = &amp;cap-&gt;band[NL80211_BAND_2GHZ];</div><div class='add'>+	else if (freq &lt;= ATH12K_5GHZ_MAX_FREQUENCY)</div><div class='add'>+		cap_band = &amp;cap-&gt;band[NL80211_BAND_5GHZ];</div><div class='add'>+	else</div><div class='add'>+		cap_band = &amp;cap-&gt;band[NL80211_BAND_6GHZ];</div><div class='add'>+</div><div class='add'>+	extra_mcs_supported = u32_get_bits(cap_band-&gt;he_cap_info[1],</div><div class='add'>+					   HE_EXTRA_MCS_SUPPORT);</div><div class='add'>+	return extra_mcs_supported;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_tpc_fill_pream(struct ath12k *ar, char *buf, int buf_len, int len,</div><div class='add'>+				 enum wmi_tpc_pream_bw pream_bw, u32 max_rix,</div><div class='add'>+				 int max_nss, int max_rates, int pream_type,</div><div class='add'>+				 enum wmi_halphy_ctrl_path_stats_id tpc_type,</div><div class='add'>+				 int rate_idx, int eht_rate_idx)</div><div class='add'>+{</div><div class='add'>+	struct wmi_tpc_stats_arg *tpc_stats = ar-&gt;debug.tpc_stats;</div><div class='add'>+	int nss, rates, chains;</div><div class='add'>+	u8 active_tx_chains;</div><div class='add'>+	u16 rate_code;</div><div class='add'>+	s16 tpc;</div><div class='add'>+</div><div class='add'>+	static const char *const pream_str[] = {</div><div class='add'>+		[WMI_TPC_PREAM_CCK]     = "CCK",</div><div class='add'>+		[WMI_TPC_PREAM_OFDM]    = "OFDM",</div><div class='add'>+		[WMI_TPC_PREAM_HT20]    = "HT20",</div><div class='add'>+		[WMI_TPC_PREAM_HT40]    = "HT40",</div><div class='add'>+		[WMI_TPC_PREAM_VHT20]   = "VHT20",</div><div class='add'>+		[WMI_TPC_PREAM_VHT40]   = "VHT40",</div><div class='add'>+		[WMI_TPC_PREAM_VHT80]   = "VHT80",</div><div class='add'>+		[WMI_TPC_PREAM_VHT160]  = "VHT160",</div><div class='add'>+		[WMI_TPC_PREAM_HE20]    = "HE20",</div><div class='add'>+		[WMI_TPC_PREAM_HE40]    = "HE40",</div><div class='add'>+		[WMI_TPC_PREAM_HE80]    = "HE80",</div><div class='add'>+		[WMI_TPC_PREAM_HE160]   = "HE160",</div><div class='add'>+		[WMI_TPC_PREAM_EHT20]   = "EHT20",</div><div class='add'>+		[WMI_TPC_PREAM_EHT40]   = "EHT40",</div><div class='add'>+		[WMI_TPC_PREAM_EHT60]   = "EHT60",</div><div class='add'>+		[WMI_TPC_PREAM_EHT80]   = "EHT80",</div><div class='add'>+		[WMI_TPC_PREAM_EHT120]   = "EHT120",</div><div class='add'>+		[WMI_TPC_PREAM_EHT140]   = "EHT140",</div><div class='add'>+		[WMI_TPC_PREAM_EHT160]   = "EHT160",</div><div class='add'>+		[WMI_TPC_PREAM_EHT200]   = "EHT200",</div><div class='add'>+		[WMI_TPC_PREAM_EHT240]   = "EHT240",</div><div class='add'>+		[WMI_TPC_PREAM_EHT280]   = "EHT280",</div><div class='add'>+		[WMI_TPC_PREAM_EHT320]   = "EHT320"};</div><div class='add'>+</div><div class='add'>+	active_tx_chains = ar-&gt;num_tx_chains;</div><div class='add'>+</div><div class='add'>+	for (nss = 0; nss &lt; max_nss; nss++) {</div><div class='add'>+		for (rates = 0; rates &lt; max_rates; rates++, rate_idx++, max_rix++) {</div><div class='add'>+			/* FW send extra MCS(10&amp;11) for VHT and HE rates,</div><div class='add'>+			 *  this is not used. Hence skipping it here</div><div class='add'>+			 */</div><div class='add'>+			if (pream_type == WMI_RATE_PREAMBLE_VHT &amp;&amp;</div><div class='add'>+			    rates &gt; ATH12K_VHT_MCS_MAX)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (pream_type == WMI_RATE_PREAMBLE_HE &amp;&amp;</div><div class='add'>+			    rates &gt; ATH12K_HE_MCS_MAX)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (pream_type == WMI_RATE_PREAMBLE_EHT &amp;&amp;</div><div class='add'>+			    rates &gt; ATH12K_EHT_MCS_MAX)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			rate_code = ath12k_get_ratecode(pream_bw, nss, rates);</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "%d\t %s\t 0x%03x\t", max_rix,</div><div class='add'>+					 pream_str[pream_bw], rate_code);</div><div class='add'>+</div><div class='add'>+			for (chains = 0; chains &lt; active_tx_chains; chains++) {</div><div class='add'>+				if (nss &gt; chains) {</div><div class='add'>+					len += scnprintf(buf + len,</div><div class='add'>+							 buf_len - len,</div><div class='add'>+							 "\t%s", "NA");</div><div class='add'>+				} else {</div><div class='add'>+					tpc = ath12k_tpc_get_rate(ar, tpc_stats,</div><div class='add'>+								  rate_idx, chains + 1,</div><div class='add'>+								  rate_code, pream_bw,</div><div class='add'>+								  tpc_type,</div><div class='add'>+								  eht_rate_idx);</div><div class='add'>+</div><div class='add'>+					if (tpc == TPC_INVAL) {</div><div class='add'>+						len += scnprintf(buf + len,</div><div class='add'>+								 buf_len - len, "\tNA");</div><div class='add'>+					} else {</div><div class='add'>+						len += scnprintf(buf + len,</div><div class='add'>+								 buf_len - len, "\t%d",</div><div class='add'>+								 tpc);</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+			if (pream_type == WMI_RATE_PREAMBLE_EHT)</div><div class='add'>+				/*For fetching the next eht rates pwr from rates array2*/</div><div class='add'>+				++eht_rate_idx;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_tpc_stats_print(struct ath12k *ar,</div><div class='add'>+				  struct wmi_tpc_stats_arg *tpc_stats,</div><div class='add'>+				  char *buf, size_t len,</div><div class='add'>+				  enum wmi_halphy_ctrl_path_stats_id type)</div><div class='add'>+{</div><div class='add'>+	u32 eht_idx = 0, pream_idx = 0, rate_pream_idx = 0, total_rates = 0, max_rix = 0;</div><div class='add'>+	u32 chan_freq, num_tx_chain, caps, i, j = 1;</div><div class='add'>+	size_t buf_len = ATH12K_TPC_STATS_BUF_SIZE;</div><div class='add'>+	u8 nss, active_tx_chains;</div><div class='add'>+	bool he_ext_mcs;</div><div class='add'>+	static const char *const type_str[WMI_HALPHY_PDEV_TX_STATS_MAX] = {</div><div class='add'>+		[WMI_HALPHY_PDEV_TX_SU_STATS]		= "SU",</div><div class='add'>+		[WMI_HALPHY_PDEV_TX_SUTXBF_STATS]	= "SU WITH TXBF",</div><div class='add'>+		[WMI_HALPHY_PDEV_TX_MU_STATS]		= "MU",</div><div class='add'>+		[WMI_HALPHY_PDEV_TX_MUTXBF_STATS]	= "MU WITH TXBF"};</div><div class='add'>+</div><div class='add'>+	u8 max_rates[WMI_TPC_PREAM_MAX] = {</div><div class='add'>+		[WMI_TPC_PREAM_CCK]     = ATH12K_CCK_RATES,</div><div class='add'>+		[WMI_TPC_PREAM_OFDM]    = ATH12K_OFDM_RATES,</div><div class='add'>+		[WMI_TPC_PREAM_HT20]    = ATH12K_HT_RATES,</div><div class='add'>+		[WMI_TPC_PREAM_HT40]    = ATH12K_HT_RATES,</div><div class='add'>+		[WMI_TPC_PREAM_VHT20]   = ATH12K_VHT_RATES,</div><div class='add'>+		[WMI_TPC_PREAM_VHT40]   = ATH12K_VHT_RATES,</div><div class='add'>+		[WMI_TPC_PREAM_VHT80]   = ATH12K_VHT_RATES,</div><div class='add'>+		[WMI_TPC_PREAM_VHT160]  = ATH12K_VHT_RATES,</div><div class='add'>+		[WMI_TPC_PREAM_HE20]    = ATH12K_HE_RATES,</div><div class='add'>+		[WMI_TPC_PREAM_HE40]    = ATH12K_HE_RATES,</div><div class='add'>+		[WMI_TPC_PREAM_HE80]    = ATH12K_HE_RATES,</div><div class='add'>+		[WMI_TPC_PREAM_HE160]   = ATH12K_HE_RATES,</div><div class='add'>+		[WMI_TPC_PREAM_EHT20]   = ATH12K_EHT_RATES,</div><div class='add'>+		[WMI_TPC_PREAM_EHT40]   = ATH12K_EHT_RATES,</div><div class='add'>+		[WMI_TPC_PREAM_EHT60]   = ATH12K_EHT_RATES,</div><div class='add'>+		[WMI_TPC_PREAM_EHT80]   = ATH12K_EHT_RATES,</div><div class='add'>+		[WMI_TPC_PREAM_EHT120]  = ATH12K_EHT_RATES,</div><div class='add'>+		[WMI_TPC_PREAM_EHT140]  = ATH12K_EHT_RATES,</div><div class='add'>+		[WMI_TPC_PREAM_EHT160]  = ATH12K_EHT_RATES,</div><div class='add'>+		[WMI_TPC_PREAM_EHT200]  = ATH12K_EHT_RATES,</div><div class='add'>+		[WMI_TPC_PREAM_EHT240]  = ATH12K_EHT_RATES,</div><div class='add'>+		[WMI_TPC_PREAM_EHT280]  = ATH12K_EHT_RATES,</div><div class='add'>+		[WMI_TPC_PREAM_EHT320]  = ATH12K_EHT_RATES};</div><div class='add'>+	static const u8 max_nss[WMI_TPC_PREAM_MAX] = {</div><div class='add'>+		[WMI_TPC_PREAM_CCK]     = ATH12K_NSS_1,</div><div class='add'>+		[WMI_TPC_PREAM_OFDM]    = ATH12K_NSS_1,</div><div class='add'>+		[WMI_TPC_PREAM_HT20]    = ATH12K_NSS_4,</div><div class='add'>+		[WMI_TPC_PREAM_HT40]    = ATH12K_NSS_4,</div><div class='add'>+		[WMI_TPC_PREAM_VHT20]   = ATH12K_NSS_8,</div><div class='add'>+		[WMI_TPC_PREAM_VHT40]   = ATH12K_NSS_8,</div><div class='add'>+		[WMI_TPC_PREAM_VHT80]   = ATH12K_NSS_8,</div><div class='add'>+		[WMI_TPC_PREAM_VHT160]  = ATH12K_NSS_4,</div><div class='add'>+		[WMI_TPC_PREAM_HE20]    = ATH12K_NSS_8,</div><div class='add'>+		[WMI_TPC_PREAM_HE40]    = ATH12K_NSS_8,</div><div class='add'>+		[WMI_TPC_PREAM_HE80]    = ATH12K_NSS_8,</div><div class='add'>+		[WMI_TPC_PREAM_HE160]   = ATH12K_NSS_4,</div><div class='add'>+		[WMI_TPC_PREAM_EHT20]   = ATH12K_NSS_4,</div><div class='add'>+		[WMI_TPC_PREAM_EHT40]   = ATH12K_NSS_4,</div><div class='add'>+		[WMI_TPC_PREAM_EHT60]   = ATH12K_NSS_4,</div><div class='add'>+		[WMI_TPC_PREAM_EHT80]   = ATH12K_NSS_4,</div><div class='add'>+		[WMI_TPC_PREAM_EHT120]  = ATH12K_NSS_4,</div><div class='add'>+		[WMI_TPC_PREAM_EHT140]  = ATH12K_NSS_4,</div><div class='add'>+		[WMI_TPC_PREAM_EHT160]  = ATH12K_NSS_4,</div><div class='add'>+		[WMI_TPC_PREAM_EHT200]  = ATH12K_NSS_4,</div><div class='add'>+		[WMI_TPC_PREAM_EHT240]  = ATH12K_NSS_4,</div><div class='add'>+		[WMI_TPC_PREAM_EHT280]  = ATH12K_NSS_4,</div><div class='add'>+		[WMI_TPC_PREAM_EHT320]  = ATH12K_NSS_4};</div><div class='add'>+</div><div class='add'>+	u16 rate_idx[WMI_TPC_PREAM_MAX] = {}, eht_rate_idx[WMI_TPC_PREAM_MAX] = {};</div><div class='add'>+	static const u8 pream_type[WMI_TPC_PREAM_MAX] = {</div><div class='add'>+		[WMI_TPC_PREAM_CCK]     = WMI_RATE_PREAMBLE_CCK,</div><div class='add'>+		[WMI_TPC_PREAM_OFDM]    = WMI_RATE_PREAMBLE_OFDM,</div><div class='add'>+		[WMI_TPC_PREAM_HT20]    = WMI_RATE_PREAMBLE_HT,</div><div class='add'>+		[WMI_TPC_PREAM_HT40]    = WMI_RATE_PREAMBLE_HT,</div><div class='add'>+		[WMI_TPC_PREAM_VHT20]   = WMI_RATE_PREAMBLE_VHT,</div><div class='add'>+		[WMI_TPC_PREAM_VHT40]   = WMI_RATE_PREAMBLE_VHT,</div><div class='add'>+		[WMI_TPC_PREAM_VHT80]   = WMI_RATE_PREAMBLE_VHT,</div><div class='add'>+		[WMI_TPC_PREAM_VHT160]  = WMI_RATE_PREAMBLE_VHT,</div><div class='add'>+		[WMI_TPC_PREAM_HE20]    = WMI_RATE_PREAMBLE_HE,</div><div class='add'>+		[WMI_TPC_PREAM_HE40]    = WMI_RATE_PREAMBLE_HE,</div><div class='add'>+		[WMI_TPC_PREAM_HE80]    = WMI_RATE_PREAMBLE_HE,</div><div class='add'>+		[WMI_TPC_PREAM_HE160]   = WMI_RATE_PREAMBLE_HE,</div><div class='add'>+		[WMI_TPC_PREAM_EHT20]   = WMI_RATE_PREAMBLE_EHT,</div><div class='add'>+		[WMI_TPC_PREAM_EHT40]   = WMI_RATE_PREAMBLE_EHT,</div><div class='add'>+		[WMI_TPC_PREAM_EHT60]   = WMI_RATE_PREAMBLE_EHT,</div><div class='add'>+		[WMI_TPC_PREAM_EHT80]   = WMI_RATE_PREAMBLE_EHT,</div><div class='add'>+		[WMI_TPC_PREAM_EHT120]  = WMI_RATE_PREAMBLE_EHT,</div><div class='add'>+		[WMI_TPC_PREAM_EHT140]  = WMI_RATE_PREAMBLE_EHT,</div><div class='add'>+		[WMI_TPC_PREAM_EHT160]  = WMI_RATE_PREAMBLE_EHT,</div><div class='add'>+		[WMI_TPC_PREAM_EHT200]  = WMI_RATE_PREAMBLE_EHT,</div><div class='add'>+		[WMI_TPC_PREAM_EHT240]  = WMI_RATE_PREAMBLE_EHT,</div><div class='add'>+		[WMI_TPC_PREAM_EHT280]  = WMI_RATE_PREAMBLE_EHT,</div><div class='add'>+		[WMI_TPC_PREAM_EHT320]  = WMI_RATE_PREAMBLE_EHT};</div><div class='add'>+</div><div class='add'>+	chan_freq = le32_to_cpu(tpc_stats-&gt;tpc_config.chan_freq);</div><div class='add'>+	num_tx_chain = le32_to_cpu(tpc_stats-&gt;tpc_config.num_tx_chain);</div><div class='add'>+	caps = le32_to_cpu(tpc_stats-&gt;tpc_config.caps);</div><div class='add'>+</div><div class='add'>+	active_tx_chains = ar-&gt;num_tx_chains;</div><div class='add'>+	he_ext_mcs = ath12k_he_supports_extra_mcs(ar, chan_freq);</div><div class='add'>+</div><div class='add'>+	/* mcs 12&amp;13 is sent by FW for certain HWs in rate array, skipping it as</div><div class='add'>+	 * it is not supported</div><div class='add'>+	 */</div><div class='add'>+	if (he_ext_mcs) {</div><div class='add'>+		for (i = WMI_TPC_PREAM_HE20; i &lt;= WMI_TPC_PREAM_HE160; ++i)</div><div class='add'>+			max_rates[i] = ATH12K_HE_RATES;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (type == WMI_HALPHY_PDEV_TX_MU_STATS ||</div><div class='add'>+	    type == WMI_HALPHY_PDEV_TX_MUTXBF_STATS) {</div><div class='add'>+		pream_idx = WMI_TPC_PREAM_VHT20;</div><div class='add'>+</div><div class='add'>+		for (i = WMI_TPC_PREAM_CCK; i &lt;= WMI_TPC_PREAM_HT40; ++i)</div><div class='add'>+			max_rix += max_nss[i] * max_rates[i];</div><div class='add'>+	}</div><div class='add'>+	/* Enumerate all the rate indices */</div><div class='add'>+	for (i = rate_pream_idx + 1; i &lt; WMI_TPC_PREAM_MAX; i++) {</div><div class='add'>+		nss = (max_nss[i - 1] &lt; num_tx_chain ?</div><div class='add'>+		       max_nss[i - 1] : num_tx_chain);</div><div class='add'>+</div><div class='add'>+		rate_idx[i] = rate_idx[i - 1] + max_rates[i - 1] * nss;</div><div class='add'>+</div><div class='add'>+		if (pream_type[i] == WMI_RATE_PREAMBLE_EHT) {</div><div class='add'>+			eht_rate_idx[j] = eht_rate_idx[j - 1] + max_rates[i] * nss;</div><div class='add'>+			++j;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WMI_TPC_PREAM_MAX; i++) {</div><div class='add'>+		nss = (max_nss[i] &lt; num_tx_chain ?</div><div class='add'>+		       max_nss[i] : num_tx_chain);</div><div class='add'>+		total_rates += max_rates[i] * nss;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "No.of rates-%d\n", total_rates);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "**************** %s ****************\n",</div><div class='add'>+			 type_str[type]);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "\t\t\t\tTPC values for Active chains\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "Rate idx Preamble Rate code");</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt;= active_tx_chains; ++i) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "\t%d-Chain", i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+	for (i = pream_idx; i &lt; WMI_TPC_PREAM_MAX; i++) {</div><div class='add'>+		if (chan_freq &lt;= 2483) {</div><div class='add'>+			if (i == WMI_TPC_PREAM_VHT80 ||</div><div class='add'>+			    i == WMI_TPC_PREAM_VHT160 ||</div><div class='add'>+			    i == WMI_TPC_PREAM_HE80 ||</div><div class='add'>+			    i == WMI_TPC_PREAM_HE160 ||</div><div class='add'>+			    (i &gt;= WMI_TPC_PREAM_EHT60 &amp;&amp;</div><div class='add'>+			     i &lt;= WMI_TPC_PREAM_EHT320)) {</div><div class='add'>+				max_rix += max_nss[i] * max_rates[i];</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (i == WMI_TPC_PREAM_CCK) {</div><div class='add'>+				max_rix += max_rates[i];</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nss = (max_nss[i] &lt; ar-&gt;num_tx_chains ? max_nss[i] : ar-&gt;num_tx_chains);</div><div class='add'>+</div><div class='add'>+		if (!(caps &amp;</div><div class='add'>+		    (1 &lt;&lt; ATH12K_TPC_STATS_SUPPORT_BE_PUNC))) {</div><div class='add'>+			if (i == WMI_TPC_PREAM_EHT60 || i == WMI_TPC_PREAM_EHT120 ||</div><div class='add'>+			    i == WMI_TPC_PREAM_EHT140 || i == WMI_TPC_PREAM_EHT200 ||</div><div class='add'>+			    i == WMI_TPC_PREAM_EHT240 || i == WMI_TPC_PREAM_EHT280) {</div><div class='add'>+				max_rix += max_nss[i] * max_rates[i];</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		len = ath12k_tpc_fill_pream(ar, buf, buf_len, len, i, max_rix, nss,</div><div class='add'>+					    max_rates[i], pream_type[i],</div><div class='add'>+					    type, rate_idx[i], eht_rate_idx[eht_idx]);</div><div class='add'>+</div><div class='add'>+		if (pream_type[i] == WMI_RATE_PREAMBLE_EHT)</div><div class='add'>+			/*For fetch the next index eht rates from rates array2*/</div><div class='add'>+			++eht_idx;</div><div class='add'>+</div><div class='add'>+		max_rix += max_nss[i] * max_rates[i];</div><div class='add'>+	}</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_tpc_stats_fill(struct ath12k *ar,</div><div class='add'>+				  struct wmi_tpc_stats_arg *tpc_stats,</div><div class='add'>+				  char *buf)</div><div class='add'>+{</div><div class='add'>+	size_t buf_len = ATH12K_TPC_STATS_BUF_SIZE;</div><div class='add'>+	struct wmi_tpc_config_params *tpc;</div><div class='add'>+	size_t len = 0;</div><div class='add'>+</div><div class='add'>+	if (!tpc_stats) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to find tpc stats\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	tpc = &amp;tpc_stats-&gt;tpc_config;</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "*************** TPC config **************\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "* powers are in 0.25 dBm steps\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "reg domain-%d\t\tchan freq-%d\n",</div><div class='add'>+			 tpc-&gt;reg_domain, tpc-&gt;chan_freq);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "power limit-%d\t\tmax reg-domain Power-%d\n",</div><div class='add'>+			 le32_to_cpu(tpc-&gt;twice_max_reg_power) / 2, tpc-&gt;power_limit);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "No.of tx chain-%d\t",</div><div class='add'>+			 ar-&gt;num_tx_chains);</div><div class='add'>+</div><div class='add'>+	ath12k_tpc_stats_print(ar, tpc_stats, buf, len,</div><div class='add'>+			       ar-&gt;debug.tpc_stats_type);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_open_tpc_stats(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = inode-&gt;i_private;</div><div class='add'>+	struct ath12k_hw *ah = ath12k_ar_to_ah(ar);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	guard(wiphy)(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;state != ATH12K_HW_STATE_ON) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "Interface not up\n");</div><div class='add'>+		return -ENETDOWN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	void *buf __free(kfree) = kzalloc(ATH12K_TPC_STATS_BUF_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_debug_tpc_stats_request(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to request tpc stats: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!wait_for_completion_timeout(&amp;ar-&gt;debug.tpc_complete, TPC_STATS_WAIT_TIME)) {</div><div class='add'>+		spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		ath12k_wmi_free_tpc_stats_mem(ar);</div><div class='add'>+		ar-&gt;debug.tpc_request = false;</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_tpc_stats_fill(ar, ar-&gt;debug.tpc_stats, buf);</div><div class='add'>+	file-&gt;private_data = no_free_ptr(buf);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	ath12k_wmi_free_tpc_stats_mem(ar);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath12k_read_tpc_stats(struct file *file,</div><div class='add'>+				     char __user *user_buf,</div><div class='add'>+				     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	const char *buf = file-&gt;private_data;</div><div class='add'>+	size_t len = strlen(buf);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_release_tpc_stats(struct inode *inode,</div><div class='add'>+				    struct file *file)</div><div class='add'>+{</div><div class='add'>+	kfree(file-&gt;private_data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_tpc_stats = {</div><div class='add'>+	.open = ath12k_open_tpc_stats,</div><div class='add'>+	.release = ath12k_release_tpc_stats,</div><div class='add'>+	.read = ath12k_read_tpc_stats,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_tpc_stats_type = {</div><div class='add'>+	.write = ath12k_write_tpc_stats_type,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t ath12k_write_extd_rx_stats(struct file *file,</div><div class='add'>+					  const char __user *ubuf,</div><div class='add'>+					  size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = file-&gt;private_data;</div><div class='add'>+	struct htt_rx_ring_tlv_filter tlv_filter = {};</div><div class='add'>+	u32 ring_id, rx_filter = 0;</div><div class='add'>+	bool enable;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	if (kstrtobool_from_user(ubuf, count, &amp;enable))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	wiphy_lock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!ar-&gt;ab-&gt;hw_params-&gt;rxdma1_enable) {</div><div class='add'>+		ret = count;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;ah-&gt;state != ATH12K_HW_STATE_ON) {</div><div class='add'>+		ret = -ENETDOWN;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enable == ar-&gt;debug.extd_rx_stats) {</div><div class='add'>+		ret = count;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		rx_filter =  HTT_RX_FILTER_TLV_FLAGS_MPDU_START;</div><div class='add'>+		rx_filter |= HTT_RX_FILTER_TLV_FLAGS_PPDU_START;</div><div class='add'>+		rx_filter |= HTT_RX_FILTER_TLV_FLAGS_PPDU_END;</div><div class='add'>+		rx_filter |= HTT_RX_FILTER_TLV_FLAGS_PPDU_END_USER_STATS;</div><div class='add'>+		rx_filter |= HTT_RX_FILTER_TLV_FLAGS_PPDU_END_USER_STATS_EXT;</div><div class='add'>+		rx_filter |= HTT_RX_FILTER_TLV_FLAGS_PPDU_END_STATUS_DONE;</div><div class='add'>+		rx_filter |= HTT_RX_FILTER_TLV_FLAGS_PPDU_START_USER_INFO;</div><div class='add'>+</div><div class='add'>+		tlv_filter.rx_filter = rx_filter;</div><div class='add'>+		tlv_filter.pkt_filter_flags0 = HTT_RX_FP_MGMT_FILTER_FLAGS0;</div><div class='add'>+		tlv_filter.pkt_filter_flags1 = HTT_RX_FP_MGMT_FILTER_FLAGS1;</div><div class='add'>+		tlv_filter.pkt_filter_flags2 = HTT_RX_FP_CTRL_FILTER_FLASG2;</div><div class='add'>+		tlv_filter.pkt_filter_flags3 = HTT_RX_FP_CTRL_FILTER_FLASG3 |</div><div class='add'>+			HTT_RX_FP_DATA_FILTER_FLASG3;</div><div class='add'>+	} else {</div><div class='add'>+		tlv_filter = ath12k_mac_mon_status_filter_default;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;debug.rx_filter = tlv_filter.rx_filter;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ar-&gt;ab-&gt;hw_params-&gt;num_rxdma_per_pdev; i++) {</div><div class='add'>+		ring_id = ar-&gt;dp.rxdma_mon_dst_ring[i].ring_id;</div><div class='add'>+		ret = ath12k_dp_tx_htt_rx_filter_setup(ar-&gt;ab, ring_id, ar-&gt;dp.mac_id + i,</div><div class='add'>+						       HAL_RXDMA_MONITOR_DST,</div><div class='add'>+						       DP_RXDMA_REFILL_RING_SIZE,</div><div class='add'>+						       &amp;tlv_filter);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to set rx filter for monitor status ring\n");</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;debug.extd_rx_stats = !!enable;</div><div class='add'>+	ret = count;</div><div class='add'>+exit:</div><div class='add'>+	wiphy_unlock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath12k_read_extd_rx_stats(struct file *file,</div><div class='add'>+					 char __user *ubuf,</div><div class='add'>+					 size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = file-&gt;private_data;</div><div class='add'>+	char buf[32];</div><div class='add'>+	int len = 0;</div><div class='add'>+</div><div class='add'>+	wiphy_lock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+	len = scnprintf(buf, sizeof(buf) - len, "%d\n",</div><div class='add'>+			ar-&gt;debug.extd_rx_stats);</div><div class='add'>+	wiphy_unlock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(ubuf, count, ppos, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_extd_rx_stats = {</div><div class='add'>+	.read = ath12k_read_extd_rx_stats,</div><div class='add'>+	.write = ath12k_write_extd_rx_stats,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ath12k_open_link_stats(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = inode-&gt;i_private;</div><div class='add'>+	size_t len = 0, buf_len = (PAGE_SIZE * 2);</div><div class='add'>+	struct ath12k_link_stats linkstat;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	unsigned long links_map;</div><div class='add'>+	struct wiphy *wiphy;</div><div class='add'>+	int link_id, i;</div><div class='add'>+	char *buf;</div><div class='add'>+</div><div class='add'>+	if (!ahvif)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(buf_len, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	wiphy = ahvif-&gt;ah-&gt;hw-&gt;wiphy;</div><div class='add'>+	wiphy_lock(wiphy);</div><div class='add'>+</div><div class='add'>+	links_map = ahvif-&gt;links_map;</div><div class='add'>+	for_each_set_bit(link_id, &amp;links_map,</div><div class='add'>+			 IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		arvif = rcu_dereference_protected(ahvif-&gt;link[link_id],</div><div class='add'>+						  lockdep_is_held(&amp;wiphy-&gt;mtx));</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;arvif-&gt;link_stats_lock);</div><div class='add'>+		linkstat = arvif-&gt;link_stats;</div><div class='add'>+		spin_unlock_bh(&amp;arvif-&gt;link_stats_lock);</div><div class='add'>+</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "link[%d] Tx Unicast Frames Enqueued  = %d\n",</div><div class='add'>+				 link_id, linkstat.tx_enqueued);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "link[%d] Tx Broadcast Frames Enqueued = %d\n",</div><div class='add'>+				 link_id, linkstat.tx_bcast_mcast);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "link[%d] Tx Frames Completed = %d\n",</div><div class='add'>+				 link_id, linkstat.tx_completed);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "link[%d] Tx Frames Dropped = %d\n",</div><div class='add'>+				 link_id, linkstat.tx_dropped);</div><div class='add'>+</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "link[%d] Tx Frame descriptor Encap Type = ",</div><div class='add'>+				 link_id);</div><div class='add'>+</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 " raw:%d",</div><div class='add'>+					 linkstat.tx_encap_type[0]);</div><div class='add'>+</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 " native_wifi:%d",</div><div class='add'>+					 linkstat.tx_encap_type[1]);</div><div class='add'>+</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 " ethernet:%d",</div><div class='add'>+					 linkstat.tx_encap_type[2]);</div><div class='add'>+</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "\nlink[%d] Tx Frame descriptor Encrypt Type = ",</div><div class='add'>+				 link_id);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; HAL_ENCRYPT_TYPE_MAX; i++) {</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 " %d:%d", i,</div><div class='add'>+					 linkstat.tx_encrypt_type[i]);</div><div class='add'>+		}</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "\nlink[%d] Tx Frame descriptor Type = buffer:%d extension:%d\n",</div><div class='add'>+				 link_id, linkstat.tx_desc_type[0],</div><div class='add'>+				 linkstat.tx_desc_type[1]);</div><div class='add'>+</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				"------------------------------------------------------\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wiphy_unlock(wiphy);</div><div class='add'>+</div><div class='add'>+	file-&gt;private_data = buf;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_release_link_stats(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	kfree(file-&gt;private_data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath12k_read_link_stats(struct file *file,</div><div class='add'>+				      char __user *user_buf,</div><div class='add'>+				      size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	const char *buf = file-&gt;private_data;</div><div class='add'>+	size_t len = strlen(buf);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations ath12k_fops_link_stats = {</div><div class='add'>+	.open = ath12k_open_link_stats,</div><div class='add'>+	.release = ath12k_release_link_stats,</div><div class='add'>+	.read = ath12k_read_link_stats,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath12k_debugfs_op_vif_add(struct ieee80211_hw *hw,</div><div class='add'>+			       struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("link_stats", 0400, vif-&gt;debugfs_dir, ahvif,</div><div class='add'>+			    &amp;ath12k_fops_link_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath12k_debugfs_dump_device_dp_stats(struct file *file,</div><div class='add'>+						   char __user *user_buf,</div><div class='add'>+						   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = file-&gt;private_data;</div><div class='add'>+	struct ath12k_device_dp_stats *device_stats = &amp;ab-&gt;device_stats;</div><div class='add'>+	int len = 0, i, j, ret;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	const int size = 4096;</div><div class='add'>+	static const char *rxdma_err[HAL_REO_ENTR_RING_RXDMA_ECODE_MAX] = {</div><div class='add'>+		[HAL_REO_ENTR_RING_RXDMA_ECODE_OVERFLOW_ERR] = "Overflow",</div><div class='add'>+		[HAL_REO_ENTR_RING_RXDMA_ECODE_MPDU_LEN_ERR] = "MPDU len",</div><div class='add'>+		[HAL_REO_ENTR_RING_RXDMA_ECODE_FCS_ERR] = "FCS",</div><div class='add'>+		[HAL_REO_ENTR_RING_RXDMA_ECODE_DECRYPT_ERR] = "Decrypt",</div><div class='add'>+		[HAL_REO_ENTR_RING_RXDMA_ECODE_TKIP_MIC_ERR] = "TKIP MIC",</div><div class='add'>+		[HAL_REO_ENTR_RING_RXDMA_ECODE_UNECRYPTED_ERR] = "Unencrypt",</div><div class='add'>+		[HAL_REO_ENTR_RING_RXDMA_ECODE_MSDU_LEN_ERR] = "MSDU len",</div><div class='add'>+		[HAL_REO_ENTR_RING_RXDMA_ECODE_MSDU_LIMIT_ERR] = "MSDU limit",</div><div class='add'>+		[HAL_REO_ENTR_RING_RXDMA_ECODE_WIFI_PARSE_ERR] = "WiFi parse",</div><div class='add'>+		[HAL_REO_ENTR_RING_RXDMA_ECODE_AMSDU_PARSE_ERR] = "AMSDU parse",</div><div class='add'>+		[HAL_REO_ENTR_RING_RXDMA_ECODE_SA_TIMEOUT_ERR] = "SA timeout",</div><div class='add'>+		[HAL_REO_ENTR_RING_RXDMA_ECODE_DA_TIMEOUT_ERR] = "DA timeout",</div><div class='add'>+		[HAL_REO_ENTR_RING_RXDMA_ECODE_FLOW_TIMEOUT_ERR] = "Flow timeout",</div><div class='add'>+		[HAL_REO_ENTR_RING_RXDMA_ECODE_FLUSH_REQUEST_ERR] = "Flush req",</div><div class='add'>+		[HAL_REO_ENTR_RING_RXDMA_ECODE_AMSDU_FRAG_ERR] = "AMSDU frag",</div><div class='add'>+		[HAL_REO_ENTR_RING_RXDMA_ECODE_MULTICAST_ECHO_ERR] = "Multicast echo",</div><div class='add'>+		[HAL_REO_ENTR_RING_RXDMA_ECODE_AMSDU_MISMATCH_ERR] = "AMSDU mismatch",</div><div class='add'>+		[HAL_REO_ENTR_RING_RXDMA_ECODE_UNAUTH_WDS_ERR] = "Unauth WDS",</div><div class='add'>+		[HAL_REO_ENTR_RING_RXDMA_ECODE_GRPCAST_AMSDU_WDS_ERR] = "AMSDU or WDS"};</div><div class='add'>+</div><div class='add'>+	static const char *reo_err[HAL_REO_DEST_RING_ERROR_CODE_MAX] = {</div><div class='add'>+		[HAL_REO_DEST_RING_ERROR_CODE_DESC_ADDR_ZERO] = "Desc addr zero",</div><div class='add'>+		[HAL_REO_DEST_RING_ERROR_CODE_DESC_INVALID] = "Desc inval",</div><div class='add'>+		[HAL_REO_DEST_RING_ERROR_CODE_AMPDU_IN_NON_BA] =  "AMPDU in non BA",</div><div class='add'>+		[HAL_REO_DEST_RING_ERROR_CODE_NON_BA_DUPLICATE] = "Non BA dup",</div><div class='add'>+		[HAL_REO_DEST_RING_ERROR_CODE_BA_DUPLICATE] = "BA dup",</div><div class='add'>+		[HAL_REO_DEST_RING_ERROR_CODE_FRAME_2K_JUMP] = "Frame 2k jump",</div><div class='add'>+		[HAL_REO_DEST_RING_ERROR_CODE_BAR_2K_JUMP] = "BAR 2k jump",</div><div class='add'>+		[HAL_REO_DEST_RING_ERROR_CODE_FRAME_OOR] = "Frame OOR",</div><div class='add'>+		[HAL_REO_DEST_RING_ERROR_CODE_BAR_OOR] = "BAR OOR",</div><div class='add'>+		[HAL_REO_DEST_RING_ERROR_CODE_NO_BA_SESSION] = "No BA session",</div><div class='add'>+		[HAL_REO_DEST_RING_ERROR_CODE_FRAME_SN_EQUALS_SSN] = "Frame SN equal SSN",</div><div class='add'>+		[HAL_REO_DEST_RING_ERROR_CODE_PN_CHECK_FAILED] = "PN check fail",</div><div class='add'>+		[HAL_REO_DEST_RING_ERROR_CODE_2K_ERR_FLAG_SET] = "2k err",</div><div class='add'>+		[HAL_REO_DEST_RING_ERROR_CODE_PN_ERR_FLAG_SET] = "PN err",</div><div class='add'>+		[HAL_REO_DEST_RING_ERROR_CODE_DESC_BLOCKED] = "Desc blocked"};</div><div class='add'>+</div><div class='add'>+	static const char *wbm_rel_src[HAL_WBM_REL_SRC_MODULE_MAX] = {</div><div class='add'>+		[HAL_WBM_REL_SRC_MODULE_TQM] = "TQM",</div><div class='add'>+		[HAL_WBM_REL_SRC_MODULE_RXDMA] = "Rxdma",</div><div class='add'>+		[HAL_WBM_REL_SRC_MODULE_REO] = "Reo",</div><div class='add'>+		[HAL_WBM_REL_SRC_MODULE_FW] = "FW",</div><div class='add'>+		[HAL_WBM_REL_SRC_MODULE_SW] = "SW"};</div><div class='add'>+</div><div class='add'>+	char *buf __free(kfree) = kzalloc(size, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "DEVICE RX STATS:\n\n");</div><div class='add'>+	len += scnprintf(buf + len, size - len, "err ring pkts: %u\n",</div><div class='add'>+			 device_stats-&gt;err_ring_pkts);</div><div class='add'>+	len += scnprintf(buf + len, size - len, "Invalid RBM: %u\n\n",</div><div class='add'>+			 device_stats-&gt;invalid_rbm);</div><div class='add'>+	len += scnprintf(buf + len, size - len, "RXDMA errors:\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HAL_REO_ENTR_RING_RXDMA_ECODE_MAX; i++)</div><div class='add'>+		len += scnprintf(buf + len, size - len, "%s: %u\n",</div><div class='add'>+				 rxdma_err[i], device_stats-&gt;rxdma_error[i]);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\nREO errors:\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HAL_REO_DEST_RING_ERROR_CODE_MAX; i++)</div><div class='add'>+		len += scnprintf(buf + len, size - len, "%s: %u\n",</div><div class='add'>+				 reo_err[i], device_stats-&gt;reo_error[i]);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\nHAL REO errors:\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DP_REO_DST_RING_MAX; i++)</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='add'>+				 "ring%d: %u\n", i,</div><div class='add'>+				 device_stats-&gt;hal_reo_error[i]);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\nDEVICE TX STATS:\n");</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\nTCL Ring Full Failures:\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DP_TCL_NUM_RING_MAX; i++)</div><div class='add'>+		len += scnprintf(buf + len, size - len, "ring%d: %u\n",</div><div class='add'>+				 i, device_stats-&gt;tx_err.desc_na[i]);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len,</div><div class='add'>+			 "\nMisc Transmit Failures: %d\n",</div><div class='add'>+			 atomic_read(&amp;device_stats-&gt;tx_err.misc_fail));</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\ntx_wbm_rel_source:");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HAL_WBM_REL_SRC_MODULE_MAX; i++)</div><div class='add'>+		len += scnprintf(buf + len, size - len, " %d:%u",</div><div class='add'>+				 i, device_stats-&gt;tx_wbm_rel_source[i]);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\ntqm_rel_reason:");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_TQM_RELEASE_REASON; i++)</div><div class='add'>+		len += scnprintf(buf + len, size - len, " %d:%u",</div><div class='add'>+				 i, device_stats-&gt;tqm_rel_reason[i]);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\nfw_tx_status:");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_FW_TX_STATUS; i++)</div><div class='add'>+		len += scnprintf(buf + len, size - len, " %d:%u",</div><div class='add'>+				 i, device_stats-&gt;fw_tx_status[i]);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\ntx_enqueued:");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DP_TCL_NUM_RING_MAX; i++)</div><div class='add'>+		len += scnprintf(buf + len, size - len, " %d:%u", i,</div><div class='add'>+				 device_stats-&gt;tx_enqueued[i]);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\ntx_completed:");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DP_TCL_NUM_RING_MAX; i++)</div><div class='add'>+		len += scnprintf(buf + len, size - len, " %d:%u",</div><div class='add'>+				 i, device_stats-&gt;tx_completed[i]);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		ar = ath12k_mac_get_ar_by_pdev_id(ab, DP_SW2HW_MACID(i));</div><div class='add'>+		if (ar) {</div><div class='add'>+			len += scnprintf(buf + len, size - len,</div><div class='add'>+					"\nradio%d tx_pending: %u\n", i,</div><div class='add'>+					atomic_read(&amp;ar-&gt;dp.num_tx_pending));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\nREO Rx Received:\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DP_REO_DST_RING_MAX; i++) {</div><div class='add'>+		len += scnprintf(buf + len, size - len, "Ring%d:", i + 1);</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; ATH12K_MAX_DEVICES; j++) {</div><div class='add'>+			len += scnprintf(buf + len, size - len,</div><div class='add'>+					"\t%d:%u", j,</div><div class='add'>+					 device_stats-&gt;reo_rx[i][j]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		len += scnprintf(buf + len, size - len, "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\nREO excep MSDU buf type:%u\n",</div><div class='add'>+			 device_stats-&gt;reo_excep_msdu_buf_type);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\nRx WBM REL SRC Errors:\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HAL_WBM_REL_SRC_MODULE_MAX; i++) {</div><div class='add'>+		len += scnprintf(buf + len, size - len, "%s:", wbm_rel_src[i]);</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; ATH12K_MAX_DEVICES; j++) {</div><div class='add'>+			len += scnprintf(buf + len,</div><div class='add'>+					 size - len,</div><div class='add'>+					 "\t%d:%u", j,</div><div class='add'>+					 device_stats-&gt;rx_wbm_rel_source[i][j]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		len += scnprintf(buf + len, size - len, "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_device_dp_stats = {</div><div class='add'>+	.read = ath12k_debugfs_dump_device_dp_stats,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath12k_debugfs_pdev_create(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	debugfs_create_file("simulate_fw_crash", 0600, ab-&gt;debugfs_soc, ab,</div><div class='add'>+			    &amp;fops_simulate_fw_crash);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("device_dp_stats", 0400, ab-&gt;debugfs_soc, ab,</div><div class='add'>+			    &amp;fops_device_dp_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_debugfs_soc_create(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	bool dput_needed;</div><div class='add'>+	char soc_name[64] = {};</div><div class='add'>+	struct dentry *debugfs_ath12k;</div><div class='add'>+</div><div class='add'>+	debugfs_ath12k = debugfs_lookup("ath12k", NULL);</div><div class='add'>+	if (debugfs_ath12k) {</div><div class='add'>+		/* a dentry from lookup() needs dput() after we don't use it */</div><div class='add'>+		dput_needed = true;</div><div class='add'>+	} else {</div><div class='add'>+		debugfs_ath12k = debugfs_create_dir("ath12k", NULL);</div><div class='add'>+		if (IS_ERR_OR_NULL(debugfs_ath12k))</div><div class='add'>+			return;</div><div class='add'>+		dput_needed = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	scnprintf(soc_name, sizeof(soc_name), "%s-%s", ath12k_bus_str(ab-&gt;hif.bus),</div><div class='add'>+		  dev_name(ab-&gt;dev));</div><div class='add'>+</div><div class='add'>+	ab-&gt;debugfs_soc = debugfs_create_dir(soc_name, debugfs_ath12k);</div><div class='add'>+</div><div class='add'>+	if (dput_needed)</div><div class='add'>+		dput(debugfs_ath12k);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_debugfs_soc_destroy(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	debugfs_remove_recursive(ab-&gt;debugfs_soc);</div><div class='add'>+	ab-&gt;debugfs_soc = NULL;</div><div class='add'>+	/* We are not removing ath12k directory on purpose, even if it</div><div class='add'>+	 * would be empty. This simplifies the directory handling and it's</div><div class='add'>+	 * a minor cosmetic issue to leave an empty ath12k directory to</div><div class='add'>+	 * debugfs.</div><div class='add'>+	 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_open_vdev_stats(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = inode-&gt;i_private;</div><div class='add'>+	struct ath12k_fw_stats_req_params param;</div><div class='add'>+	struct ath12k_hw *ah = ath12k_ar_to_ah(ar);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	guard(wiphy)(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!ah)</div><div class='add'>+		return -ENETDOWN;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;state != ATH12K_HW_STATE_ON)</div><div class='add'>+		return -ENETDOWN;</div><div class='add'>+</div><div class='add'>+	void *buf __free(kfree) = kzalloc(ATH12K_FW_STATS_BUF_SIZE, GFP_ATOMIC);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	param.pdev_id = ath12k_mac_get_target_pdev_id(ar);</div><div class='add'>+	/* VDEV stats is always sent for all active VDEVs from FW */</div><div class='add'>+	param.vdev_id = 0;</div><div class='add'>+	param.stats_id = WMI_REQUEST_VDEV_STAT;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_get_fw_stats(ar, &amp;param);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to request fw vdev stats: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_wmi_fw_stats_dump(ar, &amp;ar-&gt;fw_stats, param.stats_id,</div><div class='add'>+				 buf);</div><div class='add'>+	ath12k_fw_stats_reset(ar);</div><div class='add'>+</div><div class='add'>+	file-&gt;private_data = no_free_ptr(buf);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_release_vdev_stats(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	kfree(file-&gt;private_data);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath12k_read_vdev_stats(struct file *file,</div><div class='add'>+				      char __user *user_buf,</div><div class='add'>+				      size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	const char *buf = file-&gt;private_data;</div><div class='add'>+	size_t len = strlen(buf);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_vdev_stats = {</div><div class='add'>+	.open = ath12k_open_vdev_stats,</div><div class='add'>+	.release = ath12k_release_vdev_stats,</div><div class='add'>+	.read = ath12k_read_vdev_stats,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ath12k_open_bcn_stats(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = inode-&gt;i_private;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k_fw_stats_req_params param;</div><div class='add'>+	struct ath12k_hw *ah = ath12k_ar_to_ah(ar);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	guard(wiphy)(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (ah &amp;&amp; ah-&gt;state != ATH12K_HW_STATE_ON)</div><div class='add'>+		return -ENETDOWN;</div><div class='add'>+</div><div class='add'>+	void *buf __free(kfree) = kzalloc(ATH12K_FW_STATS_BUF_SIZE, GFP_ATOMIC);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	param.pdev_id = ath12k_mac_get_target_pdev_id(ar);</div><div class='add'>+	param.stats_id = WMI_REQUEST_BCN_STAT;</div><div class='add'>+</div><div class='add'>+	/* loop all active VDEVs for bcn stats */</div><div class='add'>+	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+		if (!arvif-&gt;is_up)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		param.vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+		ret = ath12k_mac_get_fw_stats(ar, &amp;param);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to request fw bcn stats: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_wmi_fw_stats_dump(ar, &amp;ar-&gt;fw_stats, param.stats_id,</div><div class='add'>+				 buf);</div><div class='add'>+	ath12k_fw_stats_reset(ar);</div><div class='add'>+</div><div class='add'>+	file-&gt;private_data = no_free_ptr(buf);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_release_bcn_stats(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	kfree(file-&gt;private_data);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath12k_read_bcn_stats(struct file *file,</div><div class='add'>+				     char __user *user_buf,</div><div class='add'>+				     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	const char *buf = file-&gt;private_data;</div><div class='add'>+	size_t len = strlen(buf);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_bcn_stats = {</div><div class='add'>+	.open = ath12k_open_bcn_stats,</div><div class='add'>+	.release = ath12k_release_bcn_stats,</div><div class='add'>+	.read = ath12k_read_bcn_stats,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ath12k_open_pdev_stats(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = inode-&gt;i_private;</div><div class='add'>+	struct ath12k_hw *ah = ath12k_ar_to_ah(ar);</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_fw_stats_req_params param;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	guard(wiphy)(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (ah &amp;&amp; ah-&gt;state != ATH12K_HW_STATE_ON)</div><div class='add'>+		return -ENETDOWN;</div><div class='add'>+</div><div class='add'>+	void *buf __free(kfree) = kzalloc(ATH12K_FW_STATS_BUF_SIZE, GFP_ATOMIC);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	param.pdev_id = ath12k_mac_get_target_pdev_id(ar);</div><div class='add'>+	param.vdev_id = 0;</div><div class='add'>+	param.stats_id = WMI_REQUEST_PDEV_STAT;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_get_fw_stats(ar, &amp;param);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to request fw pdev stats: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_wmi_fw_stats_dump(ar, &amp;ar-&gt;fw_stats, param.stats_id,</div><div class='add'>+				 buf);</div><div class='add'>+	ath12k_fw_stats_reset(ar);</div><div class='add'>+</div><div class='add'>+	file-&gt;private_data = no_free_ptr(buf);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_release_pdev_stats(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	kfree(file-&gt;private_data);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath12k_read_pdev_stats(struct file *file,</div><div class='add'>+				      char __user *user_buf,</div><div class='add'>+				      size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	const char *buf = file-&gt;private_data;</div><div class='add'>+	size_t len = strlen(buf);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_pdev_stats = {</div><div class='add'>+	.open = ath12k_open_pdev_stats,</div><div class='add'>+	.release = ath12k_release_pdev_stats,</div><div class='add'>+	.read = ath12k_read_pdev_stats,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void ath12k_debugfs_fw_stats_register(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct dentry *fwstats_dir = debugfs_create_dir("fw_stats",</div><div class='add'>+							ar-&gt;debug.debugfs_pdev);</div><div class='add'>+</div><div class='add'>+	/* all stats debugfs files created are under "fw_stats" directory</div><div class='add'>+	 * created per PDEV</div><div class='add'>+	 */</div><div class='add'>+	debugfs_create_file("vdev_stats", 0600, fwstats_dir, ar,</div><div class='add'>+			    &amp;fops_vdev_stats);</div><div class='add'>+	debugfs_create_file("beacon_stats", 0600, fwstats_dir, ar,</div><div class='add'>+			    &amp;fops_bcn_stats);</div><div class='add'>+	debugfs_create_file("pdev_stats", 0600, fwstats_dir, ar,</div><div class='add'>+			    &amp;fops_pdev_stats);</div><div class='add'>+</div><div class='add'>+	ath12k_fw_stats_init(ar);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_debugfs_register(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ieee80211_hw *hw = ar-&gt;ah-&gt;hw;</div><div class='add'>+	char pdev_name[5];</div><div class='add'>+	char buf[100] = {};</div><div class='add'>+</div><div class='add'>+	scnprintf(pdev_name, sizeof(pdev_name), "%s%d", "mac", ar-&gt;pdev_idx);</div><div class='add'>+</div><div class='add'>+	ar-&gt;debug.debugfs_pdev = debugfs_create_dir(pdev_name, ab-&gt;debugfs_soc);</div><div class='add'>+</div><div class='add'>+	/* Create a symlink under ieee80211/phy* */</div><div class='add'>+	scnprintf(buf, sizeof(buf), "../../ath12k/%pd2", ar-&gt;debug.debugfs_pdev);</div><div class='add'>+	ar-&gt;debug.debugfs_pdev_symlink = debugfs_create_symlink("ath12k",</div><div class='add'>+								hw-&gt;wiphy-&gt;debugfsdir,</div><div class='add'>+								buf);</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;mac.sbands[NL80211_BAND_5GHZ].channels) {</div><div class='add'>+		debugfs_create_file("dfs_simulate_radar", 0200,</div><div class='add'>+				    ar-&gt;debug.debugfs_pdev, ar,</div><div class='add'>+				    &amp;fops_simulate_radar);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("tpc_stats", 0400, ar-&gt;debug.debugfs_pdev, ar,</div><div class='add'>+			    &amp;fops_tpc_stats);</div><div class='add'>+	debugfs_create_file("tpc_stats_type", 0200, ar-&gt;debug.debugfs_pdev,</div><div class='add'>+			    ar, &amp;fops_tpc_stats_type);</div><div class='add'>+	init_completion(&amp;ar-&gt;debug.tpc_complete);</div><div class='add'>+</div><div class='add'>+	ath12k_debugfs_htt_stats_register(ar);</div><div class='add'>+	ath12k_debugfs_fw_stats_register(ar);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("ext_rx_stats", 0644,</div><div class='add'>+			    ar-&gt;debug.debugfs_pdev, ar,</div><div class='add'>+			    &amp;fops_extd_rx_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_debugfs_unregister(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	if (!ar-&gt;debug.debugfs_pdev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Remove symlink under ieee80211/phy* */</div><div class='add'>+	debugfs_remove(ar-&gt;debug.debugfs_pdev_symlink);</div><div class='add'>+	debugfs_remove_recursive(ar-&gt;debug.debugfs_pdev);</div><div class='add'>+	ar-&gt;debug.debugfs_pdev_symlink = NULL;</div><div class='add'>+	ar-&gt;debug.debugfs_pdev = NULL;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/debugfs.h b/drivers/net/wireless/ath/ath12k/debugfs.h<br/>new file mode 100644<br/>index 000000000000..21641a8a0346<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/debugfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/debugfs.h</a></div><div class='hunk'>@@ -0,0 +1,147 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ATH12K_DEBUGFS_H_</div><div class='add'>+#define _ATH12K_DEBUGFS_H_</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ATH12K_DEBUGFS</div><div class='add'>+void ath12k_debugfs_soc_create(struct ath12k_base *ab);</div><div class='add'>+void ath12k_debugfs_soc_destroy(struct ath12k_base *ab);</div><div class='add'>+void ath12k_debugfs_register(struct ath12k *ar);</div><div class='add'>+void ath12k_debugfs_unregister(struct ath12k *ar);</div><div class='add'>+void ath12k_debugfs_op_vif_add(struct ieee80211_hw *hw,</div><div class='add'>+			       struct ieee80211_vif *vif);</div><div class='add'>+void ath12k_debugfs_pdev_create(struct ath12k_base *ab);</div><div class='add'>+</div><div class='add'>+static inline bool ath12k_debugfs_is_extd_rx_stats_enabled(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	return ar-&gt;debug.extd_rx_stats;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath12k_debugfs_rx_filter(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	return ar-&gt;debug.rx_filter;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ATH12K_CCK_RATES			4</div><div class='add'>+#define ATH12K_OFDM_RATES			8</div><div class='add'>+#define ATH12K_HT_RATES				8</div><div class='add'>+#define ATH12K_VHT_RATES			12</div><div class='add'>+#define ATH12K_HE_RATES				12</div><div class='add'>+#define ATH12K_HE_RATES_WITH_EXTRA_MCS		14</div><div class='add'>+#define ATH12K_EHT_RATES			16</div><div class='add'>+#define HE_EXTRA_MCS_SUPPORT			GENMASK(31, 16)</div><div class='add'>+#define ATH12K_NSS_1				1</div><div class='add'>+#define ATH12K_NSS_4				4</div><div class='add'>+#define ATH12K_NSS_8				8</div><div class='add'>+#define ATH12K_HW_NSS(_rcode)			(((_rcode) &gt;&gt; 5) &amp; 0x7)</div><div class='add'>+#define TPC_STATS_WAIT_TIME			(1 * HZ)</div><div class='add'>+#define MAX_TPC_PREAM_STR_LEN			7</div><div class='add'>+#define TPC_INVAL				-128</div><div class='add'>+#define TPC_MAX					127</div><div class='add'>+#define TPC_STATS_WAIT_TIME			(1 * HZ)</div><div class='add'>+#define TPC_STATS_TOT_ROW			700</div><div class='add'>+#define TPC_STATS_TOT_COLUMN			100</div><div class='add'>+#define MODULATION_LIMIT			126</div><div class='add'>+</div><div class='add'>+#define ATH12K_TPC_STATS_BUF_SIZE	(TPC_STATS_TOT_ROW * TPC_STATS_TOT_COLUMN)</div><div class='add'>+</div><div class='add'>+enum wmi_tpc_pream_bw {</div><div class='add'>+	WMI_TPC_PREAM_CCK,</div><div class='add'>+	WMI_TPC_PREAM_OFDM,</div><div class='add'>+	WMI_TPC_PREAM_HT20,</div><div class='add'>+	WMI_TPC_PREAM_HT40,</div><div class='add'>+	WMI_TPC_PREAM_VHT20,</div><div class='add'>+	WMI_TPC_PREAM_VHT40,</div><div class='add'>+	WMI_TPC_PREAM_VHT80,</div><div class='add'>+	WMI_TPC_PREAM_VHT160,</div><div class='add'>+	WMI_TPC_PREAM_HE20,</div><div class='add'>+	WMI_TPC_PREAM_HE40,</div><div class='add'>+	WMI_TPC_PREAM_HE80,</div><div class='add'>+	WMI_TPC_PREAM_HE160,</div><div class='add'>+	WMI_TPC_PREAM_EHT20,</div><div class='add'>+	WMI_TPC_PREAM_EHT40,</div><div class='add'>+	WMI_TPC_PREAM_EHT60,</div><div class='add'>+	WMI_TPC_PREAM_EHT80,</div><div class='add'>+	WMI_TPC_PREAM_EHT120,</div><div class='add'>+	WMI_TPC_PREAM_EHT140,</div><div class='add'>+	WMI_TPC_PREAM_EHT160,</div><div class='add'>+	WMI_TPC_PREAM_EHT200,</div><div class='add'>+	WMI_TPC_PREAM_EHT240,</div><div class='add'>+	WMI_TPC_PREAM_EHT280,</div><div class='add'>+	WMI_TPC_PREAM_EHT320,</div><div class='add'>+	WMI_TPC_PREAM_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_debug_tpc_stats_ctl_mode {</div><div class='add'>+	ATH12K_TPC_STATS_CTL_MODE_LEGACY_5GHZ_6GHZ,</div><div class='add'>+	ATH12K_TPC_STATS_CTL_MODE_HT_VHT20_5GHZ_6GHZ,</div><div class='add'>+	ATH12K_TPC_STATS_CTL_MODE_HE_EHT20_5GHZ_6GHZ,</div><div class='add'>+	ATH12K_TPC_STATS_CTL_MODE_HT_VHT40_5GHZ_6GHZ,</div><div class='add'>+	ATH12K_TPC_STATS_CTL_MODE_HE_EHT40_5GHZ_6GHZ,</div><div class='add'>+	ATH12K_TPC_STATS_CTL_MODE_VHT80_5GHZ_6GHZ,</div><div class='add'>+	ATH12K_TPC_STATS_CTL_MODE_HE_EHT80_5GHZ_6GHZ,</div><div class='add'>+	ATH12K_TPC_STATS_CTL_MODE_VHT160_5GHZ_6GHZ,</div><div class='add'>+	ATH12K_TPC_STATS_CTL_MODE_HE_EHT160_5GHZ_6GHZ,</div><div class='add'>+	ATH12K_TPC_STATS_CTL_MODE_HE_EHT320_5GHZ_6GHZ,</div><div class='add'>+	ATH12K_TPC_STATS_CTL_MODE_CCK_2GHZ,</div><div class='add'>+	ATH12K_TPC_STATS_CTL_MODE_LEGACY_2GHZ,</div><div class='add'>+	ATH12K_TPC_STATS_CTL_MODE_HT20_2GHZ,</div><div class='add'>+	ATH12K_TPC_STATS_CTL_MODE_HT40_2GHZ,</div><div class='add'>+</div><div class='add'>+	ATH12K_TPC_STATS_CTL_MODE_EHT80_SU_PUNC20 = 23,</div><div class='add'>+	ATH12K_TPC_STATS_CTL_MODE_EHT160_SU_PUNC20,</div><div class='add'>+	ATH12K_TPC_STATS_CTL_MODE_EHT320_SU_PUNC40,</div><div class='add'>+	ATH12K_TPC_STATS_CTL_MODE_EHT320_SU_PUNC80,</div><div class='add'>+	ATH12K_TPC_STATS_CTL_MODE_EHT320_SU_PUNC120</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_debug_tpc_stats_support_modes {</div><div class='add'>+	ATH12K_TPC_STATS_SUPPORT_160 = 0,</div><div class='add'>+	ATH12K_TPC_STATS_SUPPORT_320,</div><div class='add'>+	ATH12K_TPC_STATS_SUPPORT_AX,</div><div class='add'>+	ATH12K_TPC_STATS_SUPPORT_AX_EXTRA_MCS,</div><div class='add'>+	ATH12K_TPC_STATS_SUPPORT_BE,</div><div class='add'>+	ATH12K_TPC_STATS_SUPPORT_BE_PUNC,</div><div class='add'>+};</div><div class='add'>+#else</div><div class='add'>+static inline void ath12k_debugfs_soc_create(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_debugfs_soc_destroy(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_debugfs_register(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_debugfs_unregister(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool ath12k_debugfs_is_extd_rx_stats_enabled(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath12k_debugfs_rx_filter(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_debugfs_op_vif_add(struct ieee80211_hw *hw,</div><div class='add'>+					     struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_debugfs_pdev_create(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_ATH12K_DEBUGFS */</div><div class='add'>+</div><div class='add'>+#endif /* _ATH12K_DEBUGFS_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c b/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c<br/>new file mode 100644<br/>index 000000000000..48b010a1b756<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c</a></div><div class='hunk'>@@ -0,0 +1,6178 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "debugfs_htt_stats.h"</div><div class='add'>+#include "dp_tx.h"</div><div class='add'>+#include "dp_rx.h"</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+print_array_to_buf_index(u8 *buf, u32 offset, const char *header, u32 stats_index,</div><div class='add'>+			 const __le32 *array, u32 array_len, const char *footer)</div><div class='add'>+{</div><div class='add'>+	int index = 0;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (header) {</div><div class='add'>+		index += scnprintf(buf + offset,</div><div class='add'>+				   ATH12K_HTT_STATS_BUF_SIZE - offset,</div><div class='add'>+				   "%s = ", header);</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; array_len; i++) {</div><div class='add'>+		index += scnprintf(buf + offset + index,</div><div class='add'>+				   (ATH12K_HTT_STATS_BUF_SIZE - offset) - index,</div><div class='add'>+				   " %u:%u,", stats_index++, le32_to_cpu(array[i]));</div><div class='add'>+	}</div><div class='add'>+	/* To overwrite the last trailing comma */</div><div class='add'>+	index--;</div><div class='add'>+	*(buf + offset + index) = '\0';</div><div class='add'>+</div><div class='add'>+	if (footer) {</div><div class='add'>+		index += scnprintf(buf + offset + index,</div><div class='add'>+				   (ATH12K_HTT_STATS_BUF_SIZE - offset) - index,</div><div class='add'>+				   "%s", footer);</div><div class='add'>+	}</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+print_array_to_buf(u8 *buf, u32 offset, const char *header,</div><div class='add'>+		   const __le32 *array, u32 array_len, const char *footer)</div><div class='add'>+{</div><div class='add'>+	return print_array_to_buf_index(buf, offset, header, 0, array, array_len,</div><div class='add'>+					footer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+print_array_to_buf_s8(u8 *buf, u32 offset, const char *header, u32 stats_index,</div><div class='add'>+		      const s8 *array, u32 array_len, const char *footer)</div><div class='add'>+{</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	int index = 0;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (header)</div><div class='add'>+		index += scnprintf(buf + offset, buf_len - offset, "%s = ", header);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; array_len; i++) {</div><div class='add'>+		index += scnprintf(buf + offset + index, (buf_len - offset) - index,</div><div class='add'>+				   " %u:%d,", stats_index++, array[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	index--;</div><div class='add'>+	if ((offset + index) &lt; buf_len)</div><div class='add'>+		buf[offset + index] = '\0';</div><div class='add'>+</div><div class='add'>+	if (footer) {</div><div class='add'>+		index += scnprintf(buf + offset + index, (buf_len - offset) - index,</div><div class='add'>+				   "%s", footer);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *ath12k_htt_ax_tx_rx_ru_size_to_str(u8 ru_size)</div><div class='add'>+{</div><div class='add'>+	switch (ru_size) {</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_AX_RU_SIZE_26:</div><div class='add'>+		return "26";</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_AX_RU_SIZE_52:</div><div class='add'>+		return "52";</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_AX_RU_SIZE_106:</div><div class='add'>+		return "106";</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_AX_RU_SIZE_242:</div><div class='add'>+		return "242";</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_AX_RU_SIZE_484:</div><div class='add'>+		return "484";</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_AX_RU_SIZE_996:</div><div class='add'>+		return "996";</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_AX_RU_SIZE_996x2:</div><div class='add'>+		return "996x2";</div><div class='add'>+	default:</div><div class='add'>+		return "unknown";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *ath12k_htt_be_tx_rx_ru_size_to_str(u8 ru_size)</div><div class='add'>+{</div><div class='add'>+	switch (ru_size) {</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_26:</div><div class='add'>+		return "26";</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_52:</div><div class='add'>+		return "52";</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_52_26:</div><div class='add'>+		return "52+26";</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_106:</div><div class='add'>+		return "106";</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_106_26:</div><div class='add'>+		return "106+26";</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_242:</div><div class='add'>+		return "242";</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_484:</div><div class='add'>+		return "484";</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_484_242:</div><div class='add'>+		return "484+242";</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_996:</div><div class='add'>+		return "996";</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_996_484:</div><div class='add'>+		return "996+484";</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_996_484_242:</div><div class='add'>+		return "996+484+242";</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_996x2:</div><div class='add'>+		return "996x2";</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_996x2_484:</div><div class='add'>+		return "996x2+484";</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_996x3:</div><div class='add'>+		return "996x3";</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_996x3_484:</div><div class='add'>+		return "996x3+484";</div><div class='add'>+	case ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_996x4:</div><div class='add'>+		return "996x4";</div><div class='add'>+	default:</div><div class='add'>+		return "unknown";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char*</div><div class='add'>+ath12k_tx_ru_size_to_str(enum ath12k_htt_stats_ru_type ru_type, u8 ru_size)</div><div class='add'>+{</div><div class='add'>+	if (ru_type == ATH12K_HTT_STATS_RU_TYPE_SINGLE_RU_ONLY)</div><div class='add'>+		return ath12k_htt_ax_tx_rx_ru_size_to_str(ru_size);</div><div class='add'>+	else if (ru_type == ATH12K_HTT_STATS_RU_TYPE_SINGLE_AND_MULTI_RU)</div><div class='add'>+		return ath12k_htt_be_tx_rx_ru_size_to_str(ru_size);</div><div class='add'>+	else</div><div class='add'>+		return "unknown";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+htt_print_tx_pdev_stats_cmn_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_pdev_stats_cmn_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 mac_id_word;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_id_word = le32_to_cpu(htt_stats_buf-&gt;mac_id__word);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_PDEV_STATS_CMN_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n",</div><div class='add'>+			 u32_get_bits(mac_id_word, ATH12K_HTT_STATS_MAC_ID));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "comp_delivered = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;comp_delivered));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "self_triggers = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;self_triggers));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hw_queued = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;hw_queued));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hw_reaped = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;hw_reaped));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "underrun = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;underrun));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hw_paused = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;hw_paused));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hw_flush = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;hw_flush));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hw_filt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;hw_filt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_abort = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_abort));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ppdu_ok = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ppdu_ok));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_requeued = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mpdu_requed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_xretry = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_xretry));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "data_rc = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;data_rc));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_dropped_xretry = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mpdu_dropped_xretry));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "illegal_rate_phy_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;illgl_rate_phy_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "cont_xretry = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;cont_xretry));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_timeout = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_timeout));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_time_dur_data = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_time_dur_data));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pdev_resets = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;pdev_resets));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_underrun = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;phy_underrun));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "txop_ovf = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;txop_ovf));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "seq_posted = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;seq_posted));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "seq_failed_queueing = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;seq_failed_queueing));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "seq_completed = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;seq_completed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "seq_restarted = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;seq_restarted));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "seq_txop_repost_stop = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;seq_txop_repost_stop));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "next_seq_cancel = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;next_seq_cancel));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "dl_mu_mimo_seq_posted = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mu_seq_posted));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "dl_mu_ofdma_seq_posted = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mu_ofdma_seq_posted));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ul_mu_mimo_seq_posted = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ul_mumimo_seq_posted));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ul_mu_ofdma_seq_posted = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ul_ofdma_seq_posted));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mu_mimo_peer_blacklisted = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_mu_peer_blacklisted));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "seq_qdepth_repost_stop = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;seq_qdepth_repost_stop));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "seq_min_msdu_repost_stop = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;seq_min_msdu_repost_stop));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mu_seq_min_msdu_repost_stop = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mu_seq_min_msdu_repost_stop));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "seq_switch_hw_paused = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;seq_switch_hw_paused));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "next_seq_posted_dsr = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;next_seq_posted_dsr));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "seq_posted_isr = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;seq_posted_isr));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "seq_ctrl_cached = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;seq_ctrl_cached));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_count_tqm = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mpdu_count_tqm));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "msdu_count_tqm = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;msdu_count_tqm));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_removed_tqm = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mpdu_removed_tqm));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "msdu_removed_tqm = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;msdu_removed_tqm));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "remove_mpdus_max_retries = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;remove_mpdus_max_retries));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdus_sw_flush = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mpdus_sw_flush));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdus_hw_filter = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mpdus_hw_filter));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdus_truncated = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mpdus_truncated));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdus_ack_failed = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mpdus_ack_failed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdus_expired = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mpdus_expired));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdus_seq_hw_retry = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mpdus_seq_hw_retry));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ack_tlv_proc = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ack_tlv_proc));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "coex_abort_mpdu_cnt_valid = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;coex_abort_mpdu_cnt_valid));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "coex_abort_mpdu_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;coex_abort_mpdu_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_total_ppdus_tried_ota = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_total_ppdus_tried_ota));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_data_ppdus_tried_ota = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_data_ppdus_tried_ota));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "local_ctrl_mgmt_enqued = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;local_ctrl_mgmt_enqued));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "local_ctrl_mgmt_freed = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;local_ctrl_mgmt_freed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "local_data_enqued = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;local_data_enqued));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "local_data_freed = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;local_data_freed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_tried = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mpdu_tried));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "isr_wait_seq_posted = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;isr_wait_seq_posted));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_active_dur_us_low = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_active_dur_us_low));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_active_dur_us_high = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_active_dur_us_high));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fes_offsets_err_cnt = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fes_offsets_err_cnt));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+htt_print_tx_pdev_stats_urrn_tlv(const void *tag_buf,</div><div class='add'>+				 u16 tag_len,</div><div class='add'>+				 struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_pdev_stats_urrn_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u16 num_elems = min_t(u16, (tag_len &gt;&gt; 2),</div><div class='add'>+			      HTT_TX_PDEV_MAX_URRN_STATS);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			"HTT_TX_PDEV_STATS_URRN_TLV:\n");</div><div class='add'>+</div><div class='add'>+	len += print_array_to_buf(buf, len, "urrn_stats", htt_stats_buf-&gt;urrn_stats,</div><div class='add'>+				  num_elems, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+htt_print_tx_pdev_stats_flush_tlv(const void *tag_buf,</div><div class='add'>+				  u16 tag_len,</div><div class='add'>+				  struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_pdev_stats_flush_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u16 num_elems = min_t(u16, (tag_len &gt;&gt; 2),</div><div class='add'>+			      ATH12K_HTT_TX_PDEV_MAX_FLUSH_REASON_STATS);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_PDEV_STATS_FLUSH_TLV:\n");</div><div class='add'>+</div><div class='add'>+	len += print_array_to_buf(buf, len, "flush_errs", htt_stats_buf-&gt;flush_errs,</div><div class='add'>+				  num_elems, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+htt_print_tx_pdev_stats_sifs_tlv(const void *tag_buf,</div><div class='add'>+				 u16 tag_len,</div><div class='add'>+				 struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_pdev_stats_sifs_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u16 num_elems = min_t(u16, (tag_len &gt;&gt; 2),</div><div class='add'>+			      ATH12K_HTT_TX_PDEV_MAX_SIFS_BURST_STATS);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_PDEV_STATS_SIFS_TLV:\n");</div><div class='add'>+</div><div class='add'>+	len += print_array_to_buf(buf, len, "sifs_status", htt_stats_buf-&gt;sifs_status,</div><div class='add'>+				  num_elems, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+htt_print_tx_pdev_mu_ppdu_dist_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					 struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_pdev_mu_ppdu_dist_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	char *mode;</div><div class='add'>+	u8 j, hw_mode, i, str_buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 stats_value;</div><div class='add'>+	u8 max_ppdu = ATH12K_HTT_STATS_MAX_NUM_MU_PPDU_PER_BURST;</div><div class='add'>+	u8 max_sched = ATH12K_HTT_STATS_MAX_NUM_SCHED_STATUS;</div><div class='add'>+	char str_buf[ATH12K_HTT_MAX_STRING_LEN];</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hw_mode = le32_to_cpu(htt_stats_buf-&gt;hw_mode);</div><div class='add'>+</div><div class='add'>+	switch (hw_mode) {</div><div class='add'>+	case ATH12K_HTT_STATS_HWMODE_AC:</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "HTT_TX_PDEV_AC_MU_PPDU_DISTRIBUTION_STATS:\n");</div><div class='add'>+		mode = "ac";</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_HTT_STATS_HWMODE_AX:</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "HTT_TX_PDEV_AX_MU_PPDU_DISTRIBUTION_STATS:\n");</div><div class='add'>+		mode = "ax";</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_HTT_STATS_HWMODE_BE:</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "HTT_TX_PDEV_BE_MU_PPDU_DISTRIBUTION_STATS:\n");</div><div class='add'>+		mode = "be";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_STATS_NUM_NR_BINS ; i++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "%s_mu_mimo_num_seq_posted_nr%u = %u\n", mode,</div><div class='add'>+				 ((i + 1) * 4), htt_stats_buf-&gt;num_seq_posted[i]);</div><div class='add'>+		str_buf_len = 0;</div><div class='add'>+		memset(str_buf, 0x0, sizeof(str_buf));</div><div class='add'>+		for (j = 0; j &lt; ATH12K_HTT_STATS_MAX_NUM_MU_PPDU_PER_BURST ; j++) {</div><div class='add'>+			stats_value = le32_to_cpu(htt_stats_buf-&gt;num_ppdu_posted_per_burst</div><div class='add'>+						  [i * max_ppdu + j]);</div><div class='add'>+			str_buf_len += scnprintf(&amp;str_buf[str_buf_len],</div><div class='add'>+						ATH12K_HTT_MAX_STRING_LEN - str_buf_len,</div><div class='add'>+						" %u:%u,", j, stats_value);</div><div class='add'>+		}</div><div class='add'>+		/* To overwrite the last trailing comma */</div><div class='add'>+		str_buf[str_buf_len - 1] = '\0';</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "%s_mu_mimo_num_ppdu_posted_per_burst_nr%u = %s\n",</div><div class='add'>+				 mode, ((i + 1) * 4), str_buf);</div><div class='add'>+		str_buf_len = 0;</div><div class='add'>+		memset(str_buf, 0x0, sizeof(str_buf));</div><div class='add'>+		for (j = 0; j &lt; ATH12K_HTT_STATS_MAX_NUM_MU_PPDU_PER_BURST ; j++) {</div><div class='add'>+			stats_value = le32_to_cpu(htt_stats_buf-&gt;num_ppdu_cmpl_per_burst</div><div class='add'>+						  [i * max_ppdu + j]);</div><div class='add'>+			str_buf_len += scnprintf(&amp;str_buf[str_buf_len],</div><div class='add'>+						ATH12K_HTT_MAX_STRING_LEN - str_buf_len,</div><div class='add'>+						" %u:%u,", j, stats_value);</div><div class='add'>+		}</div><div class='add'>+		/* To overwrite the last trailing comma */</div><div class='add'>+		str_buf[str_buf_len - 1] = '\0';</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "%s_mu_mimo_num_ppdu_completed_per_burst_nr%u = %s\n",</div><div class='add'>+				 mode, ((i + 1) * 4), str_buf);</div><div class='add'>+		str_buf_len = 0;</div><div class='add'>+		memset(str_buf, 0x0, sizeof(str_buf));</div><div class='add'>+		for (j = 0; j &lt; ATH12K_HTT_STATS_MAX_NUM_SCHED_STATUS ; j++) {</div><div class='add'>+			stats_value = le32_to_cpu(htt_stats_buf-&gt;num_seq_term_status</div><div class='add'>+						  [i * max_sched + j]);</div><div class='add'>+			str_buf_len += scnprintf(&amp;str_buf[str_buf_len],</div><div class='add'>+						ATH12K_HTT_MAX_STRING_LEN - str_buf_len,</div><div class='add'>+						" %u:%u,", j, stats_value);</div><div class='add'>+		}</div><div class='add'>+		/* To overwrite the last trailing comma */</div><div class='add'>+		str_buf[str_buf_len - 1] = '\0';</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "%s_mu_mimo_num_seq_term_status_nr%u = %s\n\n",</div><div class='add'>+				 mode, ((i + 1) * 4), str_buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+htt_print_tx_pdev_stats_sifs_hist_tlv(const void *tag_buf,</div><div class='add'>+				      u16 tag_len,</div><div class='add'>+				      struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_pdev_stats_sifs_hist_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u16 num_elems = min_t(u16, (tag_len &gt;&gt; 2),</div><div class='add'>+			      ATH12K_HTT_TX_PDEV_MAX_SIFS_BURST_HIST_STATS);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_PDEV_STATS_SIFS_HIST_TLV:\n");</div><div class='add'>+</div><div class='add'>+	len += print_array_to_buf(buf, len, "sifs_hist_status",</div><div class='add'>+				  htt_stats_buf-&gt;sifs_hist_status, num_elems, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+htt_print_pdev_ctrl_path_tx_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				      struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_pdev_ctrl_path_tx_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_PDEV_STATS_CTRL_PATH_TX_STATS:\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "fw_tx_mgmt_subtype",</div><div class='add'>+				 htt_stats_buf-&gt;fw_tx_mgmt_subtype,</div><div class='add'>+				 ATH12K_HTT_STATS_SUBTYPE_MAX, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_stats_tx_sched_cmn_tlv(const void *tag_buf,</div><div class='add'>+					u16 tag_len,</div><div class='add'>+					struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_stats_tx_sched_cmn_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 mac_id_word;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_id_word = __le32_to_cpu(htt_stats_buf-&gt;mac_id__word);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_STATS_TX_SCHED_CMN_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n",</div><div class='add'>+			 u32_get_bits(mac_id_word, ATH12K_HTT_STATS_MAC_ID));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "current_timestamp = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;current_timestamp));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_pdev_stats_sched_per_txq_tlv(const void *tag_buf,</div><div class='add'>+						 u16 tag_len,</div><div class='add'>+						 struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_pdev_stats_sched_per_txq_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 mac_id_word;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_id_word = __le32_to_cpu(htt_stats_buf-&gt;mac_id__word);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_PDEV_STATS_SCHED_PER_TXQ_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n",</div><div class='add'>+			u32_get_bits(mac_id_word,</div><div class='add'>+				     ATH12K_HTT_TX_PDEV_STATS_SCHED_PER_TXQ_MAC_ID));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "txq_id = %u\n",</div><div class='add'>+			 u32_get_bits(mac_id_word,</div><div class='add'>+				      ATH12K_HTT_TX_PDEV_STATS_SCHED_PER_TXQ_ID));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sched_policy = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;sched_policy));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "last_sched_cmd_posted_timestamp = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;last_sched_cmd_posted_timestamp));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "last_sched_cmd_compl_timestamp = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;last_sched_cmd_compl_timestamp));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sched_2_tac_lwm_count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;sched_2_tac_lwm_count));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sched_2_tac_ring_full = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;sched_2_tac_ring_full));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sched_cmd_post_failure = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;sched_cmd_post_failure));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_active_tids = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_active_tids));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_ps_schedules = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_ps_schedules));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sched_cmds_pending = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;sched_cmds_pending));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_tid_register = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_tid_register));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_tid_unregister = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_tid_unregister));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_qstats_queried = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_qstats_queried));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "qstats_update_pending = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;qstats_update_pending));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "last_qstats_query_timestamp = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;last_qstats_query_timestamp));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_tqm_cmdq_full = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_tqm_cmdq_full));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_de_sched_algo_trigger = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_de_sched_algo_trigger));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_rt_sched_algo_trigger = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_rt_sched_algo_trigger));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_tqm_sched_algo_trigger = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_tqm_sched_algo_trigger));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "notify_sched = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;notify_sched));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "dur_based_sendn_term = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;dur_based_sendn_term));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "su_notify2_sched = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;su_notify2_sched));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "su_optimal_queued_msdus_sched = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;su_optimal_queued_msdus_sched));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "su_delay_timeout_sched = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;su_delay_timeout_sched));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "su_min_txtime_sched_delay = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;su_min_txtime_sched_delay));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "su_no_delay = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;su_no_delay));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_supercycles = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_supercycles));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_subcycles_with_sort = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_subcycles_with_sort));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_subcycles_no_sort = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_subcycles_no_sort));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_sched_txq_cmd_posted_tlv(const void *tag_buf,</div><div class='add'>+					  u16 tag_len,</div><div class='add'>+					  struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_sched_txq_cmd_posted_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u16 num_elements = tag_len &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_SCHED_TXQ_CMD_POSTED_TLV:\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "sched_cmd_posted",</div><div class='add'>+				  htt_stats_buf-&gt;sched_cmd_posted, num_elements, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_sched_txq_cmd_reaped_tlv(const void *tag_buf,</div><div class='add'>+					  u16 tag_len,</div><div class='add'>+					  struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_sched_txq_cmd_reaped_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u16 num_elements = tag_len &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_SCHED_TXQ_CMD_REAPED_TLV:\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "sched_cmd_reaped",</div><div class='add'>+				  htt_stats_buf-&gt;sched_cmd_reaped, num_elements, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_sched_txq_sched_order_su_tlv(const void *tag_buf,</div><div class='add'>+					      u16 tag_len,</div><div class='add'>+					      struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_sched_txq_sched_order_su_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 sched_order_su_num_entries = min_t(u32, (tag_len &gt;&gt; 2),</div><div class='add'>+					       ATH12K_HTT_TX_PDEV_NUM_SCHED_ORDER_LOG);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_SCHED_TXQ_SCHED_ORDER_SU_TLV:\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "sched_order_su",</div><div class='add'>+				  htt_stats_buf-&gt;sched_order_su,</div><div class='add'>+				  sched_order_su_num_entries, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_sched_txq_sched_ineligibility_tlv(const void *tag_buf,</div><div class='add'>+						   u16 tag_len,</div><div class='add'>+						   struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_sched_txq_sched_ineligibility_tlv *htt_stats_buf =</div><div class='add'>+		     tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 sched_ineligibility_num_entries = tag_len &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_SCHED_TXQ_SCHED_INELIGIBILITY:\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "sched_ineligibility",</div><div class='add'>+				  htt_stats_buf-&gt;sched_ineligibility,</div><div class='add'>+				  sched_ineligibility_num_entries, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_sched_txq_supercycle_trigger_tlv(const void *tag_buf,</div><div class='add'>+						  u16 tag_len,</div><div class='add'>+						  struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_sched_txq_supercycle_triggers_tlv *htt_stats_buf =</div><div class='add'>+		     tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u16 num_elems = min_t(u16, (tag_len &gt;&gt; 2),</div><div class='add'>+			      ATH12K_HTT_SCHED_SUPERCYCLE_TRIGGER_MAX);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_SCHED_TXQ_SUPERCYCLE_TRIGGER:\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "supercycle_triggers",</div><div class='add'>+				  htt_stats_buf-&gt;supercycle_triggers, num_elems, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_hw_stats_pdev_errs_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_hw_stats_pdev_errs_tlv *htt_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 mac_id_word;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_id_word = le32_to_cpu(htt_buf-&gt;mac_id__word);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_HW_STATS_PDEV_ERRS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n",</div><div class='add'>+			 u32_get_bits(mac_id_word, ATH12K_HTT_STATS_MAC_ID));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_abort = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;tx_abort));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_abort_fail_count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;tx_abort_fail_count));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_abort = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;rx_abort));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_abort_fail_count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;rx_abort_fail_count));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_flush_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;rx_flush_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "warm_reset = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;warm_reset));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "cold_reset = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;cold_reset));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_cold_reset_restore_cal = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;mac_cold_reset_restore_cal));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_cold_reset = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;mac_cold_reset));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_warm_reset = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;mac_warm_reset));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_only_reset = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;mac_only_reset));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_warm_reset = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;phy_warm_reset));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_warm_reset_ucode_trig = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;phy_warm_reset_ucode_trig));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_warm_reset_restore_cal = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;mac_warm_reset_restore_cal));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_sfm_reset = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;mac_sfm_reset));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_warm_reset_m3_ssr = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;phy_warm_reset_m3_ssr));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fw_rx_rings_reset = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;fw_rx_rings_reset));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_flush = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;tx_flush));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_glb_reset = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;tx_glb_reset));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_txq_reset = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;tx_txq_reset));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_timeout_reset = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;rx_timeout_reset));</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "PDEV_PHY_WARM_RESET_REASONS:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_warm_reset_reason_phy_m3 = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;phy_warm_reset_reason_phy_m3));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "phy_warm_reset_reason_tx_hw_stuck = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;phy_warm_reset_reason_tx_hw_stuck));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "phy_warm_reset_reason_num_cca_rx_frame_stuck = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;phy_warm_reset_reason_num_rx_frame_stuck));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "phy_warm_reset_reason_wal_rx_recovery_rst_rx_busy = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;phy_warm_reset_reason_wal_rx_rec_rx_busy));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "phy_warm_reset_reason_wal_rx_recovery_rst_mac_hang = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;phy_warm_reset_reason_wal_rx_rec_mac_hng));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "phy_warm_reset_reason_mac_reset_converted_phy_reset = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;phy_warm_reset_reason_mac_conv_phy_reset));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "phy_warm_reset_reason_tx_lifetime_expiry_cca_stuck = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;phy_warm_reset_reason_tx_exp_cca_stuck));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "phy_warm_reset_reason_tx_consecutive_flush9_war = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;phy_warm_reset_reason_tx_consec_flsh_war));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "phy_warm_reset_reason_tx_hwsch_reset_war = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;phy_warm_reset_reason_tx_hwsch_reset_war));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "phy_warm_reset_reason_hwsch_wdog_or_cca_wdog_war = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;phy_warm_reset_reason_hwsch_cca_wdog_war));</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "WAL_RX_RECOVERY_STATS:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "wal_rx_recovery_rst_mac_hang_count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;wal_rx_recovery_rst_mac_hang_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "wal_rx_recovery_rst_known_sig_count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;wal_rx_recovery_rst_known_sig_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "wal_rx_recovery_rst_no_rx_count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;wal_rx_recovery_rst_no_rx_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "wal_rx_recovery_rst_no_rx_consecutive_count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;wal_rx_recovery_rst_no_rx_consec_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "wal_rx_recovery_rst_rx_busy_count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;wal_rx_recovery_rst_rx_busy_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "wal_rx_recovery_rst_phy_mac_hang_count = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;wal_rx_recovery_rst_phy_mac_hang_cnt));</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_RX_DEST_DRAIN_STATS:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "rx_dest_drain_rx_descs_leak_prevention_done = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;rx_dest_drain_rx_descs_leak_prevented));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "rx_dest_drain_rx_descs_saved_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;rx_dest_drain_rx_descs_saved_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "rx_dest_drain_rxdma2reo_leak_detected = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;rx_dest_drain_rxdma2reo_leak_detected));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "rx_dest_drain_rxdma2fw_leak_detected = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;rx_dest_drain_rxdma2fw_leak_detected));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "rx_dest_drain_rxdma2wbm_leak_detected = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;rx_dest_drain_rxdma2wbm_leak_detected));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "rx_dest_drain_rxdma1_2sw_leak_detected = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;rx_dest_drain_rxdma1_2sw_leak_detected));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "rx_dest_drain_rx_drain_ok_mac_idle = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;rx_dest_drain_rx_drain_ok_mac_idle));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "rx_dest_drain_ok_mac_not_idle = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;rx_dest_drain_ok_mac_not_idle));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "rx_dest_drain_prerequisite_invld = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;rx_dest_drain_prerequisite_invld));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "rx_dest_drain_skip_for_non_lmac_reset = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;rx_dest_drain_skip_non_lmac_reset));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "rx_dest_drain_hw_fifo_not_empty_post_drain_wait = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_buf-&gt;rx_dest_drain_hw_fifo_notempty_post_wait));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_hw_stats_intr_misc_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_hw_stats_intr_misc_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_HW_STATS_INTR_MISC_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hw_intr_name = %s\n",</div><div class='add'>+			 htt_stats_buf-&gt;hw_intr_name);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mask = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mask));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "count = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;count));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_hw_stats_whal_tx_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				      struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_hw_stats_whal_tx_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 mac_id_word;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_id_word = __le32_to_cpu(htt_stats_buf-&gt;mac_id__word);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_HW_STATS_WHAL_TX_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n",</div><div class='add'>+			 u32_get_bits(mac_id_word, ATH12K_HTT_STATS_MAC_ID));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "last_unpause_ppdu_id = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;last_unpause_ppdu_id));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hwsch_unpause_wait_tqm_write = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;hwsch_unpause_wait_tqm_write));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hwsch_dummy_tlv_skipped = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;hwsch_dummy_tlv_skipped));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "hwsch_misaligned_offset_received = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;hwsch_misaligned_offset_received));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hwsch_reset_count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;hwsch_reset_count));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hwsch_dev_reset_war = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;hwsch_dev_reset_war));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hwsch_delayed_pause = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;hwsch_delayed_pause));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hwsch_long_delayed_pause = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;hwsch_long_delayed_pause));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sch_rx_ppdu_no_response = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;sch_rx_ppdu_no_response));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sch_selfgen_response = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;sch_selfgen_response));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sch_rx_sifs_resp_trigger= %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;sch_rx_sifs_resp_trigger));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_hw_war_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+			    struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_hw_war_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u16 fixed_len, array_len;</div><div class='add'>+	u8 i, array_words;</div><div class='add'>+	u32 mac_id;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_id = __le32_to_cpu(htt_stats_buf-&gt;mac_id__word);</div><div class='add'>+	fixed_len = sizeof(*htt_stats_buf);</div><div class='add'>+	array_len = tag_len - fixed_len;</div><div class='add'>+	array_words = array_len &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_HW_WAR_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n",</div><div class='add'>+			 u32_get_bits(mac_id, ATH12K_HTT_STATS_MAC_ID));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; array_words; i++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "hw_war %u = %u\n\n",</div><div class='add'>+				 i, le32_to_cpu(htt_stats_buf-&gt;hw_wars[i]));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_tqm_cmn_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				      struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_tqm_cmn_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 mac_id_word;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_id_word = __le32_to_cpu(htt_stats_buf-&gt;mac_id__word);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_TQM_CMN_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n",</div><div class='add'>+			u32_get_bits(mac_id_word, ATH12K_HTT_STATS_MAC_ID));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "max_cmdq_id = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;max_cmdq_id));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "list_mpdu_cnt_hist_intvl = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;list_mpdu_cnt_hist_intvl));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "add_msdu = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;add_msdu));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "q_empty = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;q_empty));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "q_not_empty = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;q_not_empty));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "drop_notification = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;drop_notification));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "desc_threshold = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;desc_threshold));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hwsch_tqm_invalid_status = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;hwsch_tqm_invalid_status));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "missed_tqm_gen_mpdus = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;missed_tqm_gen_mpdus));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "total_msduq_timestamp_updates = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;msduq_timestamp_updates));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "total_msduq_timestamp_updates_by_get_mpdu_head_info_cmd = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;msduq_updates_mpdu_head_info_cmd));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "total_msduq_timestamp_updates_by_emp_to_nonemp_status = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;msduq_updates_emp_to_nonemp_status));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "total_get_mpdu_head_info_cmds_by_sched_algo_la_query = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;get_mpdu_head_info_cmds_by_query));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "total_get_mpdu_head_info_cmds_by_tac = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;get_mpdu_head_info_cmds_by_tac));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "total_gen_mpdu_cmds_by_sched_algo_la_query = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;gen_mpdu_cmds_by_query));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "active_tqm_tids = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_active_tids));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "inactive_tqm_tids = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_inactive_tids));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tqm_active_msduq_flows = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_active_msduq_flows));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hi_prio_q_not_empty = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;high_prio_q_not_empty));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_tqm_error_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_tqm_error_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_TQM_ERROR_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "q_empty_failure = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;q_empty_failure));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "q_not_empty_failure = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;q_not_empty_failure));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "add_msdu_failure = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;add_msdu_failure));</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "TQM_ERROR_RESET_STATS:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tqm_cache_ctl_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_cache_ctl_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tqm_soft_reset = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_soft_reset));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "tqm_reset_total_num_in_use_link_descs = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_reset_num_in_use_link_descs));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "tqm_reset_worst_case_num_lost_link_descs = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_reset_num_lost_link_descs));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "tqm_reset_worst_case_num_lost_host_tx_bufs_count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_reset_num_lost_host_tx_buf_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "tqm_reset_num_in_use_link_descs_internal_tqm = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_reset_num_in_use_internal_tqm));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "tqm_reset_num_in_use_link_descs_wbm_idle_link_ring = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_reset_num_in_use_idle_link_rng));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "tqm_reset_time_to_tqm_hang_delta_ms = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_reset_time_to_tqm_hang_delta_ms));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tqm_reset_recovery_time_ms = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_reset_recovery_time_ms));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tqm_reset_num_peers_hdl = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_reset_num_peers_hdl));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "tqm_reset_cumm_dirty_hw_mpduq_proc_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_reset_cumm_dirty_hw_mpduq_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "tqm_reset_cumm_dirty_hw_msduq_proc = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_reset_cumm_dirty_hw_msduq_proc));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "tqm_reset_flush_cache_cmd_su_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_reset_flush_cache_cmd_su_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "tqm_reset_flush_cache_cmd_other_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_reset_flush_cache_cmd_other_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "tqm_reset_flush_cache_cmd_trig_type = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_reset_flush_cache_cmd_trig_type));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "tqm_reset_flush_cache_cmd_trig_cfg = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_reset_flush_cache_cmd_trig_cfg));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "tqm_reset_flush_cache_cmd_skip_cmd_status_null = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_reset_flush_cmd_skp_status_null));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_tqm_gen_mpdu_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					   struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_tqm_gen_mpdu_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u16 num_elements = tag_len &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_TQM_GEN_MPDU_STATS_TLV:\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "gen_mpdu_end_reason",</div><div class='add'>+				  htt_stats_buf-&gt;gen_mpdu_end_reason, num_elements,</div><div class='add'>+				  "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_tqm_list_mpdu_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					    struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_tqm_list_mpdu_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u16 num_elems = min_t(u16, (tag_len &gt;&gt; 2),</div><div class='add'>+			      ATH12K_HTT_TX_TQM_MAX_LIST_MPDU_END_REASON);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_TQM_LIST_MPDU_STATS_TLV:\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "list_mpdu_end_reason",</div><div class='add'>+				  htt_stats_buf-&gt;list_mpdu_end_reason, num_elems, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_tqm_list_mpdu_cnt_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					  struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_tqm_list_mpdu_cnt_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u16 num_elems = min_t(u16, (tag_len &gt;&gt; 2),</div><div class='add'>+			      ATH12K_HTT_TX_TQM_MAX_LIST_MPDU_CNT_HISTOGRAM_BINS);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_TQM_LIST_MPDU_CNT_TLV_V:\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "list_mpdu_cnt_hist",</div><div class='add'>+				  htt_stats_buf-&gt;list_mpdu_cnt_hist, num_elems, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_tqm_pdev_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				       struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_tqm_pdev_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_TQM_PDEV_STATS_TLV_V:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "msdu_count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;msdu_count));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mpdu_count));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "remove_msdu = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;remove_msdu));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "remove_mpdu = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;remove_mpdu));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "remove_msdu_ttl = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;remove_msdu_ttl));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "send_bar = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;send_bar));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "bar_sync = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;bar_sync));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "notify_mpdu = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;notify_mpdu));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sync_cmd = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;sync_cmd));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "write_cmd = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;write_cmd));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "hwsch_trigger = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;hwsch_trigger));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ack_tlv_proc = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ack_tlv_proc));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "gen_mpdu_cmd = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;gen_mpdu_cmd));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "gen_list_cmd = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;gen_list_cmd));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "remove_mpdu_cmd = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;remove_mpdu_cmd));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "remove_mpdu_tried_cmd = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;remove_mpdu_tried_cmd));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_queue_stats_cmd = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mpdu_queue_stats_cmd));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdu_head_info_cmd = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mpdu_head_info_cmd));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "msdu_flow_stats_cmd = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;msdu_flow_stats_cmd));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "remove_msdu_cmd = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;remove_msdu_cmd));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "remove_msdu_ttl_cmd = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;remove_msdu_ttl_cmd));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "flush_cache_cmd = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;flush_cache_cmd));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "update_mpduq_cmd = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;update_mpduq_cmd));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "enqueue = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;enqueue));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "enqueue_notify = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;enqueue_notify));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "notify_mpdu_at_head = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;notify_mpdu_at_head));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "notify_mpdu_state_valid = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;notify_mpdu_state_valid));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sched_udp_notify1 = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;sched_udp_notify1));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sched_udp_notify2 = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;sched_udp_notify2));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sched_nonudp_notify1 = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;sched_nonudp_notify1));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sched_nonudp_notify2 = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;sched_nonudp_notify2));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_de_cmn_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				     struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_de_cmn_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 mac_id_word;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_id_word = __le32_to_cpu(htt_stats_buf-&gt;mac_id__word);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_DE_CMN_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n",</div><div class='add'>+			 u32_get_bits(mac_id_word, ATH12K_HTT_STATS_MAC_ID));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tcl2fw_entry_count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tcl2fw_entry_count));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "not_to_fw = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;not_to_fw));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "invalid_pdev_vdev_peer = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;invalid_pdev_vdev_peer));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tcl_res_invalid_addrx = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tcl_res_invalid_addrx));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "wbm2fw_entry_count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;wbm2fw_entry_count));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "invalid_pdev = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;invalid_pdev));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tcl_res_addrx_timeout = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tcl_res_addrx_timeout));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "invalid_vdev = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;invalid_vdev));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "invalid_tcl_exp_frame_desc = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;invalid_tcl_exp_frame_desc));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "vdev_id_mismatch_count = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;vdev_id_mismatch_cnt));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_de_eapol_packets_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					       struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_de_eapol_packets_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_DE_EAPOL_PACKETS_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "m1_packets = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;m1_packets));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "m2_packets = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;m2_packets));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "m3_packets = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;m3_packets));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "m4_packets = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;m4_packets));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "g1_packets = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;g1_packets));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "g2_packets = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;g2_packets));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rc4_packets = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rc4_packets));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "eap_packets = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;eap_packets));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "eapol_start_packets = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;eapol_start_packets));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "eapol_logoff_packets = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;eapol_logoff_packets));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "eapol_encap_asf_packets = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;eapol_encap_asf_packets));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_de_classify_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					  struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_de_classify_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_DE_CLASSIFY_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "arp_packets = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;arp_packets));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "igmp_packets = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;igmp_packets));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "dhcp_packets = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;dhcp_packets));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "host_inspected = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;host_inspected));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_included = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;htt_included));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_valid_mcs = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;htt_valid_mcs));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_valid_nss = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;htt_valid_nss));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_valid_preamble_type = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;htt_valid_preamble_type));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_valid_chainmask = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;htt_valid_chainmask));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_valid_guard_interval = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;htt_valid_guard_interval));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_valid_retries = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;htt_valid_retries));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_valid_bw_info = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;htt_valid_bw_info));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_valid_power = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;htt_valid_power));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_valid_key_flags = 0x%x\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;htt_valid_key_flags));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_valid_no_encryption = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;htt_valid_no_encryption));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_entry_count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_entry_count));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_priority_be = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_priority_be));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_priority_high = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_priority_high));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_priority_low = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_priority_low));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_traffic_ptrn_be = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_traffic_ptrn_be));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_traffic_ptrn_over_sub = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_traffic_ptrn_over_sub));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_traffic_ptrn_bursty = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_traffic_ptrn_bursty));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_traffic_ptrn_interactive = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_traffic_ptrn_interactive));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_traffic_ptrn_periodic = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_traffic_ptrn_periodic));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_hwqueue_alloc = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_hwqueue_alloc));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_hwqueue_created = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_hwqueue_created));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_hwqueue_send_to_host = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_hwqueue_send_to_host));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mcast_entry = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mcast_entry));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "bcast_entry = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;bcast_entry));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_update_peer_cache = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;htt_update_peer_cache));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "htt_learning_frame = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;htt_learning_frame));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_invalid_peer = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_invalid_peer));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mec_notify = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mec_notify));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_de_classify_failed_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+						 struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_de_classify_failed_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_DE_CLASSIFY_FAILED_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ap_bss_peer_not_found = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ap_bss_peer_not_found));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ap_bcast_mcast_no_peer = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ap_bcast_mcast_no_peer));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sta_delete_in_progress = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;sta_delete_in_progress));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ibss_no_bss_peer = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ibss_no_bss_peer));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "invalid_vdev_type = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;invalid_vdev_type));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "invalid_ast_peer_entry = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;invalid_ast_peer_entry));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "peer_entry_invalid = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;peer_entry_invalid));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ethertype_not_ip = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ethertype_not_ip));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "eapol_lookup_failed = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;eapol_lookup_failed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "qpeer_not_allow_data = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;qpeer_not_allow_data));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fse_tid_override = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_tid_override));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ipv6_jumbogram_zero_length = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ipv6_jumbogram_zero_length));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "qos_to_non_qos_in_prog = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;qos_to_non_qos_in_prog));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ap_bcast_mcast_eapol = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ap_bcast_mcast_eapol));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "unicast_on_ap_bss_peer = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;unicast_on_ap_bss_peer));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ap_vdev_invalid = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ap_vdev_invalid));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "incomplete_llc = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;incomplete_llc));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "eapol_duplicate_m3 = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;eapol_duplicate_m3));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "eapol_duplicate_m4 = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;eapol_duplicate_m4));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_de_classify_status_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+						 struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_de_classify_status_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_DE_CLASSIFY_STATUS_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "eok = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;eok));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "classify_done = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;classify_done));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "lookup_failed = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;lookup_failed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "send_host_dhcp = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;send_host_dhcp));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "send_host_mcast = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;send_host_mcast));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "send_host_unknown_dest = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;send_host_unknown_dest));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "send_host = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;send_host));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "status_invalid = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;status_invalid));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_de_enqueue_packets_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+						 struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_de_enqueue_packets_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_DE_ENQUEUE_PACKETS_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "enqueued_pkts = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;enqueued_pkts));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "to_tqm = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;to_tqm));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "to_tqm_bypass = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;to_tqm_bypass));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_de_enqueue_discard_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+						 struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_de_enqueue_discard_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_DE_ENQUEUE_DISCARD_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "discarded_pkts = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;discarded_pkts));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "local_frames = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;local_frames));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "is_ext_msdu = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;is_ext_msdu));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_de_compl_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				       struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_de_compl_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_DE_COMPL_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tcl_dummy_frame = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tcl_dummy_frame));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tqm_dummy_frame = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_dummy_frame));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tqm_notify_frame = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_notify_frame));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "fw2wbm_enq = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fw2wbm_enq));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tqm_bypass_frame = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tqm_bypass_frame));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_selfgen_cmn_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					  struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_selfgen_cmn_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 mac_id_word;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_id_word = __le32_to_cpu(htt_stats_buf-&gt;mac_id__word);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_SELFGEN_CMN_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n",</div><div class='add'>+			 u32_get_bits(mac_id_word, ATH12K_HTT_STATS_MAC_ID));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "su_bar = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;su_bar));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rts = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rts));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "cts2self = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;cts2self));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "qos_null = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;qos_null));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "delayed_bar_1 = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;delayed_bar_1));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "delayed_bar_2 = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;delayed_bar_2));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "delayed_bar_3 = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;delayed_bar_3));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "delayed_bar_4 = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;delayed_bar_4));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "delayed_bar_5 = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;delayed_bar_5));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "delayed_bar_6 = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;delayed_bar_6));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "delayed_bar_7 = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;delayed_bar_7));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_selfgen_ac_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					 struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_selfgen_ac_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_SELFGEN_AC_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_su_ndpa_tried = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ac_su_ndpa));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_su_ndp_tried = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ac_su_ndp));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_ndpa_tried = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ac_mu_mimo_ndpa));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_ndp_tried = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ac_mu_mimo_ndp));</div><div class='add'>+	len += print_array_to_buf_index(buf, len, "ac_mu_mimo_brpollX_tried = ", 1,</div><div class='add'>+					htt_stats_buf-&gt;ac_mu_mimo_brpoll,</div><div class='add'>+					ATH12K_HTT_TX_NUM_AC_MUMIMO_USER_STATS - 1,</div><div class='add'>+					"\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_selfgen_ax_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					 struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_selfgen_ax_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_SELFGEN_AX_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_su_ndpa_tried = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ax_su_ndpa));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_su_ndp_tried = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ax_su_ndp));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_ndpa_tried = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ax_mu_mimo_ndpa));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_ndp_tried = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ax_mu_mimo_ndp));</div><div class='add'>+	len += print_array_to_buf_index(buf, len, "ax_mu_mimo_brpollX_tried = ", 1,</div><div class='add'>+					htt_stats_buf-&gt;ax_mu_mimo_brpoll,</div><div class='add'>+					ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS - 1, "\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_basic_trigger = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ax_basic_trigger));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_ulmumimo_total_trigger = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ax_ulmumimo_trigger));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_bsr_trigger = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ax_bsr_trigger));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_bar_trigger = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ax_mu_bar_trigger));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_rts_trigger = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ax_mu_rts_trigger));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_selfgen_be_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					 struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_selfgen_be_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_SELFGEN_BE_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_su_ndpa_queued = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_su_ndpa_queued));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_su_ndpa_tried = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_su_ndpa));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_su_ndp_queued = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_su_ndp_queued));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_su_ndp_tried = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_su_ndp));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_mu_mimo_ndpa_queued = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_mu_mimo_ndpa_queued));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_mu_mimo_ndpa_tried = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_mu_mimo_ndpa));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_mu_mimo_ndp_queued = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_mu_mimo_ndp_queued));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_mu_mimo_ndp_tried = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_mu_mimo_ndp));</div><div class='add'>+	len += print_array_to_buf_index(buf, len, "be_mu_mimo_brpollX_queued = ", 1,</div><div class='add'>+					htt_stats_buf-&gt;be_mu_mimo_brpoll_queued,</div><div class='add'>+					ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS - 1,</div><div class='add'>+					"\n");</div><div class='add'>+	len += print_array_to_buf_index(buf, len, "be_mu_mimo_brpollX_tried = ", 1,</div><div class='add'>+					htt_stats_buf-&gt;be_mu_mimo_brpoll,</div><div class='add'>+					ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS - 1,</div><div class='add'>+					"\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "be_ul_mumimo_trigger = ",</div><div class='add'>+				  htt_stats_buf-&gt;be_ul_mumimo_trigger,</div><div class='add'>+				  ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS, "\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_basic_trigger = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_basic_trigger));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_ulmumimo_total_trigger = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_ulmumimo_trigger));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_bsr_trigger = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_bsr_trigger));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_mu_bar_trigger = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_mu_bar_trigger));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_mu_rts_trigger = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_mu_rts_trigger));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_selfgen_ac_err_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					     struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_selfgen_ac_err_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_SELFGEN_AC_ERR_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_su_ndp_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ac_su_ndp_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_su_ndpa_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ac_su_ndpa_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_ndpa_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ac_mu_mimo_ndpa_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_ndp_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ac_mu_mimo_ndp_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_brp1_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ac_mu_mimo_brp1_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_brp2_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ac_mu_mimo_brp2_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_brp3_err = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ac_mu_mimo_brp3_err));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_selfgen_ax_err_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					     struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_selfgen_ax_err_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_SELFGEN_AX_ERR_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_su_ndp_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ax_su_ndp_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_su_ndpa_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ax_su_ndpa_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_ndpa_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ax_mu_mimo_ndpa_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_ndp_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ax_mu_mimo_ndp_err));</div><div class='add'>+	len += print_array_to_buf_index(buf, len, "ax_mu_mimo_brpX_err", 1,</div><div class='add'>+					htt_stats_buf-&gt;ax_mu_mimo_brp_err,</div><div class='add'>+					ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS - 1,</div><div class='add'>+					"\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_basic_trigger_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ax_basic_trigger_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_ulmumimo_total_trigger_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ax_ulmumimo_trigger_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_bsr_trigger_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ax_bsr_trigger_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_bar_trigger_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ax_mu_bar_trigger_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_rts_trigger_err = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ax_mu_rts_trigger_err));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_selfgen_be_err_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					     struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_selfgen_be_err_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_SELFGEN_BE_ERR_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_su_ndp_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_su_ndp_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_su_ndp_flushed = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_su_ndp_flushed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_su_ndpa_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_su_ndpa_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_su_ndpa_flushed = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_su_ndpa_flushed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_mu_mimo_ndpa_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_mu_mimo_ndpa_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_mu_mimo_ndpa_flushed = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_mu_mimo_ndpa_flushed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_mu_mimo_ndp_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_mu_mimo_ndp_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_mu_mimo_ndp_flushed = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_mu_mimo_ndp_flushed));</div><div class='add'>+	len += print_array_to_buf_index(buf, len, "be_mu_mimo_brpX_err", 1,</div><div class='add'>+					htt_stats_buf-&gt;be_mu_mimo_brp_err,</div><div class='add'>+					ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS - 1,</div><div class='add'>+					"\n");</div><div class='add'>+	len += print_array_to_buf_index(buf, len, "be_mu_mimo_brpollX_flushed", 1,</div><div class='add'>+					htt_stats_buf-&gt;be_mu_mimo_brpoll_flushed,</div><div class='add'>+					ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS - 1,</div><div class='add'>+					"\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "be_mu_mimo_num_cbf_rcvd_on_brp_err",</div><div class='add'>+				  htt_stats_buf-&gt;be_mu_mimo_brp_err_num_cbf_rxd,</div><div class='add'>+				  ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "be_ul_mumimo_trigger_err",</div><div class='add'>+				  htt_stats_buf-&gt;be_ul_mumimo_trigger_err,</div><div class='add'>+				  ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS, "\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_basic_trigger_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_basic_trigger_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_ulmumimo_total_trig_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_ulmumimo_trigger_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_bsr_trigger_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_bsr_trigger_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_mu_bar_trigger_err = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_mu_bar_trigger_err));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_mu_rts_trigger_err = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_mu_rts_trigger_err));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_selfgen_ac_sched_status_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+						      struct debug_htt_stats_req *stats)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_selfgen_ac_sched_status_stats_tlv *htt_stats_buf =</div><div class='add'>+		     tag_buf;</div><div class='add'>+	u8 *buf = stats-&gt;buf;</div><div class='add'>+	u32 len = stats-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_SELFGEN_AC_SCHED_STATUS_STATS_TLV:\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ac_su_ndpa_sch_status",</div><div class='add'>+				  htt_stats_buf-&gt;ac_su_ndpa_sch_status,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ac_su_ndp_sch_status",</div><div class='add'>+				  htt_stats_buf-&gt;ac_su_ndp_sch_status,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ac_mu_mimo_ndpa_sch_status",</div><div class='add'>+				  htt_stats_buf-&gt;ac_mu_mimo_ndpa_sch_status,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ac_mu_mimo_ndp_sch_status",</div><div class='add'>+				  htt_stats_buf-&gt;ac_mu_mimo_ndp_sch_status,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ac_mu_mimo_brp_sch_status",</div><div class='add'>+				  htt_stats_buf-&gt;ac_mu_mimo_brp_sch_status,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ac_su_ndp_sch_flag_err",</div><div class='add'>+				  htt_stats_buf-&gt;ac_su_ndp_sch_flag_err,</div><div class='add'>+				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ac_mu_mimo_ndp_sch_flag_err",</div><div class='add'>+				  htt_stats_buf-&gt;ac_mu_mimo_ndp_sch_flag_err,</div><div class='add'>+				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ac_mu_mimo_brp_sch_flag_err",</div><div class='add'>+				  htt_stats_buf-&gt;ac_mu_mimo_brp_sch_flag_err,</div><div class='add'>+				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_selfgen_ax_sched_status_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+						      struct debug_htt_stats_req *stats)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_selfgen_ax_sched_status_stats_tlv *htt_stats_buf =</div><div class='add'>+		     tag_buf;</div><div class='add'>+	u8 *buf = stats-&gt;buf;</div><div class='add'>+	u32 len = stats-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_SELFGEN_AX_SCHED_STATUS_STATS_TLV:\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ax_su_ndpa_sch_status",</div><div class='add'>+				  htt_stats_buf-&gt;ax_su_ndpa_sch_status,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ax_su_ndp_sch_status",</div><div class='add'>+				  htt_stats_buf-&gt;ax_su_ndp_sch_status,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ax_mu_mimo_ndpa_sch_status",</div><div class='add'>+				  htt_stats_buf-&gt;ax_mu_mimo_ndpa_sch_status,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ax_mu_mimo_ndp_sch_status",</div><div class='add'>+				  htt_stats_buf-&gt;ax_mu_mimo_ndp_sch_status,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ax_mu_brp_sch_status",</div><div class='add'>+				  htt_stats_buf-&gt;ax_mu_brp_sch_status,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ax_mu_bar_sch_status",</div><div class='add'>+				  htt_stats_buf-&gt;ax_mu_bar_sch_status,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ax_basic_trig_sch_status",</div><div class='add'>+				  htt_stats_buf-&gt;ax_basic_trig_sch_status,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ax_su_ndp_sch_flag_err",</div><div class='add'>+				  htt_stats_buf-&gt;ax_su_ndp_sch_flag_err,</div><div class='add'>+				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ax_mu_mimo_ndp_sch_flag_err",</div><div class='add'>+				  htt_stats_buf-&gt;ax_mu_mimo_ndp_sch_flag_err,</div><div class='add'>+				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ax_mu_brp_sch_flag_err",</div><div class='add'>+				  htt_stats_buf-&gt;ax_mu_brp_sch_flag_err,</div><div class='add'>+				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ax_mu_bar_sch_flag_err",</div><div class='add'>+				  htt_stats_buf-&gt;ax_mu_bar_sch_flag_err,</div><div class='add'>+				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ax_basic_trig_sch_flag_err",</div><div class='add'>+				  htt_stats_buf-&gt;ax_basic_trig_sch_flag_err,</div><div class='add'>+				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ax_ulmumimo_trig_sch_status",</div><div class='add'>+				  htt_stats_buf-&gt;ax_ulmumimo_trig_sch_status,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ax_ulmumimo_trig_sch_flag_err",</div><div class='add'>+				  htt_stats_buf-&gt;ax_ulmumimo_trig_sch_flag_err,</div><div class='add'>+				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_selfgen_be_sched_status_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+						      struct debug_htt_stats_req *stats)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_selfgen_be_sched_status_stats_tlv *htt_stats_buf =</div><div class='add'>+		     tag_buf;</div><div class='add'>+	u8 *buf = stats-&gt;buf;</div><div class='add'>+	u32 len = stats-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_SELFGEN_BE_SCHED_STATUS_STATS_TLV:\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "be_su_ndpa_sch_status",</div><div class='add'>+				  htt_stats_buf-&gt;be_su_ndpa_sch_status,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "be_su_ndp_sch_status",</div><div class='add'>+				  htt_stats_buf-&gt;be_su_ndp_sch_status,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "be_mu_mimo_ndpa_sch_status",</div><div class='add'>+				  htt_stats_buf-&gt;be_mu_mimo_ndpa_sch_status,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "be_mu_mimo_ndp_sch_status",</div><div class='add'>+				  htt_stats_buf-&gt;be_mu_mimo_ndp_sch_status,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "be_mu_brp_sch_status",</div><div class='add'>+				  htt_stats_buf-&gt;be_mu_brp_sch_status,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "be_mu_bar_sch_status",</div><div class='add'>+				  htt_stats_buf-&gt;be_mu_bar_sch_status,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "be_basic_trig_sch_status",</div><div class='add'>+				  htt_stats_buf-&gt;be_basic_trig_sch_status,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "be_su_ndp_sch_flag_err",</div><div class='add'>+				  htt_stats_buf-&gt;be_su_ndp_sch_flag_err,</div><div class='add'>+				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "be_mu_mimo_ndp_sch_flag_err",</div><div class='add'>+				  htt_stats_buf-&gt;be_mu_mimo_ndp_sch_flag_err,</div><div class='add'>+				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "be_mu_brp_sch_flag_err",</div><div class='add'>+				  htt_stats_buf-&gt;be_mu_brp_sch_flag_err,</div><div class='add'>+				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "be_mu_bar_sch_flag_err",</div><div class='add'>+				  htt_stats_buf-&gt;be_mu_bar_sch_flag_err,</div><div class='add'>+				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "be_basic_trig_sch_flag_err",</div><div class='add'>+				  htt_stats_buf-&gt;be_basic_trig_sch_flag_err,</div><div class='add'>+				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "be_basic_trig_sch_flag_err",</div><div class='add'>+				  htt_stats_buf-&gt;be_basic_trig_sch_flag_err,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "be_ulmumimo_trig_sch_flag_err",</div><div class='add'>+				  htt_stats_buf-&gt;be_ulmumimo_trig_sch_flag_err,</div><div class='add'>+				  ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_stats_string_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				  struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_stats_string_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u8 i;</div><div class='add'>+	u16 index = 0;</div><div class='add'>+	u32 datum;</div><div class='add'>+	char data[ATH12K_HTT_MAX_STRING_LEN] = {};</div><div class='add'>+</div><div class='add'>+	tag_len = tag_len &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_STATS_STRING_TLV:\n");</div><div class='add'>+	for (i = 0; i &lt; tag_len; i++) {</div><div class='add'>+		datum = __le32_to_cpu(htt_stats_buf-&gt;data[i]);</div><div class='add'>+		index += scnprintf(&amp;data[index], ATH12K_HTT_MAX_STRING_LEN - index,</div><div class='add'>+				   "%.*s", 4, (char *)&amp;datum);</div><div class='add'>+		if (index &gt;= ATH12K_HTT_MAX_STRING_LEN)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "data = %s\n\n", data);</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_sring_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				 struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_sring_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 mac_id_word;</div><div class='add'>+	u32 avail_words;</div><div class='add'>+	u32 head_tail_ptr;</div><div class='add'>+	u32 sring_stat;</div><div class='add'>+	u32 tail_ptr;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_id_word = __le32_to_cpu(htt_stats_buf-&gt;mac_id__ring_id__arena__ep);</div><div class='add'>+	avail_words = __le32_to_cpu(htt_stats_buf-&gt;num_avail_words__num_valid_words);</div><div class='add'>+	head_tail_ptr = __le32_to_cpu(htt_stats_buf-&gt;head_ptr__tail_ptr);</div><div class='add'>+	sring_stat = __le32_to_cpu(htt_stats_buf-&gt;consumer_empty__producer_full);</div><div class='add'>+	tail_ptr = __le32_to_cpu(htt_stats_buf-&gt;prefetch_count__internal_tail_ptr);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_SRING_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n",</div><div class='add'>+			 u32_get_bits(mac_id_word, ATH12K_HTT_SRING_STATS_MAC_ID));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ring_id = %u\n",</div><div class='add'>+			 u32_get_bits(mac_id_word, ATH12K_HTT_SRING_STATS_RING_ID));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "arena = %u\n",</div><div class='add'>+			 u32_get_bits(mac_id_word, ATH12K_HTT_SRING_STATS_ARENA));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ep = %u\n",</div><div class='add'>+			 u32_get_bits(mac_id_word, ATH12K_HTT_SRING_STATS_EP));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "base_addr_lsb = 0x%x\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;base_addr_lsb));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "base_addr_msb = 0x%x\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;base_addr_msb));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ring_size = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ring_size));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "elem_size = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;elem_size));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_avail_words = %u\n",</div><div class='add'>+			 u32_get_bits(avail_words,</div><div class='add'>+				      ATH12K_HTT_SRING_STATS_NUM_AVAIL_WORDS));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_valid_words = %u\n",</div><div class='add'>+			 u32_get_bits(avail_words,</div><div class='add'>+				      ATH12K_HTT_SRING_STATS_NUM_VALID_WORDS));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "head_ptr = %u\n",</div><div class='add'>+			 u32_get_bits(head_tail_ptr, ATH12K_HTT_SRING_STATS_HEAD_PTR));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tail_ptr = %u\n",</div><div class='add'>+			 u32_get_bits(head_tail_ptr, ATH12K_HTT_SRING_STATS_TAIL_PTR));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "consumer_empty = %u\n",</div><div class='add'>+			 u32_get_bits(sring_stat,</div><div class='add'>+				      ATH12K_HTT_SRING_STATS_CONSUMER_EMPTY));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "producer_full = %u\n",</div><div class='add'>+			 u32_get_bits(head_tail_ptr,</div><div class='add'>+				      ATH12K_HTT_SRING_STATS_PRODUCER_FULL));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "prefetch_count = %u\n",</div><div class='add'>+			 u32_get_bits(tail_ptr, ATH12K_HTT_SRING_STATS_PREFETCH_COUNT));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "internal_tail_ptr = %u\n\n",</div><div class='add'>+			 u32_get_bits(tail_ptr,</div><div class='add'>+				      ATH12K_HTT_SRING_STATS_INTERNAL_TAIL_PTR));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_sfm_cmn_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+			     struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_sfm_cmn_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 mac_id_word;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_id_word = __le32_to_cpu(htt_stats_buf-&gt;mac_id__word);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_SFM_CMN_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n",</div><div class='add'>+			 u32_get_bits(mac_id_word, ATH12K_HTT_STATS_MAC_ID));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "buf_total = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;buf_total));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mem_empty = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mem_empty));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "deallocate_bufs = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;deallocate_bufs));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_records = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_records));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_sfm_client_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_sfm_client_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_SFM_CLIENT_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "client_id = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;client_id));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "buf_min = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;buf_min));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "buf_max = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;buf_max));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "buf_busy = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;buf_busy));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "buf_alloc = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;buf_alloc));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "buf_avail = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;buf_avail));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_users = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_users));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_sfm_client_user_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				     struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_sfm_client_user_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u16 num_elems = tag_len &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_SFM_CLIENT_USER_TLV:\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "dwords_used_by_user_n",</div><div class='add'>+				  htt_stats_buf-&gt;dwords_used_by_user_n,</div><div class='add'>+				  num_elems, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_pdev_mu_mimo_sch_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					       struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_pdev_mu_mimo_sch_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_PDEV_MU_MIMO_SCH_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mu_mimo_sch_posted = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mu_mimo_sch_posted));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mu_mimo_sch_failed = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mu_mimo_sch_failed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mu_mimo_ppdu_posted = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mu_mimo_ppdu_posted));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "\nac_mu_mimo_sch_posted_per_group_index %u (SU) = %u\n", 0,</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ac_mu_mimo_per_grp_sz[0]));</div><div class='add'>+	for (i = 1; i &lt; ATH12K_HTT_TX_NUM_AC_MUMIMO_USER_STATS; i++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ac_mu_mimo_sch_posted_per_group_index %u ", i);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "(TOTAL STREAMS = %u) = %u\n", i + 1,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;ac_mu_mimo_per_grp_sz[i]));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_TX_NUM_AC_MUMIMO_USER_STATS; i++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ac_mu_mimo_sch_posted_per_group_index %u ",</div><div class='add'>+				 i + ATH12K_HTT_TX_NUM_AC_MUMIMO_USER_STATS);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "(TOTAL STREAMS = %u) = %u\n",</div><div class='add'>+				 i + ATH12K_HTT_TX_NUM_AC_MUMIMO_USER_STATS + 1,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;ac_mu_mimo_grp_sz_ext[i]));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "\nax_mu_mimo_sch_posted_per_group_index %u (SU) = %u\n", 0,</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ax_mu_mimo_per_grp_sz[0]));</div><div class='add'>+	for (i = 1; i &lt; ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS; i++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_mu_mimo_sch_posted_per_group_index %u ", i);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "(TOTAL STREAMS = %u) = %u\n", i + 1,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;ax_mu_mimo_per_grp_sz[i]));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			"\nbe_mu_mimo_sch_posted_per_group_index %u (SU) = %u\n", 0,</div><div class='add'>+			le32_to_cpu(htt_stats_buf-&gt;be_mu_mimo_per_grp_sz[0]));</div><div class='add'>+	for (i = 1; i &lt; ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS; i++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "be_mu_mimo_sch_posted_per_group_index %u ", i);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "(TOTAL STREAMS = %u) = %u\n", i + 1,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;be_mu_mimo_per_grp_sz[i]));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n11ac MU_MIMO SCH STATS:\n");</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_TX_NUM_AC_MUMIMO_USER_STATS; i++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_sch_nusers_");</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%u = %u\n", i,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;ac_mu_mimo_sch_nusers[i]));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n11ax MU_MIMO SCH STATS:\n");</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS; i++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_sch_nusers_");</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%u = %u\n", i,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;ax_mu_mimo_sch_nusers[i]));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n11be MU_MIMO SCH STATS:\n");</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS; i++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "be_mu_mimo_sch_nusers_");</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%u = %u\n", i,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;be_mu_mimo_sch_nusers[i]));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n11ax OFDMA SCH STATS:\n");</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_TX_NUM_OFDMA_USER_STATS; i++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ofdma_sch_nusers_%u = %u\n", i,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;ax_ofdma_sch_nusers[i]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ul_ofdma_basic_sch_nusers_%u = %u\n", i,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;ax_ul_ofdma_nusers[i]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ul_ofdma_bsr_sch_nusers_%u = %u\n", i,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;ax_ul_ofdma_bsr_nusers[i]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ul_ofdma_bar_sch_nusers_%u = %u\n", i,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;ax_ul_ofdma_bar_nusers[i]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ul_ofdma_brp_sch_nusers_%u = %u\n\n", i,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;ax_ul_ofdma_brp_nusers[i]));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "11ax UL MUMIMO SCH STATS:\n");</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_TX_NUM_UL_MUMIMO_USER_STATS; i++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ul_mumimo_basic_sch_nusers_%u = %u\n", i,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;ax_ul_mumimo_nusers[i]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_ul_mumimo_brp_sch_nusers_%u = %u\n\n", i,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;ax_ul_mumimo_brp_nusers[i]));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_pdev_mumimo_grp_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					      struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_pdev_mumimo_grp_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	int j;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_PDEV_MUMIMO_GRP_STATS:\n");</div><div class='add'>+	len += print_array_to_buf(buf, len,</div><div class='add'>+				  "dl_mumimo_grp_tputs_observed (per bin = 300 mbps)",</div><div class='add'>+				  htt_stats_buf-&gt;dl_mumimo_grp_tputs,</div><div class='add'>+				  ATH12K_HTT_STATS_MUMIMO_TPUT_NUM_BINS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "dl_mumimo_grp eligible",</div><div class='add'>+				  htt_stats_buf-&gt;dl_mumimo_grp_eligible,</div><div class='add'>+				  ATH12K_HTT_STATS_NUM_MAX_MUMIMO_SZ, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "dl_mumimo_grp_ineligible",</div><div class='add'>+				  htt_stats_buf-&gt;dl_mumimo_grp_ineligible,</div><div class='add'>+				  ATH12K_HTT_STATS_NUM_MAX_MUMIMO_SZ, "\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "dl_mumimo_grp_invalid:\n");</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_STATS_NUM_MAX_MUMIMO_SZ; j++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "grp_id = %u", j);</div><div class='add'>+		len += print_array_to_buf(buf, len, "",</div><div class='add'>+					  htt_stats_buf-&gt;dl_mumimo_grp_invalid,</div><div class='add'>+					  ATH12K_HTT_STATS_MAX_INVALID_REASON_CODE,</div><div class='add'>+					  "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += print_array_to_buf(buf, len, "ul_mumimo_grp_best_grp_size",</div><div class='add'>+				  htt_stats_buf-&gt;ul_mumimo_grp_best_grp_size,</div><div class='add'>+				  ATH12K_HTT_STATS_NUM_MAX_MUMIMO_SZ, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ul_mumimo_grp_best_num_usrs = ",</div><div class='add'>+				  htt_stats_buf-&gt;ul_mumimo_grp_best_usrs,</div><div class='add'>+				  ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len,</div><div class='add'>+				  "ul_mumimo_grp_tputs_observed (per bin = 300 mbps)",</div><div class='add'>+				  htt_stats_buf-&gt;ul_mumimo_grp_tputs,</div><div class='add'>+				  ATH12K_HTT_STATS_MUMIMO_TPUT_NUM_BINS, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_pdev_mu_mimo_mpdu_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+						struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_pdev_mpdu_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 user_index;</div><div class='add'>+	u32 tx_sched_mode;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	user_index = __le32_to_cpu(htt_stats_buf-&gt;user_index);</div><div class='add'>+	tx_sched_mode = __le32_to_cpu(htt_stats_buf-&gt;tx_sched_mode);</div><div class='add'>+</div><div class='add'>+	if (tx_sched_mode == ATH12K_HTT_STATS_TX_SCHED_MODE_MU_MIMO_AC) {</div><div class='add'>+		if (!user_index)</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "HTT_TX_PDEV_MU_MIMO_AC_MPDU_STATS:\n");</div><div class='add'>+</div><div class='add'>+		if (user_index &lt; ATH12K_HTT_TX_NUM_AC_MUMIMO_USER_STATS) {</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ac_mu_mimo_mpdus_queued_usr_%u = %u\n",</div><div class='add'>+					 user_index,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;mpdus_queued_usr));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ac_mu_mimo_mpdus_tried_usr_%u = %u\n",</div><div class='add'>+					 user_index,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;mpdus_tried_usr));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ac_mu_mimo_mpdus_failed_usr_%u = %u\n",</div><div class='add'>+					 user_index,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;mpdus_failed_usr));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ac_mu_mimo_mpdus_requeued_usr_%u = %u\n",</div><div class='add'>+					 user_index,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;mpdus_requeued_usr));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ac_mu_mimo_err_no_ba_usr_%u = %u\n",</div><div class='add'>+					 user_index,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;err_no_ba_usr));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ac_mu_mimo_mpdu_underrun_usr_%u = %u\n",</div><div class='add'>+					 user_index,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;mpdu_underrun_usr));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					"ac_mu_mimo_ampdu_underrun_usr_%u = %u\n\n",</div><div class='add'>+					 user_index,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;ampdu_underrun_usr));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tx_sched_mode == ATH12K_HTT_STATS_TX_SCHED_MODE_MU_MIMO_AX) {</div><div class='add'>+		if (!user_index)</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "HTT_TX_PDEV_MU_MIMO_AX_MPDU_STATS:\n");</div><div class='add'>+</div><div class='add'>+		if (user_index &lt; ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS) {</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_mimo_mpdus_queued_usr_%u = %u\n",</div><div class='add'>+					 user_index,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;mpdus_queued_usr));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_mimo_mpdus_tried_usr_%u = %u\n",</div><div class='add'>+					 user_index,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;mpdus_tried_usr));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_mimo_mpdus_failed_usr_%u = %u\n",</div><div class='add'>+					 user_index,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;mpdus_failed_usr));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_mimo_mpdus_requeued_usr_%u = %u\n",</div><div class='add'>+					 user_index,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;mpdus_requeued_usr));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_mimo_err_no_ba_usr_%u = %u\n",</div><div class='add'>+					 user_index,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;err_no_ba_usr));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_mimo_mpdu_underrun_usr_%u = %u\n",</div><div class='add'>+					 user_index,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;mpdu_underrun_usr));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_mimo_ampdu_underrun_usr_%u = %u\n\n",</div><div class='add'>+					 user_index,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;ampdu_underrun_usr));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tx_sched_mode == ATH12K_HTT_STATS_TX_SCHED_MODE_MU_OFDMA_AX) {</div><div class='add'>+		if (!user_index)</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "HTT_TX_PDEV_AX_MU_OFDMA_MPDU_STATS:\n");</div><div class='add'>+</div><div class='add'>+		if (user_index &lt; ATH12K_HTT_TX_NUM_OFDMA_USER_STATS) {</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_ofdma_mpdus_queued_usr_%u = %u\n",</div><div class='add'>+					 user_index,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;mpdus_queued_usr));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_ofdma_mpdus_tried_usr_%u = %u\n",</div><div class='add'>+					 user_index,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;mpdus_tried_usr));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_ofdma_mpdus_failed_usr_%u = %u\n",</div><div class='add'>+					 user_index,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;mpdus_failed_usr));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_ofdma_mpdus_requeued_usr_%u = %u\n",</div><div class='add'>+					 user_index,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;mpdus_requeued_usr));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_ofdma_err_no_ba_usr_%u = %u\n",</div><div class='add'>+					 user_index,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;err_no_ba_usr));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_ofdma_mpdu_underrun_usr_%u = %u\n",</div><div class='add'>+					 user_index,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;mpdu_underrun_usr));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ax_mu_ofdma_ampdu_underrun_usr_%u = %u\n\n",</div><div class='add'>+					 user_index,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;ampdu_underrun_usr));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_pdev_cca_stats_hist_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					 struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_pdev_cca_stats_hist_v1_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_PDEV_CCA_STATS_HIST_TLV :\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "chan_num = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;chan_num));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_records = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_records));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "valid_cca_counters_bitmap = 0x%x\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;valid_cca_counters_bitmap));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "collection_interval = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;collection_interval));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_pdev_stats_cca_counters_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					     struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_pdev_stats_cca_counters_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_PDEV_STATS_CCA_COUNTERS_TLV:(in usec)\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_frame_usec = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_frame_usec));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_frame_usec = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_frame_usec));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_clear_usec = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_clear_usec));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "my_rx_frame_usec = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;my_rx_frame_usec));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "usec_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;usec_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "med_rx_idle_usec = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;med_rx_idle_usec));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "med_tx_idle_global_usec = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;med_tx_idle_global_usec));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "cca_obss_usec = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;cca_obss_usec));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_sounding_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				       struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_sounding_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	const __le32 *cbf_20, *cbf_40, *cbf_80, *cbf_160, *cbf_320;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 tx_sounding_mode;</div><div class='add'>+	u8 i, u;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cbf_20 = htt_stats_buf-&gt;cbf_20;</div><div class='add'>+	cbf_40 = htt_stats_buf-&gt;cbf_40;</div><div class='add'>+	cbf_80 = htt_stats_buf-&gt;cbf_80;</div><div class='add'>+	cbf_160 = htt_stats_buf-&gt;cbf_160;</div><div class='add'>+	cbf_320 = htt_stats_buf-&gt;cbf_320;</div><div class='add'>+	tx_sounding_mode = le32_to_cpu(htt_stats_buf-&gt;tx_sounding_mode);</div><div class='add'>+</div><div class='add'>+	if (tx_sounding_mode == ATH12K_HTT_TX_AC_SOUNDING_MODE) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "HTT_TX_AC_SOUNDING_STATS_TLV:\n");</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ac_cbf_20 = IBF: %u, SU_SIFS: %u, SU_RBO: %u, ",</div><div class='add'>+				 le32_to_cpu(cbf_20[ATH12K_HTT_IMPL_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_20[ATH12K_HTT_EXPL_SUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_20[ATH12K_HTT_EXPL_SURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "MU_SIFS: %u, MU_RBO: %u\n",</div><div class='add'>+				 le32_to_cpu(cbf_20[ATH12K_HTT_EXPL_MUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_20[ATH12K_HTT_EXPL_MURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ac_cbf_40 = IBF: %u, SU_SIFS: %u, SU_RBO: %u, ",</div><div class='add'>+				 le32_to_cpu(cbf_40[ATH12K_HTT_IMPL_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_40[ATH12K_HTT_EXPL_SUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_40[ATH12K_HTT_EXPL_SURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "MU_SIFS: %u, MU_RBO: %u\n",</div><div class='add'>+				 le32_to_cpu(cbf_40[ATH12K_HTT_EXPL_MUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_40[ATH12K_HTT_EXPL_MURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ac_cbf_80 = IBF: %u, SU_SIFS: %u, SU_RBO: %u, ",</div><div class='add'>+				 le32_to_cpu(cbf_80[ATH12K_HTT_IMPL_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_80[ATH12K_HTT_EXPL_SUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_80[ATH12K_HTT_EXPL_SURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "MU_SIFS: %u, MU_RBO: %u\n",</div><div class='add'>+				 le32_to_cpu(cbf_80[ATH12K_HTT_EXPL_MUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_80[ATH12K_HTT_EXPL_MURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ac_cbf_160 = IBF: %u, SU_SIFS: %u, SU_RBO: %u, ",</div><div class='add'>+				 le32_to_cpu(cbf_160[ATH12K_HTT_IMPL_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_160[ATH12K_HTT_EXPL_SUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_160[ATH12K_HTT_EXPL_SURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "MU_SIFS: %u, MU_RBO: %u\n",</div><div class='add'>+				 le32_to_cpu(cbf_160[ATH12K_HTT_EXPL_MUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_160[ATH12K_HTT_EXPL_MURBO_STEER_STATS]));</div><div class='add'>+</div><div class='add'>+		for (u = 0, i = 0; u &lt; ATH12K_HTT_TX_NUM_AC_MUMIMO_USER_STATS; u++) {</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "Sounding User_%u = 20MHz: %u, ", u,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;sounding[i++]));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len, "40MHz: %u, ",</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;sounding[i++]));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len, "80MHz: %u, ",</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;sounding[i++]));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len, "160MHz: %u\n",</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;sounding[i++]));</div><div class='add'>+		}</div><div class='add'>+	} else if (tx_sounding_mode == ATH12K_HTT_TX_AX_SOUNDING_MODE) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "\nHTT_TX_AX_SOUNDING_STATS_TLV:\n");</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_cbf_20 = IBF: %u, SU_SIFS: %u, SU_RBO: %u, ",</div><div class='add'>+				 le32_to_cpu(cbf_20[ATH12K_HTT_IMPL_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_20[ATH12K_HTT_EXPL_SUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_20[ATH12K_HTT_EXPL_SURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "MU_SIFS: %u, MU_RBO: %u\n",</div><div class='add'>+				 le32_to_cpu(cbf_20[ATH12K_HTT_EXPL_MUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_20[ATH12K_HTT_EXPL_MURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_cbf_40 = IBF: %u, SU_SIFS: %u, SU_RBO: %u, ",</div><div class='add'>+				 le32_to_cpu(cbf_40[ATH12K_HTT_IMPL_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_40[ATH12K_HTT_EXPL_SUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_40[ATH12K_HTT_EXPL_SURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "MU_SIFS: %u, MU_RBO: %u\n",</div><div class='add'>+				 le32_to_cpu(cbf_40[ATH12K_HTT_EXPL_MUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_40[ATH12K_HTT_EXPL_MURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_cbf_80 = IBF: %u, SU_SIFS: %u, SU_RBO: %u, ",</div><div class='add'>+				 le32_to_cpu(cbf_80[ATH12K_HTT_IMPL_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_80[ATH12K_HTT_EXPL_SUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_80[ATH12K_HTT_EXPL_SURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "MU_SIFS: %u, MU_RBO: %u\n",</div><div class='add'>+				 le32_to_cpu(cbf_80[ATH12K_HTT_EXPL_MUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_80[ATH12K_HTT_EXPL_MURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ax_cbf_160 = IBF: %u, SU_SIFS: %u, SU_RBO: %u, ",</div><div class='add'>+				 le32_to_cpu(cbf_160[ATH12K_HTT_IMPL_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_160[ATH12K_HTT_EXPL_SUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_160[ATH12K_HTT_EXPL_SURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "MU_SIFS: %u, MU_RBO: %u\n",</div><div class='add'>+				 le32_to_cpu(cbf_160[ATH12K_HTT_EXPL_MUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_160[ATH12K_HTT_EXPL_MURBO_STEER_STATS]));</div><div class='add'>+</div><div class='add'>+		for (u = 0, i = 0; u &lt; ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS; u++) {</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "Sounding User_%u = 20MHz: %u, ", u,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;sounding[i++]));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len, "40MHz: %u, ",</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;sounding[i++]));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len, "80MHz: %u, ",</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;sounding[i++]));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len, "160MHz: %u\n",</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;sounding[i++]));</div><div class='add'>+		}</div><div class='add'>+	} else if (tx_sounding_mode == ATH12K_HTT_TX_BE_SOUNDING_MODE) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "\nHTT_TX_BE_SOUNDING_STATS_TLV:\n");</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "be_cbf_20 = IBF: %u, SU_SIFS: %u, SU_RBO: %u, ",</div><div class='add'>+				 le32_to_cpu(cbf_20[ATH12K_HTT_IMPL_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_20[ATH12K_HTT_EXPL_SUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_20[ATH12K_HTT_EXPL_SURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "MU_SIFS: %u, MU_RBO: %u\n",</div><div class='add'>+				 le32_to_cpu(cbf_20[ATH12K_HTT_EXPL_MUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_20[ATH12K_HTT_EXPL_MURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "be_cbf_40 = IBF: %u, SU_SIFS: %u, SU_RBO: %u, ",</div><div class='add'>+				 le32_to_cpu(cbf_40[ATH12K_HTT_IMPL_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_40[ATH12K_HTT_EXPL_SUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_40[ATH12K_HTT_EXPL_SURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "MU_SIFS: %u, MU_RBO: %u\n",</div><div class='add'>+				 le32_to_cpu(cbf_40[ATH12K_HTT_EXPL_MUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_40[ATH12K_HTT_EXPL_MURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "be_cbf_80 = IBF: %u, SU_SIFS: %u, SU_RBO: %u, ",</div><div class='add'>+				 le32_to_cpu(cbf_80[ATH12K_HTT_IMPL_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_80[ATH12K_HTT_EXPL_SUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_80[ATH12K_HTT_EXPL_SURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "MU_SIFS: %u, MU_RBO: %u\n",</div><div class='add'>+				 le32_to_cpu(cbf_80[ATH12K_HTT_EXPL_MUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_80[ATH12K_HTT_EXPL_MURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "be_cbf_160 = IBF: %u, SU_SIFS: %u, SU_RBO: %u, ",</div><div class='add'>+				 le32_to_cpu(cbf_160[ATH12K_HTT_IMPL_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_160[ATH12K_HTT_EXPL_SUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_160[ATH12K_HTT_EXPL_SURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "MU_SIFS: %u, MU_RBO: %u\n",</div><div class='add'>+				 le32_to_cpu(cbf_160[ATH12K_HTT_EXPL_MUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_160[ATH12K_HTT_EXPL_MURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "be_cbf_320 = IBF: %u, SU_SIFS: %u, SU_RBO: %u, ",</div><div class='add'>+				 le32_to_cpu(cbf_320[ATH12K_HTT_IMPL_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_320[ATH12K_HTT_EXPL_SUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_320[ATH12K_HTT_EXPL_SURBO_STEER_STATS]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "MU_SIFS: %u, MU_RBO: %u\n",</div><div class='add'>+				 le32_to_cpu(cbf_320[ATH12K_HTT_EXPL_MUSIFS_STEER_STATS]),</div><div class='add'>+				 le32_to_cpu(cbf_320[ATH12K_HTT_EXPL_MURBO_STEER_STATS]));</div><div class='add'>+		for (u = 0, i = 0; u &lt; ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS; u++) {</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "Sounding User_%u = 20MHz: %u, ", u,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;sounding[i++]));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len, "40MHz: %u, ",</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;sounding[i++]));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len, "80MHz: %u, ",</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;sounding[i++]));</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "160MHz: %u, 320MHz: %u\n",</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;sounding[i++]),</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;sounding_320[u]));</div><div class='add'>+		}</div><div class='add'>+	} else if (tx_sounding_mode == ATH12K_HTT_TX_CMN_SOUNDING_MODE) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "\nCV UPLOAD HANDLER STATS:\n");</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_nc_mismatch_err = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_nc_mismatch_err));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_fcs_err = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_fcs_err));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_frag_idx_mismatch = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_frag_idx_mismatch));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_invalid_peer_id = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_invalid_peer_id));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_no_txbf_setup = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_no_txbf_setup));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_expiry_in_update = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_expiry_in_update));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_pkt_bw_exceed = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_pkt_bw_exceed));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_dma_not_done_err = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_dma_not_done_err));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_update_failed = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_update_failed));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_dma_timeout_error = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_dma_timeout_error));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_buf_ibf_uploads = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_buf_ibf_uploads));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_buf_ebf_uploads = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_buf_ebf_uploads));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_buf_received = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_buf_received));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_buf_fed_back = %u\n\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_buf_fed_back));</div><div class='add'>+</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "CV QUERY STATS:\n");</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_total_query = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_total_query));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "cv_total_pattern_query = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_total_pattern_query));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_total_bw_query = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_total_bw_query));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_invalid_bw_coding = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_invalid_bw_coding));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_forced_sounding = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_forced_sounding));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "cv_standalone_sounding = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_standalone_sounding));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_nc_mismatch = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_nc_mismatch));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_fb_type_mismatch = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_fb_type_mismatch));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_ofdma_bw_mismatch = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_ofdma_bw_mismatch));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_bw_mismatch = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_bw_mismatch));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_pattern_mismatch = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_pattern_mismatch));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_preamble_mismatch = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_preamble_mismatch));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_nr_mismatch = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_nr_mismatch));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "cv_in_use_cnt_exceeded = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_in_use_cnt_exceeded));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_ntbr_sounding = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_ntbr_sounding));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "cv_found_upload_in_progress = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_found_upload_in_progress));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "cv_expired_during_query = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_expired_during_query));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_found = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_found));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_not_found = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_not_found));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_total_query_ibf = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_total_query_ibf));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_found_ibf = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_found_ibf));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "cv_not_found_ibf = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_not_found_ibf));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "cv_expired_during_query_ibf = %u\n\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;cv_expired_during_query_ibf));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_pdev_obss_pd_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_pdev_obss_pd_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u8 i;</div><div class='add'>+	static const char *access_cat_names[ATH12K_HTT_NUM_AC_WMM] = {"best effort",</div><div class='add'>+								      "background",</div><div class='add'>+								      "video", "voice"};</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_PDEV_OBSS_PD_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_spatial_reuse_tx = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_sr_tx_transmissions));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "num_spatial_reuse_opportunities = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_spatial_reuse_opportunities));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_non_srg_opportunities = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_non_srg_opportunities));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_non_srg_ppdu_tried = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_non_srg_ppdu_tried));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_non_srg_ppdu_success = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_non_srg_ppdu_success));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_srg_opportunities = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_srg_opportunities));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_srg_ppdu_tried = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_srg_ppdu_tried));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_srg_ppdu_success = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_srg_ppdu_success));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_psr_opportunities = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_psr_opportunities));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_psr_ppdu_tried = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_psr_ppdu_tried));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_psr_ppdu_success = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_psr_ppdu_success));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "min_duration_check_flush_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_obss_min_dur_check_flush_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sr_ppdu_abort_flush_cnt = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_sr_ppdu_abort_flush_cnt));</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_PDEV_OBSS_PD_PER_AC_STATS:\n");</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_NUM_AC_WMM; i++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "Access Category %u (%s)\n",</div><div class='add'>+				 i, access_cat_names[i]);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "num_non_srg_ppdu_tried = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;num_non_srg_tried_per_ac[i]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "num_non_srg_ppdu_success = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;num_non_srg_success_ac[i]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "num_srg_ppdu_tried = %u\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;num_srg_tried_per_ac[i]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "num_srg_ppdu_success = %u\n\n",</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;num_srg_success_per_ac[i]));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_latency_prof_ctx_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				      struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_latency_prof_ctx_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_STATS_LATENCY_CTX_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "duration = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;duration));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_msdu_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_msdu_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_mpdu_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_mpdu_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_msdu_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_msdu_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_mpdu_cnt = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_mpdu_cnt));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_latency_prof_cnt(const void *tag_buf, u16 tag_len,</div><div class='add'>+				  struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_latency_prof_cnt_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_STATS_LATENCY_CNT_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "prof_enable_cnt = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;prof_enable_cnt));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_latency_prof_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_latency_prof_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (le32_to_cpu(htt_stats_buf-&gt;print_header) == 1) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "HTT_STATS_LATENCY_PROF_TLV:\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "Latency name = %s\n",</div><div class='add'>+			 htt_stats_buf-&gt;latency_prof_name);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "minimum = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;min));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "maximum = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;max));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "last = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;last));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "total = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tot));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "average = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;avg));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "histogram interval = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;hist_intvl));</div><div class='add'>+	len += print_array_to_buf(buf, len, "histogram", htt_stats_buf-&gt;hist,</div><div class='add'>+				  ATH12K_HTT_LATENCY_PROFILE_NUM_MAX_HIST, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_ul_ofdma_trigger_stats(const void *tag_buf, u16 tag_len,</div><div class='add'>+					struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_rx_pdev_ul_trigger_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 mac_id;</div><div class='add'>+	u8 j;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_id = __le32_to_cpu(htt_stats_buf-&gt;mac_id__word);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_RX_PDEV_UL_TRIGGER_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n",</div><div class='add'>+			 u32_get_bits(mac_id, ATH12K_HTT_STATS_MAC_ID));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_11ax_ul_ofdma = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_11ax_ul_ofdma));</div><div class='add'>+	len += print_array_to_buf(buf, len, "ul_ofdma_rx_mcs",</div><div class='add'>+				  htt_stats_buf-&gt;ul_ofdma_rx_mcs,</div><div class='add'>+				  ATH12K_HTT_RX_NUM_MCS_CNTRS, "\n");</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_RX_NUM_GI_CNTRS; j++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "ul_ofdma_rx_gi[%u]", j);</div><div class='add'>+		len += print_array_to_buf(buf, len, "",</div><div class='add'>+					  htt_stats_buf-&gt;ul_ofdma_rx_gi[j],</div><div class='add'>+					  ATH12K_HTT_RX_NUM_MCS_CNTRS, "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += print_array_to_buf_index(buf, len, "ul_ofdma_rx_nss", 1,</div><div class='add'>+					htt_stats_buf-&gt;ul_ofdma_rx_nss,</div><div class='add'>+					ATH12K_HTT_RX_NUM_SPATIAL_STREAMS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ul_ofdma_rx_bw",</div><div class='add'>+				  htt_stats_buf-&gt;ul_ofdma_rx_bw,</div><div class='add'>+				  ATH12K_HTT_RX_NUM_BW_CNTRS, "\n");</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_RX_NUM_REDUCED_CHAN_TYPES; j++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, j == 0 ?</div><div class='add'>+				 "half_ul_ofdma_rx_bw" :</div><div class='add'>+				 "quarter_ul_ofdma_rx_bw");</div><div class='add'>+		len += print_array_to_buf(buf, len, "", htt_stats_buf-&gt;red_bw[j],</div><div class='add'>+					  ATH12K_HTT_RX_NUM_BW_CNTRS, "\n");</div><div class='add'>+	}</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ul_ofdma_rx_stbc = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ul_ofdma_rx_stbc));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ul_ofdma_rx_ldpc = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ul_ofdma_rx_ldpc));</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_ulofdma_data_ru_size_ppdu = ");</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_RX_NUM_RU_SIZE_CNTRS; j++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %s:%u ",</div><div class='add'>+				 ath12k_htt_ax_tx_rx_ru_size_to_str(j),</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;data_ru_size_ppdu[j]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "rx_ulofdma_non_data_ru_size_ppdu = ");</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_RX_NUM_RU_SIZE_CNTRS; j++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %s:%u ",</div><div class='add'>+				 ath12k_htt_ax_tx_rx_ru_size_to_str(j),</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;non_data_ru_size_ppdu[j]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_rssi_track_sta_aid",</div><div class='add'>+				  htt_stats_buf-&gt;uplink_sta_aid,</div><div class='add'>+				  ATH12K_HTT_RX_UL_MAX_UPLINK_RSSI_TRACK, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_sta_target_rssi",</div><div class='add'>+				  htt_stats_buf-&gt;uplink_sta_target_rssi,</div><div class='add'>+				  ATH12K_HTT_RX_UL_MAX_UPLINK_RSSI_TRACK, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_sta_fd_rssi",</div><div class='add'>+				  htt_stats_buf-&gt;uplink_sta_fd_rssi,</div><div class='add'>+				  ATH12K_HTT_RX_UL_MAX_UPLINK_RSSI_TRACK, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_sta_power_headroom",</div><div class='add'>+				  htt_stats_buf-&gt;uplink_sta_power_headroom,</div><div class='add'>+				  ATH12K_HTT_RX_UL_MAX_UPLINK_RSSI_TRACK, "\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "ul_ofdma_basic_trigger_rx_qos_null_only = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ul_ofdma_bsc_trig_rx_qos_null_only));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_ul_ofdma_user_stats(const void *tag_buf, u16 tag_len,</div><div class='add'>+				     struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_rx_pdev_ul_ofdma_user_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 user_index;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	user_index = __le32_to_cpu(htt_stats_buf-&gt;user_index);</div><div class='add'>+</div><div class='add'>+	if (!user_index)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "HTT_RX_PDEV_UL_OFDMA_USER_STAS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_ulofdma_non_data_ppdu_%u = %u\n",</div><div class='add'>+			 user_index,</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_ulofdma_non_data_ppdu));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_ulofdma_data_ppdu_%u = %u\n",</div><div class='add'>+			 user_index,</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_ulofdma_data_ppdu));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_ulofdma_mpdu_ok_%u = %u\n",</div><div class='add'>+			 user_index,</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_ulofdma_mpdu_ok));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_ulofdma_mpdu_fail_%u = %u\n",</div><div class='add'>+			 user_index,</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_ulofdma_mpdu_fail));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "rx_ulofdma_non_data_nusers_%u = %u\n", user_index,</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_ulofdma_non_data_nusers));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_ulofdma_data_nusers_%u = %u\n\n",</div><div class='add'>+			 user_index,</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_ulofdma_data_nusers));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_ul_mumimo_trig_stats(const void *tag_buf, u16 tag_len,</div><div class='add'>+				      struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_rx_ul_mumimo_trig_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	char str_buf[ATH12K_HTT_MAX_STRING_LEN] = {};</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 mac_id;</div><div class='add'>+	u16 index;</div><div class='add'>+	u8 i, j;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_id = __le32_to_cpu(htt_stats_buf-&gt;mac_id__word);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_RX_PDEV_UL_MUMIMO_TRIG_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n",</div><div class='add'>+			 u32_get_bits(mac_id, ATH12K_HTT_STATS_MAC_ID));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_11ax_ul_mumimo = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_11ax_ul_mumimo));</div><div class='add'>+	index = 0;</div><div class='add'>+	memset(str_buf, 0x0, ATH12K_HTT_MAX_STRING_LEN);</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_RX_NUM_MCS_CNTRS; i++)</div><div class='add'>+		index += scnprintf(&amp;str_buf[index], ATH12K_HTT_MAX_STRING_LEN - index,</div><div class='add'>+				  " %u:%u,", i,</div><div class='add'>+				  le32_to_cpu(htt_stats_buf-&gt;ul_mumimo_rx_mcs[i]));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_RX_NUM_EXTRA_MCS_CNTRS; i++)</div><div class='add'>+		index += scnprintf(&amp;str_buf[index], ATH12K_HTT_MAX_STRING_LEN - index,</div><div class='add'>+				  " %u:%u,", i + ATH12K_HTT_RX_NUM_MCS_CNTRS,</div><div class='add'>+				  le32_to_cpu(htt_stats_buf-&gt;ul_mumimo_rx_mcs_ext[i]));</div><div class='add'>+	str_buf[--index] = '\0';</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ul_mumimo_rx_mcs = %s\n", str_buf);</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_RX_NUM_GI_CNTRS; j++) {</div><div class='add'>+		index = 0;</div><div class='add'>+		memset(&amp;str_buf[index], 0x0, ATH12K_HTT_MAX_STRING_LEN);</div><div class='add'>+		for (i = 0; i &lt; ATH12K_HTT_RX_NUM_MCS_CNTRS; i++)</div><div class='add'>+			index += scnprintf(&amp;str_buf[index],</div><div class='add'>+					  ATH12K_HTT_MAX_STRING_LEN - index,</div><div class='add'>+					  " %u:%u,", i,</div><div class='add'>+					  le32_to_cpu(htt_stats_buf-&gt;ul_rx_gi[j][i]));</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ATH12K_HTT_RX_NUM_EXTRA_MCS_CNTRS; i++)</div><div class='add'>+			index += scnprintf(&amp;str_buf[index],</div><div class='add'>+					  ATH12K_HTT_MAX_STRING_LEN - index,</div><div class='add'>+					  " %u:%u,", i + ATH12K_HTT_RX_NUM_MCS_CNTRS,</div><div class='add'>+					  le32_to_cpu(htt_stats_buf-&gt;ul_gi_ext[j][i]));</div><div class='add'>+		str_buf[--index] = '\0';</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ul_mumimo_rx_gi_%u = %s\n", j, str_buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	index = 0;</div><div class='add'>+	memset(str_buf, 0x0, ATH12K_HTT_MAX_STRING_LEN);</div><div class='add'>+	len += print_array_to_buf_index(buf, len, "ul_mumimo_rx_nss", 1,</div><div class='add'>+					htt_stats_buf-&gt;ul_mumimo_rx_nss,</div><div class='add'>+					ATH12K_HTT_RX_NUM_SPATIAL_STREAMS, "\n");</div><div class='add'>+</div><div class='add'>+	len += print_array_to_buf(buf, len, "ul_mumimo_rx_bw",</div><div class='add'>+				  htt_stats_buf-&gt;ul_mumimo_rx_bw,</div><div class='add'>+				  ATH12K_HTT_RX_NUM_BW_CNTRS, "\n");</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_RX_NUM_REDUCED_CHAN_TYPES; i++) {</div><div class='add'>+		index = 0;</div><div class='add'>+		memset(str_buf, 0x0, ATH12K_HTT_MAX_STRING_LEN);</div><div class='add'>+		for (j = 0; j &lt; ATH12K_HTT_RX_NUM_BW_CNTRS; j++)</div><div class='add'>+			index += scnprintf(&amp;str_buf[index],</div><div class='add'>+					  ATH12K_HTT_MAX_STRING_LEN - index,</div><div class='add'>+					  " %u:%u,", j,</div><div class='add'>+					  le32_to_cpu(htt_stats_buf-&gt;red_bw[i][j]));</div><div class='add'>+		str_buf[--index] = '\0';</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%s = %s\n",</div><div class='add'>+				 i == 0 ? "half_ul_mumimo_rx_bw" :</div><div class='add'>+				 "quarter_ul_mumimo_rx_bw", str_buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ul_mumimo_rx_stbc = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ul_mumimo_rx_stbc));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ul_mumimo_rx_ldpc = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ul_mumimo_rx_ldpc));</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_RX_NUM_SPATIAL_STREAMS; j++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "rx_ul_mumimo_rssi_in_dbm: chain%u ", j);</div><div class='add'>+		len += print_array_to_buf_s8(buf, len, "", 0,</div><div class='add'>+					     htt_stats_buf-&gt;ul_rssi[j],</div><div class='add'>+					     ATH12K_HTT_RX_NUM_BW_CNTRS, "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_TX_UL_MUMIMO_USER_STATS; j++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "rx_ul_mumimo_target_rssi: user_%u ", j);</div><div class='add'>+		len += print_array_to_buf_s8(buf, len, "", 0,</div><div class='add'>+					     htt_stats_buf-&gt;tgt_rssi[j],</div><div class='add'>+					     ATH12K_HTT_RX_NUM_BW_CNTRS, "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_TX_UL_MUMIMO_USER_STATS; j++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "rx_ul_mumimo_fd_rssi: user_%u ", j);</div><div class='add'>+		len += print_array_to_buf_s8(buf, len, "", 0,</div><div class='add'>+					     htt_stats_buf-&gt;fd[j],</div><div class='add'>+					     ATH12K_HTT_RX_NUM_SPATIAL_STREAMS, "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_TX_UL_MUMIMO_USER_STATS; j++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "rx_ulmumimo_pilot_evm_db_mean: user_%u ", j);</div><div class='add'>+		len += print_array_to_buf_s8(buf, len, "", 0,</div><div class='add'>+					     htt_stats_buf-&gt;db[j],</div><div class='add'>+					     ATH12K_HTT_RX_NUM_SPATIAL_STREAMS, "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "ul_mumimo_basic_trigger_rx_qos_null_only = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mumimo_bsc_trig_rx_qos_null_only));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_rx_fse_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				  struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_rx_fse_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_STATS_RX_FSE_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "=== Software RX FSE STATS ===\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "Enable count  = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_enable_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "Disable count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_disable_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "Cache invalidate entry count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_cache_invalidate_entry_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "Full cache invalidate count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_full_cache_invalidate_cnt));</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n=== Hardware RX FSE STATS ===\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "Cache hits count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_num_cache_hits_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "Cache no. of searches = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_num_searches_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "Cache occupancy peak count:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "[0] = %u [1-16] = %u [17-32] = %u ",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_cache_occupancy_peak_cnt[0]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_cache_occupancy_peak_cnt[1]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_cache_occupancy_peak_cnt[2]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "[33-48] = %u [49-64] = %u ",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_cache_occupancy_peak_cnt[3]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_cache_occupancy_peak_cnt[4]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "[65-80] = %u [81-96] = %u ",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_cache_occupancy_peak_cnt[5]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_cache_occupancy_peak_cnt[6]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "[97-112] = %u [113-127] = %u ",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_cache_occupancy_peak_cnt[7]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_cache_occupancy_peak_cnt[8]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "[128] = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_cache_occupancy_peak_cnt[9]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "Cache occupancy current count:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "[0] = %u [1-16] = %u [17-32] = %u ",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_cache_occupancy_curr_cnt[0]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_cache_occupancy_curr_cnt[1]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_cache_occupancy_curr_cnt[2]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "[33-48] = %u [49-64] = %u ",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_cache_occupancy_curr_cnt[3]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_cache_occupancy_curr_cnt[4]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "[65-80] = %u [81-96] = %u ",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_cache_occupancy_curr_cnt[5]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_cache_occupancy_curr_cnt[6]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "[97-112] = %u [113-127] = %u ",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_cache_occupancy_curr_cnt[7]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_cache_occupancy_curr_cnt[8]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "[128] = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_cache_occupancy_curr_cnt[9]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "Cache search square count:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "[0] = %u [1-50] = %u [51-100] = %u ",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_search_stat_square_cnt[0]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_search_stat_square_cnt[1]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_search_stat_square_cnt[2]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "[101-200] = %u [201-255] = %u ",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_search_stat_square_cnt[3]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_search_stat_square_cnt[4]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "[256] = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_search_stat_square_cnt[5]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "Cache search peak pending count:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "[0] = %u [1-2] = %u [3-4] = %u ",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_search_stat_peak_cnt[0]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_search_stat_peak_cnt[1]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_search_stat_peak_cnt[2]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "[Greater/Equal to 5] = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_search_stat_peak_cnt[3]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "Cache search tot pending count:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "[0] = %u [1-2] = %u [3-4] = %u ",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_search_stat_pending_cnt[0]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_search_stat_pending_cnt[1]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_search_stat_pending_cnt[2]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "[Greater/Equal to 5] = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fse_search_stat_pending_cnt[3]));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_pdev_tx_rate_txbf_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					     struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_pdev_txrate_txbf_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_STATS_PDEV_TX_RATE_TXBF_STATS:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "Legacy OFDM Rates: 6 Mbps: %u, ",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_legacy_ofdm_rate[0]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "9 Mbps: %u, 12 Mbps: %u, ",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_legacy_ofdm_rate[1]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_legacy_ofdm_rate[2]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "18 Mbps: %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_legacy_ofdm_rate[3]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "24 Mbps: %u, 36 Mbps: %u, ",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_legacy_ofdm_rate[4]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_legacy_ofdm_rate[5]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "48 Mbps: %u, 54 Mbps: %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_legacy_ofdm_rate[6]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_legacy_ofdm_rate[7]));</div><div class='add'>+</div><div class='add'>+	len += print_array_to_buf(buf, len, "tx_ol_mcs", htt_stats_buf-&gt;tx_su_ol_mcs,</div><div class='add'>+				  ATH12K_HTT_TX_BF_RATE_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "tx_ibf_mcs", htt_stats_buf-&gt;tx_su_ibf_mcs,</div><div class='add'>+				  ATH12K_HTT_TX_BF_RATE_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "tx_txbf_mcs", htt_stats_buf-&gt;tx_su_txbf_mcs,</div><div class='add'>+				  ATH12K_HTT_TX_BF_RATE_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	len += print_array_to_buf_index(buf, len, "tx_ol_nss", 1,</div><div class='add'>+					htt_stats_buf-&gt;tx_su_ol_nss,</div><div class='add'>+					ATH12K_HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS,</div><div class='add'>+					"\n");</div><div class='add'>+	len += print_array_to_buf_index(buf, len, "tx_ibf_nss", 1,</div><div class='add'>+					htt_stats_buf-&gt;tx_su_ibf_nss,</div><div class='add'>+					ATH12K_HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS,</div><div class='add'>+					"\n");</div><div class='add'>+	len += print_array_to_buf_index(buf, len, "tx_txbf_nss", 1,</div><div class='add'>+					htt_stats_buf-&gt;tx_su_txbf_nss,</div><div class='add'>+					ATH12K_HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS,</div><div class='add'>+					"\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "tx_ol_bw", htt_stats_buf-&gt;tx_su_ol_bw,</div><div class='add'>+				  ATH12K_HTT_TXBF_NUM_BW_CNTRS, "\n");</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_TXBF_NUM_REDUCED_CHAN_TYPES; i++)</div><div class='add'>+		len += print_array_to_buf(buf, len, i ? "quarter_tx_ol_bw" :</div><div class='add'>+					  "half_tx_ol_bw",</div><div class='add'>+					  htt_stats_buf-&gt;ol[i],</div><div class='add'>+					  ATH12K_HTT_TXBF_NUM_BW_CNTRS,</div><div class='add'>+					  "\n");</div><div class='add'>+</div><div class='add'>+	len += print_array_to_buf(buf, len, "tx_ibf_bw", htt_stats_buf-&gt;tx_su_ibf_bw,</div><div class='add'>+				  ATH12K_HTT_TXBF_NUM_BW_CNTRS, "\n");</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_TXBF_NUM_REDUCED_CHAN_TYPES; i++)</div><div class='add'>+		len += print_array_to_buf(buf, len, i ? "quarter_tx_ibf_bw" :</div><div class='add'>+					  "half_tx_ibf_bw",</div><div class='add'>+					  htt_stats_buf-&gt;ibf[i],</div><div class='add'>+					  ATH12K_HTT_TXBF_NUM_BW_CNTRS,</div><div class='add'>+					  "\n");</div><div class='add'>+</div><div class='add'>+	len += print_array_to_buf(buf, len, "tx_txbf_bw", htt_stats_buf-&gt;tx_su_txbf_bw,</div><div class='add'>+				  ATH12K_HTT_TXBF_NUM_BW_CNTRS, "\n");</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_TXBF_NUM_REDUCED_CHAN_TYPES; i++)</div><div class='add'>+		len += print_array_to_buf(buf, len, i ? "quarter_tx_txbf_bw" :</div><div class='add'>+					  "half_tx_txbf_bw",</div><div class='add'>+					  htt_stats_buf-&gt;txbf[i],</div><div class='add'>+					  ATH12K_HTT_TXBF_NUM_BW_CNTRS,</div><div class='add'>+					  "\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_STATS_PDEV_TXBF_FLAG_RETURN_STATS:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "TXBF_reason_code_stats: 0:%u, 1:%u,",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;txbf_flag_set_mu_mode),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;txbf_flag_set_final_status));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, " 2:%u, 3:%u, 4:%u, 5:%u, ",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;txbf_flag_not_set_verified_txbf_mode),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;txbf_flag_not_set_disable_p2p_access),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;txbf_flag_not_set_max_nss_in_he160),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;txbf_flag_not_set_disable_uldlofdma));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "6:%u, 7:%u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;txbf_flag_not_set_mcs_threshold_val),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;txbf_flag_not_set_final_status));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_txbf_ofdma_ax_ndpa_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					      struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_txbf_ofdma_ax_ndpa_stats_tlv *stats_buf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 num_elements;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	num_elements = le32_to_cpu(stats_buf-&gt;num_elems_ax_ndpa_arr);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TXBF_OFDMA_AX_NDPA_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_ofdma_ndpa_queued =");</div><div class='add'>+	for (i = 0; i &lt; num_elements; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u,", i + 1,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;ax_ndpa[i].ax_ofdma_ndpa_queued));</div><div class='add'>+	len--;</div><div class='add'>+	*(buf + len) = '\0';</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nax_ofdma_ndpa_tried =");</div><div class='add'>+	for (i = 0; i &lt; num_elements; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u,", i + 1,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;ax_ndpa[i].ax_ofdma_ndpa_tried));</div><div class='add'>+	len--;</div><div class='add'>+	*(buf + len) = '\0';</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nax_ofdma_ndpa_flushed =");</div><div class='add'>+	for (i = 0; i &lt; num_elements; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u,", i + 1,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;ax_ndpa[i].ax_ofdma_ndpa_flush));</div><div class='add'>+	len--;</div><div class='add'>+	*(buf + len) = '\0';</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nax_ofdma_ndpa_err =");</div><div class='add'>+	for (i = 0; i &lt; num_elements; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u,", i + 1,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;ax_ndpa[i].ax_ofdma_ndpa_err));</div><div class='add'>+	len--;</div><div class='add'>+	*(buf + len) = '\0';</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_txbf_ofdma_ax_ndp_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					     struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_txbf_ofdma_ax_ndp_stats_tlv *stats_buf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 num_elements;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	num_elements = le32_to_cpu(stats_buf-&gt;num_elems_ax_ndp_arr);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TXBF_OFDMA_AX_NDP_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_ofdma_ndp_queued =");</div><div class='add'>+	for (i = 0; i &lt; num_elements; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u,", i + 1,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;ax_ndp[i].ax_ofdma_ndp_queued));</div><div class='add'>+	len--;</div><div class='add'>+	*(buf + len) = '\0';</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nax_ofdma_ndp_tried =");</div><div class='add'>+	for (i = 0; i &lt; num_elements; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u,", i + 1,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;ax_ndp[i].ax_ofdma_ndp_tried));</div><div class='add'>+	len--;</div><div class='add'>+	*(buf + len) = '\0';</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nax_ofdma_ndp_flushed =");</div><div class='add'>+	for (i = 0; i &lt; num_elements; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u,", i + 1,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;ax_ndp[i].ax_ofdma_ndp_flush));</div><div class='add'>+	len--;</div><div class='add'>+	*(buf + len) = '\0';</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nax_ofdma_ndp_err =");</div><div class='add'>+	for (i = 0; i &lt; num_elements; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u,", i + 1,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;ax_ndp[i].ax_ofdma_ndp_err));</div><div class='add'>+	len--;</div><div class='add'>+	*(buf + len) = '\0';</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_txbf_ofdma_ax_brp_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					     struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_txbf_ofdma_ax_brp_stats_tlv *stats_buf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 num_elements;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	num_elements = le32_to_cpu(stats_buf-&gt;num_elems_ax_brp_arr);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TXBF_OFDMA_AX_BRP_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_ofdma_brpoll_queued =");</div><div class='add'>+	for (i = 0; i &lt; num_elements; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u,", i + 1,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;ax_brp[i].ax_ofdma_brp_queued));</div><div class='add'>+	len--;</div><div class='add'>+	*(buf + len) = '\0';</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nax_ofdma_brpoll_tied =");</div><div class='add'>+	for (i = 0; i &lt; num_elements; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u,", i + 1,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;ax_brp[i].ax_ofdma_brp_tried));</div><div class='add'>+	len--;</div><div class='add'>+	*(buf + len) = '\0';</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nax_ofdma_brpoll_flushed =");</div><div class='add'>+	for (i = 0; i &lt; num_elements; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u,", i + 1,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;ax_brp[i].ax_ofdma_brp_flushed));</div><div class='add'>+	len--;</div><div class='add'>+	*(buf + len) = '\0';</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nax_ofdma_brp_err =");</div><div class='add'>+	for (i = 0; i &lt; num_elements; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u,", i + 1,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;ax_brp[i].ax_ofdma_brp_err));</div><div class='add'>+	len--;</div><div class='add'>+	*(buf + len) = '\0';</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nax_ofdma_brp_err_num_cbf_rcvd =");</div><div class='add'>+	for (i = 0; i &lt; num_elements; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u,", i + 1,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;ax_brp[i].ax_ofdma_num_cbf_rcvd));</div><div class='add'>+	len--;</div><div class='add'>+	*(buf + len) = '\0';</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_txbf_ofdma_ax_steer_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					       struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_txbf_ofdma_ax_steer_stats_tlv *stats_buf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 num_elements;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	num_elements = le32_to_cpu(stats_buf-&gt;num_elems_ax_steer_arr);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TXBF_OFDMA_AX_STEER_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_ofdma_num_ppdu_steer =");</div><div class='add'>+	for (i = 0; i &lt; num_elements; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u,", i + 1,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;ax_steer[i].num_ppdu_steer));</div><div class='add'>+	len--;</div><div class='add'>+	*(buf + len) = '\0';</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nax_ofdma_num_usrs_prefetch =");</div><div class='add'>+	for (i = 0; i &lt; num_elements; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u,", i + 1,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;ax_steer[i].num_usr_prefetch));</div><div class='add'>+	len--;</div><div class='add'>+	*(buf + len) = '\0';</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nax_ofdma_num_usrs_sound =");</div><div class='add'>+	for (i = 0; i &lt; num_elements; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u,", i + 1,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;ax_steer[i].num_usr_sound));</div><div class='add'>+	len--;</div><div class='add'>+	*(buf + len) = '\0';</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nax_ofdma_num_usrs_force_sound =");</div><div class='add'>+	for (i = 0; i &lt; num_elements; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u,", i + 1,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;ax_steer[i].num_usr_force_sound));</div><div class='add'>+	len--;</div><div class='add'>+	*(buf + len) = '\0';</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_txbf_ofdma_ax_steer_mpdu_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+						    struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_txbf_ofdma_ax_steer_mpdu_stats_tlv *stats_buf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TXBF_OFDMA_AX_STEER_MPDU_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rbo_steer_mpdus_tried = %u\n",</div><div class='add'>+			 le32_to_cpu(stats_buf-&gt;ax_ofdma_rbo_steer_mpdus_tried));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rbo_steer_mpdus_failed = %u\n",</div><div class='add'>+			 le32_to_cpu(stats_buf-&gt;ax_ofdma_rbo_steer_mpdus_failed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sifs_steer_mpdus_tried = %u\n",</div><div class='add'>+			 le32_to_cpu(stats_buf-&gt;ax_ofdma_sifs_steer_mpdus_tried));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sifs_steer_mpdus_failed = %u\n\n",</div><div class='add'>+			 le32_to_cpu(stats_buf-&gt;ax_ofdma_sifs_steer_mpdus_failed));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_htt_print_dlpager_entry(const struct ath12k_htt_pgs_info *pg_info,</div><div class='add'>+					   int idx, char *str_buf)</div><div class='add'>+{</div><div class='add'>+	u64 page_timestamp;</div><div class='add'>+	u16 index = 0;</div><div class='add'>+</div><div class='add'>+	page_timestamp = ath12k_le32hilo_to_u64(pg_info-&gt;ts_msb, pg_info-&gt;ts_lsb);</div><div class='add'>+</div><div class='add'>+	index += snprintf(&amp;str_buf[index], ATH12K_HTT_MAX_STRING_LEN - index,</div><div class='add'>+			  "Index - %u ; Page Number - %u ; ",</div><div class='add'>+			  idx, le32_to_cpu(pg_info-&gt;page_num));</div><div class='add'>+	index += snprintf(&amp;str_buf[index], ATH12K_HTT_MAX_STRING_LEN - index,</div><div class='add'>+			  "Num of pages - %u ; Timestamp - %lluus\n",</div><div class='add'>+			  le32_to_cpu(pg_info-&gt;num_pgs), page_timestamp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_dlpager_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				   struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_dl_pager_stats_tlv *stat_buf = tag_buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 dword_lock, dword_unlock;</div><div class='add'>+	int i;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u8 pg_locked;</div><div class='add'>+	u8 pg_unlock;</div><div class='add'>+	char str_buf[ATH12K_HTT_MAX_STRING_LEN] = {};</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*stat_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dword_lock = le32_get_bits(stat_buf-&gt;info2,</div><div class='add'>+				   ATH12K_HTT_DLPAGER_TOTAL_LOCK_PAGES_INFO2);</div><div class='add'>+	dword_unlock = le32_get_bits(stat_buf-&gt;info2,</div><div class='add'>+				     ATH12K_HTT_DLPAGER_TOTAL_FREE_PAGES_INFO2);</div><div class='add'>+</div><div class='add'>+	pg_locked = ATH12K_HTT_STATS_PAGE_LOCKED;</div><div class='add'>+	pg_unlock = ATH12K_HTT_STATS_PAGE_UNLOCKED;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_DLPAGER_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ASYNC locked pages = %u\n",</div><div class='add'>+			 le32_get_bits(stat_buf-&gt;info0,</div><div class='add'>+				       ATH12K_HTT_DLPAGER_ASYNC_LOCK_PG_CNT_INFO0));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "SYNC locked pages = %u\n",</div><div class='add'>+			 le32_get_bits(stat_buf-&gt;info0,</div><div class='add'>+				       ATH12K_HTT_DLPAGER_SYNC_LOCK_PG_CNT_INFO0));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "Total locked pages = %u\n",</div><div class='add'>+			 le32_get_bits(stat_buf-&gt;info1,</div><div class='add'>+				       ATH12K_HTT_DLPAGER_TOTAL_LOCK_PAGES_INFO1));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "Total free pages = %u\n",</div><div class='add'>+			 le32_get_bits(stat_buf-&gt;info1,</div><div class='add'>+				       ATH12K_HTT_DLPAGER_TOTAL_FREE_PAGES_INFO1));</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nLOCKED PAGES HISTORY\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "last_locked_page_idx = %u\n",</div><div class='add'>+			 dword_lock ? dword_lock - 1 : (ATH12K_PAGER_MAX - 1));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH12K_PAGER_MAX; i++) {</div><div class='add'>+		memset(str_buf, 0x0, ATH12K_HTT_MAX_STRING_LEN);</div><div class='add'>+		ath12k_htt_print_dlpager_entry(&amp;stat_buf-&gt;pgs_info[pg_locked][i],</div><div class='add'>+					       i, str_buf);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%s", str_buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nUNLOCKED PAGES HISTORY\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "last_unlocked_page_idx = %u\n",</div><div class='add'>+			 dword_unlock ? dword_unlock - 1 : ATH12K_PAGER_MAX - 1);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH12K_PAGER_MAX; i++) {</div><div class='add'>+		memset(str_buf, 0x0, ATH12K_HTT_MAX_STRING_LEN);</div><div class='add'>+		ath12k_htt_print_dlpager_entry(&amp;stat_buf-&gt;pgs_info[pg_unlock][i],</div><div class='add'>+					       i, str_buf);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%s", str_buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_phy_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+			       struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_phy_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf, i;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_PHY_STATS_TLV:\n");</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_STATS_MAX_CHAINS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "bdf_nf_chain[%d] = %d\n",</div><div class='add'>+				 i, a_sle32_to_cpu(htt_stats_buf-&gt;nf_chain[i]));</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_STATS_MAX_CHAINS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "runtime_nf_chain[%d] = %d\n",</div><div class='add'>+				 i, a_sle32_to_cpu(htt_stats_buf-&gt;runtime_nf_chain[i]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "false_radar_cnt = %u / %u (mins)\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;false_radar_cnt),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;fw_run_time));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "radar_cs_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;radar_cs_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ani_level = %d\n\n",</div><div class='add'>+			 a_sle32_to_cpu(htt_stats_buf-&gt;ani_level));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_phy_counters_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				  struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_phy_counters_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_PHY_COUNTERS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_ofdma_timing_err_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_ofdma_timing_err_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_cck_fail_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_cck_fail_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mactx_abort_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mactx_abort_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "macrx_abort_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;macrx_abort_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phytx_abort_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;phytx_abort_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phyrx_abort_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;phyrx_abort_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phyrx_defer_abort_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;phyrx_defer_abort_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_gain_adj_lstf_event_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_gain_adj_lstf_event_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_gain_adj_non_legacy_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_gain_adj_non_legacy_cnt));</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_pkt_cnt", htt_stats_buf-&gt;rx_pkt_cnt,</div><div class='add'>+				  ATH12K_HTT_MAX_RX_PKT_CNT, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_pkt_crc_pass_cnt",</div><div class='add'>+				  htt_stats_buf-&gt;rx_pkt_crc_pass_cnt,</div><div class='add'>+				  ATH12K_HTT_MAX_RX_PKT_CRC_PASS_CNT, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "per_blk_err_cnt",</div><div class='add'>+				  htt_stats_buf-&gt;per_blk_err_cnt,</div><div class='add'>+				  ATH12K_HTT_MAX_PER_BLK_ERR_CNT, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_ota_err_cnt",</div><div class='add'>+				  htt_stats_buf-&gt;rx_ota_err_cnt,</div><div class='add'>+				  ATH12K_HTT_MAX_RX_OTA_ERR_CNT, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_phy_reset_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				     struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_phy_reset_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_PHY_RESET_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pdev_id = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;pdev_id));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "chan_mhz = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;chan_mhz));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "chan_band_center_freq1 = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;chan_band_center_freq1));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "chan_band_center_freq2 = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;chan_band_center_freq2));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "chan_phy_mode = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;chan_phy_mode));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "chan_flags = 0x%0x\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;chan_flags));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "chan_num = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;chan_num));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "reset_cause = 0x%0x\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;reset_cause));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "prev_reset_cause = 0x%0x\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;prev_reset_cause));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_warm_reset_src = 0x%0x\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;phy_warm_reset_src));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_gain_tbl_mode = %d\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_gain_tbl_mode));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "xbar_val = 0x%0x\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;xbar_val));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "force_calibration = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;force_calibration));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phyrf_mode = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;phyrf_mode));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_homechan = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;phy_homechan));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_tx_ch_mask = 0x%0x\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;phy_tx_ch_mask));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_rx_ch_mask = 0x%0x\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;phy_rx_ch_mask));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phybb_ini_mask = 0x%0x\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;phybb_ini_mask));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phyrf_ini_mask = 0x%0x\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;phyrf_ini_mask));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_dfs_en_mask = 0x%0x\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;phy_dfs_en_mask));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_sscan_en_mask = 0x%0x\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;phy_sscan_en_mask));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_synth_sel_mask = 0x%0x\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;phy_synth_sel_mask));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_adfs_freq = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;phy_adfs_freq));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "cck_fir_settings = 0x%0x\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;cck_fir_settings));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_dyn_pri_chan = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;phy_dyn_pri_chan));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "cca_thresh = 0x%0x\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;cca_thresh));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "dyn_cca_status = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;dyn_cca_status));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rxdesense_thresh_hw = 0x%x\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rxdesense_thresh_hw));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rxdesense_thresh_sw = 0x%x\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rxdesense_thresh_sw));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_phy_reset_counters_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_phy_reset_counters_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_PHY_RESET_COUNTERS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pdev_id = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;pdev_id));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "cf_active_low_fail_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;cf_active_low_fail_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "cf_active_low_pass_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;cf_active_low_pass_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "phy_off_through_vreg_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;phy_off_through_vreg_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "force_calibration_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;force_calibration_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rf_mode_switch_phy_off_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rf_mode_switch_phy_off_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "temperature_recal_cnt = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;temperature_recal_cnt));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_phy_tpc_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				   struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_phy_tpc_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_PHY_TPC_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pdev_id = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;pdev_id));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_power_scale = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_power_scale));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_power_scale_db = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_power_scale_db));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "min_negative_tx_power = %d\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;min_negative_tx_power));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "reg_ctl_domain = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;reg_ctl_domain));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "twice_max_rd_power = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;twice_max_rd_power));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "max_tx_power = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;max_tx_power));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "home_max_tx_power = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;home_max_tx_power));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "psd_power = %d\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;psd_power));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "eirp_power = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;eirp_power));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "power_type_6ghz = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;power_type_6ghz));</div><div class='add'>+	len += print_array_to_buf(buf, len, "max_reg_allowed_power",</div><div class='add'>+				  htt_stats_buf-&gt;max_reg_allowed_power,</div><div class='add'>+				  ATH12K_HTT_STATS_MAX_CHAINS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "max_reg_allowed_power_6ghz",</div><div class='add'>+				  htt_stats_buf-&gt;max_reg_allowed_power_6ghz,</div><div class='add'>+				  ATH12K_HTT_STATS_MAX_CHAINS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "sub_band_cfreq",</div><div class='add'>+				  htt_stats_buf-&gt;sub_band_cfreq,</div><div class='add'>+				  ATH12K_HTT_MAX_CH_PWR_INFO_SIZE, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "sub_band_txpower",</div><div class='add'>+				  htt_stats_buf-&gt;sub_band_txpower,</div><div class='add'>+				  ATH12K_HTT_MAX_CH_PWR_INFO_SIZE, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_soc_txrx_stats_common_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					   struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_t2h_soc_txrx_stats_common_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u64 drop_count;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	drop_count = ath12k_le32hilo_to_u64(htt_stats_buf-&gt;inv_peers_msdu_drop_count_hi,</div><div class='add'>+					    htt_stats_buf-&gt;inv_peers_msdu_drop_count_lo);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_SOC_COMMON_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "soc_drop_count = %llu\n\n",</div><div class='add'>+			 drop_count);</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_per_rate_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				       struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_per_rate_stats_tlv *stats_buf = tag_buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 ru_size_cnt = 0;</div><div class='add'>+	u32 rc_mode, ru_type;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf, i;</div><div class='add'>+	const char *mode_prefix;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rc_mode = le32_to_cpu(stats_buf-&gt;rc_mode);</div><div class='add'>+	ru_type = le32_to_cpu(stats_buf-&gt;ru_type);</div><div class='add'>+</div><div class='add'>+	switch (rc_mode) {</div><div class='add'>+	case ATH12K_HTT_STATS_RC_MODE_DLSU:</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "HTT_TX_PER_STATS:\n");</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\nPER_STATS_SU:\n");</div><div class='add'>+		mode_prefix = "su";</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_HTT_STATS_RC_MODE_DLMUMIMO:</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\nPER_STATS_DL_MUMIMO:\n");</div><div class='add'>+		mode_prefix = "mu";</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_HTT_STATS_RC_MODE_DLOFDMA:</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\nPER_STATS_DL_OFDMA:\n");</div><div class='add'>+		mode_prefix = "ofdma";</div><div class='add'>+		if (ru_type == ATH12K_HTT_STATS_RU_TYPE_SINGLE_RU_ONLY)</div><div class='add'>+			ru_size_cnt = ATH12K_HTT_TX_RX_PDEV_STATS_NUM_AX_RU_SIZE_CNTRS;</div><div class='add'>+		else if (ru_type == ATH12K_HTT_STATS_RU_TYPE_SINGLE_AND_MULTI_RU)</div><div class='add'>+			ru_size_cnt = ATH12K_HTT_TX_RX_PDEV_NUM_BE_RU_SIZE_CNTRS;</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_HTT_STATS_RC_MODE_ULMUMIMO:</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "HTT_RX_PER_STATS:\n");</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\nPER_STATS_UL_MUMIMO:\n");</div><div class='add'>+		mode_prefix = "ulmu";</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_HTT_STATS_RC_MODE_ULOFDMA:</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\nPER_STATS_UL_OFDMA:\n");</div><div class='add'>+		mode_prefix = "ulofdma";</div><div class='add'>+		if (ru_type == ATH12K_HTT_STATS_RU_TYPE_SINGLE_RU_ONLY)</div><div class='add'>+			ru_size_cnt = ATH12K_HTT_TX_RX_PDEV_STATS_NUM_AX_RU_SIZE_CNTRS;</div><div class='add'>+		else if (ru_type == ATH12K_HTT_STATS_RU_TYPE_SINGLE_AND_MULTI_RU)</div><div class='add'>+			ru_size_cnt = ATH12K_HTT_TX_RX_PDEV_NUM_BE_RU_SIZE_CNTRS;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nPER per BW:\n");</div><div class='add'>+	if (rc_mode == ATH12K_HTT_STATS_RC_MODE_ULOFDMA ||</div><div class='add'>+	    rc_mode == ATH12K_HTT_STATS_RC_MODE_ULMUMIMO)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "data_ppdus_%s = ",</div><div class='add'>+				 mode_prefix);</div><div class='add'>+	else</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "ppdus_tried_%s = ",</div><div class='add'>+				 mode_prefix);</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_TX_PDEV_STATS_NUM_BW_CNTRS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u ", i,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;per_bw[i].ppdus_tried));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, " %u:%u\n", i,</div><div class='add'>+			 le32_to_cpu(stats_buf-&gt;per_bw320.ppdus_tried));</div><div class='add'>+</div><div class='add'>+	if (rc_mode == ATH12K_HTT_STATS_RC_MODE_ULOFDMA ||</div><div class='add'>+	    rc_mode == ATH12K_HTT_STATS_RC_MODE_ULMUMIMO)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "non_data_ppdus_%s = ",</div><div class='add'>+				 mode_prefix);</div><div class='add'>+	else</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "ppdus_ack_failed_%s = ",</div><div class='add'>+				 mode_prefix);</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_TX_PDEV_STATS_NUM_BW_CNTRS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u ", i,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;per_bw[i].ppdus_ack_failed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, " %u:%u\n", i,</div><div class='add'>+			 le32_to_cpu(stats_buf-&gt;per_bw320.ppdus_ack_failed));</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdus_tried_%s = ", mode_prefix);</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_TX_PDEV_STATS_NUM_BW_CNTRS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u ", i,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;per_bw[i].mpdus_tried));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, " %u:%u\n", i,</div><div class='add'>+			 le32_to_cpu(stats_buf-&gt;per_bw320.mpdus_tried));</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdus_failed_%s = ", mode_prefix);</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_TX_PDEV_STATS_NUM_BW_CNTRS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u", i,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;per_bw[i].mpdus_failed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, " %u:%u\n", i,</div><div class='add'>+			 le32_to_cpu(stats_buf-&gt;per_bw320.mpdus_failed));</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nPER per NSS:\n");</div><div class='add'>+	if (rc_mode == ATH12K_HTT_STATS_RC_MODE_ULOFDMA ||</div><div class='add'>+	    rc_mode == ATH12K_HTT_STATS_RC_MODE_ULMUMIMO)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "data_ppdus_%s = ",</div><div class='add'>+				 mode_prefix);</div><div class='add'>+	else</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "ppdus_tried_%s = ",</div><div class='add'>+				 mode_prefix);</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_PDEV_STAT_NUM_SPATIAL_STREAMS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u ", i + 1,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;per_nss[i].ppdus_tried));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	if (rc_mode == ATH12K_HTT_STATS_RC_MODE_ULOFDMA ||</div><div class='add'>+	    rc_mode == ATH12K_HTT_STATS_RC_MODE_ULMUMIMO)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "non_data_ppdus_%s = ",</div><div class='add'>+				 mode_prefix);</div><div class='add'>+	else</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "ppdus_ack_failed_%s = ",</div><div class='add'>+				 mode_prefix);</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_PDEV_STAT_NUM_SPATIAL_STREAMS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u ", i + 1,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;per_nss[i].ppdus_ack_failed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdus_tried_%s = ", mode_prefix);</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_PDEV_STAT_NUM_SPATIAL_STREAMS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u ", i + 1,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;per_nss[i].mpdus_tried));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdus_failed_%s = ", mode_prefix);</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_PDEV_STAT_NUM_SPATIAL_STREAMS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u ", i + 1,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;per_nss[i].mpdus_failed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nPER per MCS:\n");</div><div class='add'>+	if (rc_mode == ATH12K_HTT_STATS_RC_MODE_ULOFDMA ||</div><div class='add'>+	    rc_mode == ATH12K_HTT_STATS_RC_MODE_ULMUMIMO)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "data_ppdus_%s = ",</div><div class='add'>+				 mode_prefix);</div><div class='add'>+	else</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "ppdus_tried_%s = ",</div><div class='add'>+				 mode_prefix);</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_TXBF_RATE_STAT_NUM_MCS_CNTRS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u ", i,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;per_mcs[i].ppdus_tried));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	if (rc_mode == ATH12K_HTT_STATS_RC_MODE_ULOFDMA ||</div><div class='add'>+	    rc_mode == ATH12K_HTT_STATS_RC_MODE_ULMUMIMO)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "non_data_ppdus_%s = ",</div><div class='add'>+				 mode_prefix);</div><div class='add'>+	else</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "ppdus_ack_failed_%s = ",</div><div class='add'>+				 mode_prefix);</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_TXBF_RATE_STAT_NUM_MCS_CNTRS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u ", i,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;per_mcs[i].ppdus_ack_failed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdus_tried_%s = ", mode_prefix);</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_TXBF_RATE_STAT_NUM_MCS_CNTRS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u ", i,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;per_mcs[i].mpdus_tried));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mpdus_failed_%s = ", mode_prefix);</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_TXBF_RATE_STAT_NUM_MCS_CNTRS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u ", i,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;per_mcs[i].mpdus_failed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	if ((rc_mode == ATH12K_HTT_STATS_RC_MODE_DLOFDMA ||</div><div class='add'>+	     rc_mode == ATH12K_HTT_STATS_RC_MODE_ULOFDMA) &amp;&amp;</div><div class='add'>+	     ru_type != ATH12K_HTT_STATS_RU_TYPE_INVALID) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\nPER per RU:\n");</div><div class='add'>+</div><div class='add'>+		if (rc_mode == ATH12K_HTT_STATS_RC_MODE_ULOFDMA)</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len, "data_ppdus_%s = ",</div><div class='add'>+					 mode_prefix);</div><div class='add'>+		else</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len, "ppdus_tried_%s = ",</div><div class='add'>+					 mode_prefix);</div><div class='add'>+		for (i = 0; i &lt; ru_size_cnt; i++)</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len, " %s:%u ",</div><div class='add'>+					 ath12k_tx_ru_size_to_str(ru_type, i),</div><div class='add'>+					 le32_to_cpu(stats_buf-&gt;ru[i].ppdus_tried));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+		if (rc_mode == ATH12K_HTT_STATS_RC_MODE_ULOFDMA)</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "non_data_ppdus_%s = ", mode_prefix);</div><div class='add'>+		else</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "ppdus_ack_failed_%s = ", mode_prefix);</div><div class='add'>+		for (i = 0; i &lt; ru_size_cnt; i++)</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len, " %s:%u ",</div><div class='add'>+					 ath12k_tx_ru_size_to_str(ru_type, i),</div><div class='add'>+					 le32_to_cpu(stats_buf-&gt;ru[i].ppdus_ack_failed));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "mpdus_tried_%s = ",</div><div class='add'>+				 mode_prefix);</div><div class='add'>+		for (i = 0; i &lt; ru_size_cnt; i++)</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len, " %s:%u ",</div><div class='add'>+					 ath12k_tx_ru_size_to_str(ru_type, i),</div><div class='add'>+					 le32_to_cpu(stats_buf-&gt;ru[i].mpdus_tried));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "mpdus_failed_%s = ",</div><div class='add'>+				 mode_prefix);</div><div class='add'>+		for (i = 0; i &lt; ru_size_cnt; i++)</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len, " %s:%u ",</div><div class='add'>+					 ath12k_tx_ru_size_to_str(ru_type, i),</div><div class='add'>+					 le32_to_cpu(stats_buf-&gt;ru[i].mpdus_failed));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\n\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rc_mode == ATH12K_HTT_STATS_RC_MODE_DLMUMIMO) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\nlast_probed_bw  = %u\n",</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;last_probed_bw));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "last_probed_nss = %u\n",</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;last_probed_nss));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "last_probed_mcs = %u\n",</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;last_probed_mcs));</div><div class='add'>+		len += print_array_to_buf(buf, len, "MU Probe count per RC MODE",</div><div class='add'>+					  stats_buf-&gt;probe_cnt,</div><div class='add'>+					  ATH12K_HTT_RC_MODE_2D_COUNT, "\n\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_ast_entry_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+			       struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_ast_entry_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 mac_addr_l32;</div><div class='add'>+	u32 mac_addr_h16;</div><div class='add'>+	u32 ast_info;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_addr_l32 = le32_to_cpu(htt_stats_buf-&gt;mac_addr.mac_addr_l32);</div><div class='add'>+	mac_addr_h16 = le32_to_cpu(htt_stats_buf-&gt;mac_addr.mac_addr_h16);</div><div class='add'>+	ast_info = le32_to_cpu(htt_stats_buf-&gt;info);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_AST_ENTRY_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ast_index = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ast_index));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "mac_addr = %02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='add'>+			 u32_get_bits(mac_addr_l32, ATH12K_HTT_MAC_ADDR_L32_0),</div><div class='add'>+			 u32_get_bits(mac_addr_l32, ATH12K_HTT_MAC_ADDR_L32_1),</div><div class='add'>+			 u32_get_bits(mac_addr_l32, ATH12K_HTT_MAC_ADDR_L32_2),</div><div class='add'>+			 u32_get_bits(mac_addr_l32, ATH12K_HTT_MAC_ADDR_L32_3),</div><div class='add'>+			 u32_get_bits(mac_addr_h16, ATH12K_HTT_MAC_ADDR_H16_0),</div><div class='add'>+			 u32_get_bits(mac_addr_h16, ATH12K_HTT_MAC_ADDR_H16_1));</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sw_peer_id = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;sw_peer_id));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pdev_id = %u\n",</div><div class='add'>+			 u32_get_bits(ast_info, ATH12K_HTT_AST_PDEV_ID_INFO));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "vdev_id = %u\n",</div><div class='add'>+			 u32_get_bits(ast_info, ATH12K_HTT_AST_VDEV_ID_INFO));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "next_hop = %u\n",</div><div class='add'>+			 u32_get_bits(ast_info, ATH12K_HTT_AST_NEXT_HOP_INFO));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mcast = %u\n",</div><div class='add'>+			 u32_get_bits(ast_info, ATH12K_HTT_AST_MCAST_INFO));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "monitor_direct = %u\n",</div><div class='add'>+			 u32_get_bits(ast_info, ATH12K_HTT_AST_MONITOR_DIRECT_INFO));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mesh_sta = %u\n",</div><div class='add'>+			 u32_get_bits(ast_info, ATH12K_HTT_AST_MESH_STA_INFO));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mec = %u\n",</div><div class='add'>+			 u32_get_bits(ast_info, ATH12K_HTT_AST_MEC_INFO));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "intra_bss = %u\n\n",</div><div class='add'>+			 u32_get_bits(ast_info, ATH12K_HTT_AST_INTRA_BSS_INFO));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char*</div><div class='add'>+ath12k_htt_get_punct_dir_type_str(enum ath12k_htt_stats_direction direction)</div><div class='add'>+{</div><div class='add'>+	switch (direction) {</div><div class='add'>+	case ATH12K_HTT_STATS_DIRECTION_TX:</div><div class='add'>+		return "tx";</div><div class='add'>+	case ATH12K_HTT_STATS_DIRECTION_RX:</div><div class='add'>+		return "rx";</div><div class='add'>+	default:</div><div class='add'>+		return "unknown";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char*</div><div class='add'>+ath12k_htt_get_punct_ppdu_type_str(enum ath12k_htt_stats_ppdu_type ppdu_type)</div><div class='add'>+{</div><div class='add'>+	switch (ppdu_type) {</div><div class='add'>+	case ATH12K_HTT_STATS_PPDU_TYPE_MODE_SU:</div><div class='add'>+		return "su";</div><div class='add'>+	case ATH12K_HTT_STATS_PPDU_TYPE_DL_MU_MIMO:</div><div class='add'>+		return "dl_mu_mimo";</div><div class='add'>+	case ATH12K_HTT_STATS_PPDU_TYPE_UL_MU_MIMO:</div><div class='add'>+		return "ul_mu_mimo";</div><div class='add'>+	case ATH12K_HTT_STATS_PPDU_TYPE_DL_MU_OFDMA:</div><div class='add'>+		return "dl_mu_ofdma";</div><div class='add'>+	case ATH12K_HTT_STATS_PPDU_TYPE_UL_MU_OFDMA:</div><div class='add'>+		return "ul_mu_ofdma";</div><div class='add'>+	default:</div><div class='add'>+		return "unknown";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char*</div><div class='add'>+ath12k_htt_get_punct_pream_type_str(enum ath12k_htt_stats_param_type pream_type)</div><div class='add'>+{</div><div class='add'>+	switch (pream_type) {</div><div class='add'>+	case ATH12K_HTT_STATS_PREAM_OFDM:</div><div class='add'>+		return "ofdm";</div><div class='add'>+	case ATH12K_HTT_STATS_PREAM_CCK:</div><div class='add'>+		return "cck";</div><div class='add'>+	case ATH12K_HTT_STATS_PREAM_HT:</div><div class='add'>+		return "ht";</div><div class='add'>+	case ATH12K_HTT_STATS_PREAM_VHT:</div><div class='add'>+		return "ac";</div><div class='add'>+	case ATH12K_HTT_STATS_PREAM_HE:</div><div class='add'>+		return "ax";</div><div class='add'>+	case ATH12K_HTT_STATS_PREAM_EHT:</div><div class='add'>+		return "be";</div><div class='add'>+	default:</div><div class='add'>+		return "unknown";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_puncture_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				    struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_pdev_puncture_stats_tlv *stats_buf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	const char *direction;</div><div class='add'>+	const char *ppdu_type;</div><div class='add'>+	const char *preamble;</div><div class='add'>+	u32 mac_id__word;</div><div class='add'>+	u32 subband_limit;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_id__word = le32_to_cpu(stats_buf-&gt;mac_id__word);</div><div class='add'>+	subband_limit = min(le32_to_cpu(stats_buf-&gt;subband_cnt),</div><div class='add'>+			    ATH12K_HTT_PUNCT_STATS_MAX_SUBBAND_CNT);</div><div class='add'>+</div><div class='add'>+	direction = ath12k_htt_get_punct_dir_type_str(le32_to_cpu(stats_buf-&gt;direction));</div><div class='add'>+	ppdu_type = ath12k_htt_get_punct_ppdu_type_str(le32_to_cpu(stats_buf-&gt;ppdu_type));</div><div class='add'>+	preamble = ath12k_htt_get_punct_pream_type_str(le32_to_cpu(stats_buf-&gt;preamble));</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_PDEV_PUNCTURE_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n",</div><div class='add'>+			 u32_get_bits(mac_id__word, ATH12K_HTT_STATS_MAC_ID));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "%s_%s_%s_last_used_pattern_mask = 0x%08x\n",</div><div class='add'>+			 direction, preamble, ppdu_type,</div><div class='add'>+			 le32_to_cpu(stats_buf-&gt;last_used_pattern_mask));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; subband_limit; i++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "%s_%s_%s_num_subbands_used_cnt_%02d = %u\n",</div><div class='add'>+				 direction, preamble, ppdu_type, i + 1,</div><div class='add'>+				 le32_to_cpu(stats_buf-&gt;num_subbands_used_cnt[i]));</div><div class='add'>+	}</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_dmac_reset_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				      struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_dmac_reset_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u64 time;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_DMAC_RESET_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "reset_count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;reset_count));</div><div class='add'>+	time = ath12k_le32hilo_to_u64(htt_stats_buf-&gt;reset_time_hi_ms,</div><div class='add'>+				      htt_stats_buf-&gt;reset_time_lo_ms);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "reset_time_ms = %llu\n", time);</div><div class='add'>+	time = ath12k_le32hilo_to_u64(htt_stats_buf-&gt;disengage_time_hi_ms,</div><div class='add'>+				      htt_stats_buf-&gt;disengage_time_lo_ms);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "disengage_time_ms = %llu\n", time);</div><div class='add'>+</div><div class='add'>+	time = ath12k_le32hilo_to_u64(htt_stats_buf-&gt;engage_time_hi_ms,</div><div class='add'>+				      htt_stats_buf-&gt;engage_time_lo_ms);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "engage_time_ms = %llu\n", time);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "disengage_count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;disengage_count));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "engage_count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;engage_count));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "drain_dest_ring_mask = 0x%x\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;drain_dest_ring_mask));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_pdev_sched_algo_ofdma_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+						 struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_pdev_sched_algo_ofdma_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 mac_id_word;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_id_word = le32_to_cpu(htt_stats_buf-&gt;mac_id__word);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_PDEV_SCHED_ALGO_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n",</div><div class='add'>+			 u32_get_bits(mac_id_word, ATH12K_HTT_STATS_MAC_ID));</div><div class='add'>+	len += print_array_to_buf(buf, len, "rate_based_dlofdma_enabled_count",</div><div class='add'>+				  htt_stats_buf-&gt;rate_based_dlofdma_enabled_cnt,</div><div class='add'>+				  ATH12K_HTT_NUM_AC_WMM, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rate_based_dlofdma_disabled_count",</div><div class='add'>+				  htt_stats_buf-&gt;rate_based_dlofdma_disabled_cnt,</div><div class='add'>+				  ATH12K_HTT_NUM_AC_WMM, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rate_based_dlofdma_probing_count",</div><div class='add'>+				  htt_stats_buf-&gt;rate_based_dlofdma_disabled_cnt,</div><div class='add'>+				  ATH12K_HTT_NUM_AC_WMM, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rate_based_dlofdma_monitoring_count",</div><div class='add'>+				  htt_stats_buf-&gt;rate_based_dlofdma_monitor_cnt,</div><div class='add'>+				  ATH12K_HTT_NUM_AC_WMM, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "chan_acc_lat_based_dlofdma_enabled_count",</div><div class='add'>+				  htt_stats_buf-&gt;chan_acc_lat_based_dlofdma_enabled_cnt,</div><div class='add'>+				  ATH12K_HTT_NUM_AC_WMM, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "chan_acc_lat_based_dlofdma_disabled_count",</div><div class='add'>+				  htt_stats_buf-&gt;chan_acc_lat_based_dlofdma_disabled_cnt,</div><div class='add'>+				  ATH12K_HTT_NUM_AC_WMM, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "chan_acc_lat_based_dlofdma_monitoring_count",</div><div class='add'>+				  htt_stats_buf-&gt;chan_acc_lat_based_dlofdma_monitor_cnt,</div><div class='add'>+				  ATH12K_HTT_NUM_AC_WMM, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "downgrade_to_dl_su_ru_alloc_fail",</div><div class='add'>+				  htt_stats_buf-&gt;downgrade_to_dl_su_ru_alloc_fail,</div><div class='add'>+				  ATH12K_HTT_NUM_AC_WMM, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "candidate_list_single_user_disable_ofdma",</div><div class='add'>+				  htt_stats_buf-&gt;candidate_list_single_user_disable_ofdma,</div><div class='add'>+				  ATH12K_HTT_NUM_AC_WMM, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "dl_cand_list_dropped_high_ul_qos_weight",</div><div class='add'>+				  htt_stats_buf-&gt;dl_cand_list_dropped_high_ul_qos_weight,</div><div class='add'>+				  ATH12K_HTT_NUM_AC_WMM, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ax_dlofdma_disabled_due_to_pipelining",</div><div class='add'>+				  htt_stats_buf-&gt;ax_dlofdma_disabled_due_to_pipelining,</div><div class='add'>+				  ATH12K_HTT_NUM_AC_WMM, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "dlofdma_disabled_su_only_eligible",</div><div class='add'>+				  htt_stats_buf-&gt;dlofdma_disabled_su_only_eligible,</div><div class='add'>+				  ATH12K_HTT_NUM_AC_WMM, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "dlofdma_disabled_consec_no_mpdus_tried",</div><div class='add'>+				  htt_stats_buf-&gt;dlofdma_disabled_consec_no_mpdus_tried,</div><div class='add'>+				  ATH12K_HTT_NUM_AC_WMM, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "dlofdma_disabled_consec_no_mpdus_success",</div><div class='add'>+				  htt_stats_buf-&gt;dlofdma_disabled_consec_no_mpdus_success,</div><div class='add'>+				  ATH12K_HTT_NUM_AC_WMM, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_tx_pdev_rate_stats_be_ofdma_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+						 struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_pdev_rate_stats_be_ofdma_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 mac_id_word;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_id_word = le32_to_cpu(htt_stats_buf-&gt;mac_id__word);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_TX_PDEV_RATE_STATS_BE_OFDMA_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n",</div><div class='add'>+			 u32_get_bits(mac_id_word, ATH12K_HTT_STATS_MAC_ID));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_ofdma_tx_ldpc = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;be_ofdma_tx_ldpc));</div><div class='add'>+	len += print_array_to_buf(buf, len, "be_ofdma_tx_mcs",</div><div class='add'>+				  htt_stats_buf-&gt;be_ofdma_tx_mcs,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_NUM_BE_MCS_CNTRS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "be_ofdma_eht_sig_mcs",</div><div class='add'>+				  htt_stats_buf-&gt;be_ofdma_eht_sig_mcs,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_NUM_EHT_SIG_MCS_CNTRS, "\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "be_ofdma_tx_ru_size = ");</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_TX_RX_PDEV_NUM_BE_RU_SIZE_CNTRS; i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %s:%u ",</div><div class='add'>+				 ath12k_htt_be_tx_rx_ru_size_to_str(i),</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;be_ofdma_tx_ru_size[i]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+	len += print_array_to_buf_index(buf, len, "be_ofdma_tx_nss = ", 1,</div><div class='add'>+					htt_stats_buf-&gt;be_ofdma_tx_nss,</div><div class='add'>+					ATH12K_HTT_PDEV_STAT_NUM_SPATIAL_STREAMS,</div><div class='add'>+					"\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "be_ofdma_tx_bw",</div><div class='add'>+				  htt_stats_buf-&gt;be_ofdma_tx_bw,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_NUM_BE_BW_CNTRS, "\n");</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_TX_PDEV_NUM_GI_CNTRS; i++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "be_ofdma_tx_gi[%u]", i);</div><div class='add'>+		len += print_array_to_buf(buf, len, "", htt_stats_buf-&gt;gi[i],</div><div class='add'>+					  ATH12K_HTT_TX_PDEV_NUM_BE_MCS_CNTRS, "\n");</div><div class='add'>+	}</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_pdev_mbssid_ctrl_frame_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+						  struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_pdev_mbssid_ctrl_frame_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 mac_id_word;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_id_word = le32_to_cpu(htt_stats_buf-&gt;mac_id__word);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_MBSSID_CTRL_FRAME_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n",</div><div class='add'>+			 u32_get_bits(mac_id_word, ATH12K_HTT_STATS_MAC_ID));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "basic_trigger_across_bss = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;basic_trigger_across_bss));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "basic_trigger_within_bss = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;basic_trigger_within_bss));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "bsr_trigger_across_bss = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;bsr_trigger_across_bss));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "bsr_trigger_within_bss = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;bsr_trigger_within_bss));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mu_rts_across_bss = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mu_rts_across_bss));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mu_rts_within_bss = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mu_rts_within_bss));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ul_mumimo_trigger_across_bss = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ul_mumimo_trigger_across_bss));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "ul_mumimo_trigger_within_bss = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ul_mumimo_trigger_within_bss));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+ath12k_htt_print_tx_pdev_rate_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_pdev_rate_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u8 i, j;</div><div class='add'>+	u32 mac_id_word;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_id_word = le32_to_cpu(htt_stats_buf-&gt;mac_id_word);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_TX_PDEV_RATE_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n",</div><div class='add'>+			 u32_get_bits(mac_id_word, ATH12K_HTT_STATS_MAC_ID));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_ldpc = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_ldpc));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_tx_ldpc = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ac_mu_mimo_tx_ldpc));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_tx_ldpc = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ax_mu_mimo_tx_ldpc));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ofdma_tx_ldpc = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ofdma_tx_ldpc));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rts_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rts_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rts_success = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rts_success));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ack_rssi = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ack_rssi));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "Legacy CCK Rates: 1 Mbps: %u, 2 Mbps: %u, 5.5 Mbps: %u, 12 Mbps: %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_legacy_cck_rate[0]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_legacy_cck_rate[1]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_legacy_cck_rate[2]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_legacy_cck_rate[3]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "Legacy OFDM Rates: 6 Mbps: %u, 9 Mbps: %u, 12 Mbps: %u, 18 Mbps: %u\n"</div><div class='add'>+			 "                   24 Mbps: %u, 36 Mbps: %u, 48 Mbps: %u, 54 Mbps: %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_legacy_ofdm_rate[0]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_legacy_ofdm_rate[1]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_legacy_ofdm_rate[2]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_legacy_ofdm_rate[3]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_legacy_ofdm_rate[4]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_legacy_ofdm_rate[5]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_legacy_ofdm_rate[6]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_legacy_ofdm_rate[7]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HE LTF: 1x: %u, 2x: %u, 4x: %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_he_ltf[1]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_he_ltf[2]),</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_he_ltf[3]));</div><div class='add'>+</div><div class='add'>+	len += print_array_to_buf(buf, len, "tx_mcs", htt_stats_buf-&gt;tx_mcs,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS, NULL);</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_TX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS; j++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, ", %u:%u",</div><div class='add'>+				 j + ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;tx_mcs_ext[j]));</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_TX_PDEV_STATS_NUM_EXTRA2_MCS_COUNTERS; j++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, ", %u:%u",</div><div class='add'>+				 j + ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS +</div><div class='add'>+				 ATH12K_HTT_TX_PDEV_STATS_NUM_EXTRA2_MCS_COUNTERS,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;tx_mcs_ext_2[j]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	len += print_array_to_buf(buf, len, "ax_mu_mimo_tx_mcs",</div><div class='add'>+				  htt_stats_buf-&gt;ax_mu_mimo_tx_mcs,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS, NULL);</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_TX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS; j++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, ", %u:%u",</div><div class='add'>+				 j + ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;ax_mu_mimo_tx_mcs_ext[j]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	len += print_array_to_buf(buf, len, "ofdma_tx_mcs",</div><div class='add'>+				  htt_stats_buf-&gt;ofdma_tx_mcs,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS, NULL);</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_TX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS; j++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, ", %u:%u",</div><div class='add'>+				 j + ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;ofdma_tx_mcs_ext[j]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_nss =");</div><div class='add'>+	for (j = 1; j &lt;= ATH12K_HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS; j++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u,",</div><div class='add'>+				 j, le32_to_cpu(htt_stats_buf-&gt;tx_nss[j - 1]));</div><div class='add'>+	len--;</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_tx_nss =");</div><div class='add'>+	for (j = 1; j &lt;= ATH12K_HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS; j++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u,",</div><div class='add'>+				 j, le32_to_cpu(htt_stats_buf-&gt;ac_mu_mimo_tx_nss[j - 1]));</div><div class='add'>+	len--;</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_tx_nss =");</div><div class='add'>+	for (j = 1; j &lt;= ATH12K_HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS; j++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u,",</div><div class='add'>+				 j, le32_to_cpu(htt_stats_buf-&gt;ax_mu_mimo_tx_nss[j - 1]));</div><div class='add'>+	len--;</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ofdma_tx_nss =");</div><div class='add'>+	for (j = 1; j &lt;= ATH12K_HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS; j++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u:%u,",</div><div class='add'>+				 j, le32_to_cpu(htt_stats_buf-&gt;ofdma_tx_nss[j - 1]));</div><div class='add'>+	len--;</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	len += print_array_to_buf(buf, len, "tx_bw", htt_stats_buf-&gt;tx_bw,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_BW_COUNTERS, NULL);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, ", %u:%u\n",</div><div class='add'>+			 ATH12K_HTT_TX_PDEV_STATS_NUM_BW_COUNTERS,</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_bw_320mhz));</div><div class='add'>+</div><div class='add'>+	len += print_array_to_buf(buf, len, "tx_stbc",</div><div class='add'>+				  htt_stats_buf-&gt;tx_stbc,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS, NULL);</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_TX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS; j++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, ", %u:%u",</div><div class='add'>+				 j + ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;tx_stbc_ext[j]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_TX_PDEV_STATS_NUM_GI_COUNTERS; j++) {</div><div class='add'>+		len += scnprintf(buf + len, (buf_len - len),</div><div class='add'>+				 "tx_gi[%u] =", j);</div><div class='add'>+		len += print_array_to_buf(buf, len, NULL, htt_stats_buf-&gt;tx_gi[j],</div><div class='add'>+					  ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS,</div><div class='add'>+					  NULL);</div><div class='add'>+		for (i = 0; i &lt; ATH12K_HTT_TX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS; i++)</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len, ", %u:%u",</div><div class='add'>+					 i + ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;tx_gi_ext[j][i]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_TX_PDEV_STATS_NUM_GI_COUNTERS; j++) {</div><div class='add'>+		len += scnprintf(buf + len, (buf_len - len),</div><div class='add'>+				 "ac_mu_mimo_tx_gi[%u] =", j);</div><div class='add'>+		len += print_array_to_buf(buf, len, NULL,</div><div class='add'>+					  htt_stats_buf-&gt;ac_mu_mimo_tx_gi[j],</div><div class='add'>+					  ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS,</div><div class='add'>+					  "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_TX_PDEV_STATS_NUM_GI_COUNTERS; j++) {</div><div class='add'>+		len += scnprintf(buf + len, (buf_len - len),</div><div class='add'>+				 "ax_mu_mimo_tx_gi[%u] =", j);</div><div class='add'>+		len += print_array_to_buf(buf, len, NULL, htt_stats_buf-&gt;ax_mimo_tx_gi[j],</div><div class='add'>+					  ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS,</div><div class='add'>+					  NULL);</div><div class='add'>+		for (i = 0; i &lt; ATH12K_HTT_TX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS; i++)</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len, ", %u:%u",</div><div class='add'>+					 i + ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;ax_tx_gi_ext[j][i]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_TX_PDEV_STATS_NUM_GI_COUNTERS; j++) {</div><div class='add'>+		len += scnprintf(buf + len, (buf_len - len),</div><div class='add'>+				 "ofdma_tx_gi[%u] = ", j);</div><div class='add'>+		len += print_array_to_buf(buf, len, NULL, htt_stats_buf-&gt;ofdma_tx_gi[j],</div><div class='add'>+					  ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS,</div><div class='add'>+					  NULL);</div><div class='add'>+		for (i = 0; i &lt; ATH12K_HTT_TX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS; i++)</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len, ", %u:%u",</div><div class='add'>+					 i + ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS,</div><div class='add'>+					 le32_to_cpu(htt_stats_buf-&gt;ofd_tx_gi_ext[j][i]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += print_array_to_buf(buf, len, "tx_su_mcs", htt_stats_buf-&gt;tx_su_mcs,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "tx_mu_mcs", htt_stats_buf-&gt;tx_mu_mcs,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ac_mu_mimo_tx_mcs",</div><div class='add'>+				  htt_stats_buf-&gt;ac_mu_mimo_tx_mcs,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ac_mu_mimo_tx_bw",</div><div class='add'>+				  htt_stats_buf-&gt;ac_mu_mimo_tx_bw,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_BW_COUNTERS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ax_mu_mimo_tx_bw",</div><div class='add'>+				  htt_stats_buf-&gt;ax_mu_mimo_tx_bw,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_BW_COUNTERS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ofdma_tx_bw",</div><div class='add'>+				  htt_stats_buf-&gt;ofdma_tx_bw,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_BW_COUNTERS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "tx_pream", htt_stats_buf-&gt;tx_pream,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_PREAMBLE_TYPES, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "tx_dcm", htt_stats_buf-&gt;tx_dcm,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_DCM_COUNTERS, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_histogram_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				     struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_tx_histogram_stats_tlv *stats_buf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "low_latency_rate_cnt =  %u\n",</div><div class='add'>+			 le32_to_cpu(stats_buf-&gt;low_latency_rate_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "su_burst_rate_drop_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(stats_buf-&gt;su_burst_rate_drop_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "su_burst_rate_drop_fail_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(stats_buf-&gt;su_burst_rate_drop_fail_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rate_retry_mcs_drop_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(stats_buf-&gt;rate_retry_mcs_drop_cnt));</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\nPER_HISTOGRAM_STATS\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "mcs_drop_rate", stats_buf-&gt;mcs_drop_rate,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_DROP_COUNTERS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "per_histogram_count",</div><div class='add'>+				  stats_buf-&gt;per_histogram_cnt,</div><div class='add'>+				  ATH12K_HTT_TX_PDEV_STATS_NUM_PER_COUNTERS, "\n\n");</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+ath12k_htt_print_rx_pdev_rate_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_rx_pdev_rate_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u8 i, j;</div><div class='add'>+	u32 mac_id_word;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_id_word = le32_to_cpu(htt_stats_buf-&gt;mac_id_word);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_RX_PDEV_RATE_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n",</div><div class='add'>+			 u32_get_bits(mac_id_word, ATH12K_HTT_STATS_MAC_ID));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "nsts = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;nsts));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_ldpc = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_ldpc));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rts_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rts_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rssi_mgmt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rssi_mgmt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rssi_data = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rssi_data));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rssi_comb = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rssi_comb));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rssi_in_dbm = %d\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rssi_in_dbm));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_evm_nss_count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;nss_count));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_evm_pilot_count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;pilot_count));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_11ax_su_ext = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_11ax_su_ext));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_11ac_mumimo = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_11ac_mumimo));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_11ax_mumimo = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_11ax_mumimo));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_11ax_ofdma = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_11ax_ofdma));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "txbf = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;txbf));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_su_ndpa = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_su_ndpa));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_mu_ndpa = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_mu_ndpa));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_br_poll = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_br_poll));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_active_dur_us_low = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_active_dur_us_low));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_active_dur_us_high = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_active_dur_us_high));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_11ax_ul_ofdma = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_11ax_ul_ofdma));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ul_ofdma_rx_stbc = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ul_ofdma_rx_stbc));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ul_ofdma_rx_ldpc = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ul_ofdma_rx_ldpc));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "per_chain_rssi_pkt_type = %#x\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;per_chain_rssi_pkt_type));</div><div class='add'>+</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_nss", htt_stats_buf-&gt;rx_nss,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_dcm", htt_stats_buf-&gt;rx_dcm,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_DCM_COUNTERS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_stbc", htt_stats_buf-&gt;rx_stbc,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_bw", htt_stats_buf-&gt;rx_bw,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_BW_COUNTERS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_pream", htt_stats_buf-&gt;rx_pream,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_PREAMBLE_TYPES, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_11ax_su_txbf_mcs",</div><div class='add'>+				  htt_stats_buf-&gt;rx_11ax_su_txbf_mcs,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_11ax_mu_txbf_mcs",</div><div class='add'>+				  htt_stats_buf-&gt;rx_11ax_mu_txbf_mcs,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_legacy_cck_rate",</div><div class='add'>+				  htt_stats_buf-&gt;rx_legacy_cck_rate,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_LEGACY_CCK_STATS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_legacy_ofdm_rate",</div><div class='add'>+				  htt_stats_buf-&gt;rx_legacy_ofdm_rate,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_LEGACY_OFDM_STATS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ul_ofdma_rx_mcs",</div><div class='add'>+				  htt_stats_buf-&gt;ul_ofdma_rx_mcs,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ul_ofdma_rx_nss",</div><div class='add'>+				  htt_stats_buf-&gt;ul_ofdma_rx_nss,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ul_ofdma_rx_bw",</div><div class='add'>+				  htt_stats_buf-&gt;ul_ofdma_rx_bw,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_BW_COUNTERS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_ulofdma_non_data_ppdu",</div><div class='add'>+				  htt_stats_buf-&gt;rx_ulofdma_non_data_ppdu,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_MAX_OFDMA_NUM_USER, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_ulofdma_data_ppdu",</div><div class='add'>+				  htt_stats_buf-&gt;rx_ulofdma_data_ppdu,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_MAX_OFDMA_NUM_USER, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_ulofdma_mpdu_ok",</div><div class='add'>+				  htt_stats_buf-&gt;rx_ulofdma_mpdu_ok,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_MAX_OFDMA_NUM_USER, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_ulofdma_mpdu_fail",</div><div class='add'>+				  htt_stats_buf-&gt;rx_ulofdma_mpdu_fail,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_MAX_OFDMA_NUM_USER, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_ulofdma_non_data_nusers",</div><div class='add'>+				  htt_stats_buf-&gt;rx_ulofdma_non_data_nusers,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_MAX_OFDMA_NUM_USER, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_ulofdma_data_nusers",</div><div class='add'>+				  htt_stats_buf-&gt;rx_ulofdma_data_nusers,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_MAX_OFDMA_NUM_USER, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_11ax_dl_ofdma_mcs",</div><div class='add'>+				  htt_stats_buf-&gt;rx_11ax_dl_ofdma_mcs,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_11ax_dl_ofdma_ru",</div><div class='add'>+				  htt_stats_buf-&gt;rx_11ax_dl_ofdma_ru,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_RU_SIZE_COUNTERS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_ulmumimo_non_data_ppdu",</div><div class='add'>+				  htt_stats_buf-&gt;rx_ulmumimo_non_data_ppdu,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_ulmumimo_data_ppdu",</div><div class='add'>+				  htt_stats_buf-&gt;rx_ulmumimo_data_ppdu,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_ulmumimo_mpdu_ok",</div><div class='add'>+				  htt_stats_buf-&gt;rx_ulmumimo_mpdu_ok,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_ulmumimo_mpdu_fail",</div><div class='add'>+				  htt_stats_buf-&gt;rx_ulmumimo_mpdu_fail,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER, "\n");</div><div class='add'>+</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_mcs",</div><div class='add'>+				  htt_stats_buf-&gt;rx_mcs,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS, NULL);</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_TX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS; j++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, ", %u:%u",</div><div class='add'>+				 j + ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;rx_mcs_ext[j]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS; j++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "pilot_evm_db[%u] =", j);</div><div class='add'>+		len += print_array_to_buf(buf, len, NULL,</div><div class='add'>+					  htt_stats_buf-&gt;rx_pil_evm_db[j],</div><div class='add'>+					  ATH12K_HTT_RX_PDEV_STATS_RXEVM_MAX_PILOTS_NSS,</div><div class='add'>+					  "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pilot_evm_db_mean =");</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS; i++)</div><div class='add'>+		len += scnprintf(buf + len,</div><div class='add'>+				 buf_len - len,</div><div class='add'>+				 " %u:%d,", i,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;rx_pilot_evm_db_mean[i]));</div><div class='add'>+	len--;</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS; j++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "rssi_chain_in_db[%u] = ", j);</div><div class='add'>+		for (i = 0; i &lt; ATH12K_HTT_RX_PDEV_STATS_NUM_BW_COUNTERS; i++)</div><div class='add'>+			len += scnprintf(buf + len,</div><div class='add'>+					 buf_len - len,</div><div class='add'>+					 " %u: %d,", i,</div><div class='add'>+					 htt_stats_buf-&gt;rssi_chain_in_db[j][i]);</div><div class='add'>+		len--;</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_RX_PDEV_STATS_NUM_GI_COUNTERS; j++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "rx_gi[%u] = ", j);</div><div class='add'>+		len += print_array_to_buf(buf, len, NULL,</div><div class='add'>+					  htt_stats_buf-&gt;rx_gi[j],</div><div class='add'>+					  ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS,</div><div class='add'>+					  "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_RX_PDEV_STATS_NUM_GI_COUNTERS; j++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ul_ofdma_rx_gi[%u] = ", j);</div><div class='add'>+		len += print_array_to_buf(buf, len, NULL,</div><div class='add'>+					  htt_stats_buf-&gt;ul_ofdma_rx_gi[j],</div><div class='add'>+					  ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS,</div><div class='add'>+					  "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS; j++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "rx_ul_fd_rssi: nss[%u] = ", j);</div><div class='add'>+		for (i = 0; i &lt; ATH12K_HTT_RX_PDEV_MAX_OFDMA_NUM_USER; i++)</div><div class='add'>+			len += scnprintf(buf + len,</div><div class='add'>+					 buf_len - len,</div><div class='add'>+					 " %u:%d,",</div><div class='add'>+					 i, htt_stats_buf-&gt;rx_ul_fd_rssi[j][i]);</div><div class='add'>+		len--;</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS; j++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "rx_per_chain_rssi_in_dbm[%u] =", j);</div><div class='add'>+		for (i = 0; i &lt; ATH12K_HTT_RX_PDEV_STATS_NUM_BW_COUNTERS; i++)</div><div class='add'>+			len += scnprintf(buf + len,</div><div class='add'>+					 buf_len - len,</div><div class='add'>+					 " %u:%d,",</div><div class='add'>+					 i,</div><div class='add'>+					 htt_stats_buf-&gt;rx_per_chain_rssi_in_dbm[j][i]);</div><div class='add'>+		len--;</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+ath12k_htt_print_rx_pdev_rate_ext_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					    struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_rx_pdev_rate_ext_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u8 j;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_RX_PDEV_RATE_EXT_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rssi_mgmt_in_dbm = %d\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rssi_mgmt_in_dbm));</div><div class='add'>+</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_stbc_ext",</div><div class='add'>+				  htt_stats_buf-&gt;rx_stbc_ext,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS_EXT, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "ul_ofdma_rx_mcs_ext",</div><div class='add'>+				  htt_stats_buf-&gt;ul_ofdma_rx_mcs_ext,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS_EXT, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_11ax_su_txbf_mcs_ext",</div><div class='add'>+				  htt_stats_buf-&gt;rx_11ax_su_txbf_mcs_ext,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS_EXT, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_11ax_mu_txbf_mcs_ext",</div><div class='add'>+				  htt_stats_buf-&gt;rx_11ax_mu_txbf_mcs_ext,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS_EXT, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_11ax_dl_ofdma_mcs_ext",</div><div class='add'>+				  htt_stats_buf-&gt;rx_11ax_dl_ofdma_mcs_ext,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS_EXT, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_bw_ext",</div><div class='add'>+				  htt_stats_buf-&gt;rx_bw_ext,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_BW_EXT2_COUNTERS, "\n");</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_su_punctured_mode",</div><div class='add'>+				  htt_stats_buf-&gt;rx_su_punctured_mode,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_PUNCTURED_MODE_COUNTERS,</div><div class='add'>+				  "\n");</div><div class='add'>+</div><div class='add'>+	len += print_array_to_buf(buf, len, "rx_mcs_ext",</div><div class='add'>+				  htt_stats_buf-&gt;rx_mcs_ext,</div><div class='add'>+				  ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS_EXT,</div><div class='add'>+				  NULL);</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_RX_PDEV_STATS_NUM_EXTRA2_MCS_COUNTERS; j++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, ", %u:%u",</div><div class='add'>+				 j + ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS_EXT,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;rx_mcs_ext_2[j]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_RX_PDEV_STATS_NUM_GI_COUNTERS; j++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "rx_gi_ext[%u] = ", j);</div><div class='add'>+		len += print_array_to_buf(buf, len, NULL,</div><div class='add'>+					  htt_stats_buf-&gt;rx_gi_ext[j],</div><div class='add'>+					  ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS_EXT,</div><div class='add'>+					  "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; ATH12K_HTT_RX_PDEV_STATS_NUM_GI_COUNTERS; j++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "ul_ofdma_rx_gi_ext[%u] = ", j);</div><div class='add'>+		len += print_array_to_buf(buf, len, NULL,</div><div class='add'>+					  htt_stats_buf-&gt;ul_ofdma_rx_gi_ext[j],</div><div class='add'>+					  ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS_EXT,</div><div class='add'>+					  "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_pdev_tdma_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				     struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_pdev_tdma_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u32 mac_id_word;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_id_word = le32_to_cpu(htt_stats_buf-&gt;mac_id__word);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_PDEV_TDMA_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n",</div><div class='add'>+			 u32_get_bits(mac_id_word, ATH12K_HTT_STATS_MAC_ID));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_tdma_active_schedules = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_tdma_active_schedules));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_tdma_reserved_schedules = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_tdma_reserved_schedules));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "num_tdma_restricted_schedules = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_tdma_restricted_schedules));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "num_tdma_unconfigured_schedules = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_tdma_unconfigured_schedules));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_tdma_slot_switches = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_tdma_slot_switches));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_tdma_edca_switches = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_tdma_edca_switches));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_mlo_sched_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				     struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_mlo_sched_stats_tlv *stats_buf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_STATS_MLO_SCHED_STATS:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_sec_link_sched = %u\n",</div><div class='add'>+			 le32_to_cpu(stats_buf-&gt;pref_link_num_sec_link_sched));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_pref_link_timeout = %u\n",</div><div class='add'>+			 le32_to_cpu(stats_buf-&gt;pref_link_num_pref_link_timeout));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_pref_link_sch_delay_ipc = %u\n",</div><div class='add'>+			 le32_to_cpu(stats_buf-&gt;pref_link_num_pref_link_sch_delay_ipc));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_pref_link_timeout_ipc = %u\n\n",</div><div class='add'>+			 le32_to_cpu(stats_buf-&gt;pref_link_num_pref_link_timeout_ipc));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_mlo_ipc_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				   struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_pdev_mlo_ipc_stats_tlv *stats_buf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+	u8 i, j;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_STATS_MLO_IPC_STATS:\n");</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTT_HWMLO_MAX_LINKS; i++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "src_link: %u\n", i);</div><div class='add'>+		for (j = 0; j &lt; ATH12K_HTT_MLO_MAX_IPC_RINGS; j++)</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					 "mlo_ipc_ring_full_cnt[%u]: %u\n", j,</div><div class='add'>+					 le32_to_cpu(stats_buf-&gt;mlo_ipc_ring_cnt[i][j]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_pdev_rtt_resp_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					 struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_stats_pdev_rtt_resp_stats_tlv *sbuf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*sbuf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_PDEV_RTT_RESP_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pdev_id = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;pdev_id));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_11mc_ftm_suc = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;tx_11mc_ftm_suc));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_11mc_ftm_suc_retry = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;tx_11mc_ftm_suc_retry));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_11mc_ftm_fail = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;tx_11mc_ftm_fail));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_11mc_ftmr_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;rx_11mc_ftmr_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_11mc_ftmr_dup_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;rx_11mc_ftmr_dup_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_11mc_iftmr_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;rx_11mc_iftmr_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_11mc_iftmr_dup_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;rx_11mc_iftmr_dup_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "ftmr_drop_11mc_resp_role_not_enabled_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;ftmr_drop_11mc_resp_role_not_enabled_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_11az_ftm_successful = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;tx_11az_ftm_successful));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_11az_ftm_failed = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;tx_11az_ftm_failed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_11az_ftmr_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;rx_11az_ftmr_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_11az_ftmr_dup_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;rx_11az_ftmr_dup_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_11az_iftmr_dup_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;rx_11az_iftmr_dup_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "initiator_active_responder_rejected_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;initiator_active_responder_rejected_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "malformed_ftmr = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;malformed_ftmr));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "ftmr_drop_ntb_resp_role_not_enabled_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;ftmr_drop_ntb_resp_role_not_enabled_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "ftmr_drop_tb_resp_role_not_enabled_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;ftmr_drop_tb_resp_role_not_enabled_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "responder_alloc_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;responder_alloc_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "responder_alloc_failure = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;responder_alloc_failure));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "responder_terminate_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;responder_terminate_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "active_rsta_open = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;active_rsta_open));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "active_rsta_mac = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;active_rsta_mac));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "active_rsta_mac_phy = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;active_rsta_mac_phy));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pn_check_failure_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;pn_check_failure_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_assoc_ranging_peers = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;num_assoc_ranging_peers));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_unassoc_ranging_peers = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;num_unassoc_ranging_peers));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pasn_m1_auth_recv_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;pasn_m1_auth_recv_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pasn_m1_auth_drop_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;pasn_m1_auth_drop_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pasn_m2_auth_recv_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;pasn_m2_auth_recv_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pasn_m2_auth_tx_fail_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;pasn_m2_auth_tx_fail_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pasn_m3_auth_recv_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;pasn_m3_auth_recv_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pasn_m3_auth_drop_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;pasn_m3_auth_drop_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pasn_peer_create_request_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;pasn_peer_create_request_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pasn_peer_created_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;pasn_peer_created_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pasn_peer_create_timeout_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;pasn_peer_create_timeout_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "sec_ranging_not_supported_mfp_not_setup = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;sec_ranging_not_supported_mfp_not_setup));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "non_sec_ranging_discarded_for_assoc_peer_with_mfpr_set = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;non_sec_ranging_discarded_for_assoc_peer));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "open_ranging_discarded_with_URNM_MFPR_set_for_pasn_peer = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;open_ranging_discarded_set_for_pasn_peer));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "unassoc_non_pasn_ranging_not_supported_with_URNM_MFPR = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;unassoc_non_pasn_ranging_not_supported));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "invalid_ftm_request_params = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;invalid_ftm_request_params));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "requested_bw_format_not_supported = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;requested_bw_format_not_supported));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "ntb_unsec_unassoc_mode_ranging_peer_alloc_failed = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;ntb_unsec_unassoc_ranging_peer_alloc_failed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "tb_unassoc_unsec_mode_pasn_peer_creation_failed = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;tb_unassoc_unsec_pasn_peer_creation_failed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "num_ranging_sequences_processed = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;num_ranging_sequences_processed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ndp_rx_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;ndp_rx_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_req_bw_20_MHz = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;num_req_bw_20_mhz));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_req_bw_40_MHz = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;num_req_bw_40_mhz));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_req_bw_80_MHz = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;num_req_bw_80_mhz));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_req_bw_160_MHz = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;num_req_bw_160_mhz));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ntb_tx_ndp = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;ntb_tx_ndp));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_ntb_ranging_NDPAs_recv = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;num_ntb_ranging_ndpas_recv));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "recv_lmr = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;recv_lmr));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "invalid_ftmr_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;invalid_ftmr_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "max_time_bw_meas_exp_cnt = %u\n\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;max_time_bw_meas_exp_cnt));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_pdev_rtt_init_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+					 struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_stats_pdev_rtt_init_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf, i;</div><div class='add'>+	__le32 sch_fail;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_PDEV_RTT_INIT_STATS_TLV:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pdev_id = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;pdev_id));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_11mc_ftmr_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_11mc_ftmr_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_11mc_ftmr_fail = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_11mc_ftmr_fail));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_11mc_ftmr_suc_retry = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_11mc_ftmr_suc_retry));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_11mc_ftm_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_11mc_ftm_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rx_11az_ftm_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rx_11az_ftm_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "initiator_terminate_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;initiator_terminate_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_meas_req_count = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_meas_req_count));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_11az_ftmr_start = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_11az_ftmr_start));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_11az_ftmr_stop = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_11az_ftmr_stop));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tx_11az_ftmr_fail = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tx_11az_ftmr_fail));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "ftmr_tx_failed_null_11az_peer = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ftmr_tx_failed_null_11az_peer));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ftmr_retry_timeout = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ftmr_retry_timeout));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ftm_parse_failure = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ftm_parse_failure));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "incompatible_ftm_params = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;incompatible_ftm_params));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "ranging_negotiation_successful_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ranging_negotiation_successful_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "active_ista = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;active_ista));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "init_role_not_enabled = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;init_role_not_enabled));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "invalid_preamble = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;invalid_preamble));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "invalid_chan_bw_format = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;invalid_chan_bw_format));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "mgmt_buff_alloc_fail_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;mgmt_buff_alloc_fail_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sec_ranging_req_in_open_mode = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;sec_ranging_req_in_open_mode));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "max_time_bw_meas_exp_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;max_time_bw_meas_exp_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_tb_ranging_requests = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_tb_ranging_requests));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tb_meas_duration_expiry_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tb_meas_duration_expiry_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ntbr_triggered_successfully = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ntbr_triggered_successfully));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ntbr_trigger_failed = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ntbr_trigger_failed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "invalid_or_no_vreg_idx = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;invalid_or_no_vreg_idx));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "set_vreg_params_failed = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;set_vreg_params_failed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "sac_mismatch = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;sac_mismatch));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pasn_m1_auth_recv_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;pasn_m1_auth_recv_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pasn_m1_auth_tx_fail_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;pasn_m1_auth_tx_fail_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pasn_m2_auth_recv_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;pasn_m2_auth_recv_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pasn_m2_auth_drop_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;pasn_m2_auth_drop_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pasn_m3_auth_recv_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;pasn_m3_auth_recv_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pasn_m3_auth_tx_fail_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;pasn_m3_auth_tx_fail_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pasn_peer_create_request_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;pasn_peer_create_request_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pasn_peer_created_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;pasn_peer_created_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "pasn_peer_create_timeout_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;pasn_peer_create_timeout_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ntbr_ndpa_failed = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ntbr_ndpa_failed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ntbr_sequence_successful = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ntbr_sequence_successful));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ntbr_ndp_failed = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ntbr_ndp_failed));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_tb_ranging_NDPAs_recv = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_tb_ranging_ndpas_recv));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ndp_rx_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ndp_rx_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "num_trigger_frames_received = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;num_trigger_frames_received));</div><div class='add'>+	for (i = 0; i &lt; (ATH12K_HTT_SCH_CMD_STATUS_CNT - 1); i++)</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "num_sch_cmd_status_%d = %u\n", i,</div><div class='add'>+				 le32_to_cpu(htt_stats_buf-&gt;sch_cmd_status_cnts[i]));</div><div class='add'>+	sch_fail = htt_stats_buf-&gt;sch_cmd_status_cnts[ATH12K_HTT_SCH_CMD_STATUS_CNT - 1];</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "num_sch_cmd_status_other_failure = %u\n",</div><div class='add'>+			 le32_to_cpu(sch_fail));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "lmr_timeout = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;lmr_timeout));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "lmr_recv = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;lmr_recv));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_pdev_rtt_hw_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+				       struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_stats_pdev_rtt_hw_stats_tlv *htt_stats_buf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*htt_stats_buf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "HTT_STATS_PDEV_RTT_HW_STATS_TAG:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ista_ranging_ndpa_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ista_ranging_ndpa_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ista_ranging_ndp_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ista_ranging_ndp_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "ista_ranging_i2r_lmr_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;ista_ranging_i2r_lmr_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rtsa_ranging_resp_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rtsa_ranging_resp_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rtsa_ranging_ndp_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rtsa_ranging_ndp_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "rsta_ranging_lmr_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;rsta_ranging_lmr_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tb_ranging_cts2s_rcvd_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tb_ranging_cts2s_rcvd_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tb_ranging_ndp_rcvd_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tb_ranging_ndp_rcvd_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "tb_ranging_lmr_rcvd_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tb_ranging_lmr_rcvd_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "tb_ranging_tf_poll_resp_sent_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tb_ranging_tf_poll_resp_sent_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "tb_ranging_tf_sound_resp_sent_cnt = %u\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tb_ranging_tf_sound_resp_sent_cnt));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "tb_ranging_tf_report_resp_sent_cnt = %u\n\n",</div><div class='add'>+			 le32_to_cpu(htt_stats_buf-&gt;tb_ranging_tf_report_resp_sent_cnt));</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_pdev_rtt_tbr_selfgen_queued_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+						       struct debug_htt_stats_req *req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_stats_pdev_rtt_tbr_tlv *sbuf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = req-&gt;buf_len;</div><div class='add'>+	u8 *buf = req-&gt;buf;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*sbuf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_STATS_PDEV_RTT_TBR_SELFGEN_QUEUED_STATS_TAG:\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "SU poll = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;su_ftype[ATH12K_HTT_FTYPE_TF_POLL]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "SU sound = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;su_ftype[ATH12K_HTT_FTYPE_TF_SOUND]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "SU NDPA = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;su_ftype[ATH12K_HTT_FTYPE_TBR_NDPA]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "SU NDP = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;su_ftype[ATH12K_HTT_FTYPE_TBR_NDP]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "SU LMR = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;su_ftype[ATH12K_HTT_FTYPE_TBR_LMR]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "SU TF_REPORT = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;su_ftype[ATH12K_HTT_FTYPE_TF_RPRT]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "MU poll = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;mu_ftype[ATH12K_HTT_FTYPE_TF_POLL]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "MU sound = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;mu_ftype[ATH12K_HTT_FTYPE_TF_SOUND]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "MU NDPA = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;mu_ftype[ATH12K_HTT_FTYPE_TBR_NDPA]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "MU NDP = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;mu_ftype[ATH12K_HTT_FTYPE_TBR_NDP]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "MU LMR = %u\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;mu_ftype[ATH12K_HTT_FTYPE_TBR_LMR]));</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "MU TF_REPORT = %u\n\n",</div><div class='add'>+			 le32_to_cpu(sbuf-&gt;mu_ftype[ATH12K_HTT_FTYPE_TF_RPRT]));</div><div class='add'>+</div><div class='add'>+	req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htt_print_pdev_rtt_tbr_cmd_res_stats_tlv(const void *tag_buf, u16 tag_len,</div><div class='add'>+						struct debug_htt_stats_req *stats_req)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_htt_stats_pdev_rtt_tbr_cmd_result_stats_tlv *sbuf = tag_buf;</div><div class='add'>+	u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE;</div><div class='add'>+	u32 len = stats_req-&gt;buf_len;</div><div class='add'>+	u8 *buf = stats_req-&gt;buf, i;</div><div class='add'>+</div><div class='add'>+	if (tag_len &lt; sizeof(*sbuf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "HTT_STATS_PDEV_RTT_TBR_CMD_RESULT_STATS_TAG:\n");</div><div class='add'>+	for (i = 0; i &lt; le32_to_cpu(sbuf-&gt;tbr_num_sch_cmd_result_buckets); i++) {</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "num_sch_cmd_status_%u:\n", i);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "SU frame_SGEN_TF_POLL = %u\n",</div><div class='add'>+				 le32_to_cpu(sbuf-&gt;su_res[ATH12K_HTT_FTYPE_TF_POLL][i]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "SU frame_SGEN_TF_SOUND = %u\n",</div><div class='add'>+				 le32_to_cpu(sbuf-&gt;su_res[ATH12K_HTT_FTYPE_TF_SOUND][i]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "SU frame_SGEN_TBR_NDPA = %u\n",</div><div class='add'>+				 le32_to_cpu(sbuf-&gt;su_res[ATH12K_HTT_FTYPE_TBR_NDPA][i]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "SU frame_SGEN_TBR_NDP = %u\n",</div><div class='add'>+				 le32_to_cpu(sbuf-&gt;su_res[ATH12K_HTT_FTYPE_TBR_NDP][i]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "SU frame_SGEN_TBR_LMR = %u\n",</div><div class='add'>+				 le32_to_cpu(sbuf-&gt;su_res[ATH12K_HTT_FTYPE_TBR_LMR][i]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "SU frame_SGEN_TF_REPORT = %u\n",</div><div class='add'>+				 le32_to_cpu(sbuf-&gt;su_res[ATH12K_HTT_FTYPE_TF_RPRT][i]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "MU frame_SGEN_TF_POLL = %u\n",</div><div class='add'>+				 le32_to_cpu(sbuf-&gt;mu_res[ATH12K_HTT_FTYPE_TF_POLL][i]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "MU frame_SGEN_TF_SOUND = %u\n",</div><div class='add'>+				 le32_to_cpu(sbuf-&gt;mu_res[ATH12K_HTT_FTYPE_TF_SOUND][i]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "MU frame_SGEN_TBR_NDPA = %u\n",</div><div class='add'>+				 le32_to_cpu(sbuf-&gt;mu_res[ATH12K_HTT_FTYPE_TBR_NDPA][i]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "MU frame_SGEN_TBR_NDP = %u\n",</div><div class='add'>+				 le32_to_cpu(sbuf-&gt;mu_res[ATH12K_HTT_FTYPE_TBR_NDP][i]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "MU frame_SGEN_TBR_LMR = %u\n",</div><div class='add'>+				 le32_to_cpu(sbuf-&gt;mu_res[ATH12K_HTT_FTYPE_TBR_LMR][i]));</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "MU frame_SGEN_TF_REPORT = %u\n\n",</div><div class='add'>+				 le32_to_cpu(sbuf-&gt;mu_res[ATH12K_HTT_FTYPE_TF_RPRT][i]));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats_req-&gt;buf_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dbg_htt_ext_stats_parse(struct ath12k_base *ab,</div><div class='add'>+					  u16 tag, u16 len, const void *tag_buf,</div><div class='add'>+					  void *user_data)</div><div class='add'>+{</div><div class='add'>+	struct debug_htt_stats_req *stats_req = user_data;</div><div class='add'>+</div><div class='add'>+	switch (tag) {</div><div class='add'>+	case HTT_STATS_TX_PDEV_CMN_TAG:</div><div class='add'>+		htt_print_tx_pdev_stats_cmn_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_PDEV_UNDERRUN_TAG:</div><div class='add'>+		htt_print_tx_pdev_stats_urrn_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_PDEV_SIFS_TAG:</div><div class='add'>+		htt_print_tx_pdev_stats_sifs_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_PDEV_FLUSH_TAG:</div><div class='add'>+		htt_print_tx_pdev_stats_flush_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_PDEV_SIFS_HIST_TAG:</div><div class='add'>+		htt_print_tx_pdev_stats_sifs_hist_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PDEV_CTRL_PATH_TX_STATS_TAG:</div><div class='add'>+		htt_print_pdev_ctrl_path_tx_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_MU_PPDU_DIST_TAG:</div><div class='add'>+		htt_print_tx_pdev_mu_ppdu_dist_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_SCHED_CMN_TAG:</div><div class='add'>+		ath12k_htt_print_stats_tx_sched_cmn_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_PDEV_SCHEDULER_TXQ_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_pdev_stats_sched_per_txq_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_SCHED_TXQ_CMD_POSTED_TAG:</div><div class='add'>+		ath12k_htt_print_sched_txq_cmd_posted_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_SCHED_TXQ_CMD_REAPED_TAG:</div><div class='add'>+		ath12k_htt_print_sched_txq_cmd_reaped_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_SCHED_TXQ_SCHED_ORDER_SU_TAG:</div><div class='add'>+		ath12k_htt_print_sched_txq_sched_order_su_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_SCHED_TXQ_SCHED_INELIGIBILITY_TAG:</div><div class='add'>+		ath12k_htt_print_sched_txq_sched_ineligibility_tlv(tag_buf, len,</div><div class='add'>+								   stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_SCHED_TXQ_SUPERCYCLE_TRIGGER_TAG:</div><div class='add'>+		ath12k_htt_print_sched_txq_supercycle_trigger_tlv(tag_buf, len,</div><div class='add'>+								  stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_HW_PDEV_ERRS_TAG:</div><div class='add'>+		ath12k_htt_print_hw_stats_pdev_errs_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_HW_INTR_MISC_TAG:</div><div class='add'>+		ath12k_htt_print_hw_stats_intr_misc_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_WHAL_TX_TAG:</div><div class='add'>+		ath12k_htt_print_hw_stats_whal_tx_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_HW_WAR_TAG:</div><div class='add'>+		ath12k_htt_print_hw_war_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_TQM_CMN_TAG:</div><div class='add'>+		ath12k_htt_print_tx_tqm_cmn_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_TQM_ERROR_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_tqm_error_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_TQM_GEN_MPDU_TAG:</div><div class='add'>+		ath12k_htt_print_tx_tqm_gen_mpdu_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_TQM_LIST_MPDU_TAG:</div><div class='add'>+		ath12k_htt_print_tx_tqm_list_mpdu_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_TQM_LIST_MPDU_CNT_TAG:</div><div class='add'>+		ath12k_htt_print_tx_tqm_list_mpdu_cnt_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_TQM_PDEV_TAG:</div><div class='add'>+		ath12k_htt_print_tx_tqm_pdev_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_DE_CMN_TAG:</div><div class='add'>+		ath12k_htt_print_tx_de_cmn_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_DE_EAPOL_PACKETS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_de_eapol_packets_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_DE_CLASSIFY_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_de_classify_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_DE_CLASSIFY_FAILED_TAG:</div><div class='add'>+		ath12k_htt_print_tx_de_classify_failed_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_DE_CLASSIFY_STATUS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_de_classify_status_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_DE_ENQUEUE_PACKETS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_de_enqueue_packets_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_DE_ENQUEUE_DISCARD_TAG:</div><div class='add'>+		ath12k_htt_print_tx_de_enqueue_discard_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_DE_COMPL_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_de_compl_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_SELFGEN_CMN_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_selfgen_cmn_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_SELFGEN_AC_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_selfgen_ac_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_SELFGEN_AX_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_selfgen_ax_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_SELFGEN_BE_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_selfgen_be_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_SELFGEN_AC_ERR_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_selfgen_ac_err_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_SELFGEN_AX_ERR_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_selfgen_ax_err_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_SELFGEN_BE_ERR_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_selfgen_be_err_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_SELFGEN_AC_SCHED_STATUS_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_selfgen_ac_sched_status_stats_tlv(tag_buf, len,</div><div class='add'>+								      stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_SELFGEN_AX_SCHED_STATUS_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_selfgen_ax_sched_status_stats_tlv(tag_buf, len,</div><div class='add'>+								      stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_SELFGEN_BE_SCHED_STATUS_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_selfgen_be_sched_status_stats_tlv(tag_buf, len,</div><div class='add'>+								      stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_STRING_TAG:</div><div class='add'>+		ath12k_htt_print_stats_string_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_SRING_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_sring_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_SFM_CMN_TAG:</div><div class='add'>+		ath12k_htt_print_sfm_cmn_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_SFM_CLIENT_TAG:</div><div class='add'>+		ath12k_htt_print_sfm_client_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_SFM_CLIENT_USER_TAG:</div><div class='add'>+		ath12k_htt_print_sfm_client_user_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_PDEV_MU_MIMO_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_pdev_mu_mimo_sch_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_PDEV_MUMIMO_GRP_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_pdev_mumimo_grp_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_PDEV_MPDU_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_pdev_mu_mimo_mpdu_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PDEV_CCA_1SEC_HIST_TAG:</div><div class='add'>+	case HTT_STATS_PDEV_CCA_100MSEC_HIST_TAG:</div><div class='add'>+	case HTT_STATS_PDEV_CCA_STAT_CUMULATIVE_TAG:</div><div class='add'>+		ath12k_htt_print_pdev_cca_stats_hist_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PDEV_CCA_COUNTERS_TAG:</div><div class='add'>+		ath12k_htt_print_pdev_stats_cca_counters_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_SOUNDING_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_sounding_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PDEV_OBSS_PD_TAG:</div><div class='add'>+		ath12k_htt_print_pdev_obss_pd_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_LATENCY_CTX_TAG:</div><div class='add'>+		ath12k_htt_print_latency_prof_ctx_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_LATENCY_CNT_TAG:</div><div class='add'>+		ath12k_htt_print_latency_prof_cnt(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_LATENCY_PROF_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_latency_prof_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_RX_PDEV_UL_TRIG_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_ul_ofdma_trigger_stats(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_RX_PDEV_UL_OFDMA_USER_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_ul_ofdma_user_stats(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_RX_PDEV_UL_MUMIMO_TRIG_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_ul_mumimo_trig_stats(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_RX_FSE_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_rx_fse_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PDEV_TX_RATE_TXBF_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_pdev_tx_rate_txbf_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TXBF_OFDMA_AX_NDPA_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_txbf_ofdma_ax_ndpa_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TXBF_OFDMA_AX_NDP_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_txbf_ofdma_ax_ndp_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TXBF_OFDMA_AX_BRP_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_txbf_ofdma_ax_brp_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TXBF_OFDMA_AX_STEER_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_txbf_ofdma_ax_steer_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TXBF_OFDMA_AX_STEER_MPDU_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_txbf_ofdma_ax_steer_mpdu_stats_tlv(tag_buf, len,</div><div class='add'>+								    stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_DLPAGER_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_dlpager_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PHY_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_phy_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PHY_COUNTERS_TAG:</div><div class='add'>+		ath12k_htt_print_phy_counters_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PHY_RESET_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_phy_reset_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PHY_RESET_COUNTERS_TAG:</div><div class='add'>+		ath12k_htt_print_phy_reset_counters_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PHY_TPC_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_phy_tpc_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_SOC_TXRX_STATS_COMMON_TAG:</div><div class='add'>+		ath12k_htt_print_soc_txrx_stats_common_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PER_RATE_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_per_rate_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_AST_ENTRY_TAG:</div><div class='add'>+		ath12k_htt_print_ast_entry_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PDEV_PUNCTURE_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_puncture_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_DMAC_RESET_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_dmac_reset_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PDEV_SCHED_ALGO_OFDMA_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_pdev_sched_algo_ofdma_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_PDEV_RATE_STATS_BE_OFDMA_TAG:</div><div class='add'>+		ath12k_htt_print_tx_pdev_rate_stats_be_ofdma_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PDEV_MBSSID_CTRL_FRAME_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_pdev_mbssid_ctrl_frame_stats_tlv(tag_buf, len,</div><div class='add'>+								  stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_PDEV_RATE_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_tx_pdev_rate_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_TX_PDEV_HISTOGRAM_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_histogram_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_RX_PDEV_RATE_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_rx_pdev_rate_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_RX_PDEV_RATE_EXT_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_rx_pdev_rate_ext_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PDEV_TDMA_TAG:</div><div class='add'>+		ath12k_htt_print_pdev_tdma_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_MLO_SCHED_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_mlo_sched_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PDEV_MLO_IPC_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_mlo_ipc_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PDEV_RTT_RESP_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_pdev_rtt_resp_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PDEV_RTT_INIT_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_pdev_rtt_init_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PDEV_RTT_HW_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_pdev_rtt_hw_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PDEV_RTT_TBR_SELFGEN_QUEUED_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_pdev_rtt_tbr_selfgen_queued_stats_tlv(tag_buf, len,</div><div class='add'>+								       stats_req);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_STATS_PDEV_RTT_TBR_CMD_RESULT_STATS_TAG:</div><div class='add'>+		ath12k_htt_print_pdev_rtt_tbr_cmd_res_stats_tlv(tag_buf, len, stats_req);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_debugfs_htt_ext_stats_handler(struct ath12k_base *ab,</div><div class='add'>+					  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_htt_extd_stats_msg *msg;</div><div class='add'>+	struct debug_htt_stats_req *stats_req;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	u32 len, pdev_id, stats_info;</div><div class='add'>+	u64 cookie;</div><div class='add'>+	int ret;</div><div class='add'>+	bool send_completion = false;</div><div class='add'>+</div><div class='add'>+	msg = (struct ath12k_htt_extd_stats_msg *)skb-&gt;data;</div><div class='add'>+	cookie = le64_to_cpu(msg-&gt;cookie);</div><div class='add'>+</div><div class='add'>+	if (u64_get_bits(cookie, ATH12K_HTT_STATS_COOKIE_MSB) !=</div><div class='add'>+			 ATH12K_HTT_STATS_MAGIC_VALUE) {</div><div class='add'>+		ath12k_warn(ab, "received invalid htt ext stats event\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pdev_id = u64_get_bits(cookie, ATH12K_HTT_STATS_COOKIE_LSB);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ar = ath12k_mac_get_ar_by_pdev_id(ab, pdev_id);</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath12k_warn(ab, "failed to get ar for pdev_id %d\n", pdev_id);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats_req = ar-&gt;debug.htt_stats.stats_req;</div><div class='add'>+	if (!stats_req)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	stats_info = le32_to_cpu(msg-&gt;info1);</div><div class='add'>+	stats_req-&gt;done = u32_get_bits(stats_info, ATH12K_HTT_T2H_EXT_STATS_INFO1_DONE);</div><div class='add'>+	if (stats_req-&gt;done)</div><div class='add'>+		send_completion = true;</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	len = u32_get_bits(stats_info, ATH12K_HTT_T2H_EXT_STATS_INFO1_LENGTH);</div><div class='add'>+	if (len &gt; skb-&gt;len) {</div><div class='add'>+		ath12k_warn(ab, "invalid length %d for HTT stats", len);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_htt_tlv_iter(ab, msg-&gt;data, len,</div><div class='add'>+				     ath12k_dbg_htt_ext_stats_parse,</div><div class='add'>+				     stats_req);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ab, "Failed to parse tlv %d\n", ret);</div><div class='add'>+</div><div class='add'>+	if (send_completion)</div><div class='add'>+		complete(&amp;stats_req-&gt;htt_stats_rcvd);</div><div class='add'>+exit:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath12k_read_htt_stats_type(struct file *file,</div><div class='add'>+					  char __user *user_buf,</div><div class='add'>+					  size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = file-&gt;private_data;</div><div class='add'>+	enum ath12k_dbg_htt_ext_stats_type type;</div><div class='add'>+	char buf[32];</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	wiphy_lock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+	type = ar-&gt;debug.htt_stats.type;</div><div class='add'>+	wiphy_unlock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	len = scnprintf(buf, sizeof(buf), "%u\n", type);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath12k_write_htt_stats_type(struct file *file,</div><div class='add'>+					   const char __user *user_buf,</div><div class='add'>+					   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = file-&gt;private_data;</div><div class='add'>+	enum ath12k_dbg_htt_ext_stats_type type;</div><div class='add'>+	unsigned int cfg_param[4] = {};</div><div class='add'>+	const int size = 32;</div><div class='add'>+	int num_args;</div><div class='add'>+</div><div class='add'>+	if (count &gt; size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	char *buf __free(kfree) = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(buf, user_buf, count))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	num_args = sscanf(buf, "%u %u %u %u %u\n", &amp;type, &amp;cfg_param[0],</div><div class='add'>+			  &amp;cfg_param[1], &amp;cfg_param[2], &amp;cfg_param[3]);</div><div class='add'>+	if (!num_args || num_args &gt; 5)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (type == ATH12K_DBG_HTT_EXT_STATS_RESET ||</div><div class='add'>+	    type &gt;= ATH12K_DBG_HTT_NUM_EXT_STATS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	wiphy_lock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ar-&gt;debug.htt_stats.type = type;</div><div class='add'>+	ar-&gt;debug.htt_stats.cfg_param[0] = cfg_param[0];</div><div class='add'>+	ar-&gt;debug.htt_stats.cfg_param[1] = cfg_param[1];</div><div class='add'>+	ar-&gt;debug.htt_stats.cfg_param[2] = cfg_param[2];</div><div class='add'>+	ar-&gt;debug.htt_stats.cfg_param[3] = cfg_param[3];</div><div class='add'>+</div><div class='add'>+	wiphy_unlock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_htt_stats_type = {</div><div class='add'>+	.read = ath12k_read_htt_stats_type,</div><div class='add'>+	.write = ath12k_write_htt_stats_type,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ath12k_debugfs_htt_stats_req(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct debug_htt_stats_req *stats_req = ar-&gt;debug.htt_stats.stats_req;</div><div class='add'>+	enum ath12k_dbg_htt_ext_stats_type type = stats_req-&gt;type;</div><div class='add'>+	u64 cookie;</div><div class='add'>+	int ret, pdev_id;</div><div class='add'>+	struct htt_ext_stats_cfg_params cfg_params = {};</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;stats_req-&gt;htt_stats_rcvd);</div><div class='add'>+</div><div class='add'>+	pdev_id = ath12k_mac_get_target_pdev_id(ar);</div><div class='add'>+	stats_req-&gt;done = false;</div><div class='add'>+	stats_req-&gt;pdev_id = pdev_id;</div><div class='add'>+</div><div class='add'>+	cookie = u64_encode_bits(ATH12K_HTT_STATS_MAGIC_VALUE,</div><div class='add'>+				 ATH12K_HTT_STATS_COOKIE_MSB);</div><div class='add'>+	cookie |= u64_encode_bits(pdev_id, ATH12K_HTT_STATS_COOKIE_LSB);</div><div class='add'>+</div><div class='add'>+	if (stats_req-&gt;override_cfg_param) {</div><div class='add'>+		cfg_params.cfg0 = stats_req-&gt;cfg_param[0];</div><div class='add'>+		cfg_params.cfg1 = stats_req-&gt;cfg_param[1];</div><div class='add'>+		cfg_params.cfg2 = stats_req-&gt;cfg_param[2];</div><div class='add'>+		cfg_params.cfg3 = stats_req-&gt;cfg_param[3];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_tx_htt_h2t_ext_stats_req(ar, type, &amp;cfg_params, cookie);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to send htt stats request: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	if (!wait_for_completion_timeout(&amp;stats_req-&gt;htt_stats_rcvd, 3 * HZ)) {</div><div class='add'>+		spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		if (!stats_req-&gt;done) {</div><div class='add'>+			stats_req-&gt;done = true;</div><div class='add'>+			spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "stats request timed out\n");</div><div class='add'>+			return -ETIMEDOUT;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_open_htt_stats(struct inode *inode,</div><div class='add'>+				 struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = inode-&gt;i_private;</div><div class='add'>+	struct debug_htt_stats_req *stats_req;</div><div class='add'>+	enum ath12k_dbg_htt_ext_stats_type type = ar-&gt;debug.htt_stats.type;</div><div class='add'>+	struct ath12k_hw *ah = ath12k_ar_to_ah(ar);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (type == ATH12K_DBG_HTT_EXT_STATS_RESET)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	wiphy_lock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;state != ATH12K_HW_STATE_ON) {</div><div class='add'>+		ret = -ENETDOWN;</div><div class='add'>+		goto err_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;debug.htt_stats.stats_req) {</div><div class='add'>+		ret = -EAGAIN;</div><div class='add'>+		goto err_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats_req = kzalloc(sizeof(*stats_req) + ATH12K_HTT_STATS_BUF_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!stats_req) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;debug.htt_stats.stats_req = stats_req;</div><div class='add'>+	stats_req-&gt;type = type;</div><div class='add'>+	stats_req-&gt;cfg_param[0] = ar-&gt;debug.htt_stats.cfg_param[0];</div><div class='add'>+	stats_req-&gt;cfg_param[1] = ar-&gt;debug.htt_stats.cfg_param[1];</div><div class='add'>+	stats_req-&gt;cfg_param[2] = ar-&gt;debug.htt_stats.cfg_param[2];</div><div class='add'>+	stats_req-&gt;cfg_param[3] = ar-&gt;debug.htt_stats.cfg_param[3];</div><div class='add'>+	stats_req-&gt;override_cfg_param = !!stats_req-&gt;cfg_param[0] ||</div><div class='add'>+					!!stats_req-&gt;cfg_param[1] ||</div><div class='add'>+					!!stats_req-&gt;cfg_param[2] ||</div><div class='add'>+					!!stats_req-&gt;cfg_param[3];</div><div class='add'>+</div><div class='add'>+	ret = ath12k_debugfs_htt_stats_req(ar);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	file-&gt;private_data = stats_req;</div><div class='add'>+</div><div class='add'>+	wiphy_unlock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+out:</div><div class='add'>+	kfree(stats_req);</div><div class='add'>+	ar-&gt;debug.htt_stats.stats_req = NULL;</div><div class='add'>+err_unlock:</div><div class='add'>+	wiphy_unlock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_release_htt_stats(struct inode *inode,</div><div class='add'>+				    struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = inode-&gt;i_private;</div><div class='add'>+</div><div class='add'>+	wiphy_lock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+	kfree(file-&gt;private_data);</div><div class='add'>+	ar-&gt;debug.htt_stats.stats_req = NULL;</div><div class='add'>+	wiphy_unlock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath12k_read_htt_stats(struct file *file,</div><div class='add'>+				     char __user *user_buf,</div><div class='add'>+				     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct debug_htt_stats_req *stats_req = file-&gt;private_data;</div><div class='add'>+	char *buf;</div><div class='add'>+	u32 length;</div><div class='add'>+</div><div class='add'>+	buf = stats_req-&gt;buf;</div><div class='add'>+	length = min_t(u32, stats_req-&gt;buf_len, ATH12K_HTT_STATS_BUF_SIZE);</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, length);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_dump_htt_stats = {</div><div class='add'>+	.open = ath12k_open_htt_stats,</div><div class='add'>+	.release = ath12k_release_htt_stats,</div><div class='add'>+	.read = ath12k_read_htt_stats,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t ath12k_write_htt_stats_reset(struct file *file,</div><div class='add'>+					    const char __user *user_buf,</div><div class='add'>+					    size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = file-&gt;private_data;</div><div class='add'>+	enum ath12k_dbg_htt_ext_stats_type type;</div><div class='add'>+	struct htt_ext_stats_cfg_params cfg_params = {};</div><div class='add'>+	u8 param_pos;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtou32_from_user(user_buf, count, 0, &amp;type);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (type &gt;= ATH12K_DBG_HTT_NUM_EXT_STATS ||</div><div class='add'>+	    type == ATH12K_DBG_HTT_EXT_STATS_RESET)</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	wiphy_lock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+	cfg_params.cfg0 = HTT_STAT_DEFAULT_RESET_START_OFFSET;</div><div class='add'>+	param_pos = (type &gt;&gt; 5) + 1;</div><div class='add'>+</div><div class='add'>+	switch (param_pos) {</div><div class='add'>+	case ATH12K_HTT_STATS_RESET_PARAM_CFG_32_BYTES:</div><div class='add'>+		cfg_params.cfg1 = 1 &lt;&lt; (cfg_params.cfg0 + type);</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_HTT_STATS_RESET_PARAM_CFG_64_BYTES:</div><div class='add'>+		cfg_params.cfg2 = ATH12K_HTT_STATS_RESET_BITMAP32_BIT(cfg_params.cfg0 +</div><div class='add'>+								      type);</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_HTT_STATS_RESET_PARAM_CFG_128_BYTES:</div><div class='add'>+		cfg_params.cfg3 = ATH12K_HTT_STATS_RESET_BITMAP64_BIT(cfg_params.cfg0 +</div><div class='add'>+								      type);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_tx_htt_h2t_ext_stats_req(ar,</div><div class='add'>+						 ATH12K_DBG_HTT_EXT_STATS_RESET,</div><div class='add'>+						 &amp;cfg_params,</div><div class='add'>+						 0ULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to send htt stats request: %d\n", ret);</div><div class='add'>+		wiphy_unlock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;debug.htt_stats.reset = type;</div><div class='add'>+	wiphy_unlock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_htt_stats_reset = {</div><div class='add'>+	.write = ath12k_write_htt_stats_reset,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath12k_debugfs_htt_stats_register(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	debugfs_create_file("htt_stats_type", 0600, ar-&gt;debug.debugfs_pdev,</div><div class='add'>+			    ar, &amp;fops_htt_stats_type);</div><div class='add'>+	debugfs_create_file("htt_stats", 0400, ar-&gt;debug.debugfs_pdev,</div><div class='add'>+			    ar, &amp;fops_dump_htt_stats);</div><div class='add'>+	debugfs_create_file("htt_stats_reset", 0200, ar-&gt;debug.debugfs_pdev,</div><div class='add'>+			    ar, &amp;fops_htt_stats_reset);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.h b/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.h<br/>new file mode 100644<br/>index 000000000000..9bd3a632b002<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/debugfs_htt_stats.h</a></div><div class='hunk'>@@ -0,0 +1,2076 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef DEBUG_HTT_STATS_H</div><div class='add'>+#define DEBUG_HTT_STATS_H</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_STATS_BUF_SIZE		(1024 * 512)</div><div class='add'>+#define ATH12K_HTT_STATS_COOKIE_LSB		GENMASK_ULL(31, 0)</div><div class='add'>+#define ATH12K_HTT_STATS_COOKIE_MSB		GENMASK_ULL(63, 32)</div><div class='add'>+#define ATH12K_HTT_STATS_MAGIC_VALUE		0xF0F0F0F0</div><div class='add'>+#define ATH12K_HTT_STATS_SUBTYPE_MAX		16</div><div class='add'>+#define ATH12K_HTT_MAX_STRING_LEN		256</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_STATS_RESET_BITMAP32_OFFSET(_idx)	((_idx) &amp; 0x1f)</div><div class='add'>+#define ATH12K_HTT_STATS_RESET_BITMAP64_OFFSET(_idx)	((_idx) &amp; 0x3f)</div><div class='add'>+#define ATH12K_HTT_STATS_RESET_BITMAP32_BIT(_idx)	(1 &lt;&lt; \</div><div class='add'>+		ATH12K_HTT_STATS_RESET_BITMAP32_OFFSET(_idx))</div><div class='add'>+#define ATH12K_HTT_STATS_RESET_BITMAP64_BIT(_idx)	(1 &lt;&lt; \</div><div class='add'>+		ATH12K_HTT_STATS_RESET_BITMAP64_OFFSET(_idx))</div><div class='add'>+</div><div class='add'>+void ath12k_debugfs_htt_stats_register(struct ath12k *ar);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ATH12K_DEBUGFS</div><div class='add'>+void ath12k_debugfs_htt_ext_stats_handler(struct ath12k_base *ab,</div><div class='add'>+					  struct sk_buff *skb);</div><div class='add'>+#else /* CONFIG_ATH12K_DEBUGFS */</div><div class='add'>+static inline void ath12k_debugfs_htt_ext_stats_handler(struct ath12k_base *ab,</div><div class='add'>+							struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: target -&gt; host extended statistics upload</div><div class='add'>+ *</div><div class='add'>+ * The following field definitions describe the format of the HTT</div><div class='add'>+ * target to host stats upload confirmation message.</div><div class='add'>+ * The message contains a cookie echoed from the HTT host-&gt;target stats</div><div class='add'>+ * upload request, which identifies which request the confirmation is</div><div class='add'>+ * for, and a single stats can span over multiple HTT stats indication</div><div class='add'>+ * due to the HTT message size limitation so every HTT ext stats</div><div class='add'>+ * indication will have tag-length-value stats information elements.</div><div class='add'>+ * The tag-length header for each HTT stats IND message also includes a</div><div class='add'>+ * status field, to indicate whether the request for the stat type in</div><div class='add'>+ * question was fully met, partially met, unable to be met, or invalid</div><div class='add'>+ * (if the stat type in question is disabled in the target).</div><div class='add'>+ * A Done bit 1's indicate the end of the of stats info elements.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * |31                         16|15    12|11|10 8|7   5|4       0|</div><div class='add'>+ * |--------------------------------------------------------------|</div><div class='add'>+ * |                   reserved                   |    msg type   |</div><div class='add'>+ * |--------------------------------------------------------------|</div><div class='add'>+ * |                         cookie LSBs                          |</div><div class='add'>+ * |--------------------------------------------------------------|</div><div class='add'>+ * |                         cookie MSBs                          |</div><div class='add'>+ * |--------------------------------------------------------------|</div><div class='add'>+ * |      stats entry length     | rsvd   | D|  S |   stat type   |</div><div class='add'>+ * |--------------------------------------------------------------|</div><div class='add'>+ * |                   type-specific stats info                   |</div><div class='add'>+ * |                      (see debugfs_htt_stats.h)               |</div><div class='add'>+ * |--------------------------------------------------------------|</div><div class='add'>+ * Header fields:</div><div class='add'>+ *  - MSG_TYPE</div><div class='add'>+ *    Bits 7:0</div><div class='add'>+ *    Purpose: Identifies this is a extended statistics upload confirmation</div><div class='add'>+ *             message.</div><div class='add'>+ *    Value: 0x1c</div><div class='add'>+ *  - COOKIE_LSBS</div><div class='add'>+ *    Bits 31:0</div><div class='add'>+ *    Purpose: Provide a mechanism to match a target-&gt;host stats confirmation</div><div class='add'>+ *        message with its preceding host-&gt;target stats request message.</div><div class='add'>+ *    Value: MSBs of the opaque cookie specified by the host-side requestor</div><div class='add'>+ *  - COOKIE_MSBS</div><div class='add'>+ *    Bits 31:0</div><div class='add'>+ *    Purpose: Provide a mechanism to match a target-&gt;host stats confirmation</div><div class='add'>+ *        message with its preceding host-&gt;target stats request message.</div><div class='add'>+ *    Value: MSBs of the opaque cookie specified by the host-side requestor</div><div class='add'>+ *</div><div class='add'>+ * Stats Information Element tag-length header fields:</div><div class='add'>+ *  - STAT_TYPE</div><div class='add'>+ *    Bits 7:0</div><div class='add'>+ *    Purpose: identifies the type of statistics info held in the</div><div class='add'>+ *        following information element</div><div class='add'>+ *    Value: ath12k_dbg_htt_ext_stats_type</div><div class='add'>+ *  - STATUS</div><div class='add'>+ *    Bits 10:8</div><div class='add'>+ *    Purpose: indicate whether the requested stats are present</div><div class='add'>+ *    Value:</div><div class='add'>+ *       0 -&gt; The requested stats have been delivered in full</div><div class='add'>+ *       1 -&gt; The requested stats have been delivered in part</div><div class='add'>+ *       2 -&gt; The requested stats could not be delivered (error case)</div><div class='add'>+ *       3 -&gt; The requested stat type is either not recognized (invalid)</div><div class='add'>+ *  - DONE</div><div class='add'>+ *    Bits 11</div><div class='add'>+ *    Purpose:</div><div class='add'>+ *        Indicates the completion of the stats entry, this will be the last</div><div class='add'>+ *        stats conf HTT segment for the requested stats type.</div><div class='add'>+ *    Value:</div><div class='add'>+ *        0 -&gt; the stats retrieval is ongoing</div><div class='add'>+ *        1 -&gt; the stats retrieval is complete</div><div class='add'>+ *  - LENGTH</div><div class='add'>+ *    Bits 31:16</div><div class='add'>+ *    Purpose: indicate the stats information size</div><div class='add'>+ *    Value: This field specifies the number of bytes of stats information</div><div class='add'>+ *       that follows the element tag-length header.</div><div class='add'>+ *       It is expected but not required that this length is a multiple of</div><div class='add'>+ *       4 bytes.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_T2H_EXT_STATS_INFO1_DONE		BIT(11)</div><div class='add'>+#define ATH12K_HTT_T2H_EXT_STATS_INFO1_LENGTH		GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_extd_stats_msg {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le64 cookie;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* htt_dbg_ext_stats_type */</div><div class='add'>+enum ath12k_dbg_htt_ext_stats_type {</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_RESET				= 0,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_PDEV_TX			= 1,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_PDEV_TX_SCHED			= 4,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_PDEV_ERROR			= 5,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_PDEV_TQM			= 6,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_TX_DE_INFO			= 8,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_PDEV_TX_RATE			= 9,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_PDEV_RX_RATE			= 10,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_TX_SELFGEN_INFO		= 12,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_SRNG_INFO			= 15,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_SFM_INFO			= 16,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_PDEV_TX_MU			= 17,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_PDEV_CCA_STATS			= 19,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_TX_SOUNDING_INFO		= 22,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_PDEV_OBSS_PD_STATS		= 23,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_LATENCY_PROF_STATS		= 25,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_PDEV_UL_TRIG_STATS		= 26,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_PDEV_UL_MUMIMO_TRIG_STATS	= 27,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_FSE_RX				= 28,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_PDEV_RX_RATE_EXT		= 30,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_PDEV_TX_RATE_TXBF		= 31,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_TXBF_OFDMA			= 32,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_DLPAGER_STATS			= 36,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_PHY_COUNTERS_AND_PHY_STATS		= 37,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_VDEVS_TXRX_STATS			= 38,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_PDEV_PER_STATS			= 40,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_AST_ENTRIES				= 41,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_SOC_ERROR			= 45,</div><div class='add'>+	ATH12K_DBG_HTT_DBG_PDEV_PUNCTURE_STATS			= 46,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_PDEV_SCHED_ALGO		= 49,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_STATS_MANDATORY_MUOFDMA		= 51,</div><div class='add'>+	ATH12K_DGB_HTT_EXT_STATS_PDEV_MBSSID_CTRL_FRAME		= 54,</div><div class='add'>+	ATH12K_DBG_HTT_PDEV_TDMA_STATS				= 57,</div><div class='add'>+	ATH12K_DBG_HTT_MLO_SCHED_STATS				= 63,</div><div class='add'>+	ATH12K_DBG_HTT_PDEV_MLO_IPC_STATS			= 64,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_PDEV_RTT_RESP_STATS			= 65,</div><div class='add'>+	ATH12K_DBG_HTT_EXT_PDEV_RTT_INITIATOR_STATS		= 66,</div><div class='add'>+</div><div class='add'>+	/* keep this last */</div><div class='add'>+	ATH12K_DBG_HTT_NUM_EXT_STATS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_dbg_htt_tlv_tag {</div><div class='add'>+	HTT_STATS_TX_PDEV_CMN_TAG			= 0,</div><div class='add'>+	HTT_STATS_TX_PDEV_UNDERRUN_TAG			= 1,</div><div class='add'>+	HTT_STATS_TX_PDEV_SIFS_TAG			= 2,</div><div class='add'>+	HTT_STATS_TX_PDEV_FLUSH_TAG			= 3,</div><div class='add'>+	HTT_STATS_STRING_TAG				= 5,</div><div class='add'>+	HTT_STATS_TX_TQM_GEN_MPDU_TAG			= 11,</div><div class='add'>+	HTT_STATS_TX_TQM_LIST_MPDU_TAG			= 12,</div><div class='add'>+	HTT_STATS_TX_TQM_LIST_MPDU_CNT_TAG		= 13,</div><div class='add'>+	HTT_STATS_TX_TQM_CMN_TAG			= 14,</div><div class='add'>+	HTT_STATS_TX_TQM_PDEV_TAG			= 15,</div><div class='add'>+	HTT_STATS_TX_DE_EAPOL_PACKETS_TAG		= 17,</div><div class='add'>+	HTT_STATS_TX_DE_CLASSIFY_FAILED_TAG		= 18,</div><div class='add'>+	HTT_STATS_TX_DE_CLASSIFY_STATS_TAG		= 19,</div><div class='add'>+	HTT_STATS_TX_DE_CLASSIFY_STATUS_TAG		= 20,</div><div class='add'>+	HTT_STATS_TX_DE_ENQUEUE_PACKETS_TAG		= 21,</div><div class='add'>+	HTT_STATS_TX_DE_ENQUEUE_DISCARD_TAG		= 22,</div><div class='add'>+	HTT_STATS_TX_DE_CMN_TAG				= 23,</div><div class='add'>+	HTT_STATS_TX_PDEV_MU_MIMO_STATS_TAG		= 25,</div><div class='add'>+	HTT_STATS_SFM_CMN_TAG				= 26,</div><div class='add'>+	HTT_STATS_SRING_STATS_TAG			= 27,</div><div class='add'>+	HTT_STATS_TX_PDEV_RATE_STATS_TAG		= 34,</div><div class='add'>+	HTT_STATS_RX_PDEV_RATE_STATS_TAG		= 35,</div><div class='add'>+	HTT_STATS_TX_PDEV_SCHEDULER_TXQ_STATS_TAG	= 36,</div><div class='add'>+	HTT_STATS_TX_SCHED_CMN_TAG			= 37,</div><div class='add'>+	HTT_STATS_SCHED_TXQ_CMD_POSTED_TAG		= 39,</div><div class='add'>+	HTT_STATS_SFM_CLIENT_USER_TAG			= 41,</div><div class='add'>+	HTT_STATS_SFM_CLIENT_TAG			= 42,</div><div class='add'>+	HTT_STATS_TX_TQM_ERROR_STATS_TAG                = 43,</div><div class='add'>+	HTT_STATS_SCHED_TXQ_CMD_REAPED_TAG		= 44,</div><div class='add'>+	HTT_STATS_TX_SELFGEN_AC_ERR_STATS_TAG		= 46,</div><div class='add'>+	HTT_STATS_TX_SELFGEN_CMN_STATS_TAG		= 47,</div><div class='add'>+	HTT_STATS_TX_SELFGEN_AC_STATS_TAG		= 48,</div><div class='add'>+	HTT_STATS_TX_SELFGEN_AX_STATS_TAG		= 49,</div><div class='add'>+	HTT_STATS_TX_SELFGEN_AX_ERR_STATS_TAG		= 50,</div><div class='add'>+	HTT_STATS_HW_INTR_MISC_TAG			= 54,</div><div class='add'>+	HTT_STATS_HW_PDEV_ERRS_TAG			= 56,</div><div class='add'>+	HTT_STATS_TX_DE_COMPL_STATS_TAG			= 65,</div><div class='add'>+	HTT_STATS_WHAL_TX_TAG				= 66,</div><div class='add'>+	HTT_STATS_TX_PDEV_SIFS_HIST_TAG			= 67,</div><div class='add'>+	HTT_STATS_PDEV_CCA_1SEC_HIST_TAG		= 70,</div><div class='add'>+	HTT_STATS_PDEV_CCA_100MSEC_HIST_TAG		= 71,</div><div class='add'>+	HTT_STATS_PDEV_CCA_STAT_CUMULATIVE_TAG		= 72,</div><div class='add'>+	HTT_STATS_PDEV_CCA_COUNTERS_TAG			= 73,</div><div class='add'>+	HTT_STATS_TX_PDEV_MPDU_STATS_TAG		= 74,</div><div class='add'>+	HTT_STATS_TX_SOUNDING_STATS_TAG			= 80,</div><div class='add'>+	HTT_STATS_SCHED_TXQ_SCHED_ORDER_SU_TAG		= 86,</div><div class='add'>+	HTT_STATS_SCHED_TXQ_SCHED_INELIGIBILITY_TAG	= 87,</div><div class='add'>+	HTT_STATS_PDEV_OBSS_PD_TAG			= 88,</div><div class='add'>+	HTT_STATS_HW_WAR_TAG				= 89,</div><div class='add'>+	HTT_STATS_LATENCY_PROF_STATS_TAG		= 91,</div><div class='add'>+	HTT_STATS_LATENCY_CTX_TAG			= 92,</div><div class='add'>+	HTT_STATS_LATENCY_CNT_TAG			= 93,</div><div class='add'>+	HTT_STATS_RX_PDEV_UL_TRIG_STATS_TAG		= 94,</div><div class='add'>+	HTT_STATS_RX_PDEV_UL_OFDMA_USER_STATS_TAG	= 95,</div><div class='add'>+	HTT_STATS_RX_PDEV_UL_MUMIMO_TRIG_STATS_TAG	= 97,</div><div class='add'>+	HTT_STATS_RX_FSE_STATS_TAG			= 98,</div><div class='add'>+	HTT_STATS_SCHED_TXQ_SUPERCYCLE_TRIGGER_TAG	= 100,</div><div class='add'>+	HTT_STATS_PDEV_CTRL_PATH_TX_STATS_TAG		= 102,</div><div class='add'>+	HTT_STATS_RX_PDEV_RATE_EXT_STATS_TAG		= 103,</div><div class='add'>+	HTT_STATS_PDEV_TX_RATE_TXBF_STATS_TAG		= 108,</div><div class='add'>+	HTT_STATS_TX_SELFGEN_AC_SCHED_STATUS_STATS_TAG	= 111,</div><div class='add'>+	HTT_STATS_TX_SELFGEN_AX_SCHED_STATUS_STATS_TAG	= 112,</div><div class='add'>+	HTT_STATS_DLPAGER_STATS_TAG			= 120,</div><div class='add'>+	HTT_STATS_PHY_COUNTERS_TAG			= 121,</div><div class='add'>+	HTT_STATS_PHY_STATS_TAG				= 122,</div><div class='add'>+	HTT_STATS_PHY_RESET_COUNTERS_TAG		= 123,</div><div class='add'>+	HTT_STATS_PHY_RESET_STATS_TAG			= 124,</div><div class='add'>+	HTT_STATS_SOC_TXRX_STATS_COMMON_TAG		= 125,</div><div class='add'>+	HTT_STATS_PER_RATE_STATS_TAG			= 128,</div><div class='add'>+	HTT_STATS_MU_PPDU_DIST_TAG			= 129,</div><div class='add'>+	HTT_STATS_TX_PDEV_MUMIMO_GRP_STATS_TAG		= 130,</div><div class='add'>+	HTT_STATS_AST_ENTRY_TAG				= 132,</div><div class='add'>+	HTT_STATS_TX_PDEV_RATE_STATS_BE_OFDMA_TAG	= 135,</div><div class='add'>+	HTT_STATS_TX_SELFGEN_BE_ERR_STATS_TAG		= 137,</div><div class='add'>+	HTT_STATS_TX_SELFGEN_BE_STATS_TAG		= 138,</div><div class='add'>+	HTT_STATS_TX_SELFGEN_BE_SCHED_STATUS_STATS_TAG	= 139,</div><div class='add'>+	HTT_STATS_TX_PDEV_HISTOGRAM_STATS_TAG		= 144,</div><div class='add'>+	HTT_STATS_TXBF_OFDMA_AX_NDPA_STATS_TAG		= 147,</div><div class='add'>+	HTT_STATS_TXBF_OFDMA_AX_NDP_STATS_TAG		= 148,</div><div class='add'>+	HTT_STATS_TXBF_OFDMA_AX_BRP_STATS_TAG		= 149,</div><div class='add'>+	HTT_STATS_TXBF_OFDMA_AX_STEER_STATS_TAG		= 150,</div><div class='add'>+	HTT_STATS_DMAC_RESET_STATS_TAG			= 155,</div><div class='add'>+	HTT_STATS_PHY_TPC_STATS_TAG			= 157,</div><div class='add'>+	HTT_STATS_PDEV_PUNCTURE_STATS_TAG		= 158,</div><div class='add'>+	HTT_STATS_PDEV_SCHED_ALGO_OFDMA_STATS_TAG	= 165,</div><div class='add'>+	HTT_STATS_TXBF_OFDMA_AX_STEER_MPDU_STATS_TAG	= 172,</div><div class='add'>+	HTT_STATS_PDEV_MBSSID_CTRL_FRAME_STATS_TAG	= 176,</div><div class='add'>+	HTT_STATS_PDEV_TDMA_TAG				= 187,</div><div class='add'>+	HTT_STATS_MLO_SCHED_STATS_TAG			= 190,</div><div class='add'>+	HTT_STATS_PDEV_MLO_IPC_STATS_TAG		= 191,</div><div class='add'>+	HTT_STATS_PDEV_RTT_RESP_STATS_TAG		= 194,</div><div class='add'>+	HTT_STATS_PDEV_RTT_INIT_STATS_TAG		= 195,</div><div class='add'>+	HTT_STATS_PDEV_RTT_HW_STATS_TAG			= 196,</div><div class='add'>+	HTT_STATS_PDEV_RTT_TBR_SELFGEN_QUEUED_STATS_TAG	= 197,</div><div class='add'>+	HTT_STATS_PDEV_RTT_TBR_CMD_RESULT_STATS_TAG	= 198,</div><div class='add'>+</div><div class='add'>+	HTT_STATS_MAX_TAG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_STATS_MAC_ID				GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_MAX_SIFS_BURST_STATS		9</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_MAX_FLUSH_REASON_STATS	150</div><div class='add'>+</div><div class='add'>+/* MU MIMO distribution stats is a 2-dimensional array</div><div class='add'>+ * with dimension one denoting stats for nr4[0] or nr8[1]</div><div class='add'>+ */</div><div class='add'>+#define ATH12K_HTT_STATS_NUM_NR_BINS			2</div><div class='add'>+#define ATH12K_HTT_STATS_MAX_NUM_MU_PPDU_PER_BURST	10</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_MAX_SIFS_BURST_HIST_STATS	10</div><div class='add'>+#define ATH12K_HTT_STATS_MAX_NUM_SCHED_STATUS		9</div><div class='add'>+#define ATH12K_HTT_STATS_NUM_SCHED_STATUS_WORDS		\</div><div class='add'>+	(ATH12K_HTT_STATS_NUM_NR_BINS * ATH12K_HTT_STATS_MAX_NUM_SCHED_STATUS)</div><div class='add'>+#define ATH12K_HTT_STATS_MU_PPDU_PER_BURST_WORDS	\</div><div class='add'>+	(ATH12K_HTT_STATS_NUM_NR_BINS * ATH12K_HTT_STATS_MAX_NUM_MU_PPDU_PER_BURST)</div><div class='add'>+</div><div class='add'>+enum ath12k_htt_tx_pdev_underrun_enum {</div><div class='add'>+	HTT_STATS_TX_PDEV_NO_DATA_UNDERRUN		= 0,</div><div class='add'>+	HTT_STATS_TX_PDEV_DATA_UNDERRUN_BETWEEN_MPDU	= 1,</div><div class='add'>+	HTT_STATS_TX_PDEV_DATA_UNDERRUN_WITHIN_MPDU	= 2,</div><div class='add'>+	HTT_TX_PDEV_MAX_URRN_STATS			= 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_htt_stats_reset_cfg_param_alloc_pos {</div><div class='add'>+	ATH12K_HTT_STATS_RESET_PARAM_CFG_32_BYTES = 1,</div><div class='add'>+	ATH12K_HTT_STATS_RESET_PARAM_CFG_64_BYTES,</div><div class='add'>+	ATH12K_HTT_STATS_RESET_PARAM_CFG_128_BYTES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct debug_htt_stats_req {</div><div class='add'>+	bool done;</div><div class='add'>+	bool override_cfg_param;</div><div class='add'>+	u8 pdev_id;</div><div class='add'>+	enum ath12k_dbg_htt_ext_stats_type type;</div><div class='add'>+	u32 cfg_param[4];</div><div class='add'>+	u8 peer_addr[ETH_ALEN];</div><div class='add'>+	struct completion htt_stats_rcvd;</div><div class='add'>+	u32 buf_len;</div><div class='add'>+	u8 buf[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_pdev_stats_cmn_tlv {</div><div class='add'>+	__le32 mac_id__word;</div><div class='add'>+	__le32 hw_queued;</div><div class='add'>+	__le32 hw_reaped;</div><div class='add'>+	__le32 underrun;</div><div class='add'>+	__le32 hw_paused;</div><div class='add'>+	__le32 hw_flush;</div><div class='add'>+	__le32 hw_filt;</div><div class='add'>+	__le32 tx_abort;</div><div class='add'>+	__le32 mpdu_requed;</div><div class='add'>+	__le32 tx_xretry;</div><div class='add'>+	__le32 data_rc;</div><div class='add'>+	__le32 mpdu_dropped_xretry;</div><div class='add'>+	__le32 illgl_rate_phy_err;</div><div class='add'>+	__le32 cont_xretry;</div><div class='add'>+	__le32 tx_timeout;</div><div class='add'>+	__le32 pdev_resets;</div><div class='add'>+	__le32 phy_underrun;</div><div class='add'>+	__le32 txop_ovf;</div><div class='add'>+	__le32 seq_posted;</div><div class='add'>+	__le32 seq_failed_queueing;</div><div class='add'>+	__le32 seq_completed;</div><div class='add'>+	__le32 seq_restarted;</div><div class='add'>+	__le32 mu_seq_posted;</div><div class='add'>+	__le32 seq_switch_hw_paused;</div><div class='add'>+	__le32 next_seq_posted_dsr;</div><div class='add'>+	__le32 seq_posted_isr;</div><div class='add'>+	__le32 seq_ctrl_cached;</div><div class='add'>+	__le32 mpdu_count_tqm;</div><div class='add'>+	__le32 msdu_count_tqm;</div><div class='add'>+	__le32 mpdu_removed_tqm;</div><div class='add'>+	__le32 msdu_removed_tqm;</div><div class='add'>+	__le32 mpdus_sw_flush;</div><div class='add'>+	__le32 mpdus_hw_filter;</div><div class='add'>+	__le32 mpdus_truncated;</div><div class='add'>+	__le32 mpdus_ack_failed;</div><div class='add'>+	__le32 mpdus_expired;</div><div class='add'>+	__le32 mpdus_seq_hw_retry;</div><div class='add'>+	__le32 ack_tlv_proc;</div><div class='add'>+	__le32 coex_abort_mpdu_cnt_valid;</div><div class='add'>+	__le32 coex_abort_mpdu_cnt;</div><div class='add'>+	__le32 num_total_ppdus_tried_ota;</div><div class='add'>+	__le32 num_data_ppdus_tried_ota;</div><div class='add'>+	__le32 local_ctrl_mgmt_enqued;</div><div class='add'>+	__le32 local_ctrl_mgmt_freed;</div><div class='add'>+	__le32 local_data_enqued;</div><div class='add'>+	__le32 local_data_freed;</div><div class='add'>+	__le32 mpdu_tried;</div><div class='add'>+	__le32 isr_wait_seq_posted;</div><div class='add'>+</div><div class='add'>+	__le32 tx_active_dur_us_low;</div><div class='add'>+	__le32 tx_active_dur_us_high;</div><div class='add'>+	__le32 remove_mpdus_max_retries;</div><div class='add'>+	__le32 comp_delivered;</div><div class='add'>+	__le32 ppdu_ok;</div><div class='add'>+	__le32 self_triggers;</div><div class='add'>+	__le32 tx_time_dur_data;</div><div class='add'>+	__le32 seq_qdepth_repost_stop;</div><div class='add'>+	__le32 mu_seq_min_msdu_repost_stop;</div><div class='add'>+	__le32 seq_min_msdu_repost_stop;</div><div class='add'>+	__le32 seq_txop_repost_stop;</div><div class='add'>+	__le32 next_seq_cancel;</div><div class='add'>+	__le32 fes_offsets_err_cnt;</div><div class='add'>+	__le32 num_mu_peer_blacklisted;</div><div class='add'>+	__le32 mu_ofdma_seq_posted;</div><div class='add'>+	__le32 ul_mumimo_seq_posted;</div><div class='add'>+	__le32 ul_ofdma_seq_posted;</div><div class='add'>+</div><div class='add'>+	__le32 thermal_suspend_cnt;</div><div class='add'>+	__le32 dfs_suspend_cnt;</div><div class='add'>+	__le32 tx_abort_suspend_cnt;</div><div class='add'>+	__le32 tgt_specific_opaque_txq_suspend_info;</div><div class='add'>+	__le32 last_suspend_reason;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_pdev_stats_urrn_tlv {</div><div class='add'>+	DECLARE_FLEX_ARRAY(__le32, urrn_stats);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_pdev_stats_flush_tlv {</div><div class='add'>+	DECLARE_FLEX_ARRAY(__le32, flush_errs);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_pdev_stats_phy_err_tlv {</div><div class='add'>+	DECLARE_FLEX_ARRAY(__le32, phy_errs);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_pdev_stats_sifs_tlv {</div><div class='add'>+	DECLARE_FLEX_ARRAY(__le32, sifs_status);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_pdev_ctrl_path_tx_stats_tlv {</div><div class='add'>+	__le32 fw_tx_mgmt_subtype[ATH12K_HTT_STATS_SUBTYPE_MAX];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_pdev_stats_sifs_hist_tlv {</div><div class='add'>+	DECLARE_FLEX_ARRAY(__le32, sifs_hist_status);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum ath12k_htt_stats_hw_mode {</div><div class='add'>+	ATH12K_HTT_STATS_HWMODE_AC = 0,</div><div class='add'>+	ATH12K_HTT_STATS_HWMODE_AX = 1,</div><div class='add'>+	ATH12K_HTT_STATS_HWMODE_BE = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_pdev_mu_ppdu_dist_stats_tlv {</div><div class='add'>+	__le32 hw_mode;</div><div class='add'>+	__le32 num_seq_term_status[ATH12K_HTT_STATS_NUM_SCHED_STATUS_WORDS];</div><div class='add'>+	__le32 num_ppdu_cmpl_per_burst[ATH12K_HTT_STATS_MU_PPDU_PER_BURST_WORDS];</div><div class='add'>+	__le32 num_seq_posted[ATH12K_HTT_STATS_NUM_NR_BINS];</div><div class='add'>+	__le32 num_ppdu_posted_per_burst[ATH12K_HTT_STATS_MU_PPDU_PER_BURST_WORDS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS        12</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_STATS_NUM_GI_COUNTERS          4</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_STATS_NUM_DCM_COUNTERS         5</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_STATS_NUM_BW_COUNTERS          4</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS      8</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_STATS_NUM_PREAMBLE_TYPES       7</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_STATS_NUM_LEGACY_CCK_STATS     4</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_STATS_NUM_LEGACY_OFDM_STATS    8</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_STATS_NUM_LTF                  4</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS   2</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_STATS_NUM_EXTRA2_MCS_COUNTERS  2</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_STATS_NUM_11AX_TRIGGER_TYPES   6</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_STATS_NUM_PER_COUNTERS	  101</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_DROP_COUNTERS \</div><div class='add'>+	(ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS + \</div><div class='add'>+	 ATH12K_HTT_TX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS + \</div><div class='add'>+	 ATH12K_HTT_TX_PDEV_STATS_NUM_EXTRA2_MCS_COUNTERS)</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_pdev_rate_stats_tlv {</div><div class='add'>+	__le32 mac_id_word;</div><div class='add'>+	__le32 tx_ldpc;</div><div class='add'>+	__le32 rts_cnt;</div><div class='add'>+	__le32 ack_rssi;</div><div class='add'>+	__le32 tx_mcs[ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	__le32 tx_su_mcs[ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	__le32 tx_mu_mcs[ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	__le32 tx_nss[ATH12K_HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS];</div><div class='add'>+	__le32 tx_bw[ATH12K_HTT_TX_PDEV_STATS_NUM_BW_COUNTERS];</div><div class='add'>+	__le32 tx_stbc[ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	__le32 tx_pream[ATH12K_HTT_TX_PDEV_STATS_NUM_PREAMBLE_TYPES];</div><div class='add'>+	__le32 tx_gi[ATH12K_HTT_TX_PDEV_STATS_NUM_GI_COUNTERS]</div><div class='add'>+		[ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	__le32 tx_dcm[ATH12K_HTT_TX_PDEV_STATS_NUM_DCM_COUNTERS];</div><div class='add'>+	__le32 rts_success;</div><div class='add'>+	__le32 tx_legacy_cck_rate[ATH12K_HTT_TX_PDEV_STATS_NUM_LEGACY_CCK_STATS];</div><div class='add'>+	__le32 tx_legacy_ofdm_rate[ATH12K_HTT_TX_PDEV_STATS_NUM_LEGACY_OFDM_STATS];</div><div class='add'>+	__le32 ac_mu_mimo_tx_ldpc;</div><div class='add'>+	__le32 ax_mu_mimo_tx_ldpc;</div><div class='add'>+	__le32 ofdma_tx_ldpc;</div><div class='add'>+	__le32 tx_he_ltf[ATH12K_HTT_TX_PDEV_STATS_NUM_LTF];</div><div class='add'>+	__le32 ac_mu_mimo_tx_mcs[ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	__le32 ax_mu_mimo_tx_mcs[ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	__le32 ofdma_tx_mcs[ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	__le32 ac_mu_mimo_tx_nss[ATH12K_HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS];</div><div class='add'>+	__le32 ax_mu_mimo_tx_nss[ATH12K_HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS];</div><div class='add'>+	__le32 ofdma_tx_nss[ATH12K_HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS];</div><div class='add'>+	__le32 ac_mu_mimo_tx_bw[ATH12K_HTT_TX_PDEV_STATS_NUM_BW_COUNTERS];</div><div class='add'>+	__le32 ax_mu_mimo_tx_bw[ATH12K_HTT_TX_PDEV_STATS_NUM_BW_COUNTERS];</div><div class='add'>+	__le32 ofdma_tx_bw[ATH12K_HTT_TX_PDEV_STATS_NUM_BW_COUNTERS];</div><div class='add'>+	__le32 ac_mu_mimo_tx_gi[ATH12K_HTT_TX_PDEV_STATS_NUM_GI_COUNTERS]</div><div class='add'>+			    [ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	__le32 ax_mimo_tx_gi[ATH12K_HTT_TX_PDEV_STATS_NUM_GI_COUNTERS]</div><div class='add'>+			    [ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	__le32 ofdma_tx_gi[ATH12K_HTT_TX_PDEV_STATS_NUM_GI_COUNTERS]</div><div class='add'>+		       [ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	__le32 trigger_type_11ax[ATH12K_HTT_TX_PDEV_STATS_NUM_11AX_TRIGGER_TYPES];</div><div class='add'>+	__le32 tx_11ax_su_ext;</div><div class='add'>+	__le32 tx_mcs_ext[ATH12K_HTT_TX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS];</div><div class='add'>+	__le32 tx_stbc_ext[ATH12K_HTT_TX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS];</div><div class='add'>+	__le32 tx_gi_ext[ATH12K_HTT_TX_PDEV_STATS_NUM_GI_COUNTERS]</div><div class='add'>+		     [ATH12K_HTT_TX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS];</div><div class='add'>+	__le32 ax_mu_mimo_tx_mcs_ext[ATH12K_HTT_TX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS];</div><div class='add'>+	__le32 ofdma_tx_mcs_ext[ATH12K_HTT_TX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS];</div><div class='add'>+	__le32 ax_tx_gi_ext[ATH12K_HTT_TX_PDEV_STATS_NUM_GI_COUNTERS]</div><div class='add'>+				[ATH12K_HTT_TX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS];</div><div class='add'>+	__le32 ofd_tx_gi_ext[ATH12K_HTT_TX_PDEV_STATS_NUM_GI_COUNTERS]</div><div class='add'>+			   [ATH12K_HTT_TX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS];</div><div class='add'>+	__le32 tx_mcs_ext_2[ATH12K_HTT_TX_PDEV_STATS_NUM_EXTRA2_MCS_COUNTERS];</div><div class='add'>+	__le32 tx_bw_320mhz;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_histogram_stats_tlv {</div><div class='add'>+	__le32 rate_retry_mcs_drop_cnt;</div><div class='add'>+	__le32 mcs_drop_rate[ATH12K_HTT_TX_PDEV_STATS_NUM_MCS_DROP_COUNTERS];</div><div class='add'>+	__le32 per_histogram_cnt[ATH12K_HTT_TX_PDEV_STATS_NUM_PER_COUNTERS];</div><div class='add'>+	__le32 low_latency_rate_cnt;</div><div class='add'>+	__le32 su_burst_rate_drop_cnt;</div><div class='add'>+	__le32 su_burst_rate_drop_fail_cnt;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_RX_PDEV_STATS_NUM_LEGACY_CCK_STATS		4</div><div class='add'>+#define ATH12K_HTT_RX_PDEV_STATS_NUM_LEGACY_OFDM_STATS		8</div><div class='add'>+#define ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS		12</div><div class='add'>+#define ATH12K_HTT_RX_PDEV_STATS_NUM_GI_COUNTERS		4</div><div class='add'>+#define ATH12K_HTT_RX_PDEV_STATS_NUM_DCM_COUNTERS		5</div><div class='add'>+#define ATH12K_HTT_RX_PDEV_STATS_NUM_BW_COUNTERS		4</div><div class='add'>+#define ATH12K_HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS		8</div><div class='add'>+#define ATH12K_HTT_RX_PDEV_STATS_NUM_PREAMBLE_TYPES		7</div><div class='add'>+#define ATH12K_HTT_RX_PDEV_MAX_OFDMA_NUM_USER			8</div><div class='add'>+#define ATH12K_HTT_RX_PDEV_STATS_RXEVM_MAX_PILOTS_NSS		16</div><div class='add'>+#define ATH12K_HTT_RX_PDEV_STATS_NUM_RU_SIZE_COUNTERS		6</div><div class='add'>+#define ATH12K_HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER		8</div><div class='add'>+#define ATH12K_HTT_RX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS		2</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_rx_pdev_rate_stats_tlv {</div><div class='add'>+	__le32 mac_id_word;</div><div class='add'>+	__le32 nsts;</div><div class='add'>+	__le32 rx_ldpc;</div><div class='add'>+	__le32 rts_cnt;</div><div class='add'>+	__le32 rssi_mgmt;</div><div class='add'>+	__le32 rssi_data;</div><div class='add'>+	__le32 rssi_comb;</div><div class='add'>+	__le32 rx_mcs[ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	__le32 rx_nss[ATH12K_HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS];</div><div class='add'>+	__le32 rx_dcm[ATH12K_HTT_RX_PDEV_STATS_NUM_DCM_COUNTERS];</div><div class='add'>+	__le32 rx_stbc[ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	__le32 rx_bw[ATH12K_HTT_RX_PDEV_STATS_NUM_BW_COUNTERS];</div><div class='add'>+	__le32 rx_pream[ATH12K_HTT_RX_PDEV_STATS_NUM_PREAMBLE_TYPES];</div><div class='add'>+	u8 rssi_chain_in_db[ATH12K_HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS]</div><div class='add'>+		     [ATH12K_HTT_RX_PDEV_STATS_NUM_BW_COUNTERS];</div><div class='add'>+	__le32 rx_gi[ATH12K_HTT_RX_PDEV_STATS_NUM_GI_COUNTERS]</div><div class='add'>+		[ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	__le32 rssi_in_dbm;</div><div class='add'>+	__le32 rx_11ax_su_ext;</div><div class='add'>+	__le32 rx_11ac_mumimo;</div><div class='add'>+	__le32 rx_11ax_mumimo;</div><div class='add'>+	__le32 rx_11ax_ofdma;</div><div class='add'>+	__le32 txbf;</div><div class='add'>+	__le32 rx_legacy_cck_rate[ATH12K_HTT_RX_PDEV_STATS_NUM_LEGACY_CCK_STATS];</div><div class='add'>+	__le32 rx_legacy_ofdm_rate[ATH12K_HTT_RX_PDEV_STATS_NUM_LEGACY_OFDM_STATS];</div><div class='add'>+	__le32 rx_active_dur_us_low;</div><div class='add'>+	__le32 rx_active_dur_us_high;</div><div class='add'>+	__le32 rx_11ax_ul_ofdma;</div><div class='add'>+	__le32 ul_ofdma_rx_mcs[ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	__le32 ul_ofdma_rx_gi[ATH12K_HTT_TX_PDEV_STATS_NUM_GI_COUNTERS]</div><div class='add'>+			  [ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	__le32 ul_ofdma_rx_nss[ATH12K_HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS];</div><div class='add'>+	__le32 ul_ofdma_rx_bw[ATH12K_HTT_TX_PDEV_STATS_NUM_BW_COUNTERS];</div><div class='add'>+	__le32 ul_ofdma_rx_stbc;</div><div class='add'>+	__le32 ul_ofdma_rx_ldpc;</div><div class='add'>+	__le32 rx_ulofdma_non_data_ppdu[ATH12K_HTT_RX_PDEV_MAX_OFDMA_NUM_USER];</div><div class='add'>+	__le32 rx_ulofdma_data_ppdu[ATH12K_HTT_RX_PDEV_MAX_OFDMA_NUM_USER];</div><div class='add'>+	__le32 rx_ulofdma_mpdu_ok[ATH12K_HTT_RX_PDEV_MAX_OFDMA_NUM_USER];</div><div class='add'>+	__le32 rx_ulofdma_mpdu_fail[ATH12K_HTT_RX_PDEV_MAX_OFDMA_NUM_USER];</div><div class='add'>+	__le32 nss_count;</div><div class='add'>+	__le32 pilot_count;</div><div class='add'>+	__le32 rx_pil_evm_db[ATH12K_HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS]</div><div class='add'>+			   [ATH12K_HTT_RX_PDEV_STATS_RXEVM_MAX_PILOTS_NSS];</div><div class='add'>+	__le32 rx_pilot_evm_db_mean[ATH12K_HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS];</div><div class='add'>+	s8 rx_ul_fd_rssi[ATH12K_HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS]</div><div class='add'>+			[ATH12K_HTT_RX_PDEV_MAX_OFDMA_NUM_USER];</div><div class='add'>+	__le32 per_chain_rssi_pkt_type;</div><div class='add'>+	s8 rx_per_chain_rssi_in_dbm[ATH12K_HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS]</div><div class='add'>+				   [ATH12K_HTT_RX_PDEV_STATS_NUM_BW_COUNTERS];</div><div class='add'>+	__le32 rx_su_ndpa;</div><div class='add'>+	__le32 rx_11ax_su_txbf_mcs[ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	__le32 rx_mu_ndpa;</div><div class='add'>+	__le32 rx_11ax_mu_txbf_mcs[ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	__le32 rx_br_poll;</div><div class='add'>+	__le32 rx_11ax_dl_ofdma_mcs[ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	__le32 rx_11ax_dl_ofdma_ru[ATH12K_HTT_RX_PDEV_STATS_NUM_RU_SIZE_COUNTERS];</div><div class='add'>+	__le32 rx_ulmumimo_non_data_ppdu[ATH12K_HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER];</div><div class='add'>+	__le32 rx_ulmumimo_data_ppdu[ATH12K_HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER];</div><div class='add'>+	__le32 rx_ulmumimo_mpdu_ok[ATH12K_HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER];</div><div class='add'>+	__le32 rx_ulmumimo_mpdu_fail[ATH12K_HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER];</div><div class='add'>+	__le32 rx_ulofdma_non_data_nusers[ATH12K_HTT_RX_PDEV_MAX_OFDMA_NUM_USER];</div><div class='add'>+	__le32 rx_ulofdma_data_nusers[ATH12K_HTT_RX_PDEV_MAX_OFDMA_NUM_USER];</div><div class='add'>+	__le32 rx_mcs_ext[ATH12K_HTT_RX_PDEV_STATS_NUM_EXTRA_MCS_COUNTERS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_RX_PDEV_STATS_NUM_BW_EXT_COUNTERS		4</div><div class='add'>+#define ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS_EXT		14</div><div class='add'>+#define ATH12K_HTT_RX_PDEV_STATS_NUM_EXTRA2_MCS_COUNTERS	2</div><div class='add'>+#define ATH12K_HTT_RX_PDEV_STATS_NUM_BW_EXT2_COUNTERS		5</div><div class='add'>+#define ATH12K_HTT_RX_PDEV_STATS_NUM_PUNCTURED_MODE_COUNTERS	5</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_rx_pdev_rate_ext_stats_tlv {</div><div class='add'>+	u8 rssi_chain_ext[ATH12K_HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS]</div><div class='add'>+			 [ATH12K_HTT_RX_PDEV_STATS_NUM_BW_EXT_COUNTERS];</div><div class='add'>+	s8 rx_per_chain_rssi_ext_in_dbm[ATH12K_HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS]</div><div class='add'>+				       [ATH12K_HTT_RX_PDEV_STATS_NUM_BW_EXT_COUNTERS];</div><div class='add'>+	__le32 rssi_mcast_in_dbm;</div><div class='add'>+	__le32 rssi_mgmt_in_dbm;</div><div class='add'>+	__le32 rx_mcs_ext[ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS_EXT];</div><div class='add'>+	__le32 rx_stbc_ext[ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS_EXT];</div><div class='add'>+	__le32 rx_gi_ext[ATH12K_HTT_RX_PDEV_STATS_NUM_GI_COUNTERS]</div><div class='add'>+		     [ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS_EXT];</div><div class='add'>+	__le32 ul_ofdma_rx_mcs_ext[ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS_EXT];</div><div class='add'>+	__le32 ul_ofdma_rx_gi_ext[ATH12K_HTT_TX_PDEV_STATS_NUM_GI_COUNTERS]</div><div class='add'>+			      [ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS_EXT];</div><div class='add'>+	__le32 rx_11ax_su_txbf_mcs_ext[ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS_EXT];</div><div class='add'>+	__le32 rx_11ax_mu_txbf_mcs_ext[ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS_EXT];</div><div class='add'>+	__le32 rx_11ax_dl_ofdma_mcs_ext[ATH12K_HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS_EXT];</div><div class='add'>+	__le32 rx_mcs_ext_2[ATH12K_HTT_RX_PDEV_STATS_NUM_EXTRA2_MCS_COUNTERS];</div><div class='add'>+	__le32 rx_bw_ext[ATH12K_HTT_RX_PDEV_STATS_NUM_BW_EXT2_COUNTERS];</div><div class='add'>+	__le32 rx_gi_ext_2[ATH12K_HTT_RX_PDEV_STATS_NUM_GI_COUNTERS]</div><div class='add'>+		[ATH12K_HTT_RX_PDEV_STATS_NUM_EXTRA2_MCS_COUNTERS];</div><div class='add'>+	__le32 rx_su_punctured_mode[ATH12K_HTT_RX_PDEV_STATS_NUM_PUNCTURED_MODE_COUNTERS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_STATS_SCHED_PER_TXQ_MAC_ID	GENMASK(7, 0)</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_STATS_SCHED_PER_TXQ_ID	GENMASK(15, 8)</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_NUM_SCHED_ORDER_LOG	20</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_stats_tx_sched_cmn_tlv {</div><div class='add'>+	__le32 mac_id__word;</div><div class='add'>+	__le32 current_timestamp;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_pdev_stats_sched_per_txq_tlv {</div><div class='add'>+	__le32 mac_id__word;</div><div class='add'>+	__le32 sched_policy;</div><div class='add'>+	__le32 last_sched_cmd_posted_timestamp;</div><div class='add'>+	__le32 last_sched_cmd_compl_timestamp;</div><div class='add'>+	__le32 sched_2_tac_lwm_count;</div><div class='add'>+	__le32 sched_2_tac_ring_full;</div><div class='add'>+	__le32 sched_cmd_post_failure;</div><div class='add'>+	__le32 num_active_tids;</div><div class='add'>+	__le32 num_ps_schedules;</div><div class='add'>+	__le32 sched_cmds_pending;</div><div class='add'>+	__le32 num_tid_register;</div><div class='add'>+	__le32 num_tid_unregister;</div><div class='add'>+	__le32 num_qstats_queried;</div><div class='add'>+	__le32 qstats_update_pending;</div><div class='add'>+	__le32 last_qstats_query_timestamp;</div><div class='add'>+	__le32 num_tqm_cmdq_full;</div><div class='add'>+	__le32 num_de_sched_algo_trigger;</div><div class='add'>+	__le32 num_rt_sched_algo_trigger;</div><div class='add'>+	__le32 num_tqm_sched_algo_trigger;</div><div class='add'>+	__le32 notify_sched;</div><div class='add'>+	__le32 dur_based_sendn_term;</div><div class='add'>+	__le32 su_notify2_sched;</div><div class='add'>+	__le32 su_optimal_queued_msdus_sched;</div><div class='add'>+	__le32 su_delay_timeout_sched;</div><div class='add'>+	__le32 su_min_txtime_sched_delay;</div><div class='add'>+	__le32 su_no_delay;</div><div class='add'>+	__le32 num_supercycles;</div><div class='add'>+	__le32 num_subcycles_with_sort;</div><div class='add'>+	__le32 num_subcycles_no_sort;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_sched_txq_cmd_posted_tlv {</div><div class='add'>+	DECLARE_FLEX_ARRAY(__le32, sched_cmd_posted);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_sched_txq_cmd_reaped_tlv {</div><div class='add'>+	DECLARE_FLEX_ARRAY(__le32, sched_cmd_reaped);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_sched_txq_sched_order_su_tlv {</div><div class='add'>+	DECLARE_FLEX_ARRAY(__le32, sched_order_su);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_sched_txq_sched_ineligibility_tlv {</div><div class='add'>+	DECLARE_FLEX_ARRAY(__le32, sched_ineligibility);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum ath12k_htt_sched_txq_supercycle_triggers_tlv_enum {</div><div class='add'>+	ATH12K_HTT_SCHED_SUPERCYCLE_TRIGGER_NONE = 0,</div><div class='add'>+	ATH12K_HTT_SCHED_SUPERCYCLE_TRIGGER_FORCED,</div><div class='add'>+	ATH12K_HTT_SCHED_SUPERCYCLE_TRIGGER_LESS_NUM_TIDQ_ENTRIES,</div><div class='add'>+	ATH12K_HTT_SCHED_SUPERCYCLE_TRIGGER_LESS_NUM_ACTIVE_TIDS,</div><div class='add'>+	ATH12K_HTT_SCHED_SUPERCYCLE_TRIGGER_MAX_ITR_REACHED,</div><div class='add'>+	ATH12K_HTT_SCHED_SUPERCYCLE_TRIGGER_DUR_THRESHOLD_REACHED,</div><div class='add'>+	ATH12K_HTT_SCHED_SUPERCYCLE_TRIGGER_TWT_TRIGGER,</div><div class='add'>+	ATH12K_HTT_SCHED_SUPERCYCLE_TRIGGER_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_sched_txq_supercycle_triggers_tlv {</div><div class='add'>+	DECLARE_FLEX_ARRAY(__le32, supercycle_triggers);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_hw_stats_pdev_errs_tlv {</div><div class='add'>+	__le32 mac_id__word;</div><div class='add'>+	__le32 tx_abort;</div><div class='add'>+	__le32 tx_abort_fail_count;</div><div class='add'>+	__le32 rx_abort;</div><div class='add'>+	__le32 rx_abort_fail_count;</div><div class='add'>+	__le32 warm_reset;</div><div class='add'>+	__le32 cold_reset;</div><div class='add'>+	__le32 tx_flush;</div><div class='add'>+	__le32 tx_glb_reset;</div><div class='add'>+	__le32 tx_txq_reset;</div><div class='add'>+	__le32 rx_timeout_reset;</div><div class='add'>+	__le32 mac_cold_reset_restore_cal;</div><div class='add'>+	__le32 mac_cold_reset;</div><div class='add'>+	__le32 mac_warm_reset;</div><div class='add'>+	__le32 mac_only_reset;</div><div class='add'>+	__le32 phy_warm_reset;</div><div class='add'>+	__le32 phy_warm_reset_ucode_trig;</div><div class='add'>+	__le32 mac_warm_reset_restore_cal;</div><div class='add'>+	__le32 mac_sfm_reset;</div><div class='add'>+	__le32 phy_warm_reset_m3_ssr;</div><div class='add'>+	__le32 phy_warm_reset_reason_phy_m3;</div><div class='add'>+	__le32 phy_warm_reset_reason_tx_hw_stuck;</div><div class='add'>+	__le32 phy_warm_reset_reason_num_rx_frame_stuck;</div><div class='add'>+	__le32 phy_warm_reset_reason_wal_rx_rec_rx_busy;</div><div class='add'>+	__le32 phy_warm_reset_reason_wal_rx_rec_mac_hng;</div><div class='add'>+	__le32 phy_warm_reset_reason_mac_conv_phy_reset;</div><div class='add'>+	__le32 wal_rx_recovery_rst_mac_hang_cnt;</div><div class='add'>+	__le32 wal_rx_recovery_rst_known_sig_cnt;</div><div class='add'>+	__le32 wal_rx_recovery_rst_no_rx_cnt;</div><div class='add'>+	__le32 wal_rx_recovery_rst_no_rx_consec_cnt;</div><div class='add'>+	__le32 wal_rx_recovery_rst_rx_busy_cnt;</div><div class='add'>+	__le32 wal_rx_recovery_rst_phy_mac_hang_cnt;</div><div class='add'>+	__le32 rx_flush_cnt;</div><div class='add'>+	__le32 phy_warm_reset_reason_tx_exp_cca_stuck;</div><div class='add'>+	__le32 phy_warm_reset_reason_tx_consec_flsh_war;</div><div class='add'>+	__le32 phy_warm_reset_reason_tx_hwsch_reset_war;</div><div class='add'>+	__le32 phy_warm_reset_reason_hwsch_cca_wdog_war;</div><div class='add'>+	__le32 fw_rx_rings_reset;</div><div class='add'>+	__le32 rx_dest_drain_rx_descs_leak_prevented;</div><div class='add'>+	__le32 rx_dest_drain_rx_descs_saved_cnt;</div><div class='add'>+	__le32 rx_dest_drain_rxdma2reo_leak_detected;</div><div class='add'>+	__le32 rx_dest_drain_rxdma2fw_leak_detected;</div><div class='add'>+	__le32 rx_dest_drain_rxdma2wbm_leak_detected;</div><div class='add'>+	__le32 rx_dest_drain_rxdma1_2sw_leak_detected;</div><div class='add'>+	__le32 rx_dest_drain_rx_drain_ok_mac_idle;</div><div class='add'>+	__le32 rx_dest_drain_ok_mac_not_idle;</div><div class='add'>+	__le32 rx_dest_drain_prerequisite_invld;</div><div class='add'>+	__le32 rx_dest_drain_skip_non_lmac_reset;</div><div class='add'>+	__le32 rx_dest_drain_hw_fifo_notempty_post_wait;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_STATS_MAX_HW_INTR_NAME_LEN 8</div><div class='add'>+struct ath12k_htt_hw_stats_intr_misc_tlv {</div><div class='add'>+	u8 hw_intr_name[ATH12K_HTT_STATS_MAX_HW_INTR_NAME_LEN];</div><div class='add'>+	__le32 mask;</div><div class='add'>+	__le32 count;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_hw_stats_whal_tx_tlv {</div><div class='add'>+	__le32 mac_id__word;</div><div class='add'>+	__le32 last_unpause_ppdu_id;</div><div class='add'>+	__le32 hwsch_unpause_wait_tqm_write;</div><div class='add'>+	__le32 hwsch_dummy_tlv_skipped;</div><div class='add'>+	__le32 hwsch_misaligned_offset_received;</div><div class='add'>+	__le32 hwsch_reset_count;</div><div class='add'>+	__le32 hwsch_dev_reset_war;</div><div class='add'>+	__le32 hwsch_delayed_pause;</div><div class='add'>+	__le32 hwsch_long_delayed_pause;</div><div class='add'>+	__le32 sch_rx_ppdu_no_response;</div><div class='add'>+	__le32 sch_selfgen_response;</div><div class='add'>+	__le32 sch_rx_sifs_resp_trigger;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_hw_war_stats_tlv {</div><div class='add'>+	__le32 mac_id__word;</div><div class='add'>+	DECLARE_FLEX_ARRAY(__le32, hw_wars);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_tqm_cmn_stats_tlv {</div><div class='add'>+	__le32 mac_id__word;</div><div class='add'>+	__le32 max_cmdq_id;</div><div class='add'>+	__le32 list_mpdu_cnt_hist_intvl;</div><div class='add'>+	__le32 add_msdu;</div><div class='add'>+	__le32 q_empty;</div><div class='add'>+	__le32 q_not_empty;</div><div class='add'>+	__le32 drop_notification;</div><div class='add'>+	__le32 desc_threshold;</div><div class='add'>+	__le32 hwsch_tqm_invalid_status;</div><div class='add'>+	__le32 missed_tqm_gen_mpdus;</div><div class='add'>+	__le32 tqm_active_tids;</div><div class='add'>+	__le32 tqm_inactive_tids;</div><div class='add'>+	__le32 tqm_active_msduq_flows;</div><div class='add'>+	__le32 msduq_timestamp_updates;</div><div class='add'>+	__le32 msduq_updates_mpdu_head_info_cmd;</div><div class='add'>+	__le32 msduq_updates_emp_to_nonemp_status;</div><div class='add'>+	__le32 get_mpdu_head_info_cmds_by_query;</div><div class='add'>+	__le32 get_mpdu_head_info_cmds_by_tac;</div><div class='add'>+	__le32 gen_mpdu_cmds_by_query;</div><div class='add'>+	__le32 high_prio_q_not_empty;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_tqm_error_stats_tlv {</div><div class='add'>+	__le32 q_empty_failure;</div><div class='add'>+	__le32 q_not_empty_failure;</div><div class='add'>+	__le32 add_msdu_failure;</div><div class='add'>+	__le32 tqm_cache_ctl_err;</div><div class='add'>+	__le32 tqm_soft_reset;</div><div class='add'>+	__le32 tqm_reset_num_in_use_link_descs;</div><div class='add'>+	__le32 tqm_reset_num_lost_link_descs;</div><div class='add'>+	__le32 tqm_reset_num_lost_host_tx_buf_cnt;</div><div class='add'>+	__le32 tqm_reset_num_in_use_internal_tqm;</div><div class='add'>+	__le32 tqm_reset_num_in_use_idle_link_rng;</div><div class='add'>+	__le32 tqm_reset_time_to_tqm_hang_delta_ms;</div><div class='add'>+	__le32 tqm_reset_recovery_time_ms;</div><div class='add'>+	__le32 tqm_reset_num_peers_hdl;</div><div class='add'>+	__le32 tqm_reset_cumm_dirty_hw_mpduq_cnt;</div><div class='add'>+	__le32 tqm_reset_cumm_dirty_hw_msduq_proc;</div><div class='add'>+	__le32 tqm_reset_flush_cache_cmd_su_cnt;</div><div class='add'>+	__le32 tqm_reset_flush_cache_cmd_other_cnt;</div><div class='add'>+	__le32 tqm_reset_flush_cache_cmd_trig_type;</div><div class='add'>+	__le32 tqm_reset_flush_cache_cmd_trig_cfg;</div><div class='add'>+	__le32 tqm_reset_flush_cmd_skp_status_null;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_tqm_gen_mpdu_stats_tlv {</div><div class='add'>+	DECLARE_FLEX_ARRAY(__le32, gen_mpdu_end_reason);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_TX_TQM_MAX_LIST_MPDU_END_REASON		16</div><div class='add'>+#define ATH12K_HTT_TX_TQM_MAX_LIST_MPDU_CNT_HISTOGRAM_BINS	16</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_tqm_list_mpdu_stats_tlv {</div><div class='add'>+	DECLARE_FLEX_ARRAY(__le32, list_mpdu_end_reason);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_tqm_list_mpdu_cnt_tlv {</div><div class='add'>+	DECLARE_FLEX_ARRAY(__le32, list_mpdu_cnt_hist);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_tqm_pdev_stats_tlv {</div><div class='add'>+	__le32 msdu_count;</div><div class='add'>+	__le32 mpdu_count;</div><div class='add'>+	__le32 remove_msdu;</div><div class='add'>+	__le32 remove_mpdu;</div><div class='add'>+	__le32 remove_msdu_ttl;</div><div class='add'>+	__le32 send_bar;</div><div class='add'>+	__le32 bar_sync;</div><div class='add'>+	__le32 notify_mpdu;</div><div class='add'>+	__le32 sync_cmd;</div><div class='add'>+	__le32 write_cmd;</div><div class='add'>+	__le32 hwsch_trigger;</div><div class='add'>+	__le32 ack_tlv_proc;</div><div class='add'>+	__le32 gen_mpdu_cmd;</div><div class='add'>+	__le32 gen_list_cmd;</div><div class='add'>+	__le32 remove_mpdu_cmd;</div><div class='add'>+	__le32 remove_mpdu_tried_cmd;</div><div class='add'>+	__le32 mpdu_queue_stats_cmd;</div><div class='add'>+	__le32 mpdu_head_info_cmd;</div><div class='add'>+	__le32 msdu_flow_stats_cmd;</div><div class='add'>+	__le32 remove_msdu_cmd;</div><div class='add'>+	__le32 remove_msdu_ttl_cmd;</div><div class='add'>+	__le32 flush_cache_cmd;</div><div class='add'>+	__le32 update_mpduq_cmd;</div><div class='add'>+	__le32 enqueue;</div><div class='add'>+	__le32 enqueue_notify;</div><div class='add'>+	__le32 notify_mpdu_at_head;</div><div class='add'>+	__le32 notify_mpdu_state_valid;</div><div class='add'>+	__le32 sched_udp_notify1;</div><div class='add'>+	__le32 sched_udp_notify2;</div><div class='add'>+	__le32 sched_nonudp_notify1;</div><div class='add'>+	__le32 sched_nonudp_notify2;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_de_cmn_stats_tlv {</div><div class='add'>+	__le32 mac_id__word;</div><div class='add'>+	__le32 tcl2fw_entry_count;</div><div class='add'>+	__le32 not_to_fw;</div><div class='add'>+	__le32 invalid_pdev_vdev_peer;</div><div class='add'>+	__le32 tcl_res_invalid_addrx;</div><div class='add'>+	__le32 wbm2fw_entry_count;</div><div class='add'>+	__le32 invalid_pdev;</div><div class='add'>+	__le32 tcl_res_addrx_timeout;</div><div class='add'>+	__le32 invalid_vdev;</div><div class='add'>+	__le32 invalid_tcl_exp_frame_desc;</div><div class='add'>+	__le32 vdev_id_mismatch_cnt;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_de_eapol_packets_stats_tlv {</div><div class='add'>+	__le32 m1_packets;</div><div class='add'>+	__le32 m2_packets;</div><div class='add'>+	__le32 m3_packets;</div><div class='add'>+	__le32 m4_packets;</div><div class='add'>+	__le32 g1_packets;</div><div class='add'>+	__le32 g2_packets;</div><div class='add'>+	__le32 rc4_packets;</div><div class='add'>+	__le32 eap_packets;</div><div class='add'>+	__le32 eapol_start_packets;</div><div class='add'>+	__le32 eapol_logoff_packets;</div><div class='add'>+	__le32 eapol_encap_asf_packets;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_de_classify_stats_tlv {</div><div class='add'>+	__le32 arp_packets;</div><div class='add'>+	__le32 igmp_packets;</div><div class='add'>+	__le32 dhcp_packets;</div><div class='add'>+	__le32 host_inspected;</div><div class='add'>+	__le32 htt_included;</div><div class='add'>+	__le32 htt_valid_mcs;</div><div class='add'>+	__le32 htt_valid_nss;</div><div class='add'>+	__le32 htt_valid_preamble_type;</div><div class='add'>+	__le32 htt_valid_chainmask;</div><div class='add'>+	__le32 htt_valid_guard_interval;</div><div class='add'>+	__le32 htt_valid_retries;</div><div class='add'>+	__le32 htt_valid_bw_info;</div><div class='add'>+	__le32 htt_valid_power;</div><div class='add'>+	__le32 htt_valid_key_flags;</div><div class='add'>+	__le32 htt_valid_no_encryption;</div><div class='add'>+	__le32 fse_entry_count;</div><div class='add'>+	__le32 fse_priority_be;</div><div class='add'>+	__le32 fse_priority_high;</div><div class='add'>+	__le32 fse_priority_low;</div><div class='add'>+	__le32 fse_traffic_ptrn_be;</div><div class='add'>+	__le32 fse_traffic_ptrn_over_sub;</div><div class='add'>+	__le32 fse_traffic_ptrn_bursty;</div><div class='add'>+	__le32 fse_traffic_ptrn_interactive;</div><div class='add'>+	__le32 fse_traffic_ptrn_periodic;</div><div class='add'>+	__le32 fse_hwqueue_alloc;</div><div class='add'>+	__le32 fse_hwqueue_created;</div><div class='add'>+	__le32 fse_hwqueue_send_to_host;</div><div class='add'>+	__le32 mcast_entry;</div><div class='add'>+	__le32 bcast_entry;</div><div class='add'>+	__le32 htt_update_peer_cache;</div><div class='add'>+	__le32 htt_learning_frame;</div><div class='add'>+	__le32 fse_invalid_peer;</div><div class='add'>+	__le32 mec_notify;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_de_classify_failed_stats_tlv {</div><div class='add'>+	__le32 ap_bss_peer_not_found;</div><div class='add'>+	__le32 ap_bcast_mcast_no_peer;</div><div class='add'>+	__le32 sta_delete_in_progress;</div><div class='add'>+	__le32 ibss_no_bss_peer;</div><div class='add'>+	__le32 invalid_vdev_type;</div><div class='add'>+	__le32 invalid_ast_peer_entry;</div><div class='add'>+	__le32 peer_entry_invalid;</div><div class='add'>+	__le32 ethertype_not_ip;</div><div class='add'>+	__le32 eapol_lookup_failed;</div><div class='add'>+	__le32 qpeer_not_allow_data;</div><div class='add'>+	__le32 fse_tid_override;</div><div class='add'>+	__le32 ipv6_jumbogram_zero_length;</div><div class='add'>+	__le32 qos_to_non_qos_in_prog;</div><div class='add'>+	__le32 ap_bcast_mcast_eapol;</div><div class='add'>+	__le32 unicast_on_ap_bss_peer;</div><div class='add'>+	__le32 ap_vdev_invalid;</div><div class='add'>+	__le32 incomplete_llc;</div><div class='add'>+	__le32 eapol_duplicate_m3;</div><div class='add'>+	__le32 eapol_duplicate_m4;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_de_classify_status_stats_tlv {</div><div class='add'>+	__le32 eok;</div><div class='add'>+	__le32 classify_done;</div><div class='add'>+	__le32 lookup_failed;</div><div class='add'>+	__le32 send_host_dhcp;</div><div class='add'>+	__le32 send_host_mcast;</div><div class='add'>+	__le32 send_host_unknown_dest;</div><div class='add'>+	__le32 send_host;</div><div class='add'>+	__le32 status_invalid;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_de_enqueue_packets_stats_tlv {</div><div class='add'>+	__le32 enqueued_pkts;</div><div class='add'>+	__le32 to_tqm;</div><div class='add'>+	__le32 to_tqm_bypass;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_de_enqueue_discard_stats_tlv {</div><div class='add'>+	__le32 discarded_pkts;</div><div class='add'>+	__le32 local_frames;</div><div class='add'>+	__le32 is_ext_msdu;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_de_compl_stats_tlv {</div><div class='add'>+	__le32 tcl_dummy_frame;</div><div class='add'>+	__le32 tqm_dummy_frame;</div><div class='add'>+	__le32 tqm_notify_frame;</div><div class='add'>+	__le32 fw2wbm_enq;</div><div class='add'>+	__le32 tqm_bypass_frame;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum ath12k_htt_tx_mumimo_grp_invalid_reason_code_stats {</div><div class='add'>+	ATH12K_HTT_TX_MUMIMO_GRP_VALID,</div><div class='add'>+	ATH12K_HTT_TX_MUMIMO_GRP_INVALID_NUM_MU_USERS_EXCEEDED_MU_MAX_USERS,</div><div class='add'>+	ATH12K_HTT_TX_MUMIMO_GRP_INVALID_SCHED_ALGO_NOT_MU_COMPATIBLE_GID,</div><div class='add'>+	ATH12K_HTT_TX_MUMIMO_GRP_INVALID_NON_PRIMARY_GRP,</div><div class='add'>+	ATH12K_HTT_TX_MUMIMO_GRP_INVALID_ZERO_CANDIDATES,</div><div class='add'>+	ATH12K_HTT_TX_MUMIMO_GRP_INVALID_MORE_CANDIDATES,</div><div class='add'>+	ATH12K_HTT_TX_MUMIMO_GRP_INVALID_GROUP_SIZE_EXCEED_NSS,</div><div class='add'>+	ATH12K_HTT_TX_MUMIMO_GRP_INVALID_GROUP_INELIGIBLE,</div><div class='add'>+	ATH12K_HTT_TX_MUMIMO_GRP_INVALID,</div><div class='add'>+	ATH12K_HTT_TX_MUMIMO_GRP_INVALID_GROUP_EFF_MU_TPUT_OMBPS,</div><div class='add'>+	ATH12K_HTT_TX_MUMIMO_GRP_INVALID_MAX_REASON_CODE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_NUM_AC_WMM				0x4</div><div class='add'>+#define ATH12K_HTT_MAX_NUM_SBT_INTR			4</div><div class='add'>+#define ATH12K_HTT_TX_NUM_AC_MUMIMO_USER_STATS		4</div><div class='add'>+#define ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS		8</div><div class='add'>+#define ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS		8</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS	7</div><div class='add'>+#define ATH12K_HTT_TX_NUM_OFDMA_USER_STATS		74</div><div class='add'>+#define ATH12K_HTT_TX_NUM_UL_MUMIMO_USER_STATS		8</div><div class='add'>+#define ATH12K_HTT_STATS_NUM_MAX_MUMIMO_SZ		8</div><div class='add'>+#define ATH12K_HTT_STATS_MUMIMO_TPUT_NUM_BINS		10</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_STATS_MAX_INVALID_REASON_CODE \</div><div class='add'>+	ATH12K_HTT_TX_MUMIMO_GRP_INVALID_MAX_REASON_CODE</div><div class='add'>+#define ATH12K_HTT_TX_NUM_MUMIMO_GRP_INVALID_WORDS \</div><div class='add'>+	(ATH12K_HTT_STATS_NUM_MAX_MUMIMO_SZ * ATH12K_HTT_STATS_MAX_INVALID_REASON_CODE)</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_selfgen_cmn_stats_tlv {</div><div class='add'>+	__le32 mac_id__word;</div><div class='add'>+	__le32 su_bar;</div><div class='add'>+	__le32 rts;</div><div class='add'>+	__le32 cts2self;</div><div class='add'>+	__le32 qos_null;</div><div class='add'>+	__le32 delayed_bar_1;</div><div class='add'>+	__le32 delayed_bar_2;</div><div class='add'>+	__le32 delayed_bar_3;</div><div class='add'>+	__le32 delayed_bar_4;</div><div class='add'>+	__le32 delayed_bar_5;</div><div class='add'>+	__le32 delayed_bar_6;</div><div class='add'>+	__le32 delayed_bar_7;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_selfgen_ac_stats_tlv {</div><div class='add'>+	__le32 ac_su_ndpa;</div><div class='add'>+	__le32 ac_su_ndp;</div><div class='add'>+	__le32 ac_mu_mimo_ndpa;</div><div class='add'>+	__le32 ac_mu_mimo_ndp;</div><div class='add'>+	__le32 ac_mu_mimo_brpoll[ATH12K_HTT_TX_NUM_AC_MUMIMO_USER_STATS - 1];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_selfgen_ax_stats_tlv {</div><div class='add'>+	__le32 ax_su_ndpa;</div><div class='add'>+	__le32 ax_su_ndp;</div><div class='add'>+	__le32 ax_mu_mimo_ndpa;</div><div class='add'>+	__le32 ax_mu_mimo_ndp;</div><div class='add'>+	__le32 ax_mu_mimo_brpoll[ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS - 1];</div><div class='add'>+	__le32 ax_basic_trigger;</div><div class='add'>+	__le32 ax_bsr_trigger;</div><div class='add'>+	__le32 ax_mu_bar_trigger;</div><div class='add'>+	__le32 ax_mu_rts_trigger;</div><div class='add'>+	__le32 ax_ulmumimo_trigger;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_selfgen_be_stats_tlv {</div><div class='add'>+	__le32 be_su_ndpa;</div><div class='add'>+	__le32 be_su_ndp;</div><div class='add'>+	__le32 be_mu_mimo_ndpa;</div><div class='add'>+	__le32 be_mu_mimo_ndp;</div><div class='add'>+	__le32 be_mu_mimo_brpoll[ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS - 1];</div><div class='add'>+	__le32 be_basic_trigger;</div><div class='add'>+	__le32 be_bsr_trigger;</div><div class='add'>+	__le32 be_mu_bar_trigger;</div><div class='add'>+	__le32 be_mu_rts_trigger;</div><div class='add'>+	__le32 be_ulmumimo_trigger;</div><div class='add'>+	__le32 be_su_ndpa_queued;</div><div class='add'>+	__le32 be_su_ndp_queued;</div><div class='add'>+	__le32 be_mu_mimo_ndpa_queued;</div><div class='add'>+	__le32 be_mu_mimo_ndp_queued;</div><div class='add'>+	__le32 be_mu_mimo_brpoll_queued[ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS - 1];</div><div class='add'>+	__le32 be_ul_mumimo_trigger[ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_selfgen_ac_err_stats_tlv {</div><div class='add'>+	__le32 ac_su_ndp_err;</div><div class='add'>+	__le32 ac_su_ndpa_err;</div><div class='add'>+	__le32 ac_mu_mimo_ndpa_err;</div><div class='add'>+	__le32 ac_mu_mimo_ndp_err;</div><div class='add'>+	__le32 ac_mu_mimo_brp1_err;</div><div class='add'>+	__le32 ac_mu_mimo_brp2_err;</div><div class='add'>+	__le32 ac_mu_mimo_brp3_err;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_selfgen_ax_err_stats_tlv {</div><div class='add'>+	__le32 ax_su_ndp_err;</div><div class='add'>+	__le32 ax_su_ndpa_err;</div><div class='add'>+	__le32 ax_mu_mimo_ndpa_err;</div><div class='add'>+	__le32 ax_mu_mimo_ndp_err;</div><div class='add'>+	__le32 ax_mu_mimo_brp_err[ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS - 1];</div><div class='add'>+	__le32 ax_basic_trigger_err;</div><div class='add'>+	__le32 ax_bsr_trigger_err;</div><div class='add'>+	__le32 ax_mu_bar_trigger_err;</div><div class='add'>+	__le32 ax_mu_rts_trigger_err;</div><div class='add'>+	__le32 ax_ulmumimo_trigger_err;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_selfgen_be_err_stats_tlv {</div><div class='add'>+	__le32 be_su_ndp_err;</div><div class='add'>+	__le32 be_su_ndpa_err;</div><div class='add'>+	__le32 be_mu_mimo_ndpa_err;</div><div class='add'>+	__le32 be_mu_mimo_ndp_err;</div><div class='add'>+	__le32 be_mu_mimo_brp_err[ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS - 1];</div><div class='add'>+	__le32 be_basic_trigger_err;</div><div class='add'>+	__le32 be_bsr_trigger_err;</div><div class='add'>+	__le32 be_mu_bar_trigger_err;</div><div class='add'>+	__le32 be_mu_rts_trigger_err;</div><div class='add'>+	__le32 be_ulmumimo_trigger_err;</div><div class='add'>+	__le32 be_mu_mimo_brp_err_num_cbf_rxd[ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS];</div><div class='add'>+	__le32 be_su_ndpa_flushed;</div><div class='add'>+	__le32 be_su_ndp_flushed;</div><div class='add'>+	__le32 be_mu_mimo_ndpa_flushed;</div><div class='add'>+	__le32 be_mu_mimo_ndp_flushed;</div><div class='add'>+	__le32 be_mu_mimo_brpoll_flushed[ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS - 1];</div><div class='add'>+	__le32 be_ul_mumimo_trigger_err[ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum ath12k_htt_tx_selfgen_sch_tsflag_error_stats {</div><div class='add'>+	ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_FLUSH_RCVD_ERR,</div><div class='add'>+	ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_FILT_SCHED_CMD_ERR,</div><div class='add'>+	ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_RESP_MISMATCH_ERR,</div><div class='add'>+	ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_RESP_CBF_MIMO_CTRL_MISMATCH_ERR,</div><div class='add'>+	ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_RESP_CBF_BW_MISMATCH_ERR,</div><div class='add'>+	ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_RETRY_COUNT_FAIL_ERR,</div><div class='add'>+	ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_RESP_TOO_LATE_RECEIVED_ERR,</div><div class='add'>+	ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_SIFS_STALL_NO_NEXT_CMD_ERR,</div><div class='add'>+</div><div class='add'>+	ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_selfgen_ac_sched_status_stats_tlv {</div><div class='add'>+	__le32 ac_su_ndpa_sch_status[ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];</div><div class='add'>+	__le32 ac_su_ndp_sch_status[ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];</div><div class='add'>+	__le32 ac_su_ndp_sch_flag_err[ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS];</div><div class='add'>+	__le32 ac_mu_mimo_ndpa_sch_status[ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];</div><div class='add'>+	__le32 ac_mu_mimo_ndp_sch_status[ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];</div><div class='add'>+	__le32 ac_mu_mimo_ndp_sch_flag_err[ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS];</div><div class='add'>+	__le32 ac_mu_mimo_brp_sch_status[ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];</div><div class='add'>+	__le32 ac_mu_mimo_brp_sch_flag_err[ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_selfgen_ax_sched_status_stats_tlv {</div><div class='add'>+	__le32 ax_su_ndpa_sch_status[ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];</div><div class='add'>+	__le32 ax_su_ndp_sch_status[ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];</div><div class='add'>+	__le32 ax_su_ndp_sch_flag_err[ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS];</div><div class='add'>+	__le32 ax_mu_mimo_ndpa_sch_status[ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];</div><div class='add'>+	__le32 ax_mu_mimo_ndp_sch_status[ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];</div><div class='add'>+	__le32 ax_mu_mimo_ndp_sch_flag_err[ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS];</div><div class='add'>+	__le32 ax_mu_brp_sch_status[ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];</div><div class='add'>+	__le32 ax_mu_brp_sch_flag_err[ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS];</div><div class='add'>+	__le32 ax_mu_bar_sch_status[ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];</div><div class='add'>+	__le32 ax_mu_bar_sch_flag_err[ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS];</div><div class='add'>+	__le32 ax_basic_trig_sch_status[ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];</div><div class='add'>+	__le32 ax_basic_trig_sch_flag_err[ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS];</div><div class='add'>+	__le32 ax_ulmumimo_trig_sch_status[ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];</div><div class='add'>+	__le32 ax_ulmumimo_trig_sch_flag_err[ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_selfgen_be_sched_status_stats_tlv {</div><div class='add'>+	__le32 be_su_ndpa_sch_status[ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];</div><div class='add'>+	__le32 be_su_ndp_sch_status[ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];</div><div class='add'>+	__le32 be_su_ndp_sch_flag_err[ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS];</div><div class='add'>+	__le32 be_mu_mimo_ndpa_sch_status[ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];</div><div class='add'>+	__le32 be_mu_mimo_ndp_sch_status[ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];</div><div class='add'>+	__le32 be_mu_mimo_ndp_sch_flag_err[ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS];</div><div class='add'>+	__le32 be_mu_brp_sch_status[ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];</div><div class='add'>+	__le32 be_mu_brp_sch_flag_err[ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS];</div><div class='add'>+	__le32 be_mu_bar_sch_status[ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];</div><div class='add'>+	__le32 be_mu_bar_sch_flag_err[ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS];</div><div class='add'>+	__le32 be_basic_trig_sch_status[ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];</div><div class='add'>+	__le32 be_basic_trig_sch_flag_err[ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS];</div><div class='add'>+	__le32 be_ulmumimo_trig_sch_status[ATH12K_HTT_TX_PDEV_STATS_NUM_TX_ERR_STATUS];</div><div class='add'>+	__le32 be_ulmumimo_trig_sch_flag_err[ATH12K_HTT_TX_SELFGEN_SCH_TSFLAG_ERR_STATS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_stats_string_tlv {</div><div class='add'>+	DECLARE_FLEX_ARRAY(__le32, data);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_SRING_STATS_MAC_ID                  GENMASK(7, 0)</div><div class='add'>+#define ATH12K_HTT_SRING_STATS_RING_ID                 GENMASK(15, 8)</div><div class='add'>+#define ATH12K_HTT_SRING_STATS_ARENA                   GENMASK(23, 16)</div><div class='add'>+#define ATH12K_HTT_SRING_STATS_EP                      BIT(24)</div><div class='add'>+#define ATH12K_HTT_SRING_STATS_NUM_AVAIL_WORDS         GENMASK(15, 0)</div><div class='add'>+#define ATH12K_HTT_SRING_STATS_NUM_VALID_WORDS         GENMASK(31, 16)</div><div class='add'>+#define ATH12K_HTT_SRING_STATS_HEAD_PTR                GENMASK(15, 0)</div><div class='add'>+#define ATH12K_HTT_SRING_STATS_TAIL_PTR                GENMASK(31, 16)</div><div class='add'>+#define ATH12K_HTT_SRING_STATS_CONSUMER_EMPTY          GENMASK(15, 0)</div><div class='add'>+#define ATH12K_HTT_SRING_STATS_PRODUCER_FULL           GENMASK(31, 16)</div><div class='add'>+#define ATH12K_HTT_SRING_STATS_PREFETCH_COUNT          GENMASK(15, 0)</div><div class='add'>+#define ATH12K_HTT_SRING_STATS_INTERNAL_TAIL_PTR       GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_sring_stats_tlv {</div><div class='add'>+	__le32 mac_id__ring_id__arena__ep;</div><div class='add'>+	__le32 base_addr_lsb;</div><div class='add'>+	__le32 base_addr_msb;</div><div class='add'>+	__le32 ring_size;</div><div class='add'>+	__le32 elem_size;</div><div class='add'>+	__le32 num_avail_words__num_valid_words;</div><div class='add'>+	__le32 head_ptr__tail_ptr;</div><div class='add'>+	__le32 consumer_empty__producer_full;</div><div class='add'>+	__le32 prefetch_count__internal_tail_ptr;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_sfm_cmn_tlv {</div><div class='add'>+	__le32 mac_id__word;</div><div class='add'>+	__le32 buf_total;</div><div class='add'>+	__le32 mem_empty;</div><div class='add'>+	__le32 deallocate_bufs;</div><div class='add'>+	__le32 num_records;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_sfm_client_tlv {</div><div class='add'>+	__le32 client_id;</div><div class='add'>+	__le32 buf_min;</div><div class='add'>+	__le32 buf_max;</div><div class='add'>+	__le32 buf_busy;</div><div class='add'>+	__le32 buf_alloc;</div><div class='add'>+	__le32 buf_avail;</div><div class='add'>+	__le32 num_users;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_sfm_client_user_tlv {</div><div class='add'>+	DECLARE_FLEX_ARRAY(__le32, dwords_used_by_user_n);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_pdev_mu_mimo_sch_stats_tlv {</div><div class='add'>+	__le32 mu_mimo_sch_posted;</div><div class='add'>+	__le32 mu_mimo_sch_failed;</div><div class='add'>+	__le32 mu_mimo_ppdu_posted;</div><div class='add'>+	__le32 ac_mu_mimo_sch_nusers[ATH12K_HTT_TX_NUM_AC_MUMIMO_USER_STATS];</div><div class='add'>+	__le32 ax_mu_mimo_sch_nusers[ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS];</div><div class='add'>+	__le32 ax_ofdma_sch_nusers[ATH12K_HTT_TX_NUM_OFDMA_USER_STATS];</div><div class='add'>+	__le32 ax_ul_ofdma_nusers[ATH12K_HTT_TX_NUM_OFDMA_USER_STATS];</div><div class='add'>+	__le32 ax_ul_ofdma_bsr_nusers[ATH12K_HTT_TX_NUM_OFDMA_USER_STATS];</div><div class='add'>+	__le32 ax_ul_ofdma_bar_nusers[ATH12K_HTT_TX_NUM_OFDMA_USER_STATS];</div><div class='add'>+	__le32 ax_ul_ofdma_brp_nusers[ATH12K_HTT_TX_NUM_OFDMA_USER_STATS];</div><div class='add'>+	__le32 ax_ul_mumimo_nusers[ATH12K_HTT_TX_NUM_UL_MUMIMO_USER_STATS];</div><div class='add'>+	__le32 ax_ul_mumimo_brp_nusers[ATH12K_HTT_TX_NUM_UL_MUMIMO_USER_STATS];</div><div class='add'>+	__le32 ac_mu_mimo_per_grp_sz[ATH12K_HTT_TX_NUM_AC_MUMIMO_USER_STATS];</div><div class='add'>+	__le32 ax_mu_mimo_per_grp_sz[ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS];</div><div class='add'>+	__le32 be_mu_mimo_sch_nusers[ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS];</div><div class='add'>+	__le32 be_mu_mimo_per_grp_sz[ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS];</div><div class='add'>+	__le32 ac_mu_mimo_grp_sz_ext[ATH12K_HTT_TX_NUM_AC_MUMIMO_USER_STATS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_pdev_mumimo_grp_stats_tlv {</div><div class='add'>+	__le32 dl_mumimo_grp_best_grp_size[ATH12K_HTT_STATS_NUM_MAX_MUMIMO_SZ];</div><div class='add'>+	__le32 dl_mumimo_grp_best_num_usrs[ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS];</div><div class='add'>+	__le32 dl_mumimo_grp_eligible[ATH12K_HTT_STATS_NUM_MAX_MUMIMO_SZ];</div><div class='add'>+	__le32 dl_mumimo_grp_ineligible[ATH12K_HTT_STATS_NUM_MAX_MUMIMO_SZ];</div><div class='add'>+	__le32 dl_mumimo_grp_invalid[ATH12K_HTT_TX_NUM_MUMIMO_GRP_INVALID_WORDS];</div><div class='add'>+	__le32 dl_mumimo_grp_tputs[ATH12K_HTT_STATS_MUMIMO_TPUT_NUM_BINS];</div><div class='add'>+	__le32 ul_mumimo_grp_best_grp_size[ATH12K_HTT_STATS_NUM_MAX_MUMIMO_SZ];</div><div class='add'>+	__le32 ul_mumimo_grp_best_usrs[ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS];</div><div class='add'>+	__le32 ul_mumimo_grp_tputs[ATH12K_HTT_STATS_MUMIMO_TPUT_NUM_BINS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum ath12k_htt_stats_tx_sched_modes {</div><div class='add'>+	ATH12K_HTT_STATS_TX_SCHED_MODE_MU_MIMO_AC = 0,</div><div class='add'>+	ATH12K_HTT_STATS_TX_SCHED_MODE_MU_MIMO_AX,</div><div class='add'>+	ATH12K_HTT_STATS_TX_SCHED_MODE_MU_OFDMA_AX,</div><div class='add'>+	ATH12K_HTT_STATS_TX_SCHED_MODE_MU_OFDMA_BE,</div><div class='add'>+	ATH12K_HTT_STATS_TX_SCHED_MODE_MU_MIMO_BE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_pdev_mpdu_stats_tlv {</div><div class='add'>+	__le32 mpdus_queued_usr;</div><div class='add'>+	__le32 mpdus_tried_usr;</div><div class='add'>+	__le32 mpdus_failed_usr;</div><div class='add'>+	__le32 mpdus_requeued_usr;</div><div class='add'>+	__le32 err_no_ba_usr;</div><div class='add'>+	__le32 mpdu_underrun_usr;</div><div class='add'>+	__le32 ampdu_underrun_usr;</div><div class='add'>+	__le32 user_index;</div><div class='add'>+	__le32 tx_sched_mode;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_pdev_stats_cca_counters_tlv {</div><div class='add'>+	__le32 tx_frame_usec;</div><div class='add'>+	__le32 rx_frame_usec;</div><div class='add'>+	__le32 rx_clear_usec;</div><div class='add'>+	__le32 my_rx_frame_usec;</div><div class='add'>+	__le32 usec_cnt;</div><div class='add'>+	__le32 med_rx_idle_usec;</div><div class='add'>+	__le32 med_tx_idle_global_usec;</div><div class='add'>+	__le32 cca_obss_usec;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_pdev_cca_stats_hist_v1_tlv {</div><div class='add'>+	__le32 chan_num;</div><div class='add'>+	__le32 num_records;</div><div class='add'>+	__le32 valid_cca_counters_bitmap;</div><div class='add'>+	__le32 collection_interval;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_TX_CV_CORR_MAX_NUM_COLUMNS		8</div><div class='add'>+#define ATH12K_HTT_TX_NUM_AC_MUMIMO_USER_STATS		4</div><div class='add'>+#define ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS          8</div><div class='add'>+#define ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS		8</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_STATS_NUM_BW_COUNTERS	4</div><div class='add'>+#define ATH12K_HTT_TX_NUM_MCS_CNTRS			12</div><div class='add'>+#define ATH12K_HTT_TX_NUM_EXTRA_MCS_CNTRS		2</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_TX_NUM_OF_SOUNDING_STATS_WORDS \</div><div class='add'>+	(ATH12K_HTT_TX_PDEV_STATS_NUM_BW_COUNTERS * \</div><div class='add'>+	 ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS)</div><div class='add'>+</div><div class='add'>+enum ath12k_htt_txbf_sound_steer_modes {</div><div class='add'>+	ATH12K_HTT_IMPL_STEER_STATS		= 0,</div><div class='add'>+	ATH12K_HTT_EXPL_SUSIFS_STEER_STATS	= 1,</div><div class='add'>+	ATH12K_HTT_EXPL_SURBO_STEER_STATS	= 2,</div><div class='add'>+	ATH12K_HTT_EXPL_MUSIFS_STEER_STATS	= 3,</div><div class='add'>+	ATH12K_HTT_EXPL_MURBO_STEER_STATS	= 4,</div><div class='add'>+	ATH12K_HTT_TXBF_MAX_NUM_OF_MODES	= 5</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_htt_stats_sounding_tx_mode {</div><div class='add'>+	ATH12K_HTT_TX_AC_SOUNDING_MODE		= 0,</div><div class='add'>+	ATH12K_HTT_TX_AX_SOUNDING_MODE		= 1,</div><div class='add'>+	ATH12K_HTT_TX_BE_SOUNDING_MODE		= 2,</div><div class='add'>+	ATH12K_HTT_TX_CMN_SOUNDING_MODE		= 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_sounding_stats_tlv {</div><div class='add'>+	__le32 tx_sounding_mode;</div><div class='add'>+	__le32 cbf_20[ATH12K_HTT_TXBF_MAX_NUM_OF_MODES];</div><div class='add'>+	__le32 cbf_40[ATH12K_HTT_TXBF_MAX_NUM_OF_MODES];</div><div class='add'>+	__le32 cbf_80[ATH12K_HTT_TXBF_MAX_NUM_OF_MODES];</div><div class='add'>+	__le32 cbf_160[ATH12K_HTT_TXBF_MAX_NUM_OF_MODES];</div><div class='add'>+	__le32 sounding[ATH12K_HTT_TX_NUM_OF_SOUNDING_STATS_WORDS];</div><div class='add'>+	__le32 cv_nc_mismatch_err;</div><div class='add'>+	__le32 cv_fcs_err;</div><div class='add'>+	__le32 cv_frag_idx_mismatch;</div><div class='add'>+	__le32 cv_invalid_peer_id;</div><div class='add'>+	__le32 cv_no_txbf_setup;</div><div class='add'>+	__le32 cv_expiry_in_update;</div><div class='add'>+	__le32 cv_pkt_bw_exceed;</div><div class='add'>+	__le32 cv_dma_not_done_err;</div><div class='add'>+	__le32 cv_update_failed;</div><div class='add'>+	__le32 cv_total_query;</div><div class='add'>+	__le32 cv_total_pattern_query;</div><div class='add'>+	__le32 cv_total_bw_query;</div><div class='add'>+	__le32 cv_invalid_bw_coding;</div><div class='add'>+	__le32 cv_forced_sounding;</div><div class='add'>+	__le32 cv_standalone_sounding;</div><div class='add'>+	__le32 cv_nc_mismatch;</div><div class='add'>+	__le32 cv_fb_type_mismatch;</div><div class='add'>+	__le32 cv_ofdma_bw_mismatch;</div><div class='add'>+	__le32 cv_bw_mismatch;</div><div class='add'>+	__le32 cv_pattern_mismatch;</div><div class='add'>+	__le32 cv_preamble_mismatch;</div><div class='add'>+	__le32 cv_nr_mismatch;</div><div class='add'>+	__le32 cv_in_use_cnt_exceeded;</div><div class='add'>+	__le32 cv_found;</div><div class='add'>+	__le32 cv_not_found;</div><div class='add'>+	__le32 sounding_320[ATH12K_HTT_TX_NUM_BE_MUMIMO_USER_STATS];</div><div class='add'>+	__le32 cbf_320[ATH12K_HTT_TXBF_MAX_NUM_OF_MODES];</div><div class='add'>+	__le32 cv_ntbr_sounding;</div><div class='add'>+	__le32 cv_found_upload_in_progress;</div><div class='add'>+	__le32 cv_expired_during_query;</div><div class='add'>+	__le32 cv_dma_timeout_error;</div><div class='add'>+	__le32 cv_buf_ibf_uploads;</div><div class='add'>+	__le32 cv_buf_ebf_uploads;</div><div class='add'>+	__le32 cv_buf_received;</div><div class='add'>+	__le32 cv_buf_fed_back;</div><div class='add'>+	__le32 cv_total_query_ibf;</div><div class='add'>+	__le32 cv_found_ibf;</div><div class='add'>+	__le32 cv_not_found_ibf;</div><div class='add'>+	__le32 cv_expired_during_query_ibf;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_pdev_obss_pd_stats_tlv {</div><div class='add'>+	__le32 num_obss_tx_ppdu_success;</div><div class='add'>+	__le32 num_obss_tx_ppdu_failure;</div><div class='add'>+	__le32 num_sr_tx_transmissions;</div><div class='add'>+	__le32 num_spatial_reuse_opportunities;</div><div class='add'>+	__le32 num_non_srg_opportunities;</div><div class='add'>+	__le32 num_non_srg_ppdu_tried;</div><div class='add'>+	__le32 num_non_srg_ppdu_success;</div><div class='add'>+	__le32 num_srg_opportunities;</div><div class='add'>+	__le32 num_srg_ppdu_tried;</div><div class='add'>+	__le32 num_srg_ppdu_success;</div><div class='add'>+	__le32 num_psr_opportunities;</div><div class='add'>+	__le32 num_psr_ppdu_tried;</div><div class='add'>+	__le32 num_psr_ppdu_success;</div><div class='add'>+	__le32 num_non_srg_tried_per_ac[ATH12K_HTT_NUM_AC_WMM];</div><div class='add'>+	__le32 num_non_srg_success_ac[ATH12K_HTT_NUM_AC_WMM];</div><div class='add'>+	__le32 num_srg_tried_per_ac[ATH12K_HTT_NUM_AC_WMM];</div><div class='add'>+	__le32 num_srg_success_per_ac[ATH12K_HTT_NUM_AC_WMM];</div><div class='add'>+	__le32 num_obss_min_dur_check_flush_cnt;</div><div class='add'>+	__le32 num_sr_ppdu_abort_flush_cnt;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_STATS_MAX_PROF_STATS_NAME_LEN	32</div><div class='add'>+#define ATH12K_HTT_LATENCY_PROFILE_NUM_MAX_HIST		3</div><div class='add'>+#define ATH12K_HTT_INTERRUPTS_LATENCY_PROFILE_MAX_HIST	3</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_latency_prof_stats_tlv {</div><div class='add'>+	__le32 print_header;</div><div class='add'>+	s8 latency_prof_name[ATH12K_HTT_STATS_MAX_PROF_STATS_NAME_LEN];</div><div class='add'>+	__le32 cnt;</div><div class='add'>+	__le32 min;</div><div class='add'>+	__le32 max;</div><div class='add'>+	__le32 last;</div><div class='add'>+	__le32 tot;</div><div class='add'>+	__le32 avg;</div><div class='add'>+	__le32 hist_intvl;</div><div class='add'>+	__le32 hist[ATH12K_HTT_LATENCY_PROFILE_NUM_MAX_HIST];</div><div class='add'>+}  __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_latency_prof_ctx_tlv {</div><div class='add'>+	__le32 duration;</div><div class='add'>+	__le32 tx_msdu_cnt;</div><div class='add'>+	__le32 tx_mpdu_cnt;</div><div class='add'>+	__le32 tx_ppdu_cnt;</div><div class='add'>+	__le32 rx_msdu_cnt;</div><div class='add'>+	__le32 rx_mpdu_cnt;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_latency_prof_cnt_tlv {</div><div class='add'>+	__le32 prof_enable_cnt;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_RX_NUM_MCS_CNTRS		12</div><div class='add'>+#define ATH12K_HTT_RX_NUM_GI_CNTRS		4</div><div class='add'>+#define ATH12K_HTT_RX_NUM_SPATIAL_STREAMS	8</div><div class='add'>+#define ATH12K_HTT_RX_NUM_BW_CNTRS		4</div><div class='add'>+#define ATH12K_HTT_RX_NUM_RU_SIZE_CNTRS		6</div><div class='add'>+#define ATH12K_HTT_RX_NUM_RU_SIZE_160MHZ_CNTRS	7</div><div class='add'>+#define ATH12K_HTT_RX_UL_MAX_UPLINK_RSSI_TRACK	5</div><div class='add'>+#define ATH12K_HTT_RX_NUM_REDUCED_CHAN_TYPES	2</div><div class='add'>+#define ATH12K_HTT_RX_NUM_EXTRA_MCS_CNTRS	2</div><div class='add'>+</div><div class='add'>+enum ATH12K_HTT_TX_RX_PDEV_STATS_AX_RU_SIZE {</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_AX_RU_SIZE_26,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_AX_RU_SIZE_52,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_AX_RU_SIZE_106,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_AX_RU_SIZE_242,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_AX_RU_SIZE_484,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_AX_RU_SIZE_996,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_AX_RU_SIZE_996x2,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_NUM_AX_RU_SIZE_CNTRS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_rx_pdev_ul_ofdma_user_stats_tlv {</div><div class='add'>+	__le32 user_index;</div><div class='add'>+	__le32 rx_ulofdma_non_data_ppdu;</div><div class='add'>+	__le32 rx_ulofdma_data_ppdu;</div><div class='add'>+	__le32 rx_ulofdma_mpdu_ok;</div><div class='add'>+	__le32 rx_ulofdma_mpdu_fail;</div><div class='add'>+	__le32 rx_ulofdma_non_data_nusers;</div><div class='add'>+	__le32 rx_ulofdma_data_nusers;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_rx_pdev_ul_trigger_stats_tlv {</div><div class='add'>+	__le32 mac_id__word;</div><div class='add'>+	__le32 rx_11ax_ul_ofdma;</div><div class='add'>+	__le32 ul_ofdma_rx_mcs[ATH12K_HTT_RX_NUM_MCS_CNTRS];</div><div class='add'>+	__le32 ul_ofdma_rx_gi[ATH12K_HTT_RX_NUM_GI_CNTRS][ATH12K_HTT_RX_NUM_MCS_CNTRS];</div><div class='add'>+	__le32 ul_ofdma_rx_nss[ATH12K_HTT_RX_NUM_SPATIAL_STREAMS];</div><div class='add'>+	__le32 ul_ofdma_rx_bw[ATH12K_HTT_RX_NUM_BW_CNTRS];</div><div class='add'>+	__le32 ul_ofdma_rx_stbc;</div><div class='add'>+	__le32 ul_ofdma_rx_ldpc;</div><div class='add'>+	__le32 data_ru_size_ppdu[ATH12K_HTT_RX_NUM_RU_SIZE_160MHZ_CNTRS];</div><div class='add'>+	__le32 non_data_ru_size_ppdu[ATH12K_HTT_RX_NUM_RU_SIZE_160MHZ_CNTRS];</div><div class='add'>+	__le32 uplink_sta_aid[ATH12K_HTT_RX_UL_MAX_UPLINK_RSSI_TRACK];</div><div class='add'>+	__le32 uplink_sta_target_rssi[ATH12K_HTT_RX_UL_MAX_UPLINK_RSSI_TRACK];</div><div class='add'>+	__le32 uplink_sta_fd_rssi[ATH12K_HTT_RX_UL_MAX_UPLINK_RSSI_TRACK];</div><div class='add'>+	__le32 uplink_sta_power_headroom[ATH12K_HTT_RX_UL_MAX_UPLINK_RSSI_TRACK];</div><div class='add'>+	__le32 red_bw[ATH12K_HTT_RX_NUM_REDUCED_CHAN_TYPES][ATH12K_HTT_RX_NUM_BW_CNTRS];</div><div class='add'>+	__le32 ul_ofdma_bsc_trig_rx_qos_null_only;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_TX_UL_MUMIMO_USER_STATS	8</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_rx_ul_mumimo_trig_stats_tlv {</div><div class='add'>+	__le32 mac_id__word;</div><div class='add'>+	__le32 rx_11ax_ul_mumimo;</div><div class='add'>+	__le32 ul_mumimo_rx_mcs[ATH12K_HTT_RX_NUM_MCS_CNTRS];</div><div class='add'>+	__le32 ul_rx_gi[ATH12K_HTT_RX_NUM_GI_CNTRS][ATH12K_HTT_RX_NUM_MCS_CNTRS];</div><div class='add'>+	__le32 ul_mumimo_rx_nss[ATH12K_HTT_RX_NUM_SPATIAL_STREAMS];</div><div class='add'>+	__le32 ul_mumimo_rx_bw[ATH12K_HTT_RX_NUM_BW_CNTRS];</div><div class='add'>+	__le32 ul_mumimo_rx_stbc;</div><div class='add'>+	__le32 ul_mumimo_rx_ldpc;</div><div class='add'>+	__le32 ul_mumimo_rx_mcs_ext[ATH12K_HTT_RX_NUM_EXTRA_MCS_CNTRS];</div><div class='add'>+	__le32 ul_gi_ext[ATH12K_HTT_RX_NUM_GI_CNTRS][ATH12K_HTT_RX_NUM_EXTRA_MCS_CNTRS];</div><div class='add'>+	s8 ul_rssi[ATH12K_HTT_RX_NUM_SPATIAL_STREAMS][ATH12K_HTT_RX_NUM_BW_CNTRS];</div><div class='add'>+	s8 tgt_rssi[ATH12K_HTT_TX_UL_MUMIMO_USER_STATS][ATH12K_HTT_RX_NUM_BW_CNTRS];</div><div class='add'>+	s8 fd[ATH12K_HTT_TX_UL_MUMIMO_USER_STATS][ATH12K_HTT_RX_NUM_SPATIAL_STREAMS];</div><div class='add'>+	s8 db[ATH12K_HTT_TX_UL_MUMIMO_USER_STATS][ATH12K_HTT_RX_NUM_SPATIAL_STREAMS];</div><div class='add'>+	__le32 red_bw[ATH12K_HTT_RX_NUM_REDUCED_CHAN_TYPES][ATH12K_HTT_RX_NUM_BW_CNTRS];</div><div class='add'>+	__le32 mumimo_bsc_trig_rx_qos_null_only;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_RX_NUM_MAX_PEAK_OCCUPANCY_INDEX	10</div><div class='add'>+#define ATH12K_HTT_RX_NUM_MAX_CURR_OCCUPANCY_INDEX	10</div><div class='add'>+#define ATH12K_HTT_RX_NUM_SQUARE_INDEX			6</div><div class='add'>+#define ATH12K_HTT_RX_NUM_MAX_PEAK_SEARCH_INDEX		4</div><div class='add'>+#define ATH12K_HTT_RX_NUM_MAX_PENDING_SEARCH_INDEX	4</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_rx_fse_stats_tlv {</div><div class='add'>+	__le32 fse_enable_cnt;</div><div class='add'>+	__le32 fse_disable_cnt;</div><div class='add'>+	__le32 fse_cache_invalidate_entry_cnt;</div><div class='add'>+	__le32 fse_full_cache_invalidate_cnt;</div><div class='add'>+	__le32 fse_num_cache_hits_cnt;</div><div class='add'>+	__le32 fse_num_searches_cnt;</div><div class='add'>+	__le32 fse_cache_occupancy_peak_cnt[ATH12K_HTT_RX_NUM_MAX_PEAK_OCCUPANCY_INDEX];</div><div class='add'>+	__le32 fse_cache_occupancy_curr_cnt[ATH12K_HTT_RX_NUM_MAX_CURR_OCCUPANCY_INDEX];</div><div class='add'>+	__le32 fse_search_stat_square_cnt[ATH12K_HTT_RX_NUM_SQUARE_INDEX];</div><div class='add'>+	__le32 fse_search_stat_peak_cnt[ATH12K_HTT_RX_NUM_MAX_PEAK_SEARCH_INDEX];</div><div class='add'>+	__le32 fse_search_stat_pending_cnt[ATH12K_HTT_RX_NUM_MAX_PENDING_SEARCH_INDEX];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_TX_BF_RATE_STATS_NUM_MCS_COUNTERS		14</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_STATS_NUM_LEGACY_OFDM_STATS		8</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS		8</div><div class='add'>+#define ATH12K_HTT_TXBF_NUM_BW_CNTRS				5</div><div class='add'>+#define ATH12K_HTT_TXBF_NUM_REDUCED_CHAN_TYPES			2</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_pdev_txrate_txbf_stats_tlv {</div><div class='add'>+	__le32 tx_su_txbf_mcs[ATH12K_HTT_TX_BF_RATE_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	__le32 tx_su_ibf_mcs[ATH12K_HTT_TX_BF_RATE_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	__le32 tx_su_ol_mcs[ATH12K_HTT_TX_BF_RATE_STATS_NUM_MCS_COUNTERS];</div><div class='add'>+	__le32 tx_su_txbf_nss[ATH12K_HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS];</div><div class='add'>+	__le32 tx_su_ibf_nss[ATH12K_HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS];</div><div class='add'>+	__le32 tx_su_ol_nss[ATH12K_HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS];</div><div class='add'>+	__le32 tx_su_txbf_bw[ATH12K_HTT_TXBF_NUM_BW_CNTRS];</div><div class='add'>+	__le32 tx_su_ibf_bw[ATH12K_HTT_TXBF_NUM_BW_CNTRS];</div><div class='add'>+	__le32 tx_su_ol_bw[ATH12K_HTT_TXBF_NUM_BW_CNTRS];</div><div class='add'>+	__le32 tx_legacy_ofdm_rate[ATH12K_HTT_TX_PDEV_STATS_NUM_LEGACY_OFDM_STATS];</div><div class='add'>+	__le32 txbf[ATH12K_HTT_TXBF_NUM_REDUCED_CHAN_TYPES][ATH12K_HTT_TXBF_NUM_BW_CNTRS];</div><div class='add'>+	__le32 ibf[ATH12K_HTT_TXBF_NUM_REDUCED_CHAN_TYPES][ATH12K_HTT_TXBF_NUM_BW_CNTRS];</div><div class='add'>+	__le32 ol[ATH12K_HTT_TXBF_NUM_REDUCED_CHAN_TYPES][ATH12K_HTT_TXBF_NUM_BW_CNTRS];</div><div class='add'>+	__le32 txbf_flag_set_mu_mode;</div><div class='add'>+	__le32 txbf_flag_set_final_status;</div><div class='add'>+	__le32 txbf_flag_not_set_verified_txbf_mode;</div><div class='add'>+	__le32 txbf_flag_not_set_disable_p2p_access;</div><div class='add'>+	__le32 txbf_flag_not_set_max_nss_in_he160;</div><div class='add'>+	__le32 txbf_flag_not_set_disable_uldlofdma;</div><div class='add'>+	__le32 txbf_flag_not_set_mcs_threshold_val;</div><div class='add'>+	__le32 txbf_flag_not_set_final_status;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_txbf_ofdma_ax_ndpa_stats_elem_t {</div><div class='add'>+	__le32 ax_ofdma_ndpa_queued;</div><div class='add'>+	__le32 ax_ofdma_ndpa_tried;</div><div class='add'>+	__le32 ax_ofdma_ndpa_flush;</div><div class='add'>+	__le32 ax_ofdma_ndpa_err;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_txbf_ofdma_ax_ndpa_stats_tlv {</div><div class='add'>+	__le32 num_elems_ax_ndpa_arr;</div><div class='add'>+	__le32 arr_elem_size_ax_ndpa;</div><div class='add'>+	DECLARE_FLEX_ARRAY(struct ath12k_htt_txbf_ofdma_ax_ndpa_stats_elem_t, ax_ndpa);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_txbf_ofdma_ax_ndp_stats_elem_t {</div><div class='add'>+	__le32 ax_ofdma_ndp_queued;</div><div class='add'>+	__le32 ax_ofdma_ndp_tried;</div><div class='add'>+	__le32 ax_ofdma_ndp_flush;</div><div class='add'>+	__le32 ax_ofdma_ndp_err;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_txbf_ofdma_ax_ndp_stats_tlv {</div><div class='add'>+	__le32 num_elems_ax_ndp_arr;</div><div class='add'>+	__le32 arr_elem_size_ax_ndp;</div><div class='add'>+	DECLARE_FLEX_ARRAY(struct ath12k_htt_txbf_ofdma_ax_ndp_stats_elem_t, ax_ndp);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_txbf_ofdma_ax_brp_stats_elem_t {</div><div class='add'>+	__le32 ax_ofdma_brp_queued;</div><div class='add'>+	__le32 ax_ofdma_brp_tried;</div><div class='add'>+	__le32 ax_ofdma_brp_flushed;</div><div class='add'>+	__le32 ax_ofdma_brp_err;</div><div class='add'>+	__le32 ax_ofdma_num_cbf_rcvd;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_txbf_ofdma_ax_brp_stats_tlv {</div><div class='add'>+	__le32 num_elems_ax_brp_arr;</div><div class='add'>+	__le32 arr_elem_size_ax_brp;</div><div class='add'>+	DECLARE_FLEX_ARRAY(struct ath12k_htt_txbf_ofdma_ax_brp_stats_elem_t, ax_brp);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_txbf_ofdma_ax_steer_stats_elem_t {</div><div class='add'>+	__le32 num_ppdu_steer;</div><div class='add'>+	__le32 num_ppdu_ol;</div><div class='add'>+	__le32 num_usr_prefetch;</div><div class='add'>+	__le32 num_usr_sound;</div><div class='add'>+	__le32 num_usr_force_sound;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_txbf_ofdma_ax_steer_stats_tlv {</div><div class='add'>+	__le32 num_elems_ax_steer_arr;</div><div class='add'>+	__le32 arr_elem_size_ax_steer;</div><div class='add'>+	DECLARE_FLEX_ARRAY(struct ath12k_htt_txbf_ofdma_ax_steer_stats_elem_t, ax_steer);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_txbf_ofdma_ax_steer_mpdu_stats_tlv {</div><div class='add'>+	__le32 ax_ofdma_rbo_steer_mpdus_tried;</div><div class='add'>+	__le32 ax_ofdma_rbo_steer_mpdus_failed;</div><div class='add'>+	__le32 ax_ofdma_sifs_steer_mpdus_tried;</div><div class='add'>+	__le32 ax_ofdma_sifs_steer_mpdus_failed;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum ath12k_htt_stats_page_lock_state {</div><div class='add'>+	ATH12K_HTT_STATS_PAGE_LOCKED	= 0,</div><div class='add'>+	ATH12K_HTT_STATS_PAGE_UNLOCKED	= 1,</div><div class='add'>+	ATH12K_NUM_PG_LOCK_STATE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_PAGER_MAX	10</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_DLPAGER_ASYNC_LOCK_PG_CNT_INFO0	GENMASK(7, 0)</div><div class='add'>+#define ATH12K_HTT_DLPAGER_SYNC_LOCK_PG_CNT_INFO0	GENMASK(15, 8)</div><div class='add'>+#define ATH12K_HTT_DLPAGER_TOTAL_LOCK_PAGES_INFO1	GENMASK(15, 0)</div><div class='add'>+#define ATH12K_HTT_DLPAGER_TOTAL_FREE_PAGES_INFO1	GENMASK(31, 16)</div><div class='add'>+#define ATH12K_HTT_DLPAGER_TOTAL_LOCK_PAGES_INFO2	GENMASK(15, 0)</div><div class='add'>+#define ATH12K_HTT_DLPAGER_TOTAL_FREE_PAGES_INFO2	GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_pgs_info {</div><div class='add'>+	__le32 page_num;</div><div class='add'>+	__le32 num_pgs;</div><div class='add'>+	__le32 ts_lsb;</div><div class='add'>+	__le32 ts_msb;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_dl_pager_stats_tlv {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 info2;</div><div class='add'>+	struct ath12k_htt_pgs_info pgs_info[ATH12K_NUM_PG_LOCK_STATE][ATH12K_PAGER_MAX];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_STATS_MAX_CHAINS		8</div><div class='add'>+#define ATH12K_HTT_MAX_RX_PKT_CNT		8</div><div class='add'>+#define ATH12K_HTT_MAX_RX_PKT_CRC_PASS_CNT	8</div><div class='add'>+#define ATH12K_HTT_MAX_PER_BLK_ERR_CNT		20</div><div class='add'>+#define ATH12K_HTT_MAX_RX_OTA_ERR_CNT		14</div><div class='add'>+#define ATH12K_HTT_MAX_CH_PWR_INFO_SIZE		16</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_phy_stats_tlv {</div><div class='add'>+	a_sle32 nf_chain[ATH12K_HTT_STATS_MAX_CHAINS];</div><div class='add'>+	__le32 false_radar_cnt;</div><div class='add'>+	__le32 radar_cs_cnt;</div><div class='add'>+	a_sle32 ani_level;</div><div class='add'>+	__le32 fw_run_time;</div><div class='add'>+	a_sle32 runtime_nf_chain[ATH12K_HTT_STATS_MAX_CHAINS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_phy_counters_tlv {</div><div class='add'>+	__le32 rx_ofdma_timing_err_cnt;</div><div class='add'>+	__le32 rx_cck_fail_cnt;</div><div class='add'>+	__le32 mactx_abort_cnt;</div><div class='add'>+	__le32 macrx_abort_cnt;</div><div class='add'>+	__le32 phytx_abort_cnt;</div><div class='add'>+	__le32 phyrx_abort_cnt;</div><div class='add'>+	__le32 phyrx_defer_abort_cnt;</div><div class='add'>+	__le32 rx_gain_adj_lstf_event_cnt;</div><div class='add'>+	__le32 rx_gain_adj_non_legacy_cnt;</div><div class='add'>+	__le32 rx_pkt_cnt[ATH12K_HTT_MAX_RX_PKT_CNT];</div><div class='add'>+	__le32 rx_pkt_crc_pass_cnt[ATH12K_HTT_MAX_RX_PKT_CRC_PASS_CNT];</div><div class='add'>+	__le32 per_blk_err_cnt[ATH12K_HTT_MAX_PER_BLK_ERR_CNT];</div><div class='add'>+	__le32 rx_ota_err_cnt[ATH12K_HTT_MAX_RX_OTA_ERR_CNT];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_phy_reset_stats_tlv {</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 chan_mhz;</div><div class='add'>+	__le32 chan_band_center_freq1;</div><div class='add'>+	__le32 chan_band_center_freq2;</div><div class='add'>+	__le32 chan_phy_mode;</div><div class='add'>+	__le32 chan_flags;</div><div class='add'>+	__le32 chan_num;</div><div class='add'>+	__le32 reset_cause;</div><div class='add'>+	__le32 prev_reset_cause;</div><div class='add'>+	__le32 phy_warm_reset_src;</div><div class='add'>+	__le32 rx_gain_tbl_mode;</div><div class='add'>+	__le32 xbar_val;</div><div class='add'>+	__le32 force_calibration;</div><div class='add'>+	__le32 phyrf_mode;</div><div class='add'>+	__le32 phy_homechan;</div><div class='add'>+	__le32 phy_tx_ch_mask;</div><div class='add'>+	__le32 phy_rx_ch_mask;</div><div class='add'>+	__le32 phybb_ini_mask;</div><div class='add'>+	__le32 phyrf_ini_mask;</div><div class='add'>+	__le32 phy_dfs_en_mask;</div><div class='add'>+	__le32 phy_sscan_en_mask;</div><div class='add'>+	__le32 phy_synth_sel_mask;</div><div class='add'>+	__le32 phy_adfs_freq;</div><div class='add'>+	__le32 cck_fir_settings;</div><div class='add'>+	__le32 phy_dyn_pri_chan;</div><div class='add'>+	__le32 cca_thresh;</div><div class='add'>+	__le32 dyn_cca_status;</div><div class='add'>+	__le32 rxdesense_thresh_hw;</div><div class='add'>+	__le32 rxdesense_thresh_sw;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_phy_reset_counters_tlv {</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 cf_active_low_fail_cnt;</div><div class='add'>+	__le32 cf_active_low_pass_cnt;</div><div class='add'>+	__le32 phy_off_through_vreg_cnt;</div><div class='add'>+	__le32 force_calibration_cnt;</div><div class='add'>+	__le32 rf_mode_switch_phy_off_cnt;</div><div class='add'>+	__le32 temperature_recal_cnt;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_phy_tpc_stats_tlv {</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 tx_power_scale;</div><div class='add'>+	__le32 tx_power_scale_db;</div><div class='add'>+	__le32 min_negative_tx_power;</div><div class='add'>+	__le32 reg_ctl_domain;</div><div class='add'>+	__le32 max_reg_allowed_power[ATH12K_HTT_STATS_MAX_CHAINS];</div><div class='add'>+	__le32 max_reg_allowed_power_6ghz[ATH12K_HTT_STATS_MAX_CHAINS];</div><div class='add'>+	__le32 twice_max_rd_power;</div><div class='add'>+	__le32 max_tx_power;</div><div class='add'>+	__le32 home_max_tx_power;</div><div class='add'>+	__le32 psd_power;</div><div class='add'>+	__le32 eirp_power;</div><div class='add'>+	__le32 power_type_6ghz;</div><div class='add'>+	__le32 sub_band_cfreq[ATH12K_HTT_MAX_CH_PWR_INFO_SIZE];</div><div class='add'>+	__le32 sub_band_txpower[ATH12K_HTT_MAX_CH_PWR_INFO_SIZE];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_t2h_soc_txrx_stats_common_tlv {</div><div class='add'>+	__le32 inv_peers_msdu_drop_count_hi;</div><div class='add'>+	__le32 inv_peers_msdu_drop_count_lo;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_AST_PDEV_ID_INFO		GENMASK(1, 0)</div><div class='add'>+#define ATH12K_HTT_AST_VDEV_ID_INFO		GENMASK(9, 2)</div><div class='add'>+#define ATH12K_HTT_AST_NEXT_HOP_INFO		BIT(10)</div><div class='add'>+#define ATH12K_HTT_AST_MCAST_INFO		BIT(11)</div><div class='add'>+#define ATH12K_HTT_AST_MONITOR_DIRECT_INFO	BIT(12)</div><div class='add'>+#define ATH12K_HTT_AST_MESH_STA_INFO		BIT(13)</div><div class='add'>+#define ATH12K_HTT_AST_MEC_INFO			BIT(14)</div><div class='add'>+#define ATH12K_HTT_AST_INTRA_BSS_INFO		BIT(15)</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_ast_entry_tlv {</div><div class='add'>+	__le32 sw_peer_id;</div><div class='add'>+	__le32 ast_index;</div><div class='add'>+	struct htt_mac_addr mac_addr;</div><div class='add'>+	__le32 info;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum ath12k_htt_stats_direction {</div><div class='add'>+	ATH12K_HTT_STATS_DIRECTION_TX,</div><div class='add'>+	ATH12K_HTT_STATS_DIRECTION_RX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_htt_stats_ppdu_type {</div><div class='add'>+	ATH12K_HTT_STATS_PPDU_TYPE_MODE_SU,</div><div class='add'>+	ATH12K_HTT_STATS_PPDU_TYPE_DL_MU_MIMO,</div><div class='add'>+	ATH12K_HTT_STATS_PPDU_TYPE_UL_MU_MIMO,</div><div class='add'>+	ATH12K_HTT_STATS_PPDU_TYPE_DL_MU_OFDMA,</div><div class='add'>+	ATH12K_HTT_STATS_PPDU_TYPE_UL_MU_OFDMA</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_htt_stats_param_type {</div><div class='add'>+	ATH12K_HTT_STATS_PREAM_OFDM,</div><div class='add'>+	ATH12K_HTT_STATS_PREAM_CCK,</div><div class='add'>+	ATH12K_HTT_STATS_PREAM_HT,</div><div class='add'>+	ATH12K_HTT_STATS_PREAM_VHT,</div><div class='add'>+	ATH12K_HTT_STATS_PREAM_HE,</div><div class='add'>+	ATH12K_HTT_STATS_PREAM_EHT,</div><div class='add'>+	ATH12K_HTT_STATS_PREAM_RSVD1,</div><div class='add'>+	ATH12K_HTT_STATS_PREAM_COUNT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_PUNCT_STATS_MAX_SUBBAND_CNT	32</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_pdev_puncture_stats_tlv {</div><div class='add'>+	__le32 mac_id__word;</div><div class='add'>+	__le32 direction;</div><div class='add'>+	__le32 preamble;</div><div class='add'>+	__le32 ppdu_type;</div><div class='add'>+	__le32 subband_cnt;</div><div class='add'>+	__le32 last_used_pattern_mask;</div><div class='add'>+	__le32 num_subbands_used_cnt[ATH12K_HTT_PUNCT_STATS_MAX_SUBBAND_CNT];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_dmac_reset_stats_tlv {</div><div class='add'>+	__le32 reset_count;</div><div class='add'>+	__le32 reset_time_lo_ms;</div><div class='add'>+	__le32 reset_time_hi_ms;</div><div class='add'>+	__le32 disengage_time_lo_ms;</div><div class='add'>+	__le32 disengage_time_hi_ms;</div><div class='add'>+	__le32 engage_time_lo_ms;</div><div class='add'>+	__le32 engage_time_hi_ms;</div><div class='add'>+	__le32 disengage_count;</div><div class='add'>+	__le32 engage_count;</div><div class='add'>+	__le32 drain_dest_ring_mask;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_pdev_sched_algo_ofdma_stats_tlv {</div><div class='add'>+	__le32 mac_id__word;</div><div class='add'>+	__le32 rate_based_dlofdma_enabled_cnt[ATH12K_HTT_NUM_AC_WMM];</div><div class='add'>+	__le32 rate_based_dlofdma_disabled_cnt[ATH12K_HTT_NUM_AC_WMM];</div><div class='add'>+	__le32 rate_based_dlofdma_probing_cnt[ATH12K_HTT_NUM_AC_WMM];</div><div class='add'>+	__le32 rate_based_dlofdma_monitor_cnt[ATH12K_HTT_NUM_AC_WMM];</div><div class='add'>+	__le32 chan_acc_lat_based_dlofdma_enabled_cnt[ATH12K_HTT_NUM_AC_WMM];</div><div class='add'>+	__le32 chan_acc_lat_based_dlofdma_disabled_cnt[ATH12K_HTT_NUM_AC_WMM];</div><div class='add'>+	__le32 chan_acc_lat_based_dlofdma_monitor_cnt[ATH12K_HTT_NUM_AC_WMM];</div><div class='add'>+	__le32 downgrade_to_dl_su_ru_alloc_fail[ATH12K_HTT_NUM_AC_WMM];</div><div class='add'>+	__le32 candidate_list_single_user_disable_ofdma[ATH12K_HTT_NUM_AC_WMM];</div><div class='add'>+	__le32 dl_cand_list_dropped_high_ul_qos_weight[ATH12K_HTT_NUM_AC_WMM];</div><div class='add'>+	__le32 ax_dlofdma_disabled_due_to_pipelining[ATH12K_HTT_NUM_AC_WMM];</div><div class='add'>+	__le32 dlofdma_disabled_su_only_eligible[ATH12K_HTT_NUM_AC_WMM];</div><div class='add'>+	__le32 dlofdma_disabled_consec_no_mpdus_tried[ATH12K_HTT_NUM_AC_WMM];</div><div class='add'>+	__le32 dlofdma_disabled_consec_no_mpdus_success[ATH12K_HTT_NUM_AC_WMM];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_STATS_NUM_BW_CNTRS		4</div><div class='add'>+#define ATH12K_HTT_PDEV_STAT_NUM_SPATIAL_STREAMS	8</div><div class='add'>+#define ATH12K_HTT_TXBF_RATE_STAT_NUM_MCS_CNTRS		14</div><div class='add'>+</div><div class='add'>+enum ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE {</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_26,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_52,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_52_26,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_106,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_106_26,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_242,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_484,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_484_242,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_996,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_996_484,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_996_484_242,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_996x2,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_996x2_484,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_996x3,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_996x3_484,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_STATS_BE_RU_SIZE_996x4,</div><div class='add'>+	ATH12K_HTT_TX_RX_PDEV_NUM_BE_RU_SIZE_CNTRS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ATH12K_HTT_RC_MODE {</div><div class='add'>+	ATH12K_HTT_RC_MODE_SU_OL,</div><div class='add'>+	ATH12K_HTT_RC_MODE_SU_BF,</div><div class='add'>+	ATH12K_HTT_RC_MODE_MU1_INTF,</div><div class='add'>+	ATH12K_HTT_RC_MODE_MU2_INTF,</div><div class='add'>+	ATH12K_HTT_RC_MODE_MU3_INTF,</div><div class='add'>+	ATH12K_HTT_RC_MODE_MU4_INTF,</div><div class='add'>+	ATH12K_HTT_RC_MODE_MU5_INTF,</div><div class='add'>+	ATH12K_HTT_RC_MODE_MU6_INTF,</div><div class='add'>+	ATH12K_HTT_RC_MODE_MU7_INTF,</div><div class='add'>+	ATH12K_HTT_RC_MODE_2D_COUNT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_htt_stats_rc_mode {</div><div class='add'>+	ATH12K_HTT_STATS_RC_MODE_DLSU     = 0,</div><div class='add'>+	ATH12K_HTT_STATS_RC_MODE_DLMUMIMO = 1,</div><div class='add'>+	ATH12K_HTT_STATS_RC_MODE_DLOFDMA  = 2,</div><div class='add'>+	ATH12K_HTT_STATS_RC_MODE_ULMUMIMO = 3,</div><div class='add'>+	ATH12K_HTT_STATS_RC_MODE_ULOFDMA  = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_htt_stats_ru_type {</div><div class='add'>+	ATH12K_HTT_STATS_RU_TYPE_INVALID,</div><div class='add'>+	ATH12K_HTT_STATS_RU_TYPE_SINGLE_RU_ONLY,</div><div class='add'>+	ATH12K_HTT_STATS_RU_TYPE_SINGLE_AND_MULTI_RU,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_rate_stats {</div><div class='add'>+	__le32 ppdus_tried;</div><div class='add'>+	__le32 ppdus_ack_failed;</div><div class='add'>+	__le32 mpdus_tried;</div><div class='add'>+	__le32 mpdus_failed;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_per_rate_stats_tlv {</div><div class='add'>+	__le32 rc_mode;</div><div class='add'>+	__le32 last_probed_mcs;</div><div class='add'>+	__le32 last_probed_nss;</div><div class='add'>+	__le32 last_probed_bw;</div><div class='add'>+	struct ath12k_htt_tx_rate_stats per_bw[ATH12K_HTT_TX_PDEV_STATS_NUM_BW_CNTRS];</div><div class='add'>+	struct ath12k_htt_tx_rate_stats per_nss[ATH12K_HTT_PDEV_STAT_NUM_SPATIAL_STREAMS];</div><div class='add'>+	struct ath12k_htt_tx_rate_stats per_mcs[ATH12K_HTT_TXBF_RATE_STAT_NUM_MCS_CNTRS];</div><div class='add'>+	struct ath12k_htt_tx_rate_stats per_bw320;</div><div class='add'>+	__le32 probe_cnt[ATH12K_HTT_RC_MODE_2D_COUNT];</div><div class='add'>+	__le32 ru_type;</div><div class='add'>+	struct ath12k_htt_tx_rate_stats ru[ATH12K_HTT_TX_RX_PDEV_NUM_BE_RU_SIZE_CNTRS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_NUM_BE_MCS_CNTRS		16</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_NUM_BE_BW_CNTRS		5</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_NUM_EHT_SIG_MCS_CNTRS	4</div><div class='add'>+#define ATH12K_HTT_TX_PDEV_NUM_GI_CNTRS			4</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_tx_pdev_rate_stats_be_ofdma_tlv {</div><div class='add'>+	__le32 mac_id__word;</div><div class='add'>+	__le32 be_ofdma_tx_ldpc;</div><div class='add'>+	__le32 be_ofdma_tx_mcs[ATH12K_HTT_TX_PDEV_NUM_BE_MCS_CNTRS];</div><div class='add'>+	__le32 be_ofdma_tx_nss[ATH12K_HTT_PDEV_STAT_NUM_SPATIAL_STREAMS];</div><div class='add'>+	__le32 be_ofdma_tx_bw[ATH12K_HTT_TX_PDEV_NUM_BE_BW_CNTRS];</div><div class='add'>+	__le32 gi[ATH12K_HTT_TX_PDEV_NUM_GI_CNTRS][ATH12K_HTT_TX_PDEV_NUM_BE_MCS_CNTRS];</div><div class='add'>+	__le32 be_ofdma_tx_ru_size[ATH12K_HTT_TX_RX_PDEV_NUM_BE_RU_SIZE_CNTRS];</div><div class='add'>+	__le32 be_ofdma_eht_sig_mcs[ATH12K_HTT_TX_PDEV_NUM_EHT_SIG_MCS_CNTRS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_pdev_mbssid_ctrl_frame_tlv {</div><div class='add'>+	__le32 mac_id__word;</div><div class='add'>+	__le32 basic_trigger_across_bss;</div><div class='add'>+	__le32 basic_trigger_within_bss;</div><div class='add'>+	__le32 bsr_trigger_across_bss;</div><div class='add'>+	__le32 bsr_trigger_within_bss;</div><div class='add'>+	__le32 mu_rts_across_bss;</div><div class='add'>+	__le32 mu_rts_within_bss;</div><div class='add'>+	__le32 ul_mumimo_trigger_across_bss;</div><div class='add'>+	__le32 ul_mumimo_trigger_within_bss;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_pdev_tdma_stats_tlv {</div><div class='add'>+	__le32 mac_id__word;</div><div class='add'>+	__le32 num_tdma_active_schedules;</div><div class='add'>+	__le32 num_tdma_reserved_schedules;</div><div class='add'>+	__le32 num_tdma_restricted_schedules;</div><div class='add'>+	__le32 num_tdma_unconfigured_schedules;</div><div class='add'>+	__le32 num_tdma_slot_switches;</div><div class='add'>+	__le32 num_tdma_edca_switches;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_mlo_sched_stats_tlv {</div><div class='add'>+	__le32 pref_link_num_sec_link_sched;</div><div class='add'>+	__le32 pref_link_num_pref_link_timeout;</div><div class='add'>+	__le32 pref_link_num_pref_link_sch_delay_ipc;</div><div class='add'>+	__le32 pref_link_num_pref_link_timeout_ipc;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_HWMLO_MAX_LINKS	6</div><div class='add'>+#define ATH12K_HTT_MLO_MAX_IPC_RINGS	7</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_pdev_mlo_ipc_stats_tlv {</div><div class='add'>+	__le32 mlo_ipc_ring_cnt[ATH12K_HTT_HWMLO_MAX_LINKS][ATH12K_HTT_MLO_MAX_IPC_RINGS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_stats_pdev_rtt_resp_stats_tlv {</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 tx_11mc_ftm_suc;</div><div class='add'>+	__le32 tx_11mc_ftm_suc_retry;</div><div class='add'>+	__le32 tx_11mc_ftm_fail;</div><div class='add'>+	__le32 rx_11mc_ftmr_cnt;</div><div class='add'>+	__le32 rx_11mc_ftmr_dup_cnt;</div><div class='add'>+	__le32 rx_11mc_iftmr_cnt;</div><div class='add'>+	__le32 rx_11mc_iftmr_dup_cnt;</div><div class='add'>+	__le32 ftmr_drop_11mc_resp_role_not_enabled_cnt;</div><div class='add'>+	__le32 initiator_active_responder_rejected_cnt;</div><div class='add'>+	__le32 responder_terminate_cnt;</div><div class='add'>+	__le32 active_rsta_open;</div><div class='add'>+	__le32 active_rsta_mac;</div><div class='add'>+	__le32 active_rsta_mac_phy;</div><div class='add'>+	__le32 num_assoc_ranging_peers;</div><div class='add'>+	__le32 num_unassoc_ranging_peers;</div><div class='add'>+	__le32 responder_alloc_cnt;</div><div class='add'>+	__le32 responder_alloc_failure;</div><div class='add'>+	__le32 pn_check_failure_cnt;</div><div class='add'>+	__le32 pasn_m1_auth_recv_cnt;</div><div class='add'>+	__le32 pasn_m1_auth_drop_cnt;</div><div class='add'>+	__le32 pasn_m2_auth_recv_cnt;</div><div class='add'>+	__le32 pasn_m2_auth_tx_fail_cnt;</div><div class='add'>+	__le32 pasn_m3_auth_recv_cnt;</div><div class='add'>+	__le32 pasn_m3_auth_drop_cnt;</div><div class='add'>+	__le32 pasn_peer_create_request_cnt;</div><div class='add'>+	__le32 pasn_peer_create_timeout_cnt;</div><div class='add'>+	__le32 pasn_peer_created_cnt;</div><div class='add'>+	__le32 sec_ranging_not_supported_mfp_not_setup;</div><div class='add'>+	__le32 non_sec_ranging_discarded_for_assoc_peer;</div><div class='add'>+	__le32 open_ranging_discarded_set_for_pasn_peer;</div><div class='add'>+	__le32 unassoc_non_pasn_ranging_not_supported;</div><div class='add'>+	__le32 num_req_bw_20_mhz;</div><div class='add'>+	__le32 num_req_bw_40_mhz;</div><div class='add'>+	__le32 num_req_bw_80_mhz;</div><div class='add'>+	__le32 num_req_bw_160_mhz;</div><div class='add'>+	__le32 tx_11az_ftm_successful;</div><div class='add'>+	__le32 tx_11az_ftm_failed;</div><div class='add'>+	__le32 rx_11az_ftmr_cnt;</div><div class='add'>+	__le32 rx_11az_ftmr_dup_cnt;</div><div class='add'>+	__le32 rx_11az_iftmr_dup_cnt;</div><div class='add'>+	__le32 malformed_ftmr;</div><div class='add'>+	__le32 ftmr_drop_ntb_resp_role_not_enabled_cnt;</div><div class='add'>+	__le32 ftmr_drop_tb_resp_role_not_enabled_cnt;</div><div class='add'>+	__le32 invalid_ftm_request_params;</div><div class='add'>+	__le32 requested_bw_format_not_supported;</div><div class='add'>+	__le32 ntb_unsec_unassoc_ranging_peer_alloc_failed;</div><div class='add'>+	__le32 tb_unassoc_unsec_pasn_peer_creation_failed;</div><div class='add'>+	__le32 num_ranging_sequences_processed;</div><div class='add'>+	__le32 ntb_tx_ndp;</div><div class='add'>+	__le32 ndp_rx_cnt;</div><div class='add'>+	__le32 num_ntb_ranging_ndpas_recv;</div><div class='add'>+	__le32 recv_lmr;</div><div class='add'>+	__le32 invalid_ftmr_cnt;</div><div class='add'>+	__le32 max_time_bw_meas_exp_cnt;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_MAX_SCH_CMD_RESULT	25</div><div class='add'>+#define ATH12K_HTT_SCH_CMD_STATUS_CNT	9</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_stats_pdev_rtt_init_stats_tlv {</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 tx_11mc_ftmr_cnt;</div><div class='add'>+	__le32 tx_11mc_ftmr_fail;</div><div class='add'>+	__le32 tx_11mc_ftmr_suc_retry;</div><div class='add'>+	__le32 rx_11mc_ftm_cnt;</div><div class='add'>+	__le32 tx_meas_req_count;</div><div class='add'>+	__le32 init_role_not_enabled;</div><div class='add'>+	__le32 initiator_terminate_cnt;</div><div class='add'>+	__le32 tx_11az_ftmr_fail;</div><div class='add'>+	__le32 tx_11az_ftmr_start;</div><div class='add'>+	__le32 tx_11az_ftmr_stop;</div><div class='add'>+	__le32 rx_11az_ftm_cnt;</div><div class='add'>+	__le32 active_ista;</div><div class='add'>+	__le32 invalid_preamble;</div><div class='add'>+	__le32 invalid_chan_bw_format;</div><div class='add'>+	__le32 mgmt_buff_alloc_fail_cnt;</div><div class='add'>+	__le32 ftm_parse_failure;</div><div class='add'>+	__le32 ranging_negotiation_successful_cnt;</div><div class='add'>+	__le32 incompatible_ftm_params;</div><div class='add'>+	__le32 sec_ranging_req_in_open_mode;</div><div class='add'>+	__le32 ftmr_tx_failed_null_11az_peer;</div><div class='add'>+	__le32 ftmr_retry_timeout;</div><div class='add'>+	__le32 max_time_bw_meas_exp_cnt;</div><div class='add'>+	__le32 tb_meas_duration_expiry_cnt;</div><div class='add'>+	__le32 num_tb_ranging_requests;</div><div class='add'>+	__le32 ntbr_triggered_successfully;</div><div class='add'>+	__le32 ntbr_trigger_failed;</div><div class='add'>+	__le32 invalid_or_no_vreg_idx;</div><div class='add'>+	__le32 set_vreg_params_failed;</div><div class='add'>+	__le32 sac_mismatch;</div><div class='add'>+	__le32 pasn_m1_auth_recv_cnt;</div><div class='add'>+	__le32 pasn_m1_auth_tx_fail_cnt;</div><div class='add'>+	__le32 pasn_m2_auth_recv_cnt;</div><div class='add'>+	__le32 pasn_m2_auth_drop_cnt;</div><div class='add'>+	__le32 pasn_m3_auth_recv_cnt;</div><div class='add'>+	__le32 pasn_m3_auth_tx_fail_cnt;</div><div class='add'>+	__le32 pasn_peer_create_request_cnt;</div><div class='add'>+	__le32 pasn_peer_create_timeout_cnt;</div><div class='add'>+	__le32 pasn_peer_created_cnt;</div><div class='add'>+	__le32 ntbr_ndpa_failed;</div><div class='add'>+	__le32 ntbr_sequence_successful;</div><div class='add'>+	__le32 ntbr_ndp_failed;</div><div class='add'>+	__le32 sch_cmd_status_cnts[ATH12K_HTT_SCH_CMD_STATUS_CNT];</div><div class='add'>+	__le32 lmr_timeout;</div><div class='add'>+	__le32 lmr_recv;</div><div class='add'>+	__le32 num_trigger_frames_received;</div><div class='add'>+	__le32 num_tb_ranging_ndpas_recv;</div><div class='add'>+	__le32 ndp_rx_cnt;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_stats_pdev_rtt_hw_stats_tlv {</div><div class='add'>+	__le32 ista_ranging_ndpa_cnt;</div><div class='add'>+	__le32 ista_ranging_ndp_cnt;</div><div class='add'>+	__le32 ista_ranging_i2r_lmr_cnt;</div><div class='add'>+	__le32 rtsa_ranging_resp_cnt;</div><div class='add'>+	__le32 rtsa_ranging_ndp_cnt;</div><div class='add'>+	__le32 rsta_ranging_lmr_cnt;</div><div class='add'>+	__le32 tb_ranging_cts2s_rcvd_cnt;</div><div class='add'>+	__le32 tb_ranging_ndp_rcvd_cnt;</div><div class='add'>+	__le32 tb_ranging_lmr_rcvd_cnt;</div><div class='add'>+	__le32 tb_ranging_tf_poll_resp_sent_cnt;</div><div class='add'>+	__le32 tb_ranging_tf_sound_resp_sent_cnt;</div><div class='add'>+	__le32 tb_ranging_tf_report_resp_sent_cnt;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum ath12k_htt_stats_txsend_ftype {</div><div class='add'>+	ATH12K_HTT_FTYPE_TF_POLL,</div><div class='add'>+	ATH12K_HTT_FTYPE_TF_SOUND,</div><div class='add'>+	ATH12K_HTT_FTYPE_TBR_NDPA,</div><div class='add'>+	ATH12K_HTT_FTYPE_TBR_NDP,</div><div class='add'>+	ATH12K_HTT_FTYPE_TBR_LMR,</div><div class='add'>+	ATH12K_HTT_FTYPE_TF_RPRT,</div><div class='add'>+	ATH12K_HTT_FTYPE_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_stats_pdev_rtt_tbr_tlv {</div><div class='add'>+	__le32 su_ftype[ATH12K_HTT_FTYPE_MAX];</div><div class='add'>+	__le32 mu_ftype[ATH12K_HTT_FTYPE_MAX];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_stats_pdev_rtt_tbr_cmd_result_stats_tlv {</div><div class='add'>+	__le32 tbr_num_sch_cmd_result_buckets;</div><div class='add'>+	__le32 su_res[ATH12K_HTT_FTYPE_MAX][ATH12K_HTT_MAX_SCH_CMD_RESULT];</div><div class='add'>+	__le32 mu_res[ATH12K_HTT_FTYPE_MAX][ATH12K_HTT_MAX_SCH_CMD_RESULT];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/debugfs_sta.c b/drivers/net/wireless/ath/ath12k/debugfs_sta.c<br/>new file mode 100644<br/>index 000000000000..5bd2bf4c9dac<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/debugfs_sta.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/debugfs_sta.c</a></div><div class='hunk'>@@ -0,0 +1,337 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "debugfs_sta.h"</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "peer.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "debugfs_htt_stats.h"</div><div class='add'>+#include "debugfs.h"</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+u32 ath12k_dbg_sta_dump_rate_stats(u8 *buf, u32 offset, const int size,</div><div class='add'>+				   bool he_rates_avail,</div><div class='add'>+				   const struct ath12k_rx_peer_rate_stats *stats)</div><div class='add'>+{</div><div class='add'>+	static const char *legacy_rate_str[HAL_RX_MAX_NUM_LEGACY_RATES] = {</div><div class='add'>+					"1 Mbps", "2 Mbps", "5.5 Mbps", "6 Mbps",</div><div class='add'>+					"9 Mbps", "11 Mbps", "12 Mbps", "18 Mbps",</div><div class='add'>+					"24 Mbps", "36 Mbps", "48 Mbps", "54 Mbps"};</div><div class='add'>+	u8 max_bw = HAL_RX_BW_MAX, max_gi = HAL_RX_GI_MAX, max_mcs = HAL_RX_MAX_NSS;</div><div class='add'>+	int mcs = 0, bw = 0, nss = 0, gi = 0, bw_num = 0;</div><div class='add'>+	u32 i, len = offset, max = max_bw * max_gi * max_mcs;</div><div class='add'>+	bool found;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\nEHT stats:\n");</div><div class='add'>+	for (i = 0; i &lt;= HAL_RX_MAX_MCS_BE; i++)</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='add'>+				   "MCS %d: %llu%s", i, stats-&gt;be_mcs_count[i],</div><div class='add'>+				   (i + 1) % 8 ? "\t" : "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\nHE stats:\n");</div><div class='add'>+	for (i = 0; i &lt;= HAL_RX_MAX_MCS_HE; i++)</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='add'>+				   "MCS %d: %llu%s", i, stats-&gt;he_mcs_count[i],</div><div class='add'>+				   (i + 1) % 6 ? "\t" : "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\nVHT stats:\n");</div><div class='add'>+	for (i = 0; i &lt;= HAL_RX_MAX_MCS_VHT; i++)</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='add'>+				   "MCS %d: %llu%s", i, stats-&gt;vht_mcs_count[i],</div><div class='add'>+				   (i + 1) % 5 ? "\t" : "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\nHT stats:\n");</div><div class='add'>+	for (i = 0; i &lt;= HAL_RX_MAX_MCS_HT; i++)</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='add'>+				   "MCS %d: %llu%s", i, stats-&gt;ht_mcs_count[i],</div><div class='add'>+				   (i + 1) % 8 ? "\t" : "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\nLegacy stats:\n");</div><div class='add'>+	for (i = 0; i &lt; HAL_RX_MAX_NUM_LEGACY_RATES; i++)</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='add'>+				   "%s: %llu%s", legacy_rate_str[i],</div><div class='add'>+				   stats-&gt;legacy_count[i],</div><div class='add'>+				   (i + 1) % 4 ? "\t" : "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\nNSS stats:\n");</div><div class='add'>+	for (i = 0; i &lt; HAL_RX_MAX_NSS; i++)</div><div class='add'>+		len += scnprintf(buf + len, size - len,</div><div class='add'>+				   "%dx%d: %llu ", i + 1, i + 1,</div><div class='add'>+				   stats-&gt;nss_count[i]);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len,</div><div class='add'>+			  "\n\nGI: 0.8 us %llu 0.4 us %llu 1.6 us %llu 3.2 us %llu\n",</div><div class='add'>+			  stats-&gt;gi_count[0],</div><div class='add'>+			  stats-&gt;gi_count[1],</div><div class='add'>+			  stats-&gt;gi_count[2],</div><div class='add'>+			  stats-&gt;gi_count[3]);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len,</div><div class='add'>+			   "BW: 20 MHz %llu 40 MHz %llu 80 MHz %llu 160 MHz %llu 320 MHz %llu\n",</div><div class='add'>+			   stats-&gt;bw_count[0],</div><div class='add'>+			   stats-&gt;bw_count[1],</div><div class='add'>+			   stats-&gt;bw_count[2],</div><div class='add'>+			   stats-&gt;bw_count[3],</div><div class='add'>+			   stats-&gt;bw_count[4]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; max; i++) {</div><div class='add'>+		found = false;</div><div class='add'>+</div><div class='add'>+		for (mcs = 0; mcs &lt;= HAL_RX_MAX_MCS_HT; mcs++) {</div><div class='add'>+			if (stats-&gt;rx_rate[bw][gi][nss][mcs]) {</div><div class='add'>+				found = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!found)</div><div class='add'>+			goto skip_report;</div><div class='add'>+</div><div class='add'>+		switch (bw) {</div><div class='add'>+		case HAL_RX_BW_20MHZ:</div><div class='add'>+			bw_num = 20;</div><div class='add'>+			break;</div><div class='add'>+		case HAL_RX_BW_40MHZ:</div><div class='add'>+			bw_num = 40;</div><div class='add'>+			break;</div><div class='add'>+		case HAL_RX_BW_80MHZ:</div><div class='add'>+			bw_num = 80;</div><div class='add'>+			break;</div><div class='add'>+		case HAL_RX_BW_160MHZ:</div><div class='add'>+			bw_num = 160;</div><div class='add'>+			break;</div><div class='add'>+		case HAL_RX_BW_320MHZ:</div><div class='add'>+			bw_num = 320;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		len += scnprintf(buf + len, size - len, "\n%d Mhz gi %d us %dx%d : ",</div><div class='add'>+				 bw_num, gi, nss + 1, nss + 1);</div><div class='add'>+</div><div class='add'>+		for (mcs = 0; mcs &lt;= HAL_RX_MAX_MCS_HT; mcs++) {</div><div class='add'>+			if (stats-&gt;rx_rate[bw][gi][nss][mcs])</div><div class='add'>+				len += scnprintf(buf + len, size - len,</div><div class='add'>+						 " %d:%llu", mcs,</div><div class='add'>+						 stats-&gt;rx_rate[bw][gi][nss][mcs]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+skip_report:</div><div class='add'>+		if (nss++ &gt;= max_mcs - 1) {</div><div class='add'>+			nss = 0;</div><div class='add'>+			if (gi++ &gt;= max_gi - 1) {</div><div class='add'>+				gi = 0;</div><div class='add'>+				if (bw &lt; max_bw - 1)</div><div class='add'>+					bw++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\n");</div><div class='add'>+</div><div class='add'>+	return len - offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath12k_dbg_sta_dump_rx_stats(struct file *file,</div><div class='add'>+					    char __user *user_buf,</div><div class='add'>+					    size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_link_sta *link_sta = file-&gt;private_data;</div><div class='add'>+	struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(link_sta-&gt;sta);</div><div class='add'>+	const int size = ATH12K_STA_RX_STATS_BUF_SIZE;</div><div class='add'>+	struct ath12k_hw *ah = ahsta-&gt;ahvif-&gt;ah;</div><div class='add'>+	struct ath12k_rx_peer_stats *rx_stats;</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	u8 link_id = link_sta-&gt;link_id;</div><div class='add'>+	int len = 0, i, ret = 0;</div><div class='add'>+	bool he_rates_avail;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+</div><div class='add'>+	wiphy_lock(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!(BIT(link_id) &amp; ahsta-&gt;links_map)) {</div><div class='add'>+		wiphy_unlock(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arsta = wiphy_dereference(ah-&gt;hw-&gt;wiphy, ahsta-&gt;link[link_id]);</div><div class='add'>+	if (!arsta || !arsta-&gt;arvif-&gt;ar) {</div><div class='add'>+		wiphy_unlock(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar = arsta-&gt;arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	u8 *buf __free(kfree) = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	if (!buf) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	rx_stats = arsta-&gt;rx_stats;</div><div class='add'>+	if (!rx_stats) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "RX peer stats:\n\n");</div><div class='add'>+	len += scnprintf(buf + len, size - len, "Num of MSDUs: %llu\n",</div><div class='add'>+			 rx_stats-&gt;num_msdu);</div><div class='add'>+	len += scnprintf(buf + len, size - len, "Num of MSDUs with TCP L4: %llu\n",</div><div class='add'>+			 rx_stats-&gt;tcp_msdu_count);</div><div class='add'>+	len += scnprintf(buf + len, size - len, "Num of MSDUs with UDP L4: %llu\n",</div><div class='add'>+			 rx_stats-&gt;udp_msdu_count);</div><div class='add'>+	len += scnprintf(buf + len, size - len, "Num of other MSDUs: %llu\n",</div><div class='add'>+			 rx_stats-&gt;other_msdu_count);</div><div class='add'>+	len += scnprintf(buf + len, size - len, "Num of MSDUs part of AMPDU: %llu\n",</div><div class='add'>+			 rx_stats-&gt;ampdu_msdu_count);</div><div class='add'>+	len += scnprintf(buf + len, size - len, "Num of MSDUs not part of AMPDU: %llu\n",</div><div class='add'>+			 rx_stats-&gt;non_ampdu_msdu_count);</div><div class='add'>+	len += scnprintf(buf + len, size - len, "Num of MSDUs using STBC: %llu\n",</div><div class='add'>+			 rx_stats-&gt;stbc_count);</div><div class='add'>+	len += scnprintf(buf + len, size - len, "Num of MSDUs beamformed: %llu\n",</div><div class='add'>+			 rx_stats-&gt;beamformed_count);</div><div class='add'>+	len += scnprintf(buf + len, size - len, "Num of MPDUs with FCS ok: %llu\n",</div><div class='add'>+			 rx_stats-&gt;num_mpdu_fcs_ok);</div><div class='add'>+	len += scnprintf(buf + len, size - len, "Num of MPDUs with FCS error: %llu\n",</div><div class='add'>+			 rx_stats-&gt;num_mpdu_fcs_err);</div><div class='add'>+</div><div class='add'>+	he_rates_avail = (rx_stats-&gt;pream_cnt[HAL_RX_PREAMBLE_11AX] &gt; 1) ? true : false;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len,</div><div class='add'>+			 "preamble: 11A %llu 11B %llu 11N %llu 11AC %llu 11AX %llu 11BE %llu\n",</div><div class='add'>+			 rx_stats-&gt;pream_cnt[0], rx_stats-&gt;pream_cnt[1],</div><div class='add'>+			 rx_stats-&gt;pream_cnt[2], rx_stats-&gt;pream_cnt[3],</div><div class='add'>+			 rx_stats-&gt;pream_cnt[4], rx_stats-&gt;pream_cnt[6]);</div><div class='add'>+	len += scnprintf(buf + len, size - len,</div><div class='add'>+			 "reception type: SU %llu MU_MIMO %llu MU_OFDMA %llu MU_OFDMA_MIMO %llu\n",</div><div class='add'>+			 rx_stats-&gt;reception_type[0], rx_stats-&gt;reception_type[1],</div><div class='add'>+			 rx_stats-&gt;reception_type[2], rx_stats-&gt;reception_type[3]);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "TID(0-15) Legacy TID(16):");</div><div class='add'>+	for (i = 0; i &lt;= IEEE80211_NUM_TIDS; i++)</div><div class='add'>+		len += scnprintf(buf + len, size - len, "%llu ", rx_stats-&gt;tid_count[i]);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\nRX Duration:%llu\n",</div><div class='add'>+			 rx_stats-&gt;rx_duration);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len,</div><div class='add'>+			 "\nDCM: %llu\nRU26:  %llu\nRU52:  %llu\nRU106: %llu\nRU242: %llu\nRU484: %llu\nRU996: %llu\nRU996x2: %llu\n",</div><div class='add'>+			 rx_stats-&gt;dcm_count, rx_stats-&gt;ru_alloc_cnt[0],</div><div class='add'>+			 rx_stats-&gt;ru_alloc_cnt[1], rx_stats-&gt;ru_alloc_cnt[2],</div><div class='add'>+			 rx_stats-&gt;ru_alloc_cnt[3], rx_stats-&gt;ru_alloc_cnt[4],</div><div class='add'>+			 rx_stats-&gt;ru_alloc_cnt[5], rx_stats-&gt;ru_alloc_cnt[6]);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\nRX success packet stats:\n");</div><div class='add'>+	len += ath12k_dbg_sta_dump_rate_stats(buf, len, size, he_rates_avail,</div><div class='add'>+					      &amp;rx_stats-&gt;pkt_stats);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\n");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, size - len, "\nRX success byte stats:\n");</div><div class='add'>+	len += ath12k_dbg_sta_dump_rate_stats(buf, len, size, he_rates_avail,</div><div class='add'>+					      &amp;rx_stats-&gt;byte_stats);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	if (len)</div><div class='add'>+		ret = simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+out:</div><div class='add'>+	wiphy_unlock(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_rx_stats = {</div><div class='add'>+	.read = ath12k_dbg_sta_dump_rx_stats,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t ath12k_dbg_sta_reset_rx_stats(struct file *file,</div><div class='add'>+					     const char __user *buf,</div><div class='add'>+					     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_link_sta *link_sta = file-&gt;private_data;</div><div class='add'>+	struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(link_sta-&gt;sta);</div><div class='add'>+	struct ath12k_hw *ah = ahsta-&gt;ahvif-&gt;ah;</div><div class='add'>+	struct ath12k_rx_peer_stats *rx_stats;</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	u8 link_id = link_sta-&gt;link_id;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	bool reset;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtobool_from_user(buf, count, &amp;reset);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!reset)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	wiphy_lock(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!(BIT(link_id) &amp; ahsta-&gt;links_map)) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arsta = wiphy_dereference(ah-&gt;hw-&gt;wiphy, ahsta-&gt;link[link_id]);</div><div class='add'>+	if (!arsta || !arsta-&gt;arvif-&gt;ar) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar = arsta-&gt;arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	rx_stats = arsta-&gt;rx_stats;</div><div class='add'>+	if (!rx_stats) {</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(rx_stats, 0, sizeof(*rx_stats));</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	ret = count;</div><div class='add'>+out:</div><div class='add'>+	wiphy_unlock(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_reset_rx_stats = {</div><div class='add'>+	.write = ath12k_dbg_sta_reset_rx_stats,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath12k_debugfs_link_sta_op_add(struct ieee80211_hw *hw,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct ieee80211_link_sta *link_sta,</div><div class='add'>+				    struct dentry *dir)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ar = ath12k_get_ar_by_vif(hw, vif, link_sta-&gt;link_id);</div><div class='add'>+	if (!ar)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (ath12k_debugfs_is_extd_rx_stats_enabled(ar)) {</div><div class='add'>+		debugfs_create_file("rx_stats", 0400, dir, link_sta,</div><div class='add'>+				    &amp;fops_rx_stats);</div><div class='add'>+		debugfs_create_file("reset_rx_stats", 0200, dir, link_sta,</div><div class='add'>+				    &amp;fops_reset_rx_stats);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/debugfs_sta.h b/drivers/net/wireless/ath/ath12k/debugfs_sta.h<br/>new file mode 100644<br/>index 000000000000..8de924f4d7d5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/debugfs_sta.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/debugfs_sta.h</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ATH12K_DEBUGFS_STA_H_</div><div class='add'>+#define _ATH12K_DEBUGFS_STA_H_</div><div class='add'>+</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+</div><div class='add'>+#define ATH12K_STA_RX_STATS_BUF_SIZE		(1024 * 16)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ATH12K_DEBUGFS</div><div class='add'>+</div><div class='add'>+void ath12k_debugfs_link_sta_op_add(struct ieee80211_hw *hw,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct ieee80211_link_sta *link_sta,</div><div class='add'>+				    struct dentry *dir);</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_ATH12K_DEBUGFS */</div><div class='add'>+</div><div class='add'>+#endif /* _ATH12K_DEBUGFS_STA_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/dp.c b/drivers/net/wireless/ath/ath12k/dp.c<br/>new file mode 100644<br/>index 000000000000..4a54b8c35311<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/dp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/dp.c</a></div><div class='hunk'>@@ -0,0 +1,1841 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/hash.h&gt;</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "dp_tx.h"</div><div class='add'>+#include "hal_tx.h"</div><div class='add'>+#include "hif.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "dp_rx.h"</div><div class='add'>+#include "peer.h"</div><div class='add'>+#include "dp_mon.h"</div><div class='add'>+</div><div class='add'>+enum ath12k_dp_desc_type {</div><div class='add'>+	ATH12K_DP_TX_DESC,</div><div class='add'>+	ATH12K_DP_RX_DESC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_htt_htc_tx_complete(struct ath12k_base *ab,</div><div class='add'>+					  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_peer_cleanup(struct ath12k *ar, int vdev_id, const u8 *addr)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+</div><div class='add'>+	/* TODO: Any other peer specific DP cleanup */</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	peer = ath12k_peer_find(ab, vdev_id, addr);</div><div class='add'>+	if (!peer) {</div><div class='add'>+		ath12k_warn(ab, "failed to lookup peer %pM on vdev %d\n",</div><div class='add'>+			    addr, vdev_id);</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!peer-&gt;primary_link) {</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dp_rx_peer_tid_cleanup(ar, peer);</div><div class='add'>+	crypto_free_shash(peer-&gt;tfm_mmic);</div><div class='add'>+	peer-&gt;dp_setup_done = false;</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_peer_setup(struct ath12k *ar, int vdev_id, const u8 *addr)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	u32 reo_dest;</div><div class='add'>+	int ret = 0, tid;</div><div class='add'>+</div><div class='add'>+	/* NOTE: reo_dest ring id starts from 1 unlike mac_id which starts from 0 */</div><div class='add'>+	reo_dest = ar-&gt;dp.mac_id + 1;</div><div class='add'>+	ret = ath12k_wmi_set_peer_param(ar, addr, vdev_id,</div><div class='add'>+					WMI_PEER_SET_DEFAULT_ROUTING,</div><div class='add'>+					DP_RX_HASH_ENABLE | (reo_dest &lt;&lt; 1));</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to set default routing %d peer :%pM vdev_id :%d\n",</div><div class='add'>+			    ret, addr, vdev_id);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (tid = 0; tid &lt;= IEEE80211_NUM_TIDS; tid++) {</div><div class='add'>+		ret = ath12k_dp_rx_peer_tid_setup(ar, addr, vdev_id, tid, 1, 0,</div><div class='add'>+						  HAL_PN_TYPE_NONE);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to setup rxd tid queue for tid %d: %d\n",</div><div class='add'>+				    tid, ret);</div><div class='add'>+			goto peer_clean;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_rx_peer_frag_setup(ar, addr, vdev_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to setup rx defrag context\n");</div><div class='add'>+		goto peer_clean;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TODO: Setup other peer specific resource used in data path */</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+peer_clean:</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	peer = ath12k_peer_find(ab, vdev_id, addr);</div><div class='add'>+	if (!peer) {</div><div class='add'>+		ath12k_warn(ab, "failed to find the peer to del rx tid\n");</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (tid--; tid &gt;= 0; tid--)</div><div class='add'>+		ath12k_dp_rx_peer_tid_delete(ar, peer, tid);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_srng_cleanup(struct ath12k_base *ab, struct dp_srng *ring)</div><div class='add'>+{</div><div class='add'>+	if (!ring-&gt;vaddr_unaligned)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dma_free_coherent(ab-&gt;dev, ring-&gt;size, ring-&gt;vaddr_unaligned,</div><div class='add'>+			  ring-&gt;paddr_unaligned);</div><div class='add'>+</div><div class='add'>+	ring-&gt;vaddr_unaligned = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_srng_find_ring_in_mask(int ring_num, const u8 *grp_mask)</div><div class='add'>+{</div><div class='add'>+	int ext_group_num;</div><div class='add'>+	u8 mask = 1 &lt;&lt; ring_num;</div><div class='add'>+</div><div class='add'>+	for (ext_group_num = 0; ext_group_num &lt; ATH12K_EXT_IRQ_GRP_NUM_MAX;</div><div class='add'>+	     ext_group_num++) {</div><div class='add'>+		if (mask &amp; grp_mask[ext_group_num])</div><div class='add'>+			return ext_group_num;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_srng_calculate_msi_group(struct ath12k_base *ab,</div><div class='add'>+					      enum hal_ring_type type, int ring_num)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_hal_tcl_to_wbm_rbm_map *map;</div><div class='add'>+	const u8 *grp_mask;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case HAL_WBM2SW_RELEASE:</div><div class='add'>+		if (ring_num == HAL_WBM2SW_REL_ERR_RING_NUM) {</div><div class='add'>+			grp_mask = &amp;ab-&gt;hw_params-&gt;ring_mask-&gt;rx_wbm_rel[0];</div><div class='add'>+			ring_num = 0;</div><div class='add'>+		} else {</div><div class='add'>+			map = ab-&gt;hw_params-&gt;hal_ops-&gt;tcl_to_wbm_rbm_map;</div><div class='add'>+			for (i = 0; i &lt; ab-&gt;hw_params-&gt;max_tx_ring; i++) {</div><div class='add'>+				if (ring_num == map[i].wbm_ring_num) {</div><div class='add'>+					ring_num = i;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			grp_mask = &amp;ab-&gt;hw_params-&gt;ring_mask-&gt;tx[0];</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case HAL_REO_EXCEPTION:</div><div class='add'>+		grp_mask = &amp;ab-&gt;hw_params-&gt;ring_mask-&gt;rx_err[0];</div><div class='add'>+		break;</div><div class='add'>+	case HAL_REO_DST:</div><div class='add'>+		grp_mask = &amp;ab-&gt;hw_params-&gt;ring_mask-&gt;rx[0];</div><div class='add'>+		break;</div><div class='add'>+	case HAL_REO_STATUS:</div><div class='add'>+		grp_mask = &amp;ab-&gt;hw_params-&gt;ring_mask-&gt;reo_status[0];</div><div class='add'>+		break;</div><div class='add'>+	case HAL_RXDMA_MONITOR_STATUS:</div><div class='add'>+		grp_mask = &amp;ab-&gt;hw_params-&gt;ring_mask-&gt;rx_mon_status[0];</div><div class='add'>+		break;</div><div class='add'>+	case HAL_RXDMA_MONITOR_DST:</div><div class='add'>+		grp_mask = &amp;ab-&gt;hw_params-&gt;ring_mask-&gt;rx_mon_dest[0];</div><div class='add'>+		break;</div><div class='add'>+	case HAL_TX_MONITOR_DST:</div><div class='add'>+		grp_mask = &amp;ab-&gt;hw_params-&gt;ring_mask-&gt;tx_mon_dest[0];</div><div class='add'>+		break;</div><div class='add'>+	case HAL_RXDMA_BUF:</div><div class='add'>+		grp_mask = &amp;ab-&gt;hw_params-&gt;ring_mask-&gt;host2rxdma[0];</div><div class='add'>+		break;</div><div class='add'>+	case HAL_RXDMA_MONITOR_BUF:</div><div class='add'>+	case HAL_TCL_DATA:</div><div class='add'>+	case HAL_TCL_CMD:</div><div class='add'>+	case HAL_REO_CMD:</div><div class='add'>+	case HAL_SW2WBM_RELEASE:</div><div class='add'>+	case HAL_WBM_IDLE_LINK:</div><div class='add'>+	case HAL_TCL_STATUS:</div><div class='add'>+	case HAL_REO_REINJECT:</div><div class='add'>+	case HAL_CE_SRC:</div><div class='add'>+	case HAL_CE_DST:</div><div class='add'>+	case HAL_CE_DST_STATUS:</div><div class='add'>+	default:</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ath12k_dp_srng_find_ring_in_mask(ring_num, grp_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_srng_msi_setup(struct ath12k_base *ab,</div><div class='add'>+				     struct hal_srng_params *ring_params,</div><div class='add'>+				     enum hal_ring_type type, int ring_num)</div><div class='add'>+{</div><div class='add'>+	int msi_group_number, msi_data_count;</div><div class='add'>+	u32 msi_data_start, msi_irq_start, addr_lo, addr_hi;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_hif_get_user_msi_vector(ab, "DP",</div><div class='add'>+					     &amp;msi_data_count, &amp;msi_data_start,</div><div class='add'>+					     &amp;msi_irq_start);</div><div class='add'>+	if (ret)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	msi_group_number = ath12k_dp_srng_calculate_msi_group(ab, type,</div><div class='add'>+							      ring_num);</div><div class='add'>+	if (msi_group_number &lt; 0) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_PCI,</div><div class='add'>+			   "ring not part of an ext_group; ring_type: %d,ring_num %d",</div><div class='add'>+			   type, ring_num);</div><div class='add'>+		ring_params-&gt;msi_addr = 0;</div><div class='add'>+		ring_params-&gt;msi_data = 0;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (msi_group_number &gt; msi_data_count) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_PCI,</div><div class='add'>+			   "multiple msi_groups share one msi, msi_group_num %d",</div><div class='add'>+			   msi_group_number);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_hif_get_msi_address(ab, &amp;addr_lo, &amp;addr_hi);</div><div class='add'>+</div><div class='add'>+	ring_params-&gt;msi_addr = addr_lo;</div><div class='add'>+	ring_params-&gt;msi_addr |= (dma_addr_t)(((uint64_t)addr_hi) &lt;&lt; 32);</div><div class='add'>+	ring_params-&gt;msi_data = (msi_group_number % msi_data_count)</div><div class='add'>+		+ msi_data_start;</div><div class='add'>+	ring_params-&gt;flags |= HAL_SRNG_FLAGS_MSI_INTR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_srng_setup(struct ath12k_base *ab, struct dp_srng *ring,</div><div class='add'>+			 enum hal_ring_type type, int ring_num,</div><div class='add'>+			 int mac_id, int num_entries)</div><div class='add'>+{</div><div class='add'>+	struct hal_srng_params params = {};</div><div class='add'>+	int entry_sz = ath12k_hal_srng_get_entrysize(ab, type);</div><div class='add'>+	int max_entries = ath12k_hal_srng_get_max_entries(ab, type);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (max_entries &lt; 0 || entry_sz &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (num_entries &gt; max_entries)</div><div class='add'>+		num_entries = max_entries;</div><div class='add'>+</div><div class='add'>+	ring-&gt;size = (num_entries * entry_sz) + HAL_RING_BASE_ALIGN - 1;</div><div class='add'>+	ring-&gt;vaddr_unaligned = dma_alloc_coherent(ab-&gt;dev, ring-&gt;size,</div><div class='add'>+						   &amp;ring-&gt;paddr_unaligned,</div><div class='add'>+						   GFP_KERNEL);</div><div class='add'>+	if (!ring-&gt;vaddr_unaligned)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ring-&gt;vaddr = PTR_ALIGN(ring-&gt;vaddr_unaligned, HAL_RING_BASE_ALIGN);</div><div class='add'>+	ring-&gt;paddr = ring-&gt;paddr_unaligned + ((unsigned long)ring-&gt;vaddr -</div><div class='add'>+		      (unsigned long)ring-&gt;vaddr_unaligned);</div><div class='add'>+</div><div class='add'>+	params.ring_base_vaddr = ring-&gt;vaddr;</div><div class='add'>+	params.ring_base_paddr = ring-&gt;paddr;</div><div class='add'>+	params.num_entries = num_entries;</div><div class='add'>+	ath12k_dp_srng_msi_setup(ab, &amp;params, type, ring_num + mac_id);</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case HAL_REO_DST:</div><div class='add'>+		params.intr_batch_cntr_thres_entries =</div><div class='add'>+					HAL_SRNG_INT_BATCH_THRESHOLD_RX;</div><div class='add'>+		params.intr_timer_thres_us = HAL_SRNG_INT_TIMER_THRESHOLD_RX;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_RXDMA_BUF:</div><div class='add'>+	case HAL_RXDMA_MONITOR_BUF:</div><div class='add'>+		params.low_threshold = num_entries &gt;&gt; 3;</div><div class='add'>+		params.flags |= HAL_SRNG_FLAGS_LOW_THRESH_INTR_EN;</div><div class='add'>+		params.intr_batch_cntr_thres_entries = 0;</div><div class='add'>+		params.intr_timer_thres_us = HAL_SRNG_INT_TIMER_THRESHOLD_RX;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_RXDMA_MONITOR_STATUS:</div><div class='add'>+		params.low_threshold = num_entries &gt;&gt; 3;</div><div class='add'>+		params.flags |= HAL_SRNG_FLAGS_LOW_THRESH_INTR_EN;</div><div class='add'>+		params.intr_batch_cntr_thres_entries = 1;</div><div class='add'>+		params.intr_timer_thres_us = HAL_SRNG_INT_TIMER_THRESHOLD_RX;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_TX_MONITOR_DST:</div><div class='add'>+		params.low_threshold = DP_TX_MONITOR_BUF_SIZE_MAX &gt;&gt; 3;</div><div class='add'>+		params.flags |= HAL_SRNG_FLAGS_LOW_THRESH_INTR_EN;</div><div class='add'>+		params.intr_batch_cntr_thres_entries = 0;</div><div class='add'>+		params.intr_timer_thres_us = HAL_SRNG_INT_TIMER_THRESHOLD_RX;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_WBM2SW_RELEASE:</div><div class='add'>+		if (ab-&gt;hw_params-&gt;hw_ops-&gt;dp_srng_is_tx_comp_ring(ring_num)) {</div><div class='add'>+			params.intr_batch_cntr_thres_entries =</div><div class='add'>+					HAL_SRNG_INT_BATCH_THRESHOLD_TX;</div><div class='add'>+			params.intr_timer_thres_us =</div><div class='add'>+					HAL_SRNG_INT_TIMER_THRESHOLD_TX;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		/* follow through when ring_num != HAL_WBM2SW_REL_ERR_RING_NUM */</div><div class='add'>+		fallthrough;</div><div class='add'>+	case HAL_REO_EXCEPTION:</div><div class='add'>+	case HAL_REO_REINJECT:</div><div class='add'>+	case HAL_REO_CMD:</div><div class='add'>+	case HAL_REO_STATUS:</div><div class='add'>+	case HAL_TCL_DATA:</div><div class='add'>+	case HAL_TCL_CMD:</div><div class='add'>+	case HAL_TCL_STATUS:</div><div class='add'>+	case HAL_WBM_IDLE_LINK:</div><div class='add'>+	case HAL_SW2WBM_RELEASE:</div><div class='add'>+	case HAL_RXDMA_DST:</div><div class='add'>+	case HAL_RXDMA_MONITOR_DST:</div><div class='add'>+	case HAL_RXDMA_MONITOR_DESC:</div><div class='add'>+		params.intr_batch_cntr_thres_entries =</div><div class='add'>+					HAL_SRNG_INT_BATCH_THRESHOLD_OTHER;</div><div class='add'>+		params.intr_timer_thres_us = HAL_SRNG_INT_TIMER_THRESHOLD_OTHER;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_RXDMA_DIR_BUF:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_warn(ab, "Not a valid ring type in dp :%d\n", type);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_hal_srng_setup(ab, type, ring_num, mac_id, &amp;params);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_warn(ab, "failed to setup srng: %d ring_id %d\n",</div><div class='add'>+			    ret, ring_num);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ring-&gt;ring_id = ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+u32 ath12k_dp_tx_get_vdev_bank_config(struct ath12k_base *ab,</div><div class='add'>+				      struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	u32 bank_config = 0;</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+</div><div class='add'>+	/* Only valid for raw frames with HW crypto enabled.</div><div class='add'>+	 * With SW crypto, mac80211 sets key per packet</div><div class='add'>+	 */</div><div class='add'>+	if (ahvif-&gt;tx_encap_type == HAL_TCL_ENCAP_TYPE_RAW &amp;&amp;</div><div class='add'>+	    test_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED, &amp;ab-&gt;dev_flags))</div><div class='add'>+		bank_config |=</div><div class='add'>+			u32_encode_bits(ath12k_dp_tx_get_encrypt_type(ahvif-&gt;key_cipher),</div><div class='add'>+					HAL_TX_BANK_CONFIG_ENCRYPT_TYPE);</div><div class='add'>+</div><div class='add'>+	bank_config |= u32_encode_bits(ahvif-&gt;tx_encap_type,</div><div class='add'>+					HAL_TX_BANK_CONFIG_ENCAP_TYPE);</div><div class='add'>+	bank_config |= u32_encode_bits(0, HAL_TX_BANK_CONFIG_SRC_BUFFER_SWAP) |</div><div class='add'>+			u32_encode_bits(0, HAL_TX_BANK_CONFIG_LINK_META_SWAP) |</div><div class='add'>+			u32_encode_bits(0, HAL_TX_BANK_CONFIG_EPD);</div><div class='add'>+</div><div class='add'>+	/* only valid if idx_lookup_override is not set in tcl_data_cmd */</div><div class='add'>+	if (ahvif-&gt;vdev_type == WMI_VDEV_TYPE_STA)</div><div class='add'>+		bank_config |= u32_encode_bits(1, HAL_TX_BANK_CONFIG_INDEX_LOOKUP_EN);</div><div class='add'>+	else</div><div class='add'>+		bank_config |= u32_encode_bits(0, HAL_TX_BANK_CONFIG_INDEX_LOOKUP_EN);</div><div class='add'>+</div><div class='add'>+	bank_config |= u32_encode_bits(arvif-&gt;hal_addr_search_flags &amp; HAL_TX_ADDRX_EN,</div><div class='add'>+					HAL_TX_BANK_CONFIG_ADDRX_EN) |</div><div class='add'>+			u32_encode_bits(!!(arvif-&gt;hal_addr_search_flags &amp;</div><div class='add'>+					HAL_TX_ADDRY_EN),</div><div class='add'>+					HAL_TX_BANK_CONFIG_ADDRY_EN);</div><div class='add'>+</div><div class='add'>+	bank_config |= u32_encode_bits(ieee80211_vif_is_mesh(ahvif-&gt;vif) ? 3 : 0,</div><div class='add'>+					HAL_TX_BANK_CONFIG_MESH_EN) |</div><div class='add'>+			u32_encode_bits(arvif-&gt;vdev_id_check_en,</div><div class='add'>+					HAL_TX_BANK_CONFIG_VDEV_ID_CHECK_EN);</div><div class='add'>+</div><div class='add'>+	bank_config |= u32_encode_bits(0, HAL_TX_BANK_CONFIG_DSCP_TIP_MAP_ID);</div><div class='add'>+</div><div class='add'>+	return bank_config;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_tx_get_bank_profile(struct ath12k_base *ab,</div><div class='add'>+					 struct ath12k_link_vif *arvif,</div><div class='add'>+					 struct ath12k_dp *dp)</div><div class='add'>+{</div><div class='add'>+	int bank_id = DP_INVALID_BANK_ID;</div><div class='add'>+	int i;</div><div class='add'>+	u32 bank_config;</div><div class='add'>+	bool configure_register = false;</div><div class='add'>+</div><div class='add'>+	/* convert vdev params into hal_tx_bank_config */</div><div class='add'>+	bank_config = ath12k_dp_tx_get_vdev_bank_config(ab, arvif);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dp-&gt;tx_bank_lock);</div><div class='add'>+	/* TODO: implement using idr kernel framework*/</div><div class='add'>+	for (i = 0; i &lt; dp-&gt;num_bank_profiles; i++) {</div><div class='add'>+		if (dp-&gt;bank_profiles[i].is_configured &amp;&amp;</div><div class='add'>+		    (dp-&gt;bank_profiles[i].bank_config ^ bank_config) == 0) {</div><div class='add'>+			bank_id = i;</div><div class='add'>+			goto inc_ref_and_return;</div><div class='add'>+		}</div><div class='add'>+		if (!dp-&gt;bank_profiles[i].is_configured ||</div><div class='add'>+		    !dp-&gt;bank_profiles[i].num_users) {</div><div class='add'>+			bank_id = i;</div><div class='add'>+			goto configure_and_return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bank_id == DP_INVALID_BANK_ID) {</div><div class='add'>+		spin_unlock_bh(&amp;dp-&gt;tx_bank_lock);</div><div class='add'>+		ath12k_err(ab, "unable to find TX bank!");</div><div class='add'>+		return bank_id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+configure_and_return:</div><div class='add'>+	dp-&gt;bank_profiles[bank_id].is_configured = true;</div><div class='add'>+	dp-&gt;bank_profiles[bank_id].bank_config = bank_config;</div><div class='add'>+	configure_register = true;</div><div class='add'>+inc_ref_and_return:</div><div class='add'>+	dp-&gt;bank_profiles[bank_id].num_users++;</div><div class='add'>+	spin_unlock_bh(&amp;dp-&gt;tx_bank_lock);</div><div class='add'>+</div><div class='add'>+	if (configure_register)</div><div class='add'>+		ath12k_hal_tx_configure_bank_register(ab, bank_config, bank_id);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_DP_HTT, "dp_htt tcl bank_id %d input 0x%x match 0x%x num_users %u",</div><div class='add'>+		   bank_id, bank_config, dp-&gt;bank_profiles[bank_id].bank_config,</div><div class='add'>+		   dp-&gt;bank_profiles[bank_id].num_users);</div><div class='add'>+</div><div class='add'>+	return bank_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_tx_put_bank_profile(struct ath12k_dp *dp, u8 bank_id)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;dp-&gt;tx_bank_lock);</div><div class='add'>+	dp-&gt;bank_profiles[bank_id].num_users--;</div><div class='add'>+	spin_unlock_bh(&amp;dp-&gt;tx_bank_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_deinit_bank_profiles(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+</div><div class='add'>+	kfree(dp-&gt;bank_profiles);</div><div class='add'>+	dp-&gt;bank_profiles = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_init_bank_profiles(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	u32 num_tcl_banks = ab-&gt;hw_params-&gt;num_tcl_banks;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	dp-&gt;num_bank_profiles = num_tcl_banks;</div><div class='add'>+	dp-&gt;bank_profiles = kmalloc_array(num_tcl_banks,</div><div class='add'>+					  sizeof(struct ath12k_dp_tx_bank_profile),</div><div class='add'>+					  GFP_KERNEL);</div><div class='add'>+	if (!dp-&gt;bank_profiles)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;dp-&gt;tx_bank_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_tcl_banks; i++) {</div><div class='add'>+		dp-&gt;bank_profiles[i].is_configured = false;</div><div class='add'>+		dp-&gt;bank_profiles[i].num_users = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_srng_common_cleanup(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ath12k_dp_srng_cleanup(ab, &amp;dp-&gt;reo_status_ring);</div><div class='add'>+	ath12k_dp_srng_cleanup(ab, &amp;dp-&gt;reo_cmd_ring);</div><div class='add'>+	ath12k_dp_srng_cleanup(ab, &amp;dp-&gt;reo_except_ring);</div><div class='add'>+	ath12k_dp_srng_cleanup(ab, &amp;dp-&gt;rx_rel_ring);</div><div class='add'>+	ath12k_dp_srng_cleanup(ab, &amp;dp-&gt;reo_reinject_ring);</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;max_tx_ring; i++) {</div><div class='add'>+		ath12k_dp_srng_cleanup(ab, &amp;dp-&gt;tx_ring[i].tcl_comp_ring);</div><div class='add'>+		ath12k_dp_srng_cleanup(ab, &amp;dp-&gt;tx_ring[i].tcl_data_ring);</div><div class='add'>+	}</div><div class='add'>+	ath12k_dp_srng_cleanup(ab, &amp;dp-&gt;wbm_desc_rel_ring);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_srng_common_setup(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	const struct ath12k_hal_tcl_to_wbm_rbm_map *map;</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	int i, ret, tx_comp_ring_num;</div><div class='add'>+	u32 ring_hash_map;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_srng_setup(ab, &amp;dp-&gt;wbm_desc_rel_ring,</div><div class='add'>+				   HAL_SW2WBM_RELEASE, 0, 0,</div><div class='add'>+				   DP_WBM_RELEASE_RING_SIZE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to set up wbm2sw_release ring :%d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;max_tx_ring; i++) {</div><div class='add'>+		map = ab-&gt;hw_params-&gt;hal_ops-&gt;tcl_to_wbm_rbm_map;</div><div class='add'>+		tx_comp_ring_num = map[i].wbm_ring_num;</div><div class='add'>+</div><div class='add'>+		ret = ath12k_dp_srng_setup(ab, &amp;dp-&gt;tx_ring[i].tcl_data_ring,</div><div class='add'>+					   HAL_TCL_DATA, i, 0,</div><div class='add'>+					   DP_TCL_DATA_RING_SIZE);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to set up tcl_data ring (%d) :%d\n",</div><div class='add'>+				    i, ret);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ath12k_dp_srng_setup(ab, &amp;dp-&gt;tx_ring[i].tcl_comp_ring,</div><div class='add'>+					   HAL_WBM2SW_RELEASE, tx_comp_ring_num, 0,</div><div class='add'>+					   DP_TX_COMP_RING_SIZE(ab));</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to set up tcl_comp ring (%d) :%d\n",</div><div class='add'>+				    tx_comp_ring_num, ret);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_srng_setup(ab, &amp;dp-&gt;reo_reinject_ring, HAL_REO_REINJECT,</div><div class='add'>+				   0, 0, DP_REO_REINJECT_RING_SIZE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to set up reo_reinject ring :%d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_srng_setup(ab, &amp;dp-&gt;rx_rel_ring, HAL_WBM2SW_RELEASE,</div><div class='add'>+				   HAL_WBM2SW_REL_ERR_RING_NUM, 0,</div><div class='add'>+				   DP_RX_RELEASE_RING_SIZE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to set up rx_rel ring :%d\n", ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_srng_setup(ab, &amp;dp-&gt;reo_except_ring, HAL_REO_EXCEPTION,</div><div class='add'>+				   0, 0, DP_REO_EXCEPTION_RING_SIZE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to set up reo_exception ring :%d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_srng_setup(ab, &amp;dp-&gt;reo_cmd_ring, HAL_REO_CMD,</div><div class='add'>+				   0, 0, DP_REO_CMD_RING_SIZE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to set up reo_cmd ring :%d\n", ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	srng = &amp;ab-&gt;hal.srng_list[dp-&gt;reo_cmd_ring.ring_id];</div><div class='add'>+	ath12k_hal_reo_init_cmd_ring(ab, srng);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_srng_setup(ab, &amp;dp-&gt;reo_status_ring, HAL_REO_STATUS,</div><div class='add'>+				   0, 0, DP_REO_STATUS_RING_SIZE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to set up reo_status ring :%d\n", ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* When hash based routing of rx packet is enabled, 32 entries to map</div><div class='add'>+	 * the hash values to the ring will be configured. Each hash entry uses</div><div class='add'>+	 * four bits to map to a particular ring. The ring mapping will be</div><div class='add'>+	 * 0:TCL, 1:SW1, 2:SW2, 3:SW3, 4:SW4, 5:Release, 6:FW and 7:SW5</div><div class='add'>+	 * 8:SW6, 9:SW7, 10:SW8, 11:Not used.</div><div class='add'>+	 */</div><div class='add'>+	ring_hash_map = HAL_HASH_ROUTING_RING_SW1 |</div><div class='add'>+			HAL_HASH_ROUTING_RING_SW2 &lt;&lt; 4 |</div><div class='add'>+			HAL_HASH_ROUTING_RING_SW3 &lt;&lt; 8 |</div><div class='add'>+			HAL_HASH_ROUTING_RING_SW4 &lt;&lt; 12 |</div><div class='add'>+			HAL_HASH_ROUTING_RING_SW1 &lt;&lt; 16 |</div><div class='add'>+			HAL_HASH_ROUTING_RING_SW2 &lt;&lt; 20 |</div><div class='add'>+			HAL_HASH_ROUTING_RING_SW3 &lt;&lt; 24 |</div><div class='add'>+			HAL_HASH_ROUTING_RING_SW4 &lt;&lt; 28;</div><div class='add'>+</div><div class='add'>+	ath12k_hal_reo_hw_setup(ab, ring_hash_map);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	ath12k_dp_srng_common_cleanup(ab);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_scatter_idle_link_desc_cleanup(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct hal_wbm_idle_scatter_list *slist = dp-&gt;scatter_list;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DP_IDLE_SCATTER_BUFS_MAX; i++) {</div><div class='add'>+		if (!slist[i].vaddr)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dma_free_coherent(ab-&gt;dev, HAL_WBM_IDLE_SCATTER_BUF_SIZE_MAX,</div><div class='add'>+				  slist[i].vaddr, slist[i].paddr);</div><div class='add'>+		slist[i].vaddr = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_scatter_idle_link_desc_setup(struct ath12k_base *ab,</div><div class='add'>+						  int size,</div><div class='add'>+						  u32 n_link_desc_bank,</div><div class='add'>+						  u32 n_link_desc,</div><div class='add'>+						  u32 last_bank_sz)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct dp_link_desc_bank *link_desc_banks = dp-&gt;link_desc_banks;</div><div class='add'>+	struct hal_wbm_idle_scatter_list *slist = dp-&gt;scatter_list;</div><div class='add'>+	u32 n_entries_per_buf;</div><div class='add'>+	int num_scatter_buf, scatter_idx;</div><div class='add'>+	struct hal_wbm_link_desc *scatter_buf;</div><div class='add'>+	int align_bytes, n_entries;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	int rem_entries;</div><div class='add'>+	int i;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u32 end_offset, cookie;</div><div class='add'>+	enum hal_rx_buf_return_buf_manager rbm = dp-&gt;idle_link_rbm;</div><div class='add'>+</div><div class='add'>+	n_entries_per_buf = HAL_WBM_IDLE_SCATTER_BUF_SIZE /</div><div class='add'>+		ath12k_hal_srng_get_entrysize(ab, HAL_WBM_IDLE_LINK);</div><div class='add'>+	num_scatter_buf = DIV_ROUND_UP(size, HAL_WBM_IDLE_SCATTER_BUF_SIZE);</div><div class='add'>+</div><div class='add'>+	if (num_scatter_buf &gt; DP_IDLE_SCATTER_BUFS_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_scatter_buf; i++) {</div><div class='add'>+		slist[i].vaddr = dma_alloc_coherent(ab-&gt;dev,</div><div class='add'>+						    HAL_WBM_IDLE_SCATTER_BUF_SIZE_MAX,</div><div class='add'>+						    &amp;slist[i].paddr, GFP_KERNEL);</div><div class='add'>+		if (!slist[i].vaddr) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	scatter_idx = 0;</div><div class='add'>+	scatter_buf = slist[scatter_idx].vaddr;</div><div class='add'>+	rem_entries = n_entries_per_buf;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n_link_desc_bank; i++) {</div><div class='add'>+		align_bytes = link_desc_banks[i].vaddr -</div><div class='add'>+			      link_desc_banks[i].vaddr_unaligned;</div><div class='add'>+		n_entries = (DP_LINK_DESC_ALLOC_SIZE_THRESH - align_bytes) /</div><div class='add'>+			     HAL_LINK_DESC_SIZE;</div><div class='add'>+		paddr = link_desc_banks[i].paddr;</div><div class='add'>+		while (n_entries) {</div><div class='add'>+			cookie = DP_LINK_DESC_COOKIE_SET(n_entries, i);</div><div class='add'>+			ath12k_hal_set_link_desc_addr(scatter_buf, cookie,</div><div class='add'>+						      paddr, rbm);</div><div class='add'>+			n_entries--;</div><div class='add'>+			paddr += HAL_LINK_DESC_SIZE;</div><div class='add'>+			if (rem_entries) {</div><div class='add'>+				rem_entries--;</div><div class='add'>+				scatter_buf++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			rem_entries = n_entries_per_buf;</div><div class='add'>+			scatter_idx++;</div><div class='add'>+			scatter_buf = slist[scatter_idx].vaddr;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	end_offset = (scatter_buf - slist[scatter_idx].vaddr) *</div><div class='add'>+		     sizeof(struct hal_wbm_link_desc);</div><div class='add'>+	ath12k_hal_setup_link_idle_list(ab, slist, num_scatter_buf,</div><div class='add'>+					n_link_desc, end_offset);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	ath12k_dp_scatter_idle_link_desc_cleanup(ab);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_link_desc_bank_free(struct ath12k_base *ab,</div><div class='add'>+			      struct dp_link_desc_bank *link_desc_banks)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DP_LINK_DESC_BANKS_MAX; i++) {</div><div class='add'>+		if (link_desc_banks[i].vaddr_unaligned) {</div><div class='add'>+			dma_free_coherent(ab-&gt;dev,</div><div class='add'>+					  link_desc_banks[i].size,</div><div class='add'>+					  link_desc_banks[i].vaddr_unaligned,</div><div class='add'>+					  link_desc_banks[i].paddr_unaligned);</div><div class='add'>+			link_desc_banks[i].vaddr_unaligned = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_link_desc_bank_alloc(struct ath12k_base *ab,</div><div class='add'>+					  struct dp_link_desc_bank *desc_bank,</div><div class='add'>+					  int n_link_desc_bank,</div><div class='add'>+					  int last_bank_sz)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	int i;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int desc_sz = DP_LINK_DESC_ALLOC_SIZE_THRESH;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n_link_desc_bank; i++) {</div><div class='add'>+		if (i == (n_link_desc_bank - 1) &amp;&amp; last_bank_sz)</div><div class='add'>+			desc_sz = last_bank_sz;</div><div class='add'>+</div><div class='add'>+		desc_bank[i].vaddr_unaligned =</div><div class='add'>+					dma_alloc_coherent(ab-&gt;dev, desc_sz,</div><div class='add'>+							   &amp;desc_bank[i].paddr_unaligned,</div><div class='add'>+							   GFP_KERNEL);</div><div class='add'>+		if (!desc_bank[i].vaddr_unaligned) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		desc_bank[i].vaddr = PTR_ALIGN(desc_bank[i].vaddr_unaligned,</div><div class='add'>+					       HAL_LINK_DESC_ALIGN);</div><div class='add'>+		desc_bank[i].paddr = desc_bank[i].paddr_unaligned +</div><div class='add'>+				     ((unsigned long)desc_bank[i].vaddr -</div><div class='add'>+				      (unsigned long)desc_bank[i].vaddr_unaligned);</div><div class='add'>+		desc_bank[i].size = desc_sz;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	ath12k_dp_link_desc_bank_free(ab, dp-&gt;link_desc_banks);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_link_desc_cleanup(struct ath12k_base *ab,</div><div class='add'>+				 struct dp_link_desc_bank *desc_bank,</div><div class='add'>+				 u32 ring_type, struct dp_srng *ring)</div><div class='add'>+{</div><div class='add'>+	ath12k_dp_link_desc_bank_free(ab, desc_bank);</div><div class='add'>+</div><div class='add'>+	if (ring_type != HAL_RXDMA_MONITOR_DESC) {</div><div class='add'>+		ath12k_dp_srng_cleanup(ab, ring);</div><div class='add'>+		ath12k_dp_scatter_idle_link_desc_cleanup(ab);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wbm_idle_ring_setup(struct ath12k_base *ab, u32 *n_link_desc)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	u32 n_mpdu_link_desc, n_mpdu_queue_desc;</div><div class='add'>+	u32 n_tx_msdu_link_desc, n_rx_msdu_link_desc;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	n_mpdu_link_desc = (DP_NUM_TIDS_MAX * DP_AVG_MPDUS_PER_TID_MAX) /</div><div class='add'>+			   HAL_NUM_MPDUS_PER_LINK_DESC;</div><div class='add'>+</div><div class='add'>+	n_mpdu_queue_desc = n_mpdu_link_desc /</div><div class='add'>+			    HAL_NUM_MPDU_LINKS_PER_QUEUE_DESC;</div><div class='add'>+</div><div class='add'>+	n_tx_msdu_link_desc = (DP_NUM_TIDS_MAX * DP_AVG_FLOWS_PER_TID *</div><div class='add'>+			       DP_AVG_MSDUS_PER_FLOW) /</div><div class='add'>+			      HAL_NUM_TX_MSDUS_PER_LINK_DESC;</div><div class='add'>+</div><div class='add'>+	n_rx_msdu_link_desc = (DP_NUM_TIDS_MAX * DP_AVG_MPDUS_PER_TID_MAX *</div><div class='add'>+			       DP_AVG_MSDUS_PER_MPDU) /</div><div class='add'>+			      HAL_NUM_RX_MSDUS_PER_LINK_DESC;</div><div class='add'>+</div><div class='add'>+	*n_link_desc = n_mpdu_link_desc + n_mpdu_queue_desc +</div><div class='add'>+		      n_tx_msdu_link_desc + n_rx_msdu_link_desc;</div><div class='add'>+</div><div class='add'>+	if (*n_link_desc &amp; (*n_link_desc - 1))</div><div class='add'>+		*n_link_desc = 1 &lt;&lt; fls(*n_link_desc);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_srng_setup(ab, &amp;dp-&gt;wbm_idle_ring,</div><div class='add'>+				   HAL_WBM_IDLE_LINK, 0, 0, *n_link_desc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to setup wbm_idle_ring: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_link_desc_setup(struct ath12k_base *ab,</div><div class='add'>+			      struct dp_link_desc_bank *link_desc_banks,</div><div class='add'>+			      u32 ring_type, struct hal_srng *srng,</div><div class='add'>+			      u32 n_link_desc)</div><div class='add'>+{</div><div class='add'>+	u32 tot_mem_sz;</div><div class='add'>+	u32 n_link_desc_bank, last_bank_sz;</div><div class='add'>+	u32 entry_sz, align_bytes, n_entries;</div><div class='add'>+	struct hal_wbm_link_desc *desc;</div><div class='add'>+	u32 paddr;</div><div class='add'>+	int i, ret;</div><div class='add'>+	u32 cookie;</div><div class='add'>+	enum hal_rx_buf_return_buf_manager rbm = ab-&gt;dp.idle_link_rbm;</div><div class='add'>+</div><div class='add'>+	tot_mem_sz = n_link_desc * HAL_LINK_DESC_SIZE;</div><div class='add'>+	tot_mem_sz += HAL_LINK_DESC_ALIGN;</div><div class='add'>+</div><div class='add'>+	if (tot_mem_sz &lt;= DP_LINK_DESC_ALLOC_SIZE_THRESH) {</div><div class='add'>+		n_link_desc_bank = 1;</div><div class='add'>+		last_bank_sz = tot_mem_sz;</div><div class='add'>+	} else {</div><div class='add'>+		n_link_desc_bank = tot_mem_sz /</div><div class='add'>+				   (DP_LINK_DESC_ALLOC_SIZE_THRESH -</div><div class='add'>+				    HAL_LINK_DESC_ALIGN);</div><div class='add'>+		last_bank_sz = tot_mem_sz %</div><div class='add'>+			       (DP_LINK_DESC_ALLOC_SIZE_THRESH -</div><div class='add'>+				HAL_LINK_DESC_ALIGN);</div><div class='add'>+</div><div class='add'>+		if (last_bank_sz)</div><div class='add'>+			n_link_desc_bank += 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (n_link_desc_bank &gt; DP_LINK_DESC_BANKS_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_link_desc_bank_alloc(ab, link_desc_banks,</div><div class='add'>+					     n_link_desc_bank, last_bank_sz);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Setup link desc idle list for HW internal usage */</div><div class='add'>+	entry_sz = ath12k_hal_srng_get_entrysize(ab, ring_type);</div><div class='add'>+	tot_mem_sz = entry_sz * n_link_desc;</div><div class='add'>+</div><div class='add'>+	/* Setup scatter desc list when the total memory requirement is more */</div><div class='add'>+	if (tot_mem_sz &gt; DP_LINK_DESC_ALLOC_SIZE_THRESH &amp;&amp;</div><div class='add'>+	    ring_type != HAL_RXDMA_MONITOR_DESC) {</div><div class='add'>+		ret = ath12k_dp_scatter_idle_link_desc_setup(ab, tot_mem_sz,</div><div class='add'>+							     n_link_desc_bank,</div><div class='add'>+							     n_link_desc,</div><div class='add'>+							     last_bank_sz);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to setup scatting idle list descriptor :%d\n",</div><div class='add'>+				    ret);</div><div class='add'>+			goto fail_desc_bank_free;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_begin(ab, srng);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n_link_desc_bank; i++) {</div><div class='add'>+		align_bytes = link_desc_banks[i].vaddr -</div><div class='add'>+			      link_desc_banks[i].vaddr_unaligned;</div><div class='add'>+		n_entries = (link_desc_banks[i].size - align_bytes) /</div><div class='add'>+			    HAL_LINK_DESC_SIZE;</div><div class='add'>+		paddr = link_desc_banks[i].paddr;</div><div class='add'>+		while (n_entries &amp;&amp;</div><div class='add'>+		       (desc = ath12k_hal_srng_src_get_next_entry(ab, srng))) {</div><div class='add'>+			cookie = DP_LINK_DESC_COOKIE_SET(n_entries, i);</div><div class='add'>+			ath12k_hal_set_link_desc_addr(desc, cookie, paddr, rbm);</div><div class='add'>+			n_entries--;</div><div class='add'>+			paddr += HAL_LINK_DESC_SIZE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail_desc_bank_free:</div><div class='add'>+	ath12k_dp_link_desc_bank_free(ab, link_desc_banks);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_service_srng(struct ath12k_base *ab,</div><div class='add'>+			   struct ath12k_ext_irq_grp *irq_grp,</div><div class='add'>+			   int budget)</div><div class='add'>+{</div><div class='add'>+	struct napi_struct *napi = &amp;irq_grp-&gt;napi;</div><div class='add'>+	int grp_id = irq_grp-&gt;grp_id;</div><div class='add'>+	int work_done = 0;</div><div class='add'>+	int i = 0, j;</div><div class='add'>+	int tot_work_done = 0;</div><div class='add'>+	enum dp_monitor_mode monitor_mode;</div><div class='add'>+	u8 ring_mask;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;ring_mask-&gt;tx[grp_id]) {</div><div class='add'>+		i = fls(ab-&gt;hw_params-&gt;ring_mask-&gt;tx[grp_id]) - 1;</div><div class='add'>+		ath12k_dp_tx_completion_handler(ab, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;ring_mask-&gt;rx_err[grp_id]) {</div><div class='add'>+		work_done = ath12k_dp_rx_process_err(ab, napi, budget);</div><div class='add'>+		budget -= work_done;</div><div class='add'>+		tot_work_done += work_done;</div><div class='add'>+		if (budget &lt;= 0)</div><div class='add'>+			goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;ring_mask-&gt;rx_wbm_rel[grp_id]) {</div><div class='add'>+		work_done = ath12k_dp_rx_process_wbm_err(ab,</div><div class='add'>+							 napi,</div><div class='add'>+							 budget);</div><div class='add'>+		budget -= work_done;</div><div class='add'>+		tot_work_done += work_done;</div><div class='add'>+</div><div class='add'>+		if (budget &lt;= 0)</div><div class='add'>+			goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;ring_mask-&gt;rx[grp_id]) {</div><div class='add'>+		i = fls(ab-&gt;hw_params-&gt;ring_mask-&gt;rx[grp_id]) - 1;</div><div class='add'>+		work_done = ath12k_dp_rx_process(ab, i, napi,</div><div class='add'>+						 budget);</div><div class='add'>+		budget -= work_done;</div><div class='add'>+		tot_work_done += work_done;</div><div class='add'>+		if (budget &lt;= 0)</div><div class='add'>+			goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;ring_mask-&gt;rx_mon_status[grp_id]) {</div><div class='add'>+		ring_mask = ab-&gt;hw_params-&gt;ring_mask-&gt;rx_mon_status[grp_id];</div><div class='add'>+		for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+			for (j = 0; j &lt; ab-&gt;hw_params-&gt;num_rxdma_per_pdev; j++) {</div><div class='add'>+				int id = i * ab-&gt;hw_params-&gt;num_rxdma_per_pdev + j;</div><div class='add'>+</div><div class='add'>+				if (ring_mask &amp; BIT(id)) {</div><div class='add'>+					work_done =</div><div class='add'>+					ath12k_dp_mon_process_ring(ab, id, napi, budget,</div><div class='add'>+								   0);</div><div class='add'>+					budget -= work_done;</div><div class='add'>+					tot_work_done += work_done;</div><div class='add'>+					if (budget &lt;= 0)</div><div class='add'>+						goto done;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;ring_mask-&gt;rx_mon_dest[grp_id]) {</div><div class='add'>+		monitor_mode = ATH12K_DP_RX_MONITOR_MODE;</div><div class='add'>+		ring_mask = ab-&gt;hw_params-&gt;ring_mask-&gt;rx_mon_dest[grp_id];</div><div class='add'>+		for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+			for (j = 0; j &lt; ab-&gt;hw_params-&gt;num_rxdma_per_pdev; j++) {</div><div class='add'>+				int id = i * ab-&gt;hw_params-&gt;num_rxdma_per_pdev + j;</div><div class='add'>+</div><div class='add'>+				if (ring_mask &amp; BIT(id)) {</div><div class='add'>+					work_done =</div><div class='add'>+					ath12k_dp_mon_process_ring(ab, id, napi, budget,</div><div class='add'>+								   monitor_mode);</div><div class='add'>+					budget -= work_done;</div><div class='add'>+					tot_work_done += work_done;</div><div class='add'>+</div><div class='add'>+					if (budget &lt;= 0)</div><div class='add'>+						goto done;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;ring_mask-&gt;tx_mon_dest[grp_id]) {</div><div class='add'>+		monitor_mode = ATH12K_DP_TX_MONITOR_MODE;</div><div class='add'>+		ring_mask = ab-&gt;hw_params-&gt;ring_mask-&gt;tx_mon_dest[grp_id];</div><div class='add'>+		for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+			for (j = 0; j &lt; ab-&gt;hw_params-&gt;num_rxdma_per_pdev; j++) {</div><div class='add'>+				int id = i * ab-&gt;hw_params-&gt;num_rxdma_per_pdev + j;</div><div class='add'>+</div><div class='add'>+				if (ring_mask &amp; BIT(id)) {</div><div class='add'>+					work_done =</div><div class='add'>+					ath12k_dp_mon_process_ring(ab, id, napi, budget,</div><div class='add'>+								   monitor_mode);</div><div class='add'>+					budget -= work_done;</div><div class='add'>+					tot_work_done += work_done;</div><div class='add'>+</div><div class='add'>+					if (budget &lt;= 0)</div><div class='add'>+						goto done;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;ring_mask-&gt;reo_status[grp_id])</div><div class='add'>+		ath12k_dp_rx_process_reo_status(ab);</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;ring_mask-&gt;host2rxdma[grp_id]) {</div><div class='add'>+		struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+		struct dp_rxdma_ring *rx_ring = &amp;dp-&gt;rx_refill_buf_ring;</div><div class='add'>+		LIST_HEAD(list);</div><div class='add'>+</div><div class='add'>+		ath12k_dp_rx_bufs_replenish(ab, rx_ring, &amp;list, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TODO: Implement handler for other interrupts */</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	return tot_work_done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_pdev_free(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++)</div><div class='add'>+		ath12k_dp_rx_pdev_free(ab, i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_pdev_pre_alloc(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pdev_dp *dp = &amp;ar-&gt;dp;</div><div class='add'>+</div><div class='add'>+	dp-&gt;mac_id = ar-&gt;pdev_idx;</div><div class='add'>+	atomic_set(&amp;dp-&gt;num_tx_pending, 0);</div><div class='add'>+	init_waitqueue_head(&amp;dp-&gt;tx_empty_waitq);</div><div class='add'>+	/* TODO: Add any RXDMA setup required per pdev */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool ath12k_dp_wmask_compaction_rx_tlv_supported(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_WMSK_COMPACTION_RX_TLVS, ab-&gt;wmi_ab.svc_map) &amp;&amp;</div><div class='add'>+	    ab-&gt;hw_params-&gt;hal_ops-&gt;rxdma_ring_wmask_rx_mpdu_start &amp;&amp;</div><div class='add'>+	    ab-&gt;hw_params-&gt;hal_ops-&gt;rxdma_ring_wmask_rx_msdu_end &amp;&amp;</div><div class='add'>+	    ab-&gt;hw_params-&gt;hal_ops-&gt;get_hal_rx_compact_ops) {</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_hal_rx_desc_init(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	if (ath12k_dp_wmask_compaction_rx_tlv_supported(ab)) {</div><div class='add'>+		/* RX TLVS compaction is supported, hence change the hal_rx_ops</div><div class='add'>+		 * to compact hal_rx_ops.</div><div class='add'>+		 */</div><div class='add'>+		ab-&gt;hal_rx_ops = ab-&gt;hw_params-&gt;hal_ops-&gt;get_hal_rx_compact_ops();</div><div class='add'>+	}</div><div class='add'>+	ab-&gt;hal.hal_desc_sz =</div><div class='add'>+		ab-&gt;hal_rx_ops-&gt;rx_desc_get_desc_size();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_pdev_alloc(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_rx_htt_setup(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* TODO: Per-pdev rx ring unlike tx ring which is mapped to different AC's */</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		ar = ab-&gt;pdevs[i].ar;</div><div class='add'>+		ret = ath12k_dp_rx_pdev_alloc(ab, i);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to allocate pdev rx for pdev_id :%d\n",</div><div class='add'>+				    i);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+		ret = ath12k_dp_rx_pdev_mon_attach(ar);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to initialize mon pdev %d\n", i);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	ath12k_dp_pdev_free(ab);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_htt_connect(struct ath12k_dp *dp)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_htc_svc_conn_req conn_req = {};</div><div class='add'>+	struct ath12k_htc_svc_conn_resp conn_resp = {};</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	conn_req.ep_ops.ep_tx_complete = ath12k_dp_htt_htc_tx_complete;</div><div class='add'>+	conn_req.ep_ops.ep_rx_complete = ath12k_dp_htt_htc_t2h_msg_handler;</div><div class='add'>+</div><div class='add'>+	/* connect to control service */</div><div class='add'>+	conn_req.service_id = ATH12K_HTC_SVC_ID_HTT_DATA_MSG;</div><div class='add'>+</div><div class='add'>+	status = ath12k_htc_connect_service(&amp;dp-&gt;ab-&gt;htc, &amp;conn_req,</div><div class='add'>+					    &amp;conn_resp);</div><div class='add'>+</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	dp-&gt;eid = conn_resp.eid;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_update_vdev_search(struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	switch (arvif-&gt;ahvif-&gt;vdev_type) {</div><div class='add'>+	case WMI_VDEV_TYPE_STA:</div><div class='add'>+		arvif-&gt;hal_addr_search_flags = HAL_TX_ADDRY_EN;</div><div class='add'>+		arvif-&gt;search_type = HAL_TX_ADDR_SEARCH_INDEX;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_VDEV_TYPE_AP:</div><div class='add'>+	case WMI_VDEV_TYPE_IBSS:</div><div class='add'>+		arvif-&gt;hal_addr_search_flags = HAL_TX_ADDRX_EN;</div><div class='add'>+		arvif-&gt;search_type = HAL_TX_ADDR_SEARCH_DEFAULT;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_VDEV_TYPE_MONITOR:</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_vdev_tx_attach(struct ath12k *ar, struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+</div><div class='add'>+	arvif-&gt;tcl_metadata |= u32_encode_bits(1, HTT_TCL_META_DATA_TYPE) |</div><div class='add'>+			       u32_encode_bits(arvif-&gt;vdev_id,</div><div class='add'>+					       HTT_TCL_META_DATA_VDEV_ID) |</div><div class='add'>+			       u32_encode_bits(ar-&gt;pdev-&gt;pdev_id,</div><div class='add'>+					       HTT_TCL_META_DATA_PDEV_ID);</div><div class='add'>+</div><div class='add'>+	/* set HTT extension valid bit to 0 by default */</div><div class='add'>+	arvif-&gt;tcl_metadata &amp;= ~HTT_TCL_META_DATA_VALID_HTT;</div><div class='add'>+</div><div class='add'>+	ath12k_dp_update_vdev_search(arvif);</div><div class='add'>+	arvif-&gt;vdev_id_check_en = true;</div><div class='add'>+	arvif-&gt;bank_id = ath12k_dp_tx_get_bank_profile(ab, arvif, &amp;ab-&gt;dp);</div><div class='add'>+</div><div class='add'>+	/* TODO: error path for bank id failure */</div><div class='add'>+	if (arvif-&gt;bank_id == DP_INVALID_BANK_ID) {</div><div class='add'>+		ath12k_err(ar-&gt;ab, "Failed to initialize DP TX Banks");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_cc_cleanup(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_rx_desc_info *desc_info;</div><div class='add'>+	struct ath12k_tx_desc_info *tx_desc_info, *tmp1;</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct ath12k_skb_cb *skb_cb;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int i, j;</div><div class='add'>+	u32 pool_id, tx_spt_page;</div><div class='add'>+</div><div class='add'>+	if (!dp-&gt;spt_info)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* RX Descriptor cleanup */</div><div class='add'>+	spin_lock_bh(&amp;dp-&gt;rx_desc_lock);</div><div class='add'>+</div><div class='add'>+	if (dp-&gt;rxbaddr) {</div><div class='add'>+		for (i = 0; i &lt; ATH12K_NUM_RX_SPT_PAGES(ab); i++) {</div><div class='add'>+			if (!dp-&gt;rxbaddr[i])</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			desc_info = dp-&gt;rxbaddr[i];</div><div class='add'>+</div><div class='add'>+			for (j = 0; j &lt; ATH12K_MAX_SPT_ENTRIES; j++) {</div><div class='add'>+				if (!desc_info[j].in_use) {</div><div class='add'>+					list_del(&amp;desc_info[j].list);</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				skb = desc_info[j].skb;</div><div class='add'>+				if (!skb)</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				dma_unmap_single(ab-&gt;dev,</div><div class='add'>+						 ATH12K_SKB_RXCB(skb)-&gt;paddr,</div><div class='add'>+						 skb-&gt;len + skb_tailroom(skb),</div><div class='add'>+						 DMA_FROM_DEVICE);</div><div class='add'>+				dev_kfree_skb_any(skb);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			kfree(dp-&gt;rxbaddr[i]);</div><div class='add'>+			dp-&gt;rxbaddr[i] = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		kfree(dp-&gt;rxbaddr);</div><div class='add'>+		dp-&gt;rxbaddr = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;dp-&gt;rx_desc_lock);</div><div class='add'>+</div><div class='add'>+	/* TX Descriptor cleanup */</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HW_MAX_QUEUES; i++) {</div><div class='add'>+		spin_lock_bh(&amp;dp-&gt;tx_desc_lock[i]);</div><div class='add'>+</div><div class='add'>+		list_for_each_entry_safe(tx_desc_info, tmp1,</div><div class='add'>+					 &amp;dp-&gt;tx_desc_used_list[i], list) {</div><div class='add'>+			list_del(&amp;tx_desc_info-&gt;list);</div><div class='add'>+			skb = tx_desc_info-&gt;skb;</div><div class='add'>+</div><div class='add'>+			if (!skb)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			skb_cb = ATH12K_SKB_CB(skb);</div><div class='add'>+			if (skb_cb-&gt;paddr_ext_desc) {</div><div class='add'>+				dma_unmap_single(ab-&gt;dev,</div><div class='add'>+						 skb_cb-&gt;paddr_ext_desc,</div><div class='add'>+						 tx_desc_info-&gt;skb_ext_desc-&gt;len,</div><div class='add'>+						 DMA_TO_DEVICE);</div><div class='add'>+				dev_kfree_skb_any(tx_desc_info-&gt;skb_ext_desc);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* if we are unregistering, hw would've been destroyed and</div><div class='add'>+			 * ar is no longer valid.</div><div class='add'>+			 */</div><div class='add'>+			if (!(test_bit(ATH12K_FLAG_UNREGISTERING, &amp;ab-&gt;dev_flags))) {</div><div class='add'>+				ar = skb_cb-&gt;ar;</div><div class='add'>+</div><div class='add'>+				if (atomic_dec_and_test(&amp;ar-&gt;dp.num_tx_pending))</div><div class='add'>+					wake_up(&amp;ar-&gt;dp.tx_empty_waitq);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			dma_unmap_single(ab-&gt;dev, ATH12K_SKB_CB(skb)-&gt;paddr,</div><div class='add'>+					 skb-&gt;len, DMA_TO_DEVICE);</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_unlock_bh(&amp;dp-&gt;tx_desc_lock[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dp-&gt;txbaddr) {</div><div class='add'>+		for (pool_id = 0; pool_id &lt; ATH12K_HW_MAX_QUEUES; pool_id++) {</div><div class='add'>+			spin_lock_bh(&amp;dp-&gt;tx_desc_lock[pool_id]);</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; ATH12K_TX_SPT_PAGES_PER_POOL(ab); i++) {</div><div class='add'>+				tx_spt_page = i + pool_id *</div><div class='add'>+					      ATH12K_TX_SPT_PAGES_PER_POOL(ab);</div><div class='add'>+				if (!dp-&gt;txbaddr[tx_spt_page])</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				kfree(dp-&gt;txbaddr[tx_spt_page]);</div><div class='add'>+				dp-&gt;txbaddr[tx_spt_page] = NULL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			spin_unlock_bh(&amp;dp-&gt;tx_desc_lock[pool_id]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		kfree(dp-&gt;txbaddr);</div><div class='add'>+		dp-&gt;txbaddr = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* unmap SPT pages */</div><div class='add'>+	for (i = 0; i &lt; dp-&gt;num_spt_pages; i++) {</div><div class='add'>+		if (!dp-&gt;spt_info[i].vaddr)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dma_free_coherent(ab-&gt;dev, ATH12K_PAGE_SIZE,</div><div class='add'>+				  dp-&gt;spt_info[i].vaddr, dp-&gt;spt_info[i].paddr);</div><div class='add'>+		dp-&gt;spt_info[i].vaddr = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(dp-&gt;spt_info);</div><div class='add'>+	dp-&gt;spt_info = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_reoq_lut_cleanup(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;hw_params-&gt;reoq_lut_support)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (dp-&gt;reoq_lut.vaddr_unaligned) {</div><div class='add'>+		ath12k_hif_write32(ab,</div><div class='add'>+				   HAL_SEQ_WCSS_UMAC_REO_REG +</div><div class='add'>+				   HAL_REO1_QDESC_LUT_BASE0(ab), 0);</div><div class='add'>+		dma_free_coherent(ab-&gt;dev, dp-&gt;reoq_lut.size,</div><div class='add'>+				  dp-&gt;reoq_lut.vaddr_unaligned,</div><div class='add'>+				  dp-&gt;reoq_lut.paddr_unaligned);</div><div class='add'>+		dp-&gt;reoq_lut.vaddr_unaligned = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dp-&gt;ml_reoq_lut.vaddr_unaligned) {</div><div class='add'>+		ath12k_hif_write32(ab,</div><div class='add'>+				   HAL_SEQ_WCSS_UMAC_REO_REG +</div><div class='add'>+				   HAL_REO1_QDESC_LUT_BASE1(ab), 0);</div><div class='add'>+		dma_free_coherent(ab-&gt;dev, dp-&gt;ml_reoq_lut.size,</div><div class='add'>+				  dp-&gt;ml_reoq_lut.vaddr_unaligned,</div><div class='add'>+				  dp-&gt;ml_reoq_lut.paddr_unaligned);</div><div class='add'>+		dp-&gt;ml_reoq_lut.vaddr_unaligned = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_free(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!dp-&gt;ab)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ath12k_dp_link_desc_cleanup(ab, dp-&gt;link_desc_banks,</div><div class='add'>+				    HAL_WBM_IDLE_LINK, &amp;dp-&gt;wbm_idle_ring);</div><div class='add'>+</div><div class='add'>+	ath12k_dp_cc_cleanup(ab);</div><div class='add'>+	ath12k_dp_reoq_lut_cleanup(ab);</div><div class='add'>+	ath12k_dp_deinit_bank_profiles(ab);</div><div class='add'>+	ath12k_dp_srng_common_cleanup(ab);</div><div class='add'>+</div><div class='add'>+	ath12k_dp_rx_reo_cmd_list_cleanup(ab);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;max_tx_ring; i++) {</div><div class='add'>+		kfree(dp-&gt;tx_ring[i].tx_status);</div><div class='add'>+		dp-&gt;tx_ring[i].tx_status = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dp_rx_free(ab);</div><div class='add'>+	/* Deinit any SOC level resource */</div><div class='add'>+	dp-&gt;ab = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_cc_config(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	u32 cmem_base = ab-&gt;qmi.dev_mem[ATH12K_QMI_DEVMEM_CMEM_INDEX].start;</div><div class='add'>+	u32 reo_base = HAL_SEQ_WCSS_UMAC_REO_REG;</div><div class='add'>+	u32 wbm_base = HAL_SEQ_WCSS_UMAC_WBM_REG;</div><div class='add'>+	u32 val = 0;</div><div class='add'>+</div><div class='add'>+	if (ath12k_ftm_mode)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ath12k_hif_write32(ab, reo_base + HAL_REO1_SW_COOKIE_CFG0(ab), cmem_base);</div><div class='add'>+</div><div class='add'>+	val |= u32_encode_bits(ATH12K_CMEM_ADDR_MSB,</div><div class='add'>+			       HAL_REO1_SW_COOKIE_CFG_CMEM_BASE_ADDR_MSB) |</div><div class='add'>+		u32_encode_bits(ATH12K_CC_PPT_MSB,</div><div class='add'>+				HAL_REO1_SW_COOKIE_CFG_COOKIE_PPT_MSB) |</div><div class='add'>+		u32_encode_bits(ATH12K_CC_SPT_MSB,</div><div class='add'>+				HAL_REO1_SW_COOKIE_CFG_COOKIE_SPT_MSB) |</div><div class='add'>+		u32_encode_bits(1, HAL_REO1_SW_COOKIE_CFG_ALIGN) |</div><div class='add'>+		u32_encode_bits(1, HAL_REO1_SW_COOKIE_CFG_ENABLE) |</div><div class='add'>+		u32_encode_bits(1, HAL_REO1_SW_COOKIE_CFG_GLOBAL_ENABLE);</div><div class='add'>+</div><div class='add'>+	ath12k_hif_write32(ab, reo_base + HAL_REO1_SW_COOKIE_CFG1(ab), val);</div><div class='add'>+</div><div class='add'>+	/* Enable HW CC for WBM */</div><div class='add'>+	ath12k_hif_write32(ab, wbm_base + HAL_WBM_SW_COOKIE_CFG0, cmem_base);</div><div class='add'>+</div><div class='add'>+	val = u32_encode_bits(ATH12K_CMEM_ADDR_MSB,</div><div class='add'>+			      HAL_WBM_SW_COOKIE_CFG_CMEM_BASE_ADDR_MSB) |</div><div class='add'>+		u32_encode_bits(ATH12K_CC_PPT_MSB,</div><div class='add'>+				HAL_WBM_SW_COOKIE_CFG_COOKIE_PPT_MSB) |</div><div class='add'>+		u32_encode_bits(ATH12K_CC_SPT_MSB,</div><div class='add'>+				HAL_WBM_SW_COOKIE_CFG_COOKIE_SPT_MSB) |</div><div class='add'>+		u32_encode_bits(1, HAL_WBM_SW_COOKIE_CFG_ALIGN);</div><div class='add'>+</div><div class='add'>+	ath12k_hif_write32(ab, wbm_base + HAL_WBM_SW_COOKIE_CFG1, val);</div><div class='add'>+</div><div class='add'>+	/* Enable conversion complete indication */</div><div class='add'>+	val = ath12k_hif_read32(ab, wbm_base + HAL_WBM_SW_COOKIE_CFG2);</div><div class='add'>+	val |= u32_encode_bits(1, HAL_WBM_SW_COOKIE_CFG_RELEASE_PATH_EN) |</div><div class='add'>+		u32_encode_bits(1, HAL_WBM_SW_COOKIE_CFG_ERR_PATH_EN) |</div><div class='add'>+		u32_encode_bits(1, HAL_WBM_SW_COOKIE_CFG_CONV_IND_EN);</div><div class='add'>+</div><div class='add'>+	ath12k_hif_write32(ab, wbm_base + HAL_WBM_SW_COOKIE_CFG2, val);</div><div class='add'>+</div><div class='add'>+	/* Enable Cookie conversion for WBM2SW Rings */</div><div class='add'>+	val = ath12k_hif_read32(ab, wbm_base + HAL_WBM_SW_COOKIE_CONVERT_CFG);</div><div class='add'>+	val |= u32_encode_bits(1, HAL_WBM_SW_COOKIE_CONV_CFG_GLOBAL_EN) |</div><div class='add'>+	       ab-&gt;hw_params-&gt;hal_params-&gt;wbm2sw_cc_enable;</div><div class='add'>+</div><div class='add'>+	ath12k_hif_write32(ab, wbm_base + HAL_WBM_SW_COOKIE_CONVERT_CFG, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_dp_cc_cookie_gen(u16 ppt_idx, u16 spt_idx)</div><div class='add'>+{</div><div class='add'>+	return (u32)ppt_idx &lt;&lt; ATH12K_CC_PPT_SHIFT | spt_idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *ath12k_dp_cc_get_desc_addr_ptr(struct ath12k_base *ab,</div><div class='add'>+						   u16 ppt_idx, u16 spt_idx)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+</div><div class='add'>+	return dp-&gt;spt_info[ppt_idx].vaddr + spt_idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ath12k_rx_desc_info *ath12k_dp_get_rx_desc(struct ath12k_base *ab,</div><div class='add'>+						  u32 cookie)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct ath12k_rx_desc_info **desc_addr_ptr;</div><div class='add'>+	u16 start_ppt_idx, end_ppt_idx, ppt_idx, spt_idx;</div><div class='add'>+</div><div class='add'>+	ppt_idx = u32_get_bits(cookie, ATH12K_DP_CC_COOKIE_PPT);</div><div class='add'>+	spt_idx = u32_get_bits(cookie, ATH12K_DP_CC_COOKIE_SPT);</div><div class='add'>+</div><div class='add'>+	start_ppt_idx = dp-&gt;rx_ppt_base + ATH12K_RX_SPT_PAGE_OFFSET(ab);</div><div class='add'>+	end_ppt_idx = start_ppt_idx + ATH12K_NUM_RX_SPT_PAGES(ab);</div><div class='add'>+</div><div class='add'>+	if (ppt_idx &lt; start_ppt_idx ||</div><div class='add'>+	    ppt_idx &gt;= end_ppt_idx ||</div><div class='add'>+	    spt_idx &gt; ATH12K_MAX_SPT_ENTRIES)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ppt_idx = ppt_idx - dp-&gt;rx_ppt_base;</div><div class='add'>+	desc_addr_ptr = ath12k_dp_cc_get_desc_addr_ptr(ab, ppt_idx, spt_idx);</div><div class='add'>+</div><div class='add'>+	return *desc_addr_ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ath12k_tx_desc_info *ath12k_dp_get_tx_desc(struct ath12k_base *ab,</div><div class='add'>+						  u32 cookie)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_tx_desc_info **desc_addr_ptr;</div><div class='add'>+	u16 start_ppt_idx, end_ppt_idx, ppt_idx, spt_idx;</div><div class='add'>+</div><div class='add'>+	ppt_idx = u32_get_bits(cookie, ATH12K_DP_CC_COOKIE_PPT);</div><div class='add'>+	spt_idx = u32_get_bits(cookie, ATH12K_DP_CC_COOKIE_SPT);</div><div class='add'>+</div><div class='add'>+	start_ppt_idx = ATH12K_TX_SPT_PAGE_OFFSET;</div><div class='add'>+	end_ppt_idx = start_ppt_idx +</div><div class='add'>+		      (ATH12K_TX_SPT_PAGES_PER_POOL(ab) * ATH12K_HW_MAX_QUEUES);</div><div class='add'>+</div><div class='add'>+	if (ppt_idx &lt; start_ppt_idx ||</div><div class='add'>+	    ppt_idx &gt;= end_ppt_idx ||</div><div class='add'>+	    spt_idx &gt; ATH12K_MAX_SPT_ENTRIES)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	desc_addr_ptr = ath12k_dp_cc_get_desc_addr_ptr(ab, ppt_idx, spt_idx);</div><div class='add'>+</div><div class='add'>+	return *desc_addr_ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_cc_desc_init(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct ath12k_rx_desc_info *rx_descs, **rx_desc_addr;</div><div class='add'>+	struct ath12k_tx_desc_info *tx_descs, **tx_desc_addr;</div><div class='add'>+	u32 num_rx_spt_pages = ATH12K_NUM_RX_SPT_PAGES(ab);</div><div class='add'>+	u32 i, j, pool_id, tx_spt_page;</div><div class='add'>+	u32 ppt_idx, cookie_ppt_idx;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dp-&gt;rx_desc_lock);</div><div class='add'>+</div><div class='add'>+	dp-&gt;rxbaddr = kcalloc(num_rx_spt_pages,</div><div class='add'>+			      sizeof(struct ath12k_rx_desc_info *), GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+	if (!dp-&gt;rxbaddr) {</div><div class='add'>+		spin_unlock_bh(&amp;dp-&gt;rx_desc_lock);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* First ATH12K_NUM_RX_SPT_PAGES(ab) of allocated SPT pages are used for</div><div class='add'>+	 * RX</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; num_rx_spt_pages; i++) {</div><div class='add'>+		rx_descs = kcalloc(ATH12K_MAX_SPT_ENTRIES, sizeof(*rx_descs),</div><div class='add'>+				   GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+		if (!rx_descs) {</div><div class='add'>+			spin_unlock_bh(&amp;dp-&gt;rx_desc_lock);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ppt_idx = ATH12K_RX_SPT_PAGE_OFFSET(ab) + i;</div><div class='add'>+		cookie_ppt_idx = dp-&gt;rx_ppt_base + ppt_idx;</div><div class='add'>+		dp-&gt;rxbaddr[i] = &amp;rx_descs[0];</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; ATH12K_MAX_SPT_ENTRIES; j++) {</div><div class='add'>+			rx_descs[j].cookie = ath12k_dp_cc_cookie_gen(cookie_ppt_idx, j);</div><div class='add'>+			rx_descs[j].magic = ATH12K_DP_RX_DESC_MAGIC;</div><div class='add'>+			rx_descs[j].device_id = ab-&gt;device_id;</div><div class='add'>+			list_add_tail(&amp;rx_descs[j].list, &amp;dp-&gt;rx_desc_free_list);</div><div class='add'>+</div><div class='add'>+			/* Update descriptor VA in SPT */</div><div class='add'>+			rx_desc_addr = ath12k_dp_cc_get_desc_addr_ptr(ab, ppt_idx, j);</div><div class='add'>+			*rx_desc_addr = &amp;rx_descs[j];</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;dp-&gt;rx_desc_lock);</div><div class='add'>+</div><div class='add'>+	dp-&gt;txbaddr = kcalloc(ATH12K_NUM_TX_SPT_PAGES(ab),</div><div class='add'>+			      sizeof(struct ath12k_tx_desc_info *), GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+	if (!dp-&gt;txbaddr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (pool_id = 0; pool_id &lt; ATH12K_HW_MAX_QUEUES; pool_id++) {</div><div class='add'>+		spin_lock_bh(&amp;dp-&gt;tx_desc_lock[pool_id]);</div><div class='add'>+		for (i = 0; i &lt; ATH12K_TX_SPT_PAGES_PER_POOL(ab); i++) {</div><div class='add'>+			tx_descs = kcalloc(ATH12K_MAX_SPT_ENTRIES, sizeof(*tx_descs),</div><div class='add'>+					   GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+			if (!tx_descs) {</div><div class='add'>+				spin_unlock_bh(&amp;dp-&gt;tx_desc_lock[pool_id]);</div><div class='add'>+				/* Caller takes care of TX pending and RX desc cleanup */</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			tx_spt_page = i + pool_id *</div><div class='add'>+				      ATH12K_TX_SPT_PAGES_PER_POOL(ab);</div><div class='add'>+			ppt_idx = ATH12K_TX_SPT_PAGE_OFFSET + tx_spt_page;</div><div class='add'>+</div><div class='add'>+			dp-&gt;txbaddr[tx_spt_page] = &amp;tx_descs[0];</div><div class='add'>+</div><div class='add'>+			for (j = 0; j &lt; ATH12K_MAX_SPT_ENTRIES; j++) {</div><div class='add'>+				tx_descs[j].desc_id = ath12k_dp_cc_cookie_gen(ppt_idx, j);</div><div class='add'>+				tx_descs[j].pool_id = pool_id;</div><div class='add'>+				list_add_tail(&amp;tx_descs[j].list,</div><div class='add'>+					      &amp;dp-&gt;tx_desc_free_list[pool_id]);</div><div class='add'>+</div><div class='add'>+				/* Update descriptor VA in SPT */</div><div class='add'>+				tx_desc_addr =</div><div class='add'>+					ath12k_dp_cc_get_desc_addr_ptr(ab, ppt_idx, j);</div><div class='add'>+				*tx_desc_addr = &amp;tx_descs[j];</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_bh(&amp;dp-&gt;tx_desc_lock[pool_id]);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_cmem_init(struct ath12k_base *ab,</div><div class='add'>+			       struct ath12k_dp *dp,</div><div class='add'>+			       enum ath12k_dp_desc_type type)</div><div class='add'>+{</div><div class='add'>+	u32 cmem_base;</div><div class='add'>+	int i, start, end;</div><div class='add'>+</div><div class='add'>+	cmem_base = ab-&gt;qmi.dev_mem[ATH12K_QMI_DEVMEM_CMEM_INDEX].start;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case ATH12K_DP_TX_DESC:</div><div class='add'>+		start = ATH12K_TX_SPT_PAGE_OFFSET;</div><div class='add'>+		end = start + ATH12K_NUM_TX_SPT_PAGES(ab);</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_DP_RX_DESC:</div><div class='add'>+		cmem_base += ATH12K_PPT_ADDR_OFFSET(dp-&gt;rx_ppt_base);</div><div class='add'>+		start = ATH12K_RX_SPT_PAGE_OFFSET(ab);</div><div class='add'>+		end = start + ATH12K_NUM_RX_SPT_PAGES(ab);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_err(ab, "invalid descriptor type %d in cmem init\n", type);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Write to PPT in CMEM */</div><div class='add'>+	for (i = start; i &lt; end; i++)</div><div class='add'>+		ath12k_hif_write32(ab, cmem_base + ATH12K_PPT_ADDR_OFFSET(i),</div><div class='add'>+				   dp-&gt;spt_info[i].paddr &gt;&gt; ATH12K_SPT_4K_ALIGN_OFFSET);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_partner_cc_init(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_group *ag = ab-&gt;ag;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_devices; i++) {</div><div class='add'>+		if (ag-&gt;ab[i] == ab)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ath12k_dp_cmem_init(ab, &amp;ag-&gt;ab[i]-&gt;dp, ATH12K_DP_RX_DESC);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_dp_get_num_spt_pages(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return ATH12K_NUM_RX_SPT_PAGES(ab) + ATH12K_NUM_TX_SPT_PAGES(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_cc_init(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;dp-&gt;rx_desc_free_list);</div><div class='add'>+	spin_lock_init(&amp;dp-&gt;rx_desc_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HW_MAX_QUEUES; i++) {</div><div class='add'>+		INIT_LIST_HEAD(&amp;dp-&gt;tx_desc_free_list[i]);</div><div class='add'>+		INIT_LIST_HEAD(&amp;dp-&gt;tx_desc_used_list[i]);</div><div class='add'>+		spin_lock_init(&amp;dp-&gt;tx_desc_lock[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dp-&gt;num_spt_pages = ath12k_dp_get_num_spt_pages(ab);</div><div class='add'>+	if (dp-&gt;num_spt_pages &gt; ATH12K_MAX_PPT_ENTRIES)</div><div class='add'>+		dp-&gt;num_spt_pages = ATH12K_MAX_PPT_ENTRIES;</div><div class='add'>+</div><div class='add'>+	dp-&gt;spt_info = kcalloc(dp-&gt;num_spt_pages, sizeof(struct ath12k_spt_info),</div><div class='add'>+			       GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!dp-&gt;spt_info) {</div><div class='add'>+		ath12k_warn(ab, "SPT page allocation failure");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dp-&gt;rx_ppt_base = ab-&gt;device_id * ATH12K_NUM_RX_SPT_PAGES(ab);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dp-&gt;num_spt_pages; i++) {</div><div class='add'>+		dp-&gt;spt_info[i].vaddr = dma_alloc_coherent(ab-&gt;dev,</div><div class='add'>+							   ATH12K_PAGE_SIZE,</div><div class='add'>+							   &amp;dp-&gt;spt_info[i].paddr,</div><div class='add'>+							   GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+		if (!dp-&gt;spt_info[i].vaddr) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto free;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (dp-&gt;spt_info[i].paddr &amp; ATH12K_SPT_4K_ALIGN_CHECK) {</div><div class='add'>+			ath12k_warn(ab, "SPT allocated memory is not 4K aligned");</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto free;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_cmem_init(ab, dp, ATH12K_DP_TX_DESC);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "HW CC Tx cmem init failed %d", ret);</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_cmem_init(ab, dp, ATH12K_DP_RX_DESC);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "HW CC Rx cmem init failed %d", ret);</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_cc_desc_init(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "HW CC desc init failed %d", ret);</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+free:</div><div class='add'>+	ath12k_dp_cc_cleanup(ab);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_alloc_reoq_lut(struct ath12k_base *ab,</div><div class='add'>+				    struct ath12k_reo_q_addr_lut *lut)</div><div class='add'>+{</div><div class='add'>+	lut-&gt;size =  DP_REOQ_LUT_SIZE + HAL_REO_QLUT_ADDR_ALIGN - 1;</div><div class='add'>+	lut-&gt;vaddr_unaligned = dma_alloc_coherent(ab-&gt;dev, lut-&gt;size,</div><div class='add'>+						  &amp;lut-&gt;paddr_unaligned,</div><div class='add'>+						  GFP_KERNEL | __GFP_ZERO);</div><div class='add'>+	if (!lut-&gt;vaddr_unaligned)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	lut-&gt;vaddr = PTR_ALIGN(lut-&gt;vaddr_unaligned, HAL_REO_QLUT_ADDR_ALIGN);</div><div class='add'>+	lut-&gt;paddr = lut-&gt;paddr_unaligned +</div><div class='add'>+		     ((unsigned long)lut-&gt;vaddr - (unsigned long)lut-&gt;vaddr_unaligned);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_reoq_lut_setup(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;hw_params-&gt;reoq_lut_support)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_alloc_reoq_lut(ab, &amp;dp-&gt;reoq_lut);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to allocate memory for reoq table");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_alloc_reoq_lut(ab, &amp;dp-&gt;ml_reoq_lut);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to allocate memory for ML reoq table");</div><div class='add'>+		dma_free_coherent(ab-&gt;dev, dp-&gt;reoq_lut.size,</div><div class='add'>+				  dp-&gt;reoq_lut.vaddr_unaligned,</div><div class='add'>+				  dp-&gt;reoq_lut.paddr_unaligned);</div><div class='add'>+		dp-&gt;reoq_lut.vaddr_unaligned = NULL;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Bits in the register have address [39:8] LUT base address to be</div><div class='add'>+	 * allocated such that LSBs are assumed to be zero. Also, current</div><div class='add'>+	 * design supports paddr up to 4 GB max hence it fits in 32 bit</div><div class='add'>+	 * register only</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	ath12k_hif_write32(ab, HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO1_QDESC_LUT_BASE0(ab),</div><div class='add'>+			   dp-&gt;reoq_lut.paddr &gt;&gt; 8);</div><div class='add'>+</div><div class='add'>+	ath12k_hif_write32(ab, HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO1_QDESC_LUT_BASE1(ab),</div><div class='add'>+			   dp-&gt;ml_reoq_lut.paddr &gt;&gt; 8);</div><div class='add'>+</div><div class='add'>+	val = ath12k_hif_read32(ab, HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO1_QDESC_ADDR(ab));</div><div class='add'>+</div><div class='add'>+	ath12k_hif_write32(ab, HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO1_QDESC_ADDR(ab),</div><div class='add'>+			   val | HAL_REO_QDESC_ADDR_READ_LUT_ENABLE);</div><div class='add'>+</div><div class='add'>+	ath12k_hif_write32(ab, HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO1_QDESC_MAX_PEERID(ab),</div><div class='add'>+			   HAL_REO_QDESC_MAX_PEERID);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum hal_rx_buf_return_buf_manager</div><div class='add'>+ath12k_dp_get_idle_link_rbm(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	switch (ab-&gt;device_id) {</div><div class='add'>+	case 0:</div><div class='add'>+		return HAL_RX_BUF_RBM_WBM_DEV0_IDLE_DESC_LIST;</div><div class='add'>+	case 1:</div><div class='add'>+		return HAL_RX_BUF_RBM_WBM_DEV1_IDLE_DESC_LIST;</div><div class='add'>+	case 2:</div><div class='add'>+		return HAL_RX_BUF_RBM_WBM_DEV2_IDLE_DESC_LIST;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_warn(ab, "invalid %d device id, so choose default rbm\n",</div><div class='add'>+			    ab-&gt;device_id);</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return HAL_RX_BUF_RBM_WBM_DEV0_IDLE_DESC_LIST;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_alloc(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct hal_srng *srng = NULL;</div><div class='add'>+	size_t size = 0;</div><div class='add'>+	u32 n_link_desc = 0;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	dp-&gt;ab = ab;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;dp-&gt;reo_cmd_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dp-&gt;reo_cmd_cache_flush_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dp-&gt;reo_cmd_update_rx_queue_list);</div><div class='add'>+	spin_lock_init(&amp;dp-&gt;reo_cmd_lock);</div><div class='add'>+	spin_lock_init(&amp;dp-&gt;reo_rxq_flush_lock);</div><div class='add'>+</div><div class='add'>+	dp-&gt;reo_cmd_cache_flush_count = 0;</div><div class='add'>+	dp-&gt;idle_link_rbm = ath12k_dp_get_idle_link_rbm(ab);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wbm_idle_ring_setup(ab, &amp;n_link_desc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to setup wbm_idle_ring: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	srng = &amp;ab-&gt;hal.srng_list[dp-&gt;wbm_idle_ring.ring_id];</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_link_desc_setup(ab, dp-&gt;link_desc_banks,</div><div class='add'>+					HAL_WBM_IDLE_LINK, srng, n_link_desc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to setup link desc: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_cc_init(ab);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to setup cookie converter %d\n", ret);</div><div class='add'>+		goto fail_link_desc_cleanup;</div><div class='add'>+	}</div><div class='add'>+	ret = ath12k_dp_init_bank_profiles(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to setup bank profiles %d\n", ret);</div><div class='add'>+		goto fail_hw_cc_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_srng_common_setup(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fail_dp_bank_profiles_cleanup;</div><div class='add'>+</div><div class='add'>+	size = sizeof(struct hal_wbm_release_ring_tx) *</div><div class='add'>+	       DP_TX_COMP_RING_SIZE(ab);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_reoq_lut_setup(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to setup reoq table %d\n", ret);</div><div class='add'>+		goto fail_cmn_srng_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;max_tx_ring; i++) {</div><div class='add'>+		dp-&gt;tx_ring[i].tcl_data_ring_id = i;</div><div class='add'>+</div><div class='add'>+		dp-&gt;tx_ring[i].tx_status_head = 0;</div><div class='add'>+		dp-&gt;tx_ring[i].tx_status_tail = DP_TX_COMP_RING_SIZE(ab) - 1;</div><div class='add'>+		dp-&gt;tx_ring[i].tx_status = kmalloc(size, GFP_KERNEL);</div><div class='add'>+		if (!dp-&gt;tx_ring[i].tx_status) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			/* FIXME: The allocated tx status is not freed</div><div class='add'>+			 * properly here</div><div class='add'>+			 */</div><div class='add'>+			goto fail_cmn_reoq_cleanup;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HAL_DSCP_TID_MAP_TBL_NUM_ENTRIES_MAX; i++)</div><div class='add'>+		ath12k_hal_tx_set_dscp_tid_map(ab, i);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_rx_alloc(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fail_dp_rx_free;</div><div class='add'>+</div><div class='add'>+	/* Init any SOC level resource for DP */</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail_dp_rx_free:</div><div class='add'>+	ath12k_dp_rx_free(ab);</div><div class='add'>+</div><div class='add'>+fail_cmn_reoq_cleanup:</div><div class='add'>+	ath12k_dp_reoq_lut_cleanup(ab);</div><div class='add'>+</div><div class='add'>+fail_cmn_srng_cleanup:</div><div class='add'>+	ath12k_dp_srng_common_cleanup(ab);</div><div class='add'>+</div><div class='add'>+fail_dp_bank_profiles_cleanup:</div><div class='add'>+	ath12k_dp_deinit_bank_profiles(ab);</div><div class='add'>+</div><div class='add'>+fail_hw_cc_cleanup:</div><div class='add'>+	ath12k_dp_cc_cleanup(ab);</div><div class='add'>+</div><div class='add'>+fail_link_desc_cleanup:</div><div class='add'>+	ath12k_dp_link_desc_cleanup(ab, dp-&gt;link_desc_banks,</div><div class='add'>+				    HAL_WBM_IDLE_LINK, &amp;dp-&gt;wbm_idle_ring);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/dp.h b/drivers/net/wireless/ath/ath12k/dp.h<br/>new file mode 100644<br/>index 000000000000..4ffec6ad7d8d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/dp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/dp.h</a></div><div class='hunk'>@@ -0,0 +1,1976 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH12K_DP_H</div><div class='add'>+#define ATH12K_DP_H</div><div class='add'>+</div><div class='add'>+#include "hal_desc.h"</div><div class='add'>+#include "hal_rx.h"</div><div class='add'>+#include "hw.h"</div><div class='add'>+</div><div class='add'>+#define MAX_RXDMA_PER_PDEV     2</div><div class='add'>+</div><div class='add'>+struct ath12k_base;</div><div class='add'>+struct ath12k_peer;</div><div class='add'>+struct ath12k_dp;</div><div class='add'>+struct ath12k_vif;</div><div class='add'>+struct ath12k_link_vif;</div><div class='add'>+struct hal_tcl_status_ring;</div><div class='add'>+struct ath12k_ext_irq_grp;</div><div class='add'>+</div><div class='add'>+#define DP_MON_PURGE_TIMEOUT_MS     100</div><div class='add'>+#define DP_MON_SERVICE_BUDGET       128</div><div class='add'>+</div><div class='add'>+struct dp_srng {</div><div class='add'>+	u32 *vaddr_unaligned;</div><div class='add'>+	u32 *vaddr;</div><div class='add'>+	dma_addr_t paddr_unaligned;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	int size;</div><div class='add'>+	u32 ring_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dp_rxdma_mon_ring {</div><div class='add'>+	struct dp_srng refill_buf_ring;</div><div class='add'>+	struct idr bufs_idr;</div><div class='add'>+	/* Protects bufs_idr */</div><div class='add'>+	spinlock_t idr_lock;</div><div class='add'>+	int bufs_max;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dp_rxdma_ring {</div><div class='add'>+	struct dp_srng refill_buf_ring;</div><div class='add'>+	int bufs_max;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_TX_COMPL_NEXT(ab, x)	(((x) + 1) % DP_TX_COMP_RING_SIZE(ab))</div><div class='add'>+</div><div class='add'>+struct dp_tx_ring {</div><div class='add'>+	u8 tcl_data_ring_id;</div><div class='add'>+	struct dp_srng tcl_data_ring;</div><div class='add'>+	struct dp_srng tcl_comp_ring;</div><div class='add'>+	struct hal_wbm_completion_ring_tx *tx_status;</div><div class='add'>+	int tx_status_head;</div><div class='add'>+	int tx_status_tail;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_pdev_mon_stats {</div><div class='add'>+	u32 status_ppdu_state;</div><div class='add'>+	u32 status_ppdu_start;</div><div class='add'>+	u32 status_ppdu_end;</div><div class='add'>+	u32 status_ppdu_compl;</div><div class='add'>+	u32 status_ppdu_start_mis;</div><div class='add'>+	u32 status_ppdu_end_mis;</div><div class='add'>+	u32 status_ppdu_done;</div><div class='add'>+	u32 dest_ppdu_done;</div><div class='add'>+	u32 dest_mpdu_done;</div><div class='add'>+	u32 dest_mpdu_drop;</div><div class='add'>+	u32 dup_mon_linkdesc_cnt;</div><div class='add'>+	u32 dup_mon_buf_cnt;</div><div class='add'>+	u32 dest_mon_stuck;</div><div class='add'>+	u32 dest_mon_not_reaped;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum dp_mon_status_buf_state {</div><div class='add'>+	DP_MON_STATUS_MATCH,</div><div class='add'>+	DP_MON_STATUS_NO_DMA,</div><div class='add'>+	DP_MON_STATUS_LAG,</div><div class='add'>+	DP_MON_STATUS_LEAD,</div><div class='add'>+	DP_MON_STATUS_REPLINISH,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dp_link_desc_bank {</div><div class='add'>+	void *vaddr_unaligned;</div><div class='add'>+	void *vaddr;</div><div class='add'>+	dma_addr_t paddr_unaligned;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	u32 size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Size to enforce scatter idle list mode */</div><div class='add'>+#define DP_LINK_DESC_ALLOC_SIZE_THRESH 0x200000</div><div class='add'>+#define DP_LINK_DESC_BANKS_MAX 8</div><div class='add'>+</div><div class='add'>+#define DP_LINK_DESC_START	0x4000</div><div class='add'>+#define DP_LINK_DESC_SHIFT	3</div><div class='add'>+</div><div class='add'>+#define DP_LINK_DESC_COOKIE_SET(id, page) \</div><div class='add'>+	((((id) + DP_LINK_DESC_START) &lt;&lt; DP_LINK_DESC_SHIFT) | (page))</div><div class='add'>+</div><div class='add'>+#define DP_LINK_DESC_BANK_MASK	GENMASK(2, 0)</div><div class='add'>+</div><div class='add'>+#define DP_RX_DESC_COOKIE_INDEX_MAX		0x3ffff</div><div class='add'>+#define DP_RX_DESC_COOKIE_POOL_ID_MAX		0x1c0000</div><div class='add'>+#define DP_RX_DESC_COOKIE_MAX	\</div><div class='add'>+	(DP_RX_DESC_COOKIE_INDEX_MAX | DP_RX_DESC_COOKIE_POOL_ID_MAX)</div><div class='add'>+#define DP_NOT_PPDU_ID_WRAP_AROUND 20000</div><div class='add'>+</div><div class='add'>+enum ath12k_dp_ppdu_state {</div><div class='add'>+	DP_PPDU_STATUS_START,</div><div class='add'>+	DP_PPDU_STATUS_DONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dp_mon_mpdu {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct sk_buff *head;</div><div class='add'>+	struct sk_buff *tail;</div><div class='add'>+	u32 err_bitmap;</div><div class='add'>+	u8 decap_format;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DP_MON_MAX_STATUS_BUF 32</div><div class='add'>+</div><div class='add'>+struct ath12k_mon_data {</div><div class='add'>+	struct dp_link_desc_bank link_desc_banks[DP_LINK_DESC_BANKS_MAX];</div><div class='add'>+	struct hal_rx_mon_ppdu_info mon_ppdu_info;</div><div class='add'>+</div><div class='add'>+	u32 mon_ppdu_status;</div><div class='add'>+	u32 mon_last_buf_cookie;</div><div class='add'>+	u64 mon_last_linkdesc_paddr;</div><div class='add'>+	u16 chan_noise_floor;</div><div class='add'>+	u32 err_bitmap;</div><div class='add'>+	u8 decap_format;</div><div class='add'>+</div><div class='add'>+	struct ath12k_pdev_mon_stats rx_mon_stats;</div><div class='add'>+	enum dp_mon_status_buf_state buf_state;</div><div class='add'>+	/* lock for monitor data */</div><div class='add'>+	spinlock_t mon_lock;</div><div class='add'>+	struct sk_buff_head rx_status_q;</div><div class='add'>+	struct dp_mon_mpdu *mon_mpdu;</div><div class='add'>+	struct list_head dp_rx_mon_mpdu_list;</div><div class='add'>+	struct dp_mon_tx_ppdu_info *tx_prot_ppdu_info;</div><div class='add'>+	struct dp_mon_tx_ppdu_info *tx_data_ppdu_info;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_pdev_dp {</div><div class='add'>+	u32 mac_id;</div><div class='add'>+	atomic_t num_tx_pending;</div><div class='add'>+	wait_queue_head_t tx_empty_waitq;</div><div class='add'>+	struct dp_srng rxdma_mon_dst_ring[MAX_RXDMA_PER_PDEV];</div><div class='add'>+	struct dp_srng tx_mon_dst_ring[MAX_RXDMA_PER_PDEV];</div><div class='add'>+</div><div class='add'>+	struct ieee80211_rx_status rx_status;</div><div class='add'>+	struct ath12k_mon_data mon_data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DP_NUM_CLIENTS_MAX 64</div><div class='add'>+#define DP_AVG_TIDS_PER_CLIENT 2</div><div class='add'>+#define DP_NUM_TIDS_MAX (DP_NUM_CLIENTS_MAX * DP_AVG_TIDS_PER_CLIENT)</div><div class='add'>+#define DP_AVG_MSDUS_PER_FLOW 128</div><div class='add'>+#define DP_AVG_FLOWS_PER_TID 2</div><div class='add'>+#define DP_AVG_MPDUS_PER_TID_MAX 128</div><div class='add'>+#define DP_AVG_MSDUS_PER_MPDU 4</div><div class='add'>+</div><div class='add'>+#define DP_RX_HASH_ENABLE	1 /* Enable hash based Rx steering */</div><div class='add'>+</div><div class='add'>+#define DP_BA_WIN_SZ_MAX	1024</div><div class='add'>+</div><div class='add'>+#define DP_TCL_NUM_RING_MAX	4</div><div class='add'>+</div><div class='add'>+#define DP_IDLE_SCATTER_BUFS_MAX 16</div><div class='add'>+</div><div class='add'>+#define DP_WBM_RELEASE_RING_SIZE	64</div><div class='add'>+#define DP_TCL_DATA_RING_SIZE		512</div><div class='add'>+#define DP_TX_COMP_RING_SIZE(ab) \</div><div class='add'>+	((ab)-&gt;profile_param-&gt;dp_params.tx_comp_ring_size)</div><div class='add'>+#define DP_TX_IDR_SIZE(ab)		DP_TX_COMP_RING_SIZE(ab)</div><div class='add'>+#define DP_TCL_CMD_RING_SIZE		32</div><div class='add'>+#define DP_TCL_STATUS_RING_SIZE		32</div><div class='add'>+#define DP_REO_DST_RING_MAX		8</div><div class='add'>+#define DP_REO_DST_RING_SIZE		2048</div><div class='add'>+#define DP_REO_REINJECT_RING_SIZE	32</div><div class='add'>+#define DP_RX_RELEASE_RING_SIZE		1024</div><div class='add'>+#define DP_REO_EXCEPTION_RING_SIZE	128</div><div class='add'>+#define DP_REO_CMD_RING_SIZE		256</div><div class='add'>+#define DP_REO_STATUS_RING_SIZE		2048</div><div class='add'>+#define DP_RXDMA_BUF_RING_SIZE		4096</div><div class='add'>+#define DP_RX_MAC_BUF_RING_SIZE		2048</div><div class='add'>+#define DP_RXDMA_REFILL_RING_SIZE	2048</div><div class='add'>+#define DP_RXDMA_ERR_DST_RING_SIZE	1024</div><div class='add'>+#define DP_RXDMA_MON_STATUS_RING_SIZE	1024</div><div class='add'>+#define DP_RXDMA_MONITOR_BUF_RING_SIZE(ab) \</div><div class='add'>+	((ab)-&gt;profile_param-&gt;dp_params.rxdma_monitor_buf_ring_size)</div><div class='add'>+#define DP_RXDMA_MONITOR_DST_RING_SIZE(ab) \</div><div class='add'>+	((ab)-&gt;profile_param-&gt;dp_params.rxdma_monitor_dst_ring_size)</div><div class='add'>+#define DP_RXDMA_MONITOR_DESC_RING_SIZE	4096</div><div class='add'>+#define DP_TX_MONITOR_BUF_RING_SIZE	4096</div><div class='add'>+#define DP_TX_MONITOR_DEST_RING_SIZE	2048</div><div class='add'>+</div><div class='add'>+#define DP_TX_MONITOR_BUF_SIZE		2048</div><div class='add'>+#define DP_TX_MONITOR_BUF_SIZE_MIN	48</div><div class='add'>+#define DP_TX_MONITOR_BUF_SIZE_MAX	8192</div><div class='add'>+</div><div class='add'>+#define DP_RX_BUFFER_SIZE	2048</div><div class='add'>+#define DP_RX_BUFFER_SIZE_LITE	1024</div><div class='add'>+#define DP_RX_BUFFER_ALIGN_SIZE	128</div><div class='add'>+</div><div class='add'>+#define RX_MON_STATUS_BASE_BUF_SIZE	2048</div><div class='add'>+#define RX_MON_STATUS_BUF_ALIGN		128</div><div class='add'>+#define RX_MON_STATUS_BUF_RESERVATION	128</div><div class='add'>+#define RX_MON_STATUS_BUF_SIZE		(RX_MON_STATUS_BASE_BUF_SIZE - \</div><div class='add'>+				 (RX_MON_STATUS_BUF_RESERVATION + \</div><div class='add'>+				  RX_MON_STATUS_BUF_ALIGN + \</div><div class='add'>+				  SKB_DATA_ALIGN(sizeof(struct skb_shared_info))))</div><div class='add'>+</div><div class='add'>+#define DP_RXDMA_BUF_COOKIE_BUF_ID	GENMASK(17, 0)</div><div class='add'>+#define DP_RXDMA_BUF_COOKIE_PDEV_ID	GENMASK(19, 18)</div><div class='add'>+</div><div class='add'>+#define DP_HW2SW_MACID(mac_id) ({ typeof(mac_id) x = (mac_id); x ? x - 1 : 0; })</div><div class='add'>+#define DP_SW2HW_MACID(mac_id) ((mac_id) + 1)</div><div class='add'>+</div><div class='add'>+#define DP_TX_DESC_ID_MAC_ID  GENMASK(1, 0)</div><div class='add'>+#define DP_TX_DESC_ID_MSDU_ID GENMASK(18, 2)</div><div class='add'>+#define DP_TX_DESC_ID_POOL_ID GENMASK(20, 19)</div><div class='add'>+</div><div class='add'>+#define ATH12K_SHADOW_DP_TIMER_INTERVAL 20</div><div class='add'>+#define ATH12K_SHADOW_CTRL_TIMER_INTERVAL 10</div><div class='add'>+</div><div class='add'>+#define ATH12K_NUM_POOL_TX_DESC(ab) \</div><div class='add'>+	((ab)-&gt;profile_param-&gt;dp_params.num_pool_tx_desc)</div><div class='add'>+/* TODO: revisit this count during testing */</div><div class='add'>+#define ATH12K_RX_DESC_COUNT(ab) \</div><div class='add'>+	((ab)-&gt;profile_param-&gt;dp_params.rx_desc_count)</div><div class='add'>+</div><div class='add'>+#define ATH12K_PAGE_SIZE	PAGE_SIZE</div><div class='add'>+</div><div class='add'>+/* Total 1024 entries in PPT, i.e 4K/4 considering 4K aligned</div><div class='add'>+ * SPT pages which makes lower 12bits 0</div><div class='add'>+ */</div><div class='add'>+#define ATH12K_MAX_PPT_ENTRIES	1024</div><div class='add'>+</div><div class='add'>+/* Total 512 entries in a SPT, i.e 4K Page/8 */</div><div class='add'>+#define ATH12K_MAX_SPT_ENTRIES	512</div><div class='add'>+</div><div class='add'>+#define ATH12K_NUM_RX_SPT_PAGES(ab)	((ATH12K_RX_DESC_COUNT(ab)) / \</div><div class='add'>+					  ATH12K_MAX_SPT_ENTRIES)</div><div class='add'>+</div><div class='add'>+#define ATH12K_TX_SPT_PAGES_PER_POOL(ab) (ATH12K_NUM_POOL_TX_DESC(ab) / \</div><div class='add'>+					  ATH12K_MAX_SPT_ENTRIES)</div><div class='add'>+#define ATH12K_NUM_TX_SPT_PAGES(ab)	(ATH12K_TX_SPT_PAGES_PER_POOL(ab) * \</div><div class='add'>+					 ATH12K_HW_MAX_QUEUES)</div><div class='add'>+</div><div class='add'>+#define ATH12K_TX_SPT_PAGE_OFFSET 0</div><div class='add'>+#define ATH12K_RX_SPT_PAGE_OFFSET(ab) ATH12K_NUM_TX_SPT_PAGES(ab)</div><div class='add'>+</div><div class='add'>+/* The SPT pages are divided for RX and TX, first block for RX</div><div class='add'>+ * and remaining for TX</div><div class='add'>+ */</div><div class='add'>+#define ATH12K_NUM_TX_SPT_PAGE_START(ab) ATH12K_NUM_RX_SPT_PAGES(ab)</div><div class='add'>+</div><div class='add'>+#define ATH12K_DP_RX_DESC_MAGIC	0xBABABABA</div><div class='add'>+</div><div class='add'>+/* 4K aligned address have last 12 bits set to 0, this check is done</div><div class='add'>+ * so that two spt pages address can be stored per 8bytes</div><div class='add'>+ * of CMEM (PPT)</div><div class='add'>+ */</div><div class='add'>+#define ATH12K_SPT_4K_ALIGN_CHECK 0xFFF</div><div class='add'>+#define ATH12K_SPT_4K_ALIGN_OFFSET 12</div><div class='add'>+#define ATH12K_PPT_ADDR_OFFSET(ppt_index) (4 * (ppt_index))</div><div class='add'>+</div><div class='add'>+/* To indicate HW of CMEM address, b0-31 are cmem base received via QMI */</div><div class='add'>+#define ATH12K_CMEM_ADDR_MSB 0x10</div><div class='add'>+</div><div class='add'>+/* Of 20 bits cookie, b0-b8 is to indicate SPT offset and b9-19 for PPT */</div><div class='add'>+#define ATH12K_CC_SPT_MSB 8</div><div class='add'>+#define ATH12K_CC_PPT_MSB 19</div><div class='add'>+#define ATH12K_CC_PPT_SHIFT 9</div><div class='add'>+#define ATH12K_DP_CC_COOKIE_SPT	GENMASK(8, 0)</div><div class='add'>+#define ATH12K_DP_CC_COOKIE_PPT	GENMASK(19, 9)</div><div class='add'>+</div><div class='add'>+#define DP_REO_QREF_NUM		GENMASK(31, 16)</div><div class='add'>+#define DP_MAX_PEER_ID		2047</div><div class='add'>+</div><div class='add'>+/* Total size of the LUT is based on 2K peers, each having reference</div><div class='add'>+ * for 17tids, note each entry is of type ath12k_reo_queue_ref</div><div class='add'>+ * hence total size is 2048 * 17 * 8 = 278528</div><div class='add'>+ */</div><div class='add'>+#define DP_REOQ_LUT_SIZE	278528</div><div class='add'>+</div><div class='add'>+/* Invalid TX Bank ID value */</div><div class='add'>+#define DP_INVALID_BANK_ID -1</div><div class='add'>+</div><div class='add'>+#define MAX_TQM_RELEASE_REASON 15</div><div class='add'>+#define MAX_FW_TX_STATUS 7</div><div class='add'>+</div><div class='add'>+struct ath12k_dp_tx_bank_profile {</div><div class='add'>+	u8 is_configured;</div><div class='add'>+	u32 num_users;</div><div class='add'>+	u32 bank_config;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_hp_update_timer {</div><div class='add'>+	struct timer_list timer;</div><div class='add'>+	bool started;</div><div class='add'>+	bool init;</div><div class='add'>+	u32 tx_num;</div><div class='add'>+	u32 timer_tx_num;</div><div class='add'>+	u32 ring_id;</div><div class='add'>+	u32 interval;</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_rx_desc_info {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u32 cookie;</div><div class='add'>+	u32 magic;</div><div class='add'>+	u8 in_use	: 1,</div><div class='add'>+	   device_id	: 3,</div><div class='add'>+	   reserved	: 4;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_tx_desc_info {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct sk_buff *skb_ext_desc;</div><div class='add'>+	u32 desc_id; /* Cookie */</div><div class='add'>+	u8 mac_id;</div><div class='add'>+	u8 pool_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_tx_desc_params {</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct sk_buff *skb_ext_desc;</div><div class='add'>+	u8 mac_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_spt_info {</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	u64 *vaddr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_reo_queue_ref {</div><div class='add'>+	u32 info0;</div><div class='add'>+	u32 info1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_reo_q_addr_lut {</div><div class='add'>+	u32 *vaddr_unaligned;</div><div class='add'>+	u32 *vaddr;</div><div class='add'>+	dma_addr_t paddr_unaligned;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	u32 size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_link_stats {</div><div class='add'>+	u32 tx_enqueued;</div><div class='add'>+	u32 tx_completed;</div><div class='add'>+	u32 tx_bcast_mcast;</div><div class='add'>+	u32 tx_dropped;</div><div class='add'>+	u32 tx_encap_type[HAL_TCL_ENCAP_TYPE_MAX];</div><div class='add'>+	u32 tx_encrypt_type[HAL_ENCRYPT_TYPE_MAX];</div><div class='add'>+	u32 tx_desc_type[HAL_TCL_DESC_TYPE_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_dp {</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	u32 mon_dest_ring_stuck_cnt;</div><div class='add'>+	u8 num_bank_profiles;</div><div class='add'>+	/* protects the access and update of bank_profiles */</div><div class='add'>+	spinlock_t tx_bank_lock;</div><div class='add'>+	struct ath12k_dp_tx_bank_profile *bank_profiles;</div><div class='add'>+	enum ath12k_htc_ep_id eid;</div><div class='add'>+	struct completion htt_tgt_version_received;</div><div class='add'>+	u8 htt_tgt_ver_major;</div><div class='add'>+	u8 htt_tgt_ver_minor;</div><div class='add'>+	struct dp_link_desc_bank link_desc_banks[DP_LINK_DESC_BANKS_MAX];</div><div class='add'>+	enum hal_rx_buf_return_buf_manager idle_link_rbm;</div><div class='add'>+	struct dp_srng wbm_idle_ring;</div><div class='add'>+	struct dp_srng wbm_desc_rel_ring;</div><div class='add'>+	struct dp_srng reo_reinject_ring;</div><div class='add'>+	struct dp_srng rx_rel_ring;</div><div class='add'>+	struct dp_srng reo_except_ring;</div><div class='add'>+	struct dp_srng reo_cmd_ring;</div><div class='add'>+	struct dp_srng reo_status_ring;</div><div class='add'>+	enum ath12k_peer_metadata_version peer_metadata_ver;</div><div class='add'>+	struct dp_srng reo_dst_ring[DP_REO_DST_RING_MAX];</div><div class='add'>+	struct dp_tx_ring tx_ring[DP_TCL_NUM_RING_MAX];</div><div class='add'>+	struct hal_wbm_idle_scatter_list scatter_list[DP_IDLE_SCATTER_BUFS_MAX];</div><div class='add'>+	struct list_head reo_cmd_update_rx_queue_list;</div><div class='add'>+	struct list_head reo_cmd_cache_flush_list;</div><div class='add'>+	u32 reo_cmd_cache_flush_count;</div><div class='add'>+	/* protects access to below fields,</div><div class='add'>+	 * - reo_cmd_update_rx_queue_list</div><div class='add'>+	 * - reo_cmd_cache_flush_list</div><div class='add'>+	 * - reo_cmd_cache_flush_count</div><div class='add'>+	 */</div><div class='add'>+	spinlock_t reo_rxq_flush_lock;</div><div class='add'>+	struct list_head reo_cmd_list;</div><div class='add'>+	/* protects access to below fields,</div><div class='add'>+	 * - reo_cmd_list</div><div class='add'>+	 */</div><div class='add'>+	spinlock_t reo_cmd_lock;</div><div class='add'>+	struct ath12k_hp_update_timer reo_cmd_timer;</div><div class='add'>+	struct ath12k_hp_update_timer tx_ring_timer[DP_TCL_NUM_RING_MAX];</div><div class='add'>+	struct ath12k_spt_info *spt_info;</div><div class='add'>+	u32 num_spt_pages;</div><div class='add'>+	u32 rx_ppt_base;</div><div class='add'>+	struct ath12k_rx_desc_info **rxbaddr;</div><div class='add'>+	struct ath12k_tx_desc_info **txbaddr;</div><div class='add'>+	struct list_head rx_desc_free_list;</div><div class='add'>+	/* protects the free desc list */</div><div class='add'>+	spinlock_t rx_desc_lock;</div><div class='add'>+</div><div class='add'>+	struct list_head tx_desc_free_list[ATH12K_HW_MAX_QUEUES];</div><div class='add'>+	struct list_head tx_desc_used_list[ATH12K_HW_MAX_QUEUES];</div><div class='add'>+	/* protects the free and used desc lists */</div><div class='add'>+	spinlock_t tx_desc_lock[ATH12K_HW_MAX_QUEUES];</div><div class='add'>+</div><div class='add'>+	struct dp_rxdma_ring rx_refill_buf_ring;</div><div class='add'>+	struct dp_srng rx_mac_buf_ring[MAX_RXDMA_PER_PDEV];</div><div class='add'>+	struct dp_srng rxdma_err_dst_ring[MAX_RXDMA_PER_PDEV];</div><div class='add'>+	struct dp_rxdma_mon_ring rxdma_mon_buf_ring;</div><div class='add'>+	struct dp_rxdma_mon_ring tx_mon_buf_ring;</div><div class='add'>+	struct dp_rxdma_mon_ring rx_mon_status_refill_ring[MAX_RXDMA_PER_PDEV];</div><div class='add'>+	struct ath12k_reo_q_addr_lut reoq_lut;</div><div class='add'>+	struct ath12k_reo_q_addr_lut ml_reoq_lut;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* HTT definitions */</div><div class='add'>+#define HTT_TAG_TCL_METADATA_VERSION		5</div><div class='add'>+</div><div class='add'>+#define HTT_TCL_META_DATA_TYPE			GENMASK(1, 0)</div><div class='add'>+#define HTT_TCL_META_DATA_VALID_HTT		BIT(2)</div><div class='add'>+</div><div class='add'>+/* vdev meta data */</div><div class='add'>+#define HTT_TCL_META_DATA_VDEV_ID		 GENMASK(10, 3)</div><div class='add'>+#define HTT_TCL_META_DATA_PDEV_ID		 GENMASK(12, 11)</div><div class='add'>+#define HTT_TCL_META_DATA_HOST_INSPECTED_MISSION BIT(13)</div><div class='add'>+</div><div class='add'>+/* peer meta data */</div><div class='add'>+#define HTT_TCL_META_DATA_PEER_ID		GENMASK(15, 3)</div><div class='add'>+</div><div class='add'>+/* Global sequence number */</div><div class='add'>+#define HTT_TCL_META_DATA_TYPE_GLOBAL_SEQ_NUM		3</div><div class='add'>+#define HTT_TCL_META_DATA_GLOBAL_SEQ_HOST_INSPECTED	BIT(2)</div><div class='add'>+#define HTT_TCL_META_DATA_GLOBAL_SEQ_NUM		GENMASK(14, 3)</div><div class='add'>+#define HTT_TX_MLO_MCAST_HOST_REINJECT_BASE_VDEV_ID	128</div><div class='add'>+</div><div class='add'>+/* HTT tx completion is overlaid in wbm_release_ring */</div><div class='add'>+#define HTT_TX_WBM_COMP_INFO0_STATUS		GENMASK(16, 13)</div><div class='add'>+#define HTT_TX_WBM_COMP_INFO1_REINJECT_REASON	GENMASK(3, 0)</div><div class='add'>+#define HTT_TX_WBM_COMP_INFO1_EXCEPTION_FRAME	BIT(4)</div><div class='add'>+</div><div class='add'>+#define HTT_TX_WBM_COMP_INFO2_ACK_RSSI		GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+struct htt_tx_wbm_completion {</div><div class='add'>+	__le32 rsvd0[2];</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le32 info3;</div><div class='add'>+	__le32 info4;</div><div class='add'>+	__le32 rsvd1;</div><div class='add'>+</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum htt_h2t_msg_type {</div><div class='add'>+	HTT_H2T_MSG_TYPE_VERSION_REQ		= 0,</div><div class='add'>+	HTT_H2T_MSG_TYPE_SRING_SETUP		= 0xb,</div><div class='add'>+	HTT_H2T_MSG_TYPE_RX_RING_SELECTION_CFG	= 0xc,</div><div class='add'>+	HTT_H2T_MSG_TYPE_EXT_STATS_CFG		= 0x10,</div><div class='add'>+	HTT_H2T_MSG_TYPE_PPDU_STATS_CFG		= 0x11,</div><div class='add'>+	HTT_H2T_MSG_TYPE_VDEV_TXRX_STATS_CFG	= 0x1a,</div><div class='add'>+	HTT_H2T_MSG_TYPE_TX_MONITOR_CFG		= 0x1b,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HTT_VER_REQ_INFO_MSG_ID		GENMASK(7, 0)</div><div class='add'>+#define HTT_OPTION_TCL_METADATA_VER_V1	1</div><div class='add'>+#define HTT_OPTION_TCL_METADATA_VER_V2	2</div><div class='add'>+#define HTT_OPTION_TAG			GENMASK(7, 0)</div><div class='add'>+#define HTT_OPTION_LEN			GENMASK(15, 8)</div><div class='add'>+#define HTT_OPTION_VALUE		GENMASK(31, 16)</div><div class='add'>+#define HTT_TCL_METADATA_VER_SZ		4</div><div class='add'>+</div><div class='add'>+struct htt_ver_req_cmd {</div><div class='add'>+	__le32 ver_reg_info;</div><div class='add'>+	__le32 tcl_metadata_version;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum htt_srng_ring_type {</div><div class='add'>+	HTT_HW_TO_SW_RING,</div><div class='add'>+	HTT_SW_TO_HW_RING,</div><div class='add'>+	HTT_SW_TO_SW_RING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum htt_srng_ring_id {</div><div class='add'>+	HTT_RXDMA_HOST_BUF_RING,</div><div class='add'>+	HTT_RXDMA_MONITOR_STATUS_RING,</div><div class='add'>+	HTT_RXDMA_MONITOR_BUF_RING,</div><div class='add'>+	HTT_RXDMA_MONITOR_DESC_RING,</div><div class='add'>+	HTT_RXDMA_MONITOR_DEST_RING,</div><div class='add'>+	HTT_HOST1_TO_FW_RXBUF_RING,</div><div class='add'>+	HTT_HOST2_TO_FW_RXBUF_RING,</div><div class='add'>+	HTT_RXDMA_NON_MONITOR_DEST_RING,</div><div class='add'>+	HTT_RXDMA_HOST_BUF_RING2,</div><div class='add'>+	HTT_TX_MON_HOST2MON_BUF_RING,</div><div class='add'>+	HTT_TX_MON_MON2HOST_DEST_RING,</div><div class='add'>+	HTT_RX_MON_HOST2MON_BUF_RING,</div><div class='add'>+	HTT_RX_MON_MON2HOST_DEST_RING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* host -&gt; target  HTT_SRING_SETUP message</div><div class='add'>+ *</div><div class='add'>+ * After target is booted up, Host can send SRING setup message for</div><div class='add'>+ * each host facing LMAC SRING. Target setups up HW registers based</div><div class='add'>+ * on setup message and confirms back to Host if response_required is set.</div><div class='add'>+ * Host should wait for confirmation message before sending new SRING</div><div class='add'>+ * setup message</div><div class='add'>+ *</div><div class='add'>+ * The message would appear as follows:</div><div class='add'>+ *</div><div class='add'>+ * |31            24|23    20|19|18 16|15|14          8|7                0|</div><div class='add'>+ * |--------------- +-----------------+----------------+------------------|</div><div class='add'>+ * |    ring_type   |      ring_id    |    pdev_id     |     msg_type     |</div><div class='add'>+ * |----------------------------------------------------------------------|</div><div class='add'>+ * |                          ring_base_addr_lo                           |</div><div class='add'>+ * |----------------------------------------------------------------------|</div><div class='add'>+ * |                         ring_base_addr_hi                            |</div><div class='add'>+ * |----------------------------------------------------------------------|</div><div class='add'>+ * |ring_misc_cfg_flag|ring_entry_size|            ring_size              |</div><div class='add'>+ * |----------------------------------------------------------------------|</div><div class='add'>+ * |                         ring_head_offset32_remote_addr_lo            |</div><div class='add'>+ * |----------------------------------------------------------------------|</div><div class='add'>+ * |                         ring_head_offset32_remote_addr_hi            |</div><div class='add'>+ * |----------------------------------------------------------------------|</div><div class='add'>+ * |                         ring_tail_offset32_remote_addr_lo            |</div><div class='add'>+ * |----------------------------------------------------------------------|</div><div class='add'>+ * |                         ring_tail_offset32_remote_addr_hi            |</div><div class='add'>+ * |----------------------------------------------------------------------|</div><div class='add'>+ * |                          ring_msi_addr_lo                            |</div><div class='add'>+ * |----------------------------------------------------------------------|</div><div class='add'>+ * |                          ring_msi_addr_hi                            |</div><div class='add'>+ * |----------------------------------------------------------------------|</div><div class='add'>+ * |                          ring_msi_data                               |</div><div class='add'>+ * |----------------------------------------------------------------------|</div><div class='add'>+ * |         intr_timer_th            |IM|      intr_batch_counter_th     |</div><div class='add'>+ * |----------------------------------------------------------------------|</div><div class='add'>+ * |          reserved        |RR|PTCF|        intr_low_threshold         |</div><div class='add'>+ * |----------------------------------------------------------------------|</div><div class='add'>+ * Where</div><div class='add'>+ *     IM = sw_intr_mode</div><div class='add'>+ *     RR = response_required</div><div class='add'>+ *     PTCF = prefetch_timer_cfg</div><div class='add'>+ *</div><div class='add'>+ * The message is interpreted as follows:</div><div class='add'>+ * dword0  - b'0:7   - msg_type: This will be set to</div><div class='add'>+ *                     HTT_H2T_MSG_TYPE_SRING_SETUP</div><div class='add'>+ *           b'8:15  - pdev_id:</div><div class='add'>+ *                     0 (for rings at SOC/UMAC level),</div><div class='add'>+ *                     1/2/3 mac id (for rings at LMAC level)</div><div class='add'>+ *           b'16:23 - ring_id: identify which ring is to setup,</div><div class='add'>+ *                     more details can be got from enum htt_srng_ring_id</div><div class='add'>+ *           b'24:31 - ring_type: identify type of host rings,</div><div class='add'>+ *                     more details can be got from enum htt_srng_ring_type</div><div class='add'>+ * dword1  - b'0:31  - ring_base_addr_lo: Lower 32bits of ring base address</div><div class='add'>+ * dword2  - b'0:31  - ring_base_addr_hi: Upper 32bits of ring base address</div><div class='add'>+ * dword3  - b'0:15  - ring_size: size of the ring in unit of 4-bytes words</div><div class='add'>+ *           b'16:23 - ring_entry_size: Size of each entry in 4-byte word units</div><div class='add'>+ *           b'24:31 - ring_misc_cfg_flag: Valid only for HW_TO_SW_RING and</div><div class='add'>+ *                     SW_TO_HW_RING.</div><div class='add'>+ *                     Refer to HTT_SRING_SETUP_RING_MISC_CFG_RING defs.</div><div class='add'>+ * dword4  - b'0:31  - ring_head_off32_remote_addr_lo:</div><div class='add'>+ *                     Lower 32 bits of memory address of the remote variable</div><div class='add'>+ *                     storing the 4-byte word offset that identifies the head</div><div class='add'>+ *                     element within the ring.</div><div class='add'>+ *                     (The head offset variable has type u32.)</div><div class='add'>+ *                     Valid for HW_TO_SW and SW_TO_SW rings.</div><div class='add'>+ * dword5  - b'0:31  - ring_head_off32_remote_addr_hi:</div><div class='add'>+ *                     Upper 32 bits of memory address of the remote variable</div><div class='add'>+ *                     storing the 4-byte word offset that identifies the head</div><div class='add'>+ *                     element within the ring.</div><div class='add'>+ *                     (The head offset variable has type u32.)</div><div class='add'>+ *                     Valid for HW_TO_SW and SW_TO_SW rings.</div><div class='add'>+ * dword6  - b'0:31  - ring_tail_off32_remote_addr_lo:</div><div class='add'>+ *                     Lower 32 bits of memory address of the remote variable</div><div class='add'>+ *                     storing the 4-byte word offset that identifies the tail</div><div class='add'>+ *                     element within the ring.</div><div class='add'>+ *                     (The tail offset variable has type u32.)</div><div class='add'>+ *                     Valid for HW_TO_SW and SW_TO_SW rings.</div><div class='add'>+ * dword7  - b'0:31  - ring_tail_off32_remote_addr_hi:</div><div class='add'>+ *                     Upper 32 bits of memory address of the remote variable</div><div class='add'>+ *                     storing the 4-byte word offset that identifies the tail</div><div class='add'>+ *                     element within the ring.</div><div class='add'>+ *                     (The tail offset variable has type u32.)</div><div class='add'>+ *                     Valid for HW_TO_SW and SW_TO_SW rings.</div><div class='add'>+ * dword8  - b'0:31  - ring_msi_addr_lo: Lower 32bits of MSI cfg address</div><div class='add'>+ *                     valid only for HW_TO_SW_RING and SW_TO_HW_RING</div><div class='add'>+ * dword9  - b'0:31  - ring_msi_addr_hi: Upper 32bits of MSI cfg address</div><div class='add'>+ *                     valid only for HW_TO_SW_RING and SW_TO_HW_RING</div><div class='add'>+ * dword10 - b'0:31  - ring_msi_data: MSI data</div><div class='add'>+ *                     Refer to HTT_SRING_SETUP_RING_MSC_CFG_xxx defs</div><div class='add'>+ *                     valid only for HW_TO_SW_RING and SW_TO_HW_RING</div><div class='add'>+ * dword11 - b'0:14  - intr_batch_counter_th:</div><div class='add'>+ *                     batch counter threshold is in units of 4-byte words.</div><div class='add'>+ *                     HW internally maintains and increments batch count.</div><div class='add'>+ *                     (see SRING spec for detail description).</div><div class='add'>+ *                     When batch count reaches threshold value, an interrupt</div><div class='add'>+ *                     is generated by HW.</div><div class='add'>+ *           b'15    - sw_intr_mode:</div><div class='add'>+ *                     This configuration shall be static.</div><div class='add'>+ *                     Only programmed at power up.</div><div class='add'>+ *                     0: generate pulse style sw interrupts</div><div class='add'>+ *                     1: generate level style sw interrupts</div><div class='add'>+ *           b'16:31 - intr_timer_th:</div><div class='add'>+ *                     The timer init value when timer is idle or is</div><div class='add'>+ *                     initialized to start downcounting.</div><div class='add'>+ *                     In 8us units (to cover a range of 0 to 524 ms)</div><div class='add'>+ * dword12 - b'0:15  - intr_low_threshold:</div><div class='add'>+ *                     Used only by Consumer ring to generate ring_sw_int_p.</div><div class='add'>+ *                     Ring entries low threshold water mark, that is used</div><div class='add'>+ *                     in combination with the interrupt timer as well as</div><div class='add'>+ *                     the clearing of the level interrupt.</div><div class='add'>+ *           b'16:18 - prefetch_timer_cfg:</div><div class='add'>+ *                     Used only by Consumer ring to set timer mode to</div><div class='add'>+ *                     support Application prefetch handling.</div><div class='add'>+ *                     The external tail offset/pointer will be updated</div><div class='add'>+ *                     at following intervals:</div><div class='add'>+ *                     3'b000: (Prefetch feature disabled; used only for debug)</div><div class='add'>+ *                     3'b001: 1 usec</div><div class='add'>+ *                     3'b010: 4 usec</div><div class='add'>+ *                     3'b011: 8 usec (default)</div><div class='add'>+ *                     3'b100: 16 usec</div><div class='add'>+ *                     Others: Reserved</div><div class='add'>+ *           b'19    - response_required:</div><div class='add'>+ *                     Host needs HTT_T2H_MSG_TYPE_SRING_SETUP_DONE as response</div><div class='add'>+ *           b'20:31 - reserved:  reserved for future use</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HTT_SRNG_SETUP_CMD_INFO0_MSG_TYPE	GENMASK(7, 0)</div><div class='add'>+#define HTT_SRNG_SETUP_CMD_INFO0_PDEV_ID	GENMASK(15, 8)</div><div class='add'>+#define HTT_SRNG_SETUP_CMD_INFO0_RING_ID	GENMASK(23, 16)</div><div class='add'>+#define HTT_SRNG_SETUP_CMD_INFO0_RING_TYPE	GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+#define HTT_SRNG_SETUP_CMD_INFO1_RING_SIZE			GENMASK(15, 0)</div><div class='add'>+#define HTT_SRNG_SETUP_CMD_INFO1_RING_ENTRY_SIZE		GENMASK(23, 16)</div><div class='add'>+#define HTT_SRNG_SETUP_CMD_INFO1_RING_LOOP_CNT_DIS		BIT(25)</div><div class='add'>+#define HTT_SRNG_SETUP_CMD_INFO1_RING_FLAGS_MSI_SWAP		BIT(27)</div><div class='add'>+#define HTT_SRNG_SETUP_CMD_INFO1_RING_FLAGS_HOST_FW_SWAP	BIT(28)</div><div class='add'>+#define HTT_SRNG_SETUP_CMD_INFO1_RING_FLAGS_TLV_SWAP		BIT(29)</div><div class='add'>+</div><div class='add'>+#define HTT_SRNG_SETUP_CMD_INTR_INFO_BATCH_COUNTER_THRESH	GENMASK(14, 0)</div><div class='add'>+#define HTT_SRNG_SETUP_CMD_INTR_INFO_SW_INTR_MODE		BIT(15)</div><div class='add'>+#define HTT_SRNG_SETUP_CMD_INTR_INFO_INTR_TIMER_THRESH		GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define HTT_SRNG_SETUP_CMD_INFO2_INTR_LOW_THRESH	GENMASK(15, 0)</div><div class='add'>+#define HTT_SRNG_SETUP_CMD_INFO2_PRE_FETCH_TIMER_CFG	GENMASK(18, 16)</div><div class='add'>+#define HTT_SRNG_SETUP_CMD_INFO2_RESPONSE_REQUIRED	BIT(19)</div><div class='add'>+</div><div class='add'>+struct htt_srng_setup_cmd {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 ring_base_addr_lo;</div><div class='add'>+	__le32 ring_base_addr_hi;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 ring_head_off32_remote_addr_lo;</div><div class='add'>+	__le32 ring_head_off32_remote_addr_hi;</div><div class='add'>+	__le32 ring_tail_off32_remote_addr_lo;</div><div class='add'>+	__le32 ring_tail_off32_remote_addr_hi;</div><div class='add'>+	__le32 ring_msi_addr_lo;</div><div class='add'>+	__le32 ring_msi_addr_hi;</div><div class='add'>+	__le32 msi_data;</div><div class='add'>+	__le32 intr_info;</div><div class='add'>+	__le32 info2;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* host -&gt; target FW  PPDU_STATS config message</div><div class='add'>+ *</div><div class='add'>+ * @details</div><div class='add'>+ * The following field definitions describe the format of the HTT host</div><div class='add'>+ * to target FW for PPDU_STATS_CFG msg.</div><div class='add'>+ * The message allows the host to configure the PPDU_STATS_IND messages</div><div class='add'>+ * produced by the target.</div><div class='add'>+ *</div><div class='add'>+ * |31          24|23          16|15           8|7            0|</div><div class='add'>+ * |-----------------------------------------------------------|</div><div class='add'>+ * |    REQ bit mask             |   pdev_mask  |   msg type   |</div><div class='add'>+ * |-----------------------------------------------------------|</div><div class='add'>+ * Header fields:</div><div class='add'>+ *  - MSG_TYPE</div><div class='add'>+ *    Bits 7:0</div><div class='add'>+ *    Purpose: identifies this is a req to configure ppdu_stats_ind from target</div><div class='add'>+ *    Value: 0x11</div><div class='add'>+ *  - PDEV_MASK</div><div class='add'>+ *    Bits 8:15</div><div class='add'>+ *    Purpose: identifies which pdevs this PPDU stats configuration applies to</div><div class='add'>+ *    Value: This is a overloaded field, refer to usage and interpretation of</div><div class='add'>+ *           PDEV in interface document.</div><div class='add'>+ *           Bit   8    :  Reserved for SOC stats</div><div class='add'>+ *           Bit 9 - 15 :  Indicates PDEV_MASK in DBDC</div><div class='add'>+ *                         Indicates MACID_MASK in DBS</div><div class='add'>+ *  - REQ_TLV_BIT_MASK</div><div class='add'>+ *    Bits 16:31</div><div class='add'>+ *    Purpose: each set bit indicates the corresponding PPDU stats TLV type</div><div class='add'>+ *        needs to be included in the target's PPDU_STATS_IND messages.</div><div class='add'>+ *    Value: refer htt_ppdu_stats_tlv_tag_t &lt;&lt;&lt;???</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct htt_ppdu_stats_cfg_cmd {</div><div class='add'>+	__le32 msg;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HTT_PPDU_STATS_CFG_MSG_TYPE		GENMASK(7, 0)</div><div class='add'>+#define HTT_PPDU_STATS_CFG_SOC_STATS		BIT(8)</div><div class='add'>+#define HTT_PPDU_STATS_CFG_PDEV_ID		GENMASK(15, 9)</div><div class='add'>+#define HTT_PPDU_STATS_CFG_TLV_TYPE_BITMASK	GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+enum htt_ppdu_stats_tag_type {</div><div class='add'>+	HTT_PPDU_STATS_TAG_COMMON,</div><div class='add'>+	HTT_PPDU_STATS_TAG_USR_COMMON,</div><div class='add'>+	HTT_PPDU_STATS_TAG_USR_RATE,</div><div class='add'>+	HTT_PPDU_STATS_TAG_USR_MPDU_ENQ_BITMAP_64,</div><div class='add'>+	HTT_PPDU_STATS_TAG_USR_MPDU_ENQ_BITMAP_256,</div><div class='add'>+	HTT_PPDU_STATS_TAG_SCH_CMD_STATUS,</div><div class='add'>+	HTT_PPDU_STATS_TAG_USR_COMPLTN_COMMON,</div><div class='add'>+	HTT_PPDU_STATS_TAG_USR_COMPLTN_BA_BITMAP_64,</div><div class='add'>+	HTT_PPDU_STATS_TAG_USR_COMPLTN_BA_BITMAP_256,</div><div class='add'>+	HTT_PPDU_STATS_TAG_USR_COMPLTN_ACK_BA_STATUS,</div><div class='add'>+	HTT_PPDU_STATS_TAG_USR_COMPLTN_FLUSH,</div><div class='add'>+	HTT_PPDU_STATS_TAG_USR_COMMON_ARRAY,</div><div class='add'>+	HTT_PPDU_STATS_TAG_INFO,</div><div class='add'>+	HTT_PPDU_STATS_TAG_TX_MGMTCTRL_PAYLOAD,</div><div class='add'>+</div><div class='add'>+	/* New TLV's are added above to this line */</div><div class='add'>+	HTT_PPDU_STATS_TAG_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HTT_PPDU_STATS_TAG_DEFAULT (BIT(HTT_PPDU_STATS_TAG_COMMON) \</div><div class='add'>+				   | BIT(HTT_PPDU_STATS_TAG_USR_COMMON) \</div><div class='add'>+				   | BIT(HTT_PPDU_STATS_TAG_USR_RATE) \</div><div class='add'>+				   | BIT(HTT_PPDU_STATS_TAG_SCH_CMD_STATUS) \</div><div class='add'>+				   | BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_COMMON) \</div><div class='add'>+				   | BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_ACK_BA_STATUS) \</div><div class='add'>+				   | BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_FLUSH) \</div><div class='add'>+				   | BIT(HTT_PPDU_STATS_TAG_USR_COMMON_ARRAY))</div><div class='add'>+</div><div class='add'>+#define HTT_PPDU_STATS_TAG_PKTLOG  (BIT(HTT_PPDU_STATS_TAG_USR_MPDU_ENQ_BITMAP_64) | \</div><div class='add'>+				    BIT(HTT_PPDU_STATS_TAG_USR_MPDU_ENQ_BITMAP_256) | \</div><div class='add'>+				    BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_BA_BITMAP_64) | \</div><div class='add'>+				    BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_BA_BITMAP_256) | \</div><div class='add'>+				    BIT(HTT_PPDU_STATS_TAG_INFO) | \</div><div class='add'>+				    BIT(HTT_PPDU_STATS_TAG_TX_MGMTCTRL_PAYLOAD) | \</div><div class='add'>+				    HTT_PPDU_STATS_TAG_DEFAULT)</div><div class='add'>+</div><div class='add'>+enum htt_stats_internal_ppdu_frametype {</div><div class='add'>+	HTT_STATS_PPDU_FTYPE_CTRL,</div><div class='add'>+	HTT_STATS_PPDU_FTYPE_DATA,</div><div class='add'>+	HTT_STATS_PPDU_FTYPE_BAR,</div><div class='add'>+	HTT_STATS_PPDU_FTYPE_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* HTT_H2T_MSG_TYPE_RX_RING_SELECTION_CFG Message</div><div class='add'>+ *</div><div class='add'>+ * details:</div><div class='add'>+ *    HTT_H2T_MSG_TYPE_RX_RING_SELECTION_CFG message is sent by host to</div><div class='add'>+ *    configure RXDMA rings.</div><div class='add'>+ *    The configuration is per ring based and includes both packet subtypes</div><div class='add'>+ *    and PPDU/MPDU TLVs.</div><div class='add'>+ *</div><div class='add'>+ *    The message would appear as follows:</div><div class='add'>+ *</div><div class='add'>+ *    |31   29|28|27|26|25|24|23       16|15             8|7             0|</div><div class='add'>+ *    |-------+--+--+--+--+--+-----------+----------------+---------------|</div><div class='add'>+ *    | rsvd1 |ED|DT|OV|PS|SS|  ring_id  |     pdev_id    |    msg_type   |</div><div class='add'>+ *    |-------------------------------------------------------------------|</div><div class='add'>+ *    |              rsvd2               |           ring_buffer_size     |</div><div class='add'>+ *    |-------------------------------------------------------------------|</div><div class='add'>+ *    |                        packet_type_enable_flags_0                 |</div><div class='add'>+ *    |-------------------------------------------------------------------|</div><div class='add'>+ *    |                        packet_type_enable_flags_1                 |</div><div class='add'>+ *    |-------------------------------------------------------------------|</div><div class='add'>+ *    |                        packet_type_enable_flags_2                 |</div><div class='add'>+ *    |-------------------------------------------------------------------|</div><div class='add'>+ *    |                        packet_type_enable_flags_3                 |</div><div class='add'>+ *    |-------------------------------------------------------------------|</div><div class='add'>+ *    |                         tlv_filter_in_flags                       |</div><div class='add'>+ *    |-------------------------------------------------------------------|</div><div class='add'>+ * Where:</div><div class='add'>+ *     PS = pkt_swap</div><div class='add'>+ *     SS = status_swap</div><div class='add'>+ * The message is interpreted as follows:</div><div class='add'>+ * dword0 - b'0:7   - msg_type: This will be set to</div><div class='add'>+ *                    HTT_H2T_MSG_TYPE_RX_RING_SELECTION_CFG</div><div class='add'>+ *          b'8:15  - pdev_id:</div><div class='add'>+ *                    0 (for rings at SOC/UMAC level),</div><div class='add'>+ *                    1/2/3 mac id (for rings at LMAC level)</div><div class='add'>+ *          b'16:23 - ring_id : Identify the ring to configure.</div><div class='add'>+ *                    More details can be got from enum htt_srng_ring_id</div><div class='add'>+ *          b'24    - status_swap: 1 is to swap status TLV</div><div class='add'>+ *          b'25    - pkt_swap:  1 is to swap packet TLV</div><div class='add'>+ *          b'26    - rx_offset_valid (OV): flag to indicate rx offsets</div><div class='add'>+ *		      configuration fields are valid</div><div class='add'>+ *          b'27    - drop_thresh_valid (DT): flag to indicate if the</div><div class='add'>+ *		      rx_drop_threshold field is valid</div><div class='add'>+ *          b'28    - rx_mon_global_en: Enable/Disable global register</div><div class='add'>+ *		      configuration in Rx monitor module.</div><div class='add'>+ *          b'29:31 - rsvd1:  reserved for future use</div><div class='add'>+ * dword1 - b'0:16  - ring_buffer_size: size of buffers referenced by rx ring,</div><div class='add'>+ *                    in byte units.</div><div class='add'>+ *                    Valid only for HW_TO_SW_RING and SW_TO_HW_RING</div><div class='add'>+ *        - b'16:31 - rsvd2: Reserved for future use</div><div class='add'>+ * dword2 - b'0:31  - packet_type_enable_flags_0:</div><div class='add'>+ *                    Enable MGMT packet from 0b0000 to 0b1001</div><div class='add'>+ *                    bits from low to high: FP, MD, MO - 3 bits</div><div class='add'>+ *                        FP: Filter_Pass</div><div class='add'>+ *                        MD: Monitor_Direct</div><div class='add'>+ *                        MO: Monitor_Other</div><div class='add'>+ *                    10 mgmt subtypes * 3 bits -&gt; 30 bits</div><div class='add'>+ *                    Refer to PKT_TYPE_ENABLE_FLAG0_xxx_MGMT_xxx defs</div><div class='add'>+ * dword3 - b'0:31  - packet_type_enable_flags_1:</div><div class='add'>+ *                    Enable MGMT packet from 0b1010 to 0b1111</div><div class='add'>+ *                    bits from low to high: FP, MD, MO - 3 bits</div><div class='add'>+ *                    Refer to PKT_TYPE_ENABLE_FLAG1_xxx_MGMT_xxx defs</div><div class='add'>+ * dword4 - b'0:31 -  packet_type_enable_flags_2:</div><div class='add'>+ *                    Enable CTRL packet from 0b0000 to 0b1001</div><div class='add'>+ *                    bits from low to high: FP, MD, MO - 3 bits</div><div class='add'>+ *                    Refer to PKT_TYPE_ENABLE_FLAG2_xxx_CTRL_xxx defs</div><div class='add'>+ * dword5 - b'0:31  - packet_type_enable_flags_3:</div><div class='add'>+ *                    Enable CTRL packet from 0b1010 to 0b1111,</div><div class='add'>+ *                    MCAST_DATA, UCAST_DATA, NULL_DATA</div><div class='add'>+ *                    bits from low to high: FP, MD, MO - 3 bits</div><div class='add'>+ *                    Refer to PKT_TYPE_ENABLE_FLAG3_xxx_CTRL_xxx defs</div><div class='add'>+ * dword6 - b'0:31 -  tlv_filter_in_flags:</div><div class='add'>+ *                    Filter in Attention/MPDU/PPDU/Header/User tlvs</div><div class='add'>+ *                    Refer to CFG_TLV_FILTER_IN_FLAG defs</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_MSG_TYPE	GENMASK(7, 0)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PDEV_ID	GENMASK(15, 8)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_RING_ID	GENMASK(23, 16)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_SS		BIT(24)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PS		BIT(25)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_OFFSET_VALID	BIT(26)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_DROP_THRES_VAL	BIT(27)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_EN_RXMON		BIT(28)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_CMD_INFO1_BUF_SIZE		GENMASK(15, 0)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_CMD_INFO1_CONF_LEN_MGMT	GENMASK(18, 16)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_CMD_INFO1_CONF_LEN_CTRL	GENMASK(21, 19)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_CMD_INFO1_CONF_LEN_DATA	GENMASK(24, 22)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_CMD_INFO2_DROP_THRESHOLD	GENMASK(9, 0)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_CMD_INFO2_EN_LOG_MGMT_TYPE	BIT(17)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_CMD_INFO2_EN_CTRL_TYPE	BIT(18)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_CMD_INFO2_EN_LOG_DATA_TYPE	BIT(19)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_CMD_INFO3_EN_TLV_PKT_OFFSET	BIT(0)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_CMD_INFO3_PKT_TLV_OFFSET	GENMASK(14, 1)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_RX_PACKET_OFFSET      GENMASK(15, 0)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_RX_HEADER_OFFSET      GENMASK(31, 16)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_RX_MPDU_END_OFFSET    GENMASK(15, 0)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_RX_MPDU_START_OFFSET  GENMASK(31, 16)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_RX_MSDU_END_OFFSET    GENMASK(15, 0)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_RX_MSDU_START_OFFSET  GENMASK(31, 16)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_RX_ATTENTION_OFFSET   GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_WORD_MASK_COMPACT_SET	BIT(23)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_RX_MPDU_START_MASK	GENMASK(15, 0)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_RX_MPDU_END_MASK	GENMASK(18, 16)</div><div class='add'>+#define HTT_RX_RING_SELECTION_CFG_RX_MSDU_END_MASK	GENMASK(16, 0)</div><div class='add'>+</div><div class='add'>+enum htt_rx_filter_tlv_flags {</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_MPDU_START		= BIT(0),</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_MSDU_START		= BIT(1),</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_RX_PACKET		= BIT(2),</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_MSDU_END		= BIT(3),</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_MPDU_END		= BIT(4),</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_PACKET_HEADER		= BIT(5),</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_PER_MSDU_HEADER		= BIT(6),</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_ATTENTION		= BIT(7),</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_PPDU_START		= BIT(8),</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_PPDU_END		= BIT(9),</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_PPDU_END_USER_STATS	= BIT(10),</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_PPDU_END_USER_STATS_EXT	= BIT(11),</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_PPDU_END_STATUS_DONE	= BIT(12),</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_PPDU_START_USER_INFO	= BIT(13),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum htt_rx_mgmt_pkt_filter_tlv_flags0 {</div><div class='add'>+	HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS0_ASSOC_REQ		= BIT(0),</div><div class='add'>+	HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS0_ASSOC_REQ		= BIT(1),</div><div class='add'>+	HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS0_ASSOC_REQ		= BIT(2),</div><div class='add'>+	HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS0_ASSOC_RESP		= BIT(3),</div><div class='add'>+	HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS0_ASSOC_RESP		= BIT(4),</div><div class='add'>+	HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS0_ASSOC_RESP		= BIT(5),</div><div class='add'>+	HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS0_REASSOC_REQ	= BIT(6),</div><div class='add'>+	HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS0_REASSOC_REQ	= BIT(7),</div><div class='add'>+	HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS0_REASSOC_REQ	= BIT(8),</div><div class='add'>+	HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS0_REASSOC_RESP	= BIT(9),</div><div class='add'>+	HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS0_REASSOC_RESP	= BIT(10),</div><div class='add'>+	HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS0_REASSOC_RESP	= BIT(11),</div><div class='add'>+	HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS0_PROBE_REQ		= BIT(12),</div><div class='add'>+	HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS0_PROBE_REQ		= BIT(13),</div><div class='add'>+	HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS0_PROBE_REQ		= BIT(14),</div><div class='add'>+	HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS0_PROBE_RESP		= BIT(15),</div><div class='add'>+	HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS0_PROBE_RESP		= BIT(16),</div><div class='add'>+	HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS0_PROBE_RESP		= BIT(17),</div><div class='add'>+	HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS0_PROBE_TIMING_ADV	= BIT(18),</div><div class='add'>+	HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS0_PROBE_TIMING_ADV	= BIT(19),</div><div class='add'>+	HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS0_PROBE_TIMING_ADV	= BIT(20),</div><div class='add'>+	HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS0_RESERVED_7		= BIT(21),</div><div class='add'>+	HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS0_RESERVED_7		= BIT(22),</div><div class='add'>+	HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS0_RESERVED_7		= BIT(23),</div><div class='add'>+	HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS0_BEACON		= BIT(24),</div><div class='add'>+	HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS0_BEACON		= BIT(25),</div><div class='add'>+	HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS0_BEACON		= BIT(26),</div><div class='add'>+	HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS0_ATIM		= BIT(27),</div><div class='add'>+	HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS0_ATIM		= BIT(28),</div><div class='add'>+	HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS0_ATIM		= BIT(29),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum htt_rx_mgmt_pkt_filter_tlv_flags1 {</div><div class='add'>+	HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS1_DISASSOC		= BIT(0),</div><div class='add'>+	HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS1_DISASSOC		= BIT(1),</div><div class='add'>+	HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS1_DISASSOC		= BIT(2),</div><div class='add'>+	HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS1_AUTH		= BIT(3),</div><div class='add'>+	HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS1_AUTH		= BIT(4),</div><div class='add'>+	HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS1_AUTH		= BIT(5),</div><div class='add'>+	HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS1_DEAUTH		= BIT(6),</div><div class='add'>+	HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS1_DEAUTH		= BIT(7),</div><div class='add'>+	HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS1_DEAUTH		= BIT(8),</div><div class='add'>+	HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS1_ACTION		= BIT(9),</div><div class='add'>+	HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS1_ACTION		= BIT(10),</div><div class='add'>+	HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS1_ACTION		= BIT(11),</div><div class='add'>+	HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS1_ACTION_NOACK	= BIT(12),</div><div class='add'>+	HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS1_ACTION_NOACK	= BIT(13),</div><div class='add'>+	HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS1_ACTION_NOACK	= BIT(14),</div><div class='add'>+	HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS1_RESERVED_15	= BIT(15),</div><div class='add'>+	HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS1_RESERVED_15	= BIT(16),</div><div class='add'>+	HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS1_RESERVED_15	= BIT(17),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum htt_rx_ctrl_pkt_filter_tlv_flags2 {</div><div class='add'>+	HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_RESERVED_1	= BIT(0),</div><div class='add'>+	HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_RESERVED_1	= BIT(1),</div><div class='add'>+	HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_RESERVED_1	= BIT(2),</div><div class='add'>+	HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_RESERVED_2	= BIT(3),</div><div class='add'>+	HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_RESERVED_2	= BIT(4),</div><div class='add'>+	HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_RESERVED_2	= BIT(5),</div><div class='add'>+	HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_TRIGGER	= BIT(6),</div><div class='add'>+	HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_TRIGGER	= BIT(7),</div><div class='add'>+	HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_TRIGGER	= BIT(8),</div><div class='add'>+	HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_RESERVED_4	= BIT(9),</div><div class='add'>+	HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_RESERVED_4	= BIT(10),</div><div class='add'>+	HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_RESERVED_4	= BIT(11),</div><div class='add'>+	HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_BF_REP_POLL	= BIT(12),</div><div class='add'>+	HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_BF_REP_POLL	= BIT(13),</div><div class='add'>+	HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_BF_REP_POLL	= BIT(14),</div><div class='add'>+	HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_VHT_NDP	= BIT(15),</div><div class='add'>+	HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_VHT_NDP	= BIT(16),</div><div class='add'>+	HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_VHT_NDP	= BIT(17),</div><div class='add'>+	HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_FRAME_EXT	= BIT(18),</div><div class='add'>+	HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_FRAME_EXT	= BIT(19),</div><div class='add'>+	HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_FRAME_EXT	= BIT(20),</div><div class='add'>+	HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_WRAPPER	= BIT(21),</div><div class='add'>+	HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_WRAPPER	= BIT(22),</div><div class='add'>+	HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_WRAPPER	= BIT(23),</div><div class='add'>+	HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_BAR		= BIT(24),</div><div class='add'>+	HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS2_BAR		= BIT(25),</div><div class='add'>+	HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS2_BAR		= BIT(26),</div><div class='add'>+	HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_BA			= BIT(27),</div><div class='add'>+	HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS2_BA			= BIT(28),</div><div class='add'>+	HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS2_BA			= BIT(29),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum htt_rx_ctrl_pkt_filter_tlv_flags3 {</div><div class='add'>+	HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS3_PSPOLL		= BIT(0),</div><div class='add'>+	HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS3_PSPOLL		= BIT(1),</div><div class='add'>+	HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS3_PSPOLL		= BIT(2),</div><div class='add'>+	HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS3_RTS		= BIT(3),</div><div class='add'>+	HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS3_RTS		= BIT(4),</div><div class='add'>+	HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS3_RTS		= BIT(5),</div><div class='add'>+	HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS3_CTS		= BIT(6),</div><div class='add'>+	HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS3_CTS		= BIT(7),</div><div class='add'>+	HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS3_CTS		= BIT(8),</div><div class='add'>+	HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS3_ACK		= BIT(9),</div><div class='add'>+	HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS3_ACK		= BIT(10),</div><div class='add'>+	HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS3_ACK		= BIT(11),</div><div class='add'>+	HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS3_CFEND		= BIT(12),</div><div class='add'>+	HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS3_CFEND		= BIT(13),</div><div class='add'>+	HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS3_CFEND		= BIT(14),</div><div class='add'>+	HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS3_CFEND_ACK		= BIT(15),</div><div class='add'>+	HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS3_CFEND_ACK		= BIT(16),</div><div class='add'>+	HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS3_CFEND_ACK		= BIT(17),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum htt_rx_data_pkt_filter_tlv_flasg3 {</div><div class='add'>+	HTT_RX_FP_DATA_PKT_FILTER_TLV_FLASG3_MCAST	= BIT(18),</div><div class='add'>+	HTT_RX_MD_DATA_PKT_FILTER_TLV_FLASG3_MCAST	= BIT(19),</div><div class='add'>+	HTT_RX_MO_DATA_PKT_FILTER_TLV_FLASG3_MCAST	= BIT(20),</div><div class='add'>+	HTT_RX_FP_DATA_PKT_FILTER_TLV_FLASG3_UCAST	= BIT(21),</div><div class='add'>+	HTT_RX_MD_DATA_PKT_FILTER_TLV_FLASG3_UCAST	= BIT(22),</div><div class='add'>+	HTT_RX_MO_DATA_PKT_FILTER_TLV_FLASG3_UCAST	= BIT(23),</div><div class='add'>+	HTT_RX_FP_DATA_PKT_FILTER_TLV_FLASG3_NULL_DATA	= BIT(24),</div><div class='add'>+	HTT_RX_MD_DATA_PKT_FILTER_TLV_FLASG3_NULL_DATA	= BIT(25),</div><div class='add'>+	HTT_RX_MO_DATA_PKT_FILTER_TLV_FLASG3_NULL_DATA	= BIT(26),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HTT_RX_FP_MGMT_FILTER_FLAGS0 \</div><div class='add'>+	(HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS0_ASSOC_REQ \</div><div class='add'>+	| HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS0_ASSOC_RESP \</div><div class='add'>+	| HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS0_REASSOC_REQ \</div><div class='add'>+	| HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS0_REASSOC_RESP \</div><div class='add'>+	| HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS0_PROBE_REQ \</div><div class='add'>+	| HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS0_PROBE_RESP \</div><div class='add'>+	| HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS0_PROBE_TIMING_ADV \</div><div class='add'>+	| HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS0_BEACON \</div><div class='add'>+	| HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS0_ATIM)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MD_MGMT_FILTER_FLAGS0 \</div><div class='add'>+	(HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS0_ASSOC_REQ \</div><div class='add'>+	| HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS0_ASSOC_RESP \</div><div class='add'>+	| HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS0_REASSOC_REQ \</div><div class='add'>+	| HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS0_REASSOC_RESP \</div><div class='add'>+	| HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS0_PROBE_REQ \</div><div class='add'>+	| HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS0_PROBE_RESP \</div><div class='add'>+	| HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS0_PROBE_TIMING_ADV \</div><div class='add'>+	| HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS0_BEACON \</div><div class='add'>+	| HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS0_ATIM)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MO_MGMT_FILTER_FLAGS0 \</div><div class='add'>+	(HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS0_ASSOC_REQ \</div><div class='add'>+	| HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS0_ASSOC_RESP \</div><div class='add'>+	| HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS0_REASSOC_REQ \</div><div class='add'>+	| HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS0_REASSOC_RESP \</div><div class='add'>+	| HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS0_PROBE_REQ \</div><div class='add'>+	| HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS0_PROBE_RESP \</div><div class='add'>+	| HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS0_PROBE_TIMING_ADV \</div><div class='add'>+	| HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS0_BEACON \</div><div class='add'>+	| HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS0_ATIM)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_FP_MGMT_FILTER_FLAGS1 (HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS1_DISASSOC \</div><div class='add'>+				     | HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS1_AUTH \</div><div class='add'>+				     | HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS1_DEAUTH \</div><div class='add'>+				     | HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS1_ACTION \</div><div class='add'>+				     | HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS1_ACTION_NOACK)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MD_MGMT_FILTER_FLAGS1 (HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS1_DISASSOC \</div><div class='add'>+				     | HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS1_AUTH \</div><div class='add'>+				     | HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS1_DEAUTH \</div><div class='add'>+				     | HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS1_ACTION \</div><div class='add'>+				     | HTT_RX_MD_MGMT_PKT_FILTER_TLV_FLAGS1_ACTION_NOACK)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MO_MGMT_FILTER_FLAGS1 (HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS1_DISASSOC \</div><div class='add'>+				     | HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS1_AUTH \</div><div class='add'>+				     | HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS1_DEAUTH \</div><div class='add'>+				     | HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS1_ACTION \</div><div class='add'>+				     | HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS1_ACTION_NOACK)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_FP_CTRL_FILTER_FLASG2 (HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_WRAPPER \</div><div class='add'>+				     | HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_BAR \</div><div class='add'>+				     | HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_BA)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MD_CTRL_FILTER_FLASG2 (HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_WRAPPER \</div><div class='add'>+				     | HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS2_BAR \</div><div class='add'>+				     | HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS2_BA)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MO_CTRL_FILTER_FLASG2 (HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_WRAPPER \</div><div class='add'>+				     | HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS2_BAR \</div><div class='add'>+				     | HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS2_BA)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_FP_CTRL_FILTER_FLASG3 (HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS3_PSPOLL \</div><div class='add'>+				     | HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS3_RTS \</div><div class='add'>+				     | HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS3_CTS \</div><div class='add'>+				     | HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS3_ACK \</div><div class='add'>+				     | HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS3_CFEND \</div><div class='add'>+				     | HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS3_CFEND_ACK)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MD_CTRL_FILTER_FLASG3 (HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS3_PSPOLL \</div><div class='add'>+				     | HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS3_RTS \</div><div class='add'>+				     | HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS3_CTS \</div><div class='add'>+				     | HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS3_ACK \</div><div class='add'>+				     | HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS3_CFEND \</div><div class='add'>+				     | HTT_RX_MD_CTRL_PKT_FILTER_TLV_FLAGS3_CFEND_ACK)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MO_CTRL_FILTER_FLASG3 (HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS3_PSPOLL \</div><div class='add'>+				     | HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS3_RTS \</div><div class='add'>+				     | HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS3_CTS \</div><div class='add'>+				     | HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS3_ACK \</div><div class='add'>+				     | HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS3_CFEND \</div><div class='add'>+				     | HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS3_CFEND_ACK)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_FP_DATA_FILTER_FLASG3 (HTT_RX_FP_DATA_PKT_FILTER_TLV_FLASG3_MCAST \</div><div class='add'>+				     | HTT_RX_FP_DATA_PKT_FILTER_TLV_FLASG3_UCAST \</div><div class='add'>+				     | HTT_RX_FP_DATA_PKT_FILTER_TLV_FLASG3_NULL_DATA)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MD_DATA_FILTER_FLASG3 (HTT_RX_MD_DATA_PKT_FILTER_TLV_FLASG3_MCAST \</div><div class='add'>+				     | HTT_RX_MD_DATA_PKT_FILTER_TLV_FLASG3_UCAST \</div><div class='add'>+				     | HTT_RX_MD_DATA_PKT_FILTER_TLV_FLASG3_NULL_DATA)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MO_DATA_FILTER_FLASG3 (HTT_RX_MO_DATA_PKT_FILTER_TLV_FLASG3_MCAST \</div><div class='add'>+				     | HTT_RX_MO_DATA_PKT_FILTER_TLV_FLASG3_UCAST \</div><div class='add'>+				     | HTT_RX_MO_DATA_PKT_FILTER_TLV_FLASG3_NULL_DATA)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MON_FP_MGMT_FILTER_FLAGS0 \</div><div class='add'>+		(HTT_RX_FP_MGMT_FILTER_FLAGS0 | \</div><div class='add'>+		HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS0_RESERVED_7)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MON_MO_MGMT_FILTER_FLAGS0 \</div><div class='add'>+		(HTT_RX_MO_MGMT_FILTER_FLAGS0 | \</div><div class='add'>+		HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS0_RESERVED_7)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MON_FP_MGMT_FILTER_FLAGS1 \</div><div class='add'>+		(HTT_RX_FP_MGMT_FILTER_FLAGS1 | \</div><div class='add'>+		HTT_RX_FP_MGMT_PKT_FILTER_TLV_FLAGS1_RESERVED_15)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MON_MO_MGMT_FILTER_FLAGS1 \</div><div class='add'>+		(HTT_RX_MO_MGMT_FILTER_FLAGS1 | \</div><div class='add'>+		HTT_RX_MO_MGMT_PKT_FILTER_TLV_FLAGS1_RESERVED_15)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MON_FP_CTRL_FILTER_FLASG2 \</div><div class='add'>+		(HTT_RX_FP_CTRL_FILTER_FLASG2 | \</div><div class='add'>+		HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_RESERVED_1 | \</div><div class='add'>+		HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_RESERVED_2 | \</div><div class='add'>+		HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_TRIGGER | \</div><div class='add'>+		HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_RESERVED_4 | \</div><div class='add'>+		HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_BF_REP_POLL | \</div><div class='add'>+		HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_VHT_NDP | \</div><div class='add'>+		HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_FRAME_EXT)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MON_MO_CTRL_FILTER_FLASG2 \</div><div class='add'>+		(HTT_RX_MO_CTRL_FILTER_FLASG2 | \</div><div class='add'>+		HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_RESERVED_1 | \</div><div class='add'>+		HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_RESERVED_2 | \</div><div class='add'>+		HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_TRIGGER | \</div><div class='add'>+		HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_RESERVED_4 | \</div><div class='add'>+		HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_BF_REP_POLL | \</div><div class='add'>+		HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_VHT_NDP | \</div><div class='add'>+		HTT_RX_MO_CTRL_PKT_FILTER_TLV_FLAGS2_CTRL_FRAME_EXT)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MON_FP_CTRL_FILTER_FLASG3 HTT_RX_FP_CTRL_FILTER_FLASG3</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MON_MO_CTRL_FILTER_FLASG3 HTT_RX_MO_CTRL_FILTER_FLASG3</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MON_FP_DATA_FILTER_FLASG3 HTT_RX_FP_DATA_FILTER_FLASG3</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MON_MO_DATA_FILTER_FLASG3 HTT_RX_MO_DATA_FILTER_FLASG3</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MON_FILTER_TLV_FLAGS \</div><div class='add'>+		(HTT_RX_FILTER_TLV_FLAGS_MPDU_START | \</div><div class='add'>+		HTT_RX_FILTER_TLV_FLAGS_PPDU_START | \</div><div class='add'>+		HTT_RX_FILTER_TLV_FLAGS_PPDU_END | \</div><div class='add'>+		HTT_RX_FILTER_TLV_FLAGS_PPDU_END_USER_STATS | \</div><div class='add'>+		HTT_RX_FILTER_TLV_FLAGS_PPDU_END_USER_STATS_EXT | \</div><div class='add'>+		HTT_RX_FILTER_TLV_FLAGS_PPDU_END_STATUS_DONE)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MON_FILTER_TLV_FLAGS_MON_STATUS_RING \</div><div class='add'>+		(HTT_RX_FILTER_TLV_FLAGS_MPDU_START | \</div><div class='add'>+		HTT_RX_FILTER_TLV_FLAGS_PPDU_START | \</div><div class='add'>+		HTT_RX_FILTER_TLV_FLAGS_PPDU_END | \</div><div class='add'>+		HTT_RX_FILTER_TLV_FLAGS_PPDU_END_USER_STATS | \</div><div class='add'>+		HTT_RX_FILTER_TLV_FLAGS_PPDU_END_USER_STATS_EXT | \</div><div class='add'>+		HTT_RX_FILTER_TLV_FLAGS_PPDU_END_STATUS_DONE)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MON_FILTER_TLV_FLAGS_MON_BUF_RING \</div><div class='add'>+		(HTT_RX_FILTER_TLV_FLAGS_MPDU_START | \</div><div class='add'>+		HTT_RX_FILTER_TLV_FLAGS_MSDU_START | \</div><div class='add'>+		HTT_RX_FILTER_TLV_FLAGS_RX_PACKET | \</div><div class='add'>+		HTT_RX_FILTER_TLV_FLAGS_MSDU_END | \</div><div class='add'>+		HTT_RX_FILTER_TLV_FLAGS_MPDU_END | \</div><div class='add'>+		HTT_RX_FILTER_TLV_FLAGS_PACKET_HEADER | \</div><div class='add'>+		HTT_RX_FILTER_TLV_FLAGS_PER_MSDU_HEADER | \</div><div class='add'>+		HTT_RX_FILTER_TLV_FLAGS_ATTENTION)</div><div class='add'>+</div><div class='add'>+#define HTT_RX_MON_FILTER_TLV_FLAGS_MON_DEST_RING \</div><div class='add'>+	(HTT_RX_FILTER_TLV_FLAGS_MPDU_START | \</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_MSDU_START | \</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_RX_PACKET | \</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_MSDU_END | \</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_MPDU_END | \</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_PACKET_HEADER | \</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_PER_MSDU_HEADER | \</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_PPDU_START | \</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_PPDU_END | \</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_PPDU_END_USER_STATS | \</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_PPDU_END_USER_STATS_EXT | \</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_PPDU_END_STATUS_DONE | \</div><div class='add'>+	HTT_RX_FILTER_TLV_FLAGS_PPDU_START_USER_INFO)</div><div class='add'>+</div><div class='add'>+/* msdu start. mpdu end, attention, rx hdr tlv's are not subscribed */</div><div class='add'>+#define HTT_RX_TLV_FLAGS_RXDMA_RING \</div><div class='add'>+		(HTT_RX_FILTER_TLV_FLAGS_MPDU_START | \</div><div class='add'>+		HTT_RX_FILTER_TLV_FLAGS_RX_PACKET | \</div><div class='add'>+		HTT_RX_FILTER_TLV_FLAGS_MSDU_END)</div><div class='add'>+</div><div class='add'>+#define HTT_TX_RING_SELECTION_CFG_CMD_INFO0_MSG_TYPE	GENMASK(7, 0)</div><div class='add'>+#define HTT_TX_RING_SELECTION_CFG_CMD_INFO0_PDEV_ID	GENMASK(15, 8)</div><div class='add'>+</div><div class='add'>+struct htt_rx_ring_selection_cfg_cmd {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 pkt_type_en_flags0;</div><div class='add'>+	__le32 pkt_type_en_flags1;</div><div class='add'>+	__le32 pkt_type_en_flags2;</div><div class='add'>+	__le32 pkt_type_en_flags3;</div><div class='add'>+	__le32 rx_filter_tlv;</div><div class='add'>+	__le32 rx_packet_offset;</div><div class='add'>+	__le32 rx_mpdu_offset;</div><div class='add'>+	__le32 rx_msdu_offset;</div><div class='add'>+	__le32 rx_attn_offset;</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le32 reserved[2];</div><div class='add'>+	__le32 rx_mpdu_start_end_mask;</div><div class='add'>+	__le32 rx_msdu_end_word_mask;</div><div class='add'>+	__le32 info3;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HTT_RX_RING_TLV_DROP_THRESHOLD_VALUE	32</div><div class='add'>+#define HTT_RX_RING_DEFAULT_DMA_LENGTH		0x7</div><div class='add'>+#define HTT_RX_RING_PKT_TLV_OFFSET		0x1</div><div class='add'>+</div><div class='add'>+struct htt_rx_ring_tlv_filter {</div><div class='add'>+	u32 rx_filter; /* see htt_rx_filter_tlv_flags */</div><div class='add'>+	u32 pkt_filter_flags0; /* MGMT */</div><div class='add'>+	u32 pkt_filter_flags1; /* MGMT */</div><div class='add'>+	u32 pkt_filter_flags2; /* CTRL */</div><div class='add'>+	u32 pkt_filter_flags3; /* DATA */</div><div class='add'>+	bool offset_valid;</div><div class='add'>+	u16 rx_packet_offset;</div><div class='add'>+	u16 rx_header_offset;</div><div class='add'>+	u16 rx_mpdu_end_offset;</div><div class='add'>+	u16 rx_mpdu_start_offset;</div><div class='add'>+	u16 rx_msdu_end_offset;</div><div class='add'>+	u16 rx_msdu_start_offset;</div><div class='add'>+	u16 rx_attn_offset;</div><div class='add'>+	u16 rx_mpdu_start_wmask;</div><div class='add'>+	u16 rx_mpdu_end_wmask;</div><div class='add'>+	u32 rx_msdu_end_wmask;</div><div class='add'>+	u32 conf_len_ctrl;</div><div class='add'>+	u32 conf_len_mgmt;</div><div class='add'>+	u32 conf_len_data;</div><div class='add'>+	u16 rx_drop_threshold;</div><div class='add'>+	bool enable_log_mgmt_type;</div><div class='add'>+	bool enable_log_ctrl_type;</div><div class='add'>+	bool enable_log_data_type;</div><div class='add'>+	bool enable_rx_tlv_offset;</div><div class='add'>+	u16 rx_tlv_offset;</div><div class='add'>+	bool drop_threshold_valid;</div><div class='add'>+	bool rxmon_disable;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HTT_STATS_FRAME_CTRL_TYPE_MGMT  0x0</div><div class='add'>+#define HTT_STATS_FRAME_CTRL_TYPE_CTRL  0x1</div><div class='add'>+#define HTT_STATS_FRAME_CTRL_TYPE_DATA  0x2</div><div class='add'>+#define HTT_STATS_FRAME_CTRL_TYPE_RESV  0x3</div><div class='add'>+</div><div class='add'>+#define HTT_TX_RING_SELECTION_CFG_CMD_INFO0_MSG_TYPE	GENMASK(7, 0)</div><div class='add'>+#define HTT_TX_RING_SELECTION_CFG_CMD_INFO0_PDEV_ID	GENMASK(15, 8)</div><div class='add'>+#define HTT_TX_RING_SELECTION_CFG_CMD_INFO0_RING_ID	GENMASK(23, 16)</div><div class='add'>+#define HTT_TX_RING_SELECTION_CFG_CMD_INFO0_SS		BIT(24)</div><div class='add'>+#define HTT_TX_RING_SELECTION_CFG_CMD_INFO0_PS		BIT(25)</div><div class='add'>+</div><div class='add'>+#define HTT_TX_RING_SELECTION_CFG_CMD_INFO1_RING_BUFF_SIZE	GENMASK(15, 0)</div><div class='add'>+#define HTT_TX_RING_SELECTION_CFG_CMD_INFO1_PKT_TYPE		GENMASK(18, 16)</div><div class='add'>+#define HTT_TX_RING_SELECTION_CFG_CMD_INFO1_CONF_LEN_MGMT	GENMASK(21, 19)</div><div class='add'>+#define HTT_TX_RING_SELECTION_CFG_CMD_INFO1_CONF_LEN_CTRL	GENMASK(24, 22)</div><div class='add'>+#define HTT_TX_RING_SELECTION_CFG_CMD_INFO1_CONF_LEN_DATA	GENMASK(27, 25)</div><div class='add'>+</div><div class='add'>+#define HTT_TX_RING_SELECTION_CFG_CMD_INFO2_PKT_TYPE_EN_FLAG	GENMASK(2, 0)</div><div class='add'>+</div><div class='add'>+struct htt_tx_ring_selection_cfg_cmd {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le32 tlv_filter_mask_in0;</div><div class='add'>+	__le32 tlv_filter_mask_in1;</div><div class='add'>+	__le32 tlv_filter_mask_in2;</div><div class='add'>+	__le32 tlv_filter_mask_in3;</div><div class='add'>+	__le32 reserved[3];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HTT_TX_RING_TLV_FILTER_MGMT_DMA_LEN	GENMASK(3, 0)</div><div class='add'>+#define HTT_TX_RING_TLV_FILTER_CTRL_DMA_LEN	GENMASK(7, 4)</div><div class='add'>+#define HTT_TX_RING_TLV_FILTER_DATA_DMA_LEN	GENMASK(11, 8)</div><div class='add'>+</div><div class='add'>+#define HTT_TX_MON_FILTER_HYBRID_MODE \</div><div class='add'>+		(HTT_TX_FILTER_TLV_FLAGS0_RESPONSE_START_STATUS | \</div><div class='add'>+		HTT_TX_FILTER_TLV_FLAGS0_RESPONSE_END_STATUS | \</div><div class='add'>+		HTT_TX_FILTER_TLV_FLAGS0_TX_FES_STATUS_START | \</div><div class='add'>+		HTT_TX_FILTER_TLV_FLAGS0_TX_FES_STATUS_END | \</div><div class='add'>+		HTT_TX_FILTER_TLV_FLAGS0_TX_FES_STATUS_START_PPDU | \</div><div class='add'>+		HTT_TX_FILTER_TLV_FLAGS0_TX_FES_STATUS_USER_PPDU | \</div><div class='add'>+		HTT_TX_FILTER_TLV_FLAGS0_TX_FES_STATUS_ACK_OR_BA | \</div><div class='add'>+		HTT_TX_FILTER_TLV_FLAGS0_TX_FES_STATUS_1K_BA | \</div><div class='add'>+		HTT_TX_FILTER_TLV_FLAGS0_TX_FES_STATUS_START_PROT | \</div><div class='add'>+		HTT_TX_FILTER_TLV_FLAGS0_TX_FES_STATUS_PROT | \</div><div class='add'>+		HTT_TX_FILTER_TLV_FLAGS0_TX_FES_STATUS_USER_RESPONSE | \</div><div class='add'>+		HTT_TX_FILTER_TLV_FLAGS0_RECEIVED_RESPONSE_INFO | \</div><div class='add'>+		HTT_TX_FILTER_TLV_FLAGS0_RECEIVED_RESPONSE_INFO_PART2)</div><div class='add'>+</div><div class='add'>+struct htt_tx_ring_tlv_filter {</div><div class='add'>+	u32 tx_mon_downstream_tlv_flags;</div><div class='add'>+	u32 tx_mon_upstream_tlv_flags0;</div><div class='add'>+	u32 tx_mon_upstream_tlv_flags1;</div><div class='add'>+	u32 tx_mon_upstream_tlv_flags2;</div><div class='add'>+	bool tx_mon_mgmt_filter;</div><div class='add'>+	bool tx_mon_data_filter;</div><div class='add'>+	bool tx_mon_ctrl_filter;</div><div class='add'>+	u16 tx_mon_pkt_dma_len;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum htt_tx_mon_upstream_tlv_flags0 {</div><div class='add'>+	HTT_TX_FILTER_TLV_FLAGS0_RESPONSE_START_STATUS		= BIT(1),</div><div class='add'>+	HTT_TX_FILTER_TLV_FLAGS0_RESPONSE_END_STATUS		= BIT(2),</div><div class='add'>+	HTT_TX_FILTER_TLV_FLAGS0_TX_FES_STATUS_START		= BIT(3),</div><div class='add'>+	HTT_TX_FILTER_TLV_FLAGS0_TX_FES_STATUS_END		= BIT(4),</div><div class='add'>+	HTT_TX_FILTER_TLV_FLAGS0_TX_FES_STATUS_START_PPDU	= BIT(5),</div><div class='add'>+	HTT_TX_FILTER_TLV_FLAGS0_TX_FES_STATUS_USER_PPDU	= BIT(6),</div><div class='add'>+	HTT_TX_FILTER_TLV_FLAGS0_TX_FES_STATUS_ACK_OR_BA	= BIT(7),</div><div class='add'>+	HTT_TX_FILTER_TLV_FLAGS0_TX_FES_STATUS_1K_BA		= BIT(8),</div><div class='add'>+	HTT_TX_FILTER_TLV_FLAGS0_TX_FES_STATUS_START_PROT	= BIT(9),</div><div class='add'>+	HTT_TX_FILTER_TLV_FLAGS0_TX_FES_STATUS_PROT		= BIT(10),</div><div class='add'>+	HTT_TX_FILTER_TLV_FLAGS0_TX_FES_STATUS_USER_RESPONSE	= BIT(11),</div><div class='add'>+	HTT_TX_FILTER_TLV_FLAGS0_RX_FRAME_BITMAP_ACK		= BIT(12),</div><div class='add'>+	HTT_TX_FILTER_TLV_FLAGS0_RX_FRAME_1K_BITMAP_ACK		= BIT(13),</div><div class='add'>+	HTT_TX_FILTER_TLV_FLAGS0_COEX_TX_STATUS			= BIT(14),</div><div class='add'>+	HTT_TX_FILTER_TLV_FLAGS0_RECEIVED_RESPONSE_INFO		= BIT(15),</div><div class='add'>+	HTT_TX_FILTER_TLV_FLAGS0_RECEIVED_RESPONSE_INFO_PART2	= BIT(16),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HTT_TX_FILTER_TLV_FLAGS2_TXPCU_PHYTX_OTHER_TRANSMIT_INFO32	BIT(11)</div><div class='add'>+</div><div class='add'>+/* HTT message target-&gt;host */</div><div class='add'>+</div><div class='add'>+enum htt_t2h_msg_type {</div><div class='add'>+	HTT_T2H_MSG_TYPE_VERSION_CONF,</div><div class='add'>+	HTT_T2H_MSG_TYPE_PEER_MAP	= 0x3,</div><div class='add'>+	HTT_T2H_MSG_TYPE_PEER_UNMAP	= 0x4,</div><div class='add'>+	HTT_T2H_MSG_TYPE_RX_ADDBA	= 0x5,</div><div class='add'>+	HTT_T2H_MSG_TYPE_PKTLOG		= 0x8,</div><div class='add'>+	HTT_T2H_MSG_TYPE_SEC_IND	= 0xb,</div><div class='add'>+	HTT_T2H_MSG_TYPE_PEER_MAP2	= 0x1e,</div><div class='add'>+	HTT_T2H_MSG_TYPE_PEER_UNMAP2	= 0x1f,</div><div class='add'>+	HTT_T2H_MSG_TYPE_PPDU_STATS_IND = 0x1d,</div><div class='add'>+	HTT_T2H_MSG_TYPE_EXT_STATS_CONF = 0x1c,</div><div class='add'>+	HTT_T2H_MSG_TYPE_BKPRESSURE_EVENT_IND = 0x24,</div><div class='add'>+	HTT_T2H_MSG_TYPE_MLO_TIMESTAMP_OFFSET_IND = 0x28,</div><div class='add'>+	HTT_T2H_MSG_TYPE_PEER_MAP3	= 0x2b,</div><div class='add'>+	HTT_T2H_MSG_TYPE_VDEV_TXRX_STATS_PERIODIC_IND = 0x2c,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HTT_TARGET_VERSION_MAJOR 3</div><div class='add'>+</div><div class='add'>+#define HTT_T2H_MSG_TYPE		GENMASK(7, 0)</div><div class='add'>+#define HTT_T2H_VERSION_CONF_MINOR	GENMASK(15, 8)</div><div class='add'>+#define HTT_T2H_VERSION_CONF_MAJOR	GENMASK(23, 16)</div><div class='add'>+</div><div class='add'>+struct htt_t2h_version_conf_msg {</div><div class='add'>+	__le32 version;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HTT_T2H_PEER_MAP_INFO_VDEV_ID	GENMASK(15, 8)</div><div class='add'>+#define HTT_T2H_PEER_MAP_INFO_PEER_ID	GENMASK(31, 16)</div><div class='add'>+#define HTT_T2H_PEER_MAP_INFO1_MAC_ADDR_H16	GENMASK(15, 0)</div><div class='add'>+#define HTT_T2H_PEER_MAP_INFO1_HW_PEER_ID	GENMASK(31, 16)</div><div class='add'>+#define HTT_T2H_PEER_MAP_INFO2_AST_HASH_VAL	GENMASK(15, 0)</div><div class='add'>+#define HTT_T2H_PEER_MAP3_INFO2_HW_PEER_ID	GENMASK(15, 0)</div><div class='add'>+#define HTT_T2H_PEER_MAP3_INFO2_AST_HASH_VAL	GENMASK(31, 16)</div><div class='add'>+#define HTT_T2H_PEER_MAP_INFO2_NEXT_HOP_M	BIT(16)</div><div class='add'>+#define HTT_T2H_PEER_MAP_INFO2_NEXT_HOP_S	16</div><div class='add'>+</div><div class='add'>+struct htt_t2h_peer_map_event {</div><div class='add'>+	__le32 info;</div><div class='add'>+	__le32 mac_addr_l32;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 info2;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HTT_T2H_PEER_UNMAP_INFO_VDEV_ID	HTT_T2H_PEER_MAP_INFO_VDEV_ID</div><div class='add'>+#define HTT_T2H_PEER_UNMAP_INFO_PEER_ID	HTT_T2H_PEER_MAP_INFO_PEER_ID</div><div class='add'>+#define HTT_T2H_PEER_UNMAP_INFO1_MAC_ADDR_H16 \</div><div class='add'>+					HTT_T2H_PEER_MAP_INFO1_MAC_ADDR_H16</div><div class='add'>+#define HTT_T2H_PEER_MAP_INFO1_NEXT_HOP_M HTT_T2H_PEER_MAP_INFO2_NEXT_HOP_M</div><div class='add'>+#define HTT_T2H_PEER_MAP_INFO1_NEXT_HOP_S HTT_T2H_PEER_MAP_INFO2_NEXT_HOP_S</div><div class='add'>+</div><div class='add'>+struct htt_t2h_peer_unmap_event {</div><div class='add'>+	__le32 info;</div><div class='add'>+	__le32 mac_addr_l32;</div><div class='add'>+	__le32 info1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct htt_resp_msg {</div><div class='add'>+	union {</div><div class='add'>+		struct htt_t2h_version_conf_msg version_msg;</div><div class='add'>+		struct htt_t2h_peer_map_event peer_map_ev;</div><div class='add'>+		struct htt_t2h_peer_unmap_event peer_unmap_ev;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HTT_VDEV_GET_STATS_U64(msg_l32, msg_u32)\</div><div class='add'>+	(((u64)__le32_to_cpu(msg_u32) &lt;&lt; 32) | (__le32_to_cpu(msg_l32)))</div><div class='add'>+#define HTT_T2H_VDEV_STATS_PERIODIC_MSG_TYPE		GENMASK(7, 0)</div><div class='add'>+#define HTT_T2H_VDEV_STATS_PERIODIC_PDEV_ID		GENMASK(15, 8)</div><div class='add'>+#define HTT_T2H_VDEV_STATS_PERIODIC_NUM_VDEV		GENMASK(23, 16)</div><div class='add'>+#define HTT_T2H_VDEV_STATS_PERIODIC_PAYLOAD_BYTES	GENMASK(15, 0)</div><div class='add'>+#define HTT_VDEV_TXRX_STATS_COMMON_TLV		0</div><div class='add'>+#define HTT_VDEV_TXRX_STATS_HW_STATS_TLV	1</div><div class='add'>+</div><div class='add'>+struct htt_t2h_vdev_txrx_stats_ind {</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 rx_msdu_byte_cnt_lo;</div><div class='add'>+	__le32 rx_msdu_byte_cnt_hi;</div><div class='add'>+	__le32 rx_msdu_cnt_lo;</div><div class='add'>+	__le32 rx_msdu_cnt_hi;</div><div class='add'>+	__le32 tx_msdu_byte_cnt_lo;</div><div class='add'>+	__le32 tx_msdu_byte_cnt_hi;</div><div class='add'>+	__le32 tx_msdu_cnt_lo;</div><div class='add'>+	__le32 tx_msdu_cnt_hi;</div><div class='add'>+	__le32 tx_retry_cnt_lo;</div><div class='add'>+	__le32 tx_retry_cnt_hi;</div><div class='add'>+	__le32 tx_retry_byte_cnt_lo;</div><div class='add'>+	__le32 tx_retry_byte_cnt_hi;</div><div class='add'>+	__le32 tx_drop_cnt_lo;</div><div class='add'>+	__le32 tx_drop_cnt_hi;</div><div class='add'>+	__le32 tx_drop_byte_cnt_lo;</div><div class='add'>+	__le32 tx_drop_byte_cnt_hi;</div><div class='add'>+	__le32 msdu_ttl_cnt_lo;</div><div class='add'>+	__le32 msdu_ttl_cnt_hi;</div><div class='add'>+	__le32 msdu_ttl_byte_cnt_lo;</div><div class='add'>+	__le32 msdu_ttl_byte_cnt_hi;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct htt_t2h_vdev_common_stats_tlv {</div><div class='add'>+	__le32 soc_drop_count_lo;</div><div class='add'>+	__le32 soc_drop_count_hi;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* ppdu stats</div><div class='add'>+ *</div><div class='add'>+ * @details</div><div class='add'>+ * The following field definitions describe the format of the HTT target</div><div class='add'>+ * to host ppdu stats indication message.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * |31                         16|15   12|11   10|9      8|7            0 |</div><div class='add'>+ * |----------------------------------------------------------------------|</div><div class='add'>+ * |    payload_size             | rsvd  |pdev_id|mac_id  |    msg type   |</div><div class='add'>+ * |----------------------------------------------------------------------|</div><div class='add'>+ * |                          ppdu_id                                     |</div><div class='add'>+ * |----------------------------------------------------------------------|</div><div class='add'>+ * |                        Timestamp in us                               |</div><div class='add'>+ * |----------------------------------------------------------------------|</div><div class='add'>+ * |                          reserved                                    |</div><div class='add'>+ * |----------------------------------------------------------------------|</div><div class='add'>+ * |                    type-specific stats info                          |</div><div class='add'>+ * |                     (see htt_ppdu_stats.h)                           |</div><div class='add'>+ * |----------------------------------------------------------------------|</div><div class='add'>+ * Header fields:</div><div class='add'>+ *  - MSG_TYPE</div><div class='add'>+ *    Bits 7:0</div><div class='add'>+ *    Purpose: Identifies this is a PPDU STATS indication</div><div class='add'>+ *             message.</div><div class='add'>+ *    Value: 0x1d</div><div class='add'>+ *  - mac_id</div><div class='add'>+ *    Bits 9:8</div><div class='add'>+ *    Purpose: mac_id of this ppdu_id</div><div class='add'>+ *    Value: 0-3</div><div class='add'>+ *  - pdev_id</div><div class='add'>+ *    Bits 11:10</div><div class='add'>+ *    Purpose: pdev_id of this ppdu_id</div><div class='add'>+ *    Value: 0-3</div><div class='add'>+ *     0 (for rings at SOC level),</div><div class='add'>+ *     1/2/3 PDEV -&gt; 0/1/2</div><div class='add'>+ *  - payload_size</div><div class='add'>+ *    Bits 31:16</div><div class='add'>+ *    Purpose: total tlv size</div><div class='add'>+ *    Value: payload_size in bytes</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HTT_T2H_PPDU_STATS_INFO_PDEV_ID GENMASK(11, 10)</div><div class='add'>+#define HTT_T2H_PPDU_STATS_INFO_PAYLOAD_SIZE GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_ppdu_stats_msg {</div><div class='add'>+	__le32 info;</div><div class='add'>+	__le32 ppdu_id;</div><div class='add'>+	__le32 timestamp;</div><div class='add'>+	__le32 rsvd;</div><div class='add'>+	u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct htt_tlv {</div><div class='add'>+	__le32 header;</div><div class='add'>+	u8 value[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HTT_TLV_TAG			GENMASK(11, 0)</div><div class='add'>+#define HTT_TLV_LEN			GENMASK(23, 12)</div><div class='add'>+</div><div class='add'>+enum HTT_PPDU_STATS_BW {</div><div class='add'>+	HTT_PPDU_STATS_BANDWIDTH_5MHZ   = 0,</div><div class='add'>+	HTT_PPDU_STATS_BANDWIDTH_10MHZ  = 1,</div><div class='add'>+	HTT_PPDU_STATS_BANDWIDTH_20MHZ  = 2,</div><div class='add'>+	HTT_PPDU_STATS_BANDWIDTH_40MHZ  = 3,</div><div class='add'>+	HTT_PPDU_STATS_BANDWIDTH_80MHZ  = 4,</div><div class='add'>+	HTT_PPDU_STATS_BANDWIDTH_160MHZ = 5, /* includes 80+80 */</div><div class='add'>+	HTT_PPDU_STATS_BANDWIDTH_DYN    = 6,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HTT_PPDU_STATS_CMN_FLAGS_FRAME_TYPE_M	GENMASK(7, 0)</div><div class='add'>+#define HTT_PPDU_STATS_CMN_FLAGS_QUEUE_TYPE_M	GENMASK(15, 8)</div><div class='add'>+/* bw - HTT_PPDU_STATS_BW */</div><div class='add'>+#define HTT_PPDU_STATS_CMN_FLAGS_BW_M		GENMASK(19, 16)</div><div class='add'>+</div><div class='add'>+struct htt_ppdu_stats_common {</div><div class='add'>+	__le32 ppdu_id;</div><div class='add'>+	__le16 sched_cmdid;</div><div class='add'>+	u8 ring_id;</div><div class='add'>+	u8 num_users;</div><div class='add'>+	__le32 flags; /* %HTT_PPDU_STATS_COMMON_FLAGS_*/</div><div class='add'>+	__le32 chain_mask;</div><div class='add'>+	__le32 fes_duration_us; /* frame exchange sequence */</div><div class='add'>+	__le32 ppdu_sch_eval_start_tstmp_us;</div><div class='add'>+	__le32 ppdu_sch_end_tstmp_us;</div><div class='add'>+	__le32 ppdu_start_tstmp_us;</div><div class='add'>+	/* BIT [15 :  0] - phy mode (WLAN_PHY_MODE) with which ppdu was transmitted</div><div class='add'>+	 * BIT [31 : 16] - bandwidth (in MHz) with which ppdu was transmitted</div><div class='add'>+	 */</div><div class='add'>+	__le16 phy_mode;</div><div class='add'>+	__le16 bw_mhz;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum htt_ppdu_stats_gi {</div><div class='add'>+	HTT_PPDU_STATS_SGI_0_8_US,</div><div class='add'>+	HTT_PPDU_STATS_SGI_0_4_US,</div><div class='add'>+	HTT_PPDU_STATS_SGI_1_6_US,</div><div class='add'>+	HTT_PPDU_STATS_SGI_3_2_US,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_INFO0_USER_POS_M	GENMASK(3, 0)</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_INFO0_MU_GROUP_ID_M	GENMASK(11, 4)</div><div class='add'>+</div><div class='add'>+enum HTT_PPDU_STATS_PPDU_TYPE {</div><div class='add'>+	HTT_PPDU_STATS_PPDU_TYPE_SU,</div><div class='add'>+	HTT_PPDU_STATS_PPDU_TYPE_MU_MIMO,</div><div class='add'>+	HTT_PPDU_STATS_PPDU_TYPE_MU_OFDMA,</div><div class='add'>+	HTT_PPDU_STATS_PPDU_TYPE_MU_MIMO_OFDMA,</div><div class='add'>+	HTT_PPDU_STATS_PPDU_TYPE_UL_TRIG,</div><div class='add'>+	HTT_PPDU_STATS_PPDU_TYPE_BURST_BCN,</div><div class='add'>+	HTT_PPDU_STATS_PPDU_TYPE_UL_BSR_RESP,</div><div class='add'>+	HTT_PPDU_STATS_PPDU_TYPE_UL_BSR_TRIG,</div><div class='add'>+	HTT_PPDU_STATS_PPDU_TYPE_UL_RESP,</div><div class='add'>+	HTT_PPDU_STATS_PPDU_TYPE_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_INFO1_RESP_TYPE_VALD_M	BIT(0)</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_INFO1_PPDU_TYPE_M	GENMASK(5, 1)</div><div class='add'>+</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_FLAGS_LTF_SIZE_M	GENMASK(1, 0)</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_FLAGS_STBC_M		BIT(2)</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_FLAGS_HE_RE_M		BIT(3)</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_FLAGS_TXBF_M		GENMASK(7, 4)</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_FLAGS_BW_M		GENMASK(11, 8)</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_FLAGS_NSS_M		GENMASK(15, 12)</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_FLAGS_MCS_M		GENMASK(19, 16)</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_FLAGS_PREAMBLE_M	GENMASK(23, 20)</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_FLAGS_GI_M		GENMASK(27, 24)</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_FLAGS_DCM_M		BIT(28)</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_FLAGS_LDPC_M		BIT(29)</div><div class='add'>+</div><div class='add'>+#define HTT_USR_RATE_PPDU_TYPE(_val) \</div><div class='add'>+		le32_get_bits(_val, HTT_PPDU_STATS_USER_RATE_INFO1_PPDU_TYPE_M)</div><div class='add'>+#define HTT_USR_RATE_PREAMBLE(_val) \</div><div class='add'>+		le32_get_bits(_val, HTT_PPDU_STATS_USER_RATE_FLAGS_PREAMBLE_M)</div><div class='add'>+#define HTT_USR_RATE_BW(_val) \</div><div class='add'>+		le32_get_bits(_val, HTT_PPDU_STATS_USER_RATE_FLAGS_BW_M)</div><div class='add'>+#define HTT_USR_RATE_NSS(_val) \</div><div class='add'>+		le32_get_bits(_val, HTT_PPDU_STATS_USER_RATE_FLAGS_NSS_M)</div><div class='add'>+#define HTT_USR_RATE_MCS(_val) \</div><div class='add'>+		le32_get_bits(_val, HTT_PPDU_STATS_USER_RATE_FLAGS_MCS_M)</div><div class='add'>+#define HTT_USR_RATE_GI(_val) \</div><div class='add'>+		le32_get_bits(_val, HTT_PPDU_STATS_USER_RATE_FLAGS_GI_M)</div><div class='add'>+#define HTT_USR_RATE_DCM(_val) \</div><div class='add'>+		le32_get_bits(_val, HTT_PPDU_STATS_USER_RATE_FLAGS_DCM_M)</div><div class='add'>+</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_LTF_SIZE_M		GENMASK(1, 0)</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_STBC_M		BIT(2)</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_HE_RE_M		BIT(3)</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_TXBF_M		GENMASK(7, 4)</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_BW_M		GENMASK(11, 8)</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_NSS_M		GENMASK(15, 12)</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_MCS_M		GENMASK(19, 16)</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_PREAMBLE_M		GENMASK(23, 20)</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_GI_M		GENMASK(27, 24)</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_DCM_M		BIT(28)</div><div class='add'>+#define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_LDPC_M		BIT(29)</div><div class='add'>+</div><div class='add'>+struct htt_ppdu_stats_user_rate {</div><div class='add'>+	u8 tid_num;</div><div class='add'>+	u8 reserved0;</div><div class='add'>+	__le16 sw_peer_id;</div><div class='add'>+	__le32 info0; /* %HTT_PPDU_STATS_USER_RATE_INFO0_*/</div><div class='add'>+	__le16 ru_end;</div><div class='add'>+	__le16 ru_start;</div><div class='add'>+	__le16 resp_ru_end;</div><div class='add'>+	__le16 resp_ru_start;</div><div class='add'>+	__le32 info1; /* %HTT_PPDU_STATS_USER_RATE_INFO1_ */</div><div class='add'>+	__le32 rate_flags; /* %HTT_PPDU_STATS_USER_RATE_FLAGS_ */</div><div class='add'>+	/* Note: resp_rate_info is only valid for if resp_type is UL */</div><div class='add'>+	__le32 resp_rate_flags; /* %HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_ */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HTT_PPDU_STATS_TX_INFO_FLAGS_RATECODE_M		GENMASK(7, 0)</div><div class='add'>+#define HTT_PPDU_STATS_TX_INFO_FLAGS_IS_AMPDU_M		BIT(8)</div><div class='add'>+#define HTT_PPDU_STATS_TX_INFO_FLAGS_BA_ACK_FAILED_M	GENMASK(10, 9)</div><div class='add'>+#define HTT_PPDU_STATS_TX_INFO_FLAGS_BW_M		GENMASK(13, 11)</div><div class='add'>+#define HTT_PPDU_STATS_TX_INFO_FLAGS_SGI_M		BIT(14)</div><div class='add'>+#define HTT_PPDU_STATS_TX_INFO_FLAGS_PEERID_M		GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define HTT_TX_INFO_IS_AMSDU(_flags) \</div><div class='add'>+			u32_get_bits(_flags, HTT_PPDU_STATS_TX_INFO_FLAGS_IS_AMPDU_M)</div><div class='add'>+#define HTT_TX_INFO_BA_ACK_FAILED(_flags) \</div><div class='add'>+			u32_get_bits(_flags, HTT_PPDU_STATS_TX_INFO_FLAGS_BA_ACK_FAILED_M)</div><div class='add'>+#define HTT_TX_INFO_RATECODE(_flags) \</div><div class='add'>+			u32_get_bits(_flags, HTT_PPDU_STATS_TX_INFO_FLAGS_RATECODE_M)</div><div class='add'>+#define HTT_TX_INFO_PEERID(_flags) \</div><div class='add'>+			u32_get_bits(_flags, HTT_PPDU_STATS_TX_INFO_FLAGS_PEERID_M)</div><div class='add'>+</div><div class='add'>+enum  htt_ppdu_stats_usr_compln_status {</div><div class='add'>+	HTT_PPDU_STATS_USER_STATUS_OK,</div><div class='add'>+	HTT_PPDU_STATS_USER_STATUS_FILTERED,</div><div class='add'>+	HTT_PPDU_STATS_USER_STATUS_RESP_TIMEOUT,</div><div class='add'>+	HTT_PPDU_STATS_USER_STATUS_RESP_MISMATCH,</div><div class='add'>+	HTT_PPDU_STATS_USER_STATUS_ABORT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HTT_PPDU_STATS_USR_CMPLTN_CMN_FLAGS_LONG_RETRY_M	GENMASK(3, 0)</div><div class='add'>+#define HTT_PPDU_STATS_USR_CMPLTN_CMN_FLAGS_SHORT_RETRY_M	GENMASK(7, 4)</div><div class='add'>+#define HTT_PPDU_STATS_USR_CMPLTN_CMN_FLAGS_IS_AMPDU_M		BIT(8)</div><div class='add'>+#define HTT_PPDU_STATS_USR_CMPLTN_CMN_FLAGS_RESP_TYPE_M		GENMASK(12, 9)</div><div class='add'>+</div><div class='add'>+#define HTT_USR_CMPLTN_IS_AMPDU(_val) \</div><div class='add'>+	    le32_get_bits(_val, HTT_PPDU_STATS_USR_CMPLTN_CMN_FLAGS_IS_AMPDU_M)</div><div class='add'>+#define HTT_USR_CMPLTN_LONG_RETRY(_val) \</div><div class='add'>+	    le32_get_bits(_val, HTT_PPDU_STATS_USR_CMPLTN_CMN_FLAGS_LONG_RETRY_M)</div><div class='add'>+#define HTT_USR_CMPLTN_SHORT_RETRY(_val) \</div><div class='add'>+	    le32_get_bits(_val, HTT_PPDU_STATS_USR_CMPLTN_CMN_FLAGS_SHORT_RETRY_M)</div><div class='add'>+</div><div class='add'>+struct htt_ppdu_stats_usr_cmpltn_cmn {</div><div class='add'>+	u8 status;</div><div class='add'>+	u8 tid_num;</div><div class='add'>+	__le16 sw_peer_id;</div><div class='add'>+	/* RSSI value of last ack packet (units = dB above noise floor) */</div><div class='add'>+	__le32 ack_rssi;</div><div class='add'>+	__le16 mpdu_tried;</div><div class='add'>+	__le16 mpdu_success;</div><div class='add'>+	__le32 flags; /* %HTT_PPDU_STATS_USR_CMPLTN_CMN_FLAGS_LONG_RETRIES*/</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HTT_PPDU_STATS_ACK_BA_INFO_NUM_MPDU_M	GENMASK(8, 0)</div><div class='add'>+#define HTT_PPDU_STATS_ACK_BA_INFO_NUM_MSDU_M	GENMASK(24, 9)</div><div class='add'>+#define HTT_PPDU_STATS_ACK_BA_INFO_TID_NUM	GENMASK(31, 25)</div><div class='add'>+</div><div class='add'>+#define HTT_PPDU_STATS_NON_QOS_TID	16</div><div class='add'>+</div><div class='add'>+struct htt_ppdu_stats_usr_cmpltn_ack_ba_status {</div><div class='add'>+	__le32 ppdu_id;</div><div class='add'>+	__le16 sw_peer_id;</div><div class='add'>+	__le16 reserved0;</div><div class='add'>+	__le32 info; /* %HTT_PPDU_STATS_USR_CMPLTN_CMN_INFO_ */</div><div class='add'>+	__le16 current_seq;</div><div class='add'>+	__le16 start_seq;</div><div class='add'>+	__le32 success_bytes;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct htt_ppdu_user_stats {</div><div class='add'>+	u16 peer_id;</div><div class='add'>+	u16 delay_ba;</div><div class='add'>+	u32 tlv_flags;</div><div class='add'>+	bool is_valid_peer_id;</div><div class='add'>+	struct htt_ppdu_stats_user_rate rate;</div><div class='add'>+	struct htt_ppdu_stats_usr_cmpltn_cmn cmpltn_cmn;</div><div class='add'>+	struct htt_ppdu_stats_usr_cmpltn_ack_ba_status ack_ba;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HTT_PPDU_STATS_MAX_USERS	8</div><div class='add'>+#define HTT_PPDU_DESC_MAX_DEPTH	16</div><div class='add'>+</div><div class='add'>+struct htt_ppdu_stats {</div><div class='add'>+	struct htt_ppdu_stats_common common;</div><div class='add'>+	struct htt_ppdu_user_stats user_stats[HTT_PPDU_STATS_MAX_USERS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct htt_ppdu_stats_info {</div><div class='add'>+	u32 tlv_bitmap;</div><div class='add'>+	u32 ppdu_id;</div><div class='add'>+	u32 frame_type;</div><div class='add'>+	u32 frame_ctrl;</div><div class='add'>+	u32 delay_ba;</div><div class='add'>+	u32 bar_num_users;</div><div class='add'>+	struct htt_ppdu_stats ppdu_stats;</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* @brief target -&gt; host MLO offset indiciation message</div><div class='add'>+ *</div><div class='add'>+ * @details</div><div class='add'>+ * The following field definitions describe the format of the HTT target</div><div class='add'>+ * to host mlo offset indication message.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * |31        29|28    |26|25  22|21 16|15  13|12     10 |9     8|7     0|</div><div class='add'>+ * |---------------------------------------------------------------------|</div><div class='add'>+ * |   rsvd1    | mac_freq                    |chip_id   |pdev_id|msgtype|</div><div class='add'>+ * |---------------------------------------------------------------------|</div><div class='add'>+ * |                           sync_timestamp_lo_us                      |</div><div class='add'>+ * |---------------------------------------------------------------------|</div><div class='add'>+ * |                           sync_timestamp_hi_us                      |</div><div class='add'>+ * |---------------------------------------------------------------------|</div><div class='add'>+ * |                           mlo_offset_lo                             |</div><div class='add'>+ * |---------------------------------------------------------------------|</div><div class='add'>+ * |                           mlo_offset_hi                             |</div><div class='add'>+ * |---------------------------------------------------------------------|</div><div class='add'>+ * |                           mlo_offset_clcks                          |</div><div class='add'>+ * |---------------------------------------------------------------------|</div><div class='add'>+ * |   rsvd2           | mlo_comp_clks |mlo_comp_us                      |</div><div class='add'>+ * |---------------------------------------------------------------------|</div><div class='add'>+ * |   rsvd3                   |mlo_comp_timer                           |</div><div class='add'>+ * |---------------------------------------------------------------------|</div><div class='add'>+ * Header fields</div><div class='add'>+ *  - MSG_TYPE</div><div class='add'>+ *    Bits 7:0</div><div class='add'>+ *    Purpose: Identifies this is a MLO offset indication msg</div><div class='add'>+ *  - PDEV_ID</div><div class='add'>+ *    Bits 9:8</div><div class='add'>+ *    Purpose: Pdev of this MLO offset</div><div class='add'>+ *  - CHIP_ID</div><div class='add'>+ *    Bits 12:10</div><div class='add'>+ *    Purpose: chip_id of this MLO offset</div><div class='add'>+ *  - MAC_FREQ</div><div class='add'>+ *    Bits 28:13</div><div class='add'>+ *  - SYNC_TIMESTAMP_LO_US</div><div class='add'>+ *    Purpose: clock frequency of the mac HW block in MHz</div><div class='add'>+ *    Bits: 31:0</div><div class='add'>+ *    Purpose: lower 32 bits of the WLAN global time stamp at which</div><div class='add'>+ *             last sync interrupt was received</div><div class='add'>+ *  - SYNC_TIMESTAMP_HI_US</div><div class='add'>+ *    Bits: 31:0</div><div class='add'>+ *    Purpose: upper 32 bits of WLAN global time stamp at which</div><div class='add'>+ *             last sync interrupt was received</div><div class='add'>+ *  - MLO_OFFSET_LO</div><div class='add'>+ *    Bits: 31:0</div><div class='add'>+ *    Purpose: lower 32 bits of the MLO offset in us</div><div class='add'>+ *  - MLO_OFFSET_HI</div><div class='add'>+ *    Bits: 31:0</div><div class='add'>+ *    Purpose: upper 32 bits of the MLO offset in us</div><div class='add'>+ *  - MLO_COMP_US</div><div class='add'>+ *    Bits: 15:0</div><div class='add'>+ *    Purpose: MLO time stamp compensation applied in us</div><div class='add'>+ *  - MLO_COMP_CLCKS</div><div class='add'>+ *    Bits: 25:16</div><div class='add'>+ *    Purpose: MLO time stamp compensation applied in clock ticks</div><div class='add'>+ *  - MLO_COMP_TIMER</div><div class='add'>+ *    Bits: 21:0</div><div class='add'>+ *    Purpose: Periodic timer at which compensation is applied</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HTT_T2H_MLO_OFFSET_INFO_MSG_TYPE        GENMASK(7, 0)</div><div class='add'>+#define HTT_T2H_MLO_OFFSET_INFO_PDEV_ID         GENMASK(9, 8)</div><div class='add'>+</div><div class='add'>+struct ath12k_htt_mlo_offset_msg {</div><div class='add'>+	__le32 info;</div><div class='add'>+	__le32 sync_timestamp_lo_us;</div><div class='add'>+	__le32 sync_timestamp_hi_us;</div><div class='add'>+	__le32 mlo_offset_hi;</div><div class='add'>+	__le32 mlo_offset_lo;</div><div class='add'>+	__le32 mlo_offset_clks;</div><div class='add'>+	__le32 mlo_comp_clks;</div><div class='add'>+	__le32 mlo_comp_timer;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* @brief host -&gt; target FW extended statistics retrieve</div><div class='add'>+ *</div><div class='add'>+ * @details</div><div class='add'>+ * The following field definitions describe the format of the HTT host</div><div class='add'>+ * to target FW extended stats retrieve message.</div><div class='add'>+ * The message specifies the type of stats the host wants to retrieve.</div><div class='add'>+ *</div><div class='add'>+ * |31          24|23          16|15           8|7            0|</div><div class='add'>+ * |-----------------------------------------------------------|</div><div class='add'>+ * |   reserved   | stats type   |   pdev_mask  |   msg type   |</div><div class='add'>+ * |-----------------------------------------------------------|</div><div class='add'>+ * |                   config param [0]                        |</div><div class='add'>+ * |-----------------------------------------------------------|</div><div class='add'>+ * |                   config param [1]                        |</div><div class='add'>+ * |-----------------------------------------------------------|</div><div class='add'>+ * |                   config param [2]                        |</div><div class='add'>+ * |-----------------------------------------------------------|</div><div class='add'>+ * |                   config param [3]                        |</div><div class='add'>+ * |-----------------------------------------------------------|</div><div class='add'>+ * |                         reserved                          |</div><div class='add'>+ * |-----------------------------------------------------------|</div><div class='add'>+ * |                        cookie LSBs                        |</div><div class='add'>+ * |-----------------------------------------------------------|</div><div class='add'>+ * |                        cookie MSBs                        |</div><div class='add'>+ * |-----------------------------------------------------------|</div><div class='add'>+ * Header fields:</div><div class='add'>+ *  - MSG_TYPE</div><div class='add'>+ *    Bits 7:0</div><div class='add'>+ *    Purpose: identifies this is a extended stats upload request message</div><div class='add'>+ *    Value: 0x10</div><div class='add'>+ *  - PDEV_MASK</div><div class='add'>+ *    Bits 8:15</div><div class='add'>+ *    Purpose: identifies the mask of PDEVs to retrieve stats from</div><div class='add'>+ *    Value: This is a overloaded field, refer to usage and interpretation of</div><div class='add'>+ *           PDEV in interface document.</div><div class='add'>+ *           Bit   8    :  Reserved for SOC stats</div><div class='add'>+ *           Bit 9 - 15 :  Indicates PDEV_MASK in DBDC</div><div class='add'>+ *                         Indicates MACID_MASK in DBS</div><div class='add'>+ *  - STATS_TYPE</div><div class='add'>+ *    Bits 23:16</div><div class='add'>+ *    Purpose: identifies which FW statistics to upload</div><div class='add'>+ *    Value: Defined by htt_dbg_ext_stats_type (see htt_stats.h)</div><div class='add'>+ *  - Reserved</div><div class='add'>+ *    Bits 31:24</div><div class='add'>+ *  - CONFIG_PARAM [0]</div><div class='add'>+ *    Bits 31:0</div><div class='add'>+ *    Purpose: give an opaque configuration value to the specified stats type</div><div class='add'>+ *    Value: stats-type specific configuration value</div><div class='add'>+ *           Refer to htt_stats.h for interpretation for each stats sub_type</div><div class='add'>+ *  - CONFIG_PARAM [1]</div><div class='add'>+ *    Bits 31:0</div><div class='add'>+ *    Purpose: give an opaque configuration value to the specified stats type</div><div class='add'>+ *    Value: stats-type specific configuration value</div><div class='add'>+ *           Refer to htt_stats.h for interpretation for each stats sub_type</div><div class='add'>+ *  - CONFIG_PARAM [2]</div><div class='add'>+ *    Bits 31:0</div><div class='add'>+ *    Purpose: give an opaque configuration value to the specified stats type</div><div class='add'>+ *    Value: stats-type specific configuration value</div><div class='add'>+ *           Refer to htt_stats.h for interpretation for each stats sub_type</div><div class='add'>+ *  - CONFIG_PARAM [3]</div><div class='add'>+ *    Bits 31:0</div><div class='add'>+ *    Purpose: give an opaque configuration value to the specified stats type</div><div class='add'>+ *    Value: stats-type specific configuration value</div><div class='add'>+ *           Refer to htt_stats.h for interpretation for each stats sub_type</div><div class='add'>+ *  - Reserved [31:0] for future use.</div><div class='add'>+ *  - COOKIE_LSBS</div><div class='add'>+ *    Bits 31:0</div><div class='add'>+ *    Purpose: Provide a mechanism to match a target-&gt;host stats confirmation</div><div class='add'>+ *        message with its preceding host-&gt;target stats request message.</div><div class='add'>+ *    Value: LSBs of the opaque cookie specified by the host-side requestor</div><div class='add'>+ *  - COOKIE_MSBS</div><div class='add'>+ *    Bits 31:0</div><div class='add'>+ *    Purpose: Provide a mechanism to match a target-&gt;host stats confirmation</div><div class='add'>+ *        message with its preceding host-&gt;target stats request message.</div><div class='add'>+ *    Value: MSBs of the opaque cookie specified by the host-side requestor</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct htt_ext_stats_cfg_hdr {</div><div class='add'>+	u8 msg_type;</div><div class='add'>+	u8 pdev_mask;</div><div class='add'>+	u8 stats_type;</div><div class='add'>+	u8 reserved;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct htt_ext_stats_cfg_cmd {</div><div class='add'>+	struct htt_ext_stats_cfg_hdr hdr;</div><div class='add'>+	__le32 cfg_param0;</div><div class='add'>+	__le32 cfg_param1;</div><div class='add'>+	__le32 cfg_param2;</div><div class='add'>+	__le32 cfg_param3;</div><div class='add'>+	__le32 reserved;</div><div class='add'>+	__le32 cookie_lsb;</div><div class='add'>+	__le32 cookie_msb;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* htt stats config default params */</div><div class='add'>+#define HTT_STAT_DEFAULT_RESET_START_OFFSET 0</div><div class='add'>+#define HTT_STAT_DEFAULT_CFG0_ALL_HWQS 0xffffffff</div><div class='add'>+#define HTT_STAT_DEFAULT_CFG0_ALL_TXQS 0xffffffff</div><div class='add'>+#define HTT_STAT_DEFAULT_CFG0_ALL_CMDQS 0xffff</div><div class='add'>+#define HTT_STAT_DEFAULT_CFG0_ALL_RINGS 0xffff</div><div class='add'>+#define HTT_STAT_DEFAULT_CFG0_ACTIVE_PEERS 0xff</div><div class='add'>+#define HTT_STAT_DEFAULT_CFG0_CCA_CUMULATIVE 0x00</div><div class='add'>+#define HTT_STAT_DEFAULT_CFG0_ACTIVE_VDEVS 0x00</div><div class='add'>+</div><div class='add'>+/* HTT_DBG_EXT_STATS_PEER_INFO</div><div class='add'>+ * PARAMS:</div><div class='add'>+ * @config_param0:</div><div class='add'>+ *  [Bit0] - [0] for sw_peer_id, [1] for mac_addr based request</div><div class='add'>+ *  [Bit15 : Bit 1] htt_peer_stats_req_mode_t</div><div class='add'>+ *  [Bit31 : Bit16] sw_peer_id</div><div class='add'>+ * @config_param1:</div><div class='add'>+ *  peer_stats_req_type_mask:32 (enum htt_peer_stats_tlv_enum)</div><div class='add'>+ *   0 bit htt_peer_stats_cmn_tlv</div><div class='add'>+ *   1 bit htt_peer_details_tlv</div><div class='add'>+ *   2 bit htt_tx_peer_rate_stats_tlv</div><div class='add'>+ *   3 bit htt_rx_peer_rate_stats_tlv</div><div class='add'>+ *   4 bit htt_tx_tid_stats_tlv/htt_tx_tid_stats_v1_tlv</div><div class='add'>+ *   5 bit htt_rx_tid_stats_tlv</div><div class='add'>+ *   6 bit htt_msdu_flow_stats_tlv</div><div class='add'>+ * @config_param2: [Bit31 : Bit0] mac_addr31to0</div><div class='add'>+ * @config_param3: [Bit15 : Bit0] mac_addr47to32</div><div class='add'>+ *                [Bit31 : Bit16] reserved</div><div class='add'>+ */</div><div class='add'>+#define HTT_STAT_PEER_INFO_MAC_ADDR BIT(0)</div><div class='add'>+#define HTT_STAT_DEFAULT_PEER_REQ_TYPE 0x7f</div><div class='add'>+</div><div class='add'>+/* Used to set different configs to the specified stats type.*/</div><div class='add'>+struct htt_ext_stats_cfg_params {</div><div class='add'>+	u32 cfg0;</div><div class='add'>+	u32 cfg1;</div><div class='add'>+	u32 cfg2;</div><div class='add'>+	u32 cfg3;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum vdev_stats_offload_timer_duration {</div><div class='add'>+	ATH12K_STATS_TIMER_DUR_500MS = 1,</div><div class='add'>+	ATH12K_STATS_TIMER_DUR_1SEC = 2,</div><div class='add'>+	ATH12K_STATS_TIMER_DUR_2SEC = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTT_MAC_ADDR_L32_0	GENMASK(7, 0)</div><div class='add'>+#define ATH12K_HTT_MAC_ADDR_L32_1	GENMASK(15, 8)</div><div class='add'>+#define ATH12K_HTT_MAC_ADDR_L32_2	GENMASK(23, 16)</div><div class='add'>+#define ATH12K_HTT_MAC_ADDR_L32_3	GENMASK(31, 24)</div><div class='add'>+#define ATH12K_HTT_MAC_ADDR_H16_0	GENMASK(7, 0)</div><div class='add'>+#define ATH12K_HTT_MAC_ADDR_H16_1	GENMASK(15, 8)</div><div class='add'>+</div><div class='add'>+struct htt_mac_addr {</div><div class='add'>+	__le32 mac_addr_l32;</div><div class='add'>+	__le32 mac_addr_h16;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+static inline void ath12k_dp_get_mac_addr(u32 addr_l32, u16 addr_h16, u8 *addr)</div><div class='add'>+{</div><div class='add'>+	memcpy(addr, &amp;addr_l32, 4);</div><div class='add'>+	memcpy(addr + 4, &amp;addr_h16, ETH_ALEN - 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_service_srng(struct ath12k_base *ab,</div><div class='add'>+			   struct ath12k_ext_irq_grp *irq_grp,</div><div class='add'>+			   int budget);</div><div class='add'>+int ath12k_dp_htt_connect(struct ath12k_dp *dp);</div><div class='add'>+void ath12k_dp_vdev_tx_attach(struct ath12k *ar, struct ath12k_link_vif *arvif);</div><div class='add'>+void ath12k_dp_free(struct ath12k_base *ab);</div><div class='add'>+int ath12k_dp_alloc(struct ath12k_base *ab);</div><div class='add'>+void ath12k_dp_cc_config(struct ath12k_base *ab);</div><div class='add'>+void ath12k_dp_partner_cc_init(struct ath12k_base *ab);</div><div class='add'>+int ath12k_dp_pdev_alloc(struct ath12k_base *ab);</div><div class='add'>+void ath12k_dp_pdev_pre_alloc(struct ath12k *ar);</div><div class='add'>+void ath12k_dp_pdev_free(struct ath12k_base *ab);</div><div class='add'>+int ath12k_dp_tx_htt_srng_setup(struct ath12k_base *ab, u32 ring_id,</div><div class='add'>+				int mac_id, enum hal_ring_type ring_type);</div><div class='add'>+int ath12k_dp_peer_setup(struct ath12k *ar, int vdev_id, const u8 *addr);</div><div class='add'>+void ath12k_dp_peer_cleanup(struct ath12k *ar, int vdev_id, const u8 *addr);</div><div class='add'>+void ath12k_dp_srng_cleanup(struct ath12k_base *ab, struct dp_srng *ring);</div><div class='add'>+int ath12k_dp_srng_setup(struct ath12k_base *ab, struct dp_srng *ring,</div><div class='add'>+			 enum hal_ring_type type, int ring_num,</div><div class='add'>+			 int mac_id, int num_entries);</div><div class='add'>+void ath12k_dp_link_desc_cleanup(struct ath12k_base *ab,</div><div class='add'>+				 struct dp_link_desc_bank *desc_bank,</div><div class='add'>+				 u32 ring_type, struct dp_srng *ring);</div><div class='add'>+int ath12k_dp_link_desc_setup(struct ath12k_base *ab,</div><div class='add'>+			      struct dp_link_desc_bank *link_desc_banks,</div><div class='add'>+			      u32 ring_type, struct hal_srng *srng,</div><div class='add'>+			      u32 n_link_desc);</div><div class='add'>+struct ath12k_rx_desc_info *ath12k_dp_get_rx_desc(struct ath12k_base *ab,</div><div class='add'>+						  u32 cookie);</div><div class='add'>+struct ath12k_tx_desc_info *ath12k_dp_get_tx_desc(struct ath12k_base *ab,</div><div class='add'>+						  u32 desc_id);</div><div class='add'>+bool ath12k_dp_wmask_compaction_rx_tlv_supported(struct ath12k_base *ab);</div><div class='add'>+void ath12k_dp_hal_rx_desc_init(struct ath12k_base *ab);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/dp_mon.c b/drivers/net/wireless/ath/ath12k/dp_mon.c<br/>new file mode 100644<br/>index 000000000000..39d1967584db<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/dp_mon.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/dp_mon.c</a></div><div class='hunk'>@@ -0,0 +1,4438 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "dp_mon.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "dp_rx.h"</div><div class='add'>+#include "dp_tx.h"</div><div class='add'>+#include "peer.h"</div><div class='add'>+</div><div class='add'>+#define ATH12K_LE32_DEC_ENC(value, dec_bits, enc_bits)	\</div><div class='add'>+		u32_encode_bits(le32_get_bits(value, dec_bits), enc_bits)</div><div class='add'>+</div><div class='add'>+#define ATH12K_LE64_DEC_ENC(value, dec_bits, enc_bits) \</div><div class='add'>+		u32_encode_bits(le64_get_bits(value, dec_bits), enc_bits)</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_rx_handle_ofdma_info(const struct hal_rx_ppdu_end_user_stats *ppdu_end_user,</div><div class='add'>+				   struct hal_rx_user_status *rx_user_status)</div><div class='add'>+{</div><div class='add'>+	rx_user_status-&gt;ul_ofdma_user_v0_word0 =</div><div class='add'>+		__le32_to_cpu(ppdu_end_user-&gt;usr_resp_ref);</div><div class='add'>+	rx_user_status-&gt;ul_ofdma_user_v0_word1 =</div><div class='add'>+		__le32_to_cpu(ppdu_end_user-&gt;usr_resp_ref_ext);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_rx_populate_byte_count(const struct hal_rx_ppdu_end_user_stats *stats,</div><div class='add'>+				     void *ppduinfo,</div><div class='add'>+				     struct hal_rx_user_status *rx_user_status)</div><div class='add'>+{</div><div class='add'>+	rx_user_status-&gt;mpdu_ok_byte_count =</div><div class='add'>+		le32_get_bits(stats-&gt;info7,</div><div class='add'>+			      HAL_RX_PPDU_END_USER_STATS_INFO7_MPDU_OK_BYTE_COUNT);</div><div class='add'>+	rx_user_status-&gt;mpdu_err_byte_count =</div><div class='add'>+		le32_get_bits(stats-&gt;info8,</div><div class='add'>+			      HAL_RX_PPDU_END_USER_STATS_INFO8_MPDU_ERR_BYTE_COUNT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_rx_populate_mu_user_info(const struct hal_rx_ppdu_end_user_stats *rx_tlv,</div><div class='add'>+				       struct hal_rx_mon_ppdu_info *ppdu_info,</div><div class='add'>+				       struct hal_rx_user_status *rx_user_status)</div><div class='add'>+{</div><div class='add'>+	rx_user_status-&gt;ast_index = ppdu_info-&gt;ast_index;</div><div class='add'>+	rx_user_status-&gt;tid = ppdu_info-&gt;tid;</div><div class='add'>+	rx_user_status-&gt;tcp_ack_msdu_count =</div><div class='add'>+		ppdu_info-&gt;tcp_ack_msdu_count;</div><div class='add'>+	rx_user_status-&gt;tcp_msdu_count =</div><div class='add'>+		ppdu_info-&gt;tcp_msdu_count;</div><div class='add'>+	rx_user_status-&gt;udp_msdu_count =</div><div class='add'>+		ppdu_info-&gt;udp_msdu_count;</div><div class='add'>+	rx_user_status-&gt;other_msdu_count =</div><div class='add'>+		ppdu_info-&gt;other_msdu_count;</div><div class='add'>+	rx_user_status-&gt;frame_control = ppdu_info-&gt;frame_control;</div><div class='add'>+	rx_user_status-&gt;frame_control_info_valid =</div><div class='add'>+		ppdu_info-&gt;frame_control_info_valid;</div><div class='add'>+	rx_user_status-&gt;data_sequence_control_info_valid =</div><div class='add'>+		ppdu_info-&gt;data_sequence_control_info_valid;</div><div class='add'>+	rx_user_status-&gt;first_data_seq_ctrl =</div><div class='add'>+		ppdu_info-&gt;first_data_seq_ctrl;</div><div class='add'>+	rx_user_status-&gt;preamble_type = ppdu_info-&gt;preamble_type;</div><div class='add'>+	rx_user_status-&gt;ht_flags = ppdu_info-&gt;ht_flags;</div><div class='add'>+	rx_user_status-&gt;vht_flags = ppdu_info-&gt;vht_flags;</div><div class='add'>+	rx_user_status-&gt;he_flags = ppdu_info-&gt;he_flags;</div><div class='add'>+	rx_user_status-&gt;rs_flags = ppdu_info-&gt;rs_flags;</div><div class='add'>+</div><div class='add'>+	rx_user_status-&gt;mpdu_cnt_fcs_ok =</div><div class='add'>+		ppdu_info-&gt;num_mpdu_fcs_ok;</div><div class='add'>+	rx_user_status-&gt;mpdu_cnt_fcs_err =</div><div class='add'>+		ppdu_info-&gt;num_mpdu_fcs_err;</div><div class='add'>+	memcpy(&amp;rx_user_status-&gt;mpdu_fcs_ok_bitmap[0], &amp;ppdu_info-&gt;mpdu_fcs_ok_bitmap[0],</div><div class='add'>+	       HAL_RX_NUM_WORDS_PER_PPDU_BITMAP *</div><div class='add'>+	       sizeof(ppdu_info-&gt;mpdu_fcs_ok_bitmap[0]));</div><div class='add'>+</div><div class='add'>+	ath12k_dp_mon_rx_populate_byte_count(rx_tlv, ppdu_info, rx_user_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_mon_parse_vht_sig_a(const struct hal_rx_vht_sig_a_info *vht_sig,</div><div class='add'>+					  struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	u32 nsts, info0, info1;</div><div class='add'>+	u8 gi_setting;</div><div class='add'>+</div><div class='add'>+	info0 = __le32_to_cpu(vht_sig-&gt;info0);</div><div class='add'>+	info1 = __le32_to_cpu(vht_sig-&gt;info1);</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;ldpc = u32_get_bits(info1, HAL_RX_VHT_SIG_A_INFO_INFO1_SU_MU_CODING);</div><div class='add'>+	ppdu_info-&gt;mcs = u32_get_bits(info1, HAL_RX_VHT_SIG_A_INFO_INFO1_MCS);</div><div class='add'>+	gi_setting = u32_get_bits(info1, HAL_RX_VHT_SIG_A_INFO_INFO1_GI_SETTING);</div><div class='add'>+	switch (gi_setting) {</div><div class='add'>+	case HAL_RX_VHT_SIG_A_NORMAL_GI:</div><div class='add'>+		ppdu_info-&gt;gi = HAL_RX_GI_0_8_US;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_RX_VHT_SIG_A_SHORT_GI:</div><div class='add'>+	case HAL_RX_VHT_SIG_A_SHORT_GI_AMBIGUITY:</div><div class='add'>+		ppdu_info-&gt;gi = HAL_RX_GI_0_4_US;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;is_stbc = u32_get_bits(info0, HAL_RX_VHT_SIG_A_INFO_INFO0_STBC);</div><div class='add'>+	nsts = u32_get_bits(info0, HAL_RX_VHT_SIG_A_INFO_INFO0_NSTS);</div><div class='add'>+	if (ppdu_info-&gt;is_stbc &amp;&amp; nsts &gt; 0)</div><div class='add'>+		nsts = ((nsts + 1) &gt;&gt; 1) - 1;</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;nss = u32_get_bits(nsts, VHT_SIG_SU_NSS_MASK) + 1;</div><div class='add'>+	ppdu_info-&gt;bw = u32_get_bits(info0, HAL_RX_VHT_SIG_A_INFO_INFO0_BW);</div><div class='add'>+	ppdu_info-&gt;beamformed = u32_get_bits(info1,</div><div class='add'>+					     HAL_RX_VHT_SIG_A_INFO_INFO1_BEAMFORMED);</div><div class='add'>+	ppdu_info-&gt;vht_flag_values5 = u32_get_bits(info0,</div><div class='add'>+						   HAL_RX_VHT_SIG_A_INFO_INFO0_GROUP_ID);</div><div class='add'>+	ppdu_info-&gt;vht_flag_values3[0] = (((ppdu_info-&gt;mcs) &lt;&lt; 4) |</div><div class='add'>+					    ppdu_info-&gt;nss);</div><div class='add'>+	ppdu_info-&gt;vht_flag_values2 = ppdu_info-&gt;bw;</div><div class='add'>+	ppdu_info-&gt;vht_flag_values4 =</div><div class='add'>+		u32_get_bits(info1, HAL_RX_VHT_SIG_A_INFO_INFO1_SU_MU_CODING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_mon_parse_ht_sig(const struct hal_rx_ht_sig_info *ht_sig,</div><div class='add'>+				       struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	u32 info0 = __le32_to_cpu(ht_sig-&gt;info0);</div><div class='add'>+	u32 info1 = __le32_to_cpu(ht_sig-&gt;info1);</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;mcs = u32_get_bits(info0, HAL_RX_HT_SIG_INFO_INFO0_MCS);</div><div class='add'>+	ppdu_info-&gt;bw = u32_get_bits(info0, HAL_RX_HT_SIG_INFO_INFO0_BW);</div><div class='add'>+	ppdu_info-&gt;is_stbc = u32_get_bits(info1, HAL_RX_HT_SIG_INFO_INFO1_STBC);</div><div class='add'>+	ppdu_info-&gt;ldpc = u32_get_bits(info1, HAL_RX_HT_SIG_INFO_INFO1_FEC_CODING);</div><div class='add'>+	ppdu_info-&gt;gi = u32_get_bits(info1, HAL_RX_HT_SIG_INFO_INFO1_GI);</div><div class='add'>+	ppdu_info-&gt;nss = (ppdu_info-&gt;mcs &gt;&gt; 3) + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_mon_parse_l_sig_b(const struct hal_rx_lsig_b_info *lsigb,</div><div class='add'>+					struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	u32 info0 = __le32_to_cpu(lsigb-&gt;info0);</div><div class='add'>+	u8 rate;</div><div class='add'>+</div><div class='add'>+	rate = u32_get_bits(info0, HAL_RX_LSIG_B_INFO_INFO0_RATE);</div><div class='add'>+	switch (rate) {</div><div class='add'>+	case 1:</div><div class='add'>+		rate = HAL_RX_LEGACY_RATE_1_MBPS;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+	case 5:</div><div class='add'>+		rate = HAL_RX_LEGACY_RATE_2_MBPS;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+	case 6:</div><div class='add'>+		rate = HAL_RX_LEGACY_RATE_5_5_MBPS;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+	case 7:</div><div class='add'>+		rate = HAL_RX_LEGACY_RATE_11_MBPS;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		rate = HAL_RX_LEGACY_RATE_INVALID;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;rate = rate;</div><div class='add'>+	ppdu_info-&gt;cck_flag = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_mon_parse_l_sig_a(const struct hal_rx_lsig_a_info *lsiga,</div><div class='add'>+					struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	u32 info0 = __le32_to_cpu(lsiga-&gt;info0);</div><div class='add'>+	u8 rate;</div><div class='add'>+</div><div class='add'>+	rate = u32_get_bits(info0, HAL_RX_LSIG_A_INFO_INFO0_RATE);</div><div class='add'>+	switch (rate) {</div><div class='add'>+	case 8:</div><div class='add'>+		rate = HAL_RX_LEGACY_RATE_48_MBPS;</div><div class='add'>+		break;</div><div class='add'>+	case 9:</div><div class='add'>+		rate = HAL_RX_LEGACY_RATE_24_MBPS;</div><div class='add'>+		break;</div><div class='add'>+	case 10:</div><div class='add'>+		rate = HAL_RX_LEGACY_RATE_12_MBPS;</div><div class='add'>+		break;</div><div class='add'>+	case 11:</div><div class='add'>+		rate = HAL_RX_LEGACY_RATE_6_MBPS;</div><div class='add'>+		break;</div><div class='add'>+	case 12:</div><div class='add'>+		rate = HAL_RX_LEGACY_RATE_54_MBPS;</div><div class='add'>+		break;</div><div class='add'>+	case 13:</div><div class='add'>+		rate = HAL_RX_LEGACY_RATE_36_MBPS;</div><div class='add'>+		break;</div><div class='add'>+	case 14:</div><div class='add'>+		rate = HAL_RX_LEGACY_RATE_18_MBPS;</div><div class='add'>+		break;</div><div class='add'>+	case 15:</div><div class='add'>+		rate = HAL_RX_LEGACY_RATE_9_MBPS;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		rate = HAL_RX_LEGACY_RATE_INVALID;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;rate = rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_parse_he_sig_b2_ofdma(const struct hal_rx_he_sig_b2_ofdma_info *ofdma,</div><div class='add'>+				    struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	u32 info0, value;</div><div class='add'>+</div><div class='add'>+	info0 = __le32_to_cpu(ofdma-&gt;info0);</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;he_data1 |= HE_MCS_KNOWN | HE_DCM_KNOWN | HE_CODING_KNOWN;</div><div class='add'>+</div><div class='add'>+	/* HE-data2 */</div><div class='add'>+	ppdu_info-&gt;he_data2 |= HE_TXBF_KNOWN;</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;mcs = u32_get_bits(info0, HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_MCS);</div><div class='add'>+	value = ppdu_info-&gt;mcs &lt;&lt; HE_TRANSMIT_MCS_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data3 |= value;</div><div class='add'>+</div><div class='add'>+	value = u32_get_bits(info0, HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_DCM);</div><div class='add'>+	value = value &lt;&lt; HE_DCM_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data3 |= value;</div><div class='add'>+</div><div class='add'>+	value = u32_get_bits(info0, HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_CODING);</div><div class='add'>+	ppdu_info-&gt;ldpc = value;</div><div class='add'>+	value = value &lt;&lt; HE_CODING_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data3 |= value;</div><div class='add'>+</div><div class='add'>+	/* HE-data4 */</div><div class='add'>+	value = u32_get_bits(info0, HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_ID);</div><div class='add'>+	value = value &lt;&lt; HE_STA_ID_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data4 |= value;</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;nss =</div><div class='add'>+		u32_get_bits(info0,</div><div class='add'>+			     HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_NSTS) + 1;</div><div class='add'>+	ppdu_info-&gt;beamformed = u32_get_bits(info0,</div><div class='add'>+					     HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_TXBF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_parse_he_sig_b2_mu(const struct hal_rx_he_sig_b2_mu_info *he_sig_b2_mu,</div><div class='add'>+				 struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	u32 info0, value;</div><div class='add'>+</div><div class='add'>+	info0 = __le32_to_cpu(he_sig_b2_mu-&gt;info0);</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;he_data1 |= HE_MCS_KNOWN | HE_CODING_KNOWN;</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;mcs = u32_get_bits(info0, HAL_RX_HE_SIG_B2_MU_INFO_INFO0_STA_MCS);</div><div class='add'>+	value = ppdu_info-&gt;mcs &lt;&lt; HE_TRANSMIT_MCS_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data3 |= value;</div><div class='add'>+</div><div class='add'>+	value = u32_get_bits(info0, HAL_RX_HE_SIG_B2_MU_INFO_INFO0_STA_CODING);</div><div class='add'>+	ppdu_info-&gt;ldpc = value;</div><div class='add'>+	value = value &lt;&lt; HE_CODING_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data3 |= value;</div><div class='add'>+</div><div class='add'>+	value = u32_get_bits(info0, HAL_RX_HE_SIG_B2_MU_INFO_INFO0_STA_ID);</div><div class='add'>+	value = value &lt;&lt; HE_STA_ID_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data4 |= value;</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;nss =</div><div class='add'>+		u32_get_bits(info0,</div><div class='add'>+			     HAL_RX_HE_SIG_B2_MU_INFO_INFO0_STA_NSTS) + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_parse_he_sig_b1_mu(const struct hal_rx_he_sig_b1_mu_info *he_sig_b1_mu,</div><div class='add'>+				 struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	u32 info0 = __le32_to_cpu(he_sig_b1_mu-&gt;info0);</div><div class='add'>+	u16 ru_tones;</div><div class='add'>+</div><div class='add'>+	ru_tones = u32_get_bits(info0,</div><div class='add'>+				HAL_RX_HE_SIG_B1_MU_INFO_INFO0_RU_ALLOCATION);</div><div class='add'>+	ppdu_info-&gt;ru_alloc = ath12k_he_ru_tones_to_nl80211_he_ru_alloc(ru_tones);</div><div class='add'>+	ppdu_info-&gt;he_RU[0] = ru_tones;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_parse_he_sig_mu(const struct hal_rx_he_sig_a_mu_dl_info *he_sig_a_mu_dl,</div><div class='add'>+			      struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	u32 info0, info1, value;</div><div class='add'>+	u16 he_gi = 0, he_ltf = 0;</div><div class='add'>+</div><div class='add'>+	info0 = __le32_to_cpu(he_sig_a_mu_dl-&gt;info0);</div><div class='add'>+	info1 = __le32_to_cpu(he_sig_a_mu_dl-&gt;info1);</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;he_mu_flags = 1;</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;he_data1 = HE_MU_FORMAT_TYPE;</div><div class='add'>+	ppdu_info-&gt;he_data1 |=</div><div class='add'>+			HE_BSS_COLOR_KNOWN |</div><div class='add'>+			HE_DL_UL_KNOWN |</div><div class='add'>+			HE_LDPC_EXTRA_SYMBOL_KNOWN |</div><div class='add'>+			HE_STBC_KNOWN |</div><div class='add'>+			HE_DATA_BW_RU_KNOWN |</div><div class='add'>+			HE_DOPPLER_KNOWN;</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;he_data2 =</div><div class='add'>+			HE_GI_KNOWN |</div><div class='add'>+			HE_LTF_SYMBOLS_KNOWN |</div><div class='add'>+			HE_PRE_FEC_PADDING_KNOWN |</div><div class='add'>+			HE_PE_DISAMBIGUITY_KNOWN |</div><div class='add'>+			HE_TXOP_KNOWN |</div><div class='add'>+			HE_MIDABLE_PERIODICITY_KNOWN;</div><div class='add'>+</div><div class='add'>+	/* data3 */</div><div class='add'>+	ppdu_info-&gt;he_data3 = u32_get_bits(info0, HAL_RX_HE_SIG_A_MU_DL_INFO0_BSS_COLOR);</div><div class='add'>+	value = u32_get_bits(info0, HAL_RX_HE_SIG_A_MU_DL_INFO0_UL_FLAG);</div><div class='add'>+	value = value &lt;&lt; HE_DL_UL_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data3 |= value;</div><div class='add'>+</div><div class='add'>+	value = u32_get_bits(info1, HAL_RX_HE_SIG_A_MU_DL_INFO1_LDPC_EXTRA);</div><div class='add'>+	value = value &lt;&lt; HE_LDPC_EXTRA_SYMBOL_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data3 |= value;</div><div class='add'>+</div><div class='add'>+	value = u32_get_bits(info1, HAL_RX_HE_SIG_A_MU_DL_INFO1_STBC);</div><div class='add'>+	value = value &lt;&lt; HE_STBC_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data3 |= value;</div><div class='add'>+</div><div class='add'>+	/* data4 */</div><div class='add'>+	ppdu_info-&gt;he_data4 = u32_get_bits(info0,</div><div class='add'>+					   HAL_RX_HE_SIG_A_MU_DL_INFO0_SPATIAL_REUSE);</div><div class='add'>+	ppdu_info-&gt;he_data4 = value;</div><div class='add'>+</div><div class='add'>+	/* data5 */</div><div class='add'>+	value = u32_get_bits(info0, HAL_RX_HE_SIG_A_MU_DL_INFO0_TRANSMIT_BW);</div><div class='add'>+	ppdu_info-&gt;he_data5 = value;</div><div class='add'>+	ppdu_info-&gt;bw = value;</div><div class='add'>+</div><div class='add'>+	value = u32_get_bits(info0, HAL_RX_HE_SIG_A_MU_DL_INFO0_CP_LTF_SIZE);</div><div class='add'>+	switch (value) {</div><div class='add'>+	case 0:</div><div class='add'>+		he_gi = HE_GI_0_8;</div><div class='add'>+		he_ltf = HE_LTF_4_X;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		he_gi = HE_GI_0_8;</div><div class='add'>+		he_ltf = HE_LTF_2_X;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		he_gi = HE_GI_1_6;</div><div class='add'>+		he_ltf = HE_LTF_2_X;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		he_gi = HE_GI_3_2;</div><div class='add'>+		he_ltf = HE_LTF_4_X;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;gi = he_gi;</div><div class='add'>+	value = he_gi &lt;&lt; HE_GI_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data5 |= value;</div><div class='add'>+</div><div class='add'>+	value = he_ltf &lt;&lt; HE_LTF_SIZE_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data5 |= value;</div><div class='add'>+</div><div class='add'>+	value = u32_get_bits(info1, HAL_RX_HE_SIG_A_MU_DL_INFO1_NUM_LTF_SYMB);</div><div class='add'>+	value = (value &lt;&lt; HE_LTF_SYM_SHIFT);</div><div class='add'>+	ppdu_info-&gt;he_data5 |= value;</div><div class='add'>+</div><div class='add'>+	value = u32_get_bits(info1, HAL_RX_HE_SIG_A_MU_DL_INFO1_PKT_EXT_FACTOR);</div><div class='add'>+	value = value &lt;&lt; HE_PRE_FEC_PAD_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data5 |= value;</div><div class='add'>+</div><div class='add'>+	value = u32_get_bits(info1, HAL_RX_HE_SIG_A_MU_DL_INFO1_PKT_EXT_PE_DISAM);</div><div class='add'>+	value = value &lt;&lt; HE_PE_DISAMBIGUITY_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data5 |= value;</div><div class='add'>+</div><div class='add'>+	/*data6*/</div><div class='add'>+	value = u32_get_bits(info0, HAL_RX_HE_SIG_A_MU_DL_INFO0_DOPPLER_INDICATION);</div><div class='add'>+	value = value &lt;&lt; HE_DOPPLER_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data6 |= value;</div><div class='add'>+</div><div class='add'>+	value = u32_get_bits(info1, HAL_RX_HE_SIG_A_MU_DL_INFO1_TXOP_DURATION);</div><div class='add'>+	value = value &lt;&lt; HE_TXOP_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data6 |= value;</div><div class='add'>+</div><div class='add'>+	/* HE-MU Flags */</div><div class='add'>+	/* HE-MU-flags1 */</div><div class='add'>+	ppdu_info-&gt;he_flags1 =</div><div class='add'>+		HE_SIG_B_MCS_KNOWN |</div><div class='add'>+		HE_SIG_B_DCM_KNOWN |</div><div class='add'>+		HE_SIG_B_COMPRESSION_FLAG_1_KNOWN |</div><div class='add'>+		HE_SIG_B_SYM_NUM_KNOWN |</div><div class='add'>+		HE_RU_0_KNOWN;</div><div class='add'>+</div><div class='add'>+	value = u32_get_bits(info0, HAL_RX_HE_SIG_A_MU_DL_INFO0_MCS_OF_SIGB);</div><div class='add'>+	ppdu_info-&gt;he_flags1 |= value;</div><div class='add'>+	value = u32_get_bits(info0, HAL_RX_HE_SIG_A_MU_DL_INFO0_DCM_OF_SIGB);</div><div class='add'>+	value = value &lt;&lt; HE_DCM_FLAG_1_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_flags1 |= value;</div><div class='add'>+</div><div class='add'>+	/* HE-MU-flags2 */</div><div class='add'>+	ppdu_info-&gt;he_flags2 = HE_BW_KNOWN;</div><div class='add'>+</div><div class='add'>+	value = u32_get_bits(info0, HAL_RX_HE_SIG_A_MU_DL_INFO0_TRANSMIT_BW);</div><div class='add'>+	ppdu_info-&gt;he_flags2 |= value;</div><div class='add'>+	value = u32_get_bits(info0, HAL_RX_HE_SIG_A_MU_DL_INFO0_COMP_MODE_SIGB);</div><div class='add'>+	value = value &lt;&lt; HE_SIG_B_COMPRESSION_FLAG_2_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_flags2 |= value;</div><div class='add'>+	value = u32_get_bits(info0, HAL_RX_HE_SIG_A_MU_DL_INFO0_NUM_SIGB_SYMB);</div><div class='add'>+	value = value - 1;</div><div class='add'>+	value = value &lt;&lt; HE_NUM_SIG_B_SYMBOLS_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_flags2 |= value;</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;is_stbc = info1 &amp;</div><div class='add'>+			     HAL_RX_HE_SIG_A_MU_DL_INFO1_STBC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_mon_parse_he_sig_su(const struct hal_rx_he_sig_a_su_info *he_sig_a,</div><div class='add'>+					  struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	u32 info0, info1, value;</div><div class='add'>+	u32 dcm;</div><div class='add'>+	u8 he_dcm = 0, he_stbc = 0;</div><div class='add'>+	u16 he_gi = 0, he_ltf = 0;</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;he_flags = 1;</div><div class='add'>+</div><div class='add'>+	info0 = __le32_to_cpu(he_sig_a-&gt;info0);</div><div class='add'>+	info1 = __le32_to_cpu(he_sig_a-&gt;info1);</div><div class='add'>+</div><div class='add'>+	value = u32_get_bits(info0, HAL_RX_HE_SIG_A_SU_INFO_INFO0_FORMAT_IND);</div><div class='add'>+	if (value == 0)</div><div class='add'>+		ppdu_info-&gt;he_data1 = HE_TRIG_FORMAT_TYPE;</div><div class='add'>+	else</div><div class='add'>+		ppdu_info-&gt;he_data1 = HE_SU_FORMAT_TYPE;</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;he_data1 |=</div><div class='add'>+			HE_BSS_COLOR_KNOWN |</div><div class='add'>+			HE_BEAM_CHANGE_KNOWN |</div><div class='add'>+			HE_DL_UL_KNOWN |</div><div class='add'>+			HE_MCS_KNOWN |</div><div class='add'>+			HE_DCM_KNOWN |</div><div class='add'>+			HE_CODING_KNOWN |</div><div class='add'>+			HE_LDPC_EXTRA_SYMBOL_KNOWN |</div><div class='add'>+			HE_STBC_KNOWN |</div><div class='add'>+			HE_DATA_BW_RU_KNOWN |</div><div class='add'>+			HE_DOPPLER_KNOWN;</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;he_data2 |=</div><div class='add'>+			HE_GI_KNOWN |</div><div class='add'>+			HE_TXBF_KNOWN |</div><div class='add'>+			HE_PE_DISAMBIGUITY_KNOWN |</div><div class='add'>+			HE_TXOP_KNOWN |</div><div class='add'>+			HE_LTF_SYMBOLS_KNOWN |</div><div class='add'>+			HE_PRE_FEC_PADDING_KNOWN |</div><div class='add'>+			HE_MIDABLE_PERIODICITY_KNOWN;</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;he_data3 = u32_get_bits(info0,</div><div class='add'>+					   HAL_RX_HE_SIG_A_SU_INFO_INFO0_BSS_COLOR);</div><div class='add'>+	value = u32_get_bits(info0, HAL_RX_HE_SIG_A_SU_INFO_INFO0_BEAM_CHANGE);</div><div class='add'>+	value = value &lt;&lt; HE_BEAM_CHANGE_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data3 |= value;</div><div class='add'>+	value = u32_get_bits(info0, HAL_RX_HE_SIG_A_SU_INFO_INFO0_DL_UL_FLAG);</div><div class='add'>+	value = value &lt;&lt; HE_DL_UL_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data3 |= value;</div><div class='add'>+</div><div class='add'>+	value = u32_get_bits(info0, HAL_RX_HE_SIG_A_SU_INFO_INFO0_TRANSMIT_MCS);</div><div class='add'>+	ppdu_info-&gt;mcs = value;</div><div class='add'>+	value = value &lt;&lt; HE_TRANSMIT_MCS_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data3 |= value;</div><div class='add'>+</div><div class='add'>+	value = u32_get_bits(info0, HAL_RX_HE_SIG_A_SU_INFO_INFO0_DCM);</div><div class='add'>+	he_dcm = value;</div><div class='add'>+	value = value &lt;&lt; HE_DCM_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data3 |= value;</div><div class='add'>+	value = u32_get_bits(info1, HAL_RX_HE_SIG_A_SU_INFO_INFO1_CODING);</div><div class='add'>+	value = value &lt;&lt; HE_CODING_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data3 |= value;</div><div class='add'>+	value = u32_get_bits(info1, HAL_RX_HE_SIG_A_SU_INFO_INFO1_LDPC_EXTRA);</div><div class='add'>+	value = value &lt;&lt; HE_LDPC_EXTRA_SYMBOL_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data3 |= value;</div><div class='add'>+	value = u32_get_bits(info1, HAL_RX_HE_SIG_A_SU_INFO_INFO1_STBC);</div><div class='add'>+	he_stbc = value;</div><div class='add'>+	value = value &lt;&lt; HE_STBC_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data3 |= value;</div><div class='add'>+</div><div class='add'>+	/* data4 */</div><div class='add'>+	ppdu_info-&gt;he_data4 = u32_get_bits(info0,</div><div class='add'>+					   HAL_RX_HE_SIG_A_SU_INFO_INFO0_SPATIAL_REUSE);</div><div class='add'>+</div><div class='add'>+	/* data5 */</div><div class='add'>+	value = u32_get_bits(info0,</div><div class='add'>+			     HAL_RX_HE_SIG_A_SU_INFO_INFO0_TRANSMIT_BW);</div><div class='add'>+	ppdu_info-&gt;he_data5 = value;</div><div class='add'>+	ppdu_info-&gt;bw = value;</div><div class='add'>+	value = u32_get_bits(info0, HAL_RX_HE_SIG_A_SU_INFO_INFO0_CP_LTF_SIZE);</div><div class='add'>+	switch (value) {</div><div class='add'>+	case 0:</div><div class='add'>+		he_gi = HE_GI_0_8;</div><div class='add'>+		he_ltf = HE_LTF_1_X;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		he_gi = HE_GI_0_8;</div><div class='add'>+		he_ltf = HE_LTF_2_X;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		he_gi = HE_GI_1_6;</div><div class='add'>+		he_ltf = HE_LTF_2_X;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		if (he_dcm &amp;&amp; he_stbc) {</div><div class='add'>+			he_gi = HE_GI_0_8;</div><div class='add'>+			he_ltf = HE_LTF_4_X;</div><div class='add'>+		} else {</div><div class='add'>+			he_gi = HE_GI_3_2;</div><div class='add'>+			he_ltf = HE_LTF_4_X;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	ppdu_info-&gt;gi = he_gi;</div><div class='add'>+	value = he_gi &lt;&lt; HE_GI_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data5 |= value;</div><div class='add'>+	value = he_ltf &lt;&lt; HE_LTF_SIZE_SHIFT;</div><div class='add'>+	ppdu_info-&gt;ltf_size = he_ltf;</div><div class='add'>+	ppdu_info-&gt;he_data5 |= value;</div><div class='add'>+</div><div class='add'>+	value = u32_get_bits(info0, HAL_RX_HE_SIG_A_SU_INFO_INFO0_NSTS);</div><div class='add'>+	value = (value &lt;&lt; HE_LTF_SYM_SHIFT);</div><div class='add'>+	ppdu_info-&gt;he_data5 |= value;</div><div class='add'>+</div><div class='add'>+	value = u32_get_bits(info1, HAL_RX_HE_SIG_A_SU_INFO_INFO1_PKT_EXT_FACTOR);</div><div class='add'>+	value = value &lt;&lt; HE_PRE_FEC_PAD_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data5 |= value;</div><div class='add'>+</div><div class='add'>+	value = u32_get_bits(info1, HAL_RX_HE_SIG_A_SU_INFO_INFO1_TXBF);</div><div class='add'>+	value = value &lt;&lt; HE_TXBF_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data5 |= value;</div><div class='add'>+	value = u32_get_bits(info1, HAL_RX_HE_SIG_A_SU_INFO_INFO1_PKT_EXT_PE_DISAM);</div><div class='add'>+	value = value &lt;&lt; HE_PE_DISAMBIGUITY_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data5 |= value;</div><div class='add'>+</div><div class='add'>+	/* data6 */</div><div class='add'>+	value = u32_get_bits(info0, HAL_RX_HE_SIG_A_SU_INFO_INFO0_NSTS);</div><div class='add'>+	value++;</div><div class='add'>+	ppdu_info-&gt;he_data6 = value;</div><div class='add'>+	value = u32_get_bits(info1, HAL_RX_HE_SIG_A_SU_INFO_INFO1_DOPPLER_IND);</div><div class='add'>+	value = value &lt;&lt; HE_DOPPLER_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data6 |= value;</div><div class='add'>+	value = u32_get_bits(info1, HAL_RX_HE_SIG_A_SU_INFO_INFO1_TXOP_DURATION);</div><div class='add'>+	value = value &lt;&lt; HE_TXOP_SHIFT;</div><div class='add'>+	ppdu_info-&gt;he_data6 |= value;</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;mcs =</div><div class='add'>+		u32_get_bits(info0, HAL_RX_HE_SIG_A_SU_INFO_INFO0_TRANSMIT_MCS);</div><div class='add'>+	ppdu_info-&gt;bw =</div><div class='add'>+		u32_get_bits(info0, HAL_RX_HE_SIG_A_SU_INFO_INFO0_TRANSMIT_BW);</div><div class='add'>+	ppdu_info-&gt;ldpc = u32_get_bits(info1, HAL_RX_HE_SIG_A_SU_INFO_INFO1_CODING);</div><div class='add'>+	ppdu_info-&gt;is_stbc = u32_get_bits(info1, HAL_RX_HE_SIG_A_SU_INFO_INFO1_STBC);</div><div class='add'>+	ppdu_info-&gt;beamformed = u32_get_bits(info1, HAL_RX_HE_SIG_A_SU_INFO_INFO1_TXBF);</div><div class='add'>+	dcm = u32_get_bits(info0, HAL_RX_HE_SIG_A_SU_INFO_INFO0_DCM);</div><div class='add'>+	ppdu_info-&gt;nss = u32_get_bits(info0,</div><div class='add'>+				      HAL_RX_HE_SIG_A_SU_INFO_INFO0_NSTS) + 1;</div><div class='add'>+	ppdu_info-&gt;dcm = dcm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_hal_rx_parse_u_sig_cmn(const struct hal_mon_usig_cmn *cmn,</div><div class='add'>+				     struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	u32 common;</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;u_sig_info.bw = le32_get_bits(cmn-&gt;info0,</div><div class='add'>+						 HAL_RX_USIG_CMN_INFO0_BW);</div><div class='add'>+	ppdu_info-&gt;u_sig_info.ul_dl = le32_get_bits(cmn-&gt;info0,</div><div class='add'>+						    HAL_RX_USIG_CMN_INFO0_UL_DL);</div><div class='add'>+</div><div class='add'>+	common = __le32_to_cpu(ppdu_info-&gt;u_sig_info.usig.common);</div><div class='add'>+	common |= IEEE80211_RADIOTAP_EHT_USIG_COMMON_PHY_VER_KNOWN |</div><div class='add'>+		  IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_KNOWN |</div><div class='add'>+		  IEEE80211_RADIOTAP_EHT_USIG_COMMON_UL_DL_KNOWN |</div><div class='add'>+		  IEEE80211_RADIOTAP_EHT_USIG_COMMON_BSS_COLOR_KNOWN |</div><div class='add'>+		  IEEE80211_RADIOTAP_EHT_USIG_COMMON_TXOP_KNOWN |</div><div class='add'>+		  ATH12K_LE32_DEC_ENC(cmn-&gt;info0,</div><div class='add'>+				      HAL_RX_USIG_CMN_INFO0_PHY_VERSION,</div><div class='add'>+				      IEEE80211_RADIOTAP_EHT_USIG_COMMON_PHY_VER) |</div><div class='add'>+		  u32_encode_bits(ppdu_info-&gt;u_sig_info.bw,</div><div class='add'>+				  IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW) |</div><div class='add'>+		  u32_encode_bits(ppdu_info-&gt;u_sig_info.ul_dl,</div><div class='add'>+				  IEEE80211_RADIOTAP_EHT_USIG_COMMON_UL_DL) |</div><div class='add'>+		  ATH12K_LE32_DEC_ENC(cmn-&gt;info0,</div><div class='add'>+				      HAL_RX_USIG_CMN_INFO0_BSS_COLOR,</div><div class='add'>+				      IEEE80211_RADIOTAP_EHT_USIG_COMMON_BSS_COLOR) |</div><div class='add'>+		  ATH12K_LE32_DEC_ENC(cmn-&gt;info0,</div><div class='add'>+				      HAL_RX_USIG_CMN_INFO0_TXOP,</div><div class='add'>+				      IEEE80211_RADIOTAP_EHT_USIG_COMMON_TXOP);</div><div class='add'>+	ppdu_info-&gt;u_sig_info.usig.common = cpu_to_le32(common);</div><div class='add'>+</div><div class='add'>+	switch (ppdu_info-&gt;u_sig_info.bw) {</div><div class='add'>+	default:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case HAL_EHT_BW_20:</div><div class='add'>+		ppdu_info-&gt;bw = HAL_RX_BW_20MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_EHT_BW_40:</div><div class='add'>+		ppdu_info-&gt;bw = HAL_RX_BW_40MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_EHT_BW_80:</div><div class='add'>+		ppdu_info-&gt;bw = HAL_RX_BW_80MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_EHT_BW_160:</div><div class='add'>+		ppdu_info-&gt;bw = HAL_RX_BW_160MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_EHT_BW_320_1:</div><div class='add'>+	case HAL_EHT_BW_320_2:</div><div class='add'>+		ppdu_info-&gt;bw = HAL_RX_BW_320MHZ;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_hal_rx_parse_u_sig_tb(const struct hal_mon_usig_tb *usig_tb,</div><div class='add'>+				    struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_radiotap_eht_usig *usig = &amp;ppdu_info-&gt;u_sig_info.usig;</div><div class='add'>+	enum ieee80211_radiotap_eht_usig_tb spatial_reuse1, spatial_reuse2;</div><div class='add'>+	u32 common, value, mask;</div><div class='add'>+</div><div class='add'>+	spatial_reuse1 = IEEE80211_RADIOTAP_EHT_USIG2_TB_B3_B6_SPATIAL_REUSE_1;</div><div class='add'>+	spatial_reuse2 = IEEE80211_RADIOTAP_EHT_USIG2_TB_B7_B10_SPATIAL_REUSE_2;</div><div class='add'>+</div><div class='add'>+	common = __le32_to_cpu(usig-&gt;common);</div><div class='add'>+	value = __le32_to_cpu(usig-&gt;value);</div><div class='add'>+	mask = __le32_to_cpu(usig-&gt;mask);</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;u_sig_info.ppdu_type_comp_mode =</div><div class='add'>+				le32_get_bits(usig_tb-&gt;info0,</div><div class='add'>+					      HAL_RX_USIG_TB_INFO0_PPDU_TYPE_COMP_MODE);</div><div class='add'>+</div><div class='add'>+	common |= ATH12K_LE32_DEC_ENC(usig_tb-&gt;info0,</div><div class='add'>+				      HAL_RX_USIG_TB_INFO0_RX_INTEG_CHECK_PASS,</div><div class='add'>+				      IEEE80211_RADIOTAP_EHT_USIG_COMMON_BAD_USIG_CRC);</div><div class='add'>+</div><div class='add'>+	value |= IEEE80211_RADIOTAP_EHT_USIG1_TB_B20_B25_DISREGARD |</div><div class='add'>+		 u32_encode_bits(ppdu_info-&gt;u_sig_info.ppdu_type_comp_mode,</div><div class='add'>+				 IEEE80211_RADIOTAP_EHT_USIG2_TB_B0_B1_PPDU_TYPE) |</div><div class='add'>+		 IEEE80211_RADIOTAP_EHT_USIG2_TB_B2_VALIDATE |</div><div class='add'>+		 ATH12K_LE32_DEC_ENC(usig_tb-&gt;info0,</div><div class='add'>+				     HAL_RX_USIG_TB_INFO0_SPATIAL_REUSE_1,</div><div class='add'>+				     spatial_reuse1) |</div><div class='add'>+		 ATH12K_LE32_DEC_ENC(usig_tb-&gt;info0,</div><div class='add'>+				     HAL_RX_USIG_TB_INFO0_SPATIAL_REUSE_2,</div><div class='add'>+				     spatial_reuse2) |</div><div class='add'>+		 IEEE80211_RADIOTAP_EHT_USIG2_TB_B11_B15_DISREGARD |</div><div class='add'>+		 ATH12K_LE32_DEC_ENC(usig_tb-&gt;info0,</div><div class='add'>+				     HAL_RX_USIG_TB_INFO0_CRC,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_USIG2_TB_B16_B19_CRC) |</div><div class='add'>+		 ATH12K_LE32_DEC_ENC(usig_tb-&gt;info0,</div><div class='add'>+				     HAL_RX_USIG_TB_INFO0_TAIL,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_USIG2_TB_B20_B25_TAIL);</div><div class='add'>+</div><div class='add'>+	mask |= IEEE80211_RADIOTAP_EHT_USIG1_TB_B20_B25_DISREGARD |</div><div class='add'>+		IEEE80211_RADIOTAP_EHT_USIG2_TB_B0_B1_PPDU_TYPE |</div><div class='add'>+		IEEE80211_RADIOTAP_EHT_USIG2_TB_B2_VALIDATE |</div><div class='add'>+		spatial_reuse1 | spatial_reuse2 |</div><div class='add'>+		IEEE80211_RADIOTAP_EHT_USIG2_TB_B11_B15_DISREGARD |</div><div class='add'>+		IEEE80211_RADIOTAP_EHT_USIG2_TB_B16_B19_CRC |</div><div class='add'>+		IEEE80211_RADIOTAP_EHT_USIG2_TB_B20_B25_TAIL;</div><div class='add'>+</div><div class='add'>+	usig-&gt;common = cpu_to_le32(common);</div><div class='add'>+	usig-&gt;value = cpu_to_le32(value);</div><div class='add'>+	usig-&gt;mask = cpu_to_le32(mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_hal_rx_parse_u_sig_mu(const struct hal_mon_usig_mu *usig_mu,</div><div class='add'>+				    struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_radiotap_eht_usig *usig = &amp;ppdu_info-&gt;u_sig_info.usig;</div><div class='add'>+	enum ieee80211_radiotap_eht_usig_mu sig_symb, punc;</div><div class='add'>+	u32 common, value, mask;</div><div class='add'>+</div><div class='add'>+	sig_symb = IEEE80211_RADIOTAP_EHT_USIG2_MU_B11_B15_EHT_SIG_SYMBOLS;</div><div class='add'>+	punc = IEEE80211_RADIOTAP_EHT_USIG2_MU_B3_B7_PUNCTURED_INFO;</div><div class='add'>+</div><div class='add'>+	common = __le32_to_cpu(usig-&gt;common);</div><div class='add'>+	value = __le32_to_cpu(usig-&gt;value);</div><div class='add'>+	mask = __le32_to_cpu(usig-&gt;mask);</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;u_sig_info.ppdu_type_comp_mode =</div><div class='add'>+				le32_get_bits(usig_mu-&gt;info0,</div><div class='add'>+					      HAL_RX_USIG_MU_INFO0_PPDU_TYPE_COMP_MODE);</div><div class='add'>+	ppdu_info-&gt;u_sig_info.eht_sig_mcs =</div><div class='add'>+				le32_get_bits(usig_mu-&gt;info0,</div><div class='add'>+					      HAL_RX_USIG_MU_INFO0_EHT_SIG_MCS);</div><div class='add'>+	ppdu_info-&gt;u_sig_info.num_eht_sig_sym =</div><div class='add'>+				le32_get_bits(usig_mu-&gt;info0,</div><div class='add'>+					      HAL_RX_USIG_MU_INFO0_NUM_EHT_SIG_SYM);</div><div class='add'>+</div><div class='add'>+	common |= ATH12K_LE32_DEC_ENC(usig_mu-&gt;info0,</div><div class='add'>+				      HAL_RX_USIG_MU_INFO0_RX_INTEG_CHECK_PASS,</div><div class='add'>+				      IEEE80211_RADIOTAP_EHT_USIG_COMMON_BAD_USIG_CRC);</div><div class='add'>+</div><div class='add'>+	value |= IEEE80211_RADIOTAP_EHT_USIG1_MU_B20_B24_DISREGARD |</div><div class='add'>+		 IEEE80211_RADIOTAP_EHT_USIG1_MU_B25_VALIDATE |</div><div class='add'>+		 u32_encode_bits(ppdu_info-&gt;u_sig_info.ppdu_type_comp_mode,</div><div class='add'>+				 IEEE80211_RADIOTAP_EHT_USIG2_MU_B0_B1_PPDU_TYPE) |</div><div class='add'>+		 IEEE80211_RADIOTAP_EHT_USIG2_MU_B2_VALIDATE |</div><div class='add'>+		 ATH12K_LE32_DEC_ENC(usig_mu-&gt;info0,</div><div class='add'>+				     HAL_RX_USIG_MU_INFO0_PUNC_CH_INFO,</div><div class='add'>+				     punc) |</div><div class='add'>+		 IEEE80211_RADIOTAP_EHT_USIG2_MU_B8_VALIDATE |</div><div class='add'>+		 u32_encode_bits(ppdu_info-&gt;u_sig_info.eht_sig_mcs,</div><div class='add'>+				 IEEE80211_RADIOTAP_EHT_USIG2_MU_B9_B10_SIG_MCS) |</div><div class='add'>+		 u32_encode_bits(ppdu_info-&gt;u_sig_info.num_eht_sig_sym,</div><div class='add'>+				 sig_symb) |</div><div class='add'>+		 ATH12K_LE32_DEC_ENC(usig_mu-&gt;info0,</div><div class='add'>+				     HAL_RX_USIG_MU_INFO0_CRC,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_USIG2_MU_B16_B19_CRC) |</div><div class='add'>+		 ATH12K_LE32_DEC_ENC(usig_mu-&gt;info0,</div><div class='add'>+				     HAL_RX_USIG_MU_INFO0_TAIL,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_USIG2_MU_B20_B25_TAIL);</div><div class='add'>+</div><div class='add'>+	mask |= IEEE80211_RADIOTAP_EHT_USIG1_MU_B20_B24_DISREGARD |</div><div class='add'>+		IEEE80211_RADIOTAP_EHT_USIG1_MU_B25_VALIDATE |</div><div class='add'>+		IEEE80211_RADIOTAP_EHT_USIG2_MU_B0_B1_PPDU_TYPE |</div><div class='add'>+		IEEE80211_RADIOTAP_EHT_USIG2_MU_B2_VALIDATE |</div><div class='add'>+		punc |</div><div class='add'>+		IEEE80211_RADIOTAP_EHT_USIG2_MU_B8_VALIDATE |</div><div class='add'>+		IEEE80211_RADIOTAP_EHT_USIG2_MU_B9_B10_SIG_MCS |</div><div class='add'>+		sig_symb |</div><div class='add'>+		IEEE80211_RADIOTAP_EHT_USIG2_MU_B16_B19_CRC |</div><div class='add'>+		IEEE80211_RADIOTAP_EHT_USIG2_MU_B20_B25_TAIL;</div><div class='add'>+</div><div class='add'>+	usig-&gt;common = cpu_to_le32(common);</div><div class='add'>+	usig-&gt;value = cpu_to_le32(value);</div><div class='add'>+	usig-&gt;mask = cpu_to_le32(mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_hal_rx_parse_u_sig_hdr(const struct hal_mon_usig_hdr *usig,</div><div class='add'>+				     struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	u8 comp_mode;</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;eht_usig = true;</div><div class='add'>+</div><div class='add'>+	ath12k_dp_mon_hal_rx_parse_u_sig_cmn(&amp;usig-&gt;cmn, ppdu_info);</div><div class='add'>+</div><div class='add'>+	comp_mode = le32_get_bits(usig-&gt;non_cmn.mu.info0,</div><div class='add'>+				  HAL_RX_USIG_MU_INFO0_PPDU_TYPE_COMP_MODE);</div><div class='add'>+</div><div class='add'>+	if (comp_mode == 0 &amp;&amp; ppdu_info-&gt;u_sig_info.ul_dl)</div><div class='add'>+		ath12k_dp_mon_hal_rx_parse_u_sig_tb(&amp;usig-&gt;non_cmn.tb, ppdu_info);</div><div class='add'>+	else</div><div class='add'>+		ath12k_dp_mon_hal_rx_parse_u_sig_mu(&amp;usig-&gt;non_cmn.mu, ppdu_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_hal_aggr_tlv(struct hal_rx_mon_ppdu_info *ppdu_info,</div><div class='add'>+			   u16 tlv_len, const void *tlv_data)</div><div class='add'>+{</div><div class='add'>+	if (tlv_len &lt;= HAL_RX_MON_MAX_AGGR_SIZE - ppdu_info-&gt;tlv_aggr.cur_len) {</div><div class='add'>+		memcpy(ppdu_info-&gt;tlv_aggr.buf + ppdu_info-&gt;tlv_aggr.cur_len,</div><div class='add'>+		       tlv_data, tlv_len);</div><div class='add'>+		ppdu_info-&gt;tlv_aggr.cur_len += tlv_len;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+ath12k_dp_mon_hal_rx_is_frame_type_ndp(const struct hal_rx_u_sig_info *usig_info)</div><div class='add'>+{</div><div class='add'>+	if (usig_info-&gt;ppdu_type_comp_mode == 1 &amp;&amp;</div><div class='add'>+	    usig_info-&gt;eht_sig_mcs == 0 &amp;&amp;</div><div class='add'>+	    usig_info-&gt;num_eht_sig_sym == 0)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+ath12k_dp_mon_hal_rx_is_non_ofdma(const struct hal_rx_u_sig_info *usig_info)</div><div class='add'>+{</div><div class='add'>+	u32 ppdu_type_comp_mode = usig_info-&gt;ppdu_type_comp_mode;</div><div class='add'>+	u32 ul_dl = usig_info-&gt;ul_dl;</div><div class='add'>+</div><div class='add'>+	if ((ppdu_type_comp_mode == HAL_RX_RECEPTION_TYPE_MU_MIMO &amp;&amp; ul_dl == 0) ||</div><div class='add'>+	    (ppdu_type_comp_mode == HAL_RX_RECEPTION_TYPE_MU_OFDMA &amp;&amp; ul_dl == 0) ||</div><div class='add'>+	    (ppdu_type_comp_mode == HAL_RX_RECEPTION_TYPE_MU_MIMO  &amp;&amp; ul_dl == 1))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+ath12k_dp_mon_hal_rx_is_ofdma(const struct hal_rx_u_sig_info *usig_info)</div><div class='add'>+{</div><div class='add'>+	if (usig_info-&gt;ppdu_type_comp_mode == 0 &amp;&amp; usig_info-&gt;ul_dl == 0)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_hal_rx_parse_eht_sig_ndp(const struct hal_eht_sig_ndp_cmn_eb *eht_sig_ndp,</div><div class='add'>+				       struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	struct hal_rx_radiotap_eht *eht = &amp;ppdu_info-&gt;eht_info.eht;</div><div class='add'>+	u32 known, data;</div><div class='add'>+</div><div class='add'>+	known = __le32_to_cpu(eht-&gt;known);</div><div class='add'>+	known |= IEEE80211_RADIOTAP_EHT_KNOWN_SPATIAL_REUSE |</div><div class='add'>+		 IEEE80211_RADIOTAP_EHT_KNOWN_EHT_LTF |</div><div class='add'>+		 IEEE80211_RADIOTAP_EHT_KNOWN_NSS_S |</div><div class='add'>+		 IEEE80211_RADIOTAP_EHT_KNOWN_BEAMFORMED_S |</div><div class='add'>+		 IEEE80211_RADIOTAP_EHT_KNOWN_DISREGARD_S |</div><div class='add'>+		 IEEE80211_RADIOTAP_EHT_KNOWN_CRC1 |</div><div class='add'>+		 IEEE80211_RADIOTAP_EHT_KNOWN_TAIL1;</div><div class='add'>+	eht-&gt;known = cpu_to_le32(known);</div><div class='add'>+</div><div class='add'>+	data = __le32_to_cpu(eht-&gt;data[0]);</div><div class='add'>+	data |= ATH12K_LE32_DEC_ENC(eht_sig_ndp-&gt;info0,</div><div class='add'>+				    HAL_RX_EHT_SIG_NDP_CMN_INFO0_SPATIAL_REUSE,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_DATA0_SPATIAL_REUSE);</div><div class='add'>+	/* GI and LTF size are separately indicated in radiotap header</div><div class='add'>+	 * and hence will be parsed from other TLV</div><div class='add'>+	 */</div><div class='add'>+	data |=	ATH12K_LE32_DEC_ENC(eht_sig_ndp-&gt;info0,</div><div class='add'>+				    HAL_RX_EHT_SIG_NDP_CMN_INFO0_NUM_LTF_SYM,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_DATA0_EHT_LTF);</div><div class='add'>+</div><div class='add'>+	data |=	ATH12K_LE32_DEC_ENC(eht_sig_ndp-&gt;info0,</div><div class='add'>+				    HAL_RX_EHT_SIG_NDP_CMN_INFO0_CRC,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_DATA0_CRC1_O);</div><div class='add'>+</div><div class='add'>+	data |= ATH12K_LE32_DEC_ENC(eht_sig_ndp-&gt;info0,</div><div class='add'>+				    HAL_RX_EHT_SIG_NDP_CMN_INFO0_DISREGARD,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_DATA0_DISREGARD_S);</div><div class='add'>+	eht-&gt;data[0] = cpu_to_le32(data);</div><div class='add'>+</div><div class='add'>+	data = __le32_to_cpu(eht-&gt;data[7]);</div><div class='add'>+	data |=	ATH12K_LE32_DEC_ENC(eht_sig_ndp-&gt;info0,</div><div class='add'>+				    HAL_RX_EHT_SIG_NDP_CMN_INFO0_NSS,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_DATA7_NSS_S);</div><div class='add'>+</div><div class='add'>+	data |=	ATH12K_LE32_DEC_ENC(eht_sig_ndp-&gt;info0,</div><div class='add'>+				    HAL_RX_EHT_SIG_NDP_CMN_INFO0_BEAMFORMED,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_DATA7_BEAMFORMED_S);</div><div class='add'>+	eht-&gt;data[7] = cpu_to_le32(data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_hal_rx_parse_usig_overflow(const struct hal_eht_sig_usig_overflow *ovflow,</div><div class='add'>+					 struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	struct hal_rx_radiotap_eht *eht = &amp;ppdu_info-&gt;eht_info.eht;</div><div class='add'>+	u32 known, data;</div><div class='add'>+</div><div class='add'>+	known = __le32_to_cpu(eht-&gt;known);</div><div class='add'>+	known |= IEEE80211_RADIOTAP_EHT_KNOWN_SPATIAL_REUSE |</div><div class='add'>+		 IEEE80211_RADIOTAP_EHT_KNOWN_EHT_LTF |</div><div class='add'>+		 IEEE80211_RADIOTAP_EHT_KNOWN_LDPC_EXTRA_SYM_OM |</div><div class='add'>+		 IEEE80211_RADIOTAP_EHT_KNOWN_PRE_PADD_FACOR_OM |</div><div class='add'>+		 IEEE80211_RADIOTAP_EHT_KNOWN_PE_DISAMBIGUITY_OM |</div><div class='add'>+		 IEEE80211_RADIOTAP_EHT_KNOWN_DISREGARD_O;</div><div class='add'>+	eht-&gt;known = cpu_to_le32(known);</div><div class='add'>+</div><div class='add'>+	data = __le32_to_cpu(eht-&gt;data[0]);</div><div class='add'>+	data |=	ATH12K_LE32_DEC_ENC(ovflow-&gt;info0,</div><div class='add'>+				    HAL_RX_EHT_SIG_OVERFLOW_INFO0_SPATIAL_REUSE,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_DATA0_SPATIAL_REUSE);</div><div class='add'>+</div><div class='add'>+	/* GI and LTF size are separately indicated in radiotap header</div><div class='add'>+	 * and hence will be parsed from other TLV</div><div class='add'>+	 */</div><div class='add'>+	data |=	ATH12K_LE32_DEC_ENC(ovflow-&gt;info0,</div><div class='add'>+				    HAL_RX_EHT_SIG_OVERFLOW_INFO0_NUM_LTF_SYM,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_DATA0_EHT_LTF);</div><div class='add'>+</div><div class='add'>+	data |=	ATH12K_LE32_DEC_ENC(ovflow-&gt;info0,</div><div class='add'>+				    HAL_RX_EHT_SIG_OVERFLOW_INFO0_LDPC_EXTA_SYM,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_DATA0_LDPC_EXTRA_SYM_OM);</div><div class='add'>+</div><div class='add'>+	data |=	ATH12K_LE32_DEC_ENC(ovflow-&gt;info0,</div><div class='add'>+				    HAL_RX_EHT_SIG_OVERFLOW_INFO0_PRE_FEC_PAD_FACTOR,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_DATA0_PRE_PADD_FACOR_OM);</div><div class='add'>+</div><div class='add'>+	data |=	ATH12K_LE32_DEC_ENC(ovflow-&gt;info0,</div><div class='add'>+				    HAL_RX_EHT_SIG_OVERFLOW_INFO0_DISAMBIGUITY,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_DATA0_PE_DISAMBIGUITY_OM);</div><div class='add'>+</div><div class='add'>+	data |=	ATH12K_LE32_DEC_ENC(ovflow-&gt;info0,</div><div class='add'>+				    HAL_RX_EHT_SIG_OVERFLOW_INFO0_DISREGARD,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_DATA0_DISREGARD_O);</div><div class='add'>+	eht-&gt;data[0] = cpu_to_le32(data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_hal_rx_parse_non_ofdma_users(const struct hal_eht_sig_non_ofdma_cmn_eb *eb,</div><div class='add'>+					   struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	struct hal_rx_radiotap_eht *eht = &amp;ppdu_info-&gt;eht_info.eht;</div><div class='add'>+	u32 known, data;</div><div class='add'>+</div><div class='add'>+	known = __le32_to_cpu(eht-&gt;known);</div><div class='add'>+	known |= IEEE80211_RADIOTAP_EHT_KNOWN_NR_NON_OFDMA_USERS_M;</div><div class='add'>+	eht-&gt;known = cpu_to_le32(known);</div><div class='add'>+</div><div class='add'>+	data = __le32_to_cpu(eht-&gt;data[7]);</div><div class='add'>+	data |=	ATH12K_LE32_DEC_ENC(eb-&gt;info0,</div><div class='add'>+				    HAL_RX_EHT_SIG_NON_OFDMA_INFO0_NUM_USERS,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_DATA7_NUM_OF_NON_OFDMA_USERS);</div><div class='add'>+	eht-&gt;data[7] = cpu_to_le32(data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_hal_rx_parse_eht_mumimo_user(const struct hal_eht_sig_mu_mimo *user,</div><div class='add'>+					   struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	struct hal_rx_eht_info *eht_info = &amp;ppdu_info-&gt;eht_info;</div><div class='add'>+	u32 user_idx;</div><div class='add'>+</div><div class='add'>+	if (eht_info-&gt;num_user_info &gt;= ARRAY_SIZE(eht_info-&gt;user_info))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	user_idx = eht_info-&gt;num_user_info++;</div><div class='add'>+</div><div class='add'>+	eht_info-&gt;user_info[user_idx] |=</div><div class='add'>+		IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID_KNOWN |</div><div class='add'>+		IEEE80211_RADIOTAP_EHT_USER_INFO_MCS_KNOWN |</div><div class='add'>+		IEEE80211_RADIOTAP_EHT_USER_INFO_CODING_KNOWN |</div><div class='add'>+		IEEE80211_RADIOTAP_EHT_USER_INFO_SPATIAL_CONFIG_KNOWN_M |</div><div class='add'>+		ATH12K_LE32_DEC_ENC(user-&gt;info0,</div><div class='add'>+				    HAL_RX_EHT_SIG_MUMIMO_USER_INFO0_STA_ID,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID) |</div><div class='add'>+		ATH12K_LE32_DEC_ENC(user-&gt;info0,</div><div class='add'>+				    HAL_RX_EHT_SIG_MUMIMO_USER_INFO0_CODING,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USER_INFO_CODING) |</div><div class='add'>+		ATH12K_LE32_DEC_ENC(user-&gt;info0,</div><div class='add'>+				    HAL_RX_EHT_SIG_MUMIMO_USER_INFO0_MCS,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USER_INFO_MCS) |</div><div class='add'>+		ATH12K_LE32_DEC_ENC(user-&gt;info0,</div><div class='add'>+				    HAL_RX_EHT_SIG_MUMIMO_USER_INFO0_SPATIAL_CODING,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USER_INFO_SPATIAL_CONFIG_M);</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;mcs = le32_get_bits(user-&gt;info0,</div><div class='add'>+				       HAL_RX_EHT_SIG_MUMIMO_USER_INFO0_MCS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_hal_rx_parse_eht_non_mumimo_user(const struct hal_eht_sig_non_mu_mimo *user,</div><div class='add'>+					       struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	struct hal_rx_eht_info *eht_info = &amp;ppdu_info-&gt;eht_info;</div><div class='add'>+	u32 user_idx;</div><div class='add'>+</div><div class='add'>+	if (eht_info-&gt;num_user_info &gt;= ARRAY_SIZE(eht_info-&gt;user_info))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	user_idx = eht_info-&gt;num_user_info++;</div><div class='add'>+</div><div class='add'>+	eht_info-&gt;user_info[user_idx] |=</div><div class='add'>+		IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID_KNOWN |</div><div class='add'>+		IEEE80211_RADIOTAP_EHT_USER_INFO_MCS_KNOWN |</div><div class='add'>+		IEEE80211_RADIOTAP_EHT_USER_INFO_CODING_KNOWN |</div><div class='add'>+		IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_KNOWN_O |</div><div class='add'>+		IEEE80211_RADIOTAP_EHT_USER_INFO_BEAMFORMING_KNOWN_O |</div><div class='add'>+		ATH12K_LE32_DEC_ENC(user-&gt;info0,</div><div class='add'>+				    HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_STA_ID,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID) |</div><div class='add'>+		ATH12K_LE32_DEC_ENC(user-&gt;info0,</div><div class='add'>+				    HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_CODING,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USER_INFO_CODING) |</div><div class='add'>+		ATH12K_LE32_DEC_ENC(user-&gt;info0,</div><div class='add'>+				    HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_MCS,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USER_INFO_MCS) |</div><div class='add'>+		ATH12K_LE32_DEC_ENC(user-&gt;info0,</div><div class='add'>+				    HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_NSS,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_O) |</div><div class='add'>+		ATH12K_LE32_DEC_ENC(user-&gt;info0,</div><div class='add'>+				    HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_BEAMFORMED,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USER_INFO_BEAMFORMING_O);</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;mcs = le32_get_bits(user-&gt;info0,</div><div class='add'>+				       HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_MCS);</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;nss = le32_get_bits(user-&gt;info0,</div><div class='add'>+				       HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_NSS) + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+ath12k_dp_mon_hal_rx_is_mu_mimo_user(const struct hal_rx_u_sig_info *usig_info)</div><div class='add'>+{</div><div class='add'>+	if (usig_info-&gt;ppdu_type_comp_mode == HAL_RX_RECEPTION_TYPE_SU &amp;&amp;</div><div class='add'>+	    usig_info-&gt;ul_dl == 1)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_hal_rx_parse_eht_sig_non_ofdma(const void *tlv,</div><div class='add'>+					     struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	const struct hal_eht_sig_non_ofdma_cmn_eb *eb = tlv;</div><div class='add'>+</div><div class='add'>+	ath12k_dp_mon_hal_rx_parse_usig_overflow(tlv, ppdu_info);</div><div class='add'>+	ath12k_dp_mon_hal_rx_parse_non_ofdma_users(eb, ppdu_info);</div><div class='add'>+</div><div class='add'>+	if (ath12k_dp_mon_hal_rx_is_mu_mimo_user(&amp;ppdu_info-&gt;u_sig_info))</div><div class='add'>+		ath12k_dp_mon_hal_rx_parse_eht_mumimo_user(&amp;eb-&gt;user_field.mu_mimo,</div><div class='add'>+							   ppdu_info);</div><div class='add'>+	else</div><div class='add'>+		ath12k_dp_mon_hal_rx_parse_eht_non_mumimo_user(&amp;eb-&gt;user_field.n_mu_mimo,</div><div class='add'>+							       ppdu_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_hal_rx_parse_ru_allocation(const struct hal_eht_sig_ofdma_cmn_eb *eb,</div><div class='add'>+					 struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	const struct hal_eht_sig_ofdma_cmn_eb1 *ofdma_cmn_eb1 = &amp;eb-&gt;eb1;</div><div class='add'>+	const struct hal_eht_sig_ofdma_cmn_eb2 *ofdma_cmn_eb2 = &amp;eb-&gt;eb2;</div><div class='add'>+	struct hal_rx_radiotap_eht *eht = &amp;ppdu_info-&gt;eht_info.eht;</div><div class='add'>+	enum ieee80211_radiotap_eht_data ru_123, ru_124, ru_125, ru_126;</div><div class='add'>+	enum ieee80211_radiotap_eht_data ru_121, ru_122, ru_112, ru_111;</div><div class='add'>+	u32 data;</div><div class='add'>+</div><div class='add'>+	ru_123 = IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_1_2_3;</div><div class='add'>+	ru_124 = IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_4;</div><div class='add'>+	ru_125 = IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_5;</div><div class='add'>+	ru_126 = IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_1_2_6;</div><div class='add'>+	ru_121 = IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_1;</div><div class='add'>+	ru_122 = IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_2;</div><div class='add'>+	ru_112 = IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_1_1_2;</div><div class='add'>+	ru_111 = IEEE80211_RADIOTAP_EHT_DATA1_RU_ALLOC_CC_1_1_1;</div><div class='add'>+</div><div class='add'>+	switch (ppdu_info-&gt;u_sig_info.bw) {</div><div class='add'>+	case HAL_EHT_BW_320_2:</div><div class='add'>+	case HAL_EHT_BW_320_1:</div><div class='add'>+		data = __le32_to_cpu(eht-&gt;data[4]);</div><div class='add'>+		/* CC1 2::3 */</div><div class='add'>+		data |=	IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_1_2_3_KNOWN |</div><div class='add'>+			ATH12K_LE64_DEC_ENC(ofdma_cmn_eb2-&gt;info0,</div><div class='add'>+					    HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_3,</div><div class='add'>+					    ru_123);</div><div class='add'>+		eht-&gt;data[4] = cpu_to_le32(data);</div><div class='add'>+</div><div class='add'>+		data = __le32_to_cpu(eht-&gt;data[5]);</div><div class='add'>+		/* CC1 2::4 */</div><div class='add'>+		data |=	IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_4_KNOWN |</div><div class='add'>+			ATH12K_LE64_DEC_ENC(ofdma_cmn_eb2-&gt;info0,</div><div class='add'>+					    HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_4,</div><div class='add'>+					    ru_124);</div><div class='add'>+</div><div class='add'>+		/* CC1 2::5 */</div><div class='add'>+		data |=	IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_5_KNOWN |</div><div class='add'>+			ATH12K_LE64_DEC_ENC(ofdma_cmn_eb2-&gt;info0,</div><div class='add'>+					    HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_5,</div><div class='add'>+					    ru_125);</div><div class='add'>+		eht-&gt;data[5] = cpu_to_le32(data);</div><div class='add'>+</div><div class='add'>+		data = __le32_to_cpu(eht-&gt;data[6]);</div><div class='add'>+		/* CC1 2::6 */</div><div class='add'>+		data |=	IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_1_2_6_KNOWN |</div><div class='add'>+			ATH12K_LE64_DEC_ENC(ofdma_cmn_eb2-&gt;info0,</div><div class='add'>+					    HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_6,</div><div class='add'>+					    ru_126);</div><div class='add'>+		eht-&gt;data[6] = cpu_to_le32(data);</div><div class='add'>+</div><div class='add'>+		fallthrough;</div><div class='add'>+	case HAL_EHT_BW_160:</div><div class='add'>+		data = __le32_to_cpu(eht-&gt;data[3]);</div><div class='add'>+		/* CC1 2::1 */</div><div class='add'>+		data |=	IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_1_KNOWN |</div><div class='add'>+			ATH12K_LE64_DEC_ENC(ofdma_cmn_eb2-&gt;info0,</div><div class='add'>+					    HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_1,</div><div class='add'>+					    ru_121);</div><div class='add'>+		/* CC1 2::2 */</div><div class='add'>+		data |=	IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_2_KNOWN |</div><div class='add'>+			ATH12K_LE64_DEC_ENC(ofdma_cmn_eb2-&gt;info0,</div><div class='add'>+					    HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_2,</div><div class='add'>+					    ru_122);</div><div class='add'>+		eht-&gt;data[3] = cpu_to_le32(data);</div><div class='add'>+</div><div class='add'>+		fallthrough;</div><div class='add'>+	case HAL_EHT_BW_80:</div><div class='add'>+		data = __le32_to_cpu(eht-&gt;data[2]);</div><div class='add'>+		/* CC1 1::2 */</div><div class='add'>+		data |=	IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_1_1_2_KNOWN |</div><div class='add'>+			ATH12K_LE64_DEC_ENC(ofdma_cmn_eb1-&gt;info0,</div><div class='add'>+					    HAL_RX_EHT_SIG_OFDMA_EB1_RU_ALLOC_1_2,</div><div class='add'>+					    ru_112);</div><div class='add'>+		eht-&gt;data[2] = cpu_to_le32(data);</div><div class='add'>+</div><div class='add'>+		fallthrough;</div><div class='add'>+	case HAL_EHT_BW_40:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case HAL_EHT_BW_20:</div><div class='add'>+		data = __le32_to_cpu(eht-&gt;data[1]);</div><div class='add'>+		/* CC1 1::1 */</div><div class='add'>+		data |=	IEEE80211_RADIOTAP_EHT_DATA1_RU_ALLOC_CC_1_1_1_KNOWN |</div><div class='add'>+			ATH12K_LE64_DEC_ENC(ofdma_cmn_eb1-&gt;info0,</div><div class='add'>+					    HAL_RX_EHT_SIG_OFDMA_EB1_RU_ALLOC_1_1,</div><div class='add'>+					    ru_111);</div><div class='add'>+		eht-&gt;data[1] = cpu_to_le32(data);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_hal_rx_parse_eht_sig_ofdma(const void *tlv,</div><div class='add'>+					 struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	const struct hal_eht_sig_ofdma_cmn_eb *ofdma = tlv;</div><div class='add'>+</div><div class='add'>+	ath12k_dp_mon_hal_rx_parse_usig_overflow(tlv, ppdu_info);</div><div class='add'>+	ath12k_dp_mon_hal_rx_parse_ru_allocation(ofdma, ppdu_info);</div><div class='add'>+</div><div class='add'>+	ath12k_dp_mon_hal_rx_parse_eht_non_mumimo_user(&amp;ofdma-&gt;user_field.n_mu_mimo,</div><div class='add'>+						       ppdu_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_parse_eht_sig_hdr(struct hal_rx_mon_ppdu_info *ppdu_info,</div><div class='add'>+				const void *tlv_data)</div><div class='add'>+{</div><div class='add'>+	ppdu_info-&gt;is_eht = true;</div><div class='add'>+</div><div class='add'>+	if (ath12k_dp_mon_hal_rx_is_frame_type_ndp(&amp;ppdu_info-&gt;u_sig_info))</div><div class='add'>+		ath12k_dp_mon_hal_rx_parse_eht_sig_ndp(tlv_data, ppdu_info);</div><div class='add'>+	else if (ath12k_dp_mon_hal_rx_is_non_ofdma(&amp;ppdu_info-&gt;u_sig_info))</div><div class='add'>+		ath12k_dp_mon_hal_rx_parse_eht_sig_non_ofdma(tlv_data, ppdu_info);</div><div class='add'>+	else if (ath12k_dp_mon_hal_rx_is_ofdma(&amp;ppdu_info-&gt;u_sig_info))</div><div class='add'>+		ath12k_dp_mon_hal_rx_parse_eht_sig_ofdma(tlv_data, ppdu_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline enum ath12k_eht_ru_size</div><div class='add'>+hal_rx_mon_hal_ru_size_to_ath12k_ru_size(u32 hal_ru_size)</div><div class='add'>+{</div><div class='add'>+	switch (hal_ru_size) {</div><div class='add'>+	case HAL_EHT_RU_26:</div><div class='add'>+		return ATH12K_EHT_RU_26;</div><div class='add'>+	case HAL_EHT_RU_52:</div><div class='add'>+		return ATH12K_EHT_RU_52;</div><div class='add'>+	case HAL_EHT_RU_78:</div><div class='add'>+		return ATH12K_EHT_RU_52_26;</div><div class='add'>+	case HAL_EHT_RU_106:</div><div class='add'>+		return ATH12K_EHT_RU_106;</div><div class='add'>+	case HAL_EHT_RU_132:</div><div class='add'>+		return ATH12K_EHT_RU_106_26;</div><div class='add'>+	case HAL_EHT_RU_242:</div><div class='add'>+		return ATH12K_EHT_RU_242;</div><div class='add'>+	case HAL_EHT_RU_484:</div><div class='add'>+		return ATH12K_EHT_RU_484;</div><div class='add'>+	case HAL_EHT_RU_726:</div><div class='add'>+		return ATH12K_EHT_RU_484_242;</div><div class='add'>+	case HAL_EHT_RU_996:</div><div class='add'>+		return ATH12K_EHT_RU_996;</div><div class='add'>+	case HAL_EHT_RU_996x2:</div><div class='add'>+		return ATH12K_EHT_RU_996x2;</div><div class='add'>+	case HAL_EHT_RU_996x3:</div><div class='add'>+		return ATH12K_EHT_RU_996x3;</div><div class='add'>+	case HAL_EHT_RU_996x4:</div><div class='add'>+		return ATH12K_EHT_RU_996x4;</div><div class='add'>+	case HAL_EHT_RU_NONE:</div><div class='add'>+		return ATH12K_EHT_RU_INVALID;</div><div class='add'>+	case HAL_EHT_RU_996_484:</div><div class='add'>+		return ATH12K_EHT_RU_996_484;</div><div class='add'>+	case HAL_EHT_RU_996x2_484:</div><div class='add'>+		return ATH12K_EHT_RU_996x2_484;</div><div class='add'>+	case HAL_EHT_RU_996x3_484:</div><div class='add'>+		return ATH12K_EHT_RU_996x3_484;</div><div class='add'>+	case HAL_EHT_RU_996_484_242:</div><div class='add'>+		return ATH12K_EHT_RU_996_484_242;</div><div class='add'>+	default:</div><div class='add'>+		return ATH12K_EHT_RU_INVALID;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+hal_rx_ul_ofdma_ru_size_to_width(enum ath12k_eht_ru_size ru_size)</div><div class='add'>+{</div><div class='add'>+	switch (ru_size) {</div><div class='add'>+	case ATH12K_EHT_RU_26:</div><div class='add'>+		return RU_26;</div><div class='add'>+	case ATH12K_EHT_RU_52:</div><div class='add'>+		return RU_52;</div><div class='add'>+	case ATH12K_EHT_RU_52_26:</div><div class='add'>+		return RU_52_26;</div><div class='add'>+	case ATH12K_EHT_RU_106:</div><div class='add'>+		return RU_106;</div><div class='add'>+	case ATH12K_EHT_RU_106_26:</div><div class='add'>+		return RU_106_26;</div><div class='add'>+	case ATH12K_EHT_RU_242:</div><div class='add'>+		return RU_242;</div><div class='add'>+	case ATH12K_EHT_RU_484:</div><div class='add'>+		return RU_484;</div><div class='add'>+	case ATH12K_EHT_RU_484_242:</div><div class='add'>+		return RU_484_242;</div><div class='add'>+	case ATH12K_EHT_RU_996:</div><div class='add'>+		return RU_996;</div><div class='add'>+	case ATH12K_EHT_RU_996_484:</div><div class='add'>+		return RU_996_484;</div><div class='add'>+	case ATH12K_EHT_RU_996_484_242:</div><div class='add'>+		return RU_996_484_242;</div><div class='add'>+	case ATH12K_EHT_RU_996x2:</div><div class='add'>+		return RU_2X996;</div><div class='add'>+	case ATH12K_EHT_RU_996x2_484:</div><div class='add'>+		return RU_2X996_484;</div><div class='add'>+	case ATH12K_EHT_RU_996x3:</div><div class='add'>+		return RU_3X996;</div><div class='add'>+	case ATH12K_EHT_RU_996x3_484:</div><div class='add'>+		return RU_3X996_484;</div><div class='add'>+	case ATH12K_EHT_RU_996x4:</div><div class='add'>+		return RU_4X996;</div><div class='add'>+	default:</div><div class='add'>+		return RU_INVALID;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_hal_rx_parse_user_info(const struct hal_receive_user_info *rx_usr_info,</div><div class='add'>+				     u16 user_id,</div><div class='add'>+				     struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	struct hal_rx_user_status *mon_rx_user_status = NULL;</div><div class='add'>+	struct hal_rx_radiotap_eht *eht = &amp;ppdu_info-&gt;eht_info.eht;</div><div class='add'>+	enum ath12k_eht_ru_size rtap_ru_size = ATH12K_EHT_RU_INVALID;</div><div class='add'>+	u32 ru_width, reception_type, ru_index = HAL_EHT_RU_INVALID;</div><div class='add'>+	u32 ru_type_80_0, ru_start_index_80_0;</div><div class='add'>+	u32 ru_type_80_1, ru_start_index_80_1;</div><div class='add'>+	u32 ru_type_80_2, ru_start_index_80_2;</div><div class='add'>+	u32 ru_type_80_3, ru_start_index_80_3;</div><div class='add'>+	u32 ru_size = 0, num_80mhz_with_ru = 0;</div><div class='add'>+	u64 ru_index_320mhz = 0;</div><div class='add'>+	u32 ru_index_per80mhz;</div><div class='add'>+</div><div class='add'>+	reception_type = le32_get_bits(rx_usr_info-&gt;info0,</div><div class='add'>+				       HAL_RX_USR_INFO0_RECEPTION_TYPE);</div><div class='add'>+</div><div class='add'>+	switch (reception_type) {</div><div class='add'>+	case HAL_RECEPTION_TYPE_SU:</div><div class='add'>+		ppdu_info-&gt;reception_type = HAL_RX_RECEPTION_TYPE_SU;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_RECEPTION_TYPE_DL_MU_MIMO:</div><div class='add'>+	case HAL_RECEPTION_TYPE_UL_MU_MIMO:</div><div class='add'>+		ppdu_info-&gt;reception_type = HAL_RX_RECEPTION_TYPE_MU_MIMO;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_RECEPTION_TYPE_DL_MU_OFMA:</div><div class='add'>+	case HAL_RECEPTION_TYPE_UL_MU_OFDMA:</div><div class='add'>+		ppdu_info-&gt;reception_type = HAL_RX_RECEPTION_TYPE_MU_OFDMA;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_RECEPTION_TYPE_DL_MU_OFDMA_MIMO:</div><div class='add'>+	case HAL_RECEPTION_TYPE_UL_MU_OFDMA_MIMO:</div><div class='add'>+		ppdu_info-&gt;reception_type = HAL_RX_RECEPTION_TYPE_MU_OFDMA_MIMO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;is_stbc = le32_get_bits(rx_usr_info-&gt;info0, HAL_RX_USR_INFO0_STBC);</div><div class='add'>+	ppdu_info-&gt;ldpc = le32_get_bits(rx_usr_info-&gt;info2, HAL_RX_USR_INFO2_LDPC);</div><div class='add'>+	ppdu_info-&gt;dcm = le32_get_bits(rx_usr_info-&gt;info2, HAL_RX_USR_INFO2_STA_DCM);</div><div class='add'>+	ppdu_info-&gt;bw = le32_get_bits(rx_usr_info-&gt;info1, HAL_RX_USR_INFO1_RX_BW);</div><div class='add'>+	ppdu_info-&gt;mcs = le32_get_bits(rx_usr_info-&gt;info1, HAL_RX_USR_INFO1_MCS);</div><div class='add'>+	ppdu_info-&gt;nss = le32_get_bits(rx_usr_info-&gt;info2, HAL_RX_USR_INFO2_NSS) + 1;</div><div class='add'>+</div><div class='add'>+	if (user_id &lt; HAL_MAX_UL_MU_USERS) {</div><div class='add'>+		mon_rx_user_status = &amp;ppdu_info-&gt;userstats[user_id];</div><div class='add'>+		mon_rx_user_status-&gt;mcs = ppdu_info-&gt;mcs;</div><div class='add'>+		mon_rx_user_status-&gt;nss = ppdu_info-&gt;nss;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(ppdu_info-&gt;reception_type == HAL_RX_RECEPTION_TYPE_MU_MIMO ||</div><div class='add'>+	      ppdu_info-&gt;reception_type == HAL_RX_RECEPTION_TYPE_MU_OFDMA ||</div><div class='add'>+	      ppdu_info-&gt;reception_type == HAL_RX_RECEPTION_TYPE_MU_OFDMA_MIMO))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* RU allocation present only for OFDMA reception */</div><div class='add'>+	ru_type_80_0 = le32_get_bits(rx_usr_info-&gt;info2, HAL_RX_USR_INFO2_RU_TYPE_80_0);</div><div class='add'>+	ru_start_index_80_0 = le32_get_bits(rx_usr_info-&gt;info3,</div><div class='add'>+					    HAL_RX_USR_INFO3_RU_START_IDX_80_0);</div><div class='add'>+	if (ru_type_80_0 != HAL_EHT_RU_NONE) {</div><div class='add'>+		ru_size += ru_type_80_0;</div><div class='add'>+		ru_index_per80mhz = ru_start_index_80_0;</div><div class='add'>+		ru_index = ru_index_per80mhz;</div><div class='add'>+		ru_index_320mhz |= HAL_RU_PER80(ru_type_80_0, 0, ru_index_per80mhz);</div><div class='add'>+		num_80mhz_with_ru++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ru_type_80_1 = le32_get_bits(rx_usr_info-&gt;info2, HAL_RX_USR_INFO2_RU_TYPE_80_1);</div><div class='add'>+	ru_start_index_80_1 = le32_get_bits(rx_usr_info-&gt;info3,</div><div class='add'>+					    HAL_RX_USR_INFO3_RU_START_IDX_80_1);</div><div class='add'>+	if (ru_type_80_1 != HAL_EHT_RU_NONE) {</div><div class='add'>+		ru_size += ru_type_80_1;</div><div class='add'>+		ru_index_per80mhz = ru_start_index_80_1;</div><div class='add'>+		ru_index = ru_index_per80mhz;</div><div class='add'>+		ru_index_320mhz |= HAL_RU_PER80(ru_type_80_1, 1, ru_index_per80mhz);</div><div class='add'>+		num_80mhz_with_ru++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ru_type_80_2 = le32_get_bits(rx_usr_info-&gt;info2, HAL_RX_USR_INFO2_RU_TYPE_80_2);</div><div class='add'>+	ru_start_index_80_2 = le32_get_bits(rx_usr_info-&gt;info3,</div><div class='add'>+					    HAL_RX_USR_INFO3_RU_START_IDX_80_2);</div><div class='add'>+	if (ru_type_80_2 != HAL_EHT_RU_NONE) {</div><div class='add'>+		ru_size += ru_type_80_2;</div><div class='add'>+		ru_index_per80mhz = ru_start_index_80_2;</div><div class='add'>+		ru_index = ru_index_per80mhz;</div><div class='add'>+		ru_index_320mhz |= HAL_RU_PER80(ru_type_80_2, 2, ru_index_per80mhz);</div><div class='add'>+		num_80mhz_with_ru++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ru_type_80_3 = le32_get_bits(rx_usr_info-&gt;info2, HAL_RX_USR_INFO2_RU_TYPE_80_3);</div><div class='add'>+	ru_start_index_80_3 = le32_get_bits(rx_usr_info-&gt;info2,</div><div class='add'>+					    HAL_RX_USR_INFO3_RU_START_IDX_80_3);</div><div class='add'>+	if (ru_type_80_3 != HAL_EHT_RU_NONE) {</div><div class='add'>+		ru_size += ru_type_80_3;</div><div class='add'>+		ru_index_per80mhz = ru_start_index_80_3;</div><div class='add'>+		ru_index = ru_index_per80mhz;</div><div class='add'>+		ru_index_320mhz |= HAL_RU_PER80(ru_type_80_3, 3, ru_index_per80mhz);</div><div class='add'>+		num_80mhz_with_ru++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (num_80mhz_with_ru &gt; 1) {</div><div class='add'>+		/* Calculate the MRU index */</div><div class='add'>+		switch (ru_index_320mhz) {</div><div class='add'>+		case HAL_EHT_RU_996_484_0:</div><div class='add'>+		case HAL_EHT_RU_996x2_484_0:</div><div class='add'>+		case HAL_EHT_RU_996x3_484_0:</div><div class='add'>+			ru_index = 0;</div><div class='add'>+			break;</div><div class='add'>+		case HAL_EHT_RU_996_484_1:</div><div class='add'>+		case HAL_EHT_RU_996x2_484_1:</div><div class='add'>+		case HAL_EHT_RU_996x3_484_1:</div><div class='add'>+			ru_index = 1;</div><div class='add'>+			break;</div><div class='add'>+		case HAL_EHT_RU_996_484_2:</div><div class='add'>+		case HAL_EHT_RU_996x2_484_2:</div><div class='add'>+		case HAL_EHT_RU_996x3_484_2:</div><div class='add'>+			ru_index = 2;</div><div class='add'>+			break;</div><div class='add'>+		case HAL_EHT_RU_996_484_3:</div><div class='add'>+		case HAL_EHT_RU_996x2_484_3:</div><div class='add'>+		case HAL_EHT_RU_996x3_484_3:</div><div class='add'>+			ru_index = 3;</div><div class='add'>+			break;</div><div class='add'>+		case HAL_EHT_RU_996_484_4:</div><div class='add'>+		case HAL_EHT_RU_996x2_484_4:</div><div class='add'>+		case HAL_EHT_RU_996x3_484_4:</div><div class='add'>+			ru_index = 4;</div><div class='add'>+			break;</div><div class='add'>+		case HAL_EHT_RU_996_484_5:</div><div class='add'>+		case HAL_EHT_RU_996x2_484_5:</div><div class='add'>+		case HAL_EHT_RU_996x3_484_5:</div><div class='add'>+			ru_index = 5;</div><div class='add'>+			break;</div><div class='add'>+		case HAL_EHT_RU_996_484_6:</div><div class='add'>+		case HAL_EHT_RU_996x2_484_6:</div><div class='add'>+		case HAL_EHT_RU_996x3_484_6:</div><div class='add'>+			ru_index = 6;</div><div class='add'>+			break;</div><div class='add'>+		case HAL_EHT_RU_996_484_7:</div><div class='add'>+		case HAL_EHT_RU_996x2_484_7:</div><div class='add'>+		case HAL_EHT_RU_996x3_484_7:</div><div class='add'>+			ru_index = 7;</div><div class='add'>+			break;</div><div class='add'>+		case HAL_EHT_RU_996x2_484_8:</div><div class='add'>+			ru_index = 8;</div><div class='add'>+			break;</div><div class='add'>+		case HAL_EHT_RU_996x2_484_9:</div><div class='add'>+			ru_index = 9;</div><div class='add'>+			break;</div><div class='add'>+		case HAL_EHT_RU_996x2_484_10:</div><div class='add'>+			ru_index = 10;</div><div class='add'>+			break;</div><div class='add'>+		case HAL_EHT_RU_996x2_484_11:</div><div class='add'>+			ru_index = 11;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ru_index = HAL_EHT_RU_INVALID;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ru_size += 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtap_ru_size = hal_rx_mon_hal_ru_size_to_ath12k_ru_size(ru_size);</div><div class='add'>+	if (rtap_ru_size != ATH12K_EHT_RU_INVALID) {</div><div class='add'>+		u32 known, data;</div><div class='add'>+</div><div class='add'>+		known = __le32_to_cpu(eht-&gt;known);</div><div class='add'>+		known |= IEEE80211_RADIOTAP_EHT_KNOWN_RU_MRU_SIZE_OM;</div><div class='add'>+		eht-&gt;known = cpu_to_le32(known);</div><div class='add'>+</div><div class='add'>+		data = __le32_to_cpu(eht-&gt;data[1]);</div><div class='add'>+		data |=	u32_encode_bits(rtap_ru_size,</div><div class='add'>+					IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE);</div><div class='add'>+		eht-&gt;data[1] = cpu_to_le32(data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ru_index != HAL_EHT_RU_INVALID) {</div><div class='add'>+		u32 known, data;</div><div class='add'>+</div><div class='add'>+		known = __le32_to_cpu(eht-&gt;known);</div><div class='add'>+		known |= IEEE80211_RADIOTAP_EHT_KNOWN_RU_MRU_INDEX_OM;</div><div class='add'>+		eht-&gt;known = cpu_to_le32(known);</div><div class='add'>+</div><div class='add'>+		data = __le32_to_cpu(eht-&gt;data[1]);</div><div class='add'>+		data |=	u32_encode_bits(rtap_ru_size,</div><div class='add'>+					IEEE80211_RADIOTAP_EHT_DATA1_RU_INDEX);</div><div class='add'>+		eht-&gt;data[1] = cpu_to_le32(data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mon_rx_user_status &amp;&amp; ru_index != HAL_EHT_RU_INVALID &amp;&amp;</div><div class='add'>+	    rtap_ru_size != ATH12K_EHT_RU_INVALID) {</div><div class='add'>+		mon_rx_user_status-&gt;ul_ofdma_ru_start_index = ru_index;</div><div class='add'>+		mon_rx_user_status-&gt;ul_ofdma_ru_size = rtap_ru_size;</div><div class='add'>+</div><div class='add'>+		ru_width = hal_rx_ul_ofdma_ru_size_to_width(rtap_ru_size);</div><div class='add'>+</div><div class='add'>+		mon_rx_user_status-&gt;ul_ofdma_ru_width = ru_width;</div><div class='add'>+		mon_rx_user_status-&gt;ofdma_info_valid = 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_mon_parse_rx_msdu_end_err(u32 info, u32 *errmap)</div><div class='add'>+{</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_FCS_ERR)</div><div class='add'>+		*errmap |= HAL_RX_MPDU_ERR_FCS;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_DECRYPT_ERR)</div><div class='add'>+		*errmap |= HAL_RX_MPDU_ERR_DECRYPT;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_TKIP_MIC_ERR)</div><div class='add'>+		*errmap |= HAL_RX_MPDU_ERR_TKIP_MIC;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_A_MSDU_ERROR)</div><div class='add'>+		*errmap |= HAL_RX_MPDU_ERR_AMSDU_ERR;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_OVERFLOW_ERR)</div><div class='add'>+		*errmap |= HAL_RX_MPDU_ERR_OVERFLOW;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_MSDU_LEN_ERR)</div><div class='add'>+		*errmap |= HAL_RX_MPDU_ERR_MSDU_LEN;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_MPDU_LEN_ERR)</div><div class='add'>+		*errmap |= HAL_RX_MPDU_ERR_MPDU_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_parse_cmn_usr_info(const struct hal_phyrx_common_user_info *cmn_usr_info,</div><div class='add'>+			  struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	struct hal_rx_radiotap_eht *eht = &amp;ppdu_info-&gt;eht_info.eht;</div><div class='add'>+	u32 known, data, cp_setting, ltf_size;</div><div class='add'>+</div><div class='add'>+	known = __le32_to_cpu(eht-&gt;known);</div><div class='add'>+	known |= IEEE80211_RADIOTAP_EHT_KNOWN_GI |</div><div class='add'>+		IEEE80211_RADIOTAP_EHT_KNOWN_EHT_LTF;</div><div class='add'>+	eht-&gt;known = cpu_to_le32(known);</div><div class='add'>+</div><div class='add'>+	cp_setting = le32_get_bits(cmn_usr_info-&gt;info0,</div><div class='add'>+				   HAL_RX_CMN_USR_INFO0_CP_SETTING);</div><div class='add'>+	ltf_size = le32_get_bits(cmn_usr_info-&gt;info0,</div><div class='add'>+				 HAL_RX_CMN_USR_INFO0_LTF_SIZE);</div><div class='add'>+</div><div class='add'>+	data = __le32_to_cpu(eht-&gt;data[0]);</div><div class='add'>+	data |= u32_encode_bits(cp_setting, IEEE80211_RADIOTAP_EHT_DATA0_GI);</div><div class='add'>+	data |= u32_encode_bits(ltf_size, IEEE80211_RADIOTAP_EHT_DATA0_LTF);</div><div class='add'>+	eht-&gt;data[0] = cpu_to_le32(data);</div><div class='add'>+</div><div class='add'>+	if (!ppdu_info-&gt;ltf_size)</div><div class='add'>+		ppdu_info-&gt;ltf_size = ltf_size;</div><div class='add'>+	if (!ppdu_info-&gt;gi)</div><div class='add'>+		ppdu_info-&gt;gi = cp_setting;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_parse_status_msdu_end(struct ath12k_mon_data *pmon,</div><div class='add'>+				    const struct hal_rx_msdu_end *msdu_end)</div><div class='add'>+{</div><div class='add'>+	ath12k_dp_mon_parse_rx_msdu_end_err(__le32_to_cpu(msdu_end-&gt;info2),</div><div class='add'>+					    &amp;pmon-&gt;err_bitmap);</div><div class='add'>+	pmon-&gt;decap_format = le32_get_bits(msdu_end-&gt;info1,</div><div class='add'>+					   RX_MSDU_END_INFO11_DECAP_FORMAT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum hal_rx_mon_status</div><div class='add'>+ath12k_dp_mon_rx_parse_status_tlv(struct ath12k *ar,</div><div class='add'>+				  struct ath12k_mon_data *pmon,</div><div class='add'>+				  const struct hal_tlv_64_hdr *tlv)</div><div class='add'>+{</div><div class='add'>+	struct hal_rx_mon_ppdu_info *ppdu_info = &amp;pmon-&gt;mon_ppdu_info;</div><div class='add'>+	const void *tlv_data = tlv-&gt;value;</div><div class='add'>+	u32 info[7], userid;</div><div class='add'>+	u16 tlv_tag, tlv_len;</div><div class='add'>+</div><div class='add'>+	tlv_tag = le64_get_bits(tlv-&gt;tl, HAL_TLV_64_HDR_TAG);</div><div class='add'>+	tlv_len = le64_get_bits(tlv-&gt;tl, HAL_TLV_64_HDR_LEN);</div><div class='add'>+	userid = le64_get_bits(tlv-&gt;tl, HAL_TLV_64_USR_ID);</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;tlv_aggr.in_progress &amp;&amp; ppdu_info-&gt;tlv_aggr.tlv_tag != tlv_tag) {</div><div class='add'>+		ath12k_dp_mon_parse_eht_sig_hdr(ppdu_info, ppdu_info-&gt;tlv_aggr.buf);</div><div class='add'>+</div><div class='add'>+		ppdu_info-&gt;tlv_aggr.in_progress = false;</div><div class='add'>+		ppdu_info-&gt;tlv_aggr.cur_len = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (tlv_tag) {</div><div class='add'>+	case HAL_RX_PPDU_START: {</div><div class='add'>+		const struct hal_rx_ppdu_start *ppdu_start = tlv_data;</div><div class='add'>+</div><div class='add'>+		u64 ppdu_ts = ath12k_le32hilo_to_u64(ppdu_start-&gt;ppdu_start_ts_63_32,</div><div class='add'>+						     ppdu_start-&gt;ppdu_start_ts_31_0);</div><div class='add'>+</div><div class='add'>+		info[0] = __le32_to_cpu(ppdu_start-&gt;info0);</div><div class='add'>+</div><div class='add'>+		ppdu_info-&gt;ppdu_id = u32_get_bits(info[0],</div><div class='add'>+						  HAL_RX_PPDU_START_INFO0_PPDU_ID);</div><div class='add'>+</div><div class='add'>+		info[1] = __le32_to_cpu(ppdu_start-&gt;info1);</div><div class='add'>+		ppdu_info-&gt;chan_num = u32_get_bits(info[1],</div><div class='add'>+						   HAL_RX_PPDU_START_INFO1_CHAN_NUM);</div><div class='add'>+		ppdu_info-&gt;freq = u32_get_bits(info[1],</div><div class='add'>+					       HAL_RX_PPDU_START_INFO1_CHAN_FREQ);</div><div class='add'>+		ppdu_info-&gt;ppdu_ts = ppdu_ts;</div><div class='add'>+</div><div class='add'>+		if (ppdu_info-&gt;ppdu_id != ppdu_info-&gt;last_ppdu_id) {</div><div class='add'>+			ppdu_info-&gt;last_ppdu_id = ppdu_info-&gt;ppdu_id;</div><div class='add'>+			ppdu_info-&gt;num_users = 0;</div><div class='add'>+			memset(&amp;ppdu_info-&gt;mpdu_fcs_ok_bitmap, 0,</div><div class='add'>+			       HAL_RX_NUM_WORDS_PER_PPDU_BITMAP *</div><div class='add'>+			       sizeof(ppdu_info-&gt;mpdu_fcs_ok_bitmap[0]));</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case HAL_RX_PPDU_END_USER_STATS: {</div><div class='add'>+		const struct hal_rx_ppdu_end_user_stats *eu_stats = tlv_data;</div><div class='add'>+		u32 tid_bitmap;</div><div class='add'>+</div><div class='add'>+		info[0] = __le32_to_cpu(eu_stats-&gt;info0);</div><div class='add'>+		info[1] = __le32_to_cpu(eu_stats-&gt;info1);</div><div class='add'>+		info[2] = __le32_to_cpu(eu_stats-&gt;info2);</div><div class='add'>+		info[4] = __le32_to_cpu(eu_stats-&gt;info4);</div><div class='add'>+		info[5] = __le32_to_cpu(eu_stats-&gt;info5);</div><div class='add'>+		info[6] = __le32_to_cpu(eu_stats-&gt;info6);</div><div class='add'>+</div><div class='add'>+		ppdu_info-&gt;ast_index =</div><div class='add'>+			u32_get_bits(info[2], HAL_RX_PPDU_END_USER_STATS_INFO2_AST_INDEX);</div><div class='add'>+		ppdu_info-&gt;fc_valid =</div><div class='add'>+			u32_get_bits(info[1], HAL_RX_PPDU_END_USER_STATS_INFO1_FC_VALID);</div><div class='add'>+		tid_bitmap = u32_get_bits(info[6],</div><div class='add'>+					  HAL_RX_PPDU_END_USER_STATS_INFO6_TID_BITMAP);</div><div class='add'>+		ppdu_info-&gt;tid = ffs(tid_bitmap) - 1;</div><div class='add'>+		ppdu_info-&gt;tcp_msdu_count =</div><div class='add'>+			u32_get_bits(info[4],</div><div class='add'>+				     HAL_RX_PPDU_END_USER_STATS_INFO4_TCP_MSDU_CNT);</div><div class='add'>+		ppdu_info-&gt;udp_msdu_count =</div><div class='add'>+			u32_get_bits(info[4],</div><div class='add'>+				     HAL_RX_PPDU_END_USER_STATS_INFO4_UDP_MSDU_CNT);</div><div class='add'>+		ppdu_info-&gt;other_msdu_count =</div><div class='add'>+			u32_get_bits(info[5],</div><div class='add'>+				     HAL_RX_PPDU_END_USER_STATS_INFO5_OTHER_MSDU_CNT);</div><div class='add'>+		ppdu_info-&gt;tcp_ack_msdu_count =</div><div class='add'>+			u32_get_bits(info[5],</div><div class='add'>+				     HAL_RX_PPDU_END_USER_STATS_INFO5_TCP_ACK_MSDU_CNT);</div><div class='add'>+		ppdu_info-&gt;preamble_type =</div><div class='add'>+			u32_get_bits(info[1],</div><div class='add'>+				     HAL_RX_PPDU_END_USER_STATS_INFO1_PKT_TYPE);</div><div class='add'>+		ppdu_info-&gt;num_mpdu_fcs_ok =</div><div class='add'>+			u32_get_bits(info[1],</div><div class='add'>+				     HAL_RX_PPDU_END_USER_STATS_INFO1_MPDU_CNT_FCS_OK);</div><div class='add'>+		ppdu_info-&gt;num_mpdu_fcs_err =</div><div class='add'>+			u32_get_bits(info[0],</div><div class='add'>+				     HAL_RX_PPDU_END_USER_STATS_INFO0_MPDU_CNT_FCS_ERR);</div><div class='add'>+		ppdu_info-&gt;peer_id =</div><div class='add'>+			u32_get_bits(info[0], HAL_RX_PPDU_END_USER_STATS_INFO0_PEER_ID);</div><div class='add'>+</div><div class='add'>+		switch (ppdu_info-&gt;preamble_type) {</div><div class='add'>+		case HAL_RX_PREAMBLE_11N:</div><div class='add'>+			ppdu_info-&gt;ht_flags = 1;</div><div class='add'>+			break;</div><div class='add'>+		case HAL_RX_PREAMBLE_11AC:</div><div class='add'>+			ppdu_info-&gt;vht_flags = 1;</div><div class='add'>+			break;</div><div class='add'>+		case HAL_RX_PREAMBLE_11AX:</div><div class='add'>+			ppdu_info-&gt;he_flags = 1;</div><div class='add'>+			break;</div><div class='add'>+		case HAL_RX_PREAMBLE_11BE:</div><div class='add'>+			ppdu_info-&gt;is_eht = true;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (userid &lt; HAL_MAX_UL_MU_USERS) {</div><div class='add'>+			struct hal_rx_user_status *rxuser_stats =</div><div class='add'>+				&amp;ppdu_info-&gt;userstats[userid];</div><div class='add'>+</div><div class='add'>+			if (ppdu_info-&gt;num_mpdu_fcs_ok &gt; 1 ||</div><div class='add'>+			    ppdu_info-&gt;num_mpdu_fcs_err &gt; 1)</div><div class='add'>+				ppdu_info-&gt;userstats[userid].ampdu_present = true;</div><div class='add'>+</div><div class='add'>+			ppdu_info-&gt;num_users += 1;</div><div class='add'>+</div><div class='add'>+			ath12k_dp_mon_rx_handle_ofdma_info(eu_stats, rxuser_stats);</div><div class='add'>+			ath12k_dp_mon_rx_populate_mu_user_info(eu_stats, ppdu_info,</div><div class='add'>+							       rxuser_stats);</div><div class='add'>+		}</div><div class='add'>+		ppdu_info-&gt;mpdu_fcs_ok_bitmap[0] = __le32_to_cpu(eu_stats-&gt;rsvd1[0]);</div><div class='add'>+		ppdu_info-&gt;mpdu_fcs_ok_bitmap[1] = __le32_to_cpu(eu_stats-&gt;rsvd1[1]);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case HAL_RX_PPDU_END_USER_STATS_EXT: {</div><div class='add'>+		const struct hal_rx_ppdu_end_user_stats_ext *eu_stats = tlv_data;</div><div class='add'>+</div><div class='add'>+		ppdu_info-&gt;mpdu_fcs_ok_bitmap[2] = __le32_to_cpu(eu_stats-&gt;info1);</div><div class='add'>+		ppdu_info-&gt;mpdu_fcs_ok_bitmap[3] = __le32_to_cpu(eu_stats-&gt;info2);</div><div class='add'>+		ppdu_info-&gt;mpdu_fcs_ok_bitmap[4] = __le32_to_cpu(eu_stats-&gt;info3);</div><div class='add'>+		ppdu_info-&gt;mpdu_fcs_ok_bitmap[5] = __le32_to_cpu(eu_stats-&gt;info4);</div><div class='add'>+		ppdu_info-&gt;mpdu_fcs_ok_bitmap[6] = __le32_to_cpu(eu_stats-&gt;info5);</div><div class='add'>+		ppdu_info-&gt;mpdu_fcs_ok_bitmap[7] = __le32_to_cpu(eu_stats-&gt;info6);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case HAL_PHYRX_HT_SIG:</div><div class='add'>+		ath12k_dp_mon_parse_ht_sig(tlv_data, ppdu_info);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HAL_PHYRX_L_SIG_B:</div><div class='add'>+		ath12k_dp_mon_parse_l_sig_b(tlv_data, ppdu_info);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HAL_PHYRX_L_SIG_A:</div><div class='add'>+		ath12k_dp_mon_parse_l_sig_a(tlv_data, ppdu_info);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HAL_PHYRX_VHT_SIG_A:</div><div class='add'>+		ath12k_dp_mon_parse_vht_sig_a(tlv_data, ppdu_info);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HAL_PHYRX_HE_SIG_A_SU:</div><div class='add'>+		ath12k_dp_mon_parse_he_sig_su(tlv_data, ppdu_info);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HAL_PHYRX_HE_SIG_A_MU_DL:</div><div class='add'>+		ath12k_dp_mon_parse_he_sig_mu(tlv_data, ppdu_info);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HAL_PHYRX_HE_SIG_B1_MU:</div><div class='add'>+		ath12k_dp_mon_parse_he_sig_b1_mu(tlv_data, ppdu_info);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HAL_PHYRX_HE_SIG_B2_MU:</div><div class='add'>+		ath12k_dp_mon_parse_he_sig_b2_mu(tlv_data, ppdu_info);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HAL_PHYRX_HE_SIG_B2_OFDMA:</div><div class='add'>+		ath12k_dp_mon_parse_he_sig_b2_ofdma(tlv_data, ppdu_info);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HAL_PHYRX_RSSI_LEGACY: {</div><div class='add'>+		const struct hal_rx_phyrx_rssi_legacy_info *rssi = tlv_data;</div><div class='add'>+</div><div class='add'>+		info[0] = __le32_to_cpu(rssi-&gt;info0);</div><div class='add'>+		info[2] = __le32_to_cpu(rssi-&gt;info2);</div><div class='add'>+</div><div class='add'>+		/* TODO: Please note that the combined rssi will not be accurate</div><div class='add'>+		 * in MU case. Rssi in MU needs to be retrieved from</div><div class='add'>+		 * PHYRX_OTHER_RECEIVE_INFO TLV.</div><div class='add'>+		 */</div><div class='add'>+		ppdu_info-&gt;rssi_comb =</div><div class='add'>+			u32_get_bits(info[2],</div><div class='add'>+				     HAL_RX_RSSI_LEGACY_INFO_INFO2_RSSI_COMB_PPDU);</div><div class='add'>+</div><div class='add'>+		ppdu_info-&gt;bw = u32_get_bits(info[0],</div><div class='add'>+					     HAL_RX_RSSI_LEGACY_INFO_INFO0_RX_BW);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case HAL_PHYRX_COMMON_USER_INFO: {</div><div class='add'>+		ath12k_parse_cmn_usr_info(tlv_data, ppdu_info);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case HAL_RX_PPDU_START_USER_INFO:</div><div class='add'>+		ath12k_dp_mon_hal_rx_parse_user_info(tlv_data, userid, ppdu_info);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HAL_RXPCU_PPDU_END_INFO: {</div><div class='add'>+		const struct hal_rx_ppdu_end_duration *ppdu_rx_duration = tlv_data;</div><div class='add'>+</div><div class='add'>+		info[0] = __le32_to_cpu(ppdu_rx_duration-&gt;info0);</div><div class='add'>+		ppdu_info-&gt;rx_duration =</div><div class='add'>+			u32_get_bits(info[0], HAL_RX_PPDU_END_DURATION);</div><div class='add'>+		ppdu_info-&gt;tsft = __le32_to_cpu(ppdu_rx_duration-&gt;rsvd0[1]);</div><div class='add'>+		ppdu_info-&gt;tsft = (ppdu_info-&gt;tsft &lt;&lt; 32) |</div><div class='add'>+				   __le32_to_cpu(ppdu_rx_duration-&gt;rsvd0[0]);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case HAL_RX_MPDU_START: {</div><div class='add'>+		const struct hal_rx_mpdu_start *mpdu_start = tlv_data;</div><div class='add'>+		u16 peer_id;</div><div class='add'>+</div><div class='add'>+		info[1] = __le32_to_cpu(mpdu_start-&gt;info1);</div><div class='add'>+		peer_id = u32_get_bits(info[1], HAL_RX_MPDU_START_INFO1_PEERID);</div><div class='add'>+		if (peer_id)</div><div class='add'>+			ppdu_info-&gt;peer_id = peer_id;</div><div class='add'>+</div><div class='add'>+		ppdu_info-&gt;mpdu_len += u32_get_bits(info[1],</div><div class='add'>+						    HAL_RX_MPDU_START_INFO2_MPDU_LEN);</div><div class='add'>+		if (userid &lt; HAL_MAX_UL_MU_USERS) {</div><div class='add'>+			info[0] = __le32_to_cpu(mpdu_start-&gt;info0);</div><div class='add'>+			ppdu_info-&gt;userid = userid;</div><div class='add'>+			ppdu_info-&gt;userstats[userid].ampdu_id =</div><div class='add'>+				u32_get_bits(info[0], HAL_RX_MPDU_START_INFO0_PPDU_ID);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return HAL_RX_MON_STATUS_MPDU_START;</div><div class='add'>+	}</div><div class='add'>+	case HAL_RX_MSDU_START:</div><div class='add'>+		/* TODO: add msdu start parsing logic */</div><div class='add'>+		break;</div><div class='add'>+	case HAL_MON_BUF_ADDR:</div><div class='add'>+		return HAL_RX_MON_STATUS_BUF_ADDR;</div><div class='add'>+	case HAL_RX_MSDU_END:</div><div class='add'>+		ath12k_dp_mon_parse_status_msdu_end(pmon, tlv_data);</div><div class='add'>+		return HAL_RX_MON_STATUS_MSDU_END;</div><div class='add'>+	case HAL_RX_MPDU_END:</div><div class='add'>+		return HAL_RX_MON_STATUS_MPDU_END;</div><div class='add'>+	case HAL_PHYRX_GENERIC_U_SIG:</div><div class='add'>+		ath12k_dp_mon_hal_rx_parse_u_sig_hdr(tlv_data, ppdu_info);</div><div class='add'>+		break;</div><div class='add'>+	case HAL_PHYRX_GENERIC_EHT_SIG:</div><div class='add'>+		/* Handle the case where aggregation is in progress</div><div class='add'>+		 * or the current TLV is one of the TLVs which should be</div><div class='add'>+		 * aggregated</div><div class='add'>+		 */</div><div class='add'>+		if (!ppdu_info-&gt;tlv_aggr.in_progress) {</div><div class='add'>+			ppdu_info-&gt;tlv_aggr.in_progress = true;</div><div class='add'>+			ppdu_info-&gt;tlv_aggr.tlv_tag = tlv_tag;</div><div class='add'>+			ppdu_info-&gt;tlv_aggr.cur_len = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ppdu_info-&gt;is_eht = true;</div><div class='add'>+</div><div class='add'>+		ath12k_dp_mon_hal_aggr_tlv(ppdu_info, tlv_len, tlv_data);</div><div class='add'>+		break;</div><div class='add'>+	case HAL_DUMMY:</div><div class='add'>+		return HAL_RX_MON_STATUS_BUF_DONE;</div><div class='add'>+	case HAL_RX_PPDU_END_STATUS_DONE:</div><div class='add'>+	case 0:</div><div class='add'>+		return HAL_RX_MON_STATUS_PPDU_DONE;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return HAL_RX_MON_STATUS_PPDU_NOT_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_fill_rx_stats_info(struct ath12k *ar,</div><div class='add'>+				 struct hal_rx_mon_ppdu_info *ppdu_info,</div><div class='add'>+				 struct ieee80211_rx_status *rx_status)</div><div class='add'>+{</div><div class='add'>+	u32 center_freq = ppdu_info-&gt;freq;</div><div class='add'>+</div><div class='add'>+	rx_status-&gt;freq = center_freq;</div><div class='add'>+	rx_status-&gt;bw = ath12k_mac_bw_to_mac80211_bw(ppdu_info-&gt;bw);</div><div class='add'>+	rx_status-&gt;nss = ppdu_info-&gt;nss;</div><div class='add'>+	rx_status-&gt;rate_idx = 0;</div><div class='add'>+	rx_status-&gt;encoding = RX_ENC_LEGACY;</div><div class='add'>+	rx_status-&gt;flag |= RX_FLAG_NO_SIGNAL_VAL;</div><div class='add'>+</div><div class='add'>+	if (center_freq &gt;= ATH12K_MIN_6GHZ_FREQ &amp;&amp;</div><div class='add'>+	    center_freq &lt;= ATH12K_MAX_6GHZ_FREQ) {</div><div class='add'>+		rx_status-&gt;band = NL80211_BAND_6GHZ;</div><div class='add'>+	} else if (center_freq &gt;= ATH12K_MIN_2GHZ_FREQ &amp;&amp;</div><div class='add'>+		   center_freq &lt;= ATH12K_MAX_2GHZ_FREQ) {</div><div class='add'>+		rx_status-&gt;band = NL80211_BAND_2GHZ;</div><div class='add'>+	} else if (center_freq &gt;= ATH12K_MIN_5GHZ_FREQ &amp;&amp;</div><div class='add'>+		   center_freq &lt;= ATH12K_MAX_5GHZ_FREQ) {</div><div class='add'>+		rx_status-&gt;band = NL80211_BAND_5GHZ;</div><div class='add'>+	} else {</div><div class='add'>+		rx_status-&gt;band = NUM_NL80211_BANDS;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff</div><div class='add'>+*ath12k_dp_rx_alloc_mon_status_buf(struct ath12k_base *ab,</div><div class='add'>+				   struct dp_rxdma_mon_ring *rx_ring,</div><div class='add'>+				   int *buf_id)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(RX_MON_STATUS_BUF_SIZE);</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		goto fail_alloc_skb;</div><div class='add'>+</div><div class='add'>+	if (!IS_ALIGNED((unsigned long)skb-&gt;data,</div><div class='add'>+			RX_MON_STATUS_BUF_ALIGN)) {</div><div class='add'>+		skb_pull(skb, PTR_ALIGN(skb-&gt;data, RX_MON_STATUS_BUF_ALIGN) -</div><div class='add'>+			 skb-&gt;data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	paddr = dma_map_single(ab-&gt;dev, skb-&gt;data,</div><div class='add'>+			       skb-&gt;len + skb_tailroom(skb),</div><div class='add'>+			       DMA_FROM_DEVICE);</div><div class='add'>+	if (unlikely(dma_mapping_error(ab-&gt;dev, paddr)))</div><div class='add'>+		goto fail_free_skb;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+	*buf_id = idr_alloc(&amp;rx_ring-&gt;bufs_idr, skb, 0,</div><div class='add'>+			    rx_ring-&gt;bufs_max, GFP_ATOMIC);</div><div class='add'>+	spin_unlock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+	if (*buf_id &lt; 0)</div><div class='add'>+		goto fail_dma_unmap;</div><div class='add'>+</div><div class='add'>+	ATH12K_SKB_RXCB(skb)-&gt;paddr = paddr;</div><div class='add'>+	return skb;</div><div class='add'>+</div><div class='add'>+fail_dma_unmap:</div><div class='add'>+	dma_unmap_single(ab-&gt;dev, paddr, skb-&gt;len + skb_tailroom(skb),</div><div class='add'>+			 DMA_FROM_DEVICE);</div><div class='add'>+fail_free_skb:</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+fail_alloc_skb:</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum dp_mon_status_buf_state</div><div class='add'>+ath12k_dp_rx_mon_buf_done(struct ath12k_base *ab, struct hal_srng *srng,</div><div class='add'>+			  struct dp_rxdma_mon_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb;</div><div class='add'>+	struct hal_tlv_64_hdr *tlv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	void *status_desc;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	u32 cookie;</div><div class='add'>+	int buf_id;</div><div class='add'>+	u8 rbm;</div><div class='add'>+</div><div class='add'>+	status_desc = ath12k_hal_srng_src_next_peek(ab, srng);</div><div class='add'>+	if (!status_desc)</div><div class='add'>+		return DP_MON_STATUS_NO_DMA;</div><div class='add'>+</div><div class='add'>+	ath12k_hal_rx_buf_addr_info_get(status_desc, &amp;paddr, &amp;cookie, &amp;rbm);</div><div class='add'>+</div><div class='add'>+	buf_id = u32_get_bits(cookie, DP_RXDMA_BUF_COOKIE_BUF_ID);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+	skb = idr_find(&amp;rx_ring-&gt;bufs_idr, buf_id);</div><div class='add'>+	spin_unlock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		return DP_MON_STATUS_NO_DMA;</div><div class='add'>+</div><div class='add'>+	rxcb = ATH12K_SKB_RXCB(skb);</div><div class='add'>+	dma_sync_single_for_cpu(ab-&gt;dev, rxcb-&gt;paddr,</div><div class='add'>+				skb-&gt;len + skb_tailroom(skb),</div><div class='add'>+				DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+	tlv = (struct hal_tlv_64_hdr *)skb-&gt;data;</div><div class='add'>+	if (le64_get_bits(tlv-&gt;tl, HAL_TLV_HDR_TAG) != HAL_RX_STATUS_BUFFER_DONE)</div><div class='add'>+		return DP_MON_STATUS_NO_DMA;</div><div class='add'>+</div><div class='add'>+	return DP_MON_STATUS_REPLINISH;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_dp_mon_comp_ppduid(u32 msdu_ppdu_id, u32 *ppdu_id)</div><div class='add'>+{</div><div class='add'>+	u32 ret = 0;</div><div class='add'>+</div><div class='add'>+	if ((*ppdu_id &lt; msdu_ppdu_id) &amp;&amp;</div><div class='add'>+	    ((msdu_ppdu_id - *ppdu_id) &lt; DP_NOT_PPDU_ID_WRAP_AROUND)) {</div><div class='add'>+		/* Hold on mon dest ring, and reap mon status ring. */</div><div class='add'>+		*ppdu_id = msdu_ppdu_id;</div><div class='add'>+		ret = msdu_ppdu_id;</div><div class='add'>+	} else if ((*ppdu_id &gt; msdu_ppdu_id) &amp;&amp;</div><div class='add'>+		((*ppdu_id - msdu_ppdu_id) &gt; DP_NOT_PPDU_ID_WRAP_AROUND)) {</div><div class='add'>+		/* PPDU ID has exceeded the maximum value and will</div><div class='add'>+		 * restart from 0.</div><div class='add'>+		 */</div><div class='add'>+		*ppdu_id = msdu_ppdu_id;</div><div class='add'>+		ret = msdu_ppdu_id;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void ath12k_dp_mon_next_link_desc_get(struct hal_rx_msdu_link *msdu_link,</div><div class='add'>+				      dma_addr_t *paddr, u32 *sw_cookie, u8 *rbm,</div><div class='add'>+				      struct ath12k_buffer_addr **pp_buf_addr_info)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_buffer_addr *buf_addr_info;</div><div class='add'>+</div><div class='add'>+	buf_addr_info = &amp;msdu_link-&gt;buf_addr_info;</div><div class='add'>+</div><div class='add'>+	ath12k_hal_rx_buf_addr_info_get(buf_addr_info, paddr, sw_cookie, rbm);</div><div class='add'>+</div><div class='add'>+	*pp_buf_addr_info = buf_addr_info;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_fill_rx_rate(struct ath12k *ar,</div><div class='add'>+			   struct hal_rx_mon_ppdu_info *ppdu_info,</div><div class='add'>+			   struct ieee80211_rx_status *rx_status)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	enum rx_msdu_start_pkt_type pkt_type;</div><div class='add'>+	u8 rate_mcs, nss, sgi;</div><div class='add'>+	bool is_cck;</div><div class='add'>+</div><div class='add'>+	pkt_type = ppdu_info-&gt;preamble_type;</div><div class='add'>+	rate_mcs = ppdu_info-&gt;rate;</div><div class='add'>+	nss = ppdu_info-&gt;nss;</div><div class='add'>+	sgi = ppdu_info-&gt;gi;</div><div class='add'>+</div><div class='add'>+	switch (pkt_type) {</div><div class='add'>+	case RX_MSDU_START_PKT_TYPE_11A:</div><div class='add'>+	case RX_MSDU_START_PKT_TYPE_11B:</div><div class='add'>+		is_cck = (pkt_type == RX_MSDU_START_PKT_TYPE_11B);</div><div class='add'>+		if (rx_status-&gt;band &lt; NUM_NL80211_BANDS) {</div><div class='add'>+			sband = &amp;ar-&gt;mac.sbands[rx_status-&gt;band];</div><div class='add'>+			rx_status-&gt;rate_idx = ath12k_mac_hw_rate_to_idx(sband, rate_mcs,</div><div class='add'>+									is_cck);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case RX_MSDU_START_PKT_TYPE_11N:</div><div class='add'>+		rx_status-&gt;encoding = RX_ENC_HT;</div><div class='add'>+		if (rate_mcs &gt; ATH12K_HT_MCS_MAX) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "Received with invalid mcs in HT mode %d\n",</div><div class='add'>+				     rate_mcs);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		rx_status-&gt;rate_idx = rate_mcs + (8 * (nss - 1));</div><div class='add'>+		if (sgi)</div><div class='add'>+			rx_status-&gt;enc_flags |= RX_ENC_FLAG_SHORT_GI;</div><div class='add'>+		break;</div><div class='add'>+	case RX_MSDU_START_PKT_TYPE_11AC:</div><div class='add'>+		rx_status-&gt;encoding = RX_ENC_VHT;</div><div class='add'>+		rx_status-&gt;rate_idx = rate_mcs;</div><div class='add'>+		if (rate_mcs &gt; ATH12K_VHT_MCS_MAX) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "Received with invalid mcs in VHT mode %d\n",</div><div class='add'>+				     rate_mcs);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (sgi)</div><div class='add'>+			rx_status-&gt;enc_flags |= RX_ENC_FLAG_SHORT_GI;</div><div class='add'>+		break;</div><div class='add'>+	case RX_MSDU_START_PKT_TYPE_11AX:</div><div class='add'>+		rx_status-&gt;rate_idx = rate_mcs;</div><div class='add'>+		if (rate_mcs &gt; ATH12K_HE_MCS_MAX) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "Received with invalid mcs in HE mode %d\n",</div><div class='add'>+				    rate_mcs);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		rx_status-&gt;encoding = RX_ENC_HE;</div><div class='add'>+		rx_status-&gt;he_gi = ath12k_he_gi_to_nl80211_he_gi(sgi);</div><div class='add'>+		break;</div><div class='add'>+	case RX_MSDU_START_PKT_TYPE_11BE:</div><div class='add'>+		rx_status-&gt;rate_idx = rate_mcs;</div><div class='add'>+		if (rate_mcs &gt; ATH12K_EHT_MCS_MAX) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "Received with invalid mcs in EHT mode %d\n",</div><div class='add'>+				    rate_mcs);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		rx_status-&gt;encoding = RX_ENC_EHT;</div><div class='add'>+		rx_status-&gt;he_gi = ath12k_he_gi_to_nl80211_he_gi(sgi);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_DATA,</div><div class='add'>+			   "monitor receives invalid preamble type %d",</div><div class='add'>+			    pkt_type);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_mon_rx_msdus_set_payload(struct ath12k *ar,</div><div class='add'>+					       struct sk_buff *head_msdu,</div><div class='add'>+					       struct sk_buff *tail_msdu)</div><div class='add'>+{</div><div class='add'>+	u32 rx_pkt_offset, l2_hdr_offset, total_offset;</div><div class='add'>+</div><div class='add'>+	rx_pkt_offset = ar-&gt;ab-&gt;hal.hal_desc_sz;</div><div class='add'>+	l2_hdr_offset =</div><div class='add'>+		ath12k_dp_rx_h_l3pad(ar-&gt;ab, (struct hal_rx_desc *)tail_msdu-&gt;data);</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;ab-&gt;hw_params-&gt;rxdma1_enable)</div><div class='add'>+		total_offset = ATH12K_MON_RX_PKT_OFFSET;</div><div class='add'>+	else</div><div class='add'>+		total_offset = rx_pkt_offset + l2_hdr_offset;</div><div class='add'>+</div><div class='add'>+	skb_pull(head_msdu, total_offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *</div><div class='add'>+ath12k_dp_mon_rx_merg_msdus(struct ath12k *ar,</div><div class='add'>+			    struct dp_mon_mpdu *mon_mpdu,</div><div class='add'>+			    struct hal_rx_mon_ppdu_info *ppdu_info,</div><div class='add'>+			    struct ieee80211_rx_status *rxs)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct sk_buff *msdu, *mpdu_buf, *prev_buf, *head_frag_list;</div><div class='add'>+	struct sk_buff *head_msdu, *tail_msdu;</div><div class='add'>+	struct hal_rx_desc *rx_desc;</div><div class='add'>+	u8 *hdr_desc, *dest, decap_format = mon_mpdu-&gt;decap_format;</div><div class='add'>+	struct ieee80211_hdr_3addr *wh;</div><div class='add'>+	struct ieee80211_channel *channel;</div><div class='add'>+	u32 frag_list_sum_len = 0;</div><div class='add'>+	u8 channel_num = ppdu_info-&gt;chan_num;</div><div class='add'>+</div><div class='add'>+	mpdu_buf = NULL;</div><div class='add'>+	head_msdu = mon_mpdu-&gt;head;</div><div class='add'>+	tail_msdu = mon_mpdu-&gt;tail;</div><div class='add'>+</div><div class='add'>+	if (!head_msdu || !tail_msdu)</div><div class='add'>+		goto err_merge_fail;</div><div class='add'>+</div><div class='add'>+	ath12k_dp_mon_fill_rx_stats_info(ar, ppdu_info, rxs);</div><div class='add'>+</div><div class='add'>+	if (unlikely(rxs-&gt;band == NUM_NL80211_BANDS ||</div><div class='add'>+		     !ath12k_ar_to_hw(ar)-&gt;wiphy-&gt;bands[rxs-&gt;band])) {</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_DATA,</div><div class='add'>+			   "sband is NULL for status band %d channel_num %d center_freq %d pdev_id %d\n",</div><div class='add'>+			   rxs-&gt;band, channel_num, ppdu_info-&gt;freq, ar-&gt;pdev_idx);</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		channel = ar-&gt;rx_channel;</div><div class='add'>+		if (channel) {</div><div class='add'>+			rxs-&gt;band = channel-&gt;band;</div><div class='add'>+			channel_num =</div><div class='add'>+				ieee80211_frequency_to_channel(channel-&gt;center_freq);</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rxs-&gt;band &lt; NUM_NL80211_BANDS)</div><div class='add'>+		rxs-&gt;freq = ieee80211_channel_to_frequency(channel_num,</div><div class='add'>+							   rxs-&gt;band);</div><div class='add'>+</div><div class='add'>+	ath12k_dp_mon_fill_rx_rate(ar, ppdu_info, rxs);</div><div class='add'>+</div><div class='add'>+	if (decap_format == DP_RX_DECAP_TYPE_RAW) {</div><div class='add'>+		ath12k_dp_mon_rx_msdus_set_payload(ar, head_msdu, tail_msdu);</div><div class='add'>+</div><div class='add'>+		prev_buf = head_msdu;</div><div class='add'>+		msdu = head_msdu-&gt;next;</div><div class='add'>+		head_frag_list = NULL;</div><div class='add'>+</div><div class='add'>+		while (msdu) {</div><div class='add'>+			ath12k_dp_mon_rx_msdus_set_payload(ar, head_msdu, tail_msdu);</div><div class='add'>+</div><div class='add'>+			if (!head_frag_list)</div><div class='add'>+				head_frag_list = msdu;</div><div class='add'>+</div><div class='add'>+			frag_list_sum_len += msdu-&gt;len;</div><div class='add'>+			prev_buf = msdu;</div><div class='add'>+			msdu = msdu-&gt;next;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		prev_buf-&gt;next = NULL;</div><div class='add'>+</div><div class='add'>+		skb_trim(prev_buf, prev_buf-&gt;len);</div><div class='add'>+		if (head_frag_list) {</div><div class='add'>+			skb_shinfo(head_msdu)-&gt;frag_list = head_frag_list;</div><div class='add'>+			head_msdu-&gt;data_len = frag_list_sum_len;</div><div class='add'>+			head_msdu-&gt;len += head_msdu-&gt;data_len;</div><div class='add'>+			head_msdu-&gt;next = NULL;</div><div class='add'>+		}</div><div class='add'>+	} else if (decap_format == DP_RX_DECAP_TYPE_NATIVE_WIFI) {</div><div class='add'>+		u8 qos_pkt = 0;</div><div class='add'>+</div><div class='add'>+		rx_desc = (struct hal_rx_desc *)head_msdu-&gt;data;</div><div class='add'>+		hdr_desc =</div><div class='add'>+			ab-&gt;hal_rx_ops-&gt;rx_desc_get_msdu_payload(rx_desc);</div><div class='add'>+</div><div class='add'>+		/* Base size */</div><div class='add'>+		wh = (struct ieee80211_hdr_3addr *)hdr_desc;</div><div class='add'>+</div><div class='add'>+		if (ieee80211_is_data_qos(wh-&gt;frame_control))</div><div class='add'>+			qos_pkt = 1;</div><div class='add'>+</div><div class='add'>+		msdu = head_msdu;</div><div class='add'>+</div><div class='add'>+		while (msdu) {</div><div class='add'>+			ath12k_dp_mon_rx_msdus_set_payload(ar, head_msdu, tail_msdu);</div><div class='add'>+			if (qos_pkt) {</div><div class='add'>+				dest = skb_push(msdu, sizeof(__le16));</div><div class='add'>+				if (!dest)</div><div class='add'>+					goto err_merge_fail;</div><div class='add'>+				memcpy(dest, hdr_desc, sizeof(struct ieee80211_qos_hdr));</div><div class='add'>+			}</div><div class='add'>+			prev_buf = msdu;</div><div class='add'>+			msdu = msdu-&gt;next;</div><div class='add'>+		}</div><div class='add'>+		dest = skb_put(prev_buf, HAL_RX_FCS_LEN);</div><div class='add'>+		if (!dest)</div><div class='add'>+			goto err_merge_fail;</div><div class='add'>+</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_DATA,</div><div class='add'>+			   "mpdu_buf %p mpdu_buf-&gt;len %u",</div><div class='add'>+			   prev_buf, prev_buf-&gt;len);</div><div class='add'>+	} else {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_DATA,</div><div class='add'>+			   "decap format %d is not supported!\n",</div><div class='add'>+			   decap_format);</div><div class='add'>+		goto err_merge_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return head_msdu;</div><div class='add'>+</div><div class='add'>+err_merge_fail:</div><div class='add'>+	if (mpdu_buf &amp;&amp; decap_format != DP_RX_DECAP_TYPE_RAW) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_DATA,</div><div class='add'>+			   "err_merge_fail mpdu_buf %p", mpdu_buf);</div><div class='add'>+		/* Free the head buffer */</div><div class='add'>+		dev_kfree_skb_any(mpdu_buf);</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_rx_update_radiotap_he(struct hal_rx_mon_ppdu_info *rx_status,</div><div class='add'>+				    u8 *rtap_buf)</div><div class='add'>+{</div><div class='add'>+	u32 rtap_len = 0;</div><div class='add'>+</div><div class='add'>+	put_unaligned_le16(rx_status-&gt;he_data1, &amp;rtap_buf[rtap_len]);</div><div class='add'>+	rtap_len += 2;</div><div class='add'>+</div><div class='add'>+	put_unaligned_le16(rx_status-&gt;he_data2, &amp;rtap_buf[rtap_len]);</div><div class='add'>+	rtap_len += 2;</div><div class='add'>+</div><div class='add'>+	put_unaligned_le16(rx_status-&gt;he_data3, &amp;rtap_buf[rtap_len]);</div><div class='add'>+	rtap_len += 2;</div><div class='add'>+</div><div class='add'>+	put_unaligned_le16(rx_status-&gt;he_data4, &amp;rtap_buf[rtap_len]);</div><div class='add'>+	rtap_len += 2;</div><div class='add'>+</div><div class='add'>+	put_unaligned_le16(rx_status-&gt;he_data5, &amp;rtap_buf[rtap_len]);</div><div class='add'>+	rtap_len += 2;</div><div class='add'>+</div><div class='add'>+	put_unaligned_le16(rx_status-&gt;he_data6, &amp;rtap_buf[rtap_len]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_rx_update_radiotap_he_mu(struct hal_rx_mon_ppdu_info *rx_status,</div><div class='add'>+				       u8 *rtap_buf)</div><div class='add'>+{</div><div class='add'>+	u32 rtap_len = 0;</div><div class='add'>+</div><div class='add'>+	put_unaligned_le16(rx_status-&gt;he_flags1, &amp;rtap_buf[rtap_len]);</div><div class='add'>+	rtap_len += 2;</div><div class='add'>+</div><div class='add'>+	put_unaligned_le16(rx_status-&gt;he_flags2, &amp;rtap_buf[rtap_len]);</div><div class='add'>+	rtap_len += 2;</div><div class='add'>+</div><div class='add'>+	rtap_buf[rtap_len] = rx_status-&gt;he_RU[0];</div><div class='add'>+	rtap_len += 1;</div><div class='add'>+</div><div class='add'>+	rtap_buf[rtap_len] = rx_status-&gt;he_RU[1];</div><div class='add'>+	rtap_len += 1;</div><div class='add'>+</div><div class='add'>+	rtap_buf[rtap_len] = rx_status-&gt;he_RU[2];</div><div class='add'>+	rtap_len += 1;</div><div class='add'>+</div><div class='add'>+	rtap_buf[rtap_len] = rx_status-&gt;he_RU[3];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_mon_update_radiotap(struct ath12k *ar,</div><div class='add'>+					  struct hal_rx_mon_ppdu_info *ppduinfo,</div><div class='add'>+					  struct sk_buff *mon_skb,</div><div class='add'>+					  struct ieee80211_rx_status *rxs)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	s32 noise_floor;</div><div class='add'>+	u8 *ptr = NULL;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	noise_floor = ath12k_pdev_get_noise_floor(ar);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	rxs-&gt;flag |= RX_FLAG_MACTIME_START;</div><div class='add'>+	rxs-&gt;nss = ppduinfo-&gt;nss;</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_HW_DB2DBM_CONVERSION_SUPPORT,</div><div class='add'>+		     ar-&gt;ab-&gt;wmi_ab.svc_map))</div><div class='add'>+		rxs-&gt;signal = ppduinfo-&gt;rssi_comb;</div><div class='add'>+	else</div><div class='add'>+		rxs-&gt;signal = ppduinfo-&gt;rssi_comb + noise_floor;</div><div class='add'>+</div><div class='add'>+	if (ppduinfo-&gt;userstats[ppduinfo-&gt;userid].ampdu_present) {</div><div class='add'>+		rxs-&gt;flag |= RX_FLAG_AMPDU_DETAILS;</div><div class='add'>+		rxs-&gt;ampdu_reference = ppduinfo-&gt;userstats[ppduinfo-&gt;userid].ampdu_id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ppduinfo-&gt;is_eht || ppduinfo-&gt;eht_usig) {</div><div class='add'>+		struct ieee80211_radiotap_tlv *tlv;</div><div class='add'>+		struct ieee80211_radiotap_eht *eht;</div><div class='add'>+		struct ieee80211_radiotap_eht_usig *usig;</div><div class='add'>+		u16 len = 0, i, eht_len, usig_len;</div><div class='add'>+		u8 user;</div><div class='add'>+</div><div class='add'>+		if (ppduinfo-&gt;is_eht) {</div><div class='add'>+			eht_len = struct_size(eht,</div><div class='add'>+					      user_info,</div><div class='add'>+					      ppduinfo-&gt;eht_info.num_user_info);</div><div class='add'>+			len += sizeof(*tlv) + eht_len;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ppduinfo-&gt;eht_usig) {</div><div class='add'>+			usig_len = sizeof(*usig);</div><div class='add'>+			len += sizeof(*tlv) + usig_len;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rxs-&gt;flag |= RX_FLAG_RADIOTAP_TLV_AT_END;</div><div class='add'>+		rxs-&gt;encoding = RX_ENC_EHT;</div><div class='add'>+</div><div class='add'>+		skb_reset_mac_header(mon_skb);</div><div class='add'>+</div><div class='add'>+		tlv = skb_push(mon_skb, len);</div><div class='add'>+</div><div class='add'>+		if (ppduinfo-&gt;is_eht) {</div><div class='add'>+			tlv-&gt;type = cpu_to_le16(IEEE80211_RADIOTAP_EHT);</div><div class='add'>+			tlv-&gt;len = cpu_to_le16(eht_len);</div><div class='add'>+</div><div class='add'>+			eht = (struct ieee80211_radiotap_eht *)tlv-&gt;data;</div><div class='add'>+			eht-&gt;known = ppduinfo-&gt;eht_info.eht.known;</div><div class='add'>+</div><div class='add'>+			for (i = 0;</div><div class='add'>+			     i &lt; ARRAY_SIZE(eht-&gt;data) &amp;&amp;</div><div class='add'>+			     i &lt; ARRAY_SIZE(ppduinfo-&gt;eht_info.eht.data);</div><div class='add'>+			     i++)</div><div class='add'>+				eht-&gt;data[i] = ppduinfo-&gt;eht_info.eht.data[i];</div><div class='add'>+</div><div class='add'>+			for (user = 0; user &lt; ppduinfo-&gt;eht_info.num_user_info; user++)</div><div class='add'>+				put_unaligned_le32(ppduinfo-&gt;eht_info.user_info[user],</div><div class='add'>+						   &amp;eht-&gt;user_info[user]);</div><div class='add'>+</div><div class='add'>+			tlv = (struct ieee80211_radiotap_tlv *)&amp;tlv-&gt;data[eht_len];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ppduinfo-&gt;eht_usig) {</div><div class='add'>+			tlv-&gt;type = cpu_to_le16(IEEE80211_RADIOTAP_EHT_USIG);</div><div class='add'>+			tlv-&gt;len = cpu_to_le16(usig_len);</div><div class='add'>+</div><div class='add'>+			usig = (struct ieee80211_radiotap_eht_usig *)tlv-&gt;data;</div><div class='add'>+			*usig = ppduinfo-&gt;u_sig_info.usig;</div><div class='add'>+		}</div><div class='add'>+	} else if (ppduinfo-&gt;he_mu_flags) {</div><div class='add'>+		rxs-&gt;flag |= RX_FLAG_RADIOTAP_HE_MU;</div><div class='add'>+		rxs-&gt;encoding = RX_ENC_HE;</div><div class='add'>+		ptr = skb_push(mon_skb, sizeof(struct ieee80211_radiotap_he_mu));</div><div class='add'>+		ath12k_dp_mon_rx_update_radiotap_he_mu(ppduinfo, ptr);</div><div class='add'>+	} else if (ppduinfo-&gt;he_flags) {</div><div class='add'>+		rxs-&gt;flag |= RX_FLAG_RADIOTAP_HE;</div><div class='add'>+		rxs-&gt;encoding = RX_ENC_HE;</div><div class='add'>+		ptr = skb_push(mon_skb, sizeof(struct ieee80211_radiotap_he));</div><div class='add'>+		ath12k_dp_mon_rx_update_radiotap_he(ppduinfo, ptr);</div><div class='add'>+		rxs-&gt;rate_idx = ppduinfo-&gt;rate;</div><div class='add'>+	} else if (ppduinfo-&gt;vht_flags) {</div><div class='add'>+		rxs-&gt;encoding = RX_ENC_VHT;</div><div class='add'>+		rxs-&gt;rate_idx = ppduinfo-&gt;rate;</div><div class='add'>+	} else if (ppduinfo-&gt;ht_flags) {</div><div class='add'>+		rxs-&gt;encoding = RX_ENC_HT;</div><div class='add'>+		rxs-&gt;rate_idx = ppduinfo-&gt;rate;</div><div class='add'>+	} else {</div><div class='add'>+		rxs-&gt;encoding = RX_ENC_LEGACY;</div><div class='add'>+		sband = &amp;ar-&gt;mac.sbands[rxs-&gt;band];</div><div class='add'>+		rxs-&gt;rate_idx = ath12k_mac_hw_rate_to_idx(sband, ppduinfo-&gt;rate,</div><div class='add'>+							  ppduinfo-&gt;cck_flag);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rxs-&gt;mactime = ppduinfo-&gt;tsft;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_mon_rx_deliver_msdu(struct ath12k *ar, struct napi_struct *napi,</div><div class='add'>+					  struct sk_buff *msdu,</div><div class='add'>+					  const struct hal_rx_mon_ppdu_info *ppduinfo,</div><div class='add'>+					  struct ieee80211_rx_status *status,</div><div class='add'>+					  u8 decap)</div><div class='add'>+{</div><div class='add'>+	static const struct ieee80211_radiotap_he known = {</div><div class='add'>+		.data1 = cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_DATA_MCS_KNOWN |</div><div class='add'>+				     IEEE80211_RADIOTAP_HE_DATA1_BW_RU_ALLOC_KNOWN),</div><div class='add'>+		.data2 = cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA2_GI_KNOWN),</div><div class='add'>+	};</div><div class='add'>+	struct ieee80211_rx_status *rx_status;</div><div class='add'>+	struct ieee80211_radiotap_he *he = NULL;</div><div class='add'>+	struct ieee80211_sta *pubsta = NULL;</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(msdu);</div><div class='add'>+	bool is_mcbc = rxcb-&gt;is_mcbc;</div><div class='add'>+	bool is_eapol_tkip = rxcb-&gt;is_eapol;</div><div class='add'>+</div><div class='add'>+	status-&gt;link_valid = 0;</div><div class='add'>+</div><div class='add'>+	if ((status-&gt;encoding == RX_ENC_HE) &amp;&amp; !(status-&gt;flag &amp; RX_FLAG_RADIOTAP_HE) &amp;&amp;</div><div class='add'>+	    !(status-&gt;flag &amp; RX_FLAG_SKIP_MONITOR)) {</div><div class='add'>+		he = skb_push(msdu, sizeof(known));</div><div class='add'>+		memcpy(he, &amp;known, sizeof(known));</div><div class='add'>+		status-&gt;flag |= RX_FLAG_RADIOTAP_HE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+	peer = ath12k_peer_find_by_id(ar-&gt;ab, ppduinfo-&gt;peer_id);</div><div class='add'>+	if (peer &amp;&amp; peer-&gt;sta) {</div><div class='add'>+		pubsta = peer-&gt;sta;</div><div class='add'>+		if (pubsta-&gt;valid_links) {</div><div class='add'>+			status-&gt;link_valid = 1;</div><div class='add'>+			status-&gt;link_id = peer-&gt;link_id;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_DATA,</div><div class='add'>+		   "rx skb %p len %u peer %pM %u %s %s%s%s%s%s%s%s%s %srate_idx %u vht_nss %u freq %u band %u flag 0x%x fcs-err %i mic-err %i amsdu-more %i\n",</div><div class='add'>+		   msdu,</div><div class='add'>+		   msdu-&gt;len,</div><div class='add'>+		   peer ? peer-&gt;addr : NULL,</div><div class='add'>+		   rxcb-&gt;tid,</div><div class='add'>+		   (is_mcbc) ? "mcast" : "ucast",</div><div class='add'>+		   (status-&gt;encoding == RX_ENC_LEGACY) ? "legacy" : "",</div><div class='add'>+		   (status-&gt;encoding == RX_ENC_HT) ? "ht" : "",</div><div class='add'>+		   (status-&gt;encoding == RX_ENC_VHT) ? "vht" : "",</div><div class='add'>+		   (status-&gt;encoding == RX_ENC_HE) ? "he" : "",</div><div class='add'>+		   (status-&gt;bw == RATE_INFO_BW_40) ? "40" : "",</div><div class='add'>+		   (status-&gt;bw == RATE_INFO_BW_80) ? "80" : "",</div><div class='add'>+		   (status-&gt;bw == RATE_INFO_BW_160) ? "160" : "",</div><div class='add'>+		   (status-&gt;bw == RATE_INFO_BW_320) ? "320" : "",</div><div class='add'>+		   status-&gt;enc_flags &amp; RX_ENC_FLAG_SHORT_GI ? "sgi " : "",</div><div class='add'>+		   status-&gt;rate_idx,</div><div class='add'>+		   status-&gt;nss,</div><div class='add'>+		   status-&gt;freq,</div><div class='add'>+		   status-&gt;band, status-&gt;flag,</div><div class='add'>+		   !!(status-&gt;flag &amp; RX_FLAG_FAILED_FCS_CRC),</div><div class='add'>+		   !!(status-&gt;flag &amp; RX_FLAG_MMIC_ERROR),</div><div class='add'>+		   !!(status-&gt;flag &amp; RX_FLAG_AMSDU_MORE));</div><div class='add'>+</div><div class='add'>+	ath12k_dbg_dump(ar-&gt;ab, ATH12K_DBG_DP_RX, NULL, "dp rx msdu: ",</div><div class='add'>+			msdu-&gt;data, msdu-&gt;len);</div><div class='add'>+	rx_status = IEEE80211_SKB_RXCB(msdu);</div><div class='add'>+	*rx_status = *status;</div><div class='add'>+</div><div class='add'>+	/* TODO: trace rx packet */</div><div class='add'>+</div><div class='add'>+	/* PN for multicast packets are not validate in HW,</div><div class='add'>+	 * so skip 802.3 rx path</div><div class='add'>+	 * Also, fast_rx expects the STA to be authorized, hence</div><div class='add'>+	 * eapol packets are sent in slow path.</div><div class='add'>+	 */</div><div class='add'>+	if (decap == DP_RX_DECAP_TYPE_ETHERNET2_DIX &amp;&amp; !is_eapol_tkip &amp;&amp;</div><div class='add'>+	    !(is_mcbc &amp;&amp; rx_status-&gt;flag &amp; RX_FLAG_DECRYPTED))</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_8023;</div><div class='add'>+</div><div class='add'>+	ieee80211_rx_napi(ath12k_ar_to_hw(ar), pubsta, msdu, napi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_mon_rx_deliver(struct ath12k *ar,</div><div class='add'>+				    struct dp_mon_mpdu *mon_mpdu,</div><div class='add'>+				    struct hal_rx_mon_ppdu_info *ppduinfo,</div><div class='add'>+				    struct napi_struct *napi)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pdev_dp *dp = &amp;ar-&gt;dp;</div><div class='add'>+	struct sk_buff *mon_skb, *skb_next, *header;</div><div class='add'>+	struct ieee80211_rx_status *rxs = &amp;dp-&gt;rx_status;</div><div class='add'>+	u8 decap = DP_RX_DECAP_TYPE_RAW;</div><div class='add'>+</div><div class='add'>+	mon_skb = ath12k_dp_mon_rx_merg_msdus(ar, mon_mpdu, ppduinfo, rxs);</div><div class='add'>+	if (!mon_skb)</div><div class='add'>+		goto mon_deliver_fail;</div><div class='add'>+</div><div class='add'>+	header = mon_skb;</div><div class='add'>+	rxs-&gt;flag = 0;</div><div class='add'>+</div><div class='add'>+	if (mon_mpdu-&gt;err_bitmap &amp; HAL_RX_MPDU_ERR_FCS)</div><div class='add'>+		rxs-&gt;flag = RX_FLAG_FAILED_FCS_CRC;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		skb_next = mon_skb-&gt;next;</div><div class='add'>+		if (!skb_next)</div><div class='add'>+			rxs-&gt;flag &amp;= ~RX_FLAG_AMSDU_MORE;</div><div class='add'>+		else</div><div class='add'>+			rxs-&gt;flag |= RX_FLAG_AMSDU_MORE;</div><div class='add'>+</div><div class='add'>+		if (mon_skb == header) {</div><div class='add'>+			header = NULL;</div><div class='add'>+			rxs-&gt;flag &amp;= ~RX_FLAG_ALLOW_SAME_PN;</div><div class='add'>+		} else {</div><div class='add'>+			rxs-&gt;flag |= RX_FLAG_ALLOW_SAME_PN;</div><div class='add'>+		}</div><div class='add'>+		rxs-&gt;flag |= RX_FLAG_ONLY_MONITOR;</div><div class='add'>+</div><div class='add'>+		if (!(rxs-&gt;flag &amp; RX_FLAG_ONLY_MONITOR))</div><div class='add'>+			decap = mon_mpdu-&gt;decap_format;</div><div class='add'>+</div><div class='add'>+		ath12k_dp_mon_update_radiotap(ar, ppduinfo, mon_skb, rxs);</div><div class='add'>+		ath12k_dp_mon_rx_deliver_msdu(ar, napi, mon_skb, ppduinfo, rxs, decap);</div><div class='add'>+		mon_skb = skb_next;</div><div class='add'>+	} while (mon_skb);</div><div class='add'>+	rxs-&gt;flag = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+mon_deliver_fail:</div><div class='add'>+	mon_skb = mon_mpdu-&gt;head;</div><div class='add'>+	while (mon_skb) {</div><div class='add'>+		skb_next = mon_skb-&gt;next;</div><div class='add'>+		dev_kfree_skb_any(mon_skb);</div><div class='add'>+		mon_skb = skb_next;</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_pkt_set_pktlen(struct sk_buff *skb, u32 len)</div><div class='add'>+{</div><div class='add'>+	if (skb-&gt;len &gt; len) {</div><div class='add'>+		skb_trim(skb, len);</div><div class='add'>+	} else {</div><div class='add'>+		if (skb_tailroom(skb) &lt; len - skb-&gt;len) {</div><div class='add'>+			if ((pskb_expand_head(skb, 0,</div><div class='add'>+					      len - skb-&gt;len - skb_tailroom(skb),</div><div class='add'>+					      GFP_ATOMIC))) {</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		skb_put(skb, (len - skb-&gt;len));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Hardware fill buffer with 128 bytes aligned. So need to reap it</div><div class='add'>+ * with 128 bytes aligned.</div><div class='add'>+ */</div><div class='add'>+#define RXDMA_DATA_DMA_BLOCK_SIZE 128</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_get_buf_len(struct hal_rx_msdu_desc_info *info,</div><div class='add'>+			  bool *is_frag, u32 *total_len,</div><div class='add'>+			  u32 *frag_len, u32 *msdu_cnt)</div><div class='add'>+{</div><div class='add'>+	if (info-&gt;msdu_flags &amp; RX_MSDU_DESC_INFO0_MSDU_CONTINUATION) {</div><div class='add'>+		*is_frag = true;</div><div class='add'>+		*frag_len = (RX_MON_STATUS_BASE_BUF_SIZE -</div><div class='add'>+			     sizeof(struct hal_rx_desc)) &amp;</div><div class='add'>+			     ~(RXDMA_DATA_DMA_BLOCK_SIZE - 1);</div><div class='add'>+		*total_len += *frag_len;</div><div class='add'>+	} else {</div><div class='add'>+		if (*is_frag)</div><div class='add'>+			*frag_len = info-&gt;msdu_len - *total_len;</div><div class='add'>+		else</div><div class='add'>+			*frag_len = info-&gt;msdu_len;</div><div class='add'>+</div><div class='add'>+		*msdu_cnt -= 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_dp_mon_parse_status_buf(struct ath12k *ar,</div><div class='add'>+			       struct ath12k_mon_data *pmon,</div><div class='add'>+			       const struct dp_mon_packet_info *packet_info)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct dp_rxdma_mon_ring *buf_ring = &amp;ab-&gt;dp.rxdma_mon_buf_ring;</div><div class='add'>+	struct sk_buff *msdu;</div><div class='add'>+	int buf_id;</div><div class='add'>+	u32 offset;</div><div class='add'>+</div><div class='add'>+	buf_id = u32_get_bits(packet_info-&gt;cookie, DP_RXDMA_BUF_COOKIE_BUF_ID);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;buf_ring-&gt;idr_lock);</div><div class='add'>+	msdu = idr_remove(&amp;buf_ring-&gt;bufs_idr, buf_id);</div><div class='add'>+	spin_unlock_bh(&amp;buf_ring-&gt;idr_lock);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!msdu)) {</div><div class='add'>+		ath12k_warn(ab, "mon dest desc with inval buf_id %d\n", buf_id);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dma_unmap_single(ab-&gt;dev, ATH12K_SKB_RXCB(msdu)-&gt;paddr,</div><div class='add'>+			 msdu-&gt;len + skb_tailroom(msdu),</div><div class='add'>+			 DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+	offset = packet_info-&gt;dma_length + ATH12K_MON_RX_DOT11_OFFSET;</div><div class='add'>+	if (ath12k_dp_pkt_set_pktlen(msdu, offset)) {</div><div class='add'>+		dev_kfree_skb_any(msdu);</div><div class='add'>+		goto dest_replenish;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!pmon-&gt;mon_mpdu-&gt;head)</div><div class='add'>+		pmon-&gt;mon_mpdu-&gt;head = msdu;</div><div class='add'>+	else</div><div class='add'>+		pmon-&gt;mon_mpdu-&gt;tail-&gt;next = msdu;</div><div class='add'>+</div><div class='add'>+	pmon-&gt;mon_mpdu-&gt;tail = msdu;</div><div class='add'>+</div><div class='add'>+dest_replenish:</div><div class='add'>+	ath12k_dp_mon_buf_replenish(ab, buf_ring, 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_dp_mon_parse_rx_dest_tlv(struct ath12k *ar,</div><div class='add'>+				struct ath12k_mon_data *pmon,</div><div class='add'>+				enum hal_rx_mon_status hal_status,</div><div class='add'>+				const void *tlv_data)</div><div class='add'>+{</div><div class='add'>+	switch (hal_status) {</div><div class='add'>+	case HAL_RX_MON_STATUS_MPDU_START:</div><div class='add'>+		if (WARN_ON_ONCE(pmon-&gt;mon_mpdu))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		pmon-&gt;mon_mpdu = kzalloc(sizeof(*pmon-&gt;mon_mpdu), GFP_ATOMIC);</div><div class='add'>+		if (!pmon-&gt;mon_mpdu)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_RX_MON_STATUS_BUF_ADDR:</div><div class='add'>+		return ath12k_dp_mon_parse_status_buf(ar, pmon, tlv_data);</div><div class='add'>+	case HAL_RX_MON_STATUS_MPDU_END:</div><div class='add'>+		/* If no MSDU then free empty MPDU */</div><div class='add'>+		if (pmon-&gt;mon_mpdu-&gt;tail) {</div><div class='add'>+			pmon-&gt;mon_mpdu-&gt;tail-&gt;next = NULL;</div><div class='add'>+			list_add_tail(&amp;pmon-&gt;mon_mpdu-&gt;list, &amp;pmon-&gt;dp_rx_mon_mpdu_list);</div><div class='add'>+		} else {</div><div class='add'>+			kfree(pmon-&gt;mon_mpdu);</div><div class='add'>+		}</div><div class='add'>+		pmon-&gt;mon_mpdu = NULL;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_RX_MON_STATUS_MSDU_END:</div><div class='add'>+		pmon-&gt;mon_mpdu-&gt;decap_format = pmon-&gt;decap_format;</div><div class='add'>+		pmon-&gt;mon_mpdu-&gt;err_bitmap = pmon-&gt;err_bitmap;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum hal_rx_mon_status</div><div class='add'>+ath12k_dp_mon_parse_rx_dest(struct ath12k *ar, struct ath12k_mon_data *pmon,</div><div class='add'>+			    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hal_tlv_64_hdr *tlv;</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb;</div><div class='add'>+	enum hal_rx_mon_status hal_status;</div><div class='add'>+	u16 tlv_tag, tlv_len;</div><div class='add'>+	u8 *ptr = skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		tlv = (struct hal_tlv_64_hdr *)ptr;</div><div class='add'>+		tlv_tag = le64_get_bits(tlv-&gt;tl, HAL_TLV_64_HDR_TAG);</div><div class='add'>+</div><div class='add'>+		/* The actual length of PPDU_END is the combined length of many PHY</div><div class='add'>+		 * TLVs that follow. Skip the TLV header and</div><div class='add'>+		 * rx_rxpcu_classification_overview that follows the header to get to</div><div class='add'>+		 * next TLV.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		if (tlv_tag == HAL_RX_PPDU_END)</div><div class='add'>+			tlv_len = sizeof(struct hal_rx_rxpcu_classification_overview);</div><div class='add'>+		else</div><div class='add'>+			tlv_len = le64_get_bits(tlv-&gt;tl, HAL_TLV_64_HDR_LEN);</div><div class='add'>+</div><div class='add'>+		hal_status = ath12k_dp_mon_rx_parse_status_tlv(ar, pmon, tlv);</div><div class='add'>+</div><div class='add'>+		if (ar-&gt;monitor_started &amp;&amp; ar-&gt;ab-&gt;hw_params-&gt;rxdma1_enable &amp;&amp;</div><div class='add'>+		    ath12k_dp_mon_parse_rx_dest_tlv(ar, pmon, hal_status, tlv-&gt;value))</div><div class='add'>+			return HAL_RX_MON_STATUS_PPDU_DONE;</div><div class='add'>+</div><div class='add'>+		ptr += sizeof(*tlv) + tlv_len;</div><div class='add'>+		ptr = PTR_ALIGN(ptr, HAL_TLV_64_ALIGN);</div><div class='add'>+</div><div class='add'>+		if ((ptr - skb-&gt;data) &gt; skb-&gt;len)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	} while ((hal_status == HAL_RX_MON_STATUS_PPDU_NOT_DONE) ||</div><div class='add'>+		 (hal_status == HAL_RX_MON_STATUS_BUF_ADDR) ||</div><div class='add'>+		 (hal_status == HAL_RX_MON_STATUS_MPDU_START) ||</div><div class='add'>+		 (hal_status == HAL_RX_MON_STATUS_MPDU_END) ||</div><div class='add'>+		 (hal_status == HAL_RX_MON_STATUS_MSDU_END));</div><div class='add'>+</div><div class='add'>+	rxcb = ATH12K_SKB_RXCB(skb);</div><div class='add'>+	if (rxcb-&gt;is_end_of_ppdu)</div><div class='add'>+		hal_status = HAL_RX_MON_STATUS_PPDU_DONE;</div><div class='add'>+</div><div class='add'>+	return hal_status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum hal_rx_mon_status</div><div class='add'>+ath12k_dp_mon_rx_parse_mon_status(struct ath12k *ar,</div><div class='add'>+				  struct ath12k_mon_data *pmon,</div><div class='add'>+				  struct sk_buff *skb,</div><div class='add'>+				  struct napi_struct *napi)</div><div class='add'>+{</div><div class='add'>+	struct hal_rx_mon_ppdu_info *ppdu_info = &amp;pmon-&gt;mon_ppdu_info;</div><div class='add'>+	struct dp_mon_mpdu *tmp;</div><div class='add'>+	struct dp_mon_mpdu *mon_mpdu = pmon-&gt;mon_mpdu;</div><div class='add'>+	enum hal_rx_mon_status hal_status;</div><div class='add'>+</div><div class='add'>+	hal_status = ath12k_dp_mon_parse_rx_dest(ar, pmon, skb);</div><div class='add'>+	if (hal_status != HAL_RX_MON_STATUS_PPDU_DONE)</div><div class='add'>+		return hal_status;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(mon_mpdu, tmp, &amp;pmon-&gt;dp_rx_mon_mpdu_list, list) {</div><div class='add'>+		list_del(&amp;mon_mpdu-&gt;list);</div><div class='add'>+</div><div class='add'>+		if (mon_mpdu-&gt;head &amp;&amp; mon_mpdu-&gt;tail)</div><div class='add'>+			ath12k_dp_mon_rx_deliver(ar, mon_mpdu, ppdu_info, napi);</div><div class='add'>+</div><div class='add'>+		kfree(mon_mpdu);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return hal_status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_mon_buf_replenish(struct ath12k_base *ab,</div><div class='add'>+				struct dp_rxdma_mon_ring *buf_ring,</div><div class='add'>+				int req_entries)</div><div class='add'>+{</div><div class='add'>+	struct hal_mon_buf_ring *mon_buf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	u32 cookie;</div><div class='add'>+	int buf_id;</div><div class='add'>+</div><div class='add'>+	srng = &amp;ab-&gt;hal.srng_list[buf_ring-&gt;refill_buf_ring.ring_id];</div><div class='add'>+	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='add'>+	ath12k_hal_srng_access_begin(ab, srng);</div><div class='add'>+</div><div class='add'>+	while (req_entries &gt; 0) {</div><div class='add'>+		skb = dev_alloc_skb(DP_RX_BUFFER_SIZE + DP_RX_BUFFER_ALIGN_SIZE);</div><div class='add'>+		if (unlikely(!skb))</div><div class='add'>+			goto fail_alloc_skb;</div><div class='add'>+</div><div class='add'>+		if (!IS_ALIGNED((unsigned long)skb-&gt;data, DP_RX_BUFFER_ALIGN_SIZE)) {</div><div class='add'>+			skb_pull(skb,</div><div class='add'>+				 PTR_ALIGN(skb-&gt;data, DP_RX_BUFFER_ALIGN_SIZE) -</div><div class='add'>+				 skb-&gt;data);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		paddr = dma_map_single(ab-&gt;dev, skb-&gt;data,</div><div class='add'>+				       skb-&gt;len + skb_tailroom(skb),</div><div class='add'>+				       DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+		if (unlikely(dma_mapping_error(ab-&gt;dev, paddr)))</div><div class='add'>+			goto fail_free_skb;</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;buf_ring-&gt;idr_lock);</div><div class='add'>+		buf_id = idr_alloc(&amp;buf_ring-&gt;bufs_idr, skb, 0,</div><div class='add'>+				   buf_ring-&gt;bufs_max * 3, GFP_ATOMIC);</div><div class='add'>+		spin_unlock_bh(&amp;buf_ring-&gt;idr_lock);</div><div class='add'>+</div><div class='add'>+		if (unlikely(buf_id &lt; 0))</div><div class='add'>+			goto fail_dma_unmap;</div><div class='add'>+</div><div class='add'>+		mon_buf = ath12k_hal_srng_src_get_next_entry(ab, srng);</div><div class='add'>+		if (unlikely(!mon_buf))</div><div class='add'>+			goto fail_idr_remove;</div><div class='add'>+</div><div class='add'>+		ATH12K_SKB_RXCB(skb)-&gt;paddr = paddr;</div><div class='add'>+</div><div class='add'>+		cookie = u32_encode_bits(buf_id, DP_RXDMA_BUF_COOKIE_BUF_ID);</div><div class='add'>+</div><div class='add'>+		mon_buf-&gt;paddr_lo = cpu_to_le32(lower_32_bits(paddr));</div><div class='add'>+		mon_buf-&gt;paddr_hi = cpu_to_le32(upper_32_bits(paddr));</div><div class='add'>+		mon_buf-&gt;cookie = cpu_to_le64(cookie);</div><div class='add'>+</div><div class='add'>+		req_entries--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail_idr_remove:</div><div class='add'>+	spin_lock_bh(&amp;buf_ring-&gt;idr_lock);</div><div class='add'>+	idr_remove(&amp;buf_ring-&gt;bufs_idr, buf_id);</div><div class='add'>+	spin_unlock_bh(&amp;buf_ring-&gt;idr_lock);</div><div class='add'>+fail_dma_unmap:</div><div class='add'>+	dma_unmap_single(ab-&gt;dev, paddr, skb-&gt;len + skb_tailroom(skb),</div><div class='add'>+			 DMA_FROM_DEVICE);</div><div class='add'>+fail_free_skb:</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+fail_alloc_skb:</div><div class='add'>+	ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_mon_status_bufs_replenish(struct ath12k_base *ab,</div><div class='add'>+					struct dp_rxdma_mon_ring *rx_ring,</div><div class='add'>+					int req_entries)</div><div class='add'>+{</div><div class='add'>+	enum hal_rx_buf_return_buf_manager mgr =</div><div class='add'>+		ab-&gt;hw_params-&gt;hal_params-&gt;rx_buf_rbm;</div><div class='add'>+	int num_free, num_remain, buf_id;</div><div class='add'>+	struct ath12k_buffer_addr *desc;</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	u32 cookie;</div><div class='add'>+</div><div class='add'>+	req_entries = min(req_entries, rx_ring-&gt;bufs_max);</div><div class='add'>+</div><div class='add'>+	srng = &amp;ab-&gt;hal.srng_list[rx_ring-&gt;refill_buf_ring.ring_id];</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_begin(ab, srng);</div><div class='add'>+</div><div class='add'>+	num_free = ath12k_hal_srng_src_num_free(ab, srng, true);</div><div class='add'>+	if (!req_entries &amp;&amp; (num_free &gt; (rx_ring-&gt;bufs_max * 3) / 4))</div><div class='add'>+		req_entries = num_free;</div><div class='add'>+</div><div class='add'>+	req_entries = min(num_free, req_entries);</div><div class='add'>+	num_remain = req_entries;</div><div class='add'>+</div><div class='add'>+	while (num_remain &gt; 0) {</div><div class='add'>+		skb = dev_alloc_skb(RX_MON_STATUS_BUF_SIZE);</div><div class='add'>+		if (!skb)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!IS_ALIGNED((unsigned long)skb-&gt;data,</div><div class='add'>+				RX_MON_STATUS_BUF_ALIGN)) {</div><div class='add'>+			skb_pull(skb,</div><div class='add'>+				 PTR_ALIGN(skb-&gt;data, RX_MON_STATUS_BUF_ALIGN) -</div><div class='add'>+				 skb-&gt;data);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		paddr = dma_map_single(ab-&gt;dev, skb-&gt;data,</div><div class='add'>+				       skb-&gt;len + skb_tailroom(skb),</div><div class='add'>+				       DMA_FROM_DEVICE);</div><div class='add'>+		if (dma_mapping_error(ab-&gt;dev, paddr))</div><div class='add'>+			goto fail_free_skb;</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+		buf_id = idr_alloc(&amp;rx_ring-&gt;bufs_idr, skb, 0,</div><div class='add'>+				   rx_ring-&gt;bufs_max * 3, GFP_ATOMIC);</div><div class='add'>+		spin_unlock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+		if (buf_id &lt; 0)</div><div class='add'>+			goto fail_dma_unmap;</div><div class='add'>+		cookie = u32_encode_bits(buf_id, DP_RXDMA_BUF_COOKIE_BUF_ID);</div><div class='add'>+</div><div class='add'>+		desc = ath12k_hal_srng_src_get_next_entry(ab, srng);</div><div class='add'>+		if (!desc)</div><div class='add'>+			goto fail_buf_unassign;</div><div class='add'>+</div><div class='add'>+		ATH12K_SKB_RXCB(skb)-&gt;paddr = paddr;</div><div class='add'>+</div><div class='add'>+		num_remain--;</div><div class='add'>+</div><div class='add'>+		ath12k_hal_rx_buf_addr_info_set(desc, paddr, cookie, mgr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return req_entries - num_remain;</div><div class='add'>+</div><div class='add'>+fail_buf_unassign:</div><div class='add'>+	spin_lock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+	idr_remove(&amp;rx_ring-&gt;bufs_idr, buf_id);</div><div class='add'>+	spin_unlock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+fail_dma_unmap:</div><div class='add'>+	dma_unmap_single(ab-&gt;dev, paddr, skb-&gt;len + skb_tailroom(skb),</div><div class='add'>+			 DMA_FROM_DEVICE);</div><div class='add'>+fail_free_skb:</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return req_entries - num_remain;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dp_mon_tx_ppdu_info *</div><div class='add'>+ath12k_dp_mon_tx_get_ppdu_info(struct ath12k_mon_data *pmon,</div><div class='add'>+			       unsigned int ppdu_id,</div><div class='add'>+			       enum dp_mon_tx_ppdu_info_type type)</div><div class='add'>+{</div><div class='add'>+	struct dp_mon_tx_ppdu_info *tx_ppdu_info;</div><div class='add'>+</div><div class='add'>+	if (type == DP_MON_TX_PROT_PPDU_INFO) {</div><div class='add'>+		tx_ppdu_info = pmon-&gt;tx_prot_ppdu_info;</div><div class='add'>+</div><div class='add'>+		if (tx_ppdu_info &amp;&amp; !tx_ppdu_info-&gt;is_used)</div><div class='add'>+			return tx_ppdu_info;</div><div class='add'>+		kfree(tx_ppdu_info);</div><div class='add'>+	} else {</div><div class='add'>+		tx_ppdu_info = pmon-&gt;tx_data_ppdu_info;</div><div class='add'>+</div><div class='add'>+		if (tx_ppdu_info &amp;&amp; !tx_ppdu_info-&gt;is_used)</div><div class='add'>+			return tx_ppdu_info;</div><div class='add'>+		kfree(tx_ppdu_info);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* allocate new tx_ppdu_info */</div><div class='add'>+	tx_ppdu_info = kzalloc(sizeof(*tx_ppdu_info), GFP_ATOMIC);</div><div class='add'>+	if (!tx_ppdu_info)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	tx_ppdu_info-&gt;is_used = 0;</div><div class='add'>+	tx_ppdu_info-&gt;ppdu_id = ppdu_id;</div><div class='add'>+</div><div class='add'>+	if (type == DP_MON_TX_PROT_PPDU_INFO)</div><div class='add'>+		pmon-&gt;tx_prot_ppdu_info = tx_ppdu_info;</div><div class='add'>+	else</div><div class='add'>+		pmon-&gt;tx_data_ppdu_info = tx_ppdu_info;</div><div class='add'>+</div><div class='add'>+	return tx_ppdu_info;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dp_mon_tx_ppdu_info *</div><div class='add'>+ath12k_dp_mon_hal_tx_ppdu_info(struct ath12k_mon_data *pmon,</div><div class='add'>+			       u16 tlv_tag)</div><div class='add'>+{</div><div class='add'>+	switch (tlv_tag) {</div><div class='add'>+	case HAL_TX_FES_SETUP:</div><div class='add'>+	case HAL_TX_FLUSH:</div><div class='add'>+	case HAL_PCU_PPDU_SETUP_INIT:</div><div class='add'>+	case HAL_TX_PEER_ENTRY:</div><div class='add'>+	case HAL_TX_QUEUE_EXTENSION:</div><div class='add'>+	case HAL_TX_MPDU_START:</div><div class='add'>+	case HAL_TX_MSDU_START:</div><div class='add'>+	case HAL_TX_DATA:</div><div class='add'>+	case HAL_MON_BUF_ADDR:</div><div class='add'>+	case HAL_TX_MPDU_END:</div><div class='add'>+	case HAL_TX_LAST_MPDU_FETCHED:</div><div class='add'>+	case HAL_TX_LAST_MPDU_END:</div><div class='add'>+	case HAL_COEX_TX_REQ:</div><div class='add'>+	case HAL_TX_RAW_OR_NATIVE_FRAME_SETUP:</div><div class='add'>+	case HAL_SCH_CRITICAL_TLV_REFERENCE:</div><div class='add'>+	case HAL_TX_FES_SETUP_COMPLETE:</div><div class='add'>+	case HAL_TQM_MPDU_GLOBAL_START:</div><div class='add'>+	case HAL_SCHEDULER_END:</div><div class='add'>+	case HAL_TX_FES_STATUS_USER_PPDU:</div><div class='add'>+		break;</div><div class='add'>+	case HAL_TX_FES_STATUS_PROT: {</div><div class='add'>+		if (!pmon-&gt;tx_prot_ppdu_info-&gt;is_used)</div><div class='add'>+			pmon-&gt;tx_prot_ppdu_info-&gt;is_used = true;</div><div class='add'>+</div><div class='add'>+		return pmon-&gt;tx_prot_ppdu_info;</div><div class='add'>+	}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!pmon-&gt;tx_data_ppdu_info-&gt;is_used)</div><div class='add'>+		pmon-&gt;tx_data_ppdu_info-&gt;is_used = true;</div><div class='add'>+</div><div class='add'>+	return pmon-&gt;tx_data_ppdu_info;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MAX_MONITOR_HEADER 512</div><div class='add'>+#define MAX_DUMMY_FRM_BODY 128</div><div class='add'>+</div><div class='add'>+struct sk_buff *ath12k_dp_mon_tx_alloc_skb(void)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(MAX_MONITOR_HEADER + MAX_DUMMY_FRM_BODY);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb, MAX_MONITOR_HEADER);</div><div class='add'>+</div><div class='add'>+	if (!IS_ALIGNED((unsigned long)skb-&gt;data, 4))</div><div class='add'>+		skb_pull(skb, PTR_ALIGN(skb-&gt;data, 4) - skb-&gt;data);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_dp_mon_tx_gen_cts2self_frame(struct dp_mon_tx_ppdu_info *tx_ppdu_info)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct ieee80211_cts *cts;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_dp_mon_tx_alloc_skb();</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cts = (struct ieee80211_cts *)skb-&gt;data;</div><div class='add'>+	memset(cts, 0, MAX_DUMMY_FRM_BODY);</div><div class='add'>+	cts-&gt;frame_control =</div><div class='add'>+		cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS);</div><div class='add'>+	cts-&gt;duration = cpu_to_le16(tx_ppdu_info-&gt;rx_status.rx_duration);</div><div class='add'>+	memcpy(cts-&gt;ra, tx_ppdu_info-&gt;rx_status.addr1, sizeof(cts-&gt;ra));</div><div class='add'>+</div><div class='add'>+	skb_put(skb, sizeof(*cts));</div><div class='add'>+	tx_ppdu_info-&gt;tx_mon_mpdu-&gt;head = skb;</div><div class='add'>+	tx_ppdu_info-&gt;tx_mon_mpdu-&gt;tail = NULL;</div><div class='add'>+	list_add_tail(&amp;tx_ppdu_info-&gt;tx_mon_mpdu-&gt;list,</div><div class='add'>+		      &amp;tx_ppdu_info-&gt;dp_tx_mon_mpdu_list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_dp_mon_tx_gen_rts_frame(struct dp_mon_tx_ppdu_info *tx_ppdu_info)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct ieee80211_rts *rts;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_dp_mon_tx_alloc_skb();</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rts = (struct ieee80211_rts *)skb-&gt;data;</div><div class='add'>+	memset(rts, 0, MAX_DUMMY_FRM_BODY);</div><div class='add'>+	rts-&gt;frame_control =</div><div class='add'>+		cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_RTS);</div><div class='add'>+	rts-&gt;duration = cpu_to_le16(tx_ppdu_info-&gt;rx_status.rx_duration);</div><div class='add'>+	memcpy(rts-&gt;ra, tx_ppdu_info-&gt;rx_status.addr1, sizeof(rts-&gt;ra));</div><div class='add'>+	memcpy(rts-&gt;ta, tx_ppdu_info-&gt;rx_status.addr2, sizeof(rts-&gt;ta));</div><div class='add'>+</div><div class='add'>+	skb_put(skb, sizeof(*rts));</div><div class='add'>+	tx_ppdu_info-&gt;tx_mon_mpdu-&gt;head = skb;</div><div class='add'>+	tx_ppdu_info-&gt;tx_mon_mpdu-&gt;tail = NULL;</div><div class='add'>+	list_add_tail(&amp;tx_ppdu_info-&gt;tx_mon_mpdu-&gt;list,</div><div class='add'>+		      &amp;tx_ppdu_info-&gt;dp_tx_mon_mpdu_list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_dp_mon_tx_gen_3addr_qos_null_frame(struct dp_mon_tx_ppdu_info *tx_ppdu_info)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct ieee80211_qos_hdr *qhdr;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_dp_mon_tx_alloc_skb();</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	qhdr = (struct ieee80211_qos_hdr *)skb-&gt;data;</div><div class='add'>+	memset(qhdr, 0, MAX_DUMMY_FRM_BODY);</div><div class='add'>+	qhdr-&gt;frame_control =</div><div class='add'>+		cpu_to_le16(IEEE80211_FTYPE_DATA | IEEE80211_STYPE_QOS_NULLFUNC);</div><div class='add'>+	qhdr-&gt;duration_id = cpu_to_le16(tx_ppdu_info-&gt;rx_status.rx_duration);</div><div class='add'>+	memcpy(qhdr-&gt;addr1, tx_ppdu_info-&gt;rx_status.addr1, ETH_ALEN);</div><div class='add'>+	memcpy(qhdr-&gt;addr2, tx_ppdu_info-&gt;rx_status.addr2, ETH_ALEN);</div><div class='add'>+	memcpy(qhdr-&gt;addr3, tx_ppdu_info-&gt;rx_status.addr3, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	skb_put(skb, sizeof(*qhdr));</div><div class='add'>+	tx_ppdu_info-&gt;tx_mon_mpdu-&gt;head = skb;</div><div class='add'>+	tx_ppdu_info-&gt;tx_mon_mpdu-&gt;tail = NULL;</div><div class='add'>+	list_add_tail(&amp;tx_ppdu_info-&gt;tx_mon_mpdu-&gt;list,</div><div class='add'>+		      &amp;tx_ppdu_info-&gt;dp_tx_mon_mpdu_list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_dp_mon_tx_gen_4addr_qos_null_frame(struct dp_mon_tx_ppdu_info *tx_ppdu_info)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct dp_mon_qosframe_addr4 *qhdr;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_dp_mon_tx_alloc_skb();</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	qhdr = (struct dp_mon_qosframe_addr4 *)skb-&gt;data;</div><div class='add'>+	memset(qhdr, 0, MAX_DUMMY_FRM_BODY);</div><div class='add'>+	qhdr-&gt;frame_control =</div><div class='add'>+		cpu_to_le16(IEEE80211_FTYPE_DATA | IEEE80211_STYPE_QOS_NULLFUNC);</div><div class='add'>+	qhdr-&gt;duration = cpu_to_le16(tx_ppdu_info-&gt;rx_status.rx_duration);</div><div class='add'>+	memcpy(qhdr-&gt;addr1, tx_ppdu_info-&gt;rx_status.addr1, ETH_ALEN);</div><div class='add'>+	memcpy(qhdr-&gt;addr2, tx_ppdu_info-&gt;rx_status.addr2, ETH_ALEN);</div><div class='add'>+	memcpy(qhdr-&gt;addr3, tx_ppdu_info-&gt;rx_status.addr3, ETH_ALEN);</div><div class='add'>+	memcpy(qhdr-&gt;addr4, tx_ppdu_info-&gt;rx_status.addr4, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	skb_put(skb, sizeof(*qhdr));</div><div class='add'>+	tx_ppdu_info-&gt;tx_mon_mpdu-&gt;head = skb;</div><div class='add'>+	tx_ppdu_info-&gt;tx_mon_mpdu-&gt;tail = NULL;</div><div class='add'>+	list_add_tail(&amp;tx_ppdu_info-&gt;tx_mon_mpdu-&gt;list,</div><div class='add'>+		      &amp;tx_ppdu_info-&gt;dp_tx_mon_mpdu_list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_dp_mon_tx_gen_ack_frame(struct dp_mon_tx_ppdu_info *tx_ppdu_info)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct dp_mon_frame_min_one *fbmhdr;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_dp_mon_tx_alloc_skb();</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fbmhdr = (struct dp_mon_frame_min_one *)skb-&gt;data;</div><div class='add'>+	memset(fbmhdr, 0, MAX_DUMMY_FRM_BODY);</div><div class='add'>+	fbmhdr-&gt;frame_control =</div><div class='add'>+		cpu_to_le16(IEEE80211_FTYPE_DATA | IEEE80211_STYPE_QOS_CFACK);</div><div class='add'>+	memcpy(fbmhdr-&gt;addr1, tx_ppdu_info-&gt;rx_status.addr1, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	/* set duration zero for ack frame */</div><div class='add'>+	fbmhdr-&gt;duration = 0;</div><div class='add'>+</div><div class='add'>+	skb_put(skb, sizeof(*fbmhdr));</div><div class='add'>+	tx_ppdu_info-&gt;tx_mon_mpdu-&gt;head = skb;</div><div class='add'>+	tx_ppdu_info-&gt;tx_mon_mpdu-&gt;tail = NULL;</div><div class='add'>+	list_add_tail(&amp;tx_ppdu_info-&gt;tx_mon_mpdu-&gt;list,</div><div class='add'>+		      &amp;tx_ppdu_info-&gt;dp_tx_mon_mpdu_list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_dp_mon_tx_gen_prot_frame(struct dp_mon_tx_ppdu_info *tx_ppdu_info)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (tx_ppdu_info-&gt;rx_status.medium_prot_type) {</div><div class='add'>+	case DP_MON_TX_MEDIUM_RTS_LEGACY:</div><div class='add'>+	case DP_MON_TX_MEDIUM_RTS_11AC_STATIC_BW:</div><div class='add'>+	case DP_MON_TX_MEDIUM_RTS_11AC_DYNAMIC_BW:</div><div class='add'>+		ret = ath12k_dp_mon_tx_gen_rts_frame(tx_ppdu_info);</div><div class='add'>+		break;</div><div class='add'>+	case DP_MON_TX_MEDIUM_CTS2SELF:</div><div class='add'>+		ret = ath12k_dp_mon_tx_gen_cts2self_frame(tx_ppdu_info);</div><div class='add'>+		break;</div><div class='add'>+	case DP_MON_TX_MEDIUM_QOS_NULL_NO_ACK_3ADDR:</div><div class='add'>+		ret = ath12k_dp_mon_tx_gen_3addr_qos_null_frame(tx_ppdu_info);</div><div class='add'>+		break;</div><div class='add'>+	case DP_MON_TX_MEDIUM_QOS_NULL_NO_ACK_4ADDR:</div><div class='add'>+		ret = ath12k_dp_mon_tx_gen_4addr_qos_null_frame(tx_ppdu_info);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum dp_mon_tx_tlv_status</div><div class='add'>+ath12k_dp_mon_tx_parse_status_tlv(struct ath12k_base *ab,</div><div class='add'>+				  struct ath12k_mon_data *pmon,</div><div class='add'>+				  u16 tlv_tag, const void *tlv_data, u32 userid)</div><div class='add'>+{</div><div class='add'>+	struct dp_mon_tx_ppdu_info *tx_ppdu_info;</div><div class='add'>+	enum dp_mon_tx_tlv_status status = DP_MON_TX_STATUS_PPDU_NOT_DONE;</div><div class='add'>+	u32 info[7];</div><div class='add'>+</div><div class='add'>+	tx_ppdu_info = ath12k_dp_mon_hal_tx_ppdu_info(pmon, tlv_tag);</div><div class='add'>+</div><div class='add'>+	switch (tlv_tag) {</div><div class='add'>+	case HAL_TX_FES_SETUP: {</div><div class='add'>+		const struct hal_tx_fes_setup *tx_fes_setup = tlv_data;</div><div class='add'>+</div><div class='add'>+		info[0] = __le32_to_cpu(tx_fes_setup-&gt;info0);</div><div class='add'>+		tx_ppdu_info-&gt;ppdu_id = __le32_to_cpu(tx_fes_setup-&gt;schedule_id);</div><div class='add'>+		tx_ppdu_info-&gt;num_users =</div><div class='add'>+			u32_get_bits(info[0], HAL_TX_FES_SETUP_INFO0_NUM_OF_USERS);</div><div class='add'>+		status = DP_MON_TX_FES_SETUP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case HAL_TX_FES_STATUS_END: {</div><div class='add'>+		const struct hal_tx_fes_status_end *tx_fes_status_end = tlv_data;</div><div class='add'>+		u32 tst_15_0, tst_31_16;</div><div class='add'>+</div><div class='add'>+		info[0] = __le32_to_cpu(tx_fes_status_end-&gt;info0);</div><div class='add'>+		tst_15_0 =</div><div class='add'>+			u32_get_bits(info[0],</div><div class='add'>+				     HAL_TX_FES_STATUS_END_INFO0_START_TIMESTAMP_15_0);</div><div class='add'>+		tst_31_16 =</div><div class='add'>+			u32_get_bits(info[0],</div><div class='add'>+				     HAL_TX_FES_STATUS_END_INFO0_START_TIMESTAMP_31_16);</div><div class='add'>+</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.ppdu_ts = (tst_15_0 | (tst_31_16 &lt;&lt; 16));</div><div class='add'>+		status = DP_MON_TX_FES_STATUS_END;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case HAL_RX_RESPONSE_REQUIRED_INFO: {</div><div class='add'>+		const struct hal_rx_resp_req_info *rx_resp_req_info = tlv_data;</div><div class='add'>+		u32 addr_32;</div><div class='add'>+		u16 addr_16;</div><div class='add'>+</div><div class='add'>+		info[0] = __le32_to_cpu(rx_resp_req_info-&gt;info0);</div><div class='add'>+		info[1] = __le32_to_cpu(rx_resp_req_info-&gt;info1);</div><div class='add'>+		info[2] = __le32_to_cpu(rx_resp_req_info-&gt;info2);</div><div class='add'>+		info[3] = __le32_to_cpu(rx_resp_req_info-&gt;info3);</div><div class='add'>+		info[4] = __le32_to_cpu(rx_resp_req_info-&gt;info4);</div><div class='add'>+		info[5] = __le32_to_cpu(rx_resp_req_info-&gt;info5);</div><div class='add'>+</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.ppdu_id =</div><div class='add'>+			u32_get_bits(info[0], HAL_RX_RESP_REQ_INFO0_PPDU_ID);</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.reception_type =</div><div class='add'>+			u32_get_bits(info[0], HAL_RX_RESP_REQ_INFO0_RECEPTION_TYPE);</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.rx_duration =</div><div class='add'>+			u32_get_bits(info[1], HAL_RX_RESP_REQ_INFO1_DURATION);</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.mcs =</div><div class='add'>+			u32_get_bits(info[1], HAL_RX_RESP_REQ_INFO1_RATE_MCS);</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.sgi =</div><div class='add'>+			u32_get_bits(info[1], HAL_RX_RESP_REQ_INFO1_SGI);</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.is_stbc =</div><div class='add'>+			u32_get_bits(info[1], HAL_RX_RESP_REQ_INFO1_STBC);</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.ldpc =</div><div class='add'>+			u32_get_bits(info[1], HAL_RX_RESP_REQ_INFO1_LDPC);</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.is_ampdu =</div><div class='add'>+			u32_get_bits(info[1], HAL_RX_RESP_REQ_INFO1_IS_AMPDU);</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.num_users =</div><div class='add'>+			u32_get_bits(info[2], HAL_RX_RESP_REQ_INFO2_NUM_USER);</div><div class='add'>+</div><div class='add'>+		addr_32 = u32_get_bits(info[3], HAL_RX_RESP_REQ_INFO3_ADDR1_31_0);</div><div class='add'>+		addr_16 = u32_get_bits(info[3], HAL_RX_RESP_REQ_INFO4_ADDR1_47_32);</div><div class='add'>+		ath12k_dp_get_mac_addr(addr_32, addr_16, tx_ppdu_info-&gt;rx_status.addr1);</div><div class='add'>+</div><div class='add'>+		addr_16 = u32_get_bits(info[4], HAL_RX_RESP_REQ_INFO4_ADDR1_15_0);</div><div class='add'>+		addr_32 = u32_get_bits(info[5], HAL_RX_RESP_REQ_INFO5_ADDR1_47_16);</div><div class='add'>+		ath12k_dp_get_mac_addr(addr_32, addr_16, tx_ppdu_info-&gt;rx_status.addr2);</div><div class='add'>+</div><div class='add'>+		if (tx_ppdu_info-&gt;rx_status.reception_type == 0)</div><div class='add'>+			ath12k_dp_mon_tx_gen_cts2self_frame(tx_ppdu_info);</div><div class='add'>+		status = DP_MON_RX_RESPONSE_REQUIRED_INFO;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case HAL_PCU_PPDU_SETUP_INIT: {</div><div class='add'>+		const struct hal_tx_pcu_ppdu_setup_init *ppdu_setup = tlv_data;</div><div class='add'>+		u32 addr_32;</div><div class='add'>+		u16 addr_16;</div><div class='add'>+</div><div class='add'>+		info[0] = __le32_to_cpu(ppdu_setup-&gt;info0);</div><div class='add'>+		info[1] = __le32_to_cpu(ppdu_setup-&gt;info1);</div><div class='add'>+		info[2] = __le32_to_cpu(ppdu_setup-&gt;info2);</div><div class='add'>+		info[3] = __le32_to_cpu(ppdu_setup-&gt;info3);</div><div class='add'>+		info[4] = __le32_to_cpu(ppdu_setup-&gt;info4);</div><div class='add'>+		info[5] = __le32_to_cpu(ppdu_setup-&gt;info5);</div><div class='add'>+		info[6] = __le32_to_cpu(ppdu_setup-&gt;info6);</div><div class='add'>+</div><div class='add'>+		/* protection frame address 1 */</div><div class='add'>+		addr_32 = u32_get_bits(info[1],</div><div class='add'>+				       HAL_TX_PPDU_SETUP_INFO1_PROT_FRAME_ADDR1_31_0);</div><div class='add'>+		addr_16 = u32_get_bits(info[2],</div><div class='add'>+				       HAL_TX_PPDU_SETUP_INFO2_PROT_FRAME_ADDR1_47_32);</div><div class='add'>+		ath12k_dp_get_mac_addr(addr_32, addr_16, tx_ppdu_info-&gt;rx_status.addr1);</div><div class='add'>+</div><div class='add'>+		/* protection frame address 2 */</div><div class='add'>+		addr_16 = u32_get_bits(info[2],</div><div class='add'>+				       HAL_TX_PPDU_SETUP_INFO2_PROT_FRAME_ADDR2_15_0);</div><div class='add'>+		addr_32 = u32_get_bits(info[3],</div><div class='add'>+				       HAL_TX_PPDU_SETUP_INFO3_PROT_FRAME_ADDR2_47_16);</div><div class='add'>+		ath12k_dp_get_mac_addr(addr_32, addr_16, tx_ppdu_info-&gt;rx_status.addr2);</div><div class='add'>+</div><div class='add'>+		/* protection frame address 3 */</div><div class='add'>+		addr_32 = u32_get_bits(info[4],</div><div class='add'>+				       HAL_TX_PPDU_SETUP_INFO4_PROT_FRAME_ADDR3_31_0);</div><div class='add'>+		addr_16 = u32_get_bits(info[5],</div><div class='add'>+				       HAL_TX_PPDU_SETUP_INFO5_PROT_FRAME_ADDR3_47_32);</div><div class='add'>+		ath12k_dp_get_mac_addr(addr_32, addr_16, tx_ppdu_info-&gt;rx_status.addr3);</div><div class='add'>+</div><div class='add'>+		/* protection frame address 4 */</div><div class='add'>+		addr_16 = u32_get_bits(info[5],</div><div class='add'>+				       HAL_TX_PPDU_SETUP_INFO5_PROT_FRAME_ADDR4_15_0);</div><div class='add'>+		addr_32 = u32_get_bits(info[6],</div><div class='add'>+				       HAL_TX_PPDU_SETUP_INFO6_PROT_FRAME_ADDR4_47_16);</div><div class='add'>+		ath12k_dp_get_mac_addr(addr_32, addr_16, tx_ppdu_info-&gt;rx_status.addr4);</div><div class='add'>+</div><div class='add'>+		status = u32_get_bits(info[0],</div><div class='add'>+				      HAL_TX_PPDU_SETUP_INFO0_MEDIUM_PROT_TYPE);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case HAL_TX_QUEUE_EXTENSION: {</div><div class='add'>+		const struct hal_tx_queue_exten *tx_q_exten = tlv_data;</div><div class='add'>+</div><div class='add'>+		info[0] = __le32_to_cpu(tx_q_exten-&gt;info0);</div><div class='add'>+</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.frame_control =</div><div class='add'>+			u32_get_bits(info[0],</div><div class='add'>+				     HAL_TX_Q_EXT_INFO0_FRAME_CTRL);</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.fc_valid = true;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case HAL_TX_FES_STATUS_START: {</div><div class='add'>+		const struct hal_tx_fes_status_start *tx_fes_start = tlv_data;</div><div class='add'>+</div><div class='add'>+		info[0] = __le32_to_cpu(tx_fes_start-&gt;info0);</div><div class='add'>+</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.medium_prot_type =</div><div class='add'>+			u32_get_bits(info[0],</div><div class='add'>+				     HAL_TX_FES_STATUS_START_INFO0_MEDIUM_PROT_TYPE);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case HAL_TX_FES_STATUS_PROT: {</div><div class='add'>+		const struct hal_tx_fes_status_prot *tx_fes_status = tlv_data;</div><div class='add'>+		u32 start_timestamp;</div><div class='add'>+		u32 end_timestamp;</div><div class='add'>+</div><div class='add'>+		info[0] = __le32_to_cpu(tx_fes_status-&gt;info0);</div><div class='add'>+		info[1] = __le32_to_cpu(tx_fes_status-&gt;info1);</div><div class='add'>+</div><div class='add'>+		start_timestamp =</div><div class='add'>+			u32_get_bits(info[0],</div><div class='add'>+				     HAL_TX_FES_STAT_PROT_INFO0_STRT_FRM_TS_15_0);</div><div class='add'>+		start_timestamp |=</div><div class='add'>+			u32_get_bits(info[0],</div><div class='add'>+				     HAL_TX_FES_STAT_PROT_INFO0_STRT_FRM_TS_31_16) &lt;&lt; 15;</div><div class='add'>+		end_timestamp =</div><div class='add'>+			u32_get_bits(info[1],</div><div class='add'>+				     HAL_TX_FES_STAT_PROT_INFO1_END_FRM_TS_15_0);</div><div class='add'>+		end_timestamp |=</div><div class='add'>+			u32_get_bits(info[1],</div><div class='add'>+				     HAL_TX_FES_STAT_PROT_INFO1_END_FRM_TS_31_16) &lt;&lt; 15;</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.rx_duration = end_timestamp - start_timestamp;</div><div class='add'>+</div><div class='add'>+		ath12k_dp_mon_tx_gen_prot_frame(tx_ppdu_info);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case HAL_TX_FES_STATUS_START_PPDU:</div><div class='add'>+	case HAL_TX_FES_STATUS_START_PROT: {</div><div class='add'>+		const struct hal_tx_fes_status_start_prot *tx_fes_stat_start = tlv_data;</div><div class='add'>+		u64 ppdu_ts;</div><div class='add'>+</div><div class='add'>+		info[0] = __le32_to_cpu(tx_fes_stat_start-&gt;info0);</div><div class='add'>+</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.ppdu_ts =</div><div class='add'>+			u32_get_bits(info[0],</div><div class='add'>+				     HAL_TX_FES_STAT_STRT_INFO0_PROT_TS_LOWER_32);</div><div class='add'>+		ppdu_ts = (u32_get_bits(info[1],</div><div class='add'>+					HAL_TX_FES_STAT_STRT_INFO1_PROT_TS_UPPER_32));</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.ppdu_ts |= ppdu_ts &lt;&lt; 32;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case HAL_TX_FES_STATUS_USER_PPDU: {</div><div class='add'>+		const struct hal_tx_fes_status_user_ppdu *tx_fes_usr_ppdu = tlv_data;</div><div class='add'>+</div><div class='add'>+		info[0] = __le32_to_cpu(tx_fes_usr_ppdu-&gt;info0);</div><div class='add'>+</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.rx_duration =</div><div class='add'>+			u32_get_bits(info[0],</div><div class='add'>+				     HAL_TX_FES_STAT_USR_PPDU_INFO0_DURATION);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case HAL_MACTX_HE_SIG_A_SU:</div><div class='add'>+		ath12k_dp_mon_parse_he_sig_su(tlv_data, &amp;tx_ppdu_info-&gt;rx_status);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HAL_MACTX_HE_SIG_A_MU_DL:</div><div class='add'>+		ath12k_dp_mon_parse_he_sig_mu(tlv_data, &amp;tx_ppdu_info-&gt;rx_status);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HAL_MACTX_HE_SIG_B1_MU:</div><div class='add'>+		ath12k_dp_mon_parse_he_sig_b1_mu(tlv_data, &amp;tx_ppdu_info-&gt;rx_status);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HAL_MACTX_HE_SIG_B2_MU:</div><div class='add'>+		ath12k_dp_mon_parse_he_sig_b2_mu(tlv_data, &amp;tx_ppdu_info-&gt;rx_status);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HAL_MACTX_HE_SIG_B2_OFDMA:</div><div class='add'>+		ath12k_dp_mon_parse_he_sig_b2_ofdma(tlv_data, &amp;tx_ppdu_info-&gt;rx_status);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HAL_MACTX_VHT_SIG_A:</div><div class='add'>+		ath12k_dp_mon_parse_vht_sig_a(tlv_data, &amp;tx_ppdu_info-&gt;rx_status);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HAL_MACTX_L_SIG_A:</div><div class='add'>+		ath12k_dp_mon_parse_l_sig_a(tlv_data, &amp;tx_ppdu_info-&gt;rx_status);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HAL_MACTX_L_SIG_B:</div><div class='add'>+		ath12k_dp_mon_parse_l_sig_b(tlv_data, &amp;tx_ppdu_info-&gt;rx_status);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HAL_RX_FRAME_BITMAP_ACK: {</div><div class='add'>+		const struct hal_rx_frame_bitmap_ack *fbm_ack = tlv_data;</div><div class='add'>+		u32 addr_32;</div><div class='add'>+		u16 addr_16;</div><div class='add'>+</div><div class='add'>+		info[0] = __le32_to_cpu(fbm_ack-&gt;info0);</div><div class='add'>+		info[1] = __le32_to_cpu(fbm_ack-&gt;info1);</div><div class='add'>+</div><div class='add'>+		addr_32 = u32_get_bits(info[0],</div><div class='add'>+				       HAL_RX_FBM_ACK_INFO0_ADDR1_31_0);</div><div class='add'>+		addr_16 = u32_get_bits(info[1],</div><div class='add'>+				       HAL_RX_FBM_ACK_INFO1_ADDR1_47_32);</div><div class='add'>+		ath12k_dp_get_mac_addr(addr_32, addr_16, tx_ppdu_info-&gt;rx_status.addr1);</div><div class='add'>+</div><div class='add'>+		ath12k_dp_mon_tx_gen_ack_frame(tx_ppdu_info);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case HAL_MACTX_PHY_DESC: {</div><div class='add'>+		const struct hal_tx_phy_desc *tx_phy_desc = tlv_data;</div><div class='add'>+</div><div class='add'>+		info[0] = __le32_to_cpu(tx_phy_desc-&gt;info0);</div><div class='add'>+		info[1] = __le32_to_cpu(tx_phy_desc-&gt;info1);</div><div class='add'>+		info[2] = __le32_to_cpu(tx_phy_desc-&gt;info2);</div><div class='add'>+		info[3] = __le32_to_cpu(tx_phy_desc-&gt;info3);</div><div class='add'>+</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.beamformed =</div><div class='add'>+			u32_get_bits(info[0],</div><div class='add'>+				     HAL_TX_PHY_DESC_INFO0_BF_TYPE);</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.preamble_type =</div><div class='add'>+			u32_get_bits(info[0],</div><div class='add'>+				     HAL_TX_PHY_DESC_INFO0_PREAMBLE_11B);</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.mcs =</div><div class='add'>+			u32_get_bits(info[1],</div><div class='add'>+				     HAL_TX_PHY_DESC_INFO1_MCS);</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.ltf_size =</div><div class='add'>+			u32_get_bits(info[3],</div><div class='add'>+				     HAL_TX_PHY_DESC_INFO3_LTF_SIZE);</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.nss =</div><div class='add'>+			u32_get_bits(info[2],</div><div class='add'>+				     HAL_TX_PHY_DESC_INFO2_NSS);</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.chan_num =</div><div class='add'>+			u32_get_bits(info[3],</div><div class='add'>+				     HAL_TX_PHY_DESC_INFO3_ACTIVE_CHANNEL);</div><div class='add'>+		tx_ppdu_info-&gt;rx_status.bw =</div><div class='add'>+			u32_get_bits(info[0],</div><div class='add'>+				     HAL_TX_PHY_DESC_INFO0_BANDWIDTH);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case HAL_TX_MPDU_START: {</div><div class='add'>+		struct dp_mon_mpdu *mon_mpdu = tx_ppdu_info-&gt;tx_mon_mpdu;</div><div class='add'>+</div><div class='add'>+		mon_mpdu = kzalloc(sizeof(*mon_mpdu), GFP_ATOMIC);</div><div class='add'>+		if (!mon_mpdu)</div><div class='add'>+			return DP_MON_TX_STATUS_PPDU_NOT_DONE;</div><div class='add'>+		status = DP_MON_TX_MPDU_START;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case HAL_TX_MPDU_END:</div><div class='add'>+		list_add_tail(&amp;tx_ppdu_info-&gt;tx_mon_mpdu-&gt;list,</div><div class='add'>+			      &amp;tx_ppdu_info-&gt;dp_tx_mon_mpdu_list);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum dp_mon_tx_tlv_status</div><div class='add'>+ath12k_dp_mon_tx_status_get_num_user(u16 tlv_tag,</div><div class='add'>+				     struct hal_tlv_hdr *tx_tlv,</div><div class='add'>+				     u8 *num_users)</div><div class='add'>+{</div><div class='add'>+	u32 tlv_status = DP_MON_TX_STATUS_PPDU_NOT_DONE;</div><div class='add'>+	u32 info0;</div><div class='add'>+</div><div class='add'>+	switch (tlv_tag) {</div><div class='add'>+	case HAL_TX_FES_SETUP: {</div><div class='add'>+		struct hal_tx_fes_setup *tx_fes_setup =</div><div class='add'>+				(struct hal_tx_fes_setup *)tx_tlv;</div><div class='add'>+</div><div class='add'>+		info0 = __le32_to_cpu(tx_fes_setup-&gt;info0);</div><div class='add'>+</div><div class='add'>+		*num_users = u32_get_bits(info0, HAL_TX_FES_SETUP_INFO0_NUM_OF_USERS);</div><div class='add'>+		tlv_status = DP_MON_TX_FES_SETUP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case HAL_RX_RESPONSE_REQUIRED_INFO: {</div><div class='add'>+		/* TODO: need to update *num_users */</div><div class='add'>+		tlv_status = DP_MON_RX_RESPONSE_REQUIRED_INFO;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return tlv_status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_tx_process_ppdu_info(struct ath12k *ar,</div><div class='add'>+				   struct napi_struct *napi,</div><div class='add'>+				   struct dp_mon_tx_ppdu_info *tx_ppdu_info)</div><div class='add'>+{</div><div class='add'>+	struct dp_mon_mpdu *tmp, *mon_mpdu;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(mon_mpdu, tmp,</div><div class='add'>+				 &amp;tx_ppdu_info-&gt;dp_tx_mon_mpdu_list, list) {</div><div class='add'>+		list_del(&amp;mon_mpdu-&gt;list);</div><div class='add'>+</div><div class='add'>+		if (mon_mpdu-&gt;head)</div><div class='add'>+			ath12k_dp_mon_rx_deliver(ar, mon_mpdu,</div><div class='add'>+						 &amp;tx_ppdu_info-&gt;rx_status, napi);</div><div class='add'>+</div><div class='add'>+		kfree(mon_mpdu);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum hal_rx_mon_status</div><div class='add'>+ath12k_dp_mon_tx_parse_mon_status(struct ath12k *ar,</div><div class='add'>+				  struct ath12k_mon_data *pmon,</div><div class='add'>+				  struct sk_buff *skb,</div><div class='add'>+				  struct napi_struct *napi,</div><div class='add'>+				  u32 ppdu_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct dp_mon_tx_ppdu_info *tx_prot_ppdu_info, *tx_data_ppdu_info;</div><div class='add'>+	struct hal_tlv_hdr *tlv;</div><div class='add'>+	u8 *ptr = skb-&gt;data;</div><div class='add'>+	u16 tlv_tag;</div><div class='add'>+	u16 tlv_len;</div><div class='add'>+	u32 tlv_userid = 0;</div><div class='add'>+	u8 num_user;</div><div class='add'>+	u32 tlv_status = DP_MON_TX_STATUS_PPDU_NOT_DONE;</div><div class='add'>+</div><div class='add'>+	tx_prot_ppdu_info = ath12k_dp_mon_tx_get_ppdu_info(pmon, ppdu_id,</div><div class='add'>+							   DP_MON_TX_PROT_PPDU_INFO);</div><div class='add'>+	if (!tx_prot_ppdu_info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	tlv = (struct hal_tlv_hdr *)ptr;</div><div class='add'>+	tlv_tag = le32_get_bits(tlv-&gt;tl, HAL_TLV_HDR_TAG);</div><div class='add'>+</div><div class='add'>+	tlv_status = ath12k_dp_mon_tx_status_get_num_user(tlv_tag, tlv, &amp;num_user);</div><div class='add'>+	if (tlv_status == DP_MON_TX_STATUS_PPDU_NOT_DONE || !num_user)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	tx_data_ppdu_info = ath12k_dp_mon_tx_get_ppdu_info(pmon, ppdu_id,</div><div class='add'>+							   DP_MON_TX_DATA_PPDU_INFO);</div><div class='add'>+	if (!tx_data_ppdu_info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		tlv = (struct hal_tlv_hdr *)ptr;</div><div class='add'>+		tlv_tag = le32_get_bits(tlv-&gt;tl, HAL_TLV_HDR_TAG);</div><div class='add'>+		tlv_len = le32_get_bits(tlv-&gt;tl, HAL_TLV_HDR_LEN);</div><div class='add'>+		tlv_userid = le32_get_bits(tlv-&gt;tl, HAL_TLV_USR_ID);</div><div class='add'>+</div><div class='add'>+		tlv_status = ath12k_dp_mon_tx_parse_status_tlv(ab, pmon,</div><div class='add'>+							       tlv_tag, ptr,</div><div class='add'>+							       tlv_userid);</div><div class='add'>+		ptr += tlv_len;</div><div class='add'>+		ptr = PTR_ALIGN(ptr, HAL_TLV_ALIGN);</div><div class='add'>+		if ((ptr - skb-&gt;data) &gt;= DP_TX_MONITOR_BUF_SIZE)</div><div class='add'>+			break;</div><div class='add'>+	} while (tlv_status != DP_MON_TX_FES_STATUS_END);</div><div class='add'>+</div><div class='add'>+	ath12k_dp_mon_tx_process_ppdu_info(ar, napi, tx_data_ppdu_info);</div><div class='add'>+	ath12k_dp_mon_tx_process_ppdu_info(ar, napi, tx_prot_ppdu_info);</div><div class='add'>+</div><div class='add'>+	return tlv_status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_rx_update_peer_rate_table_stats(struct ath12k_rx_peer_stats *rx_stats,</div><div class='add'>+					      struct hal_rx_mon_ppdu_info *ppdu_info,</div><div class='add'>+					      struct hal_rx_user_status *user_stats,</div><div class='add'>+					      u32 num_msdu)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_rx_peer_rate_stats *stats;</div><div class='add'>+	u32 mcs_idx = (user_stats) ? user_stats-&gt;mcs : ppdu_info-&gt;mcs;</div><div class='add'>+	u32 nss_idx = (user_stats) ? user_stats-&gt;nss - 1 : ppdu_info-&gt;nss - 1;</div><div class='add'>+	u32 bw_idx = ppdu_info-&gt;bw;</div><div class='add'>+	u32 gi_idx = ppdu_info-&gt;gi;</div><div class='add'>+	u32 len;</div><div class='add'>+</div><div class='add'>+	if (mcs_idx &gt; HAL_RX_MAX_MCS_HT || nss_idx &gt;= HAL_RX_MAX_NSS ||</div><div class='add'>+	    bw_idx &gt;= HAL_RX_BW_MAX || gi_idx &gt;= HAL_RX_GI_MAX) {</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;preamble_type == HAL_RX_PREAMBLE_11AX ||</div><div class='add'>+	    ppdu_info-&gt;preamble_type == HAL_RX_PREAMBLE_11BE)</div><div class='add'>+		gi_idx = ath12k_he_gi_to_nl80211_he_gi(ppdu_info-&gt;gi);</div><div class='add'>+</div><div class='add'>+	rx_stats-&gt;pkt_stats.rx_rate[bw_idx][gi_idx][nss_idx][mcs_idx] += num_msdu;</div><div class='add'>+	stats = &amp;rx_stats-&gt;byte_stats;</div><div class='add'>+</div><div class='add'>+	if (user_stats)</div><div class='add'>+		len = user_stats-&gt;mpdu_ok_byte_count;</div><div class='add'>+	else</div><div class='add'>+		len = ppdu_info-&gt;mpdu_len;</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_rate[bw_idx][gi_idx][nss_idx][mcs_idx] += len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_mon_rx_update_peer_su_stats(struct ath12k *ar,</div><div class='add'>+						  struct ath12k_link_sta *arsta,</div><div class='add'>+						  struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_rx_peer_stats *rx_stats = arsta-&gt;rx_stats;</div><div class='add'>+	u32 num_msdu;</div><div class='add'>+</div><div class='add'>+	arsta-&gt;rssi_comb = ppdu_info-&gt;rssi_comb;</div><div class='add'>+	ewma_avg_rssi_add(&amp;arsta-&gt;avg_rssi, ppdu_info-&gt;rssi_comb);</div><div class='add'>+	if (!rx_stats)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	num_msdu = ppdu_info-&gt;tcp_msdu_count + ppdu_info-&gt;tcp_ack_msdu_count +</div><div class='add'>+		   ppdu_info-&gt;udp_msdu_count + ppdu_info-&gt;other_msdu_count;</div><div class='add'>+</div><div class='add'>+	rx_stats-&gt;num_msdu += num_msdu;</div><div class='add'>+	rx_stats-&gt;tcp_msdu_count += ppdu_info-&gt;tcp_msdu_count +</div><div class='add'>+				    ppdu_info-&gt;tcp_ack_msdu_count;</div><div class='add'>+	rx_stats-&gt;udp_msdu_count += ppdu_info-&gt;udp_msdu_count;</div><div class='add'>+	rx_stats-&gt;other_msdu_count += ppdu_info-&gt;other_msdu_count;</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;preamble_type == HAL_RX_PREAMBLE_11A ||</div><div class='add'>+	    ppdu_info-&gt;preamble_type == HAL_RX_PREAMBLE_11B) {</div><div class='add'>+		ppdu_info-&gt;nss = 1;</div><div class='add'>+		ppdu_info-&gt;mcs = HAL_RX_MAX_MCS;</div><div class='add'>+		ppdu_info-&gt;tid = IEEE80211_NUM_TIDS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;ldpc &lt; HAL_RX_SU_MU_CODING_MAX)</div><div class='add'>+		rx_stats-&gt;coding_count[ppdu_info-&gt;ldpc] += num_msdu;</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;tid &lt;= IEEE80211_NUM_TIDS)</div><div class='add'>+		rx_stats-&gt;tid_count[ppdu_info-&gt;tid] += num_msdu;</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;preamble_type &lt; HAL_RX_PREAMBLE_MAX)</div><div class='add'>+		rx_stats-&gt;pream_cnt[ppdu_info-&gt;preamble_type] += num_msdu;</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;reception_type &lt; HAL_RX_RECEPTION_TYPE_MAX)</div><div class='add'>+		rx_stats-&gt;reception_type[ppdu_info-&gt;reception_type] += num_msdu;</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;is_stbc)</div><div class='add'>+		rx_stats-&gt;stbc_count += num_msdu;</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;beamformed)</div><div class='add'>+		rx_stats-&gt;beamformed_count += num_msdu;</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;num_mpdu_fcs_ok &gt; 1)</div><div class='add'>+		rx_stats-&gt;ampdu_msdu_count += num_msdu;</div><div class='add'>+	else</div><div class='add'>+		rx_stats-&gt;non_ampdu_msdu_count += num_msdu;</div><div class='add'>+</div><div class='add'>+	rx_stats-&gt;num_mpdu_fcs_ok += ppdu_info-&gt;num_mpdu_fcs_ok;</div><div class='add'>+	rx_stats-&gt;num_mpdu_fcs_err += ppdu_info-&gt;num_mpdu_fcs_err;</div><div class='add'>+	rx_stats-&gt;dcm_count += ppdu_info-&gt;dcm;</div><div class='add'>+</div><div class='add'>+	rx_stats-&gt;rx_duration += ppdu_info-&gt;rx_duration;</div><div class='add'>+	arsta-&gt;rx_duration = rx_stats-&gt;rx_duration;</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;nss &gt; 0 &amp;&amp; ppdu_info-&gt;nss &lt;= HAL_RX_MAX_NSS) {</div><div class='add'>+		rx_stats-&gt;pkt_stats.nss_count[ppdu_info-&gt;nss - 1] += num_msdu;</div><div class='add'>+		rx_stats-&gt;byte_stats.nss_count[ppdu_info-&gt;nss - 1] += ppdu_info-&gt;mpdu_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;preamble_type == HAL_RX_PREAMBLE_11N &amp;&amp;</div><div class='add'>+	    ppdu_info-&gt;mcs &lt;= HAL_RX_MAX_MCS_HT) {</div><div class='add'>+		rx_stats-&gt;pkt_stats.ht_mcs_count[ppdu_info-&gt;mcs] += num_msdu;</div><div class='add'>+		rx_stats-&gt;byte_stats.ht_mcs_count[ppdu_info-&gt;mcs] += ppdu_info-&gt;mpdu_len;</div><div class='add'>+		/* To fit into rate table for HT packets */</div><div class='add'>+		ppdu_info-&gt;mcs = ppdu_info-&gt;mcs % 8;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;preamble_type == HAL_RX_PREAMBLE_11AC &amp;&amp;</div><div class='add'>+	    ppdu_info-&gt;mcs &lt;= HAL_RX_MAX_MCS_VHT) {</div><div class='add'>+		rx_stats-&gt;pkt_stats.vht_mcs_count[ppdu_info-&gt;mcs] += num_msdu;</div><div class='add'>+		rx_stats-&gt;byte_stats.vht_mcs_count[ppdu_info-&gt;mcs] += ppdu_info-&gt;mpdu_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;preamble_type == HAL_RX_PREAMBLE_11AX &amp;&amp;</div><div class='add'>+	    ppdu_info-&gt;mcs &lt;= HAL_RX_MAX_MCS_HE) {</div><div class='add'>+		rx_stats-&gt;pkt_stats.he_mcs_count[ppdu_info-&gt;mcs] += num_msdu;</div><div class='add'>+		rx_stats-&gt;byte_stats.he_mcs_count[ppdu_info-&gt;mcs] += ppdu_info-&gt;mpdu_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;preamble_type == HAL_RX_PREAMBLE_11BE &amp;&amp;</div><div class='add'>+	    ppdu_info-&gt;mcs &lt;= HAL_RX_MAX_MCS_BE) {</div><div class='add'>+		rx_stats-&gt;pkt_stats.be_mcs_count[ppdu_info-&gt;mcs] += num_msdu;</div><div class='add'>+		rx_stats-&gt;byte_stats.be_mcs_count[ppdu_info-&gt;mcs] += ppdu_info-&gt;mpdu_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((ppdu_info-&gt;preamble_type == HAL_RX_PREAMBLE_11A ||</div><div class='add'>+	     ppdu_info-&gt;preamble_type == HAL_RX_PREAMBLE_11B) &amp;&amp;</div><div class='add'>+	     ppdu_info-&gt;rate &lt; HAL_RX_LEGACY_RATE_INVALID) {</div><div class='add'>+		rx_stats-&gt;pkt_stats.legacy_count[ppdu_info-&gt;rate] += num_msdu;</div><div class='add'>+		rx_stats-&gt;byte_stats.legacy_count[ppdu_info-&gt;rate] += ppdu_info-&gt;mpdu_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;gi &lt; HAL_RX_GI_MAX) {</div><div class='add'>+		rx_stats-&gt;pkt_stats.gi_count[ppdu_info-&gt;gi] += num_msdu;</div><div class='add'>+		rx_stats-&gt;byte_stats.gi_count[ppdu_info-&gt;gi] += ppdu_info-&gt;mpdu_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;bw &lt; HAL_RX_BW_MAX) {</div><div class='add'>+		rx_stats-&gt;pkt_stats.bw_count[ppdu_info-&gt;bw] += num_msdu;</div><div class='add'>+		rx_stats-&gt;byte_stats.bw_count[ppdu_info-&gt;bw] += ppdu_info-&gt;mpdu_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dp_mon_rx_update_peer_rate_table_stats(rx_stats, ppdu_info,</div><div class='add'>+						      NULL, num_msdu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_mon_rx_process_ulofdma(struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	struct hal_rx_user_status *rx_user_status;</div><div class='add'>+	u32 num_users, i, mu_ul_user_v0_word0, mu_ul_user_v0_word1, ru_size;</div><div class='add'>+</div><div class='add'>+	if (!(ppdu_info-&gt;reception_type == HAL_RX_RECEPTION_TYPE_MU_MIMO ||</div><div class='add'>+	      ppdu_info-&gt;reception_type == HAL_RX_RECEPTION_TYPE_MU_OFDMA ||</div><div class='add'>+	      ppdu_info-&gt;reception_type == HAL_RX_RECEPTION_TYPE_MU_OFDMA_MIMO))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	num_users = ppdu_info-&gt;num_users;</div><div class='add'>+	if (num_users &gt; HAL_MAX_UL_MU_USERS)</div><div class='add'>+		num_users = HAL_MAX_UL_MU_USERS;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_users; i++) {</div><div class='add'>+		rx_user_status = &amp;ppdu_info-&gt;userstats[i];</div><div class='add'>+		mu_ul_user_v0_word0 =</div><div class='add'>+			rx_user_status-&gt;ul_ofdma_user_v0_word0;</div><div class='add'>+		mu_ul_user_v0_word1 =</div><div class='add'>+			rx_user_status-&gt;ul_ofdma_user_v0_word1;</div><div class='add'>+</div><div class='add'>+		if (u32_get_bits(mu_ul_user_v0_word0,</div><div class='add'>+				 HAL_RX_UL_OFDMA_USER_INFO_V0_W0_VALID) &amp;&amp;</div><div class='add'>+		    !u32_get_bits(mu_ul_user_v0_word0,</div><div class='add'>+				  HAL_RX_UL_OFDMA_USER_INFO_V0_W0_VER)) {</div><div class='add'>+			rx_user_status-&gt;mcs =</div><div class='add'>+				u32_get_bits(mu_ul_user_v0_word1,</div><div class='add'>+					     HAL_RX_UL_OFDMA_USER_INFO_V0_W1_MCS);</div><div class='add'>+			rx_user_status-&gt;nss =</div><div class='add'>+				u32_get_bits(mu_ul_user_v0_word1,</div><div class='add'>+					     HAL_RX_UL_OFDMA_USER_INFO_V0_W1_NSS) + 1;</div><div class='add'>+</div><div class='add'>+			rx_user_status-&gt;ofdma_info_valid = 1;</div><div class='add'>+			rx_user_status-&gt;ul_ofdma_ru_start_index =</div><div class='add'>+				u32_get_bits(mu_ul_user_v0_word1,</div><div class='add'>+					     HAL_RX_UL_OFDMA_USER_INFO_V0_W1_RU_START);</div><div class='add'>+</div><div class='add'>+			ru_size = u32_get_bits(mu_ul_user_v0_word1,</div><div class='add'>+					       HAL_RX_UL_OFDMA_USER_INFO_V0_W1_RU_SIZE);</div><div class='add'>+			rx_user_status-&gt;ul_ofdma_ru_width = ru_size;</div><div class='add'>+			rx_user_status-&gt;ul_ofdma_ru_size = ru_size;</div><div class='add'>+		}</div><div class='add'>+		rx_user_status-&gt;ldpc = u32_get_bits(mu_ul_user_v0_word1,</div><div class='add'>+						    HAL_RX_UL_OFDMA_USER_INFO_V0_W1_LDPC);</div><div class='add'>+	}</div><div class='add'>+	ppdu_info-&gt;ldpc = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_rx_update_user_stats(struct ath12k *ar,</div><div class='add'>+				   struct hal_rx_mon_ppdu_info *ppdu_info,</div><div class='add'>+				   u32 uid)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	struct ath12k_rx_peer_stats *rx_stats = NULL;</div><div class='add'>+	struct hal_rx_user_status *user_stats = &amp;ppdu_info-&gt;userstats[uid];</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	u32 num_msdu;</div><div class='add'>+</div><div class='add'>+	if (user_stats-&gt;ast_index == 0 || user_stats-&gt;ast_index == 0xFFFF)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	peer = ath12k_peer_find_by_ast(ar-&gt;ab, user_stats-&gt;ast_index);</div><div class='add'>+</div><div class='add'>+	if (!peer) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "peer ast idx %d can't be found\n",</div><div class='add'>+			    user_stats-&gt;ast_index);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arsta = ath12k_peer_get_link_sta(ar-&gt;ab, peer);</div><div class='add'>+	if (!arsta) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "link sta not found on peer %pM id %d\n",</div><div class='add'>+			    peer-&gt;addr, peer-&gt;peer_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arsta-&gt;rssi_comb = ppdu_info-&gt;rssi_comb;</div><div class='add'>+	ewma_avg_rssi_add(&amp;arsta-&gt;avg_rssi, ppdu_info-&gt;rssi_comb);</div><div class='add'>+	rx_stats = arsta-&gt;rx_stats;</div><div class='add'>+	if (!rx_stats)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	num_msdu = user_stats-&gt;tcp_msdu_count + user_stats-&gt;tcp_ack_msdu_count +</div><div class='add'>+		   user_stats-&gt;udp_msdu_count + user_stats-&gt;other_msdu_count;</div><div class='add'>+</div><div class='add'>+	rx_stats-&gt;num_msdu += num_msdu;</div><div class='add'>+	rx_stats-&gt;tcp_msdu_count += user_stats-&gt;tcp_msdu_count +</div><div class='add'>+				    user_stats-&gt;tcp_ack_msdu_count;</div><div class='add'>+	rx_stats-&gt;udp_msdu_count += user_stats-&gt;udp_msdu_count;</div><div class='add'>+	rx_stats-&gt;other_msdu_count += user_stats-&gt;other_msdu_count;</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;ldpc &lt; HAL_RX_SU_MU_CODING_MAX)</div><div class='add'>+		rx_stats-&gt;coding_count[ppdu_info-&gt;ldpc] += num_msdu;</div><div class='add'>+</div><div class='add'>+	if (user_stats-&gt;tid &lt;= IEEE80211_NUM_TIDS)</div><div class='add'>+		rx_stats-&gt;tid_count[user_stats-&gt;tid] += num_msdu;</div><div class='add'>+</div><div class='add'>+	if (user_stats-&gt;preamble_type &lt; HAL_RX_PREAMBLE_MAX)</div><div class='add'>+		rx_stats-&gt;pream_cnt[user_stats-&gt;preamble_type] += num_msdu;</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;reception_type &lt; HAL_RX_RECEPTION_TYPE_MAX)</div><div class='add'>+		rx_stats-&gt;reception_type[ppdu_info-&gt;reception_type] += num_msdu;</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;is_stbc)</div><div class='add'>+		rx_stats-&gt;stbc_count += num_msdu;</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;beamformed)</div><div class='add'>+		rx_stats-&gt;beamformed_count += num_msdu;</div><div class='add'>+</div><div class='add'>+	if (user_stats-&gt;mpdu_cnt_fcs_ok &gt; 1)</div><div class='add'>+		rx_stats-&gt;ampdu_msdu_count += num_msdu;</div><div class='add'>+	else</div><div class='add'>+		rx_stats-&gt;non_ampdu_msdu_count += num_msdu;</div><div class='add'>+</div><div class='add'>+	rx_stats-&gt;num_mpdu_fcs_ok += user_stats-&gt;mpdu_cnt_fcs_ok;</div><div class='add'>+	rx_stats-&gt;num_mpdu_fcs_err += user_stats-&gt;mpdu_cnt_fcs_err;</div><div class='add'>+	rx_stats-&gt;dcm_count += ppdu_info-&gt;dcm;</div><div class='add'>+	if (ppdu_info-&gt;reception_type == HAL_RX_RECEPTION_TYPE_MU_OFDMA ||</div><div class='add'>+	    ppdu_info-&gt;reception_type == HAL_RX_RECEPTION_TYPE_MU_OFDMA_MIMO)</div><div class='add'>+		rx_stats-&gt;ru_alloc_cnt[user_stats-&gt;ul_ofdma_ru_size] += num_msdu;</div><div class='add'>+</div><div class='add'>+	rx_stats-&gt;rx_duration += ppdu_info-&gt;rx_duration;</div><div class='add'>+	arsta-&gt;rx_duration = rx_stats-&gt;rx_duration;</div><div class='add'>+</div><div class='add'>+	if (user_stats-&gt;nss &gt; 0 &amp;&amp; user_stats-&gt;nss &lt;= HAL_RX_MAX_NSS) {</div><div class='add'>+		rx_stats-&gt;pkt_stats.nss_count[user_stats-&gt;nss - 1] += num_msdu;</div><div class='add'>+		rx_stats-&gt;byte_stats.nss_count[user_stats-&gt;nss - 1] +=</div><div class='add'>+						user_stats-&gt;mpdu_ok_byte_count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (user_stats-&gt;preamble_type == HAL_RX_PREAMBLE_11AX &amp;&amp;</div><div class='add'>+	    user_stats-&gt;mcs &lt;= HAL_RX_MAX_MCS_HE) {</div><div class='add'>+		rx_stats-&gt;pkt_stats.he_mcs_count[user_stats-&gt;mcs] += num_msdu;</div><div class='add'>+		rx_stats-&gt;byte_stats.he_mcs_count[user_stats-&gt;mcs] +=</div><div class='add'>+						user_stats-&gt;mpdu_ok_byte_count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;gi &lt; HAL_RX_GI_MAX) {</div><div class='add'>+		rx_stats-&gt;pkt_stats.gi_count[ppdu_info-&gt;gi] += num_msdu;</div><div class='add'>+		rx_stats-&gt;byte_stats.gi_count[ppdu_info-&gt;gi] +=</div><div class='add'>+						user_stats-&gt;mpdu_ok_byte_count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;bw &lt; HAL_RX_BW_MAX) {</div><div class='add'>+		rx_stats-&gt;pkt_stats.bw_count[ppdu_info-&gt;bw] += num_msdu;</div><div class='add'>+		rx_stats-&gt;byte_stats.bw_count[ppdu_info-&gt;bw] +=</div><div class='add'>+						user_stats-&gt;mpdu_ok_byte_count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dp_mon_rx_update_peer_rate_table_stats(rx_stats, ppdu_info,</div><div class='add'>+						      user_stats, num_msdu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_rx_update_peer_mu_stats(struct ath12k *ar,</div><div class='add'>+				      struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	u32 num_users, i;</div><div class='add'>+</div><div class='add'>+	num_users = ppdu_info-&gt;num_users;</div><div class='add'>+	if (num_users &gt; HAL_MAX_UL_MU_USERS)</div><div class='add'>+		num_users = HAL_MAX_UL_MU_USERS;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_users; i++)</div><div class='add'>+		ath12k_dp_mon_rx_update_user_stats(ar, ppdu_info, i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_mon_rx_memset_ppdu_info(struct hal_rx_mon_ppdu_info *ppdu_info)</div><div class='add'>+{</div><div class='add'>+	memset(ppdu_info, 0, sizeof(*ppdu_info));</div><div class='add'>+	ppdu_info-&gt;peer_id = HAL_INVALID_PEERID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_mon_srng_process(struct ath12k *ar, int *budget,</div><div class='add'>+			       struct napi_struct *napi)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_pdev_dp *pdev_dp = &amp;ar-&gt;dp;</div><div class='add'>+	struct ath12k_mon_data *pmon = (struct ath12k_mon_data *)&amp;pdev_dp-&gt;mon_data;</div><div class='add'>+	struct hal_rx_mon_ppdu_info *ppdu_info = &amp;pmon-&gt;mon_ppdu_info;</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct hal_mon_dest_desc *mon_dst_desc;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb;</div><div class='add'>+	struct dp_srng *mon_dst_ring;</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	struct dp_rxdma_mon_ring *buf_ring;</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	struct sk_buff_head skb_list;</div><div class='add'>+	u64 cookie;</div><div class='add'>+	int num_buffs_reaped = 0, srng_id, buf_id;</div><div class='add'>+	u32 hal_status, end_offset, info0, end_reason;</div><div class='add'>+	u8 pdev_idx = ath12k_hw_mac_id_to_pdev_id(ab-&gt;hw_params, ar-&gt;pdev_idx);</div><div class='add'>+</div><div class='add'>+	__skb_queue_head_init(&amp;skb_list);</div><div class='add'>+	srng_id = ath12k_hw_mac_id_to_srng_id(ab-&gt;hw_params, pdev_idx);</div><div class='add'>+	mon_dst_ring = &amp;pdev_dp-&gt;rxdma_mon_dst_ring[srng_id];</div><div class='add'>+	buf_ring = &amp;dp-&gt;rxdma_mon_buf_ring;</div><div class='add'>+</div><div class='add'>+	srng = &amp;ab-&gt;hal.srng_list[mon_dst_ring-&gt;ring_id];</div><div class='add'>+	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='add'>+	ath12k_hal_srng_access_begin(ab, srng);</div><div class='add'>+</div><div class='add'>+	while (likely(*budget)) {</div><div class='add'>+		mon_dst_desc = ath12k_hal_srng_dst_peek(ab, srng);</div><div class='add'>+		if (unlikely(!mon_dst_desc))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* In case of empty descriptor, the cookie in the ring descriptor</div><div class='add'>+		 * is invalid. Therefore, this entry is skipped, and ring processing</div><div class='add'>+		 * continues.</div><div class='add'>+		 */</div><div class='add'>+		info0 = le32_to_cpu(mon_dst_desc-&gt;info0);</div><div class='add'>+		if (u32_get_bits(info0, HAL_MON_DEST_INFO0_EMPTY_DESC))</div><div class='add'>+			goto move_next;</div><div class='add'>+</div><div class='add'>+		cookie = le32_to_cpu(mon_dst_desc-&gt;cookie);</div><div class='add'>+		buf_id = u32_get_bits(cookie, DP_RXDMA_BUF_COOKIE_BUF_ID);</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;buf_ring-&gt;idr_lock);</div><div class='add'>+		skb = idr_remove(&amp;buf_ring-&gt;bufs_idr, buf_id);</div><div class='add'>+		spin_unlock_bh(&amp;buf_ring-&gt;idr_lock);</div><div class='add'>+</div><div class='add'>+		if (unlikely(!skb)) {</div><div class='add'>+			ath12k_warn(ab, "monitor destination with invalid buf_id %d\n",</div><div class='add'>+				    buf_id);</div><div class='add'>+			goto move_next;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rxcb = ATH12K_SKB_RXCB(skb);</div><div class='add'>+		dma_unmap_single(ab-&gt;dev, rxcb-&gt;paddr,</div><div class='add'>+				 skb-&gt;len + skb_tailroom(skb),</div><div class='add'>+				 DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+		end_reason = u32_get_bits(info0, HAL_MON_DEST_INFO0_END_REASON);</div><div class='add'>+</div><div class='add'>+		/* HAL_MON_FLUSH_DETECTED implies that an rx flush received at the end of</div><div class='add'>+		 * rx PPDU and HAL_MON_PPDU_TRUNCATED implies that the PPDU got</div><div class='add'>+		 * truncated due to a system level error. In both the cases, buffer data</div><div class='add'>+		 * can be discarded</div><div class='add'>+		 */</div><div class='add'>+		if ((end_reason == HAL_MON_FLUSH_DETECTED) ||</div><div class='add'>+		    (end_reason == HAL_MON_PPDU_TRUNCATED)) {</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_DATA,</div><div class='add'>+				   "Monitor dest descriptor end reason %d", end_reason);</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			goto move_next;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Calculate the budget when the ring descriptor with the</div><div class='add'>+		 * HAL_MON_END_OF_PPDU to ensure that one PPDU worth of data is always</div><div class='add'>+		 * reaped. This helps to efficiently utilize the NAPI budget.</div><div class='add'>+		 */</div><div class='add'>+		if (end_reason == HAL_MON_END_OF_PPDU) {</div><div class='add'>+			*budget -= 1;</div><div class='add'>+			rxcb-&gt;is_end_of_ppdu = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		end_offset = u32_get_bits(info0, HAL_MON_DEST_INFO0_END_OFFSET);</div><div class='add'>+		if (likely(end_offset &lt;= DP_RX_BUFFER_SIZE)) {</div><div class='add'>+			skb_put(skb, end_offset);</div><div class='add'>+		} else {</div><div class='add'>+			ath12k_warn(ab,</div><div class='add'>+				    "invalid offset on mon stats destination %u\n",</div><div class='add'>+				    end_offset);</div><div class='add'>+			skb_put(skb, DP_RX_BUFFER_SIZE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		__skb_queue_tail(&amp;skb_list, skb);</div><div class='add'>+</div><div class='add'>+move_next:</div><div class='add'>+		ath12k_dp_mon_buf_replenish(ab, buf_ring, 1);</div><div class='add'>+		ath12k_hal_srng_dst_get_next_entry(ab, srng);</div><div class='add'>+		num_buffs_reaped++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!num_buffs_reaped)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* In some cases, one PPDU worth of data can be spread across multiple NAPI</div><div class='add'>+	 * schedules, To avoid losing existing parsed ppdu_info information, skip</div><div class='add'>+	 * the memset of the ppdu_info structure and continue processing it.</div><div class='add'>+	 */</div><div class='add'>+	if (!ppdu_info-&gt;ppdu_continuation)</div><div class='add'>+		ath12k_dp_mon_rx_memset_ppdu_info(ppdu_info);</div><div class='add'>+</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;skb_list))) {</div><div class='add'>+		hal_status = ath12k_dp_mon_rx_parse_mon_status(ar, pmon, skb, napi);</div><div class='add'>+		if (hal_status != HAL_RX_MON_STATUS_PPDU_DONE) {</div><div class='add'>+			ppdu_info-&gt;ppdu_continuation = true;</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ppdu_info-&gt;peer_id == HAL_INVALID_PEERID)</div><div class='add'>+			goto free_skb;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		peer = ath12k_peer_find_by_id(ab, ppdu_info-&gt;peer_id);</div><div class='add'>+		if (!peer || !peer-&gt;sta) {</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_DATA,</div><div class='add'>+				   "failed to find the peer with monitor peer_id %d\n",</div><div class='add'>+				   ppdu_info-&gt;peer_id);</div><div class='add'>+			goto next_skb;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ppdu_info-&gt;reception_type == HAL_RX_RECEPTION_TYPE_SU) {</div><div class='add'>+			arsta = ath12k_peer_get_link_sta(ar-&gt;ab, peer);</div><div class='add'>+			if (!arsta) {</div><div class='add'>+				ath12k_warn(ar-&gt;ab, "link sta not found on peer %pM id %d\n",</div><div class='add'>+					    peer-&gt;addr, peer-&gt;peer_id);</div><div class='add'>+				spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+				rcu_read_unlock();</div><div class='add'>+				dev_kfree_skb_any(skb);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			ath12k_dp_mon_rx_update_peer_su_stats(ar, arsta,</div><div class='add'>+							      ppdu_info);</div><div class='add'>+		} else if ((ppdu_info-&gt;fc_valid) &amp;&amp;</div><div class='add'>+			   (ppdu_info-&gt;ast_index != HAL_AST_IDX_INVALID)) {</div><div class='add'>+			ath12k_dp_mon_rx_process_ulofdma(ppdu_info);</div><div class='add'>+			ath12k_dp_mon_rx_update_peer_mu_stats(ar, ppdu_info);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+next_skb:</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+free_skb:</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		ath12k_dp_mon_rx_memset_ppdu_info(ppdu_info);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return num_buffs_reaped;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_rx_reap_mon_status_ring(struct ath12k_base *ab, int mac_id,</div><div class='add'>+					     int *budget, struct sk_buff_head *skb_list)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_hw_hal_params *hal_params;</div><div class='add'>+	int buf_id, srng_id, num_buffs_reaped = 0;</div><div class='add'>+	enum dp_mon_status_buf_state reap_status;</div><div class='add'>+	struct dp_rxdma_mon_ring *rx_ring;</div><div class='add'>+	struct ath12k_mon_data *pmon;</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb;</div><div class='add'>+	struct hal_tlv_64_hdr *tlv;</div><div class='add'>+	void *rx_mon_status_desc;</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	struct ath12k_dp *dp;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	u32 cookie;</div><div class='add'>+	u8 rbm;</div><div class='add'>+</div><div class='add'>+	ar = ab-&gt;pdevs[ath12k_hw_mac_id_to_pdev_id(ab-&gt;hw_params, mac_id)].ar;</div><div class='add'>+	dp = &amp;ab-&gt;dp;</div><div class='add'>+	pmon = &amp;ar-&gt;dp.mon_data;</div><div class='add'>+	srng_id = ath12k_hw_mac_id_to_srng_id(ab-&gt;hw_params, mac_id);</div><div class='add'>+	rx_ring = &amp;dp-&gt;rx_mon_status_refill_ring[srng_id];</div><div class='add'>+</div><div class='add'>+	srng = &amp;ab-&gt;hal.srng_list[rx_ring-&gt;refill_buf_ring.ring_id];</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_begin(ab, srng);</div><div class='add'>+</div><div class='add'>+	while (*budget) {</div><div class='add'>+		*budget -= 1;</div><div class='add'>+		rx_mon_status_desc = ath12k_hal_srng_src_peek(ab, srng);</div><div class='add'>+		if (!rx_mon_status_desc) {</div><div class='add'>+			pmon-&gt;buf_state = DP_MON_STATUS_REPLINISH;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ath12k_hal_rx_buf_addr_info_get(rx_mon_status_desc, &amp;paddr,</div><div class='add'>+						&amp;cookie, &amp;rbm);</div><div class='add'>+		if (paddr) {</div><div class='add'>+			buf_id = u32_get_bits(cookie, DP_RXDMA_BUF_COOKIE_BUF_ID);</div><div class='add'>+</div><div class='add'>+			spin_lock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+			skb = idr_find(&amp;rx_ring-&gt;bufs_idr, buf_id);</div><div class='add'>+			spin_unlock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+</div><div class='add'>+			if (!skb) {</div><div class='add'>+				ath12k_warn(ab, "rx monitor status with invalid buf_id %d\n",</div><div class='add'>+					    buf_id);</div><div class='add'>+				pmon-&gt;buf_state = DP_MON_STATUS_REPLINISH;</div><div class='add'>+				goto move_next;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			rxcb = ATH12K_SKB_RXCB(skb);</div><div class='add'>+</div><div class='add'>+			dma_sync_single_for_cpu(ab-&gt;dev, rxcb-&gt;paddr,</div><div class='add'>+						skb-&gt;len + skb_tailroom(skb),</div><div class='add'>+						DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+			tlv = (struct hal_tlv_64_hdr *)skb-&gt;data;</div><div class='add'>+			if (le64_get_bits(tlv-&gt;tl, HAL_TLV_HDR_TAG) !=</div><div class='add'>+					HAL_RX_STATUS_BUFFER_DONE) {</div><div class='add'>+				pmon-&gt;buf_state = DP_MON_STATUS_NO_DMA;</div><div class='add'>+				ath12k_warn(ab,</div><div class='add'>+					    "mon status DONE not set %llx, buf_id %d\n",</div><div class='add'>+					    le64_get_bits(tlv-&gt;tl, HAL_TLV_HDR_TAG),</div><div class='add'>+					    buf_id);</div><div class='add'>+				/* RxDMA status done bit might not be set even</div><div class='add'>+				 * though tp is moved by HW.</div><div class='add'>+				 */</div><div class='add'>+</div><div class='add'>+				/* If done status is missing:</div><div class='add'>+				 * 1. As per MAC team's suggestion,</div><div class='add'>+				 *    when HP + 1 entry is peeked and if DMA</div><div class='add'>+				 *    is not done and if HP + 2 entry's DMA done</div><div class='add'>+				 *    is set. skip HP + 1 entry and</div><div class='add'>+				 *    start processing in next interrupt.</div><div class='add'>+				 * 2. If HP + 2 entry's DMA done is not set,</div><div class='add'>+				 *    poll onto HP + 1 entry DMA done to be set.</div><div class='add'>+				 *    Check status for same buffer for next time</div><div class='add'>+				 *    dp_rx_mon_status_srng_process</div><div class='add'>+				 */</div><div class='add'>+				reap_status = ath12k_dp_rx_mon_buf_done(ab, srng,</div><div class='add'>+									rx_ring);</div><div class='add'>+				if (reap_status == DP_MON_STATUS_NO_DMA)</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				spin_lock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+				idr_remove(&amp;rx_ring-&gt;bufs_idr, buf_id);</div><div class='add'>+				spin_unlock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+</div><div class='add'>+				dma_unmap_single(ab-&gt;dev, rxcb-&gt;paddr,</div><div class='add'>+						 skb-&gt;len + skb_tailroom(skb),</div><div class='add'>+						 DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+				dev_kfree_skb_any(skb);</div><div class='add'>+				pmon-&gt;buf_state = DP_MON_STATUS_REPLINISH;</div><div class='add'>+				goto move_next;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			spin_lock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+			idr_remove(&amp;rx_ring-&gt;bufs_idr, buf_id);</div><div class='add'>+			spin_unlock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+</div><div class='add'>+			dma_unmap_single(ab-&gt;dev, rxcb-&gt;paddr,</div><div class='add'>+					 skb-&gt;len + skb_tailroom(skb),</div><div class='add'>+					 DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+			if (ath12k_dp_pkt_set_pktlen(skb, RX_MON_STATUS_BUF_SIZE)) {</div><div class='add'>+				dev_kfree_skb_any(skb);</div><div class='add'>+				goto move_next;</div><div class='add'>+			}</div><div class='add'>+			__skb_queue_tail(skb_list, skb);</div><div class='add'>+		} else {</div><div class='add'>+			pmon-&gt;buf_state = DP_MON_STATUS_REPLINISH;</div><div class='add'>+		}</div><div class='add'>+move_next:</div><div class='add'>+		skb = ath12k_dp_rx_alloc_mon_status_buf(ab, rx_ring,</div><div class='add'>+							&amp;buf_id);</div><div class='add'>+</div><div class='add'>+		if (!skb) {</div><div class='add'>+			ath12k_warn(ab, "failed to alloc buffer for status ring\n");</div><div class='add'>+			hal_params = ab-&gt;hw_params-&gt;hal_params;</div><div class='add'>+			ath12k_hal_rx_buf_addr_info_set(rx_mon_status_desc, 0, 0,</div><div class='add'>+							hal_params-&gt;rx_buf_rbm);</div><div class='add'>+			num_buffs_reaped++;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		rxcb = ATH12K_SKB_RXCB(skb);</div><div class='add'>+</div><div class='add'>+		cookie = u32_encode_bits(mac_id, DP_RXDMA_BUF_COOKIE_PDEV_ID) |</div><div class='add'>+			 u32_encode_bits(buf_id, DP_RXDMA_BUF_COOKIE_BUF_ID);</div><div class='add'>+</div><div class='add'>+		ath12k_hal_rx_buf_addr_info_set(rx_mon_status_desc, rxcb-&gt;paddr,</div><div class='add'>+						cookie,</div><div class='add'>+						ab-&gt;hw_params-&gt;hal_params-&gt;rx_buf_rbm);</div><div class='add'>+		ath12k_hal_srng_src_get_next_entry(ab, srng);</div><div class='add'>+		num_buffs_reaped++;</div><div class='add'>+	}</div><div class='add'>+	ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return num_buffs_reaped;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+ath12k_dp_rx_mon_mpdu_pop(struct ath12k *ar, int mac_id,</div><div class='add'>+			  void *ring_entry, struct sk_buff **head_msdu,</div><div class='add'>+			  struct sk_buff **tail_msdu,</div><div class='add'>+			  struct list_head *used_list,</div><div class='add'>+			  u32 *npackets, u32 *ppdu_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_mon_data *pmon = (struct ath12k_mon_data *)&amp;ar-&gt;dp.mon_data;</div><div class='add'>+	struct ath12k_buffer_addr *p_buf_addr_info, *p_last_buf_addr_info;</div><div class='add'>+	u32 msdu_ppdu_id = 0, msdu_cnt = 0, total_len = 0, frag_len = 0;</div><div class='add'>+	u32 rx_buf_size, rx_pkt_offset, sw_cookie;</div><div class='add'>+	bool is_frag, is_first_msdu, drop_mpdu = false;</div><div class='add'>+	struct hal_reo_entrance_ring *ent_desc =</div><div class='add'>+		(struct hal_reo_entrance_ring *)ring_entry;</div><div class='add'>+	u32 rx_bufs_used = 0, i = 0, desc_bank = 0;</div><div class='add'>+	struct hal_rx_desc *rx_desc, *tail_rx_desc;</div><div class='add'>+	struct hal_rx_msdu_link *msdu_link_desc;</div><div class='add'>+	struct sk_buff *msdu = NULL, *last = NULL;</div><div class='add'>+	struct ath12k_rx_desc_info *desc_info;</div><div class='add'>+	struct ath12k_buffer_addr buf_info;</div><div class='add'>+	struct hal_rx_msdu_list msdu_list;</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb;</div><div class='add'>+	u16 num_msdus = 0;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	u8 rbm;</div><div class='add'>+</div><div class='add'>+	ath12k_hal_rx_reo_ent_buf_paddr_get(ring_entry, &amp;paddr,</div><div class='add'>+					    &amp;sw_cookie,</div><div class='add'>+					    &amp;p_last_buf_addr_info, &amp;rbm,</div><div class='add'>+					    &amp;msdu_cnt);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;pmon-&gt;mon_lock);</div><div class='add'>+</div><div class='add'>+	if (le32_get_bits(ent_desc-&gt;info1,</div><div class='add'>+			  HAL_REO_ENTR_RING_INFO1_RXDMA_PUSH_REASON) ==</div><div class='add'>+			  HAL_REO_DEST_RING_PUSH_REASON_ERR_DETECTED) {</div><div class='add'>+		u8 rxdma_err = le32_get_bits(ent_desc-&gt;info1,</div><div class='add'>+					     HAL_REO_ENTR_RING_INFO1_RXDMA_ERROR_CODE);</div><div class='add'>+		if (rxdma_err == HAL_REO_ENTR_RING_RXDMA_ECODE_FLUSH_REQUEST_ERR ||</div><div class='add'>+		    rxdma_err == HAL_REO_ENTR_RING_RXDMA_ECODE_MPDU_LEN_ERR ||</div><div class='add'>+		    rxdma_err == HAL_REO_ENTR_RING_RXDMA_ECODE_OVERFLOW_ERR) {</div><div class='add'>+			drop_mpdu = true;</div><div class='add'>+			pmon-&gt;rx_mon_stats.dest_mpdu_drop++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	is_frag = false;</div><div class='add'>+	is_first_msdu = true;</div><div class='add'>+	rx_pkt_offset = sizeof(struct hal_rx_desc);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if (pmon-&gt;mon_last_linkdesc_paddr == paddr) {</div><div class='add'>+			pmon-&gt;rx_mon_stats.dup_mon_linkdesc_cnt++;</div><div class='add'>+			spin_unlock_bh(&amp;pmon-&gt;mon_lock);</div><div class='add'>+			return rx_bufs_used;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		desc_bank = u32_get_bits(sw_cookie, DP_LINK_DESC_BANK_MASK);</div><div class='add'>+		msdu_link_desc =</div><div class='add'>+			ar-&gt;ab-&gt;dp.link_desc_banks[desc_bank].vaddr +</div><div class='add'>+			(paddr - ar-&gt;ab-&gt;dp.link_desc_banks[desc_bank].paddr);</div><div class='add'>+</div><div class='add'>+		ath12k_hal_rx_msdu_list_get(ar, msdu_link_desc, &amp;msdu_list,</div><div class='add'>+					    &amp;num_msdus);</div><div class='add'>+		desc_info = ath12k_dp_get_rx_desc(ar-&gt;ab,</div><div class='add'>+						  msdu_list.sw_cookie[num_msdus - 1]);</div><div class='add'>+		tail_rx_desc = (struct hal_rx_desc *)(desc_info-&gt;skb)-&gt;data;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; num_msdus; i++) {</div><div class='add'>+			u32 l2_hdr_offset;</div><div class='add'>+</div><div class='add'>+			if (pmon-&gt;mon_last_buf_cookie == msdu_list.sw_cookie[i]) {</div><div class='add'>+				ath12k_dbg(ar-&gt;ab, ATH12K_DBG_DATA,</div><div class='add'>+					   "i %d last_cookie %d is same\n",</div><div class='add'>+					   i, pmon-&gt;mon_last_buf_cookie);</div><div class='add'>+				drop_mpdu = true;</div><div class='add'>+				pmon-&gt;rx_mon_stats.dup_mon_buf_cnt++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			desc_info =</div><div class='add'>+				ath12k_dp_get_rx_desc(ar-&gt;ab, msdu_list.sw_cookie[i]);</div><div class='add'>+			msdu = desc_info-&gt;skb;</div><div class='add'>+</div><div class='add'>+			if (!msdu) {</div><div class='add'>+				ath12k_dbg(ar-&gt;ab, ATH12K_DBG_DATA,</div><div class='add'>+					   "msdu_pop: invalid msdu (%d/%d)\n",</div><div class='add'>+					   i + 1, num_msdus);</div><div class='add'>+				goto next_msdu;</div><div class='add'>+			}</div><div class='add'>+			rxcb = ATH12K_SKB_RXCB(msdu);</div><div class='add'>+			if (rxcb-&gt;paddr != msdu_list.paddr[i]) {</div><div class='add'>+				ath12k_dbg(ar-&gt;ab, ATH12K_DBG_DATA,</div><div class='add'>+					   "i %d paddr %lx != %lx\n",</div><div class='add'>+					   i, (unsigned long)rxcb-&gt;paddr,</div><div class='add'>+					   (unsigned long)msdu_list.paddr[i]);</div><div class='add'>+				drop_mpdu = true;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			if (!rxcb-&gt;unmapped) {</div><div class='add'>+				dma_unmap_single(ar-&gt;ab-&gt;dev, rxcb-&gt;paddr,</div><div class='add'>+						 msdu-&gt;len +</div><div class='add'>+						 skb_tailroom(msdu),</div><div class='add'>+						 DMA_FROM_DEVICE);</div><div class='add'>+				rxcb-&gt;unmapped = 1;</div><div class='add'>+			}</div><div class='add'>+			if (drop_mpdu) {</div><div class='add'>+				ath12k_dbg(ar-&gt;ab, ATH12K_DBG_DATA,</div><div class='add'>+					   "i %d drop msdu %p *ppdu_id %x\n",</div><div class='add'>+					   i, msdu, *ppdu_id);</div><div class='add'>+				dev_kfree_skb_any(msdu);</div><div class='add'>+				msdu = NULL;</div><div class='add'>+				goto next_msdu;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			rx_desc = (struct hal_rx_desc *)msdu-&gt;data;</div><div class='add'>+			l2_hdr_offset = ath12k_dp_rx_h_l3pad(ar-&gt;ab, tail_rx_desc);</div><div class='add'>+			if (is_first_msdu) {</div><div class='add'>+				if (!ath12k_dp_rxdesc_mpdu_valid(ar-&gt;ab, rx_desc)) {</div><div class='add'>+					drop_mpdu = true;</div><div class='add'>+					dev_kfree_skb_any(msdu);</div><div class='add'>+					msdu = NULL;</div><div class='add'>+					pmon-&gt;mon_last_linkdesc_paddr = paddr;</div><div class='add'>+					goto next_msdu;</div><div class='add'>+				}</div><div class='add'>+				msdu_ppdu_id =</div><div class='add'>+					ath12k_dp_rxdesc_get_ppduid(ar-&gt;ab, rx_desc);</div><div class='add'>+</div><div class='add'>+				if (ath12k_dp_mon_comp_ppduid(msdu_ppdu_id,</div><div class='add'>+							      ppdu_id)) {</div><div class='add'>+					spin_unlock_bh(&amp;pmon-&gt;mon_lock);</div><div class='add'>+					return rx_bufs_used;</div><div class='add'>+				}</div><div class='add'>+				pmon-&gt;mon_last_linkdesc_paddr = paddr;</div><div class='add'>+				is_first_msdu = false;</div><div class='add'>+			}</div><div class='add'>+			ath12k_dp_mon_get_buf_len(&amp;msdu_list.msdu_info[i],</div><div class='add'>+						  &amp;is_frag, &amp;total_len,</div><div class='add'>+						  &amp;frag_len, &amp;msdu_cnt);</div><div class='add'>+			rx_buf_size = rx_pkt_offset + l2_hdr_offset + frag_len;</div><div class='add'>+</div><div class='add'>+			if (ath12k_dp_pkt_set_pktlen(msdu, rx_buf_size)) {</div><div class='add'>+				dev_kfree_skb_any(msdu);</div><div class='add'>+				goto next_msdu;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!(*head_msdu))</div><div class='add'>+				*head_msdu = msdu;</div><div class='add'>+			else if (last)</div><div class='add'>+				last-&gt;next = msdu;</div><div class='add'>+</div><div class='add'>+			last = msdu;</div><div class='add'>+next_msdu:</div><div class='add'>+			pmon-&gt;mon_last_buf_cookie = msdu_list.sw_cookie[i];</div><div class='add'>+			rx_bufs_used++;</div><div class='add'>+			desc_info-&gt;skb = NULL;</div><div class='add'>+			list_add_tail(&amp;desc_info-&gt;list, used_list);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath12k_hal_rx_buf_addr_info_set(&amp;buf_info, paddr, sw_cookie, rbm);</div><div class='add'>+</div><div class='add'>+		ath12k_dp_mon_next_link_desc_get(msdu_link_desc, &amp;paddr,</div><div class='add'>+						 &amp;sw_cookie, &amp;rbm,</div><div class='add'>+						 &amp;p_buf_addr_info);</div><div class='add'>+</div><div class='add'>+		ath12k_dp_rx_link_desc_return(ar-&gt;ab, &amp;buf_info,</div><div class='add'>+					      HAL_WBM_REL_BM_ACT_PUT_IN_IDLE);</div><div class='add'>+</div><div class='add'>+		p_last_buf_addr_info = p_buf_addr_info;</div><div class='add'>+</div><div class='add'>+	} while (paddr &amp;&amp; msdu_cnt);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;pmon-&gt;mon_lock);</div><div class='add'>+</div><div class='add'>+	if (last)</div><div class='add'>+		last-&gt;next = NULL;</div><div class='add'>+</div><div class='add'>+	*tail_msdu = msdu;</div><div class='add'>+</div><div class='add'>+	if (msdu_cnt == 0)</div><div class='add'>+		*npackets = 1;</div><div class='add'>+</div><div class='add'>+	return rx_bufs_used;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The destination ring processing is stuck if the destination is not</div><div class='add'>+ * moving while status ring moves 16 PPDU. The destination ring processing</div><div class='add'>+ * skips this destination ring PPDU as a workaround.</div><div class='add'>+ */</div><div class='add'>+#define MON_DEST_RING_STUCK_MAX_CNT 16</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_mon_dest_process(struct ath12k *ar, int mac_id,</div><div class='add'>+					  u32 quota, struct napi_struct *napi)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_mon_data *pmon = (struct ath12k_mon_data *)&amp;ar-&gt;dp.mon_data;</div><div class='add'>+	struct ath12k_pdev_mon_stats *rx_mon_stats;</div><div class='add'>+	u32 ppdu_id, rx_bufs_used = 0, ring_id;</div><div class='add'>+	u32 mpdu_rx_bufs_used, npackets = 0;</div><div class='add'>+	struct ath12k_dp *dp = &amp;ar-&gt;ab-&gt;dp;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	void *ring_entry, *mon_dst_srng;</div><div class='add'>+	struct dp_mon_mpdu *tmp_mpdu;</div><div class='add'>+	LIST_HEAD(rx_desc_used_list);</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+</div><div class='add'>+	ring_id = dp-&gt;rxdma_err_dst_ring[mac_id].ring_id;</div><div class='add'>+	srng = &amp;ab-&gt;hal.srng_list[ring_id];</div><div class='add'>+</div><div class='add'>+	mon_dst_srng = &amp;ab-&gt;hal.srng_list[ring_id];</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_begin(ab, mon_dst_srng);</div><div class='add'>+</div><div class='add'>+	ppdu_id = pmon-&gt;mon_ppdu_info.ppdu_id;</div><div class='add'>+	rx_mon_stats = &amp;pmon-&gt;rx_mon_stats;</div><div class='add'>+</div><div class='add'>+	while ((ring_entry = ath12k_hal_srng_dst_peek(ar-&gt;ab, mon_dst_srng))) {</div><div class='add'>+		struct sk_buff *head_msdu, *tail_msdu;</div><div class='add'>+</div><div class='add'>+		head_msdu = NULL;</div><div class='add'>+		tail_msdu = NULL;</div><div class='add'>+</div><div class='add'>+		mpdu_rx_bufs_used = ath12k_dp_rx_mon_mpdu_pop(ar, mac_id, ring_entry,</div><div class='add'>+							      &amp;head_msdu, &amp;tail_msdu,</div><div class='add'>+							      &amp;rx_desc_used_list,</div><div class='add'>+							      &amp;npackets, &amp;ppdu_id);</div><div class='add'>+</div><div class='add'>+		rx_bufs_used += mpdu_rx_bufs_used;</div><div class='add'>+</div><div class='add'>+		if (mpdu_rx_bufs_used) {</div><div class='add'>+			dp-&gt;mon_dest_ring_stuck_cnt = 0;</div><div class='add'>+		} else {</div><div class='add'>+			dp-&gt;mon_dest_ring_stuck_cnt++;</div><div class='add'>+			rx_mon_stats-&gt;dest_mon_not_reaped++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (dp-&gt;mon_dest_ring_stuck_cnt &gt; MON_DEST_RING_STUCK_MAX_CNT) {</div><div class='add'>+			rx_mon_stats-&gt;dest_mon_stuck++;</div><div class='add'>+			ath12k_dbg(ar-&gt;ab, ATH12K_DBG_DATA,</div><div class='add'>+				   "status ring ppdu_id=%d dest ring ppdu_id=%d mon_dest_ring_stuck_cnt=%d dest_mon_not_reaped=%u dest_mon_stuck=%u\n",</div><div class='add'>+				   pmon-&gt;mon_ppdu_info.ppdu_id, ppdu_id,</div><div class='add'>+				   dp-&gt;mon_dest_ring_stuck_cnt,</div><div class='add'>+				   rx_mon_stats-&gt;dest_mon_not_reaped,</div><div class='add'>+				   rx_mon_stats-&gt;dest_mon_stuck);</div><div class='add'>+			spin_lock_bh(&amp;pmon-&gt;mon_lock);</div><div class='add'>+			pmon-&gt;mon_ppdu_info.ppdu_id = ppdu_id;</div><div class='add'>+			spin_unlock_bh(&amp;pmon-&gt;mon_lock);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ppdu_id != pmon-&gt;mon_ppdu_info.ppdu_id) {</div><div class='add'>+			spin_lock_bh(&amp;pmon-&gt;mon_lock);</div><div class='add'>+			pmon-&gt;mon_ppdu_status = DP_PPDU_STATUS_START;</div><div class='add'>+			spin_unlock_bh(&amp;pmon-&gt;mon_lock);</div><div class='add'>+			ath12k_dbg(ar-&gt;ab, ATH12K_DBG_DATA,</div><div class='add'>+				   "dest_rx: new ppdu_id %x != status ppdu_id %x dest_mon_not_reaped = %u dest_mon_stuck = %u\n",</div><div class='add'>+				   ppdu_id, pmon-&gt;mon_ppdu_info.ppdu_id,</div><div class='add'>+				   rx_mon_stats-&gt;dest_mon_not_reaped,</div><div class='add'>+				   rx_mon_stats-&gt;dest_mon_stuck);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (head_msdu &amp;&amp; tail_msdu) {</div><div class='add'>+			tmp_mpdu = kzalloc(sizeof(*tmp_mpdu), GFP_ATOMIC);</div><div class='add'>+			if (!tmp_mpdu)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			tmp_mpdu-&gt;head = head_msdu;</div><div class='add'>+			tmp_mpdu-&gt;tail = tail_msdu;</div><div class='add'>+			tmp_mpdu-&gt;err_bitmap = pmon-&gt;err_bitmap;</div><div class='add'>+			tmp_mpdu-&gt;decap_format = pmon-&gt;decap_format;</div><div class='add'>+			ath12k_dp_mon_rx_deliver(ar, tmp_mpdu,</div><div class='add'>+						 &amp;pmon-&gt;mon_ppdu_info, napi);</div><div class='add'>+			rx_mon_stats-&gt;dest_mpdu_done++;</div><div class='add'>+			kfree(tmp_mpdu);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ring_entry = ath12k_hal_srng_dst_get_next_entry(ar-&gt;ab,</div><div class='add'>+								mon_dst_srng);</div><div class='add'>+	}</div><div class='add'>+	ath12k_hal_srng_access_end(ar-&gt;ab, mon_dst_srng);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (rx_bufs_used) {</div><div class='add'>+		rx_mon_stats-&gt;dest_ppdu_done++;</div><div class='add'>+		ath12k_dp_rx_bufs_replenish(ar-&gt;ab,</div><div class='add'>+					    &amp;dp-&gt;rx_refill_buf_ring,</div><div class='add'>+					    &amp;rx_desc_used_list,</div><div class='add'>+					    rx_bufs_used);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+__ath12k_dp_mon_process_ring(struct ath12k *ar, int mac_id,</div><div class='add'>+			     struct napi_struct *napi, int *budget)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_mon_data *pmon = (struct ath12k_mon_data *)&amp;ar-&gt;dp.mon_data;</div><div class='add'>+	struct ath12k_pdev_mon_stats *rx_mon_stats = &amp;pmon-&gt;rx_mon_stats;</div><div class='add'>+	struct hal_rx_mon_ppdu_info *ppdu_info = &amp;pmon-&gt;mon_ppdu_info;</div><div class='add'>+	enum hal_rx_mon_status hal_status;</div><div class='add'>+	struct sk_buff_head skb_list;</div><div class='add'>+	int num_buffs_reaped;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	__skb_queue_head_init(&amp;skb_list);</div><div class='add'>+</div><div class='add'>+	num_buffs_reaped = ath12k_dp_rx_reap_mon_status_ring(ar-&gt;ab, mac_id,</div><div class='add'>+							     budget, &amp;skb_list);</div><div class='add'>+	if (!num_buffs_reaped)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;skb_list))) {</div><div class='add'>+		memset(ppdu_info, 0, sizeof(*ppdu_info));</div><div class='add'>+		ppdu_info-&gt;peer_id = HAL_INVALID_PEERID;</div><div class='add'>+</div><div class='add'>+		hal_status = ath12k_dp_mon_parse_rx_dest(ar, pmon, skb);</div><div class='add'>+</div><div class='add'>+		if (ar-&gt;monitor_started &amp;&amp;</div><div class='add'>+		    pmon-&gt;mon_ppdu_status == DP_PPDU_STATUS_START &amp;&amp;</div><div class='add'>+		    hal_status == HAL_TLV_STATUS_PPDU_DONE) {</div><div class='add'>+			rx_mon_stats-&gt;status_ppdu_done++;</div><div class='add'>+			pmon-&gt;mon_ppdu_status = DP_PPDU_STATUS_DONE;</div><div class='add'>+			ath12k_dp_rx_mon_dest_process(ar, mac_id, *budget, napi);</div><div class='add'>+			pmon-&gt;mon_ppdu_status = DP_PPDU_STATUS_START;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	return num_buffs_reaped;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_mon_process_ring(struct ath12k_base *ab, int mac_id,</div><div class='add'>+			       struct napi_struct *napi, int budget,</div><div class='add'>+			       enum dp_monitor_mode monitor_mode)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = ath12k_ab_to_ar(ab, mac_id);</div><div class='add'>+	int num_buffs_reaped = 0;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;rxdma1_enable) {</div><div class='add'>+		if (monitor_mode == ATH12K_DP_RX_MONITOR_MODE)</div><div class='add'>+			num_buffs_reaped = ath12k_dp_mon_srng_process(ar, &amp;budget, napi);</div><div class='add'>+	} else {</div><div class='add'>+		if (ar-&gt;monitor_started)</div><div class='add'>+			num_buffs_reaped =</div><div class='add'>+				__ath12k_dp_mon_process_ring(ar, mac_id, napi, &amp;budget);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return num_buffs_reaped;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/dp_mon.h b/drivers/net/wireless/ath/ath12k/dp_mon.h<br/>new file mode 100644<br/>index 000000000000..e25595cbdcf3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/dp_mon.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/dp_mon.h</a></div><div class='hunk'>@@ -0,0 +1,107 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH12K_DP_MON_H</div><div class='add'>+#define ATH12K_DP_MON_H</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+</div><div class='add'>+#define ATH12K_MON_RX_DOT11_OFFSET	5</div><div class='add'>+#define ATH12K_MON_RX_PKT_OFFSET	8</div><div class='add'>+</div><div class='add'>+enum dp_monitor_mode {</div><div class='add'>+	ATH12K_DP_TX_MONITOR_MODE,</div><div class='add'>+	ATH12K_DP_RX_MONITOR_MODE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum dp_mon_tx_ppdu_info_type {</div><div class='add'>+	DP_MON_TX_PROT_PPDU_INFO,</div><div class='add'>+	DP_MON_TX_DATA_PPDU_INFO</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum dp_mon_tx_tlv_status {</div><div class='add'>+	DP_MON_TX_FES_SETUP,</div><div class='add'>+	DP_MON_TX_FES_STATUS_END,</div><div class='add'>+	DP_MON_RX_RESPONSE_REQUIRED_INFO,</div><div class='add'>+	DP_MON_RESPONSE_END_STATUS_INFO,</div><div class='add'>+	DP_MON_TX_MPDU_START,</div><div class='add'>+	DP_MON_TX_MSDU_START,</div><div class='add'>+	DP_MON_TX_BUFFER_ADDR,</div><div class='add'>+	DP_MON_TX_DATA,</div><div class='add'>+	DP_MON_TX_STATUS_PPDU_NOT_DONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum dp_mon_tx_medium_protection_type {</div><div class='add'>+	DP_MON_TX_MEDIUM_NO_PROTECTION,</div><div class='add'>+	DP_MON_TX_MEDIUM_RTS_LEGACY,</div><div class='add'>+	DP_MON_TX_MEDIUM_RTS_11AC_STATIC_BW,</div><div class='add'>+	DP_MON_TX_MEDIUM_RTS_11AC_DYNAMIC_BW,</div><div class='add'>+	DP_MON_TX_MEDIUM_CTS2SELF,</div><div class='add'>+	DP_MON_TX_MEDIUM_QOS_NULL_NO_ACK_3ADDR,</div><div class='add'>+	DP_MON_TX_MEDIUM_QOS_NULL_NO_ACK_4ADDR</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dp_mon_qosframe_addr4 {</div><div class='add'>+	__le16 frame_control;</div><div class='add'>+	__le16 duration;</div><div class='add'>+	u8 addr1[ETH_ALEN];</div><div class='add'>+	u8 addr2[ETH_ALEN];</div><div class='add'>+	u8 addr3[ETH_ALEN];</div><div class='add'>+	__le16 seq_ctrl;</div><div class='add'>+	u8 addr4[ETH_ALEN];</div><div class='add'>+	__le16 qos_ctrl;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct dp_mon_frame_min_one {</div><div class='add'>+	__le16 frame_control;</div><div class='add'>+	__le16 duration;</div><div class='add'>+	u8 addr1[ETH_ALEN];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct dp_mon_packet_info {</div><div class='add'>+	u64 cookie;</div><div class='add'>+	u16 dma_length;</div><div class='add'>+	bool msdu_continuation;</div><div class='add'>+	bool truncated;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dp_mon_tx_ppdu_info {</div><div class='add'>+	u32 ppdu_id;</div><div class='add'>+	u8  num_users;</div><div class='add'>+	bool is_used;</div><div class='add'>+	struct hal_rx_mon_ppdu_info rx_status;</div><div class='add'>+	struct list_head dp_tx_mon_mpdu_list;</div><div class='add'>+	struct dp_mon_mpdu *tx_mon_mpdu;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_rx_mon_status</div><div class='add'>+ath12k_dp_mon_rx_parse_mon_status(struct ath12k *ar,</div><div class='add'>+				  struct ath12k_mon_data *pmon,</div><div class='add'>+				  struct sk_buff *skb,</div><div class='add'>+				  struct napi_struct *napi);</div><div class='add'>+int ath12k_dp_mon_buf_replenish(struct ath12k_base *ab,</div><div class='add'>+				struct dp_rxdma_mon_ring *buf_ring,</div><div class='add'>+				int req_entries);</div><div class='add'>+int ath12k_dp_mon_status_bufs_replenish(struct ath12k_base *ab,</div><div class='add'>+					struct dp_rxdma_mon_ring *rx_ring,</div><div class='add'>+					int req_entries);</div><div class='add'>+int ath12k_dp_mon_process_ring(struct ath12k_base *ab, int mac_id,</div><div class='add'>+			       struct napi_struct *napi, int budget,</div><div class='add'>+			       enum dp_monitor_mode monitor_mode);</div><div class='add'>+struct sk_buff *ath12k_dp_mon_tx_alloc_skb(void);</div><div class='add'>+enum dp_mon_tx_tlv_status</div><div class='add'>+ath12k_dp_mon_tx_status_get_num_user(u16 tlv_tag,</div><div class='add'>+				     struct hal_tlv_hdr *tx_tlv,</div><div class='add'>+				     u8 *num_users);</div><div class='add'>+enum hal_rx_mon_status</div><div class='add'>+ath12k_dp_mon_tx_parse_mon_status(struct ath12k *ar,</div><div class='add'>+				  struct ath12k_mon_data *pmon,</div><div class='add'>+				  struct sk_buff *skb,</div><div class='add'>+				  struct napi_struct *napi,</div><div class='add'>+				  u32 ppdu_id);</div><div class='add'>+void ath12k_dp_mon_rx_process_ulofdma(struct hal_rx_mon_ppdu_info *ppdu_info);</div><div class='add'>+int ath12k_dp_mon_srng_process(struct ath12k *ar, int *budget, struct napi_struct *napi);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/dp_rx.c b/drivers/net/wireless/ath/ath12k/dp_rx.c<br/>new file mode 100644<br/>index 000000000000..d28d8ffec0f8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/dp_rx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/dp_rx.c</a></div><div class='hunk'>@@ -0,0 +1,4830 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ieee80211.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;crypto/hash.h&gt;</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "hal_desc.h"</div><div class='add'>+#include "hw.h"</div><div class='add'>+#include "dp_rx.h"</div><div class='add'>+#include "hal_rx.h"</div><div class='add'>+#include "dp_tx.h"</div><div class='add'>+#include "peer.h"</div><div class='add'>+#include "dp_mon.h"</div><div class='add'>+#include "debugfs_htt_stats.h"</div><div class='add'>+</div><div class='add'>+#define ATH12K_DP_RX_FRAGMENT_TIMEOUT_MS (2 * HZ)</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_rx_tid_delete_handler(struct ath12k_base *ab,</div><div class='add'>+					   struct ath12k_dp_rx_tid_rxq *rx_tid);</div><div class='add'>+</div><div class='add'>+static enum hal_encrypt_type ath12k_dp_rx_h_enctype(struct ath12k_base *ab,</div><div class='add'>+						    struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	if (!ab-&gt;hal_rx_ops-&gt;rx_desc_encrypt_valid(desc))</div><div class='add'>+		return HAL_ENCRYPT_TYPE_OPEN;</div><div class='add'>+</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;rx_desc_get_encrypt_type(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 ath12k_dp_rx_h_decap_type(struct ath12k_base *ab,</div><div class='add'>+			     struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;rx_desc_get_decap_type(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_dp_rx_h_mesh_ctl_present(struct ath12k_base *ab,</div><div class='add'>+					  struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;rx_desc_get_mesh_ctl(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_dp_rx_h_seq_ctrl_valid(struct ath12k_base *ab,</div><div class='add'>+					  struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;rx_desc_get_mpdu_seq_ctl_vld(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_dp_rx_h_fc_valid(struct ath12k_base *ab,</div><div class='add'>+				    struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;rx_desc_get_mpdu_fc_valid(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_dp_rx_h_more_frags(struct ath12k_base *ab,</div><div class='add'>+				      struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr *)(skb-&gt;data + ab-&gt;hal.hal_desc_sz);</div><div class='add'>+	return ieee80211_has_morefrags(hdr-&gt;frame_control);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath12k_dp_rx_h_frag_no(struct ath12k_base *ab,</div><div class='add'>+				  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr *)(skb-&gt;data + ab-&gt;hal.hal_desc_sz);</div><div class='add'>+	return le16_to_cpu(hdr-&gt;seq_ctrl) &amp; IEEE80211_SCTL_FRAG;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath12k_dp_rx_h_seq_no(struct ath12k_base *ab,</div><div class='add'>+				 struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;rx_desc_get_mpdu_start_seq_no(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_dp_rx_h_msdu_done(struct ath12k_base *ab,</div><div class='add'>+				     struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;dp_rx_h_msdu_done(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_dp_rx_h_l4_cksum_fail(struct ath12k_base *ab,</div><div class='add'>+					 struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;dp_rx_h_l4_cksum_fail(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_dp_rx_h_ip_cksum_fail(struct ath12k_base *ab,</div><div class='add'>+					 struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;dp_rx_h_ip_cksum_fail(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_dp_rx_h_is_decrypted(struct ath12k_base *ab,</div><div class='add'>+					struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;dp_rx_h_is_decrypted(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 ath12k_dp_rx_h_mpdu_err(struct ath12k_base *ab,</div><div class='add'>+			    struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;dp_rx_h_mpdu_err(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath12k_dp_rx_h_msdu_len(struct ath12k_base *ab,</div><div class='add'>+				   struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;rx_desc_get_msdu_len(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_dp_rx_h_sgi(struct ath12k_base *ab,</div><div class='add'>+			     struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;rx_desc_get_msdu_sgi(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_dp_rx_h_rate_mcs(struct ath12k_base *ab,</div><div class='add'>+				  struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;rx_desc_get_msdu_rate_mcs(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_dp_rx_h_rx_bw(struct ath12k_base *ab,</div><div class='add'>+			       struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;rx_desc_get_msdu_rx_bw(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_dp_rx_h_freq(struct ath12k_base *ab,</div><div class='add'>+			       struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;rx_desc_get_msdu_freq(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_dp_rx_h_pkt_type(struct ath12k_base *ab,</div><div class='add'>+				  struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;rx_desc_get_msdu_pkt_type(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_dp_rx_h_nss(struct ath12k_base *ab,</div><div class='add'>+			     struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return hweight8(ab-&gt;hal_rx_ops-&gt;rx_desc_get_msdu_nss(desc));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_dp_rx_h_tid(struct ath12k_base *ab,</div><div class='add'>+			     struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;rx_desc_get_mpdu_tid(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath12k_dp_rx_h_peer_id(struct ath12k_base *ab,</div><div class='add'>+				  struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;rx_desc_get_mpdu_peer_id(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 ath12k_dp_rx_h_l3pad(struct ath12k_base *ab,</div><div class='add'>+			struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;rx_desc_get_l3_pad_bytes(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_dp_rx_h_first_msdu(struct ath12k_base *ab,</div><div class='add'>+				      struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;rx_desc_get_first_msdu(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_dp_rx_h_last_msdu(struct ath12k_base *ab,</div><div class='add'>+				     struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;rx_desc_get_last_msdu(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_desc_end_tlv_copy(struct ath12k_base *ab,</div><div class='add'>+					   struct hal_rx_desc *fdesc,</div><div class='add'>+					   struct hal_rx_desc *ldesc)</div><div class='add'>+{</div><div class='add'>+	ab-&gt;hal_rx_ops-&gt;rx_desc_copy_end_tlv(fdesc, ldesc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rxdesc_set_msdu_len(struct ath12k_base *ab,</div><div class='add'>+					  struct hal_rx_desc *desc,</div><div class='add'>+					  u16 len)</div><div class='add'>+{</div><div class='add'>+	ab-&gt;hal_rx_ops-&gt;rx_desc_set_msdu_len(desc, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 ath12k_dp_rxdesc_get_ppduid(struct ath12k_base *ab,</div><div class='add'>+				struct hal_rx_desc *rx_desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;rx_desc_get_mpdu_ppdu_id(rx_desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool ath12k_dp_rxdesc_mpdu_valid(struct ath12k_base *ab,</div><div class='add'>+				 struct hal_rx_desc *rx_desc)</div><div class='add'>+{</div><div class='add'>+	u32 tlv_tag;</div><div class='add'>+</div><div class='add'>+	tlv_tag = ab-&gt;hal_rx_ops-&gt;rx_desc_get_mpdu_start_tag(rx_desc);</div><div class='add'>+</div><div class='add'>+	return tlv_tag == HAL_RX_MPDU_START;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_dp_rx_h_is_da_mcbc(struct ath12k_base *ab,</div><div class='add'>+				      struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return (ath12k_dp_rx_h_first_msdu(ab, desc) &amp;&amp;</div><div class='add'>+		ab-&gt;hal_rx_ops-&gt;rx_desc_is_da_mcbc(desc));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_dp_rxdesc_mac_addr2_valid(struct ath12k_base *ab,</div><div class='add'>+					     struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;rx_desc_mac_addr2_valid(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *ath12k_dp_rxdesc_get_mpdu_start_addr2(struct ath12k_base *ab,</div><div class='add'>+						 struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;rx_desc_mpdu_start_addr2(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_desc_get_dot11_hdr(struct ath12k_base *ab,</div><div class='add'>+					    struct hal_rx_desc *desc,</div><div class='add'>+					    struct ieee80211_hdr *hdr)</div><div class='add'>+{</div><div class='add'>+	ab-&gt;hal_rx_ops-&gt;rx_desc_get_dot11_hdr(desc, hdr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_desc_get_crypto_header(struct ath12k_base *ab,</div><div class='add'>+						struct hal_rx_desc *desc,</div><div class='add'>+						u8 *crypto_hdr,</div><div class='add'>+						enum hal_encrypt_type enctype)</div><div class='add'>+{</div><div class='add'>+	ab-&gt;hal_rx_ops-&gt;rx_desc_get_crypto_header(desc, crypto_hdr, enctype);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 ath12k_dp_rx_get_msdu_src_link(struct ath12k_base *ab,</div><div class='add'>+						struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hal_rx_ops-&gt;rx_desc_get_msdu_src_link_id(desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_clean_up_skb_list(struct sk_buff_head *skb_list)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	while ((skb = __skb_dequeue(skb_list)))</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t ath12k_dp_list_cut_nodes(struct list_head *list,</div><div class='add'>+				       struct list_head *head,</div><div class='add'>+				       size_t count)</div><div class='add'>+{</div><div class='add'>+	struct list_head *cur;</div><div class='add'>+	struct ath12k_rx_desc_info *rx_desc;</div><div class='add'>+	size_t nodes = 0;</div><div class='add'>+</div><div class='add'>+	if (!count) {</div><div class='add'>+		INIT_LIST_HEAD(list);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each(cur, head) {</div><div class='add'>+		if (!count)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		rx_desc = list_entry(cur, struct ath12k_rx_desc_info, list);</div><div class='add'>+		rx_desc-&gt;in_use = true;</div><div class='add'>+</div><div class='add'>+		count--;</div><div class='add'>+		nodes++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_cut_before(list, head, cur);</div><div class='add'>+out:</div><div class='add'>+	return nodes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_enqueue_free(struct ath12k_dp *dp,</div><div class='add'>+				      struct list_head *used_list)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_rx_desc_info *rx_desc, *safe;</div><div class='add'>+</div><div class='add'>+	/* Reset the use flag */</div><div class='add'>+	list_for_each_entry_safe(rx_desc, safe, used_list, list)</div><div class='add'>+		rx_desc-&gt;in_use = false;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dp-&gt;rx_desc_lock);</div><div class='add'>+	list_splice_tail(used_list, &amp;dp-&gt;rx_desc_free_list);</div><div class='add'>+	spin_unlock_bh(&amp;dp-&gt;rx_desc_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Returns number of Rx buffers replenished */</div><div class='add'>+int ath12k_dp_rx_bufs_replenish(struct ath12k_base *ab,</div><div class='add'>+				struct dp_rxdma_ring *rx_ring,</div><div class='add'>+				struct list_head *used_list,</div><div class='add'>+				int req_entries)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_buffer_addr *desc;</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int num_free;</div><div class='add'>+	int num_remain;</div><div class='add'>+	u32 cookie;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct ath12k_rx_desc_info *rx_desc;</div><div class='add'>+	enum hal_rx_buf_return_buf_manager mgr = ab-&gt;hw_params-&gt;hal_params-&gt;rx_buf_rbm;</div><div class='add'>+</div><div class='add'>+	req_entries = min(req_entries, rx_ring-&gt;bufs_max);</div><div class='add'>+</div><div class='add'>+	srng = &amp;ab-&gt;hal.srng_list[rx_ring-&gt;refill_buf_ring.ring_id];</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_begin(ab, srng);</div><div class='add'>+</div><div class='add'>+	num_free = ath12k_hal_srng_src_num_free(ab, srng, true);</div><div class='add'>+	if (!req_entries &amp;&amp; (num_free &gt; (rx_ring-&gt;bufs_max * 3) / 4))</div><div class='add'>+		req_entries = num_free;</div><div class='add'>+</div><div class='add'>+	req_entries = min(num_free, req_entries);</div><div class='add'>+	num_remain = req_entries;</div><div class='add'>+</div><div class='add'>+	if (!num_remain)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Get the descriptor from free list */</div><div class='add'>+	if (list_empty(used_list)) {</div><div class='add'>+		spin_lock_bh(&amp;dp-&gt;rx_desc_lock);</div><div class='add'>+		req_entries = ath12k_dp_list_cut_nodes(used_list,</div><div class='add'>+						       &amp;dp-&gt;rx_desc_free_list,</div><div class='add'>+						       num_remain);</div><div class='add'>+		spin_unlock_bh(&amp;dp-&gt;rx_desc_lock);</div><div class='add'>+		num_remain = req_entries;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (num_remain &gt; 0) {</div><div class='add'>+		skb = dev_alloc_skb(DP_RX_BUFFER_SIZE +</div><div class='add'>+				    DP_RX_BUFFER_ALIGN_SIZE);</div><div class='add'>+		if (!skb)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!IS_ALIGNED((unsigned long)skb-&gt;data,</div><div class='add'>+				DP_RX_BUFFER_ALIGN_SIZE)) {</div><div class='add'>+			skb_pull(skb,</div><div class='add'>+				 PTR_ALIGN(skb-&gt;data, DP_RX_BUFFER_ALIGN_SIZE) -</div><div class='add'>+				 skb-&gt;data);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		paddr = dma_map_single(ab-&gt;dev, skb-&gt;data,</div><div class='add'>+				       skb-&gt;len + skb_tailroom(skb),</div><div class='add'>+				       DMA_FROM_DEVICE);</div><div class='add'>+		if (dma_mapping_error(ab-&gt;dev, paddr))</div><div class='add'>+			goto fail_free_skb;</div><div class='add'>+</div><div class='add'>+		rx_desc = list_first_entry_or_null(used_list,</div><div class='add'>+						   struct ath12k_rx_desc_info,</div><div class='add'>+						   list);</div><div class='add'>+		if (!rx_desc)</div><div class='add'>+			goto fail_dma_unmap;</div><div class='add'>+</div><div class='add'>+		rx_desc-&gt;skb = skb;</div><div class='add'>+		cookie = rx_desc-&gt;cookie;</div><div class='add'>+</div><div class='add'>+		desc = ath12k_hal_srng_src_get_next_entry(ab, srng);</div><div class='add'>+		if (!desc)</div><div class='add'>+			goto fail_dma_unmap;</div><div class='add'>+</div><div class='add'>+		list_del(&amp;rx_desc-&gt;list);</div><div class='add'>+		ATH12K_SKB_RXCB(skb)-&gt;paddr = paddr;</div><div class='add'>+</div><div class='add'>+		num_remain--;</div><div class='add'>+</div><div class='add'>+		ath12k_hal_rx_buf_addr_info_set(desc, paddr, cookie, mgr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+fail_dma_unmap:</div><div class='add'>+	dma_unmap_single(ab-&gt;dev, paddr, skb-&gt;len + skb_tailroom(skb),</div><div class='add'>+			 DMA_FROM_DEVICE);</div><div class='add'>+fail_free_skb:</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+out:</div><div class='add'>+	ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+</div><div class='add'>+	if (!list_empty(used_list))</div><div class='add'>+		ath12k_dp_rx_enqueue_free(dp, used_list);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return req_entries - num_remain;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_rxdma_mon_buf_ring_free(struct ath12k_base *ab,</div><div class='add'>+					     struct dp_rxdma_mon_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int buf_id;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+	idr_for_each_entry(&amp;rx_ring-&gt;bufs_idr, skb, buf_id) {</div><div class='add'>+		idr_remove(&amp;rx_ring-&gt;bufs_idr, buf_id);</div><div class='add'>+		/* TODO: Understand where internal driver does this dma_unmap</div><div class='add'>+		 * of rxdma_buffer.</div><div class='add'>+		 */</div><div class='add'>+		dma_unmap_single(ab-&gt;dev, ATH12K_SKB_RXCB(skb)-&gt;paddr,</div><div class='add'>+				 skb-&gt;len + skb_tailroom(skb), DMA_FROM_DEVICE);</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	idr_destroy(&amp;rx_ring-&gt;bufs_idr);</div><div class='add'>+	spin_unlock_bh(&amp;rx_ring-&gt;idr_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_rxdma_buf_free(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ath12k_dp_rxdma_mon_buf_ring_free(ab, &amp;dp-&gt;rxdma_mon_buf_ring);</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;rxdma1_enable)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;num_rxdma_per_pdev; i++)</div><div class='add'>+		ath12k_dp_rxdma_mon_buf_ring_free(ab,</div><div class='add'>+						  &amp;dp-&gt;rx_mon_status_refill_ring[i]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_rxdma_mon_ring_buf_setup(struct ath12k_base *ab,</div><div class='add'>+					      struct dp_rxdma_mon_ring *rx_ring,</div><div class='add'>+					      u32 ringtype)</div><div class='add'>+{</div><div class='add'>+	int num_entries;</div><div class='add'>+</div><div class='add'>+	num_entries = rx_ring-&gt;refill_buf_ring.size /</div><div class='add'>+		ath12k_hal_srng_get_entrysize(ab, ringtype);</div><div class='add'>+</div><div class='add'>+	rx_ring-&gt;bufs_max = num_entries;</div><div class='add'>+</div><div class='add'>+	if (ringtype == HAL_RXDMA_MONITOR_STATUS)</div><div class='add'>+		ath12k_dp_mon_status_bufs_replenish(ab, rx_ring,</div><div class='add'>+						    num_entries);</div><div class='add'>+	else</div><div class='add'>+		ath12k_dp_mon_buf_replenish(ab, rx_ring, num_entries);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_rxdma_ring_buf_setup(struct ath12k_base *ab,</div><div class='add'>+					  struct dp_rxdma_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+	LIST_HEAD(list);</div><div class='add'>+</div><div class='add'>+	rx_ring-&gt;bufs_max = rx_ring-&gt;refill_buf_ring.size /</div><div class='add'>+			ath12k_hal_srng_get_entrysize(ab, HAL_RXDMA_BUF);</div><div class='add'>+</div><div class='add'>+	ath12k_dp_rx_bufs_replenish(ab, rx_ring, &amp;list, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_rxdma_buf_setup(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct dp_rxdma_mon_ring *mon_ring;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_rxdma_ring_buf_setup(ab, &amp;dp-&gt;rx_refill_buf_ring);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "failed to setup HAL_RXDMA_BUF\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;rxdma1_enable) {</div><div class='add'>+		ret = ath12k_dp_rxdma_mon_ring_buf_setup(ab,</div><div class='add'>+							 &amp;dp-&gt;rxdma_mon_buf_ring,</div><div class='add'>+							 HAL_RXDMA_MONITOR_BUF);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ab,</div><div class='add'>+				    "failed to setup HAL_RXDMA_MONITOR_BUF\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;num_rxdma_per_pdev; i++) {</div><div class='add'>+		mon_ring = &amp;dp-&gt;rx_mon_status_refill_ring[i];</div><div class='add'>+		ret = ath12k_dp_rxdma_mon_ring_buf_setup(ab, mon_ring,</div><div class='add'>+							 HAL_RXDMA_MONITOR_STATUS);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab,</div><div class='add'>+				    "failed to setup HAL_RXDMA_MONITOR_STATUS\n");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_pdev_srng_free(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pdev_dp *dp = &amp;ar-&gt;dp;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;num_rxdma_per_pdev; i++)</div><div class='add'>+		ath12k_dp_srng_cleanup(ab, &amp;dp-&gt;rxdma_mon_dst_ring[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_rx_pdev_reo_cleanup(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DP_REO_DST_RING_MAX; i++)</div><div class='add'>+		ath12k_dp_srng_cleanup(ab, &amp;dp-&gt;reo_dst_ring[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_rx_pdev_reo_setup(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DP_REO_DST_RING_MAX; i++) {</div><div class='add'>+		ret = ath12k_dp_srng_setup(ab, &amp;dp-&gt;reo_dst_ring[i],</div><div class='add'>+					   HAL_REO_DST, i, 0,</div><div class='add'>+					   DP_REO_DST_RING_SIZE);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to setup reo_dst_ring\n");</div><div class='add'>+			goto err_reo_cleanup;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_reo_cleanup:</div><div class='add'>+	ath12k_dp_rx_pdev_reo_cleanup(ab);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_rx_pdev_srng_alloc(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pdev_dp *dp = &amp;ar-&gt;dp;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 mac_id = dp-&gt;mac_id;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;num_rxdma_per_pdev; i++) {</div><div class='add'>+		ret = ath12k_dp_srng_setup(ar-&gt;ab,</div><div class='add'>+					   &amp;dp-&gt;rxdma_mon_dst_ring[i],</div><div class='add'>+					   HAL_RXDMA_MONITOR_DST,</div><div class='add'>+					   0, mac_id + i,</div><div class='add'>+					   DP_RXDMA_MONITOR_DST_RING_SIZE(ab));</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "failed to setup HAL_RXDMA_MONITOR_DST\n");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_init_rx_tid_rxq(struct ath12k_dp_rx_tid_rxq *rx_tid_rxq,</div><div class='add'>+				      struct ath12k_dp_rx_tid *rx_tid)</div><div class='add'>+{</div><div class='add'>+	rx_tid_rxq-&gt;tid = rx_tid-&gt;tid;</div><div class='add'>+	rx_tid_rxq-&gt;active = rx_tid-&gt;active;</div><div class='add'>+	rx_tid_rxq-&gt;qbuf = rx_tid-&gt;qbuf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_tid_cleanup(struct ath12k_base *ab,</div><div class='add'>+				     struct ath12k_reoq_buf *tid_qbuf)</div><div class='add'>+{</div><div class='add'>+	if (tid_qbuf-&gt;vaddr) {</div><div class='add'>+		dma_unmap_single(ab-&gt;dev, tid_qbuf-&gt;paddr_aligned,</div><div class='add'>+				 tid_qbuf-&gt;size, DMA_BIDIRECTIONAL);</div><div class='add'>+		kfree(tid_qbuf-&gt;vaddr);</div><div class='add'>+		tid_qbuf-&gt;vaddr = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_rx_reo_cmd_list_cleanup(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct ath12k_dp_rx_reo_cmd *cmd, *tmp;</div><div class='add'>+	struct ath12k_dp_rx_reo_cache_flush_elem *cmd_cache, *tmp_cache;</div><div class='add'>+	struct dp_reo_update_rx_queue_elem *cmd_queue, *tmp_queue;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dp-&gt;reo_rxq_flush_lock);</div><div class='add'>+	list_for_each_entry_safe(cmd_queue, tmp_queue, &amp;dp-&gt;reo_cmd_update_rx_queue_list,</div><div class='add'>+				 list) {</div><div class='add'>+		list_del(&amp;cmd_queue-&gt;list);</div><div class='add'>+		ath12k_dp_rx_tid_cleanup(ab, &amp;cmd_queue-&gt;rx_tid.qbuf);</div><div class='add'>+		kfree(cmd_queue);</div><div class='add'>+	}</div><div class='add'>+	list_for_each_entry_safe(cmd_cache, tmp_cache,</div><div class='add'>+				 &amp;dp-&gt;reo_cmd_cache_flush_list, list) {</div><div class='add'>+		list_del(&amp;cmd_cache-&gt;list);</div><div class='add'>+		dp-&gt;reo_cmd_cache_flush_count--;</div><div class='add'>+		ath12k_dp_rx_tid_cleanup(ab, &amp;cmd_cache-&gt;data.qbuf);</div><div class='add'>+		kfree(cmd_cache);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;dp-&gt;reo_rxq_flush_lock);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dp-&gt;reo_cmd_lock);</div><div class='add'>+	list_for_each_entry_safe(cmd, tmp, &amp;dp-&gt;reo_cmd_list, list) {</div><div class='add'>+		list_del(&amp;cmd-&gt;list);</div><div class='add'>+		ath12k_dp_rx_tid_cleanup(ab, &amp;cmd-&gt;data.qbuf);</div><div class='add'>+		kfree(cmd);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;dp-&gt;reo_cmd_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_reo_cmd_free(struct ath12k_dp *dp, void *ctx,</div><div class='add'>+				   enum hal_reo_cmd_status status)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp_rx_tid_rxq *rx_tid = ctx;</div><div class='add'>+</div><div class='add'>+	if (status != HAL_REO_CMD_SUCCESS)</div><div class='add'>+		ath12k_warn(dp-&gt;ab, "failed to flush rx tid hw desc, tid %d status %d\n",</div><div class='add'>+			    rx_tid-&gt;tid, status);</div><div class='add'>+</div><div class='add'>+	ath12k_dp_rx_tid_cleanup(dp-&gt;ab, &amp;rx_tid-&gt;qbuf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_reo_cmd_send(struct ath12k_base *ab,</div><div class='add'>+				  struct ath12k_dp_rx_tid_rxq *rx_tid,</div><div class='add'>+				  enum hal_reo_cmd_type type,</div><div class='add'>+				  struct ath12k_hal_reo_cmd *cmd,</div><div class='add'>+				  void (*cb)(struct ath12k_dp *dp, void *ctx,</div><div class='add'>+					     enum hal_reo_cmd_status status))</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct ath12k_dp_rx_reo_cmd *dp_cmd;</div><div class='add'>+	struct hal_srng *cmd_ring;</div><div class='add'>+	int cmd_num;</div><div class='add'>+</div><div class='add'>+	cmd_ring = &amp;ab-&gt;hal.srng_list[dp-&gt;reo_cmd_ring.ring_id];</div><div class='add'>+	cmd_num = ath12k_hal_reo_cmd_send(ab, cmd_ring, type, cmd);</div><div class='add'>+</div><div class='add'>+	/* cmd_num should start from 1, during failure return the error code */</div><div class='add'>+	if (cmd_num &lt; 0)</div><div class='add'>+		return cmd_num;</div><div class='add'>+</div><div class='add'>+	/* reo cmd ring descriptors has cmd_num starting from 1 */</div><div class='add'>+	if (cmd_num == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!cb)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Can this be optimized so that we keep the pending command list only</div><div class='add'>+	 * for tid delete command to free up the resource on the command status</div><div class='add'>+	 * indication?</div><div class='add'>+	 */</div><div class='add'>+	dp_cmd = kzalloc(sizeof(*dp_cmd), GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+	if (!dp_cmd)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;dp_cmd-&gt;data, rx_tid, sizeof(*rx_tid));</div><div class='add'>+	dp_cmd-&gt;cmd_num = cmd_num;</div><div class='add'>+	dp_cmd-&gt;handler = cb;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dp-&gt;reo_cmd_lock);</div><div class='add'>+	list_add_tail(&amp;dp_cmd-&gt;list, &amp;dp-&gt;reo_cmd_list);</div><div class='add'>+	spin_unlock_bh(&amp;dp-&gt;reo_cmd_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_reo_cache_flush(struct ath12k_base *ab,</div><div class='add'>+				     struct ath12k_dp_rx_tid_rxq *rx_tid)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hal_reo_cmd cmd = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cmd.addr_lo = lower_32_bits(rx_tid-&gt;qbuf.paddr_aligned);</div><div class='add'>+	cmd.addr_hi = upper_32_bits(rx_tid-&gt;qbuf.paddr_aligned);</div><div class='add'>+	/* HAL_REO_CMD_FLG_FLUSH_FWD_ALL_MPDUS - all pending MPDUs</div><div class='add'>+	 *in the bitmap will be forwarded/flushed to REO output rings</div><div class='add'>+	 */</div><div class='add'>+	cmd.flag = HAL_REO_CMD_FLG_NEED_STATUS |</div><div class='add'>+		   HAL_REO_CMD_FLG_FLUSH_FWD_ALL_MPDUS;</div><div class='add'>+</div><div class='add'>+	/* For all QoS TIDs (except NON_QOS), the driver allocates a maximum</div><div class='add'>+	 * window size of 1024. In such cases, the driver can issue a single</div><div class='add'>+	 * 1KB descriptor flush command instead of sending multiple 128-byte</div><div class='add'>+	 * flush commands for each QoS TID, improving efficiency.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (rx_tid-&gt;tid != HAL_DESC_REO_NON_QOS_TID)</div><div class='add'>+		cmd.flag |= HAL_REO_CMD_FLG_FLUSH_QUEUE_1K_DESC;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_reo_cmd_send(ab, rx_tid,</div><div class='add'>+				     HAL_REO_CMD_FLUSH_CACHE,</div><div class='add'>+				     &amp;cmd, ath12k_dp_reo_cmd_free);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_peer_rx_tid_qref_reset(struct ath12k_base *ab, u16 peer_id, u16 tid)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_reo_queue_ref *qref;</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	bool ml_peer = false;</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;hw_params-&gt;reoq_lut_support)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (peer_id &amp; ATH12K_PEER_ML_ID_VALID) {</div><div class='add'>+		peer_id &amp;= ~ATH12K_PEER_ML_ID_VALID;</div><div class='add'>+		ml_peer = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ml_peer)</div><div class='add'>+		qref = (struct ath12k_reo_queue_ref *)dp-&gt;ml_reoq_lut.vaddr +</div><div class='add'>+				(peer_id * (IEEE80211_NUM_TIDS + 1) + tid);</div><div class='add'>+	else</div><div class='add'>+		qref = (struct ath12k_reo_queue_ref *)dp-&gt;reoq_lut.vaddr +</div><div class='add'>+				(peer_id * (IEEE80211_NUM_TIDS + 1) + tid);</div><div class='add'>+</div><div class='add'>+	qref-&gt;info0 = u32_encode_bits(0, BUFFER_ADDR_INFO0_ADDR);</div><div class='add'>+	qref-&gt;info1 = u32_encode_bits(0, BUFFER_ADDR_INFO1_ADDR) |</div><div class='add'>+		      u32_encode_bits(tid, DP_REO_QREF_NUM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_process_reo_cmd_update_rx_queue_list(struct ath12k_dp *dp)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = dp-&gt;ab;</div><div class='add'>+	struct dp_reo_update_rx_queue_elem *elem, *tmp;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dp-&gt;reo_rxq_flush_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(elem, tmp, &amp;dp-&gt;reo_cmd_update_rx_queue_list, list) {</div><div class='add'>+		if (elem-&gt;rx_tid.active)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (ath12k_dp_rx_tid_delete_handler(ab, &amp;elem-&gt;rx_tid))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ath12k_peer_rx_tid_qref_reset(ab,</div><div class='add'>+					      elem-&gt;is_ml_peer ? elem-&gt;ml_peer_id :</div><div class='add'>+					      elem-&gt;peer_id,</div><div class='add'>+					      elem-&gt;rx_tid.tid);</div><div class='add'>+</div><div class='add'>+		if (ab-&gt;hw_params-&gt;reoq_lut_support)</div><div class='add'>+			ath12k_hal_reo_shared_qaddr_cache_clear(ab);</div><div class='add'>+</div><div class='add'>+		list_del(&amp;elem-&gt;list);</div><div class='add'>+		kfree(elem);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;dp-&gt;reo_rxq_flush_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_tid_del_func(struct ath12k_dp *dp, void *ctx,</div><div class='add'>+				      enum hal_reo_cmd_status status)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = dp-&gt;ab;</div><div class='add'>+	struct ath12k_dp_rx_tid_rxq *rx_tid = ctx;</div><div class='add'>+	struct ath12k_dp_rx_reo_cache_flush_elem *elem, *tmp;</div><div class='add'>+</div><div class='add'>+	if (status == HAL_REO_CMD_DRAIN) {</div><div class='add'>+		goto free_desc;</div><div class='add'>+	} else if (status != HAL_REO_CMD_SUCCESS) {</div><div class='add'>+		/* Shouldn't happen! Cleanup in case of other failure? */</div><div class='add'>+		ath12k_warn(ab, "failed to delete rx tid %d hw descriptor %d\n",</div><div class='add'>+			    rx_tid-&gt;tid, status);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Retry the HAL_REO_CMD_UPDATE_RX_QUEUE command for entries</div><div class='add'>+	 * in the pending queue list marked TID as inactive</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_bh(&amp;dp-&gt;ab-&gt;base_lock);</div><div class='add'>+	ath12k_dp_rx_process_reo_cmd_update_rx_queue_list(dp);</div><div class='add'>+	spin_unlock_bh(&amp;dp-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	elem = kzalloc(sizeof(*elem), GFP_ATOMIC);</div><div class='add'>+	if (!elem)</div><div class='add'>+		goto free_desc;</div><div class='add'>+</div><div class='add'>+	elem-&gt;ts = jiffies;</div><div class='add'>+	memcpy(&amp;elem-&gt;data, rx_tid, sizeof(*rx_tid));</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dp-&gt;reo_rxq_flush_lock);</div><div class='add'>+	list_add_tail(&amp;elem-&gt;list, &amp;dp-&gt;reo_cmd_cache_flush_list);</div><div class='add'>+	dp-&gt;reo_cmd_cache_flush_count++;</div><div class='add'>+</div><div class='add'>+	/* Flush and invalidate aged REO desc from HW cache */</div><div class='add'>+	list_for_each_entry_safe(elem, tmp, &amp;dp-&gt;reo_cmd_cache_flush_list,</div><div class='add'>+				 list) {</div><div class='add'>+		if (dp-&gt;reo_cmd_cache_flush_count &gt; ATH12K_DP_RX_REO_DESC_FREE_THRES ||</div><div class='add'>+		    time_after(jiffies, elem-&gt;ts +</div><div class='add'>+			       msecs_to_jiffies(ATH12K_DP_RX_REO_DESC_FREE_TIMEOUT_MS))) {</div><div class='add'>+			/* The reo_cmd_cache_flush_list is used in only two contexts,</div><div class='add'>+			 * one is in this function called from napi and the</div><div class='add'>+			 * other in ath12k_dp_free during core destroy.</div><div class='add'>+			 * If cache command sent is success, delete the element in</div><div class='add'>+			 * the cache list. ath12k_dp_rx_reo_cmd_list_cleanup</div><div class='add'>+			 * will be called during core destroy.</div><div class='add'>+			 */</div><div class='add'>+</div><div class='add'>+			if (ath12k_dp_reo_cache_flush(ab, &amp;elem-&gt;data))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			list_del(&amp;elem-&gt;list);</div><div class='add'>+			dp-&gt;reo_cmd_cache_flush_count--;</div><div class='add'>+			kfree(elem);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;dp-&gt;reo_rxq_flush_lock);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+free_desc:</div><div class='add'>+	ath12k_dp_rx_tid_cleanup(ab, &amp;rx_tid-&gt;qbuf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_rx_tid_delete_handler(struct ath12k_base *ab,</div><div class='add'>+					   struct ath12k_dp_rx_tid_rxq *rx_tid)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hal_reo_cmd cmd = {};</div><div class='add'>+</div><div class='add'>+	cmd.flag = HAL_REO_CMD_FLG_NEED_STATUS;</div><div class='add'>+	cmd.addr_lo = lower_32_bits(rx_tid-&gt;qbuf.paddr_aligned);</div><div class='add'>+	cmd.addr_hi = upper_32_bits(rx_tid-&gt;qbuf.paddr_aligned);</div><div class='add'>+	cmd.upd0 |= HAL_REO_CMD_UPD0_VLD;</div><div class='add'>+	/* Observed flush cache failure, to avoid that set vld bit during delete */</div><div class='add'>+	cmd.upd1 |= HAL_REO_CMD_UPD1_VLD;</div><div class='add'>+</div><div class='add'>+	return ath12k_dp_reo_cmd_send(ab, rx_tid,</div><div class='add'>+				      HAL_REO_CMD_UPDATE_RX_QUEUE, &amp;cmd,</div><div class='add'>+				      ath12k_dp_rx_tid_del_func);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_peer_rx_tid_qref_setup(struct ath12k_base *ab, u16 peer_id, u16 tid,</div><div class='add'>+					  dma_addr_t paddr)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_reo_queue_ref *qref;</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	bool ml_peer = false;</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;hw_params-&gt;reoq_lut_support)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (peer_id &amp; ATH12K_PEER_ML_ID_VALID) {</div><div class='add'>+		peer_id &amp;= ~ATH12K_PEER_ML_ID_VALID;</div><div class='add'>+		ml_peer = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ml_peer)</div><div class='add'>+		qref = (struct ath12k_reo_queue_ref *)dp-&gt;ml_reoq_lut.vaddr +</div><div class='add'>+				(peer_id * (IEEE80211_NUM_TIDS + 1) + tid);</div><div class='add'>+	else</div><div class='add'>+		qref = (struct ath12k_reo_queue_ref *)dp-&gt;reoq_lut.vaddr +</div><div class='add'>+				(peer_id * (IEEE80211_NUM_TIDS + 1) + tid);</div><div class='add'>+</div><div class='add'>+	qref-&gt;info0 = u32_encode_bits(lower_32_bits(paddr),</div><div class='add'>+				      BUFFER_ADDR_INFO0_ADDR);</div><div class='add'>+	qref-&gt;info1 = u32_encode_bits(upper_32_bits(paddr),</div><div class='add'>+				      BUFFER_ADDR_INFO1_ADDR) |</div><div class='add'>+		      u32_encode_bits(tid, DP_REO_QREF_NUM);</div><div class='add'>+	ath12k_hal_reo_shared_qaddr_cache_clear(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_mark_tid_as_inactive(struct ath12k_dp *dp, int peer_id, u8 tid)</div><div class='add'>+{</div><div class='add'>+	struct dp_reo_update_rx_queue_elem *elem;</div><div class='add'>+	struct ath12k_dp_rx_tid_rxq *rx_tid;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dp-&gt;reo_rxq_flush_lock);</div><div class='add'>+	list_for_each_entry(elem, &amp;dp-&gt;reo_cmd_update_rx_queue_list, list) {</div><div class='add'>+		if (elem-&gt;peer_id == peer_id) {</div><div class='add'>+			rx_tid = &amp;elem-&gt;rx_tid;</div><div class='add'>+			if (rx_tid-&gt;tid == tid) {</div><div class='add'>+				rx_tid-&gt;active = false;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;dp-&gt;reo_rxq_flush_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_rx_peer_tid_delete(struct ath12k *ar,</div><div class='add'>+				  struct ath12k_peer *peer, u8 tid)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp_rx_tid *rx_tid = &amp;peer-&gt;rx_tid[tid];</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+</div><div class='add'>+	if (!rx_tid-&gt;active)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rx_tid-&gt;active = false;</div><div class='add'>+</div><div class='add'>+	ath12k_dp_mark_tid_as_inactive(dp, peer-&gt;peer_id, tid);</div><div class='add'>+	ath12k_dp_rx_process_reo_cmd_update_rx_queue_list(dp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_rx_link_desc_return(struct ath12k_base *ab,</div><div class='add'>+				  struct ath12k_buffer_addr *buf_addr_info,</div><div class='add'>+				  enum hal_wbm_rel_bm_act action)</div><div class='add'>+{</div><div class='add'>+	struct hal_wbm_release_ring *desc;</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	srng = &amp;ab-&gt;hal.srng_list[dp-&gt;wbm_desc_rel_ring.ring_id];</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_begin(ab, srng);</div><div class='add'>+</div><div class='add'>+	desc = ath12k_hal_srng_src_get_next_entry(ab, srng);</div><div class='add'>+	if (!desc) {</div><div class='add'>+		ret = -ENOBUFS;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_hal_rx_msdu_link_desc_set(ab, desc, buf_addr_info, action);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_frags_cleanup(struct ath12k_dp_rx_tid *rx_tid,</div><div class='add'>+				       bool rel_link_desc)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_buffer_addr *buf_addr_info;</div><div class='add'>+	struct ath12k_base *ab = rx_tid-&gt;ab;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	if (rx_tid-&gt;dst_ring_desc) {</div><div class='add'>+		if (rel_link_desc) {</div><div class='add'>+			buf_addr_info = &amp;rx_tid-&gt;dst_ring_desc-&gt;buf_addr_info;</div><div class='add'>+			ath12k_dp_rx_link_desc_return(ab, buf_addr_info,</div><div class='add'>+						      HAL_WBM_REL_BM_ACT_PUT_IN_IDLE);</div><div class='add'>+		}</div><div class='add'>+		kfree(rx_tid-&gt;dst_ring_desc);</div><div class='add'>+		rx_tid-&gt;dst_ring_desc = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_tid-&gt;cur_sn = 0;</div><div class='add'>+	rx_tid-&gt;last_frag_no = 0;</div><div class='add'>+	rx_tid-&gt;rx_frag_bitmap = 0;</div><div class='add'>+	__skb_queue_purge(&amp;rx_tid-&gt;rx_frags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_rx_peer_tid_cleanup(struct ath12k *ar, struct ath12k_peer *peer)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp_rx_tid *rx_tid;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= IEEE80211_NUM_TIDS; i++) {</div><div class='add'>+		rx_tid = &amp;peer-&gt;rx_tid[i];</div><div class='add'>+</div><div class='add'>+		ath12k_dp_rx_peer_tid_delete(ar, peer, i);</div><div class='add'>+		ath12k_dp_rx_frags_cleanup(rx_tid, true);</div><div class='add'>+</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+		timer_delete_sync(&amp;rx_tid-&gt;frag_timer);</div><div class='add'>+		spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_peer_rx_tid_reo_update(struct ath12k *ar,</div><div class='add'>+					 struct ath12k_peer *peer,</div><div class='add'>+					 struct ath12k_dp_rx_tid *rx_tid,</div><div class='add'>+					 u32 ba_win_sz, u16 ssn,</div><div class='add'>+					 bool update_ssn)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hal_reo_cmd cmd = {};</div><div class='add'>+	int ret;</div><div class='add'>+	struct ath12k_dp_rx_tid_rxq rx_tid_rxq;</div><div class='add'>+</div><div class='add'>+	ath12k_dp_init_rx_tid_rxq(&amp;rx_tid_rxq, rx_tid);</div><div class='add'>+</div><div class='add'>+	cmd.addr_lo = lower_32_bits(rx_tid_rxq.qbuf.paddr_aligned);</div><div class='add'>+	cmd.addr_hi = upper_32_bits(rx_tid_rxq.qbuf.paddr_aligned);</div><div class='add'>+	cmd.flag = HAL_REO_CMD_FLG_NEED_STATUS;</div><div class='add'>+	cmd.upd0 = HAL_REO_CMD_UPD0_BA_WINDOW_SIZE;</div><div class='add'>+	cmd.ba_window_size = ba_win_sz;</div><div class='add'>+</div><div class='add'>+	if (update_ssn) {</div><div class='add'>+		cmd.upd0 |= HAL_REO_CMD_UPD0_SSN;</div><div class='add'>+		cmd.upd2 = u32_encode_bits(ssn, HAL_REO_CMD_UPD2_SSN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_reo_cmd_send(ar-&gt;ab, &amp;rx_tid_rxq,</div><div class='add'>+				     HAL_REO_CMD_UPDATE_RX_QUEUE, &amp;cmd,</div><div class='add'>+				     NULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to update rx tid queue, tid %d (%d)\n",</div><div class='add'>+			    rx_tid_rxq.tid, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_tid-&gt;ba_win_sz = ba_win_sz;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_rx_assign_reoq(struct ath12k_base *ab,</div><div class='add'>+				    struct ath12k_sta *ahsta,</div><div class='add'>+				    struct ath12k_dp_rx_tid *rx_tid,</div><div class='add'>+				    u16 ssn, enum hal_pn_type pn_type)</div><div class='add'>+{</div><div class='add'>+	u32 ba_win_sz = rx_tid-&gt;ba_win_sz;</div><div class='add'>+	struct ath12k_reoq_buf *buf;</div><div class='add'>+	void *vaddr, *vaddr_aligned;</div><div class='add'>+	dma_addr_t paddr_aligned;</div><div class='add'>+	u8 tid = rx_tid-&gt;tid;</div><div class='add'>+	u32 hw_desc_sz;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	buf = &amp;ahsta-&gt;reoq_bufs[tid];</div><div class='add'>+	if (!buf-&gt;vaddr) {</div><div class='add'>+		/* TODO: Optimize the memory allocation for qos tid based on</div><div class='add'>+		 * the actual BA window size in REO tid update path.</div><div class='add'>+		 */</div><div class='add'>+		if (tid == HAL_DESC_REO_NON_QOS_TID)</div><div class='add'>+			hw_desc_sz = ath12k_hal_reo_qdesc_size(ba_win_sz, tid);</div><div class='add'>+		else</div><div class='add'>+			hw_desc_sz = ath12k_hal_reo_qdesc_size(DP_BA_WIN_SZ_MAX, tid);</div><div class='add'>+</div><div class='add'>+		vaddr = kzalloc(hw_desc_sz + HAL_LINK_DESC_ALIGN - 1, GFP_ATOMIC);</div><div class='add'>+		if (!vaddr)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		vaddr_aligned = PTR_ALIGN(vaddr, HAL_LINK_DESC_ALIGN);</div><div class='add'>+</div><div class='add'>+		ath12k_hal_reo_qdesc_setup(vaddr_aligned, tid, ba_win_sz,</div><div class='add'>+					   ssn, pn_type);</div><div class='add'>+</div><div class='add'>+		paddr_aligned = dma_map_single(ab-&gt;dev, vaddr_aligned, hw_desc_sz,</div><div class='add'>+					       DMA_BIDIRECTIONAL);</div><div class='add'>+		ret = dma_mapping_error(ab-&gt;dev, paddr_aligned);</div><div class='add'>+		if (ret) {</div><div class='add'>+			kfree(vaddr);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buf-&gt;vaddr = vaddr;</div><div class='add'>+		buf-&gt;paddr_aligned = paddr_aligned;</div><div class='add'>+		buf-&gt;size = hw_desc_sz;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_tid-&gt;qbuf = *buf;</div><div class='add'>+	rx_tid-&gt;active = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_prepare_reo_update_elem(struct ath12k_dp *dp,</div><div class='add'>+					     struct ath12k_peer *peer,</div><div class='add'>+					     struct ath12k_dp_rx_tid *rx_tid)</div><div class='add'>+{</div><div class='add'>+	struct dp_reo_update_rx_queue_elem *elem;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;dp-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	elem = kzalloc(sizeof(*elem), GFP_ATOMIC);</div><div class='add'>+	if (!elem)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	elem-&gt;peer_id = peer-&gt;peer_id;</div><div class='add'>+	elem-&gt;is_ml_peer = peer-&gt;mlo;</div><div class='add'>+	elem-&gt;ml_peer_id = peer-&gt;ml_id;</div><div class='add'>+</div><div class='add'>+	ath12k_dp_init_rx_tid_rxq(&amp;elem-&gt;rx_tid, rx_tid);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dp-&gt;reo_rxq_flush_lock);</div><div class='add'>+	list_add_tail(&amp;elem-&gt;list, &amp;dp-&gt;reo_cmd_update_rx_queue_list);</div><div class='add'>+	spin_unlock_bh(&amp;dp-&gt;reo_rxq_flush_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_rx_peer_tid_setup(struct ath12k *ar, const u8 *peer_mac, int vdev_id,</div><div class='add'>+				u8 tid, u32 ba_win_sz, u16 ssn,</div><div class='add'>+				enum hal_pn_type pn_type)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	struct ath12k_sta *ahsta;</div><div class='add'>+	struct ath12k_dp_rx_tid *rx_tid;</div><div class='add'>+	dma_addr_t paddr_aligned;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	peer = ath12k_peer_find(ab, vdev_id, peer_mac);</div><div class='add'>+	if (!peer) {</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		ath12k_warn(ab, "failed to find the peer to set up rx tid\n");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;dp_primary_link_only &amp;&amp;</div><div class='add'>+	    !peer-&gt;primary_link) {</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;reoq_lut_support &amp;&amp;</div><div class='add'>+	    (!dp-&gt;reoq_lut.vaddr || !dp-&gt;ml_reoq_lut.vaddr)) {</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		ath12k_warn(ab, "reo qref table is not setup\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (peer-&gt;peer_id &gt; DP_MAX_PEER_ID || tid &gt; IEEE80211_NUM_TIDS) {</div><div class='add'>+		ath12k_warn(ab, "peer id of peer %d or tid %d doesn't allow reoq setup\n",</div><div class='add'>+			    peer-&gt;peer_id, tid);</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_tid = &amp;peer-&gt;rx_tid[tid];</div><div class='add'>+	/* Update the tid queue if it is already setup */</div><div class='add'>+	if (rx_tid-&gt;active) {</div><div class='add'>+		ret = ath12k_peer_rx_tid_reo_update(ar, peer, rx_tid,</div><div class='add'>+						    ba_win_sz, ssn, true);</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to update reo for rx tid %d\n", tid);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!ab-&gt;hw_params-&gt;reoq_lut_support) {</div><div class='add'>+			paddr_aligned = rx_tid-&gt;qbuf.paddr_aligned;</div><div class='add'>+			ret = ath12k_wmi_peer_rx_reorder_queue_setup(ar, vdev_id,</div><div class='add'>+								     peer_mac,</div><div class='add'>+								     paddr_aligned, tid,</div><div class='add'>+								     1, ba_win_sz);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_warn(ab, "failed to setup peer rx reorder queuefor tid %d: %d\n",</div><div class='add'>+					    tid, ret);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_tid-&gt;tid = tid;</div><div class='add'>+</div><div class='add'>+	rx_tid-&gt;ba_win_sz = ba_win_sz;</div><div class='add'>+</div><div class='add'>+	ahsta = ath12k_sta_to_ahsta(peer-&gt;sta);</div><div class='add'>+	ret = ath12k_dp_rx_assign_reoq(ab, ahsta, rx_tid, ssn, pn_type);</div><div class='add'>+	if (ret) {</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		ath12k_warn(ab, "failed to assign reoq buf for rx tid %u\n", tid);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Pre-allocate the update_rxq_list for the corresponding tid</div><div class='add'>+	 * This will be used during the tid delete. The reason we are not</div><div class='add'>+	 * allocating during tid delete is that, if any alloc fail in update_rxq_list</div><div class='add'>+	 * we may not be able to delete the tid vaddr/paddr and may lead to leak</div><div class='add'>+	 */</div><div class='add'>+	ret = ath12k_dp_prepare_reo_update_elem(dp, peer, rx_tid);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to alloc update_rxq_list for rx tid %u\n", tid);</div><div class='add'>+		ath12k_dp_rx_tid_cleanup(ab, &amp;rx_tid-&gt;qbuf);</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	paddr_aligned = rx_tid-&gt;qbuf.paddr_aligned;</div><div class='add'>+	if (ab-&gt;hw_params-&gt;reoq_lut_support) {</div><div class='add'>+		/* Update the REO queue LUT at the corresponding peer id</div><div class='add'>+		 * and tid with qaddr.</div><div class='add'>+		 */</div><div class='add'>+		if (peer-&gt;mlo)</div><div class='add'>+			ath12k_peer_rx_tid_qref_setup(ab, peer-&gt;ml_id, tid,</div><div class='add'>+						      paddr_aligned);</div><div class='add'>+		else</div><div class='add'>+			ath12k_peer_rx_tid_qref_setup(ab, peer-&gt;peer_id, tid,</div><div class='add'>+						      paddr_aligned);</div><div class='add'>+</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	} else {</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		ret = ath12k_wmi_peer_rx_reorder_queue_setup(ar, vdev_id, peer_mac,</div><div class='add'>+							     paddr_aligned, tid, 1,</div><div class='add'>+							     ba_win_sz);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_rx_ampdu_start(struct ath12k *ar,</div><div class='add'>+			     struct ieee80211_ampdu_params *params,</div><div class='add'>+			     u8 link_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(params-&gt;sta);</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	int vdev_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	arsta = wiphy_dereference(ath12k_ar_to_hw(ar)-&gt;wiphy,</div><div class='add'>+				  ahsta-&gt;link[link_id]);</div><div class='add'>+	if (!arsta)</div><div class='add'>+		return -ENOLINK;</div><div class='add'>+</div><div class='add'>+	vdev_id = arsta-&gt;arvif-&gt;vdev_id;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_rx_peer_tid_setup(ar, arsta-&gt;addr, vdev_id,</div><div class='add'>+					  params-&gt;tid, params-&gt;buf_size,</div><div class='add'>+					  params-&gt;ssn, arsta-&gt;ahsta-&gt;pn_type);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ab, "failed to setup rx tid %d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_rx_ampdu_stop(struct ath12k *ar,</div><div class='add'>+			    struct ieee80211_ampdu_params *params,</div><div class='add'>+			    u8 link_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(params-&gt;sta);</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	int vdev_id;</div><div class='add'>+	bool active;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	arsta = wiphy_dereference(ath12k_ar_to_hw(ar)-&gt;wiphy,</div><div class='add'>+				  ahsta-&gt;link[link_id]);</div><div class='add'>+	if (!arsta)</div><div class='add'>+		return -ENOLINK;</div><div class='add'>+</div><div class='add'>+	vdev_id = arsta-&gt;arvif-&gt;vdev_id;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	peer = ath12k_peer_find(ab, vdev_id, arsta-&gt;addr);</div><div class='add'>+	if (!peer) {</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		ath12k_warn(ab, "failed to find the peer to stop rx aggregation\n");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	active = peer-&gt;rx_tid[params-&gt;tid].active;</div><div class='add'>+</div><div class='add'>+	if (!active) {</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_peer_rx_tid_reo_update(ar, peer, peer-&gt;rx_tid, 1, 0, false);</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to update reo for rx tid %d: %d\n",</div><div class='add'>+			    params-&gt;tid, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_rx_peer_pn_replay_config(struct ath12k_link_vif *arvif,</div><div class='add'>+				       const u8 *peer_addr,</div><div class='add'>+				       enum set_key_cmd key_cmd,</div><div class='add'>+				       struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_hal_reo_cmd cmd = {};</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	struct ath12k_dp_rx_tid *rx_tid;</div><div class='add'>+	struct ath12k_dp_rx_tid_rxq rx_tid_rxq;</div><div class='add'>+	u8 tid;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* NOTE: Enable PN/TSC replay check offload only for unicast frames.</div><div class='add'>+	 * We use mac80211 PN/TSC replay check functionality for bcast/mcast</div><div class='add'>+	 * for now.</div><div class='add'>+	 */</div><div class='add'>+	if (!(key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cmd.flag = HAL_REO_CMD_FLG_NEED_STATUS;</div><div class='add'>+	cmd.upd0 = HAL_REO_CMD_UPD0_PN |</div><div class='add'>+		    HAL_REO_CMD_UPD0_PN_SIZE |</div><div class='add'>+		    HAL_REO_CMD_UPD0_PN_VALID |</div><div class='add'>+		    HAL_REO_CMD_UPD0_PN_CHECK |</div><div class='add'>+		    HAL_REO_CMD_UPD0_SVLD;</div><div class='add'>+</div><div class='add'>+	switch (key-&gt;cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP_256:</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='add'>+		if (key_cmd == SET_KEY) {</div><div class='add'>+			cmd.upd1 |= HAL_REO_CMD_UPD1_PN_CHECK;</div><div class='add'>+			cmd.pn_size = 48;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	peer = ath12k_peer_find(ab, arvif-&gt;vdev_id, peer_addr);</div><div class='add'>+	if (!peer) {</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		ath12k_warn(ab, "failed to find the peer %pM to configure pn replay detection\n",</div><div class='add'>+			    peer_addr);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (tid = 0; tid &lt;= IEEE80211_NUM_TIDS; tid++) {</div><div class='add'>+		rx_tid = &amp;peer-&gt;rx_tid[tid];</div><div class='add'>+		if (!rx_tid-&gt;active)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ath12k_dp_init_rx_tid_rxq(&amp;rx_tid_rxq, rx_tid);</div><div class='add'>+		cmd.addr_lo = lower_32_bits(rx_tid_rxq.qbuf.paddr_aligned);</div><div class='add'>+		cmd.addr_hi = upper_32_bits(rx_tid_rxq.qbuf.paddr_aligned);</div><div class='add'>+		ret = ath12k_dp_reo_cmd_send(ab, &amp;rx_tid_rxq,</div><div class='add'>+					     HAL_REO_CMD_UPDATE_RX_QUEUE,</div><div class='add'>+					     &amp;cmd, NULL);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to configure rx tid %d queue of peer %pM for pn replay detection %d\n",</div><div class='add'>+				    tid, peer_addr, ret);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_get_ppdu_user_index(struct htt_ppdu_stats *ppdu_stats,</div><div class='add'>+				      u16 peer_id)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HTT_PPDU_STATS_MAX_USERS - 1; i++) {</div><div class='add'>+		if (ppdu_stats-&gt;user_stats[i].is_valid_peer_id) {</div><div class='add'>+			if (peer_id == ppdu_stats-&gt;user_stats[i].peer_id)</div><div class='add'>+				return i;</div><div class='add'>+		} else {</div><div class='add'>+			return i;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_htt_tlv_ppdu_stats_parse(struct ath12k_base *ab,</div><div class='add'>+					   u16 tag, u16 len, const void *ptr,</div><div class='add'>+					   void *data)</div><div class='add'>+{</div><div class='add'>+	const struct htt_ppdu_stats_usr_cmpltn_ack_ba_status *ba_status;</div><div class='add'>+	const struct htt_ppdu_stats_usr_cmpltn_cmn *cmplt_cmn;</div><div class='add'>+	const struct htt_ppdu_stats_user_rate *user_rate;</div><div class='add'>+	struct htt_ppdu_stats_info *ppdu_info;</div><div class='add'>+	struct htt_ppdu_user_stats *user_stats;</div><div class='add'>+	int cur_user;</div><div class='add'>+	u16 peer_id;</div><div class='add'>+</div><div class='add'>+	ppdu_info = data;</div><div class='add'>+</div><div class='add'>+	switch (tag) {</div><div class='add'>+	case HTT_PPDU_STATS_TAG_COMMON:</div><div class='add'>+		if (len &lt; sizeof(struct htt_ppdu_stats_common)) {</div><div class='add'>+			ath12k_warn(ab, "Invalid len %d for the tag 0x%x\n",</div><div class='add'>+				    len, tag);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		memcpy(&amp;ppdu_info-&gt;ppdu_stats.common, ptr,</div><div class='add'>+		       sizeof(struct htt_ppdu_stats_common));</div><div class='add'>+		break;</div><div class='add'>+	case HTT_PPDU_STATS_TAG_USR_RATE:</div><div class='add'>+		if (len &lt; sizeof(struct htt_ppdu_stats_user_rate)) {</div><div class='add'>+			ath12k_warn(ab, "Invalid len %d for the tag 0x%x\n",</div><div class='add'>+				    len, tag);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		user_rate = ptr;</div><div class='add'>+		peer_id = le16_to_cpu(user_rate-&gt;sw_peer_id);</div><div class='add'>+		cur_user = ath12k_get_ppdu_user_index(&amp;ppdu_info-&gt;ppdu_stats,</div><div class='add'>+						      peer_id);</div><div class='add'>+		if (cur_user &lt; 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		user_stats = &amp;ppdu_info-&gt;ppdu_stats.user_stats[cur_user];</div><div class='add'>+		user_stats-&gt;peer_id = peer_id;</div><div class='add'>+		user_stats-&gt;is_valid_peer_id = true;</div><div class='add'>+		memcpy(&amp;user_stats-&gt;rate, ptr,</div><div class='add'>+		       sizeof(struct htt_ppdu_stats_user_rate));</div><div class='add'>+		user_stats-&gt;tlv_flags |= BIT(tag);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_PPDU_STATS_TAG_USR_COMPLTN_COMMON:</div><div class='add'>+		if (len &lt; sizeof(struct htt_ppdu_stats_usr_cmpltn_cmn)) {</div><div class='add'>+			ath12k_warn(ab, "Invalid len %d for the tag 0x%x\n",</div><div class='add'>+				    len, tag);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cmplt_cmn = ptr;</div><div class='add'>+		peer_id = le16_to_cpu(cmplt_cmn-&gt;sw_peer_id);</div><div class='add'>+		cur_user = ath12k_get_ppdu_user_index(&amp;ppdu_info-&gt;ppdu_stats,</div><div class='add'>+						      peer_id);</div><div class='add'>+		if (cur_user &lt; 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		user_stats = &amp;ppdu_info-&gt;ppdu_stats.user_stats[cur_user];</div><div class='add'>+		user_stats-&gt;peer_id = peer_id;</div><div class='add'>+		user_stats-&gt;is_valid_peer_id = true;</div><div class='add'>+		memcpy(&amp;user_stats-&gt;cmpltn_cmn, ptr,</div><div class='add'>+		       sizeof(struct htt_ppdu_stats_usr_cmpltn_cmn));</div><div class='add'>+		user_stats-&gt;tlv_flags |= BIT(tag);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_PPDU_STATS_TAG_USR_COMPLTN_ACK_BA_STATUS:</div><div class='add'>+		if (len &lt;</div><div class='add'>+		    sizeof(struct htt_ppdu_stats_usr_cmpltn_ack_ba_status)) {</div><div class='add'>+			ath12k_warn(ab, "Invalid len %d for the tag 0x%x\n",</div><div class='add'>+				    len, tag);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ba_status = ptr;</div><div class='add'>+		peer_id = le16_to_cpu(ba_status-&gt;sw_peer_id);</div><div class='add'>+		cur_user = ath12k_get_ppdu_user_index(&amp;ppdu_info-&gt;ppdu_stats,</div><div class='add'>+						      peer_id);</div><div class='add'>+		if (cur_user &lt; 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		user_stats = &amp;ppdu_info-&gt;ppdu_stats.user_stats[cur_user];</div><div class='add'>+		user_stats-&gt;peer_id = peer_id;</div><div class='add'>+		user_stats-&gt;is_valid_peer_id = true;</div><div class='add'>+		memcpy(&amp;user_stats-&gt;ack_ba, ptr,</div><div class='add'>+		       sizeof(struct htt_ppdu_stats_usr_cmpltn_ack_ba_status));</div><div class='add'>+		user_stats-&gt;tlv_flags |= BIT(tag);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_htt_tlv_iter(struct ath12k_base *ab, const void *ptr, size_t len,</div><div class='add'>+			   int (*iter)(struct ath12k_base *ar, u16 tag, u16 len,</div><div class='add'>+				       const void *ptr, void *data),</div><div class='add'>+			   void *data)</div><div class='add'>+{</div><div class='add'>+	const struct htt_tlv *tlv;</div><div class='add'>+	const void *begin = ptr;</div><div class='add'>+	u16 tlv_tag, tlv_len;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	while (len &gt; 0) {</div><div class='add'>+		if (len &lt; sizeof(*tlv)) {</div><div class='add'>+			ath12k_err(ab, "htt tlv parse failure at byte %zd (%zu bytes left, %zu expected)\n",</div><div class='add'>+				   ptr - begin, len, sizeof(*tlv));</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		tlv = (struct htt_tlv *)ptr;</div><div class='add'>+		tlv_tag = le32_get_bits(tlv-&gt;header, HTT_TLV_TAG);</div><div class='add'>+		tlv_len = le32_get_bits(tlv-&gt;header, HTT_TLV_LEN);</div><div class='add'>+		ptr += sizeof(*tlv);</div><div class='add'>+		len -= sizeof(*tlv);</div><div class='add'>+</div><div class='add'>+		if (tlv_len &gt; len) {</div><div class='add'>+			ath12k_err(ab, "htt tlv parse failure of tag %u at byte %zd (%zu bytes left, %u expected)\n",</div><div class='add'>+				   tlv_tag, ptr - begin, len, tlv_len);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		ret = iter(ab, tlv_tag, tlv_len, ptr, data);</div><div class='add'>+		if (ret == -ENOMEM)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ptr += tlv_len;</div><div class='add'>+		len -= tlv_len;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_update_per_peer_tx_stats(struct ath12k *ar,</div><div class='add'>+				struct htt_ppdu_stats *ppdu_stats, u8 user)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	struct htt_ppdu_stats_user_rate *user_rate;</div><div class='add'>+	struct ath12k_per_peer_tx_stats *peer_stats = &amp;ar-&gt;peer_tx_stats;</div><div class='add'>+	struct htt_ppdu_user_stats *usr_stats = &amp;ppdu_stats-&gt;user_stats[user];</div><div class='add'>+	struct htt_ppdu_stats_common *common = &amp;ppdu_stats-&gt;common;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 flags, mcs, nss, bw, sgi, dcm, ppdu_type, rate_idx = 0;</div><div class='add'>+	u32 v, succ_bytes = 0;</div><div class='add'>+	u16 tones, rate = 0, succ_pkts = 0;</div><div class='add'>+	u32 tx_duration = 0;</div><div class='add'>+	u8 tid = HTT_PPDU_STATS_NON_QOS_TID;</div><div class='add'>+	u16 tx_retry_failed = 0, tx_retry_count = 0;</div><div class='add'>+	bool is_ampdu = false, is_ofdma;</div><div class='add'>+</div><div class='add'>+	if (!(usr_stats-&gt;tlv_flags &amp; BIT(HTT_PPDU_STATS_TAG_USR_RATE)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (usr_stats-&gt;tlv_flags &amp; BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_COMMON)) {</div><div class='add'>+		is_ampdu =</div><div class='add'>+			HTT_USR_CMPLTN_IS_AMPDU(usr_stats-&gt;cmpltn_cmn.flags);</div><div class='add'>+		tx_retry_failed =</div><div class='add'>+			__le16_to_cpu(usr_stats-&gt;cmpltn_cmn.mpdu_tried) -</div><div class='add'>+			__le16_to_cpu(usr_stats-&gt;cmpltn_cmn.mpdu_success);</div><div class='add'>+		tx_retry_count =</div><div class='add'>+			HTT_USR_CMPLTN_LONG_RETRY(usr_stats-&gt;cmpltn_cmn.flags) +</div><div class='add'>+			HTT_USR_CMPLTN_SHORT_RETRY(usr_stats-&gt;cmpltn_cmn.flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (usr_stats-&gt;tlv_flags &amp;</div><div class='add'>+	    BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_ACK_BA_STATUS)) {</div><div class='add'>+		succ_bytes = le32_to_cpu(usr_stats-&gt;ack_ba.success_bytes);</div><div class='add'>+		succ_pkts = le32_get_bits(usr_stats-&gt;ack_ba.info,</div><div class='add'>+					  HTT_PPDU_STATS_ACK_BA_INFO_NUM_MSDU_M);</div><div class='add'>+		tid = le32_get_bits(usr_stats-&gt;ack_ba.info,</div><div class='add'>+				    HTT_PPDU_STATS_ACK_BA_INFO_TID_NUM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (common-&gt;fes_duration_us)</div><div class='add'>+		tx_duration = le32_to_cpu(common-&gt;fes_duration_us);</div><div class='add'>+</div><div class='add'>+	user_rate = &amp;usr_stats-&gt;rate;</div><div class='add'>+	flags = HTT_USR_RATE_PREAMBLE(user_rate-&gt;rate_flags);</div><div class='add'>+	bw = HTT_USR_RATE_BW(user_rate-&gt;rate_flags) - 2;</div><div class='add'>+	nss = HTT_USR_RATE_NSS(user_rate-&gt;rate_flags) + 1;</div><div class='add'>+	mcs = HTT_USR_RATE_MCS(user_rate-&gt;rate_flags);</div><div class='add'>+	sgi = HTT_USR_RATE_GI(user_rate-&gt;rate_flags);</div><div class='add'>+	dcm = HTT_USR_RATE_DCM(user_rate-&gt;rate_flags);</div><div class='add'>+</div><div class='add'>+	ppdu_type = HTT_USR_RATE_PPDU_TYPE(user_rate-&gt;info1);</div><div class='add'>+	is_ofdma = (ppdu_type == HTT_PPDU_STATS_PPDU_TYPE_MU_OFDMA) ||</div><div class='add'>+		   (ppdu_type == HTT_PPDU_STATS_PPDU_TYPE_MU_MIMO_OFDMA);</div><div class='add'>+</div><div class='add'>+	/* Note: If host configured fixed rates and in some other special</div><div class='add'>+	 * cases, the broadcast/management frames are sent in different rates.</div><div class='add'>+	 * Firmware rate's control to be skipped for this?</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (flags == WMI_RATE_PREAMBLE_HE &amp;&amp; mcs &gt; ATH12K_HE_MCS_MAX) {</div><div class='add'>+		ath12k_warn(ab, "Invalid HE mcs %d peer stats",  mcs);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags == WMI_RATE_PREAMBLE_VHT &amp;&amp; mcs &gt; ATH12K_VHT_MCS_MAX) {</div><div class='add'>+		ath12k_warn(ab, "Invalid VHT mcs %d peer stats",  mcs);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags == WMI_RATE_PREAMBLE_HT &amp;&amp; (mcs &gt; ATH12K_HT_MCS_MAX || nss &lt; 1)) {</div><div class='add'>+		ath12k_warn(ab, "Invalid HT mcs %d nss %d peer stats",</div><div class='add'>+			    mcs, nss);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags == WMI_RATE_PREAMBLE_CCK || flags == WMI_RATE_PREAMBLE_OFDM) {</div><div class='add'>+		ret = ath12k_mac_hw_ratecode_to_legacy_rate(mcs,</div><div class='add'>+							    flags,</div><div class='add'>+							    &amp;rate_idx,</div><div class='add'>+							    &amp;rate);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	peer = ath12k_peer_find_by_id(ab, usr_stats-&gt;peer_id);</div><div class='add'>+</div><div class='add'>+	if (!peer || !peer-&gt;sta) {</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arsta = ath12k_peer_get_link_sta(ab, peer);</div><div class='add'>+	if (!arsta) {</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;arsta-&gt;txrate, 0, sizeof(arsta-&gt;txrate));</div><div class='add'>+</div><div class='add'>+	arsta-&gt;txrate.bw = ath12k_mac_bw_to_mac80211_bw(bw);</div><div class='add'>+</div><div class='add'>+	switch (flags) {</div><div class='add'>+	case WMI_RATE_PREAMBLE_OFDM:</div><div class='add'>+		arsta-&gt;txrate.legacy = rate;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_RATE_PREAMBLE_CCK:</div><div class='add'>+		arsta-&gt;txrate.legacy = rate;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_RATE_PREAMBLE_HT:</div><div class='add'>+		arsta-&gt;txrate.mcs = mcs + 8 * (nss - 1);</div><div class='add'>+		arsta-&gt;txrate.flags = RATE_INFO_FLAGS_MCS;</div><div class='add'>+		if (sgi)</div><div class='add'>+			arsta-&gt;txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_RATE_PREAMBLE_VHT:</div><div class='add'>+		arsta-&gt;txrate.mcs = mcs;</div><div class='add'>+		arsta-&gt;txrate.flags = RATE_INFO_FLAGS_VHT_MCS;</div><div class='add'>+		if (sgi)</div><div class='add'>+			arsta-&gt;txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_RATE_PREAMBLE_HE:</div><div class='add'>+		arsta-&gt;txrate.mcs = mcs;</div><div class='add'>+		arsta-&gt;txrate.flags = RATE_INFO_FLAGS_HE_MCS;</div><div class='add'>+		arsta-&gt;txrate.he_dcm = dcm;</div><div class='add'>+		arsta-&gt;txrate.he_gi = ath12k_he_gi_to_nl80211_he_gi(sgi);</div><div class='add'>+		tones = le16_to_cpu(user_rate-&gt;ru_end) -</div><div class='add'>+			le16_to_cpu(user_rate-&gt;ru_start) + 1;</div><div class='add'>+		v = ath12k_he_ru_tones_to_nl80211_he_ru_alloc(tones);</div><div class='add'>+		arsta-&gt;txrate.he_ru_alloc = v;</div><div class='add'>+		if (is_ofdma)</div><div class='add'>+			arsta-&gt;txrate.bw = RATE_INFO_BW_HE_RU;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_RATE_PREAMBLE_EHT:</div><div class='add'>+		arsta-&gt;txrate.mcs = mcs;</div><div class='add'>+		arsta-&gt;txrate.flags = RATE_INFO_FLAGS_EHT_MCS;</div><div class='add'>+		arsta-&gt;txrate.he_dcm = dcm;</div><div class='add'>+		arsta-&gt;txrate.eht_gi = ath12k_mac_eht_gi_to_nl80211_eht_gi(sgi);</div><div class='add'>+		tones = le16_to_cpu(user_rate-&gt;ru_end) -</div><div class='add'>+			le16_to_cpu(user_rate-&gt;ru_start) + 1;</div><div class='add'>+		v = ath12k_mac_eht_ru_tones_to_nl80211_eht_ru_alloc(tones);</div><div class='add'>+		arsta-&gt;txrate.eht_ru_alloc = v;</div><div class='add'>+		if (is_ofdma)</div><div class='add'>+			arsta-&gt;txrate.bw = RATE_INFO_BW_EHT_RU;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arsta-&gt;tx_retry_failed += tx_retry_failed;</div><div class='add'>+	arsta-&gt;tx_retry_count += tx_retry_count;</div><div class='add'>+	arsta-&gt;txrate.nss = nss;</div><div class='add'>+	arsta-&gt;tx_duration += tx_duration;</div><div class='add'>+	memcpy(&amp;arsta-&gt;last_txrate, &amp;arsta-&gt;txrate, sizeof(struct rate_info));</div><div class='add'>+</div><div class='add'>+	/* PPDU stats reported for mgmt packet doesn't have valid tx bytes.</div><div class='add'>+	 * So skip peer stats update for mgmt packets.</div><div class='add'>+	 */</div><div class='add'>+	if (tid &lt; HTT_PPDU_STATS_NON_QOS_TID) {</div><div class='add'>+		memset(peer_stats, 0, sizeof(*peer_stats));</div><div class='add'>+		peer_stats-&gt;succ_pkts = succ_pkts;</div><div class='add'>+		peer_stats-&gt;succ_bytes = succ_bytes;</div><div class='add'>+		peer_stats-&gt;is_ampdu = is_ampdu;</div><div class='add'>+		peer_stats-&gt;duration = tx_duration;</div><div class='add'>+		peer_stats-&gt;ba_fails =</div><div class='add'>+			HTT_USR_CMPLTN_LONG_RETRY(usr_stats-&gt;cmpltn_cmn.flags) +</div><div class='add'>+			HTT_USR_CMPLTN_SHORT_RETRY(usr_stats-&gt;cmpltn_cmn.flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_htt_update_ppdu_stats(struct ath12k *ar,</div><div class='add'>+					 struct htt_ppdu_stats *ppdu_stats)</div><div class='add'>+{</div><div class='add'>+	u8 user;</div><div class='add'>+</div><div class='add'>+	for (user = 0; user &lt; HTT_PPDU_STATS_MAX_USERS - 1; user++)</div><div class='add'>+		ath12k_update_per_peer_tx_stats(ar, ppdu_stats, user);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+struct htt_ppdu_stats_info *ath12k_dp_htt_get_ppdu_desc(struct ath12k *ar,</div><div class='add'>+							u32 ppdu_id)</div><div class='add'>+{</div><div class='add'>+	struct htt_ppdu_stats_info *ppdu_info;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;data_lock);</div><div class='add'>+	if (!list_empty(&amp;ar-&gt;ppdu_stats_info)) {</div><div class='add'>+		list_for_each_entry(ppdu_info, &amp;ar-&gt;ppdu_stats_info, list) {</div><div class='add'>+			if (ppdu_info-&gt;ppdu_id == ppdu_id)</div><div class='add'>+				return ppdu_info;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ar-&gt;ppdu_stat_list_depth &gt; HTT_PPDU_DESC_MAX_DEPTH) {</div><div class='add'>+			ppdu_info = list_first_entry(&amp;ar-&gt;ppdu_stats_info,</div><div class='add'>+						     typeof(*ppdu_info), list);</div><div class='add'>+			list_del(&amp;ppdu_info-&gt;list);</div><div class='add'>+			ar-&gt;ppdu_stat_list_depth--;</div><div class='add'>+			ath12k_htt_update_ppdu_stats(ar, &amp;ppdu_info-&gt;ppdu_stats);</div><div class='add'>+			kfree(ppdu_info);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ppdu_info = kzalloc(sizeof(*ppdu_info), GFP_ATOMIC);</div><div class='add'>+	if (!ppdu_info)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;ppdu_info-&gt;list, &amp;ar-&gt;ppdu_stats_info);</div><div class='add'>+	ar-&gt;ppdu_stat_list_depth++;</div><div class='add'>+</div><div class='add'>+	return ppdu_info;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_copy_to_delay_stats(struct ath12k_peer *peer,</div><div class='add'>+				       struct htt_ppdu_user_stats *usr_stats)</div><div class='add'>+{</div><div class='add'>+	peer-&gt;ppdu_stats_delayba.sw_peer_id = le16_to_cpu(usr_stats-&gt;rate.sw_peer_id);</div><div class='add'>+	peer-&gt;ppdu_stats_delayba.info0 = le32_to_cpu(usr_stats-&gt;rate.info0);</div><div class='add'>+	peer-&gt;ppdu_stats_delayba.ru_end = le16_to_cpu(usr_stats-&gt;rate.ru_end);</div><div class='add'>+	peer-&gt;ppdu_stats_delayba.ru_start = le16_to_cpu(usr_stats-&gt;rate.ru_start);</div><div class='add'>+	peer-&gt;ppdu_stats_delayba.info1 = le32_to_cpu(usr_stats-&gt;rate.info1);</div><div class='add'>+	peer-&gt;ppdu_stats_delayba.rate_flags = le32_to_cpu(usr_stats-&gt;rate.rate_flags);</div><div class='add'>+	peer-&gt;ppdu_stats_delayba.resp_rate_flags =</div><div class='add'>+		le32_to_cpu(usr_stats-&gt;rate.resp_rate_flags);</div><div class='add'>+</div><div class='add'>+	peer-&gt;delayba_flag = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_copy_to_bar(struct ath12k_peer *peer,</div><div class='add'>+			       struct htt_ppdu_user_stats *usr_stats)</div><div class='add'>+{</div><div class='add'>+	usr_stats-&gt;rate.sw_peer_id = cpu_to_le16(peer-&gt;ppdu_stats_delayba.sw_peer_id);</div><div class='add'>+	usr_stats-&gt;rate.info0 = cpu_to_le32(peer-&gt;ppdu_stats_delayba.info0);</div><div class='add'>+	usr_stats-&gt;rate.ru_end = cpu_to_le16(peer-&gt;ppdu_stats_delayba.ru_end);</div><div class='add'>+	usr_stats-&gt;rate.ru_start = cpu_to_le16(peer-&gt;ppdu_stats_delayba.ru_start);</div><div class='add'>+	usr_stats-&gt;rate.info1 = cpu_to_le32(peer-&gt;ppdu_stats_delayba.info1);</div><div class='add'>+	usr_stats-&gt;rate.rate_flags = cpu_to_le32(peer-&gt;ppdu_stats_delayba.rate_flags);</div><div class='add'>+	usr_stats-&gt;rate.resp_rate_flags =</div><div class='add'>+		cpu_to_le32(peer-&gt;ppdu_stats_delayba.resp_rate_flags);</div><div class='add'>+</div><div class='add'>+	peer-&gt;delayba_flag = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_htt_pull_ppdu_stats(struct ath12k_base *ab,</div><div class='add'>+				      struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_htt_ppdu_stats_msg *msg;</div><div class='add'>+	struct htt_ppdu_stats_info *ppdu_info;</div><div class='add'>+	struct ath12k_peer *peer = NULL;</div><div class='add'>+	struct htt_ppdu_user_stats *usr_stats = NULL;</div><div class='add'>+	u32 peer_id = 0;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int ret, i;</div><div class='add'>+	u8 pdev_id;</div><div class='add'>+	u32 ppdu_id, len;</div><div class='add'>+</div><div class='add'>+	msg = (struct ath12k_htt_ppdu_stats_msg *)skb-&gt;data;</div><div class='add'>+	len = le32_get_bits(msg-&gt;info, HTT_T2H_PPDU_STATS_INFO_PAYLOAD_SIZE);</div><div class='add'>+	if (len &gt; (skb-&gt;len - struct_size(msg, data, 0))) {</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "HTT PPDU STATS event has unexpected payload size %u, should be smaller than %u\n",</div><div class='add'>+			    len, skb-&gt;len);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pdev_id = le32_get_bits(msg-&gt;info, HTT_T2H_PPDU_STATS_INFO_PDEV_ID);</div><div class='add'>+	ppdu_id = le32_to_cpu(msg-&gt;ppdu_id);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ar = ath12k_mac_get_ar_by_pdev_id(ab, pdev_id);</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	ppdu_info = ath12k_dp_htt_get_ppdu_desc(ar, ppdu_id);</div><div class='add'>+	if (!ppdu_info) {</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ppdu_info-&gt;ppdu_id = ppdu_id;</div><div class='add'>+	ret = ath12k_dp_htt_tlv_iter(ab, msg-&gt;data, len,</div><div class='add'>+				     ath12k_htt_tlv_ppdu_stats_parse,</div><div class='add'>+				     (void *)ppdu_info);</div><div class='add'>+	if (ret) {</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		ath12k_warn(ab, "Failed to parse tlv %d\n", ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ppdu_info-&gt;ppdu_stats.common.num_users &gt;= HTT_PPDU_STATS_MAX_USERS) {</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "HTT PPDU STATS event has unexpected num_users %u, should be smaller than %u\n",</div><div class='add'>+			    ppdu_info-&gt;ppdu_stats.common.num_users,</div><div class='add'>+			    HTT_PPDU_STATS_MAX_USERS);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* back up data rate tlv for all peers */</div><div class='add'>+	if (ppdu_info-&gt;frame_type == HTT_STATS_PPDU_FTYPE_DATA &amp;&amp;</div><div class='add'>+	    (ppdu_info-&gt;tlv_bitmap &amp; (1 &lt;&lt; HTT_PPDU_STATS_TAG_USR_COMMON)) &amp;&amp;</div><div class='add'>+	    ppdu_info-&gt;delay_ba) {</div><div class='add'>+		for (i = 0; i &lt; ppdu_info-&gt;ppdu_stats.common.num_users; i++) {</div><div class='add'>+			peer_id = ppdu_info-&gt;ppdu_stats.user_stats[i].peer_id;</div><div class='add'>+			spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+			peer = ath12k_peer_find_by_id(ab, peer_id);</div><div class='add'>+			if (!peer) {</div><div class='add'>+				spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			usr_stats = &amp;ppdu_info-&gt;ppdu_stats.user_stats[i];</div><div class='add'>+			if (usr_stats-&gt;delay_ba)</div><div class='add'>+				ath12k_copy_to_delay_stats(peer, usr_stats);</div><div class='add'>+			spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* restore all peers' data rate tlv to mu-bar tlv */</div><div class='add'>+	if (ppdu_info-&gt;frame_type == HTT_STATS_PPDU_FTYPE_BAR &amp;&amp;</div><div class='add'>+	    (ppdu_info-&gt;tlv_bitmap &amp; (1 &lt;&lt; HTT_PPDU_STATS_TAG_USR_COMMON))) {</div><div class='add'>+		for (i = 0; i &lt; ppdu_info-&gt;bar_num_users; i++) {</div><div class='add'>+			peer_id = ppdu_info-&gt;ppdu_stats.user_stats[i].peer_id;</div><div class='add'>+			spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+			peer = ath12k_peer_find_by_id(ab, peer_id);</div><div class='add'>+			if (!peer) {</div><div class='add'>+				spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			usr_stats = &amp;ppdu_info-&gt;ppdu_stats.user_stats[i];</div><div class='add'>+			if (peer-&gt;delayba_flag)</div><div class='add'>+				ath12k_copy_to_bar(peer, usr_stats);</div><div class='add'>+			spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_htt_mlo_offset_event_handler(struct ath12k_base *ab,</div><div class='add'>+						struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_htt_mlo_offset_msg *msg;</div><div class='add'>+	struct ath12k_pdev *pdev;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	u8 pdev_id;</div><div class='add'>+</div><div class='add'>+	msg = (struct ath12k_htt_mlo_offset_msg *)skb-&gt;data;</div><div class='add'>+	pdev_id = u32_get_bits(__le32_to_cpu(msg-&gt;info),</div><div class='add'>+			       HTT_T2H_MLO_OFFSET_INFO_PDEV_ID);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ar = ath12k_mac_get_ar_by_pdev_id(ab, pdev_id);</div><div class='add'>+	if (!ar) {</div><div class='add'>+		/* It is possible that the ar is not yet active (started).</div><div class='add'>+		 * The above function will only look for the active pdev</div><div class='add'>+		 * and hence %NULL return is possible. Just silently</div><div class='add'>+		 * discard this message</div><div class='add'>+		 */</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	pdev = ar-&gt;pdev;</div><div class='add'>+</div><div class='add'>+	pdev-&gt;timestamp.info = __le32_to_cpu(msg-&gt;info);</div><div class='add'>+	pdev-&gt;timestamp.sync_timestamp_lo_us = __le32_to_cpu(msg-&gt;sync_timestamp_lo_us);</div><div class='add'>+	pdev-&gt;timestamp.sync_timestamp_hi_us = __le32_to_cpu(msg-&gt;sync_timestamp_hi_us);</div><div class='add'>+	pdev-&gt;timestamp.mlo_offset_lo = __le32_to_cpu(msg-&gt;mlo_offset_lo);</div><div class='add'>+	pdev-&gt;timestamp.mlo_offset_hi = __le32_to_cpu(msg-&gt;mlo_offset_hi);</div><div class='add'>+	pdev-&gt;timestamp.mlo_offset_clks = __le32_to_cpu(msg-&gt;mlo_offset_clks);</div><div class='add'>+	pdev-&gt;timestamp.mlo_comp_clks = __le32_to_cpu(msg-&gt;mlo_comp_clks);</div><div class='add'>+	pdev-&gt;timestamp.mlo_comp_timer = __le32_to_cpu(msg-&gt;mlo_comp_timer);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+exit:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_htt_htc_t2h_msg_handler(struct ath12k_base *ab,</div><div class='add'>+				       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct htt_resp_msg *resp = (struct htt_resp_msg *)skb-&gt;data;</div><div class='add'>+	enum htt_t2h_msg_type type;</div><div class='add'>+	u16 peer_id;</div><div class='add'>+	u8 vdev_id;</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='add'>+	u16 peer_mac_h16;</div><div class='add'>+	u16 ast_hash = 0;</div><div class='add'>+	u16 hw_peer_id;</div><div class='add'>+</div><div class='add'>+	type = le32_get_bits(resp-&gt;version_msg.version, HTT_T2H_MSG_TYPE);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_DP_HTT, "dp_htt rx msg type :0x%0x\n", type);</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case HTT_T2H_MSG_TYPE_VERSION_CONF:</div><div class='add'>+		dp-&gt;htt_tgt_ver_major = le32_get_bits(resp-&gt;version_msg.version,</div><div class='add'>+						      HTT_T2H_VERSION_CONF_MAJOR);</div><div class='add'>+		dp-&gt;htt_tgt_ver_minor = le32_get_bits(resp-&gt;version_msg.version,</div><div class='add'>+						      HTT_T2H_VERSION_CONF_MINOR);</div><div class='add'>+		complete(&amp;dp-&gt;htt_tgt_version_received);</div><div class='add'>+		break;</div><div class='add'>+	/* TODO: remove unused peer map versions after testing */</div><div class='add'>+	case HTT_T2H_MSG_TYPE_PEER_MAP:</div><div class='add'>+		vdev_id = le32_get_bits(resp-&gt;peer_map_ev.info,</div><div class='add'>+					HTT_T2H_PEER_MAP_INFO_VDEV_ID);</div><div class='add'>+		peer_id = le32_get_bits(resp-&gt;peer_map_ev.info,</div><div class='add'>+					HTT_T2H_PEER_MAP_INFO_PEER_ID);</div><div class='add'>+		peer_mac_h16 = le32_get_bits(resp-&gt;peer_map_ev.info1,</div><div class='add'>+					     HTT_T2H_PEER_MAP_INFO1_MAC_ADDR_H16);</div><div class='add'>+		ath12k_dp_get_mac_addr(le32_to_cpu(resp-&gt;peer_map_ev.mac_addr_l32),</div><div class='add'>+				       peer_mac_h16, mac_addr);</div><div class='add'>+		ath12k_peer_map_event(ab, vdev_id, peer_id, mac_addr, 0, 0);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_T2H_MSG_TYPE_PEER_MAP2:</div><div class='add'>+		vdev_id = le32_get_bits(resp-&gt;peer_map_ev.info,</div><div class='add'>+					HTT_T2H_PEER_MAP_INFO_VDEV_ID);</div><div class='add'>+		peer_id = le32_get_bits(resp-&gt;peer_map_ev.info,</div><div class='add'>+					HTT_T2H_PEER_MAP_INFO_PEER_ID);</div><div class='add'>+		peer_mac_h16 = le32_get_bits(resp-&gt;peer_map_ev.info1,</div><div class='add'>+					     HTT_T2H_PEER_MAP_INFO1_MAC_ADDR_H16);</div><div class='add'>+		ath12k_dp_get_mac_addr(le32_to_cpu(resp-&gt;peer_map_ev.mac_addr_l32),</div><div class='add'>+				       peer_mac_h16, mac_addr);</div><div class='add'>+		ast_hash = le32_get_bits(resp-&gt;peer_map_ev.info2,</div><div class='add'>+					 HTT_T2H_PEER_MAP_INFO2_AST_HASH_VAL);</div><div class='add'>+		hw_peer_id = le32_get_bits(resp-&gt;peer_map_ev.info1,</div><div class='add'>+					   HTT_T2H_PEER_MAP_INFO1_HW_PEER_ID);</div><div class='add'>+		ath12k_peer_map_event(ab, vdev_id, peer_id, mac_addr, ast_hash,</div><div class='add'>+				      hw_peer_id);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_T2H_MSG_TYPE_PEER_MAP3:</div><div class='add'>+		vdev_id = le32_get_bits(resp-&gt;peer_map_ev.info,</div><div class='add'>+					HTT_T2H_PEER_MAP_INFO_VDEV_ID);</div><div class='add'>+		peer_id = le32_get_bits(resp-&gt;peer_map_ev.info,</div><div class='add'>+					HTT_T2H_PEER_MAP_INFO_PEER_ID);</div><div class='add'>+		peer_mac_h16 = le32_get_bits(resp-&gt;peer_map_ev.info1,</div><div class='add'>+					     HTT_T2H_PEER_MAP_INFO1_MAC_ADDR_H16);</div><div class='add'>+		ath12k_dp_get_mac_addr(le32_to_cpu(resp-&gt;peer_map_ev.mac_addr_l32),</div><div class='add'>+				       peer_mac_h16, mac_addr);</div><div class='add'>+		ast_hash = le32_get_bits(resp-&gt;peer_map_ev.info2,</div><div class='add'>+					 HTT_T2H_PEER_MAP3_INFO2_AST_HASH_VAL);</div><div class='add'>+		hw_peer_id = le32_get_bits(resp-&gt;peer_map_ev.info2,</div><div class='add'>+					   HTT_T2H_PEER_MAP3_INFO2_HW_PEER_ID);</div><div class='add'>+		ath12k_peer_map_event(ab, vdev_id, peer_id, mac_addr, ast_hash,</div><div class='add'>+				      hw_peer_id);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_T2H_MSG_TYPE_PEER_UNMAP:</div><div class='add'>+	case HTT_T2H_MSG_TYPE_PEER_UNMAP2:</div><div class='add'>+		peer_id = le32_get_bits(resp-&gt;peer_unmap_ev.info,</div><div class='add'>+					HTT_T2H_PEER_UNMAP_INFO_PEER_ID);</div><div class='add'>+		ath12k_peer_unmap_event(ab, peer_id);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_T2H_MSG_TYPE_PPDU_STATS_IND:</div><div class='add'>+		ath12k_htt_pull_ppdu_stats(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_T2H_MSG_TYPE_EXT_STATS_CONF:</div><div class='add'>+		ath12k_debugfs_htt_ext_stats_handler(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case HTT_T2H_MSG_TYPE_MLO_TIMESTAMP_OFFSET_IND:</div><div class='add'>+		ath12k_htt_mlo_offset_event_handler(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_DP_HTT, "dp_htt event %d not handled\n",</div><div class='add'>+			   type);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_rx_msdu_coalesce(struct ath12k *ar,</div><div class='add'>+				      struct sk_buff_head *msdu_list,</div><div class='add'>+				      struct sk_buff *first, struct sk_buff *last,</div><div class='add'>+				      u8 l3pad_bytes, int msdu_len)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(first);</div><div class='add'>+	int buf_first_hdr_len, buf_first_len;</div><div class='add'>+	struct hal_rx_desc *ldesc;</div><div class='add'>+	int space_extra, rem_len, buf_len;</div><div class='add'>+	u32 hal_rx_desc_sz = ar-&gt;ab-&gt;hal.hal_desc_sz;</div><div class='add'>+	bool is_continuation;</div><div class='add'>+</div><div class='add'>+	/* As the msdu is spread across multiple rx buffers,</div><div class='add'>+	 * find the offset to the start of msdu for computing</div><div class='add'>+	 * the length of the msdu in the first buffer.</div><div class='add'>+	 */</div><div class='add'>+	buf_first_hdr_len = hal_rx_desc_sz + l3pad_bytes;</div><div class='add'>+	buf_first_len = DP_RX_BUFFER_SIZE - buf_first_hdr_len;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(msdu_len &lt;= buf_first_len)) {</div><div class='add'>+		skb_put(first, buf_first_hdr_len + msdu_len);</div><div class='add'>+		skb_pull(first, buf_first_hdr_len);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ldesc = (struct hal_rx_desc *)last-&gt;data;</div><div class='add'>+	rxcb-&gt;is_first_msdu = ath12k_dp_rx_h_first_msdu(ab, ldesc);</div><div class='add'>+	rxcb-&gt;is_last_msdu = ath12k_dp_rx_h_last_msdu(ab, ldesc);</div><div class='add'>+</div><div class='add'>+	/* MSDU spans over multiple buffers because the length of the MSDU</div><div class='add'>+	 * exceeds DP_RX_BUFFER_SIZE - HAL_RX_DESC_SIZE. So assume the data</div><div class='add'>+	 * in the first buf is of length DP_RX_BUFFER_SIZE - HAL_RX_DESC_SIZE.</div><div class='add'>+	 */</div><div class='add'>+	skb_put(first, DP_RX_BUFFER_SIZE);</div><div class='add'>+	skb_pull(first, buf_first_hdr_len);</div><div class='add'>+</div><div class='add'>+	/* When an MSDU spread over multiple buffers MSDU_END</div><div class='add'>+	 * tlvs are valid only in the last buffer. Copy those tlvs.</div><div class='add'>+	 */</div><div class='add'>+	ath12k_dp_rx_desc_end_tlv_copy(ab, rxcb-&gt;rx_desc, ldesc);</div><div class='add'>+</div><div class='add'>+	space_extra = msdu_len - (buf_first_len + skb_tailroom(first));</div><div class='add'>+	if (space_extra &gt; 0 &amp;&amp;</div><div class='add'>+	    (pskb_expand_head(first, 0, space_extra, GFP_ATOMIC) &lt; 0)) {</div><div class='add'>+		/* Free up all buffers of the MSDU */</div><div class='add'>+		while ((skb = __skb_dequeue(msdu_list)) != NULL) {</div><div class='add'>+			rxcb = ATH12K_SKB_RXCB(skb);</div><div class='add'>+			if (!rxcb-&gt;is_continuation) {</div><div class='add'>+				dev_kfree_skb_any(skb);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+		}</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rem_len = msdu_len - buf_first_len;</div><div class='add'>+	while ((skb = __skb_dequeue(msdu_list)) != NULL &amp;&amp; rem_len &gt; 0) {</div><div class='add'>+		rxcb = ATH12K_SKB_RXCB(skb);</div><div class='add'>+		is_continuation = rxcb-&gt;is_continuation;</div><div class='add'>+		if (is_continuation)</div><div class='add'>+			buf_len = DP_RX_BUFFER_SIZE - hal_rx_desc_sz;</div><div class='add'>+		else</div><div class='add'>+			buf_len = rem_len;</div><div class='add'>+</div><div class='add'>+		if (buf_len &gt; (DP_RX_BUFFER_SIZE - hal_rx_desc_sz)) {</div><div class='add'>+			WARN_ON_ONCE(1);</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb_put(skb, buf_len + hal_rx_desc_sz);</div><div class='add'>+		skb_pull(skb, hal_rx_desc_sz);</div><div class='add'>+		skb_copy_from_linear_data(skb, skb_put(first, buf_len),</div><div class='add'>+					  buf_len);</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+</div><div class='add'>+		rem_len -= buf_len;</div><div class='add'>+		if (!is_continuation)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ath12k_dp_rx_get_msdu_last_buf(struct sk_buff_head *msdu_list,</div><div class='add'>+						      struct sk_buff *first)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(first);</div><div class='add'>+</div><div class='add'>+	if (!rxcb-&gt;is_continuation)</div><div class='add'>+		return first;</div><div class='add'>+</div><div class='add'>+	skb_queue_walk(msdu_list, skb) {</div><div class='add'>+		rxcb = ATH12K_SKB_RXCB(skb);</div><div class='add'>+		if (!rxcb-&gt;is_continuation)</div><div class='add'>+			return skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_h_csum_offload(struct sk_buff *msdu,</div><div class='add'>+					struct ath12k_dp_rx_info *rx_info)</div><div class='add'>+{</div><div class='add'>+	msdu-&gt;ip_summed = (rx_info-&gt;ip_csum_fail || rx_info-&gt;l4_csum_fail) ?</div><div class='add'>+			   CHECKSUM_NONE : CHECKSUM_UNNECESSARY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_rx_crypto_mic_len(struct ath12k *ar, enum hal_encrypt_type enctype)</div><div class='add'>+{</div><div class='add'>+	switch (enctype) {</div><div class='add'>+	case HAL_ENCRYPT_TYPE_OPEN:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_TKIP_NO_MIC:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_TKIP_MIC:</div><div class='add'>+		return 0;</div><div class='add'>+	case HAL_ENCRYPT_TYPE_CCMP_128:</div><div class='add'>+		return IEEE80211_CCMP_MIC_LEN;</div><div class='add'>+	case HAL_ENCRYPT_TYPE_CCMP_256:</div><div class='add'>+		return IEEE80211_CCMP_256_MIC_LEN;</div><div class='add'>+	case HAL_ENCRYPT_TYPE_GCMP_128:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_AES_GCMP_256:</div><div class='add'>+		return IEEE80211_GCMP_MIC_LEN;</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WEP_40:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WEP_104:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WEP_128:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WAPI_GCM_SM4:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WAPI:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_warn(ar-&gt;ab, "unsupported encryption type %d for mic len\n", enctype);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_rx_crypto_param_len(struct ath12k *ar,</div><div class='add'>+					 enum hal_encrypt_type enctype)</div><div class='add'>+{</div><div class='add'>+	switch (enctype) {</div><div class='add'>+	case HAL_ENCRYPT_TYPE_OPEN:</div><div class='add'>+		return 0;</div><div class='add'>+	case HAL_ENCRYPT_TYPE_TKIP_NO_MIC:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_TKIP_MIC:</div><div class='add'>+		return IEEE80211_TKIP_IV_LEN;</div><div class='add'>+	case HAL_ENCRYPT_TYPE_CCMP_128:</div><div class='add'>+		return IEEE80211_CCMP_HDR_LEN;</div><div class='add'>+	case HAL_ENCRYPT_TYPE_CCMP_256:</div><div class='add'>+		return IEEE80211_CCMP_256_HDR_LEN;</div><div class='add'>+	case HAL_ENCRYPT_TYPE_GCMP_128:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_AES_GCMP_256:</div><div class='add'>+		return IEEE80211_GCMP_HDR_LEN;</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WEP_40:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WEP_104:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WEP_128:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WAPI_GCM_SM4:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WAPI:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_warn(ar-&gt;ab, "unsupported encryption type %d\n", enctype);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_rx_crypto_icv_len(struct ath12k *ar,</div><div class='add'>+				       enum hal_encrypt_type enctype)</div><div class='add'>+{</div><div class='add'>+	switch (enctype) {</div><div class='add'>+	case HAL_ENCRYPT_TYPE_OPEN:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_CCMP_128:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_CCMP_256:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_GCMP_128:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_AES_GCMP_256:</div><div class='add'>+		return 0;</div><div class='add'>+	case HAL_ENCRYPT_TYPE_TKIP_NO_MIC:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_TKIP_MIC:</div><div class='add'>+		return IEEE80211_TKIP_ICV_LEN;</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WEP_40:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WEP_104:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WEP_128:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WAPI_GCM_SM4:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WAPI:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_warn(ar-&gt;ab, "unsupported encryption type %d\n", enctype);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_h_undecap_nwifi(struct ath12k *ar,</div><div class='add'>+					 struct sk_buff *msdu,</div><div class='add'>+					 enum hal_encrypt_type enctype,</div><div class='add'>+					 struct ieee80211_rx_status *status)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(msdu);</div><div class='add'>+	u8 decap_hdr[DP_MAX_NWIFI_HDR_LEN];</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	size_t hdr_len;</div><div class='add'>+	u8 *crypto_hdr;</div><div class='add'>+	u16 qos_ctl;</div><div class='add'>+</div><div class='add'>+	/* pull decapped header */</div><div class='add'>+	hdr = (struct ieee80211_hdr *)msdu-&gt;data;</div><div class='add'>+	hdr_len = ieee80211_hdrlen(hdr-&gt;frame_control);</div><div class='add'>+	skb_pull(msdu, hdr_len);</div><div class='add'>+</div><div class='add'>+	/*  Rebuild qos header */</div><div class='add'>+	hdr-&gt;frame_control |= __cpu_to_le16(IEEE80211_STYPE_QOS_DATA);</div><div class='add'>+</div><div class='add'>+	/* Reset the order bit as the HT_Control header is stripped */</div><div class='add'>+	hdr-&gt;frame_control &amp;= ~(__cpu_to_le16(IEEE80211_FCTL_ORDER));</div><div class='add'>+</div><div class='add'>+	qos_ctl = rxcb-&gt;tid;</div><div class='add'>+</div><div class='add'>+	if (ath12k_dp_rx_h_mesh_ctl_present(ab, rxcb-&gt;rx_desc))</div><div class='add'>+		qos_ctl |= IEEE80211_QOS_CTL_MESH_CONTROL_PRESENT;</div><div class='add'>+</div><div class='add'>+	/* TODO: Add other QoS ctl fields when required */</div><div class='add'>+</div><div class='add'>+	/* copy decap header before overwriting for reuse below */</div><div class='add'>+	memcpy(decap_hdr, hdr, hdr_len);</div><div class='add'>+</div><div class='add'>+	/* Rebuild crypto header for mac80211 use */</div><div class='add'>+	if (!(status-&gt;flag &amp; RX_FLAG_IV_STRIPPED)) {</div><div class='add'>+		crypto_hdr = skb_push(msdu, ath12k_dp_rx_crypto_param_len(ar, enctype));</div><div class='add'>+		ath12k_dp_rx_desc_get_crypto_header(ar-&gt;ab,</div><div class='add'>+						    rxcb-&gt;rx_desc, crypto_hdr,</div><div class='add'>+						    enctype);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(skb_push(msdu,</div><div class='add'>+			IEEE80211_QOS_CTL_LEN), &amp;qos_ctl,</div><div class='add'>+			IEEE80211_QOS_CTL_LEN);</div><div class='add'>+	memcpy(skb_push(msdu, hdr_len), decap_hdr, hdr_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_h_undecap_raw(struct ath12k *ar, struct sk_buff *msdu,</div><div class='add'>+				       enum hal_encrypt_type enctype,</div><div class='add'>+				       struct ieee80211_rx_status *status,</div><div class='add'>+				       bool decrypted)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(msdu);</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	size_t hdr_len;</div><div class='add'>+	size_t crypto_len;</div><div class='add'>+</div><div class='add'>+	if (!rxcb-&gt;is_first_msdu ||</div><div class='add'>+	    !(rxcb-&gt;is_first_msdu &amp;&amp; rxcb-&gt;is_last_msdu)) {</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_trim(msdu, msdu-&gt;len - FCS_LEN);</div><div class='add'>+</div><div class='add'>+	if (!decrypted)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hdr = (void *)msdu-&gt;data;</div><div class='add'>+</div><div class='add'>+	/* Tail */</div><div class='add'>+	if (status-&gt;flag &amp; RX_FLAG_IV_STRIPPED) {</div><div class='add'>+		skb_trim(msdu, msdu-&gt;len -</div><div class='add'>+			 ath12k_dp_rx_crypto_mic_len(ar, enctype));</div><div class='add'>+</div><div class='add'>+		skb_trim(msdu, msdu-&gt;len -</div><div class='add'>+			 ath12k_dp_rx_crypto_icv_len(ar, enctype));</div><div class='add'>+	} else {</div><div class='add'>+		/* MIC */</div><div class='add'>+		if (status-&gt;flag &amp; RX_FLAG_MIC_STRIPPED)</div><div class='add'>+			skb_trim(msdu, msdu-&gt;len -</div><div class='add'>+				 ath12k_dp_rx_crypto_mic_len(ar, enctype));</div><div class='add'>+</div><div class='add'>+		/* ICV */</div><div class='add'>+		if (status-&gt;flag &amp; RX_FLAG_ICV_STRIPPED)</div><div class='add'>+			skb_trim(msdu, msdu-&gt;len -</div><div class='add'>+				 ath12k_dp_rx_crypto_icv_len(ar, enctype));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* MMIC */</div><div class='add'>+	if ((status-&gt;flag &amp; RX_FLAG_MMIC_STRIPPED) &amp;&amp;</div><div class='add'>+	    !ieee80211_has_morefrags(hdr-&gt;frame_control) &amp;&amp;</div><div class='add'>+	    enctype == HAL_ENCRYPT_TYPE_TKIP_MIC)</div><div class='add'>+		skb_trim(msdu, msdu-&gt;len - IEEE80211_CCMP_MIC_LEN);</div><div class='add'>+</div><div class='add'>+	/* Head */</div><div class='add'>+	if (status-&gt;flag &amp; RX_FLAG_IV_STRIPPED) {</div><div class='add'>+		hdr_len = ieee80211_hdrlen(hdr-&gt;frame_control);</div><div class='add'>+		crypto_len = ath12k_dp_rx_crypto_param_len(ar, enctype);</div><div class='add'>+</div><div class='add'>+		memmove(msdu-&gt;data + crypto_len, msdu-&gt;data, hdr_len);</div><div class='add'>+		skb_pull(msdu, crypto_len);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_get_dot11_hdr_from_rx_desc(struct ath12k *ar,</div><div class='add'>+					      struct sk_buff *msdu,</div><div class='add'>+					      struct ath12k_skb_rxcb *rxcb,</div><div class='add'>+					      struct ieee80211_rx_status *status,</div><div class='add'>+					      enum hal_encrypt_type enctype)</div><div class='add'>+{</div><div class='add'>+	struct hal_rx_desc *rx_desc = rxcb-&gt;rx_desc;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	size_t hdr_len, crypto_len;</div><div class='add'>+	struct ieee80211_hdr hdr;</div><div class='add'>+	__le16 qos_ctl;</div><div class='add'>+	u8 *crypto_hdr, mesh_ctrl;</div><div class='add'>+</div><div class='add'>+	ath12k_dp_rx_desc_get_dot11_hdr(ab, rx_desc, &amp;hdr);</div><div class='add'>+	hdr_len = ieee80211_hdrlen(hdr.frame_control);</div><div class='add'>+	mesh_ctrl = ath12k_dp_rx_h_mesh_ctl_present(ab, rx_desc);</div><div class='add'>+</div><div class='add'>+	if (!(status-&gt;flag &amp; RX_FLAG_IV_STRIPPED)) {</div><div class='add'>+		crypto_len = ath12k_dp_rx_crypto_param_len(ar, enctype);</div><div class='add'>+		crypto_hdr = skb_push(msdu, crypto_len);</div><div class='add'>+		ath12k_dp_rx_desc_get_crypto_header(ab, rx_desc, crypto_hdr, enctype);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_push(msdu, hdr_len);</div><div class='add'>+	memcpy(msdu-&gt;data, &amp;hdr, min(hdr_len, sizeof(hdr)));</div><div class='add'>+</div><div class='add'>+	if (rxcb-&gt;is_mcbc)</div><div class='add'>+		status-&gt;flag &amp;= ~RX_FLAG_PN_VALIDATED;</div><div class='add'>+</div><div class='add'>+	/* Add QOS header */</div><div class='add'>+	if (ieee80211_is_data_qos(hdr.frame_control)) {</div><div class='add'>+		struct ieee80211_hdr *qos_ptr = (struct ieee80211_hdr *)msdu-&gt;data;</div><div class='add'>+</div><div class='add'>+		qos_ctl = cpu_to_le16(rxcb-&gt;tid &amp; IEEE80211_QOS_CTL_TID_MASK);</div><div class='add'>+		if (mesh_ctrl)</div><div class='add'>+			qos_ctl |= cpu_to_le16(IEEE80211_QOS_CTL_MESH_CONTROL_PRESENT);</div><div class='add'>+</div><div class='add'>+		memcpy(ieee80211_get_qos_ctl(qos_ptr), &amp;qos_ctl, IEEE80211_QOS_CTL_LEN);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_h_undecap_eth(struct ath12k *ar,</div><div class='add'>+				       struct sk_buff *msdu,</div><div class='add'>+				       enum hal_encrypt_type enctype,</div><div class='add'>+				       struct ieee80211_rx_status *status)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	struct ethhdr *eth;</div><div class='add'>+	u8 da[ETH_ALEN];</div><div class='add'>+	u8 sa[ETH_ALEN];</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(msdu);</div><div class='add'>+	struct ath12k_dp_rx_rfc1042_hdr rfc = {0xaa, 0xaa, 0x03, {0x00, 0x00, 0x00}};</div><div class='add'>+</div><div class='add'>+	eth = (struct ethhdr *)msdu-&gt;data;</div><div class='add'>+	ether_addr_copy(da, eth-&gt;h_dest);</div><div class='add'>+	ether_addr_copy(sa, eth-&gt;h_source);</div><div class='add'>+	rfc.snap_type = eth-&gt;h_proto;</div><div class='add'>+	skb_pull(msdu, sizeof(*eth));</div><div class='add'>+	memcpy(skb_push(msdu, sizeof(rfc)), &amp;rfc,</div><div class='add'>+	       sizeof(rfc));</div><div class='add'>+	ath12k_get_dot11_hdr_from_rx_desc(ar, msdu, rxcb, status, enctype);</div><div class='add'>+</div><div class='add'>+	/* original 802.11 header has a different DA and in</div><div class='add'>+	 * case of 4addr it may also have different SA</div><div class='add'>+	 */</div><div class='add'>+	hdr = (struct ieee80211_hdr *)msdu-&gt;data;</div><div class='add'>+	ether_addr_copy(ieee80211_get_DA(hdr), da);</div><div class='add'>+	ether_addr_copy(ieee80211_get_SA(hdr), sa);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_h_undecap(struct ath12k *ar, struct sk_buff *msdu,</div><div class='add'>+				   struct hal_rx_desc *rx_desc,</div><div class='add'>+				   enum hal_encrypt_type enctype,</div><div class='add'>+				   struct ieee80211_rx_status *status,</div><div class='add'>+				   bool decrypted)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	u8 decap;</div><div class='add'>+	struct ethhdr *ehdr;</div><div class='add'>+</div><div class='add'>+	decap = ath12k_dp_rx_h_decap_type(ab, rx_desc);</div><div class='add'>+</div><div class='add'>+	switch (decap) {</div><div class='add'>+	case DP_RX_DECAP_TYPE_NATIVE_WIFI:</div><div class='add'>+		ath12k_dp_rx_h_undecap_nwifi(ar, msdu, enctype, status);</div><div class='add'>+		break;</div><div class='add'>+	case DP_RX_DECAP_TYPE_RAW:</div><div class='add'>+		ath12k_dp_rx_h_undecap_raw(ar, msdu, enctype, status,</div><div class='add'>+					   decrypted);</div><div class='add'>+		break;</div><div class='add'>+	case DP_RX_DECAP_TYPE_ETHERNET2_DIX:</div><div class='add'>+		ehdr = (struct ethhdr *)msdu-&gt;data;</div><div class='add'>+</div><div class='add'>+		/* mac80211 allows fast path only for authorized STA */</div><div class='add'>+		if (ehdr-&gt;h_proto == cpu_to_be16(ETH_P_PAE)) {</div><div class='add'>+			ATH12K_SKB_RXCB(msdu)-&gt;is_eapol = true;</div><div class='add'>+			ath12k_dp_rx_h_undecap_eth(ar, msdu, enctype, status);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* PN for mcast packets will be validated in mac80211;</div><div class='add'>+		 * remove eth header and add 802.11 header.</div><div class='add'>+		 */</div><div class='add'>+		if (ATH12K_SKB_RXCB(msdu)-&gt;is_mcbc &amp;&amp; decrypted)</div><div class='add'>+			ath12k_dp_rx_h_undecap_eth(ar, msdu, enctype, status);</div><div class='add'>+		break;</div><div class='add'>+	case DP_RX_DECAP_TYPE_8023:</div><div class='add'>+		/* TODO: Handle undecap for these formats */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ath12k_peer *</div><div class='add'>+ath12k_dp_rx_h_find_peer(struct ath12k_base *ab, struct sk_buff *msdu,</div><div class='add'>+			 struct ath12k_dp_rx_info *rx_info)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(msdu);</div><div class='add'>+	struct ath12k_peer *peer = NULL;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	if (rxcb-&gt;peer_id)</div><div class='add'>+		peer = ath12k_peer_find_by_id(ab, rxcb-&gt;peer_id);</div><div class='add'>+</div><div class='add'>+	if (peer)</div><div class='add'>+		return peer;</div><div class='add'>+</div><div class='add'>+	if (rx_info-&gt;addr2_present)</div><div class='add'>+		peer = ath12k_peer_find_by_addr(ab, rx_info-&gt;addr2);</div><div class='add'>+</div><div class='add'>+	return peer;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_h_mpdu(struct ath12k *ar,</div><div class='add'>+				struct sk_buff *msdu,</div><div class='add'>+				struct hal_rx_desc *rx_desc,</div><div class='add'>+				struct ath12k_dp_rx_info *rx_info)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb;</div><div class='add'>+	enum hal_encrypt_type enctype;</div><div class='add'>+	bool is_decrypted = false;</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	struct ieee80211_rx_status *rx_status = rx_info-&gt;rx_status;</div><div class='add'>+	u32 err_bitmap;</div><div class='add'>+</div><div class='add'>+	/* PN for multicast packets will be checked in mac80211 */</div><div class='add'>+	rxcb = ATH12K_SKB_RXCB(msdu);</div><div class='add'>+	rxcb-&gt;is_mcbc = rx_info-&gt;is_mcbc;</div><div class='add'>+</div><div class='add'>+	if (rxcb-&gt;is_mcbc)</div><div class='add'>+		rxcb-&gt;peer_id = rx_info-&gt;peer_id;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+	peer = ath12k_dp_rx_h_find_peer(ar-&gt;ab, msdu, rx_info);</div><div class='add'>+	if (peer) {</div><div class='add'>+		/* resetting mcbc bit because mcbc packets are unicast</div><div class='add'>+		 * packets only for AP as STA sends unicast packets.</div><div class='add'>+		 */</div><div class='add'>+		rxcb-&gt;is_mcbc = rxcb-&gt;is_mcbc &amp;&amp; !peer-&gt;ucast_ra_only;</div><div class='add'>+</div><div class='add'>+		if (rxcb-&gt;is_mcbc)</div><div class='add'>+			enctype = peer-&gt;sec_type_grp;</div><div class='add'>+		else</div><div class='add'>+			enctype = peer-&gt;sec_type;</div><div class='add'>+	} else {</div><div class='add'>+		enctype = HAL_ENCRYPT_TYPE_OPEN;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	err_bitmap = ath12k_dp_rx_h_mpdu_err(ab, rx_desc);</div><div class='add'>+	if (enctype != HAL_ENCRYPT_TYPE_OPEN &amp;&amp; !err_bitmap)</div><div class='add'>+		is_decrypted = ath12k_dp_rx_h_is_decrypted(ab, rx_desc);</div><div class='add'>+</div><div class='add'>+	/* Clear per-MPDU flags while leaving per-PPDU flags intact */</div><div class='add'>+	rx_status-&gt;flag &amp;= ~(RX_FLAG_FAILED_FCS_CRC |</div><div class='add'>+			     RX_FLAG_MMIC_ERROR |</div><div class='add'>+			     RX_FLAG_DECRYPTED |</div><div class='add'>+			     RX_FLAG_IV_STRIPPED |</div><div class='add'>+			     RX_FLAG_MMIC_STRIPPED);</div><div class='add'>+</div><div class='add'>+	if (err_bitmap &amp; HAL_RX_MPDU_ERR_FCS)</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_FAILED_FCS_CRC;</div><div class='add'>+	if (err_bitmap &amp; HAL_RX_MPDU_ERR_TKIP_MIC)</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_MMIC_ERROR;</div><div class='add'>+</div><div class='add'>+	if (is_decrypted) {</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_DECRYPTED | RX_FLAG_MMIC_STRIPPED;</div><div class='add'>+</div><div class='add'>+		if (rx_info-&gt;is_mcbc)</div><div class='add'>+			rx_status-&gt;flag |= RX_FLAG_MIC_STRIPPED |</div><div class='add'>+					RX_FLAG_ICV_STRIPPED;</div><div class='add'>+		else</div><div class='add'>+			rx_status-&gt;flag |= RX_FLAG_IV_STRIPPED |</div><div class='add'>+					   RX_FLAG_PN_VALIDATED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dp_rx_h_csum_offload(msdu, rx_info);</div><div class='add'>+	ath12k_dp_rx_h_undecap(ar, msdu, rx_desc,</div><div class='add'>+			       enctype, rx_status, is_decrypted);</div><div class='add'>+</div><div class='add'>+	if (!is_decrypted || rx_info-&gt;is_mcbc)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (rx_info-&gt;decap_type != DP_RX_DECAP_TYPE_ETHERNET2_DIX) {</div><div class='add'>+		hdr = (void *)msdu-&gt;data;</div><div class='add'>+		hdr-&gt;frame_control &amp;= ~__cpu_to_le16(IEEE80211_FCTL_PROTECTED);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_h_rate(struct ath12k *ar, struct ath12k_dp_rx_info *rx_info)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	struct ieee80211_rx_status *rx_status = rx_info-&gt;rx_status;</div><div class='add'>+	enum rx_msdu_start_pkt_type pkt_type = rx_info-&gt;pkt_type;</div><div class='add'>+	u8 bw = rx_info-&gt;bw, sgi = rx_info-&gt;sgi;</div><div class='add'>+	u8 rate_mcs = rx_info-&gt;rate_mcs, nss = rx_info-&gt;nss;</div><div class='add'>+	bool is_cck;</div><div class='add'>+</div><div class='add'>+	switch (pkt_type) {</div><div class='add'>+	case RX_MSDU_START_PKT_TYPE_11A:</div><div class='add'>+	case RX_MSDU_START_PKT_TYPE_11B:</div><div class='add'>+		is_cck = (pkt_type == RX_MSDU_START_PKT_TYPE_11B);</div><div class='add'>+		sband = &amp;ar-&gt;mac.sbands[rx_status-&gt;band];</div><div class='add'>+		rx_status-&gt;rate_idx = ath12k_mac_hw_rate_to_idx(sband, rate_mcs,</div><div class='add'>+								is_cck);</div><div class='add'>+		break;</div><div class='add'>+	case RX_MSDU_START_PKT_TYPE_11N:</div><div class='add'>+		rx_status-&gt;encoding = RX_ENC_HT;</div><div class='add'>+		if (rate_mcs &gt; ATH12K_HT_MCS_MAX) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "Received with invalid mcs in HT mode %d\n",</div><div class='add'>+				     rate_mcs);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		rx_status-&gt;rate_idx = rate_mcs + (8 * (nss - 1));</div><div class='add'>+		if (sgi)</div><div class='add'>+			rx_status-&gt;enc_flags |= RX_ENC_FLAG_SHORT_GI;</div><div class='add'>+		rx_status-&gt;bw = ath12k_mac_bw_to_mac80211_bw(bw);</div><div class='add'>+		break;</div><div class='add'>+	case RX_MSDU_START_PKT_TYPE_11AC:</div><div class='add'>+		rx_status-&gt;encoding = RX_ENC_VHT;</div><div class='add'>+		rx_status-&gt;rate_idx = rate_mcs;</div><div class='add'>+		if (rate_mcs &gt; ATH12K_VHT_MCS_MAX) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "Received with invalid mcs in VHT mode %d\n",</div><div class='add'>+				     rate_mcs);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		rx_status-&gt;nss = nss;</div><div class='add'>+		if (sgi)</div><div class='add'>+			rx_status-&gt;enc_flags |= RX_ENC_FLAG_SHORT_GI;</div><div class='add'>+		rx_status-&gt;bw = ath12k_mac_bw_to_mac80211_bw(bw);</div><div class='add'>+		break;</div><div class='add'>+	case RX_MSDU_START_PKT_TYPE_11AX:</div><div class='add'>+		rx_status-&gt;rate_idx = rate_mcs;</div><div class='add'>+		if (rate_mcs &gt; ATH12K_HE_MCS_MAX) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "Received with invalid mcs in HE mode %d\n",</div><div class='add'>+				    rate_mcs);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		rx_status-&gt;encoding = RX_ENC_HE;</div><div class='add'>+		rx_status-&gt;nss = nss;</div><div class='add'>+		rx_status-&gt;he_gi = ath12k_he_gi_to_nl80211_he_gi(sgi);</div><div class='add'>+		rx_status-&gt;bw = ath12k_mac_bw_to_mac80211_bw(bw);</div><div class='add'>+		break;</div><div class='add'>+	case RX_MSDU_START_PKT_TYPE_11BE:</div><div class='add'>+		rx_status-&gt;rate_idx = rate_mcs;</div><div class='add'>+</div><div class='add'>+		if (rate_mcs &gt; ATH12K_EHT_MCS_MAX) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "Received with invalid mcs in EHT mode %d\n",</div><div class='add'>+				    rate_mcs);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rx_status-&gt;encoding = RX_ENC_EHT;</div><div class='add'>+		rx_status-&gt;nss = nss;</div><div class='add'>+		rx_status-&gt;eht.gi = ath12k_mac_eht_gi_to_nl80211_eht_gi(sgi);</div><div class='add'>+		rx_status-&gt;bw = ath12k_mac_bw_to_mac80211_bw(bw);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_rx_h_fetch_info(struct ath12k_base *ab, struct hal_rx_desc *rx_desc,</div><div class='add'>+			       struct ath12k_dp_rx_info *rx_info)</div><div class='add'>+{</div><div class='add'>+	rx_info-&gt;ip_csum_fail = ath12k_dp_rx_h_ip_cksum_fail(ab, rx_desc);</div><div class='add'>+	rx_info-&gt;l4_csum_fail = ath12k_dp_rx_h_l4_cksum_fail(ab, rx_desc);</div><div class='add'>+	rx_info-&gt;is_mcbc = ath12k_dp_rx_h_is_da_mcbc(ab, rx_desc);</div><div class='add'>+	rx_info-&gt;decap_type = ath12k_dp_rx_h_decap_type(ab, rx_desc);</div><div class='add'>+	rx_info-&gt;pkt_type = ath12k_dp_rx_h_pkt_type(ab, rx_desc);</div><div class='add'>+	rx_info-&gt;sgi = ath12k_dp_rx_h_sgi(ab, rx_desc);</div><div class='add'>+	rx_info-&gt;rate_mcs = ath12k_dp_rx_h_rate_mcs(ab, rx_desc);</div><div class='add'>+	rx_info-&gt;bw = ath12k_dp_rx_h_rx_bw(ab, rx_desc);</div><div class='add'>+	rx_info-&gt;nss = ath12k_dp_rx_h_nss(ab, rx_desc);</div><div class='add'>+	rx_info-&gt;tid = ath12k_dp_rx_h_tid(ab, rx_desc);</div><div class='add'>+	rx_info-&gt;peer_id = ath12k_dp_rx_h_peer_id(ab, rx_desc);</div><div class='add'>+	rx_info-&gt;phy_meta_data = ath12k_dp_rx_h_freq(ab, rx_desc);</div><div class='add'>+</div><div class='add'>+	if (ath12k_dp_rxdesc_mac_addr2_valid(ab, rx_desc)) {</div><div class='add'>+		ether_addr_copy(rx_info-&gt;addr2,</div><div class='add'>+				ath12k_dp_rxdesc_get_mpdu_start_addr2(ab, rx_desc));</div><div class='add'>+		rx_info-&gt;addr2_present = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg_dump(ab, ATH12K_DBG_DATA, NULL, "rx_desc: ",</div><div class='add'>+			rx_desc, sizeof(*rx_desc));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_rx_h_ppdu(struct ath12k *ar, struct ath12k_dp_rx_info *rx_info)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_rx_status *rx_status = rx_info-&gt;rx_status;</div><div class='add'>+	u8 channel_num;</div><div class='add'>+	u32 center_freq, meta_data;</div><div class='add'>+	struct ieee80211_channel *channel;</div><div class='add'>+</div><div class='add'>+	rx_status-&gt;freq = 0;</div><div class='add'>+	rx_status-&gt;rate_idx = 0;</div><div class='add'>+	rx_status-&gt;nss = 0;</div><div class='add'>+	rx_status-&gt;encoding = RX_ENC_LEGACY;</div><div class='add'>+	rx_status-&gt;bw = RATE_INFO_BW_20;</div><div class='add'>+	rx_status-&gt;enc_flags = 0;</div><div class='add'>+</div><div class='add'>+	rx_status-&gt;flag |= RX_FLAG_NO_SIGNAL_VAL;</div><div class='add'>+</div><div class='add'>+	meta_data = rx_info-&gt;phy_meta_data;</div><div class='add'>+	channel_num = meta_data;</div><div class='add'>+	center_freq = meta_data &gt;&gt; 16;</div><div class='add'>+</div><div class='add'>+	rx_status-&gt;band = NUM_NL80211_BANDS;</div><div class='add'>+</div><div class='add'>+	if (center_freq &gt;= ATH12K_MIN_6GHZ_FREQ &amp;&amp;</div><div class='add'>+	    center_freq &lt;= ATH12K_MAX_6GHZ_FREQ) {</div><div class='add'>+		rx_status-&gt;band = NL80211_BAND_6GHZ;</div><div class='add'>+		rx_status-&gt;freq = center_freq;</div><div class='add'>+	} else if (channel_num &gt;= 1 &amp;&amp; channel_num &lt;= 14) {</div><div class='add'>+		rx_status-&gt;band = NL80211_BAND_2GHZ;</div><div class='add'>+	} else if (channel_num &gt;= 36 &amp;&amp; channel_num &lt;= 173) {</div><div class='add'>+		rx_status-&gt;band = NL80211_BAND_5GHZ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(rx_status-&gt;band == NUM_NL80211_BANDS ||</div><div class='add'>+		     !ath12k_ar_to_hw(ar)-&gt;wiphy-&gt;bands[rx_status-&gt;band])) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "sband is NULL for status band %d channel_num %d center_freq %d pdev_id %d\n",</div><div class='add'>+			    rx_status-&gt;band, channel_num, center_freq, ar-&gt;pdev_idx);</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		channel = ar-&gt;rx_channel;</div><div class='add'>+		if (channel) {</div><div class='add'>+			rx_status-&gt;band = channel-&gt;band;</div><div class='add'>+			channel_num =</div><div class='add'>+				ieee80211_frequency_to_channel(channel-&gt;center_freq);</div><div class='add'>+			rx_status-&gt;freq = ieee80211_channel_to_frequency(channel_num,</div><div class='add'>+									 rx_status-&gt;band);</div><div class='add'>+		} else {</div><div class='add'>+			ath12k_err(ar-&gt;ab, "unable to determine channel, band for rx packet");</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		goto h_rate;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rx_status-&gt;band != NL80211_BAND_6GHZ)</div><div class='add'>+		rx_status-&gt;freq = ieee80211_channel_to_frequency(channel_num,</div><div class='add'>+								 rx_status-&gt;band);</div><div class='add'>+</div><div class='add'>+h_rate:</div><div class='add'>+	ath12k_dp_rx_h_rate(ar, rx_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_deliver_msdu(struct ath12k *ar, struct napi_struct *napi,</div><div class='add'>+				      struct sk_buff *msdu,</div><div class='add'>+				      struct ath12k_dp_rx_info *rx_info)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ieee80211_rx_status *rx_status;</div><div class='add'>+	struct ieee80211_sta *pubsta;</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(msdu);</div><div class='add'>+	struct ieee80211_rx_status *status = rx_info-&gt;rx_status;</div><div class='add'>+	u8 decap = rx_info-&gt;decap_type;</div><div class='add'>+	bool is_mcbc = rxcb-&gt;is_mcbc;</div><div class='add'>+	bool is_eapol = rxcb-&gt;is_eapol;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	peer = ath12k_dp_rx_h_find_peer(ab, msdu, rx_info);</div><div class='add'>+</div><div class='add'>+	pubsta = peer ? peer-&gt;sta : NULL;</div><div class='add'>+</div><div class='add'>+	if (pubsta &amp;&amp; pubsta-&gt;valid_links) {</div><div class='add'>+		status-&gt;link_valid = 1;</div><div class='add'>+		status-&gt;link_id = peer-&gt;link_id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_DATA,</div><div class='add'>+		   "rx skb %p len %u peer %pM %d %s sn %u %s%s%s%s%s%s%s%s%s%s rate_idx %u vht_nss %u freq %u band %u flag 0x%x fcs-err %i mic-err %i amsdu-more %i\n",</div><div class='add'>+		   msdu,</div><div class='add'>+		   msdu-&gt;len,</div><div class='add'>+		   peer ? peer-&gt;addr : NULL,</div><div class='add'>+		   rxcb-&gt;tid,</div><div class='add'>+		   is_mcbc ? "mcast" : "ucast",</div><div class='add'>+		   ath12k_dp_rx_h_seq_no(ab, rxcb-&gt;rx_desc),</div><div class='add'>+		   (status-&gt;encoding == RX_ENC_LEGACY) ? "legacy" : "",</div><div class='add'>+		   (status-&gt;encoding == RX_ENC_HT) ? "ht" : "",</div><div class='add'>+		   (status-&gt;encoding == RX_ENC_VHT) ? "vht" : "",</div><div class='add'>+		   (status-&gt;encoding == RX_ENC_HE) ? "he" : "",</div><div class='add'>+		   (status-&gt;encoding == RX_ENC_EHT) ? "eht" : "",</div><div class='add'>+		   (status-&gt;bw == RATE_INFO_BW_40) ? "40" : "",</div><div class='add'>+		   (status-&gt;bw == RATE_INFO_BW_80) ? "80" : "",</div><div class='add'>+		   (status-&gt;bw == RATE_INFO_BW_160) ? "160" : "",</div><div class='add'>+		   (status-&gt;bw == RATE_INFO_BW_320) ? "320" : "",</div><div class='add'>+		   status-&gt;enc_flags &amp; RX_ENC_FLAG_SHORT_GI ? "sgi " : "",</div><div class='add'>+		   status-&gt;rate_idx,</div><div class='add'>+		   status-&gt;nss,</div><div class='add'>+		   status-&gt;freq,</div><div class='add'>+		   status-&gt;band, status-&gt;flag,</div><div class='add'>+		   !!(status-&gt;flag &amp; RX_FLAG_FAILED_FCS_CRC),</div><div class='add'>+		   !!(status-&gt;flag &amp; RX_FLAG_MMIC_ERROR),</div><div class='add'>+		   !!(status-&gt;flag &amp; RX_FLAG_AMSDU_MORE));</div><div class='add'>+</div><div class='add'>+	ath12k_dbg_dump(ab, ATH12K_DBG_DP_RX, NULL, "dp rx msdu: ",</div><div class='add'>+			msdu-&gt;data, msdu-&gt;len);</div><div class='add'>+</div><div class='add'>+	rx_status = IEEE80211_SKB_RXCB(msdu);</div><div class='add'>+	*rx_status = *status;</div><div class='add'>+</div><div class='add'>+	/* TODO: trace rx packet */</div><div class='add'>+</div><div class='add'>+	/* PN for multicast packets are not validate in HW,</div><div class='add'>+	 * so skip 802.3 rx path</div><div class='add'>+	 * Also, fast_rx expects the STA to be authorized, hence</div><div class='add'>+	 * eapol packets are sent in slow path.</div><div class='add'>+	 */</div><div class='add'>+	if (decap == DP_RX_DECAP_TYPE_ETHERNET2_DIX &amp;&amp; !is_eapol &amp;&amp;</div><div class='add'>+	    !(is_mcbc &amp;&amp; rx_status-&gt;flag &amp; RX_FLAG_DECRYPTED))</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_8023;</div><div class='add'>+</div><div class='add'>+	ieee80211_rx_napi(ath12k_ar_to_hw(ar), pubsta, msdu, napi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_dp_rx_check_nwifi_hdr_len_valid(struct ath12k_base *ab,</div><div class='add'>+						   struct hal_rx_desc *rx_desc,</div><div class='add'>+						   struct sk_buff *msdu)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	u8 decap_type;</div><div class='add'>+	u32 hdr_len;</div><div class='add'>+</div><div class='add'>+	decap_type = ath12k_dp_rx_h_decap_type(ab, rx_desc);</div><div class='add'>+	if (decap_type != DP_RX_DECAP_TYPE_NATIVE_WIFI)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr *)msdu-&gt;data;</div><div class='add'>+	hdr_len = ieee80211_hdrlen(hdr-&gt;frame_control);</div><div class='add'>+</div><div class='add'>+	if ((likely(hdr_len &lt;= DP_MAX_NWIFI_HDR_LEN)))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	ab-&gt;device_stats.invalid_rbm++;</div><div class='add'>+	WARN_ON_ONCE(1);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_rx_process_msdu(struct ath12k *ar,</div><div class='add'>+				     struct sk_buff *msdu,</div><div class='add'>+				     struct sk_buff_head *msdu_list,</div><div class='add'>+				     struct ath12k_dp_rx_info *rx_info)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct hal_rx_desc *rx_desc, *lrx_desc;</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb;</div><div class='add'>+	struct sk_buff *last_buf;</div><div class='add'>+	u8 l3_pad_bytes;</div><div class='add'>+	u16 msdu_len;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 hal_rx_desc_sz = ar-&gt;ab-&gt;hal.hal_desc_sz;</div><div class='add'>+</div><div class='add'>+	last_buf = ath12k_dp_rx_get_msdu_last_buf(msdu_list, msdu);</div><div class='add'>+	if (!last_buf) {</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "No valid Rx buffer to access MSDU_END tlv\n");</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto free_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_desc = (struct hal_rx_desc *)msdu-&gt;data;</div><div class='add'>+	lrx_desc = (struct hal_rx_desc *)last_buf-&gt;data;</div><div class='add'>+	if (!ath12k_dp_rx_h_msdu_done(ab, lrx_desc)) {</div><div class='add'>+		ath12k_warn(ab, "msdu_done bit in msdu_end is not set\n");</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto free_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rxcb = ATH12K_SKB_RXCB(msdu);</div><div class='add'>+	rxcb-&gt;rx_desc = rx_desc;</div><div class='add'>+	msdu_len = ath12k_dp_rx_h_msdu_len(ab, lrx_desc);</div><div class='add'>+	l3_pad_bytes = ath12k_dp_rx_h_l3pad(ab, lrx_desc);</div><div class='add'>+</div><div class='add'>+	if (rxcb-&gt;is_frag) {</div><div class='add'>+		skb_pull(msdu, hal_rx_desc_sz);</div><div class='add'>+	} else if (!rxcb-&gt;is_continuation) {</div><div class='add'>+		if ((msdu_len + hal_rx_desc_sz) &gt; DP_RX_BUFFER_SIZE) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			ath12k_warn(ab, "invalid msdu len %u\n", msdu_len);</div><div class='add'>+			ath12k_dbg_dump(ab, ATH12K_DBG_DATA, NULL, "", rx_desc,</div><div class='add'>+					sizeof(*rx_desc));</div><div class='add'>+			goto free_out;</div><div class='add'>+		}</div><div class='add'>+		skb_put(msdu, hal_rx_desc_sz + l3_pad_bytes + msdu_len);</div><div class='add'>+		skb_pull(msdu, hal_rx_desc_sz + l3_pad_bytes);</div><div class='add'>+	} else {</div><div class='add'>+		ret = ath12k_dp_rx_msdu_coalesce(ar, msdu_list,</div><div class='add'>+						 msdu, last_buf,</div><div class='add'>+						 l3_pad_bytes, msdu_len);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab,</div><div class='add'>+				    "failed to coalesce msdu rx buffer%d\n", ret);</div><div class='add'>+			goto free_out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(!ath12k_dp_rx_check_nwifi_hdr_len_valid(ab, rx_desc, msdu))) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto free_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dp_rx_h_fetch_info(ab, rx_desc, rx_info);</div><div class='add'>+	ath12k_dp_rx_h_ppdu(ar, rx_info);</div><div class='add'>+	ath12k_dp_rx_h_mpdu(ar, msdu, rx_desc, rx_info);</div><div class='add'>+</div><div class='add'>+	rx_info-&gt;rx_status-&gt;flag |= RX_FLAG_SKIP_MONITOR | RX_FLAG_DUP_VALIDATED;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_process_received_packets(struct ath12k_base *ab,</div><div class='add'>+						  struct napi_struct *napi,</div><div class='add'>+						  struct sk_buff_head *msdu_list,</div><div class='add'>+						  int ring_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_group *ag = ab-&gt;ag;</div><div class='add'>+	struct ieee80211_rx_status rx_status = {};</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb;</div><div class='add'>+	struct sk_buff *msdu;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_hw_link *hw_links = ag-&gt;hw_links;</div><div class='add'>+	struct ath12k_base *partner_ab;</div><div class='add'>+	struct ath12k_dp_rx_info rx_info;</div><div class='add'>+	u8 hw_link_id, pdev_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (skb_queue_empty(msdu_list))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rx_info.addr2_present = false;</div><div class='add'>+	rx_info.rx_status = &amp;rx_status;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	while ((msdu = __skb_dequeue(msdu_list))) {</div><div class='add'>+		rxcb = ATH12K_SKB_RXCB(msdu);</div><div class='add'>+		hw_link_id = rxcb-&gt;hw_link_id;</div><div class='add'>+		partner_ab = ath12k_ag_to_ab(ag,</div><div class='add'>+					     hw_links[hw_link_id].device_id);</div><div class='add'>+		pdev_id = ath12k_hw_mac_id_to_pdev_id(partner_ab-&gt;hw_params,</div><div class='add'>+						      hw_links[hw_link_id].pdev_idx);</div><div class='add'>+		ar = partner_ab-&gt;pdevs[pdev_id].ar;</div><div class='add'>+		if (!rcu_dereference(partner_ab-&gt;pdevs_active[pdev_id])) {</div><div class='add'>+			dev_kfree_skb_any(msdu);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (test_bit(ATH12K_FLAG_CAC_RUNNING, &amp;ar-&gt;dev_flags)) {</div><div class='add'>+			dev_kfree_skb_any(msdu);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ath12k_dp_rx_process_msdu(ar, msdu, msdu_list, &amp;rx_info);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_DATA,</div><div class='add'>+				   "Unable to process msdu %d", ret);</div><div class='add'>+			dev_kfree_skb_any(msdu);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath12k_dp_rx_deliver_msdu(ar, napi, msdu, &amp;rx_info);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath12k_dp_rx_get_peer_id(struct ath12k_base *ab,</div><div class='add'>+				    enum ath12k_peer_metadata_version ver,</div><div class='add'>+				    __le32 peer_metadata)</div><div class='add'>+{</div><div class='add'>+	switch (ver) {</div><div class='add'>+	default:</div><div class='add'>+		ath12k_warn(ab, "Unknown peer metadata version: %d", ver);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case ATH12K_PEER_METADATA_V0:</div><div class='add'>+		return le32_get_bits(peer_metadata,</div><div class='add'>+				     RX_MPDU_DESC_META_DATA_V0_PEER_ID);</div><div class='add'>+	case ATH12K_PEER_METADATA_V1:</div><div class='add'>+		return le32_get_bits(peer_metadata,</div><div class='add'>+				     RX_MPDU_DESC_META_DATA_V1_PEER_ID);</div><div class='add'>+	case ATH12K_PEER_METADATA_V1A:</div><div class='add'>+		return le32_get_bits(peer_metadata,</div><div class='add'>+				     RX_MPDU_DESC_META_DATA_V1A_PEER_ID);</div><div class='add'>+	case ATH12K_PEER_METADATA_V1B:</div><div class='add'>+		return le32_get_bits(peer_metadata,</div><div class='add'>+				     RX_MPDU_DESC_META_DATA_V1B_PEER_ID);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_rx_process(struct ath12k_base *ab, int ring_id,</div><div class='add'>+			 struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_group *ag = ab-&gt;ag;</div><div class='add'>+	struct list_head rx_desc_used_list[ATH12K_MAX_DEVICES];</div><div class='add'>+	struct ath12k_hw_link *hw_links = ag-&gt;hw_links;</div><div class='add'>+	int num_buffs_reaped[ATH12K_MAX_DEVICES] = {};</div><div class='add'>+	struct ath12k_rx_desc_info *desc_info;</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct dp_rxdma_ring *rx_ring = &amp;dp-&gt;rx_refill_buf_ring;</div><div class='add'>+	struct hal_reo_dest_ring *desc;</div><div class='add'>+	struct ath12k_base *partner_ab;</div><div class='add'>+	struct sk_buff_head msdu_list;</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb;</div><div class='add'>+	int total_msdu_reaped = 0;</div><div class='add'>+	u8 hw_link_id, device_id;</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	struct sk_buff *msdu;</div><div class='add'>+	bool done = false;</div><div class='add'>+	u64 desc_va;</div><div class='add'>+</div><div class='add'>+	__skb_queue_head_init(&amp;msdu_list);</div><div class='add'>+</div><div class='add'>+	for (device_id = 0; device_id &lt; ATH12K_MAX_DEVICES; device_id++)</div><div class='add'>+		INIT_LIST_HEAD(&amp;rx_desc_used_list[device_id]);</div><div class='add'>+</div><div class='add'>+	srng = &amp;ab-&gt;hal.srng_list[dp-&gt;reo_dst_ring[ring_id].ring_id];</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+try_again:</div><div class='add'>+	ath12k_hal_srng_access_begin(ab, srng);</div><div class='add'>+</div><div class='add'>+	while ((desc = ath12k_hal_srng_dst_get_next_entry(ab, srng))) {</div><div class='add'>+		struct rx_mpdu_desc *mpdu_info;</div><div class='add'>+		struct rx_msdu_desc *msdu_info;</div><div class='add'>+		enum hal_reo_dest_ring_push_reason push_reason;</div><div class='add'>+		u32 cookie;</div><div class='add'>+</div><div class='add'>+		cookie = le32_get_bits(desc-&gt;buf_addr_info.info1,</div><div class='add'>+				       BUFFER_ADDR_INFO1_SW_COOKIE);</div><div class='add'>+</div><div class='add'>+		hw_link_id = le32_get_bits(desc-&gt;info0,</div><div class='add'>+					   HAL_REO_DEST_RING_INFO0_SRC_LINK_ID);</div><div class='add'>+</div><div class='add'>+		desc_va = ((u64)le32_to_cpu(desc-&gt;buf_va_hi) &lt;&lt; 32 |</div><div class='add'>+			   le32_to_cpu(desc-&gt;buf_va_lo));</div><div class='add'>+		desc_info = (struct ath12k_rx_desc_info *)((unsigned long)desc_va);</div><div class='add'>+</div><div class='add'>+		device_id = hw_links[hw_link_id].device_id;</div><div class='add'>+		partner_ab = ath12k_ag_to_ab(ag, device_id);</div><div class='add'>+		if (unlikely(!partner_ab)) {</div><div class='add'>+			if (desc_info-&gt;skb) {</div><div class='add'>+				dev_kfree_skb_any(desc_info-&gt;skb);</div><div class='add'>+				desc_info-&gt;skb = NULL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* retry manual desc retrieval */</div><div class='add'>+		if (!desc_info) {</div><div class='add'>+			desc_info = ath12k_dp_get_rx_desc(partner_ab, cookie);</div><div class='add'>+			if (!desc_info) {</div><div class='add'>+				ath12k_warn(partner_ab, "Invalid cookie in manual descriptor retrieval: 0x%x\n",</div><div class='add'>+					    cookie);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (desc_info-&gt;magic != ATH12K_DP_RX_DESC_MAGIC)</div><div class='add'>+			ath12k_warn(ab, "Check HW CC implementation");</div><div class='add'>+</div><div class='add'>+		msdu = desc_info-&gt;skb;</div><div class='add'>+		desc_info-&gt;skb = NULL;</div><div class='add'>+</div><div class='add'>+		list_add_tail(&amp;desc_info-&gt;list, &amp;rx_desc_used_list[device_id]);</div><div class='add'>+</div><div class='add'>+		rxcb = ATH12K_SKB_RXCB(msdu);</div><div class='add'>+		dma_unmap_single(partner_ab-&gt;dev, rxcb-&gt;paddr,</div><div class='add'>+				 msdu-&gt;len + skb_tailroom(msdu),</div><div class='add'>+				 DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+		num_buffs_reaped[device_id]++;</div><div class='add'>+		ab-&gt;device_stats.reo_rx[ring_id][ab-&gt;device_id]++;</div><div class='add'>+</div><div class='add'>+		push_reason = le32_get_bits(desc-&gt;info0,</div><div class='add'>+					    HAL_REO_DEST_RING_INFO0_PUSH_REASON);</div><div class='add'>+		if (push_reason !=</div><div class='add'>+		    HAL_REO_DEST_RING_PUSH_REASON_ROUTING_INSTRUCTION) {</div><div class='add'>+			dev_kfree_skb_any(msdu);</div><div class='add'>+			ab-&gt;device_stats.hal_reo_error[ring_id]++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		msdu_info = &amp;desc-&gt;rx_msdu_info;</div><div class='add'>+		mpdu_info = &amp;desc-&gt;rx_mpdu_info;</div><div class='add'>+</div><div class='add'>+		rxcb-&gt;is_first_msdu = !!(le32_to_cpu(msdu_info-&gt;info0) &amp;</div><div class='add'>+					 RX_MSDU_DESC_INFO0_FIRST_MSDU_IN_MPDU);</div><div class='add'>+		rxcb-&gt;is_last_msdu = !!(le32_to_cpu(msdu_info-&gt;info0) &amp;</div><div class='add'>+					RX_MSDU_DESC_INFO0_LAST_MSDU_IN_MPDU);</div><div class='add'>+		rxcb-&gt;is_continuation = !!(le32_to_cpu(msdu_info-&gt;info0) &amp;</div><div class='add'>+					   RX_MSDU_DESC_INFO0_MSDU_CONTINUATION);</div><div class='add'>+		rxcb-&gt;hw_link_id = hw_link_id;</div><div class='add'>+		rxcb-&gt;peer_id = ath12k_dp_rx_get_peer_id(ab, dp-&gt;peer_metadata_ver,</div><div class='add'>+							 mpdu_info-&gt;peer_meta_data);</div><div class='add'>+		rxcb-&gt;tid = le32_get_bits(mpdu_info-&gt;info0,</div><div class='add'>+					  RX_MPDU_DESC_INFO0_TID);</div><div class='add'>+</div><div class='add'>+		__skb_queue_tail(&amp;msdu_list, msdu);</div><div class='add'>+</div><div class='add'>+		if (!rxcb-&gt;is_continuation) {</div><div class='add'>+			total_msdu_reaped++;</div><div class='add'>+			done = true;</div><div class='add'>+		} else {</div><div class='add'>+			done = false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (total_msdu_reaped &gt;= budget)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Hw might have updated the head pointer after we cached it.</div><div class='add'>+	 * In this case, even though there are entries in the ring we'll</div><div class='add'>+	 * get rx_desc NULL. Give the read another try with updated cached</div><div class='add'>+	 * head pointer so that we can reap complete MPDU in the current</div><div class='add'>+	 * rx processing.</div><div class='add'>+	 */</div><div class='add'>+	if (!done &amp;&amp; ath12k_hal_srng_dst_num_free(ab, srng, true)) {</div><div class='add'>+		ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+		goto try_again;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!total_msdu_reaped)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	for (device_id = 0; device_id &lt; ATH12K_MAX_DEVICES; device_id++) {</div><div class='add'>+		if (!num_buffs_reaped[device_id])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		partner_ab = ath12k_ag_to_ab(ag, device_id);</div><div class='add'>+		rx_ring = &amp;partner_ab-&gt;dp.rx_refill_buf_ring;</div><div class='add'>+</div><div class='add'>+		ath12k_dp_rx_bufs_replenish(partner_ab, rx_ring,</div><div class='add'>+					    &amp;rx_desc_used_list[device_id],</div><div class='add'>+					    num_buffs_reaped[device_id]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dp_rx_process_received_packets(ab, napi, &amp;msdu_list,</div><div class='add'>+					      ring_id);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	return total_msdu_reaped;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_frag_timer(struct timer_list *timer)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp_rx_tid *rx_tid = timer_container_of(rx_tid, timer,</div><div class='add'>+							     frag_timer);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;rx_tid-&gt;ab-&gt;base_lock);</div><div class='add'>+	if (rx_tid-&gt;last_frag_no &amp;&amp;</div><div class='add'>+	    rx_tid-&gt;rx_frag_bitmap == GENMASK(rx_tid-&gt;last_frag_no, 0)) {</div><div class='add'>+		spin_unlock_bh(&amp;rx_tid-&gt;ab-&gt;base_lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	ath12k_dp_rx_frags_cleanup(rx_tid, true);</div><div class='add'>+	spin_unlock_bh(&amp;rx_tid-&gt;ab-&gt;base_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_rx_peer_frag_setup(struct ath12k *ar, const u8 *peer_mac, int vdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct crypto_shash *tfm;</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	struct ath12k_dp_rx_tid *rx_tid;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	tfm = crypto_alloc_shash("michael_mic", 0, 0);</div><div class='add'>+	if (IS_ERR(tfm))</div><div class='add'>+		return PTR_ERR(tfm);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	peer = ath12k_peer_find(ab, vdev_id, peer_mac);</div><div class='add'>+	if (!peer) {</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		crypto_free_shash(tfm);</div><div class='add'>+		ath12k_warn(ab, "failed to find the peer to set up fragment info\n");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!peer-&gt;primary_link) {</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		crypto_free_shash(tfm);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= IEEE80211_NUM_TIDS; i++) {</div><div class='add'>+		rx_tid = &amp;peer-&gt;rx_tid[i];</div><div class='add'>+		rx_tid-&gt;ab = ab;</div><div class='add'>+		timer_setup(&amp;rx_tid-&gt;frag_timer, ath12k_dp_rx_frag_timer, 0);</div><div class='add'>+		skb_queue_head_init(&amp;rx_tid-&gt;rx_frags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	peer-&gt;tfm_mmic = tfm;</div><div class='add'>+	peer-&gt;dp_setup_done = true;</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_rx_h_michael_mic(struct crypto_shash *tfm, u8 *key,</div><div class='add'>+				      struct ieee80211_hdr *hdr, u8 *data,</div><div class='add'>+				      size_t data_len, u8 *mic)</div><div class='add'>+{</div><div class='add'>+	SHASH_DESC_ON_STACK(desc, tfm);</div><div class='add'>+	u8 mic_hdr[16] = {};</div><div class='add'>+	u8 tid = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!tfm)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	desc-&gt;tfm = tfm;</div><div class='add'>+</div><div class='add'>+	ret = crypto_shash_setkey(tfm, key, 8);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = crypto_shash_init(desc);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* TKIP MIC header */</div><div class='add'>+	memcpy(mic_hdr, ieee80211_get_DA(hdr), ETH_ALEN);</div><div class='add'>+	memcpy(mic_hdr + ETH_ALEN, ieee80211_get_SA(hdr), ETH_ALEN);</div><div class='add'>+	if (ieee80211_is_data_qos(hdr-&gt;frame_control))</div><div class='add'>+		tid = ieee80211_get_tid(hdr);</div><div class='add'>+	mic_hdr[12] = tid;</div><div class='add'>+</div><div class='add'>+	ret = crypto_shash_update(desc, mic_hdr, 16);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	ret = crypto_shash_update(desc, data, data_len);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	ret = crypto_shash_final(desc, mic);</div><div class='add'>+out:</div><div class='add'>+	shash_desc_zero(desc);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_rx_h_verify_tkip_mic(struct ath12k *ar, struct ath12k_peer *peer,</div><div class='add'>+					  struct sk_buff *msdu)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct hal_rx_desc *rx_desc = (struct hal_rx_desc *)msdu-&gt;data;</div><div class='add'>+	struct ieee80211_rx_status *rxs = IEEE80211_SKB_RXCB(msdu);</div><div class='add'>+	struct ieee80211_key_conf *key_conf;</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	struct ath12k_dp_rx_info rx_info;</div><div class='add'>+	u8 mic[IEEE80211_CCMP_MIC_LEN];</div><div class='add'>+	int head_len, tail_len, ret;</div><div class='add'>+	size_t data_len;</div><div class='add'>+	u32 hdr_len, hal_rx_desc_sz = ar-&gt;ab-&gt;hal.hal_desc_sz;</div><div class='add'>+	u8 *key, *data;</div><div class='add'>+	u8 key_idx;</div><div class='add'>+</div><div class='add'>+	if (ath12k_dp_rx_h_enctype(ab, rx_desc) != HAL_ENCRYPT_TYPE_TKIP_MIC)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rx_info.addr2_present = false;</div><div class='add'>+	rx_info.rx_status = rxs;</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr *)(msdu-&gt;data + hal_rx_desc_sz);</div><div class='add'>+	hdr_len = ieee80211_hdrlen(hdr-&gt;frame_control);</div><div class='add'>+	head_len = hdr_len + hal_rx_desc_sz + IEEE80211_TKIP_IV_LEN;</div><div class='add'>+	tail_len = IEEE80211_CCMP_MIC_LEN + IEEE80211_TKIP_ICV_LEN + FCS_LEN;</div><div class='add'>+</div><div class='add'>+	if (!is_multicast_ether_addr(hdr-&gt;addr1))</div><div class='add'>+		key_idx = peer-&gt;ucast_keyidx;</div><div class='add'>+	else</div><div class='add'>+		key_idx = peer-&gt;mcast_keyidx;</div><div class='add'>+</div><div class='add'>+	key_conf = peer-&gt;keys[key_idx];</div><div class='add'>+</div><div class='add'>+	data = msdu-&gt;data + head_len;</div><div class='add'>+	data_len = msdu-&gt;len - head_len - tail_len;</div><div class='add'>+	key = &amp;key_conf-&gt;key[NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY];</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_rx_h_michael_mic(peer-&gt;tfm_mmic, key, hdr, data, data_len, mic);</div><div class='add'>+	if (ret || memcmp(mic, data + data_len, IEEE80211_CCMP_MIC_LEN))</div><div class='add'>+		goto mic_fail;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+mic_fail:</div><div class='add'>+	(ATH12K_SKB_RXCB(msdu))-&gt;is_first_msdu = true;</div><div class='add'>+	(ATH12K_SKB_RXCB(msdu))-&gt;is_last_msdu = true;</div><div class='add'>+</div><div class='add'>+	ath12k_dp_rx_h_fetch_info(ab, rx_desc, &amp;rx_info);</div><div class='add'>+</div><div class='add'>+	rxs-&gt;flag |= RX_FLAG_MMIC_ERROR | RX_FLAG_MMIC_STRIPPED |</div><div class='add'>+		    RX_FLAG_IV_STRIPPED | RX_FLAG_DECRYPTED;</div><div class='add'>+	skb_pull(msdu, hal_rx_desc_sz);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!ath12k_dp_rx_check_nwifi_hdr_len_valid(ab, rx_desc, msdu)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ath12k_dp_rx_h_ppdu(ar, &amp;rx_info);</div><div class='add'>+	ath12k_dp_rx_h_undecap(ar, msdu, rx_desc,</div><div class='add'>+			       HAL_ENCRYPT_TYPE_TKIP_MIC, rxs, true);</div><div class='add'>+	ieee80211_rx(ath12k_ar_to_hw(ar), msdu);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_h_undecap_frag(struct ath12k *ar, struct sk_buff *msdu,</div><div class='add'>+					enum hal_encrypt_type enctype, u32 flags)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	size_t hdr_len;</div><div class='add'>+	size_t crypto_len;</div><div class='add'>+	u32 hal_rx_desc_sz = ar-&gt;ab-&gt;hal.hal_desc_sz;</div><div class='add'>+</div><div class='add'>+	if (!flags)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr *)(msdu-&gt;data + hal_rx_desc_sz);</div><div class='add'>+</div><div class='add'>+	if (flags &amp; RX_FLAG_MIC_STRIPPED)</div><div class='add'>+		skb_trim(msdu, msdu-&gt;len -</div><div class='add'>+			 ath12k_dp_rx_crypto_mic_len(ar, enctype));</div><div class='add'>+</div><div class='add'>+	if (flags &amp; RX_FLAG_ICV_STRIPPED)</div><div class='add'>+		skb_trim(msdu, msdu-&gt;len -</div><div class='add'>+			 ath12k_dp_rx_crypto_icv_len(ar, enctype));</div><div class='add'>+</div><div class='add'>+	if (flags &amp; RX_FLAG_IV_STRIPPED) {</div><div class='add'>+		hdr_len = ieee80211_hdrlen(hdr-&gt;frame_control);</div><div class='add'>+		crypto_len = ath12k_dp_rx_crypto_param_len(ar, enctype);</div><div class='add'>+</div><div class='add'>+		memmove(msdu-&gt;data + hal_rx_desc_sz + crypto_len,</div><div class='add'>+			msdu-&gt;data + hal_rx_desc_sz, hdr_len);</div><div class='add'>+		skb_pull(msdu, crypto_len);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_rx_h_defrag(struct ath12k *ar,</div><div class='add'>+				 struct ath12k_peer *peer,</div><div class='add'>+				 struct ath12k_dp_rx_tid *rx_tid,</div><div class='add'>+				 struct sk_buff **defrag_skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct hal_rx_desc *rx_desc;</div><div class='add'>+	struct sk_buff *skb, *first_frag, *last_frag;</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	enum hal_encrypt_type enctype;</div><div class='add'>+	bool is_decrypted = false;</div><div class='add'>+	int msdu_len = 0;</div><div class='add'>+	int extra_space;</div><div class='add'>+	u32 flags, hal_rx_desc_sz = ar-&gt;ab-&gt;hal.hal_desc_sz;</div><div class='add'>+</div><div class='add'>+	first_frag = skb_peek(&amp;rx_tid-&gt;rx_frags);</div><div class='add'>+	last_frag = skb_peek_tail(&amp;rx_tid-&gt;rx_frags);</div><div class='add'>+</div><div class='add'>+	skb_queue_walk(&amp;rx_tid-&gt;rx_frags, skb) {</div><div class='add'>+		flags = 0;</div><div class='add'>+		rx_desc = (struct hal_rx_desc *)skb-&gt;data;</div><div class='add'>+		hdr = (struct ieee80211_hdr *)(skb-&gt;data + hal_rx_desc_sz);</div><div class='add'>+</div><div class='add'>+		enctype = ath12k_dp_rx_h_enctype(ab, rx_desc);</div><div class='add'>+		if (enctype != HAL_ENCRYPT_TYPE_OPEN)</div><div class='add'>+			is_decrypted = ath12k_dp_rx_h_is_decrypted(ab,</div><div class='add'>+								   rx_desc);</div><div class='add'>+</div><div class='add'>+		if (is_decrypted) {</div><div class='add'>+			if (skb != first_frag)</div><div class='add'>+				flags |= RX_FLAG_IV_STRIPPED;</div><div class='add'>+			if (skb != last_frag)</div><div class='add'>+				flags |= RX_FLAG_ICV_STRIPPED |</div><div class='add'>+					 RX_FLAG_MIC_STRIPPED;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* RX fragments are always raw packets */</div><div class='add'>+		if (skb != last_frag)</div><div class='add'>+			skb_trim(skb, skb-&gt;len - FCS_LEN);</div><div class='add'>+		ath12k_dp_rx_h_undecap_frag(ar, skb, enctype, flags);</div><div class='add'>+</div><div class='add'>+		if (skb != first_frag)</div><div class='add'>+			skb_pull(skb, hal_rx_desc_sz +</div><div class='add'>+				      ieee80211_hdrlen(hdr-&gt;frame_control));</div><div class='add'>+		msdu_len += skb-&gt;len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	extra_space = msdu_len - (DP_RX_BUFFER_SIZE + skb_tailroom(first_frag));</div><div class='add'>+	if (extra_space &gt; 0 &amp;&amp;</div><div class='add'>+	    (pskb_expand_head(first_frag, 0, extra_space, GFP_ATOMIC) &lt; 0))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	__skb_unlink(first_frag, &amp;rx_tid-&gt;rx_frags);</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;rx_tid-&gt;rx_frags))) {</div><div class='add'>+		skb_put_data(first_frag, skb-&gt;data, skb-&gt;len);</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr *)(first_frag-&gt;data + hal_rx_desc_sz);</div><div class='add'>+	hdr-&gt;frame_control &amp;= ~__cpu_to_le16(IEEE80211_FCTL_MOREFRAGS);</div><div class='add'>+	ATH12K_SKB_RXCB(first_frag)-&gt;is_frag = 1;</div><div class='add'>+</div><div class='add'>+	if (ath12k_dp_rx_h_verify_tkip_mic(ar, peer, first_frag))</div><div class='add'>+		first_frag = NULL;</div><div class='add'>+</div><div class='add'>+	*defrag_skb = first_frag;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_rx_h_defrag_reo_reinject(struct ath12k *ar,</div><div class='add'>+					      struct ath12k_dp_rx_tid *rx_tid,</div><div class='add'>+					      struct sk_buff *defrag_skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct hal_rx_desc *rx_desc = (struct hal_rx_desc *)defrag_skb-&gt;data;</div><div class='add'>+	struct hal_reo_entrance_ring *reo_ent_ring;</div><div class='add'>+	struct hal_reo_dest_ring *reo_dest_ring;</div><div class='add'>+	struct dp_link_desc_bank *link_desc_banks;</div><div class='add'>+	struct hal_rx_msdu_link *msdu_link;</div><div class='add'>+	struct hal_rx_msdu_details *msdu0;</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	dma_addr_t link_paddr, buf_paddr;</div><div class='add'>+	u32 desc_bank, msdu_info, msdu_ext_info, mpdu_info;</div><div class='add'>+	u32 cookie, hal_rx_desc_sz, dest_ring_info0, queue_addr_hi;</div><div class='add'>+	int ret;</div><div class='add'>+	struct ath12k_rx_desc_info *desc_info;</div><div class='add'>+	enum hal_rx_buf_return_buf_manager idle_link_rbm = dp-&gt;idle_link_rbm;</div><div class='add'>+	u8 dst_ind;</div><div class='add'>+</div><div class='add'>+	hal_rx_desc_sz = ab-&gt;hal.hal_desc_sz;</div><div class='add'>+	link_desc_banks = dp-&gt;link_desc_banks;</div><div class='add'>+	reo_dest_ring = rx_tid-&gt;dst_ring_desc;</div><div class='add'>+</div><div class='add'>+	ath12k_hal_rx_reo_ent_paddr_get(ab, &amp;reo_dest_ring-&gt;buf_addr_info,</div><div class='add'>+					&amp;link_paddr, &amp;cookie);</div><div class='add'>+	desc_bank = u32_get_bits(cookie, DP_LINK_DESC_BANK_MASK);</div><div class='add'>+</div><div class='add'>+	msdu_link = (struct hal_rx_msdu_link *)(link_desc_banks[desc_bank].vaddr +</div><div class='add'>+			(link_paddr - link_desc_banks[desc_bank].paddr));</div><div class='add'>+	msdu0 = &amp;msdu_link-&gt;msdu_link[0];</div><div class='add'>+	msdu_ext_info = le32_to_cpu(msdu0-&gt;rx_msdu_ext_info.info0);</div><div class='add'>+	dst_ind = u32_get_bits(msdu_ext_info, RX_MSDU_EXT_DESC_INFO0_REO_DEST_IND);</div><div class='add'>+</div><div class='add'>+	memset(msdu0, 0, sizeof(*msdu0));</div><div class='add'>+</div><div class='add'>+	msdu_info = u32_encode_bits(1, RX_MSDU_DESC_INFO0_FIRST_MSDU_IN_MPDU) |</div><div class='add'>+		    u32_encode_bits(1, RX_MSDU_DESC_INFO0_LAST_MSDU_IN_MPDU) |</div><div class='add'>+		    u32_encode_bits(0, RX_MSDU_DESC_INFO0_MSDU_CONTINUATION) |</div><div class='add'>+		    u32_encode_bits(defrag_skb-&gt;len - hal_rx_desc_sz,</div><div class='add'>+				    RX_MSDU_DESC_INFO0_MSDU_LENGTH) |</div><div class='add'>+		    u32_encode_bits(1, RX_MSDU_DESC_INFO0_VALID_SA) |</div><div class='add'>+		    u32_encode_bits(1, RX_MSDU_DESC_INFO0_VALID_DA);</div><div class='add'>+	msdu0-&gt;rx_msdu_info.info0 = cpu_to_le32(msdu_info);</div><div class='add'>+	msdu0-&gt;rx_msdu_ext_info.info0 = cpu_to_le32(msdu_ext_info);</div><div class='add'>+</div><div class='add'>+	/* change msdu len in hal rx desc */</div><div class='add'>+	ath12k_dp_rxdesc_set_msdu_len(ab, rx_desc, defrag_skb-&gt;len - hal_rx_desc_sz);</div><div class='add'>+</div><div class='add'>+	buf_paddr = dma_map_single(ab-&gt;dev, defrag_skb-&gt;data,</div><div class='add'>+				   defrag_skb-&gt;len + skb_tailroom(defrag_skb),</div><div class='add'>+				   DMA_TO_DEVICE);</div><div class='add'>+	if (dma_mapping_error(ab-&gt;dev, buf_paddr))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dp-&gt;rx_desc_lock);</div><div class='add'>+	desc_info = list_first_entry_or_null(&amp;dp-&gt;rx_desc_free_list,</div><div class='add'>+					     struct ath12k_rx_desc_info,</div><div class='add'>+					     list);</div><div class='add'>+	if (!desc_info) {</div><div class='add'>+		spin_unlock_bh(&amp;dp-&gt;rx_desc_lock);</div><div class='add'>+		ath12k_warn(ab, "failed to find rx desc for reinject\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_unmap_dma;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc_info-&gt;skb = defrag_skb;</div><div class='add'>+	desc_info-&gt;in_use = true;</div><div class='add'>+</div><div class='add'>+	list_del(&amp;desc_info-&gt;list);</div><div class='add'>+	spin_unlock_bh(&amp;dp-&gt;rx_desc_lock);</div><div class='add'>+</div><div class='add'>+	ATH12K_SKB_RXCB(defrag_skb)-&gt;paddr = buf_paddr;</div><div class='add'>+</div><div class='add'>+	ath12k_hal_rx_buf_addr_info_set(&amp;msdu0-&gt;buf_addr_info, buf_paddr,</div><div class='add'>+					desc_info-&gt;cookie,</div><div class='add'>+					HAL_RX_BUF_RBM_SW3_BM);</div><div class='add'>+</div><div class='add'>+	/* Fill mpdu details into reo entrance ring */</div><div class='add'>+	srng = &amp;ab-&gt;hal.srng_list[dp-&gt;reo_reinject_ring.ring_id];</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='add'>+	ath12k_hal_srng_access_begin(ab, srng);</div><div class='add'>+</div><div class='add'>+	reo_ent_ring = ath12k_hal_srng_src_get_next_entry(ab, srng);</div><div class='add'>+	if (!reo_ent_ring) {</div><div class='add'>+		ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+		spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+		ret = -ENOSPC;</div><div class='add'>+		goto err_free_desc;</div><div class='add'>+	}</div><div class='add'>+	memset(reo_ent_ring, 0, sizeof(*reo_ent_ring));</div><div class='add'>+</div><div class='add'>+	ath12k_hal_rx_buf_addr_info_set(&amp;reo_ent_ring-&gt;buf_addr_info, link_paddr,</div><div class='add'>+					cookie,</div><div class='add'>+					idle_link_rbm);</div><div class='add'>+</div><div class='add'>+	mpdu_info = u32_encode_bits(1, RX_MPDU_DESC_INFO0_MSDU_COUNT) |</div><div class='add'>+		    u32_encode_bits(0, RX_MPDU_DESC_INFO0_FRAG_FLAG) |</div><div class='add'>+		    u32_encode_bits(1, RX_MPDU_DESC_INFO0_RAW_MPDU) |</div><div class='add'>+		    u32_encode_bits(1, RX_MPDU_DESC_INFO0_VALID_PN) |</div><div class='add'>+		    u32_encode_bits(rx_tid-&gt;tid, RX_MPDU_DESC_INFO0_TID);</div><div class='add'>+</div><div class='add'>+	reo_ent_ring-&gt;rx_mpdu_info.info0 = cpu_to_le32(mpdu_info);</div><div class='add'>+	reo_ent_ring-&gt;rx_mpdu_info.peer_meta_data =</div><div class='add'>+		reo_dest_ring-&gt;rx_mpdu_info.peer_meta_data;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;reoq_lut_support) {</div><div class='add'>+		reo_ent_ring-&gt;queue_addr_lo = reo_dest_ring-&gt;rx_mpdu_info.peer_meta_data;</div><div class='add'>+		queue_addr_hi = 0;</div><div class='add'>+	} else {</div><div class='add'>+		reo_ent_ring-&gt;queue_addr_lo =</div><div class='add'>+				cpu_to_le32(lower_32_bits(rx_tid-&gt;qbuf.paddr_aligned));</div><div class='add'>+		queue_addr_hi = upper_32_bits(rx_tid-&gt;qbuf.paddr_aligned);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reo_ent_ring-&gt;info0 = le32_encode_bits(queue_addr_hi,</div><div class='add'>+					       HAL_REO_ENTR_RING_INFO0_QUEUE_ADDR_HI) |</div><div class='add'>+			      le32_encode_bits(dst_ind,</div><div class='add'>+					       HAL_REO_ENTR_RING_INFO0_DEST_IND);</div><div class='add'>+</div><div class='add'>+	reo_ent_ring-&gt;info1 = le32_encode_bits(rx_tid-&gt;cur_sn,</div><div class='add'>+					       HAL_REO_ENTR_RING_INFO1_MPDU_SEQ_NUM);</div><div class='add'>+	dest_ring_info0 = le32_get_bits(reo_dest_ring-&gt;info0,</div><div class='add'>+					HAL_REO_DEST_RING_INFO0_SRC_LINK_ID);</div><div class='add'>+	reo_ent_ring-&gt;info2 =</div><div class='add'>+		cpu_to_le32(u32_get_bits(dest_ring_info0,</div><div class='add'>+					 HAL_REO_ENTR_RING_INFO2_SRC_LINK_ID));</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_desc:</div><div class='add'>+	spin_lock_bh(&amp;dp-&gt;rx_desc_lock);</div><div class='add'>+	desc_info-&gt;in_use = false;</div><div class='add'>+	desc_info-&gt;skb = NULL;</div><div class='add'>+	list_add_tail(&amp;desc_info-&gt;list, &amp;dp-&gt;rx_desc_free_list);</div><div class='add'>+	spin_unlock_bh(&amp;dp-&gt;rx_desc_lock);</div><div class='add'>+err_unmap_dma:</div><div class='add'>+	dma_unmap_single(ab-&gt;dev, buf_paddr, defrag_skb-&gt;len + skb_tailroom(defrag_skb),</div><div class='add'>+			 DMA_TO_DEVICE);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_rx_h_cmp_frags(struct ath12k_base *ab,</div><div class='add'>+				    struct sk_buff *a, struct sk_buff *b)</div><div class='add'>+{</div><div class='add'>+	int frag1, frag2;</div><div class='add'>+</div><div class='add'>+	frag1 = ath12k_dp_rx_h_frag_no(ab, a);</div><div class='add'>+	frag2 = ath12k_dp_rx_h_frag_no(ab, b);</div><div class='add'>+</div><div class='add'>+	return frag1 - frag2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_h_sort_frags(struct ath12k_base *ab,</div><div class='add'>+				      struct sk_buff_head *frag_list,</div><div class='add'>+				      struct sk_buff *cur_frag)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int cmp;</div><div class='add'>+</div><div class='add'>+	skb_queue_walk(frag_list, skb) {</div><div class='add'>+		cmp = ath12k_dp_rx_h_cmp_frags(ab, skb, cur_frag);</div><div class='add'>+		if (cmp &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+		__skb_queue_before(frag_list, skb, cur_frag);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	__skb_queue_tail(frag_list, cur_frag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 ath12k_dp_rx_h_get_pn(struct ath12k *ar, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	u64 pn = 0;</div><div class='add'>+	u8 *ehdr;</div><div class='add'>+	u32 hal_rx_desc_sz = ar-&gt;ab-&gt;hal.hal_desc_sz;</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr *)(skb-&gt;data + hal_rx_desc_sz);</div><div class='add'>+	ehdr = skb-&gt;data + hal_rx_desc_sz + ieee80211_hdrlen(hdr-&gt;frame_control);</div><div class='add'>+</div><div class='add'>+	pn = ehdr[0];</div><div class='add'>+	pn |= (u64)ehdr[1] &lt;&lt; 8;</div><div class='add'>+	pn |= (u64)ehdr[4] &lt;&lt; 16;</div><div class='add'>+	pn |= (u64)ehdr[5] &lt;&lt; 24;</div><div class='add'>+	pn |= (u64)ehdr[6] &lt;&lt; 32;</div><div class='add'>+	pn |= (u64)ehdr[7] &lt;&lt; 40;</div><div class='add'>+</div><div class='add'>+	return pn;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+ath12k_dp_rx_h_defrag_validate_incr_pn(struct ath12k *ar, struct ath12k_dp_rx_tid *rx_tid)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	enum hal_encrypt_type encrypt_type;</div><div class='add'>+	struct sk_buff *first_frag, *skb;</div><div class='add'>+	struct hal_rx_desc *desc;</div><div class='add'>+	u64 last_pn;</div><div class='add'>+	u64 cur_pn;</div><div class='add'>+</div><div class='add'>+	first_frag = skb_peek(&amp;rx_tid-&gt;rx_frags);</div><div class='add'>+	desc = (struct hal_rx_desc *)first_frag-&gt;data;</div><div class='add'>+</div><div class='add'>+	encrypt_type = ath12k_dp_rx_h_enctype(ab, desc);</div><div class='add'>+	if (encrypt_type != HAL_ENCRYPT_TYPE_CCMP_128 &amp;&amp;</div><div class='add'>+	    encrypt_type != HAL_ENCRYPT_TYPE_CCMP_256 &amp;&amp;</div><div class='add'>+	    encrypt_type != HAL_ENCRYPT_TYPE_GCMP_128 &amp;&amp;</div><div class='add'>+	    encrypt_type != HAL_ENCRYPT_TYPE_AES_GCMP_256)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	last_pn = ath12k_dp_rx_h_get_pn(ar, first_frag);</div><div class='add'>+	skb_queue_walk(&amp;rx_tid-&gt;rx_frags, skb) {</div><div class='add'>+		if (skb == first_frag)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		cur_pn = ath12k_dp_rx_h_get_pn(ar, skb);</div><div class='add'>+		if (cur_pn != last_pn + 1)</div><div class='add'>+			return false;</div><div class='add'>+		last_pn = cur_pn;</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_rx_frag_h_mpdu(struct ath12k *ar,</div><div class='add'>+				    struct sk_buff *msdu,</div><div class='add'>+				    struct hal_reo_dest_ring *ring_desc)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct hal_rx_desc *rx_desc;</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	struct ath12k_dp_rx_tid *rx_tid;</div><div class='add'>+	struct sk_buff *defrag_skb = NULL;</div><div class='add'>+	u32 peer_id;</div><div class='add'>+	u16 seqno, frag_no;</div><div class='add'>+	u8 tid;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	bool more_frags;</div><div class='add'>+</div><div class='add'>+	rx_desc = (struct hal_rx_desc *)msdu-&gt;data;</div><div class='add'>+	peer_id = ath12k_dp_rx_h_peer_id(ab, rx_desc);</div><div class='add'>+	tid = ath12k_dp_rx_h_tid(ab, rx_desc);</div><div class='add'>+	seqno = ath12k_dp_rx_h_seq_no(ab, rx_desc);</div><div class='add'>+	frag_no = ath12k_dp_rx_h_frag_no(ab, msdu);</div><div class='add'>+	more_frags = ath12k_dp_rx_h_more_frags(ab, msdu);</div><div class='add'>+</div><div class='add'>+	if (!ath12k_dp_rx_h_seq_ctrl_valid(ab, rx_desc) ||</div><div class='add'>+	    !ath12k_dp_rx_h_fc_valid(ab, rx_desc) ||</div><div class='add'>+	    tid &gt; IEEE80211_NUM_TIDS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* received unfragmented packet in reo</div><div class='add'>+	 * exception ring, this shouldn't happen</div><div class='add'>+	 * as these packets typically come from</div><div class='add'>+	 * reo2sw srngs.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON_ONCE(!frag_no &amp;&amp; !more_frags))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	peer = ath12k_peer_find_by_id(ab, peer_id);</div><div class='add'>+	if (!peer) {</div><div class='add'>+		ath12k_warn(ab, "failed to find the peer to de-fragment received fragment peer_id %d\n",</div><div class='add'>+			    peer_id);</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!peer-&gt;dp_setup_done) {</div><div class='add'>+		ath12k_warn(ab, "The peer %pM [%d] has uninitialized datapath\n",</div><div class='add'>+			    peer-&gt;addr, peer_id);</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_tid = &amp;peer-&gt;rx_tid[tid];</div><div class='add'>+</div><div class='add'>+	if ((!skb_queue_empty(&amp;rx_tid-&gt;rx_frags) &amp;&amp; seqno != rx_tid-&gt;cur_sn) ||</div><div class='add'>+	    skb_queue_empty(&amp;rx_tid-&gt;rx_frags)) {</div><div class='add'>+		/* Flush stored fragments and start a new sequence */</div><div class='add'>+		ath12k_dp_rx_frags_cleanup(rx_tid, true);</div><div class='add'>+		rx_tid-&gt;cur_sn = seqno;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rx_tid-&gt;rx_frag_bitmap &amp; BIT(frag_no)) {</div><div class='add'>+		/* Fragment already present */</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((!rx_tid-&gt;rx_frag_bitmap || frag_no &gt; __fls(rx_tid-&gt;rx_frag_bitmap)))</div><div class='add'>+		__skb_queue_tail(&amp;rx_tid-&gt;rx_frags, msdu);</div><div class='add'>+	else</div><div class='add'>+		ath12k_dp_rx_h_sort_frags(ab, &amp;rx_tid-&gt;rx_frags, msdu);</div><div class='add'>+</div><div class='add'>+	rx_tid-&gt;rx_frag_bitmap |= BIT(frag_no);</div><div class='add'>+	if (!more_frags)</div><div class='add'>+		rx_tid-&gt;last_frag_no = frag_no;</div><div class='add'>+</div><div class='add'>+	if (frag_no == 0) {</div><div class='add'>+		rx_tid-&gt;dst_ring_desc = kmemdup(ring_desc,</div><div class='add'>+						sizeof(*rx_tid-&gt;dst_ring_desc),</div><div class='add'>+						GFP_ATOMIC);</div><div class='add'>+		if (!rx_tid-&gt;dst_ring_desc) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		ath12k_dp_rx_link_desc_return(ab, &amp;ring_desc-&gt;buf_addr_info,</div><div class='add'>+					      HAL_WBM_REL_BM_ACT_PUT_IN_IDLE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!rx_tid-&gt;last_frag_no ||</div><div class='add'>+	    rx_tid-&gt;rx_frag_bitmap != GENMASK(rx_tid-&gt;last_frag_no, 0)) {</div><div class='add'>+		mod_timer(&amp;rx_tid-&gt;frag_timer, jiffies +</div><div class='add'>+					       ATH12K_DP_RX_FRAGMENT_TIMEOUT_MS);</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	timer_delete_sync(&amp;rx_tid-&gt;frag_timer);</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	peer = ath12k_peer_find_by_id(ab, peer_id);</div><div class='add'>+	if (!peer)</div><div class='add'>+		goto err_frags_cleanup;</div><div class='add'>+</div><div class='add'>+	if (!ath12k_dp_rx_h_defrag_validate_incr_pn(ar, rx_tid))</div><div class='add'>+		goto err_frags_cleanup;</div><div class='add'>+</div><div class='add'>+	if (ath12k_dp_rx_h_defrag(ar, peer, rx_tid, &amp;defrag_skb))</div><div class='add'>+		goto err_frags_cleanup;</div><div class='add'>+</div><div class='add'>+	if (!defrag_skb)</div><div class='add'>+		goto err_frags_cleanup;</div><div class='add'>+</div><div class='add'>+	if (ath12k_dp_rx_h_defrag_reo_reinject(ar, rx_tid, defrag_skb))</div><div class='add'>+		goto err_frags_cleanup;</div><div class='add'>+</div><div class='add'>+	ath12k_dp_rx_frags_cleanup(rx_tid, false);</div><div class='add'>+	goto out_unlock;</div><div class='add'>+</div><div class='add'>+err_frags_cleanup:</div><div class='add'>+	dev_kfree_skb_any(defrag_skb);</div><div class='add'>+	ath12k_dp_rx_frags_cleanup(rx_tid, true);</div><div class='add'>+out_unlock:</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_dp_process_rx_err_buf(struct ath12k *ar, struct hal_reo_dest_ring *desc,</div><div class='add'>+			     struct list_head *used_list,</div><div class='add'>+			     bool drop, u32 cookie)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct sk_buff *msdu;</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb;</div><div class='add'>+	struct hal_rx_desc *rx_desc;</div><div class='add'>+	u16 msdu_len;</div><div class='add'>+	u32 hal_rx_desc_sz = ab-&gt;hal.hal_desc_sz;</div><div class='add'>+	struct ath12k_rx_desc_info *desc_info;</div><div class='add'>+	u64 desc_va;</div><div class='add'>+</div><div class='add'>+	desc_va = ((u64)le32_to_cpu(desc-&gt;buf_va_hi) &lt;&lt; 32 |</div><div class='add'>+		   le32_to_cpu(desc-&gt;buf_va_lo));</div><div class='add'>+	desc_info = (struct ath12k_rx_desc_info *)((unsigned long)desc_va);</div><div class='add'>+</div><div class='add'>+	/* retry manual desc retrieval */</div><div class='add'>+	if (!desc_info) {</div><div class='add'>+		desc_info = ath12k_dp_get_rx_desc(ab, cookie);</div><div class='add'>+		if (!desc_info) {</div><div class='add'>+			ath12k_warn(ab, "Invalid cookie in DP rx error descriptor retrieval: 0x%x\n",</div><div class='add'>+				    cookie);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (desc_info-&gt;magic != ATH12K_DP_RX_DESC_MAGIC)</div><div class='add'>+		ath12k_warn(ab, " RX Exception, Check HW CC implementation");</div><div class='add'>+</div><div class='add'>+	msdu = desc_info-&gt;skb;</div><div class='add'>+	desc_info-&gt;skb = NULL;</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;desc_info-&gt;list, used_list);</div><div class='add'>+</div><div class='add'>+	rxcb = ATH12K_SKB_RXCB(msdu);</div><div class='add'>+	dma_unmap_single(ar-&gt;ab-&gt;dev, rxcb-&gt;paddr,</div><div class='add'>+			 msdu-&gt;len + skb_tailroom(msdu),</div><div class='add'>+			 DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+	if (drop) {</div><div class='add'>+		dev_kfree_skb_any(msdu);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (!rcu_dereference(ar-&gt;ab-&gt;pdevs_active[ar-&gt;pdev_idx])) {</div><div class='add'>+		dev_kfree_skb_any(msdu);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_FLAG_CAC_RUNNING, &amp;ar-&gt;dev_flags)) {</div><div class='add'>+		dev_kfree_skb_any(msdu);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_desc = (struct hal_rx_desc *)msdu-&gt;data;</div><div class='add'>+	msdu_len = ath12k_dp_rx_h_msdu_len(ar-&gt;ab, rx_desc);</div><div class='add'>+	if ((msdu_len + hal_rx_desc_sz) &gt; DP_RX_BUFFER_SIZE) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "invalid msdu leng %u", msdu_len);</div><div class='add'>+		ath12k_dbg_dump(ar-&gt;ab, ATH12K_DBG_DATA, NULL, "", rx_desc,</div><div class='add'>+				sizeof(*rx_desc));</div><div class='add'>+		dev_kfree_skb_any(msdu);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_put(msdu, hal_rx_desc_sz + msdu_len);</div><div class='add'>+</div><div class='add'>+	if (ath12k_dp_rx_frag_h_mpdu(ar, msdu, desc)) {</div><div class='add'>+		dev_kfree_skb_any(msdu);</div><div class='add'>+		ath12k_dp_rx_link_desc_return(ar-&gt;ab, &amp;desc-&gt;buf_addr_info,</div><div class='add'>+					      HAL_WBM_REL_BM_ACT_PUT_IN_IDLE);</div><div class='add'>+	}</div><div class='add'>+exit:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_h_msdu_buffer_type(struct ath12k_base *ab,</div><div class='add'>+					struct list_head *list,</div><div class='add'>+					struct hal_reo_dest_ring *desc)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_rx_desc_info *desc_info;</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb;</div><div class='add'>+	struct sk_buff *msdu;</div><div class='add'>+	u64 desc_va;</div><div class='add'>+</div><div class='add'>+	ab-&gt;device_stats.reo_excep_msdu_buf_type++;</div><div class='add'>+</div><div class='add'>+	desc_va = (u64)le32_to_cpu(desc-&gt;buf_va_hi) &lt;&lt; 32 |</div><div class='add'>+		  le32_to_cpu(desc-&gt;buf_va_lo);</div><div class='add'>+	desc_info = (struct ath12k_rx_desc_info *)(uintptr_t)desc_va;</div><div class='add'>+	if (!desc_info) {</div><div class='add'>+		u32 cookie;</div><div class='add'>+</div><div class='add'>+		cookie = le32_get_bits(desc-&gt;buf_addr_info.info1,</div><div class='add'>+				       BUFFER_ADDR_INFO1_SW_COOKIE);</div><div class='add'>+		desc_info = ath12k_dp_get_rx_desc(ab, cookie);</div><div class='add'>+		if (!desc_info) {</div><div class='add'>+			ath12k_warn(ab, "Invalid cookie in manual descriptor retrieval: 0x%x\n",</div><div class='add'>+				    cookie);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (desc_info-&gt;magic != ATH12K_DP_RX_DESC_MAGIC) {</div><div class='add'>+		ath12k_warn(ab, "rx exception, magic check failed with value: %u\n",</div><div class='add'>+			    desc_info-&gt;magic);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msdu = desc_info-&gt;skb;</div><div class='add'>+	desc_info-&gt;skb = NULL;</div><div class='add'>+	list_add_tail(&amp;desc_info-&gt;list, list);</div><div class='add'>+	rxcb = ATH12K_SKB_RXCB(msdu);</div><div class='add'>+	dma_unmap_single(ab-&gt;dev, rxcb-&gt;paddr, msdu-&gt;len + skb_tailroom(msdu),</div><div class='add'>+			 DMA_FROM_DEVICE);</div><div class='add'>+	dev_kfree_skb_any(msdu);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_rx_process_err(struct ath12k_base *ab, struct napi_struct *napi,</div><div class='add'>+			     int budget)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_group *ag = ab-&gt;ag;</div><div class='add'>+	struct list_head rx_desc_used_list[ATH12K_MAX_DEVICES];</div><div class='add'>+	u32 msdu_cookies[HAL_NUM_RX_MSDUS_PER_LINK_DESC];</div><div class='add'>+	int num_buffs_reaped[ATH12K_MAX_DEVICES] = {};</div><div class='add'>+	struct dp_link_desc_bank *link_desc_banks;</div><div class='add'>+	enum hal_rx_buf_return_buf_manager rbm;</div><div class='add'>+	struct hal_rx_msdu_link *link_desc_va;</div><div class='add'>+	int tot_n_bufs_reaped, quota, ret, i;</div><div class='add'>+	struct hal_reo_dest_ring *reo_desc;</div><div class='add'>+	struct dp_rxdma_ring *rx_ring;</div><div class='add'>+	struct dp_srng *reo_except;</div><div class='add'>+	struct ath12k_hw_link *hw_links = ag-&gt;hw_links;</div><div class='add'>+	struct ath12k_base *partner_ab;</div><div class='add'>+	u8 hw_link_id, device_id;</div><div class='add'>+	u32 desc_bank, num_msdus;</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	bool is_frag;</div><div class='add'>+	bool drop;</div><div class='add'>+	int pdev_id;</div><div class='add'>+</div><div class='add'>+	tot_n_bufs_reaped = 0;</div><div class='add'>+	quota = budget;</div><div class='add'>+</div><div class='add'>+	for (device_id = 0; device_id &lt; ATH12K_MAX_DEVICES; device_id++)</div><div class='add'>+		INIT_LIST_HEAD(&amp;rx_desc_used_list[device_id]);</div><div class='add'>+</div><div class='add'>+	reo_except = &amp;ab-&gt;dp.reo_except_ring;</div><div class='add'>+</div><div class='add'>+	srng = &amp;ab-&gt;hal.srng_list[reo_except-&gt;ring_id];</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_begin(ab, srng);</div><div class='add'>+</div><div class='add'>+	while (budget &amp;&amp;</div><div class='add'>+	       (reo_desc = ath12k_hal_srng_dst_get_next_entry(ab, srng))) {</div><div class='add'>+		drop = false;</div><div class='add'>+		ab-&gt;device_stats.err_ring_pkts++;</div><div class='add'>+</div><div class='add'>+		hw_link_id = le32_get_bits(reo_desc-&gt;info0,</div><div class='add'>+					   HAL_REO_DEST_RING_INFO0_SRC_LINK_ID);</div><div class='add'>+		device_id = hw_links[hw_link_id].device_id;</div><div class='add'>+		partner_ab = ath12k_ag_to_ab(ag, device_id);</div><div class='add'>+</div><div class='add'>+		/* Below case is added to handle data packet from un-associated clients.</div><div class='add'>+		 * As it is expected that AST lookup will fail for</div><div class='add'>+		 * un-associated station's data packets.</div><div class='add'>+		 */</div><div class='add'>+		if (le32_get_bits(reo_desc-&gt;info0, HAL_REO_DEST_RING_INFO0_BUFFER_TYPE) ==</div><div class='add'>+		    HAL_REO_DEST_RING_BUFFER_TYPE_MSDU) {</div><div class='add'>+			if (!ath12k_dp_h_msdu_buffer_type(partner_ab,</div><div class='add'>+							  &amp;rx_desc_used_list[device_id],</div><div class='add'>+							  reo_desc)) {</div><div class='add'>+				num_buffs_reaped[device_id]++;</div><div class='add'>+				tot_n_bufs_reaped++;</div><div class='add'>+			}</div><div class='add'>+			goto next_desc;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ath12k_hal_desc_reo_parse_err(ab, reo_desc, &amp;paddr,</div><div class='add'>+						    &amp;desc_bank);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to parse error reo desc %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pdev_id = ath12k_hw_mac_id_to_pdev_id(partner_ab-&gt;hw_params,</div><div class='add'>+						      hw_links[hw_link_id].pdev_idx);</div><div class='add'>+		ar = partner_ab-&gt;pdevs[pdev_id].ar;</div><div class='add'>+</div><div class='add'>+		link_desc_banks = partner_ab-&gt;dp.link_desc_banks;</div><div class='add'>+		link_desc_va = link_desc_banks[desc_bank].vaddr +</div><div class='add'>+			       (paddr - link_desc_banks[desc_bank].paddr);</div><div class='add'>+		ath12k_hal_rx_msdu_link_info_get(link_desc_va, &amp;num_msdus, msdu_cookies,</div><div class='add'>+						 &amp;rbm);</div><div class='add'>+		if (rbm != partner_ab-&gt;dp.idle_link_rbm &amp;&amp;</div><div class='add'>+		    rbm != HAL_RX_BUF_RBM_SW3_BM &amp;&amp;</div><div class='add'>+		    rbm != partner_ab-&gt;hw_params-&gt;hal_params-&gt;rx_buf_rbm) {</div><div class='add'>+			ab-&gt;device_stats.invalid_rbm++;</div><div class='add'>+			ath12k_warn(ab, "invalid return buffer manager %d\n", rbm);</div><div class='add'>+			ath12k_dp_rx_link_desc_return(partner_ab,</div><div class='add'>+						      &amp;reo_desc-&gt;buf_addr_info,</div><div class='add'>+						      HAL_WBM_REL_BM_ACT_REL_MSDU);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		is_frag = !!(le32_to_cpu(reo_desc-&gt;rx_mpdu_info.info0) &amp;</div><div class='add'>+			     RX_MPDU_DESC_INFO0_FRAG_FLAG);</div><div class='add'>+</div><div class='add'>+		/* Process only rx fragments with one msdu per link desc below, and drop</div><div class='add'>+		 * msdu's indicated due to error reasons.</div><div class='add'>+		 * Dynamic fragmentation not supported in Multi-link client, so drop the</div><div class='add'>+		 * partner device buffers.</div><div class='add'>+		 */</div><div class='add'>+		if (!is_frag || num_msdus &gt; 1 ||</div><div class='add'>+		    partner_ab-&gt;device_id != ab-&gt;device_id) {</div><div class='add'>+			drop = true;</div><div class='add'>+</div><div class='add'>+			/* Return the link desc back to wbm idle list */</div><div class='add'>+			ath12k_dp_rx_link_desc_return(partner_ab,</div><div class='add'>+						      &amp;reo_desc-&gt;buf_addr_info,</div><div class='add'>+						      HAL_WBM_REL_BM_ACT_PUT_IN_IDLE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; num_msdus; i++) {</div><div class='add'>+			if (!ath12k_dp_process_rx_err_buf(ar, reo_desc,</div><div class='add'>+							  &amp;rx_desc_used_list[device_id],</div><div class='add'>+							  drop,</div><div class='add'>+							  msdu_cookies[i])) {</div><div class='add'>+				num_buffs_reaped[device_id]++;</div><div class='add'>+				tot_n_bufs_reaped++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+next_desc:</div><div class='add'>+		if (tot_n_bufs_reaped &gt;= quota) {</div><div class='add'>+			tot_n_bufs_reaped = quota;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		budget = quota - tot_n_bufs_reaped;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	for (device_id = 0; device_id &lt; ATH12K_MAX_DEVICES; device_id++) {</div><div class='add'>+		if (!num_buffs_reaped[device_id])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		partner_ab = ath12k_ag_to_ab(ag, device_id);</div><div class='add'>+		rx_ring = &amp;partner_ab-&gt;dp.rx_refill_buf_ring;</div><div class='add'>+</div><div class='add'>+		ath12k_dp_rx_bufs_replenish(partner_ab, rx_ring,</div><div class='add'>+					    &amp;rx_desc_used_list[device_id],</div><div class='add'>+					    num_buffs_reaped[device_id]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return tot_n_bufs_reaped;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_null_q_desc_sg_drop(struct ath12k *ar,</div><div class='add'>+					     int msdu_len,</div><div class='add'>+					     struct sk_buff_head *msdu_list)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb, *tmp;</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb;</div><div class='add'>+	int n_buffs;</div><div class='add'>+</div><div class='add'>+	n_buffs = DIV_ROUND_UP(msdu_len,</div><div class='add'>+			       (DP_RX_BUFFER_SIZE - ar-&gt;ab-&gt;hal.hal_desc_sz));</div><div class='add'>+</div><div class='add'>+	skb_queue_walk_safe(msdu_list, skb, tmp) {</div><div class='add'>+		rxcb = ATH12K_SKB_RXCB(skb);</div><div class='add'>+		if (rxcb-&gt;err_rel_src == HAL_WBM_REL_SRC_MODULE_REO &amp;&amp;</div><div class='add'>+		    rxcb-&gt;err_code == HAL_REO_DEST_RING_ERROR_CODE_DESC_ADDR_ZERO) {</div><div class='add'>+			if (!n_buffs)</div><div class='add'>+				break;</div><div class='add'>+			__skb_unlink(skb, msdu_list);</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			n_buffs--;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_rx_h_null_q_desc(struct ath12k *ar, struct sk_buff *msdu,</div><div class='add'>+				      struct ath12k_dp_rx_info *rx_info,</div><div class='add'>+				      struct sk_buff_head *msdu_list)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	u16 msdu_len;</div><div class='add'>+	struct hal_rx_desc *desc = (struct hal_rx_desc *)msdu-&gt;data;</div><div class='add'>+	u8 l3pad_bytes;</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(msdu);</div><div class='add'>+	u32 hal_rx_desc_sz = ar-&gt;ab-&gt;hal.hal_desc_sz;</div><div class='add'>+</div><div class='add'>+	msdu_len = ath12k_dp_rx_h_msdu_len(ab, desc);</div><div class='add'>+</div><div class='add'>+	if (!rxcb-&gt;is_frag &amp;&amp; ((msdu_len + hal_rx_desc_sz) &gt; DP_RX_BUFFER_SIZE)) {</div><div class='add'>+		/* First buffer will be freed by the caller, so deduct it's length */</div><div class='add'>+		msdu_len = msdu_len - (DP_RX_BUFFER_SIZE - hal_rx_desc_sz);</div><div class='add'>+		ath12k_dp_rx_null_q_desc_sg_drop(ar, msdu_len, msdu_list);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Even after cleaning up the sg buffers in the msdu list with above check</div><div class='add'>+	 * any msdu received with continuation flag needs to be dropped as invalid.</div><div class='add'>+	 * This protects against some random err frame with continuation flag.</div><div class='add'>+	 */</div><div class='add'>+	if (rxcb-&gt;is_continuation)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!ath12k_dp_rx_h_msdu_done(ab, desc)) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "msdu_done bit not set in null_q_des processing\n");</div><div class='add'>+		__skb_queue_purge(msdu_list);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Handle NULL queue descriptor violations arising out a missing</div><div class='add'>+	 * REO queue for a given peer or a given TID. This typically</div><div class='add'>+	 * may happen if a packet is received on a QOS enabled TID before the</div><div class='add'>+	 * ADDBA negotiation for that TID, when the TID queue is setup. Or</div><div class='add'>+	 * it may also happen for MC/BC frames if they are not routed to the</div><div class='add'>+	 * non-QOS TID queue, in the absence of any other default TID queue.</div><div class='add'>+	 * This error can show up both in a REO destination or WBM release ring.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (rxcb-&gt;is_frag) {</div><div class='add'>+		skb_pull(msdu, hal_rx_desc_sz);</div><div class='add'>+	} else {</div><div class='add'>+		l3pad_bytes = ath12k_dp_rx_h_l3pad(ab, desc);</div><div class='add'>+</div><div class='add'>+		if ((hal_rx_desc_sz + l3pad_bytes + msdu_len) &gt; DP_RX_BUFFER_SIZE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		skb_put(msdu, hal_rx_desc_sz + l3pad_bytes + msdu_len);</div><div class='add'>+		skb_pull(msdu, hal_rx_desc_sz + l3pad_bytes);</div><div class='add'>+	}</div><div class='add'>+	if (unlikely(!ath12k_dp_rx_check_nwifi_hdr_len_valid(ab, desc, msdu)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ath12k_dp_rx_h_fetch_info(ab, desc, rx_info);</div><div class='add'>+	ath12k_dp_rx_h_ppdu(ar, rx_info);</div><div class='add'>+	ath12k_dp_rx_h_mpdu(ar, msdu, desc, rx_info);</div><div class='add'>+</div><div class='add'>+	rxcb-&gt;tid = rx_info-&gt;tid;</div><div class='add'>+</div><div class='add'>+	/* Please note that caller will having the access to msdu and completing</div><div class='add'>+	 * rx with mac80211. Need not worry about cleaning up amsdu_list.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_dp_rx_h_reo_err(struct ath12k *ar, struct sk_buff *msdu,</div><div class='add'>+				   struct ath12k_dp_rx_info *rx_info,</div><div class='add'>+				   struct sk_buff_head *msdu_list)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(msdu);</div><div class='add'>+	bool drop = false;</div><div class='add'>+</div><div class='add'>+	ar-&gt;ab-&gt;device_stats.reo_error[rxcb-&gt;err_code]++;</div><div class='add'>+</div><div class='add'>+	switch (rxcb-&gt;err_code) {</div><div class='add'>+	case HAL_REO_DEST_RING_ERROR_CODE_DESC_ADDR_ZERO:</div><div class='add'>+		if (ath12k_dp_rx_h_null_q_desc(ar, msdu, rx_info, msdu_list))</div><div class='add'>+			drop = true;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_REO_DEST_RING_ERROR_CODE_PN_CHECK_FAILED:</div><div class='add'>+		/* TODO: Do not drop PN failed packets in the driver;</div><div class='add'>+		 * instead, it is good to drop such packets in mac80211</div><div class='add'>+		 * after incrementing the replay counters.</div><div class='add'>+		 */</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		/* TODO: Review other errors and process them to mac80211</div><div class='add'>+		 * as appropriate.</div><div class='add'>+		 */</div><div class='add'>+		drop = true;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return drop;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_dp_rx_h_tkip_mic_err(struct ath12k *ar, struct sk_buff *msdu,</div><div class='add'>+					struct ath12k_dp_rx_info *rx_info)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	u16 msdu_len;</div><div class='add'>+	struct hal_rx_desc *desc = (struct hal_rx_desc *)msdu-&gt;data;</div><div class='add'>+	u8 l3pad_bytes;</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(msdu);</div><div class='add'>+	u32 hal_rx_desc_sz = ar-&gt;ab-&gt;hal.hal_desc_sz;</div><div class='add'>+</div><div class='add'>+	rxcb-&gt;is_first_msdu = ath12k_dp_rx_h_first_msdu(ab, desc);</div><div class='add'>+	rxcb-&gt;is_last_msdu = ath12k_dp_rx_h_last_msdu(ab, desc);</div><div class='add'>+</div><div class='add'>+	l3pad_bytes = ath12k_dp_rx_h_l3pad(ab, desc);</div><div class='add'>+	msdu_len = ath12k_dp_rx_h_msdu_len(ab, desc);</div><div class='add'>+</div><div class='add'>+	if ((hal_rx_desc_sz + l3pad_bytes + msdu_len) &gt; DP_RX_BUFFER_SIZE) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_DATA,</div><div class='add'>+			   "invalid msdu len in tkip mic err %u\n", msdu_len);</div><div class='add'>+		ath12k_dbg_dump(ab, ATH12K_DBG_DATA, NULL, "", desc,</div><div class='add'>+				sizeof(*desc));</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_put(msdu, hal_rx_desc_sz + l3pad_bytes + msdu_len);</div><div class='add'>+	skb_pull(msdu, hal_rx_desc_sz + l3pad_bytes);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!ath12k_dp_rx_check_nwifi_hdr_len_valid(ab, desc, msdu)))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	ath12k_dp_rx_h_ppdu(ar, rx_info);</div><div class='add'>+</div><div class='add'>+	rx_info-&gt;rx_status-&gt;flag |= (RX_FLAG_MMIC_STRIPPED | RX_FLAG_MMIC_ERROR |</div><div class='add'>+				     RX_FLAG_DECRYPTED);</div><div class='add'>+</div><div class='add'>+	ath12k_dp_rx_h_undecap(ar, msdu, desc,</div><div class='add'>+			       HAL_ENCRYPT_TYPE_TKIP_MIC, rx_info-&gt;rx_status, false);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_dp_rx_h_rxdma_err(struct ath12k *ar,  struct sk_buff *msdu,</div><div class='add'>+				     struct ath12k_dp_rx_info *rx_info)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(msdu);</div><div class='add'>+	struct hal_rx_desc *rx_desc = (struct hal_rx_desc *)msdu-&gt;data;</div><div class='add'>+	bool drop = false;</div><div class='add'>+	u32 err_bitmap;</div><div class='add'>+</div><div class='add'>+	ar-&gt;ab-&gt;device_stats.rxdma_error[rxcb-&gt;err_code]++;</div><div class='add'>+</div><div class='add'>+	switch (rxcb-&gt;err_code) {</div><div class='add'>+	case HAL_REO_ENTR_RING_RXDMA_ECODE_DECRYPT_ERR:</div><div class='add'>+	case HAL_REO_ENTR_RING_RXDMA_ECODE_TKIP_MIC_ERR:</div><div class='add'>+		err_bitmap = ath12k_dp_rx_h_mpdu_err(ab, rx_desc);</div><div class='add'>+		if (err_bitmap &amp; HAL_RX_MPDU_ERR_TKIP_MIC) {</div><div class='add'>+			ath12k_dp_rx_h_fetch_info(ab, rx_desc, rx_info);</div><div class='add'>+			drop = ath12k_dp_rx_h_tkip_mic_err(ar, msdu, rx_info);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		/* TODO: Review other rxdma error code to check if anything is</div><div class='add'>+		 * worth reporting to mac80211</div><div class='add'>+		 */</div><div class='add'>+		drop = true;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return drop;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_rx_wbm_err(struct ath12k *ar,</div><div class='add'>+				 struct napi_struct *napi,</div><div class='add'>+				 struct sk_buff *msdu,</div><div class='add'>+				 struct sk_buff_head *msdu_list)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(msdu);</div><div class='add'>+	struct ieee80211_rx_status rxs = {};</div><div class='add'>+	struct ath12k_dp_rx_info rx_info;</div><div class='add'>+	bool drop = true;</div><div class='add'>+</div><div class='add'>+	rx_info.addr2_present = false;</div><div class='add'>+	rx_info.rx_status = &amp;rxs;</div><div class='add'>+</div><div class='add'>+	switch (rxcb-&gt;err_rel_src) {</div><div class='add'>+	case HAL_WBM_REL_SRC_MODULE_REO:</div><div class='add'>+		drop = ath12k_dp_rx_h_reo_err(ar, msdu, &amp;rx_info, msdu_list);</div><div class='add'>+		break;</div><div class='add'>+	case HAL_WBM_REL_SRC_MODULE_RXDMA:</div><div class='add'>+		drop = ath12k_dp_rx_h_rxdma_err(ar, msdu, &amp;rx_info);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* msdu will get freed */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (drop) {</div><div class='add'>+		dev_kfree_skb_any(msdu);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_info.rx_status-&gt;flag |= RX_FLAG_SKIP_MONITOR;</div><div class='add'>+</div><div class='add'>+	ath12k_dp_rx_deliver_msdu(ar, napi, msdu, &amp;rx_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_rx_process_wbm_err(struct ath12k_base *ab,</div><div class='add'>+				 struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	struct list_head rx_desc_used_list[ATH12K_MAX_DEVICES];</div><div class='add'>+	struct ath12k_hw_group *ag = ab-&gt;ag;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct dp_rxdma_ring *rx_ring;</div><div class='add'>+	struct hal_rx_wbm_rel_info err_info;</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	struct sk_buff *msdu;</div><div class='add'>+	struct sk_buff_head msdu_list, scatter_msdu_list;</div><div class='add'>+	struct ath12k_skb_rxcb *rxcb;</div><div class='add'>+	void *rx_desc;</div><div class='add'>+	int num_buffs_reaped[ATH12K_MAX_DEVICES] = {};</div><div class='add'>+	int total_num_buffs_reaped = 0;</div><div class='add'>+	struct ath12k_rx_desc_info *desc_info;</div><div class='add'>+	struct ath12k_device_dp_stats *device_stats = &amp;ab-&gt;device_stats;</div><div class='add'>+	struct ath12k_hw_link *hw_links = ag-&gt;hw_links;</div><div class='add'>+	struct ath12k_base *partner_ab;</div><div class='add'>+	u8 hw_link_id, device_id;</div><div class='add'>+	int ret, pdev_id;</div><div class='add'>+	struct hal_rx_desc *msdu_data;</div><div class='add'>+</div><div class='add'>+	__skb_queue_head_init(&amp;msdu_list);</div><div class='add'>+	__skb_queue_head_init(&amp;scatter_msdu_list);</div><div class='add'>+</div><div class='add'>+	for (device_id = 0; device_id &lt; ATH12K_MAX_DEVICES; device_id++)</div><div class='add'>+		INIT_LIST_HEAD(&amp;rx_desc_used_list[device_id]);</div><div class='add'>+</div><div class='add'>+	srng = &amp;ab-&gt;hal.srng_list[dp-&gt;rx_rel_ring.ring_id];</div><div class='add'>+	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_begin(ab, srng);</div><div class='add'>+</div><div class='add'>+	while (budget) {</div><div class='add'>+		rx_desc = ath12k_hal_srng_dst_get_next_entry(ab, srng);</div><div class='add'>+		if (!rx_desc)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ret = ath12k_hal_wbm_desc_parse_err(ab, rx_desc, &amp;err_info);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab,</div><div class='add'>+				    "failed to parse rx error in wbm_rel ring desc %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		desc_info = err_info.rx_desc;</div><div class='add'>+</div><div class='add'>+		/* retry manual desc retrieval if hw cc is not done */</div><div class='add'>+		if (!desc_info) {</div><div class='add'>+			desc_info = ath12k_dp_get_rx_desc(ab, err_info.cookie);</div><div class='add'>+			if (!desc_info) {</div><div class='add'>+				ath12k_warn(ab, "Invalid cookie in DP WBM rx error descriptor retrieval: 0x%x\n",</div><div class='add'>+					    err_info.cookie);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (desc_info-&gt;magic != ATH12K_DP_RX_DESC_MAGIC)</div><div class='add'>+			ath12k_warn(ab, "WBM RX err, Check HW CC implementation");</div><div class='add'>+</div><div class='add'>+		msdu = desc_info-&gt;skb;</div><div class='add'>+		desc_info-&gt;skb = NULL;</div><div class='add'>+</div><div class='add'>+		device_id = desc_info-&gt;device_id;</div><div class='add'>+		partner_ab = ath12k_ag_to_ab(ag, device_id);</div><div class='add'>+		if (unlikely(!partner_ab)) {</div><div class='add'>+			dev_kfree_skb_any(msdu);</div><div class='add'>+</div><div class='add'>+			/* In any case continuation bit is set</div><div class='add'>+			 * in the previous record, cleanup scatter_msdu_list</div><div class='add'>+			 */</div><div class='add'>+			ath12k_dp_clean_up_skb_list(&amp;scatter_msdu_list);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		list_add_tail(&amp;desc_info-&gt;list, &amp;rx_desc_used_list[device_id]);</div><div class='add'>+</div><div class='add'>+		rxcb = ATH12K_SKB_RXCB(msdu);</div><div class='add'>+		dma_unmap_single(partner_ab-&gt;dev, rxcb-&gt;paddr,</div><div class='add'>+				 msdu-&gt;len + skb_tailroom(msdu),</div><div class='add'>+				 DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+		num_buffs_reaped[device_id]++;</div><div class='add'>+		total_num_buffs_reaped++;</div><div class='add'>+</div><div class='add'>+		if (!err_info.continuation)</div><div class='add'>+			budget--;</div><div class='add'>+</div><div class='add'>+		if (err_info.push_reason !=</div><div class='add'>+		    HAL_REO_DEST_RING_PUSH_REASON_ERR_DETECTED) {</div><div class='add'>+			dev_kfree_skb_any(msdu);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		msdu_data = (struct hal_rx_desc *)msdu-&gt;data;</div><div class='add'>+		rxcb-&gt;err_rel_src = err_info.err_rel_src;</div><div class='add'>+		rxcb-&gt;err_code = err_info.err_code;</div><div class='add'>+		rxcb-&gt;is_first_msdu = err_info.first_msdu;</div><div class='add'>+		rxcb-&gt;is_last_msdu = err_info.last_msdu;</div><div class='add'>+		rxcb-&gt;is_continuation = err_info.continuation;</div><div class='add'>+		rxcb-&gt;rx_desc = msdu_data;</div><div class='add'>+</div><div class='add'>+		if (err_info.continuation) {</div><div class='add'>+			__skb_queue_tail(&amp;scatter_msdu_list, msdu);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		hw_link_id = ath12k_dp_rx_get_msdu_src_link(partner_ab,</div><div class='add'>+							    msdu_data);</div><div class='add'>+		if (hw_link_id &gt;= ATH12K_GROUP_MAX_RADIO) {</div><div class='add'>+			dev_kfree_skb_any(msdu);</div><div class='add'>+</div><div class='add'>+			/* In any case continuation bit is set</div><div class='add'>+			 * in the previous record, cleanup scatter_msdu_list</div><div class='add'>+			 */</div><div class='add'>+			ath12k_dp_clean_up_skb_list(&amp;scatter_msdu_list);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!skb_queue_empty(&amp;scatter_msdu_list)) {</div><div class='add'>+			struct sk_buff *msdu;</div><div class='add'>+</div><div class='add'>+			skb_queue_walk(&amp;scatter_msdu_list, msdu) {</div><div class='add'>+				rxcb = ATH12K_SKB_RXCB(msdu);</div><div class='add'>+				rxcb-&gt;hw_link_id = hw_link_id;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			skb_queue_splice_tail_init(&amp;scatter_msdu_list,</div><div class='add'>+						   &amp;msdu_list);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rxcb = ATH12K_SKB_RXCB(msdu);</div><div class='add'>+		rxcb-&gt;hw_link_id = hw_link_id;</div><div class='add'>+		__skb_queue_tail(&amp;msdu_list, msdu);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* In any case continuation bit is set in the</div><div class='add'>+	 * last record, cleanup scatter_msdu_list</div><div class='add'>+	 */</div><div class='add'>+	ath12k_dp_clean_up_skb_list(&amp;scatter_msdu_list);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!total_num_buffs_reaped)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	for (device_id = 0; device_id &lt; ATH12K_MAX_DEVICES; device_id++) {</div><div class='add'>+		if (!num_buffs_reaped[device_id])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		partner_ab = ath12k_ag_to_ab(ag, device_id);</div><div class='add'>+		rx_ring = &amp;partner_ab-&gt;dp.rx_refill_buf_ring;</div><div class='add'>+</div><div class='add'>+		ath12k_dp_rx_bufs_replenish(ab, rx_ring,</div><div class='add'>+					    &amp;rx_desc_used_list[device_id],</div><div class='add'>+					    num_buffs_reaped[device_id]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	while ((msdu = __skb_dequeue(&amp;msdu_list))) {</div><div class='add'>+		rxcb = ATH12K_SKB_RXCB(msdu);</div><div class='add'>+		hw_link_id = rxcb-&gt;hw_link_id;</div><div class='add'>+</div><div class='add'>+		device_id = hw_links[hw_link_id].device_id;</div><div class='add'>+		partner_ab = ath12k_ag_to_ab(ag, device_id);</div><div class='add'>+		if (unlikely(!partner_ab)) {</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_DATA,</div><div class='add'>+				   "Unable to process WBM error msdu due to invalid hw link id %d device id %d\n",</div><div class='add'>+				   hw_link_id, device_id);</div><div class='add'>+			dev_kfree_skb_any(msdu);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pdev_id = ath12k_hw_mac_id_to_pdev_id(partner_ab-&gt;hw_params,</div><div class='add'>+						      hw_links[hw_link_id].pdev_idx);</div><div class='add'>+		ar = partner_ab-&gt;pdevs[pdev_id].ar;</div><div class='add'>+</div><div class='add'>+		if (!ar || !rcu_dereference(ar-&gt;ab-&gt;pdevs_active[pdev_id])) {</div><div class='add'>+			dev_kfree_skb_any(msdu);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (test_bit(ATH12K_FLAG_CAC_RUNNING, &amp;ar-&gt;dev_flags)) {</div><div class='add'>+			dev_kfree_skb_any(msdu);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (rxcb-&gt;err_rel_src &lt; HAL_WBM_REL_SRC_MODULE_MAX) {</div><div class='add'>+			device_id = ar-&gt;ab-&gt;device_id;</div><div class='add'>+			device_stats-&gt;rx_wbm_rel_source[rxcb-&gt;err_rel_src][device_id]++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath12k_dp_rx_wbm_err(ar, napi, msdu, &amp;msdu_list);</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+done:</div><div class='add'>+	return total_num_buffs_reaped;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_rx_process_reo_status(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct hal_tlv_64_hdr *hdr;</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	struct ath12k_dp_rx_reo_cmd *cmd, *tmp;</div><div class='add'>+	bool found = false;</div><div class='add'>+	u16 tag;</div><div class='add'>+	struct hal_reo_status reo_status;</div><div class='add'>+</div><div class='add'>+	srng = &amp;ab-&gt;hal.srng_list[dp-&gt;reo_status_ring.ring_id];</div><div class='add'>+</div><div class='add'>+	memset(&amp;reo_status, 0, sizeof(reo_status));</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_begin(ab, srng);</div><div class='add'>+</div><div class='add'>+	while ((hdr = ath12k_hal_srng_dst_get_next_entry(ab, srng))) {</div><div class='add'>+		tag = le64_get_bits(hdr-&gt;tl, HAL_SRNG_TLV_HDR_TAG);</div><div class='add'>+</div><div class='add'>+		switch (tag) {</div><div class='add'>+		case HAL_REO_GET_QUEUE_STATS_STATUS:</div><div class='add'>+			ath12k_hal_reo_status_queue_stats(ab, hdr,</div><div class='add'>+							  &amp;reo_status);</div><div class='add'>+			break;</div><div class='add'>+		case HAL_REO_FLUSH_QUEUE_STATUS:</div><div class='add'>+			ath12k_hal_reo_flush_queue_status(ab, hdr,</div><div class='add'>+							  &amp;reo_status);</div><div class='add'>+			break;</div><div class='add'>+		case HAL_REO_FLUSH_CACHE_STATUS:</div><div class='add'>+			ath12k_hal_reo_flush_cache_status(ab, hdr,</div><div class='add'>+							  &amp;reo_status);</div><div class='add'>+			break;</div><div class='add'>+		case HAL_REO_UNBLOCK_CACHE_STATUS:</div><div class='add'>+			ath12k_hal_reo_unblk_cache_status(ab, hdr,</div><div class='add'>+							  &amp;reo_status);</div><div class='add'>+			break;</div><div class='add'>+		case HAL_REO_FLUSH_TIMEOUT_LIST_STATUS:</div><div class='add'>+			ath12k_hal_reo_flush_timeout_list_status(ab, hdr,</div><div class='add'>+								 &amp;reo_status);</div><div class='add'>+			break;</div><div class='add'>+		case HAL_REO_DESCRIPTOR_THRESHOLD_REACHED_STATUS:</div><div class='add'>+			ath12k_hal_reo_desc_thresh_reached_status(ab, hdr,</div><div class='add'>+								  &amp;reo_status);</div><div class='add'>+			break;</div><div class='add'>+		case HAL_REO_UPDATE_RX_REO_QUEUE_STATUS:</div><div class='add'>+			ath12k_hal_reo_update_rx_reo_queue_status(ab, hdr,</div><div class='add'>+								  &amp;reo_status);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ath12k_warn(ab, "Unknown reo status type %d\n", tag);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;dp-&gt;reo_cmd_lock);</div><div class='add'>+		list_for_each_entry_safe(cmd, tmp, &amp;dp-&gt;reo_cmd_list, list) {</div><div class='add'>+			if (reo_status.uniform_hdr.cmd_num == cmd-&gt;cmd_num) {</div><div class='add'>+				found = true;</div><div class='add'>+				list_del(&amp;cmd-&gt;list);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_bh(&amp;dp-&gt;reo_cmd_lock);</div><div class='add'>+</div><div class='add'>+		if (found) {</div><div class='add'>+			cmd-&gt;handler(dp, (void *)&amp;cmd-&gt;data,</div><div class='add'>+				     reo_status.uniform_hdr.cmd_status);</div><div class='add'>+			kfree(cmd);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		found = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_rx_free(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct dp_srng *srng;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ath12k_dp_srng_cleanup(ab, &amp;dp-&gt;rx_refill_buf_ring.refill_buf_ring);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;num_rxdma_per_pdev; i++) {</div><div class='add'>+		if (ab-&gt;hw_params-&gt;rx_mac_buf_ring)</div><div class='add'>+			ath12k_dp_srng_cleanup(ab, &amp;dp-&gt;rx_mac_buf_ring[i]);</div><div class='add'>+		if (!ab-&gt;hw_params-&gt;rxdma1_enable) {</div><div class='add'>+			srng = &amp;dp-&gt;rx_mon_status_refill_ring[i].refill_buf_ring;</div><div class='add'>+			ath12k_dp_srng_cleanup(ab, srng);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;num_rxdma_dst_ring; i++)</div><div class='add'>+		ath12k_dp_srng_cleanup(ab, &amp;dp-&gt;rxdma_err_dst_ring[i]);</div><div class='add'>+</div><div class='add'>+	ath12k_dp_srng_cleanup(ab, &amp;dp-&gt;rxdma_mon_buf_ring.refill_buf_ring);</div><div class='add'>+</div><div class='add'>+	ath12k_dp_rxdma_buf_free(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_rx_pdev_free(struct ath12k_base *ab, int mac_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = ab-&gt;pdevs[mac_id].ar;</div><div class='add'>+</div><div class='add'>+	ath12k_dp_rx_pdev_srng_free(ar);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_rxdma_ring_sel_config_qcn9274(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct htt_rx_ring_tlv_filter tlv_filter = {};</div><div class='add'>+	u32 ring_id;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 hal_rx_desc_sz = ab-&gt;hal.hal_desc_sz;</div><div class='add'>+</div><div class='add'>+	ring_id = dp-&gt;rx_refill_buf_ring.refill_buf_ring.ring_id;</div><div class='add'>+</div><div class='add'>+	tlv_filter.rx_filter = HTT_RX_TLV_FLAGS_RXDMA_RING;</div><div class='add'>+	tlv_filter.pkt_filter_flags2 = HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_BAR;</div><div class='add'>+	tlv_filter.pkt_filter_flags3 = HTT_RX_FP_DATA_PKT_FILTER_TLV_FLASG3_MCAST |</div><div class='add'>+					HTT_RX_FP_DATA_PKT_FILTER_TLV_FLASG3_UCAST |</div><div class='add'>+					HTT_RX_FP_DATA_PKT_FILTER_TLV_FLASG3_NULL_DATA;</div><div class='add'>+	tlv_filter.offset_valid = true;</div><div class='add'>+	tlv_filter.rx_packet_offset = hal_rx_desc_sz;</div><div class='add'>+</div><div class='add'>+	tlv_filter.rx_mpdu_start_offset =</div><div class='add'>+		ab-&gt;hal_rx_ops-&gt;rx_desc_get_mpdu_start_offset();</div><div class='add'>+	tlv_filter.rx_msdu_end_offset =</div><div class='add'>+		ab-&gt;hal_rx_ops-&gt;rx_desc_get_msdu_end_offset();</div><div class='add'>+</div><div class='add'>+	if (ath12k_dp_wmask_compaction_rx_tlv_supported(ab)) {</div><div class='add'>+		tlv_filter.rx_mpdu_start_wmask =</div><div class='add'>+			ab-&gt;hw_params-&gt;hal_ops-&gt;rxdma_ring_wmask_rx_mpdu_start();</div><div class='add'>+		tlv_filter.rx_msdu_end_wmask =</div><div class='add'>+			ab-&gt;hw_params-&gt;hal_ops-&gt;rxdma_ring_wmask_rx_msdu_end();</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_DATA,</div><div class='add'>+			   "Configuring compact tlv masks rx_mpdu_start_wmask 0x%x rx_msdu_end_wmask 0x%x\n",</div><div class='add'>+			   tlv_filter.rx_mpdu_start_wmask, tlv_filter.rx_msdu_end_wmask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_tx_htt_rx_filter_setup(ab, ring_id, 0,</div><div class='add'>+					       HAL_RXDMA_BUF,</div><div class='add'>+					       DP_RXDMA_REFILL_RING_SIZE,</div><div class='add'>+					       &amp;tlv_filter);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_rxdma_ring_sel_config_wcn7850(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct htt_rx_ring_tlv_filter tlv_filter = {};</div><div class='add'>+	u32 ring_id;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u32 hal_rx_desc_sz = ab-&gt;hal.hal_desc_sz;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ring_id = dp-&gt;rx_refill_buf_ring.refill_buf_ring.ring_id;</div><div class='add'>+</div><div class='add'>+	tlv_filter.rx_filter = HTT_RX_TLV_FLAGS_RXDMA_RING;</div><div class='add'>+	tlv_filter.pkt_filter_flags2 = HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_BAR;</div><div class='add'>+	tlv_filter.pkt_filter_flags3 = HTT_RX_FP_DATA_PKT_FILTER_TLV_FLASG3_MCAST |</div><div class='add'>+					HTT_RX_FP_DATA_PKT_FILTER_TLV_FLASG3_UCAST |</div><div class='add'>+					HTT_RX_FP_DATA_PKT_FILTER_TLV_FLASG3_NULL_DATA;</div><div class='add'>+	tlv_filter.offset_valid = true;</div><div class='add'>+	tlv_filter.rx_packet_offset = hal_rx_desc_sz;</div><div class='add'>+</div><div class='add'>+	tlv_filter.rx_header_offset = offsetof(struct hal_rx_desc_wcn7850, pkt_hdr_tlv);</div><div class='add'>+</div><div class='add'>+	tlv_filter.rx_mpdu_start_offset =</div><div class='add'>+		ab-&gt;hal_rx_ops-&gt;rx_desc_get_mpdu_start_offset();</div><div class='add'>+	tlv_filter.rx_msdu_end_offset =</div><div class='add'>+		ab-&gt;hal_rx_ops-&gt;rx_desc_get_msdu_end_offset();</div><div class='add'>+</div><div class='add'>+	/* TODO: Selectively subscribe to required qwords within msdu_end</div><div class='add'>+	 * and mpdu_start and setup the mask in below msg</div><div class='add'>+	 * and modify the rx_desc struct</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;num_rxdma_per_pdev; i++) {</div><div class='add'>+		ring_id = dp-&gt;rx_mac_buf_ring[i].ring_id;</div><div class='add'>+		ret = ath12k_dp_tx_htt_rx_filter_setup(ab, ring_id, i,</div><div class='add'>+						       HAL_RXDMA_BUF,</div><div class='add'>+						       DP_RXDMA_REFILL_RING_SIZE,</div><div class='add'>+						       &amp;tlv_filter);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_rx_htt_setup(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	u32 ring_id;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	/* TODO: Need to verify the HTT setup for QCN9224 */</div><div class='add'>+	ring_id = dp-&gt;rx_refill_buf_ring.refill_buf_ring.ring_id;</div><div class='add'>+	ret = ath12k_dp_tx_htt_srng_setup(ab, ring_id, 0, HAL_RXDMA_BUF);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to configure rx_refill_buf_ring %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;rx_mac_buf_ring) {</div><div class='add'>+		for (i = 0; i &lt; ab-&gt;hw_params-&gt;num_rxdma_per_pdev; i++) {</div><div class='add'>+			ring_id = dp-&gt;rx_mac_buf_ring[i].ring_id;</div><div class='add'>+			ret = ath12k_dp_tx_htt_srng_setup(ab, ring_id,</div><div class='add'>+							  i, HAL_RXDMA_BUF);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_warn(ab, "failed to configure rx_mac_buf_ring%d %d\n",</div><div class='add'>+					    i, ret);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;num_rxdma_dst_ring; i++) {</div><div class='add'>+		ring_id = dp-&gt;rxdma_err_dst_ring[i].ring_id;</div><div class='add'>+		ret = ath12k_dp_tx_htt_srng_setup(ab, ring_id,</div><div class='add'>+						  i, HAL_RXDMA_DST);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to configure rxdma_err_dest_ring%d %d\n",</div><div class='add'>+				    i, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;rxdma1_enable) {</div><div class='add'>+		ring_id = dp-&gt;rxdma_mon_buf_ring.refill_buf_ring.ring_id;</div><div class='add'>+		ret = ath12k_dp_tx_htt_srng_setup(ab, ring_id,</div><div class='add'>+						  0, HAL_RXDMA_MONITOR_BUF);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to configure rxdma_mon_buf_ring %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; ab-&gt;hw_params-&gt;num_rxdma_per_pdev; i++) {</div><div class='add'>+			ring_id =</div><div class='add'>+				dp-&gt;rx_mon_status_refill_ring[i].refill_buf_ring.ring_id;</div><div class='add'>+			ret = ath12k_dp_tx_htt_srng_setup(ab, ring_id, i,</div><div class='add'>+							  HAL_RXDMA_MONITOR_STATUS);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_warn(ab,</div><div class='add'>+					    "failed to configure mon_status_refill_ring%d %d\n",</div><div class='add'>+					    i, ret);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ab-&gt;hw_params-&gt;hw_ops-&gt;rxdma_ring_sel_config(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to setup rxdma ring selection config\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_rx_alloc(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct dp_srng *srng;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	idr_init(&amp;dp-&gt;rxdma_mon_buf_ring.bufs_idr);</div><div class='add'>+	spin_lock_init(&amp;dp-&gt;rxdma_mon_buf_ring.idr_lock);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_srng_setup(ab,</div><div class='add'>+				   &amp;dp-&gt;rx_refill_buf_ring.refill_buf_ring,</div><div class='add'>+				   HAL_RXDMA_BUF, 0, 0,</div><div class='add'>+				   DP_RXDMA_BUF_RING_SIZE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to setup rx_refill_buf_ring\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;rx_mac_buf_ring) {</div><div class='add'>+		for (i = 0; i &lt; ab-&gt;hw_params-&gt;num_rxdma_per_pdev; i++) {</div><div class='add'>+			ret = ath12k_dp_srng_setup(ab,</div><div class='add'>+						   &amp;dp-&gt;rx_mac_buf_ring[i],</div><div class='add'>+						   HAL_RXDMA_BUF, 1,</div><div class='add'>+						   i, DP_RX_MAC_BUF_RING_SIZE);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_warn(ab, "failed to setup rx_mac_buf_ring %d\n",</div><div class='add'>+					    i);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;num_rxdma_dst_ring; i++) {</div><div class='add'>+		ret = ath12k_dp_srng_setup(ab, &amp;dp-&gt;rxdma_err_dst_ring[i],</div><div class='add'>+					   HAL_RXDMA_DST, 0, i,</div><div class='add'>+					   DP_RXDMA_ERR_DST_RING_SIZE);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to setup rxdma_err_dst_ring %d\n", i);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;rxdma1_enable) {</div><div class='add'>+		ret = ath12k_dp_srng_setup(ab,</div><div class='add'>+					   &amp;dp-&gt;rxdma_mon_buf_ring.refill_buf_ring,</div><div class='add'>+					   HAL_RXDMA_MONITOR_BUF, 0, 0,</div><div class='add'>+					   DP_RXDMA_MONITOR_BUF_RING_SIZE(ab));</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to setup HAL_RXDMA_MONITOR_BUF\n");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; ab-&gt;hw_params-&gt;num_rxdma_per_pdev; i++) {</div><div class='add'>+			idr_init(&amp;dp-&gt;rx_mon_status_refill_ring[i].bufs_idr);</div><div class='add'>+			spin_lock_init(&amp;dp-&gt;rx_mon_status_refill_ring[i].idr_lock);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ab-&gt;hw_params-&gt;num_rxdma_per_pdev; i++) {</div><div class='add'>+			srng = &amp;dp-&gt;rx_mon_status_refill_ring[i].refill_buf_ring;</div><div class='add'>+			ret = ath12k_dp_srng_setup(ab, srng,</div><div class='add'>+						   HAL_RXDMA_MONITOR_STATUS, 0, i,</div><div class='add'>+						   DP_RXDMA_MON_STATUS_RING_SIZE);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_warn(ab, "failed to setup mon status ring %d\n",</div><div class='add'>+					    i);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_rxdma_buf_setup(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to setup rxdma ring\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_rx_pdev_alloc(struct ath12k_base *ab, int mac_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = ab-&gt;pdevs[mac_id].ar;</div><div class='add'>+	struct ath12k_pdev_dp *dp = &amp;ar-&gt;dp;</div><div class='add'>+	u32 ring_id;</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;hw_params-&gt;rxdma1_enable)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_rx_pdev_srng_alloc(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to setup rx srngs\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;num_rxdma_per_pdev; i++) {</div><div class='add'>+		ring_id = dp-&gt;rxdma_mon_dst_ring[i].ring_id;</div><div class='add'>+		ret = ath12k_dp_tx_htt_srng_setup(ab, ring_id,</div><div class='add'>+						  mac_id + i,</div><div class='add'>+						  HAL_RXDMA_MONITOR_DST);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab,</div><div class='add'>+				    "failed to configure rxdma_mon_dst_ring %d %d\n",</div><div class='add'>+				    i, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_rx_pdev_mon_status_attach(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pdev_dp *dp = &amp;ar-&gt;dp;</div><div class='add'>+	struct ath12k_mon_data *pmon = (struct ath12k_mon_data *)&amp;dp-&gt;mon_data;</div><div class='add'>+</div><div class='add'>+	skb_queue_head_init(&amp;pmon-&gt;rx_status_q);</div><div class='add'>+</div><div class='add'>+	pmon-&gt;mon_ppdu_status = DP_PPDU_STATUS_START;</div><div class='add'>+</div><div class='add'>+	memset(&amp;pmon-&gt;rx_mon_stats, 0,</div><div class='add'>+	       sizeof(pmon-&gt;rx_mon_stats));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_rx_pdev_mon_attach(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pdev_dp *dp = &amp;ar-&gt;dp;</div><div class='add'>+	struct ath12k_mon_data *pmon = &amp;dp-&gt;mon_data;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_rx_pdev_mon_status_attach(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "pdev_mon_status_attach() failed");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pmon-&gt;mon_last_linkdesc_paddr = 0;</div><div class='add'>+	pmon-&gt;mon_last_buf_cookie = DP_RX_DESC_COOKIE_MAX + 1;</div><div class='add'>+	spin_lock_init(&amp;pmon-&gt;mon_lock);</div><div class='add'>+</div><div class='add'>+	if (!ar-&gt;ab-&gt;hw_params-&gt;rxdma1_enable)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;pmon-&gt;dp_rx_mon_mpdu_list);</div><div class='add'>+	pmon-&gt;mon_mpdu = NULL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/dp_rx.h b/drivers/net/wireless/ath/ath12k/dp_rx.h<br/>new file mode 100644<br/>index 000000000000..69d0a36a91d8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/dp_rx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/dp_rx.h</a></div><div class='hunk'>@@ -0,0 +1,191 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+#ifndef ATH12K_DP_RX_H</div><div class='add'>+#define ATH12K_DP_RX_H</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "rx_desc.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+#define DP_MAX_NWIFI_HDR_LEN	30</div><div class='add'>+</div><div class='add'>+struct ath12k_dp_rx_tid {</div><div class='add'>+	u8 tid;</div><div class='add'>+	u32 ba_win_sz;</div><div class='add'>+	bool active;</div><div class='add'>+	struct ath12k_reoq_buf qbuf;</div><div class='add'>+</div><div class='add'>+	/* Info related to rx fragments */</div><div class='add'>+	u32 cur_sn;</div><div class='add'>+	u16 last_frag_no;</div><div class='add'>+	u16 rx_frag_bitmap;</div><div class='add'>+</div><div class='add'>+	struct sk_buff_head rx_frags;</div><div class='add'>+	struct hal_reo_dest_ring *dst_ring_desc;</div><div class='add'>+</div><div class='add'>+	/* Timer info related to fragments */</div><div class='add'>+	struct timer_list frag_timer;</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_dp_rx_tid_rxq {</div><div class='add'>+	u8 tid;</div><div class='add'>+	bool active;</div><div class='add'>+	struct ath12k_reoq_buf qbuf;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_dp_rx_reo_cache_flush_elem {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct ath12k_dp_rx_tid_rxq data;</div><div class='add'>+	unsigned long ts;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dp_reo_update_rx_queue_elem {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct ath12k_dp_rx_tid_rxq rx_tid;</div><div class='add'>+	int peer_id;</div><div class='add'>+	bool is_ml_peer;</div><div class='add'>+	u16 ml_peer_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_dp_rx_reo_cmd {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct ath12k_dp_rx_tid_rxq data;</div><div class='add'>+	int cmd_num;</div><div class='add'>+	void (*handler)(struct ath12k_dp *dp, void *ctx,</div><div class='add'>+			enum hal_reo_cmd_status status);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_DP_RX_REO_DESC_FREE_THRES  64</div><div class='add'>+#define ATH12K_DP_RX_REO_DESC_FREE_TIMEOUT_MS 1000</div><div class='add'>+</div><div class='add'>+enum ath12k_dp_rx_decap_type {</div><div class='add'>+	DP_RX_DECAP_TYPE_RAW,</div><div class='add'>+	DP_RX_DECAP_TYPE_NATIVE_WIFI,</div><div class='add'>+	DP_RX_DECAP_TYPE_ETHERNET2_DIX,</div><div class='add'>+	DP_RX_DECAP_TYPE_8023,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_dp_rx_rfc1042_hdr {</div><div class='add'>+	u8 llc_dsap;</div><div class='add'>+	u8 llc_ssap;</div><div class='add'>+	u8 llc_ctrl;</div><div class='add'>+	u8 snap_oui[3];</div><div class='add'>+	__be16 snap_type;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_dp_rx_info {</div><div class='add'>+	struct ieee80211_rx_status *rx_status;</div><div class='add'>+	u32 phy_meta_data;</div><div class='add'>+	u16 peer_id;</div><div class='add'>+	u8 decap_type;</div><div class='add'>+	u8 pkt_type;</div><div class='add'>+	u8 sgi;</div><div class='add'>+	u8 rate_mcs;</div><div class='add'>+	u8 bw;</div><div class='add'>+	u8 nss;</div><div class='add'>+	u8 addr2[ETH_ALEN];</div><div class='add'>+	u8 tid;</div><div class='add'>+	bool ip_csum_fail;</div><div class='add'>+	bool l4_csum_fail;</div><div class='add'>+	bool is_mcbc;</div><div class='add'>+	bool addr2_present;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline u32 ath12k_he_gi_to_nl80211_he_gi(u8 sgi)</div><div class='add'>+{</div><div class='add'>+	u32 ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (sgi) {</div><div class='add'>+	case RX_MSDU_START_SGI_0_8_US:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_GI_0_8;</div><div class='add'>+		break;</div><div class='add'>+	case RX_MSDU_START_SGI_1_6_US:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_GI_1_6;</div><div class='add'>+		break;</div><div class='add'>+	case RX_MSDU_START_SGI_3_2_US:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_GI_3_2;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_GI_0_8;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_rx_ampdu_start(struct ath12k *ar,</div><div class='add'>+			     struct ieee80211_ampdu_params *params,</div><div class='add'>+			     u8 link_id);</div><div class='add'>+int ath12k_dp_rx_ampdu_stop(struct ath12k *ar,</div><div class='add'>+			    struct ieee80211_ampdu_params *params,</div><div class='add'>+			    u8 link_id);</div><div class='add'>+int ath12k_dp_rx_peer_pn_replay_config(struct ath12k_link_vif *arvif,</div><div class='add'>+				       const u8 *peer_addr,</div><div class='add'>+				       enum set_key_cmd key_cmd,</div><div class='add'>+				       struct ieee80211_key_conf *key);</div><div class='add'>+void ath12k_dp_rx_peer_tid_cleanup(struct ath12k *ar, struct ath12k_peer *peer);</div><div class='add'>+void ath12k_dp_rx_peer_tid_delete(struct ath12k *ar,</div><div class='add'>+				  struct ath12k_peer *peer, u8 tid);</div><div class='add'>+int ath12k_dp_rx_peer_tid_setup(struct ath12k *ar, const u8 *peer_mac, int vdev_id,</div><div class='add'>+				u8 tid, u32 ba_win_sz, u16 ssn,</div><div class='add'>+				enum hal_pn_type pn_type);</div><div class='add'>+void ath12k_dp_htt_htc_t2h_msg_handler(struct ath12k_base *ab,</div><div class='add'>+				       struct sk_buff *skb);</div><div class='add'>+int ath12k_dp_rx_pdev_reo_setup(struct ath12k_base *ab);</div><div class='add'>+void ath12k_dp_rx_pdev_reo_cleanup(struct ath12k_base *ab);</div><div class='add'>+int ath12k_dp_rx_htt_setup(struct ath12k_base *ab);</div><div class='add'>+int ath12k_dp_rx_alloc(struct ath12k_base *ab);</div><div class='add'>+void ath12k_dp_rx_free(struct ath12k_base *ab);</div><div class='add'>+int ath12k_dp_rx_pdev_alloc(struct ath12k_base *ab, int pdev_idx);</div><div class='add'>+void ath12k_dp_rx_pdev_free(struct ath12k_base *ab, int pdev_idx);</div><div class='add'>+void ath12k_dp_rx_reo_cmd_list_cleanup(struct ath12k_base *ab);</div><div class='add'>+void ath12k_dp_rx_process_reo_status(struct ath12k_base *ab);</div><div class='add'>+int ath12k_dp_rx_process_wbm_err(struct ath12k_base *ab,</div><div class='add'>+				 struct napi_struct *napi, int budget);</div><div class='add'>+int ath12k_dp_rx_process_err(struct ath12k_base *ab, struct napi_struct *napi,</div><div class='add'>+			     int budget);</div><div class='add'>+int ath12k_dp_rx_process(struct ath12k_base *ab, int mac_id,</div><div class='add'>+			 struct napi_struct *napi,</div><div class='add'>+			 int budget);</div><div class='add'>+int ath12k_dp_rx_bufs_replenish(struct ath12k_base *ab,</div><div class='add'>+				struct dp_rxdma_ring *rx_ring,</div><div class='add'>+				struct list_head *used_list,</div><div class='add'>+				int req_entries);</div><div class='add'>+int ath12k_dp_rx_pdev_mon_attach(struct ath12k *ar);</div><div class='add'>+int ath12k_dp_rx_peer_frag_setup(struct ath12k *ar, const u8 *peer_mac, int vdev_id);</div><div class='add'>+</div><div class='add'>+u8 ath12k_dp_rx_h_l3pad(struct ath12k_base *ab,</div><div class='add'>+			struct hal_rx_desc *desc);</div><div class='add'>+struct ath12k_peer *</div><div class='add'>+ath12k_dp_rx_h_find_peer(struct ath12k_base *ab, struct sk_buff *msdu,</div><div class='add'>+			 struct ath12k_dp_rx_info *rx_info);</div><div class='add'>+u8 ath12k_dp_rx_h_decap_type(struct ath12k_base *ab,</div><div class='add'>+			     struct hal_rx_desc *desc);</div><div class='add'>+u32 ath12k_dp_rx_h_mpdu_err(struct ath12k_base *ab,</div><div class='add'>+			    struct hal_rx_desc *desc);</div><div class='add'>+void ath12k_dp_rx_h_ppdu(struct ath12k *ar, struct ath12k_dp_rx_info *rx_info);</div><div class='add'>+int ath12k_dp_rxdma_ring_sel_config_qcn9274(struct ath12k_base *ab);</div><div class='add'>+int ath12k_dp_rxdma_ring_sel_config_wcn7850(struct ath12k_base *ab);</div><div class='add'>+</div><div class='add'>+int ath12k_dp_htt_tlv_iter(struct ath12k_base *ab, const void *ptr, size_t len,</div><div class='add'>+			   int (*iter)(struct ath12k_base *ar, u16 tag, u16 len,</div><div class='add'>+				       const void *ptr, void *data),</div><div class='add'>+			   void *data);</div><div class='add'>+void ath12k_dp_rx_h_fetch_info(struct ath12k_base *ab,  struct hal_rx_desc *rx_desc,</div><div class='add'>+			       struct ath12k_dp_rx_info *rx_info);</div><div class='add'>+</div><div class='add'>+int ath12k_dp_rx_crypto_mic_len(struct ath12k *ar, enum hal_encrypt_type enctype);</div><div class='add'>+u32 ath12k_dp_rxdesc_get_ppduid(struct ath12k_base *ab,</div><div class='add'>+				struct hal_rx_desc *rx_desc);</div><div class='add'>+bool ath12k_dp_rxdesc_mpdu_valid(struct ath12k_base *ab,</div><div class='add'>+				 struct hal_rx_desc *rx_desc);</div><div class='add'>+int ath12k_dp_rx_link_desc_return(struct ath12k_base *ab,</div><div class='add'>+				  struct ath12k_buffer_addr *buf_addr_info,</div><div class='add'>+				  enum hal_wbm_rel_bm_act action);</div><div class='add'>+bool ath12k_dp_rxdesc_mpdu_valid(struct ath12k_base *ab,</div><div class='add'>+				 struct hal_rx_desc *rx_desc);</div><div class='add'>+#endif /* ATH12K_DP_RX_H */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/dp_tx.c b/drivers/net/wireless/ath/ath12k/dp_tx.c<br/>new file mode 100644<br/>index 000000000000..abc84ca8467a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/dp_tx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/dp_tx.c</a></div><div class='hunk'>@@ -0,0 +1,1781 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "dp_tx.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "debugfs.h"</div><div class='add'>+#include "hw.h"</div><div class='add'>+#include "peer.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+</div><div class='add'>+static enum hal_tcl_encap_type</div><div class='add'>+ath12k_dp_tx_get_encap_type(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_FLAG_RAW_MODE, &amp;ab-&gt;dev_flags))</div><div class='add'>+		return HAL_TCL_ENCAP_TYPE_RAW;</div><div class='add'>+</div><div class='add'>+	if (tx_info-&gt;flags &amp; IEEE80211_TX_CTL_HW_80211_ENCAP)</div><div class='add'>+		return HAL_TCL_ENCAP_TYPE_ETHERNET;</div><div class='add'>+</div><div class='add'>+	return HAL_TCL_ENCAP_TYPE_NATIVE_WIFI;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_tx_encap_nwifi(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='add'>+	u8 *qos_ctl;</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_is_data_qos(hdr-&gt;frame_control))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	qos_ctl = ieee80211_get_qos_ctl(hdr);</div><div class='add'>+	memmove(skb-&gt;data + IEEE80211_QOS_CTL_LEN,</div><div class='add'>+		skb-&gt;data, (void *)qos_ctl - (void *)skb-&gt;data);</div><div class='add'>+	skb_pull(skb, IEEE80211_QOS_CTL_LEN);</div><div class='add'>+</div><div class='add'>+	hdr = (void *)skb-&gt;data;</div><div class='add'>+	hdr-&gt;frame_control &amp;= ~__cpu_to_le16(IEEE80211_STYPE_QOS_DATA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_dp_tx_get_tid(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='add'>+	struct ath12k_skb_cb *cb = ATH12K_SKB_CB(skb);</div><div class='add'>+</div><div class='add'>+	if (cb-&gt;flags &amp; ATH12K_SKB_HW_80211_ENCAP)</div><div class='add'>+		return skb-&gt;priority &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='add'>+	else if (!ieee80211_is_data_qos(hdr-&gt;frame_control))</div><div class='add'>+		return HAL_DESC_REO_NON_QOS_TID;</div><div class='add'>+	else</div><div class='add'>+		return skb-&gt;priority &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum hal_encrypt_type ath12k_dp_tx_get_encrypt_type(u32 cipher)</div><div class='add'>+{</div><div class='add'>+	switch (cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP40:</div><div class='add'>+		return HAL_ENCRYPT_TYPE_WEP_40;</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP104:</div><div class='add'>+		return HAL_ENCRYPT_TYPE_WEP_104;</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		return HAL_ENCRYPT_TYPE_TKIP_MIC;</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+		return HAL_ENCRYPT_TYPE_CCMP_128;</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP_256:</div><div class='add'>+		return HAL_ENCRYPT_TYPE_CCMP_256;</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP:</div><div class='add'>+		return HAL_ENCRYPT_TYPE_GCMP_128;</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='add'>+		return HAL_ENCRYPT_TYPE_AES_GCMP_256;</div><div class='add'>+	default:</div><div class='add'>+		return HAL_ENCRYPT_TYPE_OPEN;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_tx_release_txbuf(struct ath12k_dp *dp,</div><div class='add'>+				       struct ath12k_tx_desc_info *tx_desc,</div><div class='add'>+				       u8 pool_id)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;dp-&gt;tx_desc_lock[pool_id]);</div><div class='add'>+	tx_desc-&gt;skb_ext_desc = NULL;</div><div class='add'>+	list_move_tail(&amp;tx_desc-&gt;list, &amp;dp-&gt;tx_desc_free_list[pool_id]);</div><div class='add'>+	spin_unlock_bh(&amp;dp-&gt;tx_desc_lock[pool_id]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ath12k_tx_desc_info *ath12k_dp_tx_assign_buffer(struct ath12k_dp *dp,</div><div class='add'>+							      u8 pool_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_tx_desc_info *desc;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dp-&gt;tx_desc_lock[pool_id]);</div><div class='add'>+	desc = list_first_entry_or_null(&amp;dp-&gt;tx_desc_free_list[pool_id],</div><div class='add'>+					struct ath12k_tx_desc_info,</div><div class='add'>+					list);</div><div class='add'>+	if (!desc) {</div><div class='add'>+		spin_unlock_bh(&amp;dp-&gt;tx_desc_lock[pool_id]);</div><div class='add'>+		ath12k_warn(dp-&gt;ab, "failed to allocate data Tx buffer\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_move_tail(&amp;desc-&gt;list, &amp;dp-&gt;tx_desc_used_list[pool_id]);</div><div class='add'>+	spin_unlock_bh(&amp;dp-&gt;tx_desc_lock[pool_id]);</div><div class='add'>+</div><div class='add'>+	return desc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_hal_tx_cmd_ext_desc_setup(struct ath12k_base *ab,</div><div class='add'>+					     struct hal_tx_msdu_ext_desc *tcl_ext_cmd,</div><div class='add'>+					     struct hal_tx_info *ti)</div><div class='add'>+{</div><div class='add'>+	tcl_ext_cmd-&gt;info0 = le32_encode_bits(ti-&gt;paddr,</div><div class='add'>+					      HAL_TX_MSDU_EXT_INFO0_BUF_PTR_LO);</div><div class='add'>+	tcl_ext_cmd-&gt;info1 = le32_encode_bits(0x0,</div><div class='add'>+					      HAL_TX_MSDU_EXT_INFO1_BUF_PTR_HI) |</div><div class='add'>+			       le32_encode_bits(ti-&gt;data_len,</div><div class='add'>+						HAL_TX_MSDU_EXT_INFO1_BUF_LEN);</div><div class='add'>+</div><div class='add'>+	tcl_ext_cmd-&gt;info1 |= le32_encode_bits(1, HAL_TX_MSDU_EXT_INFO1_EXTN_OVERRIDE) |</div><div class='add'>+				le32_encode_bits(ti-&gt;encap_type,</div><div class='add'>+						 HAL_TX_MSDU_EXT_INFO1_ENCAP_TYPE) |</div><div class='add'>+				le32_encode_bits(ti-&gt;encrypt_type,</div><div class='add'>+						 HAL_TX_MSDU_EXT_INFO1_ENCRYPT_TYPE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define HTT_META_DATA_ALIGNMENT 0x8</div><div class='add'>+</div><div class='add'>+static void *ath12k_dp_metadata_align_skb(struct sk_buff *skb, u8 tail_len)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *tail;</div><div class='add'>+	void *metadata;</div><div class='add'>+</div><div class='add'>+	if (unlikely(skb_cow_data(skb, tail_len, &amp;tail) &lt; 0))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	metadata = pskb_put(skb, tail, tail_len);</div><div class='add'>+	memset(metadata, 0, tail_len);</div><div class='add'>+	return metadata;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Preparing HTT Metadata when utilized with ext MSDU */</div><div class='add'>+static int ath12k_dp_prepare_htt_metadata(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hal_tx_msdu_metadata *desc_ext;</div><div class='add'>+	u8 htt_desc_size;</div><div class='add'>+	/* Size rounded of multiple of 8 bytes */</div><div class='add'>+	u8 htt_desc_size_aligned;</div><div class='add'>+</div><div class='add'>+	htt_desc_size = sizeof(struct hal_tx_msdu_metadata);</div><div class='add'>+	htt_desc_size_aligned = ALIGN(htt_desc_size, HTT_META_DATA_ALIGNMENT);</div><div class='add'>+</div><div class='add'>+	desc_ext = ath12k_dp_metadata_align_skb(skb, htt_desc_size_aligned);</div><div class='add'>+	if (!desc_ext)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	desc_ext-&gt;info0 = le32_encode_bits(1, HAL_TX_MSDU_METADATA_INFO0_ENCRYPT_FLAG) |</div><div class='add'>+			  le32_encode_bits(0, HAL_TX_MSDU_METADATA_INFO0_ENCRYPT_TYPE) |</div><div class='add'>+			  le32_encode_bits(1,</div><div class='add'>+					   HAL_TX_MSDU_METADATA_INFO0_HOST_TX_DESC_POOL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_tx_move_payload(struct sk_buff *skb,</div><div class='add'>+				      unsigned long delta,</div><div class='add'>+				      bool head)</div><div class='add'>+{</div><div class='add'>+	unsigned long len = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	if (head) {</div><div class='add'>+		skb_push(skb, delta);</div><div class='add'>+		memmove(skb-&gt;data, skb-&gt;data + delta, len);</div><div class='add'>+		skb_trim(skb, len);</div><div class='add'>+	} else {</div><div class='add'>+		skb_put(skb, delta);</div><div class='add'>+		memmove(skb-&gt;data + delta, skb-&gt;data, len);</div><div class='add'>+		skb_pull(skb, delta);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_dp_tx_align_payload(struct ath12k_base *ab,</div><div class='add'>+				      struct sk_buff **pskb)</div><div class='add'>+{</div><div class='add'>+	u32 iova_mask = ab-&gt;hw_params-&gt;iova_mask;</div><div class='add'>+	unsigned long offset, delta1, delta2;</div><div class='add'>+	struct sk_buff *skb2, *skb = *pskb;</div><div class='add'>+	unsigned int headroom = skb_headroom(skb);</div><div class='add'>+	int tailroom = skb_tailroom(skb);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	offset = (unsigned long)skb-&gt;data &amp; iova_mask;</div><div class='add'>+	delta1 = offset;</div><div class='add'>+	delta2 = iova_mask - offset + 1;</div><div class='add'>+</div><div class='add'>+	if (headroom &gt;= delta1) {</div><div class='add'>+		ath12k_dp_tx_move_payload(skb, delta1, true);</div><div class='add'>+	} else if (tailroom &gt;= delta2) {</div><div class='add'>+		ath12k_dp_tx_move_payload(skb, delta2, false);</div><div class='add'>+	} else {</div><div class='add'>+		skb2 = skb_realloc_headroom(skb, iova_mask);</div><div class='add'>+		if (!skb2) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+</div><div class='add'>+		offset = (unsigned long)skb2-&gt;data &amp; iova_mask;</div><div class='add'>+		if (offset)</div><div class='add'>+			ath12k_dp_tx_move_payload(skb2, offset, true);</div><div class='add'>+		*pskb = skb2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_tx(struct ath12k *ar, struct ath12k_link_vif *arvif,</div><div class='add'>+		 struct sk_buff *skb, bool gsn_valid, int mcbc_gsn,</div><div class='add'>+		 bool is_mcast)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct hal_tx_info ti = {};</div><div class='add'>+	struct ath12k_tx_desc_info *tx_desc;</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	struct ath12k_skb_cb *skb_cb = ATH12K_SKB_CB(skb);</div><div class='add'>+	struct hal_tcl_data_cmd *hal_tcl_desc;</div><div class='add'>+	struct hal_tx_msdu_ext_desc *msg;</div><div class='add'>+	struct sk_buff *skb_ext_desc = NULL;</div><div class='add'>+	struct hal_srng *tcl_ring;</div><div class='add'>+	struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	struct dp_tx_ring *tx_ring;</div><div class='add'>+	u8 pool_id;</div><div class='add'>+	u8 hal_ring_id;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 ring_selector, ring_map = 0;</div><div class='add'>+	bool tcl_ring_retry;</div><div class='add'>+	bool msdu_ext_desc = false;</div><div class='add'>+	bool add_htt_metadata = false;</div><div class='add'>+	u32 iova_mask = ab-&gt;hw_params-&gt;iova_mask;</div><div class='add'>+	bool is_diff_encap = false;</div><div class='add'>+	bool is_null_frame = false;</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_FLAG_CRASH_FLUSH, &amp;ar-&gt;ab-&gt;dev_flags))</div><div class='add'>+		return -ESHUTDOWN;</div><div class='add'>+</div><div class='add'>+	if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_HW_80211_ENCAP) &amp;&amp;</div><div class='add'>+	    !ieee80211_is_data(hdr-&gt;frame_control))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	pool_id = skb_get_queue_mapping(skb) &amp; (ATH12K_HW_MAX_QUEUES - 1);</div><div class='add'>+</div><div class='add'>+	/* Let the default ring selection be based on current processor</div><div class='add'>+	 * number, where one of the 3 tcl rings are selected based on</div><div class='add'>+	 * the smp_processor_id(). In case that ring</div><div class='add'>+	 * is full/busy, we resort to other available rings.</div><div class='add'>+	 * If all rings are full, we drop the packet.</div><div class='add'>+	 * TODO: Add throttling logic when all rings are full</div><div class='add'>+	 */</div><div class='add'>+	ring_selector = ab-&gt;hw_params-&gt;hw_ops-&gt;get_ring_selector(skb);</div><div class='add'>+</div><div class='add'>+tcl_ring_sel:</div><div class='add'>+	tcl_ring_retry = false;</div><div class='add'>+	ti.ring_id = ring_selector % ab-&gt;hw_params-&gt;max_tx_ring;</div><div class='add'>+</div><div class='add'>+	ring_map |= BIT(ti.ring_id);</div><div class='add'>+	ti.rbm_id = ab-&gt;hw_params-&gt;hal_ops-&gt;tcl_to_wbm_rbm_map[ti.ring_id].rbm_id;</div><div class='add'>+</div><div class='add'>+	tx_ring = &amp;dp-&gt;tx_ring[ti.ring_id];</div><div class='add'>+</div><div class='add'>+	tx_desc = ath12k_dp_tx_assign_buffer(dp, pool_id);</div><div class='add'>+	if (!tx_desc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ti.bank_id = arvif-&gt;bank_id;</div><div class='add'>+	ti.meta_data_flags = arvif-&gt;tcl_metadata;</div><div class='add'>+</div><div class='add'>+	if (ahvif-&gt;tx_encap_type == HAL_TCL_ENCAP_TYPE_RAW &amp;&amp;</div><div class='add'>+	    test_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED, &amp;ar-&gt;ab-&gt;dev_flags)) {</div><div class='add'>+		if (skb_cb-&gt;flags &amp; ATH12K_SKB_CIPHER_SET) {</div><div class='add'>+			ti.encrypt_type =</div><div class='add'>+				ath12k_dp_tx_get_encrypt_type(skb_cb-&gt;cipher);</div><div class='add'>+</div><div class='add'>+			if (ieee80211_has_protected(hdr-&gt;frame_control))</div><div class='add'>+				skb_put(skb, IEEE80211_CCMP_MIC_LEN);</div><div class='add'>+		} else {</div><div class='add'>+			ti.encrypt_type = HAL_ENCRYPT_TYPE_OPEN;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		msdu_ext_desc = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (gsn_valid) {</div><div class='add'>+		/* Reset and Initialize meta_data_flags with Global Sequence</div><div class='add'>+		 * Number (GSN) info.</div><div class='add'>+		 */</div><div class='add'>+		ti.meta_data_flags =</div><div class='add'>+			u32_encode_bits(HTT_TCL_META_DATA_TYPE_GLOBAL_SEQ_NUM,</div><div class='add'>+					HTT_TCL_META_DATA_TYPE) |</div><div class='add'>+			u32_encode_bits(mcbc_gsn, HTT_TCL_META_DATA_GLOBAL_SEQ_NUM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ti.encap_type = ath12k_dp_tx_get_encap_type(ab, skb);</div><div class='add'>+	ti.addr_search_flags = arvif-&gt;hal_addr_search_flags;</div><div class='add'>+	ti.search_type = arvif-&gt;search_type;</div><div class='add'>+	ti.type = HAL_TCL_DESC_TYPE_BUFFER;</div><div class='add'>+	ti.pkt_offset = 0;</div><div class='add'>+	ti.lmac_id = ar-&gt;lmac_id;</div><div class='add'>+</div><div class='add'>+	ti.vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+	if (gsn_valid)</div><div class='add'>+		ti.vdev_id += HTT_TX_MLO_MCAST_HOST_REINJECT_BASE_VDEV_ID;</div><div class='add'>+</div><div class='add'>+	ti.bss_ast_hash = arvif-&gt;ast_hash;</div><div class='add'>+	ti.bss_ast_idx = arvif-&gt;ast_idx;</div><div class='add'>+	ti.dscp_tid_tbl_idx = 0;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL &amp;&amp;</div><div class='add'>+	    ti.encap_type != HAL_TCL_ENCAP_TYPE_RAW) {</div><div class='add'>+		ti.flags0 |= u32_encode_bits(1, HAL_TCL_DATA_CMD_INFO2_IP4_CKSUM_EN) |</div><div class='add'>+			     u32_encode_bits(1, HAL_TCL_DATA_CMD_INFO2_UDP4_CKSUM_EN) |</div><div class='add'>+			     u32_encode_bits(1, HAL_TCL_DATA_CMD_INFO2_UDP6_CKSUM_EN) |</div><div class='add'>+			     u32_encode_bits(1, HAL_TCL_DATA_CMD_INFO2_TCP4_CKSUM_EN) |</div><div class='add'>+			     u32_encode_bits(1, HAL_TCL_DATA_CMD_INFO2_TCP6_CKSUM_EN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ti.flags1 |= u32_encode_bits(1, HAL_TCL_DATA_CMD_INFO3_TID_OVERWRITE);</div><div class='add'>+</div><div class='add'>+	ti.tid = ath12k_dp_tx_get_tid(skb);</div><div class='add'>+</div><div class='add'>+	switch (ti.encap_type) {</div><div class='add'>+	case HAL_TCL_ENCAP_TYPE_NATIVE_WIFI:</div><div class='add'>+		is_null_frame = ieee80211_is_nullfunc(hdr-&gt;frame_control);</div><div class='add'>+		if (ahvif-&gt;vif-&gt;offload_flags &amp; IEEE80211_OFFLOAD_ENCAP_ENABLED) {</div><div class='add'>+			if (skb-&gt;protocol == cpu_to_be16(ETH_P_PAE) || is_null_frame)</div><div class='add'>+				is_diff_encap = true;</div><div class='add'>+</div><div class='add'>+			/* Firmware expects msdu ext descriptor for nwifi/raw packets</div><div class='add'>+			 * received in ETH mode. Without this, observed tx fail for</div><div class='add'>+			 * Multicast packets in ETH mode.</div><div class='add'>+			 */</div><div class='add'>+			msdu_ext_desc = true;</div><div class='add'>+		} else {</div><div class='add'>+			ath12k_dp_tx_encap_nwifi(skb);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case HAL_TCL_ENCAP_TYPE_RAW:</div><div class='add'>+		if (!test_bit(ATH12K_FLAG_RAW_MODE, &amp;ab-&gt;dev_flags)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto fail_remove_tx_buf;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case HAL_TCL_ENCAP_TYPE_ETHERNET:</div><div class='add'>+		/* no need to encap */</div><div class='add'>+		break;</div><div class='add'>+	case HAL_TCL_ENCAP_TYPE_802_3:</div><div class='add'>+	default:</div><div class='add'>+		/* TODO: Take care of other encap modes as well */</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		atomic_inc(&amp;ab-&gt;device_stats.tx_err.misc_fail);</div><div class='add'>+		goto fail_remove_tx_buf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iova_mask &amp;&amp;</div><div class='add'>+	    (unsigned long)skb-&gt;data &amp; iova_mask) {</div><div class='add'>+		ret = ath12k_dp_tx_align_payload(ab, &amp;skb);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to align TX buffer %d\n", ret);</div><div class='add'>+			/* don't bail out, give original buffer</div><div class='add'>+			 * a chance even unaligned.</div><div class='add'>+			 */</div><div class='add'>+			goto map;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* hdr is pointing to a wrong place after alignment,</div><div class='add'>+		 * so refresh it for later use.</div><div class='add'>+		 */</div><div class='add'>+		hdr = (void *)skb-&gt;data;</div><div class='add'>+	}</div><div class='add'>+map:</div><div class='add'>+	ti.paddr = dma_map_single(ab-&gt;dev, skb-&gt;data, skb-&gt;len, DMA_TO_DEVICE);</div><div class='add'>+	if (dma_mapping_error(ab-&gt;dev, ti.paddr)) {</div><div class='add'>+		atomic_inc(&amp;ab-&gt;device_stats.tx_err.misc_fail);</div><div class='add'>+		ath12k_warn(ab, "failed to DMA map data Tx buffer\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto fail_remove_tx_buf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((!test_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED, &amp;ar-&gt;ab-&gt;dev_flags) &amp;&amp;</div><div class='add'>+	     !(skb_cb-&gt;flags &amp; ATH12K_SKB_HW_80211_ENCAP) &amp;&amp;</div><div class='add'>+	     !(skb_cb-&gt;flags &amp; ATH12K_SKB_CIPHER_SET) &amp;&amp;</div><div class='add'>+	     ieee80211_has_protected(hdr-&gt;frame_control)) ||</div><div class='add'>+	    is_diff_encap) {</div><div class='add'>+		/* Firmware is not expecting meta data for qos null</div><div class='add'>+		 * nwifi packet received in ETH encap mode.</div><div class='add'>+		 */</div><div class='add'>+		if (is_null_frame &amp;&amp; msdu_ext_desc)</div><div class='add'>+			goto skip_htt_meta;</div><div class='add'>+</div><div class='add'>+		/* Add metadata for sw encrypted vlan group traffic</div><div class='add'>+		 * and EAPOL nwifi packet received in ETH encap mode.</div><div class='add'>+		 */</div><div class='add'>+		add_htt_metadata = true;</div><div class='add'>+		msdu_ext_desc = true;</div><div class='add'>+		ti.meta_data_flags |= HTT_TCL_META_DATA_VALID_HTT;</div><div class='add'>+skip_htt_meta:</div><div class='add'>+		ti.flags0 |= u32_encode_bits(1, HAL_TCL_DATA_CMD_INFO2_TO_FW);</div><div class='add'>+		ti.encap_type = HAL_TCL_ENCAP_TYPE_RAW;</div><div class='add'>+		ti.encrypt_type = HAL_ENCRYPT_TYPE_OPEN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tx_desc-&gt;skb = skb;</div><div class='add'>+	tx_desc-&gt;mac_id = ar-&gt;pdev_idx;</div><div class='add'>+	ti.desc_id = tx_desc-&gt;desc_id;</div><div class='add'>+	ti.data_len = skb-&gt;len;</div><div class='add'>+	skb_cb-&gt;paddr = ti.paddr;</div><div class='add'>+	skb_cb-&gt;vif = ahvif-&gt;vif;</div><div class='add'>+	skb_cb-&gt;ar = ar;</div><div class='add'>+</div><div class='add'>+	if (msdu_ext_desc) {</div><div class='add'>+		skb_ext_desc = dev_alloc_skb(sizeof(struct hal_tx_msdu_ext_desc));</div><div class='add'>+		if (!skb_ext_desc) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto fail_unmap_dma;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb_put(skb_ext_desc, sizeof(struct hal_tx_msdu_ext_desc));</div><div class='add'>+		memset(skb_ext_desc-&gt;data, 0, skb_ext_desc-&gt;len);</div><div class='add'>+</div><div class='add'>+		msg = (struct hal_tx_msdu_ext_desc *)skb_ext_desc-&gt;data;</div><div class='add'>+		ath12k_hal_tx_cmd_ext_desc_setup(ab, msg, &amp;ti);</div><div class='add'>+</div><div class='add'>+		if (add_htt_metadata) {</div><div class='add'>+			ret = ath12k_dp_prepare_htt_metadata(skb_ext_desc);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				ath12k_dbg(ab, ATH12K_DBG_DP_TX,</div><div class='add'>+					   "Failed to add HTT meta data, dropping packet\n");</div><div class='add'>+				goto fail_free_ext_skb;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ti.paddr = dma_map_single(ab-&gt;dev, skb_ext_desc-&gt;data,</div><div class='add'>+					  skb_ext_desc-&gt;len, DMA_TO_DEVICE);</div><div class='add'>+		ret = dma_mapping_error(ab-&gt;dev, ti.paddr);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto fail_free_ext_skb;</div><div class='add'>+</div><div class='add'>+		ti.data_len = skb_ext_desc-&gt;len;</div><div class='add'>+		ti.type = HAL_TCL_DESC_TYPE_EXT_DESC;</div><div class='add'>+</div><div class='add'>+		skb_cb-&gt;paddr_ext_desc = ti.paddr;</div><div class='add'>+		tx_desc-&gt;skb_ext_desc = skb_ext_desc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hal_ring_id = tx_ring-&gt;tcl_data_ring.ring_id;</div><div class='add'>+	tcl_ring = &amp;ab-&gt;hal.srng_list[hal_ring_id];</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;tcl_ring-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_begin(ab, tcl_ring);</div><div class='add'>+</div><div class='add'>+	hal_tcl_desc = ath12k_hal_srng_src_get_next_entry(ab, tcl_ring);</div><div class='add'>+	if (!hal_tcl_desc) {</div><div class='add'>+		/* NOTE: It is highly unlikely we'll be running out of tcl_ring</div><div class='add'>+		 * desc because the desc is directly enqueued onto hw queue.</div><div class='add'>+		 */</div><div class='add'>+		ath12k_hal_srng_access_end(ab, tcl_ring);</div><div class='add'>+		ab-&gt;device_stats.tx_err.desc_na[ti.ring_id]++;</div><div class='add'>+		spin_unlock_bh(&amp;tcl_ring-&gt;lock);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+		/* Checking for available tcl descriptors in another ring in</div><div class='add'>+		 * case of failure due to full tcl ring now, is better than</div><div class='add'>+		 * checking this ring earlier for each pkt tx.</div><div class='add'>+		 * Restart ring selection if some rings are not checked yet.</div><div class='add'>+		 */</div><div class='add'>+		if (ring_map != (BIT(ab-&gt;hw_params-&gt;max_tx_ring) - 1) &amp;&amp;</div><div class='add'>+		    ab-&gt;hw_params-&gt;tcl_ring_retry) {</div><div class='add'>+			tcl_ring_retry = true;</div><div class='add'>+			ring_selector++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		goto fail_unmap_dma_ext;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;arvif-&gt;link_stats_lock);</div><div class='add'>+	arvif-&gt;link_stats.tx_encap_type[ti.encap_type]++;</div><div class='add'>+	arvif-&gt;link_stats.tx_encrypt_type[ti.encrypt_type]++;</div><div class='add'>+	arvif-&gt;link_stats.tx_desc_type[ti.type]++;</div><div class='add'>+</div><div class='add'>+	if (is_mcast)</div><div class='add'>+		arvif-&gt;link_stats.tx_bcast_mcast++;</div><div class='add'>+	else</div><div class='add'>+		arvif-&gt;link_stats.tx_enqueued++;</div><div class='add'>+	spin_unlock_bh(&amp;arvif-&gt;link_stats_lock);</div><div class='add'>+</div><div class='add'>+	ab-&gt;device_stats.tx_enqueued[ti.ring_id]++;</div><div class='add'>+</div><div class='add'>+	ath12k_hal_tx_cmd_desc_setup(ab, hal_tcl_desc, &amp;ti);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_end(ab, tcl_ring);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;tcl_ring-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg_dump(ab, ATH12K_DBG_DP_TX, NULL, "dp tx msdu: ",</div><div class='add'>+			skb-&gt;data, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;ar-&gt;dp.num_tx_pending);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail_unmap_dma_ext:</div><div class='add'>+	if (skb_cb-&gt;paddr_ext_desc)</div><div class='add'>+		dma_unmap_single(ab-&gt;dev, skb_cb-&gt;paddr_ext_desc,</div><div class='add'>+				 skb_ext_desc-&gt;len,</div><div class='add'>+				 DMA_TO_DEVICE);</div><div class='add'>+fail_free_ext_skb:</div><div class='add'>+	kfree_skb(skb_ext_desc);</div><div class='add'>+</div><div class='add'>+fail_unmap_dma:</div><div class='add'>+	dma_unmap_single(ab-&gt;dev, ti.paddr, ti.data_len, DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+fail_remove_tx_buf:</div><div class='add'>+	ath12k_dp_tx_release_txbuf(dp, tx_desc, pool_id);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;arvif-&gt;link_stats_lock);</div><div class='add'>+	arvif-&gt;link_stats.tx_dropped++;</div><div class='add'>+	spin_unlock_bh(&amp;arvif-&gt;link_stats_lock);</div><div class='add'>+</div><div class='add'>+	if (tcl_ring_retry)</div><div class='add'>+		goto tcl_ring_sel;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_tx_free_txbuf(struct ath12k_base *ab,</div><div class='add'>+				    struct dp_tx_ring *tx_ring,</div><div class='add'>+				    struct ath12k_tx_desc_params *desc_params)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct sk_buff *msdu = desc_params-&gt;skb;</div><div class='add'>+	struct ath12k_skb_cb *skb_cb;</div><div class='add'>+	u8 pdev_id = ath12k_hw_mac_id_to_pdev_id(ab-&gt;hw_params, desc_params-&gt;mac_id);</div><div class='add'>+</div><div class='add'>+	skb_cb = ATH12K_SKB_CB(msdu);</div><div class='add'>+	ar = ab-&gt;pdevs[pdev_id].ar;</div><div class='add'>+</div><div class='add'>+	dma_unmap_single(ab-&gt;dev, skb_cb-&gt;paddr, msdu-&gt;len, DMA_TO_DEVICE);</div><div class='add'>+	if (skb_cb-&gt;paddr_ext_desc) {</div><div class='add'>+		dma_unmap_single(ab-&gt;dev, skb_cb-&gt;paddr_ext_desc,</div><div class='add'>+				 desc_params-&gt;skb_ext_desc-&gt;len, DMA_TO_DEVICE);</div><div class='add'>+		dev_kfree_skb_any(desc_params-&gt;skb_ext_desc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ieee80211_free_txskb(ar-&gt;ah-&gt;hw, msdu);</div><div class='add'>+</div><div class='add'>+	if (atomic_dec_and_test(&amp;ar-&gt;dp.num_tx_pending))</div><div class='add'>+		wake_up(&amp;ar-&gt;dp.tx_empty_waitq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_tx_htt_tx_complete_buf(struct ath12k_base *ab,</div><div class='add'>+				 struct ath12k_tx_desc_params *desc_params,</div><div class='add'>+				 struct dp_tx_ring *tx_ring,</div><div class='add'>+				 struct ath12k_dp_htt_wbm_tx_status *ts,</div><div class='add'>+				 u16 peer_id)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_tx_info *info;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k_skb_cb *skb_cb;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct ath12k_vif *ahvif;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct sk_buff *msdu = desc_params-&gt;skb;</div><div class='add'>+	s32 noise_floor;</div><div class='add'>+	struct ieee80211_tx_status status = {};</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+</div><div class='add'>+	skb_cb = ATH12K_SKB_CB(msdu);</div><div class='add'>+	info = IEEE80211_SKB_CB(msdu);</div><div class='add'>+</div><div class='add'>+	ar = skb_cb-&gt;ar;</div><div class='add'>+	ab-&gt;device_stats.tx_completed[tx_ring-&gt;tcl_data_ring_id]++;</div><div class='add'>+</div><div class='add'>+	if (atomic_dec_and_test(&amp;ar-&gt;dp.num_tx_pending))</div><div class='add'>+		wake_up(&amp;ar-&gt;dp.tx_empty_waitq);</div><div class='add'>+</div><div class='add'>+	dma_unmap_single(ab-&gt;dev, skb_cb-&gt;paddr, msdu-&gt;len, DMA_TO_DEVICE);</div><div class='add'>+	if (skb_cb-&gt;paddr_ext_desc) {</div><div class='add'>+		dma_unmap_single(ab-&gt;dev, skb_cb-&gt;paddr_ext_desc,</div><div class='add'>+				 desc_params-&gt;skb_ext_desc-&gt;len, DMA_TO_DEVICE);</div><div class='add'>+		dev_kfree_skb_any(desc_params-&gt;skb_ext_desc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vif = skb_cb-&gt;vif;</div><div class='add'>+	if (vif) {</div><div class='add'>+		ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		arvif = rcu_dereference(ahvif-&gt;link[skb_cb-&gt;link_id]);</div><div class='add'>+		if (arvif) {</div><div class='add'>+			spin_lock_bh(&amp;arvif-&gt;link_stats_lock);</div><div class='add'>+			arvif-&gt;link_stats.tx_completed++;</div><div class='add'>+			spin_unlock_bh(&amp;arvif-&gt;link_stats_lock);</div><div class='add'>+		}</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;info-&gt;status, 0, sizeof(info-&gt;status));</div><div class='add'>+</div><div class='add'>+	if (ts-&gt;acked) {</div><div class='add'>+		if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)) {</div><div class='add'>+			info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='add'>+			info-&gt;status.ack_signal = ts-&gt;ack_rssi;</div><div class='add'>+</div><div class='add'>+			if (!test_bit(WMI_TLV_SERVICE_HW_DB2DBM_CONVERSION_SUPPORT,</div><div class='add'>+				      ab-&gt;wmi_ab.svc_map)) {</div><div class='add'>+				spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+				noise_floor = ath12k_pdev_get_noise_floor(ar);</div><div class='add'>+				spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+				info-&gt;status.ack_signal += noise_floor;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			info-&gt;status.flags = IEEE80211_TX_STATUS_ACK_SIGNAL_VALID;</div><div class='add'>+		} else {</div><div class='add'>+			info-&gt;flags |= IEEE80211_TX_STAT_NOACK_TRANSMITTED;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	peer = ath12k_peer_find_by_id(ab, peer_id);</div><div class='add'>+	if (!peer || !peer-&gt;sta) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_DATA,</div><div class='add'>+			   "dp_tx: failed to find the peer with peer_id %d\n", peer_id);</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		ieee80211_free_txskb(ath12k_ar_to_hw(ar), msdu);</div><div class='add'>+		goto exit;</div><div class='add'>+	} else {</div><div class='add'>+		status.sta = peer-&gt;sta;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	status.info = info;</div><div class='add'>+	status.skb = msdu;</div><div class='add'>+	ieee80211_tx_status_ext(ath12k_ar_to_hw(ar), &amp;status);</div><div class='add'>+exit:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_dp_tx_process_htt_tx_complete(struct ath12k_base *ab, void *desc,</div><div class='add'>+				     struct dp_tx_ring *tx_ring,</div><div class='add'>+				     struct ath12k_tx_desc_params *desc_params)</div><div class='add'>+{</div><div class='add'>+	struct htt_tx_wbm_completion *status_desc;</div><div class='add'>+	struct ath12k_dp_htt_wbm_tx_status ts = {};</div><div class='add'>+	enum hal_wbm_htt_tx_comp_status wbm_status;</div><div class='add'>+	u16 peer_id;</div><div class='add'>+</div><div class='add'>+	status_desc = desc;</div><div class='add'>+</div><div class='add'>+	wbm_status = le32_get_bits(status_desc-&gt;info0,</div><div class='add'>+				   HTT_TX_WBM_COMP_INFO0_STATUS);</div><div class='add'>+	ab-&gt;device_stats.fw_tx_status[wbm_status]++;</div><div class='add'>+</div><div class='add'>+	switch (wbm_status) {</div><div class='add'>+	case HAL_WBM_REL_HTT_TX_COMP_STATUS_OK:</div><div class='add'>+		ts.acked = (wbm_status == HAL_WBM_REL_HTT_TX_COMP_STATUS_OK);</div><div class='add'>+		ts.ack_rssi = le32_get_bits(status_desc-&gt;info2,</div><div class='add'>+					    HTT_TX_WBM_COMP_INFO2_ACK_RSSI);</div><div class='add'>+</div><div class='add'>+		peer_id = le32_get_bits(((struct hal_wbm_completion_ring_tx *)desc)-&gt;</div><div class='add'>+				info3, HAL_WBM_COMPL_TX_INFO3_PEER_ID);</div><div class='add'>+</div><div class='add'>+		ath12k_dp_tx_htt_tx_complete_buf(ab, desc_params, tx_ring, &amp;ts, peer_id);</div><div class='add'>+		break;</div><div class='add'>+	case HAL_WBM_REL_HTT_TX_COMP_STATUS_DROP:</div><div class='add'>+	case HAL_WBM_REL_HTT_TX_COMP_STATUS_TTL:</div><div class='add'>+	case HAL_WBM_REL_HTT_TX_COMP_STATUS_REINJ:</div><div class='add'>+	case HAL_WBM_REL_HTT_TX_COMP_STATUS_INSPECT:</div><div class='add'>+	case HAL_WBM_REL_HTT_TX_COMP_STATUS_VDEVID_MISMATCH:</div><div class='add'>+		ath12k_dp_tx_free_txbuf(ab, tx_ring, desc_params);</div><div class='add'>+		break;</div><div class='add'>+	case HAL_WBM_REL_HTT_TX_COMP_STATUS_MEC_NOTIFY:</div><div class='add'>+		/* This event is to be handled only when the driver decides to</div><div class='add'>+		 * use WDS offload functionality.</div><div class='add'>+		 */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_warn(ab, "Unknown htt wbm tx status %d\n", wbm_status);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_tx_update_txcompl(struct ath12k *ar, struct hal_tx_status *ts)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct ath12k_sta *ahsta;</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	struct rate_info txrate = {};</div><div class='add'>+	u16 rate, ru_tones;</div><div class='add'>+	u8 rate_idx = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	peer = ath12k_peer_find_by_id(ab, ts-&gt;peer_id);</div><div class='add'>+	if (!peer || !peer-&gt;sta) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_DP_TX,</div><div class='add'>+			   "failed to find the peer by id %u\n", ts-&gt;peer_id);</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	sta = peer-&gt;sta;</div><div class='add'>+	ahsta = ath12k_sta_to_ahsta(sta);</div><div class='add'>+	arsta = &amp;ahsta-&gt;deflink;</div><div class='add'>+</div><div class='add'>+	/* This is to prefer choose the real NSS value arsta-&gt;last_txrate.nss,</div><div class='add'>+	 * if it is invalid, then choose the NSS value while assoc.</div><div class='add'>+	 */</div><div class='add'>+	if (arsta-&gt;last_txrate.nss)</div><div class='add'>+		txrate.nss = arsta-&gt;last_txrate.nss;</div><div class='add'>+	else</div><div class='add'>+		txrate.nss = arsta-&gt;peer_nss;</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	switch (ts-&gt;pkt_type) {</div><div class='add'>+	case HAL_TX_RATE_STATS_PKT_TYPE_11A:</div><div class='add'>+	case HAL_TX_RATE_STATS_PKT_TYPE_11B:</div><div class='add'>+		ret = ath12k_mac_hw_ratecode_to_legacy_rate(ts-&gt;mcs,</div><div class='add'>+							    ts-&gt;pkt_type,</div><div class='add'>+							    &amp;rate_idx,</div><div class='add'>+							    &amp;rate);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			ath12k_warn(ab, "Invalid tx legacy rate %d\n", ret);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		txrate.legacy = rate;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_TX_RATE_STATS_PKT_TYPE_11N:</div><div class='add'>+		if (ts-&gt;mcs &gt; ATH12K_HT_MCS_MAX) {</div><div class='add'>+			ath12k_warn(ab, "Invalid HT mcs index %d\n", ts-&gt;mcs);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (txrate.nss != 0)</div><div class='add'>+			txrate.mcs = ts-&gt;mcs + 8 * (txrate.nss - 1);</div><div class='add'>+</div><div class='add'>+		txrate.flags = RATE_INFO_FLAGS_MCS;</div><div class='add'>+</div><div class='add'>+		if (ts-&gt;sgi)</div><div class='add'>+			txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_TX_RATE_STATS_PKT_TYPE_11AC:</div><div class='add'>+		if (ts-&gt;mcs &gt; ATH12K_VHT_MCS_MAX) {</div><div class='add'>+			ath12k_warn(ab, "Invalid VHT mcs index %d\n", ts-&gt;mcs);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		txrate.mcs = ts-&gt;mcs;</div><div class='add'>+		txrate.flags = RATE_INFO_FLAGS_VHT_MCS;</div><div class='add'>+</div><div class='add'>+		if (ts-&gt;sgi)</div><div class='add'>+			txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_TX_RATE_STATS_PKT_TYPE_11AX:</div><div class='add'>+		if (ts-&gt;mcs &gt; ATH12K_HE_MCS_MAX) {</div><div class='add'>+			ath12k_warn(ab, "Invalid HE mcs index %d\n", ts-&gt;mcs);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		txrate.mcs = ts-&gt;mcs;</div><div class='add'>+		txrate.flags = RATE_INFO_FLAGS_HE_MCS;</div><div class='add'>+		txrate.he_gi = ath12k_he_gi_to_nl80211_he_gi(ts-&gt;sgi);</div><div class='add'>+		break;</div><div class='add'>+	case HAL_TX_RATE_STATS_PKT_TYPE_11BE:</div><div class='add'>+		if (ts-&gt;mcs &gt; ATH12K_EHT_MCS_MAX) {</div><div class='add'>+			ath12k_warn(ab, "Invalid EHT mcs index %d\n", ts-&gt;mcs);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		txrate.mcs = ts-&gt;mcs;</div><div class='add'>+		txrate.flags = RATE_INFO_FLAGS_EHT_MCS;</div><div class='add'>+		txrate.eht_gi = ath12k_mac_eht_gi_to_nl80211_eht_gi(ts-&gt;sgi);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_warn(ab, "Invalid tx pkt type: %d\n", ts-&gt;pkt_type);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	txrate.bw = ath12k_mac_bw_to_mac80211_bw(ts-&gt;bw);</div><div class='add'>+</div><div class='add'>+	if (ts-&gt;ofdma &amp;&amp; ts-&gt;pkt_type == HAL_TX_RATE_STATS_PKT_TYPE_11AX) {</div><div class='add'>+		txrate.bw = RATE_INFO_BW_HE_RU;</div><div class='add'>+		ru_tones = ath12k_mac_he_convert_tones_to_ru_tones(ts-&gt;tones);</div><div class='add'>+		txrate.he_ru_alloc =</div><div class='add'>+			ath12k_he_ru_tones_to_nl80211_he_ru_alloc(ru_tones);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ts-&gt;ofdma &amp;&amp; ts-&gt;pkt_type == HAL_TX_RATE_STATS_PKT_TYPE_11BE) {</div><div class='add'>+		txrate.bw = RATE_INFO_BW_EHT_RU;</div><div class='add'>+		txrate.eht_ru_alloc =</div><div class='add'>+			ath12k_mac_eht_ru_tones_to_nl80211_eht_ru_alloc(ts-&gt;tones);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	arsta-&gt;txrate = txrate;</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_tx_complete_msdu(struct ath12k *ar,</div><div class='add'>+				       struct ath12k_tx_desc_params *desc_params,</div><div class='add'>+				       struct hal_tx_status *ts,</div><div class='add'>+				       int ring)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_hw *ah = ar-&gt;ah;</div><div class='add'>+	struct ieee80211_tx_info *info;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k_skb_cb *skb_cb;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct ath12k_vif *ahvif;</div><div class='add'>+	struct sk_buff *msdu = desc_params-&gt;skb;</div><div class='add'>+	s32 noise_floor;</div><div class='add'>+	struct ieee80211_tx_status status = {};</div><div class='add'>+	struct ieee80211_rate_status status_rate = {};</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	struct ath12k_sta *ahsta;</div><div class='add'>+	struct rate_info rate;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(ts-&gt;buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM)) {</div><div class='add'>+		/* Must not happen */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_cb = ATH12K_SKB_CB(msdu);</div><div class='add'>+	ab-&gt;device_stats.tx_completed[ring]++;</div><div class='add'>+</div><div class='add'>+	dma_unmap_single(ab-&gt;dev, skb_cb-&gt;paddr, msdu-&gt;len, DMA_TO_DEVICE);</div><div class='add'>+	if (skb_cb-&gt;paddr_ext_desc) {</div><div class='add'>+		dma_unmap_single(ab-&gt;dev, skb_cb-&gt;paddr_ext_desc,</div><div class='add'>+				 desc_params-&gt;skb_ext_desc-&gt;len, DMA_TO_DEVICE);</div><div class='add'>+		dev_kfree_skb_any(desc_params-&gt;skb_ext_desc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	if (!rcu_dereference(ab-&gt;pdevs_active[ar-&gt;pdev_idx])) {</div><div class='add'>+		ieee80211_free_txskb(ah-&gt;hw, msdu);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!skb_cb-&gt;vif) {</div><div class='add'>+		ieee80211_free_txskb(ah-&gt;hw, msdu);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vif = skb_cb-&gt;vif;</div><div class='add'>+	if (vif) {</div><div class='add'>+		ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+		arvif = rcu_dereference(ahvif-&gt;link[skb_cb-&gt;link_id]);</div><div class='add'>+		if (arvif) {</div><div class='add'>+			spin_lock_bh(&amp;arvif-&gt;link_stats_lock);</div><div class='add'>+			arvif-&gt;link_stats.tx_completed++;</div><div class='add'>+			spin_unlock_bh(&amp;arvif-&gt;link_stats_lock);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info = IEEE80211_SKB_CB(msdu);</div><div class='add'>+	memset(&amp;info-&gt;status, 0, sizeof(info-&gt;status));</div><div class='add'>+</div><div class='add'>+	/* skip tx rate update from ieee80211_status*/</div><div class='add'>+	info-&gt;status.rates[0].idx = -1;</div><div class='add'>+</div><div class='add'>+	switch (ts-&gt;status) {</div><div class='add'>+	case HAL_WBM_TQM_REL_REASON_FRAME_ACKED:</div><div class='add'>+		if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)) {</div><div class='add'>+			info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='add'>+			info-&gt;status.ack_signal = ts-&gt;ack_rssi;</div><div class='add'>+</div><div class='add'>+			if (!test_bit(WMI_TLV_SERVICE_HW_DB2DBM_CONVERSION_SUPPORT,</div><div class='add'>+				      ab-&gt;wmi_ab.svc_map)) {</div><div class='add'>+				spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+				noise_floor = ath12k_pdev_get_noise_floor(ar);</div><div class='add'>+				spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+				info-&gt;status.ack_signal += noise_floor;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			info-&gt;status.flags = IEEE80211_TX_STATUS_ACK_SIGNAL_VALID;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case HAL_WBM_TQM_REL_REASON_CMD_REMOVE_TX:</div><div class='add'>+		if (info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK) {</div><div class='add'>+			info-&gt;flags |= IEEE80211_TX_STAT_NOACK_TRANSMITTED;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='add'>+	case HAL_WBM_TQM_REL_REASON_CMD_REMOVE_MPDU:</div><div class='add'>+	case HAL_WBM_TQM_REL_REASON_DROP_THRESHOLD:</div><div class='add'>+	case HAL_WBM_TQM_REL_REASON_CMD_REMOVE_AGED_FRAMES:</div><div class='add'>+		/* The failure status is due to internal firmware tx failure</div><div class='add'>+		 * hence drop the frame; do not update the status of frame to</div><div class='add'>+		 * the upper layer</div><div class='add'>+		 */</div><div class='add'>+		ieee80211_free_txskb(ah-&gt;hw, msdu);</div><div class='add'>+		goto exit;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_DP_TX, "tx frame is not acked status %d\n",</div><div class='add'>+			   ts-&gt;status);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* NOTE: Tx rate status reporting. Tx completion status does not have</div><div class='add'>+	 * necessary information (for example nss) to build the tx rate.</div><div class='add'>+	 * Might end up reporting it out-of-band from HTT stats.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	ath12k_dp_tx_update_txcompl(ar, ts);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	peer = ath12k_peer_find_by_id(ab, ts-&gt;peer_id);</div><div class='add'>+	if (!peer || !peer-&gt;sta) {</div><div class='add'>+		ath12k_err(ab,</div><div class='add'>+			   "dp_tx: failed to find the peer with peer_id %d\n",</div><div class='add'>+			   ts-&gt;peer_id);</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		ieee80211_free_txskb(ath12k_ar_to_hw(ar), msdu);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	ahsta = ath12k_sta_to_ahsta(peer-&gt;sta);</div><div class='add'>+	arsta = &amp;ahsta-&gt;deflink;</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	status.sta = peer-&gt;sta;</div><div class='add'>+	status.info = info;</div><div class='add'>+	status.skb = msdu;</div><div class='add'>+	rate = arsta-&gt;last_txrate;</div><div class='add'>+</div><div class='add'>+	status_rate.rate_idx = rate;</div><div class='add'>+	status_rate.try_count = 1;</div><div class='add'>+</div><div class='add'>+	status.rates = &amp;status_rate;</div><div class='add'>+	status.n_rates = 1;</div><div class='add'>+	ieee80211_tx_status_ext(ath12k_ar_to_hw(ar), &amp;status);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_dp_tx_status_parse(struct ath12k_base *ab,</div><div class='add'>+				      struct hal_wbm_completion_ring_tx *desc,</div><div class='add'>+				      struct hal_tx_status *ts)</div><div class='add'>+{</div><div class='add'>+	u32 info0 = le32_to_cpu(desc-&gt;rate_stats.info0);</div><div class='add'>+</div><div class='add'>+	ts-&gt;buf_rel_source =</div><div class='add'>+		le32_get_bits(desc-&gt;info0, HAL_WBM_COMPL_TX_INFO0_REL_SRC_MODULE);</div><div class='add'>+	if (ts-&gt;buf_rel_source != HAL_WBM_REL_SRC_MODULE_FW &amp;&amp;</div><div class='add'>+	    ts-&gt;buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (ts-&gt;buf_rel_source == HAL_WBM_REL_SRC_MODULE_FW)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ts-&gt;status = le32_get_bits(desc-&gt;info0,</div><div class='add'>+				   HAL_WBM_COMPL_TX_INFO0_TQM_RELEASE_REASON);</div><div class='add'>+</div><div class='add'>+	ts-&gt;ppdu_id = le32_get_bits(desc-&gt;info1,</div><div class='add'>+				    HAL_WBM_COMPL_TX_INFO1_TQM_STATUS_NUMBER);</div><div class='add'>+</div><div class='add'>+	ts-&gt;peer_id = le32_get_bits(desc-&gt;info3, HAL_WBM_COMPL_TX_INFO3_PEER_ID);</div><div class='add'>+</div><div class='add'>+	ts-&gt;ack_rssi = le32_get_bits(desc-&gt;info2,</div><div class='add'>+				     HAL_WBM_COMPL_TX_INFO2_ACK_FRAME_RSSI);</div><div class='add'>+</div><div class='add'>+	if (info0 &amp; HAL_TX_RATE_STATS_INFO0_VALID) {</div><div class='add'>+		ts-&gt;pkt_type = u32_get_bits(info0, HAL_TX_RATE_STATS_INFO0_PKT_TYPE);</div><div class='add'>+		ts-&gt;mcs = u32_get_bits(info0, HAL_TX_RATE_STATS_INFO0_MCS);</div><div class='add'>+		ts-&gt;sgi = u32_get_bits(info0, HAL_TX_RATE_STATS_INFO0_SGI);</div><div class='add'>+		ts-&gt;bw = u32_get_bits(info0, HAL_TX_RATE_STATS_INFO0_BW);</div><div class='add'>+		ts-&gt;tones = u32_get_bits(info0, HAL_TX_RATE_STATS_INFO0_TONES_IN_RU);</div><div class='add'>+		ts-&gt;ofdma = u32_get_bits(info0, HAL_TX_RATE_STATS_INFO0_OFDMA_TX);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_dp_tx_completion_handler(struct ath12k_base *ab, int ring_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	int hal_ring_id = dp-&gt;tx_ring[ring_id].tcl_comp_ring.ring_id;</div><div class='add'>+	struct hal_srng *status_ring = &amp;ab-&gt;hal.srng_list[hal_ring_id];</div><div class='add'>+	struct ath12k_tx_desc_info *tx_desc = NULL;</div><div class='add'>+	struct hal_tx_status ts = {};</div><div class='add'>+	struct ath12k_tx_desc_params desc_params;</div><div class='add'>+	struct dp_tx_ring *tx_ring = &amp;dp-&gt;tx_ring[ring_id];</div><div class='add'>+	struct hal_wbm_release_ring *desc;</div><div class='add'>+	u8 pdev_id;</div><div class='add'>+	u64 desc_va;</div><div class='add'>+	enum hal_wbm_rel_src_module buf_rel_source;</div><div class='add'>+	enum hal_wbm_tqm_rel_reason rel_status;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;status_ring-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_begin(ab, status_ring);</div><div class='add'>+</div><div class='add'>+	while (ATH12K_TX_COMPL_NEXT(ab, tx_ring-&gt;tx_status_head) !=</div><div class='add'>+	       tx_ring-&gt;tx_status_tail) {</div><div class='add'>+		desc = ath12k_hal_srng_dst_get_next_entry(ab, status_ring);</div><div class='add'>+		if (!desc)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;tx_ring-&gt;tx_status[tx_ring-&gt;tx_status_head],</div><div class='add'>+		       desc, sizeof(*desc));</div><div class='add'>+		tx_ring-&gt;tx_status_head =</div><div class='add'>+			ATH12K_TX_COMPL_NEXT(ab, tx_ring-&gt;tx_status_head);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ath12k_hal_srng_dst_peek(ab, status_ring) &amp;&amp;</div><div class='add'>+	    (ATH12K_TX_COMPL_NEXT(ab, tx_ring-&gt;tx_status_head) ==</div><div class='add'>+	     tx_ring-&gt;tx_status_tail)) {</div><div class='add'>+		/* TODO: Process pending tx_status messages when kfifo_is_full() */</div><div class='add'>+		ath12k_warn(ab, "Unable to process some of the tx_status ring desc because status_fifo is full\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_end(ab, status_ring);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;status_ring-&gt;lock);</div><div class='add'>+</div><div class='add'>+	while (ATH12K_TX_COMPL_NEXT(ab, tx_ring-&gt;tx_status_tail) !=</div><div class='add'>+	       tx_ring-&gt;tx_status_head) {</div><div class='add'>+		struct hal_wbm_completion_ring_tx *tx_status;</div><div class='add'>+		u32 desc_id;</div><div class='add'>+</div><div class='add'>+		tx_ring-&gt;tx_status_tail =</div><div class='add'>+			ATH12K_TX_COMPL_NEXT(ab, tx_ring-&gt;tx_status_tail);</div><div class='add'>+		tx_status = &amp;tx_ring-&gt;tx_status[tx_ring-&gt;tx_status_tail];</div><div class='add'>+		ath12k_dp_tx_status_parse(ab, tx_status, &amp;ts);</div><div class='add'>+</div><div class='add'>+		if (le32_get_bits(tx_status-&gt;info0, HAL_WBM_COMPL_TX_INFO0_CC_DONE)) {</div><div class='add'>+			/* HW done cookie conversion */</div><div class='add'>+			desc_va = ((u64)le32_to_cpu(tx_status-&gt;buf_va_hi) &lt;&lt; 32 |</div><div class='add'>+				   le32_to_cpu(tx_status-&gt;buf_va_lo));</div><div class='add'>+			tx_desc = (struct ath12k_tx_desc_info *)((unsigned long)desc_va);</div><div class='add'>+		} else {</div><div class='add'>+			/* SW does cookie conversion to VA */</div><div class='add'>+			desc_id = le32_get_bits(tx_status-&gt;buf_va_hi,</div><div class='add'>+						BUFFER_ADDR_INFO1_SW_COOKIE);</div><div class='add'>+</div><div class='add'>+			tx_desc = ath12k_dp_get_tx_desc(ab, desc_id);</div><div class='add'>+		}</div><div class='add'>+		if (!tx_desc) {</div><div class='add'>+			ath12k_warn(ab, "unable to retrieve tx_desc!");</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		desc_params.mac_id = tx_desc-&gt;mac_id;</div><div class='add'>+		desc_params.skb = tx_desc-&gt;skb;</div><div class='add'>+		desc_params.skb_ext_desc = tx_desc-&gt;skb_ext_desc;</div><div class='add'>+</div><div class='add'>+		/* Find the HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE value */</div><div class='add'>+		buf_rel_source = le32_get_bits(tx_status-&gt;info0,</div><div class='add'>+					       HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE);</div><div class='add'>+		ab-&gt;device_stats.tx_wbm_rel_source[buf_rel_source]++;</div><div class='add'>+</div><div class='add'>+		rel_status = le32_get_bits(tx_status-&gt;info0,</div><div class='add'>+					   HAL_WBM_COMPL_TX_INFO0_TQM_RELEASE_REASON);</div><div class='add'>+		ab-&gt;device_stats.tqm_rel_reason[rel_status]++;</div><div class='add'>+</div><div class='add'>+		/* Release descriptor as soon as extracting necessary info</div><div class='add'>+		 * to reduce contention</div><div class='add'>+		 */</div><div class='add'>+		ath12k_dp_tx_release_txbuf(dp, tx_desc, tx_desc-&gt;pool_id);</div><div class='add'>+		if (ts.buf_rel_source == HAL_WBM_REL_SRC_MODULE_FW) {</div><div class='add'>+			ath12k_dp_tx_process_htt_tx_complete(ab, (void *)tx_status,</div><div class='add'>+							     tx_ring, &amp;desc_params);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pdev_id = ath12k_hw_mac_id_to_pdev_id(ab-&gt;hw_params, desc_params.mac_id);</div><div class='add'>+		ar = ab-&gt;pdevs[pdev_id].ar;</div><div class='add'>+</div><div class='add'>+		if (atomic_dec_and_test(&amp;ar-&gt;dp.num_tx_pending))</div><div class='add'>+			wake_up(&amp;ar-&gt;dp.tx_empty_waitq);</div><div class='add'>+</div><div class='add'>+		ath12k_dp_tx_complete_msdu(ar, &amp;desc_params, &amp;ts,</div><div class='add'>+					   tx_ring-&gt;tcl_data_ring_id);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_dp_tx_get_ring_id_type(struct ath12k_base *ab,</div><div class='add'>+			      int mac_id, u32 ring_id,</div><div class='add'>+			      enum hal_ring_type ring_type,</div><div class='add'>+			      enum htt_srng_ring_type *htt_ring_type,</div><div class='add'>+			      enum htt_srng_ring_id *htt_ring_id)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (ring_type) {</div><div class='add'>+	case HAL_RXDMA_BUF:</div><div class='add'>+		/* for some targets, host fills rx buffer to fw and fw fills to</div><div class='add'>+		 * rxbuf ring for each rxdma</div><div class='add'>+		 */</div><div class='add'>+		if (!ab-&gt;hw_params-&gt;rx_mac_buf_ring) {</div><div class='add'>+			if (!(ring_id == HAL_SRNG_SW2RXDMA_BUF0 ||</div><div class='add'>+			      ring_id == HAL_SRNG_SW2RXDMA_BUF1)) {</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			*htt_ring_id = HTT_RXDMA_HOST_BUF_RING;</div><div class='add'>+			*htt_ring_type = HTT_SW_TO_HW_RING;</div><div class='add'>+		} else {</div><div class='add'>+			if (ring_id == HAL_SRNG_SW2RXDMA_BUF0) {</div><div class='add'>+				*htt_ring_id = HTT_HOST1_TO_FW_RXBUF_RING;</div><div class='add'>+				*htt_ring_type = HTT_SW_TO_SW_RING;</div><div class='add'>+			} else {</div><div class='add'>+				*htt_ring_id = HTT_RXDMA_HOST_BUF_RING;</div><div class='add'>+				*htt_ring_type = HTT_SW_TO_HW_RING;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case HAL_RXDMA_DST:</div><div class='add'>+		*htt_ring_id = HTT_RXDMA_NON_MONITOR_DEST_RING;</div><div class='add'>+		*htt_ring_type = HTT_HW_TO_SW_RING;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_RXDMA_MONITOR_BUF:</div><div class='add'>+		*htt_ring_id = HTT_RX_MON_HOST2MON_BUF_RING;</div><div class='add'>+		*htt_ring_type = HTT_SW_TO_HW_RING;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_RXDMA_MONITOR_STATUS:</div><div class='add'>+		*htt_ring_id = HTT_RXDMA_MONITOR_STATUS_RING;</div><div class='add'>+		*htt_ring_type = HTT_SW_TO_HW_RING;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_RXDMA_MONITOR_DST:</div><div class='add'>+		*htt_ring_id = HTT_RX_MON_MON2HOST_DEST_RING;</div><div class='add'>+		*htt_ring_type = HTT_HW_TO_SW_RING;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_RXDMA_MONITOR_DESC:</div><div class='add'>+		*htt_ring_id = HTT_RXDMA_MONITOR_DESC_RING;</div><div class='add'>+		*htt_ring_type = HTT_SW_TO_HW_RING;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_warn(ab, "Unsupported ring type in DP :%d\n", ring_type);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_tx_htt_srng_setup(struct ath12k_base *ab, u32 ring_id,</div><div class='add'>+				int mac_id, enum hal_ring_type ring_type)</div><div class='add'>+{</div><div class='add'>+	struct htt_srng_setup_cmd *cmd;</div><div class='add'>+	struct hal_srng *srng = &amp;ab-&gt;hal.srng_list[ring_id];</div><div class='add'>+	struct hal_srng_params params;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u32 ring_entry_sz;</div><div class='add'>+	int len = sizeof(*cmd);</div><div class='add'>+	dma_addr_t hp_addr, tp_addr;</div><div class='add'>+	enum htt_srng_ring_type htt_ring_type;</div><div class='add'>+	enum htt_srng_ring_id htt_ring_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_htc_alloc_skb(ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memset(&amp;params, 0, sizeof(params));</div><div class='add'>+	ath12k_hal_srng_get_params(ab, srng, &amp;params);</div><div class='add'>+</div><div class='add'>+	hp_addr = ath12k_hal_srng_get_hp_addr(ab, srng);</div><div class='add'>+	tp_addr = ath12k_hal_srng_get_tp_addr(ab, srng);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_tx_get_ring_id_type(ab, mac_id, ring_id,</div><div class='add'>+					    ring_type, &amp;htt_ring_type,</div><div class='add'>+					    &amp;htt_ring_id);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='add'>+	skb_put(skb, len);</div><div class='add'>+	cmd = (struct htt_srng_setup_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;info0 = le32_encode_bits(HTT_H2T_MSG_TYPE_SRING_SETUP,</div><div class='add'>+				      HTT_SRNG_SETUP_CMD_INFO0_MSG_TYPE);</div><div class='add'>+	if (htt_ring_type == HTT_SW_TO_HW_RING ||</div><div class='add'>+	    htt_ring_type == HTT_HW_TO_SW_RING)</div><div class='add'>+		cmd-&gt;info0 |= le32_encode_bits(DP_SW2HW_MACID(mac_id),</div><div class='add'>+					       HTT_SRNG_SETUP_CMD_INFO0_PDEV_ID);</div><div class='add'>+	else</div><div class='add'>+		cmd-&gt;info0 |= le32_encode_bits(mac_id,</div><div class='add'>+					       HTT_SRNG_SETUP_CMD_INFO0_PDEV_ID);</div><div class='add'>+	cmd-&gt;info0 |= le32_encode_bits(htt_ring_type,</div><div class='add'>+				       HTT_SRNG_SETUP_CMD_INFO0_RING_TYPE);</div><div class='add'>+	cmd-&gt;info0 |= le32_encode_bits(htt_ring_id,</div><div class='add'>+				       HTT_SRNG_SETUP_CMD_INFO0_RING_ID);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;ring_base_addr_lo = cpu_to_le32(params.ring_base_paddr &amp;</div><div class='add'>+					     HAL_ADDR_LSB_REG_MASK);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;ring_base_addr_hi = cpu_to_le32((u64)params.ring_base_paddr &gt;&gt;</div><div class='add'>+					     HAL_ADDR_MSB_REG_SHIFT);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_hal_srng_get_entrysize(ab, ring_type);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='add'>+	ring_entry_sz = ret;</div><div class='add'>+</div><div class='add'>+	ring_entry_sz &gt;&gt;= 2;</div><div class='add'>+	cmd-&gt;info1 = le32_encode_bits(ring_entry_sz,</div><div class='add'>+				      HTT_SRNG_SETUP_CMD_INFO1_RING_ENTRY_SIZE);</div><div class='add'>+	cmd-&gt;info1 |= le32_encode_bits(params.num_entries * ring_entry_sz,</div><div class='add'>+				       HTT_SRNG_SETUP_CMD_INFO1_RING_SIZE);</div><div class='add'>+	cmd-&gt;info1 |= le32_encode_bits(!!(params.flags &amp; HAL_SRNG_FLAGS_MSI_SWAP),</div><div class='add'>+				       HTT_SRNG_SETUP_CMD_INFO1_RING_FLAGS_MSI_SWAP);</div><div class='add'>+	cmd-&gt;info1 |= le32_encode_bits(!!(params.flags &amp; HAL_SRNG_FLAGS_DATA_TLV_SWAP),</div><div class='add'>+				       HTT_SRNG_SETUP_CMD_INFO1_RING_FLAGS_TLV_SWAP);</div><div class='add'>+	cmd-&gt;info1 |= le32_encode_bits(!!(params.flags &amp; HAL_SRNG_FLAGS_RING_PTR_SWAP),</div><div class='add'>+				       HTT_SRNG_SETUP_CMD_INFO1_RING_FLAGS_HOST_FW_SWAP);</div><div class='add'>+	if (htt_ring_type == HTT_SW_TO_HW_RING)</div><div class='add'>+		cmd-&gt;info1 |= cpu_to_le32(HTT_SRNG_SETUP_CMD_INFO1_RING_LOOP_CNT_DIS);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;ring_head_off32_remote_addr_lo = cpu_to_le32(lower_32_bits(hp_addr));</div><div class='add'>+	cmd-&gt;ring_head_off32_remote_addr_hi = cpu_to_le32(upper_32_bits(hp_addr));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;ring_tail_off32_remote_addr_lo = cpu_to_le32(lower_32_bits(tp_addr));</div><div class='add'>+	cmd-&gt;ring_tail_off32_remote_addr_hi = cpu_to_le32(upper_32_bits(tp_addr));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;ring_msi_addr_lo = cpu_to_le32(lower_32_bits(params.msi_addr));</div><div class='add'>+	cmd-&gt;ring_msi_addr_hi = cpu_to_le32(upper_32_bits(params.msi_addr));</div><div class='add'>+	cmd-&gt;msi_data = cpu_to_le32(params.msi_data);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;intr_info =</div><div class='add'>+		le32_encode_bits(params.intr_batch_cntr_thres_entries * ring_entry_sz,</div><div class='add'>+				 HTT_SRNG_SETUP_CMD_INTR_INFO_BATCH_COUNTER_THRESH);</div><div class='add'>+	cmd-&gt;intr_info |=</div><div class='add'>+		le32_encode_bits(params.intr_timer_thres_us &gt;&gt; 3,</div><div class='add'>+				 HTT_SRNG_SETUP_CMD_INTR_INFO_INTR_TIMER_THRESH);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;info2 = 0;</div><div class='add'>+	if (params.flags &amp; HAL_SRNG_FLAGS_LOW_THRESH_INTR_EN) {</div><div class='add'>+		cmd-&gt;info2 = le32_encode_bits(params.low_threshold,</div><div class='add'>+					      HTT_SRNG_SETUP_CMD_INFO2_INTR_LOW_THRESH);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_HAL,</div><div class='add'>+		   "%s msi_addr_lo:0x%x, msi_addr_hi:0x%x, msi_data:0x%x\n",</div><div class='add'>+		   __func__, cmd-&gt;ring_msi_addr_lo, cmd-&gt;ring_msi_addr_hi,</div><div class='add'>+		   cmd-&gt;msi_data);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_HAL,</div><div class='add'>+		   "ring_id:%d, ring_type:%d, intr_info:0x%x, flags:0x%x\n",</div><div class='add'>+		   ring_id, ring_type, cmd-&gt;intr_info, cmd-&gt;info2);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_htc_send(&amp;ab-&gt;htc, ab-&gt;dp.eid, skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free:</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define HTT_TARGET_VERSION_TIMEOUT_HZ (3 * HZ)</div><div class='add'>+</div><div class='add'>+int ath12k_dp_tx_htt_h2t_ver_req_msg(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct htt_ver_req_cmd *cmd;</div><div class='add'>+	int len = sizeof(*cmd);</div><div class='add'>+	u32 metadata_version;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;dp-&gt;htt_tgt_version_received);</div><div class='add'>+</div><div class='add'>+	skb = ath12k_htc_alloc_skb(ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	skb_put(skb, len);</div><div class='add'>+	cmd = (struct htt_ver_req_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;ver_reg_info = le32_encode_bits(HTT_H2T_MSG_TYPE_VERSION_REQ,</div><div class='add'>+					     HTT_OPTION_TAG);</div><div class='add'>+	metadata_version = ath12k_ftm_mode ? HTT_OPTION_TCL_METADATA_VER_V1 :</div><div class='add'>+			   HTT_OPTION_TCL_METADATA_VER_V2;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;tcl_metadata_version = le32_encode_bits(HTT_TAG_TCL_METADATA_VERSION,</div><div class='add'>+						     HTT_OPTION_TAG) |</div><div class='add'>+				    le32_encode_bits(HTT_TCL_METADATA_VER_SZ,</div><div class='add'>+						     HTT_OPTION_LEN) |</div><div class='add'>+				    le32_encode_bits(metadata_version,</div><div class='add'>+						     HTT_OPTION_VALUE);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_htc_send(&amp;ab-&gt;htc, dp-&gt;eid, skb);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = wait_for_completion_timeout(&amp;dp-&gt;htt_tgt_version_received,</div><div class='add'>+					  HTT_TARGET_VERSION_TIMEOUT_HZ);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		ath12k_warn(ab, "htt target version request timed out\n");</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dp-&gt;htt_tgt_ver_major != HTT_TARGET_VERSION_MAJOR) {</div><div class='add'>+		ath12k_err(ab, "unsupported htt major version %d supported version is %d\n",</div><div class='add'>+			   dp-&gt;htt_tgt_ver_major, HTT_TARGET_VERSION_MAJOR);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_tx_htt_h2t_ppdu_stats_req(struct ath12k *ar, u32 mask)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct htt_ppdu_stats_cfg_cmd *cmd;</div><div class='add'>+	int len = sizeof(*cmd);</div><div class='add'>+	u8 pdev_mask;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;num_rxdma_per_pdev; i++) {</div><div class='add'>+		skb = ath12k_htc_alloc_skb(ab, len);</div><div class='add'>+		if (!skb)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		skb_put(skb, len);</div><div class='add'>+		cmd = (struct htt_ppdu_stats_cfg_cmd *)skb-&gt;data;</div><div class='add'>+		cmd-&gt;msg = le32_encode_bits(HTT_H2T_MSG_TYPE_PPDU_STATS_CFG,</div><div class='add'>+					    HTT_PPDU_STATS_CFG_MSG_TYPE);</div><div class='add'>+</div><div class='add'>+		pdev_mask = 1 &lt;&lt; (i + ar-&gt;pdev_idx);</div><div class='add'>+		cmd-&gt;msg |= le32_encode_bits(pdev_mask, HTT_PPDU_STATS_CFG_PDEV_ID);</div><div class='add'>+		cmd-&gt;msg |= le32_encode_bits(mask, HTT_PPDU_STATS_CFG_TLV_TYPE_BITMASK);</div><div class='add'>+</div><div class='add'>+		ret = ath12k_htc_send(&amp;ab-&gt;htc, dp-&gt;eid, skb);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_tx_htt_rx_filter_setup(struct ath12k_base *ab, u32 ring_id,</div><div class='add'>+				     int mac_id, enum hal_ring_type ring_type,</div><div class='add'>+				     int rx_buf_size,</div><div class='add'>+				     struct htt_rx_ring_tlv_filter *tlv_filter)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_ring_selection_cfg_cmd *cmd;</div><div class='add'>+	struct hal_srng *srng = &amp;ab-&gt;hal.srng_list[ring_id];</div><div class='add'>+	struct hal_srng_params params;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int len = sizeof(*cmd);</div><div class='add'>+	enum htt_srng_ring_type htt_ring_type;</div><div class='add'>+	enum htt_srng_ring_id htt_ring_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_htc_alloc_skb(ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memset(&amp;params, 0, sizeof(params));</div><div class='add'>+	ath12k_hal_srng_get_params(ab, srng, &amp;params);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_tx_get_ring_id_type(ab, mac_id, ring_id,</div><div class='add'>+					    ring_type, &amp;htt_ring_type,</div><div class='add'>+					    &amp;htt_ring_id);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='add'>+	skb_put(skb, len);</div><div class='add'>+	cmd = (struct htt_rx_ring_selection_cfg_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;info0 = le32_encode_bits(HTT_H2T_MSG_TYPE_RX_RING_SELECTION_CFG,</div><div class='add'>+				      HTT_RX_RING_SELECTION_CFG_CMD_INFO0_MSG_TYPE);</div><div class='add'>+	if (htt_ring_type == HTT_SW_TO_HW_RING ||</div><div class='add'>+	    htt_ring_type == HTT_HW_TO_SW_RING)</div><div class='add'>+		cmd-&gt;info0 |=</div><div class='add'>+			le32_encode_bits(DP_SW2HW_MACID(mac_id),</div><div class='add'>+					 HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PDEV_ID);</div><div class='add'>+	else</div><div class='add'>+		cmd-&gt;info0 |=</div><div class='add'>+			le32_encode_bits(mac_id,</div><div class='add'>+					 HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PDEV_ID);</div><div class='add'>+	cmd-&gt;info0 |= le32_encode_bits(htt_ring_id,</div><div class='add'>+				       HTT_RX_RING_SELECTION_CFG_CMD_INFO0_RING_ID);</div><div class='add'>+	cmd-&gt;info0 |= le32_encode_bits(!!(params.flags &amp; HAL_SRNG_FLAGS_MSI_SWAP),</div><div class='add'>+				       HTT_RX_RING_SELECTION_CFG_CMD_INFO0_SS);</div><div class='add'>+	cmd-&gt;info0 |= le32_encode_bits(!!(params.flags &amp; HAL_SRNG_FLAGS_DATA_TLV_SWAP),</div><div class='add'>+				       HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PS);</div><div class='add'>+	cmd-&gt;info0 |= le32_encode_bits(tlv_filter-&gt;offset_valid,</div><div class='add'>+				       HTT_RX_RING_SELECTION_CFG_CMD_INFO0_OFFSET_VALID);</div><div class='add'>+	cmd-&gt;info0 |=</div><div class='add'>+		le32_encode_bits(tlv_filter-&gt;drop_threshold_valid,</div><div class='add'>+				 HTT_RX_RING_SELECTION_CFG_CMD_INFO0_DROP_THRES_VAL);</div><div class='add'>+	cmd-&gt;info0 |= le32_encode_bits(!tlv_filter-&gt;rxmon_disable,</div><div class='add'>+				       HTT_RX_RING_SELECTION_CFG_CMD_INFO0_EN_RXMON);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;info1 = le32_encode_bits(rx_buf_size,</div><div class='add'>+				      HTT_RX_RING_SELECTION_CFG_CMD_INFO1_BUF_SIZE);</div><div class='add'>+	cmd-&gt;info1 |= le32_encode_bits(tlv_filter-&gt;conf_len_mgmt,</div><div class='add'>+				       HTT_RX_RING_SELECTION_CFG_CMD_INFO1_CONF_LEN_MGMT);</div><div class='add'>+	cmd-&gt;info1 |= le32_encode_bits(tlv_filter-&gt;conf_len_ctrl,</div><div class='add'>+				       HTT_RX_RING_SELECTION_CFG_CMD_INFO1_CONF_LEN_CTRL);</div><div class='add'>+	cmd-&gt;info1 |= le32_encode_bits(tlv_filter-&gt;conf_len_data,</div><div class='add'>+				       HTT_RX_RING_SELECTION_CFG_CMD_INFO1_CONF_LEN_DATA);</div><div class='add'>+	cmd-&gt;pkt_type_en_flags0 = cpu_to_le32(tlv_filter-&gt;pkt_filter_flags0);</div><div class='add'>+	cmd-&gt;pkt_type_en_flags1 = cpu_to_le32(tlv_filter-&gt;pkt_filter_flags1);</div><div class='add'>+	cmd-&gt;pkt_type_en_flags2 = cpu_to_le32(tlv_filter-&gt;pkt_filter_flags2);</div><div class='add'>+	cmd-&gt;pkt_type_en_flags3 = cpu_to_le32(tlv_filter-&gt;pkt_filter_flags3);</div><div class='add'>+	cmd-&gt;rx_filter_tlv = cpu_to_le32(tlv_filter-&gt;rx_filter);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;info2 = le32_encode_bits(tlv_filter-&gt;rx_drop_threshold,</div><div class='add'>+				      HTT_RX_RING_SELECTION_CFG_CMD_INFO2_DROP_THRESHOLD);</div><div class='add'>+	cmd-&gt;info2 |=</div><div class='add'>+		le32_encode_bits(tlv_filter-&gt;enable_log_mgmt_type,</div><div class='add'>+				 HTT_RX_RING_SELECTION_CFG_CMD_INFO2_EN_LOG_MGMT_TYPE);</div><div class='add'>+	cmd-&gt;info2 |=</div><div class='add'>+		le32_encode_bits(tlv_filter-&gt;enable_log_ctrl_type,</div><div class='add'>+				 HTT_RX_RING_SELECTION_CFG_CMD_INFO2_EN_CTRL_TYPE);</div><div class='add'>+	cmd-&gt;info2 |=</div><div class='add'>+		le32_encode_bits(tlv_filter-&gt;enable_log_data_type,</div><div class='add'>+				 HTT_RX_RING_SELECTION_CFG_CMD_INFO2_EN_LOG_DATA_TYPE);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;info3 =</div><div class='add'>+		le32_encode_bits(tlv_filter-&gt;enable_rx_tlv_offset,</div><div class='add'>+				 HTT_RX_RING_SELECTION_CFG_CMD_INFO3_EN_TLV_PKT_OFFSET);</div><div class='add'>+	cmd-&gt;info3 |=</div><div class='add'>+		le32_encode_bits(tlv_filter-&gt;rx_tlv_offset,</div><div class='add'>+				 HTT_RX_RING_SELECTION_CFG_CMD_INFO3_PKT_TLV_OFFSET);</div><div class='add'>+</div><div class='add'>+	if (tlv_filter-&gt;offset_valid) {</div><div class='add'>+		cmd-&gt;rx_packet_offset =</div><div class='add'>+			le32_encode_bits(tlv_filter-&gt;rx_packet_offset,</div><div class='add'>+					 HTT_RX_RING_SELECTION_CFG_RX_PACKET_OFFSET);</div><div class='add'>+</div><div class='add'>+		cmd-&gt;rx_packet_offset |=</div><div class='add'>+			le32_encode_bits(tlv_filter-&gt;rx_header_offset,</div><div class='add'>+					 HTT_RX_RING_SELECTION_CFG_RX_HEADER_OFFSET);</div><div class='add'>+</div><div class='add'>+		cmd-&gt;rx_mpdu_offset =</div><div class='add'>+			le32_encode_bits(tlv_filter-&gt;rx_mpdu_end_offset,</div><div class='add'>+					 HTT_RX_RING_SELECTION_CFG_RX_MPDU_END_OFFSET);</div><div class='add'>+</div><div class='add'>+		cmd-&gt;rx_mpdu_offset |=</div><div class='add'>+			le32_encode_bits(tlv_filter-&gt;rx_mpdu_start_offset,</div><div class='add'>+					 HTT_RX_RING_SELECTION_CFG_RX_MPDU_START_OFFSET);</div><div class='add'>+</div><div class='add'>+		cmd-&gt;rx_msdu_offset =</div><div class='add'>+			le32_encode_bits(tlv_filter-&gt;rx_msdu_end_offset,</div><div class='add'>+					 HTT_RX_RING_SELECTION_CFG_RX_MSDU_END_OFFSET);</div><div class='add'>+</div><div class='add'>+		cmd-&gt;rx_msdu_offset |=</div><div class='add'>+			le32_encode_bits(tlv_filter-&gt;rx_msdu_start_offset,</div><div class='add'>+					 HTT_RX_RING_SELECTION_CFG_RX_MSDU_START_OFFSET);</div><div class='add'>+</div><div class='add'>+		cmd-&gt;rx_attn_offset =</div><div class='add'>+			le32_encode_bits(tlv_filter-&gt;rx_attn_offset,</div><div class='add'>+					 HTT_RX_RING_SELECTION_CFG_RX_ATTENTION_OFFSET);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tlv_filter-&gt;rx_mpdu_start_wmask &gt; 0 &amp;&amp;</div><div class='add'>+	    tlv_filter-&gt;rx_msdu_end_wmask &gt; 0) {</div><div class='add'>+		cmd-&gt;info2 |=</div><div class='add'>+			le32_encode_bits(true,</div><div class='add'>+					 HTT_RX_RING_SELECTION_CFG_WORD_MASK_COMPACT_SET);</div><div class='add'>+		cmd-&gt;rx_mpdu_start_end_mask =</div><div class='add'>+			le32_encode_bits(tlv_filter-&gt;rx_mpdu_start_wmask,</div><div class='add'>+					 HTT_RX_RING_SELECTION_CFG_RX_MPDU_START_MASK);</div><div class='add'>+		/* mpdu_end is not used for any hardwares so far</div><div class='add'>+		 * please assign it in future if any chip is</div><div class='add'>+		 * using through hal ops</div><div class='add'>+		 */</div><div class='add'>+		cmd-&gt;rx_mpdu_start_end_mask |=</div><div class='add'>+			le32_encode_bits(tlv_filter-&gt;rx_mpdu_end_wmask,</div><div class='add'>+					 HTT_RX_RING_SELECTION_CFG_RX_MPDU_END_MASK);</div><div class='add'>+		cmd-&gt;rx_msdu_end_word_mask =</div><div class='add'>+			le32_encode_bits(tlv_filter-&gt;rx_msdu_end_wmask,</div><div class='add'>+					 HTT_RX_RING_SELECTION_CFG_RX_MSDU_END_MASK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_htc_send(&amp;ab-&gt;htc, ab-&gt;dp.eid, skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free:</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+ath12k_dp_tx_htt_h2t_ext_stats_req(struct ath12k *ar, u8 type,</div><div class='add'>+				   struct htt_ext_stats_cfg_params *cfg_params,</div><div class='add'>+				   u64 cookie)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_dp *dp = &amp;ab-&gt;dp;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct htt_ext_stats_cfg_cmd *cmd;</div><div class='add'>+	int len = sizeof(*cmd);</div><div class='add'>+	int ret;</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_htc_alloc_skb(ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	skb_put(skb, len);</div><div class='add'>+</div><div class='add'>+	cmd = (struct htt_ext_stats_cfg_cmd *)skb-&gt;data;</div><div class='add'>+	memset(cmd, 0, sizeof(*cmd));</div><div class='add'>+	cmd-&gt;hdr.msg_type = HTT_H2T_MSG_TYPE_EXT_STATS_CFG;</div><div class='add'>+</div><div class='add'>+	pdev_id = ath12k_mac_get_target_pdev_id(ar);</div><div class='add'>+	cmd-&gt;hdr.pdev_mask = 1 &lt;&lt; pdev_id;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;hdr.stats_type = type;</div><div class='add'>+	cmd-&gt;cfg_param0 = cpu_to_le32(cfg_params-&gt;cfg0);</div><div class='add'>+	cmd-&gt;cfg_param1 = cpu_to_le32(cfg_params-&gt;cfg1);</div><div class='add'>+	cmd-&gt;cfg_param2 = cpu_to_le32(cfg_params-&gt;cfg2);</div><div class='add'>+	cmd-&gt;cfg_param3 = cpu_to_le32(cfg_params-&gt;cfg3);</div><div class='add'>+	cmd-&gt;cookie_lsb = cpu_to_le32(lower_32_bits(cookie));</div><div class='add'>+	cmd-&gt;cookie_msb = cpu_to_le32(upper_32_bits(cookie));</div><div class='add'>+</div><div class='add'>+	ret = ath12k_htc_send(&amp;ab-&gt;htc, dp-&gt;eid, skb);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to send htt type stats request: %d",</div><div class='add'>+			    ret);</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_tx_htt_monitor_mode_ring_config(struct ath12k *ar, bool reset)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_tx_htt_rx_monitor_mode_ring_config(ar, reset);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to setup rx monitor filter %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_tx_htt_rx_monitor_mode_ring_config(struct ath12k *ar, bool reset)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct htt_rx_ring_tlv_filter tlv_filter = {};</div><div class='add'>+	int ret, ring_id, i;</div><div class='add'>+</div><div class='add'>+	tlv_filter.offset_valid = false;</div><div class='add'>+</div><div class='add'>+	if (!reset) {</div><div class='add'>+		tlv_filter.rx_filter = HTT_RX_MON_FILTER_TLV_FLAGS_MON_DEST_RING;</div><div class='add'>+</div><div class='add'>+		tlv_filter.drop_threshold_valid = true;</div><div class='add'>+		tlv_filter.rx_drop_threshold = HTT_RX_RING_TLV_DROP_THRESHOLD_VALUE;</div><div class='add'>+</div><div class='add'>+		tlv_filter.enable_log_mgmt_type = true;</div><div class='add'>+		tlv_filter.enable_log_ctrl_type = true;</div><div class='add'>+		tlv_filter.enable_log_data_type = true;</div><div class='add'>+</div><div class='add'>+		tlv_filter.conf_len_ctrl = HTT_RX_RING_DEFAULT_DMA_LENGTH;</div><div class='add'>+		tlv_filter.conf_len_mgmt = HTT_RX_RING_DEFAULT_DMA_LENGTH;</div><div class='add'>+		tlv_filter.conf_len_data = HTT_RX_RING_DEFAULT_DMA_LENGTH;</div><div class='add'>+</div><div class='add'>+		tlv_filter.enable_rx_tlv_offset = true;</div><div class='add'>+		tlv_filter.rx_tlv_offset = HTT_RX_RING_PKT_TLV_OFFSET;</div><div class='add'>+</div><div class='add'>+		tlv_filter.pkt_filter_flags0 =</div><div class='add'>+					HTT_RX_MON_FP_MGMT_FILTER_FLAGS0 |</div><div class='add'>+					HTT_RX_MON_MO_MGMT_FILTER_FLAGS0;</div><div class='add'>+		tlv_filter.pkt_filter_flags1 =</div><div class='add'>+					HTT_RX_MON_FP_MGMT_FILTER_FLAGS1 |</div><div class='add'>+					HTT_RX_MON_MO_MGMT_FILTER_FLAGS1;</div><div class='add'>+		tlv_filter.pkt_filter_flags2 =</div><div class='add'>+					HTT_RX_MON_FP_CTRL_FILTER_FLASG2 |</div><div class='add'>+					HTT_RX_MON_MO_CTRL_FILTER_FLASG2;</div><div class='add'>+		tlv_filter.pkt_filter_flags3 =</div><div class='add'>+					HTT_RX_MON_FP_CTRL_FILTER_FLASG3 |</div><div class='add'>+					HTT_RX_MON_MO_CTRL_FILTER_FLASG3 |</div><div class='add'>+					HTT_RX_MON_FP_DATA_FILTER_FLASG3 |</div><div class='add'>+					HTT_RX_MON_MO_DATA_FILTER_FLASG3;</div><div class='add'>+	} else {</div><div class='add'>+		tlv_filter = ath12k_mac_mon_status_filter_default;</div><div class='add'>+</div><div class='add'>+		if (ath12k_debugfs_is_extd_rx_stats_enabled(ar))</div><div class='add'>+			tlv_filter.rx_filter = ath12k_debugfs_rx_filter(ar);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;rxdma1_enable) {</div><div class='add'>+		for (i = 0; i &lt; ab-&gt;hw_params-&gt;num_rxdma_per_pdev; i++) {</div><div class='add'>+			ring_id = ar-&gt;dp.rxdma_mon_dst_ring[i].ring_id;</div><div class='add'>+			ret = ath12k_dp_tx_htt_rx_filter_setup(ar-&gt;ab, ring_id,</div><div class='add'>+							       ar-&gt;dp.mac_id + i,</div><div class='add'>+							       HAL_RXDMA_MONITOR_DST,</div><div class='add'>+							       DP_RXDMA_REFILL_RING_SIZE,</div><div class='add'>+							       &amp;tlv_filter);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_err(ab,</div><div class='add'>+					   "failed to setup filter for monitor buf %d\n",</div><div class='add'>+					   ret);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!reset) {</div><div class='add'>+		for (i = 0; i &lt; ab-&gt;hw_params-&gt;num_rxdma_per_pdev; i++) {</div><div class='add'>+			ring_id = ab-&gt;dp.rx_mac_buf_ring[i].ring_id;</div><div class='add'>+			ret = ath12k_dp_tx_htt_rx_filter_setup(ar-&gt;ab, ring_id,</div><div class='add'>+							       i,</div><div class='add'>+							       HAL_RXDMA_BUF,</div><div class='add'>+							       DP_RXDMA_REFILL_RING_SIZE,</div><div class='add'>+							       &amp;tlv_filter);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_err(ab,</div><div class='add'>+					   "failed to setup filter for mon rx buf %d\n",</div><div class='add'>+					   ret);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;num_rxdma_per_pdev; i++) {</div><div class='add'>+		ring_id = ab-&gt;dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id;</div><div class='add'>+		if (!reset) {</div><div class='add'>+			tlv_filter.rx_filter =</div><div class='add'>+				HTT_RX_MON_FILTER_TLV_FLAGS_MON_STATUS_RING;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ath12k_dp_tx_htt_rx_filter_setup(ab, ring_id,</div><div class='add'>+						       i,</div><div class='add'>+						       HAL_RXDMA_MONITOR_STATUS,</div><div class='add'>+						       RX_MON_STATUS_BUF_SIZE,</div><div class='add'>+						       &amp;tlv_filter);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_err(ab,</div><div class='add'>+				   "failed to setup filter for mon status buf %d\n",</div><div class='add'>+				   ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_dp_tx_htt_tx_filter_setup(struct ath12k_base *ab, u32 ring_id,</div><div class='add'>+				     int mac_id, enum hal_ring_type ring_type,</div><div class='add'>+				     int tx_buf_size,</div><div class='add'>+				     struct htt_tx_ring_tlv_filter *htt_tlv_filter)</div><div class='add'>+{</div><div class='add'>+	struct htt_tx_ring_selection_cfg_cmd *cmd;</div><div class='add'>+	struct hal_srng *srng = &amp;ab-&gt;hal.srng_list[ring_id];</div><div class='add'>+	struct hal_srng_params params;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int len = sizeof(*cmd);</div><div class='add'>+	enum htt_srng_ring_type htt_ring_type;</div><div class='add'>+	enum htt_srng_ring_id htt_ring_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_htc_alloc_skb(ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memset(&amp;params, 0, sizeof(params));</div><div class='add'>+	ath12k_hal_srng_get_params(ab, srng, &amp;params);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_tx_get_ring_id_type(ab, mac_id, ring_id,</div><div class='add'>+					    ring_type, &amp;htt_ring_type,</div><div class='add'>+					    &amp;htt_ring_id);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='add'>+	skb_put(skb, len);</div><div class='add'>+	cmd = (struct htt_tx_ring_selection_cfg_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;info0 = le32_encode_bits(HTT_H2T_MSG_TYPE_TX_MONITOR_CFG,</div><div class='add'>+				      HTT_TX_RING_SELECTION_CFG_CMD_INFO0_MSG_TYPE);</div><div class='add'>+	if (htt_ring_type == HTT_SW_TO_HW_RING ||</div><div class='add'>+	    htt_ring_type == HTT_HW_TO_SW_RING)</div><div class='add'>+		cmd-&gt;info0 |=</div><div class='add'>+			le32_encode_bits(DP_SW2HW_MACID(mac_id),</div><div class='add'>+					 HTT_TX_RING_SELECTION_CFG_CMD_INFO0_PDEV_ID);</div><div class='add'>+	else</div><div class='add'>+		cmd-&gt;info0 |=</div><div class='add'>+			le32_encode_bits(mac_id,</div><div class='add'>+					 HTT_TX_RING_SELECTION_CFG_CMD_INFO0_PDEV_ID);</div><div class='add'>+	cmd-&gt;info0 |= le32_encode_bits(htt_ring_id,</div><div class='add'>+				       HTT_TX_RING_SELECTION_CFG_CMD_INFO0_RING_ID);</div><div class='add'>+	cmd-&gt;info0 |= le32_encode_bits(!!(params.flags &amp; HAL_SRNG_FLAGS_MSI_SWAP),</div><div class='add'>+				       HTT_TX_RING_SELECTION_CFG_CMD_INFO0_SS);</div><div class='add'>+	cmd-&gt;info0 |= le32_encode_bits(!!(params.flags &amp; HAL_SRNG_FLAGS_DATA_TLV_SWAP),</div><div class='add'>+				       HTT_TX_RING_SELECTION_CFG_CMD_INFO0_PS);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;info1 |=</div><div class='add'>+		le32_encode_bits(tx_buf_size,</div><div class='add'>+				 HTT_TX_RING_SELECTION_CFG_CMD_INFO1_RING_BUFF_SIZE);</div><div class='add'>+</div><div class='add'>+	if (htt_tlv_filter-&gt;tx_mon_mgmt_filter) {</div><div class='add'>+		cmd-&gt;info1 |=</div><div class='add'>+			le32_encode_bits(HTT_STATS_FRAME_CTRL_TYPE_MGMT,</div><div class='add'>+					 HTT_TX_RING_SELECTION_CFG_CMD_INFO1_PKT_TYPE);</div><div class='add'>+		cmd-&gt;info1 |=</div><div class='add'>+		le32_encode_bits(htt_tlv_filter-&gt;tx_mon_pkt_dma_len,</div><div class='add'>+				 HTT_TX_RING_SELECTION_CFG_CMD_INFO1_CONF_LEN_MGMT);</div><div class='add'>+		cmd-&gt;info2 |=</div><div class='add'>+		le32_encode_bits(HTT_STATS_FRAME_CTRL_TYPE_MGMT,</div><div class='add'>+				 HTT_TX_RING_SELECTION_CFG_CMD_INFO2_PKT_TYPE_EN_FLAG);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (htt_tlv_filter-&gt;tx_mon_data_filter) {</div><div class='add'>+		cmd-&gt;info1 |=</div><div class='add'>+			le32_encode_bits(HTT_STATS_FRAME_CTRL_TYPE_CTRL,</div><div class='add'>+					 HTT_TX_RING_SELECTION_CFG_CMD_INFO1_PKT_TYPE);</div><div class='add'>+		cmd-&gt;info1 |=</div><div class='add'>+		le32_encode_bits(htt_tlv_filter-&gt;tx_mon_pkt_dma_len,</div><div class='add'>+				 HTT_TX_RING_SELECTION_CFG_CMD_INFO1_CONF_LEN_CTRL);</div><div class='add'>+		cmd-&gt;info2 |=</div><div class='add'>+		le32_encode_bits(HTT_STATS_FRAME_CTRL_TYPE_CTRL,</div><div class='add'>+				 HTT_TX_RING_SELECTION_CFG_CMD_INFO2_PKT_TYPE_EN_FLAG);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (htt_tlv_filter-&gt;tx_mon_ctrl_filter) {</div><div class='add'>+		cmd-&gt;info1 |=</div><div class='add'>+			le32_encode_bits(HTT_STATS_FRAME_CTRL_TYPE_DATA,</div><div class='add'>+					 HTT_TX_RING_SELECTION_CFG_CMD_INFO1_PKT_TYPE);</div><div class='add'>+		cmd-&gt;info1 |=</div><div class='add'>+		le32_encode_bits(htt_tlv_filter-&gt;tx_mon_pkt_dma_len,</div><div class='add'>+				 HTT_TX_RING_SELECTION_CFG_CMD_INFO1_CONF_LEN_DATA);</div><div class='add'>+		cmd-&gt;info2 |=</div><div class='add'>+		le32_encode_bits(HTT_STATS_FRAME_CTRL_TYPE_DATA,</div><div class='add'>+				 HTT_TX_RING_SELECTION_CFG_CMD_INFO2_PKT_TYPE_EN_FLAG);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd-&gt;tlv_filter_mask_in0 =</div><div class='add'>+		cpu_to_le32(htt_tlv_filter-&gt;tx_mon_downstream_tlv_flags);</div><div class='add'>+	cmd-&gt;tlv_filter_mask_in1 =</div><div class='add'>+		cpu_to_le32(htt_tlv_filter-&gt;tx_mon_upstream_tlv_flags0);</div><div class='add'>+	cmd-&gt;tlv_filter_mask_in2 =</div><div class='add'>+		cpu_to_le32(htt_tlv_filter-&gt;tx_mon_upstream_tlv_flags1);</div><div class='add'>+	cmd-&gt;tlv_filter_mask_in3 =</div><div class='add'>+		cpu_to_le32(htt_tlv_filter-&gt;tx_mon_upstream_tlv_flags2);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_htc_send(&amp;ab-&gt;htc, ab-&gt;dp.eid, skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free:</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/dp_tx.h b/drivers/net/wireless/ath/ath12k/dp_tx.h<br/>new file mode 100644<br/>index 000000000000..10acdcf1fa8f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/dp_tx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/dp_tx.h</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2022, 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH12K_DP_TX_H</div><div class='add'>+#define ATH12K_DP_TX_H</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "hal_tx.h"</div><div class='add'>+</div><div class='add'>+struct ath12k_dp_htt_wbm_tx_status {</div><div class='add'>+	bool acked;</div><div class='add'>+	s8 ack_rssi;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ath12k_dp_tx_htt_h2t_ver_req_msg(struct ath12k_base *ab);</div><div class='add'>+int ath12k_dp_tx(struct ath12k *ar, struct ath12k_link_vif *arvif,</div><div class='add'>+		 struct sk_buff *skb, bool gsn_valid, int mcbc_gsn,</div><div class='add'>+		 bool is_mcast);</div><div class='add'>+void ath12k_dp_tx_completion_handler(struct ath12k_base *ab, int ring_id);</div><div class='add'>+</div><div class='add'>+int ath12k_dp_tx_htt_h2t_ppdu_stats_req(struct ath12k *ar, u32 mask);</div><div class='add'>+int</div><div class='add'>+ath12k_dp_tx_htt_h2t_ext_stats_req(struct ath12k *ar, u8 type,</div><div class='add'>+				   struct htt_ext_stats_cfg_params *cfg_params,</div><div class='add'>+				   u64 cookie);</div><div class='add'>+int ath12k_dp_tx_htt_rx_monitor_mode_ring_config(struct ath12k *ar, bool reset);</div><div class='add'>+</div><div class='add'>+int ath12k_dp_tx_htt_rx_filter_setup(struct ath12k_base *ab, u32 ring_id,</div><div class='add'>+				     int mac_id, enum hal_ring_type ring_type,</div><div class='add'>+				     int rx_buf_size,</div><div class='add'>+				     struct htt_rx_ring_tlv_filter *tlv_filter);</div><div class='add'>+void ath12k_dp_tx_put_bank_profile(struct ath12k_dp *dp, u8 bank_id);</div><div class='add'>+int ath12k_dp_tx_htt_tx_filter_setup(struct ath12k_base *ab, u32 ring_id,</div><div class='add'>+				     int mac_id, enum hal_ring_type ring_type,</div><div class='add'>+				     int tx_buf_size,</div><div class='add'>+				     struct htt_tx_ring_tlv_filter *htt_tlv_filter);</div><div class='add'>+int ath12k_dp_tx_htt_monitor_mode_ring_config(struct ath12k *ar, bool reset);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/fw.c b/drivers/net/wireless/ath/ath12k/fw.c<br/>new file mode 100644<br/>index 000000000000..5ac497f80cad<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/fw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/fw.c</a></div><div class='hunk'>@@ -0,0 +1,178 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+static int ath12k_fw_request_firmware_api_n(struct ath12k_base *ab,</div><div class='add'>+					    const char *name)</div><div class='add'>+{</div><div class='add'>+	size_t magic_len, len, ie_len;</div><div class='add'>+	int ie_id, i, index, bit, ret;</div><div class='add'>+	struct ath12k_fw_ie *hdr;</div><div class='add'>+	const u8 *data;</div><div class='add'>+	__le32 *timestamp;</div><div class='add'>+</div><div class='add'>+	ab-&gt;fw.fw = ath12k_core_firmware_request(ab, name);</div><div class='add'>+	if (IS_ERR(ab-&gt;fw.fw)) {</div><div class='add'>+		ret = PTR_ERR(ab-&gt;fw.fw);</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT, "failed to load %s: %d\n", name, ret);</div><div class='add'>+		ab-&gt;fw.fw = NULL;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data = ab-&gt;fw.fw-&gt;data;</div><div class='add'>+	len = ab-&gt;fw.fw-&gt;size;</div><div class='add'>+</div><div class='add'>+	/* magic also includes the null byte, check that as well */</div><div class='add'>+	magic_len = strlen(ATH12K_FIRMWARE_MAGIC) + 1;</div><div class='add'>+</div><div class='add'>+	if (len &lt; magic_len) {</div><div class='add'>+		ath12k_err(ab, "firmware image too small to contain magic: %zu\n",</div><div class='add'>+			   len);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (memcmp(data, ATH12K_FIRMWARE_MAGIC, magic_len) != 0) {</div><div class='add'>+		ath12k_err(ab, "Invalid firmware magic\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* jump over the padding */</div><div class='add'>+	magic_len = ALIGN(magic_len, 4);</div><div class='add'>+</div><div class='add'>+	/* make sure there's space for padding */</div><div class='add'>+	if (magic_len &gt; len) {</div><div class='add'>+		ath12k_err(ab, "No space for padding after magic\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len -= magic_len;</div><div class='add'>+	data += magic_len;</div><div class='add'>+</div><div class='add'>+	/* loop elements */</div><div class='add'>+	while (len &gt; sizeof(struct ath12k_fw_ie)) {</div><div class='add'>+		hdr = (struct ath12k_fw_ie *)data;</div><div class='add'>+</div><div class='add'>+		ie_id = le32_to_cpu(hdr-&gt;id);</div><div class='add'>+		ie_len = le32_to_cpu(hdr-&gt;len);</div><div class='add'>+</div><div class='add'>+		len -= sizeof(*hdr);</div><div class='add'>+		data += sizeof(*hdr);</div><div class='add'>+</div><div class='add'>+		if (len &lt; ie_len) {</div><div class='add'>+			ath12k_err(ab, "Invalid length for FW IE %d (%zu &lt; %zu)\n",</div><div class='add'>+				   ie_id, len, ie_len);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (ie_id) {</div><div class='add'>+		case ATH12K_FW_IE_TIMESTAMP:</div><div class='add'>+			if (ie_len != sizeof(u32))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			timestamp = (__le32 *)data;</div><div class='add'>+</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_BOOT, "found fw timestamp %d\n",</div><div class='add'>+				   le32_to_cpup(timestamp));</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_FW_IE_FEATURES:</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+				   "found firmware features ie (%zd B)\n",</div><div class='add'>+				   ie_len);</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; ATH12K_FW_FEATURE_COUNT; i++) {</div><div class='add'>+				index = i / 8;</div><div class='add'>+				bit = i % 8;</div><div class='add'>+</div><div class='add'>+				if (index == ie_len)</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				if (data[index] &amp; (1 &lt;&lt; bit))</div><div class='add'>+					__set_bit(i, ab-&gt;fw.fw_features);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ab-&gt;fw.fw_features_valid = true;</div><div class='add'>+</div><div class='add'>+			ath12k_dbg_dump(ab, ATH12K_DBG_BOOT, "features", "",</div><div class='add'>+					ab-&gt;fw.fw_features,</div><div class='add'>+					sizeof(ab-&gt;fw.fw_features));</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_FW_IE_AMSS_IMAGE:</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+				   "found fw image ie (%zd B)\n",</div><div class='add'>+				   ie_len);</div><div class='add'>+</div><div class='add'>+			ab-&gt;fw.amss_data = data;</div><div class='add'>+			ab-&gt;fw.amss_len = ie_len;</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_FW_IE_M3_IMAGE:</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+				   "found m3 image ie (%zd B)\n",</div><div class='add'>+				   ie_len);</div><div class='add'>+</div><div class='add'>+			ab-&gt;fw.m3_data = data;</div><div class='add'>+			ab-&gt;fw.m3_len = ie_len;</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_FW_IE_AMSS_DUALMAC_IMAGE:</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+				   "found dualmac fw image ie (%zd B)\n",</div><div class='add'>+				   ie_len);</div><div class='add'>+			ab-&gt;fw.amss_dualmac_data = data;</div><div class='add'>+			ab-&gt;fw.amss_dualmac_len = ie_len;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ath12k_warn(ab, "Unknown FW IE: %u\n", ie_id);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* jump over the padding */</div><div class='add'>+		ie_len = ALIGN(ie_len, 4);</div><div class='add'>+</div><div class='add'>+		/* make sure there's space for padding */</div><div class='add'>+		if (ie_len &gt; len)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		len -= ie_len;</div><div class='add'>+		data += ie_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	release_firmware(ab-&gt;fw.fw);</div><div class='add'>+	ab-&gt;fw.fw = NULL;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_fw_map(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_fw_request_firmware_api_n(ab, ATH12K_FW_API2_FILE);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		ab-&gt;fw.api_version = 2;</div><div class='add'>+	else</div><div class='add'>+		ab-&gt;fw.api_version = 1;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_BOOT, "using fw api %d\n",</div><div class='add'>+		   ab-&gt;fw.api_version);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_fw_unmap(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	release_firmware(ab-&gt;fw.fw);</div><div class='add'>+	memset(&amp;ab-&gt;fw, 0, sizeof(ab-&gt;fw));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool ath12k_fw_feature_supported(struct ath12k_base *ab, enum ath12k_fw_features feat)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;fw.fw_features_valid &amp;&amp; test_bit(feat, ab-&gt;fw.fw_features);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/fw.h b/drivers/net/wireless/ath/ath12k/fw.h<br/>new file mode 100644<br/>index 000000000000..7afaefed5086<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/fw.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/fw.h</a></div><div class='hunk'>@@ -0,0 +1,37 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH12K_FW_H</div><div class='add'>+#define ATH12K_FW_H</div><div class='add'>+</div><div class='add'>+#define ATH12K_FW_API2_FILE		"firmware-2.bin"</div><div class='add'>+#define ATH12K_FIRMWARE_MAGIC		"QCOM-ATH12K-FW"</div><div class='add'>+</div><div class='add'>+enum ath12k_fw_ie_type {</div><div class='add'>+	ATH12K_FW_IE_TIMESTAMP = 0,</div><div class='add'>+	ATH12K_FW_IE_FEATURES = 1,</div><div class='add'>+	ATH12K_FW_IE_AMSS_IMAGE = 2,</div><div class='add'>+	ATH12K_FW_IE_M3_IMAGE = 3,</div><div class='add'>+	ATH12K_FW_IE_AMSS_DUALMAC_IMAGE = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_fw_features {</div><div class='add'>+	/* The firmware supports setting the QRTR id via register</div><div class='add'>+	 * PCIE_LOCAL_REG_QRTR_NODE_ID</div><div class='add'>+	 */</div><div class='add'>+	ATH12K_FW_FEATURE_MULTI_QRTR_ID = 0,</div><div class='add'>+</div><div class='add'>+	/* The firmware supports MLO capability */</div><div class='add'>+	ATH12K_FW_FEATURE_MLO,</div><div class='add'>+</div><div class='add'>+	/* keep last */</div><div class='add'>+	ATH12K_FW_FEATURE_COUNT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath12k_fw_map(struct ath12k_base *ab);</div><div class='add'>+void ath12k_fw_unmap(struct ath12k_base *ab);</div><div class='add'>+bool ath12k_fw_feature_supported(struct ath12k_base *ab, enum ath12k_fw_features feat);</div><div class='add'>+</div><div class='add'>+#endif /* ATH12K_FW_H */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/hal.c b/drivers/net/wireless/ath/ath12k/hal.c<br/>new file mode 100644<br/>index 000000000000..6406fcf5d69f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/hal.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/hal.c</a></div><div class='hunk'>@@ -0,0 +1,2663 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include "hal_tx.h"</div><div class='add'>+#include "hal_rx.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "hal_desc.h"</div><div class='add'>+#include "hif.h"</div><div class='add'>+</div><div class='add'>+static const struct hal_srng_config hw_srng_config_template[] = {</div><div class='add'>+	/* TODO: max_rings can populated by querying HW capabilities */</div><div class='add'>+	[HAL_REO_DST] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_RING_ID_REO2SW1,</div><div class='add'>+		.max_rings = 8,</div><div class='add'>+		.entry_size = sizeof(struct hal_reo_dest_ring) &gt;&gt; 2,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_UMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_DST,</div><div class='add'>+		.max_size = HAL_REO_REO2SW1_RING_BASE_MSB_RING_SIZE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_REO_EXCEPTION] = {</div><div class='add'>+		/* Designating REO2SW0 ring as exception ring.</div><div class='add'>+		 * Any of theREO2SW rings can be used as exception ring.</div><div class='add'>+		 */</div><div class='add'>+		.start_ring_id = HAL_SRNG_RING_ID_REO2SW0,</div><div class='add'>+		.max_rings = 1,</div><div class='add'>+		.entry_size = sizeof(struct hal_reo_dest_ring) &gt;&gt; 2,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_UMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_DST,</div><div class='add'>+		.max_size = HAL_REO_REO2SW0_RING_BASE_MSB_RING_SIZE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_REO_REINJECT] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_RING_ID_SW2REO,</div><div class='add'>+		.max_rings = 4,</div><div class='add'>+		.entry_size = sizeof(struct hal_reo_entrance_ring) &gt;&gt; 2,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_UMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_SRC,</div><div class='add'>+		.max_size = HAL_REO_SW2REO_RING_BASE_MSB_RING_SIZE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_REO_CMD] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_RING_ID_REO_CMD,</div><div class='add'>+		.max_rings = 1,</div><div class='add'>+		.entry_size = (sizeof(struct hal_tlv_64_hdr) +</div><div class='add'>+			sizeof(struct hal_reo_get_queue_stats)) &gt;&gt; 2,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_UMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_SRC,</div><div class='add'>+		.max_size = HAL_REO_CMD_RING_BASE_MSB_RING_SIZE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_REO_STATUS] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_RING_ID_REO_STATUS,</div><div class='add'>+		.max_rings = 1,</div><div class='add'>+		.entry_size = (sizeof(struct hal_tlv_64_hdr) +</div><div class='add'>+			sizeof(struct hal_reo_get_queue_stats_status)) &gt;&gt; 2,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_UMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_DST,</div><div class='add'>+		.max_size = HAL_REO_STATUS_RING_BASE_MSB_RING_SIZE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_TCL_DATA] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_RING_ID_SW2TCL1,</div><div class='add'>+		.max_rings = 6,</div><div class='add'>+		.entry_size = sizeof(struct hal_tcl_data_cmd) &gt;&gt; 2,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_UMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_SRC,</div><div class='add'>+		.max_size = HAL_SW2TCL1_RING_BASE_MSB_RING_SIZE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_TCL_CMD] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_RING_ID_SW2TCL_CMD,</div><div class='add'>+		.max_rings = 1,</div><div class='add'>+		.entry_size = sizeof(struct hal_tcl_gse_cmd) &gt;&gt; 2,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_UMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_SRC,</div><div class='add'>+		.max_size = HAL_SW2TCL1_CMD_RING_BASE_MSB_RING_SIZE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_TCL_STATUS] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_RING_ID_TCL_STATUS,</div><div class='add'>+		.max_rings = 1,</div><div class='add'>+		.entry_size = (sizeof(struct hal_tlv_hdr) +</div><div class='add'>+			     sizeof(struct hal_tcl_status_ring)) &gt;&gt; 2,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_UMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_DST,</div><div class='add'>+		.max_size = HAL_TCL_STATUS_RING_BASE_MSB_RING_SIZE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_CE_SRC] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_RING_ID_CE0_SRC,</div><div class='add'>+		.max_rings = 16,</div><div class='add'>+		.entry_size = sizeof(struct hal_ce_srng_src_desc) &gt;&gt; 2,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_UMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_SRC,</div><div class='add'>+		.max_size = HAL_CE_SRC_RING_BASE_MSB_RING_SIZE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_CE_DST] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_RING_ID_CE0_DST,</div><div class='add'>+		.max_rings = 16,</div><div class='add'>+		.entry_size = sizeof(struct hal_ce_srng_dest_desc) &gt;&gt; 2,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_UMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_SRC,</div><div class='add'>+		.max_size = HAL_CE_DST_RING_BASE_MSB_RING_SIZE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_CE_DST_STATUS] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_RING_ID_CE0_DST_STATUS,</div><div class='add'>+		.max_rings = 16,</div><div class='add'>+		.entry_size = sizeof(struct hal_ce_srng_dst_status_desc) &gt;&gt; 2,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_UMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_DST,</div><div class='add'>+		.max_size = HAL_CE_DST_STATUS_RING_BASE_MSB_RING_SIZE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_WBM_IDLE_LINK] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_RING_ID_WBM_IDLE_LINK,</div><div class='add'>+		.max_rings = 1,</div><div class='add'>+		.entry_size = sizeof(struct hal_wbm_link_desc) &gt;&gt; 2,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_UMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_SRC,</div><div class='add'>+		.max_size = HAL_WBM_IDLE_LINK_RING_BASE_MSB_RING_SIZE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_SW2WBM_RELEASE] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_RING_ID_WBM_SW0_RELEASE,</div><div class='add'>+		.max_rings = 2,</div><div class='add'>+		.entry_size = sizeof(struct hal_wbm_release_ring) &gt;&gt; 2,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_UMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_SRC,</div><div class='add'>+		.max_size = HAL_SW2WBM_RELEASE_RING_BASE_MSB_RING_SIZE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_WBM2SW_RELEASE] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_RING_ID_WBM2SW0_RELEASE,</div><div class='add'>+		.max_rings = 8,</div><div class='add'>+		.entry_size = sizeof(struct hal_wbm_release_ring) &gt;&gt; 2,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_UMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_DST,</div><div class='add'>+		.max_size = HAL_WBM2SW_RELEASE_RING_BASE_MSB_RING_SIZE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_RXDMA_BUF] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_SW2RXDMA_BUF0,</div><div class='add'>+		.max_rings = 1,</div><div class='add'>+		.entry_size = sizeof(struct hal_wbm_buffer_ring) &gt;&gt; 2,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_DMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_SRC,</div><div class='add'>+		.max_size = HAL_RXDMA_RING_MAX_SIZE_BE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_RXDMA_DST] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_RING_ID_WMAC1_RXDMA2SW0,</div><div class='add'>+		.max_rings = 0,</div><div class='add'>+		.entry_size = 0,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_PMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_DST,</div><div class='add'>+		.max_size = HAL_RXDMA_RING_MAX_SIZE_BE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_RXDMA_MONITOR_BUF] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_SW2RXMON_BUF0,</div><div class='add'>+		.max_rings = 1,</div><div class='add'>+		.entry_size = sizeof(struct hal_mon_buf_ring) &gt;&gt; 2,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_PMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_SRC,</div><div class='add'>+		.max_size = HAL_RXDMA_RING_MAX_SIZE_BE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_RXDMA_MONITOR_STATUS] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_RING_ID_WMAC1_SW2RXDMA1_STATBUF,</div><div class='add'>+		.max_rings = 1,</div><div class='add'>+		.entry_size = sizeof(struct hal_wbm_buffer_ring) &gt;&gt; 2,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_PMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_SRC,</div><div class='add'>+		.max_size = HAL_RXDMA_RING_MAX_SIZE_BE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_RXDMA_MONITOR_DESC] = { 0, },</div><div class='add'>+	[HAL_RXDMA_DIR_BUF] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_RING_ID_RXDMA_DIR_BUF,</div><div class='add'>+		.max_rings = 2,</div><div class='add'>+		.entry_size = 8 &gt;&gt; 2, /* TODO: Define the struct */</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_PMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_SRC,</div><div class='add'>+		.max_size = HAL_RXDMA_RING_MAX_SIZE_BE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_PPE2TCL] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_RING_ID_PPE2TCL1,</div><div class='add'>+		.max_rings = 1,</div><div class='add'>+		.entry_size = sizeof(struct hal_tcl_entrance_from_ppe_ring) &gt;&gt; 2,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_PMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_SRC,</div><div class='add'>+		.max_size = HAL_SW2TCL1_RING_BASE_MSB_RING_SIZE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_PPE_RELEASE] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_RING_ID_WBM_PPE_RELEASE,</div><div class='add'>+		.max_rings = 1,</div><div class='add'>+		.entry_size = sizeof(struct hal_wbm_release_ring) &gt;&gt; 2,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_PMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_SRC,</div><div class='add'>+		.max_size = HAL_WBM2PPE_RELEASE_RING_BASE_MSB_RING_SIZE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_TX_MONITOR_BUF] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_RING_ID_WMAC1_SW2TXMON_BUF0,</div><div class='add'>+		.max_rings = 1,</div><div class='add'>+		.entry_size = sizeof(struct hal_mon_buf_ring) &gt;&gt; 2,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_PMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_SRC,</div><div class='add'>+		.max_size = HAL_RXDMA_RING_MAX_SIZE_BE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_RXDMA_MONITOR_DST] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_RING_ID_WMAC1_SW2RXMON_BUF0,</div><div class='add'>+		.max_rings = 1,</div><div class='add'>+		.entry_size = sizeof(struct hal_mon_dest_desc) &gt;&gt; 2,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_PMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_DST,</div><div class='add'>+		.max_size = HAL_RXDMA_RING_MAX_SIZE_BE,</div><div class='add'>+	},</div><div class='add'>+	[HAL_TX_MONITOR_DST] = {</div><div class='add'>+		.start_ring_id = HAL_SRNG_RING_ID_WMAC1_TXMON2SW0_BUF0,</div><div class='add'>+		.max_rings = 1,</div><div class='add'>+		.entry_size = sizeof(struct hal_mon_dest_desc) &gt;&gt; 2,</div><div class='add'>+		.mac_type = ATH12K_HAL_SRNG_PMAC,</div><div class='add'>+		.ring_dir = HAL_SRNG_DIR_DST,</div><div class='add'>+		.max_size = HAL_RXDMA_RING_MAX_SIZE_BE,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ath12k_hal_tcl_to_wbm_rbm_map</div><div class='add'>+ath12k_hal_qcn9274_tcl_to_wbm_rbm_map[DP_TCL_NUM_RING_MAX] = {</div><div class='add'>+	{</div><div class='add'>+		.wbm_ring_num = 0,</div><div class='add'>+		.rbm_id = HAL_RX_BUF_RBM_SW0_BM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.wbm_ring_num = 1,</div><div class='add'>+		.rbm_id = HAL_RX_BUF_RBM_SW1_BM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.wbm_ring_num = 2,</div><div class='add'>+		.rbm_id = HAL_RX_BUF_RBM_SW2_BM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.wbm_ring_num = 4,</div><div class='add'>+		.rbm_id = HAL_RX_BUF_RBM_SW4_BM,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ath12k_hal_tcl_to_wbm_rbm_map</div><div class='add'>+ath12k_hal_wcn7850_tcl_to_wbm_rbm_map[DP_TCL_NUM_RING_MAX] = {</div><div class='add'>+	{</div><div class='add'>+		.wbm_ring_num = 0,</div><div class='add'>+		.rbm_id = HAL_RX_BUF_RBM_SW0_BM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.wbm_ring_num = 2,</div><div class='add'>+		.rbm_id = HAL_RX_BUF_RBM_SW2_BM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.wbm_ring_num = 4,</div><div class='add'>+		.rbm_id = HAL_RX_BUF_RBM_SW4_BM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned int ath12k_hal_reo1_ring_id_offset(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return HAL_REO1_RING_ID(ab) - HAL_REO1_RING_BASE_LSB(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int ath12k_hal_reo1_ring_msi1_base_lsb_offset(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return HAL_REO1_RING_MSI1_BASE_LSB(ab) - HAL_REO1_RING_BASE_LSB(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int ath12k_hal_reo1_ring_msi1_base_msb_offset(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return HAL_REO1_RING_MSI1_BASE_MSB(ab) - HAL_REO1_RING_BASE_LSB(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int ath12k_hal_reo1_ring_msi1_data_offset(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return HAL_REO1_RING_MSI1_DATA(ab) - HAL_REO1_RING_BASE_LSB(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int ath12k_hal_reo1_ring_base_msb_offset(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return HAL_REO1_RING_BASE_MSB(ab) - HAL_REO1_RING_BASE_LSB(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int ath12k_hal_reo1_ring_producer_int_setup_offset(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return HAL_REO1_RING_PRODUCER_INT_SETUP(ab) - HAL_REO1_RING_BASE_LSB(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int ath12k_hal_reo1_ring_hp_addr_lsb_offset(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return HAL_REO1_RING_HP_ADDR_LSB(ab) - HAL_REO1_RING_BASE_LSB(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int ath12k_hal_reo1_ring_hp_addr_msb_offset(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return HAL_REO1_RING_HP_ADDR_MSB(ab) - HAL_REO1_RING_BASE_LSB(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int ath12k_hal_reo1_ring_misc_offset(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return HAL_REO1_RING_MISC(ab) - HAL_REO1_RING_BASE_LSB(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_qcn9274_rx_desc_get_first_msdu(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le16_get_bits(desc-&gt;u.qcn9274.msdu_end.info5,</div><div class='add'>+			       RX_MSDU_END_INFO5_FIRST_MSDU);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_qcn9274_rx_desc_get_last_msdu(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le16_get_bits(desc-&gt;u.qcn9274.msdu_end.info5,</div><div class='add'>+			       RX_MSDU_END_INFO5_LAST_MSDU);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_qcn9274_rx_desc_get_l3_pad_bytes(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le16_get_bits(desc-&gt;u.qcn9274.msdu_end.info5,</div><div class='add'>+			     RX_MSDU_END_INFO5_L3_HDR_PADDING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_qcn9274_rx_desc_encrypt_valid(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le32_get_bits(desc-&gt;u.qcn9274.mpdu_start.info4,</div><div class='add'>+			       RX_MPDU_START_INFO4_ENCRYPT_INFO_VALID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hw_qcn9274_rx_desc_get_encrypt_type(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.qcn9274.mpdu_start.info2,</div><div class='add'>+			     RX_MPDU_START_INFO2_ENC_TYPE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_qcn9274_rx_desc_get_decap_type(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.qcn9274.msdu_end.info11,</div><div class='add'>+			     RX_MSDU_END_INFO11_DECAP_FORMAT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_qcn9274_rx_desc_get_mesh_ctl(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.qcn9274.msdu_end.info11,</div><div class='add'>+			     RX_MSDU_END_INFO11_MESH_CTRL_PRESENT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_qcn9274_rx_desc_get_mpdu_seq_ctl_vld(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le32_get_bits(desc-&gt;u.qcn9274.mpdu_start.info4,</div><div class='add'>+			       RX_MPDU_START_INFO4_MPDU_SEQ_CTRL_VALID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_qcn9274_rx_desc_get_mpdu_fc_valid(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le32_get_bits(desc-&gt;u.qcn9274.mpdu_start.info4,</div><div class='add'>+			       RX_MPDU_START_INFO4_MPDU_FCTRL_VALID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath12k_hw_qcn9274_rx_desc_get_mpdu_start_seq_no(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.qcn9274.mpdu_start.info4,</div><div class='add'>+			     RX_MPDU_START_INFO4_MPDU_SEQ_NUM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath12k_hw_qcn9274_rx_desc_get_msdu_len(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.qcn9274.msdu_end.info10,</div><div class='add'>+			     RX_MSDU_END_INFO10_MSDU_LENGTH);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_qcn9274_rx_desc_get_msdu_sgi(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.qcn9274.msdu_end.info12,</div><div class='add'>+			     RX_MSDU_END_INFO12_SGI);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_qcn9274_rx_desc_get_msdu_rate_mcs(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.qcn9274.msdu_end.info12,</div><div class='add'>+			     RX_MSDU_END_INFO12_RATE_MCS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_qcn9274_rx_desc_get_msdu_rx_bw(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.qcn9274.msdu_end.info12,</div><div class='add'>+			     RX_MSDU_END_INFO12_RECV_BW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hw_qcn9274_rx_desc_get_msdu_freq(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return __le32_to_cpu(desc-&gt;u.qcn9274.msdu_end.phy_meta_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_qcn9274_rx_desc_get_msdu_pkt_type(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.qcn9274.msdu_end.info12,</div><div class='add'>+			     RX_MSDU_END_INFO12_PKT_TYPE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_qcn9274_rx_desc_get_msdu_nss(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.qcn9274.msdu_end.info12,</div><div class='add'>+			     RX_MSDU_END_INFO12_MIMO_SS_BITMAP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_qcn9274_rx_desc_get_mpdu_tid(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le16_get_bits(desc-&gt;u.qcn9274.msdu_end.info5,</div><div class='add'>+			    RX_MSDU_END_INFO5_TID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath12k_hw_qcn9274_rx_desc_get_mpdu_peer_id(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return __le16_to_cpu(desc-&gt;u.qcn9274.mpdu_start.sw_peer_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_hw_qcn9274_rx_desc_copy_end_tlv(struct hal_rx_desc *fdesc,</div><div class='add'>+						   struct hal_rx_desc *ldesc)</div><div class='add'>+{</div><div class='add'>+	memcpy(&amp;fdesc-&gt;u.qcn9274.msdu_end, &amp;ldesc-&gt;u.qcn9274.msdu_end,</div><div class='add'>+	       sizeof(struct rx_msdu_end_qcn9274));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hw_qcn9274_rx_desc_get_mpdu_ppdu_id(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return __le16_to_cpu(desc-&gt;u.qcn9274.mpdu_start.phy_ppdu_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_hw_qcn9274_rx_desc_set_msdu_len(struct hal_rx_desc *desc, u16 len)</div><div class='add'>+{</div><div class='add'>+	u32 info = __le32_to_cpu(desc-&gt;u.qcn9274.msdu_end.info10);</div><div class='add'>+</div><div class='add'>+	info &amp;= ~RX_MSDU_END_INFO10_MSDU_LENGTH;</div><div class='add'>+	info |= u32_encode_bits(len, RX_MSDU_END_INFO10_MSDU_LENGTH);</div><div class='add'>+</div><div class='add'>+	desc-&gt;u.qcn9274.msdu_end.info10 = __cpu_to_le32(info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *ath12k_hw_qcn9274_rx_desc_get_msdu_payload(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return &amp;desc-&gt;u.qcn9274.msdu_payload[0];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hw_qcn9274_rx_desc_get_mpdu_start_offset(void)</div><div class='add'>+{</div><div class='add'>+	return offsetof(struct hal_rx_desc_qcn9274, mpdu_start);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hw_qcn9274_rx_desc_get_msdu_end_offset(void)</div><div class='add'>+{</div><div class='add'>+	return offsetof(struct hal_rx_desc_qcn9274, msdu_end);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_qcn9274_rx_desc_mac_addr2_valid(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return __le32_to_cpu(desc-&gt;u.qcn9274.mpdu_start.info4) &amp;</div><div class='add'>+	       RX_MPDU_START_INFO4_MAC_ADDR2_VALID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *ath12k_hw_qcn9274_rx_desc_mpdu_start_addr2(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return desc-&gt;u.qcn9274.mpdu_start.addr2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_qcn9274_rx_desc_is_da_mcbc(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return __le16_to_cpu(desc-&gt;u.qcn9274.msdu_end.info5) &amp;</div><div class='add'>+	       RX_MSDU_END_INFO5_DA_IS_MCBC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_hw_qcn9274_rx_desc_get_dot11_hdr(struct hal_rx_desc *desc,</div><div class='add'>+						    struct ieee80211_hdr *hdr)</div><div class='add'>+{</div><div class='add'>+	hdr-&gt;frame_control = desc-&gt;u.qcn9274.mpdu_start.frame_ctrl;</div><div class='add'>+	hdr-&gt;duration_id = desc-&gt;u.qcn9274.mpdu_start.duration;</div><div class='add'>+	ether_addr_copy(hdr-&gt;addr1, desc-&gt;u.qcn9274.mpdu_start.addr1);</div><div class='add'>+	ether_addr_copy(hdr-&gt;addr2, desc-&gt;u.qcn9274.mpdu_start.addr2);</div><div class='add'>+	ether_addr_copy(hdr-&gt;addr3, desc-&gt;u.qcn9274.mpdu_start.addr3);</div><div class='add'>+	if (__le32_to_cpu(desc-&gt;u.qcn9274.mpdu_start.info4) &amp;</div><div class='add'>+			RX_MPDU_START_INFO4_MAC_ADDR4_VALID) {</div><div class='add'>+		ether_addr_copy(hdr-&gt;addr4, desc-&gt;u.qcn9274.mpdu_start.addr4);</div><div class='add'>+	}</div><div class='add'>+	hdr-&gt;seq_ctrl = desc-&gt;u.qcn9274.mpdu_start.seq_ctrl;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_hw_qcn9274_rx_desc_get_crypto_hdr(struct hal_rx_desc *desc,</div><div class='add'>+						     u8 *crypto_hdr,</div><div class='add'>+						     enum hal_encrypt_type enctype)</div><div class='add'>+{</div><div class='add'>+	unsigned int key_id;</div><div class='add'>+</div><div class='add'>+	switch (enctype) {</div><div class='add'>+	case HAL_ENCRYPT_TYPE_OPEN:</div><div class='add'>+		return;</div><div class='add'>+	case HAL_ENCRYPT_TYPE_TKIP_NO_MIC:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_TKIP_MIC:</div><div class='add'>+		crypto_hdr[0] =</div><div class='add'>+			HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc-&gt;u.qcn9274.mpdu_start.pn[0]);</div><div class='add'>+		crypto_hdr[1] = 0;</div><div class='add'>+		crypto_hdr[2] =</div><div class='add'>+			HAL_RX_MPDU_INFO_PN_GET_BYTE1(desc-&gt;u.qcn9274.mpdu_start.pn[0]);</div><div class='add'>+		break;</div><div class='add'>+	case HAL_ENCRYPT_TYPE_CCMP_128:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_CCMP_256:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_GCMP_128:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_AES_GCMP_256:</div><div class='add'>+		crypto_hdr[0] =</div><div class='add'>+			HAL_RX_MPDU_INFO_PN_GET_BYTE1(desc-&gt;u.qcn9274.mpdu_start.pn[0]);</div><div class='add'>+		crypto_hdr[1] =</div><div class='add'>+			HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc-&gt;u.qcn9274.mpdu_start.pn[0]);</div><div class='add'>+		crypto_hdr[2] = 0;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WEP_40:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WEP_104:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WEP_128:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WAPI_GCM_SM4:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WAPI:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	key_id = le32_get_bits(desc-&gt;u.qcn9274.mpdu_start.info5,</div><div class='add'>+			       RX_MPDU_START_INFO5_KEY_ID);</div><div class='add'>+	crypto_hdr[3] = 0x20 | (key_id &lt;&lt; 6);</div><div class='add'>+	crypto_hdr[4] = HAL_RX_MPDU_INFO_PN_GET_BYTE3(desc-&gt;u.qcn9274.mpdu_start.pn[0]);</div><div class='add'>+	crypto_hdr[5] = HAL_RX_MPDU_INFO_PN_GET_BYTE4(desc-&gt;u.qcn9274.mpdu_start.pn[0]);</div><div class='add'>+	crypto_hdr[6] = HAL_RX_MPDU_INFO_PN_GET_BYTE1(desc-&gt;u.qcn9274.mpdu_start.pn[1]);</div><div class='add'>+	crypto_hdr[7] = HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc-&gt;u.qcn9274.mpdu_start.pn[1]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_hal_srng_create_config_qcn9274(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hal *hal = &amp;ab-&gt;hal;</div><div class='add'>+	struct hal_srng_config *s;</div><div class='add'>+</div><div class='add'>+	hal-&gt;srng_config = kmemdup(hw_srng_config_template,</div><div class='add'>+				   sizeof(hw_srng_config_template),</div><div class='add'>+				   GFP_KERNEL);</div><div class='add'>+	if (!hal-&gt;srng_config)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_REO_DST];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO1_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO1_RING_HP;</div><div class='add'>+	s-&gt;reg_size[0] = HAL_REO2_RING_BASE_LSB(ab) - HAL_REO1_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_size[1] = HAL_REO2_RING_HP - HAL_REO1_RING_HP;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_REO_EXCEPTION];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO_SW0_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO_SW0_RING_HP;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_REO_REINJECT];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_SW2REO_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_SW2REO_RING_HP;</div><div class='add'>+	s-&gt;reg_size[0] = HAL_SW2REO1_RING_BASE_LSB(ab) - HAL_SW2REO_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_size[1] = HAL_SW2REO1_RING_HP - HAL_SW2REO_RING_HP;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_REO_CMD];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO_CMD_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO_CMD_HP;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_REO_STATUS];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO_STATUS_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO_STATUS_HP;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_TCL_DATA];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL1_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL1_RING_HP;</div><div class='add'>+	s-&gt;reg_size[0] = HAL_TCL2_RING_BASE_LSB(ab) - HAL_TCL1_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_size[1] = HAL_TCL2_RING_HP - HAL_TCL1_RING_HP;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_TCL_CMD];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL_RING_HP;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_TCL_STATUS];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL_STATUS_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL_STATUS_RING_HP;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_CE_SRC];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab) + HAL_CE_DST_RING_BASE_LSB;</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab) + HAL_CE_DST_RING_HP;</div><div class='add'>+	s-&gt;reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_SRC_REG(ab) -</div><div class='add'>+		HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab);</div><div class='add'>+	s-&gt;reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_SRC_REG(ab) -</div><div class='add'>+		HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab);</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_CE_DST];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_RING_BASE_LSB;</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_RING_HP;</div><div class='add'>+	s-&gt;reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) -</div><div class='add'>+		HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab);</div><div class='add'>+	s-&gt;reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) -</div><div class='add'>+		HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab);</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_CE_DST_STATUS];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) +</div><div class='add'>+		HAL_CE_DST_STATUS_RING_BASE_LSB;</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_STATUS_RING_HP;</div><div class='add'>+	s-&gt;reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) -</div><div class='add'>+		HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab);</div><div class='add'>+	s-&gt;reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) -</div><div class='add'>+		HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab);</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_WBM_IDLE_LINK];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_WBM_REG + HAL_WBM_IDLE_LINK_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_WBM_REG + HAL_WBM_IDLE_LINK_RING_HP;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_SW2WBM_RELEASE];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_WBM_REG +</div><div class='add'>+		HAL_WBM_SW_RELEASE_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_WBM_REG + HAL_WBM_SW_RELEASE_RING_HP;</div><div class='add'>+	s-&gt;reg_size[0] = HAL_WBM_SW1_RELEASE_RING_BASE_LSB(ab) -</div><div class='add'>+			 HAL_WBM_SW_RELEASE_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_size[1] = HAL_WBM_SW1_RELEASE_RING_HP - HAL_WBM_SW_RELEASE_RING_HP;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_WBM2SW_RELEASE];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_WBM_REG + HAL_WBM0_RELEASE_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_WBM_REG + HAL_WBM0_RELEASE_RING_HP;</div><div class='add'>+	s-&gt;reg_size[0] = HAL_WBM1_RELEASE_RING_BASE_LSB(ab) -</div><div class='add'>+		HAL_WBM0_RELEASE_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_size[1] = HAL_WBM1_RELEASE_RING_HP - HAL_WBM0_RELEASE_RING_HP;</div><div class='add'>+</div><div class='add'>+	/* Some LMAC rings are not accessed from the host:</div><div class='add'>+	 * RXDMA_BUG, RXDMA_DST, RXDMA_MONITOR_BUF, RXDMA_MONITOR_STATUS,</div><div class='add'>+	 * RXDMA_MONITOR_DST, RXDMA_MONITOR_DESC, RXDMA_DIR_BUF_SRC,</div><div class='add'>+	 * RXDMA_RX_MONITOR_BUF, TX_MONITOR_BUF, TX_MONITOR_DST, SW2RXDMA</div><div class='add'>+	 */</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_PPE2TCL];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL_PPE2TCL1_RING_BASE_LSB;</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL_PPE2TCL1_RING_HP;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_PPE_RELEASE];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_WBM_REG +</div><div class='add'>+				HAL_WBM_PPE_RELEASE_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_WBM_REG + HAL_WBM_PPE_RELEASE_RING_HP;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath12k_hal_qcn9274_rx_mpdu_start_wmask_get(void)</div><div class='add'>+{</div><div class='add'>+	return QCN9274_MPDU_START_WMASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hal_qcn9274_rx_msdu_end_wmask_get(void)</div><div class='add'>+{</div><div class='add'>+	return QCN9274_MSDU_END_WMASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hal_rx_ops *ath12k_hal_qcn9274_get_hal_rx_compact_ops(void)</div><div class='add'>+{</div><div class='add'>+	return &amp;hal_rx_qcn9274_compact_ops;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_qcn9274_dp_rx_h_msdu_done(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le32_get_bits(desc-&gt;u.qcn9274.msdu_end.info14,</div><div class='add'>+			       RX_MSDU_END_INFO14_MSDU_DONE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_qcn9274_dp_rx_h_l4_cksum_fail(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le32_get_bits(desc-&gt;u.qcn9274.msdu_end.info13,</div><div class='add'>+			       RX_MSDU_END_INFO13_TCP_UDP_CKSUM_FAIL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_qcn9274_dp_rx_h_ip_cksum_fail(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le32_get_bits(desc-&gt;u.qcn9274.msdu_end.info13,</div><div class='add'>+			       RX_MSDU_END_INFO13_IP_CKSUM_FAIL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_qcn9274_dp_rx_h_is_decrypted(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return (le32_get_bits(desc-&gt;u.qcn9274.msdu_end.info14,</div><div class='add'>+			      RX_MSDU_END_INFO14_DECRYPT_STATUS_CODE) ==</div><div class='add'>+			      RX_DESC_DECRYPT_STATUS_CODE_OK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hw_qcn9274_dp_rx_h_mpdu_err(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	u32 info = __le32_to_cpu(desc-&gt;u.qcn9274.msdu_end.info13);</div><div class='add'>+	u32 errmap = 0;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_FCS_ERR)</div><div class='add'>+		errmap |= HAL_RX_MPDU_ERR_FCS;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_DECRYPT_ERR)</div><div class='add'>+		errmap |= HAL_RX_MPDU_ERR_DECRYPT;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_TKIP_MIC_ERR)</div><div class='add'>+		errmap |= HAL_RX_MPDU_ERR_TKIP_MIC;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_A_MSDU_ERROR)</div><div class='add'>+		errmap |= HAL_RX_MPDU_ERR_AMSDU_ERR;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_OVERFLOW_ERR)</div><div class='add'>+		errmap |= HAL_RX_MPDU_ERR_OVERFLOW;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_MSDU_LEN_ERR)</div><div class='add'>+		errmap |= HAL_RX_MPDU_ERR_MSDU_LEN;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_MPDU_LEN_ERR)</div><div class='add'>+		errmap |= HAL_RX_MPDU_ERR_MPDU_LEN;</div><div class='add'>+</div><div class='add'>+	return errmap;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hw_qcn9274_get_rx_desc_size(void)</div><div class='add'>+{</div><div class='add'>+	return sizeof(struct hal_rx_desc_qcn9274);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_qcn9274_rx_desc_get_msdu_src_link(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct hal_rx_ops hal_rx_qcn9274_ops = {</div><div class='add'>+	.rx_desc_get_first_msdu = ath12k_hw_qcn9274_rx_desc_get_first_msdu,</div><div class='add'>+	.rx_desc_get_last_msdu = ath12k_hw_qcn9274_rx_desc_get_last_msdu,</div><div class='add'>+	.rx_desc_get_l3_pad_bytes = ath12k_hw_qcn9274_rx_desc_get_l3_pad_bytes,</div><div class='add'>+	.rx_desc_encrypt_valid = ath12k_hw_qcn9274_rx_desc_encrypt_valid,</div><div class='add'>+	.rx_desc_get_encrypt_type = ath12k_hw_qcn9274_rx_desc_get_encrypt_type,</div><div class='add'>+	.rx_desc_get_decap_type = ath12k_hw_qcn9274_rx_desc_get_decap_type,</div><div class='add'>+	.rx_desc_get_mesh_ctl = ath12k_hw_qcn9274_rx_desc_get_mesh_ctl,</div><div class='add'>+	.rx_desc_get_mpdu_seq_ctl_vld = ath12k_hw_qcn9274_rx_desc_get_mpdu_seq_ctl_vld,</div><div class='add'>+	.rx_desc_get_mpdu_fc_valid = ath12k_hw_qcn9274_rx_desc_get_mpdu_fc_valid,</div><div class='add'>+	.rx_desc_get_mpdu_start_seq_no = ath12k_hw_qcn9274_rx_desc_get_mpdu_start_seq_no,</div><div class='add'>+	.rx_desc_get_msdu_len = ath12k_hw_qcn9274_rx_desc_get_msdu_len,</div><div class='add'>+	.rx_desc_get_msdu_sgi = ath12k_hw_qcn9274_rx_desc_get_msdu_sgi,</div><div class='add'>+	.rx_desc_get_msdu_rate_mcs = ath12k_hw_qcn9274_rx_desc_get_msdu_rate_mcs,</div><div class='add'>+	.rx_desc_get_msdu_rx_bw = ath12k_hw_qcn9274_rx_desc_get_msdu_rx_bw,</div><div class='add'>+	.rx_desc_get_msdu_freq = ath12k_hw_qcn9274_rx_desc_get_msdu_freq,</div><div class='add'>+	.rx_desc_get_msdu_pkt_type = ath12k_hw_qcn9274_rx_desc_get_msdu_pkt_type,</div><div class='add'>+	.rx_desc_get_msdu_nss = ath12k_hw_qcn9274_rx_desc_get_msdu_nss,</div><div class='add'>+	.rx_desc_get_mpdu_tid = ath12k_hw_qcn9274_rx_desc_get_mpdu_tid,</div><div class='add'>+	.rx_desc_get_mpdu_peer_id = ath12k_hw_qcn9274_rx_desc_get_mpdu_peer_id,</div><div class='add'>+	.rx_desc_copy_end_tlv = ath12k_hw_qcn9274_rx_desc_copy_end_tlv,</div><div class='add'>+	.rx_desc_get_mpdu_ppdu_id = ath12k_hw_qcn9274_rx_desc_get_mpdu_ppdu_id,</div><div class='add'>+	.rx_desc_set_msdu_len = ath12k_hw_qcn9274_rx_desc_set_msdu_len,</div><div class='add'>+	.rx_desc_get_msdu_payload = ath12k_hw_qcn9274_rx_desc_get_msdu_payload,</div><div class='add'>+	.rx_desc_get_mpdu_start_offset = ath12k_hw_qcn9274_rx_desc_get_mpdu_start_offset,</div><div class='add'>+	.rx_desc_get_msdu_end_offset = ath12k_hw_qcn9274_rx_desc_get_msdu_end_offset,</div><div class='add'>+	.rx_desc_mac_addr2_valid = ath12k_hw_qcn9274_rx_desc_mac_addr2_valid,</div><div class='add'>+	.rx_desc_mpdu_start_addr2 = ath12k_hw_qcn9274_rx_desc_mpdu_start_addr2,</div><div class='add'>+	.rx_desc_is_da_mcbc = ath12k_hw_qcn9274_rx_desc_is_da_mcbc,</div><div class='add'>+	.rx_desc_get_dot11_hdr = ath12k_hw_qcn9274_rx_desc_get_dot11_hdr,</div><div class='add'>+	.rx_desc_get_crypto_header = ath12k_hw_qcn9274_rx_desc_get_crypto_hdr,</div><div class='add'>+	.dp_rx_h_msdu_done = ath12k_hw_qcn9274_dp_rx_h_msdu_done,</div><div class='add'>+	.dp_rx_h_l4_cksum_fail = ath12k_hw_qcn9274_dp_rx_h_l4_cksum_fail,</div><div class='add'>+	.dp_rx_h_ip_cksum_fail = ath12k_hw_qcn9274_dp_rx_h_ip_cksum_fail,</div><div class='add'>+	.dp_rx_h_is_decrypted = ath12k_hw_qcn9274_dp_rx_h_is_decrypted,</div><div class='add'>+	.dp_rx_h_mpdu_err = ath12k_hw_qcn9274_dp_rx_h_mpdu_err,</div><div class='add'>+	.rx_desc_get_desc_size = ath12k_hw_qcn9274_get_rx_desc_size,</div><div class='add'>+	.rx_desc_get_msdu_src_link_id = ath12k_hw_qcn9274_rx_desc_get_msdu_src_link,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_qcn9274_compact_rx_desc_get_first_msdu(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le16_get_bits(desc-&gt;u.qcn9274_compact.msdu_end.info5,</div><div class='add'>+			       RX_MSDU_END_INFO5_FIRST_MSDU);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_qcn9274_compact_rx_desc_get_last_msdu(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le16_get_bits(desc-&gt;u.qcn9274_compact.msdu_end.info5,</div><div class='add'>+			       RX_MSDU_END_INFO5_LAST_MSDU);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_qcn9274_compact_rx_desc_get_l3_pad_bytes(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le16_get_bits(desc-&gt;u.qcn9274_compact.msdu_end.info5,</div><div class='add'>+			     RX_MSDU_END_INFO5_L3_HDR_PADDING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_qcn9274_compact_rx_desc_encrypt_valid(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le32_get_bits(desc-&gt;u.qcn9274_compact.mpdu_start.info4,</div><div class='add'>+			       RX_MPDU_START_INFO4_ENCRYPT_INFO_VALID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hw_qcn9274_compact_rx_desc_get_encrypt_type(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.qcn9274_compact.mpdu_start.info2,</div><div class='add'>+			     RX_MPDU_START_INFO2_ENC_TYPE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_qcn9274_compact_rx_desc_get_decap_type(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.qcn9274_compact.msdu_end.info11,</div><div class='add'>+			     RX_MSDU_END_INFO11_DECAP_FORMAT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_qcn9274_compact_rx_desc_get_mesh_ctl(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.qcn9274.msdu_end.info11,</div><div class='add'>+			     RX_MSDU_END_INFO11_MESH_CTRL_PRESENT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+ath12k_hw_qcn9274_compact_rx_desc_get_mpdu_seq_ctl_vld(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le32_get_bits(desc-&gt;u.qcn9274_compact.mpdu_start.info4,</div><div class='add'>+			       RX_MPDU_START_INFO4_MPDU_SEQ_CTRL_VALID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_qcn9274_compact_rx_desc_get_mpdu_fc_valid(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le32_get_bits(desc-&gt;u.qcn9274_compact.mpdu_start.info4,</div><div class='add'>+			       RX_MPDU_START_INFO4_MPDU_FCTRL_VALID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16</div><div class='add'>+ath12k_hw_qcn9274_compact_rx_desc_get_mpdu_start_seq_no(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.qcn9274_compact.mpdu_start.info4,</div><div class='add'>+			     RX_MPDU_START_INFO4_MPDU_SEQ_NUM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath12k_hw_qcn9274_compact_rx_desc_get_msdu_len(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.qcn9274_compact.msdu_end.info10,</div><div class='add'>+			     RX_MSDU_END_INFO10_MSDU_LENGTH);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_qcn9274_compact_rx_desc_get_msdu_sgi(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.qcn9274_compact.msdu_end.info12,</div><div class='add'>+			     RX_MSDU_END_INFO12_SGI);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_qcn9274_compact_rx_desc_get_msdu_rate_mcs(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.qcn9274_compact.msdu_end.info12,</div><div class='add'>+			     RX_MSDU_END_INFO12_RATE_MCS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_qcn9274_compact_rx_desc_get_msdu_rx_bw(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.qcn9274_compact.msdu_end.info12,</div><div class='add'>+			     RX_MSDU_END_INFO12_RECV_BW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hw_qcn9274_compact_rx_desc_get_msdu_freq(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return __le32_to_cpu(desc-&gt;u.qcn9274_compact.msdu_end.phy_meta_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_qcn9274_compact_rx_desc_get_msdu_pkt_type(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.qcn9274_compact.msdu_end.info12,</div><div class='add'>+			     RX_MSDU_END_INFO12_PKT_TYPE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_qcn9274_compact_rx_desc_get_msdu_nss(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.qcn9274_compact.msdu_end.info12,</div><div class='add'>+			     RX_MSDU_END_INFO12_MIMO_SS_BITMAP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_qcn9274_compact_rx_desc_get_mpdu_tid(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le16_get_bits(desc-&gt;u.qcn9274_compact.msdu_end.info5,</div><div class='add'>+			     RX_MSDU_END_INFO5_TID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath12k_hw_qcn9274_compact_rx_desc_get_mpdu_peer_id(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return __le16_to_cpu(desc-&gt;u.qcn9274_compact.mpdu_start.sw_peer_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_hw_qcn9274_compact_rx_desc_copy_end_tlv(struct hal_rx_desc *fdesc,</div><div class='add'>+							   struct hal_rx_desc *ldesc)</div><div class='add'>+{</div><div class='add'>+	fdesc-&gt;u.qcn9274_compact.msdu_end = ldesc-&gt;u.qcn9274_compact.msdu_end;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hw_qcn9274_compact_rx_desc_get_mpdu_ppdu_id(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return __le16_to_cpu(desc-&gt;u.qcn9274_compact.mpdu_start.phy_ppdu_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_hw_qcn9274_compact_rx_desc_set_msdu_len(struct hal_rx_desc *desc, u16 len)</div><div class='add'>+{</div><div class='add'>+	u32 info = __le32_to_cpu(desc-&gt;u.qcn9274_compact.msdu_end.info10);</div><div class='add'>+</div><div class='add'>+	info = u32_replace_bits(info, len, RX_MSDU_END_INFO10_MSDU_LENGTH);</div><div class='add'>+	desc-&gt;u.qcn9274_compact.msdu_end.info10 = __cpu_to_le32(info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *ath12k_hw_qcn9274_compact_rx_desc_get_msdu_payload(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return &amp;desc-&gt;u.qcn9274_compact.msdu_payload[0];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hw_qcn9274_compact_rx_desc_get_mpdu_start_offset(void)</div><div class='add'>+{</div><div class='add'>+	return offsetof(struct hal_rx_desc_qcn9274_compact, mpdu_start);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hw_qcn9274_compact_rx_desc_get_msdu_end_offset(void)</div><div class='add'>+{</div><div class='add'>+	return offsetof(struct hal_rx_desc_qcn9274_compact, msdu_end);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_qcn9274_compact_rx_desc_mac_addr2_valid(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return __le32_to_cpu(desc-&gt;u.qcn9274_compact.mpdu_start.info4) &amp;</div><div class='add'>+			     RX_MPDU_START_INFO4_MAC_ADDR2_VALID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *ath12k_hw_qcn9274_compact_rx_desc_mpdu_start_addr2(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return desc-&gt;u.qcn9274_compact.mpdu_start.addr2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_qcn9274_compact_rx_desc_is_da_mcbc(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return __le16_to_cpu(desc-&gt;u.qcn9274_compact.msdu_end.info5) &amp;</div><div class='add'>+	       RX_MSDU_END_INFO5_DA_IS_MCBC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_hw_qcn9274_compact_rx_desc_get_dot11_hdr(struct hal_rx_desc *desc,</div><div class='add'>+							    struct ieee80211_hdr *hdr)</div><div class='add'>+{</div><div class='add'>+	hdr-&gt;frame_control = desc-&gt;u.qcn9274_compact.mpdu_start.frame_ctrl;</div><div class='add'>+	hdr-&gt;duration_id = desc-&gt;u.qcn9274_compact.mpdu_start.duration;</div><div class='add'>+	ether_addr_copy(hdr-&gt;addr1, desc-&gt;u.qcn9274_compact.mpdu_start.addr1);</div><div class='add'>+	ether_addr_copy(hdr-&gt;addr2, desc-&gt;u.qcn9274_compact.mpdu_start.addr2);</div><div class='add'>+	ether_addr_copy(hdr-&gt;addr3, desc-&gt;u.qcn9274_compact.mpdu_start.addr3);</div><div class='add'>+	if (__le32_to_cpu(desc-&gt;u.qcn9274_compact.mpdu_start.info4) &amp;</div><div class='add'>+			RX_MPDU_START_INFO4_MAC_ADDR4_VALID) {</div><div class='add'>+		ether_addr_copy(hdr-&gt;addr4, desc-&gt;u.qcn9274_compact.mpdu_start.addr4);</div><div class='add'>+	}</div><div class='add'>+	hdr-&gt;seq_ctrl = desc-&gt;u.qcn9274_compact.mpdu_start.seq_ctrl;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_hw_qcn9274_compact_rx_desc_get_crypto_hdr(struct hal_rx_desc *desc,</div><div class='add'>+						 u8 *crypto_hdr,</div><div class='add'>+						 enum hal_encrypt_type enctype)</div><div class='add'>+{</div><div class='add'>+	unsigned int key_id;</div><div class='add'>+</div><div class='add'>+	switch (enctype) {</div><div class='add'>+	case HAL_ENCRYPT_TYPE_OPEN:</div><div class='add'>+		return;</div><div class='add'>+	case HAL_ENCRYPT_TYPE_TKIP_NO_MIC:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_TKIP_MIC:</div><div class='add'>+		crypto_hdr[0] =</div><div class='add'>+		HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc-&gt;u.qcn9274_compact.mpdu_start.pn[0]);</div><div class='add'>+		crypto_hdr[1] = 0;</div><div class='add'>+		crypto_hdr[2] =</div><div class='add'>+		HAL_RX_MPDU_INFO_PN_GET_BYTE1(desc-&gt;u.qcn9274_compact.mpdu_start.pn[0]);</div><div class='add'>+		break;</div><div class='add'>+	case HAL_ENCRYPT_TYPE_CCMP_128:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_CCMP_256:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_GCMP_128:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_AES_GCMP_256:</div><div class='add'>+		crypto_hdr[0] =</div><div class='add'>+		HAL_RX_MPDU_INFO_PN_GET_BYTE1(desc-&gt;u.qcn9274_compact.mpdu_start.pn[0]);</div><div class='add'>+		crypto_hdr[1] =</div><div class='add'>+		HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc-&gt;u.qcn9274_compact.mpdu_start.pn[0]);</div><div class='add'>+		crypto_hdr[2] = 0;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WEP_40:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WEP_104:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WEP_128:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WAPI_GCM_SM4:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WAPI:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	key_id = le32_get_bits(desc-&gt;u.qcn9274_compact.mpdu_start.info5,</div><div class='add'>+			       RX_MPDU_START_INFO5_KEY_ID);</div><div class='add'>+	crypto_hdr[3] = 0x20 | (key_id &lt;&lt; 6);</div><div class='add'>+	crypto_hdr[4] =</div><div class='add'>+		HAL_RX_MPDU_INFO_PN_GET_BYTE3(desc-&gt;u.qcn9274_compact.mpdu_start.pn[0]);</div><div class='add'>+	crypto_hdr[5] =</div><div class='add'>+		HAL_RX_MPDU_INFO_PN_GET_BYTE4(desc-&gt;u.qcn9274_compact.mpdu_start.pn[0]);</div><div class='add'>+	crypto_hdr[6] =</div><div class='add'>+		HAL_RX_MPDU_INFO_PN_GET_BYTE1(desc-&gt;u.qcn9274_compact.mpdu_start.pn[1]);</div><div class='add'>+	crypto_hdr[7] =</div><div class='add'>+		HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc-&gt;u.qcn9274_compact.mpdu_start.pn[1]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_qcn9274_compact_dp_rx_h_msdu_done(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le32_get_bits(desc-&gt;u.qcn9274_compact.msdu_end.info14,</div><div class='add'>+			       RX_MSDU_END_INFO14_MSDU_DONE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_qcn9274_compact_dp_rx_h_l4_cksum_fail(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le32_get_bits(desc-&gt;u.qcn9274_compact.msdu_end.info13,</div><div class='add'>+			       RX_MSDU_END_INFO13_TCP_UDP_CKSUM_FAIL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_qcn9274_compact_dp_rx_h_ip_cksum_fail(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le32_get_bits(desc-&gt;u.qcn9274_compact.msdu_end.info13,</div><div class='add'>+			       RX_MSDU_END_INFO13_IP_CKSUM_FAIL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_qcn9274_compact_dp_rx_h_is_decrypted(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return (le32_get_bits(desc-&gt;u.qcn9274_compact.msdu_end.info14,</div><div class='add'>+			      RX_MSDU_END_INFO14_DECRYPT_STATUS_CODE) ==</div><div class='add'>+			RX_DESC_DECRYPT_STATUS_CODE_OK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hw_qcn9274_compact_dp_rx_h_mpdu_err(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	u32 info = __le32_to_cpu(desc-&gt;u.qcn9274_compact.msdu_end.info13);</div><div class='add'>+	u32 errmap = 0;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_FCS_ERR)</div><div class='add'>+		errmap |= HAL_RX_MPDU_ERR_FCS;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_DECRYPT_ERR)</div><div class='add'>+		errmap |= HAL_RX_MPDU_ERR_DECRYPT;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_TKIP_MIC_ERR)</div><div class='add'>+		errmap |= HAL_RX_MPDU_ERR_TKIP_MIC;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_A_MSDU_ERROR)</div><div class='add'>+		errmap |= HAL_RX_MPDU_ERR_AMSDU_ERR;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_OVERFLOW_ERR)</div><div class='add'>+		errmap |= HAL_RX_MPDU_ERR_OVERFLOW;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_MSDU_LEN_ERR)</div><div class='add'>+		errmap |= HAL_RX_MPDU_ERR_MSDU_LEN;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_MPDU_LEN_ERR)</div><div class='add'>+		errmap |= HAL_RX_MPDU_ERR_MPDU_LEN;</div><div class='add'>+</div><div class='add'>+	return errmap;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hw_qcn9274_compact_get_rx_desc_size(void)</div><div class='add'>+{</div><div class='add'>+	return sizeof(struct hal_rx_desc_qcn9274_compact);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_qcn9274_compact_rx_desc_get_msdu_src_link(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le64_get_bits(desc-&gt;u.qcn9274_compact.msdu_end.msdu_end_tag,</div><div class='add'>+			     RX_MSDU_END_64_TLV_SRC_LINK_ID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct hal_rx_ops hal_rx_qcn9274_compact_ops = {</div><div class='add'>+	.rx_desc_get_first_msdu = ath12k_hw_qcn9274_compact_rx_desc_get_first_msdu,</div><div class='add'>+	.rx_desc_get_last_msdu = ath12k_hw_qcn9274_compact_rx_desc_get_last_msdu,</div><div class='add'>+	.rx_desc_get_l3_pad_bytes = ath12k_hw_qcn9274_compact_rx_desc_get_l3_pad_bytes,</div><div class='add'>+	.rx_desc_encrypt_valid = ath12k_hw_qcn9274_compact_rx_desc_encrypt_valid,</div><div class='add'>+	.rx_desc_get_encrypt_type = ath12k_hw_qcn9274_compact_rx_desc_get_encrypt_type,</div><div class='add'>+	.rx_desc_get_decap_type = ath12k_hw_qcn9274_compact_rx_desc_get_decap_type,</div><div class='add'>+	.rx_desc_get_mesh_ctl = ath12k_hw_qcn9274_compact_rx_desc_get_mesh_ctl,</div><div class='add'>+	.rx_desc_get_mpdu_seq_ctl_vld =</div><div class='add'>+		ath12k_hw_qcn9274_compact_rx_desc_get_mpdu_seq_ctl_vld,</div><div class='add'>+	.rx_desc_get_mpdu_fc_valid = ath12k_hw_qcn9274_compact_rx_desc_get_mpdu_fc_valid,</div><div class='add'>+	.rx_desc_get_mpdu_start_seq_no =</div><div class='add'>+		ath12k_hw_qcn9274_compact_rx_desc_get_mpdu_start_seq_no,</div><div class='add'>+	.rx_desc_get_msdu_len = ath12k_hw_qcn9274_compact_rx_desc_get_msdu_len,</div><div class='add'>+	.rx_desc_get_msdu_sgi = ath12k_hw_qcn9274_compact_rx_desc_get_msdu_sgi,</div><div class='add'>+	.rx_desc_get_msdu_rate_mcs = ath12k_hw_qcn9274_compact_rx_desc_get_msdu_rate_mcs,</div><div class='add'>+	.rx_desc_get_msdu_rx_bw = ath12k_hw_qcn9274_compact_rx_desc_get_msdu_rx_bw,</div><div class='add'>+	.rx_desc_get_msdu_freq = ath12k_hw_qcn9274_compact_rx_desc_get_msdu_freq,</div><div class='add'>+	.rx_desc_get_msdu_pkt_type = ath12k_hw_qcn9274_compact_rx_desc_get_msdu_pkt_type,</div><div class='add'>+	.rx_desc_get_msdu_nss = ath12k_hw_qcn9274_compact_rx_desc_get_msdu_nss,</div><div class='add'>+	.rx_desc_get_mpdu_tid = ath12k_hw_qcn9274_compact_rx_desc_get_mpdu_tid,</div><div class='add'>+	.rx_desc_get_mpdu_peer_id = ath12k_hw_qcn9274_compact_rx_desc_get_mpdu_peer_id,</div><div class='add'>+	.rx_desc_copy_end_tlv = ath12k_hw_qcn9274_compact_rx_desc_copy_end_tlv,</div><div class='add'>+	.rx_desc_get_mpdu_ppdu_id = ath12k_hw_qcn9274_compact_rx_desc_get_mpdu_ppdu_id,</div><div class='add'>+	.rx_desc_set_msdu_len = ath12k_hw_qcn9274_compact_rx_desc_set_msdu_len,</div><div class='add'>+	.rx_desc_get_msdu_payload = ath12k_hw_qcn9274_compact_rx_desc_get_msdu_payload,</div><div class='add'>+	.rx_desc_get_mpdu_start_offset =</div><div class='add'>+		ath12k_hw_qcn9274_compact_rx_desc_get_mpdu_start_offset,</div><div class='add'>+	.rx_desc_get_msdu_end_offset =</div><div class='add'>+		ath12k_hw_qcn9274_compact_rx_desc_get_msdu_end_offset,</div><div class='add'>+	.rx_desc_mac_addr2_valid = ath12k_hw_qcn9274_compact_rx_desc_mac_addr2_valid,</div><div class='add'>+	.rx_desc_mpdu_start_addr2 = ath12k_hw_qcn9274_compact_rx_desc_mpdu_start_addr2,</div><div class='add'>+	.rx_desc_is_da_mcbc = ath12k_hw_qcn9274_compact_rx_desc_is_da_mcbc,</div><div class='add'>+	.rx_desc_get_dot11_hdr = ath12k_hw_qcn9274_compact_rx_desc_get_dot11_hdr,</div><div class='add'>+	.rx_desc_get_crypto_header = ath12k_hw_qcn9274_compact_rx_desc_get_crypto_hdr,</div><div class='add'>+	.dp_rx_h_msdu_done = ath12k_hw_qcn9274_compact_dp_rx_h_msdu_done,</div><div class='add'>+	.dp_rx_h_l4_cksum_fail = ath12k_hw_qcn9274_compact_dp_rx_h_l4_cksum_fail,</div><div class='add'>+	.dp_rx_h_ip_cksum_fail = ath12k_hw_qcn9274_compact_dp_rx_h_ip_cksum_fail,</div><div class='add'>+	.dp_rx_h_is_decrypted = ath12k_hw_qcn9274_compact_dp_rx_h_is_decrypted,</div><div class='add'>+	.dp_rx_h_mpdu_err = ath12k_hw_qcn9274_compact_dp_rx_h_mpdu_err,</div><div class='add'>+	.rx_desc_get_desc_size = ath12k_hw_qcn9274_compact_get_rx_desc_size,</div><div class='add'>+	.rx_desc_get_msdu_src_link_id =</div><div class='add'>+		ath12k_hw_qcn9274_compact_rx_desc_get_msdu_src_link,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct hal_ops hal_qcn9274_ops = {</div><div class='add'>+	.create_srng_config = ath12k_hal_srng_create_config_qcn9274,</div><div class='add'>+	.tcl_to_wbm_rbm_map = ath12k_hal_qcn9274_tcl_to_wbm_rbm_map,</div><div class='add'>+	.rxdma_ring_wmask_rx_mpdu_start = ath12k_hal_qcn9274_rx_mpdu_start_wmask_get,</div><div class='add'>+	.rxdma_ring_wmask_rx_msdu_end = ath12k_hal_qcn9274_rx_msdu_end_wmask_get,</div><div class='add'>+	.get_hal_rx_compact_ops = ath12k_hal_qcn9274_get_hal_rx_compact_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_wcn7850_rx_desc_get_first_msdu(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le16_get_bits(desc-&gt;u.wcn7850.msdu_end.info5,</div><div class='add'>+			       RX_MSDU_END_INFO5_FIRST_MSDU);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_wcn7850_rx_desc_get_last_msdu(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le16_get_bits(desc-&gt;u.wcn7850.msdu_end.info5,</div><div class='add'>+			       RX_MSDU_END_INFO5_LAST_MSDU);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_wcn7850_rx_desc_get_l3_pad_bytes(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le16_get_bits(desc-&gt;u.wcn7850.msdu_end.info5,</div><div class='add'>+			    RX_MSDU_END_INFO5_L3_HDR_PADDING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_wcn7850_rx_desc_encrypt_valid(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le32_get_bits(desc-&gt;u.wcn7850.mpdu_start.info4,</div><div class='add'>+			       RX_MPDU_START_INFO4_ENCRYPT_INFO_VALID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hw_wcn7850_rx_desc_get_encrypt_type(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.wcn7850.mpdu_start.info2,</div><div class='add'>+			     RX_MPDU_START_INFO2_ENC_TYPE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_wcn7850_rx_desc_get_decap_type(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.wcn7850.msdu_end.info11,</div><div class='add'>+			     RX_MSDU_END_INFO11_DECAP_FORMAT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_wcn7850_rx_desc_get_mesh_ctl(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.wcn7850.msdu_end.info11,</div><div class='add'>+			     RX_MSDU_END_INFO11_MESH_CTRL_PRESENT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_wcn7850_rx_desc_get_mpdu_seq_ctl_vld(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le32_get_bits(desc-&gt;u.wcn7850.mpdu_start.info4,</div><div class='add'>+			       RX_MPDU_START_INFO4_MPDU_SEQ_CTRL_VALID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_wcn7850_rx_desc_get_mpdu_fc_valid(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le32_get_bits(desc-&gt;u.wcn7850.mpdu_start.info4,</div><div class='add'>+			       RX_MPDU_START_INFO4_MPDU_FCTRL_VALID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath12k_hw_wcn7850_rx_desc_get_mpdu_start_seq_no(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.wcn7850.mpdu_start.info4,</div><div class='add'>+			     RX_MPDU_START_INFO4_MPDU_SEQ_NUM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath12k_hw_wcn7850_rx_desc_get_msdu_len(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.wcn7850.msdu_end.info10,</div><div class='add'>+			     RX_MSDU_END_INFO10_MSDU_LENGTH);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_wcn7850_rx_desc_get_msdu_sgi(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.wcn7850.msdu_end.info12,</div><div class='add'>+			     RX_MSDU_END_INFO12_SGI);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_wcn7850_rx_desc_get_msdu_rate_mcs(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.wcn7850.msdu_end.info12,</div><div class='add'>+			     RX_MSDU_END_INFO12_RATE_MCS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_wcn7850_rx_desc_get_msdu_rx_bw(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.wcn7850.msdu_end.info12,</div><div class='add'>+			     RX_MSDU_END_INFO12_RECV_BW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hw_wcn7850_rx_desc_get_msdu_freq(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return __le32_to_cpu(desc-&gt;u.wcn7850.msdu_end.phy_meta_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_wcn7850_rx_desc_get_msdu_pkt_type(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.wcn7850.msdu_end.info12,</div><div class='add'>+			     RX_MSDU_END_INFO12_PKT_TYPE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_wcn7850_rx_desc_get_msdu_nss(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.wcn7850.msdu_end.info12,</div><div class='add'>+			     RX_MSDU_END_INFO12_MIMO_SS_BITMAP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_wcn7850_rx_desc_get_mpdu_tid(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(desc-&gt;u.wcn7850.mpdu_start.info2,</div><div class='add'>+			     RX_MPDU_START_INFO2_TID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath12k_hw_wcn7850_rx_desc_get_mpdu_peer_id(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return __le16_to_cpu(desc-&gt;u.wcn7850.mpdu_start.sw_peer_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_hw_wcn7850_rx_desc_copy_end_tlv(struct hal_rx_desc *fdesc,</div><div class='add'>+						   struct hal_rx_desc *ldesc)</div><div class='add'>+{</div><div class='add'>+	memcpy(&amp;fdesc-&gt;u.wcn7850.msdu_end, &amp;ldesc-&gt;u.wcn7850.msdu_end,</div><div class='add'>+	       sizeof(struct rx_msdu_end_qcn9274));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hw_wcn7850_rx_desc_get_mpdu_start_tag(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return le64_get_bits(desc-&gt;u.wcn7850.mpdu_start_tag,</div><div class='add'>+			    HAL_TLV_HDR_TAG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hw_wcn7850_rx_desc_get_mpdu_ppdu_id(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return __le16_to_cpu(desc-&gt;u.wcn7850.mpdu_start.phy_ppdu_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_hw_wcn7850_rx_desc_set_msdu_len(struct hal_rx_desc *desc, u16 len)</div><div class='add'>+{</div><div class='add'>+	u32 info = __le32_to_cpu(desc-&gt;u.wcn7850.msdu_end.info10);</div><div class='add'>+</div><div class='add'>+	info &amp;= ~RX_MSDU_END_INFO10_MSDU_LENGTH;</div><div class='add'>+	info |= u32_encode_bits(len, RX_MSDU_END_INFO10_MSDU_LENGTH);</div><div class='add'>+</div><div class='add'>+	desc-&gt;u.wcn7850.msdu_end.info10 = __cpu_to_le32(info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *ath12k_hw_wcn7850_rx_desc_get_msdu_payload(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return &amp;desc-&gt;u.wcn7850.msdu_payload[0];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hw_wcn7850_rx_desc_get_mpdu_start_offset(void)</div><div class='add'>+{</div><div class='add'>+	return offsetof(struct hal_rx_desc_wcn7850, mpdu_start_tag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hw_wcn7850_rx_desc_get_msdu_end_offset(void)</div><div class='add'>+{</div><div class='add'>+	return offsetof(struct hal_rx_desc_wcn7850, msdu_end_tag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_wcn7850_rx_desc_mac_addr2_valid(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return __le32_to_cpu(desc-&gt;u.wcn7850.mpdu_start.info4) &amp;</div><div class='add'>+	       RX_MPDU_START_INFO4_MAC_ADDR2_VALID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *ath12k_hw_wcn7850_rx_desc_mpdu_start_addr2(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return desc-&gt;u.wcn7850.mpdu_start.addr2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_wcn7850_rx_desc_is_da_mcbc(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return __le32_to_cpu(desc-&gt;u.wcn7850.msdu_end.info13) &amp;</div><div class='add'>+	       RX_MSDU_END_INFO13_MCAST_BCAST;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_hw_wcn7850_rx_desc_get_dot11_hdr(struct hal_rx_desc *desc,</div><div class='add'>+						    struct ieee80211_hdr *hdr)</div><div class='add'>+{</div><div class='add'>+	hdr-&gt;frame_control = desc-&gt;u.wcn7850.mpdu_start.frame_ctrl;</div><div class='add'>+	hdr-&gt;duration_id = desc-&gt;u.wcn7850.mpdu_start.duration;</div><div class='add'>+	ether_addr_copy(hdr-&gt;addr1, desc-&gt;u.wcn7850.mpdu_start.addr1);</div><div class='add'>+	ether_addr_copy(hdr-&gt;addr2, desc-&gt;u.wcn7850.mpdu_start.addr2);</div><div class='add'>+	ether_addr_copy(hdr-&gt;addr3, desc-&gt;u.wcn7850.mpdu_start.addr3);</div><div class='add'>+	if (__le32_to_cpu(desc-&gt;u.wcn7850.mpdu_start.info4) &amp;</div><div class='add'>+			RX_MPDU_START_INFO4_MAC_ADDR4_VALID) {</div><div class='add'>+		ether_addr_copy(hdr-&gt;addr4, desc-&gt;u.wcn7850.mpdu_start.addr4);</div><div class='add'>+	}</div><div class='add'>+	hdr-&gt;seq_ctrl = desc-&gt;u.wcn7850.mpdu_start.seq_ctrl;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_hw_wcn7850_rx_desc_get_crypto_hdr(struct hal_rx_desc *desc,</div><div class='add'>+						     u8 *crypto_hdr,</div><div class='add'>+						     enum hal_encrypt_type enctype)</div><div class='add'>+{</div><div class='add'>+	unsigned int key_id;</div><div class='add'>+</div><div class='add'>+	switch (enctype) {</div><div class='add'>+	case HAL_ENCRYPT_TYPE_OPEN:</div><div class='add'>+		return;</div><div class='add'>+	case HAL_ENCRYPT_TYPE_TKIP_NO_MIC:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_TKIP_MIC:</div><div class='add'>+		crypto_hdr[0] =</div><div class='add'>+			HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc-&gt;u.wcn7850.mpdu_start.pn[0]);</div><div class='add'>+		crypto_hdr[1] = 0;</div><div class='add'>+		crypto_hdr[2] =</div><div class='add'>+			HAL_RX_MPDU_INFO_PN_GET_BYTE1(desc-&gt;u.wcn7850.mpdu_start.pn[0]);</div><div class='add'>+		break;</div><div class='add'>+	case HAL_ENCRYPT_TYPE_CCMP_128:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_CCMP_256:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_GCMP_128:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_AES_GCMP_256:</div><div class='add'>+		crypto_hdr[0] =</div><div class='add'>+			HAL_RX_MPDU_INFO_PN_GET_BYTE1(desc-&gt;u.wcn7850.mpdu_start.pn[0]);</div><div class='add'>+		crypto_hdr[1] =</div><div class='add'>+			HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc-&gt;u.wcn7850.mpdu_start.pn[0]);</div><div class='add'>+		crypto_hdr[2] = 0;</div><div class='add'>+		break;</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WEP_40:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WEP_104:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WEP_128:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WAPI_GCM_SM4:</div><div class='add'>+	case HAL_ENCRYPT_TYPE_WAPI:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	key_id = u32_get_bits(__le32_to_cpu(desc-&gt;u.wcn7850.mpdu_start.info5),</div><div class='add'>+			      RX_MPDU_START_INFO5_KEY_ID);</div><div class='add'>+	crypto_hdr[3] = 0x20 | (key_id &lt;&lt; 6);</div><div class='add'>+	crypto_hdr[4] = HAL_RX_MPDU_INFO_PN_GET_BYTE3(desc-&gt;u.wcn7850.mpdu_start.pn[0]);</div><div class='add'>+	crypto_hdr[5] = HAL_RX_MPDU_INFO_PN_GET_BYTE4(desc-&gt;u.wcn7850.mpdu_start.pn[0]);</div><div class='add'>+	crypto_hdr[6] = HAL_RX_MPDU_INFO_PN_GET_BYTE1(desc-&gt;u.wcn7850.mpdu_start.pn[1]);</div><div class='add'>+	crypto_hdr[7] = HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc-&gt;u.wcn7850.mpdu_start.pn[1]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_hal_srng_create_config_wcn7850(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hal *hal = &amp;ab-&gt;hal;</div><div class='add'>+	struct hal_srng_config *s;</div><div class='add'>+</div><div class='add'>+	hal-&gt;srng_config = kmemdup(hw_srng_config_template,</div><div class='add'>+				   sizeof(hw_srng_config_template),</div><div class='add'>+				   GFP_KERNEL);</div><div class='add'>+	if (!hal-&gt;srng_config)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_REO_DST];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO1_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO1_RING_HP;</div><div class='add'>+	s-&gt;reg_size[0] = HAL_REO2_RING_BASE_LSB(ab) - HAL_REO1_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_size[1] = HAL_REO2_RING_HP - HAL_REO1_RING_HP;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_REO_EXCEPTION];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO_SW0_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO_SW0_RING_HP;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_REO_REINJECT];</div><div class='add'>+	s-&gt;max_rings = 1;</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_SW2REO_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_SW2REO_RING_HP;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_REO_CMD];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO_CMD_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO_CMD_HP;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_REO_STATUS];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO_STATUS_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO_STATUS_HP;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_TCL_DATA];</div><div class='add'>+	s-&gt;max_rings = 5;</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL1_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL1_RING_HP;</div><div class='add'>+	s-&gt;reg_size[0] = HAL_TCL2_RING_BASE_LSB(ab) - HAL_TCL1_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_size[1] = HAL_TCL2_RING_HP - HAL_TCL1_RING_HP;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_TCL_CMD];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL_RING_HP;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_TCL_STATUS];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL_STATUS_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL_STATUS_RING_HP;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_CE_SRC];</div><div class='add'>+	s-&gt;max_rings = 12;</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab) + HAL_CE_DST_RING_BASE_LSB;</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab) + HAL_CE_DST_RING_HP;</div><div class='add'>+	s-&gt;reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_SRC_REG(ab) -</div><div class='add'>+		HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab);</div><div class='add'>+	s-&gt;reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_SRC_REG(ab) -</div><div class='add'>+		HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab);</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_CE_DST];</div><div class='add'>+	s-&gt;max_rings = 12;</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_RING_BASE_LSB;</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_RING_HP;</div><div class='add'>+	s-&gt;reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) -</div><div class='add'>+		HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab);</div><div class='add'>+	s-&gt;reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) -</div><div class='add'>+		HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab);</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_CE_DST_STATUS];</div><div class='add'>+	s-&gt;max_rings = 12;</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) +</div><div class='add'>+		HAL_CE_DST_STATUS_RING_BASE_LSB;</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_STATUS_RING_HP;</div><div class='add'>+	s-&gt;reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) -</div><div class='add'>+		HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab);</div><div class='add'>+	s-&gt;reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) -</div><div class='add'>+		HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab);</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_WBM_IDLE_LINK];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_WBM_REG + HAL_WBM_IDLE_LINK_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_WBM_REG + HAL_WBM_IDLE_LINK_RING_HP;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_SW2WBM_RELEASE];</div><div class='add'>+	s-&gt;max_rings = 1;</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_WBM_REG +</div><div class='add'>+		HAL_WBM_SW_RELEASE_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_WBM_REG + HAL_WBM_SW_RELEASE_RING_HP;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_WBM2SW_RELEASE];</div><div class='add'>+	s-&gt;reg_start[0] = HAL_SEQ_WCSS_UMAC_WBM_REG + HAL_WBM0_RELEASE_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_start[1] = HAL_SEQ_WCSS_UMAC_WBM_REG + HAL_WBM0_RELEASE_RING_HP;</div><div class='add'>+	s-&gt;reg_size[0] = HAL_WBM1_RELEASE_RING_BASE_LSB(ab) -</div><div class='add'>+		HAL_WBM0_RELEASE_RING_BASE_LSB(ab);</div><div class='add'>+	s-&gt;reg_size[1] = HAL_WBM1_RELEASE_RING_HP - HAL_WBM0_RELEASE_RING_HP;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_RXDMA_BUF];</div><div class='add'>+	s-&gt;max_rings = 2;</div><div class='add'>+	s-&gt;mac_type = ATH12K_HAL_SRNG_PMAC;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_RXDMA_DST];</div><div class='add'>+	s-&gt;max_rings = 1;</div><div class='add'>+	s-&gt;entry_size = sizeof(struct hal_reo_entrance_ring) &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+	/* below rings are not used */</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_RXDMA_DIR_BUF];</div><div class='add'>+	s-&gt;max_rings = 0;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_PPE2TCL];</div><div class='add'>+	s-&gt;max_rings = 0;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_PPE_RELEASE];</div><div class='add'>+	s-&gt;max_rings = 0;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_TX_MONITOR_BUF];</div><div class='add'>+	s-&gt;max_rings = 0;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_TX_MONITOR_DST];</div><div class='add'>+	s-&gt;max_rings = 0;</div><div class='add'>+</div><div class='add'>+	s = &amp;hal-&gt;srng_config[HAL_PPE2TCL];</div><div class='add'>+	s-&gt;max_rings = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_wcn7850_dp_rx_h_msdu_done(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le32_get_bits(desc-&gt;u.wcn7850.msdu_end.info14,</div><div class='add'>+			       RX_MSDU_END_INFO14_MSDU_DONE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_wcn7850_dp_rx_h_l4_cksum_fail(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le32_get_bits(desc-&gt;u.wcn7850.msdu_end.info13,</div><div class='add'>+			       RX_MSDU_END_INFO13_TCP_UDP_CKSUM_FAIL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_wcn7850_dp_rx_h_ip_cksum_fail(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return !!le32_get_bits(desc-&gt;u.wcn7850.msdu_end.info13,</div><div class='add'>+			      RX_MSDU_END_INFO13_IP_CKSUM_FAIL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_hw_wcn7850_dp_rx_h_is_decrypted(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return (le32_get_bits(desc-&gt;u.wcn7850.msdu_end.info14,</div><div class='add'>+			      RX_MSDU_END_INFO14_DECRYPT_STATUS_CODE) ==</div><div class='add'>+			      RX_DESC_DECRYPT_STATUS_CODE_OK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hw_wcn7850_dp_rx_h_mpdu_err(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	u32 info = __le32_to_cpu(desc-&gt;u.wcn7850.msdu_end.info13);</div><div class='add'>+	u32 errmap = 0;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_FCS_ERR)</div><div class='add'>+		errmap |= HAL_RX_MPDU_ERR_FCS;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_DECRYPT_ERR)</div><div class='add'>+		errmap |= HAL_RX_MPDU_ERR_DECRYPT;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_TKIP_MIC_ERR)</div><div class='add'>+		errmap |= HAL_RX_MPDU_ERR_TKIP_MIC;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_A_MSDU_ERROR)</div><div class='add'>+		errmap |= HAL_RX_MPDU_ERR_AMSDU_ERR;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_OVERFLOW_ERR)</div><div class='add'>+		errmap |= HAL_RX_MPDU_ERR_OVERFLOW;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_MSDU_LEN_ERR)</div><div class='add'>+		errmap |= HAL_RX_MPDU_ERR_MSDU_LEN;</div><div class='add'>+</div><div class='add'>+	if (info &amp; RX_MSDU_END_INFO13_MPDU_LEN_ERR)</div><div class='add'>+		errmap |= HAL_RX_MPDU_ERR_MPDU_LEN;</div><div class='add'>+</div><div class='add'>+	return errmap;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_hw_wcn7850_get_rx_desc_size(void)</div><div class='add'>+{</div><div class='add'>+	return sizeof(struct hal_rx_desc_wcn7850);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_wcn7850_rx_desc_get_msdu_src_link(struct hal_rx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct hal_rx_ops hal_rx_wcn7850_ops = {</div><div class='add'>+	.rx_desc_get_first_msdu = ath12k_hw_wcn7850_rx_desc_get_first_msdu,</div><div class='add'>+	.rx_desc_get_last_msdu = ath12k_hw_wcn7850_rx_desc_get_last_msdu,</div><div class='add'>+	.rx_desc_get_l3_pad_bytes = ath12k_hw_wcn7850_rx_desc_get_l3_pad_bytes,</div><div class='add'>+	.rx_desc_encrypt_valid = ath12k_hw_wcn7850_rx_desc_encrypt_valid,</div><div class='add'>+	.rx_desc_get_encrypt_type = ath12k_hw_wcn7850_rx_desc_get_encrypt_type,</div><div class='add'>+	.rx_desc_get_decap_type = ath12k_hw_wcn7850_rx_desc_get_decap_type,</div><div class='add'>+	.rx_desc_get_mesh_ctl = ath12k_hw_wcn7850_rx_desc_get_mesh_ctl,</div><div class='add'>+	.rx_desc_get_mpdu_seq_ctl_vld = ath12k_hw_wcn7850_rx_desc_get_mpdu_seq_ctl_vld,</div><div class='add'>+	.rx_desc_get_mpdu_fc_valid = ath12k_hw_wcn7850_rx_desc_get_mpdu_fc_valid,</div><div class='add'>+	.rx_desc_get_mpdu_start_seq_no = ath12k_hw_wcn7850_rx_desc_get_mpdu_start_seq_no,</div><div class='add'>+	.rx_desc_get_msdu_len = ath12k_hw_wcn7850_rx_desc_get_msdu_len,</div><div class='add'>+	.rx_desc_get_msdu_sgi = ath12k_hw_wcn7850_rx_desc_get_msdu_sgi,</div><div class='add'>+	.rx_desc_get_msdu_rate_mcs = ath12k_hw_wcn7850_rx_desc_get_msdu_rate_mcs,</div><div class='add'>+	.rx_desc_get_msdu_rx_bw = ath12k_hw_wcn7850_rx_desc_get_msdu_rx_bw,</div><div class='add'>+	.rx_desc_get_msdu_freq = ath12k_hw_wcn7850_rx_desc_get_msdu_freq,</div><div class='add'>+	.rx_desc_get_msdu_pkt_type = ath12k_hw_wcn7850_rx_desc_get_msdu_pkt_type,</div><div class='add'>+	.rx_desc_get_msdu_nss = ath12k_hw_wcn7850_rx_desc_get_msdu_nss,</div><div class='add'>+	.rx_desc_get_mpdu_tid = ath12k_hw_wcn7850_rx_desc_get_mpdu_tid,</div><div class='add'>+	.rx_desc_get_mpdu_peer_id = ath12k_hw_wcn7850_rx_desc_get_mpdu_peer_id,</div><div class='add'>+	.rx_desc_copy_end_tlv = ath12k_hw_wcn7850_rx_desc_copy_end_tlv,</div><div class='add'>+	.rx_desc_get_mpdu_start_tag = ath12k_hw_wcn7850_rx_desc_get_mpdu_start_tag,</div><div class='add'>+	.rx_desc_get_mpdu_ppdu_id = ath12k_hw_wcn7850_rx_desc_get_mpdu_ppdu_id,</div><div class='add'>+	.rx_desc_set_msdu_len = ath12k_hw_wcn7850_rx_desc_set_msdu_len,</div><div class='add'>+	.rx_desc_get_msdu_payload = ath12k_hw_wcn7850_rx_desc_get_msdu_payload,</div><div class='add'>+	.rx_desc_get_mpdu_start_offset = ath12k_hw_wcn7850_rx_desc_get_mpdu_start_offset,</div><div class='add'>+	.rx_desc_get_msdu_end_offset = ath12k_hw_wcn7850_rx_desc_get_msdu_end_offset,</div><div class='add'>+	.rx_desc_mac_addr2_valid = ath12k_hw_wcn7850_rx_desc_mac_addr2_valid,</div><div class='add'>+	.rx_desc_mpdu_start_addr2 = ath12k_hw_wcn7850_rx_desc_mpdu_start_addr2,</div><div class='add'>+	.rx_desc_is_da_mcbc = ath12k_hw_wcn7850_rx_desc_is_da_mcbc,</div><div class='add'>+	.rx_desc_get_dot11_hdr = ath12k_hw_wcn7850_rx_desc_get_dot11_hdr,</div><div class='add'>+	.rx_desc_get_crypto_header = ath12k_hw_wcn7850_rx_desc_get_crypto_hdr,</div><div class='add'>+	.dp_rx_h_msdu_done = ath12k_hw_wcn7850_dp_rx_h_msdu_done,</div><div class='add'>+	.dp_rx_h_l4_cksum_fail = ath12k_hw_wcn7850_dp_rx_h_l4_cksum_fail,</div><div class='add'>+	.dp_rx_h_ip_cksum_fail = ath12k_hw_wcn7850_dp_rx_h_ip_cksum_fail,</div><div class='add'>+	.dp_rx_h_is_decrypted = ath12k_hw_wcn7850_dp_rx_h_is_decrypted,</div><div class='add'>+	.dp_rx_h_mpdu_err = ath12k_hw_wcn7850_dp_rx_h_mpdu_err,</div><div class='add'>+	.rx_desc_get_desc_size = ath12k_hw_wcn7850_get_rx_desc_size,</div><div class='add'>+	.rx_desc_get_msdu_src_link_id = ath12k_hw_wcn7850_rx_desc_get_msdu_src_link,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct hal_ops hal_wcn7850_ops = {</div><div class='add'>+	.create_srng_config = ath12k_hal_srng_create_config_wcn7850,</div><div class='add'>+	.tcl_to_wbm_rbm_map = ath12k_hal_wcn7850_tcl_to_wbm_rbm_map,</div><div class='add'>+	.rxdma_ring_wmask_rx_mpdu_start = NULL,</div><div class='add'>+	.rxdma_ring_wmask_rx_msdu_end = NULL,</div><div class='add'>+	.get_hal_rx_compact_ops = NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ath12k_hal_alloc_cont_rdp(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hal *hal = &amp;ab-&gt;hal;</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	size = sizeof(u32) * HAL_SRNG_RING_ID_MAX;</div><div class='add'>+	hal-&gt;rdp.vaddr = dma_alloc_coherent(ab-&gt;dev, size, &amp;hal-&gt;rdp.paddr,</div><div class='add'>+					    GFP_KERNEL);</div><div class='add'>+	if (!hal-&gt;rdp.vaddr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_hal_free_cont_rdp(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hal *hal = &amp;ab-&gt;hal;</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	if (!hal-&gt;rdp.vaddr)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	size = sizeof(u32) * HAL_SRNG_RING_ID_MAX;</div><div class='add'>+	dma_free_coherent(ab-&gt;dev, size,</div><div class='add'>+			  hal-&gt;rdp.vaddr, hal-&gt;rdp.paddr);</div><div class='add'>+	hal-&gt;rdp.vaddr = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_hal_alloc_cont_wrp(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hal *hal = &amp;ab-&gt;hal;</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	size = sizeof(u32) * (HAL_SRNG_NUM_PMAC_RINGS + HAL_SRNG_NUM_DMAC_RINGS);</div><div class='add'>+	hal-&gt;wrp.vaddr = dma_alloc_coherent(ab-&gt;dev, size, &amp;hal-&gt;wrp.paddr,</div><div class='add'>+					    GFP_KERNEL);</div><div class='add'>+	if (!hal-&gt;wrp.vaddr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_hal_free_cont_wrp(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hal *hal = &amp;ab-&gt;hal;</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	if (!hal-&gt;wrp.vaddr)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	size = sizeof(u32) * (HAL_SRNG_NUM_PMAC_RINGS + HAL_SRNG_NUM_DMAC_RINGS);</div><div class='add'>+	dma_free_coherent(ab-&gt;dev, size,</div><div class='add'>+			  hal-&gt;wrp.vaddr, hal-&gt;wrp.paddr);</div><div class='add'>+	hal-&gt;wrp.vaddr = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_hal_ce_dst_setup(struct ath12k_base *ab,</div><div class='add'>+				    struct hal_srng *srng, int ring_num)</div><div class='add'>+{</div><div class='add'>+	struct hal_srng_config *srng_config = &amp;ab-&gt;hal.srng_config[HAL_CE_DST];</div><div class='add'>+	u32 addr;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	addr = HAL_CE_DST_RING_CTRL +</div><div class='add'>+	       srng_config-&gt;reg_start[HAL_SRNG_REG_GRP_R0] +</div><div class='add'>+	       ring_num * srng_config-&gt;reg_size[HAL_SRNG_REG_GRP_R0];</div><div class='add'>+</div><div class='add'>+	val = ath12k_hif_read32(ab, addr);</div><div class='add'>+	val &amp;= ~HAL_CE_DST_R0_DEST_CTRL_MAX_LEN;</div><div class='add'>+	val |= u32_encode_bits(srng-&gt;u.dst_ring.max_buffer_length,</div><div class='add'>+			       HAL_CE_DST_R0_DEST_CTRL_MAX_LEN);</div><div class='add'>+	ath12k_hif_write32(ab, addr, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_hal_srng_dst_hw_init(struct ath12k_base *ab,</div><div class='add'>+					struct hal_srng *srng)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hal *hal = &amp;ab-&gt;hal;</div><div class='add'>+	u32 val;</div><div class='add'>+	u64 hp_addr;</div><div class='add'>+	u32 reg_base;</div><div class='add'>+</div><div class='add'>+	reg_base = srng-&gt;hwreg_base[HAL_SRNG_REG_GRP_R0];</div><div class='add'>+</div><div class='add'>+	if (srng-&gt;flags &amp; HAL_SRNG_FLAGS_MSI_INTR) {</div><div class='add'>+		ath12k_hif_write32(ab, reg_base +</div><div class='add'>+				   ath12k_hal_reo1_ring_msi1_base_lsb_offset(ab),</div><div class='add'>+				   srng-&gt;msi_addr);</div><div class='add'>+</div><div class='add'>+		val = u32_encode_bits(((u64)srng-&gt;msi_addr &gt;&gt; HAL_ADDR_MSB_REG_SHIFT),</div><div class='add'>+				      HAL_REO1_RING_MSI1_BASE_MSB_ADDR) |</div><div class='add'>+				      HAL_REO1_RING_MSI1_BASE_MSB_MSI1_ENABLE;</div><div class='add'>+		ath12k_hif_write32(ab, reg_base +</div><div class='add'>+				   ath12k_hal_reo1_ring_msi1_base_msb_offset(ab), val);</div><div class='add'>+</div><div class='add'>+		ath12k_hif_write32(ab,</div><div class='add'>+				   reg_base + ath12k_hal_reo1_ring_msi1_data_offset(ab),</div><div class='add'>+				   srng-&gt;msi_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_hif_write32(ab, reg_base, srng-&gt;ring_base_paddr);</div><div class='add'>+</div><div class='add'>+	val = u32_encode_bits(((u64)srng-&gt;ring_base_paddr &gt;&gt; HAL_ADDR_MSB_REG_SHIFT),</div><div class='add'>+			      HAL_REO1_RING_BASE_MSB_RING_BASE_ADDR_MSB) |</div><div class='add'>+	      u32_encode_bits((srng-&gt;entry_size * srng-&gt;num_entries),</div><div class='add'>+			      HAL_REO1_RING_BASE_MSB_RING_SIZE);</div><div class='add'>+	ath12k_hif_write32(ab, reg_base + ath12k_hal_reo1_ring_base_msb_offset(ab), val);</div><div class='add'>+</div><div class='add'>+	val = u32_encode_bits(srng-&gt;ring_id, HAL_REO1_RING_ID_RING_ID) |</div><div class='add'>+	      u32_encode_bits(srng-&gt;entry_size, HAL_REO1_RING_ID_ENTRY_SIZE);</div><div class='add'>+	ath12k_hif_write32(ab, reg_base + ath12k_hal_reo1_ring_id_offset(ab), val);</div><div class='add'>+</div><div class='add'>+	/* interrupt setup */</div><div class='add'>+	val = u32_encode_bits((srng-&gt;intr_timer_thres_us &gt;&gt; 3),</div><div class='add'>+			      HAL_REO1_RING_PRDR_INT_SETUP_INTR_TMR_THOLD);</div><div class='add'>+</div><div class='add'>+	val |= u32_encode_bits((srng-&gt;intr_batch_cntr_thres_entries * srng-&gt;entry_size),</div><div class='add'>+				HAL_REO1_RING_PRDR_INT_SETUP_BATCH_COUNTER_THOLD);</div><div class='add'>+</div><div class='add'>+	ath12k_hif_write32(ab,</div><div class='add'>+			   reg_base + ath12k_hal_reo1_ring_producer_int_setup_offset(ab),</div><div class='add'>+			   val);</div><div class='add'>+</div><div class='add'>+	hp_addr = hal-&gt;rdp.paddr +</div><div class='add'>+		  ((unsigned long)srng-&gt;u.dst_ring.hp_addr -</div><div class='add'>+		   (unsigned long)hal-&gt;rdp.vaddr);</div><div class='add'>+	ath12k_hif_write32(ab, reg_base + ath12k_hal_reo1_ring_hp_addr_lsb_offset(ab),</div><div class='add'>+			   hp_addr &amp; HAL_ADDR_LSB_REG_MASK);</div><div class='add'>+	ath12k_hif_write32(ab, reg_base + ath12k_hal_reo1_ring_hp_addr_msb_offset(ab),</div><div class='add'>+			   hp_addr &gt;&gt; HAL_ADDR_MSB_REG_SHIFT);</div><div class='add'>+</div><div class='add'>+	/* Initialize head and tail pointers to indicate ring is empty */</div><div class='add'>+	reg_base = srng-&gt;hwreg_base[HAL_SRNG_REG_GRP_R2];</div><div class='add'>+	ath12k_hif_write32(ab, reg_base, 0);</div><div class='add'>+	ath12k_hif_write32(ab, reg_base + HAL_REO1_RING_TP_OFFSET, 0);</div><div class='add'>+	*srng-&gt;u.dst_ring.hp_addr = 0;</div><div class='add'>+</div><div class='add'>+	reg_base = srng-&gt;hwreg_base[HAL_SRNG_REG_GRP_R0];</div><div class='add'>+	val = 0;</div><div class='add'>+	if (srng-&gt;flags &amp; HAL_SRNG_FLAGS_DATA_TLV_SWAP)</div><div class='add'>+		val |= HAL_REO1_RING_MISC_DATA_TLV_SWAP;</div><div class='add'>+	if (srng-&gt;flags &amp; HAL_SRNG_FLAGS_RING_PTR_SWAP)</div><div class='add'>+		val |= HAL_REO1_RING_MISC_HOST_FW_SWAP;</div><div class='add'>+	if (srng-&gt;flags &amp; HAL_SRNG_FLAGS_MSI_SWAP)</div><div class='add'>+		val |= HAL_REO1_RING_MISC_MSI_SWAP;</div><div class='add'>+	val |= HAL_REO1_RING_MISC_SRNG_ENABLE;</div><div class='add'>+</div><div class='add'>+	ath12k_hif_write32(ab, reg_base + ath12k_hal_reo1_ring_misc_offset(ab), val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_hal_srng_src_hw_init(struct ath12k_base *ab,</div><div class='add'>+					struct hal_srng *srng)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hal *hal = &amp;ab-&gt;hal;</div><div class='add'>+	u32 val;</div><div class='add'>+	u64 tp_addr;</div><div class='add'>+	u32 reg_base;</div><div class='add'>+</div><div class='add'>+	reg_base = srng-&gt;hwreg_base[HAL_SRNG_REG_GRP_R0];</div><div class='add'>+</div><div class='add'>+	if (srng-&gt;flags &amp; HAL_SRNG_FLAGS_MSI_INTR) {</div><div class='add'>+		ath12k_hif_write32(ab, reg_base +</div><div class='add'>+				   HAL_TCL1_RING_MSI1_BASE_LSB_OFFSET(ab),</div><div class='add'>+				   srng-&gt;msi_addr);</div><div class='add'>+</div><div class='add'>+		val = u32_encode_bits(((u64)srng-&gt;msi_addr &gt;&gt; HAL_ADDR_MSB_REG_SHIFT),</div><div class='add'>+				      HAL_TCL1_RING_MSI1_BASE_MSB_ADDR) |</div><div class='add'>+				      HAL_TCL1_RING_MSI1_BASE_MSB_MSI1_ENABLE;</div><div class='add'>+		ath12k_hif_write32(ab, reg_base +</div><div class='add'>+				       HAL_TCL1_RING_MSI1_BASE_MSB_OFFSET(ab),</div><div class='add'>+				   val);</div><div class='add'>+</div><div class='add'>+		ath12k_hif_write32(ab, reg_base +</div><div class='add'>+				       HAL_TCL1_RING_MSI1_DATA_OFFSET(ab),</div><div class='add'>+				   srng-&gt;msi_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_hif_write32(ab, reg_base, srng-&gt;ring_base_paddr);</div><div class='add'>+</div><div class='add'>+	val = u32_encode_bits(((u64)srng-&gt;ring_base_paddr &gt;&gt; HAL_ADDR_MSB_REG_SHIFT),</div><div class='add'>+			      HAL_TCL1_RING_BASE_MSB_RING_BASE_ADDR_MSB) |</div><div class='add'>+	      u32_encode_bits((srng-&gt;entry_size * srng-&gt;num_entries),</div><div class='add'>+			      HAL_TCL1_RING_BASE_MSB_RING_SIZE);</div><div class='add'>+	ath12k_hif_write32(ab, reg_base + HAL_TCL1_RING_BASE_MSB_OFFSET(ab), val);</div><div class='add'>+</div><div class='add'>+	val = u32_encode_bits(srng-&gt;entry_size, HAL_REO1_RING_ID_ENTRY_SIZE);</div><div class='add'>+	ath12k_hif_write32(ab, reg_base + HAL_TCL1_RING_ID_OFFSET(ab), val);</div><div class='add'>+</div><div class='add'>+	val = u32_encode_bits(srng-&gt;intr_timer_thres_us,</div><div class='add'>+			      HAL_TCL1_RING_CONSR_INT_SETUP_IX0_INTR_TMR_THOLD);</div><div class='add'>+</div><div class='add'>+	val |= u32_encode_bits((srng-&gt;intr_batch_cntr_thres_entries * srng-&gt;entry_size),</div><div class='add'>+			       HAL_TCL1_RING_CONSR_INT_SETUP_IX0_BATCH_COUNTER_THOLD);</div><div class='add'>+</div><div class='add'>+	ath12k_hif_write32(ab,</div><div class='add'>+			   reg_base + HAL_TCL1_RING_CONSR_INT_SETUP_IX0_OFFSET(ab),</div><div class='add'>+			   val);</div><div class='add'>+</div><div class='add'>+	val = 0;</div><div class='add'>+	if (srng-&gt;flags &amp; HAL_SRNG_FLAGS_LOW_THRESH_INTR_EN) {</div><div class='add'>+		val |= u32_encode_bits(srng-&gt;u.src_ring.low_threshold,</div><div class='add'>+				       HAL_TCL1_RING_CONSR_INT_SETUP_IX1_LOW_THOLD);</div><div class='add'>+	}</div><div class='add'>+	ath12k_hif_write32(ab,</div><div class='add'>+			   reg_base + HAL_TCL1_RING_CONSR_INT_SETUP_IX1_OFFSET(ab),</div><div class='add'>+			   val);</div><div class='add'>+</div><div class='add'>+	if (srng-&gt;ring_id != HAL_SRNG_RING_ID_WBM_IDLE_LINK) {</div><div class='add'>+		tp_addr = hal-&gt;rdp.paddr +</div><div class='add'>+			  ((unsigned long)srng-&gt;u.src_ring.tp_addr -</div><div class='add'>+			   (unsigned long)hal-&gt;rdp.vaddr);</div><div class='add'>+		ath12k_hif_write32(ab,</div><div class='add'>+				   reg_base + HAL_TCL1_RING_TP_ADDR_LSB_OFFSET(ab),</div><div class='add'>+				   tp_addr &amp; HAL_ADDR_LSB_REG_MASK);</div><div class='add'>+		ath12k_hif_write32(ab,</div><div class='add'>+				   reg_base + HAL_TCL1_RING_TP_ADDR_MSB_OFFSET(ab),</div><div class='add'>+				   tp_addr &gt;&gt; HAL_ADDR_MSB_REG_SHIFT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize head and tail pointers to indicate ring is empty */</div><div class='add'>+	reg_base = srng-&gt;hwreg_base[HAL_SRNG_REG_GRP_R2];</div><div class='add'>+	ath12k_hif_write32(ab, reg_base, 0);</div><div class='add'>+	ath12k_hif_write32(ab, reg_base + HAL_TCL1_RING_TP_OFFSET, 0);</div><div class='add'>+	*srng-&gt;u.src_ring.tp_addr = 0;</div><div class='add'>+</div><div class='add'>+	reg_base = srng-&gt;hwreg_base[HAL_SRNG_REG_GRP_R0];</div><div class='add'>+	val = 0;</div><div class='add'>+	if (srng-&gt;flags &amp; HAL_SRNG_FLAGS_DATA_TLV_SWAP)</div><div class='add'>+		val |= HAL_TCL1_RING_MISC_DATA_TLV_SWAP;</div><div class='add'>+	if (srng-&gt;flags &amp; HAL_SRNG_FLAGS_RING_PTR_SWAP)</div><div class='add'>+		val |= HAL_TCL1_RING_MISC_HOST_FW_SWAP;</div><div class='add'>+	if (srng-&gt;flags &amp; HAL_SRNG_FLAGS_MSI_SWAP)</div><div class='add'>+		val |= HAL_TCL1_RING_MISC_MSI_SWAP;</div><div class='add'>+</div><div class='add'>+	/* Loop count is not used for SRC rings */</div><div class='add'>+	val |= HAL_TCL1_RING_MISC_MSI_LOOPCNT_DISABLE;</div><div class='add'>+</div><div class='add'>+	val |= HAL_TCL1_RING_MISC_SRNG_ENABLE;</div><div class='add'>+</div><div class='add'>+	if (srng-&gt;ring_id == HAL_SRNG_RING_ID_WBM_IDLE_LINK)</div><div class='add'>+		val |= HAL_TCL1_RING_MISC_MSI_RING_ID_DISABLE;</div><div class='add'>+</div><div class='add'>+	ath12k_hif_write32(ab, reg_base + HAL_TCL1_RING_MISC_OFFSET(ab), val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_hal_srng_hw_init(struct ath12k_base *ab,</div><div class='add'>+				    struct hal_srng *srng)</div><div class='add'>+{</div><div class='add'>+	if (srng-&gt;ring_dir == HAL_SRNG_DIR_SRC)</div><div class='add'>+		ath12k_hal_srng_src_hw_init(ab, srng);</div><div class='add'>+	else</div><div class='add'>+		ath12k_hal_srng_dst_hw_init(ab, srng);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_hal_srng_get_ring_id(struct ath12k_base *ab,</div><div class='add'>+				       enum hal_ring_type type,</div><div class='add'>+				       int ring_num, int mac_id)</div><div class='add'>+{</div><div class='add'>+	struct hal_srng_config *srng_config = &amp;ab-&gt;hal.srng_config[type];</div><div class='add'>+	int ring_id;</div><div class='add'>+</div><div class='add'>+	if (ring_num &gt;= srng_config-&gt;max_rings) {</div><div class='add'>+		ath12k_warn(ab, "invalid ring number :%d\n", ring_num);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ring_id = srng_config-&gt;start_ring_id + ring_num;</div><div class='add'>+	if (srng_config-&gt;mac_type == ATH12K_HAL_SRNG_PMAC)</div><div class='add'>+		ring_id += mac_id * HAL_SRNG_RINGS_PER_PMAC;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ring_id &gt;= HAL_SRNG_RING_ID_MAX))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return ring_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_hal_srng_get_entrysize(struct ath12k_base *ab, u32 ring_type)</div><div class='add'>+{</div><div class='add'>+	struct hal_srng_config *srng_config;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ring_type &gt;= HAL_MAX_RING_TYPES))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	srng_config = &amp;ab-&gt;hal.srng_config[ring_type];</div><div class='add'>+</div><div class='add'>+	return (srng_config-&gt;entry_size &lt;&lt; 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_hal_srng_get_max_entries(struct ath12k_base *ab, u32 ring_type)</div><div class='add'>+{</div><div class='add'>+	struct hal_srng_config *srng_config;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ring_type &gt;= HAL_MAX_RING_TYPES))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	srng_config = &amp;ab-&gt;hal.srng_config[ring_type];</div><div class='add'>+</div><div class='add'>+	return (srng_config-&gt;max_size / srng_config-&gt;entry_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_srng_get_params(struct ath12k_base *ab, struct hal_srng *srng,</div><div class='add'>+				struct hal_srng_params *params)</div><div class='add'>+{</div><div class='add'>+	params-&gt;ring_base_paddr = srng-&gt;ring_base_paddr;</div><div class='add'>+	params-&gt;ring_base_vaddr = srng-&gt;ring_base_vaddr;</div><div class='add'>+	params-&gt;num_entries = srng-&gt;num_entries;</div><div class='add'>+	params-&gt;intr_timer_thres_us = srng-&gt;intr_timer_thres_us;</div><div class='add'>+	params-&gt;intr_batch_cntr_thres_entries =</div><div class='add'>+		srng-&gt;intr_batch_cntr_thres_entries;</div><div class='add'>+	params-&gt;low_threshold = srng-&gt;u.src_ring.low_threshold;</div><div class='add'>+	params-&gt;msi_addr = srng-&gt;msi_addr;</div><div class='add'>+	params-&gt;msi2_addr = srng-&gt;msi2_addr;</div><div class='add'>+	params-&gt;msi_data = srng-&gt;msi_data;</div><div class='add'>+	params-&gt;msi2_data = srng-&gt;msi2_data;</div><div class='add'>+	params-&gt;flags = srng-&gt;flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+dma_addr_t ath12k_hal_srng_get_hp_addr(struct ath12k_base *ab,</div><div class='add'>+				       struct hal_srng *srng)</div><div class='add'>+{</div><div class='add'>+	if (!(srng-&gt;flags &amp; HAL_SRNG_FLAGS_LMAC_RING))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (srng-&gt;ring_dir == HAL_SRNG_DIR_SRC)</div><div class='add'>+		return ab-&gt;hal.wrp.paddr +</div><div class='add'>+		       ((unsigned long)srng-&gt;u.src_ring.hp_addr -</div><div class='add'>+			(unsigned long)ab-&gt;hal.wrp.vaddr);</div><div class='add'>+	else</div><div class='add'>+		return ab-&gt;hal.rdp.paddr +</div><div class='add'>+		       ((unsigned long)srng-&gt;u.dst_ring.hp_addr -</div><div class='add'>+			 (unsigned long)ab-&gt;hal.rdp.vaddr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+dma_addr_t ath12k_hal_srng_get_tp_addr(struct ath12k_base *ab,</div><div class='add'>+				       struct hal_srng *srng)</div><div class='add'>+{</div><div class='add'>+	if (!(srng-&gt;flags &amp; HAL_SRNG_FLAGS_LMAC_RING))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (srng-&gt;ring_dir == HAL_SRNG_DIR_SRC)</div><div class='add'>+		return ab-&gt;hal.rdp.paddr +</div><div class='add'>+		       ((unsigned long)srng-&gt;u.src_ring.tp_addr -</div><div class='add'>+			(unsigned long)ab-&gt;hal.rdp.vaddr);</div><div class='add'>+	else</div><div class='add'>+		return ab-&gt;hal.wrp.paddr +</div><div class='add'>+		       ((unsigned long)srng-&gt;u.dst_ring.tp_addr -</div><div class='add'>+			(unsigned long)ab-&gt;hal.wrp.vaddr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 ath12k_hal_ce_get_desc_size(enum hal_ce_desc type)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case HAL_CE_DESC_SRC:</div><div class='add'>+		return sizeof(struct hal_ce_srng_src_desc);</div><div class='add'>+	case HAL_CE_DESC_DST:</div><div class='add'>+		return sizeof(struct hal_ce_srng_dest_desc);</div><div class='add'>+	case HAL_CE_DESC_DST_STATUS:</div><div class='add'>+		return sizeof(struct hal_ce_srng_dst_status_desc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_ce_src_set_desc(struct hal_ce_srng_src_desc *desc, dma_addr_t paddr,</div><div class='add'>+				u32 len, u32 id, u8 byte_swap_data)</div><div class='add'>+{</div><div class='add'>+	desc-&gt;buffer_addr_low = cpu_to_le32(paddr &amp; HAL_ADDR_LSB_REG_MASK);</div><div class='add'>+	desc-&gt;buffer_addr_info =</div><div class='add'>+		le32_encode_bits(((u64)paddr &gt;&gt; HAL_ADDR_MSB_REG_SHIFT),</div><div class='add'>+				 HAL_CE_SRC_DESC_ADDR_INFO_ADDR_HI) |</div><div class='add'>+		le32_encode_bits(byte_swap_data,</div><div class='add'>+				 HAL_CE_SRC_DESC_ADDR_INFO_BYTE_SWAP) |</div><div class='add'>+		le32_encode_bits(0, HAL_CE_SRC_DESC_ADDR_INFO_GATHER) |</div><div class='add'>+		le32_encode_bits(len, HAL_CE_SRC_DESC_ADDR_INFO_LEN);</div><div class='add'>+	desc-&gt;meta_info = le32_encode_bits(id, HAL_CE_SRC_DESC_META_INFO_DATA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_ce_dst_set_desc(struct hal_ce_srng_dest_desc *desc, dma_addr_t paddr)</div><div class='add'>+{</div><div class='add'>+	desc-&gt;buffer_addr_low = cpu_to_le32(paddr &amp; HAL_ADDR_LSB_REG_MASK);</div><div class='add'>+	desc-&gt;buffer_addr_info =</div><div class='add'>+		le32_encode_bits(((u64)paddr &gt;&gt; HAL_ADDR_MSB_REG_SHIFT),</div><div class='add'>+				 HAL_CE_DEST_DESC_ADDR_INFO_ADDR_HI);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 ath12k_hal_ce_dst_status_get_length(struct hal_ce_srng_dst_status_desc *desc)</div><div class='add'>+{</div><div class='add'>+	u32 len;</div><div class='add'>+</div><div class='add'>+	len = le32_get_bits(desc-&gt;flags, HAL_CE_DST_STATUS_DESC_FLAGS_LEN);</div><div class='add'>+	desc-&gt;flags &amp;= ~cpu_to_le32(HAL_CE_DST_STATUS_DESC_FLAGS_LEN);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_set_link_desc_addr(struct hal_wbm_link_desc *desc, u32 cookie,</div><div class='add'>+				   dma_addr_t paddr,</div><div class='add'>+				   enum hal_rx_buf_return_buf_manager rbm)</div><div class='add'>+{</div><div class='add'>+	desc-&gt;buf_addr_info.info0 = le32_encode_bits((paddr &amp; HAL_ADDR_LSB_REG_MASK),</div><div class='add'>+						     BUFFER_ADDR_INFO0_ADDR);</div><div class='add'>+	desc-&gt;buf_addr_info.info1 =</div><div class='add'>+			le32_encode_bits(((u64)paddr &gt;&gt; HAL_ADDR_MSB_REG_SHIFT),</div><div class='add'>+					 BUFFER_ADDR_INFO1_ADDR) |</div><div class='add'>+			le32_encode_bits(rbm, BUFFER_ADDR_INFO1_RET_BUF_MGR) |</div><div class='add'>+			le32_encode_bits(cookie, BUFFER_ADDR_INFO1_SW_COOKIE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *ath12k_hal_srng_dst_peek(struct ath12k_base *ab, struct hal_srng *srng)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (srng-&gt;u.dst_ring.tp != srng-&gt;u.dst_ring.cached_hp)</div><div class='add'>+		return (srng-&gt;ring_base_vaddr + srng-&gt;u.dst_ring.tp);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *ath12k_hal_srng_dst_get_next_entry(struct ath12k_base *ab,</div><div class='add'>+					 struct hal_srng *srng)</div><div class='add'>+{</div><div class='add'>+	void *desc;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (srng-&gt;u.dst_ring.tp == srng-&gt;u.dst_ring.cached_hp)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	desc = srng-&gt;ring_base_vaddr + srng-&gt;u.dst_ring.tp;</div><div class='add'>+</div><div class='add'>+	srng-&gt;u.dst_ring.tp = (srng-&gt;u.dst_ring.tp + srng-&gt;entry_size) %</div><div class='add'>+			      srng-&gt;ring_size;</div><div class='add'>+</div><div class='add'>+	return desc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_hal_srng_dst_num_free(struct ath12k_base *ab, struct hal_srng *srng,</div><div class='add'>+				 bool sync_hw_ptr)</div><div class='add'>+{</div><div class='add'>+	u32 tp, hp;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	tp = srng-&gt;u.dst_ring.tp;</div><div class='add'>+</div><div class='add'>+	if (sync_hw_ptr) {</div><div class='add'>+		hp = *srng-&gt;u.dst_ring.hp_addr;</div><div class='add'>+		srng-&gt;u.dst_ring.cached_hp = hp;</div><div class='add'>+	} else {</div><div class='add'>+		hp = srng-&gt;u.dst_ring.cached_hp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hp &gt;= tp)</div><div class='add'>+		return (hp - tp) / srng-&gt;entry_size;</div><div class='add'>+	else</div><div class='add'>+		return (srng-&gt;ring_size - tp + hp) / srng-&gt;entry_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Returns number of available entries in src ring */</div><div class='add'>+int ath12k_hal_srng_src_num_free(struct ath12k_base *ab, struct hal_srng *srng,</div><div class='add'>+				 bool sync_hw_ptr)</div><div class='add'>+{</div><div class='add'>+	u32 tp, hp;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	hp = srng-&gt;u.src_ring.hp;</div><div class='add'>+</div><div class='add'>+	if (sync_hw_ptr) {</div><div class='add'>+		tp = *srng-&gt;u.src_ring.tp_addr;</div><div class='add'>+		srng-&gt;u.src_ring.cached_tp = tp;</div><div class='add'>+	} else {</div><div class='add'>+		tp = srng-&gt;u.src_ring.cached_tp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tp &gt; hp)</div><div class='add'>+		return ((tp - hp) / srng-&gt;entry_size) - 1;</div><div class='add'>+	else</div><div class='add'>+		return ((srng-&gt;ring_size - hp + tp) / srng-&gt;entry_size) - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *ath12k_hal_srng_src_next_peek(struct ath12k_base *ab,</div><div class='add'>+				    struct hal_srng *srng)</div><div class='add'>+{</div><div class='add'>+	void *desc;</div><div class='add'>+	u32 next_hp;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	next_hp = (srng-&gt;u.src_ring.hp + srng-&gt;entry_size) % srng-&gt;ring_size;</div><div class='add'>+</div><div class='add'>+	if (next_hp == srng-&gt;u.src_ring.cached_tp)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	desc = srng-&gt;ring_base_vaddr + next_hp;</div><div class='add'>+</div><div class='add'>+	return desc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *ath12k_hal_srng_src_get_next_entry(struct ath12k_base *ab,</div><div class='add'>+					 struct hal_srng *srng)</div><div class='add'>+{</div><div class='add'>+	void *desc;</div><div class='add'>+	u32 next_hp;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* TODO: Using % is expensive, but we have to do this since size of some</div><div class='add'>+	 * SRNG rings is not power of 2 (due to descriptor sizes). Need to see</div><div class='add'>+	 * if separate function is defined for rings having power of 2 ring size</div><div class='add'>+	 * (TCL2SW, REO2SW, SW2RXDMA and CE rings) so that we can avoid the</div><div class='add'>+	 * overhead of % by using mask (with &amp;).</div><div class='add'>+	 */</div><div class='add'>+	next_hp = (srng-&gt;u.src_ring.hp + srng-&gt;entry_size) % srng-&gt;ring_size;</div><div class='add'>+</div><div class='add'>+	if (next_hp == srng-&gt;u.src_ring.cached_tp)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	desc = srng-&gt;ring_base_vaddr + srng-&gt;u.src_ring.hp;</div><div class='add'>+	srng-&gt;u.src_ring.hp = next_hp;</div><div class='add'>+</div><div class='add'>+	/* TODO: Reap functionality is not used by all rings. If particular</div><div class='add'>+	 * ring does not use reap functionality, we need not update reap_hp</div><div class='add'>+	 * with next_hp pointer. Need to make sure a separate function is used</div><div class='add'>+	 * before doing any optimization by removing below code updating</div><div class='add'>+	 * reap_hp.</div><div class='add'>+	 */</div><div class='add'>+	srng-&gt;u.src_ring.reap_hp = next_hp;</div><div class='add'>+</div><div class='add'>+	return desc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *ath12k_hal_srng_src_peek(struct ath12k_base *ab, struct hal_srng *srng)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (((srng-&gt;u.src_ring.hp + srng-&gt;entry_size) % srng-&gt;ring_size) ==</div><div class='add'>+	    srng-&gt;u.src_ring.cached_tp)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return srng-&gt;ring_base_vaddr + srng-&gt;u.src_ring.hp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *ath12k_hal_srng_src_reap_next(struct ath12k_base *ab,</div><div class='add'>+				    struct hal_srng *srng)</div><div class='add'>+{</div><div class='add'>+	void *desc;</div><div class='add'>+	u32 next_reap_hp;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	next_reap_hp = (srng-&gt;u.src_ring.reap_hp + srng-&gt;entry_size) %</div><div class='add'>+		       srng-&gt;ring_size;</div><div class='add'>+</div><div class='add'>+	if (next_reap_hp == srng-&gt;u.src_ring.cached_tp)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	desc = srng-&gt;ring_base_vaddr + next_reap_hp;</div><div class='add'>+	srng-&gt;u.src_ring.reap_hp = next_reap_hp;</div><div class='add'>+</div><div class='add'>+	return desc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *ath12k_hal_srng_src_get_next_reaped(struct ath12k_base *ab,</div><div class='add'>+					  struct hal_srng *srng)</div><div class='add'>+{</div><div class='add'>+	void *desc;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (srng-&gt;u.src_ring.hp == srng-&gt;u.src_ring.reap_hp)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	desc = srng-&gt;ring_base_vaddr + srng-&gt;u.src_ring.hp;</div><div class='add'>+	srng-&gt;u.src_ring.hp = (srng-&gt;u.src_ring.hp + srng-&gt;entry_size) %</div><div class='add'>+			      srng-&gt;ring_size;</div><div class='add'>+</div><div class='add'>+	return desc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_srng_access_begin(struct ath12k_base *ab, struct hal_srng *srng)</div><div class='add'>+{</div><div class='add'>+	u32 hp;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (srng-&gt;ring_dir == HAL_SRNG_DIR_SRC) {</div><div class='add'>+		srng-&gt;u.src_ring.cached_tp =</div><div class='add'>+			*(volatile u32 *)srng-&gt;u.src_ring.tp_addr;</div><div class='add'>+	} else {</div><div class='add'>+		hp = READ_ONCE(*srng-&gt;u.dst_ring.hp_addr);</div><div class='add'>+</div><div class='add'>+		if (hp != srng-&gt;u.dst_ring.cached_hp) {</div><div class='add'>+			srng-&gt;u.dst_ring.cached_hp = hp;</div><div class='add'>+			/* Make sure descriptor is read after the head</div><div class='add'>+			 * pointer.</div><div class='add'>+			 */</div><div class='add'>+			dma_rmb();</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Update cached ring head/tail pointers to HW. ath12k_hal_srng_access_begin()</div><div class='add'>+ * should have been called before this.</div><div class='add'>+ */</div><div class='add'>+void ath12k_hal_srng_access_end(struct ath12k_base *ab, struct hal_srng *srng)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (srng-&gt;flags &amp; HAL_SRNG_FLAGS_LMAC_RING) {</div><div class='add'>+		/* For LMAC rings, ring pointer updates are done through FW and</div><div class='add'>+		 * hence written to a shared memory location that is read by FW</div><div class='add'>+		 */</div><div class='add'>+		if (srng-&gt;ring_dir == HAL_SRNG_DIR_SRC) {</div><div class='add'>+			srng-&gt;u.src_ring.last_tp =</div><div class='add'>+				*(volatile u32 *)srng-&gt;u.src_ring.tp_addr;</div><div class='add'>+			/* Make sure descriptor is written before updating the</div><div class='add'>+			 * head pointer.</div><div class='add'>+			 */</div><div class='add'>+			dma_wmb();</div><div class='add'>+			WRITE_ONCE(*srng-&gt;u.src_ring.hp_addr, srng-&gt;u.src_ring.hp);</div><div class='add'>+		} else {</div><div class='add'>+			srng-&gt;u.dst_ring.last_hp = *srng-&gt;u.dst_ring.hp_addr;</div><div class='add'>+			/* Make sure descriptor is read before updating the</div><div class='add'>+			 * tail pointer.</div><div class='add'>+			 */</div><div class='add'>+			dma_mb();</div><div class='add'>+			WRITE_ONCE(*srng-&gt;u.dst_ring.tp_addr, srng-&gt;u.dst_ring.tp);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (srng-&gt;ring_dir == HAL_SRNG_DIR_SRC) {</div><div class='add'>+			srng-&gt;u.src_ring.last_tp =</div><div class='add'>+				*(volatile u32 *)srng-&gt;u.src_ring.tp_addr;</div><div class='add'>+			/* Assume implementation use an MMIO write accessor</div><div class='add'>+			 * which has the required wmb() so that the descriptor</div><div class='add'>+			 * is written before the updating the head pointer.</div><div class='add'>+			 */</div><div class='add'>+			ath12k_hif_write32(ab,</div><div class='add'>+					   (unsigned long)srng-&gt;u.src_ring.hp_addr -</div><div class='add'>+					   (unsigned long)ab-&gt;mem,</div><div class='add'>+					   srng-&gt;u.src_ring.hp);</div><div class='add'>+		} else {</div><div class='add'>+			srng-&gt;u.dst_ring.last_hp = *srng-&gt;u.dst_ring.hp_addr;</div><div class='add'>+			/* Make sure descriptor is read before updating the</div><div class='add'>+			 * tail pointer.</div><div class='add'>+			 */</div><div class='add'>+			mb();</div><div class='add'>+			ath12k_hif_write32(ab,</div><div class='add'>+					   (unsigned long)srng-&gt;u.dst_ring.tp_addr -</div><div class='add'>+					   (unsigned long)ab-&gt;mem,</div><div class='add'>+					   srng-&gt;u.dst_ring.tp);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	srng-&gt;timestamp = jiffies;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_setup_link_idle_list(struct ath12k_base *ab,</div><div class='add'>+				     struct hal_wbm_idle_scatter_list *sbuf,</div><div class='add'>+				     u32 nsbufs, u32 tot_link_desc,</div><div class='add'>+				     u32 end_offset)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_buffer_addr *link_addr;</div><div class='add'>+	int i;</div><div class='add'>+	u32 reg_scatter_buf_sz = HAL_WBM_IDLE_SCATTER_BUF_SIZE / 64;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	link_addr = (void *)sbuf[0].vaddr + HAL_WBM_IDLE_SCATTER_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; nsbufs; i++) {</div><div class='add'>+		link_addr-&gt;info0 = cpu_to_le32(sbuf[i].paddr &amp; HAL_ADDR_LSB_REG_MASK);</div><div class='add'>+</div><div class='add'>+		link_addr-&gt;info1 =</div><div class='add'>+			le32_encode_bits((u64)sbuf[i].paddr &gt;&gt; HAL_ADDR_MSB_REG_SHIFT,</div><div class='add'>+					 HAL_WBM_SCATTERED_DESC_MSB_BASE_ADDR_39_32) |</div><div class='add'>+			le32_encode_bits(BASE_ADDR_MATCH_TAG_VAL,</div><div class='add'>+					 HAL_WBM_SCATTERED_DESC_MSB_BASE_ADDR_MATCH_TAG);</div><div class='add'>+</div><div class='add'>+		link_addr = (void *)sbuf[i].vaddr +</div><div class='add'>+			     HAL_WBM_IDLE_SCATTER_BUF_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = u32_encode_bits(reg_scatter_buf_sz, HAL_WBM_SCATTER_BUFFER_SIZE) |</div><div class='add'>+	      u32_encode_bits(0x1, HAL_WBM_LINK_DESC_IDLE_LIST_MODE);</div><div class='add'>+</div><div class='add'>+	ath12k_hif_write32(ab,</div><div class='add'>+			   HAL_SEQ_WCSS_UMAC_WBM_REG +</div><div class='add'>+			   HAL_WBM_R0_IDLE_LIST_CONTROL_ADDR(ab),</div><div class='add'>+			   val);</div><div class='add'>+</div><div class='add'>+	val = u32_encode_bits(reg_scatter_buf_sz * nsbufs,</div><div class='add'>+			      HAL_WBM_SCATTER_RING_SIZE_OF_IDLE_LINK_DESC_LIST);</div><div class='add'>+	ath12k_hif_write32(ab,</div><div class='add'>+			   HAL_SEQ_WCSS_UMAC_WBM_REG + HAL_WBM_R0_IDLE_LIST_SIZE_ADDR(ab),</div><div class='add'>+			   val);</div><div class='add'>+</div><div class='add'>+	val = u32_encode_bits(sbuf[0].paddr &amp; HAL_ADDR_LSB_REG_MASK,</div><div class='add'>+			      BUFFER_ADDR_INFO0_ADDR);</div><div class='add'>+	ath12k_hif_write32(ab,</div><div class='add'>+			   HAL_SEQ_WCSS_UMAC_WBM_REG +</div><div class='add'>+			   HAL_WBM_SCATTERED_RING_BASE_LSB(ab),</div><div class='add'>+			   val);</div><div class='add'>+</div><div class='add'>+	val = u32_encode_bits(BASE_ADDR_MATCH_TAG_VAL,</div><div class='add'>+			      HAL_WBM_SCATTERED_DESC_MSB_BASE_ADDR_MATCH_TAG) |</div><div class='add'>+	      u32_encode_bits((u64)sbuf[0].paddr &gt;&gt; HAL_ADDR_MSB_REG_SHIFT,</div><div class='add'>+			      HAL_WBM_SCATTERED_DESC_MSB_BASE_ADDR_39_32);</div><div class='add'>+	ath12k_hif_write32(ab,</div><div class='add'>+			   HAL_SEQ_WCSS_UMAC_WBM_REG +</div><div class='add'>+			   HAL_WBM_SCATTERED_RING_BASE_MSB(ab),</div><div class='add'>+			   val);</div><div class='add'>+</div><div class='add'>+	/* Setup head and tail pointers for the idle list */</div><div class='add'>+	val = u32_encode_bits(sbuf[nsbufs - 1].paddr, BUFFER_ADDR_INFO0_ADDR);</div><div class='add'>+	ath12k_hif_write32(ab,</div><div class='add'>+			   HAL_SEQ_WCSS_UMAC_WBM_REG +</div><div class='add'>+			   HAL_WBM_SCATTERED_DESC_PTR_HEAD_INFO_IX0(ab),</div><div class='add'>+			   val);</div><div class='add'>+</div><div class='add'>+	val = u32_encode_bits(((u64)sbuf[nsbufs - 1].paddr &gt;&gt; HAL_ADDR_MSB_REG_SHIFT),</div><div class='add'>+			      HAL_WBM_SCATTERED_DESC_MSB_BASE_ADDR_39_32) |</div><div class='add'>+	       u32_encode_bits((end_offset &gt;&gt; 2),</div><div class='add'>+			       HAL_WBM_SCATTERED_DESC_HEAD_P_OFFSET_IX1);</div><div class='add'>+	ath12k_hif_write32(ab,</div><div class='add'>+			   HAL_SEQ_WCSS_UMAC_WBM_REG +</div><div class='add'>+			   HAL_WBM_SCATTERED_DESC_PTR_HEAD_INFO_IX1(ab),</div><div class='add'>+			   val);</div><div class='add'>+</div><div class='add'>+	val = u32_encode_bits(sbuf[0].paddr, BUFFER_ADDR_INFO0_ADDR);</div><div class='add'>+	ath12k_hif_write32(ab,</div><div class='add'>+			   HAL_SEQ_WCSS_UMAC_WBM_REG +</div><div class='add'>+			   HAL_WBM_SCATTERED_DESC_PTR_HEAD_INFO_IX0(ab),</div><div class='add'>+			   val);</div><div class='add'>+</div><div class='add'>+	val = u32_encode_bits(sbuf[0].paddr, BUFFER_ADDR_INFO0_ADDR);</div><div class='add'>+	ath12k_hif_write32(ab,</div><div class='add'>+			   HAL_SEQ_WCSS_UMAC_WBM_REG +</div><div class='add'>+			   HAL_WBM_SCATTERED_DESC_PTR_TAIL_INFO_IX0(ab),</div><div class='add'>+			   val);</div><div class='add'>+</div><div class='add'>+	val = u32_encode_bits(((u64)sbuf[0].paddr &gt;&gt; HAL_ADDR_MSB_REG_SHIFT),</div><div class='add'>+			      HAL_WBM_SCATTERED_DESC_MSB_BASE_ADDR_39_32) |</div><div class='add'>+	      u32_encode_bits(0, HAL_WBM_SCATTERED_DESC_TAIL_P_OFFSET_IX1);</div><div class='add'>+	ath12k_hif_write32(ab,</div><div class='add'>+			   HAL_SEQ_WCSS_UMAC_WBM_REG +</div><div class='add'>+			   HAL_WBM_SCATTERED_DESC_PTR_TAIL_INFO_IX1(ab),</div><div class='add'>+			   val);</div><div class='add'>+</div><div class='add'>+	val = 2 * tot_link_desc;</div><div class='add'>+	ath12k_hif_write32(ab,</div><div class='add'>+			   HAL_SEQ_WCSS_UMAC_WBM_REG +</div><div class='add'>+			   HAL_WBM_SCATTERED_DESC_PTR_HP_ADDR(ab),</div><div class='add'>+			   val);</div><div class='add'>+</div><div class='add'>+	/* Enable the SRNG */</div><div class='add'>+	val = u32_encode_bits(1, HAL_WBM_IDLE_LINK_RING_MISC_SRNG_ENABLE) |</div><div class='add'>+	      u32_encode_bits(1, HAL_WBM_IDLE_LINK_RING_MISC_RIND_ID_DISABLE);</div><div class='add'>+	ath12k_hif_write32(ab,</div><div class='add'>+			   HAL_SEQ_WCSS_UMAC_WBM_REG +</div><div class='add'>+			   HAL_WBM_IDLE_LINK_RING_MISC_ADDR(ab),</div><div class='add'>+			   val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_hal_srng_setup(struct ath12k_base *ab, enum hal_ring_type type,</div><div class='add'>+			  int ring_num, int mac_id,</div><div class='add'>+			  struct hal_srng_params *params)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hal *hal = &amp;ab-&gt;hal;</div><div class='add'>+	struct hal_srng_config *srng_config = &amp;ab-&gt;hal.srng_config[type];</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	int ring_id;</div><div class='add'>+	u32 idx;</div><div class='add'>+	int i;</div><div class='add'>+	u32 reg_base;</div><div class='add'>+</div><div class='add'>+	ring_id = ath12k_hal_srng_get_ring_id(ab, type, ring_num, mac_id);</div><div class='add'>+	if (ring_id &lt; 0)</div><div class='add'>+		return ring_id;</div><div class='add'>+</div><div class='add'>+	srng = &amp;hal-&gt;srng_list[ring_id];</div><div class='add'>+</div><div class='add'>+	srng-&gt;ring_id = ring_id;</div><div class='add'>+	srng-&gt;ring_dir = srng_config-&gt;ring_dir;</div><div class='add'>+	srng-&gt;ring_base_paddr = params-&gt;ring_base_paddr;</div><div class='add'>+	srng-&gt;ring_base_vaddr = params-&gt;ring_base_vaddr;</div><div class='add'>+	srng-&gt;entry_size = srng_config-&gt;entry_size;</div><div class='add'>+	srng-&gt;num_entries = params-&gt;num_entries;</div><div class='add'>+	srng-&gt;ring_size = srng-&gt;entry_size * srng-&gt;num_entries;</div><div class='add'>+	srng-&gt;intr_batch_cntr_thres_entries =</div><div class='add'>+				params-&gt;intr_batch_cntr_thres_entries;</div><div class='add'>+	srng-&gt;intr_timer_thres_us = params-&gt;intr_timer_thres_us;</div><div class='add'>+	srng-&gt;flags = params-&gt;flags;</div><div class='add'>+	srng-&gt;msi_addr = params-&gt;msi_addr;</div><div class='add'>+	srng-&gt;msi2_addr = params-&gt;msi2_addr;</div><div class='add'>+	srng-&gt;msi_data = params-&gt;msi_data;</div><div class='add'>+	srng-&gt;msi2_data = params-&gt;msi2_data;</div><div class='add'>+	srng-&gt;initialized = 1;</div><div class='add'>+	spin_lock_init(&amp;srng-&gt;lock);</div><div class='add'>+	lockdep_set_class(&amp;srng-&gt;lock, &amp;srng-&gt;lock_key);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HAL_SRNG_NUM_REG_GRP; i++) {</div><div class='add'>+		srng-&gt;hwreg_base[i] = srng_config-&gt;reg_start[i] +</div><div class='add'>+				      (ring_num * srng_config-&gt;reg_size[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(srng-&gt;ring_base_vaddr, 0,</div><div class='add'>+	       (srng-&gt;entry_size * srng-&gt;num_entries) &lt;&lt; 2);</div><div class='add'>+</div><div class='add'>+	reg_base = srng-&gt;hwreg_base[HAL_SRNG_REG_GRP_R2];</div><div class='add'>+</div><div class='add'>+	if (srng-&gt;ring_dir == HAL_SRNG_DIR_SRC) {</div><div class='add'>+		srng-&gt;u.src_ring.hp = 0;</div><div class='add'>+		srng-&gt;u.src_ring.cached_tp = 0;</div><div class='add'>+		srng-&gt;u.src_ring.reap_hp = srng-&gt;ring_size - srng-&gt;entry_size;</div><div class='add'>+		srng-&gt;u.src_ring.tp_addr = (void *)(hal-&gt;rdp.vaddr + ring_id);</div><div class='add'>+		srng-&gt;u.src_ring.low_threshold = params-&gt;low_threshold *</div><div class='add'>+						 srng-&gt;entry_size;</div><div class='add'>+		if (srng_config-&gt;mac_type == ATH12K_HAL_SRNG_UMAC) {</div><div class='add'>+			if (!ab-&gt;hw_params-&gt;supports_shadow_regs)</div><div class='add'>+				srng-&gt;u.src_ring.hp_addr =</div><div class='add'>+					(u32 *)((unsigned long)ab-&gt;mem + reg_base);</div><div class='add'>+			else</div><div class='add'>+				ath12k_dbg(ab, ATH12K_DBG_HAL,</div><div class='add'>+					   "hal type %d ring_num %d reg_base 0x%x shadow 0x%lx\n",</div><div class='add'>+					   type, ring_num,</div><div class='add'>+					   reg_base,</div><div class='add'>+					   (unsigned long)srng-&gt;u.src_ring.hp_addr -</div><div class='add'>+					   (unsigned long)ab-&gt;mem);</div><div class='add'>+		} else {</div><div class='add'>+			idx = ring_id - HAL_SRNG_RING_ID_DMAC_CMN_ID_START;</div><div class='add'>+			srng-&gt;u.src_ring.hp_addr = (void *)(hal-&gt;wrp.vaddr +</div><div class='add'>+						   idx);</div><div class='add'>+			srng-&gt;flags |= HAL_SRNG_FLAGS_LMAC_RING;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* During initialization loop count in all the descriptors</div><div class='add'>+		 * will be set to zero, and HW will set it to 1 on completing</div><div class='add'>+		 * descriptor update in first loop, and increments it by 1 on</div><div class='add'>+		 * subsequent loops (loop count wraps around after reaching</div><div class='add'>+		 * 0xffff). The 'loop_cnt' in SW ring state is the expected</div><div class='add'>+		 * loop count in descriptors updated by HW (to be processed</div><div class='add'>+		 * by SW).</div><div class='add'>+		 */</div><div class='add'>+		srng-&gt;u.dst_ring.loop_cnt = 1;</div><div class='add'>+		srng-&gt;u.dst_ring.tp = 0;</div><div class='add'>+		srng-&gt;u.dst_ring.cached_hp = 0;</div><div class='add'>+		srng-&gt;u.dst_ring.hp_addr = (void *)(hal-&gt;rdp.vaddr + ring_id);</div><div class='add'>+		if (srng_config-&gt;mac_type == ATH12K_HAL_SRNG_UMAC) {</div><div class='add'>+			if (!ab-&gt;hw_params-&gt;supports_shadow_regs)</div><div class='add'>+				srng-&gt;u.dst_ring.tp_addr =</div><div class='add'>+					(u32 *)((unsigned long)ab-&gt;mem + reg_base +</div><div class='add'>+					(HAL_REO1_RING_TP - HAL_REO1_RING_HP));</div><div class='add'>+			else</div><div class='add'>+				ath12k_dbg(ab, ATH12K_DBG_HAL,</div><div class='add'>+					   "type %d ring_num %d target_reg 0x%x shadow 0x%lx\n",</div><div class='add'>+					   type, ring_num,</div><div class='add'>+					   reg_base + HAL_REO1_RING_TP - HAL_REO1_RING_HP,</div><div class='add'>+					   (unsigned long)srng-&gt;u.dst_ring.tp_addr -</div><div class='add'>+					   (unsigned long)ab-&gt;mem);</div><div class='add'>+		} else {</div><div class='add'>+			/* For PMAC &amp; DMAC rings, tail pointer updates will be done</div><div class='add'>+			 * through FW by writing to a shared memory location</div><div class='add'>+			 */</div><div class='add'>+			idx = ring_id - HAL_SRNG_RING_ID_DMAC_CMN_ID_START;</div><div class='add'>+			srng-&gt;u.dst_ring.tp_addr = (void *)(hal-&gt;wrp.vaddr +</div><div class='add'>+						   idx);</div><div class='add'>+			srng-&gt;flags |= HAL_SRNG_FLAGS_LMAC_RING;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (srng_config-&gt;mac_type != ATH12K_HAL_SRNG_UMAC)</div><div class='add'>+		return ring_id;</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_hw_init(ab, srng);</div><div class='add'>+</div><div class='add'>+	if (type == HAL_CE_DST) {</div><div class='add'>+		srng-&gt;u.dst_ring.max_buffer_length = params-&gt;max_buffer_len;</div><div class='add'>+		ath12k_hal_ce_dst_setup(ab, srng, ring_num);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ring_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_hal_srng_update_hp_tp_addr(struct ath12k_base *ab,</div><div class='add'>+					      int shadow_cfg_idx,</div><div class='add'>+					      enum hal_ring_type ring_type,</div><div class='add'>+					      int ring_num)</div><div class='add'>+{</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	struct ath12k_hal *hal = &amp;ab-&gt;hal;</div><div class='add'>+	int ring_id;</div><div class='add'>+	struct hal_srng_config *srng_config = &amp;hal-&gt;srng_config[ring_type];</div><div class='add'>+</div><div class='add'>+	ring_id = ath12k_hal_srng_get_ring_id(ab, ring_type, ring_num, 0);</div><div class='add'>+	if (ring_id &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	srng = &amp;hal-&gt;srng_list[ring_id];</div><div class='add'>+</div><div class='add'>+	if (srng_config-&gt;ring_dir == HAL_SRNG_DIR_DST)</div><div class='add'>+		srng-&gt;u.dst_ring.tp_addr = (u32 *)(HAL_SHADOW_REG(shadow_cfg_idx) +</div><div class='add'>+						   (unsigned long)ab-&gt;mem);</div><div class='add'>+	else</div><div class='add'>+		srng-&gt;u.src_ring.hp_addr = (u32 *)(HAL_SHADOW_REG(shadow_cfg_idx) +</div><div class='add'>+						   (unsigned long)ab-&gt;mem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_hal_srng_update_shadow_config(struct ath12k_base *ab,</div><div class='add'>+					 enum hal_ring_type ring_type,</div><div class='add'>+					 int ring_num)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hal *hal = &amp;ab-&gt;hal;</div><div class='add'>+	struct hal_srng_config *srng_config = &amp;hal-&gt;srng_config[ring_type];</div><div class='add'>+	int shadow_cfg_idx = hal-&gt;num_shadow_reg_configured;</div><div class='add'>+	u32 target_reg;</div><div class='add'>+</div><div class='add'>+	if (shadow_cfg_idx &gt;= HAL_SHADOW_NUM_REGS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	hal-&gt;num_shadow_reg_configured++;</div><div class='add'>+</div><div class='add'>+	target_reg = srng_config-&gt;reg_start[HAL_HP_OFFSET_IN_REG_START];</div><div class='add'>+	target_reg += srng_config-&gt;reg_size[HAL_HP_OFFSET_IN_REG_START] *</div><div class='add'>+		ring_num;</div><div class='add'>+</div><div class='add'>+	/* For destination ring, shadow the TP */</div><div class='add'>+	if (srng_config-&gt;ring_dir == HAL_SRNG_DIR_DST)</div><div class='add'>+		target_reg += HAL_OFFSET_FROM_HP_TO_TP;</div><div class='add'>+</div><div class='add'>+	hal-&gt;shadow_reg_addr[shadow_cfg_idx] = target_reg;</div><div class='add'>+</div><div class='add'>+	/* update hp/tp addr to hal structure*/</div><div class='add'>+	ath12k_hal_srng_update_hp_tp_addr(ab, shadow_cfg_idx, ring_type,</div><div class='add'>+					  ring_num);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_HAL,</div><div class='add'>+		   "target_reg %x, shadow reg 0x%x shadow_idx 0x%x, ring_type %d, ring num %d",</div><div class='add'>+		  target_reg,</div><div class='add'>+		  HAL_SHADOW_REG(shadow_cfg_idx),</div><div class='add'>+		  shadow_cfg_idx,</div><div class='add'>+		  ring_type, ring_num);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_srng_shadow_config(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hal *hal = &amp;ab-&gt;hal;</div><div class='add'>+	int ring_type, ring_num;</div><div class='add'>+</div><div class='add'>+	/* update all the non-CE srngs. */</div><div class='add'>+	for (ring_type = 0; ring_type &lt; HAL_MAX_RING_TYPES; ring_type++) {</div><div class='add'>+		struct hal_srng_config *srng_config = &amp;hal-&gt;srng_config[ring_type];</div><div class='add'>+</div><div class='add'>+		if (ring_type == HAL_CE_SRC ||</div><div class='add'>+		    ring_type == HAL_CE_DST ||</div><div class='add'>+			ring_type == HAL_CE_DST_STATUS)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (srng_config-&gt;mac_type == ATH12K_HAL_SRNG_DMAC ||</div><div class='add'>+		    srng_config-&gt;mac_type == ATH12K_HAL_SRNG_PMAC)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (ring_num = 0; ring_num &lt; srng_config-&gt;max_rings; ring_num++)</div><div class='add'>+			ath12k_hal_srng_update_shadow_config(ab, ring_type, ring_num);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_srng_get_shadow_config(struct ath12k_base *ab,</div><div class='add'>+				       u32 **cfg, u32 *len)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hal *hal = &amp;ab-&gt;hal;</div><div class='add'>+</div><div class='add'>+	*len = hal-&gt;num_shadow_reg_configured;</div><div class='add'>+	*cfg = hal-&gt;shadow_reg_addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_srng_shadow_update_hp_tp(struct ath12k_base *ab,</div><div class='add'>+					 struct hal_srng *srng)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* check whether the ring is empty. Update the shadow</div><div class='add'>+	 * HP only when then ring isn't' empty.</div><div class='add'>+	 */</div><div class='add'>+	if (srng-&gt;ring_dir == HAL_SRNG_DIR_SRC &amp;&amp;</div><div class='add'>+	    *srng-&gt;u.src_ring.tp_addr != srng-&gt;u.src_ring.hp)</div><div class='add'>+		ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_hal_register_srng_lock_keys(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hal *hal = &amp;ab-&gt;hal;</div><div class='add'>+	u32 ring_id;</div><div class='add'>+</div><div class='add'>+	for (ring_id = 0; ring_id &lt; HAL_SRNG_RING_ID_MAX; ring_id++)</div><div class='add'>+		lockdep_register_key(&amp;hal-&gt;srng_list[ring_id].lock_key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_hal_unregister_srng_lock_keys(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hal *hal = &amp;ab-&gt;hal;</div><div class='add'>+	u32 ring_id;</div><div class='add'>+</div><div class='add'>+	for (ring_id = 0; ring_id &lt; HAL_SRNG_RING_ID_MAX; ring_id++)</div><div class='add'>+		lockdep_unregister_key(&amp;hal-&gt;srng_list[ring_id].lock_key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_hal_srng_init(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hal *hal = &amp;ab-&gt;hal;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memset(hal, 0, sizeof(*hal));</div><div class='add'>+</div><div class='add'>+	ret = ab-&gt;hw_params-&gt;hal_ops-&gt;create_srng_config(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_hal;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_hal_alloc_cont_rdp(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_hal;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_hal_alloc_cont_wrp(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free_cont_rdp;</div><div class='add'>+</div><div class='add'>+	ath12k_hal_register_srng_lock_keys(ab);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_cont_rdp:</div><div class='add'>+	ath12k_hal_free_cont_rdp(ab);</div><div class='add'>+</div><div class='add'>+err_hal:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_srng_deinit(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hal *hal = &amp;ab-&gt;hal;</div><div class='add'>+</div><div class='add'>+	ath12k_hal_unregister_srng_lock_keys(ab);</div><div class='add'>+	ath12k_hal_free_cont_rdp(ab);</div><div class='add'>+	ath12k_hal_free_cont_wrp(ab);</div><div class='add'>+	kfree(hal-&gt;srng_config);</div><div class='add'>+	hal-&gt;srng_config = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_dump_srng_stats(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct hal_srng *srng;</div><div class='add'>+	struct ath12k_ext_irq_grp *irq_grp;</div><div class='add'>+	struct ath12k_ce_pipe *ce_pipe;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ath12k_err(ab, "Last interrupt received for each CE:\n");</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;ce_count; i++) {</div><div class='add'>+		ce_pipe = &amp;ab-&gt;ce.ce_pipe[i];</div><div class='add'>+</div><div class='add'>+		if (ath12k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ath12k_err(ab, "CE_id %d pipe_num %d %ums before\n",</div><div class='add'>+			   i, ce_pipe-&gt;pipe_num,</div><div class='add'>+			   jiffies_to_msecs(jiffies - ce_pipe-&gt;timestamp));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_err(ab, "\nLast interrupt received for each group:\n");</div><div class='add'>+	for (i = 0; i &lt; ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) {</div><div class='add'>+		irq_grp = &amp;ab-&gt;ext_irq_grp[i];</div><div class='add'>+		ath12k_err(ab, "group_id %d %ums before\n",</div><div class='add'>+			   irq_grp-&gt;grp_id,</div><div class='add'>+			   jiffies_to_msecs(jiffies - irq_grp-&gt;timestamp));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HAL_SRNG_RING_ID_MAX; i++) {</div><div class='add'>+		srng = &amp;ab-&gt;hal.srng_list[i];</div><div class='add'>+</div><div class='add'>+		if (!srng-&gt;initialized)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (srng-&gt;ring_dir == HAL_SRNG_DIR_SRC)</div><div class='add'>+			ath12k_err(ab,</div><div class='add'>+				   "src srng id %u hp %u, reap_hp %u, cur tp %u, cached tp %u last tp %u napi processed before %ums\n",</div><div class='add'>+				   srng-&gt;ring_id, srng-&gt;u.src_ring.hp,</div><div class='add'>+				   srng-&gt;u.src_ring.reap_hp,</div><div class='add'>+				   *srng-&gt;u.src_ring.tp_addr, srng-&gt;u.src_ring.cached_tp,</div><div class='add'>+				   srng-&gt;u.src_ring.last_tp,</div><div class='add'>+				   jiffies_to_msecs(jiffies - srng-&gt;timestamp));</div><div class='add'>+		else if (srng-&gt;ring_dir == HAL_SRNG_DIR_DST)</div><div class='add'>+			ath12k_err(ab,</div><div class='add'>+				   "dst srng id %u tp %u, cur hp %u, cached hp %u last hp %u napi processed before %ums\n",</div><div class='add'>+				   srng-&gt;ring_id, srng-&gt;u.dst_ring.tp,</div><div class='add'>+				   *srng-&gt;u.dst_ring.hp_addr,</div><div class='add'>+				   srng-&gt;u.dst_ring.cached_hp,</div><div class='add'>+				   srng-&gt;u.dst_ring.last_hp,</div><div class='add'>+				   jiffies_to_msecs(jiffies - srng-&gt;timestamp));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/hal.h b/drivers/net/wireless/ath/ath12k/hal.h<br/>new file mode 100644<br/>index 000000000000..efe00e167998<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/hal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/hal.h</a></div><div class='hunk'>@@ -0,0 +1,1181 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH12K_HAL_H</div><div class='add'>+#define ATH12K_HAL_H</div><div class='add'>+</div><div class='add'>+#include "hal_desc.h"</div><div class='add'>+#include "rx_desc.h"</div><div class='add'>+</div><div class='add'>+struct ath12k_base;</div><div class='add'>+#define HAL_CE_REMAP_REG_BASE	(ab-&gt;ce_remap_base_addr)</div><div class='add'>+</div><div class='add'>+#define HAL_LINK_DESC_SIZE			(32 &lt;&lt; 2)</div><div class='add'>+#define HAL_LINK_DESC_ALIGN			128</div><div class='add'>+#define HAL_NUM_MPDUS_PER_LINK_DESC		6</div><div class='add'>+#define HAL_NUM_TX_MSDUS_PER_LINK_DESC		7</div><div class='add'>+#define HAL_NUM_RX_MSDUS_PER_LINK_DESC		6</div><div class='add'>+#define HAL_NUM_MPDU_LINKS_PER_QUEUE_DESC	12</div><div class='add'>+#define HAL_MAX_AVAIL_BLK_RES			3</div><div class='add'>+</div><div class='add'>+#define HAL_RING_BASE_ALIGN	8</div><div class='add'>+#define HAL_REO_QLUT_ADDR_ALIGN 256</div><div class='add'>+</div><div class='add'>+#define HAL_WBM_IDLE_SCATTER_BUF_SIZE_MAX	32704</div><div class='add'>+/* TODO: Check with hw team on the supported scatter buf size */</div><div class='add'>+#define HAL_WBM_IDLE_SCATTER_NEXT_PTR_SIZE	8</div><div class='add'>+#define HAL_WBM_IDLE_SCATTER_BUF_SIZE (HAL_WBM_IDLE_SCATTER_BUF_SIZE_MAX - \</div><div class='add'>+				       HAL_WBM_IDLE_SCATTER_NEXT_PTR_SIZE)</div><div class='add'>+</div><div class='add'>+/* TODO: 16 entries per radio times MAX_VAPS_SUPPORTED */</div><div class='add'>+#define HAL_DSCP_TID_MAP_TBL_NUM_ENTRIES_MAX	32</div><div class='add'>+#define HAL_DSCP_TID_TBL_SIZE			24</div><div class='add'>+</div><div class='add'>+/* calculate the register address from bar0 of shadow register x */</div><div class='add'>+#define HAL_SHADOW_BASE_ADDR			0x000008fc</div><div class='add'>+#define HAL_SHADOW_NUM_REGS			40</div><div class='add'>+#define HAL_HP_OFFSET_IN_REG_START		1</div><div class='add'>+#define HAL_OFFSET_FROM_HP_TO_TP		4</div><div class='add'>+</div><div class='add'>+#define HAL_SHADOW_REG(x) (HAL_SHADOW_BASE_ADDR + (4 * (x)))</div><div class='add'>+#define HAL_REO_QDESC_MAX_PEERID		8191</div><div class='add'>+</div><div class='add'>+/* WCSS Relative address */</div><div class='add'>+#define HAL_SEQ_WCSS_CMEM_OFFSET		0x00100000</div><div class='add'>+#define HAL_SEQ_WCSS_UMAC_OFFSET		0x00a00000</div><div class='add'>+#define HAL_SEQ_WCSS_UMAC_REO_REG		0x00a38000</div><div class='add'>+#define HAL_SEQ_WCSS_UMAC_TCL_REG		0x00a44000</div><div class='add'>+#define HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_umac_ce0_src_reg_base)</div><div class='add'>+#define HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_umac_ce0_dest_reg_base)</div><div class='add'>+#define HAL_SEQ_WCSS_UMAC_CE1_SRC_REG(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_umac_ce1_src_reg_base)</div><div class='add'>+#define HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_umac_ce1_dest_reg_base)</div><div class='add'>+#define HAL_SEQ_WCSS_UMAC_WBM_REG		0x00a34000</div><div class='add'>+</div><div class='add'>+#define HAL_CE_WFSS_CE_REG_BASE			0x01b80000</div><div class='add'>+</div><div class='add'>+#define HAL_TCL_SW_CONFIG_BANK_ADDR		0x00a4408c</div><div class='add'>+</div><div class='add'>+/* SW2TCL(x) R0 ring configuration address */</div><div class='add'>+#define HAL_TCL1_RING_CMN_CTRL_REG		0x00000020</div><div class='add'>+#define HAL_TCL1_RING_DSCP_TID_MAP		0x00000240</div><div class='add'>+#define HAL_TCL1_RING_BASE_LSB(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_tcl1_ring_base_lsb)</div><div class='add'>+#define HAL_TCL1_RING_BASE_MSB(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_tcl1_ring_base_msb)</div><div class='add'>+#define HAL_TCL1_RING_ID(ab)			((ab)-&gt;hw_params-&gt;regs-&gt;hal_tcl1_ring_id)</div><div class='add'>+#define HAL_TCL1_RING_MISC(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_tcl1_ring_misc)</div><div class='add'>+#define HAL_TCL1_RING_TP_ADDR_LSB(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_tcl1_ring_tp_addr_lsb)</div><div class='add'>+#define HAL_TCL1_RING_TP_ADDR_MSB(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_tcl1_ring_tp_addr_msb)</div><div class='add'>+#define HAL_TCL1_RING_CONSUMER_INT_SETUP_IX0(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_tcl1_ring_consumer_int_setup_ix0)</div><div class='add'>+#define HAL_TCL1_RING_CONSUMER_INT_SETUP_IX1(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_tcl1_ring_consumer_int_setup_ix1)</div><div class='add'>+#define HAL_TCL1_RING_MSI1_BASE_LSB(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_tcl1_ring_msi1_base_lsb)</div><div class='add'>+#define HAL_TCL1_RING_MSI1_BASE_MSB(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_tcl1_ring_msi1_base_msb)</div><div class='add'>+#define HAL_TCL1_RING_MSI1_DATA(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_tcl1_ring_msi1_data)</div><div class='add'>+#define HAL_TCL2_RING_BASE_LSB(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_tcl2_ring_base_lsb)</div><div class='add'>+#define HAL_TCL_RING_BASE_LSB(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_tcl_ring_base_lsb)</div><div class='add'>+</div><div class='add'>+#define HAL_TCL1_RING_MSI1_BASE_LSB_OFFSET(ab) ({ typeof(ab) _ab = (ab); \</div><div class='add'>+	(HAL_TCL1_RING_MSI1_BASE_LSB(_ab) - HAL_TCL1_RING_BASE_LSB(_ab)); })</div><div class='add'>+#define HAL_TCL1_RING_MSI1_BASE_MSB_OFFSET(ab)	({ typeof(ab) _ab = (ab); \</div><div class='add'>+	(HAL_TCL1_RING_MSI1_BASE_MSB(_ab) - HAL_TCL1_RING_BASE_LSB(_ab)); })</div><div class='add'>+#define HAL_TCL1_RING_MSI1_DATA_OFFSET(ab) ({ typeof(ab) _ab = (ab); \</div><div class='add'>+	(HAL_TCL1_RING_MSI1_DATA(_ab) - HAL_TCL1_RING_BASE_LSB(_ab)); })</div><div class='add'>+#define HAL_TCL1_RING_BASE_MSB_OFFSET(ab) ({ typeof(ab) _ab = (ab); \</div><div class='add'>+	(HAL_TCL1_RING_BASE_MSB(_ab) - HAL_TCL1_RING_BASE_LSB(_ab)); })</div><div class='add'>+#define HAL_TCL1_RING_ID_OFFSET(ab) ({ typeof(ab) _ab = (ab); \</div><div class='add'>+	(HAL_TCL1_RING_ID(_ab) - HAL_TCL1_RING_BASE_LSB(_ab)); })</div><div class='add'>+#define HAL_TCL1_RING_CONSR_INT_SETUP_IX0_OFFSET(ab) ({ typeof(ab) _ab = (ab); \</div><div class='add'>+	(HAL_TCL1_RING_CONSUMER_INT_SETUP_IX0(_ab) - HAL_TCL1_RING_BASE_LSB(_ab)); })</div><div class='add'>+#define HAL_TCL1_RING_CONSR_INT_SETUP_IX1_OFFSET(ab) ({ typeof(ab) _ab = (ab); \</div><div class='add'>+	(HAL_TCL1_RING_CONSUMER_INT_SETUP_IX1(_ab) - HAL_TCL1_RING_BASE_LSB(_ab)); })</div><div class='add'>+#define HAL_TCL1_RING_TP_ADDR_LSB_OFFSET(ab) ({ typeof(ab) _ab = (ab); \</div><div class='add'>+	(HAL_TCL1_RING_TP_ADDR_LSB(_ab) - HAL_TCL1_RING_BASE_LSB(_ab)); })</div><div class='add'>+#define HAL_TCL1_RING_TP_ADDR_MSB_OFFSET(ab) ({ typeof(ab) _ab = (ab); \</div><div class='add'>+	(HAL_TCL1_RING_TP_ADDR_MSB(_ab) - HAL_TCL1_RING_BASE_LSB(_ab)); })</div><div class='add'>+#define HAL_TCL1_RING_MISC_OFFSET(ab) ({ typeof(ab) _ab = (ab); \</div><div class='add'>+	(HAL_TCL1_RING_MISC(_ab) - HAL_TCL1_RING_BASE_LSB(_ab)); })</div><div class='add'>+</div><div class='add'>+/* SW2TCL(x) R2 ring pointers (head/tail) address */</div><div class='add'>+#define HAL_TCL1_RING_HP			0x00002000</div><div class='add'>+#define HAL_TCL1_RING_TP			0x00002004</div><div class='add'>+#define HAL_TCL2_RING_HP			0x00002008</div><div class='add'>+#define HAL_TCL_RING_HP				0x00002028</div><div class='add'>+</div><div class='add'>+#define HAL_TCL1_RING_TP_OFFSET \</div><div class='add'>+		(HAL_TCL1_RING_TP - HAL_TCL1_RING_HP)</div><div class='add'>+</div><div class='add'>+/* TCL STATUS ring address */</div><div class='add'>+#define HAL_TCL_STATUS_RING_BASE_LSB(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_tcl_status_ring_base_lsb)</div><div class='add'>+#define HAL_TCL_STATUS_RING_HP			0x00002048</div><div class='add'>+</div><div class='add'>+/* PPE2TCL1 Ring address */</div><div class='add'>+#define HAL_TCL_PPE2TCL1_RING_BASE_LSB		0x00000c48</div><div class='add'>+#define HAL_TCL_PPE2TCL1_RING_HP		0x00002038</div><div class='add'>+</div><div class='add'>+/* WBM PPE Release Ring address */</div><div class='add'>+#define HAL_WBM_PPE_RELEASE_RING_BASE_LSB(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_ppe_rel_ring_base)</div><div class='add'>+#define HAL_WBM_PPE_RELEASE_RING_HP		0x00003020</div><div class='add'>+</div><div class='add'>+/* REO2SW(x) R0 ring configuration address */</div><div class='add'>+#define HAL_REO1_GEN_ENABLE			0x00000000</div><div class='add'>+#define HAL_REO1_MISC_CTRL_ADDR(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo1_misc_ctrl_addr)</div><div class='add'>+#define HAL_REO1_DEST_RING_CTRL_IX_0		0x00000004</div><div class='add'>+#define HAL_REO1_DEST_RING_CTRL_IX_1		0x00000008</div><div class='add'>+#define HAL_REO1_DEST_RING_CTRL_IX_2		0x0000000c</div><div class='add'>+#define HAL_REO1_DEST_RING_CTRL_IX_3		0x00000010</div><div class='add'>+#define HAL_REO1_QDESC_ADDR(ab)		((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo1_qdesc_addr)</div><div class='add'>+#define HAL_REO1_QDESC_MAX_PEERID(ab)	((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo1_qdesc_max_peerid)</div><div class='add'>+#define HAL_REO1_SW_COOKIE_CFG0(ab)	((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo1_sw_cookie_cfg0)</div><div class='add'>+#define HAL_REO1_SW_COOKIE_CFG1(ab)	((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo1_sw_cookie_cfg1)</div><div class='add'>+#define HAL_REO1_QDESC_LUT_BASE0(ab)	((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo1_qdesc_lut_base0)</div><div class='add'>+#define HAL_REO1_QDESC_LUT_BASE1(ab)	((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo1_qdesc_lut_base1)</div><div class='add'>+#define HAL_REO1_RING_BASE_LSB(ab)	((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo1_ring_base_lsb)</div><div class='add'>+#define HAL_REO1_RING_BASE_MSB(ab)	((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo1_ring_base_msb)</div><div class='add'>+#define HAL_REO1_RING_ID(ab)		((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo1_ring_id)</div><div class='add'>+#define HAL_REO1_RING_MISC(ab)		((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo1_ring_misc)</div><div class='add'>+#define HAL_REO1_RING_HP_ADDR_LSB(ab)	((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo1_ring_hp_addr_lsb)</div><div class='add'>+#define HAL_REO1_RING_HP_ADDR_MSB(ab)	((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo1_ring_hp_addr_msb)</div><div class='add'>+#define HAL_REO1_RING_PRODUCER_INT_SETUP(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo1_ring_producer_int_setup)</div><div class='add'>+#define HAL_REO1_RING_MSI1_BASE_LSB(ab)	\</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo1_ring_msi1_base_lsb)</div><div class='add'>+#define HAL_REO1_RING_MSI1_BASE_MSB(ab)	\</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo1_ring_msi1_base_msb)</div><div class='add'>+#define HAL_REO1_RING_MSI1_DATA(ab)	((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo1_ring_msi1_data)</div><div class='add'>+#define HAL_REO2_RING_BASE_LSB(ab)	((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo2_ring_base)</div><div class='add'>+#define HAL_REO1_AGING_THRESH_IX_0(ab)	((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo1_aging_thres_ix0)</div><div class='add'>+#define HAL_REO1_AGING_THRESH_IX_1(ab)	((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo1_aging_thres_ix1)</div><div class='add'>+#define HAL_REO1_AGING_THRESH_IX_2(ab)	((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo1_aging_thres_ix2)</div><div class='add'>+#define HAL_REO1_AGING_THRESH_IX_3(ab)	((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo1_aging_thres_ix3)</div><div class='add'>+</div><div class='add'>+/* REO2SW(x) R2 ring pointers (head/tail) address */</div><div class='add'>+#define HAL_REO1_RING_HP			0x00003048</div><div class='add'>+#define HAL_REO1_RING_TP			0x0000304c</div><div class='add'>+#define HAL_REO2_RING_HP			0x00003050</div><div class='add'>+</div><div class='add'>+#define HAL_REO1_RING_TP_OFFSET			(HAL_REO1_RING_TP - HAL_REO1_RING_HP)</div><div class='add'>+</div><div class='add'>+/* REO2SW0 ring configuration address */</div><div class='add'>+#define HAL_REO_SW0_RING_BASE_LSB(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo2_sw0_ring_base)</div><div class='add'>+</div><div class='add'>+/* REO2SW0 R2 ring pointer (head/tail) address */</div><div class='add'>+#define HAL_REO_SW0_RING_HP			0x00003088</div><div class='add'>+</div><div class='add'>+/* REO CMD R0 address */</div><div class='add'>+#define HAL_REO_CMD_RING_BASE_LSB(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo_cmd_ring_base)</div><div class='add'>+</div><div class='add'>+/* REO CMD R2 address */</div><div class='add'>+#define HAL_REO_CMD_HP				0x00003020</div><div class='add'>+</div><div class='add'>+/* SW2REO R0 address */</div><div class='add'>+#define	HAL_SW2REO_RING_BASE_LSB(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_sw2reo_ring_base)</div><div class='add'>+#define HAL_SW2REO1_RING_BASE_LSB(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_sw2reo1_ring_base)</div><div class='add'>+</div><div class='add'>+/* SW2REO R2 address */</div><div class='add'>+#define HAL_SW2REO_RING_HP			0x00003028</div><div class='add'>+#define HAL_SW2REO1_RING_HP			0x00003030</div><div class='add'>+</div><div class='add'>+/* CE ring R0 address */</div><div class='add'>+#define HAL_CE_SRC_RING_BASE_LSB                0x00000000</div><div class='add'>+#define HAL_CE_DST_RING_BASE_LSB		0x00000000</div><div class='add'>+#define HAL_CE_DST_STATUS_RING_BASE_LSB		0x00000058</div><div class='add'>+#define HAL_CE_DST_RING_CTRL			0x000000b0</div><div class='add'>+</div><div class='add'>+/* CE ring R2 address */</div><div class='add'>+#define HAL_CE_DST_RING_HP			0x00000400</div><div class='add'>+#define HAL_CE_DST_STATUS_RING_HP		0x00000408</div><div class='add'>+</div><div class='add'>+/* REO status address */</div><div class='add'>+#define HAL_REO_STATUS_RING_BASE_LSB(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_reo_status_ring_base)</div><div class='add'>+#define HAL_REO_STATUS_HP			0x000030a8</div><div class='add'>+</div><div class='add'>+/* WBM Idle R0 address */</div><div class='add'>+#define HAL_WBM_IDLE_LINK_RING_BASE_LSB(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_wbm_idle_ring_base_lsb)</div><div class='add'>+#define HAL_WBM_IDLE_LINK_RING_MISC_ADDR(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_wbm_idle_ring_misc_addr)</div><div class='add'>+#define HAL_WBM_R0_IDLE_LIST_CONTROL_ADDR(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_wbm_r0_idle_list_cntl_addr)</div><div class='add'>+#define HAL_WBM_R0_IDLE_LIST_SIZE_ADDR(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_wbm_r0_idle_list_size_addr)</div><div class='add'>+#define HAL_WBM_SCATTERED_RING_BASE_LSB(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_wbm_scattered_ring_base_lsb)</div><div class='add'>+#define HAL_WBM_SCATTERED_RING_BASE_MSB(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_wbm_scattered_ring_base_msb)</div><div class='add'>+#define HAL_WBM_SCATTERED_DESC_PTR_HEAD_INFO_IX0(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_wbm_scattered_desc_head_info_ix0)</div><div class='add'>+#define HAL_WBM_SCATTERED_DESC_PTR_HEAD_INFO_IX1(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_wbm_scattered_desc_head_info_ix1)</div><div class='add'>+#define HAL_WBM_SCATTERED_DESC_PTR_TAIL_INFO_IX0(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_wbm_scattered_desc_tail_info_ix0)</div><div class='add'>+#define HAL_WBM_SCATTERED_DESC_PTR_TAIL_INFO_IX1(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_wbm_scattered_desc_tail_info_ix1)</div><div class='add'>+#define HAL_WBM_SCATTERED_DESC_PTR_HP_ADDR(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_wbm_scattered_desc_ptr_hp_addr)</div><div class='add'>+</div><div class='add'>+/* WBM Idle R2 address */</div><div class='add'>+#define HAL_WBM_IDLE_LINK_RING_HP		0x000030b8</div><div class='add'>+</div><div class='add'>+/* SW2WBM R0 release address */</div><div class='add'>+#define HAL_WBM_SW_RELEASE_RING_BASE_LSB(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_wbm_sw_release_ring_base_lsb)</div><div class='add'>+#define HAL_WBM_SW1_RELEASE_RING_BASE_LSB(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_wbm_sw1_release_ring_base_lsb)</div><div class='add'>+</div><div class='add'>+/* SW2WBM R2 release address */</div><div class='add'>+#define HAL_WBM_SW_RELEASE_RING_HP		0x00003010</div><div class='add'>+#define HAL_WBM_SW1_RELEASE_RING_HP		0x00003018</div><div class='add'>+</div><div class='add'>+/* WBM2SW R0 release address */</div><div class='add'>+#define HAL_WBM0_RELEASE_RING_BASE_LSB(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_wbm0_release_ring_base_lsb)</div><div class='add'>+</div><div class='add'>+#define HAL_WBM1_RELEASE_RING_BASE_LSB(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;hal_wbm1_release_ring_base_lsb)</div><div class='add'>+</div><div class='add'>+/* WBM2SW R2 release address */</div><div class='add'>+#define HAL_WBM0_RELEASE_RING_HP		0x000030c8</div><div class='add'>+#define HAL_WBM1_RELEASE_RING_HP		0x000030d0</div><div class='add'>+</div><div class='add'>+/* WBM cookie config address and mask */</div><div class='add'>+#define HAL_WBM_SW_COOKIE_CFG0			0x00000040</div><div class='add'>+#define HAL_WBM_SW_COOKIE_CFG1			0x00000044</div><div class='add'>+#define HAL_WBM_SW_COOKIE_CFG2			0x00000090</div><div class='add'>+#define HAL_WBM_SW_COOKIE_CONVERT_CFG		0x00000094</div><div class='add'>+</div><div class='add'>+#define HAL_WBM_SW_COOKIE_CFG_CMEM_BASE_ADDR_MSB	GENMASK(7, 0)</div><div class='add'>+#define HAL_WBM_SW_COOKIE_CFG_COOKIE_PPT_MSB		GENMASK(12, 8)</div><div class='add'>+#define HAL_WBM_SW_COOKIE_CFG_COOKIE_SPT_MSB		GENMASK(17, 13)</div><div class='add'>+#define HAL_WBM_SW_COOKIE_CFG_ALIGN			BIT(18)</div><div class='add'>+#define HAL_WBM_SW_COOKIE_CFG_RELEASE_PATH_EN		BIT(0)</div><div class='add'>+#define HAL_WBM_SW_COOKIE_CFG_ERR_PATH_EN		BIT(1)</div><div class='add'>+#define HAL_WBM_SW_COOKIE_CFG_CONV_IND_EN		BIT(3)</div><div class='add'>+</div><div class='add'>+#define HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW0_EN		BIT(1)</div><div class='add'>+#define HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW1_EN		BIT(2)</div><div class='add'>+#define HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW2_EN		BIT(3)</div><div class='add'>+#define HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW3_EN		BIT(4)</div><div class='add'>+#define HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW4_EN		BIT(5)</div><div class='add'>+#define HAL_WBM_SW_COOKIE_CONV_CFG_GLOBAL_EN		BIT(8)</div><div class='add'>+</div><div class='add'>+/* TCL ring field mask and offset */</div><div class='add'>+#define HAL_TCL1_RING_BASE_MSB_RING_SIZE		GENMASK(27, 8)</div><div class='add'>+#define HAL_TCL1_RING_BASE_MSB_RING_BASE_ADDR_MSB	GENMASK(7, 0)</div><div class='add'>+#define HAL_TCL1_RING_ID_ENTRY_SIZE			GENMASK(7, 0)</div><div class='add'>+#define HAL_TCL1_RING_MISC_MSI_RING_ID_DISABLE		BIT(0)</div><div class='add'>+#define HAL_TCL1_RING_MISC_MSI_LOOPCNT_DISABLE		BIT(1)</div><div class='add'>+#define HAL_TCL1_RING_MISC_MSI_SWAP			BIT(3)</div><div class='add'>+#define HAL_TCL1_RING_MISC_HOST_FW_SWAP			BIT(4)</div><div class='add'>+#define HAL_TCL1_RING_MISC_DATA_TLV_SWAP		BIT(5)</div><div class='add'>+#define HAL_TCL1_RING_MISC_SRNG_ENABLE			BIT(6)</div><div class='add'>+#define HAL_TCL1_RING_CONSR_INT_SETUP_IX0_INTR_TMR_THOLD   GENMASK(31, 16)</div><div class='add'>+#define HAL_TCL1_RING_CONSR_INT_SETUP_IX0_BATCH_COUNTER_THOLD GENMASK(14, 0)</div><div class='add'>+#define HAL_TCL1_RING_CONSR_INT_SETUP_IX1_LOW_THOLD	GENMASK(15, 0)</div><div class='add'>+#define HAL_TCL1_RING_MSI1_BASE_MSB_MSI1_ENABLE		BIT(8)</div><div class='add'>+#define HAL_TCL1_RING_MSI1_BASE_MSB_ADDR		GENMASK(7, 0)</div><div class='add'>+#define HAL_TCL1_RING_CMN_CTRL_DSCP_TID_MAP_PROG_EN	BIT(23)</div><div class='add'>+#define HAL_TCL1_RING_FIELD_DSCP_TID_MAP		GENMASK(31, 0)</div><div class='add'>+#define HAL_TCL1_RING_FIELD_DSCP_TID_MAP0		GENMASK(2, 0)</div><div class='add'>+#define HAL_TCL1_RING_FIELD_DSCP_TID_MAP1		GENMASK(5, 3)</div><div class='add'>+#define HAL_TCL1_RING_FIELD_DSCP_TID_MAP2		GENMASK(8, 6)</div><div class='add'>+#define HAL_TCL1_RING_FIELD_DSCP_TID_MAP3		GENMASK(11, 9)</div><div class='add'>+#define HAL_TCL1_RING_FIELD_DSCP_TID_MAP4		GENMASK(14, 12)</div><div class='add'>+#define HAL_TCL1_RING_FIELD_DSCP_TID_MAP5		GENMASK(17, 15)</div><div class='add'>+#define HAL_TCL1_RING_FIELD_DSCP_TID_MAP6		GENMASK(20, 18)</div><div class='add'>+#define HAL_TCL1_RING_FIELD_DSCP_TID_MAP7		GENMASK(23, 21)</div><div class='add'>+</div><div class='add'>+/* REO ring field mask and offset */</div><div class='add'>+#define HAL_REO1_RING_BASE_MSB_RING_SIZE		GENMASK(27, 8)</div><div class='add'>+#define HAL_REO1_RING_BASE_MSB_RING_BASE_ADDR_MSB	GENMASK(7, 0)</div><div class='add'>+#define HAL_REO1_RING_ID_RING_ID			GENMASK(15, 8)</div><div class='add'>+#define HAL_REO1_RING_ID_ENTRY_SIZE			GENMASK(7, 0)</div><div class='add'>+#define HAL_REO1_RING_MISC_MSI_SWAP			BIT(3)</div><div class='add'>+#define HAL_REO1_RING_MISC_HOST_FW_SWAP			BIT(4)</div><div class='add'>+#define HAL_REO1_RING_MISC_DATA_TLV_SWAP		BIT(5)</div><div class='add'>+#define HAL_REO1_RING_MISC_SRNG_ENABLE			BIT(6)</div><div class='add'>+#define HAL_REO1_RING_PRDR_INT_SETUP_INTR_TMR_THOLD	GENMASK(31, 16)</div><div class='add'>+#define HAL_REO1_RING_PRDR_INT_SETUP_BATCH_COUNTER_THOLD GENMASK(14, 0)</div><div class='add'>+#define HAL_REO1_RING_MSI1_BASE_MSB_MSI1_ENABLE		BIT(8)</div><div class='add'>+#define HAL_REO1_RING_MSI1_BASE_MSB_ADDR		GENMASK(7, 0)</div><div class='add'>+#define HAL_REO1_MISC_CTL_FRAG_DST_RING			GENMASK(20, 17)</div><div class='add'>+#define HAL_REO1_MISC_CTL_BAR_DST_RING			GENMASK(24, 21)</div><div class='add'>+#define HAL_REO1_GEN_ENABLE_AGING_LIST_ENABLE		BIT(2)</div><div class='add'>+#define HAL_REO1_GEN_ENABLE_AGING_FLUSH_ENABLE		BIT(3)</div><div class='add'>+#define HAL_REO1_SW_COOKIE_CFG_CMEM_BASE_ADDR_MSB	GENMASK(7, 0)</div><div class='add'>+#define HAL_REO1_SW_COOKIE_CFG_COOKIE_PPT_MSB		GENMASK(12, 8)</div><div class='add'>+#define HAL_REO1_SW_COOKIE_CFG_COOKIE_SPT_MSB		GENMASK(17, 13)</div><div class='add'>+#define HAL_REO1_SW_COOKIE_CFG_ALIGN			BIT(18)</div><div class='add'>+#define HAL_REO1_SW_COOKIE_CFG_ENABLE			BIT(19)</div><div class='add'>+#define HAL_REO1_SW_COOKIE_CFG_GLOBAL_ENABLE		BIT(20)</div><div class='add'>+#define HAL_REO_QDESC_ADDR_READ_LUT_ENABLE		BIT(7)</div><div class='add'>+#define HAL_REO_QDESC_ADDR_READ_CLEAR_QDESC_ARRAY	BIT(6)</div><div class='add'>+</div><div class='add'>+/* CE ring bit field mask and shift */</div><div class='add'>+#define HAL_CE_DST_R0_DEST_CTRL_MAX_LEN			GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define HAL_ADDR_LSB_REG_MASK				0xffffffff</div><div class='add'>+</div><div class='add'>+#define HAL_ADDR_MSB_REG_SHIFT				32</div><div class='add'>+</div><div class='add'>+/* WBM ring bit field mask and shift */</div><div class='add'>+#define HAL_WBM_LINK_DESC_IDLE_LIST_MODE		BIT(1)</div><div class='add'>+#define HAL_WBM_SCATTER_BUFFER_SIZE			GENMASK(10, 2)</div><div class='add'>+#define HAL_WBM_SCATTER_RING_SIZE_OF_IDLE_LINK_DESC_LIST GENMASK(31, 16)</div><div class='add'>+#define HAL_WBM_SCATTERED_DESC_MSB_BASE_ADDR_39_32	GENMASK(7, 0)</div><div class='add'>+#define HAL_WBM_SCATTERED_DESC_MSB_BASE_ADDR_MATCH_TAG	GENMASK(31, 8)</div><div class='add'>+</div><div class='add'>+#define HAL_WBM_SCATTERED_DESC_HEAD_P_OFFSET_IX1	GENMASK(20, 8)</div><div class='add'>+#define HAL_WBM_SCATTERED_DESC_TAIL_P_OFFSET_IX1	GENMASK(20, 8)</div><div class='add'>+</div><div class='add'>+#define HAL_WBM_IDLE_LINK_RING_MISC_SRNG_ENABLE		BIT(6)</div><div class='add'>+#define HAL_WBM_IDLE_LINK_RING_MISC_RIND_ID_DISABLE	BIT(0)</div><div class='add'>+</div><div class='add'>+#define BASE_ADDR_MATCH_TAG_VAL 0x5</div><div class='add'>+</div><div class='add'>+#define HAL_REO_REO2SW1_RING_BASE_MSB_RING_SIZE		0x000fffff</div><div class='add'>+#define HAL_REO_REO2SW0_RING_BASE_MSB_RING_SIZE		0x000fffff</div><div class='add'>+#define HAL_REO_SW2REO_RING_BASE_MSB_RING_SIZE		0x0000ffff</div><div class='add'>+#define HAL_REO_CMD_RING_BASE_MSB_RING_SIZE		0x0000ffff</div><div class='add'>+#define HAL_REO_STATUS_RING_BASE_MSB_RING_SIZE		0x0000ffff</div><div class='add'>+#define HAL_SW2TCL1_RING_BASE_MSB_RING_SIZE		0x000fffff</div><div class='add'>+#define HAL_SW2TCL1_CMD_RING_BASE_MSB_RING_SIZE		0x000fffff</div><div class='add'>+#define HAL_TCL_STATUS_RING_BASE_MSB_RING_SIZE		0x0000ffff</div><div class='add'>+#define HAL_CE_SRC_RING_BASE_MSB_RING_SIZE		0x0000ffff</div><div class='add'>+#define HAL_CE_DST_RING_BASE_MSB_RING_SIZE		0x0000ffff</div><div class='add'>+#define HAL_CE_DST_STATUS_RING_BASE_MSB_RING_SIZE	0x0000ffff</div><div class='add'>+#define HAL_WBM_IDLE_LINK_RING_BASE_MSB_RING_SIZE	0x000fffff</div><div class='add'>+#define HAL_SW2WBM_RELEASE_RING_BASE_MSB_RING_SIZE	0x0000ffff</div><div class='add'>+#define HAL_WBM2SW_RELEASE_RING_BASE_MSB_RING_SIZE	0x000fffff</div><div class='add'>+#define HAL_RXDMA_RING_MAX_SIZE				0x0000ffff</div><div class='add'>+#define HAL_RXDMA_RING_MAX_SIZE_BE			0x000fffff</div><div class='add'>+#define HAL_WBM2PPE_RELEASE_RING_BASE_MSB_RING_SIZE	0x000fffff</div><div class='add'>+</div><div class='add'>+#define HAL_WBM2SW_REL_ERR_RING_NUM 3</div><div class='add'>+/* Add any other errors here and return them in</div><div class='add'>+ * ath12k_hal_rx_desc_get_err().</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HAL_IPQ5332_CE_WFSS_REG_BASE	0x740000</div><div class='add'>+#define HAL_IPQ5332_CE_SIZE		0x100000</div><div class='add'>+</div><div class='add'>+enum hal_srng_ring_id {</div><div class='add'>+	HAL_SRNG_RING_ID_REO2SW0 = 0,</div><div class='add'>+	HAL_SRNG_RING_ID_REO2SW1,</div><div class='add'>+	HAL_SRNG_RING_ID_REO2SW2,</div><div class='add'>+	HAL_SRNG_RING_ID_REO2SW3,</div><div class='add'>+	HAL_SRNG_RING_ID_REO2SW4,</div><div class='add'>+	HAL_SRNG_RING_ID_REO2SW5,</div><div class='add'>+	HAL_SRNG_RING_ID_REO2SW6,</div><div class='add'>+	HAL_SRNG_RING_ID_REO2SW7,</div><div class='add'>+	HAL_SRNG_RING_ID_REO2SW8,</div><div class='add'>+	HAL_SRNG_RING_ID_REO2TCL,</div><div class='add'>+	HAL_SRNG_RING_ID_REO2PPE,</div><div class='add'>+</div><div class='add'>+	HAL_SRNG_RING_ID_SW2REO  = 16,</div><div class='add'>+	HAL_SRNG_RING_ID_SW2REO1,</div><div class='add'>+	HAL_SRNG_RING_ID_SW2REO2,</div><div class='add'>+	HAL_SRNG_RING_ID_SW2REO3,</div><div class='add'>+</div><div class='add'>+	HAL_SRNG_RING_ID_REO_CMD,</div><div class='add'>+	HAL_SRNG_RING_ID_REO_STATUS,</div><div class='add'>+</div><div class='add'>+	HAL_SRNG_RING_ID_SW2TCL1 = 24,</div><div class='add'>+	HAL_SRNG_RING_ID_SW2TCL2,</div><div class='add'>+	HAL_SRNG_RING_ID_SW2TCL3,</div><div class='add'>+	HAL_SRNG_RING_ID_SW2TCL4,</div><div class='add'>+	HAL_SRNG_RING_ID_SW2TCL5,</div><div class='add'>+	HAL_SRNG_RING_ID_SW2TCL6,</div><div class='add'>+	HAL_SRNG_RING_ID_PPE2TCL1 = 30,</div><div class='add'>+</div><div class='add'>+	HAL_SRNG_RING_ID_SW2TCL_CMD = 40,</div><div class='add'>+	HAL_SRNG_RING_ID_SW2TCL1_CMD,</div><div class='add'>+	HAL_SRNG_RING_ID_TCL_STATUS,</div><div class='add'>+</div><div class='add'>+	HAL_SRNG_RING_ID_CE0_SRC = 64,</div><div class='add'>+	HAL_SRNG_RING_ID_CE1_SRC,</div><div class='add'>+	HAL_SRNG_RING_ID_CE2_SRC,</div><div class='add'>+	HAL_SRNG_RING_ID_CE3_SRC,</div><div class='add'>+	HAL_SRNG_RING_ID_CE4_SRC,</div><div class='add'>+	HAL_SRNG_RING_ID_CE5_SRC,</div><div class='add'>+	HAL_SRNG_RING_ID_CE6_SRC,</div><div class='add'>+	HAL_SRNG_RING_ID_CE7_SRC,</div><div class='add'>+	HAL_SRNG_RING_ID_CE8_SRC,</div><div class='add'>+	HAL_SRNG_RING_ID_CE9_SRC,</div><div class='add'>+	HAL_SRNG_RING_ID_CE10_SRC,</div><div class='add'>+	HAL_SRNG_RING_ID_CE11_SRC,</div><div class='add'>+	HAL_SRNG_RING_ID_CE12_SRC,</div><div class='add'>+	HAL_SRNG_RING_ID_CE13_SRC,</div><div class='add'>+	HAL_SRNG_RING_ID_CE14_SRC,</div><div class='add'>+	HAL_SRNG_RING_ID_CE15_SRC,</div><div class='add'>+</div><div class='add'>+	HAL_SRNG_RING_ID_CE0_DST = 81,</div><div class='add'>+	HAL_SRNG_RING_ID_CE1_DST,</div><div class='add'>+	HAL_SRNG_RING_ID_CE2_DST,</div><div class='add'>+	HAL_SRNG_RING_ID_CE3_DST,</div><div class='add'>+	HAL_SRNG_RING_ID_CE4_DST,</div><div class='add'>+	HAL_SRNG_RING_ID_CE5_DST,</div><div class='add'>+	HAL_SRNG_RING_ID_CE6_DST,</div><div class='add'>+	HAL_SRNG_RING_ID_CE7_DST,</div><div class='add'>+	HAL_SRNG_RING_ID_CE8_DST,</div><div class='add'>+	HAL_SRNG_RING_ID_CE9_DST,</div><div class='add'>+	HAL_SRNG_RING_ID_CE10_DST,</div><div class='add'>+	HAL_SRNG_RING_ID_CE11_DST,</div><div class='add'>+	HAL_SRNG_RING_ID_CE12_DST,</div><div class='add'>+	HAL_SRNG_RING_ID_CE13_DST,</div><div class='add'>+	HAL_SRNG_RING_ID_CE14_DST,</div><div class='add'>+	HAL_SRNG_RING_ID_CE15_DST,</div><div class='add'>+</div><div class='add'>+	HAL_SRNG_RING_ID_CE0_DST_STATUS = 100,</div><div class='add'>+	HAL_SRNG_RING_ID_CE1_DST_STATUS,</div><div class='add'>+	HAL_SRNG_RING_ID_CE2_DST_STATUS,</div><div class='add'>+	HAL_SRNG_RING_ID_CE3_DST_STATUS,</div><div class='add'>+	HAL_SRNG_RING_ID_CE4_DST_STATUS,</div><div class='add'>+	HAL_SRNG_RING_ID_CE5_DST_STATUS,</div><div class='add'>+	HAL_SRNG_RING_ID_CE6_DST_STATUS,</div><div class='add'>+	HAL_SRNG_RING_ID_CE7_DST_STATUS,</div><div class='add'>+	HAL_SRNG_RING_ID_CE8_DST_STATUS,</div><div class='add'>+	HAL_SRNG_RING_ID_CE9_DST_STATUS,</div><div class='add'>+	HAL_SRNG_RING_ID_CE10_DST_STATUS,</div><div class='add'>+	HAL_SRNG_RING_ID_CE11_DST_STATUS,</div><div class='add'>+	HAL_SRNG_RING_ID_CE12_DST_STATUS,</div><div class='add'>+	HAL_SRNG_RING_ID_CE13_DST_STATUS,</div><div class='add'>+	HAL_SRNG_RING_ID_CE14_DST_STATUS,</div><div class='add'>+	HAL_SRNG_RING_ID_CE15_DST_STATUS,</div><div class='add'>+</div><div class='add'>+	HAL_SRNG_RING_ID_WBM_IDLE_LINK = 120,</div><div class='add'>+	HAL_SRNG_RING_ID_WBM_SW0_RELEASE,</div><div class='add'>+	HAL_SRNG_RING_ID_WBM_SW1_RELEASE,</div><div class='add'>+	HAL_SRNG_RING_ID_WBM_PPE_RELEASE = 123,</div><div class='add'>+</div><div class='add'>+	HAL_SRNG_RING_ID_WBM2SW0_RELEASE = 128,</div><div class='add'>+	HAL_SRNG_RING_ID_WBM2SW1_RELEASE,</div><div class='add'>+	HAL_SRNG_RING_ID_WBM2SW2_RELEASE,</div><div class='add'>+	HAL_SRNG_RING_ID_WBM2SW3_RELEASE, /* RX ERROR RING */</div><div class='add'>+	HAL_SRNG_RING_ID_WBM2SW4_RELEASE,</div><div class='add'>+	HAL_SRNG_RING_ID_WBM2SW5_RELEASE,</div><div class='add'>+	HAL_SRNG_RING_ID_WBM2SW6_RELEASE,</div><div class='add'>+	HAL_SRNG_RING_ID_WBM2SW7_RELEASE,</div><div class='add'>+</div><div class='add'>+	HAL_SRNG_RING_ID_UMAC_ID_END = 159,</div><div class='add'>+</div><div class='add'>+	/* Common DMAC rings shared by all LMACs */</div><div class='add'>+	HAL_SRNG_RING_ID_DMAC_CMN_ID_START = 160,</div><div class='add'>+	HAL_SRNG_SW2RXDMA_BUF0 = HAL_SRNG_RING_ID_DMAC_CMN_ID_START,</div><div class='add'>+	HAL_SRNG_SW2RXDMA_BUF1 = 161,</div><div class='add'>+	HAL_SRNG_SW2RXDMA_BUF2 = 162,</div><div class='add'>+</div><div class='add'>+	HAL_SRNG_SW2RXMON_BUF0 = 168,</div><div class='add'>+</div><div class='add'>+	HAL_SRNG_SW2TXMON_BUF0 = 176,</div><div class='add'>+</div><div class='add'>+	HAL_SRNG_RING_ID_DMAC_CMN_ID_END = 183,</div><div class='add'>+	HAL_SRNG_RING_ID_PMAC1_ID_START = 184,</div><div class='add'>+</div><div class='add'>+	HAL_SRNG_RING_ID_WMAC1_SW2RXMON_BUF0 = HAL_SRNG_RING_ID_PMAC1_ID_START,</div><div class='add'>+</div><div class='add'>+	HAL_SRNG_RING_ID_WMAC1_SW2RXDMA1_STATBUF,</div><div class='add'>+	HAL_SRNG_RING_ID_WMAC1_RXDMA2SW0,</div><div class='add'>+	HAL_SRNG_RING_ID_WMAC1_RXDMA2SW1,</div><div class='add'>+	HAL_SRNG_RING_ID_WMAC1_RXMON2SW0 = HAL_SRNG_RING_ID_WMAC1_RXDMA2SW1,</div><div class='add'>+	HAL_SRNG_RING_ID_WMAC1_SW2RXDMA1_DESC,</div><div class='add'>+	HAL_SRNG_RING_ID_RXDMA_DIR_BUF,</div><div class='add'>+	HAL_SRNG_RING_ID_WMAC1_TXMON2SW0_BUF0,</div><div class='add'>+	HAL_SRNG_RING_ID_WMAC1_SW2TXMON_BUF0,</div><div class='add'>+</div><div class='add'>+	HAL_SRNG_RING_ID_PMAC1_ID_END,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SRNG registers are split into two groups R0 and R2 */</div><div class='add'>+#define HAL_SRNG_REG_GRP_R0	0</div><div class='add'>+#define HAL_SRNG_REG_GRP_R2	1</div><div class='add'>+#define HAL_SRNG_NUM_REG_GRP    2</div><div class='add'>+</div><div class='add'>+/* TODO: number of PMACs */</div><div class='add'>+#define HAL_SRNG_NUM_PMACS      3</div><div class='add'>+#define HAL_SRNG_NUM_DMAC_RINGS (HAL_SRNG_RING_ID_DMAC_CMN_ID_END - \</div><div class='add'>+				 HAL_SRNG_RING_ID_DMAC_CMN_ID_START)</div><div class='add'>+#define HAL_SRNG_RINGS_PER_PMAC (HAL_SRNG_RING_ID_PMAC1_ID_END - \</div><div class='add'>+				 HAL_SRNG_RING_ID_PMAC1_ID_START)</div><div class='add'>+#define HAL_SRNG_NUM_PMAC_RINGS (HAL_SRNG_NUM_PMACS * HAL_SRNG_RINGS_PER_PMAC)</div><div class='add'>+#define HAL_SRNG_RING_ID_MAX    (HAL_SRNG_RING_ID_DMAC_CMN_ID_END + \</div><div class='add'>+				 HAL_SRNG_NUM_PMAC_RINGS)</div><div class='add'>+</div><div class='add'>+enum hal_ring_type {</div><div class='add'>+	HAL_REO_DST,</div><div class='add'>+	HAL_REO_EXCEPTION,</div><div class='add'>+	HAL_REO_REINJECT,</div><div class='add'>+	HAL_REO_CMD,</div><div class='add'>+	HAL_REO_STATUS,</div><div class='add'>+	HAL_TCL_DATA,</div><div class='add'>+	HAL_TCL_CMD,</div><div class='add'>+	HAL_TCL_STATUS,</div><div class='add'>+	HAL_CE_SRC,</div><div class='add'>+	HAL_CE_DST,</div><div class='add'>+	HAL_CE_DST_STATUS,</div><div class='add'>+	HAL_WBM_IDLE_LINK,</div><div class='add'>+	HAL_SW2WBM_RELEASE,</div><div class='add'>+	HAL_WBM2SW_RELEASE,</div><div class='add'>+	HAL_RXDMA_BUF,</div><div class='add'>+	HAL_RXDMA_DST,</div><div class='add'>+	HAL_RXDMA_MONITOR_BUF,</div><div class='add'>+	HAL_RXDMA_MONITOR_STATUS,</div><div class='add'>+	HAL_RXDMA_MONITOR_DST,</div><div class='add'>+	HAL_RXDMA_MONITOR_DESC,</div><div class='add'>+	HAL_RXDMA_DIR_BUF,</div><div class='add'>+	HAL_PPE2TCL,</div><div class='add'>+	HAL_PPE_RELEASE,</div><div class='add'>+	HAL_TX_MONITOR_BUF,</div><div class='add'>+	HAL_TX_MONITOR_DST,</div><div class='add'>+	HAL_MAX_RING_TYPES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_RX_MAX_BA_WINDOW	256</div><div class='add'>+</div><div class='add'>+#define HAL_DEFAULT_BE_BK_VI_REO_TIMEOUT_USEC	(100 * 1000)</div><div class='add'>+#define HAL_DEFAULT_VO_REO_TIMEOUT_USEC		(40 * 1000)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum hal_reo_cmd_type: Enum for REO command type</div><div class='add'>+ * @HAL_REO_CMD_GET_QUEUE_STATS: Get REO queue status/stats</div><div class='add'>+ * @HAL_REO_CMD_FLUSH_QUEUE: Flush all frames in REO queue</div><div class='add'>+ * @HAL_REO_CMD_FLUSH_CACHE: Flush descriptor entries in the cache</div><div class='add'>+ * @HAL_REO_CMD_UNBLOCK_CACHE: Unblock a descriptor's address that was blocked</div><div class='add'>+ *      earlier with a 'REO_FLUSH_CACHE' command</div><div class='add'>+ * @HAL_REO_CMD_FLUSH_TIMEOUT_LIST: Flush buffers/descriptors from timeout list</div><div class='add'>+ * @HAL_REO_CMD_UPDATE_RX_QUEUE: Update REO queue settings</div><div class='add'>+ */</div><div class='add'>+enum hal_reo_cmd_type {</div><div class='add'>+	HAL_REO_CMD_GET_QUEUE_STATS     = 0,</div><div class='add'>+	HAL_REO_CMD_FLUSH_QUEUE         = 1,</div><div class='add'>+	HAL_REO_CMD_FLUSH_CACHE         = 2,</div><div class='add'>+	HAL_REO_CMD_UNBLOCK_CACHE       = 3,</div><div class='add'>+	HAL_REO_CMD_FLUSH_TIMEOUT_LIST  = 4,</div><div class='add'>+	HAL_REO_CMD_UPDATE_RX_QUEUE     = 5,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum hal_reo_cmd_status: Enum for execution status of REO command</div><div class='add'>+ * @HAL_REO_CMD_SUCCESS: Command has successfully executed</div><div class='add'>+ * @HAL_REO_CMD_BLOCKED: Command could not be executed as the queue</div><div class='add'>+ *			 or cache was blocked</div><div class='add'>+ * @HAL_REO_CMD_FAILED: Command execution failed, could be due to</div><div class='add'>+ *			invalid queue desc</div><div class='add'>+ * @HAL_REO_CMD_RESOURCE_BLOCKED: Command could not be executed because</div><div class='add'>+ *				  one or more descriptors were blocked</div><div class='add'>+ * @HAL_REO_CMD_DRAIN:</div><div class='add'>+ */</div><div class='add'>+enum hal_reo_cmd_status {</div><div class='add'>+	HAL_REO_CMD_SUCCESS		= 0,</div><div class='add'>+	HAL_REO_CMD_BLOCKED		= 1,</div><div class='add'>+	HAL_REO_CMD_FAILED		= 2,</div><div class='add'>+	HAL_REO_CMD_RESOURCE_BLOCKED	= 3,</div><div class='add'>+	HAL_REO_CMD_DRAIN		= 0xff,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hal_wbm_idle_scatter_list {</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	struct hal_wbm_link_desc *vaddr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hal_srng_params {</div><div class='add'>+	dma_addr_t ring_base_paddr;</div><div class='add'>+	u32 *ring_base_vaddr;</div><div class='add'>+	int num_entries;</div><div class='add'>+	u32 intr_batch_cntr_thres_entries;</div><div class='add'>+	u32 intr_timer_thres_us;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u32 max_buffer_len;</div><div class='add'>+	u32 low_threshold;</div><div class='add'>+	u32 high_threshold;</div><div class='add'>+	dma_addr_t msi_addr;</div><div class='add'>+	dma_addr_t msi2_addr;</div><div class='add'>+	u32 msi_data;</div><div class='add'>+	u32 msi2_data;</div><div class='add'>+</div><div class='add'>+	/* Add more params as needed */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_srng_dir {</div><div class='add'>+	HAL_SRNG_DIR_SRC,</div><div class='add'>+	HAL_SRNG_DIR_DST</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* srng flags */</div><div class='add'>+#define HAL_SRNG_FLAGS_MSI_SWAP			0x00000008</div><div class='add'>+#define HAL_SRNG_FLAGS_RING_PTR_SWAP		0x00000010</div><div class='add'>+#define HAL_SRNG_FLAGS_DATA_TLV_SWAP		0x00000020</div><div class='add'>+#define HAL_SRNG_FLAGS_LOW_THRESH_INTR_EN	0x00010000</div><div class='add'>+#define HAL_SRNG_FLAGS_MSI_INTR			0x00020000</div><div class='add'>+#define HAL_SRNG_FLAGS_HIGH_THRESH_INTR_EN	0x00080000</div><div class='add'>+#define HAL_SRNG_FLAGS_LMAC_RING		0x80000000</div><div class='add'>+</div><div class='add'>+#define HAL_SRNG_TLV_HDR_TAG		GENMASK(9, 1)</div><div class='add'>+#define HAL_SRNG_TLV_HDR_LEN		GENMASK(25, 10)</div><div class='add'>+</div><div class='add'>+/* Common SRNG ring structure for source and destination rings */</div><div class='add'>+struct hal_srng {</div><div class='add'>+	/* Unique SRNG ring ID */</div><div class='add'>+	u8 ring_id;</div><div class='add'>+</div><div class='add'>+	/* Ring initialization done */</div><div class='add'>+	u8 initialized;</div><div class='add'>+</div><div class='add'>+	/* Interrupt/MSI value assigned to this ring */</div><div class='add'>+	int irq;</div><div class='add'>+</div><div class='add'>+	/* Physical base address of the ring */</div><div class='add'>+	dma_addr_t ring_base_paddr;</div><div class='add'>+</div><div class='add'>+	/* Virtual base address of the ring */</div><div class='add'>+	u32 *ring_base_vaddr;</div><div class='add'>+</div><div class='add'>+	/* Number of entries in ring */</div><div class='add'>+	u32 num_entries;</div><div class='add'>+</div><div class='add'>+	/* Ring size */</div><div class='add'>+	u32 ring_size;</div><div class='add'>+</div><div class='add'>+	/* Ring size mask */</div><div class='add'>+	u32 ring_size_mask;</div><div class='add'>+</div><div class='add'>+	/* Size of ring entry */</div><div class='add'>+	u32 entry_size;</div><div class='add'>+</div><div class='add'>+	/* Interrupt timer threshold - in micro seconds */</div><div class='add'>+	u32 intr_timer_thres_us;</div><div class='add'>+</div><div class='add'>+	/* Interrupt batch counter threshold - in number of ring entries */</div><div class='add'>+	u32 intr_batch_cntr_thres_entries;</div><div class='add'>+</div><div class='add'>+	/* MSI Address */</div><div class='add'>+	dma_addr_t msi_addr;</div><div class='add'>+</div><div class='add'>+	/* MSI data */</div><div class='add'>+	u32 msi_data;</div><div class='add'>+</div><div class='add'>+	/* MSI2 Address */</div><div class='add'>+	dma_addr_t msi2_addr;</div><div class='add'>+</div><div class='add'>+	/* MSI2 data */</div><div class='add'>+	u32 msi2_data;</div><div class='add'>+</div><div class='add'>+	/* Misc flags */</div><div class='add'>+	u32 flags;</div><div class='add'>+</div><div class='add'>+	/* Lock for serializing ring index updates */</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+</div><div class='add'>+	struct lock_class_key lock_key;</div><div class='add'>+</div><div class='add'>+	/* Start offset of SRNG register groups for this ring</div><div class='add'>+	 * TBD: See if this is required - register address can be derived</div><div class='add'>+	 * from ring ID</div><div class='add'>+	 */</div><div class='add'>+	u32 hwreg_base[HAL_SRNG_NUM_REG_GRP];</div><div class='add'>+</div><div class='add'>+	u64 timestamp;</div><div class='add'>+</div><div class='add'>+	/* Source or Destination ring */</div><div class='add'>+	enum hal_srng_dir ring_dir;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			/* SW tail pointer */</div><div class='add'>+			u32 tp;</div><div class='add'>+</div><div class='add'>+			/* Shadow head pointer location to be updated by HW */</div><div class='add'>+			volatile u32 *hp_addr;</div><div class='add'>+</div><div class='add'>+			/* Cached head pointer */</div><div class='add'>+			u32 cached_hp;</div><div class='add'>+</div><div class='add'>+			/* Tail pointer location to be updated by SW - This</div><div class='add'>+			 * will be a register address and need not be</div><div class='add'>+			 * accessed through SW structure</div><div class='add'>+			 */</div><div class='add'>+			u32 *tp_addr;</div><div class='add'>+</div><div class='add'>+			/* Current SW loop cnt */</div><div class='add'>+			u32 loop_cnt;</div><div class='add'>+</div><div class='add'>+			/* max transfer size */</div><div class='add'>+			u16 max_buffer_length;</div><div class='add'>+</div><div class='add'>+			/* head pointer at access end */</div><div class='add'>+			u32 last_hp;</div><div class='add'>+		} dst_ring;</div><div class='add'>+</div><div class='add'>+		struct {</div><div class='add'>+			/* SW head pointer */</div><div class='add'>+			u32 hp;</div><div class='add'>+</div><div class='add'>+			/* SW reap head pointer */</div><div class='add'>+			u32 reap_hp;</div><div class='add'>+</div><div class='add'>+			/* Shadow tail pointer location to be updated by HW */</div><div class='add'>+			u32 *tp_addr;</div><div class='add'>+</div><div class='add'>+			/* Cached tail pointer */</div><div class='add'>+			u32 cached_tp;</div><div class='add'>+</div><div class='add'>+			/* Head pointer location to be updated by SW - This</div><div class='add'>+			 * will be a register address and need not be accessed</div><div class='add'>+			 * through SW structure</div><div class='add'>+			 */</div><div class='add'>+			u32 *hp_addr;</div><div class='add'>+</div><div class='add'>+			/* Low threshold - in number of ring entries */</div><div class='add'>+			u32 low_threshold;</div><div class='add'>+</div><div class='add'>+			/* tail pointer at access end */</div><div class='add'>+			u32 last_tp;</div><div class='add'>+		} src_ring;</div><div class='add'>+	} u;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Interrupt mitigation - Batch threshold in terms of number of frames */</div><div class='add'>+#define HAL_SRNG_INT_BATCH_THRESHOLD_TX 256</div><div class='add'>+#define HAL_SRNG_INT_BATCH_THRESHOLD_RX 128</div><div class='add'>+#define HAL_SRNG_INT_BATCH_THRESHOLD_OTHER 1</div><div class='add'>+</div><div class='add'>+/* Interrupt mitigation - timer threshold in us */</div><div class='add'>+#define HAL_SRNG_INT_TIMER_THRESHOLD_TX 1000</div><div class='add'>+#define HAL_SRNG_INT_TIMER_THRESHOLD_RX 500</div><div class='add'>+#define HAL_SRNG_INT_TIMER_THRESHOLD_OTHER 256</div><div class='add'>+</div><div class='add'>+enum hal_srng_mac_type {</div><div class='add'>+	ATH12K_HAL_SRNG_UMAC,</div><div class='add'>+	ATH12K_HAL_SRNG_DMAC,</div><div class='add'>+	ATH12K_HAL_SRNG_PMAC</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* HW SRNG configuration table */</div><div class='add'>+struct hal_srng_config {</div><div class='add'>+	int start_ring_id;</div><div class='add'>+	u16 max_rings;</div><div class='add'>+	u16 entry_size;</div><div class='add'>+	u32 reg_start[HAL_SRNG_NUM_REG_GRP];</div><div class='add'>+	u16 reg_size[HAL_SRNG_NUM_REG_GRP];</div><div class='add'>+	enum hal_srng_mac_type mac_type;</div><div class='add'>+	enum hal_srng_dir ring_dir;</div><div class='add'>+	u32 max_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum hal_rx_buf_return_buf_manager - manager for returned rx buffers</div><div class='add'>+ *</div><div class='add'>+ * @HAL_RX_BUF_RBM_WBM_IDLE_BUF_LIST: Buffer returned to WBM idle buffer list</div><div class='add'>+ * @HAL_RX_BUF_RBM_WBM_DEV0_IDLE_DESC_LIST: Descriptor returned to WBM idle</div><div class='add'>+ *	descriptor list, where the device 0 WBM is chosen in case of a multi-device config</div><div class='add'>+ * @HAL_RX_BUF_RBM_WBM_DEV1_IDLE_DESC_LIST: Descriptor returned to WBM idle</div><div class='add'>+ *	descriptor list, where the device 1 WBM is chosen in case of a multi-device config</div><div class='add'>+ * @HAL_RX_BUF_RBM_WBM_DEV2_IDLE_DESC_LIST: Descriptor returned to WBM idle</div><div class='add'>+ *	descriptor list, where the device 2 WBM is chosen in case of a multi-device config</div><div class='add'>+ * @HAL_RX_BUF_RBM_FW_BM: Buffer returned to FW</div><div class='add'>+ * @HAL_RX_BUF_RBM_SW0_BM: For ring 0 -- returned to host</div><div class='add'>+ * @HAL_RX_BUF_RBM_SW1_BM: For ring 1 -- returned to host</div><div class='add'>+ * @HAL_RX_BUF_RBM_SW2_BM: For ring 2 -- returned to host</div><div class='add'>+ * @HAL_RX_BUF_RBM_SW3_BM: For ring 3 -- returned to host</div><div class='add'>+ * @HAL_RX_BUF_RBM_SW4_BM: For ring 4 -- returned to host</div><div class='add'>+ * @HAL_RX_BUF_RBM_SW5_BM: For ring 5 -- returned to host</div><div class='add'>+ * @HAL_RX_BUF_RBM_SW6_BM: For ring 6 -- returned to host</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum hal_rx_buf_return_buf_manager {</div><div class='add'>+	HAL_RX_BUF_RBM_WBM_IDLE_BUF_LIST,</div><div class='add'>+	HAL_RX_BUF_RBM_WBM_DEV0_IDLE_DESC_LIST,</div><div class='add'>+	HAL_RX_BUF_RBM_WBM_DEV1_IDLE_DESC_LIST,</div><div class='add'>+	HAL_RX_BUF_RBM_WBM_DEV2_IDLE_DESC_LIST,</div><div class='add'>+	HAL_RX_BUF_RBM_FW_BM,</div><div class='add'>+	HAL_RX_BUF_RBM_SW0_BM,</div><div class='add'>+	HAL_RX_BUF_RBM_SW1_BM,</div><div class='add'>+	HAL_RX_BUF_RBM_SW2_BM,</div><div class='add'>+	HAL_RX_BUF_RBM_SW3_BM,</div><div class='add'>+	HAL_RX_BUF_RBM_SW4_BM,</div><div class='add'>+	HAL_RX_BUF_RBM_SW5_BM,</div><div class='add'>+	HAL_RX_BUF_RBM_SW6_BM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_SRNG_DESC_LOOP_CNT		0xf0000000</div><div class='add'>+</div><div class='add'>+#define HAL_REO_CMD_FLG_NEED_STATUS		BIT(0)</div><div class='add'>+#define HAL_REO_CMD_FLG_STATS_CLEAR		BIT(1)</div><div class='add'>+#define HAL_REO_CMD_FLG_FLUSH_BLOCK_LATER	BIT(2)</div><div class='add'>+#define HAL_REO_CMD_FLG_FLUSH_RELEASE_BLOCKING	BIT(3)</div><div class='add'>+#define HAL_REO_CMD_FLG_FLUSH_NO_INVAL		BIT(4)</div><div class='add'>+#define HAL_REO_CMD_FLG_FLUSH_FWD_ALL_MPDUS	BIT(5)</div><div class='add'>+#define HAL_REO_CMD_FLG_FLUSH_ALL		BIT(6)</div><div class='add'>+#define HAL_REO_CMD_FLG_UNBLK_RESOURCE		BIT(7)</div><div class='add'>+#define HAL_REO_CMD_FLG_UNBLK_CACHE		BIT(8)</div><div class='add'>+#define HAL_REO_CMD_FLG_FLUSH_QUEUE_1K_DESC	BIT(9)</div><div class='add'>+</div><div class='add'>+/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO0_UPD_* fields */</div><div class='add'>+#define HAL_REO_CMD_UPD0_RX_QUEUE_NUM		BIT(8)</div><div class='add'>+#define HAL_REO_CMD_UPD0_VLD			BIT(9)</div><div class='add'>+#define HAL_REO_CMD_UPD0_ALDC			BIT(10)</div><div class='add'>+#define HAL_REO_CMD_UPD0_DIS_DUP_DETECTION	BIT(11)</div><div class='add'>+#define HAL_REO_CMD_UPD0_SOFT_REORDER_EN	BIT(12)</div><div class='add'>+#define HAL_REO_CMD_UPD0_AC			BIT(13)</div><div class='add'>+#define HAL_REO_CMD_UPD0_BAR			BIT(14)</div><div class='add'>+#define HAL_REO_CMD_UPD0_RETRY			BIT(15)</div><div class='add'>+#define HAL_REO_CMD_UPD0_CHECK_2K_MODE		BIT(16)</div><div class='add'>+#define HAL_REO_CMD_UPD0_OOR_MODE		BIT(17)</div><div class='add'>+#define HAL_REO_CMD_UPD0_BA_WINDOW_SIZE		BIT(18)</div><div class='add'>+#define HAL_REO_CMD_UPD0_PN_CHECK		BIT(19)</div><div class='add'>+#define HAL_REO_CMD_UPD0_EVEN_PN		BIT(20)</div><div class='add'>+#define HAL_REO_CMD_UPD0_UNEVEN_PN		BIT(21)</div><div class='add'>+#define HAL_REO_CMD_UPD0_PN_HANDLE_ENABLE	BIT(22)</div><div class='add'>+#define HAL_REO_CMD_UPD0_PN_SIZE		BIT(23)</div><div class='add'>+#define HAL_REO_CMD_UPD0_IGNORE_AMPDU_FLG	BIT(24)</div><div class='add'>+#define HAL_REO_CMD_UPD0_SVLD			BIT(25)</div><div class='add'>+#define HAL_REO_CMD_UPD0_SSN			BIT(26)</div><div class='add'>+#define HAL_REO_CMD_UPD0_SEQ_2K_ERR		BIT(27)</div><div class='add'>+#define HAL_REO_CMD_UPD0_PN_ERR			BIT(28)</div><div class='add'>+#define HAL_REO_CMD_UPD0_PN_VALID		BIT(29)</div><div class='add'>+#define HAL_REO_CMD_UPD0_PN			BIT(30)</div><div class='add'>+</div><div class='add'>+/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO1_* fields */</div><div class='add'>+#define HAL_REO_CMD_UPD1_VLD			BIT(16)</div><div class='add'>+#define HAL_REO_CMD_UPD1_ALDC			GENMASK(18, 17)</div><div class='add'>+#define HAL_REO_CMD_UPD1_DIS_DUP_DETECTION	BIT(19)</div><div class='add'>+#define HAL_REO_CMD_UPD1_SOFT_REORDER_EN	BIT(20)</div><div class='add'>+#define HAL_REO_CMD_UPD1_AC			GENMASK(22, 21)</div><div class='add'>+#define HAL_REO_CMD_UPD1_BAR			BIT(23)</div><div class='add'>+#define HAL_REO_CMD_UPD1_RETRY			BIT(24)</div><div class='add'>+#define HAL_REO_CMD_UPD1_CHECK_2K_MODE		BIT(25)</div><div class='add'>+#define HAL_REO_CMD_UPD1_OOR_MODE		BIT(26)</div><div class='add'>+#define HAL_REO_CMD_UPD1_PN_CHECK		BIT(27)</div><div class='add'>+#define HAL_REO_CMD_UPD1_EVEN_PN		BIT(28)</div><div class='add'>+#define HAL_REO_CMD_UPD1_UNEVEN_PN		BIT(29)</div><div class='add'>+#define HAL_REO_CMD_UPD1_PN_HANDLE_ENABLE	BIT(30)</div><div class='add'>+#define HAL_REO_CMD_UPD1_IGNORE_AMPDU_FLG	BIT(31)</div><div class='add'>+</div><div class='add'>+/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO2_* fields */</div><div class='add'>+#define HAL_REO_CMD_UPD2_SVLD			BIT(10)</div><div class='add'>+#define HAL_REO_CMD_UPD2_SSN			GENMASK(22, 11)</div><div class='add'>+#define HAL_REO_CMD_UPD2_SEQ_2K_ERR		BIT(23)</div><div class='add'>+#define HAL_REO_CMD_UPD2_PN_ERR			BIT(24)</div><div class='add'>+</div><div class='add'>+struct ath12k_hal_reo_cmd {</div><div class='add'>+	u32 addr_lo;</div><div class='add'>+	u32 flag;</div><div class='add'>+	u32 upd0;</div><div class='add'>+	u32 upd1;</div><div class='add'>+	u32 upd2;</div><div class='add'>+	u32 pn[4];</div><div class='add'>+	u16 rx_queue_num;</div><div class='add'>+	u16 min_rel;</div><div class='add'>+	u16 min_fwd;</div><div class='add'>+	u8 addr_hi;</div><div class='add'>+	u8 ac_list;</div><div class='add'>+	u8 blocking_idx;</div><div class='add'>+	u16 ba_window_size;</div><div class='add'>+	u8 pn_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_pn_type {</div><div class='add'>+	HAL_PN_TYPE_NONE,</div><div class='add'>+	HAL_PN_TYPE_WPA,</div><div class='add'>+	HAL_PN_TYPE_WAPI_EVEN,</div><div class='add'>+	HAL_PN_TYPE_WAPI_UNEVEN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_ce_desc {</div><div class='add'>+	HAL_CE_DESC_SRC,</div><div class='add'>+	HAL_CE_DESC_DST,</div><div class='add'>+	HAL_CE_DESC_DST_STATUS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_HASH_ROUTING_RING_TCL 0</div><div class='add'>+#define HAL_HASH_ROUTING_RING_SW1 1</div><div class='add'>+#define HAL_HASH_ROUTING_RING_SW2 2</div><div class='add'>+#define HAL_HASH_ROUTING_RING_SW3 3</div><div class='add'>+#define HAL_HASH_ROUTING_RING_SW4 4</div><div class='add'>+#define HAL_HASH_ROUTING_RING_REL 5</div><div class='add'>+#define HAL_HASH_ROUTING_RING_FW  6</div><div class='add'>+</div><div class='add'>+struct hal_reo_status_header {</div><div class='add'>+	u16 cmd_num;</div><div class='add'>+	enum hal_reo_cmd_status cmd_status;</div><div class='add'>+	u16 cmd_exe_time;</div><div class='add'>+	u32 timestamp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hal_reo_status_queue_stats {</div><div class='add'>+	u16 ssn;</div><div class='add'>+	u16 curr_idx;</div><div class='add'>+	u32 pn[4];</div><div class='add'>+	u32 last_rx_queue_ts;</div><div class='add'>+	u32 last_rx_dequeue_ts;</div><div class='add'>+	u32 rx_bitmap[8]; /* Bitmap from 0-255 */</div><div class='add'>+	u32 curr_mpdu_cnt;</div><div class='add'>+	u32 curr_msdu_cnt;</div><div class='add'>+	u16 fwd_due_to_bar_cnt;</div><div class='add'>+	u16 dup_cnt;</div><div class='add'>+	u32 frames_in_order_cnt;</div><div class='add'>+	u32 num_mpdu_processed_cnt;</div><div class='add'>+	u32 num_msdu_processed_cnt;</div><div class='add'>+	u32 total_num_processed_byte_cnt;</div><div class='add'>+	u32 late_rx_mpdu_cnt;</div><div class='add'>+	u32 reorder_hole_cnt;</div><div class='add'>+	u8 timeout_cnt;</div><div class='add'>+	u8 bar_rx_cnt;</div><div class='add'>+	u8 num_window_2k_jump_cnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hal_reo_status_flush_queue {</div><div class='add'>+	bool err_detected;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_reo_status_flush_cache_err_code {</div><div class='add'>+	HAL_REO_STATUS_FLUSH_CACHE_ERR_CODE_SUCCESS,</div><div class='add'>+	HAL_REO_STATUS_FLUSH_CACHE_ERR_CODE_IN_USE,</div><div class='add'>+	HAL_REO_STATUS_FLUSH_CACHE_ERR_CODE_NOT_FOUND,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hal_reo_status_flush_cache {</div><div class='add'>+	bool err_detected;</div><div class='add'>+	enum hal_reo_status_flush_cache_err_code err_code;</div><div class='add'>+	bool cache_controller_flush_status_hit;</div><div class='add'>+	u8 cache_controller_flush_status_desc_type;</div><div class='add'>+	u8 cache_controller_flush_status_client_id;</div><div class='add'>+	u8 cache_controller_flush_status_err;</div><div class='add'>+	u8 cache_controller_flush_status_cnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_reo_status_unblock_cache_type {</div><div class='add'>+	HAL_REO_STATUS_UNBLOCK_BLOCKING_RESOURCE,</div><div class='add'>+	HAL_REO_STATUS_UNBLOCK_ENTIRE_CACHE_USAGE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hal_reo_status_unblock_cache {</div><div class='add'>+	bool err_detected;</div><div class='add'>+	enum hal_reo_status_unblock_cache_type unblock_type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hal_reo_status_flush_timeout_list {</div><div class='add'>+	bool err_detected;</div><div class='add'>+	bool list_empty;</div><div class='add'>+	u16 release_desc_cnt;</div><div class='add'>+	u16 fwd_buf_cnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_reo_threshold_idx {</div><div class='add'>+	HAL_REO_THRESHOLD_IDX_DESC_COUNTER0,</div><div class='add'>+	HAL_REO_THRESHOLD_IDX_DESC_COUNTER1,</div><div class='add'>+	HAL_REO_THRESHOLD_IDX_DESC_COUNTER2,</div><div class='add'>+	HAL_REO_THRESHOLD_IDX_DESC_COUNTER_SUM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hal_reo_status_desc_thresh_reached {</div><div class='add'>+	enum hal_reo_threshold_idx threshold_idx;</div><div class='add'>+	u32 link_desc_counter0;</div><div class='add'>+	u32 link_desc_counter1;</div><div class='add'>+	u32 link_desc_counter2;</div><div class='add'>+	u32 link_desc_counter_sum;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hal_reo_status {</div><div class='add'>+	struct hal_reo_status_header uniform_hdr;</div><div class='add'>+	u8 loop_cnt;</div><div class='add'>+	union {</div><div class='add'>+		struct hal_reo_status_queue_stats queue_stats;</div><div class='add'>+		struct hal_reo_status_flush_queue flush_queue;</div><div class='add'>+		struct hal_reo_status_flush_cache flush_cache;</div><div class='add'>+		struct hal_reo_status_unblock_cache unblock_cache;</div><div class='add'>+		struct hal_reo_status_flush_timeout_list timeout_list;</div><div class='add'>+		struct hal_reo_status_desc_thresh_reached desc_thresh_reached;</div><div class='add'>+	} u;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* HAL context to be used to access SRNG APIs (currently used by data path</div><div class='add'>+ * and transport (CE) modules)</div><div class='add'>+ */</div><div class='add'>+struct ath12k_hal {</div><div class='add'>+	/* HAL internal state for all SRNG rings.</div><div class='add'>+	 */</div><div class='add'>+	struct hal_srng srng_list[HAL_SRNG_RING_ID_MAX];</div><div class='add'>+</div><div class='add'>+	/* SRNG configuration table */</div><div class='add'>+	struct hal_srng_config *srng_config;</div><div class='add'>+</div><div class='add'>+	/* Remote pointer memory for HW/FW updates */</div><div class='add'>+	struct {</div><div class='add'>+		u32 *vaddr;</div><div class='add'>+		dma_addr_t paddr;</div><div class='add'>+	} rdp;</div><div class='add'>+</div><div class='add'>+	/* Shared memory for ring pointer updates from host to FW */</div><div class='add'>+	struct {</div><div class='add'>+		u32 *vaddr;</div><div class='add'>+		dma_addr_t paddr;</div><div class='add'>+	} wrp;</div><div class='add'>+</div><div class='add'>+	/* Available REO blocking resources bitmap */</div><div class='add'>+	u8 avail_blk_resource;</div><div class='add'>+</div><div class='add'>+	u8 current_blk_index;</div><div class='add'>+</div><div class='add'>+	/* shadow register configuration */</div><div class='add'>+	u32 shadow_reg_addr[HAL_SHADOW_NUM_REGS];</div><div class='add'>+	int num_shadow_reg_configured;</div><div class='add'>+</div><div class='add'>+	u32 hal_desc_sz;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Maps WBM ring number and Return Buffer Manager Id per TCL ring */</div><div class='add'>+struct ath12k_hal_tcl_to_wbm_rbm_map  {</div><div class='add'>+	u8 wbm_ring_num;</div><div class='add'>+	u8 rbm_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hal_rx_ops {</div><div class='add'>+	bool (*rx_desc_get_first_msdu)(struct hal_rx_desc *desc);</div><div class='add'>+	bool (*rx_desc_get_last_msdu)(struct hal_rx_desc *desc);</div><div class='add'>+	u8 (*rx_desc_get_l3_pad_bytes)(struct hal_rx_desc *desc);</div><div class='add'>+	u8 *(*rx_desc_get_hdr_status)(struct hal_rx_desc *desc);</div><div class='add'>+	bool (*rx_desc_encrypt_valid)(struct hal_rx_desc *desc);</div><div class='add'>+	u32 (*rx_desc_get_encrypt_type)(struct hal_rx_desc *desc);</div><div class='add'>+	u8 (*rx_desc_get_decap_type)(struct hal_rx_desc *desc);</div><div class='add'>+	u8 (*rx_desc_get_mesh_ctl)(struct hal_rx_desc *desc);</div><div class='add'>+	bool (*rx_desc_get_mpdu_seq_ctl_vld)(struct hal_rx_desc *desc);</div><div class='add'>+	bool (*rx_desc_get_mpdu_fc_valid)(struct hal_rx_desc *desc);</div><div class='add'>+	u16 (*rx_desc_get_mpdu_start_seq_no)(struct hal_rx_desc *desc);</div><div class='add'>+	u16 (*rx_desc_get_msdu_len)(struct hal_rx_desc *desc);</div><div class='add'>+	u8 (*rx_desc_get_msdu_sgi)(struct hal_rx_desc *desc);</div><div class='add'>+	u8 (*rx_desc_get_msdu_rate_mcs)(struct hal_rx_desc *desc);</div><div class='add'>+	u8 (*rx_desc_get_msdu_rx_bw)(struct hal_rx_desc *desc);</div><div class='add'>+	u32 (*rx_desc_get_msdu_freq)(struct hal_rx_desc *desc);</div><div class='add'>+	u8 (*rx_desc_get_msdu_pkt_type)(struct hal_rx_desc *desc);</div><div class='add'>+	u8 (*rx_desc_get_msdu_nss)(struct hal_rx_desc *desc);</div><div class='add'>+	u8 (*rx_desc_get_mpdu_tid)(struct hal_rx_desc *desc);</div><div class='add'>+	u16 (*rx_desc_get_mpdu_peer_id)(struct hal_rx_desc *desc);</div><div class='add'>+	void (*rx_desc_copy_end_tlv)(struct hal_rx_desc *fdesc,</div><div class='add'>+				     struct hal_rx_desc *ldesc);</div><div class='add'>+	u32 (*rx_desc_get_mpdu_start_tag)(struct hal_rx_desc *desc);</div><div class='add'>+	u32 (*rx_desc_get_mpdu_ppdu_id)(struct hal_rx_desc *desc);</div><div class='add'>+	void (*rx_desc_set_msdu_len)(struct hal_rx_desc *desc, u16 len);</div><div class='add'>+	struct rx_attention *(*rx_desc_get_attention)(struct hal_rx_desc *desc);</div><div class='add'>+	u8 *(*rx_desc_get_msdu_payload)(struct hal_rx_desc *desc);</div><div class='add'>+	u32 (*rx_desc_get_mpdu_start_offset)(void);</div><div class='add'>+	u32 (*rx_desc_get_msdu_end_offset)(void);</div><div class='add'>+	bool (*rx_desc_mac_addr2_valid)(struct hal_rx_desc *desc);</div><div class='add'>+	u8* (*rx_desc_mpdu_start_addr2)(struct hal_rx_desc *desc);</div><div class='add'>+	bool (*rx_desc_is_da_mcbc)(struct hal_rx_desc *desc);</div><div class='add'>+	void (*rx_desc_get_dot11_hdr)(struct hal_rx_desc *desc,</div><div class='add'>+				      struct ieee80211_hdr *hdr);</div><div class='add'>+	void (*rx_desc_get_crypto_header)(struct hal_rx_desc *desc,</div><div class='add'>+					  u8 *crypto_hdr,</div><div class='add'>+					  enum hal_encrypt_type enctype);</div><div class='add'>+	bool (*dp_rx_h_msdu_done)(struct hal_rx_desc *desc);</div><div class='add'>+	bool (*dp_rx_h_l4_cksum_fail)(struct hal_rx_desc *desc);</div><div class='add'>+	bool (*dp_rx_h_ip_cksum_fail)(struct hal_rx_desc *desc);</div><div class='add'>+	bool (*dp_rx_h_is_decrypted)(struct hal_rx_desc *desc);</div><div class='add'>+	u32 (*dp_rx_h_mpdu_err)(struct hal_rx_desc *desc);</div><div class='add'>+	u32 (*rx_desc_get_desc_size)(void);</div><div class='add'>+	u8 (*rx_desc_get_msdu_src_link_id)(struct hal_rx_desc *desc);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hal_ops {</div><div class='add'>+	int (*create_srng_config)(struct ath12k_base *ab);</div><div class='add'>+	u16 (*rxdma_ring_wmask_rx_mpdu_start)(void);</div><div class='add'>+	u32 (*rxdma_ring_wmask_rx_msdu_end)(void);</div><div class='add'>+	const struct hal_rx_ops *(*get_hal_rx_compact_ops)(void);</div><div class='add'>+	const struct ath12k_hal_tcl_to_wbm_rbm_map *tcl_to_wbm_rbm_map;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct hal_ops hal_qcn9274_ops;</div><div class='add'>+extern const struct hal_ops hal_wcn7850_ops;</div><div class='add'>+</div><div class='add'>+extern const struct hal_rx_ops hal_rx_qcn9274_ops;</div><div class='add'>+extern const struct hal_rx_ops hal_rx_qcn9274_compact_ops;</div><div class='add'>+extern const struct hal_rx_ops hal_rx_wcn7850_ops;</div><div class='add'>+</div><div class='add'>+u32 ath12k_hal_reo_qdesc_size(u32 ba_window_size, u8 tid);</div><div class='add'>+void ath12k_hal_reo_qdesc_setup(struct hal_rx_reo_queue *qdesc,</div><div class='add'>+				int tid, u32 ba_window_size,</div><div class='add'>+				u32 start_seq, enum hal_pn_type type);</div><div class='add'>+void ath12k_hal_reo_init_cmd_ring(struct ath12k_base *ab,</div><div class='add'>+				  struct hal_srng *srng);</div><div class='add'>+void ath12k_hal_reo_hw_setup(struct ath12k_base *ab, u32 ring_hash_map);</div><div class='add'>+void ath12k_hal_setup_link_idle_list(struct ath12k_base *ab,</div><div class='add'>+				     struct hal_wbm_idle_scatter_list *sbuf,</div><div class='add'>+				     u32 nsbufs, u32 tot_link_desc,</div><div class='add'>+				     u32 end_offset);</div><div class='add'>+</div><div class='add'>+dma_addr_t ath12k_hal_srng_get_tp_addr(struct ath12k_base *ab,</div><div class='add'>+				       struct hal_srng *srng);</div><div class='add'>+dma_addr_t ath12k_hal_srng_get_hp_addr(struct ath12k_base *ab,</div><div class='add'>+				       struct hal_srng *srng);</div><div class='add'>+void ath12k_hal_set_link_desc_addr(struct hal_wbm_link_desc *desc, u32 cookie,</div><div class='add'>+				   dma_addr_t paddr,</div><div class='add'>+				   enum hal_rx_buf_return_buf_manager rbm);</div><div class='add'>+u32 ath12k_hal_ce_get_desc_size(enum hal_ce_desc type);</div><div class='add'>+void ath12k_hal_ce_src_set_desc(struct hal_ce_srng_src_desc *desc, dma_addr_t paddr,</div><div class='add'>+				u32 len, u32 id, u8 byte_swap_data);</div><div class='add'>+void ath12k_hal_ce_dst_set_desc(struct hal_ce_srng_dest_desc *desc, dma_addr_t paddr);</div><div class='add'>+u32 ath12k_hal_ce_dst_status_get_length(struct hal_ce_srng_dst_status_desc *desc);</div><div class='add'>+int ath12k_hal_srng_get_entrysize(struct ath12k_base *ab, u32 ring_type);</div><div class='add'>+int ath12k_hal_srng_get_max_entries(struct ath12k_base *ab, u32 ring_type);</div><div class='add'>+void ath12k_hal_srng_get_params(struct ath12k_base *ab, struct hal_srng *srng,</div><div class='add'>+				struct hal_srng_params *params);</div><div class='add'>+void *ath12k_hal_srng_dst_get_next_entry(struct ath12k_base *ab,</div><div class='add'>+					 struct hal_srng *srng);</div><div class='add'>+void *ath12k_hal_srng_src_peek(struct ath12k_base *ab, struct hal_srng *srng);</div><div class='add'>+void *ath12k_hal_srng_dst_peek(struct ath12k_base *ab, struct hal_srng *srng);</div><div class='add'>+int ath12k_hal_srng_dst_num_free(struct ath12k_base *ab, struct hal_srng *srng,</div><div class='add'>+				 bool sync_hw_ptr);</div><div class='add'>+void *ath12k_hal_srng_src_get_next_reaped(struct ath12k_base *ab,</div><div class='add'>+					  struct hal_srng *srng);</div><div class='add'>+void *ath12k_hal_srng_src_reap_next(struct ath12k_base *ab,</div><div class='add'>+				    struct hal_srng *srng);</div><div class='add'>+void *ath12k_hal_srng_src_next_peek(struct ath12k_base *ab,</div><div class='add'>+				    struct hal_srng *srng);</div><div class='add'>+void *ath12k_hal_srng_src_get_next_entry(struct ath12k_base *ab,</div><div class='add'>+					 struct hal_srng *srng);</div><div class='add'>+int ath12k_hal_srng_src_num_free(struct ath12k_base *ab, struct hal_srng *srng,</div><div class='add'>+				 bool sync_hw_ptr);</div><div class='add'>+void ath12k_hal_srng_access_begin(struct ath12k_base *ab,</div><div class='add'>+				  struct hal_srng *srng);</div><div class='add'>+void ath12k_hal_srng_access_end(struct ath12k_base *ab, struct hal_srng *srng);</div><div class='add'>+int ath12k_hal_srng_setup(struct ath12k_base *ab, enum hal_ring_type type,</div><div class='add'>+			  int ring_num, int mac_id,</div><div class='add'>+			  struct hal_srng_params *params);</div><div class='add'>+int ath12k_hal_srng_init(struct ath12k_base *ath12k);</div><div class='add'>+void ath12k_hal_srng_deinit(struct ath12k_base *ath12k);</div><div class='add'>+void ath12k_hal_dump_srng_stats(struct ath12k_base *ab);</div><div class='add'>+void ath12k_hal_srng_get_shadow_config(struct ath12k_base *ab,</div><div class='add'>+				       u32 **cfg, u32 *len);</div><div class='add'>+int ath12k_hal_srng_update_shadow_config(struct ath12k_base *ab,</div><div class='add'>+					 enum hal_ring_type ring_type,</div><div class='add'>+					int ring_num);</div><div class='add'>+void ath12k_hal_srng_shadow_config(struct ath12k_base *ab);</div><div class='add'>+void ath12k_hal_srng_shadow_update_hp_tp(struct ath12k_base *ab,</div><div class='add'>+					 struct hal_srng *srng);</div><div class='add'>+void ath12k_hal_reo_shared_qaddr_cache_clear(struct ath12k_base *ab);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/hal_desc.h b/drivers/net/wireless/ath/ath12k/hal_desc.h<br/>new file mode 100644<br/>index 000000000000..13ddac4a9412<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/hal_desc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/hal_desc.h</a></div><div class='hunk'>@@ -0,0 +1,3045 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2022, 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+#include "core.h"</div><div class='add'>+</div><div class='add'>+#ifndef ATH12K_HAL_DESC_H</div><div class='add'>+#define ATH12K_HAL_DESC_H</div><div class='add'>+</div><div class='add'>+#define BUFFER_ADDR_INFO0_ADDR         GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+#define BUFFER_ADDR_INFO1_ADDR         GENMASK(7, 0)</div><div class='add'>+#define BUFFER_ADDR_INFO1_RET_BUF_MGR  GENMASK(11, 8)</div><div class='add'>+#define BUFFER_ADDR_INFO1_SW_COOKIE    GENMASK(31, 12)</div><div class='add'>+</div><div class='add'>+struct ath12k_buffer_addr {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* ath12k_buffer_addr</div><div class='add'>+ *</div><div class='add'>+ * buffer_addr_31_0</div><div class='add'>+ *		Address (lower 32 bits) of the MSDU buffer or MSDU_EXTENSION</div><div class='add'>+ *		descriptor or Link descriptor</div><div class='add'>+ *</div><div class='add'>+ * buffer_addr_39_32</div><div class='add'>+ *		Address (upper 8 bits) of the MSDU buffer or MSDU_EXTENSION</div><div class='add'>+ *		descriptor or Link descriptor</div><div class='add'>+ *</div><div class='add'>+ * return_buffer_manager (RBM)</div><div class='add'>+ *		Consumer: WBM</div><div class='add'>+ *		Producer: SW/FW</div><div class='add'>+ *		Indicates to which buffer manager the buffer or MSDU_EXTENSION</div><div class='add'>+ *		descriptor or link descriptor that is being pointed to shall be</div><div class='add'>+ *		returned after the frame has been processed. It is used by WBM</div><div class='add'>+ *		for routing purposes.</div><div class='add'>+ *</div><div class='add'>+ *		Values are defined in enum %HAL_RX_BUF_RBM_</div><div class='add'>+ *</div><div class='add'>+ * sw_buffer_cookie</div><div class='add'>+ *		Cookie field exclusively used by SW. HW ignores the contents,</div><div class='add'>+ *		accept that it passes the programmed value on to other</div><div class='add'>+ *		descriptors together with the physical address.</div><div class='add'>+ *</div><div class='add'>+ *		Field can be used by SW to for example associate the buffers</div><div class='add'>+ *		physical address with the virtual address.</div><div class='add'>+ *</div><div class='add'>+ *		NOTE1:</div><div class='add'>+ *		The three most significant bits can have a special meaning</div><div class='add'>+ *		 in case this struct is embedded in a TX_MPDU_DETAILS STRUCT,</div><div class='add'>+ *		and field transmit_bw_restriction is set</div><div class='add'>+ *</div><div class='add'>+ *		In case of NON punctured transmission:</div><div class='add'>+ *		Sw_buffer_cookie[19:17] = 3'b000: 20 MHz TX only</div><div class='add'>+ *		Sw_buffer_cookie[19:17] = 3'b001: 40 MHz TX only</div><div class='add'>+ *		Sw_buffer_cookie[19:17] = 3'b010: 80 MHz TX only</div><div class='add'>+ *		Sw_buffer_cookie[19:17] = 3'b011: 160 MHz TX only</div><div class='add'>+ *		Sw_buffer_cookie[19:17] = 3'b101: 240 MHz TX only</div><div class='add'>+ *		Sw_buffer_cookie[19:17] = 3'b100: 320 MHz TX only</div><div class='add'>+ *		Sw_buffer_cookie[19:18] = 2'b11: reserved</div><div class='add'>+ *</div><div class='add'>+ *		In case of punctured transmission:</div><div class='add'>+ *		Sw_buffer_cookie[19:16] = 4'b0000: pattern 0 only</div><div class='add'>+ *		Sw_buffer_cookie[19:16] = 4'b0001: pattern 1 only</div><div class='add'>+ *		Sw_buffer_cookie[19:16] = 4'b0010: pattern 2 only</div><div class='add'>+ *		Sw_buffer_cookie[19:16] = 4'b0011: pattern 3 only</div><div class='add'>+ *		Sw_buffer_cookie[19:16] = 4'b0100: pattern 4 only</div><div class='add'>+ *		Sw_buffer_cookie[19:16] = 4'b0101: pattern 5 only</div><div class='add'>+ *		Sw_buffer_cookie[19:16] = 4'b0110: pattern 6 only</div><div class='add'>+ *		Sw_buffer_cookie[19:16] = 4'b0111: pattern 7 only</div><div class='add'>+ *		Sw_buffer_cookie[19:16] = 4'b1000: pattern 8 only</div><div class='add'>+ *		Sw_buffer_cookie[19:16] = 4'b1001: pattern 9 only</div><div class='add'>+ *		Sw_buffer_cookie[19:16] = 4'b1010: pattern 10 only</div><div class='add'>+ *		Sw_buffer_cookie[19:16] = 4'b1011: pattern 11 only</div><div class='add'>+ *		Sw_buffer_cookie[19:18] = 2'b11: reserved</div><div class='add'>+ *</div><div class='add'>+ *		Note: a punctured transmission is indicated by the presence</div><div class='add'>+ *		 of TLV TX_PUNCTURE_SETUP embedded in the scheduler TLV</div><div class='add'>+ *</div><div class='add'>+ *		Sw_buffer_cookie[20:17]: Tid: The TID field in the QoS control</div><div class='add'>+ *		 field</div><div class='add'>+ *</div><div class='add'>+ *		Sw_buffer_cookie[16]: Mpdu_qos_control_valid: This field</div><div class='add'>+ *		 indicates MPDUs with a QoS control field.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum hal_tlv_tag {</div><div class='add'>+	HAL_MACTX_CBF_START					= 0 /* 0x0 */,</div><div class='add'>+	HAL_PHYRX_DATA						= 1 /* 0x1 */,</div><div class='add'>+	HAL_PHYRX_CBF_DATA_RESP					= 2 /* 0x2 */,</div><div class='add'>+	HAL_PHYRX_ABORT_REQUEST					= 3 /* 0x3 */,</div><div class='add'>+	HAL_PHYRX_USER_ABORT_NOTIFICATION			= 4 /* 0x4 */,</div><div class='add'>+	HAL_MACTX_DATA_RESP					= 5 /* 0x5 */,</div><div class='add'>+	HAL_MACTX_CBF_DATA					= 6 /* 0x6 */,</div><div class='add'>+	HAL_MACTX_CBF_DONE					= 7 /* 0x7 */,</div><div class='add'>+	HAL_PHYRX_LMR_DATA_RESP					= 8 /* 0x8 */,</div><div class='add'>+	HAL_RXPCU_TO_UCODE_START				= 9 /* 0x9 */,</div><div class='add'>+	HAL_RXPCU_TO_UCODE_DELIMITER_FOR_FULL_MPDU		= 10 /* 0xa */,</div><div class='add'>+	HAL_RXPCU_TO_UCODE_FULL_MPDU_DATA			= 11 /* 0xb */,</div><div class='add'>+	HAL_RXPCU_TO_UCODE_FCS_STATUS				= 12 /* 0xc */,</div><div class='add'>+	HAL_RXPCU_TO_UCODE_MPDU_DELIMITER			= 13 /* 0xd */,</div><div class='add'>+	HAL_RXPCU_TO_UCODE_DELIMITER_FOR_MPDU_HEADER		= 14 /* 0xe */,</div><div class='add'>+	HAL_RXPCU_TO_UCODE_MPDU_HEADER_DATA			= 15 /* 0xf */,</div><div class='add'>+	HAL_RXPCU_TO_UCODE_END					= 16 /* 0x10 */,</div><div class='add'>+	HAL_MACRX_CBF_READ_REQUEST				= 32 /* 0x20 */,</div><div class='add'>+	HAL_MACRX_CBF_DATA_REQUEST				= 33 /* 0x21 */,</div><div class='add'>+	HAL_MACRXXPECT_NDP_RECEPTION				= 34 /* 0x22 */,</div><div class='add'>+	HAL_MACRX_FREEZE_CAPTURE_CHANNEL			= 35 /* 0x23 */,</div><div class='add'>+	HAL_MACRX_NDP_TIMEOUT					= 36 /* 0x24 */,</div><div class='add'>+	HAL_MACRX_ABORT_ACK					= 37 /* 0x25 */,</div><div class='add'>+	HAL_MACRX_REQ_IMPLICIT_FB				= 38 /* 0x26 */,</div><div class='add'>+	HAL_MACRX_CHAIN_MASK					= 39 /* 0x27 */,</div><div class='add'>+	HAL_MACRX_NAP_USER					= 40 /* 0x28 */,</div><div class='add'>+	HAL_MACRX_ABORT_REQUEST					= 41 /* 0x29 */,</div><div class='add'>+	HAL_PHYTX_OTHER_TRANSMIT_INFO16				= 42 /* 0x2a */,</div><div class='add'>+	HAL_PHYTX_ABORT_ACK					= 43 /* 0x2b */,</div><div class='add'>+	HAL_PHYTX_ABORT_REQUEST					= 44 /* 0x2c */,</div><div class='add'>+	HAL_PHYTX_PKT_END					= 45 /* 0x2d */,</div><div class='add'>+	HAL_PHYTX_PPDU_HEADER_INFO_REQUEST			= 46 /* 0x2e */,</div><div class='add'>+	HAL_PHYTX_REQUEST_CTRL_INFO				= 47 /* 0x2f */,</div><div class='add'>+	HAL_PHYTX_DATA_REQUEST					= 48 /* 0x30 */,</div><div class='add'>+	HAL_PHYTX_BF_CV_LOADING_DONE				= 49 /* 0x31 */,</div><div class='add'>+	HAL_PHYTX_NAP_ACK					= 50 /* 0x32 */,</div><div class='add'>+	HAL_PHYTX_NAP_DONE					= 51 /* 0x33 */,</div><div class='add'>+	HAL_PHYTX_OFF_ACK					= 52 /* 0x34 */,</div><div class='add'>+	HAL_PHYTX_ON_ACK					= 53 /* 0x35 */,</div><div class='add'>+	HAL_PHYTX_SYNTH_OFF_ACK					= 54 /* 0x36 */,</div><div class='add'>+	HAL_PHYTX_DEBUG16					= 55 /* 0x37 */,</div><div class='add'>+	HAL_MACTX_ABORT_REQUEST					= 56 /* 0x38 */,</div><div class='add'>+	HAL_MACTX_ABORT_ACK					= 57 /* 0x39 */,</div><div class='add'>+	HAL_MACTX_PKT_END					= 58 /* 0x3a */,</div><div class='add'>+	HAL_MACTX_PRE_PHY_DESC					= 59 /* 0x3b */,</div><div class='add'>+	HAL_MACTX_BF_PARAMS_COMMON				= 60 /* 0x3c */,</div><div class='add'>+	HAL_MACTX_BF_PARAMS_PER_USER				= 61 /* 0x3d */,</div><div class='add'>+	HAL_MACTX_PREFETCH_CV					= 62 /* 0x3e */,</div><div class='add'>+	HAL_MACTX_USER_DESC_COMMON				= 63 /* 0x3f */,</div><div class='add'>+	HAL_MACTX_USER_DESC_PER_USER				= 64 /* 0x40 */,</div><div class='add'>+	HAL_XAMPLE_USER_TLV_16					= 65 /* 0x41 */,</div><div class='add'>+	HAL_XAMPLE_TLV_16					= 66 /* 0x42 */,</div><div class='add'>+	HAL_MACTX_PHY_OFF					= 67 /* 0x43 */,</div><div class='add'>+	HAL_MACTX_PHY_ON					= 68 /* 0x44 */,</div><div class='add'>+	HAL_MACTX_SYNTH_OFF					= 69 /* 0x45 */,</div><div class='add'>+	HAL_MACTXXPECT_CBF_COMMON				= 70 /* 0x46 */,</div><div class='add'>+	HAL_MACTXXPECT_CBF_PER_USER				= 71 /* 0x47 */,</div><div class='add'>+	HAL_MACTX_PHY_DESC					= 72 /* 0x48 */,</div><div class='add'>+	HAL_MACTX_L_SIG_A					= 73 /* 0x49 */,</div><div class='add'>+	HAL_MACTX_L_SIG_B					= 74 /* 0x4a */,</div><div class='add'>+	HAL_MACTX_HT_SIG					= 75 /* 0x4b */,</div><div class='add'>+	HAL_MACTX_VHT_SIG_A					= 76 /* 0x4c */,</div><div class='add'>+	HAL_MACTX_VHT_SIG_B_SU20				= 77 /* 0x4d */,</div><div class='add'>+	HAL_MACTX_VHT_SIG_B_SU40				= 78 /* 0x4e */,</div><div class='add'>+	HAL_MACTX_VHT_SIG_B_SU80				= 79 /* 0x4f */,</div><div class='add'>+	HAL_MACTX_VHT_SIG_B_SU160				= 80 /* 0x50 */,</div><div class='add'>+	HAL_MACTX_VHT_SIG_B_MU20				= 81 /* 0x51 */,</div><div class='add'>+	HAL_MACTX_VHT_SIG_B_MU40				= 82 /* 0x52 */,</div><div class='add'>+	HAL_MACTX_VHT_SIG_B_MU80				= 83 /* 0x53 */,</div><div class='add'>+	HAL_MACTX_VHT_SIG_B_MU160				= 84 /* 0x54 */,</div><div class='add'>+	HAL_MACTX_SERVICE					= 85 /* 0x55 */,</div><div class='add'>+	HAL_MACTX_HE_SIG_A_SU					= 86 /* 0x56 */,</div><div class='add'>+	HAL_MACTX_HE_SIG_A_MU_DL				= 87 /* 0x57 */,</div><div class='add'>+	HAL_MACTX_HE_SIG_A_MU_UL				= 88 /* 0x58 */,</div><div class='add'>+	HAL_MACTX_HE_SIG_B1_MU					= 89 /* 0x59 */,</div><div class='add'>+	HAL_MACTX_HE_SIG_B2_MU					= 90 /* 0x5a */,</div><div class='add'>+	HAL_MACTX_HE_SIG_B2_OFDMA				= 91 /* 0x5b */,</div><div class='add'>+	HAL_MACTX_DELETE_CV					= 92 /* 0x5c */,</div><div class='add'>+	HAL_MACTX_MU_UPLINK_COMMON				= 93 /* 0x5d */,</div><div class='add'>+	HAL_MACTX_MU_UPLINK_USER_SETUP				= 94 /* 0x5e */,</div><div class='add'>+	HAL_MACTX_OTHER_TRANSMIT_INFO				= 95 /* 0x5f */,</div><div class='add'>+	HAL_MACTX_PHY_NAP					= 96 /* 0x60 */,</div><div class='add'>+	HAL_MACTX_DEBUG						= 97 /* 0x61 */,</div><div class='add'>+	HAL_PHYRX_ABORT_ACK					= 98 /* 0x62 */,</div><div class='add'>+	HAL_PHYRX_GENERATED_CBF_DETAILS				= 99 /* 0x63 */,</div><div class='add'>+	HAL_PHYRX_RSSI_LEGACY					= 100 /* 0x64 */,</div><div class='add'>+	HAL_PHYRX_RSSI_HT					= 101 /* 0x65 */,</div><div class='add'>+	HAL_PHYRX_USER_INFO					= 102 /* 0x66 */,</div><div class='add'>+	HAL_PHYRX_PKT_END					= 103 /* 0x67 */,</div><div class='add'>+	HAL_PHYRX_DEBUG						= 104 /* 0x68 */,</div><div class='add'>+	HAL_PHYRX_CBF_TRANSFER_DONE				= 105 /* 0x69 */,</div><div class='add'>+	HAL_PHYRX_CBF_TRANSFER_ABORT				= 106 /* 0x6a */,</div><div class='add'>+	HAL_PHYRX_L_SIG_A					= 107 /* 0x6b */,</div><div class='add'>+	HAL_PHYRX_L_SIG_B					= 108 /* 0x6c */,</div><div class='add'>+	HAL_PHYRX_HT_SIG					= 109 /* 0x6d */,</div><div class='add'>+	HAL_PHYRX_VHT_SIG_A					= 110 /* 0x6e */,</div><div class='add'>+	HAL_PHYRX_VHT_SIG_B_SU20				= 111 /* 0x6f */,</div><div class='add'>+	HAL_PHYRX_VHT_SIG_B_SU40				= 112 /* 0x70 */,</div><div class='add'>+	HAL_PHYRX_VHT_SIG_B_SU80				= 113 /* 0x71 */,</div><div class='add'>+	HAL_PHYRX_VHT_SIG_B_SU160				= 114 /* 0x72 */,</div><div class='add'>+	HAL_PHYRX_VHT_SIG_B_MU20				= 115 /* 0x73 */,</div><div class='add'>+	HAL_PHYRX_VHT_SIG_B_MU40				= 116 /* 0x74 */,</div><div class='add'>+	HAL_PHYRX_VHT_SIG_B_MU80				= 117 /* 0x75 */,</div><div class='add'>+	HAL_PHYRX_VHT_SIG_B_MU160				= 118 /* 0x76 */,</div><div class='add'>+	HAL_PHYRX_HE_SIG_A_SU					= 119 /* 0x77 */,</div><div class='add'>+	HAL_PHYRX_HE_SIG_A_MU_DL				= 120 /* 0x78 */,</div><div class='add'>+	HAL_PHYRX_HE_SIG_A_MU_UL				= 121 /* 0x79 */,</div><div class='add'>+	HAL_PHYRX_HE_SIG_B1_MU					= 122 /* 0x7a */,</div><div class='add'>+	HAL_PHYRX_HE_SIG_B2_MU					= 123 /* 0x7b */,</div><div class='add'>+	HAL_PHYRX_HE_SIG_B2_OFDMA				= 124 /* 0x7c */,</div><div class='add'>+	HAL_PHYRX_OTHER_RECEIVE_INFO				= 125 /* 0x7d */,</div><div class='add'>+	HAL_PHYRX_COMMON_USER_INFO				= 126 /* 0x7e */,</div><div class='add'>+	HAL_PHYRX_DATA_DONE					= 127 /* 0x7f */,</div><div class='add'>+	HAL_COEX_TX_REQ						= 128 /* 0x80 */,</div><div class='add'>+	HAL_DUMMY						= 129 /* 0x81 */,</div><div class='add'>+	HALXAMPLE_TLV_32_NAME					= 130 /* 0x82 */,</div><div class='add'>+	HAL_MPDU_LIMIT						= 131 /* 0x83 */,</div><div class='add'>+	HAL_NA_LENGTH_END					= 132 /* 0x84 */,</div><div class='add'>+	HAL_OLE_BUF_STATUS					= 133 /* 0x85 */,</div><div class='add'>+	HAL_PCU_PPDU_SETUP_DONE					= 134 /* 0x86 */,</div><div class='add'>+	HAL_PCU_PPDU_SETUP_END					= 135 /* 0x87 */,</div><div class='add'>+	HAL_PCU_PPDU_SETUP_INIT					= 136 /* 0x88 */,</div><div class='add'>+	HAL_PCU_PPDU_SETUP_START				= 137 /* 0x89 */,</div><div class='add'>+	HAL_PDG_FES_SETUP					= 138 /* 0x8a */,</div><div class='add'>+	HAL_PDG_RESPONSE					= 139 /* 0x8b */,</div><div class='add'>+	HAL_PDG_TX_REQ						= 140 /* 0x8c */,</div><div class='add'>+	HAL_SCH_WAIT_INSTR					= 141 /* 0x8d */,</div><div class='add'>+	HAL_TQM_FLOWMPTY_STATUS					= 143 /* 0x8f */,</div><div class='add'>+	HAL_TQM_FLOW_NOTMPTY_STATUS				= 144 /* 0x90 */,</div><div class='add'>+	HAL_TQM_GEN_MPDU_LENGTH_LIST				= 145 /* 0x91 */,</div><div class='add'>+	HAL_TQM_GEN_MPDU_LENGTH_LIST_STATUS			= 146 /* 0x92 */,</div><div class='add'>+	HAL_TQM_GEN_MPDUS					= 147 /* 0x93 */,</div><div class='add'>+	HAL_TQM_GEN_MPDUS_STATUS				= 148 /* 0x94 */,</div><div class='add'>+	HAL_TQM_REMOVE_MPDU					= 149 /* 0x95 */,</div><div class='add'>+	HAL_TQM_REMOVE_MPDU_STATUS				= 150 /* 0x96 */,</div><div class='add'>+	HAL_TQM_REMOVE_MSDU					= 151 /* 0x97 */,</div><div class='add'>+	HAL_TQM_REMOVE_MSDU_STATUS				= 152 /* 0x98 */,</div><div class='add'>+	HAL_TQM_UPDATE_TX_MPDU_COUNT				= 153 /* 0x99 */,</div><div class='add'>+	HAL_TQM_WRITE_CMD					= 154 /* 0x9a */,</div><div class='add'>+	HAL_OFDMA_TRIGGER_DETAILS				= 155 /* 0x9b */,</div><div class='add'>+	HAL_TX_DATA						= 156 /* 0x9c */,</div><div class='add'>+	HAL_TX_FES_SETUP					= 157 /* 0x9d */,</div><div class='add'>+	HAL_RX_PACKET						= 158 /* 0x9e */,</div><div class='add'>+	HALXPECTED_RESPONSE					= 159 /* 0x9f */,</div><div class='add'>+	HAL_TX_MPDU_END						= 160 /* 0xa0 */,</div><div class='add'>+	HAL_TX_MPDU_START					= 161 /* 0xa1 */,</div><div class='add'>+	HAL_TX_MSDU_END						= 162 /* 0xa2 */,</div><div class='add'>+	HAL_TX_MSDU_START					= 163 /* 0xa3 */,</div><div class='add'>+	HAL_TX_SW_MODE_SETUP					= 164 /* 0xa4 */,</div><div class='add'>+	HAL_TXPCU_BUFFER_STATUS					= 165 /* 0xa5 */,</div><div class='add'>+	HAL_TXPCU_USER_BUFFER_STATUS				= 166 /* 0xa6 */,</div><div class='add'>+	HAL_DATA_TO_TIME_CONFIG					= 167 /* 0xa7 */,</div><div class='add'>+	HALXAMPLE_USER_TLV_32					= 168 /* 0xa8 */,</div><div class='add'>+	HAL_MPDU_INFO						= 169 /* 0xa9 */,</div><div class='add'>+	HAL_PDG_USER_SETUP					= 170 /* 0xaa */,</div><div class='add'>+	HAL_TX_11AH_SETUP					= 171 /* 0xab */,</div><div class='add'>+	HAL_REO_UPDATE_RX_REO_QUEUE_STATUS			= 172 /* 0xac */,</div><div class='add'>+	HAL_TX_PEER_ENTRY					= 173 /* 0xad */,</div><div class='add'>+	HAL_TX_RAW_OR_NATIVE_FRAME_SETUP			= 174 /* 0xae */,</div><div class='add'>+	HALXAMPLE_USER_TLV_44					= 175 /* 0xaf */,</div><div class='add'>+	HAL_TX_FLUSH						= 176 /* 0xb0 */,</div><div class='add'>+	HAL_TX_FLUSH_REQ					= 177 /* 0xb1 */,</div><div class='add'>+	HAL_TQM_WRITE_CMD_STATUS				= 178 /* 0xb2 */,</div><div class='add'>+	HAL_TQM_GET_MPDU_QUEUE_STATS				= 179 /* 0xb3 */,</div><div class='add'>+	HAL_TQM_GET_MSDU_FLOW_STATS				= 180 /* 0xb4 */,</div><div class='add'>+	HALXAMPLE_USER_CTLV_44					= 181 /* 0xb5 */,</div><div class='add'>+	HAL_TX_FES_STATUS_START					= 182 /* 0xb6 */,</div><div class='add'>+	HAL_TX_FES_STATUS_USER_PPDU				= 183 /* 0xb7 */,</div><div class='add'>+	HAL_TX_FES_STATUS_USER_RESPONSE				= 184 /* 0xb8 */,</div><div class='add'>+	HAL_TX_FES_STATUS_END					= 185 /* 0xb9 */,</div><div class='add'>+	HAL_RX_TRIG_INFO					= 186 /* 0xba */,</div><div class='add'>+	HAL_RXPCU_TX_SETUP_CLEAR				= 187 /* 0xbb */,</div><div class='add'>+	HAL_RX_FRAME_BITMAP_REQ					= 188 /* 0xbc */,</div><div class='add'>+	HAL_RX_FRAME_BITMAP_ACK					= 189 /* 0xbd */,</div><div class='add'>+	HAL_COEX_RX_STATUS					= 190 /* 0xbe */,</div><div class='add'>+	HAL_RX_START_PARAM					= 191 /* 0xbf */,</div><div class='add'>+	HAL_RX_PPDU_START					= 192 /* 0xc0 */,</div><div class='add'>+	HAL_RX_PPDU_END						= 193 /* 0xc1 */,</div><div class='add'>+	HAL_RX_MPDU_START					= 194 /* 0xc2 */,</div><div class='add'>+	HAL_RX_MPDU_END						= 195 /* 0xc3 */,</div><div class='add'>+	HAL_RX_MSDU_START					= 196 /* 0xc4 */,</div><div class='add'>+	HAL_RX_MSDU_END						= 197 /* 0xc5 */,</div><div class='add'>+	HAL_RX_ATTENTION					= 198 /* 0xc6 */,</div><div class='add'>+	HAL_RECEIVED_RESPONSE_INFO				= 199 /* 0xc7 */,</div><div class='add'>+	HAL_RX_PHY_SLEEP					= 200 /* 0xc8 */,</div><div class='add'>+	HAL_RX_HEADER						= 201 /* 0xc9 */,</div><div class='add'>+	HAL_RX_PEER_ENTRY					= 202 /* 0xca */,</div><div class='add'>+	HAL_RX_FLUSH						= 203 /* 0xcb */,</div><div class='add'>+	HAL_RX_RESPONSE_REQUIRED_INFO				= 204 /* 0xcc */,</div><div class='add'>+	HAL_RX_FRAMELESS_BAR_DETAILS				= 205 /* 0xcd */,</div><div class='add'>+	HAL_TQM_GET_MPDU_QUEUE_STATS_STATUS			= 206 /* 0xce */,</div><div class='add'>+	HAL_TQM_GET_MSDU_FLOW_STATS_STATUS			= 207 /* 0xcf */,</div><div class='add'>+	HAL_TX_CBF_INFO						= 208 /* 0xd0 */,</div><div class='add'>+	HAL_PCU_PPDU_SETUP_USER					= 209 /* 0xd1 */,</div><div class='add'>+	HAL_RX_MPDU_PCU_START					= 210 /* 0xd2 */,</div><div class='add'>+	HAL_RX_PM_INFO						= 211 /* 0xd3 */,</div><div class='add'>+	HAL_RX_USER_PPDU_END					= 212 /* 0xd4 */,</div><div class='add'>+	HAL_RX_PRE_PPDU_START					= 213 /* 0xd5 */,</div><div class='add'>+	HAL_RX_PREAMBLE						= 214 /* 0xd6 */,</div><div class='add'>+	HAL_TX_FES_SETUP_COMPLETE				= 215 /* 0xd7 */,</div><div class='add'>+	HAL_TX_LAST_MPDU_FETCHED				= 216 /* 0xd8 */,</div><div class='add'>+	HAL_TXDMA_STOP_REQUEST					= 217 /* 0xd9 */,</div><div class='add'>+	HAL_RXPCU_SETUP						= 218 /* 0xda */,</div><div class='add'>+	HAL_RXPCU_USER_SETUP					= 219 /* 0xdb */,</div><div class='add'>+	HAL_TX_FES_STATUS_ACK_OR_BA				= 220 /* 0xdc */,</div><div class='add'>+	HAL_TQM_ACKED_MPDU					= 221 /* 0xdd */,</div><div class='add'>+	HAL_COEX_TX_RESP					= 222 /* 0xde */,</div><div class='add'>+	HAL_COEX_TX_STATUS					= 223 /* 0xdf */,</div><div class='add'>+	HAL_MACTX_COEX_PHY_CTRL					= 224 /* 0xe0 */,</div><div class='add'>+	HAL_COEX_STATUS_BROADCAST				= 225 /* 0xe1 */,</div><div class='add'>+	HAL_RESPONSE_START_STATUS				= 226 /* 0xe2 */,</div><div class='add'>+	HAL_RESPONSEND_STATUS					= 227 /* 0xe3 */,</div><div class='add'>+	HAL_CRYPTO_STATUS					= 228 /* 0xe4 */,</div><div class='add'>+	HAL_RECEIVED_TRIGGER_INFO				= 229 /* 0xe5 */,</div><div class='add'>+	HAL_COEX_TX_STOP_CTRL					= 230 /* 0xe6 */,</div><div class='add'>+	HAL_RX_PPDU_ACK_REPORT					= 231 /* 0xe7 */,</div><div class='add'>+	HAL_RX_PPDU_NO_ACK_REPORT				= 232 /* 0xe8 */,</div><div class='add'>+	HAL_SCH_COEX_STATUS					= 233 /* 0xe9 */,</div><div class='add'>+	HAL_SCHEDULER_COMMAND_STATUS				= 234 /* 0xea */,</div><div class='add'>+	HAL_SCHEDULER_RX_PPDU_NO_RESPONSE_STATUS		= 235 /* 0xeb */,</div><div class='add'>+	HAL_TX_FES_STATUS_PROT					= 236 /* 0xec */,</div><div class='add'>+	HAL_TX_FES_STATUS_START_PPDU				= 237 /* 0xed */,</div><div class='add'>+	HAL_TX_FES_STATUS_START_PROT				= 238 /* 0xee */,</div><div class='add'>+	HAL_TXPCU_PHYTX_DEBUG32					= 239 /* 0xef */,</div><div class='add'>+	HAL_TXPCU_PHYTX_OTHER_TRANSMIT_INFO32			= 240 /* 0xf0 */,</div><div class='add'>+	HAL_TX_MPDU_COUNT_TRANSFERND				= 241 /* 0xf1 */,</div><div class='add'>+	HAL_WHO_ANCHOR_OFFSET					= 242 /* 0xf2 */,</div><div class='add'>+	HAL_WHO_ANCHOR_VALUE					= 243 /* 0xf3 */,</div><div class='add'>+	HAL_WHO_CCE_INFO					= 244 /* 0xf4 */,</div><div class='add'>+	HAL_WHO_COMMIT						= 245 /* 0xf5 */,</div><div class='add'>+	HAL_WHO_COMMIT_DONE					= 246 /* 0xf6 */,</div><div class='add'>+	HAL_WHO_FLUSH						= 247 /* 0xf7 */,</div><div class='add'>+	HAL_WHO_L2_LLC						= 248 /* 0xf8 */,</div><div class='add'>+	HAL_WHO_L2_PAYLOAD					= 249 /* 0xf9 */,</div><div class='add'>+	HAL_WHO_L3_CHECKSUM					= 250 /* 0xfa */,</div><div class='add'>+	HAL_WHO_L3_INFO						= 251 /* 0xfb */,</div><div class='add'>+	HAL_WHO_L4_CHECKSUM					= 252 /* 0xfc */,</div><div class='add'>+	HAL_WHO_L4_INFO						= 253 /* 0xfd */,</div><div class='add'>+	HAL_WHO_MSDU						= 254 /* 0xfe */,</div><div class='add'>+	HAL_WHO_MSDU_MISC					= 255 /* 0xff */,</div><div class='add'>+	HAL_WHO_PACKET_DATA					= 256 /* 0x100 */,</div><div class='add'>+	HAL_WHO_PACKET_HDR					= 257 /* 0x101 */,</div><div class='add'>+	HAL_WHO_PPDU_END					= 258 /* 0x102 */,</div><div class='add'>+	HAL_WHO_PPDU_START					= 259 /* 0x103 */,</div><div class='add'>+	HAL_WHO_TSO						= 260 /* 0x104 */,</div><div class='add'>+	HAL_WHO_WMAC_HEADER_PV0					= 261 /* 0x105 */,</div><div class='add'>+	HAL_WHO_WMAC_HEADER_PV1					= 262 /* 0x106 */,</div><div class='add'>+	HAL_WHO_WMAC_IV						= 263 /* 0x107 */,</div><div class='add'>+	HAL_MPDU_INFO_END					= 264 /* 0x108 */,</div><div class='add'>+	HAL_MPDU_INFO_BITMAP					= 265 /* 0x109 */,</div><div class='add'>+	HAL_TX_QUEUE_EXTENSION					= 266 /* 0x10a */,</div><div class='add'>+	HAL_SCHEDULER_SELFGEN_RESPONSE_STATUS			= 267 /* 0x10b */,</div><div class='add'>+	HAL_TQM_UPDATE_TX_MPDU_COUNT_STATUS			= 268 /* 0x10c */,</div><div class='add'>+	HAL_TQM_ACKED_MPDU_STATUS				= 269 /* 0x10d */,</div><div class='add'>+	HAL_TQM_ADD_MSDU_STATUS					= 270 /* 0x10e */,</div><div class='add'>+	HAL_TQM_LIST_GEN_DONE					= 271 /* 0x10f */,</div><div class='add'>+	HAL_WHO_TERMINATE					= 272 /* 0x110 */,</div><div class='add'>+	HAL_TX_LAST_MPDU_END					= 273 /* 0x111 */,</div><div class='add'>+	HAL_TX_CV_DATA						= 274 /* 0x112 */,</div><div class='add'>+	HAL_PPDU_TX_END						= 275 /* 0x113 */,</div><div class='add'>+	HAL_PROT_TX_END						= 276 /* 0x114 */,</div><div class='add'>+	HAL_MPDU_INFO_GLOBAL_END				= 277 /* 0x115 */,</div><div class='add'>+	HAL_TQM_SCH_INSTR_GLOBAL_END				= 278 /* 0x116 */,</div><div class='add'>+	HAL_RX_PPDU_END_USER_STATS				= 279 /* 0x117 */,</div><div class='add'>+	HAL_RX_PPDU_END_USER_STATS_EXT				= 280 /* 0x118 */,</div><div class='add'>+	HAL_REO_GET_QUEUE_STATS					= 281 /* 0x119 */,</div><div class='add'>+	HAL_REO_FLUSH_QUEUE					= 282 /* 0x11a */,</div><div class='add'>+	HAL_REO_FLUSH_CACHE					= 283 /* 0x11b */,</div><div class='add'>+	HAL_REO_UNBLOCK_CACHE					= 284 /* 0x11c */,</div><div class='add'>+	HAL_REO_GET_QUEUE_STATS_STATUS				= 285 /* 0x11d */,</div><div class='add'>+	HAL_REO_FLUSH_QUEUE_STATUS				= 286 /* 0x11e */,</div><div class='add'>+	HAL_REO_FLUSH_CACHE_STATUS				= 287 /* 0x11f */,</div><div class='add'>+	HAL_REO_UNBLOCK_CACHE_STATUS				= 288 /* 0x120 */,</div><div class='add'>+	HAL_TQM_FLUSH_CACHE					= 289 /* 0x121 */,</div><div class='add'>+	HAL_TQM_UNBLOCK_CACHE					= 290 /* 0x122 */,</div><div class='add'>+	HAL_TQM_FLUSH_CACHE_STATUS				= 291 /* 0x123 */,</div><div class='add'>+	HAL_TQM_UNBLOCK_CACHE_STATUS				= 292 /* 0x124 */,</div><div class='add'>+	HAL_RX_PPDU_END_STATUS_DONE				= 293 /* 0x125 */,</div><div class='add'>+	HAL_RX_STATUS_BUFFER_DONE				= 294 /* 0x126 */,</div><div class='add'>+	HAL_TX_DATA_SYNC					= 297 /* 0x129 */,</div><div class='add'>+	HAL_PHYRX_CBF_READ_REQUEST_ACK				= 298 /* 0x12a */,</div><div class='add'>+	HAL_TQM_GET_MPDU_HEAD_INFO				= 299 /* 0x12b */,</div><div class='add'>+	HAL_TQM_SYNC_CMD					= 300 /* 0x12c */,</div><div class='add'>+	HAL_TQM_GET_MPDU_HEAD_INFO_STATUS			= 301 /* 0x12d */,</div><div class='add'>+	HAL_TQM_SYNC_CMD_STATUS					= 302 /* 0x12e */,</div><div class='add'>+	HAL_TQM_THRESHOLD_DROP_NOTIFICATION_STATUS		= 303 /* 0x12f */,</div><div class='add'>+	HAL_TQM_DESCRIPTOR_THRESHOLD_REACHED_STATUS		= 304 /* 0x130 */,</div><div class='add'>+	HAL_REO_FLUSH_TIMEOUT_LIST				= 305 /* 0x131 */,</div><div class='add'>+	HAL_REO_FLUSH_TIMEOUT_LIST_STATUS			= 306 /* 0x132 */,</div><div class='add'>+	HAL_REO_DESCRIPTOR_THRESHOLD_REACHED_STATUS		= 307 /* 0x133 */,</div><div class='add'>+	HAL_SCHEDULER_RX_SIFS_RESPONSE_TRIGGER_STATUS		= 308 /* 0x134 */,</div><div class='add'>+	HALXAMPLE_USER_TLV_32_NAME				= 309 /* 0x135 */,</div><div class='add'>+	HAL_RX_PPDU_START_USER_INFO				= 310 /* 0x136 */,</div><div class='add'>+	HAL_RX_RING_MASK					= 311 /* 0x137 */,</div><div class='add'>+	HAL_COEX_MAC_NAP					= 312 /* 0x138 */,</div><div class='add'>+	HAL_RXPCU_PPDU_END_INFO					= 313 /* 0x139 */,</div><div class='add'>+	HAL_WHO_MESH_CONTROL					= 314 /* 0x13a */,</div><div class='add'>+	HAL_PDG_SW_MODE_BW_START				= 315 /* 0x13b */,</div><div class='add'>+	HAL_PDG_SW_MODE_BW_END					= 316 /* 0x13c */,</div><div class='add'>+	HAL_PDG_WAIT_FOR_MAC_REQUEST				= 317 /* 0x13d */,</div><div class='add'>+	HAL_PDG_WAIT_FOR_PHY_REQUEST				= 318 /* 0x13e */,</div><div class='add'>+	HAL_SCHEDULER_END					= 319 /* 0x13f */,</div><div class='add'>+	HAL_RX_PPDU_START_DROPPED				= 320 /* 0x140 */,</div><div class='add'>+	HAL_RX_PPDU_END_DROPPED					= 321 /* 0x141 */,</div><div class='add'>+	HAL_RX_PPDU_END_STATUS_DONE_DROPPED			= 322 /* 0x142 */,</div><div class='add'>+	HAL_RX_MPDU_START_DROPPED				= 323 /* 0x143 */,</div><div class='add'>+	HAL_RX_MSDU_START_DROPPED				= 324 /* 0x144 */,</div><div class='add'>+	HAL_RX_MSDU_END_DROPPED					= 325 /* 0x145 */,</div><div class='add'>+	HAL_RX_MPDU_END_DROPPED					= 326 /* 0x146 */,</div><div class='add'>+	HAL_RX_ATTENTION_DROPPED				= 327 /* 0x147 */,</div><div class='add'>+	HAL_TXPCU_USER_SETUP					= 328 /* 0x148 */,</div><div class='add'>+	HAL_RXPCU_USER_SETUP_EXT				= 329 /* 0x149 */,</div><div class='add'>+	HAL_CMD_PART_0_END					= 330 /* 0x14a */,</div><div class='add'>+	HAL_MACTX_SYNTH_ON					= 331 /* 0x14b */,</div><div class='add'>+	HAL_SCH_CRITICAL_TLV_REFERENCE				= 332 /* 0x14c */,</div><div class='add'>+	HAL_TQM_MPDU_GLOBAL_START				= 333 /* 0x14d */,</div><div class='add'>+	HALXAMPLE_TLV_32					= 334 /* 0x14e */,</div><div class='add'>+	HAL_TQM_UPDATE_TX_MSDU_FLOW				= 335 /* 0x14f */,</div><div class='add'>+	HAL_TQM_UPDATE_TX_MPDU_QUEUE_HEAD			= 336 /* 0x150 */,</div><div class='add'>+	HAL_TQM_UPDATE_TX_MSDU_FLOW_STATUS			= 337 /* 0x151 */,</div><div class='add'>+	HAL_TQM_UPDATE_TX_MPDU_QUEUE_HEAD_STATUS		= 338 /* 0x152 */,</div><div class='add'>+	HAL_REO_UPDATE_RX_REO_QUEUE				= 339 /* 0x153 */,</div><div class='add'>+	HAL_TQM_MPDU_QUEUEMPTY_STATUS				= 340 /* 0x154 */,</div><div class='add'>+	HAL_TQM_2_SCH_MPDU_AVAILABLE				= 341 /* 0x155 */,</div><div class='add'>+	HAL_PDG_TRIG_RESPONSE					= 342 /* 0x156 */,</div><div class='add'>+	HAL_TRIGGER_RESPONSE_TX_DONE				= 343 /* 0x157 */,</div><div class='add'>+	HAL_ABORT_FROM_PHYRX_DETAILS				= 344 /* 0x158 */,</div><div class='add'>+	HAL_SCH_TQM_CMD_WRAPPER					= 345 /* 0x159 */,</div><div class='add'>+	HAL_MPDUS_AVAILABLE					= 346 /* 0x15a */,</div><div class='add'>+	HAL_RECEIVED_RESPONSE_INFO_PART2			= 347 /* 0x15b */,</div><div class='add'>+	HAL_PHYRX_TX_START_TIMING				= 348 /* 0x15c */,</div><div class='add'>+	HAL_TXPCU_PREAMBLE_DONE					= 349 /* 0x15d */,</div><div class='add'>+	HAL_NDP_PREAMBLE_DONE					= 350 /* 0x15e */,</div><div class='add'>+	HAL_SCH_TQM_CMD_WRAPPER_RBO_DROP			= 351 /* 0x15f */,</div><div class='add'>+	HAL_SCH_TQM_CMD_WRAPPER_CONT_DROP			= 352 /* 0x160 */,</div><div class='add'>+	HAL_MACTX_CLEAR_PREV_TX_INFO				= 353 /* 0x161 */,</div><div class='add'>+	HAL_TX_PUNCTURE_SETUP					= 354 /* 0x162 */,</div><div class='add'>+	HAL_R2R_STATUS_END					= 355 /* 0x163 */,</div><div class='add'>+	HAL_MACTX_PREFETCH_CV_COMMON				= 356 /* 0x164 */,</div><div class='add'>+	HAL_END_OF_FLUSH_MARKER					= 357 /* 0x165 */,</div><div class='add'>+	HAL_MACTX_MU_UPLINK_COMMON_PUNC				= 358 /* 0x166 */,</div><div class='add'>+	HAL_MACTX_MU_UPLINK_USER_SETUP_PUNC			= 359 /* 0x167 */,</div><div class='add'>+	HAL_RECEIVED_RESPONSE_USER_7_0				= 360 /* 0x168 */,</div><div class='add'>+	HAL_RECEIVED_RESPONSE_USER_15_8				= 361 /* 0x169 */,</div><div class='add'>+	HAL_RECEIVED_RESPONSE_USER_23_16			= 362 /* 0x16a */,</div><div class='add'>+	HAL_RECEIVED_RESPONSE_USER_31_24			= 363 /* 0x16b */,</div><div class='add'>+	HAL_RECEIVED_RESPONSE_USER_36_32			= 364 /* 0x16c */,</div><div class='add'>+	HAL_TX_LOOPBACK_SETUP					= 365 /* 0x16d */,</div><div class='add'>+	HAL_PHYRX_OTHER_RECEIVE_INFO_RU_DETAILS			= 366 /* 0x16e */,</div><div class='add'>+	HAL_SCH_WAIT_INSTR_TX_PATH				= 367 /* 0x16f */,</div><div class='add'>+	HAL_MACTX_OTHER_TRANSMIT_INFO_TX2TX			= 368 /* 0x170 */,</div><div class='add'>+	HAL_MACTX_OTHER_TRANSMIT_INFOMUPHY_SETUP		= 369 /* 0x171 */,</div><div class='add'>+	HAL_PHYRX_OTHER_RECEIVE_INFOVM_DETAILS			= 370 /* 0x172 */,</div><div class='add'>+	HAL_TX_WUR_DATA						= 371 /* 0x173 */,</div><div class='add'>+	HAL_RX_PPDU_END_START					= 372 /* 0x174 */,</div><div class='add'>+	HAL_RX_PPDU_END_MIDDLE					= 373 /* 0x175 */,</div><div class='add'>+	HAL_RX_PPDU_END_LAST					= 374 /* 0x176 */,</div><div class='add'>+	HAL_MACTX_BACKOFF_BASED_TRANSMISSION			= 375 /* 0x177 */,</div><div class='add'>+	HAL_MACTX_OTHER_TRANSMIT_INFO_DL_OFDMA_TX		= 376 /* 0x178 */,</div><div class='add'>+	HAL_SRP_INFO						= 377 /* 0x179 */,</div><div class='add'>+	HAL_OBSS_SR_INFO					= 378 /* 0x17a */,</div><div class='add'>+	HAL_SCHEDULER_SW_MSG_STATUS				= 379 /* 0x17b */,</div><div class='add'>+	HAL_HWSCH_RXPCU_MAC_INFO_ANNOUNCEMENT			= 380 /* 0x17c */,</div><div class='add'>+	HAL_RXPCU_SETUP_COMPLETE				= 381 /* 0x17d */,</div><div class='add'>+	HAL_SNOOP_PPDU_START					= 382 /* 0x17e */,</div><div class='add'>+	HAL_SNOOP_MPDU_USR_DBG_INFO				= 383 /* 0x17f */,</div><div class='add'>+	HAL_SNOOP_MSDU_USR_DBG_INFO				= 384 /* 0x180 */,</div><div class='add'>+	HAL_SNOOP_MSDU_USR_DATA					= 385 /* 0x181 */,</div><div class='add'>+	HAL_SNOOP_MPDU_USR_STAT_INFO				= 386 /* 0x182 */,</div><div class='add'>+	HAL_SNOOP_PPDU_END					= 387 /* 0x183 */,</div><div class='add'>+	HAL_SNOOP_SPARE						= 388 /* 0x184 */,</div><div class='add'>+	HAL_PHYRX_OTHER_RECEIVE_INFO_MU_RSSI_COMMON		= 390 /* 0x186 */,</div><div class='add'>+	HAL_PHYRX_OTHER_RECEIVE_INFO_MU_RSSI_USER		= 391 /* 0x187 */,</div><div class='add'>+	HAL_MACTX_OTHER_TRANSMIT_INFO_SCH_DETAILS		= 392 /* 0x188 */,</div><div class='add'>+	HAL_PHYRX_OTHER_RECEIVE_INFO_108PVM_DETAILS		= 393 /* 0x189 */,</div><div class='add'>+	HAL_SCH_TLV_WRAPPER					= 394 /* 0x18a */,</div><div class='add'>+	HAL_SCHEDULER_STATUS_WRAPPER				= 395 /* 0x18b */,</div><div class='add'>+	HAL_MPDU_INFO_6X					= 396 /* 0x18c */,</div><div class='add'>+	HAL_MACTX_11AZ_USER_DESC_PER_USER			= 397 /* 0x18d */,</div><div class='add'>+	HAL_MACTX_U_SIGHT_SU_MU					= 398 /* 0x18e */,</div><div class='add'>+	HAL_MACTX_U_SIGHT_TB					= 399 /* 0x18f */,</div><div class='add'>+	HAL_PHYRX_U_SIGHT_SU_MU					= 403 /* 0x193 */,</div><div class='add'>+	HAL_PHYRX_U_SIGHT_TB					= 404 /* 0x194 */,</div><div class='add'>+	HAL_MACRX_LMR_READ_REQUEST				= 408 /* 0x198 */,</div><div class='add'>+	HAL_MACRX_LMR_DATA_REQUEST				= 409 /* 0x199 */,</div><div class='add'>+	HAL_PHYRX_LMR_TRANSFER_DONE				= 410 /* 0x19a */,</div><div class='add'>+	HAL_PHYRX_LMR_TRANSFER_ABORT				= 411 /* 0x19b */,</div><div class='add'>+	HAL_PHYRX_LMR_READ_REQUEST_ACK				= 412 /* 0x19c */,</div><div class='add'>+	HAL_MACRX_SECURE_LTF_SEQ_PTR				= 413 /* 0x19d */,</div><div class='add'>+	HAL_PHYRX_USER_INFO_MU_UL				= 414 /* 0x19e */,</div><div class='add'>+	HAL_MPDU_QUEUE_OVERVIEW					= 415 /* 0x19f */,</div><div class='add'>+	HAL_SCHEDULER_NAV_INFO					= 416 /* 0x1a0 */,</div><div class='add'>+	HAL_LMR_PEER_ENTRY					= 418 /* 0x1a2 */,</div><div class='add'>+	HAL_LMR_MPDU_START					= 419 /* 0x1a3 */,</div><div class='add'>+	HAL_LMR_DATA						= 420 /* 0x1a4 */,</div><div class='add'>+	HAL_LMR_MPDU_END					= 421 /* 0x1a5 */,</div><div class='add'>+	HAL_REO_GET_QUEUE_1K_STATS_STATUS			= 422 /* 0x1a6 */,</div><div class='add'>+	HAL_RX_FRAME_1K_BITMAP_ACK				= 423 /* 0x1a7 */,</div><div class='add'>+	HAL_TX_FES_STATUS_1K_BA					= 424 /* 0x1a8 */,</div><div class='add'>+	HAL_TQM_ACKED_1K_MPDU					= 425 /* 0x1a9 */,</div><div class='add'>+	HAL_MACRX_INBSS_OBSS_IND				= 426 /* 0x1aa */,</div><div class='add'>+	HAL_PHYRX_LOCATION					= 427 /* 0x1ab */,</div><div class='add'>+	HAL_MLO_TX_NOTIFICATION_SU				= 428 /* 0x1ac */,</div><div class='add'>+	HAL_MLO_TX_NOTIFICATION_MU				= 429 /* 0x1ad */,</div><div class='add'>+	HAL_MLO_TX_REQ_SU					= 430 /* 0x1ae */,</div><div class='add'>+	HAL_MLO_TX_REQ_MU					= 431 /* 0x1af */,</div><div class='add'>+	HAL_MLO_TX_RESP						= 432 /* 0x1b0 */,</div><div class='add'>+	HAL_MLO_RX_NOTIFICATION					= 433 /* 0x1b1 */,</div><div class='add'>+	HAL_MLO_BKOFF_TRUNC_REQ					= 434 /* 0x1b2 */,</div><div class='add'>+	HAL_MLO_TBTT_NOTIFICATION				= 435 /* 0x1b3 */,</div><div class='add'>+	HAL_MLO_MESSAGE						= 436 /* 0x1b4 */,</div><div class='add'>+	HAL_MLO_TS_SYNC_MSG					= 437 /* 0x1b5 */,</div><div class='add'>+	HAL_MLO_FES_SETUP					= 438 /* 0x1b6 */,</div><div class='add'>+	HAL_MLO_PDG_FES_SETUP_SU				= 439 /* 0x1b7 */,</div><div class='add'>+	HAL_MLO_PDG_FES_SETUP_MU				= 440 /* 0x1b8 */,</div><div class='add'>+	HAL_MPDU_INFO_1K_BITMAP					= 441 /* 0x1b9 */,</div><div class='add'>+	HAL_MON_BUF_ADDR					= 442 /* 0x1ba */,</div><div class='add'>+	HAL_TX_FRAG_STATE					= 443 /* 0x1bb */,</div><div class='add'>+	HAL_MACTXHT_SIG_USR_OFDMA				= 446 /* 0x1be */,</div><div class='add'>+	HAL_PHYRXHT_SIG_CMN_PUNC				= 448 /* 0x1c0 */,</div><div class='add'>+	HAL_PHYRXHT_SIG_CMN_OFDMA				= 450 /* 0x1c2 */,</div><div class='add'>+	HAL_PHYRXHT_SIG_USR_OFDMA				= 454 /* 0x1c6 */,</div><div class='add'>+	HAL_PHYRX_PKT_END_PART1					= 456 /* 0x1c8 */,</div><div class='add'>+	HAL_MACTXXPECT_NDP_RECEPTION				= 457 /* 0x1c9 */,</div><div class='add'>+	HAL_MACTX_SECURE_LTF_SEQ_PTR				= 458 /* 0x1ca */,</div><div class='add'>+	HAL_MLO_PDG_BKOFF_TRUNC_NOTIFY				= 460 /* 0x1cc */,</div><div class='add'>+	HAL_PHYRX_11AZ_INTEGRITY_DATA				= 461 /* 0x1cd */,</div><div class='add'>+	HAL_PHYTX_LOCATION					= 462 /* 0x1ce */,</div><div class='add'>+	HAL_PHYTX_11AZ_INTEGRITY_DATA				= 463 /* 0x1cf */,</div><div class='add'>+	HAL_MACTXHT_SIG_USR_SU					= 466 /* 0x1d2 */,</div><div class='add'>+	HAL_MACTXHT_SIG_USR_MU_MIMO				= 467 /* 0x1d3 */,</div><div class='add'>+	HAL_PHYRXHT_SIG_USR_SU					= 468 /* 0x1d4 */,</div><div class='add'>+	HAL_PHYRXHT_SIG_USR_MU_MIMO				= 469 /* 0x1d5 */,</div><div class='add'>+	HAL_PHYRX_GENERIC_U_SIG					= 470 /* 0x1d6 */,</div><div class='add'>+	HAL_PHYRX_GENERIC_EHT_SIG				= 471 /* 0x1d7 */,</div><div class='add'>+	HAL_OVERWRITE_RESP_START				= 472 /* 0x1d8 */,</div><div class='add'>+	HAL_OVERWRITE_RESP_PREAMBLE_INFO			= 473 /* 0x1d9 */,</div><div class='add'>+	HAL_OVERWRITE_RESP_FRAME_INFO				= 474 /* 0x1da */,</div><div class='add'>+	HAL_OVERWRITE_RESP_END					= 475 /* 0x1db */,</div><div class='add'>+	HAL_RXPCUARLY_RX_INDICATION				= 476 /* 0x1dc */,</div><div class='add'>+	HAL_MON_DROP						= 477 /* 0x1dd */,</div><div class='add'>+	HAL_MACRX_MU_UPLINK_COMMON_SNIFF			= 478 /* 0x1de */,</div><div class='add'>+	HAL_MACRX_MU_UPLINK_USER_SETUP_SNIFF			= 479 /* 0x1df */,</div><div class='add'>+	HAL_MACRX_MU_UPLINK_USER_SEL_SNIFF			= 480 /* 0x1e0 */,</div><div class='add'>+	HAL_MACRX_MU_UPLINK_FCS_STATUS_SNIFF			= 481 /* 0x1e1 */,</div><div class='add'>+	HAL_MACTX_PREFETCH_CV_DMA				= 482 /* 0x1e2 */,</div><div class='add'>+	HAL_MACTX_PREFETCH_CV_PER_USER				= 483 /* 0x1e3 */,</div><div class='add'>+	HAL_PHYRX_OTHER_RECEIVE_INFO_ALL_SIGB_DETAILS		= 484 /* 0x1e4 */,</div><div class='add'>+	HAL_MACTX_BF_PARAMS_UPDATE_COMMON			= 485 /* 0x1e5 */,</div><div class='add'>+	HAL_MACTX_BF_PARAMS_UPDATE_PER_USER			= 486 /* 0x1e6 */,</div><div class='add'>+	HAL_RANGING_USER_DETAILS				= 487 /* 0x1e7 */,</div><div class='add'>+	HAL_PHYTX_CV_CORR_STATUS				= 488 /* 0x1e8 */,</div><div class='add'>+	HAL_PHYTX_CV_CORR_COMMON				= 489 /* 0x1e9 */,</div><div class='add'>+	HAL_PHYTX_CV_CORR_USER					= 490 /* 0x1ea */,</div><div class='add'>+	HAL_MACTX_CV_CORR_COMMON				= 491 /* 0x1eb */,</div><div class='add'>+	HAL_MACTX_CV_CORR_MAC_INFO_GROUP			= 492 /* 0x1ec */,</div><div class='add'>+	HAL_BW_PUNCTUREVAL_WRAPPER				= 493 /* 0x1ed */,</div><div class='add'>+	HAL_MACTX_RX_NOTIFICATION_FOR_PHY			= 494 /* 0x1ee */,</div><div class='add'>+	HAL_MACTX_TX_NOTIFICATION_FOR_PHY			= 495 /* 0x1ef */,</div><div class='add'>+	HAL_MACTX_MU_UPLINK_COMMON_PER_BW			= 496 /* 0x1f0 */,</div><div class='add'>+	HAL_MACTX_MU_UPLINK_USER_SETUP_PER_BW			= 497 /* 0x1f1 */,</div><div class='add'>+	HAL_RX_PPDU_END_USER_STATS_EXT2				= 498 /* 0x1f2 */,</div><div class='add'>+	HAL_FW2SW_MON						= 499 /* 0x1f3 */,</div><div class='add'>+	HAL_WSI_DIRECT_MESSAGE					= 500 /* 0x1f4 */,</div><div class='add'>+	HAL_MACTXMLSR_PRE_SWITCH				= 501 /* 0x1f5 */,</div><div class='add'>+	HAL_MACTXMLSR_SWITCH					= 502 /* 0x1f6 */,</div><div class='add'>+	HAL_MACTXMLSR_SWITCH_BACK				= 503 /* 0x1f7 */,</div><div class='add'>+	HAL_PHYTXMLSR_SWITCH_ACK				= 504 /* 0x1f8 */,</div><div class='add'>+	HAL_PHYTXMLSR_SWITCH_BACK_ACK				= 505 /* 0x1f9 */,</div><div class='add'>+	HAL_SPARE_REUSE_TAG_0					= 506 /* 0x1fa */,</div><div class='add'>+	HAL_SPARE_REUSE_TAG_1					= 507 /* 0x1fb */,</div><div class='add'>+	HAL_SPARE_REUSE_TAG_2					= 508 /* 0x1fc */,</div><div class='add'>+	HAL_SPARE_REUSE_TAG_3					= 509 /* 0x1fd */,</div><div class='add'>+	/* FIXME: Assign correct value for HAL_TCL_DATA_CMD */</div><div class='add'>+	HAL_TCL_DATA_CMD					= 510,</div><div class='add'>+	HAL_TLV_BASE						= 511 /* 0x1ff */,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_TLV_HDR_TAG		GENMASK(9, 1)</div><div class='add'>+#define HAL_TLV_HDR_LEN		GENMASK(25, 10)</div><div class='add'>+#define HAL_TLV_USR_ID          GENMASK(31, 26)</div><div class='add'>+</div><div class='add'>+#define HAL_TLV_ALIGN	4</div><div class='add'>+</div><div class='add'>+struct hal_tlv_hdr {</div><div class='add'>+	__le32 tl;</div><div class='add'>+	u8 value[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_TLV_64_HDR_TAG		GENMASK(9, 1)</div><div class='add'>+#define HAL_TLV_64_HDR_LEN		GENMASK(21, 10)</div><div class='add'>+#define HAL_TLV_64_USR_ID		GENMASK(31, 26)</div><div class='add'>+#define HAL_TLV_64_ALIGN		8</div><div class='add'>+</div><div class='add'>+struct hal_tlv_64_hdr {</div><div class='add'>+	__le64 tl;</div><div class='add'>+	u8 value[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define RX_MPDU_DESC_INFO0_MSDU_COUNT		GENMASK(7, 0)</div><div class='add'>+#define RX_MPDU_DESC_INFO0_FRAG_FLAG		BIT(8)</div><div class='add'>+#define RX_MPDU_DESC_INFO0_MPDU_RETRY		BIT(9)</div><div class='add'>+#define RX_MPDU_DESC_INFO0_AMPDU_FLAG		BIT(10)</div><div class='add'>+#define RX_MPDU_DESC_INFO0_BAR_FRAME		BIT(11)</div><div class='add'>+#define RX_MPDU_DESC_INFO0_VALID_PN		BIT(12)</div><div class='add'>+#define RX_MPDU_DESC_INFO0_RAW_MPDU		BIT(13)</div><div class='add'>+#define RX_MPDU_DESC_INFO0_MORE_FRAG_FLAG	BIT(14)</div><div class='add'>+#define RX_MPDU_DESC_INFO0_SRC_INFO		GENMASK(26, 15)</div><div class='add'>+#define RX_MPDU_DESC_INFO0_MPDU_QOS_CTRL_VALID	BIT(27)</div><div class='add'>+#define RX_MPDU_DESC_INFO0_TID			GENMASK(31, 28)</div><div class='add'>+</div><div class='add'>+/* Peer Metadata classification */</div><div class='add'>+</div><div class='add'>+/* Version 0 */</div><div class='add'>+#define RX_MPDU_DESC_META_DATA_V0_PEER_ID	GENMASK(15, 0)</div><div class='add'>+#define RX_MPDU_DESC_META_DATA_V0_VDEV_ID	GENMASK(23, 16)</div><div class='add'>+</div><div class='add'>+/* Version 1 */</div><div class='add'>+#define RX_MPDU_DESC_META_DATA_V1_PEER_ID		GENMASK(13, 0)</div><div class='add'>+#define RX_MPDU_DESC_META_DATA_V1_LOGICAL_LINK_ID	GENMASK(15, 14)</div><div class='add'>+#define RX_MPDU_DESC_META_DATA_V1_VDEV_ID		GENMASK(23, 16)</div><div class='add'>+#define RX_MPDU_DESC_META_DATA_V1_LMAC_ID		GENMASK(25, 24)</div><div class='add'>+#define RX_MPDU_DESC_META_DATA_V1_DEVICE_ID		GENMASK(28, 26)</div><div class='add'>+</div><div class='add'>+/* Version 1A */</div><div class='add'>+#define RX_MPDU_DESC_META_DATA_V1A_PEER_ID		GENMASK(13, 0)</div><div class='add'>+#define RX_MPDU_DESC_META_DATA_V1A_VDEV_ID		GENMASK(21, 14)</div><div class='add'>+#define RX_MPDU_DESC_META_DATA_V1A_LOGICAL_LINK_ID	GENMASK(25, 22)</div><div class='add'>+#define RX_MPDU_DESC_META_DATA_V1A_DEVICE_ID		GENMASK(28, 26)</div><div class='add'>+</div><div class='add'>+/* Version 1B */</div><div class='add'>+#define RX_MPDU_DESC_META_DATA_V1B_PEER_ID	GENMASK(13, 0)</div><div class='add'>+#define RX_MPDU_DESC_META_DATA_V1B_VDEV_ID	GENMASK(21, 14)</div><div class='add'>+#define RX_MPDU_DESC_META_DATA_V1B_HW_LINK_ID	GENMASK(25, 22)</div><div class='add'>+#define RX_MPDU_DESC_META_DATA_V1B_DEVICE_ID	GENMASK(28, 26)</div><div class='add'>+</div><div class='add'>+struct rx_mpdu_desc {</div><div class='add'>+	__le32 info0; /* %RX_MPDU_DESC_INFO */</div><div class='add'>+	__le32 peer_meta_data;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* rx_mpdu_desc</div><div class='add'>+ *		Producer: RXDMA</div><div class='add'>+ *		Consumer: REO/SW/FW</div><div class='add'>+ *</div><div class='add'>+ * msdu_count</div><div class='add'>+ *		The number of MSDUs within the MPDU</div><div class='add'>+ *</div><div class='add'>+ * fragment_flag</div><div class='add'>+ *		When set, this MPDU is a fragment and REO should forward this</div><div class='add'>+ *		fragment MPDU to the REO destination ring without any reorder</div><div class='add'>+ *		checks, pn checks or bitmap update. This implies that REO is</div><div class='add'>+ *		forwarding the pointer to the MSDU link descriptor.</div><div class='add'>+ *</div><div class='add'>+ * mpdu_retry_bit</div><div class='add'>+ *		The retry bit setting from the MPDU header of the received frame</div><div class='add'>+ *</div><div class='add'>+ * ampdu_flag</div><div class='add'>+ *		Indicates the MPDU was received as part of an A-MPDU.</div><div class='add'>+ *</div><div class='add'>+ * bar_frame</div><div class='add'>+ *		Indicates the received frame is a BAR frame. After processing,</div><div class='add'>+ *		this frame shall be pushed to SW or deleted.</div><div class='add'>+ *</div><div class='add'>+ * valid_pn</div><div class='add'>+ *		When not set, REO will not perform a PN sequence number check.</div><div class='add'>+ *</div><div class='add'>+ * raw_mpdu</div><div class='add'>+ *		Field only valid when first_msdu_in_mpdu_flag is set. Indicates</div><div class='add'>+ *		the contents in the MSDU buffer contains a 'RAW' MPDU. This</div><div class='add'>+ *		'RAW' MPDU might be spread out over multiple MSDU buffers.</div><div class='add'>+ *</div><div class='add'>+ * more_fragment_flag</div><div class='add'>+ *		The More Fragment bit setting from the MPDU header of the</div><div class='add'>+ *		received frame</div><div class='add'>+ *</div><div class='add'>+ * src_info</div><div class='add'>+ *		Source (Virtual) device/interface info associated with this peer.</div><div class='add'>+ *		This field gets passed on by REO to PPE in the EDMA descriptor.</div><div class='add'>+ *</div><div class='add'>+ * mpdu_qos_control_valid</div><div class='add'>+ *		When set, the MPDU has a QoS control field</div><div class='add'>+ *</div><div class='add'>+ * tid</div><div class='add'>+ *		Field only valid when mpdu_qos_control_valid is set</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum hal_rx_msdu_desc_reo_dest_ind {</div><div class='add'>+	HAL_RX_MSDU_DESC_REO_DEST_IND_TCL,</div><div class='add'>+	HAL_RX_MSDU_DESC_REO_DEST_IND_SW1,</div><div class='add'>+	HAL_RX_MSDU_DESC_REO_DEST_IND_SW2,</div><div class='add'>+	HAL_RX_MSDU_DESC_REO_DEST_IND_SW3,</div><div class='add'>+	HAL_RX_MSDU_DESC_REO_DEST_IND_SW4,</div><div class='add'>+	HAL_RX_MSDU_DESC_REO_DEST_IND_RELEASE,</div><div class='add'>+	HAL_RX_MSDU_DESC_REO_DEST_IND_FW,</div><div class='add'>+	HAL_RX_MSDU_DESC_REO_DEST_IND_SW5,</div><div class='add'>+	HAL_RX_MSDU_DESC_REO_DEST_IND_SW6,</div><div class='add'>+	HAL_RX_MSDU_DESC_REO_DEST_IND_SW7,</div><div class='add'>+	HAL_RX_MSDU_DESC_REO_DEST_IND_SW8,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RX_MSDU_DESC_INFO0_FIRST_MSDU_IN_MPDU	BIT(0)</div><div class='add'>+#define RX_MSDU_DESC_INFO0_LAST_MSDU_IN_MPDU	BIT(1)</div><div class='add'>+#define RX_MSDU_DESC_INFO0_MSDU_CONTINUATION	BIT(2)</div><div class='add'>+#define RX_MSDU_DESC_INFO0_MSDU_LENGTH		GENMASK(16, 3)</div><div class='add'>+#define RX_MSDU_DESC_INFO0_MSDU_DROP		BIT(17)</div><div class='add'>+#define RX_MSDU_DESC_INFO0_VALID_SA		BIT(18)</div><div class='add'>+#define RX_MSDU_DESC_INFO0_VALID_DA		BIT(19)</div><div class='add'>+#define RX_MSDU_DESC_INFO0_DA_MCBC		BIT(20)</div><div class='add'>+#define RX_MSDU_DESC_INFO0_L3_HDR_PAD_MSB	BIT(21)</div><div class='add'>+#define RX_MSDU_DESC_INFO0_TCP_UDP_CHKSUM_FAIL	BIT(22)</div><div class='add'>+#define RX_MSDU_DESC_INFO0_IP_CHKSUM_FAIL	BIT(23)</div><div class='add'>+#define RX_MSDU_DESC_INFO0_FROM_DS		BIT(24)</div><div class='add'>+#define RX_MSDU_DESC_INFO0_TO_DS		BIT(25)</div><div class='add'>+#define RX_MSDU_DESC_INFO0_INTRA_BSS		BIT(26)</div><div class='add'>+#define RX_MSDU_DESC_INFO0_DST_CHIP_ID		GENMASK(28, 27)</div><div class='add'>+#define RX_MSDU_DESC_INFO0_DECAP_FORMAT		GENMASK(30, 29)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_MSDU_PKT_LENGTH_GET(val)		\</div><div class='add'>+	(le32_get_bits((val), RX_MSDU_DESC_INFO0_MSDU_LENGTH))</div><div class='add'>+</div><div class='add'>+struct rx_msdu_desc {</div><div class='add'>+	__le32 info0;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* rx_msdu_desc</div><div class='add'>+ *</div><div class='add'>+ * first_msdu_in_mpdu</div><div class='add'>+ *		Indicates first msdu in mpdu.</div><div class='add'>+ *</div><div class='add'>+ * last_msdu_in_mpdu</div><div class='add'>+ *		Indicates last msdu in mpdu. This flag can be true only when</div><div class='add'>+ *		'Msdu_continuation' set to 0. This implies that when an msdu</div><div class='add'>+ *		is spread out over multiple buffers and thus msdu_continuation</div><div class='add'>+ *		is set, only for the very last buffer of the msdu, can the</div><div class='add'>+ *		'last_msdu_in_mpdu' be set.</div><div class='add'>+ *</div><div class='add'>+ *		When both first_msdu_in_mpdu and last_msdu_in_mpdu are set,</div><div class='add'>+ *		the MPDU that this MSDU belongs to only contains a single MSDU.</div><div class='add'>+ *</div><div class='add'>+ * msdu_continuation</div><div class='add'>+ *		When set, this MSDU buffer was not able to hold the entire MSDU.</div><div class='add'>+ *		The next buffer will therefore contain additional information</div><div class='add'>+ *		related to this MSDU.</div><div class='add'>+ *</div><div class='add'>+ * msdu_length</div><div class='add'>+ *		Field is only valid in combination with the 'first_msdu_in_mpdu'</div><div class='add'>+ *		being set. Full MSDU length in bytes after decapsulation. This</div><div class='add'>+ *		field is still valid for MPDU frames without A-MSDU. It still</div><div class='add'>+ *		represents MSDU length after decapsulation Or in case of RAW</div><div class='add'>+ *		MPDUs, it indicates the length of the entire MPDU (without FCS</div><div class='add'>+ *		field).</div><div class='add'>+ *</div><div class='add'>+ * msdu_drop</div><div class='add'>+ *		Indicates that REO shall drop this MSDU and not forward it to</div><div class='add'>+ *		any other ring.</div><div class='add'>+ *</div><div class='add'>+ * valid_sa</div><div class='add'>+ *		Indicates OLE found a valid SA entry for this MSDU.</div><div class='add'>+ *</div><div class='add'>+ * valid_da</div><div class='add'>+ *		When set, OLE found a valid DA entry for this MSDU.</div><div class='add'>+ *</div><div class='add'>+ * da_mcbc</div><div class='add'>+ *		Field Only valid if valid_da is set. Indicates the DA address</div><div class='add'>+ *		is a Multicast or Broadcast address for this MSDU.</div><div class='add'>+ *</div><div class='add'>+ * l3_header_padding_msb</div><div class='add'>+ *		Passed on from 'RX_MSDU_END' TLV (only the MSB is reported as</div><div class='add'>+ *		the LSB is always zero). Number of bytes padded to make sure</div><div class='add'>+ *		that the L3 header will always start of a Dword boundary</div><div class='add'>+ *</div><div class='add'>+ * tcp_udp_checksum_fail</div><div class='add'>+ *		Passed on from 'RX_ATTENTION' TLV</div><div class='add'>+ *		Indicates that the computed checksum did not match the checksum</div><div class='add'>+ *		in the TCP/UDP header.</div><div class='add'>+ *</div><div class='add'>+ * ip_checksum_fail</div><div class='add'>+ *		Passed on from 'RX_ATTENTION' TLV</div><div class='add'>+ *		Indicates that the computed checksum did not match the checksum</div><div class='add'>+ *		in the IP header.</div><div class='add'>+ *</div><div class='add'>+ * from_DS</div><div class='add'>+ *		Set if the 'from DS' bit is set in the frame control.</div><div class='add'>+ *</div><div class='add'>+ * to_DS</div><div class='add'>+ *		Set if the 'to DS' bit is set in the frame control.</div><div class='add'>+ *</div><div class='add'>+ * intra_bss</div><div class='add'>+ *		This packet needs intra-BSS routing by SW as the 'vdev_id'</div><div class='add'>+ *		for the destination is the same as the 'vdev_id' that this</div><div class='add'>+ *		MSDU was got in.</div><div class='add'>+ *</div><div class='add'>+ * dest_chip_id</div><div class='add'>+ *		If intra_bss is set, copied by RXOLE/RXDMA from 'ADDR_SEARCH_ENTRY'</div><div class='add'>+ *		to support intra-BSS routing with multi-chip multi-link operation.</div><div class='add'>+ *		This indicates into which chip's TCL the packet should be queued.</div><div class='add'>+ *</div><div class='add'>+ * decap_format</div><div class='add'>+ *		Indicates the format after decapsulation:</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define RX_MSDU_EXT_DESC_INFO0_REO_DEST_IND	GENMASK(4, 0)</div><div class='add'>+#define RX_MSDU_EXT_DESC_INFO0_SERVICE_CODE	GENMASK(13, 5)</div><div class='add'>+#define RX_MSDU_EXT_DESC_INFO0_PRIORITY_VALID	BIT(14)</div><div class='add'>+#define RX_MSDU_EXT_DESC_INFO0_DATA_OFFSET	GENMASK(26, 15)</div><div class='add'>+#define RX_MSDU_EXT_DESC_INFO0_SRC_LINK_ID	GENMASK(29, 27)</div><div class='add'>+</div><div class='add'>+struct rx_msdu_ext_desc {</div><div class='add'>+	__le32 info0;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* rx_msdu_ext_desc</div><div class='add'>+ *</div><div class='add'>+ * reo_destination_indication</div><div class='add'>+ *		The ID of the REO exit ring where the MSDU frame shall push</div><div class='add'>+ *		after (MPDU level) reordering has finished.</div><div class='add'>+ *</div><div class='add'>+ * service_code</div><div class='add'>+ *		Opaque service code between PPE and Wi-Fi</div><div class='add'>+ *</div><div class='add'>+ * priority_valid</div><div class='add'>+ *</div><div class='add'>+ * data_offset</div><div class='add'>+ *		The offset to Rx packet data within the buffer (including</div><div class='add'>+ *		Rx DMA offset programming and L3 header padding inserted</div><div class='add'>+ *		by Rx OLE).</div><div class='add'>+ *</div><div class='add'>+ * src_link_id</div><div class='add'>+ *		Set to the link ID of the PMAC that received the frame</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum hal_reo_dest_ring_buffer_type {</div><div class='add'>+	HAL_REO_DEST_RING_BUFFER_TYPE_MSDU,</div><div class='add'>+	HAL_REO_DEST_RING_BUFFER_TYPE_LINK_DESC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_reo_dest_ring_push_reason {</div><div class='add'>+	HAL_REO_DEST_RING_PUSH_REASON_ERR_DETECTED,</div><div class='add'>+	HAL_REO_DEST_RING_PUSH_REASON_ROUTING_INSTRUCTION,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_reo_dest_ring_error_code {</div><div class='add'>+	HAL_REO_DEST_RING_ERROR_CODE_DESC_ADDR_ZERO,</div><div class='add'>+	HAL_REO_DEST_RING_ERROR_CODE_DESC_INVALID,</div><div class='add'>+	HAL_REO_DEST_RING_ERROR_CODE_AMPDU_IN_NON_BA,</div><div class='add'>+	HAL_REO_DEST_RING_ERROR_CODE_NON_BA_DUPLICATE,</div><div class='add'>+	HAL_REO_DEST_RING_ERROR_CODE_BA_DUPLICATE,</div><div class='add'>+	HAL_REO_DEST_RING_ERROR_CODE_FRAME_2K_JUMP,</div><div class='add'>+	HAL_REO_DEST_RING_ERROR_CODE_BAR_2K_JUMP,</div><div class='add'>+	HAL_REO_DEST_RING_ERROR_CODE_FRAME_OOR,</div><div class='add'>+	HAL_REO_DEST_RING_ERROR_CODE_BAR_OOR,</div><div class='add'>+	HAL_REO_DEST_RING_ERROR_CODE_NO_BA_SESSION,</div><div class='add'>+	HAL_REO_DEST_RING_ERROR_CODE_FRAME_SN_EQUALS_SSN,</div><div class='add'>+	HAL_REO_DEST_RING_ERROR_CODE_PN_CHECK_FAILED,</div><div class='add'>+	HAL_REO_DEST_RING_ERROR_CODE_2K_ERR_FLAG_SET,</div><div class='add'>+	HAL_REO_DEST_RING_ERROR_CODE_PN_ERR_FLAG_SET,</div><div class='add'>+	HAL_REO_DEST_RING_ERROR_CODE_DESC_BLOCKED,</div><div class='add'>+	HAL_REO_DEST_RING_ERROR_CODE_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_REO_DEST_RING_INFO0_BUFFER_TYPE		BIT(0)</div><div class='add'>+#define HAL_REO_DEST_RING_INFO0_PUSH_REASON		GENMASK(2, 1)</div><div class='add'>+#define HAL_REO_DEST_RING_INFO0_ERROR_CODE		GENMASK(7, 3)</div><div class='add'>+#define HAL_REO_DEST_RING_INFO0_MSDU_DATA_SIZE		GENMASK(11, 8)</div><div class='add'>+#define HAL_REO_DEST_RING_INFO0_SW_EXCEPTION		BIT(12)</div><div class='add'>+#define HAL_REO_DEST_RING_INFO0_SRC_LINK_ID		GENMASK(15, 13)</div><div class='add'>+#define HAL_REO_DEST_RING_INFO0_SIGNATURE		GENMASK(19, 16)</div><div class='add'>+#define HAL_REO_DEST_RING_INFO0_RING_ID			GENMASK(27, 20)</div><div class='add'>+#define HAL_REO_DEST_RING_INFO0_LOOPING_COUNT		GENMASK(31, 28)</div><div class='add'>+</div><div class='add'>+struct hal_reo_dest_ring {</div><div class='add'>+	struct ath12k_buffer_addr buf_addr_info;</div><div class='add'>+	struct rx_mpdu_desc rx_mpdu_info;</div><div class='add'>+	struct rx_msdu_desc rx_msdu_info;</div><div class='add'>+	__le32 buf_va_lo;</div><div class='add'>+	__le32 buf_va_hi;</div><div class='add'>+	__le32 info0; /* %HAL_REO_DEST_RING_INFO0_ */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_reo_dest_ring</div><div class='add'>+ *</div><div class='add'>+ *		Producer: RXDMA</div><div class='add'>+ *		Consumer: REO/SW/FW</div><div class='add'>+ *</div><div class='add'>+ * buf_addr_info</div><div class='add'>+ *		Details of the physical address of a buffer or MSDU</div><div class='add'>+ *		link descriptor.</div><div class='add'>+ *</div><div class='add'>+ * rx_mpdu_info</div><div class='add'>+ *		General information related to the MPDU that is passed</div><div class='add'>+ *		on from REO entrance ring to the REO destination ring.</div><div class='add'>+ *</div><div class='add'>+ * rx_msdu_info</div><div class='add'>+ *		General information related to the MSDU that is passed</div><div class='add'>+ *		on from RXDMA all the way to the REO destination ring.</div><div class='add'>+ *</div><div class='add'>+ * buf_va_lo</div><div class='add'>+ *		Field only valid if Reo_dest_buffer_type is set to MSDU_buf_address</div><div class='add'>+ *		Lower 32 bits of the 64-bit virtual address corresponding</div><div class='add'>+ *		to Buf_or_link_desc_addr_info</div><div class='add'>+ *</div><div class='add'>+ * buf_va_hi</div><div class='add'>+ *		Address (upper 32 bits) of the REO queue descriptor.</div><div class='add'>+ *		Upper 32 bits of the 64-bit virtual address corresponding</div><div class='add'>+ *		to Buf_or_link_desc_addr_info</div><div class='add'>+ *</div><div class='add'>+ * buffer_type</div><div class='add'>+ *		Indicates the type of address provided in the buf_addr_info.</div><div class='add'>+ *		Values are defined in enum %HAL_REO_DEST_RING_BUFFER_TYPE_.</div><div class='add'>+ *</div><div class='add'>+ * push_reason</div><div class='add'>+ *		Reason for pushing this frame to this exit ring. Values are</div><div class='add'>+ *		defined in enum %HAL_REO_DEST_RING_PUSH_REASON_.</div><div class='add'>+ *</div><div class='add'>+ * error_code</div><div class='add'>+ *		Valid only when 'push_reason' is set. All error codes are</div><div class='add'>+ *		defined in enum %HAL_REO_DEST_RING_ERROR_CODE_.</div><div class='add'>+ *</div><div class='add'>+ * captured_msdu_data_size</div><div class='add'>+ *		The number of following REO_DESTINATION STRUCTs that have</div><div class='add'>+ *		been replaced with msdu_data extracted from the msdu_buffer</div><div class='add'>+ *		and copied into the ring for easy FW/SW access.</div><div class='add'>+ *</div><div class='add'>+ * sw_exception</div><div class='add'>+ *		This field has the same setting as the SW_exception field</div><div class='add'>+ *		in the corresponding REO_entrance_ring descriptor.</div><div class='add'>+ *		When set, the REO entrance descriptor is generated by FW,</div><div class='add'>+ *		and the MPDU was processed in the following way:</div><div class='add'>+ *		- NO re-order function is needed.</div><div class='add'>+ *		- MPDU delinking is determined by the setting of Entrance</div><div class='add'>+ *		  ring field: SW_excection_mpdu_delink</div><div class='add'>+ *		- Destination ring selection is based on the setting of</div><div class='add'>+ *		  the Entrance ring field SW_exception_destination _ring_valid</div><div class='add'>+ *</div><div class='add'>+ * src_link_id</div><div class='add'>+ *		Set to the link ID of the PMAC that received the frame</div><div class='add'>+ *</div><div class='add'>+ * signature</div><div class='add'>+ *		Set to value 0x8 when msdu capture mode is enabled for this ring</div><div class='add'>+ *</div><div class='add'>+ * ring_id</div><div class='add'>+ *		The buffer pointer ring id.</div><div class='add'>+ *		0 - Idle ring</div><div class='add'>+ *		1 - N refers to other rings.</div><div class='add'>+ *</div><div class='add'>+ * looping_count</div><div class='add'>+ *		Indicates the number of times the producer of entries into</div><div class='add'>+ *		this ring has looped around the ring.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HAL_REO_TO_PPE_RING_INFO0_DATA_LENGTH	GENMASK(15, 0)</div><div class='add'>+#define HAL_REO_TO_PPE_RING_INFO0_DATA_OFFSET	GENMASK(23, 16)</div><div class='add'>+#define HAL_REO_TO_PPE_RING_INFO0_POOL_ID	GENMASK(28, 24)</div><div class='add'>+#define HAL_REO_TO_PPE_RING_INFO0_PREHEADER	BIT(29)</div><div class='add'>+#define HAL_REO_TO_PPE_RING_INFO0_TSO_EN	BIT(30)</div><div class='add'>+#define HAL_REO_TO_PPE_RING_INFO0_MORE	BIT(31)</div><div class='add'>+</div><div class='add'>+struct hal_reo_to_ppe_ring {</div><div class='add'>+	__le32 buffer_addr;</div><div class='add'>+	__le32 info0; /* %HAL_REO_TO_PPE_RING_INFO0_ */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_reo_to_ppe_ring</div><div class='add'>+ *</div><div class='add'>+ *		Producer: REO</div><div class='add'>+ *		Consumer: PPE</div><div class='add'>+ *</div><div class='add'>+ * buf_addr_info</div><div class='add'>+ *		Details of the physical address of a buffer or MSDU</div><div class='add'>+ *		link descriptor.</div><div class='add'>+ *</div><div class='add'>+ * data_length</div><div class='add'>+ *		Length of valid data in bytes</div><div class='add'>+ *</div><div class='add'>+ * data_offset</div><div class='add'>+ *		Offset to the data from buffer pointer. Can be used to</div><div class='add'>+ *		strip header in the data for tunnel termination etc.</div><div class='add'>+ *</div><div class='add'>+ * pool_id</div><div class='add'>+ *		REO has global configuration register for this field.</div><div class='add'>+ *		It may have several free buffer pools, each</div><div class='add'>+ *		RX-Descriptor ring can fetch free buffer from specific</div><div class='add'>+ *		buffer pool; pool id will indicate which pool the buffer</div><div class='add'>+ *		will be released to; POOL_ID Zero returned to SW</div><div class='add'>+ *</div><div class='add'>+ * preheader</div><div class='add'>+ *		Disabled: 0 (Default)</div><div class='add'>+ *		Enabled: 1</div><div class='add'>+ *</div><div class='add'>+ * tso_en</div><div class='add'>+ *		Disabled: 0 (Default)</div><div class='add'>+ *		Enabled: 1</div><div class='add'>+ *</div><div class='add'>+ * more</div><div class='add'>+ *		More Segments followed</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum hal_reo_entr_rxdma_push_reason {</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_PUSH_REASON_ERR_DETECTED,</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_PUSH_REASON_ROUTING_INSTRUCTION,</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_PUSH_REASON_RX_FLUSH,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_reo_entr_rxdma_ecode {</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_ECODE_OVERFLOW_ERR,</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_ECODE_MPDU_LEN_ERR,</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_ECODE_FCS_ERR,</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_ECODE_DECRYPT_ERR,</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_ECODE_TKIP_MIC_ERR,</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_ECODE_UNECRYPTED_ERR,</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_ECODE_MSDU_LEN_ERR,</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_ECODE_MSDU_LIMIT_ERR,</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_ECODE_WIFI_PARSE_ERR,</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_ECODE_AMSDU_PARSE_ERR,</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_ECODE_SA_TIMEOUT_ERR,</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_ECODE_DA_TIMEOUT_ERR,</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_ECODE_FLOW_TIMEOUT_ERR,</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_ECODE_FLUSH_REQUEST_ERR,</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_ECODE_AMSDU_FRAG_ERR,</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_ECODE_MULTICAST_ECHO_ERR,</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_ECODE_AMSDU_MISMATCH_ERR,</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_ECODE_UNAUTH_WDS_ERR,</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_ECODE_GRPCAST_AMSDU_WDS_ERR,</div><div class='add'>+	HAL_REO_ENTR_RING_RXDMA_ECODE_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_rx_reo_dest_ring {</div><div class='add'>+	HAL_RX_REO_DEST_RING_TCL,</div><div class='add'>+	HAL_RX_REO_DEST_RING_SW1,</div><div class='add'>+	HAL_RX_REO_DEST_RING_SW2,</div><div class='add'>+	HAL_RX_REO_DEST_RING_SW3,</div><div class='add'>+	HAL_RX_REO_DEST_RING_SW4,</div><div class='add'>+	HAL_RX_REO_DEST_RING_RELEASE,</div><div class='add'>+	HAL_RX_REO_DEST_RING_FW,</div><div class='add'>+	HAL_RX_REO_DEST_RING_SW5,</div><div class='add'>+	HAL_RX_REO_DEST_RING_SW6,</div><div class='add'>+	HAL_RX_REO_DEST_RING_SW7,</div><div class='add'>+	HAL_RX_REO_DEST_RING_SW8,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_REO_ENTR_RING_INFO0_QUEUE_ADDR_HI		GENMASK(7, 0)</div><div class='add'>+#define HAL_REO_ENTR_RING_INFO0_MPDU_BYTE_COUNT		GENMASK(21, 8)</div><div class='add'>+#define HAL_REO_ENTR_RING_INFO0_DEST_IND		GENMASK(26, 22)</div><div class='add'>+#define HAL_REO_ENTR_RING_INFO0_FRAMELESS_BAR		BIT(27)</div><div class='add'>+</div><div class='add'>+#define HAL_REO_ENTR_RING_INFO1_RXDMA_PUSH_REASON	GENMASK(1, 0)</div><div class='add'>+#define HAL_REO_ENTR_RING_INFO1_RXDMA_ERROR_CODE	GENMASK(6, 2)</div><div class='add'>+#define HAL_REO_ENTR_RING_INFO1_MPDU_FRAG_NUM		GENMASK(10, 7)</div><div class='add'>+#define HAL_REO_ENTR_RING_INFO1_SW_EXCEPTION		BIT(11)</div><div class='add'>+#define HAL_REO_ENTR_RING_INFO1_SW_EXCEPT_MPDU_DELINK	BIT(12)</div><div class='add'>+#define HAL_REO_ENTR_RING_INFO1_SW_EXCEPTION_RING_VLD	BIT(13)</div><div class='add'>+#define HAL_REO_ENTR_RING_INFO1_SW_EXCEPTION_RING	GENMASK(18, 14)</div><div class='add'>+#define HAL_REO_ENTR_RING_INFO1_MPDU_SEQ_NUM		GENMASK(30, 19)</div><div class='add'>+</div><div class='add'>+#define HAL_REO_ENTR_RING_INFO2_PHY_PPDU_ID		GENMASK(15, 0)</div><div class='add'>+#define HAL_REO_ENTR_RING_INFO2_SRC_LINK_ID		GENMASK(18, 16)</div><div class='add'>+#define HAL_REO_ENTR_RING_INFO2_RING_ID			GENMASK(27, 20)</div><div class='add'>+#define HAL_REO_ENTR_RING_INFO2_LOOPING_COUNT		GENMASK(31, 28)</div><div class='add'>+</div><div class='add'>+struct hal_reo_entrance_ring {</div><div class='add'>+	struct ath12k_buffer_addr buf_addr_info;</div><div class='add'>+	struct rx_mpdu_desc rx_mpdu_info;</div><div class='add'>+	__le32 queue_addr_lo;</div><div class='add'>+	__le32 info0; /* %HAL_REO_ENTR_RING_INFO0_ */</div><div class='add'>+	__le32 info1; /* %HAL_REO_ENTR_RING_INFO1_ */</div><div class='add'>+	__le32 info2; /* %HAL_REO_DEST_RING_INFO2_ */</div><div class='add'>+</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_reo_entrance_ring</div><div class='add'>+ *</div><div class='add'>+ *		Producer: RXDMA</div><div class='add'>+ *		Consumer: REO</div><div class='add'>+ *</div><div class='add'>+ * buf_addr_info</div><div class='add'>+ *		Details of the physical address of a buffer or MSDU</div><div class='add'>+ *		link descriptor.</div><div class='add'>+ *</div><div class='add'>+ * rx_mpdu_info</div><div class='add'>+ *		General information related to the MPDU that is passed</div><div class='add'>+ *		on from REO entrance ring to the REO destination ring.</div><div class='add'>+ *</div><div class='add'>+ * queue_addr_lo</div><div class='add'>+ *		Address (lower 32 bits) of the REO queue descriptor.</div><div class='add'>+ *</div><div class='add'>+ * queue_addr_hi</div><div class='add'>+ *		Address (upper 8 bits) of the REO queue descriptor.</div><div class='add'>+ *</div><div class='add'>+ * mpdu_byte_count</div><div class='add'>+ *		An approximation of the number of bytes received in this MPDU.</div><div class='add'>+ *		Used to keeps stats on the amount of data flowing</div><div class='add'>+ *		through a queue.</div><div class='add'>+ *</div><div class='add'>+ * reo_destination_indication</div><div class='add'>+ *		The id of the reo exit ring where the msdu frame shall push</div><div class='add'>+ *		after (MPDU level) reordering has finished. Values are defined</div><div class='add'>+ *		in enum %HAL_RX_MSDU_DESC_REO_DEST_IND_.</div><div class='add'>+ *</div><div class='add'>+ * frameless_bar</div><div class='add'>+ *		Indicates that this REO entrance ring struct contains BAR info</div><div class='add'>+ *		from a multi TID BAR frame. The original multi TID BAR frame</div><div class='add'>+ *		itself contained all the REO info for the first TID, but all</div><div class='add'>+ *		the subsequent TID info and their linkage to the REO descriptors</div><div class='add'>+ *		is passed down as 'frameless' BAR info.</div><div class='add'>+ *</div><div class='add'>+ *		The only fields valid in this descriptor when this bit is set</div><div class='add'>+ *		are queue_addr_lo, queue_addr_hi, mpdu_sequence_number,</div><div class='add'>+ *		bar_frame and peer_meta_data.</div><div class='add'>+ *</div><div class='add'>+ * rxdma_push_reason</div><div class='add'>+ *		Reason for pushing this frame to this exit ring. Values are</div><div class='add'>+ *		defined in enum %HAL_REO_ENTR_RING_RXDMA_PUSH_REASON_.</div><div class='add'>+ *</div><div class='add'>+ * rxdma_error_code</div><div class='add'>+ *		Valid only when 'push_reason' is set. All error codes are</div><div class='add'>+ *		defined in enum %HAL_REO_ENTR_RING_RXDMA_ECODE_.</div><div class='add'>+ *</div><div class='add'>+ * mpdu_fragment_number</div><div class='add'>+ *		Field only valid when Reo_level_mpdu_frame_info.</div><div class='add'>+ *		Rx_mpdu_desc_info_details.Fragment_flag is set.</div><div class='add'>+ *</div><div class='add'>+ * sw_exception</div><div class='add'>+ *		When not set, REO is performing all its default MPDU processing</div><div class='add'>+ *		operations,</div><div class='add'>+ *		When set, this REO entrance descriptor is generated by FW, and</div><div class='add'>+ *		should be processed as an exception. This implies:</div><div class='add'>+ *		NO re-order function is needed.</div><div class='add'>+ *		MPDU delinking is determined by the setting of field</div><div class='add'>+ *		SW_excection_mpdu_delink</div><div class='add'>+ *</div><div class='add'>+ * sw_exception_mpdu_delink</div><div class='add'>+ *		Field only valid when SW_exception is set.</div><div class='add'>+ *		1'b0: REO should NOT delink the MPDU, and thus pass this</div><div class='add'>+ *			MPDU on to the destination ring as is. This implies that</div><div class='add'>+ *			in the REO_DESTINATION_RING struct field</div><div class='add'>+ *			Buf_or_link_desc_addr_info should point to an MSDU link</div><div class='add'>+ *			descriptor</div><div class='add'>+ *		1'b1: REO should perform the normal MPDU delink into MSDU operations.</div><div class='add'>+ *</div><div class='add'>+ * sw_exception_dest_ring</div><div class='add'>+ *		Field only valid when fields SW_exception and SW</div><div class='add'>+ *		exception_destination_ring_valid are set. values are defined</div><div class='add'>+ *		in %HAL_RX_REO_DEST_RING_.</div><div class='add'>+ *</div><div class='add'>+ * mpdu_seq_number</div><div class='add'>+ *		The field can have two different meanings based on the setting</div><div class='add'>+ *		of sub-field Reo level mpdu frame info.</div><div class='add'>+ *		Rx_mpdu_desc_info_details. BAR_frame</div><div class='add'>+ *		'BAR_frame' is NOT set:</div><div class='add'>+ *		The MPDU sequence number of the received frame.</div><div class='add'>+ *		'BAR_frame' is set.</div><div class='add'>+ *		The MPDU Start sequence number from the BAR frame</div><div class='add'>+ *</div><div class='add'>+ * phy_ppdu_id</div><div class='add'>+ *		A PPDU counter value that PHY increments for every PPDU received</div><div class='add'>+ *</div><div class='add'>+ * src_link_id</div><div class='add'>+ *		Set to the link ID of the PMAC that received the frame</div><div class='add'>+ *</div><div class='add'>+ * ring_id</div><div class='add'>+ *		The buffer pointer ring id.</div><div class='add'>+ *		0 - Idle ring</div><div class='add'>+ *		1 - N refers to other rings.</div><div class='add'>+ *</div><div class='add'>+ * looping_count</div><div class='add'>+ *		Indicates the number of times the producer of entries into</div><div class='add'>+ *		this ring has looped around the ring.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HAL_REO_CMD_HDR_INFO0_CMD_NUMBER	GENMASK(15, 0)</div><div class='add'>+#define HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED	BIT(16)</div><div class='add'>+</div><div class='add'>+struct hal_reo_cmd_hdr {</div><div class='add'>+	__le32 info0;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_REO_GET_QUEUE_STATS_INFO0_QUEUE_ADDR_HI	GENMASK(7, 0)</div><div class='add'>+#define HAL_REO_GET_QUEUE_STATS_INFO0_CLEAR_STATS	BIT(8)</div><div class='add'>+</div><div class='add'>+struct hal_reo_get_queue_stats {</div><div class='add'>+	struct hal_reo_cmd_hdr cmd;</div><div class='add'>+	__le32 queue_addr_lo;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 rsvd0[6];</div><div class='add'>+	__le32 tlv64_pad;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_reo_get_queue_stats</div><div class='add'>+ *		Producer: SW</div><div class='add'>+ *		Consumer: REO</div><div class='add'>+ *</div><div class='add'>+ * cmd</div><div class='add'>+ *		Details for command execution tracking purposes.</div><div class='add'>+ *</div><div class='add'>+ * queue_addr_lo</div><div class='add'>+ *		Address (lower 32 bits) of the REO queue descriptor.</div><div class='add'>+ *</div><div class='add'>+ * queue_addr_hi</div><div class='add'>+ *		Address (upper 8 bits) of the REO queue descriptor.</div><div class='add'>+ *</div><div class='add'>+ * clear_stats</div><div class='add'>+ *		Clear stats settings. When set, Clear the stats after</div><div class='add'>+ *		generating the status.</div><div class='add'>+ *</div><div class='add'>+ *		Following stats will be cleared.</div><div class='add'>+ *		Timeout_count</div><div class='add'>+ *		Forward_due_to_bar_count</div><div class='add'>+ *		Duplicate_count</div><div class='add'>+ *		Frames_in_order_count</div><div class='add'>+ *		BAR_received_count</div><div class='add'>+ *		MPDU_Frames_processed_count</div><div class='add'>+ *		MSDU_Frames_processed_count</div><div class='add'>+ *		Total_processed_byte_count</div><div class='add'>+ *		Late_receive_MPDU_count</div><div class='add'>+ *		window_jump_2k</div><div class='add'>+ *		Hole_count</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HAL_REO_FLUSH_QUEUE_INFO0_DESC_ADDR_HI		GENMASK(7, 0)</div><div class='add'>+#define HAL_REO_FLUSH_QUEUE_INFO0_BLOCK_DESC_ADDR	BIT(8)</div><div class='add'>+#define HAL_REO_FLUSH_QUEUE_INFO0_BLOCK_RESRC_IDX	GENMASK(10, 9)</div><div class='add'>+</div><div class='add'>+struct hal_reo_flush_queue {</div><div class='add'>+	struct hal_reo_cmd_hdr cmd;</div><div class='add'>+	__le32 desc_addr_lo;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 rsvd0[6];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_REO_FLUSH_CACHE_INFO0_CACHE_ADDR_HI		GENMASK(7, 0)</div><div class='add'>+#define HAL_REO_FLUSH_CACHE_INFO0_FWD_ALL_MPDUS		BIT(8)</div><div class='add'>+#define HAL_REO_FLUSH_CACHE_INFO0_RELEASE_BLOCK_IDX	BIT(9)</div><div class='add'>+#define HAL_REO_FLUSH_CACHE_INFO0_BLOCK_RESRC_IDX	GENMASK(11, 10)</div><div class='add'>+#define HAL_REO_FLUSH_CACHE_INFO0_FLUSH_WO_INVALIDATE	BIT(12)</div><div class='add'>+#define HAL_REO_FLUSH_CACHE_INFO0_BLOCK_CACHE_USAGE	BIT(13)</div><div class='add'>+#define HAL_REO_FLUSH_CACHE_INFO0_FLUSH_ALL		BIT(14)</div><div class='add'>+#define HAL_REO_FLUSH_CACHE_INFO0_FLUSH_QUEUE_1K_DESC	BIT(15)</div><div class='add'>+</div><div class='add'>+struct hal_reo_flush_cache {</div><div class='add'>+	struct hal_reo_cmd_hdr cmd;</div><div class='add'>+	__le32 cache_addr_lo;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 rsvd0[6];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO0_CMD_TYPE			BIT(0)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO0_DESC_TYPE		BIT(1)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO0_BANK_ID			GENMASK(7, 2)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO0_TX_NOTIFY_FRAME		GENMASK(10, 8)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO0_HDR_LEN_READ_SEL		BIT(11)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO0_BUF_TIMESTAMP		GENMASK(30, 12)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO0_BUF_TIMESTAMP_VLD	BIT(31)</div><div class='add'>+</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO1_CMD_NUM		GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO2_DATA_LEN		GENMASK(15, 0)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO2_IP4_CKSUM_EN	BIT(16)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO2_UDP4_CKSUM_EN	BIT(17)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO2_UDP6_CKSUM_EN	BIT(18)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO2_TCP4_CKSUM_EN	BIT(19)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO2_TCP6_CKSUM_EN	BIT(20)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO2_TO_FW		BIT(21)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO2_PKT_OFFSET	GENMASK(31, 23)</div><div class='add'>+</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO3_TID_OVERWRITE		BIT(0)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO3_FLOW_OVERRIDE_EN		BIT(1)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO3_CLASSIFY_INFO_SEL	GENMASK(3, 2)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO3_TID			GENMASK(7, 4)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO3_FLOW_OVERRIDE		BIT(8)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO3_PMAC_ID			GENMASK(10, 9)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO3_MSDU_COLOR		GENMASK(12, 11)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO3_VDEV_ID			GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO4_SEARCH_INDEX		GENMASK(19, 0)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO4_CACHE_SET_NUM		GENMASK(23, 20)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO4_IDX_LOOKUP_OVERRIDE	BIT(24)</div><div class='add'>+</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO5_RING_ID			GENMASK(27, 20)</div><div class='add'>+#define HAL_TCL_DATA_CMD_INFO5_LOOPING_COUNT		GENMASK(31, 28)</div><div class='add'>+</div><div class='add'>+enum hal_encrypt_type {</div><div class='add'>+	HAL_ENCRYPT_TYPE_WEP_40,</div><div class='add'>+	HAL_ENCRYPT_TYPE_WEP_104,</div><div class='add'>+	HAL_ENCRYPT_TYPE_TKIP_NO_MIC,</div><div class='add'>+	HAL_ENCRYPT_TYPE_WEP_128,</div><div class='add'>+	HAL_ENCRYPT_TYPE_TKIP_MIC,</div><div class='add'>+	HAL_ENCRYPT_TYPE_WAPI,</div><div class='add'>+	HAL_ENCRYPT_TYPE_CCMP_128,</div><div class='add'>+	HAL_ENCRYPT_TYPE_OPEN,</div><div class='add'>+	HAL_ENCRYPT_TYPE_CCMP_256,</div><div class='add'>+	HAL_ENCRYPT_TYPE_GCMP_128,</div><div class='add'>+	HAL_ENCRYPT_TYPE_AES_GCMP_256,</div><div class='add'>+	HAL_ENCRYPT_TYPE_WAPI_GCM_SM4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_tcl_encap_type {</div><div class='add'>+	HAL_TCL_ENCAP_TYPE_RAW,</div><div class='add'>+	HAL_TCL_ENCAP_TYPE_NATIVE_WIFI,</div><div class='add'>+	HAL_TCL_ENCAP_TYPE_ETHERNET,</div><div class='add'>+	HAL_TCL_ENCAP_TYPE_802_3 = 3,</div><div class='add'>+	HAL_TCL_ENCAP_TYPE_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_tcl_desc_type {</div><div class='add'>+	HAL_TCL_DESC_TYPE_BUFFER,</div><div class='add'>+	HAL_TCL_DESC_TYPE_EXT_DESC,</div><div class='add'>+	HAL_TCL_DESC_TYPE_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_wbm_htt_tx_comp_status {</div><div class='add'>+	HAL_WBM_REL_HTT_TX_COMP_STATUS_OK,</div><div class='add'>+	HAL_WBM_REL_HTT_TX_COMP_STATUS_DROP,</div><div class='add'>+	HAL_WBM_REL_HTT_TX_COMP_STATUS_TTL,</div><div class='add'>+	HAL_WBM_REL_HTT_TX_COMP_STATUS_REINJ,</div><div class='add'>+	HAL_WBM_REL_HTT_TX_COMP_STATUS_INSPECT,</div><div class='add'>+	HAL_WBM_REL_HTT_TX_COMP_STATUS_MEC_NOTIFY,</div><div class='add'>+	HAL_WBM_REL_HTT_TX_COMP_STATUS_VDEVID_MISMATCH,</div><div class='add'>+	HAL_WBM_REL_HTT_TX_COMP_STATUS_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hal_tcl_data_cmd {</div><div class='add'>+	struct ath12k_buffer_addr buf_addr_info;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le32 info3;</div><div class='add'>+	__le32 info4;</div><div class='add'>+	__le32 info5;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_tcl_data_cmd</div><div class='add'>+ *</div><div class='add'>+ * buf_addr_info</div><div class='add'>+ *		Details of the physical address of a buffer or MSDU</div><div class='add'>+ *		link descriptor.</div><div class='add'>+ *</div><div class='add'>+ * tcl_cmd_type</div><div class='add'>+ *		used to select the type of TCL Command descriptor</div><div class='add'>+ *</div><div class='add'>+ * desc_type</div><div class='add'>+ *		Indicates the type of address provided in the buf_addr_info.</div><div class='add'>+ *		Values are defined in enum %HAL_REO_DEST_RING_BUFFER_TYPE_.</div><div class='add'>+ *</div><div class='add'>+ * bank_id</div><div class='add'>+ *		used to select one of the TCL register banks for fields removed</div><div class='add'>+ *		from 'TCL_DATA_CMD' that do not change often within one virtual</div><div class='add'>+ *		device or a set of virtual devices:</div><div class='add'>+ *</div><div class='add'>+ * tx_notify_frame</div><div class='add'>+ *		TCL copies this value to 'TQM_ENTRANCE_RING' field FW_tx_notify_frame.</div><div class='add'>+ *</div><div class='add'>+ * hdr_length_read_sel</div><div class='add'>+ *		used to select the per 'encap_type' register set for MSDU header</div><div class='add'>+ *		read length</div><div class='add'>+ *</div><div class='add'>+ * buffer_timestamp</div><div class='add'>+ * buffer_timestamp_valid</div><div class='add'>+ *		Frame system entrance timestamp. It shall be filled by first</div><div class='add'>+ *		module (SW, TCL or TQM) that sees the frames first.</div><div class='add'>+ *</div><div class='add'>+ * cmd_num</div><div class='add'>+ *		This number can be used to match against status.</div><div class='add'>+ *</div><div class='add'>+ * data_length</div><div class='add'>+ *		MSDU length in case of direct descriptor. Length of link</div><div class='add'>+ *		extension descriptor in case of Link extension descriptor.</div><div class='add'>+ *</div><div class='add'>+ * *_checksum_en</div><div class='add'>+ *		Enable checksum replacement for ipv4, udp_over_ipv4, ipv6,</div><div class='add'>+ *		udp_over_ipv6, tcp_over_ipv4 and tcp_over_ipv6.</div><div class='add'>+ *</div><div class='add'>+ * to_fw</div><div class='add'>+ *		Forward packet to FW along with classification result. The</div><div class='add'>+ *		packet will not be forward to TQM when this bit is set.</div><div class='add'>+ *		1'b0: Use classification result to forward the packet.</div><div class='add'>+ *		1'b1: Override classification result &amp; forward packet only to fw</div><div class='add'>+ *</div><div class='add'>+ * packet_offset</div><div class='add'>+ *		Packet offset from Metadata in case of direct buffer descriptor.</div><div class='add'>+ *</div><div class='add'>+ * hlos_tid_overwrite</div><div class='add'>+ *</div><div class='add'>+ *		When set, TCL shall ignore the IP DSCP and VLAN PCP</div><div class='add'>+ *		fields and use HLOS_TID as the final TID. Otherwise TCL</div><div class='add'>+ *		shall consider the DSCP and PCP fields as well as HLOS_TID</div><div class='add'>+ *		and choose a final TID based on the configured priority</div><div class='add'>+ *</div><div class='add'>+ * flow_override_enable</div><div class='add'>+ *		TCL uses this to select the flow pointer from the peer table,</div><div class='add'>+ *		which can be overridden by SW for pre-encrypted raw WiFi packets</div><div class='add'>+ *		that cannot be parsed for UDP or for other MLO</div><div class='add'>+ *		0 - FP_PARSE_IP: Use the flow-pointer based on parsing the IPv4</div><div class='add'>+ *				 or IPv6 header.</div><div class='add'>+ *		1 - FP_USE_OVERRIDE: Use the who_classify_info_sel and</div><div class='add'>+ *				     flow_override fields to select the flow-pointer</div><div class='add'>+ *</div><div class='add'>+ * who_classify_info_sel</div><div class='add'>+ *		Field only valid when flow_override_enable is set to FP_USE_OVERRIDE.</div><div class='add'>+ *		This field is used to select  one of the 'WHO_CLASSIFY_INFO's in the</div><div class='add'>+ *		peer table in case more than 2 flows are mapped to a single TID.</div><div class='add'>+ *		0: To choose Flow 0 and 1 of any TID use this value.</div><div class='add'>+ *		1: To choose Flow 2 and 3 of any TID use this value.</div><div class='add'>+ *		2: To choose Flow 4 and 5 of any TID use this value.</div><div class='add'>+ *		3: To choose Flow 6 and 7 of any TID use this value.</div><div class='add'>+ *</div><div class='add'>+ *		If who_classify_info sel is not in sync with the num_tx_classify_info</div><div class='add'>+ *		field from address search, then TCL will set 'who_classify_info_sel'</div><div class='add'>+ *		to 0 use flows 0 and 1.</div><div class='add'>+ *</div><div class='add'>+ * hlos_tid</div><div class='add'>+ *		HLOS MSDU priority</div><div class='add'>+ *		Field is used when HLOS_TID_overwrite is set.</div><div class='add'>+ *</div><div class='add'>+ * flow_override</div><div class='add'>+ *		Field only valid when flow_override_enable is set to FP_USE_OVERRIDE</div><div class='add'>+ *		TCL uses this to select the flow pointer from the peer table,</div><div class='add'>+ *		which can be overridden by SW for pre-encrypted raw WiFi packets</div><div class='add'>+ *		that cannot be parsed for UDP or for other MLO</div><div class='add'>+ *		0 - FP_USE_NON_UDP: Use the non-UDP flow pointer (flow 0)</div><div class='add'>+ *		1 - FP_USE_UDP: Use the UDP flow pointer (flow 1)</div><div class='add'>+ *</div><div class='add'>+ * pmac_id</div><div class='add'>+ *		TCL uses this PMAC_ID in address search, i.e, while</div><div class='add'>+ *		finding matching entry for the packet in AST corresponding</div><div class='add'>+ *		to given PMAC_ID</div><div class='add'>+ *</div><div class='add'>+ *		If PMAC ID is all 1s (=&gt; value 3), it indicates wildcard</div><div class='add'>+ *		match for any PMAC</div><div class='add'>+ *</div><div class='add'>+ * vdev_id</div><div class='add'>+ *		Virtual device ID to check against the address search entry to</div><div class='add'>+ *		avoid security issues from transmitting packets from an incorrect</div><div class='add'>+ *		virtual device</div><div class='add'>+ *</div><div class='add'>+ * search_index</div><div class='add'>+ *		The index that will be used for index based address or</div><div class='add'>+ *		flow search. The field is valid when 'search_type' is  1 or 2.</div><div class='add'>+ *</div><div class='add'>+ * cache_set_num</div><div class='add'>+ *</div><div class='add'>+ *		Cache set number that should be used to cache the index</div><div class='add'>+ *		based search results, for address and flow search. This</div><div class='add'>+ *		value should be equal to LSB four bits of the hash value of</div><div class='add'>+ *		match data, in case of search index points to an entry which</div><div class='add'>+ *		may be used in content based search also. The value can be</div><div class='add'>+ *		anything when the entry pointed by search index will not be</div><div class='add'>+ *		used for content based search.</div><div class='add'>+ *</div><div class='add'>+ * index_loop_override</div><div class='add'>+ *		When set, address search and packet routing is forced to use</div><div class='add'>+ *		'search_index' instead of following the register configuration</div><div class='add'>+ *		selected by Bank_id.</div><div class='add'>+ *</div><div class='add'>+ * ring_id</div><div class='add'>+ *		The buffer pointer ring ID.</div><div class='add'>+ *		0 refers to the IDLE ring</div><div class='add'>+ *		1 - N refers to other rings</div><div class='add'>+ *</div><div class='add'>+ * looping_count</div><div class='add'>+ *</div><div class='add'>+ *		A count value that indicates the number of times the</div><div class='add'>+ *		producer of entries into the Ring has looped around the</div><div class='add'>+ *		ring.</div><div class='add'>+ *</div><div class='add'>+ *		At initialization time, this value is set to 0. On the</div><div class='add'>+ *		first loop, this value is set to 1. After the max value is</div><div class='add'>+ *		reached allowed by the number of bits for this field, the</div><div class='add'>+ *		count value continues with 0 again.</div><div class='add'>+ *</div><div class='add'>+ *		In case SW is the consumer of the ring entries, it can</div><div class='add'>+ *		use this field to figure out up to where the producer of</div><div class='add'>+ *		entries has created new entries. This eliminates the need to</div><div class='add'>+ *		check where the head pointer' of the ring is located once</div><div class='add'>+ *		the SW starts processing an interrupt indicating that new</div><div class='add'>+ *		entries have been put into this ring...</div><div class='add'>+ *</div><div class='add'>+ *		Also note that SW if it wants only needs to look at the</div><div class='add'>+ *		LSB bit of this count value.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HAL_TCL_DESC_LEN sizeof(struct hal_tcl_data_cmd)</div><div class='add'>+</div><div class='add'>+#define HAL_TX_MSDU_EXT_INFO0_BUF_PTR_LO	GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+#define HAL_TX_MSDU_EXT_INFO1_BUF_PTR_HI	GENMASK(7, 0)</div><div class='add'>+#define HAL_TX_MSDU_EXT_INFO1_EXTN_OVERRIDE	BIT(8)</div><div class='add'>+#define HAL_TX_MSDU_EXT_INFO1_ENCAP_TYPE	GENMASK(10, 9)</div><div class='add'>+#define HAL_TX_MSDU_EXT_INFO1_ENCRYPT_TYPE	GENMASK(14, 11)</div><div class='add'>+#define HAL_TX_MSDU_EXT_INFO1_BUF_LEN		GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+struct hal_tx_msdu_ext_desc {</div><div class='add'>+	__le32 rsvd0[6];</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 rsvd1[10];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hal_tcl_gse_cmd {</div><div class='add'>+	__le32 ctrl_buf_addr_lo;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 meta_data[2];</div><div class='add'>+	__le32 rsvd0[2];</div><div class='add'>+	__le32 info1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_tcl_gse_cmd</div><div class='add'>+ *</div><div class='add'>+ * ctrl_buf_addr_lo, ctrl_buf_addr_hi</div><div class='add'>+ *		Address of a control buffer containing additional info needed</div><div class='add'>+ *		for this command execution.</div><div class='add'>+ *</div><div class='add'>+ * meta_data</div><div class='add'>+ *		Meta data to be returned in the status descriptor</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum hal_tcl_cache_op_res {</div><div class='add'>+	HAL_TCL_CACHE_OP_RES_DONE,</div><div class='add'>+	HAL_TCL_CACHE_OP_RES_NOT_FOUND,</div><div class='add'>+	HAL_TCL_CACHE_OP_RES_TIMEOUT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hal_tcl_status_ring {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 msdu_byte_count;</div><div class='add'>+	__le32 msdu_timestamp;</div><div class='add'>+	__le32 meta_data[2];</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 rsvd0;</div><div class='add'>+	__le32 info2;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_tcl_status_ring</div><div class='add'>+ *</div><div class='add'>+ * msdu_cnt</div><div class='add'>+ * msdu_byte_count</div><div class='add'>+ *		MSDU count of Entry and MSDU byte count for entry 1.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HAL_CE_SRC_DESC_ADDR_INFO_ADDR_HI	GENMASK(7, 0)</div><div class='add'>+#define HAL_CE_SRC_DESC_ADDR_INFO_HASH_EN	BIT(8)</div><div class='add'>+#define HAL_CE_SRC_DESC_ADDR_INFO_BYTE_SWAP	BIT(9)</div><div class='add'>+#define HAL_CE_SRC_DESC_ADDR_INFO_DEST_SWAP	BIT(10)</div><div class='add'>+#define HAL_CE_SRC_DESC_ADDR_INFO_GATHER	BIT(11)</div><div class='add'>+#define HAL_CE_SRC_DESC_ADDR_INFO_LEN		GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define HAL_CE_SRC_DESC_META_INFO_DATA		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define HAL_CE_SRC_DESC_FLAGS_RING_ID		GENMASK(27, 20)</div><div class='add'>+#define HAL_CE_SRC_DESC_FLAGS_LOOP_CNT		HAL_SRNG_DESC_LOOP_CNT</div><div class='add'>+</div><div class='add'>+struct hal_ce_srng_src_desc {</div><div class='add'>+	__le32 buffer_addr_low;</div><div class='add'>+	__le32 buffer_addr_info; /* %HAL_CE_SRC_DESC_ADDR_INFO_ */</div><div class='add'>+	__le32 meta_info; /* %HAL_CE_SRC_DESC_META_INFO_ */</div><div class='add'>+	__le32 flags; /* %HAL_CE_SRC_DESC_FLAGS_ */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_ce_srng_src_desc</div><div class='add'>+ *</div><div class='add'>+ * buffer_addr_lo</div><div class='add'>+ *		LSB 32 bits of the 40 Bit Pointer to the source buffer</div><div class='add'>+ *</div><div class='add'>+ * buffer_addr_hi</div><div class='add'>+ *		MSB 8 bits of the 40 Bit Pointer to the source buffer</div><div class='add'>+ *</div><div class='add'>+ * toeplitz_en</div><div class='add'>+ *		Enable generation of 32-bit Toeplitz-LFSR hash for</div><div class='add'>+ *		data transfer. In case of gather field in first source</div><div class='add'>+ *		ring entry of the gather copy cycle in taken into account.</div><div class='add'>+ *</div><div class='add'>+ * src_swap</div><div class='add'>+ *		Treats source memory organization as big-endian. For</div><div class='add'>+ *		each dword read (4 bytes), the byte 0 is swapped with byte 3</div><div class='add'>+ *		and byte 1 is swapped with byte 2.</div><div class='add'>+ *		In case of gather field in first source ring entry of</div><div class='add'>+ *		the gather copy cycle in taken into account.</div><div class='add'>+ *</div><div class='add'>+ * dest_swap</div><div class='add'>+ *		Treats destination memory organization as big-endian.</div><div class='add'>+ *		For each dword write (4 bytes), the byte 0 is swapped with</div><div class='add'>+ *		byte 3 and byte 1 is swapped with byte 2.</div><div class='add'>+ *		In case of gather field in first source ring entry of</div><div class='add'>+ *		the gather copy cycle in taken into account.</div><div class='add'>+ *</div><div class='add'>+ * gather</div><div class='add'>+ *		Enables gather of multiple copy engine source</div><div class='add'>+ *		descriptors to one destination.</div><div class='add'>+ *</div><div class='add'>+ * ce_res_0</div><div class='add'>+ *		Reserved</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * length</div><div class='add'>+ *		Length of the buffer in units of octets of the current</div><div class='add'>+ *		descriptor</div><div class='add'>+ *</div><div class='add'>+ * fw_metadata</div><div class='add'>+ *		Meta data used by FW.</div><div class='add'>+ *		In case of gather field in first source ring entry of</div><div class='add'>+ *		the gather copy cycle in taken into account.</div><div class='add'>+ *</div><div class='add'>+ * ce_res_1</div><div class='add'>+ *		Reserved</div><div class='add'>+ *</div><div class='add'>+ * ce_res_2</div><div class='add'>+ *		Reserved</div><div class='add'>+ *</div><div class='add'>+ * ring_id</div><div class='add'>+ *		The buffer pointer ring ID.</div><div class='add'>+ *		0 refers to the IDLE ring</div><div class='add'>+ *		1 - N refers to other rings</div><div class='add'>+ *		Helps with debugging when dumping ring contents.</div><div class='add'>+ *</div><div class='add'>+ * looping_count</div><div class='add'>+ *		A count value that indicates the number of times the</div><div class='add'>+ *		producer of entries into the Ring has looped around the</div><div class='add'>+ *		ring.</div><div class='add'>+ *</div><div class='add'>+ *		At initialization time, this value is set to 0. On the</div><div class='add'>+ *		first loop, this value is set to 1. After the max value is</div><div class='add'>+ *		reached allowed by the number of bits for this field, the</div><div class='add'>+ *		count value continues with 0 again.</div><div class='add'>+ *</div><div class='add'>+ *		In case SW is the consumer of the ring entries, it can</div><div class='add'>+ *		use this field to figure out up to where the producer of</div><div class='add'>+ *		entries has created new entries. This eliminates the need to</div><div class='add'>+ *		check where the head pointer' of the ring is located once</div><div class='add'>+ *		the SW starts processing an interrupt indicating that new</div><div class='add'>+ *		entries have been put into this ring...</div><div class='add'>+ *</div><div class='add'>+ *		Also note that SW if it wants only needs to look at the</div><div class='add'>+ *		LSB bit of this count value.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HAL_CE_DEST_DESC_ADDR_INFO_ADDR_HI		GENMASK(7, 0)</div><div class='add'>+#define HAL_CE_DEST_DESC_ADDR_INFO_RING_ID		GENMASK(27, 20)</div><div class='add'>+#define HAL_CE_DEST_DESC_ADDR_INFO_LOOP_CNT		HAL_SRNG_DESC_LOOP_CNT</div><div class='add'>+</div><div class='add'>+struct hal_ce_srng_dest_desc {</div><div class='add'>+	__le32 buffer_addr_low;</div><div class='add'>+	__le32 buffer_addr_info; /* %HAL_CE_DEST_DESC_ADDR_INFO_ */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_ce_srng_dest_desc</div><div class='add'>+ *</div><div class='add'>+ * dst_buffer_low</div><div class='add'>+ *		LSB 32 bits of the 40 Bit Pointer to the Destination</div><div class='add'>+ *		buffer</div><div class='add'>+ *</div><div class='add'>+ * dst_buffer_high</div><div class='add'>+ *		MSB 8 bits of the 40 Bit Pointer to the Destination</div><div class='add'>+ *		buffer</div><div class='add'>+ *</div><div class='add'>+ * ce_res_4</div><div class='add'>+ *		Reserved</div><div class='add'>+ *</div><div class='add'>+ * ring_id</div><div class='add'>+ *		The buffer pointer ring ID.</div><div class='add'>+ *		0 refers to the IDLE ring</div><div class='add'>+ *		1 - N refers to other rings</div><div class='add'>+ *		Helps with debugging when dumping ring contents.</div><div class='add'>+ *</div><div class='add'>+ * looping_count</div><div class='add'>+ *		A count value that indicates the number of times the</div><div class='add'>+ *		producer of entries into the Ring has looped around the</div><div class='add'>+ *		ring.</div><div class='add'>+ *</div><div class='add'>+ *		At initialization time, this value is set to 0. On the</div><div class='add'>+ *		first loop, this value is set to 1. After the max value is</div><div class='add'>+ *		reached allowed by the number of bits for this field, the</div><div class='add'>+ *		count value continues with 0 again.</div><div class='add'>+ *</div><div class='add'>+ *		In case SW is the consumer of the ring entries, it can</div><div class='add'>+ *		use this field to figure out up to where the producer of</div><div class='add'>+ *		entries has created new entries. This eliminates the need to</div><div class='add'>+ *		check where the head pointer' of the ring is located once</div><div class='add'>+ *		the SW starts processing an interrupt indicating that new</div><div class='add'>+ *		entries have been put into this ring...</div><div class='add'>+ *</div><div class='add'>+ *		Also note that SW if it wants only needs to look at the</div><div class='add'>+ *		LSB bit of this count value.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HAL_CE_DST_STATUS_DESC_FLAGS_HASH_EN		BIT(8)</div><div class='add'>+#define HAL_CE_DST_STATUS_DESC_FLAGS_BYTE_SWAP		BIT(9)</div><div class='add'>+#define HAL_CE_DST_STATUS_DESC_FLAGS_DEST_SWAP		BIT(10)</div><div class='add'>+#define HAL_CE_DST_STATUS_DESC_FLAGS_GATHER		BIT(11)</div><div class='add'>+#define HAL_CE_DST_STATUS_DESC_FLAGS_LEN		GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define HAL_CE_DST_STATUS_DESC_META_INFO_DATA		GENMASK(15, 0)</div><div class='add'>+#define HAL_CE_DST_STATUS_DESC_META_INFO_RING_ID	GENMASK(27, 20)</div><div class='add'>+#define HAL_CE_DST_STATUS_DESC_META_INFO_LOOP_CNT	HAL_SRNG_DESC_LOOP_CNT</div><div class='add'>+</div><div class='add'>+struct hal_ce_srng_dst_status_desc {</div><div class='add'>+	__le32 flags; /* %HAL_CE_DST_STATUS_DESC_FLAGS_ */</div><div class='add'>+	__le32 toeplitz_hash0;</div><div class='add'>+	__le32 toeplitz_hash1;</div><div class='add'>+	__le32 meta_info; /* HAL_CE_DST_STATUS_DESC_META_INFO_ */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_ce_srng_dst_status_desc</div><div class='add'>+ *</div><div class='add'>+ * ce_res_5</div><div class='add'>+ *		Reserved</div><div class='add'>+ *</div><div class='add'>+ * toeplitz_en</div><div class='add'>+ *</div><div class='add'>+ * src_swap</div><div class='add'>+ *		Source memory buffer swapped</div><div class='add'>+ *</div><div class='add'>+ * dest_swap</div><div class='add'>+ *		Destination  memory buffer swapped</div><div class='add'>+ *</div><div class='add'>+ * gather</div><div class='add'>+ *		Gather of multiple copy engine source descriptors to one</div><div class='add'>+ *		destination enabled</div><div class='add'>+ *</div><div class='add'>+ * ce_res_6</div><div class='add'>+ *		Reserved</div><div class='add'>+ *</div><div class='add'>+ * length</div><div class='add'>+ *		Sum of all the Lengths of the source descriptor in the</div><div class='add'>+ *		gather chain</div><div class='add'>+ *</div><div class='add'>+ * toeplitz_hash_0</div><div class='add'>+ *		32 LS bits of 64 bit Toeplitz LFSR hash result</div><div class='add'>+ *</div><div class='add'>+ * toeplitz_hash_1</div><div class='add'>+ *		32 MS bits of 64 bit Toeplitz LFSR hash result</div><div class='add'>+ *</div><div class='add'>+ * fw_metadata</div><div class='add'>+ *		Meta data used by FW</div><div class='add'>+ *		In case of gather field in first source ring entry of</div><div class='add'>+ *		the gather copy cycle in taken into account.</div><div class='add'>+ *</div><div class='add'>+ * ce_res_7</div><div class='add'>+ *		Reserved</div><div class='add'>+ *</div><div class='add'>+ * ring_id</div><div class='add'>+ *		The buffer pointer ring ID.</div><div class='add'>+ *		0 refers to the IDLE ring</div><div class='add'>+ *		1 - N refers to other rings</div><div class='add'>+ *		Helps with debugging when dumping ring contents.</div><div class='add'>+ *</div><div class='add'>+ * looping_count</div><div class='add'>+ *		A count value that indicates the number of times the</div><div class='add'>+ *		producer of entries into the Ring has looped around the</div><div class='add'>+ *		ring.</div><div class='add'>+ *</div><div class='add'>+ *		At initialization time, this value is set to 0. On the</div><div class='add'>+ *		first loop, this value is set to 1. After the max value is</div><div class='add'>+ *		reached allowed by the number of bits for this field, the</div><div class='add'>+ *		count value continues with 0 again.</div><div class='add'>+ *</div><div class='add'>+ *		In case SW is the consumer of the ring entries, it can</div><div class='add'>+ *		use this field to figure out up to where the producer of</div><div class='add'>+ *		entries has created new entries. This eliminates the need to</div><div class='add'>+ *		check where the head pointer' of the ring is located once</div><div class='add'>+ *		the SW starts processing an interrupt indicating that new</div><div class='add'>+ *		entries have been put into this ring...</div><div class='add'>+ *</div><div class='add'>+ *		Also note that SW if it wants only needs to look at the</div><div class='add'>+ *			LSB bit of this count value.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HAL_TX_RATE_STATS_INFO0_VALID		BIT(0)</div><div class='add'>+#define HAL_TX_RATE_STATS_INFO0_BW		GENMASK(3, 1)</div><div class='add'>+#define HAL_TX_RATE_STATS_INFO0_PKT_TYPE	GENMASK(7, 4)</div><div class='add'>+#define HAL_TX_RATE_STATS_INFO0_STBC		BIT(8)</div><div class='add'>+#define HAL_TX_RATE_STATS_INFO0_LDPC		BIT(9)</div><div class='add'>+#define HAL_TX_RATE_STATS_INFO0_SGI		GENMASK(11, 10)</div><div class='add'>+#define HAL_TX_RATE_STATS_INFO0_MCS		GENMASK(15, 12)</div><div class='add'>+#define HAL_TX_RATE_STATS_INFO0_OFDMA_TX	BIT(16)</div><div class='add'>+#define HAL_TX_RATE_STATS_INFO0_TONES_IN_RU	GENMASK(28, 17)</div><div class='add'>+</div><div class='add'>+enum hal_tx_rate_stats_bw {</div><div class='add'>+	HAL_TX_RATE_STATS_BW_20,</div><div class='add'>+	HAL_TX_RATE_STATS_BW_40,</div><div class='add'>+	HAL_TX_RATE_STATS_BW_80,</div><div class='add'>+	HAL_TX_RATE_STATS_BW_160,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_tx_rate_stats_pkt_type {</div><div class='add'>+	HAL_TX_RATE_STATS_PKT_TYPE_11A,</div><div class='add'>+	HAL_TX_RATE_STATS_PKT_TYPE_11B,</div><div class='add'>+	HAL_TX_RATE_STATS_PKT_TYPE_11N,</div><div class='add'>+	HAL_TX_RATE_STATS_PKT_TYPE_11AC,</div><div class='add'>+	HAL_TX_RATE_STATS_PKT_TYPE_11AX,</div><div class='add'>+	HAL_TX_RATE_STATS_PKT_TYPE_11BA,</div><div class='add'>+	HAL_TX_RATE_STATS_PKT_TYPE_11BE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_tx_rate_stats_sgi {</div><div class='add'>+	HAL_TX_RATE_STATS_SGI_08US,</div><div class='add'>+	HAL_TX_RATE_STATS_SGI_04US,</div><div class='add'>+	HAL_TX_RATE_STATS_SGI_16US,</div><div class='add'>+	HAL_TX_RATE_STATS_SGI_32US,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hal_tx_rate_stats {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 tsf;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hal_wbm_link_desc {</div><div class='add'>+	struct ath12k_buffer_addr buf_addr_info;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_wbm_link_desc</div><div class='add'>+ *</div><div class='add'>+ *	Producer: WBM</div><div class='add'>+ *	Consumer: WBM</div><div class='add'>+ *</div><div class='add'>+ * buf_addr_info</div><div class='add'>+ *		Details of the physical address of a buffer or MSDU</div><div class='add'>+ *		link descriptor.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum hal_wbm_rel_src_module {</div><div class='add'>+	HAL_WBM_REL_SRC_MODULE_TQM,</div><div class='add'>+	HAL_WBM_REL_SRC_MODULE_RXDMA,</div><div class='add'>+	HAL_WBM_REL_SRC_MODULE_REO,</div><div class='add'>+	HAL_WBM_REL_SRC_MODULE_FW,</div><div class='add'>+	HAL_WBM_REL_SRC_MODULE_SW,</div><div class='add'>+	HAL_WBM_REL_SRC_MODULE_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_wbm_rel_desc_type {</div><div class='add'>+	HAL_WBM_REL_DESC_TYPE_REL_MSDU,</div><div class='add'>+	HAL_WBM_REL_DESC_TYPE_MSDU_LINK,</div><div class='add'>+	HAL_WBM_REL_DESC_TYPE_MPDU_LINK,</div><div class='add'>+	HAL_WBM_REL_DESC_TYPE_MSDU_EXT,</div><div class='add'>+	HAL_WBM_REL_DESC_TYPE_QUEUE_EXT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hal_wbm_rel_desc_type</div><div class='add'>+ *</div><div class='add'>+ * msdu_buffer</div><div class='add'>+ *	The address points to an MSDU buffer</div><div class='add'>+ *</div><div class='add'>+ * msdu_link_descriptor</div><div class='add'>+ *	The address points to an Tx MSDU link descriptor</div><div class='add'>+ *</div><div class='add'>+ * mpdu_link_descriptor</div><div class='add'>+ *	The address points to an MPDU link descriptor</div><div class='add'>+ *</div><div class='add'>+ * msdu_ext_descriptor</div><div class='add'>+ *	The address points to an MSDU extension descriptor</div><div class='add'>+ *</div><div class='add'>+ * queue_ext_descriptor</div><div class='add'>+ *	The address points to an TQM queue extension descriptor. WBM should</div><div class='add'>+ *	treat this is the same way as a link descriptor.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum hal_wbm_rel_bm_act {</div><div class='add'>+	HAL_WBM_REL_BM_ACT_PUT_IN_IDLE,</div><div class='add'>+	HAL_WBM_REL_BM_ACT_REL_MSDU,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hal_wbm_rel_bm_act</div><div class='add'>+ *</div><div class='add'>+ * put_in_idle_list</div><div class='add'>+ *	Put the buffer or descriptor back in the idle list. In case of MSDU or</div><div class='add'>+ *	MDPU link descriptor, BM does not need to check to release any</div><div class='add'>+ *	individual MSDU buffers.</div><div class='add'>+ *</div><div class='add'>+ * release_msdu_list</div><div class='add'>+ *	This BM action can only be used in combination with desc_type being</div><div class='add'>+ *	msdu_link_descriptor. Field first_msdu_index points out which MSDU</div><div class='add'>+ *	pointer in the MSDU link descriptor is the first of an MPDU that is</div><div class='add'>+ *	released. BM shall release all the MSDU buffers linked to this first</div><div class='add'>+ *	MSDU buffer pointer. All related MSDU buffer pointer entries shall be</div><div class='add'>+ *	set to value 0, which represents the 'NULL' pointer. When all MSDU</div><div class='add'>+ *	buffer pointers in the MSDU link descriptor are 'NULL', the MSDU link</div><div class='add'>+ *	descriptor itself shall also be released.</div><div class='add'>+ */</div><div class='add'>+#define HAL_WBM_COMPL_RX_INFO0_REL_SRC_MODULE		GENMASK(2, 0)</div><div class='add'>+#define HAL_WBM_COMPL_RX_INFO0_BM_ACTION		GENMASK(5, 3)</div><div class='add'>+#define HAL_WBM_COMPL_RX_INFO0_DESC_TYPE		GENMASK(8, 6)</div><div class='add'>+#define HAL_WBM_COMPL_RX_INFO0_RBM			GENMASK(12, 9)</div><div class='add'>+#define HAL_WBM_COMPL_RX_INFO0_RXDMA_PUSH_REASON	GENMASK(18, 17)</div><div class='add'>+#define HAL_WBM_COMPL_RX_INFO0_RXDMA_ERROR_CODE		GENMASK(23, 19)</div><div class='add'>+#define HAL_WBM_COMPL_RX_INFO0_REO_PUSH_REASON		GENMASK(25, 24)</div><div class='add'>+#define HAL_WBM_COMPL_RX_INFO0_REO_ERROR_CODE		GENMASK(30, 26)</div><div class='add'>+#define HAL_WBM_COMPL_RX_INFO0_WBM_INTERNAL_ERROR	BIT(31)</div><div class='add'>+</div><div class='add'>+#define HAL_WBM_COMPL_RX_INFO1_PHY_ADDR_HI		GENMASK(7, 0)</div><div class='add'>+#define HAL_WBM_COMPL_RX_INFO1_SW_COOKIE		GENMASK(27, 8)</div><div class='add'>+#define HAL_WBM_COMPL_RX_INFO1_LOOPING_COUNT		GENMASK(31, 28)</div><div class='add'>+</div><div class='add'>+struct hal_wbm_completion_ring_rx {</div><div class='add'>+	__le32 addr_lo;</div><div class='add'>+	__le32 addr_hi;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	struct rx_mpdu_desc rx_mpdu_info;</div><div class='add'>+	struct rx_msdu_desc rx_msdu_info;</div><div class='add'>+	__le32 phy_addr_lo;</div><div class='add'>+	__le32 info1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_WBM_COMPL_TX_INFO0_REL_SRC_MODULE		GENMASK(2, 0)</div><div class='add'>+#define HAL_WBM_COMPL_TX_INFO0_DESC_TYPE		GENMASK(8, 6)</div><div class='add'>+#define HAL_WBM_COMPL_TX_INFO0_RBM			GENMASK(12, 9)</div><div class='add'>+#define HAL_WBM_COMPL_TX_INFO0_TQM_RELEASE_REASON	GENMASK(16, 13)</div><div class='add'>+#define HAL_WBM_COMPL_TX_INFO0_RBM_OVERRIDE_VLD		BIT(17)</div><div class='add'>+#define HAL_WBM_COMPL_TX_INFO0_SW_COOKIE_LO		GENMASK(29, 18)</div><div class='add'>+#define HAL_WBM_COMPL_TX_INFO0_CC_DONE			BIT(30)</div><div class='add'>+#define HAL_WBM_COMPL_TX_INFO0_WBM_INTERNAL_ERROR	BIT(31)</div><div class='add'>+</div><div class='add'>+#define HAL_WBM_COMPL_TX_INFO1_TQM_STATUS_NUMBER	GENMASK(23, 0)</div><div class='add'>+#define HAL_WBM_COMPL_TX_INFO1_TRANSMIT_COUNT		GENMASK(30, 24)</div><div class='add'>+#define HAL_WBM_COMPL_TX_INFO1_SW_REL_DETAILS_VALID	BIT(31)</div><div class='add'>+</div><div class='add'>+#define HAL_WBM_COMPL_TX_INFO2_ACK_FRAME_RSSI		GENMASK(7, 0)</div><div class='add'>+#define HAL_WBM_COMPL_TX_INFO2_FIRST_MSDU		BIT(8)</div><div class='add'>+#define HAL_WBM_COMPL_TX_INFO2_LAST_MSDU		BIT(9)</div><div class='add'>+#define HAL_WBM_COMPL_TX_INFO2_FW_TX_NOTIF_FRAME	GENMASK(12, 10)</div><div class='add'>+#define HAL_WBM_COMPL_TX_INFO2_BUFFER_TIMESTAMP		GENMASK(31, 13)</div><div class='add'>+</div><div class='add'>+#define HAL_WBM_COMPL_TX_INFO3_PEER_ID			GENMASK(15, 0)</div><div class='add'>+#define HAL_WBM_COMPL_TX_INFO3_TID			GENMASK(19, 16)</div><div class='add'>+#define HAL_WBM_COMPL_TX_INFO3_SW_COOKIE_HI		GENMASK(27, 20)</div><div class='add'>+#define HAL_WBM_COMPL_TX_INFO3_LOOPING_COUNT		GENMASK(31, 28)</div><div class='add'>+</div><div class='add'>+struct hal_wbm_completion_ring_tx {</div><div class='add'>+	__le32 buf_va_lo;</div><div class='add'>+	__le32 buf_va_hi;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 info2;</div><div class='add'>+	struct hal_tx_rate_stats rate_stats;</div><div class='add'>+	__le32 info3;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_WBM_RELEASE_TX_INFO0_REL_SRC_MODULE		GENMASK(2, 0)</div><div class='add'>+#define HAL_WBM_RELEASE_TX_INFO0_BM_ACTION		GENMASK(5, 3)</div><div class='add'>+#define HAL_WBM_RELEASE_TX_INFO0_DESC_TYPE		GENMASK(8, 6)</div><div class='add'>+#define HAL_WBM_RELEASE_TX_INFO0_FIRST_MSDU_IDX		GENMASK(12, 9)</div><div class='add'>+#define HAL_WBM_RELEASE_TX_INFO0_TQM_RELEASE_REASON	GENMASK(18, 13)</div><div class='add'>+#define HAL_WBM_RELEASE_TX_INFO0_RBM_OVERRIDE_VLD	BIT(17)</div><div class='add'>+#define HAL_WBM_RELEASE_TX_INFO0_SW_BUFFER_COOKIE_11_0	GENMASK(29, 18)</div><div class='add'>+#define HAL_WBM_RELEASE_TX_INFO0_WBM_INTERNAL_ERROR	BIT(31)</div><div class='add'>+</div><div class='add'>+#define HAL_WBM_RELEASE_TX_INFO1_TQM_STATUS_NUMBER	GENMASK(23, 0)</div><div class='add'>+#define HAL_WBM_RELEASE_TX_INFO1_TRANSMIT_COUNT		GENMASK(30, 24)</div><div class='add'>+#define HAL_WBM_RELEASE_TX_INFO1_SW_REL_DETAILS_VALID	BIT(31)</div><div class='add'>+</div><div class='add'>+#define HAL_WBM_RELEASE_TX_INFO2_ACK_FRAME_RSSI		GENMASK(7, 0)</div><div class='add'>+#define HAL_WBM_RELEASE_TX_INFO2_FIRST_MSDU		BIT(8)</div><div class='add'>+#define HAL_WBM_RELEASE_TX_INFO2_LAST_MSDU		BIT(9)</div><div class='add'>+#define HAL_WBM_RELEASE_TX_INFO2_FW_TX_NOTIF_FRAME	GENMASK(12, 10)</div><div class='add'>+#define HAL_WBM_RELEASE_TX_INFO2_BUFFER_TIMESTAMP	GENMASK(31, 13)</div><div class='add'>+</div><div class='add'>+#define HAL_WBM_RELEASE_TX_INFO3_PEER_ID		GENMASK(15, 0)</div><div class='add'>+#define HAL_WBM_RELEASE_TX_INFO3_TID			GENMASK(19, 16)</div><div class='add'>+#define HAL_WBM_RELEASE_TX_INFO3_SW_BUFFER_COOKIE_19_12	GENMASK(27, 20)</div><div class='add'>+#define HAL_WBM_RELEASE_TX_INFO3_LOOPING_COUNT		GENMASK(31, 28)</div><div class='add'>+</div><div class='add'>+struct hal_wbm_release_ring_tx {</div><div class='add'>+	struct ath12k_buffer_addr buf_addr_info;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 info2;</div><div class='add'>+	struct hal_tx_rate_stats rate_stats;</div><div class='add'>+	__le32 info3;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_WBM_RELEASE_RX_INFO0_REL_SRC_MODULE		GENMASK(2, 0)</div><div class='add'>+#define HAL_WBM_RELEASE_RX_INFO0_BM_ACTION		GENMASK(5, 3)</div><div class='add'>+#define HAL_WBM_RELEASE_RX_INFO0_DESC_TYPE		GENMASK(8, 6)</div><div class='add'>+#define HAL_WBM_RELEASE_RX_INFO0_FIRST_MSDU_IDX		GENMASK(12, 9)</div><div class='add'>+#define HAL_WBM_RELEASE_RX_INFO0_CC_STATUS		BIT(16)</div><div class='add'>+#define HAL_WBM_RELEASE_RX_INFO0_RXDMA_PUSH_REASON	GENMASK(18, 17)</div><div class='add'>+#define HAL_WBM_RELEASE_RX_INFO0_RXDMA_ERROR_CODE	GENMASK(23, 19)</div><div class='add'>+#define HAL_WBM_RELEASE_RX_INFO0_REO_PUSH_REASON	GENMASK(25, 24)</div><div class='add'>+#define HAL_WBM_RELEASE_RX_INFO0_REO_ERROR_CODE		GENMASK(30, 26)</div><div class='add'>+#define HAL_WBM_RELEASE_RX_INFO0_WBM_INTERNAL_ERROR	BIT(31)</div><div class='add'>+</div><div class='add'>+#define HAL_WBM_RELEASE_RX_INFO2_RING_ID		GENMASK(27, 20)</div><div class='add'>+#define HAL_WBM_RELEASE_RX_INFO2_LOOPING_COUNT		GENMASK(31, 28)</div><div class='add'>+</div><div class='add'>+struct hal_wbm_release_ring_rx {</div><div class='add'>+	struct ath12k_buffer_addr buf_addr_info;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	struct rx_mpdu_desc rx_mpdu_info;</div><div class='add'>+	struct rx_msdu_desc rx_msdu_info;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 info2;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_WBM_RELEASE_RX_CC_INFO0_RBM			GENMASK(12, 9)</div><div class='add'>+#define HAL_WBM_RELEASE_RX_CC_INFO1_COOKIE		GENMASK(27, 8)</div><div class='add'>+/* Used when hw cc is success */</div><div class='add'>+struct hal_wbm_release_ring_cc_rx {</div><div class='add'>+	__le32 buf_va_lo;</div><div class='add'>+	__le32 buf_va_hi;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	struct rx_mpdu_desc rx_mpdu_info;</div><div class='add'>+	struct rx_msdu_desc rx_msdu_info;</div><div class='add'>+	__le32 buf_pa_lo;</div><div class='add'>+	__le32 info1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE		GENMASK(2, 0)</div><div class='add'>+#define HAL_WBM_RELEASE_INFO0_BM_ACTION			GENMASK(5, 3)</div><div class='add'>+#define HAL_WBM_RELEASE_INFO0_DESC_TYPE			GENMASK(8, 6)</div><div class='add'>+#define HAL_WBM_RELEASE_INFO0_RXDMA_PUSH_REASON		GENMASK(18, 17)</div><div class='add'>+#define HAL_WBM_RELEASE_INFO0_RXDMA_ERROR_CODE		GENMASK(23, 19)</div><div class='add'>+#define HAL_WBM_RELEASE_INFO0_REO_PUSH_REASON		GENMASK(25, 24)</div><div class='add'>+#define HAL_WBM_RELEASE_INFO0_REO_ERROR_CODE		GENMASK(30, 26)</div><div class='add'>+#define HAL_WBM_RELEASE_INFO0_WBM_INTERNAL_ERROR	BIT(31)</div><div class='add'>+</div><div class='add'>+#define HAL_WBM_RELEASE_INFO3_FIRST_MSDU		BIT(0)</div><div class='add'>+#define HAL_WBM_RELEASE_INFO3_LAST_MSDU			BIT(1)</div><div class='add'>+#define HAL_WBM_RELEASE_INFO3_CONTINUATION		BIT(2)</div><div class='add'>+</div><div class='add'>+#define HAL_WBM_RELEASE_INFO5_LOOPING_COUNT		GENMASK(31, 28)</div><div class='add'>+#define HAL_ENCRYPT_TYPE_MAX 12</div><div class='add'>+</div><div class='add'>+struct hal_wbm_release_ring {</div><div class='add'>+	struct ath12k_buffer_addr buf_addr_info;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le32 info3;</div><div class='add'>+	__le32 info4;</div><div class='add'>+	__le32 info5;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_wbm_release_ring</div><div class='add'>+ *</div><div class='add'>+ *	Producer: SW/TQM/RXDMA/REO/SWITCH</div><div class='add'>+ *	Consumer: WBM/SW/FW</div><div class='add'>+ *</div><div class='add'>+ * HTT tx status is overlaid on wbm_release ring on 4-byte words 2, 3, 4 and 5</div><div class='add'>+ * for software based completions.</div><div class='add'>+ *</div><div class='add'>+ * buf_addr_info</div><div class='add'>+ *	Details of the physical address of the buffer or link descriptor.</div><div class='add'>+ *</div><div class='add'>+ * release_source_module</div><div class='add'>+ *	Indicates which module initiated the release of this buffer/descriptor.</div><div class='add'>+ *	Values are defined in enum %HAL_WBM_REL_SRC_MODULE_.</div><div class='add'>+ *</div><div class='add'>+ * buffer_or_desc_type</div><div class='add'>+ *	Field only valid when WBM is marked as the return_buffer_manager in</div><div class='add'>+ *	the Released_Buffer_address_info. Indicates that type of buffer or</div><div class='add'>+ *	descriptor is being released. Values are in enum %HAL_WBM_REL_DESC_TYPE.</div><div class='add'>+ *</div><div class='add'>+ * wbm_internal_error</div><div class='add'>+ *	Is set when WBM got a buffer pointer but the action was to push it to</div><div class='add'>+ *	the idle link descriptor ring or do link related activity OR</div><div class='add'>+ *	Is set when WBM got a link buffer pointer but the action was to push it</div><div class='add'>+ *	to the buffer descriptor ring.</div><div class='add'>+ *</div><div class='add'>+ * looping_count</div><div class='add'>+ *	A count value that indicates the number of times the</div><div class='add'>+ *	producer of entries into the Buffer Manager Ring has looped</div><div class='add'>+ *	around the ring.</div><div class='add'>+ *</div><div class='add'>+ *	At initialization time, this value is set to 0. On the</div><div class='add'>+ *	first loop, this value is set to 1. After the max value is</div><div class='add'>+ *	reached allowed by the number of bits for this field, the</div><div class='add'>+ *	count value continues with 0 again.</div><div class='add'>+ *</div><div class='add'>+ *	In case SW is the consumer of the ring entries, it can</div><div class='add'>+ *	use this field to figure out up to where the producer of</div><div class='add'>+ *	entries has created new entries. This eliminates the need to</div><div class='add'>+ *	check where the head pointer' of the ring is located once</div><div class='add'>+ *	the SW starts processing an interrupt indicating that new</div><div class='add'>+ *	entries have been put into this ring...</div><div class='add'>+ *</div><div class='add'>+ *	Also note that SW if it wants only needs to look at the</div><div class='add'>+ *	LSB bit of this count value.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum hal_wbm_tqm_rel_reason - TQM release reason code</div><div class='add'>+ * @HAL_WBM_TQM_REL_REASON_FRAME_ACKED: ACK or BACK received for the frame</div><div class='add'>+ * @HAL_WBM_TQM_REL_REASON_CMD_REMOVE_MPDU: Command remove_mpdus initiated by SW</div><div class='add'>+ * @HAL_WBM_TQM_REL_REASON_CMD_REMOVE_TX: Command remove transmitted_mpdus</div><div class='add'>+ *	initiated by sw.</div><div class='add'>+ * @HAL_WBM_TQM_REL_REASON_CMD_REMOVE_NOTX: Command remove untransmitted_mpdus</div><div class='add'>+ *	initiated by sw.</div><div class='add'>+ * @HAL_WBM_TQM_REL_REASON_CMD_REMOVE_AGED_FRAMES: Command remove aged msdus or</div><div class='add'>+ *	mpdus.</div><div class='add'>+ * @HAL_WBM_TQM_REL_REASON_CMD_REMOVE_RESEAON1: Remove command initiated by</div><div class='add'>+ *	fw with fw_reason1.</div><div class='add'>+ * @HAL_WBM_TQM_REL_REASON_CMD_REMOVE_RESEAON2: Remove command initiated by</div><div class='add'>+ *	fw with fw_reason2.</div><div class='add'>+ * @HAL_WBM_TQM_REL_REASON_CMD_REMOVE_RESEAON3: Remove command initiated by</div><div class='add'>+ *	fw with fw_reason3.</div><div class='add'>+ * @HAL_WBM_TQM_REL_REASON_CMD_DISABLE_QUEUE: Remove command initiated by</div><div class='add'>+ *	fw with disable queue.</div><div class='add'>+ * @HAL_WBM_TQM_REL_REASON_CMD_TILL_NONMATCHING: Remove command initiated by</div><div class='add'>+ *	fw to remove all mpdu until 1st non-match.</div><div class='add'>+ * @HAL_WBM_TQM_REL_REASON_DROP_THRESHOLD: Dropped due to drop threshold</div><div class='add'>+ *	criteria</div><div class='add'>+ * @HAL_WBM_TQM_REL_REASON_DROP_LINK_DESC_UNAVAIL: Dropped due to link desc</div><div class='add'>+ *	not available</div><div class='add'>+ * @HAL_WBM_TQM_REL_REASON_DROP_OR_INVALID_MSDU: Dropped due drop bit set or</div><div class='add'>+ *	null flow</div><div class='add'>+ * @HAL_WBM_TQM_REL_REASON_MULTICAST_DROP: Dropped due mcast drop set for VDEV</div><div class='add'>+ * @HAL_WBM_TQM_REL_REASON_VDEV_MISMATCH_DROP: Dropped due to being set with</div><div class='add'>+ *	'TCL_drop_reason'</div><div class='add'>+ */</div><div class='add'>+enum hal_wbm_tqm_rel_reason {</div><div class='add'>+	HAL_WBM_TQM_REL_REASON_FRAME_ACKED,</div><div class='add'>+	HAL_WBM_TQM_REL_REASON_CMD_REMOVE_MPDU,</div><div class='add'>+	HAL_WBM_TQM_REL_REASON_CMD_REMOVE_TX,</div><div class='add'>+	HAL_WBM_TQM_REL_REASON_CMD_REMOVE_NOTX,</div><div class='add'>+	HAL_WBM_TQM_REL_REASON_CMD_REMOVE_AGED_FRAMES,</div><div class='add'>+	HAL_WBM_TQM_REL_REASON_CMD_REMOVE_RESEAON1,</div><div class='add'>+	HAL_WBM_TQM_REL_REASON_CMD_REMOVE_RESEAON2,</div><div class='add'>+	HAL_WBM_TQM_REL_REASON_CMD_REMOVE_RESEAON3,</div><div class='add'>+	HAL_WBM_TQM_REL_REASON_CMD_DISABLE_QUEUE,</div><div class='add'>+	HAL_WBM_TQM_REL_REASON_CMD_TILL_NONMATCHING,</div><div class='add'>+	HAL_WBM_TQM_REL_REASON_DROP_THRESHOLD,</div><div class='add'>+	HAL_WBM_TQM_REL_REASON_DROP_LINK_DESC_UNAVAIL,</div><div class='add'>+	HAL_WBM_TQM_REL_REASON_DROP_OR_INVALID_MSDU,</div><div class='add'>+	HAL_WBM_TQM_REL_REASON_MULTICAST_DROP,</div><div class='add'>+	HAL_WBM_TQM_REL_REASON_VDEV_MISMATCH_DROP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hal_wbm_buffer_ring {</div><div class='add'>+	struct ath12k_buffer_addr buf_addr_info;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_mon_end_reason {</div><div class='add'>+	HAL_MON_STATUS_BUFFER_FULL,</div><div class='add'>+	HAL_MON_FLUSH_DETECTED,</div><div class='add'>+	HAL_MON_END_OF_PPDU,</div><div class='add'>+	HAL_MON_PPDU_TRUNCATED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_SW_MONITOR_RING_INFO0_RXDMA_PUSH_REASON	GENMASK(1, 0)</div><div class='add'>+#define HAL_SW_MONITOR_RING_INFO0_RXDMA_ERROR_CODE	GENMASK(6, 2)</div><div class='add'>+#define HAL_SW_MONITOR_RING_INFO0_MPDU_FRAGMENT_NUMBER	GENMASK(10, 7)</div><div class='add'>+#define HAL_SW_MONITOR_RING_INFO0_FRAMELESS_BAR		BIT(11)</div><div class='add'>+#define HAL_SW_MONITOR_RING_INFO0_STATUS_BUF_COUNT	GENMASK(15, 12)</div><div class='add'>+#define HAL_SW_MONITOR_RING_INFO0_END_OF_PPDU		BIT(16)</div><div class='add'>+</div><div class='add'>+#define HAL_SW_MONITOR_RING_INFO1_PHY_PPDU_ID	GENMASK(15, 0)</div><div class='add'>+#define HAL_SW_MONITOR_RING_INFO1_RING_ID	GENMASK(27, 20)</div><div class='add'>+#define HAL_SW_MONITOR_RING_INFO1_LOOPING_COUNT	GENMASK(31, 28)</div><div class='add'>+</div><div class='add'>+struct hal_sw_monitor_ring {</div><div class='add'>+	struct ath12k_buffer_addr buf_addr_info;</div><div class='add'>+	struct rx_mpdu_desc rx_mpdu_info;</div><div class='add'>+	struct ath12k_buffer_addr status_buff_addr_info;</div><div class='add'>+	__le32 info0; /* %HAL_SW_MONITOR_RING_INFO0 */</div><div class='add'>+	__le32 info1; /* %HAL_SW_MONITOR_RING_INFO1 */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_sw_monitor_ring</div><div class='add'>+ *</div><div class='add'>+ *		Producer: RXDMA</div><div class='add'>+ *		Consumer: REO/SW/FW</div><div class='add'>+ * buf_addr_info</div><div class='add'>+ *              Details of the physical address of a buffer or MSDU</div><div class='add'>+ *              link descriptor.</div><div class='add'>+ *</div><div class='add'>+ * rx_mpdu_info</div><div class='add'>+ *              Details related to the MPDU being pushed to SW, valid</div><div class='add'>+ *              only if end_of_ppdu is set to 0.</div><div class='add'>+ *</div><div class='add'>+ * status_buff_addr_info</div><div class='add'>+ *		Details of the physical address of the first status</div><div class='add'>+ *		buffer used for the PPDU (either the PPDU that included the</div><div class='add'>+ *		MPDU being pushed to SW if end_of_ppdu = 0, or the PPDU</div><div class='add'>+ *		whose end is indicated through end_of_ppdu = 1)</div><div class='add'>+ *</div><div class='add'>+ * rxdma_push_reason</div><div class='add'>+ *		Indicates why RXDMA pushed the frame to this ring</div><div class='add'>+ *</div><div class='add'>+ *		&lt;enum 0 rxdma_error_detected&gt; RXDMA detected an error an</div><div class='add'>+ *		pushed this frame to this queue</div><div class='add'>+ *</div><div class='add'>+ *		&lt;enum 1 rxdma_routing_instruction&gt; RXDMA pushed the</div><div class='add'>+ *		frame to this queue per received routing instructions. No</div><div class='add'>+ *		error within RXDMA was detected</div><div class='add'>+ *</div><div class='add'>+ *		&lt;enum 2 rxdma_rx_flush&gt; RXDMA received an RX_FLUSH. As a</div><div class='add'>+ *		result the MSDU link descriptor might not have the</div><div class='add'>+ *		last_msdu_in_mpdu_flag set, but instead WBM might just see a</div><div class='add'>+ *		NULL pointer in the MSDU link descriptor. This is to be</div><div class='add'>+ *		considered a normal condition for this scenario.</div><div class='add'>+ *</div><div class='add'>+ * rxdma_error_code</div><div class='add'>+ *		Field only valid when rxdma_push_reason is set to</div><div class='add'>+ *		'rxdma_error_detected.'</div><div class='add'>+ *</div><div class='add'>+ *		&lt;enum 0 rxdma_overflow_err&gt;MPDU frame is not complete</div><div class='add'>+ *		due to a FIFO overflow error in RXPCU.</div><div class='add'>+ *</div><div class='add'>+ *		&lt;enum 1 rxdma_mpdu_length_err&gt;MPDU frame is not complete</div><div class='add'>+ *		due to receiving incomplete MPDU from the PHY</div><div class='add'>+ *</div><div class='add'>+ *		&lt;enum 3 rxdma_decrypt_err&gt;CRYPTO reported a decryption</div><div class='add'>+ *		error or CRYPTO received an encrypted frame, but did not get</div><div class='add'>+ *		a valid corresponding key id in the peer entry.</div><div class='add'>+ *</div><div class='add'>+ *		&lt;enum 4 rxdma_tkip_mic_err&gt;CRYPTO reported a TKIP MIC</div><div class='add'>+ *		error</div><div class='add'>+ *</div><div class='add'>+ *		&lt;enum 5 rxdma_unecrypted_err&gt;CRYPTO reported an</div><div class='add'>+ *		unencrypted frame error when encrypted was expected</div><div class='add'>+ *</div><div class='add'>+ *		&lt;enum 6 rxdma_msdu_len_err&gt;RX OLE reported an MSDU</div><div class='add'>+ *		length error</div><div class='add'>+ *</div><div class='add'>+ *		&lt;enum 7 rxdma_msdu_limit_err&gt;RX OLE reported that max</div><div class='add'>+ *		number of MSDUs allowed in an MPDU got exceeded</div><div class='add'>+ *</div><div class='add'>+ *		&lt;enum 8 rxdma_wifi_parse_err&gt;RX OLE reported a parsing</div><div class='add'>+ *		error</div><div class='add'>+ *</div><div class='add'>+ *		&lt;enum 9 rxdma_amsdu_parse_err&gt;RX OLE reported an A-MSDU</div><div class='add'>+ *		parsing error</div><div class='add'>+ *</div><div class='add'>+ *		&lt;enum 10 rxdma_sa_timeout_err&gt;RX OLE reported a timeout</div><div class='add'>+ *		during SA search</div><div class='add'>+ *</div><div class='add'>+ *		&lt;enum 11 rxdma_da_timeout_err&gt;RX OLE reported a timeout</div><div class='add'>+ *		during DA search</div><div class='add'>+ *</div><div class='add'>+ *		&lt;enum 12 rxdma_flow_timeout_err&gt;RX OLE reported a</div><div class='add'>+ *		timeout during flow search</div><div class='add'>+ *</div><div class='add'>+ *		&lt;enum 13 rxdma_flush_request&gt;RXDMA received a flush</div><div class='add'>+ *		request</div><div class='add'>+ *</div><div class='add'>+ *		&lt;enum 14 rxdma_amsdu_fragment_err&gt;Rx PCU reported A-MSDU</div><div class='add'>+ *		present as well as a fragmented MPDU.</div><div class='add'>+ *</div><div class='add'>+ * mpdu_fragment_number</div><div class='add'>+ *		Field only valid when Reo_level_mpdu_frame_info.</div><div class='add'>+ *		Rx_mpdu_desc_info_details.Fragment_flag is set and</div><div class='add'>+ *		end_of_ppdu is set to 0.</div><div class='add'>+ *</div><div class='add'>+ *		The fragment number from the 802.11 header.</div><div class='add'>+ *</div><div class='add'>+ *		Note that the sequence number is embedded in the field:</div><div class='add'>+ *		Reo_level_mpdu_frame_info. Rx_mpdu_desc_info_details.</div><div class='add'>+ *		Mpdu_sequence_number</div><div class='add'>+ *</div><div class='add'>+ * frameless_bar</div><div class='add'>+ *		When set, this SW monitor ring struct contains BAR info</div><div class='add'>+ *		from a multi TID BAR frame. The original multi TID BAR frame</div><div class='add'>+ *		itself contained all the REO info for the first TID, but all</div><div class='add'>+ *		the subsequent TID info and their linkage to the REO</div><div class='add'>+ *		descriptors is passed down as 'frameless' BAR info.</div><div class='add'>+ *</div><div class='add'>+ *		The only fields valid in this descriptor when this bit</div><div class='add'>+ *		is within the</div><div class='add'>+ *</div><div class='add'>+ *		Reo_level_mpdu_frame_info:</div><div class='add'>+ *		   Within Rx_mpdu_desc_info_details:</div><div class='add'>+ *			Mpdu_Sequence_number</div><div class='add'>+ *			BAR_frame</div><div class='add'>+ *			Peer_meta_data</div><div class='add'>+ *			All other fields shall be set to 0.</div><div class='add'>+ *</div><div class='add'>+ * status_buf_count</div><div class='add'>+ *		A count of status buffers used so far for the PPDU</div><div class='add'>+ *		(either the PPDU that included the MPDU being pushed to SW</div><div class='add'>+ *		if end_of_ppdu = 0, or the PPDU whose end is indicated</div><div class='add'>+ *		through end_of_ppdu = 1)</div><div class='add'>+ *</div><div class='add'>+ * end_of_ppdu</div><div class='add'>+ *		Some hw RXDMA can be configured to generate a separate</div><div class='add'>+ *		'SW_MONITOR_RING' descriptor at the end of a PPDU (either</div><div class='add'>+ *		through an 'RX_PPDU_END' TLV or through an 'RX_FLUSH') to</div><div class='add'>+ *		demarcate PPDUs.</div><div class='add'>+ *</div><div class='add'>+ *		For such a descriptor, this bit is set to 1 and fields</div><div class='add'>+ *		Reo_level_mpdu_frame_info, mpdu_fragment_number and</div><div class='add'>+ *		Frameless_bar are all set to 0.</div><div class='add'>+ *</div><div class='add'>+ *		Otherwise this bit is set to 0.</div><div class='add'>+ *</div><div class='add'>+ * phy_ppdu_id</div><div class='add'>+ *		A PPDU counter value that PHY increments for every PPDU</div><div class='add'>+ *		received</div><div class='add'>+ *</div><div class='add'>+ *		The counter value wraps around. Some hw RXDMA can be</div><div class='add'>+ *		configured to copy this from the RX_PPDU_START TLV for every</div><div class='add'>+ *		output descriptor.</div><div class='add'>+ *</div><div class='add'>+ * ring_id</div><div class='add'>+ *		For debugging.</div><div class='add'>+ *		This field is filled in by the SRNG module.</div><div class='add'>+ *		It help to identify the ring that is being looked</div><div class='add'>+ *</div><div class='add'>+ * looping_count</div><div class='add'>+ *		For debugging.</div><div class='add'>+ *		This field is filled in by the SRNG module.</div><div class='add'>+ *</div><div class='add'>+ *		A count value that indicates the number of times the</div><div class='add'>+ *		producer of entries into this Ring has looped around the</div><div class='add'>+ *		ring.</div><div class='add'>+ *		At initialization time, this value is set to 0. On the</div><div class='add'>+ *		first loop, this value is set to 1. After the max value is</div><div class='add'>+ *		reached allowed by the number of bits for this field, the</div><div class='add'>+ *		count value continues with 0 again.</div><div class='add'>+ *</div><div class='add'>+ *		In case SW is the consumer of the ring entries, it can</div><div class='add'>+ *		use this field to figure out up to where the producer of</div><div class='add'>+ *		entries has created new entries. This eliminates the need to</div><div class='add'>+ *		check where the head pointer' of the ring is located once</div><div class='add'>+ *		the SW starts processing an interrupt indicating that new</div><div class='add'>+ *		entries have been put into this ring...</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum hal_desc_owner {</div><div class='add'>+	HAL_DESC_OWNER_WBM,</div><div class='add'>+	HAL_DESC_OWNER_SW,</div><div class='add'>+	HAL_DESC_OWNER_TQM,</div><div class='add'>+	HAL_DESC_OWNER_RXDMA,</div><div class='add'>+	HAL_DESC_OWNER_REO,</div><div class='add'>+	HAL_DESC_OWNER_SWITCH,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_desc_buf_type {</div><div class='add'>+	HAL_DESC_BUF_TYPE_TX_MSDU_LINK,</div><div class='add'>+	HAL_DESC_BUF_TYPE_TX_MPDU_LINK,</div><div class='add'>+	HAL_DESC_BUF_TYPE_TX_MPDU_QUEUE_HEAD,</div><div class='add'>+	HAL_DESC_BUF_TYPE_TX_MPDU_QUEUE_EXT,</div><div class='add'>+	HAL_DESC_BUF_TYPE_TX_FLOW,</div><div class='add'>+	HAL_DESC_BUF_TYPE_TX_BUFFER,</div><div class='add'>+	HAL_DESC_BUF_TYPE_RX_MSDU_LINK,</div><div class='add'>+	HAL_DESC_BUF_TYPE_RX_MPDU_LINK,</div><div class='add'>+	HAL_DESC_BUF_TYPE_RX_REO_QUEUE,</div><div class='add'>+	HAL_DESC_BUF_TYPE_RX_REO_QUEUE_EXT,</div><div class='add'>+	HAL_DESC_BUF_TYPE_RX_BUFFER,</div><div class='add'>+	HAL_DESC_BUF_TYPE_IDLE_LINK,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_DESC_REO_OWNED		4</div><div class='add'>+#define HAL_DESC_REO_QUEUE_DESC		8</div><div class='add'>+#define HAL_DESC_REO_QUEUE_EXT_DESC	9</div><div class='add'>+#define HAL_DESC_REO_NON_QOS_TID	16</div><div class='add'>+</div><div class='add'>+#define HAL_DESC_HDR_INFO0_OWNER	GENMASK(3, 0)</div><div class='add'>+#define HAL_DESC_HDR_INFO0_BUF_TYPE	GENMASK(7, 4)</div><div class='add'>+#define HAL_DESC_HDR_INFO0_DBG_RESERVED	GENMASK(31, 8)</div><div class='add'>+</div><div class='add'>+struct hal_desc_header {</div><div class='add'>+	__le32 info0;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hal_rx_mpdu_link_ptr {</div><div class='add'>+	struct ath12k_buffer_addr addr_info;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hal_rx_msdu_details {</div><div class='add'>+	struct ath12k_buffer_addr buf_addr_info;</div><div class='add'>+	struct rx_msdu_desc rx_msdu_info;</div><div class='add'>+	struct rx_msdu_ext_desc rx_msdu_ext_info;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_RX_MSDU_LNK_INFO0_RX_QUEUE_NUMBER		GENMASK(15, 0)</div><div class='add'>+#define HAL_RX_MSDU_LNK_INFO0_FIRST_MSDU_LNK		BIT(16)</div><div class='add'>+</div><div class='add'>+struct hal_rx_msdu_link {</div><div class='add'>+	struct hal_desc_header desc_hdr;</div><div class='add'>+	struct ath12k_buffer_addr buf_addr_info;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 pn[4];</div><div class='add'>+	struct hal_rx_msdu_details msdu_link[6];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hal_rx_reo_queue_ext {</div><div class='add'>+	struct hal_desc_header desc_hdr;</div><div class='add'>+	__le32 rsvd;</div><div class='add'>+	struct hal_rx_mpdu_link_ptr mpdu_link[15];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_rx_reo_queue_ext</div><div class='add'>+ *	Consumer: REO</div><div class='add'>+ *	Producer: REO</div><div class='add'>+ *</div><div class='add'>+ * descriptor_header</div><div class='add'>+ *	Details about which module owns this struct.</div><div class='add'>+ *</div><div class='add'>+ * mpdu_link</div><div class='add'>+ *	Pointer to the next MPDU_link descriptor in the MPDU queue.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum hal_rx_reo_queue_pn_size {</div><div class='add'>+	HAL_RX_REO_QUEUE_PN_SIZE_24,</div><div class='add'>+	HAL_RX_REO_QUEUE_PN_SIZE_48,</div><div class='add'>+	HAL_RX_REO_QUEUE_PN_SIZE_128,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_RX_REO_QUEUE_RX_QUEUE_NUMBER		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO0_VLD			BIT(0)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO0_ASSOC_LNK_DESC_COUNTER	GENMASK(2, 1)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO0_DIS_DUP_DETECTION	BIT(3)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO0_SOFT_REORDER_EN		BIT(4)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO0_AC			GENMASK(6, 5)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO0_BAR			BIT(7)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO0_RETRY			BIT(8)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO0_CHECK_2K_MODE		BIT(9)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO0_OOR_MODE			BIT(10)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO0_BA_WINDOW_SIZE		GENMASK(20, 11)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO0_PN_CHECK			BIT(21)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO0_EVEN_PN			BIT(22)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO0_UNEVEN_PN		BIT(23)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO0_PN_HANDLE_ENABLE		BIT(24)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO0_PN_SIZE			GENMASK(26, 25)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO0_IGNORE_AMPDU_FLG		BIT(27)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO1_SVLD			BIT(0)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO1_SSN			GENMASK(12, 1)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO1_CURRENT_IDX		GENMASK(22, 13)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO1_SEQ_2K_ERR		BIT(23)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO1_PN_ERR			BIT(24)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO1_PN_VALID			BIT(31)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO2_MPDU_COUNT		GENMASK(6, 0)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO2_MSDU_COUNT		(31, 7)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO3_TIMEOUT_COUNT		GENMASK(9, 4)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO3_FWD_DUE_TO_BAR_CNT	GENMASK(15, 10)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO3_DUPLICATE_COUNT		GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO4_FRAME_IN_ORD_COUNT	GENMASK(23, 0)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO4_BAR_RECVD_COUNT		GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO5_LATE_RX_MPDU_COUNT	GENMASK(11, 0)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO5_WINDOW_JUMP_2K		GENMASK(15, 12)</div><div class='add'>+#define HAL_RX_REO_QUEUE_INFO5_HOLE_COUNT		GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+struct hal_rx_reo_queue {</div><div class='add'>+	struct hal_desc_header desc_hdr;</div><div class='add'>+	__le32 rx_queue_num;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 pn[4];</div><div class='add'>+	__le32 last_rx_enqueue_timestamp;</div><div class='add'>+	__le32 last_rx_dequeue_timestamp;</div><div class='add'>+	__le32 next_aging_queue[2];</div><div class='add'>+	__le32 prev_aging_queue[2];</div><div class='add'>+	__le32 rx_bitmap[9];</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le32 info3;</div><div class='add'>+	__le32 info4;</div><div class='add'>+	__le32 processed_mpdus;</div><div class='add'>+	__le32 processed_msdus;</div><div class='add'>+	__le32 processed_total_bytes;</div><div class='add'>+	__le32 info5;</div><div class='add'>+	__le32 rsvd[2];</div><div class='add'>+	struct hal_rx_reo_queue_ext ext_desc[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_rx_reo_queue</div><div class='add'>+ *</div><div class='add'>+ * descriptor_header</div><div class='add'>+ *	Details about which module owns this struct. Note that sub field</div><div class='add'>+ *	Buffer_type shall be set to receive_reo_queue_descriptor.</div><div class='add'>+ *</div><div class='add'>+ * receive_queue_number</div><div class='add'>+ *	Indicates the MPDU queue ID to which this MPDU link descriptor belongs.</div><div class='add'>+ *</div><div class='add'>+ * vld</div><div class='add'>+ *	Valid bit indicating a session is established and the queue descriptor</div><div class='add'>+ *	is valid.</div><div class='add'>+ * associated_link_descriptor_counter</div><div class='add'>+ *	Indicates which of the 3 link descriptor counters shall be incremented</div><div class='add'>+ *	or decremented when link descriptors are added or removed from this</div><div class='add'>+ *	flow queue.</div><div class='add'>+ * disable_duplicate_detection</div><div class='add'>+ *	When set, do not perform any duplicate detection.</div><div class='add'>+ * soft_reorder_enable</div><div class='add'>+ *	When set, REO has been instructed to not perform the actual re-ordering</div><div class='add'>+ *	of frames for this queue, but just to insert the reorder opcodes.</div><div class='add'>+ * ac</div><div class='add'>+ *	Indicates the access category of the queue descriptor.</div><div class='add'>+ * bar</div><div class='add'>+ *	Indicates if BAR has been received.</div><div class='add'>+ * retry</div><div class='add'>+ *	Retry bit is checked if this bit is set.</div><div class='add'>+ * chk_2k_mode</div><div class='add'>+ *	Indicates what type of operation is expected from Reo when the received</div><div class='add'>+ *	frame SN falls within the 2K window.</div><div class='add'>+ * oor_mode</div><div class='add'>+ *	Indicates what type of operation is expected when the received frame</div><div class='add'>+ *	falls within the OOR window.</div><div class='add'>+ * ba_window_size</div><div class='add'>+ *	Indicates the negotiated (window size + 1). Max of 256 bits.</div><div class='add'>+ *</div><div class='add'>+ *	A value 255 means 256 bitmap, 63 means 64 bitmap, 0 (means non-BA</div><div class='add'>+ *	session, with window size of 0). The 3 values here are the main values</div><div class='add'>+ *	validated, but other values should work as well.</div><div class='add'>+ *</div><div class='add'>+ *	A BA window size of 0 (=&gt; one frame entry bitmat), means that there is</div><div class='add'>+ *	no additional rx_reo_queue_ext desc. following rx_reo_queue in memory.</div><div class='add'>+ *	A BA window size of 1 - 105, means that there is 1 rx_reo_queue_ext.</div><div class='add'>+ *	A BA window size of 106 - 210, means that there are 2 rx_reo_queue_ext.</div><div class='add'>+ *	A BA window size of 211 - 256, means that there are 3 rx_reo_queue_ext.</div><div class='add'>+ * pn_check_needed, pn_shall_be_even, pn_shall_be_uneven, pn_handling_enable,</div><div class='add'>+ * pn_size</div><div class='add'>+ *	REO shall perform the PN increment check, even number check, uneven</div><div class='add'>+ *	number check, PN error check and size of the PN field check.</div><div class='add'>+ * ignore_ampdu_flag</div><div class='add'>+ *	REO shall ignore the ampdu_flag on entrance descriptor for this queue.</div><div class='add'>+ *</div><div class='add'>+ * svld</div><div class='add'>+ *	Sequence number in next field is valid one.</div><div class='add'>+ * ssn</div><div class='add'>+ *	 Starting Sequence number of the session.</div><div class='add'>+ * current_index</div><div class='add'>+ *	Points to last forwarded packet</div><div class='add'>+ * seq_2k_error_detected_flag</div><div class='add'>+ *	REO has detected a 2k error jump in the sequence number and from that</div><div class='add'>+ *	moment forward, all new frames are forwarded directly to FW, without</div><div class='add'>+ *	duplicate detect, reordering, etc.</div><div class='add'>+ * pn_error_detected_flag</div><div class='add'>+ *	REO has detected a PN error.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_QUEUE_ADDR_HI		GENMASK(7, 0)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_RX_QUEUE_NUM		BIT(8)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_VLD			BIT(9)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_ASSOC_LNK_DESC_CNT	BIT(10)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_DIS_DUP_DETECTION	BIT(11)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_SOFT_REORDER_EN		BIT(12)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_AC			BIT(13)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_BAR			BIT(14)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_RETRY			BIT(15)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_CHECK_2K_MODE		BIT(16)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_OOR_MODE			BIT(17)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_BA_WINDOW_SIZE		BIT(18)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_PN_CHECK			BIT(19)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_EVEN_PN			BIT(20)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_UNEVEN_PN		BIT(21)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_PN_HANDLE_ENABLE		BIT(22)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_PN_SIZE			BIT(23)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_IGNORE_AMPDU_FLG		BIT(24)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_SVLD			BIT(25)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_SSN			BIT(26)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_SEQ_2K_ERR		BIT(27)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_PN_ERR			BIT(28)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_PN_VALID			BIT(29)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO0_UPD_PN			BIT(30)</div><div class='add'>+</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO1_RX_QUEUE_NUMBER		GENMASK(15, 0)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO1_VLD				BIT(16)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO1_ASSOC_LNK_DESC_COUNTER	GENMASK(18, 17)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO1_DIS_DUP_DETECTION		BIT(19)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO1_SOFT_REORDER_EN		BIT(20)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO1_AC				GENMASK(22, 21)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO1_BAR				BIT(23)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO1_RETRY			BIT(24)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO1_CHECK_2K_MODE		BIT(25)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO1_OOR_MODE			BIT(26)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO1_PN_CHECK			BIT(27)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO1_EVEN_PN			BIT(28)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO1_UNEVEN_PN			BIT(29)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO1_PN_HANDLE_ENABLE		BIT(30)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO1_IGNORE_AMPDU_FLG		BIT(31)</div><div class='add'>+</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO2_BA_WINDOW_SIZE		GENMASK(9, 0)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO2_PN_SIZE			GENMASK(11, 10)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO2_SVLD				BIT(12)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO2_SSN				GENMASK(24, 13)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO2_SEQ_2K_ERR			BIT(25)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO2_PN_ERR			BIT(26)</div><div class='add'>+#define HAL_REO_UPD_RX_QUEUE_INFO2_PN_VALID			BIT(27)</div><div class='add'>+</div><div class='add'>+struct hal_reo_update_rx_queue {</div><div class='add'>+	struct hal_reo_cmd_hdr cmd;</div><div class='add'>+	__le32 queue_addr_lo;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le32 pn[4];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hal_rx_reo_queue_1k {</div><div class='add'>+	struct hal_desc_header desc_hdr;</div><div class='add'>+	__le32 rx_bitmap_1023_288[23];</div><div class='add'>+	__le32 reserved[8];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_REO_UNBLOCK_CACHE_INFO0_UNBLK_CACHE		BIT(0)</div><div class='add'>+#define HAL_REO_UNBLOCK_CACHE_INFO0_RESOURCE_IDX	GENMASK(2, 1)</div><div class='add'>+</div><div class='add'>+struct hal_reo_unblock_cache {</div><div class='add'>+	struct hal_reo_cmd_hdr cmd;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 rsvd[7];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum hal_reo_exec_status {</div><div class='add'>+	HAL_REO_EXEC_STATUS_SUCCESS,</div><div class='add'>+	HAL_REO_EXEC_STATUS_BLOCKED,</div><div class='add'>+	HAL_REO_EXEC_STATUS_FAILED,</div><div class='add'>+	HAL_REO_EXEC_STATUS_RESOURCE_BLOCKED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_REO_STATUS_HDR_INFO0_STATUS_NUM	GENMASK(15, 0)</div><div class='add'>+#define HAL_REO_STATUS_HDR_INFO0_EXEC_TIME	GENMASK(25, 16)</div><div class='add'>+#define HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS	GENMASK(27, 26)</div><div class='add'>+</div><div class='add'>+struct hal_reo_status_hdr {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 timestamp;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_reo_status_hdr</div><div class='add'>+ *		Producer: REO</div><div class='add'>+ *		Consumer: SW</div><div class='add'>+ *</div><div class='add'>+ * status_num</div><div class='add'>+ *		The value in this field is equal to value of the reo command</div><div class='add'>+ *		number. This field helps to correlate the statuses with the REO</div><div class='add'>+ *		commands.</div><div class='add'>+ *</div><div class='add'>+ * execution_time (in us)</div><div class='add'>+ *		The amount of time REO took to execute the command. Note that</div><div class='add'>+ *		this time does not include the duration of the command waiting</div><div class='add'>+ *		in the command ring, before the execution started.</div><div class='add'>+ *</div><div class='add'>+ * execution_status</div><div class='add'>+ *		Execution status of the command. Values are defined in</div><div class='add'>+ *		enum %HAL_REO_EXEC_STATUS_.</div><div class='add'>+ */</div><div class='add'>+#define HAL_REO_GET_QUEUE_STATS_STATUS_INFO0_SSN		GENMASK(11, 0)</div><div class='add'>+#define HAL_REO_GET_QUEUE_STATS_STATUS_INFO0_CUR_IDX		GENMASK(21, 12)</div><div class='add'>+</div><div class='add'>+#define HAL_REO_GET_QUEUE_STATS_STATUS_INFO1_MPDU_COUNT		GENMASK(6, 0)</div><div class='add'>+#define HAL_REO_GET_QUEUE_STATS_STATUS_INFO1_MSDU_COUNT		GENMASK(31, 7)</div><div class='add'>+</div><div class='add'>+#define HAL_REO_GET_QUEUE_STATS_STATUS_INFO2_WINDOW_JMP2K	GENMASK(3, 0)</div><div class='add'>+#define HAL_REO_GET_QUEUE_STATS_STATUS_INFO2_TIMEOUT_COUNT	GENMASK(9, 4)</div><div class='add'>+#define HAL_REO_GET_QUEUE_STATS_STATUS_INFO2_FDTB_COUNT		GENMASK(15, 10)</div><div class='add'>+#define HAL_REO_GET_QUEUE_STATS_STATUS_INFO2_DUPLICATE_COUNT	GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define HAL_REO_GET_QUEUE_STATS_STATUS_INFO3_FIO_COUNT		GENMASK(23, 0)</div><div class='add'>+#define HAL_REO_GET_QUEUE_STATS_STATUS_INFO3_BAR_RCVD_CNT	GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+#define HAL_REO_GET_QUEUE_STATS_STATUS_INFO4_LATE_RX_MPDU	GENMASK(11, 0)</div><div class='add'>+#define HAL_REO_GET_QUEUE_STATS_STATUS_INFO4_HOLE_COUNT		GENMASK(27, 12)</div><div class='add'>+</div><div class='add'>+#define HAL_REO_GET_QUEUE_STATS_STATUS_INFO5_LOOPING_CNT	GENMASK(31, 28)</div><div class='add'>+</div><div class='add'>+struct hal_reo_get_queue_stats_status {</div><div class='add'>+	struct hal_reo_status_hdr hdr;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 pn[4];</div><div class='add'>+	__le32 last_rx_enqueue_timestamp;</div><div class='add'>+	__le32 last_rx_dequeue_timestamp;</div><div class='add'>+	__le32 rx_bitmap[9];</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le32 info3;</div><div class='add'>+	__le32 num_mpdu_frames;</div><div class='add'>+	__le32 num_msdu_frames;</div><div class='add'>+	__le32 total_bytes;</div><div class='add'>+	__le32 info4;</div><div class='add'>+	__le32 info5;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_reo_get_queue_stats_status</div><div class='add'>+ *		Producer: REO</div><div class='add'>+ *		Consumer: SW</div><div class='add'>+ *</div><div class='add'>+ * status_hdr</div><div class='add'>+ *		Details that can link this status with the original command. It</div><div class='add'>+ *		also contains info on how long REO took to execute this command.</div><div class='add'>+ *</div><div class='add'>+ * ssn</div><div class='add'>+ *		Starting Sequence number of the session, this changes whenever</div><div class='add'>+ *		window moves (can be filled by SW then maintained by REO).</div><div class='add'>+ *</div><div class='add'>+ * current_index</div><div class='add'>+ *		Points to last forwarded packet.</div><div class='add'>+ *</div><div class='add'>+ * pn</div><div class='add'>+ *		Bits of the PN number.</div><div class='add'>+ *</div><div class='add'>+ * last_rx_enqueue_timestamp</div><div class='add'>+ * last_rx_dequeue_timestamp</div><div class='add'>+ *		Timestamp of arrival of the last MPDU for this queue and</div><div class='add'>+ *		Timestamp of forwarding an MPDU accordingly.</div><div class='add'>+ *</div><div class='add'>+ * rx_bitmap</div><div class='add'>+ *		When a bit is set, the corresponding frame is currently held</div><div class='add'>+ *		in the re-order queue. The bitmap  is Fully managed by HW.</div><div class='add'>+ *</div><div class='add'>+ * current_mpdu_count</div><div class='add'>+ * current_msdu_count</div><div class='add'>+ *		The number of MPDUs and MSDUs in the queue.</div><div class='add'>+ *</div><div class='add'>+ * timeout_count</div><div class='add'>+ *		The number of times REO started forwarding frames even though</div><div class='add'>+ *		there is a hole in the bitmap. Forwarding reason is timeout.</div><div class='add'>+ *</div><div class='add'>+ * forward_due_to_bar_count</div><div class='add'>+ *		The number of times REO started forwarding frames even though</div><div class='add'>+ *		there is a hole in the bitmap. Fwd reason is reception of BAR.</div><div class='add'>+ *</div><div class='add'>+ * duplicate_count</div><div class='add'>+ *		The number of duplicate frames that have been detected.</div><div class='add'>+ *</div><div class='add'>+ * frames_in_order_count</div><div class='add'>+ *		The number of frames that have been received in order (without</div><div class='add'>+ *		a hole that prevented them from being forwarded immediately).</div><div class='add'>+ *</div><div class='add'>+ * bar_received_count</div><div class='add'>+ *		The number of times a BAR frame is received.</div><div class='add'>+ *</div><div class='add'>+ * mpdu_frames_processed_count</div><div class='add'>+ * msdu_frames_processed_count</div><div class='add'>+ *		The total number of MPDU/MSDU frames that have been processed.</div><div class='add'>+ *</div><div class='add'>+ * total_bytes</div><div class='add'>+ *		An approximation of the number of bytes received for this queue.</div><div class='add'>+ *</div><div class='add'>+ * late_receive_mpdu_count</div><div class='add'>+ *		The number of MPDUs received after the window had already moved</div><div class='add'>+ *		on. The 'late' sequence window is defined as</div><div class='add'>+ *		(Window SSN - 256) - (Window SSN - 1).</div><div class='add'>+ *</div><div class='add'>+ * window_jump_2k</div><div class='add'>+ *		The number of times the window moved more than 2K</div><div class='add'>+ *</div><div class='add'>+ * hole_count</div><div class='add'>+ *		The number of times a hole was created in the receive bitmap.</div><div class='add'>+ *</div><div class='add'>+ * looping_count</div><div class='add'>+ *		A count value that indicates the number of times the producer of</div><div class='add'>+ *		entries into this Ring has looped around the ring.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HAL_REO_STATUS_LOOP_CNT			GENMASK(31, 28)</div><div class='add'>+</div><div class='add'>+#define HAL_REO_FLUSH_QUEUE_INFO0_ERR_DETECTED	BIT(0)</div><div class='add'>+#define HAL_REO_FLUSH_QUEUE_INFO0_RSVD		GENMASK(31, 1)</div><div class='add'>+#define HAL_REO_FLUSH_QUEUE_INFO1_RSVD		GENMASK(27, 0)</div><div class='add'>+</div><div class='add'>+struct hal_reo_flush_queue_status {</div><div class='add'>+	struct hal_reo_status_hdr hdr;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 rsvd0[21];</div><div class='add'>+	__le32 info1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_reo_flush_queue_status</div><div class='add'>+ *		Producer: REO</div><div class='add'>+ *		Consumer: SW</div><div class='add'>+ *</div><div class='add'>+ * status_hdr</div><div class='add'>+ *		Details that can link this status with the original command. It</div><div class='add'>+ *		also contains info on how long REO took to execute this command.</div><div class='add'>+ *</div><div class='add'>+ * error_detected</div><div class='add'>+ *		Status of blocking resource</div><div class='add'>+ *</div><div class='add'>+ *		0 - No error has been detected while executing this command</div><div class='add'>+ *		1 - Error detected. The resource to be used for blocking was</div><div class='add'>+ *		    already in use.</div><div class='add'>+ *</div><div class='add'>+ * looping_count</div><div class='add'>+ *		A count value that indicates the number of times the producer of</div><div class='add'>+ *		entries into this Ring has looped around the ring.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HAL_REO_FLUSH_CACHE_STATUS_INFO0_IS_ERR			BIT(0)</div><div class='add'>+#define HAL_REO_FLUSH_CACHE_STATUS_INFO0_BLOCK_ERR_CODE		GENMASK(2, 1)</div><div class='add'>+#define HAL_REO_FLUSH_CACHE_STATUS_INFO0_FLUSH_STATUS_HIT	BIT(8)</div><div class='add'>+#define HAL_REO_FLUSH_CACHE_STATUS_INFO0_FLUSH_DESC_TYPE	GENMASK(11, 9)</div><div class='add'>+#define HAL_REO_FLUSH_CACHE_STATUS_INFO0_FLUSH_CLIENT_ID	GENMASK(15, 12)</div><div class='add'>+#define HAL_REO_FLUSH_CACHE_STATUS_INFO0_FLUSH_ERR		GENMASK(17, 16)</div><div class='add'>+#define HAL_REO_FLUSH_CACHE_STATUS_INFO0_FLUSH_COUNT		GENMASK(25, 18)</div><div class='add'>+</div><div class='add'>+struct hal_reo_flush_cache_status {</div><div class='add'>+	struct hal_reo_status_hdr hdr;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 rsvd0[21];</div><div class='add'>+	__le32 info1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_reo_flush_cache_status</div><div class='add'>+ *		Producer: REO</div><div class='add'>+ *		Consumer: SW</div><div class='add'>+ *</div><div class='add'>+ * status_hdr</div><div class='add'>+ *		Details that can link this status with the original command. It</div><div class='add'>+ *		also contains info on how long REO took to execute this command.</div><div class='add'>+ *</div><div class='add'>+ * error_detected</div><div class='add'>+ *		Status for blocking resource handling</div><div class='add'>+ *</div><div class='add'>+ *		0 - No error has been detected while executing this command</div><div class='add'>+ *		1 - An error in the blocking resource management was detected</div><div class='add'>+ *</div><div class='add'>+ * block_error_details</div><div class='add'>+ *		only valid when error_detected is set</div><div class='add'>+ *</div><div class='add'>+ *		0 - No blocking related errors found</div><div class='add'>+ *		1 - Blocking resource is already in use</div><div class='add'>+ *		2 - Resource requested to be unblocked, was not blocked</div><div class='add'>+ *</div><div class='add'>+ * cache_controller_flush_status_hit</div><div class='add'>+ *		The status that the cache controller returned on executing the</div><div class='add'>+ *		flush command.</div><div class='add'>+ *</div><div class='add'>+ *		0 - miss; 1 - hit</div><div class='add'>+ *</div><div class='add'>+ * cache_controller_flush_status_desc_type</div><div class='add'>+ *		Flush descriptor type</div><div class='add'>+ *</div><div class='add'>+ * cache_controller_flush_status_client_id</div><div class='add'>+ *		Module who made the flush request</div><div class='add'>+ *</div><div class='add'>+ *		In REO, this is always 0</div><div class='add'>+ *</div><div class='add'>+ * cache_controller_flush_status_error</div><div class='add'>+ *		Error condition</div><div class='add'>+ *</div><div class='add'>+ *		0 - No error found</div><div class='add'>+ *		1 - HW interface is still busy</div><div class='add'>+ *		2 - Line currently locked. Used for one line flush command</div><div class='add'>+ *		3 - At least one line is still locked.</div><div class='add'>+ *		    Used for cache flush command.</div><div class='add'>+ *</div><div class='add'>+ * cache_controller_flush_count</div><div class='add'>+ *		The number of lines that were actually flushed out</div><div class='add'>+ *</div><div class='add'>+ * looping_count</div><div class='add'>+ *		A count value that indicates the number of times the producer of</div><div class='add'>+ *		entries into this Ring has looped around the ring.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HAL_REO_UNBLOCK_CACHE_STATUS_INFO0_IS_ERR	BIT(0)</div><div class='add'>+#define HAL_REO_UNBLOCK_CACHE_STATUS_INFO0_TYPE		BIT(1)</div><div class='add'>+</div><div class='add'>+struct hal_reo_unblock_cache_status {</div><div class='add'>+	struct hal_reo_status_hdr hdr;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 rsvd0[21];</div><div class='add'>+	__le32 info1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_reo_unblock_cache_status</div><div class='add'>+ *		Producer: REO</div><div class='add'>+ *		Consumer: SW</div><div class='add'>+ *</div><div class='add'>+ * status_hdr</div><div class='add'>+ *		Details that can link this status with the original command. It</div><div class='add'>+ *		also contains info on how long REO took to execute this command.</div><div class='add'>+ *</div><div class='add'>+ * error_detected</div><div class='add'>+ *		0 - No error has been detected while executing this command</div><div class='add'>+ *		1 - The blocking resource was not in use, and therefore it could</div><div class='add'>+ *		    not be unblocked.</div><div class='add'>+ *</div><div class='add'>+ * unblock_type</div><div class='add'>+ *		Reference to the type of unblock command</div><div class='add'>+ *		0 - Unblock a blocking resource</div><div class='add'>+ *		1 - The entire cache usage is unblock</div><div class='add'>+ *</div><div class='add'>+ * looping_count</div><div class='add'>+ *		A count value that indicates the number of times the producer of</div><div class='add'>+ *		entries into this Ring has looped around the ring.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HAL_REO_FLUSH_TIMEOUT_STATUS_INFO0_IS_ERR		BIT(0)</div><div class='add'>+#define HAL_REO_FLUSH_TIMEOUT_STATUS_INFO0_LIST_EMPTY		BIT(1)</div><div class='add'>+</div><div class='add'>+#define HAL_REO_FLUSH_TIMEOUT_STATUS_INFO1_REL_DESC_COUNT	GENMASK(15, 0)</div><div class='add'>+#define HAL_REO_FLUSH_TIMEOUT_STATUS_INFO1_FWD_BUF_COUNT	GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+struct hal_reo_flush_timeout_list_status {</div><div class='add'>+	struct hal_reo_status_hdr hdr;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 rsvd0[20];</div><div class='add'>+	__le32 info2;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_reo_flush_timeout_list_status</div><div class='add'>+ *		Producer: REO</div><div class='add'>+ *		Consumer: SW</div><div class='add'>+ *</div><div class='add'>+ * status_hdr</div><div class='add'>+ *		Details that can link this status with the original command. It</div><div class='add'>+ *		also contains info on how long REO took to execute this command.</div><div class='add'>+ *</div><div class='add'>+ * error_detected</div><div class='add'>+ *		0 - No error has been detected while executing this command</div><div class='add'>+ *		1 - Command not properly executed and returned with error</div><div class='add'>+ *</div><div class='add'>+ * timeout_list_empty</div><div class='add'>+ *		When set, REO has depleted the timeout list and all entries are</div><div class='add'>+ *		gone.</div><div class='add'>+ *</div><div class='add'>+ * release_desc_count</div><div class='add'>+ *		Producer: SW; Consumer: REO</div><div class='add'>+ *		The number of link descriptor released</div><div class='add'>+ *</div><div class='add'>+ * forward_buf_count</div><div class='add'>+ *		Producer: SW; Consumer: REO</div><div class='add'>+ *		The number of buffers forwarded to the REO destination rings</div><div class='add'>+ *</div><div class='add'>+ * looping_count</div><div class='add'>+ *		A count value that indicates the number of times the producer of</div><div class='add'>+ *		entries into this Ring has looped around the ring.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HAL_REO_DESC_THRESH_STATUS_INFO0_THRESH_INDEX		GENMASK(1, 0)</div><div class='add'>+#define HAL_REO_DESC_THRESH_STATUS_INFO1_LINK_DESC_COUNTER0	GENMASK(23, 0)</div><div class='add'>+#define HAL_REO_DESC_THRESH_STATUS_INFO2_LINK_DESC_COUNTER1	GENMASK(23, 0)</div><div class='add'>+#define HAL_REO_DESC_THRESH_STATUS_INFO3_LINK_DESC_COUNTER2	GENMASK(23, 0)</div><div class='add'>+#define HAL_REO_DESC_THRESH_STATUS_INFO4_LINK_DESC_COUNTER_SUM	GENMASK(25, 0)</div><div class='add'>+</div><div class='add'>+struct hal_reo_desc_thresh_reached_status {</div><div class='add'>+	struct hal_reo_status_hdr hdr;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le32 info3;</div><div class='add'>+	__le32 info4;</div><div class='add'>+	__le32 rsvd0[17];</div><div class='add'>+	__le32 info5;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_reo_desc_thresh_reached_status</div><div class='add'>+ *		Producer: REO</div><div class='add'>+ *		Consumer: SW</div><div class='add'>+ *</div><div class='add'>+ * status_hdr</div><div class='add'>+ *		Details that can link this status with the original command. It</div><div class='add'>+ *		also contains info on how long REO took to execute this command.</div><div class='add'>+ *</div><div class='add'>+ * threshold_index</div><div class='add'>+ *		The index of the threshold register whose value got reached</div><div class='add'>+ *</div><div class='add'>+ * link_descriptor_counter0</div><div class='add'>+ * link_descriptor_counter1</div><div class='add'>+ * link_descriptor_counter2</div><div class='add'>+ * link_descriptor_counter_sum</div><div class='add'>+ *		Value of the respective counters at generation of this message</div><div class='add'>+ *</div><div class='add'>+ * looping_count</div><div class='add'>+ *		A count value that indicates the number of times the producer of</div><div class='add'>+ *		entries into this Ring has looped around the ring.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HAL_TCL_ENTRANCE_FROM_PPE_RING_INFO0_DATA_LENGTH	GENMASK(13, 0)</div><div class='add'>+#define HAL_TCL_ENTRANCE_FROM_PPE_RING_INFO0_L4_CSUM_STATUS	BIT(14)</div><div class='add'>+#define HAL_TCL_ENTRANCE_FROM_PPE_RING_INFO0_L3_CSUM_STATUS	BIT(15)</div><div class='add'>+#define HAL_TCL_ENTRANCE_FROM_PPE_RING_INFO0_PID		GENMASK(27, 24)</div><div class='add'>+#define HAL_TCL_ENTRANCE_FROM_PPE_RING_INFO0_QDISC		BIT(28)</div><div class='add'>+#define HAL_TCL_ENTRANCE_FROM_PPE_RING_INFO0_MULTICAST	BIT(29)</div><div class='add'>+#define HAL_TCL_ENTRANCE_FROM_PPE_RING_INFO0_MORE		BIT(30)</div><div class='add'>+#define HAL_TCL_ENTRANCE_FROM_PPE_RING_INFO0_VALID_TOGGLE	BIT(31)</div><div class='add'>+</div><div class='add'>+struct hal_tcl_entrance_from_ppe_ring {</div><div class='add'>+	__le32 buffer_addr;</div><div class='add'>+	__le32 info0;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hal_mon_buf_ring {</div><div class='add'>+	__le32 paddr_lo;</div><div class='add'>+	__le32 paddr_hi;</div><div class='add'>+	__le64 cookie;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hal_mon_buf_ring</div><div class='add'>+ *	Producer : SW</div><div class='add'>+ *	Consumer : Monitor</div><div class='add'>+ *</div><div class='add'>+ * paddr_lo</div><div class='add'>+ *	Lower 32-bit physical address of the buffer pointer from the source ring.</div><div class='add'>+ * paddr_hi</div><div class='add'>+ *	bit range 7-0 : upper 8 bit of the physical address.</div><div class='add'>+ *	bit range 31-8 : reserved.</div><div class='add'>+ * cookie</div><div class='add'>+ *	Consumer: RxMon/TxMon 64 bit cookie of the buffers.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HAL_MON_DEST_COOKIE_BUF_ID      GENMASK(17, 0)</div><div class='add'>+</div><div class='add'>+#define HAL_MON_DEST_INFO0_END_OFFSET		GENMASK(11, 0)</div><div class='add'>+#define HAL_MON_DEST_INFO0_END_REASON		GENMASK(17, 16)</div><div class='add'>+#define HAL_MON_DEST_INFO0_INITIATOR		BIT(18)</div><div class='add'>+#define HAL_MON_DEST_INFO0_EMPTY_DESC		BIT(19)</div><div class='add'>+#define HAL_MON_DEST_INFO0_RING_ID		GENMASK(27, 20)</div><div class='add'>+#define HAL_MON_DEST_INFO0_LOOPING_COUNT	GENMASK(31, 28)</div><div class='add'>+</div><div class='add'>+struct hal_mon_dest_desc {</div><div class='add'>+	__le32 cookie;</div><div class='add'>+	__le32 reserved;</div><div class='add'>+	__le32 ppdu_id;</div><div class='add'>+	__le32 info0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hal_mon_dest_ring</div><div class='add'>+ *	Producer : TxMon/RxMon</div><div class='add'>+ *	Consumer : SW</div><div class='add'>+ * cookie</div><div class='add'>+ *	bit 0 -17 buf_id to track the skb's vaddr.</div><div class='add'>+ * ppdu_id</div><div class='add'>+ *	Phy ppdu_id</div><div class='add'>+ * end_offset</div><div class='add'>+ *	The offset into status buffer where DMA ended, ie., offset to the last</div><div class='add'>+ *	TLV + last TLV size.</div><div class='add'>+ * flush_detected</div><div class='add'>+ *	Indicates whether 'tx_flush' or 'rx_flush' occurred.</div><div class='add'>+ * end_of_ppdu</div><div class='add'>+ *	Indicates end of ppdu.</div><div class='add'>+ * pmac_id</div><div class='add'>+ *	Indicates PMAC that received from frame.</div><div class='add'>+ * empty_descriptor</div><div class='add'>+ *	This descriptor is written on flush or end of ppdu or end of status</div><div class='add'>+ *	buffer.</div><div class='add'>+ * ring_id</div><div class='add'>+ *	updated by SRNG.</div><div class='add'>+ * looping_count</div><div class='add'>+ *	updated by SRNG.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HAL_TX_MSDU_METADATA_INFO0_ENCRYPT_FLAG		BIT(8)</div><div class='add'>+#define HAL_TX_MSDU_METADATA_INFO0_ENCRYPT_TYPE		GENMASK(16, 15)</div><div class='add'>+#define HAL_TX_MSDU_METADATA_INFO0_HOST_TX_DESC_POOL	BIT(31)</div><div class='add'>+</div><div class='add'>+struct hal_tx_msdu_metadata {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 rsvd0[6];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hal_tx_msdu_metadata</div><div class='add'>+ * valid_encrypt_type</div><div class='add'>+ *		if set, encrypt type is valid</div><div class='add'>+ * encrypt_type</div><div class='add'>+ *		0 = NO_ENCRYPT,</div><div class='add'>+ *		1 = ENCRYPT,</div><div class='add'>+ *		2 ~ 3 - Reserved</div><div class='add'>+ * host_tx_desc_pool</div><div class='add'>+ *		If set, Firmware allocates tx_descriptors</div><div class='add'>+ *		in WAL_BUFFERID_TX_HOST_DATA_EXP,instead</div><div class='add'>+ *		of WAL_BUFFERID_TX_TCL_DATA_EXP.</div><div class='add'>+ *		Use cases:</div><div class='add'>+ *		Any time firmware uses TQM-BYPASS for Data</div><div class='add'>+ *		TID, firmware expect host to set this bit.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#endif /* ATH12K_HAL_DESC_H */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/hal_rx.c b/drivers/net/wireless/ath/ath12k/hal_rx.c<br/>new file mode 100644<br/>index 000000000000..c4443ca05cd6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/hal_rx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/hal_rx.c</a></div><div class='hunk'>@@ -0,0 +1,947 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "hal.h"</div><div class='add'>+#include "hal_tx.h"</div><div class='add'>+#include "hal_rx.h"</div><div class='add'>+#include "hal_desc.h"</div><div class='add'>+#include "hif.h"</div><div class='add'>+</div><div class='add'>+static void ath12k_hal_reo_set_desc_hdr(struct hal_desc_header *hdr,</div><div class='add'>+					u8 owner, u8 buffer_type, u32 magic)</div><div class='add'>+{</div><div class='add'>+	hdr-&gt;info0 = le32_encode_bits(owner, HAL_DESC_HDR_INFO0_OWNER) |</div><div class='add'>+		     le32_encode_bits(buffer_type, HAL_DESC_HDR_INFO0_BUF_TYPE);</div><div class='add'>+</div><div class='add'>+	/* Magic pattern in reserved bits for debugging */</div><div class='add'>+	hdr-&gt;info0 |= le32_encode_bits(magic, HAL_DESC_HDR_INFO0_DBG_RESERVED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_hal_reo_cmd_queue_stats(struct hal_tlv_64_hdr *tlv,</div><div class='add'>+					  struct ath12k_hal_reo_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct hal_reo_get_queue_stats *desc;</div><div class='add'>+</div><div class='add'>+	tlv-&gt;tl = le64_encode_bits(HAL_REO_GET_QUEUE_STATS, HAL_TLV_HDR_TAG) |</div><div class='add'>+		  le64_encode_bits(sizeof(*desc), HAL_TLV_HDR_LEN);</div><div class='add'>+</div><div class='add'>+	desc = (struct hal_reo_get_queue_stats *)tlv-&gt;value;</div><div class='add'>+	memset_startat(desc, 0, queue_addr_lo);</div><div class='add'>+</div><div class='add'>+	desc-&gt;cmd.info0 &amp;= ~cpu_to_le32(HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED);</div><div class='add'>+	if (cmd-&gt;flag &amp; HAL_REO_CMD_FLG_NEED_STATUS)</div><div class='add'>+		desc-&gt;cmd.info0 |= cpu_to_le32(HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED);</div><div class='add'>+</div><div class='add'>+	desc-&gt;queue_addr_lo = cpu_to_le32(cmd-&gt;addr_lo);</div><div class='add'>+	desc-&gt;info0 = le32_encode_bits(cmd-&gt;addr_hi,</div><div class='add'>+				       HAL_REO_GET_QUEUE_STATS_INFO0_QUEUE_ADDR_HI);</div><div class='add'>+	if (cmd-&gt;flag &amp; HAL_REO_CMD_FLG_STATS_CLEAR)</div><div class='add'>+		desc-&gt;info0 |= cpu_to_le32(HAL_REO_GET_QUEUE_STATS_INFO0_CLEAR_STATS);</div><div class='add'>+</div><div class='add'>+	return le32_get_bits(desc-&gt;cmd.info0, HAL_REO_CMD_HDR_INFO0_CMD_NUMBER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_hal_reo_cmd_flush_cache(struct ath12k_hal *hal,</div><div class='add'>+					  struct hal_tlv_64_hdr *tlv,</div><div class='add'>+					  struct ath12k_hal_reo_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct hal_reo_flush_cache *desc;</div><div class='add'>+	u8 avail_slot = ffz(hal-&gt;avail_blk_resource);</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;flag &amp; HAL_REO_CMD_FLG_FLUSH_BLOCK_LATER) {</div><div class='add'>+		if (avail_slot &gt;= HAL_MAX_AVAIL_BLK_RES)</div><div class='add'>+			return -ENOSPC;</div><div class='add'>+</div><div class='add'>+		hal-&gt;current_blk_index = avail_slot;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tlv-&gt;tl = le64_encode_bits(HAL_REO_FLUSH_CACHE, HAL_TLV_HDR_TAG) |</div><div class='add'>+		  le64_encode_bits(sizeof(*desc), HAL_TLV_HDR_LEN);</div><div class='add'>+</div><div class='add'>+	desc = (struct hal_reo_flush_cache *)tlv-&gt;value;</div><div class='add'>+	memset_startat(desc, 0, cache_addr_lo);</div><div class='add'>+</div><div class='add'>+	desc-&gt;cmd.info0 &amp;= ~cpu_to_le32(HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED);</div><div class='add'>+	if (cmd-&gt;flag &amp; HAL_REO_CMD_FLG_NEED_STATUS)</div><div class='add'>+		desc-&gt;cmd.info0 |= cpu_to_le32(HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED);</div><div class='add'>+</div><div class='add'>+	desc-&gt;cache_addr_lo = cpu_to_le32(cmd-&gt;addr_lo);</div><div class='add'>+	desc-&gt;info0 = le32_encode_bits(cmd-&gt;addr_hi,</div><div class='add'>+				       HAL_REO_FLUSH_CACHE_INFO0_CACHE_ADDR_HI);</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;flag &amp; HAL_REO_CMD_FLG_FLUSH_FWD_ALL_MPDUS)</div><div class='add'>+		desc-&gt;info0 |= cpu_to_le32(HAL_REO_FLUSH_CACHE_INFO0_FWD_ALL_MPDUS);</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;flag &amp; HAL_REO_CMD_FLG_FLUSH_BLOCK_LATER) {</div><div class='add'>+		desc-&gt;info0 |= cpu_to_le32(HAL_REO_FLUSH_CACHE_INFO0_BLOCK_CACHE_USAGE);</div><div class='add'>+		desc-&gt;info0 |=</div><div class='add'>+			le32_encode_bits(avail_slot,</div><div class='add'>+					 HAL_REO_FLUSH_CACHE_INFO0_BLOCK_RESRC_IDX);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;flag &amp; HAL_REO_CMD_FLG_FLUSH_NO_INVAL)</div><div class='add'>+		desc-&gt;info0 |= cpu_to_le32(HAL_REO_FLUSH_CACHE_INFO0_FLUSH_WO_INVALIDATE);</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;flag &amp; HAL_REO_CMD_FLG_FLUSH_ALL)</div><div class='add'>+		desc-&gt;info0 |= cpu_to_le32(HAL_REO_FLUSH_CACHE_INFO0_FLUSH_ALL);</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;flag &amp; HAL_REO_CMD_FLG_FLUSH_QUEUE_1K_DESC)</div><div class='add'>+		desc-&gt;info0 |= cpu_to_le32(HAL_REO_FLUSH_CACHE_INFO0_FLUSH_QUEUE_1K_DESC);</div><div class='add'>+</div><div class='add'>+	return le32_get_bits(desc-&gt;cmd.info0, HAL_REO_CMD_HDR_INFO0_CMD_NUMBER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_hal_reo_cmd_update_rx_queue(struct hal_tlv_64_hdr *tlv,</div><div class='add'>+					      struct ath12k_hal_reo_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct hal_reo_update_rx_queue *desc;</div><div class='add'>+</div><div class='add'>+	tlv-&gt;tl = le64_encode_bits(HAL_REO_UPDATE_RX_REO_QUEUE, HAL_TLV_HDR_TAG) |</div><div class='add'>+		  le64_encode_bits(sizeof(*desc), HAL_TLV_HDR_LEN);</div><div class='add'>+</div><div class='add'>+	desc = (struct hal_reo_update_rx_queue *)tlv-&gt;value;</div><div class='add'>+	memset_startat(desc, 0, queue_addr_lo);</div><div class='add'>+</div><div class='add'>+	desc-&gt;cmd.info0 &amp;= ~cpu_to_le32(HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED);</div><div class='add'>+	if (cmd-&gt;flag &amp; HAL_REO_CMD_FLG_NEED_STATUS)</div><div class='add'>+		desc-&gt;cmd.info0 |= cpu_to_le32(HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED);</div><div class='add'>+</div><div class='add'>+	desc-&gt;queue_addr_lo = cpu_to_le32(cmd-&gt;addr_lo);</div><div class='add'>+	desc-&gt;info0 =</div><div class='add'>+		le32_encode_bits(cmd-&gt;addr_hi,</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_QUEUE_ADDR_HI) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd0 &amp; HAL_REO_CMD_UPD0_RX_QUEUE_NUM),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_UPD_RX_QUEUE_NUM) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd0 &amp; HAL_REO_CMD_UPD0_VLD),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_UPD_VLD) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd0 &amp; HAL_REO_CMD_UPD0_ALDC),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_UPD_ASSOC_LNK_DESC_CNT) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd0 &amp; HAL_REO_CMD_UPD0_DIS_DUP_DETECTION),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_UPD_DIS_DUP_DETECTION) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd0 &amp; HAL_REO_CMD_UPD0_SOFT_REORDER_EN),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_UPD_SOFT_REORDER_EN) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd0 &amp; HAL_REO_CMD_UPD0_AC),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_UPD_AC) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd0 &amp; HAL_REO_CMD_UPD0_BAR),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_UPD_BAR) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd0 &amp; HAL_REO_CMD_UPD0_RETRY),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_UPD_RETRY) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd0 &amp; HAL_REO_CMD_UPD0_CHECK_2K_MODE),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_UPD_CHECK_2K_MODE) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd0 &amp; HAL_REO_CMD_UPD0_OOR_MODE),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_UPD_OOR_MODE) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd0 &amp; HAL_REO_CMD_UPD0_BA_WINDOW_SIZE),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_UPD_BA_WINDOW_SIZE) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd0 &amp; HAL_REO_CMD_UPD0_PN_CHECK),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_UPD_PN_CHECK) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd0 &amp; HAL_REO_CMD_UPD0_EVEN_PN),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_UPD_EVEN_PN) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd0 &amp; HAL_REO_CMD_UPD0_UNEVEN_PN),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_UPD_UNEVEN_PN) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd0 &amp; HAL_REO_CMD_UPD0_PN_HANDLE_ENABLE),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_UPD_PN_HANDLE_ENABLE) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd0 &amp; HAL_REO_CMD_UPD0_PN_SIZE),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_UPD_PN_SIZE) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd0 &amp; HAL_REO_CMD_UPD0_IGNORE_AMPDU_FLG),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_UPD_IGNORE_AMPDU_FLG) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd0 &amp; HAL_REO_CMD_UPD0_SVLD),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_UPD_SVLD) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd0 &amp; HAL_REO_CMD_UPD0_SSN),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_UPD_SSN) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd0 &amp; HAL_REO_CMD_UPD0_SEQ_2K_ERR),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_UPD_SEQ_2K_ERR) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd0 &amp; HAL_REO_CMD_UPD0_PN_VALID),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_UPD_PN_VALID) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd0 &amp; HAL_REO_CMD_UPD0_PN),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO0_UPD_PN);</div><div class='add'>+</div><div class='add'>+	desc-&gt;info1 =</div><div class='add'>+		le32_encode_bits(cmd-&gt;rx_queue_num,</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO1_RX_QUEUE_NUMBER) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd1 &amp; HAL_REO_CMD_UPD1_VLD),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO1_VLD) |</div><div class='add'>+		le32_encode_bits(u32_get_bits(cmd-&gt;upd1, HAL_REO_CMD_UPD1_ALDC),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO1_ASSOC_LNK_DESC_COUNTER) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd1 &amp; HAL_REO_CMD_UPD1_DIS_DUP_DETECTION),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO1_DIS_DUP_DETECTION) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd1 &amp; HAL_REO_CMD_UPD1_SOFT_REORDER_EN),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO1_SOFT_REORDER_EN) |</div><div class='add'>+		le32_encode_bits(u32_get_bits(cmd-&gt;upd1, HAL_REO_CMD_UPD1_AC),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO1_AC) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd1 &amp; HAL_REO_CMD_UPD1_BAR),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO1_BAR) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd1 &amp; HAL_REO_CMD_UPD1_CHECK_2K_MODE),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO1_CHECK_2K_MODE) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd1 &amp; HAL_REO_CMD_UPD1_RETRY),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO1_RETRY) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd1 &amp; HAL_REO_CMD_UPD1_OOR_MODE),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO1_OOR_MODE) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd1 &amp; HAL_REO_CMD_UPD1_PN_CHECK),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO1_PN_CHECK) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd1 &amp; HAL_REO_CMD_UPD1_EVEN_PN),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO1_EVEN_PN) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd1 &amp; HAL_REO_CMD_UPD1_UNEVEN_PN),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO1_UNEVEN_PN) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd1 &amp; HAL_REO_CMD_UPD1_PN_HANDLE_ENABLE),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO1_PN_HANDLE_ENABLE) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd1 &amp; HAL_REO_CMD_UPD1_IGNORE_AMPDU_FLG),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO1_IGNORE_AMPDU_FLG);</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;pn_size == 24)</div><div class='add'>+		cmd-&gt;pn_size = HAL_RX_REO_QUEUE_PN_SIZE_24;</div><div class='add'>+	else if (cmd-&gt;pn_size == 48)</div><div class='add'>+		cmd-&gt;pn_size = HAL_RX_REO_QUEUE_PN_SIZE_48;</div><div class='add'>+	else if (cmd-&gt;pn_size == 128)</div><div class='add'>+		cmd-&gt;pn_size = HAL_RX_REO_QUEUE_PN_SIZE_128;</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;ba_window_size &lt; 1)</div><div class='add'>+		cmd-&gt;ba_window_size = 1;</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;ba_window_size == 1)</div><div class='add'>+		cmd-&gt;ba_window_size++;</div><div class='add'>+</div><div class='add'>+	desc-&gt;info2 =</div><div class='add'>+		le32_encode_bits(cmd-&gt;ba_window_size - 1,</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO2_BA_WINDOW_SIZE) |</div><div class='add'>+		le32_encode_bits(cmd-&gt;pn_size, HAL_REO_UPD_RX_QUEUE_INFO2_PN_SIZE) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd2 &amp; HAL_REO_CMD_UPD2_SVLD),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO2_SVLD) |</div><div class='add'>+		le32_encode_bits(u32_get_bits(cmd-&gt;upd2, HAL_REO_CMD_UPD2_SSN),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO2_SSN) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd2 &amp; HAL_REO_CMD_UPD2_SEQ_2K_ERR),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO2_SEQ_2K_ERR) |</div><div class='add'>+		le32_encode_bits(!!(cmd-&gt;upd2 &amp; HAL_REO_CMD_UPD2_PN_ERR),</div><div class='add'>+				 HAL_REO_UPD_RX_QUEUE_INFO2_PN_ERR);</div><div class='add'>+</div><div class='add'>+	return le32_get_bits(desc-&gt;cmd.info0, HAL_REO_CMD_HDR_INFO0_CMD_NUMBER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_hal_reo_cmd_send(struct ath12k_base *ab, struct hal_srng *srng,</div><div class='add'>+			    enum hal_reo_cmd_type type,</div><div class='add'>+			    struct ath12k_hal_reo_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct hal_tlv_64_hdr *reo_desc;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_access_begin(ab, srng);</div><div class='add'>+	reo_desc = ath12k_hal_srng_src_get_next_entry(ab, srng);</div><div class='add'>+	if (!reo_desc) {</div><div class='add'>+		ret = -ENOBUFS;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case HAL_REO_CMD_GET_QUEUE_STATS:</div><div class='add'>+		ret = ath12k_hal_reo_cmd_queue_stats(reo_desc, cmd);</div><div class='add'>+		break;</div><div class='add'>+	case HAL_REO_CMD_FLUSH_CACHE:</div><div class='add'>+		ret = ath12k_hal_reo_cmd_flush_cache(&amp;ab-&gt;hal, reo_desc, cmd);</div><div class='add'>+		break;</div><div class='add'>+	case HAL_REO_CMD_UPDATE_RX_QUEUE:</div><div class='add'>+		ret = ath12k_hal_reo_cmd_update_rx_queue(reo_desc, cmd);</div><div class='add'>+		break;</div><div class='add'>+	case HAL_REO_CMD_FLUSH_QUEUE:</div><div class='add'>+	case HAL_REO_CMD_UNBLOCK_CACHE:</div><div class='add'>+	case HAL_REO_CMD_FLUSH_TIMEOUT_LIST:</div><div class='add'>+		ath12k_warn(ab, "Unsupported reo command %d\n", type);</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_warn(ab, "Unknown reo command %d\n", type);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	ath12k_hal_srng_access_end(ab, srng);</div><div class='add'>+	spin_unlock_bh(&amp;srng-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_rx_buf_addr_info_set(struct ath12k_buffer_addr *binfo,</div><div class='add'>+				     dma_addr_t paddr, u32 cookie, u8 manager)</div><div class='add'>+{</div><div class='add'>+	u32 paddr_lo, paddr_hi;</div><div class='add'>+</div><div class='add'>+	paddr_lo = lower_32_bits(paddr);</div><div class='add'>+	paddr_hi = upper_32_bits(paddr);</div><div class='add'>+	binfo-&gt;info0 = le32_encode_bits(paddr_lo, BUFFER_ADDR_INFO0_ADDR);</div><div class='add'>+	binfo-&gt;info1 = le32_encode_bits(paddr_hi, BUFFER_ADDR_INFO1_ADDR) |</div><div class='add'>+		       le32_encode_bits(cookie, BUFFER_ADDR_INFO1_SW_COOKIE) |</div><div class='add'>+		       le32_encode_bits(manager, BUFFER_ADDR_INFO1_RET_BUF_MGR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_rx_buf_addr_info_get(struct ath12k_buffer_addr *binfo,</div><div class='add'>+				     dma_addr_t *paddr,</div><div class='add'>+				     u32 *cookie, u8 *rbm)</div><div class='add'>+{</div><div class='add'>+	*paddr = (((u64)le32_get_bits(binfo-&gt;info1, BUFFER_ADDR_INFO1_ADDR)) &lt;&lt; 32) |</div><div class='add'>+		le32_get_bits(binfo-&gt;info0, BUFFER_ADDR_INFO0_ADDR);</div><div class='add'>+	*cookie = le32_get_bits(binfo-&gt;info1, BUFFER_ADDR_INFO1_SW_COOKIE);</div><div class='add'>+	*rbm = le32_get_bits(binfo-&gt;info1, BUFFER_ADDR_INFO1_RET_BUF_MGR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_rx_msdu_link_info_get(struct hal_rx_msdu_link *link, u32 *num_msdus,</div><div class='add'>+				      u32 *msdu_cookies,</div><div class='add'>+				      enum hal_rx_buf_return_buf_manager *rbm)</div><div class='add'>+{</div><div class='add'>+	struct hal_rx_msdu_details *msdu;</div><div class='add'>+	u32 val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	*num_msdus = HAL_NUM_RX_MSDUS_PER_LINK_DESC;</div><div class='add'>+</div><div class='add'>+	msdu = &amp;link-&gt;msdu_link[0];</div><div class='add'>+	*rbm = le32_get_bits(msdu-&gt;buf_addr_info.info1,</div><div class='add'>+			     BUFFER_ADDR_INFO1_RET_BUF_MGR);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; *num_msdus; i++) {</div><div class='add'>+		msdu = &amp;link-&gt;msdu_link[i];</div><div class='add'>+</div><div class='add'>+		val = le32_get_bits(msdu-&gt;buf_addr_info.info0,</div><div class='add'>+				    BUFFER_ADDR_INFO0_ADDR);</div><div class='add'>+		if (val == 0) {</div><div class='add'>+			*num_msdus = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		*msdu_cookies = le32_get_bits(msdu-&gt;buf_addr_info.info1,</div><div class='add'>+					      BUFFER_ADDR_INFO1_SW_COOKIE);</div><div class='add'>+		msdu_cookies++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_hal_desc_reo_parse_err(struct ath12k_base *ab,</div><div class='add'>+				  struct hal_reo_dest_ring *desc,</div><div class='add'>+				  dma_addr_t *paddr, u32 *desc_bank)</div><div class='add'>+{</div><div class='add'>+	enum hal_reo_dest_ring_push_reason push_reason;</div><div class='add'>+	enum hal_reo_dest_ring_error_code err_code;</div><div class='add'>+	u32 cookie;</div><div class='add'>+</div><div class='add'>+	push_reason = le32_get_bits(desc-&gt;info0,</div><div class='add'>+				    HAL_REO_DEST_RING_INFO0_PUSH_REASON);</div><div class='add'>+	err_code = le32_get_bits(desc-&gt;info0,</div><div class='add'>+				 HAL_REO_DEST_RING_INFO0_ERROR_CODE);</div><div class='add'>+	ab-&gt;device_stats.reo_error[err_code]++;</div><div class='add'>+</div><div class='add'>+	if (push_reason != HAL_REO_DEST_RING_PUSH_REASON_ERR_DETECTED &amp;&amp;</div><div class='add'>+	    push_reason != HAL_REO_DEST_RING_PUSH_REASON_ROUTING_INSTRUCTION) {</div><div class='add'>+		ath12k_warn(ab, "expected error push reason code, received %d\n",</div><div class='add'>+			    push_reason);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_hal_rx_reo_ent_paddr_get(ab, &amp;desc-&gt;buf_addr_info, paddr, &amp;cookie);</div><div class='add'>+	*desc_bank = u32_get_bits(cookie, DP_LINK_DESC_BANK_MASK);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_hal_wbm_desc_parse_err(struct ath12k_base *ab, void *desc,</div><div class='add'>+				  struct hal_rx_wbm_rel_info *rel_info)</div><div class='add'>+{</div><div class='add'>+	struct hal_wbm_release_ring *wbm_desc = desc;</div><div class='add'>+	struct hal_wbm_release_ring_cc_rx *wbm_cc_desc = desc;</div><div class='add'>+	enum hal_wbm_rel_desc_type type;</div><div class='add'>+	enum hal_wbm_rel_src_module rel_src;</div><div class='add'>+	bool hw_cc_done;</div><div class='add'>+	u64 desc_va;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	type = le32_get_bits(wbm_desc-&gt;info0, HAL_WBM_RELEASE_INFO0_DESC_TYPE);</div><div class='add'>+	/* We expect only WBM_REL buffer type */</div><div class='add'>+	if (type != HAL_WBM_REL_DESC_TYPE_REL_MSDU) {</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rel_src = le32_get_bits(wbm_desc-&gt;info0,</div><div class='add'>+				HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE);</div><div class='add'>+	if (rel_src != HAL_WBM_REL_SRC_MODULE_RXDMA &amp;&amp;</div><div class='add'>+	    rel_src != HAL_WBM_REL_SRC_MODULE_REO)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* The format of wbm rel ring desc changes based on the</div><div class='add'>+	 * hw cookie conversion status</div><div class='add'>+	 */</div><div class='add'>+	hw_cc_done = le32_get_bits(wbm_desc-&gt;info0,</div><div class='add'>+				   HAL_WBM_RELEASE_RX_INFO0_CC_STATUS);</div><div class='add'>+</div><div class='add'>+	if (!hw_cc_done) {</div><div class='add'>+		val = le32_get_bits(wbm_desc-&gt;buf_addr_info.info1,</div><div class='add'>+				    BUFFER_ADDR_INFO1_RET_BUF_MGR);</div><div class='add'>+		if (val != HAL_RX_BUF_RBM_SW3_BM) {</div><div class='add'>+			ab-&gt;device_stats.invalid_rbm++;</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rel_info-&gt;cookie = le32_get_bits(wbm_desc-&gt;buf_addr_info.info1,</div><div class='add'>+						 BUFFER_ADDR_INFO1_SW_COOKIE);</div><div class='add'>+</div><div class='add'>+		rel_info-&gt;rx_desc = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		val = le32_get_bits(wbm_cc_desc-&gt;info0,</div><div class='add'>+				    HAL_WBM_RELEASE_RX_CC_INFO0_RBM);</div><div class='add'>+		if (val != HAL_RX_BUF_RBM_SW3_BM) {</div><div class='add'>+			ab-&gt;device_stats.invalid_rbm++;</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rel_info-&gt;cookie = le32_get_bits(wbm_cc_desc-&gt;info1,</div><div class='add'>+						 HAL_WBM_RELEASE_RX_CC_INFO1_COOKIE);</div><div class='add'>+</div><div class='add'>+		desc_va = ((u64)le32_to_cpu(wbm_cc_desc-&gt;buf_va_hi) &lt;&lt; 32 |</div><div class='add'>+			   le32_to_cpu(wbm_cc_desc-&gt;buf_va_lo));</div><div class='add'>+		rel_info-&gt;rx_desc =</div><div class='add'>+			(struct ath12k_rx_desc_info *)((unsigned long)desc_va);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rel_info-&gt;err_rel_src = rel_src;</div><div class='add'>+	rel_info-&gt;hw_cc_done = hw_cc_done;</div><div class='add'>+</div><div class='add'>+	rel_info-&gt;first_msdu = le32_get_bits(wbm_desc-&gt;info3,</div><div class='add'>+					     HAL_WBM_RELEASE_INFO3_FIRST_MSDU);</div><div class='add'>+	rel_info-&gt;last_msdu = le32_get_bits(wbm_desc-&gt;info3,</div><div class='add'>+					    HAL_WBM_RELEASE_INFO3_LAST_MSDU);</div><div class='add'>+	rel_info-&gt;continuation = le32_get_bits(wbm_desc-&gt;info3,</div><div class='add'>+					       HAL_WBM_RELEASE_INFO3_CONTINUATION);</div><div class='add'>+</div><div class='add'>+	if (rel_info-&gt;err_rel_src == HAL_WBM_REL_SRC_MODULE_REO) {</div><div class='add'>+		rel_info-&gt;push_reason =</div><div class='add'>+			le32_get_bits(wbm_desc-&gt;info0,</div><div class='add'>+				      HAL_WBM_RELEASE_INFO0_REO_PUSH_REASON);</div><div class='add'>+		rel_info-&gt;err_code =</div><div class='add'>+			le32_get_bits(wbm_desc-&gt;info0,</div><div class='add'>+				      HAL_WBM_RELEASE_INFO0_REO_ERROR_CODE);</div><div class='add'>+	} else {</div><div class='add'>+		rel_info-&gt;push_reason =</div><div class='add'>+			le32_get_bits(wbm_desc-&gt;info0,</div><div class='add'>+				      HAL_WBM_RELEASE_INFO0_RXDMA_PUSH_REASON);</div><div class='add'>+		rel_info-&gt;err_code =</div><div class='add'>+			le32_get_bits(wbm_desc-&gt;info0,</div><div class='add'>+				      HAL_WBM_RELEASE_INFO0_RXDMA_ERROR_CODE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_rx_reo_ent_paddr_get(struct ath12k_base *ab,</div><div class='add'>+				     struct ath12k_buffer_addr *buff_addr,</div><div class='add'>+				     dma_addr_t *paddr, u32 *cookie)</div><div class='add'>+{</div><div class='add'>+	*paddr = ((u64)(le32_get_bits(buff_addr-&gt;info1,</div><div class='add'>+				      BUFFER_ADDR_INFO1_ADDR)) &lt;&lt; 32) |</div><div class='add'>+		le32_get_bits(buff_addr-&gt;info0, BUFFER_ADDR_INFO0_ADDR);</div><div class='add'>+</div><div class='add'>+	*cookie = le32_get_bits(buff_addr-&gt;info1, BUFFER_ADDR_INFO1_SW_COOKIE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_rx_reo_ent_buf_paddr_get(void *rx_desc, dma_addr_t *paddr,</div><div class='add'>+					 u32 *sw_cookie,</div><div class='add'>+					 struct ath12k_buffer_addr **pp_buf_addr,</div><div class='add'>+					 u8 *rbm, u32 *msdu_cnt)</div><div class='add'>+{</div><div class='add'>+	struct hal_reo_entrance_ring *reo_ent_ring =</div><div class='add'>+		(struct hal_reo_entrance_ring *)rx_desc;</div><div class='add'>+	struct ath12k_buffer_addr *buf_addr_info;</div><div class='add'>+	struct rx_mpdu_desc *rx_mpdu_desc_info_details;</div><div class='add'>+</div><div class='add'>+	rx_mpdu_desc_info_details =</div><div class='add'>+			(struct rx_mpdu_desc *)&amp;reo_ent_ring-&gt;rx_mpdu_info;</div><div class='add'>+</div><div class='add'>+	*msdu_cnt = le32_get_bits(rx_mpdu_desc_info_details-&gt;info0,</div><div class='add'>+				  RX_MPDU_DESC_INFO0_MSDU_COUNT);</div><div class='add'>+</div><div class='add'>+	buf_addr_info = (struct ath12k_buffer_addr *)&amp;reo_ent_ring-&gt;buf_addr_info;</div><div class='add'>+</div><div class='add'>+	*paddr = (((u64)le32_get_bits(buf_addr_info-&gt;info1,</div><div class='add'>+				      BUFFER_ADDR_INFO1_ADDR)) &lt;&lt; 32) |</div><div class='add'>+			le32_get_bits(buf_addr_info-&gt;info0,</div><div class='add'>+				      BUFFER_ADDR_INFO0_ADDR);</div><div class='add'>+</div><div class='add'>+	*sw_cookie = le32_get_bits(buf_addr_info-&gt;info1,</div><div class='add'>+				   BUFFER_ADDR_INFO1_SW_COOKIE);</div><div class='add'>+	*rbm = le32_get_bits(buf_addr_info-&gt;info1,</div><div class='add'>+			     BUFFER_ADDR_INFO1_RET_BUF_MGR);</div><div class='add'>+</div><div class='add'>+	*pp_buf_addr = (void *)buf_addr_info;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_rx_msdu_list_get(struct ath12k *ar,</div><div class='add'>+				 struct hal_rx_msdu_link *link_desc,</div><div class='add'>+				 struct hal_rx_msdu_list *msdu_list,</div><div class='add'>+				 u16 *num_msdus)</div><div class='add'>+{</div><div class='add'>+	struct hal_rx_msdu_details *msdu_details = NULL;</div><div class='add'>+	struct rx_msdu_desc *msdu_desc_info = NULL;</div><div class='add'>+	u32 last = 0, first = 0;</div><div class='add'>+	u8 tmp = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	last = u32_encode_bits(last, RX_MSDU_DESC_INFO0_LAST_MSDU_IN_MPDU);</div><div class='add'>+	first = u32_encode_bits(first, RX_MSDU_DESC_INFO0_FIRST_MSDU_IN_MPDU);</div><div class='add'>+	msdu_details = &amp;link_desc-&gt;msdu_link[0];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HAL_RX_NUM_MSDU_DESC; i++) {</div><div class='add'>+		if (!i &amp;&amp; le32_get_bits(msdu_details[i].buf_addr_info.info0,</div><div class='add'>+					BUFFER_ADDR_INFO0_ADDR) == 0)</div><div class='add'>+			break;</div><div class='add'>+		if (le32_get_bits(msdu_details[i].buf_addr_info.info0,</div><div class='add'>+				  BUFFER_ADDR_INFO0_ADDR) == 0) {</div><div class='add'>+			msdu_desc_info = &amp;msdu_details[i - 1].rx_msdu_info;</div><div class='add'>+			msdu_desc_info-&gt;info0 |= cpu_to_le32(last);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		msdu_desc_info = &amp;msdu_details[i].rx_msdu_info;</div><div class='add'>+</div><div class='add'>+		if (!i)</div><div class='add'>+			msdu_desc_info-&gt;info0 |= cpu_to_le32(first);</div><div class='add'>+		else if (i == (HAL_RX_NUM_MSDU_DESC - 1))</div><div class='add'>+			msdu_desc_info-&gt;info0 |= cpu_to_le32(last);</div><div class='add'>+		msdu_list-&gt;msdu_info[i].msdu_flags = le32_to_cpu(msdu_desc_info-&gt;info0);</div><div class='add'>+		msdu_list-&gt;msdu_info[i].msdu_len =</div><div class='add'>+			 HAL_RX_MSDU_PKT_LENGTH_GET(msdu_desc_info-&gt;info0);</div><div class='add'>+		msdu_list-&gt;sw_cookie[i] =</div><div class='add'>+			le32_get_bits(msdu_details[i].buf_addr_info.info1,</div><div class='add'>+				      BUFFER_ADDR_INFO1_SW_COOKIE);</div><div class='add'>+		tmp = le32_get_bits(msdu_details[i].buf_addr_info.info1,</div><div class='add'>+				    BUFFER_ADDR_INFO1_RET_BUF_MGR);</div><div class='add'>+		msdu_list-&gt;paddr[i] =</div><div class='add'>+			((u64)(le32_get_bits(msdu_details[i].buf_addr_info.info1,</div><div class='add'>+					     BUFFER_ADDR_INFO1_ADDR)) &lt;&lt; 32) |</div><div class='add'>+			le32_get_bits(msdu_details[i].buf_addr_info.info0,</div><div class='add'>+				      BUFFER_ADDR_INFO0_ADDR);</div><div class='add'>+		msdu_list-&gt;rbm[i] = tmp;</div><div class='add'>+	}</div><div class='add'>+	*num_msdus = i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_rx_msdu_link_desc_set(struct ath12k_base *ab,</div><div class='add'>+				      struct hal_wbm_release_ring *desc,</div><div class='add'>+				      struct ath12k_buffer_addr *buf_addr_info,</div><div class='add'>+				      enum hal_wbm_rel_bm_act action)</div><div class='add'>+{</div><div class='add'>+	desc-&gt;buf_addr_info = *buf_addr_info;</div><div class='add'>+	desc-&gt;info0 |= le32_encode_bits(HAL_WBM_REL_SRC_MODULE_SW,</div><div class='add'>+					HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE) |</div><div class='add'>+		    le32_encode_bits(action, HAL_WBM_RELEASE_INFO0_BM_ACTION) |</div><div class='add'>+		    le32_encode_bits(HAL_WBM_REL_DESC_TYPE_MSDU_LINK,</div><div class='add'>+				     HAL_WBM_RELEASE_INFO0_DESC_TYPE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_reo_status_queue_stats(struct ath12k_base *ab, struct hal_tlv_64_hdr *tlv,</div><div class='add'>+				       struct hal_reo_status *status)</div><div class='add'>+{</div><div class='add'>+	struct hal_reo_get_queue_stats_status *desc =</div><div class='add'>+		(struct hal_reo_get_queue_stats_status *)tlv-&gt;value;</div><div class='add'>+</div><div class='add'>+	status-&gt;uniform_hdr.cmd_num =</div><div class='add'>+				le32_get_bits(desc-&gt;hdr.info0,</div><div class='add'>+					      HAL_REO_STATUS_HDR_INFO0_STATUS_NUM);</div><div class='add'>+	status-&gt;uniform_hdr.cmd_status =</div><div class='add'>+				le32_get_bits(desc-&gt;hdr.info0,</div><div class='add'>+					      HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_HAL, "Queue stats status:\n");</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_HAL, "header: cmd_num %d status %d\n",</div><div class='add'>+		   status-&gt;uniform_hdr.cmd_num,</div><div class='add'>+		   status-&gt;uniform_hdr.cmd_status);</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_HAL, "ssn %u cur_idx %u\n",</div><div class='add'>+		   le32_get_bits(desc-&gt;info0,</div><div class='add'>+				 HAL_REO_GET_QUEUE_STATS_STATUS_INFO0_SSN),</div><div class='add'>+		   le32_get_bits(desc-&gt;info0,</div><div class='add'>+				 HAL_REO_GET_QUEUE_STATS_STATUS_INFO0_CUR_IDX));</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_HAL, "pn = [%08x, %08x, %08x, %08x]\n",</div><div class='add'>+		   desc-&gt;pn[0], desc-&gt;pn[1], desc-&gt;pn[2], desc-&gt;pn[3]);</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_HAL, "last_rx: enqueue_tstamp %08x dequeue_tstamp %08x\n",</div><div class='add'>+		   desc-&gt;last_rx_enqueue_timestamp,</div><div class='add'>+		   desc-&gt;last_rx_dequeue_timestamp);</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_HAL, "rx_bitmap [%08x %08x %08x %08x %08x %08x %08x %08x]\n",</div><div class='add'>+		   desc-&gt;rx_bitmap[0], desc-&gt;rx_bitmap[1], desc-&gt;rx_bitmap[2],</div><div class='add'>+		   desc-&gt;rx_bitmap[3], desc-&gt;rx_bitmap[4], desc-&gt;rx_bitmap[5],</div><div class='add'>+		   desc-&gt;rx_bitmap[6], desc-&gt;rx_bitmap[7]);</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_HAL, "count: cur_mpdu %u cur_msdu %u\n",</div><div class='add'>+		   le32_get_bits(desc-&gt;info1,</div><div class='add'>+				 HAL_REO_GET_QUEUE_STATS_STATUS_INFO1_MPDU_COUNT),</div><div class='add'>+		   le32_get_bits(desc-&gt;info1,</div><div class='add'>+				 HAL_REO_GET_QUEUE_STATS_STATUS_INFO1_MSDU_COUNT));</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_HAL, "fwd_timeout %u fwd_bar %u dup_count %u\n",</div><div class='add'>+		   le32_get_bits(desc-&gt;info2,</div><div class='add'>+				 HAL_REO_GET_QUEUE_STATS_STATUS_INFO2_TIMEOUT_COUNT),</div><div class='add'>+		   le32_get_bits(desc-&gt;info2,</div><div class='add'>+				 HAL_REO_GET_QUEUE_STATS_STATUS_INFO2_FDTB_COUNT),</div><div class='add'>+		   le32_get_bits(desc-&gt;info2,</div><div class='add'>+				 HAL_REO_GET_QUEUE_STATS_STATUS_INFO2_DUPLICATE_COUNT));</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_HAL, "frames_in_order %u bar_rcvd %u\n",</div><div class='add'>+		   le32_get_bits(desc-&gt;info3,</div><div class='add'>+				 HAL_REO_GET_QUEUE_STATS_STATUS_INFO3_FIO_COUNT),</div><div class='add'>+		   le32_get_bits(desc-&gt;info3,</div><div class='add'>+				 HAL_REO_GET_QUEUE_STATS_STATUS_INFO3_BAR_RCVD_CNT));</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_HAL, "num_mpdus %d num_msdus %d total_bytes %d\n",</div><div class='add'>+		   desc-&gt;num_mpdu_frames, desc-&gt;num_msdu_frames,</div><div class='add'>+		   desc-&gt;total_bytes);</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_HAL, "late_rcvd %u win_jump_2k %u hole_cnt %u\n",</div><div class='add'>+		   le32_get_bits(desc-&gt;info4,</div><div class='add'>+				 HAL_REO_GET_QUEUE_STATS_STATUS_INFO4_LATE_RX_MPDU),</div><div class='add'>+		   le32_get_bits(desc-&gt;info2,</div><div class='add'>+				 HAL_REO_GET_QUEUE_STATS_STATUS_INFO2_WINDOW_JMP2K),</div><div class='add'>+		   le32_get_bits(desc-&gt;info4,</div><div class='add'>+				 HAL_REO_GET_QUEUE_STATS_STATUS_INFO4_HOLE_COUNT));</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_HAL, "looping count %u\n",</div><div class='add'>+		   le32_get_bits(desc-&gt;info5,</div><div class='add'>+				 HAL_REO_GET_QUEUE_STATS_STATUS_INFO5_LOOPING_CNT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_reo_flush_queue_status(struct ath12k_base *ab, struct hal_tlv_64_hdr *tlv,</div><div class='add'>+				       struct hal_reo_status *status)</div><div class='add'>+{</div><div class='add'>+	struct hal_reo_flush_queue_status *desc =</div><div class='add'>+		(struct hal_reo_flush_queue_status *)tlv-&gt;value;</div><div class='add'>+</div><div class='add'>+	status-&gt;uniform_hdr.cmd_num =</div><div class='add'>+			le32_get_bits(desc-&gt;hdr.info0,</div><div class='add'>+				      HAL_REO_STATUS_HDR_INFO0_STATUS_NUM);</div><div class='add'>+	status-&gt;uniform_hdr.cmd_status =</div><div class='add'>+			le32_get_bits(desc-&gt;hdr.info0,</div><div class='add'>+				      HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS);</div><div class='add'>+	status-&gt;u.flush_queue.err_detected =</div><div class='add'>+			le32_get_bits(desc-&gt;info0,</div><div class='add'>+				      HAL_REO_FLUSH_QUEUE_INFO0_ERR_DETECTED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_reo_flush_cache_status(struct ath12k_base *ab, struct hal_tlv_64_hdr *tlv,</div><div class='add'>+				       struct hal_reo_status *status)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hal *hal = &amp;ab-&gt;hal;</div><div class='add'>+	struct hal_reo_flush_cache_status *desc =</div><div class='add'>+		(struct hal_reo_flush_cache_status *)tlv-&gt;value;</div><div class='add'>+</div><div class='add'>+	status-&gt;uniform_hdr.cmd_num =</div><div class='add'>+			le32_get_bits(desc-&gt;hdr.info0,</div><div class='add'>+				      HAL_REO_STATUS_HDR_INFO0_STATUS_NUM);</div><div class='add'>+	status-&gt;uniform_hdr.cmd_status =</div><div class='add'>+			le32_get_bits(desc-&gt;hdr.info0,</div><div class='add'>+				      HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS);</div><div class='add'>+</div><div class='add'>+	status-&gt;u.flush_cache.err_detected =</div><div class='add'>+			le32_get_bits(desc-&gt;info0,</div><div class='add'>+				      HAL_REO_FLUSH_CACHE_STATUS_INFO0_IS_ERR);</div><div class='add'>+	status-&gt;u.flush_cache.err_code =</div><div class='add'>+		le32_get_bits(desc-&gt;info0,</div><div class='add'>+			      HAL_REO_FLUSH_CACHE_STATUS_INFO0_BLOCK_ERR_CODE);</div><div class='add'>+	if (!status-&gt;u.flush_cache.err_code)</div><div class='add'>+		hal-&gt;avail_blk_resource |= BIT(hal-&gt;current_blk_index);</div><div class='add'>+</div><div class='add'>+	status-&gt;u.flush_cache.cache_controller_flush_status_hit =</div><div class='add'>+		le32_get_bits(desc-&gt;info0,</div><div class='add'>+			      HAL_REO_FLUSH_CACHE_STATUS_INFO0_FLUSH_STATUS_HIT);</div><div class='add'>+</div><div class='add'>+	status-&gt;u.flush_cache.cache_controller_flush_status_desc_type =</div><div class='add'>+		le32_get_bits(desc-&gt;info0,</div><div class='add'>+			      HAL_REO_FLUSH_CACHE_STATUS_INFO0_FLUSH_DESC_TYPE);</div><div class='add'>+	status-&gt;u.flush_cache.cache_controller_flush_status_client_id =</div><div class='add'>+		le32_get_bits(desc-&gt;info0,</div><div class='add'>+			      HAL_REO_FLUSH_CACHE_STATUS_INFO0_FLUSH_CLIENT_ID);</div><div class='add'>+	status-&gt;u.flush_cache.cache_controller_flush_status_err =</div><div class='add'>+		le32_get_bits(desc-&gt;info0,</div><div class='add'>+			      HAL_REO_FLUSH_CACHE_STATUS_INFO0_FLUSH_ERR);</div><div class='add'>+	status-&gt;u.flush_cache.cache_controller_flush_status_cnt =</div><div class='add'>+		le32_get_bits(desc-&gt;info0,</div><div class='add'>+			      HAL_REO_FLUSH_CACHE_STATUS_INFO0_FLUSH_COUNT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_reo_unblk_cache_status(struct ath12k_base *ab, struct hal_tlv_64_hdr *tlv,</div><div class='add'>+				       struct hal_reo_status *status)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hal *hal = &amp;ab-&gt;hal;</div><div class='add'>+	struct hal_reo_unblock_cache_status *desc =</div><div class='add'>+		(struct hal_reo_unblock_cache_status *)tlv-&gt;value;</div><div class='add'>+</div><div class='add'>+	status-&gt;uniform_hdr.cmd_num =</div><div class='add'>+			le32_get_bits(desc-&gt;hdr.info0,</div><div class='add'>+				      HAL_REO_STATUS_HDR_INFO0_STATUS_NUM);</div><div class='add'>+	status-&gt;uniform_hdr.cmd_status =</div><div class='add'>+			le32_get_bits(desc-&gt;hdr.info0,</div><div class='add'>+				      HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS);</div><div class='add'>+</div><div class='add'>+	status-&gt;u.unblock_cache.err_detected =</div><div class='add'>+			le32_get_bits(desc-&gt;info0,</div><div class='add'>+				      HAL_REO_UNBLOCK_CACHE_STATUS_INFO0_IS_ERR);</div><div class='add'>+	status-&gt;u.unblock_cache.unblock_type =</div><div class='add'>+			le32_get_bits(desc-&gt;info0,</div><div class='add'>+				      HAL_REO_UNBLOCK_CACHE_STATUS_INFO0_TYPE);</div><div class='add'>+</div><div class='add'>+	if (!status-&gt;u.unblock_cache.err_detected &amp;&amp;</div><div class='add'>+	    status-&gt;u.unblock_cache.unblock_type ==</div><div class='add'>+	    HAL_REO_STATUS_UNBLOCK_BLOCKING_RESOURCE)</div><div class='add'>+		hal-&gt;avail_blk_resource &amp;= ~BIT(hal-&gt;current_blk_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_reo_flush_timeout_list_status(struct ath12k_base *ab,</div><div class='add'>+					      struct hal_tlv_64_hdr *tlv,</div><div class='add'>+					      struct hal_reo_status *status)</div><div class='add'>+{</div><div class='add'>+	struct hal_reo_flush_timeout_list_status *desc =</div><div class='add'>+		(struct hal_reo_flush_timeout_list_status *)tlv-&gt;value;</div><div class='add'>+</div><div class='add'>+	status-&gt;uniform_hdr.cmd_num =</div><div class='add'>+			le32_get_bits(desc-&gt;hdr.info0,</div><div class='add'>+				      HAL_REO_STATUS_HDR_INFO0_STATUS_NUM);</div><div class='add'>+	status-&gt;uniform_hdr.cmd_status =</div><div class='add'>+			le32_get_bits(desc-&gt;hdr.info0,</div><div class='add'>+				      HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS);</div><div class='add'>+</div><div class='add'>+	status-&gt;u.timeout_list.err_detected =</div><div class='add'>+			le32_get_bits(desc-&gt;info0,</div><div class='add'>+				      HAL_REO_FLUSH_TIMEOUT_STATUS_INFO0_IS_ERR);</div><div class='add'>+	status-&gt;u.timeout_list.list_empty =</div><div class='add'>+			le32_get_bits(desc-&gt;info0,</div><div class='add'>+				      HAL_REO_FLUSH_TIMEOUT_STATUS_INFO0_LIST_EMPTY);</div><div class='add'>+</div><div class='add'>+	status-&gt;u.timeout_list.release_desc_cnt =</div><div class='add'>+		le32_get_bits(desc-&gt;info1,</div><div class='add'>+			      HAL_REO_FLUSH_TIMEOUT_STATUS_INFO1_REL_DESC_COUNT);</div><div class='add'>+	status-&gt;u.timeout_list.fwd_buf_cnt =</div><div class='add'>+		le32_get_bits(desc-&gt;info0,</div><div class='add'>+			      HAL_REO_FLUSH_TIMEOUT_STATUS_INFO1_FWD_BUF_COUNT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_reo_desc_thresh_reached_status(struct ath12k_base *ab,</div><div class='add'>+					       struct hal_tlv_64_hdr *tlv,</div><div class='add'>+					       struct hal_reo_status *status)</div><div class='add'>+{</div><div class='add'>+	struct hal_reo_desc_thresh_reached_status *desc =</div><div class='add'>+		(struct hal_reo_desc_thresh_reached_status *)tlv-&gt;value;</div><div class='add'>+</div><div class='add'>+	status-&gt;uniform_hdr.cmd_num =</div><div class='add'>+			le32_get_bits(desc-&gt;hdr.info0,</div><div class='add'>+				      HAL_REO_STATUS_HDR_INFO0_STATUS_NUM);</div><div class='add'>+	status-&gt;uniform_hdr.cmd_status =</div><div class='add'>+			le32_get_bits(desc-&gt;hdr.info0,</div><div class='add'>+				      HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS);</div><div class='add'>+</div><div class='add'>+	status-&gt;u.desc_thresh_reached.threshold_idx =</div><div class='add'>+		le32_get_bits(desc-&gt;info0,</div><div class='add'>+			      HAL_REO_DESC_THRESH_STATUS_INFO0_THRESH_INDEX);</div><div class='add'>+</div><div class='add'>+	status-&gt;u.desc_thresh_reached.link_desc_counter0 =</div><div class='add'>+		le32_get_bits(desc-&gt;info1,</div><div class='add'>+			      HAL_REO_DESC_THRESH_STATUS_INFO1_LINK_DESC_COUNTER0);</div><div class='add'>+</div><div class='add'>+	status-&gt;u.desc_thresh_reached.link_desc_counter1 =</div><div class='add'>+		le32_get_bits(desc-&gt;info2,</div><div class='add'>+			      HAL_REO_DESC_THRESH_STATUS_INFO2_LINK_DESC_COUNTER1);</div><div class='add'>+</div><div class='add'>+	status-&gt;u.desc_thresh_reached.link_desc_counter2 =</div><div class='add'>+		le32_get_bits(desc-&gt;info3,</div><div class='add'>+			      HAL_REO_DESC_THRESH_STATUS_INFO3_LINK_DESC_COUNTER2);</div><div class='add'>+</div><div class='add'>+	status-&gt;u.desc_thresh_reached.link_desc_counter_sum =</div><div class='add'>+		le32_get_bits(desc-&gt;info4,</div><div class='add'>+			      HAL_REO_DESC_THRESH_STATUS_INFO4_LINK_DESC_COUNTER_SUM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_reo_update_rx_reo_queue_status(struct ath12k_base *ab,</div><div class='add'>+					       struct hal_tlv_64_hdr *tlv,</div><div class='add'>+					       struct hal_reo_status *status)</div><div class='add'>+{</div><div class='add'>+	struct hal_reo_status_hdr *desc =</div><div class='add'>+		(struct hal_reo_status_hdr *)tlv-&gt;value;</div><div class='add'>+</div><div class='add'>+	status-&gt;uniform_hdr.cmd_num =</div><div class='add'>+			le32_get_bits(desc-&gt;info0,</div><div class='add'>+				      HAL_REO_STATUS_HDR_INFO0_STATUS_NUM);</div><div class='add'>+	status-&gt;uniform_hdr.cmd_status =</div><div class='add'>+			le32_get_bits(desc-&gt;info0,</div><div class='add'>+				      HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 ath12k_hal_reo_qdesc_size(u32 ba_window_size, u8 tid)</div><div class='add'>+{</div><div class='add'>+	u32 num_ext_desc, num_1k_desc = 0;</div><div class='add'>+</div><div class='add'>+	if (ba_window_size &lt;= 1) {</div><div class='add'>+		if (tid != HAL_DESC_REO_NON_QOS_TID)</div><div class='add'>+			num_ext_desc = 1;</div><div class='add'>+		else</div><div class='add'>+			num_ext_desc = 0;</div><div class='add'>+</div><div class='add'>+	} else if (ba_window_size &lt;= 105) {</div><div class='add'>+		num_ext_desc = 1;</div><div class='add'>+	} else if (ba_window_size &lt;= 210) {</div><div class='add'>+		num_ext_desc = 2;</div><div class='add'>+	} else if (ba_window_size &lt;= 256) {</div><div class='add'>+		num_ext_desc = 3;</div><div class='add'>+	} else {</div><div class='add'>+		num_ext_desc = 10;</div><div class='add'>+		num_1k_desc = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sizeof(struct hal_rx_reo_queue) +</div><div class='add'>+		(num_ext_desc * sizeof(struct hal_rx_reo_queue_ext)) +</div><div class='add'>+		(num_1k_desc * sizeof(struct hal_rx_reo_queue_1k));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_reo_qdesc_setup(struct hal_rx_reo_queue *qdesc,</div><div class='add'>+				int tid, u32 ba_window_size,</div><div class='add'>+				u32 start_seq, enum hal_pn_type type)</div><div class='add'>+{</div><div class='add'>+	struct hal_rx_reo_queue_ext *ext_desc;</div><div class='add'>+</div><div class='add'>+	ath12k_hal_reo_set_desc_hdr(&amp;qdesc-&gt;desc_hdr, HAL_DESC_REO_OWNED,</div><div class='add'>+				    HAL_DESC_REO_QUEUE_DESC,</div><div class='add'>+				    REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_0);</div><div class='add'>+</div><div class='add'>+	qdesc-&gt;rx_queue_num = le32_encode_bits(tid, HAL_RX_REO_QUEUE_RX_QUEUE_NUMBER);</div><div class='add'>+</div><div class='add'>+	qdesc-&gt;info0 =</div><div class='add'>+		le32_encode_bits(1, HAL_RX_REO_QUEUE_INFO0_VLD) |</div><div class='add'>+		le32_encode_bits(1, HAL_RX_REO_QUEUE_INFO0_ASSOC_LNK_DESC_COUNTER) |</div><div class='add'>+		le32_encode_bits(ath12k_tid_to_ac(tid), HAL_RX_REO_QUEUE_INFO0_AC);</div><div class='add'>+</div><div class='add'>+	if (ba_window_size &lt; 1)</div><div class='add'>+		ba_window_size = 1;</div><div class='add'>+</div><div class='add'>+	if (ba_window_size == 1 &amp;&amp; tid != HAL_DESC_REO_NON_QOS_TID)</div><div class='add'>+		ba_window_size++;</div><div class='add'>+</div><div class='add'>+	if (ba_window_size == 1)</div><div class='add'>+		qdesc-&gt;info0 |= le32_encode_bits(1, HAL_RX_REO_QUEUE_INFO0_RETRY);</div><div class='add'>+</div><div class='add'>+	qdesc-&gt;info0 |= le32_encode_bits(ba_window_size - 1,</div><div class='add'>+					 HAL_RX_REO_QUEUE_INFO0_BA_WINDOW_SIZE);</div><div class='add'>+	switch (type) {</div><div class='add'>+	case HAL_PN_TYPE_NONE:</div><div class='add'>+	case HAL_PN_TYPE_WAPI_EVEN:</div><div class='add'>+	case HAL_PN_TYPE_WAPI_UNEVEN:</div><div class='add'>+		break;</div><div class='add'>+	case HAL_PN_TYPE_WPA:</div><div class='add'>+		qdesc-&gt;info0 |=</div><div class='add'>+			le32_encode_bits(1, HAL_RX_REO_QUEUE_INFO0_PN_CHECK) |</div><div class='add'>+			le32_encode_bits(HAL_RX_REO_QUEUE_PN_SIZE_48,</div><div class='add'>+					 HAL_RX_REO_QUEUE_INFO0_PN_SIZE);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TODO: Set Ignore ampdu flags based on BA window size and/or</div><div class='add'>+	 * AMPDU capabilities</div><div class='add'>+	 */</div><div class='add'>+	qdesc-&gt;info0 |= le32_encode_bits(1, HAL_RX_REO_QUEUE_INFO0_IGNORE_AMPDU_FLG);</div><div class='add'>+</div><div class='add'>+	qdesc-&gt;info1 |= le32_encode_bits(0, HAL_RX_REO_QUEUE_INFO1_SVLD);</div><div class='add'>+</div><div class='add'>+	if (start_seq &lt;= 0xfff)</div><div class='add'>+		qdesc-&gt;info1 = le32_encode_bits(start_seq,</div><div class='add'>+						HAL_RX_REO_QUEUE_INFO1_SSN);</div><div class='add'>+</div><div class='add'>+	if (tid == HAL_DESC_REO_NON_QOS_TID)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ext_desc = qdesc-&gt;ext_desc;</div><div class='add'>+</div><div class='add'>+	/* TODO: HW queue descriptors are currently allocated for max BA</div><div class='add'>+	 * window size for all QOS TIDs so that same descriptor can be used</div><div class='add'>+	 * later when ADDBA request is received. This should be changed to</div><div class='add'>+	 * allocate HW queue descriptors based on BA window size being</div><div class='add'>+	 * negotiated (0 for non BA cases), and reallocate when BA window</div><div class='add'>+	 * size changes and also send WMI message to FW to change the REO</div><div class='add'>+	 * queue descriptor in Rx peer entry as part of dp_rx_tid_update.</div><div class='add'>+	 */</div><div class='add'>+	memset(ext_desc, 0, 3 * sizeof(*ext_desc));</div><div class='add'>+	ath12k_hal_reo_set_desc_hdr(&amp;ext_desc-&gt;desc_hdr, HAL_DESC_REO_OWNED,</div><div class='add'>+				    HAL_DESC_REO_QUEUE_EXT_DESC,</div><div class='add'>+				    REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_1);</div><div class='add'>+	ext_desc++;</div><div class='add'>+	ath12k_hal_reo_set_desc_hdr(&amp;ext_desc-&gt;desc_hdr, HAL_DESC_REO_OWNED,</div><div class='add'>+				    HAL_DESC_REO_QUEUE_EXT_DESC,</div><div class='add'>+				    REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_2);</div><div class='add'>+	ext_desc++;</div><div class='add'>+	ath12k_hal_reo_set_desc_hdr(&amp;ext_desc-&gt;desc_hdr, HAL_DESC_REO_OWNED,</div><div class='add'>+				    HAL_DESC_REO_QUEUE_EXT_DESC,</div><div class='add'>+				    REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_reo_init_cmd_ring(struct ath12k_base *ab,</div><div class='add'>+				  struct hal_srng *srng)</div><div class='add'>+{</div><div class='add'>+	struct hal_srng_params params;</div><div class='add'>+	struct hal_tlv_64_hdr *tlv;</div><div class='add'>+	struct hal_reo_get_queue_stats *desc;</div><div class='add'>+	int i, cmd_num = 1;</div><div class='add'>+	int entry_size;</div><div class='add'>+	u8 *entry;</div><div class='add'>+</div><div class='add'>+	memset(&amp;params, 0, sizeof(params));</div><div class='add'>+</div><div class='add'>+	entry_size = ath12k_hal_srng_get_entrysize(ab, HAL_REO_CMD);</div><div class='add'>+	ath12k_hal_srng_get_params(ab, srng, &amp;params);</div><div class='add'>+	entry = (u8 *)params.ring_base_vaddr;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; params.num_entries; i++) {</div><div class='add'>+		tlv = (struct hal_tlv_64_hdr *)entry;</div><div class='add'>+		desc = (struct hal_reo_get_queue_stats *)tlv-&gt;value;</div><div class='add'>+		desc-&gt;cmd.info0 = le32_encode_bits(cmd_num++,</div><div class='add'>+						   HAL_REO_CMD_HDR_INFO0_CMD_NUMBER);</div><div class='add'>+		entry += entry_size;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_reo_hw_setup(struct ath12k_base *ab, u32 ring_hash_map)</div><div class='add'>+{</div><div class='add'>+	u32 reo_base = HAL_SEQ_WCSS_UMAC_REO_REG;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = ath12k_hif_read32(ab, reo_base + HAL_REO1_GEN_ENABLE);</div><div class='add'>+</div><div class='add'>+	val |= u32_encode_bits(1, HAL_REO1_GEN_ENABLE_AGING_LIST_ENABLE) |</div><div class='add'>+	       u32_encode_bits(1, HAL_REO1_GEN_ENABLE_AGING_FLUSH_ENABLE);</div><div class='add'>+	ath12k_hif_write32(ab, reo_base + HAL_REO1_GEN_ENABLE, val);</div><div class='add'>+</div><div class='add'>+	val = ath12k_hif_read32(ab, reo_base + HAL_REO1_MISC_CTRL_ADDR(ab));</div><div class='add'>+</div><div class='add'>+	val &amp;= ~(HAL_REO1_MISC_CTL_FRAG_DST_RING |</div><div class='add'>+		 HAL_REO1_MISC_CTL_BAR_DST_RING);</div><div class='add'>+	val |= u32_encode_bits(HAL_SRNG_RING_ID_REO2SW0,</div><div class='add'>+			       HAL_REO1_MISC_CTL_FRAG_DST_RING);</div><div class='add'>+	val |= u32_encode_bits(HAL_SRNG_RING_ID_REO2SW0,</div><div class='add'>+			       HAL_REO1_MISC_CTL_BAR_DST_RING);</div><div class='add'>+	ath12k_hif_write32(ab, reo_base + HAL_REO1_MISC_CTRL_ADDR(ab), val);</div><div class='add'>+</div><div class='add'>+	ath12k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_0(ab),</div><div class='add'>+			   HAL_DEFAULT_BE_BK_VI_REO_TIMEOUT_USEC);</div><div class='add'>+	ath12k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_1(ab),</div><div class='add'>+			   HAL_DEFAULT_BE_BK_VI_REO_TIMEOUT_USEC);</div><div class='add'>+	ath12k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_2(ab),</div><div class='add'>+			   HAL_DEFAULT_BE_BK_VI_REO_TIMEOUT_USEC);</div><div class='add'>+	ath12k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_3(ab),</div><div class='add'>+			   HAL_DEFAULT_VO_REO_TIMEOUT_USEC);</div><div class='add'>+</div><div class='add'>+	ath12k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_2,</div><div class='add'>+			   ring_hash_map);</div><div class='add'>+	ath12k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_3,</div><div class='add'>+			   ring_hash_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_reo_shared_qaddr_cache_clear(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ab-&gt;base_lock);</div><div class='add'>+	val = ath12k_hif_read32(ab, HAL_SEQ_WCSS_UMAC_REO_REG +</div><div class='add'>+				HAL_REO1_QDESC_ADDR(ab));</div><div class='add'>+</div><div class='add'>+	val |= u32_encode_bits(1, HAL_REO_QDESC_ADDR_READ_CLEAR_QDESC_ARRAY);</div><div class='add'>+	ath12k_hif_write32(ab, HAL_SEQ_WCSS_UMAC_REO_REG +</div><div class='add'>+			   HAL_REO1_QDESC_ADDR(ab), val);</div><div class='add'>+</div><div class='add'>+	val &amp;= ~HAL_REO_QDESC_ADDR_READ_CLEAR_QDESC_ARRAY;</div><div class='add'>+	ath12k_hif_write32(ab, HAL_SEQ_WCSS_UMAC_REO_REG +</div><div class='add'>+			   HAL_REO1_QDESC_ADDR(ab), val);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/hal_rx.h b/drivers/net/wireless/ath/ath12k/hal_rx.h<br/>new file mode 100644<br/>index 000000000000..d1ad7747b82c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/hal_rx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/hal_rx.h</a></div><div class='hunk'>@@ -0,0 +1,1171 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH12K_HAL_RX_H</div><div class='add'>+#define ATH12K_HAL_RX_H</div><div class='add'>+</div><div class='add'>+struct hal_rx_wbm_rel_info {</div><div class='add'>+	u32 cookie;</div><div class='add'>+	enum hal_wbm_rel_src_module err_rel_src;</div><div class='add'>+	enum hal_reo_dest_ring_push_reason push_reason;</div><div class='add'>+	u32 err_code;</div><div class='add'>+	bool first_msdu;</div><div class='add'>+	bool last_msdu;</div><div class='add'>+	bool continuation;</div><div class='add'>+	void *rx_desc;</div><div class='add'>+	bool hw_cc_done;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_INVALID_PEERID	0x3fff</div><div class='add'>+#define VHT_SIG_SU_NSS_MASK 0x7</div><div class='add'>+</div><div class='add'>+#define HAL_RX_MPDU_INFO_PN_GET_BYTE1(__val) \</div><div class='add'>+	le32_get_bits((__val), GENMASK(7, 0))</div><div class='add'>+</div><div class='add'>+#define HAL_RX_MPDU_INFO_PN_GET_BYTE2(__val) \</div><div class='add'>+	le32_get_bits((__val), GENMASK(15, 8))</div><div class='add'>+</div><div class='add'>+#define HAL_RX_MPDU_INFO_PN_GET_BYTE3(__val) \</div><div class='add'>+	le32_get_bits((__val), GENMASK(23, 16))</div><div class='add'>+</div><div class='add'>+#define HAL_RX_MPDU_INFO_PN_GET_BYTE4(__val) \</div><div class='add'>+	le32_get_bits((__val), GENMASK(31, 24))</div><div class='add'>+</div><div class='add'>+struct hal_rx_mon_status_tlv_hdr {</div><div class='add'>+	u32 hdr;</div><div class='add'>+	u8 value[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_rx_su_mu_coding {</div><div class='add'>+	HAL_RX_SU_MU_CODING_BCC,</div><div class='add'>+	HAL_RX_SU_MU_CODING_LDPC,</div><div class='add'>+	HAL_RX_SU_MU_CODING_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_rx_gi {</div><div class='add'>+	HAL_RX_GI_0_8_US,</div><div class='add'>+	HAL_RX_GI_0_4_US,</div><div class='add'>+	HAL_RX_GI_1_6_US,</div><div class='add'>+	HAL_RX_GI_3_2_US,</div><div class='add'>+	HAL_RX_GI_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_rx_bw {</div><div class='add'>+	HAL_RX_BW_20MHZ,</div><div class='add'>+	HAL_RX_BW_40MHZ,</div><div class='add'>+	HAL_RX_BW_80MHZ,</div><div class='add'>+	HAL_RX_BW_160MHZ,</div><div class='add'>+	HAL_RX_BW_320MHZ,</div><div class='add'>+	HAL_RX_BW_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_rx_preamble {</div><div class='add'>+	HAL_RX_PREAMBLE_11A,</div><div class='add'>+	HAL_RX_PREAMBLE_11B,</div><div class='add'>+	HAL_RX_PREAMBLE_11N,</div><div class='add'>+	HAL_RX_PREAMBLE_11AC,</div><div class='add'>+	HAL_RX_PREAMBLE_11AX,</div><div class='add'>+	HAL_RX_PREAMBLE_11BA,</div><div class='add'>+	HAL_RX_PREAMBLE_11BE,</div><div class='add'>+	HAL_RX_PREAMBLE_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_rx_reception_type {</div><div class='add'>+	HAL_RX_RECEPTION_TYPE_SU,</div><div class='add'>+	HAL_RX_RECEPTION_TYPE_MU_MIMO,</div><div class='add'>+	HAL_RX_RECEPTION_TYPE_MU_OFDMA,</div><div class='add'>+	HAL_RX_RECEPTION_TYPE_MU_OFDMA_MIMO,</div><div class='add'>+	HAL_RX_RECEPTION_TYPE_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hal_rx_legacy_rate {</div><div class='add'>+	HAL_RX_LEGACY_RATE_1_MBPS,</div><div class='add'>+	HAL_RX_LEGACY_RATE_2_MBPS,</div><div class='add'>+	HAL_RX_LEGACY_RATE_5_5_MBPS,</div><div class='add'>+	HAL_RX_LEGACY_RATE_6_MBPS,</div><div class='add'>+	HAL_RX_LEGACY_RATE_9_MBPS,</div><div class='add'>+	HAL_RX_LEGACY_RATE_11_MBPS,</div><div class='add'>+	HAL_RX_LEGACY_RATE_12_MBPS,</div><div class='add'>+	HAL_RX_LEGACY_RATE_18_MBPS,</div><div class='add'>+	HAL_RX_LEGACY_RATE_24_MBPS,</div><div class='add'>+	HAL_RX_LEGACY_RATE_36_MBPS,</div><div class='add'>+	HAL_RX_LEGACY_RATE_48_MBPS,</div><div class='add'>+	HAL_RX_LEGACY_RATE_54_MBPS,</div><div class='add'>+	HAL_RX_LEGACY_RATE_INVALID,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_TLV_STATUS_PPDU_NOT_DONE            0</div><div class='add'>+#define HAL_TLV_STATUS_PPDU_DONE                1</div><div class='add'>+#define HAL_TLV_STATUS_BUF_DONE                 2</div><div class='add'>+#define HAL_TLV_STATUS_PPDU_NON_STD_DONE        3</div><div class='add'>+#define HAL_RX_FCS_LEN                          4</div><div class='add'>+</div><div class='add'>+enum hal_rx_mon_status {</div><div class='add'>+	HAL_RX_MON_STATUS_PPDU_NOT_DONE,</div><div class='add'>+	HAL_RX_MON_STATUS_PPDU_DONE,</div><div class='add'>+	HAL_RX_MON_STATUS_BUF_DONE,</div><div class='add'>+	HAL_RX_MON_STATUS_BUF_ADDR,</div><div class='add'>+	HAL_RX_MON_STATUS_MPDU_START,</div><div class='add'>+	HAL_RX_MON_STATUS_MPDU_END,</div><div class='add'>+	HAL_RX_MON_STATUS_MSDU_END,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_RX_MAX_MPDU				1024</div><div class='add'>+#define HAL_RX_NUM_WORDS_PER_PPDU_BITMAP	(HAL_RX_MAX_MPDU &gt;&gt; 5)</div><div class='add'>+</div><div class='add'>+struct hal_rx_user_status {</div><div class='add'>+	u32 mcs:4,</div><div class='add'>+	nss:3,</div><div class='add'>+	ofdma_info_valid:1,</div><div class='add'>+	ul_ofdma_ru_start_index:7,</div><div class='add'>+	ul_ofdma_ru_width:7,</div><div class='add'>+	ul_ofdma_ru_size:8;</div><div class='add'>+	u32 ul_ofdma_user_v0_word0;</div><div class='add'>+	u32 ul_ofdma_user_v0_word1;</div><div class='add'>+	u32 ast_index;</div><div class='add'>+	u32 tid;</div><div class='add'>+	u16 tcp_msdu_count;</div><div class='add'>+	u16 tcp_ack_msdu_count;</div><div class='add'>+	u16 udp_msdu_count;</div><div class='add'>+	u16 other_msdu_count;</div><div class='add'>+	u16 frame_control;</div><div class='add'>+	u8 frame_control_info_valid;</div><div class='add'>+	u8 data_sequence_control_info_valid;</div><div class='add'>+	u16 first_data_seq_ctrl;</div><div class='add'>+	u32 preamble_type;</div><div class='add'>+	u16 ht_flags;</div><div class='add'>+	u16 vht_flags;</div><div class='add'>+	u16 he_flags;</div><div class='add'>+	u8 rs_flags;</div><div class='add'>+	u8 ldpc;</div><div class='add'>+	u32 mpdu_cnt_fcs_ok;</div><div class='add'>+	u32 mpdu_cnt_fcs_err;</div><div class='add'>+	u32 mpdu_fcs_ok_bitmap[HAL_RX_NUM_WORDS_PER_PPDU_BITMAP];</div><div class='add'>+	u32 mpdu_ok_byte_count;</div><div class='add'>+	u32 mpdu_err_byte_count;</div><div class='add'>+	bool ampdu_present;</div><div class='add'>+	u16 ampdu_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_MAX_UL_MU_USERS	37</div><div class='add'>+</div><div class='add'>+struct hal_rx_u_sig_info {</div><div class='add'>+	bool ul_dl;</div><div class='add'>+	u8 bw;</div><div class='add'>+	u8 ppdu_type_comp_mode;</div><div class='add'>+	u8 eht_sig_mcs;</div><div class='add'>+	u8 num_eht_sig_sym;</div><div class='add'>+	struct ieee80211_radiotap_eht_usig usig;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_RX_MON_MAX_AGGR_SIZE	128</div><div class='add'>+</div><div class='add'>+struct hal_rx_tlv_aggr_info {</div><div class='add'>+	bool in_progress;</div><div class='add'>+	u16 cur_len;</div><div class='add'>+	u16 tlv_tag;</div><div class='add'>+	u8 buf[HAL_RX_MON_MAX_AGGR_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hal_rx_radiotap_eht {</div><div class='add'>+	__le32 known;</div><div class='add'>+	__le32 data[9];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define EHT_MAX_USER_INFO	4</div><div class='add'>+</div><div class='add'>+struct hal_rx_eht_info {</div><div class='add'>+	u8 num_user_info;</div><div class='add'>+	struct hal_rx_radiotap_eht eht;</div><div class='add'>+	u32 user_info[EHT_MAX_USER_INFO];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hal_rx_mon_ppdu_info {</div><div class='add'>+	u32 ppdu_id;</div><div class='add'>+	u32 last_ppdu_id;</div><div class='add'>+	u64 ppdu_ts;</div><div class='add'>+	u32 num_mpdu_fcs_ok;</div><div class='add'>+	u32 num_mpdu_fcs_err;</div><div class='add'>+	u32 preamble_type;</div><div class='add'>+	u32 mpdu_len;</div><div class='add'>+	u16 chan_num;</div><div class='add'>+	u16 freq;</div><div class='add'>+	u16 tcp_msdu_count;</div><div class='add'>+	u16 tcp_ack_msdu_count;</div><div class='add'>+	u16 udp_msdu_count;</div><div class='add'>+	u16 other_msdu_count;</div><div class='add'>+	u16 peer_id;</div><div class='add'>+	u8 rate;</div><div class='add'>+	u8 mcs;</div><div class='add'>+	u8 nss;</div><div class='add'>+	u8 bw;</div><div class='add'>+	u8 vht_flag_values1;</div><div class='add'>+	u8 vht_flag_values2;</div><div class='add'>+	u8 vht_flag_values3[4];</div><div class='add'>+	u8 vht_flag_values4;</div><div class='add'>+	u8 vht_flag_values5;</div><div class='add'>+	u16 vht_flag_values6;</div><div class='add'>+	u8 is_stbc;</div><div class='add'>+	u8 gi;</div><div class='add'>+	u8 sgi;</div><div class='add'>+	u8 ldpc;</div><div class='add'>+	u8 beamformed;</div><div class='add'>+	u8 rssi_comb;</div><div class='add'>+	u16 tid;</div><div class='add'>+	u8 fc_valid;</div><div class='add'>+	u16 ht_flags;</div><div class='add'>+	u16 vht_flags;</div><div class='add'>+	u16 he_flags;</div><div class='add'>+	u16 he_mu_flags;</div><div class='add'>+	u8 dcm;</div><div class='add'>+	u8 ru_alloc;</div><div class='add'>+	u8 reception_type;</div><div class='add'>+	u64 tsft;</div><div class='add'>+	u64 rx_duration;</div><div class='add'>+	u16 frame_control;</div><div class='add'>+	u32 ast_index;</div><div class='add'>+	u8 rs_fcs_err;</div><div class='add'>+	u8 rs_flags;</div><div class='add'>+	u8 cck_flag;</div><div class='add'>+	u8 ofdm_flag;</div><div class='add'>+	u8 ulofdma_flag;</div><div class='add'>+	u8 frame_control_info_valid;</div><div class='add'>+	u16 he_per_user_1;</div><div class='add'>+	u16 he_per_user_2;</div><div class='add'>+	u8 he_per_user_position;</div><div class='add'>+	u8 he_per_user_known;</div><div class='add'>+	u16 he_flags1;</div><div class='add'>+	u16 he_flags2;</div><div class='add'>+	u8 he_RU[4];</div><div class='add'>+	u16 he_data1;</div><div class='add'>+	u16 he_data2;</div><div class='add'>+	u16 he_data3;</div><div class='add'>+	u16 he_data4;</div><div class='add'>+	u16 he_data5;</div><div class='add'>+	u16 he_data6;</div><div class='add'>+	u32 ppdu_len;</div><div class='add'>+	u32 prev_ppdu_id;</div><div class='add'>+	u32 device_id;</div><div class='add'>+	u16 first_data_seq_ctrl;</div><div class='add'>+	u8 monitor_direct_used;</div><div class='add'>+	u8 data_sequence_control_info_valid;</div><div class='add'>+	u8 ltf_size;</div><div class='add'>+	u8 rxpcu_filter_pass;</div><div class='add'>+	s8 rssi_chain[8][8];</div><div class='add'>+	u32 num_users;</div><div class='add'>+	u32 mpdu_fcs_ok_bitmap[HAL_RX_NUM_WORDS_PER_PPDU_BITMAP];</div><div class='add'>+	u8 addr1[ETH_ALEN];</div><div class='add'>+	u8 addr2[ETH_ALEN];</div><div class='add'>+	u8 addr3[ETH_ALEN];</div><div class='add'>+	u8 addr4[ETH_ALEN];</div><div class='add'>+	struct hal_rx_user_status userstats[HAL_MAX_UL_MU_USERS];</div><div class='add'>+	u8 userid;</div><div class='add'>+	bool first_msdu_in_mpdu;</div><div class='add'>+	bool is_ampdu;</div><div class='add'>+	u8 medium_prot_type;</div><div class='add'>+	bool ppdu_continuation;</div><div class='add'>+	bool eht_usig;</div><div class='add'>+	struct hal_rx_u_sig_info u_sig_info;</div><div class='add'>+	bool is_eht;</div><div class='add'>+	struct hal_rx_eht_info eht_info;</div><div class='add'>+	struct hal_rx_tlv_aggr_info tlv_aggr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_RX_PPDU_START_INFO0_PPDU_ID			GENMASK(15, 0)</div><div class='add'>+#define HAL_RX_PPDU_START_INFO1_CHAN_NUM		GENMASK(15, 0)</div><div class='add'>+#define HAL_RX_PPDU_START_INFO1_CHAN_FREQ		GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+struct hal_rx_ppdu_start {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 ppdu_start_ts_31_0;</div><div class='add'>+	__le32 ppdu_start_ts_63_32;</div><div class='add'>+	__le32 rsvd[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO0_PEER_ID		GENMASK(13, 0)</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO0_DEVICE_ID		GENMASK(15, 14)</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO0_MPDU_CNT_FCS_ERR	GENMASK(26, 16)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO1_MPDU_CNT_FCS_OK	GENMASK(10, 0)</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO1_FC_VALID		BIT(11)</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO1_QOS_CTRL_VALID		BIT(12)</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO1_HT_CTRL_VALID		BIT(13)</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO1_PKT_TYPE              GENMASK(24, 21)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO2_AST_INDEX		GENMASK(15, 0)</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO2_FRAME_CTRL		GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO3_QOS_CTRL		GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO4_UDP_MSDU_CNT		GENMASK(15, 0)</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO4_TCP_MSDU_CNT		GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO5_OTHER_MSDU_CNT		GENMASK(15, 0)</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO5_TCP_ACK_MSDU_CNT	GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO6_TID_BITMAP		GENMASK(15, 0)</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO6_TID_EOSP_BITMAP	GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO7_MPDU_OK_BYTE_COUNT    GENMASK(24, 0)</div><div class='add'>+#define HAL_RX_PPDU_END_USER_STATS_INFO8_MPDU_ERR_BYTE_COUNT   GENMASK(24, 0)</div><div class='add'>+</div><div class='add'>+struct hal_rx_ppdu_end_user_stats {</div><div class='add'>+	__le32 rsvd0[2];</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le32 info3;</div><div class='add'>+	__le32 ht_ctrl;</div><div class='add'>+	__le32 rsvd1[2];</div><div class='add'>+	__le32 info4;</div><div class='add'>+	__le32 info5;</div><div class='add'>+	__le32 usr_resp_ref;</div><div class='add'>+	__le32 info6;</div><div class='add'>+	__le32 rsvd3[4];</div><div class='add'>+	__le32 info7;</div><div class='add'>+	__le32 rsvd4;</div><div class='add'>+	__le32 info8;</div><div class='add'>+	__le32 rsvd5[2];</div><div class='add'>+	__le32 usr_resp_ref_ext;</div><div class='add'>+	__le32 rsvd6;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hal_rx_ppdu_end_user_stats_ext {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le32 info3;</div><div class='add'>+	__le32 info4;</div><div class='add'>+	__le32 info5;</div><div class='add'>+	__le32 info6;</div><div class='add'>+	__le32 rsvd;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_RX_HT_SIG_INFO_INFO0_MCS		GENMASK(6, 0)</div><div class='add'>+#define HAL_RX_HT_SIG_INFO_INFO0_BW		BIT(7)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_HT_SIG_INFO_INFO1_STBC		GENMASK(5, 4)</div><div class='add'>+#define HAL_RX_HT_SIG_INFO_INFO1_FEC_CODING	BIT(6)</div><div class='add'>+#define HAL_RX_HT_SIG_INFO_INFO1_GI		BIT(7)</div><div class='add'>+</div><div class='add'>+struct hal_rx_ht_sig_info {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_RX_LSIG_B_INFO_INFO0_RATE	GENMASK(3, 0)</div><div class='add'>+#define HAL_RX_LSIG_B_INFO_INFO0_LEN	GENMASK(15, 4)</div><div class='add'>+</div><div class='add'>+struct hal_rx_lsig_b_info {</div><div class='add'>+	__le32 info0;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_RX_LSIG_A_INFO_INFO0_RATE		GENMASK(3, 0)</div><div class='add'>+#define HAL_RX_LSIG_A_INFO_INFO0_LEN		GENMASK(16, 5)</div><div class='add'>+#define HAL_RX_LSIG_A_INFO_INFO0_PKT_TYPE	GENMASK(27, 24)</div><div class='add'>+</div><div class='add'>+struct hal_rx_lsig_a_info {</div><div class='add'>+	__le32 info0;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_RX_VHT_SIG_A_INFO_INFO0_BW		GENMASK(1, 0)</div><div class='add'>+#define HAL_RX_VHT_SIG_A_INFO_INFO0_STBC	BIT(3)</div><div class='add'>+#define HAL_RX_VHT_SIG_A_INFO_INFO0_GROUP_ID	GENMASK(9, 4)</div><div class='add'>+#define HAL_RX_VHT_SIG_A_INFO_INFO0_NSTS	GENMASK(21, 10)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_VHT_SIG_A_INFO_INFO1_GI_SETTING		GENMASK(1, 0)</div><div class='add'>+#define HAL_RX_VHT_SIG_A_INFO_INFO1_SU_MU_CODING	BIT(2)</div><div class='add'>+#define HAL_RX_VHT_SIG_A_INFO_INFO1_MCS			GENMASK(7, 4)</div><div class='add'>+#define HAL_RX_VHT_SIG_A_INFO_INFO1_BEAMFORMED		BIT(8)</div><div class='add'>+</div><div class='add'>+struct hal_rx_vht_sig_a_info {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum hal_rx_vht_sig_a_gi_setting {</div><div class='add'>+	HAL_RX_VHT_SIG_A_NORMAL_GI = 0,</div><div class='add'>+	HAL_RX_VHT_SIG_A_SHORT_GI = 1,</div><div class='add'>+	HAL_RX_VHT_SIG_A_SHORT_GI_AMBIGUITY = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HE_GI_0_8 0</div><div class='add'>+#define HE_GI_0_4 1</div><div class='add'>+#define HE_GI_1_6 2</div><div class='add'>+#define HE_GI_3_2 3</div><div class='add'>+</div><div class='add'>+#define HE_LTF_1_X 0</div><div class='add'>+#define HE_LTF_2_X 1</div><div class='add'>+#define HE_LTF_4_X 2</div><div class='add'>+</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO0_TRANSMIT_MCS	GENMASK(6, 3)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO0_DCM		BIT(7)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO0_TRANSMIT_BW	GENMASK(20, 19)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO0_CP_LTF_SIZE	GENMASK(22, 21)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO0_NSTS		GENMASK(25, 23)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO0_BSS_COLOR		GENMASK(13, 8)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO0_SPATIAL_REUSE	GENMASK(18, 15)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO0_FORMAT_IND	BIT(0)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO0_BEAM_CHANGE	BIT(1)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO0_DL_UL_FLAG	BIT(2)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO1_TXOP_DURATION	GENMASK(6, 0)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO1_CODING		BIT(7)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO1_LDPC_EXTRA	BIT(8)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO1_STBC		BIT(9)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO1_TXBF		BIT(10)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO1_PKT_EXT_FACTOR	GENMASK(12, 11)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO1_PKT_EXT_PE_DISAM	BIT(13)</div><div class='add'>+#define HAL_RX_HE_SIG_A_SU_INFO_INFO1_DOPPLER_IND	BIT(15)</div><div class='add'>+</div><div class='add'>+struct hal_rx_he_sig_a_su_info {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO0_UL_FLAG		BIT(1)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO0_MCS_OF_SIGB		GENMASK(3, 1)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO0_DCM_OF_SIGB		BIT(4)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO0_BSS_COLOR		GENMASK(10, 5)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO0_SPATIAL_REUSE	GENMASK(14, 11)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO0_TRANSMIT_BW		GENMASK(17, 15)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO0_NUM_SIGB_SYMB	GENMASK(21, 18)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO0_COMP_MODE_SIGB	BIT(22)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO0_CP_LTF_SIZE		GENMASK(24, 23)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO0_DOPPLER_INDICATION	BIT(25)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO1_TXOP_DURATION	GENMASK(6, 0)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO1_NUM_LTF_SYMB	GENMASK(10, 8)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO1_LDPC_EXTRA		BIT(11)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO1_STBC		BIT(12)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO1_PKT_EXT_FACTOR	GENMASK(14, 13)</div><div class='add'>+#define HAL_RX_HE_SIG_A_MU_DL_INFO1_PKT_EXT_PE_DISAM	BIT(15)</div><div class='add'>+</div><div class='add'>+struct hal_rx_he_sig_a_mu_dl_info {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_RX_HE_SIG_B1_MU_INFO_INFO0_RU_ALLOCATION	GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+struct hal_rx_he_sig_b1_mu_info {</div><div class='add'>+	__le32 info0;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_RX_HE_SIG_B2_MU_INFO_INFO0_STA_ID           GENMASK(10, 0)</div><div class='add'>+#define HAL_RX_HE_SIG_B2_MU_INFO_INFO0_STA_MCS		GENMASK(18, 15)</div><div class='add'>+#define HAL_RX_HE_SIG_B2_MU_INFO_INFO0_STA_CODING	BIT(20)</div><div class='add'>+#define HAL_RX_HE_SIG_B2_MU_INFO_INFO0_STA_NSTS		GENMASK(31, 29)</div><div class='add'>+</div><div class='add'>+struct hal_rx_he_sig_b2_mu_info {</div><div class='add'>+	__le32 info0;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_ID	GENMASK(10, 0)</div><div class='add'>+#define HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_NSTS	GENMASK(13, 11)</div><div class='add'>+#define HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_TXBF	BIT(14)</div><div class='add'>+#define HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_MCS	GENMASK(18, 15)</div><div class='add'>+#define HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_DCM	BIT(19)</div><div class='add'>+#define HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_CODING	BIT(20)</div><div class='add'>+</div><div class='add'>+struct hal_rx_he_sig_b2_ofdma_info {</div><div class='add'>+	__le32 info0;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum hal_rx_ul_reception_type {</div><div class='add'>+	HAL_RECEPTION_TYPE_ULOFMDA,</div><div class='add'>+	HAL_RECEPTION_TYPE_ULMIMO,</div><div class='add'>+	HAL_RECEPTION_TYPE_OTHER,</div><div class='add'>+	HAL_RECEPTION_TYPE_FRAMELESS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_RX_RSSI_LEGACY_INFO_INFO0_RECEPTION		GENMASK(3, 0)</div><div class='add'>+#define HAL_RX_RSSI_LEGACY_INFO_INFO0_RX_BW		GENMASK(7, 5)</div><div class='add'>+#define HAL_RX_RSSI_LEGACY_INFO_INFO1_RSSI_COMB		GENMASK(15, 8)</div><div class='add'>+#define HAL_RX_RSSI_LEGACY_INFO_INFO2_RSSI_COMB_PPDU	GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+struct hal_rx_phyrx_rssi_legacy_info {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 rsvd0[39];</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 info2;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_RX_MPDU_START_INFO0_PPDU_ID			GENMASK(31, 16)</div><div class='add'>+#define HAL_RX_MPDU_START_INFO1_PEERID			GENMASK(29, 16)</div><div class='add'>+#define HAL_RX_MPDU_START_INFO1_DEVICE_ID		GENMASK(31, 30)</div><div class='add'>+#define HAL_RX_MPDU_START_INFO2_MPDU_LEN		GENMASK(13, 0)</div><div class='add'>+struct hal_rx_mpdu_start {</div><div class='add'>+	__le32 rsvd0[9];</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 rsvd1[2];</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le32 rsvd2[16];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hal_rx_msdu_end {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 rsvd0[9];</div><div class='add'>+	__le16 info00;</div><div class='add'>+	__le16 info01;</div><div class='add'>+	__le32 rsvd00[8];</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 rsvd1[10];</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le32 rsvd2;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_RX_PPDU_END_DURATION	GENMASK(23, 0)</div><div class='add'>+struct hal_rx_ppdu_end_duration {</div><div class='add'>+	__le32 rsvd0[9];</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 rsvd1[18];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hal_rx_rxpcu_classification_overview {</div><div class='add'>+	u32 rsvd0;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hal_rx_msdu_desc_info {</div><div class='add'>+	u32 msdu_flags;</div><div class='add'>+	u16 msdu_len; /* 14 bits for length */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_RX_NUM_MSDU_DESC 6</div><div class='add'>+struct hal_rx_msdu_list {</div><div class='add'>+	struct hal_rx_msdu_desc_info msdu_info[HAL_RX_NUM_MSDU_DESC];</div><div class='add'>+	u64 paddr[HAL_RX_NUM_MSDU_DESC];</div><div class='add'>+	u32 sw_cookie[HAL_RX_NUM_MSDU_DESC];</div><div class='add'>+	u8 rbm[HAL_RX_NUM_MSDU_DESC];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_RX_FBM_ACK_INFO0_ADDR1_31_0		GENMASK(31, 0)</div><div class='add'>+#define HAL_RX_FBM_ACK_INFO1_ADDR1_47_32	GENMASK(15, 0)</div><div class='add'>+#define HAL_RX_FBM_ACK_INFO1_ADDR2_15_0		GENMASK(31, 16)</div><div class='add'>+#define HAL_RX_FBM_ACK_INFO2_ADDR2_47_16	GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+struct hal_rx_frame_bitmap_ack {</div><div class='add'>+	__le32 reserved;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le32 reserved1[10];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_RX_RESP_REQ_INFO0_PPDU_ID		GENMASK(15, 0)</div><div class='add'>+#define HAL_RX_RESP_REQ_INFO0_RECEPTION_TYPE	BIT(16)</div><div class='add'>+#define HAL_RX_RESP_REQ_INFO1_DURATION		GENMASK(15, 0)</div><div class='add'>+#define HAL_RX_RESP_REQ_INFO1_RATE_MCS		GENMASK(24, 21)</div><div class='add'>+#define HAL_RX_RESP_REQ_INFO1_SGI		GENMASK(26, 25)</div><div class='add'>+#define HAL_RX_RESP_REQ_INFO1_STBC		BIT(27)</div><div class='add'>+#define HAL_RX_RESP_REQ_INFO1_LDPC		BIT(28)</div><div class='add'>+#define HAL_RX_RESP_REQ_INFO1_IS_AMPDU		BIT(29)</div><div class='add'>+#define HAL_RX_RESP_REQ_INFO2_NUM_USER		GENMASK(6, 0)</div><div class='add'>+#define HAL_RX_RESP_REQ_INFO3_ADDR1_31_0	GENMASK(31, 0)</div><div class='add'>+#define HAL_RX_RESP_REQ_INFO4_ADDR1_47_32	GENMASK(15, 0)</div><div class='add'>+#define HAL_RX_RESP_REQ_INFO4_ADDR1_15_0	GENMASK(31, 16)</div><div class='add'>+#define HAL_RX_RESP_REQ_INFO5_ADDR1_47_16	GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+struct hal_rx_resp_req_info {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 reserved[1];</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le32 reserved1[2];</div><div class='add'>+	__le32 info3;</div><div class='add'>+	__le32 info4;</div><div class='add'>+	__le32 info5;</div><div class='add'>+	__le32 reserved2[5];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_0 0xDDBEEF</div><div class='add'>+#define REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_1 0xADBEEF</div><div class='add'>+#define REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_2 0xBDBEEF</div><div class='add'>+#define REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_3 0xCDBEEF</div><div class='add'>+</div><div class='add'>+#define HAL_RX_UL_OFDMA_USER_INFO_V0_W0_VALID		BIT(30)</div><div class='add'>+#define HAL_RX_UL_OFDMA_USER_INFO_V0_W0_VER		BIT(31)</div><div class='add'>+#define HAL_RX_UL_OFDMA_USER_INFO_V0_W1_NSS		GENMASK(2, 0)</div><div class='add'>+#define HAL_RX_UL_OFDMA_USER_INFO_V0_W1_MCS		GENMASK(6, 3)</div><div class='add'>+#define HAL_RX_UL_OFDMA_USER_INFO_V0_W1_LDPC		BIT(7)</div><div class='add'>+#define HAL_RX_UL_OFDMA_USER_INFO_V0_W1_DCM		BIT(8)</div><div class='add'>+#define HAL_RX_UL_OFDMA_USER_INFO_V0_W1_RU_START	GENMASK(15, 9)</div><div class='add'>+#define HAL_RX_UL_OFDMA_USER_INFO_V0_W1_RU_SIZE		GENMASK(18, 16)</div><div class='add'>+</div><div class='add'>+/* HE Radiotap data1 Mask */</div><div class='add'>+#define HE_SU_FORMAT_TYPE 0x0000</div><div class='add'>+#define HE_EXT_SU_FORMAT_TYPE 0x0001</div><div class='add'>+#define HE_MU_FORMAT_TYPE  0x0002</div><div class='add'>+#define HE_TRIG_FORMAT_TYPE  0x0003</div><div class='add'>+#define HE_BEAM_CHANGE_KNOWN 0x0008</div><div class='add'>+#define HE_DL_UL_KNOWN 0x0010</div><div class='add'>+#define HE_MCS_KNOWN 0x0020</div><div class='add'>+#define HE_DCM_KNOWN 0x0040</div><div class='add'>+#define HE_CODING_KNOWN 0x0080</div><div class='add'>+#define HE_LDPC_EXTRA_SYMBOL_KNOWN 0x0100</div><div class='add'>+#define HE_STBC_KNOWN 0x0200</div><div class='add'>+#define HE_DATA_BW_RU_KNOWN 0x4000</div><div class='add'>+#define HE_DOPPLER_KNOWN 0x8000</div><div class='add'>+#define HE_BSS_COLOR_KNOWN 0x0004</div><div class='add'>+</div><div class='add'>+/* HE Radiotap data2 Mask */</div><div class='add'>+#define HE_GI_KNOWN 0x0002</div><div class='add'>+#define HE_TXBF_KNOWN 0x0010</div><div class='add'>+#define HE_PE_DISAMBIGUITY_KNOWN 0x0020</div><div class='add'>+#define HE_TXOP_KNOWN 0x0040</div><div class='add'>+#define HE_LTF_SYMBOLS_KNOWN 0x0004</div><div class='add'>+#define HE_PRE_FEC_PADDING_KNOWN 0x0008</div><div class='add'>+#define HE_MIDABLE_PERIODICITY_KNOWN 0x0080</div><div class='add'>+</div><div class='add'>+/* HE radiotap data3 shift values */</div><div class='add'>+#define HE_BEAM_CHANGE_SHIFT 6</div><div class='add'>+#define HE_DL_UL_SHIFT 7</div><div class='add'>+#define HE_TRANSMIT_MCS_SHIFT 8</div><div class='add'>+#define HE_DCM_SHIFT 12</div><div class='add'>+#define HE_CODING_SHIFT 13</div><div class='add'>+#define HE_LDPC_EXTRA_SYMBOL_SHIFT 14</div><div class='add'>+#define HE_STBC_SHIFT 15</div><div class='add'>+</div><div class='add'>+/* HE radiotap data4 shift values */</div><div class='add'>+#define HE_STA_ID_SHIFT 4</div><div class='add'>+</div><div class='add'>+/* HE radiotap data5 */</div><div class='add'>+#define HE_GI_SHIFT 4</div><div class='add'>+#define HE_LTF_SIZE_SHIFT 6</div><div class='add'>+#define HE_LTF_SYM_SHIFT 8</div><div class='add'>+#define HE_TXBF_SHIFT 14</div><div class='add'>+#define HE_PE_DISAMBIGUITY_SHIFT 15</div><div class='add'>+#define HE_PRE_FEC_PAD_SHIFT 12</div><div class='add'>+</div><div class='add'>+/* HE radiotap data6 */</div><div class='add'>+#define HE_DOPPLER_SHIFT 4</div><div class='add'>+#define HE_TXOP_SHIFT 8</div><div class='add'>+</div><div class='add'>+/* HE radiotap HE-MU flags1 */</div><div class='add'>+#define HE_SIG_B_MCS_KNOWN 0x0010</div><div class='add'>+#define HE_SIG_B_DCM_KNOWN 0x0040</div><div class='add'>+#define HE_SIG_B_SYM_NUM_KNOWN 0x8000</div><div class='add'>+#define HE_RU_0_KNOWN 0x0100</div><div class='add'>+#define HE_RU_1_KNOWN 0x0200</div><div class='add'>+#define HE_RU_2_KNOWN 0x0400</div><div class='add'>+#define HE_RU_3_KNOWN 0x0800</div><div class='add'>+#define HE_DCM_FLAG_1_SHIFT 5</div><div class='add'>+#define HE_SPATIAL_REUSE_MU_KNOWN 0x0100</div><div class='add'>+#define HE_SIG_B_COMPRESSION_FLAG_1_KNOWN 0x4000</div><div class='add'>+</div><div class='add'>+/* HE radiotap HE-MU flags2 */</div><div class='add'>+#define HE_SIG_B_COMPRESSION_FLAG_2_SHIFT 3</div><div class='add'>+#define HE_BW_KNOWN 0x0004</div><div class='add'>+#define HE_NUM_SIG_B_SYMBOLS_SHIFT 4</div><div class='add'>+#define HE_SIG_B_COMPRESSION_FLAG_2_KNOWN 0x0100</div><div class='add'>+#define HE_NUM_SIG_B_FLAG_2_SHIFT 9</div><div class='add'>+#define HE_LTF_FLAG_2_SYMBOLS_SHIFT 12</div><div class='add'>+#define HE_LTF_KNOWN 0x8000</div><div class='add'>+</div><div class='add'>+/* HE radiotap per_user_1 */</div><div class='add'>+#define HE_STA_SPATIAL_SHIFT 11</div><div class='add'>+#define HE_TXBF_SHIFT 14</div><div class='add'>+#define HE_RESERVED_SET_TO_1_SHIFT 19</div><div class='add'>+#define HE_STA_CODING_SHIFT 20</div><div class='add'>+</div><div class='add'>+/* HE radiotap per_user_2 */</div><div class='add'>+#define HE_STA_MCS_SHIFT 4</div><div class='add'>+#define HE_STA_DCM_SHIFT 5</div><div class='add'>+</div><div class='add'>+/* HE radiotap per user known */</div><div class='add'>+#define HE_USER_FIELD_POSITION_KNOWN 0x01</div><div class='add'>+#define HE_STA_ID_PER_USER_KNOWN 0x02</div><div class='add'>+#define HE_STA_NSTS_KNOWN 0x04</div><div class='add'>+#define HE_STA_TX_BF_KNOWN 0x08</div><div class='add'>+#define HE_STA_SPATIAL_CONFIG_KNOWN 0x10</div><div class='add'>+#define HE_STA_MCS_KNOWN 0x20</div><div class='add'>+#define HE_STA_DCM_KNOWN 0x40</div><div class='add'>+#define HE_STA_CODING_KNOWN 0x80</div><div class='add'>+</div><div class='add'>+#define HAL_RX_MPDU_ERR_FCS			BIT(0)</div><div class='add'>+#define HAL_RX_MPDU_ERR_DECRYPT			BIT(1)</div><div class='add'>+#define HAL_RX_MPDU_ERR_TKIP_MIC		BIT(2)</div><div class='add'>+#define HAL_RX_MPDU_ERR_AMSDU_ERR		BIT(3)</div><div class='add'>+#define HAL_RX_MPDU_ERR_OVERFLOW		BIT(4)</div><div class='add'>+#define HAL_RX_MPDU_ERR_MSDU_LEN		BIT(5)</div><div class='add'>+#define HAL_RX_MPDU_ERR_MPDU_LEN		BIT(6)</div><div class='add'>+#define HAL_RX_MPDU_ERR_UNENCRYPTED_FRAME	BIT(7)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_CMN_USR_INFO0_CP_SETTING			GENMASK(17, 16)</div><div class='add'>+#define HAL_RX_CMN_USR_INFO0_LTF_SIZE			GENMASK(19, 18)</div><div class='add'>+</div><div class='add'>+struct hal_phyrx_common_user_info {</div><div class='add'>+	__le32 rsvd[2];</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 rsvd1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_RX_EHT_SIG_NDP_CMN_INFO0_SPATIAL_REUSE	GENMASK(3, 0)</div><div class='add'>+#define HAL_RX_EHT_SIG_NDP_CMN_INFO0_GI_LTF		GENMASK(5, 4)</div><div class='add'>+#define HAL_RX_EHT_SIG_NDP_CMN_INFO0_NUM_LTF_SYM	GENMASK(8, 6)</div><div class='add'>+#define HAL_RX_EHT_SIG_NDP_CMN_INFO0_NSS		GENMASK(10, 7)</div><div class='add'>+#define HAL_RX_EHT_SIG_NDP_CMN_INFO0_BEAMFORMED		BIT(11)</div><div class='add'>+#define HAL_RX_EHT_SIG_NDP_CMN_INFO0_DISREGARD		GENMASK(13, 12)</div><div class='add'>+#define HAL_RX_EHT_SIG_NDP_CMN_INFO0_CRC		GENMASK(17, 14)</div><div class='add'>+</div><div class='add'>+struct hal_eht_sig_ndp_cmn_eb {</div><div class='add'>+	__le32 info0;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_RX_EHT_SIG_OVERFLOW_INFO0_SPATIAL_REUSE		GENMASK(3, 0)</div><div class='add'>+#define HAL_RX_EHT_SIG_OVERFLOW_INFO0_GI_LTF			GENMASK(5, 4)</div><div class='add'>+#define HAL_RX_EHT_SIG_OVERFLOW_INFO0_NUM_LTF_SYM		GENMASK(8, 6)</div><div class='add'>+#define HAL_RX_EHT_SIG_OVERFLOW_INFO0_LDPC_EXTA_SYM		BIT(9)</div><div class='add'>+#define HAL_RX_EHT_SIG_OVERFLOW_INFO0_PRE_FEC_PAD_FACTOR	GENMASK(11, 10)</div><div class='add'>+#define HAL_RX_EHT_SIG_OVERFLOW_INFO0_DISAMBIGUITY		BIT(12)</div><div class='add'>+#define HAL_RX_EHT_SIG_OVERFLOW_INFO0_DISREGARD			GENMASK(16, 13)</div><div class='add'>+</div><div class='add'>+struct hal_eht_sig_usig_overflow {</div><div class='add'>+	__le32 info0;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_STA_ID	GENMASK(10, 0)</div><div class='add'>+#define HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_MCS	GENMASK(14, 11)</div><div class='add'>+#define HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_VALIDATE	BIT(15)</div><div class='add'>+#define HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_NSS	GENMASK(19, 16)</div><div class='add'>+#define HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_BEAMFORMED	BIT(20)</div><div class='add'>+#define HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_CODING	BIT(21)</div><div class='add'>+#define HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_CRC	GENMASK(25, 22)</div><div class='add'>+</div><div class='add'>+struct hal_eht_sig_non_mu_mimo {</div><div class='add'>+	__le32 info0;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_RX_EHT_SIG_MUMIMO_USER_INFO0_STA_ID		GENMASK(10, 0)</div><div class='add'>+#define HAL_RX_EHT_SIG_MUMIMO_USER_INFO0_MCS		GENMASK(14, 11)</div><div class='add'>+#define HAL_RX_EHT_SIG_MUMIMO_USER_INFO0_CODING		BIT(15)</div><div class='add'>+#define HAL_RX_EHT_SIG_MUMIMO_USER_INFO0_SPATIAL_CODING	GENMASK(22, 16)</div><div class='add'>+#define HAL_RX_EHT_SIG_MUMIMO_USER_INFO0_CRC		GENMASK(26, 23)</div><div class='add'>+</div><div class='add'>+struct hal_eht_sig_mu_mimo {</div><div class='add'>+	__le32 info0;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union hal_eht_sig_user_field {</div><div class='add'>+	struct hal_eht_sig_mu_mimo mu_mimo;</div><div class='add'>+	struct hal_eht_sig_non_mu_mimo n_mu_mimo;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_RX_EHT_SIG_NON_OFDMA_INFO0_SPATIAL_REUSE		GENMASK(3, 0)</div><div class='add'>+#define HAL_RX_EHT_SIG_NON_OFDMA_INFO0_GI_LTF			GENMASK(5, 4)</div><div class='add'>+#define HAL_RX_EHT_SIG_NON_OFDMA_INFO0_NUM_LTF_SYM		GENMASK(8, 6)</div><div class='add'>+#define HAL_RX_EHT_SIG_NON_OFDMA_INFO0_LDPC_EXTA_SYM		BIT(9)</div><div class='add'>+#define HAL_RX_EHT_SIG_NON_OFDMA_INFO0_PRE_FEC_PAD_FACTOR	GENMASK(11, 10)</div><div class='add'>+#define HAL_RX_EHT_SIG_NON_OFDMA_INFO0_DISAMBIGUITY		BIT(12)</div><div class='add'>+#define HAL_RX_EHT_SIG_NON_OFDMA_INFO0_DISREGARD		GENMASK(16, 13)</div><div class='add'>+#define HAL_RX_EHT_SIG_NON_OFDMA_INFO0_NUM_USERS		GENMASK(19, 17)</div><div class='add'>+</div><div class='add'>+struct hal_eht_sig_non_ofdma_cmn_eb {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	union hal_eht_sig_user_field user_field;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_RX_EHT_SIG_OFDMA_EB1_SPATIAL_REUSE		GENMASK_ULL(3, 0)</div><div class='add'>+#define HAL_RX_EHT_SIG_OFDMA_EB1_GI_LTF			GENMASK_ULL(5, 4)</div><div class='add'>+#define HAL_RX_EHT_SIG_OFDMA_EB1_NUM_LFT_SYM		GENMASK_ULL(8, 6)</div><div class='add'>+#define HAL_RX_EHT_SIG_OFDMA_EB1_LDPC_EXTRA_SYM		BIT(9)</div><div class='add'>+#define HAL_RX_EHT_SIG_OFDMA_EB1_PRE_FEC_PAD_FACTOR	GENMASK_ULL(11, 10)</div><div class='add'>+#define HAL_RX_EHT_SIG_OFDMA_EB1_PRE_DISAMBIGUITY	BIT(12)</div><div class='add'>+#define HAL_RX_EHT_SIG_OFDMA_EB1_DISREGARD		GENMASK_ULL(16, 13)</div><div class='add'>+#define HAL_RX_EHT_SIG_OFDMA_EB1_RU_ALLOC_1_1		GENMASK_ULL(25, 17)</div><div class='add'>+#define HAL_RX_EHT_SIG_OFDMA_EB1_RU_ALLOC_1_2		GENMASK_ULL(34, 26)</div><div class='add'>+#define HAL_RX_EHT_SIG_OFDMA_EB1_CRC			GENMASK_ULL(30, 27)</div><div class='add'>+</div><div class='add'>+struct hal_eht_sig_ofdma_cmn_eb1 {</div><div class='add'>+	__le64 info0;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_1		GENMASK_ULL(8, 0)</div><div class='add'>+#define HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_2		GENMASK_ULL(17, 9)</div><div class='add'>+#define HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_3		GENMASK_ULL(26, 18)</div><div class='add'>+#define HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_4		GENMASK_ULL(35, 27)</div><div class='add'>+#define HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_5		GENMASK_ULL(44, 36)</div><div class='add'>+#define HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_6		GENMASK_ULL(53, 45)</div><div class='add'>+#define HAL_RX_EHT_SIG_OFDMA_EB2_MCS			GNEMASK_ULL(57, 54)</div><div class='add'>+</div><div class='add'>+struct hal_eht_sig_ofdma_cmn_eb2 {</div><div class='add'>+	__le64 info0;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hal_eht_sig_ofdma_cmn_eb {</div><div class='add'>+	struct hal_eht_sig_ofdma_cmn_eb1 eb1;</div><div class='add'>+	struct hal_eht_sig_ofdma_cmn_eb2 eb2;</div><div class='add'>+	union hal_eht_sig_user_field user_field;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum hal_eht_bw {</div><div class='add'>+	HAL_EHT_BW_20,</div><div class='add'>+	HAL_EHT_BW_40,</div><div class='add'>+	HAL_EHT_BW_80,</div><div class='add'>+	HAL_EHT_BW_160,</div><div class='add'>+	HAL_EHT_BW_320_1,</div><div class='add'>+	HAL_EHT_BW_320_2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_RX_USIG_CMN_INFO0_PHY_VERSION	GENMASK(2, 0)</div><div class='add'>+#define HAL_RX_USIG_CMN_INFO0_BW		GENMASK(5, 3)</div><div class='add'>+#define HAL_RX_USIG_CMN_INFO0_UL_DL		BIT(6)</div><div class='add'>+#define HAL_RX_USIG_CMN_INFO0_BSS_COLOR		GENMASK(12, 7)</div><div class='add'>+#define HAL_RX_USIG_CMN_INFO0_TXOP		GENMASK(19, 13)</div><div class='add'>+#define HAL_RX_USIG_CMN_INFO0_DISREGARD		GENMASK(25, 20)</div><div class='add'>+#define HAL_RX_USIG_CMN_INFO0_VALIDATE		BIT(26)</div><div class='add'>+</div><div class='add'>+struct hal_mon_usig_cmn {</div><div class='add'>+	__le32 info0;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_RX_USIG_TB_INFO0_PPDU_TYPE_COMP_MODE	GENMASK(1, 0)</div><div class='add'>+#define HAL_RX_USIG_TB_INFO0_VALIDATE			BIT(2)</div><div class='add'>+#define HAL_RX_USIG_TB_INFO0_SPATIAL_REUSE_1		GENMASK(6, 3)</div><div class='add'>+#define HAL_RX_USIG_TB_INFO0_SPATIAL_REUSE_2		GENMASK(10, 7)</div><div class='add'>+#define HAL_RX_USIG_TB_INFO0_DISREGARD_1		GENMASK(15, 11)</div><div class='add'>+#define HAL_RX_USIG_TB_INFO0_CRC			GENMASK(19, 16)</div><div class='add'>+#define HAL_RX_USIG_TB_INFO0_TAIL			GENMASK(25, 20)</div><div class='add'>+#define HAL_RX_USIG_TB_INFO0_RX_INTEG_CHECK_PASS	BIT(31)</div><div class='add'>+</div><div class='add'>+struct hal_mon_usig_tb {</div><div class='add'>+	__le32 info0;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_RX_USIG_MU_INFO0_PPDU_TYPE_COMP_MODE	GENMASK(1, 0)</div><div class='add'>+#define HAL_RX_USIG_MU_INFO0_VALIDATE_1			BIT(2)</div><div class='add'>+#define HAL_RX_USIG_MU_INFO0_PUNC_CH_INFO		GENMASK(7, 3)</div><div class='add'>+#define HAL_RX_USIG_MU_INFO0_VALIDATE_2			BIT(8)</div><div class='add'>+#define HAL_RX_USIG_MU_INFO0_EHT_SIG_MCS		GENMASK(10, 9)</div><div class='add'>+#define HAL_RX_USIG_MU_INFO0_NUM_EHT_SIG_SYM		GENMASK(15, 11)</div><div class='add'>+#define HAL_RX_USIG_MU_INFO0_CRC			GENMASK(20, 16)</div><div class='add'>+#define HAL_RX_USIG_MU_INFO0_TAIL			GENMASK(26, 21)</div><div class='add'>+#define HAL_RX_USIG_MU_INFO0_RX_INTEG_CHECK_PASS	BIT(31)</div><div class='add'>+</div><div class='add'>+struct hal_mon_usig_mu {</div><div class='add'>+	__le32 info0;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union hal_mon_usig_non_cmn {</div><div class='add'>+	struct hal_mon_usig_tb tb;</div><div class='add'>+	struct hal_mon_usig_mu mu;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hal_mon_usig_hdr {</div><div class='add'>+	struct hal_mon_usig_cmn cmn;</div><div class='add'>+	union hal_mon_usig_non_cmn non_cmn;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_RX_USR_INFO0_PHY_PPDU_ID		GENMASK(15, 0)</div><div class='add'>+#define HAL_RX_USR_INFO0_USR_RSSI		GENMASK(23, 16)</div><div class='add'>+#define HAL_RX_USR_INFO0_PKT_TYPE		GENMASK(27, 24)</div><div class='add'>+#define HAL_RX_USR_INFO0_STBC			BIT(28)</div><div class='add'>+#define HAL_RX_USR_INFO0_RECEPTION_TYPE		GENMASK(31, 29)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_USR_INFO1_MCS			GENMASK(3, 0)</div><div class='add'>+#define HAL_RX_USR_INFO1_SGI			GENMASK(5, 4)</div><div class='add'>+#define HAL_RX_USR_INFO1_HE_RANGING_NDP		BIT(6)</div><div class='add'>+#define HAL_RX_USR_INFO1_MIMO_SS_BITMAP		GENMASK(15, 8)</div><div class='add'>+#define HAL_RX_USR_INFO1_RX_BW			GENMASK(18, 16)</div><div class='add'>+#define HAL_RX_USR_INFO1_DL_OFMDA_USR_IDX	GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_USR_INFO2_DL_OFDMA_CONTENT_CHAN	BIT(0)</div><div class='add'>+#define HAL_RX_USR_INFO2_NSS			GENMASK(10, 8)</div><div class='add'>+#define HAL_RX_USR_INFO2_STREAM_OFFSET		GENMASK(13, 11)</div><div class='add'>+#define HAL_RX_USR_INFO2_STA_DCM		BIT(14)</div><div class='add'>+#define HAL_RX_USR_INFO2_LDPC			BIT(15)</div><div class='add'>+#define HAL_RX_USR_INFO2_RU_TYPE_80_0		GENMASK(19, 16)</div><div class='add'>+#define HAL_RX_USR_INFO2_RU_TYPE_80_1		GENMASK(23, 20)</div><div class='add'>+#define HAL_RX_USR_INFO2_RU_TYPE_80_2		GENMASK(27, 24)</div><div class='add'>+#define HAL_RX_USR_INFO2_RU_TYPE_80_3		GENMASK(31, 28)</div><div class='add'>+</div><div class='add'>+#define HAL_RX_USR_INFO3_RU_START_IDX_80_0	GENMASK(5, 0)</div><div class='add'>+#define HAL_RX_USR_INFO3_RU_START_IDX_80_1	GENMASK(13, 8)</div><div class='add'>+#define HAL_RX_USR_INFO3_RU_START_IDX_80_2	GENMASK(21, 16)</div><div class='add'>+#define HAL_RX_USR_INFO3_RU_START_IDX_80_3	GENMASK(29, 24)</div><div class='add'>+</div><div class='add'>+struct hal_receive_user_info {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le32 info3;</div><div class='add'>+	__le32 user_fd_rssi_seg0;</div><div class='add'>+	__le32 user_fd_rssi_seg1;</div><div class='add'>+	__le32 user_fd_rssi_seg2;</div><div class='add'>+	__le32 user_fd_rssi_seg3;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum hal_mon_reception_type {</div><div class='add'>+	HAL_RECEPTION_TYPE_SU,</div><div class='add'>+	HAL_RECEPTION_TYPE_DL_MU_MIMO,</div><div class='add'>+	HAL_RECEPTION_TYPE_DL_MU_OFMA,</div><div class='add'>+	HAL_RECEPTION_TYPE_DL_MU_OFDMA_MIMO,</div><div class='add'>+	HAL_RECEPTION_TYPE_UL_MU_MIMO,</div><div class='add'>+	HAL_RECEPTION_TYPE_UL_MU_OFDMA,</div><div class='add'>+	HAL_RECEPTION_TYPE_UL_MU_OFDMA_MIMO,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Different allowed RU in 11BE */</div><div class='add'>+#define HAL_EHT_RU_26		0ULL</div><div class='add'>+#define HAL_EHT_RU_52		1ULL</div><div class='add'>+#define HAL_EHT_RU_78		2ULL</div><div class='add'>+#define HAL_EHT_RU_106		3ULL</div><div class='add'>+#define HAL_EHT_RU_132		4ULL</div><div class='add'>+#define HAL_EHT_RU_242		5ULL</div><div class='add'>+#define HAL_EHT_RU_484		6ULL</div><div class='add'>+#define HAL_EHT_RU_726		7ULL</div><div class='add'>+#define HAL_EHT_RU_996		8ULL</div><div class='add'>+#define HAL_EHT_RU_996x2	9ULL</div><div class='add'>+#define HAL_EHT_RU_996x3	10ULL</div><div class='add'>+#define HAL_EHT_RU_996x4	11ULL</div><div class='add'>+#define HAL_EHT_RU_NONE		15ULL</div><div class='add'>+#define HAL_EHT_RU_INVALID	31ULL</div><div class='add'>+/* MRUs spanning above 80Mhz</div><div class='add'>+ * HAL_EHT_RU_996_484 = HAL_EHT_RU_484 + HAL_EHT_RU_996 + 4 (reserved)</div><div class='add'>+ */</div><div class='add'>+#define HAL_EHT_RU_996_484	18ULL</div><div class='add'>+#define HAL_EHT_RU_996x2_484	28ULL</div><div class='add'>+#define HAL_EHT_RU_996x3_484	40ULL</div><div class='add'>+#define HAL_EHT_RU_996_484_242	23ULL</div><div class='add'>+</div><div class='add'>+#define NUM_RU_BITS_PER80	16</div><div class='add'>+#define NUM_RU_BITS_PER20	4</div><div class='add'>+</div><div class='add'>+/* Different per_80Mhz band in 320Mhz bandwidth */</div><div class='add'>+#define HAL_80_0	0</div><div class='add'>+#define HAL_80_1	1</div><div class='add'>+#define HAL_80_2	2</div><div class='add'>+#define HAL_80_3	3</div><div class='add'>+</div><div class='add'>+#define HAL_RU_80MHZ(num_band)		((num_band) * NUM_RU_BITS_PER80)</div><div class='add'>+#define HAL_RU_20MHZ(idx_per_80)	((idx_per_80) * NUM_RU_BITS_PER20)</div><div class='add'>+</div><div class='add'>+#define HAL_RU_SHIFT(num_band, idx_per_80)	\</div><div class='add'>+		(HAL_RU_80MHZ(num_band) + HAL_RU_20MHZ(idx_per_80))</div><div class='add'>+</div><div class='add'>+#define HAL_RU(ru, num_band, idx_per_80)	\</div><div class='add'>+		((u64)(ru) &lt;&lt; HAL_RU_SHIFT(num_band, idx_per_80))</div><div class='add'>+</div><div class='add'>+/* MRU-996+484 */</div><div class='add'>+#define HAL_EHT_RU_996_484_0	(HAL_RU(HAL_EHT_RU_484, HAL_80_0, 1) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996, HAL_80_1, 0))</div><div class='add'>+#define HAL_EHT_RU_996_484_1	(HAL_RU(HAL_EHT_RU_484, HAL_80_0, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996, HAL_80_1, 0))</div><div class='add'>+#define HAL_EHT_RU_996_484_2	(HAL_RU(HAL_EHT_RU_996, HAL_80_0, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_484, HAL_80_1, 1))</div><div class='add'>+#define HAL_EHT_RU_996_484_3	(HAL_RU(HAL_EHT_RU_996, HAL_80_0, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_484, HAL_80_1, 0))</div><div class='add'>+#define HAL_EHT_RU_996_484_4	(HAL_RU(HAL_EHT_RU_484, HAL_80_2, 1) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996, HAL_80_3, 0))</div><div class='add'>+#define HAL_EHT_RU_996_484_5	(HAL_RU(HAL_EHT_RU_484, HAL_80_2, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996, HAL_80_3, 0))</div><div class='add'>+#define HAL_EHT_RU_996_484_6	(HAL_RU(HAL_EHT_RU_996, HAL_80_2, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_484, HAL_80_3, 1))</div><div class='add'>+#define HAL_EHT_RU_996_484_7	(HAL_RU(HAL_EHT_RU_996, HAL_80_2, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_484, HAL_80_3, 0))</div><div class='add'>+</div><div class='add'>+/* MRU-996x2+484 */</div><div class='add'>+#define HAL_EHT_RU_996x2_484_0	(HAL_RU(HAL_EHT_RU_484, HAL_80_0, 1) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x2, HAL_80_1, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x2, HAL_80_2, 0))</div><div class='add'>+#define HAL_EHT_RU_996x2_484_1	(HAL_RU(HAL_EHT_RU_484, HAL_80_0, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x2, HAL_80_1, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x2, HAL_80_2, 0))</div><div class='add'>+#define HAL_EHT_RU_996x2_484_2	(HAL_RU(HAL_EHT_RU_996x2, HAL_80_0, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_484, HAL_80_1, 1) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x2, HAL_80_2, 0))</div><div class='add'>+#define HAL_EHT_RU_996x2_484_3	(HAL_RU(HAL_EHT_RU_996x2, HAL_80_0, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_484, HAL_80_1, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x2, HAL_80_2, 0))</div><div class='add'>+#define HAL_EHT_RU_996x2_484_4	(HAL_RU(HAL_EHT_RU_996x2, HAL_80_0, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x2, HAL_80_1, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_484, HAL_80_2, 1))</div><div class='add'>+#define HAL_EHT_RU_996x2_484_5	(HAL_RU(HAL_EHT_RU_996x2, HAL_80_0, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x2, HAL_80_1, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_484, HAL_80_2, 0))</div><div class='add'>+#define HAL_EHT_RU_996x2_484_6	(HAL_RU(HAL_EHT_RU_484, HAL_80_1, 1) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x2, HAL_80_2, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x2, HAL_80_3, 0))</div><div class='add'>+#define HAL_EHT_RU_996x2_484_7	(HAL_RU(HAL_EHT_RU_484, HAL_80_1, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x2, HAL_80_2, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x2, HAL_80_3, 0))</div><div class='add'>+#define HAL_EHT_RU_996x2_484_8	(HAL_RU(HAL_EHT_RU_996x2, HAL_80_1, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_484, HAL_80_2, 1) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x2, HAL_80_3, 0))</div><div class='add'>+#define HAL_EHT_RU_996x2_484_9	(HAL_RU(HAL_EHT_RU_996x2, HAL_80_1, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_484, HAL_80_2, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x2, HAL_80_3, 0))</div><div class='add'>+#define HAL_EHT_RU_996x2_484_10	(HAL_RU(HAL_EHT_RU_996x2, HAL_80_1, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x2, HAL_80_2, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_484, HAL_80_3, 1))</div><div class='add'>+#define HAL_EHT_RU_996x2_484_11	(HAL_RU(HAL_EHT_RU_996x2, HAL_80_1, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x2, HAL_80_2, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_484, HAL_80_3, 0))</div><div class='add'>+</div><div class='add'>+/* MRU-996x3+484 */</div><div class='add'>+#define HAL_EHT_RU_996x3_484_0	(HAL_RU(HAL_EHT_RU_484, HAL_80_0, 1) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x3, HAL_80_1, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x3, HAL_80_2, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x3, HAL_80_3, 0))</div><div class='add'>+#define HAL_EHT_RU_996x3_484_1	(HAL_RU(HAL_EHT_RU_484, HAL_80_0, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x3, HAL_80_1, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x3, HAL_80_2, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x3, HAL_80_3, 0))</div><div class='add'>+#define HAL_EHT_RU_996x3_484_2	(HAL_RU(HAL_EHT_RU_996x3, HAL_80_0, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_484, HAL_80_1, 1) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x3, HAL_80_2, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x3, HAL_80_3, 0))</div><div class='add'>+#define HAL_EHT_RU_996x3_484_3	(HAL_RU(HAL_EHT_RU_996x3, HAL_80_0, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_484, HAL_80_1, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x3, HAL_80_2, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x3, HAL_80_3, 0))</div><div class='add'>+#define HAL_EHT_RU_996x3_484_4	(HAL_RU(HAL_EHT_RU_996x3, HAL_80_0, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x3, HAL_80_1, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_484, HAL_80_2, 1) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x3, HAL_80_3, 0))</div><div class='add'>+#define HAL_EHT_RU_996x3_484_5	(HAL_RU(HAL_EHT_RU_996x3, HAL_80_0, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x3, HAL_80_1, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_484, HAL_80_2, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x3, HAL_80_3, 0))</div><div class='add'>+#define HAL_EHT_RU_996x3_484_6	(HAL_RU(HAL_EHT_RU_996x3, HAL_80_0, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x3, HAL_80_1, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x3, HAL_80_2, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_484, HAL_80_3, 1))</div><div class='add'>+#define HAL_EHT_RU_996x3_484_7	(HAL_RU(HAL_EHT_RU_996x3, HAL_80_0, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x3, HAL_80_1, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_996x3, HAL_80_2, 0) |	\</div><div class='add'>+				 HAL_RU(HAL_EHT_RU_484, HAL_80_3, 0))</div><div class='add'>+</div><div class='add'>+#define HAL_RU_PER80(ru_per80, num_80mhz, ru_idx_per80mhz) \</div><div class='add'>+			(HAL_RU(ru_per80, num_80mhz, ru_idx_per80mhz))</div><div class='add'>+</div><div class='add'>+#define RU_INVALID		0</div><div class='add'>+#define RU_26			1</div><div class='add'>+#define RU_52			2</div><div class='add'>+#define RU_106			4</div><div class='add'>+#define RU_242			9</div><div class='add'>+#define RU_484			18</div><div class='add'>+#define RU_996			37</div><div class='add'>+#define RU_2X996		74</div><div class='add'>+#define RU_3X996		111</div><div class='add'>+#define RU_4X996		148</div><div class='add'>+#define RU_52_26		(RU_52 + RU_26)</div><div class='add'>+#define RU_106_26		(RU_106 + RU_26)</div><div class='add'>+#define RU_484_242		(RU_484 + RU_242)</div><div class='add'>+#define RU_996_484		(RU_996 + RU_484)</div><div class='add'>+#define RU_996_484_242		(RU_996 + RU_484_242)</div><div class='add'>+#define RU_2X996_484		(RU_2X996 + RU_484)</div><div class='add'>+#define RU_3X996_484		(RU_3X996 + RU_484)</div><div class='add'>+</div><div class='add'>+enum ath12k_eht_ru_size {</div><div class='add'>+	ATH12K_EHT_RU_26,</div><div class='add'>+	ATH12K_EHT_RU_52,</div><div class='add'>+	ATH12K_EHT_RU_106,</div><div class='add'>+	ATH12K_EHT_RU_242,</div><div class='add'>+	ATH12K_EHT_RU_484,</div><div class='add'>+	ATH12K_EHT_RU_996,</div><div class='add'>+	ATH12K_EHT_RU_996x2,</div><div class='add'>+	ATH12K_EHT_RU_996x4,</div><div class='add'>+	ATH12K_EHT_RU_52_26,</div><div class='add'>+	ATH12K_EHT_RU_106_26,</div><div class='add'>+	ATH12K_EHT_RU_484_242,</div><div class='add'>+	ATH12K_EHT_RU_996_484,</div><div class='add'>+	ATH12K_EHT_RU_996_484_242,</div><div class='add'>+	ATH12K_EHT_RU_996x2_484,</div><div class='add'>+	ATH12K_EHT_RU_996x3,</div><div class='add'>+	ATH12K_EHT_RU_996x3_484,</div><div class='add'>+</div><div class='add'>+	/* Keep last */</div><div class='add'>+	ATH12K_EHT_RU_INVALID,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_RX_RU_ALLOC_TYPE_MAX	ATH12K_EHT_RU_INVALID</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+enum nl80211_he_ru_alloc ath12k_he_ru_tones_to_nl80211_he_ru_alloc(u16 ru_tones)</div><div class='add'>+{</div><div class='add'>+	enum nl80211_he_ru_alloc ret;</div><div class='add'>+</div><div class='add'>+	switch (ru_tones) {</div><div class='add'>+	case RU_52:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_RU_ALLOC_52;</div><div class='add'>+		break;</div><div class='add'>+	case RU_106:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_RU_ALLOC_106;</div><div class='add'>+		break;</div><div class='add'>+	case RU_242:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_RU_ALLOC_242;</div><div class='add'>+		break;</div><div class='add'>+	case RU_484:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_RU_ALLOC_484;</div><div class='add'>+		break;</div><div class='add'>+	case RU_996:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_RU_ALLOC_996;</div><div class='add'>+		break;</div><div class='add'>+	case RU_2X996:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_RU_ALLOC_2x996;</div><div class='add'>+		break;</div><div class='add'>+	case RU_26:</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		ret = NL80211_RATE_INFO_HE_RU_ALLOC_26;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_reo_status_queue_stats(struct ath12k_base *ab,</div><div class='add'>+				       struct hal_tlv_64_hdr *tlv,</div><div class='add'>+				       struct hal_reo_status *status);</div><div class='add'>+void ath12k_hal_reo_flush_queue_status(struct ath12k_base *ab,</div><div class='add'>+				       struct hal_tlv_64_hdr *tlv,</div><div class='add'>+				       struct hal_reo_status *status);</div><div class='add'>+void ath12k_hal_reo_flush_cache_status(struct ath12k_base *ab,</div><div class='add'>+				       struct hal_tlv_64_hdr *tlv,</div><div class='add'>+				       struct hal_reo_status *status);</div><div class='add'>+void ath12k_hal_reo_unblk_cache_status(struct ath12k_base *ab,</div><div class='add'>+				       struct hal_tlv_64_hdr *tlv,</div><div class='add'>+				       struct hal_reo_status *status);</div><div class='add'>+void ath12k_hal_reo_flush_timeout_list_status(struct ath12k_base *ab,</div><div class='add'>+					      struct hal_tlv_64_hdr *tlv,</div><div class='add'>+					      struct hal_reo_status *status);</div><div class='add'>+void ath12k_hal_reo_desc_thresh_reached_status(struct ath12k_base *ab,</div><div class='add'>+					       struct hal_tlv_64_hdr *tlv,</div><div class='add'>+					       struct hal_reo_status *status);</div><div class='add'>+void ath12k_hal_reo_update_rx_reo_queue_status(struct ath12k_base *ab,</div><div class='add'>+					       struct hal_tlv_64_hdr *tlv,</div><div class='add'>+					       struct hal_reo_status *status);</div><div class='add'>+void ath12k_hal_rx_msdu_link_info_get(struct hal_rx_msdu_link *link, u32 *num_msdus,</div><div class='add'>+				      u32 *msdu_cookies,</div><div class='add'>+				      enum hal_rx_buf_return_buf_manager *rbm);</div><div class='add'>+void ath12k_hal_rx_msdu_link_desc_set(struct ath12k_base *ab,</div><div class='add'>+				      struct hal_wbm_release_ring *desc,</div><div class='add'>+				      struct ath12k_buffer_addr *buf_addr_info,</div><div class='add'>+				      enum hal_wbm_rel_bm_act action);</div><div class='add'>+void ath12k_hal_rx_buf_addr_info_set(struct ath12k_buffer_addr *binfo,</div><div class='add'>+				     dma_addr_t paddr, u32 cookie, u8 manager);</div><div class='add'>+void ath12k_hal_rx_buf_addr_info_get(struct ath12k_buffer_addr *binfo,</div><div class='add'>+				     dma_addr_t *paddr,</div><div class='add'>+				     u32 *cookie, u8 *rbm);</div><div class='add'>+int ath12k_hal_desc_reo_parse_err(struct ath12k_base *ab,</div><div class='add'>+				  struct hal_reo_dest_ring *desc,</div><div class='add'>+				  dma_addr_t *paddr, u32 *desc_bank);</div><div class='add'>+int ath12k_hal_wbm_desc_parse_err(struct ath12k_base *ab, void *desc,</div><div class='add'>+				  struct hal_rx_wbm_rel_info *rel_info);</div><div class='add'>+void ath12k_hal_rx_reo_ent_paddr_get(struct ath12k_base *ab,</div><div class='add'>+				     struct ath12k_buffer_addr *buff_addr,</div><div class='add'>+				     dma_addr_t *paddr, u32 *cookie);</div><div class='add'>+void ath12k_hal_rx_reo_ent_buf_paddr_get(void *rx_desc, dma_addr_t *paddr, u32 *sw_cookie,</div><div class='add'>+					 struct ath12k_buffer_addr **pp_buf_addr,</div><div class='add'>+					 u8 *rbm, u32 *msdu_cnt);</div><div class='add'>+void ath12k_hal_rx_msdu_list_get(struct ath12k *ar,</div><div class='add'>+				 struct hal_rx_msdu_link *link_desc,</div><div class='add'>+				 struct hal_rx_msdu_list *msdu_list,</div><div class='add'>+				 u16 *num_msdus);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/hal_tx.c b/drivers/net/wireless/ath/ath12k/hal_tx.c<br/>new file mode 100644<br/>index 000000000000..869e07e406fe<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/hal_tx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/hal_tx.c</a></div><div class='hunk'>@@ -0,0 +1,145 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "hal_desc.h"</div><div class='add'>+#include "hal.h"</div><div class='add'>+#include "hal_tx.h"</div><div class='add'>+#include "hif.h"</div><div class='add'>+</div><div class='add'>+#define DSCP_TID_MAP_TBL_ENTRY_SIZE 64</div><div class='add'>+</div><div class='add'>+/* dscp_tid_map - Default DSCP-TID mapping</div><div class='add'>+ *=================</div><div class='add'>+ * DSCP        TID</div><div class='add'>+ *=================</div><div class='add'>+ * 000xxx      0</div><div class='add'>+ * 001xxx      1</div><div class='add'>+ * 010xxx      2</div><div class='add'>+ * 011xxx      3</div><div class='add'>+ * 100xxx      4</div><div class='add'>+ * 101xxx      5</div><div class='add'>+ * 110xxx      6</div><div class='add'>+ * 111xxx      7</div><div class='add'>+ */</div><div class='add'>+static inline u8 dscp2tid(u8 dscp)</div><div class='add'>+{</div><div class='add'>+	return dscp &gt;&gt; 3;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_tx_cmd_desc_setup(struct ath12k_base *ab,</div><div class='add'>+				  struct hal_tcl_data_cmd *tcl_cmd,</div><div class='add'>+				  struct hal_tx_info *ti)</div><div class='add'>+{</div><div class='add'>+	tcl_cmd-&gt;buf_addr_info.info0 =</div><div class='add'>+		le32_encode_bits(ti-&gt;paddr, BUFFER_ADDR_INFO0_ADDR);</div><div class='add'>+	tcl_cmd-&gt;buf_addr_info.info1 =</div><div class='add'>+		le32_encode_bits(((uint64_t)ti-&gt;paddr &gt;&gt; HAL_ADDR_MSB_REG_SHIFT),</div><div class='add'>+				 BUFFER_ADDR_INFO1_ADDR);</div><div class='add'>+	tcl_cmd-&gt;buf_addr_info.info1 |=</div><div class='add'>+		le32_encode_bits((ti-&gt;rbm_id), BUFFER_ADDR_INFO1_RET_BUF_MGR) |</div><div class='add'>+		le32_encode_bits(ti-&gt;desc_id, BUFFER_ADDR_INFO1_SW_COOKIE);</div><div class='add'>+</div><div class='add'>+	tcl_cmd-&gt;info0 =</div><div class='add'>+		le32_encode_bits(ti-&gt;type, HAL_TCL_DATA_CMD_INFO0_DESC_TYPE) |</div><div class='add'>+		le32_encode_bits(ti-&gt;bank_id, HAL_TCL_DATA_CMD_INFO0_BANK_ID);</div><div class='add'>+</div><div class='add'>+	tcl_cmd-&gt;info1 =</div><div class='add'>+		le32_encode_bits(ti-&gt;meta_data_flags,</div><div class='add'>+				 HAL_TCL_DATA_CMD_INFO1_CMD_NUM);</div><div class='add'>+</div><div class='add'>+	tcl_cmd-&gt;info2 = cpu_to_le32(ti-&gt;flags0) |</div><div class='add'>+		le32_encode_bits(ti-&gt;data_len, HAL_TCL_DATA_CMD_INFO2_DATA_LEN) |</div><div class='add'>+		le32_encode_bits(ti-&gt;pkt_offset, HAL_TCL_DATA_CMD_INFO2_PKT_OFFSET);</div><div class='add'>+</div><div class='add'>+	tcl_cmd-&gt;info3 = cpu_to_le32(ti-&gt;flags1) |</div><div class='add'>+		le32_encode_bits(ti-&gt;tid, HAL_TCL_DATA_CMD_INFO3_TID) |</div><div class='add'>+		le32_encode_bits(ti-&gt;lmac_id, HAL_TCL_DATA_CMD_INFO3_PMAC_ID) |</div><div class='add'>+		le32_encode_bits(ti-&gt;vdev_id, HAL_TCL_DATA_CMD_INFO3_VDEV_ID);</div><div class='add'>+</div><div class='add'>+	tcl_cmd-&gt;info4 = le32_encode_bits(ti-&gt;bss_ast_idx,</div><div class='add'>+					  HAL_TCL_DATA_CMD_INFO4_SEARCH_INDEX) |</div><div class='add'>+			 le32_encode_bits(ti-&gt;bss_ast_hash,</div><div class='add'>+					  HAL_TCL_DATA_CMD_INFO4_CACHE_SET_NUM);</div><div class='add'>+	tcl_cmd-&gt;info5 = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_tx_set_dscp_tid_map(struct ath12k_base *ab, int id)</div><div class='add'>+{</div><div class='add'>+	u32 ctrl_reg_val;</div><div class='add'>+	u32 addr;</div><div class='add'>+	u8 hw_map_val[HAL_DSCP_TID_TBL_SIZE], dscp, tid;</div><div class='add'>+	int i;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	ctrl_reg_val = ath12k_hif_read32(ab, HAL_SEQ_WCSS_UMAC_TCL_REG +</div><div class='add'>+					 HAL_TCL1_RING_CMN_CTRL_REG);</div><div class='add'>+	/* Enable read/write access */</div><div class='add'>+	ctrl_reg_val |= HAL_TCL1_RING_CMN_CTRL_DSCP_TID_MAP_PROG_EN;</div><div class='add'>+	ath12k_hif_write32(ab, HAL_SEQ_WCSS_UMAC_TCL_REG +</div><div class='add'>+			   HAL_TCL1_RING_CMN_CTRL_REG, ctrl_reg_val);</div><div class='add'>+</div><div class='add'>+	addr = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL1_RING_DSCP_TID_MAP +</div><div class='add'>+	       (4 * id * (HAL_DSCP_TID_TBL_SIZE / 4));</div><div class='add'>+</div><div class='add'>+	/* Configure each DSCP-TID mapping in three bits there by configure</div><div class='add'>+	 * three bytes in an iteration.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0, dscp = 0; i &lt; HAL_DSCP_TID_TBL_SIZE; i += 3) {</div><div class='add'>+		tid = dscp2tid(dscp);</div><div class='add'>+		value = u32_encode_bits(tid, HAL_TCL1_RING_FIELD_DSCP_TID_MAP0);</div><div class='add'>+		dscp++;</div><div class='add'>+</div><div class='add'>+		tid = dscp2tid(dscp);</div><div class='add'>+		value |= u32_encode_bits(tid, HAL_TCL1_RING_FIELD_DSCP_TID_MAP1);</div><div class='add'>+		dscp++;</div><div class='add'>+</div><div class='add'>+		tid = dscp2tid(dscp);</div><div class='add'>+		value |= u32_encode_bits(tid, HAL_TCL1_RING_FIELD_DSCP_TID_MAP2);</div><div class='add'>+		dscp++;</div><div class='add'>+</div><div class='add'>+		tid = dscp2tid(dscp);</div><div class='add'>+		value |= u32_encode_bits(tid, HAL_TCL1_RING_FIELD_DSCP_TID_MAP3);</div><div class='add'>+		dscp++;</div><div class='add'>+</div><div class='add'>+		tid = dscp2tid(dscp);</div><div class='add'>+		value |= u32_encode_bits(tid, HAL_TCL1_RING_FIELD_DSCP_TID_MAP4);</div><div class='add'>+		dscp++;</div><div class='add'>+</div><div class='add'>+		tid = dscp2tid(dscp);</div><div class='add'>+		value |= u32_encode_bits(tid, HAL_TCL1_RING_FIELD_DSCP_TID_MAP5);</div><div class='add'>+		dscp++;</div><div class='add'>+</div><div class='add'>+		tid = dscp2tid(dscp);</div><div class='add'>+		value |= u32_encode_bits(tid, HAL_TCL1_RING_FIELD_DSCP_TID_MAP6);</div><div class='add'>+		dscp++;</div><div class='add'>+</div><div class='add'>+		tid = dscp2tid(dscp);</div><div class='add'>+		value |= u32_encode_bits(tid, HAL_TCL1_RING_FIELD_DSCP_TID_MAP7);</div><div class='add'>+		dscp++;</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;hw_map_val[i], &amp;value, 3);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HAL_DSCP_TID_TBL_SIZE; i += 4) {</div><div class='add'>+		ath12k_hif_write32(ab, addr, *(u32 *)&amp;hw_map_val[i]);</div><div class='add'>+		addr += 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable read/write access */</div><div class='add'>+	ctrl_reg_val = ath12k_hif_read32(ab, HAL_SEQ_WCSS_UMAC_TCL_REG +</div><div class='add'>+					 HAL_TCL1_RING_CMN_CTRL_REG);</div><div class='add'>+	ctrl_reg_val &amp;= ~HAL_TCL1_RING_CMN_CTRL_DSCP_TID_MAP_PROG_EN;</div><div class='add'>+	ath12k_hif_write32(ab, HAL_SEQ_WCSS_UMAC_TCL_REG +</div><div class='add'>+			   HAL_TCL1_RING_CMN_CTRL_REG,</div><div class='add'>+			   ctrl_reg_val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_hal_tx_configure_bank_register(struct ath12k_base *ab, u32 bank_config,</div><div class='add'>+					   u8 bank_id)</div><div class='add'>+{</div><div class='add'>+	ath12k_hif_write32(ab, HAL_TCL_SW_CONFIG_BANK_ADDR + 4 * bank_id,</div><div class='add'>+			   bank_config);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/hal_tx.h b/drivers/net/wireless/ath/ath12k/hal_tx.h<br/>new file mode 100644<br/>index 000000000000..eb065a79f6c6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/hal_tx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/hal_tx.h</a></div><div class='hunk'>@@ -0,0 +1,200 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2022, 2024-2025 Qualcomm Innovation Center, Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH12K_HAL_TX_H</div><div class='add'>+#define ATH12K_HAL_TX_H</div><div class='add'>+</div><div class='add'>+#include "hal_desc.h"</div><div class='add'>+#include "core.h"</div><div class='add'>+</div><div class='add'>+#define HAL_TX_ADDRX_EN			1</div><div class='add'>+#define HAL_TX_ADDRY_EN			2</div><div class='add'>+</div><div class='add'>+#define HAL_TX_ADDR_SEARCH_DEFAULT	0</div><div class='add'>+#define HAL_TX_ADDR_SEARCH_INDEX	1</div><div class='add'>+</div><div class='add'>+/* TODO: check all these data can be managed with struct ath12k_tx_desc_info for perf */</div><div class='add'>+struct hal_tx_info {</div><div class='add'>+	u16 meta_data_flags; /* %HAL_TCL_DATA_CMD_INFO0_META_ */</div><div class='add'>+	u8 ring_id;</div><div class='add'>+	u8 rbm_id;</div><div class='add'>+	u32 desc_id;</div><div class='add'>+	enum hal_tcl_desc_type type;</div><div class='add'>+	enum hal_tcl_encap_type encap_type;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	u32 data_len;</div><div class='add'>+	u32 pkt_offset;</div><div class='add'>+	enum hal_encrypt_type encrypt_type;</div><div class='add'>+	u32 flags0; /* %HAL_TCL_DATA_CMD_INFO1_ */</div><div class='add'>+	u32 flags1; /* %HAL_TCL_DATA_CMD_INFO2_ */</div><div class='add'>+	u16 addr_search_flags; /* %HAL_TCL_DATA_CMD_INFO0_ADDR(X/Y)_ */</div><div class='add'>+	u16 bss_ast_hash;</div><div class='add'>+	u16 bss_ast_idx;</div><div class='add'>+	u8 tid;</div><div class='add'>+	u8 search_type; /* %HAL_TX_ADDR_SEARCH_ */</div><div class='add'>+	u8 lmac_id;</div><div class='add'>+	u8 vdev_id;</div><div class='add'>+	u8 dscp_tid_tbl_idx;</div><div class='add'>+	bool enable_mesh;</div><div class='add'>+	int bank_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* TODO: Check if the actual desc macros can be used instead */</div><div class='add'>+#define HAL_TX_STATUS_FLAGS_FIRST_MSDU		BIT(0)</div><div class='add'>+#define HAL_TX_STATUS_FLAGS_LAST_MSDU		BIT(1)</div><div class='add'>+#define HAL_TX_STATUS_FLAGS_MSDU_IN_AMSDU	BIT(2)</div><div class='add'>+#define HAL_TX_STATUS_FLAGS_RATE_STATS_VALID	BIT(3)</div><div class='add'>+#define HAL_TX_STATUS_FLAGS_RATE_LDPC		BIT(4)</div><div class='add'>+#define HAL_TX_STATUS_FLAGS_RATE_STBC		BIT(5)</div><div class='add'>+#define HAL_TX_STATUS_FLAGS_OFDMA		BIT(6)</div><div class='add'>+</div><div class='add'>+#define HAL_TX_STATUS_DESC_LEN		sizeof(struct hal_wbm_release_ring)</div><div class='add'>+</div><div class='add'>+/* Tx status parsed from srng desc */</div><div class='add'>+struct hal_tx_status {</div><div class='add'>+	enum hal_wbm_rel_src_module buf_rel_source;</div><div class='add'>+	enum hal_wbm_tqm_rel_reason status;</div><div class='add'>+	s8 ack_rssi;</div><div class='add'>+	u32 flags; /* %HAL_TX_STATUS_FLAGS_ */</div><div class='add'>+	u32 ppdu_id;</div><div class='add'>+	u8 try_cnt;</div><div class='add'>+	u8 tid;</div><div class='add'>+	u16 peer_id;</div><div class='add'>+	enum hal_tx_rate_stats_pkt_type pkt_type;</div><div class='add'>+	enum hal_tx_rate_stats_sgi sgi;</div><div class='add'>+	enum ath12k_supported_bw bw;</div><div class='add'>+	u8 mcs;</div><div class='add'>+	u16 tones;</div><div class='add'>+	u8 ofdma;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAL_TX_PHY_DESC_INFO0_BF_TYPE		GENMASK(17, 16)</div><div class='add'>+#define HAL_TX_PHY_DESC_INFO0_PREAMBLE_11B	BIT(20)</div><div class='add'>+#define HAL_TX_PHY_DESC_INFO0_PKT_TYPE		GENMASK(24, 21)</div><div class='add'>+#define HAL_TX_PHY_DESC_INFO0_BANDWIDTH		GENMASK(30, 28)</div><div class='add'>+#define HAL_TX_PHY_DESC_INFO1_MCS		GENMASK(3, 0)</div><div class='add'>+#define HAL_TX_PHY_DESC_INFO1_STBC		BIT(6)</div><div class='add'>+#define HAL_TX_PHY_DESC_INFO2_NSS		GENMASK(23, 21)</div><div class='add'>+#define HAL_TX_PHY_DESC_INFO3_AP_PKT_BW		GENMASK(6, 4)</div><div class='add'>+#define HAL_TX_PHY_DESC_INFO3_LTF_SIZE		GENMASK(20, 19)</div><div class='add'>+#define HAL_TX_PHY_DESC_INFO3_ACTIVE_CHANNEL	GENMASK(17, 15)</div><div class='add'>+</div><div class='add'>+struct hal_tx_phy_desc {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le32 info3;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_TX_FES_STAT_PROT_INFO0_STRT_FRM_TS_15_0	GENMASK(15, 0)</div><div class='add'>+#define HAL_TX_FES_STAT_PROT_INFO0_STRT_FRM_TS_31_16	GENMASK(31, 16)</div><div class='add'>+#define HAL_TX_FES_STAT_PROT_INFO1_END_FRM_TS_15_0	GENMASK(15, 0)</div><div class='add'>+#define HAL_TX_FES_STAT_PROT_INFO1_END_FRM_TS_31_16	GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+struct hal_tx_fes_status_prot {</div><div class='add'>+	__le64 reserved;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 reserved1[11];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_TX_FES_STAT_USR_PPDU_INFO0_DURATION		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+struct hal_tx_fes_status_user_ppdu {</div><div class='add'>+	__le64 reserved;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 reserved1[3];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_TX_FES_STAT_STRT_INFO0_PROT_TS_LOWER_32	GENMASK(31, 0)</div><div class='add'>+#define HAL_TX_FES_STAT_STRT_INFO1_PROT_TS_UPPER_32	GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+struct hal_tx_fes_status_start_prot {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le64 reserved;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_TX_FES_STATUS_START_INFO0_MEDIUM_PROT_TYPE	GENMASK(29, 27)</div><div class='add'>+</div><div class='add'>+struct hal_tx_fes_status_start {</div><div class='add'>+	__le32 reserved;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le64 reserved1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_TX_Q_EXT_INFO0_FRAME_CTRL		GENMASK(15, 0)</div><div class='add'>+#define HAL_TX_Q_EXT_INFO0_QOS_CTRL		GENMASK(31, 16)</div><div class='add'>+#define HAL_TX_Q_EXT_INFO1_AMPDU_FLAG		BIT(0)</div><div class='add'>+</div><div class='add'>+struct hal_tx_queue_exten {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_TX_FES_SETUP_INFO0_NUM_OF_USERS	GENMASK(28, 23)</div><div class='add'>+</div><div class='add'>+struct hal_tx_fes_setup {</div><div class='add'>+	__le32 schedule_id;</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le64 reserved;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_TX_PPDU_SETUP_INFO0_MEDIUM_PROT_TYPE	GENMASK(2, 0)</div><div class='add'>+#define HAL_TX_PPDU_SETUP_INFO1_PROT_FRAME_ADDR1_31_0	GENMASK(31, 0)</div><div class='add'>+#define HAL_TX_PPDU_SETUP_INFO2_PROT_FRAME_ADDR1_47_32	GENMASK(15, 0)</div><div class='add'>+#define HAL_TX_PPDU_SETUP_INFO2_PROT_FRAME_ADDR2_15_0	GENMASK(31, 16)</div><div class='add'>+#define HAL_TX_PPDU_SETUP_INFO3_PROT_FRAME_ADDR2_47_16	GENMASK(31, 0)</div><div class='add'>+#define HAL_TX_PPDU_SETUP_INFO4_PROT_FRAME_ADDR3_31_0	GENMASK(31, 0)</div><div class='add'>+#define HAL_TX_PPDU_SETUP_INFO5_PROT_FRAME_ADDR3_47_32	GENMASK(15, 0)</div><div class='add'>+#define HAL_TX_PPDU_SETUP_INFO5_PROT_FRAME_ADDR4_15_0	GENMASK(31, 16)</div><div class='add'>+#define HAL_TX_PPDU_SETUP_INFO6_PROT_FRAME_ADDR4_47_16	GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+struct hal_tx_pcu_ppdu_setup_init {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le32 info3;</div><div class='add'>+	__le32 reserved;</div><div class='add'>+	__le32 info4;</div><div class='add'>+	__le32 info5;</div><div class='add'>+	__le32 info6;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_TX_FES_STATUS_END_INFO0_START_TIMESTAMP_15_0	GENMASK(15, 0)</div><div class='add'>+#define HAL_TX_FES_STATUS_END_INFO0_START_TIMESTAMP_31_16	GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+struct hal_tx_fes_status_end {</div><div class='add'>+	__le32 reserved[2];</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 reserved1[19];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HAL_TX_BANK_CONFIG_EPD			BIT(0)</div><div class='add'>+#define HAL_TX_BANK_CONFIG_ENCAP_TYPE		GENMASK(2, 1)</div><div class='add'>+#define HAL_TX_BANK_CONFIG_ENCRYPT_TYPE		GENMASK(6, 3)</div><div class='add'>+#define HAL_TX_BANK_CONFIG_SRC_BUFFER_SWAP	BIT(7)</div><div class='add'>+#define HAL_TX_BANK_CONFIG_LINK_META_SWAP	BIT(8)</div><div class='add'>+#define HAL_TX_BANK_CONFIG_INDEX_LOOKUP_EN	BIT(9)</div><div class='add'>+#define HAL_TX_BANK_CONFIG_ADDRX_EN		BIT(10)</div><div class='add'>+#define HAL_TX_BANK_CONFIG_ADDRY_EN		BIT(11)</div><div class='add'>+#define HAL_TX_BANK_CONFIG_MESH_EN		GENMASK(13, 12)</div><div class='add'>+#define HAL_TX_BANK_CONFIG_VDEV_ID_CHECK_EN	BIT(14)</div><div class='add'>+#define HAL_TX_BANK_CONFIG_PMAC_ID		GENMASK(16, 15)</div><div class='add'>+/* STA mode will have MCAST_PKT_CTRL instead of DSCP_TID_MAP bitfield */</div><div class='add'>+#define HAL_TX_BANK_CONFIG_DSCP_TIP_MAP_ID	GENMASK(22, 17)</div><div class='add'>+</div><div class='add'>+void ath12k_hal_tx_cmd_desc_setup(struct ath12k_base *ab,</div><div class='add'>+				  struct hal_tcl_data_cmd *tcl_cmd,</div><div class='add'>+				  struct hal_tx_info *ti);</div><div class='add'>+void ath12k_hal_tx_set_dscp_tid_map(struct ath12k_base *ab, int id);</div><div class='add'>+int ath12k_hal_reo_cmd_send(struct ath12k_base *ab, struct hal_srng *srng,</div><div class='add'>+			    enum hal_reo_cmd_type type,</div><div class='add'>+			    struct ath12k_hal_reo_cmd *cmd);</div><div class='add'>+void ath12k_hal_tx_configure_bank_register(struct ath12k_base *ab, u32 bank_config,</div><div class='add'>+					   u8 bank_id);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/hif.h b/drivers/net/wireless/ath/ath12k/hif.h<br/>new file mode 100644<br/>index 000000000000..e8840fab6061<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/hif.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/hif.h</a></div><div class='hunk'>@@ -0,0 +1,165 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH12K_HIF_H</div><div class='add'>+#define ATH12K_HIF_H</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+</div><div class='add'>+struct ath12k_hif_ops {</div><div class='add'>+	u32 (*read32)(struct ath12k_base *ab, u32 address);</div><div class='add'>+	void (*write32)(struct ath12k_base *ab, u32 address, u32 data);</div><div class='add'>+	void (*irq_enable)(struct ath12k_base *ab);</div><div class='add'>+	void (*irq_disable)(struct ath12k_base *ab);</div><div class='add'>+	int (*start)(struct ath12k_base *ab);</div><div class='add'>+	void (*stop)(struct ath12k_base *ab);</div><div class='add'>+	int (*power_up)(struct ath12k_base *ab);</div><div class='add'>+	void (*power_down)(struct ath12k_base *ab, bool is_suspend);</div><div class='add'>+	int (*suspend)(struct ath12k_base *ab);</div><div class='add'>+	int (*resume)(struct ath12k_base *ab);</div><div class='add'>+	int (*map_service_to_pipe)(struct ath12k_base *ab, u16 service_id,</div><div class='add'>+				   u8 *ul_pipe, u8 *dl_pipe);</div><div class='add'>+	int (*get_user_msi_vector)(struct ath12k_base *ab, char *user_name,</div><div class='add'>+				   int *num_vectors, u32 *user_base_data,</div><div class='add'>+				   u32 *base_vector);</div><div class='add'>+	void (*get_msi_address)(struct ath12k_base *ab, u32 *msi_addr_lo,</div><div class='add'>+				u32 *msi_addr_hi);</div><div class='add'>+	void (*ce_irq_enable)(struct ath12k_base *ab);</div><div class='add'>+	void (*ce_irq_disable)(struct ath12k_base *ab);</div><div class='add'>+	void (*get_ce_msi_idx)(struct ath12k_base *ab, u32 ce_id, u32 *msi_idx);</div><div class='add'>+	int (*panic_handler)(struct ath12k_base *ab);</div><div class='add'>+	void (*coredump_download)(struct ath12k_base *ab);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int ath12k_hif_map_service_to_pipe(struct ath12k_base *ab, u16 service_id,</div><div class='add'>+						 u8 *ul_pipe, u8 *dl_pipe)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hif.ops-&gt;map_service_to_pipe(ab, service_id,</div><div class='add'>+						ul_pipe, dl_pipe);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath12k_hif_get_user_msi_vector(struct ath12k_base *ab,</div><div class='add'>+						 char *user_name,</div><div class='add'>+						 int *num_vectors,</div><div class='add'>+						 u32 *user_base_data,</div><div class='add'>+						 u32 *base_vector)</div><div class='add'>+{</div><div class='add'>+	if (!ab-&gt;hif.ops-&gt;get_user_msi_vector)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ab-&gt;hif.ops-&gt;get_user_msi_vector(ab, user_name, num_vectors,</div><div class='add'>+						user_base_data,</div><div class='add'>+						base_vector);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_hif_get_msi_address(struct ath12k_base *ab,</div><div class='add'>+					      u32 *msi_addr_lo,</div><div class='add'>+					      u32 *msi_addr_hi)</div><div class='add'>+{</div><div class='add'>+	if (!ab-&gt;hif.ops-&gt;get_msi_address)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ab-&gt;hif.ops-&gt;get_msi_address(ab, msi_addr_lo, msi_addr_hi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_hif_get_ce_msi_idx(struct ath12k_base *ab, u32 ce_id,</div><div class='add'>+					     u32 *msi_data_idx)</div><div class='add'>+{</div><div class='add'>+	if (ab-&gt;hif.ops-&gt;get_ce_msi_idx)</div><div class='add'>+		ab-&gt;hif.ops-&gt;get_ce_msi_idx(ab, ce_id, msi_data_idx);</div><div class='add'>+	else</div><div class='add'>+		*msi_data_idx = ce_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_hif_ce_irq_enable(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	if (ab-&gt;hif.ops-&gt;ce_irq_enable)</div><div class='add'>+		ab-&gt;hif.ops-&gt;ce_irq_enable(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_hif_ce_irq_disable(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	if (ab-&gt;hif.ops-&gt;ce_irq_disable)</div><div class='add'>+		ab-&gt;hif.ops-&gt;ce_irq_disable(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_hif_irq_enable(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ab-&gt;hif.ops-&gt;irq_enable(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_hif_irq_disable(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ab-&gt;hif.ops-&gt;irq_disable(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath12k_hif_suspend(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	if (ab-&gt;hif.ops-&gt;suspend)</div><div class='add'>+		return ab-&gt;hif.ops-&gt;suspend(ab);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath12k_hif_resume(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	if (ab-&gt;hif.ops-&gt;resume)</div><div class='add'>+		return ab-&gt;hif.ops-&gt;resume(ab);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath12k_hif_start(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hif.ops-&gt;start(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_hif_stop(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ab-&gt;hif.ops-&gt;stop(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 ath12k_hif_read32(struct ath12k_base *ab, u32 address)</div><div class='add'>+{</div><div class='add'>+	return ab-&gt;hif.ops-&gt;read32(ab, address);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_hif_write32(struct ath12k_base *ab, u32 address,</div><div class='add'>+				      u32 data)</div><div class='add'>+{</div><div class='add'>+	ab-&gt;hif.ops-&gt;write32(ab, address, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath12k_hif_power_up(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	if (!ab-&gt;hif.ops-&gt;power_up)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ab-&gt;hif.ops-&gt;power_up(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_hif_power_down(struct ath12k_base *ab, bool is_suspend)</div><div class='add'>+{</div><div class='add'>+	if (!ab-&gt;hif.ops-&gt;power_down)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ab-&gt;hif.ops-&gt;power_down(ab, is_suspend);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath12k_hif_panic_handler(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	if (!ab-&gt;hif.ops-&gt;panic_handler)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	return ab-&gt;hif.ops-&gt;panic_handler(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_hif_coredump_download(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	if (ab-&gt;hif.ops-&gt;coredump_download)</div><div class='add'>+		ab-&gt;hif.ops-&gt;coredump_download(ab);</div><div class='add'>+}</div><div class='add'>+#endif /* ATH12K_HIF_H */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/htc.c b/drivers/net/wireless/ath/ath12k/htc.c<br/>new file mode 100644<br/>index 000000000000..d13616bf07f4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/htc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/htc.c</a></div><div class='hunk'>@@ -0,0 +1,795 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2022, 2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "hif.h"</div><div class='add'>+</div><div class='add'>+struct sk_buff *ath12k_htc_alloc_skb(struct ath12k_base *ab, int size)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(size + sizeof(struct ath12k_htc_hdr));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb, sizeof(struct ath12k_htc_hdr));</div><div class='add'>+</div><div class='add'>+	/* FW/HTC requires 4-byte aligned streams */</div><div class='add'>+	if (!IS_ALIGNED((unsigned long)skb-&gt;data, 4))</div><div class='add'>+		ath12k_warn(ab, "Unaligned HTC tx skb\n");</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_htc_control_tx_complete(struct ath12k_base *ab,</div><div class='add'>+					   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ath12k_htc_build_tx_ctrl_skb(void)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct ath12k_skb_cb *skb_cb;</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(ATH12K_HTC_CONTROL_BUFFER_SIZE);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb, sizeof(struct ath12k_htc_hdr));</div><div class='add'>+	WARN_ON_ONCE(!IS_ALIGNED((unsigned long)skb-&gt;data, 4));</div><div class='add'>+</div><div class='add'>+	skb_cb = ATH12K_SKB_CB(skb);</div><div class='add'>+	memset(skb_cb, 0, sizeof(*skb_cb));</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_htc_prepare_tx_skb(struct ath12k_htc_ep *ep,</div><div class='add'>+				      struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_htc_hdr *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = (struct ath12k_htc_hdr *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	memset(hdr, 0, sizeof(*hdr));</div><div class='add'>+	hdr-&gt;htc_info = le32_encode_bits(ep-&gt;eid, HTC_HDR_ENDPOINTID) |</div><div class='add'>+			le32_encode_bits((skb-&gt;len - sizeof(*hdr)),</div><div class='add'>+					 HTC_HDR_PAYLOADLEN);</div><div class='add'>+</div><div class='add'>+	if (ep-&gt;tx_credit_flow_enabled)</div><div class='add'>+		hdr-&gt;htc_info |= le32_encode_bits(ATH12K_HTC_FLAG_NEED_CREDIT_UPDATE,</div><div class='add'>+						  HTC_HDR_FLAGS);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ep-&gt;htc-&gt;tx_lock);</div><div class='add'>+	hdr-&gt;ctrl_info = le32_encode_bits(ep-&gt;seq_no++, HTC_HDR_CONTROLBYTES1);</div><div class='add'>+	spin_unlock_bh(&amp;ep-&gt;htc-&gt;tx_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_htc_send(struct ath12k_htc *htc,</div><div class='add'>+		    enum ath12k_htc_ep_id eid,</div><div class='add'>+		    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_htc_ep *ep = &amp;htc-&gt;endpoint[eid];</div><div class='add'>+	struct ath12k_skb_cb *skb_cb = ATH12K_SKB_CB(skb);</div><div class='add'>+	struct device *dev = htc-&gt;ab-&gt;dev;</div><div class='add'>+	struct ath12k_base *ab = htc-&gt;ab;</div><div class='add'>+	int credits = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (eid &gt;= ATH12K_HTC_EP_COUNT) {</div><div class='add'>+		ath12k_warn(ab, "Invalid endpoint id: %d\n", eid);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_push(skb, sizeof(struct ath12k_htc_hdr));</div><div class='add'>+</div><div class='add'>+	if (ep-&gt;tx_credit_flow_enabled) {</div><div class='add'>+		credits = DIV_ROUND_UP(skb-&gt;len, htc-&gt;target_credit_size);</div><div class='add'>+		spin_lock_bh(&amp;htc-&gt;tx_lock);</div><div class='add'>+		if (ep-&gt;tx_credits &lt; credits) {</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_HTC,</div><div class='add'>+				   "htc insufficient credits ep %d required %d available %d\n",</div><div class='add'>+				   eid, credits, ep-&gt;tx_credits);</div><div class='add'>+			spin_unlock_bh(&amp;htc-&gt;tx_lock);</div><div class='add'>+			ret = -EAGAIN;</div><div class='add'>+			goto err_pull;</div><div class='add'>+		}</div><div class='add'>+		ep-&gt;tx_credits -= credits;</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_HTC,</div><div class='add'>+			   "htc ep %d consumed %d credits (total %d)\n",</div><div class='add'>+			   eid, credits, ep-&gt;tx_credits);</div><div class='add'>+		spin_unlock_bh(&amp;htc-&gt;tx_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_htc_prepare_tx_skb(ep, skb);</div><div class='add'>+</div><div class='add'>+	skb_cb-&gt;paddr = dma_map_single(dev, skb-&gt;data, skb-&gt;len, DMA_TO_DEVICE);</div><div class='add'>+	ret = dma_mapping_error(dev, skb_cb-&gt;paddr);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto err_credits;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_ce_send(htc-&gt;ab, skb, ep-&gt;ul_pipe_id, ep-&gt;eid);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_unmap;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_unmap:</div><div class='add'>+	dma_unmap_single(dev, skb_cb-&gt;paddr, skb-&gt;len, DMA_TO_DEVICE);</div><div class='add'>+err_credits:</div><div class='add'>+	if (ep-&gt;tx_credit_flow_enabled) {</div><div class='add'>+		spin_lock_bh(&amp;htc-&gt;tx_lock);</div><div class='add'>+		ep-&gt;tx_credits += credits;</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_HTC,</div><div class='add'>+			   "htc ep %d reverted %d credits back (total %d)\n",</div><div class='add'>+			   eid, credits, ep-&gt;tx_credits);</div><div class='add'>+		spin_unlock_bh(&amp;htc-&gt;tx_lock);</div><div class='add'>+</div><div class='add'>+		if (ep-&gt;ep_ops.ep_tx_credits)</div><div class='add'>+			ep-&gt;ep_ops.ep_tx_credits(htc-&gt;ab);</div><div class='add'>+	}</div><div class='add'>+err_pull:</div><div class='add'>+	skb_pull(skb, sizeof(struct ath12k_htc_hdr));</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_htc_process_credit_report(struct ath12k_htc *htc,</div><div class='add'>+				 const struct ath12k_htc_credit_report *report,</div><div class='add'>+				 int len,</div><div class='add'>+				 enum ath12k_htc_ep_id eid)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = htc-&gt;ab;</div><div class='add'>+	struct ath12k_htc_ep *ep;</div><div class='add'>+	int i, n_reports;</div><div class='add'>+</div><div class='add'>+	if (len % sizeof(*report))</div><div class='add'>+		ath12k_warn(ab, "Uneven credit report len %d", len);</div><div class='add'>+</div><div class='add'>+	n_reports = len / sizeof(*report);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;htc-&gt;tx_lock);</div><div class='add'>+	for (i = 0; i &lt; n_reports; i++, report++) {</div><div class='add'>+		if (report-&gt;eid &gt;= ATH12K_HTC_EP_COUNT)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ep = &amp;htc-&gt;endpoint[report-&gt;eid];</div><div class='add'>+		ep-&gt;tx_credits += report-&gt;credits;</div><div class='add'>+</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_HTC, "htc ep %d got %d credits (total %d)\n",</div><div class='add'>+			   report-&gt;eid, report-&gt;credits, ep-&gt;tx_credits);</div><div class='add'>+</div><div class='add'>+		if (ep-&gt;ep_ops.ep_tx_credits) {</div><div class='add'>+			spin_unlock_bh(&amp;htc-&gt;tx_lock);</div><div class='add'>+			ep-&gt;ep_ops.ep_tx_credits(htc-&gt;ab);</div><div class='add'>+			spin_lock_bh(&amp;htc-&gt;tx_lock);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;htc-&gt;tx_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_htc_process_trailer(struct ath12k_htc *htc,</div><div class='add'>+				      u8 *buffer,</div><div class='add'>+				      int length,</div><div class='add'>+				      enum ath12k_htc_ep_id src_eid)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = htc-&gt;ab;</div><div class='add'>+	int status = 0;</div><div class='add'>+	struct ath12k_htc_record *record;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	while (length &gt; 0) {</div><div class='add'>+		record = (struct ath12k_htc_record *)buffer;</div><div class='add'>+</div><div class='add'>+		if (length &lt; sizeof(record-&gt;hdr)) {</div><div class='add'>+			status = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (record-&gt;hdr.len &gt; length) {</div><div class='add'>+			/* no room left in buffer for record */</div><div class='add'>+			ath12k_warn(ab, "Invalid record length: %d\n",</div><div class='add'>+				    record-&gt;hdr.len);</div><div class='add'>+			status = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (record-&gt;hdr.id) {</div><div class='add'>+		case ATH12K_HTC_RECORD_CREDITS:</div><div class='add'>+			len = sizeof(struct ath12k_htc_credit_report);</div><div class='add'>+			if (record-&gt;hdr.len &lt; len) {</div><div class='add'>+				ath12k_warn(ab, "Credit report too long\n");</div><div class='add'>+				status = -EINVAL;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			ath12k_htc_process_credit_report(htc,</div><div class='add'>+							 record-&gt;credit_report,</div><div class='add'>+							 record-&gt;hdr.len,</div><div class='add'>+							 src_eid);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ath12k_warn(ab, "Unhandled record: id:%d length:%d\n",</div><div class='add'>+				    record-&gt;hdr.id, record-&gt;hdr.len);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (status)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* multiple records may be present in a trailer */</div><div class='add'>+		buffer += sizeof(record-&gt;hdr) + record-&gt;hdr.len;</div><div class='add'>+		length -= sizeof(record-&gt;hdr) + record-&gt;hdr.len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_htc_suspend_complete(struct ath12k_base *ab, bool ack)</div><div class='add'>+{</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_BOOT, "boot suspend complete %d\n", ack);</div><div class='add'>+</div><div class='add'>+	if (ack)</div><div class='add'>+		set_bit(ATH12K_FLAG_HTC_SUSPEND_COMPLETE, &amp;ab-&gt;dev_flags);</div><div class='add'>+	else</div><div class='add'>+		clear_bit(ATH12K_FLAG_HTC_SUSPEND_COMPLETE, &amp;ab-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+	complete(&amp;ab-&gt;htc_suspend);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_htc_wakeup_from_suspend(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_BOOT, "boot wakeup from suspend is received\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_htc_rx_completion_handler(struct ath12k_base *ab,</div><div class='add'>+				      struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	struct ath12k_htc *htc = &amp;ab-&gt;htc;</div><div class='add'>+	struct ath12k_htc_hdr *hdr;</div><div class='add'>+	struct ath12k_htc_ep *ep;</div><div class='add'>+	u16 payload_len;</div><div class='add'>+	u32 trailer_len = 0;</div><div class='add'>+	size_t min_len;</div><div class='add'>+	u8 eid;</div><div class='add'>+	bool trailer_present;</div><div class='add'>+</div><div class='add'>+	hdr = (struct ath12k_htc_hdr *)skb-&gt;data;</div><div class='add'>+	skb_pull(skb, sizeof(*hdr));</div><div class='add'>+</div><div class='add'>+	eid = le32_get_bits(hdr-&gt;htc_info, HTC_HDR_ENDPOINTID);</div><div class='add'>+</div><div class='add'>+	if (eid &gt;= ATH12K_HTC_EP_COUNT) {</div><div class='add'>+		ath12k_warn(ab, "HTC Rx: invalid eid %d\n", eid);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ep = &amp;htc-&gt;endpoint[eid];</div><div class='add'>+</div><div class='add'>+	payload_len = le32_get_bits(hdr-&gt;htc_info, HTC_HDR_PAYLOADLEN);</div><div class='add'>+</div><div class='add'>+	if (payload_len + sizeof(*hdr) &gt; ATH12K_HTC_MAX_LEN) {</div><div class='add'>+		ath12k_warn(ab, "HTC rx frame too long, len: %zu\n",</div><div class='add'>+			    payload_len + sizeof(*hdr));</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &lt; payload_len) {</div><div class='add'>+		ath12k_warn(ab, "HTC Rx: insufficient length, got %d, expected %d\n",</div><div class='add'>+			    skb-&gt;len, payload_len);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get flags to check for trailer */</div><div class='add'>+	trailer_present = le32_get_bits(hdr-&gt;htc_info, HTC_HDR_FLAGS) &amp;</div><div class='add'>+			  ATH12K_HTC_FLAG_TRAILER_PRESENT;</div><div class='add'>+</div><div class='add'>+	if (trailer_present) {</div><div class='add'>+		u8 *trailer;</div><div class='add'>+</div><div class='add'>+		trailer_len = le32_get_bits(hdr-&gt;ctrl_info,</div><div class='add'>+					    HTC_HDR_CONTROLBYTES0);</div><div class='add'>+		min_len = sizeof(struct ath12k_htc_record_hdr);</div><div class='add'>+</div><div class='add'>+		if ((trailer_len &lt; min_len) ||</div><div class='add'>+		    (trailer_len &gt; payload_len)) {</div><div class='add'>+			ath12k_warn(ab, "Invalid trailer length: %d\n",</div><div class='add'>+				    trailer_len);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		trailer = (u8 *)hdr;</div><div class='add'>+		trailer += sizeof(*hdr);</div><div class='add'>+		trailer += payload_len;</div><div class='add'>+		trailer -= trailer_len;</div><div class='add'>+		status = ath12k_htc_process_trailer(htc, trailer,</div><div class='add'>+						    trailer_len, eid);</div><div class='add'>+		if (status)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		skb_trim(skb, skb-&gt;len - trailer_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (trailer_len &gt;= payload_len)</div><div class='add'>+		/* zero length packet with trailer data, just drop these */</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (eid == ATH12K_HTC_EP_0) {</div><div class='add'>+		struct ath12k_htc_msg *msg = (struct ath12k_htc_msg *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+		switch (le32_get_bits(msg-&gt;msg_svc_id, HTC_MSG_MESSAGEID)) {</div><div class='add'>+		case ATH12K_HTC_MSG_READY_ID:</div><div class='add'>+		case ATH12K_HTC_MSG_CONNECT_SERVICE_RESP_ID:</div><div class='add'>+			/* handle HTC control message */</div><div class='add'>+			if (completion_done(&amp;htc-&gt;ctl_resp)) {</div><div class='add'>+				/* this is a fatal error, target should not be</div><div class='add'>+				 * sending unsolicited messages on the ep 0</div><div class='add'>+				 */</div><div class='add'>+				ath12k_warn(ab, "HTC rx ctrl still processing\n");</div><div class='add'>+				complete(&amp;htc-&gt;ctl_resp);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			htc-&gt;control_resp_len =</div><div class='add'>+				min_t(int, skb-&gt;len,</div><div class='add'>+				      ATH12K_HTC_MAX_CTRL_MSG_LEN);</div><div class='add'>+</div><div class='add'>+			memcpy(htc-&gt;control_resp_buffer, skb-&gt;data,</div><div class='add'>+			       htc-&gt;control_resp_len);</div><div class='add'>+</div><div class='add'>+			complete(&amp;htc-&gt;ctl_resp);</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_HTC_MSG_SEND_SUSPEND_COMPLETE:</div><div class='add'>+			ath12k_htc_suspend_complete(ab, true);</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_HTC_MSG_NACK_SUSPEND:</div><div class='add'>+			ath12k_htc_suspend_complete(ab, false);</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_HTC_MSG_WAKEUP_FROM_SUSPEND_ID:</div><div class='add'>+			ath12k_htc_wakeup_from_suspend(ab);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ath12k_warn(ab, "ignoring unsolicited htc ep0 event %u\n",</div><div class='add'>+				    le32_get_bits(msg-&gt;msg_svc_id, HTC_MSG_MESSAGEID));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_HTC, "htc rx completion ep %d skb %p\n",</div><div class='add'>+		   eid, skb);</div><div class='add'>+	ep-&gt;ep_ops.ep_rx_complete(ab, skb);</div><div class='add'>+</div><div class='add'>+	/* poll tx completion for interrupt disabled CE's */</div><div class='add'>+	ath12k_ce_poll_send_completed(ab, ep-&gt;ul_pipe_id);</div><div class='add'>+</div><div class='add'>+	/* skb is now owned by the rx completion handler */</div><div class='add'>+	skb = NULL;</div><div class='add'>+out:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_htc_control_rx_complete(struct ath12k_base *ab,</div><div class='add'>+					   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	/* This is unexpected. FW is not supposed to send regular rx on this</div><div class='add'>+	 * endpoint.</div><div class='add'>+	 */</div><div class='add'>+	ath12k_warn(ab, "unexpected htc rx\n");</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *htc_service_name(enum ath12k_htc_svc_id id)</div><div class='add'>+{</div><div class='add'>+	switch (id) {</div><div class='add'>+	case ATH12K_HTC_SVC_ID_RESERVED:</div><div class='add'>+		return "Reserved";</div><div class='add'>+	case ATH12K_HTC_SVC_ID_RSVD_CTRL:</div><div class='add'>+		return "Control";</div><div class='add'>+	case ATH12K_HTC_SVC_ID_WMI_CONTROL:</div><div class='add'>+		return "WMI";</div><div class='add'>+	case ATH12K_HTC_SVC_ID_WMI_DATA_BE:</div><div class='add'>+		return "DATA BE";</div><div class='add'>+	case ATH12K_HTC_SVC_ID_WMI_DATA_BK:</div><div class='add'>+		return "DATA BK";</div><div class='add'>+	case ATH12K_HTC_SVC_ID_WMI_DATA_VI:</div><div class='add'>+		return "DATA VI";</div><div class='add'>+	case ATH12K_HTC_SVC_ID_WMI_DATA_VO:</div><div class='add'>+		return "DATA VO";</div><div class='add'>+	case ATH12K_HTC_SVC_ID_WMI_CONTROL_MAC1:</div><div class='add'>+		return "WMI MAC1";</div><div class='add'>+	case ATH12K_HTC_SVC_ID_WMI_CONTROL_MAC2:</div><div class='add'>+		return "WMI MAC2";</div><div class='add'>+	case ATH12K_HTC_SVC_ID_NMI_CONTROL:</div><div class='add'>+		return "NMI Control";</div><div class='add'>+	case ATH12K_HTC_SVC_ID_NMI_DATA:</div><div class='add'>+		return "NMI Data";</div><div class='add'>+	case ATH12K_HTC_SVC_ID_HTT_DATA_MSG:</div><div class='add'>+		return "HTT Data";</div><div class='add'>+	case ATH12K_HTC_SVC_ID_TEST_RAW_STREAMS:</div><div class='add'>+		return "RAW";</div><div class='add'>+	case ATH12K_HTC_SVC_ID_IPA_TX:</div><div class='add'>+		return "IPA TX";</div><div class='add'>+	case ATH12K_HTC_SVC_ID_PKT_LOG:</div><div class='add'>+		return "PKT LOG";</div><div class='add'>+	case ATH12K_HTC_SVC_ID_WMI_CONTROL_DIAG:</div><div class='add'>+		return "WMI DIAG";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "Unknown";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_htc_reset_endpoint_states(struct ath12k_htc *htc)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_htc_ep *ep;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = ATH12K_HTC_EP_0; i &lt; ATH12K_HTC_EP_COUNT; i++) {</div><div class='add'>+		ep = &amp;htc-&gt;endpoint[i];</div><div class='add'>+		ep-&gt;service_id = ATH12K_HTC_SVC_ID_UNUSED;</div><div class='add'>+		ep-&gt;max_ep_message_len = 0;</div><div class='add'>+		ep-&gt;max_tx_queue_depth = 0;</div><div class='add'>+		ep-&gt;eid = i;</div><div class='add'>+		ep-&gt;htc = htc;</div><div class='add'>+		ep-&gt;tx_credit_flow_enabled = true;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_htc_get_credit_allocation(struct ath12k_htc *htc,</div><div class='add'>+					   u16 service_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_htc_svc_tx_credits *serv_entry;</div><div class='add'>+	u8 i, allocation = 0;</div><div class='add'>+</div><div class='add'>+	serv_entry = htc-&gt;service_alloc_table;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HTC_MAX_SERVICE_ALLOC_ENTRIES; i++) {</div><div class='add'>+		if (serv_entry[i].service_id == service_id) {</div><div class='add'>+			allocation = serv_entry[i].credit_allocation;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return allocation;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_htc_setup_target_buffer_assignments(struct ath12k_htc *htc)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_htc_svc_tx_credits *serv_entry;</div><div class='add'>+	static const u32 svc_id[] = {</div><div class='add'>+					ATH12K_HTC_SVC_ID_WMI_CONTROL,</div><div class='add'>+					ATH12K_HTC_SVC_ID_WMI_CONTROL_MAC1,</div><div class='add'>+					ATH12K_HTC_SVC_ID_WMI_CONTROL_MAC2,</div><div class='add'>+				};</div><div class='add'>+	int i, credits;</div><div class='add'>+</div><div class='add'>+	credits = htc-&gt;total_transmit_credits;</div><div class='add'>+	serv_entry = htc-&gt;service_alloc_table;</div><div class='add'>+</div><div class='add'>+	if ((htc-&gt;wmi_ep_count == 0) ||</div><div class='add'>+	    (htc-&gt;wmi_ep_count &gt; ARRAY_SIZE(svc_id)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Divide credits among number of endpoints for WMI */</div><div class='add'>+	credits = credits / htc-&gt;wmi_ep_count;</div><div class='add'>+	for (i = 0; i &lt; htc-&gt;wmi_ep_count; i++) {</div><div class='add'>+		serv_entry[i].service_id = svc_id[i];</div><div class='add'>+		serv_entry[i].credit_allocation = credits;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_htc_wait_target(struct ath12k_htc *htc)</div><div class='add'>+{</div><div class='add'>+	int i, status = 0;</div><div class='add'>+	struct ath12k_base *ab = htc-&gt;ab;</div><div class='add'>+	unsigned long time_left;</div><div class='add'>+	struct ath12k_htc_ready *ready;</div><div class='add'>+	u16 message_id;</div><div class='add'>+	u16 credit_count;</div><div class='add'>+	u16 credit_size;</div><div class='add'>+</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;htc-&gt;ctl_resp,</div><div class='add'>+						ATH12K_HTC_WAIT_TIMEOUT_HZ);</div><div class='add'>+	if (!time_left) {</div><div class='add'>+		ath12k_warn(ab, "failed to receive control response completion, polling..\n");</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ab-&gt;hw_params-&gt;ce_count; i++)</div><div class='add'>+			ath12k_ce_per_engine_service(htc-&gt;ab, i);</div><div class='add'>+</div><div class='add'>+		time_left =</div><div class='add'>+			wait_for_completion_timeout(&amp;htc-&gt;ctl_resp,</div><div class='add'>+						    ATH12K_HTC_WAIT_TIMEOUT_HZ);</div><div class='add'>+</div><div class='add'>+		if (!time_left)</div><div class='add'>+			status = -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		ath12k_warn(ab, "ctl_resp never came in (%d)\n", status);</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (htc-&gt;control_resp_len &lt; sizeof(*ready)) {</div><div class='add'>+		ath12k_warn(ab, "Invalid HTC ready msg len:%d\n",</div><div class='add'>+			    htc-&gt;control_resp_len);</div><div class='add'>+		return -ECOMM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ready = (struct ath12k_htc_ready *)htc-&gt;control_resp_buffer;</div><div class='add'>+	message_id = le32_get_bits(ready-&gt;id_credit_count, HTC_MSG_MESSAGEID);</div><div class='add'>+	credit_count = le32_get_bits(ready-&gt;id_credit_count,</div><div class='add'>+				     HTC_READY_MSG_CREDITCOUNT);</div><div class='add'>+	credit_size = le32_get_bits(ready-&gt;size_ep, HTC_READY_MSG_CREDITSIZE);</div><div class='add'>+</div><div class='add'>+	if (message_id != ATH12K_HTC_MSG_READY_ID) {</div><div class='add'>+		ath12k_warn(ab, "Invalid HTC ready msg: 0x%x\n", message_id);</div><div class='add'>+		return -ECOMM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	htc-&gt;total_transmit_credits = credit_count;</div><div class='add'>+	htc-&gt;target_credit_size = credit_size;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_HTC,</div><div class='add'>+		   "Target ready! transmit resources: %d size:%d\n",</div><div class='add'>+		   htc-&gt;total_transmit_credits, htc-&gt;target_credit_size);</div><div class='add'>+</div><div class='add'>+	if ((htc-&gt;total_transmit_credits == 0) ||</div><div class='add'>+	    (htc-&gt;target_credit_size == 0)) {</div><div class='add'>+		ath12k_warn(ab, "Invalid credit size received\n");</div><div class='add'>+		return -ECOMM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_htc_setup_target_buffer_assignments(htc);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_htc_connect_service(struct ath12k_htc *htc,</div><div class='add'>+			       struct ath12k_htc_svc_conn_req *conn_req,</div><div class='add'>+			       struct ath12k_htc_svc_conn_resp *conn_resp)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = htc-&gt;ab;</div><div class='add'>+	struct ath12k_htc_conn_svc *req_msg;</div><div class='add'>+	struct ath12k_htc_conn_svc_resp resp_msg_dummy;</div><div class='add'>+	struct ath12k_htc_conn_svc_resp *resp_msg = &amp;resp_msg_dummy;</div><div class='add'>+	enum ath12k_htc_ep_id assigned_eid = ATH12K_HTC_EP_COUNT;</div><div class='add'>+	struct ath12k_htc_ep *ep;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned int max_msg_size = 0;</div><div class='add'>+	int length, status;</div><div class='add'>+	unsigned long time_left;</div><div class='add'>+	bool disable_credit_flow_ctrl = false;</div><div class='add'>+	u16 message_id, service_id, flags = 0;</div><div class='add'>+	u8 tx_alloc = 0;</div><div class='add'>+</div><div class='add'>+	/* special case for HTC pseudo control service */</div><div class='add'>+	if (conn_req-&gt;service_id == ATH12K_HTC_SVC_ID_RSVD_CTRL) {</div><div class='add'>+		disable_credit_flow_ctrl = true;</div><div class='add'>+		assigned_eid = ATH12K_HTC_EP_0;</div><div class='add'>+		max_msg_size = ATH12K_HTC_MAX_CTRL_MSG_LEN;</div><div class='add'>+		memset(&amp;resp_msg_dummy, 0, sizeof(resp_msg_dummy));</div><div class='add'>+		goto setup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tx_alloc = ath12k_htc_get_credit_allocation(htc,</div><div class='add'>+						    conn_req-&gt;service_id);</div><div class='add'>+	if (!tx_alloc)</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+			   "boot htc service %s does not allocate target credits\n",</div><div class='add'>+			   htc_service_name(conn_req-&gt;service_id));</div><div class='add'>+</div><div class='add'>+	skb = ath12k_htc_build_tx_ctrl_skb();</div><div class='add'>+	if (!skb) {</div><div class='add'>+		ath12k_warn(ab, "Failed to allocate HTC packet\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	length = sizeof(*req_msg);</div><div class='add'>+	skb_put(skb, length);</div><div class='add'>+	memset(skb-&gt;data, 0, length);</div><div class='add'>+</div><div class='add'>+	req_msg = (struct ath12k_htc_conn_svc *)skb-&gt;data;</div><div class='add'>+	req_msg-&gt;msg_svc_id = le32_encode_bits(ATH12K_HTC_MSG_CONNECT_SERVICE_ID,</div><div class='add'>+					       HTC_MSG_MESSAGEID);</div><div class='add'>+</div><div class='add'>+	flags |= u32_encode_bits(tx_alloc, ATH12K_HTC_CONN_FLAGS_RECV_ALLOC);</div><div class='add'>+</div><div class='add'>+	/* Only enable credit flow control for WMI ctrl service */</div><div class='add'>+	if (!(conn_req-&gt;service_id == ATH12K_HTC_SVC_ID_WMI_CONTROL ||</div><div class='add'>+	      conn_req-&gt;service_id == ATH12K_HTC_SVC_ID_WMI_CONTROL_MAC1 ||</div><div class='add'>+	      conn_req-&gt;service_id == ATH12K_HTC_SVC_ID_WMI_CONTROL_MAC2)) {</div><div class='add'>+		flags |= ATH12K_HTC_CONN_FLAGS_DISABLE_CREDIT_FLOW_CTRL;</div><div class='add'>+		disable_credit_flow_ctrl = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req_msg-&gt;flags_len = le32_encode_bits(flags, HTC_SVC_MSG_CONNECTIONFLAGS);</div><div class='add'>+	req_msg-&gt;msg_svc_id |= le32_encode_bits(conn_req-&gt;service_id,</div><div class='add'>+						HTC_SVC_MSG_SERVICE_ID);</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;htc-&gt;ctl_resp);</div><div class='add'>+</div><div class='add'>+	status = ath12k_htc_send(htc, ATH12K_HTC_EP_0, skb);</div><div class='add'>+	if (status) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* wait for response */</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;htc-&gt;ctl_resp,</div><div class='add'>+						ATH12K_HTC_CONN_SVC_TIMEOUT_HZ);</div><div class='add'>+	if (!time_left) {</div><div class='add'>+		ath12k_err(ab, "Service connect timeout\n");</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* we controlled the buffer creation, it's aligned */</div><div class='add'>+	resp_msg = (struct ath12k_htc_conn_svc_resp *)htc-&gt;control_resp_buffer;</div><div class='add'>+	message_id = le32_get_bits(resp_msg-&gt;msg_svc_id, HTC_MSG_MESSAGEID);</div><div class='add'>+	service_id = le32_get_bits(resp_msg-&gt;msg_svc_id,</div><div class='add'>+				   HTC_SVC_RESP_MSG_SERVICEID);</div><div class='add'>+</div><div class='add'>+	if ((message_id != ATH12K_HTC_MSG_CONNECT_SERVICE_RESP_ID) ||</div><div class='add'>+	    (htc-&gt;control_resp_len &lt; sizeof(*resp_msg))) {</div><div class='add'>+		ath12k_err(ab, "Invalid resp message ID 0x%x", message_id);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_HTC,</div><div class='add'>+		   "HTC Service %s connect response: status: %u, assigned ep: %u\n",</div><div class='add'>+		   htc_service_name(service_id),</div><div class='add'>+		   le32_get_bits(resp_msg-&gt;flags_len, HTC_SVC_RESP_MSG_STATUS),</div><div class='add'>+		   le32_get_bits(resp_msg-&gt;flags_len, HTC_SVC_RESP_MSG_ENDPOINTID));</div><div class='add'>+</div><div class='add'>+	conn_resp-&gt;connect_resp_code = le32_get_bits(resp_msg-&gt;flags_len,</div><div class='add'>+						     HTC_SVC_RESP_MSG_STATUS);</div><div class='add'>+</div><div class='add'>+	/* check response status */</div><div class='add'>+	if (conn_resp-&gt;connect_resp_code != ATH12K_HTC_CONN_SVC_STATUS_SUCCESS) {</div><div class='add'>+		ath12k_err(ab, "HTC Service %s connect request failed: 0x%x)\n",</div><div class='add'>+			   htc_service_name(service_id),</div><div class='add'>+		       conn_resp-&gt;connect_resp_code);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	assigned_eid = le32_get_bits(resp_msg-&gt;flags_len,</div><div class='add'>+				     HTC_SVC_RESP_MSG_ENDPOINTID);</div><div class='add'>+</div><div class='add'>+	max_msg_size = le32_get_bits(resp_msg-&gt;flags_len,</div><div class='add'>+				     HTC_SVC_RESP_MSG_MAXMSGSIZE);</div><div class='add'>+</div><div class='add'>+setup:</div><div class='add'>+</div><div class='add'>+	if (assigned_eid &gt;= ATH12K_HTC_EP_COUNT)</div><div class='add'>+		return -EPROTO;</div><div class='add'>+</div><div class='add'>+	if (max_msg_size == 0)</div><div class='add'>+		return -EPROTO;</div><div class='add'>+</div><div class='add'>+	ep = &amp;htc-&gt;endpoint[assigned_eid];</div><div class='add'>+	ep-&gt;eid = assigned_eid;</div><div class='add'>+</div><div class='add'>+	if (ep-&gt;service_id != ATH12K_HTC_SVC_ID_UNUSED)</div><div class='add'>+		return -EPROTO;</div><div class='add'>+</div><div class='add'>+	/* return assigned endpoint to caller */</div><div class='add'>+	conn_resp-&gt;eid = assigned_eid;</div><div class='add'>+	conn_resp-&gt;max_msg_len = le32_get_bits(resp_msg-&gt;flags_len,</div><div class='add'>+					       HTC_SVC_RESP_MSG_MAXMSGSIZE);</div><div class='add'>+</div><div class='add'>+	/* setup the endpoint */</div><div class='add'>+	ep-&gt;service_id = conn_req-&gt;service_id;</div><div class='add'>+	ep-&gt;max_tx_queue_depth = conn_req-&gt;max_send_queue_depth;</div><div class='add'>+	ep-&gt;max_ep_message_len = le32_get_bits(resp_msg-&gt;flags_len,</div><div class='add'>+					       HTC_SVC_RESP_MSG_MAXMSGSIZE);</div><div class='add'>+	ep-&gt;tx_credits = tx_alloc;</div><div class='add'>+</div><div class='add'>+	/* copy all the callbacks */</div><div class='add'>+	ep-&gt;ep_ops = conn_req-&gt;ep_ops;</div><div class='add'>+</div><div class='add'>+	status = ath12k_hif_map_service_to_pipe(htc-&gt;ab,</div><div class='add'>+						ep-&gt;service_id,</div><div class='add'>+						&amp;ep-&gt;ul_pipe_id,</div><div class='add'>+						&amp;ep-&gt;dl_pipe_id);</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+		   "boot htc service '%s' ul pipe %d dl pipe %d eid %d ready\n",</div><div class='add'>+		   htc_service_name(ep-&gt;service_id), ep-&gt;ul_pipe_id,</div><div class='add'>+		   ep-&gt;dl_pipe_id, ep-&gt;eid);</div><div class='add'>+</div><div class='add'>+	if (disable_credit_flow_ctrl &amp;&amp; ep-&gt;tx_credit_flow_enabled) {</div><div class='add'>+		ep-&gt;tx_credit_flow_enabled = false;</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+			   "boot htc service '%s' eid %d TX flow control disabled\n",</div><div class='add'>+			   htc_service_name(ep-&gt;service_id), assigned_eid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_htc_start(struct ath12k_htc *htc)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int status;</div><div class='add'>+	struct ath12k_base *ab = htc-&gt;ab;</div><div class='add'>+	struct ath12k_htc_setup_complete_extended *msg;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_htc_build_tx_ctrl_skb();</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	skb_put(skb, sizeof(*msg));</div><div class='add'>+	memset(skb-&gt;data, 0, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	msg = (struct ath12k_htc_setup_complete_extended *)skb-&gt;data;</div><div class='add'>+	msg-&gt;msg_id = le32_encode_bits(ATH12K_HTC_MSG_SETUP_COMPLETE_EX_ID,</div><div class='add'>+				       HTC_MSG_MESSAGEID);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_HTC, "HTC is using TX credit flow control\n");</div><div class='add'>+</div><div class='add'>+	status = ath12k_htc_send(htc, ATH12K_HTC_EP_0, skb);</div><div class='add'>+	if (status) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_htc_init(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_htc *htc = &amp;ab-&gt;htc;</div><div class='add'>+	struct ath12k_htc_svc_conn_req conn_req = { };</div><div class='add'>+	struct ath12k_htc_svc_conn_resp conn_resp = { };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;htc-&gt;tx_lock);</div><div class='add'>+</div><div class='add'>+	ath12k_htc_reset_endpoint_states(htc);</div><div class='add'>+</div><div class='add'>+	htc-&gt;ab = ab;</div><div class='add'>+</div><div class='add'>+	switch (ab-&gt;wmi_ab.preferred_hw_mode) {</div><div class='add'>+	case WMI_HOST_HW_MODE_SINGLE:</div><div class='add'>+		htc-&gt;wmi_ep_count = 1;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_HOST_HW_MODE_DBS:</div><div class='add'>+	case WMI_HOST_HW_MODE_DBS_OR_SBS:</div><div class='add'>+		htc-&gt;wmi_ep_count = 2;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_HOST_HW_MODE_DBS_SBS:</div><div class='add'>+		htc-&gt;wmi_ep_count = 3;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		htc-&gt;wmi_ep_count = ab-&gt;hw_params-&gt;max_radios;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* setup our pseudo HTC control endpoint connection */</div><div class='add'>+	conn_req.ep_ops.ep_tx_complete = ath12k_htc_control_tx_complete;</div><div class='add'>+	conn_req.ep_ops.ep_rx_complete = ath12k_htc_control_rx_complete;</div><div class='add'>+	conn_req.max_send_queue_depth = ATH12K_NUM_CONTROL_TX_BUFFERS;</div><div class='add'>+	conn_req.service_id = ATH12K_HTC_SVC_ID_RSVD_CTRL;</div><div class='add'>+</div><div class='add'>+	/* connect fake service */</div><div class='add'>+	ret = ath12k_htc_connect_service(htc, &amp;conn_req, &amp;conn_resp);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "could not connect to htc service (%d)\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;htc-&gt;ctl_resp);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/htc.h b/drivers/net/wireless/ath/ath12k/htc.h<br/>new file mode 100644<br/>index 000000000000..7e3dccc7cc14<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/htc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/htc.h</a></div><div class='hunk'>@@ -0,0 +1,316 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH12K_HTC_H</div><div class='add'>+#define ATH12K_HTC_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+</div><div class='add'>+struct ath12k_base;</div><div class='add'>+</div><div class='add'>+#define HTC_HDR_ENDPOINTID                       GENMASK(7, 0)</div><div class='add'>+#define HTC_HDR_FLAGS                            GENMASK(15, 8)</div><div class='add'>+#define HTC_HDR_PAYLOADLEN                       GENMASK(31, 16)</div><div class='add'>+#define HTC_HDR_CONTROLBYTES0                    GENMASK(7, 0)</div><div class='add'>+#define HTC_HDR_CONTROLBYTES1                    GENMASK(15, 8)</div><div class='add'>+#define HTC_HDR_RESERVED                         GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define HTC_SVC_MSG_SERVICE_ID                   GENMASK(31, 16)</div><div class='add'>+#define HTC_SVC_MSG_CONNECTIONFLAGS              GENMASK(15, 0)</div><div class='add'>+#define HTC_SVC_MSG_SERVICEMETALENGTH            GENMASK(23, 16)</div><div class='add'>+#define HTC_READY_MSG_CREDITCOUNT                GENMASK(31, 16)</div><div class='add'>+#define HTC_READY_MSG_CREDITSIZE                 GENMASK(15, 0)</div><div class='add'>+#define HTC_READY_MSG_MAXENDPOINTS               GENMASK(23, 16)</div><div class='add'>+</div><div class='add'>+#define HTC_READY_EX_MSG_HTCVERSION              GENMASK(7, 0)</div><div class='add'>+#define HTC_READY_EX_MSG_MAXMSGSPERHTCBUNDLE     GENMASK(15, 8)</div><div class='add'>+</div><div class='add'>+#define HTC_SVC_RESP_MSG_SERVICEID           GENMASK(31, 16)</div><div class='add'>+#define HTC_SVC_RESP_MSG_STATUS              GENMASK(7, 0)</div><div class='add'>+#define HTC_SVC_RESP_MSG_ENDPOINTID          GENMASK(15, 8)</div><div class='add'>+#define HTC_SVC_RESP_MSG_MAXMSGSIZE          GENMASK(31, 16)</div><div class='add'>+#define HTC_SVC_RESP_MSG_SERVICEMETALENGTH   GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define HTC_MSG_MESSAGEID                        GENMASK(15, 0)</div><div class='add'>+#define HTC_SETUP_COMPLETE_EX_MSG_SETUPFLAGS     GENMASK(31, 0)</div><div class='add'>+#define HTC_SETUP_COMPLETE_EX_MSG_MAXMSGSPERBUNDLEDRECV      GENMASK(7, 0)</div><div class='add'>+#define HTC_SETUP_COMPLETE_EX_MSG_RSVD0          GENMASK(15, 8)</div><div class='add'>+#define HTC_SETUP_COMPLETE_EX_MSG_RSVD1          GENMASK(23, 16)</div><div class='add'>+#define HTC_SETUP_COMPLETE_EX_MSG_RSVD2          GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+enum ath12k_htc_tx_flags {</div><div class='add'>+	ATH12K_HTC_FLAG_NEED_CREDIT_UPDATE = 0x01,</div><div class='add'>+	ATH12K_HTC_FLAG_SEND_BUNDLE        = 0x02</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_htc_rx_flags {</div><div class='add'>+	ATH12K_HTC_FLAG_TRAILER_PRESENT = 0x02,</div><div class='add'>+	ATH12K_HTC_FLAG_BUNDLE_MASK     = 0xF0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_htc_hdr {</div><div class='add'>+	__le32 htc_info;</div><div class='add'>+	__le32 ctrl_info;</div><div class='add'>+} __packed __aligned(4);</div><div class='add'>+</div><div class='add'>+enum ath12k_htc_msg_id {</div><div class='add'>+	ATH12K_HTC_MSG_READY_ID                = 1,</div><div class='add'>+	ATH12K_HTC_MSG_CONNECT_SERVICE_ID      = 2,</div><div class='add'>+	ATH12K_HTC_MSG_CONNECT_SERVICE_RESP_ID = 3,</div><div class='add'>+	ATH12K_HTC_MSG_SETUP_COMPLETE_ID       = 4,</div><div class='add'>+	ATH12K_HTC_MSG_SETUP_COMPLETE_EX_ID    = 5,</div><div class='add'>+	ATH12K_HTC_MSG_SEND_SUSPEND_COMPLETE   = 6,</div><div class='add'>+	ATH12K_HTC_MSG_NACK_SUSPEND	       = 7,</div><div class='add'>+	ATH12K_HTC_MSG_WAKEUP_FROM_SUSPEND_ID  = 8,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_htc_version {</div><div class='add'>+	ATH12K_HTC_VERSION_2P0 = 0x00, /* 2.0 */</div><div class='add'>+	ATH12K_HTC_VERSION_2P1 = 0x01, /* 2.1 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_htc_conn_flag_threshold_level {</div><div class='add'>+	ATH12K_HTC_CONN_FLAGS_THRESHOLD_LEVEL_ONE_FOURTH,</div><div class='add'>+	ATH12K_HTC_CONN_FLAGS_THRESHOLD_LEVEL_ONE_HALF,</div><div class='add'>+	ATH12K_HTC_CONN_FLAGS_THRESHOLD_LEVEL_THREE_FOURTHS,</div><div class='add'>+	ATH12K_HTC_CONN_FLAGS_THRESHOLD_LEVEL_UNITY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_HTC_CONN_FLAGS_THRESHOLD_LEVEL_MASK	GENMASK(1, 0)</div><div class='add'>+#define ATH12K_HTC_CONN_FLAGS_REDUCE_CREDIT_DRIBBLE	BIT(2)</div><div class='add'>+#define ATH12K_HTC_CONN_FLAGS_DISABLE_CREDIT_FLOW_CTRL	BIT(3)</div><div class='add'>+#define ATH12K_HTC_CONN_FLAGS_RECV_ALLOC		GENMASK(15, 8)</div><div class='add'>+</div><div class='add'>+enum ath12k_htc_conn_svc_status {</div><div class='add'>+	ATH12K_HTC_CONN_SVC_STATUS_SUCCESS      = 0,</div><div class='add'>+	ATH12K_HTC_CONN_SVC_STATUS_NOT_FOUND    = 1,</div><div class='add'>+	ATH12K_HTC_CONN_SVC_STATUS_FAILED       = 2,</div><div class='add'>+	ATH12K_HTC_CONN_SVC_STATUS_NO_RESOURCES = 3,</div><div class='add'>+	ATH12K_HTC_CONN_SVC_STATUS_NO_MORE_EP   = 4</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_htc_ready {</div><div class='add'>+	__le32 id_credit_count;</div><div class='add'>+	__le32 size_ep;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htc_ready_extended {</div><div class='add'>+	struct ath12k_htc_ready base;</div><div class='add'>+	__le32 ver_bundle;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htc_conn_svc {</div><div class='add'>+	__le32 msg_svc_id;</div><div class='add'>+	__le32 flags_len;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htc_conn_svc_resp {</div><div class='add'>+	__le32 msg_svc_id;</div><div class='add'>+	__le32 flags_len;</div><div class='add'>+	__le32 svc_meta_pad;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htc_setup_complete_extended {</div><div class='add'>+	__le32 msg_id;</div><div class='add'>+	__le32 flags;</div><div class='add'>+	__le32 max_msgs_per_bundled_recv;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htc_msg {</div><div class='add'>+	__le32 msg_svc_id;</div><div class='add'>+	__le32 flags_len;</div><div class='add'>+} __packed __aligned(4);</div><div class='add'>+</div><div class='add'>+enum ath12k_htc_record_id {</div><div class='add'>+	ATH12K_HTC_RECORD_NULL    = 0,</div><div class='add'>+	ATH12K_HTC_RECORD_CREDITS = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_htc_record_hdr {</div><div class='add'>+	u8 id; /* @enum ath12k_htc_record_id */</div><div class='add'>+	u8 len;</div><div class='add'>+	u8 pad0;</div><div class='add'>+	u8 pad1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htc_credit_report {</div><div class='add'>+	u8 eid; /* @enum ath12k_htc_ep_id */</div><div class='add'>+	u8 credits;</div><div class='add'>+	u8 pad0;</div><div class='add'>+	u8 pad1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_htc_record {</div><div class='add'>+	struct ath12k_htc_record_hdr hdr;</div><div class='add'>+	struct ath12k_htc_credit_report credit_report[];</div><div class='add'>+} __packed __aligned(4);</div><div class='add'>+</div><div class='add'>+/* HTC FRAME structure layout draft</div><div class='add'>+ *</div><div class='add'>+ * note: the trailer offset is dynamic depending</div><div class='add'>+ * on payload length. this is only a struct layout draft</div><div class='add'>+ *</div><div class='add'>+ *=======================================================</div><div class='add'>+ *</div><div class='add'>+ *                 HTC HEADER</div><div class='add'>+ *</div><div class='add'>+ *=======================================================</div><div class='add'>+ *                      |</div><div class='add'>+ *      HTC message     |        payload</div><div class='add'>+ *   (variable length)  |    (variable length)</div><div class='add'>+ *=======================================================</div><div class='add'>+ *</div><div class='add'>+ *                  HTC Record</div><div class='add'>+ *</div><div class='add'>+ *=======================================================</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum ath12k_htc_svc_gid {</div><div class='add'>+	ATH12K_HTC_SVC_GRP_RSVD = 0,</div><div class='add'>+	ATH12K_HTC_SVC_GRP_WMI = 1,</div><div class='add'>+	ATH12K_HTC_SVC_GRP_NMI = 2,</div><div class='add'>+	ATH12K_HTC_SVC_GRP_HTT = 3,</div><div class='add'>+	ATH12K_HTC_SVC_GRP_CFG = 4,</div><div class='add'>+	ATH12K_HTC_SVC_GRP_IPA = 5,</div><div class='add'>+	ATH12K_HTC_SVC_GRP_PKTLOG = 6,</div><div class='add'>+</div><div class='add'>+	ATH12K_HTC_SVC_GRP_TEST = 254,</div><div class='add'>+	ATH12K_HTC_SVC_GRP_LAST = 255,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SVC(group, idx) \</div><div class='add'>+	(int)(((int)(group) &lt;&lt; 8) | (int)(idx))</div><div class='add'>+</div><div class='add'>+enum ath12k_htc_svc_id {</div><div class='add'>+	/* NOTE: service ID of 0x0000 is reserved and should never be used */</div><div class='add'>+	ATH12K_HTC_SVC_ID_RESERVED	= 0x0000,</div><div class='add'>+	ATH12K_HTC_SVC_ID_UNUSED	= ATH12K_HTC_SVC_ID_RESERVED,</div><div class='add'>+</div><div class='add'>+	ATH12K_HTC_SVC_ID_RSVD_CTRL	= SVC(ATH12K_HTC_SVC_GRP_RSVD, 1),</div><div class='add'>+	ATH12K_HTC_SVC_ID_WMI_CONTROL	= SVC(ATH12K_HTC_SVC_GRP_WMI, 0),</div><div class='add'>+	ATH12K_HTC_SVC_ID_WMI_DATA_BE	= SVC(ATH12K_HTC_SVC_GRP_WMI, 1),</div><div class='add'>+	ATH12K_HTC_SVC_ID_WMI_DATA_BK	= SVC(ATH12K_HTC_SVC_GRP_WMI, 2),</div><div class='add'>+	ATH12K_HTC_SVC_ID_WMI_DATA_VI	= SVC(ATH12K_HTC_SVC_GRP_WMI, 3),</div><div class='add'>+	ATH12K_HTC_SVC_ID_WMI_DATA_VO	= SVC(ATH12K_HTC_SVC_GRP_WMI, 4),</div><div class='add'>+	ATH12K_HTC_SVC_ID_WMI_CONTROL_MAC1 = SVC(ATH12K_HTC_SVC_GRP_WMI, 5),</div><div class='add'>+	ATH12K_HTC_SVC_ID_WMI_CONTROL_MAC2 = SVC(ATH12K_HTC_SVC_GRP_WMI, 6),</div><div class='add'>+	ATH12K_HTC_SVC_ID_WMI_CONTROL_DIAG = SVC(ATH12K_HTC_SVC_GRP_WMI, 7),</div><div class='add'>+</div><div class='add'>+	ATH12K_HTC_SVC_ID_NMI_CONTROL	= SVC(ATH12K_HTC_SVC_GRP_NMI, 0),</div><div class='add'>+	ATH12K_HTC_SVC_ID_NMI_DATA	= SVC(ATH12K_HTC_SVC_GRP_NMI, 1),</div><div class='add'>+</div><div class='add'>+	ATH12K_HTC_SVC_ID_HTT_DATA_MSG	= SVC(ATH12K_HTC_SVC_GRP_HTT, 0),</div><div class='add'>+</div><div class='add'>+	/* raw stream service (i.e. flash, tcmd, calibration apps) */</div><div class='add'>+	ATH12K_HTC_SVC_ID_TEST_RAW_STREAMS = SVC(ATH12K_HTC_SVC_GRP_TEST, 0),</div><div class='add'>+	ATH12K_HTC_SVC_ID_IPA_TX = SVC(ATH12K_HTC_SVC_GRP_IPA, 0),</div><div class='add'>+	ATH12K_HTC_SVC_ID_PKT_LOG = SVC(ATH12K_HTC_SVC_GRP_PKTLOG, 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#undef SVC</div><div class='add'>+</div><div class='add'>+enum ath12k_htc_ep_id {</div><div class='add'>+	ATH12K_HTC_EP_UNUSED = -1,</div><div class='add'>+	ATH12K_HTC_EP_0 = 0,</div><div class='add'>+	ATH12K_HTC_EP_1 = 1,</div><div class='add'>+	ATH12K_HTC_EP_2,</div><div class='add'>+	ATH12K_HTC_EP_3,</div><div class='add'>+	ATH12K_HTC_EP_4,</div><div class='add'>+	ATH12K_HTC_EP_5,</div><div class='add'>+	ATH12K_HTC_EP_6,</div><div class='add'>+	ATH12K_HTC_EP_7,</div><div class='add'>+	ATH12K_HTC_EP_8,</div><div class='add'>+	ATH12K_HTC_EP_COUNT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_htc_ep_ops {</div><div class='add'>+	void (*ep_tx_complete)(struct ath12k_base *ab, struct sk_buff *skb);</div><div class='add'>+	void (*ep_rx_complete)(struct ath12k_base *ab, struct sk_buff *skb);</div><div class='add'>+	void (*ep_tx_credits)(struct ath12k_base *ab);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* service connection information */</div><div class='add'>+struct ath12k_htc_svc_conn_req {</div><div class='add'>+	u16 service_id;</div><div class='add'>+	struct ath12k_htc_ep_ops ep_ops;</div><div class='add'>+	int max_send_queue_depth;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* service connection response information */</div><div class='add'>+struct ath12k_htc_svc_conn_resp {</div><div class='add'>+	u8 buffer_len;</div><div class='add'>+	u8 actual_len;</div><div class='add'>+	enum ath12k_htc_ep_id eid;</div><div class='add'>+	unsigned int max_msg_len;</div><div class='add'>+	u8 connect_resp_code;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_NUM_CONTROL_TX_BUFFERS 2</div><div class='add'>+#define ATH12K_HTC_MAX_LEN 4096</div><div class='add'>+#define ATH12K_HTC_MAX_CTRL_MSG_LEN 256</div><div class='add'>+#define ATH12K_HTC_WAIT_TIMEOUT_HZ (1 * HZ)</div><div class='add'>+#define ATH12K_HTC_CONTROL_BUFFER_SIZE (ATH12K_HTC_MAX_CTRL_MSG_LEN + \</div><div class='add'>+					sizeof(struct ath12k_htc_hdr))</div><div class='add'>+#define ATH12K_HTC_CONN_SVC_TIMEOUT_HZ (1 * HZ)</div><div class='add'>+#define ATH12K_HTC_MAX_SERVICE_ALLOC_ENTRIES 8</div><div class='add'>+</div><div class='add'>+struct ath12k_htc_ep {</div><div class='add'>+	struct ath12k_htc *htc;</div><div class='add'>+	enum ath12k_htc_ep_id eid;</div><div class='add'>+	enum ath12k_htc_svc_id service_id;</div><div class='add'>+	struct ath12k_htc_ep_ops ep_ops;</div><div class='add'>+</div><div class='add'>+	int max_tx_queue_depth;</div><div class='add'>+	int max_ep_message_len;</div><div class='add'>+	u8 ul_pipe_id;</div><div class='add'>+	u8 dl_pipe_id;</div><div class='add'>+</div><div class='add'>+	u8 seq_no; /* for debugging */</div><div class='add'>+	int tx_credits;</div><div class='add'>+	bool tx_credit_flow_enabled;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_htc_svc_tx_credits {</div><div class='add'>+	u16 service_id;</div><div class='add'>+	u8  credit_allocation;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_htc {</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	struct ath12k_htc_ep endpoint[ATH12K_HTC_EP_COUNT];</div><div class='add'>+</div><div class='add'>+	/* protects endpoints */</div><div class='add'>+	spinlock_t tx_lock;</div><div class='add'>+</div><div class='add'>+	u8 control_resp_buffer[ATH12K_HTC_MAX_CTRL_MSG_LEN];</div><div class='add'>+	int control_resp_len;</div><div class='add'>+</div><div class='add'>+	struct completion ctl_resp;</div><div class='add'>+</div><div class='add'>+	int total_transmit_credits;</div><div class='add'>+	struct ath12k_htc_svc_tx_credits</div><div class='add'>+		service_alloc_table[ATH12K_HTC_MAX_SERVICE_ALLOC_ENTRIES];</div><div class='add'>+	int target_credit_size;</div><div class='add'>+	u8 wmi_ep_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ath12k_htc_init(struct ath12k_base *ar);</div><div class='add'>+int ath12k_htc_wait_target(struct ath12k_htc *htc);</div><div class='add'>+int ath12k_htc_start(struct ath12k_htc *htc);</div><div class='add'>+int ath12k_htc_connect_service(struct ath12k_htc *htc,</div><div class='add'>+			       struct ath12k_htc_svc_conn_req  *conn_req,</div><div class='add'>+			       struct ath12k_htc_svc_conn_resp *conn_resp);</div><div class='add'>+int ath12k_htc_send(struct ath12k_htc *htc, enum ath12k_htc_ep_id eid,</div><div class='add'>+		    struct sk_buff *packet);</div><div class='add'>+struct sk_buff *ath12k_htc_alloc_skb(struct ath12k_base *ar, int size);</div><div class='add'>+void ath12k_htc_rx_completion_handler(struct ath12k_base *ar,</div><div class='add'>+				      struct sk_buff *skb);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/hw.c b/drivers/net/wireless/ath/ath12k/hw.c<br/>new file mode 100644<br/>index 000000000000..6791ae1d64e5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/hw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/hw.c</a></div><div class='hunk'>@@ -0,0 +1,1680 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "ce.h"</div><div class='add'>+#include "hw.h"</div><div class='add'>+#include "mhi.h"</div><div class='add'>+#include "dp_rx.h"</div><div class='add'>+#include "peer.h"</div><div class='add'>+</div><div class='add'>+static const guid_t wcn7850_uuid = GUID_INIT(0xf634f534, 0x6147, 0x11ec,</div><div class='add'>+					     0x90, 0xd6, 0x02, 0x42,</div><div class='add'>+					     0xac, 0x12, 0x00, 0x03);</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_qcn9274_mac_from_pdev_id(int pdev_idx)</div><div class='add'>+{</div><div class='add'>+	return pdev_idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_hw_mac_id_to_pdev_id_qcn9274(const struct ath12k_hw_params *hw,</div><div class='add'>+					       int mac_id)</div><div class='add'>+{</div><div class='add'>+	return mac_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_hw_mac_id_to_srng_id_qcn9274(const struct ath12k_hw_params *hw,</div><div class='add'>+					       int mac_id)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_get_ring_selector_qcn9274(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return smp_processor_id();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_dp_srng_is_comp_ring_qcn9274(int ring_num)</div><div class='add'>+{</div><div class='add'>+	if (ring_num &lt; 3 || ring_num == 4)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_is_frame_link_agnostic_qcn9274(struct ath12k_link_vif *arvif,</div><div class='add'>+						  struct ieee80211_mgmt *mgmt)</div><div class='add'>+{</div><div class='add'>+	return ieee80211_is_action(mgmt-&gt;frame_control);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_hw_mac_id_to_pdev_id_wcn7850(const struct ath12k_hw_params *hw,</div><div class='add'>+					       int mac_id)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_hw_mac_id_to_srng_id_wcn7850(const struct ath12k_hw_params *hw,</div><div class='add'>+					       int mac_id)</div><div class='add'>+{</div><div class='add'>+	return mac_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_hw_get_ring_selector_wcn7850(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return skb_get_queue_mapping(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_dp_srng_is_comp_ring_wcn7850(int ring_num)</div><div class='add'>+{</div><div class='add'>+	if (ring_num == 0 || ring_num == 2 || ring_num == 4)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_is_addba_resp_action_code(struct ieee80211_mgmt *mgmt)</div><div class='add'>+{</div><div class='add'>+	if (!ieee80211_is_action(mgmt-&gt;frame_control))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (mgmt-&gt;u.action.category != WLAN_CATEGORY_BACK)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (mgmt-&gt;u.action.u.addba_resp.action_code != WLAN_ACTION_ADDBA_RESP)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_is_frame_link_agnostic_wcn7850(struct ath12k_link_vif *arvif,</div><div class='add'>+						  struct ieee80211_mgmt *mgmt)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+	struct ath12k_hw *ah = ath12k_ar_to_ah(arvif-&gt;ar);</div><div class='add'>+	struct ath12k_base *ab = arvif-&gt;ar-&gt;ab;</div><div class='add'>+	__le16 fc = mgmt-&gt;frame_control;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	if (!ath12k_peer_find_by_addr(ab, mgmt-&gt;da) &amp;&amp;</div><div class='add'>+	    !ath12k_peer_ml_find(ah, mgmt-&gt;da)) {</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+		return arvif-&gt;is_up &amp;&amp;</div><div class='add'>+		       (vif-&gt;valid_links == vif-&gt;active_links) &amp;&amp;</div><div class='add'>+		       !ieee80211_is_probe_req(fc) &amp;&amp;</div><div class='add'>+		       !ieee80211_is_auth(fc) &amp;&amp;</div><div class='add'>+		       !ieee80211_is_deauth(fc) &amp;&amp;</div><div class='add'>+		       !ath12k_is_addba_resp_action_code(mgmt);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP)</div><div class='add'>+		return !(ieee80211_is_probe_resp(fc) || ieee80211_is_auth(fc) ||</div><div class='add'>+			 ieee80211_is_assoc_resp(fc) || ieee80211_is_reassoc_resp(fc) ||</div><div class='add'>+			 ath12k_is_addba_resp_action_code(mgmt));</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ath12k_hw_ops qcn9274_ops = {</div><div class='add'>+	.get_hw_mac_from_pdev_id = ath12k_hw_qcn9274_mac_from_pdev_id,</div><div class='add'>+	.mac_id_to_pdev_id = ath12k_hw_mac_id_to_pdev_id_qcn9274,</div><div class='add'>+	.mac_id_to_srng_id = ath12k_hw_mac_id_to_srng_id_qcn9274,</div><div class='add'>+	.rxdma_ring_sel_config = ath12k_dp_rxdma_ring_sel_config_qcn9274,</div><div class='add'>+	.get_ring_selector = ath12k_hw_get_ring_selector_qcn9274,</div><div class='add'>+	.dp_srng_is_tx_comp_ring = ath12k_dp_srng_is_comp_ring_qcn9274,</div><div class='add'>+	.is_frame_link_agnostic = ath12k_is_frame_link_agnostic_qcn9274,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ath12k_hw_ops wcn7850_ops = {</div><div class='add'>+	.get_hw_mac_from_pdev_id = ath12k_hw_qcn9274_mac_from_pdev_id,</div><div class='add'>+	.mac_id_to_pdev_id = ath12k_hw_mac_id_to_pdev_id_wcn7850,</div><div class='add'>+	.mac_id_to_srng_id = ath12k_hw_mac_id_to_srng_id_wcn7850,</div><div class='add'>+	.rxdma_ring_sel_config = ath12k_dp_rxdma_ring_sel_config_wcn7850,</div><div class='add'>+	.get_ring_selector = ath12k_hw_get_ring_selector_wcn7850,</div><div class='add'>+	.dp_srng_is_tx_comp_ring = ath12k_dp_srng_is_comp_ring_wcn7850,</div><div class='add'>+	.is_frame_link_agnostic = ath12k_is_frame_link_agnostic_wcn7850,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_TX_RING_MASK_0 0x1</div><div class='add'>+#define ATH12K_TX_RING_MASK_1 0x2</div><div class='add'>+#define ATH12K_TX_RING_MASK_2 0x4</div><div class='add'>+#define ATH12K_TX_RING_MASK_3 0x8</div><div class='add'>+#define ATH12K_TX_RING_MASK_4 0x10</div><div class='add'>+</div><div class='add'>+#define ATH12K_RX_RING_MASK_0 0x1</div><div class='add'>+#define ATH12K_RX_RING_MASK_1 0x2</div><div class='add'>+#define ATH12K_RX_RING_MASK_2 0x4</div><div class='add'>+#define ATH12K_RX_RING_MASK_3 0x8</div><div class='add'>+</div><div class='add'>+#define ATH12K_RX_ERR_RING_MASK_0 0x1</div><div class='add'>+</div><div class='add'>+#define ATH12K_RX_WBM_REL_RING_MASK_0 0x1</div><div class='add'>+</div><div class='add'>+#define ATH12K_REO_STATUS_RING_MASK_0 0x1</div><div class='add'>+</div><div class='add'>+#define ATH12K_HOST2RXDMA_RING_MASK_0 0x1</div><div class='add'>+</div><div class='add'>+#define ATH12K_RX_MON_RING_MASK_0 0x1</div><div class='add'>+#define ATH12K_RX_MON_RING_MASK_1 0x2</div><div class='add'>+#define ATH12K_RX_MON_RING_MASK_2 0x4</div><div class='add'>+</div><div class='add'>+#define ATH12K_TX_MON_RING_MASK_0 0x1</div><div class='add'>+#define ATH12K_TX_MON_RING_MASK_1 0x2</div><div class='add'>+</div><div class='add'>+#define ATH12K_RX_MON_STATUS_RING_MASK_0 0x1</div><div class='add'>+#define ATH12K_RX_MON_STATUS_RING_MASK_1 0x2</div><div class='add'>+#define ATH12K_RX_MON_STATUS_RING_MASK_2 0x4</div><div class='add'>+</div><div class='add'>+/* Target firmware's Copy Engine configuration. */</div><div class='add'>+static const struct ce_pipe_config ath12k_target_ce_config_wlan_qcn9274[] = {</div><div class='add'>+	/* CE0: host-&gt;target HTC control and raw streams */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(0),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE1: target-&gt;host HTT + HTC control */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(1),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE2: target-&gt;host WMI */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(2),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE3: host-&gt;target WMI (mac0) */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(3),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE4: host-&gt;target HTT */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(4),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		.nentries = __cpu_to_le32(256),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(256),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS | CE_ATTR_DIS_INTR),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE5: target-&gt;host Pktlog */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(5),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE6: Reserved for target autonomous hif_memcpy */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(6),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_INOUT),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(16384),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE7: host-&gt;target WMI (mac1) */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(7),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE8: Reserved for target autonomous hif_memcpy */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(8),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_INOUT),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(16384),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE9, 10 and 11: Reserved for MHI */</div><div class='add'>+</div><div class='add'>+	/* CE12: Target CV prefetch */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(12),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE13: Target CV prefetch */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(13),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE14: WMI logging/CFR/Spectral/Radar */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(14),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE15: Reserved */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Target firmware's Copy Engine configuration. */</div><div class='add'>+static const struct ce_pipe_config ath12k_target_ce_config_wlan_wcn7850[] = {</div><div class='add'>+	/* CE0: host-&gt;target HTC control and raw streams */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(0),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE1: target-&gt;host HTT + HTC control */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(1),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE2: target-&gt;host WMI */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(2),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE3: host-&gt;target WMI */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(3),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE4: host-&gt;target HTT */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(4),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		.nentries = __cpu_to_le32(256),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(256),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS | CE_ATTR_DIS_INTR),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE5: target-&gt;host Pktlog */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(5),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE6: Reserved for target autonomous hif_memcpy */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(6),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_INOUT),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(16384),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE7 used only by Host */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(7),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_INOUT_H2H),</div><div class='add'>+		.nentries = __cpu_to_le32(0),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(0),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS | CE_ATTR_DIS_INTR),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* CE8 target-&gt;host used only by IPA */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(8),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_INOUT),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(16384),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+	/* CE 9, 10, 11 are used by MHI driver */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Map from service/endpoint to Copy Engine.</div><div class='add'>+ * This table is derived from the CE_PCI TABLE, above.</div><div class='add'>+ * It is passed to the Target at startup for use by firmware.</div><div class='add'>+ */</div><div class='add'>+static const struct service_to_pipe ath12k_target_service_to_ce_map_wlan_qcn9274[] = {</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_VO),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		__cpu_to_le32(3),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_VO),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		__cpu_to_le32(2),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_BK),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		__cpu_to_le32(3),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_BK),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		__cpu_to_le32(2),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_BE),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		__cpu_to_le32(3),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_BE),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		__cpu_to_le32(2),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_VI),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		__cpu_to_le32(3),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_VI),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		__cpu_to_le32(2),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_CONTROL),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		__cpu_to_le32(3),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_CONTROL),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		__cpu_to_le32(2),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_RSVD_CTRL),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		__cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_RSVD_CTRL),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		__cpu_to_le32(1),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_TEST_RAW_STREAMS),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		__cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_TEST_RAW_STREAMS),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		__cpu_to_le32(1),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_HTT_DATA_MSG),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		__cpu_to_le32(4),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_HTT_DATA_MSG),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		__cpu_to_le32(1),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_CONTROL_MAC1),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		__cpu_to_le32(7),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_CONTROL_MAC1),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		__cpu_to_le32(2),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_PKT_LOG),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		__cpu_to_le32(5),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_CONTROL_DIAG),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		__cpu_to_le32(14),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* (Additions here) */</div><div class='add'>+</div><div class='add'>+	{ /* must be last */</div><div class='add'>+		__cpu_to_le32(0),</div><div class='add'>+		__cpu_to_le32(0),</div><div class='add'>+		__cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct service_to_pipe ath12k_target_service_to_ce_map_wlan_wcn7850[] = {</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_VO),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		__cpu_to_le32(3),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_VO),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		__cpu_to_le32(2),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_BK),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		__cpu_to_le32(3),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_BK),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		__cpu_to_le32(2),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_BE),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		__cpu_to_le32(3),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_BE),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		__cpu_to_le32(2),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_VI),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		__cpu_to_le32(3),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_VI),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		__cpu_to_le32(2),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_CONTROL),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		__cpu_to_le32(3),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_CONTROL),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		__cpu_to_le32(2),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_RSVD_CTRL),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		__cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_RSVD_CTRL),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		__cpu_to_le32(2),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_HTT_DATA_MSG),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),	/* out = UL = host -&gt; target */</div><div class='add'>+		__cpu_to_le32(4),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_HTT_DATA_MSG),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),	/* in = DL = target -&gt; host */</div><div class='add'>+		__cpu_to_le32(1),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* (Additions here) */</div><div class='add'>+</div><div class='add'>+	{ /* must be last */</div><div class='add'>+		__cpu_to_le32(0),</div><div class='add'>+		__cpu_to_le32(0),</div><div class='add'>+		__cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ce_pipe_config ath12k_target_ce_config_wlan_ipq5332[] = {</div><div class='add'>+	/* host-&gt;target HTC control and raw streams */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(0),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+	/* target-&gt;host HTT */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(1),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+	/* target-&gt;host WMI  + HTC control */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(2),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+	/* host-&gt;target WMI */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(3),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+	/* host-&gt;target HTT */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(4),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		.nentries = __cpu_to_le32(256),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(256),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS | CE_ATTR_DIS_INTR),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+	/* Target -&gt; host PKTLOG */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(5),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+	/* Reserved for target autonomous HIF_memcpy */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(6),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_INOUT),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(16384),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+	/* CE7 Reserved for CV Prefetch */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(7),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+	/* CE8 Reserved for target generic HIF memcpy */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(8),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_INOUT),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(16384),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+	/* CE9 WMI logging/CFR/Spectral/Radar/ */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(9),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		.nentries = __cpu_to_le32(32),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(2048),</div><div class='add'>+		.flags = __cpu_to_le32(CE_ATTR_FLAGS),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+	/* Unused TBD */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(10),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_NONE),</div><div class='add'>+		.nentries = __cpu_to_le32(0),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(0),</div><div class='add'>+		.flags = __cpu_to_le32(0),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+	/* Unused TBD */</div><div class='add'>+	{</div><div class='add'>+		.pipenum = __cpu_to_le32(11),</div><div class='add'>+		.pipedir = __cpu_to_le32(PIPEDIR_NONE),</div><div class='add'>+		.nentries = __cpu_to_le32(0),</div><div class='add'>+		.nbytes_max = __cpu_to_le32(0),</div><div class='add'>+		.flags = __cpu_to_le32(0),</div><div class='add'>+		.reserved = __cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct service_to_pipe ath12k_target_service_to_ce_map_wlan_ipq5332[] = {</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_VO),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		__cpu_to_le32(3),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_VO),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		__cpu_to_le32(2),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_BK),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		__cpu_to_le32(3),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_BK),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		__cpu_to_le32(2),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_BE),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		__cpu_to_le32(3),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_BE),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		__cpu_to_le32(2),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_VI),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		__cpu_to_le32(3),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_VI),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		__cpu_to_le32(2),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_CONTROL),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		__cpu_to_le32(3),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_CONTROL),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		__cpu_to_le32(2),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_RSVD_CTRL),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		__cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_RSVD_CTRL),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		__cpu_to_le32(1),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_TEST_RAW_STREAMS),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		__cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_TEST_RAW_STREAMS),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		__cpu_to_le32(1),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_HTT_DATA_MSG),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_OUT),</div><div class='add'>+		__cpu_to_le32(4),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_HTT_DATA_MSG),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		__cpu_to_le32(1),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_PKT_LOG),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		__cpu_to_le32(5),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		__cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_CONTROL_DIAG),</div><div class='add'>+		__cpu_to_le32(PIPEDIR_IN),</div><div class='add'>+		__cpu_to_le32(9),</div><div class='add'>+	},</div><div class='add'>+	/* (Additions here) */</div><div class='add'>+</div><div class='add'>+	{ /* must be last */</div><div class='add'>+		__cpu_to_le32(0),</div><div class='add'>+		__cpu_to_le32(0),</div><div class='add'>+		__cpu_to_le32(0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ath12k_hw_ring_mask ath12k_hw_ring_mask_qcn9274 = {</div><div class='add'>+	.tx  = {</div><div class='add'>+		ATH12K_TX_RING_MASK_0,</div><div class='add'>+		ATH12K_TX_RING_MASK_1,</div><div class='add'>+		ATH12K_TX_RING_MASK_2,</div><div class='add'>+		ATH12K_TX_RING_MASK_3,</div><div class='add'>+	},</div><div class='add'>+	.rx_mon_dest = {</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		ATH12K_RX_MON_RING_MASK_0,</div><div class='add'>+		ATH12K_RX_MON_RING_MASK_1,</div><div class='add'>+		ATH12K_RX_MON_RING_MASK_2,</div><div class='add'>+	},</div><div class='add'>+	.rx = {</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		ATH12K_RX_RING_MASK_0,</div><div class='add'>+		ATH12K_RX_RING_MASK_1,</div><div class='add'>+		ATH12K_RX_RING_MASK_2,</div><div class='add'>+		ATH12K_RX_RING_MASK_3,</div><div class='add'>+	},</div><div class='add'>+	.rx_err = {</div><div class='add'>+		0, 0, 0,</div><div class='add'>+		ATH12K_RX_ERR_RING_MASK_0,</div><div class='add'>+	},</div><div class='add'>+	.rx_wbm_rel = {</div><div class='add'>+		0, 0, 0,</div><div class='add'>+		ATH12K_RX_WBM_REL_RING_MASK_0,</div><div class='add'>+	},</div><div class='add'>+	.reo_status = {</div><div class='add'>+		0, 0, 0,</div><div class='add'>+		ATH12K_REO_STATUS_RING_MASK_0,</div><div class='add'>+	},</div><div class='add'>+	.host2rxdma = {</div><div class='add'>+		0, 0, 0,</div><div class='add'>+		ATH12K_HOST2RXDMA_RING_MASK_0,</div><div class='add'>+	},</div><div class='add'>+	.tx_mon_dest = {</div><div class='add'>+		0, 0, 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ath12k_hw_ring_mask ath12k_hw_ring_mask_ipq5332 = {</div><div class='add'>+	.tx  = {</div><div class='add'>+		ATH12K_TX_RING_MASK_0,</div><div class='add'>+		ATH12K_TX_RING_MASK_1,</div><div class='add'>+		ATH12K_TX_RING_MASK_2,</div><div class='add'>+		ATH12K_TX_RING_MASK_3,</div><div class='add'>+	},</div><div class='add'>+	.rx_mon_dest = {</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+		ATH12K_RX_MON_RING_MASK_0,</div><div class='add'>+	},</div><div class='add'>+	.rx = {</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		ATH12K_RX_RING_MASK_0,</div><div class='add'>+		ATH12K_RX_RING_MASK_1,</div><div class='add'>+		ATH12K_RX_RING_MASK_2,</div><div class='add'>+		ATH12K_RX_RING_MASK_3,</div><div class='add'>+	},</div><div class='add'>+	.rx_err = {</div><div class='add'>+		0, 0, 0,</div><div class='add'>+		ATH12K_RX_ERR_RING_MASK_0,</div><div class='add'>+	},</div><div class='add'>+	.rx_wbm_rel = {</div><div class='add'>+		0, 0, 0,</div><div class='add'>+		ATH12K_RX_WBM_REL_RING_MASK_0,</div><div class='add'>+	},</div><div class='add'>+	.reo_status = {</div><div class='add'>+		0, 0, 0,</div><div class='add'>+		ATH12K_REO_STATUS_RING_MASK_0,</div><div class='add'>+	},</div><div class='add'>+	.host2rxdma = {</div><div class='add'>+		0, 0, 0,</div><div class='add'>+		ATH12K_HOST2RXDMA_RING_MASK_0,</div><div class='add'>+	},</div><div class='add'>+	.tx_mon_dest = {</div><div class='add'>+		ATH12K_TX_MON_RING_MASK_0,</div><div class='add'>+		ATH12K_TX_MON_RING_MASK_1,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ath12k_hw_ring_mask ath12k_hw_ring_mask_wcn7850 = {</div><div class='add'>+	.tx  = {</div><div class='add'>+		ATH12K_TX_RING_MASK_0,</div><div class='add'>+		ATH12K_TX_RING_MASK_1,</div><div class='add'>+		ATH12K_TX_RING_MASK_2,</div><div class='add'>+	},</div><div class='add'>+	.rx_mon_dest = {</div><div class='add'>+	},</div><div class='add'>+	.rx_mon_status = {</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		ATH12K_RX_MON_STATUS_RING_MASK_0,</div><div class='add'>+		ATH12K_RX_MON_STATUS_RING_MASK_1,</div><div class='add'>+		ATH12K_RX_MON_STATUS_RING_MASK_2,</div><div class='add'>+	},</div><div class='add'>+	.rx = {</div><div class='add'>+		0, 0, 0,</div><div class='add'>+		ATH12K_RX_RING_MASK_0,</div><div class='add'>+		ATH12K_RX_RING_MASK_1,</div><div class='add'>+		ATH12K_RX_RING_MASK_2,</div><div class='add'>+		ATH12K_RX_RING_MASK_3,</div><div class='add'>+	},</div><div class='add'>+	.rx_err = {</div><div class='add'>+		ATH12K_RX_ERR_RING_MASK_0,</div><div class='add'>+	},</div><div class='add'>+	.rx_wbm_rel = {</div><div class='add'>+		ATH12K_RX_WBM_REL_RING_MASK_0,</div><div class='add'>+	},</div><div class='add'>+	.reo_status = {</div><div class='add'>+		ATH12K_REO_STATUS_RING_MASK_0,</div><div class='add'>+	},</div><div class='add'>+	.host2rxdma = {</div><div class='add'>+	},</div><div class='add'>+	.tx_mon_dest = {</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ath12k_hw_regs qcn9274_v1_regs = {</div><div class='add'>+	/* SW2TCL(x) R0 ring configuration address */</div><div class='add'>+	.hal_tcl1_ring_id = 0x00000908,</div><div class='add'>+	.hal_tcl1_ring_misc = 0x00000910,</div><div class='add'>+	.hal_tcl1_ring_tp_addr_lsb = 0x0000091c,</div><div class='add'>+	.hal_tcl1_ring_tp_addr_msb = 0x00000920,</div><div class='add'>+	.hal_tcl1_ring_consumer_int_setup_ix0 = 0x00000930,</div><div class='add'>+	.hal_tcl1_ring_consumer_int_setup_ix1 = 0x00000934,</div><div class='add'>+	.hal_tcl1_ring_msi1_base_lsb = 0x00000948,</div><div class='add'>+	.hal_tcl1_ring_msi1_base_msb = 0x0000094c,</div><div class='add'>+	.hal_tcl1_ring_msi1_data = 0x00000950,</div><div class='add'>+	.hal_tcl_ring_base_lsb = 0x00000b58,</div><div class='add'>+	.hal_tcl1_ring_base_lsb = 0x00000900,</div><div class='add'>+	.hal_tcl1_ring_base_msb = 0x00000904,</div><div class='add'>+	.hal_tcl2_ring_base_lsb = 0x00000978,</div><div class='add'>+</div><div class='add'>+	/* TCL STATUS ring address */</div><div class='add'>+	.hal_tcl_status_ring_base_lsb = 0x00000d38,</div><div class='add'>+</div><div class='add'>+	.hal_wbm_idle_ring_base_lsb = 0x00000d0c,</div><div class='add'>+	.hal_wbm_idle_ring_misc_addr = 0x00000d1c,</div><div class='add'>+	.hal_wbm_r0_idle_list_cntl_addr = 0x00000210,</div><div class='add'>+	.hal_wbm_r0_idle_list_size_addr = 0x00000214,</div><div class='add'>+	.hal_wbm_scattered_ring_base_lsb = 0x00000220,</div><div class='add'>+	.hal_wbm_scattered_ring_base_msb = 0x00000224,</div><div class='add'>+	.hal_wbm_scattered_desc_head_info_ix0 = 0x00000230,</div><div class='add'>+	.hal_wbm_scattered_desc_head_info_ix1 = 0x00000234,</div><div class='add'>+	.hal_wbm_scattered_desc_tail_info_ix0 = 0x00000240,</div><div class='add'>+	.hal_wbm_scattered_desc_tail_info_ix1 = 0x00000244,</div><div class='add'>+	.hal_wbm_scattered_desc_ptr_hp_addr = 0x0000024c,</div><div class='add'>+</div><div class='add'>+	.hal_wbm_sw_release_ring_base_lsb = 0x0000034c,</div><div class='add'>+	.hal_wbm_sw1_release_ring_base_lsb = 0x000003c4,</div><div class='add'>+	.hal_wbm0_release_ring_base_lsb = 0x00000dd8,</div><div class='add'>+	.hal_wbm1_release_ring_base_lsb = 0x00000e50,</div><div class='add'>+</div><div class='add'>+	/* PCIe base address */</div><div class='add'>+	.pcie_qserdes_sysclk_en_sel = 0x01e0c0a8,</div><div class='add'>+	.pcie_pcs_osc_dtct_config_base = 0x01e0d45c,</div><div class='add'>+</div><div class='add'>+	/* PPE release ring address */</div><div class='add'>+	.hal_ppe_rel_ring_base = 0x0000043c,</div><div class='add'>+</div><div class='add'>+	/* REO DEST ring address */</div><div class='add'>+	.hal_reo2_ring_base = 0x0000055c,</div><div class='add'>+	.hal_reo1_misc_ctrl_addr = 0x00000b7c,</div><div class='add'>+	.hal_reo1_sw_cookie_cfg0 = 0x00000050,</div><div class='add'>+	.hal_reo1_sw_cookie_cfg1 = 0x00000054,</div><div class='add'>+	.hal_reo1_qdesc_lut_base0 = 0x00000058,</div><div class='add'>+	.hal_reo1_qdesc_lut_base1 = 0x0000005c,</div><div class='add'>+	.hal_reo1_ring_base_lsb = 0x000004e4,</div><div class='add'>+	.hal_reo1_ring_base_msb = 0x000004e8,</div><div class='add'>+	.hal_reo1_ring_id = 0x000004ec,</div><div class='add'>+	.hal_reo1_ring_misc = 0x000004f4,</div><div class='add'>+	.hal_reo1_ring_hp_addr_lsb = 0x000004f8,</div><div class='add'>+	.hal_reo1_ring_hp_addr_msb = 0x000004fc,</div><div class='add'>+	.hal_reo1_ring_producer_int_setup = 0x00000508,</div><div class='add'>+	.hal_reo1_ring_msi1_base_lsb = 0x0000052C,</div><div class='add'>+	.hal_reo1_ring_msi1_base_msb = 0x00000530,</div><div class='add'>+	.hal_reo1_ring_msi1_data = 0x00000534,</div><div class='add'>+	.hal_reo1_aging_thres_ix0 = 0x00000b08,</div><div class='add'>+	.hal_reo1_aging_thres_ix1 = 0x00000b0c,</div><div class='add'>+	.hal_reo1_aging_thres_ix2 = 0x00000b10,</div><div class='add'>+	.hal_reo1_aging_thres_ix3 = 0x00000b14,</div><div class='add'>+</div><div class='add'>+	/* REO Exception ring address */</div><div class='add'>+	.hal_reo2_sw0_ring_base = 0x000008a4,</div><div class='add'>+</div><div class='add'>+	/* REO Reinject ring address */</div><div class='add'>+	.hal_sw2reo_ring_base = 0x00000304,</div><div class='add'>+	.hal_sw2reo1_ring_base = 0x0000037c,</div><div class='add'>+</div><div class='add'>+	/* REO cmd ring address */</div><div class='add'>+	.hal_reo_cmd_ring_base = 0x0000028c,</div><div class='add'>+</div><div class='add'>+	/* REO status ring address */</div><div class='add'>+	.hal_reo_status_ring_base = 0x00000a84,</div><div class='add'>+</div><div class='add'>+	/* CE base address */</div><div class='add'>+	.hal_umac_ce0_src_reg_base = 0x01b80000,</div><div class='add'>+	.hal_umac_ce0_dest_reg_base = 0x01b81000,</div><div class='add'>+	.hal_umac_ce1_src_reg_base = 0x01b82000,</div><div class='add'>+	.hal_umac_ce1_dest_reg_base = 0x01b83000,</div><div class='add'>+</div><div class='add'>+	.gcc_gcc_pcie_hot_rst = 0x1e38338,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ath12k_hw_regs qcn9274_v2_regs = {</div><div class='add'>+	/* SW2TCL(x) R0 ring configuration address */</div><div class='add'>+	.hal_tcl1_ring_id = 0x00000908,</div><div class='add'>+	.hal_tcl1_ring_misc = 0x00000910,</div><div class='add'>+	.hal_tcl1_ring_tp_addr_lsb = 0x0000091c,</div><div class='add'>+	.hal_tcl1_ring_tp_addr_msb = 0x00000920,</div><div class='add'>+	.hal_tcl1_ring_consumer_int_setup_ix0 = 0x00000930,</div><div class='add'>+	.hal_tcl1_ring_consumer_int_setup_ix1 = 0x00000934,</div><div class='add'>+	.hal_tcl1_ring_msi1_base_lsb = 0x00000948,</div><div class='add'>+	.hal_tcl1_ring_msi1_base_msb = 0x0000094c,</div><div class='add'>+	.hal_tcl1_ring_msi1_data = 0x00000950,</div><div class='add'>+	.hal_tcl_ring_base_lsb = 0x00000b58,</div><div class='add'>+	.hal_tcl1_ring_base_lsb = 0x00000900,</div><div class='add'>+	.hal_tcl1_ring_base_msb = 0x00000904,</div><div class='add'>+	.hal_tcl2_ring_base_lsb = 0x00000978,</div><div class='add'>+</div><div class='add'>+	/* TCL STATUS ring address */</div><div class='add'>+	.hal_tcl_status_ring_base_lsb = 0x00000d38,</div><div class='add'>+</div><div class='add'>+	/* WBM idle link ring address */</div><div class='add'>+	.hal_wbm_idle_ring_base_lsb = 0x00000d3c,</div><div class='add'>+	.hal_wbm_idle_ring_misc_addr = 0x00000d4c,</div><div class='add'>+	.hal_wbm_r0_idle_list_cntl_addr = 0x00000240,</div><div class='add'>+	.hal_wbm_r0_idle_list_size_addr = 0x00000244,</div><div class='add'>+	.hal_wbm_scattered_ring_base_lsb = 0x00000250,</div><div class='add'>+	.hal_wbm_scattered_ring_base_msb = 0x00000254,</div><div class='add'>+	.hal_wbm_scattered_desc_head_info_ix0 = 0x00000260,</div><div class='add'>+	.hal_wbm_scattered_desc_head_info_ix1 = 0x00000264,</div><div class='add'>+	.hal_wbm_scattered_desc_tail_info_ix0 = 0x00000270,</div><div class='add'>+	.hal_wbm_scattered_desc_tail_info_ix1 = 0x00000274,</div><div class='add'>+	.hal_wbm_scattered_desc_ptr_hp_addr = 0x0000027c,</div><div class='add'>+</div><div class='add'>+	/* SW2WBM release ring address */</div><div class='add'>+	.hal_wbm_sw_release_ring_base_lsb = 0x0000037c,</div><div class='add'>+	.hal_wbm_sw1_release_ring_base_lsb = 0x000003f4,</div><div class='add'>+</div><div class='add'>+	/* WBM2SW release ring address */</div><div class='add'>+	.hal_wbm0_release_ring_base_lsb = 0x00000e08,</div><div class='add'>+	.hal_wbm1_release_ring_base_lsb = 0x00000e80,</div><div class='add'>+</div><div class='add'>+	/* PCIe base address */</div><div class='add'>+	.pcie_qserdes_sysclk_en_sel = 0x01e0c0a8,</div><div class='add'>+	.pcie_pcs_osc_dtct_config_base = 0x01e0d45c,</div><div class='add'>+</div><div class='add'>+	/* PPE release ring address */</div><div class='add'>+	.hal_ppe_rel_ring_base = 0x0000046c,</div><div class='add'>+</div><div class='add'>+	/* REO DEST ring address */</div><div class='add'>+	.hal_reo2_ring_base = 0x00000578,</div><div class='add'>+	.hal_reo1_misc_ctrl_addr = 0x00000b9c,</div><div class='add'>+	.hal_reo1_sw_cookie_cfg0 = 0x0000006c,</div><div class='add'>+	.hal_reo1_sw_cookie_cfg1 = 0x00000070,</div><div class='add'>+	.hal_reo1_qdesc_lut_base0 = 0x00000074,</div><div class='add'>+	.hal_reo1_qdesc_lut_base1 = 0x00000078,</div><div class='add'>+	.hal_reo1_qdesc_addr = 0x0000007c,</div><div class='add'>+	.hal_reo1_qdesc_max_peerid = 0x00000088,</div><div class='add'>+	.hal_reo1_ring_base_lsb = 0x00000500,</div><div class='add'>+	.hal_reo1_ring_base_msb = 0x00000504,</div><div class='add'>+	.hal_reo1_ring_id = 0x00000508,</div><div class='add'>+	.hal_reo1_ring_misc = 0x00000510,</div><div class='add'>+	.hal_reo1_ring_hp_addr_lsb = 0x00000514,</div><div class='add'>+	.hal_reo1_ring_hp_addr_msb = 0x00000518,</div><div class='add'>+	.hal_reo1_ring_producer_int_setup = 0x00000524,</div><div class='add'>+	.hal_reo1_ring_msi1_base_lsb = 0x00000548,</div><div class='add'>+	.hal_reo1_ring_msi1_base_msb = 0x0000054C,</div><div class='add'>+	.hal_reo1_ring_msi1_data = 0x00000550,</div><div class='add'>+	.hal_reo1_aging_thres_ix0 = 0x00000B28,</div><div class='add'>+	.hal_reo1_aging_thres_ix1 = 0x00000B2C,</div><div class='add'>+	.hal_reo1_aging_thres_ix2 = 0x00000B30,</div><div class='add'>+	.hal_reo1_aging_thres_ix3 = 0x00000B34,</div><div class='add'>+</div><div class='add'>+	/* REO Exception ring address */</div><div class='add'>+	.hal_reo2_sw0_ring_base = 0x000008c0,</div><div class='add'>+</div><div class='add'>+	/* REO Reinject ring address */</div><div class='add'>+	.hal_sw2reo_ring_base = 0x00000320,</div><div class='add'>+	.hal_sw2reo1_ring_base = 0x00000398,</div><div class='add'>+</div><div class='add'>+	/* REO cmd ring address */</div><div class='add'>+	.hal_reo_cmd_ring_base = 0x000002A8,</div><div class='add'>+</div><div class='add'>+	/* REO status ring address */</div><div class='add'>+	.hal_reo_status_ring_base = 0x00000aa0,</div><div class='add'>+</div><div class='add'>+	/* CE base address */</div><div class='add'>+	.hal_umac_ce0_src_reg_base = 0x01b80000,</div><div class='add'>+	.hal_umac_ce0_dest_reg_base = 0x01b81000,</div><div class='add'>+	.hal_umac_ce1_src_reg_base = 0x01b82000,</div><div class='add'>+	.hal_umac_ce1_dest_reg_base = 0x01b83000,</div><div class='add'>+</div><div class='add'>+	.gcc_gcc_pcie_hot_rst = 0x1e38338,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ath12k_hw_regs ipq5332_regs = {</div><div class='add'>+	/* SW2TCL(x) R0 ring configuration address */</div><div class='add'>+	.hal_tcl1_ring_id = 0x00000918,</div><div class='add'>+	.hal_tcl1_ring_misc = 0x00000920,</div><div class='add'>+	.hal_tcl1_ring_tp_addr_lsb = 0x0000092c,</div><div class='add'>+	.hal_tcl1_ring_tp_addr_msb = 0x00000930,</div><div class='add'>+	.hal_tcl1_ring_consumer_int_setup_ix0 = 0x00000940,</div><div class='add'>+	.hal_tcl1_ring_consumer_int_setup_ix1 = 0x00000944,</div><div class='add'>+	.hal_tcl1_ring_msi1_base_lsb = 0x00000958,</div><div class='add'>+	.hal_tcl1_ring_msi1_base_msb = 0x0000095c,</div><div class='add'>+	.hal_tcl1_ring_base_lsb = 0x00000910,</div><div class='add'>+	.hal_tcl1_ring_base_msb = 0x00000914,</div><div class='add'>+	.hal_tcl1_ring_msi1_data = 0x00000960,</div><div class='add'>+	.hal_tcl2_ring_base_lsb = 0x00000988,</div><div class='add'>+	.hal_tcl_ring_base_lsb = 0x00000b68,</div><div class='add'>+</div><div class='add'>+	/* TCL STATUS ring address */</div><div class='add'>+	.hal_tcl_status_ring_base_lsb = 0x00000d48,</div><div class='add'>+</div><div class='add'>+	/* REO DEST ring address */</div><div class='add'>+	.hal_reo2_ring_base = 0x00000578,</div><div class='add'>+	.hal_reo1_misc_ctrl_addr = 0x00000b9c,</div><div class='add'>+	.hal_reo1_sw_cookie_cfg0 = 0x0000006c,</div><div class='add'>+	.hal_reo1_sw_cookie_cfg1 = 0x00000070,</div><div class='add'>+	.hal_reo1_qdesc_lut_base0 = 0x00000074,</div><div class='add'>+	.hal_reo1_qdesc_lut_base1 = 0x00000078,</div><div class='add'>+	.hal_reo1_ring_base_lsb = 0x00000500,</div><div class='add'>+	.hal_reo1_ring_base_msb = 0x00000504,</div><div class='add'>+	.hal_reo1_ring_id = 0x00000508,</div><div class='add'>+	.hal_reo1_ring_misc = 0x00000510,</div><div class='add'>+	.hal_reo1_ring_hp_addr_lsb = 0x00000514,</div><div class='add'>+	.hal_reo1_ring_hp_addr_msb = 0x00000518,</div><div class='add'>+	.hal_reo1_ring_producer_int_setup = 0x00000524,</div><div class='add'>+	.hal_reo1_ring_msi1_base_lsb = 0x00000548,</div><div class='add'>+	.hal_reo1_ring_msi1_base_msb = 0x0000054C,</div><div class='add'>+	.hal_reo1_ring_msi1_data = 0x00000550,</div><div class='add'>+	.hal_reo1_aging_thres_ix0 = 0x00000B28,</div><div class='add'>+	.hal_reo1_aging_thres_ix1 = 0x00000B2C,</div><div class='add'>+	.hal_reo1_aging_thres_ix2 = 0x00000B30,</div><div class='add'>+	.hal_reo1_aging_thres_ix3 = 0x00000B34,</div><div class='add'>+</div><div class='add'>+	/* REO Exception ring address */</div><div class='add'>+	.hal_reo2_sw0_ring_base = 0x000008c0,</div><div class='add'>+</div><div class='add'>+	/* REO Reinject ring address */</div><div class='add'>+	.hal_sw2reo_ring_base = 0x00000320,</div><div class='add'>+	.hal_sw2reo1_ring_base = 0x00000398,</div><div class='add'>+</div><div class='add'>+	/* REO cmd ring address */</div><div class='add'>+	.hal_reo_cmd_ring_base = 0x000002A8,</div><div class='add'>+</div><div class='add'>+	/* REO status ring address */</div><div class='add'>+	.hal_reo_status_ring_base = 0x00000aa0,</div><div class='add'>+</div><div class='add'>+	/* WBM idle link ring address */</div><div class='add'>+	.hal_wbm_idle_ring_base_lsb = 0x00000d3c,</div><div class='add'>+	.hal_wbm_idle_ring_misc_addr = 0x00000d4c,</div><div class='add'>+	.hal_wbm_r0_idle_list_cntl_addr = 0x00000240,</div><div class='add'>+	.hal_wbm_r0_idle_list_size_addr = 0x00000244,</div><div class='add'>+	.hal_wbm_scattered_ring_base_lsb = 0x00000250,</div><div class='add'>+	.hal_wbm_scattered_ring_base_msb = 0x00000254,</div><div class='add'>+	.hal_wbm_scattered_desc_head_info_ix0 = 0x00000260,</div><div class='add'>+	.hal_wbm_scattered_desc_head_info_ix1   = 0x00000264,</div><div class='add'>+	.hal_wbm_scattered_desc_tail_info_ix0 = 0x00000270,</div><div class='add'>+	.hal_wbm_scattered_desc_tail_info_ix1 = 0x00000274,</div><div class='add'>+	.hal_wbm_scattered_desc_ptr_hp_addr = 0x0000027c,</div><div class='add'>+</div><div class='add'>+	/* SW2WBM release ring address */</div><div class='add'>+	.hal_wbm_sw_release_ring_base_lsb = 0x0000037c,</div><div class='add'>+</div><div class='add'>+	/* WBM2SW release ring address */</div><div class='add'>+	.hal_wbm0_release_ring_base_lsb = 0x00000e08,</div><div class='add'>+	.hal_wbm1_release_ring_base_lsb = 0x00000e80,</div><div class='add'>+</div><div class='add'>+	/* PPE release ring address */</div><div class='add'>+	.hal_ppe_rel_ring_base = 0x0000046c,</div><div class='add'>+</div><div class='add'>+	/* CE address */</div><div class='add'>+	.hal_umac_ce0_src_reg_base = 0x00740000 -</div><div class='add'>+		HAL_IPQ5332_CE_WFSS_REG_BASE,</div><div class='add'>+	.hal_umac_ce0_dest_reg_base = 0x00741000 -</div><div class='add'>+		HAL_IPQ5332_CE_WFSS_REG_BASE,</div><div class='add'>+	.hal_umac_ce1_src_reg_base = 0x00742000 -</div><div class='add'>+		HAL_IPQ5332_CE_WFSS_REG_BASE,</div><div class='add'>+	.hal_umac_ce1_dest_reg_base = 0x00743000 -</div><div class='add'>+		HAL_IPQ5332_CE_WFSS_REG_BASE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ath12k_hw_regs wcn7850_regs = {</div><div class='add'>+	/* SW2TCL(x) R0 ring configuration address */</div><div class='add'>+	.hal_tcl1_ring_id = 0x00000908,</div><div class='add'>+	.hal_tcl1_ring_misc = 0x00000910,</div><div class='add'>+	.hal_tcl1_ring_tp_addr_lsb = 0x0000091c,</div><div class='add'>+	.hal_tcl1_ring_tp_addr_msb = 0x00000920,</div><div class='add'>+	.hal_tcl1_ring_consumer_int_setup_ix0 = 0x00000930,</div><div class='add'>+	.hal_tcl1_ring_consumer_int_setup_ix1 = 0x00000934,</div><div class='add'>+	.hal_tcl1_ring_msi1_base_lsb = 0x00000948,</div><div class='add'>+	.hal_tcl1_ring_msi1_base_msb = 0x0000094c,</div><div class='add'>+	.hal_tcl1_ring_msi1_data = 0x00000950,</div><div class='add'>+	.hal_tcl_ring_base_lsb = 0x00000b58,</div><div class='add'>+	.hal_tcl1_ring_base_lsb = 0x00000900,</div><div class='add'>+	.hal_tcl1_ring_base_msb = 0x00000904,</div><div class='add'>+	.hal_tcl2_ring_base_lsb = 0x00000978,</div><div class='add'>+</div><div class='add'>+	/* TCL STATUS ring address */</div><div class='add'>+	.hal_tcl_status_ring_base_lsb = 0x00000d38,</div><div class='add'>+</div><div class='add'>+	.hal_wbm_idle_ring_base_lsb = 0x00000d3c,</div><div class='add'>+	.hal_wbm_idle_ring_misc_addr = 0x00000d4c,</div><div class='add'>+	.hal_wbm_r0_idle_list_cntl_addr = 0x00000240,</div><div class='add'>+	.hal_wbm_r0_idle_list_size_addr = 0x00000244,</div><div class='add'>+	.hal_wbm_scattered_ring_base_lsb = 0x00000250,</div><div class='add'>+	.hal_wbm_scattered_ring_base_msb = 0x00000254,</div><div class='add'>+	.hal_wbm_scattered_desc_head_info_ix0 = 0x00000260,</div><div class='add'>+	.hal_wbm_scattered_desc_head_info_ix1 = 0x00000264,</div><div class='add'>+	.hal_wbm_scattered_desc_tail_info_ix0 = 0x00000270,</div><div class='add'>+	.hal_wbm_scattered_desc_tail_info_ix1 = 0x00000274,</div><div class='add'>+	.hal_wbm_scattered_desc_ptr_hp_addr = 0x00000027c,</div><div class='add'>+</div><div class='add'>+	.hal_wbm_sw_release_ring_base_lsb = 0x0000037c,</div><div class='add'>+	.hal_wbm_sw1_release_ring_base_lsb = 0x00000284,</div><div class='add'>+	.hal_wbm0_release_ring_base_lsb = 0x00000e08,</div><div class='add'>+	.hal_wbm1_release_ring_base_lsb = 0x00000e80,</div><div class='add'>+</div><div class='add'>+	/* PCIe base address */</div><div class='add'>+	.pcie_qserdes_sysclk_en_sel = 0x01e0e0a8,</div><div class='add'>+	.pcie_pcs_osc_dtct_config_base = 0x01e0f45c,</div><div class='add'>+</div><div class='add'>+	/* PPE release ring address */</div><div class='add'>+	.hal_ppe_rel_ring_base = 0x0000043c,</div><div class='add'>+</div><div class='add'>+	/* REO DEST ring address */</div><div class='add'>+	.hal_reo2_ring_base = 0x0000055c,</div><div class='add'>+	.hal_reo1_misc_ctrl_addr = 0x00000b7c,</div><div class='add'>+	.hal_reo1_sw_cookie_cfg0 = 0x00000050,</div><div class='add'>+	.hal_reo1_sw_cookie_cfg1 = 0x00000054,</div><div class='add'>+	.hal_reo1_qdesc_lut_base0 = 0x00000058,</div><div class='add'>+	.hal_reo1_qdesc_lut_base1 = 0x0000005c,</div><div class='add'>+	.hal_reo1_ring_base_lsb = 0x000004e4,</div><div class='add'>+	.hal_reo1_ring_base_msb = 0x000004e8,</div><div class='add'>+	.hal_reo1_ring_id = 0x000004ec,</div><div class='add'>+	.hal_reo1_ring_misc = 0x000004f4,</div><div class='add'>+	.hal_reo1_ring_hp_addr_lsb = 0x000004f8,</div><div class='add'>+	.hal_reo1_ring_hp_addr_msb = 0x000004fc,</div><div class='add'>+	.hal_reo1_ring_producer_int_setup = 0x00000508,</div><div class='add'>+	.hal_reo1_ring_msi1_base_lsb = 0x0000052C,</div><div class='add'>+	.hal_reo1_ring_msi1_base_msb = 0x00000530,</div><div class='add'>+	.hal_reo1_ring_msi1_data = 0x00000534,</div><div class='add'>+	.hal_reo1_aging_thres_ix0 = 0x00000b08,</div><div class='add'>+	.hal_reo1_aging_thres_ix1 = 0x00000b0c,</div><div class='add'>+	.hal_reo1_aging_thres_ix2 = 0x00000b10,</div><div class='add'>+	.hal_reo1_aging_thres_ix3 = 0x00000b14,</div><div class='add'>+</div><div class='add'>+	/* REO Exception ring address */</div><div class='add'>+	.hal_reo2_sw0_ring_base = 0x000008a4,</div><div class='add'>+</div><div class='add'>+	/* REO Reinject ring address */</div><div class='add'>+	.hal_sw2reo_ring_base = 0x00000304,</div><div class='add'>+	.hal_sw2reo1_ring_base = 0x0000037c,</div><div class='add'>+</div><div class='add'>+	/* REO cmd ring address */</div><div class='add'>+	.hal_reo_cmd_ring_base = 0x0000028c,</div><div class='add'>+</div><div class='add'>+	/* REO status ring address */</div><div class='add'>+	.hal_reo_status_ring_base = 0x00000a84,</div><div class='add'>+</div><div class='add'>+	/* CE base address */</div><div class='add'>+	.hal_umac_ce0_src_reg_base = 0x01b80000,</div><div class='add'>+	.hal_umac_ce0_dest_reg_base = 0x01b81000,</div><div class='add'>+	.hal_umac_ce1_src_reg_base = 0x01b82000,</div><div class='add'>+	.hal_umac_ce1_dest_reg_base = 0x01b83000,</div><div class='add'>+</div><div class='add'>+	.gcc_gcc_pcie_hot_rst = 0x1e40304,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ath12k_hw_hal_params ath12k_hw_hal_params_qcn9274 = {</div><div class='add'>+	.rx_buf_rbm = HAL_RX_BUF_RBM_SW3_BM,</div><div class='add'>+	.wbm2sw_cc_enable = HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW0_EN |</div><div class='add'>+			    HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW1_EN |</div><div class='add'>+			    HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW2_EN |</div><div class='add'>+			    HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW3_EN |</div><div class='add'>+			    HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW4_EN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ath12k_hw_hal_params ath12k_hw_hal_params_wcn7850 = {</div><div class='add'>+	.rx_buf_rbm = HAL_RX_BUF_RBM_SW1_BM,</div><div class='add'>+	.wbm2sw_cc_enable = HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW0_EN |</div><div class='add'>+			    HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW2_EN |</div><div class='add'>+			    HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW3_EN |</div><div class='add'>+			    HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW4_EN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ath12k_hw_hal_params ath12k_hw_hal_params_ipq5332 = {</div><div class='add'>+	.rx_buf_rbm = HAL_RX_BUF_RBM_SW3_BM,</div><div class='add'>+	.wbm2sw_cc_enable = HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW0_EN |</div><div class='add'>+			    HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW1_EN |</div><div class='add'>+			    HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW2_EN |</div><div class='add'>+			    HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW3_EN |</div><div class='add'>+			    HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW4_EN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ce_ie_addr ath12k_ce_ie_addr_ipq5332 = {</div><div class='add'>+	.ie1_reg_addr = CE_HOST_IE_ADDRESS - HAL_IPQ5332_CE_WFSS_REG_BASE,</div><div class='add'>+	.ie2_reg_addr = CE_HOST_IE_2_ADDRESS - HAL_IPQ5332_CE_WFSS_REG_BASE,</div><div class='add'>+	.ie3_reg_addr = CE_HOST_IE_3_ADDRESS - HAL_IPQ5332_CE_WFSS_REG_BASE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ce_remap ath12k_ce_remap_ipq5332 = {</div><div class='add'>+	.base = HAL_IPQ5332_CE_WFSS_REG_BASE,</div><div class='add'>+	.size = HAL_IPQ5332_CE_SIZE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ath12k_hw_params ath12k_hw_params[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "qcn9274 hw1.0",</div><div class='add'>+		.hw_rev = ATH12K_HW_QCN9274_HW10,</div><div class='add'>+		.fw = {</div><div class='add'>+			.dir = "QCN9274/hw1.0",</div><div class='add'>+			.board_size = 256 * 1024,</div><div class='add'>+			.cal_offset = 128 * 1024,</div><div class='add'>+			.m3_loader = ath12k_m3_fw_loader_driver,</div><div class='add'>+		},</div><div class='add'>+		.max_radios = 1,</div><div class='add'>+		.single_pdev_only = false,</div><div class='add'>+		.qmi_service_ins_id = ATH12K_QMI_WLFW_SERVICE_INS_ID_V01_QCN9274,</div><div class='add'>+		.internal_sleep_clock = false,</div><div class='add'>+</div><div class='add'>+		.hw_ops = &amp;qcn9274_ops,</div><div class='add'>+		.ring_mask = &amp;ath12k_hw_ring_mask_qcn9274,</div><div class='add'>+		.regs = &amp;qcn9274_v1_regs,</div><div class='add'>+</div><div class='add'>+		.host_ce_config = ath12k_host_ce_config_qcn9274,</div><div class='add'>+		.ce_count = 16,</div><div class='add'>+		.target_ce_config = ath12k_target_ce_config_wlan_qcn9274,</div><div class='add'>+		.target_ce_count = 12,</div><div class='add'>+		.svc_to_ce_map = ath12k_target_service_to_ce_map_wlan_qcn9274,</div><div class='add'>+		.svc_to_ce_map_len = 18,</div><div class='add'>+</div><div class='add'>+		.hal_params = &amp;ath12k_hw_hal_params_qcn9274,</div><div class='add'>+</div><div class='add'>+		.rxdma1_enable = false,</div><div class='add'>+		.num_rxdma_per_pdev = 1,</div><div class='add'>+		.num_rxdma_dst_ring = 0,</div><div class='add'>+		.rx_mac_buf_ring = false,</div><div class='add'>+		.vdev_start_delay = false,</div><div class='add'>+</div><div class='add'>+		.interface_modes = BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+					BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+					BIT(NL80211_IFTYPE_MESH_POINT) |</div><div class='add'>+					BIT(NL80211_IFTYPE_AP_VLAN),</div><div class='add'>+		.supports_monitor = false,</div><div class='add'>+</div><div class='add'>+		.idle_ps = false,</div><div class='add'>+		.download_calib = true,</div><div class='add'>+		.supports_suspend = false,</div><div class='add'>+		.tcl_ring_retry = true,</div><div class='add'>+		.reoq_lut_support = true,</div><div class='add'>+		.supports_shadow_regs = false,</div><div class='add'>+</div><div class='add'>+		.num_tcl_banks = 48,</div><div class='add'>+		.max_tx_ring = 4,</div><div class='add'>+</div><div class='add'>+		.mhi_config = &amp;ath12k_mhi_config_qcn9274,</div><div class='add'>+</div><div class='add'>+		.wmi_init = ath12k_wmi_init_qcn9274,</div><div class='add'>+</div><div class='add'>+		.hal_ops = &amp;hal_qcn9274_ops,</div><div class='add'>+</div><div class='add'>+		.qmi_cnss_feature_bitmap = BIT(CNSS_QDSS_CFG_MISS_V01),</div><div class='add'>+</div><div class='add'>+		.rfkill_pin = 0,</div><div class='add'>+		.rfkill_cfg = 0,</div><div class='add'>+		.rfkill_on_level = 0,</div><div class='add'>+</div><div class='add'>+		.rddm_size = 0x600000,</div><div class='add'>+</div><div class='add'>+		.def_num_link = 0,</div><div class='add'>+		.max_mlo_peer = 256,</div><div class='add'>+</div><div class='add'>+		.otp_board_id_register = QCN9274_QFPROM_RAW_RFA_PDET_ROW13_LSB,</div><div class='add'>+</div><div class='add'>+		.supports_sta_ps = false,</div><div class='add'>+</div><div class='add'>+		.acpi_guid = NULL,</div><div class='add'>+		.supports_dynamic_smps_6ghz = true,</div><div class='add'>+</div><div class='add'>+		.iova_mask = 0,</div><div class='add'>+</div><div class='add'>+		.supports_aspm = false,</div><div class='add'>+</div><div class='add'>+		.ce_ie_addr = NULL,</div><div class='add'>+		.ce_remap = NULL,</div><div class='add'>+		.bdf_addr_offset = 0,</div><div class='add'>+</div><div class='add'>+		.current_cc_support = false,</div><div class='add'>+</div><div class='add'>+		.dp_primary_link_only = true,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "wcn7850 hw2.0",</div><div class='add'>+		.hw_rev = ATH12K_HW_WCN7850_HW20,</div><div class='add'>+</div><div class='add'>+		.fw = {</div><div class='add'>+			.dir = "WCN7850/hw2.0",</div><div class='add'>+			.board_size = 256 * 1024,</div><div class='add'>+			.cal_offset = 256 * 1024,</div><div class='add'>+			.m3_loader = ath12k_m3_fw_loader_driver,</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.max_radios = 1,</div><div class='add'>+		.single_pdev_only = true,</div><div class='add'>+		.qmi_service_ins_id = ATH12K_QMI_WLFW_SERVICE_INS_ID_V01_WCN7850,</div><div class='add'>+		.internal_sleep_clock = true,</div><div class='add'>+</div><div class='add'>+		.hw_ops = &amp;wcn7850_ops,</div><div class='add'>+		.ring_mask = &amp;ath12k_hw_ring_mask_wcn7850,</div><div class='add'>+		.regs = &amp;wcn7850_regs,</div><div class='add'>+</div><div class='add'>+		.host_ce_config = ath12k_host_ce_config_wcn7850,</div><div class='add'>+		.ce_count = 9,</div><div class='add'>+		.target_ce_config = ath12k_target_ce_config_wlan_wcn7850,</div><div class='add'>+		.target_ce_count = 9,</div><div class='add'>+		.svc_to_ce_map = ath12k_target_service_to_ce_map_wlan_wcn7850,</div><div class='add'>+		.svc_to_ce_map_len = 14,</div><div class='add'>+</div><div class='add'>+		.hal_params = &amp;ath12k_hw_hal_params_wcn7850,</div><div class='add'>+</div><div class='add'>+		.rxdma1_enable = false,</div><div class='add'>+		.num_rxdma_per_pdev = 2,</div><div class='add'>+		.num_rxdma_dst_ring = 1,</div><div class='add'>+		.rx_mac_buf_ring = true,</div><div class='add'>+		.vdev_start_delay = true,</div><div class='add'>+</div><div class='add'>+		.interface_modes = BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+				   BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+				   BIT(NL80211_IFTYPE_P2P_DEVICE) |</div><div class='add'>+				   BIT(NL80211_IFTYPE_P2P_CLIENT) |</div><div class='add'>+				   BIT(NL80211_IFTYPE_P2P_GO),</div><div class='add'>+		.supports_monitor = true,</div><div class='add'>+</div><div class='add'>+		.idle_ps = true,</div><div class='add'>+		.download_calib = false,</div><div class='add'>+		.supports_suspend = true,</div><div class='add'>+		.tcl_ring_retry = false,</div><div class='add'>+		.reoq_lut_support = false,</div><div class='add'>+		.supports_shadow_regs = true,</div><div class='add'>+</div><div class='add'>+		.num_tcl_banks = 7,</div><div class='add'>+		.max_tx_ring = 3,</div><div class='add'>+</div><div class='add'>+		.mhi_config = &amp;ath12k_mhi_config_wcn7850,</div><div class='add'>+</div><div class='add'>+		.wmi_init = ath12k_wmi_init_wcn7850,</div><div class='add'>+</div><div class='add'>+		.hal_ops = &amp;hal_wcn7850_ops,</div><div class='add'>+</div><div class='add'>+		.qmi_cnss_feature_bitmap = BIT(CNSS_QDSS_CFG_MISS_V01) |</div><div class='add'>+					   BIT(CNSS_PCIE_PERST_NO_PULL_V01),</div><div class='add'>+</div><div class='add'>+		.rfkill_pin = 48,</div><div class='add'>+		.rfkill_cfg = 0,</div><div class='add'>+		.rfkill_on_level = 1,</div><div class='add'>+</div><div class='add'>+		.rddm_size = 0x780000,</div><div class='add'>+</div><div class='add'>+		.def_num_link = 2,</div><div class='add'>+		.max_mlo_peer = 32,</div><div class='add'>+</div><div class='add'>+		.otp_board_id_register = 0,</div><div class='add'>+</div><div class='add'>+		.supports_sta_ps = true,</div><div class='add'>+</div><div class='add'>+		.acpi_guid = &amp;wcn7850_uuid,</div><div class='add'>+		.supports_dynamic_smps_6ghz = false,</div><div class='add'>+</div><div class='add'>+		.iova_mask = ATH12K_PCIE_MAX_PAYLOAD_SIZE - 1,</div><div class='add'>+</div><div class='add'>+		.supports_aspm = true,</div><div class='add'>+</div><div class='add'>+		.ce_ie_addr = NULL,</div><div class='add'>+		.ce_remap = NULL,</div><div class='add'>+		.bdf_addr_offset = 0,</div><div class='add'>+</div><div class='add'>+		.current_cc_support = true,</div><div class='add'>+</div><div class='add'>+		.dp_primary_link_only = false,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "qcn9274 hw2.0",</div><div class='add'>+		.hw_rev = ATH12K_HW_QCN9274_HW20,</div><div class='add'>+		.fw = {</div><div class='add'>+			.dir = "QCN9274/hw2.0",</div><div class='add'>+			.board_size = 256 * 1024,</div><div class='add'>+			.cal_offset = 128 * 1024,</div><div class='add'>+			.m3_loader = ath12k_m3_fw_loader_driver,</div><div class='add'>+		},</div><div class='add'>+		.max_radios = 2,</div><div class='add'>+		.single_pdev_only = false,</div><div class='add'>+		.qmi_service_ins_id = ATH12K_QMI_WLFW_SERVICE_INS_ID_V01_QCN9274,</div><div class='add'>+		.internal_sleep_clock = false,</div><div class='add'>+</div><div class='add'>+		.hw_ops = &amp;qcn9274_ops,</div><div class='add'>+		.ring_mask = &amp;ath12k_hw_ring_mask_qcn9274,</div><div class='add'>+		.regs = &amp;qcn9274_v2_regs,</div><div class='add'>+</div><div class='add'>+		.host_ce_config = ath12k_host_ce_config_qcn9274,</div><div class='add'>+		.ce_count = 16,</div><div class='add'>+		.target_ce_config = ath12k_target_ce_config_wlan_qcn9274,</div><div class='add'>+		.target_ce_count = 12,</div><div class='add'>+		.svc_to_ce_map = ath12k_target_service_to_ce_map_wlan_qcn9274,</div><div class='add'>+		.svc_to_ce_map_len = 18,</div><div class='add'>+</div><div class='add'>+		.hal_params = &amp;ath12k_hw_hal_params_qcn9274,</div><div class='add'>+</div><div class='add'>+		.rxdma1_enable = true,</div><div class='add'>+		.num_rxdma_per_pdev = 1,</div><div class='add'>+		.num_rxdma_dst_ring = 0,</div><div class='add'>+		.rx_mac_buf_ring = false,</div><div class='add'>+		.vdev_start_delay = false,</div><div class='add'>+</div><div class='add'>+		.interface_modes = BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+					BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+					BIT(NL80211_IFTYPE_MESH_POINT) |</div><div class='add'>+					BIT(NL80211_IFTYPE_AP_VLAN),</div><div class='add'>+		.supports_monitor = true,</div><div class='add'>+</div><div class='add'>+		.idle_ps = false,</div><div class='add'>+		.download_calib = true,</div><div class='add'>+		.supports_suspend = false,</div><div class='add'>+		.tcl_ring_retry = true,</div><div class='add'>+		.reoq_lut_support = true,</div><div class='add'>+		.supports_shadow_regs = false,</div><div class='add'>+</div><div class='add'>+		.num_tcl_banks = 48,</div><div class='add'>+		.max_tx_ring = 4,</div><div class='add'>+</div><div class='add'>+		.mhi_config = &amp;ath12k_mhi_config_qcn9274,</div><div class='add'>+</div><div class='add'>+		.wmi_init = ath12k_wmi_init_qcn9274,</div><div class='add'>+</div><div class='add'>+		.hal_ops = &amp;hal_qcn9274_ops,</div><div class='add'>+</div><div class='add'>+		.qmi_cnss_feature_bitmap = BIT(CNSS_QDSS_CFG_MISS_V01),</div><div class='add'>+</div><div class='add'>+		.rfkill_pin = 0,</div><div class='add'>+		.rfkill_cfg = 0,</div><div class='add'>+		.rfkill_on_level = 0,</div><div class='add'>+</div><div class='add'>+		.rddm_size = 0x600000,</div><div class='add'>+</div><div class='add'>+		.def_num_link = 0,</div><div class='add'>+		.max_mlo_peer = 256,</div><div class='add'>+</div><div class='add'>+		.otp_board_id_register = QCN9274_QFPROM_RAW_RFA_PDET_ROW13_LSB,</div><div class='add'>+</div><div class='add'>+		.supports_sta_ps = false,</div><div class='add'>+</div><div class='add'>+		.acpi_guid = NULL,</div><div class='add'>+		.supports_dynamic_smps_6ghz = true,</div><div class='add'>+</div><div class='add'>+		.iova_mask = 0,</div><div class='add'>+</div><div class='add'>+		.supports_aspm = false,</div><div class='add'>+</div><div class='add'>+		.ce_ie_addr = NULL,</div><div class='add'>+		.ce_remap = NULL,</div><div class='add'>+		.bdf_addr_offset = 0,</div><div class='add'>+</div><div class='add'>+		.current_cc_support = false,</div><div class='add'>+</div><div class='add'>+		.dp_primary_link_only = true,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "ipq5332 hw1.0",</div><div class='add'>+		.hw_rev = ATH12K_HW_IPQ5332_HW10,</div><div class='add'>+		.fw = {</div><div class='add'>+			.dir = "IPQ5332/hw1.0",</div><div class='add'>+			.board_size = 256 * 1024,</div><div class='add'>+			.cal_offset = 128 * 1024,</div><div class='add'>+			.m3_loader = ath12k_m3_fw_loader_remoteproc,</div><div class='add'>+		},</div><div class='add'>+		.max_radios = 1,</div><div class='add'>+		.single_pdev_only = false,</div><div class='add'>+		.qmi_service_ins_id = ATH12K_QMI_WLFW_SERVICE_INS_ID_V01_IPQ5332,</div><div class='add'>+		.internal_sleep_clock = false,</div><div class='add'>+</div><div class='add'>+		.hw_ops = &amp;qcn9274_ops,</div><div class='add'>+		.regs = &amp;ipq5332_regs,</div><div class='add'>+		.ring_mask = &amp;ath12k_hw_ring_mask_ipq5332,</div><div class='add'>+</div><div class='add'>+		.host_ce_config = ath12k_host_ce_config_ipq5332,</div><div class='add'>+		.ce_count = 12,</div><div class='add'>+		.target_ce_config = ath12k_target_ce_config_wlan_ipq5332,</div><div class='add'>+		.target_ce_count = 12,</div><div class='add'>+		.svc_to_ce_map = ath12k_target_service_to_ce_map_wlan_ipq5332,</div><div class='add'>+		.svc_to_ce_map_len = 18,</div><div class='add'>+</div><div class='add'>+		.hal_params = &amp;ath12k_hw_hal_params_ipq5332,</div><div class='add'>+</div><div class='add'>+		.rxdma1_enable = false,</div><div class='add'>+		.num_rxdma_per_pdev = 1,</div><div class='add'>+		.num_rxdma_dst_ring = 0,</div><div class='add'>+		.rx_mac_buf_ring = false,</div><div class='add'>+		.vdev_start_delay = false,</div><div class='add'>+</div><div class='add'>+		.interface_modes = BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+				   BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+				   BIT(NL80211_IFTYPE_MESH_POINT),</div><div class='add'>+		.supports_monitor = false,</div><div class='add'>+</div><div class='add'>+		.idle_ps = false,</div><div class='add'>+		.download_calib = true,</div><div class='add'>+		.supports_suspend = false,</div><div class='add'>+		.tcl_ring_retry = true,</div><div class='add'>+		.reoq_lut_support = false,</div><div class='add'>+		.supports_shadow_regs = false,</div><div class='add'>+</div><div class='add'>+		.num_tcl_banks = 48,</div><div class='add'>+		.max_tx_ring = 4,</div><div class='add'>+</div><div class='add'>+		.wmi_init = &amp;ath12k_wmi_init_qcn9274,</div><div class='add'>+</div><div class='add'>+		.hal_ops = &amp;hal_qcn9274_ops,</div><div class='add'>+</div><div class='add'>+		.qmi_cnss_feature_bitmap = BIT(CNSS_QDSS_CFG_MISS_V01),</div><div class='add'>+</div><div class='add'>+		.rfkill_pin = 0,</div><div class='add'>+		.rfkill_cfg = 0,</div><div class='add'>+		.rfkill_on_level = 0,</div><div class='add'>+</div><div class='add'>+		.rddm_size = 0,</div><div class='add'>+</div><div class='add'>+		.def_num_link = 0,</div><div class='add'>+		.max_mlo_peer = 256,</div><div class='add'>+</div><div class='add'>+		.otp_board_id_register = 0,</div><div class='add'>+</div><div class='add'>+		.supports_sta_ps = false,</div><div class='add'>+</div><div class='add'>+		.acpi_guid = NULL,</div><div class='add'>+		.supports_dynamic_smps_6ghz = false,</div><div class='add'>+		.iova_mask = 0,</div><div class='add'>+		.supports_aspm = false,</div><div class='add'>+</div><div class='add'>+		.ce_ie_addr = &amp;ath12k_ce_ie_addr_ipq5332,</div><div class='add'>+		.ce_remap = &amp;ath12k_ce_remap_ipq5332,</div><div class='add'>+		.bdf_addr_offset = 0xC00000,</div><div class='add'>+</div><div class='add'>+		.dp_primary_link_only = true,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ath12k_hw_init(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_hw_params *hw_params = NULL;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ath12k_hw_params); i++) {</div><div class='add'>+		hw_params = &amp;ath12k_hw_params[i];</div><div class='add'>+</div><div class='add'>+		if (hw_params-&gt;hw_rev == ab-&gt;hw_rev)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i == ARRAY_SIZE(ath12k_hw_params)) {</div><div class='add'>+		ath12k_err(ab, "Unsupported hardware version: 0x%x\n", ab-&gt;hw_rev);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab-&gt;hw_params = hw_params;</div><div class='add'>+</div><div class='add'>+	ath12k_info(ab, "Hardware name: %s\n", ab-&gt;hw_params-&gt;name);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/hw.h b/drivers/net/wireless/ath/ath12k/hw.h<br/>new file mode 100644<br/>index 000000000000..8ce11c3e6d5c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/hw.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/hw.h</a></div><div class='hunk'>@@ -0,0 +1,382 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH12K_HW_H</div><div class='add'>+#define ATH12K_HW_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mhi.h&gt;</div><div class='add'>+#include &lt;linux/uuid.h&gt;</div><div class='add'>+</div><div class='add'>+#include "wmi.h"</div><div class='add'>+#include "hal.h"</div><div class='add'>+</div><div class='add'>+/* Target configuration defines */</div><div class='add'>+</div><div class='add'>+/* Num VDEVS per radio */</div><div class='add'>+#define TARGET_NUM_VDEVS(ab)    ((ab)-&gt;profile_param-&gt;num_vdevs)</div><div class='add'>+</div><div class='add'>+/* Max num of stations for Single Radio mode */</div><div class='add'>+#define TARGET_NUM_STATIONS_SINGLE(ab) ((ab)-&gt;profile_param-&gt;max_client_single)</div><div class='add'>+</div><div class='add'>+/* Max num of stations for DBS */</div><div class='add'>+#define TARGET_NUM_STATIONS_DBS(ab)    ((ab)-&gt;profile_param-&gt;max_client_dbs)</div><div class='add'>+</div><div class='add'>+/* Max num of stations for DBS_SBS */</div><div class='add'>+#define TARGET_NUM_STATIONS_DBS_SBS(ab) \</div><div class='add'>+	((ab)-&gt;profile_param-&gt;max_client_dbs_sbs)</div><div class='add'>+</div><div class='add'>+#define TARGET_NUM_STATIONS(ab, x)     TARGET_NUM_STATIONS_##x(ab)</div><div class='add'>+</div><div class='add'>+#define TARGET_NUM_PEER_KEYS	2</div><div class='add'>+</div><div class='add'>+#define TARGET_AST_SKID_LIMIT	16</div><div class='add'>+#define TARGET_NUM_OFFLD_PEERS	4</div><div class='add'>+#define TARGET_NUM_OFFLD_REORDER_BUFFS 4</div><div class='add'>+</div><div class='add'>+#define TARGET_TX_CHAIN_MASK	(BIT(0) | BIT(1) | BIT(2) | BIT(4))</div><div class='add'>+#define TARGET_RX_CHAIN_MASK	(BIT(0) | BIT(1) | BIT(2) | BIT(4))</div><div class='add'>+#define TARGET_RX_TIMEOUT_LO_PRI	100</div><div class='add'>+#define TARGET_RX_TIMEOUT_HI_PRI	40</div><div class='add'>+</div><div class='add'>+#define TARGET_DECAP_MODE_RAW		0</div><div class='add'>+#define TARGET_DECAP_MODE_NATIVE_WIFI	1</div><div class='add'>+#define TARGET_DECAP_MODE_ETH		2</div><div class='add'>+</div><div class='add'>+#define TARGET_SCAN_MAX_PENDING_REQS	4</div><div class='add'>+#define TARGET_BMISS_OFFLOAD_MAX_VDEV	3</div><div class='add'>+#define TARGET_ROAM_OFFLOAD_MAX_VDEV	3</div><div class='add'>+#define TARGET_ROAM_OFFLOAD_MAX_AP_PROFILES	8</div><div class='add'>+#define TARGET_GTK_OFFLOAD_MAX_VDEV	3</div><div class='add'>+#define TARGET_NUM_MCAST_GROUPS		12</div><div class='add'>+#define TARGET_NUM_MCAST_TABLE_ELEMS	64</div><div class='add'>+#define TARGET_MCAST2UCAST_MODE		2</div><div class='add'>+#define TARGET_TX_DBG_LOG_SIZE		1024</div><div class='add'>+#define TARGET_RX_SKIP_DEFRAG_TIMEOUT_DUP_DETECTION_CHECK 1</div><div class='add'>+#define TARGET_VOW_CONFIG		0</div><div class='add'>+#define TARGET_NUM_MSDU_DESC		(2500)</div><div class='add'>+#define TARGET_MAX_FRAG_ENTRIES		6</div><div class='add'>+#define TARGET_MAX_BCN_OFFLD		16</div><div class='add'>+#define TARGET_NUM_WDS_ENTRIES		32</div><div class='add'>+#define TARGET_DMA_BURST_SIZE		1</div><div class='add'>+#define TARGET_RX_BATCHMODE		1</div><div class='add'>+#define TARGET_EMA_MAX_PROFILE_PERIOD	8</div><div class='add'>+</div><div class='add'>+#define ATH12K_HW_DEFAULT_QUEUE		0</div><div class='add'>+#define ATH12K_HW_MAX_QUEUES		4</div><div class='add'>+#define ATH12K_QUEUE_LEN		4096</div><div class='add'>+</div><div class='add'>+#define ATH12K_HW_RATECODE_CCK_SHORT_PREAM_MASK  0x4</div><div class='add'>+</div><div class='add'>+#define ATH12K_FW_DIR			"ath12k"</div><div class='add'>+</div><div class='add'>+#define ATH12K_BOARD_MAGIC		"QCA-ATH12K-BOARD"</div><div class='add'>+#define ATH12K_BOARD_API2_FILE		"board-2.bin"</div><div class='add'>+#define ATH12K_DEFAULT_BOARD_FILE	"board.bin"</div><div class='add'>+#define ATH12K_DEFAULT_CAL_FILE		"caldata.bin"</div><div class='add'>+#define ATH12K_AMSS_FILE		"amss.bin"</div><div class='add'>+#define ATH12K_M3_FILE			"m3.bin"</div><div class='add'>+#define ATH12K_REGDB_FILE_NAME		"regdb.bin"</div><div class='add'>+</div><div class='add'>+#define ATH12K_PCIE_MAX_PAYLOAD_SIZE	128</div><div class='add'>+#define ATH12K_IPQ5332_USERPD_ID	1</div><div class='add'>+</div><div class='add'>+enum ath12k_hw_rate_cck {</div><div class='add'>+	ATH12K_HW_RATE_CCK_LP_11M = 0,</div><div class='add'>+	ATH12K_HW_RATE_CCK_LP_5_5M,</div><div class='add'>+	ATH12K_HW_RATE_CCK_LP_2M,</div><div class='add'>+	ATH12K_HW_RATE_CCK_LP_1M,</div><div class='add'>+	ATH12K_HW_RATE_CCK_SP_11M,</div><div class='add'>+	ATH12K_HW_RATE_CCK_SP_5_5M,</div><div class='add'>+	ATH12K_HW_RATE_CCK_SP_2M,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_hw_rate_ofdm {</div><div class='add'>+	ATH12K_HW_RATE_OFDM_48M = 0,</div><div class='add'>+	ATH12K_HW_RATE_OFDM_24M,</div><div class='add'>+	ATH12K_HW_RATE_OFDM_12M,</div><div class='add'>+	ATH12K_HW_RATE_OFDM_6M,</div><div class='add'>+	ATH12K_HW_RATE_OFDM_54M,</div><div class='add'>+	ATH12K_HW_RATE_OFDM_36M,</div><div class='add'>+	ATH12K_HW_RATE_OFDM_18M,</div><div class='add'>+	ATH12K_HW_RATE_OFDM_9M,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_bus {</div><div class='add'>+	ATH12K_BUS_PCI,</div><div class='add'>+	ATH12K_BUS_AHB,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_EXT_IRQ_GRP_NUM_MAX 11</div><div class='add'>+</div><div class='add'>+struct hal_rx_desc;</div><div class='add'>+struct hal_tcl_data_cmd;</div><div class='add'>+struct htt_rx_ring_tlv_filter;</div><div class='add'>+enum hal_encrypt_type;</div><div class='add'>+</div><div class='add'>+struct ath12k_hw_ring_mask {</div><div class='add'>+	u8 tx[ATH12K_EXT_IRQ_GRP_NUM_MAX];</div><div class='add'>+	u8 rx_mon_dest[ATH12K_EXT_IRQ_GRP_NUM_MAX];</div><div class='add'>+	u8 rx_mon_status[ATH12K_EXT_IRQ_GRP_NUM_MAX];</div><div class='add'>+	u8 rx[ATH12K_EXT_IRQ_GRP_NUM_MAX];</div><div class='add'>+	u8 rx_err[ATH12K_EXT_IRQ_GRP_NUM_MAX];</div><div class='add'>+	u8 rx_wbm_rel[ATH12K_EXT_IRQ_GRP_NUM_MAX];</div><div class='add'>+	u8 reo_status[ATH12K_EXT_IRQ_GRP_NUM_MAX];</div><div class='add'>+	u8 host2rxdma[ATH12K_EXT_IRQ_GRP_NUM_MAX];</div><div class='add'>+	u8 tx_mon_dest[ATH12K_EXT_IRQ_GRP_NUM_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_hw_hal_params {</div><div class='add'>+	enum hal_rx_buf_return_buf_manager rx_buf_rbm;</div><div class='add'>+	u32	  wbm2sw_cc_enable;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_m3_fw_loaders {</div><div class='add'>+	ath12k_m3_fw_loader_driver,</div><div class='add'>+	ath12k_m3_fw_loader_remoteproc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_hw_params {</div><div class='add'>+	const char *name;</div><div class='add'>+	u16 hw_rev;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		const char *dir;</div><div class='add'>+		size_t board_size;</div><div class='add'>+		size_t cal_offset;</div><div class='add'>+		enum ath12k_m3_fw_loaders m3_loader;</div><div class='add'>+	} fw;</div><div class='add'>+</div><div class='add'>+	u8 max_radios;</div><div class='add'>+	bool single_pdev_only:1;</div><div class='add'>+	u32 qmi_service_ins_id;</div><div class='add'>+	bool internal_sleep_clock:1;</div><div class='add'>+</div><div class='add'>+	const struct ath12k_hw_ops *hw_ops;</div><div class='add'>+	const struct ath12k_hw_ring_mask *ring_mask;</div><div class='add'>+	const struct ath12k_hw_regs *regs;</div><div class='add'>+</div><div class='add'>+	const struct ce_attr *host_ce_config;</div><div class='add'>+	u32 ce_count;</div><div class='add'>+	const struct ce_pipe_config *target_ce_config;</div><div class='add'>+	u32 target_ce_count;</div><div class='add'>+	const struct service_to_pipe *svc_to_ce_map;</div><div class='add'>+	u32 svc_to_ce_map_len;</div><div class='add'>+</div><div class='add'>+	const struct ath12k_hw_hal_params *hal_params;</div><div class='add'>+</div><div class='add'>+	bool rxdma1_enable:1;</div><div class='add'>+	int num_rxdma_per_pdev;</div><div class='add'>+	int num_rxdma_dst_ring;</div><div class='add'>+	bool rx_mac_buf_ring:1;</div><div class='add'>+	bool vdev_start_delay:1;</div><div class='add'>+</div><div class='add'>+	u16 interface_modes;</div><div class='add'>+	bool supports_monitor:1;</div><div class='add'>+</div><div class='add'>+	bool idle_ps:1;</div><div class='add'>+	bool download_calib:1;</div><div class='add'>+	bool supports_suspend:1;</div><div class='add'>+	bool tcl_ring_retry:1;</div><div class='add'>+	bool reoq_lut_support:1;</div><div class='add'>+	bool supports_shadow_regs:1;</div><div class='add'>+	bool supports_aspm:1;</div><div class='add'>+	bool current_cc_support:1;</div><div class='add'>+</div><div class='add'>+	u32 num_tcl_banks;</div><div class='add'>+	u32 max_tx_ring;</div><div class='add'>+</div><div class='add'>+	const struct mhi_controller_config *mhi_config;</div><div class='add'>+</div><div class='add'>+	void (*wmi_init)(struct ath12k_base *ab,</div><div class='add'>+			 struct ath12k_wmi_resource_config_arg *config);</div><div class='add'>+</div><div class='add'>+	const struct hal_ops *hal_ops;</div><div class='add'>+</div><div class='add'>+	u64 qmi_cnss_feature_bitmap;</div><div class='add'>+</div><div class='add'>+	u32 rfkill_pin;</div><div class='add'>+	u32 rfkill_cfg;</div><div class='add'>+	u32 rfkill_on_level;</div><div class='add'>+</div><div class='add'>+	u32 rddm_size;</div><div class='add'>+</div><div class='add'>+	u8 def_num_link;</div><div class='add'>+	u16 max_mlo_peer;</div><div class='add'>+</div><div class='add'>+	u32 otp_board_id_register;</div><div class='add'>+</div><div class='add'>+	bool supports_sta_ps;</div><div class='add'>+</div><div class='add'>+	const guid_t *acpi_guid;</div><div class='add'>+	bool supports_dynamic_smps_6ghz;</div><div class='add'>+</div><div class='add'>+	u32 iova_mask;</div><div class='add'>+</div><div class='add'>+	const struct ce_ie_addr *ce_ie_addr;</div><div class='add'>+	const struct ce_remap *ce_remap;</div><div class='add'>+	u32 bdf_addr_offset;</div><div class='add'>+</div><div class='add'>+	/* setup REO queue, frag etc only for primary link peer */</div><div class='add'>+	bool dp_primary_link_only:1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_hw_ops {</div><div class='add'>+	u8 (*get_hw_mac_from_pdev_id)(int pdev_id);</div><div class='add'>+	int (*mac_id_to_pdev_id)(const struct ath12k_hw_params *hw, int mac_id);</div><div class='add'>+	int (*mac_id_to_srng_id)(const struct ath12k_hw_params *hw, int mac_id);</div><div class='add'>+	int (*rxdma_ring_sel_config)(struct ath12k_base *ab);</div><div class='add'>+	u8 (*get_ring_selector)(struct sk_buff *skb);</div><div class='add'>+	bool (*dp_srng_is_tx_comp_ring)(int ring_num);</div><div class='add'>+	bool (*is_frame_link_agnostic)(struct ath12k_link_vif *arvif,</div><div class='add'>+				       struct ieee80211_mgmt *mgmt);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+int ath12k_hw_get_mac_from_pdev_id(const struct ath12k_hw_params *hw,</div><div class='add'>+				   int pdev_idx)</div><div class='add'>+{</div><div class='add'>+	if (hw-&gt;hw_ops-&gt;get_hw_mac_from_pdev_id)</div><div class='add'>+		return hw-&gt;hw_ops-&gt;get_hw_mac_from_pdev_id(pdev_idx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath12k_hw_mac_id_to_pdev_id(const struct ath12k_hw_params *hw,</div><div class='add'>+					      int mac_id)</div><div class='add'>+{</div><div class='add'>+	if (hw-&gt;hw_ops-&gt;mac_id_to_pdev_id)</div><div class='add'>+		return hw-&gt;hw_ops-&gt;mac_id_to_pdev_id(hw, mac_id);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath12k_hw_mac_id_to_srng_id(const struct ath12k_hw_params *hw,</div><div class='add'>+					      int mac_id)</div><div class='add'>+{</div><div class='add'>+	if (hw-&gt;hw_ops-&gt;mac_id_to_srng_id)</div><div class='add'>+		return hw-&gt;hw_ops-&gt;mac_id_to_srng_id(hw, mac_id);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ath12k_fw_ie {</div><div class='add'>+	__le32 id;</div><div class='add'>+	__le32 len;</div><div class='add'>+	u8 data[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_bd_ie_board_type {</div><div class='add'>+	ATH12K_BD_IE_BOARD_NAME = 0,</div><div class='add'>+	ATH12K_BD_IE_BOARD_DATA = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_bd_ie_regdb_type {</div><div class='add'>+	ATH12K_BD_IE_REGDB_NAME = 0,</div><div class='add'>+	ATH12K_BD_IE_REGDB_DATA = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_bd_ie_type {</div><div class='add'>+	/* contains sub IEs of enum ath12k_bd_ie_board_type */</div><div class='add'>+	ATH12K_BD_IE_BOARD = 0,</div><div class='add'>+	/* contains sub IEs of enum ath12k_bd_ie_regdb_type */</div><div class='add'>+	ATH12K_BD_IE_REGDB = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_hw_regs {</div><div class='add'>+	u32 hal_tcl1_ring_id;</div><div class='add'>+	u32 hal_tcl1_ring_misc;</div><div class='add'>+	u32 hal_tcl1_ring_tp_addr_lsb;</div><div class='add'>+	u32 hal_tcl1_ring_tp_addr_msb;</div><div class='add'>+	u32 hal_tcl1_ring_consumer_int_setup_ix0;</div><div class='add'>+	u32 hal_tcl1_ring_consumer_int_setup_ix1;</div><div class='add'>+	u32 hal_tcl1_ring_msi1_base_lsb;</div><div class='add'>+	u32 hal_tcl1_ring_msi1_base_msb;</div><div class='add'>+	u32 hal_tcl1_ring_msi1_data;</div><div class='add'>+	u32 hal_tcl_ring_base_lsb;</div><div class='add'>+	u32 hal_tcl1_ring_base_lsb;</div><div class='add'>+	u32 hal_tcl1_ring_base_msb;</div><div class='add'>+	u32 hal_tcl2_ring_base_lsb;</div><div class='add'>+</div><div class='add'>+	u32 hal_tcl_status_ring_base_lsb;</div><div class='add'>+</div><div class='add'>+	u32 hal_reo1_qdesc_addr;</div><div class='add'>+	u32 hal_reo1_qdesc_max_peerid;</div><div class='add'>+</div><div class='add'>+	u32 hal_wbm_idle_ring_base_lsb;</div><div class='add'>+	u32 hal_wbm_idle_ring_misc_addr;</div><div class='add'>+	u32 hal_wbm_r0_idle_list_cntl_addr;</div><div class='add'>+	u32 hal_wbm_r0_idle_list_size_addr;</div><div class='add'>+	u32 hal_wbm_scattered_ring_base_lsb;</div><div class='add'>+	u32 hal_wbm_scattered_ring_base_msb;</div><div class='add'>+	u32 hal_wbm_scattered_desc_head_info_ix0;</div><div class='add'>+	u32 hal_wbm_scattered_desc_head_info_ix1;</div><div class='add'>+	u32 hal_wbm_scattered_desc_tail_info_ix0;</div><div class='add'>+	u32 hal_wbm_scattered_desc_tail_info_ix1;</div><div class='add'>+	u32 hal_wbm_scattered_desc_ptr_hp_addr;</div><div class='add'>+</div><div class='add'>+	u32 hal_wbm_sw_release_ring_base_lsb;</div><div class='add'>+	u32 hal_wbm_sw1_release_ring_base_lsb;</div><div class='add'>+	u32 hal_wbm0_release_ring_base_lsb;</div><div class='add'>+	u32 hal_wbm1_release_ring_base_lsb;</div><div class='add'>+</div><div class='add'>+	u32 pcie_qserdes_sysclk_en_sel;</div><div class='add'>+	u32 pcie_pcs_osc_dtct_config_base;</div><div class='add'>+</div><div class='add'>+	u32 hal_umac_ce0_src_reg_base;</div><div class='add'>+	u32 hal_umac_ce0_dest_reg_base;</div><div class='add'>+	u32 hal_umac_ce1_src_reg_base;</div><div class='add'>+	u32 hal_umac_ce1_dest_reg_base;</div><div class='add'>+</div><div class='add'>+	u32 hal_ppe_rel_ring_base;</div><div class='add'>+</div><div class='add'>+	u32 hal_reo2_ring_base;</div><div class='add'>+	u32 hal_reo1_misc_ctrl_addr;</div><div class='add'>+	u32 hal_reo1_sw_cookie_cfg0;</div><div class='add'>+	u32 hal_reo1_sw_cookie_cfg1;</div><div class='add'>+	u32 hal_reo1_qdesc_lut_base0;</div><div class='add'>+	u32 hal_reo1_qdesc_lut_base1;</div><div class='add'>+	u32 hal_reo1_ring_base_lsb;</div><div class='add'>+	u32 hal_reo1_ring_base_msb;</div><div class='add'>+	u32 hal_reo1_ring_id;</div><div class='add'>+	u32 hal_reo1_ring_misc;</div><div class='add'>+	u32 hal_reo1_ring_hp_addr_lsb;</div><div class='add'>+	u32 hal_reo1_ring_hp_addr_msb;</div><div class='add'>+	u32 hal_reo1_ring_producer_int_setup;</div><div class='add'>+	u32 hal_reo1_ring_msi1_base_lsb;</div><div class='add'>+	u32 hal_reo1_ring_msi1_base_msb;</div><div class='add'>+	u32 hal_reo1_ring_msi1_data;</div><div class='add'>+	u32 hal_reo1_aging_thres_ix0;</div><div class='add'>+	u32 hal_reo1_aging_thres_ix1;</div><div class='add'>+	u32 hal_reo1_aging_thres_ix2;</div><div class='add'>+	u32 hal_reo1_aging_thres_ix3;</div><div class='add'>+</div><div class='add'>+	u32 hal_reo2_sw0_ring_base;</div><div class='add'>+</div><div class='add'>+	u32 hal_sw2reo_ring_base;</div><div class='add'>+	u32 hal_sw2reo1_ring_base;</div><div class='add'>+</div><div class='add'>+	u32 hal_reo_cmd_ring_base;</div><div class='add'>+</div><div class='add'>+	u32 hal_reo_status_ring_base;</div><div class='add'>+</div><div class='add'>+	u32 gcc_gcc_pcie_hot_rst;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline const char *ath12k_bd_ie_type_str(enum ath12k_bd_ie_type type)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case ATH12K_BD_IE_BOARD:</div><div class='add'>+		return "board data";</div><div class='add'>+	case ATH12K_BD_IE_REGDB:</div><div class='add'>+		return "regdb data";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "unknown";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_hw_init(struct ath12k_base *ab);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c<br/>new file mode 100644<br/>index 000000000000..f7a2a544bef2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/mac.c</a></div><div class='hunk'>@@ -0,0 +1,14996 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+#include &lt;net/cfg80211.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mac.h"</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "wmi.h"</div><div class='add'>+#include "hw.h"</div><div class='add'>+#include "dp_tx.h"</div><div class='add'>+#include "dp_rx.h"</div><div class='add'>+#include "testmode.h"</div><div class='add'>+#include "peer.h"</div><div class='add'>+#include "debugfs.h"</div><div class='add'>+#include "hif.h"</div><div class='add'>+#include "wow.h"</div><div class='add'>+#include "debugfs_sta.h"</div><div class='add'>+</div><div class='add'>+#define CHAN2G(_channel, _freq, _flags) { \</div><div class='add'>+	.band                   = NL80211_BAND_2GHZ, \</div><div class='add'>+	.hw_value               = (_channel), \</div><div class='add'>+	.center_freq            = (_freq), \</div><div class='add'>+	.flags                  = (_flags), \</div><div class='add'>+	.max_antenna_gain       = 0, \</div><div class='add'>+	.max_power              = 30, \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CHAN5G(_channel, _freq, _flags) { \</div><div class='add'>+	.band                   = NL80211_BAND_5GHZ, \</div><div class='add'>+	.hw_value               = (_channel), \</div><div class='add'>+	.center_freq            = (_freq), \</div><div class='add'>+	.flags                  = (_flags), \</div><div class='add'>+	.max_antenna_gain       = 0, \</div><div class='add'>+	.max_power              = 30, \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CHAN6G(_channel, _freq, _flags) { \</div><div class='add'>+	.band                   = NL80211_BAND_6GHZ, \</div><div class='add'>+	.hw_value               = (_channel), \</div><div class='add'>+	.center_freq            = (_freq), \</div><div class='add'>+	.flags                  = (_flags), \</div><div class='add'>+	.max_antenna_gain       = 0, \</div><div class='add'>+	.max_power              = 30, \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_channel ath12k_2ghz_channels[] = {</div><div class='add'>+	CHAN2G(1, 2412, 0),</div><div class='add'>+	CHAN2G(2, 2417, 0),</div><div class='add'>+	CHAN2G(3, 2422, 0),</div><div class='add'>+	CHAN2G(4, 2427, 0),</div><div class='add'>+	CHAN2G(5, 2432, 0),</div><div class='add'>+	CHAN2G(6, 2437, 0),</div><div class='add'>+	CHAN2G(7, 2442, 0),</div><div class='add'>+	CHAN2G(8, 2447, 0),</div><div class='add'>+	CHAN2G(9, 2452, 0),</div><div class='add'>+	CHAN2G(10, 2457, 0),</div><div class='add'>+	CHAN2G(11, 2462, 0),</div><div class='add'>+	CHAN2G(12, 2467, 0),</div><div class='add'>+	CHAN2G(13, 2472, 0),</div><div class='add'>+	CHAN2G(14, 2484, 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_channel ath12k_5ghz_channels[] = {</div><div class='add'>+	CHAN5G(36, 5180, 0),</div><div class='add'>+	CHAN5G(40, 5200, 0),</div><div class='add'>+	CHAN5G(44, 5220, 0),</div><div class='add'>+	CHAN5G(48, 5240, 0),</div><div class='add'>+	CHAN5G(52, 5260, 0),</div><div class='add'>+	CHAN5G(56, 5280, 0),</div><div class='add'>+	CHAN5G(60, 5300, 0),</div><div class='add'>+	CHAN5G(64, 5320, 0),</div><div class='add'>+	CHAN5G(100, 5500, 0),</div><div class='add'>+	CHAN5G(104, 5520, 0),</div><div class='add'>+	CHAN5G(108, 5540, 0),</div><div class='add'>+	CHAN5G(112, 5560, 0),</div><div class='add'>+	CHAN5G(116, 5580, 0),</div><div class='add'>+	CHAN5G(120, 5600, 0),</div><div class='add'>+	CHAN5G(124, 5620, 0),</div><div class='add'>+	CHAN5G(128, 5640, 0),</div><div class='add'>+	CHAN5G(132, 5660, 0),</div><div class='add'>+	CHAN5G(136, 5680, 0),</div><div class='add'>+	CHAN5G(140, 5700, 0),</div><div class='add'>+	CHAN5G(144, 5720, 0),</div><div class='add'>+	CHAN5G(149, 5745, 0),</div><div class='add'>+	CHAN5G(153, 5765, 0),</div><div class='add'>+	CHAN5G(157, 5785, 0),</div><div class='add'>+	CHAN5G(161, 5805, 0),</div><div class='add'>+	CHAN5G(165, 5825, 0),</div><div class='add'>+	CHAN5G(169, 5845, 0),</div><div class='add'>+	CHAN5G(173, 5865, 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_channel ath12k_6ghz_channels[] = {</div><div class='add'>+	/* Operating Class 136 */</div><div class='add'>+	CHAN6G(2, 5935, 0),</div><div class='add'>+</div><div class='add'>+	/* Operating Classes 131-135 */</div><div class='add'>+	CHAN6G(1, 5955, 0),</div><div class='add'>+	CHAN6G(5, 5975, 0),</div><div class='add'>+	CHAN6G(9, 5995, 0),</div><div class='add'>+	CHAN6G(13, 6015, 0),</div><div class='add'>+	CHAN6G(17, 6035, 0),</div><div class='add'>+	CHAN6G(21, 6055, 0),</div><div class='add'>+	CHAN6G(25, 6075, 0),</div><div class='add'>+	CHAN6G(29, 6095, 0),</div><div class='add'>+	CHAN6G(33, 6115, 0),</div><div class='add'>+	CHAN6G(37, 6135, 0),</div><div class='add'>+	CHAN6G(41, 6155, 0),</div><div class='add'>+	CHAN6G(45, 6175, 0),</div><div class='add'>+	CHAN6G(49, 6195, 0),</div><div class='add'>+	CHAN6G(53, 6215, 0),</div><div class='add'>+	CHAN6G(57, 6235, 0),</div><div class='add'>+	CHAN6G(61, 6255, 0),</div><div class='add'>+	CHAN6G(65, 6275, 0),</div><div class='add'>+	CHAN6G(69, 6295, 0),</div><div class='add'>+	CHAN6G(73, 6315, 0),</div><div class='add'>+	CHAN6G(77, 6335, 0),</div><div class='add'>+	CHAN6G(81, 6355, 0),</div><div class='add'>+	CHAN6G(85, 6375, 0),</div><div class='add'>+	CHAN6G(89, 6395, 0),</div><div class='add'>+	CHAN6G(93, 6415, 0),</div><div class='add'>+	CHAN6G(97, 6435, 0),</div><div class='add'>+	CHAN6G(101, 6455, 0),</div><div class='add'>+	CHAN6G(105, 6475, 0),</div><div class='add'>+	CHAN6G(109, 6495, 0),</div><div class='add'>+	CHAN6G(113, 6515, 0),</div><div class='add'>+	CHAN6G(117, 6535, 0),</div><div class='add'>+	CHAN6G(121, 6555, 0),</div><div class='add'>+	CHAN6G(125, 6575, 0),</div><div class='add'>+	CHAN6G(129, 6595, 0),</div><div class='add'>+	CHAN6G(133, 6615, 0),</div><div class='add'>+	CHAN6G(137, 6635, 0),</div><div class='add'>+	CHAN6G(141, 6655, 0),</div><div class='add'>+	CHAN6G(145, 6675, 0),</div><div class='add'>+	CHAN6G(149, 6695, 0),</div><div class='add'>+	CHAN6G(153, 6715, 0),</div><div class='add'>+	CHAN6G(157, 6735, 0),</div><div class='add'>+	CHAN6G(161, 6755, 0),</div><div class='add'>+	CHAN6G(165, 6775, 0),</div><div class='add'>+	CHAN6G(169, 6795, 0),</div><div class='add'>+	CHAN6G(173, 6815, 0),</div><div class='add'>+	CHAN6G(177, 6835, 0),</div><div class='add'>+	CHAN6G(181, 6855, 0),</div><div class='add'>+	CHAN6G(185, 6875, 0),</div><div class='add'>+	CHAN6G(189, 6895, 0),</div><div class='add'>+	CHAN6G(193, 6915, 0),</div><div class='add'>+	CHAN6G(197, 6935, 0),</div><div class='add'>+	CHAN6G(201, 6955, 0),</div><div class='add'>+	CHAN6G(205, 6975, 0),</div><div class='add'>+	CHAN6G(209, 6995, 0),</div><div class='add'>+	CHAN6G(213, 7015, 0),</div><div class='add'>+	CHAN6G(217, 7035, 0),</div><div class='add'>+	CHAN6G(221, 7055, 0),</div><div class='add'>+	CHAN6G(225, 7075, 0),</div><div class='add'>+	CHAN6G(229, 7095, 0),</div><div class='add'>+	CHAN6G(233, 7115, 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ieee80211_rate ath12k_legacy_rates[] = {</div><div class='add'>+	{ .bitrate = 10,</div><div class='add'>+	  .hw_value = ATH12K_HW_RATE_CCK_LP_1M },</div><div class='add'>+	{ .bitrate = 20,</div><div class='add'>+	  .hw_value = ATH12K_HW_RATE_CCK_LP_2M,</div><div class='add'>+	  .hw_value_short = ATH12K_HW_RATE_CCK_SP_2M,</div><div class='add'>+	  .flags = IEEE80211_RATE_SHORT_PREAMBLE },</div><div class='add'>+	{ .bitrate = 55,</div><div class='add'>+	  .hw_value = ATH12K_HW_RATE_CCK_LP_5_5M,</div><div class='add'>+	  .hw_value_short = ATH12K_HW_RATE_CCK_SP_5_5M,</div><div class='add'>+	  .flags = IEEE80211_RATE_SHORT_PREAMBLE },</div><div class='add'>+	{ .bitrate = 110,</div><div class='add'>+	  .hw_value = ATH12K_HW_RATE_CCK_LP_11M,</div><div class='add'>+	  .hw_value_short = ATH12K_HW_RATE_CCK_SP_11M,</div><div class='add'>+	  .flags = IEEE80211_RATE_SHORT_PREAMBLE },</div><div class='add'>+</div><div class='add'>+	{ .bitrate = 60, .hw_value = ATH12K_HW_RATE_OFDM_6M },</div><div class='add'>+	{ .bitrate = 90, .hw_value = ATH12K_HW_RATE_OFDM_9M },</div><div class='add'>+	{ .bitrate = 120, .hw_value = ATH12K_HW_RATE_OFDM_12M },</div><div class='add'>+	{ .bitrate = 180, .hw_value = ATH12K_HW_RATE_OFDM_18M },</div><div class='add'>+	{ .bitrate = 240, .hw_value = ATH12K_HW_RATE_OFDM_24M },</div><div class='add'>+	{ .bitrate = 360, .hw_value = ATH12K_HW_RATE_OFDM_36M },</div><div class='add'>+	{ .bitrate = 480, .hw_value = ATH12K_HW_RATE_OFDM_48M },</div><div class='add'>+	{ .bitrate = 540, .hw_value = ATH12K_HW_RATE_OFDM_54M },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const int</div><div class='add'>+ath12k_phymodes[NUM_NL80211_BANDS][ATH12K_CHAN_WIDTH_NUM] = {</div><div class='add'>+	[NL80211_BAND_2GHZ] = {</div><div class='add'>+			[NL80211_CHAN_WIDTH_5] = MODE_UNKNOWN,</div><div class='add'>+			[NL80211_CHAN_WIDTH_10] = MODE_UNKNOWN,</div><div class='add'>+			[NL80211_CHAN_WIDTH_20_NOHT] = MODE_11BE_EHT20_2G,</div><div class='add'>+			[NL80211_CHAN_WIDTH_20] = MODE_11BE_EHT20_2G,</div><div class='add'>+			[NL80211_CHAN_WIDTH_40] = MODE_11BE_EHT40_2G,</div><div class='add'>+			[NL80211_CHAN_WIDTH_80] = MODE_UNKNOWN,</div><div class='add'>+			[NL80211_CHAN_WIDTH_80P80] = MODE_UNKNOWN,</div><div class='add'>+			[NL80211_CHAN_WIDTH_160] = MODE_UNKNOWN,</div><div class='add'>+			[NL80211_CHAN_WIDTH_320] = MODE_UNKNOWN,</div><div class='add'>+	},</div><div class='add'>+	[NL80211_BAND_5GHZ] = {</div><div class='add'>+			[NL80211_CHAN_WIDTH_5] = MODE_UNKNOWN,</div><div class='add'>+			[NL80211_CHAN_WIDTH_10] = MODE_UNKNOWN,</div><div class='add'>+			[NL80211_CHAN_WIDTH_20_NOHT] = MODE_11BE_EHT20,</div><div class='add'>+			[NL80211_CHAN_WIDTH_20] = MODE_11BE_EHT20,</div><div class='add'>+			[NL80211_CHAN_WIDTH_40] = MODE_11BE_EHT40,</div><div class='add'>+			[NL80211_CHAN_WIDTH_80] = MODE_11BE_EHT80,</div><div class='add'>+			[NL80211_CHAN_WIDTH_160] = MODE_11BE_EHT160,</div><div class='add'>+			[NL80211_CHAN_WIDTH_80P80] = MODE_UNKNOWN,</div><div class='add'>+			[NL80211_CHAN_WIDTH_320] = MODE_11BE_EHT320,</div><div class='add'>+	},</div><div class='add'>+	[NL80211_BAND_6GHZ] = {</div><div class='add'>+			[NL80211_CHAN_WIDTH_5] = MODE_UNKNOWN,</div><div class='add'>+			[NL80211_CHAN_WIDTH_10] = MODE_UNKNOWN,</div><div class='add'>+			[NL80211_CHAN_WIDTH_20_NOHT] = MODE_11BE_EHT20,</div><div class='add'>+			[NL80211_CHAN_WIDTH_20] = MODE_11BE_EHT20,</div><div class='add'>+			[NL80211_CHAN_WIDTH_40] = MODE_11BE_EHT40,</div><div class='add'>+			[NL80211_CHAN_WIDTH_80] = MODE_11BE_EHT80,</div><div class='add'>+			[NL80211_CHAN_WIDTH_160] = MODE_11BE_EHT160,</div><div class='add'>+			[NL80211_CHAN_WIDTH_80P80] = MODE_UNKNOWN,</div><div class='add'>+			[NL80211_CHAN_WIDTH_320] = MODE_11BE_EHT320,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct htt_rx_ring_tlv_filter ath12k_mac_mon_status_filter_default = {</div><div class='add'>+	.rx_filter = HTT_RX_FILTER_TLV_FLAGS_MPDU_START |</div><div class='add'>+		     HTT_RX_FILTER_TLV_FLAGS_PPDU_END |</div><div class='add'>+		     HTT_RX_FILTER_TLV_FLAGS_PPDU_END_STATUS_DONE |</div><div class='add'>+		     HTT_RX_FILTER_TLV_FLAGS_PPDU_START_USER_INFO,</div><div class='add'>+	.pkt_filter_flags0 = HTT_RX_FP_MGMT_FILTER_FLAGS0,</div><div class='add'>+	.pkt_filter_flags1 = HTT_RX_FP_MGMT_FILTER_FLAGS1,</div><div class='add'>+	.pkt_filter_flags2 = HTT_RX_FP_CTRL_FILTER_FLASG2,</div><div class='add'>+	.pkt_filter_flags3 = HTT_RX_FP_DATA_FILTER_FLASG3 |</div><div class='add'>+			     HTT_RX_FP_CTRL_FILTER_FLASG3</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_MAC_FIRST_OFDM_RATE_IDX 4</div><div class='add'>+#define ath12k_g_rates ath12k_legacy_rates</div><div class='add'>+#define ath12k_g_rates_size (ARRAY_SIZE(ath12k_legacy_rates))</div><div class='add'>+#define ath12k_a_rates (ath12k_legacy_rates + 4)</div><div class='add'>+#define ath12k_a_rates_size (ARRAY_SIZE(ath12k_legacy_rates) - 4)</div><div class='add'>+</div><div class='add'>+#define ATH12K_MAC_SCAN_TIMEOUT_MSECS 200 /* in msecs */</div><div class='add'>+</div><div class='add'>+static const u32 ath12k_smps_map[] = {</div><div class='add'>+	[WLAN_HT_CAP_SM_PS_STATIC] = WMI_PEER_SMPS_STATIC,</div><div class='add'>+	[WLAN_HT_CAP_SM_PS_DYNAMIC] = WMI_PEER_SMPS_DYNAMIC,</div><div class='add'>+	[WLAN_HT_CAP_SM_PS_INVALID] = WMI_PEER_SMPS_PS_NONE,</div><div class='add'>+	[WLAN_HT_CAP_SM_PS_DISABLED] = WMI_PEER_SMPS_PS_NONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ath12k_start_vdev_delay(struct ath12k *ar,</div><div class='add'>+				   struct ath12k_link_vif *arvif);</div><div class='add'>+static void ath12k_mac_stop(struct ath12k *ar);</div><div class='add'>+static int ath12k_mac_vdev_create(struct ath12k *ar, struct ath12k_link_vif *arvif);</div><div class='add'>+static int ath12k_mac_vdev_delete(struct ath12k *ar, struct ath12k_link_vif *arvif);</div><div class='add'>+</div><div class='add'>+static const char *ath12k_mac_phymode_str(enum wmi_phy_mode mode)</div><div class='add'>+{</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case MODE_11A:</div><div class='add'>+		return "11a";</div><div class='add'>+	case MODE_11G:</div><div class='add'>+		return "11g";</div><div class='add'>+	case MODE_11B:</div><div class='add'>+		return "11b";</div><div class='add'>+	case MODE_11GONLY:</div><div class='add'>+		return "11gonly";</div><div class='add'>+	case MODE_11NA_HT20:</div><div class='add'>+		return "11na-ht20";</div><div class='add'>+	case MODE_11NG_HT20:</div><div class='add'>+		return "11ng-ht20";</div><div class='add'>+	case MODE_11NA_HT40:</div><div class='add'>+		return "11na-ht40";</div><div class='add'>+	case MODE_11NG_HT40:</div><div class='add'>+		return "11ng-ht40";</div><div class='add'>+	case MODE_11AC_VHT20:</div><div class='add'>+		return "11ac-vht20";</div><div class='add'>+	case MODE_11AC_VHT40:</div><div class='add'>+		return "11ac-vht40";</div><div class='add'>+	case MODE_11AC_VHT80:</div><div class='add'>+		return "11ac-vht80";</div><div class='add'>+	case MODE_11AC_VHT160:</div><div class='add'>+		return "11ac-vht160";</div><div class='add'>+	case MODE_11AC_VHT80_80:</div><div class='add'>+		return "11ac-vht80+80";</div><div class='add'>+	case MODE_11AC_VHT20_2G:</div><div class='add'>+		return "11ac-vht20-2g";</div><div class='add'>+	case MODE_11AC_VHT40_2G:</div><div class='add'>+		return "11ac-vht40-2g";</div><div class='add'>+	case MODE_11AC_VHT80_2G:</div><div class='add'>+		return "11ac-vht80-2g";</div><div class='add'>+	case MODE_11AX_HE20:</div><div class='add'>+		return "11ax-he20";</div><div class='add'>+	case MODE_11AX_HE40:</div><div class='add'>+		return "11ax-he40";</div><div class='add'>+	case MODE_11AX_HE80:</div><div class='add'>+		return "11ax-he80";</div><div class='add'>+	case MODE_11AX_HE80_80:</div><div class='add'>+		return "11ax-he80+80";</div><div class='add'>+	case MODE_11AX_HE160:</div><div class='add'>+		return "11ax-he160";</div><div class='add'>+	case MODE_11AX_HE20_2G:</div><div class='add'>+		return "11ax-he20-2g";</div><div class='add'>+	case MODE_11AX_HE40_2G:</div><div class='add'>+		return "11ax-he40-2g";</div><div class='add'>+	case MODE_11AX_HE80_2G:</div><div class='add'>+		return "11ax-he80-2g";</div><div class='add'>+	case MODE_11BE_EHT20:</div><div class='add'>+		return "11be-eht20";</div><div class='add'>+	case MODE_11BE_EHT40:</div><div class='add'>+		return "11be-eht40";</div><div class='add'>+	case MODE_11BE_EHT80:</div><div class='add'>+		return "11be-eht80";</div><div class='add'>+	case MODE_11BE_EHT80_80:</div><div class='add'>+		return "11be-eht80+80";</div><div class='add'>+	case MODE_11BE_EHT160:</div><div class='add'>+		return "11be-eht160";</div><div class='add'>+	case MODE_11BE_EHT160_160:</div><div class='add'>+		return "11be-eht160+160";</div><div class='add'>+	case MODE_11BE_EHT320:</div><div class='add'>+		return "11be-eht320";</div><div class='add'>+	case MODE_11BE_EHT20_2G:</div><div class='add'>+		return "11be-eht20-2g";</div><div class='add'>+	case MODE_11BE_EHT40_2G:</div><div class='add'>+		return "11be-eht40-2g";</div><div class='add'>+	case MODE_UNKNOWN:</div><div class='add'>+		/* skip */</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+		/* no default handler to allow compiler to check that the</div><div class='add'>+		 * enum is fully handled</div><div class='add'>+		 */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "&lt;unknown&gt;";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 ath12k_mac_he_convert_tones_to_ru_tones(u16 tones)</div><div class='add'>+{</div><div class='add'>+	switch (tones) {</div><div class='add'>+	case 26:</div><div class='add'>+		return RU_26;</div><div class='add'>+	case 52:</div><div class='add'>+		return RU_52;</div><div class='add'>+	case 106:</div><div class='add'>+		return RU_106;</div><div class='add'>+	case 242:</div><div class='add'>+		return RU_242;</div><div class='add'>+	case 484:</div><div class='add'>+		return RU_484;</div><div class='add'>+	case 996:</div><div class='add'>+		return RU_996;</div><div class='add'>+	case (996 * 2):</div><div class='add'>+		return RU_2X996;</div><div class='add'>+	default:</div><div class='add'>+		return RU_26;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum nl80211_eht_gi ath12k_mac_eht_gi_to_nl80211_eht_gi(u8 sgi)</div><div class='add'>+{</div><div class='add'>+	switch (sgi) {</div><div class='add'>+	case RX_MSDU_START_SGI_0_8_US:</div><div class='add'>+		return NL80211_RATE_INFO_EHT_GI_0_8;</div><div class='add'>+	case RX_MSDU_START_SGI_1_6_US:</div><div class='add'>+		return NL80211_RATE_INFO_EHT_GI_1_6;</div><div class='add'>+	case RX_MSDU_START_SGI_3_2_US:</div><div class='add'>+		return NL80211_RATE_INFO_EHT_GI_3_2;</div><div class='add'>+	default:</div><div class='add'>+		return NL80211_RATE_INFO_EHT_GI_0_8;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum nl80211_eht_ru_alloc ath12k_mac_eht_ru_tones_to_nl80211_eht_ru_alloc(u16 ru_tones)</div><div class='add'>+{</div><div class='add'>+	switch (ru_tones) {</div><div class='add'>+	case 26:</div><div class='add'>+		return NL80211_RATE_INFO_EHT_RU_ALLOC_26;</div><div class='add'>+	case 52:</div><div class='add'>+		return NL80211_RATE_INFO_EHT_RU_ALLOC_52;</div><div class='add'>+	case (52 + 26):</div><div class='add'>+		return NL80211_RATE_INFO_EHT_RU_ALLOC_52P26;</div><div class='add'>+	case 106:</div><div class='add'>+		return NL80211_RATE_INFO_EHT_RU_ALLOC_106;</div><div class='add'>+	case (106 + 26):</div><div class='add'>+		return NL80211_RATE_INFO_EHT_RU_ALLOC_106P26;</div><div class='add'>+	case 242:</div><div class='add'>+		return NL80211_RATE_INFO_EHT_RU_ALLOC_242;</div><div class='add'>+	case 484:</div><div class='add'>+		return NL80211_RATE_INFO_EHT_RU_ALLOC_484;</div><div class='add'>+	case (484 + 242):</div><div class='add'>+		return NL80211_RATE_INFO_EHT_RU_ALLOC_484P242;</div><div class='add'>+	case 996:</div><div class='add'>+		return NL80211_RATE_INFO_EHT_RU_ALLOC_996;</div><div class='add'>+	case (996 + 484):</div><div class='add'>+		return NL80211_RATE_INFO_EHT_RU_ALLOC_996P484;</div><div class='add'>+	case (996 + 484 + 242):</div><div class='add'>+		return NL80211_RATE_INFO_EHT_RU_ALLOC_996P484P242;</div><div class='add'>+	case (2 * 996):</div><div class='add'>+		return NL80211_RATE_INFO_EHT_RU_ALLOC_2x996;</div><div class='add'>+	case (2 * 996 + 484):</div><div class='add'>+		return NL80211_RATE_INFO_EHT_RU_ALLOC_2x996P484;</div><div class='add'>+	case (3 * 996):</div><div class='add'>+		return NL80211_RATE_INFO_EHT_RU_ALLOC_3x996;</div><div class='add'>+	case (3 * 996 + 484):</div><div class='add'>+		return NL80211_RATE_INFO_EHT_RU_ALLOC_3x996P484;</div><div class='add'>+	case (4 * 996):</div><div class='add'>+		return NL80211_RATE_INFO_EHT_RU_ALLOC_4x996;</div><div class='add'>+	default:</div><div class='add'>+		return NL80211_RATE_INFO_EHT_RU_ALLOC_26;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum rate_info_bw</div><div class='add'>+ath12k_mac_bw_to_mac80211_bw(enum ath12k_supported_bw bw)</div><div class='add'>+{</div><div class='add'>+	u8 ret = RATE_INFO_BW_20;</div><div class='add'>+</div><div class='add'>+	switch (bw) {</div><div class='add'>+	case ATH12K_BW_20:</div><div class='add'>+		ret = RATE_INFO_BW_20;</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_BW_40:</div><div class='add'>+		ret = RATE_INFO_BW_40;</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_BW_80:</div><div class='add'>+		ret = RATE_INFO_BW_80;</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_BW_160:</div><div class='add'>+		ret = RATE_INFO_BW_160;</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_BW_320:</div><div class='add'>+		ret = RATE_INFO_BW_320;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum ath12k_supported_bw ath12k_mac_mac80211_bw_to_ath12k_bw(enum rate_info_bw bw)</div><div class='add'>+{</div><div class='add'>+	switch (bw) {</div><div class='add'>+	case RATE_INFO_BW_20:</div><div class='add'>+		return ATH12K_BW_20;</div><div class='add'>+	case RATE_INFO_BW_40:</div><div class='add'>+		return ATH12K_BW_40;</div><div class='add'>+	case RATE_INFO_BW_80:</div><div class='add'>+		return ATH12K_BW_80;</div><div class='add'>+	case RATE_INFO_BW_160:</div><div class='add'>+		return ATH12K_BW_160;</div><div class='add'>+	case RATE_INFO_BW_320:</div><div class='add'>+		return ATH12K_BW_320;</div><div class='add'>+	default:</div><div class='add'>+		return ATH12K_BW_20;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_mac_hw_ratecode_to_legacy_rate(u8 hw_rc, u8 preamble, u8 *rateidx,</div><div class='add'>+					  u16 *rate)</div><div class='add'>+{</div><div class='add'>+	/* As default, it is OFDM rates */</div><div class='add'>+	int i = ATH12K_MAC_FIRST_OFDM_RATE_IDX;</div><div class='add'>+	int max_rates_idx = ath12k_g_rates_size;</div><div class='add'>+</div><div class='add'>+	if (preamble == WMI_RATE_PREAMBLE_CCK) {</div><div class='add'>+		hw_rc &amp;= ~ATH12K_HW_RATECODE_CCK_SHORT_PREAM_MASK;</div><div class='add'>+		i = 0;</div><div class='add'>+		max_rates_idx = ATH12K_MAC_FIRST_OFDM_RATE_IDX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (i &lt; max_rates_idx) {</div><div class='add'>+		if (hw_rc == ath12k_legacy_rates[i].hw_value) {</div><div class='add'>+			*rateidx = i;</div><div class='add'>+			*rate = ath12k_legacy_rates[i].bitrate;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 ath12k_mac_bitrate_to_idx(const struct ieee80211_supported_band *sband,</div><div class='add'>+			     u32 bitrate)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sband-&gt;n_bitrates; i++)</div><div class='add'>+		if (sband-&gt;bitrates[i].bitrate == bitrate)</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+ath12k_mac_max_ht_nss(const u8 *ht_mcs_mask)</div><div class='add'>+{</div><div class='add'>+	int nss;</div><div class='add'>+</div><div class='add'>+	for (nss = IEEE80211_HT_MCS_MASK_LEN - 1; nss &gt;= 0; nss--)</div><div class='add'>+		if (ht_mcs_mask[nss])</div><div class='add'>+			return nss + 1;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+ath12k_mac_max_vht_nss(const u16 *vht_mcs_mask)</div><div class='add'>+{</div><div class='add'>+	int nss;</div><div class='add'>+</div><div class='add'>+	for (nss = NL80211_VHT_NSS_MAX - 1; nss &gt;= 0; nss--)</div><div class='add'>+		if (vht_mcs_mask[nss])</div><div class='add'>+			return nss + 1;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+ath12k_mac_max_he_nss(const u16 he_mcs_mask[NL80211_HE_NSS_MAX])</div><div class='add'>+{</div><div class='add'>+	int nss;</div><div class='add'>+</div><div class='add'>+	for (nss = NL80211_HE_NSS_MAX - 1; nss &gt;= 0; nss--)</div><div class='add'>+		if (he_mcs_mask[nss])</div><div class='add'>+			return nss + 1;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+ath12k_mac_max_eht_nss(const u16 eht_mcs_mask[NL80211_EHT_NSS_MAX])</div><div class='add'>+{</div><div class='add'>+	int nss;</div><div class='add'>+</div><div class='add'>+	for (nss = NL80211_EHT_NSS_MAX - 1; nss &gt;= 0; nss--)</div><div class='add'>+		if (eht_mcs_mask[nss])</div><div class='add'>+			return nss + 1;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+ath12k_mac_max_eht_mcs_nss(const u8 *eht_mcs, int eht_mcs_set_size)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u8 nss = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; eht_mcs_set_size; i++)</div><div class='add'>+		nss = max(nss, u8_get_bits(eht_mcs[i], IEEE80211_EHT_MCS_NSS_RX));</div><div class='add'>+</div><div class='add'>+	return nss;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_parse_mpdudensity(u8 mpdudensity)</div><div class='add'>+{</div><div class='add'>+/*  From IEEE Std 802.11-2020 defined values for "Minimum MPDU Start Spacing":</div><div class='add'>+ *   0 for no restriction</div><div class='add'>+ *   1 for 1/4 us</div><div class='add'>+ *   2 for 1/2 us</div><div class='add'>+ *   3 for 1 us</div><div class='add'>+ *   4 for 2 us</div><div class='add'>+ *   5 for 4 us</div><div class='add'>+ *   6 for 8 us</div><div class='add'>+ *   7 for 16 us</div><div class='add'>+ */</div><div class='add'>+	switch (mpdudensity) {</div><div class='add'>+	case 0:</div><div class='add'>+		return 0;</div><div class='add'>+	case 1:</div><div class='add'>+	case 2:</div><div class='add'>+	case 3:</div><div class='add'>+	/* Our lower layer calculations limit our precision to</div><div class='add'>+	 * 1 microsecond</div><div class='add'>+	 */</div><div class='add'>+		return 1;</div><div class='add'>+	case 4:</div><div class='add'>+		return 2;</div><div class='add'>+	case 5:</div><div class='add'>+		return 4;</div><div class='add'>+	case 6:</div><div class='add'>+		return 8;</div><div class='add'>+	case 7:</div><div class='add'>+		return 16;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_vif_link_chan(struct ieee80211_vif *vif, u8 link_id,</div><div class='add'>+				    struct cfg80211_chan_def *def)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct ieee80211_chanctx_conf *conf;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	link_conf = rcu_dereference(vif-&gt;link_conf[link_id]);</div><div class='add'>+</div><div class='add'>+	if (!link_conf) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return -ENOLINK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conf = rcu_dereference(link_conf-&gt;chanctx_conf);</div><div class='add'>+	if (!conf) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+	*def = conf-&gt;def;</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ath12k_link_vif *</div><div class='add'>+ath12k_mac_get_tx_arvif(struct ath12k_link_vif *arvif,</div><div class='add'>+			struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_bss_conf *tx_bss_conf;</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ath12k_vif *tx_ahvif;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	tx_bss_conf = wiphy_dereference(ath12k_ar_to_hw(ar)-&gt;wiphy,</div><div class='add'>+					link_conf-&gt;tx_bss_conf);</div><div class='add'>+	if (tx_bss_conf) {</div><div class='add'>+		tx_ahvif = ath12k_vif_to_ahvif(tx_bss_conf-&gt;vif);</div><div class='add'>+		return wiphy_dereference(tx_ahvif-&gt;ah-&gt;hw-&gt;wiphy,</div><div class='add'>+					 tx_ahvif-&gt;link[tx_bss_conf-&gt;link_id]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const u8 *ath12k_mac_get_tx_bssid(struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct ath12k_link_vif *tx_arvif;</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	link_conf = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+	if (!link_conf) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "unable to access bss link conf for link %u required to retrieve transmitting link conf\n",</div><div class='add'>+			    arvif-&gt;link_id);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	if (link_conf-&gt;vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='add'>+		if (link_conf-&gt;nontransmitted)</div><div class='add'>+			return link_conf-&gt;transmitter_bssid;</div><div class='add'>+	} else {</div><div class='add'>+		tx_arvif = ath12k_mac_get_tx_arvif(arvif, link_conf);</div><div class='add'>+		if (tx_arvif)</div><div class='add'>+			return tx_arvif-&gt;bssid;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ieee80211_bss_conf *</div><div class='add'>+ath12k_mac_get_link_bss_conf(struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = arvif-&gt;ahvif-&gt;vif;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;link_id &gt;= IEEE80211_MLD_MAX_NUM_LINKS)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	link_conf = wiphy_dereference(ath12k_ar_to_hw(ar)-&gt;wiphy,</div><div class='add'>+				      vif-&gt;link_conf[arvif-&gt;link_id]);</div><div class='add'>+</div><div class='add'>+	return link_conf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ieee80211_link_sta *ath12k_mac_get_link_sta(struct ath12k_link_sta *arsta)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_sta *ahsta = arsta-&gt;ahsta;</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(ahsta);</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ahsta-&gt;ahvif-&gt;ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (arsta-&gt;link_id &gt;= IEEE80211_MLD_MAX_NUM_LINKS)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	link_sta = wiphy_dereference(ahsta-&gt;ahvif-&gt;ah-&gt;hw-&gt;wiphy,</div><div class='add'>+				     sta-&gt;link[arsta-&gt;link_id]);</div><div class='add'>+</div><div class='add'>+	return link_sta;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_mac_bitrate_is_cck(int bitrate)</div><div class='add'>+{</div><div class='add'>+	switch (bitrate) {</div><div class='add'>+	case 10:</div><div class='add'>+	case 20:</div><div class='add'>+	case 55:</div><div class='add'>+	case 110:</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 ath12k_mac_hw_rate_to_idx(const struct ieee80211_supported_band *sband,</div><div class='add'>+			     u8 hw_rate, bool cck)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_rate *rate;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sband-&gt;n_bitrates; i++) {</div><div class='add'>+		rate = &amp;sband-&gt;bitrates[i];</div><div class='add'>+</div><div class='add'>+		if (ath12k_mac_bitrate_is_cck(rate-&gt;bitrate) != cck)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (rate-&gt;hw_value == hw_rate)</div><div class='add'>+			return i;</div><div class='add'>+		else if (rate-&gt;flags &amp; IEEE80211_RATE_SHORT_PREAMBLE &amp;&amp;</div><div class='add'>+			 rate-&gt;hw_value_short == hw_rate)</div><div class='add'>+			return i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_mac_bitrate_to_rate(int bitrate)</div><div class='add'>+{</div><div class='add'>+	return DIV_ROUND_UP(bitrate, 5) |</div><div class='add'>+	       (ath12k_mac_bitrate_is_cck(bitrate) ? BIT(7) : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_get_arvif_iter(void *data, u8 *mac,</div><div class='add'>+				  struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif_iter *arvif_iter = data;</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	unsigned long links_map = ahvif-&gt;links_map;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	u8 link_id;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(link_id, &amp;links_map, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		arvif = rcu_dereference(ahvif-&gt;link[link_id]);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!arvif))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!arvif-&gt;is_created)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (arvif-&gt;vdev_id == arvif_iter-&gt;vdev_id &amp;&amp;</div><div class='add'>+		    arvif-&gt;ar == arvif_iter-&gt;ar) {</div><div class='add'>+			arvif_iter-&gt;arvif = arvif;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ath12k_link_vif *ath12k_mac_get_arvif(struct ath12k *ar, u32 vdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif_iter arvif_iter = {};</div><div class='add'>+	u32 flags;</div><div class='add'>+</div><div class='add'>+	/* To use the arvif returned, caller must have held rcu read lock.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON(!rcu_read_lock_any_held());</div><div class='add'>+	arvif_iter.vdev_id = vdev_id;</div><div class='add'>+	arvif_iter.ar = ar;</div><div class='add'>+</div><div class='add'>+	flags = IEEE80211_IFACE_ITER_RESUME_ALL;</div><div class='add'>+	ieee80211_iterate_active_interfaces_atomic(ath12k_ar_to_hw(ar),</div><div class='add'>+						   flags,</div><div class='add'>+						   ath12k_get_arvif_iter,</div><div class='add'>+						   &amp;arvif_iter);</div><div class='add'>+	if (!arvif_iter.arvif) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "No VIF found for vdev %d\n", vdev_id);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return arvif_iter.arvif;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ath12k_link_vif *ath12k_mac_get_arvif_by_vdev_id(struct ath12k_base *ab,</div><div class='add'>+							u32 vdev_id)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct ath12k_pdev *pdev;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		pdev = rcu_dereference(ab-&gt;pdevs_active[i]);</div><div class='add'>+		if (pdev &amp;&amp; pdev-&gt;ar &amp;&amp;</div><div class='add'>+		    (pdev-&gt;ar-&gt;allocated_vdev_map &amp; (1LL &lt;&lt; vdev_id))) {</div><div class='add'>+			arvif = ath12k_mac_get_arvif(pdev-&gt;ar, vdev_id);</div><div class='add'>+			if (arvif)</div><div class='add'>+				return arvif;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ath12k *ath12k_mac_get_ar_by_vdev_id(struct ath12k_base *ab, u32 vdev_id)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct ath12k_pdev *pdev;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		pdev = rcu_dereference(ab-&gt;pdevs_active[i]);</div><div class='add'>+		if (pdev &amp;&amp; pdev-&gt;ar) {</div><div class='add'>+			if (pdev-&gt;ar-&gt;allocated_vdev_map &amp; (1LL &lt;&lt; vdev_id))</div><div class='add'>+				return pdev-&gt;ar;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ath12k *ath12k_mac_get_ar_by_pdev_id(struct ath12k_base *ab, u32 pdev_id)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct ath12k_pdev *pdev;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;single_pdev_only) {</div><div class='add'>+		pdev = rcu_dereference(ab-&gt;pdevs_active[0]);</div><div class='add'>+		return pdev ? pdev-&gt;ar : NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(pdev_id &gt; ab-&gt;num_radios))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		if (ab-&gt;fw_mode == ATH12K_FIRMWARE_MODE_FTM)</div><div class='add'>+			pdev = &amp;ab-&gt;pdevs[i];</div><div class='add'>+		else</div><div class='add'>+			pdev = rcu_dereference(ab-&gt;pdevs_active[i]);</div><div class='add'>+</div><div class='add'>+		if (pdev &amp;&amp; pdev-&gt;pdev_id == pdev_id)</div><div class='add'>+			return (pdev-&gt;ar ? pdev-&gt;ar : NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_mac_is_ml_arvif(struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ahvif-&gt;ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (ahvif-&gt;vif-&gt;valid_links &amp; BIT(arvif-&gt;link_id))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ath12k *ath12k_mac_get_ar_by_chan(struct ieee80211_hw *hw,</div><div class='add'>+						struct ieee80211_channel *channel)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = hw-&gt;priv;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ar = ah-&gt;radio;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;num_radio == 1)</div><div class='add'>+		return ar;</div><div class='add'>+</div><div class='add'>+	for_each_ar(ah, ar, i) {</div><div class='add'>+		if (channel-&gt;center_freq &gt;= KHZ_TO_MHZ(ar-&gt;freq_range.start_freq) &amp;&amp;</div><div class='add'>+		    channel-&gt;center_freq &lt;= KHZ_TO_MHZ(ar-&gt;freq_range.end_freq))</div><div class='add'>+			return ar;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ath12k *ath12k_get_ar_by_ctx(struct ieee80211_hw *hw,</div><div class='add'>+					   struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return ath12k_mac_get_ar_by_chan(hw, ctx-&gt;def.chan);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ath12k *ath12k_get_ar_by_vif(struct ieee80211_hw *hw,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    u8 link_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* If there is one pdev within ah, then we return</div><div class='add'>+	 * ar directly.</div><div class='add'>+	 */</div><div class='add'>+	if (ah-&gt;num_radio == 1)</div><div class='add'>+		return ah-&gt;radio;</div><div class='add'>+</div><div class='add'>+	if (!(ahvif-&gt;links_map &amp; BIT(link_id)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	arvif = wiphy_dereference(hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+	if (arvif &amp;&amp; arvif-&gt;is_created)</div><div class='add'>+		return arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_mac_get_any_chanctx_conf_iter(struct ieee80211_hw *hw,</div><div class='add'>+					  struct ieee80211_chanctx_conf *conf,</div><div class='add'>+					  void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_mac_get_any_chanctx_conf_arg *arg = data;</div><div class='add'>+	struct ath12k *ctx_ar = ath12k_get_ar_by_ctx(hw, conf);</div><div class='add'>+</div><div class='add'>+	if (ctx_ar == arg-&gt;ar)</div><div class='add'>+		arg-&gt;chanctx_conf = conf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ath12k_link_vif *ath12k_mac_get_vif_up(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+		if (arvif-&gt;is_up)</div><div class='add'>+			return arvif;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_mac_band_match(enum nl80211_band band1, enum WMI_HOST_WLAN_BAND band2)</div><div class='add'>+{</div><div class='add'>+	switch (band1) {</div><div class='add'>+	case NL80211_BAND_2GHZ:</div><div class='add'>+		if (band2 &amp; WMI_HOST_WLAN_2GHZ_CAP)</div><div class='add'>+			return true;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_BAND_5GHZ:</div><div class='add'>+	case NL80211_BAND_6GHZ:</div><div class='add'>+		if (band2 &amp; WMI_HOST_WLAN_5GHZ_CAP)</div><div class='add'>+			return true;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_mac_get_target_pdev_id_from_vif(struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ieee80211_vif *vif = arvif-&gt;ahvif-&gt;vif;</div><div class='add'>+	struct cfg80211_chan_def def;</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	u8 pdev_id = ab-&gt;fw_pdev[0].pdev_id;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ath12k_mac_vif_link_chan(vif, arvif-&gt;link_id, &amp;def)))</div><div class='add'>+		return pdev_id;</div><div class='add'>+</div><div class='add'>+	band = def.chan-&gt;band;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;fw_pdev_count; i++) {</div><div class='add'>+		if (ath12k_mac_band_match(band, ab-&gt;fw_pdev[i].supported_bands))</div><div class='add'>+			return ab-&gt;fw_pdev[i].pdev_id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return pdev_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 ath12k_mac_get_target_pdev_id(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;hw_params-&gt;single_pdev_only)</div><div class='add'>+		return ar-&gt;pdev-&gt;pdev_id;</div><div class='add'>+</div><div class='add'>+	arvif = ath12k_mac_get_vif_up(ar);</div><div class='add'>+</div><div class='add'>+	/* fw_pdev array has pdev ids derived from phy capability</div><div class='add'>+	 * service ready event (pdev_and_hw_link_ids).</div><div class='add'>+	 * If no vif is active, return default first index.</div><div class='add'>+	 */</div><div class='add'>+	if (!arvif)</div><div class='add'>+		return ar-&gt;ab-&gt;fw_pdev[0].pdev_id;</div><div class='add'>+</div><div class='add'>+	/* If active vif is found, return the pdev id matching chandef band */</div><div class='add'>+	return ath12k_mac_get_target_pdev_id_from_vif(arvif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pdev_caps_update(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+</div><div class='add'>+	ar-&gt;max_tx_power = ab-&gt;target_caps.hw_max_tx_power;</div><div class='add'>+</div><div class='add'>+	/* FIXME: Set min_tx_power to ab-&gt;target_caps.hw_min_tx_power.</div><div class='add'>+	 * But since the received value in svcrdy is same as hw_max_tx_power,</div><div class='add'>+	 * we can set ar-&gt;min_tx_power to 0 currently until</div><div class='add'>+	 * this is fixed in firmware</div><div class='add'>+	 */</div><div class='add'>+	ar-&gt;min_tx_power = 0;</div><div class='add'>+</div><div class='add'>+	ar-&gt;txpower_limit_2g = ar-&gt;max_tx_power;</div><div class='add'>+	ar-&gt;txpower_limit_5g = ar-&gt;max_tx_power;</div><div class='add'>+	ar-&gt;txpower_scale = WMI_HOST_TP_SCALE_MAX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_txpower_recalc(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pdev *pdev = ar-&gt;pdev;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	int ret, txpower = -1;</div><div class='add'>+	u32 param;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+		if (arvif-&gt;txpower &lt;= 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (txpower == -1)</div><div class='add'>+			txpower = arvif-&gt;txpower;</div><div class='add'>+		else</div><div class='add'>+			txpower = min(txpower, arvif-&gt;txpower);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (txpower == -1)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* txpwr is set as 2 units per dBm in FW*/</div><div class='add'>+	txpower = min_t(u32, max_t(u32, ar-&gt;min_tx_power, txpower),</div><div class='add'>+			ar-&gt;max_tx_power) * 2;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "txpower to set in hw %d\n",</div><div class='add'>+		   txpower / 2);</div><div class='add'>+</div><div class='add'>+	if ((pdev-&gt;cap.supported_bands &amp; WMI_HOST_WLAN_2GHZ_CAP) &amp;&amp;</div><div class='add'>+	    ar-&gt;txpower_limit_2g != txpower) {</div><div class='add'>+		param = WMI_PDEV_PARAM_TXPOWER_LIMIT2G;</div><div class='add'>+		ret = ath12k_wmi_pdev_set_param(ar, param,</div><div class='add'>+						txpower, ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto fail;</div><div class='add'>+		ar-&gt;txpower_limit_2g = txpower;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((pdev-&gt;cap.supported_bands &amp; WMI_HOST_WLAN_5GHZ_CAP) &amp;&amp;</div><div class='add'>+	    ar-&gt;txpower_limit_5g != txpower) {</div><div class='add'>+		param = WMI_PDEV_PARAM_TXPOWER_LIMIT5G;</div><div class='add'>+		ret = ath12k_wmi_pdev_set_param(ar, param,</div><div class='add'>+						txpower, ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto fail;</div><div class='add'>+		ar-&gt;txpower_limit_5g = txpower;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	ath12k_warn(ar-&gt;ab, "failed to recalc txpower limit %d using pdev param %d: %d\n",</div><div class='add'>+		    txpower / 2, param, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_recalc_rtscts_prot(struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	u32 vdev_param, rts_cts;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	vdev_param = WMI_VDEV_PARAM_ENABLE_RTSCTS;</div><div class='add'>+</div><div class='add'>+	/* Enable RTS/CTS protection for sw retries (when legacy stations</div><div class='add'>+	 * are in BSS) or by default only for second rate series.</div><div class='add'>+	 * TODO: Check if we need to enable CTS 2 Self in any case</div><div class='add'>+	 */</div><div class='add'>+	rts_cts = WMI_USE_RTS_CTS;</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;num_legacy_stations &gt; 0)</div><div class='add'>+		rts_cts |= WMI_RTSCTS_ACROSS_SW_RETRIES &lt;&lt; 4;</div><div class='add'>+	else</div><div class='add'>+		rts_cts |= WMI_RTSCTS_FOR_SECOND_RATESERIES &lt;&lt; 4;</div><div class='add'>+</div><div class='add'>+	/* Need not send duplicate param value to firmware */</div><div class='add'>+	if (arvif-&gt;rtscts_prot_mode == rts_cts)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	arvif-&gt;rtscts_prot_mode = rts_cts;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac vdev %d recalc rts/cts prot %d\n",</div><div class='add'>+		   arvif-&gt;vdev_id, rts_cts);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+					    vdev_param, rts_cts);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to recalculate rts/cts prot for vdev %d: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_set_kickout(struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	u32 param;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_pdev_set_param(ar, WMI_PDEV_PARAM_STA_KICKOUT_TH,</div><div class='add'>+					ATH12K_KICKOUT_THRESHOLD,</div><div class='add'>+					ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set kickout threshold on vdev %i: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	param = WMI_VDEV_PARAM_AP_KEEPALIVE_MIN_IDLE_INACTIVE_TIME_SECS;</div><div class='add'>+	ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id, param,</div><div class='add'>+					    ATH12K_KEEPALIVE_MIN_IDLE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set keepalive minimum idle time on vdev %i: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	param = WMI_VDEV_PARAM_AP_KEEPALIVE_MAX_IDLE_INACTIVE_TIME_SECS;</div><div class='add'>+	ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id, param,</div><div class='add'>+					    ATH12K_KEEPALIVE_MAX_IDLE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set keepalive maximum idle time on vdev %i: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	param = WMI_VDEV_PARAM_AP_KEEPALIVE_MAX_UNRESPONSIVE_TIME_SECS;</div><div class='add'>+	ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id, param,</div><div class='add'>+					    ATH12K_KEEPALIVE_MAX_UNRESPONSIVE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set keepalive maximum unresponsive time on vdev %i: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_mac_peer_cleanup_all(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_peer *peer, *tmp;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	list_for_each_entry_safe(peer, tmp, &amp;ab-&gt;peers, list) {</div><div class='add'>+		/* Skip Rx TID cleanup for self peer */</div><div class='add'>+		if (peer-&gt;sta)</div><div class='add'>+			ath12k_dp_rx_peer_tid_cleanup(ar, peer);</div><div class='add'>+</div><div class='add'>+		list_del(&amp;peer-&gt;list);</div><div class='add'>+		kfree(peer);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	ar-&gt;num_peers = 0;</div><div class='add'>+	ar-&gt;num_stations = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_vdev_setup_sync(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_FLAG_CRASH_FLUSH, &amp;ar-&gt;ab-&gt;dev_flags))</div><div class='add'>+		return -ESHUTDOWN;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "vdev setup timeout %d\n",</div><div class='add'>+		   ATH12K_VDEV_SETUP_TIMEOUT_HZ);</div><div class='add'>+</div><div class='add'>+	if (!wait_for_completion_timeout(&amp;ar-&gt;vdev_setup_done,</div><div class='add'>+					 ATH12K_VDEV_SETUP_TIMEOUT_HZ))</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	return ar-&gt;last_wmi_vdev_start_status ? -EINVAL : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_monitor_vdev_up(struct ath12k *ar, int vdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_vdev_up_params params = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	params.vdev_id = vdev_id;</div><div class='add'>+	params.bssid = ar-&gt;mac_addr;</div><div class='add'>+	ret = ath12k_wmi_vdev_up(ar, &amp;params);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to put up monitor vdev %i: %d\n",</div><div class='add'>+			    vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac monitor vdev %i started\n",</div><div class='add'>+		   vdev_id);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_monitor_vdev_start(struct ath12k *ar, int vdev_id,</div><div class='add'>+					 struct cfg80211_chan_def *chandef)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_channel *channel;</div><div class='add'>+	struct wmi_vdev_start_req_arg arg = {};</div><div class='add'>+	struct ath12k_wmi_vdev_up_params params = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	channel = chandef-&gt;chan;</div><div class='add'>+	arg.vdev_id = vdev_id;</div><div class='add'>+	arg.freq = channel-&gt;center_freq;</div><div class='add'>+	arg.band_center_freq1 = chandef-&gt;center_freq1;</div><div class='add'>+	arg.band_center_freq2 = chandef-&gt;center_freq2;</div><div class='add'>+	arg.mode = ath12k_phymodes[chandef-&gt;chan-&gt;band][chandef-&gt;width];</div><div class='add'>+	arg.chan_radar = !!(channel-&gt;flags &amp; IEEE80211_CHAN_RADAR);</div><div class='add'>+</div><div class='add'>+	arg.min_power = 0;</div><div class='add'>+	arg.max_power = channel-&gt;max_power;</div><div class='add'>+	arg.max_reg_power = channel-&gt;max_reg_power;</div><div class='add'>+	arg.max_antenna_gain = channel-&gt;max_antenna_gain;</div><div class='add'>+</div><div class='add'>+	arg.pref_tx_streams = ar-&gt;num_tx_chains;</div><div class='add'>+	arg.pref_rx_streams = ar-&gt;num_rx_chains;</div><div class='add'>+	arg.punct_bitmap = 0xFFFFFFFF;</div><div class='add'>+</div><div class='add'>+	arg.passive |= !!(chandef-&gt;chan-&gt;flags &amp; IEEE80211_CHAN_NO_IR);</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;ar-&gt;vdev_setup_done);</div><div class='add'>+	reinit_completion(&amp;ar-&gt;vdev_delete_done);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_vdev_start(ar, &amp;arg, false);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to request monitor vdev %i start: %d\n",</div><div class='add'>+			    vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_vdev_setup_sync(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to synchronize setup for monitor vdev %i start: %d\n",</div><div class='add'>+			    vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	params.vdev_id = vdev_id;</div><div class='add'>+	params.bssid = ar-&gt;mac_addr;</div><div class='add'>+	ret = ath12k_wmi_vdev_up(ar, &amp;params);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to put up monitor vdev %i: %d\n",</div><div class='add'>+			    vdev_id, ret);</div><div class='add'>+		goto vdev_stop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac monitor vdev %i started\n",</div><div class='add'>+		   vdev_id);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+vdev_stop:</div><div class='add'>+	ret = ath12k_wmi_vdev_stop(ar, vdev_id);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to stop monitor vdev %i after start failure: %d\n",</div><div class='add'>+			    vdev_id, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_monitor_vdev_stop(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;ar-&gt;vdev_setup_done);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_vdev_stop(ar, ar-&gt;monitor_vdev_id);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to request monitor vdev %i stop: %d\n",</div><div class='add'>+			    ar-&gt;monitor_vdev_id, ret);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_vdev_setup_sync(ar);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to synchronize monitor vdev %i stop: %d\n",</div><div class='add'>+			    ar-&gt;monitor_vdev_id, ret);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_vdev_down(ar, ar-&gt;monitor_vdev_id);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to put down monitor vdev %i: %d\n",</div><div class='add'>+			    ar-&gt;monitor_vdev_id, ret);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac monitor vdev %i stopped\n",</div><div class='add'>+		   ar-&gt;monitor_vdev_id);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_monitor_vdev_delete(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned long time_left;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!ar-&gt;monitor_vdev_created)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;ar-&gt;vdev_delete_done);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_vdev_delete(ar, ar-&gt;monitor_vdev_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to request wmi monitor vdev %i removal: %d\n",</div><div class='add'>+			    ar-&gt;monitor_vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;ar-&gt;vdev_delete_done,</div><div class='add'>+						ATH12K_VDEV_DELETE_TIMEOUT_HZ);</div><div class='add'>+	if (time_left == 0) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "Timeout in receiving vdev delete response\n");</div><div class='add'>+	} else {</div><div class='add'>+		ar-&gt;allocated_vdev_map &amp;= ~(1LL &lt;&lt; ar-&gt;monitor_vdev_id);</div><div class='add'>+		ar-&gt;ab-&gt;free_vdev_map |= 1LL &lt;&lt; (ar-&gt;monitor_vdev_id);</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac monitor vdev %d deleted\n",</div><div class='add'>+			   ar-&gt;monitor_vdev_id);</div><div class='add'>+		ar-&gt;num_created_vdevs--;</div><div class='add'>+		ar-&gt;monitor_vdev_id = -1;</div><div class='add'>+		ar-&gt;monitor_vdev_created = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_monitor_start(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_mac_get_any_chanctx_conf_arg arg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;monitor_started)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	arg.ar = ar;</div><div class='add'>+	arg.chanctx_conf = NULL;</div><div class='add'>+	ieee80211_iter_chan_contexts_atomic(ath12k_ar_to_hw(ar),</div><div class='add'>+					    ath12k_mac_get_any_chanctx_conf_iter,</div><div class='add'>+					    &amp;arg);</div><div class='add'>+	if (!arg.chanctx_conf)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_monitor_vdev_start(ar, ar-&gt;monitor_vdev_id,</div><div class='add'>+					    &amp;arg.chanctx_conf-&gt;def);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to start monitor vdev: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_tx_htt_monitor_mode_ring_config(ar, false);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "fail to set monitor filter: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;monitor_started = true;</div><div class='add'>+	ar-&gt;num_started_vdevs++;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac monitor started\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_monitor_stop(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!ar-&gt;monitor_started)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_monitor_vdev_stop(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to stop monitor vdev: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;monitor_started = false;</div><div class='add'>+	ar-&gt;num_started_vdevs--;</div><div class='add'>+	ret = ath12k_dp_tx_htt_monitor_mode_ring_config(ar, true);</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac monitor stopped ret %d\n", ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_mac_vdev_stop(struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;ar-&gt;vdev_setup_done);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_vdev_stop(ar, arvif-&gt;vdev_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to stop WMI vdev %i: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_vdev_setup_sync(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to synchronize setup for vdev %i: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(ar-&gt;num_started_vdevs == 0);</div><div class='add'>+</div><div class='add'>+	ar-&gt;num_started_vdevs--;</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "vdev %pM stopped, vdev_id %d\n",</div><div class='add'>+		   ahvif-&gt;vif-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_FLAG_CAC_RUNNING, &amp;ar-&gt;dev_flags)) {</div><div class='add'>+		clear_bit(ATH12K_FLAG_CAC_RUNNING, &amp;ar-&gt;dev_flags);</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "CAC Stopped for vdev %d\n",</div><div class='add'>+			   arvif-&gt;vdev_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_op_config(struct ieee80211_hw *hw, int radio_idx, u32 changed)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_setup_bcn_p2p_ie(struct ath12k_link_vif *arvif,</div><div class='add'>+				       struct sk_buff *bcn)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ieee80211_mgmt *mgmt;</div><div class='add'>+	const u8 *p2p_ie;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mgmt = (void *)bcn-&gt;data;</div><div class='add'>+	p2p_ie = cfg80211_find_vendor_ie(WLAN_OUI_WFA, WLAN_OUI_TYPE_WFA_P2P,</div><div class='add'>+					 mgmt-&gt;u.beacon.variable,</div><div class='add'>+					 bcn-&gt;len - (mgmt-&gt;u.beacon.variable -</div><div class='add'>+						     bcn-&gt;data));</div><div class='add'>+	if (!p2p_ie) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "no P2P ie found in beacon\n");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_p2p_go_bcn_ie(ar, arvif-&gt;vdev_id, p2p_ie);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to submit P2P GO bcn ie for vdev %i: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_remove_vendor_ie(struct sk_buff *skb, unsigned int oui,</div><div class='add'>+				       u8 oui_type, size_t ie_offset)</div><div class='add'>+{</div><div class='add'>+	const u8 *next, *end;</div><div class='add'>+	size_t len;</div><div class='add'>+	u8 *ie;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(skb-&gt;len &lt; ie_offset))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ie = (u8 *)cfg80211_find_vendor_ie(oui, oui_type,</div><div class='add'>+					   skb-&gt;data + ie_offset,</div><div class='add'>+					   skb-&gt;len - ie_offset);</div><div class='add'>+	if (!ie)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	len = ie[1] + 2;</div><div class='add'>+	end = skb-&gt;data + skb-&gt;len;</div><div class='add'>+	next = ie + len;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(next &gt; end))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memmove(ie, next, end - next);</div><div class='add'>+	skb_trim(skb, skb-&gt;len - len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_set_arvif_ies(struct ath12k_link_vif *arvif,</div><div class='add'>+				     struct ath12k_link_vif *tx_arvif,</div><div class='add'>+				     struct sk_buff *bcn,</div><div class='add'>+				     u8 bssid_index, bool *nontx_profile_found)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)bcn-&gt;data;</div><div class='add'>+	const struct element *elem, *nontx, *index, *nie, *ext_cap_ie;</div><div class='add'>+	const u8 *start, *tail;</div><div class='add'>+	u16 rem_len;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	start = bcn-&gt;data + ieee80211_get_hdrlen_from_skb(bcn) + sizeof(mgmt-&gt;u.beacon);</div><div class='add'>+	tail = skb_tail_pointer(bcn);</div><div class='add'>+	rem_len = tail - start;</div><div class='add'>+</div><div class='add'>+	arvif-&gt;rsnie_present = false;</div><div class='add'>+	arvif-&gt;wpaie_present = false;</div><div class='add'>+</div><div class='add'>+	if (cfg80211_find_ie(WLAN_EID_RSN, start, rem_len))</div><div class='add'>+		arvif-&gt;rsnie_present = true;</div><div class='add'>+	if (cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT, WLAN_OUI_TYPE_MICROSOFT_WPA,</div><div class='add'>+				    start, rem_len))</div><div class='add'>+		arvif-&gt;wpaie_present = true;</div><div class='add'>+</div><div class='add'>+	ext_cap_ie = cfg80211_find_elem(WLAN_EID_EXT_CAPABILITY, start, rem_len);</div><div class='add'>+	if (ext_cap_ie &amp;&amp; ext_cap_ie-&gt;datalen &gt;= 11 &amp;&amp;</div><div class='add'>+	    (ext_cap_ie-&gt;data[10] &amp; WLAN_EXT_CAPA11_BCN_PROTECT))</div><div class='add'>+		tx_arvif-&gt;beacon_prot = true;</div><div class='add'>+</div><div class='add'>+	/* Return from here for the transmitted profile */</div><div class='add'>+	if (!bssid_index)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Initial rsnie_present for the nontransmitted profile is set to be same as that</div><div class='add'>+	 * of the transmitted profile. It will be changed if security configurations are</div><div class='add'>+	 * different.</div><div class='add'>+	 */</div><div class='add'>+	*nontx_profile_found = false;</div><div class='add'>+	for_each_element_id(elem, WLAN_EID_MULTIPLE_BSSID, start, rem_len) {</div><div class='add'>+		/* Fixed minimum MBSSID element length with at least one</div><div class='add'>+		 * nontransmitted BSSID profile is 12 bytes as given below;</div><div class='add'>+		 * 1 (max BSSID indicator) +</div><div class='add'>+		 * 2 (Nontransmitted BSSID profile: Subelement ID + length) +</div><div class='add'>+		 * 4 (Nontransmitted BSSID Capabilities: tag + length + info)</div><div class='add'>+		 * 2 (Nontransmitted BSSID SSID: tag + length)</div><div class='add'>+		 * 3 (Nontransmitted BSSID Index: tag + length + BSSID index</div><div class='add'>+		 */</div><div class='add'>+		if (elem-&gt;datalen &lt; 12 || elem-&gt;data[0] &lt; 1)</div><div class='add'>+			continue; /* Max BSSID indicator must be &gt;=1 */</div><div class='add'>+</div><div class='add'>+		for_each_element(nontx, elem-&gt;data + 1, elem-&gt;datalen - 1) {</div><div class='add'>+			start = nontx-&gt;data;</div><div class='add'>+</div><div class='add'>+			if (nontx-&gt;id != 0 || nontx-&gt;datalen &lt; 4)</div><div class='add'>+				continue; /* Invalid nontransmitted profile */</div><div class='add'>+</div><div class='add'>+			if (nontx-&gt;data[0] != WLAN_EID_NON_TX_BSSID_CAP ||</div><div class='add'>+			    nontx-&gt;data[1] != 2) {</div><div class='add'>+				continue; /* Missing nontransmitted BSS capabilities */</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (nontx-&gt;data[4] != WLAN_EID_SSID)</div><div class='add'>+				continue; /* Missing SSID for nontransmitted BSS */</div><div class='add'>+</div><div class='add'>+			index = cfg80211_find_elem(WLAN_EID_MULTI_BSSID_IDX,</div><div class='add'>+						   start, nontx-&gt;datalen);</div><div class='add'>+			if (!index || index-&gt;datalen &lt; 1 || index-&gt;data[0] == 0)</div><div class='add'>+				continue; /* Invalid MBSSID Index element */</div><div class='add'>+</div><div class='add'>+			if (index-&gt;data[0] == bssid_index) {</div><div class='add'>+				*nontx_profile_found = true;</div><div class='add'>+</div><div class='add'>+				/* Check if nontx BSS has beacon protection enabled */</div><div class='add'>+				if (!tx_arvif-&gt;beacon_prot) {</div><div class='add'>+					ext_cap_ie =</div><div class='add'>+					    cfg80211_find_elem(WLAN_EID_EXT_CAPABILITY,</div><div class='add'>+							       nontx-&gt;data,</div><div class='add'>+							       nontx-&gt;datalen);</div><div class='add'>+					if (ext_cap_ie &amp;&amp; ext_cap_ie-&gt;datalen &gt;= 11 &amp;&amp;</div><div class='add'>+					    (ext_cap_ie-&gt;data[10] &amp;</div><div class='add'>+					     WLAN_EXT_CAPA11_BCN_PROTECT))</div><div class='add'>+						tx_arvif-&gt;beacon_prot = true;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (cfg80211_find_ie(WLAN_EID_RSN,</div><div class='add'>+						     nontx-&gt;data,</div><div class='add'>+						     nontx-&gt;datalen)) {</div><div class='add'>+					arvif-&gt;rsnie_present = true;</div><div class='add'>+					return;</div><div class='add'>+				} else if (!arvif-&gt;rsnie_present) {</div><div class='add'>+					return; /* Both tx and nontx BSS are open */</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				nie = cfg80211_find_ext_elem(WLAN_EID_EXT_NON_INHERITANCE,</div><div class='add'>+							     nontx-&gt;data,</div><div class='add'>+							     nontx-&gt;datalen);</div><div class='add'>+				if (!nie || nie-&gt;datalen &lt; 2)</div><div class='add'>+					return; /* Invalid non-inheritance element */</div><div class='add'>+</div><div class='add'>+				for (i = 1; i &lt; nie-&gt;datalen - 1; i++) {</div><div class='add'>+					if (nie-&gt;data[i] == WLAN_EID_RSN) {</div><div class='add'>+						arvif-&gt;rsnie_present = false;</div><div class='add'>+						break;</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_setup_bcn_tmpl_ema(struct ath12k_link_vif *arvif,</div><div class='add'>+					 struct ath12k_link_vif *tx_arvif,</div><div class='add'>+					 u8 bssid_index)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_bcn_tmpl_ema_arg ema_args;</div><div class='add'>+	struct ieee80211_ema_beacons *beacons;</div><div class='add'>+	bool nontx_profile_found = false;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	beacons = ieee80211_beacon_get_template_ema_list(ath12k_ar_to_hw(tx_arvif-&gt;ar),</div><div class='add'>+							 tx_arvif-&gt;ahvif-&gt;vif,</div><div class='add'>+							 tx_arvif-&gt;link_id);</div><div class='add'>+	if (!beacons || !beacons-&gt;cnt) {</div><div class='add'>+		ath12k_warn(arvif-&gt;ar-&gt;ab,</div><div class='add'>+			    "failed to get ema beacon templates from mac80211\n");</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tx_arvif == arvif)</div><div class='add'>+		ath12k_mac_set_arvif_ies(arvif, tx_arvif, beacons-&gt;bcn[0].skb, 0, NULL);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; beacons-&gt;cnt; i++) {</div><div class='add'>+		if (tx_arvif != arvif &amp;&amp; !nontx_profile_found)</div><div class='add'>+			ath12k_mac_set_arvif_ies(arvif, tx_arvif, beacons-&gt;bcn[i].skb,</div><div class='add'>+						 bssid_index,</div><div class='add'>+						 &amp;nontx_profile_found);</div><div class='add'>+</div><div class='add'>+		ema_args.bcn_cnt = beacons-&gt;cnt;</div><div class='add'>+		ema_args.bcn_index = i;</div><div class='add'>+		ret = ath12k_wmi_bcn_tmpl(tx_arvif, &amp;beacons-&gt;bcn[i].offs,</div><div class='add'>+					  beacons-&gt;bcn[i].skb, &amp;ema_args);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(tx_arvif-&gt;ar-&gt;ab,</div><div class='add'>+				    "failed to set ema beacon template id %i error %d\n",</div><div class='add'>+				    i, ret);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tx_arvif != arvif &amp;&amp; !nontx_profile_found)</div><div class='add'>+		ath12k_warn(arvif-&gt;ar-&gt;ab,</div><div class='add'>+			    "nontransmitted bssid index %u not found in beacon template\n",</div><div class='add'>+			    bssid_index);</div><div class='add'>+</div><div class='add'>+	ieee80211_beacon_free_ema_list(beacons);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_setup_bcn_tmpl(struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(ahvif);</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct ath12k_link_vif *tx_arvif;</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ieee80211_mutable_offsets offs = {};</div><div class='add'>+	bool nontx_profile_found = false;</div><div class='add'>+	struct sk_buff *bcn;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ahvif-&gt;vdev_type != WMI_VDEV_TYPE_AP)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	link_conf = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+	if (!link_conf) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "unable to access bss link conf to set bcn tmpl for vif %pM link %u\n",</div><div class='add'>+			    vif-&gt;addr, arvif-&gt;link_id);</div><div class='add'>+		return -ENOLINK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tx_arvif = ath12k_mac_get_tx_arvif(arvif, link_conf);</div><div class='add'>+	if (tx_arvif) {</div><div class='add'>+		if (tx_arvif != arvif &amp;&amp; arvif-&gt;is_up)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		if (link_conf-&gt;ema_ap)</div><div class='add'>+			return ath12k_mac_setup_bcn_tmpl_ema(arvif, tx_arvif,</div><div class='add'>+							     link_conf-&gt;bssid_index);</div><div class='add'>+	} else {</div><div class='add'>+		tx_arvif = arvif;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bcn = ieee80211_beacon_get_template(ath12k_ar_to_hw(tx_arvif-&gt;ar),</div><div class='add'>+					    tx_arvif-&gt;ahvif-&gt;vif,</div><div class='add'>+					    &amp;offs, tx_arvif-&gt;link_id);</div><div class='add'>+	if (!bcn) {</div><div class='add'>+		ath12k_warn(ab, "failed to get beacon template from mac80211\n");</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tx_arvif == arvif) {</div><div class='add'>+		ath12k_mac_set_arvif_ies(arvif, tx_arvif, bcn, 0, NULL);</div><div class='add'>+	} else {</div><div class='add'>+		ath12k_mac_set_arvif_ies(arvif, tx_arvif, bcn,</div><div class='add'>+					 link_conf-&gt;bssid_index,</div><div class='add'>+					 &amp;nontx_profile_found);</div><div class='add'>+		if (!nontx_profile_found)</div><div class='add'>+			ath12k_warn(ab,</div><div class='add'>+				    "nontransmitted profile not found in beacon template\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ahvif-&gt;vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp; ahvif-&gt;vif-&gt;p2p) {</div><div class='add'>+		ret = ath12k_mac_setup_bcn_p2p_ie(arvif, bcn);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to setup P2P GO bcn ie: %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+			goto free_bcn_skb;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* P2P IE is inserted by firmware automatically (as</div><div class='add'>+		 * configured above) so remove it from the base beacon</div><div class='add'>+		 * template to avoid duplicate P2P IEs in beacon frames.</div><div class='add'>+		 */</div><div class='add'>+		ret = ath12k_mac_remove_vendor_ie(bcn, WLAN_OUI_WFA,</div><div class='add'>+						  WLAN_OUI_TYPE_WFA_P2P,</div><div class='add'>+						  offsetof(struct ieee80211_mgmt,</div><div class='add'>+							   u.beacon.variable));</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to remove P2P vendor ie: %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+			goto free_bcn_skb;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_bcn_tmpl(arvif, &amp;offs, bcn, NULL);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ab, "failed to submit beacon template command: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+</div><div class='add'>+free_bcn_skb:</div><div class='add'>+	kfree_skb(bcn);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_control_beaconing(struct ath12k_link_vif *arvif,</div><div class='add'>+				     struct ieee80211_bss_conf *info)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_vdev_up_params params = {};</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(arvif-&gt;ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;enable_beacon) {</div><div class='add'>+		ret = ath12k_wmi_vdev_down(ar, arvif-&gt;vdev_id);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to down vdev_id %i: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+</div><div class='add'>+		arvif-&gt;is_up = false;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Install the beacon template to the FW */</div><div class='add'>+	ret = ath12k_mac_setup_bcn_tmpl(arvif);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to update bcn tmpl during vdev up: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ahvif-&gt;aid = 0;</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(arvif-&gt;bssid, info-&gt;addr);</div><div class='add'>+</div><div class='add'>+	params.vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+	params.aid = ahvif-&gt;aid;</div><div class='add'>+	params.bssid = arvif-&gt;bssid;</div><div class='add'>+	params.tx_bssid = ath12k_mac_get_tx_bssid(arvif);</div><div class='add'>+	if (params.tx_bssid) {</div><div class='add'>+		params.nontx_profile_idx = info-&gt;bssid_index;</div><div class='add'>+		params.nontx_profile_cnt = 1 &lt;&lt; info-&gt;bssid_indicator;</div><div class='add'>+	}</div><div class='add'>+	ret = ath12k_wmi_vdev_up(arvif-&gt;ar, &amp;params);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to bring up vdev %d: %i\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arvif-&gt;is_up = true;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac vdev %d up\n", arvif-&gt;vdev_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_handle_beacon_iter(void *data, u8 *mac,</div><div class='add'>+					  struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb = data;</div><div class='add'>+	struct ieee80211_mgmt *mgmt = (void *)skb-&gt;data;</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_link_vif *arvif = &amp;ahvif-&gt;deflink;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION || !arvif-&gt;is_created)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!ether_addr_equal(mgmt-&gt;bssid, vif-&gt;bss_conf.bssid))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work(&amp;arvif-&gt;connection_loss_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_mac_handle_beacon(struct ath12k *ar, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	ieee80211_iterate_active_interfaces_atomic(ath12k_ar_to_hw(ar),</div><div class='add'>+						   IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						   ath12k_mac_handle_beacon_iter,</div><div class='add'>+						   skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_mac_handle_beacon_miss(struct ath12k *ar,</div><div class='add'>+				   struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = ath12k_ar_to_hw(ar);</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+</div><div class='add'>+	if (!(arvif-&gt;is_created &amp;&amp; arvif-&gt;is_up))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ieee80211_beacon_loss(vif);</div><div class='add'>+</div><div class='add'>+	/* Firmware doesn't report beacon loss events repeatedly. If AP probe</div><div class='add'>+	 * (done by mac80211) succeeds but beacons do not resume then it</div><div class='add'>+	 * doesn't make sense to continue operation. Queue connection loss work</div><div class='add'>+	 * which can be cancelled when beacon is received.</div><div class='add'>+	 */</div><div class='add'>+	ieee80211_queue_delayed_work(hw, &amp;arvif-&gt;connection_loss_work,</div><div class='add'>+				     ATH12K_CONNECTION_LOSS_HZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_vif_sta_connection_loss_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_link_vif *arvif = container_of(work, struct ath12k_link_vif,</div><div class='add'>+						     connection_loss_work.work);</div><div class='add'>+	struct ieee80211_vif *vif = arvif-&gt;ahvif-&gt;vif;</div><div class='add'>+</div><div class='add'>+	if (!arvif-&gt;is_up)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ieee80211_connection_loss(vif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_peer_assoc_h_basic(struct ath12k *ar,</div><div class='add'>+				      struct ath12k_link_vif *arvif,</div><div class='add'>+				      struct ath12k_link_sta *arsta,</div><div class='add'>+				      struct ath12k_wmi_peer_assoc_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta-&gt;ahsta);</div><div class='add'>+	struct ieee80211_hw *hw = ath12k_ar_to_hw(ar);</div><div class='add'>+	struct ieee80211_bss_conf *bss_conf;</div><div class='add'>+	u32 aid;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+		aid = vif-&gt;cfg.aid;</div><div class='add'>+	else</div><div class='add'>+		aid = sta-&gt;aid;</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(arg-&gt;peer_mac, arsta-&gt;addr);</div><div class='add'>+	arg-&gt;vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+	arg-&gt;peer_associd = aid;</div><div class='add'>+	arg-&gt;auth_flag = true;</div><div class='add'>+	/* TODO: STA WAR in ath10k for listen interval required? */</div><div class='add'>+	arg-&gt;peer_listen_intval = hw-&gt;conf.listen_interval;</div><div class='add'>+	arg-&gt;peer_nss = 1;</div><div class='add'>+</div><div class='add'>+	bss_conf = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+	if (!bss_conf) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "unable to access bss link conf in peer assoc for vif %pM link %u\n",</div><div class='add'>+			    vif-&gt;addr, arvif-&gt;link_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arg-&gt;peer_caps = bss_conf-&gt;assoc_capability;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_peer_assoc_h_crypto(struct ath12k *ar,</div><div class='add'>+				       struct ath12k_link_vif *arvif,</div><div class='add'>+				       struct ath12k_link_sta *arsta,</div><div class='add'>+				       struct ath12k_wmi_peer_assoc_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta-&gt;ahsta);</div><div class='add'>+	struct ieee80211_bss_conf *info;</div><div class='add'>+	struct cfg80211_chan_def def;</div><div class='add'>+	struct cfg80211_bss *bss;</div><div class='add'>+	struct ieee80211_hw *hw = ath12k_ar_to_hw(ar);</div><div class='add'>+	const u8 *rsnie = NULL;</div><div class='add'>+	const u8 *wpaie = NULL;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	info = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+	if (!info) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "unable to access bss link conf for peer assoc crypto for vif %pM link %u\n",</div><div class='add'>+			    vif-&gt;addr, arvif-&gt;link_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ath12k_mac_vif_link_chan(vif, arvif-&gt;link_id, &amp;def)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bss = cfg80211_get_bss(hw-&gt;wiphy, def.chan, info-&gt;bssid, NULL, 0,</div><div class='add'>+			       IEEE80211_BSS_TYPE_ANY, IEEE80211_PRIVACY_ANY);</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;rsnie_present || arvif-&gt;wpaie_present) {</div><div class='add'>+		arg-&gt;need_ptk_4_way = true;</div><div class='add'>+		if (arvif-&gt;wpaie_present)</div><div class='add'>+			arg-&gt;need_gtk_2_way = true;</div><div class='add'>+	} else if (bss) {</div><div class='add'>+		const struct cfg80211_bss_ies *ies;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		rsnie = ieee80211_bss_get_ie(bss, WLAN_EID_RSN);</div><div class='add'>+</div><div class='add'>+		ies = rcu_dereference(bss-&gt;ies);</div><div class='add'>+</div><div class='add'>+		wpaie = cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT,</div><div class='add'>+						WLAN_OUI_TYPE_MICROSOFT_WPA,</div><div class='add'>+						ies-&gt;data,</div><div class='add'>+						ies-&gt;len);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		cfg80211_put_bss(hw-&gt;wiphy, bss);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* FIXME: base on RSN IE/WPA IE is a correct idea? */</div><div class='add'>+	if (rsnie || wpaie) {</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+			   "%s: rsn ie found\n", __func__);</div><div class='add'>+		arg-&gt;need_ptk_4_way = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wpaie) {</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+			   "%s: wpa ie found\n", __func__);</div><div class='add'>+		arg-&gt;need_gtk_2_way = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;mfp) {</div><div class='add'>+		/* TODO: Need to check if FW supports PMF? */</div><div class='add'>+		arg-&gt;is_pmf_enabled = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TODO: safe_mode_enabled (bypass 4-way handshake) flag req? */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_peer_assoc_h_rates(struct ath12k *ar,</div><div class='add'>+				      struct ath12k_link_vif *arvif,</div><div class='add'>+				      struct ath12k_link_sta *arsta,</div><div class='add'>+				      struct ath12k_wmi_peer_assoc_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta-&gt;ahsta);</div><div class='add'>+	struct wmi_rate_set_arg *rateset = &amp;arg-&gt;peer_legacy_rates;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	struct cfg80211_chan_def def;</div><div class='add'>+	const struct ieee80211_supported_band *sband;</div><div class='add'>+	const struct ieee80211_rate *rates;</div><div class='add'>+	struct ieee80211_hw *hw = ath12k_ar_to_hw(ar);</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	u32 ratemask;</div><div class='add'>+	u8 rate;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ath12k_mac_vif_link_chan(vif, arvif-&gt;link_id, &amp;def)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	link_sta = ath12k_mac_get_link_sta(arsta);</div><div class='add'>+	if (!link_sta) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "unable to access link sta in peer assoc rates for sta %pM link %u\n",</div><div class='add'>+			    sta-&gt;addr, arsta-&gt;link_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	band = def.chan-&gt;band;</div><div class='add'>+	sband = hw-&gt;wiphy-&gt;bands[band];</div><div class='add'>+	ratemask = link_sta-&gt;supp_rates[band];</div><div class='add'>+	ratemask &amp;= arvif-&gt;bitrate_mask.control[band].legacy;</div><div class='add'>+	rates = sband-&gt;bitrates;</div><div class='add'>+</div><div class='add'>+	rateset-&gt;num_rates = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 32; i++, ratemask &gt;&gt;= 1, rates++) {</div><div class='add'>+		if (!(ratemask &amp; 1))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		rate = ath12k_mac_bitrate_to_rate(rates-&gt;bitrate);</div><div class='add'>+		rateset-&gt;rates[rateset-&gt;num_rates] = rate;</div><div class='add'>+		rateset-&gt;num_rates++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+ath12k_peer_assoc_h_ht_masked(const u8 *ht_mcs_mask)</div><div class='add'>+{</div><div class='add'>+	int nss;</div><div class='add'>+</div><div class='add'>+	for (nss = 0; nss &lt; IEEE80211_HT_MCS_MASK_LEN; nss++)</div><div class='add'>+		if (ht_mcs_mask[nss])</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+ath12k_peer_assoc_h_vht_masked(const u16 *vht_mcs_mask)</div><div class='add'>+{</div><div class='add'>+	int nss;</div><div class='add'>+</div><div class='add'>+	for (nss = 0; nss &lt; NL80211_VHT_NSS_MAX; nss++)</div><div class='add'>+		if (vht_mcs_mask[nss])</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_peer_assoc_h_ht(struct ath12k *ar,</div><div class='add'>+				   struct ath12k_link_vif *arvif,</div><div class='add'>+				   struct ath12k_link_sta *arsta,</div><div class='add'>+				   struct ath12k_wmi_peer_assoc_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta-&gt;ahsta);</div><div class='add'>+	const struct ieee80211_sta_ht_cap *ht_cap;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	struct cfg80211_chan_def def;</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	const u8 *ht_mcs_mask;</div><div class='add'>+	int i, n;</div><div class='add'>+	u8 max_nss;</div><div class='add'>+	u32 stbc;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ath12k_mac_vif_link_chan(vif, arvif-&gt;link_id, &amp;def)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	link_sta = ath12k_mac_get_link_sta(arsta);</div><div class='add'>+	if (!link_sta) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "unable to access link sta in peer assoc ht for sta %pM link %u\n",</div><div class='add'>+			    sta-&gt;addr, arsta-&gt;link_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ht_cap = &amp;link_sta-&gt;ht_cap;</div><div class='add'>+	if (!ht_cap-&gt;ht_supported)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	band = def.chan-&gt;band;</div><div class='add'>+	ht_mcs_mask = arvif-&gt;bitrate_mask.control[band].ht_mcs;</div><div class='add'>+</div><div class='add'>+	if (ath12k_peer_assoc_h_ht_masked(ht_mcs_mask))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	arg-&gt;ht_flag = true;</div><div class='add'>+</div><div class='add'>+	arg-&gt;peer_max_mpdu = (1 &lt;&lt; (IEEE80211_HT_MAX_AMPDU_FACTOR +</div><div class='add'>+				    ht_cap-&gt;ampdu_factor)) - 1;</div><div class='add'>+</div><div class='add'>+	arg-&gt;peer_mpdu_density =</div><div class='add'>+		ath12k_parse_mpdudensity(ht_cap-&gt;ampdu_density);</div><div class='add'>+</div><div class='add'>+	arg-&gt;peer_ht_caps = ht_cap-&gt;cap;</div><div class='add'>+	arg-&gt;peer_rate_caps |= WMI_HOST_RC_HT_FLAG;</div><div class='add'>+</div><div class='add'>+	if (ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_LDPC_CODING)</div><div class='add'>+		arg-&gt;ldpc_flag = true;</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;bandwidth &gt;= IEEE80211_STA_RX_BW_40) {</div><div class='add'>+		arg-&gt;bw_40 = true;</div><div class='add'>+		arg-&gt;peer_rate_caps |= WMI_HOST_RC_CW40_FLAG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* As firmware handles these two flags (IEEE80211_HT_CAP_SGI_20</div><div class='add'>+	 * and IEEE80211_HT_CAP_SGI_40) for enabling SGI, reset both</div><div class='add'>+	 * flags if guard interval is to force Long GI</div><div class='add'>+	 */</div><div class='add'>+	if (arvif-&gt;bitrate_mask.control[band].gi == NL80211_TXRATE_FORCE_LGI) {</div><div class='add'>+		arg-&gt;peer_ht_caps &amp;= ~(IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_SGI_40);</div><div class='add'>+	} else {</div><div class='add'>+		/* Enable SGI flag if either SGI_20 or SGI_40 is supported */</div><div class='add'>+		if (ht_cap-&gt;cap &amp; (IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_SGI_40))</div><div class='add'>+			arg-&gt;peer_rate_caps |= WMI_HOST_RC_SGI_FLAG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_TX_STBC) {</div><div class='add'>+		arg-&gt;peer_rate_caps |= WMI_HOST_RC_TX_STBC_FLAG;</div><div class='add'>+		arg-&gt;stbc_flag = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_RX_STBC) {</div><div class='add'>+		stbc = ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_RX_STBC;</div><div class='add'>+		stbc = stbc &gt;&gt; IEEE80211_HT_CAP_RX_STBC_SHIFT;</div><div class='add'>+		stbc = stbc &lt;&lt; WMI_HOST_RC_RX_STBC_FLAG_S;</div><div class='add'>+		arg-&gt;peer_rate_caps |= stbc;</div><div class='add'>+		arg-&gt;stbc_flag = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ht_cap-&gt;mcs.rx_mask[1] &amp;&amp; ht_cap-&gt;mcs.rx_mask[2])</div><div class='add'>+		arg-&gt;peer_rate_caps |= WMI_HOST_RC_TS_FLAG;</div><div class='add'>+	else if (ht_cap-&gt;mcs.rx_mask[1])</div><div class='add'>+		arg-&gt;peer_rate_caps |= WMI_HOST_RC_DS_FLAG;</div><div class='add'>+</div><div class='add'>+	for (i = 0, n = 0, max_nss = 0; i &lt; IEEE80211_HT_MCS_MASK_LEN * 8; i++)</div><div class='add'>+		if ((ht_cap-&gt;mcs.rx_mask[i / 8] &amp; BIT(i % 8)) &amp;&amp;</div><div class='add'>+		    (ht_mcs_mask[i / 8] &amp; BIT(i % 8))) {</div><div class='add'>+			max_nss = (i / 8) + 1;</div><div class='add'>+			arg-&gt;peer_ht_rates.rates[n++] = i;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	/* This is a workaround for HT-enabled STAs which break the spec</div><div class='add'>+	 * and have no HT capabilities RX mask (no HT RX MCS map).</div><div class='add'>+	 *</div><div class='add'>+	 * As per spec, in section 20.3.5 Modulation and coding scheme (MCS),</div><div class='add'>+	 * MCS 0 through 7 are mandatory in 20MHz with 800 ns GI at all STAs.</div><div class='add'>+	 *</div><div class='add'>+	 * Firmware asserts if such situation occurs.</div><div class='add'>+	 */</div><div class='add'>+	if (n == 0) {</div><div class='add'>+		arg-&gt;peer_ht_rates.num_rates = 8;</div><div class='add'>+		for (i = 0; i &lt; arg-&gt;peer_ht_rates.num_rates; i++)</div><div class='add'>+			arg-&gt;peer_ht_rates.rates[i] = i;</div><div class='add'>+	} else {</div><div class='add'>+		arg-&gt;peer_ht_rates.num_rates = n;</div><div class='add'>+		arg-&gt;peer_nss = min(link_sta-&gt;rx_nss, max_nss);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac ht peer %pM mcs cnt %d nss %d\n",</div><div class='add'>+		   arg-&gt;peer_mac,</div><div class='add'>+		   arg-&gt;peer_ht_rates.num_rates,</div><div class='add'>+		   arg-&gt;peer_nss);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_get_max_vht_mcs_map(u16 mcs_map, int nss)</div><div class='add'>+{</div><div class='add'>+	switch ((mcs_map &gt;&gt; (2 * nss)) &amp; 0x3) {</div><div class='add'>+	case IEEE80211_VHT_MCS_SUPPORT_0_7: return BIT(8) - 1;</div><div class='add'>+	case IEEE80211_VHT_MCS_SUPPORT_0_8: return BIT(9) - 1;</div><div class='add'>+	case IEEE80211_VHT_MCS_SUPPORT_0_9: return BIT(10) - 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16</div><div class='add'>+ath12k_peer_assoc_h_vht_limit(u16 tx_mcs_set,</div><div class='add'>+			      const u16 vht_mcs_limit[NL80211_VHT_NSS_MAX])</div><div class='add'>+{</div><div class='add'>+	int idx_limit;</div><div class='add'>+	int nss;</div><div class='add'>+	u16 mcs_map;</div><div class='add'>+	u16 mcs;</div><div class='add'>+</div><div class='add'>+	for (nss = 0; nss &lt; NL80211_VHT_NSS_MAX; nss++) {</div><div class='add'>+		mcs_map = ath12k_mac_get_max_vht_mcs_map(tx_mcs_set, nss) &amp;</div><div class='add'>+			  vht_mcs_limit[nss];</div><div class='add'>+</div><div class='add'>+		if (mcs_map)</div><div class='add'>+			idx_limit = fls(mcs_map) - 1;</div><div class='add'>+		else</div><div class='add'>+			idx_limit = -1;</div><div class='add'>+</div><div class='add'>+		switch (idx_limit) {</div><div class='add'>+		case 0:</div><div class='add'>+		case 1:</div><div class='add'>+		case 2:</div><div class='add'>+		case 3:</div><div class='add'>+		case 4:</div><div class='add'>+		case 5:</div><div class='add'>+		case 6:</div><div class='add'>+		case 7:</div><div class='add'>+			mcs = IEEE80211_VHT_MCS_SUPPORT_0_7;</div><div class='add'>+			break;</div><div class='add'>+		case 8:</div><div class='add'>+			mcs = IEEE80211_VHT_MCS_SUPPORT_0_8;</div><div class='add'>+			break;</div><div class='add'>+		case 9:</div><div class='add'>+			mcs = IEEE80211_VHT_MCS_SUPPORT_0_9;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			WARN_ON(1);</div><div class='add'>+			fallthrough;</div><div class='add'>+		case -1:</div><div class='add'>+			mcs = IEEE80211_VHT_MCS_NOT_SUPPORTED;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tx_mcs_set &amp;= ~(0x3 &lt;&lt; (nss * 2));</div><div class='add'>+		tx_mcs_set |= mcs &lt;&lt; (nss * 2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return tx_mcs_set;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_get_nss_160mhz(struct ath12k *ar,</div><div class='add'>+				u8 max_nss)</div><div class='add'>+{</div><div class='add'>+	u8 nss_ratio_info = ar-&gt;pdev-&gt;cap.nss_ratio_info;</div><div class='add'>+	u8 max_sup_nss = 0;</div><div class='add'>+</div><div class='add'>+	switch (nss_ratio_info) {</div><div class='add'>+	case WMI_NSS_RATIO_1BY2_NSS:</div><div class='add'>+		max_sup_nss = max_nss &gt;&gt; 1;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_NSS_RATIO_3BY4_NSS:</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "WMI_NSS_RATIO_3BY4_NSS not supported\n");</div><div class='add'>+		break;</div><div class='add'>+	case WMI_NSS_RATIO_1_NSS:</div><div class='add'>+		max_sup_nss = max_nss;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_NSS_RATIO_2_NSS:</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "WMI_NSS_RATIO_2_NSS not supported\n");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "invalid nss ratio received from fw: %d\n",</div><div class='add'>+			    nss_ratio_info);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return max_sup_nss;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_peer_assoc_h_vht(struct ath12k *ar,</div><div class='add'>+				    struct ath12k_link_vif *arvif,</div><div class='add'>+				    struct ath12k_link_sta *arsta,</div><div class='add'>+				    struct ath12k_wmi_peer_assoc_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta-&gt;ahsta);</div><div class='add'>+	const struct ieee80211_sta_vht_cap *vht_cap;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	struct cfg80211_chan_def def;</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	u16 *vht_mcs_mask;</div><div class='add'>+	u8 ampdu_factor;</div><div class='add'>+	u8 max_nss, vht_mcs;</div><div class='add'>+	int i, vht_nss, nss_idx;</div><div class='add'>+	bool user_rate_valid = true;</div><div class='add'>+	u32 rx_nss, tx_nss, nss_160;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ath12k_mac_vif_link_chan(vif, arvif-&gt;link_id, &amp;def)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	link_sta = ath12k_mac_get_link_sta(arsta);</div><div class='add'>+	if (!link_sta) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "unable to access link sta in peer assoc vht for sta %pM link %u\n",</div><div class='add'>+			    sta-&gt;addr, arsta-&gt;link_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vht_cap = &amp;link_sta-&gt;vht_cap;</div><div class='add'>+	if (!vht_cap-&gt;vht_supported)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	band = def.chan-&gt;band;</div><div class='add'>+	vht_mcs_mask = arvif-&gt;bitrate_mask.control[band].vht_mcs;</div><div class='add'>+</div><div class='add'>+	if (ath12k_peer_assoc_h_vht_masked(vht_mcs_mask))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	arg-&gt;vht_flag = true;</div><div class='add'>+</div><div class='add'>+	/* TODO: similar flags required? */</div><div class='add'>+	arg-&gt;vht_capable = true;</div><div class='add'>+</div><div class='add'>+	if (def.chan-&gt;band == NL80211_BAND_2GHZ)</div><div class='add'>+		arg-&gt;vht_ng_flag = true;</div><div class='add'>+</div><div class='add'>+	arg-&gt;peer_vht_caps = vht_cap-&gt;cap;</div><div class='add'>+</div><div class='add'>+	ampdu_factor = (vht_cap-&gt;cap &amp;</div><div class='add'>+			IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK) &gt;&gt;</div><div class='add'>+		       IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT;</div><div class='add'>+</div><div class='add'>+	/* Workaround: Some Netgear/Linksys 11ac APs set Rx A-MPDU factor to</div><div class='add'>+	 * zero in VHT IE. Using it would result in degraded throughput.</div><div class='add'>+	 * arg-&gt;peer_max_mpdu at this point contains HT max_mpdu so keep</div><div class='add'>+	 * it if VHT max_mpdu is smaller.</div><div class='add'>+	 */</div><div class='add'>+	arg-&gt;peer_max_mpdu = max(arg-&gt;peer_max_mpdu,</div><div class='add'>+				 (1U &lt;&lt; (IEEE80211_HT_MAX_AMPDU_FACTOR +</div><div class='add'>+					ampdu_factor)) - 1);</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_80)</div><div class='add'>+		arg-&gt;bw_80 = true;</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_160)</div><div class='add'>+		arg-&gt;bw_160 = true;</div><div class='add'>+</div><div class='add'>+	vht_nss =  ath12k_mac_max_vht_nss(vht_mcs_mask);</div><div class='add'>+</div><div class='add'>+	if (vht_nss &gt; link_sta-&gt;rx_nss) {</div><div class='add'>+		user_rate_valid = false;</div><div class='add'>+		for (nss_idx = link_sta-&gt;rx_nss - 1; nss_idx &gt;= 0; nss_idx--) {</div><div class='add'>+			if (vht_mcs_mask[nss_idx]) {</div><div class='add'>+				user_rate_valid = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!user_rate_valid) {</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+			   "Setting vht range MCS value to peer supported nss:%d for peer %pM\n",</div><div class='add'>+			   link_sta-&gt;rx_nss, arsta-&gt;addr);</div><div class='add'>+		vht_mcs_mask[link_sta-&gt;rx_nss - 1] = vht_mcs_mask[vht_nss - 1];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Calculate peer NSS capability from VHT capabilities if STA</div><div class='add'>+	 * supports VHT.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0, max_nss = 0, vht_mcs = 0; i &lt; NL80211_VHT_NSS_MAX; i++) {</div><div class='add'>+		vht_mcs = __le16_to_cpu(vht_cap-&gt;vht_mcs.rx_mcs_map) &gt;&gt;</div><div class='add'>+			  (2 * i) &amp; 3;</div><div class='add'>+</div><div class='add'>+		if (vht_mcs != IEEE80211_VHT_MCS_NOT_SUPPORTED &amp;&amp;</div><div class='add'>+		    vht_mcs_mask[i])</div><div class='add'>+			max_nss = i + 1;</div><div class='add'>+	}</div><div class='add'>+	arg-&gt;peer_nss = min(link_sta-&gt;rx_nss, max_nss);</div><div class='add'>+	arg-&gt;rx_max_rate = __le16_to_cpu(vht_cap-&gt;vht_mcs.rx_highest);</div><div class='add'>+	arg-&gt;rx_mcs_set = __le16_to_cpu(vht_cap-&gt;vht_mcs.rx_mcs_map);</div><div class='add'>+	arg-&gt;rx_mcs_set = ath12k_peer_assoc_h_vht_limit(arg-&gt;rx_mcs_set, vht_mcs_mask);</div><div class='add'>+</div><div class='add'>+	arg-&gt;tx_max_rate = __le16_to_cpu(vht_cap-&gt;vht_mcs.tx_highest);</div><div class='add'>+	arg-&gt;tx_mcs_set = __le16_to_cpu(vht_cap-&gt;vht_mcs.tx_mcs_map);</div><div class='add'>+</div><div class='add'>+	/* In QCN9274 platform, VHT MCS rate 10 and 11 is enabled by default.</div><div class='add'>+	 * VHT MCS rate 10 and 11 is not supported in 11ac standard.</div><div class='add'>+	 * so explicitly disable the VHT MCS rate 10 and 11 in 11ac mode.</div><div class='add'>+	 */</div><div class='add'>+	arg-&gt;tx_mcs_set &amp;= ~IEEE80211_VHT_MCS_SUPPORT_0_11_MASK;</div><div class='add'>+	arg-&gt;tx_mcs_set |= IEEE80211_DISABLE_VHT_MCS_SUPPORT_0_11;</div><div class='add'>+</div><div class='add'>+	if ((arg-&gt;tx_mcs_set &amp; IEEE80211_VHT_MCS_NOT_SUPPORTED) ==</div><div class='add'>+			IEEE80211_VHT_MCS_NOT_SUPPORTED)</div><div class='add'>+		arg-&gt;peer_vht_caps &amp;= ~IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE;</div><div class='add'>+</div><div class='add'>+	/* TODO:  Check */</div><div class='add'>+	arg-&gt;tx_max_mcs_nss = 0xFF;</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;peer_phymode == MODE_11AC_VHT160) {</div><div class='add'>+		tx_nss = ath12k_get_nss_160mhz(ar, max_nss);</div><div class='add'>+		rx_nss = min(arg-&gt;peer_nss, tx_nss);</div><div class='add'>+		arg-&gt;peer_bw_rxnss_override = ATH12K_BW_NSS_MAP_ENABLE;</div><div class='add'>+</div><div class='add'>+		if (!rx_nss) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "invalid max_nss\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nss_160 = u32_encode_bits(rx_nss - 1, ATH12K_PEER_RX_NSS_160MHZ);</div><div class='add'>+		arg-&gt;peer_bw_rxnss_override |= nss_160;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "mac vht peer %pM max_mpdu %d flags 0x%x nss_override 0x%x\n",</div><div class='add'>+		   arsta-&gt;addr, arg-&gt;peer_max_mpdu, arg-&gt;peer_flags,</div><div class='add'>+		   arg-&gt;peer_bw_rxnss_override);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_get_max_he_mcs_map(u16 mcs_map, int nss)</div><div class='add'>+{</div><div class='add'>+	switch ((mcs_map &gt;&gt; (2 * nss)) &amp; 0x3) {</div><div class='add'>+	case IEEE80211_HE_MCS_SUPPORT_0_7: return BIT(8) - 1;</div><div class='add'>+	case IEEE80211_HE_MCS_SUPPORT_0_9: return BIT(10) - 1;</div><div class='add'>+	case IEEE80211_HE_MCS_SUPPORT_0_11: return BIT(12) - 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath12k_peer_assoc_h_he_limit(u16 tx_mcs_set,</div><div class='add'>+					const u16 *he_mcs_limit)</div><div class='add'>+{</div><div class='add'>+	int idx_limit;</div><div class='add'>+	int nss;</div><div class='add'>+	u16 mcs_map;</div><div class='add'>+	u16 mcs;</div><div class='add'>+</div><div class='add'>+	for (nss = 0; nss &lt; NL80211_HE_NSS_MAX; nss++) {</div><div class='add'>+		mcs_map = ath12k_mac_get_max_he_mcs_map(tx_mcs_set, nss) &amp;</div><div class='add'>+			he_mcs_limit[nss];</div><div class='add'>+</div><div class='add'>+		if (mcs_map)</div><div class='add'>+			idx_limit = fls(mcs_map) - 1;</div><div class='add'>+		else</div><div class='add'>+			idx_limit = -1;</div><div class='add'>+</div><div class='add'>+		switch (idx_limit) {</div><div class='add'>+		case 0 ... 7:</div><div class='add'>+			mcs = IEEE80211_HE_MCS_SUPPORT_0_7;</div><div class='add'>+			break;</div><div class='add'>+		case 8:</div><div class='add'>+		case 9:</div><div class='add'>+			mcs = IEEE80211_HE_MCS_SUPPORT_0_9;</div><div class='add'>+			break;</div><div class='add'>+		case 10:</div><div class='add'>+		case 11:</div><div class='add'>+			mcs = IEEE80211_HE_MCS_SUPPORT_0_11;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			WARN_ON(1);</div><div class='add'>+			fallthrough;</div><div class='add'>+		case -1:</div><div class='add'>+			mcs = IEEE80211_HE_MCS_NOT_SUPPORTED;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tx_mcs_set &amp;= ~(0x3 &lt;&lt; (nss * 2));</div><div class='add'>+		tx_mcs_set |= mcs &lt;&lt; (nss * 2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return tx_mcs_set;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+ath12k_peer_assoc_h_he_masked(const u16 he_mcs_mask[NL80211_HE_NSS_MAX])</div><div class='add'>+{</div><div class='add'>+	int nss;</div><div class='add'>+</div><div class='add'>+	for (nss = 0; nss &lt; NL80211_HE_NSS_MAX; nss++)</div><div class='add'>+		if (he_mcs_mask[nss])</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_peer_assoc_h_he(struct ath12k *ar,</div><div class='add'>+				   struct ath12k_link_vif *arvif,</div><div class='add'>+				   struct ath12k_link_sta *arsta,</div><div class='add'>+				   struct ath12k_wmi_peer_assoc_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta-&gt;ahsta);</div><div class='add'>+	const struct ieee80211_sta_he_cap *he_cap;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	struct cfg80211_chan_def def;</div><div class='add'>+	int i;</div><div class='add'>+	u8 ampdu_factor, max_nss;</div><div class='add'>+	u8 rx_mcs_80 = IEEE80211_HE_MCS_NOT_SUPPORTED;</div><div class='add'>+	u8 rx_mcs_160 = IEEE80211_HE_MCS_NOT_SUPPORTED;</div><div class='add'>+	u16 mcs_160_map, mcs_80_map;</div><div class='add'>+	u8 link_id = arvif-&gt;link_id;</div><div class='add'>+	bool support_160;</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	u16 *he_mcs_mask;</div><div class='add'>+	u8 he_mcs;</div><div class='add'>+	u16 he_tx_mcs = 0, v = 0;</div><div class='add'>+	int he_nss, nss_idx;</div><div class='add'>+	bool user_rate_valid = true;</div><div class='add'>+	u32 rx_nss, tx_nss, nss_160;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ath12k_mac_vif_link_chan(vif, link_id, &amp;def)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	link_conf = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+	if (!link_conf) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "unable to access bss link conf in peer assoc he for vif %pM link %u",</div><div class='add'>+			    vif-&gt;addr, link_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	link_sta = ath12k_mac_get_link_sta(arsta);</div><div class='add'>+	if (!link_sta) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "unable to access link sta in peer assoc he for sta %pM link %u\n",</div><div class='add'>+			    sta-&gt;addr, arsta-&gt;link_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	he_cap = &amp;link_sta-&gt;he_cap;</div><div class='add'>+	if (!he_cap-&gt;has_he)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	band = def.chan-&gt;band;</div><div class='add'>+	he_mcs_mask = arvif-&gt;bitrate_mask.control[band].he_mcs;</div><div class='add'>+</div><div class='add'>+	if (ath12k_peer_assoc_h_he_masked(he_mcs_mask))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	arg-&gt;he_flag = true;</div><div class='add'>+</div><div class='add'>+	support_160 = !!(he_cap-&gt;he_cap_elem.phy_cap_info[0] &amp;</div><div class='add'>+		  IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G);</div><div class='add'>+</div><div class='add'>+	/* Supported HE-MCS and NSS Set of peer he_cap is intersection with self he_cp */</div><div class='add'>+	mcs_160_map = le16_to_cpu(he_cap-&gt;he_mcs_nss_supp.rx_mcs_160);</div><div class='add'>+	mcs_80_map = le16_to_cpu(he_cap-&gt;he_mcs_nss_supp.rx_mcs_80);</div><div class='add'>+</div><div class='add'>+	if (support_160) {</div><div class='add'>+		for (i = 7; i &gt;= 0; i--) {</div><div class='add'>+			u8 mcs_160 = (mcs_160_map &gt;&gt; (2 * i)) &amp; 3;</div><div class='add'>+</div><div class='add'>+			if (mcs_160 != IEEE80211_HE_MCS_NOT_SUPPORTED) {</div><div class='add'>+				rx_mcs_160 = i + 1;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 7; i &gt;= 0; i--) {</div><div class='add'>+		u8 mcs_80 = (mcs_80_map &gt;&gt; (2 * i)) &amp; 3;</div><div class='add'>+</div><div class='add'>+		if (mcs_80 != IEEE80211_HE_MCS_NOT_SUPPORTED) {</div><div class='add'>+			rx_mcs_80 = i + 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (support_160)</div><div class='add'>+		max_nss = min(rx_mcs_80, rx_mcs_160);</div><div class='add'>+	else</div><div class='add'>+		max_nss = rx_mcs_80;</div><div class='add'>+</div><div class='add'>+	arg-&gt;peer_nss = min(link_sta-&gt;rx_nss, max_nss);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;arg-&gt;peer_he_cap_macinfo, he_cap-&gt;he_cap_elem.mac_cap_info,</div><div class='add'>+	       sizeof(he_cap-&gt;he_cap_elem.mac_cap_info));</div><div class='add'>+	memcpy(&amp;arg-&gt;peer_he_cap_phyinfo, he_cap-&gt;he_cap_elem.phy_cap_info,</div><div class='add'>+	       sizeof(he_cap-&gt;he_cap_elem.phy_cap_info));</div><div class='add'>+	arg-&gt;peer_he_ops = link_conf-&gt;he_oper.params;</div><div class='add'>+</div><div class='add'>+	/* the top most byte is used to indicate BSS color info */</div><div class='add'>+	arg-&gt;peer_he_ops &amp;= 0xffffff;</div><div class='add'>+</div><div class='add'>+	/* As per section 26.6.1 IEEE Std 802.11ax‐2022, if the Max AMPDU</div><div class='add'>+	 * Exponent Extension in HE cap is zero, use the arg-&gt;peer_max_mpdu</div><div class='add'>+	 * as calculated while parsing VHT caps(if VHT caps is present)</div><div class='add'>+	 * or HT caps (if VHT caps is not present).</div><div class='add'>+	 *</div><div class='add'>+	 * For non-zero value of Max AMPDU Exponent Extension in HE MAC caps,</div><div class='add'>+	 * if a HE STA sends VHT cap and HE cap IE in assoc request then, use</div><div class='add'>+	 * MAX_AMPDU_LEN_FACTOR as 20 to calculate max_ampdu length.</div><div class='add'>+	 * If a HE STA that does not send VHT cap, but HE and HT cap in assoc</div><div class='add'>+	 * request, then use MAX_AMPDU_LEN_FACTOR as 16 to calculate max_ampdu</div><div class='add'>+	 * length.</div><div class='add'>+	 */</div><div class='add'>+	ampdu_factor = u8_get_bits(he_cap-&gt;he_cap_elem.mac_cap_info[3],</div><div class='add'>+				   IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK);</div><div class='add'>+</div><div class='add'>+	if (ampdu_factor) {</div><div class='add'>+		if (link_sta-&gt;vht_cap.vht_supported)</div><div class='add'>+			arg-&gt;peer_max_mpdu = (1 &lt;&lt; (IEEE80211_HE_VHT_MAX_AMPDU_FACTOR +</div><div class='add'>+						    ampdu_factor)) - 1;</div><div class='add'>+		else if (link_sta-&gt;ht_cap.ht_supported)</div><div class='add'>+			arg-&gt;peer_max_mpdu = (1 &lt;&lt; (IEEE80211_HE_HT_MAX_AMPDU_FACTOR +</div><div class='add'>+						    ampdu_factor)) - 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (he_cap-&gt;he_cap_elem.phy_cap_info[6] &amp;</div><div class='add'>+	    IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT) {</div><div class='add'>+		int bit = 7;</div><div class='add'>+		int nss, ru;</div><div class='add'>+</div><div class='add'>+		arg-&gt;peer_ppet.numss_m1 = he_cap-&gt;ppe_thres[0] &amp;</div><div class='add'>+					  IEEE80211_PPE_THRES_NSS_MASK;</div><div class='add'>+		arg-&gt;peer_ppet.ru_bit_mask =</div><div class='add'>+			(he_cap-&gt;ppe_thres[0] &amp;</div><div class='add'>+			 IEEE80211_PPE_THRES_RU_INDEX_BITMASK_MASK) &gt;&gt;</div><div class='add'>+			IEEE80211_PPE_THRES_RU_INDEX_BITMASK_POS;</div><div class='add'>+</div><div class='add'>+		for (nss = 0; nss &lt;= arg-&gt;peer_ppet.numss_m1; nss++) {</div><div class='add'>+			for (ru = 0; ru &lt; 4; ru++) {</div><div class='add'>+				u32 val = 0;</div><div class='add'>+				int i;</div><div class='add'>+</div><div class='add'>+				if ((arg-&gt;peer_ppet.ru_bit_mask &amp; BIT(ru)) == 0)</div><div class='add'>+					continue;</div><div class='add'>+				for (i = 0; i &lt; 6; i++) {</div><div class='add'>+					val &gt;&gt;= 1;</div><div class='add'>+					val |= ((he_cap-&gt;ppe_thres[bit / 8] &gt;&gt;</div><div class='add'>+						 (bit % 8)) &amp; 0x1) &lt;&lt; 5;</div><div class='add'>+					bit++;</div><div class='add'>+				}</div><div class='add'>+				arg-&gt;peer_ppet.ppet16_ppet8_ru3_ru0[nss] |=</div><div class='add'>+								val &lt;&lt; (ru * 6);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (he_cap-&gt;he_cap_elem.mac_cap_info[0] &amp; IEEE80211_HE_MAC_CAP0_TWT_RES)</div><div class='add'>+		arg-&gt;twt_responder = true;</div><div class='add'>+	if (he_cap-&gt;he_cap_elem.mac_cap_info[0] &amp; IEEE80211_HE_MAC_CAP0_TWT_REQ)</div><div class='add'>+		arg-&gt;twt_requester = true;</div><div class='add'>+</div><div class='add'>+	he_nss = ath12k_mac_max_he_nss(he_mcs_mask);</div><div class='add'>+</div><div class='add'>+	if (he_nss &gt; link_sta-&gt;rx_nss) {</div><div class='add'>+		user_rate_valid = false;</div><div class='add'>+		for (nss_idx = link_sta-&gt;rx_nss - 1; nss_idx &gt;= 0; nss_idx--) {</div><div class='add'>+			if (he_mcs_mask[nss_idx]) {</div><div class='add'>+				user_rate_valid = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!user_rate_valid) {</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+			   "Setting he range MCS value to peer supported nss:%d for peer %pM\n",</div><div class='add'>+			   link_sta-&gt;rx_nss, arsta-&gt;addr);</div><div class='add'>+		he_mcs_mask[link_sta-&gt;rx_nss - 1] = he_mcs_mask[he_nss - 1];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (link_sta-&gt;bandwidth) {</div><div class='add'>+	case IEEE80211_STA_RX_BW_160:</div><div class='add'>+		v = le16_to_cpu(he_cap-&gt;he_mcs_nss_supp.rx_mcs_160);</div><div class='add'>+		v = ath12k_peer_assoc_h_he_limit(v, he_mcs_mask);</div><div class='add'>+		arg-&gt;peer_he_rx_mcs_set[WMI_HECAP_TXRX_MCS_NSS_IDX_160] = v;</div><div class='add'>+</div><div class='add'>+		v = le16_to_cpu(he_cap-&gt;he_mcs_nss_supp.tx_mcs_160);</div><div class='add'>+		arg-&gt;peer_he_tx_mcs_set[WMI_HECAP_TXRX_MCS_NSS_IDX_160] = v;</div><div class='add'>+</div><div class='add'>+		arg-&gt;peer_he_mcs_count++;</div><div class='add'>+		if (!he_tx_mcs)</div><div class='add'>+			he_tx_mcs = v;</div><div class='add'>+		fallthrough;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		v = le16_to_cpu(he_cap-&gt;he_mcs_nss_supp.rx_mcs_80);</div><div class='add'>+		v = ath12k_peer_assoc_h_he_limit(v, he_mcs_mask);</div><div class='add'>+		arg-&gt;peer_he_rx_mcs_set[WMI_HECAP_TXRX_MCS_NSS_IDX_80] = v;</div><div class='add'>+</div><div class='add'>+		v = le16_to_cpu(he_cap-&gt;he_mcs_nss_supp.tx_mcs_80);</div><div class='add'>+		arg-&gt;peer_he_tx_mcs_set[WMI_HECAP_TXRX_MCS_NSS_IDX_80] = v;</div><div class='add'>+</div><div class='add'>+		arg-&gt;peer_he_mcs_count++;</div><div class='add'>+		if (!he_tx_mcs)</div><div class='add'>+			he_tx_mcs = v;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Calculate peer NSS capability from HE capabilities if STA</div><div class='add'>+	 * supports HE.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0, max_nss = 0, he_mcs = 0; i &lt; NL80211_HE_NSS_MAX; i++) {</div><div class='add'>+		he_mcs = he_tx_mcs &gt;&gt; (2 * i) &amp; 3;</div><div class='add'>+</div><div class='add'>+		/* In case of fixed rates, MCS Range in he_tx_mcs might have</div><div class='add'>+		 * unsupported range, with he_mcs_mask set, so check either of them</div><div class='add'>+		 * to find nss.</div><div class='add'>+		 */</div><div class='add'>+		if (he_mcs != IEEE80211_HE_MCS_NOT_SUPPORTED ||</div><div class='add'>+		    he_mcs_mask[i])</div><div class='add'>+			max_nss = i + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	max_nss = min(max_nss, ar-&gt;num_tx_chains);</div><div class='add'>+	arg-&gt;peer_nss = min(link_sta-&gt;rx_nss, max_nss);</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;peer_phymode == MODE_11AX_HE160) {</div><div class='add'>+		tx_nss = ath12k_get_nss_160mhz(ar, ar-&gt;num_tx_chains);</div><div class='add'>+		rx_nss = min(arg-&gt;peer_nss, tx_nss);</div><div class='add'>+</div><div class='add'>+		arg-&gt;peer_nss = min(link_sta-&gt;rx_nss, ar-&gt;num_rx_chains);</div><div class='add'>+		arg-&gt;peer_bw_rxnss_override = ATH12K_BW_NSS_MAP_ENABLE;</div><div class='add'>+</div><div class='add'>+		if (!rx_nss) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "invalid max_nss\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nss_160 = u32_encode_bits(rx_nss - 1, ATH12K_PEER_RX_NSS_160MHZ);</div><div class='add'>+		arg-&gt;peer_bw_rxnss_override |= nss_160;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "mac he peer %pM nss %d mcs cnt %d nss_override 0x%x\n",</div><div class='add'>+		   arsta-&gt;addr, arg-&gt;peer_nss,</div><div class='add'>+		   arg-&gt;peer_he_mcs_count,</div><div class='add'>+		   arg-&gt;peer_bw_rxnss_override);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_peer_assoc_h_he_6ghz(struct ath12k *ar,</div><div class='add'>+					struct ath12k_link_vif *arvif,</div><div class='add'>+					struct ath12k_link_sta *arsta,</div><div class='add'>+					struct ath12k_wmi_peer_assoc_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta-&gt;ahsta);</div><div class='add'>+	const struct ieee80211_sta_he_cap *he_cap;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	struct cfg80211_chan_def def;</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	u8 ampdu_factor, mpdu_density;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ath12k_mac_vif_link_chan(vif, arvif-&gt;link_id, &amp;def)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	band = def.chan-&gt;band;</div><div class='add'>+</div><div class='add'>+	link_sta = ath12k_mac_get_link_sta(arsta);</div><div class='add'>+	if (!link_sta) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "unable to access link sta in peer assoc he 6ghz for sta %pM link %u\n",</div><div class='add'>+			    sta-&gt;addr, arsta-&gt;link_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	he_cap = &amp;link_sta-&gt;he_cap;</div><div class='add'>+</div><div class='add'>+	if (!arg-&gt;he_flag || band != NL80211_BAND_6GHZ || !link_sta-&gt;he_6ghz_capa.capa)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='add'>+		arg-&gt;bw_40 = true;</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_80)</div><div class='add'>+		arg-&gt;bw_80 = true;</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_160)</div><div class='add'>+		arg-&gt;bw_160 = true;</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_320)</div><div class='add'>+		arg-&gt;bw_320 = true;</div><div class='add'>+</div><div class='add'>+	arg-&gt;peer_he_caps_6ghz = le16_to_cpu(link_sta-&gt;he_6ghz_capa.capa);</div><div class='add'>+</div><div class='add'>+	mpdu_density = u32_get_bits(arg-&gt;peer_he_caps_6ghz,</div><div class='add'>+				    IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START);</div><div class='add'>+	arg-&gt;peer_mpdu_density = ath12k_parse_mpdudensity(mpdu_density);</div><div class='add'>+</div><div class='add'>+	/* From IEEE Std 802.11ax-2021 - Section 10.12.2: An HE STA shall be capable of</div><div class='add'>+	 * receiving A-MPDU where the A-MPDU pre-EOF padding length is up to the value</div><div class='add'>+	 * indicated by the Maximum A-MPDU Length Exponent Extension field in the HE</div><div class='add'>+	 * Capabilities element and the Maximum A-MPDU Length Exponent field in HE 6 GHz</div><div class='add'>+	 * Band Capabilities element in the 6 GHz band.</div><div class='add'>+	 *</div><div class='add'>+	 * Here, we are extracting the Max A-MPDU Exponent Extension from HE caps and</div><div class='add'>+	 * factor is the Maximum A-MPDU Length Exponent from HE 6 GHZ Band capability.</div><div class='add'>+	 */</div><div class='add'>+	ampdu_factor = u8_get_bits(he_cap-&gt;he_cap_elem.mac_cap_info[3],</div><div class='add'>+				   IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK) +</div><div class='add'>+			u32_get_bits(arg-&gt;peer_he_caps_6ghz,</div><div class='add'>+				     IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP);</div><div class='add'>+</div><div class='add'>+	arg-&gt;peer_max_mpdu = (1u &lt;&lt; (IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR +</div><div class='add'>+				     ampdu_factor)) - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_get_smps_from_capa(const struct ieee80211_sta_ht_cap *ht_cap,</div><div class='add'>+				     const struct ieee80211_he_6ghz_capa *he_6ghz_capa,</div><div class='add'>+				     int *smps)</div><div class='add'>+{</div><div class='add'>+	if (ht_cap-&gt;ht_supported)</div><div class='add'>+		*smps = u16_get_bits(ht_cap-&gt;cap, IEEE80211_HT_CAP_SM_PS);</div><div class='add'>+	else</div><div class='add'>+		*smps = le16_get_bits(he_6ghz_capa-&gt;capa,</div><div class='add'>+				      IEEE80211_HE_6GHZ_CAP_SM_PS);</div><div class='add'>+</div><div class='add'>+	if (*smps &gt;= ARRAY_SIZE(ath12k_smps_map))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_peer_assoc_h_smps(struct ath12k_link_sta *arsta,</div><div class='add'>+				     struct ath12k_wmi_peer_assoc_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta-&gt;ahsta);</div><div class='add'>+	const struct ieee80211_he_6ghz_capa *he_6ghz_capa;</div><div class='add'>+	struct ath12k_link_vif *arvif = arsta-&gt;arvif;</div><div class='add'>+	const struct ieee80211_sta_ht_cap *ht_cap;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	int smps;</div><div class='add'>+</div><div class='add'>+	link_sta = ath12k_mac_get_link_sta(arsta);</div><div class='add'>+	if (!link_sta) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "unable to access link sta in peer assoc he for sta %pM link %u\n",</div><div class='add'>+			    sta-&gt;addr, arsta-&gt;link_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	he_6ghz_capa = &amp;link_sta-&gt;he_6ghz_capa;</div><div class='add'>+	ht_cap = &amp;link_sta-&gt;ht_cap;</div><div class='add'>+</div><div class='add'>+	if (!ht_cap-&gt;ht_supported &amp;&amp; !he_6ghz_capa-&gt;capa)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (ath12k_get_smps_from_capa(ht_cap, he_6ghz_capa, &amp;smps))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (smps) {</div><div class='add'>+	case WLAN_HT_CAP_SM_PS_STATIC:</div><div class='add'>+		arg-&gt;static_mimops_flag = true;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_HT_CAP_SM_PS_DYNAMIC:</div><div class='add'>+		arg-&gt;dynamic_mimops_flag = true;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_HT_CAP_SM_PS_DISABLED:</div><div class='add'>+		arg-&gt;spatial_mux_flag = true;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_peer_assoc_h_qos(struct ath12k *ar,</div><div class='add'>+				    struct ath12k_link_vif *arvif,</div><div class='add'>+				    struct ath12k_link_sta *arsta,</div><div class='add'>+				    struct ath12k_wmi_peer_assoc_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta-&gt;ahsta);</div><div class='add'>+</div><div class='add'>+	switch (arvif-&gt;ahvif-&gt;vdev_type) {</div><div class='add'>+	case WMI_VDEV_TYPE_AP:</div><div class='add'>+		if (sta-&gt;wme) {</div><div class='add'>+			/* TODO: Check WME vs QoS */</div><div class='add'>+			arg-&gt;is_wme_set = true;</div><div class='add'>+			arg-&gt;qos_flag = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (sta-&gt;wme &amp;&amp; sta-&gt;uapsd_queues) {</div><div class='add'>+			/* TODO: Check WME vs QoS */</div><div class='add'>+			arg-&gt;is_wme_set = true;</div><div class='add'>+			arg-&gt;apsd_flag = true;</div><div class='add'>+			arg-&gt;peer_rate_caps |= WMI_HOST_RC_UAPSD_FLAG;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case WMI_VDEV_TYPE_STA:</div><div class='add'>+		if (sta-&gt;wme) {</div><div class='add'>+			arg-&gt;is_wme_set = true;</div><div class='add'>+			arg-&gt;qos_flag = true;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac peer %pM qos %d\n",</div><div class='add'>+		   arsta-&gt;addr, arg-&gt;qos_flag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_peer_assoc_qos_ap(struct ath12k *ar,</div><div class='add'>+				    struct ath12k_link_vif *arvif,</div><div class='add'>+				    struct ath12k_link_sta *arsta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta-&gt;ahsta);</div><div class='add'>+	struct ath12k_wmi_ap_ps_arg arg;</div><div class='add'>+	u32 max_sp;</div><div class='add'>+	u32 uapsd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	arg.vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac uapsd_queues 0x%x max_sp %d\n",</div><div class='add'>+		   sta-&gt;uapsd_queues, sta-&gt;max_sp);</div><div class='add'>+</div><div class='add'>+	uapsd = 0;</div><div class='add'>+	if (sta-&gt;uapsd_queues &amp; IEEE80211_WMM_IE_STA_QOSINFO_AC_VO)</div><div class='add'>+		uapsd |= WMI_AP_PS_UAPSD_AC3_DELIVERY_EN |</div><div class='add'>+			 WMI_AP_PS_UAPSD_AC3_TRIGGER_EN;</div><div class='add'>+	if (sta-&gt;uapsd_queues &amp; IEEE80211_WMM_IE_STA_QOSINFO_AC_VI)</div><div class='add'>+		uapsd |= WMI_AP_PS_UAPSD_AC2_DELIVERY_EN |</div><div class='add'>+			 WMI_AP_PS_UAPSD_AC2_TRIGGER_EN;</div><div class='add'>+	if (sta-&gt;uapsd_queues &amp; IEEE80211_WMM_IE_STA_QOSINFO_AC_BK)</div><div class='add'>+		uapsd |= WMI_AP_PS_UAPSD_AC1_DELIVERY_EN |</div><div class='add'>+			 WMI_AP_PS_UAPSD_AC1_TRIGGER_EN;</div><div class='add'>+	if (sta-&gt;uapsd_queues &amp; IEEE80211_WMM_IE_STA_QOSINFO_AC_BE)</div><div class='add'>+		uapsd |= WMI_AP_PS_UAPSD_AC0_DELIVERY_EN |</div><div class='add'>+			 WMI_AP_PS_UAPSD_AC0_TRIGGER_EN;</div><div class='add'>+</div><div class='add'>+	max_sp = 0;</div><div class='add'>+	if (sta-&gt;max_sp &lt; MAX_WMI_AP_PS_PEER_PARAM_MAX_SP)</div><div class='add'>+		max_sp = sta-&gt;max_sp;</div><div class='add'>+</div><div class='add'>+	arg.param = WMI_AP_PS_PEER_PARAM_UAPSD;</div><div class='add'>+	arg.value = uapsd;</div><div class='add'>+	ret = ath12k_wmi_send_set_ap_ps_param_cmd(ar, arsta-&gt;addr, &amp;arg);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	arg.param = WMI_AP_PS_PEER_PARAM_MAX_SP;</div><div class='add'>+	arg.value = max_sp;</div><div class='add'>+	ret = ath12k_wmi_send_set_ap_ps_param_cmd(ar, arsta-&gt;addr, &amp;arg);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* TODO: revisit during testing */</div><div class='add'>+	arg.param = WMI_AP_PS_PEER_PARAM_SIFS_RESP_FRMTYPE;</div><div class='add'>+	arg.value = DISABLE_SIFS_RESPONSE_TRIGGER;</div><div class='add'>+	ret = ath12k_wmi_send_set_ap_ps_param_cmd(ar, arsta-&gt;addr, &amp;arg);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	arg.param = WMI_AP_PS_PEER_PARAM_SIFS_RESP_UAPSD;</div><div class='add'>+	arg.value = DISABLE_SIFS_RESPONSE_TRIGGER;</div><div class='add'>+	ret = ath12k_wmi_send_set_ap_ps_param_cmd(ar, arsta-&gt;addr, &amp;arg);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	ath12k_warn(ar-&gt;ab, "failed to set ap ps peer param %d for vdev %i: %d\n",</div><div class='add'>+		    arg.param, arvif-&gt;vdev_id, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_mac_sta_has_ofdm_only(struct ieee80211_link_sta *sta)</div><div class='add'>+{</div><div class='add'>+	return sta-&gt;supp_rates[NL80211_BAND_2GHZ] &gt;&gt;</div><div class='add'>+	       ATH12K_MAC_FIRST_OFDM_RATE_IDX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum wmi_phy_mode ath12k_mac_get_phymode_vht(struct ath12k *ar,</div><div class='add'>+						    struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_160) {</div><div class='add'>+		if (link_sta-&gt;vht_cap.cap &amp; (IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ |</div><div class='add'>+		    IEEE80211_VHT_CAP_EXT_NSS_BW_MASK))</div><div class='add'>+			return MODE_11AC_VHT160;</div><div class='add'>+</div><div class='add'>+		/* Allow STA to connect even if it does not explicitly advertise 160 MHz</div><div class='add'>+		 * support</div><div class='add'>+		 */</div><div class='add'>+		return MODE_11AC_VHT160;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_80)</div><div class='add'>+		return MODE_11AC_VHT80;</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='add'>+		return MODE_11AC_VHT40;</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_20)</div><div class='add'>+		return MODE_11AC_VHT20;</div><div class='add'>+</div><div class='add'>+	return MODE_UNKNOWN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum wmi_phy_mode ath12k_mac_get_phymode_he(struct ath12k *ar,</div><div class='add'>+						   struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_160) {</div><div class='add'>+		if (link_sta-&gt;he_cap.he_cap_elem.phy_cap_info[0] &amp;</div><div class='add'>+		     IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G)</div><div class='add'>+			return MODE_11AX_HE160;</div><div class='add'>+</div><div class='add'>+		return MODE_UNKNOWN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_80)</div><div class='add'>+		return MODE_11AX_HE80;</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='add'>+		return MODE_11AX_HE40;</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_20)</div><div class='add'>+		return MODE_11AX_HE20;</div><div class='add'>+</div><div class='add'>+	return MODE_UNKNOWN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum wmi_phy_mode ath12k_mac_get_phymode_eht(struct ath12k *ar,</div><div class='add'>+						    struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_320)</div><div class='add'>+		if (link_sta-&gt;eht_cap.eht_cap_elem.phy_cap_info[0] &amp;</div><div class='add'>+		    IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ)</div><div class='add'>+			return MODE_11BE_EHT320;</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_160) {</div><div class='add'>+		if (link_sta-&gt;he_cap.he_cap_elem.phy_cap_info[0] &amp;</div><div class='add'>+		    IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G)</div><div class='add'>+			return MODE_11BE_EHT160;</div><div class='add'>+</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "invalid EHT PHY capability info for 160 Mhz: %d\n",</div><div class='add'>+			    link_sta-&gt;he_cap.he_cap_elem.phy_cap_info[0]);</div><div class='add'>+</div><div class='add'>+		return MODE_UNKNOWN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_80)</div><div class='add'>+		return MODE_11BE_EHT80;</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='add'>+		return MODE_11BE_EHT40;</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_20)</div><div class='add'>+		return MODE_11BE_EHT20;</div><div class='add'>+</div><div class='add'>+	return MODE_UNKNOWN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+ath12k_peer_assoc_h_eht_masked(const u16 eht_mcs_mask[NL80211_EHT_NSS_MAX])</div><div class='add'>+{</div><div class='add'>+	int nss;</div><div class='add'>+</div><div class='add'>+	for (nss = 0; nss &lt; NL80211_EHT_NSS_MAX; nss++)</div><div class='add'>+		if (eht_mcs_mask[nss])</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_peer_assoc_h_phymode(struct ath12k *ar,</div><div class='add'>+					struct ath12k_link_vif *arvif,</div><div class='add'>+					struct ath12k_link_sta *arsta,</div><div class='add'>+					struct ath12k_wmi_peer_assoc_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	struct cfg80211_chan_def def;</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	const u8 *ht_mcs_mask;</div><div class='add'>+	const u16 *vht_mcs_mask;</div><div class='add'>+	const u16 *he_mcs_mask;</div><div class='add'>+	const u16 *eht_mcs_mask;</div><div class='add'>+	enum wmi_phy_mode phymode = MODE_UNKNOWN;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta-&gt;ahsta);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ath12k_mac_vif_link_chan(vif, arvif-&gt;link_id, &amp;def)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	band = def.chan-&gt;band;</div><div class='add'>+	ht_mcs_mask = arvif-&gt;bitrate_mask.control[band].ht_mcs;</div><div class='add'>+	vht_mcs_mask = arvif-&gt;bitrate_mask.control[band].vht_mcs;</div><div class='add'>+	he_mcs_mask = arvif-&gt;bitrate_mask.control[band].he_mcs;</div><div class='add'>+	eht_mcs_mask = arvif-&gt;bitrate_mask.control[band].eht_mcs;</div><div class='add'>+</div><div class='add'>+	link_sta = ath12k_mac_get_link_sta(arsta);</div><div class='add'>+	if (!link_sta) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "unable to access link sta in peer assoc he for sta %pM link %u\n",</div><div class='add'>+			    sta-&gt;addr, arsta-&gt;link_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (band) {</div><div class='add'>+	case NL80211_BAND_2GHZ:</div><div class='add'>+		if (link_sta-&gt;eht_cap.has_eht &amp;&amp;</div><div class='add'>+		    !ath12k_peer_assoc_h_eht_masked(eht_mcs_mask)) {</div><div class='add'>+			if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='add'>+				phymode = MODE_11BE_EHT40_2G;</div><div class='add'>+			else</div><div class='add'>+				phymode = MODE_11BE_EHT20_2G;</div><div class='add'>+		} else if (link_sta-&gt;he_cap.has_he &amp;&amp;</div><div class='add'>+			   !ath12k_peer_assoc_h_he_masked(he_mcs_mask)) {</div><div class='add'>+			if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_80)</div><div class='add'>+				phymode = MODE_11AX_HE80_2G;</div><div class='add'>+			else if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='add'>+				phymode = MODE_11AX_HE40_2G;</div><div class='add'>+			else</div><div class='add'>+				phymode = MODE_11AX_HE20_2G;</div><div class='add'>+		} else if (link_sta-&gt;vht_cap.vht_supported &amp;&amp;</div><div class='add'>+		    !ath12k_peer_assoc_h_vht_masked(vht_mcs_mask)) {</div><div class='add'>+			if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='add'>+				phymode = MODE_11AC_VHT40;</div><div class='add'>+			else</div><div class='add'>+				phymode = MODE_11AC_VHT20;</div><div class='add'>+		} else if (link_sta-&gt;ht_cap.ht_supported &amp;&amp;</div><div class='add'>+			   !ath12k_peer_assoc_h_ht_masked(ht_mcs_mask)) {</div><div class='add'>+			if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_40)</div><div class='add'>+				phymode = MODE_11NG_HT40;</div><div class='add'>+			else</div><div class='add'>+				phymode = MODE_11NG_HT20;</div><div class='add'>+		} else if (ath12k_mac_sta_has_ofdm_only(link_sta)) {</div><div class='add'>+			phymode = MODE_11G;</div><div class='add'>+		} else {</div><div class='add'>+			phymode = MODE_11B;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_BAND_5GHZ:</div><div class='add'>+	case NL80211_BAND_6GHZ:</div><div class='add'>+		/* Check EHT first */</div><div class='add'>+		if (link_sta-&gt;eht_cap.has_eht) {</div><div class='add'>+			phymode = ath12k_mac_get_phymode_eht(ar, link_sta);</div><div class='add'>+		} else if (link_sta-&gt;he_cap.has_he &amp;&amp;</div><div class='add'>+			   !ath12k_peer_assoc_h_he_masked(he_mcs_mask)) {</div><div class='add'>+			phymode = ath12k_mac_get_phymode_he(ar, link_sta);</div><div class='add'>+		} else if (link_sta-&gt;vht_cap.vht_supported &amp;&amp;</div><div class='add'>+		    !ath12k_peer_assoc_h_vht_masked(vht_mcs_mask)) {</div><div class='add'>+			phymode = ath12k_mac_get_phymode_vht(ar, link_sta);</div><div class='add'>+		} else if (link_sta-&gt;ht_cap.ht_supported &amp;&amp;</div><div class='add'>+			   !ath12k_peer_assoc_h_ht_masked(ht_mcs_mask)) {</div><div class='add'>+			if (link_sta-&gt;bandwidth &gt;= IEEE80211_STA_RX_BW_40)</div><div class='add'>+				phymode = MODE_11NA_HT40;</div><div class='add'>+			else</div><div class='add'>+				phymode = MODE_11NA_HT20;</div><div class='add'>+		} else {</div><div class='add'>+			phymode = MODE_11A;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac peer %pM phymode %s\n",</div><div class='add'>+		   arsta-&gt;addr, ath12k_mac_phymode_str(phymode));</div><div class='add'>+</div><div class='add'>+	arg-&gt;peer_phymode = phymode;</div><div class='add'>+	WARN_ON(phymode == MODE_UNKNOWN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ATH12K_EHT_MCS_7_ENABLED	0x00FF</div><div class='add'>+#define ATH12K_EHT_MCS_9_ENABLED	0x0300</div><div class='add'>+#define ATH12K_EHT_MCS_11_ENABLED	0x0C00</div><div class='add'>+#define ATH12K_EHT_MCS_13_ENABLED	0x3000</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_set_eht_mcs(u8 rx_tx_mcs7, u8 rx_tx_mcs9,</div><div class='add'>+				   u8 rx_tx_mcs11, u8 rx_tx_mcs13,</div><div class='add'>+				   u32 *rx_mcs, u32 *tx_mcs,</div><div class='add'>+				   const u16 eht_mcs_limit[NL80211_EHT_NSS_MAX])</div><div class='add'>+{</div><div class='add'>+	int nss;</div><div class='add'>+	u8 mcs_7 = 0, mcs_9 = 0, mcs_11 = 0, mcs_13 = 0;</div><div class='add'>+	u8 peer_mcs_7, peer_mcs_9, peer_mcs_11, peer_mcs_13;</div><div class='add'>+</div><div class='add'>+	for (nss = 0; nss &lt; NL80211_EHT_NSS_MAX; nss++) {</div><div class='add'>+		if (eht_mcs_limit[nss] &amp; ATH12K_EHT_MCS_7_ENABLED)</div><div class='add'>+			mcs_7++;</div><div class='add'>+		if (eht_mcs_limit[nss] &amp; ATH12K_EHT_MCS_9_ENABLED)</div><div class='add'>+			mcs_9++;</div><div class='add'>+		if (eht_mcs_limit[nss] &amp; ATH12K_EHT_MCS_11_ENABLED)</div><div class='add'>+			mcs_11++;</div><div class='add'>+		if (eht_mcs_limit[nss] &amp; ATH12K_EHT_MCS_13_ENABLED)</div><div class='add'>+			mcs_13++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	peer_mcs_7 = u8_get_bits(rx_tx_mcs7, IEEE80211_EHT_MCS_NSS_RX);</div><div class='add'>+	peer_mcs_9 = u8_get_bits(rx_tx_mcs9, IEEE80211_EHT_MCS_NSS_RX);</div><div class='add'>+	peer_mcs_11 = u8_get_bits(rx_tx_mcs11, IEEE80211_EHT_MCS_NSS_RX);</div><div class='add'>+	peer_mcs_13 = u8_get_bits(rx_tx_mcs13, IEEE80211_EHT_MCS_NSS_RX);</div><div class='add'>+</div><div class='add'>+	*rx_mcs = u32_encode_bits(min(peer_mcs_7, mcs_7), WMI_EHT_MCS_NSS_0_7) |</div><div class='add'>+		  u32_encode_bits(min(peer_mcs_9, mcs_9), WMI_EHT_MCS_NSS_8_9) |</div><div class='add'>+		  u32_encode_bits(min(peer_mcs_11, mcs_11), WMI_EHT_MCS_NSS_10_11) |</div><div class='add'>+		  u32_encode_bits(min(peer_mcs_13, mcs_13), WMI_EHT_MCS_NSS_12_13);</div><div class='add'>+</div><div class='add'>+	peer_mcs_7 = u8_get_bits(rx_tx_mcs7, IEEE80211_EHT_MCS_NSS_TX);</div><div class='add'>+	peer_mcs_9 = u8_get_bits(rx_tx_mcs9, IEEE80211_EHT_MCS_NSS_TX);</div><div class='add'>+	peer_mcs_11 = u8_get_bits(rx_tx_mcs11, IEEE80211_EHT_MCS_NSS_TX);</div><div class='add'>+	peer_mcs_13 = u8_get_bits(rx_tx_mcs13, IEEE80211_EHT_MCS_NSS_TX);</div><div class='add'>+</div><div class='add'>+	*tx_mcs = u32_encode_bits(min(peer_mcs_7, mcs_7), WMI_EHT_MCS_NSS_0_7) |</div><div class='add'>+		  u32_encode_bits(min(peer_mcs_9, mcs_9), WMI_EHT_MCS_NSS_8_9) |</div><div class='add'>+		  u32_encode_bits(min(peer_mcs_11, mcs_11), WMI_EHT_MCS_NSS_10_11) |</div><div class='add'>+		  u32_encode_bits(min(peer_mcs_13, mcs_13), WMI_EHT_MCS_NSS_12_13);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_set_eht_ppe_threshold(const u8 *ppe_thres,</div><div class='add'>+					     struct ath12k_wmi_ppe_threshold_arg *ppet)</div><div class='add'>+{</div><div class='add'>+	u32 bit_pos = IEEE80211_EHT_PPE_THRES_INFO_HEADER_SIZE, val;</div><div class='add'>+	u8 nss, ru, i;</div><div class='add'>+	u8 ppet_bit_len_per_ru = IEEE80211_EHT_PPE_THRES_INFO_PPET_SIZE * 2;</div><div class='add'>+</div><div class='add'>+	ppet-&gt;numss_m1 = u8_get_bits(ppe_thres[0], IEEE80211_EHT_PPE_THRES_NSS_MASK);</div><div class='add'>+	ppet-&gt;ru_bit_mask = u16_get_bits(get_unaligned_le16(ppe_thres),</div><div class='add'>+					 IEEE80211_EHT_PPE_THRES_RU_INDEX_BITMASK_MASK);</div><div class='add'>+</div><div class='add'>+	for (nss = 0; nss &lt;= ppet-&gt;numss_m1; nss++) {</div><div class='add'>+		for (ru = 0;</div><div class='add'>+		     ru &lt; hweight16(IEEE80211_EHT_PPE_THRES_RU_INDEX_BITMASK_MASK);</div><div class='add'>+		     ru++) {</div><div class='add'>+			if ((ppet-&gt;ru_bit_mask &amp; BIT(ru)) == 0)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			val = 0;</div><div class='add'>+			for (i = 0; i &lt; ppet_bit_len_per_ru; i++) {</div><div class='add'>+				val |= (((ppe_thres[bit_pos / 8] &gt;&gt;</div><div class='add'>+					  (bit_pos % 8)) &amp; 0x1) &lt;&lt; i);</div><div class='add'>+				bit_pos++;</div><div class='add'>+			}</div><div class='add'>+			ppet-&gt;ppet16_ppet8_ru3_ru0[nss] |=</div><div class='add'>+					(val &lt;&lt; (ru * ppet_bit_len_per_ru));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_peer_assoc_h_eht(struct ath12k *ar,</div><div class='add'>+				    struct ath12k_link_vif *arvif,</div><div class='add'>+				    struct ath12k_link_sta *arsta,</div><div class='add'>+				    struct ath12k_wmi_peer_assoc_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta-&gt;ahsta);</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+	const struct ieee80211_eht_mcs_nss_supp *own_eht_mcs_nss_supp;</div><div class='add'>+	const struct ieee80211_eht_mcs_nss_supp_20mhz_only *bw_20;</div><div class='add'>+	const struct ieee80211_sta_eht_cap *eht_cap, *own_eht_cap;</div><div class='add'>+	const struct ieee80211_sband_iftype_data *iftd;</div><div class='add'>+	const struct ieee80211_eht_mcs_nss_supp_bw *bw;</div><div class='add'>+	const struct ieee80211_sta_he_cap *he_cap;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct cfg80211_chan_def def;</div><div class='add'>+	bool user_rate_valid = true;</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	int eht_nss, nss_idx;</div><div class='add'>+	u32 *rx_mcs, *tx_mcs;</div><div class='add'>+	u16 *eht_mcs_mask;</div><div class='add'>+	u8 max_nss = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	link_sta = ath12k_mac_get_link_sta(arsta);</div><div class='add'>+	if (!link_sta) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "unable to access link sta in peer assoc eht for sta %pM link %u\n",</div><div class='add'>+			    sta-&gt;addr, arsta-&gt;link_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	link_conf = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+	if (!link_conf) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "unable to access link_conf in peer assoc eht set\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	eht_cap = &amp;link_sta-&gt;eht_cap;</div><div class='add'>+	he_cap = &amp;link_sta-&gt;he_cap;</div><div class='add'>+	if (!he_cap-&gt;has_he || !eht_cap-&gt;has_eht)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ath12k_mac_vif_link_chan(vif, arvif-&gt;link_id, &amp;def)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	band = def.chan-&gt;band;</div><div class='add'>+	eht_mcs_mask = arvif-&gt;bitrate_mask.control[band].eht_mcs;</div><div class='add'>+</div><div class='add'>+	iftd = ieee80211_get_sband_iftype_data(&amp;ar-&gt;mac.sbands[band], vif-&gt;type);</div><div class='add'>+	if (!iftd) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "unable to access iftype_data in struct ieee80211_supported_band\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	own_eht_cap = &amp;iftd-&gt;eht_cap;</div><div class='add'>+	own_eht_mcs_nss_supp = &amp;own_eht_cap-&gt;eht_mcs_nss_supp;</div><div class='add'>+</div><div class='add'>+	arg-&gt;eht_flag = true;</div><div class='add'>+</div><div class='add'>+	if ((eht_cap-&gt;eht_cap_elem.phy_cap_info[5] &amp;</div><div class='add'>+	     IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT) &amp;&amp;</div><div class='add'>+	    eht_cap-&gt;eht_ppe_thres[0] != 0)</div><div class='add'>+		ath12k_mac_set_eht_ppe_threshold(eht_cap-&gt;eht_ppe_thres,</div><div class='add'>+						 &amp;arg-&gt;peer_eht_ppet);</div><div class='add'>+</div><div class='add'>+	memcpy(arg-&gt;peer_eht_cap_mac, eht_cap-&gt;eht_cap_elem.mac_cap_info,</div><div class='add'>+	       sizeof(eht_cap-&gt;eht_cap_elem.mac_cap_info));</div><div class='add'>+	memcpy(arg-&gt;peer_eht_cap_phy, eht_cap-&gt;eht_cap_elem.phy_cap_info,</div><div class='add'>+	       sizeof(eht_cap-&gt;eht_cap_elem.phy_cap_info));</div><div class='add'>+</div><div class='add'>+	rx_mcs = arg-&gt;peer_eht_rx_mcs_set;</div><div class='add'>+	tx_mcs = arg-&gt;peer_eht_tx_mcs_set;</div><div class='add'>+</div><div class='add'>+	eht_nss = ath12k_mac_max_eht_mcs_nss((void *)own_eht_mcs_nss_supp,</div><div class='add'>+					     sizeof(*own_eht_mcs_nss_supp));</div><div class='add'>+	if (eht_nss &gt; link_sta-&gt;rx_nss) {</div><div class='add'>+		user_rate_valid = false;</div><div class='add'>+		for (nss_idx = (link_sta-&gt;rx_nss - 1); nss_idx &gt;= 0; nss_idx--) {</div><div class='add'>+			if (eht_mcs_mask[nss_idx]) {</div><div class='add'>+				user_rate_valid = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!user_rate_valid) {</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+			   "Setting eht range MCS value to peer supported nss %d for peer %pM\n",</div><div class='add'>+			   link_sta-&gt;rx_nss, arsta-&gt;addr);</div><div class='add'>+		eht_mcs_mask[link_sta-&gt;rx_nss - 1] = eht_mcs_mask[eht_nss - 1];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bw_20 = &amp;eht_cap-&gt;eht_mcs_nss_supp.only_20mhz;</div><div class='add'>+	bw = &amp;eht_cap-&gt;eht_mcs_nss_supp.bw._80;</div><div class='add'>+</div><div class='add'>+	switch (link_sta-&gt;bandwidth) {</div><div class='add'>+	case IEEE80211_STA_RX_BW_320:</div><div class='add'>+		bw = &amp;eht_cap-&gt;eht_mcs_nss_supp.bw._320;</div><div class='add'>+		ath12k_mac_set_eht_mcs(bw-&gt;rx_tx_mcs9_max_nss,</div><div class='add'>+				       bw-&gt;rx_tx_mcs9_max_nss,</div><div class='add'>+				       bw-&gt;rx_tx_mcs11_max_nss,</div><div class='add'>+				       bw-&gt;rx_tx_mcs13_max_nss,</div><div class='add'>+				       &amp;rx_mcs[WMI_EHTCAP_TXRX_MCS_NSS_IDX_320],</div><div class='add'>+				       &amp;tx_mcs[WMI_EHTCAP_TXRX_MCS_NSS_IDX_320],</div><div class='add'>+				       eht_mcs_mask);</div><div class='add'>+		arg-&gt;peer_eht_mcs_count++;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case IEEE80211_STA_RX_BW_160:</div><div class='add'>+		bw = &amp;eht_cap-&gt;eht_mcs_nss_supp.bw._160;</div><div class='add'>+		ath12k_mac_set_eht_mcs(bw-&gt;rx_tx_mcs9_max_nss,</div><div class='add'>+				       bw-&gt;rx_tx_mcs9_max_nss,</div><div class='add'>+				       bw-&gt;rx_tx_mcs11_max_nss,</div><div class='add'>+				       bw-&gt;rx_tx_mcs13_max_nss,</div><div class='add'>+				       &amp;rx_mcs[WMI_EHTCAP_TXRX_MCS_NSS_IDX_160],</div><div class='add'>+				       &amp;tx_mcs[WMI_EHTCAP_TXRX_MCS_NSS_IDX_160],</div><div class='add'>+				       eht_mcs_mask);</div><div class='add'>+		arg-&gt;peer_eht_mcs_count++;</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		if (!(link_sta-&gt;he_cap.he_cap_elem.phy_cap_info[0] &amp;</div><div class='add'>+		      IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_MASK_ALL)) {</div><div class='add'>+			bw_20 = &amp;eht_cap-&gt;eht_mcs_nss_supp.only_20mhz;</div><div class='add'>+</div><div class='add'>+			ath12k_mac_set_eht_mcs(bw_20-&gt;rx_tx_mcs7_max_nss,</div><div class='add'>+					       bw_20-&gt;rx_tx_mcs9_max_nss,</div><div class='add'>+					       bw_20-&gt;rx_tx_mcs11_max_nss,</div><div class='add'>+					       bw_20-&gt;rx_tx_mcs13_max_nss,</div><div class='add'>+					       &amp;rx_mcs[WMI_EHTCAP_TXRX_MCS_NSS_IDX_80],</div><div class='add'>+					       &amp;tx_mcs[WMI_EHTCAP_TXRX_MCS_NSS_IDX_80],</div><div class='add'>+					       eht_mcs_mask);</div><div class='add'>+		} else {</div><div class='add'>+			bw = &amp;eht_cap-&gt;eht_mcs_nss_supp.bw._80;</div><div class='add'>+			ath12k_mac_set_eht_mcs(bw-&gt;rx_tx_mcs9_max_nss,</div><div class='add'>+					       bw-&gt;rx_tx_mcs9_max_nss,</div><div class='add'>+					       bw-&gt;rx_tx_mcs11_max_nss,</div><div class='add'>+					       bw-&gt;rx_tx_mcs13_max_nss,</div><div class='add'>+					       &amp;rx_mcs[WMI_EHTCAP_TXRX_MCS_NSS_IDX_80],</div><div class='add'>+					       &amp;tx_mcs[WMI_EHTCAP_TXRX_MCS_NSS_IDX_80],</div><div class='add'>+					       eht_mcs_mask);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		arg-&gt;peer_eht_mcs_count++;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arg-&gt;punct_bitmap = ~arvif-&gt;punct_bitmap;</div><div class='add'>+	arg-&gt;eht_disable_mcs15 = link_conf-&gt;eht_disable_mcs15;</div><div class='add'>+</div><div class='add'>+	if (!(link_sta-&gt;he_cap.he_cap_elem.phy_cap_info[0] &amp;</div><div class='add'>+	      IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_MASK_ALL)) {</div><div class='add'>+		if (bw_20-&gt;rx_tx_mcs13_max_nss)</div><div class='add'>+			max_nss = max(max_nss, u8_get_bits(bw_20-&gt;rx_tx_mcs13_max_nss,</div><div class='add'>+							   IEEE80211_EHT_MCS_NSS_RX));</div><div class='add'>+		if (bw_20-&gt;rx_tx_mcs11_max_nss)</div><div class='add'>+			max_nss = max(max_nss, u8_get_bits(bw_20-&gt;rx_tx_mcs11_max_nss,</div><div class='add'>+							   IEEE80211_EHT_MCS_NSS_RX));</div><div class='add'>+		if (bw_20-&gt;rx_tx_mcs9_max_nss)</div><div class='add'>+			max_nss = max(max_nss, u8_get_bits(bw_20-&gt;rx_tx_mcs9_max_nss,</div><div class='add'>+							   IEEE80211_EHT_MCS_NSS_RX));</div><div class='add'>+		if (bw_20-&gt;rx_tx_mcs7_max_nss)</div><div class='add'>+			max_nss = max(max_nss, u8_get_bits(bw_20-&gt;rx_tx_mcs7_max_nss,</div><div class='add'>+							   IEEE80211_EHT_MCS_NSS_RX));</div><div class='add'>+	} else {</div><div class='add'>+		if (bw-&gt;rx_tx_mcs13_max_nss)</div><div class='add'>+			max_nss = max(max_nss, u8_get_bits(bw-&gt;rx_tx_mcs13_max_nss,</div><div class='add'>+							   IEEE80211_EHT_MCS_NSS_RX));</div><div class='add'>+		if (bw-&gt;rx_tx_mcs11_max_nss)</div><div class='add'>+			max_nss = max(max_nss, u8_get_bits(bw-&gt;rx_tx_mcs11_max_nss,</div><div class='add'>+							   IEEE80211_EHT_MCS_NSS_RX));</div><div class='add'>+		if (bw-&gt;rx_tx_mcs9_max_nss)</div><div class='add'>+			max_nss = max(max_nss, u8_get_bits(bw-&gt;rx_tx_mcs9_max_nss,</div><div class='add'>+							   IEEE80211_EHT_MCS_NSS_RX));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	max_nss = min(max_nss, (uint8_t)eht_nss);</div><div class='add'>+</div><div class='add'>+	arg-&gt;peer_nss = min(link_sta-&gt;rx_nss, max_nss);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "mac eht peer %pM nss %d mcs cnt %d ru_punct_bitmap 0x%x\n",</div><div class='add'>+		   arsta-&gt;addr, arg-&gt;peer_nss, arg-&gt;peer_eht_mcs_count,</div><div class='add'>+		   arg-&gt;punct_bitmap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_peer_assoc_h_mlo(struct ath12k_link_sta *arsta,</div><div class='add'>+				    struct ath12k_wmi_peer_assoc_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta-&gt;ahsta);</div><div class='add'>+	struct peer_assoc_mlo_params *ml = &amp;arg-&gt;ml;</div><div class='add'>+	struct ath12k_sta *ahsta = arsta-&gt;ahsta;</div><div class='add'>+	struct ath12k_link_sta *arsta_p;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	unsigned long links;</div><div class='add'>+	u8 link_id;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!sta-&gt;mlo || ahsta-&gt;ml_peer_id == ATH12K_MLO_PEER_ID_INVALID)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ml-&gt;enabled = true;</div><div class='add'>+	ml-&gt;assoc_link = arsta-&gt;is_assoc_link;</div><div class='add'>+</div><div class='add'>+	/* For now considering the primary umac based on assoc link */</div><div class='add'>+	ml-&gt;primary_umac = arsta-&gt;is_assoc_link;</div><div class='add'>+	ml-&gt;peer_id_valid = true;</div><div class='add'>+	ml-&gt;logical_link_idx_valid = true;</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(ml-&gt;mld_addr, sta-&gt;addr);</div><div class='add'>+	ml-&gt;logical_link_idx = arsta-&gt;link_idx;</div><div class='add'>+	ml-&gt;ml_peer_id = ahsta-&gt;ml_peer_id;</div><div class='add'>+	ml-&gt;ieee_link_id = arsta-&gt;link_id;</div><div class='add'>+	ml-&gt;num_partner_links = 0;</div><div class='add'>+	ml-&gt;eml_cap = sta-&gt;eml_cap;</div><div class='add'>+	links = ahsta-&gt;links_map;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(link_id, &amp;links, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		if (i &gt;= ATH12K_WMI_MLO_MAX_LINKS)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		arsta_p = rcu_dereference(ahsta-&gt;link[link_id]);</div><div class='add'>+		arvif = rcu_dereference(ahsta-&gt;ahvif-&gt;link[link_id]);</div><div class='add'>+</div><div class='add'>+		if (arsta_p == arsta)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!arvif-&gt;is_started)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ml-&gt;partner_info[i].vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+		ml-&gt;partner_info[i].hw_link_id = arvif-&gt;ar-&gt;pdev-&gt;hw_link_id;</div><div class='add'>+		ml-&gt;partner_info[i].assoc_link = arsta_p-&gt;is_assoc_link;</div><div class='add'>+		ml-&gt;partner_info[i].primary_umac = arsta_p-&gt;is_assoc_link;</div><div class='add'>+		ml-&gt;partner_info[i].logical_link_idx_valid = true;</div><div class='add'>+		ml-&gt;partner_info[i].logical_link_idx = arsta_p-&gt;link_idx;</div><div class='add'>+		ml-&gt;num_partner_links++;</div><div class='add'>+</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_peer_assoc_prepare(struct ath12k *ar,</div><div class='add'>+				      struct ath12k_link_vif *arvif,</div><div class='add'>+				      struct ath12k_link_sta *arsta,</div><div class='add'>+				      struct ath12k_wmi_peer_assoc_arg *arg,</div><div class='add'>+				      bool reassoc)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	memset(arg, 0, sizeof(*arg));</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;ar-&gt;peer_assoc_done);</div><div class='add'>+</div><div class='add'>+	arg-&gt;peer_new_assoc = !reassoc;</div><div class='add'>+	ath12k_peer_assoc_h_basic(ar, arvif, arsta, arg);</div><div class='add'>+	ath12k_peer_assoc_h_crypto(ar, arvif, arsta, arg);</div><div class='add'>+	ath12k_peer_assoc_h_rates(ar, arvif, arsta, arg);</div><div class='add'>+	ath12k_peer_assoc_h_ht(ar, arvif, arsta, arg);</div><div class='add'>+	ath12k_peer_assoc_h_vht(ar, arvif, arsta, arg);</div><div class='add'>+	ath12k_peer_assoc_h_he(ar, arvif, arsta, arg);</div><div class='add'>+	ath12k_peer_assoc_h_he_6ghz(ar, arvif, arsta, arg);</div><div class='add'>+	ath12k_peer_assoc_h_eht(ar, arvif, arsta, arg);</div><div class='add'>+	ath12k_peer_assoc_h_qos(ar, arvif, arsta, arg);</div><div class='add'>+	ath12k_peer_assoc_h_phymode(ar, arvif, arsta, arg);</div><div class='add'>+	ath12k_peer_assoc_h_smps(arsta, arg);</div><div class='add'>+	ath12k_peer_assoc_h_mlo(arsta, arg);</div><div class='add'>+</div><div class='add'>+	arsta-&gt;peer_nss = arg-&gt;peer_nss;</div><div class='add'>+	/* TODO: amsdu_disable req? */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_setup_peer_smps(struct ath12k *ar, struct ath12k_link_vif *arvif,</div><div class='add'>+				  const u8 *addr,</div><div class='add'>+				  const struct ieee80211_sta_ht_cap *ht_cap,</div><div class='add'>+				  const struct ieee80211_he_6ghz_capa *he_6ghz_capa)</div><div class='add'>+{</div><div class='add'>+	int smps, ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!ht_cap-&gt;ht_supported &amp;&amp; !he_6ghz_capa)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_get_smps_from_capa(ht_cap, he_6ghz_capa, &amp;smps);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return ath12k_wmi_set_peer_param(ar, addr, arvif-&gt;vdev_id,</div><div class='add'>+					 WMI_PEER_MIMO_PS_STATE,</div><div class='add'>+					 ath12k_smps_map[smps]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_set_he_txbf_conf(struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	u32 param = WMI_VDEV_PARAM_SET_HEMU_MODE;</div><div class='add'>+	u32 value = 0;</div><div class='add'>+	int ret;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+</div><div class='add'>+	link_conf = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+	if (!link_conf) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "unable to access bss link conf in txbf conf\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!link_conf-&gt;he_support)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (link_conf-&gt;he_su_beamformer) {</div><div class='add'>+		value |= u32_encode_bits(HE_SU_BFER_ENABLE, HE_MODE_SU_TX_BFER);</div><div class='add'>+		if (link_conf-&gt;he_mu_beamformer &amp;&amp;</div><div class='add'>+		    ahvif-&gt;vdev_type == WMI_VDEV_TYPE_AP)</div><div class='add'>+			value |= u32_encode_bits(HE_MU_BFER_ENABLE, HE_MODE_MU_TX_BFER);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ahvif-&gt;vif-&gt;type != NL80211_IFTYPE_MESH_POINT) {</div><div class='add'>+		value |= u32_encode_bits(HE_DL_MUOFDMA_ENABLE, HE_MODE_DL_OFDMA) |</div><div class='add'>+			 u32_encode_bits(HE_UL_MUOFDMA_ENABLE, HE_MODE_UL_OFDMA);</div><div class='add'>+</div><div class='add'>+		if (link_conf-&gt;he_full_ul_mumimo)</div><div class='add'>+			value |= u32_encode_bits(HE_UL_MUMIMO_ENABLE, HE_MODE_UL_MUMIMO);</div><div class='add'>+</div><div class='add'>+		if (link_conf-&gt;he_su_beamformee)</div><div class='add'>+			value |= u32_encode_bits(HE_SU_BFEE_ENABLE, HE_MODE_SU_TX_BFEE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id, param, value);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set vdev %d HE MU mode: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	param = WMI_VDEV_PARAM_SET_HE_SOUNDING_MODE;</div><div class='add'>+	value =	u32_encode_bits(HE_VHT_SOUNDING_MODE_ENABLE, HE_VHT_SOUNDING_MODE) |</div><div class='add'>+		u32_encode_bits(HE_TRIG_NONTRIG_SOUNDING_MODE_ENABLE,</div><div class='add'>+				HE_TRIG_NONTRIG_SOUNDING_MODE);</div><div class='add'>+	ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+					    param, value);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set vdev %d sounding mode: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_vif_recalc_sta_he_txbf(struct ath12k *ar,</div><div class='add'>+					     struct ath12k_link_vif *arvif,</div><div class='add'>+					     struct ieee80211_sta_he_cap *he_cap,</div><div class='add'>+					     int *hemode)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = arvif-&gt;ahvif-&gt;vif;</div><div class='add'>+	struct ieee80211_he_cap_elem he_cap_elem = {};</div><div class='add'>+	struct ieee80211_sta_he_cap *cap_band;</div><div class='add'>+	struct cfg80211_chan_def def;</div><div class='add'>+	u8 link_id = arvif-&gt;link_id;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+</div><div class='add'>+	link_conf = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+	if (!link_conf) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "unable to access bss link conf in recalc txbf conf\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!link_conf-&gt;he_support)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ath12k_mac_vif_link_chan(vif, link_id, &amp;def)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (def.chan-&gt;band == NL80211_BAND_2GHZ)</div><div class='add'>+		cap_band = &amp;ar-&gt;mac.iftype[NL80211_BAND_2GHZ][vif-&gt;type].he_cap;</div><div class='add'>+	else</div><div class='add'>+		cap_band = &amp;ar-&gt;mac.iftype[NL80211_BAND_5GHZ][vif-&gt;type].he_cap;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;he_cap_elem, &amp;cap_band-&gt;he_cap_elem, sizeof(he_cap_elem));</div><div class='add'>+</div><div class='add'>+	*hemode = 0;</div><div class='add'>+	if (HECAP_PHY_SUBFME_GET(he_cap_elem.phy_cap_info)) {</div><div class='add'>+		if (HECAP_PHY_SUBFMR_GET(he_cap-&gt;he_cap_elem.phy_cap_info))</div><div class='add'>+			*hemode |= u32_encode_bits(HE_SU_BFEE_ENABLE, HE_MODE_SU_TX_BFEE);</div><div class='add'>+		if (HECAP_PHY_MUBFMR_GET(he_cap-&gt;he_cap_elem.phy_cap_info))</div><div class='add'>+			*hemode |= u32_encode_bits(HE_MU_BFEE_ENABLE, HE_MODE_MU_TX_BFEE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_MESH_POINT) {</div><div class='add'>+		*hemode |= u32_encode_bits(HE_DL_MUOFDMA_ENABLE, HE_MODE_DL_OFDMA) |</div><div class='add'>+			  u32_encode_bits(HE_UL_MUOFDMA_ENABLE, HE_MODE_UL_OFDMA);</div><div class='add'>+</div><div class='add'>+		if (HECAP_PHY_ULMUMIMO_GET(he_cap_elem.phy_cap_info))</div><div class='add'>+			if (HECAP_PHY_ULMUMIMO_GET(he_cap-&gt;he_cap_elem.phy_cap_info))</div><div class='add'>+				*hemode |= u32_encode_bits(HE_UL_MUMIMO_ENABLE,</div><div class='add'>+							  HE_MODE_UL_MUMIMO);</div><div class='add'>+</div><div class='add'>+		if (u32_get_bits(*hemode, HE_MODE_MU_TX_BFEE))</div><div class='add'>+			*hemode |= u32_encode_bits(HE_SU_BFEE_ENABLE, HE_MODE_SU_TX_BFEE);</div><div class='add'>+</div><div class='add'>+		if (u32_get_bits(*hemode, HE_MODE_MU_TX_BFER))</div><div class='add'>+			*hemode |= u32_encode_bits(HE_SU_BFER_ENABLE, HE_MODE_SU_TX_BFER);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_set_eht_txbf_conf(struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	u32 param = WMI_VDEV_PARAM_SET_EHT_MU_MODE;</div><div class='add'>+	u32 value = 0;</div><div class='add'>+	int ret;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+</div><div class='add'>+	link_conf = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+	if (!link_conf) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "unable to access bss link conf in eht txbf conf\n");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!link_conf-&gt;eht_support)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (link_conf-&gt;eht_su_beamformer) {</div><div class='add'>+		value |= u32_encode_bits(EHT_SU_BFER_ENABLE, EHT_MODE_SU_TX_BFER);</div><div class='add'>+		if (link_conf-&gt;eht_mu_beamformer &amp;&amp;</div><div class='add'>+		    ahvif-&gt;vdev_type == WMI_VDEV_TYPE_AP)</div><div class='add'>+			value |= u32_encode_bits(EHT_MU_BFER_ENABLE,</div><div class='add'>+						 EHT_MODE_MU_TX_BFER) |</div><div class='add'>+				 u32_encode_bits(EHT_DL_MUOFDMA_ENABLE,</div><div class='add'>+						 EHT_MODE_DL_OFDMA_MUMIMO) |</div><div class='add'>+				 u32_encode_bits(EHT_UL_MUOFDMA_ENABLE,</div><div class='add'>+						 EHT_MODE_UL_OFDMA_MUMIMO);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ahvif-&gt;vif-&gt;type != NL80211_IFTYPE_MESH_POINT) {</div><div class='add'>+		value |= u32_encode_bits(EHT_DL_MUOFDMA_ENABLE, EHT_MODE_DL_OFDMA) |</div><div class='add'>+			 u32_encode_bits(EHT_UL_MUOFDMA_ENABLE, EHT_MODE_UL_OFDMA);</div><div class='add'>+</div><div class='add'>+		if (link_conf-&gt;eht_80mhz_full_bw_ul_mumimo)</div><div class='add'>+			value |= u32_encode_bits(EHT_UL_MUMIMO_ENABLE, EHT_MODE_MUMIMO);</div><div class='add'>+</div><div class='add'>+		if (link_conf-&gt;eht_su_beamformee)</div><div class='add'>+			value |= u32_encode_bits(EHT_SU_BFEE_ENABLE,</div><div class='add'>+						 EHT_MODE_SU_TX_BFEE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id, param, value);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set vdev %d EHT MU mode: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_mac_ieee80211_sta_bw_to_wmi(struct ath12k *ar,</div><div class='add'>+					      struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	u32 bw;</div><div class='add'>+</div><div class='add'>+	switch (link_sta-&gt;bandwidth) {</div><div class='add'>+	case IEEE80211_STA_RX_BW_20:</div><div class='add'>+		bw = WMI_PEER_CHWIDTH_20MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_STA_RX_BW_40:</div><div class='add'>+		bw = WMI_PEER_CHWIDTH_40MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_STA_RX_BW_80:</div><div class='add'>+		bw = WMI_PEER_CHWIDTH_80MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_STA_RX_BW_160:</div><div class='add'>+		bw = WMI_PEER_CHWIDTH_160MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_STA_RX_BW_320:</div><div class='add'>+		bw = WMI_PEER_CHWIDTH_320MHZ;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "Invalid bandwidth %d for link station %pM\n",</div><div class='add'>+			    link_sta-&gt;bandwidth, link_sta-&gt;addr);</div><div class='add'>+		bw = WMI_PEER_CHWIDTH_20MHZ;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return bw;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_bss_assoc(struct ath12k *ar,</div><div class='add'>+			     struct ath12k_link_vif *arvif,</div><div class='add'>+			     struct ieee80211_bss_conf *bss_conf)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(ahvif);</div><div class='add'>+	struct ath12k_wmi_vdev_up_params params = {};</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	u8 link_id = bss_conf-&gt;link_id;</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	struct ieee80211_sta *ap_sta;</div><div class='add'>+	struct ath12k_sta *ahsta;</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	bool is_auth = false;</div><div class='add'>+	u32 hemode = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	struct ath12k_wmi_peer_assoc_arg *peer_arg __free(kfree) =</div><div class='add'>+					kzalloc(sizeof(*peer_arg), GFP_KERNEL);</div><div class='add'>+	if (!peer_arg)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "mac vdev %i link id %u assoc bssid %pM aid %d\n",</div><div class='add'>+		   arvif-&gt;vdev_id, link_id, arvif-&gt;bssid, ahvif-&gt;aid);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	/* During ML connection, cfg.ap_addr has the MLD address. For</div><div class='add'>+	 * non-ML connection, it has the BSSID.</div><div class='add'>+	 */</div><div class='add'>+	ap_sta = ieee80211_find_sta(vif, vif-&gt;cfg.ap_addr);</div><div class='add'>+	if (!ap_sta) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to find station entry for bss %pM vdev %i\n",</div><div class='add'>+			    vif-&gt;cfg.ap_addr, arvif-&gt;vdev_id);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ahsta = ath12k_sta_to_ahsta(ap_sta);</div><div class='add'>+</div><div class='add'>+	arsta = wiphy_dereference(ath12k_ar_to_hw(ar)-&gt;wiphy,</div><div class='add'>+				  ahsta-&gt;link[link_id]);</div><div class='add'>+	if (WARN_ON(!arsta)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	link_sta = ath12k_mac_get_link_sta(arsta);</div><div class='add'>+	if (WARN_ON(!link_sta)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_peer_assoc_prepare(ar, arvif, arsta, peer_arg, false);</div><div class='add'>+</div><div class='add'>+	/* link_sta-&gt;he_cap must be protected by rcu_read_lock */</div><div class='add'>+	ret = ath12k_mac_vif_recalc_sta_he_txbf(ar, arvif, &amp;link_sta-&gt;he_cap, &amp;hemode);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to recalc he txbf for vdev %i on bss %pM: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, bss_conf-&gt;bssid, ret);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	/* keep this before ath12k_wmi_send_peer_assoc_cmd() */</div><div class='add'>+	ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+					    WMI_VDEV_PARAM_SET_HEMU_MODE, hemode);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to submit vdev param txbf 0x%x: %d\n",</div><div class='add'>+			    hemode, ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	peer_arg-&gt;is_assoc = true;</div><div class='add'>+	ret = ath12k_wmi_send_peer_assoc_cmd(ar, peer_arg);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to run peer assoc for %pM vdev %i: %d\n",</div><div class='add'>+			    bss_conf-&gt;bssid, arvif-&gt;vdev_id, ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!wait_for_completion_timeout(&amp;ar-&gt;peer_assoc_done, 1 * HZ)) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to get peer assoc conf event for %pM vdev %i\n",</div><div class='add'>+			    bss_conf-&gt;bssid, arvif-&gt;vdev_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_setup_peer_smps(ar, arvif, bss_conf-&gt;bssid,</div><div class='add'>+				     &amp;link_sta-&gt;ht_cap, &amp;link_sta-&gt;he_6ghz_capa);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to setup peer SMPS for vdev %d: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(arvif-&gt;is_up);</div><div class='add'>+</div><div class='add'>+	ahvif-&gt;aid = vif-&gt;cfg.aid;</div><div class='add'>+	ether_addr_copy(arvif-&gt;bssid, bss_conf-&gt;bssid);</div><div class='add'>+</div><div class='add'>+	params.vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+	params.aid = ahvif-&gt;aid;</div><div class='add'>+	params.bssid = arvif-&gt;bssid;</div><div class='add'>+	params.tx_bssid = ath12k_mac_get_tx_bssid(arvif);</div><div class='add'>+	if (params.tx_bssid) {</div><div class='add'>+		params.nontx_profile_idx = bss_conf-&gt;bssid_index;</div><div class='add'>+		params.nontx_profile_cnt = 1 &lt;&lt; bss_conf-&gt;bssid_indicator;</div><div class='add'>+	}</div><div class='add'>+	ret = ath12k_wmi_vdev_up(ar, &amp;params);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set vdev %d up: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arvif-&gt;is_up = true;</div><div class='add'>+	arvif-&gt;rekey_data.enable_offload = false;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "mac vdev %d up (associated) bssid %pM aid %d\n",</div><div class='add'>+		   arvif-&gt;vdev_id, bss_conf-&gt;bssid, vif-&gt;cfg.aid);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	peer = ath12k_peer_find(ar-&gt;ab, arvif-&gt;vdev_id, arvif-&gt;bssid);</div><div class='add'>+	if (peer &amp;&amp; peer-&gt;is_authorized)</div><div class='add'>+		is_auth = true;</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	/* Authorize BSS Peer */</div><div class='add'>+	if (is_auth) {</div><div class='add'>+		ret = ath12k_wmi_set_peer_param(ar, arvif-&gt;bssid,</div><div class='add'>+						arvif-&gt;vdev_id,</div><div class='add'>+						WMI_PEER_AUTHORIZE,</div><div class='add'>+						1);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "Unable to authorize BSS peer: %d\n", ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_send_obss_spr_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+					   &amp;bss_conf-&gt;he_obss_pd);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set vdev %i OBSS PD parameters: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_11D_OFFLOAD, ar-&gt;ab-&gt;wmi_ab.svc_map) &amp;&amp;</div><div class='add'>+	    ahvif-&gt;vdev_type == WMI_VDEV_TYPE_STA &amp;&amp;</div><div class='add'>+	    ahvif-&gt;vdev_subtype == WMI_VDEV_SUBTYPE_NONE)</div><div class='add'>+		ath12k_mac_11d_scan_stop_all(ar-&gt;ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_bss_disassoc(struct ath12k *ar,</div><div class='add'>+				struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac vdev %i disassoc bssid %pM\n",</div><div class='add'>+		   arvif-&gt;vdev_id, arvif-&gt;bssid);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_vdev_down(ar, arvif-&gt;vdev_id);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to down vdev %i: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+</div><div class='add'>+	arvif-&gt;is_up = false;</div><div class='add'>+</div><div class='add'>+	memset(&amp;arvif-&gt;rekey_data, 0, sizeof(arvif-&gt;rekey_data));</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work(&amp;arvif-&gt;connection_loss_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_mac_get_rate_hw_value(int bitrate)</div><div class='add'>+{</div><div class='add'>+	u32 preamble;</div><div class='add'>+	u16 hw_value;</div><div class='add'>+	int rate;</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	if (ath12k_mac_bitrate_is_cck(bitrate))</div><div class='add'>+		preamble = WMI_RATE_PREAMBLE_CCK;</div><div class='add'>+	else</div><div class='add'>+		preamble = WMI_RATE_PREAMBLE_OFDM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ath12k_legacy_rates); i++) {</div><div class='add'>+		if (ath12k_legacy_rates[i].bitrate != bitrate)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		hw_value = ath12k_legacy_rates[i].hw_value;</div><div class='add'>+		rate = ATH12K_HW_RATE_CODE(hw_value, 0, preamble);</div><div class='add'>+</div><div class='add'>+		return rate;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_recalculate_mgmt_rate(struct ath12k *ar,</div><div class='add'>+					 struct ath12k_link_vif *arvif,</div><div class='add'>+					 struct cfg80211_chan_def *def)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+	struct ieee80211_hw *hw = ath12k_ar_to_hw(ar);</div><div class='add'>+	const struct ieee80211_supported_band *sband;</div><div class='add'>+	struct ieee80211_bss_conf *bss_conf;</div><div class='add'>+	u8 basic_rate_idx;</div><div class='add'>+	int hw_rate_code;</div><div class='add'>+	u32 vdev_param;</div><div class='add'>+	u16 bitrate;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	bss_conf = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+	if (!bss_conf) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "unable to access bss link conf in mgmt rate calc for vif %pM link %u\n",</div><div class='add'>+			    vif-&gt;addr, arvif-&gt;link_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sband = hw-&gt;wiphy-&gt;bands[def-&gt;chan-&gt;band];</div><div class='add'>+	if (bss_conf-&gt;basic_rates)</div><div class='add'>+		basic_rate_idx = __ffs(bss_conf-&gt;basic_rates);</div><div class='add'>+	else</div><div class='add'>+		basic_rate_idx = 0;</div><div class='add'>+	bitrate = sband-&gt;bitrates[basic_rate_idx].bitrate;</div><div class='add'>+</div><div class='add'>+	hw_rate_code = ath12k_mac_get_rate_hw_value(bitrate);</div><div class='add'>+	if (hw_rate_code &lt; 0) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "bitrate not supported %d\n", bitrate);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vdev_param = WMI_VDEV_PARAM_MGMT_RATE;</div><div class='add'>+	ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id, vdev_param,</div><div class='add'>+					    hw_rate_code);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set mgmt tx rate %d\n", ret);</div><div class='add'>+</div><div class='add'>+	vdev_param = WMI_VDEV_PARAM_BEACON_RATE;</div><div class='add'>+	ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id, vdev_param,</div><div class='add'>+					    hw_rate_code);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set beacon tx rate %d\n", ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_bcn_tx_event(struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+</div><div class='add'>+	link_conf = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+	if (!link_conf) {</div><div class='add'>+		ath12k_warn(arvif-&gt;ar-&gt;ab, "failed to get link conf for vdev %u\n",</div><div class='add'>+			    arvif-&gt;vdev_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link_conf-&gt;color_change_active) {</div><div class='add'>+		if (ieee80211_beacon_cntdwn_is_complete(vif, arvif-&gt;link_id)) {</div><div class='add'>+			ieee80211_color_change_finish(vif, arvif-&gt;link_id);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ieee80211_beacon_update_cntdwn(vif, arvif-&gt;link_id);</div><div class='add'>+		ath12k_mac_setup_bcn_tmpl(arvif);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_bcn_tx_work(struct wiphy *wiphy, struct wiphy_work *work)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_link_vif *arvif = container_of(work, struct ath12k_link_vif,</div><div class='add'>+						     bcn_tx_work);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(wiphy);</div><div class='add'>+	ath12k_mac_bcn_tx_event(arvif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_init_arvif(struct ath12k_vif *ahvif,</div><div class='add'>+				  struct ath12k_link_vif *arvif, int link_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = ahvif-&gt;ah;</div><div class='add'>+	u8 _link_id;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!arvif))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(link_id &gt;= ATH12K_NUM_MAX_LINKS))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (link_id &lt; 0)</div><div class='add'>+		_link_id = 0;</div><div class='add'>+	else</div><div class='add'>+		_link_id = link_id;</div><div class='add'>+</div><div class='add'>+	arvif-&gt;ahvif = ahvif;</div><div class='add'>+	arvif-&gt;link_id = _link_id;</div><div class='add'>+</div><div class='add'>+	/* Protects the datapath stats update on a per link basis */</div><div class='add'>+	spin_lock_init(&amp;arvif-&gt;link_stats_lock);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;arvif-&gt;list);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;arvif-&gt;connection_loss_work,</div><div class='add'>+			  ath12k_mac_vif_sta_connection_loss_work);</div><div class='add'>+	wiphy_work_init(&amp;arvif-&gt;bcn_tx_work, ath12k_mac_bcn_tx_work);</div><div class='add'>+</div><div class='add'>+	arvif-&gt;num_stations = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(arvif-&gt;bitrate_mask.control); i++) {</div><div class='add'>+		arvif-&gt;bitrate_mask.control[i].legacy = 0xffffffff;</div><div class='add'>+		arvif-&gt;bitrate_mask.control[i].gi = NL80211_TXRATE_DEFAULT_GI;</div><div class='add'>+		memset(arvif-&gt;bitrate_mask.control[i].ht_mcs, 0xff,</div><div class='add'>+		       sizeof(arvif-&gt;bitrate_mask.control[i].ht_mcs));</div><div class='add'>+		memset(arvif-&gt;bitrate_mask.control[i].vht_mcs, 0xff,</div><div class='add'>+		       sizeof(arvif-&gt;bitrate_mask.control[i].vht_mcs));</div><div class='add'>+		memset(arvif-&gt;bitrate_mask.control[i].he_mcs, 0xff,</div><div class='add'>+		       sizeof(arvif-&gt;bitrate_mask.control[i].he_mcs));</div><div class='add'>+		memset(arvif-&gt;bitrate_mask.control[i].eht_mcs, 0xff,</div><div class='add'>+		       sizeof(arvif-&gt;bitrate_mask.control[i].eht_mcs));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Handle MLO related assignments */</div><div class='add'>+	if (link_id &gt;= 0) {</div><div class='add'>+		rcu_assign_pointer(ahvif-&gt;link[arvif-&gt;link_id], arvif);</div><div class='add'>+		ahvif-&gt;links_map |= BIT(_link_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_generic_dbg(ATH12K_DBG_MAC,</div><div class='add'>+			   "mac init link arvif (link_id %d%s) for vif %pM. links_map 0x%x",</div><div class='add'>+			   _link_id, (link_id &lt; 0) ? " deflink" : "", ahvif-&gt;vif-&gt;addr,</div><div class='add'>+			   ahvif-&gt;links_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_remove_link_interface(struct ieee80211_hw *hw,</div><div class='add'>+					     struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	struct ath12k_hw *ah = hw-&gt;priv;</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;arvif-&gt;connection_loss_work);</div><div class='add'>+	wiphy_work_cancel(ath12k_ar_to_hw(ar)-&gt;wiphy, &amp;arvif-&gt;bcn_tx_work);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac remove link interface (vdev %d link id %d)",</div><div class='add'>+		   arvif-&gt;vdev_id, arvif-&gt;link_id);</div><div class='add'>+</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_11D_OFFLOAD, ar-&gt;ab-&gt;wmi_ab.svc_map) &amp;&amp;</div><div class='add'>+	    ahvif-&gt;vdev_type == WMI_VDEV_TYPE_STA &amp;&amp;</div><div class='add'>+	    ahvif-&gt;vdev_subtype == WMI_VDEV_SUBTYPE_NONE)</div><div class='add'>+		ath12k_mac_11d_scan_stop(ar);</div><div class='add'>+</div><div class='add'>+	if (ahvif-&gt;vdev_type == WMI_VDEV_TYPE_AP) {</div><div class='add'>+		ret = ath12k_peer_delete(ar, arvif-&gt;vdev_id, arvif-&gt;bssid);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to submit AP self-peer removal on vdev %d link id %d: %d",</div><div class='add'>+				    arvif-&gt;vdev_id, arvif-&gt;link_id, ret);</div><div class='add'>+	}</div><div class='add'>+	ath12k_mac_vdev_delete(ar, arvif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ath12k_link_vif *ath12k_mac_assign_link_vif(struct ath12k_hw *ah,</div><div class='add'>+							  struct ieee80211_vif *vif,</div><div class='add'>+							  u8 link_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	arvif = wiphy_dereference(ah-&gt;hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+	if (arvif)</div><div class='add'>+		return arvif;</div><div class='add'>+</div><div class='add'>+	/* If this is the first link arvif being created for an ML VIF</div><div class='add'>+	 * use the preallocated deflink memory except for scan arvifs</div><div class='add'>+	 */</div><div class='add'>+	if (!ahvif-&gt;links_map &amp;&amp; link_id &lt; ATH12K_FIRST_SCAN_LINK) {</div><div class='add'>+		arvif = &amp;ahvif-&gt;deflink;</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+			arvif-&gt;is_sta_assoc_link = true;</div><div class='add'>+	} else {</div><div class='add'>+		arvif = kzalloc(sizeof(*arvif), GFP_KERNEL);</div><div class='add'>+		if (!arvif)</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_mac_init_arvif(ahvif, arvif, link_id);</div><div class='add'>+</div><div class='add'>+	return arvif;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_unassign_link_vif(struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	struct ath12k_hw *ah = ahvif-&gt;ah;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(ahvif-&gt;link[arvif-&gt;link_id], NULL);</div><div class='add'>+	synchronize_rcu();</div><div class='add'>+	ahvif-&gt;links_map &amp;= ~BIT(arvif-&gt;link_id);</div><div class='add'>+</div><div class='add'>+	if (arvif != &amp;ahvif-&gt;deflink)</div><div class='add'>+		kfree(arvif);</div><div class='add'>+	else</div><div class='add'>+		memset(arvif, 0, sizeof(*arvif));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_mac_op_change_vif_links(struct ieee80211_hw *hw,</div><div class='add'>+			       struct ieee80211_vif *vif,</div><div class='add'>+			       u16 old_links, u16 new_links,</div><div class='add'>+			       struct ieee80211_bss_conf *ol[IEEE80211_MLD_MAX_NUM_LINKS])</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	unsigned long to_remove = old_links &amp; ~new_links;</div><div class='add'>+	unsigned long to_add = ~old_links &amp; new_links;</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	u8 link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ath12k_generic_dbg(ATH12K_DBG_MAC,</div><div class='add'>+			   "mac vif link changed for MLD %pM old_links 0x%x new_links 0x%x\n",</div><div class='add'>+			   vif-&gt;addr, old_links, new_links);</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(link_id, &amp;to_add, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		arvif = wiphy_dereference(hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+		/* mac80211 wants to add link but driver already has the</div><div class='add'>+		 * link. This should not happen ideally.</div><div class='add'>+		 */</div><div class='add'>+		if (WARN_ON(arvif))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		arvif = ath12k_mac_assign_link_vif(ah, vif, link_id);</div><div class='add'>+		if (WARN_ON(!arvif))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(link_id, &amp;to_remove, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		arvif = wiphy_dereference(hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+		if (WARN_ON(!arvif))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (!arvif-&gt;is_created)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!arvif-&gt;ar))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		ath12k_mac_remove_link_interface(hw, arvif);</div><div class='add'>+		ath12k_mac_unassign_link_vif(arvif);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_fils_discovery(struct ath12k_link_vif *arvif,</div><div class='add'>+				     struct ieee80211_bss_conf *info)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ieee80211_hw *hw = ath12k_ar_to_hw(ar);</div><div class='add'>+	struct sk_buff *tmpl;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 interval;</div><div class='add'>+	bool unsol_bcast_probe_resp_enabled = false;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;fils_discovery.max_interval) {</div><div class='add'>+		interval = info-&gt;fils_discovery.max_interval;</div><div class='add'>+</div><div class='add'>+		tmpl = ieee80211_get_fils_discovery_tmpl(hw, vif);</div><div class='add'>+		if (tmpl)</div><div class='add'>+			ret = ath12k_wmi_fils_discovery_tmpl(ar, arvif-&gt;vdev_id,</div><div class='add'>+							     tmpl);</div><div class='add'>+	} else if (info-&gt;unsol_bcast_probe_resp_interval) {</div><div class='add'>+		unsol_bcast_probe_resp_enabled = 1;</div><div class='add'>+		interval = info-&gt;unsol_bcast_probe_resp_interval;</div><div class='add'>+</div><div class='add'>+		tmpl = ieee80211_get_unsol_bcast_probe_resp_tmpl(hw, vif);</div><div class='add'>+		if (tmpl)</div><div class='add'>+			ret = ath12k_wmi_probe_resp_tmpl(ar, arvif-&gt;vdev_id,</div><div class='add'>+							 tmpl);</div><div class='add'>+	} else { /* Disable */</div><div class='add'>+		return ath12k_wmi_fils_discovery(ar, arvif-&gt;vdev_id, 0, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!tmpl) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "mac vdev %i failed to retrieve %s template\n",</div><div class='add'>+			    arvif-&gt;vdev_id, (unsol_bcast_probe_resp_enabled ?</div><div class='add'>+			    "unsolicited broadcast probe response" :</div><div class='add'>+			    "FILS discovery"));</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+	kfree_skb(tmpl);</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = ath12k_wmi_fils_discovery(ar, arvif-&gt;vdev_id, interval,</div><div class='add'>+						unsol_bcast_probe_resp_enabled);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_op_vif_cfg_changed(struct ieee80211_hw *hw,</div><div class='add'>+					  struct ieee80211_vif *vif,</div><div class='add'>+					  u64 changed)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	unsigned long links = ahvif-&gt;links_map;</div><div class='add'>+	struct ieee80211_bss_conf *info;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct ath12k_sta *ahsta;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	u8 link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_SSID &amp;&amp; vif-&gt;type == NL80211_IFTYPE_AP) {</div><div class='add'>+		ahvif-&gt;u.ap.ssid_len = vif-&gt;cfg.ssid_len;</div><div class='add'>+		if (vif-&gt;cfg.ssid_len)</div><div class='add'>+			memcpy(ahvif-&gt;u.ap.ssid, vif-&gt;cfg.ssid, vif-&gt;cfg.ssid_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_ASSOC) {</div><div class='add'>+		if (vif-&gt;cfg.assoc) {</div><div class='add'>+			/* only in station mode we can get here, so it's safe</div><div class='add'>+			 * to use ap_addr</div><div class='add'>+			 */</div><div class='add'>+			rcu_read_lock();</div><div class='add'>+			sta = ieee80211_find_sta(vif, vif-&gt;cfg.ap_addr);</div><div class='add'>+			if (!sta) {</div><div class='add'>+				rcu_read_unlock();</div><div class='add'>+				WARN_ONCE(1, "failed to find sta with addr %pM\n",</div><div class='add'>+					  vif-&gt;cfg.ap_addr);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ahsta = ath12k_sta_to_ahsta(sta);</div><div class='add'>+			arvif = wiphy_dereference(hw-&gt;wiphy,</div><div class='add'>+						  ahvif-&gt;link[ahsta-&gt;assoc_link_id]);</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+			ar = arvif-&gt;ar;</div><div class='add'>+			/* there is no reason for which an assoc link's</div><div class='add'>+			 * bss info does not exist</div><div class='add'>+			 */</div><div class='add'>+			info = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+			ath12k_bss_assoc(ar, arvif, info);</div><div class='add'>+</div><div class='add'>+			/* exclude assoc link as it is done above */</div><div class='add'>+			links &amp;= ~BIT(ahsta-&gt;assoc_link_id);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for_each_set_bit(link_id, &amp;links, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+			arvif = wiphy_dereference(hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+			if (!arvif || !arvif-&gt;ar)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			ar = arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+			if (vif-&gt;cfg.assoc) {</div><div class='add'>+				info = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+				if (!info)</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				ath12k_bss_assoc(ar, arvif, info);</div><div class='add'>+			} else {</div><div class='add'>+				ath12k_bss_disassoc(ar, arvif);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_vif_setup_ps(struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ieee80211_vif *vif = arvif-&gt;ahvif-&gt;vif;</div><div class='add'>+	struct ieee80211_conf *conf = &amp;ath12k_ar_to_hw(ar)-&gt;conf;</div><div class='add'>+	enum wmi_sta_powersave_param param;</div><div class='add'>+	struct ieee80211_bss_conf *info;</div><div class='add'>+	enum wmi_sta_ps_mode psmode;</div><div class='add'>+	int ret;</div><div class='add'>+	int timeout;</div><div class='add'>+	bool enable_ps;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	enable_ps = arvif-&gt;ahvif-&gt;ps;</div><div class='add'>+	if (enable_ps) {</div><div class='add'>+		psmode = WMI_STA_PS_MODE_ENABLED;</div><div class='add'>+		param = WMI_STA_PS_PARAM_INACTIVITY_TIME;</div><div class='add'>+</div><div class='add'>+		timeout = conf-&gt;dynamic_ps_timeout;</div><div class='add'>+		if (timeout == 0) {</div><div class='add'>+			info = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+			if (!info) {</div><div class='add'>+				ath12k_warn(ar-&gt;ab, "unable to access bss link conf in setup ps for vif %pM link %u\n",</div><div class='add'>+					    vif-&gt;addr, arvif-&gt;link_id);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* firmware doesn't like 0 */</div><div class='add'>+			timeout = ieee80211_tu_to_usec(info-&gt;beacon_int) / 1000;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ath12k_wmi_set_sta_ps_param(ar, arvif-&gt;vdev_id, param,</div><div class='add'>+						  timeout);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to set inactivity time for vdev %d: %i\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		psmode = WMI_STA_PS_MODE_DISABLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac vdev %d psmode %s\n",</div><div class='add'>+		   arvif-&gt;vdev_id, psmode ? "enable" : "disable");</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_pdev_set_ps_mode(ar, arvif-&gt;vdev_id, psmode);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set sta power save mode %d for vdev %d: %d\n",</div><div class='add'>+			    psmode, arvif-&gt;vdev_id, ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_mac_supports_tpc(struct ath12k *ar, struct ath12k_vif *ahvif,</div><div class='add'>+				    const struct cfg80211_chan_def *chandef)</div><div class='add'>+{</div><div class='add'>+	return ath12k_wmi_supports_6ghz_cc_ext(ar) &amp;&amp;</div><div class='add'>+		test_bit(WMI_TLV_SERVICE_EXT_TPC_REG_SUPPORT, ar-&gt;ab-&gt;wmi_ab.svc_map) &amp;&amp;</div><div class='add'>+		(ahvif-&gt;vdev_type == WMI_VDEV_TYPE_STA  ||</div><div class='add'>+		 ahvif-&gt;vdev_type == WMI_VDEV_TYPE_AP) &amp;&amp;</div><div class='add'>+		ahvif-&gt;vdev_subtype == WMI_VDEV_SUBTYPE_NONE &amp;&amp;</div><div class='add'>+		chandef-&gt;chan &amp;&amp;</div><div class='add'>+		chandef-&gt;chan-&gt;band == NL80211_BAND_6GHZ;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_vdev_params_up(struct ath12k *ar,</div><div class='add'>+				      struct ath12k_link_vif *arvif,</div><div class='add'>+				      struct ath12k_link_vif *tx_arvif,</div><div class='add'>+				      struct ieee80211_bss_conf *info, u16 aid)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_vdev_up_params params = {</div><div class='add'>+		.vdev_id = arvif-&gt;vdev_id,</div><div class='add'>+		.aid = aid,</div><div class='add'>+		.bssid = arvif-&gt;bssid</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (tx_arvif) {</div><div class='add'>+		params.tx_bssid = tx_arvif-&gt;bssid;</div><div class='add'>+		params.nontx_profile_idx = info-&gt;bssid_index;</div><div class='add'>+		params.nontx_profile_cnt = 1 &lt;&lt; info-&gt;bssid_indicator;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_vdev_up(arvif-&gt;ar, &amp;params);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to bring vdev up %d: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_bss_info_changed(struct ath12k *ar,</div><div class='add'>+					struct ath12k_link_vif *arvif,</div><div class='add'>+					struct ieee80211_bss_conf *info,</div><div class='add'>+					u64 changed)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(ahvif);</div><div class='add'>+	struct ieee80211_vif_cfg *vif_cfg = &amp;vif-&gt;cfg;</div><div class='add'>+	struct ath12k_link_vif *tx_arvif;</div><div class='add'>+	struct cfg80211_chan_def def;</div><div class='add'>+	u32 param_id, param_value;</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	u32 vdev_param;</div><div class='add'>+	int mcast_rate;</div><div class='add'>+	u32 preamble;</div><div class='add'>+	u16 hw_value;</div><div class='add'>+	u16 bitrate;</div><div class='add'>+	u8 rateidx;</div><div class='add'>+	u32 rate;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_BEACON_INT) {</div><div class='add'>+		arvif-&gt;beacon_interval = info-&gt;beacon_int;</div><div class='add'>+</div><div class='add'>+		param_id = WMI_VDEV_PARAM_BEACON_INTERVAL;</div><div class='add'>+		ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+						    param_id,</div><div class='add'>+						    arvif-&gt;beacon_interval);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "Failed to set beacon interval for VDEV: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id);</div><div class='add'>+		else</div><div class='add'>+			ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+				   "Beacon interval: %d set for VDEV: %d\n",</div><div class='add'>+				   arvif-&gt;beacon_interval, arvif-&gt;vdev_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_BEACON) {</div><div class='add'>+		param_id = WMI_PDEV_PARAM_BEACON_TX_MODE;</div><div class='add'>+		param_value = WMI_BEACON_BURST_MODE;</div><div class='add'>+		ret = ath12k_wmi_pdev_set_param(ar, param_id,</div><div class='add'>+						param_value, ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "Failed to set beacon mode for VDEV: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id);</div><div class='add'>+		else</div><div class='add'>+			ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+				   "Set burst beacon mode for VDEV: %d\n",</div><div class='add'>+				   arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+		/* In MBSSID case, need to install transmitting VIF's template first */</div><div class='add'>+</div><div class='add'>+		ret = ath12k_mac_setup_bcn_tmpl(arvif);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to update bcn template: %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+</div><div class='add'>+		if (!arvif-&gt;is_csa_in_progress)</div><div class='add'>+			goto skip_vdev_up;</div><div class='add'>+</div><div class='add'>+		tx_arvif = ath12k_mac_get_tx_arvif(arvif, info);</div><div class='add'>+		if (tx_arvif &amp;&amp; arvif != tx_arvif &amp;&amp; tx_arvif-&gt;is_csa_in_progress)</div><div class='add'>+			/* skip non tx vif's */</div><div class='add'>+			goto skip_vdev_up;</div><div class='add'>+</div><div class='add'>+		ath12k_wmi_vdev_params_up(ar, arvif, tx_arvif, info, ahvif-&gt;aid);</div><div class='add'>+</div><div class='add'>+		arvif-&gt;is_csa_in_progress = false;</div><div class='add'>+</div><div class='add'>+		if (tx_arvif &amp;&amp; arvif == tx_arvif) {</div><div class='add'>+			struct ath12k_link_vif *arvif_itr;</div><div class='add'>+</div><div class='add'>+			list_for_each_entry(arvif_itr, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+				if (!arvif_itr-&gt;is_csa_in_progress)</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				ath12k_wmi_vdev_params_up(ar, arvif, tx_arvif,</div><div class='add'>+							  info, ahvif-&gt;aid);</div><div class='add'>+				arvif_itr-&gt;is_csa_in_progress = false;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+skip_vdev_up:</div><div class='add'>+</div><div class='add'>+	if (changed &amp; (BSS_CHANGED_BEACON_INFO | BSS_CHANGED_BEACON)) {</div><div class='add'>+		arvif-&gt;dtim_period = info-&gt;dtim_period;</div><div class='add'>+</div><div class='add'>+		param_id = WMI_VDEV_PARAM_DTIM_PERIOD;</div><div class='add'>+		ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+						    param_id,</div><div class='add'>+						    arvif-&gt;dtim_period);</div><div class='add'>+</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "Failed to set dtim period for VDEV %d: %i\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+		else</div><div class='add'>+			ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+				   "DTIM period: %d set for VDEV: %d\n",</div><div class='add'>+				   arvif-&gt;dtim_period, arvif-&gt;vdev_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_SSID &amp;&amp;</div><div class='add'>+	    vif-&gt;type == NL80211_IFTYPE_AP) {</div><div class='add'>+		ahvif-&gt;u.ap.ssid_len = vif-&gt;cfg.ssid_len;</div><div class='add'>+		if (vif-&gt;cfg.ssid_len)</div><div class='add'>+			memcpy(ahvif-&gt;u.ap.ssid, vif-&gt;cfg.ssid, vif-&gt;cfg.ssid_len);</div><div class='add'>+		ahvif-&gt;u.ap.hidden_ssid = info-&gt;hidden_ssid;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_BSSID &amp;&amp; !is_zero_ether_addr(info-&gt;bssid))</div><div class='add'>+		ether_addr_copy(arvif-&gt;bssid, info-&gt;bssid);</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_BEACON_ENABLED) {</div><div class='add'>+		if (info-&gt;enable_beacon) {</div><div class='add'>+			ret = ath12k_mac_set_he_txbf_conf(arvif);</div><div class='add'>+			if (ret)</div><div class='add'>+				ath12k_warn(ar-&gt;ab,</div><div class='add'>+					    "failed to set HE TXBF config for vdev: %d\n",</div><div class='add'>+					    arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+			ret = ath12k_mac_set_eht_txbf_conf(arvif);</div><div class='add'>+			if (ret)</div><div class='add'>+				ath12k_warn(ar-&gt;ab,</div><div class='add'>+					    "failed to set EHT TXBF config for vdev: %d\n",</div><div class='add'>+					    arvif-&gt;vdev_id);</div><div class='add'>+		}</div><div class='add'>+		ath12k_control_beaconing(arvif, info);</div><div class='add'>+</div><div class='add'>+		if (arvif-&gt;is_up &amp;&amp; info-&gt;he_support &amp;&amp;</div><div class='add'>+		    info-&gt;he_oper.params) {</div><div class='add'>+			/* TODO: Extend to support 1024 BA Bitmap size */</div><div class='add'>+			ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+							    WMI_VDEV_PARAM_BA_MODE,</div><div class='add'>+							    WMI_BA_MODE_BUFFER_SIZE_256);</div><div class='add'>+			if (ret)</div><div class='add'>+				ath12k_warn(ar-&gt;ab,</div><div class='add'>+					    "failed to set BA BUFFER SIZE 256 for vdev: %d\n",</div><div class='add'>+					    arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+			param_id = WMI_VDEV_PARAM_HEOPS_0_31;</div><div class='add'>+			param_value = info-&gt;he_oper.params;</div><div class='add'>+			ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+							    param_id, param_value);</div><div class='add'>+			ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+				   "he oper param: %x set for VDEV: %d\n",</div><div class='add'>+				   param_value, arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+			if (ret)</div><div class='add'>+				ath12k_warn(ar-&gt;ab, "Failed to set he oper params %x for VDEV %d: %i\n",</div><div class='add'>+					    param_value, arvif-&gt;vdev_id, ret);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_ERP_CTS_PROT) {</div><div class='add'>+		u32 cts_prot;</div><div class='add'>+</div><div class='add'>+		cts_prot = !!(info-&gt;use_cts_prot);</div><div class='add'>+		param_id = WMI_VDEV_PARAM_PROTECTION_MODE;</div><div class='add'>+</div><div class='add'>+		if (arvif-&gt;is_started) {</div><div class='add'>+			ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+							    param_id, cts_prot);</div><div class='add'>+			if (ret)</div><div class='add'>+				ath12k_warn(ar-&gt;ab, "Failed to set CTS prot for VDEV: %d\n",</div><div class='add'>+					    arvif-&gt;vdev_id);</div><div class='add'>+			else</div><div class='add'>+				ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "Set CTS prot: %d for VDEV: %d\n",</div><div class='add'>+					   cts_prot, arvif-&gt;vdev_id);</div><div class='add'>+		} else {</div><div class='add'>+			ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "defer protection mode setup, vdev is not ready yet\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_ERP_SLOT) {</div><div class='add'>+		u32 slottime;</div><div class='add'>+</div><div class='add'>+		if (info-&gt;use_short_slot)</div><div class='add'>+			slottime = WMI_VDEV_SLOT_TIME_SHORT; /* 9us */</div><div class='add'>+</div><div class='add'>+		else</div><div class='add'>+			slottime = WMI_VDEV_SLOT_TIME_LONG; /* 20us */</div><div class='add'>+</div><div class='add'>+		param_id = WMI_VDEV_PARAM_SLOT_TIME;</div><div class='add'>+		ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+						    param_id, slottime);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "Failed to set erp slot for VDEV: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id);</div><div class='add'>+		else</div><div class='add'>+			ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+				   "Set slottime: %d for VDEV: %d\n",</div><div class='add'>+				   slottime, arvif-&gt;vdev_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_ERP_PREAMBLE) {</div><div class='add'>+		u32 preamble;</div><div class='add'>+</div><div class='add'>+		if (info-&gt;use_short_preamble)</div><div class='add'>+			preamble = WMI_VDEV_PREAMBLE_SHORT;</div><div class='add'>+		else</div><div class='add'>+			preamble = WMI_VDEV_PREAMBLE_LONG;</div><div class='add'>+</div><div class='add'>+		param_id = WMI_VDEV_PARAM_PREAMBLE;</div><div class='add'>+		ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+						    param_id, preamble);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "Failed to set preamble for VDEV: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id);</div><div class='add'>+		else</div><div class='add'>+			ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+				   "Set preamble: %d for VDEV: %d\n",</div><div class='add'>+				   preamble, arvif-&gt;vdev_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_ASSOC) {</div><div class='add'>+		if (vif-&gt;cfg.assoc)</div><div class='add'>+			ath12k_bss_assoc(ar, arvif, info);</div><div class='add'>+		else</div><div class='add'>+			ath12k_bss_disassoc(ar, arvif);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_TXPOWER) {</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac vdev_id %i txpower %d\n",</div><div class='add'>+			   arvif-&gt;vdev_id, info-&gt;txpower);</div><div class='add'>+</div><div class='add'>+		arvif-&gt;txpower = info-&gt;txpower;</div><div class='add'>+		ath12k_mac_txpower_recalc(ar);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_MCAST_RATE &amp;&amp;</div><div class='add'>+	    !ath12k_mac_vif_link_chan(vif, arvif-&gt;link_id, &amp;def)) {</div><div class='add'>+		band = def.chan-&gt;band;</div><div class='add'>+		mcast_rate = info-&gt;mcast_rate[band];</div><div class='add'>+</div><div class='add'>+		if (mcast_rate &gt; 0) {</div><div class='add'>+			rateidx = mcast_rate - 1;</div><div class='add'>+		} else {</div><div class='add'>+			if (info-&gt;basic_rates)</div><div class='add'>+				rateidx = __ffs(info-&gt;basic_rates);</div><div class='add'>+			else</div><div class='add'>+				rateidx = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ar-&gt;pdev-&gt;cap.supported_bands &amp; WMI_HOST_WLAN_5GHZ_CAP)</div><div class='add'>+			rateidx += ATH12K_MAC_FIRST_OFDM_RATE_IDX;</div><div class='add'>+</div><div class='add'>+		bitrate = ath12k_legacy_rates[rateidx].bitrate;</div><div class='add'>+		hw_value = ath12k_legacy_rates[rateidx].hw_value;</div><div class='add'>+</div><div class='add'>+		if (ath12k_mac_bitrate_is_cck(bitrate))</div><div class='add'>+			preamble = WMI_RATE_PREAMBLE_CCK;</div><div class='add'>+		else</div><div class='add'>+			preamble = WMI_RATE_PREAMBLE_OFDM;</div><div class='add'>+</div><div class='add'>+		rate = ATH12K_HW_RATE_CODE(hw_value, 0, preamble);</div><div class='add'>+</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+			   "mac vdev %d mcast_rate %x\n",</div><div class='add'>+			   arvif-&gt;vdev_id, rate);</div><div class='add'>+</div><div class='add'>+		vdev_param = WMI_VDEV_PARAM_MCAST_DATA_RATE;</div><div class='add'>+		ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+						    vdev_param, rate);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "failed to set mcast rate on vdev %i: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id,  ret);</div><div class='add'>+</div><div class='add'>+		vdev_param = WMI_VDEV_PARAM_BCAST_DATA_RATE;</div><div class='add'>+		ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+						    vdev_param, rate);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "failed to set bcast rate on vdev %i: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id,  ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_BASIC_RATES &amp;&amp;</div><div class='add'>+	    !ath12k_mac_vif_link_chan(vif, arvif-&gt;link_id, &amp;def))</div><div class='add'>+		ath12k_recalculate_mgmt_rate(ar, arvif, &amp;def);</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_TWT) {</div><div class='add'>+		if (info-&gt;twt_requester || info-&gt;twt_responder)</div><div class='add'>+			ath12k_wmi_send_twt_enable_cmd(ar, ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+		else</div><div class='add'>+			ath12k_wmi_send_twt_disable_cmd(ar, ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_HE_OBSS_PD)</div><div class='add'>+		ath12k_wmi_send_obss_spr_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+					     &amp;info-&gt;he_obss_pd);</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_HE_BSS_COLOR) {</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_AP) {</div><div class='add'>+			ret = ath12k_wmi_obss_color_cfg_cmd(ar,</div><div class='add'>+							    arvif-&gt;vdev_id,</div><div class='add'>+							    info-&gt;he_bss_color.color,</div><div class='add'>+							    ATH12K_BSS_COLOR_AP_PERIODS,</div><div class='add'>+							    info-&gt;he_bss_color.enabled);</div><div class='add'>+			if (ret)</div><div class='add'>+				ath12k_warn(ar-&gt;ab, "failed to set bss color collision on vdev %u: %d\n",</div><div class='add'>+					    arvif-&gt;vdev_id,  ret);</div><div class='add'>+</div><div class='add'>+			param_id = WMI_VDEV_PARAM_BSS_COLOR;</div><div class='add'>+			if (info-&gt;he_bss_color.enabled)</div><div class='add'>+				param_value = info-&gt;he_bss_color.color &lt;&lt;</div><div class='add'>+					      IEEE80211_HE_OPERATION_BSS_COLOR_OFFSET;</div><div class='add'>+			else</div><div class='add'>+				param_value = IEEE80211_HE_OPERATION_BSS_COLOR_DISABLED;</div><div class='add'>+</div><div class='add'>+			ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+							    param_id,</div><div class='add'>+							    param_value);</div><div class='add'>+			if (ret)</div><div class='add'>+				ath12k_warn(ar-&gt;ab, "failed to set bss color param on vdev %u: %d\n",</div><div class='add'>+					    arvif-&gt;vdev_id,  ret);</div><div class='add'>+			else</div><div class='add'>+				ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "bss color param 0x%x set on vdev %u\n",</div><div class='add'>+					   param_value, arvif-&gt;vdev_id);</div><div class='add'>+		} else if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='add'>+			ret = ath12k_wmi_send_bss_color_change_enable_cmd(ar,</div><div class='add'>+									  arvif-&gt;vdev_id,</div><div class='add'>+									  1);</div><div class='add'>+			if (ret)</div><div class='add'>+				ath12k_warn(ar-&gt;ab, "failed to enable bss color change on vdev %i: %d\n",</div><div class='add'>+					    arvif-&gt;vdev_id,  ret);</div><div class='add'>+			ret = ath12k_wmi_obss_color_cfg_cmd(ar,</div><div class='add'>+							    arvif-&gt;vdev_id,</div><div class='add'>+							    0,</div><div class='add'>+							    ATH12K_BSS_COLOR_STA_PERIODS,</div><div class='add'>+							    1);</div><div class='add'>+			if (ret)</div><div class='add'>+				ath12k_warn(ar-&gt;ab, "failed to set bss color collision on vdev %i: %d\n",</div><div class='add'>+					    arvif-&gt;vdev_id,  ret);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_mac_fils_discovery(arvif, info);</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_PS &amp;&amp;</div><div class='add'>+	    ar-&gt;ab-&gt;hw_params-&gt;supports_sta_ps) {</div><div class='add'>+		ahvif-&gt;ps = vif_cfg-&gt;ps;</div><div class='add'>+		ath12k_mac_vif_setup_ps(arvif);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ath12k_vif_cache *ath12k_ahvif_get_link_cache(struct ath12k_vif *ahvif,</div><div class='add'>+							    u8 link_id)</div><div class='add'>+{</div><div class='add'>+	if (!ahvif-&gt;cache[link_id]) {</div><div class='add'>+		ahvif-&gt;cache[link_id] = kzalloc(sizeof(*ahvif-&gt;cache[0]), GFP_KERNEL);</div><div class='add'>+		if (ahvif-&gt;cache[link_id])</div><div class='add'>+			INIT_LIST_HEAD(&amp;ahvif-&gt;cache[link_id]-&gt;key_conf.list);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ahvif-&gt;cache[link_id];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahvif_put_link_key_cache(struct ath12k_vif_cache *cache)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_key_conf *key_conf, *tmp;</div><div class='add'>+</div><div class='add'>+	if (!cache || list_empty(&amp;cache-&gt;key_conf.list))</div><div class='add'>+		return;</div><div class='add'>+	list_for_each_entry_safe(key_conf, tmp, &amp;cache-&gt;key_conf.list, list) {</div><div class='add'>+		list_del(&amp;key_conf-&gt;list);</div><div class='add'>+		kfree(key_conf);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_ahvif_put_link_cache(struct ath12k_vif *ahvif, u8 link_id)</div><div class='add'>+{</div><div class='add'>+	if (link_id &gt;= IEEE80211_MLD_MAX_NUM_LINKS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ath12k_ahvif_put_link_key_cache(ahvif-&gt;cache[link_id]);</div><div class='add'>+	kfree(ahvif-&gt;cache[link_id]);</div><div class='add'>+	ahvif-&gt;cache[link_id] = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_op_link_info_changed(struct ieee80211_hw *hw,</div><div class='add'>+					    struct ieee80211_vif *vif,</div><div class='add'>+					    struct ieee80211_bss_conf *info,</div><div class='add'>+					    u64 changed)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_vif_cache *cache;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	u8 link_id = info-&gt;link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	arvif = wiphy_dereference(hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+</div><div class='add'>+	/* if the vdev is not created on a certain radio,</div><div class='add'>+	 * cache the info to be updated later on vdev creation</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (!arvif || !arvif-&gt;is_created) {</div><div class='add'>+		cache = ath12k_ahvif_get_link_cache(ahvif, link_id);</div><div class='add'>+		if (!cache)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		cache-&gt;bss_conf_changed |= changed;</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar = arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	ath12k_mac_bss_info_changed(ar, arvif, info, changed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ath12k*</div><div class='add'>+ath12k_mac_select_scan_device(struct ieee80211_hw *hw,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      u32 center_freq)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = hw-&gt;priv;</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;num_radio == 1)</div><div class='add'>+		return ah-&gt;radio;</div><div class='add'>+</div><div class='add'>+	/* Currently mac80211 supports splitting scan requests into</div><div class='add'>+	 * multiple scan requests per band.</div><div class='add'>+	 * Loop through first channel and determine the scan radio</div><div class='add'>+	 * TODO: There could be 5 GHz low/high channels in that case</div><div class='add'>+	 * split the hw request and perform multiple scans</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (center_freq &lt; ATH12K_MIN_5GHZ_FREQ)</div><div class='add'>+		band = NL80211_BAND_2GHZ;</div><div class='add'>+	else if (center_freq &lt; ATH12K_MIN_6GHZ_FREQ)</div><div class='add'>+		band = NL80211_BAND_5GHZ;</div><div class='add'>+	else</div><div class='add'>+		band = NL80211_BAND_6GHZ;</div><div class='add'>+</div><div class='add'>+	for_each_ar(ah, ar, i) {</div><div class='add'>+		if (ar-&gt;mac.sbands[band].channels &amp;&amp;</div><div class='add'>+		    center_freq &gt;= KHZ_TO_MHZ(ar-&gt;freq_range.start_freq) &amp;&amp;</div><div class='add'>+		    center_freq &lt;= KHZ_TO_MHZ(ar-&gt;freq_range.end_freq))</div><div class='add'>+			return ar;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __ath12k_mac_scan_finish(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = ath12k_ar_to_hw(ar);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	switch (ar-&gt;scan.state) {</div><div class='add'>+	case ATH12K_SCAN_IDLE:</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_SCAN_RUNNING:</div><div class='add'>+	case ATH12K_SCAN_ABORTING:</div><div class='add'>+		if (ar-&gt;scan.is_roc &amp;&amp; ar-&gt;scan.roc_notify)</div><div class='add'>+			ieee80211_remain_on_channel_expired(hw);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case ATH12K_SCAN_STARTING:</div><div class='add'>+		cancel_delayed_work(&amp;ar-&gt;scan.timeout);</div><div class='add'>+		complete_all(&amp;ar-&gt;scan.completed);</div><div class='add'>+		wiphy_work_queue(ar-&gt;ah-&gt;hw-&gt;wiphy, &amp;ar-&gt;scan.vdev_clean_wk);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_mac_scan_finish(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	__ath12k_mac_scan_finish(ar);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_scan_stop(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_scan_cancel_arg arg = {</div><div class='add'>+		.req_type = WLAN_SCAN_CANCEL_SINGLE,</div><div class='add'>+		.scan_id = ATH12K_SCAN_ID,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* TODO: Fill other STOP Params */</div><div class='add'>+	arg.pdev_id = ar-&gt;pdev-&gt;pdev_id;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_send_scan_stop_cmd(ar, &amp;arg);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to stop wmi scan: %d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = wait_for_completion_timeout(&amp;ar-&gt;scan.completed, 3 * HZ);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to receive scan abort comple: timed out\n");</div><div class='add'>+		ret = -ETIMEDOUT;</div><div class='add'>+	} else if (ret &gt; 0) {</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	/* Scan state should be updated in scan completion worker but in</div><div class='add'>+	 * case firmware fails to deliver the event (for whatever reason)</div><div class='add'>+	 * it is desired to clean up scan state anyway. Firmware may have</div><div class='add'>+	 * just dropped the scan completion event delivery due to transport</div><div class='add'>+	 * pipe being overflown with data and/or it can recover on its own</div><div class='add'>+	 * before next scan request is submitted.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	if (ret)</div><div class='add'>+		__ath12k_mac_scan_finish(ar);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_scan_abort(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	switch (ar-&gt;scan.state) {</div><div class='add'>+	case ATH12K_SCAN_IDLE:</div><div class='add'>+		/* This can happen if timeout worker kicked in and called</div><div class='add'>+		 * abortion while scan completion was being processed.</div><div class='add'>+		 */</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_SCAN_STARTING:</div><div class='add'>+	case ATH12K_SCAN_ABORTING:</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "refusing scan abortion due to invalid scan state: %d\n",</div><div class='add'>+			    ar-&gt;scan.state);</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_SCAN_RUNNING:</div><div class='add'>+		ar-&gt;scan.state = ATH12K_SCAN_ABORTING;</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+		ret = ath12k_scan_stop(ar);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to abort scan: %d\n", ret);</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_scan_timeout_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = container_of(work, struct ath12k,</div><div class='add'>+					 scan.timeout.work);</div><div class='add'>+</div><div class='add'>+	wiphy_lock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+	ath12k_scan_abort(ar);</div><div class='add'>+	wiphy_unlock(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_scan_send_complete(struct ath12k *ar,</div><div class='add'>+					  struct cfg80211_scan_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = ar-&gt;ah;</div><div class='add'>+	struct ath12k *partner_ar;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	for_each_ar(ah, partner_ar, i)</div><div class='add'>+		if (partner_ar != ar &amp;&amp;</div><div class='add'>+		    partner_ar-&gt;scan.state == ATH12K_SCAN_RUNNING)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+	ieee80211_scan_completed(ah-&gt;hw, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_scan_vdev_clean_work(struct wiphy *wiphy, struct wiphy_work *work)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = container_of(work, struct ath12k,</div><div class='add'>+					 scan.vdev_clean_wk);</div><div class='add'>+	struct ath12k_hw *ah = ar-&gt;ah;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(wiphy);</div><div class='add'>+</div><div class='add'>+	arvif = ar-&gt;scan.arvif;</div><div class='add'>+</div><div class='add'>+	/* The scan vdev has already been deleted. This can occur when a</div><div class='add'>+	 * new scan request is made on the same vif with a different</div><div class='add'>+	 * frequency, causing the scan arvif to move from one radio to</div><div class='add'>+	 * another. Or, scan was abrupted and via remove interface, the</div><div class='add'>+	 * arvif is already deleted. Alternatively, if the scan vdev is not</div><div class='add'>+	 * being used as an actual vdev, then do not delete it.</div><div class='add'>+	 */</div><div class='add'>+	if (!arvif || arvif-&gt;is_started)</div><div class='add'>+		goto work_complete;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac clean scan vdev (link id %u)",</div><div class='add'>+		   arvif-&gt;link_id);</div><div class='add'>+</div><div class='add'>+	ath12k_mac_remove_link_interface(ah-&gt;hw, arvif);</div><div class='add'>+	ath12k_mac_unassign_link_vif(arvif);</div><div class='add'>+</div><div class='add'>+work_complete:</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	ar-&gt;scan.arvif = NULL;</div><div class='add'>+	if (!ar-&gt;scan.is_roc) {</div><div class='add'>+		struct cfg80211_scan_info info = {</div><div class='add'>+			.aborted = ((ar-&gt;scan.state ==</div><div class='add'>+				    ATH12K_SCAN_ABORTING) ||</div><div class='add'>+				    (ar-&gt;scan.state ==</div><div class='add'>+				    ATH12K_SCAN_STARTING)),</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ath12k_mac_scan_send_complete(ar, &amp;info);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;scan.state = ATH12K_SCAN_IDLE;</div><div class='add'>+	ar-&gt;scan_channel = NULL;</div><div class='add'>+	ar-&gt;scan.roc_freq = 0;</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_start_scan(struct ath12k *ar,</div><div class='add'>+			     struct ath12k_wmi_scan_req_arg *arg)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_send_scan_start_cmd(ar, arg);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = wait_for_completion_timeout(&amp;ar-&gt;scan.started, 1 * HZ);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		ret = ath12k_scan_stop(ar);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to stop scan: %d\n", ret);</div><div class='add'>+</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If we failed to start the scan, return error code at</div><div class='add'>+	 * this point.  This is probably due to some issue in the</div><div class='add'>+	 * firmware, but no need to wedge the driver due to that...</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	if (ar-&gt;scan.state == ATH12K_SCAN_IDLE) {</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_mac_get_fw_stats(struct ath12k *ar,</div><div class='add'>+			    struct ath12k_fw_stats_req_params *param)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_hw *ah = ath12k_ar_to_ah(ar);</div><div class='add'>+	unsigned long time_left;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ah-&gt;hw_mutex);</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;state != ATH12K_HW_STATE_ON)</div><div class='add'>+		return -ENETDOWN;</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;ar-&gt;fw_stats_complete);</div><div class='add'>+	reinit_completion(&amp;ar-&gt;fw_stats_done);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_send_stats_request_cmd(ar, param-&gt;stats_id,</div><div class='add'>+						param-&gt;vdev_id, param-&gt;pdev_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to request fw stats: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "get fw stat pdev id %d vdev id %d stats id 0x%x\n",</div><div class='add'>+		   param-&gt;pdev_id, param-&gt;vdev_id, param-&gt;stats_id);</div><div class='add'>+</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;ar-&gt;fw_stats_complete, 1 * HZ);</div><div class='add'>+	if (!time_left) {</div><div class='add'>+		ath12k_warn(ab, "time out while waiting for get fw stats\n");</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Firmware sends WMI_UPDATE_STATS_EVENTID back-to-back</div><div class='add'>+	 * when stats data buffer limit is reached. fw_stats_complete</div><div class='add'>+	 * is completed once host receives first event from firmware, but</div><div class='add'>+	 * still there could be more events following. Below is to wait</div><div class='add'>+	 * until firmware completes sending all the events.</div><div class='add'>+	 */</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;ar-&gt;fw_stats_done, 3 * HZ);</div><div class='add'>+	if (!time_left) {</div><div class='add'>+		ath12k_warn(ab, "time out while waiting for fw stats done\n");</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_op_get_txpower(struct ieee80211_hw *hw,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     unsigned int link_id,</div><div class='add'>+				     int *dbm)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_fw_stats_req_params params = {};</div><div class='add'>+	struct ath12k_fw_stats_pdev *pdev;</div><div class='add'>+	struct ath12k_hw *ah = hw-&gt;priv;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Final Tx power is minimum of Target Power, CTL power, Regulatory</div><div class='add'>+	 * Power, PSD EIRP Power. We just know the Regulatory power from the</div><div class='add'>+	 * regulatory rules obtained. FW knows all these power and sets the min</div><div class='add'>+	 * of these. Hence, we request the FW pdev stats in which FW reports</div><div class='add'>+	 * the minimum of all vdev's channel Tx power.</div><div class='add'>+	 */</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	arvif = wiphy_dereference(ah-&gt;hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+	if (!arvif || !arvif-&gt;ar)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ar = arvif-&gt;ar;</div><div class='add'>+	ab = ar-&gt;ab;</div><div class='add'>+	if (ah-&gt;state != ATH12K_HW_STATE_ON)</div><div class='add'>+		goto err_fallback;</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_FLAG_CAC_RUNNING, &amp;ar-&gt;dev_flags))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	/* Limit the requests to Firmware for fetching the tx power */</div><div class='add'>+	if (ar-&gt;chan_tx_pwr != ATH12K_PDEV_TX_POWER_INVALID &amp;&amp;</div><div class='add'>+	    time_before(jiffies,</div><div class='add'>+			msecs_to_jiffies(ATH12K_PDEV_TX_POWER_REFRESH_TIME_MSECS) +</div><div class='add'>+					 ar-&gt;last_tx_power_update))</div><div class='add'>+		goto send_tx_power;</div><div class='add'>+</div><div class='add'>+	params.pdev_id = ar-&gt;pdev-&gt;pdev_id;</div><div class='add'>+	params.vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+	params.stats_id = WMI_REQUEST_PDEV_STAT;</div><div class='add'>+	ret = ath12k_mac_get_fw_stats(ar, &amp;params);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to request fw pdev stats: %d\n", ret);</div><div class='add'>+		goto err_fallback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	pdev = list_first_entry_or_null(&amp;ar-&gt;fw_stats.pdevs,</div><div class='add'>+					struct ath12k_fw_stats_pdev, list);</div><div class='add'>+	if (!pdev) {</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		goto err_fallback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* tx power reported by firmware is in units of 0.5 dBm */</div><div class='add'>+	ar-&gt;chan_tx_pwr = pdev-&gt;chan_tx_power / 2;</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	ar-&gt;last_tx_power_update = jiffies;</div><div class='add'>+	ath12k_fw_stats_reset(ar);</div><div class='add'>+</div><div class='add'>+send_tx_power:</div><div class='add'>+	*dbm = ar-&gt;chan_tx_pwr;</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "txpower fetched from firmware %d dBm\n",</div><div class='add'>+		   *dbm);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_fallback:</div><div class='add'>+	/* We didn't get txpower from FW. Hence, relying on vif-&gt;bss_conf.txpower */</div><div class='add'>+	*dbm = vif-&gt;bss_conf.txpower;</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "txpower from firmware NaN, reported %d dBm\n",</div><div class='add'>+		   *dbm);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8</div><div class='add'>+ath12k_mac_find_link_id_by_ar(struct ath12k_vif *ahvif, struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k_hw *ah = ahvif-&gt;ah;</div><div class='add'>+	unsigned long links = ahvif-&gt;links_map;</div><div class='add'>+	unsigned long scan_links_map;</div><div class='add'>+	u8 link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(link_id, &amp;links, ATH12K_NUM_MAX_LINKS) {</div><div class='add'>+		arvif = wiphy_dereference(ah-&gt;hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+</div><div class='add'>+		if (!arvif || !arvif-&gt;is_created)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (ar == arvif-&gt;ar)</div><div class='add'>+			return link_id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* input ar is not assigned to any of the links of ML VIF, use next</div><div class='add'>+	 * available scan link for scan vdev creation. There are cases where</div><div class='add'>+	 * single scan req needs to be split in driver and initiate separate</div><div class='add'>+	 * scan requests to firmware based on device.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	 /* Unset all non-scan links (0-14) of scan_links_map so that ffs() will</div><div class='add'>+	  * choose an available link among scan links (i.e link id &gt;= 15)</div><div class='add'>+	  */</div><div class='add'>+	scan_links_map = ~ahvif-&gt;links_map &amp; ATH12K_SCAN_LINKS_MASK;</div><div class='add'>+	if (scan_links_map)</div><div class='add'>+		return __ffs(scan_links_map);</div><div class='add'>+</div><div class='add'>+	return ATH12K_FIRST_SCAN_LINK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_initiate_hw_scan(struct ieee80211_hw *hw,</div><div class='add'>+				       struct ieee80211_vif *vif,</div><div class='add'>+				       struct ieee80211_scan_request *hw_req,</div><div class='add'>+				       int n_channels,</div><div class='add'>+				       struct ieee80211_channel **chan_list,</div><div class='add'>+				       struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct cfg80211_scan_request *req = &amp;hw_req-&gt;req;</div><div class='add'>+	struct ath12k_wmi_scan_req_arg *arg = NULL;</div><div class='add'>+	u8 link_id;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+	bool create = true;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	arvif = &amp;ahvif-&gt;deflink;</div><div class='add'>+</div><div class='add'>+	/* check if any of the links of ML VIF is already started on</div><div class='add'>+	 * radio(ar) corresponding to given scan frequency and use it,</div><div class='add'>+	 * if not use scan link (link id &gt;= 15) for scan purpose.</div><div class='add'>+	 */</div><div class='add'>+	link_id = ath12k_mac_find_link_id_by_ar(ahvif, ar);</div><div class='add'>+	/* All scan links are occupied. ideally this shouldn't happen as</div><div class='add'>+	 * mac80211 won't schedule scan for same band until ongoing scan is</div><div class='add'>+	 * completed, don't try to exceed max links just in case if it happens.</div><div class='add'>+	 */</div><div class='add'>+	if (link_id &gt;= ATH12K_NUM_MAX_LINKS)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	arvif = ath12k_mac_assign_link_vif(ah, vif, link_id);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac link ID %d selected for scan",</div><div class='add'>+		   arvif-&gt;link_id);</div><div class='add'>+</div><div class='add'>+	/* If the vif is already assigned to a specific vdev of an ar,</div><div class='add'>+	 * check whether its already started, vdev which is started</div><div class='add'>+	 * are not allowed to switch to a new radio.</div><div class='add'>+	 * If the vdev is not started, but was earlier created on a</div><div class='add'>+	 * different ar, delete that vdev and create a new one. We don't</div><div class='add'>+	 * delete at the scan stop as an optimization to avoid redundant</div><div class='add'>+	 * delete-create vdev's for the same ar, in case the request is</div><div class='add'>+	 * always on the same band for the vif</div><div class='add'>+	 */</div><div class='add'>+	if (arvif-&gt;is_created) {</div><div class='add'>+		if (WARN_ON(!arvif-&gt;ar))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (ar != arvif-&gt;ar &amp;&amp; arvif-&gt;is_started)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (ar != arvif-&gt;ar) {</div><div class='add'>+			ath12k_mac_remove_link_interface(hw, arvif);</div><div class='add'>+			ath12k_mac_unassign_link_vif(arvif);</div><div class='add'>+		} else {</div><div class='add'>+			create = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (create) {</div><div class='add'>+		/* Previous arvif would've been cleared in radio switch block</div><div class='add'>+		 * above, assign arvif again for create.</div><div class='add'>+		 */</div><div class='add'>+		arvif = ath12k_mac_assign_link_vif(ah, vif, link_id);</div><div class='add'>+</div><div class='add'>+		ret = ath12k_mac_vdev_create(ar, arvif);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "unable to create scan vdev %d\n", ret);</div><div class='add'>+			ath12k_mac_unassign_link_vif(arvif);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	switch (ar-&gt;scan.state) {</div><div class='add'>+	case ATH12K_SCAN_IDLE:</div><div class='add'>+		reinit_completion(&amp;ar-&gt;scan.started);</div><div class='add'>+		reinit_completion(&amp;ar-&gt;scan.completed);</div><div class='add'>+		ar-&gt;scan.state = ATH12K_SCAN_STARTING;</div><div class='add'>+		ar-&gt;scan.is_roc = false;</div><div class='add'>+		ar-&gt;scan.arvif = arvif;</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_SCAN_STARTING:</div><div class='add'>+	case ATH12K_SCAN_RUNNING:</div><div class='add'>+	case ATH12K_SCAN_ABORTING:</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	arg = kzalloc(sizeof(*arg), GFP_KERNEL);</div><div class='add'>+	if (!arg) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_wmi_start_scan_init(ar, arg);</div><div class='add'>+	arg-&gt;vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+	arg-&gt;scan_id = ATH12K_SCAN_ID;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;ie_len) {</div><div class='add'>+		arg-&gt;extraie.ptr = kmemdup(req-&gt;ie, req-&gt;ie_len, GFP_KERNEL);</div><div class='add'>+		if (!arg-&gt;extraie.ptr) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		arg-&gt;extraie.len = req-&gt;ie_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (req-&gt;n_ssids) {</div><div class='add'>+		arg-&gt;num_ssids = req-&gt;n_ssids;</div><div class='add'>+		for (i = 0; i &lt; arg-&gt;num_ssids; i++)</div><div class='add'>+			arg-&gt;ssid[i] = req-&gt;ssids[i];</div><div class='add'>+	} else {</div><div class='add'>+		arg-&gt;scan_f_passive = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (n_channels) {</div><div class='add'>+		arg-&gt;num_chan = n_channels;</div><div class='add'>+		arg-&gt;chan_list = kcalloc(arg-&gt;num_chan, sizeof(*arg-&gt;chan_list),</div><div class='add'>+					 GFP_KERNEL);</div><div class='add'>+		if (!arg-&gt;chan_list) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; arg-&gt;num_chan; i++)</div><div class='add'>+			arg-&gt;chan_list[i] = chan_list[i]-&gt;center_freq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_start_scan(ar, arg);</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (ret == -EBUSY)</div><div class='add'>+			ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+				   "scan engine is busy 11d state %d\n", ar-&gt;state_11d);</div><div class='add'>+		else</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to start hw scan: %d\n", ret);</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		ar-&gt;scan.state = ATH12K_SCAN_IDLE;</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac scan started");</div><div class='add'>+</div><div class='add'>+	/* Add a margin to account for event/command processing */</div><div class='add'>+	ieee80211_queue_delayed_work(ath12k_ar_to_hw(ar), &amp;ar-&gt;scan.timeout,</div><div class='add'>+				     msecs_to_jiffies(arg-&gt;max_scan_time +</div><div class='add'>+						      ATH12K_MAC_SCAN_TIMEOUT_MSECS));</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	if (arg) {</div><div class='add'>+		kfree(arg-&gt;chan_list);</div><div class='add'>+		kfree(arg-&gt;extraie.ptr);</div><div class='add'>+		kfree(arg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;state_11d == ATH12K_11D_PREPARING &amp;&amp;</div><div class='add'>+	    ahvif-&gt;vdev_type == WMI_VDEV_TYPE_STA &amp;&amp;</div><div class='add'>+	    ahvif-&gt;vdev_subtype == WMI_VDEV_SUBTYPE_NONE)</div><div class='add'>+		ath12k_mac_11d_scan_start(ar, arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_op_hw_scan(struct ieee80211_hw *hw,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_scan_request *hw_req)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ieee80211_channel **chan_list, *chan;</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	unsigned long links_map, link_id;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k *ar, *scan_ar;</div><div class='add'>+	int i, j, ret = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	chan_list = kcalloc(hw_req-&gt;req.n_channels, sizeof(*chan_list), GFP_KERNEL);</div><div class='add'>+	if (!chan_list)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* There could be channels that belong to multiple underlying radio</div><div class='add'>+	 * in same scan request as mac80211 sees it as single band. In that</div><div class='add'>+	 * case split the hw_req based on frequency range and schedule scans to</div><div class='add'>+	 * corresponding radio.</div><div class='add'>+	 */</div><div class='add'>+	for_each_ar(ah, ar, i) {</div><div class='add'>+		int n_chans = 0;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; hw_req-&gt;req.n_channels; j++) {</div><div class='add'>+			chan = hw_req-&gt;req.channels[j];</div><div class='add'>+			scan_ar = ath12k_mac_select_scan_device(hw, vif,</div><div class='add'>+								chan-&gt;center_freq);</div><div class='add'>+			if (!scan_ar) {</div><div class='add'>+				ath12k_hw_warn(ah, "unable to select scan device for freq %d\n",</div><div class='add'>+					       chan-&gt;center_freq);</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto abort;</div><div class='add'>+			}</div><div class='add'>+			if (ar != scan_ar)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			chan_list[n_chans++] = chan;</div><div class='add'>+		}</div><div class='add'>+		if (n_chans) {</div><div class='add'>+			ret = ath12k_mac_initiate_hw_scan(hw, vif, hw_req, n_chans,</div><div class='add'>+							  chan_list, ar);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto abort;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+abort:</div><div class='add'>+	/* If any of the parallel scans initiated fails, abort all and</div><div class='add'>+	 * remove the scan interfaces created. Return complete scan</div><div class='add'>+	 * failure as mac80211 assumes this as single scan request.</div><div class='add'>+	 */</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_hw_warn(ah, "Scan failed %d , cleanup all scan vdevs\n", ret);</div><div class='add'>+		links_map = ahvif-&gt;links_map;</div><div class='add'>+		for_each_set_bit(link_id, &amp;links_map, ATH12K_NUM_MAX_LINKS) {</div><div class='add'>+			arvif = wiphy_dereference(hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+			if (!arvif)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			ar = arvif-&gt;ar;</div><div class='add'>+			if (ar-&gt;scan.arvif == arvif) {</div><div class='add'>+				wiphy_work_cancel(hw-&gt;wiphy, &amp;ar-&gt;scan.vdev_clean_wk);</div><div class='add'>+				spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+				ar-&gt;scan.arvif = NULL;</div><div class='add'>+				ar-&gt;scan.state = ATH12K_SCAN_IDLE;</div><div class='add'>+				ar-&gt;scan_channel = NULL;</div><div class='add'>+				ar-&gt;scan.roc_freq = 0;</div><div class='add'>+				spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+			}</div><div class='add'>+			if (link_id &gt;= ATH12K_FIRST_SCAN_LINK) {</div><div class='add'>+				ath12k_mac_remove_link_interface(hw, arvif);</div><div class='add'>+				ath12k_mac_unassign_link_vif(arvif);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	kfree(chan_list);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_op_cancel_hw_scan(struct ieee80211_hw *hw,</div><div class='add'>+					 struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	unsigned long link_id, links_map = ahvif-&gt;links_map;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(link_id, &amp;links_map, ATH12K_NUM_MAX_LINKS) {</div><div class='add'>+		arvif = wiphy_dereference(hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+		if (!arvif || arvif-&gt;is_started)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ar = arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+		ath12k_scan_abort(ar);</div><div class='add'>+</div><div class='add'>+		cancel_delayed_work_sync(&amp;ar-&gt;scan.timeout);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_install_key(struct ath12k_link_vif *arvif,</div><div class='add'>+			      struct ieee80211_key_conf *key,</div><div class='add'>+			      enum set_key_cmd cmd,</div><div class='add'>+			      const u8 *macaddr, u32 flags)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	struct wmi_vdev_install_key_arg arg = {</div><div class='add'>+		.vdev_id = arvif-&gt;vdev_id,</div><div class='add'>+		.key_idx = key-&gt;keyidx,</div><div class='add'>+		.key_len = key-&gt;keylen,</div><div class='add'>+		.key_data = key-&gt;key,</div><div class='add'>+		.key_flags = flags,</div><div class='add'>+		.ieee80211_key_cipher = key-&gt;cipher,</div><div class='add'>+		.macaddr = macaddr,</div><div class='add'>+	};</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED, &amp;ar-&gt;ab-&gt;dev_flags))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (cmd == DISABLE_KEY) {</div><div class='add'>+		/* TODO: Check if FW expects  value other than NONE for del */</div><div class='add'>+		/* arg.key_cipher = WMI_CIPHER_NONE; */</div><div class='add'>+		arg.key_len = 0;</div><div class='add'>+		arg.key_data = NULL;</div><div class='add'>+		goto check_order;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (key-&gt;cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP_256:</div><div class='add'>+		arg.key_cipher = WMI_CIPHER_AES_CCM;</div><div class='add'>+		key-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_IV_MGMT;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		arg.key_cipher = WMI_CIPHER_TKIP;</div><div class='add'>+		arg.key_txmic_len = 8;</div><div class='add'>+		arg.key_rxmic_len = 8;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='add'>+		arg.key_cipher = WMI_CIPHER_AES_GCM;</div><div class='add'>+		key-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_IV_MGMT;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_AES_CMAC:</div><div class='add'>+		arg.key_cipher = WMI_CIPHER_AES_CMAC;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_GMAC_128:</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_GMAC_256:</div><div class='add'>+		arg.key_cipher = WMI_CIPHER_AES_GMAC;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_CMAC_256:</div><div class='add'>+		arg.key_cipher = WMI_CIPHER_AES_CMAC;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "cipher %d is not supported\n", key-&gt;cipher);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_FLAG_RAW_MODE, &amp;ar-&gt;ab-&gt;dev_flags))</div><div class='add'>+		key-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_IV |</div><div class='add'>+			      IEEE80211_KEY_FLAG_RESERVE_TAILROOM;</div><div class='add'>+</div><div class='add'>+check_order:</div><div class='add'>+	if (ahvif-&gt;vdev_type == WMI_VDEV_TYPE_STA &amp;&amp;</div><div class='add'>+	    arg.key_flags == WMI_KEY_GROUP) {</div><div class='add'>+		if (cmd == SET_KEY) {</div><div class='add'>+			if (arvif-&gt;pairwise_key_done) {</div><div class='add'>+				ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+					   "vdev %u pairwise key done, go install group key\n",</div><div class='add'>+					   arg.vdev_id);</div><div class='add'>+				goto install;</div><div class='add'>+			} else {</div><div class='add'>+				/* WCN7850 firmware requires pairwise key to be installed</div><div class='add'>+				 * before group key. In case group key comes first, cache</div><div class='add'>+				 * it and return. Will revisit it once pairwise key gets</div><div class='add'>+				 * installed.</div><div class='add'>+				 */</div><div class='add'>+				arvif-&gt;group_key = arg;</div><div class='add'>+				arvif-&gt;group_key_valid = true;</div><div class='add'>+				ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+					   "vdev %u group key before pairwise key, cache and skip\n",</div><div class='add'>+					   arg.vdev_id);</div><div class='add'>+</div><div class='add'>+				ret = 0;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			arvif-&gt;group_key_valid = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+install:</div><div class='add'>+	reinit_completion(&amp;ar-&gt;install_key_done);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_vdev_install_key(arvif-&gt;ar, &amp;arg);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!wait_for_completion_timeout(&amp;ar-&gt;install_key_done, 1 * HZ))</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	if (ether_addr_equal(arg.macaddr, arvif-&gt;bssid))</div><div class='add'>+		ahvif-&gt;key_cipher = arg.ieee80211_key_cipher;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;install_key_status) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ahvif-&gt;vdev_type == WMI_VDEV_TYPE_STA &amp;&amp;</div><div class='add'>+	    arg.key_flags == WMI_KEY_PAIRWISE) {</div><div class='add'>+		if (cmd == SET_KEY) {</div><div class='add'>+			arvif-&gt;pairwise_key_done = true;</div><div class='add'>+			if (arvif-&gt;group_key_valid) {</div><div class='add'>+				/* Install cached GTK */</div><div class='add'>+				arvif-&gt;group_key_valid = false;</div><div class='add'>+				arg = arvif-&gt;group_key;</div><div class='add'>+				ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+					   "vdev %u pairwise key done, group key ready, go install\n",</div><div class='add'>+					   arg.vdev_id);</div><div class='add'>+				goto install;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			arvif-&gt;pairwise_key_done = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (ret) {</div><div class='add'>+		/* In case of failure userspace may not do DISABLE_KEY</div><div class='add'>+		 * but triggers re-connection directly, so manually reset</div><div class='add'>+		 * status here.</div><div class='add'>+		 */</div><div class='add'>+		arvif-&gt;group_key_valid = false;</div><div class='add'>+		arvif-&gt;pairwise_key_done = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_clear_peer_keys(struct ath12k_link_vif *arvif,</div><div class='add'>+				  const u8 *addr)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	int first_errno = 0;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+	u32 flags = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	peer = ath12k_peer_find(ab, arvif-&gt;vdev_id, addr);</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	if (!peer)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(peer-&gt;keys); i++) {</div><div class='add'>+		if (!peer-&gt;keys[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* key flags are not required to delete the key */</div><div class='add'>+		ret = ath12k_install_key(arvif, peer-&gt;keys[i],</div><div class='add'>+					 DISABLE_KEY, addr, flags);</div><div class='add'>+		if (ret &lt; 0 &amp;&amp; first_errno == 0)</div><div class='add'>+			first_errno = ret;</div><div class='add'>+</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			ath12k_warn(ab, "failed to remove peer key %d: %d\n",</div><div class='add'>+				    i, ret);</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		peer-&gt;keys[i] = NULL;</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return first_errno;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_set_key(struct ath12k *ar, enum set_key_cmd cmd,</div><div class='add'>+			      struct ath12k_link_vif *arvif,</div><div class='add'>+			      struct ath12k_link_sta *arsta,</div><div class='add'>+			      struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = NULL;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	struct ath12k_sta *ahsta;</div><div class='add'>+	const u8 *peer_addr;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 flags = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (arsta)</div><div class='add'>+		sta = ath12k_ahsta_to_sta(arsta-&gt;ahsta);</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED, &amp;ab-&gt;dev_flags))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (sta)</div><div class='add'>+		peer_addr = arsta-&gt;addr;</div><div class='add'>+	else</div><div class='add'>+		peer_addr = arvif-&gt;bssid;</div><div class='add'>+</div><div class='add'>+	key-&gt;hw_key_idx = key-&gt;keyidx;</div><div class='add'>+</div><div class='add'>+	/* the peer should not disappear in mid-way (unless FW goes awry) since</div><div class='add'>+	 * we already hold wiphy lock. we just make sure its there now.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	peer = ath12k_peer_find(ab, arvif-&gt;vdev_id, peer_addr);</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	if (!peer) {</div><div class='add'>+		if (cmd == SET_KEY) {</div><div class='add'>+			ath12k_warn(ab, "cannot install key for non-existent peer %pM\n",</div><div class='add'>+				    peer_addr);</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* if the peer doesn't exist there is no key to disable</div><div class='add'>+		 * anymore</div><div class='add'>+		 */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE)</div><div class='add'>+		flags = WMI_KEY_PAIRWISE;</div><div class='add'>+	else</div><div class='add'>+		flags = WMI_KEY_GROUP;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_install_key(arvif, key, cmd, peer_addr, flags);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "ath12k_install_key failed (%d)\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_rx_peer_pn_replay_config(arvif, peer_addr, cmd, key);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to offload PN replay detection %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	peer = ath12k_peer_find(ab, arvif-&gt;vdev_id, peer_addr);</div><div class='add'>+	if (peer &amp;&amp; cmd == SET_KEY) {</div><div class='add'>+		peer-&gt;keys[key-&gt;keyidx] = key;</div><div class='add'>+		if (key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE) {</div><div class='add'>+			peer-&gt;ucast_keyidx = key-&gt;keyidx;</div><div class='add'>+			peer-&gt;sec_type = ath12k_dp_tx_get_encrypt_type(key-&gt;cipher);</div><div class='add'>+		} else {</div><div class='add'>+			peer-&gt;mcast_keyidx = key-&gt;keyidx;</div><div class='add'>+			peer-&gt;sec_type_grp = ath12k_dp_tx_get_encrypt_type(key-&gt;cipher);</div><div class='add'>+		}</div><div class='add'>+	} else if (peer &amp;&amp; cmd == DISABLE_KEY) {</div><div class='add'>+		peer-&gt;keys[key-&gt;keyidx] = NULL;</div><div class='add'>+		if (key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE)</div><div class='add'>+			peer-&gt;ucast_keyidx = 0;</div><div class='add'>+		else</div><div class='add'>+			peer-&gt;mcast_keyidx = 0;</div><div class='add'>+	} else if (!peer)</div><div class='add'>+		/* impossible unless FW goes crazy */</div><div class='add'>+		ath12k_warn(ab, "peer %pM disappeared!\n", peer_addr);</div><div class='add'>+</div><div class='add'>+	if (sta) {</div><div class='add'>+		ahsta = ath12k_sta_to_ahsta(sta);</div><div class='add'>+</div><div class='add'>+		switch (key-&gt;cipher) {</div><div class='add'>+		case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+		case WLAN_CIPHER_SUITE_CCMP_256:</div><div class='add'>+		case WLAN_CIPHER_SUITE_GCMP:</div><div class='add'>+		case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='add'>+			if (cmd == SET_KEY)</div><div class='add'>+				ahsta-&gt;pn_type = HAL_PN_TYPE_WPA;</div><div class='add'>+			else</div><div class='add'>+				ahsta-&gt;pn_type = HAL_PN_TYPE_NONE;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ahsta-&gt;pn_type = HAL_PN_TYPE_NONE;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_update_key_cache(struct ath12k_vif_cache *cache,</div><div class='add'>+				       enum set_key_cmd cmd,</div><div class='add'>+				       struct ieee80211_sta *sta,</div><div class='add'>+				       struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_key_conf *key_conf, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(key_conf, tmp, &amp;cache-&gt;key_conf.list, list) {</div><div class='add'>+		if (key_conf-&gt;key != key)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* If SET key entry is already present in cache, nothing to do,</div><div class='add'>+		 * just return</div><div class='add'>+		 */</div><div class='add'>+		if (cmd == SET_KEY)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		/* DEL key for an old SET key which driver hasn't flushed yet.</div><div class='add'>+		 */</div><div class='add'>+		list_del(&amp;key_conf-&gt;list);</div><div class='add'>+		kfree(key_conf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd == SET_KEY) {</div><div class='add'>+		key_conf = kzalloc(sizeof(*key_conf), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+		if (!key_conf)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		key_conf-&gt;cmd = cmd;</div><div class='add'>+		key_conf-&gt;sta = sta;</div><div class='add'>+		key_conf-&gt;key = key;</div><div class='add'>+		list_add_tail(&amp;key_conf-&gt;list,</div><div class='add'>+			      &amp;cache-&gt;key_conf.list);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='add'>+				 struct ieee80211_vif *vif, struct ieee80211_sta *sta,</div><div class='add'>+				 struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k_link_sta *arsta = NULL;</div><div class='add'>+	struct ath12k_vif_cache *cache;</div><div class='add'>+	struct ath12k_sta *ahsta;</div><div class='add'>+	unsigned long links;</div><div class='add'>+	u8 link_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* IGTK needs to be done in host software */</div><div class='add'>+	if (key-&gt;keyidx == 4 || key-&gt;keyidx == 5)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (key-&gt;keyidx &gt; WMI_MAX_KEY_INDEX)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	if (sta) {</div><div class='add'>+		ahsta = ath12k_sta_to_ahsta(sta);</div><div class='add'>+</div><div class='add'>+		/* For an ML STA Pairwise key is same for all associated link Stations,</div><div class='add'>+		 * hence do set key for all link STAs which are active.</div><div class='add'>+		 */</div><div class='add'>+		if (sta-&gt;mlo) {</div><div class='add'>+			links = ahsta-&gt;links_map;</div><div class='add'>+			for_each_set_bit(link_id, &amp;links, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+				arvif = wiphy_dereference(hw-&gt;wiphy,</div><div class='add'>+							  ahvif-&gt;link[link_id]);</div><div class='add'>+				arsta = wiphy_dereference(hw-&gt;wiphy,</div><div class='add'>+							  ahsta-&gt;link[link_id]);</div><div class='add'>+</div><div class='add'>+				if (WARN_ON(!arvif || !arsta))</div><div class='add'>+					/* arvif and arsta are expected to be valid when</div><div class='add'>+					 * STA is present.</div><div class='add'>+					 */</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				ret = ath12k_mac_set_key(arvif-&gt;ar, cmd, arvif,</div><div class='add'>+							 arsta, key);</div><div class='add'>+				if (ret)</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		arsta = &amp;ahsta-&gt;deflink;</div><div class='add'>+		arvif = arsta-&gt;arvif;</div><div class='add'>+		if (WARN_ON(!arvif))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		ret = ath12k_mac_set_key(arvif-&gt;ar, cmd, arvif, arsta, key);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (key-&gt;link_id &gt;= 0 &amp;&amp; key-&gt;link_id &lt; IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		link_id = key-&gt;link_id;</div><div class='add'>+		arvif = wiphy_dereference(hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+	} else {</div><div class='add'>+		link_id = 0;</div><div class='add'>+		arvif = &amp;ahvif-&gt;deflink;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!arvif || !arvif-&gt;is_created) {</div><div class='add'>+		cache = ath12k_ahvif_get_link_cache(ahvif, link_id);</div><div class='add'>+		if (!cache)</div><div class='add'>+			return -ENOSPC;</div><div class='add'>+</div><div class='add'>+		ret = ath12k_mac_update_key_cache(cache, cmd, sta, key);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_set_key(arvif-&gt;ar, cmd, arvif, NULL, key);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_mac_bitrate_mask_num_vht_rates(struct ath12k *ar,</div><div class='add'>+				      enum nl80211_band band,</div><div class='add'>+				      const struct cfg80211_bitrate_mask *mask)</div><div class='add'>+{</div><div class='add'>+	int num_rates = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mask-&gt;control[band].vht_mcs); i++)</div><div class='add'>+		num_rates += hweight16(mask-&gt;control[band].vht_mcs[i]);</div><div class='add'>+</div><div class='add'>+	return num_rates;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_mac_bitrate_mask_num_he_rates(struct ath12k *ar,</div><div class='add'>+				     enum nl80211_band band,</div><div class='add'>+				     const struct cfg80211_bitrate_mask *mask)</div><div class='add'>+{</div><div class='add'>+	int num_rates = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mask-&gt;control[band].he_mcs); i++)</div><div class='add'>+		num_rates += hweight16(mask-&gt;control[band].he_mcs[i]);</div><div class='add'>+</div><div class='add'>+	return num_rates;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_mac_bitrate_mask_num_eht_rates(struct ath12k *ar,</div><div class='add'>+				      enum nl80211_band band,</div><div class='add'>+				      const struct cfg80211_bitrate_mask *mask)</div><div class='add'>+{</div><div class='add'>+	int num_rates = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mask-&gt;control[band].eht_mcs); i++)</div><div class='add'>+		num_rates += hweight16(mask-&gt;control[band].eht_mcs[i]);</div><div class='add'>+</div><div class='add'>+	return num_rates;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_mac_set_peer_vht_fixed_rate(struct ath12k_link_vif *arvif,</div><div class='add'>+				   struct ath12k_link_sta *arsta,</div><div class='add'>+				   const struct cfg80211_bitrate_mask *mask,</div><div class='add'>+				   enum nl80211_band band)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	u8 vht_rate, nss;</div><div class='add'>+	u32 rate_code;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	nss = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mask-&gt;control[band].vht_mcs); i++) {</div><div class='add'>+		if (hweight16(mask-&gt;control[band].vht_mcs[i]) == 1) {</div><div class='add'>+			nss = i + 1;</div><div class='add'>+			vht_rate = ffs(mask-&gt;control[band].vht_mcs[i]) - 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!nss) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "No single VHT Fixed rate found to set for %pM",</div><div class='add'>+			    arsta-&gt;addr);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "Setting Fixed VHT Rate for peer %pM. Device will not switch to any other selected rates",</div><div class='add'>+		   arsta-&gt;addr);</div><div class='add'>+</div><div class='add'>+	rate_code = ATH12K_HW_RATE_CODE(vht_rate, nss - 1,</div><div class='add'>+					WMI_RATE_PREAMBLE_VHT);</div><div class='add'>+	ret = ath12k_wmi_set_peer_param(ar, arsta-&gt;addr,</div><div class='add'>+					arvif-&gt;vdev_id,</div><div class='add'>+					WMI_PEER_PARAM_FIXED_RATE,</div><div class='add'>+					rate_code);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to update STA %pM Fixed Rate %d: %d\n",</div><div class='add'>+			     arsta-&gt;addr, rate_code, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_mac_set_peer_he_fixed_rate(struct ath12k_link_vif *arvif,</div><div class='add'>+				  struct ath12k_link_sta *arsta,</div><div class='add'>+				  const struct cfg80211_bitrate_mask *mask,</div><div class='add'>+				  enum nl80211_band band)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	u8 he_rate, nss;</div><div class='add'>+	u32 rate_code;</div><div class='add'>+	int ret, i;</div><div class='add'>+	struct ath12k_sta *ahsta = arsta-&gt;ahsta;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	sta = ath12k_ahsta_to_sta(ahsta);</div><div class='add'>+	nss = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mask-&gt;control[band].he_mcs); i++) {</div><div class='add'>+		if (hweight16(mask-&gt;control[band].he_mcs[i]) == 1) {</div><div class='add'>+			nss = i + 1;</div><div class='add'>+			he_rate = ffs(mask-&gt;control[band].he_mcs[i]) - 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!nss) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "No single HE Fixed rate found to set for %pM",</div><div class='add'>+			    arsta-&gt;addr);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Avoid updating invalid nss as fixed rate*/</div><div class='add'>+	if (nss &gt; sta-&gt;deflink.rx_nss)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "Setting Fixed HE Rate for peer %pM. Device will not switch to any other selected rates",</div><div class='add'>+		   arsta-&gt;addr);</div><div class='add'>+</div><div class='add'>+	rate_code = ATH12K_HW_RATE_CODE(he_rate, nss - 1,</div><div class='add'>+					WMI_RATE_PREAMBLE_HE);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_set_peer_param(ar, arsta-&gt;addr,</div><div class='add'>+					arvif-&gt;vdev_id,</div><div class='add'>+					WMI_PEER_PARAM_FIXED_RATE,</div><div class='add'>+					rate_code);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to update STA %pM Fixed Rate %d: %d\n",</div><div class='add'>+			    arsta-&gt;addr, rate_code, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_mac_set_peer_eht_fixed_rate(struct ath12k_link_vif *arvif,</div><div class='add'>+				   struct ath12k_link_sta *arsta,</div><div class='add'>+				   const struct cfg80211_bitrate_mask *mask,</div><div class='add'>+				   enum nl80211_band band)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_sta *ahsta = arsta-&gt;ahsta;</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	u8 eht_rate, nss = 0;</div><div class='add'>+	u32 rate_code;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	sta = ath12k_ahsta_to_sta(ahsta);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mask-&gt;control[band].eht_mcs); i++) {</div><div class='add'>+		if (hweight16(mask-&gt;control[band].eht_mcs[i]) == 1) {</div><div class='add'>+			nss = i + 1;</div><div class='add'>+			eht_rate = ffs(mask-&gt;control[band].eht_mcs[i]) - 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!nss) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "No single EHT Fixed rate found to set for %pM\n",</div><div class='add'>+			    arsta-&gt;addr);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Avoid updating invalid nss as fixed rate*/</div><div class='add'>+	link_sta = ath12k_mac_get_link_sta(arsta);</div><div class='add'>+	if (!link_sta || nss &gt; link_sta-&gt;rx_nss) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "unable to access link sta for sta %pM link %u or fixed nss of %u is not supported by sta\n",</div><div class='add'>+			    sta-&gt;addr, arsta-&gt;link_id, nss);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "Setting Fixed EHT Rate for peer %pM. Device will not switch to any other selected rates\n",</div><div class='add'>+		   arsta-&gt;addr);</div><div class='add'>+</div><div class='add'>+	rate_code = ATH12K_HW_RATE_CODE(eht_rate, nss - 1,</div><div class='add'>+					WMI_RATE_PREAMBLE_EHT);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_set_peer_param(ar, arsta-&gt;addr,</div><div class='add'>+					arvif-&gt;vdev_id,</div><div class='add'>+					WMI_PEER_PARAM_FIXED_RATE,</div><div class='add'>+					rate_code);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to update STA %pM Fixed Rate %d: %d\n",</div><div class='add'>+			    arsta-&gt;addr, rate_code, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_station_assoc(struct ath12k *ar,</div><div class='add'>+				    struct ath12k_link_vif *arvif,</div><div class='add'>+				    struct ath12k_link_sta *arsta,</div><div class='add'>+				    bool reassoc)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta-&gt;ahsta);</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	int ret;</div><div class='add'>+	struct cfg80211_chan_def def;</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	struct cfg80211_bitrate_mask *mask;</div><div class='add'>+	u8 num_vht_rates, num_he_rates, num_eht_rates;</div><div class='add'>+	u8 link_id = arvif-&gt;link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ath12k_mac_vif_link_chan(vif, arvif-&gt;link_id, &amp;def)))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!rcu_access_pointer(sta-&gt;link[link_id])))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	band = def.chan-&gt;band;</div><div class='add'>+	mask = &amp;arvif-&gt;bitrate_mask;</div><div class='add'>+</div><div class='add'>+	struct ath12k_wmi_peer_assoc_arg *peer_arg __free(kfree) =</div><div class='add'>+		kzalloc(sizeof(*peer_arg), GFP_KERNEL);</div><div class='add'>+	if (!peer_arg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ath12k_peer_assoc_prepare(ar, arvif, arsta, peer_arg, reassoc);</div><div class='add'>+</div><div class='add'>+	if (peer_arg-&gt;peer_nss &lt; 1) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "invalid peer NSS %d\n", peer_arg-&gt;peer_nss);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	peer_arg-&gt;is_assoc = true;</div><div class='add'>+	ret = ath12k_wmi_send_peer_assoc_cmd(ar, peer_arg);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to run peer assoc for STA %pM vdev %i: %d\n",</div><div class='add'>+			    arsta-&gt;addr, arvif-&gt;vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!wait_for_completion_timeout(&amp;ar-&gt;peer_assoc_done, 1 * HZ)) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to get peer assoc conf event for %pM vdev %i\n",</div><div class='add'>+			    arsta-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	num_vht_rates = ath12k_mac_bitrate_mask_num_vht_rates(ar, band, mask);</div><div class='add'>+	num_he_rates = ath12k_mac_bitrate_mask_num_he_rates(ar, band, mask);</div><div class='add'>+	num_eht_rates = ath12k_mac_bitrate_mask_num_eht_rates(ar, band, mask);</div><div class='add'>+</div><div class='add'>+	/* If single VHT/HE/EHT rate is configured (by set_bitrate_mask()),</div><div class='add'>+	 * peer_assoc will disable VHT/HE/EHT. This is now enabled by a peer</div><div class='add'>+	 * specific fixed param.</div><div class='add'>+	 * Note that all other rates and NSS will be disabled for this peer.</div><div class='add'>+	 */</div><div class='add'>+	link_sta = ath12k_mac_get_link_sta(arsta);</div><div class='add'>+	if (!link_sta) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "unable to access link sta in station assoc\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	arsta-&gt;bw = ath12k_mac_ieee80211_sta_bw_to_wmi(ar, link_sta);</div><div class='add'>+	arsta-&gt;bw_prev = link_sta-&gt;bandwidth;</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;vht_cap.vht_supported &amp;&amp; num_vht_rates == 1) {</div><div class='add'>+		ret = ath12k_mac_set_peer_vht_fixed_rate(arvif, arsta, mask, band);</div><div class='add'>+	} else if (link_sta-&gt;he_cap.has_he &amp;&amp; num_he_rates == 1) {</div><div class='add'>+		ret = ath12k_mac_set_peer_he_fixed_rate(arvif, arsta, mask, band);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	} else if (link_sta-&gt;eht_cap.has_eht &amp;&amp; num_eht_rates == 1) {</div><div class='add'>+		ret = ath12k_mac_set_peer_eht_fixed_rate(arvif, arsta, mask, band);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Re-assoc is run only to update supported rates for given station. It</div><div class='add'>+	 * doesn't make much sense to reconfigure the peer completely.</div><div class='add'>+	 */</div><div class='add'>+	if (reassoc)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_setup_peer_smps(ar, arvif, arsta-&gt;addr,</div><div class='add'>+				     &amp;link_sta-&gt;ht_cap, &amp;link_sta-&gt;he_6ghz_capa);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to setup peer SMPS for vdev %d: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!sta-&gt;wme) {</div><div class='add'>+		arvif-&gt;num_legacy_stations++;</div><div class='add'>+		ret = ath12k_recalc_rtscts_prot(arvif);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;wme &amp;&amp; sta-&gt;uapsd_queues) {</div><div class='add'>+		ret = ath12k_peer_assoc_qos_ap(ar, arvif, arsta);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to set qos params for STA %pM for vdev %i: %d\n",</div><div class='add'>+				    arsta-&gt;addr, arvif-&gt;vdev_id, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_station_disassoc(struct ath12k *ar,</div><div class='add'>+				       struct ath12k_link_vif *arvif,</div><div class='add'>+				       struct ath12k_link_sta *arsta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta-&gt;ahsta);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!sta-&gt;wme) {</div><div class='add'>+		arvif-&gt;num_legacy_stations--;</div><div class='add'>+		return ath12k_recalc_rtscts_prot(arvif);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_sta_rc_update_wk(struct wiphy *wiphy, struct wiphy_work *wk)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct cfg80211_chan_def def;</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	const u8 *ht_mcs_mask;</div><div class='add'>+	const u16 *vht_mcs_mask;</div><div class='add'>+	const u16 *he_mcs_mask;</div><div class='add'>+	const u16 *eht_mcs_mask;</div><div class='add'>+	u32 changed, bw, nss, mac_nss, smps, bw_prev;</div><div class='add'>+	int err, num_vht_rates, num_he_rates, num_eht_rates;</div><div class='add'>+	const struct cfg80211_bitrate_mask *mask;</div><div class='add'>+	enum wmi_phy_mode peer_phymode;</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(wiphy);</div><div class='add'>+</div><div class='add'>+	arsta = container_of(wk, struct ath12k_link_sta, update_wk);</div><div class='add'>+	sta = ath12k_ahsta_to_sta(arsta-&gt;ahsta);</div><div class='add'>+	arvif = arsta-&gt;arvif;</div><div class='add'>+	vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+	ar = arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ath12k_mac_vif_link_chan(vif, arvif-&gt;link_id, &amp;def)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	band = def.chan-&gt;band;</div><div class='add'>+	ht_mcs_mask = arvif-&gt;bitrate_mask.control[band].ht_mcs;</div><div class='add'>+	vht_mcs_mask = arvif-&gt;bitrate_mask.control[band].vht_mcs;</div><div class='add'>+	he_mcs_mask = arvif-&gt;bitrate_mask.control[band].he_mcs;</div><div class='add'>+	eht_mcs_mask = arvif-&gt;bitrate_mask.control[band].eht_mcs;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	changed = arsta-&gt;changed;</div><div class='add'>+	arsta-&gt;changed = 0;</div><div class='add'>+</div><div class='add'>+	bw = arsta-&gt;bw;</div><div class='add'>+	bw_prev = arsta-&gt;bw_prev;</div><div class='add'>+	nss = arsta-&gt;nss;</div><div class='add'>+	smps = arsta-&gt;smps;</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	nss = max_t(u32, 1, nss);</div><div class='add'>+	mac_nss = max3(ath12k_mac_max_ht_nss(ht_mcs_mask),</div><div class='add'>+		       ath12k_mac_max_vht_nss(vht_mcs_mask),</div><div class='add'>+		       ath12k_mac_max_he_nss(he_mcs_mask));</div><div class='add'>+	mac_nss = max(mac_nss, ath12k_mac_max_eht_nss(eht_mcs_mask));</div><div class='add'>+	nss = min(nss, mac_nss);</div><div class='add'>+</div><div class='add'>+	struct ath12k_wmi_peer_assoc_arg *peer_arg __free(kfree) =</div><div class='add'>+					kzalloc(sizeof(*peer_arg), GFP_KERNEL);</div><div class='add'>+	if (!peer_arg)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (changed &amp; IEEE80211_RC_BW_CHANGED) {</div><div class='add'>+		ath12k_peer_assoc_h_phymode(ar, arvif, arsta, peer_arg);</div><div class='add'>+		peer_phymode = peer_arg-&gt;peer_phymode;</div><div class='add'>+</div><div class='add'>+		if (bw &gt; bw_prev) {</div><div class='add'>+			/* Phymode shows maximum supported channel width, if we</div><div class='add'>+			 * upgrade bandwidth then due to sanity check of firmware,</div><div class='add'>+			 * we have to send WMI_PEER_PHYMODE followed by</div><div class='add'>+			 * WMI_PEER_CHWIDTH</div><div class='add'>+			 */</div><div class='add'>+			ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac bandwidth upgrade for sta %pM new %d old %d\n",</div><div class='add'>+				   arsta-&gt;addr, bw, bw_prev);</div><div class='add'>+			err = ath12k_wmi_set_peer_param(ar, arsta-&gt;addr,</div><div class='add'>+							arvif-&gt;vdev_id, WMI_PEER_PHYMODE,</div><div class='add'>+							peer_phymode);</div><div class='add'>+			if (err) {</div><div class='add'>+				ath12k_warn(ar-&gt;ab, "failed to update STA %pM to peer phymode %d: %d\n",</div><div class='add'>+					    arsta-&gt;addr, peer_phymode, err);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+			err = ath12k_wmi_set_peer_param(ar, arsta-&gt;addr,</div><div class='add'>+							arvif-&gt;vdev_id, WMI_PEER_CHWIDTH,</div><div class='add'>+							bw);</div><div class='add'>+			if (err)</div><div class='add'>+				ath12k_warn(ar-&gt;ab, "failed to update STA %pM to peer bandwidth %d: %d\n",</div><div class='add'>+					    arsta-&gt;addr, bw, err);</div><div class='add'>+		} else {</div><div class='add'>+			/* When we downgrade bandwidth this will conflict with phymode</div><div class='add'>+			 * and cause to trigger firmware crash. In this case we send</div><div class='add'>+			 * WMI_PEER_CHWIDTH followed by WMI_PEER_PHYMODE</div><div class='add'>+			 */</div><div class='add'>+			ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac bandwidth downgrade for sta %pM new %d old %d\n",</div><div class='add'>+				   arsta-&gt;addr, bw, bw_prev);</div><div class='add'>+			err = ath12k_wmi_set_peer_param(ar, arsta-&gt;addr,</div><div class='add'>+							arvif-&gt;vdev_id, WMI_PEER_CHWIDTH,</div><div class='add'>+							bw);</div><div class='add'>+			if (err) {</div><div class='add'>+				ath12k_warn(ar-&gt;ab, "failed to update STA %pM peer to bandwidth %d: %d\n",</div><div class='add'>+					    arsta-&gt;addr, bw, err);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+			err = ath12k_wmi_set_peer_param(ar, arsta-&gt;addr,</div><div class='add'>+							arvif-&gt;vdev_id, WMI_PEER_PHYMODE,</div><div class='add'>+							peer_phymode);</div><div class='add'>+			if (err)</div><div class='add'>+				ath12k_warn(ar-&gt;ab, "failed to update STA %pM to peer phymode %d: %d\n",</div><div class='add'>+					    arsta-&gt;addr, peer_phymode, err);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; IEEE80211_RC_NSS_CHANGED) {</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac update sta %pM nss %d\n",</div><div class='add'>+			   arsta-&gt;addr, nss);</div><div class='add'>+</div><div class='add'>+		err = ath12k_wmi_set_peer_param(ar, arsta-&gt;addr, arvif-&gt;vdev_id,</div><div class='add'>+						WMI_PEER_NSS, nss);</div><div class='add'>+		if (err)</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to update STA %pM nss %d: %d\n",</div><div class='add'>+				    arsta-&gt;addr, nss, err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; IEEE80211_RC_SMPS_CHANGED) {</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac update sta %pM smps %d\n",</div><div class='add'>+			   arsta-&gt;addr, smps);</div><div class='add'>+</div><div class='add'>+		err = ath12k_wmi_set_peer_param(ar, arsta-&gt;addr, arvif-&gt;vdev_id,</div><div class='add'>+						WMI_PEER_MIMO_PS_STATE, smps);</div><div class='add'>+		if (err)</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to update STA %pM smps %d: %d\n",</div><div class='add'>+				    arsta-&gt;addr, smps, err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; IEEE80211_RC_SUPP_RATES_CHANGED) {</div><div class='add'>+		mask = &amp;arvif-&gt;bitrate_mask;</div><div class='add'>+		num_vht_rates = ath12k_mac_bitrate_mask_num_vht_rates(ar, band,</div><div class='add'>+								      mask);</div><div class='add'>+		num_he_rates = ath12k_mac_bitrate_mask_num_he_rates(ar, band,</div><div class='add'>+								    mask);</div><div class='add'>+		num_eht_rates = ath12k_mac_bitrate_mask_num_eht_rates(ar, band,</div><div class='add'>+								      mask);</div><div class='add'>+</div><div class='add'>+		/* Peer_assoc_prepare will reject vht rates in</div><div class='add'>+		 * bitrate_mask if its not available in range format and</div><div class='add'>+		 * sets vht tx_rateset as unsupported. So multiple VHT MCS</div><div class='add'>+		 * setting(eg. MCS 4,5,6) per peer is not supported here.</div><div class='add'>+		 * But, Single rate in VHT mask can be set as per-peer</div><div class='add'>+		 * fixed rate. But even if any HT rates are configured in</div><div class='add'>+		 * the bitrate mask, device will not switch to those rates</div><div class='add'>+		 * when per-peer Fixed rate is set.</div><div class='add'>+		 * TODO: Check RATEMASK_CMDID to support auto rates selection</div><div class='add'>+		 * across HT/VHT and for multiple VHT MCS support.</div><div class='add'>+		 */</div><div class='add'>+		link_sta = ath12k_mac_get_link_sta(arsta);</div><div class='add'>+		if (!link_sta) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "unable to access link sta in peer assoc he for sta %pM link %u\n",</div><div class='add'>+				    sta-&gt;addr, arsta-&gt;link_id);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (link_sta-&gt;vht_cap.vht_supported &amp;&amp; num_vht_rates == 1) {</div><div class='add'>+			ath12k_mac_set_peer_vht_fixed_rate(arvif, arsta, mask,</div><div class='add'>+							   band);</div><div class='add'>+		} else if (link_sta-&gt;he_cap.has_he &amp;&amp; num_he_rates == 1) {</div><div class='add'>+			ath12k_mac_set_peer_he_fixed_rate(arvif, arsta, mask, band);</div><div class='add'>+		} else if (link_sta-&gt;eht_cap.has_eht &amp;&amp; num_eht_rates == 1) {</div><div class='add'>+			err = ath12k_mac_set_peer_eht_fixed_rate(arvif, arsta,</div><div class='add'>+								 mask, band);</div><div class='add'>+			if (err) {</div><div class='add'>+				ath12k_warn(ar-&gt;ab,</div><div class='add'>+					    "failed to set peer EHT fixed rate for STA %pM ret %d\n",</div><div class='add'>+					    arsta-&gt;addr, err);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			/* If the peer is non-VHT/HE/EHT or no fixed VHT/HE/EHT</div><div class='add'>+			 * rate is provided in the new bitrate mask we set the</div><div class='add'>+			 * other rates using peer_assoc command. Also clear</div><div class='add'>+			 * the peer fixed rate settings as it has higher proprity</div><div class='add'>+			 * than peer assoc</div><div class='add'>+			 */</div><div class='add'>+			err = ath12k_wmi_set_peer_param(ar, arsta-&gt;addr,</div><div class='add'>+							arvif-&gt;vdev_id,</div><div class='add'>+							WMI_PEER_PARAM_FIXED_RATE,</div><div class='add'>+							WMI_FIXED_RATE_NONE);</div><div class='add'>+			if (err)</div><div class='add'>+				ath12k_warn(ar-&gt;ab,</div><div class='add'>+					    "failed to disable peer fixed rate for STA %pM ret %d\n",</div><div class='add'>+					    arsta-&gt;addr, err);</div><div class='add'>+</div><div class='add'>+			ath12k_peer_assoc_prepare(ar, arvif, arsta,</div><div class='add'>+						  peer_arg, true);</div><div class='add'>+</div><div class='add'>+			peer_arg-&gt;is_assoc = false;</div><div class='add'>+			err = ath12k_wmi_send_peer_assoc_cmd(ar, peer_arg);</div><div class='add'>+			if (err)</div><div class='add'>+				ath12k_warn(ar-&gt;ab, "failed to run peer assoc for STA %pM vdev %i: %d\n",</div><div class='add'>+					    arsta-&gt;addr, arvif-&gt;vdev_id, err);</div><div class='add'>+</div><div class='add'>+			if (!wait_for_completion_timeout(&amp;ar-&gt;peer_assoc_done, 1 * HZ))</div><div class='add'>+				ath12k_warn(ar-&gt;ab, "failed to get peer assoc conf event for %pM vdev %i\n",</div><div class='add'>+					    arsta-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_free_unassign_link_sta(struct ath12k_hw *ah,</div><div class='add'>+					      struct ath12k_sta *ahsta,</div><div class='add'>+					      u8 link_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(link_id &gt;= IEEE80211_MLD_MAX_NUM_LINKS))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	arsta = wiphy_dereference(ah-&gt;hw-&gt;wiphy, ahsta-&gt;link[link_id]);</div><div class='add'>+	if (WARN_ON(!arsta))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ahsta-&gt;links_map &amp;= ~BIT(link_id);</div><div class='add'>+	rcu_assign_pointer(ahsta-&gt;link[link_id], NULL);</div><div class='add'>+	synchronize_rcu();</div><div class='add'>+</div><div class='add'>+	if (arsta == &amp;ahsta-&gt;deflink) {</div><div class='add'>+		arsta-&gt;link_id = ATH12K_INVALID_LINK_ID;</div><div class='add'>+		arsta-&gt;ahsta = NULL;</div><div class='add'>+		arsta-&gt;arvif = NULL;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(arsta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_inc_num_stations(struct ath12k_link_vif *arvif,</div><div class='add'>+				       struct ath12k_link_sta *arsta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta-&gt;ahsta);</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;ahvif-&gt;vdev_type == WMI_VDEV_TYPE_STA &amp;&amp; !sta-&gt;tdls)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;num_stations &gt;= ar-&gt;max_num_stations)</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	ar-&gt;num_stations++;</div><div class='add'>+	arvif-&gt;num_stations++;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "mac station %pM connected to vdev %u num_stations %u\n",</div><div class='add'>+		   arsta-&gt;addr, arvif-&gt;vdev_id, arvif-&gt;num_stations);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_dec_num_stations(struct ath12k_link_vif *arvif,</div><div class='add'>+					struct ath12k_link_sta *arsta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta-&gt;ahsta);</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;ahvif-&gt;vdev_type == WMI_VDEV_TYPE_STA &amp;&amp; !sta-&gt;tdls)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ar-&gt;num_stations--;</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;num_stations) {</div><div class='add'>+		arvif-&gt;num_stations--;</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+			   "mac station %pM disconnected from vdev %u num_stations %u\n",</div><div class='add'>+			   arsta-&gt;addr, arvif-&gt;vdev_id, arvif-&gt;num_stations);</div><div class='add'>+	} else {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "mac station %pM disconnect for vdev %u without any connected station\n",</div><div class='add'>+			    arsta-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_station_post_remove(struct ath12k *ar,</div><div class='add'>+					   struct ath12k_link_vif *arvif,</div><div class='add'>+					   struct ath12k_link_sta *arsta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta-&gt;ahsta);</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ath12k_mac_dec_num_stations(arvif, arsta);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	peer = ath12k_peer_find(ar-&gt;ab, arvif-&gt;vdev_id, arsta-&gt;addr);</div><div class='add'>+	if (peer &amp;&amp; peer-&gt;sta == sta) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "Found peer entry %pM n vdev %i after it was supposedly removed\n",</div><div class='add'>+			    vif-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+		peer-&gt;sta = NULL;</div><div class='add'>+		list_del(&amp;peer-&gt;list);</div><div class='add'>+		kfree(peer);</div><div class='add'>+		ar-&gt;num_peers--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	kfree(arsta-&gt;rx_stats);</div><div class='add'>+	arsta-&gt;rx_stats = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_station_unauthorize(struct ath12k *ar,</div><div class='add'>+					  struct ath12k_link_vif *arvif,</div><div class='add'>+					  struct ath12k_link_sta *arsta)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	peer = ath12k_peer_find(ar-&gt;ab, arvif-&gt;vdev_id, arsta-&gt;addr);</div><div class='add'>+	if (peer)</div><div class='add'>+		peer-&gt;is_authorized = false;</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	/* Driver must clear the keys during the state change from</div><div class='add'>+	 * IEEE80211_STA_AUTHORIZED to IEEE80211_STA_ASSOC, since after</div><div class='add'>+	 * returning from here, mac80211 is going to delete the keys</div><div class='add'>+	 * in __sta_info_destroy_part2(). This will ensure that the driver does</div><div class='add'>+	 * not retain stale key references after mac80211 deletes the keys.</div><div class='add'>+	 */</div><div class='add'>+	ret = ath12k_clear_peer_keys(arvif, arsta-&gt;addr);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to clear all peer keys for vdev %i: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_station_authorize(struct ath12k *ar,</div><div class='add'>+					struct ath12k_link_vif *arvif,</div><div class='add'>+					struct ath12k_link_sta *arsta)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	peer = ath12k_peer_find(ar-&gt;ab, arvif-&gt;vdev_id, arsta-&gt;addr);</div><div class='add'>+	if (peer)</div><div class='add'>+		peer-&gt;is_authorized = true;</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; arvif-&gt;is_up) {</div><div class='add'>+		ret = ath12k_wmi_set_peer_param(ar, arsta-&gt;addr,</div><div class='add'>+						arvif-&gt;vdev_id,</div><div class='add'>+						WMI_PEER_AUTHORIZE,</div><div class='add'>+						1);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "Unable to authorize peer %pM vdev %d: %d\n",</div><div class='add'>+				    arsta-&gt;addr, arvif-&gt;vdev_id, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_station_remove(struct ath12k *ar,</div><div class='add'>+				     struct ath12k_link_vif *arvif,</div><div class='add'>+				     struct ath12k_link_sta *arsta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta-&gt;ahsta);</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	wiphy_work_cancel(ar-&gt;ah-&gt;hw-&gt;wiphy, &amp;arsta-&gt;update_wk);</div><div class='add'>+</div><div class='add'>+	if (ahvif-&gt;vdev_type == WMI_VDEV_TYPE_STA) {</div><div class='add'>+		ath12k_bss_disassoc(ar, arvif);</div><div class='add'>+		ret = ath12k_mac_vdev_stop(arvif);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to stop vdev %i: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;mlo)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ath12k_dp_peer_cleanup(ar, arvif-&gt;vdev_id, arsta-&gt;addr);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_peer_delete(ar, arvif-&gt;vdev_id, arsta-&gt;addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "Failed to delete peer: %pM for VDEV: %d\n",</div><div class='add'>+			    arsta-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+	else</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "Removed peer: %pM for VDEV: %d\n",</div><div class='add'>+			   arsta-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	ath12k_mac_station_post_remove(ar, arvif, arsta);</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;valid_links)</div><div class='add'>+		ath12k_mac_free_unassign_link_sta(ahvif-&gt;ah,</div><div class='add'>+						  arsta-&gt;ahsta, arsta-&gt;link_id);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_station_add(struct ath12k *ar,</div><div class='add'>+				  struct ath12k_link_vif *arvif,</div><div class='add'>+				  struct ath12k_link_sta *arsta)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta-&gt;ahsta);</div><div class='add'>+	struct ath12k_wmi_peer_create_arg peer_param = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_inc_num_stations(arvif, arsta);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "refusing to associate station: too many connected already (%d)\n",</div><div class='add'>+			    ar-&gt;max_num_stations);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ath12k_debugfs_is_extd_rx_stats_enabled(ar) &amp;&amp; !arsta-&gt;rx_stats) {</div><div class='add'>+		arsta-&gt;rx_stats = kzalloc(sizeof(*arsta-&gt;rx_stats), GFP_KERNEL);</div><div class='add'>+		if (!arsta-&gt;rx_stats) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto dec_num_station;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	peer_param.vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+	peer_param.peer_addr = arsta-&gt;addr;</div><div class='add'>+	peer_param.peer_type = WMI_PEER_TYPE_DEFAULT;</div><div class='add'>+	peer_param.ml_enabled = sta-&gt;mlo;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_peer_create(ar, arvif, sta, &amp;peer_param);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "Failed to add peer: %pM for VDEV: %d\n",</div><div class='add'>+			    arsta-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+		goto free_peer;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MAC, "Added peer: %pM for VDEV: %d\n",</div><div class='add'>+		   arsta-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_is_mesh(vif)) {</div><div class='add'>+		ret = ath12k_wmi_set_peer_param(ar, arsta-&gt;addr,</div><div class='add'>+						arvif-&gt;vdev_id,</div><div class='add'>+						WMI_PEER_USE_4ADDR, 1);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to STA %pM 4addr capability: %d\n",</div><div class='add'>+				    arsta-&gt;addr, ret);</div><div class='add'>+			goto free_peer;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_peer_setup(ar, arvif-&gt;vdev_id, arsta-&gt;addr);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to setup dp for peer %pM on vdev %i (%d)\n",</div><div class='add'>+			    arsta-&gt;addr, arvif-&gt;vdev_id, ret);</div><div class='add'>+		goto free_peer;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;vdev_start_delay &amp;&amp;</div><div class='add'>+	    !arvif-&gt;is_started &amp;&amp;</div><div class='add'>+	    arvif-&gt;ahvif-&gt;vdev_type != WMI_VDEV_TYPE_AP) {</div><div class='add'>+		ret = ath12k_start_vdev_delay(ar, arvif);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to delay vdev start: %d\n", ret);</div><div class='add'>+			goto free_peer;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ewma_avg_rssi_init(&amp;arsta-&gt;avg_rssi);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_peer:</div><div class='add'>+	ath12k_peer_delete(ar, arvif-&gt;vdev_id, arsta-&gt;addr);</div><div class='add'>+	kfree(arsta-&gt;rx_stats);</div><div class='add'>+	arsta-&gt;rx_stats = NULL;</div><div class='add'>+dec_num_station:</div><div class='add'>+	ath12k_mac_dec_num_stations(arvif, arsta);</div><div class='add'>+exit:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_assign_link_sta(struct ath12k_hw *ah,</div><div class='add'>+				      struct ath12k_sta *ahsta,</div><div class='add'>+				      struct ath12k_link_sta *arsta,</div><div class='add'>+				      struct ath12k_vif *ahvif,</div><div class='add'>+				      u8 link_id)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(ahsta);</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!arsta || link_id &gt;= IEEE80211_MLD_MAX_NUM_LINKS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	arvif = wiphy_dereference(ah-&gt;hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+	if (!arvif)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(arsta, 0, sizeof(*arsta));</div><div class='add'>+</div><div class='add'>+	link_sta = wiphy_dereference(ah-&gt;hw-&gt;wiphy, sta-&gt;link[link_id]);</div><div class='add'>+	if (!link_sta)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(arsta-&gt;addr, link_sta-&gt;addr);</div><div class='add'>+</div><div class='add'>+	/* logical index of the link sta in order of creation */</div><div class='add'>+	arsta-&gt;link_idx = ahsta-&gt;num_peer++;</div><div class='add'>+</div><div class='add'>+	arsta-&gt;link_id = link_id;</div><div class='add'>+	ahsta-&gt;links_map |= BIT(arsta-&gt;link_id);</div><div class='add'>+	arsta-&gt;arvif = arvif;</div><div class='add'>+	arsta-&gt;ahsta = ahsta;</div><div class='add'>+	ahsta-&gt;ahvif = ahvif;</div><div class='add'>+</div><div class='add'>+	wiphy_work_init(&amp;arsta-&gt;update_wk, ath12k_sta_rc_update_wk);</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(ahsta-&gt;link[link_id], arsta);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_ml_station_remove(struct ath12k_vif *ahvif,</div><div class='add'>+					 struct ath12k_sta *ahsta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(ahsta);</div><div class='add'>+	struct ath12k_hw *ah = ahvif-&gt;ah;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	unsigned long links;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	u8 link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ath12k_peer_mlo_link_peers_delete(ahvif, ahsta);</div><div class='add'>+</div><div class='add'>+	/* validate link station removal and clear arsta links */</div><div class='add'>+	links = ahsta-&gt;links_map;</div><div class='add'>+	for_each_set_bit(link_id, &amp;links, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		arvif = wiphy_dereference(ah-&gt;hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+		arsta = wiphy_dereference(ah-&gt;hw-&gt;wiphy, ahsta-&gt;link[link_id]);</div><div class='add'>+		if (!arvif || !arsta)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ar = arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+		ath12k_mac_station_post_remove(ar, arvif, arsta);</div><div class='add'>+</div><div class='add'>+		ath12k_mac_free_unassign_link_sta(ah, ahsta, link_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_peer_ml_delete(ah, sta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_handle_link_sta_state(struct ieee80211_hw *hw,</div><div class='add'>+					    struct ath12k_link_vif *arvif,</div><div class='add'>+					    struct ath12k_link_sta *arsta,</div><div class='add'>+					    enum ieee80211_sta_state old_state,</div><div class='add'>+					    enum ieee80211_sta_state new_state)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ath12k_reg_info *reg_info;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MAC, "mac handle link %u sta %pM state %d -&gt; %d\n",</div><div class='add'>+		   arsta-&gt;link_id, arsta-&gt;addr, old_state, new_state);</div><div class='add'>+</div><div class='add'>+	/* IEEE80211_STA_NONE -&gt; IEEE80211_STA_NOTEXIST: Remove the station</div><div class='add'>+	 * from driver</div><div class='add'>+	 */</div><div class='add'>+	if ((old_state == IEEE80211_STA_NONE &amp;&amp;</div><div class='add'>+	     new_state == IEEE80211_STA_NOTEXIST)) {</div><div class='add'>+		ret = ath12k_mac_station_remove(ar, arvif, arsta);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "Failed to remove station: %pM for VDEV: %d\n",</div><div class='add'>+				    arsta-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* IEEE80211_STA_NOTEXIST -&gt; IEEE80211_STA_NONE: Add new station to driver */</div><div class='add'>+	if (old_state == IEEE80211_STA_NOTEXIST &amp;&amp;</div><div class='add'>+	    new_state == IEEE80211_STA_NONE) {</div><div class='add'>+		ret = ath12k_mac_station_add(ar, arvif, arsta);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ab, "Failed to add station: %pM for VDEV: %d\n",</div><div class='add'>+				    arsta-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	/* IEEE80211_STA_AUTH -&gt; IEEE80211_STA_ASSOC: Send station assoc command for</div><div class='add'>+	 * peer associated to AP/Mesh/ADHOC vif type.</div><div class='add'>+	 */</div><div class='add'>+	} else if (old_state == IEEE80211_STA_AUTH &amp;&amp;</div><div class='add'>+		   new_state == IEEE80211_STA_ASSOC &amp;&amp;</div><div class='add'>+		   (vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='add'>+		    vif-&gt;type == NL80211_IFTYPE_MESH_POINT ||</div><div class='add'>+		    vif-&gt;type == NL80211_IFTYPE_ADHOC)) {</div><div class='add'>+		ret = ath12k_mac_station_assoc(ar, arvif, arsta, false);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ab, "Failed to associate station: %pM\n",</div><div class='add'>+				    arsta-&gt;addr);</div><div class='add'>+</div><div class='add'>+	/* IEEE80211_STA_ASSOC -&gt; IEEE80211_STA_AUTHORIZED: set peer status as</div><div class='add'>+	 * authorized</div><div class='add'>+	 */</div><div class='add'>+	} else if (old_state == IEEE80211_STA_ASSOC &amp;&amp;</div><div class='add'>+		   new_state == IEEE80211_STA_AUTHORIZED) {</div><div class='add'>+		ret = ath12k_mac_station_authorize(ar, arvif, arsta);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "Failed to authorize station: %pM\n",</div><div class='add'>+				    arsta-&gt;addr);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ath12k_wmi_supports_6ghz_cc_ext(ar) &amp;&amp;</div><div class='add'>+		    arvif-&gt;ahvif-&gt;vdev_type == WMI_VDEV_TYPE_STA) {</div><div class='add'>+			link_conf = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+			reg_info = ab-&gt;reg_info[ar-&gt;pdev_idx];</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_MAC, "connection done, update reg rules\n");</div><div class='add'>+			ath12k_hw_to_ah(hw)-&gt;regd_updated = false;</div><div class='add'>+			ath12k_reg_handle_chan_list(ab, reg_info, arvif-&gt;ahvif-&gt;vdev_type,</div><div class='add'>+						    link_conf-&gt;power_type);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	/* IEEE80211_STA_AUTHORIZED -&gt; IEEE80211_STA_ASSOC: station may be in removal,</div><div class='add'>+	 * deauthorize it.</div><div class='add'>+	 */</div><div class='add'>+	} else if (old_state == IEEE80211_STA_AUTHORIZED &amp;&amp;</div><div class='add'>+		   new_state == IEEE80211_STA_ASSOC) {</div><div class='add'>+		ath12k_mac_station_unauthorize(ar, arvif, arsta);</div><div class='add'>+</div><div class='add'>+	/* IEEE80211_STA_ASSOC -&gt; IEEE80211_STA_AUTH: disassoc peer connected to</div><div class='add'>+	 * AP/mesh/ADHOC vif type.</div><div class='add'>+	 */</div><div class='add'>+	} else if (old_state == IEEE80211_STA_ASSOC &amp;&amp;</div><div class='add'>+		   new_state == IEEE80211_STA_AUTH &amp;&amp;</div><div class='add'>+		   (vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='add'>+		    vif-&gt;type == NL80211_IFTYPE_MESH_POINT ||</div><div class='add'>+		    vif-&gt;type == NL80211_IFTYPE_ADHOC)) {</div><div class='add'>+		ret = ath12k_mac_station_disassoc(ar, arvif, arsta);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ab, "Failed to disassociate station: %pM\n",</div><div class='add'>+				    arsta-&gt;addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_mac_is_freq_on_mac(struct ath12k_hw_mode_freq_range_arg *freq_range,</div><div class='add'>+				      u32 freq, u8 mac_id)</div><div class='add'>+{</div><div class='add'>+	return (freq &gt;= freq_range[mac_id].low_2ghz_freq &amp;&amp;</div><div class='add'>+		freq &lt;= freq_range[mac_id].high_2ghz_freq) ||</div><div class='add'>+	       (freq &gt;= freq_range[mac_id].low_5ghz_freq &amp;&amp;</div><div class='add'>+		freq &lt;= freq_range[mac_id].high_5ghz_freq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+ath12k_mac_2_freq_same_mac_in_freq_range(struct ath12k_base *ab,</div><div class='add'>+					 struct ath12k_hw_mode_freq_range_arg *freq_range,</div><div class='add'>+					 u32 freq_link1, u32 freq_link2)</div><div class='add'>+{</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_RADIOS; i++) {</div><div class='add'>+		if (ath12k_mac_is_freq_on_mac(freq_range, freq_link1, i) &amp;&amp;</div><div class='add'>+		    ath12k_mac_is_freq_on_mac(freq_range, freq_link2, i))</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_mac_is_hw_dbs_capable(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return test_bit(WMI_TLV_SERVICE_DUAL_BAND_SIMULTANEOUS_SUPPORT,</div><div class='add'>+			ab-&gt;wmi_ab.svc_map) &amp;&amp;</div><div class='add'>+	       ab-&gt;wmi_ab.hw_mode_info.support_dbs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_mac_2_freq_same_mac_in_dbs(struct ath12k_base *ab,</div><div class='add'>+					      u32 freq_link1, u32 freq_link2)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_mode_freq_range_arg *freq_range;</div><div class='add'>+</div><div class='add'>+	if (!ath12k_mac_is_hw_dbs_capable(ab))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	freq_range = ab-&gt;wmi_ab.hw_mode_info.freq_range_caps[ATH12K_HW_MODE_DBS];</div><div class='add'>+	return ath12k_mac_2_freq_same_mac_in_freq_range(ab, freq_range,</div><div class='add'>+							freq_link1, freq_link2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_mac_is_hw_sbs_capable(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return test_bit(WMI_TLV_SERVICE_DUAL_BAND_SIMULTANEOUS_SUPPORT,</div><div class='add'>+			ab-&gt;wmi_ab.svc_map) &amp;&amp;</div><div class='add'>+	       ab-&gt;wmi_ab.hw_mode_info.support_sbs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_mac_2_freq_same_mac_in_sbs(struct ath12k_base *ab,</div><div class='add'>+					      u32 freq_link1, u32 freq_link2)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_mode_info *info = &amp;ab-&gt;wmi_ab.hw_mode_info;</div><div class='add'>+	struct ath12k_hw_mode_freq_range_arg *sbs_uppr_share;</div><div class='add'>+	struct ath12k_hw_mode_freq_range_arg *sbs_low_share;</div><div class='add'>+	struct ath12k_hw_mode_freq_range_arg *sbs_range;</div><div class='add'>+</div><div class='add'>+	if (!ath12k_mac_is_hw_sbs_capable(ab))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;wmi_ab.sbs_lower_band_end_freq) {</div><div class='add'>+		sbs_uppr_share = info-&gt;freq_range_caps[ATH12K_HW_MODE_SBS_UPPER_SHARE];</div><div class='add'>+		sbs_low_share = info-&gt;freq_range_caps[ATH12K_HW_MODE_SBS_LOWER_SHARE];</div><div class='add'>+</div><div class='add'>+		return ath12k_mac_2_freq_same_mac_in_freq_range(ab, sbs_low_share,</div><div class='add'>+								freq_link1, freq_link2) ||</div><div class='add'>+		       ath12k_mac_2_freq_same_mac_in_freq_range(ab, sbs_uppr_share,</div><div class='add'>+								freq_link1, freq_link2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sbs_range = info-&gt;freq_range_caps[ATH12K_HW_MODE_SBS];</div><div class='add'>+	return ath12k_mac_2_freq_same_mac_in_freq_range(ab, sbs_range,</div><div class='add'>+							freq_link1, freq_link2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_mac_freqs_on_same_mac(struct ath12k_base *ab,</div><div class='add'>+					 u32 freq_link1, u32 freq_link2)</div><div class='add'>+{</div><div class='add'>+	return ath12k_mac_2_freq_same_mac_in_dbs(ab, freq_link1, freq_link2) &amp;&amp;</div><div class='add'>+	       ath12k_mac_2_freq_same_mac_in_sbs(ab, freq_link1, freq_link2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_mlo_sta_set_link_active(struct ath12k_base *ab,</div><div class='add'>+					      enum wmi_mlo_link_force_reason reason,</div><div class='add'>+					      enum wmi_mlo_link_force_mode mode,</div><div class='add'>+					      u8 *mlo_vdev_id_lst,</div><div class='add'>+					      u8 num_mlo_vdev,</div><div class='add'>+					      u8 *mlo_inactive_vdev_lst,</div><div class='add'>+					      u8 num_mlo_inactive_vdev)</div><div class='add'>+{</div><div class='add'>+	struct wmi_mlo_link_set_active_arg param = {};</div><div class='add'>+	u32 entry_idx, entry_offset, vdev_idx;</div><div class='add'>+	u8 vdev_id;</div><div class='add'>+</div><div class='add'>+	param.reason = reason;</div><div class='add'>+	param.force_mode = mode;</div><div class='add'>+</div><div class='add'>+	for (vdev_idx = 0; vdev_idx &lt; num_mlo_vdev; vdev_idx++) {</div><div class='add'>+		vdev_id = mlo_vdev_id_lst[vdev_idx];</div><div class='add'>+		entry_idx = vdev_id / 32;</div><div class='add'>+		entry_offset = vdev_id % 32;</div><div class='add'>+		if (entry_idx &gt;= WMI_MLO_LINK_NUM_SZ) {</div><div class='add'>+			ath12k_warn(ab, "Invalid entry_idx %d num_mlo_vdev %d vdev %d",</div><div class='add'>+				    entry_idx, num_mlo_vdev, vdev_id);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		param.vdev_bitmap[entry_idx] |= 1 &lt;&lt; entry_offset;</div><div class='add'>+		/* update entry number if entry index changed */</div><div class='add'>+		if (param.num_vdev_bitmap &lt; entry_idx + 1)</div><div class='add'>+			param.num_vdev_bitmap = entry_idx + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "num_vdev_bitmap %d vdev_bitmap[0] = 0x%x, vdev_bitmap[1] = 0x%x",</div><div class='add'>+		   param.num_vdev_bitmap, param.vdev_bitmap[0], param.vdev_bitmap[1]);</div><div class='add'>+</div><div class='add'>+	if (mode == WMI_MLO_LINK_FORCE_MODE_ACTIVE_INACTIVE) {</div><div class='add'>+		for (vdev_idx = 0; vdev_idx &lt; num_mlo_inactive_vdev; vdev_idx++) {</div><div class='add'>+			vdev_id = mlo_inactive_vdev_lst[vdev_idx];</div><div class='add'>+			entry_idx = vdev_id / 32;</div><div class='add'>+			entry_offset = vdev_id % 32;</div><div class='add'>+			if (entry_idx &gt;= WMI_MLO_LINK_NUM_SZ) {</div><div class='add'>+				ath12k_warn(ab, "Invalid entry_idx %d num_mlo_vdev %d vdev %d",</div><div class='add'>+					    entry_idx, num_mlo_inactive_vdev, vdev_id);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			param.inactive_vdev_bitmap[entry_idx] |= 1 &lt;&lt; entry_offset;</div><div class='add'>+			/* update entry number if entry index changed */</div><div class='add'>+			if (param.num_inactive_vdev_bitmap &lt; entry_idx + 1)</div><div class='add'>+				param.num_inactive_vdev_bitmap = entry_idx + 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_MAC,</div><div class='add'>+			   "num_vdev_bitmap %d inactive_vdev_bitmap[0] = 0x%x, inactive_vdev_bitmap[1] = 0x%x",</div><div class='add'>+			   param.num_inactive_vdev_bitmap,</div><div class='add'>+			   param.inactive_vdev_bitmap[0],</div><div class='add'>+			   param.inactive_vdev_bitmap[1]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mode == WMI_MLO_LINK_FORCE_MODE_ACTIVE_LINK_NUM ||</div><div class='add'>+	    mode == WMI_MLO_LINK_FORCE_MODE_INACTIVE_LINK_NUM) {</div><div class='add'>+		param.num_link_entry = 1;</div><div class='add'>+		param.link_num[0].num_of_link = num_mlo_vdev - 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ath12k_wmi_send_mlo_link_set_active_cmd(ab, &amp;param);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_mlo_sta_update_link_active(struct ath12k_base *ab,</div><div class='add'>+						 struct ieee80211_hw *hw,</div><div class='add'>+						 struct ath12k_vif *ahvif)</div><div class='add'>+{</div><div class='add'>+	u8 mlo_vdev_id_lst[IEEE80211_MLD_MAX_NUM_LINKS] = {};</div><div class='add'>+	u32 mlo_freq_list[IEEE80211_MLD_MAX_NUM_LINKS] = {};</div><div class='add'>+	unsigned long links = ahvif-&gt;links_map;</div><div class='add'>+	enum wmi_mlo_link_force_reason reason;</div><div class='add'>+	struct ieee80211_chanctx_conf *conf;</div><div class='add'>+	enum wmi_mlo_link_force_mode mode;</div><div class='add'>+	struct ieee80211_bss_conf *info;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	u8 num_mlo_vdev = 0;</div><div class='add'>+	u8 link_id;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(link_id, &amp;links, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		arvif = wiphy_dereference(hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+		/* make sure vdev is created on this device */</div><div class='add'>+		if (!arvif || !arvif-&gt;is_created || arvif-&gt;ar-&gt;ab != ab)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		info = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+		conf = wiphy_dereference(hw-&gt;wiphy, info-&gt;chanctx_conf);</div><div class='add'>+		mlo_freq_list[num_mlo_vdev] = conf-&gt;def.chan-&gt;center_freq;</div><div class='add'>+</div><div class='add'>+		mlo_vdev_id_lst[num_mlo_vdev] = arvif-&gt;vdev_id;</div><div class='add'>+		num_mlo_vdev++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* It is not allowed to activate more links than a single device</div><div class='add'>+	 * supported. Something goes wrong if we reach here.</div><div class='add'>+	 */</div><div class='add'>+	if (num_mlo_vdev &gt; ATH12K_NUM_MAX_ACTIVE_LINKS_PER_DEVICE) {</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if 2 links are established and both link channels fall on the</div><div class='add'>+	 * same hardware MAC, send command to firmware to deactivate one</div><div class='add'>+	 * of them.</div><div class='add'>+	 */</div><div class='add'>+	if (num_mlo_vdev == 2 &amp;&amp;</div><div class='add'>+	    ath12k_mac_freqs_on_same_mac(ab, mlo_freq_list[0],</div><div class='add'>+					 mlo_freq_list[1])) {</div><div class='add'>+		mode = WMI_MLO_LINK_FORCE_MODE_INACTIVE_LINK_NUM;</div><div class='add'>+		reason = WMI_MLO_LINK_FORCE_REASON_NEW_CONNECT;</div><div class='add'>+		return ath12k_mac_mlo_sta_set_link_active(ab, reason, mode,</div><div class='add'>+							  mlo_vdev_id_lst, num_mlo_vdev,</div><div class='add'>+							  NULL, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_mac_are_sbs_chan(struct ath12k_base *ab, u32 freq_1, u32 freq_2)</div><div class='add'>+{</div><div class='add'>+	if (!ath12k_mac_is_hw_sbs_capable(ab))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (ath12k_is_2ghz_channel_freq(freq_1) ||</div><div class='add'>+	    ath12k_is_2ghz_channel_freq(freq_2))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return !ath12k_mac_2_freq_same_mac_in_sbs(ab, freq_1, freq_2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_mac_are_dbs_chan(struct ath12k_base *ab, u32 freq_1, u32 freq_2)</div><div class='add'>+{</div><div class='add'>+	if (!ath12k_mac_is_hw_dbs_capable(ab))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return !ath12k_mac_2_freq_same_mac_in_dbs(ab, freq_1, freq_2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_select_links(struct ath12k_base *ab,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_hw *hw,</div><div class='add'>+				   u16 *selected_links)</div><div class='add'>+{</div><div class='add'>+	unsigned long useful_links = ieee80211_vif_usable_links(vif);</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	u8 num_useful_links = hweight_long(useful_links);</div><div class='add'>+	struct ieee80211_chanctx_conf *chanctx;</div><div class='add'>+	struct ath12k_link_vif *assoc_arvif;</div><div class='add'>+	u32 assoc_link_freq, partner_freq;</div><div class='add'>+	u16 sbs_links = 0, dbs_links = 0;</div><div class='add'>+	struct ieee80211_bss_conf *info;</div><div class='add'>+	struct ieee80211_channel *chan;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct ath12k_sta *ahsta;</div><div class='add'>+	u8 link_id;</div><div class='add'>+</div><div class='add'>+	/* activate all useful links if less than max supported */</div><div class='add'>+	if (num_useful_links &lt;= ATH12K_NUM_MAX_ACTIVE_LINKS_PER_DEVICE) {</div><div class='add'>+		*selected_links = useful_links;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* only in station mode we can get here, so it's safe</div><div class='add'>+	 * to use ap_addr</div><div class='add'>+	 */</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	sta = ieee80211_find_sta(vif, vif-&gt;cfg.ap_addr);</div><div class='add'>+	if (!sta) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		ath12k_warn(ab, "failed to find sta with addr %pM\n", vif-&gt;cfg.ap_addr);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ahsta = ath12k_sta_to_ahsta(sta);</div><div class='add'>+	assoc_arvif = wiphy_dereference(hw-&gt;wiphy, ahvif-&gt;link[ahsta-&gt;assoc_link_id]);</div><div class='add'>+	info = ath12k_mac_get_link_bss_conf(assoc_arvif);</div><div class='add'>+	chanctx = rcu_dereference(info-&gt;chanctx_conf);</div><div class='add'>+	assoc_link_freq = chanctx-&gt;def.chan-&gt;center_freq;</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MAC, "assoc link %u freq %u\n",</div><div class='add'>+		   assoc_arvif-&gt;link_id, assoc_link_freq);</div><div class='add'>+</div><div class='add'>+	/* assoc link is already activated and has to be kept active,</div><div class='add'>+	 * only need to select a partner link from others.</div><div class='add'>+	 */</div><div class='add'>+	useful_links &amp;= ~BIT(assoc_arvif-&gt;link_id);</div><div class='add'>+	for_each_set_bit(link_id, &amp;useful_links, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		info = wiphy_dereference(hw-&gt;wiphy, vif-&gt;link_conf[link_id]);</div><div class='add'>+		if (!info) {</div><div class='add'>+			ath12k_warn(ab, "failed to get link info for link: %u\n",</div><div class='add'>+				    link_id);</div><div class='add'>+			return -ENOLINK;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		chan = info-&gt;chanreq.oper.chan;</div><div class='add'>+		if (!chan) {</div><div class='add'>+			ath12k_warn(ab, "failed to get chan for link: %u\n", link_id);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		partner_freq = chan-&gt;center_freq;</div><div class='add'>+		if (ath12k_mac_are_sbs_chan(ab, assoc_link_freq, partner_freq)) {</div><div class='add'>+			sbs_links |= BIT(link_id);</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_MAC, "new SBS link %u freq %u\n",</div><div class='add'>+				   link_id, partner_freq);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ath12k_mac_are_dbs_chan(ab, assoc_link_freq, partner_freq)) {</div><div class='add'>+			dbs_links |= BIT(link_id);</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_MAC, "new DBS link %u freq %u\n",</div><div class='add'>+				   link_id, partner_freq);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_MAC, "non DBS/SBS link %u freq %u\n",</div><div class='add'>+			   link_id, partner_freq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* choose the first candidate no matter how many is in the list */</div><div class='add'>+	if (sbs_links)</div><div class='add'>+		link_id = __ffs(sbs_links);</div><div class='add'>+	else if (dbs_links)</div><div class='add'>+		link_id = __ffs(dbs_links);</div><div class='add'>+	else</div><div class='add'>+		link_id = ffs(useful_links) - 1;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MAC, "select partner link %u\n", link_id);</div><div class='add'>+</div><div class='add'>+	*selected_links = BIT(assoc_arvif-&gt;link_id) | BIT(link_id);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_op_sta_state(struct ieee80211_hw *hw,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_sta *sta,</div><div class='add'>+				   enum ieee80211_sta_state old_state,</div><div class='add'>+				   enum ieee80211_sta_state new_state)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta);</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	struct ath12k_base *prev_ab = NULL, *ab;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	unsigned long valid_links;</div><div class='add'>+	u16 selected_links = 0;</div><div class='add'>+	u8 link_id = 0, i;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_is_mld(vif) &amp;&amp; sta-&gt;valid_links) {</div><div class='add'>+		WARN_ON(!sta-&gt;mlo &amp;&amp; hweight16(sta-&gt;valid_links) != 1);</div><div class='add'>+		link_id = ffs(sta-&gt;valid_links) - 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* IEEE80211_STA_NOTEXIST -&gt; IEEE80211_STA_NONE:</div><div class='add'>+	 * New station add received. If this is a ML station then</div><div class='add'>+	 * ahsta-&gt;links_map will be zero and sta-&gt;valid_links will be 1.</div><div class='add'>+	 * Assign default link to the first link sta.</div><div class='add'>+	 */</div><div class='add'>+	if (old_state == IEEE80211_STA_NOTEXIST &amp;&amp;</div><div class='add'>+	    new_state == IEEE80211_STA_NONE) {</div><div class='add'>+		memset(ahsta, 0, sizeof(*ahsta));</div><div class='add'>+</div><div class='add'>+		arsta = &amp;ahsta-&gt;deflink;</div><div class='add'>+</div><div class='add'>+		/* ML sta */</div><div class='add'>+		if (sta-&gt;mlo &amp;&amp; !ahsta-&gt;links_map &amp;&amp;</div><div class='add'>+		    (hweight16(sta-&gt;valid_links) == 1)) {</div><div class='add'>+			ret = ath12k_peer_ml_create(ah, sta);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_hw_warn(ah, "unable to create ML peer for sta %pM",</div><div class='add'>+					       sta-&gt;addr);</div><div class='add'>+				goto exit;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ath12k_mac_assign_link_sta(ah, ahsta, arsta, ahvif,</div><div class='add'>+						 link_id);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_hw_warn(ah, "unable assign link %d for sta %pM",</div><div class='add'>+				       link_id, sta-&gt;addr);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* above arsta will get memset, hence do this after assign</div><div class='add'>+		 * link sta</div><div class='add'>+		 */</div><div class='add'>+		if (sta-&gt;mlo) {</div><div class='add'>+			/* For station mode, arvif-&gt;is_sta_assoc_link has been set when</div><div class='add'>+			 * vdev starts. Make sure the arvif/arsta pair have same setting</div><div class='add'>+			 */</div><div class='add'>+			if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+			    !arsta-&gt;arvif-&gt;is_sta_assoc_link) {</div><div class='add'>+				ath12k_hw_warn(ah, "failed to verify assoc link setting with link id %u\n",</div><div class='add'>+					       link_id);</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto exit;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			arsta-&gt;is_assoc_link = true;</div><div class='add'>+			ahsta-&gt;assoc_link_id = link_id;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* In the ML station scenario, activate all partner links once the</div><div class='add'>+	 * client is transitioning to the associated state.</div><div class='add'>+	 *</div><div class='add'>+	 * FIXME: Ideally, this activation should occur when the client</div><div class='add'>+	 * transitions to the authorized state. However, there are some</div><div class='add'>+	 * issues with handling this in the firmware. Until the firmware</div><div class='add'>+	 * can manage it properly, activate the links when the client is</div><div class='add'>+	 * about to move to the associated state.</div><div class='add'>+	 */</div><div class='add'>+	if (ieee80211_vif_is_mld(vif) &amp;&amp; vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+	    old_state == IEEE80211_STA_AUTH &amp;&amp; new_state == IEEE80211_STA_ASSOC) {</div><div class='add'>+		/* TODO: for now only do link selection for single device</div><div class='add'>+		 * MLO case. Other cases would be handled in the future.</div><div class='add'>+		 */</div><div class='add'>+		ab = ah-&gt;radio[0].ab;</div><div class='add'>+		if (ab-&gt;ag-&gt;num_devices == 1) {</div><div class='add'>+			ret = ath12k_mac_select_links(ab, vif, hw, &amp;selected_links);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_warn(ab,</div><div class='add'>+					    "failed to get selected links: %d\n", ret);</div><div class='add'>+				goto exit;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			selected_links = ieee80211_vif_usable_links(vif);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ieee80211_set_active_links(vif, selected_links);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Handle all the other state transitions in generic way */</div><div class='add'>+	valid_links = ahsta-&gt;links_map;</div><div class='add'>+	for_each_set_bit(link_id, &amp;valid_links, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		arvif = wiphy_dereference(hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+		arsta = wiphy_dereference(hw-&gt;wiphy, ahsta-&gt;link[link_id]);</div><div class='add'>+		/* some assumptions went wrong! */</div><div class='add'>+		if (WARN_ON(!arvif || !arsta))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* vdev might be in deleted */</div><div class='add'>+		if (WARN_ON(!arvif-&gt;ar))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = ath12k_mac_handle_link_sta_state(hw, arvif, arsta,</div><div class='add'>+						       old_state, new_state);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_hw_warn(ah, "unable to move link sta %d of sta %pM from state %d to %d",</div><div class='add'>+				       link_id, arsta-&gt;addr, old_state, new_state);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_is_mld(vif) &amp;&amp; vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+	    old_state == IEEE80211_STA_ASSOC &amp;&amp; new_state == IEEE80211_STA_AUTHORIZED) {</div><div class='add'>+		for_each_ar(ah, ar, i) {</div><div class='add'>+			ab = ar-&gt;ab;</div><div class='add'>+			if (prev_ab == ab)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			ret = ath12k_mac_mlo_sta_update_link_active(ab, hw, ahvif);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_warn(ab,</div><div class='add'>+					    "failed to update link active state on connect %d\n",</div><div class='add'>+					    ret);</div><div class='add'>+				goto exit;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			prev_ab = ab;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* IEEE80211_STA_NONE -&gt; IEEE80211_STA_NOTEXIST:</div><div class='add'>+	 * Remove the station from driver (handle ML sta here since that</div><div class='add'>+	 * needs special handling. Normal sta will be handled in generic</div><div class='add'>+	 * handler below</div><div class='add'>+	 */</div><div class='add'>+	if (old_state == IEEE80211_STA_NONE &amp;&amp;</div><div class='add'>+	    new_state == IEEE80211_STA_NOTEXIST &amp;&amp; sta-&gt;mlo)</div><div class='add'>+		ath12k_mac_ml_station_remove(ahvif, ahsta);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	/* update the state if everything went well */</div><div class='add'>+	if (!ret)</div><div class='add'>+		ahsta-&gt;state = new_state;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_op_sta_set_txpwr(struct ieee80211_hw *hw,</div><div class='add'>+				       struct ieee80211_vif *vif,</div><div class='add'>+				       struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta);</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	u8 link_id;</div><div class='add'>+	int ret;</div><div class='add'>+	s16 txpwr;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* TODO: use link id from mac80211 once that's implemented */</div><div class='add'>+	link_id = 0;</div><div class='add'>+</div><div class='add'>+	arvif = wiphy_dereference(hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+	arsta = wiphy_dereference(hw-&gt;wiphy, ahsta-&gt;link[link_id]);</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;deflink.txpwr.type == NL80211_TX_POWER_AUTOMATIC) {</div><div class='add'>+		txpwr = 0;</div><div class='add'>+	} else {</div><div class='add'>+		txpwr = sta-&gt;deflink.txpwr.power;</div><div class='add'>+		if (!txpwr) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (txpwr &gt; ATH12K_TX_POWER_MAX_VAL || txpwr &lt; ATH12K_TX_POWER_MIN_VAL) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar = arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_set_peer_param(ar, arsta-&gt;addr, arvif-&gt;vdev_id,</div><div class='add'>+					WMI_PEER_USE_FIXED_PWR, txpwr);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set tx power for station ret: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_op_link_sta_rc_update(struct ieee80211_hw *hw,</div><div class='add'>+					     struct ieee80211_vif *vif,</div><div class='add'>+					     struct ieee80211_link_sta *link_sta,</div><div class='add'>+					     u32 changed)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = link_sta-&gt;sta;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta);</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	u32 bw, smps;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	arvif = rcu_dereference(ahvif-&gt;link[link_sta-&gt;link_id]);</div><div class='add'>+	if (!arvif) {</div><div class='add'>+		ath12k_hw_warn(ah, "mac sta rc update failed to fetch link vif on link id %u for peer %pM\n",</div><div class='add'>+			       link_sta-&gt;link_id, sta-&gt;addr);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar = arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	arsta = rcu_dereference(ahsta-&gt;link[link_sta-&gt;link_id]);</div><div class='add'>+	if (!arsta) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "mac sta rc update failed to fetch link sta on link id %u for peer %pM\n",</div><div class='add'>+			    link_sta-&gt;link_id, sta-&gt;addr);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	peer = ath12k_peer_find(ar-&gt;ab, arvif-&gt;vdev_id, arsta-&gt;addr);</div><div class='add'>+	if (!peer) {</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "mac sta rc update failed to find peer %pM on vdev %i\n",</div><div class='add'>+			    arsta-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	if (arsta-&gt;link_id &gt;= IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	link_sta = rcu_dereference(sta-&gt;link[arsta-&gt;link_id]);</div><div class='add'>+	if (!link_sta) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "unable to access link sta in rc update for sta %pM link %u\n",</div><div class='add'>+			    sta-&gt;addr, arsta-&gt;link_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "mac sta rc update for %pM changed %08x bw %d nss %d smps %d\n",</div><div class='add'>+		   arsta-&gt;addr, changed, link_sta-&gt;bandwidth, link_sta-&gt;rx_nss,</div><div class='add'>+		   link_sta-&gt;smps_mode);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	if (changed &amp; IEEE80211_RC_BW_CHANGED) {</div><div class='add'>+		bw = ath12k_mac_ieee80211_sta_bw_to_wmi(ar, link_sta);</div><div class='add'>+		arsta-&gt;bw_prev = arsta-&gt;bw;</div><div class='add'>+		arsta-&gt;bw = bw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; IEEE80211_RC_NSS_CHANGED)</div><div class='add'>+		arsta-&gt;nss = link_sta-&gt;rx_nss;</div><div class='add'>+</div><div class='add'>+	if (changed &amp; IEEE80211_RC_SMPS_CHANGED) {</div><div class='add'>+		smps = WMI_PEER_SMPS_PS_NONE;</div><div class='add'>+</div><div class='add'>+		switch (link_sta-&gt;smps_mode) {</div><div class='add'>+		case IEEE80211_SMPS_AUTOMATIC:</div><div class='add'>+		case IEEE80211_SMPS_OFF:</div><div class='add'>+			smps = WMI_PEER_SMPS_PS_NONE;</div><div class='add'>+			break;</div><div class='add'>+		case IEEE80211_SMPS_STATIC:</div><div class='add'>+			smps = WMI_PEER_SMPS_STATIC;</div><div class='add'>+			break;</div><div class='add'>+		case IEEE80211_SMPS_DYNAMIC:</div><div class='add'>+			smps = WMI_PEER_SMPS_DYNAMIC;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "Invalid smps %d in sta rc update for %pM link %u\n",</div><div class='add'>+				    link_sta-&gt;smps_mode, arsta-&gt;addr, link_sta-&gt;link_id);</div><div class='add'>+			smps = WMI_PEER_SMPS_PS_NONE;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		arsta-&gt;smps = smps;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arsta-&gt;changed |= changed;</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	wiphy_work_queue(hw-&gt;wiphy, &amp;arsta-&gt;update_wk);</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ath12k_link_sta *ath12k_mac_alloc_assign_link_sta(struct ath12k_hw *ah,</div><div class='add'>+								struct ath12k_sta *ahsta,</div><div class='add'>+								struct ath12k_vif *ahvif,</div><div class='add'>+								u8 link_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (link_id &gt;= IEEE80211_MLD_MAX_NUM_LINKS)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	arsta = wiphy_dereference(ah-&gt;hw-&gt;wiphy, ahsta-&gt;link[link_id]);</div><div class='add'>+	if (arsta)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	arsta = kmalloc(sizeof(*arsta), GFP_KERNEL);</div><div class='add'>+	if (!arsta)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_assign_link_sta(ah, ahsta, arsta, ahvif, link_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(arsta);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return arsta;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_op_change_sta_links(struct ieee80211_hw *hw,</div><div class='add'>+					  struct ieee80211_vif *vif,</div><div class='add'>+					  struct ieee80211_sta *sta,</div><div class='add'>+					  u16 old_links, u16 new_links)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta);</div><div class='add'>+	struct ath12k_hw *ah = hw-&gt;priv;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	unsigned long valid_links;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	u8 link_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!sta-&gt;valid_links)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Firmware does not support removal of one of link stas. All sta</div><div class='add'>+	 * would be removed during ML STA delete in sta_state(), hence link</div><div class='add'>+	 * sta removal is not handled here.</div><div class='add'>+	 */</div><div class='add'>+	if (new_links &lt; old_links)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (ahsta-&gt;ml_peer_id == ATH12K_MLO_PEER_ID_INVALID) {</div><div class='add'>+		ath12k_hw_warn(ah, "unable to add link for ml sta %pM", sta-&gt;addr);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* this op is expected only after initial sta insertion with default link */</div><div class='add'>+	if (WARN_ON(ahsta-&gt;links_map == 0))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	valid_links = new_links;</div><div class='add'>+	for_each_set_bit(link_id, &amp;valid_links, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		if (ahsta-&gt;links_map &amp; BIT(link_id))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		arvif = wiphy_dereference(hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+		arsta = ath12k_mac_alloc_assign_link_sta(ah, ahsta, ahvif, link_id);</div><div class='add'>+</div><div class='add'>+		if (!arvif || !arsta) {</div><div class='add'>+			ath12k_hw_warn(ah, "Failed to alloc/assign link sta");</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ar = arvif-&gt;ar;</div><div class='add'>+		if (!ar)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = ath12k_mac_station_add(ar, arvif, arsta);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "Failed to add station: %pM for VDEV: %d\n",</div><div class='add'>+				    arsta-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+			ath12k_mac_free_unassign_link_sta(ah, ahsta, link_id);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_mac_op_can_activate_links(struct ieee80211_hw *hw,</div><div class='add'>+					     struct ieee80211_vif *vif,</div><div class='add'>+					     u16 active_links)</div><div class='add'>+{</div><div class='add'>+	/* TODO: Handle recovery case */</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_conf_tx_uapsd(struct ath12k_link_vif *arvif,</div><div class='add'>+				u16 ac, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	u32 value;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ahvif-&gt;vdev_type != WMI_VDEV_TYPE_STA)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (ac) {</div><div class='add'>+	case IEEE80211_AC_VO:</div><div class='add'>+		value = WMI_STA_PS_UAPSD_AC3_DELIVERY_EN |</div><div class='add'>+			WMI_STA_PS_UAPSD_AC3_TRIGGER_EN;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AC_VI:</div><div class='add'>+		value = WMI_STA_PS_UAPSD_AC2_DELIVERY_EN |</div><div class='add'>+			WMI_STA_PS_UAPSD_AC2_TRIGGER_EN;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AC_BE:</div><div class='add'>+		value = WMI_STA_PS_UAPSD_AC1_DELIVERY_EN |</div><div class='add'>+			WMI_STA_PS_UAPSD_AC1_TRIGGER_EN;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AC_BK:</div><div class='add'>+		value = WMI_STA_PS_UAPSD_AC0_DELIVERY_EN |</div><div class='add'>+			WMI_STA_PS_UAPSD_AC0_TRIGGER_EN;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		ahvif-&gt;u.sta.uapsd |= value;</div><div class='add'>+	else</div><div class='add'>+		ahvif-&gt;u.sta.uapsd &amp;= ~value;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_set_sta_ps_param(ar, arvif-&gt;vdev_id,</div><div class='add'>+					  WMI_STA_PS_PARAM_UAPSD,</div><div class='add'>+					  ahvif-&gt;u.sta.uapsd);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "could not set uapsd params %d\n", ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ahvif-&gt;u.sta.uapsd)</div><div class='add'>+		value = WMI_STA_PS_RX_WAKE_POLICY_POLL_UAPSD;</div><div class='add'>+	else</div><div class='add'>+		value = WMI_STA_PS_RX_WAKE_POLICY_WAKE;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_set_sta_ps_param(ar, arvif-&gt;vdev_id,</div><div class='add'>+					  WMI_STA_PS_PARAM_RX_WAKE_POLICY,</div><div class='add'>+					  value);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "could not set rx wake param %d\n", ret);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_conf_tx(struct ath12k_link_vif *arvif, u16 ac,</div><div class='add'>+			      const struct ieee80211_tx_queue_params *params)</div><div class='add'>+{</div><div class='add'>+	struct wmi_wmm_params_arg *p = NULL;</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	switch (ac) {</div><div class='add'>+	case IEEE80211_AC_VO:</div><div class='add'>+		p = &amp;arvif-&gt;wmm_params.ac_vo;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AC_VI:</div><div class='add'>+		p = &amp;arvif-&gt;wmm_params.ac_vi;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AC_BE:</div><div class='add'>+		p = &amp;arvif-&gt;wmm_params.ac_be;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AC_BK:</div><div class='add'>+		p = &amp;arvif-&gt;wmm_params.ac_bk;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!p)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p-&gt;cwmin = params-&gt;cw_min;</div><div class='add'>+	p-&gt;cwmax = params-&gt;cw_max;</div><div class='add'>+	p-&gt;aifs = params-&gt;aifs;</div><div class='add'>+	p-&gt;txop = params-&gt;txop;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_send_wmm_update_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+					     &amp;arvif-&gt;wmm_params);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "pdev idx %d failed to set wmm params: %d\n",</div><div class='add'>+			    ar-&gt;pdev_idx, ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_conf_tx_uapsd(arvif, ac, params-&gt;uapsd);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ab, "pdev idx %d failed to set sta uapsd: %d\n",</div><div class='add'>+			    ar-&gt;pdev_idx, ret);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_op_conf_tx(struct ieee80211_hw *hw,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 unsigned int link_id, u16 ac,</div><div class='add'>+				 const struct ieee80211_tx_queue_params *params)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k_vif_cache *cache;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (link_id &gt;= IEEE80211_MLD_MAX_NUM_LINKS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	arvif = wiphy_dereference(hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+	if (!arvif || !arvif-&gt;is_created) {</div><div class='add'>+		cache = ath12k_ahvif_get_link_cache(ahvif, link_id);</div><div class='add'>+		if (!cache)</div><div class='add'>+			return -ENOSPC;</div><div class='add'>+</div><div class='add'>+		cache-&gt;tx_conf.changed = true;</div><div class='add'>+		cache-&gt;tx_conf.ac = ac;</div><div class='add'>+		cache-&gt;tx_conf.tx_queue_params = *params;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_conf_tx(arvif, ac, params);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ieee80211_sta_ht_cap</div><div class='add'>+ath12k_create_ht_cap(struct ath12k *ar, u32 ar_ht_cap, u32 rate_cap_rx_chainmask)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct ieee80211_sta_ht_cap ht_cap = {};</div><div class='add'>+	u32 ar_vht_cap = ar-&gt;pdev-&gt;cap.vht_cap;</div><div class='add'>+</div><div class='add'>+	if (!(ar_ht_cap &amp; WMI_HT_CAP_ENABLED))</div><div class='add'>+		return ht_cap;</div><div class='add'>+</div><div class='add'>+	ht_cap.ht_supported = 1;</div><div class='add'>+	ht_cap.ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;</div><div class='add'>+	ht_cap.ampdu_density = IEEE80211_HT_MPDU_DENSITY_NONE;</div><div class='add'>+	ht_cap.cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;</div><div class='add'>+	ht_cap.cap |= IEEE80211_HT_CAP_DSSSCCK40;</div><div class='add'>+	ht_cap.cap |= WLAN_HT_CAP_SM_PS_STATIC &lt;&lt; IEEE80211_HT_CAP_SM_PS_SHIFT;</div><div class='add'>+</div><div class='add'>+	if (ar_ht_cap &amp; WMI_HT_CAP_HT20_SGI)</div><div class='add'>+		ht_cap.cap |= IEEE80211_HT_CAP_SGI_20;</div><div class='add'>+</div><div class='add'>+	if (ar_ht_cap &amp; WMI_HT_CAP_HT40_SGI)</div><div class='add'>+		ht_cap.cap |= IEEE80211_HT_CAP_SGI_40;</div><div class='add'>+</div><div class='add'>+	if (ar_ht_cap &amp; WMI_HT_CAP_DYNAMIC_SMPS) {</div><div class='add'>+		u32 smps;</div><div class='add'>+</div><div class='add'>+		smps   = WLAN_HT_CAP_SM_PS_DYNAMIC;</div><div class='add'>+		smps &lt;&lt;= IEEE80211_HT_CAP_SM_PS_SHIFT;</div><div class='add'>+</div><div class='add'>+		ht_cap.cap |= smps;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ar_ht_cap &amp; WMI_HT_CAP_TX_STBC)</div><div class='add'>+		ht_cap.cap |= IEEE80211_HT_CAP_TX_STBC;</div><div class='add'>+</div><div class='add'>+	if (ar_ht_cap &amp; WMI_HT_CAP_RX_STBC) {</div><div class='add'>+		u32 stbc;</div><div class='add'>+</div><div class='add'>+		stbc   = ar_ht_cap;</div><div class='add'>+		stbc  &amp;= WMI_HT_CAP_RX_STBC;</div><div class='add'>+		stbc &gt;&gt;= WMI_HT_CAP_RX_STBC_MASK_SHIFT;</div><div class='add'>+		stbc &lt;&lt;= IEEE80211_HT_CAP_RX_STBC_SHIFT;</div><div class='add'>+		stbc  &amp;= IEEE80211_HT_CAP_RX_STBC;</div><div class='add'>+</div><div class='add'>+		ht_cap.cap |= stbc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ar_ht_cap &amp; WMI_HT_CAP_RX_LDPC)</div><div class='add'>+		ht_cap.cap |= IEEE80211_HT_CAP_LDPC_CODING;</div><div class='add'>+</div><div class='add'>+	if (ar_ht_cap &amp; WMI_HT_CAP_L_SIG_TXOP_PROT)</div><div class='add'>+		ht_cap.cap |= IEEE80211_HT_CAP_LSIG_TXOP_PROT;</div><div class='add'>+</div><div class='add'>+	if (ar_vht_cap &amp; WMI_VHT_CAP_MAX_MPDU_LEN_MASK)</div><div class='add'>+		ht_cap.cap |= IEEE80211_HT_CAP_MAX_AMSDU;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ar-&gt;num_rx_chains; i++) {</div><div class='add'>+		if (rate_cap_rx_chainmask &amp; BIT(i))</div><div class='add'>+			ht_cap.mcs.rx_mask[i] = 0xFF;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ht_cap.mcs.tx_params |= IEEE80211_HT_MCS_TX_DEFINED;</div><div class='add'>+</div><div class='add'>+	return ht_cap;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_set_txbf_conf(struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	u32 value = 0;</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	int nsts;</div><div class='add'>+	int sound_dim;</div><div class='add'>+	u32 vht_cap = ar-&gt;pdev-&gt;cap.vht_cap;</div><div class='add'>+	u32 vdev_param = WMI_VDEV_PARAM_TXBF;</div><div class='add'>+</div><div class='add'>+	if (vht_cap &amp; (IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE)) {</div><div class='add'>+		nsts = vht_cap &amp; IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK;</div><div class='add'>+		nsts &gt;&gt;= IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT;</div><div class='add'>+		value |= SM(nsts, WMI_TXBF_STS_CAP_OFFSET);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vht_cap &amp; (IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE)) {</div><div class='add'>+		sound_dim = vht_cap &amp;</div><div class='add'>+			    IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK;</div><div class='add'>+		sound_dim &gt;&gt;= IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_SHIFT;</div><div class='add'>+		if (sound_dim &gt; (ar-&gt;num_tx_chains - 1))</div><div class='add'>+			sound_dim = ar-&gt;num_tx_chains - 1;</div><div class='add'>+		value |= SM(sound_dim, WMI_BF_SOUND_DIM_OFFSET);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!value)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (vht_cap &amp; IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE) {</div><div class='add'>+		value |= WMI_VDEV_PARAM_TXBF_SU_TX_BFER;</div><div class='add'>+</div><div class='add'>+		if ((vht_cap &amp; IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE) &amp;&amp;</div><div class='add'>+		    ahvif-&gt;vdev_type == WMI_VDEV_TYPE_AP)</div><div class='add'>+			value |= WMI_VDEV_PARAM_TXBF_MU_TX_BFER;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vht_cap &amp; IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE) {</div><div class='add'>+		value |= WMI_VDEV_PARAM_TXBF_SU_TX_BFEE;</div><div class='add'>+</div><div class='add'>+		if ((vht_cap &amp; IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE) &amp;&amp;</div><div class='add'>+		    ahvif-&gt;vdev_type == WMI_VDEV_TYPE_STA)</div><div class='add'>+			value |= WMI_VDEV_PARAM_TXBF_MU_TX_BFEE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+					     vdev_param, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_set_vht_txbf_cap(struct ath12k *ar, u32 *vht_cap)</div><div class='add'>+{</div><div class='add'>+	bool subfer, subfee;</div><div class='add'>+	int sound_dim = 0;</div><div class='add'>+</div><div class='add'>+	subfer = !!(*vht_cap &amp; (IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE));</div><div class='add'>+	subfee = !!(*vht_cap &amp; (IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE));</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;num_tx_chains &lt; 2) {</div><div class='add'>+		*vht_cap &amp;= ~(IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE);</div><div class='add'>+		subfer = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If SU Beaformer is not set, then disable MU Beamformer Capability */</div><div class='add'>+	if (!subfer)</div><div class='add'>+		*vht_cap &amp;= ~(IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE);</div><div class='add'>+</div><div class='add'>+	/* If SU Beaformee is not set, then disable MU Beamformee Capability */</div><div class='add'>+	if (!subfee)</div><div class='add'>+		*vht_cap &amp;= ~(IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE);</div><div class='add'>+</div><div class='add'>+	sound_dim = u32_get_bits(*vht_cap,</div><div class='add'>+				 IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK);</div><div class='add'>+	*vht_cap = u32_replace_bits(*vht_cap, 0,</div><div class='add'>+				    IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK);</div><div class='add'>+</div><div class='add'>+	/* TODO: Need to check invalid STS and Sound_dim values set by FW? */</div><div class='add'>+</div><div class='add'>+	/* Enable Sounding Dimension Field only if SU BF is enabled */</div><div class='add'>+	if (subfer) {</div><div class='add'>+		if (sound_dim &gt; (ar-&gt;num_tx_chains - 1))</div><div class='add'>+			sound_dim = ar-&gt;num_tx_chains - 1;</div><div class='add'>+</div><div class='add'>+		*vht_cap = u32_replace_bits(*vht_cap, sound_dim,</div><div class='add'>+					    IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Use the STS advertised by FW unless SU Beamformee is not supported*/</div><div class='add'>+	if (!subfee)</div><div class='add'>+		*vht_cap &amp;= ~(IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ieee80211_sta_vht_cap</div><div class='add'>+ath12k_create_vht_cap(struct ath12k *ar, u32 rate_cap_tx_chainmask,</div><div class='add'>+		      u32 rate_cap_rx_chainmask)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta_vht_cap vht_cap = {};</div><div class='add'>+	u16 txmcs_map, rxmcs_map;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	vht_cap.vht_supported = 1;</div><div class='add'>+	vht_cap.cap = ar-&gt;pdev-&gt;cap.vht_cap;</div><div class='add'>+</div><div class='add'>+	ath12k_set_vht_txbf_cap(ar, &amp;vht_cap.cap);</div><div class='add'>+</div><div class='add'>+	/* 80P80 is not supported */</div><div class='add'>+	vht_cap.cap &amp;= ~IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ;</div><div class='add'>+</div><div class='add'>+	rxmcs_map = 0;</div><div class='add'>+	txmcs_map = 0;</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		if (i &lt; ar-&gt;num_tx_chains &amp;&amp; rate_cap_tx_chainmask &amp; BIT(i))</div><div class='add'>+			txmcs_map |= IEEE80211_VHT_MCS_SUPPORT_0_9 &lt;&lt; (i * 2);</div><div class='add'>+		else</div><div class='add'>+			txmcs_map |= IEEE80211_VHT_MCS_NOT_SUPPORTED &lt;&lt; (i * 2);</div><div class='add'>+</div><div class='add'>+		if (i &lt; ar-&gt;num_rx_chains &amp;&amp; rate_cap_rx_chainmask &amp; BIT(i))</div><div class='add'>+			rxmcs_map |= IEEE80211_VHT_MCS_SUPPORT_0_9 &lt;&lt; (i * 2);</div><div class='add'>+		else</div><div class='add'>+			rxmcs_map |= IEEE80211_VHT_MCS_NOT_SUPPORTED &lt;&lt; (i * 2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rate_cap_tx_chainmask &lt;= 1)</div><div class='add'>+		vht_cap.cap &amp;= ~IEEE80211_VHT_CAP_TXSTBC;</div><div class='add'>+</div><div class='add'>+	vht_cap.vht_mcs.rx_mcs_map = cpu_to_le16(rxmcs_map);</div><div class='add'>+	vht_cap.vht_mcs.tx_mcs_map = cpu_to_le16(txmcs_map);</div><div class='add'>+</div><div class='add'>+	/* Check if the HW supports 1:1 NSS ratio and reset</div><div class='add'>+	 * EXT NSS BW Support field to 0 to indicate 1:1 ratio</div><div class='add'>+	 */</div><div class='add'>+	if (ar-&gt;pdev-&gt;cap.nss_ratio_info == WMI_NSS_RATIO_1_NSS)</div><div class='add'>+		vht_cap.cap &amp;= ~IEEE80211_VHT_CAP_EXT_NSS_BW_MASK;</div><div class='add'>+</div><div class='add'>+	return vht_cap;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_setup_ht_vht_cap(struct ath12k *ar,</div><div class='add'>+					struct ath12k_pdev_cap *cap,</div><div class='add'>+					u32 *ht_cap_info)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_supported_band *band;</div><div class='add'>+	u32 rate_cap_tx_chainmask;</div><div class='add'>+	u32 rate_cap_rx_chainmask;</div><div class='add'>+	u32 ht_cap;</div><div class='add'>+</div><div class='add'>+	rate_cap_tx_chainmask = ar-&gt;cfg_tx_chainmask &gt;&gt; cap-&gt;tx_chain_mask_shift;</div><div class='add'>+	rate_cap_rx_chainmask = ar-&gt;cfg_rx_chainmask &gt;&gt; cap-&gt;rx_chain_mask_shift;</div><div class='add'>+</div><div class='add'>+	if (cap-&gt;supported_bands &amp; WMI_HOST_WLAN_2GHZ_CAP) {</div><div class='add'>+		band = &amp;ar-&gt;mac.sbands[NL80211_BAND_2GHZ];</div><div class='add'>+		ht_cap = cap-&gt;band[NL80211_BAND_2GHZ].ht_cap_info;</div><div class='add'>+		if (ht_cap_info)</div><div class='add'>+			*ht_cap_info = ht_cap;</div><div class='add'>+		band-&gt;ht_cap = ath12k_create_ht_cap(ar, ht_cap,</div><div class='add'>+						    rate_cap_rx_chainmask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cap-&gt;supported_bands &amp; WMI_HOST_WLAN_5GHZ_CAP &amp;&amp;</div><div class='add'>+	    (ar-&gt;ab-&gt;hw_params-&gt;single_pdev_only ||</div><div class='add'>+	     !ar-&gt;supports_6ghz)) {</div><div class='add'>+		band = &amp;ar-&gt;mac.sbands[NL80211_BAND_5GHZ];</div><div class='add'>+		ht_cap = cap-&gt;band[NL80211_BAND_5GHZ].ht_cap_info;</div><div class='add'>+		if (ht_cap_info)</div><div class='add'>+			*ht_cap_info = ht_cap;</div><div class='add'>+		band-&gt;ht_cap = ath12k_create_ht_cap(ar, ht_cap,</div><div class='add'>+						    rate_cap_rx_chainmask);</div><div class='add'>+		band-&gt;vht_cap = ath12k_create_vht_cap(ar, rate_cap_tx_chainmask,</div><div class='add'>+						      rate_cap_rx_chainmask);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_check_chain_mask(struct ath12k *ar, u32 ant, bool is_tx_ant)</div><div class='add'>+{</div><div class='add'>+	/* TODO: Check the request chainmask against the supported</div><div class='add'>+	 * chainmask table which is advertised in extented_service_ready event</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_gen_ppe_thresh(struct ath12k_wmi_ppe_threshold_arg *fw_ppet,</div><div class='add'>+				  u8 *he_ppet)</div><div class='add'>+{</div><div class='add'>+	int nss, ru;</div><div class='add'>+	u8 bit = 7;</div><div class='add'>+</div><div class='add'>+	he_ppet[0] = fw_ppet-&gt;numss_m1 &amp; IEEE80211_PPE_THRES_NSS_MASK;</div><div class='add'>+	he_ppet[0] |= (fw_ppet-&gt;ru_bit_mask &lt;&lt;</div><div class='add'>+		       IEEE80211_PPE_THRES_RU_INDEX_BITMASK_POS) &amp;</div><div class='add'>+		      IEEE80211_PPE_THRES_RU_INDEX_BITMASK_MASK;</div><div class='add'>+	for (nss = 0; nss &lt;= fw_ppet-&gt;numss_m1; nss++) {</div><div class='add'>+		for (ru = 0; ru &lt; 4; ru++) {</div><div class='add'>+			u8 val;</div><div class='add'>+			int i;</div><div class='add'>+</div><div class='add'>+			if ((fw_ppet-&gt;ru_bit_mask &amp; BIT(ru)) == 0)</div><div class='add'>+				continue;</div><div class='add'>+			val = (fw_ppet-&gt;ppet16_ppet8_ru3_ru0[nss] &gt;&gt; (ru * 6)) &amp;</div><div class='add'>+			       0x3f;</div><div class='add'>+			val = ((val &gt;&gt; 3) &amp; 0x7) | ((val &amp; 0x7) &lt;&lt; 3);</div><div class='add'>+			for (i = 5; i &gt;= 0; i--) {</div><div class='add'>+				he_ppet[bit / 8] |=</div><div class='add'>+					((val &gt;&gt; i) &amp; 0x1) &lt;&lt; ((bit % 8));</div><div class='add'>+				bit++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_mac_filter_he_cap_mesh(struct ieee80211_he_cap_elem *he_cap_elem)</div><div class='add'>+{</div><div class='add'>+	u8 m;</div><div class='add'>+</div><div class='add'>+	m = IEEE80211_HE_MAC_CAP0_TWT_RES |</div><div class='add'>+	    IEEE80211_HE_MAC_CAP0_TWT_REQ;</div><div class='add'>+	he_cap_elem-&gt;mac_cap_info[0] &amp;= ~m;</div><div class='add'>+</div><div class='add'>+	m = IEEE80211_HE_MAC_CAP2_TRS |</div><div class='add'>+	    IEEE80211_HE_MAC_CAP2_BCAST_TWT |</div><div class='add'>+	    IEEE80211_HE_MAC_CAP2_MU_CASCADING;</div><div class='add'>+	he_cap_elem-&gt;mac_cap_info[2] &amp;= ~m;</div><div class='add'>+</div><div class='add'>+	m = IEEE80211_HE_MAC_CAP3_FLEX_TWT_SCHED |</div><div class='add'>+	    IEEE80211_HE_MAC_CAP2_BCAST_TWT |</div><div class='add'>+	    IEEE80211_HE_MAC_CAP2_MU_CASCADING;</div><div class='add'>+	he_cap_elem-&gt;mac_cap_info[3] &amp;= ~m;</div><div class='add'>+</div><div class='add'>+	m = IEEE80211_HE_MAC_CAP4_BSRP_BQRP_A_MPDU_AGG |</div><div class='add'>+	    IEEE80211_HE_MAC_CAP4_BQR;</div><div class='add'>+	he_cap_elem-&gt;mac_cap_info[4] &amp;= ~m;</div><div class='add'>+</div><div class='add'>+	m = IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECTIVE_TRANSMISSION |</div><div class='add'>+	    IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU |</div><div class='add'>+	    IEEE80211_HE_MAC_CAP5_PUNCTURED_SOUNDING |</div><div class='add'>+	    IEEE80211_HE_MAC_CAP5_HT_VHT_TRIG_FRAME_RX;</div><div class='add'>+	he_cap_elem-&gt;mac_cap_info[5] &amp;= ~m;</div><div class='add'>+</div><div class='add'>+	m = IEEE80211_HE_PHY_CAP2_UL_MU_FULL_MU_MIMO |</div><div class='add'>+	    IEEE80211_HE_PHY_CAP2_UL_MU_PARTIAL_MU_MIMO;</div><div class='add'>+	he_cap_elem-&gt;phy_cap_info[2] &amp;= ~m;</div><div class='add'>+</div><div class='add'>+	m = IEEE80211_HE_PHY_CAP3_RX_PARTIAL_BW_SU_IN_20MHZ_MU |</div><div class='add'>+	    IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_MASK |</div><div class='add'>+	    IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_MASK;</div><div class='add'>+	he_cap_elem-&gt;phy_cap_info[3] &amp;= ~m;</div><div class='add'>+</div><div class='add'>+	m = IEEE80211_HE_PHY_CAP4_MU_BEAMFORMER;</div><div class='add'>+	he_cap_elem-&gt;phy_cap_info[4] &amp;= ~m;</div><div class='add'>+</div><div class='add'>+	m = IEEE80211_HE_PHY_CAP5_NG16_MU_FEEDBACK;</div><div class='add'>+	he_cap_elem-&gt;phy_cap_info[5] &amp;= ~m;</div><div class='add'>+</div><div class='add'>+	m = IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_75_MU |</div><div class='add'>+	    IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB |</div><div class='add'>+	    IEEE80211_HE_PHY_CAP6_TRIG_CQI_FB |</div><div class='add'>+	    IEEE80211_HE_PHY_CAP6_PARTIAL_BANDWIDTH_DL_MUMIMO;</div><div class='add'>+	he_cap_elem-&gt;phy_cap_info[6] &amp;= ~m;</div><div class='add'>+</div><div class='add'>+	m = IEEE80211_HE_PHY_CAP7_PSR_BASED_SR |</div><div class='add'>+	    IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP |</div><div class='add'>+	    IEEE80211_HE_PHY_CAP7_STBC_TX_ABOVE_80MHZ |</div><div class='add'>+	    IEEE80211_HE_PHY_CAP7_STBC_RX_ABOVE_80MHZ;</div><div class='add'>+	he_cap_elem-&gt;phy_cap_info[7] &amp;= ~m;</div><div class='add'>+</div><div class='add'>+	m = IEEE80211_HE_PHY_CAP8_HE_ER_SU_PPDU_4XLTF_AND_08_US_GI |</div><div class='add'>+	    IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G |</div><div class='add'>+	    IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU |</div><div class='add'>+	    IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU;</div><div class='add'>+	he_cap_elem-&gt;phy_cap_info[8] &amp;= ~m;</div><div class='add'>+</div><div class='add'>+	m = IEEE80211_HE_PHY_CAP9_LONGER_THAN_16_SIGB_OFDM_SYM |</div><div class='add'>+	    IEEE80211_HE_PHY_CAP9_NON_TRIGGERED_CQI_FEEDBACK |</div><div class='add'>+	    IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU |</div><div class='add'>+	    IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU |</div><div class='add'>+	    IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB |</div><div class='add'>+	    IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB;</div><div class='add'>+	he_cap_elem-&gt;phy_cap_info[9] &amp;= ~m;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __le16 ath12k_mac_setup_he_6ghz_cap(struct ath12k_pdev_cap *pcap,</div><div class='add'>+					   struct ath12k_band_cap *bcap)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	bcap-&gt;he_6ghz_capa = IEEE80211_HT_MPDU_DENSITY_NONE;</div><div class='add'>+	if (bcap-&gt;ht_cap_info &amp; WMI_HT_CAP_DYNAMIC_SMPS)</div><div class='add'>+		bcap-&gt;he_6ghz_capa |=</div><div class='add'>+			u32_encode_bits(WLAN_HT_CAP_SM_PS_DYNAMIC,</div><div class='add'>+					IEEE80211_HE_6GHZ_CAP_SM_PS);</div><div class='add'>+	else</div><div class='add'>+		bcap-&gt;he_6ghz_capa |=</div><div class='add'>+			u32_encode_bits(WLAN_HT_CAP_SM_PS_DISABLED,</div><div class='add'>+					IEEE80211_HE_6GHZ_CAP_SM_PS);</div><div class='add'>+	val = u32_get_bits(pcap-&gt;vht_cap,</div><div class='add'>+			   IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK);</div><div class='add'>+	bcap-&gt;he_6ghz_capa |=</div><div class='add'>+		u32_encode_bits(val, IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP);</div><div class='add'>+	val = u32_get_bits(pcap-&gt;vht_cap,</div><div class='add'>+			   IEEE80211_VHT_CAP_MAX_MPDU_MASK);</div><div class='add'>+	bcap-&gt;he_6ghz_capa |=</div><div class='add'>+		u32_encode_bits(val, IEEE80211_HE_6GHZ_CAP_MAX_MPDU_LEN);</div><div class='add'>+	if (pcap-&gt;vht_cap &amp; IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN)</div><div class='add'>+		bcap-&gt;he_6ghz_capa |= IEEE80211_HE_6GHZ_CAP_RX_ANTPAT_CONS;</div><div class='add'>+	if (pcap-&gt;vht_cap &amp; IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN)</div><div class='add'>+		bcap-&gt;he_6ghz_capa |= IEEE80211_HE_6GHZ_CAP_TX_ANTPAT_CONS;</div><div class='add'>+</div><div class='add'>+	return cpu_to_le16(bcap-&gt;he_6ghz_capa);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_set_hemcsmap(struct ath12k *ar,</div><div class='add'>+				    struct ath12k_pdev_cap *cap,</div><div class='add'>+				    struct ieee80211_sta_he_cap *he_cap)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_he_mcs_nss_supp *mcs_nss = &amp;he_cap-&gt;he_mcs_nss_supp;</div><div class='add'>+	u8 maxtxnss_160 = ath12k_get_nss_160mhz(ar, ar-&gt;num_tx_chains);</div><div class='add'>+	u8 maxrxnss_160 = ath12k_get_nss_160mhz(ar, ar-&gt;num_rx_chains);</div><div class='add'>+	u16 txmcs_map_160 = 0, rxmcs_map_160 = 0;</div><div class='add'>+	u16 txmcs_map = 0, rxmcs_map = 0;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		if (i &lt; ar-&gt;num_tx_chains &amp;&amp;</div><div class='add'>+		    (ar-&gt;cfg_tx_chainmask &gt;&gt; cap-&gt;tx_chain_mask_shift) &amp; BIT(i))</div><div class='add'>+			txmcs_map |= IEEE80211_HE_MCS_SUPPORT_0_11 &lt;&lt; (i * 2);</div><div class='add'>+		else</div><div class='add'>+			txmcs_map |= IEEE80211_HE_MCS_NOT_SUPPORTED &lt;&lt; (i * 2);</div><div class='add'>+</div><div class='add'>+		if (i &lt; ar-&gt;num_rx_chains &amp;&amp;</div><div class='add'>+		    (ar-&gt;cfg_rx_chainmask &gt;&gt; cap-&gt;tx_chain_mask_shift) &amp; BIT(i))</div><div class='add'>+			rxmcs_map |= IEEE80211_HE_MCS_SUPPORT_0_11 &lt;&lt; (i * 2);</div><div class='add'>+		else</div><div class='add'>+			rxmcs_map |= IEEE80211_HE_MCS_NOT_SUPPORTED &lt;&lt; (i * 2);</div><div class='add'>+</div><div class='add'>+		if (i &lt; maxtxnss_160 &amp;&amp;</div><div class='add'>+		    (ar-&gt;cfg_tx_chainmask &gt;&gt; cap-&gt;tx_chain_mask_shift) &amp; BIT(i))</div><div class='add'>+			txmcs_map_160 |= IEEE80211_HE_MCS_SUPPORT_0_11 &lt;&lt; (i * 2);</div><div class='add'>+		else</div><div class='add'>+			txmcs_map_160 |= IEEE80211_HE_MCS_NOT_SUPPORTED &lt;&lt; (i * 2);</div><div class='add'>+</div><div class='add'>+		if (i &lt; maxrxnss_160 &amp;&amp;</div><div class='add'>+		    (ar-&gt;cfg_tx_chainmask &gt;&gt; cap-&gt;tx_chain_mask_shift) &amp; BIT(i))</div><div class='add'>+			rxmcs_map_160 |= IEEE80211_HE_MCS_SUPPORT_0_11 &lt;&lt; (i * 2);</div><div class='add'>+		else</div><div class='add'>+			rxmcs_map_160 |= IEEE80211_HE_MCS_NOT_SUPPORTED &lt;&lt; (i * 2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mcs_nss-&gt;rx_mcs_80 = cpu_to_le16(rxmcs_map &amp; 0xffff);</div><div class='add'>+	mcs_nss-&gt;tx_mcs_80 = cpu_to_le16(txmcs_map &amp; 0xffff);</div><div class='add'>+	mcs_nss-&gt;rx_mcs_160 = cpu_to_le16(rxmcs_map_160 &amp; 0xffff);</div><div class='add'>+	mcs_nss-&gt;tx_mcs_160 = cpu_to_le16(txmcs_map_160 &amp; 0xffff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_copy_he_cap(struct ath12k *ar,</div><div class='add'>+				   struct ath12k_band_cap *band_cap,</div><div class='add'>+				   int iftype, u8 num_tx_chains,</div><div class='add'>+				   struct ieee80211_sta_he_cap *he_cap)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_he_cap_elem *he_cap_elem = &amp;he_cap-&gt;he_cap_elem;</div><div class='add'>+</div><div class='add'>+	he_cap-&gt;has_he = true;</div><div class='add'>+	memcpy(he_cap_elem-&gt;mac_cap_info, band_cap-&gt;he_cap_info,</div><div class='add'>+	       sizeof(he_cap_elem-&gt;mac_cap_info));</div><div class='add'>+	memcpy(he_cap_elem-&gt;phy_cap_info, band_cap-&gt;he_cap_phy_info,</div><div class='add'>+	       sizeof(he_cap_elem-&gt;phy_cap_info));</div><div class='add'>+</div><div class='add'>+	he_cap_elem-&gt;mac_cap_info[1] &amp;=</div><div class='add'>+		IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_MASK;</div><div class='add'>+	he_cap_elem-&gt;phy_cap_info[0] &amp;=</div><div class='add'>+		IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G |</div><div class='add'>+		IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |</div><div class='add'>+		IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G;</div><div class='add'>+	/* 80PLUS80 is not supported */</div><div class='add'>+	he_cap_elem-&gt;phy_cap_info[0] &amp;=</div><div class='add'>+		~IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G;</div><div class='add'>+	he_cap_elem-&gt;phy_cap_info[5] &amp;=</div><div class='add'>+		~IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK;</div><div class='add'>+	he_cap_elem-&gt;phy_cap_info[5] |= num_tx_chains - 1;</div><div class='add'>+</div><div class='add'>+	switch (iftype) {</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		he_cap_elem-&gt;mac_cap_info[2] &amp;=</div><div class='add'>+			~IEEE80211_HE_MAC_CAP2_BCAST_TWT;</div><div class='add'>+		he_cap_elem-&gt;phy_cap_info[3] &amp;=</div><div class='add'>+			~IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_MASK;</div><div class='add'>+		he_cap_elem-&gt;phy_cap_info[9] |=</div><div class='add'>+			IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		he_cap_elem-&gt;mac_cap_info[0] &amp;= ~IEEE80211_HE_MAC_CAP0_TWT_RES;</div><div class='add'>+		he_cap_elem-&gt;mac_cap_info[0] |= IEEE80211_HE_MAC_CAP0_TWT_REQ;</div><div class='add'>+		he_cap_elem-&gt;phy_cap_info[9] |=</div><div class='add'>+			IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_MESH_POINT:</div><div class='add'>+		ath12k_mac_filter_he_cap_mesh(he_cap_elem);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_mac_set_hemcsmap(ar, &amp;ar-&gt;pdev-&gt;cap, he_cap);</div><div class='add'>+	memset(he_cap-&gt;ppe_thres, 0, sizeof(he_cap-&gt;ppe_thres));</div><div class='add'>+	if (he_cap_elem-&gt;phy_cap_info[6] &amp;</div><div class='add'>+	    IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT)</div><div class='add'>+		ath12k_gen_ppe_thresh(&amp;band_cap-&gt;he_ppet, he_cap-&gt;ppe_thres);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_mac_copy_eht_mcs_nss(struct ath12k_band_cap *band_cap,</div><div class='add'>+			    struct ieee80211_eht_mcs_nss_supp *mcs_nss,</div><div class='add'>+			    const struct ieee80211_he_cap_elem *he_cap,</div><div class='add'>+			    const struct ieee80211_eht_cap_elem_fixed *eht_cap)</div><div class='add'>+{</div><div class='add'>+	if ((he_cap-&gt;phy_cap_info[0] &amp;</div><div class='add'>+	     (IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G |</div><div class='add'>+	      IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |</div><div class='add'>+	      IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G |</div><div class='add'>+	      IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G)) == 0)</div><div class='add'>+		memcpy(&amp;mcs_nss-&gt;only_20mhz, &amp;band_cap-&gt;eht_mcs_20_only,</div><div class='add'>+		       sizeof(struct ieee80211_eht_mcs_nss_supp_20mhz_only));</div><div class='add'>+</div><div class='add'>+	if (he_cap-&gt;phy_cap_info[0] &amp;</div><div class='add'>+	    (IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G |</div><div class='add'>+	     IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G))</div><div class='add'>+		memcpy(&amp;mcs_nss-&gt;bw._80, &amp;band_cap-&gt;eht_mcs_80,</div><div class='add'>+		       sizeof(struct ieee80211_eht_mcs_nss_supp_bw));</div><div class='add'>+</div><div class='add'>+	if (he_cap-&gt;phy_cap_info[0] &amp;</div><div class='add'>+	    IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G)</div><div class='add'>+		memcpy(&amp;mcs_nss-&gt;bw._160, &amp;band_cap-&gt;eht_mcs_160,</div><div class='add'>+		       sizeof(struct ieee80211_eht_mcs_nss_supp_bw));</div><div class='add'>+</div><div class='add'>+	if (eht_cap-&gt;phy_cap_info[0] &amp; IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ)</div><div class='add'>+		memcpy(&amp;mcs_nss-&gt;bw._320, &amp;band_cap-&gt;eht_mcs_320,</div><div class='add'>+		       sizeof(struct ieee80211_eht_mcs_nss_supp_bw));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_copy_eht_ppe_thresh(struct ath12k_wmi_ppe_threshold_arg *fw_ppet,</div><div class='add'>+					   struct ieee80211_sta_eht_cap *cap)</div><div class='add'>+{</div><div class='add'>+	u16 bit = IEEE80211_EHT_PPE_THRES_INFO_HEADER_SIZE;</div><div class='add'>+	u8 i, nss, ru, ppet_bit_len_per_ru = IEEE80211_EHT_PPE_THRES_INFO_PPET_SIZE * 2;</div><div class='add'>+</div><div class='add'>+	u8p_replace_bits(&amp;cap-&gt;eht_ppe_thres[0], fw_ppet-&gt;numss_m1,</div><div class='add'>+			 IEEE80211_EHT_PPE_THRES_NSS_MASK);</div><div class='add'>+</div><div class='add'>+	u16p_replace_bits((u16 *)&amp;cap-&gt;eht_ppe_thres[0], fw_ppet-&gt;ru_bit_mask,</div><div class='add'>+			  IEEE80211_EHT_PPE_THRES_RU_INDEX_BITMASK_MASK);</div><div class='add'>+</div><div class='add'>+	for (nss = 0; nss &lt;= fw_ppet-&gt;numss_m1; nss++) {</div><div class='add'>+		for (ru = 0;</div><div class='add'>+		     ru &lt; hweight16(IEEE80211_EHT_PPE_THRES_RU_INDEX_BITMASK_MASK);</div><div class='add'>+		     ru++) {</div><div class='add'>+			u32 val = 0;</div><div class='add'>+</div><div class='add'>+			if ((fw_ppet-&gt;ru_bit_mask &amp; BIT(ru)) == 0)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			u32p_replace_bits(&amp;val, fw_ppet-&gt;ppet16_ppet8_ru3_ru0[nss] &gt;&gt;</div><div class='add'>+						(ru * ppet_bit_len_per_ru),</div><div class='add'>+					  GENMASK(ppet_bit_len_per_ru - 1, 0));</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; ppet_bit_len_per_ru; i++) {</div><div class='add'>+				cap-&gt;eht_ppe_thres[bit / 8] |=</div><div class='add'>+					(((val &gt;&gt; i) &amp; 0x1) &lt;&lt; ((bit % 8)));</div><div class='add'>+				bit++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_mac_filter_eht_cap_mesh(struct ieee80211_eht_cap_elem_fixed</div><div class='add'>+			       *eht_cap_elem)</div><div class='add'>+{</div><div class='add'>+	u8 m;</div><div class='add'>+</div><div class='add'>+	m = IEEE80211_EHT_MAC_CAP0_EPCS_PRIO_ACCESS;</div><div class='add'>+	eht_cap_elem-&gt;mac_cap_info[0] &amp;= ~m;</div><div class='add'>+</div><div class='add'>+	m = IEEE80211_EHT_PHY_CAP0_PARTIAL_BW_UL_MU_MIMO;</div><div class='add'>+	eht_cap_elem-&gt;phy_cap_info[0] &amp;= ~m;</div><div class='add'>+</div><div class='add'>+	m = IEEE80211_EHT_PHY_CAP3_NG_16_MU_FEEDBACK |</div><div class='add'>+	    IEEE80211_EHT_PHY_CAP3_CODEBOOK_7_5_MU_FDBK |</div><div class='add'>+	    IEEE80211_EHT_PHY_CAP3_TRIG_MU_BF_PART_BW_FDBK |</div><div class='add'>+	    IEEE80211_EHT_PHY_CAP3_TRIG_CQI_FDBK;</div><div class='add'>+	eht_cap_elem-&gt;phy_cap_info[3] &amp;= ~m;</div><div class='add'>+</div><div class='add'>+	m = IEEE80211_EHT_PHY_CAP4_PART_BW_DL_MU_MIMO |</div><div class='add'>+	    IEEE80211_EHT_PHY_CAP4_PSR_SR_SUPP |</div><div class='add'>+	    IEEE80211_EHT_PHY_CAP4_POWER_BOOST_FACT_SUPP |</div><div class='add'>+	    IEEE80211_EHT_PHY_CAP4_EHT_MU_PPDU_4_EHT_LTF_08_GI;</div><div class='add'>+	eht_cap_elem-&gt;phy_cap_info[4] &amp;= ~m;</div><div class='add'>+</div><div class='add'>+	m = IEEE80211_EHT_PHY_CAP5_NON_TRIG_CQI_FEEDBACK |</div><div class='add'>+	    IEEE80211_EHT_PHY_CAP5_TX_LESS_242_TONE_RU_SUPP |</div><div class='add'>+	    IEEE80211_EHT_PHY_CAP5_RX_LESS_242_TONE_RU_SUPP |</div><div class='add'>+	    IEEE80211_EHT_PHY_CAP5_MAX_NUM_SUPP_EHT_LTF_MASK;</div><div class='add'>+	eht_cap_elem-&gt;phy_cap_info[5] &amp;= ~m;</div><div class='add'>+</div><div class='add'>+	m = IEEE80211_EHT_PHY_CAP6_MAX_NUM_SUPP_EHT_LTF_MASK;</div><div class='add'>+	eht_cap_elem-&gt;phy_cap_info[6] &amp;= ~m;</div><div class='add'>+</div><div class='add'>+	m = IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_80MHZ |</div><div class='add'>+	    IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_160MHZ |</div><div class='add'>+	    IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_320MHZ |</div><div class='add'>+	    IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_80MHZ |</div><div class='add'>+	    IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_160MHZ |</div><div class='add'>+	    IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_320MHZ;</div><div class='add'>+	eht_cap_elem-&gt;phy_cap_info[7] &amp;= ~m;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_copy_eht_cap(struct ath12k *ar,</div><div class='add'>+				    struct ath12k_band_cap *band_cap,</div><div class='add'>+				    struct ieee80211_he_cap_elem *he_cap_elem,</div><div class='add'>+				    int iftype,</div><div class='add'>+				    struct ieee80211_sta_eht_cap *eht_cap)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_eht_cap_elem_fixed *eht_cap_elem = &amp;eht_cap-&gt;eht_cap_elem;</div><div class='add'>+</div><div class='add'>+	memset(eht_cap, 0, sizeof(struct ieee80211_sta_eht_cap));</div><div class='add'>+</div><div class='add'>+	if (!(test_bit(WMI_TLV_SERVICE_11BE, ar-&gt;ab-&gt;wmi_ab.svc_map)) ||</div><div class='add'>+	    ath12k_acpi_get_disable_11be(ar-&gt;ab))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	eht_cap-&gt;has_eht = true;</div><div class='add'>+	memcpy(eht_cap_elem-&gt;mac_cap_info, band_cap-&gt;eht_cap_mac_info,</div><div class='add'>+	       sizeof(eht_cap_elem-&gt;mac_cap_info));</div><div class='add'>+	memcpy(eht_cap_elem-&gt;phy_cap_info, band_cap-&gt;eht_cap_phy_info,</div><div class='add'>+	       sizeof(eht_cap_elem-&gt;phy_cap_info));</div><div class='add'>+</div><div class='add'>+	switch (iftype) {</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		eht_cap_elem-&gt;phy_cap_info[0] &amp;=</div><div class='add'>+			~IEEE80211_EHT_PHY_CAP0_242_TONE_RU_GT20MHZ;</div><div class='add'>+		eht_cap_elem-&gt;phy_cap_info[4] &amp;=</div><div class='add'>+			~IEEE80211_EHT_PHY_CAP4_PART_BW_DL_MU_MIMO;</div><div class='add'>+		eht_cap_elem-&gt;phy_cap_info[5] &amp;=</div><div class='add'>+			~IEEE80211_EHT_PHY_CAP5_TX_LESS_242_TONE_RU_SUPP;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		eht_cap_elem-&gt;phy_cap_info[7] &amp;=</div><div class='add'>+			~(IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_80MHZ |</div><div class='add'>+			  IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_160MHZ |</div><div class='add'>+			  IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_320MHZ);</div><div class='add'>+		eht_cap_elem-&gt;phy_cap_info[7] &amp;=</div><div class='add'>+			~(IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_80MHZ |</div><div class='add'>+			  IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_160MHZ |</div><div class='add'>+			  IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_320MHZ);</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_MESH_POINT:</div><div class='add'>+		ath12k_mac_filter_eht_cap_mesh(eht_cap_elem);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_mac_copy_eht_mcs_nss(band_cap, &amp;eht_cap-&gt;eht_mcs_nss_supp,</div><div class='add'>+				    he_cap_elem, eht_cap_elem);</div><div class='add'>+</div><div class='add'>+	if (eht_cap_elem-&gt;phy_cap_info[5] &amp;</div><div class='add'>+	    IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT)</div><div class='add'>+		ath12k_mac_copy_eht_ppe_thresh(&amp;band_cap-&gt;eht_ppet, eht_cap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_copy_sband_iftype_data(struct ath12k *ar,</div><div class='add'>+					     struct ath12k_pdev_cap *cap,</div><div class='add'>+					     struct ieee80211_sband_iftype_data *data,</div><div class='add'>+					     int band)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_band_cap *band_cap = &amp;cap-&gt;band[band];</div><div class='add'>+	int i, idx = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_NL80211_IFTYPES; i++) {</div><div class='add'>+		struct ieee80211_sta_he_cap *he_cap = &amp;data[idx].he_cap;</div><div class='add'>+</div><div class='add'>+		switch (i) {</div><div class='add'>+		case NL80211_IFTYPE_STATION:</div><div class='add'>+		case NL80211_IFTYPE_AP:</div><div class='add'>+		case NL80211_IFTYPE_MESH_POINT:</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		data[idx].types_mask = BIT(i);</div><div class='add'>+</div><div class='add'>+		ath12k_mac_copy_he_cap(ar, band_cap, i, ar-&gt;num_tx_chains, he_cap);</div><div class='add'>+		if (band == NL80211_BAND_6GHZ) {</div><div class='add'>+			data[idx].he_6ghz_capa.capa =</div><div class='add'>+				ath12k_mac_setup_he_6ghz_cap(cap, band_cap);</div><div class='add'>+		}</div><div class='add'>+		ath12k_mac_copy_eht_cap(ar, band_cap, &amp;he_cap-&gt;he_cap_elem, i,</div><div class='add'>+					&amp;data[idx].eht_cap);</div><div class='add'>+		idx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_setup_sband_iftype_data(struct ath12k *ar,</div><div class='add'>+					       struct ath12k_pdev_cap *cap)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	int count;</div><div class='add'>+</div><div class='add'>+	if (cap-&gt;supported_bands &amp; WMI_HOST_WLAN_2GHZ_CAP) {</div><div class='add'>+		band = NL80211_BAND_2GHZ;</div><div class='add'>+		count = ath12k_mac_copy_sband_iftype_data(ar, cap,</div><div class='add'>+							  ar-&gt;mac.iftype[band],</div><div class='add'>+							  band);</div><div class='add'>+		sband = &amp;ar-&gt;mac.sbands[band];</div><div class='add'>+		_ieee80211_set_sband_iftype_data(sband, ar-&gt;mac.iftype[band],</div><div class='add'>+						 count);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cap-&gt;supported_bands &amp; WMI_HOST_WLAN_5GHZ_CAP) {</div><div class='add'>+		band = NL80211_BAND_5GHZ;</div><div class='add'>+		count = ath12k_mac_copy_sband_iftype_data(ar, cap,</div><div class='add'>+							  ar-&gt;mac.iftype[band],</div><div class='add'>+							  band);</div><div class='add'>+		sband = &amp;ar-&gt;mac.sbands[band];</div><div class='add'>+		_ieee80211_set_sband_iftype_data(sband, ar-&gt;mac.iftype[band],</div><div class='add'>+						 count);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cap-&gt;supported_bands &amp; WMI_HOST_WLAN_5GHZ_CAP &amp;&amp;</div><div class='add'>+	    ar-&gt;supports_6ghz) {</div><div class='add'>+		band = NL80211_BAND_6GHZ;</div><div class='add'>+		count = ath12k_mac_copy_sband_iftype_data(ar, cap,</div><div class='add'>+							  ar-&gt;mac.iftype[band],</div><div class='add'>+							  band);</div><div class='add'>+		sband = &amp;ar-&gt;mac.sbands[band];</div><div class='add'>+		_ieee80211_set_sband_iftype_data(sband, ar-&gt;mac.iftype[band],</div><div class='add'>+						 count);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __ath12k_set_antenna(struct ath12k *ar, u32 tx_ant, u32 rx_ant)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = ath12k_ar_to_ah(ar);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (ath12k_check_chain_mask(ar, tx_ant, true))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (ath12k_check_chain_mask(ar, rx_ant, false))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Since we advertised the max cap of all radios combined during wiphy</div><div class='add'>+	 * registration, ensure we don't set the antenna config higher than the</div><div class='add'>+	 * limits</div><div class='add'>+	 */</div><div class='add'>+	tx_ant = min_t(u32, tx_ant, ar-&gt;pdev-&gt;cap.tx_chain_mask);</div><div class='add'>+	rx_ant = min_t(u32, rx_ant, ar-&gt;pdev-&gt;cap.rx_chain_mask);</div><div class='add'>+</div><div class='add'>+	ar-&gt;cfg_tx_chainmask = tx_ant;</div><div class='add'>+	ar-&gt;cfg_rx_chainmask = rx_ant;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;state != ATH12K_HW_STATE_ON &amp;&amp;</div><div class='add'>+	    ah-&gt;state != ATH12K_HW_STATE_RESTARTED)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_pdev_set_param(ar, WMI_PDEV_PARAM_TX_CHAIN_MASK,</div><div class='add'>+					tx_ant, ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set tx-chainmask: %d, req 0x%x\n",</div><div class='add'>+			    ret, tx_ant);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;num_tx_chains = hweight32(tx_ant);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_pdev_set_param(ar, WMI_PDEV_PARAM_RX_CHAIN_MASK,</div><div class='add'>+					rx_ant, ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set rx-chainmask: %d, req 0x%x\n",</div><div class='add'>+			    ret, rx_ant);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;num_rx_chains = hweight32(rx_ant);</div><div class='add'>+</div><div class='add'>+	/* Reload HT/VHT/HE capability */</div><div class='add'>+	ath12k_mac_setup_ht_vht_cap(ar, &amp;ar-&gt;pdev-&gt;cap, NULL);</div><div class='add'>+	ath12k_mac_setup_sband_iftype_data(ar, &amp;ar-&gt;pdev-&gt;cap);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mgmt_over_wmi_tx_drop(struct ath12k *ar, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int num_mgmt;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ieee80211_free_txskb(ath12k_ar_to_hw(ar), skb);</div><div class='add'>+</div><div class='add'>+	num_mgmt = atomic_dec_if_positive(&amp;ar-&gt;num_pending_mgmt_tx);</div><div class='add'>+</div><div class='add'>+	if (num_mgmt &lt; 0)</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+</div><div class='add'>+	if (!num_mgmt)</div><div class='add'>+		wake_up(&amp;ar-&gt;txmgmt_empty_waitq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_tx_mgmt_free(struct ath12k *ar, int buf_id)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *msdu;</div><div class='add'>+	struct ieee80211_tx_info *info;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;txmgmt_idr_lock);</div><div class='add'>+	msdu = idr_remove(&amp;ar-&gt;txmgmt_idr, buf_id);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;txmgmt_idr_lock);</div><div class='add'>+</div><div class='add'>+	if (!msdu)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dma_unmap_single(ar-&gt;ab-&gt;dev, ATH12K_SKB_CB(msdu)-&gt;paddr, msdu-&gt;len,</div><div class='add'>+			 DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	info = IEEE80211_SKB_CB(msdu);</div><div class='add'>+	memset(&amp;info-&gt;status, 0, sizeof(info-&gt;status));</div><div class='add'>+</div><div class='add'>+	ath12k_mgmt_over_wmi_tx_drop(ar, msdu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_mac_tx_mgmt_pending_free(int buf_id, void *skb, void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = ctx;</div><div class='add'>+</div><div class='add'>+	ath12k_mac_tx_mgmt_free(ar, buf_id);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_vif_txmgmt_idr_remove(int buf_id, void *skb, void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = ctx;</div><div class='add'>+	struct ath12k_skb_cb *skb_cb = ATH12K_SKB_CB(skb);</div><div class='add'>+	struct ath12k *ar = skb_cb-&gt;ar;</div><div class='add'>+</div><div class='add'>+	if (skb_cb-&gt;vif == vif)</div><div class='add'>+		ath12k_mac_tx_mgmt_free(ar, buf_id);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_mgmt_tx_wmi(struct ath12k *ar, struct ath12k_link_vif *arvif,</div><div class='add'>+				  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	struct ath12k_skb_cb *skb_cb = ATH12K_SKB_CB(skb);</div><div class='add'>+	struct ieee80211_tx_info *info;</div><div class='add'>+	enum hal_encrypt_type enctype;</div><div class='add'>+	unsigned int mic_len;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	int buf_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	skb_cb-&gt;ar = ar;</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;txmgmt_idr_lock);</div><div class='add'>+	buf_id = idr_alloc(&amp;ar-&gt;txmgmt_idr, skb, 0,</div><div class='add'>+			   ATH12K_TX_MGMT_NUM_PENDING_MAX, GFP_ATOMIC);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;txmgmt_idr_lock);</div><div class='add'>+	if (buf_id &lt; 0)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	if ((skb_cb-&gt;flags &amp; ATH12K_SKB_CIPHER_SET) &amp;&amp;</div><div class='add'>+	    !(info-&gt;flags &amp; IEEE80211_TX_CTL_HW_80211_ENCAP)) {</div><div class='add'>+		if ((ieee80211_is_action(hdr-&gt;frame_control) ||</div><div class='add'>+		     ieee80211_is_deauth(hdr-&gt;frame_control) ||</div><div class='add'>+		     ieee80211_is_disassoc(hdr-&gt;frame_control)) &amp;&amp;</div><div class='add'>+		     ieee80211_has_protected(hdr-&gt;frame_control)) {</div><div class='add'>+			enctype = ath12k_dp_tx_get_encrypt_type(skb_cb-&gt;cipher);</div><div class='add'>+			mic_len = ath12k_dp_rx_crypto_mic_len(ar, enctype);</div><div class='add'>+			skb_put(skb, mic_len);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	paddr = dma_map_single(ab-&gt;dev, skb-&gt;data, skb-&gt;len, DMA_TO_DEVICE);</div><div class='add'>+	if (dma_mapping_error(ab-&gt;dev, paddr)) {</div><div class='add'>+		ath12k_warn(ab, "failed to DMA map mgmt Tx buffer\n");</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto err_free_idr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_cb-&gt;paddr = paddr;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_mgmt_send(arvif, buf_id, skb);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to send mgmt frame: %d\n", ret);</div><div class='add'>+		goto err_unmap_buf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_unmap_buf:</div><div class='add'>+	dma_unmap_single(ab-&gt;dev, skb_cb-&gt;paddr,</div><div class='add'>+			 skb-&gt;len, DMA_TO_DEVICE);</div><div class='add'>+err_free_idr:</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;txmgmt_idr_lock);</div><div class='add'>+	idr_remove(&amp;ar-&gt;txmgmt_idr, buf_id);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;txmgmt_idr_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mgmt_over_wmi_tx_purge(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	while ((skb = skb_dequeue(&amp;ar-&gt;wmi_mgmt_tx_queue)) != NULL)</div><div class='add'>+		ath12k_mgmt_over_wmi_tx_drop(ar, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_mgmt_action_frame_fill_elem_data(struct ath12k_link_vif *arvif,</div><div class='add'>+						       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	u8 category, *buf, iv_len, action_code, dialog_token;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct ieee80211_chanctx_conf *conf;</div><div class='add'>+	int cur_tx_power, max_tx_power;</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ieee80211_hw *hw = ath12k_ar_to_hw(ar);</div><div class='add'>+	struct wiphy *wiphy = hw-&gt;wiphy;</div><div class='add'>+	struct ath12k_skb_cb *skb_cb;</div><div class='add'>+	struct ieee80211_mgmt *mgmt;</div><div class='add'>+	unsigned int remaining_len;</div><div class='add'>+	bool has_protected;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(wiphy);</div><div class='add'>+</div><div class='add'>+	/* make sure category field is present */</div><div class='add'>+	if (skb-&gt;len &lt; IEEE80211_MIN_ACTION_SIZE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	remaining_len = skb-&gt;len - IEEE80211_MIN_ACTION_SIZE;</div><div class='add'>+	has_protected = ieee80211_has_protected(hdr-&gt;frame_control);</div><div class='add'>+</div><div class='add'>+	/* In case of SW crypto and hdr protected (PMF), packet will already be encrypted,</div><div class='add'>+	 * we can't put in data in this case</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED, &amp;ar-&gt;ab-&gt;dev_flags) &amp;&amp;</div><div class='add'>+	    has_protected)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mgmt = (struct ieee80211_mgmt *)hdr;</div><div class='add'>+	buf = (u8 *)&amp;mgmt-&gt;u.action;</div><div class='add'>+</div><div class='add'>+	/* FCTL_PROTECTED frame might have extra space added for HDR_LEN. Offset that</div><div class='add'>+	 * many bytes if it is there</div><div class='add'>+	 */</div><div class='add'>+	if (has_protected) {</div><div class='add'>+		skb_cb = ATH12K_SKB_CB(skb);</div><div class='add'>+</div><div class='add'>+		switch (skb_cb-&gt;cipher) {</div><div class='add'>+		/* Cipher suite having flag %IEEE80211_KEY_FLAG_GENERATE_IV_MGMT set in</div><div class='add'>+		 * key needs to be processed. See ath12k_install_key()</div><div class='add'>+		 */</div><div class='add'>+		case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+		case WLAN_CIPHER_SUITE_CCMP_256:</div><div class='add'>+		case WLAN_CIPHER_SUITE_GCMP:</div><div class='add'>+		case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='add'>+			iv_len = IEEE80211_CCMP_HDR_LEN;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+			iv_len = 0;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (remaining_len &lt; iv_len)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		buf += iv_len;</div><div class='add'>+		remaining_len -= iv_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	category = *buf++;</div><div class='add'>+	/* category code is already taken care in %IEEE80211_MIN_ACTION_SIZE hence</div><div class='add'>+	 * no need to adjust remaining_len</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	switch (category) {</div><div class='add'>+	case WLAN_CATEGORY_RADIO_MEASUREMENT:</div><div class='add'>+		/* need action code and dialog token */</div><div class='add'>+		if (remaining_len &lt; 2)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/* Packet Format:</div><div class='add'>+		 *	Action Code | Dialog Token | Variable Len (based on Action Code)</div><div class='add'>+		 */</div><div class='add'>+		action_code = *buf++;</div><div class='add'>+		dialog_token = *buf++;</div><div class='add'>+		remaining_len -= 2;</div><div class='add'>+</div><div class='add'>+		link_conf = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+		if (!link_conf) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "failed to get bss link conf for vdev %d in RM handling\n",</div><div class='add'>+				    arvif-&gt;vdev_id);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		conf = wiphy_dereference(wiphy, link_conf-&gt;chanctx_conf);</div><div class='add'>+		if (!conf)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+</div><div class='add'>+		cur_tx_power = link_conf-&gt;txpower;</div><div class='add'>+		max_tx_power = min(conf-&gt;def.chan-&gt;max_reg_power,</div><div class='add'>+				   (int)ar-&gt;max_tx_power / 2);</div><div class='add'>+</div><div class='add'>+		ath12k_mac_op_get_txpower(hw, arvif-&gt;ahvif-&gt;vif, arvif-&gt;link_id,</div><div class='add'>+					  &amp;cur_tx_power);</div><div class='add'>+</div><div class='add'>+		switch (action_code) {</div><div class='add'>+		case WLAN_RM_ACTION_LINK_MEASUREMENT_REQUEST:</div><div class='add'>+			/* need variable fields to be present in len */</div><div class='add'>+			if (remaining_len &lt; 2)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			/* Variable length format as defined in IEEE 802.11-2024,</div><div class='add'>+			 * Figure 9-1187-Link Measurement Request frame Action field</div><div class='add'>+			 * format.</div><div class='add'>+			 *	Transmit Power | Max Tx Power</div><div class='add'>+			 * We fill both of these.</div><div class='add'>+			 */</div><div class='add'>+			*buf++ = cur_tx_power;</div><div class='add'>+			*buf = max_tx_power;</div><div class='add'>+</div><div class='add'>+			ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+				   "RRM: Link Measurement Req dialog_token %u cur_tx_power %d max_tx_power %d\n",</div><div class='add'>+				   dialog_token, cur_tx_power, max_tx_power);</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_RM_ACTION_LINK_MEASUREMENT_REPORT:</div><div class='add'>+			/* need variable fields to be present in len */</div><div class='add'>+			if (remaining_len &lt; 3)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			/* Variable length format as defined in IEEE 802.11-2024,</div><div class='add'>+			 * Figure 9-1188-Link Measurement Report frame Action field format</div><div class='add'>+			 *	TPC Report | Variable Fields</div><div class='add'>+			 *</div><div class='add'>+			 * TPC Report Format:</div><div class='add'>+			 *	Element ID | Len | Tx Power | Link Margin</div><div class='add'>+			 *</div><div class='add'>+			 * We fill Tx power in the TPC Report (2nd index)</div><div class='add'>+			 */</div><div class='add'>+			buf[2] = cur_tx_power;</div><div class='add'>+</div><div class='add'>+			/* TODO: At present, Link margin data is not present so can't</div><div class='add'>+			 * really fill it now. Once it is available, it can be added</div><div class='add'>+			 * here</div><div class='add'>+			 */</div><div class='add'>+			ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+				   "RRM: Link Measurement Report dialog_token %u cur_tx_power %d\n",</div><div class='add'>+				   dialog_token, cur_tx_power);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* nothing to fill */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_mgmt_frame_fill_elem_data(struct ath12k_link_vif *arvif,</div><div class='add'>+						struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_is_action(hdr-&gt;frame_control))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ath12k_mac_mgmt_action_frame_fill_elem_data(arvif, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mgmt_over_wmi_tx_work(struct wiphy *wiphy, struct wiphy_work *work)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = container_of(work, struct ath12k, wmi_mgmt_tx_work);</div><div class='add'>+	struct ath12k_hw *ah = ar-&gt;ah;</div><div class='add'>+	struct ath12k_skb_cb *skb_cb;</div><div class='add'>+	struct ath12k_vif *ahvif;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(wiphy);</div><div class='add'>+</div><div class='add'>+	while ((skb = skb_dequeue(&amp;ar-&gt;wmi_mgmt_tx_queue)) != NULL) {</div><div class='add'>+		skb_cb = ATH12K_SKB_CB(skb);</div><div class='add'>+		if (!skb_cb-&gt;vif) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "no vif found for mgmt frame\n");</div><div class='add'>+			ath12k_mgmt_over_wmi_tx_drop(ar, skb);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ahvif = ath12k_vif_to_ahvif(skb_cb-&gt;vif);</div><div class='add'>+		if (!(ahvif-&gt;links_map &amp; BIT(skb_cb-&gt;link_id))) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "invalid linkid %u in mgmt over wmi tx with linkmap 0x%x\n",</div><div class='add'>+				    skb_cb-&gt;link_id, ahvif-&gt;links_map);</div><div class='add'>+			ath12k_mgmt_over_wmi_tx_drop(ar, skb);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		arvif = wiphy_dereference(ah-&gt;hw-&gt;wiphy, ahvif-&gt;link[skb_cb-&gt;link_id]);</div><div class='add'>+		if (ar-&gt;allocated_vdev_map &amp; (1LL &lt;&lt; arvif-&gt;vdev_id)) {</div><div class='add'>+			/* Fill in the data which is required to be filled by the driver</div><div class='add'>+			 * For example: Max Tx power in Link Measurement Request/Report</div><div class='add'>+			 */</div><div class='add'>+			ret = ath12k_mac_mgmt_frame_fill_elem_data(arvif, skb);</div><div class='add'>+			if (ret) {</div><div class='add'>+				/* If we couldn't fill the data due to any reason,</div><div class='add'>+				 * let's not discard transmitting the packet.</div><div class='add'>+				 * For example: Software crypto and PMF case</div><div class='add'>+				 */</div><div class='add'>+				ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+					   "Failed to fill the required data for the mgmt packet err %d\n",</div><div class='add'>+					   ret);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ret = ath12k_mac_mgmt_tx_wmi(ar, arvif, skb);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_warn(ar-&gt;ab, "failed to tx mgmt frame, vdev_id %d :%d\n",</div><div class='add'>+					    arvif-&gt;vdev_id, ret);</div><div class='add'>+				ath12k_mgmt_over_wmi_tx_drop(ar, skb);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "dropping mgmt frame for vdev %d link %u is_started %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id,</div><div class='add'>+				    skb_cb-&gt;link_id,</div><div class='add'>+				    arvif-&gt;is_started);</div><div class='add'>+			ath12k_mgmt_over_wmi_tx_drop(ar, skb);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_mgmt_tx(struct ath12k *ar, struct sk_buff *skb,</div><div class='add'>+			      bool is_prb_rsp)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff_head *q = &amp;ar-&gt;wmi_mgmt_tx_queue;</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_FLAG_CRASH_FLUSH, &amp;ar-&gt;ab-&gt;dev_flags))</div><div class='add'>+		return -ESHUTDOWN;</div><div class='add'>+</div><div class='add'>+	/* Drop probe response packets when the pending management tx</div><div class='add'>+	 * count has reached a certain threshold, so as to prioritize</div><div class='add'>+	 * other mgmt packets like auth and assoc to be sent on time</div><div class='add'>+	 * for establishing successful connections.</div><div class='add'>+	 */</div><div class='add'>+	if (is_prb_rsp &amp;&amp;</div><div class='add'>+	    atomic_read(&amp;ar-&gt;num_pending_mgmt_tx) &gt; ATH12K_PRB_RSP_DROP_THRESHOLD) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "dropping probe response as pending queue is almost full\n");</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb_queue_len_lockless(q) &gt;= ATH12K_TX_MGMT_NUM_PENDING_MAX) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "mgmt tx queue is full\n");</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_queue_tail(q, skb);</div><div class='add'>+	atomic_inc(&amp;ar-&gt;num_pending_mgmt_tx);</div><div class='add'>+	wiphy_work_queue(ath12k_ar_to_hw(ar)-&gt;wiphy, &amp;ar-&gt;wmi_mgmt_tx_work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_add_p2p_noa_ie(struct ath12k *ar,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      struct sk_buff *skb,</div><div class='add'>+				      bool is_prb_rsp)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+</div><div class='add'>+	if (likely(!is_prb_rsp))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	if (ahvif-&gt;u.ap.noa_data &amp;&amp;</div><div class='add'>+	    !pskb_expand_head(skb, 0, ahvif-&gt;u.ap.noa_len,</div><div class='add'>+			      GFP_ATOMIC))</div><div class='add'>+		skb_put_data(skb, ahvif-&gt;u.ap.noa_data,</div><div class='add'>+			     ahvif-&gt;u.ap.noa_len);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Note: called under rcu_read_lock() */</div><div class='add'>+static void ath12k_mlo_mcast_update_tx_link_address(struct ieee80211_vif *vif,</div><div class='add'>+						    u8 link_id, struct sk_buff *skb,</div><div class='add'>+						    u32 info_flags)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	struct ieee80211_bss_conf *bss_conf;</div><div class='add'>+</div><div class='add'>+	if (info_flags &amp; IEEE80211_TX_CTL_HW_80211_ENCAP)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bss_conf = rcu_dereference(vif-&gt;link_conf[link_id]);</div><div class='add'>+	if (bss_conf)</div><div class='add'>+		ether_addr_copy(hdr-&gt;addr2, bss_conf-&gt;addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Note: called under rcu_read_lock() */</div><div class='add'>+static u8 ath12k_mac_get_tx_link(struct ieee80211_sta *sta, struct ieee80211_vif *vif,</div><div class='add'>+				 u8 link, struct sk_buff *skb, u32 info_flags)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	struct ieee80211_bss_conf *bss_conf;</div><div class='add'>+	struct ath12k_sta *ahsta;</div><div class='add'>+</div><div class='add'>+	/* Use the link id passed or the default vif link */</div><div class='add'>+	if (!sta) {</div><div class='add'>+		if (link != IEEE80211_LINK_UNSPECIFIED)</div><div class='add'>+			return link;</div><div class='add'>+</div><div class='add'>+		return ahvif-&gt;deflink.link_id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ahsta = ath12k_sta_to_ahsta(sta);</div><div class='add'>+</div><div class='add'>+	/* Below translation ensures we pass proper A2 &amp; A3 for non ML clients.</div><div class='add'>+	 * Also it assumes for now support only for MLO AP in this path</div><div class='add'>+	 */</div><div class='add'>+	if (!sta-&gt;mlo) {</div><div class='add'>+		link = ahsta-&gt;deflink.link_id;</div><div class='add'>+</div><div class='add'>+		if (info_flags &amp; IEEE80211_TX_CTL_HW_80211_ENCAP)</div><div class='add'>+			return link;</div><div class='add'>+</div><div class='add'>+		bss_conf = rcu_dereference(vif-&gt;link_conf[link]);</div><div class='add'>+		if (bss_conf) {</div><div class='add'>+			ether_addr_copy(hdr-&gt;addr2, bss_conf-&gt;addr);</div><div class='add'>+			if (!ieee80211_has_tods(hdr-&gt;frame_control) &amp;&amp;</div><div class='add'>+			    !ieee80211_has_fromds(hdr-&gt;frame_control))</div><div class='add'>+				ether_addr_copy(hdr-&gt;addr3, bss_conf-&gt;addr);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return link;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* enqueue eth enacap &amp; data frames on primary link, FW does link</div><div class='add'>+	 * selection and address translation.</div><div class='add'>+	 */</div><div class='add'>+	if (info_flags &amp; IEEE80211_TX_CTL_HW_80211_ENCAP ||</div><div class='add'>+	    ieee80211_is_data(hdr-&gt;frame_control))</div><div class='add'>+		return ahsta-&gt;assoc_link_id;</div><div class='add'>+</div><div class='add'>+	/* 802.11 frame cases */</div><div class='add'>+	if (link == IEEE80211_LINK_UNSPECIFIED)</div><div class='add'>+		link = ahsta-&gt;deflink.link_id;</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_is_mgmt(hdr-&gt;frame_control))</div><div class='add'>+		return link;</div><div class='add'>+</div><div class='add'>+	/* Perform address conversion for ML STA Tx */</div><div class='add'>+	bss_conf = rcu_dereference(vif-&gt;link_conf[link]);</div><div class='add'>+	link_sta = rcu_dereference(sta-&gt;link[link]);</div><div class='add'>+</div><div class='add'>+	if (bss_conf &amp;&amp; link_sta) {</div><div class='add'>+		ether_addr_copy(hdr-&gt;addr1, link_sta-&gt;addr);</div><div class='add'>+		ether_addr_copy(hdr-&gt;addr2, bss_conf-&gt;addr);</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; bss_conf-&gt;bssid)</div><div class='add'>+			ether_addr_copy(hdr-&gt;addr3, bss_conf-&gt;bssid);</div><div class='add'>+		else if (vif-&gt;type == NL80211_IFTYPE_AP)</div><div class='add'>+			ether_addr_copy(hdr-&gt;addr3, bss_conf-&gt;addr);</div><div class='add'>+</div><div class='add'>+		return link;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bss_conf) {</div><div class='add'>+		/* In certain cases where a ML sta associated and added subset of</div><div class='add'>+		 * links on which the ML AP is active, but now sends some frame</div><div class='add'>+		 * (ex. Probe request) on a different link which is active in our</div><div class='add'>+		 * MLD but was not added during previous association, we can</div><div class='add'>+		 * still honor the Tx to that ML STA via the requested link.</div><div class='add'>+		 * The control would reach here in such case only when that link</div><div class='add'>+		 * address is same as the MLD address or in worst case clients</div><div class='add'>+		 * used MLD address at TA wrongly which would have helped</div><div class='add'>+		 * identify the ML sta object and pass it here.</div><div class='add'>+		 * If the link address of that STA is different from MLD address,</div><div class='add'>+		 * then the sta object would be NULL and control won't reach</div><div class='add'>+		 * here but return at the start of the function itself with !sta</div><div class='add'>+		 * check. Also this would not need any translation at hdr-&gt;addr1</div><div class='add'>+		 * from MLD to link address since the RA is the MLD address</div><div class='add'>+		 * (same as that link address ideally) already.</div><div class='add'>+		 */</div><div class='add'>+		ether_addr_copy(hdr-&gt;addr2, bss_conf-&gt;addr);</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; bss_conf-&gt;bssid)</div><div class='add'>+			ether_addr_copy(hdr-&gt;addr3, bss_conf-&gt;bssid);</div><div class='add'>+		else if (vif-&gt;type == NL80211_IFTYPE_AP)</div><div class='add'>+			ether_addr_copy(hdr-&gt;addr3, bss_conf-&gt;addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return link;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Note: called under rcu_read_lock() */</div><div class='add'>+static void ath12k_mac_op_tx(struct ieee80211_hw *hw,</div><div class='add'>+			     struct ieee80211_tx_control *control,</div><div class='add'>+			     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_skb_cb *skb_cb = ATH12K_SKB_CB(skb);</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	struct ieee80211_vif *vif = info-&gt;control.vif;</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_link_vif *arvif = &amp;ahvif-&gt;deflink;</div><div class='add'>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	struct ieee80211_key_conf *key = info-&gt;control.hw_key;</div><div class='add'>+	struct ieee80211_sta *sta = control-&gt;sta;</div><div class='add'>+	struct ath12k_link_vif *tmp_arvif;</div><div class='add'>+	u32 info_flags = info-&gt;flags;</div><div class='add'>+	struct sk_buff *msdu_copied;</div><div class='add'>+	struct ath12k *ar, *tmp_ar;</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	unsigned long links_map;</div><div class='add'>+	bool is_mcast = false;</div><div class='add'>+	bool is_dvlan = false;</div><div class='add'>+	struct ethhdr *eth;</div><div class='add'>+	bool is_prb_rsp;</div><div class='add'>+	u16 mcbc_gsn;</div><div class='add'>+	u8 link_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ahvif-&gt;vdev_type == WMI_VDEV_TYPE_MONITOR) {</div><div class='add'>+		ieee80211_free_txskb(hw, skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	link_id = u32_get_bits(info-&gt;control.flags, IEEE80211_TX_CTRL_MLO_LINK);</div><div class='add'>+	memset(skb_cb, 0, sizeof(*skb_cb));</div><div class='add'>+	skb_cb-&gt;vif = vif;</div><div class='add'>+</div><div class='add'>+	if (key) {</div><div class='add'>+		skb_cb-&gt;cipher = key-&gt;cipher;</div><div class='add'>+		skb_cb-&gt;flags |= ATH12K_SKB_CIPHER_SET;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* handle only for MLO case, use deflink for non MLO case */</div><div class='add'>+	if (ieee80211_vif_is_mld(vif)) {</div><div class='add'>+		link_id = ath12k_mac_get_tx_link(sta, vif, link_id, skb, info_flags);</div><div class='add'>+		if (link_id &gt;= IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+			ieee80211_free_txskb(hw, skb);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		link_id = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arvif = rcu_dereference(ahvif-&gt;link[link_id]);</div><div class='add'>+	if (!arvif || !arvif-&gt;ar) {</div><div class='add'>+		ath12k_warn(ahvif-&gt;ah, "failed to find arvif link id %u for frame transmission",</div><div class='add'>+			    link_id);</div><div class='add'>+		ieee80211_free_txskb(hw, skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar = arvif-&gt;ar;</div><div class='add'>+	skb_cb-&gt;link_id = link_id;</div><div class='add'>+	is_prb_rsp = ieee80211_is_probe_resp(hdr-&gt;frame_control);</div><div class='add'>+</div><div class='add'>+	if (info_flags &amp; IEEE80211_TX_CTL_HW_80211_ENCAP) {</div><div class='add'>+		eth = (struct ethhdr *)skb-&gt;data;</div><div class='add'>+		is_mcast = is_multicast_ether_addr(eth-&gt;h_dest);</div><div class='add'>+</div><div class='add'>+		skb_cb-&gt;flags |= ATH12K_SKB_HW_80211_ENCAP;</div><div class='add'>+	} else if (ieee80211_is_mgmt(hdr-&gt;frame_control)) {</div><div class='add'>+		if (sta &amp;&amp; sta-&gt;mlo)</div><div class='add'>+			skb_cb-&gt;flags |= ATH12K_SKB_MLO_STA;</div><div class='add'>+</div><div class='add'>+		ret = ath12k_mac_mgmt_tx(ar, skb, is_prb_rsp);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to queue management frame %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+			ieee80211_free_txskb(hw, skb);</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(info_flags &amp; IEEE80211_TX_CTL_HW_80211_ENCAP))</div><div class='add'>+		is_mcast = is_multicast_ether_addr(hdr-&gt;addr1);</div><div class='add'>+</div><div class='add'>+	/* This is case only for P2P_GO */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp; vif-&gt;p2p)</div><div class='add'>+		ath12k_mac_add_p2p_noa_ie(ar, vif, skb, is_prb_rsp);</div><div class='add'>+</div><div class='add'>+	/* Checking if it is a DVLAN frame */</div><div class='add'>+	if (!test_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED, &amp;ar-&gt;ab-&gt;dev_flags) &amp;&amp;</div><div class='add'>+	    !(skb_cb-&gt;flags &amp; ATH12K_SKB_HW_80211_ENCAP) &amp;&amp;</div><div class='add'>+	    !(skb_cb-&gt;flags &amp; ATH12K_SKB_CIPHER_SET) &amp;&amp;</div><div class='add'>+	    ieee80211_has_protected(hdr-&gt;frame_control))</div><div class='add'>+		is_dvlan = true;</div><div class='add'>+</div><div class='add'>+	if (!vif-&gt;valid_links || !is_mcast || is_dvlan ||</div><div class='add'>+	    (skb_cb-&gt;flags &amp; ATH12K_SKB_HW_80211_ENCAP) ||</div><div class='add'>+	    test_bit(ATH12K_FLAG_RAW_MODE, &amp;ar-&gt;ab-&gt;dev_flags)) {</div><div class='add'>+		ret = ath12k_dp_tx(ar, arvif, skb, false, 0, is_mcast);</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to transmit frame %d\n", ret);</div><div class='add'>+			ieee80211_free_txskb(ar-&gt;ah-&gt;hw, skb);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		mcbc_gsn = atomic_inc_return(&amp;ahvif-&gt;mcbc_gsn) &amp; 0xfff;</div><div class='add'>+</div><div class='add'>+		links_map = ahvif-&gt;links_map;</div><div class='add'>+		for_each_set_bit(link_id, &amp;links_map,</div><div class='add'>+				 IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+			tmp_arvif = rcu_dereference(ahvif-&gt;link[link_id]);</div><div class='add'>+			if (!tmp_arvif || !tmp_arvif-&gt;is_up)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			tmp_ar = tmp_arvif-&gt;ar;</div><div class='add'>+			msdu_copied = skb_copy(skb, GFP_ATOMIC);</div><div class='add'>+			if (!msdu_copied) {</div><div class='add'>+				ath12k_err(ar-&gt;ab,</div><div class='add'>+					   "skb copy failure link_id 0x%X vdevid 0x%X\n",</div><div class='add'>+					   link_id, tmp_arvif-&gt;vdev_id);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ath12k_mlo_mcast_update_tx_link_address(vif, link_id,</div><div class='add'>+								msdu_copied,</div><div class='add'>+								info_flags);</div><div class='add'>+</div><div class='add'>+			skb_cb = ATH12K_SKB_CB(msdu_copied);</div><div class='add'>+			skb_cb-&gt;link_id = link_id;</div><div class='add'>+</div><div class='add'>+			/* For open mode, skip peer find logic */</div><div class='add'>+			if (unlikely(!ahvif-&gt;key_cipher))</div><div class='add'>+				goto skip_peer_find;</div><div class='add'>+</div><div class='add'>+			spin_lock_bh(&amp;tmp_ar-&gt;ab-&gt;base_lock);</div><div class='add'>+			peer = ath12k_peer_find_by_addr(tmp_ar-&gt;ab, tmp_arvif-&gt;bssid);</div><div class='add'>+			if (!peer) {</div><div class='add'>+				spin_unlock_bh(&amp;tmp_ar-&gt;ab-&gt;base_lock);</div><div class='add'>+				ath12k_warn(tmp_ar-&gt;ab,</div><div class='add'>+					    "failed to find peer for vdev_id 0x%X addr %pM link_map 0x%X\n",</div><div class='add'>+					    tmp_arvif-&gt;vdev_id, tmp_arvif-&gt;bssid,</div><div class='add'>+					    ahvif-&gt;links_map);</div><div class='add'>+				dev_kfree_skb_any(msdu_copied);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			key = peer-&gt;keys[peer-&gt;mcast_keyidx];</div><div class='add'>+			if (key) {</div><div class='add'>+				skb_cb-&gt;cipher = key-&gt;cipher;</div><div class='add'>+				skb_cb-&gt;flags |= ATH12K_SKB_CIPHER_SET;</div><div class='add'>+</div><div class='add'>+				hdr = (struct ieee80211_hdr *)msdu_copied-&gt;data;</div><div class='add'>+				if (!ieee80211_has_protected(hdr-&gt;frame_control))</div><div class='add'>+					hdr-&gt;frame_control |=</div><div class='add'>+						cpu_to_le16(IEEE80211_FCTL_PROTECTED);</div><div class='add'>+			}</div><div class='add'>+			spin_unlock_bh(&amp;tmp_ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+skip_peer_find:</div><div class='add'>+			ret = ath12k_dp_tx(tmp_ar, tmp_arvif,</div><div class='add'>+					   msdu_copied, true, mcbc_gsn, is_mcast);</div><div class='add'>+			if (unlikely(ret)) {</div><div class='add'>+				if (ret == -ENOMEM) {</div><div class='add'>+					/* Drops are expected during heavy multicast</div><div class='add'>+					 * frame flood. Print with debug log</div><div class='add'>+					 * level to avoid lot of console prints</div><div class='add'>+					 */</div><div class='add'>+					ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+						   "failed to transmit frame %d\n",</div><div class='add'>+						   ret);</div><div class='add'>+				} else {</div><div class='add'>+					ath12k_warn(ar-&gt;ab,</div><div class='add'>+						    "failed to transmit frame %d\n",</div><div class='add'>+						    ret);</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				dev_kfree_skb_any(msdu_copied);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		ieee80211_free_txskb(ar-&gt;ah-&gt;hw, skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_mac_drain_tx(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* make sure rcu-protected mac80211 tx path itself is drained */</div><div class='add'>+	synchronize_net();</div><div class='add'>+</div><div class='add'>+	wiphy_work_cancel(ath12k_ar_to_hw(ar)-&gt;wiphy, &amp;ar-&gt;wmi_mgmt_tx_work);</div><div class='add'>+	ath12k_mgmt_over_wmi_tx_purge(ar);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_config_mon_status_default(struct ath12k *ar, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct htt_rx_ring_tlv_filter tlv_filter = {};</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	u32 ring_id, i;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;hw_params-&gt;rxdma1_enable)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		tlv_filter = ath12k_mac_mon_status_filter_default;</div><div class='add'>+</div><div class='add'>+		if (ath12k_debugfs_rx_filter(ar))</div><div class='add'>+			tlv_filter.rx_filter = ath12k_debugfs_rx_filter(ar);</div><div class='add'>+	} else {</div><div class='add'>+		tlv_filter.rxmon_disable = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;num_rxdma_per_pdev; i++) {</div><div class='add'>+		ring_id = ar-&gt;dp.rxdma_mon_dst_ring[i].ring_id;</div><div class='add'>+		ret = ath12k_dp_tx_htt_rx_filter_setup(ab, ring_id,</div><div class='add'>+						       ar-&gt;dp.mac_id + i,</div><div class='add'>+						       HAL_RXDMA_MONITOR_DST,</div><div class='add'>+						       DP_RXDMA_REFILL_RING_SIZE,</div><div class='add'>+						       &amp;tlv_filter);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_err(ab,</div><div class='add'>+				   "failed to setup filter for monitor buf %d\n",</div><div class='add'>+				   ret);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_start(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = ar-&gt;ah;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_pdev *pdev = ar-&gt;pdev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ah-&gt;hw_mutex);</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_pdev_set_param(ar, WMI_PDEV_PARAM_PMF_QOS,</div><div class='add'>+					1, pdev-&gt;pdev_id);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to enable PMF QOS: %d\n", ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_pdev_set_param(ar, WMI_PDEV_PARAM_DYNAMIC_BW, 1,</div><div class='add'>+					pdev-&gt;pdev_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to enable dynamic bw: %d\n", ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_pdev_set_param(ar, WMI_PDEV_PARAM_ARP_AC_OVERRIDE,</div><div class='add'>+					0, pdev-&gt;pdev_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to set ac override for ARP: %d\n",</div><div class='add'>+			   ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_send_dfs_phyerr_offload_enable_cmd(ar, pdev-&gt;pdev_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to offload radar detection: %d\n",</div><div class='add'>+			   ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dp_tx_htt_h2t_ppdu_stats_req(ar,</div><div class='add'>+						  HTT_PPDU_STATS_TAG_DEFAULT);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to req ppdu stats: %d\n", ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_pdev_set_param(ar, WMI_PDEV_PARAM_MESH_MCAST_ENABLE,</div><div class='add'>+					1, pdev-&gt;pdev_id);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to enable MESH MCAST ENABLE: (%d\n", ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__ath12k_set_antenna(ar, ar-&gt;cfg_tx_chainmask, ar-&gt;cfg_rx_chainmask);</div><div class='add'>+</div><div class='add'>+	/* TODO: Do we need to enable ANI? */</div><div class='add'>+</div><div class='add'>+	ret = ath12k_reg_update_chan_list(ar, false);</div><div class='add'>+</div><div class='add'>+	/* The ar state alone can be turned off for non supported country</div><div class='add'>+	 * without returning the error value. As we need to update the channel</div><div class='add'>+	 * for the next ar.</div><div class='add'>+	 */</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (ret == -EINVAL)</div><div class='add'>+			ret = 0;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;num_started_vdevs = 0;</div><div class='add'>+	ar-&gt;num_created_vdevs = 0;</div><div class='add'>+	ar-&gt;num_peers = 0;</div><div class='add'>+	ar-&gt;allocated_vdev_map = 0;</div><div class='add'>+	ar-&gt;chan_tx_pwr = ATH12K_PDEV_TX_POWER_INVALID;</div><div class='add'>+</div><div class='add'>+	/* Configure monitor status ring with default rx_filter to get rx status</div><div class='add'>+	 * such as rssi, rx_duration.</div><div class='add'>+	 */</div><div class='add'>+	ret = ath12k_mac_config_mon_status_default(ar, true);</div><div class='add'>+	if (ret &amp;&amp; (ret != -EOPNOTSUPP)) {</div><div class='add'>+		ath12k_err(ab, "failed to configure monitor status ring with default rx_filter: (%d)\n",</div><div class='add'>+			   ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret == -EOPNOTSUPP)</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_MAC,</div><div class='add'>+			   "monitor status config is not yet supported");</div><div class='add'>+</div><div class='add'>+	/* Configure the hash seed for hash based reo dest ring selection */</div><div class='add'>+	ath12k_wmi_pdev_lro_cfg(ar, ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+</div><div class='add'>+	/* allow device to enter IMPS */</div><div class='add'>+	if (ab-&gt;hw_params-&gt;idle_ps) {</div><div class='add'>+		ret = ath12k_wmi_pdev_set_param(ar, WMI_PDEV_PARAM_IDLE_PS_CONFIG,</div><div class='add'>+						1, pdev-&gt;pdev_id);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_err(ab, "failed to enable idle ps: %d\n", ret);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(ab-&gt;pdevs_active[ar-&gt;pdev_idx],</div><div class='add'>+			   &amp;ab-&gt;pdevs[ar-&gt;pdev_idx]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_drain_tx(struct ath12k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	for_each_ar(ah, ar, i)</div><div class='add'>+		ath12k_mac_drain_tx(ar);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_op_start(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	if (ath12k_ftm_mode)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ath12k_drain_tx(ah);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ah-&gt;hw_mutex);</div><div class='add'>+</div><div class='add'>+	switch (ah-&gt;state) {</div><div class='add'>+	case ATH12K_HW_STATE_OFF:</div><div class='add'>+		ah-&gt;state = ATH12K_HW_STATE_ON;</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_HW_STATE_RESTARTING:</div><div class='add'>+		ah-&gt;state = ATH12K_HW_STATE_RESTARTED;</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_HW_STATE_RESTARTED:</div><div class='add'>+	case ATH12K_HW_STATE_WEDGED:</div><div class='add'>+	case ATH12K_HW_STATE_ON:</div><div class='add'>+	case ATH12K_HW_STATE_TM:</div><div class='add'>+		ah-&gt;state = ATH12K_HW_STATE_OFF;</div><div class='add'>+</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_ar(ah, ar, i) {</div><div class='add'>+		ret = ath12k_mac_start(ar);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ah-&gt;state = ATH12K_HW_STATE_OFF;</div><div class='add'>+</div><div class='add'>+			ath12k_err(ar-&gt;ab, "fail to start mac operations in pdev idx %d ret %d\n",</div><div class='add'>+				   ar-&gt;pdev_idx, ret);</div><div class='add'>+			goto fail_start;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail_start:</div><div class='add'>+	for (; i &gt; 0; i--) {</div><div class='add'>+		ar = ath12k_ah_to_ar(ah, i - 1);</div><div class='add'>+		ath12k_mac_stop(ar);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_mac_rfkill_config(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	u32 param;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;rfkill_pin == 0)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "mac rfkill_pin %d rfkill_cfg %d rfkill_on_level %d",</div><div class='add'>+		   ab-&gt;hw_params-&gt;rfkill_pin, ab-&gt;hw_params-&gt;rfkill_cfg,</div><div class='add'>+		   ab-&gt;hw_params-&gt;rfkill_on_level);</div><div class='add'>+</div><div class='add'>+	param = u32_encode_bits(ab-&gt;hw_params-&gt;rfkill_on_level,</div><div class='add'>+				WMI_RFKILL_CFG_RADIO_LEVEL) |</div><div class='add'>+		u32_encode_bits(ab-&gt;hw_params-&gt;rfkill_pin,</div><div class='add'>+				WMI_RFKILL_CFG_GPIO_PIN_NUM) |</div><div class='add'>+		u32_encode_bits(ab-&gt;hw_params-&gt;rfkill_cfg,</div><div class='add'>+				WMI_RFKILL_CFG_PIN_AS_GPIO);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_pdev_set_param(ar, WMI_PDEV_PARAM_HW_RFKILL_CONFIG,</div><div class='add'>+					param, ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "failed to set rfkill config 0x%x: %d\n",</div><div class='add'>+			    param, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_mac_rfkill_enable_radio(struct ath12k *ar, bool enable)</div><div class='add'>+{</div><div class='add'>+	enum wmi_rfkill_enable_radio param;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		param = WMI_RFKILL_ENABLE_RADIO_ON;</div><div class='add'>+	else</div><div class='add'>+		param = WMI_RFKILL_ENABLE_RADIO_OFF;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac %d rfkill enable %d",</div><div class='add'>+		   ar-&gt;pdev_idx, param);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_pdev_set_param(ar, WMI_PDEV_PARAM_RFKILL_ENABLE,</div><div class='add'>+					param, ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set rfkill enable param %d: %d\n",</div><div class='add'>+			    param, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_stop(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = ar-&gt;ah;</div><div class='add'>+	struct htt_ppdu_stats_info *ppdu_stats, *tmp;</div><div class='add'>+	struct ath12k_wmi_scan_chan_list_arg *arg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ah-&gt;hw_mutex);</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_config_mon_status_default(ar, false);</div><div class='add'>+	if (ret &amp;&amp; (ret != -EOPNOTSUPP))</div><div class='add'>+		ath12k_err(ar-&gt;ab, "failed to clear rx_filter for monitor status ring: (%d)\n",</div><div class='add'>+			   ret);</div><div class='add'>+</div><div class='add'>+	clear_bit(ATH12K_FLAG_CAC_RUNNING, &amp;ar-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;ar-&gt;scan.timeout);</div><div class='add'>+	wiphy_work_cancel(ath12k_ar_to_hw(ar)-&gt;wiphy, &amp;ar-&gt;scan.vdev_clean_wk);</div><div class='add'>+	cancel_work_sync(&amp;ar-&gt;regd_channel_update_work);</div><div class='add'>+	cancel_work_sync(&amp;ar-&gt;regd_update_work);</div><div class='add'>+	cancel_work_sync(&amp;ar-&gt;ab-&gt;rfkill_work);</div><div class='add'>+	cancel_work_sync(&amp;ar-&gt;ab-&gt;update_11d_work);</div><div class='add'>+	ar-&gt;state_11d = ATH12K_11D_IDLE;</div><div class='add'>+	complete(&amp;ar-&gt;completed_11d_scan);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(ppdu_stats, tmp, &amp;ar-&gt;ppdu_stats_info, list) {</div><div class='add'>+		list_del(&amp;ppdu_stats-&gt;list);</div><div class='add'>+		kfree(ppdu_stats);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while ((arg = list_first_entry_or_null(&amp;ar-&gt;regd_channel_update_queue,</div><div class='add'>+					       struct ath12k_wmi_scan_chan_list_arg,</div><div class='add'>+					       list))) {</div><div class='add'>+		list_del(&amp;arg-&gt;list);</div><div class='add'>+		kfree(arg);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(ar-&gt;ab-&gt;pdevs_active[ar-&gt;pdev_idx], NULL);</div><div class='add'>+</div><div class='add'>+	synchronize_rcu();</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;ar-&gt;num_pending_mgmt_tx, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_op_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ath12k_drain_tx(ah);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ah-&gt;hw_mutex);</div><div class='add'>+</div><div class='add'>+	ah-&gt;state = ATH12K_HW_STATE_OFF;</div><div class='add'>+</div><div class='add'>+	for_each_ar(ah, ar, i)</div><div class='add'>+		ath12k_mac_stop(ar);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ah-&gt;hw_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8</div><div class='add'>+ath12k_mac_get_vdev_stats_id(struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = arvif-&gt;ar-&gt;ab;</div><div class='add'>+	u8 vdev_stats_id = 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if (ab-&gt;free_vdev_stats_id_map &amp; (1LL &lt;&lt; vdev_stats_id)) {</div><div class='add'>+			vdev_stats_id++;</div><div class='add'>+			if (vdev_stats_id &gt;= ATH12K_MAX_VDEV_STATS_ID) {</div><div class='add'>+				vdev_stats_id = ATH12K_INVAL_VDEV_STATS_ID;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			ab-&gt;free_vdev_stats_id_map |= (1LL &lt;&lt; vdev_stats_id);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} while (vdev_stats_id);</div><div class='add'>+</div><div class='add'>+	arvif-&gt;vdev_stats_id = vdev_stats_id;</div><div class='add'>+	return vdev_stats_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_setup_vdev_params_mbssid(struct ath12k_link_vif *arvif,</div><div class='add'>+					       u32 *flags, u32 *tx_vdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ath12k_link_vif *tx_arvif;</div><div class='add'>+</div><div class='add'>+	link_conf = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+	if (!link_conf) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "unable to access bss link conf in set mbssid params for vif %pM link %u\n",</div><div class='add'>+			    ahvif-&gt;vif-&gt;addr, arvif-&gt;link_id);</div><div class='add'>+		return -ENOLINK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tx_arvif = ath12k_mac_get_tx_arvif(arvif, link_conf);</div><div class='add'>+	if (!tx_arvif)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (link_conf-&gt;nontransmitted) {</div><div class='add'>+		if (ath12k_ar_to_hw(ar)-&gt;wiphy !=</div><div class='add'>+		    ath12k_ar_to_hw(tx_arvif-&gt;ar)-&gt;wiphy)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		*flags = WMI_VDEV_MBSSID_FLAGS_NON_TRANSMIT_AP;</div><div class='add'>+		*tx_vdev_id = tx_arvif-&gt;vdev_id;</div><div class='add'>+	} else if (tx_arvif == arvif) {</div><div class='add'>+		*flags = WMI_VDEV_MBSSID_FLAGS_TRANSMIT_AP;</div><div class='add'>+	} else {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link_conf-&gt;ema_ap)</div><div class='add'>+		*flags |= WMI_VDEV_MBSSID_FLAGS_EMA_MODE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_setup_vdev_create_arg(struct ath12k_link_vif *arvif,</div><div class='add'>+					    struct ath12k_wmi_vdev_create_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ath12k_pdev *pdev = ar-&gt;pdev;</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	arg-&gt;if_id = arvif-&gt;vdev_id;</div><div class='add'>+	arg-&gt;type = ahvif-&gt;vdev_type;</div><div class='add'>+	arg-&gt;subtype = ahvif-&gt;vdev_subtype;</div><div class='add'>+	arg-&gt;pdev_id = pdev-&gt;pdev_id;</div><div class='add'>+</div><div class='add'>+	arg-&gt;mbssid_flags = WMI_VDEV_MBSSID_FLAGS_NON_MBSSID_AP;</div><div class='add'>+	arg-&gt;mbssid_tx_vdev_id = 0;</div><div class='add'>+	if (!test_bit(WMI_TLV_SERVICE_MBSS_PARAM_IN_VDEV_START_SUPPORT,</div><div class='add'>+		      ar-&gt;ab-&gt;wmi_ab.svc_map)) {</div><div class='add'>+		ret = ath12k_mac_setup_vdev_params_mbssid(arvif,</div><div class='add'>+							  &amp;arg-&gt;mbssid_flags,</div><div class='add'>+							  &amp;arg-&gt;mbssid_tx_vdev_id);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pdev-&gt;cap.supported_bands &amp; WMI_HOST_WLAN_2GHZ_CAP) {</div><div class='add'>+		arg-&gt;chains[NL80211_BAND_2GHZ].tx = ar-&gt;num_tx_chains;</div><div class='add'>+		arg-&gt;chains[NL80211_BAND_2GHZ].rx = ar-&gt;num_rx_chains;</div><div class='add'>+	}</div><div class='add'>+	if (pdev-&gt;cap.supported_bands &amp; WMI_HOST_WLAN_5GHZ_CAP) {</div><div class='add'>+		arg-&gt;chains[NL80211_BAND_5GHZ].tx = ar-&gt;num_tx_chains;</div><div class='add'>+		arg-&gt;chains[NL80211_BAND_5GHZ].rx = ar-&gt;num_rx_chains;</div><div class='add'>+	}</div><div class='add'>+	if (pdev-&gt;cap.supported_bands &amp; WMI_HOST_WLAN_5GHZ_CAP &amp;&amp;</div><div class='add'>+	    ar-&gt;supports_6ghz) {</div><div class='add'>+		arg-&gt;chains[NL80211_BAND_6GHZ].tx = ar-&gt;num_tx_chains;</div><div class='add'>+		arg-&gt;chains[NL80211_BAND_6GHZ].rx = ar-&gt;num_rx_chains;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arg-&gt;if_stats_id = ath12k_mac_get_vdev_stats_id(arvif);</div><div class='add'>+</div><div class='add'>+	if (ath12k_mac_is_ml_arvif(arvif)) {</div><div class='add'>+		if (hweight16(ahvif-&gt;vif-&gt;valid_links) &gt; ATH12K_WMI_MLO_MAX_LINKS) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "too many MLO links during setting up vdev: %d",</div><div class='add'>+				    ahvif-&gt;vif-&gt;valid_links);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ether_addr_copy(arg-&gt;mld_addr, ahvif-&gt;vif-&gt;addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_update_vif_offload(struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(ahvif);</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	u32 param_id, param_value;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	param_id = WMI_VDEV_PARAM_TX_ENCAP_TYPE;</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+	    vif-&gt;type != NL80211_IFTYPE_AP)</div><div class='add'>+		vif-&gt;offload_flags &amp;= ~(IEEE80211_OFFLOAD_ENCAP_ENABLED |</div><div class='add'>+					IEEE80211_OFFLOAD_DECAP_ENABLED);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;offload_flags &amp; IEEE80211_OFFLOAD_ENCAP_ENABLED)</div><div class='add'>+		ahvif-&gt;tx_encap_type = ATH12K_HW_TXRX_ETHERNET;</div><div class='add'>+	else if (test_bit(ATH12K_FLAG_RAW_MODE, &amp;ab-&gt;dev_flags))</div><div class='add'>+		ahvif-&gt;tx_encap_type = ATH12K_HW_TXRX_RAW;</div><div class='add'>+	else</div><div class='add'>+		ahvif-&gt;tx_encap_type = ATH12K_HW_TXRX_NATIVE_WIFI;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+					    param_id, ahvif-&gt;tx_encap_type);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to set vdev %d tx encap mode: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		vif-&gt;offload_flags &amp;= ~IEEE80211_OFFLOAD_ENCAP_ENABLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	param_id = WMI_VDEV_PARAM_RX_DECAP_TYPE;</div><div class='add'>+	if (vif-&gt;offload_flags &amp; IEEE80211_OFFLOAD_DECAP_ENABLED)</div><div class='add'>+		param_value = ATH12K_HW_TXRX_ETHERNET;</div><div class='add'>+	else if (test_bit(ATH12K_FLAG_RAW_MODE, &amp;ab-&gt;dev_flags))</div><div class='add'>+		param_value = ATH12K_HW_TXRX_RAW;</div><div class='add'>+	else</div><div class='add'>+		param_value = ATH12K_HW_TXRX_NATIVE_WIFI;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+					    param_id, param_value);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to set vdev %d rx decap mode: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		vif-&gt;offload_flags &amp;= ~IEEE80211_OFFLOAD_DECAP_ENABLED;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_op_update_vif_offload(struct ieee80211_hw *hw,</div><div class='add'>+					     struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	unsigned long links;</div><div class='add'>+	int link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;valid_links) {</div><div class='add'>+		links = vif-&gt;valid_links;</div><div class='add'>+		for_each_set_bit(link_id, &amp;links, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+			arvif = wiphy_dereference(hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+			if (!(arvif &amp;&amp; arvif-&gt;ar))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			ath12k_mac_update_vif_offload(arvif);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_mac_update_vif_offload(&amp;ahvif-&gt;deflink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_mac_vif_ap_active_any(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_pdev *pdev;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		pdev = &amp;ab-&gt;pdevs[i];</div><div class='add'>+		ar = pdev-&gt;ar;</div><div class='add'>+		list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+			if (arvif-&gt;is_up &amp;&amp;</div><div class='add'>+			    arvif-&gt;ahvif-&gt;vdev_type == WMI_VDEV_TYPE_AP)</div><div class='add'>+				return true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_mac_11d_scan_start(struct ath12k *ar, u32 vdev_id)</div><div class='add'>+{</div><div class='add'>+	struct wmi_11d_scan_start_arg arg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;regdom_set_by_user)</div><div class='add'>+		goto fin;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;vdev_id_11d_scan != ATH12K_11D_INVALID_VDEV_ID)</div><div class='add'>+		goto fin;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(WMI_TLV_SERVICE_11D_OFFLOAD, ar-&gt;ab-&gt;wmi_ab.svc_map))</div><div class='add'>+		goto fin;</div><div class='add'>+</div><div class='add'>+	if (ath12k_mac_vif_ap_active_any(ar-&gt;ab))</div><div class='add'>+		goto fin;</div><div class='add'>+</div><div class='add'>+	arg.vdev_id = vdev_id;</div><div class='add'>+	arg.start_interval_msec = 0;</div><div class='add'>+	arg.scan_period_msec = ATH12K_SCAN_11D_INTERVAL;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "mac start 11d scan for vdev %d\n", vdev_id);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_send_11d_scan_start_cmd(ar, &amp;arg);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to start 11d scan vdev %d ret: %d\n",</div><div class='add'>+			    vdev_id, ret);</div><div class='add'>+	} else {</div><div class='add'>+		ar-&gt;vdev_id_11d_scan = vdev_id;</div><div class='add'>+		if (ar-&gt;state_11d == ATH12K_11D_PREPARING)</div><div class='add'>+			ar-&gt;state_11d = ATH12K_11D_RUNNING;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+fin:</div><div class='add'>+	if (ar-&gt;state_11d == ATH12K_11D_PREPARING) {</div><div class='add'>+		ar-&gt;state_11d = ATH12K_11D_IDLE;</div><div class='add'>+		complete(&amp;ar-&gt;completed_11d_scan);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_mac_11d_scan_stop(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(WMI_TLV_SERVICE_11D_OFFLOAD, ar-&gt;ab-&gt;wmi_ab.svc_map))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac stop 11d for vdev %d\n",</div><div class='add'>+		   ar-&gt;vdev_id_11d_scan);</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;state_11d == ATH12K_11D_PREPARING) {</div><div class='add'>+		ar-&gt;state_11d = ATH12K_11D_IDLE;</div><div class='add'>+		complete(&amp;ar-&gt;completed_11d_scan);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;vdev_id_11d_scan != ATH12K_11D_INVALID_VDEV_ID) {</div><div class='add'>+		vdev_id = ar-&gt;vdev_id_11d_scan;</div><div class='add'>+</div><div class='add'>+		ret = ath12k_wmi_send_11d_scan_stop_cmd(ar, vdev_id);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "failed to stopt 11d scan vdev %d ret: %d\n",</div><div class='add'>+				    vdev_id, ret);</div><div class='add'>+		} else {</div><div class='add'>+			ar-&gt;vdev_id_11d_scan = ATH12K_11D_INVALID_VDEV_ID;</div><div class='add'>+			ar-&gt;state_11d = ATH12K_11D_IDLE;</div><div class='add'>+			complete(&amp;ar-&gt;completed_11d_scan);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_mac_11d_scan_stop_all(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_pdev *pdev;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MAC, "mac stop soc 11d scan\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		pdev = &amp;ab-&gt;pdevs[i];</div><div class='add'>+		ar = pdev-&gt;ar;</div><div class='add'>+</div><div class='add'>+		ath12k_mac_11d_scan_stop(ar);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_determine_vdev_type(struct ieee80211_vif *vif,</div><div class='add'>+					   struct ath12k_vif *ahvif)</div><div class='add'>+{</div><div class='add'>+	ahvif-&gt;vdev_subtype = WMI_VDEV_SUBTYPE_NONE;</div><div class='add'>+</div><div class='add'>+	switch (vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_UNSPECIFIED:</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		ahvif-&gt;vdev_type = WMI_VDEV_TYPE_STA;</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;p2p)</div><div class='add'>+			ahvif-&gt;vdev_subtype = WMI_VDEV_SUBTYPE_P2P_CLIENT;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_MESH_POINT:</div><div class='add'>+		ahvif-&gt;vdev_subtype = WMI_VDEV_SUBTYPE_MESH_11S;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		ahvif-&gt;vdev_type = WMI_VDEV_TYPE_AP;</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;p2p)</div><div class='add'>+			ahvif-&gt;vdev_subtype = WMI_VDEV_SUBTYPE_P2P_GO;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_MONITOR:</div><div class='add'>+		ahvif-&gt;vdev_type = WMI_VDEV_TYPE_MONITOR;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_P2P_DEVICE:</div><div class='add'>+		ahvif-&gt;vdev_type = WMI_VDEV_TYPE_STA;</div><div class='add'>+		ahvif-&gt;vdev_subtype = WMI_VDEV_SUBTYPE_P2P_DEVICE;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_mac_vdev_create(struct ath12k *ar, struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = ar-&gt;ah;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ieee80211_hw *hw = ah-&gt;hw;</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(ahvif);</div><div class='add'>+	struct ath12k_wmi_vdev_create_arg vdev_arg = {};</div><div class='add'>+	struct ath12k_wmi_peer_create_arg peer_param = {};</div><div class='add'>+	struct ieee80211_bss_conf *link_conf = NULL;</div><div class='add'>+	u32 param_id, param_value;</div><div class='add'>+	u16 nss;</div><div class='add'>+	int i;</div><div class='add'>+	int ret, vdev_id;</div><div class='add'>+	u8 link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* In NO_VIRTUAL_MONITOR, its necessary to restrict only one monitor</div><div class='add'>+	 * interface in each radio</div><div class='add'>+	 */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_MONITOR &amp;&amp; ar-&gt;monitor_vdev_created)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;num_created_vdevs &gt;= TARGET_NUM_VDEVS(ab)) {</div><div class='add'>+		ath12k_warn(ab, "failed to create vdev, reached max vdev limit %d\n",</div><div class='add'>+			    TARGET_NUM_VDEVS(ab));</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	link_id = arvif-&gt;link_id;</div><div class='add'>+</div><div class='add'>+	if (link_id &lt; IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		link_conf = wiphy_dereference(hw-&gt;wiphy, vif-&gt;link_conf[link_id]);</div><div class='add'>+		if (!link_conf) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "unable to access bss link conf in vdev create for vif %pM link %u\n",</div><div class='add'>+				    vif-&gt;addr, arvif-&gt;link_id);</div><div class='add'>+			return -ENOLINK;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link_conf)</div><div class='add'>+		memcpy(arvif-&gt;bssid, link_conf-&gt;addr, ETH_ALEN);</div><div class='add'>+	else</div><div class='add'>+		memcpy(arvif-&gt;bssid, vif-&gt;addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	arvif-&gt;ar = ar;</div><div class='add'>+	vdev_id = __ffs64(ab-&gt;free_vdev_map);</div><div class='add'>+	arvif-&gt;vdev_id = vdev_id;</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_MONITOR)</div><div class='add'>+		ar-&gt;monitor_vdev_id = vdev_id;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac vdev create id %d type %d subtype %d map %llx\n",</div><div class='add'>+		   arvif-&gt;vdev_id, ahvif-&gt;vdev_type, ahvif-&gt;vdev_subtype,</div><div class='add'>+		   ab-&gt;free_vdev_map);</div><div class='add'>+</div><div class='add'>+	vif-&gt;cab_queue = arvif-&gt;vdev_id % (ATH12K_HW_MAX_QUEUES - 1);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(vif-&gt;hw_queue); i++)</div><div class='add'>+		vif-&gt;hw_queue[i] = i % (ATH12K_HW_MAX_QUEUES - 1);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_setup_vdev_create_arg(arvif, &amp;vdev_arg);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to create vdev parameters %d: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_vdev_create(ar, arvif-&gt;bssid, &amp;vdev_arg);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to create WMI vdev %d: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;num_created_vdevs++;</div><div class='add'>+	arvif-&gt;is_created = true;</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MAC, "vdev %pM created, vdev_id %d\n",</div><div class='add'>+		   vif-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+	ar-&gt;allocated_vdev_map |= 1LL &lt;&lt; arvif-&gt;vdev_id;</div><div class='add'>+	ab-&gt;free_vdev_map &amp;= ~(1LL &lt;&lt; arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	list_add(&amp;arvif-&gt;list, &amp;ar-&gt;arvifs);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	ath12k_mac_update_vif_offload(arvif);</div><div class='add'>+</div><div class='add'>+	nss = hweight32(ar-&gt;cfg_tx_chainmask) ? : 1;</div><div class='add'>+	ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+					    WMI_VDEV_PARAM_NSS, nss);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to set vdev %d chainmask 0x%x, nss %d :%d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ar-&gt;cfg_tx_chainmask, nss, ret);</div><div class='add'>+		goto err_vdev_del;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (ahvif-&gt;vdev_type) {</div><div class='add'>+	case WMI_VDEV_TYPE_AP:</div><div class='add'>+		peer_param.vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+		peer_param.peer_addr = arvif-&gt;bssid;</div><div class='add'>+		peer_param.peer_type = WMI_PEER_TYPE_DEFAULT;</div><div class='add'>+		ret = ath12k_peer_create(ar, arvif, NULL, &amp;peer_param);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to vdev %d create peer for AP: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+			goto err_vdev_del;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ath12k_mac_set_kickout(arvif);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to set vdev %i kickout parameters: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+			goto err_peer_del;</div><div class='add'>+		}</div><div class='add'>+		ath12k_mac_11d_scan_stop_all(ar-&gt;ab);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_VDEV_TYPE_STA:</div><div class='add'>+		param_id = WMI_STA_PS_PARAM_RX_WAKE_POLICY;</div><div class='add'>+		param_value = WMI_STA_PS_RX_WAKE_POLICY_WAKE;</div><div class='add'>+		ret = ath12k_wmi_set_sta_ps_param(ar, arvif-&gt;vdev_id,</div><div class='add'>+						  param_id, param_value);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to set vdev %d RX wake policy: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+			goto err_peer_del;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		param_id = WMI_STA_PS_PARAM_TX_WAKE_THRESHOLD;</div><div class='add'>+		param_value = WMI_STA_PS_TX_WAKE_THRESHOLD_ALWAYS;</div><div class='add'>+		ret = ath12k_wmi_set_sta_ps_param(ar, arvif-&gt;vdev_id,</div><div class='add'>+						  param_id, param_value);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to set vdev %d TX wake threshold: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+			goto err_peer_del;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		param_id = WMI_STA_PS_PARAM_PSPOLL_COUNT;</div><div class='add'>+		param_value = WMI_STA_PS_PSPOLL_COUNT_NO_MAX;</div><div class='add'>+		ret = ath12k_wmi_set_sta_ps_param(ar, arvif-&gt;vdev_id,</div><div class='add'>+						  param_id, param_value);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to set vdev %d pspoll count: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+			goto err_peer_del;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ath12k_wmi_pdev_set_ps_mode(ar, arvif-&gt;vdev_id, false);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to disable vdev %d ps mode: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+			goto err_peer_del;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (test_bit(WMI_TLV_SERVICE_11D_OFFLOAD, ab-&gt;wmi_ab.svc_map) &amp;&amp;</div><div class='add'>+		    ahvif-&gt;vdev_type == WMI_VDEV_TYPE_STA &amp;&amp;</div><div class='add'>+		    ahvif-&gt;vdev_subtype == WMI_VDEV_SUBTYPE_NONE) {</div><div class='add'>+			reinit_completion(&amp;ar-&gt;completed_11d_scan);</div><div class='add'>+			ar-&gt;state_11d = ATH12K_11D_PREPARING;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case WMI_VDEV_TYPE_MONITOR:</div><div class='add'>+		ar-&gt;monitor_vdev_created = true;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link_conf)</div><div class='add'>+		arvif-&gt;txpower = link_conf-&gt;txpower;</div><div class='add'>+	else</div><div class='add'>+		arvif-&gt;txpower = NL80211_TX_POWER_AUTOMATIC;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_txpower_recalc(ar);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_peer_del;</div><div class='add'>+</div><div class='add'>+	param_id = WMI_VDEV_PARAM_RTS_THRESHOLD;</div><div class='add'>+	param_value = hw-&gt;wiphy-&gt;rts_threshold;</div><div class='add'>+	ar-&gt;rts_threshold = param_value;</div><div class='add'>+	ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+					    param_id, param_value);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set rts threshold for vdev %d: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dp_vdev_tx_attach(ar, arvif);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+err_peer_del:</div><div class='add'>+	if (ahvif-&gt;vdev_type == WMI_VDEV_TYPE_AP) {</div><div class='add'>+		reinit_completion(&amp;ar-&gt;peer_delete_done);</div><div class='add'>+</div><div class='add'>+		ret = ath12k_wmi_send_peer_delete_cmd(ar, arvif-&gt;bssid,</div><div class='add'>+						      arvif-&gt;vdev_id);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to delete peer vdev_id %d addr %pM\n",</div><div class='add'>+				    arvif-&gt;vdev_id, arvif-&gt;bssid);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ath12k_wait_for_peer_delete_done(ar, arvif-&gt;vdev_id,</div><div class='add'>+						       arvif-&gt;bssid);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_vdev_del;</div><div class='add'>+</div><div class='add'>+		ar-&gt;num_peers--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err_vdev_del:</div><div class='add'>+	if (ahvif-&gt;vdev_type == WMI_VDEV_TYPE_MONITOR) {</div><div class='add'>+		ar-&gt;monitor_vdev_id = -1;</div><div class='add'>+		ar-&gt;monitor_vdev_created = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_wmi_vdev_delete(ar, arvif-&gt;vdev_id);</div><div class='add'>+	ar-&gt;num_created_vdevs--;</div><div class='add'>+	arvif-&gt;is_created = false;</div><div class='add'>+	arvif-&gt;ar = NULL;</div><div class='add'>+	ar-&gt;allocated_vdev_map &amp;= ~(1LL &lt;&lt; arvif-&gt;vdev_id);</div><div class='add'>+	ab-&gt;free_vdev_map |= 1LL &lt;&lt; arvif-&gt;vdev_id;</div><div class='add'>+	ab-&gt;free_vdev_stats_id_map &amp;= ~(1LL &lt;&lt; arvif-&gt;vdev_stats_id);</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	list_del(&amp;arvif-&gt;list);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	arvif-&gt;ar = NULL;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_vif_flush_key_cache(struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_key_conf *key_conf, *tmp;</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	struct ath12k_hw *ah = ahvif-&gt;ah;</div><div class='add'>+	struct ath12k_sta *ahsta;</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	struct ath12k_vif_cache *cache = ahvif-&gt;cache[arvif-&gt;link_id];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(key_conf, tmp, &amp;cache-&gt;key_conf.list, list) {</div><div class='add'>+		arsta = NULL;</div><div class='add'>+		if (key_conf-&gt;sta) {</div><div class='add'>+			ahsta = ath12k_sta_to_ahsta(key_conf-&gt;sta);</div><div class='add'>+			arsta = wiphy_dereference(ah-&gt;hw-&gt;wiphy,</div><div class='add'>+						  ahsta-&gt;link[arvif-&gt;link_id]);</div><div class='add'>+			if (!arsta)</div><div class='add'>+				goto free_cache;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ath12k_mac_set_key(arvif-&gt;ar, key_conf-&gt;cmd,</div><div class='add'>+					 arvif, arsta,</div><div class='add'>+					 key_conf-&gt;key);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(arvif-&gt;ar-&gt;ab, "unable to apply set key param to vdev %d ret %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+free_cache:</div><div class='add'>+		list_del(&amp;key_conf-&gt;list);</div><div class='add'>+		kfree(key_conf);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_vif_cache_flush(struct ath12k *ar, struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(ahvif);</div><div class='add'>+	struct ath12k_vif_cache *cache = ahvif-&gt;cache[arvif-&gt;link_id];</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!cache)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (cache-&gt;tx_conf.changed) {</div><div class='add'>+		ret = ath12k_mac_conf_tx(arvif, cache-&gt;tx_conf.ac,</div><div class='add'>+					 &amp;cache-&gt;tx_conf.tx_queue_params);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ab,</div><div class='add'>+				    "unable to apply tx config parameters to vdev %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cache-&gt;bss_conf_changed) {</div><div class='add'>+		link_conf = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+		if (!link_conf) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "unable to access bss link conf in cache flush for vif %pM link %u\n",</div><div class='add'>+				    vif-&gt;addr, arvif-&gt;link_id);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		ath12k_mac_bss_info_changed(ar, arvif, link_conf,</div><div class='add'>+					    cache-&gt;bss_conf_changed);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;cache-&gt;key_conf.list))</div><div class='add'>+		ath12k_mac_vif_flush_key_cache(arvif);</div><div class='add'>+</div><div class='add'>+	ath12k_ahvif_put_link_cache(ahvif, arvif-&gt;link_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ath12k *ath12k_mac_assign_vif_to_vdev(struct ieee80211_hw *hw,</div><div class='add'>+						    struct ath12k_link_vif *arvif,</div><div class='add'>+						    struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(ahvif);</div><div class='add'>+	struct ath12k_link_vif *scan_arvif;</div><div class='add'>+	struct ath12k_hw *ah = hw-&gt;priv;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	u8 link_id = arvif-&gt;link_id, scan_link_id;</div><div class='add'>+	unsigned long scan_link_map;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;num_radio == 1)</div><div class='add'>+		ar = ah-&gt;radio;</div><div class='add'>+	else if (ctx)</div><div class='add'>+		ar = ath12k_get_ar_by_ctx(hw, ctx);</div><div class='add'>+	else</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (!ar)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* cleanup the scan vdev if we are done scan on that ar</div><div class='add'>+	 * and now we want to create for actual usage.</div><div class='add'>+	 */</div><div class='add'>+	if (ieee80211_vif_is_mld(vif)) {</div><div class='add'>+		scan_link_map = ahvif-&gt;links_map &amp; ATH12K_SCAN_LINKS_MASK;</div><div class='add'>+		for_each_set_bit(scan_link_id, &amp;scan_link_map, ATH12K_NUM_MAX_LINKS) {</div><div class='add'>+			scan_arvif = wiphy_dereference(hw-&gt;wiphy,</div><div class='add'>+						       ahvif-&gt;link[scan_link_id]);</div><div class='add'>+			if (scan_arvif &amp;&amp; scan_arvif-&gt;ar == ar) {</div><div class='add'>+				ar-&gt;scan.arvif = NULL;</div><div class='add'>+				ath12k_mac_remove_link_interface(hw, scan_arvif);</div><div class='add'>+				ath12k_mac_unassign_link_vif(scan_arvif);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;ar) {</div><div class='add'>+		/* This is not expected really */</div><div class='add'>+		if (WARN_ON(!arvif-&gt;is_created)) {</div><div class='add'>+			arvif-&gt;ar = NULL;</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ah-&gt;num_radio == 1)</div><div class='add'>+			return arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+		/* This can happen as scan vdev gets created during multiple scans</div><div class='add'>+		 * across different radios before a vdev is brought up in</div><div class='add'>+		 * a certain radio.</div><div class='add'>+		 */</div><div class='add'>+		if (ar != arvif-&gt;ar) {</div><div class='add'>+			if (WARN_ON(arvif-&gt;is_started))</div><div class='add'>+				return NULL;</div><div class='add'>+</div><div class='add'>+			ath12k_mac_remove_link_interface(hw, arvif);</div><div class='add'>+			ath12k_mac_unassign_link_vif(arvif);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab = ar-&gt;ab;</div><div class='add'>+</div><div class='add'>+	/* Assign arvif again here since previous radio switch block</div><div class='add'>+	 * would've unassigned and cleared it.</div><div class='add'>+	 */</div><div class='add'>+	arvif = ath12k_mac_assign_link_vif(ah, vif, link_id);</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+	    ar-&gt;num_peers &gt; (ar-&gt;max_num_peers - 1)) {</div><div class='add'>+		ath12k_warn(ab, "failed to create vdev due to insufficient peer entry resource in firmware\n");</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;is_created)</div><div class='add'>+		goto flush;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_vdev_create(ar, arvif);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to create vdev %pM ret %d", vif-&gt;addr, ret);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+flush:</div><div class='add'>+	/* If the vdev is created during channel assign and not during</div><div class='add'>+	 * add_interface(), Apply any parameters for the vdev which were received</div><div class='add'>+	 * after add_interface, corresponding to this vif.</div><div class='add'>+	 */</div><div class='add'>+	ath12k_mac_vif_cache_flush(ar, arvif);</div><div class='add'>+unlock:</div><div class='add'>+	return arvif-&gt;ar;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_op_add_interface(struct ieee80211_hw *hw,</div><div class='add'>+				       struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_reg_info *reg_info;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	memset(ahvif, 0, sizeof(*ahvif));</div><div class='add'>+</div><div class='add'>+	ahvif-&gt;ah = ah;</div><div class='add'>+	ahvif-&gt;vif = vif;</div><div class='add'>+	arvif = &amp;ahvif-&gt;deflink;</div><div class='add'>+</div><div class='add'>+	ath12k_mac_init_arvif(ahvif, arvif, -1);</div><div class='add'>+</div><div class='add'>+	/* Allocate Default Queue now and reassign during actual vdev create */</div><div class='add'>+	vif-&gt;cab_queue = ATH12K_HW_DEFAULT_QUEUE;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(vif-&gt;hw_queue); i++)</div><div class='add'>+		vif-&gt;hw_queue[i] = ATH12K_HW_DEFAULT_QUEUE;</div><div class='add'>+</div><div class='add'>+	vif-&gt;driver_flags |= IEEE80211_VIF_SUPPORTS_UAPSD;</div><div class='add'>+</div><div class='add'>+	ath12k_mac_determine_vdev_type(vif, ahvif);</div><div class='add'>+</div><div class='add'>+	for_each_ar(ah, ar, i) {</div><div class='add'>+		if (!ath12k_wmi_supports_6ghz_cc_ext(ar))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ab = ar-&gt;ab;</div><div class='add'>+		reg_info = ab-&gt;reg_info[ar-&gt;pdev_idx];</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_MAC, "interface added to change reg rules\n");</div><div class='add'>+		ah-&gt;regd_updated = false;</div><div class='add'>+		ath12k_reg_handle_chan_list(ab, reg_info, ahvif-&gt;vdev_type,</div><div class='add'>+					    IEEE80211_REG_UNSET_AP);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Defer vdev creation until assign_chanctx or hw_scan is initiated as driver</div><div class='add'>+	 * will not know if this interface is an ML vif at this point.</div><div class='add'>+	 */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_vif_unref(struct ath12k_dp *dp, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_tx_desc_info *tx_desc_info;</div><div class='add'>+	struct ath12k_skb_cb *skb_cb;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH12K_HW_MAX_QUEUES; i++) {</div><div class='add'>+		spin_lock_bh(&amp;dp-&gt;tx_desc_lock[i]);</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(tx_desc_info, &amp;dp-&gt;tx_desc_used_list[i],</div><div class='add'>+				    list) {</div><div class='add'>+			skb = tx_desc_info-&gt;skb;</div><div class='add'>+			if (!skb)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			skb_cb = ATH12K_SKB_CB(skb);</div><div class='add'>+			if (skb_cb-&gt;vif == vif)</div><div class='add'>+				skb_cb-&gt;vif = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_unlock_bh(&amp;dp-&gt;tx_desc_lock[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_vdev_delete(struct ath12k *ar, struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(ahvif);</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	unsigned long time_left;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;ar-&gt;vdev_delete_done);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_vdev_delete(ar, arvif-&gt;vdev_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to delete WMI vdev %d: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		goto err_vdev_del;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;ar-&gt;vdev_delete_done,</div><div class='add'>+						ATH12K_VDEV_DELETE_TIMEOUT_HZ);</div><div class='add'>+	if (time_left == 0) {</div><div class='add'>+		ath12k_warn(ab, "Timeout in receiving vdev delete response\n");</div><div class='add'>+		goto err_vdev_del;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab-&gt;free_vdev_map |= 1LL &lt;&lt; arvif-&gt;vdev_id;</div><div class='add'>+	ar-&gt;allocated_vdev_map &amp;= ~(1LL &lt;&lt; arvif-&gt;vdev_id);</div><div class='add'>+	ar-&gt;num_created_vdevs--;</div><div class='add'>+</div><div class='add'>+	if (ahvif-&gt;vdev_type == WMI_VDEV_TYPE_MONITOR) {</div><div class='add'>+		ar-&gt;monitor_vdev_id = -1;</div><div class='add'>+		ar-&gt;monitor_vdev_created = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MAC, "vdev %pM deleted, vdev_id %d\n",</div><div class='add'>+		   vif-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+err_vdev_del:</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	list_del(&amp;arvif-&gt;list);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	ath12k_peer_cleanup(ar, arvif-&gt;vdev_id);</div><div class='add'>+	ath12k_ahvif_put_link_cache(ahvif, arvif-&gt;link_id);</div><div class='add'>+</div><div class='add'>+	idr_for_each(&amp;ar-&gt;txmgmt_idr,</div><div class='add'>+		     ath12k_mac_vif_txmgmt_idr_remove, vif);</div><div class='add'>+</div><div class='add'>+	ath12k_mac_vif_unref(&amp;ab-&gt;dp, vif);</div><div class='add'>+	ath12k_dp_tx_put_bank_profile(&amp;ab-&gt;dp, arvif-&gt;bank_id);</div><div class='add'>+</div><div class='add'>+	/* Recalc txpower for remaining vdev */</div><div class='add'>+	ath12k_mac_txpower_recalc(ar);</div><div class='add'>+</div><div class='add'>+	/* TODO: recal traffic pause state based on the available vdevs */</div><div class='add'>+	arvif-&gt;is_created = false;</div><div class='add'>+	arvif-&gt;ar = NULL;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_op_remove_interface(struct ieee80211_hw *hw,</div><div class='add'>+					   struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	u8 link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	for (link_id = 0; link_id &lt; ATH12K_NUM_MAX_LINKS; link_id++) {</div><div class='add'>+		/* if we cached some config but never received assign chanctx,</div><div class='add'>+		 * free the allocated cache.</div><div class='add'>+		 */</div><div class='add'>+		ath12k_ahvif_put_link_cache(ahvif, link_id);</div><div class='add'>+		arvif = wiphy_dereference(hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+		if (!arvif || !arvif-&gt;is_created)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ar = arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+		/* Scan abortion is in progress since before this, cancel_hw_scan()</div><div class='add'>+		 * is expected to be executed. Since link is anyways going to be removed</div><div class='add'>+		 * now, just cancel the worker and send the scan aborted to user space</div><div class='add'>+		 */</div><div class='add'>+		if (ar-&gt;scan.arvif == arvif) {</div><div class='add'>+			wiphy_work_cancel(hw-&gt;wiphy, &amp;ar-&gt;scan.vdev_clean_wk);</div><div class='add'>+</div><div class='add'>+			spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+			ar-&gt;scan.arvif = NULL;</div><div class='add'>+			if (!ar-&gt;scan.is_roc) {</div><div class='add'>+				struct cfg80211_scan_info info = {</div><div class='add'>+					.aborted = true,</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				ath12k_mac_scan_send_complete(ar, &amp;info);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ar-&gt;scan.state = ATH12K_SCAN_IDLE;</div><div class='add'>+			ar-&gt;scan_channel = NULL;</div><div class='add'>+			ar-&gt;scan.roc_freq = 0;</div><div class='add'>+			spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath12k_mac_remove_link_interface(hw, arvif);</div><div class='add'>+		ath12k_mac_unassign_link_vif(arvif);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* FIXME: Has to be verified. */</div><div class='add'>+#define SUPPORTED_FILTERS			\</div><div class='add'>+	(FIF_ALLMULTI |				\</div><div class='add'>+	FIF_CONTROL |				\</div><div class='add'>+	FIF_PSPOLL |				\</div><div class='add'>+	FIF_OTHER_BSS |				\</div><div class='add'>+	FIF_BCN_PRBRESP_PROMISC |		\</div><div class='add'>+	FIF_PROBE_REQ |				\</div><div class='add'>+	FIF_FCSFAIL)</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_op_configure_filter(struct ieee80211_hw *hw,</div><div class='add'>+					   unsigned int changed_flags,</div><div class='add'>+					   unsigned int *total_flags,</div><div class='add'>+					   u64 multicast)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ar = ath12k_ah_to_ar(ah, 0);</div><div class='add'>+</div><div class='add'>+	*total_flags &amp;= SUPPORTED_FILTERS;</div><div class='add'>+	ar-&gt;filter_flags = *total_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_op_get_antenna(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+				     u32 *tx_ant, u32 *rx_ant)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	int antennas_rx = 0, antennas_tx = 0;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	for_each_ar(ah, ar, i) {</div><div class='add'>+		antennas_rx = max_t(u32, antennas_rx, ar-&gt;cfg_rx_chainmask);</div><div class='add'>+		antennas_tx = max_t(u32, antennas_tx, ar-&gt;cfg_tx_chainmask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*tx_ant = antennas_tx;</div><div class='add'>+	*rx_ant = antennas_rx;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_op_set_antenna(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+				     u32 tx_ant, u32 rx_ant)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	for_each_ar(ah, ar, i) {</div><div class='add'>+		ret = __ath12k_set_antenna(ar, tx_ant, rx_ant);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_ampdu_action(struct ieee80211_hw *hw,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_ampdu_params *params,</div><div class='add'>+				   u8 link_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ar = ath12k_get_ar_by_vif(hw, vif, link_id);</div><div class='add'>+	if (!ar)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (params-&gt;action) {</div><div class='add'>+	case IEEE80211_AMPDU_RX_START:</div><div class='add'>+		ret = ath12k_dp_rx_ampdu_start(ar, params, link_id);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_RX_STOP:</div><div class='add'>+		ret = ath12k_dp_rx_ampdu_stop(ar, params, link_id);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_TX_START:</div><div class='add'>+	case IEEE80211_AMPDU_TX_STOP_CONT:</div><div class='add'>+	case IEEE80211_AMPDU_TX_STOP_FLUSH:</div><div class='add'>+	case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:</div><div class='add'>+	case IEEE80211_AMPDU_TX_OPERATIONAL:</div><div class='add'>+		/* Tx A-MPDU aggregation offloaded to hw/fw so deny mac80211</div><div class='add'>+		 * Tx aggregation requests.</div><div class='add'>+		 */</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "unable to perform ampdu action %d for vif %pM link %u ret %d\n",</div><div class='add'>+			    params-&gt;action, vif-&gt;addr, link_id, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_op_ampdu_action(struct ieee80211_hw *hw,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      struct ieee80211_ampdu_params *params)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = params-&gt;sta;</div><div class='add'>+	struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta);</div><div class='add'>+	unsigned long links_map = ahsta-&gt;links_map;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+	u8 link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!links_map))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(link_id, &amp;links_map, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		ret = ath12k_mac_ampdu_action(hw, vif, params, link_id);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_op_add_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+				     struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ar = ath12k_get_ar_by_ctx(hw, ctx);</div><div class='add'>+	if (!ar)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ab = ar-&gt;ab;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "mac chanctx add freq %u width %d ptr %p\n",</div><div class='add'>+		   ctx-&gt;def.chan-&gt;center_freq, ctx-&gt;def.width, ctx);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	/* TODO: In case of multiple channel context, populate rx_channel from</div><div class='add'>+	 * Rx PPDU desc information.</div><div class='add'>+	 */</div><div class='add'>+	ar-&gt;rx_channel = ctx-&gt;def.chan;</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	ar-&gt;chan_tx_pwr = ATH12K_PDEV_TX_POWER_INVALID;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_op_remove_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+					 struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ar = ath12k_get_ar_by_ctx(hw, ctx);</div><div class='add'>+	if (!ar)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ab = ar-&gt;ab;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "mac chanctx remove freq %u width %d ptr %p\n",</div><div class='add'>+		   ctx-&gt;def.chan-&gt;center_freq, ctx-&gt;def.width, ctx);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	/* TODO: In case of there is one more channel context left, populate</div><div class='add'>+	 * rx_channel with the channel of that remaining channel context.</div><div class='add'>+	 */</div><div class='add'>+	ar-&gt;rx_channel = NULL;</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	ar-&gt;chan_tx_pwr = ATH12K_PDEV_TX_POWER_INVALID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum wmi_phy_mode</div><div class='add'>+ath12k_mac_check_down_grade_phy_mode(struct ath12k *ar,</div><div class='add'>+				     enum wmi_phy_mode mode,</div><div class='add'>+				     enum nl80211_band band,</div><div class='add'>+				     enum nl80211_iftype type)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta_eht_cap *eht_cap = NULL;</div><div class='add'>+	enum wmi_phy_mode down_mode;</div><div class='add'>+	int n = ar-&gt;mac.sbands[band].n_iftype_data;</div><div class='add'>+	int i;</div><div class='add'>+	struct ieee80211_sband_iftype_data *data;</div><div class='add'>+</div><div class='add'>+	if (mode &lt; MODE_11BE_EHT20)</div><div class='add'>+		return mode;</div><div class='add'>+</div><div class='add'>+	data = ar-&gt;mac.iftype[band];</div><div class='add'>+	for (i = 0; i &lt; n; i++) {</div><div class='add'>+		if (data[i].types_mask &amp; BIT(type)) {</div><div class='add'>+			eht_cap = &amp;data[i].eht_cap;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (eht_cap &amp;&amp; eht_cap-&gt;has_eht)</div><div class='add'>+		return mode;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case MODE_11BE_EHT20:</div><div class='add'>+		down_mode = MODE_11AX_HE20;</div><div class='add'>+		break;</div><div class='add'>+	case MODE_11BE_EHT40:</div><div class='add'>+		down_mode = MODE_11AX_HE40;</div><div class='add'>+		break;</div><div class='add'>+	case MODE_11BE_EHT80:</div><div class='add'>+		down_mode = MODE_11AX_HE80;</div><div class='add'>+		break;</div><div class='add'>+	case MODE_11BE_EHT80_80:</div><div class='add'>+		down_mode = MODE_11AX_HE80_80;</div><div class='add'>+		break;</div><div class='add'>+	case MODE_11BE_EHT160:</div><div class='add'>+	case MODE_11BE_EHT160_160:</div><div class='add'>+	case MODE_11BE_EHT320:</div><div class='add'>+		down_mode = MODE_11AX_HE160;</div><div class='add'>+		break;</div><div class='add'>+	case MODE_11BE_EHT20_2G:</div><div class='add'>+		down_mode = MODE_11AX_HE20_2G;</div><div class='add'>+		break;</div><div class='add'>+	case MODE_11BE_EHT40_2G:</div><div class='add'>+		down_mode = MODE_11AX_HE40_2G;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		down_mode = mode;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "mac vdev start phymode %s downgrade to %s\n",</div><div class='add'>+		   ath12k_mac_phymode_str(mode),</div><div class='add'>+		   ath12k_mac_phymode_str(down_mode));</div><div class='add'>+</div><div class='add'>+	return down_mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_mac_mlo_get_vdev_args(struct ath12k_link_vif *arvif,</div><div class='add'>+			     struct wmi_ml_arg *ml_arg)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	struct wmi_ml_partner_info *partner_info;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct ath12k_link_vif *arvif_p;</div><div class='add'>+	unsigned long links;</div><div class='add'>+	u8 link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ahvif-&gt;ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!ath12k_mac_is_ml_arvif(arvif))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (hweight16(ahvif-&gt;vif-&gt;valid_links) &gt; ATH12K_WMI_MLO_MAX_LINKS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ml_arg-&gt;enabled = true;</div><div class='add'>+</div><div class='add'>+	/* Driver always add a new link via VDEV START, FW takes</div><div class='add'>+	 * care of internally adding this link to existing</div><div class='add'>+	 * link vdevs which are advertised as partners below</div><div class='add'>+	 */</div><div class='add'>+	ml_arg-&gt;link_add = true;</div><div class='add'>+</div><div class='add'>+	ml_arg-&gt;assoc_link = arvif-&gt;is_sta_assoc_link;</div><div class='add'>+</div><div class='add'>+	partner_info = ml_arg-&gt;partner_info;</div><div class='add'>+</div><div class='add'>+	links = ahvif-&gt;links_map;</div><div class='add'>+	for_each_set_bit(link_id, &amp;links, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		arvif_p = wiphy_dereference(ahvif-&gt;ah-&gt;hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!arvif_p))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (arvif == arvif_p)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!arvif_p-&gt;is_created)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		link_conf = wiphy_dereference(ahvif-&gt;ah-&gt;hw-&gt;wiphy,</div><div class='add'>+					      ahvif-&gt;vif-&gt;link_conf[arvif_p-&gt;link_id]);</div><div class='add'>+</div><div class='add'>+		if (!link_conf)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		partner_info-&gt;vdev_id = arvif_p-&gt;vdev_id;</div><div class='add'>+		partner_info-&gt;hw_link_id = arvif_p-&gt;ar-&gt;pdev-&gt;hw_link_id;</div><div class='add'>+		ether_addr_copy(partner_info-&gt;addr, link_conf-&gt;addr);</div><div class='add'>+		ml_arg-&gt;num_partner_links++;</div><div class='add'>+		partner_info++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_mac_vdev_start_restart(struct ath12k_link_vif *arvif,</div><div class='add'>+			      struct ieee80211_chanctx_conf *ctx,</div><div class='add'>+			      bool restart)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct wmi_vdev_start_req_arg arg = {};</div><div class='add'>+	const struct cfg80211_chan_def *chandef = &amp;ctx-&gt;def;</div><div class='add'>+	struct ieee80211_hw *hw = ath12k_ar_to_hw(ar);</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	unsigned int dfs_cac_time;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	link_conf = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+	if (!link_conf) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "unable to access bss link conf in vdev start for vif %pM link %u\n",</div><div class='add'>+			    ahvif-&gt;vif-&gt;addr, arvif-&gt;link_id);</div><div class='add'>+		return -ENOLINK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;ar-&gt;vdev_setup_done);</div><div class='add'>+</div><div class='add'>+	arg.vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+	arg.dtim_period = arvif-&gt;dtim_period;</div><div class='add'>+	arg.bcn_intval = arvif-&gt;beacon_interval;</div><div class='add'>+	arg.punct_bitmap = ~arvif-&gt;punct_bitmap;</div><div class='add'>+</div><div class='add'>+	arg.freq = chandef-&gt;chan-&gt;center_freq;</div><div class='add'>+	arg.band_center_freq1 = chandef-&gt;center_freq1;</div><div class='add'>+	arg.band_center_freq2 = chandef-&gt;center_freq2;</div><div class='add'>+	arg.mode = ath12k_phymodes[chandef-&gt;chan-&gt;band][chandef-&gt;width];</div><div class='add'>+</div><div class='add'>+	arg.mode = ath12k_mac_check_down_grade_phy_mode(ar, arg.mode,</div><div class='add'>+							chandef-&gt;chan-&gt;band,</div><div class='add'>+							ahvif-&gt;vif-&gt;type);</div><div class='add'>+	arg.min_power = 0;</div><div class='add'>+	arg.max_power = chandef-&gt;chan-&gt;max_power;</div><div class='add'>+	arg.max_reg_power = chandef-&gt;chan-&gt;max_reg_power;</div><div class='add'>+	arg.max_antenna_gain = chandef-&gt;chan-&gt;max_antenna_gain;</div><div class='add'>+</div><div class='add'>+	arg.pref_tx_streams = ar-&gt;num_tx_chains;</div><div class='add'>+	arg.pref_rx_streams = ar-&gt;num_rx_chains;</div><div class='add'>+</div><div class='add'>+	arg.mbssid_flags = WMI_VDEV_MBSSID_FLAGS_NON_MBSSID_AP;</div><div class='add'>+	arg.mbssid_tx_vdev_id = 0;</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_MBSS_PARAM_IN_VDEV_START_SUPPORT,</div><div class='add'>+		     ar-&gt;ab-&gt;wmi_ab.svc_map)) {</div><div class='add'>+		ret = ath12k_mac_setup_vdev_params_mbssid(arvif,</div><div class='add'>+							  &amp;arg.mbssid_flags,</div><div class='add'>+							  &amp;arg.mbssid_tx_vdev_id);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ahvif-&gt;vdev_type == WMI_VDEV_TYPE_AP) {</div><div class='add'>+		arg.ssid = ahvif-&gt;u.ap.ssid;</div><div class='add'>+		arg.ssid_len = ahvif-&gt;u.ap.ssid_len;</div><div class='add'>+		arg.hidden_ssid = ahvif-&gt;u.ap.hidden_ssid;</div><div class='add'>+</div><div class='add'>+		/* For now allow DFS for AP mode */</div><div class='add'>+		arg.chan_radar = !!(chandef-&gt;chan-&gt;flags &amp; IEEE80211_CHAN_RADAR);</div><div class='add'>+</div><div class='add'>+		arg.freq2_radar = ctx-&gt;radar_enabled;</div><div class='add'>+</div><div class='add'>+		arg.passive = arg.chan_radar;</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		arg.regdomain = ar-&gt;ab-&gt;dfs_region;</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+		/* TODO: Notify if secondary 80Mhz also needs radar detection */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arg.passive |= !!(chandef-&gt;chan-&gt;flags &amp; IEEE80211_CHAN_NO_IR);</div><div class='add'>+</div><div class='add'>+	if (!restart)</div><div class='add'>+		ath12k_mac_mlo_get_vdev_args(arvif, &amp;arg.ml);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "mac vdev %d start center_freq %d phymode %s punct_bitmap 0x%x\n",</div><div class='add'>+		   arg.vdev_id, arg.freq,</div><div class='add'>+		   ath12k_mac_phymode_str(arg.mode), arg.punct_bitmap);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_vdev_start(ar, &amp;arg, restart);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to %s WMI vdev %i\n",</div><div class='add'>+			    restart ? "restart" : "start", arg.vdev_id);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_vdev_setup_sync(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to synchronize setup for vdev %i %s: %d\n",</div><div class='add'>+			    arg.vdev_id, restart ? "restart" : "start", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TODO: For now we only set TPC power here. However when</div><div class='add'>+	 * channel changes, say CSA, it should be updated again.</div><div class='add'>+	 */</div><div class='add'>+	if (ath12k_mac_supports_tpc(ar, ahvif, chandef)) {</div><div class='add'>+		ath12k_mac_fill_reg_tpc_info(ar, arvif, ctx);</div><div class='add'>+		ath12k_wmi_send_vdev_set_tpc_power(ar, arvif-&gt;vdev_id,</div><div class='add'>+						   &amp;arvif-&gt;reg_tpc_info);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;num_started_vdevs++;</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MAC,  "vdev %pM started, vdev_id %d\n",</div><div class='add'>+		   ahvif-&gt;vif-&gt;addr, arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	/* Enable CAC Running Flag in the driver by checking all sub-channel's DFS</div><div class='add'>+	 * state as NL80211_DFS_USABLE which indicates CAC needs to be</div><div class='add'>+	 * done before channel usage. This flag is used to drop rx packets.</div><div class='add'>+	 * during CAC.</div><div class='add'>+	 */</div><div class='add'>+	/* TODO: Set the flag for other interface types as required */</div><div class='add'>+	if (arvif-&gt;ahvif-&gt;vdev_type == WMI_VDEV_TYPE_AP &amp;&amp; ctx-&gt;radar_enabled &amp;&amp;</div><div class='add'>+	    cfg80211_chandef_dfs_usable(hw-&gt;wiphy, chandef)) {</div><div class='add'>+		set_bit(ATH12K_FLAG_CAC_RUNNING, &amp;ar-&gt;dev_flags);</div><div class='add'>+		dfs_cac_time = cfg80211_chandef_dfs_cac_time(hw-&gt;wiphy, chandef);</div><div class='add'>+</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_MAC,</div><div class='add'>+			   "CAC started dfs_cac_time %u center_freq %d center_freq1 %d for vdev %d\n",</div><div class='add'>+			   dfs_cac_time, arg.freq, arg.band_center_freq1, arg.vdev_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_set_txbf_conf(arvif);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ab, "failed to set txbf conf for vdev %d: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_vdev_start(struct ath12k_link_vif *arvif,</div><div class='add'>+				 struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	return ath12k_mac_vdev_start_restart(arvif, ctx, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_vdev_restart(struct ath12k_link_vif *arvif,</div><div class='add'>+				   struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	return ath12k_mac_vdev_start_restart(arvif, ctx, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ath12k_mac_change_chanctx_arg {</div><div class='add'>+	struct ieee80211_chanctx_conf *ctx;</div><div class='add'>+	struct ieee80211_vif_chanctx_switch *vifs;</div><div class='add'>+	int n_vifs;</div><div class='add'>+	int next_vif;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_mac_change_chanctx_cnt_iter(void *data, u8 *mac,</div><div class='add'>+				   struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_mac_change_chanctx_arg *arg = data;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	unsigned long links_map;</div><div class='add'>+	u8 link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ahvif-&gt;ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	links_map = ahvif-&gt;links_map;</div><div class='add'>+	for_each_set_bit(link_id, &amp;links_map, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		arvif = wiphy_dereference(ahvif-&gt;ah-&gt;hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+		if (WARN_ON(!arvif))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!arvif-&gt;is_created || arvif-&gt;ar != arg-&gt;ar)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		link_conf = wiphy_dereference(ahvif-&gt;ah-&gt;hw-&gt;wiphy,</div><div class='add'>+					      vif-&gt;link_conf[link_id]);</div><div class='add'>+		if (WARN_ON(!link_conf))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (rcu_access_pointer(link_conf-&gt;chanctx_conf) != arg-&gt;ctx)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		arg-&gt;n_vifs++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_mac_change_chanctx_fill_iter(void *data, u8 *mac,</div><div class='add'>+				    struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_mac_change_chanctx_arg *arg = data;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct ieee80211_chanctx_conf *ctx;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	unsigned long links_map;</div><div class='add'>+	u8 link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ahvif-&gt;ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	links_map = ahvif-&gt;links_map;</div><div class='add'>+	for_each_set_bit(link_id, &amp;links_map, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		arvif = wiphy_dereference(ahvif-&gt;ah-&gt;hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+		if (WARN_ON(!arvif))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!arvif-&gt;is_created || arvif-&gt;ar != arg-&gt;ar)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		link_conf = wiphy_dereference(ahvif-&gt;ah-&gt;hw-&gt;wiphy,</div><div class='add'>+					      vif-&gt;link_conf[arvif-&gt;link_id]);</div><div class='add'>+		if (WARN_ON(!link_conf))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ctx = rcu_access_pointer(link_conf-&gt;chanctx_conf);</div><div class='add'>+		if (ctx != arg-&gt;ctx)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(arg-&gt;next_vif == arg-&gt;n_vifs))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		arg-&gt;vifs[arg-&gt;next_vif].vif = vif;</div><div class='add'>+		arg-&gt;vifs[arg-&gt;next_vif].old_ctx = ctx;</div><div class='add'>+		arg-&gt;vifs[arg-&gt;next_vif].new_ctx = ctx;</div><div class='add'>+		arg-&gt;vifs[arg-&gt;next_vif].link_conf = link_conf;</div><div class='add'>+		arg-&gt;next_vif++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_mac_nlwidth_to_wmiwidth(enum nl80211_chan_width width)</div><div class='add'>+{</div><div class='add'>+	switch (width) {</div><div class='add'>+	case NL80211_CHAN_WIDTH_20:</div><div class='add'>+		return WMI_CHAN_WIDTH_20;</div><div class='add'>+	case NL80211_CHAN_WIDTH_40:</div><div class='add'>+		return WMI_CHAN_WIDTH_40;</div><div class='add'>+	case NL80211_CHAN_WIDTH_80:</div><div class='add'>+		return WMI_CHAN_WIDTH_80;</div><div class='add'>+	case NL80211_CHAN_WIDTH_160:</div><div class='add'>+		return WMI_CHAN_WIDTH_160;</div><div class='add'>+	case NL80211_CHAN_WIDTH_80P80:</div><div class='add'>+		return WMI_CHAN_WIDTH_80P80;</div><div class='add'>+	case NL80211_CHAN_WIDTH_5:</div><div class='add'>+		return WMI_CHAN_WIDTH_5;</div><div class='add'>+	case NL80211_CHAN_WIDTH_10:</div><div class='add'>+		return WMI_CHAN_WIDTH_10;</div><div class='add'>+	case NL80211_CHAN_WIDTH_320:</div><div class='add'>+		return WMI_CHAN_WIDTH_320;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return WMI_CHAN_WIDTH_20;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_update_peer_puncturing_width(struct ath12k *ar,</div><div class='add'>+						   struct ath12k_link_vif *arvif,</div><div class='add'>+						   struct cfg80211_chan_def def)</div><div class='add'>+{</div><div class='add'>+	u32 param_id, param_value;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;ahvif-&gt;vdev_type != WMI_VDEV_TYPE_STA)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	param_id = WMI_PEER_CHWIDTH_PUNCTURE_20MHZ_BITMAP;</div><div class='add'>+	param_value = ath12k_mac_nlwidth_to_wmiwidth(def.width) |</div><div class='add'>+		u32_encode_bits((~def.punctured),</div><div class='add'>+				WMI_PEER_PUNCTURE_BITMAP);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "punctured bitmap %02x width %d vdev %d\n",</div><div class='add'>+		   def.punctured, def.width, arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_set_peer_param(ar, arvif-&gt;bssid,</div><div class='add'>+					arvif-&gt;vdev_id, param_id,</div><div class='add'>+					param_value);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_mac_update_vif_chan(struct ath12k *ar,</div><div class='add'>+			   struct ieee80211_vif_chanctx_switch *vifs,</div><div class='add'>+			   int n_vifs)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_vdev_up_params params = {};</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct ath12k_vif *ahvif;</div><div class='add'>+	u8 link_id;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+	bool monitor_vif = false;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n_vifs; i++) {</div><div class='add'>+		vif = vifs[i].vif;</div><div class='add'>+		ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+		link_conf = vifs[i].link_conf;</div><div class='add'>+		link_id = link_conf-&gt;link_id;</div><div class='add'>+		arvif = wiphy_dereference(ath12k_ar_to_hw(ar)-&gt;wiphy,</div><div class='add'>+					  ahvif-&gt;link[link_id]);</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_MONITOR) {</div><div class='add'>+			monitor_vif = true;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_MAC,</div><div class='add'>+			   "mac chanctx switch vdev_id %i freq %u-&gt;%u width %d-&gt;%d\n",</div><div class='add'>+			   arvif-&gt;vdev_id,</div><div class='add'>+			   vifs[i].old_ctx-&gt;def.chan-&gt;center_freq,</div><div class='add'>+			   vifs[i].new_ctx-&gt;def.chan-&gt;center_freq,</div><div class='add'>+			   vifs[i].old_ctx-&gt;def.width,</div><div class='add'>+			   vifs[i].new_ctx-&gt;def.width);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!arvif-&gt;is_started))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		arvif-&gt;punct_bitmap = vifs[i].new_ctx-&gt;def.punctured;</div><div class='add'>+</div><div class='add'>+		/* Firmware expect vdev_restart only if vdev is up.</div><div class='add'>+		 * If vdev is down then it expect vdev_stop-&gt;vdev_start.</div><div class='add'>+		 */</div><div class='add'>+		if (arvif-&gt;is_up) {</div><div class='add'>+			ret = ath12k_mac_vdev_restart(arvif, vifs[i].new_ctx);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_warn(ab, "failed to restart vdev %d: %d\n",</div><div class='add'>+					    arvif-&gt;vdev_id, ret);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			ret = ath12k_mac_vdev_stop(arvif);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_warn(ab, "failed to stop vdev %d: %d\n",</div><div class='add'>+					    arvif-&gt;vdev_id, ret);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ret = ath12k_mac_vdev_start(arvif, vifs[i].new_ctx);</div><div class='add'>+			if (ret)</div><div class='add'>+				ath12k_warn(ab, "failed to start vdev %d: %d\n",</div><div class='add'>+					    arvif-&gt;vdev_id, ret);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ath12k_mac_update_peer_puncturing_width(arvif-&gt;ar, arvif,</div><div class='add'>+							      vifs[i].new_ctx-&gt;def);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "failed to update puncturing bitmap %02x and width %d: %d\n",</div><div class='add'>+				    vifs[i].new_ctx-&gt;def.punctured,</div><div class='add'>+				    vifs[i].new_ctx-&gt;def.width, ret);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Defer VDEV bring-up during CSA to avoid installing stale</div><div class='add'>+		 * beacon templates. The beacon content is updated only</div><div class='add'>+		 * after CSA finalize, so we mark CSA in progress and skip</div><div class='add'>+		 * VDEV_UP for now. It will be handled later in</div><div class='add'>+		 * bss_info_changed().</div><div class='add'>+		 */</div><div class='add'>+		if (link_conf-&gt;csa_active &amp;&amp;</div><div class='add'>+		    arvif-&gt;ahvif-&gt;vdev_type == WMI_VDEV_TYPE_AP) {</div><div class='add'>+			arvif-&gt;is_csa_in_progress = true;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ath12k_mac_setup_bcn_tmpl(arvif);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ab, "failed to update bcn tmpl during csa: %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+</div><div class='add'>+		memset(&amp;params, 0, sizeof(params));</div><div class='add'>+		params.vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+		params.aid = ahvif-&gt;aid;</div><div class='add'>+		params.bssid = arvif-&gt;bssid;</div><div class='add'>+		params.tx_bssid = ath12k_mac_get_tx_bssid(arvif);</div><div class='add'>+		if (params.tx_bssid) {</div><div class='add'>+			params.nontx_profile_idx = link_conf-&gt;bssid_index;</div><div class='add'>+			params.nontx_profile_cnt = 1 &lt;&lt; link_conf-&gt;bssid_indicator;</div><div class='add'>+		}</div><div class='add'>+		ret = ath12k_wmi_vdev_up(arvif-&gt;ar, &amp;params);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to bring vdev up %d: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Restart the internal monitor vdev on new channel */</div><div class='add'>+	if (!monitor_vif &amp;&amp; ar-&gt;monitor_vdev_created) {</div><div class='add'>+		if (!ath12k_mac_monitor_stop(ar))</div><div class='add'>+			ath12k_mac_monitor_start(ar);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_mac_update_active_vif_chan(struct ath12k *ar,</div><div class='add'>+				  struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_mac_change_chanctx_arg arg = { .ctx = ctx, .ar = ar };</div><div class='add'>+	struct ieee80211_hw *hw = ath12k_ar_to_hw(ar);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_atomic(hw,</div><div class='add'>+						   IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						   ath12k_mac_change_chanctx_cnt_iter,</div><div class='add'>+						   &amp;arg);</div><div class='add'>+	if (arg.n_vifs == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	arg.vifs = kcalloc(arg.n_vifs, sizeof(arg.vifs[0]), GFP_KERNEL);</div><div class='add'>+	if (!arg.vifs)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_atomic(hw,</div><div class='add'>+						   IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						   ath12k_mac_change_chanctx_fill_iter,</div><div class='add'>+						   &amp;arg);</div><div class='add'>+</div><div class='add'>+	ath12k_mac_update_vif_chan(ar, arg.vifs, arg.n_vifs);</div><div class='add'>+</div><div class='add'>+	kfree(arg.vifs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_op_change_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+					 struct ieee80211_chanctx_conf *ctx,</div><div class='add'>+					 u32 changed)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ar = ath12k_get_ar_by_ctx(hw, ctx);</div><div class='add'>+	if (!ar)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ab = ar-&gt;ab;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "mac chanctx change freq %u width %d ptr %p changed %x\n",</div><div class='add'>+		   ctx-&gt;def.chan-&gt;center_freq, ctx-&gt;def.width, ctx, changed);</div><div class='add'>+</div><div class='add'>+	/* This shouldn't really happen because channel switching should use</div><div class='add'>+	 * switch_vif_chanctx().</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON(changed &amp; IEEE80211_CHANCTX_CHANGE_CHANNEL))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (changed &amp; IEEE80211_CHANCTX_CHANGE_WIDTH ||</div><div class='add'>+	    changed &amp; IEEE80211_CHANCTX_CHANGE_RADAR ||</div><div class='add'>+	    changed &amp; IEEE80211_CHANCTX_CHANGE_PUNCTURING)</div><div class='add'>+		ath12k_mac_update_active_vif_chan(ar, ctx);</div><div class='add'>+</div><div class='add'>+	/* TODO: Recalc radar detection */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_start_vdev_delay(struct ath12k *ar,</div><div class='add'>+				   struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+	struct ieee80211_chanctx_conf *chanctx;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(arvif-&gt;is_started))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	link_conf = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+	if (!link_conf) {</div><div class='add'>+		ath12k_warn(ab, "failed to get link conf for vdev %u\n", arvif-&gt;vdev_id);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chanctx	= wiphy_dereference(ath12k_ar_to_hw(arvif-&gt;ar)-&gt;wiphy,</div><div class='add'>+				    link_conf-&gt;chanctx_conf);</div><div class='add'>+	ret = ath12k_mac_vdev_start(arvif, chanctx);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to start vdev %i addr %pM on freq %d: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, vif-&gt;addr,</div><div class='add'>+			    chanctx-&gt;def.chan-&gt;center_freq, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ahvif-&gt;vdev_type == WMI_VDEV_TYPE_MONITOR) {</div><div class='add'>+		ret = ath12k_monitor_vdev_up(ar, arvif-&gt;vdev_id);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed put monitor up: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arvif-&gt;is_started = true;</div><div class='add'>+</div><div class='add'>+	/* TODO: Setup ps and cts/rts protection */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_mac_get_num_pwr_levels(struct cfg80211_chan_def *chan_def)</div><div class='add'>+{</div><div class='add'>+	if (chan_def-&gt;chan-&gt;flags &amp; IEEE80211_CHAN_PSD) {</div><div class='add'>+		switch (chan_def-&gt;width) {</div><div class='add'>+		case NL80211_CHAN_WIDTH_20:</div><div class='add'>+			return 1;</div><div class='add'>+		case NL80211_CHAN_WIDTH_40:</div><div class='add'>+			return 2;</div><div class='add'>+		case NL80211_CHAN_WIDTH_80:</div><div class='add'>+			return 4;</div><div class='add'>+		case NL80211_CHAN_WIDTH_160:</div><div class='add'>+			return 8;</div><div class='add'>+		case NL80211_CHAN_WIDTH_320:</div><div class='add'>+			return 16;</div><div class='add'>+		default:</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		switch (chan_def-&gt;width) {</div><div class='add'>+		case NL80211_CHAN_WIDTH_20:</div><div class='add'>+			return 1;</div><div class='add'>+		case NL80211_CHAN_WIDTH_40:</div><div class='add'>+			return 2;</div><div class='add'>+		case NL80211_CHAN_WIDTH_80:</div><div class='add'>+			return 3;</div><div class='add'>+		case NL80211_CHAN_WIDTH_160:</div><div class='add'>+			return 4;</div><div class='add'>+		case NL80211_CHAN_WIDTH_320:</div><div class='add'>+			return 5;</div><div class='add'>+		default:</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath12k_mac_get_6ghz_start_frequency(struct cfg80211_chan_def *chan_def)</div><div class='add'>+{</div><div class='add'>+	u16 diff_seq;</div><div class='add'>+</div><div class='add'>+	/* It is to get the lowest channel number's center frequency of the chan.</div><div class='add'>+	 * For example,</div><div class='add'>+	 * bandwidth=40 MHz, center frequency is 5965, lowest channel is 1</div><div class='add'>+	 * with center frequency 5955, its diff is 5965 - 5955 = 10.</div><div class='add'>+	 * bandwidth=80 MHz, center frequency is 5985, lowest channel is 1</div><div class='add'>+	 * with center frequency 5955, its diff is 5985 - 5955 = 30.</div><div class='add'>+	 * bandwidth=160 MHz, center frequency is 6025, lowest channel is 1</div><div class='add'>+	 * with center frequency 5955, its diff is 6025 - 5955 = 70.</div><div class='add'>+	 * bandwidth=320 MHz, center frequency is 6105, lowest channel is 1</div><div class='add'>+	 * with center frequency 5955, its diff is 6105 - 5955 = 70.</div><div class='add'>+	 */</div><div class='add'>+	switch (chan_def-&gt;width) {</div><div class='add'>+	case NL80211_CHAN_WIDTH_320:</div><div class='add'>+		diff_seq = 150;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_160:</div><div class='add'>+		diff_seq = 70;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_80:</div><div class='add'>+		diff_seq = 30;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_40:</div><div class='add'>+		diff_seq = 10;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		diff_seq = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return chan_def-&gt;center_freq1 - diff_seq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath12k_mac_get_seg_freq(struct cfg80211_chan_def *chan_def,</div><div class='add'>+				   u16 start_seq, u8 seq)</div><div class='add'>+{</div><div class='add'>+	u16 seg_seq;</div><div class='add'>+</div><div class='add'>+	/* It is to get the center frequency of the specific bandwidth.</div><div class='add'>+	 * start_seq means the lowest channel number's center frequency.</div><div class='add'>+	 * seq 0/1/2/3 means 20 MHz/40 MHz/80 MHz/160 MHz.</div><div class='add'>+	 * For example,</div><div class='add'>+	 * lowest channel is 1, its center frequency 5955,</div><div class='add'>+	 * center frequency is 5955 when bandwidth=20 MHz, its diff is 5955 - 5955 = 0.</div><div class='add'>+	 * lowest channel is 1, its center frequency 5955,</div><div class='add'>+	 * center frequency is 5965 when bandwidth=40 MHz, its diff is 5965 - 5955 = 10.</div><div class='add'>+	 * lowest channel is 1, its center frequency 5955,</div><div class='add'>+	 * center frequency is 5985 when bandwidth=80 MHz, its diff is 5985 - 5955 = 30.</div><div class='add'>+	 * lowest channel is 1, its center frequency 5955,</div><div class='add'>+	 * center frequency is 6025 when bandwidth=160 MHz, its diff is 6025 - 5955 = 70.</div><div class='add'>+	 */</div><div class='add'>+	seg_seq = 10 * (BIT(seq) - 1);</div><div class='add'>+	return seg_seq + start_seq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_get_psd_channel(struct ath12k *ar,</div><div class='add'>+				       u16 step_freq,</div><div class='add'>+				       u16 *start_freq,</div><div class='add'>+				       u16 *center_freq,</div><div class='add'>+				       u8 i,</div><div class='add'>+				       struct ieee80211_channel **temp_chan,</div><div class='add'>+				       s8 *tx_power)</div><div class='add'>+{</div><div class='add'>+	/* It is to get the center frequency for each 20 MHz.</div><div class='add'>+	 * For example, if the chan is 160 MHz and center frequency is 6025,</div><div class='add'>+	 * then it include 8 channels, they are 1/5/9/13/17/21/25/29,</div><div class='add'>+	 * channel number 1's center frequency is 5955, it is parameter start_freq.</div><div class='add'>+	 * parameter i is the step of the 8 channels. i is 0~7 for the 8 channels.</div><div class='add'>+	 * the channel 1/5/9/13/17/21/25/29 maps i=0/1/2/3/4/5/6/7,</div><div class='add'>+	 * and maps its center frequency is 5955/5975/5995/6015/6035/6055/6075/6095,</div><div class='add'>+	 * the gap is 20 for each channel, parameter step_freq means the gap.</div><div class='add'>+	 * after get the center frequency of each channel, it is easy to find the</div><div class='add'>+	 * struct ieee80211_channel of it and get the max_reg_power.</div><div class='add'>+	 */</div><div class='add'>+	*center_freq = *start_freq + i * step_freq;</div><div class='add'>+	*temp_chan = ieee80211_get_channel(ar-&gt;ah-&gt;hw-&gt;wiphy, *center_freq);</div><div class='add'>+	*tx_power = (*temp_chan)-&gt;max_reg_power;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_get_eirp_power(struct ath12k *ar,</div><div class='add'>+				      u16 *start_freq,</div><div class='add'>+				      u16 *center_freq,</div><div class='add'>+				      u8 i,</div><div class='add'>+				      struct ieee80211_channel **temp_chan,</div><div class='add'>+				      struct cfg80211_chan_def *def,</div><div class='add'>+				      s8 *tx_power)</div><div class='add'>+{</div><div class='add'>+	/* It is to get the center frequency for 20 MHz/40 MHz/80 MHz/</div><div class='add'>+	 * 160 MHz bandwidth, and then plus 10 to the center frequency,</div><div class='add'>+	 * it is the center frequency of a channel number.</div><div class='add'>+	 * For example, when configured channel number is 1.</div><div class='add'>+	 * center frequency is 5965 when bandwidth=40 MHz, after plus 10, it is 5975,</div><div class='add'>+	 * then it is channel number 5.</div><div class='add'>+	 * center frequency is 5985 when bandwidth=80 MHz, after plus 10, it is 5995,</div><div class='add'>+	 * then it is channel number 9.</div><div class='add'>+	 * center frequency is 6025 when bandwidth=160 MHz, after plus 10, it is 6035,</div><div class='add'>+	 * then it is channel number 17.</div><div class='add'>+	 * after get the center frequency of each channel, it is easy to find the</div><div class='add'>+	 * struct ieee80211_channel of it and get the max_reg_power.</div><div class='add'>+	 */</div><div class='add'>+	*center_freq = ath12k_mac_get_seg_freq(def, *start_freq, i);</div><div class='add'>+</div><div class='add'>+	/* For the 20 MHz, its center frequency is same with same channel */</div><div class='add'>+	if (i != 0)</div><div class='add'>+		*center_freq += 10;</div><div class='add'>+</div><div class='add'>+	*temp_chan = ieee80211_get_channel(ar-&gt;ah-&gt;hw-&gt;wiphy, *center_freq);</div><div class='add'>+	*tx_power = (*temp_chan)-&gt;max_reg_power;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_mac_fill_reg_tpc_info(struct ath12k *ar,</div><div class='add'>+				  struct ath12k_link_vif *arvif,</div><div class='add'>+				  struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_reg_tpc_power_info *reg_tpc_info = &amp;arvif-&gt;reg_tpc_info;</div><div class='add'>+	struct ieee80211_bss_conf *bss_conf = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+	struct ieee80211_channel *chan, *temp_chan;</div><div class='add'>+	u8 pwr_lvl_idx, num_pwr_levels, pwr_reduction;</div><div class='add'>+	bool is_psd_power = false, is_tpe_present = false;</div><div class='add'>+	s8 max_tx_power[ATH12K_NUM_PWR_LEVELS], psd_power, tx_power;</div><div class='add'>+	s8 eirp_power = 0;</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	u16 start_freq, center_freq;</div><div class='add'>+	u8 reg_6ghz_power_mode;</div><div class='add'>+</div><div class='add'>+	chan = ctx-&gt;def.chan;</div><div class='add'>+	start_freq = ath12k_mac_get_6ghz_start_frequency(&amp;ctx-&gt;def);</div><div class='add'>+	pwr_reduction = bss_conf-&gt;pwr_reduction;</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;reg_tpc_info.num_pwr_levels) {</div><div class='add'>+		is_tpe_present = true;</div><div class='add'>+		num_pwr_levels = arvif-&gt;reg_tpc_info.num_pwr_levels;</div><div class='add'>+	} else {</div><div class='add'>+		num_pwr_levels = ath12k_mac_get_num_pwr_levels(&amp;ctx-&gt;def);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (pwr_lvl_idx = 0; pwr_lvl_idx &lt; num_pwr_levels; pwr_lvl_idx++) {</div><div class='add'>+		/* STA received TPE IE*/</div><div class='add'>+		if (is_tpe_present) {</div><div class='add'>+			/* local power is PSD power*/</div><div class='add'>+			if (chan-&gt;flags &amp; IEEE80211_CHAN_PSD) {</div><div class='add'>+				/* Connecting AP is psd power */</div><div class='add'>+				if (reg_tpc_info-&gt;is_psd_power) {</div><div class='add'>+					is_psd_power = true;</div><div class='add'>+					ath12k_mac_get_psd_channel(ar, 20,</div><div class='add'>+								   &amp;start_freq,</div><div class='add'>+								   &amp;center_freq,</div><div class='add'>+								   pwr_lvl_idx,</div><div class='add'>+								   &amp;temp_chan,</div><div class='add'>+								   &amp;tx_power);</div><div class='add'>+					psd_power = temp_chan-&gt;psd;</div><div class='add'>+					eirp_power = tx_power;</div><div class='add'>+					max_tx_power[pwr_lvl_idx] =</div><div class='add'>+						min_t(s8,</div><div class='add'>+						      psd_power,</div><div class='add'>+						      reg_tpc_info-&gt;tpe[pwr_lvl_idx]);</div><div class='add'>+				/* Connecting AP is not psd power */</div><div class='add'>+				} else {</div><div class='add'>+					ath12k_mac_get_eirp_power(ar,</div><div class='add'>+								  &amp;start_freq,</div><div class='add'>+								  &amp;center_freq,</div><div class='add'>+								  pwr_lvl_idx,</div><div class='add'>+								  &amp;temp_chan,</div><div class='add'>+								  &amp;ctx-&gt;def,</div><div class='add'>+								  &amp;tx_power);</div><div class='add'>+					psd_power = temp_chan-&gt;psd;</div><div class='add'>+					/* convert psd power to EIRP power based</div><div class='add'>+					 * on channel width</div><div class='add'>+					 */</div><div class='add'>+					tx_power =</div><div class='add'>+						min_t(s8, tx_power,</div><div class='add'>+						      psd_power + 13 + pwr_lvl_idx * 3);</div><div class='add'>+					max_tx_power[pwr_lvl_idx] =</div><div class='add'>+						min_t(s8,</div><div class='add'>+						      tx_power,</div><div class='add'>+						      reg_tpc_info-&gt;tpe[pwr_lvl_idx]);</div><div class='add'>+				}</div><div class='add'>+			/* local power is not PSD power */</div><div class='add'>+			} else {</div><div class='add'>+				/* Connecting AP is psd power */</div><div class='add'>+				if (reg_tpc_info-&gt;is_psd_power) {</div><div class='add'>+					is_psd_power = true;</div><div class='add'>+					ath12k_mac_get_psd_channel(ar, 20,</div><div class='add'>+								   &amp;start_freq,</div><div class='add'>+								   &amp;center_freq,</div><div class='add'>+								   pwr_lvl_idx,</div><div class='add'>+								   &amp;temp_chan,</div><div class='add'>+								   &amp;tx_power);</div><div class='add'>+					eirp_power = tx_power;</div><div class='add'>+					max_tx_power[pwr_lvl_idx] =</div><div class='add'>+						reg_tpc_info-&gt;tpe[pwr_lvl_idx];</div><div class='add'>+				/* Connecting AP is not psd power */</div><div class='add'>+				} else {</div><div class='add'>+					ath12k_mac_get_eirp_power(ar,</div><div class='add'>+								  &amp;start_freq,</div><div class='add'>+								  &amp;center_freq,</div><div class='add'>+								  pwr_lvl_idx,</div><div class='add'>+								  &amp;temp_chan,</div><div class='add'>+								  &amp;ctx-&gt;def,</div><div class='add'>+								  &amp;tx_power);</div><div class='add'>+					max_tx_power[pwr_lvl_idx] =</div><div class='add'>+						min_t(s8,</div><div class='add'>+						      tx_power,</div><div class='add'>+						      reg_tpc_info-&gt;tpe[pwr_lvl_idx]);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		/* STA not received TPE IE */</div><div class='add'>+		} else {</div><div class='add'>+			/* local power is PSD power*/</div><div class='add'>+			if (chan-&gt;flags &amp; IEEE80211_CHAN_PSD) {</div><div class='add'>+				is_psd_power = true;</div><div class='add'>+				ath12k_mac_get_psd_channel(ar, 20,</div><div class='add'>+							   &amp;start_freq,</div><div class='add'>+							   &amp;center_freq,</div><div class='add'>+							   pwr_lvl_idx,</div><div class='add'>+							   &amp;temp_chan,</div><div class='add'>+							   &amp;tx_power);</div><div class='add'>+				psd_power = temp_chan-&gt;psd;</div><div class='add'>+				eirp_power = tx_power;</div><div class='add'>+				max_tx_power[pwr_lvl_idx] = psd_power;</div><div class='add'>+			} else {</div><div class='add'>+				ath12k_mac_get_eirp_power(ar,</div><div class='add'>+							  &amp;start_freq,</div><div class='add'>+							  &amp;center_freq,</div><div class='add'>+							  pwr_lvl_idx,</div><div class='add'>+							  &amp;temp_chan,</div><div class='add'>+							  &amp;ctx-&gt;def,</div><div class='add'>+							  &amp;tx_power);</div><div class='add'>+				max_tx_power[pwr_lvl_idx] = tx_power;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (is_psd_power) {</div><div class='add'>+			/* If AP local power constraint is present */</div><div class='add'>+			if (pwr_reduction)</div><div class='add'>+				eirp_power = eirp_power - pwr_reduction;</div><div class='add'>+</div><div class='add'>+			/* If firmware updated max tx power is non zero, then take</div><div class='add'>+			 * the min of firmware updated ap tx power</div><div class='add'>+			 * and max power derived from above mentioned parameters.</div><div class='add'>+			 */</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_MAC,</div><div class='add'>+				   "eirp power : %d firmware report power : %d\n",</div><div class='add'>+				   eirp_power, ar-&gt;max_allowed_tx_power);</div><div class='add'>+			/* Firmware reports lower max_allowed_tx_power during vdev</div><div class='add'>+			 * start response. In case of 6 GHz, firmware is not aware</div><div class='add'>+			 * of EIRP power unless driver sets EIRP power through WMI</div><div class='add'>+			 * TPC command. So radio which does not support idle power</div><div class='add'>+			 * save can set maximum calculated EIRP power directly to</div><div class='add'>+			 * firmware through TPC command without min comparison with</div><div class='add'>+			 * vdev start response's max_allowed_tx_power.</div><div class='add'>+			 */</div><div class='add'>+			if (ar-&gt;max_allowed_tx_power &amp;&amp; ab-&gt;hw_params-&gt;idle_ps)</div><div class='add'>+				eirp_power = min_t(s8,</div><div class='add'>+						   eirp_power,</div><div class='add'>+						   ar-&gt;max_allowed_tx_power);</div><div class='add'>+		} else {</div><div class='add'>+			/* If AP local power constraint is present */</div><div class='add'>+			if (pwr_reduction)</div><div class='add'>+				max_tx_power[pwr_lvl_idx] =</div><div class='add'>+					max_tx_power[pwr_lvl_idx] - pwr_reduction;</div><div class='add'>+			/* If firmware updated max tx power is non zero, then take</div><div class='add'>+			 * the min of firmware updated ap tx power</div><div class='add'>+			 * and max power derived from above mentioned parameters.</div><div class='add'>+			 */</div><div class='add'>+			if (ar-&gt;max_allowed_tx_power &amp;&amp; ab-&gt;hw_params-&gt;idle_ps)</div><div class='add'>+				max_tx_power[pwr_lvl_idx] =</div><div class='add'>+					min_t(s8,</div><div class='add'>+					      max_tx_power[pwr_lvl_idx],</div><div class='add'>+					      ar-&gt;max_allowed_tx_power);</div><div class='add'>+		}</div><div class='add'>+		reg_tpc_info-&gt;chan_power_info[pwr_lvl_idx].chan_cfreq = center_freq;</div><div class='add'>+		reg_tpc_info-&gt;chan_power_info[pwr_lvl_idx].tx_power =</div><div class='add'>+			max_tx_power[pwr_lvl_idx];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg_tpc_info-&gt;num_pwr_levels = num_pwr_levels;</div><div class='add'>+	reg_tpc_info-&gt;is_psd_power = is_psd_power;</div><div class='add'>+	reg_tpc_info-&gt;eirp_power = eirp_power;</div><div class='add'>+	if (ahvif-&gt;vdev_type == WMI_VDEV_TYPE_STA)</div><div class='add'>+		reg_6ghz_power_mode = bss_conf-&gt;power_type;</div><div class='add'>+	else</div><div class='add'>+		/* For now, LPI is the only supported AP power mode */</div><div class='add'>+		reg_6ghz_power_mode = IEEE80211_REG_LPI_AP;</div><div class='add'>+</div><div class='add'>+	reg_tpc_info-&gt;ap_power_type =</div><div class='add'>+		ath12k_reg_ap_pwr_convert(reg_6ghz_power_mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_parse_tx_pwr_env(struct ath12k *ar,</div><div class='add'>+					struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_bss_conf *bss_conf = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+	struct ath12k_reg_tpc_power_info *tpc_info = &amp;arvif-&gt;reg_tpc_info;</div><div class='add'>+	struct ieee80211_parsed_tpe_eirp *local_non_psd, *reg_non_psd;</div><div class='add'>+	struct ieee80211_parsed_tpe_psd *local_psd, *reg_psd;</div><div class='add'>+	struct ieee80211_parsed_tpe *tpe = &amp;bss_conf-&gt;tpe;</div><div class='add'>+	enum wmi_reg_6g_client_type client_type;</div><div class='add'>+	struct ath12k_reg_info *reg_info;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	bool psd_valid, non_psd_valid;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	reg_info = ab-&gt;reg_info[ar-&gt;pdev_idx];</div><div class='add'>+	client_type = reg_info-&gt;client_type;</div><div class='add'>+</div><div class='add'>+	local_psd = &amp;tpe-&gt;psd_local[client_type];</div><div class='add'>+	reg_psd = &amp;tpe-&gt;psd_reg_client[client_type];</div><div class='add'>+	local_non_psd = &amp;tpe-&gt;max_local[client_type];</div><div class='add'>+	reg_non_psd = &amp;tpe-&gt;max_reg_client[client_type];</div><div class='add'>+</div><div class='add'>+	psd_valid = local_psd-&gt;valid | reg_psd-&gt;valid;</div><div class='add'>+	non_psd_valid = local_non_psd-&gt;valid | reg_non_psd-&gt;valid;</div><div class='add'>+</div><div class='add'>+	if (!psd_valid &amp;&amp; !non_psd_valid) {</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "no transmit power envelope match client power type %d\n",</div><div class='add'>+			    client_type);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (psd_valid) {</div><div class='add'>+		tpc_info-&gt;is_psd_power = true;</div><div class='add'>+</div><div class='add'>+		tpc_info-&gt;num_pwr_levels = max(local_psd-&gt;count,</div><div class='add'>+					       reg_psd-&gt;count);</div><div class='add'>+		tpc_info-&gt;num_pwr_levels =</div><div class='add'>+				min3(tpc_info-&gt;num_pwr_levels,</div><div class='add'>+				     IEEE80211_TPE_PSD_ENTRIES_320MHZ,</div><div class='add'>+				     ATH12K_NUM_PWR_LEVELS);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; tpc_info-&gt;num_pwr_levels; i++) {</div><div class='add'>+			tpc_info-&gt;tpe[i] = min(local_psd-&gt;power[i],</div><div class='add'>+					       reg_psd-&gt;power[i]) / 2;</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_MAC,</div><div class='add'>+				   "TPE PSD power[%d] : %d\n",</div><div class='add'>+				   i, tpc_info-&gt;tpe[i]);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		tpc_info-&gt;is_psd_power = false;</div><div class='add'>+		tpc_info-&gt;eirp_power = 0;</div><div class='add'>+</div><div class='add'>+		tpc_info-&gt;num_pwr_levels = max(local_non_psd-&gt;count,</div><div class='add'>+					       reg_non_psd-&gt;count);</div><div class='add'>+		tpc_info-&gt;num_pwr_levels =</div><div class='add'>+				min3(tpc_info-&gt;num_pwr_levels,</div><div class='add'>+				     IEEE80211_TPE_EIRP_ENTRIES_320MHZ,</div><div class='add'>+				     ATH12K_NUM_PWR_LEVELS);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; tpc_info-&gt;num_pwr_levels; i++) {</div><div class='add'>+			tpc_info-&gt;tpe[i] = min(local_non_psd-&gt;power[i],</div><div class='add'>+					       reg_non_psd-&gt;power[i]) / 2;</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_MAC,</div><div class='add'>+				   "non PSD power[%d] : %d\n",</div><div class='add'>+				   i, tpc_info-&gt;tpe[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				 struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	u8 link_id = link_conf-&gt;link_id;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* For multi radio wiphy, the vdev was not created during add_interface</div><div class='add'>+	 * create now since we have a channel ctx now to assign to a specific ar/fw</div><div class='add'>+	 */</div><div class='add'>+	arvif = ath12k_mac_assign_link_vif(ah, vif, link_id);</div><div class='add'>+	if (!arvif) {</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar = ath12k_mac_assign_vif_to_vdev(hw, arvif, ctx);</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath12k_hw_warn(ah, "failed to assign chanctx for vif %pM link id %u link vif is already started",</div><div class='add'>+			       vif-&gt;addr, link_id);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab = ar-&gt;ab;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "mac chanctx assign ptr %p vdev_id %i\n",</div><div class='add'>+		   ctx, arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	if (ath12k_wmi_supports_6ghz_cc_ext(ar) &amp;&amp;</div><div class='add'>+	    ctx-&gt;def.chan-&gt;band == NL80211_BAND_6GHZ &amp;&amp;</div><div class='add'>+	    ahvif-&gt;vdev_type == WMI_VDEV_TYPE_STA)</div><div class='add'>+		ath12k_mac_parse_tx_pwr_env(ar, arvif);</div><div class='add'>+</div><div class='add'>+	arvif-&gt;punct_bitmap = ctx-&gt;def.punctured;</div><div class='add'>+</div><div class='add'>+	/* for some targets bss peer must be created before vdev_start */</div><div class='add'>+	if (ab-&gt;hw_params-&gt;vdev_start_delay &amp;&amp;</div><div class='add'>+	    ahvif-&gt;vdev_type != WMI_VDEV_TYPE_AP &amp;&amp;</div><div class='add'>+	    ahvif-&gt;vdev_type != WMI_VDEV_TYPE_MONITOR &amp;&amp;</div><div class='add'>+	    !ath12k_peer_exist_by_vdev_id(ab, arvif-&gt;vdev_id)) {</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(arvif-&gt;is_started)) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ahvif-&gt;vdev_type == WMI_VDEV_TYPE_MONITOR) {</div><div class='add'>+		ret = ath12k_mac_monitor_start(ar);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_mac_monitor_vdev_delete(ar);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		arvif-&gt;is_started = true;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_vdev_start(arvif, ctx);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to start vdev %i addr %pM on freq %d: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, vif-&gt;addr,</div><div class='add'>+			    ctx-&gt;def.chan-&gt;center_freq, ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arvif-&gt;is_started = true;</div><div class='add'>+</div><div class='add'>+	/* TODO: Setup ps and cts/rts protection */</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_mac_op_unassign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				   struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	u8 link_id = link_conf-&gt;link_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	arvif = wiphy_dereference(hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+</div><div class='add'>+	/* The vif is expected to be attached to an ar's VDEV.</div><div class='add'>+	 * We leave the vif/vdev in this function as is</div><div class='add'>+	 * and not delete the vdev symmetric to assign_vif_chanctx()</div><div class='add'>+	 * the VDEV will be deleted and unassigned either during</div><div class='add'>+	 * remove_interface() or when there is a change in channel</div><div class='add'>+	 * that moves the vif to a new ar</div><div class='add'>+	 */</div><div class='add'>+	if (!arvif || !arvif-&gt;is_created)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ar = arvif-&gt;ar;</div><div class='add'>+	ab = ar-&gt;ab;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "mac chanctx unassign ptr %p vdev_id %i\n",</div><div class='add'>+		   ctx, arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	WARN_ON(!arvif-&gt;is_started);</div><div class='add'>+</div><div class='add'>+	if (ahvif-&gt;vdev_type == WMI_VDEV_TYPE_MONITOR) {</div><div class='add'>+		ret = ath12k_mac_monitor_stop(ar);</div><div class='add'>+		if (ret)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		arvif-&gt;is_started = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ahvif-&gt;vdev_type != WMI_VDEV_TYPE_STA &amp;&amp;</div><div class='add'>+	    ahvif-&gt;vdev_type != WMI_VDEV_TYPE_MONITOR) {</div><div class='add'>+		ath12k_bss_disassoc(ar, arvif);</div><div class='add'>+		ret = ath12k_mac_vdev_stop(arvif);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ab, "failed to stop vdev %i: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+	}</div><div class='add'>+	arvif-&gt;is_started = false;</div><div class='add'>+</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_11D_OFFLOAD, ab-&gt;wmi_ab.svc_map) &amp;&amp;</div><div class='add'>+	    ahvif-&gt;vdev_type == WMI_VDEV_TYPE_STA &amp;&amp;</div><div class='add'>+	    ahvif-&gt;vdev_subtype == WMI_VDEV_SUBTYPE_NONE &amp;&amp;</div><div class='add'>+	    ar-&gt;state_11d != ATH12K_11D_PREPARING) {</div><div class='add'>+		reinit_completion(&amp;ar-&gt;completed_11d_scan);</div><div class='add'>+		ar-&gt;state_11d = ATH12K_11D_PREPARING;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;scan.arvif == arvif &amp;&amp; ar-&gt;scan.state == ATH12K_SCAN_RUNNING) {</div><div class='add'>+		ath12k_scan_abort(ar);</div><div class='add'>+		ar-&gt;scan.arvif = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_mac_op_switch_vif_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+				 struct ieee80211_vif_chanctx_switch *vifs,</div><div class='add'>+				 int n_vifs,</div><div class='add'>+				 enum ieee80211_chanctx_switch_mode mode)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ar = ath12k_get_ar_by_ctx(hw, vifs-&gt;old_ctx);</div><div class='add'>+	if (!ar)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Switching channels across radio is not allowed */</div><div class='add'>+	if (ar != ath12k_get_ar_by_ctx(hw, vifs-&gt;new_ctx))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "mac chanctx switch n_vifs %d mode %d\n",</div><div class='add'>+		   n_vifs, mode);</div><div class='add'>+	ath12k_mac_update_vif_chan(ar, vifs, n_vifs);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_set_vdev_param_to_all_vifs(struct ath12k *ar, int param, u32 value)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "setting mac vdev %d param %d value %d\n",</div><div class='add'>+			   param, arvif-&gt;vdev_id, value);</div><div class='add'>+</div><div class='add'>+		ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+						    param, value);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to set param %d for vdev %d: %d\n",</div><div class='add'>+				    param, arvif-&gt;vdev_id, ret);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* mac80211 stores device specific RTS/Fragmentation threshold value,</div><div class='add'>+ * this is set interface specific to firmware from ath12k driver</div><div class='add'>+ */</div><div class='add'>+static int ath12k_mac_op_set_rts_threshold(struct ieee80211_hw *hw,</div><div class='add'>+					   int radio_idx, u32 value)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	struct wiphy *wiphy = hw-&gt;wiphy;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int param_id = WMI_VDEV_PARAM_RTS_THRESHOLD;</div><div class='add'>+	int ret = 0, ret_err, i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (radio_idx &gt;= wiphy-&gt;n_radio || radio_idx &lt; -1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (radio_idx != -1) {</div><div class='add'>+		/* Update RTS threshold in specified radio */</div><div class='add'>+		ar = ath12k_ah_to_ar(ah, radio_idx);</div><div class='add'>+		ret = ath12k_set_vdev_param_to_all_vifs(ar, param_id, value);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "failed to set RTS config for all vdevs of pdev %d",</div><div class='add'>+				    ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ar-&gt;rts_threshold = value;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Radio_index passed is -1, so set RTS threshold for all radios. */</div><div class='add'>+	for_each_ar(ah, ar, i) {</div><div class='add'>+		ret = ath12k_set_vdev_param_to_all_vifs(ar, param_id, value);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to set RTS config for all vdevs of pdev %d",</div><div class='add'>+				    ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (!ret) {</div><div class='add'>+		/* Setting new RTS threshold for vdevs of all radios passed, so update</div><div class='add'>+		 * the RTS threshold value for all radios</div><div class='add'>+		 */</div><div class='add'>+		for_each_ar(ah, ar, i)</div><div class='add'>+			ar-&gt;rts_threshold = value;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* RTS threshold config failed, revert to the previous RTS threshold */</div><div class='add'>+	for (i = i - 1; i &gt;= 0; i--) {</div><div class='add'>+		ar = ath12k_ah_to_ar(ah, i);</div><div class='add'>+		ret_err = ath12k_set_vdev_param_to_all_vifs(ar, param_id,</div><div class='add'>+							    ar-&gt;rts_threshold);</div><div class='add'>+		if (ret_err)</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "failed to restore RTS threshold for all vdevs of pdev %d",</div><div class='add'>+				    ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_op_set_frag_threshold(struct ieee80211_hw *hw,</div><div class='add'>+					    int radio_idx, u32 value)</div><div class='add'>+{</div><div class='add'>+	/* Even though there's a WMI vdev param for fragmentation threshold no</div><div class='add'>+	 * known firmware actually implements it. Moreover it is not possible to</div><div class='add'>+	 * rely frame fragmentation to mac80211 because firmware clears the</div><div class='add'>+	 * "more fragments" bit in frame control making it impossible for remote</div><div class='add'>+	 * devices to reassemble frames.</div><div class='add'>+	 *</div><div class='add'>+	 * Hence implement a dummy callback just to say fragmentation isn't</div><div class='add'>+	 * supported. This effectively prevents mac80211 from doing frame</div><div class='add'>+	 * fragmentation in software.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_flush(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	long time_left;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	time_left = wait_event_timeout(ar-&gt;dp.tx_empty_waitq,</div><div class='add'>+				       (atomic_read(&amp;ar-&gt;dp.num_tx_pending) == 0),</div><div class='add'>+				       ATH12K_FLUSH_TIMEOUT);</div><div class='add'>+	if (time_left == 0) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to flush transmit queue, data pkts pending %d\n",</div><div class='add'>+			    atomic_read(&amp;ar-&gt;dp.num_tx_pending));</div><div class='add'>+		ret = -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	time_left = wait_event_timeout(ar-&gt;txmgmt_empty_waitq,</div><div class='add'>+				       (atomic_read(&amp;ar-&gt;num_pending_mgmt_tx) == 0),</div><div class='add'>+				       ATH12K_FLUSH_TIMEOUT);</div><div class='add'>+	if (time_left == 0) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to flush mgmt transmit queue, mgmt pkts pending %d\n",</div><div class='add'>+			    atomic_read(&amp;ar-&gt;num_pending_mgmt_tx));</div><div class='add'>+		ret = -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_mac_wait_tx_complete(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ath12k_mac_drain_tx(ar);</div><div class='add'>+	return ath12k_mac_flush(ar);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_op_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+				u32 queues, bool drop)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k_vif *ahvif;</div><div class='add'>+	unsigned long links;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	u8 link_id;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (drop)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* vif can be NULL when flush() is considered for hw */</div><div class='add'>+	if (!vif) {</div><div class='add'>+		for_each_ar(ah, ar, i)</div><div class='add'>+			ath12k_mac_flush(ar);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_ar(ah, ar, i)</div><div class='add'>+		wiphy_work_flush(hw-&gt;wiphy, &amp;ar-&gt;wmi_mgmt_tx_work);</div><div class='add'>+</div><div class='add'>+	ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	links = ahvif-&gt;links_map;</div><div class='add'>+	for_each_set_bit(link_id, &amp;links, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		arvif = wiphy_dereference(hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+		if (!(arvif &amp;&amp; arvif-&gt;ar))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ath12k_mac_flush(arvif-&gt;ar);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_mac_bitrate_mask_num_ht_rates(struct ath12k *ar,</div><div class='add'>+				     enum nl80211_band band,</div><div class='add'>+				     const struct cfg80211_bitrate_mask *mask)</div><div class='add'>+{</div><div class='add'>+	int num_rates = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mask-&gt;control[band].ht_mcs); i++)</div><div class='add'>+		num_rates += hweight16(mask-&gt;control[band].ht_mcs[i]);</div><div class='add'>+</div><div class='add'>+	return num_rates;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+ath12k_mac_has_single_legacy_rate(struct ath12k *ar,</div><div class='add'>+				  enum nl80211_band band,</div><div class='add'>+				  const struct cfg80211_bitrate_mask *mask)</div><div class='add'>+{</div><div class='add'>+	int num_rates = 0;</div><div class='add'>+</div><div class='add'>+	num_rates = hweight32(mask-&gt;control[band].legacy);</div><div class='add'>+</div><div class='add'>+	if (ath12k_mac_bitrate_mask_num_ht_rates(ar, band, mask))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (ath12k_mac_bitrate_mask_num_vht_rates(ar, band, mask))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (ath12k_mac_bitrate_mask_num_he_rates(ar, band, mask))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (ath12k_mac_bitrate_mask_num_eht_rates(ar, band, mask))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return num_rates == 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __le16</div><div class='add'>+ath12k_mac_get_tx_mcs_map(const struct ieee80211_sta_he_cap *he_cap)</div><div class='add'>+{</div><div class='add'>+	if (he_cap-&gt;he_cap_elem.phy_cap_info[0] &amp;</div><div class='add'>+	    IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G)</div><div class='add'>+		return he_cap-&gt;he_mcs_nss_supp.tx_mcs_160;</div><div class='add'>+</div><div class='add'>+	return he_cap-&gt;he_mcs_nss_supp.tx_mcs_80;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+ath12k_mac_bitrate_mask_get_single_nss(struct ath12k *ar,</div><div class='add'>+				       struct ieee80211_vif *vif,</div><div class='add'>+				       enum nl80211_band band,</div><div class='add'>+				       const struct cfg80211_bitrate_mask *mask,</div><div class='add'>+				       int *nss)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_supported_band *sband = &amp;ar-&gt;mac.sbands[band];</div><div class='add'>+	u16 vht_mcs_map = le16_to_cpu(sband-&gt;vht_cap.vht_mcs.tx_mcs_map);</div><div class='add'>+	const struct ieee80211_sband_iftype_data *data;</div><div class='add'>+	const struct ieee80211_sta_he_cap *he_cap;</div><div class='add'>+	u16 he_mcs_map = 0;</div><div class='add'>+	u16 eht_mcs_map = 0;</div><div class='add'>+	u8 ht_nss_mask = 0;</div><div class='add'>+	u8 vht_nss_mask = 0;</div><div class='add'>+	u8 he_nss_mask = 0;</div><div class='add'>+	u8 eht_nss_mask = 0;</div><div class='add'>+	u8 mcs_nss_len;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* No need to consider legacy here. Basic rates are always present</div><div class='add'>+	 * in bitrate mask</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mask-&gt;control[band].ht_mcs); i++) {</div><div class='add'>+		if (mask-&gt;control[band].ht_mcs[i] == 0)</div><div class='add'>+			continue;</div><div class='add'>+		else if (mask-&gt;control[band].ht_mcs[i] ==</div><div class='add'>+			 sband-&gt;ht_cap.mcs.rx_mask[i])</div><div class='add'>+			ht_nss_mask |= BIT(i);</div><div class='add'>+		else</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mask-&gt;control[band].vht_mcs); i++) {</div><div class='add'>+		if (mask-&gt;control[band].vht_mcs[i] == 0)</div><div class='add'>+			continue;</div><div class='add'>+		else if (mask-&gt;control[band].vht_mcs[i] ==</div><div class='add'>+			 ath12k_mac_get_max_vht_mcs_map(vht_mcs_map, i))</div><div class='add'>+			vht_nss_mask |= BIT(i);</div><div class='add'>+		else</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	he_cap = ieee80211_get_he_iftype_cap_vif(sband, vif);</div><div class='add'>+	if (!he_cap)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	he_mcs_map = le16_to_cpu(ath12k_mac_get_tx_mcs_map(he_cap));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mask-&gt;control[band].he_mcs); i++) {</div><div class='add'>+		if (mask-&gt;control[band].he_mcs[i] == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (mask-&gt;control[band].he_mcs[i] ==</div><div class='add'>+		    ath12k_mac_get_max_he_mcs_map(he_mcs_map, i))</div><div class='add'>+			he_nss_mask |= BIT(i);</div><div class='add'>+		else</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data = ieee80211_get_sband_iftype_data(sband, vif-&gt;type);</div><div class='add'>+</div><div class='add'>+	mcs_nss_len = ieee80211_eht_mcs_nss_size(&amp;data-&gt;he_cap.he_cap_elem,</div><div class='add'>+						 &amp;data-&gt;eht_cap.eht_cap_elem,</div><div class='add'>+						 false);</div><div class='add'>+	if (mcs_nss_len == 4) {</div><div class='add'>+		/* 20 MHz only STA case */</div><div class='add'>+		const struct ieee80211_eht_mcs_nss_supp_20mhz_only *eht_mcs_nss =</div><div class='add'>+			&amp;data-&gt;eht_cap.eht_mcs_nss_supp.only_20mhz;</div><div class='add'>+		if (eht_mcs_nss-&gt;rx_tx_mcs13_max_nss)</div><div class='add'>+			eht_mcs_map = 0x1fff;</div><div class='add'>+		else if (eht_mcs_nss-&gt;rx_tx_mcs11_max_nss)</div><div class='add'>+			eht_mcs_map = 0x07ff;</div><div class='add'>+		else if (eht_mcs_nss-&gt;rx_tx_mcs9_max_nss)</div><div class='add'>+			eht_mcs_map = 0x01ff;</div><div class='add'>+		else</div><div class='add'>+			eht_mcs_map = 0x007f;</div><div class='add'>+	} else {</div><div class='add'>+		const struct ieee80211_eht_mcs_nss_supp_bw *eht_mcs_nss;</div><div class='add'>+</div><div class='add'>+		switch (mcs_nss_len) {</div><div class='add'>+		case 9:</div><div class='add'>+			eht_mcs_nss = &amp;data-&gt;eht_cap.eht_mcs_nss_supp.bw._320;</div><div class='add'>+			break;</div><div class='add'>+		case 6:</div><div class='add'>+			eht_mcs_nss = &amp;data-&gt;eht_cap.eht_mcs_nss_supp.bw._160;</div><div class='add'>+			break;</div><div class='add'>+		case 3:</div><div class='add'>+			eht_mcs_nss = &amp;data-&gt;eht_cap.eht_mcs_nss_supp.bw._80;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (eht_mcs_nss-&gt;rx_tx_mcs13_max_nss)</div><div class='add'>+			eht_mcs_map = 0x1fff;</div><div class='add'>+		else if (eht_mcs_nss-&gt;rx_tx_mcs11_max_nss)</div><div class='add'>+			eht_mcs_map = 0x7ff;</div><div class='add'>+		else</div><div class='add'>+			eht_mcs_map = 0x1ff;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mask-&gt;control[band].eht_mcs); i++) {</div><div class='add'>+		if (mask-&gt;control[band].eht_mcs[i] == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (mask-&gt;control[band].eht_mcs[i] &lt; eht_mcs_map)</div><div class='add'>+			eht_nss_mask |= BIT(i);</div><div class='add'>+		else</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ht_nss_mask != vht_nss_mask || ht_nss_mask != he_nss_mask ||</div><div class='add'>+	    ht_nss_mask != eht_nss_mask)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (ht_nss_mask == 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (BIT(fls(ht_nss_mask)) - 1 != ht_nss_mask)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	*nss = fls(ht_nss_mask);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_mac_get_single_legacy_rate(struct ath12k *ar,</div><div class='add'>+				  enum nl80211_band band,</div><div class='add'>+				  const struct cfg80211_bitrate_mask *mask,</div><div class='add'>+				  u32 *rate, u8 *nss)</div><div class='add'>+{</div><div class='add'>+	int rate_idx;</div><div class='add'>+	u16 bitrate;</div><div class='add'>+	u8 preamble;</div><div class='add'>+	u8 hw_rate;</div><div class='add'>+</div><div class='add'>+	if (hweight32(mask-&gt;control[band].legacy) != 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rate_idx = ffs(mask-&gt;control[band].legacy) - 1;</div><div class='add'>+</div><div class='add'>+	if (band == NL80211_BAND_5GHZ || band == NL80211_BAND_6GHZ)</div><div class='add'>+		rate_idx += ATH12K_MAC_FIRST_OFDM_RATE_IDX;</div><div class='add'>+</div><div class='add'>+	hw_rate = ath12k_legacy_rates[rate_idx].hw_value;</div><div class='add'>+	bitrate = ath12k_legacy_rates[rate_idx].bitrate;</div><div class='add'>+</div><div class='add'>+	if (ath12k_mac_bitrate_is_cck(bitrate))</div><div class='add'>+		preamble = WMI_RATE_PREAMBLE_CCK;</div><div class='add'>+	else</div><div class='add'>+		preamble = WMI_RATE_PREAMBLE_OFDM;</div><div class='add'>+</div><div class='add'>+	*nss = 1;</div><div class='add'>+	*rate = ATH12K_HW_RATE_CODE(hw_rate, 0, preamble);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_mac_set_fixed_rate_gi_ltf(struct ath12k_link_vif *arvif, u8 gi, u8 ltf,</div><div class='add'>+				 u32 param)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* 0.8 = 0, 1.6 = 2 and 3.2 = 3. */</div><div class='add'>+	if (gi &amp;&amp; gi != 0xFF)</div><div class='add'>+		gi += 1;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+					    WMI_VDEV_PARAM_SGI, gi);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set GI:%d, error:%d\n",</div><div class='add'>+			    gi, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (param == WMI_VDEV_PARAM_HE_LTF) {</div><div class='add'>+		/* HE values start from 1 */</div><div class='add'>+		if (ltf != 0xFF)</div><div class='add'>+			ltf += 1;</div><div class='add'>+	} else {</div><div class='add'>+		/* EHT values start from 5 */</div><div class='add'>+		if (ltf != 0xFF)</div><div class='add'>+			ltf += 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+					    param, ltf);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set LTF:%d, error:%d\n",</div><div class='add'>+			    ltf, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_mac_set_auto_rate_gi_ltf(struct ath12k_link_vif *arvif, u16 gi, u8 ltf)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 ar_gi_ltf;</div><div class='add'>+</div><div class='add'>+	if (gi != 0xFF) {</div><div class='add'>+		switch (gi) {</div><div class='add'>+		case ATH12K_RATE_INFO_GI_0_8:</div><div class='add'>+			gi = WMI_AUTORATE_800NS_GI;</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_RATE_INFO_GI_1_6:</div><div class='add'>+			gi = WMI_AUTORATE_1600NS_GI;</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_RATE_INFO_GI_3_2:</div><div class='add'>+			gi = WMI_AUTORATE_3200NS_GI;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "Invalid GI\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ltf != 0xFF) {</div><div class='add'>+		switch (ltf) {</div><div class='add'>+		case ATH12K_RATE_INFO_1XLTF:</div><div class='add'>+			ltf = WMI_AUTORATE_LTF_1X;</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_RATE_INFO_2XLTF:</div><div class='add'>+			ltf = WMI_AUTORATE_LTF_2X;</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_RATE_INFO_4XLTF:</div><div class='add'>+			ltf = WMI_AUTORATE_LTF_4X;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "Invalid LTF\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar_gi_ltf = gi | ltf;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+					    WMI_VDEV_PARAM_AUTORATE_MISC_CFG,</div><div class='add'>+					    ar_gi_ltf);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to set autorate GI:%u, LTF:%u params, error:%d\n",</div><div class='add'>+			    gi, ltf, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_mac_nlgi_to_wmigi(enum nl80211_txrate_gi gi)</div><div class='add'>+{</div><div class='add'>+	switch (gi) {</div><div class='add'>+	case NL80211_TXRATE_DEFAULT_GI:</div><div class='add'>+		return WMI_GI_400_NS;</div><div class='add'>+	case NL80211_TXRATE_FORCE_LGI:</div><div class='add'>+		return WMI_GI_800_NS;</div><div class='add'>+	default:</div><div class='add'>+		return WMI_GI_400_NS;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_set_rate_params(struct ath12k_link_vif *arvif,</div><div class='add'>+				      u32 rate, u8 nss, u8 sgi, u8 ldpc,</div><div class='add'>+				      u8 he_gi, u8 he_ltf, bool he_fixed_rate,</div><div class='add'>+				      u8 eht_gi, u8 eht_ltf,</div><div class='add'>+				      bool eht_fixed_rate)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	bool he_support, eht_support, gi_ltf_set = false;</div><div class='add'>+	u32 vdev_param;</div><div class='add'>+	u32 param_value;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	link_conf = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+	if (!link_conf)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	he_support = link_conf-&gt;he_support;</div><div class='add'>+	eht_support = link_conf-&gt;eht_support;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "mac set rate params vdev %i rate 0x%02x nss 0x%02x sgi 0x%02x ldpc 0x%02x\n",</div><div class='add'>+		   arvif-&gt;vdev_id, rate, nss, sgi, ldpc);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "he_gi 0x%02x he_ltf 0x%02x he_fixed_rate %d\n", he_gi,</div><div class='add'>+		   he_ltf, he_fixed_rate);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "eht_gi 0x%02x eht_ltf 0x%02x eht_fixed_rate %d\n",</div><div class='add'>+		   eht_gi, eht_ltf, eht_fixed_rate);</div><div class='add'>+</div><div class='add'>+	if (!he_support &amp;&amp; !eht_support) {</div><div class='add'>+		vdev_param = WMI_VDEV_PARAM_FIXED_RATE;</div><div class='add'>+		ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+						    vdev_param, rate);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to set fixed rate param 0x%02x: %d\n",</div><div class='add'>+				    rate, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vdev_param = WMI_VDEV_PARAM_NSS;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+					    vdev_param, nss);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set nss param %d: %d\n",</div><div class='add'>+			    nss, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+					    WMI_VDEV_PARAM_LDPC, ldpc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set ldpc param %d: %d\n",</div><div class='add'>+			    ldpc, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (eht_support) {</div><div class='add'>+		if (eht_fixed_rate)</div><div class='add'>+			ret = ath12k_mac_set_fixed_rate_gi_ltf(arvif, eht_gi, eht_ltf,</div><div class='add'>+							       WMI_VDEV_PARAM_EHT_LTF);</div><div class='add'>+		else</div><div class='add'>+			ret = ath12k_mac_set_auto_rate_gi_ltf(arvif, eht_gi, eht_ltf);</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "failed to set EHT LTF/GI params %d/%d: %d\n",</div><div class='add'>+				    eht_gi, eht_ltf, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		gi_ltf_set = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (he_support) {</div><div class='add'>+		if (he_fixed_rate)</div><div class='add'>+			ret = ath12k_mac_set_fixed_rate_gi_ltf(arvif, he_gi, he_ltf,</div><div class='add'>+							       WMI_VDEV_PARAM_HE_LTF);</div><div class='add'>+		else</div><div class='add'>+			ret = ath12k_mac_set_auto_rate_gi_ltf(arvif, he_gi, he_ltf);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		gi_ltf_set = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!gi_ltf_set) {</div><div class='add'>+		vdev_param = WMI_VDEV_PARAM_SGI;</div><div class='add'>+		param_value = ath12k_mac_nlgi_to_wmigi(sgi);</div><div class='add'>+		ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif-&gt;vdev_id,</div><div class='add'>+						    vdev_param, param_value);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to set sgi param %d: %d\n",</div><div class='add'>+				    sgi, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+ath12k_mac_vht_mcs_range_present(struct ath12k *ar,</div><div class='add'>+				 enum nl80211_band band,</div><div class='add'>+				 const struct cfg80211_bitrate_mask *mask)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u16 vht_mcs;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NL80211_VHT_NSS_MAX; i++) {</div><div class='add'>+		vht_mcs = mask-&gt;control[band].vht_mcs[i];</div><div class='add'>+</div><div class='add'>+		switch (vht_mcs) {</div><div class='add'>+		case 0:</div><div class='add'>+		case BIT(8) - 1:</div><div class='add'>+		case BIT(9) - 1:</div><div class='add'>+		case BIT(10) - 1:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+ath12k_mac_he_mcs_range_present(struct ath12k *ar,</div><div class='add'>+				enum nl80211_band band,</div><div class='add'>+				const struct cfg80211_bitrate_mask *mask)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u16 he_mcs;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NL80211_HE_NSS_MAX; i++) {</div><div class='add'>+		he_mcs = mask-&gt;control[band].he_mcs[i];</div><div class='add'>+</div><div class='add'>+		switch (he_mcs) {</div><div class='add'>+		case 0:</div><div class='add'>+		case BIT(8) - 1:</div><div class='add'>+		case BIT(10) - 1:</div><div class='add'>+		case BIT(12) - 1:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+ath12k_mac_eht_mcs_range_present(struct ath12k *ar,</div><div class='add'>+				 enum nl80211_band band,</div><div class='add'>+				 const struct cfg80211_bitrate_mask *mask)</div><div class='add'>+{</div><div class='add'>+	u16 eht_mcs;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NL80211_EHT_NSS_MAX; i++) {</div><div class='add'>+		eht_mcs = mask-&gt;control[band].eht_mcs[i];</div><div class='add'>+</div><div class='add'>+		switch (eht_mcs) {</div><div class='add'>+		case 0:</div><div class='add'>+		case BIT(8) - 1:</div><div class='add'>+		case BIT(10) - 1:</div><div class='add'>+		case BIT(12) - 1:</div><div class='add'>+		case BIT(14) - 1:</div><div class='add'>+			break;</div><div class='add'>+		case BIT(15) - 1:</div><div class='add'>+		case BIT(16) - 1:</div><div class='add'>+		case BIT(16) - BIT(14) - 1:</div><div class='add'>+			if (i != 0)</div><div class='add'>+				return false;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_set_bitrate_mask_iter(void *data,</div><div class='add'>+					     struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_link_vif *arvif = data;</div><div class='add'>+	struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta);</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	arsta = wiphy_dereference(ath12k_ar_to_hw(ar)-&gt;wiphy,</div><div class='add'>+				  ahsta-&gt;link[arvif-&gt;link_id]);</div><div class='add'>+	if (!arsta || arsta-&gt;arvif != arvif)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	arsta-&gt;changed |= IEEE80211_RC_SUPP_RATES_CHANGED;</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	wiphy_work_queue(ath12k_ar_to_hw(ar)-&gt;wiphy, &amp;arsta-&gt;update_wk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_disable_peer_fixed_rate(void *data,</div><div class='add'>+					       struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_link_vif *arvif = data;</div><div class='add'>+	struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta);</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	arsta = wiphy_dereference(ath12k_ar_to_hw(ar)-&gt;wiphy,</div><div class='add'>+				  ahsta-&gt;link[arvif-&gt;link_id]);</div><div class='add'>+</div><div class='add'>+	if (!arsta || arsta-&gt;arvif != arvif)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_set_peer_param(ar, arsta-&gt;addr,</div><div class='add'>+					arvif-&gt;vdev_id,</div><div class='add'>+					WMI_PEER_PARAM_FIXED_RATE,</div><div class='add'>+					WMI_FIXED_RATE_NONE);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to disable peer fixed rate for STA %pM ret %d\n",</div><div class='add'>+			    arsta-&gt;addr, ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+ath12k_mac_validate_fixed_rate_settings(struct ath12k *ar, enum nl80211_band band,</div><div class='add'>+					const struct cfg80211_bitrate_mask *mask,</div><div class='add'>+					unsigned int link_id)</div><div class='add'>+{</div><div class='add'>+	bool eht_fixed_rate = false, he_fixed_rate = false, vht_fixed_rate = false;</div><div class='add'>+	const u16 *vht_mcs_mask, *he_mcs_mask, *eht_mcs_mask;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	struct ath12k_peer *peer, *tmp;</div><div class='add'>+	u8 vht_nss, he_nss, eht_nss;</div><div class='add'>+	int ret = true;</div><div class='add'>+</div><div class='add'>+	vht_mcs_mask = mask-&gt;control[band].vht_mcs;</div><div class='add'>+	he_mcs_mask = mask-&gt;control[band].he_mcs;</div><div class='add'>+	eht_mcs_mask = mask-&gt;control[band].eht_mcs;</div><div class='add'>+</div><div class='add'>+	if (ath12k_mac_bitrate_mask_num_vht_rates(ar, band, mask) == 1)</div><div class='add'>+		vht_fixed_rate = true;</div><div class='add'>+</div><div class='add'>+	if (ath12k_mac_bitrate_mask_num_he_rates(ar, band, mask) == 1)</div><div class='add'>+		he_fixed_rate = true;</div><div class='add'>+</div><div class='add'>+	if (ath12k_mac_bitrate_mask_num_eht_rates(ar, band, mask) == 1)</div><div class='add'>+		eht_fixed_rate = true;</div><div class='add'>+</div><div class='add'>+	if (!vht_fixed_rate &amp;&amp; !he_fixed_rate &amp;&amp; !eht_fixed_rate)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	vht_nss = ath12k_mac_max_vht_nss(vht_mcs_mask);</div><div class='add'>+	he_nss =  ath12k_mac_max_he_nss(he_mcs_mask);</div><div class='add'>+	eht_nss = ath12k_mac_max_eht_nss(eht_mcs_mask);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+	list_for_each_entry_safe(peer, tmp, &amp;ar-&gt;ab-&gt;peers, list) {</div><div class='add'>+		if (peer-&gt;sta) {</div><div class='add'>+			link_sta = rcu_dereference(peer-&gt;sta-&gt;link[link_id]);</div><div class='add'>+			if (!link_sta) {</div><div class='add'>+				ret = false;</div><div class='add'>+				goto exit;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (vht_fixed_rate &amp;&amp; (!link_sta-&gt;vht_cap.vht_supported ||</div><div class='add'>+					       link_sta-&gt;rx_nss &lt; vht_nss)) {</div><div class='add'>+				ret = false;</div><div class='add'>+				goto exit;</div><div class='add'>+			}</div><div class='add'>+			if (he_fixed_rate &amp;&amp; (!link_sta-&gt;he_cap.has_he ||</div><div class='add'>+					      link_sta-&gt;rx_nss &lt; he_nss)) {</div><div class='add'>+				ret = false;</div><div class='add'>+				goto exit;</div><div class='add'>+			}</div><div class='add'>+			if (eht_fixed_rate &amp;&amp; (!link_sta-&gt;eht_cap.has_eht ||</div><div class='add'>+					       link_sta-&gt;rx_nss &lt; eht_nss)) {</div><div class='add'>+				ret = false;</div><div class='add'>+				goto exit;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+exit:</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw,</div><div class='add'>+			       struct ieee80211_vif *vif,</div><div class='add'>+			       const struct cfg80211_bitrate_mask *mask)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct cfg80211_chan_def def;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	const u8 *ht_mcs_mask;</div><div class='add'>+	const u16 *vht_mcs_mask;</div><div class='add'>+	const u16 *he_mcs_mask;</div><div class='add'>+	const u16 *eht_mcs_mask;</div><div class='add'>+	u8 he_ltf = 0;</div><div class='add'>+	u8 he_gi = 0;</div><div class='add'>+	u8 eht_ltf = 0, eht_gi = 0;</div><div class='add'>+	u32 rate;</div><div class='add'>+	u8 nss, mac_nss;</div><div class='add'>+	u8 sgi;</div><div class='add'>+	u8 ldpc;</div><div class='add'>+	int single_nss;</div><div class='add'>+	int ret;</div><div class='add'>+	int num_rates;</div><div class='add'>+	bool he_fixed_rate = false;</div><div class='add'>+	bool eht_fixed_rate = false;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	arvif = &amp;ahvif-&gt;deflink;</div><div class='add'>+</div><div class='add'>+	ar = arvif-&gt;ar;</div><div class='add'>+	if (ath12k_mac_vif_link_chan(vif, arvif-&gt;link_id, &amp;def)) {</div><div class='add'>+		ret = -EPERM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	band = def.chan-&gt;band;</div><div class='add'>+	ht_mcs_mask = mask-&gt;control[band].ht_mcs;</div><div class='add'>+	vht_mcs_mask = mask-&gt;control[band].vht_mcs;</div><div class='add'>+	he_mcs_mask = mask-&gt;control[band].he_mcs;</div><div class='add'>+	eht_mcs_mask = mask-&gt;control[band].eht_mcs;</div><div class='add'>+	ldpc = !!(ar-&gt;ht_cap_info &amp; WMI_HT_CAP_LDPC);</div><div class='add'>+</div><div class='add'>+	sgi = mask-&gt;control[band].gi;</div><div class='add'>+	if (sgi == NL80211_TXRATE_FORCE_SGI) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	he_gi = mask-&gt;control[band].he_gi;</div><div class='add'>+	he_ltf = mask-&gt;control[band].he_ltf;</div><div class='add'>+</div><div class='add'>+	eht_gi = mask-&gt;control[band].eht_gi;</div><div class='add'>+	eht_ltf = mask-&gt;control[band].eht_ltf;</div><div class='add'>+</div><div class='add'>+	/* mac80211 doesn't support sending a fixed HT/VHT MCS alone, rather it</div><div class='add'>+	 * requires passing at least one of used basic rates along with them.</div><div class='add'>+	 * Fixed rate setting across different preambles(legacy, HT, VHT) is</div><div class='add'>+	 * not supported by the FW. Hence use of FIXED_RATE vdev param is not</div><div class='add'>+	 * suitable for setting single HT/VHT rates.</div><div class='add'>+	 * But, there could be a single basic rate passed from userspace which</div><div class='add'>+	 * can be done through the FIXED_RATE param.</div><div class='add'>+	 */</div><div class='add'>+	if (ath12k_mac_has_single_legacy_rate(ar, band, mask)) {</div><div class='add'>+		ret = ath12k_mac_get_single_legacy_rate(ar, band, mask, &amp;rate,</div><div class='add'>+							&amp;nss);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to get single legacy rate for vdev %i: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ieee80211_iterate_stations_mtx(hw,</div><div class='add'>+					       ath12k_mac_disable_peer_fixed_rate,</div><div class='add'>+					       arvif);</div><div class='add'>+	} else if (ath12k_mac_bitrate_mask_get_single_nss(ar, vif, band, mask,</div><div class='add'>+							  &amp;single_nss)) {</div><div class='add'>+		rate = WMI_FIXED_RATE_NONE;</div><div class='add'>+		nss = single_nss;</div><div class='add'>+		arvif-&gt;bitrate_mask = *mask;</div><div class='add'>+</div><div class='add'>+		ieee80211_iterate_stations_atomic(hw,</div><div class='add'>+						  ath12k_mac_set_bitrate_mask_iter,</div><div class='add'>+						  arvif);</div><div class='add'>+	} else {</div><div class='add'>+		rate = WMI_FIXED_RATE_NONE;</div><div class='add'>+</div><div class='add'>+		if (!ath12k_mac_validate_fixed_rate_settings(ar, band,</div><div class='add'>+							     mask, arvif-&gt;link_id))</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "failed to update fixed rate settings due to mcs/nss incompatibility\n");</div><div class='add'>+</div><div class='add'>+		mac_nss = max(max3(ath12k_mac_max_ht_nss(ht_mcs_mask),</div><div class='add'>+				   ath12k_mac_max_vht_nss(vht_mcs_mask),</div><div class='add'>+				   ath12k_mac_max_he_nss(he_mcs_mask)),</div><div class='add'>+			       ath12k_mac_max_eht_nss(eht_mcs_mask));</div><div class='add'>+		nss = min_t(u32, ar-&gt;num_tx_chains, mac_nss);</div><div class='add'>+</div><div class='add'>+		/* If multiple rates across different preambles are given</div><div class='add'>+		 * we can reconfigure this info with all peers using PEER_ASSOC</div><div class='add'>+		 * command with the below exception cases.</div><div class='add'>+		 * - Single VHT Rate : peer_assoc command accommodates only MCS</div><div class='add'>+		 * range values i.e 0-7, 0-8, 0-9 for VHT. Though mac80211</div><div class='add'>+		 * mandates passing basic rates along with HT/VHT rates, FW</div><div class='add'>+		 * doesn't allow switching from VHT to Legacy. Hence instead of</div><div class='add'>+		 * setting legacy and VHT rates using RATEMASK_CMD vdev cmd,</div><div class='add'>+		 * we could set this VHT rate as peer fixed rate param, which</div><div class='add'>+		 * will override FIXED rate and FW rate control algorithm.</div><div class='add'>+		 * If single VHT rate is passed along with HT rates, we select</div><div class='add'>+		 * the VHT rate as fixed rate for vht peers.</div><div class='add'>+		 * - Multiple VHT Rates : When Multiple VHT rates are given,this</div><div class='add'>+		 * can be set using RATEMASK CMD which uses FW rate-ctl alg.</div><div class='add'>+		 * TODO: Setting multiple VHT MCS and replacing peer_assoc with</div><div class='add'>+		 * RATEMASK_CMDID can cover all use cases of setting rates</div><div class='add'>+		 * across multiple preambles and rates within same type.</div><div class='add'>+		 * But requires more validation of the command at this point.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		num_rates = ath12k_mac_bitrate_mask_num_vht_rates(ar, band,</div><div class='add'>+								  mask);</div><div class='add'>+</div><div class='add'>+		if (!ath12k_mac_vht_mcs_range_present(ar, band, mask) &amp;&amp;</div><div class='add'>+		    num_rates &gt; 1) {</div><div class='add'>+			/* TODO: Handle multiple VHT MCS values setting using</div><div class='add'>+			 * RATEMASK CMD</div><div class='add'>+			 */</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "Setting more than one MCS Value in bitrate mask not supported\n");</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		num_rates = ath12k_mac_bitrate_mask_num_he_rates(ar, band, mask);</div><div class='add'>+		if (num_rates == 1)</div><div class='add'>+			he_fixed_rate = true;</div><div class='add'>+</div><div class='add'>+		if (!ath12k_mac_he_mcs_range_present(ar, band, mask) &amp;&amp;</div><div class='add'>+		    num_rates &gt; 1) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "Setting more than one HE MCS Value in bitrate mask not supported\n");</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		num_rates = ath12k_mac_bitrate_mask_num_eht_rates(ar, band,</div><div class='add'>+								  mask);</div><div class='add'>+		if (num_rates == 1)</div><div class='add'>+			eht_fixed_rate = true;</div><div class='add'>+</div><div class='add'>+		if (!ath12k_mac_eht_mcs_range_present(ar, band, mask) &amp;&amp;</div><div class='add'>+		    num_rates &gt; 1) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "Setting more than one EHT MCS Value in bitrate mask not supported\n");</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ieee80211_iterate_stations_mtx(hw,</div><div class='add'>+					       ath12k_mac_disable_peer_fixed_rate,</div><div class='add'>+					       arvif);</div><div class='add'>+</div><div class='add'>+		arvif-&gt;bitrate_mask = *mask;</div><div class='add'>+		ieee80211_iterate_stations_mtx(hw,</div><div class='add'>+					       ath12k_mac_set_bitrate_mask_iter,</div><div class='add'>+					       arvif);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_set_rate_params(arvif, rate, nss, sgi, ldpc, he_gi,</div><div class='add'>+					 he_ltf, he_fixed_rate, eht_gi, eht_ltf,</div><div class='add'>+					 eht_fixed_rate);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set rate params on vdev %i: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_mac_op_reconfig_complete(struct ieee80211_hw *hw,</div><div class='add'>+				enum ieee80211_reconfig_type reconfig_type)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	struct ath12k_vif *ahvif;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	int recovery_count, i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (reconfig_type != IEEE80211_RECONFIG_TYPE_RESTART)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ah-&gt;hw_mutex);</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;state != ATH12K_HW_STATE_RESTARTED)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ah-&gt;state = ATH12K_HW_STATE_ON;</div><div class='add'>+	ieee80211_wake_queues(hw);</div><div class='add'>+</div><div class='add'>+	for_each_ar(ah, ar, i) {</div><div class='add'>+		ab = ar-&gt;ab;</div><div class='add'>+</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "pdev %d successfully recovered\n",</div><div class='add'>+			    ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+</div><div class='add'>+		if (ar-&gt;ab-&gt;hw_params-&gt;current_cc_support &amp;&amp;</div><div class='add'>+		    ar-&gt;alpha2[0] != 0 &amp;&amp; ar-&gt;alpha2[1] != 0) {</div><div class='add'>+			struct wmi_set_current_country_arg arg = {};</div><div class='add'>+</div><div class='add'>+			memcpy(&amp;arg.alpha2, ar-&gt;alpha2, 2);</div><div class='add'>+			reinit_completion(&amp;ar-&gt;regd_update_completed);</div><div class='add'>+			ath12k_wmi_send_set_current_country_cmd(ar, &amp;arg);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ab-&gt;is_reset) {</div><div class='add'>+			recovery_count = atomic_inc_return(&amp;ab-&gt;recovery_count);</div><div class='add'>+</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_BOOT, "recovery count %d\n",</div><div class='add'>+				   recovery_count);</div><div class='add'>+</div><div class='add'>+			/* When there are multiple radios in an SOC,</div><div class='add'>+			 * the recovery has to be done for each radio</div><div class='add'>+			 */</div><div class='add'>+			if (recovery_count == ab-&gt;num_radios) {</div><div class='add'>+				atomic_dec(&amp;ab-&gt;reset_count);</div><div class='add'>+				complete(&amp;ab-&gt;reset_complete);</div><div class='add'>+				ab-&gt;is_reset = false;</div><div class='add'>+				atomic_set(&amp;ab-&gt;fail_cont_count, 0);</div><div class='add'>+				ath12k_dbg(ab, ATH12K_DBG_BOOT, "reset success\n");</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+			ahvif = arvif-&gt;ahvif;</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+				   "reconfig cipher %d up %d vdev type %d\n",</div><div class='add'>+				   ahvif-&gt;key_cipher,</div><div class='add'>+				   arvif-&gt;is_up,</div><div class='add'>+				   ahvif-&gt;vdev_type);</div><div class='add'>+</div><div class='add'>+			/* After trigger disconnect, then upper layer will</div><div class='add'>+			 * trigger connect again, then the PN number of</div><div class='add'>+			 * upper layer will be reset to keep up with AP</div><div class='add'>+			 * side, hence PN number mismatch will not happen.</div><div class='add'>+			 */</div><div class='add'>+			if (arvif-&gt;is_up &amp;&amp;</div><div class='add'>+			    ahvif-&gt;vdev_type == WMI_VDEV_TYPE_STA &amp;&amp;</div><div class='add'>+			    ahvif-&gt;vdev_subtype == WMI_VDEV_SUBTYPE_NONE) {</div><div class='add'>+				ieee80211_hw_restart_disconnect(ahvif-&gt;vif);</div><div class='add'>+</div><div class='add'>+				ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+					   "restart disconnect\n");</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_mac_update_bss_chan_survey(struct ath12k *ar,</div><div class='add'>+				  struct ieee80211_channel *channel)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	enum wmi_bss_chan_info_req_type type = WMI_BSS_SURVEY_REQ_TYPE_READ;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(WMI_TLV_SERVICE_BSS_CHANNEL_INFO_64, ar-&gt;ab-&gt;wmi_ab.svc_map) ||</div><div class='add'>+	    ar-&gt;rx_channel != channel)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;scan.state != ATH12K_SCAN_IDLE) {</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+			   "ignoring bss chan info req while scanning..\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;ar-&gt;bss_survey_done);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_pdev_bss_chan_info_request(ar, type);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to send pdev bss chan info request\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = wait_for_completion_timeout(&amp;ar-&gt;bss_survey_done, 3 * HZ);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "bss channel survey timed out\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_op_get_survey(struct ieee80211_hw *hw, int idx,</div><div class='add'>+				    struct survey_info *survey)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	struct survey_info *ar_survey;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (idx &gt;= ATH12K_NUM_CHANS)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	sband = hw-&gt;wiphy-&gt;bands[NL80211_BAND_2GHZ];</div><div class='add'>+	if (sband &amp;&amp; idx &gt;= sband-&gt;n_channels) {</div><div class='add'>+		idx -= sband-&gt;n_channels;</div><div class='add'>+		sband = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!sband)</div><div class='add'>+		sband = hw-&gt;wiphy-&gt;bands[NL80211_BAND_5GHZ];</div><div class='add'>+	if (sband &amp;&amp; idx &gt;= sband-&gt;n_channels) {</div><div class='add'>+		idx -= sband-&gt;n_channels;</div><div class='add'>+		sband = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!sband)</div><div class='add'>+		sband = hw-&gt;wiphy-&gt;bands[NL80211_BAND_6GHZ];</div><div class='add'>+</div><div class='add'>+	if (!sband || idx &gt;= sband-&gt;n_channels)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	ar = ath12k_mac_get_ar_by_chan(hw, &amp;sband-&gt;channels[idx]);</div><div class='add'>+	if (!ar) {</div><div class='add'>+		if (sband-&gt;channels[idx].flags &amp; IEEE80211_CHAN_DISABLED) {</div><div class='add'>+			memset(survey, 0, sizeof(*survey));</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar_survey = &amp;ar-&gt;survey[idx];</div><div class='add'>+</div><div class='add'>+	ath12k_mac_update_bss_chan_survey(ar, &amp;sband-&gt;channels[idx]);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	memcpy(survey, ar_survey, sizeof(*survey));</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	survey-&gt;channel = &amp;sband-&gt;channels[idx];</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;rx_channel == survey-&gt;channel)</div><div class='add'>+		survey-&gt;filled |= SURVEY_INFO_IN_USE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_put_chain_rssi(struct station_info *sinfo,</div><div class='add'>+				      struct ath12k_link_sta *arsta)</div><div class='add'>+{</div><div class='add'>+	s8 rssi;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(sinfo-&gt;chain_signal); i++) {</div><div class='add'>+		sinfo-&gt;chains &amp;= ~BIT(i);</div><div class='add'>+		rssi = arsta-&gt;chain_signal[i];</div><div class='add'>+</div><div class='add'>+		if (rssi != ATH12K_DEFAULT_NOISE_FLOOR &amp;&amp;</div><div class='add'>+		    rssi != ATH12K_INVALID_RSSI_FULL &amp;&amp;</div><div class='add'>+		    rssi != ATH12K_INVALID_RSSI_EMPTY &amp;&amp;</div><div class='add'>+		    rssi != 0) {</div><div class='add'>+			sinfo-&gt;chain_signal[i] = rssi;</div><div class='add'>+			sinfo-&gt;chains |= BIT(i);</div><div class='add'>+			sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_op_sta_statistics(struct ieee80211_hw *hw,</div><div class='add'>+					 struct ieee80211_vif *vif,</div><div class='add'>+					 struct ieee80211_sta *sta,</div><div class='add'>+					 struct station_info *sinfo)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta);</div><div class='add'>+	struct ath12k_fw_stats_req_params params = {};</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	s8 signal, noise_floor;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	bool db2dbm;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	arsta = &amp;ahsta-&gt;deflink;</div><div class='add'>+	ar = ath12k_get_ar_by_vif(hw, vif, arsta-&gt;link_id);</div><div class='add'>+	if (!ar)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	db2dbm = test_bit(WMI_TLV_SERVICE_HW_DB2DBM_CONVERSION_SUPPORT,</div><div class='add'>+			  ar-&gt;ab-&gt;wmi_ab.svc_map);</div><div class='add'>+</div><div class='add'>+	sinfo-&gt;rx_duration = arsta-&gt;rx_duration;</div><div class='add'>+	sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_RX_DURATION);</div><div class='add'>+</div><div class='add'>+	sinfo-&gt;tx_duration = arsta-&gt;tx_duration;</div><div class='add'>+	sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_TX_DURATION);</div><div class='add'>+</div><div class='add'>+	if (arsta-&gt;txrate.legacy || arsta-&gt;txrate.nss) {</div><div class='add'>+		if (arsta-&gt;txrate.legacy) {</div><div class='add'>+			sinfo-&gt;txrate.legacy = arsta-&gt;txrate.legacy;</div><div class='add'>+		} else {</div><div class='add'>+			sinfo-&gt;txrate.mcs = arsta-&gt;txrate.mcs;</div><div class='add'>+			sinfo-&gt;txrate.nss = arsta-&gt;txrate.nss;</div><div class='add'>+			sinfo-&gt;txrate.bw = arsta-&gt;txrate.bw;</div><div class='add'>+			sinfo-&gt;txrate.he_gi = arsta-&gt;txrate.he_gi;</div><div class='add'>+			sinfo-&gt;txrate.he_dcm = arsta-&gt;txrate.he_dcm;</div><div class='add'>+			sinfo-&gt;txrate.he_ru_alloc = arsta-&gt;txrate.he_ru_alloc;</div><div class='add'>+			sinfo-&gt;txrate.eht_gi = arsta-&gt;txrate.eht_gi;</div><div class='add'>+			sinfo-&gt;txrate.eht_ru_alloc = arsta-&gt;txrate.eht_ru_alloc;</div><div class='add'>+		}</div><div class='add'>+		sinfo-&gt;txrate.flags = arsta-&gt;txrate.flags;</div><div class='add'>+		sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TODO: Use real NF instead of default one. */</div><div class='add'>+	signal = arsta-&gt;rssi_comb;</div><div class='add'>+</div><div class='add'>+	params.pdev_id = ar-&gt;pdev-&gt;pdev_id;</div><div class='add'>+	params.vdev_id = 0;</div><div class='add'>+	params.stats_id = WMI_REQUEST_VDEV_STAT;</div><div class='add'>+</div><div class='add'>+	if (!signal &amp;&amp;</div><div class='add'>+	    ahsta-&gt;ahvif-&gt;vdev_type == WMI_VDEV_TYPE_STA &amp;&amp;</div><div class='add'>+	    !(ath12k_mac_get_fw_stats(ar, &amp;params))) {</div><div class='add'>+		signal = arsta-&gt;rssi_beacon;</div><div class='add'>+		ath12k_fw_stats_reset(ar);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	params.stats_id = WMI_REQUEST_RSSI_PER_CHAIN_STAT;</div><div class='add'>+	if (!(sinfo-&gt;filled &amp; BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL)) &amp;&amp;</div><div class='add'>+	    ahsta-&gt;ahvif-&gt;vdev_type == WMI_VDEV_TYPE_STA &amp;&amp;</div><div class='add'>+	    !(ath12k_mac_get_fw_stats(ar, &amp;params))) {</div><div class='add'>+		ath12k_mac_put_chain_rssi(sinfo, arsta);</div><div class='add'>+		ath12k_fw_stats_reset(ar);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	noise_floor = ath12k_pdev_get_noise_floor(ar);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	if (signal) {</div><div class='add'>+		sinfo-&gt;signal = db2dbm ? signal : signal + noise_floor;</div><div class='add'>+		sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sinfo-&gt;signal_avg = ewma_avg_rssi_read(&amp;arsta-&gt;avg_rssi);</div><div class='add'>+</div><div class='add'>+	if (!db2dbm)</div><div class='add'>+		sinfo-&gt;signal_avg += noise_floor;</div><div class='add'>+</div><div class='add'>+	sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG);</div><div class='add'>+</div><div class='add'>+	sinfo-&gt;tx_retries = arsta-&gt;tx_retry_count;</div><div class='add'>+	sinfo-&gt;tx_failed = arsta-&gt;tx_retry_failed;</div><div class='add'>+	sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_TX_RETRIES);</div><div class='add'>+	sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_TX_FAILED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_op_link_sta_statistics(struct ieee80211_hw *hw,</div><div class='add'>+					      struct ieee80211_vif *vif,</div><div class='add'>+					      struct ieee80211_link_sta *link_sta,</div><div class='add'>+					      struct link_station_info *link_sinfo)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(link_sta-&gt;sta);</div><div class='add'>+	struct ath12k_fw_stats_req_params params = {};</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	s8 signal;</div><div class='add'>+	bool db2dbm;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	arsta = wiphy_dereference(hw-&gt;wiphy, ahsta-&gt;link[link_sta-&gt;link_id]);</div><div class='add'>+</div><div class='add'>+	if (!arsta)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ar = ath12k_get_ar_by_vif(hw, vif, arsta-&gt;link_id);</div><div class='add'>+	if (!ar)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	db2dbm = test_bit(WMI_TLV_SERVICE_HW_DB2DBM_CONVERSION_SUPPORT,</div><div class='add'>+			  ar-&gt;ab-&gt;wmi_ab.svc_map);</div><div class='add'>+</div><div class='add'>+	link_sinfo-&gt;rx_duration = arsta-&gt;rx_duration;</div><div class='add'>+	link_sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_RX_DURATION);</div><div class='add'>+</div><div class='add'>+	link_sinfo-&gt;tx_duration = arsta-&gt;tx_duration;</div><div class='add'>+	link_sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_TX_DURATION);</div><div class='add'>+</div><div class='add'>+	if (arsta-&gt;txrate.legacy || arsta-&gt;txrate.nss) {</div><div class='add'>+		if (arsta-&gt;txrate.legacy) {</div><div class='add'>+			link_sinfo-&gt;txrate.legacy = arsta-&gt;txrate.legacy;</div><div class='add'>+		} else {</div><div class='add'>+			link_sinfo-&gt;txrate.mcs = arsta-&gt;txrate.mcs;</div><div class='add'>+			link_sinfo-&gt;txrate.nss = arsta-&gt;txrate.nss;</div><div class='add'>+			link_sinfo-&gt;txrate.bw = arsta-&gt;txrate.bw;</div><div class='add'>+			link_sinfo-&gt;txrate.he_gi = arsta-&gt;txrate.he_gi;</div><div class='add'>+			link_sinfo-&gt;txrate.he_dcm = arsta-&gt;txrate.he_dcm;</div><div class='add'>+			link_sinfo-&gt;txrate.he_ru_alloc =</div><div class='add'>+				arsta-&gt;txrate.he_ru_alloc;</div><div class='add'>+			link_sinfo-&gt;txrate.eht_gi = arsta-&gt;txrate.eht_gi;</div><div class='add'>+			link_sinfo-&gt;txrate.eht_ru_alloc =</div><div class='add'>+				arsta-&gt;txrate.eht_ru_alloc;</div><div class='add'>+		}</div><div class='add'>+		link_sinfo-&gt;txrate.flags = arsta-&gt;txrate.flags;</div><div class='add'>+		link_sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TODO: Use real NF instead of default one. */</div><div class='add'>+	signal = arsta-&gt;rssi_comb;</div><div class='add'>+</div><div class='add'>+	params.pdev_id = ar-&gt;pdev-&gt;pdev_id;</div><div class='add'>+	params.vdev_id = 0;</div><div class='add'>+	params.stats_id = WMI_REQUEST_VDEV_STAT;</div><div class='add'>+</div><div class='add'>+	if (!signal &amp;&amp;</div><div class='add'>+	    ahsta-&gt;ahvif-&gt;vdev_type == WMI_VDEV_TYPE_STA &amp;&amp;</div><div class='add'>+	    !(ath12k_mac_get_fw_stats(ar, &amp;params))) {</div><div class='add'>+		signal = arsta-&gt;rssi_beacon;</div><div class='add'>+		ath12k_fw_stats_reset(ar);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (signal) {</div><div class='add'>+		link_sinfo-&gt;signal =</div><div class='add'>+			db2dbm ? signal : signal + ATH12K_DEFAULT_NOISE_FLOOR;</div><div class='add'>+		link_sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	link_sinfo-&gt;signal_avg = ewma_avg_rssi_read(&amp;arsta-&gt;avg_rssi);</div><div class='add'>+</div><div class='add'>+	if (!db2dbm)</div><div class='add'>+		link_sinfo-&gt;signal_avg += ATH12K_DEFAULT_NOISE_FLOOR;</div><div class='add'>+</div><div class='add'>+	link_sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG);</div><div class='add'>+</div><div class='add'>+	link_sinfo-&gt;tx_retries = arsta-&gt;tx_retry_count;</div><div class='add'>+	link_sinfo-&gt;tx_failed = arsta-&gt;tx_retry_failed;</div><div class='add'>+	link_sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_TX_RETRIES);</div><div class='add'>+	link_sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_TX_FAILED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_op_cancel_remain_on_channel(struct ieee80211_hw *hw,</div><div class='add'>+						  struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+</div><div class='add'>+	ar = ath12k_ah_to_ar(ah, 0);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	ar-&gt;scan.roc_notify = false;</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	ath12k_scan_abort(ar);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;ar-&gt;scan.timeout);</div><div class='add'>+	wiphy_work_cancel(hw-&gt;wiphy, &amp;ar-&gt;scan.vdev_clean_wk);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_op_remain_on_channel(struct ieee80211_hw *hw,</div><div class='add'>+					   struct ieee80211_vif *vif,</div><div class='add'>+					   struct ieee80211_channel *chan,</div><div class='add'>+					   int duration,</div><div class='add'>+					   enum ieee80211_roc_type type)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	u32 scan_time_msec;</div><div class='add'>+	bool create = true;</div><div class='add'>+	u8 link_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ar = ath12k_mac_select_scan_device(hw, vif, chan-&gt;center_freq);</div><div class='add'>+	if (!ar)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* check if any of the links of ML VIF is already started on</div><div class='add'>+	 * radio(ar) corresponding to given scan frequency and use it,</div><div class='add'>+	 * if not use deflink(link 0) for scan purpose.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	link_id = ath12k_mac_find_link_id_by_ar(ahvif, ar);</div><div class='add'>+	arvif = ath12k_mac_assign_link_vif(ah, vif, link_id);</div><div class='add'>+	/* If the vif is already assigned to a specific vdev of an ar,</div><div class='add'>+	 * check whether its already started, vdev which is started</div><div class='add'>+	 * are not allowed to switch to a new radio.</div><div class='add'>+	 * If the vdev is not started, but was earlier created on a</div><div class='add'>+	 * different ar, delete that vdev and create a new one. We don't</div><div class='add'>+	 * delete at the scan stop as an optimization to avoid redundant</div><div class='add'>+	 * delete-create vdev's for the same ar, in case the request is</div><div class='add'>+	 * always on the same band for the vif</div><div class='add'>+	 */</div><div class='add'>+	if (arvif-&gt;is_created) {</div><div class='add'>+		if (WARN_ON(!arvif-&gt;ar))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (ar != arvif-&gt;ar &amp;&amp; arvif-&gt;is_started)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+</div><div class='add'>+		if (ar != arvif-&gt;ar) {</div><div class='add'>+			ath12k_mac_remove_link_interface(hw, arvif);</div><div class='add'>+			ath12k_mac_unassign_link_vif(arvif);</div><div class='add'>+		} else {</div><div class='add'>+			create = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (create) {</div><div class='add'>+		arvif = ath12k_mac_assign_link_vif(ah, vif, link_id);</div><div class='add'>+</div><div class='add'>+		ret = ath12k_mac_vdev_create(ar, arvif);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "unable to create scan vdev for roc: %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+			ath12k_mac_unassign_link_vif(arvif);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	switch (ar-&gt;scan.state) {</div><div class='add'>+	case ATH12K_SCAN_IDLE:</div><div class='add'>+		reinit_completion(&amp;ar-&gt;scan.started);</div><div class='add'>+		reinit_completion(&amp;ar-&gt;scan.completed);</div><div class='add'>+		reinit_completion(&amp;ar-&gt;scan.on_channel);</div><div class='add'>+		ar-&gt;scan.state = ATH12K_SCAN_STARTING;</div><div class='add'>+		ar-&gt;scan.is_roc = true;</div><div class='add'>+		ar-&gt;scan.arvif = arvif;</div><div class='add'>+		ar-&gt;scan.roc_freq = chan-&gt;center_freq;</div><div class='add'>+		ar-&gt;scan.roc_notify = true;</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_SCAN_STARTING:</div><div class='add'>+	case ATH12K_SCAN_RUNNING:</div><div class='add'>+	case ATH12K_SCAN_ABORTING:</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	scan_time_msec = hw-&gt;wiphy-&gt;max_remain_on_channel_duration * 2;</div><div class='add'>+</div><div class='add'>+	struct ath12k_wmi_scan_req_arg *arg __free(kfree) =</div><div class='add'>+					kzalloc(sizeof(*arg), GFP_KERNEL);</div><div class='add'>+	if (!arg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ath12k_wmi_start_scan_init(ar, arg);</div><div class='add'>+	arg-&gt;num_chan = 1;</div><div class='add'>+</div><div class='add'>+	u32 *chan_list __free(kfree) = kcalloc(arg-&gt;num_chan, sizeof(*chan_list),</div><div class='add'>+					       GFP_KERNEL);</div><div class='add'>+	if (!chan_list)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	arg-&gt;chan_list = chan_list;</div><div class='add'>+	arg-&gt;vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+	arg-&gt;scan_id = ATH12K_SCAN_ID;</div><div class='add'>+	arg-&gt;chan_list[0] = chan-&gt;center_freq;</div><div class='add'>+	arg-&gt;dwell_time_active = scan_time_msec;</div><div class='add'>+	arg-&gt;dwell_time_passive = scan_time_msec;</div><div class='add'>+	arg-&gt;max_scan_time = scan_time_msec;</div><div class='add'>+	arg-&gt;scan_f_passive = 1;</div><div class='add'>+	arg-&gt;burst_duration = duration;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_start_scan(ar, arg);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to start roc scan: %d\n", ret);</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		ar-&gt;scan.state = ATH12K_SCAN_IDLE;</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = wait_for_completion_timeout(&amp;ar-&gt;scan.on_channel, 3 * HZ);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to switch to channel for roc scan\n");</div><div class='add'>+		ret = ath12k_scan_stop(ar);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to stop scan: %d\n", ret);</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ieee80211_queue_delayed_work(hw, &amp;ar-&gt;scan.timeout,</div><div class='add'>+				     msecs_to_jiffies(duration));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_op_set_rekey_data(struct ieee80211_hw *hw,</div><div class='add'>+					 struct ieee80211_vif *vif,</div><div class='add'>+					 struct cfg80211_gtk_rekey_data *data)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_rekey_data *rekey_data;</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	struct ath12k *ar = ath12k_ah_to_ar(ah, 0);</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	arvif = &amp;ahvif-&gt;deflink;</div><div class='add'>+	rekey_data = &amp;arvif-&gt;rekey_data;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac set rekey data vdev %d\n",</div><div class='add'>+		   arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	memcpy(rekey_data-&gt;kck, data-&gt;kck, NL80211_KCK_LEN);</div><div class='add'>+	memcpy(rekey_data-&gt;kek, data-&gt;kek, NL80211_KEK_LEN);</div><div class='add'>+</div><div class='add'>+	/* The supplicant works on big-endian, the firmware expects it on</div><div class='add'>+	 * little endian.</div><div class='add'>+	 */</div><div class='add'>+	rekey_data-&gt;replay_ctr = get_unaligned_be64(data-&gt;replay_ctr);</div><div class='add'>+</div><div class='add'>+	arvif-&gt;rekey_data.enable_offload = true;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg_dump(ar-&gt;ab, ATH12K_DBG_MAC, "kck", NULL,</div><div class='add'>+			rekey_data-&gt;kck, NL80211_KCK_LEN);</div><div class='add'>+	ath12k_dbg_dump(ar-&gt;ab, ATH12K_DBG_MAC, "kek", NULL,</div><div class='add'>+			rekey_data-&gt;kck, NL80211_KEK_LEN);</div><div class='add'>+	ath12k_dbg_dump(ar-&gt;ab, ATH12K_DBG_MAC, "replay ctr", NULL,</div><div class='add'>+			&amp;rekey_data-&gt;replay_ctr, sizeof(rekey_data-&gt;replay_ctr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_ops ath12k_ops = {</div><div class='add'>+	.tx				= ath12k_mac_op_tx,</div><div class='add'>+	.wake_tx_queue			= ieee80211_handle_wake_tx_queue,</div><div class='add'>+	.start                          = ath12k_mac_op_start,</div><div class='add'>+	.stop                           = ath12k_mac_op_stop,</div><div class='add'>+	.reconfig_complete              = ath12k_mac_op_reconfig_complete,</div><div class='add'>+	.add_interface                  = ath12k_mac_op_add_interface,</div><div class='add'>+	.remove_interface		= ath12k_mac_op_remove_interface,</div><div class='add'>+	.update_vif_offload		= ath12k_mac_op_update_vif_offload,</div><div class='add'>+	.config                         = ath12k_mac_op_config,</div><div class='add'>+	.link_info_changed              = ath12k_mac_op_link_info_changed,</div><div class='add'>+	.vif_cfg_changed		= ath12k_mac_op_vif_cfg_changed,</div><div class='add'>+	.change_vif_links               = ath12k_mac_op_change_vif_links,</div><div class='add'>+	.configure_filter		= ath12k_mac_op_configure_filter,</div><div class='add'>+	.hw_scan                        = ath12k_mac_op_hw_scan,</div><div class='add'>+	.cancel_hw_scan                 = ath12k_mac_op_cancel_hw_scan,</div><div class='add'>+	.set_key                        = ath12k_mac_op_set_key,</div><div class='add'>+	.set_rekey_data	                = ath12k_mac_op_set_rekey_data,</div><div class='add'>+	.sta_state                      = ath12k_mac_op_sta_state,</div><div class='add'>+	.sta_set_txpwr			= ath12k_mac_op_sta_set_txpwr,</div><div class='add'>+	.link_sta_rc_update		= ath12k_mac_op_link_sta_rc_update,</div><div class='add'>+	.conf_tx                        = ath12k_mac_op_conf_tx,</div><div class='add'>+	.set_antenna			= ath12k_mac_op_set_antenna,</div><div class='add'>+	.get_antenna			= ath12k_mac_op_get_antenna,</div><div class='add'>+	.ampdu_action			= ath12k_mac_op_ampdu_action,</div><div class='add'>+	.add_chanctx			= ath12k_mac_op_add_chanctx,</div><div class='add'>+	.remove_chanctx			= ath12k_mac_op_remove_chanctx,</div><div class='add'>+	.change_chanctx			= ath12k_mac_op_change_chanctx,</div><div class='add'>+	.assign_vif_chanctx		= ath12k_mac_op_assign_vif_chanctx,</div><div class='add'>+	.unassign_vif_chanctx		= ath12k_mac_op_unassign_vif_chanctx,</div><div class='add'>+	.switch_vif_chanctx		= ath12k_mac_op_switch_vif_chanctx,</div><div class='add'>+	.get_txpower			= ath12k_mac_op_get_txpower,</div><div class='add'>+	.set_rts_threshold		= ath12k_mac_op_set_rts_threshold,</div><div class='add'>+	.set_frag_threshold		= ath12k_mac_op_set_frag_threshold,</div><div class='add'>+	.set_bitrate_mask		= ath12k_mac_op_set_bitrate_mask,</div><div class='add'>+	.get_survey			= ath12k_mac_op_get_survey,</div><div class='add'>+	.flush				= ath12k_mac_op_flush,</div><div class='add'>+	.sta_statistics			= ath12k_mac_op_sta_statistics,</div><div class='add'>+	.link_sta_statistics		= ath12k_mac_op_link_sta_statistics,</div><div class='add'>+	.remain_on_channel              = ath12k_mac_op_remain_on_channel,</div><div class='add'>+	.cancel_remain_on_channel       = ath12k_mac_op_cancel_remain_on_channel,</div><div class='add'>+	.change_sta_links               = ath12k_mac_op_change_sta_links,</div><div class='add'>+	.can_activate_links             = ath12k_mac_op_can_activate_links,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend			= ath12k_wow_op_suspend,</div><div class='add'>+	.resume				= ath12k_wow_op_resume,</div><div class='add'>+	.set_wakeup			= ath12k_wow_op_set_wakeup,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_ATH12K_DEBUGFS</div><div class='add'>+	.vif_add_debugfs                = ath12k_debugfs_op_vif_add,</div><div class='add'>+#endif</div><div class='add'>+	CFG80211_TESTMODE_CMD(ath12k_tm_cmd)</div><div class='add'>+#ifdef CONFIG_ATH12K_DEBUGFS</div><div class='add'>+	.link_sta_add_debugfs           = ath12k_debugfs_link_sta_op_add,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath12k_mac_update_freq_range(struct ath12k *ar,</div><div class='add'>+				  u32 freq_low, u32 freq_high)</div><div class='add'>+{</div><div class='add'>+	if (!(freq_low &amp;&amp; freq_high))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;freq_range.start_freq || ar-&gt;freq_range.end_freq) {</div><div class='add'>+		ar-&gt;freq_range.start_freq = min(ar-&gt;freq_range.start_freq,</div><div class='add'>+						MHZ_TO_KHZ(freq_low));</div><div class='add'>+		ar-&gt;freq_range.end_freq = max(ar-&gt;freq_range.end_freq,</div><div class='add'>+					      MHZ_TO_KHZ(freq_high));</div><div class='add'>+	} else {</div><div class='add'>+		ar-&gt;freq_range.start_freq = MHZ_TO_KHZ(freq_low);</div><div class='add'>+		ar-&gt;freq_range.end_freq = MHZ_TO_KHZ(freq_high);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "mac pdev %u freq limit updated. New range %u-&gt;%u MHz\n",</div><div class='add'>+		   ar-&gt;pdev-&gt;pdev_id, KHZ_TO_MHZ(ar-&gt;freq_range.start_freq),</div><div class='add'>+		   KHZ_TO_MHZ(ar-&gt;freq_range.end_freq));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_update_ch_list(struct ath12k *ar,</div><div class='add'>+				      struct ieee80211_supported_band *band,</div><div class='add'>+				      u32 freq_low, u32 freq_high)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!(freq_low &amp;&amp; freq_high))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; band-&gt;n_channels; i++) {</div><div class='add'>+		if (band-&gt;channels[i].center_freq &lt; freq_low ||</div><div class='add'>+		    band-&gt;channels[i].center_freq &gt; freq_high)</div><div class='add'>+			band-&gt;channels[i].flags |= IEEE80211_CHAN_DISABLED;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_get_phy_id(struct ath12k *ar, u32 band)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pdev *pdev = ar-&gt;pdev;</div><div class='add'>+	struct ath12k_pdev_cap *pdev_cap = &amp;pdev-&gt;cap;</div><div class='add'>+</div><div class='add'>+	if (band == WMI_HOST_WLAN_2GHZ_CAP)</div><div class='add'>+		return pdev_cap-&gt;band[NL80211_BAND_2GHZ].phy_id;</div><div class='add'>+</div><div class='add'>+	if (band == WMI_HOST_WLAN_5GHZ_CAP)</div><div class='add'>+		return pdev_cap-&gt;band[NL80211_BAND_5GHZ].phy_id;</div><div class='add'>+</div><div class='add'>+	ath12k_warn(ar-&gt;ab, "unsupported phy cap:%d\n", band);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_update_band(struct ath12k *ar,</div><div class='add'>+				  struct ieee80211_supported_band *orig_band,</div><div class='add'>+				  struct ieee80211_supported_band *new_band)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!orig_band || !new_band)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (orig_band-&gt;band != new_band-&gt;band)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; new_band-&gt;n_channels; i++) {</div><div class='add'>+		if (new_band-&gt;channels[i].flags &amp; IEEE80211_CHAN_DISABLED)</div><div class='add'>+			continue;</div><div class='add'>+		/* An enabled channel in new_band should not be already enabled</div><div class='add'>+		 * in the orig_band</div><div class='add'>+		 */</div><div class='add'>+		if (WARN_ON(!(orig_band-&gt;channels[i].flags &amp;</div><div class='add'>+			      IEEE80211_CHAN_DISABLED)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		orig_band-&gt;channels[i].flags &amp;= ~IEEE80211_CHAN_DISABLED;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_setup_channels_rates(struct ath12k *ar,</div><div class='add'>+					   u32 supported_bands,</div><div class='add'>+					   struct ieee80211_supported_band *bands[])</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_supported_band *band;</div><div class='add'>+	struct ath12k_wmi_hal_reg_capabilities_ext_arg *reg_cap;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	u32 phy_id, freq_low, freq_high;</div><div class='add'>+	struct ath12k_hw *ah = ar-&gt;ah;</div><div class='add'>+	void *channels;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON((ARRAY_SIZE(ath12k_2ghz_channels) +</div><div class='add'>+		      ARRAY_SIZE(ath12k_5ghz_channels) +</div><div class='add'>+		      ARRAY_SIZE(ath12k_6ghz_channels)) !=</div><div class='add'>+		     ATH12K_NUM_CHANS);</div><div class='add'>+</div><div class='add'>+	reg_cap = &amp;ab-&gt;hal_reg_cap[ar-&gt;pdev_idx];</div><div class='add'>+</div><div class='add'>+	if (supported_bands &amp; WMI_HOST_WLAN_2GHZ_CAP) {</div><div class='add'>+		channels = kmemdup(ath12k_2ghz_channels,</div><div class='add'>+				   sizeof(ath12k_2ghz_channels),</div><div class='add'>+				   GFP_KERNEL);</div><div class='add'>+		if (!channels)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		band = &amp;ar-&gt;mac.sbands[NL80211_BAND_2GHZ];</div><div class='add'>+		band-&gt;band = NL80211_BAND_2GHZ;</div><div class='add'>+		band-&gt;n_channels = ARRAY_SIZE(ath12k_2ghz_channels);</div><div class='add'>+		band-&gt;channels = channels;</div><div class='add'>+		band-&gt;n_bitrates = ath12k_g_rates_size;</div><div class='add'>+		band-&gt;bitrates = ath12k_g_rates;</div><div class='add'>+</div><div class='add'>+		if (ab-&gt;hw_params-&gt;single_pdev_only) {</div><div class='add'>+			phy_id = ath12k_get_phy_id(ar, WMI_HOST_WLAN_2GHZ_CAP);</div><div class='add'>+			reg_cap = &amp;ab-&gt;hal_reg_cap[phy_id];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		freq_low = max(reg_cap-&gt;low_2ghz_chan,</div><div class='add'>+			       ab-&gt;reg_freq_2ghz.start_freq);</div><div class='add'>+		freq_high = min(reg_cap-&gt;high_2ghz_chan,</div><div class='add'>+				ab-&gt;reg_freq_2ghz.end_freq);</div><div class='add'>+</div><div class='add'>+		ath12k_mac_update_ch_list(ar, band,</div><div class='add'>+					  reg_cap-&gt;low_2ghz_chan,</div><div class='add'>+					  reg_cap-&gt;high_2ghz_chan);</div><div class='add'>+</div><div class='add'>+		ath12k_mac_update_freq_range(ar, freq_low, freq_high);</div><div class='add'>+</div><div class='add'>+		if (!bands[NL80211_BAND_2GHZ]) {</div><div class='add'>+			bands[NL80211_BAND_2GHZ] = band;</div><div class='add'>+		} else {</div><div class='add'>+			/* Split mac in same band under same wiphy */</div><div class='add'>+			ret = ath12k_mac_update_band(ar, bands[NL80211_BAND_2GHZ], band);</div><div class='add'>+			if (ret) {</div><div class='add'>+				kfree(channels);</div><div class='add'>+				band-&gt;channels = NULL;</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+			ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac pdev %u identified as 2 GHz split mac with start freq %d end freq %d",</div><div class='add'>+				   ar-&gt;pdev-&gt;pdev_id,</div><div class='add'>+				   KHZ_TO_MHZ(ar-&gt;freq_range.start_freq),</div><div class='add'>+				   KHZ_TO_MHZ(ar-&gt;freq_range.end_freq));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (supported_bands &amp; WMI_HOST_WLAN_5GHZ_CAP) {</div><div class='add'>+		if (reg_cap-&gt;high_5ghz_chan &gt;= ATH12K_MIN_6GHZ_FREQ) {</div><div class='add'>+			channels = kmemdup(ath12k_6ghz_channels,</div><div class='add'>+					   sizeof(ath12k_6ghz_channels), GFP_KERNEL);</div><div class='add'>+			if (!channels) {</div><div class='add'>+				kfree(ar-&gt;mac.sbands[NL80211_BAND_2GHZ].channels);</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ar-&gt;supports_6ghz = true;</div><div class='add'>+			band = &amp;ar-&gt;mac.sbands[NL80211_BAND_6GHZ];</div><div class='add'>+			band-&gt;band = NL80211_BAND_6GHZ;</div><div class='add'>+			band-&gt;n_channels = ARRAY_SIZE(ath12k_6ghz_channels);</div><div class='add'>+			band-&gt;channels = channels;</div><div class='add'>+			band-&gt;n_bitrates = ath12k_a_rates_size;</div><div class='add'>+			band-&gt;bitrates = ath12k_a_rates;</div><div class='add'>+</div><div class='add'>+			freq_low = max(reg_cap-&gt;low_5ghz_chan,</div><div class='add'>+				       ab-&gt;reg_freq_6ghz.start_freq);</div><div class='add'>+			freq_high = min(reg_cap-&gt;high_5ghz_chan,</div><div class='add'>+					ab-&gt;reg_freq_6ghz.end_freq);</div><div class='add'>+</div><div class='add'>+			ath12k_mac_update_ch_list(ar, band,</div><div class='add'>+						  reg_cap-&gt;low_5ghz_chan,</div><div class='add'>+						  reg_cap-&gt;high_5ghz_chan);</div><div class='add'>+</div><div class='add'>+			ath12k_mac_update_freq_range(ar, freq_low, freq_high);</div><div class='add'>+			ah-&gt;use_6ghz_regd = true;</div><div class='add'>+</div><div class='add'>+			if (!bands[NL80211_BAND_6GHZ]) {</div><div class='add'>+				bands[NL80211_BAND_6GHZ] = band;</div><div class='add'>+			} else {</div><div class='add'>+				/* Split mac in same band under same wiphy */</div><div class='add'>+				ret = ath12k_mac_update_band(ar,</div><div class='add'>+							     bands[NL80211_BAND_6GHZ],</div><div class='add'>+							     band);</div><div class='add'>+				if (ret) {</div><div class='add'>+					kfree(ar-&gt;mac.sbands[NL80211_BAND_2GHZ].channels);</div><div class='add'>+					ar-&gt;mac.sbands[NL80211_BAND_2GHZ].channels = NULL;</div><div class='add'>+					kfree(channels);</div><div class='add'>+					band-&gt;channels = NULL;</div><div class='add'>+					return ret;</div><div class='add'>+				}</div><div class='add'>+				ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac pdev %u identified as 6 GHz split mac with start freq %d end freq %d",</div><div class='add'>+					   ar-&gt;pdev-&gt;pdev_id,</div><div class='add'>+					   KHZ_TO_MHZ(ar-&gt;freq_range.start_freq),</div><div class='add'>+					   KHZ_TO_MHZ(ar-&gt;freq_range.end_freq));</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (reg_cap-&gt;low_5ghz_chan &lt; ATH12K_MIN_6GHZ_FREQ) {</div><div class='add'>+			channels = kmemdup(ath12k_5ghz_channels,</div><div class='add'>+					   sizeof(ath12k_5ghz_channels),</div><div class='add'>+					   GFP_KERNEL);</div><div class='add'>+			if (!channels) {</div><div class='add'>+				kfree(ar-&gt;mac.sbands[NL80211_BAND_2GHZ].channels);</div><div class='add'>+				kfree(ar-&gt;mac.sbands[NL80211_BAND_6GHZ].channels);</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			band = &amp;ar-&gt;mac.sbands[NL80211_BAND_5GHZ];</div><div class='add'>+			band-&gt;band = NL80211_BAND_5GHZ;</div><div class='add'>+			band-&gt;n_channels = ARRAY_SIZE(ath12k_5ghz_channels);</div><div class='add'>+			band-&gt;channels = channels;</div><div class='add'>+			band-&gt;n_bitrates = ath12k_a_rates_size;</div><div class='add'>+			band-&gt;bitrates = ath12k_a_rates;</div><div class='add'>+</div><div class='add'>+			if (ab-&gt;hw_params-&gt;single_pdev_only) {</div><div class='add'>+				phy_id = ath12k_get_phy_id(ar, WMI_HOST_WLAN_5GHZ_CAP);</div><div class='add'>+				reg_cap = &amp;ab-&gt;hal_reg_cap[phy_id];</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			freq_low = max(reg_cap-&gt;low_5ghz_chan,</div><div class='add'>+				       ab-&gt;reg_freq_5ghz.start_freq);</div><div class='add'>+			freq_high = min(reg_cap-&gt;high_5ghz_chan,</div><div class='add'>+					ab-&gt;reg_freq_5ghz.end_freq);</div><div class='add'>+</div><div class='add'>+			ath12k_mac_update_ch_list(ar, band,</div><div class='add'>+						  reg_cap-&gt;low_5ghz_chan,</div><div class='add'>+						  reg_cap-&gt;high_5ghz_chan);</div><div class='add'>+</div><div class='add'>+			ath12k_mac_update_freq_range(ar, freq_low, freq_high);</div><div class='add'>+</div><div class='add'>+			if (!bands[NL80211_BAND_5GHZ]) {</div><div class='add'>+				bands[NL80211_BAND_5GHZ] = band;</div><div class='add'>+			} else {</div><div class='add'>+				/* Split mac in same band under same wiphy */</div><div class='add'>+				ret = ath12k_mac_update_band(ar,</div><div class='add'>+							     bands[NL80211_BAND_5GHZ],</div><div class='add'>+							     band);</div><div class='add'>+				if (ret) {</div><div class='add'>+					kfree(ar-&gt;mac.sbands[NL80211_BAND_2GHZ].channels);</div><div class='add'>+					ar-&gt;mac.sbands[NL80211_BAND_2GHZ].channels = NULL;</div><div class='add'>+					kfree(ar-&gt;mac.sbands[NL80211_BAND_6GHZ].channels);</div><div class='add'>+					ar-&gt;mac.sbands[NL80211_BAND_2GHZ].channels = NULL;</div><div class='add'>+					kfree(channels);</div><div class='add'>+					band-&gt;channels = NULL;</div><div class='add'>+					return ret;</div><div class='add'>+				}</div><div class='add'>+				ath12k_dbg(ar-&gt;ab, ATH12K_DBG_MAC, "mac pdev %u identified as 5 GHz split mac with start freq %d end freq %d",</div><div class='add'>+					   ar-&gt;pdev-&gt;pdev_id,</div><div class='add'>+					   KHZ_TO_MHZ(ar-&gt;freq_range.start_freq),</div><div class='add'>+					   KHZ_TO_MHZ(ar-&gt;freq_range.end_freq));</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath12k_mac_get_ifmodes(struct ath12k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int i;</div><div class='add'>+	u16 interface_modes = U16_MAX;</div><div class='add'>+</div><div class='add'>+	for_each_ar(ah, ar, i)</div><div class='add'>+		interface_modes &amp;= ar-&gt;ab-&gt;hw_params-&gt;interface_modes;</div><div class='add'>+</div><div class='add'>+	return interface_modes == U16_MAX ? 0 : interface_modes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_mac_is_iface_mode_enable(struct ath12k_hw *ah,</div><div class='add'>+					    enum nl80211_iftype type)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int i;</div><div class='add'>+	u16 interface_modes, mode = 0;</div><div class='add'>+	bool is_enable = false;</div><div class='add'>+</div><div class='add'>+	if (type == NL80211_IFTYPE_MESH_POINT) {</div><div class='add'>+		if (IS_ENABLED(CONFIG_MAC80211_MESH))</div><div class='add'>+			mode = BIT(type);</div><div class='add'>+	} else {</div><div class='add'>+		mode = BIT(type);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_ar(ah, ar, i) {</div><div class='add'>+		interface_modes = ar-&gt;ab-&gt;hw_params-&gt;interface_modes;</div><div class='add'>+		if (interface_modes &amp; mode) {</div><div class='add'>+			is_enable = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return is_enable;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_mac_setup_radio_iface_comb(struct ath12k *ar,</div><div class='add'>+				  struct ieee80211_iface_combination *comb)</div><div class='add'>+{</div><div class='add'>+	u16 interface_modes = ar-&gt;ab-&gt;hw_params-&gt;interface_modes;</div><div class='add'>+	struct ieee80211_iface_limit *limits;</div><div class='add'>+	int n_limits, max_interfaces;</div><div class='add'>+	bool ap, mesh, p2p;</div><div class='add'>+</div><div class='add'>+	ap = interface_modes &amp; BIT(NL80211_IFTYPE_AP);</div><div class='add'>+	p2p = interface_modes &amp; BIT(NL80211_IFTYPE_P2P_DEVICE);</div><div class='add'>+</div><div class='add'>+	mesh = IS_ENABLED(CONFIG_MAC80211_MESH) &amp;&amp;</div><div class='add'>+	       (interface_modes &amp; BIT(NL80211_IFTYPE_MESH_POINT));</div><div class='add'>+</div><div class='add'>+	if ((ap || mesh) &amp;&amp; !p2p) {</div><div class='add'>+		n_limits = 2;</div><div class='add'>+		max_interfaces = 16;</div><div class='add'>+	} else if (p2p) {</div><div class='add'>+		n_limits = 3;</div><div class='add'>+		if (ap || mesh)</div><div class='add'>+			max_interfaces = 16;</div><div class='add'>+		else</div><div class='add'>+			max_interfaces = 3;</div><div class='add'>+	} else {</div><div class='add'>+		n_limits = 1;</div><div class='add'>+		max_interfaces = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	limits = kcalloc(n_limits, sizeof(*limits), GFP_KERNEL);</div><div class='add'>+	if (!limits)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	limits[0].max = 1;</div><div class='add'>+	limits[0].types |= BIT(NL80211_IFTYPE_STATION);</div><div class='add'>+</div><div class='add'>+	if (ap || mesh || p2p)</div><div class='add'>+		limits[1].max = max_interfaces;</div><div class='add'>+</div><div class='add'>+	if (ap)</div><div class='add'>+		limits[1].types |= BIT(NL80211_IFTYPE_AP);</div><div class='add'>+</div><div class='add'>+	if (mesh)</div><div class='add'>+		limits[1].types |= BIT(NL80211_IFTYPE_MESH_POINT);</div><div class='add'>+</div><div class='add'>+	if (p2p) {</div><div class='add'>+		limits[1].types |= BIT(NL80211_IFTYPE_P2P_CLIENT) |</div><div class='add'>+					BIT(NL80211_IFTYPE_P2P_GO);</div><div class='add'>+		limits[2].max = 1;</div><div class='add'>+		limits[2].types |= BIT(NL80211_IFTYPE_P2P_DEVICE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	comb[0].limits = limits;</div><div class='add'>+	comb[0].n_limits = n_limits;</div><div class='add'>+	comb[0].max_interfaces = max_interfaces;</div><div class='add'>+	comb[0].beacon_int_infra_match = true;</div><div class='add'>+	comb[0].beacon_int_min_gcd = 100;</div><div class='add'>+</div><div class='add'>+	comb[0].num_different_channels = 1;</div><div class='add'>+	comb[0].radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |</div><div class='add'>+				      BIT(NL80211_CHAN_WIDTH_20) |</div><div class='add'>+				      BIT(NL80211_CHAN_WIDTH_40) |</div><div class='add'>+				      BIT(NL80211_CHAN_WIDTH_80) |</div><div class='add'>+				      BIT(NL80211_CHAN_WIDTH_160);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_mac_setup_global_iface_comb(struct ath12k_hw *ah,</div><div class='add'>+				   struct wiphy_radio *radio,</div><div class='add'>+				   u8 n_radio,</div><div class='add'>+				   struct ieee80211_iface_combination *comb)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_iface_combination *iter_comb;</div><div class='add'>+	struct ieee80211_iface_limit *limits;</div><div class='add'>+	int i, j, n_limits;</div><div class='add'>+	bool ap, mesh, p2p;</div><div class='add'>+</div><div class='add'>+	if (!n_radio)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ap = ath12k_mac_is_iface_mode_enable(ah, NL80211_IFTYPE_AP);</div><div class='add'>+	p2p = ath12k_mac_is_iface_mode_enable(ah, NL80211_IFTYPE_P2P_DEVICE);</div><div class='add'>+	mesh = ath12k_mac_is_iface_mode_enable(ah, NL80211_IFTYPE_MESH_POINT);</div><div class='add'>+</div><div class='add'>+	if ((ap || mesh) &amp;&amp; !p2p)</div><div class='add'>+		n_limits = 2;</div><div class='add'>+	else if (p2p)</div><div class='add'>+		n_limits = 3;</div><div class='add'>+	else</div><div class='add'>+		n_limits = 1;</div><div class='add'>+</div><div class='add'>+	limits = kcalloc(n_limits, sizeof(*limits), GFP_KERNEL);</div><div class='add'>+	if (!limits)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n_radio; i++) {</div><div class='add'>+		iter_comb = radio[i].iface_combinations;</div><div class='add'>+		for (j = 0; j &lt; iter_comb-&gt;n_limits &amp;&amp; j &lt; n_limits; j++) {</div><div class='add'>+			limits[j].types |= iter_comb-&gt;limits[j].types;</div><div class='add'>+			limits[j].max += iter_comb-&gt;limits[j].max;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		comb-&gt;max_interfaces += iter_comb-&gt;max_interfaces;</div><div class='add'>+		comb-&gt;num_different_channels += iter_comb-&gt;num_different_channels;</div><div class='add'>+		comb-&gt;radar_detect_widths |= iter_comb-&gt;radar_detect_widths;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	comb-&gt;limits = limits;</div><div class='add'>+	comb-&gt;n_limits = n_limits;</div><div class='add'>+	comb-&gt;beacon_int_infra_match = true;</div><div class='add'>+	comb-&gt;beacon_int_min_gcd = 100;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void ath12k_mac_cleanup_iface_comb(const struct ieee80211_iface_combination *iface_comb)</div><div class='add'>+{</div><div class='add'>+	kfree(iface_comb[0].limits);</div><div class='add'>+	kfree(iface_comb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_cleanup_iface_combinations(struct ath12k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	struct wiphy *wiphy = ah-&gt;hw-&gt;wiphy;</div><div class='add'>+	const struct wiphy_radio *radio;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (wiphy-&gt;n_radio &gt; 0) {</div><div class='add'>+		radio = wiphy-&gt;radio;</div><div class='add'>+		for (i = 0; i &lt; wiphy-&gt;n_radio; i++)</div><div class='add'>+			ath12k_mac_cleanup_iface_comb(radio[i].iface_combinations);</div><div class='add'>+</div><div class='add'>+		kfree(wiphy-&gt;radio);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_mac_cleanup_iface_comb(wiphy-&gt;iface_combinations);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_setup_iface_combinations(struct ath12k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_iface_combination *combinations, *comb;</div><div class='add'>+	struct wiphy *wiphy = ah-&gt;hw-&gt;wiphy;</div><div class='add'>+	struct wiphy_radio *radio;</div><div class='add'>+	int n_combinations = 1;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;num_radio == 1) {</div><div class='add'>+		ar = &amp;ah-&gt;radio[0];</div><div class='add'>+</div><div class='add'>+		if (ar-&gt;ab-&gt;hw_params-&gt;single_pdev_only)</div><div class='add'>+			n_combinations = 2;</div><div class='add'>+</div><div class='add'>+		combinations = kcalloc(n_combinations, sizeof(*combinations),</div><div class='add'>+				       GFP_KERNEL);</div><div class='add'>+		if (!combinations)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		ret = ath12k_mac_setup_radio_iface_comb(ar, combinations);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_hw_warn(ah, "failed to setup radio interface combinations for one radio: %d",</div><div class='add'>+				       ret);</div><div class='add'>+			goto err_free_combinations;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ar-&gt;ab-&gt;hw_params-&gt;single_pdev_only) {</div><div class='add'>+			comb = combinations + 1;</div><div class='add'>+			memcpy(comb, combinations, sizeof(*comb));</div><div class='add'>+			comb-&gt;num_different_channels = 2;</div><div class='add'>+			comb-&gt;radar_detect_widths = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	combinations = kcalloc(n_combinations, sizeof(*combinations), GFP_KERNEL);</div><div class='add'>+	if (!combinations)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* there are multiple radios */</div><div class='add'>+</div><div class='add'>+	radio = kcalloc(ah-&gt;num_radio, sizeof(*radio), GFP_KERNEL);</div><div class='add'>+	if (!radio) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_free_combinations;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_ar(ah, ar, i) {</div><div class='add'>+		comb = kzalloc(sizeof(*comb), GFP_KERNEL);</div><div class='add'>+		if (!comb) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto err_free_radios;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ath12k_mac_setup_radio_iface_comb(ar, comb);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_hw_warn(ah, "failed to setup radio interface combinations for radio %d: %d",</div><div class='add'>+				       i, ret);</div><div class='add'>+			kfree(comb);</div><div class='add'>+			goto err_free_radios;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		radio[i].freq_range = &amp;ar-&gt;freq_range;</div><div class='add'>+		radio[i].n_freq_range = 1;</div><div class='add'>+</div><div class='add'>+		radio[i].iface_combinations = comb;</div><div class='add'>+		radio[i].n_iface_combinations = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_setup_global_iface_comb(ah, radio, ah-&gt;num_radio, combinations);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_hw_warn(ah, "failed to setup global interface combinations: %d",</div><div class='add'>+			       ret);</div><div class='add'>+		goto err_free_all_radios;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;radio = radio;</div><div class='add'>+	wiphy-&gt;n_radio = ah-&gt;num_radio;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	wiphy-&gt;iface_combinations = combinations;</div><div class='add'>+	wiphy-&gt;n_iface_combinations = n_combinations;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_all_radios:</div><div class='add'>+	i = ah-&gt;num_radio;</div><div class='add'>+</div><div class='add'>+err_free_radios:</div><div class='add'>+	while (i--)</div><div class='add'>+		ath12k_mac_cleanup_iface_comb(radio[i].iface_combinations);</div><div class='add'>+</div><div class='add'>+	kfree(radio);</div><div class='add'>+</div><div class='add'>+err_free_combinations:</div><div class='add'>+	kfree(combinations);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const u8 ath12k_if_types_ext_capa[] = {</div><div class='add'>+	[0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING,</div><div class='add'>+	[2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT,</div><div class='add'>+	[7] = WLAN_EXT_CAPA8_OPMODE_NOTIF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 ath12k_if_types_ext_capa_sta[] = {</div><div class='add'>+	[0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING,</div><div class='add'>+	[2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT,</div><div class='add'>+	[7] = WLAN_EXT_CAPA8_OPMODE_NOTIF,</div><div class='add'>+	[9] = WLAN_EXT_CAPA10_TWT_REQUESTER_SUPPORT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 ath12k_if_types_ext_capa_ap[] = {</div><div class='add'>+	[0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING,</div><div class='add'>+	[2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT,</div><div class='add'>+	[7] = WLAN_EXT_CAPA8_OPMODE_NOTIF,</div><div class='add'>+	[9] = WLAN_EXT_CAPA10_TWT_RESPONDER_SUPPORT,</div><div class='add'>+	[10] = WLAN_EXT_CAPA11_EMA_SUPPORT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct wiphy_iftype_ext_capab ath12k_iftypes_ext_capa[] = {</div><div class='add'>+	{</div><div class='add'>+		.extended_capabilities = ath12k_if_types_ext_capa,</div><div class='add'>+		.extended_capabilities_mask = ath12k_if_types_ext_capa,</div><div class='add'>+		.extended_capabilities_len = sizeof(ath12k_if_types_ext_capa),</div><div class='add'>+	}, {</div><div class='add'>+		.iftype = NL80211_IFTYPE_STATION,</div><div class='add'>+		.extended_capabilities = ath12k_if_types_ext_capa_sta,</div><div class='add'>+		.extended_capabilities_mask = ath12k_if_types_ext_capa_sta,</div><div class='add'>+		.extended_capabilities_len =</div><div class='add'>+				sizeof(ath12k_if_types_ext_capa_sta),</div><div class='add'>+	}, {</div><div class='add'>+		.iftype = NL80211_IFTYPE_AP,</div><div class='add'>+		.extended_capabilities = ath12k_if_types_ext_capa_ap,</div><div class='add'>+		.extended_capabilities_mask = ath12k_if_types_ext_capa_ap,</div><div class='add'>+		.extended_capabilities_len =</div><div class='add'>+				sizeof(ath12k_if_types_ext_capa_ap),</div><div class='add'>+		.eml_capabilities = 0,</div><div class='add'>+		.mld_capa_and_ops = 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_cleanup_unregister(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	idr_for_each(&amp;ar-&gt;txmgmt_idr, ath12k_mac_tx_mgmt_pending_free, ar);</div><div class='add'>+	idr_destroy(&amp;ar-&gt;txmgmt_idr);</div><div class='add'>+</div><div class='add'>+	kfree(ar-&gt;mac.sbands[NL80211_BAND_2GHZ].channels);</div><div class='add'>+	kfree(ar-&gt;mac.sbands[NL80211_BAND_5GHZ].channels);</div><div class='add'>+	kfree(ar-&gt;mac.sbands[NL80211_BAND_6GHZ].channels);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_hw_unregister(struct ath12k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = ah-&gt;hw;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_ar(ah, ar, i) {</div><div class='add'>+		cancel_work_sync(&amp;ar-&gt;regd_channel_update_work);</div><div class='add'>+		cancel_work_sync(&amp;ar-&gt;regd_update_work);</div><div class='add'>+		ath12k_debugfs_unregister(ar);</div><div class='add'>+		ath12k_fw_stats_reset(ar);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ieee80211_unregister_hw(hw);</div><div class='add'>+</div><div class='add'>+	for_each_ar(ah, ar, i)</div><div class='add'>+		ath12k_mac_cleanup_unregister(ar);</div><div class='add'>+</div><div class='add'>+	ath12k_mac_cleanup_iface_combinations(ah);</div><div class='add'>+</div><div class='add'>+	SET_IEEE80211_DEV(hw, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_setup_register(struct ath12k *ar,</div><div class='add'>+				     u32 *ht_cap,</div><div class='add'>+				     struct ieee80211_supported_band *bands[])</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pdev_cap *cap = &amp;ar-&gt;pdev-&gt;cap;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;ar-&gt;txmgmt_empty_waitq);</div><div class='add'>+	idr_init(&amp;ar-&gt;txmgmt_idr);</div><div class='add'>+	spin_lock_init(&amp;ar-&gt;txmgmt_idr_lock);</div><div class='add'>+</div><div class='add'>+	ath12k_pdev_caps_update(ar);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_setup_channels_rates(ar,</div><div class='add'>+					      cap-&gt;supported_bands,</div><div class='add'>+					      bands);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ath12k_mac_setup_ht_vht_cap(ar, cap, ht_cap);</div><div class='add'>+	ath12k_mac_setup_sband_iftype_data(ar, cap);</div><div class='add'>+</div><div class='add'>+	ar-&gt;max_num_stations = ath12k_core_get_max_station_per_radio(ar-&gt;ab);</div><div class='add'>+	ar-&gt;max_num_peers = ath12k_core_get_max_peers_per_radio(ar-&gt;ab);</div><div class='add'>+</div><div class='add'>+	ar-&gt;rssi_info.min_nf_dbm = ATH12K_DEFAULT_NOISE_FLOOR;</div><div class='add'>+	ar-&gt;rssi_info.temp_offset = 0;</div><div class='add'>+	ar-&gt;rssi_info.noise_floor = ar-&gt;rssi_info.min_nf_dbm + ar-&gt;rssi_info.temp_offset;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mac_hw_register(struct ath12k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = ah-&gt;hw;</div><div class='add'>+	struct wiphy *wiphy = hw-&gt;wiphy;</div><div class='add'>+	struct ath12k *ar = ath12k_ah_to_ar(ah, 0);</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_pdev *pdev;</div><div class='add'>+	struct ath12k_pdev_cap *cap;</div><div class='add'>+	static const u32 cipher_suites[] = {</div><div class='add'>+		WLAN_CIPHER_SUITE_TKIP,</div><div class='add'>+		WLAN_CIPHER_SUITE_CCMP,</div><div class='add'>+		WLAN_CIPHER_SUITE_AES_CMAC,</div><div class='add'>+		WLAN_CIPHER_SUITE_BIP_CMAC_256,</div><div class='add'>+		WLAN_CIPHER_SUITE_BIP_GMAC_128,</div><div class='add'>+		WLAN_CIPHER_SUITE_BIP_GMAC_256,</div><div class='add'>+		WLAN_CIPHER_SUITE_GCMP,</div><div class='add'>+		WLAN_CIPHER_SUITE_GCMP_256,</div><div class='add'>+		WLAN_CIPHER_SUITE_CCMP_256,</div><div class='add'>+	};</div><div class='add'>+	int ret, i, j;</div><div class='add'>+	u32 ht_cap = U32_MAX, antennas_rx = 0, antennas_tx = 0;</div><div class='add'>+	bool is_6ghz = false, is_raw_mode = false, is_monitor_disable = false;</div><div class='add'>+	u8 *mac_addr = NULL;</div><div class='add'>+	u8 mbssid_max_interfaces = 0;</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;max_ap_assoc_sta = 0;</div><div class='add'>+</div><div class='add'>+	for_each_ar(ah, ar, i) {</div><div class='add'>+		u32 ht_cap_info = 0;</div><div class='add'>+</div><div class='add'>+		pdev = ar-&gt;pdev;</div><div class='add'>+		if (ar-&gt;ab-&gt;pdevs_macaddr_valid) {</div><div class='add'>+			ether_addr_copy(ar-&gt;mac_addr, pdev-&gt;mac_addr);</div><div class='add'>+		} else {</div><div class='add'>+			ether_addr_copy(ar-&gt;mac_addr, ar-&gt;ab-&gt;mac_addr);</div><div class='add'>+			ar-&gt;mac_addr[4] += ar-&gt;pdev_idx;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ath12k_mac_setup_register(ar, &amp;ht_cap_info, hw-&gt;wiphy-&gt;bands);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_cleanup_unregister;</div><div class='add'>+</div><div class='add'>+		/* 6 GHz does not support HT Cap, hence do not consider it */</div><div class='add'>+		if (!ar-&gt;supports_6ghz)</div><div class='add'>+			ht_cap &amp;= ht_cap_info;</div><div class='add'>+</div><div class='add'>+		wiphy-&gt;max_ap_assoc_sta += ar-&gt;max_num_stations;</div><div class='add'>+</div><div class='add'>+		/* Advertise the max antenna support of all radios, driver can handle</div><div class='add'>+		 * per pdev specific antenna setting based on pdev cap when antenna</div><div class='add'>+		 * changes are made</div><div class='add'>+		 */</div><div class='add'>+		cap = &amp;pdev-&gt;cap;</div><div class='add'>+</div><div class='add'>+		antennas_rx = max_t(u32, antennas_rx, cap-&gt;rx_chain_mask);</div><div class='add'>+		antennas_tx = max_t(u32, antennas_tx, cap-&gt;tx_chain_mask);</div><div class='add'>+</div><div class='add'>+		if (ar-&gt;supports_6ghz)</div><div class='add'>+			is_6ghz = true;</div><div class='add'>+</div><div class='add'>+		if (test_bit(ATH12K_FLAG_RAW_MODE, &amp;ar-&gt;ab-&gt;dev_flags))</div><div class='add'>+			is_raw_mode = true;</div><div class='add'>+</div><div class='add'>+		if (!ar-&gt;ab-&gt;hw_params-&gt;supports_monitor)</div><div class='add'>+			is_monitor_disable = true;</div><div class='add'>+</div><div class='add'>+		if (i == 0)</div><div class='add'>+			mac_addr = ar-&gt;mac_addr;</div><div class='add'>+		else</div><div class='add'>+			mac_addr = ab-&gt;mac_addr;</div><div class='add'>+</div><div class='add'>+		mbssid_max_interfaces += TARGET_NUM_VDEVS(ar-&gt;ab);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;available_antennas_rx = antennas_rx;</div><div class='add'>+	wiphy-&gt;available_antennas_tx = antennas_tx;</div><div class='add'>+</div><div class='add'>+	SET_IEEE80211_PERM_ADDR(hw, mac_addr);</div><div class='add'>+	SET_IEEE80211_DEV(hw, ab-&gt;dev);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_setup_iface_combinations(ah);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to setup interface combinations: %d\n", ret);</div><div class='add'>+		goto err_complete_cleanup_unregister;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;interface_modes = ath12k_mac_get_ifmodes(ah);</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;num_radio == 1 &amp;&amp;</div><div class='add'>+	    wiphy-&gt;bands[NL80211_BAND_2GHZ] &amp;&amp;</div><div class='add'>+	    wiphy-&gt;bands[NL80211_BAND_5GHZ] &amp;&amp;</div><div class='add'>+	    wiphy-&gt;bands[NL80211_BAND_6GHZ])</div><div class='add'>+		ieee80211_hw_set(hw, SINGLE_SCAN_ON_ALL_BANDS);</div><div class='add'>+</div><div class='add'>+	ieee80211_hw_set(hw, SIGNAL_DBM);</div><div class='add'>+	ieee80211_hw_set(hw, SUPPORTS_PS);</div><div class='add'>+	ieee80211_hw_set(hw, SUPPORTS_DYNAMIC_PS);</div><div class='add'>+	ieee80211_hw_set(hw, MFP_CAPABLE);</div><div class='add'>+	ieee80211_hw_set(hw, REPORTS_TX_ACK_STATUS);</div><div class='add'>+	ieee80211_hw_set(hw, HAS_RATE_CONTROL);</div><div class='add'>+	ieee80211_hw_set(hw, AP_LINK_PS);</div><div class='add'>+	ieee80211_hw_set(hw, SPECTRUM_MGMT);</div><div class='add'>+	ieee80211_hw_set(hw, CONNECTION_MONITOR);</div><div class='add'>+	ieee80211_hw_set(hw, SUPPORTS_PER_STA_GTK);</div><div class='add'>+	ieee80211_hw_set(hw, CHANCTX_STA_CSA);</div><div class='add'>+	ieee80211_hw_set(hw, QUEUE_CONTROL);</div><div class='add'>+	ieee80211_hw_set(hw, SUPPORTS_TX_FRAG);</div><div class='add'>+	ieee80211_hw_set(hw, REPORTS_LOW_ACK);</div><div class='add'>+	ieee80211_hw_set(hw, NO_VIRTUAL_MONITOR);</div><div class='add'>+</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_ETH_OFFLOAD, ar-&gt;wmi-&gt;wmi_ab-&gt;svc_map)) {</div><div class='add'>+		ieee80211_hw_set(hw, SUPPORTS_TX_ENCAP_OFFLOAD);</div><div class='add'>+		ieee80211_hw_set(hw, SUPPORTS_RX_DECAP_OFFLOAD);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cap-&gt;nss_ratio_enabled)</div><div class='add'>+		ieee80211_hw_set(hw, SUPPORTS_VHT_EXT_NSS_BW);</div><div class='add'>+</div><div class='add'>+	if ((ht_cap &amp; WMI_HT_CAP_ENABLED) || is_6ghz) {</div><div class='add'>+		ieee80211_hw_set(hw, AMPDU_AGGREGATION);</div><div class='add'>+		ieee80211_hw_set(hw, TX_AMPDU_SETUP_IN_HW);</div><div class='add'>+		ieee80211_hw_set(hw, SUPPORTS_REORDERING_BUFFER);</div><div class='add'>+		ieee80211_hw_set(hw, SUPPORTS_AMSDU_IN_AMPDU);</div><div class='add'>+		ieee80211_hw_set(hw, USES_RSS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;features |= NL80211_FEATURE_STATIC_SMPS;</div><div class='add'>+	wiphy-&gt;flags |= WIPHY_FLAG_IBSS_RSN;</div><div class='add'>+</div><div class='add'>+	/* TODO: Check if HT capability advertised from firmware is different</div><div class='add'>+	 * for each band for a dual band capable radio. It will be tricky to</div><div class='add'>+	 * handle it when the ht capability different for each band.</div><div class='add'>+	 */</div><div class='add'>+	if (ht_cap &amp; WMI_HT_CAP_DYNAMIC_SMPS ||</div><div class='add'>+	    (is_6ghz &amp;&amp; ab-&gt;hw_params-&gt;supports_dynamic_smps_6ghz))</div><div class='add'>+		wiphy-&gt;features |= NL80211_FEATURE_DYNAMIC_SMPS;</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;max_scan_ssids = WLAN_SCAN_PARAMS_MAX_SSID;</div><div class='add'>+	wiphy-&gt;max_scan_ie_len = WLAN_SCAN_PARAMS_MAX_IE_LEN;</div><div class='add'>+</div><div class='add'>+	hw-&gt;max_listen_interval = ATH12K_MAX_HW_LISTEN_INTERVAL;</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;</div><div class='add'>+	wiphy-&gt;flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;</div><div class='add'>+	wiphy-&gt;max_remain_on_channel_duration = 5000;</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;flags |= WIPHY_FLAG_AP_UAPSD;</div><div class='add'>+	wiphy-&gt;features |= NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE |</div><div class='add'>+				   NL80211_FEATURE_AP_SCAN;</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;features |= NL80211_FEATURE_TX_POWER_INSERTION;</div><div class='add'>+</div><div class='add'>+	/* MLO is not yet supported so disable Wireless Extensions for now</div><div class='add'>+	 * to make sure ath12k users don't use it. This flag can be removed</div><div class='add'>+	 * once WIPHY_FLAG_SUPPORTS_MLO is enabled.</div><div class='add'>+	 */</div><div class='add'>+	wiphy-&gt;flags |= WIPHY_FLAG_DISABLE_WEXT;</div><div class='add'>+</div><div class='add'>+	/* Copy over MLO related capabilities received from</div><div class='add'>+	 * WMI_SERVICE_READY_EXT2_EVENT if single_chip_mlo_supp is set.</div><div class='add'>+	 */</div><div class='add'>+	if (ab-&gt;ag-&gt;mlo_capable) {</div><div class='add'>+		ath12k_iftypes_ext_capa[2].eml_capabilities = cap-&gt;eml_cap;</div><div class='add'>+		ath12k_iftypes_ext_capa[2].mld_capa_and_ops = cap-&gt;mld_cap;</div><div class='add'>+		wiphy-&gt;flags |= WIPHY_FLAG_SUPPORTS_MLO;</div><div class='add'>+</div><div class='add'>+		ieee80211_hw_set(hw, MLO_MCAST_MULTI_LINK_TX);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hw-&gt;queues = ATH12K_HW_MAX_QUEUES;</div><div class='add'>+	wiphy-&gt;tx_queue_len = ATH12K_QUEUE_LEN;</div><div class='add'>+	hw-&gt;offchannel_tx_hw_queue = ATH12K_HW_MAX_QUEUES - 1;</div><div class='add'>+	hw-&gt;max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF_EHT;</div><div class='add'>+</div><div class='add'>+	hw-&gt;vif_data_size = sizeof(struct ath12k_vif);</div><div class='add'>+	hw-&gt;sta_data_size = sizeof(struct ath12k_sta);</div><div class='add'>+	hw-&gt;extra_tx_headroom = ab-&gt;hw_params-&gt;iova_mask;</div><div class='add'>+</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_STA_TX_PWR);</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT);</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_BSS_COLOR_OFFLOAD,</div><div class='add'>+		     ab-&gt;wmi_ab.svc_map)) {</div><div class='add'>+		wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_BSS_COLOR);</div><div class='add'>+		ieee80211_hw_set(hw, DETECTS_COLOR_COLLISION);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;cipher_suites = cipher_suites;</div><div class='add'>+	wiphy-&gt;n_cipher_suites = ARRAY_SIZE(cipher_suites);</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;iftype_ext_capab = ath12k_iftypes_ext_capa;</div><div class='add'>+	wiphy-&gt;num_iftype_ext_capab = ARRAY_SIZE(ath12k_iftypes_ext_capa);</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;mbssid_max_interfaces = mbssid_max_interfaces;</div><div class='add'>+	wiphy-&gt;ema_max_profile_periodicity = TARGET_EMA_MAX_PROFILE_PERIOD;</div><div class='add'>+	ieee80211_hw_set(hw, SUPPORTS_MULTI_BSSID);</div><div class='add'>+</div><div class='add'>+	if (is_6ghz) {</div><div class='add'>+		wiphy_ext_feature_set(wiphy,</div><div class='add'>+				      NL80211_EXT_FEATURE_FILS_DISCOVERY);</div><div class='add'>+		wiphy_ext_feature_set(wiphy,</div><div class='add'>+				      NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_PUNCT);</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_BEACON_PROTECTION_SUPPORT, ab-&gt;wmi_ab.svc_map))</div><div class='add'>+		wiphy_ext_feature_set(hw-&gt;wiphy, NL80211_EXT_FEATURE_BEACON_PROTECTION);</div><div class='add'>+</div><div class='add'>+	ath12k_reg_init(hw);</div><div class='add'>+</div><div class='add'>+	if (!is_raw_mode) {</div><div class='add'>+		hw-&gt;netdev_features = NETIF_F_HW_CSUM;</div><div class='add'>+		ieee80211_hw_set(hw, SW_CRYPTO_CONTROL);</div><div class='add'>+		ieee80211_hw_set(hw, SUPPORT_FAST_XMIT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_NLO, ar-&gt;wmi-&gt;wmi_ab-&gt;svc_map)) {</div><div class='add'>+		wiphy-&gt;max_sched_scan_ssids = WMI_PNO_MAX_SUPP_NETWORKS;</div><div class='add'>+		wiphy-&gt;max_match_sets = WMI_PNO_MAX_SUPP_NETWORKS;</div><div class='add'>+		wiphy-&gt;max_sched_scan_ie_len = WMI_PNO_MAX_IE_LENGTH;</div><div class='add'>+		wiphy-&gt;max_sched_scan_plans = WMI_PNO_MAX_SCHED_SCAN_PLANS;</div><div class='add'>+		wiphy-&gt;max_sched_scan_plan_interval =</div><div class='add'>+					WMI_PNO_MAX_SCHED_SCAN_PLAN_INT;</div><div class='add'>+		wiphy-&gt;max_sched_scan_plan_iterations =</div><div class='add'>+					WMI_PNO_MAX_SCHED_SCAN_PLAN_ITRNS;</div><div class='add'>+		wiphy-&gt;features |= NL80211_FEATURE_ND_RANDOM_MAC_ADDR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wow_init(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to init wow: %d\n", ret);</div><div class='add'>+		goto err_cleanup_if_combs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Boot-time regulatory updates have already been processed.</div><div class='add'>+	 * Mark them as complete now, because after registration,</div><div class='add'>+	 * cfg80211 will notify us again if there are any pending hints.</div><div class='add'>+	 * We need to wait for those hints to be processed, so it's</div><div class='add'>+	 * important to mark the boot-time updates as complete before</div><div class='add'>+	 * proceeding with registration.</div><div class='add'>+	 */</div><div class='add'>+	for_each_ar(ah, ar, i)</div><div class='add'>+		complete_all(&amp;ar-&gt;regd_update_completed);</div><div class='add'>+</div><div class='add'>+	ret = ieee80211_register_hw(hw);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "ieee80211 registration failed: %d\n", ret);</div><div class='add'>+		goto err_cleanup_if_combs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_monitor_disable)</div><div class='add'>+		/* There's a race between calling ieee80211_register_hw()</div><div class='add'>+		 * and here where the monitor mode is enabled for a little</div><div class='add'>+		 * while. But that time is so short and in practise it make</div><div class='add'>+		 * a difference in real life.</div><div class='add'>+		 */</div><div class='add'>+		wiphy-&gt;interface_modes &amp;= ~BIT(NL80211_IFTYPE_MONITOR);</div><div class='add'>+</div><div class='add'>+	for_each_ar(ah, ar, i) {</div><div class='add'>+		/* Apply the regd received during initialization */</div><div class='add'>+		ret = ath12k_regd_update(ar, true);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_err(ar-&gt;ab, "ath12k regd update failed: %d\n", ret);</div><div class='add'>+			goto err_unregister_hw;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ar-&gt;ab-&gt;hw_params-&gt;current_cc_support &amp;&amp; ab-&gt;new_alpha2[0]) {</div><div class='add'>+			struct wmi_set_current_country_arg current_cc = {};</div><div class='add'>+</div><div class='add'>+			memcpy(&amp;current_cc.alpha2, ab-&gt;new_alpha2, 2);</div><div class='add'>+			memcpy(&amp;ar-&gt;alpha2, ab-&gt;new_alpha2, 2);</div><div class='add'>+</div><div class='add'>+			reinit_completion(&amp;ar-&gt;regd_update_completed);</div><div class='add'>+</div><div class='add'>+			ret = ath12k_wmi_send_set_current_country_cmd(ar, &amp;current_cc);</div><div class='add'>+			if (ret)</div><div class='add'>+				ath12k_warn(ar-&gt;ab,</div><div class='add'>+					    "failed set cc code for mac register: %d\n",</div><div class='add'>+					    ret);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath12k_fw_stats_init(ar);</div><div class='add'>+		ath12k_debugfs_register(ar);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_unregister_hw:</div><div class='add'>+	for_each_ar(ah, ar, i)</div><div class='add'>+		ath12k_debugfs_unregister(ar);</div><div class='add'>+</div><div class='add'>+	ieee80211_unregister_hw(hw);</div><div class='add'>+</div><div class='add'>+err_cleanup_if_combs:</div><div class='add'>+	ath12k_mac_cleanup_iface_combinations(ah);</div><div class='add'>+</div><div class='add'>+err_complete_cleanup_unregister:</div><div class='add'>+	i = ah-&gt;num_radio;</div><div class='add'>+</div><div class='add'>+err_cleanup_unregister:</div><div class='add'>+	for (j = 0; j &lt; i; j++) {</div><div class='add'>+		ar = ath12k_ah_to_ar(ah, j);</div><div class='add'>+		ath12k_mac_cleanup_unregister(ar);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	SET_IEEE80211_DEV(hw, NULL);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_setup(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_pdev *pdev = ar-&gt;pdev;</div><div class='add'>+	u8 pdev_idx = ar-&gt;pdev_idx;</div><div class='add'>+</div><div class='add'>+	ar-&gt;lmac_id = ath12k_hw_get_mac_from_pdev_id(ab-&gt;hw_params, pdev_idx);</div><div class='add'>+</div><div class='add'>+	ar-&gt;wmi = &amp;ab-&gt;wmi_ab.wmi[pdev_idx];</div><div class='add'>+	/* FIXME: wmi[0] is already initialized during attach,</div><div class='add'>+	 * Should we do this again?</div><div class='add'>+	 */</div><div class='add'>+	ath12k_wmi_pdev_attach(ab, pdev_idx);</div><div class='add'>+</div><div class='add'>+	ar-&gt;cfg_tx_chainmask = pdev-&gt;cap.tx_chain_mask;</div><div class='add'>+	ar-&gt;cfg_rx_chainmask = pdev-&gt;cap.rx_chain_mask;</div><div class='add'>+	ar-&gt;num_tx_chains = hweight32(pdev-&gt;cap.tx_chain_mask);</div><div class='add'>+	ar-&gt;num_rx_chains = hweight32(pdev-&gt;cap.rx_chain_mask);</div><div class='add'>+	ar-&gt;scan.arvif = NULL;</div><div class='add'>+	ar-&gt;vdev_id_11d_scan = ATH12K_11D_INVALID_VDEV_ID;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;ar-&gt;data_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;ar-&gt;arvifs);</div><div class='add'>+	INIT_LIST_HEAD(&amp;ar-&gt;ppdu_stats_info);</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;ar-&gt;vdev_setup_done);</div><div class='add'>+	init_completion(&amp;ar-&gt;vdev_delete_done);</div><div class='add'>+	init_completion(&amp;ar-&gt;peer_assoc_done);</div><div class='add'>+	init_completion(&amp;ar-&gt;peer_delete_done);</div><div class='add'>+	init_completion(&amp;ar-&gt;install_key_done);</div><div class='add'>+	init_completion(&amp;ar-&gt;bss_survey_done);</div><div class='add'>+	init_completion(&amp;ar-&gt;scan.started);</div><div class='add'>+	init_completion(&amp;ar-&gt;scan.completed);</div><div class='add'>+	init_completion(&amp;ar-&gt;scan.on_channel);</div><div class='add'>+	init_completion(&amp;ar-&gt;mlo_setup_done);</div><div class='add'>+	init_completion(&amp;ar-&gt;completed_11d_scan);</div><div class='add'>+	init_completion(&amp;ar-&gt;regd_update_completed);</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;ar-&gt;scan.timeout, ath12k_scan_timeout_work);</div><div class='add'>+	wiphy_work_init(&amp;ar-&gt;scan.vdev_clean_wk, ath12k_scan_vdev_clean_work);</div><div class='add'>+	INIT_WORK(&amp;ar-&gt;regd_channel_update_work, ath12k_regd_update_chan_list_work);</div><div class='add'>+	INIT_LIST_HEAD(&amp;ar-&gt;regd_channel_update_queue);</div><div class='add'>+	INIT_WORK(&amp;ar-&gt;regd_update_work, ath12k_regd_update_work);</div><div class='add'>+</div><div class='add'>+	wiphy_work_init(&amp;ar-&gt;wmi_mgmt_tx_work, ath12k_mgmt_over_wmi_tx_work);</div><div class='add'>+	skb_queue_head_init(&amp;ar-&gt;wmi_mgmt_tx_queue);</div><div class='add'>+</div><div class='add'>+	ar-&gt;monitor_vdev_id = -1;</div><div class='add'>+	ar-&gt;monitor_vdev_created = false;</div><div class='add'>+	ar-&gt;monitor_started = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __ath12k_mac_mlo_setup(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	u8 num_link = 0, partner_link_id[ATH12K_GROUP_MAX_RADIO] = {};</div><div class='add'>+	struct ath12k_base *partner_ab, *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_hw_group *ag = ab-&gt;ag;</div><div class='add'>+	struct wmi_mlo_setup_arg mlo = {};</div><div class='add'>+	struct ath12k_pdev *pdev;</div><div class='add'>+	unsigned long time_left;</div><div class='add'>+	int i, j, ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;ar-&gt;mlo_setup_done);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_devices; i++) {</div><div class='add'>+		partner_ab = ag-&gt;ab[i];</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; partner_ab-&gt;num_radios; j++) {</div><div class='add'>+			pdev = &amp;partner_ab-&gt;pdevs[j];</div><div class='add'>+</div><div class='add'>+			/* Avoid the self link */</div><div class='add'>+			if (ar == pdev-&gt;ar)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			partner_link_id[num_link] = pdev-&gt;hw_link_id;</div><div class='add'>+			num_link++;</div><div class='add'>+</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_MAC, "device %d pdev %d hw_link_id %d num_link %d\n",</div><div class='add'>+				   i, j, pdev-&gt;hw_link_id, num_link);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (num_link == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mlo.group_id = cpu_to_le32(ag-&gt;id);</div><div class='add'>+	mlo.partner_link_id = partner_link_id;</div><div class='add'>+	mlo.num_partner_links = num_link;</div><div class='add'>+	ar-&gt;mlo_setup_status = 0;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MAC, "group id %d num_link %d\n", ag-&gt;id, num_link);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_mlo_setup(ar, &amp;mlo);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to send  setup MLO WMI command for pdev %d: %d\n",</div><div class='add'>+			   ar-&gt;pdev_idx, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;ar-&gt;mlo_setup_done,</div><div class='add'>+						WMI_MLO_CMD_TIMEOUT_HZ);</div><div class='add'>+</div><div class='add'>+	if (!time_left || ar-&gt;mlo_setup_status)</div><div class='add'>+		return ar-&gt;mlo_setup_status ? : -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MAC, "mlo setup done for pdev %d\n", ar-&gt;pdev_idx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __ath12k_mac_mlo_teardown(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 num_link;</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_FLAG_RECOVERY, &amp;ab-&gt;dev_flags))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	num_link = ath12k_get_num_partner_link(ar);</div><div class='add'>+</div><div class='add'>+	if (num_link == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_mlo_teardown(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to send MLO teardown WMI command for pdev %d: %d\n",</div><div class='add'>+			    ar-&gt;pdev_idx, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MAC, "mlo teardown for pdev %d\n", ar-&gt;pdev_idx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_mac_mlo_setup(struct ath12k_hw_group *ag)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int ret;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_hw; i++) {</div><div class='add'>+		ah = ag-&gt;ah[i];</div><div class='add'>+		if (!ah)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for_each_ar(ah, ar, j) {</div><div class='add'>+			ar = &amp;ah-&gt;radio[j];</div><div class='add'>+			ret = __ath12k_mac_mlo_setup(ar);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_err(ar-&gt;ab, "failed to setup MLO: %d\n", ret);</div><div class='add'>+				goto err_setup;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_setup:</div><div class='add'>+	for (i = i - 1; i &gt;= 0; i--) {</div><div class='add'>+		ah = ag-&gt;ah[i];</div><div class='add'>+		if (!ah)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (j = j - 1; j &gt;= 0; j--) {</div><div class='add'>+			ar = &amp;ah-&gt;radio[j];</div><div class='add'>+			if (!ar)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			__ath12k_mac_mlo_teardown(ar);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_mac_mlo_teardown(struct ath12k_hw_group *ag)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int ret, i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_hw; i++) {</div><div class='add'>+		ah = ag-&gt;ah[i];</div><div class='add'>+		if (!ah)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for_each_ar(ah, ar, j) {</div><div class='add'>+			ar = &amp;ah-&gt;radio[j];</div><div class='add'>+			ret = __ath12k_mac_mlo_teardown(ar);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_err(ar-&gt;ab, "failed to teardown MLO: %d\n", ret);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_mac_register(struct ath12k_hw_group *ag)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah;</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_hw; i++) {</div><div class='add'>+		ah = ath12k_ag_to_ah(ag, i);</div><div class='add'>+</div><div class='add'>+		ret = ath12k_mac_hw_register(ah);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	for (i = i - 1; i &gt;= 0; i--) {</div><div class='add'>+		ah = ath12k_ag_to_ah(ag, i);</div><div class='add'>+		if (!ah)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ath12k_mac_hw_unregister(ah);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_mac_unregister(struct ath12k_hw_group *ag)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = ag-&gt;num_hw - 1; i &gt;= 0; i--) {</div><div class='add'>+		ah = ath12k_ag_to_ah(ag, i);</div><div class='add'>+		if (!ah)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ath12k_mac_hw_unregister(ah);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_hw_destroy(struct ath12k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	ieee80211_free_hw(ah-&gt;hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ath12k_hw *ath12k_mac_hw_allocate(struct ath12k_hw_group *ag,</div><div class='add'>+						struct ath12k_pdev_map *pdev_map,</div><div class='add'>+						u8 num_pdev_map)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	struct ath12k_pdev *pdev;</div><div class='add'>+	struct ath12k_hw *ah;</div><div class='add'>+	int i;</div><div class='add'>+	u8 pdev_idx;</div><div class='add'>+</div><div class='add'>+	hw = ieee80211_alloc_hw(struct_size(ah, radio, num_pdev_map),</div><div class='add'>+				&amp;ath12k_ops);</div><div class='add'>+	if (!hw)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	ah-&gt;hw = hw;</div><div class='add'>+	ah-&gt;num_radio = num_pdev_map;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;ah-&gt;hw_mutex);</div><div class='add'>+	INIT_LIST_HEAD(&amp;ah-&gt;ml_peers);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_pdev_map; i++) {</div><div class='add'>+		ab = pdev_map[i].ab;</div><div class='add'>+		pdev_idx = pdev_map[i].pdev_idx;</div><div class='add'>+		pdev = &amp;ab-&gt;pdevs[pdev_idx];</div><div class='add'>+</div><div class='add'>+		ar = ath12k_ah_to_ar(ah, i);</div><div class='add'>+		ar-&gt;ah = ah;</div><div class='add'>+		ar-&gt;ab = ab;</div><div class='add'>+		ar-&gt;hw_link_id = pdev-&gt;hw_link_id;</div><div class='add'>+		ar-&gt;pdev = pdev;</div><div class='add'>+		ar-&gt;pdev_idx = pdev_idx;</div><div class='add'>+		pdev-&gt;ar = ar;</div><div class='add'>+</div><div class='add'>+		ag-&gt;hw_links[ar-&gt;hw_link_id].device_id = ab-&gt;device_id;</div><div class='add'>+		ag-&gt;hw_links[ar-&gt;hw_link_id].pdev_idx = pdev_idx;</div><div class='add'>+</div><div class='add'>+		ath12k_mac_setup(ar);</div><div class='add'>+		ath12k_dp_pdev_pre_alloc(ar);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ah;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_mac_destroy(struct ath12k_hw_group *ag)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pdev *pdev;</div><div class='add'>+	struct ath12k_base *ab = ag-&gt;ab[0];</div><div class='add'>+	int i, j;</div><div class='add'>+	struct ath12k_hw *ah;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_devices; i++) {</div><div class='add'>+		ab = ag-&gt;ab[i];</div><div class='add'>+		if (!ab)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; ab-&gt;num_radios; j++) {</div><div class='add'>+			pdev = &amp;ab-&gt;pdevs[j];</div><div class='add'>+			if (!pdev-&gt;ar)</div><div class='add'>+				continue;</div><div class='add'>+			pdev-&gt;ar = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_hw; i++) {</div><div class='add'>+		ah = ath12k_ag_to_ah(ag, i);</div><div class='add'>+		if (!ah)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ath12k_mac_hw_destroy(ah);</div><div class='add'>+		ath12k_ag_set_ah(ag, i, NULL);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mac_set_device_defaults(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int total_vdev;</div><div class='add'>+</div><div class='add'>+	/* Initialize channel counters frequency value in hertz */</div><div class='add'>+	ab-&gt;cc_freq_hz = 320000;</div><div class='add'>+	total_vdev = ab-&gt;num_radios * TARGET_NUM_VDEVS(ab);</div><div class='add'>+	ab-&gt;free_vdev_map = (1LL &lt;&lt; total_vdev) - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_mac_allocate(struct ath12k_hw_group *ag)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pdev_map pdev_map[ATH12K_GROUP_MAX_RADIO];</div><div class='add'>+	int mac_id, device_id, total_radio, num_hw;</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	struct ath12k_hw *ah;</div><div class='add'>+	int ret, i, j;</div><div class='add'>+	u8 radio_per_hw;</div><div class='add'>+</div><div class='add'>+	total_radio = 0;</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_devices; i++) {</div><div class='add'>+		ab = ag-&gt;ab[i];</div><div class='add'>+		if (!ab)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ath12k_debugfs_pdev_create(ab);</div><div class='add'>+		ath12k_mac_set_device_defaults(ab);</div><div class='add'>+		total_radio += ab-&gt;num_radios;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!total_radio)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(total_radio &gt; ATH12K_GROUP_MAX_RADIO))</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	/* All pdev get combined and register as single wiphy based on</div><div class='add'>+	 * hardware group which participate in multi-link operation else</div><div class='add'>+	 * each pdev get register separately.</div><div class='add'>+	 */</div><div class='add'>+	if (ag-&gt;mlo_capable)</div><div class='add'>+		radio_per_hw = total_radio;</div><div class='add'>+	else</div><div class='add'>+		radio_per_hw = 1;</div><div class='add'>+</div><div class='add'>+	num_hw = total_radio / radio_per_hw;</div><div class='add'>+</div><div class='add'>+	ag-&gt;num_hw = 0;</div><div class='add'>+	device_id = 0;</div><div class='add'>+	mac_id = 0;</div><div class='add'>+	for (i = 0; i &lt; num_hw; i++) {</div><div class='add'>+		for (j = 0; j &lt; radio_per_hw; j++) {</div><div class='add'>+			if (device_id &gt;= ag-&gt;num_devices || !ag-&gt;ab[device_id]) {</div><div class='add'>+				ret = -ENOSPC;</div><div class='add'>+				goto err;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ab = ag-&gt;ab[device_id];</div><div class='add'>+			pdev_map[j].ab = ab;</div><div class='add'>+			pdev_map[j].pdev_idx = mac_id;</div><div class='add'>+			mac_id++;</div><div class='add'>+</div><div class='add'>+			/* If mac_id falls beyond the current device MACs then</div><div class='add'>+			 * move to next device</div><div class='add'>+			 */</div><div class='add'>+			if (mac_id &gt;= ab-&gt;num_radios) {</div><div class='add'>+				mac_id = 0;</div><div class='add'>+				device_id++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ab = pdev_map-&gt;ab;</div><div class='add'>+</div><div class='add'>+		ah = ath12k_mac_hw_allocate(ag, pdev_map, radio_per_hw);</div><div class='add'>+		if (!ah) {</div><div class='add'>+			ath12k_warn(ab, "failed to allocate mac80211 hw device for hw_idx %d\n",</div><div class='add'>+				    i);</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ah-&gt;dev = ab-&gt;dev;</div><div class='add'>+</div><div class='add'>+		ag-&gt;ah[i] = ah;</div><div class='add'>+		ag-&gt;num_hw++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	for (i = i - 1; i &gt;= 0; i--) {</div><div class='add'>+		ah = ath12k_ag_to_ah(ag, i);</div><div class='add'>+		if (!ah)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ath12k_mac_hw_destroy(ah);</div><div class='add'>+		ath12k_ag_set_ah(ag, i, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_mac_vif_set_keepalive(struct ath12k_link_vif *arvif,</div><div class='add'>+				 enum wmi_sta_keepalive_method method,</div><div class='add'>+				 u32 interval)</div><div class='add'>+{</div><div class='add'>+	struct wmi_sta_keepalive_arg arg = {};</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (arvif-&gt;ahvif-&gt;vdev_type != WMI_VDEV_TYPE_STA)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(WMI_TLV_SERVICE_STA_KEEP_ALIVE, ar-&gt;ab-&gt;wmi_ab.svc_map))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	arg.vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+	arg.enabled = 1;</div><div class='add'>+	arg.method = method;</div><div class='add'>+	arg.interval = interval;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_sta_keepalive(ar, &amp;arg);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set keepalive on vdev %i: %d\n",</div><div class='add'>+			    arvif-&gt;vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/mac.h b/drivers/net/wireless/ath/ath12k/mac.h<br/>new file mode 100644<br/>index 000000000000..1f689e367c8a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/mac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/mac.h</a></div><div class='hunk'>@@ -0,0 +1,209 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH12K_MAC_H</div><div class='add'>+#define ATH12K_MAC_H</div><div class='add'>+</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+#include &lt;net/cfg80211.h&gt;</div><div class='add'>+#include "wmi.h"</div><div class='add'>+</div><div class='add'>+struct ath12k;</div><div class='add'>+struct ath12k_base;</div><div class='add'>+struct ath12k_hw;</div><div class='add'>+struct ath12k_hw_group;</div><div class='add'>+struct ath12k_pdev_map;</div><div class='add'>+</div><div class='add'>+struct ath12k_generic_iter {</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int ret;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* number of failed packets (20 packets with 16 sw reties each) */</div><div class='add'>+#define ATH12K_KICKOUT_THRESHOLD		(20 * 16)</div><div class='add'>+</div><div class='add'>+/* Use insanely high numbers to make sure that the firmware implementation</div><div class='add'>+ * won't start, we have the same functionality already in hostapd. Unit</div><div class='add'>+ * is seconds.</div><div class='add'>+ */</div><div class='add'>+#define ATH12K_KEEPALIVE_MIN_IDLE		3747</div><div class='add'>+#define ATH12K_KEEPALIVE_MAX_IDLE		3895</div><div class='add'>+#define ATH12K_KEEPALIVE_MAX_UNRESPONSIVE	3900</div><div class='add'>+</div><div class='add'>+#define ATH12K_PDEV_TX_POWER_INVALID		((u32)-1)</div><div class='add'>+#define ATH12K_PDEV_TX_POWER_REFRESH_TIME_MSECS	5000 /* msecs */</div><div class='add'>+</div><div class='add'>+/* FIXME: should these be in ieee80211.h? */</div><div class='add'>+#define IEEE80211_VHT_MCS_SUPPORT_0_11_MASK	GENMASK(23, 16)</div><div class='add'>+#define IEEE80211_DISABLE_VHT_MCS_SUPPORT_0_11	BIT(24)</div><div class='add'>+</div><div class='add'>+#define ATH12K_CHAN_WIDTH_NUM			14</div><div class='add'>+#define ATH12K_BW_NSS_MAP_ENABLE		BIT(31)</div><div class='add'>+#define ATH12K_PEER_RX_NSS_160MHZ		GENMASK(2, 0)</div><div class='add'>+</div><div class='add'>+#define ATH12K_TX_POWER_MAX_VAL	70</div><div class='add'>+#define ATH12K_TX_POWER_MIN_VAL	0</div><div class='add'>+</div><div class='add'>+#define ATH12K_DEFAULT_LINK_ID	0</div><div class='add'>+#define ATH12K_INVALID_LINK_ID	255</div><div class='add'>+</div><div class='add'>+/* Default link after the IEEE802.11 defined Max link id limit</div><div class='add'>+ * for driver usage purpose.</div><div class='add'>+ */</div><div class='add'>+#define ATH12K_FIRST_SCAN_LINK	IEEE80211_MLD_MAX_NUM_LINKS</div><div class='add'>+#define ATH12K_SCAN_MAX_LINKS	ATH12K_GROUP_MAX_RADIO</div><div class='add'>+/* Define 1 scan link for each radio for parallel scan purposes */</div><div class='add'>+#define ATH12K_NUM_MAX_LINKS (IEEE80211_MLD_MAX_NUM_LINKS + ATH12K_SCAN_MAX_LINKS)</div><div class='add'>+#define ATH12K_SCAN_LINKS_MASK	GENMASK(ATH12K_NUM_MAX_LINKS, IEEE80211_MLD_MAX_NUM_LINKS)</div><div class='add'>+</div><div class='add'>+#define ATH12K_NUM_MAX_ACTIVE_LINKS_PER_DEVICE	2</div><div class='add'>+</div><div class='add'>+#define HECAP_PHY_SUBFMR_GET(hecap_phy) \</div><div class='add'>+	u8_get_bits(hecap_phy[3], IEEE80211_HE_PHY_CAP3_SU_BEAMFORMER)</div><div class='add'>+</div><div class='add'>+#define HECAP_PHY_SUBFME_GET(hecap_phy) \</div><div class='add'>+	u8_get_bits(hecap_phy[4], IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE)</div><div class='add'>+</div><div class='add'>+#define HECAP_PHY_MUBFMR_GET(hecap_phy) \</div><div class='add'>+	u8_get_bits(hecap_phy[4], IEEE80211_HE_PHY_CAP4_MU_BEAMFORMER)</div><div class='add'>+</div><div class='add'>+#define HECAP_PHY_ULMUMIMO_GET(hecap_phy) \</div><div class='add'>+	u8_get_bits(hecap_phy[2], IEEE80211_HE_PHY_CAP2_UL_MU_FULL_MU_MIMO)</div><div class='add'>+</div><div class='add'>+#define HECAP_PHY_ULOFDMA_GET(hecap_phy) \</div><div class='add'>+	u8_get_bits(hecap_phy[2], IEEE80211_HE_PHY_CAP2_UL_MU_PARTIAL_MU_MIMO)</div><div class='add'>+</div><div class='add'>+enum ath12k_supported_bw {</div><div class='add'>+	ATH12K_BW_20    = 0,</div><div class='add'>+	ATH12K_BW_40    = 1,</div><div class='add'>+	ATH12K_BW_80    = 2,</div><div class='add'>+	ATH12K_BW_160   = 3,</div><div class='add'>+	ATH12K_BW_320   = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_gi {</div><div class='add'>+	ATH12K_RATE_INFO_GI_0_8,</div><div class='add'>+	ATH12K_RATE_INFO_GI_1_6,</div><div class='add'>+	ATH12K_RATE_INFO_GI_3_2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_ltf {</div><div class='add'>+	ATH12K_RATE_INFO_1XLTF,</div><div class='add'>+	ATH12K_RATE_INFO_2XLTF,</div><div class='add'>+	ATH12K_RATE_INFO_4XLTF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_mac_get_any_chanctx_conf_arg {</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ieee80211_chanctx_conf *chanctx_conf;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ath12k_chan_power_info - TPE containing power info per channel chunk</div><div class='add'>+ * @chan_cfreq: channel center freq (MHz)</div><div class='add'>+ * e.g.</div><div class='add'>+ * channel 37/20 MHz,  it is 6135</div><div class='add'>+ * channel 37/40 MHz,  it is 6125</div><div class='add'>+ * channel 37/80 MHz,  it is 6145</div><div class='add'>+ * channel 37/160 MHz, it is 6185</div><div class='add'>+ * @tx_power: transmit power (dBm)</div><div class='add'>+ */</div><div class='add'>+struct ath12k_chan_power_info {</div><div class='add'>+	u16 chan_cfreq;</div><div class='add'>+	s8 tx_power;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ath12k only deals with 320 MHz, so 16 subchannels */</div><div class='add'>+#define ATH12K_NUM_PWR_LEVELS  16</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ath12k_reg_tpc_power_info - regulatory TPC power info</div><div class='add'>+ * @is_psd_power: is PSD power or not</div><div class='add'>+ * @eirp_power: Maximum EIRP power (dBm), valid only if power is PSD</div><div class='add'>+ * @ap_power_type: type of power (SP/LPI/VLP)</div><div class='add'>+ * @num_pwr_levels: number of power levels</div><div class='add'>+ * @reg_max: Array of maximum TX power (dBm) per PSD value</div><div class='add'>+ * @ap_constraint_power: AP constraint power (dBm)</div><div class='add'>+ * @tpe: TPE values processed from TPE IE</div><div class='add'>+ * @chan_power_info: power info to send to firmware</div><div class='add'>+ */</div><div class='add'>+struct ath12k_reg_tpc_power_info {</div><div class='add'>+	bool is_psd_power;</div><div class='add'>+	u8 eirp_power;</div><div class='add'>+	enum wmi_reg_6g_ap_type ap_power_type;</div><div class='add'>+	u8 num_pwr_levels;</div><div class='add'>+	u8 reg_max[ATH12K_NUM_PWR_LEVELS];</div><div class='add'>+	u8 ap_constraint_power;</div><div class='add'>+	s8 tpe[ATH12K_NUM_PWR_LEVELS];</div><div class='add'>+	struct ath12k_chan_power_info chan_power_info[ATH12K_NUM_PWR_LEVELS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct htt_rx_ring_tlv_filter ath12k_mac_mon_status_filter_default;</div><div class='add'>+</div><div class='add'>+#define ATH12K_SCAN_11D_INTERVAL		600000</div><div class='add'>+#define ATH12K_11D_INVALID_VDEV_ID		0xFFFF</div><div class='add'>+</div><div class='add'>+void ath12k_mac_11d_scan_start(struct ath12k *ar, u32 vdev_id);</div><div class='add'>+void ath12k_mac_11d_scan_stop(struct ath12k *ar);</div><div class='add'>+void ath12k_mac_11d_scan_stop_all(struct ath12k_base *ab);</div><div class='add'>+</div><div class='add'>+void ath12k_mac_destroy(struct ath12k_hw_group *ag);</div><div class='add'>+void ath12k_mac_unregister(struct ath12k_hw_group *ag);</div><div class='add'>+int ath12k_mac_register(struct ath12k_hw_group *ag);</div><div class='add'>+int ath12k_mac_allocate(struct ath12k_hw_group *ag);</div><div class='add'>+int ath12k_mac_hw_ratecode_to_legacy_rate(u8 hw_rc, u8 preamble, u8 *rateidx,</div><div class='add'>+					  u16 *rate);</div><div class='add'>+u8 ath12k_mac_bitrate_to_idx(const struct ieee80211_supported_band *sband,</div><div class='add'>+			     u32 bitrate);</div><div class='add'>+u8 ath12k_mac_hw_rate_to_idx(const struct ieee80211_supported_band *sband,</div><div class='add'>+			     u8 hw_rate, bool cck);</div><div class='add'>+</div><div class='add'>+void __ath12k_mac_scan_finish(struct ath12k *ar);</div><div class='add'>+void ath12k_mac_scan_finish(struct ath12k *ar);</div><div class='add'>+</div><div class='add'>+struct ath12k_link_vif *ath12k_mac_get_arvif(struct ath12k *ar, u32 vdev_id);</div><div class='add'>+struct ath12k_link_vif *ath12k_mac_get_arvif_by_vdev_id(struct ath12k_base *ab,</div><div class='add'>+							u32 vdev_id);</div><div class='add'>+struct ath12k *ath12k_mac_get_ar_by_vdev_id(struct ath12k_base *ab, u32 vdev_id);</div><div class='add'>+struct ath12k *ath12k_mac_get_ar_by_pdev_id(struct ath12k_base *ab, u32 pdev_id);</div><div class='add'>+</div><div class='add'>+void ath12k_mac_drain_tx(struct ath12k *ar);</div><div class='add'>+void ath12k_mac_peer_cleanup_all(struct ath12k *ar);</div><div class='add'>+int ath12k_mac_tx_mgmt_pending_free(int buf_id, void *skb, void *ctx);</div><div class='add'>+enum rate_info_bw ath12k_mac_bw_to_mac80211_bw(enum ath12k_supported_bw bw);</div><div class='add'>+enum ath12k_supported_bw ath12k_mac_mac80211_bw_to_ath12k_bw(enum rate_info_bw bw);</div><div class='add'>+enum hal_encrypt_type ath12k_dp_tx_get_encrypt_type(u32 cipher);</div><div class='add'>+int ath12k_mac_rfkill_enable_radio(struct ath12k *ar, bool enable);</div><div class='add'>+int ath12k_mac_rfkill_config(struct ath12k *ar);</div><div class='add'>+int ath12k_mac_wait_tx_complete(struct ath12k *ar);</div><div class='add'>+void ath12k_mac_handle_beacon(struct ath12k *ar, struct sk_buff *skb);</div><div class='add'>+void ath12k_mac_handle_beacon_miss(struct ath12k *ar,</div><div class='add'>+				   struct ath12k_link_vif *arvif);</div><div class='add'>+int ath12k_mac_vif_set_keepalive(struct ath12k_link_vif *arvif,</div><div class='add'>+				 enum wmi_sta_keepalive_method method,</div><div class='add'>+				 u32 interval);</div><div class='add'>+u8 ath12k_mac_get_target_pdev_id(struct ath12k *ar);</div><div class='add'>+int ath12k_mac_mlo_setup(struct ath12k_hw_group *ag);</div><div class='add'>+int ath12k_mac_mlo_ready(struct ath12k_hw_group *ag);</div><div class='add'>+void ath12k_mac_mlo_teardown(struct ath12k_hw_group *ag);</div><div class='add'>+int ath12k_mac_vdev_stop(struct ath12k_link_vif *arvif);</div><div class='add'>+void ath12k_mac_get_any_chanctx_conf_iter(struct ieee80211_hw *hw,</div><div class='add'>+					  struct ieee80211_chanctx_conf *conf,</div><div class='add'>+					  void *data);</div><div class='add'>+u16 ath12k_mac_he_convert_tones_to_ru_tones(u16 tones);</div><div class='add'>+enum nl80211_eht_ru_alloc ath12k_mac_eht_ru_tones_to_nl80211_eht_ru_alloc(u16 ru_tones);</div><div class='add'>+enum nl80211_eht_gi ath12k_mac_eht_gi_to_nl80211_eht_gi(u8 sgi);</div><div class='add'>+struct ieee80211_bss_conf *ath12k_mac_get_link_bss_conf(struct ath12k_link_vif *arvif);</div><div class='add'>+struct ath12k *ath12k_get_ar_by_vif(struct ieee80211_hw *hw,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    u8 link_id);</div><div class='add'>+int ath12k_mac_get_fw_stats(struct ath12k *ar, struct ath12k_fw_stats_req_params *param);</div><div class='add'>+void ath12k_mac_update_freq_range(struct ath12k *ar,</div><div class='add'>+				  u32 freq_low, u32 freq_high);</div><div class='add'>+void ath12k_mac_fill_reg_tpc_info(struct ath12k *ar,</div><div class='add'>+				  struct ath12k_link_vif *arvif,</div><div class='add'>+				  struct ieee80211_chanctx_conf *ctx);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/mhi.c b/drivers/net/wireless/ath/ath12k/mhi.c<br/>new file mode 100644<br/>index 000000000000..08f44baf182a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/mhi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/mhi.c</a></div><div class='hunk'>@@ -0,0 +1,659 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/msi.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "mhi.h"</div><div class='add'>+#include "pci.h"</div><div class='add'>+</div><div class='add'>+#define MHI_TIMEOUT_DEFAULT_MS	90000</div><div class='add'>+#define OTP_INVALID_BOARD_ID	0xFFFF</div><div class='add'>+#define OTP_VALID_DUALMAC_BOARD_ID_MASK		0x1000</div><div class='add'>+#define MHI_CB_INVALID	0xff</div><div class='add'>+</div><div class='add'>+static const struct mhi_channel_config ath12k_mhi_channels_qcn9274[] = {</div><div class='add'>+	{</div><div class='add'>+		.num = 20,</div><div class='add'>+		.name = "IPCR",</div><div class='add'>+		.num_elements = 32,</div><div class='add'>+		.event_ring = 1,</div><div class='add'>+		.dir = DMA_TO_DEVICE,</div><div class='add'>+		.ee_mask = 0x4,</div><div class='add'>+		.pollcfg = 0,</div><div class='add'>+		.doorbell = MHI_DB_BRST_DISABLE,</div><div class='add'>+		.lpm_notify = false,</div><div class='add'>+		.offload_channel = false,</div><div class='add'>+		.doorbell_mode_switch = false,</div><div class='add'>+		.auto_queue = false,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.num = 21,</div><div class='add'>+		.name = "IPCR",</div><div class='add'>+		.num_elements = 32,</div><div class='add'>+		.event_ring = 1,</div><div class='add'>+		.dir = DMA_FROM_DEVICE,</div><div class='add'>+		.ee_mask = 0x4,</div><div class='add'>+		.pollcfg = 0,</div><div class='add'>+		.doorbell = MHI_DB_BRST_DISABLE,</div><div class='add'>+		.lpm_notify = false,</div><div class='add'>+		.offload_channel = false,</div><div class='add'>+		.doorbell_mode_switch = false,</div><div class='add'>+		.auto_queue = true,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mhi_event_config ath12k_mhi_events_qcn9274[] = {</div><div class='add'>+	{</div><div class='add'>+		.num_elements = 32,</div><div class='add'>+		.irq_moderation_ms = 0,</div><div class='add'>+		.irq = 1,</div><div class='add'>+		.data_type = MHI_ER_CTRL,</div><div class='add'>+		.mode = MHI_DB_BRST_DISABLE,</div><div class='add'>+		.hardware_event = false,</div><div class='add'>+		.client_managed = false,</div><div class='add'>+		.offload_channel = false,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.num_elements = 256,</div><div class='add'>+		.irq_moderation_ms = 1,</div><div class='add'>+		.irq = 2,</div><div class='add'>+		.mode = MHI_DB_BRST_DISABLE,</div><div class='add'>+		.priority = 1,</div><div class='add'>+		.hardware_event = false,</div><div class='add'>+		.client_managed = false,</div><div class='add'>+		.offload_channel = false,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct mhi_controller_config ath12k_mhi_config_qcn9274 = {</div><div class='add'>+	.max_channels = 30,</div><div class='add'>+	.timeout_ms = 10000,</div><div class='add'>+	.use_bounce_buf = false,</div><div class='add'>+	.buf_len = 0,</div><div class='add'>+	.num_channels = ARRAY_SIZE(ath12k_mhi_channels_qcn9274),</div><div class='add'>+	.ch_cfg = ath12k_mhi_channels_qcn9274,</div><div class='add'>+	.num_events = ARRAY_SIZE(ath12k_mhi_events_qcn9274),</div><div class='add'>+	.event_cfg = ath12k_mhi_events_qcn9274,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mhi_channel_config ath12k_mhi_channels_wcn7850[] = {</div><div class='add'>+	{</div><div class='add'>+		.num = 20,</div><div class='add'>+		.name = "IPCR",</div><div class='add'>+		.num_elements = 64,</div><div class='add'>+		.event_ring = 1,</div><div class='add'>+		.dir = DMA_TO_DEVICE,</div><div class='add'>+		.ee_mask = 0x4,</div><div class='add'>+		.pollcfg = 0,</div><div class='add'>+		.doorbell = MHI_DB_BRST_DISABLE,</div><div class='add'>+		.lpm_notify = false,</div><div class='add'>+		.offload_channel = false,</div><div class='add'>+		.doorbell_mode_switch = false,</div><div class='add'>+		.auto_queue = false,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.num = 21,</div><div class='add'>+		.name = "IPCR",</div><div class='add'>+		.num_elements = 64,</div><div class='add'>+		.event_ring = 1,</div><div class='add'>+		.dir = DMA_FROM_DEVICE,</div><div class='add'>+		.ee_mask = 0x4,</div><div class='add'>+		.pollcfg = 0,</div><div class='add'>+		.doorbell = MHI_DB_BRST_DISABLE,</div><div class='add'>+		.lpm_notify = false,</div><div class='add'>+		.offload_channel = false,</div><div class='add'>+		.doorbell_mode_switch = false,</div><div class='add'>+		.auto_queue = true,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mhi_event_config ath12k_mhi_events_wcn7850[] = {</div><div class='add'>+	{</div><div class='add'>+		.num_elements = 32,</div><div class='add'>+		.irq_moderation_ms = 0,</div><div class='add'>+		.irq = 1,</div><div class='add'>+		.mode = MHI_DB_BRST_DISABLE,</div><div class='add'>+		.data_type = MHI_ER_CTRL,</div><div class='add'>+		.hardware_event = false,</div><div class='add'>+		.client_managed = false,</div><div class='add'>+		.offload_channel = false,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.num_elements = 256,</div><div class='add'>+		.irq_moderation_ms = 1,</div><div class='add'>+		.irq = 2,</div><div class='add'>+		.mode = MHI_DB_BRST_DISABLE,</div><div class='add'>+		.priority = 1,</div><div class='add'>+		.hardware_event = false,</div><div class='add'>+		.client_managed = false,</div><div class='add'>+		.offload_channel = false,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct mhi_controller_config ath12k_mhi_config_wcn7850 = {</div><div class='add'>+	.max_channels = 128,</div><div class='add'>+	.timeout_ms = 2000,</div><div class='add'>+	.use_bounce_buf = false,</div><div class='add'>+	.buf_len = 8192,</div><div class='add'>+	.num_channels = ARRAY_SIZE(ath12k_mhi_channels_wcn7850),</div><div class='add'>+	.ch_cfg = ath12k_mhi_channels_wcn7850,</div><div class='add'>+	.num_events = ARRAY_SIZE(ath12k_mhi_events_wcn7850),</div><div class='add'>+	.event_cfg = ath12k_mhi_events_wcn7850,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath12k_mhi_set_mhictrl_reset(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = ath12k_pci_read32(ab, MHISTATUS);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_PCI, "MHISTATUS 0x%x\n", val);</div><div class='add'>+</div><div class='add'>+	/* Observed on some targets that after SOC_GLOBAL_RESET, MHISTATUS</div><div class='add'>+	 * has SYSERR bit set and thus need to set MHICTRL_RESET</div><div class='add'>+	 * to clear SYSERR.</div><div class='add'>+	 */</div><div class='add'>+	ath12k_pci_write32(ab, MHICTRL, MHICTRL_RESET_MASK);</div><div class='add'>+</div><div class='add'>+	mdelay(10);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mhi_reset_txvecdb(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath12k_pci_write32(ab, PCIE_TXVECDB, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mhi_reset_txvecstatus(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath12k_pci_write32(ab, PCIE_TXVECSTATUS, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mhi_reset_rxvecdb(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath12k_pci_write32(ab, PCIE_RXVECDB, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mhi_reset_rxvecstatus(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath12k_pci_write32(ab, PCIE_RXVECSTATUS, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_mhi_clear_vector(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath12k_mhi_reset_txvecdb(ab);</div><div class='add'>+	ath12k_mhi_reset_txvecstatus(ab);</div><div class='add'>+	ath12k_mhi_reset_rxvecdb(ab);</div><div class='add'>+	ath12k_mhi_reset_rxvecstatus(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mhi_get_msi(struct ath12k_pci *ab_pci)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ab_pci-&gt;ab;</div><div class='add'>+	u32 user_base_data, base_vector;</div><div class='add'>+	int ret, num_vectors, i;</div><div class='add'>+	int *irq;</div><div class='add'>+	unsigned int msi_data;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_pci_get_user_msi_assignment(ab,</div><div class='add'>+						 "MHI", &amp;num_vectors,</div><div class='add'>+						 &amp;user_base_data, &amp;base_vector);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_PCI, "Number of assigned MSI for MHI is %d, base vector is %d\n",</div><div class='add'>+		   num_vectors, base_vector);</div><div class='add'>+</div><div class='add'>+	irq = kcalloc(num_vectors, sizeof(*irq), GFP_KERNEL);</div><div class='add'>+	if (!irq)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	msi_data = base_vector;</div><div class='add'>+	for (i = 0; i &lt; num_vectors; i++) {</div><div class='add'>+		if (test_bit(ATH12K_PCI_FLAG_MULTI_MSI_VECTORS, &amp;ab_pci-&gt;flags))</div><div class='add'>+			irq[i] = ath12k_pci_get_msi_irq(ab-&gt;dev,</div><div class='add'>+							msi_data++);</div><div class='add'>+		else</div><div class='add'>+			irq[i] = ath12k_pci_get_msi_irq(ab-&gt;dev,</div><div class='add'>+							msi_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab_pci-&gt;mhi_ctrl-&gt;irq = irq;</div><div class='add'>+	ab_pci-&gt;mhi_ctrl-&gt;nr_irqs = num_vectors;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mhi_op_runtime_get(struct mhi_controller *mhi_cntrl)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mhi_op_runtime_put(struct mhi_controller *mhi_cntrl)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char *ath12k_mhi_op_callback_to_str(enum mhi_callback reason)</div><div class='add'>+{</div><div class='add'>+	switch (reason) {</div><div class='add'>+	case MHI_CB_IDLE:</div><div class='add'>+		return "MHI_CB_IDLE";</div><div class='add'>+	case MHI_CB_PENDING_DATA:</div><div class='add'>+		return "MHI_CB_PENDING_DATA";</div><div class='add'>+	case MHI_CB_LPM_ENTER:</div><div class='add'>+		return "MHI_CB_LPM_ENTER";</div><div class='add'>+	case MHI_CB_LPM_EXIT:</div><div class='add'>+		return "MHI_CB_LPM_EXIT";</div><div class='add'>+	case MHI_CB_EE_RDDM:</div><div class='add'>+		return "MHI_CB_EE_RDDM";</div><div class='add'>+	case MHI_CB_EE_MISSION_MODE:</div><div class='add'>+		return "MHI_CB_EE_MISSION_MODE";</div><div class='add'>+	case MHI_CB_SYS_ERROR:</div><div class='add'>+		return "MHI_CB_SYS_ERROR";</div><div class='add'>+	case MHI_CB_FATAL_ERROR:</div><div class='add'>+		return "MHI_CB_FATAL_ERROR";</div><div class='add'>+	case MHI_CB_BW_REQ:</div><div class='add'>+		return "MHI_CB_BW_REQ";</div><div class='add'>+	default:</div><div class='add'>+		return "UNKNOWN";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mhi_op_status_cb(struct mhi_controller *mhi_cntrl,</div><div class='add'>+				    enum mhi_callback cb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = dev_get_drvdata(mhi_cntrl-&gt;cntrl_dev);</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_BOOT, "mhi notify status reason %s\n",</div><div class='add'>+		   ath12k_mhi_op_callback_to_str(cb));</div><div class='add'>+</div><div class='add'>+	switch (cb) {</div><div class='add'>+	case MHI_CB_SYS_ERROR:</div><div class='add'>+		ath12k_warn(ab, "firmware crashed: MHI_CB_SYS_ERROR\n");</div><div class='add'>+		break;</div><div class='add'>+	case MHI_CB_EE_RDDM:</div><div class='add'>+		if (ab_pci-&gt;mhi_pre_cb == MHI_CB_EE_RDDM) {</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+				   "do not queue again for consecutive RDDM event\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(test_bit(ATH12K_FLAG_UNREGISTERING, &amp;ab-&gt;dev_flags))) {</div><div class='add'>+			set_bit(ATH12K_FLAG_CRASH_FLUSH, &amp;ab-&gt;dev_flags);</div><div class='add'>+			set_bit(ATH12K_FLAG_RECOVERY, &amp;ab-&gt;dev_flags);</div><div class='add'>+			queue_work(ab-&gt;workqueue_aux, &amp;ab-&gt;reset_work);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab_pci-&gt;mhi_pre_cb = cb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mhi_op_read_reg(struct mhi_controller *mhi_cntrl,</div><div class='add'>+				  void __iomem *addr,</div><div class='add'>+				  u32 *out)</div><div class='add'>+{</div><div class='add'>+	*out = readl(addr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mhi_op_write_reg(struct mhi_controller *mhi_cntrl,</div><div class='add'>+				    void __iomem *addr,</div><div class='add'>+				    u32 val)</div><div class='add'>+{</div><div class='add'>+	writel(val, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_mhi_register(struct ath12k_pci *ab_pci)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ab_pci-&gt;ab;</div><div class='add'>+	struct mhi_controller *mhi_ctrl;</div><div class='add'>+	unsigned int board_id;</div><div class='add'>+	int ret;</div><div class='add'>+	bool dualmac = false;</div><div class='add'>+</div><div class='add'>+	mhi_ctrl = mhi_alloc_controller();</div><div class='add'>+	if (!mhi_ctrl)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ab_pci-&gt;mhi_pre_cb = MHI_CB_INVALID;</div><div class='add'>+	ab_pci-&gt;mhi_ctrl = mhi_ctrl;</div><div class='add'>+	mhi_ctrl-&gt;cntrl_dev = ab-&gt;dev;</div><div class='add'>+	mhi_ctrl-&gt;regs = ab-&gt;mem;</div><div class='add'>+	mhi_ctrl-&gt;reg_len = ab-&gt;mem_len;</div><div class='add'>+	mhi_ctrl-&gt;rddm_size = ab-&gt;hw_params-&gt;rddm_size;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;otp_board_id_register) {</div><div class='add'>+		board_id =</div><div class='add'>+			ath12k_pci_read32(ab, ab-&gt;hw_params-&gt;otp_board_id_register);</div><div class='add'>+		board_id = u32_get_bits(board_id, OTP_BOARD_ID_MASK);</div><div class='add'>+</div><div class='add'>+		if (!board_id || (board_id == OTP_INVALID_BOARD_ID)) {</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+				   "failed to read board id\n");</div><div class='add'>+		} else if (board_id &amp; OTP_VALID_DUALMAC_BOARD_ID_MASK) {</div><div class='add'>+			dualmac = true;</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_BOOT,</div><div class='add'>+				   "dualmac fw selected for board id: %x\n", board_id);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dualmac) {</div><div class='add'>+		if (ab-&gt;fw.amss_dualmac_data &amp;&amp; ab-&gt;fw.amss_dualmac_len &gt; 0) {</div><div class='add'>+			/* use MHI firmware file from firmware-N.bin */</div><div class='add'>+			mhi_ctrl-&gt;fw_data = ab-&gt;fw.amss_dualmac_data;</div><div class='add'>+			mhi_ctrl-&gt;fw_sz = ab-&gt;fw.amss_dualmac_len;</div><div class='add'>+		} else {</div><div class='add'>+			ath12k_warn(ab, "dualmac firmware IE not present in firmware-N.bin\n");</div><div class='add'>+			ret = -ENOENT;</div><div class='add'>+			goto free_controller;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (ab-&gt;fw.amss_data &amp;&amp; ab-&gt;fw.amss_len &gt; 0) {</div><div class='add'>+			/* use MHI firmware file from firmware-N.bin */</div><div class='add'>+			mhi_ctrl-&gt;fw_data = ab-&gt;fw.amss_data;</div><div class='add'>+			mhi_ctrl-&gt;fw_sz = ab-&gt;fw.amss_len;</div><div class='add'>+		} else {</div><div class='add'>+			/* use the old separate mhi.bin MHI firmware file */</div><div class='add'>+			ath12k_core_create_firmware_path(ab, ATH12K_AMSS_FILE,</div><div class='add'>+							 ab_pci-&gt;amss_path,</div><div class='add'>+							 sizeof(ab_pci-&gt;amss_path));</div><div class='add'>+			mhi_ctrl-&gt;fw_image = ab_pci-&gt;amss_path;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mhi_get_msi(ab_pci);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to get msi for mhi\n");</div><div class='add'>+		goto free_controller;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!test_bit(ATH12K_PCI_FLAG_MULTI_MSI_VECTORS, &amp;ab_pci-&gt;flags))</div><div class='add'>+		mhi_ctrl-&gt;irq_flags = IRQF_SHARED | IRQF_NOBALANCING;</div><div class='add'>+</div><div class='add'>+	mhi_ctrl-&gt;iova_start = 0;</div><div class='add'>+	mhi_ctrl-&gt;iova_stop = ab_pci-&gt;dma_mask;</div><div class='add'>+	mhi_ctrl-&gt;sbl_size = SZ_512K;</div><div class='add'>+	mhi_ctrl-&gt;seg_len = SZ_512K;</div><div class='add'>+	mhi_ctrl-&gt;fbc_download = true;</div><div class='add'>+	mhi_ctrl-&gt;runtime_get = ath12k_mhi_op_runtime_get;</div><div class='add'>+	mhi_ctrl-&gt;runtime_put = ath12k_mhi_op_runtime_put;</div><div class='add'>+	mhi_ctrl-&gt;status_cb = ath12k_mhi_op_status_cb;</div><div class='add'>+	mhi_ctrl-&gt;read_reg = ath12k_mhi_op_read_reg;</div><div class='add'>+	mhi_ctrl-&gt;write_reg = ath12k_mhi_op_write_reg;</div><div class='add'>+</div><div class='add'>+	ret = mhi_register_controller(mhi_ctrl, ab-&gt;hw_params-&gt;mhi_config);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to register to mhi bus, err = %d\n", ret);</div><div class='add'>+		goto free_controller;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_controller:</div><div class='add'>+	mhi_free_controller(mhi_ctrl);</div><div class='add'>+	ab_pci-&gt;mhi_ctrl = NULL;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_mhi_unregister(struct ath12k_pci *ab_pci)</div><div class='add'>+{</div><div class='add'>+	struct mhi_controller *mhi_ctrl = ab_pci-&gt;mhi_ctrl;</div><div class='add'>+</div><div class='add'>+	mhi_unregister_controller(mhi_ctrl);</div><div class='add'>+	kfree(mhi_ctrl-&gt;irq);</div><div class='add'>+	mhi_free_controller(mhi_ctrl);</div><div class='add'>+	ab_pci-&gt;mhi_ctrl = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char *ath12k_mhi_state_to_str(enum ath12k_mhi_state mhi_state)</div><div class='add'>+{</div><div class='add'>+	switch (mhi_state) {</div><div class='add'>+	case ATH12K_MHI_INIT:</div><div class='add'>+		return "INIT";</div><div class='add'>+	case ATH12K_MHI_DEINIT:</div><div class='add'>+		return "DEINIT";</div><div class='add'>+	case ATH12K_MHI_POWER_ON:</div><div class='add'>+		return "POWER_ON";</div><div class='add'>+	case ATH12K_MHI_POWER_OFF:</div><div class='add'>+		return "POWER_OFF";</div><div class='add'>+	case ATH12K_MHI_POWER_OFF_KEEP_DEV:</div><div class='add'>+		return "POWER_OFF_KEEP_DEV";</div><div class='add'>+	case ATH12K_MHI_FORCE_POWER_OFF:</div><div class='add'>+		return "FORCE_POWER_OFF";</div><div class='add'>+	case ATH12K_MHI_SUSPEND:</div><div class='add'>+		return "SUSPEND";</div><div class='add'>+	case ATH12K_MHI_RESUME:</div><div class='add'>+		return "RESUME";</div><div class='add'>+	case ATH12K_MHI_TRIGGER_RDDM:</div><div class='add'>+		return "TRIGGER_RDDM";</div><div class='add'>+	case ATH12K_MHI_RDDM_DONE:</div><div class='add'>+		return "RDDM_DONE";</div><div class='add'>+	default:</div><div class='add'>+		return "UNKNOWN";</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ath12k_mhi_set_state_bit(struct ath12k_pci *ab_pci,</div><div class='add'>+				     enum ath12k_mhi_state mhi_state)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ab_pci-&gt;ab;</div><div class='add'>+</div><div class='add'>+	switch (mhi_state) {</div><div class='add'>+	case ATH12K_MHI_INIT:</div><div class='add'>+		set_bit(ATH12K_MHI_INIT, &amp;ab_pci-&gt;mhi_state);</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_MHI_DEINIT:</div><div class='add'>+		clear_bit(ATH12K_MHI_INIT, &amp;ab_pci-&gt;mhi_state);</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_MHI_POWER_ON:</div><div class='add'>+		set_bit(ATH12K_MHI_POWER_ON, &amp;ab_pci-&gt;mhi_state);</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_MHI_POWER_OFF:</div><div class='add'>+	case ATH12K_MHI_POWER_OFF_KEEP_DEV:</div><div class='add'>+	case ATH12K_MHI_FORCE_POWER_OFF:</div><div class='add'>+		clear_bit(ATH12K_MHI_POWER_ON, &amp;ab_pci-&gt;mhi_state);</div><div class='add'>+		clear_bit(ATH12K_MHI_TRIGGER_RDDM, &amp;ab_pci-&gt;mhi_state);</div><div class='add'>+		clear_bit(ATH12K_MHI_RDDM_DONE, &amp;ab_pci-&gt;mhi_state);</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_MHI_SUSPEND:</div><div class='add'>+		set_bit(ATH12K_MHI_SUSPEND, &amp;ab_pci-&gt;mhi_state);</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_MHI_RESUME:</div><div class='add'>+		clear_bit(ATH12K_MHI_SUSPEND, &amp;ab_pci-&gt;mhi_state);</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_MHI_TRIGGER_RDDM:</div><div class='add'>+		set_bit(ATH12K_MHI_TRIGGER_RDDM, &amp;ab_pci-&gt;mhi_state);</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_MHI_RDDM_DONE:</div><div class='add'>+		set_bit(ATH12K_MHI_RDDM_DONE, &amp;ab_pci-&gt;mhi_state);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_err(ab, "unhandled mhi state (%d)\n", mhi_state);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mhi_check_state_bit(struct ath12k_pci *ab_pci,</div><div class='add'>+				      enum ath12k_mhi_state mhi_state)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ab_pci-&gt;ab;</div><div class='add'>+</div><div class='add'>+	switch (mhi_state) {</div><div class='add'>+	case ATH12K_MHI_INIT:</div><div class='add'>+		if (!test_bit(ATH12K_MHI_INIT, &amp;ab_pci-&gt;mhi_state))</div><div class='add'>+			return 0;</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_MHI_DEINIT:</div><div class='add'>+	case ATH12K_MHI_POWER_ON:</div><div class='add'>+		if (test_bit(ATH12K_MHI_INIT, &amp;ab_pci-&gt;mhi_state) &amp;&amp;</div><div class='add'>+		    !test_bit(ATH12K_MHI_POWER_ON, &amp;ab_pci-&gt;mhi_state))</div><div class='add'>+			return 0;</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_MHI_FORCE_POWER_OFF:</div><div class='add'>+		if (test_bit(ATH12K_MHI_POWER_ON, &amp;ab_pci-&gt;mhi_state))</div><div class='add'>+			return 0;</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_MHI_POWER_OFF:</div><div class='add'>+	case ATH12K_MHI_POWER_OFF_KEEP_DEV:</div><div class='add'>+	case ATH12K_MHI_SUSPEND:</div><div class='add'>+		if (test_bit(ATH12K_MHI_POWER_ON, &amp;ab_pci-&gt;mhi_state) &amp;&amp;</div><div class='add'>+		    !test_bit(ATH12K_MHI_SUSPEND, &amp;ab_pci-&gt;mhi_state))</div><div class='add'>+			return 0;</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_MHI_RESUME:</div><div class='add'>+		if (test_bit(ATH12K_MHI_SUSPEND, &amp;ab_pci-&gt;mhi_state))</div><div class='add'>+			return 0;</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_MHI_TRIGGER_RDDM:</div><div class='add'>+		if (test_bit(ATH12K_MHI_POWER_ON, &amp;ab_pci-&gt;mhi_state) &amp;&amp;</div><div class='add'>+		    !test_bit(ATH12K_MHI_TRIGGER_RDDM, &amp;ab_pci-&gt;mhi_state))</div><div class='add'>+			return 0;</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_MHI_RDDM_DONE:</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_err(ab, "unhandled mhi state: %s(%d)\n",</div><div class='add'>+			   ath12k_mhi_state_to_str(mhi_state), mhi_state);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_err(ab, "failed to set mhi state %s(%d) in current mhi state (0x%lx)\n",</div><div class='add'>+		   ath12k_mhi_state_to_str(mhi_state), mhi_state,</div><div class='add'>+		   ab_pci-&gt;mhi_state);</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_mhi_set_state(struct ath12k_pci *ab_pci,</div><div class='add'>+				enum ath12k_mhi_state mhi_state)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ab_pci-&gt;ab;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mhi_check_state_bit(ab_pci, mhi_state);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_PCI, "setting mhi state: %s(%d)\n",</div><div class='add'>+		   ath12k_mhi_state_to_str(mhi_state), mhi_state);</div><div class='add'>+</div><div class='add'>+	switch (mhi_state) {</div><div class='add'>+	case ATH12K_MHI_INIT:</div><div class='add'>+		ret = mhi_prepare_for_power_up(ab_pci-&gt;mhi_ctrl);</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_MHI_DEINIT:</div><div class='add'>+		mhi_unprepare_after_power_down(ab_pci-&gt;mhi_ctrl);</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_MHI_POWER_ON:</div><div class='add'>+		/* In case of resume, QRTR's resume_early() is called</div><div class='add'>+		 * right after ath12k' resume_early(). Since QRTR requires</div><div class='add'>+		 * MHI mission mode state when preparing IPCR channels</div><div class='add'>+		 * (see ee_mask of that channel), we need to use the 'sync'</div><div class='add'>+		 * version here to make sure MHI is in that state when we</div><div class='add'>+		 * return. Or QRTR might resume before that state comes,</div><div class='add'>+		 * and as a result it fails.</div><div class='add'>+		 *</div><div class='add'>+		 * The 'sync' version works for non-resume (normal power on)</div><div class='add'>+		 * case as well.</div><div class='add'>+		 */</div><div class='add'>+		ret = mhi_sync_power_up(ab_pci-&gt;mhi_ctrl);</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_MHI_POWER_OFF:</div><div class='add'>+		mhi_power_down(ab_pci-&gt;mhi_ctrl, true);</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_MHI_POWER_OFF_KEEP_DEV:</div><div class='add'>+		mhi_power_down_keep_dev(ab_pci-&gt;mhi_ctrl, true);</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_MHI_FORCE_POWER_OFF:</div><div class='add'>+		mhi_power_down(ab_pci-&gt;mhi_ctrl, false);</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_MHI_SUSPEND:</div><div class='add'>+		ret = mhi_pm_suspend(ab_pci-&gt;mhi_ctrl);</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_MHI_RESUME:</div><div class='add'>+		ret = mhi_pm_resume(ab_pci-&gt;mhi_ctrl);</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_MHI_TRIGGER_RDDM:</div><div class='add'>+		ret = mhi_force_rddm_mode(ab_pci-&gt;mhi_ctrl);</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_MHI_RDDM_DONE:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_err(ab, "unhandled MHI state (%d)\n", mhi_state);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ath12k_mhi_set_state_bit(ab_pci, mhi_state);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	ath12k_err(ab, "failed to set mhi state: %s(%d)\n",</div><div class='add'>+		   ath12k_mhi_state_to_str(mhi_state), mhi_state);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_mhi_start(struct ath12k_pci *ab_pci)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ab_pci-&gt;mhi_ctrl-&gt;timeout_ms = MHI_TIMEOUT_DEFAULT_MS;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mhi_set_state(ab_pci, ATH12K_MHI_INIT);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mhi_set_state(ab_pci, ATH12K_MHI_POWER_ON);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_mhi_stop(struct ath12k_pci *ab_pci, bool is_suspend)</div><div class='add'>+{</div><div class='add'>+	/* During suspend we need to use mhi_power_down_keep_dev()</div><div class='add'>+	 * workaround, otherwise ath12k_core_resume() will timeout</div><div class='add'>+	 * during resume.</div><div class='add'>+	 */</div><div class='add'>+	if (is_suspend)</div><div class='add'>+		ath12k_mhi_set_state(ab_pci, ATH12K_MHI_POWER_OFF_KEEP_DEV);</div><div class='add'>+	else</div><div class='add'>+		ath12k_mhi_set_state(ab_pci, ATH12K_MHI_POWER_OFF);</div><div class='add'>+</div><div class='add'>+	ath12k_mhi_set_state(ab_pci, ATH12K_MHI_DEINIT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_mhi_suspend(struct ath12k_pci *ab_pci)</div><div class='add'>+{</div><div class='add'>+	ath12k_mhi_set_state(ab_pci, ATH12K_MHI_SUSPEND);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_mhi_resume(struct ath12k_pci *ab_pci)</div><div class='add'>+{</div><div class='add'>+	ath12k_mhi_set_state(ab_pci, ATH12K_MHI_RESUME);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_mhi_coredump(struct mhi_controller *mhi_ctrl, bool in_panic)</div><div class='add'>+{</div><div class='add'>+	mhi_download_rddm_image(mhi_ctrl, in_panic);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/mhi.h b/drivers/net/wireless/ath/ath12k/mhi.h<br/>new file mode 100644<br/>index 000000000000..7358b8477536<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/mhi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/mhi.h</a></div><div class='hunk'>@@ -0,0 +1,47 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2022, 2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ATH12K_MHI_H</div><div class='add'>+#define _ATH12K_MHI_H</div><div class='add'>+</div><div class='add'>+#include "pci.h"</div><div class='add'>+</div><div class='add'>+#define PCIE_TXVECDB				0x360</div><div class='add'>+#define PCIE_TXVECSTATUS			0x368</div><div class='add'>+#define PCIE_RXVECDB				0x394</div><div class='add'>+#define PCIE_RXVECSTATUS			0x39C</div><div class='add'>+</div><div class='add'>+#define MHISTATUS				0x48</div><div class='add'>+#define MHICTRL					0x38</div><div class='add'>+#define MHICTRL_RESET_MASK			0x2</div><div class='add'>+</div><div class='add'>+enum ath12k_mhi_state {</div><div class='add'>+	ATH12K_MHI_INIT,</div><div class='add'>+	ATH12K_MHI_DEINIT,</div><div class='add'>+	ATH12K_MHI_POWER_ON,</div><div class='add'>+	ATH12K_MHI_POWER_OFF,</div><div class='add'>+	ATH12K_MHI_POWER_OFF_KEEP_DEV,</div><div class='add'>+	ATH12K_MHI_FORCE_POWER_OFF,</div><div class='add'>+	ATH12K_MHI_SUSPEND,</div><div class='add'>+	ATH12K_MHI_RESUME,</div><div class='add'>+	ATH12K_MHI_TRIGGER_RDDM,</div><div class='add'>+	ATH12K_MHI_RDDM,</div><div class='add'>+	ATH12K_MHI_RDDM_DONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct mhi_controller_config ath12k_mhi_config_qcn9274;</div><div class='add'>+extern const struct mhi_controller_config ath12k_mhi_config_wcn7850;</div><div class='add'>+</div><div class='add'>+int ath12k_mhi_start(struct ath12k_pci *ar_pci);</div><div class='add'>+void ath12k_mhi_stop(struct ath12k_pci *ar_pci, bool is_suspend);</div><div class='add'>+int ath12k_mhi_register(struct ath12k_pci *ar_pci);</div><div class='add'>+void ath12k_mhi_unregister(struct ath12k_pci *ar_pci);</div><div class='add'>+void ath12k_mhi_set_mhictrl_reset(struct ath12k_base *ab);</div><div class='add'>+void ath12k_mhi_clear_vector(struct ath12k_base *ab);</div><div class='add'>+</div><div class='add'>+void ath12k_mhi_suspend(struct ath12k_pci *ar_pci);</div><div class='add'>+void ath12k_mhi_resume(struct ath12k_pci *ar_pci);</div><div class='add'>+void ath12k_mhi_coredump(struct mhi_controller *mhi_ctrl, bool in_panic);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/p2p.c b/drivers/net/wireless/ath/ath12k/p2p.c<br/>new file mode 100644<br/>index 000000000000..59589748f1a8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/p2p.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/p2p.c</a></div><div class='hunk'>@@ -0,0 +1,147 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+#include "p2p.h"</div><div class='add'>+</div><div class='add'>+static void ath12k_p2p_noa_ie_fill(u8 *data, size_t len,</div><div class='add'>+				   const struct ath12k_wmi_p2p_noa_info *noa)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_p2p_noa_attr *noa_attr;</div><div class='add'>+	u8 ctwindow = le32_get_bits(noa-&gt;noa_attr, WMI_P2P_NOA_INFO_CTWIN_TU);</div><div class='add'>+	bool oppps = le32_get_bits(noa-&gt;noa_attr, WMI_P2P_NOA_INFO_OPP_PS);</div><div class='add'>+	__le16 *noa_attr_len;</div><div class='add'>+	u16 attr_len;</div><div class='add'>+	u8 noa_descriptors = le32_get_bits(noa-&gt;noa_attr,</div><div class='add'>+					   WMI_P2P_NOA_INFO_DESC_NUM);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* P2P IE */</div><div class='add'>+	data[0] = WLAN_EID_VENDOR_SPECIFIC;</div><div class='add'>+	data[1] = len - 2;</div><div class='add'>+	data[2] = (WLAN_OUI_WFA &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	data[3] = (WLAN_OUI_WFA &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	data[4] = (WLAN_OUI_WFA &gt;&gt; 0) &amp; 0xff;</div><div class='add'>+	data[5] = WLAN_OUI_TYPE_WFA_P2P;</div><div class='add'>+</div><div class='add'>+	/* NOA ATTR */</div><div class='add'>+	data[6] = IEEE80211_P2P_ATTR_ABSENCE_NOTICE;</div><div class='add'>+	noa_attr_len = (__le16 *)&amp;data[7]; /* 2 bytes */</div><div class='add'>+	noa_attr = (struct ieee80211_p2p_noa_attr *)&amp;data[9];</div><div class='add'>+</div><div class='add'>+	noa_attr-&gt;index = le32_get_bits(noa-&gt;noa_attr,</div><div class='add'>+					WMI_P2P_NOA_INFO_INDEX);</div><div class='add'>+	noa_attr-&gt;oppps_ctwindow = ctwindow;</div><div class='add'>+	if (oppps)</div><div class='add'>+		noa_attr-&gt;oppps_ctwindow |= IEEE80211_P2P_OPPPS_ENABLE_BIT;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; noa_descriptors; i++) {</div><div class='add'>+		noa_attr-&gt;desc[i].count =</div><div class='add'>+			__le32_to_cpu(noa-&gt;descriptors[i].type_count);</div><div class='add'>+		noa_attr-&gt;desc[i].duration = noa-&gt;descriptors[i].duration;</div><div class='add'>+		noa_attr-&gt;desc[i].interval = noa-&gt;descriptors[i].interval;</div><div class='add'>+		noa_attr-&gt;desc[i].start_time = noa-&gt;descriptors[i].start_time;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	attr_len = 2; /* index + oppps_ctwindow */</div><div class='add'>+	attr_len += noa_descriptors * sizeof(struct ieee80211_p2p_noa_desc);</div><div class='add'>+	*noa_attr_len = __cpu_to_le16(attr_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t ath12k_p2p_noa_ie_len_compute(const struct ath12k_wmi_p2p_noa_info *noa)</div><div class='add'>+{</div><div class='add'>+	size_t len = 0;</div><div class='add'>+</div><div class='add'>+	if (!(le32_get_bits(noa-&gt;noa_attr, WMI_P2P_NOA_INFO_DESC_NUM)) &amp;&amp;</div><div class='add'>+	    !(le32_get_bits(noa-&gt;noa_attr, WMI_P2P_NOA_INFO_OPP_PS)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	len += 1 + 1 + 4; /* EID + len + OUI */</div><div class='add'>+	len += 1 + 2; /* noa attr + attr len */</div><div class='add'>+	len += 1 + 1; /* index + oppps_ctwindow */</div><div class='add'>+	len += le32_get_bits(noa-&gt;noa_attr, WMI_P2P_NOA_INFO_DESC_NUM) *</div><div class='add'>+			sizeof(struct ieee80211_p2p_noa_desc);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_p2p_noa_ie_assign(struct ath12k_link_vif *arvif, void *ie,</div><div class='add'>+				     size_t len)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	kfree(arvif-&gt;ahvif-&gt;u.ap.noa_data);</div><div class='add'>+</div><div class='add'>+	arvif-&gt;ahvif-&gt;u.ap.noa_data = ie;</div><div class='add'>+	arvif-&gt;ahvif-&gt;u.ap.noa_len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __ath12k_p2p_noa_update(struct ath12k_link_vif *arvif,</div><div class='add'>+				    const struct ath12k_wmi_p2p_noa_info *noa)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	void *ie;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	ath12k_p2p_noa_ie_assign(arvif, NULL, 0);</div><div class='add'>+</div><div class='add'>+	len = ath12k_p2p_noa_ie_len_compute(noa);</div><div class='add'>+	if (!len)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ie = kmalloc(len, GFP_ATOMIC);</div><div class='add'>+	if (!ie)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ath12k_p2p_noa_ie_fill(ie, len, noa);</div><div class='add'>+	ath12k_p2p_noa_ie_assign(arvif, ie, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_p2p_noa_update(struct ath12k_link_vif *arvif,</div><div class='add'>+			   const struct ath12k_wmi_p2p_noa_info *noa)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	__ath12k_p2p_noa_update(arvif, noa);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_p2p_noa_update_vdev_iter(void *data, u8 *mac,</div><div class='add'>+					    struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);</div><div class='add'>+	struct ath12k_p2p_noa_arg *arg = data;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!rcu_read_lock_any_held());</div><div class='add'>+	arvif = &amp;ahvif-&gt;deflink;</div><div class='add'>+	if (!arvif-&gt;is_created || arvif-&gt;ar != arg-&gt;ar || arvif-&gt;vdev_id != arg-&gt;vdev_id)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ath12k_p2p_noa_update(arvif, arg-&gt;noa);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_p2p_noa_update_by_vdev_id(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+				      const struct ath12k_wmi_p2p_noa_info *noa)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_p2p_noa_arg arg = {</div><div class='add'>+		.vdev_id = vdev_id,</div><div class='add'>+		.ar = ar,</div><div class='add'>+		.noa = noa,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_atomic(ath12k_ar_to_hw(ar),</div><div class='add'>+						   IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						   ath12k_p2p_noa_update_vdev_iter,</div><div class='add'>+						   &amp;arg);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/p2p.h b/drivers/net/wireless/ath/ath12k/p2p.h<br/>new file mode 100644<br/>index 000000000000..03ee877e6d6b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/p2p.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/p2p.h</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved..</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH12K_P2P_H</div><div class='add'>+#define ATH12K_P2P_H</div><div class='add'>+</div><div class='add'>+#include "wmi.h"</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_p2p_noa_info;</div><div class='add'>+</div><div class='add'>+struct ath12k_p2p_noa_arg {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	const struct ath12k_wmi_p2p_noa_info *noa;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath12k_p2p_noa_update(struct ath12k_link_vif *arvif,</div><div class='add'>+			   const struct ath12k_wmi_p2p_noa_info *noa);</div><div class='add'>+void ath12k_p2p_noa_update_by_vdev_id(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+				      const struct ath12k_wmi_p2p_noa_info *noa);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/pci.c b/drivers/net/wireless/ath/ath12k/pci.c<br/>new file mode 100644<br/>index 000000000000..a12c8379cb46<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/pci.c</a></div><div class='hunk'>@@ -0,0 +1,1895 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/msi.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "pci.h"</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "hif.h"</div><div class='add'>+#include "mhi.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+#define ATH12K_PCI_BAR_NUM		0</div><div class='add'>+#define ATH12K_PCI_DMA_MASK		36</div><div class='add'>+</div><div class='add'>+#define ATH12K_PCI_IRQ_CE0_OFFSET		3</div><div class='add'>+</div><div class='add'>+#define WINDOW_ENABLE_BIT		0x40000000</div><div class='add'>+#define WINDOW_REG_ADDRESS		0x310c</div><div class='add'>+#define WINDOW_VALUE_MASK		GENMASK(24, 19)</div><div class='add'>+#define WINDOW_START			0x80000</div><div class='add'>+#define WINDOW_RANGE_MASK		GENMASK(18, 0)</div><div class='add'>+#define WINDOW_STATIC_MASK		GENMASK(31, 6)</div><div class='add'>+</div><div class='add'>+#define TCSR_SOC_HW_VERSION		0x1B00000</div><div class='add'>+#define TCSR_SOC_HW_VERSION_MAJOR_MASK	GENMASK(11, 8)</div><div class='add'>+#define TCSR_SOC_HW_VERSION_MINOR_MASK	GENMASK(7, 4)</div><div class='add'>+</div><div class='add'>+/* BAR0 + 4k is always accessible, and no</div><div class='add'>+ * need to force wakeup.</div><div class='add'>+ * 4K - 32 = 0xFE0</div><div class='add'>+ */</div><div class='add'>+#define ACCESS_ALWAYS_OFF 0xFE0</div><div class='add'>+</div><div class='add'>+#define QCN9274_DEVICE_ID		0x1109</div><div class='add'>+#define WCN7850_DEVICE_ID		0x1107</div><div class='add'>+</div><div class='add'>+#define PCIE_LOCAL_REG_QRTR_NODE_ID	0x1E03164</div><div class='add'>+#define DOMAIN_NUMBER_MASK		GENMASK(7, 4)</div><div class='add'>+#define BUS_NUMBER_MASK			GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+static const struct pci_device_id ath12k_pci_id_table[] = {</div><div class='add'>+	{ PCI_VDEVICE(QCOM, QCN9274_DEVICE_ID) },</div><div class='add'>+	{ PCI_VDEVICE(QCOM, WCN7850_DEVICE_ID) },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(pci, ath12k_pci_id_table);</div><div class='add'>+</div><div class='add'>+/* TODO: revisit IRQ mapping for new SRNG's */</div><div class='add'>+static const struct ath12k_msi_config ath12k_msi_config[] = {</div><div class='add'>+	{</div><div class='add'>+		.total_vectors = 16,</div><div class='add'>+		.total_users = 3,</div><div class='add'>+		.users = (struct ath12k_msi_user[]) {</div><div class='add'>+			{ .name = "MHI", .num_vectors = 3, .base_vector = 0 },</div><div class='add'>+			{ .name = "CE", .num_vectors = 5, .base_vector = 3 },</div><div class='add'>+			{ .name = "DP", .num_vectors = 8, .base_vector = 8 },</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ath12k_msi_config msi_config_one_msi = {</div><div class='add'>+	.total_vectors = 1,</div><div class='add'>+	.total_users = 4,</div><div class='add'>+	.users = (struct ath12k_msi_user[]) {</div><div class='add'>+		{ .name = "MHI", .num_vectors = 3, .base_vector = 0 },</div><div class='add'>+		{ .name = "CE", .num_vectors = 1, .base_vector = 0 },</div><div class='add'>+		{ .name = "WAKE", .num_vectors = 1, .base_vector = 0 },</div><div class='add'>+		{ .name = "DP", .num_vectors = 1, .base_vector = 0 },</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *irq_name[ATH12K_IRQ_NUM_MAX] = {</div><div class='add'>+	"bhi",</div><div class='add'>+	"mhi-er0",</div><div class='add'>+	"mhi-er1",</div><div class='add'>+	"ce0",</div><div class='add'>+	"ce1",</div><div class='add'>+	"ce2",</div><div class='add'>+	"ce3",</div><div class='add'>+	"ce4",</div><div class='add'>+	"ce5",</div><div class='add'>+	"ce6",</div><div class='add'>+	"ce7",</div><div class='add'>+	"ce8",</div><div class='add'>+	"ce9",</div><div class='add'>+	"ce10",</div><div class='add'>+	"ce11",</div><div class='add'>+	"ce12",</div><div class='add'>+	"ce13",</div><div class='add'>+	"ce14",</div><div class='add'>+	"ce15",</div><div class='add'>+	"host2wbm-desc-feed",</div><div class='add'>+	"host2reo-re-injection",</div><div class='add'>+	"host2reo-command",</div><div class='add'>+	"host2rxdma-monitor-ring3",</div><div class='add'>+	"host2rxdma-monitor-ring2",</div><div class='add'>+	"host2rxdma-monitor-ring1",</div><div class='add'>+	"reo2ost-exception",</div><div class='add'>+	"wbm2host-rx-release",</div><div class='add'>+	"reo2host-status",</div><div class='add'>+	"reo2host-destination-ring4",</div><div class='add'>+	"reo2host-destination-ring3",</div><div class='add'>+	"reo2host-destination-ring2",</div><div class='add'>+	"reo2host-destination-ring1",</div><div class='add'>+	"rxdma2host-monitor-destination-mac3",</div><div class='add'>+	"rxdma2host-monitor-destination-mac2",</div><div class='add'>+	"rxdma2host-monitor-destination-mac1",</div><div class='add'>+	"ppdu-end-interrupts-mac3",</div><div class='add'>+	"ppdu-end-interrupts-mac2",</div><div class='add'>+	"ppdu-end-interrupts-mac1",</div><div class='add'>+	"rxdma2host-monitor-status-ring-mac3",</div><div class='add'>+	"rxdma2host-monitor-status-ring-mac2",</div><div class='add'>+	"rxdma2host-monitor-status-ring-mac1",</div><div class='add'>+	"host2rxdma-host-buf-ring-mac3",</div><div class='add'>+	"host2rxdma-host-buf-ring-mac2",</div><div class='add'>+	"host2rxdma-host-buf-ring-mac1",</div><div class='add'>+	"rxdma2host-destination-ring-mac3",</div><div class='add'>+	"rxdma2host-destination-ring-mac2",</div><div class='add'>+	"rxdma2host-destination-ring-mac1",</div><div class='add'>+	"host2tcl-input-ring4",</div><div class='add'>+	"host2tcl-input-ring3",</div><div class='add'>+	"host2tcl-input-ring2",</div><div class='add'>+	"host2tcl-input-ring1",</div><div class='add'>+	"wbm2host-tx-completions-ring4",</div><div class='add'>+	"wbm2host-tx-completions-ring3",</div><div class='add'>+	"wbm2host-tx-completions-ring2",</div><div class='add'>+	"wbm2host-tx-completions-ring1",</div><div class='add'>+	"tcl2host-status-ring",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ath12k_pci_bus_wake_up(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+</div><div class='add'>+	return mhi_device_get_sync(ab_pci-&gt;mhi_ctrl-&gt;mhi_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_bus_release(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+</div><div class='add'>+	mhi_device_put(ab_pci-&gt;mhi_ctrl-&gt;mhi_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ath12k_pci_ops ath12k_pci_ops_qcn9274 = {</div><div class='add'>+	.wakeup = NULL,</div><div class='add'>+	.release = NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ath12k_pci_ops ath12k_pci_ops_wcn7850 = {</div><div class='add'>+	.wakeup = ath12k_pci_bus_wake_up,</div><div class='add'>+	.release = ath12k_pci_bus_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_select_window(struct ath12k_pci *ab_pci, u32 offset)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ab_pci-&gt;ab;</div><div class='add'>+</div><div class='add'>+	u32 window = u32_get_bits(offset, WINDOW_VALUE_MASK);</div><div class='add'>+	u32 static_window;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ab_pci-&gt;window_lock);</div><div class='add'>+</div><div class='add'>+	/* Preserve the static window configuration and reset only dynamic window */</div><div class='add'>+	static_window = ab_pci-&gt;register_window &amp; WINDOW_STATIC_MASK;</div><div class='add'>+	window |= static_window;</div><div class='add'>+</div><div class='add'>+	if (window != ab_pci-&gt;register_window) {</div><div class='add'>+		iowrite32(WINDOW_ENABLE_BIT | window,</div><div class='add'>+			  ab-&gt;mem + WINDOW_REG_ADDRESS);</div><div class='add'>+		ioread32(ab-&gt;mem + WINDOW_REG_ADDRESS);</div><div class='add'>+		ab_pci-&gt;register_window = window;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_select_static_window(struct ath12k_pci *ab_pci)</div><div class='add'>+{</div><div class='add'>+	u32 umac_window = u32_get_bits(HAL_SEQ_WCSS_UMAC_OFFSET, WINDOW_VALUE_MASK);</div><div class='add'>+	u32 ce_window = u32_get_bits(HAL_CE_WFSS_CE_REG_BASE, WINDOW_VALUE_MASK);</div><div class='add'>+	u32 window;</div><div class='add'>+</div><div class='add'>+	window = (umac_window &lt;&lt; 12) | (ce_window &lt;&lt; 6);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab_pci-&gt;window_lock);</div><div class='add'>+	ab_pci-&gt;register_window = window;</div><div class='add'>+	spin_unlock_bh(&amp;ab_pci-&gt;window_lock);</div><div class='add'>+</div><div class='add'>+	iowrite32(WINDOW_ENABLE_BIT | window, ab_pci-&gt;ab-&gt;mem + WINDOW_REG_ADDRESS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_pci_get_window_start(struct ath12k_base *ab,</div><div class='add'>+				       u32 offset)</div><div class='add'>+{</div><div class='add'>+	u32 window_start;</div><div class='add'>+</div><div class='add'>+	/* If offset lies within DP register range, use 3rd window */</div><div class='add'>+	if ((offset ^ HAL_SEQ_WCSS_UMAC_OFFSET) &lt; WINDOW_RANGE_MASK)</div><div class='add'>+		window_start = 3 * WINDOW_START;</div><div class='add'>+	/* If offset lies within CE register range, use 2nd window */</div><div class='add'>+	else if ((offset ^ HAL_CE_WFSS_CE_REG_BASE) &lt; WINDOW_RANGE_MASK)</div><div class='add'>+		window_start = 2 * WINDOW_START;</div><div class='add'>+	else</div><div class='add'>+		window_start = WINDOW_START;</div><div class='add'>+</div><div class='add'>+	return window_start;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool ath12k_pci_is_offset_within_mhi_region(u32 offset)</div><div class='add'>+{</div><div class='add'>+	return (offset &gt;= PCI_MHIREGLEN_REG &amp;&amp; offset &lt;= PCI_MHI_REGION_END);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_restore_window(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab_pci-&gt;window_lock);</div><div class='add'>+</div><div class='add'>+	iowrite32(WINDOW_ENABLE_BIT | ab_pci-&gt;register_window,</div><div class='add'>+		  ab-&gt;mem + WINDOW_REG_ADDRESS);</div><div class='add'>+	ioread32(ab-&gt;mem + WINDOW_REG_ADDRESS);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ab_pci-&gt;window_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_soc_global_reset(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	u32 val, delay;</div><div class='add'>+</div><div class='add'>+	val = ath12k_pci_read32(ab, PCIE_SOC_GLOBAL_RESET);</div><div class='add'>+</div><div class='add'>+	val |= PCIE_SOC_GLOBAL_RESET_V;</div><div class='add'>+</div><div class='add'>+	ath12k_pci_write32(ab, PCIE_SOC_GLOBAL_RESET, val);</div><div class='add'>+</div><div class='add'>+	/* TODO: exact time to sleep is uncertain */</div><div class='add'>+	delay = 10;</div><div class='add'>+	mdelay(delay);</div><div class='add'>+</div><div class='add'>+	/* Need to toggle V bit back otherwise stuck in reset status */</div><div class='add'>+	val &amp;= ~PCIE_SOC_GLOBAL_RESET_V;</div><div class='add'>+</div><div class='add'>+	ath12k_pci_write32(ab, PCIE_SOC_GLOBAL_RESET, val);</div><div class='add'>+</div><div class='add'>+	mdelay(delay);</div><div class='add'>+</div><div class='add'>+	val = ath12k_pci_read32(ab, PCIE_SOC_GLOBAL_RESET);</div><div class='add'>+	if (val == 0xffffffff)</div><div class='add'>+		ath12k_warn(ab, "link down error during global reset\n");</div><div class='add'>+</div><div class='add'>+	/* Restore window register as its content is cleared during</div><div class='add'>+	 * hardware global reset, such that it aligns with host cache.</div><div class='add'>+	 */</div><div class='add'>+	ath12k_pci_restore_window(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_clear_dbg_registers(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* read cookie */</div><div class='add'>+	val = ath12k_pci_read32(ab, PCIE_Q6_COOKIE_ADDR);</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_PCI, "cookie:0x%x\n", val);</div><div class='add'>+</div><div class='add'>+	val = ath12k_pci_read32(ab, WLAON_WARM_SW_ENTRY);</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_PCI, "WLAON_WARM_SW_ENTRY 0x%x\n", val);</div><div class='add'>+</div><div class='add'>+	/* TODO: exact time to sleep is uncertain */</div><div class='add'>+	mdelay(10);</div><div class='add'>+</div><div class='add'>+	/* write 0 to WLAON_WARM_SW_ENTRY to prevent Q6 from</div><div class='add'>+	 * continuing warm path and entering dead loop.</div><div class='add'>+	 */</div><div class='add'>+	ath12k_pci_write32(ab, WLAON_WARM_SW_ENTRY, 0);</div><div class='add'>+	mdelay(10);</div><div class='add'>+</div><div class='add'>+	val = ath12k_pci_read32(ab, WLAON_WARM_SW_ENTRY);</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_PCI, "WLAON_WARM_SW_ENTRY 0x%x\n", val);</div><div class='add'>+</div><div class='add'>+	/* A read clear register. clear the register to prevent</div><div class='add'>+	 * Q6 from entering wrong code path.</div><div class='add'>+	 */</div><div class='add'>+	val = ath12k_pci_read32(ab, WLAON_SOC_RESET_CAUSE_REG);</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_PCI, "soc reset cause:%d\n", val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_enable_ltssm(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	val = ath12k_pci_read32(ab, PCIE_PCIE_PARF_LTSSM);</div><div class='add'>+</div><div class='add'>+	/* PCIE link seems very unstable after the Hot Reset*/</div><div class='add'>+	for (i = 0; val != PARM_LTSSM_VALUE &amp;&amp; i &lt; 5; i++) {</div><div class='add'>+		if (val == 0xffffffff)</div><div class='add'>+			mdelay(5);</div><div class='add'>+</div><div class='add'>+		ath12k_pci_write32(ab, PCIE_PCIE_PARF_LTSSM, PARM_LTSSM_VALUE);</div><div class='add'>+		val = ath12k_pci_read32(ab, PCIE_PCIE_PARF_LTSSM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_PCI, "pci ltssm 0x%x\n", val);</div><div class='add'>+</div><div class='add'>+	val = ath12k_pci_read32(ab, GCC_GCC_PCIE_HOT_RST(ab));</div><div class='add'>+	val |= GCC_GCC_PCIE_HOT_RST_VAL;</div><div class='add'>+	ath12k_pci_write32(ab, GCC_GCC_PCIE_HOT_RST(ab), val);</div><div class='add'>+	val = ath12k_pci_read32(ab, GCC_GCC_PCIE_HOT_RST(ab));</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_PCI, "pci pcie_hot_rst 0x%x\n", val);</div><div class='add'>+</div><div class='add'>+	mdelay(5);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_clear_all_intrs(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	/* This is a WAR for PCIE Hotreset.</div><div class='add'>+	 * When target receive Hotreset, but will set the interrupt.</div><div class='add'>+	 * So when download SBL again, SBL will open Interrupt and</div><div class='add'>+	 * receive it, and crash immediately.</div><div class='add'>+	 */</div><div class='add'>+	ath12k_pci_write32(ab, PCIE_PCIE_INT_ALL_CLEAR, PCIE_INT_CLEAR_ALL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_set_wlaon_pwr_ctrl(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = ath12k_pci_read32(ab, WLAON_QFPROM_PWR_CTRL_REG);</div><div class='add'>+	val &amp;= ~QFPROM_PWR_CTRL_VDD4BLOW_MASK;</div><div class='add'>+	ath12k_pci_write32(ab, WLAON_QFPROM_PWR_CTRL_REG, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_force_wake(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath12k_pci_write32(ab, PCIE_SOC_WAKE_PCIE_LOCAL_REG, 1);</div><div class='add'>+	mdelay(5);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_sw_reset(struct ath12k_base *ab, bool power_on)</div><div class='add'>+{</div><div class='add'>+	if (power_on) {</div><div class='add'>+		ath12k_pci_enable_ltssm(ab);</div><div class='add'>+		ath12k_pci_clear_all_intrs(ab);</div><div class='add'>+		ath12k_pci_set_wlaon_pwr_ctrl(ab);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_mhi_clear_vector(ab);</div><div class='add'>+	ath12k_pci_clear_dbg_registers(ab);</div><div class='add'>+	ath12k_pci_soc_global_reset(ab);</div><div class='add'>+	ath12k_mhi_set_mhictrl_reset(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_free_ext_irq(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) {</div><div class='add'>+		struct ath12k_ext_irq_grp *irq_grp = &amp;ab-&gt;ext_irq_grp[i];</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; irq_grp-&gt;num_irq; j++)</div><div class='add'>+			free_irq(ab-&gt;irq_num[irq_grp-&gt;irqs[j]], irq_grp);</div><div class='add'>+</div><div class='add'>+		netif_napi_del(&amp;irq_grp-&gt;napi);</div><div class='add'>+		free_netdev(irq_grp-&gt;napi_ndev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_free_irq(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i, irq_idx;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;ce_count; i++) {</div><div class='add'>+		if (ath12k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='add'>+			continue;</div><div class='add'>+		irq_idx = ATH12K_PCI_IRQ_CE0_OFFSET + i;</div><div class='add'>+		free_irq(ab-&gt;irq_num[irq_idx], &amp;ab-&gt;ce.ce_pipe[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_pci_free_ext_irq(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_ce_irq_enable(struct ath12k_base *ab, u16 ce_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+	u32 irq_idx;</div><div class='add'>+</div><div class='add'>+	/* In case of one MSI vector, we handle irq enable/disable in a</div><div class='add'>+	 * uniform way since we only have one irq</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(ATH12K_PCI_FLAG_MULTI_MSI_VECTORS, &amp;ab_pci-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	irq_idx = ATH12K_PCI_IRQ_CE0_OFFSET + ce_id;</div><div class='add'>+	enable_irq(ab-&gt;irq_num[irq_idx]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_ce_irq_disable(struct ath12k_base *ab, u16 ce_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+	u32 irq_idx;</div><div class='add'>+</div><div class='add'>+	/* In case of one MSI vector, we handle irq enable/disable in a</div><div class='add'>+	 * uniform way since we only have one irq</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(ATH12K_PCI_FLAG_MULTI_MSI_VECTORS, &amp;ab_pci-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	irq_idx = ATH12K_PCI_IRQ_CE0_OFFSET + ce_id;</div><div class='add'>+	disable_irq_nosync(ab-&gt;irq_num[irq_idx]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_ce_irqs_disable(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	clear_bit(ATH12K_FLAG_CE_IRQ_ENABLED, &amp;ab-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;ce_count; i++) {</div><div class='add'>+		if (ath12k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='add'>+			continue;</div><div class='add'>+		ath12k_pci_ce_irq_disable(ab, i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_sync_ce_irqs(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int irq_idx;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;ce_count; i++) {</div><div class='add'>+		if (ath12k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		irq_idx = ATH12K_PCI_IRQ_CE0_OFFSET + i;</div><div class='add'>+		synchronize_irq(ab-&gt;irq_num[irq_idx]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_ce_workqueue(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ce_pipe *ce_pipe = from_work(ce_pipe, work, intr_wq);</div><div class='add'>+	int irq_idx = ATH12K_PCI_IRQ_CE0_OFFSET + ce_pipe-&gt;pipe_num;</div><div class='add'>+</div><div class='add'>+	ath12k_ce_per_engine_service(ce_pipe-&gt;ab, ce_pipe-&gt;pipe_num);</div><div class='add'>+</div><div class='add'>+	enable_irq(ce_pipe-&gt;ab-&gt;irq_num[irq_idx]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t ath12k_pci_ce_interrupt_handler(int irq, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ce_pipe *ce_pipe = arg;</div><div class='add'>+	struct ath12k_base *ab = ce_pipe-&gt;ab;</div><div class='add'>+	int irq_idx = ATH12K_PCI_IRQ_CE0_OFFSET + ce_pipe-&gt;pipe_num;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(ATH12K_FLAG_CE_IRQ_ENABLED, &amp;ab-&gt;dev_flags))</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+</div><div class='add'>+	/* last interrupt received for this CE */</div><div class='add'>+	ce_pipe-&gt;timestamp = jiffies;</div><div class='add'>+</div><div class='add'>+	disable_irq_nosync(ab-&gt;irq_num[irq_idx]);</div><div class='add'>+</div><div class='add'>+	queue_work(system_bh_wq, &amp;ce_pipe-&gt;intr_wq);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_ext_grp_disable(struct ath12k_ext_irq_grp *irq_grp)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(irq_grp-&gt;ab);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* In case of one MSI vector, we handle irq enable/disable</div><div class='add'>+	 * in a uniform way since we only have one irq</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(ATH12K_PCI_FLAG_MULTI_MSI_VECTORS, &amp;ab_pci-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; irq_grp-&gt;num_irq; i++)</div><div class='add'>+		disable_irq_nosync(irq_grp-&gt;ab-&gt;irq_num[irq_grp-&gt;irqs[i]]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __ath12k_pci_ext_irq_disable(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!test_and_clear_bit(ATH12K_FLAG_EXT_IRQ_ENABLED, &amp;ab-&gt;dev_flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) {</div><div class='add'>+		struct ath12k_ext_irq_grp *irq_grp = &amp;ab-&gt;ext_irq_grp[i];</div><div class='add'>+</div><div class='add'>+		ath12k_pci_ext_grp_disable(irq_grp);</div><div class='add'>+</div><div class='add'>+		if (irq_grp-&gt;napi_enabled) {</div><div class='add'>+			napi_synchronize(&amp;irq_grp-&gt;napi);</div><div class='add'>+			napi_disable(&amp;irq_grp-&gt;napi);</div><div class='add'>+			irq_grp-&gt;napi_enabled = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_ext_grp_enable(struct ath12k_ext_irq_grp *irq_grp)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(irq_grp-&gt;ab);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* In case of one MSI vector, we handle irq enable/disable in a</div><div class='add'>+	 * uniform way since we only have one irq</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(ATH12K_PCI_FLAG_MULTI_MSI_VECTORS, &amp;ab_pci-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; irq_grp-&gt;num_irq; i++)</div><div class='add'>+		enable_irq(irq_grp-&gt;ab-&gt;irq_num[irq_grp-&gt;irqs[i]]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_sync_ext_irqs(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i, j, irq_idx;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) {</div><div class='add'>+		struct ath12k_ext_irq_grp *irq_grp = &amp;ab-&gt;ext_irq_grp[i];</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; irq_grp-&gt;num_irq; j++) {</div><div class='add'>+			irq_idx = irq_grp-&gt;irqs[j];</div><div class='add'>+			synchronize_irq(ab-&gt;irq_num[irq_idx]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pci_ext_grp_napi_poll(struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ext_irq_grp *irq_grp = container_of(napi,</div><div class='add'>+						struct ath12k_ext_irq_grp,</div><div class='add'>+						napi);</div><div class='add'>+	struct ath12k_base *ab = irq_grp-&gt;ab;</div><div class='add'>+	int work_done;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	work_done = ath12k_dp_service_srng(ab, irq_grp, budget);</div><div class='add'>+	if (work_done &lt; budget) {</div><div class='add'>+		napi_complete_done(napi, work_done);</div><div class='add'>+		for (i = 0; i &lt; irq_grp-&gt;num_irq; i++)</div><div class='add'>+			enable_irq(irq_grp-&gt;ab-&gt;irq_num[irq_grp-&gt;irqs[i]]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (work_done &gt; budget)</div><div class='add'>+		work_done = budget;</div><div class='add'>+</div><div class='add'>+	return work_done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t ath12k_pci_ext_interrupt_handler(int irq, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ext_irq_grp *irq_grp = arg;</div><div class='add'>+	struct ath12k_base *ab = irq_grp-&gt;ab;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(ATH12K_FLAG_EXT_IRQ_ENABLED, &amp;ab-&gt;dev_flags))</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(irq_grp-&gt;ab, ATH12K_DBG_PCI, "ext irq:%d\n", irq);</div><div class='add'>+</div><div class='add'>+	/* last interrupt received for this group */</div><div class='add'>+	irq_grp-&gt;timestamp = jiffies;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; irq_grp-&gt;num_irq; i++)</div><div class='add'>+		disable_irq_nosync(irq_grp-&gt;ab-&gt;irq_num[irq_grp-&gt;irqs[i]]);</div><div class='add'>+</div><div class='add'>+	napi_schedule(&amp;irq_grp-&gt;napi);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pci_ext_irq_config(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+	int i, j, n, ret, num_vectors = 0;</div><div class='add'>+	u32 user_base_data = 0, base_vector = 0, base_idx;</div><div class='add'>+	struct ath12k_ext_irq_grp *irq_grp;</div><div class='add'>+</div><div class='add'>+	base_idx = ATH12K_PCI_IRQ_CE0_OFFSET + CE_COUNT_MAX;</div><div class='add'>+	ret = ath12k_pci_get_user_msi_assignment(ab, "DP",</div><div class='add'>+						 &amp;num_vectors,</div><div class='add'>+						 &amp;user_base_data,</div><div class='add'>+						 &amp;base_vector);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) {</div><div class='add'>+		irq_grp = &amp;ab-&gt;ext_irq_grp[i];</div><div class='add'>+		u32 num_irq = 0;</div><div class='add'>+</div><div class='add'>+		irq_grp-&gt;ab = ab;</div><div class='add'>+		irq_grp-&gt;grp_id = i;</div><div class='add'>+		irq_grp-&gt;napi_ndev = alloc_netdev_dummy(0);</div><div class='add'>+		if (!irq_grp-&gt;napi_ndev) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto fail_allocate;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		netif_napi_add(irq_grp-&gt;napi_ndev, &amp;irq_grp-&gt;napi,</div><div class='add'>+			       ath12k_pci_ext_grp_napi_poll);</div><div class='add'>+</div><div class='add'>+		if (ab-&gt;hw_params-&gt;ring_mask-&gt;tx[i] ||</div><div class='add'>+		    ab-&gt;hw_params-&gt;ring_mask-&gt;rx[i] ||</div><div class='add'>+		    ab-&gt;hw_params-&gt;ring_mask-&gt;rx_err[i] ||</div><div class='add'>+		    ab-&gt;hw_params-&gt;ring_mask-&gt;rx_wbm_rel[i] ||</div><div class='add'>+		    ab-&gt;hw_params-&gt;ring_mask-&gt;reo_status[i] ||</div><div class='add'>+		    ab-&gt;hw_params-&gt;ring_mask-&gt;host2rxdma[i] ||</div><div class='add'>+		    ab-&gt;hw_params-&gt;ring_mask-&gt;rx_mon_dest[i] ||</div><div class='add'>+		    ab-&gt;hw_params-&gt;ring_mask-&gt;rx_mon_status[i]) {</div><div class='add'>+			num_irq = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		irq_grp-&gt;num_irq = num_irq;</div><div class='add'>+		irq_grp-&gt;irqs[0] = base_idx + i;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; irq_grp-&gt;num_irq; j++) {</div><div class='add'>+			int irq_idx = irq_grp-&gt;irqs[j];</div><div class='add'>+			int vector = (i % num_vectors) + base_vector;</div><div class='add'>+			int irq = ath12k_pci_get_msi_irq(ab-&gt;dev, vector);</div><div class='add'>+</div><div class='add'>+			ab-&gt;irq_num[irq_idx] = irq;</div><div class='add'>+</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_PCI,</div><div class='add'>+				   "irq:%d group:%d\n", irq, i);</div><div class='add'>+</div><div class='add'>+			irq_set_status_flags(irq, IRQ_DISABLE_UNLAZY);</div><div class='add'>+			ret = request_irq(irq, ath12k_pci_ext_interrupt_handler,</div><div class='add'>+					  ab_pci-&gt;irq_flags,</div><div class='add'>+					  "DP_EXT_IRQ", irq_grp);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_err(ab, "failed request irq %d: %d\n",</div><div class='add'>+					   vector, ret);</div><div class='add'>+				goto fail_request;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		ath12k_pci_ext_grp_disable(irq_grp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail_request:</div><div class='add'>+	/* i -&gt;napi_ndev was properly allocated. Free it also */</div><div class='add'>+	i += 1;</div><div class='add'>+fail_allocate:</div><div class='add'>+	for (n = 0; n &lt; i; n++) {</div><div class='add'>+		irq_grp = &amp;ab-&gt;ext_irq_grp[n];</div><div class='add'>+		free_netdev(irq_grp-&gt;napi_ndev);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pci_set_irq_affinity_hint(struct ath12k_pci *ab_pci,</div><div class='add'>+					    const struct cpumask *m)</div><div class='add'>+{</div><div class='add'>+	if (test_bit(ATH12K_PCI_FLAG_MULTI_MSI_VECTORS, &amp;ab_pci-&gt;flags))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return irq_set_affinity_and_hint(ab_pci-&gt;pdev-&gt;irq, m);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pci_config_irq(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+	struct ath12k_ce_pipe *ce_pipe;</div><div class='add'>+	u32 msi_data_start;</div><div class='add'>+	u32 msi_data_count, msi_data_idx;</div><div class='add'>+	u32 msi_irq_start;</div><div class='add'>+	unsigned int msi_data;</div><div class='add'>+	int irq, i, ret, irq_idx;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_pci_get_user_msi_assignment(ab,</div><div class='add'>+						 "CE", &amp;msi_data_count,</div><div class='add'>+						 &amp;msi_data_start, &amp;msi_irq_start);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Configure CE irqs */</div><div class='add'>+</div><div class='add'>+	for (i = 0, msi_data_idx = 0; i &lt; ab-&gt;hw_params-&gt;ce_count; i++) {</div><div class='add'>+		if (ath12k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		msi_data = (msi_data_idx % msi_data_count) + msi_irq_start;</div><div class='add'>+		irq = ath12k_pci_get_msi_irq(ab-&gt;dev, msi_data);</div><div class='add'>+		ce_pipe = &amp;ab-&gt;ce.ce_pipe[i];</div><div class='add'>+</div><div class='add'>+		irq_idx = ATH12K_PCI_IRQ_CE0_OFFSET + i;</div><div class='add'>+</div><div class='add'>+		INIT_WORK(&amp;ce_pipe-&gt;intr_wq, ath12k_pci_ce_workqueue);</div><div class='add'>+</div><div class='add'>+		ret = request_irq(irq, ath12k_pci_ce_interrupt_handler,</div><div class='add'>+				  ab_pci-&gt;irq_flags, irq_name[irq_idx],</div><div class='add'>+				  ce_pipe);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_err(ab, "failed to request irq %d: %d\n",</div><div class='add'>+				   irq_idx, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ab-&gt;irq_num[irq_idx] = irq;</div><div class='add'>+		msi_data_idx++;</div><div class='add'>+</div><div class='add'>+		ath12k_pci_ce_irq_disable(ab, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_pci_ext_irq_config(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_init_qmi_ce_config(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_qmi_ce_cfg *cfg = &amp;ab-&gt;qmi.ce_cfg;</div><div class='add'>+</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+	struct pci_bus *bus = ab_pci-&gt;pdev-&gt;bus;</div><div class='add'>+</div><div class='add'>+	cfg-&gt;tgt_ce = ab-&gt;hw_params-&gt;target_ce_config;</div><div class='add'>+	cfg-&gt;tgt_ce_len = ab-&gt;hw_params-&gt;target_ce_count;</div><div class='add'>+</div><div class='add'>+	cfg-&gt;svc_to_ce_map = ab-&gt;hw_params-&gt;svc_to_ce_map;</div><div class='add'>+	cfg-&gt;svc_to_ce_map_len = ab-&gt;hw_params-&gt;svc_to_ce_map_len;</div><div class='add'>+	ab-&gt;qmi.service_ins_id = ab-&gt;hw_params-&gt;qmi_service_ins_id;</div><div class='add'>+</div><div class='add'>+	if (ath12k_fw_feature_supported(ab, ATH12K_FW_FEATURE_MULTI_QRTR_ID)) {</div><div class='add'>+		ab_pci-&gt;qmi_instance =</div><div class='add'>+			u32_encode_bits(pci_domain_nr(bus), DOMAIN_NUMBER_MASK) |</div><div class='add'>+			u32_encode_bits(bus-&gt;number, BUS_NUMBER_MASK);</div><div class='add'>+		ab-&gt;qmi.service_ins_id += ab_pci-&gt;qmi_instance;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_ce_irqs_enable(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	set_bit(ATH12K_FLAG_CE_IRQ_ENABLED, &amp;ab-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;ce_count; i++) {</div><div class='add'>+		if (ath12k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='add'>+			continue;</div><div class='add'>+		ath12k_pci_ce_irq_enable(ab, i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_msi_config(struct ath12k_pci *ab_pci, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *dev = ab_pci-&gt;pdev;</div><div class='add'>+	u16 control;</div><div class='add'>+</div><div class='add'>+	pci_read_config_word(dev, dev-&gt;msi_cap + PCI_MSI_FLAGS, &amp;control);</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		control |= PCI_MSI_FLAGS_ENABLE;</div><div class='add'>+	else</div><div class='add'>+		control &amp;= ~PCI_MSI_FLAGS_ENABLE;</div><div class='add'>+</div><div class='add'>+	pci_write_config_word(dev, dev-&gt;msi_cap + PCI_MSI_FLAGS, control);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_msi_enable(struct ath12k_pci *ab_pci)</div><div class='add'>+{</div><div class='add'>+	ath12k_pci_msi_config(ab_pci, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_msi_disable(struct ath12k_pci *ab_pci)</div><div class='add'>+{</div><div class='add'>+	ath12k_pci_msi_config(ab_pci, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pci_msi_alloc(struct ath12k_pci *ab_pci)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ab_pci-&gt;ab;</div><div class='add'>+	const struct ath12k_msi_config *msi_config = ab_pci-&gt;msi_config;</div><div class='add'>+	struct msi_desc *msi_desc;</div><div class='add'>+	int num_vectors;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	num_vectors = pci_alloc_irq_vectors(ab_pci-&gt;pdev,</div><div class='add'>+					    msi_config-&gt;total_vectors,</div><div class='add'>+					    msi_config-&gt;total_vectors,</div><div class='add'>+					    PCI_IRQ_MSI);</div><div class='add'>+</div><div class='add'>+	if (num_vectors == msi_config-&gt;total_vectors) {</div><div class='add'>+		set_bit(ATH12K_PCI_FLAG_MULTI_MSI_VECTORS, &amp;ab_pci-&gt;flags);</div><div class='add'>+		ab_pci-&gt;irq_flags = IRQF_SHARED;</div><div class='add'>+	} else {</div><div class='add'>+		num_vectors = pci_alloc_irq_vectors(ab_pci-&gt;pdev,</div><div class='add'>+						    1,</div><div class='add'>+						    1,</div><div class='add'>+						    PCI_IRQ_MSI);</div><div class='add'>+		if (num_vectors &lt; 0) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto reset_msi_config;</div><div class='add'>+		}</div><div class='add'>+		clear_bit(ATH12K_PCI_FLAG_MULTI_MSI_VECTORS, &amp;ab_pci-&gt;flags);</div><div class='add'>+		ab_pci-&gt;msi_config = &amp;msi_config_one_msi;</div><div class='add'>+		ab_pci-&gt;irq_flags = IRQF_SHARED | IRQF_NOBALANCING;</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_PCI, "request MSI one vector\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_info(ab, "MSI vectors: %d\n", num_vectors);</div><div class='add'>+</div><div class='add'>+	ath12k_pci_msi_disable(ab_pci);</div><div class='add'>+</div><div class='add'>+	msi_desc = irq_get_msi_desc(ab_pci-&gt;pdev-&gt;irq);</div><div class='add'>+	if (!msi_desc) {</div><div class='add'>+		ath12k_err(ab, "msi_desc is NULL!\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto free_msi_vector;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab_pci-&gt;msi_ep_base_data = msi_desc-&gt;msg.data;</div><div class='add'>+	if (msi_desc-&gt;pci.msi_attrib.is_64)</div><div class='add'>+		set_bit(ATH12K_PCI_FLAG_IS_MSI_64, &amp;ab_pci-&gt;flags);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_PCI, "msi base data is %d\n", ab_pci-&gt;msi_ep_base_data);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_msi_vector:</div><div class='add'>+	pci_free_irq_vectors(ab_pci-&gt;pdev);</div><div class='add'>+</div><div class='add'>+reset_msi_config:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_msi_free(struct ath12k_pci *ab_pci)</div><div class='add'>+{</div><div class='add'>+	pci_free_irq_vectors(ab_pci-&gt;pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pci_config_msi_data(struct ath12k_pci *ab_pci)</div><div class='add'>+{</div><div class='add'>+	struct msi_desc *msi_desc;</div><div class='add'>+</div><div class='add'>+	msi_desc = irq_get_msi_desc(ab_pci-&gt;pdev-&gt;irq);</div><div class='add'>+	if (!msi_desc) {</div><div class='add'>+		ath12k_err(ab_pci-&gt;ab, "msi_desc is NULL!\n");</div><div class='add'>+		pci_free_irq_vectors(ab_pci-&gt;pdev);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab_pci-&gt;msi_ep_base_data = msi_desc-&gt;msg.data;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab_pci-&gt;ab, ATH12K_DBG_PCI, "pci after request_irq msi_ep_base_data %d\n",</div><div class='add'>+		   ab_pci-&gt;msi_ep_base_data);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pci_claim(struct ath12k_pci *ab_pci, struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ab_pci-&gt;ab;</div><div class='add'>+	u16 device_id;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	pci_read_config_word(pdev, PCI_DEVICE_ID, &amp;device_id);</div><div class='add'>+	if (device_id != ab_pci-&gt;dev_id)  {</div><div class='add'>+		ath12k_err(ab, "pci device id mismatch: 0x%x 0x%x\n",</div><div class='add'>+			   device_id, ab_pci-&gt;dev_id);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = pci_assign_resource(pdev, ATH12K_PCI_BAR_NUM);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to assign pci resource: %d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = pci_enable_device(pdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to enable pci device: %d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = pci_request_region(pdev, ATH12K_PCI_BAR_NUM, "ath12k_pci");</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to request pci region: %d\n", ret);</div><div class='add'>+		goto disable_device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab_pci-&gt;dma_mask = DMA_BIT_MASK(ATH12K_PCI_DMA_MASK);</div><div class='add'>+	dma_set_mask(&amp;pdev-&gt;dev, ab_pci-&gt;dma_mask);</div><div class='add'>+	dma_set_coherent_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='add'>+</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	ab-&gt;mem_len = pci_resource_len(pdev, ATH12K_PCI_BAR_NUM);</div><div class='add'>+	ab-&gt;mem = pci_iomap(pdev, ATH12K_PCI_BAR_NUM, 0);</div><div class='add'>+	if (!ab-&gt;mem) {</div><div class='add'>+		ath12k_err(ab, "failed to map pci bar %d\n", ATH12K_PCI_BAR_NUM);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto release_region;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_BOOT, "boot pci_mem 0x%p\n", ab-&gt;mem);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+release_region:</div><div class='add'>+	pci_release_region(pdev, ATH12K_PCI_BAR_NUM);</div><div class='add'>+disable_device:</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_free_region(struct ath12k_pci *ab_pci)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ab_pci-&gt;ab;</div><div class='add'>+	struct pci_dev *pci_dev = ab_pci-&gt;pdev;</div><div class='add'>+</div><div class='add'>+	pci_iounmap(pci_dev, ab-&gt;mem);</div><div class='add'>+	ab-&gt;mem = NULL;</div><div class='add'>+	pci_release_region(pci_dev, ATH12K_PCI_BAR_NUM);</div><div class='add'>+	if (pci_is_enabled(pci_dev))</div><div class='add'>+		pci_disable_device(pci_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_aspm_disable(struct ath12k_pci *ab_pci)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ab_pci-&gt;ab;</div><div class='add'>+</div><div class='add'>+	pcie_capability_read_word(ab_pci-&gt;pdev, PCI_EXP_LNKCTL,</div><div class='add'>+				  &amp;ab_pci-&gt;link_ctl);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_PCI, "pci link_ctl 0x%04x L0s %d L1 %d\n",</div><div class='add'>+		   ab_pci-&gt;link_ctl,</div><div class='add'>+		   u16_get_bits(ab_pci-&gt;link_ctl, PCI_EXP_LNKCTL_ASPM_L0S),</div><div class='add'>+		   u16_get_bits(ab_pci-&gt;link_ctl, PCI_EXP_LNKCTL_ASPM_L1));</div><div class='add'>+</div><div class='add'>+	/* disable L0s and L1 */</div><div class='add'>+	pcie_capability_clear_word(ab_pci-&gt;pdev, PCI_EXP_LNKCTL,</div><div class='add'>+				   PCI_EXP_LNKCTL_ASPMC);</div><div class='add'>+</div><div class='add'>+	set_bit(ATH12K_PCI_ASPM_RESTORE, &amp;ab_pci-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_update_qrtr_node_id(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	/* On platforms with two or more identical mhi devices, qmi service run</div><div class='add'>+	 * with identical qrtr-node-id. Because of this identical ID qrtr-lookup</div><div class='add'>+	 * cannot register more than one qmi service with identical node ID.</div><div class='add'>+	 *</div><div class='add'>+	 * This generates a unique instance ID from PCIe domain number and bus number,</div><div class='add'>+	 * writes to the given register, it is available for firmware when the QMI service</div><div class='add'>+	 * is spawned.</div><div class='add'>+	 */</div><div class='add'>+	reg = PCIE_LOCAL_REG_QRTR_NODE_ID &amp; WINDOW_RANGE_MASK;</div><div class='add'>+	ath12k_pci_write32(ab, reg, ab_pci-&gt;qmi_instance);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_PCI, "pci reg 0x%x instance 0x%x read val 0x%x\n",</div><div class='add'>+		   reg, ab_pci-&gt;qmi_instance, ath12k_pci_read32(ab, reg));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_aspm_restore(struct ath12k_pci *ab_pci)</div><div class='add'>+{</div><div class='add'>+	if (ab_pci-&gt;ab-&gt;hw_params-&gt;supports_aspm &amp;&amp;</div><div class='add'>+	    test_and_clear_bit(ATH12K_PCI_ASPM_RESTORE, &amp;ab_pci-&gt;flags))</div><div class='add'>+		pcie_capability_clear_and_set_word(ab_pci-&gt;pdev, PCI_EXP_LNKCTL,</div><div class='add'>+						   PCI_EXP_LNKCTL_ASPMC,</div><div class='add'>+						   ab_pci-&gt;link_ctl &amp;</div><div class='add'>+						   PCI_EXP_LNKCTL_ASPMC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_cancel_workqueue(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;ce_count; i++) {</div><div class='add'>+		struct ath12k_ce_pipe *ce_pipe = &amp;ab-&gt;ce.ce_pipe[i];</div><div class='add'>+</div><div class='add'>+		if (ath12k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		cancel_work_sync(&amp;ce_pipe-&gt;intr_wq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_ce_irq_disable_sync(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath12k_pci_ce_irqs_disable(ab);</div><div class='add'>+	ath12k_pci_sync_ce_irqs(ab);</div><div class='add'>+	ath12k_pci_cancel_workqueue(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_pci_map_service_to_pipe(struct ath12k_base *ab, u16 service_id,</div><div class='add'>+				   u8 *ul_pipe, u8 *dl_pipe)</div><div class='add'>+{</div><div class='add'>+	const struct service_to_pipe *entry;</div><div class='add'>+	bool ul_set = false, dl_set = false;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;svc_to_ce_map_len; i++) {</div><div class='add'>+		entry = &amp;ab-&gt;hw_params-&gt;svc_to_ce_map[i];</div><div class='add'>+</div><div class='add'>+		if (__le32_to_cpu(entry-&gt;service_id) != service_id)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (__le32_to_cpu(entry-&gt;pipedir)) {</div><div class='add'>+		case PIPEDIR_NONE:</div><div class='add'>+			break;</div><div class='add'>+		case PIPEDIR_IN:</div><div class='add'>+			WARN_ON(dl_set);</div><div class='add'>+			*dl_pipe = __le32_to_cpu(entry-&gt;pipenum);</div><div class='add'>+			dl_set = true;</div><div class='add'>+			break;</div><div class='add'>+		case PIPEDIR_OUT:</div><div class='add'>+			WARN_ON(ul_set);</div><div class='add'>+			*ul_pipe = __le32_to_cpu(entry-&gt;pipenum);</div><div class='add'>+			ul_set = true;</div><div class='add'>+			break;</div><div class='add'>+		case PIPEDIR_INOUT:</div><div class='add'>+			WARN_ON(dl_set);</div><div class='add'>+			WARN_ON(ul_set);</div><div class='add'>+			*dl_pipe = __le32_to_cpu(entry-&gt;pipenum);</div><div class='add'>+			*ul_pipe = __le32_to_cpu(entry-&gt;pipenum);</div><div class='add'>+			dl_set = true;</div><div class='add'>+			ul_set = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!ul_set || !dl_set))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_pci_get_msi_irq(struct device *dev, unsigned int vector)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pci_dev = to_pci_dev(dev);</div><div class='add'>+</div><div class='add'>+	return pci_irq_vector(pci_dev, vector);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_pci_get_user_msi_assignment(struct ath12k_base *ab, char *user_name,</div><div class='add'>+				       int *num_vectors, u32 *user_base_data,</div><div class='add'>+				       u32 *base_vector)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+	const struct ath12k_msi_config *msi_config = ab_pci-&gt;msi_config;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; msi_config-&gt;total_users; idx++) {</div><div class='add'>+		if (strcmp(user_name, msi_config-&gt;users[idx].name) == 0) {</div><div class='add'>+			*num_vectors = msi_config-&gt;users[idx].num_vectors;</div><div class='add'>+			*base_vector =  msi_config-&gt;users[idx].base_vector;</div><div class='add'>+			*user_base_data = *base_vector + ab_pci-&gt;msi_ep_base_data;</div><div class='add'>+</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_PCI,</div><div class='add'>+				   "Assign MSI to user: %s, num_vectors: %d, user_base_data: %u, base_vector: %u\n",</div><div class='add'>+				   user_name, *num_vectors, *user_base_data,</div><div class='add'>+				   *base_vector);</div><div class='add'>+</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_err(ab, "Failed to find MSI assignment for %s!\n", user_name);</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_pci_get_msi_address(struct ath12k_base *ab, u32 *msi_addr_lo,</div><div class='add'>+				u32 *msi_addr_hi)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+	struct pci_dev *pci_dev = to_pci_dev(ab-&gt;dev);</div><div class='add'>+</div><div class='add'>+	pci_read_config_dword(pci_dev, pci_dev-&gt;msi_cap + PCI_MSI_ADDRESS_LO,</div><div class='add'>+			      msi_addr_lo);</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_PCI_FLAG_IS_MSI_64, &amp;ab_pci-&gt;flags)) {</div><div class='add'>+		pci_read_config_dword(pci_dev, pci_dev-&gt;msi_cap + PCI_MSI_ADDRESS_HI,</div><div class='add'>+				      msi_addr_hi);</div><div class='add'>+	} else {</div><div class='add'>+		*msi_addr_hi = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_pci_get_ce_msi_idx(struct ath12k_base *ab, u32 ce_id,</div><div class='add'>+			       u32 *msi_idx)</div><div class='add'>+{</div><div class='add'>+	u32 i, msi_data_idx;</div><div class='add'>+</div><div class='add'>+	for (i = 0, msi_data_idx = 0; i &lt; ab-&gt;hw_params-&gt;ce_count; i++) {</div><div class='add'>+		if (ath12k_ce_get_attr_flags(ab, i) &amp; CE_ATTR_DIS_INTR)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (ce_id == i)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		msi_data_idx++;</div><div class='add'>+	}</div><div class='add'>+	*msi_idx = msi_data_idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_pci_hif_ce_irq_enable(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath12k_pci_ce_irqs_enable(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_pci_hif_ce_irq_disable(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath12k_pci_ce_irq_disable_sync(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_pci_ext_irq_enable(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) {</div><div class='add'>+		struct ath12k_ext_irq_grp *irq_grp = &amp;ab-&gt;ext_irq_grp[i];</div><div class='add'>+</div><div class='add'>+		if (!irq_grp-&gt;napi_enabled) {</div><div class='add'>+			napi_enable(&amp;irq_grp-&gt;napi);</div><div class='add'>+			irq_grp-&gt;napi_enabled = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath12k_pci_ext_grp_enable(irq_grp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_bit(ATH12K_FLAG_EXT_IRQ_ENABLED, &amp;ab-&gt;dev_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_pci_ext_irq_disable(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	if (!test_bit(ATH12K_FLAG_EXT_IRQ_ENABLED, &amp;ab-&gt;dev_flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	__ath12k_pci_ext_irq_disable(ab);</div><div class='add'>+	ath12k_pci_sync_ext_irqs(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_pci_hif_suspend(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pci *ar_pci = ath12k_pci_priv(ab);</div><div class='add'>+</div><div class='add'>+	ath12k_mhi_suspend(ar_pci);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_pci_hif_resume(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pci *ar_pci = ath12k_pci_priv(ab);</div><div class='add'>+</div><div class='add'>+	ath12k_mhi_resume(ar_pci);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_pci_stop(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(ATH12K_PCI_FLAG_INIT_DONE, &amp;ab_pci-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ath12k_pci_ce_irq_disable_sync(ab);</div><div class='add'>+	ath12k_ce_cleanup_pipes(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_pci_start(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+</div><div class='add'>+	set_bit(ATH12K_PCI_FLAG_INIT_DONE, &amp;ab_pci-&gt;flags);</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_PCI_FLAG_MULTI_MSI_VECTORS, &amp;ab_pci-&gt;flags))</div><div class='add'>+		ath12k_pci_aspm_restore(ab_pci);</div><div class='add'>+	else</div><div class='add'>+		ath12k_info(ab, "leaving PCI ASPM disabled to avoid MHI M2 problems\n");</div><div class='add'>+</div><div class='add'>+	ath12k_pci_ce_irqs_enable(ab);</div><div class='add'>+	ath12k_ce_rx_post_buf(ab);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 ath12k_pci_read32(struct ath12k_base *ab, u32 offset)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+	u32 val, window_start;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* for offset beyond BAR + 4K - 32, may</div><div class='add'>+	 * need to wakeup MHI to access.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(ATH12K_PCI_FLAG_INIT_DONE, &amp;ab_pci-&gt;flags) &amp;&amp;</div><div class='add'>+	    offset &gt;= ACCESS_ALWAYS_OFF &amp;&amp; ab_pci-&gt;pci_ops-&gt;wakeup)</div><div class='add'>+		ret = ab_pci-&gt;pci_ops-&gt;wakeup(ab);</div><div class='add'>+</div><div class='add'>+	if (offset &lt; WINDOW_START) {</div><div class='add'>+		val = ioread32(ab-&gt;mem + offset);</div><div class='add'>+	} else {</div><div class='add'>+		if (ab-&gt;static_window_map)</div><div class='add'>+			window_start = ath12k_pci_get_window_start(ab, offset);</div><div class='add'>+		else</div><div class='add'>+			window_start = WINDOW_START;</div><div class='add'>+</div><div class='add'>+		if (window_start == WINDOW_START) {</div><div class='add'>+			spin_lock_bh(&amp;ab_pci-&gt;window_lock);</div><div class='add'>+			ath12k_pci_select_window(ab_pci, offset);</div><div class='add'>+</div><div class='add'>+			if (ath12k_pci_is_offset_within_mhi_region(offset)) {</div><div class='add'>+				offset = offset - PCI_MHIREGLEN_REG;</div><div class='add'>+				val = ioread32(ab-&gt;mem +</div><div class='add'>+					       (offset &amp; WINDOW_RANGE_MASK));</div><div class='add'>+			} else {</div><div class='add'>+				val = ioread32(ab-&gt;mem + window_start +</div><div class='add'>+					       (offset &amp; WINDOW_RANGE_MASK));</div><div class='add'>+			}</div><div class='add'>+			spin_unlock_bh(&amp;ab_pci-&gt;window_lock);</div><div class='add'>+		} else {</div><div class='add'>+			val = ioread32(ab-&gt;mem + window_start +</div><div class='add'>+				       (offset &amp; WINDOW_RANGE_MASK));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_PCI_FLAG_INIT_DONE, &amp;ab_pci-&gt;flags) &amp;&amp;</div><div class='add'>+	    offset &gt;= ACCESS_ALWAYS_OFF &amp;&amp; ab_pci-&gt;pci_ops-&gt;release &amp;&amp;</div><div class='add'>+	    !ret)</div><div class='add'>+		ab_pci-&gt;pci_ops-&gt;release(ab);</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_pci_write32(struct ath12k_base *ab, u32 offset, u32 value)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+	u32 window_start;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* for offset beyond BAR + 4K - 32, may</div><div class='add'>+	 * need to wakeup MHI to access.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(ATH12K_PCI_FLAG_INIT_DONE, &amp;ab_pci-&gt;flags) &amp;&amp;</div><div class='add'>+	    offset &gt;= ACCESS_ALWAYS_OFF &amp;&amp; ab_pci-&gt;pci_ops-&gt;wakeup)</div><div class='add'>+		ret = ab_pci-&gt;pci_ops-&gt;wakeup(ab);</div><div class='add'>+</div><div class='add'>+	if (offset &lt; WINDOW_START) {</div><div class='add'>+		iowrite32(value, ab-&gt;mem + offset);</div><div class='add'>+	} else {</div><div class='add'>+		if (ab-&gt;static_window_map)</div><div class='add'>+			window_start = ath12k_pci_get_window_start(ab, offset);</div><div class='add'>+		else</div><div class='add'>+			window_start = WINDOW_START;</div><div class='add'>+</div><div class='add'>+		if (window_start == WINDOW_START) {</div><div class='add'>+			spin_lock_bh(&amp;ab_pci-&gt;window_lock);</div><div class='add'>+			ath12k_pci_select_window(ab_pci, offset);</div><div class='add'>+</div><div class='add'>+			if (ath12k_pci_is_offset_within_mhi_region(offset)) {</div><div class='add'>+				offset = offset - PCI_MHIREGLEN_REG;</div><div class='add'>+				iowrite32(value, ab-&gt;mem +</div><div class='add'>+					  (offset &amp; WINDOW_RANGE_MASK));</div><div class='add'>+			} else {</div><div class='add'>+				iowrite32(value, ab-&gt;mem + window_start +</div><div class='add'>+					  (offset &amp; WINDOW_RANGE_MASK));</div><div class='add'>+			}</div><div class='add'>+			spin_unlock_bh(&amp;ab_pci-&gt;window_lock);</div><div class='add'>+		} else {</div><div class='add'>+			iowrite32(value, ab-&gt;mem + window_start +</div><div class='add'>+				  (offset &amp; WINDOW_RANGE_MASK));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_PCI_FLAG_INIT_DONE, &amp;ab_pci-&gt;flags) &amp;&amp;</div><div class='add'>+	    offset &gt;= ACCESS_ALWAYS_OFF &amp;&amp; ab_pci-&gt;pci_ops-&gt;release &amp;&amp;</div><div class='add'>+	    !ret)</div><div class='add'>+		ab_pci-&gt;pci_ops-&gt;release(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ATH12K_COREDUMP</div><div class='add'>+static int ath12k_pci_coredump_calculate_size(struct ath12k_base *ab, u32 *dump_seg_sz)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+	struct mhi_controller *mhi_ctrl = ab_pci-&gt;mhi_ctrl;</div><div class='add'>+	struct image_info *rddm_img, *fw_img;</div><div class='add'>+	struct ath12k_tlv_dump_data *dump_tlv;</div><div class='add'>+	enum ath12k_fw_crash_dump_type mem_type;</div><div class='add'>+	u32 len = 0, rddm_tlv_sz = 0, paging_tlv_sz = 0;</div><div class='add'>+	struct ath12k_dump_file_data *file_data;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	rddm_img = mhi_ctrl-&gt;rddm_image;</div><div class='add'>+	if (!rddm_img) {</div><div class='add'>+		ath12k_err(ab, "No RDDM dump found\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fw_img = mhi_ctrl-&gt;fbc_image;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; fw_img-&gt;entries ; i++) {</div><div class='add'>+		if (!fw_img-&gt;mhi_buf[i].buf)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		paging_tlv_sz += fw_img-&gt;mhi_buf[i].len;</div><div class='add'>+	}</div><div class='add'>+	dump_seg_sz[FW_CRASH_DUMP_PAGING_DATA] = paging_tlv_sz;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rddm_img-&gt;entries; i++) {</div><div class='add'>+		if (!rddm_img-&gt;mhi_buf[i].buf)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		rddm_tlv_sz += rddm_img-&gt;mhi_buf[i].len;</div><div class='add'>+	}</div><div class='add'>+	dump_seg_sz[FW_CRASH_DUMP_RDDM_DATA] = rddm_tlv_sz;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;qmi.mem_seg_count; i++) {</div><div class='add'>+		mem_type = ath12k_coredump_get_dump_type(ab-&gt;qmi.target_mem[i].type);</div><div class='add'>+</div><div class='add'>+		if (mem_type == FW_CRASH_DUMP_NONE)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (mem_type == FW_CRASH_DUMP_TYPE_MAX) {</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_PCI,</div><div class='add'>+				   "target mem region type %d not supported",</div><div class='add'>+				   ab-&gt;qmi.target_mem[i].type);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!ab-&gt;qmi.target_mem[i].paddr)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dump_seg_sz[mem_type] += ab-&gt;qmi.target_mem[i].size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; FW_CRASH_DUMP_TYPE_MAX; i++) {</div><div class='add'>+		if (!dump_seg_sz[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		len += sizeof(*dump_tlv) + dump_seg_sz[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len)</div><div class='add'>+		len += sizeof(*file_data);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_coredump_download(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+	struct mhi_controller *mhi_ctrl = ab_pci-&gt;mhi_ctrl;</div><div class='add'>+	struct image_info *rddm_img, *fw_img;</div><div class='add'>+	struct timespec64 timestamp;</div><div class='add'>+	int i, len, mem_idx;</div><div class='add'>+	enum ath12k_fw_crash_dump_type mem_type;</div><div class='add'>+	struct ath12k_dump_file_data *file_data;</div><div class='add'>+	struct ath12k_tlv_dump_data *dump_tlv;</div><div class='add'>+	size_t hdr_len = sizeof(*file_data);</div><div class='add'>+	void *buf;</div><div class='add'>+	u32 dump_seg_sz[FW_CRASH_DUMP_TYPE_MAX] = {};</div><div class='add'>+</div><div class='add'>+	ath12k_mhi_coredump(mhi_ctrl, false);</div><div class='add'>+</div><div class='add'>+	len = ath12k_pci_coredump_calculate_size(ab, dump_seg_sz);</div><div class='add'>+	if (!len) {</div><div class='add'>+		ath12k_warn(ab, "No crash dump data found for devcoredump");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rddm_img = mhi_ctrl-&gt;rddm_image;</div><div class='add'>+	fw_img = mhi_ctrl-&gt;fbc_image;</div><div class='add'>+</div><div class='add'>+	/* dev_coredumpv() requires vmalloc data */</div><div class='add'>+	buf = vzalloc(len);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ab-&gt;dump_data = buf;</div><div class='add'>+	ab-&gt;ath12k_coredump_len = len;</div><div class='add'>+	file_data = ab-&gt;dump_data;</div><div class='add'>+	strscpy(file_data-&gt;df_magic, "ATH12K-FW-DUMP", sizeof(file_data-&gt;df_magic));</div><div class='add'>+	file_data-&gt;len = cpu_to_le32(len);</div><div class='add'>+	file_data-&gt;version = cpu_to_le32(ATH12K_FW_CRASH_DUMP_V2);</div><div class='add'>+	file_data-&gt;chip_id = cpu_to_le32(ab_pci-&gt;dev_id);</div><div class='add'>+	file_data-&gt;qrtr_id = cpu_to_le32(ab_pci-&gt;ab-&gt;qmi.service_ins_id);</div><div class='add'>+	file_data-&gt;bus_id = cpu_to_le32(pci_domain_nr(ab_pci-&gt;pdev-&gt;bus));</div><div class='add'>+	guid_gen(&amp;file_data-&gt;guid);</div><div class='add'>+	ktime_get_real_ts64(&amp;timestamp);</div><div class='add'>+	file_data-&gt;tv_sec = cpu_to_le64(timestamp.tv_sec);</div><div class='add'>+	file_data-&gt;tv_nsec = cpu_to_le64(timestamp.tv_nsec);</div><div class='add'>+	buf += hdr_len;</div><div class='add'>+	dump_tlv = buf;</div><div class='add'>+	dump_tlv-&gt;type = cpu_to_le32(FW_CRASH_DUMP_PAGING_DATA);</div><div class='add'>+	dump_tlv-&gt;tlv_len = cpu_to_le32(dump_seg_sz[FW_CRASH_DUMP_PAGING_DATA]);</div><div class='add'>+	buf += COREDUMP_TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	/* append all segments together as they are all part of a single contiguous</div><div class='add'>+	 * block of memory</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; fw_img-&gt;entries ; i++) {</div><div class='add'>+		if (!fw_img-&gt;mhi_buf[i].buf)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		memcpy_fromio(buf, (void const __iomem *)fw_img-&gt;mhi_buf[i].buf,</div><div class='add'>+			      fw_img-&gt;mhi_buf[i].len);</div><div class='add'>+		buf += fw_img-&gt;mhi_buf[i].len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dump_tlv = buf;</div><div class='add'>+	dump_tlv-&gt;type = cpu_to_le32(FW_CRASH_DUMP_RDDM_DATA);</div><div class='add'>+	dump_tlv-&gt;tlv_len = cpu_to_le32(dump_seg_sz[FW_CRASH_DUMP_RDDM_DATA]);</div><div class='add'>+	buf += COREDUMP_TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	/* append all segments together as they are all part of a single contiguous</div><div class='add'>+	 * block of memory</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; rddm_img-&gt;entries; i++) {</div><div class='add'>+		if (!rddm_img-&gt;mhi_buf[i].buf)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		memcpy_fromio(buf, (void const __iomem *)rddm_img-&gt;mhi_buf[i].buf,</div><div class='add'>+			      rddm_img-&gt;mhi_buf[i].len);</div><div class='add'>+		buf += rddm_img-&gt;mhi_buf[i].len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mem_idx = FW_CRASH_DUMP_REMOTE_MEM_DATA;</div><div class='add'>+	for (; mem_idx &lt; FW_CRASH_DUMP_TYPE_MAX; mem_idx++) {</div><div class='add'>+		if (!dump_seg_sz[mem_idx] || mem_idx == FW_CRASH_DUMP_NONE)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dump_tlv = buf;</div><div class='add'>+		dump_tlv-&gt;type = cpu_to_le32(mem_idx);</div><div class='add'>+		dump_tlv-&gt;tlv_len = cpu_to_le32(dump_seg_sz[mem_idx]);</div><div class='add'>+		buf += COREDUMP_TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ab-&gt;qmi.mem_seg_count; i++) {</div><div class='add'>+			mem_type = ath12k_coredump_get_dump_type</div><div class='add'>+							(ab-&gt;qmi.target_mem[i].type);</div><div class='add'>+</div><div class='add'>+			if (mem_type != mem_idx)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (!ab-&gt;qmi.target_mem[i].paddr) {</div><div class='add'>+				ath12k_dbg(ab, ATH12K_DBG_PCI,</div><div class='add'>+					   "Skipping mem region type %d",</div><div class='add'>+					   ab-&gt;qmi.target_mem[i].type);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			memcpy_fromio(buf, ab-&gt;qmi.target_mem[i].v.ioaddr,</div><div class='add'>+				      ab-&gt;qmi.target_mem[i].size);</div><div class='add'>+			buf += ab-&gt;qmi.target_mem[i].size;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	queue_work(ab-&gt;workqueue, &amp;ab-&gt;dump_work);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int ath12k_pci_power_up(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ab_pci-&gt;register_window = 0;</div><div class='add'>+	clear_bit(ATH12K_PCI_FLAG_INIT_DONE, &amp;ab_pci-&gt;flags);</div><div class='add'>+	ath12k_pci_sw_reset(ab_pci-&gt;ab, true);</div><div class='add'>+</div><div class='add'>+	/* Disable ASPM during firmware download due to problems switching</div><div class='add'>+	 * to AMSS state.</div><div class='add'>+	 */</div><div class='add'>+	ath12k_pci_aspm_disable(ab_pci);</div><div class='add'>+</div><div class='add'>+	ath12k_pci_msi_enable(ab_pci);</div><div class='add'>+</div><div class='add'>+	if (ath12k_fw_feature_supported(ab, ATH12K_FW_FEATURE_MULTI_QRTR_ID))</div><div class='add'>+		ath12k_pci_update_qrtr_node_id(ab);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mhi_start(ab_pci);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to start mhi: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;static_window_map)</div><div class='add'>+		ath12k_pci_select_static_window(ab_pci);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_pci_power_down(struct ath12k_base *ab, bool is_suspend)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(ATH12K_PCI_FLAG_INIT_DONE, &amp;ab_pci-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* restore aspm in case firmware bootup fails */</div><div class='add'>+	ath12k_pci_aspm_restore(ab_pci);</div><div class='add'>+</div><div class='add'>+	ath12k_pci_force_wake(ab_pci-&gt;ab);</div><div class='add'>+	ath12k_pci_msi_disable(ab_pci);</div><div class='add'>+	ath12k_mhi_stop(ab_pci, is_suspend);</div><div class='add'>+	clear_bit(ATH12K_PCI_FLAG_INIT_DONE, &amp;ab_pci-&gt;flags);</div><div class='add'>+	ath12k_pci_sw_reset(ab_pci-&gt;ab, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pci_panic_handler(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath12k_pci_sw_reset(ab, false);</div><div class='add'>+</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ath12k_hif_ops ath12k_pci_hif_ops = {</div><div class='add'>+	.start = ath12k_pci_start,</div><div class='add'>+	.stop = ath12k_pci_stop,</div><div class='add'>+	.read32 = ath12k_pci_read32,</div><div class='add'>+	.write32 = ath12k_pci_write32,</div><div class='add'>+	.power_down = ath12k_pci_power_down,</div><div class='add'>+	.power_up = ath12k_pci_power_up,</div><div class='add'>+	.suspend = ath12k_pci_hif_suspend,</div><div class='add'>+	.resume = ath12k_pci_hif_resume,</div><div class='add'>+	.irq_enable = ath12k_pci_ext_irq_enable,</div><div class='add'>+	.irq_disable = ath12k_pci_ext_irq_disable,</div><div class='add'>+	.get_msi_address = ath12k_pci_get_msi_address,</div><div class='add'>+	.get_user_msi_vector = ath12k_pci_get_user_msi_assignment,</div><div class='add'>+	.map_service_to_pipe = ath12k_pci_map_service_to_pipe,</div><div class='add'>+	.ce_irq_enable = ath12k_pci_hif_ce_irq_enable,</div><div class='add'>+	.ce_irq_disable = ath12k_pci_hif_ce_irq_disable,</div><div class='add'>+	.get_ce_msi_idx = ath12k_pci_get_ce_msi_idx,</div><div class='add'>+	.panic_handler = ath12k_pci_panic_handler,</div><div class='add'>+#ifdef CONFIG_ATH12K_COREDUMP</div><div class='add'>+	.coredump_download = ath12k_pci_coredump_download,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void ath12k_pci_read_hw_version(struct ath12k_base *ab, u32 *major, u32 *minor)</div><div class='add'>+{</div><div class='add'>+	u32 soc_hw_version;</div><div class='add'>+</div><div class='add'>+	soc_hw_version = ath12k_pci_read32(ab, TCSR_SOC_HW_VERSION);</div><div class='add'>+	*major = FIELD_GET(TCSR_SOC_HW_VERSION_MAJOR_MASK,</div><div class='add'>+			   soc_hw_version);</div><div class='add'>+	*minor = FIELD_GET(TCSR_SOC_HW_VERSION_MINOR_MASK,</div><div class='add'>+			   soc_hw_version);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_PCI,</div><div class='add'>+		   "pci tcsr_soc_hw_version major %d minor %d\n",</div><div class='add'>+		    *major, *minor);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pci_probe(struct pci_dev *pdev,</div><div class='add'>+			    const struct pci_device_id *pci_dev)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	struct ath12k_pci *ab_pci;</div><div class='add'>+	u32 soc_hw_version_major, soc_hw_version_minor;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ab = ath12k_core_alloc(&amp;pdev-&gt;dev, sizeof(*ab_pci), ATH12K_BUS_PCI);</div><div class='add'>+	if (!ab) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to allocate ath12k base\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+	pci_set_drvdata(pdev, ab);</div><div class='add'>+	ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+	ab_pci-&gt;dev_id = pci_dev-&gt;device;</div><div class='add'>+	ab_pci-&gt;ab = ab;</div><div class='add'>+	ab_pci-&gt;pdev = pdev;</div><div class='add'>+	ab-&gt;hif.ops = &amp;ath12k_pci_hif_ops;</div><div class='add'>+	ab-&gt;fw_mode = ATH12K_FIRMWARE_MODE_NORMAL;</div><div class='add'>+	pci_set_drvdata(pdev, ab);</div><div class='add'>+	spin_lock_init(&amp;ab_pci-&gt;window_lock);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_pci_claim(ab_pci, pdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to claim device: %d\n", ret);</div><div class='add'>+		goto err_free_core;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_BOOT, "pci probe %04x:%04x %04x:%04x\n",</div><div class='add'>+		   pdev-&gt;vendor, pdev-&gt;device,</div><div class='add'>+		   pdev-&gt;subsystem_vendor, pdev-&gt;subsystem_device);</div><div class='add'>+</div><div class='add'>+	ab-&gt;id.vendor = pdev-&gt;vendor;</div><div class='add'>+	ab-&gt;id.device = pdev-&gt;device;</div><div class='add'>+	ab-&gt;id.subsystem_vendor = pdev-&gt;subsystem_vendor;</div><div class='add'>+	ab-&gt;id.subsystem_device = pdev-&gt;subsystem_device;</div><div class='add'>+</div><div class='add'>+	switch (pci_dev-&gt;device) {</div><div class='add'>+	case QCN9274_DEVICE_ID:</div><div class='add'>+		ab_pci-&gt;msi_config = &amp;ath12k_msi_config[0];</div><div class='add'>+		ab-&gt;static_window_map = true;</div><div class='add'>+		ab_pci-&gt;pci_ops = &amp;ath12k_pci_ops_qcn9274;</div><div class='add'>+		ab-&gt;hal_rx_ops = &amp;hal_rx_qcn9274_ops;</div><div class='add'>+		ath12k_pci_read_hw_version(ab, &amp;soc_hw_version_major,</div><div class='add'>+					   &amp;soc_hw_version_minor);</div><div class='add'>+		ab-&gt;target_mem_mode = ath12k_core_get_memory_mode(ab);</div><div class='add'>+		switch (soc_hw_version_major) {</div><div class='add'>+		case ATH12K_PCI_SOC_HW_VERSION_2:</div><div class='add'>+			ab-&gt;hw_rev = ATH12K_HW_QCN9274_HW20;</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_PCI_SOC_HW_VERSION_1:</div><div class='add'>+			ab-&gt;hw_rev = ATH12K_HW_QCN9274_HW10;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+				"Unknown hardware version found for QCN9274: 0x%x\n",</div><div class='add'>+				soc_hw_version_major);</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='add'>+			goto err_pci_free_region;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case WCN7850_DEVICE_ID:</div><div class='add'>+		ab-&gt;id.bdf_search = ATH12K_BDF_SEARCH_BUS_AND_BOARD;</div><div class='add'>+		ab_pci-&gt;msi_config = &amp;ath12k_msi_config[0];</div><div class='add'>+		ab-&gt;static_window_map = false;</div><div class='add'>+		ab_pci-&gt;pci_ops = &amp;ath12k_pci_ops_wcn7850;</div><div class='add'>+		ab-&gt;hal_rx_ops = &amp;hal_rx_wcn7850_ops;</div><div class='add'>+		ath12k_pci_read_hw_version(ab, &amp;soc_hw_version_major,</div><div class='add'>+					   &amp;soc_hw_version_minor);</div><div class='add'>+		ab-&gt;target_mem_mode = ATH12K_QMI_MEMORY_MODE_DEFAULT;</div><div class='add'>+		switch (soc_hw_version_major) {</div><div class='add'>+		case ATH12K_PCI_SOC_HW_VERSION_2:</div><div class='add'>+			ab-&gt;hw_rev = ATH12K_HW_WCN7850_HW20;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+				"Unknown hardware version found for WCN7850: 0x%x\n",</div><div class='add'>+				soc_hw_version_major);</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='add'>+			goto err_pci_free_region;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Unknown PCI device found: 0x%x\n",</div><div class='add'>+			pci_dev-&gt;device);</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto err_pci_free_region;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_pci_msi_alloc(ab_pci);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to alloc msi: %d\n", ret);</div><div class='add'>+		goto err_pci_free_region;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_pre_init(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_pci_msi_free;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_pci_set_irq_affinity_hint(ab_pci, cpumask_of(0));</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to set irq affinity %d\n", ret);</div><div class='add'>+		goto err_pci_msi_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mhi_register(ab_pci);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to register mhi: %d\n", ret);</div><div class='add'>+		goto err_irq_affinity_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_hal_srng_init(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_mhi_unregister;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_ce_alloc_pipes(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to allocate ce pipes: %d\n", ret);</div><div class='add'>+		goto err_hal_srng_deinit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_pci_init_qmi_ce_config(ab);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_pci_config_irq(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to config irq: %d\n", ret);</div><div class='add'>+		goto err_ce_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* kernel may allocate a dummy vector before request_irq and</div><div class='add'>+	 * then allocate a real vector when request_irq is called.</div><div class='add'>+	 * So get msi_data here again to avoid spurious interrupt</div><div class='add'>+	 * as msi_data will configured to srngs.</div><div class='add'>+	 */</div><div class='add'>+	ret = ath12k_pci_config_msi_data(ab_pci);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to config msi_data: %d\n", ret);</div><div class='add'>+		goto err_free_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_init(ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_err(ab, "failed to init core: %d\n", ret);</div><div class='add'>+		goto err_free_irq;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_irq:</div><div class='add'>+	/* __free_irq() expects the caller to have cleared the affinity hint */</div><div class='add'>+	ath12k_pci_set_irq_affinity_hint(ab_pci, NULL);</div><div class='add'>+	ath12k_pci_free_irq(ab);</div><div class='add'>+</div><div class='add'>+err_ce_free:</div><div class='add'>+	ath12k_ce_free_pipes(ab);</div><div class='add'>+</div><div class='add'>+err_hal_srng_deinit:</div><div class='add'>+	ath12k_hal_srng_deinit(ab);</div><div class='add'>+</div><div class='add'>+err_mhi_unregister:</div><div class='add'>+	ath12k_mhi_unregister(ab_pci);</div><div class='add'>+</div><div class='add'>+err_irq_affinity_cleanup:</div><div class='add'>+	ath12k_pci_set_irq_affinity_hint(ab_pci, NULL);</div><div class='add'>+</div><div class='add'>+err_pci_msi_free:</div><div class='add'>+	ath12k_pci_msi_free(ab_pci);</div><div class='add'>+</div><div class='add'>+err_pci_free_region:</div><div class='add'>+	ath12k_pci_free_region(ab_pci);</div><div class='add'>+</div><div class='add'>+err_free_core:</div><div class='add'>+	ath12k_core_free(ab);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = pci_get_drvdata(pdev);</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+</div><div class='add'>+	ath12k_pci_set_irq_affinity_hint(ab_pci, NULL);</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_FLAG_QMI_FAIL, &amp;ab-&gt;dev_flags)) {</div><div class='add'>+		ath12k_pci_power_down(ab, false);</div><div class='add'>+		goto qmi_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_bit(ATH12K_FLAG_UNREGISTERING, &amp;ab-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;ab-&gt;reset_work);</div><div class='add'>+	cancel_work_sync(&amp;ab-&gt;dump_work);</div><div class='add'>+	ath12k_core_hw_group_cleanup(ab-&gt;ag);</div><div class='add'>+</div><div class='add'>+qmi_fail:</div><div class='add'>+	ath12k_core_deinit(ab);</div><div class='add'>+	ath12k_fw_unmap(ab);</div><div class='add'>+	ath12k_mhi_unregister(ab_pci);</div><div class='add'>+</div><div class='add'>+	ath12k_pci_free_irq(ab);</div><div class='add'>+	ath12k_pci_msi_free(ab_pci);</div><div class='add'>+	ath12k_pci_free_region(ab_pci);</div><div class='add'>+</div><div class='add'>+	ath12k_hal_srng_deinit(ab);</div><div class='add'>+	ath12k_ce_free_pipes(ab);</div><div class='add'>+	ath12k_core_free(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_hw_group_power_down(struct ath12k_hw_group *ag)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!ag)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_devices; i++) {</div><div class='add'>+		ab = ag-&gt;ab[i];</div><div class='add'>+		if (!ab)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ath12k_pci_power_down(ab, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ag-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_pci_shutdown(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = pci_get_drvdata(pdev);</div><div class='add'>+	struct ath12k_pci *ab_pci = ath12k_pci_priv(ab);</div><div class='add'>+</div><div class='add'>+	ath12k_pci_set_irq_affinity_hint(ab_pci, NULL);</div><div class='add'>+	ath12k_pci_hw_group_power_down(ab-&gt;ag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __maybe_unused int ath12k_pci_pm_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = dev_get_drvdata(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_suspend(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ab, "failed to suspend core: %d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __maybe_unused int ath12k_pci_pm_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = dev_get_drvdata(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_resume(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ab, "failed to resume core: %d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __maybe_unused int ath12k_pci_pm_suspend_late(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = dev_get_drvdata(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_suspend_late(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ab, "failed to late suspend core: %d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __maybe_unused int ath12k_pci_pm_resume_early(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = dev_get_drvdata(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_core_resume_early(ab);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath12k_warn(ab, "failed to early resume core: %d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops __maybe_unused ath12k_pci_pm_ops = {</div><div class='add'>+	SET_SYSTEM_SLEEP_PM_OPS(ath12k_pci_pm_suspend,</div><div class='add'>+				ath12k_pci_pm_resume)</div><div class='add'>+	SET_LATE_SYSTEM_SLEEP_PM_OPS(ath12k_pci_pm_suspend_late,</div><div class='add'>+				     ath12k_pci_pm_resume_early)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pci_driver ath12k_pci_driver = {</div><div class='add'>+	.name = "ath12k_pci",</div><div class='add'>+	.id_table = ath12k_pci_id_table,</div><div class='add'>+	.probe = ath12k_pci_probe,</div><div class='add'>+	.remove = ath12k_pci_remove,</div><div class='add'>+	.shutdown = ath12k_pci_shutdown,</div><div class='add'>+	.driver.pm = &amp;ath12k_pci_pm_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ath12k_pci_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pci_register_driver(&amp;ath12k_pci_driver);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("failed to register ath12k pci driver: %d\n",</div><div class='add'>+		       ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_pci_exit(void)</div><div class='add'>+{</div><div class='add'>+	pci_unregister_driver(&amp;ath12k_pci_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* firmware files */</div><div class='add'>+MODULE_FIRMWARE(ATH12K_FW_DIR "/QCN9274/hw2.0/*");</div><div class='add'>+MODULE_FIRMWARE(ATH12K_FW_DIR "/WCN7850/hw2.0/*");</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/pci.h b/drivers/net/wireless/ath/ath12k/pci.h<br/>new file mode 100644<br/>index 000000000000..d1ec8aad7f6c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/pci.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/pci.h</a></div><div class='hunk'>@@ -0,0 +1,153 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+#ifndef ATH12K_PCI_H</div><div class='add'>+#define ATH12K_PCI_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mhi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+</div><div class='add'>+#define PCIE_SOC_GLOBAL_RESET			0x3008</div><div class='add'>+#define PCIE_SOC_GLOBAL_RESET_V			1</div><div class='add'>+</div><div class='add'>+#define WLAON_WARM_SW_ENTRY			0x1f80504</div><div class='add'>+#define WLAON_SOC_RESET_CAUSE_REG		0x01f8060c</div><div class='add'>+</div><div class='add'>+#define PCIE_Q6_COOKIE_ADDR			0x01f80500</div><div class='add'>+#define PCIE_Q6_COOKIE_DATA			0xc0000000</div><div class='add'>+</div><div class='add'>+/* register to wake the UMAC from power collapse */</div><div class='add'>+#define PCIE_SCRATCH_0_SOC_PCIE_REG		0x4040</div><div class='add'>+</div><div class='add'>+/* register used for handshake mechanism to validate UMAC is awake */</div><div class='add'>+#define PCIE_SOC_WAKE_PCIE_LOCAL_REG		0x3004</div><div class='add'>+</div><div class='add'>+#define PCIE_PCIE_PARF_LTSSM			0x1e081b0</div><div class='add'>+#define PARM_LTSSM_VALUE			0x111</div><div class='add'>+</div><div class='add'>+#define GCC_GCC_PCIE_HOT_RST(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;gcc_gcc_pcie_hot_rst)</div><div class='add'>+</div><div class='add'>+#define GCC_GCC_PCIE_HOT_RST_VAL		0x10</div><div class='add'>+</div><div class='add'>+#define PCIE_PCIE_INT_ALL_CLEAR			0x1e08228</div><div class='add'>+#define PCIE_SMLH_REQ_RST_LINK_DOWN		0x2</div><div class='add'>+#define PCIE_INT_CLEAR_ALL			0xffffffff</div><div class='add'>+</div><div class='add'>+#define PCIE_QSERDES_COM_SYSCLK_EN_SEL_REG(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;pcie_qserdes_sysclk_en_sel)</div><div class='add'>+#define PCIE_QSERDES_COM_SYSCLK_EN_SEL_VAL	0x10</div><div class='add'>+#define PCIE_QSERDES_COM_SYSCLK_EN_SEL_MSK	0xffffffff</div><div class='add'>+#define PCIE_PCS_OSC_DTCT_CONFIG1_REG(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;pcie_pcs_osc_dtct_config_base)</div><div class='add'>+#define PCIE_PCS_OSC_DTCT_CONFIG1_VAL		0x02</div><div class='add'>+#define PCIE_PCS_OSC_DTCT_CONFIG2_REG(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;pcie_pcs_osc_dtct_config_base + 0x4)</div><div class='add'>+#define PCIE_PCS_OSC_DTCT_CONFIG2_VAL		0x52</div><div class='add'>+#define PCIE_PCS_OSC_DTCT_CONFIG4_REG(ab) \</div><div class='add'>+	((ab)-&gt;hw_params-&gt;regs-&gt;pcie_pcs_osc_dtct_config_base + 0xc)</div><div class='add'>+#define PCIE_PCS_OSC_DTCT_CONFIG4_VAL		0xff</div><div class='add'>+#define PCIE_PCS_OSC_DTCT_CONFIG_MSK		0x000000ff</div><div class='add'>+</div><div class='add'>+#define WLAON_QFPROM_PWR_CTRL_REG		0x01f8031c</div><div class='add'>+#define QFPROM_PWR_CTRL_VDD4BLOW_MASK		0x4</div><div class='add'>+</div><div class='add'>+#define QCN9274_QFPROM_RAW_RFA_PDET_ROW13_LSB	0x1E20338</div><div class='add'>+#define OTP_BOARD_ID_MASK			GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define PCI_BAR_WINDOW0_BASE	0x1E00000</div><div class='add'>+#define PCI_BAR_WINDOW0_END	0x1E7FFFC</div><div class='add'>+#define PCI_SOC_RANGE_MASK	0x3FFF</div><div class='add'>+#define PCI_SOC_PCI_REG_BASE	0x1E04000</div><div class='add'>+#define PCI_SOC_PCI_REG_END	0x1E07FFC</div><div class='add'>+#define PCI_PARF_BASE		0x1E08000</div><div class='add'>+#define PCI_PARF_END		0x1E0BFFC</div><div class='add'>+#define PCI_MHIREGLEN_REG	0x1E0E100</div><div class='add'>+#define PCI_MHI_REGION_END	0x1E0EFFC</div><div class='add'>+#define QRTR_PCI_DOMAIN_NR_MASK		GENMASK(7, 4)</div><div class='add'>+#define QRTR_PCI_BUS_NUMBER_MASK	GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+#define ATH12K_PCI_SOC_HW_VERSION_1	1</div><div class='add'>+#define ATH12K_PCI_SOC_HW_VERSION_2	2</div><div class='add'>+</div><div class='add'>+struct ath12k_msi_user {</div><div class='add'>+	const char *name;</div><div class='add'>+	int num_vectors;</div><div class='add'>+	u32 base_vector;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_msi_config {</div><div class='add'>+	int total_vectors;</div><div class='add'>+	int total_users;</div><div class='add'>+	const struct ath12k_msi_user *users;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_pci_flags {</div><div class='add'>+	ATH12K_PCI_FLAG_INIT_DONE,</div><div class='add'>+	ATH12K_PCI_FLAG_IS_MSI_64,</div><div class='add'>+	ATH12K_PCI_ASPM_RESTORE,</div><div class='add'>+	ATH12K_PCI_FLAG_MULTI_MSI_VECTORS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_pci_ops {</div><div class='add'>+	int (*wakeup)(struct ath12k_base *ab);</div><div class='add'>+	void (*release)(struct ath12k_base *ab);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_pci {</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	u16 dev_id;</div><div class='add'>+	char amss_path[100];</div><div class='add'>+	u32 msi_ep_base_data;</div><div class='add'>+	struct mhi_controller *mhi_ctrl;</div><div class='add'>+	const struct ath12k_msi_config *msi_config;</div><div class='add'>+	unsigned long mhi_state;</div><div class='add'>+	enum mhi_callback mhi_pre_cb;</div><div class='add'>+	u32 register_window;</div><div class='add'>+</div><div class='add'>+	/* protects register_window above */</div><div class='add'>+	spinlock_t window_lock;</div><div class='add'>+</div><div class='add'>+	/* enum ath12k_pci_flags */</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u16 link_ctl;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	const struct ath12k_pci_ops *pci_ops;</div><div class='add'>+	u32 qmi_instance;</div><div class='add'>+	u64 dma_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct ath12k_pci *ath12k_pci_priv(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	return (struct ath12k_pci *)ab-&gt;drv_priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_pci_get_user_msi_assignment(struct ath12k_base *ab, char *user_name,</div><div class='add'>+				       int *num_vectors, u32 *user_base_data,</div><div class='add'>+				       u32 *base_vector);</div><div class='add'>+int ath12k_pci_get_msi_irq(struct device *dev, unsigned int vector);</div><div class='add'>+void ath12k_pci_write32(struct ath12k_base *ab, u32 offset, u32 value);</div><div class='add'>+u32 ath12k_pci_read32(struct ath12k_base *ab, u32 offset);</div><div class='add'>+int ath12k_pci_map_service_to_pipe(struct ath12k_base *ab, u16 service_id,</div><div class='add'>+				   u8 *ul_pipe, u8 *dl_pipe);</div><div class='add'>+void ath12k_pci_get_msi_address(struct ath12k_base *ab, u32 *msi_addr_lo,</div><div class='add'>+				u32 *msi_addr_hi);</div><div class='add'>+void ath12k_pci_get_ce_msi_idx(struct ath12k_base *ab, u32 ce_id,</div><div class='add'>+			       u32 *msi_idx);</div><div class='add'>+void ath12k_pci_hif_ce_irq_enable(struct ath12k_base *ab);</div><div class='add'>+void ath12k_pci_hif_ce_irq_disable(struct ath12k_base *ab);</div><div class='add'>+void ath12k_pci_ext_irq_enable(struct ath12k_base *ab);</div><div class='add'>+void ath12k_pci_ext_irq_disable(struct ath12k_base *ab);</div><div class='add'>+int ath12k_pci_hif_suspend(struct ath12k_base *ab);</div><div class='add'>+int ath12k_pci_hif_resume(struct ath12k_base *ab);</div><div class='add'>+void ath12k_pci_stop(struct ath12k_base *ab);</div><div class='add'>+int ath12k_pci_start(struct ath12k_base *ab);</div><div class='add'>+int ath12k_pci_power_up(struct ath12k_base *ab);</div><div class='add'>+void ath12k_pci_power_down(struct ath12k_base *ab, bool is_suspend);</div><div class='add'>+int ath12k_pci_init(void);</div><div class='add'>+void ath12k_pci_exit(void);</div><div class='add'>+#endif /* ATH12K_PCI_H */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/peer.c b/drivers/net/wireless/ath/ath12k/peer.c<br/>new file mode 100644<br/>index 000000000000..f1ae9e5b5af7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/peer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/peer.c</a></div><div class='hunk'>@@ -0,0 +1,570 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2022, 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "peer.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='add'>+struct ath12k_ml_peer *ath12k_peer_ml_find(struct ath12k_hw *ah, const u8 *addr)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_ml_peer *ml_peer;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(ml_peer, &amp;ah-&gt;ml_peers, list) {</div><div class='add'>+		if (!ether_addr_equal(ml_peer-&gt;addr, addr))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		return ml_peer;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ath12k_peer *ath12k_peer_find(struct ath12k_base *ab, int vdev_id,</div><div class='add'>+				     const u8 *addr)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(peer, &amp;ab-&gt;peers, list) {</div><div class='add'>+		if (peer-&gt;vdev_id != vdev_id)</div><div class='add'>+			continue;</div><div class='add'>+		if (!ether_addr_equal(peer-&gt;addr, addr))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		return peer;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ath12k_peer *ath12k_peer_find_by_pdev_idx(struct ath12k_base *ab,</div><div class='add'>+							u8 pdev_idx, const u8 *addr)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(peer, &amp;ab-&gt;peers, list) {</div><div class='add'>+		if (peer-&gt;pdev_idx != pdev_idx)</div><div class='add'>+			continue;</div><div class='add'>+		if (!ether_addr_equal(peer-&gt;addr, addr))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		return peer;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ath12k_peer *ath12k_peer_find_by_addr(struct ath12k_base *ab,</div><div class='add'>+					     const u8 *addr)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(peer, &amp;ab-&gt;peers, list) {</div><div class='add'>+		if (!ether_addr_equal(peer-&gt;addr, addr))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		return peer;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ath12k_peer *ath12k_peer_find_by_ml_id(struct ath12k_base *ab,</div><div class='add'>+						     int ml_peer_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(peer, &amp;ab-&gt;peers, list)</div><div class='add'>+		if (ml_peer_id == peer-&gt;ml_id)</div><div class='add'>+			return peer;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ath12k_peer *ath12k_peer_find_by_id(struct ath12k_base *ab,</div><div class='add'>+					   int peer_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	if (peer_id == HAL_INVALID_PEERID)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (peer_id &amp; ATH12K_PEER_ML_ID_VALID)</div><div class='add'>+		return ath12k_peer_find_by_ml_id(ab, peer_id);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(peer, &amp;ab-&gt;peers, list)</div><div class='add'>+		if (peer_id == peer-&gt;peer_id)</div><div class='add'>+			return peer;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool ath12k_peer_exist_by_vdev_id(struct ath12k_base *ab, int vdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(peer, &amp;ab-&gt;peers, list) {</div><div class='add'>+		if (vdev_id == peer-&gt;vdev_id) {</div><div class='add'>+			spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ath12k_peer *ath12k_peer_find_by_ast(struct ath12k_base *ab,</div><div class='add'>+					    int ast_hash)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(peer, &amp;ab-&gt;peers, list)</div><div class='add'>+		if (ast_hash == peer-&gt;ast_hash)</div><div class='add'>+			return peer;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_peer_unmap_event(struct ath12k_base *ab, u16 peer_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	peer = ath12k_peer_find_by_id(ab, peer_id);</div><div class='add'>+	if (!peer) {</div><div class='add'>+		ath12k_warn(ab, "peer-unmap-event: unknown peer id %d\n",</div><div class='add'>+			    peer_id);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_DP_HTT, "htt peer unmap vdev %d peer %pM id %d\n",</div><div class='add'>+		   peer-&gt;vdev_id, peer-&gt;addr, peer_id);</div><div class='add'>+</div><div class='add'>+	list_del(&amp;peer-&gt;list);</div><div class='add'>+	kfree(peer);</div><div class='add'>+	wake_up(&amp;ab-&gt;peer_mapping_wq);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_peer_map_event(struct ath12k_base *ab, u8 vdev_id, u16 peer_id,</div><div class='add'>+			   u8 *mac_addr, u16 ast_hash, u16 hw_peer_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	peer = ath12k_peer_find(ab, vdev_id, mac_addr);</div><div class='add'>+	if (!peer) {</div><div class='add'>+		peer = kzalloc(sizeof(*peer), GFP_ATOMIC);</div><div class='add'>+		if (!peer)</div><div class='add'>+			goto exit;</div><div class='add'>+</div><div class='add'>+		peer-&gt;vdev_id = vdev_id;</div><div class='add'>+		peer-&gt;peer_id = peer_id;</div><div class='add'>+		peer-&gt;ast_hash = ast_hash;</div><div class='add'>+		peer-&gt;hw_peer_id = hw_peer_id;</div><div class='add'>+		ether_addr_copy(peer-&gt;addr, mac_addr);</div><div class='add'>+		list_add(&amp;peer-&gt;list, &amp;ab-&gt;peers);</div><div class='add'>+		wake_up(&amp;ab-&gt;peer_mapping_wq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_DP_HTT, "htt peer map vdev %d peer %pM id %d\n",</div><div class='add'>+		   vdev_id, mac_addr, peer_id);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wait_for_peer_common(struct ath12k_base *ab, int vdev_id,</div><div class='add'>+				       const u8 *addr, bool expect_mapped)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = wait_event_timeout(ab-&gt;peer_mapping_wq, ({</div><div class='add'>+				bool mapped;</div><div class='add'>+</div><div class='add'>+				spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+				mapped = !!ath12k_peer_find(ab, vdev_id, addr);</div><div class='add'>+				spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+				(mapped == expect_mapped ||</div><div class='add'>+				 test_bit(ATH12K_FLAG_CRASH_FLUSH, &amp;ab-&gt;dev_flags));</div><div class='add'>+				}), 3 * HZ);</div><div class='add'>+</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_peer_cleanup(struct ath12k *ar, u32 vdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_peer *peer, *tmp;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	list_for_each_entry_safe(peer, tmp, &amp;ab-&gt;peers, list) {</div><div class='add'>+		if (peer-&gt;vdev_id != vdev_id)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ath12k_warn(ab, "removing stale peer %pM from vdev_id %d\n",</div><div class='add'>+			    peer-&gt;addr, vdev_id);</div><div class='add'>+</div><div class='add'>+		list_del(&amp;peer-&gt;list);</div><div class='add'>+		kfree(peer);</div><div class='add'>+		ar-&gt;num_peers--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wait_for_peer_deleted(struct ath12k *ar, int vdev_id, const u8 *addr)</div><div class='add'>+{</div><div class='add'>+	return ath12k_wait_for_peer_common(ar-&gt;ab, vdev_id, addr, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wait_for_peer_delete_done(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+				     const u8 *addr)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned long time_left;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wait_for_peer_deleted(ar, vdev_id, addr);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed wait for peer deleted");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;ar-&gt;peer_delete_done,</div><div class='add'>+						3 * HZ);</div><div class='add'>+	if (time_left == 0) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "Timeout in receiving peer delete response\n");</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_peer_delete_send(struct ath12k *ar, u32 vdev_id, const u8 *addr)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;ar-&gt;peer_delete_done);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_send_peer_delete_cmd(ar, addr, vdev_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "failed to delete peer vdev_id %d addr %pM ret %d\n",</div><div class='add'>+			    vdev_id, addr, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_peer_delete(struct ath12k *ar, u32 vdev_id, u8 *addr)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_peer_delete_send(ar, vdev_id, addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wait_for_peer_delete_done(ar, vdev_id, addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ar-&gt;num_peers--;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wait_for_peer_created(struct ath12k *ar, int vdev_id, const u8 *addr)</div><div class='add'>+{</div><div class='add'>+	return ath12k_wait_for_peer_common(ar-&gt;ab, vdev_id, addr, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_peer_create(struct ath12k *ar, struct ath12k_link_vif *arvif,</div><div class='add'>+		       struct ieee80211_sta *sta,</div><div class='add'>+		       struct ath12k_wmi_peer_create_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	u8 link_id = arvif-&gt;link_id;</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	struct ath12k_sta *ahsta;</div><div class='add'>+	u16 ml_peer_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;num_peers &gt; (ar-&gt;max_num_peers - 1)) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to create peer due to insufficient peer entry resource in firmware\n");</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+	peer = ath12k_peer_find_by_pdev_idx(ar-&gt;ab, ar-&gt;pdev_idx, arg-&gt;peer_addr);</div><div class='add'>+	if (peer) {</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_send_peer_create_cmd(ar, arg);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send peer create vdev_id %d ret %d\n",</div><div class='add'>+			    arg-&gt;vdev_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wait_for_peer_created(ar, arg-&gt;vdev_id,</div><div class='add'>+					   arg-&gt;peer_addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	peer = ath12k_peer_find(ar-&gt;ab, arg-&gt;vdev_id, arg-&gt;peer_addr);</div><div class='add'>+	if (!peer) {</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to find peer %pM on vdev %i after creation\n",</div><div class='add'>+			    arg-&gt;peer_addr, arg-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+		reinit_completion(&amp;ar-&gt;peer_delete_done);</div><div class='add'>+</div><div class='add'>+		ret = ath12k_wmi_send_peer_delete_cmd(ar, arg-&gt;peer_addr,</div><div class='add'>+						      arg-&gt;vdev_id);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to delete peer vdev_id %d addr %pM\n",</div><div class='add'>+				    arg-&gt;vdev_id, arg-&gt;peer_addr);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ath12k_wait_for_peer_delete_done(ar, arg-&gt;vdev_id,</div><div class='add'>+						       arg-&gt;peer_addr);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	peer-&gt;pdev_idx = ar-&gt;pdev_idx;</div><div class='add'>+	peer-&gt;sta = sta;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='add'>+		arvif-&gt;ast_hash = peer-&gt;ast_hash;</div><div class='add'>+		arvif-&gt;ast_idx = peer-&gt;hw_peer_id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP)</div><div class='add'>+		peer-&gt;ucast_ra_only = true;</div><div class='add'>+</div><div class='add'>+	if (sta) {</div><div class='add'>+		ahsta = ath12k_sta_to_ahsta(sta);</div><div class='add'>+		arsta = wiphy_dereference(ath12k_ar_to_hw(ar)-&gt;wiphy,</div><div class='add'>+					  ahsta-&gt;link[link_id]);</div><div class='add'>+</div><div class='add'>+		peer-&gt;link_id = arsta-&gt;link_id;</div><div class='add'>+</div><div class='add'>+		/* Fill ML info into created peer */</div><div class='add'>+		if (sta-&gt;mlo) {</div><div class='add'>+			ml_peer_id = ahsta-&gt;ml_peer_id;</div><div class='add'>+			peer-&gt;ml_id = ml_peer_id | ATH12K_PEER_ML_ID_VALID;</div><div class='add'>+			ether_addr_copy(peer-&gt;ml_addr, sta-&gt;addr);</div><div class='add'>+</div><div class='add'>+			/* the assoc link is considered primary for now */</div><div class='add'>+			peer-&gt;primary_link = arsta-&gt;is_assoc_link;</div><div class='add'>+			peer-&gt;mlo = true;</div><div class='add'>+		} else {</div><div class='add'>+			peer-&gt;ml_id = ATH12K_MLO_PEER_ID_INVALID;</div><div class='add'>+			peer-&gt;primary_link = true;</div><div class='add'>+			peer-&gt;mlo = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	peer-&gt;sec_type = HAL_ENCRYPT_TYPE_OPEN;</div><div class='add'>+	peer-&gt;sec_type_grp = HAL_ENCRYPT_TYPE_OPEN;</div><div class='add'>+</div><div class='add'>+	ar-&gt;num_peers++;</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ath12k_peer_ml_alloc(struct ath12k_hw *ah)</div><div class='add'>+{</div><div class='add'>+	u16 ml_peer_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	for (ml_peer_id = 0; ml_peer_id &lt; ATH12K_MAX_MLO_PEERS; ml_peer_id++) {</div><div class='add'>+		if (test_bit(ml_peer_id, ah-&gt;free_ml_peer_id_map))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		set_bit(ml_peer_id, ah-&gt;free_ml_peer_id_map);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ml_peer_id == ATH12K_MAX_MLO_PEERS)</div><div class='add'>+		ml_peer_id = ATH12K_MLO_PEER_ID_INVALID;</div><div class='add'>+</div><div class='add'>+	return ml_peer_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_peer_ml_create(struct ath12k_hw *ah, struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta);</div><div class='add'>+	struct ath12k_ml_peer *ml_peer;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!sta-&gt;mlo)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ml_peer = ath12k_peer_ml_find(ah, sta-&gt;addr);</div><div class='add'>+	if (ml_peer) {</div><div class='add'>+		ath12k_hw_warn(ah, "ML peer %d exists already, unable to add new entry for %pM",</div><div class='add'>+			       ml_peer-&gt;id, sta-&gt;addr);</div><div class='add'>+		return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ml_peer = kzalloc(sizeof(*ml_peer), GFP_ATOMIC);</div><div class='add'>+	if (!ml_peer)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ahsta-&gt;ml_peer_id = ath12k_peer_ml_alloc(ah);</div><div class='add'>+</div><div class='add'>+	if (ahsta-&gt;ml_peer_id == ATH12K_MLO_PEER_ID_INVALID) {</div><div class='add'>+		ath12k_hw_warn(ah, "unable to allocate ML peer id for sta %pM",</div><div class='add'>+			       sta-&gt;addr);</div><div class='add'>+		kfree(ml_peer);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(ml_peer-&gt;addr, sta-&gt;addr);</div><div class='add'>+	ml_peer-&gt;id = ahsta-&gt;ml_peer_id;</div><div class='add'>+	list_add(&amp;ml_peer-&gt;list, &amp;ah-&gt;ml_peers);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_peer_ml_delete(struct ath12k_hw *ah, struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta);</div><div class='add'>+	struct ath12k_ml_peer *ml_peer;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!sta-&gt;mlo)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	clear_bit(ahsta-&gt;ml_peer_id, ah-&gt;free_ml_peer_id_map);</div><div class='add'>+	ahsta-&gt;ml_peer_id = ATH12K_MLO_PEER_ID_INVALID;</div><div class='add'>+</div><div class='add'>+	ml_peer = ath12k_peer_ml_find(ah, sta-&gt;addr);</div><div class='add'>+	if (!ml_peer) {</div><div class='add'>+		ath12k_hw_warn(ah, "ML peer for %pM not found", sta-&gt;addr);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_del(&amp;ml_peer-&gt;list);</div><div class='add'>+	kfree(ml_peer);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_peer_mlo_link_peers_delete(struct ath12k_vif *ahvif, struct ath12k_sta *ahsta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = ath12k_ahsta_to_sta(ahsta);</div><div class='add'>+	struct ath12k_hw *ah = ahvif-&gt;ah;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	unsigned long links;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int ret, err_ret = 0;</div><div class='add'>+	u8 link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ah-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!sta-&gt;mlo)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* FW expects delete of all link peers at once before waiting for reception</div><div class='add'>+	 * of peer unmap or delete responses</div><div class='add'>+	 */</div><div class='add'>+	links = ahsta-&gt;links_map;</div><div class='add'>+	for_each_set_bit(link_id, &amp;links, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		arvif = wiphy_dereference(ah-&gt;hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+		arsta = wiphy_dereference(ah-&gt;hw-&gt;wiphy, ahsta-&gt;link[link_id]);</div><div class='add'>+		if (!arvif || !arsta)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ar = arvif-&gt;ar;</div><div class='add'>+		if (!ar)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ath12k_dp_peer_cleanup(ar, arvif-&gt;vdev_id, arsta-&gt;addr);</div><div class='add'>+</div><div class='add'>+		ret = ath12k_peer_delete_send(ar, arvif-&gt;vdev_id, arsta-&gt;addr);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab,</div><div class='add'>+				    "failed to delete peer vdev_id %d addr %pM ret %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, arsta-&gt;addr, ret);</div><div class='add'>+			err_ret = ret;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Ensure all link peers are deleted and unmapped */</div><div class='add'>+	links = ahsta-&gt;links_map;</div><div class='add'>+	for_each_set_bit(link_id, &amp;links, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		arvif = wiphy_dereference(ah-&gt;hw-&gt;wiphy, ahvif-&gt;link[link_id]);</div><div class='add'>+		arsta = wiphy_dereference(ah-&gt;hw-&gt;wiphy, ahsta-&gt;link[link_id]);</div><div class='add'>+		if (!arvif || !arsta)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ar = arvif-&gt;ar;</div><div class='add'>+		if (!ar)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = ath12k_wait_for_peer_delete_done(ar, arvif-&gt;vdev_id, arsta-&gt;addr);</div><div class='add'>+		if (ret) {</div><div class='add'>+			err_ret = ret;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		ar-&gt;num_peers--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err_ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/peer.h b/drivers/net/wireless/ath/ath12k/peer.h<br/>new file mode 100644<br/>index 000000000000..44afc0b7dd53<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/peer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/peer.h</a></div><div class='hunk'>@@ -0,0 +1,123 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH12K_PEER_H</div><div class='add'>+#define ATH12K_PEER_H</div><div class='add'>+</div><div class='add'>+#include "dp_rx.h"</div><div class='add'>+</div><div class='add'>+struct ppdu_user_delayba {</div><div class='add'>+	u16 sw_peer_id;</div><div class='add'>+	u32 info0;</div><div class='add'>+	u16 ru_end;</div><div class='add'>+	u16 ru_start;</div><div class='add'>+	u32 info1;</div><div class='add'>+	u32 rate_flags;</div><div class='add'>+	u32 resp_rate_flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_PEER_ML_ID_VALID         BIT(13)</div><div class='add'>+</div><div class='add'>+struct ath12k_peer {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	int vdev_id;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+	int peer_id;</div><div class='add'>+	u16 ast_hash;</div><div class='add'>+	u8 pdev_idx;</div><div class='add'>+	u16 hw_peer_id;</div><div class='add'>+</div><div class='add'>+	/* protected by ab-&gt;data_lock */</div><div class='add'>+	struct ieee80211_key_conf *keys[WMI_MAX_KEY_INDEX + 1];</div><div class='add'>+	struct ath12k_dp_rx_tid rx_tid[IEEE80211_NUM_TIDS + 1];</div><div class='add'>+</div><div class='add'>+	/* Info used in MMIC verification of</div><div class='add'>+	 * RX fragments</div><div class='add'>+	 */</div><div class='add'>+	struct crypto_shash *tfm_mmic;</div><div class='add'>+	u8 mcast_keyidx;</div><div class='add'>+	u8 ucast_keyidx;</div><div class='add'>+	u16 sec_type;</div><div class='add'>+	u16 sec_type_grp;</div><div class='add'>+	struct ppdu_user_delayba ppdu_stats_delayba;</div><div class='add'>+	bool delayba_flag;</div><div class='add'>+	bool is_authorized;</div><div class='add'>+	bool mlo;</div><div class='add'>+	/* protected by ab-&gt;data_lock */</div><div class='add'>+	bool dp_setup_done;</div><div class='add'>+</div><div class='add'>+	u16 ml_id;</div><div class='add'>+</div><div class='add'>+	/* any other ML info common for all partners can be added</div><div class='add'>+	 * here and would be same for all partner peers.</div><div class='add'>+	 */</div><div class='add'>+	u8 ml_addr[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+	/* To ensure only certain work related to dp is done once */</div><div class='add'>+	bool primary_link;</div><div class='add'>+</div><div class='add'>+	/* for reference to ath12k_link_sta */</div><div class='add'>+	u8 link_id;</div><div class='add'>+	bool ucast_ra_only;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_ml_peer {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+	u16 id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath12k_peer_unmap_event(struct ath12k_base *ab, u16 peer_id);</div><div class='add'>+void ath12k_peer_map_event(struct ath12k_base *ab, u8 vdev_id, u16 peer_id,</div><div class='add'>+			   u8 *mac_addr, u16 ast_hash, u16 hw_peer_id);</div><div class='add'>+struct ath12k_peer *ath12k_peer_find(struct ath12k_base *ab, int vdev_id,</div><div class='add'>+				     const u8 *addr);</div><div class='add'>+struct ath12k_peer *ath12k_peer_find_by_addr(struct ath12k_base *ab,</div><div class='add'>+					     const u8 *addr);</div><div class='add'>+struct ath12k_peer *ath12k_peer_find_by_id(struct ath12k_base *ab, int peer_id);</div><div class='add'>+void ath12k_peer_cleanup(struct ath12k *ar, u32 vdev_id);</div><div class='add'>+int ath12k_peer_delete(struct ath12k *ar, u32 vdev_id, u8 *addr);</div><div class='add'>+int ath12k_peer_create(struct ath12k *ar, struct ath12k_link_vif *arvif,</div><div class='add'>+		       struct ieee80211_sta *sta,</div><div class='add'>+		       struct ath12k_wmi_peer_create_arg *arg);</div><div class='add'>+int ath12k_wait_for_peer_delete_done(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+				     const u8 *addr);</div><div class='add'>+bool ath12k_peer_exist_by_vdev_id(struct ath12k_base *ab, int vdev_id);</div><div class='add'>+struct ath12k_peer *ath12k_peer_find_by_ast(struct ath12k_base *ab, int ast_hash);</div><div class='add'>+int ath12k_peer_ml_create(struct ath12k_hw *ah, struct ieee80211_sta *sta);</div><div class='add'>+int ath12k_peer_ml_delete(struct ath12k_hw *ah, struct ieee80211_sta *sta);</div><div class='add'>+int ath12k_peer_mlo_link_peers_delete(struct ath12k_vif *ahvif, struct ath12k_sta *ahsta);</div><div class='add'>+struct ath12k_ml_peer *ath12k_peer_ml_find(struct ath12k_hw *ah,</div><div class='add'>+					   const u8 *addr);</div><div class='add'>+static inline</div><div class='add'>+struct ath12k_link_sta *ath12k_peer_get_link_sta(struct ath12k_base *ab,</div><div class='add'>+						 struct ath12k_peer *peer)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_sta *ahsta;</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+</div><div class='add'>+	if (!peer-&gt;sta)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ahsta = ath12k_sta_to_ahsta(peer-&gt;sta);</div><div class='add'>+	if (peer-&gt;ml_id &amp; ATH12K_PEER_ML_ID_VALID) {</div><div class='add'>+		if (!(ahsta-&gt;links_map &amp; BIT(peer-&gt;link_id))) {</div><div class='add'>+			ath12k_warn(ab, "peer %pM id %d link_id %d can't found in STA link_map 0x%x\n",</div><div class='add'>+				    peer-&gt;addr, peer-&gt;peer_id, peer-&gt;link_id,</div><div class='add'>+				    ahsta-&gt;links_map);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+		arsta = rcu_dereference(ahsta-&gt;link[peer-&gt;link_id]);</div><div class='add'>+		if (!arsta)</div><div class='add'>+			return NULL;</div><div class='add'>+	} else {</div><div class='add'>+		arsta =  &amp;ahsta-&gt;deflink;</div><div class='add'>+	}</div><div class='add'>+	return arsta;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _PEER_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/qmi.c b/drivers/net/wireless/ath/ath12k/qmi.c<br/>new file mode 100644<br/>index 000000000000..b7c48b6706df<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/qmi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/qmi.c</a></div><div class='hunk'>@@ -0,0 +1,3917 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/elf.h&gt;</div><div class='add'>+</div><div class='add'>+#include "qmi.h"</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+</div><div class='add'>+#define SLEEP_CLOCK_SELECT_INTERNAL_BIT	0x02</div><div class='add'>+#define HOST_CSTATE_BIT			0x04</div><div class='add'>+#define PLATFORM_CAP_PCIE_GLOBAL_RESET	0x08</div><div class='add'>+#define ATH12K_QMI_MAX_CHUNK_SIZE	2097152</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info wlfw_host_mlo_chip_info_s_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type      = QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len       = 1,</div><div class='add'>+		.elem_size      = sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type       = 0,</div><div class='add'>+		.offset         = offsetof(struct wlfw_host_mlo_chip_info_s_v01,</div><div class='add'>+					   chip_id),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type      = QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len       = 1,</div><div class='add'>+		.elem_size      = sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type       = 0,</div><div class='add'>+		.offset         = offsetof(struct wlfw_host_mlo_chip_info_s_v01,</div><div class='add'>+					   num_local_links),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type      = QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len       = QMI_WLFW_MAX_NUM_MLO_LINKS_PER_CHIP_V01,</div><div class='add'>+		.elem_size      = sizeof(u8),</div><div class='add'>+		.array_type     = STATIC_ARRAY,</div><div class='add'>+		.tlv_type       = 0,</div><div class='add'>+		.offset         = offsetof(struct wlfw_host_mlo_chip_info_s_v01,</div><div class='add'>+					   hw_link_id),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type      = QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len       = QMI_WLFW_MAX_NUM_MLO_LINKS_PER_CHIP_V01,</div><div class='add'>+		.elem_size      = sizeof(u8),</div><div class='add'>+		.array_type     = STATIC_ARRAY,</div><div class='add'>+		.tlv_type       = 0,</div><div class='add'>+		.offset         = offsetof(struct wlfw_host_mlo_chip_info_s_v01,</div><div class='add'>+					   valid_mlo_link_id),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type      = QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type       = QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_host_cap_req_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x10,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   num_clients_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x10,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   num_clients),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x11,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   wake_msi_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x11,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   wake_msi),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x12,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   gpios_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_DATA_LEN,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x12,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   gpios_len),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= QMI_WLFW_MAX_NUM_GPIO_V01,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= VAR_LEN_ARRAY,</div><div class='add'>+		.tlv_type	= 0x12,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   gpios),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x13,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   nm_modem_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x13,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   nm_modem),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x14,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   bdf_support_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x14,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   bdf_support),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x15,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   bdf_cache_support_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x15,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   bdf_cache_support),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x16,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   m3_support_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x16,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   m3_support),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x17,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   m3_cache_support_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x17,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   m3_cache_support),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x18,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   cal_filesys_support_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x18,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   cal_filesys_support),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x19,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   cal_cache_support_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x19,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   cal_cache_support),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x1A,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   cal_done_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x1A,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   cal_done),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x1B,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   mem_bucket_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x1B,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   mem_bucket),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x1C,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   mem_cfg_mode_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x1C,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   mem_cfg_mode),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x1D,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   cal_duration_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_2_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u16),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x1D,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   cal_duraiton),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x1E,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   platform_name_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRING,</div><div class='add'>+		.elem_len	= QMI_WLANFW_MAX_PLATFORM_NAME_LEN_V01 + 1,</div><div class='add'>+		.elem_size	= sizeof(char),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x1E,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   platform_name),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x1F,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   ddr_range_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= QMI_WLANFW_MAX_HOST_DDR_RANGE_SIZE_V01,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_wlanfw_host_ddr_range),</div><div class='add'>+		.array_type	= STATIC_ARRAY,</div><div class='add'>+		.tlv_type	= 0x1F,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   ddr_range),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x20,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   host_build_type_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_SIGNED_4_BYTE_ENUM,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(enum qmi_wlanfw_host_build_type),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x20,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   host_build_type),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x21,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   mlo_capable_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x21,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   mlo_capable),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x22,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   mlo_chip_id_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_2_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u16),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x22,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   mlo_chip_id),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x23,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   mlo_group_id_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x23,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   mlo_group_id),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x24,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   max_mlo_peer_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_2_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u16),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x24,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   max_mlo_peer),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x25,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   mlo_num_chips_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x25,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   mlo_num_chips),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x26,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   mlo_chip_info_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= QMI_WLFW_MAX_NUM_MLO_CHIPS_V01,</div><div class='add'>+		.elem_size	= sizeof(struct wlfw_host_mlo_chip_info_s_v01),</div><div class='add'>+		.array_type	= STATIC_ARRAY,</div><div class='add'>+		.tlv_type	= 0x26,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   mlo_chip_info),</div><div class='add'>+		.ei_array	= wlfw_host_mlo_chip_info_s_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x27,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   feature_list_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_8_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u64),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x27,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,</div><div class='add'>+					   feature_list),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_host_cap_resp_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_response_type_v01),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x02,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_host_cap_resp_msg_v01, resp),</div><div class='add'>+		.ei_array	= qmi_response_type_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_phy_cap_req_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_phy_cap_resp_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_response_type_v01),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x02,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_phy_cap_resp_msg_v01, resp),</div><div class='add'>+		.ei_array	= qmi_response_type_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x10,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_phy_cap_resp_msg_v01,</div><div class='add'>+					   num_phy_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x10,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_phy_cap_resp_msg_v01,</div><div class='add'>+					   num_phy),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x11,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_phy_cap_resp_msg_v01,</div><div class='add'>+					   board_id_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x11,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_phy_cap_resp_msg_v01,</div><div class='add'>+					   board_id),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type      = QMI_OPT_FLAG,</div><div class='add'>+		.elem_len       = 1,</div><div class='add'>+		.elem_size      = sizeof(u8),</div><div class='add'>+		.array_type     = NO_ARRAY,</div><div class='add'>+		.tlv_type       = 0x13,</div><div class='add'>+		.offset         = offsetof(struct qmi_wlanfw_phy_cap_resp_msg_v01,</div><div class='add'>+					   single_chip_mlo_support_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type      = QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len       = 1,</div><div class='add'>+		.elem_size      = sizeof(u8),</div><div class='add'>+		.array_type     = NO_ARRAY,</div><div class='add'>+		.tlv_type       = 0x13,</div><div class='add'>+		.offset         = offsetof(struct qmi_wlanfw_phy_cap_resp_msg_v01,</div><div class='add'>+					   single_chip_mlo_support),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_ind_register_req_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x10,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   fw_ready_enable_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x10,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   fw_ready_enable),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x11,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   initiate_cal_download_enable_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x11,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   initiate_cal_download_enable),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x12,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   initiate_cal_update_enable_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x12,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   initiate_cal_update_enable),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x13,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   msa_ready_enable_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x13,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   msa_ready_enable),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x14,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   pin_connect_result_enable_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x14,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   pin_connect_result_enable),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x15,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   client_id_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x15,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   client_id),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x16,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   request_mem_enable_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x16,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   request_mem_enable),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x17,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   fw_mem_ready_enable_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x17,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   fw_mem_ready_enable),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x18,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   fw_init_done_enable_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x18,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   fw_init_done_enable),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x19,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   rejuvenate_enable_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x19,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   rejuvenate_enable),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x1A,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   xo_cal_enable_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x1A,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   xo_cal_enable),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x1B,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   cal_done_enable_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x1B,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_req_msg_v01,</div><div class='add'>+					   cal_done_enable),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_ind_register_resp_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_response_type_v01),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x02,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_resp_msg_v01,</div><div class='add'>+					   resp),</div><div class='add'>+		.ei_array	= qmi_response_type_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x10,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_resp_msg_v01,</div><div class='add'>+					   fw_status_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_8_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u64),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x10,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ind_register_resp_msg_v01,</div><div class='add'>+					   fw_status),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_mem_cfg_s_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_8_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u64),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_mem_cfg_s_v01, offset),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_mem_cfg_s_v01, size),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_mem_cfg_s_v01, secure_flag),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_mem_seg_s_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_mem_seg_s_v01,</div><div class='add'>+				  size),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_SIGNED_4_BYTE_ENUM,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(enum qmi_wlanfw_mem_type_enum_v01),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_mem_seg_s_v01, type),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_DATA_LEN,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_mem_seg_s_v01, mem_cfg_len),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= QMI_WLANFW_MAX_NUM_MEM_CFG_V01,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_wlanfw_mem_cfg_s_v01),</div><div class='add'>+		.array_type	= VAR_LEN_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_mem_seg_s_v01, mem_cfg),</div><div class='add'>+		.ei_array	= qmi_wlanfw_mem_cfg_s_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_request_mem_ind_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_DATA_LEN,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x01,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_request_mem_ind_msg_v01,</div><div class='add'>+					   mem_seg_len),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= ATH12K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_wlanfw_mem_seg_s_v01),</div><div class='add'>+		.array_type	= VAR_LEN_ARRAY,</div><div class='add'>+		.tlv_type	= 0x01,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_request_mem_ind_msg_v01,</div><div class='add'>+					   mem_seg),</div><div class='add'>+		.ei_array	= qmi_wlanfw_mem_seg_s_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_mem_seg_resp_s_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_8_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u64),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_mem_seg_resp_s_v01, addr),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_mem_seg_resp_s_v01, size),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_SIGNED_4_BYTE_ENUM,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(enum qmi_wlanfw_mem_type_enum_v01),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_mem_seg_resp_s_v01, type),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_mem_seg_resp_s_v01, restore),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_respond_mem_req_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_DATA_LEN,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x01,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_respond_mem_req_msg_v01,</div><div class='add'>+					   mem_seg_len),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= ATH12K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_wlanfw_mem_seg_resp_s_v01),</div><div class='add'>+		.array_type	= VAR_LEN_ARRAY,</div><div class='add'>+		.tlv_type	= 0x01,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_respond_mem_req_msg_v01,</div><div class='add'>+					   mem_seg),</div><div class='add'>+		.ei_array	= qmi_wlanfw_mem_seg_resp_s_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_respond_mem_resp_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_response_type_v01),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x02,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_respond_mem_resp_msg_v01,</div><div class='add'>+					   resp),</div><div class='add'>+		.ei_array	= qmi_response_type_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_cap_req_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_rf_chip_info_s_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_rf_chip_info_s_v01,</div><div class='add'>+					   chip_id),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_rf_chip_info_s_v01,</div><div class='add'>+					   chip_family),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_rf_board_info_s_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_rf_board_info_s_v01,</div><div class='add'>+					   board_id),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_soc_info_s_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_soc_info_s_v01, soc_id),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_dev_mem_info_s_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_8_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u64),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_dev_mem_info_s_v01,</div><div class='add'>+					   start),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_8_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u64),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_dev_mem_info_s_v01,</div><div class='add'>+					   size),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_fw_version_info_s_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_fw_version_info_s_v01,</div><div class='add'>+					   fw_version),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRING,</div><div class='add'>+		.elem_len	= ATH12K_QMI_WLANFW_MAX_TIMESTAMP_LEN_V01 + 1,</div><div class='add'>+		.elem_size	= sizeof(char),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_fw_version_info_s_v01,</div><div class='add'>+					   fw_build_timestamp),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_cap_resp_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_response_type_v01),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x02,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01, resp),</div><div class='add'>+		.ei_array	= qmi_response_type_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x10,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   chip_info_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_wlanfw_rf_chip_info_s_v01),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x10,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   chip_info),</div><div class='add'>+		.ei_array	= qmi_wlanfw_rf_chip_info_s_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x11,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   board_info_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_wlanfw_rf_board_info_s_v01),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x11,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   board_info),</div><div class='add'>+		.ei_array	= qmi_wlanfw_rf_board_info_s_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x12,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   soc_info_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_wlanfw_soc_info_s_v01),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x12,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   soc_info),</div><div class='add'>+		.ei_array	= qmi_wlanfw_soc_info_s_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x13,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   fw_version_info_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_wlanfw_fw_version_info_s_v01),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x13,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   fw_version_info),</div><div class='add'>+		.ei_array	= qmi_wlanfw_fw_version_info_s_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x14,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   fw_build_id_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRING,</div><div class='add'>+		.elem_len	= ATH12K_QMI_WLANFW_MAX_BUILD_ID_LEN_V01 + 1,</div><div class='add'>+		.elem_size	= sizeof(char),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x14,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   fw_build_id),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x15,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   num_macs_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x15,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   num_macs),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x16,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   voltage_mv_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x16,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   voltage_mv),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x17,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   time_freq_hz_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x17,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   time_freq_hz),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x18,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   otp_version_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x18,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   otp_version),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x19,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   eeprom_caldata_read_timeout_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x19,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   eeprom_caldata_read_timeout),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x1A,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   fw_caps_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_8_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u64),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x1A,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01, fw_caps),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x1B,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   rd_card_chain_cap_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x1B,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   rd_card_chain_cap),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x1C,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01,</div><div class='add'>+					   dev_mem_info_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= ATH12K_QMI_WLFW_MAX_DEV_MEM_NUM_V01,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_wlanfw_dev_mem_info_s_v01),</div><div class='add'>+		.array_type	= STATIC_ARRAY,</div><div class='add'>+		.tlv_type	= 0x1C,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_cap_resp_msg_v01, dev_mem),</div><div class='add'>+		.ei_array	= qmi_wlanfw_dev_mem_info_s_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_bdf_download_req_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x01,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_bdf_download_req_msg_v01,</div><div class='add'>+					   valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x10,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_bdf_download_req_msg_v01,</div><div class='add'>+					   file_id_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_SIGNED_4_BYTE_ENUM,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(enum qmi_wlanfw_cal_temp_id_enum_v01),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x10,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_bdf_download_req_msg_v01,</div><div class='add'>+					   file_id),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x11,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_bdf_download_req_msg_v01,</div><div class='add'>+					   total_size_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x11,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_bdf_download_req_msg_v01,</div><div class='add'>+					   total_size),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x12,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_bdf_download_req_msg_v01,</div><div class='add'>+					   seg_id_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x12,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_bdf_download_req_msg_v01,</div><div class='add'>+					   seg_id),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x13,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_bdf_download_req_msg_v01,</div><div class='add'>+					   data_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_DATA_LEN,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u16),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x13,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_bdf_download_req_msg_v01,</div><div class='add'>+					   data_len),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= QMI_WLANFW_MAX_DATA_SIZE_V01,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= VAR_LEN_ARRAY,</div><div class='add'>+		.tlv_type	= 0x13,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_bdf_download_req_msg_v01,</div><div class='add'>+					   data),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x14,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_bdf_download_req_msg_v01,</div><div class='add'>+					   end_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x14,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_bdf_download_req_msg_v01,</div><div class='add'>+					   end),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x15,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_bdf_download_req_msg_v01,</div><div class='add'>+					   bdf_type_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x15,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_bdf_download_req_msg_v01,</div><div class='add'>+					   bdf_type),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_bdf_download_resp_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_response_type_v01),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x02,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_bdf_download_resp_msg_v01,</div><div class='add'>+					   resp),</div><div class='add'>+		.ei_array	= qmi_response_type_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_m3_info_req_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_8_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u64),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x01,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_m3_info_req_msg_v01, addr),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x02,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_m3_info_req_msg_v01, size),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_m3_info_resp_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_response_type_v01),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x02,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_m3_info_resp_msg_v01, resp),</div><div class='add'>+		.ei_array	= qmi_response_type_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_ce_tgt_pipe_cfg_s_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ce_tgt_pipe_cfg_s_v01,</div><div class='add'>+					   pipe_num),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_SIGNED_4_BYTE_ENUM,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(enum qmi_wlanfw_pipedir_enum_v01),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ce_tgt_pipe_cfg_s_v01,</div><div class='add'>+					   pipe_dir),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ce_tgt_pipe_cfg_s_v01,</div><div class='add'>+					   nentries),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ce_tgt_pipe_cfg_s_v01,</div><div class='add'>+					   nbytes_max),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ce_tgt_pipe_cfg_s_v01,</div><div class='add'>+					   flags),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_ce_svc_pipe_cfg_s_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ce_svc_pipe_cfg_s_v01,</div><div class='add'>+					   service_id),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_SIGNED_4_BYTE_ENUM,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(enum qmi_wlanfw_pipedir_enum_v01),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ce_svc_pipe_cfg_s_v01,</div><div class='add'>+					   pipe_dir),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_ce_svc_pipe_cfg_s_v01,</div><div class='add'>+					   pipe_num),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_shadow_reg_cfg_s_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_2_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u16),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_shadow_reg_cfg_s_v01, id),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_2_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u16),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_shadow_reg_cfg_s_v01,</div><div class='add'>+					   offset),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_shadow_reg_v3_cfg_s_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_shadow_reg_v3_cfg_s_v01,</div><div class='add'>+					   addr),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_wlan_mode_req_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_4_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u32),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x01,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_mode_req_msg_v01,</div><div class='add'>+					   mode),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x10,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_mode_req_msg_v01,</div><div class='add'>+					   hw_debug_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x10,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_mode_req_msg_v01,</div><div class='add'>+					   hw_debug),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_wlan_mode_resp_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_response_type_v01),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x02,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_mode_resp_msg_v01,</div><div class='add'>+					   resp),</div><div class='add'>+		.ei_array	= qmi_response_type_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_wlan_cfg_req_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x10,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_cfg_req_msg_v01,</div><div class='add'>+					   host_version_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRING,</div><div class='add'>+		.elem_len	= QMI_WLANFW_MAX_STR_LEN_V01 + 1,</div><div class='add'>+		.elem_size	= sizeof(char),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x10,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_cfg_req_msg_v01,</div><div class='add'>+					   host_version),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x11,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_cfg_req_msg_v01,</div><div class='add'>+					   tgt_cfg_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_DATA_LEN,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x11,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_cfg_req_msg_v01,</div><div class='add'>+					   tgt_cfg_len),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= QMI_WLANFW_MAX_NUM_CE_V01,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_wlanfw_ce_tgt_pipe_cfg_s_v01),</div><div class='add'>+		.array_type	= VAR_LEN_ARRAY,</div><div class='add'>+		.tlv_type	= 0x11,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_cfg_req_msg_v01,</div><div class='add'>+					   tgt_cfg),</div><div class='add'>+		.ei_array	= qmi_wlanfw_ce_tgt_pipe_cfg_s_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x12,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_cfg_req_msg_v01,</div><div class='add'>+					   svc_cfg_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_DATA_LEN,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x12,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_cfg_req_msg_v01,</div><div class='add'>+					   svc_cfg_len),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= QMI_WLANFW_MAX_NUM_SVC_V01,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_wlanfw_ce_svc_pipe_cfg_s_v01),</div><div class='add'>+		.array_type	= VAR_LEN_ARRAY,</div><div class='add'>+		.tlv_type	= 0x12,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_cfg_req_msg_v01,</div><div class='add'>+					   svc_cfg),</div><div class='add'>+		.ei_array	= qmi_wlanfw_ce_svc_pipe_cfg_s_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type = NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x13,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_cfg_req_msg_v01,</div><div class='add'>+					   shadow_reg_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_DATA_LEN,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type = NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x13,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_cfg_req_msg_v01,</div><div class='add'>+					   shadow_reg_len),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= QMI_WLANFW_MAX_NUM_SHADOW_REG_V01,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_wlanfw_shadow_reg_cfg_s_v01),</div><div class='add'>+		.array_type = VAR_LEN_ARRAY,</div><div class='add'>+		.tlv_type	= 0x13,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_cfg_req_msg_v01,</div><div class='add'>+					   shadow_reg),</div><div class='add'>+		.ei_array	= qmi_wlanfw_shadow_reg_cfg_s_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x17,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_cfg_req_msg_v01,</div><div class='add'>+					   shadow_reg_v3_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_DATA_LEN,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x17,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_cfg_req_msg_v01,</div><div class='add'>+					   shadow_reg_v3_len),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= QMI_WLANFW_MAX_NUM_SHADOW_REG_V3_V01,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_wlanfw_shadow_reg_v3_cfg_s_v01),</div><div class='add'>+		.array_type	= VAR_LEN_ARRAY,</div><div class='add'>+		.tlv_type	= 0x17,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_cfg_req_msg_v01,</div><div class='add'>+					   shadow_reg_v3),</div><div class='add'>+		.ei_array	= qmi_wlanfw_shadow_reg_v3_cfg_s_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_wlan_cfg_resp_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_response_type_v01),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x02,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_cfg_resp_msg_v01, resp),</div><div class='add'>+		.ei_array	= qmi_response_type_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_mem_ready_ind_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type = QMI_EOTI,</div><div class='add'>+		.array_type = NO_ARRAY,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_fw_ready_ind_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type = QMI_EOTI,</div><div class='add'>+		.array_type = NO_ARRAY,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_wlan_ini_req_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_OPT_FLAG,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x10,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_ini_req_msg_v01,</div><div class='add'>+					   enable_fwlog_valid),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_UNSIGNED_1_BYTE,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(u8),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x10,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_ini_req_msg_v01,</div><div class='add'>+					   enable_fwlog),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qmi_elem_info qmi_wlanfw_wlan_ini_resp_msg_v01_ei[] = {</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_STRUCT,</div><div class='add'>+		.elem_len	= 1,</div><div class='add'>+		.elem_size	= sizeof(struct qmi_response_type_v01),</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= 0x02,</div><div class='add'>+		.offset		= offsetof(struct qmi_wlanfw_wlan_ini_resp_msg_v01,</div><div class='add'>+					   resp),</div><div class='add'>+		.ei_array	= qmi_response_type_v01_ei,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.data_type	= QMI_EOTI,</div><div class='add'>+		.array_type	= NO_ARRAY,</div><div class='add'>+		.tlv_type	= QMI_COMMON_TLV_TYPE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ath12k_host_cap_hw_link_id_init(struct ath12k_hw_group *ag)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab, *partner_ab;</div><div class='add'>+	int i, j, hw_id_base;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_devices; i++) {</div><div class='add'>+		hw_id_base = 0;</div><div class='add'>+		ab = ag-&gt;ab[i];</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; ag-&gt;num_devices; j++) {</div><div class='add'>+			partner_ab = ag-&gt;ab[j];</div><div class='add'>+</div><div class='add'>+			if (partner_ab-&gt;wsi_info.index &gt;= ab-&gt;wsi_info.index)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			hw_id_base += partner_ab-&gt;qmi.num_radios;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ab-&gt;wsi_info.hw_link_id_base = hw_id_base;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ag-&gt;hw_link_id_init_done = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_host_cap_parse_mlo(struct ath12k_base *ab,</div><div class='add'>+				     struct qmi_wlanfw_host_cap_req_msg_v01 *req)</div><div class='add'>+{</div><div class='add'>+	struct wlfw_host_mlo_chip_info_s_v01 *info;</div><div class='add'>+	struct ath12k_hw_group *ag = ab-&gt;ag;</div><div class='add'>+	struct ath12k_base *partner_ab;</div><div class='add'>+	u8 hw_link_id = 0;</div><div class='add'>+	int i, j, ret;</div><div class='add'>+</div><div class='add'>+	if (!ag-&gt;mlo_capable) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_QMI,</div><div class='add'>+			   "MLO is disabled hence skip QMI MLO cap");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ab-&gt;qmi.num_radios || ab-&gt;qmi.num_radios == U8_MAX) {</div><div class='add'>+		ag-&gt;mlo_capable = false;</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_QMI,</div><div class='add'>+			   "skip QMI MLO cap due to invalid num_radio %d\n",</div><div class='add'>+			   ab-&gt;qmi.num_radios);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;device_id == ATH12K_INVALID_DEVICE_ID) {</div><div class='add'>+		ath12k_err(ab, "failed to send MLO cap due to invalid device id\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req-&gt;mlo_capable_valid = 1;</div><div class='add'>+	req-&gt;mlo_capable = 1;</div><div class='add'>+	req-&gt;mlo_chip_id_valid = 1;</div><div class='add'>+	req-&gt;mlo_chip_id = ab-&gt;device_id;</div><div class='add'>+	req-&gt;mlo_group_id_valid = 1;</div><div class='add'>+	req-&gt;mlo_group_id = ag-&gt;id;</div><div class='add'>+	req-&gt;max_mlo_peer_valid = 1;</div><div class='add'>+	/* Max peer number generally won't change for the same device</div><div class='add'>+	 * but needs to be synced with host driver.</div><div class='add'>+	 */</div><div class='add'>+	req-&gt;max_mlo_peer = ab-&gt;hw_params-&gt;max_mlo_peer;</div><div class='add'>+	req-&gt;mlo_num_chips_valid = 1;</div><div class='add'>+	req-&gt;mlo_num_chips = ag-&gt;num_devices;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_QMI, "mlo capability advertisement device_id %d group_id %d num_devices %d",</div><div class='add'>+		   req-&gt;mlo_chip_id, req-&gt;mlo_group_id, req-&gt;mlo_num_chips);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!ag-&gt;hw_link_id_init_done)</div><div class='add'>+		ath12k_host_cap_hw_link_id_init(ag);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_devices; i++) {</div><div class='add'>+		info = &amp;req-&gt;mlo_chip_info[i];</div><div class='add'>+		partner_ab = ag-&gt;ab[i];</div><div class='add'>+</div><div class='add'>+		if (partner_ab-&gt;device_id == ATH12K_INVALID_DEVICE_ID) {</div><div class='add'>+			ath12k_err(ab, "failed to send MLO cap due to invalid partner device id\n");</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto device_cleanup;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		info-&gt;chip_id = partner_ab-&gt;device_id;</div><div class='add'>+		info-&gt;num_local_links = partner_ab-&gt;qmi.num_radios;</div><div class='add'>+</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_QMI, "mlo device id %d num_link %d\n",</div><div class='add'>+			   info-&gt;chip_id, info-&gt;num_local_links);</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; info-&gt;num_local_links; j++) {</div><div class='add'>+			info-&gt;hw_link_id[j] = partner_ab-&gt;wsi_info.hw_link_id_base + j;</div><div class='add'>+			info-&gt;valid_mlo_link_id[j] = 1;</div><div class='add'>+</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_QMI, "mlo hw_link_id %d\n",</div><div class='add'>+				   info-&gt;hw_link_id[j]);</div><div class='add'>+</div><div class='add'>+			hw_link_id++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hw_link_id &lt;= 0)</div><div class='add'>+		ag-&gt;mlo_capable = false;</div><div class='add'>+</div><div class='add'>+	req-&gt;mlo_chip_info_valid = 1;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+device_cleanup:</div><div class='add'>+	for (i = i - 1; i &gt;= 0; i--) {</div><div class='add'>+		info = &amp;req-&gt;mlo_chip_info[i];</div><div class='add'>+</div><div class='add'>+		memset(info, 0, sizeof(*info));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req-&gt;mlo_num_chips = 0;</div><div class='add'>+	req-&gt;mlo_num_chips_valid = 0;</div><div class='add'>+</div><div class='add'>+	req-&gt;max_mlo_peer = 0;</div><div class='add'>+	req-&gt;max_mlo_peer_valid = 0;</div><div class='add'>+	req-&gt;mlo_group_id = 0;</div><div class='add'>+	req-&gt;mlo_group_id_valid = 0;</div><div class='add'>+	req-&gt;mlo_chip_id = 0;</div><div class='add'>+	req-&gt;mlo_chip_id_valid = 0;</div><div class='add'>+	req-&gt;mlo_capable = 0;</div><div class='add'>+	req-&gt;mlo_capable_valid = 0;</div><div class='add'>+</div><div class='add'>+	ag-&gt;mlo_capable = false;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* clang stack usage explodes if this is inlined */</div><div class='add'>+static noinline_for_stack</div><div class='add'>+int ath12k_qmi_host_cap_send(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct qmi_wlanfw_host_cap_req_msg_v01 req = {};</div><div class='add'>+	struct qmi_wlanfw_host_cap_resp_msg_v01 resp = {};</div><div class='add'>+	struct qmi_txn txn;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	req.num_clients_valid = 1;</div><div class='add'>+	req.num_clients = 1;</div><div class='add'>+	req.mem_cfg_mode = ab-&gt;qmi.target_mem_mode;</div><div class='add'>+	req.mem_cfg_mode_valid = 1;</div><div class='add'>+	req.bdf_support_valid = 1;</div><div class='add'>+	req.bdf_support = 1;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;fw.m3_loader == ath12k_m3_fw_loader_driver) {</div><div class='add'>+		req.m3_support_valid = 1;</div><div class='add'>+		req.m3_support = 1;</div><div class='add'>+		req.m3_cache_support_valid = 1;</div><div class='add'>+		req.m3_cache_support = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req.cal_done_valid = 1;</div><div class='add'>+	req.cal_done = ab-&gt;qmi.cal_done;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;qmi_cnss_feature_bitmap) {</div><div class='add'>+		req.feature_list_valid = 1;</div><div class='add'>+		req.feature_list = ab-&gt;hw_params-&gt;qmi_cnss_feature_bitmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* BRINGUP: here we are piggybacking a lot of stuff using</div><div class='add'>+	 * internal_sleep_clock, should it be split?</div><div class='add'>+	 */</div><div class='add'>+	if (ab-&gt;hw_params-&gt;internal_sleep_clock) {</div><div class='add'>+		req.nm_modem_valid = 1;</div><div class='add'>+</div><div class='add'>+		/* Notify firmware that this is non-qualcomm platform. */</div><div class='add'>+		req.nm_modem |= HOST_CSTATE_BIT;</div><div class='add'>+</div><div class='add'>+		/* Notify firmware about the sleep clock selection,</div><div class='add'>+		 * nm_modem_bit[1] is used for this purpose. Host driver on</div><div class='add'>+		 * non-qualcomm platforms should select internal sleep</div><div class='add'>+		 * clock.</div><div class='add'>+		 */</div><div class='add'>+		req.nm_modem |= SLEEP_CLOCK_SELECT_INTERNAL_BIT;</div><div class='add'>+		req.nm_modem |= PLATFORM_CAP_PCIE_GLOBAL_RESET;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_host_cap_parse_mlo(ab, &amp;req);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = qmi_txn_init(&amp;ab-&gt;qmi.handle, &amp;txn,</div><div class='add'>+			   qmi_wlanfw_host_cap_resp_msg_v01_ei, &amp;resp);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = qmi_send_request(&amp;ab-&gt;qmi.handle, NULL, &amp;txn,</div><div class='add'>+			       QMI_WLANFW_HOST_CAP_REQ_V01,</div><div class='add'>+			       QMI_WLANFW_HOST_CAP_REQ_MSG_V01_MAX_LEN,</div><div class='add'>+			       qmi_wlanfw_host_cap_req_msg_v01_ei, &amp;req);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		qmi_txn_cancel(&amp;txn);</div><div class='add'>+		ath12k_warn(ab, "Failed to send host capability request,err = %d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = qmi_txn_wait(&amp;txn, msecs_to_jiffies(ATH12K_QMI_WLANFW_TIMEOUT_MS));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {</div><div class='add'>+		ath12k_warn(ab, "Host capability request failed, result: %d, err: %d\n",</div><div class='add'>+			    resp.resp.result, resp.resp.error);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_qmi_phy_cap_send(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct qmi_wlanfw_phy_cap_req_msg_v01 req = {};</div><div class='add'>+	struct qmi_wlanfw_phy_cap_resp_msg_v01 resp = {};</div><div class='add'>+	struct qmi_txn txn;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = qmi_txn_init(&amp;ab-&gt;qmi.handle, &amp;txn,</div><div class='add'>+			   qmi_wlanfw_phy_cap_resp_msg_v01_ei, &amp;resp);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = qmi_send_request(&amp;ab-&gt;qmi.handle, NULL, &amp;txn,</div><div class='add'>+			       QMI_WLANFW_PHY_CAP_REQ_V01,</div><div class='add'>+			       QMI_WLANFW_PHY_CAP_REQ_MSG_V01_MAX_LEN,</div><div class='add'>+			       qmi_wlanfw_phy_cap_req_msg_v01_ei, &amp;req);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		qmi_txn_cancel(&amp;txn);</div><div class='add'>+		ath12k_warn(ab, "failed to send phy capability request: %d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = qmi_txn_wait(&amp;txn, msecs_to_jiffies(ATH12K_QMI_WLANFW_TIMEOUT_MS));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resp.single_chip_mlo_support_valid &amp;&amp; resp.single_chip_mlo_support)</div><div class='add'>+		ab-&gt;single_chip_mlo_support = true;</div><div class='add'>+</div><div class='add'>+	if (!resp.num_phy_valid) {</div><div class='add'>+		ret = -ENODATA;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab-&gt;qmi.num_radios = resp.num_phy;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_QMI,</div><div class='add'>+		   "phy capability resp valid %d single_chip_mlo_support %d valid %d num_phy %d valid %d board_id %d\n",</div><div class='add'>+		   resp.single_chip_mlo_support_valid, resp.single_chip_mlo_support,</div><div class='add'>+		   resp.num_phy_valid, resp.num_phy,</div><div class='add'>+		   resp.board_id_valid, resp.board_id);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	/* If PHY capability not advertised then rely on default num link */</div><div class='add'>+	ab-&gt;qmi.num_radios = ab-&gt;hw_params-&gt;def_num_link;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_QMI,</div><div class='add'>+		   "no valid response from PHY capability, choose default num_phy %d\n",</div><div class='add'>+		   ab-&gt;qmi.num_radios);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_qmi_fw_ind_register_send(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct qmi_wlanfw_ind_register_req_msg_v01 *req;</div><div class='add'>+	struct qmi_wlanfw_ind_register_resp_msg_v01 *resp;</div><div class='add'>+	struct qmi_handle *handle = &amp;ab-&gt;qmi.handle;</div><div class='add'>+	struct qmi_txn txn;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	req = kzalloc(sizeof(*req), GFP_KERNEL);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	resp = kzalloc(sizeof(*resp), GFP_KERNEL);</div><div class='add'>+	if (!resp) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto resp_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req-&gt;client_id_valid = 1;</div><div class='add'>+	req-&gt;client_id = QMI_WLANFW_CLIENT_ID;</div><div class='add'>+	req-&gt;fw_ready_enable_valid = 1;</div><div class='add'>+	req-&gt;fw_ready_enable = 1;</div><div class='add'>+	req-&gt;request_mem_enable_valid = 1;</div><div class='add'>+	req-&gt;request_mem_enable = 1;</div><div class='add'>+	req-&gt;fw_mem_ready_enable_valid = 1;</div><div class='add'>+	req-&gt;fw_mem_ready_enable = 1;</div><div class='add'>+	req-&gt;cal_done_enable_valid = 1;</div><div class='add'>+	req-&gt;cal_done_enable = 1;</div><div class='add'>+	req-&gt;fw_init_done_enable_valid = 1;</div><div class='add'>+	req-&gt;fw_init_done_enable = 1;</div><div class='add'>+</div><div class='add'>+	req-&gt;pin_connect_result_enable_valid = 0;</div><div class='add'>+	req-&gt;pin_connect_result_enable = 0;</div><div class='add'>+</div><div class='add'>+	ret = qmi_txn_init(handle, &amp;txn,</div><div class='add'>+			   qmi_wlanfw_ind_register_resp_msg_v01_ei, resp);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = qmi_send_request(&amp;ab-&gt;qmi.handle, NULL, &amp;txn,</div><div class='add'>+			       QMI_WLANFW_IND_REGISTER_REQ_V01,</div><div class='add'>+			       QMI_WLANFW_IND_REGISTER_REQ_MSG_V01_MAX_LEN,</div><div class='add'>+			       qmi_wlanfw_ind_register_req_msg_v01_ei, req);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		qmi_txn_cancel(&amp;txn);</div><div class='add'>+		ath12k_warn(ab, "Failed to send indication register request, err = %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = qmi_txn_wait(&amp;txn, msecs_to_jiffies(ATH12K_QMI_WLANFW_TIMEOUT_MS));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_warn(ab, "failed to register fw indication %d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resp-&gt;resp.result != QMI_RESULT_SUCCESS_V01) {</div><div class='add'>+		ath12k_warn(ab, "FW Ind register request failed, result: %d, err: %d\n",</div><div class='add'>+			    resp-&gt;resp.result, resp-&gt;resp.error);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(resp);</div><div class='add'>+resp_out:</div><div class='add'>+	kfree(req);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* clang stack usage explodes if this is inlined */</div><div class='add'>+static noinline_for_stack</div><div class='add'>+int ath12k_qmi_respond_fw_mem_request(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct qmi_wlanfw_respond_mem_req_msg_v01 *req;</div><div class='add'>+	struct qmi_wlanfw_respond_mem_resp_msg_v01 resp = {};</div><div class='add'>+	struct qmi_txn txn;</div><div class='add'>+	int ret = 0, i;</div><div class='add'>+	bool delayed;</div><div class='add'>+</div><div class='add'>+	req = kzalloc(sizeof(*req), GFP_KERNEL);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Some targets by default request a block of big contiguous</div><div class='add'>+	 * DMA memory, it's hard to allocate from kernel. So host returns</div><div class='add'>+	 * failure to firmware and firmware then request multiple blocks of</div><div class='add'>+	 * small chunk size memory.</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(ATH12K_FLAG_FIXED_MEM_REGION, &amp;ab-&gt;dev_flags) &amp;&amp;</div><div class='add'>+	    ab-&gt;qmi.target_mem_delayed) {</div><div class='add'>+		delayed = true;</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi delays mem_request %d\n",</div><div class='add'>+			   ab-&gt;qmi.mem_seg_count);</div><div class='add'>+	} else {</div><div class='add'>+		delayed = false;</div><div class='add'>+		req-&gt;mem_seg_len = ab-&gt;qmi.mem_seg_count;</div><div class='add'>+		for (i = 0; i &lt; req-&gt;mem_seg_len ; i++) {</div><div class='add'>+			req-&gt;mem_seg[i].addr = ab-&gt;qmi.target_mem[i].paddr;</div><div class='add'>+			req-&gt;mem_seg[i].size = ab-&gt;qmi.target_mem[i].size;</div><div class='add'>+			req-&gt;mem_seg[i].type = ab-&gt;qmi.target_mem[i].type;</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_QMI,</div><div class='add'>+				   "qmi req mem_seg[%d] %pad %u %u\n", i,</div><div class='add'>+				   &amp;ab-&gt;qmi.target_mem[i].paddr,</div><div class='add'>+				   ab-&gt;qmi.target_mem[i].size,</div><div class='add'>+				   ab-&gt;qmi.target_mem[i].type);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = qmi_txn_init(&amp;ab-&gt;qmi.handle, &amp;txn,</div><div class='add'>+			   qmi_wlanfw_respond_mem_resp_msg_v01_ei, &amp;resp);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = qmi_send_request(&amp;ab-&gt;qmi.handle, NULL, &amp;txn,</div><div class='add'>+			       QMI_WLANFW_RESPOND_MEM_REQ_V01,</div><div class='add'>+			       QMI_WLANFW_RESPOND_MEM_REQ_MSG_V01_MAX_LEN,</div><div class='add'>+			       qmi_wlanfw_respond_mem_req_msg_v01_ei, req);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		qmi_txn_cancel(&amp;txn);</div><div class='add'>+		ath12k_warn(ab, "qmi failed to respond memory request, err = %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = qmi_txn_wait(&amp;txn, msecs_to_jiffies(ATH12K_QMI_WLANFW_TIMEOUT_MS));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_warn(ab, "qmi failed memory request, err = %d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {</div><div class='add'>+		/* the error response is expected when</div><div class='add'>+		 * target_mem_delayed is true.</div><div class='add'>+		 */</div><div class='add'>+		if (delayed &amp;&amp; resp.resp.error == 0)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		ath12k_warn(ab, "Respond mem req failed, result: %d, err: %d\n",</div><div class='add'>+			    resp.resp.result, resp.resp.error);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	kfree(req);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_qmi_reset_mlo_mem(struct ath12k_hw_group *ag)</div><div class='add'>+{</div><div class='add'>+	struct target_mem_chunk *mlo_chunk;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!ag-&gt;mlo_mem.init_done || ag-&gt;num_started)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ag-&gt;mlo_mem.chunk); i++) {</div><div class='add'>+		mlo_chunk = &amp;ag-&gt;mlo_mem.chunk[i];</div><div class='add'>+</div><div class='add'>+		if (mlo_chunk-&gt;v.addr)</div><div class='add'>+			/* TODO: Mode 0 recovery is the default mode hence resetting the</div><div class='add'>+			 * whole memory region for now. Once Mode 1 support is added, this</div><div class='add'>+			 * needs to be handled properly</div><div class='add'>+			 */</div><div class='add'>+			memset(mlo_chunk-&gt;v.addr, 0, mlo_chunk-&gt;size);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_qmi_free_mlo_mem_chunk(struct ath12k_base *ab,</div><div class='add'>+					  struct target_mem_chunk *chunk,</div><div class='add'>+					  int idx)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_group *ag = ab-&gt;ag;</div><div class='add'>+	struct target_mem_chunk *mlo_chunk;</div><div class='add'>+	bool fixed_mem;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!ag-&gt;mlo_mem.init_done || ag-&gt;num_started)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (idx &gt;= ARRAY_SIZE(ag-&gt;mlo_mem.chunk)) {</div><div class='add'>+		ath12k_warn(ab, "invalid index for MLO memory chunk free: %d\n", idx);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fixed_mem = test_bit(ATH12K_FLAG_FIXED_MEM_REGION, &amp;ab-&gt;dev_flags);</div><div class='add'>+	mlo_chunk = &amp;ag-&gt;mlo_mem.chunk[idx];</div><div class='add'>+</div><div class='add'>+	if (fixed_mem &amp;&amp; mlo_chunk-&gt;v.ioaddr) {</div><div class='add'>+		iounmap(mlo_chunk-&gt;v.ioaddr);</div><div class='add'>+		mlo_chunk-&gt;v.ioaddr = NULL;</div><div class='add'>+	} else if (mlo_chunk-&gt;v.addr) {</div><div class='add'>+		dma_free_coherent(ab-&gt;dev,</div><div class='add'>+				  mlo_chunk-&gt;size,</div><div class='add'>+				  mlo_chunk-&gt;v.addr,</div><div class='add'>+				  mlo_chunk-&gt;paddr);</div><div class='add'>+		mlo_chunk-&gt;v.addr = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mlo_chunk-&gt;paddr = 0;</div><div class='add'>+	mlo_chunk-&gt;size = 0;</div><div class='add'>+	if (fixed_mem)</div><div class='add'>+		chunk-&gt;v.ioaddr = NULL;</div><div class='add'>+	else</div><div class='add'>+		chunk-&gt;v.addr = NULL;</div><div class='add'>+	chunk-&gt;paddr = 0;</div><div class='add'>+	chunk-&gt;size = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_qmi_free_target_mem_chunk(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_group *ag = ab-&gt;ag;</div><div class='add'>+	int i, mlo_idx;</div><div class='add'>+</div><div class='add'>+	for (i = 0, mlo_idx = 0; i &lt; ab-&gt;qmi.mem_seg_count; i++) {</div><div class='add'>+		if (ab-&gt;qmi.target_mem[i].type == MLO_GLOBAL_MEM_REGION_TYPE) {</div><div class='add'>+			ath12k_qmi_free_mlo_mem_chunk(ab,</div><div class='add'>+						      &amp;ab-&gt;qmi.target_mem[i],</div><div class='add'>+						      mlo_idx++);</div><div class='add'>+		} else {</div><div class='add'>+			if (test_bit(ATH12K_FLAG_FIXED_MEM_REGION, &amp;ab-&gt;dev_flags) &amp;&amp;</div><div class='add'>+			    ab-&gt;qmi.target_mem[i].v.ioaddr) {</div><div class='add'>+				iounmap(ab-&gt;qmi.target_mem[i].v.ioaddr);</div><div class='add'>+				ab-&gt;qmi.target_mem[i].v.ioaddr = NULL;</div><div class='add'>+			} else {</div><div class='add'>+				if (!ab-&gt;qmi.target_mem[i].v.addr)</div><div class='add'>+					continue;</div><div class='add'>+				dma_free_coherent(ab-&gt;dev,</div><div class='add'>+						  ab-&gt;qmi.target_mem[i].prev_size,</div><div class='add'>+						  ab-&gt;qmi.target_mem[i].v.addr,</div><div class='add'>+						  ab-&gt;qmi.target_mem[i].paddr);</div><div class='add'>+				ab-&gt;qmi.target_mem[i].v.addr = NULL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ag-&gt;num_started &amp;&amp; ag-&gt;mlo_mem.init_done) {</div><div class='add'>+		ag-&gt;mlo_mem.init_done = false;</div><div class='add'>+		ag-&gt;mlo_mem.mlo_mem_size = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_qmi_alloc_chunk(struct ath12k_base *ab,</div><div class='add'>+				  struct target_mem_chunk *chunk)</div><div class='add'>+{</div><div class='add'>+	/* Firmware reloads in recovery/resume.</div><div class='add'>+	 * In such cases, no need to allocate memory for FW again.</div><div class='add'>+	 */</div><div class='add'>+	if (chunk-&gt;v.addr) {</div><div class='add'>+		if (chunk-&gt;prev_type == chunk-&gt;type &amp;&amp;</div><div class='add'>+		    chunk-&gt;prev_size == chunk-&gt;size)</div><div class='add'>+			goto this_chunk_done;</div><div class='add'>+</div><div class='add'>+		/* cannot reuse the existing chunk */</div><div class='add'>+		dma_free_coherent(ab-&gt;dev, chunk-&gt;prev_size,</div><div class='add'>+				  chunk-&gt;v.addr, chunk-&gt;paddr);</div><div class='add'>+		chunk-&gt;v.addr = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chunk-&gt;v.addr = dma_alloc_coherent(ab-&gt;dev,</div><div class='add'>+					   chunk-&gt;size,</div><div class='add'>+					   &amp;chunk-&gt;paddr,</div><div class='add'>+					   GFP_KERNEL | __GFP_NOWARN);</div><div class='add'>+	if (!chunk-&gt;v.addr) {</div><div class='add'>+		if (chunk-&gt;size &gt; ATH12K_QMI_MAX_CHUNK_SIZE) {</div><div class='add'>+			ab-&gt;qmi.target_mem_delayed = true;</div><div class='add'>+			ath12k_warn(ab,</div><div class='add'>+				    "qmi dma allocation failed (%d B type %u), will try later with small size\n",</div><div class='add'>+				    chunk-&gt;size,</div><div class='add'>+				    chunk-&gt;type);</div><div class='add'>+			ath12k_qmi_free_target_mem_chunk(ab);</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+		}</div><div class='add'>+		ath12k_warn(ab, "memory allocation failure for %u size: %d\n",</div><div class='add'>+			    chunk-&gt;type, chunk-&gt;size);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	chunk-&gt;prev_type = chunk-&gt;type;</div><div class='add'>+	chunk-&gt;prev_size = chunk-&gt;size;</div><div class='add'>+this_chunk_done:</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_qmi_alloc_target_mem_chunk(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct target_mem_chunk *chunk, *mlo_chunk;</div><div class='add'>+	struct ath12k_hw_group *ag = ab-&gt;ag;</div><div class='add'>+	int i, mlo_idx, ret;</div><div class='add'>+	int mlo_size = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!ag-&gt;mlo_mem.init_done) {</div><div class='add'>+		memset(ag-&gt;mlo_mem.chunk, 0, sizeof(ag-&gt;mlo_mem.chunk));</div><div class='add'>+		ag-&gt;mlo_mem.init_done = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab-&gt;qmi.target_mem_delayed = false;</div><div class='add'>+</div><div class='add'>+	for (i = 0, mlo_idx = 0; i &lt; ab-&gt;qmi.mem_seg_count; i++) {</div><div class='add'>+		chunk = &amp;ab-&gt;qmi.target_mem[i];</div><div class='add'>+</div><div class='add'>+		/* Allocate memory for the region and the functionality supported</div><div class='add'>+		 * on the host. For the non-supported memory region, host does not</div><div class='add'>+		 * allocate memory, assigns NULL and FW will handle this without crashing.</div><div class='add'>+		 */</div><div class='add'>+		switch (chunk-&gt;type) {</div><div class='add'>+		case HOST_DDR_REGION_TYPE:</div><div class='add'>+		case M3_DUMP_REGION_TYPE:</div><div class='add'>+		case PAGEABLE_MEM_REGION_TYPE:</div><div class='add'>+		case CALDB_MEM_REGION_TYPE:</div><div class='add'>+			ret = ath12k_qmi_alloc_chunk(ab, chunk);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto err;</div><div class='add'>+			break;</div><div class='add'>+		case MLO_GLOBAL_MEM_REGION_TYPE:</div><div class='add'>+			mlo_size += chunk-&gt;size;</div><div class='add'>+			if (ag-&gt;mlo_mem.mlo_mem_size &amp;&amp;</div><div class='add'>+			    mlo_size &gt; ag-&gt;mlo_mem.mlo_mem_size) {</div><div class='add'>+				ath12k_err(ab, "QMI MLO memory allocation failure, requested size %d is more than allocated size %d",</div><div class='add'>+					   mlo_size, ag-&gt;mlo_mem.mlo_mem_size);</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto err;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			mlo_chunk = &amp;ag-&gt;mlo_mem.chunk[mlo_idx];</div><div class='add'>+			if (mlo_chunk-&gt;paddr) {</div><div class='add'>+				if (chunk-&gt;size != mlo_chunk-&gt;size) {</div><div class='add'>+					ath12k_err(ab, "QMI MLO chunk memory allocation failure for index %d, requested size %d is more than allocated size %d",</div><div class='add'>+						   mlo_idx, chunk-&gt;size, mlo_chunk-&gt;size);</div><div class='add'>+					ret = -EINVAL;</div><div class='add'>+					goto err;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				mlo_chunk-&gt;size = chunk-&gt;size;</div><div class='add'>+				mlo_chunk-&gt;type = chunk-&gt;type;</div><div class='add'>+				ret = ath12k_qmi_alloc_chunk(ab, mlo_chunk);</div><div class='add'>+				if (ret)</div><div class='add'>+					goto err;</div><div class='add'>+				memset(mlo_chunk-&gt;v.addr, 0, mlo_chunk-&gt;size);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			chunk-&gt;paddr = mlo_chunk-&gt;paddr;</div><div class='add'>+			chunk-&gt;v.addr = mlo_chunk-&gt;v.addr;</div><div class='add'>+			mlo_idx++;</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ath12k_warn(ab, "memory type %u not supported\n",</div><div class='add'>+				    chunk-&gt;type);</div><div class='add'>+			chunk-&gt;paddr = 0;</div><div class='add'>+			chunk-&gt;v.addr = NULL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ag-&gt;mlo_mem.mlo_mem_size) {</div><div class='add'>+		ag-&gt;mlo_mem.mlo_mem_size = mlo_size;</div><div class='add'>+	} else if (ag-&gt;mlo_mem.mlo_mem_size != mlo_size) {</div><div class='add'>+		ath12k_err(ab, "QMI MLO memory size error, expected size is %d but requested size is %d",</div><div class='add'>+			   ag-&gt;mlo_mem.mlo_mem_size, mlo_size);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	ath12k_qmi_free_target_mem_chunk(ab);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* The firmware will attempt to request memory in smaller chunks</div><div class='add'>+	 * on the next try. However, the current caller should be notified</div><div class='add'>+	 * that this instance of request parsing was successful.</div><div class='add'>+	 * Therefore, return 0 only.</div><div class='add'>+	 */</div><div class='add'>+	if (ret == -EAGAIN)</div><div class='add'>+		ret = 0;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_qmi_assign_target_mem_chunk(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct reserved_mem *rmem;</div><div class='add'>+	size_t avail_rmem_size;</div><div class='add'>+	int i, idx, ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0, idx = 0; i &lt; ab-&gt;qmi.mem_seg_count; i++) {</div><div class='add'>+		switch (ab-&gt;qmi.target_mem[i].type) {</div><div class='add'>+		case HOST_DDR_REGION_TYPE:</div><div class='add'>+			rmem = ath12k_core_get_reserved_mem(ab, 0);</div><div class='add'>+			if (!rmem) {</div><div class='add'>+				ret = -ENODEV;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			avail_rmem_size = rmem-&gt;size;</div><div class='add'>+			if (avail_rmem_size &lt; ab-&gt;qmi.target_mem[i].size) {</div><div class='add'>+				ath12k_dbg(ab, ATH12K_DBG_QMI,</div><div class='add'>+					   "failed to assign mem type %u req size %u avail size %zu\n",</div><div class='add'>+					   ab-&gt;qmi.target_mem[i].type,</div><div class='add'>+					   ab-&gt;qmi.target_mem[i].size,</div><div class='add'>+					   avail_rmem_size);</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ab-&gt;qmi.target_mem[idx].paddr = rmem-&gt;base;</div><div class='add'>+			ab-&gt;qmi.target_mem[idx].v.ioaddr =</div><div class='add'>+				ioremap(ab-&gt;qmi.target_mem[idx].paddr,</div><div class='add'>+					ab-&gt;qmi.target_mem[i].size);</div><div class='add'>+			if (!ab-&gt;qmi.target_mem[idx].v.ioaddr) {</div><div class='add'>+				ret = -EIO;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			ab-&gt;qmi.target_mem[idx].size = ab-&gt;qmi.target_mem[i].size;</div><div class='add'>+			ab-&gt;qmi.target_mem[idx].type = ab-&gt;qmi.target_mem[i].type;</div><div class='add'>+			idx++;</div><div class='add'>+			break;</div><div class='add'>+		case BDF_MEM_REGION_TYPE:</div><div class='add'>+			rmem = ath12k_core_get_reserved_mem(ab, 0);</div><div class='add'>+			if (!rmem) {</div><div class='add'>+				ret = -ENODEV;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			avail_rmem_size = rmem-&gt;size - ab-&gt;hw_params-&gt;bdf_addr_offset;</div><div class='add'>+			if (avail_rmem_size &lt; ab-&gt;qmi.target_mem[i].size) {</div><div class='add'>+				ath12k_dbg(ab, ATH12K_DBG_QMI,</div><div class='add'>+					   "failed to assign mem type %u req size %u avail size %zu\n",</div><div class='add'>+					   ab-&gt;qmi.target_mem[i].type,</div><div class='add'>+					   ab-&gt;qmi.target_mem[i].size,</div><div class='add'>+					   avail_rmem_size);</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			ab-&gt;qmi.target_mem[idx].paddr =</div><div class='add'>+				rmem-&gt;base + ab-&gt;hw_params-&gt;bdf_addr_offset;</div><div class='add'>+			ab-&gt;qmi.target_mem[idx].v.ioaddr =</div><div class='add'>+				ioremap(ab-&gt;qmi.target_mem[idx].paddr,</div><div class='add'>+					ab-&gt;qmi.target_mem[i].size);</div><div class='add'>+			if (!ab-&gt;qmi.target_mem[idx].v.ioaddr) {</div><div class='add'>+				ret = -EIO;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			ab-&gt;qmi.target_mem[idx].size = ab-&gt;qmi.target_mem[i].size;</div><div class='add'>+			ab-&gt;qmi.target_mem[idx].type = ab-&gt;qmi.target_mem[i].type;</div><div class='add'>+			idx++;</div><div class='add'>+			break;</div><div class='add'>+		case CALDB_MEM_REGION_TYPE:</div><div class='add'>+			/* Cold boot calibration is not enabled in Ath12k. Hence,</div><div class='add'>+			 * assign paddr = 0.</div><div class='add'>+			 * Once cold boot calibration is enabled add support to</div><div class='add'>+			 * assign reserved memory from DT.</div><div class='add'>+			 */</div><div class='add'>+			ab-&gt;qmi.target_mem[idx].paddr = 0;</div><div class='add'>+			ab-&gt;qmi.target_mem[idx].v.ioaddr = NULL;</div><div class='add'>+			ab-&gt;qmi.target_mem[idx].size = ab-&gt;qmi.target_mem[i].size;</div><div class='add'>+			ab-&gt;qmi.target_mem[idx].type = ab-&gt;qmi.target_mem[i].type;</div><div class='add'>+			idx++;</div><div class='add'>+			break;</div><div class='add'>+		case M3_DUMP_REGION_TYPE:</div><div class='add'>+			rmem = ath12k_core_get_reserved_mem(ab, 1);</div><div class='add'>+			if (!rmem) {</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			avail_rmem_size = rmem-&gt;size;</div><div class='add'>+			if (avail_rmem_size &lt; ab-&gt;qmi.target_mem[i].size) {</div><div class='add'>+				ath12k_dbg(ab, ATH12K_DBG_QMI,</div><div class='add'>+					   "failed to assign mem type %u req size %u avail size %zu\n",</div><div class='add'>+					   ab-&gt;qmi.target_mem[i].type,</div><div class='add'>+					   ab-&gt;qmi.target_mem[i].size,</div><div class='add'>+					   avail_rmem_size);</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ab-&gt;qmi.target_mem[idx].paddr = rmem-&gt;base;</div><div class='add'>+			ab-&gt;qmi.target_mem[idx].v.ioaddr =</div><div class='add'>+				ioremap(ab-&gt;qmi.target_mem[idx].paddr,</div><div class='add'>+					ab-&gt;qmi.target_mem[i].size);</div><div class='add'>+			if (!ab-&gt;qmi.target_mem[idx].v.ioaddr) {</div><div class='add'>+				ret = -EIO;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			ab-&gt;qmi.target_mem[idx].size = ab-&gt;qmi.target_mem[i].size;</div><div class='add'>+			ab-&gt;qmi.target_mem[idx].type = ab-&gt;qmi.target_mem[i].type;</div><div class='add'>+			idx++;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ath12k_warn(ab, "qmi ignore invalid mem req type %u\n",</div><div class='add'>+				    ab-&gt;qmi.target_mem[i].type);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	ab-&gt;qmi.mem_seg_count = idx;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+out:</div><div class='add'>+	ath12k_qmi_free_target_mem_chunk(ab);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* clang stack usage explodes if this is inlined */</div><div class='add'>+static noinline_for_stack</div><div class='add'>+int ath12k_qmi_request_target_cap(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct qmi_wlanfw_cap_req_msg_v01 req = {};</div><div class='add'>+	struct qmi_wlanfw_cap_resp_msg_v01 resp = {};</div><div class='add'>+	struct qmi_txn txn;</div><div class='add'>+	unsigned int board_id = ATH12K_BOARD_ID_DEFAULT;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int r;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ret = qmi_txn_init(&amp;ab-&gt;qmi.handle, &amp;txn,</div><div class='add'>+			   qmi_wlanfw_cap_resp_msg_v01_ei, &amp;resp);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = qmi_send_request(&amp;ab-&gt;qmi.handle, NULL, &amp;txn,</div><div class='add'>+			       QMI_WLANFW_CAP_REQ_V01,</div><div class='add'>+			       QMI_WLANFW_CAP_REQ_MSG_V01_MAX_LEN,</div><div class='add'>+			       qmi_wlanfw_cap_req_msg_v01_ei, &amp;req);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		qmi_txn_cancel(&amp;txn);</div><div class='add'>+		ath12k_warn(ab, "qmi failed to send target cap request, err = %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = qmi_txn_wait(&amp;txn, msecs_to_jiffies(ATH12K_QMI_WLANFW_TIMEOUT_MS));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_warn(ab, "qmi failed target cap request %d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {</div><div class='add'>+		ath12k_warn(ab, "qmi targetcap req failed, result: %d, err: %d\n",</div><div class='add'>+			    resp.resp.result, resp.resp.error);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resp.chip_info_valid) {</div><div class='add'>+		ab-&gt;qmi.target.chip_id = resp.chip_info.chip_id;</div><div class='add'>+		ab-&gt;qmi.target.chip_family = resp.chip_info.chip_family;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resp.board_info_valid)</div><div class='add'>+		ab-&gt;qmi.target.board_id = resp.board_info.board_id;</div><div class='add'>+	else</div><div class='add'>+		ab-&gt;qmi.target.board_id = board_id;</div><div class='add'>+</div><div class='add'>+	if (resp.soc_info_valid)</div><div class='add'>+		ab-&gt;qmi.target.soc_id = resp.soc_info.soc_id;</div><div class='add'>+</div><div class='add'>+	if (resp.fw_version_info_valid) {</div><div class='add'>+		ab-&gt;qmi.target.fw_version = resp.fw_version_info.fw_version;</div><div class='add'>+		strscpy(ab-&gt;qmi.target.fw_build_timestamp,</div><div class='add'>+			resp.fw_version_info.fw_build_timestamp,</div><div class='add'>+			sizeof(ab-&gt;qmi.target.fw_build_timestamp));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resp.fw_build_id_valid)</div><div class='add'>+		strscpy(ab-&gt;qmi.target.fw_build_id, resp.fw_build_id,</div><div class='add'>+			sizeof(ab-&gt;qmi.target.fw_build_id));</div><div class='add'>+</div><div class='add'>+	if (resp.dev_mem_info_valid) {</div><div class='add'>+		for (i = 0; i &lt; ATH12K_QMI_WLFW_MAX_DEV_MEM_NUM_V01; i++) {</div><div class='add'>+			ab-&gt;qmi.dev_mem[i].start =</div><div class='add'>+				resp.dev_mem[i].start;</div><div class='add'>+			ab-&gt;qmi.dev_mem[i].size =</div><div class='add'>+				resp.dev_mem[i].size;</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_QMI,</div><div class='add'>+				   "devmem [%d] start 0x%llx size %llu\n", i,</div><div class='add'>+				   ab-&gt;qmi.dev_mem[i].start,</div><div class='add'>+				   ab-&gt;qmi.dev_mem[i].size);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resp.eeprom_caldata_read_timeout_valid) {</div><div class='add'>+		ab-&gt;qmi.target.eeprom_caldata = resp.eeprom_caldata_read_timeout;</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi cal data supported from eeprom\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_info(ab, "chip_id 0x%x chip_family 0x%x board_id 0x%x soc_id 0x%x\n",</div><div class='add'>+		    ab-&gt;qmi.target.chip_id, ab-&gt;qmi.target.chip_family,</div><div class='add'>+		    ab-&gt;qmi.target.board_id, ab-&gt;qmi.target.soc_id);</div><div class='add'>+</div><div class='add'>+	ath12k_info(ab, "fw_version 0x%x fw_build_timestamp %s fw_build_id %s",</div><div class='add'>+		    ab-&gt;qmi.target.fw_version,</div><div class='add'>+		    ab-&gt;qmi.target.fw_build_timestamp,</div><div class='add'>+		    ab-&gt;qmi.target.fw_build_id);</div><div class='add'>+</div><div class='add'>+	r = ath12k_core_check_smbios(ab);</div><div class='add'>+	if (r)</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_QMI, "SMBIOS bdf variant name not set.\n");</div><div class='add'>+</div><div class='add'>+	r = ath12k_acpi_start(ab);</div><div class='add'>+	if (r)</div><div class='add'>+		/* ACPI is optional so continue in case of an error */</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT, "acpi failed: %d\n", r);</div><div class='add'>+</div><div class='add'>+	r = ath12k_acpi_check_bdf_variant_name(ab);</div><div class='add'>+	if (r)</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_BOOT, "ACPI bdf variant name not set.\n");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_qmi_load_file_target_mem(struct ath12k_base *ab,</div><div class='add'>+					   const u8 *data, u32 len, u8 type)</div><div class='add'>+{</div><div class='add'>+	struct qmi_wlanfw_bdf_download_req_msg_v01 *req;</div><div class='add'>+	struct qmi_wlanfw_bdf_download_resp_msg_v01 resp = {};</div><div class='add'>+	struct qmi_txn txn;</div><div class='add'>+	const u8 *temp = data;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u32 remaining = len;</div><div class='add'>+</div><div class='add'>+	req = kzalloc(sizeof(*req), GFP_KERNEL);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	while (remaining) {</div><div class='add'>+		req-&gt;valid = 1;</div><div class='add'>+		req-&gt;file_id_valid = 1;</div><div class='add'>+		req-&gt;file_id = ab-&gt;qmi.target.board_id;</div><div class='add'>+		req-&gt;total_size_valid = 1;</div><div class='add'>+		req-&gt;total_size = remaining;</div><div class='add'>+		req-&gt;seg_id_valid = 1;</div><div class='add'>+		req-&gt;data_valid = 1;</div><div class='add'>+		req-&gt;bdf_type = type;</div><div class='add'>+		req-&gt;bdf_type_valid = 1;</div><div class='add'>+		req-&gt;end_valid = 1;</div><div class='add'>+		req-&gt;end = 0;</div><div class='add'>+</div><div class='add'>+		if (remaining &gt; QMI_WLANFW_MAX_DATA_SIZE_V01) {</div><div class='add'>+			req-&gt;data_len = QMI_WLANFW_MAX_DATA_SIZE_V01;</div><div class='add'>+		} else {</div><div class='add'>+			req-&gt;data_len = remaining;</div><div class='add'>+			req-&gt;end = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (type == ATH12K_QMI_FILE_TYPE_EEPROM) {</div><div class='add'>+			req-&gt;data_valid = 0;</div><div class='add'>+			req-&gt;end = 1;</div><div class='add'>+			req-&gt;data_len = ATH12K_QMI_MAX_BDF_FILE_NAME_SIZE;</div><div class='add'>+		} else {</div><div class='add'>+			memcpy(req-&gt;data, temp, req-&gt;data_len);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = qmi_txn_init(&amp;ab-&gt;qmi.handle, &amp;txn,</div><div class='add'>+				   qmi_wlanfw_bdf_download_resp_msg_v01_ei,</div><div class='add'>+				   &amp;resp);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi bdf download req fixed addr type %d\n",</div><div class='add'>+			   type);</div><div class='add'>+</div><div class='add'>+		ret = qmi_send_request(&amp;ab-&gt;qmi.handle, NULL, &amp;txn,</div><div class='add'>+				       QMI_WLANFW_BDF_DOWNLOAD_REQ_V01,</div><div class='add'>+				       QMI_WLANFW_BDF_DOWNLOAD_REQ_MSG_V01_MAX_LEN,</div><div class='add'>+				       qmi_wlanfw_bdf_download_req_msg_v01_ei, req);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			qmi_txn_cancel(&amp;txn);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = qmi_txn_wait(&amp;txn, msecs_to_jiffies(ATH12K_QMI_WLANFW_TIMEOUT_MS));</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {</div><div class='add'>+			ath12k_warn(ab, "qmi BDF download failed, result: %d, err: %d\n",</div><div class='add'>+				    resp.resp.result, resp.resp.error);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (type == ATH12K_QMI_FILE_TYPE_EEPROM) {</div><div class='add'>+			remaining = 0;</div><div class='add'>+		} else {</div><div class='add'>+			remaining -= req-&gt;data_len;</div><div class='add'>+			temp += req-&gt;data_len;</div><div class='add'>+			req-&gt;seg_id++;</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_QMI,</div><div class='add'>+				   "qmi bdf download request remaining %i\n",</div><div class='add'>+				   remaining);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(req);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* clang stack usage explodes if this is inlined */</div><div class='add'>+static noinline_for_stack</div><div class='add'>+int ath12k_qmi_load_bdf_qmi(struct ath12k_base *ab,</div><div class='add'>+			    enum ath12k_qmi_bdf_type type)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = ab-&gt;dev;</div><div class='add'>+	char filename[ATH12K_QMI_MAX_BDF_FILE_NAME_SIZE];</div><div class='add'>+	const struct firmware *fw_entry;</div><div class='add'>+	struct ath12k_board_data bd;</div><div class='add'>+	u32 fw_size, file_type;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	const u8 *tmp;</div><div class='add'>+</div><div class='add'>+	memset(&amp;bd, 0, sizeof(bd));</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case ATH12K_QMI_BDF_TYPE_ELF:</div><div class='add'>+		ret = ath12k_core_fetch_bdf(ab, &amp;bd);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "qmi failed to load bdf:\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (bd.len &gt;= SELFMAG &amp;&amp; memcmp(bd.data, ELFMAG, SELFMAG) == 0)</div><div class='add'>+			type = ATH12K_QMI_BDF_TYPE_ELF;</div><div class='add'>+		else</div><div class='add'>+			type = ATH12K_QMI_BDF_TYPE_BIN;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_QMI_BDF_TYPE_REGDB:</div><div class='add'>+		ret = ath12k_core_fetch_regdb(ab, &amp;bd);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "qmi failed to load regdb bin:\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_QMI_BDF_TYPE_CALIBRATION:</div><div class='add'>+</div><div class='add'>+		if (ab-&gt;qmi.target.eeprom_caldata) {</div><div class='add'>+			file_type = ATH12K_QMI_FILE_TYPE_EEPROM;</div><div class='add'>+			tmp = filename;</div><div class='add'>+			fw_size = ATH12K_QMI_MAX_BDF_FILE_NAME_SIZE;</div><div class='add'>+		} else {</div><div class='add'>+			file_type = ATH12K_QMI_FILE_TYPE_CALDATA;</div><div class='add'>+</div><div class='add'>+			/* cal-&lt;bus&gt;-&lt;id&gt;.bin */</div><div class='add'>+			snprintf(filename, sizeof(filename), "cal-%s-%s.bin",</div><div class='add'>+				 ath12k_bus_str(ab-&gt;hif.bus), dev_name(dev));</div><div class='add'>+			fw_entry = ath12k_core_firmware_request(ab, filename);</div><div class='add'>+			if (!IS_ERR(fw_entry))</div><div class='add'>+				goto success;</div><div class='add'>+</div><div class='add'>+			fw_entry = ath12k_core_firmware_request(ab,</div><div class='add'>+								ATH12K_DEFAULT_CAL_FILE);</div><div class='add'>+			if (IS_ERR(fw_entry)) {</div><div class='add'>+				ret = PTR_ERR(fw_entry);</div><div class='add'>+				ath12k_warn(ab,</div><div class='add'>+					    "qmi failed to load CAL data file:%s\n",</div><div class='add'>+					    filename);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+success:</div><div class='add'>+			fw_size = min_t(u32, ab-&gt;hw_params-&gt;fw.board_size,</div><div class='add'>+					fw_entry-&gt;size);</div><div class='add'>+			tmp = fw_entry-&gt;data;</div><div class='add'>+		}</div><div class='add'>+		ret = ath12k_qmi_load_file_target_mem(ab, tmp, fw_size, file_type);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			ath12k_warn(ab, "qmi failed to load caldata\n");</div><div class='add'>+			goto out_qmi_cal;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi caldata downloaded: type: %u\n",</div><div class='add'>+			   file_type);</div><div class='add'>+</div><div class='add'>+out_qmi_cal:</div><div class='add'>+		if (!ab-&gt;qmi.target.eeprom_caldata)</div><div class='add'>+			release_firmware(fw_entry);</div><div class='add'>+		return ret;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_warn(ab, "unknown file type for load %d", type);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi bdf_type %d\n", type);</div><div class='add'>+</div><div class='add'>+	fw_size = min_t(u32, ab-&gt;hw_params-&gt;fw.board_size, bd.len);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_qmi_load_file_target_mem(ab, bd.data, fw_size, type);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		ath12k_warn(ab, "qmi failed to load bdf file\n");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	ath12k_core_free_bdf(ab, &amp;bd);</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi BDF download sequence completed\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_qmi_m3_free(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct m3_mem_region *m3_mem = &amp;ab-&gt;qmi.m3_mem;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;fw.m3_loader == ath12k_m3_fw_loader_remoteproc)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!m3_mem-&gt;vaddr)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dma_free_coherent(ab-&gt;dev, m3_mem-&gt;total_size,</div><div class='add'>+			  m3_mem-&gt;vaddr, m3_mem-&gt;paddr);</div><div class='add'>+	m3_mem-&gt;vaddr = NULL;</div><div class='add'>+	m3_mem-&gt;total_size = 0;</div><div class='add'>+	m3_mem-&gt;size = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_qmi_m3_load(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct m3_mem_region *m3_mem = &amp;ab-&gt;qmi.m3_mem;</div><div class='add'>+	const struct firmware *fw = NULL;</div><div class='add'>+	const void *m3_data;</div><div class='add'>+	char path[100];</div><div class='add'>+	size_t m3_len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;fw.m3_data &amp;&amp; ab-&gt;fw.m3_len &gt; 0) {</div><div class='add'>+		/* firmware-N.bin had a m3 firmware file so use that */</div><div class='add'>+		m3_data = ab-&gt;fw.m3_data;</div><div class='add'>+		m3_len = ab-&gt;fw.m3_len;</div><div class='add'>+	} else {</div><div class='add'>+		/* No m3 file in firmware-N.bin so try to request old</div><div class='add'>+		 * separate m3.bin.</div><div class='add'>+		 */</div><div class='add'>+		fw = ath12k_core_firmware_request(ab, ATH12K_M3_FILE);</div><div class='add'>+		if (IS_ERR(fw)) {</div><div class='add'>+			ret = PTR_ERR(fw);</div><div class='add'>+			ath12k_core_create_firmware_path(ab, ATH12K_M3_FILE,</div><div class='add'>+							 path, sizeof(path));</div><div class='add'>+			ath12k_err(ab, "failed to load %s: %d\n", path, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		m3_data = fw-&gt;data;</div><div class='add'>+		m3_len = fw-&gt;size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* In recovery/resume cases, M3 buffer is not freed, try to reuse that */</div><div class='add'>+	if (m3_mem-&gt;vaddr) {</div><div class='add'>+		if (m3_mem-&gt;total_size &gt;= m3_len)</div><div class='add'>+			goto skip_m3_alloc;</div><div class='add'>+</div><div class='add'>+		/* Old buffer is too small, free and reallocate */</div><div class='add'>+		ath12k_qmi_m3_free(ab);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	m3_mem-&gt;vaddr = dma_alloc_coherent(ab-&gt;dev,</div><div class='add'>+					   m3_len, &amp;m3_mem-&gt;paddr,</div><div class='add'>+					   GFP_KERNEL);</div><div class='add'>+	if (!m3_mem-&gt;vaddr) {</div><div class='add'>+		ath12k_err(ab, "failed to allocate memory for M3 with size %zu\n",</div><div class='add'>+			   m3_len);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	m3_mem-&gt;total_size = m3_len;</div><div class='add'>+</div><div class='add'>+skip_m3_alloc:</div><div class='add'>+	memcpy(m3_mem-&gt;vaddr, m3_data, m3_len);</div><div class='add'>+	m3_mem-&gt;size = m3_len;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* clang stack usage explodes if this is inlined */</div><div class='add'>+static noinline_for_stack</div><div class='add'>+int ath12k_qmi_wlanfw_m3_info_send(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct m3_mem_region *m3_mem = &amp;ab-&gt;qmi.m3_mem;</div><div class='add'>+	struct qmi_wlanfw_m3_info_req_msg_v01 req = {};</div><div class='add'>+	struct qmi_wlanfw_m3_info_resp_msg_v01 resp = {};</div><div class='add'>+	struct qmi_txn txn;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;fw.m3_loader == ath12k_m3_fw_loader_driver) {</div><div class='add'>+		ret = ath12k_qmi_m3_load(ab);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_err(ab, "failed to load m3 firmware: %d", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		req.addr = m3_mem-&gt;paddr;</div><div class='add'>+		req.size = m3_mem-&gt;size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = qmi_txn_init(&amp;ab-&gt;qmi.handle, &amp;txn,</div><div class='add'>+			   qmi_wlanfw_m3_info_resp_msg_v01_ei, &amp;resp);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = qmi_send_request(&amp;ab-&gt;qmi.handle, NULL, &amp;txn,</div><div class='add'>+			       QMI_WLANFW_M3_INFO_REQ_V01,</div><div class='add'>+			       QMI_WLANFW_M3_INFO_REQ_MSG_V01_MAX_MSG_LEN,</div><div class='add'>+			       qmi_wlanfw_m3_info_req_msg_v01_ei, &amp;req);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		qmi_txn_cancel(&amp;txn);</div><div class='add'>+		ath12k_warn(ab, "qmi failed to send M3 information request, err = %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = qmi_txn_wait(&amp;txn, msecs_to_jiffies(ATH12K_QMI_WLANFW_TIMEOUT_MS));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_warn(ab, "qmi failed M3 information request %d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {</div><div class='add'>+		ath12k_warn(ab, "qmi M3 info request failed, result: %d, err: %d\n",</div><div class='add'>+			    resp.resp.result, resp.resp.error);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_qmi_wlanfw_mode_send(struct ath12k_base *ab,</div><div class='add'>+				       u32 mode)</div><div class='add'>+{</div><div class='add'>+	struct qmi_wlanfw_wlan_mode_req_msg_v01 req = {};</div><div class='add'>+	struct qmi_wlanfw_wlan_mode_resp_msg_v01 resp = {};</div><div class='add'>+	struct qmi_txn txn;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	req.mode = mode;</div><div class='add'>+	req.hw_debug_valid = 1;</div><div class='add'>+	req.hw_debug = 0;</div><div class='add'>+</div><div class='add'>+	ret = qmi_txn_init(&amp;ab-&gt;qmi.handle, &amp;txn,</div><div class='add'>+			   qmi_wlanfw_wlan_mode_resp_msg_v01_ei, &amp;resp);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = qmi_send_request(&amp;ab-&gt;qmi.handle, NULL, &amp;txn,</div><div class='add'>+			       QMI_WLANFW_WLAN_MODE_REQ_V01,</div><div class='add'>+			       QMI_WLANFW_WLAN_MODE_REQ_MSG_V01_MAX_LEN,</div><div class='add'>+			       qmi_wlanfw_wlan_mode_req_msg_v01_ei, &amp;req);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		qmi_txn_cancel(&amp;txn);</div><div class='add'>+		ath12k_warn(ab, "qmi failed to send mode request, mode: %d, err = %d\n",</div><div class='add'>+			    mode, ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = qmi_txn_wait(&amp;txn, msecs_to_jiffies(ATH12K_QMI_WLANFW_TIMEOUT_MS));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		if (mode == ATH12K_FIRMWARE_MODE_OFF &amp;&amp; ret == -ENETRESET) {</div><div class='add'>+			ath12k_warn(ab, "WLFW service is dis-connected\n");</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		ath12k_warn(ab, "qmi failed set mode request, mode: %d, err = %d\n",</div><div class='add'>+			    mode, ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {</div><div class='add'>+		ath12k_warn(ab, "Mode request failed, mode: %d, result: %d err: %d\n",</div><div class='add'>+			    mode, resp.resp.result, resp.resp.error);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_qmi_wlanfw_wlan_cfg_send(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct qmi_wlanfw_wlan_cfg_req_msg_v01 *req;</div><div class='add'>+	struct qmi_wlanfw_wlan_cfg_resp_msg_v01 resp = {};</div><div class='add'>+	struct ce_pipe_config *ce_cfg;</div><div class='add'>+	struct service_to_pipe *svc_cfg;</div><div class='add'>+	struct qmi_txn txn;</div><div class='add'>+	int ret = 0, pipe_num;</div><div class='add'>+</div><div class='add'>+	ce_cfg	= (struct ce_pipe_config *)ab-&gt;qmi.ce_cfg.tgt_ce;</div><div class='add'>+	svc_cfg	= (struct service_to_pipe *)ab-&gt;qmi.ce_cfg.svc_to_ce_map;</div><div class='add'>+</div><div class='add'>+	req = kzalloc(sizeof(*req), GFP_KERNEL);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	req-&gt;host_version_valid = 1;</div><div class='add'>+	strscpy(req-&gt;host_version, ATH12K_HOST_VERSION_STRING,</div><div class='add'>+		sizeof(req-&gt;host_version));</div><div class='add'>+</div><div class='add'>+	req-&gt;tgt_cfg_valid = 1;</div><div class='add'>+	/* This is number of CE configs */</div><div class='add'>+	req-&gt;tgt_cfg_len = ab-&gt;qmi.ce_cfg.tgt_ce_len;</div><div class='add'>+	for (pipe_num = 0; pipe_num &lt; req-&gt;tgt_cfg_len ; pipe_num++) {</div><div class='add'>+		req-&gt;tgt_cfg[pipe_num].pipe_num =</div><div class='add'>+			__le32_to_cpu(ce_cfg[pipe_num].pipenum);</div><div class='add'>+		req-&gt;tgt_cfg[pipe_num].pipe_dir =</div><div class='add'>+			__le32_to_cpu(ce_cfg[pipe_num].pipedir);</div><div class='add'>+		req-&gt;tgt_cfg[pipe_num].nentries =</div><div class='add'>+			__le32_to_cpu(ce_cfg[pipe_num].nentries);</div><div class='add'>+		req-&gt;tgt_cfg[pipe_num].nbytes_max =</div><div class='add'>+			__le32_to_cpu(ce_cfg[pipe_num].nbytes_max);</div><div class='add'>+		req-&gt;tgt_cfg[pipe_num].flags =</div><div class='add'>+			__le32_to_cpu(ce_cfg[pipe_num].flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req-&gt;svc_cfg_valid = 1;</div><div class='add'>+	/* This is number of Service/CE configs */</div><div class='add'>+	req-&gt;svc_cfg_len = ab-&gt;qmi.ce_cfg.svc_to_ce_map_len;</div><div class='add'>+	for (pipe_num = 0; pipe_num &lt; req-&gt;svc_cfg_len; pipe_num++) {</div><div class='add'>+		req-&gt;svc_cfg[pipe_num].service_id =</div><div class='add'>+			__le32_to_cpu(svc_cfg[pipe_num].service_id);</div><div class='add'>+		req-&gt;svc_cfg[pipe_num].pipe_dir =</div><div class='add'>+			__le32_to_cpu(svc_cfg[pipe_num].pipedir);</div><div class='add'>+		req-&gt;svc_cfg[pipe_num].pipe_num =</div><div class='add'>+			__le32_to_cpu(svc_cfg[pipe_num].pipenum);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set shadow v3 configuration */</div><div class='add'>+	if (ab-&gt;hw_params-&gt;supports_shadow_regs) {</div><div class='add'>+		req-&gt;shadow_reg_v3_valid = 1;</div><div class='add'>+		req-&gt;shadow_reg_v3_len = min_t(u32,</div><div class='add'>+					       ab-&gt;qmi.ce_cfg.shadow_reg_v3_len,</div><div class='add'>+					       QMI_WLANFW_MAX_NUM_SHADOW_REG_V3_V01);</div><div class='add'>+		memcpy(&amp;req-&gt;shadow_reg_v3, ab-&gt;qmi.ce_cfg.shadow_reg_v3,</div><div class='add'>+		       sizeof(u32) * req-&gt;shadow_reg_v3_len);</div><div class='add'>+	} else {</div><div class='add'>+		req-&gt;shadow_reg_v3_valid = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = qmi_txn_init(&amp;ab-&gt;qmi.handle, &amp;txn,</div><div class='add'>+			   qmi_wlanfw_wlan_cfg_resp_msg_v01_ei, &amp;resp);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = qmi_send_request(&amp;ab-&gt;qmi.handle, NULL, &amp;txn,</div><div class='add'>+			       QMI_WLANFW_WLAN_CFG_REQ_V01,</div><div class='add'>+			       QMI_WLANFW_WLAN_CFG_REQ_MSG_V01_MAX_LEN,</div><div class='add'>+			       qmi_wlanfw_wlan_cfg_req_msg_v01_ei, req);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		qmi_txn_cancel(&amp;txn);</div><div class='add'>+		ath12k_warn(ab, "qmi failed to send wlan config request, err = %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = qmi_txn_wait(&amp;txn, msecs_to_jiffies(ATH12K_QMI_WLANFW_TIMEOUT_MS));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_warn(ab, "qmi failed wlan config request, err = %d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {</div><div class='add'>+		ath12k_warn(ab, "qmi wlan config request failed, result: %d, err: %d\n",</div><div class='add'>+			    resp.resp.result, resp.resp.error);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(req);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_qmi_wlanfw_wlan_ini_send(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct qmi_wlanfw_wlan_ini_resp_msg_v01 resp = {};</div><div class='add'>+	struct qmi_wlanfw_wlan_ini_req_msg_v01 req = {};</div><div class='add'>+	struct qmi_txn txn;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	req.enable_fwlog_valid = true;</div><div class='add'>+	req.enable_fwlog = 1;</div><div class='add'>+</div><div class='add'>+	ret = qmi_txn_init(&amp;ab-&gt;qmi.handle, &amp;txn,</div><div class='add'>+			   qmi_wlanfw_wlan_ini_resp_msg_v01_ei, &amp;resp);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = qmi_send_request(&amp;ab-&gt;qmi.handle, NULL, &amp;txn,</div><div class='add'>+			       ATH12K_QMI_WLANFW_WLAN_INI_REQ_V01,</div><div class='add'>+			       QMI_WLANFW_WLAN_INI_REQ_MSG_V01_MAX_LEN,</div><div class='add'>+			       qmi_wlanfw_wlan_ini_req_msg_v01_ei, &amp;req);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		qmi_txn_cancel(&amp;txn);</div><div class='add'>+		ath12k_warn(ab, "failed to send QMI wlan ini request: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = qmi_txn_wait(&amp;txn, msecs_to_jiffies(ATH12K_QMI_WLANFW_TIMEOUT_MS));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_warn(ab, "failed to receive QMI wlan ini request: %d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {</div><div class='add'>+		ath12k_warn(ab, "QMI wlan ini response failure: %d %d\n",</div><div class='add'>+			    resp.resp.result, resp.resp.error);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_qmi_firmware_stop(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	clear_bit(ATH12K_FLAG_QMI_FW_READY_COMPLETE, &amp;ab-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_qmi_wlanfw_mode_send(ab, ATH12K_FIRMWARE_MODE_OFF);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_warn(ab, "qmi failed to send wlan mode off\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_qmi_firmware_start(struct ath12k_base *ab,</div><div class='add'>+			      u32 mode)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_qmi_wlanfw_wlan_ini_send(ab);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_warn(ab, "qmi failed to send wlan fw ini: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_qmi_wlanfw_wlan_cfg_send(ab);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_warn(ab, "qmi failed to send wlan cfg:%d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_qmi_wlanfw_mode_send(ab, mode);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_warn(ab, "qmi failed to send wlan fw mode:%d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_qmi_driver_event_post(struct ath12k_qmi *qmi,</div><div class='add'>+			     enum ath12k_qmi_event_type type,</div><div class='add'>+			     void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_qmi_driver_event *event;</div><div class='add'>+</div><div class='add'>+	event = kzalloc(sizeof(*event), GFP_ATOMIC);</div><div class='add'>+	if (!event)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	event-&gt;type = type;</div><div class='add'>+	event-&gt;data = data;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;qmi-&gt;event_lock);</div><div class='add'>+	list_add_tail(&amp;event-&gt;list, &amp;qmi-&gt;event_list);</div><div class='add'>+	spin_unlock(&amp;qmi-&gt;event_lock);</div><div class='add'>+</div><div class='add'>+	queue_work(qmi-&gt;event_wq, &amp;qmi-&gt;event_work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_qmi_trigger_host_cap(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_qmi *qmi = &amp;ab-&gt;qmi;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;qmi-&gt;event_lock);</div><div class='add'>+</div><div class='add'>+	if (ath12k_qmi_get_event_block(qmi))</div><div class='add'>+		ath12k_qmi_set_event_block(qmi, false);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;qmi-&gt;event_lock);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_QMI, "trigger host cap for device id %d\n",</div><div class='add'>+		   ab-&gt;device_id);</div><div class='add'>+</div><div class='add'>+	ath12k_qmi_driver_event_post(qmi, ATH12K_QMI_EVENT_HOST_CAP, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_qmi_hw_group_host_cap_ready(struct ath12k_hw_group *ag)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_devices; i++) {</div><div class='add'>+		ab = ag-&gt;ab[i];</div><div class='add'>+</div><div class='add'>+		if (!(ab &amp;&amp; ab-&gt;qmi.num_radios != U8_MAX))</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ath12k_base *ath12k_qmi_hw_group_find_blocked(struct ath12k_hw_group *ag)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ag-&gt;num_devices; i++) {</div><div class='add'>+		ab = ag-&gt;ab[i];</div><div class='add'>+		if (!ab)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;ab-&gt;qmi.event_lock);</div><div class='add'>+</div><div class='add'>+		if (ath12k_qmi_get_event_block(&amp;ab-&gt;qmi)) {</div><div class='add'>+			spin_unlock(&amp;ab-&gt;qmi.event_lock);</div><div class='add'>+			return ab;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_unlock(&amp;ab-&gt;qmi.event_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* clang stack usage explodes if this is inlined */</div><div class='add'>+static noinline_for_stack</div><div class='add'>+int ath12k_qmi_event_server_arrive(struct ath12k_qmi *qmi)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = qmi-&gt;ab, *block_ab;</div><div class='add'>+	struct ath12k_hw_group *ag = ab-&gt;ag;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ath12k_qmi_phy_cap_send(ab);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_qmi_fw_ind_register_send(ab);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_warn(ab, "qmi failed to send FW indication QMI:%d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;qmi-&gt;event_lock);</div><div class='add'>+</div><div class='add'>+	ath12k_qmi_set_event_block(qmi, true);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;qmi-&gt;event_lock);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (ath12k_qmi_hw_group_host_cap_ready(ag)) {</div><div class='add'>+		ath12k_core_hw_group_set_mlo_capable(ag);</div><div class='add'>+</div><div class='add'>+		block_ab = ath12k_qmi_hw_group_find_blocked(ag);</div><div class='add'>+		if (block_ab)</div><div class='add'>+			ath12k_qmi_trigger_host_cap(block_ab);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ag-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* clang stack usage explodes if this is inlined */</div><div class='add'>+static noinline_for_stack</div><div class='add'>+int ath12k_qmi_event_mem_request(struct ath12k_qmi *qmi)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = qmi-&gt;ab;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_qmi_respond_fw_mem_request(ab);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_warn(ab, "qmi failed to respond fw mem req:%d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* clang stack usage explodes if this is inlined */</div><div class='add'>+static noinline_for_stack</div><div class='add'>+int ath12k_qmi_event_load_bdf(struct ath12k_qmi *qmi)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = qmi-&gt;ab;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_qmi_request_target_cap(ab);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_warn(ab, "qmi failed to req target capabilities:%d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_qmi_load_bdf_qmi(ab, ATH12K_QMI_BDF_TYPE_REGDB);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_warn(ab, "qmi failed to load regdb file:%d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_qmi_load_bdf_qmi(ab, ATH12K_QMI_BDF_TYPE_ELF);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_warn(ab, "qmi failed to load board data file:%d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;download_calib) {</div><div class='add'>+		ret = ath12k_qmi_load_bdf_qmi(ab, ATH12K_QMI_BDF_TYPE_CALIBRATION);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			ath12k_warn(ab, "qmi failed to load calibrated data :%d\n", ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_qmi_wlanfw_m3_info_send(ab);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_warn(ab, "qmi failed to send m3 info req:%d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_qmi_msg_mem_request_cb(struct qmi_handle *qmi_hdl,</div><div class='add'>+					  struct sockaddr_qrtr *sq,</div><div class='add'>+					  struct qmi_txn *txn,</div><div class='add'>+					  const void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_qmi *qmi = container_of(qmi_hdl, struct ath12k_qmi, handle);</div><div class='add'>+	struct ath12k_base *ab = qmi-&gt;ab;</div><div class='add'>+	const struct qmi_wlanfw_request_mem_ind_msg_v01 *msg = data;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi firmware request memory request\n");</div><div class='add'>+</div><div class='add'>+	if (msg-&gt;mem_seg_len == 0 ||</div><div class='add'>+	    msg-&gt;mem_seg_len &gt; ATH12K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01)</div><div class='add'>+		ath12k_warn(ab, "Invalid memory segment length: %u\n",</div><div class='add'>+			    msg-&gt;mem_seg_len);</div><div class='add'>+</div><div class='add'>+	ab-&gt;qmi.mem_seg_count = msg-&gt;mem_seg_len;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; qmi-&gt;mem_seg_count ; i++) {</div><div class='add'>+		ab-&gt;qmi.target_mem[i].type = msg-&gt;mem_seg[i].type;</div><div class='add'>+		ab-&gt;qmi.target_mem[i].size = msg-&gt;mem_seg[i].size;</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi mem seg type %d size %d\n",</div><div class='add'>+			   msg-&gt;mem_seg[i].type, msg-&gt;mem_seg[i].size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_FLAG_FIXED_MEM_REGION, &amp;ab-&gt;dev_flags)) {</div><div class='add'>+		ret = ath12k_qmi_assign_target_mem_chunk(ab);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to assign qmi target memory: %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		ret = ath12k_qmi_alloc_target_mem_chunk(ab);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "qmi failed to alloc target memory: %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_qmi_driver_event_post(qmi, ATH12K_QMI_EVENT_REQUEST_MEM, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_qmi_msg_mem_ready_cb(struct qmi_handle *qmi_hdl,</div><div class='add'>+					struct sockaddr_qrtr *sq,</div><div class='add'>+					struct qmi_txn *txn,</div><div class='add'>+					const void *decoded)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_qmi *qmi = container_of(qmi_hdl, struct ath12k_qmi, handle);</div><div class='add'>+	struct ath12k_base *ab = qmi-&gt;ab;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi firmware memory ready indication\n");</div><div class='add'>+	ath12k_qmi_driver_event_post(qmi, ATH12K_QMI_EVENT_FW_MEM_READY, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_qmi_msg_fw_ready_cb(struct qmi_handle *qmi_hdl,</div><div class='add'>+				       struct sockaddr_qrtr *sq,</div><div class='add'>+				       struct qmi_txn *txn,</div><div class='add'>+				       const void *decoded)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_qmi *qmi = container_of(qmi_hdl, struct ath12k_qmi, handle);</div><div class='add'>+	struct ath12k_base *ab = qmi-&gt;ab;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi firmware ready\n");</div><div class='add'>+	ath12k_qmi_driver_event_post(qmi, ATH12K_QMI_EVENT_FW_READY, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct qmi_msg_handler ath12k_qmi_msg_handlers[] = {</div><div class='add'>+	{</div><div class='add'>+		.type = QMI_INDICATION,</div><div class='add'>+		.msg_id = QMI_WLFW_REQUEST_MEM_IND_V01,</div><div class='add'>+		.ei = qmi_wlanfw_request_mem_ind_msg_v01_ei,</div><div class='add'>+		.decoded_size = sizeof(struct qmi_wlanfw_request_mem_ind_msg_v01),</div><div class='add'>+		.fn = ath12k_qmi_msg_mem_request_cb,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.type = QMI_INDICATION,</div><div class='add'>+		.msg_id = QMI_WLFW_FW_MEM_READY_IND_V01,</div><div class='add'>+		.ei = qmi_wlanfw_mem_ready_ind_msg_v01_ei,</div><div class='add'>+		.decoded_size = sizeof(struct qmi_wlanfw_fw_mem_ready_ind_msg_v01),</div><div class='add'>+		.fn = ath12k_qmi_msg_mem_ready_cb,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.type = QMI_INDICATION,</div><div class='add'>+		.msg_id = QMI_WLFW_FW_READY_IND_V01,</div><div class='add'>+		.ei = qmi_wlanfw_fw_ready_ind_msg_v01_ei,</div><div class='add'>+		.decoded_size = sizeof(struct qmi_wlanfw_fw_ready_ind_msg_v01),</div><div class='add'>+		.fn = ath12k_qmi_msg_fw_ready_cb,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* end of list */</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ath12k_qmi_ops_new_server(struct qmi_handle *qmi_hdl,</div><div class='add'>+				     struct qmi_service *service)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_qmi *qmi = container_of(qmi_hdl, struct ath12k_qmi, handle);</div><div class='add'>+	struct ath12k_base *ab = qmi-&gt;ab;</div><div class='add'>+	struct sockaddr_qrtr *sq = &amp;qmi-&gt;sq;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	sq-&gt;sq_family = AF_QIPCRTR;</div><div class='add'>+	sq-&gt;sq_node = service-&gt;node;</div><div class='add'>+	sq-&gt;sq_port = service-&gt;port;</div><div class='add'>+</div><div class='add'>+	ret = kernel_connect(qmi_hdl-&gt;sock, (struct sockaddr_unsized *)sq,</div><div class='add'>+			     sizeof(*sq), 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "qmi failed to connect to remote service %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi wifi fw qmi service connected\n");</div><div class='add'>+	ath12k_qmi_driver_event_post(qmi, ATH12K_QMI_EVENT_SERVER_ARRIVE, NULL);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_qmi_ops_del_server(struct qmi_handle *qmi_hdl,</div><div class='add'>+				      struct qmi_service *service)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_qmi *qmi = container_of(qmi_hdl, struct ath12k_qmi, handle);</div><div class='add'>+	struct ath12k_base *ab = qmi-&gt;ab;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi wifi fw del server\n");</div><div class='add'>+	ath12k_qmi_driver_event_post(qmi, ATH12K_QMI_EVENT_SERVER_EXIT, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct qmi_ops ath12k_qmi_ops = {</div><div class='add'>+	.new_server = ath12k_qmi_ops_new_server,</div><div class='add'>+	.del_server = ath12k_qmi_ops_del_server,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ath12k_qmi_event_host_cap(struct ath12k_qmi *qmi)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = qmi-&gt;ab;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_qmi_host_cap_send(ab);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_warn(ab, "failed to send qmi host cap for device id %d: %d\n",</div><div class='add'>+			    ab-&gt;device_id, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_qmi_driver_event_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_qmi *qmi = container_of(work, struct ath12k_qmi,</div><div class='add'>+					      event_work);</div><div class='add'>+	struct ath12k_qmi_driver_event *event;</div><div class='add'>+	struct ath12k_base *ab = qmi-&gt;ab;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;qmi-&gt;event_lock);</div><div class='add'>+	while (!list_empty(&amp;qmi-&gt;event_list)) {</div><div class='add'>+		event = list_first_entry(&amp;qmi-&gt;event_list,</div><div class='add'>+					 struct ath12k_qmi_driver_event, list);</div><div class='add'>+		list_del(&amp;event-&gt;list);</div><div class='add'>+		spin_unlock(&amp;qmi-&gt;event_lock);</div><div class='add'>+</div><div class='add'>+		if (test_bit(ATH12K_FLAG_UNREGISTERING, &amp;ab-&gt;dev_flags))</div><div class='add'>+			goto skip;</div><div class='add'>+</div><div class='add'>+		switch (event-&gt;type) {</div><div class='add'>+		case ATH12K_QMI_EVENT_SERVER_ARRIVE:</div><div class='add'>+			ret = ath12k_qmi_event_server_arrive(qmi);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				set_bit(ATH12K_FLAG_QMI_FAIL, &amp;ab-&gt;dev_flags);</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_QMI_EVENT_SERVER_EXIT:</div><div class='add'>+			set_bit(ATH12K_FLAG_CRASH_FLUSH, &amp;ab-&gt;dev_flags);</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_QMI_EVENT_REQUEST_MEM:</div><div class='add'>+			ret = ath12k_qmi_event_mem_request(qmi);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				set_bit(ATH12K_FLAG_QMI_FAIL, &amp;ab-&gt;dev_flags);</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_QMI_EVENT_FW_MEM_READY:</div><div class='add'>+			ret = ath12k_qmi_event_load_bdf(qmi);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				set_bit(ATH12K_FLAG_QMI_FAIL, &amp;ab-&gt;dev_flags);</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_QMI_EVENT_FW_READY:</div><div class='add'>+			clear_bit(ATH12K_FLAG_QMI_FAIL, &amp;ab-&gt;dev_flags);</div><div class='add'>+			if (test_bit(ATH12K_FLAG_QMI_FW_READY_COMPLETE, &amp;ab-&gt;dev_flags)) {</div><div class='add'>+				if (ab-&gt;is_reset)</div><div class='add'>+					ath12k_hal_dump_srng_stats(ab);</div><div class='add'>+</div><div class='add'>+				set_bit(ATH12K_FLAG_RECOVERY, &amp;ab-&gt;dev_flags);</div><div class='add'>+				queue_work(ab-&gt;workqueue, &amp;ab-&gt;restart_work);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			clear_bit(ATH12K_FLAG_CRASH_FLUSH,</div><div class='add'>+				  &amp;ab-&gt;dev_flags);</div><div class='add'>+			ret = ath12k_core_qmi_firmware_ready(ab);</div><div class='add'>+			if (!ret)</div><div class='add'>+				set_bit(ATH12K_FLAG_QMI_FW_READY_COMPLETE,</div><div class='add'>+					&amp;ab-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_QMI_EVENT_HOST_CAP:</div><div class='add'>+			ret = ath12k_qmi_event_host_cap(qmi);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				set_bit(ATH12K_FLAG_QMI_FAIL, &amp;ab-&gt;dev_flags);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ath12k_warn(ab, "invalid event type: %d", event-&gt;type);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+skip:</div><div class='add'>+		kfree(event);</div><div class='add'>+		spin_lock(&amp;qmi-&gt;event_lock);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;qmi-&gt;event_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_qmi_init_service(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memset(&amp;ab-&gt;qmi.target, 0, sizeof(struct target_info));</div><div class='add'>+	memset(&amp;ab-&gt;qmi.target_mem, 0, sizeof(struct target_mem_chunk));</div><div class='add'>+	ab-&gt;qmi.ab = ab;</div><div class='add'>+</div><div class='add'>+	ab-&gt;qmi.target_mem_mode = ab-&gt;target_mem_mode;</div><div class='add'>+	ret = qmi_handle_init(&amp;ab-&gt;qmi.handle, ATH12K_QMI_RESP_LEN_MAX,</div><div class='add'>+			      &amp;ath12k_qmi_ops, ath12k_qmi_msg_handlers);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_warn(ab, "failed to initialize qmi handle\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab-&gt;qmi.event_wq = alloc_ordered_workqueue("ath12k_qmi_driver_event", 0);</div><div class='add'>+	if (!ab-&gt;qmi.event_wq) {</div><div class='add'>+		ath12k_err(ab, "failed to allocate workqueue\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;ab-&gt;qmi.event_list);</div><div class='add'>+	spin_lock_init(&amp;ab-&gt;qmi.event_lock);</div><div class='add'>+	INIT_WORK(&amp;ab-&gt;qmi.event_work, ath12k_qmi_driver_event_work);</div><div class='add'>+</div><div class='add'>+	ret = qmi_add_lookup(&amp;ab-&gt;qmi.handle, ATH12K_QMI_WLFW_SERVICE_ID_V01,</div><div class='add'>+			     ATH12K_QMI_WLFW_SERVICE_VERS_V01,</div><div class='add'>+			     ab-&gt;qmi.service_ins_id);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ath12k_warn(ab, "failed to add qmi lookup\n");</div><div class='add'>+		destroy_workqueue(ab-&gt;qmi.event_wq);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_qmi_deinit_service(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	if (!ab-&gt;qmi.ab)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	qmi_handle_release(&amp;ab-&gt;qmi.handle);</div><div class='add'>+	cancel_work_sync(&amp;ab-&gt;qmi.event_work);</div><div class='add'>+	destroy_workqueue(ab-&gt;qmi.event_wq);</div><div class='add'>+	ath12k_qmi_m3_free(ab);</div><div class='add'>+	ath12k_qmi_free_target_mem_chunk(ab);</div><div class='add'>+	ab-&gt;qmi.ab = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_qmi_free_resource(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	ath12k_qmi_free_target_mem_chunk(ab);</div><div class='add'>+	ath12k_qmi_m3_free(ab);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/qmi.h b/drivers/net/wireless/ath/ath12k/qmi.h<br/>new file mode 100644<br/>index 000000000000..7a88268aa1e9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/qmi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/qmi.h</a></div><div class='hunk'>@@ -0,0 +1,635 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH12K_QMI_H</div><div class='add'>+#define ATH12K_QMI_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/soc/qcom/qmi.h&gt;</div><div class='add'>+</div><div class='add'>+#define ATH12K_HOST_VERSION_STRING		"WIN"</div><div class='add'>+#define ATH12K_QMI_WLANFW_TIMEOUT_MS		10000</div><div class='add'>+#define ATH12K_QMI_MAX_BDF_FILE_NAME_SIZE	64</div><div class='add'>+#define ATH12K_QMI_CALDB_ADDRESS		0x4BA00000</div><div class='add'>+#define ATH12K_QMI_WLANFW_MAX_BUILD_ID_LEN_V01	128</div><div class='add'>+#define ATH12K_QMI_WLFW_SERVICE_ID_V01		0x45</div><div class='add'>+#define ATH12K_QMI_WLFW_SERVICE_VERS_V01	0x01</div><div class='add'>+#define ATH12K_QMI_WLFW_SERVICE_INS_ID_V01	0x02</div><div class='add'>+#define ATH12K_QMI_WLFW_SERVICE_INS_ID_V01_WCN7850 0x1</div><div class='add'>+</div><div class='add'>+#define ATH12K_QMI_WLFW_SERVICE_INS_ID_V01_QCN9274	0x07</div><div class='add'>+#define ATH12K_QMI_WLFW_SERVICE_INS_ID_V01_IPQ5332	0x2</div><div class='add'>+#define ATH12K_QMI_WLANFW_MAX_TIMESTAMP_LEN_V01	32</div><div class='add'>+#define ATH12K_QMI_RESP_LEN_MAX			8192</div><div class='add'>+#define ATH12K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01	52</div><div class='add'>+#define ATH12K_QMI_CALDB_SIZE			0x480000</div><div class='add'>+#define ATH12K_QMI_BDF_EXT_STR_LENGTH		0x20</div><div class='add'>+#define ATH12K_QMI_FW_MEM_REQ_SEGMENT_CNT	3</div><div class='add'>+#define ATH12K_QMI_WLFW_MAX_DEV_MEM_NUM_V01 4</div><div class='add'>+#define ATH12K_QMI_DEVMEM_CMEM_INDEX	0</div><div class='add'>+</div><div class='add'>+#define QMI_WLFW_REQUEST_MEM_IND_V01		0x0035</div><div class='add'>+#define QMI_WLFW_FW_MEM_READY_IND_V01		0x0037</div><div class='add'>+#define QMI_WLFW_FW_READY_IND_V01		0x0038</div><div class='add'>+</div><div class='add'>+#define QMI_WLANFW_MAX_DATA_SIZE_V01		6144</div><div class='add'>+#define ATH12K_FIRMWARE_MODE_OFF		4</div><div class='add'>+</div><div class='add'>+#define ATH12K_BOARD_ID_DEFAULT	0xFF</div><div class='add'>+</div><div class='add'>+struct ath12k_base;</div><div class='add'>+struct ath12k_hw_group;</div><div class='add'>+</div><div class='add'>+enum ath12k_qmi_file_type {</div><div class='add'>+	ATH12K_QMI_FILE_TYPE_BDF_GOLDEN	= 0,</div><div class='add'>+	ATH12K_QMI_FILE_TYPE_CALDATA	= 2,</div><div class='add'>+	ATH12K_QMI_FILE_TYPE_EEPROM	= 3,</div><div class='add'>+	ATH12K_QMI_MAX_FILE_TYPE	= 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_qmi_bdf_type {</div><div class='add'>+	ATH12K_QMI_BDF_TYPE_BIN			= 0,</div><div class='add'>+	ATH12K_QMI_BDF_TYPE_ELF			= 1,</div><div class='add'>+	ATH12K_QMI_BDF_TYPE_REGDB		= 4,</div><div class='add'>+	ATH12K_QMI_BDF_TYPE_CALIBRATION		= 5,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_qmi_event_type {</div><div class='add'>+	ATH12K_QMI_EVENT_SERVER_ARRIVE,</div><div class='add'>+	ATH12K_QMI_EVENT_SERVER_EXIT,</div><div class='add'>+	ATH12K_QMI_EVENT_REQUEST_MEM,</div><div class='add'>+	ATH12K_QMI_EVENT_FW_MEM_READY,</div><div class='add'>+	ATH12K_QMI_EVENT_FW_READY,</div><div class='add'>+	ATH12K_QMI_EVENT_REGISTER_DRIVER,</div><div class='add'>+	ATH12K_QMI_EVENT_UNREGISTER_DRIVER,</div><div class='add'>+	ATH12K_QMI_EVENT_RECOVERY,</div><div class='add'>+	ATH12K_QMI_EVENT_FORCE_FW_ASSERT,</div><div class='add'>+	ATH12K_QMI_EVENT_POWER_UP,</div><div class='add'>+	ATH12K_QMI_EVENT_POWER_DOWN,</div><div class='add'>+	ATH12K_QMI_EVENT_HOST_CAP,</div><div class='add'>+	ATH12K_QMI_EVENT_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_qmi_driver_event {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	enum ath12k_qmi_event_type type;</div><div class='add'>+	void *data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_qmi_ce_cfg {</div><div class='add'>+	const struct ce_pipe_config *tgt_ce;</div><div class='add'>+	int tgt_ce_len;</div><div class='add'>+	const struct service_to_pipe *svc_to_ce_map;</div><div class='add'>+	int svc_to_ce_map_len;</div><div class='add'>+	const u8 *shadow_reg;</div><div class='add'>+	int shadow_reg_len;</div><div class='add'>+	u32 *shadow_reg_v3;</div><div class='add'>+	int shadow_reg_v3_len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_qmi_event_msg {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	enum ath12k_qmi_event_type type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct target_mem_chunk {</div><div class='add'>+	u32 size;</div><div class='add'>+	u32 type;</div><div class='add'>+	u32 prev_size;</div><div class='add'>+	u32 prev_type;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	union {</div><div class='add'>+		void __iomem *ioaddr;</div><div class='add'>+		void *addr;</div><div class='add'>+	} v;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct target_info {</div><div class='add'>+	u32 chip_id;</div><div class='add'>+	u32 chip_family;</div><div class='add'>+	u32 board_id;</div><div class='add'>+	u32 soc_id;</div><div class='add'>+	u32 fw_version;</div><div class='add'>+	u32 eeprom_caldata;</div><div class='add'>+	char fw_build_timestamp[ATH12K_QMI_WLANFW_MAX_TIMESTAMP_LEN_V01 + 1];</div><div class='add'>+	char fw_build_id[ATH12K_QMI_WLANFW_MAX_BUILD_ID_LEN_V01 + 1];</div><div class='add'>+	char bdf_ext[ATH12K_QMI_BDF_EXT_STR_LENGTH];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct m3_mem_region {</div><div class='add'>+	/* total memory allocated */</div><div class='add'>+	u32 total_size;</div><div class='add'>+	/* actual memory being used */</div><div class='add'>+	u32 size;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	void *vaddr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dev_mem_info {</div><div class='add'>+	u64 start;</div><div class='add'>+	u64 size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_qmi {</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	struct qmi_handle handle;</div><div class='add'>+	struct sockaddr_qrtr sq;</div><div class='add'>+	struct work_struct event_work;</div><div class='add'>+	struct workqueue_struct *event_wq;</div><div class='add'>+	struct list_head event_list;</div><div class='add'>+	spinlock_t event_lock; /* spinlock for qmi event list */</div><div class='add'>+	struct ath12k_qmi_ce_cfg ce_cfg;</div><div class='add'>+	struct target_mem_chunk target_mem[ATH12K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01];</div><div class='add'>+	u32 mem_seg_count;</div><div class='add'>+	u32 target_mem_mode;</div><div class='add'>+	bool target_mem_delayed;</div><div class='add'>+	u8 cal_done;</div><div class='add'>+</div><div class='add'>+	/* protected with struct ath12k_qmi::event_lock */</div><div class='add'>+	bool block_event;</div><div class='add'>+</div><div class='add'>+	u8 num_radios;</div><div class='add'>+	struct target_info target;</div><div class='add'>+	struct m3_mem_region m3_mem;</div><div class='add'>+	unsigned int service_ins_id;</div><div class='add'>+	struct dev_mem_info dev_mem[ATH12K_QMI_WLFW_MAX_DEV_MEM_NUM_V01];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define QMI_WLANFW_HOST_CAP_REQ_MSG_V01_MAX_LEN		261</div><div class='add'>+#define QMI_WLANFW_HOST_CAP_REQ_V01			0x0034</div><div class='add'>+#define QMI_WLANFW_HOST_CAP_RESP_MSG_V01_MAX_LEN	7</div><div class='add'>+#define QMI_WLFW_HOST_CAP_RESP_V01			0x0034</div><div class='add'>+#define QMI_WLFW_MAX_NUM_GPIO_V01			32</div><div class='add'>+#define QMI_WLANFW_MAX_PLATFORM_NAME_LEN_V01		64</div><div class='add'>+#define QMI_WLANFW_MAX_HOST_DDR_RANGE_SIZE_V01		3</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_host_ddr_range {</div><div class='add'>+	u64 start;</div><div class='add'>+	u64 size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_qmi_target_mem {</div><div class='add'>+	HOST_DDR_REGION_TYPE = 0x1,</div><div class='add'>+	BDF_MEM_REGION_TYPE = 0x2,</div><div class='add'>+	M3_DUMP_REGION_TYPE = 0x3,</div><div class='add'>+	CALDB_MEM_REGION_TYPE = 0x4,</div><div class='add'>+	MLO_GLOBAL_MEM_REGION_TYPE = 0x8,</div><div class='add'>+	PAGEABLE_MEM_REGION_TYPE = 0x9,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum qmi_wlanfw_host_build_type {</div><div class='add'>+	WLANFW_HOST_BUILD_TYPE_ENUM_MIN_VAL_V01 = INT_MIN,</div><div class='add'>+	QMI_WLANFW_HOST_BUILD_TYPE_UNSPECIFIED_V01 = 0,</div><div class='add'>+	QMI_WLANFW_HOST_BUILD_TYPE_PRIMARY_V01 = 1,</div><div class='add'>+	QMI_WLANFW_HOST_BUILD_TYPE_SECONDARY_V01 = 2,</div><div class='add'>+	WLANFW_HOST_BUILD_TYPE_ENUM_MAX_VAL_V01 = INT_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define QMI_WLFW_MAX_NUM_MLO_CHIPS_V01 3</div><div class='add'>+#define QMI_WLFW_MAX_NUM_MLO_LINKS_PER_CHIP_V01 2</div><div class='add'>+</div><div class='add'>+struct wlfw_host_mlo_chip_info_s_v01 {</div><div class='add'>+	u8 chip_id;</div><div class='add'>+	u8 num_local_links;</div><div class='add'>+	u8 hw_link_id[QMI_WLFW_MAX_NUM_MLO_LINKS_PER_CHIP_V01];</div><div class='add'>+	u8 valid_mlo_link_id[QMI_WLFW_MAX_NUM_MLO_LINKS_PER_CHIP_V01];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_qmi_cnss_feature {</div><div class='add'>+	CNSS_FEATURE_MIN_ENUM_VAL_V01 = INT_MIN,</div><div class='add'>+	CNSS_QDSS_CFG_MISS_V01 = 3,</div><div class='add'>+	CNSS_PCIE_PERST_NO_PULL_V01 = 4,</div><div class='add'>+	CNSS_MAX_FEATURE_V01 = 64,</div><div class='add'>+	CNSS_FEATURE_MAX_ENUM_VAL_V01 = INT_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_host_cap_req_msg_v01 {</div><div class='add'>+	u8 num_clients_valid;</div><div class='add'>+	u32 num_clients;</div><div class='add'>+	u8 wake_msi_valid;</div><div class='add'>+	u32 wake_msi;</div><div class='add'>+	u8 gpios_valid;</div><div class='add'>+	u32 gpios_len;</div><div class='add'>+	u32 gpios[QMI_WLFW_MAX_NUM_GPIO_V01];</div><div class='add'>+	u8 nm_modem_valid;</div><div class='add'>+	u8 nm_modem;</div><div class='add'>+	u8 bdf_support_valid;</div><div class='add'>+	u8 bdf_support;</div><div class='add'>+	u8 bdf_cache_support_valid;</div><div class='add'>+	u8 bdf_cache_support;</div><div class='add'>+	u8 m3_support_valid;</div><div class='add'>+	u8 m3_support;</div><div class='add'>+	u8 m3_cache_support_valid;</div><div class='add'>+	u8 m3_cache_support;</div><div class='add'>+	u8 cal_filesys_support_valid;</div><div class='add'>+	u8 cal_filesys_support;</div><div class='add'>+	u8 cal_cache_support_valid;</div><div class='add'>+	u8 cal_cache_support;</div><div class='add'>+	u8 cal_done_valid;</div><div class='add'>+	u8 cal_done;</div><div class='add'>+	u8 mem_bucket_valid;</div><div class='add'>+	u32 mem_bucket;</div><div class='add'>+	u8 mem_cfg_mode_valid;</div><div class='add'>+	u8 mem_cfg_mode;</div><div class='add'>+	u8 cal_duration_valid;</div><div class='add'>+	u16 cal_duraiton;</div><div class='add'>+	u8 platform_name_valid;</div><div class='add'>+	char platform_name[QMI_WLANFW_MAX_PLATFORM_NAME_LEN_V01 + 1];</div><div class='add'>+	u8 ddr_range_valid;</div><div class='add'>+	struct qmi_wlanfw_host_ddr_range ddr_range[QMI_WLANFW_MAX_HOST_DDR_RANGE_SIZE_V01];</div><div class='add'>+	u8 host_build_type_valid;</div><div class='add'>+	enum qmi_wlanfw_host_build_type host_build_type;</div><div class='add'>+	u8 mlo_capable_valid;</div><div class='add'>+	u8 mlo_capable;</div><div class='add'>+	u8 mlo_chip_id_valid;</div><div class='add'>+	u16 mlo_chip_id;</div><div class='add'>+	u8 mlo_group_id_valid;</div><div class='add'>+	u8 mlo_group_id;</div><div class='add'>+	u8 max_mlo_peer_valid;</div><div class='add'>+	u16 max_mlo_peer;</div><div class='add'>+	u8 mlo_num_chips_valid;</div><div class='add'>+	u8 mlo_num_chips;</div><div class='add'>+	u8 mlo_chip_info_valid;</div><div class='add'>+	struct wlfw_host_mlo_chip_info_s_v01 mlo_chip_info[QMI_WLFW_MAX_NUM_MLO_CHIPS_V01];</div><div class='add'>+	u8 feature_list_valid;</div><div class='add'>+	u64 feature_list;</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_host_cap_resp_msg_v01 {</div><div class='add'>+	struct qmi_response_type_v01 resp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define QMI_WLANFW_PHY_CAP_REQ_MSG_V01_MAX_LEN		0</div><div class='add'>+#define QMI_WLANFW_PHY_CAP_REQ_V01			0x0057</div><div class='add'>+#define QMI_WLANFW_PHY_CAP_RESP_MSG_V01_MAX_LEN		18</div><div class='add'>+#define QMI_WLANFW_PHY_CAP_RESP_V01			0x0057</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_phy_cap_req_msg_v01 {</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_phy_cap_resp_msg_v01 {</div><div class='add'>+	struct qmi_response_type_v01 resp;</div><div class='add'>+	u8 num_phy_valid;</div><div class='add'>+	u8 num_phy;</div><div class='add'>+	u8 board_id_valid;</div><div class='add'>+	u32 board_id;</div><div class='add'>+	u8 single_chip_mlo_support_valid;</div><div class='add'>+	u8 single_chip_mlo_support;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define QMI_WLANFW_IND_REGISTER_REQ_MSG_V01_MAX_LEN		54</div><div class='add'>+#define QMI_WLANFW_IND_REGISTER_REQ_V01				0x0020</div><div class='add'>+#define QMI_WLANFW_IND_REGISTER_RESP_MSG_V01_MAX_LEN		18</div><div class='add'>+#define QMI_WLANFW_IND_REGISTER_RESP_V01			0x0020</div><div class='add'>+#define QMI_WLANFW_CLIENT_ID					0x4b4e454c</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_ind_register_req_msg_v01 {</div><div class='add'>+	u8 fw_ready_enable_valid;</div><div class='add'>+	u8 fw_ready_enable;</div><div class='add'>+	u8 initiate_cal_download_enable_valid;</div><div class='add'>+	u8 initiate_cal_download_enable;</div><div class='add'>+	u8 initiate_cal_update_enable_valid;</div><div class='add'>+	u8 initiate_cal_update_enable;</div><div class='add'>+	u8 msa_ready_enable_valid;</div><div class='add'>+	u8 msa_ready_enable;</div><div class='add'>+	u8 pin_connect_result_enable_valid;</div><div class='add'>+	u8 pin_connect_result_enable;</div><div class='add'>+	u8 client_id_valid;</div><div class='add'>+	u32 client_id;</div><div class='add'>+	u8 request_mem_enable_valid;</div><div class='add'>+	u8 request_mem_enable;</div><div class='add'>+	u8 fw_mem_ready_enable_valid;</div><div class='add'>+	u8 fw_mem_ready_enable;</div><div class='add'>+	u8 fw_init_done_enable_valid;</div><div class='add'>+	u8 fw_init_done_enable;</div><div class='add'>+	u8 rejuvenate_enable_valid;</div><div class='add'>+	u32 rejuvenate_enable;</div><div class='add'>+	u8 xo_cal_enable_valid;</div><div class='add'>+	u8 xo_cal_enable;</div><div class='add'>+	u8 cal_done_enable_valid;</div><div class='add'>+	u8 cal_done_enable;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_ind_register_resp_msg_v01 {</div><div class='add'>+	struct qmi_response_type_v01 resp;</div><div class='add'>+	u8 fw_status_valid;</div><div class='add'>+	u64 fw_status;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define QMI_WLANFW_REQUEST_MEM_IND_MSG_V01_MAX_LEN	1824</div><div class='add'>+#define QMI_WLANFW_RESPOND_MEM_REQ_MSG_V01_MAX_LEN	888</div><div class='add'>+#define QMI_WLANFW_RESPOND_MEM_RESP_MSG_V01_MAX_LEN	7</div><div class='add'>+#define QMI_WLANFW_REQUEST_MEM_IND_V01			0x0035</div><div class='add'>+#define QMI_WLANFW_RESPOND_MEM_REQ_V01			0x0036</div><div class='add'>+#define QMI_WLANFW_RESPOND_MEM_RESP_V01			0x0036</div><div class='add'>+#define QMI_WLANFW_MAX_NUM_MEM_CFG_V01			2</div><div class='add'>+#define QMI_WLANFW_MAX_STR_LEN_V01                      16</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_mem_cfg_s_v01 {</div><div class='add'>+	u64 offset;</div><div class='add'>+	u32 size;</div><div class='add'>+	u8 secure_flag;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum qmi_wlanfw_mem_type_enum_v01 {</div><div class='add'>+	WLANFW_MEM_TYPE_ENUM_MIN_VAL_V01 = INT_MIN,</div><div class='add'>+	QMI_WLANFW_MEM_TYPE_MSA_V01 = 0,</div><div class='add'>+	QMI_WLANFW_MEM_TYPE_DDR_V01 = 1,</div><div class='add'>+	QMI_WLANFW_MEM_BDF_V01 = 2,</div><div class='add'>+	QMI_WLANFW_MEM_M3_V01 = 3,</div><div class='add'>+	QMI_WLANFW_MEM_CAL_V01 = 4,</div><div class='add'>+	QMI_WLANFW_MEM_DPD_V01 = 5,</div><div class='add'>+	WLANFW_MEM_TYPE_ENUM_MAX_VAL_V01 = INT_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_mem_seg_s_v01 {</div><div class='add'>+	u32 size;</div><div class='add'>+	enum qmi_wlanfw_mem_type_enum_v01 type;</div><div class='add'>+	u32 mem_cfg_len;</div><div class='add'>+	struct qmi_wlanfw_mem_cfg_s_v01 mem_cfg[QMI_WLANFW_MAX_NUM_MEM_CFG_V01];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_request_mem_ind_msg_v01 {</div><div class='add'>+	u32 mem_seg_len;</div><div class='add'>+	struct qmi_wlanfw_mem_seg_s_v01 mem_seg[ATH12K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_mem_seg_resp_s_v01 {</div><div class='add'>+	u64 addr;</div><div class='add'>+	u32 size;</div><div class='add'>+	enum qmi_wlanfw_mem_type_enum_v01 type;</div><div class='add'>+	u8 restore;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_respond_mem_req_msg_v01 {</div><div class='add'>+	u32 mem_seg_len;</div><div class='add'>+	struct qmi_wlanfw_mem_seg_resp_s_v01 mem_seg[ATH12K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_respond_mem_resp_msg_v01 {</div><div class='add'>+	struct qmi_response_type_v01 resp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_fw_mem_ready_ind_msg_v01 {</div><div class='add'>+	char placeholder;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_fw_ready_ind_msg_v01 {</div><div class='add'>+	char placeholder;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define QMI_WLANFW_CAP_REQ_MSG_V01_MAX_LEN	0</div><div class='add'>+#define QMI_WLANFW_CAP_RESP_MSG_V01_MAX_LEN	207</div><div class='add'>+#define QMI_WLANFW_CAP_REQ_V01			0x0024</div><div class='add'>+#define QMI_WLANFW_CAP_RESP_V01			0x0024</div><div class='add'>+</div><div class='add'>+enum qmi_wlanfw_pipedir_enum_v01 {</div><div class='add'>+	QMI_WLFW_PIPEDIR_NONE_V01 = 0,</div><div class='add'>+	QMI_WLFW_PIPEDIR_IN_V01 = 1,</div><div class='add'>+	QMI_WLFW_PIPEDIR_OUT_V01 = 2,</div><div class='add'>+	QMI_WLFW_PIPEDIR_INOUT_V01 = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_ce_tgt_pipe_cfg_s_v01 {</div><div class='add'>+	u32 pipe_num;</div><div class='add'>+	u32 pipe_dir;</div><div class='add'>+	u32 nentries;</div><div class='add'>+	u32 nbytes_max;</div><div class='add'>+	u32 flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_ce_svc_pipe_cfg_s_v01 {</div><div class='add'>+	u32 service_id;</div><div class='add'>+	u32 pipe_dir;</div><div class='add'>+	u32 pipe_num;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_shadow_reg_cfg_s_v01 {</div><div class='add'>+	u16 id;</div><div class='add'>+	u16 offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_shadow_reg_v3_cfg_s_v01 {</div><div class='add'>+	u32 addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_memory_region_info_s_v01 {</div><div class='add'>+	u64 region_addr;</div><div class='add'>+	u32 size;</div><div class='add'>+	u8 secure_flag;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_rf_chip_info_s_v01 {</div><div class='add'>+	u32 chip_id;</div><div class='add'>+	u32 chip_family;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_rf_board_info_s_v01 {</div><div class='add'>+	u32 board_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_soc_info_s_v01 {</div><div class='add'>+	u32 soc_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_fw_version_info_s_v01 {</div><div class='add'>+	u32 fw_version;</div><div class='add'>+	char fw_build_timestamp[ATH12K_QMI_WLANFW_MAX_TIMESTAMP_LEN_V01 + 1];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_dev_mem_info_s_v01 {</div><div class='add'>+	u64 start;</div><div class='add'>+	u64 size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum qmi_wlanfw_cal_temp_id_enum_v01 {</div><div class='add'>+	QMI_WLANFW_CAL_TEMP_IDX_0_V01 = 0,</div><div class='add'>+	QMI_WLANFW_CAL_TEMP_IDX_1_V01 = 1,</div><div class='add'>+	QMI_WLANFW_CAL_TEMP_IDX_2_V01 = 2,</div><div class='add'>+	QMI_WLANFW_CAL_TEMP_IDX_3_V01 = 3,</div><div class='add'>+	QMI_WLANFW_CAL_TEMP_IDX_4_V01 = 4,</div><div class='add'>+	QMI_WLANFW_CAL_TEMP_ID_MAX_V01 = 0xFF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum qmi_wlanfw_rd_card_chain_cap_v01 {</div><div class='add'>+	WLFW_RD_CARD_CHAIN_CAP_MIN_VAL_V01 = INT_MIN,</div><div class='add'>+	WLFW_RD_CARD_CHAIN_CAP_UNSPECIFIED_V01 = 0,</div><div class='add'>+	WLFW_RD_CARD_CHAIN_CAP_1x1_V01 = 1,</div><div class='add'>+	WLFW_RD_CARD_CHAIN_CAP_2x2_V01 = 2,</div><div class='add'>+	WLFW_RD_CARD_CHAIN_CAP_MAX_VAL_V01 = INT_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_cap_resp_msg_v01 {</div><div class='add'>+	struct qmi_response_type_v01 resp;</div><div class='add'>+	u8 chip_info_valid;</div><div class='add'>+	struct qmi_wlanfw_rf_chip_info_s_v01 chip_info;</div><div class='add'>+	u8 board_info_valid;</div><div class='add'>+	struct qmi_wlanfw_rf_board_info_s_v01 board_info;</div><div class='add'>+	u8 soc_info_valid;</div><div class='add'>+	struct qmi_wlanfw_soc_info_s_v01 soc_info;</div><div class='add'>+	u8 fw_version_info_valid;</div><div class='add'>+	struct qmi_wlanfw_fw_version_info_s_v01 fw_version_info;</div><div class='add'>+	u8 fw_build_id_valid;</div><div class='add'>+	char fw_build_id[ATH12K_QMI_WLANFW_MAX_BUILD_ID_LEN_V01 + 1];</div><div class='add'>+	u8 num_macs_valid;</div><div class='add'>+	u8 num_macs;</div><div class='add'>+	u8 voltage_mv_valid;</div><div class='add'>+	u32 voltage_mv;</div><div class='add'>+	u8 time_freq_hz_valid;</div><div class='add'>+	u32 time_freq_hz;</div><div class='add'>+	u8 otp_version_valid;</div><div class='add'>+	u32 otp_version;</div><div class='add'>+	u8 eeprom_caldata_read_timeout_valid;</div><div class='add'>+	u32 eeprom_caldata_read_timeout;</div><div class='add'>+	u8 fw_caps_valid;</div><div class='add'>+	u64 fw_caps;</div><div class='add'>+	u8 rd_card_chain_cap_valid;</div><div class='add'>+	enum qmi_wlanfw_rd_card_chain_cap_v01 rd_card_chain_cap;</div><div class='add'>+	u8 dev_mem_info_valid;</div><div class='add'>+	struct qmi_wlanfw_dev_mem_info_s_v01 dev_mem[ATH12K_QMI_WLFW_MAX_DEV_MEM_NUM_V01];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_cap_req_msg_v01 {</div><div class='add'>+	char placeholder;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define QMI_WLANFW_BDF_DOWNLOAD_REQ_MSG_V01_MAX_LEN	6182</div><div class='add'>+#define QMI_WLANFW_BDF_DOWNLOAD_RESP_MSG_V01_MAX_LEN	7</div><div class='add'>+#define QMI_WLANFW_BDF_DOWNLOAD_RESP_V01		0x0025</div><div class='add'>+#define QMI_WLANFW_BDF_DOWNLOAD_REQ_V01			0x0025</div><div class='add'>+/* TODO: Need to check with MCL and FW team that data can be pointer and</div><div class='add'>+ * can be last element in structure</div><div class='add'>+ */</div><div class='add'>+struct qmi_wlanfw_bdf_download_req_msg_v01 {</div><div class='add'>+	u8 valid;</div><div class='add'>+	u8 file_id_valid;</div><div class='add'>+	enum qmi_wlanfw_cal_temp_id_enum_v01 file_id;</div><div class='add'>+	u8 total_size_valid;</div><div class='add'>+	u32 total_size;</div><div class='add'>+	u8 seg_id_valid;</div><div class='add'>+	u32 seg_id;</div><div class='add'>+	u8 data_valid;</div><div class='add'>+	u32 data_len;</div><div class='add'>+	u8 data[QMI_WLANFW_MAX_DATA_SIZE_V01];</div><div class='add'>+	u8 end_valid;</div><div class='add'>+	u8 end;</div><div class='add'>+	u8 bdf_type_valid;</div><div class='add'>+	u8 bdf_type;</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_bdf_download_resp_msg_v01 {</div><div class='add'>+	struct qmi_response_type_v01 resp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define QMI_WLANFW_M3_INFO_REQ_MSG_V01_MAX_MSG_LEN	18</div><div class='add'>+#define QMI_WLANFW_M3_INFO_RESP_MSG_V01_MAX_MSG_LEN	7</div><div class='add'>+#define QMI_WLANFW_M3_INFO_RESP_V01		0x003C</div><div class='add'>+#define QMI_WLANFW_M3_INFO_REQ_V01		0x003C</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_m3_info_req_msg_v01 {</div><div class='add'>+	u64 addr;</div><div class='add'>+	u32 size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_m3_info_resp_msg_v01 {</div><div class='add'>+	struct qmi_response_type_v01 resp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define QMI_WLANFW_WLAN_MODE_REQ_MSG_V01_MAX_LEN	11</div><div class='add'>+#define QMI_WLANFW_WLAN_MODE_RESP_MSG_V01_MAX_LEN	7</div><div class='add'>+#define QMI_WLANFW_WLAN_CFG_REQ_MSG_V01_MAX_LEN		803</div><div class='add'>+#define QMI_WLANFW_WLAN_CFG_RESP_MSG_V01_MAX_LEN	7</div><div class='add'>+#define QMI_WLANFW_WLAN_MODE_REQ_V01			0x0022</div><div class='add'>+#define QMI_WLANFW_WLAN_MODE_RESP_V01			0x0022</div><div class='add'>+#define QMI_WLANFW_WLAN_CFG_REQ_V01			0x0023</div><div class='add'>+#define QMI_WLANFW_WLAN_CFG_RESP_V01			0x0023</div><div class='add'>+#define QMI_WLANFW_MAX_STR_LEN_V01			16</div><div class='add'>+#define QMI_WLANFW_MAX_NUM_CE_V01			12</div><div class='add'>+#define QMI_WLANFW_MAX_NUM_SVC_V01			24</div><div class='add'>+#define QMI_WLANFW_MAX_NUM_SHADOW_REG_V01		24</div><div class='add'>+#define QMI_WLANFW_MAX_NUM_SHADOW_REG_V3_V01		60</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_wlan_mode_req_msg_v01 {</div><div class='add'>+	u32 mode;</div><div class='add'>+	u8 hw_debug_valid;</div><div class='add'>+	u8 hw_debug;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_wlan_mode_resp_msg_v01 {</div><div class='add'>+	struct qmi_response_type_v01 resp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_wlan_cfg_req_msg_v01 {</div><div class='add'>+	u8 host_version_valid;</div><div class='add'>+	char host_version[QMI_WLANFW_MAX_STR_LEN_V01 + 1];</div><div class='add'>+	u8  tgt_cfg_valid;</div><div class='add'>+	u32  tgt_cfg_len;</div><div class='add'>+	struct qmi_wlanfw_ce_tgt_pipe_cfg_s_v01</div><div class='add'>+			tgt_cfg[QMI_WLANFW_MAX_NUM_CE_V01];</div><div class='add'>+	u8  svc_cfg_valid;</div><div class='add'>+	u32 svc_cfg_len;</div><div class='add'>+	struct qmi_wlanfw_ce_svc_pipe_cfg_s_v01</div><div class='add'>+			svc_cfg[QMI_WLANFW_MAX_NUM_SVC_V01];</div><div class='add'>+	u8 shadow_reg_valid;</div><div class='add'>+	u32 shadow_reg_len;</div><div class='add'>+	struct qmi_wlanfw_shadow_reg_cfg_s_v01</div><div class='add'>+		shadow_reg[QMI_WLANFW_MAX_NUM_SHADOW_REG_V01];</div><div class='add'>+	u8 shadow_reg_v3_valid;</div><div class='add'>+	u32 shadow_reg_v3_len;</div><div class='add'>+	struct qmi_wlanfw_shadow_reg_v3_cfg_s_v01</div><div class='add'>+		shadow_reg_v3[QMI_WLANFW_MAX_NUM_SHADOW_REG_V3_V01];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_wlan_cfg_resp_msg_v01 {</div><div class='add'>+	struct qmi_response_type_v01 resp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_QMI_WLANFW_WLAN_INI_REQ_V01	0x002F</div><div class='add'>+#define ATH12K_QMI_WLANFW_WLAN_INI_RESP_V01	0x002F</div><div class='add'>+#define QMI_WLANFW_WLAN_INI_REQ_MSG_V01_MAX_LEN		7</div><div class='add'>+#define QMI_WLANFW_WLAN_INI_RESP_MSG_V01_MAX_LEN	7</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_wlan_ini_req_msg_v01 {</div><div class='add'>+	/* Must be set to true if enable_fwlog is being passed */</div><div class='add'>+	u8 enable_fwlog_valid;</div><div class='add'>+	u8 enable_fwlog;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qmi_wlanfw_wlan_ini_resp_msg_v01 {</div><div class='add'>+	struct qmi_response_type_v01 resp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_qmi_mem_mode {</div><div class='add'>+	ATH12K_QMI_MEMORY_MODE_DEFAULT = 0,</div><div class='add'>+	ATH12K_QMI_MEMORY_MODE_LOW_512_M,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void ath12k_qmi_set_event_block(struct ath12k_qmi *qmi, bool block)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;qmi-&gt;event_lock);</div><div class='add'>+</div><div class='add'>+	qmi-&gt;block_event = block;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool ath12k_qmi_get_event_block(struct ath12k_qmi *qmi)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;qmi-&gt;event_lock);</div><div class='add'>+</div><div class='add'>+	return qmi-&gt;block_event;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_qmi_firmware_start(struct ath12k_base *ab,</div><div class='add'>+			      u32 mode);</div><div class='add'>+void ath12k_qmi_firmware_stop(struct ath12k_base *ab);</div><div class='add'>+void ath12k_qmi_deinit_service(struct ath12k_base *ab);</div><div class='add'>+int ath12k_qmi_init_service(struct ath12k_base *ab);</div><div class='add'>+void ath12k_qmi_free_resource(struct ath12k_base *ab);</div><div class='add'>+void ath12k_qmi_trigger_host_cap(struct ath12k_base *ab);</div><div class='add'>+void ath12k_qmi_reset_mlo_mem(struct ath12k_hw_group *ag);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/reg.c b/drivers/net/wireless/ath/ath12k/reg.c<br/>new file mode 100644<br/>index 000000000000..7898f6981e5a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/reg.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/reg.c</a></div><div class='hunk'>@@ -0,0 +1,994 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+</div><div class='add'>+/* World regdom to be used in case default regd from fw is unavailable */</div><div class='add'>+#define ATH12K_2GHZ_CH01_11      REG_RULE(2412 - 10, 2462 + 10, 40, 0, 20, 0)</div><div class='add'>+#define ATH12K_5GHZ_5150_5350    REG_RULE(5150 - 10, 5350 + 10, 80, 0, 30,\</div><div class='add'>+					  NL80211_RRF_NO_IR)</div><div class='add'>+#define ATH12K_5GHZ_5725_5850    REG_RULE(5725 - 10, 5850 + 10, 80, 0, 30,\</div><div class='add'>+					  NL80211_RRF_NO_IR)</div><div class='add'>+</div><div class='add'>+#define ETSI_WEATHER_RADAR_BAND_LOW		5590</div><div class='add'>+#define ETSI_WEATHER_RADAR_BAND_HIGH		5650</div><div class='add'>+#define ETSI_WEATHER_RADAR_BAND_CAC_TIMEOUT	600000</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_regdomain ath12k_world_regd = {</div><div class='add'>+	.n_reg_rules = 3,</div><div class='add'>+	.alpha2 = "00",</div><div class='add'>+	.reg_rules = {</div><div class='add'>+		ATH12K_2GHZ_CH01_11,</div><div class='add'>+		ATH12K_5GHZ_5150_5350,</div><div class='add'>+		ATH12K_5GHZ_5725_5850,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool ath12k_regdom_changes(struct ieee80211_hw *hw, char *alpha2)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_regdomain *regd;</div><div class='add'>+</div><div class='add'>+	regd = rcu_dereference_rtnl(hw-&gt;wiphy-&gt;regd);</div><div class='add'>+	/* This can happen during wiphy registration where the previous</div><div class='add'>+	 * user request is received before we update the regd received</div><div class='add'>+	 * from firmware.</div><div class='add'>+	 */</div><div class='add'>+	if (!regd)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return memcmp(regd-&gt;alpha2, alpha2, 2) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);</div><div class='add'>+	struct ath12k_wmi_init_country_arg arg;</div><div class='add'>+	struct wmi_set_current_country_arg current_arg = {};</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	struct ath12k *ar = ath12k_ah_to_ar(ah, 0);</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_REG,</div><div class='add'>+		   "Regulatory Notification received for %s\n", wiphy_name(wiphy));</div><div class='add'>+</div><div class='add'>+	if (request-&gt;initiator == NL80211_REGDOM_SET_BY_DRIVER) {</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_REG,</div><div class='add'>+			   "driver initiated regd update\n");</div><div class='add'>+		if (ah-&gt;state != ATH12K_HW_STATE_ON)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		for_each_ar(ah, ar, i) {</div><div class='add'>+			ret = ath12k_reg_update_chan_list(ar, true);</div><div class='add'>+			if (ret &amp;&amp; ret != -EINVAL) {</div><div class='add'>+				ath12k_warn(ar-&gt;ab,</div><div class='add'>+					    "failed to update chan list for pdev %u, ret %d\n",</div><div class='add'>+					    i, ret);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Currently supporting only General User Hints. Cell base user</div><div class='add'>+	 * hints to be handled later.</div><div class='add'>+	 * Hints from other sources like Core, Beacons are not expected for</div><div class='add'>+	 * self managed wiphy's</div><div class='add'>+	 */</div><div class='add'>+	if (!(request-&gt;initiator == NL80211_REGDOM_SET_BY_USER &amp;&amp;</div><div class='add'>+	      request-&gt;user_reg_hint_type == NL80211_USER_REG_HINT_USER)) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "Unexpected Regulatory event for this wiphy\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_ATH_REG_DYNAMIC_USER_REG_HINTS)) {</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_REG,</div><div class='add'>+			   "Country Setting is not allowed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ath12k_regdom_changes(hw, request-&gt;alpha2)) {</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_REG, "Country is already set\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allow fresh updates to wiphy regd */</div><div class='add'>+	ah-&gt;regd_updated = false;</div><div class='add'>+</div><div class='add'>+	/* Send the reg change request to all the radios */</div><div class='add'>+	for_each_ar(ah, ar, i) {</div><div class='add'>+		reinit_completion(&amp;ar-&gt;regd_update_completed);</div><div class='add'>+</div><div class='add'>+		if (ar-&gt;ab-&gt;hw_params-&gt;current_cc_support) {</div><div class='add'>+			memcpy(&amp;current_arg.alpha2, request-&gt;alpha2, 2);</div><div class='add'>+			memcpy(&amp;ar-&gt;alpha2, &amp;current_arg.alpha2, 2);</div><div class='add'>+			ret = ath12k_wmi_send_set_current_country_cmd(ar, &amp;current_arg);</div><div class='add'>+			if (ret)</div><div class='add'>+				ath12k_warn(ar-&gt;ab,</div><div class='add'>+					    "failed set current country code: %d\n", ret);</div><div class='add'>+		} else {</div><div class='add'>+			arg.flags = ALPHA_IS_SET;</div><div class='add'>+			memcpy(&amp;arg.cc_info.alpha2, request-&gt;alpha2, 2);</div><div class='add'>+			arg.cc_info.alpha2[2] = 0;</div><div class='add'>+</div><div class='add'>+			ret = ath12k_wmi_send_init_country_cmd(ar, &amp;arg);</div><div class='add'>+			if (ret)</div><div class='add'>+				ath12k_warn(ar-&gt;ab,</div><div class='add'>+					    "failed set INIT Country code: %d\n", ret);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		wiphy_lock(wiphy);</div><div class='add'>+		ath12k_mac_11d_scan_stop(ar);</div><div class='add'>+		wiphy_unlock(wiphy);</div><div class='add'>+</div><div class='add'>+		ar-&gt;regdom_set_by_user = true;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_reg_update_chan_list(struct ath12k *ar, bool wait)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_supported_band **bands;</div><div class='add'>+	struct ath12k_wmi_scan_chan_list_arg *arg;</div><div class='add'>+	struct ieee80211_channel *channel;</div><div class='add'>+	struct ieee80211_hw *hw = ath12k_ar_to_hw(ar);</div><div class='add'>+	struct ath12k_wmi_channel_arg *ch;</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	int num_channels = 0;</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;ah-&gt;state == ATH12K_HW_STATE_RESTARTING)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bands = hw-&gt;wiphy-&gt;bands;</div><div class='add'>+	for (band = 0; band &lt; NUM_NL80211_BANDS; band++) {</div><div class='add'>+		if (!(ar-&gt;mac.sbands[band].channels &amp;&amp; bands[band]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; bands[band]-&gt;n_channels; i++) {</div><div class='add'>+			if (bands[band]-&gt;channels[i].flags &amp;</div><div class='add'>+			    IEEE80211_CHAN_DISABLED)</div><div class='add'>+				continue;</div><div class='add'>+			/* Skip Channels that are not in current radio's range */</div><div class='add'>+			if (bands[band]-&gt;channels[i].center_freq &lt;</div><div class='add'>+			    KHZ_TO_MHZ(ar-&gt;freq_range.start_freq) ||</div><div class='add'>+			    bands[band]-&gt;channels[i].center_freq &gt;</div><div class='add'>+			    KHZ_TO_MHZ(ar-&gt;freq_range.end_freq))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			num_channels++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!num_channels) {</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_REG,</div><div class='add'>+			   "pdev is not supported for this country\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arg = kzalloc(struct_size(arg, channel, num_channels), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!arg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	arg-&gt;pdev_id = ar-&gt;pdev-&gt;pdev_id;</div><div class='add'>+	arg-&gt;nallchans = num_channels;</div><div class='add'>+</div><div class='add'>+	ch = arg-&gt;channel;</div><div class='add'>+</div><div class='add'>+	for (band = 0; band &lt; NUM_NL80211_BANDS; band++) {</div><div class='add'>+		if (!(ar-&gt;mac.sbands[band].channels &amp;&amp; bands[band]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; bands[band]-&gt;n_channels; i++) {</div><div class='add'>+			channel = &amp;bands[band]-&gt;channels[i];</div><div class='add'>+</div><div class='add'>+			if (channel-&gt;flags &amp; IEEE80211_CHAN_DISABLED)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			/* Skip Channels that are not in current radio's range */</div><div class='add'>+			if (bands[band]-&gt;channels[i].center_freq &lt;</div><div class='add'>+			    KHZ_TO_MHZ(ar-&gt;freq_range.start_freq) ||</div><div class='add'>+			    bands[band]-&gt;channels[i].center_freq &gt;</div><div class='add'>+			    KHZ_TO_MHZ(ar-&gt;freq_range.end_freq))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			/* TODO: Set to true/false based on some condition? */</div><div class='add'>+			ch-&gt;allow_ht = true;</div><div class='add'>+			ch-&gt;allow_vht = true;</div><div class='add'>+			ch-&gt;allow_he = true;</div><div class='add'>+</div><div class='add'>+			ch-&gt;dfs_set =</div><div class='add'>+				!!(channel-&gt;flags &amp; IEEE80211_CHAN_RADAR);</div><div class='add'>+			ch-&gt;is_chan_passive = !!(channel-&gt;flags &amp;</div><div class='add'>+						IEEE80211_CHAN_NO_IR);</div><div class='add'>+			ch-&gt;is_chan_passive |= ch-&gt;dfs_set;</div><div class='add'>+			ch-&gt;mhz = channel-&gt;center_freq;</div><div class='add'>+			ch-&gt;cfreq1 = channel-&gt;center_freq;</div><div class='add'>+			ch-&gt;minpower = 0;</div><div class='add'>+			ch-&gt;maxpower = channel-&gt;max_power * 2;</div><div class='add'>+			ch-&gt;maxregpower = channel-&gt;max_reg_power * 2;</div><div class='add'>+			ch-&gt;antennamax = channel-&gt;max_antenna_gain * 2;</div><div class='add'>+</div><div class='add'>+			/* TODO: Use appropriate phymodes */</div><div class='add'>+			if (channel-&gt;band == NL80211_BAND_2GHZ)</div><div class='add'>+				ch-&gt;phy_mode = MODE_11G;</div><div class='add'>+			else</div><div class='add'>+				ch-&gt;phy_mode = MODE_11A;</div><div class='add'>+</div><div class='add'>+			if (channel-&gt;band == NL80211_BAND_6GHZ &amp;&amp;</div><div class='add'>+			    cfg80211_channel_is_psc(channel))</div><div class='add'>+				ch-&gt;psc_channel = true;</div><div class='add'>+</div><div class='add'>+			ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+				   "mac channel [%d/%d] freq %d maxpower %d regpower %d antenna %d mode %d\n",</div><div class='add'>+				   i, arg-&gt;nallchans,</div><div class='add'>+				   ch-&gt;mhz, ch-&gt;maxpower, ch-&gt;maxregpower,</div><div class='add'>+				   ch-&gt;antennamax, ch-&gt;phy_mode);</div><div class='add'>+</div><div class='add'>+			ch++;</div><div class='add'>+			/* TODO: use quarrter/half rate, cfreq12, dfs_cfreq2</div><div class='add'>+			 * set_agile, reg_class_idx</div><div class='add'>+			 */</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wait) {</div><div class='add'>+		spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		list_add_tail(&amp;arg-&gt;list, &amp;ar-&gt;regd_channel_update_queue);</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+		queue_work(ar-&gt;ab-&gt;workqueue, &amp;ar-&gt;regd_channel_update_work);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_send_scan_chan_list_cmd(ar, arg);</div><div class='add'>+	kfree(arg);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_copy_regd(struct ieee80211_regdomain *regd_orig,</div><div class='add'>+			     struct ieee80211_regdomain *regd_copy)</div><div class='add'>+{</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	/* The caller should have checked error conditions */</div><div class='add'>+	memcpy(regd_copy, regd_orig, sizeof(*regd_orig));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; regd_orig-&gt;n_reg_rules; i++)</div><div class='add'>+		memcpy(&amp;regd_copy-&gt;reg_rules[i], &amp;regd_orig-&gt;reg_rules[i],</div><div class='add'>+		       sizeof(struct ieee80211_reg_rule));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_regd_update(struct ath12k *ar, bool init)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_hal_reg_capabilities_ext_arg *reg_cap;</div><div class='add'>+	u32 phy_id, freq_low, freq_high, supported_bands;</div><div class='add'>+	struct ath12k_hw *ah = ath12k_ar_to_ah(ar);</div><div class='add'>+	struct ieee80211_hw *hw = ah-&gt;hw;</div><div class='add'>+	struct ieee80211_regdomain *regd, *regd_copy = NULL;</div><div class='add'>+	int ret, regd_len, pdev_id;</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	long time_left;</div><div class='add'>+</div><div class='add'>+	ab = ar-&gt;ab;</div><div class='add'>+</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;ar-&gt;regd_update_completed,</div><div class='add'>+						ATH12K_REG_UPDATE_TIMEOUT_HZ);</div><div class='add'>+	if (time_left == 0) {</div><div class='add'>+		ath12k_warn(ab, "Timeout while waiting for regulatory update");</div><div class='add'>+		/* Even though timeout has occurred, still continue since at least boot</div><div class='add'>+		 * time data would be there to process</div><div class='add'>+		 */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	supported_bands = ar-&gt;pdev-&gt;cap.supported_bands;</div><div class='add'>+	reg_cap = &amp;ab-&gt;hal_reg_cap[ar-&gt;pdev_idx];</div><div class='add'>+</div><div class='add'>+	/* Possible that due to reg change, current limits for supported</div><div class='add'>+	 * frequency changed. Update it. As a first step, reset the</div><div class='add'>+	 * previous values and then compute and set the new values.</div><div class='add'>+	 */</div><div class='add'>+	ar-&gt;freq_range.start_freq = 0;</div><div class='add'>+	ar-&gt;freq_range.end_freq = 0;</div><div class='add'>+</div><div class='add'>+	if (supported_bands &amp; WMI_HOST_WLAN_2GHZ_CAP) {</div><div class='add'>+		if (ab-&gt;hw_params-&gt;single_pdev_only) {</div><div class='add'>+			phy_id = ar-&gt;pdev-&gt;cap.band[WMI_HOST_WLAN_2GHZ_CAP].phy_id;</div><div class='add'>+			reg_cap = &amp;ab-&gt;hal_reg_cap[phy_id];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		freq_low = max(reg_cap-&gt;low_2ghz_chan, ab-&gt;reg_freq_2ghz.start_freq);</div><div class='add'>+		freq_high = min(reg_cap-&gt;high_2ghz_chan, ab-&gt;reg_freq_2ghz.end_freq);</div><div class='add'>+</div><div class='add'>+		ath12k_mac_update_freq_range(ar, freq_low, freq_high);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (supported_bands &amp; WMI_HOST_WLAN_5GHZ_CAP &amp;&amp; !ar-&gt;supports_6ghz) {</div><div class='add'>+		if (ab-&gt;hw_params-&gt;single_pdev_only) {</div><div class='add'>+			phy_id = ar-&gt;pdev-&gt;cap.band[WMI_HOST_WLAN_5GHZ_CAP].phy_id;</div><div class='add'>+			reg_cap = &amp;ab-&gt;hal_reg_cap[phy_id];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		freq_low = max(reg_cap-&gt;low_5ghz_chan, ab-&gt;reg_freq_5ghz.start_freq);</div><div class='add'>+		freq_high = min(reg_cap-&gt;high_5ghz_chan, ab-&gt;reg_freq_5ghz.end_freq);</div><div class='add'>+</div><div class='add'>+		ath12k_mac_update_freq_range(ar, freq_low, freq_high);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (supported_bands &amp; WMI_HOST_WLAN_5GHZ_CAP &amp;&amp; ar-&gt;supports_6ghz) {</div><div class='add'>+		freq_low = max(reg_cap-&gt;low_5ghz_chan, ab-&gt;reg_freq_6ghz.start_freq);</div><div class='add'>+		freq_high = min(reg_cap-&gt;high_5ghz_chan, ab-&gt;reg_freq_6ghz.end_freq);</div><div class='add'>+</div><div class='add'>+		ath12k_mac_update_freq_range(ar, freq_low, freq_high);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If one of the radios within ah has already updated the regd for</div><div class='add'>+	 * the wiphy, then avoid setting regd again</div><div class='add'>+	 */</div><div class='add'>+	if (ah-&gt;regd_updated)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* firmware provides reg rules which are similar for 2 GHz and 5 GHz</div><div class='add'>+	 * pdev but 6 GHz pdev has superset of all rules including rules for</div><div class='add'>+	 * all bands, we prefer 6 GHz pdev's rules to be used for setup of</div><div class='add'>+	 * the wiphy regd.</div><div class='add'>+	 * If 6 GHz pdev was part of the ath12k_hw, wait for the 6 GHz pdev,</div><div class='add'>+	 * else pick the first pdev which calls this function and use its</div><div class='add'>+	 * regd to update global hw regd.</div><div class='add'>+	 * The regd_updated flag set at the end will not allow any further</div><div class='add'>+	 * updates.</div><div class='add'>+	 */</div><div class='add'>+	if (ah-&gt;use_6ghz_regd &amp;&amp; !ar-&gt;supports_6ghz)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	pdev_id = ar-&gt;pdev_idx;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	if (init) {</div><div class='add'>+		/* Apply the regd received during init through</div><div class='add'>+		 * WMI_REG_CHAN_LIST_CC event. In case of failure to</div><div class='add'>+		 * receive the regd, initialize with a default world</div><div class='add'>+		 * regulatory.</div><div class='add'>+		 */</div><div class='add'>+		if (ab-&gt;default_regd[pdev_id]) {</div><div class='add'>+			regd = ab-&gt;default_regd[pdev_id];</div><div class='add'>+		} else {</div><div class='add'>+			ath12k_warn(ab,</div><div class='add'>+				    "failed to receive default regd during init\n");</div><div class='add'>+			regd = (struct ieee80211_regdomain *)&amp;ath12k_world_regd;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		regd = ab-&gt;new_regd[pdev_id];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!regd) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	regd_len = sizeof(*regd) + (regd-&gt;n_reg_rules *</div><div class='add'>+		sizeof(struct ieee80211_reg_rule));</div><div class='add'>+</div><div class='add'>+	regd_copy = kzalloc(regd_len, GFP_ATOMIC);</div><div class='add'>+	if (regd_copy)</div><div class='add'>+		ath12k_copy_regd(regd, regd_copy);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	if (!regd_copy) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regulatory_set_wiphy_regd(hw-&gt;wiphy, regd_copy);</div><div class='add'>+</div><div class='add'>+	kfree(regd_copy);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;state != ATH12K_HW_STATE_ON)</div><div class='add'>+		goto skip;</div><div class='add'>+</div><div class='add'>+	ah-&gt;regd_updated = true;</div><div class='add'>+</div><div class='add'>+skip:</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	ath12k_warn(ab, "failed to perform regd update : %d\n", ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum nl80211_dfs_regions</div><div class='add'>+ath12k_map_fw_dfs_region(enum ath12k_dfs_region dfs_region)</div><div class='add'>+{</div><div class='add'>+	switch (dfs_region) {</div><div class='add'>+	case ATH12K_DFS_REG_FCC:</div><div class='add'>+	case ATH12K_DFS_REG_CN:</div><div class='add'>+		return NL80211_DFS_FCC;</div><div class='add'>+	case ATH12K_DFS_REG_ETSI:</div><div class='add'>+	case ATH12K_DFS_REG_KR:</div><div class='add'>+		return NL80211_DFS_ETSI;</div><div class='add'>+	case ATH12K_DFS_REG_MKK:</div><div class='add'>+	case ATH12K_DFS_REG_MKK_N:</div><div class='add'>+		return NL80211_DFS_JP;</div><div class='add'>+	default:</div><div class='add'>+		return NL80211_DFS_UNSET;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_get_bw_reg_flags(u16 max_bw)</div><div class='add'>+{</div><div class='add'>+	switch (max_bw) {</div><div class='add'>+	case 20:</div><div class='add'>+		return NL80211_RRF_NO_HT40 |</div><div class='add'>+			NL80211_RRF_NO_80MHZ |</div><div class='add'>+			NL80211_RRF_NO_160MHZ |</div><div class='add'>+			NL80211_RRF_NO_320MHZ;</div><div class='add'>+	case 40:</div><div class='add'>+		return NL80211_RRF_NO_80MHZ |</div><div class='add'>+			NL80211_RRF_NO_160MHZ |</div><div class='add'>+			NL80211_RRF_NO_320MHZ;</div><div class='add'>+	case 80:</div><div class='add'>+		return NL80211_RRF_NO_160MHZ |</div><div class='add'>+			NL80211_RRF_NO_320MHZ;</div><div class='add'>+	case 160:</div><div class='add'>+		return NL80211_RRF_NO_320MHZ;</div><div class='add'>+	case 320:</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_map_fw_reg_flags(u16 reg_flags)</div><div class='add'>+{</div><div class='add'>+	u32 flags = 0;</div><div class='add'>+</div><div class='add'>+	if (reg_flags &amp; REGULATORY_CHAN_NO_IR)</div><div class='add'>+		flags = NL80211_RRF_NO_IR;</div><div class='add'>+</div><div class='add'>+	if (reg_flags &amp; REGULATORY_CHAN_RADAR)</div><div class='add'>+		flags |= NL80211_RRF_DFS;</div><div class='add'>+</div><div class='add'>+	if (reg_flags &amp; REGULATORY_CHAN_NO_OFDM)</div><div class='add'>+		flags |= NL80211_RRF_NO_OFDM;</div><div class='add'>+</div><div class='add'>+	if (reg_flags &amp; REGULATORY_CHAN_INDOOR_ONLY)</div><div class='add'>+		flags |= NL80211_RRF_NO_OUTDOOR;</div><div class='add'>+</div><div class='add'>+	if (reg_flags &amp; REGULATORY_CHAN_NO_HT40)</div><div class='add'>+		flags |= NL80211_RRF_NO_HT40;</div><div class='add'>+</div><div class='add'>+	if (reg_flags &amp; REGULATORY_CHAN_NO_80MHZ)</div><div class='add'>+		flags |= NL80211_RRF_NO_80MHZ;</div><div class='add'>+</div><div class='add'>+	if (reg_flags &amp; REGULATORY_CHAN_NO_160MHZ)</div><div class='add'>+		flags |= NL80211_RRF_NO_160MHZ;</div><div class='add'>+</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_map_fw_phy_flags(u32 phy_flags)</div><div class='add'>+{</div><div class='add'>+	u32 flags = 0;</div><div class='add'>+</div><div class='add'>+	if (phy_flags &amp; ATH12K_REG_PHY_BITMAP_NO11AX)</div><div class='add'>+		flags |= NL80211_RRF_NO_HE;</div><div class='add'>+</div><div class='add'>+	if (phy_flags &amp; ATH12K_REG_PHY_BITMAP_NO11BE)</div><div class='add'>+		flags |= NL80211_RRF_NO_EHT;</div><div class='add'>+</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *</div><div class='add'>+ath12k_reg_get_regdom_str(enum nl80211_dfs_regions dfs_region)</div><div class='add'>+{</div><div class='add'>+	switch (dfs_region) {</div><div class='add'>+	case NL80211_DFS_FCC:</div><div class='add'>+		return "FCC";</div><div class='add'>+	case NL80211_DFS_ETSI:</div><div class='add'>+		return "ETSI";</div><div class='add'>+	case NL80211_DFS_JP:</div><div class='add'>+		return "JP";</div><div class='add'>+	default:</div><div class='add'>+		return "UNSET";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16</div><div class='add'>+ath12k_reg_adjust_bw(u16 start_freq, u16 end_freq, u16 max_bw)</div><div class='add'>+{</div><div class='add'>+	u16 bw;</div><div class='add'>+</div><div class='add'>+	bw = end_freq - start_freq;</div><div class='add'>+	bw = min_t(u16, bw, max_bw);</div><div class='add'>+</div><div class='add'>+	if (bw &gt;= 80 &amp;&amp; bw &lt; 160)</div><div class='add'>+		bw = 80;</div><div class='add'>+	else if (bw &gt;= 40 &amp;&amp; bw &lt; 80)</div><div class='add'>+		bw = 40;</div><div class='add'>+	else if (bw &lt; 40)</div><div class='add'>+		bw = 20;</div><div class='add'>+</div><div class='add'>+	return bw;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_reg_update_rule(struct ieee80211_reg_rule *reg_rule, u32 start_freq,</div><div class='add'>+		       u32 end_freq, u32 bw, u32 ant_gain, u32 reg_pwr,</div><div class='add'>+		       s8 psd, u32 reg_flags)</div><div class='add'>+{</div><div class='add'>+	reg_rule-&gt;freq_range.start_freq_khz = MHZ_TO_KHZ(start_freq);</div><div class='add'>+	reg_rule-&gt;freq_range.end_freq_khz = MHZ_TO_KHZ(end_freq);</div><div class='add'>+	reg_rule-&gt;freq_range.max_bandwidth_khz = MHZ_TO_KHZ(bw);</div><div class='add'>+	reg_rule-&gt;power_rule.max_antenna_gain = DBI_TO_MBI(ant_gain);</div><div class='add'>+	reg_rule-&gt;power_rule.max_eirp = DBM_TO_MBM(reg_pwr);</div><div class='add'>+	reg_rule-&gt;psd = psd;</div><div class='add'>+	reg_rule-&gt;flags = reg_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_reg_update_weather_radar_band(struct ath12k_base *ab,</div><div class='add'>+				     struct ieee80211_regdomain *regd,</div><div class='add'>+				     struct ath12k_reg_rule *reg_rule,</div><div class='add'>+				     u8 *rule_idx, u32 flags, u16 max_bw)</div><div class='add'>+{</div><div class='add'>+	u32 end_freq;</div><div class='add'>+	u16 bw;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	i = *rule_idx;</div><div class='add'>+</div><div class='add'>+	bw = ath12k_reg_adjust_bw(reg_rule-&gt;start_freq,</div><div class='add'>+				  ETSI_WEATHER_RADAR_BAND_LOW, max_bw);</div><div class='add'>+</div><div class='add'>+	ath12k_reg_update_rule(regd-&gt;reg_rules + i, reg_rule-&gt;start_freq,</div><div class='add'>+			       ETSI_WEATHER_RADAR_BAND_LOW, bw,</div><div class='add'>+			       reg_rule-&gt;ant_gain, reg_rule-&gt;reg_power,</div><div class='add'>+			       reg_rule-&gt;psd_eirp, flags);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_REG,</div><div class='add'>+		   "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n",</div><div class='add'>+		   i + 1, reg_rule-&gt;start_freq, ETSI_WEATHER_RADAR_BAND_LOW,</div><div class='add'>+		   bw, reg_rule-&gt;ant_gain, reg_rule-&gt;reg_power,</div><div class='add'>+		   regd-&gt;reg_rules[i].dfs_cac_ms,</div><div class='add'>+		   flags);</div><div class='add'>+</div><div class='add'>+	if (reg_rule-&gt;end_freq &gt; ETSI_WEATHER_RADAR_BAND_HIGH)</div><div class='add'>+		end_freq = ETSI_WEATHER_RADAR_BAND_HIGH;</div><div class='add'>+	else</div><div class='add'>+		end_freq = reg_rule-&gt;end_freq;</div><div class='add'>+</div><div class='add'>+	bw = ath12k_reg_adjust_bw(ETSI_WEATHER_RADAR_BAND_LOW, end_freq,</div><div class='add'>+				  max_bw);</div><div class='add'>+</div><div class='add'>+	i++;</div><div class='add'>+</div><div class='add'>+	ath12k_reg_update_rule(regd-&gt;reg_rules + i,</div><div class='add'>+			       ETSI_WEATHER_RADAR_BAND_LOW, end_freq, bw,</div><div class='add'>+			       reg_rule-&gt;ant_gain, reg_rule-&gt;reg_power,</div><div class='add'>+			       reg_rule-&gt;psd_eirp, flags);</div><div class='add'>+</div><div class='add'>+	regd-&gt;reg_rules[i].dfs_cac_ms = ETSI_WEATHER_RADAR_BAND_CAC_TIMEOUT;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_REG,</div><div class='add'>+		   "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n",</div><div class='add'>+		   i + 1, ETSI_WEATHER_RADAR_BAND_LOW, end_freq,</div><div class='add'>+		   bw, reg_rule-&gt;ant_gain, reg_rule-&gt;reg_power,</div><div class='add'>+		   regd-&gt;reg_rules[i].dfs_cac_ms,</div><div class='add'>+		   flags);</div><div class='add'>+</div><div class='add'>+	if (end_freq == reg_rule-&gt;end_freq) {</div><div class='add'>+		regd-&gt;n_reg_rules--;</div><div class='add'>+		*rule_idx = i;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bw = ath12k_reg_adjust_bw(ETSI_WEATHER_RADAR_BAND_HIGH,</div><div class='add'>+				  reg_rule-&gt;end_freq, max_bw);</div><div class='add'>+</div><div class='add'>+	i++;</div><div class='add'>+</div><div class='add'>+	ath12k_reg_update_rule(regd-&gt;reg_rules + i, ETSI_WEATHER_RADAR_BAND_HIGH,</div><div class='add'>+			       reg_rule-&gt;end_freq, bw,</div><div class='add'>+			       reg_rule-&gt;ant_gain, reg_rule-&gt;reg_power,</div><div class='add'>+			       reg_rule-&gt;psd_eirp, flags);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_REG,</div><div class='add'>+		   "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n",</div><div class='add'>+		   i + 1, ETSI_WEATHER_RADAR_BAND_HIGH, reg_rule-&gt;end_freq,</div><div class='add'>+		   bw, reg_rule-&gt;ant_gain, reg_rule-&gt;reg_power,</div><div class='add'>+		   regd-&gt;reg_rules[i].dfs_cac_ms,</div><div class='add'>+		   flags);</div><div class='add'>+</div><div class='add'>+	*rule_idx = i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_reg_update_freq_range(struct ath12k_reg_freq *reg_freq,</div><div class='add'>+					 struct ath12k_reg_rule *reg_rule)</div><div class='add'>+{</div><div class='add'>+	if (reg_freq-&gt;start_freq &gt; reg_rule-&gt;start_freq)</div><div class='add'>+		reg_freq-&gt;start_freq = reg_rule-&gt;start_freq;</div><div class='add'>+</div><div class='add'>+	if (reg_freq-&gt;end_freq &lt; reg_rule-&gt;end_freq)</div><div class='add'>+		reg_freq-&gt;end_freq = reg_rule-&gt;end_freq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum wmi_reg_6g_ap_type</div><div class='add'>+ath12k_reg_ap_pwr_convert(enum ieee80211_ap_reg_power power_type)</div><div class='add'>+{</div><div class='add'>+	switch (power_type) {</div><div class='add'>+	case IEEE80211_REG_LPI_AP:</div><div class='add'>+		return WMI_REG_INDOOR_AP;</div><div class='add'>+	case IEEE80211_REG_SP_AP:</div><div class='add'>+		return WMI_REG_STD_POWER_AP;</div><div class='add'>+	case IEEE80211_REG_VLP_AP:</div><div class='add'>+		return WMI_REG_VLP_AP;</div><div class='add'>+	default:</div><div class='add'>+		return WMI_REG_MAX_AP_TYPE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ieee80211_regdomain *</div><div class='add'>+ath12k_reg_build_regd(struct ath12k_base *ab,</div><div class='add'>+		      struct ath12k_reg_info *reg_info,</div><div class='add'>+		      enum wmi_vdev_type vdev_type,</div><div class='add'>+		      enum ieee80211_ap_reg_power power_type)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_regdomain *new_regd = NULL;</div><div class='add'>+	struct ath12k_reg_rule *reg_rule, *reg_rule_6ghz;</div><div class='add'>+	u32 flags, reg_6ghz_number, max_bw_6ghz;</div><div class='add'>+	u8 i = 0, j = 0, k = 0;</div><div class='add'>+	u8 num_rules;</div><div class='add'>+	u16 max_bw;</div><div class='add'>+	char alpha2[3];</div><div class='add'>+</div><div class='add'>+	num_rules = reg_info-&gt;num_5g_reg_rules + reg_info-&gt;num_2g_reg_rules;</div><div class='add'>+</div><div class='add'>+	if (reg_info-&gt;is_ext_reg_event) {</div><div class='add'>+		if (vdev_type == WMI_VDEV_TYPE_STA) {</div><div class='add'>+			enum wmi_reg_6g_ap_type ap_type;</div><div class='add'>+</div><div class='add'>+			ap_type = ath12k_reg_ap_pwr_convert(power_type);</div><div class='add'>+			if (ap_type == WMI_REG_MAX_AP_TYPE)</div><div class='add'>+				ap_type = WMI_REG_INDOOR_AP;</div><div class='add'>+</div><div class='add'>+			reg_6ghz_number = reg_info-&gt;num_6g_reg_rules_cl</div><div class='add'>+					[ap_type][WMI_REG_DEFAULT_CLIENT];</div><div class='add'>+			if (reg_6ghz_number == 0) {</div><div class='add'>+				ap_type = WMI_REG_INDOOR_AP;</div><div class='add'>+				reg_6ghz_number = reg_info-&gt;num_6g_reg_rules_cl</div><div class='add'>+						[ap_type][WMI_REG_DEFAULT_CLIENT];</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			reg_rule_6ghz = reg_info-&gt;reg_rules_6g_client_ptr</div><div class='add'>+					[ap_type][WMI_REG_DEFAULT_CLIENT];</div><div class='add'>+			max_bw_6ghz = reg_info-&gt;max_bw_6g_client</div><div class='add'>+					[ap_type][WMI_REG_DEFAULT_CLIENT];</div><div class='add'>+		} else {</div><div class='add'>+			reg_6ghz_number = reg_info-&gt;num_6g_reg_rules_ap</div><div class='add'>+						[WMI_REG_INDOOR_AP];</div><div class='add'>+			reg_rule_6ghz =</div><div class='add'>+				reg_info-&gt;reg_rules_6g_ap_ptr[WMI_REG_INDOOR_AP];</div><div class='add'>+			max_bw_6ghz = reg_info-&gt;max_bw_6g_ap[WMI_REG_INDOOR_AP];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		num_rules += reg_6ghz_number;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!num_rules)</div><div class='add'>+		goto ret;</div><div class='add'>+</div><div class='add'>+	/* Add max additional rules to accommodate weather radar band */</div><div class='add'>+	if (reg_info-&gt;dfs_region == ATH12K_DFS_REG_ETSI)</div><div class='add'>+		num_rules += 2;</div><div class='add'>+</div><div class='add'>+	new_regd = kzalloc(sizeof(*new_regd) +</div><div class='add'>+			   (num_rules * sizeof(struct ieee80211_reg_rule)),</div><div class='add'>+			   GFP_ATOMIC);</div><div class='add'>+	if (!new_regd)</div><div class='add'>+		goto ret;</div><div class='add'>+</div><div class='add'>+	memcpy(new_regd-&gt;alpha2, reg_info-&gt;alpha2, REG_ALPHA2_LEN + 1);</div><div class='add'>+	memcpy(alpha2, reg_info-&gt;alpha2, REG_ALPHA2_LEN + 1);</div><div class='add'>+	alpha2[2] = '\0';</div><div class='add'>+	new_regd-&gt;dfs_region = ath12k_map_fw_dfs_region(reg_info-&gt;dfs_region);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_REG,</div><div class='add'>+		   "\r\nCountry %s, CFG Regdomain %s FW Regdomain %d, num_reg_rules %d\n",</div><div class='add'>+		   alpha2, ath12k_reg_get_regdom_str(new_regd-&gt;dfs_region),</div><div class='add'>+		   reg_info-&gt;dfs_region, num_rules);</div><div class='add'>+</div><div class='add'>+	/* Reset start and end frequency for each band</div><div class='add'>+	 */</div><div class='add'>+	ab-&gt;reg_freq_5ghz.start_freq = INT_MAX;</div><div class='add'>+	ab-&gt;reg_freq_5ghz.end_freq = 0;</div><div class='add'>+	ab-&gt;reg_freq_2ghz.start_freq = INT_MAX;</div><div class='add'>+	ab-&gt;reg_freq_2ghz.end_freq = 0;</div><div class='add'>+	ab-&gt;reg_freq_6ghz.start_freq = INT_MAX;</div><div class='add'>+	ab-&gt;reg_freq_6ghz.end_freq = 0;</div><div class='add'>+</div><div class='add'>+	/* Update reg_rules[] below. Firmware is expected to</div><div class='add'>+	 * send these rules in order(2G rules first and then 5G)</div><div class='add'>+	 */</div><div class='add'>+	for (; i &lt; num_rules; i++) {</div><div class='add'>+		if (reg_info-&gt;num_2g_reg_rules &amp;&amp;</div><div class='add'>+		    (i &lt; reg_info-&gt;num_2g_reg_rules)) {</div><div class='add'>+			reg_rule = reg_info-&gt;reg_rules_2g_ptr + i;</div><div class='add'>+			max_bw = min_t(u16, reg_rule-&gt;max_bw,</div><div class='add'>+				       reg_info-&gt;max_bw_2g);</div><div class='add'>+			flags = ath12k_get_bw_reg_flags(reg_info-&gt;max_bw_2g);</div><div class='add'>+			ath12k_reg_update_freq_range(&amp;ab-&gt;reg_freq_2ghz, reg_rule);</div><div class='add'>+		} else if (reg_info-&gt;num_5g_reg_rules &amp;&amp;</div><div class='add'>+			   (j &lt; reg_info-&gt;num_5g_reg_rules)) {</div><div class='add'>+			reg_rule = reg_info-&gt;reg_rules_5g_ptr + j++;</div><div class='add'>+			max_bw = min_t(u16, reg_rule-&gt;max_bw,</div><div class='add'>+				       reg_info-&gt;max_bw_5g);</div><div class='add'>+</div><div class='add'>+			/* FW doesn't pass NL80211_RRF_AUTO_BW flag for</div><div class='add'>+			 * BW Auto correction, we can enable this by default</div><div class='add'>+			 * for all 5G rules here. The regulatory core performs</div><div class='add'>+			 * BW correction if required and applies flags as</div><div class='add'>+			 * per other BW rule flags we pass from here</div><div class='add'>+			 */</div><div class='add'>+			flags = NL80211_RRF_AUTO_BW |</div><div class='add'>+				ath12k_get_bw_reg_flags(reg_info-&gt;max_bw_5g);</div><div class='add'>+			ath12k_reg_update_freq_range(&amp;ab-&gt;reg_freq_5ghz, reg_rule);</div><div class='add'>+		} else if (reg_info-&gt;is_ext_reg_event &amp;&amp; reg_6ghz_number &amp;&amp;</div><div class='add'>+			   (k &lt; reg_6ghz_number)) {</div><div class='add'>+			reg_rule = reg_rule_6ghz + k++;</div><div class='add'>+			max_bw = min_t(u16, reg_rule-&gt;max_bw, max_bw_6ghz);</div><div class='add'>+			flags = NL80211_RRF_AUTO_BW |</div><div class='add'>+				ath12k_get_bw_reg_flags(max_bw_6ghz);</div><div class='add'>+			if (reg_rule-&gt;psd_flag)</div><div class='add'>+				flags |= NL80211_RRF_PSD;</div><div class='add'>+			ath12k_reg_update_freq_range(&amp;ab-&gt;reg_freq_6ghz, reg_rule);</div><div class='add'>+		} else {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		flags |= ath12k_map_fw_reg_flags(reg_rule-&gt;flags);</div><div class='add'>+		flags |= ath12k_map_fw_phy_flags(reg_info-&gt;phybitmap);</div><div class='add'>+</div><div class='add'>+		ath12k_reg_update_rule(new_regd-&gt;reg_rules + i,</div><div class='add'>+				       reg_rule-&gt;start_freq,</div><div class='add'>+				       reg_rule-&gt;end_freq, max_bw,</div><div class='add'>+				       reg_rule-&gt;ant_gain, reg_rule-&gt;reg_power,</div><div class='add'>+				       reg_rule-&gt;psd_eirp, flags);</div><div class='add'>+</div><div class='add'>+		/* Update dfs cac timeout if the dfs domain is ETSI and the</div><div class='add'>+		 * new rule covers weather radar band.</div><div class='add'>+		 * Default value of '0' corresponds to 60s timeout, so no</div><div class='add'>+		 * need to update that for other rules.</div><div class='add'>+		 */</div><div class='add'>+		if (flags &amp; NL80211_RRF_DFS &amp;&amp;</div><div class='add'>+		    reg_info-&gt;dfs_region == ATH12K_DFS_REG_ETSI &amp;&amp;</div><div class='add'>+		    (reg_rule-&gt;end_freq &gt; ETSI_WEATHER_RADAR_BAND_LOW &amp;&amp;</div><div class='add'>+		    reg_rule-&gt;start_freq &lt; ETSI_WEATHER_RADAR_BAND_HIGH)){</div><div class='add'>+			ath12k_reg_update_weather_radar_band(ab, new_regd,</div><div class='add'>+							     reg_rule, &amp;i,</div><div class='add'>+							     flags, max_bw);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (reg_info-&gt;is_ext_reg_event) {</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_REG, "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d) (%d, %d)\n",</div><div class='add'>+				   i + 1, reg_rule-&gt;start_freq, reg_rule-&gt;end_freq,</div><div class='add'>+				   max_bw, reg_rule-&gt;ant_gain, reg_rule-&gt;reg_power,</div><div class='add'>+				   new_regd-&gt;reg_rules[i].dfs_cac_ms,</div><div class='add'>+				   flags, reg_rule-&gt;psd_flag, reg_rule-&gt;psd_eirp);</div><div class='add'>+		} else {</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_REG,</div><div class='add'>+				   "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n",</div><div class='add'>+				   i + 1, reg_rule-&gt;start_freq, reg_rule-&gt;end_freq,</div><div class='add'>+				   max_bw, reg_rule-&gt;ant_gain, reg_rule-&gt;reg_power,</div><div class='add'>+				   new_regd-&gt;reg_rules[i].dfs_cac_ms,</div><div class='add'>+				   flags);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	new_regd-&gt;n_reg_rules = i;</div><div class='add'>+ret:</div><div class='add'>+	return new_regd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_regd_update_chan_list_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = container_of(work, struct ath12k,</div><div class='add'>+					 regd_channel_update_work);</div><div class='add'>+	struct ath12k_wmi_scan_chan_list_arg *arg;</div><div class='add'>+	struct list_head local_update_list;</div><div class='add'>+	int left;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;local_update_list);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	list_splice_tail_init(&amp;ar-&gt;regd_channel_update_queue, &amp;local_update_list);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	while ((arg = list_first_entry_or_null(&amp;local_update_list,</div><div class='add'>+					       struct ath12k_wmi_scan_chan_list_arg,</div><div class='add'>+					       list))) {</div><div class='add'>+		if (ar-&gt;state_11d != ATH12K_11D_IDLE) {</div><div class='add'>+			left = wait_for_completion_timeout(&amp;ar-&gt;completed_11d_scan,</div><div class='add'>+							   ATH12K_SCAN_TIMEOUT_HZ);</div><div class='add'>+			if (!left) {</div><div class='add'>+				ath12k_dbg(ar-&gt;ab, ATH12K_DBG_REG,</div><div class='add'>+					   "failed to receive 11d scan complete: timed out\n");</div><div class='add'>+				ar-&gt;state_11d = ATH12K_11D_IDLE;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ath12k_dbg(ar-&gt;ab, ATH12K_DBG_REG,</div><div class='add'>+				   "reg 11d scan wait left time %d\n", left);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((ar-&gt;scan.state == ATH12K_SCAN_STARTING ||</div><div class='add'>+		     ar-&gt;scan.state == ATH12K_SCAN_RUNNING)) {</div><div class='add'>+			left = wait_for_completion_timeout(&amp;ar-&gt;scan.completed,</div><div class='add'>+							   ATH12K_SCAN_TIMEOUT_HZ);</div><div class='add'>+			if (!left)</div><div class='add'>+				ath12k_dbg(ar-&gt;ab, ATH12K_DBG_REG,</div><div class='add'>+					   "failed to receive hw scan complete: timed out\n");</div><div class='add'>+</div><div class='add'>+			ath12k_dbg(ar-&gt;ab, ATH12K_DBG_REG,</div><div class='add'>+				   "reg hw scan wait left time %d\n", left);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath12k_wmi_send_scan_chan_list_cmd(ar, arg);</div><div class='add'>+		list_del(&amp;arg-&gt;list);</div><div class='add'>+		kfree(arg);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_regd_update_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = container_of(work, struct ath12k,</div><div class='add'>+					 regd_update_work);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_regd_update(ar, false);</div><div class='add'>+	if (ret) {</div><div class='add'>+		/* Firmware has already moved to the new regd. We need</div><div class='add'>+		 * to maintain channel consistency across FW, Host driver</div><div class='add'>+		 * and userspace. Hence as a fallback mechanism we can set</div><div class='add'>+		 * the prev or default country code to the firmware.</div><div class='add'>+		 */</div><div class='add'>+		/* TODO: Implement Fallback Mechanism */</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_reg_reset_reg_info(struct ath12k_reg_info *reg_info)</div><div class='add'>+{</div><div class='add'>+	u8 i, j;</div><div class='add'>+</div><div class='add'>+	if (!reg_info)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	kfree(reg_info-&gt;reg_rules_2g_ptr);</div><div class='add'>+	kfree(reg_info-&gt;reg_rules_5g_ptr);</div><div class='add'>+</div><div class='add'>+	if (reg_info-&gt;is_ext_reg_event) {</div><div class='add'>+		for (i = 0; i &lt; WMI_REG_CURRENT_MAX_AP_TYPE; i++) {</div><div class='add'>+			kfree(reg_info-&gt;reg_rules_6g_ap_ptr[i]);</div><div class='add'>+</div><div class='add'>+			for (j = 0; j &lt; WMI_REG_MAX_CLIENT_TYPE; j++)</div><div class='add'>+				kfree(reg_info-&gt;reg_rules_6g_client_ptr[i][j]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum ath12k_reg_status ath12k_reg_validate_reg_info(struct ath12k_base *ab,</div><div class='add'>+						    struct ath12k_reg_info *reg_info)</div><div class='add'>+{</div><div class='add'>+	int pdev_idx = reg_info-&gt;phy_id;</div><div class='add'>+</div><div class='add'>+	if (reg_info-&gt;status_code != REG_SET_CC_STATUS_PASS) {</div><div class='add'>+		/* In case of failure to set the requested country,</div><div class='add'>+		 * firmware retains the current regd. We print a failure info</div><div class='add'>+		 * and return from here.</div><div class='add'>+		 */</div><div class='add'>+		ath12k_warn(ab, "Failed to set the requested Country regulatory setting\n");</div><div class='add'>+		return ATH12K_REG_STATUS_DROP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pdev_idx &gt;= ab-&gt;num_radios) {</div><div class='add'>+		/* Process the event for phy0 only if single_pdev_only</div><div class='add'>+		 * is true. If pdev_idx is valid but not 0, discard the</div><div class='add'>+		 * event. Otherwise, it goes to fallback.</div><div class='add'>+		 */</div><div class='add'>+		if (ab-&gt;hw_params-&gt;single_pdev_only &amp;&amp;</div><div class='add'>+		    pdev_idx &lt; ab-&gt;hw_params-&gt;num_rxdma_per_pdev)</div><div class='add'>+			return ATH12K_REG_STATUS_DROP;</div><div class='add'>+		else</div><div class='add'>+			return ATH12K_REG_STATUS_FALLBACK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Avoid multiple overwrites to default regd, during core</div><div class='add'>+	 * stop-start after mac registration.</div><div class='add'>+	 */</div><div class='add'>+	if (ab-&gt;default_regd[pdev_idx] &amp;&amp; !ab-&gt;new_regd[pdev_idx] &amp;&amp;</div><div class='add'>+	    !memcmp(ab-&gt;default_regd[pdev_idx]-&gt;alpha2,</div><div class='add'>+		    reg_info-&gt;alpha2, 2))</div><div class='add'>+		return ATH12K_REG_STATUS_DROP;</div><div class='add'>+</div><div class='add'>+	return ATH12K_REG_STATUS_VALID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_reg_handle_chan_list(struct ath12k_base *ab,</div><div class='add'>+				struct ath12k_reg_info *reg_info,</div><div class='add'>+				enum wmi_vdev_type vdev_type,</div><div class='add'>+				enum ieee80211_ap_reg_power power_type)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_regdomain *regd = NULL;</div><div class='add'>+	int pdev_idx = reg_info-&gt;phy_id;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+</div><div class='add'>+	regd = ath12k_reg_build_regd(ab, reg_info, vdev_type, power_type);</div><div class='add'>+	if (!regd)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	if (test_bit(ATH12K_FLAG_REGISTERED, &amp;ab-&gt;dev_flags)) {</div><div class='add'>+		/* Once mac is registered, ar is valid and all CC events from</div><div class='add'>+		 * firmware is considered to be received due to user requests</div><div class='add'>+		 * currently.</div><div class='add'>+		 * Free previously built regd before assigning the newly</div><div class='add'>+		 * generated regd to ar. NULL pointer handling will be</div><div class='add'>+		 * taken care by kfree itself.</div><div class='add'>+		 */</div><div class='add'>+		ar = ab-&gt;pdevs[pdev_idx].ar;</div><div class='add'>+		kfree(ab-&gt;new_regd[pdev_idx]);</div><div class='add'>+		ab-&gt;new_regd[pdev_idx] = regd;</div><div class='add'>+		queue_work(ab-&gt;workqueue, &amp;ar-&gt;regd_update_work);</div><div class='add'>+	} else {</div><div class='add'>+		/* Multiple events for the same *ar is not expected. But we</div><div class='add'>+		 * can still clear any previously stored default_regd if we</div><div class='add'>+		 * are receiving this event for the same radio by mistake.</div><div class='add'>+		 * NULL pointer handling will be taken care by kfree itself.</div><div class='add'>+		 */</div><div class='add'>+		kfree(ab-&gt;default_regd[pdev_idx]);</div><div class='add'>+		/* This regd would be applied during mac registration */</div><div class='add'>+		ab-&gt;default_regd[pdev_idx] = regd;</div><div class='add'>+	}</div><div class='add'>+	ab-&gt;dfs_region = reg_info-&gt;dfs_region;</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_reg_init(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	hw-&gt;wiphy-&gt;regulatory_flags = REGULATORY_WIPHY_SELF_MANAGED;</div><div class='add'>+	hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_NOTIFY_REGDOM_BY_DRIVER;</div><div class='add'>+	hw-&gt;wiphy-&gt;reg_notifier = ath12k_reg_notifier;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_reg_free(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ab-&gt;core_lock);</div><div class='add'>+	for (i = 0; i &lt; MAX_RADIOS; i++) {</div><div class='add'>+		ath12k_reg_reset_reg_info(ab-&gt;reg_info[i]);</div><div class='add'>+		kfree(ab-&gt;reg_info[i]);</div><div class='add'>+		ab-&gt;reg_info[i] = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;hw_params-&gt;max_radios; i++) {</div><div class='add'>+		kfree(ab-&gt;default_regd[i]);</div><div class='add'>+		kfree(ab-&gt;new_regd[i]);</div><div class='add'>+		ab-&gt;default_regd[i] = NULL;</div><div class='add'>+		ab-&gt;new_regd[i] = NULL;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;ab-&gt;core_lock);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/reg.h b/drivers/net/wireless/ath/ath12k/reg.h<br/>new file mode 100644<br/>index 000000000000..da5128b8c97f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/reg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/reg.h</a></div><div class='hunk'>@@ -0,0 +1,123 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH12K_REG_H</div><div class='add'>+#define ATH12K_REG_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;net/regulatory.h&gt;</div><div class='add'>+</div><div class='add'>+struct ath12k_base;</div><div class='add'>+struct ath12k;</div><div class='add'>+</div><div class='add'>+#define ATH12K_REG_UPDATE_TIMEOUT_HZ	(3 * HZ)</div><div class='add'>+</div><div class='add'>+#define ATH12K_2GHZ_MAX_FREQUENCY	2495</div><div class='add'>+#define ATH12K_5GHZ_MAX_FREQUENCY	5920</div><div class='add'>+</div><div class='add'>+/* DFS regdomains supported by Firmware */</div><div class='add'>+enum ath12k_dfs_region {</div><div class='add'>+	ATH12K_DFS_REG_UNSET,</div><div class='add'>+	ATH12K_DFS_REG_FCC,</div><div class='add'>+	ATH12K_DFS_REG_ETSI,</div><div class='add'>+	ATH12K_DFS_REG_MKK,</div><div class='add'>+	ATH12K_DFS_REG_CN,</div><div class='add'>+	ATH12K_DFS_REG_KR,</div><div class='add'>+	ATH12K_DFS_REG_MKK_N,</div><div class='add'>+	ATH12K_DFS_REG_UNDEF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_reg_cc_code {</div><div class='add'>+	REG_SET_CC_STATUS_PASS = 0,</div><div class='add'>+	REG_CURRENT_ALPHA2_NOT_FOUND = 1,</div><div class='add'>+	REG_INIT_ALPHA2_NOT_FOUND = 2,</div><div class='add'>+	REG_SET_CC_CHANGE_NOT_ALLOWED = 3,</div><div class='add'>+	REG_SET_CC_STATUS_NO_MEMORY = 4,</div><div class='add'>+	REG_SET_CC_STATUS_FAIL = 5,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_reg_rule {</div><div class='add'>+	u16 start_freq;</div><div class='add'>+	u16 end_freq;</div><div class='add'>+	u16 max_bw;</div><div class='add'>+	u8 reg_power;</div><div class='add'>+	u8 ant_gain;</div><div class='add'>+	u16 flags;</div><div class='add'>+	bool psd_flag;</div><div class='add'>+	u16 psd_eirp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_reg_info {</div><div class='add'>+	enum ath12k_reg_cc_code status_code;</div><div class='add'>+	u8 num_phy;</div><div class='add'>+	u8 phy_id;</div><div class='add'>+	u16 reg_dmn_pair;</div><div class='add'>+	u16 ctry_code;</div><div class='add'>+	u8 alpha2[REG_ALPHA2_LEN + 1];</div><div class='add'>+	u32 dfs_region;</div><div class='add'>+	u32 phybitmap;</div><div class='add'>+	bool is_ext_reg_event;</div><div class='add'>+	u32 min_bw_2g;</div><div class='add'>+	u32 max_bw_2g;</div><div class='add'>+	u32 min_bw_5g;</div><div class='add'>+	u32 max_bw_5g;</div><div class='add'>+	u32 num_2g_reg_rules;</div><div class='add'>+	u32 num_5g_reg_rules;</div><div class='add'>+	struct ath12k_reg_rule *reg_rules_2g_ptr;</div><div class='add'>+	struct ath12k_reg_rule *reg_rules_5g_ptr;</div><div class='add'>+	enum wmi_reg_6g_client_type client_type;</div><div class='add'>+	bool rnr_tpe_usable;</div><div class='add'>+	bool unspecified_ap_usable;</div><div class='add'>+	/* TODO: All 6G related info can be stored only for required</div><div class='add'>+	 * combination instead of all types, to optimize memory usage.</div><div class='add'>+	 */</div><div class='add'>+	u8 domain_code_6g_ap[WMI_REG_CURRENT_MAX_AP_TYPE];</div><div class='add'>+	u8 domain_code_6g_client[WMI_REG_CURRENT_MAX_AP_TYPE][WMI_REG_MAX_CLIENT_TYPE];</div><div class='add'>+	u32 domain_code_6g_super_id;</div><div class='add'>+	u32 min_bw_6g_ap[WMI_REG_CURRENT_MAX_AP_TYPE];</div><div class='add'>+	u32 max_bw_6g_ap[WMI_REG_CURRENT_MAX_AP_TYPE];</div><div class='add'>+	u32 min_bw_6g_client[WMI_REG_CURRENT_MAX_AP_TYPE][WMI_REG_MAX_CLIENT_TYPE];</div><div class='add'>+	u32 max_bw_6g_client[WMI_REG_CURRENT_MAX_AP_TYPE][WMI_REG_MAX_CLIENT_TYPE];</div><div class='add'>+	u32 num_6g_reg_rules_ap[WMI_REG_CURRENT_MAX_AP_TYPE];</div><div class='add'>+	u32 num_6g_reg_rules_cl[WMI_REG_CURRENT_MAX_AP_TYPE][WMI_REG_MAX_CLIENT_TYPE];</div><div class='add'>+	struct ath12k_reg_rule *reg_rules_6g_ap_ptr[WMI_REG_CURRENT_MAX_AP_TYPE];</div><div class='add'>+	struct ath12k_reg_rule *reg_rules_6g_client_ptr</div><div class='add'>+		[WMI_REG_CURRENT_MAX_AP_TYPE][WMI_REG_MAX_CLIENT_TYPE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Phy bitmaps */</div><div class='add'>+enum ath12k_reg_phy_bitmap {</div><div class='add'>+	ATH12K_REG_PHY_BITMAP_NO11AX	= BIT(5),</div><div class='add'>+	ATH12K_REG_PHY_BITMAP_NO11BE	= BIT(6),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_reg_status {</div><div class='add'>+	ATH12K_REG_STATUS_VALID,</div><div class='add'>+	ATH12K_REG_STATUS_DROP,</div><div class='add'>+	ATH12K_REG_STATUS_FALLBACK,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath12k_reg_init(struct ieee80211_hw *hw);</div><div class='add'>+void ath12k_reg_free(struct ath12k_base *ab);</div><div class='add'>+void ath12k_regd_update_work(struct work_struct *work);</div><div class='add'>+struct ieee80211_regdomain *ath12k_reg_build_regd(struct ath12k_base *ab,</div><div class='add'>+						  struct ath12k_reg_info *reg_info,</div><div class='add'>+						  enum wmi_vdev_type vdev_type,</div><div class='add'>+						  enum ieee80211_ap_reg_power power_type);</div><div class='add'>+int ath12k_regd_update(struct ath12k *ar, bool init);</div><div class='add'>+int ath12k_reg_update_chan_list(struct ath12k *ar, bool wait);</div><div class='add'>+</div><div class='add'>+void ath12k_reg_reset_reg_info(struct ath12k_reg_info *reg_info);</div><div class='add'>+int ath12k_reg_handle_chan_list(struct ath12k_base *ab,</div><div class='add'>+				struct ath12k_reg_info *reg_info,</div><div class='add'>+				enum wmi_vdev_type vdev_type,</div><div class='add'>+				enum ieee80211_ap_reg_power power_type);</div><div class='add'>+void ath12k_regd_update_chan_list_work(struct work_struct *work);</div><div class='add'>+enum wmi_reg_6g_ap_type</div><div class='add'>+ath12k_reg_ap_pwr_convert(enum ieee80211_ap_reg_power power_type);</div><div class='add'>+enum ath12k_reg_status ath12k_reg_validate_reg_info(struct ath12k_base *ab,</div><div class='add'>+						    struct ath12k_reg_info *reg_info);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/rx_desc.h b/drivers/net/wireless/ath/ath12k/rx_desc.h<br/>new file mode 100644<br/>index 000000000000..6c600473b402<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/rx_desc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/rx_desc.h</a></div><div class='hunk'>@@ -0,0 +1,1544 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+#ifndef ATH12K_RX_DESC_H</div><div class='add'>+#define ATH12K_RX_DESC_H</div><div class='add'>+</div><div class='add'>+enum rx_desc_decap_type {</div><div class='add'>+	RX_DESC_DECAP_TYPE_RAW,</div><div class='add'>+	RX_DESC_DECAP_TYPE_NATIVE_WIFI,</div><div class='add'>+	RX_DESC_DECAP_TYPE_ETHERNET2_DIX,</div><div class='add'>+	RX_DESC_DECAP_TYPE_8023,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rx_desc_decrypt_status_code {</div><div class='add'>+	RX_DESC_DECRYPT_STATUS_CODE_OK,</div><div class='add'>+	RX_DESC_DECRYPT_STATUS_CODE_UNPROTECTED_FRAME,</div><div class='add'>+	RX_DESC_DECRYPT_STATUS_CODE_DATA_ERR,</div><div class='add'>+	RX_DESC_DECRYPT_STATUS_CODE_KEY_INVALID,</div><div class='add'>+	RX_DESC_DECRYPT_STATUS_CODE_PEER_ENTRY_INVALID,</div><div class='add'>+	RX_DESC_DECRYPT_STATUS_CODE_OTHER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RX_MPDU_START_INFO0_REO_DEST_IND		GENMASK(4, 0)</div><div class='add'>+#define RX_MPDU_START_INFO0_LMAC_PEER_ID_MSB		GENMASK(6, 5)</div><div class='add'>+#define RX_MPDU_START_INFO0_FLOW_ID_TOEPLITZ		BIT(7)</div><div class='add'>+#define RX_MPDU_START_INFO0_PKT_SEL_FP_UCAST_DATA	BIT(8)</div><div class='add'>+#define RX_MPDU_START_INFO0_PKT_SEL_FP_MCAST_DATA	BIT(9)</div><div class='add'>+#define RX_MPDU_START_INFO0_PKT_SEL_FP_CTRL_BAR		BIT(10)</div><div class='add'>+#define RX_MPDU_START_INFO0_RXDMA0_SRC_RING_SEL		GENMASK(13, 11)</div><div class='add'>+#define RX_MPDU_START_INFO0_RXDMA0_DST_RING_SEL		GENMASK(16, 14)</div><div class='add'>+#define RX_MPDU_START_INFO0_MCAST_ECHO_DROP_EN		BIT(17)</div><div class='add'>+#define RX_MPDU_START_INFO0_WDS_LEARN_DETECT_EN		BIT(18)</div><div class='add'>+#define RX_MPDU_START_INFO0_INTRA_BSS_CHECK_EN		BIT(19)</div><div class='add'>+#define RX_MPDU_START_INFO0_USE_PPE			BIT(20)</div><div class='add'>+#define RX_MPDU_START_INFO0_PPE_ROUTING_EN		BIT(21)</div><div class='add'>+</div><div class='add'>+#define RX_MPDU_START_INFO1_REO_QUEUE_DESC_HI		GENMASK(7, 0)</div><div class='add'>+#define RX_MPDU_START_INFO1_RECV_QUEUE_NUM		GENMASK(23, 8)</div><div class='add'>+#define RX_MPDU_START_INFO1_PRE_DELIM_ERR_WARN		BIT(24)</div><div class='add'>+#define RX_MPDU_START_INFO1_FIRST_DELIM_ERR		BIT(25)</div><div class='add'>+</div><div class='add'>+#define RX_MPDU_START_INFO2_EPD_EN			BIT(0)</div><div class='add'>+#define RX_MPDU_START_INFO2_ALL_FRAME_ENCPD		BIT(1)</div><div class='add'>+#define RX_MPDU_START_INFO2_ENC_TYPE			GENMASK(5, 2)</div><div class='add'>+#define RX_MPDU_START_INFO2_VAR_WEP_KEY_WIDTH		GENMASK(7, 6)</div><div class='add'>+#define RX_MPDU_START_INFO2_MESH_STA			GENMASK(9, 8)</div><div class='add'>+#define RX_MPDU_START_INFO2_BSSID_HIT			BIT(10)</div><div class='add'>+#define RX_MPDU_START_INFO2_BSSID_NUM			GENMASK(14, 11)</div><div class='add'>+#define RX_MPDU_START_INFO2_TID				GENMASK(18, 15)</div><div class='add'>+</div><div class='add'>+#define RX_MPDU_START_INFO3_RXPCU_MPDU_FLTR		GENMASK(1, 0)</div><div class='add'>+#define RX_MPDU_START_INFO3_SW_FRAME_GRP_ID		GENMASK(8, 2)</div><div class='add'>+#define RX_MPDU_START_INFO3_NDP_FRAME			BIT(9)</div><div class='add'>+#define RX_MPDU_START_INFO3_PHY_ERR			BIT(10)</div><div class='add'>+#define RX_MPDU_START_INFO3_PHY_ERR_MPDU_HDR		BIT(11)</div><div class='add'>+#define RX_MPDU_START_INFO3_PROTO_VER_ERR		BIT(12)</div><div class='add'>+#define RX_MPDU_START_INFO3_AST_LOOKUP_VALID		BIT(13)</div><div class='add'>+#define RX_MPDU_START_INFO3_RANGING			BIT(14)</div><div class='add'>+</div><div class='add'>+#define RX_MPDU_START_INFO4_MPDU_FCTRL_VALID		BIT(0)</div><div class='add'>+#define RX_MPDU_START_INFO4_MPDU_DUR_VALID		BIT(1)</div><div class='add'>+#define RX_MPDU_START_INFO4_MAC_ADDR1_VALID		BIT(2)</div><div class='add'>+#define RX_MPDU_START_INFO4_MAC_ADDR2_VALID		BIT(3)</div><div class='add'>+#define RX_MPDU_START_INFO4_MAC_ADDR3_VALID		BIT(4)</div><div class='add'>+#define RX_MPDU_START_INFO4_MAC_ADDR4_VALID		BIT(5)</div><div class='add'>+#define RX_MPDU_START_INFO4_MPDU_SEQ_CTRL_VALID		BIT(6)</div><div class='add'>+#define RX_MPDU_START_INFO4_MPDU_QOS_CTRL_VALID		BIT(7)</div><div class='add'>+#define RX_MPDU_START_INFO4_MPDU_HT_CTRL_VALID		BIT(8)</div><div class='add'>+#define RX_MPDU_START_INFO4_ENCRYPT_INFO_VALID		BIT(9)</div><div class='add'>+#define RX_MPDU_START_INFO4_MPDU_FRAG_NUMBER		GENMASK(13, 10)</div><div class='add'>+#define RX_MPDU_START_INFO4_MORE_FRAG_FLAG		BIT(14)</div><div class='add'>+#define RX_MPDU_START_INFO4_FROM_DS			BIT(16)</div><div class='add'>+#define RX_MPDU_START_INFO4_TO_DS			BIT(17)</div><div class='add'>+#define RX_MPDU_START_INFO4_ENCRYPTED			BIT(18)</div><div class='add'>+#define RX_MPDU_START_INFO4_MPDU_RETRY			BIT(19)</div><div class='add'>+#define RX_MPDU_START_INFO4_MPDU_SEQ_NUM		GENMASK(31, 20)</div><div class='add'>+</div><div class='add'>+#define RX_MPDU_START_INFO5_KEY_ID			GENMASK(7, 0)</div><div class='add'>+#define RX_MPDU_START_INFO5_NEW_PEER_ENTRY		BIT(8)</div><div class='add'>+#define RX_MPDU_START_INFO5_DECRYPT_NEEDED		BIT(9)</div><div class='add'>+#define RX_MPDU_START_INFO5_DECAP_TYPE			GENMASK(11, 10)</div><div class='add'>+#define RX_MPDU_START_INFO5_VLAN_TAG_C_PADDING		BIT(12)</div><div class='add'>+#define RX_MPDU_START_INFO5_VLAN_TAG_S_PADDING		BIT(13)</div><div class='add'>+#define RX_MPDU_START_INFO5_STRIP_VLAN_TAG_C		BIT(14)</div><div class='add'>+#define RX_MPDU_START_INFO5_STRIP_VLAN_TAG_S		BIT(15)</div><div class='add'>+#define RX_MPDU_START_INFO5_PRE_DELIM_COUNT		GENMASK(27, 16)</div><div class='add'>+#define RX_MPDU_START_INFO5_AMPDU_FLAG			BIT(28)</div><div class='add'>+#define RX_MPDU_START_INFO5_BAR_FRAME			BIT(29)</div><div class='add'>+#define RX_MPDU_START_INFO5_RAW_MPDU			BIT(30)</div><div class='add'>+</div><div class='add'>+#define RX_MPDU_START_INFO6_MPDU_LEN			GENMASK(13, 0)</div><div class='add'>+#define RX_MPDU_START_INFO6_FIRST_MPDU			BIT(14)</div><div class='add'>+#define RX_MPDU_START_INFO6_MCAST_BCAST			BIT(15)</div><div class='add'>+#define RX_MPDU_START_INFO6_AST_IDX_NOT_FOUND		BIT(16)</div><div class='add'>+#define RX_MPDU_START_INFO6_AST_IDX_TIMEOUT		BIT(17)</div><div class='add'>+#define RX_MPDU_START_INFO6_POWER_MGMT			BIT(18)</div><div class='add'>+#define RX_MPDU_START_INFO6_NON_QOS			BIT(19)</div><div class='add'>+#define RX_MPDU_START_INFO6_NULL_DATA			BIT(20)</div><div class='add'>+#define RX_MPDU_START_INFO6_MGMT_TYPE			BIT(21)</div><div class='add'>+#define RX_MPDU_START_INFO6_CTRL_TYPE			BIT(22)</div><div class='add'>+#define RX_MPDU_START_INFO6_MORE_DATA			BIT(23)</div><div class='add'>+#define RX_MPDU_START_INFO6_EOSP			BIT(24)</div><div class='add'>+#define RX_MPDU_START_INFO6_FRAGMENT			BIT(25)</div><div class='add'>+#define RX_MPDU_START_INFO6_ORDER			BIT(26)</div><div class='add'>+#define RX_MPDU_START_INFO6_UAPSD_TRIGGER		BIT(27)</div><div class='add'>+#define RX_MPDU_START_INFO6_ENCRYPT_REQUIRED		BIT(28)</div><div class='add'>+#define RX_MPDU_START_INFO6_DIRECTED			BIT(29)</div><div class='add'>+#define RX_MPDU_START_INFO6_AMSDU_PRESENT		BIT(30)</div><div class='add'>+</div><div class='add'>+#define RX_MPDU_START_INFO7_VDEV_ID			GENMASK(7, 0)</div><div class='add'>+#define RX_MPDU_START_INFO7_SERVICE_CODE		GENMASK(16, 8)</div><div class='add'>+#define RX_MPDU_START_INFO7_PRIORITY_VALID		BIT(17)</div><div class='add'>+#define RX_MPDU_START_INFO7_SRC_INFO			GENMASK(29, 18)</div><div class='add'>+</div><div class='add'>+#define RX_MPDU_START_INFO8_AUTH_TO_SEND_WDS		BIT(0)</div><div class='add'>+</div><div class='add'>+struct rx_mpdu_start_qcn9274 {</div><div class='add'>+	__le32 info0;</div><div class='add'>+	__le32 reo_queue_desc_lo;</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 pn[4];</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le32 peer_meta_data;</div><div class='add'>+	__le16 info3;</div><div class='add'>+	__le16 phy_ppdu_id;</div><div class='add'>+	__le16 ast_index;</div><div class='add'>+	__le16 sw_peer_id;</div><div class='add'>+	__le32 info4;</div><div class='add'>+	__le32 info5;</div><div class='add'>+	__le32 info6;</div><div class='add'>+	__le16 frame_ctrl;</div><div class='add'>+	__le16 duration;</div><div class='add'>+	u8 addr1[ETH_ALEN];</div><div class='add'>+	u8 addr2[ETH_ALEN];</div><div class='add'>+	u8 addr3[ETH_ALEN];</div><div class='add'>+	__le16 seq_ctrl;</div><div class='add'>+	u8 addr4[ETH_ALEN];</div><div class='add'>+	__le16 qos_ctrl;</div><div class='add'>+	__le32 ht_ctrl;</div><div class='add'>+	__le32 info7;</div><div class='add'>+	u8 multi_link_addr1[ETH_ALEN];</div><div class='add'>+	u8 multi_link_addr2[ETH_ALEN];</div><div class='add'>+	__le32 info8;</div><div class='add'>+	__le32 res0;</div><div class='add'>+	__le32 res1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define QCN9274_MPDU_START_SELECT_MPDU_START_TAG			BIT(0)</div><div class='add'>+#define QCN9274_MPDU_START_SELECT_INFO0_REO_QUEUE_DESC_LO		BIT(1)</div><div class='add'>+#define QCN9274_MPDU_START_SELECT_INFO1_PN_31_0				BIT(2)</div><div class='add'>+#define QCN9274_MPDU_START_SELECT_PN_95_32				BIT(3)</div><div class='add'>+#define QCN9274_MPDU_START_SELECT_PN_127_96_INFO2			BIT(4)</div><div class='add'>+#define QCN9274_MPDU_START_SELECT_PEER_MDATA_INFO3_PHY_PPDU_ID		BIT(5)</div><div class='add'>+#define QCN9274_MPDU_START_SELECT_AST_IDX_SW_PEER_ID_INFO4		BIT(6)</div><div class='add'>+#define QCN9274_MPDU_START_SELECT_INFO5_INFO6				BIT(7)</div><div class='add'>+#define QCN9274_MPDU_START_SELECT_FRAME_CTRL_DURATION_ADDR1_31_0	BIT(8)</div><div class='add'>+#define QCN9274_MPDU_START_SELECT_ADDR2_47_0_ADDR1_47_32		BIT(9)</div><div class='add'>+#define QCN9274_MPDU_START_SELECT_ADDR3_47_0_SEQ_CTRL			BIT(10)</div><div class='add'>+#define QCN9274_MPDU_START_SELECT_ADDR4_47_0_QOS_CTRL			BIT(11)</div><div class='add'>+#define QCN9274_MPDU_START_SELECT_HT_CTRL_INFO7				BIT(12)</div><div class='add'>+#define QCN9274_MPDU_START_SELECT_ML_ADDR1_47_0_ML_ADDR2_15_0		BIT(13)</div><div class='add'>+#define QCN9274_MPDU_START_SELECT_ML_ADDR2_47_16_INFO8			BIT(14)</div><div class='add'>+#define QCN9274_MPDU_START_SELECT_RES_0_RES_1				BIT(15)</div><div class='add'>+</div><div class='add'>+#define QCN9274_MPDU_START_WMASK (QCN9274_MPDU_START_SELECT_INFO1_PN_31_0 |	\</div><div class='add'>+		QCN9274_MPDU_START_SELECT_PN_95_32 |				\</div><div class='add'>+		QCN9274_MPDU_START_SELECT_PN_127_96_INFO2 |			\</div><div class='add'>+		QCN9274_MPDU_START_SELECT_PEER_MDATA_INFO3_PHY_PPDU_ID |	\</div><div class='add'>+		QCN9274_MPDU_START_SELECT_AST_IDX_SW_PEER_ID_INFO4 |		\</div><div class='add'>+		QCN9274_MPDU_START_SELECT_INFO5_INFO6 |				\</div><div class='add'>+		QCN9274_MPDU_START_SELECT_FRAME_CTRL_DURATION_ADDR1_31_0 |	\</div><div class='add'>+		QCN9274_MPDU_START_SELECT_ADDR2_47_0_ADDR1_47_32 |		\</div><div class='add'>+		QCN9274_MPDU_START_SELECT_ADDR3_47_0_SEQ_CTRL |			\</div><div class='add'>+		QCN9274_MPDU_START_SELECT_ADDR4_47_0_QOS_CTRL)</div><div class='add'>+</div><div class='add'>+/* The below rx_mpdu_start_qcn9274_compact structure is tied with the mask</div><div class='add'>+ * value QCN9274_MPDU_START_WMASK. If the mask value changes the structure</div><div class='add'>+ * will also change.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct rx_mpdu_start_qcn9274_compact {</div><div class='add'>+	__le32 info1;</div><div class='add'>+	__le32 pn[4];</div><div class='add'>+	__le32 info2;</div><div class='add'>+	__le32 peer_meta_data;</div><div class='add'>+	__le16 info3;</div><div class='add'>+	__le16 phy_ppdu_id;</div><div class='add'>+	__le16 ast_index;</div><div class='add'>+	__le16 sw_peer_id;</div><div class='add'>+	__le32 info4;</div><div class='add'>+	__le32 info5;</div><div class='add'>+	__le32 info6;</div><div class='add'>+	__le16 frame_ctrl;</div><div class='add'>+	__le16 duration;</div><div class='add'>+	u8 addr1[ETH_ALEN];</div><div class='add'>+	u8 addr2[ETH_ALEN];</div><div class='add'>+	u8 addr3[ETH_ALEN];</div><div class='add'>+	__le16 seq_ctrl;</div><div class='add'>+	u8 addr4[ETH_ALEN];</div><div class='add'>+	__le16 qos_ctrl;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* rx_mpdu_start</div><div class='add'>+ *</div><div class='add'>+ * reo_destination_indication</div><div class='add'>+ *		The id of the reo exit ring where the msdu frame shall push</div><div class='add'>+ *		after (MPDU level) reordering has finished. Values are defined</div><div class='add'>+ *		in enum %HAL_RX_MSDU_DESC_REO_DEST_IND_.</div><div class='add'>+ *</div><div class='add'>+ * lmac_peer_id_msb</div><div class='add'>+ *</div><div class='add'>+ *		If use_flow_id_toeplitz_clfy is set and lmac_peer_id_'sb</div><div class='add'>+ *		is 2'b00, Rx OLE uses a REO destination indicati'n of {1'b1,</div><div class='add'>+ *		hash[3:0]} using the chosen Toeplitz hash from Common Parser</div><div class='add'>+ *		if flow search fails.</div><div class='add'>+ *		If use_flow_id_toeplitz_clfy is set and lmac_peer_id_msb</div><div class='add'>+ *		's not 2'b00, Rx OLE uses a REO destination indication of</div><div class='add'>+ *		{lmac_peer_id_msb, hash[2:0]} using the chosen Toeplitz</div><div class='add'>+ *		hash from Common Parser if flow search fails.</div><div class='add'>+ *</div><div class='add'>+ * use_flow_id_toeplitz_clfy</div><div class='add'>+ *		Indication to Rx OLE to enable REO destination routing based</div><div class='add'>+ *		on the chosen Toeplitz hash from Common Parser, in case</div><div class='add'>+ *		flow search fails</div><div class='add'>+ *</div><div class='add'>+ * pkt_selection_fp_ucast_data</div><div class='add'>+ *		Filter pass Unicast data frame (matching rxpcu_filter_pass</div><div class='add'>+ *		and sw_frame_group_Unicast_data) routing selection</div><div class='add'>+ *</div><div class='add'>+ * pkt_selection_fp_mcast_data</div><div class='add'>+ *		Filter pass Multicast data frame (matching rxpcu_filter_pass</div><div class='add'>+ *		and sw_frame_group_Multicast_data) routing selection</div><div class='add'>+ *</div><div class='add'>+ * pkt_selection_fp_ctrl_bar</div><div class='add'>+ *		Filter pass BAR frame (matching rxpcu_filter_pass</div><div class='add'>+ *		and sw_frame_group_ctrl_1000) routing selection</div><div class='add'>+ *</div><div class='add'>+ * rxdma0_src_ring_selection</div><div class='add'>+ *		Field only valid when for the received frame type the corresponding</div><div class='add'>+ *		pkt_selection_fp_... bit is set</div><div class='add'>+ *</div><div class='add'>+ * rxdma0_dst_ring_selection</div><div class='add'>+ *		Field only valid when for the received frame type the corresponding</div><div class='add'>+ *		pkt_selection_fp_... bit is set</div><div class='add'>+ *</div><div class='add'>+ * mcast_echo_drop_enable</div><div class='add'>+ *		If set, for multicast packets, multicast echo check (i.e.</div><div class='add'>+ *		SA search with mcast_echo_check = 1) shall be performed</div><div class='add'>+ *		by RXOLE, and any multicast echo packets should be indicated</div><div class='add'>+ *		 to RXDMA for release to WBM</div><div class='add'>+ *</div><div class='add'>+ * wds_learning_detect_en</div><div class='add'>+ *		If set, WDS learning detection based on SA search and notification</div><div class='add'>+ *		to FW (using RXDMA0 status ring) is enabled and the "timestamp"</div><div class='add'>+ *		field in address search failure cache-only entry should</div><div class='add'>+ *		be used to avoid multiple WDS learning notifications.</div><div class='add'>+ *</div><div class='add'>+ * intrabss_check_en</div><div class='add'>+ *		If set, intra-BSS routing detection is enabled</div><div class='add'>+ *</div><div class='add'>+ * use_ppe</div><div class='add'>+ *		Indicates to RXDMA to ignore the REO_destination_indication</div><div class='add'>+ *		and use a programmed value corresponding to the REO2PPE</div><div class='add'>+ *		ring</div><div class='add'>+ *		This override to REO2PPE for packets requiring multiple</div><div class='add'>+ *		buffers shall be disabled based on an RXDMA configuration,</div><div class='add'>+ *		as PPE may not support such packets.</div><div class='add'>+ *</div><div class='add'>+ *		Supported only in full AP chips, not in client/soft</div><div class='add'>+ *		chips</div><div class='add'>+ *</div><div class='add'>+ * ppe_routing_enable</div><div class='add'>+ *		Global enable/disable bit for routing to PPE, used to disable</div><div class='add'>+ *		PPE routing even if RXOLE CCE or flow search indicate 'Use_PPE'</div><div class='add'>+ *		This is set by SW for peers which are being handled by a</div><div class='add'>+ *		host SW/accelerator subsystem that also handles packet</div><div class='add'>+ *		buffer management for WiFi-to-PPE routing.</div><div class='add'>+ *</div><div class='add'>+ *		This is cleared by SW for peers which are being handled</div><div class='add'>+ *		by a different subsystem, completely disabling WiFi-to-PPE</div><div class='add'>+ *		routing for such peers.</div><div class='add'>+ *</div><div class='add'>+ * rx_reo_queue_desc_addr_lo</div><div class='add'>+ *		Address (lower 32 bits) of the REO queue descriptor.</div><div class='add'>+ *</div><div class='add'>+ * rx_reo_queue_desc_addr_hi</div><div class='add'>+ *		Address (upper 8 bits) of the REO queue descriptor.</div><div class='add'>+ *</div><div class='add'>+ * receive_queue_number</div><div class='add'>+ *		Indicates the MPDU queue ID to which this MPDU link</div><div class='add'>+ *		descriptor belongs.</div><div class='add'>+ *</div><div class='add'>+ * pre_delim_err_warning</div><div class='add'>+ *		Indicates that a delimiter FCS error was found in between the</div><div class='add'>+ *		previous MPDU and this MPDU. Note that this is just a warning,</div><div class='add'>+ *		and does not mean that this MPDU is corrupted in any way. If</div><div class='add'>+ *		it is, there will be other errors indicated such as FCS or</div><div class='add'>+ *		decrypt errors.</div><div class='add'>+ *</div><div class='add'>+ * first_delim_err</div><div class='add'>+ *		Indicates that the first delimiter had a FCS failure.</div><div class='add'>+ *</div><div class='add'>+ * pn</div><div class='add'>+ *		The PN number.</div><div class='add'>+ *</div><div class='add'>+ * epd_en</div><div class='add'>+ *		Field only valid when AST_based_lookup_valid == 1.</div><div class='add'>+ *		In case of ndp or phy_err or AST_based_lookup_valid == 0,</div><div class='add'>+ *		this field will be set to 0</div><div class='add'>+ *		If set to one use EPD instead of LPD</div><div class='add'>+ *		In case of ndp or phy_err, this field will never be set.</div><div class='add'>+ *</div><div class='add'>+ * all_frames_shall_be_encrypted</div><div class='add'>+ *		In case of ndp or phy_err or AST_based_lookup_valid == 0,</div><div class='add'>+ *		this field will be set to 0</div><div class='add'>+ *</div><div class='add'>+ *		When set, all frames (data only ?) shall be encrypted. If</div><div class='add'>+ *		not, RX CRYPTO shall set an error flag.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * encrypt_type</div><div class='add'>+ *		In case of ndp or phy_err or AST_based_lookup_valid == 0,</div><div class='add'>+ *		this field will be set to 0</div><div class='add'>+ *</div><div class='add'>+ *		Indicates type of decrypt cipher used (as defined in the</div><div class='add'>+ *		peer entry)</div><div class='add'>+ *</div><div class='add'>+ * wep_key_width_for_variable_key</div><div class='add'>+ *</div><div class='add'>+ *		Field only valid when key_type is set to wep_varied_width.</div><div class='add'>+ *</div><div class='add'>+ * mesh_sta</div><div class='add'>+ *</div><div class='add'>+ * bssid_hit</div><div class='add'>+ *		When set, the BSSID of the incoming frame matched one of</div><div class='add'>+ *		 the 8 BSSID register values</div><div class='add'>+ * bssid_number</div><div class='add'>+ *		Field only valid when bssid_hit is set.</div><div class='add'>+ *		This number indicates which one out of the 8 BSSID register</div><div class='add'>+ *		values matched the incoming frame</div><div class='add'>+ *</div><div class='add'>+ * tid</div><div class='add'>+ *		Field only valid when mpdu_qos_control_valid is set</div><div class='add'>+ *		The TID field in the QoS control field</div><div class='add'>+ *</div><div class='add'>+ * peer_meta_data</div><div class='add'>+ *		Meta data that SW has programmed in the Peer table entry</div><div class='add'>+ *		of the transmitting STA.</div><div class='add'>+ *</div><div class='add'>+ * rxpcu_mpdu_filter_in_category</div><div class='add'>+ *		Field indicates what the reason was that this mpdu frame</div><div class='add'>+ *		was allowed to come into the receive path by rxpcu. Values</div><div class='add'>+ *		are defined in enum %RX_DESC_RXPCU_FILTER_*.</div><div class='add'>+ *</div><div class='add'>+ * sw_frame_group_id</div><div class='add'>+ *		SW processes frames based on certain classifications. Values</div><div class='add'>+ *		are defined in enum %RX_DESC_SW_FRAME_GRP_ID_*.</div><div class='add'>+ *</div><div class='add'>+ * ndp_frame</div><div class='add'>+ *		When set, the received frame was an NDP frame, and thus</div><div class='add'>+ *		there will be no MPDU data.</div><div class='add'>+ * phy_err</div><div class='add'>+ *		When set, a PHY error was received before MAC received any</div><div class='add'>+ *		data, and thus there will be no MPDU data.</div><div class='add'>+ *</div><div class='add'>+ * phy_err_during_mpdu_header</div><div class='add'>+ *		When set, a PHY error was received before MAC received the</div><div class='add'>+ *		complete MPDU header which was needed for proper decoding</div><div class='add'>+ *</div><div class='add'>+ * protocol_version_err</div><div class='add'>+ *		Set when RXPCU detected a version error in the Frame control</div><div class='add'>+ *		field</div><div class='add'>+ *</div><div class='add'>+ * ast_based_lookup_valid</div><div class='add'>+ *		When set, AST based lookup for this frame has found a valid</div><div class='add'>+ *		result.</div><div class='add'>+ *</div><div class='add'>+ * ranging</div><div class='add'>+ *		When set, a ranging NDPA or a ranging NDP was received.</div><div class='add'>+ *</div><div class='add'>+ * phy_ppdu_id</div><div class='add'>+ *		A ppdu counter value that PHY increments for every PPDU</div><div class='add'>+ *		received. The counter value wraps around.</div><div class='add'>+ *</div><div class='add'>+ * ast_index</div><div class='add'>+ *</div><div class='add'>+ *		This field indicates the index of the AST entry corresponding</div><div class='add'>+ *		to this MPDU. It is provided by the GSE module instantiated</div><div class='add'>+ *		in RXPCU.</div><div class='add'>+ *		A value of 0xFFFF indicates an invalid AST index, meaning</div><div class='add'>+ *		that No AST entry was found or NO AST search was performed</div><div class='add'>+ *</div><div class='add'>+ * sw_peer_id</div><div class='add'>+ *		In case of ndp or phy_err or AST_based_lookup_valid == 0,</div><div class='add'>+ *		this field will be set to 0</div><div class='add'>+ *		This field indicates a unique peer identifier. It is set</div><div class='add'>+ *		equal to field 'sw_peer_id' from the AST entry</div><div class='add'>+ *</div><div class='add'>+ * frame_control_valid</div><div class='add'>+ *		When set, the field Mpdu_Frame_control_field has valid information</div><div class='add'>+ *</div><div class='add'>+ * frame_duration_valid</div><div class='add'>+ *		When set, the field Mpdu_duration_field has valid information</div><div class='add'>+ *</div><div class='add'>+ * mac_addr_ad1..4_valid</div><div class='add'>+ *		When set, the fields mac_addr_adx_..... have valid information</div><div class='add'>+ *</div><div class='add'>+ * mpdu_seq_ctrl_valid</div><div class='add'>+ *</div><div class='add'>+ *		When set, the fields mpdu_sequence_control_field and mpdu_sequence_number</div><div class='add'>+ *		have valid information as well as field</div><div class='add'>+ *		For MPDUs without a sequence control field, this field will</div><div class='add'>+ *		not be set.</div><div class='add'>+ *</div><div class='add'>+ * mpdu_qos_ctrl_valid, mpdu_ht_ctrl_valid</div><div class='add'>+ *</div><div class='add'>+ *		When set, the field mpdu_qos_control_field, mpdu_ht_control has valid</div><div class='add'>+ *		information, For MPDUs without a QoS,HT control field, this field</div><div class='add'>+ *		will not be set.</div><div class='add'>+ *</div><div class='add'>+ * frame_encryption_info_valid</div><div class='add'>+ *</div><div class='add'>+ *		When set, the encryption related info fields, like IV and</div><div class='add'>+ *		PN are valid</div><div class='add'>+ *		For MPDUs that are not encrypted, this will not be set.</div><div class='add'>+ *</div><div class='add'>+ * mpdu_fragment_number</div><div class='add'>+ *</div><div class='add'>+ *		Field only valid when Mpdu_sequence_control_valid is set</div><div class='add'>+ *		AND Fragment_flag is set. The fragment number from the 802.11 header</div><div class='add'>+ *</div><div class='add'>+ * more_fragment_flag</div><div class='add'>+ *</div><div class='add'>+ *		The More Fragment bit setting from the MPDU header of the</div><div class='add'>+ *		received frame</div><div class='add'>+ *</div><div class='add'>+ * fr_ds</div><div class='add'>+ *</div><div class='add'>+ *		Field only valid when Mpdu_frame_control_valid is set</div><div class='add'>+ *		Set if the from DS bit is set in the frame control.</div><div class='add'>+ *</div><div class='add'>+ * to_ds</div><div class='add'>+ *</div><div class='add'>+ *		Field only valid when Mpdu_frame_control_valid is set</div><div class='add'>+ *		Set if the to DS bit is set in the frame control.</div><div class='add'>+ *</div><div class='add'>+ * encrypted</div><div class='add'>+ *</div><div class='add'>+ *		Field only valid when Mpdu_frame_control_valid is set.</div><div class='add'>+ *		Protected bit from the frame control.</div><div class='add'>+ *</div><div class='add'>+ * mpdu_retry</div><div class='add'>+ *		Field only valid when Mpdu_frame_control_valid is set.</div><div class='add'>+ *		Retry bit from the frame control.  Only valid when first_msdu is set</div><div class='add'>+ *</div><div class='add'>+ * mpdu_sequence_number</div><div class='add'>+ *		Field only valid when Mpdu_sequence_control_valid is set.</div><div class='add'>+ *</div><div class='add'>+ *		The sequence number from the 802.11 header.</div><div class='add'>+ * key_id</div><div class='add'>+ *		The key ID octet from the IV.</div><div class='add'>+ *		Field only valid when Frame_encryption_info_valid is set</div><div class='add'>+ *</div><div class='add'>+ * new_peer_entry</div><div class='add'>+ *		Set if new RX_PEER_ENTRY TLV follows. If clear, RX_PEER_ENTRY</div><div class='add'>+ *		doesn't follow so RX DECRYPTION module either uses old peer</div><div class='add'>+ *		entry or not decrypt.</div><div class='add'>+ *</div><div class='add'>+ * decrypt_needed</div><div class='add'>+ *		When RXPCU sets bit 'ast_index_not_found or ast_index_timeout',</div><div class='add'>+ *		RXPCU will also ensure that this bit is NOT set. CRYPTO for that</div><div class='add'>+ *		reason only needs to evaluate this bit and non of the other ones</div><div class='add'>+ *</div><div class='add'>+ * decap_type</div><div class='add'>+ *		Used by the OLE during decapsulation. Values are defined in</div><div class='add'>+ *		enum %MPDU_START_DECAP_TYPE_*.</div><div class='add'>+ *</div><div class='add'>+ * rx_insert_vlan_c_tag_padding</div><div class='add'>+ * rx_insert_vlan_s_tag_padding</div><div class='add'>+ *		Insert 4 byte of all zeros as VLAN tag or double VLAN tag if</div><div class='add'>+ *		the rx payload does not have VLAN.</div><div class='add'>+ *</div><div class='add'>+ * strip_vlan_c_tag_decap</div><div class='add'>+ * strip_vlan_s_tag_decap</div><div class='add'>+ *		Strip VLAN or double VLAN during decapsulation.</div><div class='add'>+ *</div><div class='add'>+ * pre_delim_count</div><div class='add'>+ *		The number of delimiters before this MPDU. Note that this</div><div class='add'>+ *		number is cleared at PPDU start. If this MPDU is the first</div><div class='add'>+ *		received MPDU in the PPDU and this MPDU gets filtered-in,</div><div class='add'>+ *		this field will indicate the number of delimiters located</div><div class='add'>+ *		after the last MPDU in the previous PPDU.</div><div class='add'>+ *</div><div class='add'>+ *		If this MPDU is located after the first received MPDU in</div><div class='add'>+ *		an PPDU, this field will indicate the number of delimiters</div><div class='add'>+ *		located between the previous MPDU and this MPDU.</div><div class='add'>+ *</div><div class='add'>+ * ampdu_flag</div><div class='add'>+ *		Received frame was part of an A-MPDU.</div><div class='add'>+ *</div><div class='add'>+ * bar_frame</div><div class='add'>+ *		Received frame is a BAR frame</div><div class='add'>+ *</div><div class='add'>+ * raw_mpdu</div><div class='add'>+ *		Set when no 802.11 to nwifi/ethernet hdr conversion is done</div><div class='add'>+ *</div><div class='add'>+ * mpdu_length</div><div class='add'>+ *		MPDU length before decapsulation.</div><div class='add'>+ *</div><div class='add'>+ * first_mpdu</div><div class='add'>+ *		Indicates the first MSDU of the PPDU.  If both first_mpdu</div><div class='add'>+ *		and last_mpdu are set in the MSDU then this is a not an</div><div class='add'>+ *		A-MPDU frame but a stand alone MPDU.  Interior MPDU in an</div><div class='add'>+ *		A-MPDU shall have both first_mpdu and last_mpdu bits set to</div><div class='add'>+ *		0.  The PPDU start status will only be valid when this bit</div><div class='add'>+ *		is set.</div><div class='add'>+ *</div><div class='add'>+ * mcast_bcast</div><div class='add'>+ *		Multicast / broadcast indicator.  Only set when the MAC</div><div class='add'>+ *		address 1 bit 0 is set indicating mcast/bcast and the BSSID</div><div class='add'>+ *		matches one of the 4 BSSID registers. Only set when</div><div class='add'>+ *		first_msdu is set.</div><div class='add'>+ *</div><div class='add'>+ * ast_index_not_found</div><div class='add'>+ *		Only valid when first_msdu is set. Indicates no AST matching</div><div class='add'>+ *		entries within the max search count.</div><div class='add'>+ *</div><div class='add'>+ * ast_index_timeout</div><div class='add'>+ *		Only valid when first_msdu is set. Indicates an unsuccessful</div><div class='add'>+ *		search in the address search table due to timeout.</div><div class='add'>+ *</div><div class='add'>+ * power_mgmt</div><div class='add'>+ *		Power management bit set in the 802.11 header.  Only set</div><div class='add'>+ *		when first_msdu is set.</div><div class='add'>+ *</div><div class='add'>+ * non_qos</div><div class='add'>+ *		Set if packet is not a non-QoS data frame.  Only set when</div><div class='add'>+ *		first_msdu is set.</div><div class='add'>+ *</div><div class='add'>+ * null_data</div><div class='add'>+ *		Set if frame type indicates either null data or QoS null</div><div class='add'>+ *		data format.  Only set when first_msdu is set.</div><div class='add'>+ *</div><div class='add'>+ * mgmt_type</div><div class='add'>+ *		Set if packet is a management packet.  Only set when</div><div class='add'>+ *		first_msdu is set.</div><div class='add'>+ *</div><div class='add'>+ * ctrl_type</div><div class='add'>+ *		Set if packet is a control packet.  Only set when first_msdu</div><div class='add'>+ *		is set.</div><div class='add'>+ *</div><div class='add'>+ * more_data</div><div class='add'>+ *		Set if more bit in frame control is set.  Only set when</div><div class='add'>+ *		first_msdu is set.</div><div class='add'>+ *</div><div class='add'>+ * eosp</div><div class='add'>+ *		Set if the EOSP (end of service period) bit in the QoS</div><div class='add'>+ *		control field is set.  Only set when first_msdu is set.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * fragment_flag</div><div class='add'>+ *		Fragment indication</div><div class='add'>+ *</div><div class='add'>+ * order</div><div class='add'>+ *		Set if the order bit in the frame control is set.  Only</div><div class='add'>+ *		set when first_msdu is set.</div><div class='add'>+ *</div><div class='add'>+ * u_apsd_trigger</div><div class='add'>+ *		U-APSD trigger frame</div><div class='add'>+ *</div><div class='add'>+ * encrypt_required</div><div class='add'>+ *		Indicates that this data type frame is not encrypted even if</div><div class='add'>+ *		the policy for this MPDU requires encryption as indicated in</div><div class='add'>+ *		the peer table key type.</div><div class='add'>+ *</div><div class='add'>+ * directed</div><div class='add'>+ *		MPDU is a directed packet which means that the RA matched</div><div class='add'>+ *		our STA addresses.  In proxySTA it means that the TA matched</div><div class='add'>+ *		an entry in our address search table with the corresponding</div><div class='add'>+ *		'no_ack' bit is the address search entry cleared.</div><div class='add'>+ * amsdu_present</div><div class='add'>+ *		AMSDU present</div><div class='add'>+ *</div><div class='add'>+ * mpdu_frame_control_field</div><div class='add'>+ *		Frame control field in header. Only valid when the field is marked valid.</div><div class='add'>+ *</div><div class='add'>+ * mpdu_duration_field</div><div class='add'>+ *		Duration field in header. Only valid when the field is marked valid.</div><div class='add'>+ *</div><div class='add'>+ * mac_addr_adx</div><div class='add'>+ *		MAC addresses in the received frame. Only valid when corresponding</div><div class='add'>+ *		address valid bit is set</div><div class='add'>+ *</div><div class='add'>+ * mpdu_qos_control_field, mpdu_ht_control_field</div><div class='add'>+ *		QoS/HT control fields from header. Valid only when corresponding fields</div><div class='add'>+ *		are marked valid</div><div class='add'>+ *</div><div class='add'>+ * vdev_id</div><div class='add'>+ *		Virtual device associated with this peer</div><div class='add'>+ *		RXOLE uses this to determine intra-BSS routing.</div><div class='add'>+ *</div><div class='add'>+ * service_code</div><div class='add'>+ *		Opaque service code between PPE and Wi-Fi</div><div class='add'>+ *		This field gets passed on by REO to PPE in the EDMA descriptor</div><div class='add'>+ *		('REO_TO_PPE_RING').</div><div class='add'>+ *</div><div class='add'>+ * priority_valid</div><div class='add'>+ *		This field gets passed on by REO to PPE in the EDMA descriptor</div><div class='add'>+ *		('REO_TO_PPE_RING').</div><div class='add'>+ *</div><div class='add'>+ * src_info</div><div class='add'>+ *		Source (virtual) device/interface info. associated with</div><div class='add'>+ *		this peer</div><div class='add'>+ *		This field gets passed on by REO to PPE in the EDMA descriptor</div><div class='add'>+ *		('REO_TO_PPE_RING').</div><div class='add'>+ *</div><div class='add'>+ * multi_link_addr_ad1_ad2_valid</div><div class='add'>+ *		If set, Rx OLE shall convert Address1 and Address2 of received</div><div class='add'>+ *		data frames to multi-link addresses during decapsulation to eth/nwifi</div><div class='add'>+ *</div><div class='add'>+ * multi_link_addr_ad1,ad2</div><div class='add'>+ *		Multi-link receiver address1,2. Only valid when corresponding</div><div class='add'>+ *		valid bit is set</div><div class='add'>+ *</div><div class='add'>+ * authorize_to_send_wds</div><div class='add'>+ *		If not set, RXDMA shall perform error-routing for WDS packets</div><div class='add'>+ *		as the sender is not authorized and might misuse WDS frame</div><div class='add'>+ *		format to inject packets with arbitrary DA/SA.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum rx_msdu_start_pkt_type {</div><div class='add'>+	RX_MSDU_START_PKT_TYPE_11A,</div><div class='add'>+	RX_MSDU_START_PKT_TYPE_11B,</div><div class='add'>+	RX_MSDU_START_PKT_TYPE_11N,</div><div class='add'>+	RX_MSDU_START_PKT_TYPE_11AC,</div><div class='add'>+	RX_MSDU_START_PKT_TYPE_11AX,</div><div class='add'>+	RX_MSDU_START_PKT_TYPE_11BA,</div><div class='add'>+	RX_MSDU_START_PKT_TYPE_11BE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rx_msdu_start_sgi {</div><div class='add'>+	RX_MSDU_START_SGI_0_8_US,</div><div class='add'>+	RX_MSDU_START_SGI_0_4_US,</div><div class='add'>+	RX_MSDU_START_SGI_1_6_US,</div><div class='add'>+	RX_MSDU_START_SGI_3_2_US,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rx_msdu_start_recv_bw {</div><div class='add'>+	RX_MSDU_START_RECV_BW_20MHZ,</div><div class='add'>+	RX_MSDU_START_RECV_BW_40MHZ,</div><div class='add'>+	RX_MSDU_START_RECV_BW_80MHZ,</div><div class='add'>+	RX_MSDU_START_RECV_BW_160MHZ,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rx_msdu_start_reception_type {</div><div class='add'>+	RX_MSDU_START_RECEPTION_TYPE_SU,</div><div class='add'>+	RX_MSDU_START_RECEPTION_TYPE_DL_MU_MIMO,</div><div class='add'>+	RX_MSDU_START_RECEPTION_TYPE_DL_MU_OFDMA,</div><div class='add'>+	RX_MSDU_START_RECEPTION_TYPE_DL_MU_OFDMA_MIMO,</div><div class='add'>+	RX_MSDU_START_RECEPTION_TYPE_UL_MU_MIMO,</div><div class='add'>+	RX_MSDU_START_RECEPTION_TYPE_UL_MU_OFDMA,</div><div class='add'>+	RX_MSDU_START_RECEPTION_TYPE_UL_MU_OFDMA_MIMO,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RX_MSDU_END_64_TLV_SRC_LINK_ID		GENMASK(24, 22)</div><div class='add'>+</div><div class='add'>+#define RX_MSDU_END_INFO0_RXPCU_MPDU_FITLER	GENMASK(1, 0)</div><div class='add'>+#define RX_MSDU_END_INFO0_SW_FRAME_GRP_ID	GENMASK(8, 2)</div><div class='add'>+</div><div class='add'>+#define RX_MSDU_END_INFO1_REPORTED_MPDU_LENGTH	GENMASK(13, 0)</div><div class='add'>+</div><div class='add'>+#define RX_MSDU_END_INFO2_CCE_SUPER_RULE	GENMASK(13, 8)</div><div class='add'>+#define RX_MSDU_END_INFO2_CCND_TRUNCATE		BIT(14)</div><div class='add'>+#define RX_MSDU_END_INFO2_CCND_CCE_DIS		BIT(15)</div><div class='add'>+</div><div class='add'>+#define RX_MSDU_END_INFO3_DA_OFFSET		GENMASK(5, 0)</div><div class='add'>+#define RX_MSDU_END_INFO3_SA_OFFSET		GENMASK(11, 6)</div><div class='add'>+#define RX_MSDU_END_INFO3_DA_OFFSET_VALID	BIT(12)</div><div class='add'>+#define RX_MSDU_END_INFO3_SA_OFFSET_VALID	BIT(13)</div><div class='add'>+</div><div class='add'>+#define RX_MSDU_END_INFO4_TCP_FLAG		GENMASK(8, 0)</div><div class='add'>+#define RX_MSDU_END_INFO4_LRO_ELIGIBLE		BIT(9)</div><div class='add'>+</div><div class='add'>+#define RX_MSDU_END_INFO5_SA_IDX_TIMEOUT	BIT(0)</div><div class='add'>+#define RX_MSDU_END_INFO5_DA_IDX_TIMEOUT	BIT(1)</div><div class='add'>+#define RX_MSDU_END_INFO5_TO_DS			BIT(2)</div><div class='add'>+#define RX_MSDU_END_INFO5_TID			GENMASK(6, 3)</div><div class='add'>+#define RX_MSDU_END_INFO5_SA_IS_VALID		BIT(7)</div><div class='add'>+#define RX_MSDU_END_INFO5_DA_IS_VALID		BIT(8)</div><div class='add'>+#define RX_MSDU_END_INFO5_DA_IS_MCBC		BIT(9)</div><div class='add'>+#define RX_MSDU_END_INFO5_L3_HDR_PADDING	GENMASK(11, 10)</div><div class='add'>+#define RX_MSDU_END_INFO5_FIRST_MSDU		BIT(12)</div><div class='add'>+#define RX_MSDU_END_INFO5_LAST_MSDU		BIT(13)</div><div class='add'>+#define RX_MSDU_END_INFO5_FROM_DS		BIT(14)</div><div class='add'>+#define RX_MSDU_END_INFO5_IP_CHKSUM_FAIL_COPY	BIT(15)</div><div class='add'>+</div><div class='add'>+#define RX_MSDU_END_INFO6_MSDU_DROP		BIT(0)</div><div class='add'>+#define RX_MSDU_END_INFO6_REO_DEST_IND		GENMASK(5, 1)</div><div class='add'>+#define RX_MSDU_END_INFO6_FLOW_IDX		GENMASK(25, 6)</div><div class='add'>+#define RX_MSDU_END_INFO6_USE_PPE		BIT(26)</div><div class='add'>+#define RX_MSDU_END_INFO6_MESH_STA		GENMASK(28, 27)</div><div class='add'>+#define RX_MSDU_END_INFO6_VLAN_CTAG_STRIPPED	BIT(29)</div><div class='add'>+#define RX_MSDU_END_INFO6_VLAN_STAG_STRIPPED	BIT(30)</div><div class='add'>+#define RX_MSDU_END_INFO6_FRAGMENT_FLAG		BIT(31)</div><div class='add'>+</div><div class='add'>+#define RX_MSDU_END_INFO7_AGGR_COUNT		GENMASK(7, 0)</div><div class='add'>+#define RX_MSDU_END_INFO7_FLOW_AGGR_CONTN	BIT(8)</div><div class='add'>+#define RX_MSDU_END_INFO7_FISA_TIMEOUT		BIT(9)</div><div class='add'>+</div><div class='add'>+#define RX_MSDU_END_INFO7_TCPUDP_CSUM_FAIL_CPY	BIT(10)</div><div class='add'>+#define RX_MSDU_END_INFO7_MSDU_LIMIT_ERROR	BIT(11)</div><div class='add'>+#define RX_MSDU_END_INFO7_FLOW_IDX_TIMEOUT	BIT(12)</div><div class='add'>+#define RX_MSDU_END_INFO7_FLOW_IDX_INVALID	BIT(13)</div><div class='add'>+#define RX_MSDU_END_INFO7_CCE_MATCH		BIT(14)</div><div class='add'>+#define RX_MSDU_END_INFO7_AMSDU_PARSER_ERR	BIT(15)</div><div class='add'>+</div><div class='add'>+#define RX_MSDU_END_INFO8_KEY_ID		GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define RX_MSDU_END_INFO9_SERVICE_CODE		GENMASK(14, 6)</div><div class='add'>+#define RX_MSDU_END_INFO9_PRIORITY_VALID	BIT(15)</div><div class='add'>+#define RX_MSDU_END_INFO9_INRA_BSS		BIT(16)</div><div class='add'>+#define RX_MSDU_END_INFO9_DEST_CHIP_ID		GENMASK(18, 17)</div><div class='add'>+#define RX_MSDU_END_INFO9_MCAST_ECHO		BIT(19)</div><div class='add'>+#define RX_MSDU_END_INFO9_WDS_LEARN_EVENT	BIT(20)</div><div class='add'>+#define RX_MSDU_END_INFO9_WDS_ROAM_EVENT	BIT(21)</div><div class='add'>+#define RX_MSDU_END_INFO9_WDS_KEEP_ALIVE_EVENT	BIT(22)</div><div class='add'>+</div><div class='add'>+#define RX_MSDU_END_INFO10_MSDU_LENGTH		GENMASK(13, 0)</div><div class='add'>+#define RX_MSDU_END_INFO10_STBC			BIT(14)</div><div class='add'>+#define RX_MSDU_END_INFO10_IPSEC_ESP		BIT(15)</div><div class='add'>+#define RX_MSDU_END_INFO10_L3_OFFSET		GENMASK(22, 16)</div><div class='add'>+#define RX_MSDU_END_INFO10_IPSEC_AH		BIT(23)</div><div class='add'>+#define RX_MSDU_END_INFO10_L4_OFFSET		GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+#define RX_MSDU_END_INFO11_MSDU_NUMBER		GENMASK(7, 0)</div><div class='add'>+#define RX_MSDU_END_INFO11_DECAP_FORMAT		GENMASK(9, 8)</div><div class='add'>+#define RX_MSDU_END_INFO11_IPV4			BIT(10)</div><div class='add'>+#define RX_MSDU_END_INFO11_IPV6			BIT(11)</div><div class='add'>+#define RX_MSDU_END_INFO11_TCP			BIT(12)</div><div class='add'>+#define RX_MSDU_END_INFO11_UDP			BIT(13)</div><div class='add'>+#define RX_MSDU_END_INFO11_IP_FRAG		BIT(14)</div><div class='add'>+#define RX_MSDU_END_INFO11_TCP_ONLY_ACK		BIT(15)</div><div class='add'>+#define RX_MSDU_END_INFO11_DA_IS_BCAST_MCAST	BIT(16)</div><div class='add'>+#define RX_MSDU_END_INFO11_SEL_TOEPLITZ_HASH	GENMASK(18, 17)</div><div class='add'>+#define RX_MSDU_END_INFO11_IP_FIXED_HDR_VALID	BIT(19)</div><div class='add'>+#define RX_MSDU_END_INFO11_IP_EXTN_HDR_VALID	BIT(20)</div><div class='add'>+#define RX_MSDU_END_INFO11_IP_TCP_UDP_HDR_VALID	BIT(21)</div><div class='add'>+#define RX_MSDU_END_INFO11_MESH_CTRL_PRESENT	BIT(22)</div><div class='add'>+#define RX_MSDU_END_INFO11_LDPC			BIT(23)</div><div class='add'>+#define RX_MSDU_END_INFO11_IP4_IP6_NXT_HDR	GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+#define RX_MSDU_END_INFO12_USER_RSSI		GENMASK(7, 0)</div><div class='add'>+#define RX_MSDU_END_INFO12_PKT_TYPE		GENMASK(11, 8)</div><div class='add'>+#define RX_MSDU_END_INFO12_SGI			GENMASK(13, 12)</div><div class='add'>+#define RX_MSDU_END_INFO12_RATE_MCS		GENMASK(17, 14)</div><div class='add'>+#define RX_MSDU_END_INFO12_RECV_BW		GENMASK(20, 18)</div><div class='add'>+#define RX_MSDU_END_INFO12_RECEPTION_TYPE	GENMASK(23, 21)</div><div class='add'>+</div><div class='add'>+#define RX_MSDU_END_INFO12_MIMO_SS_BITMAP	GENMASK(30, 24)</div><div class='add'>+#define RX_MSDU_END_INFO12_MIMO_DONE_COPY	BIT(31)</div><div class='add'>+</div><div class='add'>+#define RX_MSDU_END_INFO13_FIRST_MPDU		BIT(0)</div><div class='add'>+#define RX_MSDU_END_INFO13_MCAST_BCAST		BIT(2)</div><div class='add'>+#define RX_MSDU_END_INFO13_AST_IDX_NOT_FOUND	BIT(3)</div><div class='add'>+#define RX_MSDU_END_INFO13_AST_IDX_TIMEDOUT	BIT(4)</div><div class='add'>+#define RX_MSDU_END_INFO13_POWER_MGMT		BIT(5)</div><div class='add'>+#define RX_MSDU_END_INFO13_NON_QOS		BIT(6)</div><div class='add'>+#define RX_MSDU_END_INFO13_NULL_DATA		BIT(7)</div><div class='add'>+#define RX_MSDU_END_INFO13_MGMT_TYPE		BIT(8)</div><div class='add'>+#define RX_MSDU_END_INFO13_CTRL_TYPE		BIT(9)</div><div class='add'>+#define RX_MSDU_END_INFO13_MORE_DATA		BIT(10)</div><div class='add'>+#define RX_MSDU_END_INFO13_EOSP			BIT(11)</div><div class='add'>+#define RX_MSDU_END_INFO13_A_MSDU_ERROR		BIT(12)</div><div class='add'>+#define RX_MSDU_END_INFO13_ORDER		BIT(14)</div><div class='add'>+#define RX_MSDU_END_INFO13_OVERFLOW_ERR		BIT(16)</div><div class='add'>+#define RX_MSDU_END_INFO13_MSDU_LEN_ERR		BIT(17)</div><div class='add'>+#define RX_MSDU_END_INFO13_TCP_UDP_CKSUM_FAIL	BIT(18)</div><div class='add'>+#define RX_MSDU_END_INFO13_IP_CKSUM_FAIL	BIT(19)</div><div class='add'>+#define RX_MSDU_END_INFO13_SA_IDX_INVALID	BIT(20)</div><div class='add'>+#define RX_MSDU_END_INFO13_DA_IDX_INVALID	BIT(21)</div><div class='add'>+#define RX_MSDU_END_INFO13_AMSDU_ADDR_MISMATCH	BIT(22)</div><div class='add'>+#define RX_MSDU_END_INFO13_RX_IN_TX_DECRYPT_BYP	BIT(23)</div><div class='add'>+#define RX_MSDU_END_INFO13_ENCRYPT_REQUIRED	BIT(24)</div><div class='add'>+#define RX_MSDU_END_INFO13_DIRECTED		BIT(25)</div><div class='add'>+#define RX_MSDU_END_INFO13_BUFFER_FRAGMENT	BIT(26)</div><div class='add'>+#define RX_MSDU_END_INFO13_MPDU_LEN_ERR		BIT(27)</div><div class='add'>+#define RX_MSDU_END_INFO13_TKIP_MIC_ERR		BIT(28)</div><div class='add'>+#define RX_MSDU_END_INFO13_DECRYPT_ERR		BIT(29)</div><div class='add'>+#define RX_MSDU_END_INFO13_UNDECRYPT_FRAME_ERR	BIT(30)</div><div class='add'>+#define RX_MSDU_END_INFO13_FCS_ERR		BIT(31)</div><div class='add'>+</div><div class='add'>+#define RX_MSDU_END_INFO13_WIFI_PARSER_ERR      BIT(15)</div><div class='add'>+</div><div class='add'>+#define RX_MSDU_END_INFO14_DECRYPT_STATUS_CODE	GENMASK(12, 10)</div><div class='add'>+#define RX_MSDU_END_INFO14_RX_BITMAP_NOT_UPDED	BIT(13)</div><div class='add'>+#define RX_MSDU_END_INFO14_MSDU_DONE		BIT(31)</div><div class='add'>+</div><div class='add'>+struct rx_msdu_end_qcn9274 {</div><div class='add'>+	__le16 info0;</div><div class='add'>+	__le16 phy_ppdu_id;</div><div class='add'>+	__le16 ip_hdr_cksum;</div><div class='add'>+	__le16 info1;</div><div class='add'>+	__le16 info2;</div><div class='add'>+	__le16 cumulative_l3_checksum;</div><div class='add'>+	__le32 rule_indication0;</div><div class='add'>+	__le32 ipv6_options_crc;</div><div class='add'>+	__le16 info3;</div><div class='add'>+	__le16 l3_type;</div><div class='add'>+	__le32 rule_indication1;</div><div class='add'>+	__le32 tcp_seq_num;</div><div class='add'>+	__le32 tcp_ack_num;</div><div class='add'>+	__le16 info4;</div><div class='add'>+	__le16 window_size;</div><div class='add'>+	__le16 sa_sw_peer_id;</div><div class='add'>+	__le16 info5;</div><div class='add'>+	__le16 sa_idx;</div><div class='add'>+	__le16 da_idx_or_sw_peer_id;</div><div class='add'>+	__le32 info6;</div><div class='add'>+	__le32 fse_metadata;</div><div class='add'>+	__le16 cce_metadata;</div><div class='add'>+	__le16 tcp_udp_cksum;</div><div class='add'>+	__le16 info7;</div><div class='add'>+	__le16 cumulative_ip_length;</div><div class='add'>+	__le32 info8;</div><div class='add'>+	__le32 info9;</div><div class='add'>+	__le32 info10;</div><div class='add'>+	__le32 info11;</div><div class='add'>+	__le16 vlan_ctag_ci;</div><div class='add'>+	__le16 vlan_stag_ci;</div><div class='add'>+	__le32 peer_meta_data;</div><div class='add'>+	__le32 info12;</div><div class='add'>+	__le32 flow_id_toeplitz;</div><div class='add'>+	__le32 ppdu_start_timestamp_63_32;</div><div class='add'>+	__le32 phy_meta_data;</div><div class='add'>+	__le32 ppdu_start_timestamp_31_0;</div><div class='add'>+	__le32 toeplitz_hash_2_or_4;</div><div class='add'>+	__le16 res0;</div><div class='add'>+	__le16 sa_15_0;</div><div class='add'>+	__le32 sa_47_16;</div><div class='add'>+	__le32 info13;</div><div class='add'>+	__le32 info14;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define QCN9274_MSDU_END_SELECT_MSDU_END_TAG				BIT(0)</div><div class='add'>+#define QCN9274_MSDU_END_SELECT_INFO0_PHY_PPDUID_IP_HDR_CSUM_INFO1	BIT(1)</div><div class='add'>+#define QCN9274_MSDU_END_SELECT_INFO2_CUMULATIVE_CSUM_RULE_IND_0	BIT(2)</div><div class='add'>+#define QCN9274_MSDU_END_SELECT_IPV6_OP_CRC_INFO3_TYPE13		BIT(3)</div><div class='add'>+#define QCN9274_MSDU_END_SELECT_RULE_IND_1_TCP_SEQ_NUM			BIT(4)</div><div class='add'>+#define QCN9274_MSDU_END_SELECT_TCP_ACK_NUM_INFO4_WINDOW_SIZE		BIT(5)</div><div class='add'>+#define QCN9274_MSDU_END_SELECT_SA_SW_PER_ID_INFO5_SA_DA_ID		BIT(6)</div><div class='add'>+#define QCN9274_MSDU_END_SELECT_INFO6_FSE_METADATA			BIT(7)</div><div class='add'>+#define QCN9274_MSDU_END_SELECT_CCE_MDATA_TCP_UDP_CSUM_INFO7_IP_LEN	BIT(8)</div><div class='add'>+#define QCN9274_MSDU_END_SELECT_INFO8_INFO9				BIT(9)</div><div class='add'>+#define QCN9274_MSDU_END_SELECT_INFO10_INFO11				BIT(10)</div><div class='add'>+#define QCN9274_MSDU_END_SELECT_VLAN_CTAG_STAG_CI_PEER_MDATA		BIT(11)</div><div class='add'>+#define QCN9274_MSDU_END_SELECT_INFO12_AND_FLOW_ID_TOEPLITZ		BIT(12)</div><div class='add'>+#define QCN9274_MSDU_END_SELECT_PPDU_START_TS_63_32_PHY_MDATA		BIT(13)</div><div class='add'>+#define QCN9274_MSDU_END_SELECT_PPDU_START_TS_31_0_TOEPLITZ_HASH_2_4	BIT(14)</div><div class='add'>+#define QCN9274_MSDU_END_SELECT_RES0_SA_47_0				BIT(15)</div><div class='add'>+#define QCN9274_MSDU_END_SELECT_INFO13_INFO14				BIT(16)</div><div class='add'>+</div><div class='add'>+#define QCN9274_MSDU_END_WMASK (QCN9274_MSDU_END_SELECT_MSDU_END_TAG |	\</div><div class='add'>+		QCN9274_MSDU_END_SELECT_SA_SW_PER_ID_INFO5_SA_DA_ID |	\</div><div class='add'>+		QCN9274_MSDU_END_SELECT_INFO10_INFO11 |			\</div><div class='add'>+		QCN9274_MSDU_END_SELECT_INFO12_AND_FLOW_ID_TOEPLITZ |	\</div><div class='add'>+		QCN9274_MSDU_END_SELECT_PPDU_START_TS_63_32_PHY_MDATA |	\</div><div class='add'>+		QCN9274_MSDU_END_SELECT_INFO13_INFO14)</div><div class='add'>+</div><div class='add'>+/* The below rx_msdu_end_qcn9274_compact structure is tied with the mask value</div><div class='add'>+ * QCN9274_MSDU_END_WMASK. If the mask value changes the structure will also</div><div class='add'>+ * change.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct rx_msdu_end_qcn9274_compact {</div><div class='add'>+	__le64 msdu_end_tag;</div><div class='add'>+	__le16 sa_sw_peer_id;</div><div class='add'>+	__le16 info5;</div><div class='add'>+	__le16 sa_idx;</div><div class='add'>+	__le16 da_idx_or_sw_peer_id;</div><div class='add'>+	__le32 info10;</div><div class='add'>+	__le32 info11;</div><div class='add'>+	__le32 info12;</div><div class='add'>+	__le32 flow_id_toeplitz;</div><div class='add'>+	__le32 ppdu_start_timestamp_63_32;</div><div class='add'>+	__le32 phy_meta_data;</div><div class='add'>+	__le32 info13;</div><div class='add'>+	__le32 info14;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* rx_msdu_end</div><div class='add'>+ *</div><div class='add'>+ * rxpcu_mpdu_filter_in_category</div><div class='add'>+ *		Field indicates what the reason was that this mpdu frame</div><div class='add'>+ *		was allowed to come into the receive path by rxpcu. Values</div><div class='add'>+ *		are defined in enum %RX_DESC_RXPCU_FILTER_*.</div><div class='add'>+ *</div><div class='add'>+ * sw_frame_group_id</div><div class='add'>+ *		SW processes frames based on certain classifications. Values</div><div class='add'>+ *		are defined in enum %RX_DESC_SW_FRAME_GRP_ID_*.</div><div class='add'>+ *</div><div class='add'>+ * phy_ppdu_id</div><div class='add'>+ *		A ppdu counter value that PHY increments for every PPDU</div><div class='add'>+ *		received. The counter value wraps around.</div><div class='add'>+ *</div><div class='add'>+ * ip_hdr_cksum</div><div class='add'>+ *		This can include the IP header checksum or the pseudo</div><div class='add'>+ *		header checksum used by TCP/UDP checksum.</div><div class='add'>+ *</div><div class='add'>+ * reported_mpdu_length</div><div class='add'>+ *		MPDU length before decapsulation. Only valid when first_msdu is</div><div class='add'>+ *		set. This field is taken directly from the length field of the</div><div class='add'>+ *		A-MPDU delimiter or the preamble length field for non-A-MPDU</div><div class='add'>+ *		frames.</div><div class='add'>+ *</div><div class='add'>+ * cce_super_rule</div><div class='add'>+ *		Indicates the super filter rule.</div><div class='add'>+ *</div><div class='add'>+ * cce_classify_not_done_truncate</div><div class='add'>+ *		Classification failed due to truncated frame.</div><div class='add'>+ *</div><div class='add'>+ * cce_classify_not_done_cce_dis</div><div class='add'>+ *		Classification failed due to CCE global disable</div><div class='add'>+ *</div><div class='add'>+ * cumulative_l3_checksum</div><div class='add'>+ *		FISA: IP header checksum including the total MSDU length</div><div class='add'>+ *		that is part of this flow aggregated so far, reported if</div><div class='add'>+ *		'RXOLE_R0_FISA_CTRL. CHKSUM_CUM_IP_LEN_EN' is set</div><div class='add'>+ *</div><div class='add'>+ * rule_indication</div><div class='add'>+ *		Bitmap indicating which of rules have matched.</div><div class='add'>+ *</div><div class='add'>+ * ipv6_options_crc</div><div class='add'>+ *		32 bit CRC computed out of  IP v6 extension headers.</div><div class='add'>+ *</div><div class='add'>+ * da_offset</div><div class='add'>+ *		Offset into MSDU buffer for DA.</div><div class='add'>+ *</div><div class='add'>+ * sa_offset</div><div class='add'>+ *		Offset into MSDU buffer for SA.</div><div class='add'>+ *</div><div class='add'>+ * da_offset_valid</div><div class='add'>+ *		da_offset field is valid. This will be set to 0 in case</div><div class='add'>+ *		of a dynamic A-MSDU when DA is compressed.</div><div class='add'>+ *</div><div class='add'>+ * sa_offset_valid</div><div class='add'>+ *		sa_offset field is valid. This will be set to 0 in case</div><div class='add'>+ *		of a dynamic A-MSDU when SA is compressed.</div><div class='add'>+ *</div><div class='add'>+ * l3_type</div><div class='add'>+ *		The 16-bit type value indicating the type of L3 later</div><div class='add'>+ *		extracted from LLC/SNAP, set to zero if SNAP is not</div><div class='add'>+ *		available.</div><div class='add'>+ *</div><div class='add'>+ * tcp_seq_number</div><div class='add'>+ *		TCP sequence number.</div><div class='add'>+ *</div><div class='add'>+ * tcp_ack_number</div><div class='add'>+ *		TCP acknowledge number.</div><div class='add'>+ *</div><div class='add'>+ * tcp_flag</div><div class='add'>+ *		TCP flags {NS, CWR, ECE, URG, ACK, PSH, RST, SYN, FIN}.</div><div class='add'>+ *</div><div class='add'>+ * lro_eligible</div><div class='add'>+ *		Computed out of TCP and IP fields to indicate that this</div><div class='add'>+ *		MSDU is eligible for LRO.</div><div class='add'>+ *</div><div class='add'>+ * window_size</div><div class='add'>+ *		TCP receive window size.</div><div class='add'>+ *</div><div class='add'>+ * sa_sw_peer_id</div><div class='add'>+ *		sw_peer_id from the address search entry corresponding to the</div><div class='add'>+ *		source address of the MSDU.</div><div class='add'>+ *</div><div class='add'>+ * sa_idx_timeout</div><div class='add'>+ *		Indicates an unsuccessful MAC source address search due to the</div><div class='add'>+ *		expiring of the search timer.</div><div class='add'>+ *</div><div class='add'>+ * da_idx_timeout</div><div class='add'>+ *		Indicates an unsuccessful MAC destination address search due to</div><div class='add'>+ *		the expiring of the search timer.</div><div class='add'>+ *</div><div class='add'>+ * to_ds</div><div class='add'>+ *		Set if the to DS bit is set in the frame control.</div><div class='add'>+ *</div><div class='add'>+ * tid</div><div class='add'>+ *		TID field in the QoS control field</div><div class='add'>+ *</div><div class='add'>+ * sa_is_valid</div><div class='add'>+ *		Indicates that OLE found a valid SA entry.</div><div class='add'>+ *</div><div class='add'>+ * da_is_valid</div><div class='add'>+ *		Indicates that OLE found a valid DA entry.</div><div class='add'>+ *</div><div class='add'>+ * da_is_mcbc</div><div class='add'>+ *		Field Only valid if da_is_valid is set. Indicates the DA address</div><div class='add'>+ *		was a Multicast of Broadcast address.</div><div class='add'>+ *</div><div class='add'>+ * l3_header_padding</div><div class='add'>+ *		Number of bytes padded  to make sure that the L3 header will</div><div class='add'>+ *		always start of a Dword boundary.</div><div class='add'>+ *</div><div class='add'>+ * first_msdu</div><div class='add'>+ *		Indicates the first MSDU of A-MSDU. If both first_msdu and</div><div class='add'>+ *		last_msdu are set in the MSDU then this is a non-aggregated MSDU</div><div class='add'>+ *		frame: normal MPDU. Interior MSDU in an A-MSDU shall have both</div><div class='add'>+ *		first_mpdu and last_mpdu bits set to 0.</div><div class='add'>+ *</div><div class='add'>+ * last_msdu</div><div class='add'>+ *		Indicates the last MSDU of the A-MSDU. MPDU end status is only</div><div class='add'>+ *		valid when last_msdu is set.</div><div class='add'>+ *</div><div class='add'>+ * fr_ds</div><div class='add'>+ *		Set if the from DS bit is set in the frame control.</div><div class='add'>+ *</div><div class='add'>+ * ip_chksum_fail_copy</div><div class='add'>+ *		Indicates that the computed checksum did not match the</div><div class='add'>+ *		checksum in the IP header.</div><div class='add'>+ *</div><div class='add'>+ * sa_idx</div><div class='add'>+ *		The offset in the address table which matches the MAC source</div><div class='add'>+ *		address.</div><div class='add'>+ *</div><div class='add'>+ * da_idx_or_sw_peer_id</div><div class='add'>+ *		Based on a register configuration in RXOLE, this field will</div><div class='add'>+ *		contain:</div><div class='add'>+ *		The offset in the address table which matches the MAC destination</div><div class='add'>+ *		address</div><div class='add'>+ *		OR:</div><div class='add'>+ *		sw_peer_id from the address search entry corresponding to</div><div class='add'>+ *		the destination address of the MSDU</div><div class='add'>+ *</div><div class='add'>+ * msdu_drop</div><div class='add'>+ *		REO shall drop this MSDU and not forward it to any other ring.</div><div class='add'>+ *</div><div class='add'>+ *		The id of the reo exit ring where the msdu frame shall push</div><div class='add'>+ *		after (MPDU level) reordering has finished. Values are defined</div><div class='add'>+ *		in enum %HAL_RX_MSDU_DESC_REO_DEST_IND_.</div><div class='add'>+ *</div><div class='add'>+ * flow_idx</div><div class='add'>+ *		Flow table index.</div><div class='add'>+ *</div><div class='add'>+ * use_ppe</div><div class='add'>+ *		Indicates to RXDMA to ignore the REO_destination_indication</div><div class='add'>+ *		and use a programmed value corresponding to the REO2PPE</div><div class='add'>+ *		ring</div><div class='add'>+ *</div><div class='add'>+ * mesh_sta</div><div class='add'>+ *		When set, this is a Mesh (11s) STA.</div><div class='add'>+ *</div><div class='add'>+ * vlan_ctag_stripped</div><div class='add'>+ *		Set by RXOLE if it stripped 4-bytes of C-VLAN Tag from the</div><div class='add'>+ *		packet</div><div class='add'>+ *</div><div class='add'>+ * vlan_stag_stripped</div><div class='add'>+ *		Set by RXOLE if it stripped 4-bytes of S-VLAN Tag from the</div><div class='add'>+ *		packet</div><div class='add'>+ *</div><div class='add'>+ * fragment_flag</div><div class='add'>+ *		Indicates that this is an 802.11 fragment frame.  This is</div><div class='add'>+ *		set when either the more_frag bit is set in the frame control</div><div class='add'>+ *		or the fragment number is not zero.  Only set when first_msdu</div><div class='add'>+ *		is set.</div><div class='add'>+ *</div><div class='add'>+ * fse_metadata</div><div class='add'>+ *		FSE related meta data.</div><div class='add'>+ *</div><div class='add'>+ * cce_metadata</div><div class='add'>+ *		CCE related meta data.</div><div class='add'>+ *</div><div class='add'>+ * tcp_udp_chksum</div><div class='add'>+ *		The value of the computed TCP/UDP checksum.  A mode bit</div><div class='add'>+ *		selects whether this checksum is the full checksum or the</div><div class='add'>+ *		partial checksum which does not include the pseudo header.</div><div class='add'>+ *</div><div class='add'>+ * aggregation_count</div><div class='add'>+ *		Number of MSDU's aggregated so far</div><div class='add'>+ *</div><div class='add'>+ * flow_aggregation_continuation</div><div class='add'>+ *		To indicate that this MSDU can be aggregated with</div><div class='add'>+ *		the previous packet with the same flow id</div><div class='add'>+ *</div><div class='add'>+ * fisa_timeout</div><div class='add'>+ *		To indicate that the aggregation has restarted for</div><div class='add'>+ *		this flow due to timeout</div><div class='add'>+ *</div><div class='add'>+ * tcp_udp_chksum_fail</div><div class='add'>+ *		Indicates that the computed checksum (tcp_udp_chksum) did</div><div class='add'>+ *		not match the checksum in the TCP/UDP header.</div><div class='add'>+ *</div><div class='add'>+ * msdu_limit_error</div><div class='add'>+ *		Indicates that the MSDU threshold was exceeded and thus all the</div><div class='add'>+ *		rest of the MSDUs will not be scattered and will not be</div><div class='add'>+ *		decapsulated but will be DMA'ed in RAW format as a single MSDU.</div><div class='add'>+ *</div><div class='add'>+ * flow_idx_timeout</div><div class='add'>+ *		Indicates an unsuccessful flow search due to the expiring of</div><div class='add'>+ *		the search timer.</div><div class='add'>+ *</div><div class='add'>+ * flow_idx_invalid</div><div class='add'>+ *		flow id is not valid.</div><div class='add'>+ *</div><div class='add'>+ * cce_match</div><div class='add'>+ *		Indicates that this status has a corresponding MSDU that</div><div class='add'>+ *		requires FW processing. The OLE will have classification</div><div class='add'>+ *		ring mask registers which will indicate the ring(s) for</div><div class='add'>+ *		packets and descriptors which need FW attention.</div><div class='add'>+ *</div><div class='add'>+ * amsdu_parser_error</div><div class='add'>+ *		A-MSDU could not be properly de-agregated.</div><div class='add'>+ *</div><div class='add'>+ * cumulative_ip_length</div><div class='add'>+ *		Total MSDU length that is part of this flow aggregated</div><div class='add'>+ *		so far</div><div class='add'>+ *</div><div class='add'>+ * key_id</div><div class='add'>+ *		The key ID octet from the IV. Only valid when first_msdu is set.</div><div class='add'>+ *</div><div class='add'>+ * service_code</div><div class='add'>+ *		Opaque service code between PPE and Wi-Fi</div><div class='add'>+ *</div><div class='add'>+ * priority_valid</div><div class='add'>+ *		This field gets passed on by REO to PPE in the EDMA descriptor</div><div class='add'>+ *</div><div class='add'>+ * intra_bss</div><div class='add'>+ *		This packet needs intra-BSS routing by SW as the 'vdev_id'</div><div class='add'>+ *		for the destination is the same as 'vdev_id' (from 'RX_MPDU_PCU_START')</div><div class='add'>+ *		that this MSDU was got in.</div><div class='add'>+ *</div><div class='add'>+ * dest_chip_id</div><div class='add'>+ *		If intra_bss is set, copied by RXOLE from 'ADDR_SEARCH_ENTRY'</div><div class='add'>+ *		to support intra-BSS routing with multi-chip multi-link</div><div class='add'>+ *		operation. This indicates into which chip's TCL the packet should be</div><div class='add'>+ *		queueued</div><div class='add'>+ *</div><div class='add'>+ * multicast_echo</div><div class='add'>+ *		If set, this packet is a multicast echo, i.e. the DA is</div><div class='add'>+ *		multicast and Rx OLE SA search with mcast_echo_check = 1</div><div class='add'>+ *		passed. RXDMA should release such packets to WBM.</div><div class='add'>+ *</div><div class='add'>+ * wds_learning_event</div><div class='add'>+ *		If set, this packet has an SA search failure with WDS learning</div><div class='add'>+ *		enabled for the peer. RXOLE should route this TLV to the</div><div class='add'>+ *		RXDMA0 status ring to notify FW.</div><div class='add'>+ *</div><div class='add'>+ * wds_roaming_event</div><div class='add'>+ *		If set, this packet's SA 'Sw_peer_id' mismatches the 'Sw_peer_id'</div><div class='add'>+ *		of the peer through which the packet was got, indicating</div><div class='add'>+ *		the SA node has roamed. RXOLE should route this TLV to</div><div class='add'>+ *		the RXDMA0 status ring to notify FW.</div><div class='add'>+ *</div><div class='add'>+ * wds_keep_alive_event</div><div class='add'>+ *		If set, the AST timestamp for this packet's SA is older</div><div class='add'>+ *		than the current timestamp by more than a threshold programmed</div><div class='add'>+ *		in RXOLE. RXOLE should route this TLV to the RXDMA0 status</div><div class='add'>+ *		ring to notify FW to keep the AST entry for the SA alive.</div><div class='add'>+ *</div><div class='add'>+ * msdu_length</div><div class='add'>+ *		MSDU length in bytes after decapsulation.</div><div class='add'>+ *		This field is still valid for MPDU frames without A-MSDU.</div><div class='add'>+ *		It still represents MSDU length after decapsulation</div><div class='add'>+ *</div><div class='add'>+ * stbc</div><div class='add'>+ *		When set, use STBC transmission rates.</div><div class='add'>+ *</div><div class='add'>+ * ipsec_esp</div><div class='add'>+ *		Set if IPv4/v6 packet is using IPsec ESP.</div><div class='add'>+ *</div><div class='add'>+ * l3_offset</div><div class='add'>+ *		Depending upon mode bit, this field either indicates the</div><div class='add'>+ *		L3 offset in bytes from the start of the RX_HEADER or the IP</div><div class='add'>+ *		offset in bytes from the start of the packet after</div><div class='add'>+ *		decapsulation. The latter is only valid if ipv4_proto or</div><div class='add'>+ *		ipv6_proto is set.</div><div class='add'>+ *</div><div class='add'>+ * ipsec_ah</div><div class='add'>+ *		Set if IPv4/v6 packet is using IPsec AH</div><div class='add'>+ *</div><div class='add'>+ * l4_offset</div><div class='add'>+ *		Depending upon mode bit, this field either indicates the</div><div class='add'>+ *		L4 offset in bytes from the start of RX_HEADER (only valid</div><div class='add'>+ *		if either ipv4_proto or ipv6_proto is set to 1) or indicates</div><div class='add'>+ *		the offset in bytes to the start of TCP or UDP header from</div><div class='add'>+ *		the start of the IP header after decapsulation (Only valid if</div><div class='add'>+ *		tcp_proto or udp_proto is set). The value 0 indicates that</div><div class='add'>+ *		the offset is longer than 127 bytes.</div><div class='add'>+ *</div><div class='add'>+ * msdu_number</div><div class='add'>+ *		Indicates the MSDU number within a MPDU.  This value is</div><div class='add'>+ *		reset to zero at the start of each MPDU.  If the number of</div><div class='add'>+ *		MSDU exceeds 255 this number will wrap using modulo 256.</div><div class='add'>+ *</div><div class='add'>+ * decap_type</div><div class='add'>+ *		Indicates the format after decapsulation. Values are defined in</div><div class='add'>+ *		enum %MPDU_START_DECAP_TYPE_*.</div><div class='add'>+ *</div><div class='add'>+ * ipv4_proto</div><div class='add'>+ *		Set if L2 layer indicates IPv4 protocol.</div><div class='add'>+ *</div><div class='add'>+ * ipv6_proto</div><div class='add'>+ *		Set if L2 layer indicates IPv6 protocol.</div><div class='add'>+ *</div><div class='add'>+ * tcp_proto</div><div class='add'>+ *		Set if the ipv4_proto or ipv6_proto are set and the IP protocol</div><div class='add'>+ *		indicates TCP.</div><div class='add'>+ *</div><div class='add'>+ * udp_proto</div><div class='add'>+ *		Set if the ipv4_proto or ipv6_proto are set and the IP protocol</div><div class='add'>+ *		indicates UDP.</div><div class='add'>+ *</div><div class='add'>+ * ip_frag</div><div class='add'>+ *		Indicates that either the IP More frag bit is set or IP frag</div><div class='add'>+ *		number is non-zero.  If set indicates that this is a fragmented</div><div class='add'>+ *		IP packet.</div><div class='add'>+ *</div><div class='add'>+ * tcp_only_ack</div><div class='add'>+ *		Set if only the TCP Ack bit is set in the TCP flags and if</div><div class='add'>+ *		the TCP payload is 0.</div><div class='add'>+ *</div><div class='add'>+ * da_is_bcast_mcast</div><div class='add'>+ *		The destination address is broadcast or multicast.</div><div class='add'>+ *</div><div class='add'>+ * toeplitz_hash</div><div class='add'>+ *		Actual chosen Hash.</div><div class='add'>+ *		0 - Toeplitz hash of 2-tuple (IP source address, IP</div><div class='add'>+ *		    destination address)</div><div class='add'>+ *		1 - Toeplitz hash of 4-tuple (IP source	address,</div><div class='add'>+ *		    IP destination address, L4 (TCP/UDP) source port,</div><div class='add'>+ *		    L4 (TCP/UDP) destination port)</div><div class='add'>+ *		2 - Toeplitz of flow_id</div><div class='add'>+ *		3 - Zero is used</div><div class='add'>+ *</div><div class='add'>+ * ip_fixed_header_valid</div><div class='add'>+ *		Fixed 20-byte IPv4 header or 40-byte IPv6 header parsed</div><div class='add'>+ *		fully within first 256 bytes of the packet</div><div class='add'>+ *</div><div class='add'>+ * ip_extn_header_valid</div><div class='add'>+ *		IPv6/IPv6 header, including IPv4 options and</div><div class='add'>+ *		recognizable extension headers parsed fully within first 256</div><div class='add'>+ *		bytes of the packet</div><div class='add'>+ *</div><div class='add'>+ * tcp_udp_header_valid</div><div class='add'>+ *		Fixed 20-byte TCP (excluding TCP options) or 8-byte UDP</div><div class='add'>+ *		header parsed fully within first 256 bytes of the packet</div><div class='add'>+ *</div><div class='add'>+ * mesh_control_present</div><div class='add'>+ *		When set, this MSDU includes the 'Mesh Control' field</div><div class='add'>+ *</div><div class='add'>+ * ldpc</div><div class='add'>+ *</div><div class='add'>+ * ip4_protocol_ip6_next_header</div><div class='add'>+ *		For IPv4, this is the 8 bit protocol field set). For IPv6 this</div><div class='add'>+ *		is the 8 bit next_header field.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * vlan_ctag_ci</div><div class='add'>+ *		2 bytes of C-VLAN Tag Control Information from WHO_L2_LLC</div><div class='add'>+ *</div><div class='add'>+ * vlan_stag_ci</div><div class='add'>+ *		2 bytes of S-VLAN Tag Control Information from WHO_L2_LLC</div><div class='add'>+ *		in case of double VLAN</div><div class='add'>+ *</div><div class='add'>+ * peer_meta_data</div><div class='add'>+ *		Meta data that SW has programmed in the Peer table entry</div><div class='add'>+ *		of the transmitting STA.</div><div class='add'>+ *</div><div class='add'>+ * user_rssi</div><div class='add'>+ *		RSSI for this user</div><div class='add'>+ *</div><div class='add'>+ * pkt_type</div><div class='add'>+ *		Values are defined in enum %RX_MSDU_START_PKT_TYPE_*.</div><div class='add'>+ *</div><div class='add'>+ * sgi</div><div class='add'>+ *		Field only valid when pkt type is HT, VHT or HE. Values are</div><div class='add'>+ *		defined in enum %RX_MSDU_START_SGI_*.</div><div class='add'>+ *</div><div class='add'>+ * rate_mcs</div><div class='add'>+ *		MCS Rate used.</div><div class='add'>+ *</div><div class='add'>+ * receive_bandwidth</div><div class='add'>+ *		Full receive Bandwidth. Values are defined in enum</div><div class='add'>+ *		%RX_MSDU_START_RECV_*.</div><div class='add'>+ *</div><div class='add'>+ * reception_type</div><div class='add'>+ *		Indicates what type of reception this is and defined in enum</div><div class='add'>+ *		%RX_MSDU_START_RECEPTION_TYPE_*.</div><div class='add'>+ *</div><div class='add'>+ * mimo_ss_bitmap</div><div class='add'>+ *		Field only valid when</div><div class='add'>+ *		Reception_type is RX_MSDU_START_RECEPTION_TYPE_DL_MU_MIMO or</div><div class='add'>+ *		RX_MSDU_START_RECEPTION_TYPE_DL_MU_OFDMA_MIMO.</div><div class='add'>+ *</div><div class='add'>+ *		Bitmap, with each bit indicating if the related spatial</div><div class='add'>+ *		stream is used for this STA</div><div class='add'>+ *</div><div class='add'>+ *		LSB related to SS 0</div><div class='add'>+ *</div><div class='add'>+ *		0 - spatial stream not used for this reception</div><div class='add'>+ *		1 - spatial stream used for this reception</div><div class='add'>+ *</div><div class='add'>+ * msdu_done_copy</div><div class='add'>+ *		If set indicates that the RX packet data, RX header data,</div><div class='add'>+ *		RX PPDU start descriptor, RX MPDU start/end descriptor,</div><div class='add'>+ *		RX MSDU start/end descriptors and RX Attention descriptor</div><div class='add'>+ *		are all valid.  This bit is in the last 64-bit of the descriptor</div><div class='add'>+ *		expected to be subscribed in future hardware.</div><div class='add'>+ *</div><div class='add'>+ * flow_id_toeplitz</div><div class='add'>+ *		Toeplitz hash of 5-tuple</div><div class='add'>+ *		{IP source address, IP destination address, IP source port, IP</div><div class='add'>+ *		destination port, L4 protocol}  in case of non-IPSec.</div><div class='add'>+ *</div><div class='add'>+ *		In case of IPSec - Toeplitz hash of 4-tuple</div><div class='add'>+ *		{IP source address, IP destination address, SPI, L4 protocol}</div><div class='add'>+ *</div><div class='add'>+ *		The relevant Toeplitz key registers are provided in RxOLE's</div><div class='add'>+ *		instance of common parser module. These registers are separate</div><div class='add'>+ *		from the Toeplitz keys used by ASE/FSE modules inside RxOLE.</div><div class='add'>+ *		The actual value will be passed on from common parser module</div><div class='add'>+ *		to RxOLE in one of the WHO_* TLVs.</div><div class='add'>+ *</div><div class='add'>+ * ppdu_start_timestamp</div><div class='add'>+ *		Timestamp that indicates when the PPDU that contained this MPDU</div><div class='add'>+ *		started on the medium.</div><div class='add'>+ *</div><div class='add'>+ * phy_meta_data</div><div class='add'>+ *		SW programmed Meta data provided by the PHY. Can be used for SW</div><div class='add'>+ *		to indicate the channel the device is on.</div><div class='add'>+ *</div><div class='add'>+ * toeplitz_hash_2_or_4</div><div class='add'>+ *		Controlled by multiple RxOLE registers for TCP/UDP over</div><div class='add'>+ *		IPv4/IPv6 - Either, Toeplitz hash computed over 2-tuple</div><div class='add'>+ *		IPv4 or IPv6 src/dest addresses is reported; or, Toeplitz</div><div class='add'>+ *		hash computed over 4-tuple IPv4 or IPv6 src/dest addresses</div><div class='add'>+ *		and src/dest ports is reported. The Flow_id_toeplitz hash</div><div class='add'>+ *		can also be reported here. Usually the hash reported here</div><div class='add'>+ *		is the one used for hash-based REO routing (see use_flow_id_toeplitz_clfy</div><div class='add'>+ *		in 'RXPT_CLASSIFY_INFO').</div><div class='add'>+ *</div><div class='add'>+ * sa</div><div class='add'>+ *		Source MAC address</div><div class='add'>+ *</div><div class='add'>+ * first_mpdu</div><div class='add'>+ *		Indicates the first MSDU of the PPDU.  If both first_mpdu</div><div class='add'>+ *		and last_mpdu are set in the MSDU then this is a not an</div><div class='add'>+ *		A-MPDU frame but a stand alone MPDU.  Interior MPDU in an</div><div class='add'>+ *		A-MPDU shall have both first_mpdu and last_mpdu bits set to</div><div class='add'>+ *		0.  The PPDU start status will only be valid when this bit</div><div class='add'>+ *		is set.</div><div class='add'>+ *</div><div class='add'>+ * mcast_bcast</div><div class='add'>+ *		Multicast / broadcast indicator.  Only set when the MAC</div><div class='add'>+ *		address 1 bit 0 is set indicating mcast/bcast and the BSSID</div><div class='add'>+ *		matches one of the 4 BSSID registers. Only set when</div><div class='add'>+ *		first_msdu is set.</div><div class='add'>+ *</div><div class='add'>+ * ast_index_not_found</div><div class='add'>+ *		Only valid when first_msdu is set. Indicates no AST matching</div><div class='add'>+ *		entries within the max search count.</div><div class='add'>+ *</div><div class='add'>+ * ast_index_timeout</div><div class='add'>+ *		Only valid when first_msdu is set. Indicates an unsuccessful</div><div class='add'>+ *		search in the address search table due to timeout.</div><div class='add'>+ *</div><div class='add'>+ * power_mgmt</div><div class='add'>+ *		Power management bit set in the 802.11 header.  Only set</div><div class='add'>+ *		when first_msdu is set.</div><div class='add'>+ *</div><div class='add'>+ * non_qos</div><div class='add'>+ *		Set if packet is not a non-QoS data frame.  Only set when</div><div class='add'>+ *		first_msdu is set.</div><div class='add'>+ *</div><div class='add'>+ * null_data</div><div class='add'>+ *		Set if frame type indicates either null data or QoS null</div><div class='add'>+ *		data format.  Only set when first_msdu is set.</div><div class='add'>+ *</div><div class='add'>+ * mgmt_type</div><div class='add'>+ *		Set if packet is a management packet.  Only set when</div><div class='add'>+ *		first_msdu is set.</div><div class='add'>+ *</div><div class='add'>+ * ctrl_type</div><div class='add'>+ *		Set if packet is a control packet.  Only set when first_msdu</div><div class='add'>+ *		is set.</div><div class='add'>+ *</div><div class='add'>+ * more_data</div><div class='add'>+ *		Set if more bit in frame control is set.  Only set when</div><div class='add'>+ *		first_msdu is set.</div><div class='add'>+ *</div><div class='add'>+ * eosp</div><div class='add'>+ *		Set if the EOSP (end of service period) bit in the QoS</div><div class='add'>+ *		control field is set.  Only set when first_msdu is set.</div><div class='add'>+ *</div><div class='add'>+ * a_msdu_error</div><div class='add'>+ *		Set if number of MSDUs in A-MSDU is above a threshold or if the</div><div class='add'>+ *		size of the MSDU is invalid. This receive buffer will contain</div><div class='add'>+ *		all of the remainder of MSDUs in this MPDU w/o decapsulation.</div><div class='add'>+ *</div><div class='add'>+ * order</div><div class='add'>+ *		Set if the order bit in the frame control is set.  Only</div><div class='add'>+ *		set when first_msdu is set.</div><div class='add'>+ *</div><div class='add'>+ * wifi_parser_error</div><div class='add'>+ *		Indicates that the WiFi frame has one of the following errors</div><div class='add'>+ *</div><div class='add'>+ * overflow_err</div><div class='add'>+ *		RXPCU Receive FIFO ran out of space to receive the full MPDU.</div><div class='add'>+ *		Therefore this MPDU is terminated early and is thus corrupted.</div><div class='add'>+ *</div><div class='add'>+ *		This MPDU will not be ACKed.</div><div class='add'>+ *</div><div class='add'>+ *		RXPCU might still be able to correctly receive the following</div><div class='add'>+ *		MPDUs in the PPDU if enough fifo space became available in time.</div><div class='add'>+ *</div><div class='add'>+ * mpdu_length_err</div><div class='add'>+ *		Set by RXPCU if the expected MPDU length does not correspond</div><div class='add'>+ *		with the actually received number of bytes in the MPDU.</div><div class='add'>+ *</div><div class='add'>+ * tcp_udp_chksum_fail</div><div class='add'>+ *		Indicates that the computed checksum (tcp_udp_chksum) did</div><div class='add'>+ *		not match the checksum in the TCP/UDP header.</div><div class='add'>+ *</div><div class='add'>+ * ip_chksum_fail</div><div class='add'>+ *		Indicates that the computed checksum did not match the</div><div class='add'>+ *		checksum in the IP header.</div><div class='add'>+ *</div><div class='add'>+ * sa_idx_invalid</div><div class='add'>+ *		Indicates no matching entry was found in the address search</div><div class='add'>+ *		table for the source MAC address.</div><div class='add'>+ *</div><div class='add'>+ * da_idx_invalid</div><div class='add'>+ *		Indicates no matching entry was found in the address search</div><div class='add'>+ *		table for the destination MAC address.</div><div class='add'>+ *</div><div class='add'>+ * amsdu_addr_mismatch</div><div class='add'>+ *		Indicates that an A-MSDU with 'from DS = 0' had an SA mismatching</div><div class='add'>+ *		TA or an A-MDU with 'to DS = 0' had a DA mismatching RA</div><div class='add'>+ *</div><div class='add'>+ * rx_in_tx_decrypt_byp</div><div class='add'>+ *		Indicates that RX packet is not decrypted as Crypto is busy</div><div class='add'>+ *		with TX packet processing.</div><div class='add'>+ *</div><div class='add'>+ * encrypt_required</div><div class='add'>+ *		Indicates that this data type frame is not encrypted even if</div><div class='add'>+ *		the policy for this MPDU requires encryption as indicated in</div><div class='add'>+ *		the peer table key type.</div><div class='add'>+ *</div><div class='add'>+ * directed</div><div class='add'>+ *		MPDU is a directed packet which means that the RA matched</div><div class='add'>+ *		our STA addresses.  In proxySTA it means that the TA matched</div><div class='add'>+ *		an entry in our address search table with the corresponding</div><div class='add'>+ *		'no_ack' bit is the address search entry cleared.</div><div class='add'>+ *</div><div class='add'>+ * buffer_fragment</div><div class='add'>+ *		Indicates that at least one of the rx buffers has been</div><div class='add'>+ *		fragmented.  If set the FW should look at the rx_frag_info</div><div class='add'>+ *		descriptor described below.</div><div class='add'>+ *</div><div class='add'>+ * mpdu_length_err</div><div class='add'>+ *		Indicates that the MPDU was pre-maturely terminated</div><div class='add'>+ *		resulting in a truncated MPDU.  Don't trust the MPDU length</div><div class='add'>+ *		field.</div><div class='add'>+ *</div><div class='add'>+ * tkip_mic_err</div><div class='add'>+ *		Indicates that the MPDU Michael integrity check failed</div><div class='add'>+ *</div><div class='add'>+ * decrypt_err</div><div class='add'>+ *		Indicates that the MPDU decrypt integrity check failed</div><div class='add'>+ *</div><div class='add'>+ * fcs_err</div><div class='add'>+ *		Indicates that the MPDU FCS check failed</div><div class='add'>+ *</div><div class='add'>+ * flow_idx_timeout</div><div class='add'>+ *		Indicates an unsuccessful flow search due to the expiring of</div><div class='add'>+ *		the search timer.</div><div class='add'>+ *</div><div class='add'>+ * flow_idx_invalid</div><div class='add'>+ *		flow id is not valid.</div><div class='add'>+ *</div><div class='add'>+ * decrypt_status_code</div><div class='add'>+ *		Field provides insight into the decryption performed. Values</div><div class='add'>+ *		are defined in enum %RX_DESC_DECRYPT_STATUS_CODE_*.</div><div class='add'>+ *</div><div class='add'>+ * rx_bitmap_not_updated</div><div class='add'>+ *		Frame is received, but RXPCU could not update the receive bitmap</div><div class='add'>+ *		due to (temporary) fifo constraints.</div><div class='add'>+ *</div><div class='add'>+ * msdu_done</div><div class='add'>+ *		If set indicates that the RX packet data, RX header data, RX</div><div class='add'>+ *		PPDU start descriptor, RX MPDU start/end descriptor, RX MSDU</div><div class='add'>+ *		start/end descriptors and RX Attention descriptor are all</div><div class='add'>+ *		valid.  This bit must be in the last octet of the</div><div class='add'>+ *		descriptor.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct hal_rx_desc_qcn9274 {</div><div class='add'>+	struct rx_msdu_end_qcn9274 msdu_end;</div><div class='add'>+	struct rx_mpdu_start_qcn9274 mpdu_start;</div><div class='add'>+	u8 msdu_payload[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hal_rx_desc_qcn9274_compact {</div><div class='add'>+	struct rx_msdu_end_qcn9274_compact msdu_end;</div><div class='add'>+	struct rx_mpdu_start_qcn9274_compact mpdu_start;</div><div class='add'>+	u8 msdu_payload[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define RX_BE_PADDING0_BYTES 8</div><div class='add'>+#define RX_BE_PADDING1_BYTES 8</div><div class='add'>+</div><div class='add'>+#define HAL_RX_BE_PKT_HDR_TLV_LEN		112</div><div class='add'>+</div><div class='add'>+struct rx_pkt_hdr_tlv {</div><div class='add'>+	__le64 tag;</div><div class='add'>+	__le64 phy_ppdu_id;</div><div class='add'>+	u8 rx_pkt_hdr[HAL_RX_BE_PKT_HDR_TLV_LEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hal_rx_desc_wcn7850 {</div><div class='add'>+	__le64 msdu_end_tag;</div><div class='add'>+	struct rx_msdu_end_qcn9274 msdu_end;</div><div class='add'>+	u8 rx_padding0[RX_BE_PADDING0_BYTES];</div><div class='add'>+	__le64 mpdu_start_tag;</div><div class='add'>+	struct rx_mpdu_start_qcn9274 mpdu_start;</div><div class='add'>+	struct rx_pkt_hdr_tlv	 pkt_hdr_tlv;</div><div class='add'>+	u8 msdu_payload[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hal_rx_desc {</div><div class='add'>+	union {</div><div class='add'>+		struct hal_rx_desc_qcn9274 qcn9274;</div><div class='add'>+		struct hal_rx_desc_qcn9274_compact qcn9274_compact;</div><div class='add'>+		struct hal_rx_desc_wcn7850 wcn7850;</div><div class='add'>+	} u;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define MAX_USER_POS 8</div><div class='add'>+#define MAX_MU_GROUP_ID 64</div><div class='add'>+#define MAX_MU_GROUP_SHOW 16</div><div class='add'>+#define MAX_MU_GROUP_LENGTH (6 * MAX_MU_GROUP_SHOW)</div><div class='add'>+</div><div class='add'>+#endif /* ATH12K_RX_DESC_H */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/testmode.c b/drivers/net/wireless/ath/ath12k/testmode.c<br/>new file mode 100644<br/>index 000000000000..fb6af7ccf71f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/testmode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/testmode.c</a></div><div class='hunk'>@@ -0,0 +1,395 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "testmode.h"</div><div class='add'>+#include &lt;net/netlink.h&gt;</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "wmi.h"</div><div class='add'>+#include "hw.h"</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "hif.h"</div><div class='add'>+#include "../testmode_i.h"</div><div class='add'>+</div><div class='add'>+#define ATH12K_FTM_SEGHDR_CURRENT_SEQ		GENMASK(3, 0)</div><div class='add'>+#define ATH12K_FTM_SEGHDR_TOTAL_SEGMENTS	GENMASK(7, 4)</div><div class='add'>+</div><div class='add'>+static const struct nla_policy ath12k_tm_policy[ATH_TM_ATTR_MAX + 1] = {</div><div class='add'>+	[ATH_TM_ATTR_CMD]		= { .type = NLA_U32 },</div><div class='add'>+	[ATH_TM_ATTR_DATA]		= { .type = NLA_BINARY,</div><div class='add'>+					    .len = ATH_TM_DATA_MAX_LEN },</div><div class='add'>+	[ATH_TM_ATTR_WMI_CMDID]		= { .type = NLA_U32 },</div><div class='add'>+	[ATH_TM_ATTR_VERSION_MAJOR]	= { .type = NLA_U32 },</div><div class='add'>+	[ATH_TM_ATTR_VERSION_MINOR]	= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ath12k *ath12k_tm_get_ar(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pdev *pdev;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		pdev = &amp;ab-&gt;pdevs[i];</div><div class='add'>+		ar = pdev-&gt;ar;</div><div class='add'>+</div><div class='add'>+		if (ar &amp;&amp; ar-&gt;ah-&gt;state == ATH12K_HW_STATE_TM)</div><div class='add'>+			return ar;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_tm_wmi_event_unsegmented(struct ath12k_base *ab, u32 cmd_id,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *nl_skb;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_TESTMODE,</div><div class='add'>+		   "testmode event wmi cmd_id %d skb length %d\n",</div><div class='add'>+		   cmd_id, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg_dump(ab, ATH12K_DBG_TESTMODE, NULL, "", skb-&gt;data, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	ar = ath12k_tm_get_ar(ab);</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath12k_warn(ab, "testmode event not handled due to invalid pdev\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	nl_skb = cfg80211_testmode_alloc_event_skb(ar-&gt;ah-&gt;hw-&gt;wiphy,</div><div class='add'>+						   2 * nla_total_size(sizeof(u32)) +</div><div class='add'>+						   nla_total_size(skb-&gt;len),</div><div class='add'>+						   GFP_ATOMIC);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	if (!nl_skb) {</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "failed to allocate skb for unsegmented testmode wmi event\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(nl_skb, ATH_TM_ATTR_CMD, ATH_TM_CMD_WMI) ||</div><div class='add'>+	    nla_put_u32(nl_skb, ATH_TM_ATTR_WMI_CMDID, cmd_id) ||</div><div class='add'>+	    nla_put(nl_skb, ATH_TM_ATTR_DATA, skb-&gt;len, skb-&gt;data)) {</div><div class='add'>+		ath12k_warn(ab, "failed to populate testmode unsegmented event\n");</div><div class='add'>+		kfree_skb(nl_skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cfg80211_testmode_event(nl_skb, GFP_ATOMIC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_tm_process_event(struct ath12k_base *ab, u32 cmd_id,</div><div class='add'>+			     const struct ath12k_wmi_ftm_event *ftm_msg,</div><div class='add'>+			     u16 length)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *nl_skb;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	u32 data_pos, pdev_id;</div><div class='add'>+	u16 datalen;</div><div class='add'>+	u8 total_segments, current_seq;</div><div class='add'>+	u8 const *buf_pos;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_TESTMODE,</div><div class='add'>+		   "testmode event wmi cmd_id %d ftm event msg %p datalen %d\n",</div><div class='add'>+		   cmd_id, ftm_msg, length);</div><div class='add'>+	ath12k_dbg_dump(ab, ATH12K_DBG_TESTMODE, NULL, "", ftm_msg, length);</div><div class='add'>+	pdev_id = DP_HW2SW_MACID(le32_to_cpu(ftm_msg-&gt;seg_hdr.pdev_id));</div><div class='add'>+</div><div class='add'>+	if (pdev_id &gt;= ab-&gt;num_radios) {</div><div class='add'>+		ath12k_warn(ab, "testmode event not handled due to invalid pdev id\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar = ab-&gt;pdevs[pdev_id].ar;</div><div class='add'>+</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath12k_warn(ab, "testmode event not handled due to absence of pdev\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	current_seq = le32_get_bits(ftm_msg-&gt;seg_hdr.segmentinfo,</div><div class='add'>+				    ATH12K_FTM_SEGHDR_CURRENT_SEQ);</div><div class='add'>+	total_segments = le32_get_bits(ftm_msg-&gt;seg_hdr.segmentinfo,</div><div class='add'>+				       ATH12K_FTM_SEGHDR_TOTAL_SEGMENTS);</div><div class='add'>+	datalen = length - (sizeof(struct ath12k_wmi_ftm_seg_hdr_params));</div><div class='add'>+	buf_pos = ftm_msg-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (current_seq == 0) {</div><div class='add'>+		ab-&gt;ftm_event_obj.expected_seq = 0;</div><div class='add'>+		ab-&gt;ftm_event_obj.data_pos = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data_pos = ab-&gt;ftm_event_obj.data_pos;</div><div class='add'>+</div><div class='add'>+	if ((data_pos + datalen) &gt; ATH_FTM_EVENT_MAX_BUF_LENGTH) {</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "Invalid event length date_pos[%d] datalen[%d]\n",</div><div class='add'>+			    data_pos, datalen);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;ab-&gt;ftm_event_obj.eventdata[data_pos], buf_pos, datalen);</div><div class='add'>+	data_pos += datalen;</div><div class='add'>+</div><div class='add'>+	if (++ab-&gt;ftm_event_obj.expected_seq != total_segments) {</div><div class='add'>+		ab-&gt;ftm_event_obj.data_pos = data_pos;</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_TESTMODE,</div><div class='add'>+			   "partial data received current_seq[%d], total_seg[%d]\n",</div><div class='add'>+			    current_seq, total_segments);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_TESTMODE,</div><div class='add'>+		   "total data length[%d] = [%d]\n",</div><div class='add'>+		   data_pos, ftm_msg-&gt;seg_hdr.len);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	nl_skb = cfg80211_testmode_alloc_event_skb(ar-&gt;ah-&gt;hw-&gt;wiphy,</div><div class='add'>+						   2 * nla_total_size(sizeof(u32)) +</div><div class='add'>+						   nla_total_size(data_pos),</div><div class='add'>+						   GFP_ATOMIC);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	if (!nl_skb) {</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "failed to allocate skb for testmode wmi event\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(nl_skb, ATH_TM_ATTR_CMD,</div><div class='add'>+			ATH_TM_CMD_WMI_FTM) ||</div><div class='add'>+	    nla_put_u32(nl_skb, ATH_TM_ATTR_WMI_CMDID, cmd_id) ||</div><div class='add'>+	    nla_put(nl_skb, ATH_TM_ATTR_DATA, data_pos,</div><div class='add'>+		    &amp;ab-&gt;ftm_event_obj.eventdata[0])) {</div><div class='add'>+		ath12k_warn(ab, "failed to populate testmode event");</div><div class='add'>+		kfree_skb(nl_skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cfg80211_testmode_event(nl_skb, GFP_ATOMIC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_tm_cmd_get_version(struct ath12k *ar, struct nlattr *tb[])</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_TESTMODE,</div><div class='add'>+		   "testmode cmd get version_major %d version_minor %d\n",</div><div class='add'>+		   ATH_TESTMODE_VERSION_MAJOR,</div><div class='add'>+		   ATH_TESTMODE_VERSION_MINOR);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	skb = cfg80211_testmode_alloc_reply_skb(ar-&gt;ah-&gt;hw-&gt;wiphy,</div><div class='add'>+						2 * nla_total_size(sizeof(u32)));</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, ATH_TM_ATTR_VERSION_MAJOR,</div><div class='add'>+			ATH_TESTMODE_VERSION_MAJOR) ||</div><div class='add'>+	    nla_put_u32(skb, ATH_TM_ATTR_VERSION_MINOR,</div><div class='add'>+			ATH_TESTMODE_VERSION_MINOR)) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return cfg80211_testmode_reply(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_tm_cmd_process_ftm(struct ath12k *ar, struct nlattr *tb[])</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct ath12k_wmi_ftm_cmd *ftm_cmd;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	void *buf;</div><div class='add'>+	size_t aligned_len;</div><div class='add'>+	u32 cmd_id, buf_len;</div><div class='add'>+	u16 chunk_len, total_bytes, num_segments;</div><div class='add'>+	u8 segnumber = 0, *bufpos;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_TESTMODE, "ah-&gt;state  %d\n", ar-&gt;ah-&gt;state);</div><div class='add'>+	if (ar-&gt;ah-&gt;state != ATH12K_HW_STATE_TM)</div><div class='add'>+		return -ENETDOWN;</div><div class='add'>+</div><div class='add'>+	if (!tb[ATH_TM_ATTR_DATA])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	buf = nla_data(tb[ATH_TM_ATTR_DATA]);</div><div class='add'>+	buf_len = nla_len(tb[ATH_TM_ATTR_DATA]);</div><div class='add'>+	cmd_id = WMI_PDEV_UTF_CMDID;</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_TESTMODE,</div><div class='add'>+		   "testmode cmd wmi cmd_id %d buf %p buf_len %d\n",</div><div class='add'>+		   cmd_id, buf, buf_len);</div><div class='add'>+	ath12k_dbg_dump(ar-&gt;ab, ATH12K_DBG_TESTMODE, NULL, "", buf, buf_len);</div><div class='add'>+	bufpos = buf;</div><div class='add'>+	total_bytes = buf_len;</div><div class='add'>+	num_segments = total_bytes / MAX_WMI_UTF_LEN;</div><div class='add'>+</div><div class='add'>+	if (buf_len - (num_segments * MAX_WMI_UTF_LEN))</div><div class='add'>+		num_segments++;</div><div class='add'>+</div><div class='add'>+	while (buf_len) {</div><div class='add'>+		if (buf_len &gt; MAX_WMI_UTF_LEN)</div><div class='add'>+			chunk_len = MAX_WMI_UTF_LEN;    /* MAX message */</div><div class='add'>+		else</div><div class='add'>+			chunk_len = buf_len;</div><div class='add'>+</div><div class='add'>+		skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, (chunk_len +</div><div class='add'>+					sizeof(struct ath12k_wmi_ftm_cmd)));</div><div class='add'>+</div><div class='add'>+		if (!skb)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		ftm_cmd = (struct ath12k_wmi_ftm_cmd *)skb-&gt;data;</div><div class='add'>+		aligned_len  = chunk_len + sizeof(struct ath12k_wmi_ftm_seg_hdr_params);</div><div class='add'>+		ftm_cmd-&gt;tlv_header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE, aligned_len);</div><div class='add'>+		ftm_cmd-&gt;seg_hdr.len = cpu_to_le32(total_bytes);</div><div class='add'>+		ftm_cmd-&gt;seg_hdr.msgref = cpu_to_le32(ar-&gt;ftm_msgref);</div><div class='add'>+		ftm_cmd-&gt;seg_hdr.segmentinfo =</div><div class='add'>+			le32_encode_bits(num_segments,</div><div class='add'>+					 ATH12K_FTM_SEGHDR_TOTAL_SEGMENTS) |</div><div class='add'>+			le32_encode_bits(segnumber,</div><div class='add'>+					 ATH12K_FTM_SEGHDR_CURRENT_SEQ);</div><div class='add'>+		ftm_cmd-&gt;seg_hdr.pdev_id = cpu_to_le32(ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+		segnumber++;</div><div class='add'>+		memcpy(&amp;ftm_cmd-&gt;data, bufpos, chunk_len);</div><div class='add'>+		ret = ath12k_wmi_cmd_send(wmi, skb, cmd_id);</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "ftm wmi command fail: %d\n", ret);</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buf_len -= chunk_len;</div><div class='add'>+		bufpos += chunk_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	++ar-&gt;ftm_msgref;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_tm_cmd_testmode_start(struct ath12k *ar, struct nlattr *tb[])</div><div class='add'>+{</div><div class='add'>+	if (ar-&gt;ah-&gt;state == ATH12K_HW_STATE_TM)</div><div class='add'>+		return -EALREADY;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;ah-&gt;state != ATH12K_HW_STATE_OFF)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	ar-&gt;ab-&gt;ftm_event_obj.eventdata = kzalloc(ATH_FTM_EVENT_MAX_BUF_LENGTH,</div><div class='add'>+						  GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!ar-&gt;ab-&gt;ftm_event_obj.eventdata)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ar-&gt;ah-&gt;state = ATH12K_HW_STATE_TM;</div><div class='add'>+	ar-&gt;ftm_msgref = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_tm_cmd_wmi(struct ath12k *ar, struct nlattr *tb[])</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct wmi_pdev_set_param_cmd *cmd;</div><div class='add'>+	int ret = 0, tag;</div><div class='add'>+	void *buf;</div><div class='add'>+	u32 cmd_id, buf_len;</div><div class='add'>+</div><div class='add'>+	if (!tb[ATH_TM_ATTR_DATA])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!tb[ATH_TM_ATTR_WMI_CMDID])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	buf = nla_data(tb[ATH_TM_ATTR_DATA]);</div><div class='add'>+	buf_len = nla_len(tb[ATH_TM_ATTR_DATA]);</div><div class='add'>+</div><div class='add'>+	if (!buf_len) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "No data present in testmode command\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd_id = nla_get_u32(tb[ATH_TM_ATTR_WMI_CMDID]);</div><div class='add'>+</div><div class='add'>+	cmd = buf;</div><div class='add'>+	tag = le32_get_bits(cmd-&gt;tlv_header, WMI_TLV_TAG);</div><div class='add'>+</div><div class='add'>+	if (tag == WMI_TAG_PDEV_SET_PARAM_CMD)</div><div class='add'>+		cmd-&gt;pdev_id = cpu_to_le32(ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_TESTMODE,</div><div class='add'>+		   "testmode cmd wmi cmd_id %d  buf length %d\n",</div><div class='add'>+		   cmd_id, buf_len);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg_dump(ar-&gt;ab, ATH12K_DBG_TESTMODE, NULL, "", buf, buf_len);</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, buf_len);</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memcpy(skb-&gt;data, buf, buf_len);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, cmd_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to transmit wmi command (testmode): %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_tm_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		  void *data, int len)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = hw-&gt;priv;</div><div class='add'>+	struct ath12k *ar = NULL;</div><div class='add'>+	struct nlattr *tb[ATH_TM_ATTR_MAX + 1];</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	struct wiphy *wiphy = hw-&gt;wiphy;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;wiphy-&gt;mtx);</div><div class='add'>+</div><div class='add'>+	ret = nla_parse(tb, ATH_TM_ATTR_MAX, data, len, ath12k_tm_policy,</div><div class='add'>+			NULL);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!tb[ATH_TM_ATTR_CMD])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* TODO: have to handle ar for MLO case */</div><div class='add'>+	if (ah-&gt;num_radio)</div><div class='add'>+		ar = ah-&gt;radio;</div><div class='add'>+</div><div class='add'>+	if (!ar)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ab = ar-&gt;ab;</div><div class='add'>+	switch (nla_get_u32(tb[ATH_TM_ATTR_CMD])) {</div><div class='add'>+	case ATH_TM_CMD_WMI:</div><div class='add'>+		return ath12k_tm_cmd_wmi(ar, tb);</div><div class='add'>+	case ATH_TM_CMD_TESTMODE_START:</div><div class='add'>+		return ath12k_tm_cmd_testmode_start(ar, tb);</div><div class='add'>+	case ATH_TM_CMD_GET_VERSION:</div><div class='add'>+		return ath12k_tm_cmd_get_version(ar, tb);</div><div class='add'>+	case ATH_TM_CMD_WMI_FTM:</div><div class='add'>+		set_bit(ATH12K_FLAG_FTM_SEGMENTED, &amp;ab-&gt;dev_flags);</div><div class='add'>+		return ath12k_tm_cmd_process_ftm(ar, tb);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/testmode.h b/drivers/net/wireless/ath/ath12k/testmode.h<br/>new file mode 100644<br/>index 000000000000..ef6ab21d19b8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/testmode.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/testmode.h</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "hif.h"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NL80211_TESTMODE</div><div class='add'>+</div><div class='add'>+void ath12k_tm_wmi_event_unsegmented(struct ath12k_base *ab, u32 cmd_id,</div><div class='add'>+				     struct sk_buff *skb);</div><div class='add'>+void ath12k_tm_process_event(struct ath12k_base *ab, u32 cmd_id,</div><div class='add'>+			     const struct ath12k_wmi_ftm_event *ftm_msg,</div><div class='add'>+			     u16 length);</div><div class='add'>+int ath12k_tm_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		  void *data, int len);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline void ath12k_tm_wmi_event_unsegmented(struct ath12k_base *ab, u32 cmd_id,</div><div class='add'>+						   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath12k_tm_process_event(struct ath12k_base *ab, u32 cmd_id,</div><div class='add'>+					   const struct ath12k_wmi_ftm_event *msg,</div><div class='add'>+					   u16 length)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath12k_tm_cmd(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				void *data, int len)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/trace.c b/drivers/net/wireless/ath/ath12k/trace.c<br/>new file mode 100644<br/>index 000000000000..0d0edf4204b7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/trace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/trace.c</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include "trace.h"</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/trace.h b/drivers/net/wireless/ath/ath12k/trace.h<br/>new file mode 100644<br/>index 000000000000..253c67accb0e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/trace.h</a></div><div class='hunk'>@@ -0,0 +1,179 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021-2022, 2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#if !defined(_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)</div><div class='add'>+</div><div class='add'>+#include &lt;linux/tracepoint.h&gt;</div><div class='add'>+#include "core.h"</div><div class='add'>+</div><div class='add'>+#define _TRACE_H_</div><div class='add'>+</div><div class='add'>+/* create empty functions when tracing is disabled */</div><div class='add'>+#if !defined(CONFIG_ATH12K_TRACING)</div><div class='add'>+#undef TRACE_EVENT</div><div class='add'>+#define TRACE_EVENT(name, proto, ...) \</div><div class='add'>+static inline void trace_ ## name(proto) {}</div><div class='add'>+#endif /* !CONFIG_ATH12K_TRACING || __CHECKER__ */</div><div class='add'>+</div><div class='add'>+#undef TRACE_SYSTEM</div><div class='add'>+#define TRACE_SYSTEM ath12k</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(ath12k_htt_pktlog,</div><div class='add'>+	    TP_PROTO(struct ath12k *ar, const void *buf, u16 buf_len,</div><div class='add'>+		     u32 pktlog_checksum),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(ar, buf, buf_len, pktlog_checksum),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(device, dev_name(ar-&gt;ab-&gt;dev))</div><div class='add'>+		__string(driver, dev_driver_string(ar-&gt;ab-&gt;dev))</div><div class='add'>+		__field(u16, buf_len)</div><div class='add'>+		__field(u32, pktlog_checksum)</div><div class='add'>+		__dynamic_array(u8, pktlog, buf_len)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='add'>+		__entry-&gt;buf_len = buf_len;</div><div class='add'>+		__entry-&gt;pktlog_checksum = pktlog_checksum;</div><div class='add'>+		memcpy(__get_dynamic_array(pktlog), buf, buf_len);</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk(</div><div class='add'>+		"%s %s size %u pktlog_checksum %d",</div><div class='add'>+		__get_str(driver),</div><div class='add'>+		__get_str(device),</div><div class='add'>+		__entry-&gt;buf_len,</div><div class='add'>+		__entry-&gt;pktlog_checksum</div><div class='add'>+	 )</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(ath12k_htt_ppdu_stats,</div><div class='add'>+	    TP_PROTO(struct ath12k *ar, const void *data, size_t len),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(ar, data, len),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(device, dev_name(ar-&gt;ab-&gt;dev))</div><div class='add'>+		__string(driver, dev_driver_string(ar-&gt;ab-&gt;dev))</div><div class='add'>+		__field(u16, len)</div><div class='add'>+		__field(u32, info)</div><div class='add'>+		__field(u32, sync_tstmp_lo_us)</div><div class='add'>+		__field(u32, sync_tstmp_hi_us)</div><div class='add'>+		__field(u32, mlo_offset_lo)</div><div class='add'>+		__field(u32, mlo_offset_hi)</div><div class='add'>+		__field(u32, mlo_offset_clks)</div><div class='add'>+		__field(u32, mlo_comp_clks)</div><div class='add'>+		__field(u32, mlo_comp_timer)</div><div class='add'>+		__dynamic_array(u8, ppdu, len)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='add'>+		__entry-&gt;len = len;</div><div class='add'>+		__entry-&gt;info = ar-&gt;pdev-&gt;timestamp.info;</div><div class='add'>+		__entry-&gt;sync_tstmp_lo_us = ar-&gt;pdev-&gt;timestamp.sync_timestamp_hi_us;</div><div class='add'>+		__entry-&gt;sync_tstmp_hi_us = ar-&gt;pdev-&gt;timestamp.sync_timestamp_lo_us;</div><div class='add'>+		__entry-&gt;mlo_offset_lo = ar-&gt;pdev-&gt;timestamp.mlo_offset_lo;</div><div class='add'>+		__entry-&gt;mlo_offset_hi = ar-&gt;pdev-&gt;timestamp.mlo_offset_hi;</div><div class='add'>+		__entry-&gt;mlo_offset_clks = ar-&gt;pdev-&gt;timestamp.mlo_offset_clks;</div><div class='add'>+		__entry-&gt;mlo_comp_clks = ar-&gt;pdev-&gt;timestamp.mlo_comp_clks;</div><div class='add'>+		__entry-&gt;mlo_comp_timer = ar-&gt;pdev-&gt;timestamp.mlo_comp_timer;</div><div class='add'>+		memcpy(__get_dynamic_array(ppdu), data, len);</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk(</div><div class='add'>+		"%s %s ppdu len %d",</div><div class='add'>+		__get_str(driver),</div><div class='add'>+		__get_str(device),</div><div class='add'>+		__entry-&gt;len</div><div class='add'>+	 )</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(ath12k_htt_rxdesc,</div><div class='add'>+	    TP_PROTO(struct ath12k *ar, const void *data, size_t type, size_t len),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(ar, data, type, len),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(device, dev_name(ar-&gt;ab-&gt;dev))</div><div class='add'>+		__string(driver, dev_driver_string(ar-&gt;ab-&gt;dev))</div><div class='add'>+		__field(u16, len)</div><div class='add'>+		__field(u16, type)</div><div class='add'>+		__field(u32, info)</div><div class='add'>+		__field(u32, sync_tstmp_lo_us)</div><div class='add'>+		__field(u32, sync_tstmp_hi_us)</div><div class='add'>+		__field(u32, mlo_offset_lo)</div><div class='add'>+		__field(u32, mlo_offset_hi)</div><div class='add'>+		__field(u32, mlo_offset_clks)</div><div class='add'>+		__field(u32, mlo_comp_clks)</div><div class='add'>+		__field(u32, mlo_comp_timer)</div><div class='add'>+		__dynamic_array(u8, rxdesc, len)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='add'>+		__entry-&gt;len = len;</div><div class='add'>+		__entry-&gt;type = type;</div><div class='add'>+		__entry-&gt;info = ar-&gt;pdev-&gt;timestamp.info;</div><div class='add'>+		__entry-&gt;sync_tstmp_lo_us = ar-&gt;pdev-&gt;timestamp.sync_timestamp_hi_us;</div><div class='add'>+		__entry-&gt;sync_tstmp_hi_us = ar-&gt;pdev-&gt;timestamp.sync_timestamp_lo_us;</div><div class='add'>+		__entry-&gt;mlo_offset_lo = ar-&gt;pdev-&gt;timestamp.mlo_offset_lo;</div><div class='add'>+		__entry-&gt;mlo_offset_hi = ar-&gt;pdev-&gt;timestamp.mlo_offset_hi;</div><div class='add'>+		__entry-&gt;mlo_offset_clks = ar-&gt;pdev-&gt;timestamp.mlo_offset_clks;</div><div class='add'>+		__entry-&gt;mlo_comp_clks = ar-&gt;pdev-&gt;timestamp.mlo_comp_clks;</div><div class='add'>+		__entry-&gt;mlo_comp_timer = ar-&gt;pdev-&gt;timestamp.mlo_comp_timer;</div><div class='add'>+		memcpy(__get_dynamic_array(rxdesc), data, len);</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk(</div><div class='add'>+		"%s %s rxdesc len %d",</div><div class='add'>+		__get_str(driver),</div><div class='add'>+		__get_str(device),</div><div class='add'>+		__entry-&gt;len</div><div class='add'>+	 )</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(ath12k_wmi_diag,</div><div class='add'>+	    TP_PROTO(struct ath12k_base *ab, const void *data, size_t len),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(ab, data, len),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(device, dev_name(ab-&gt;dev))</div><div class='add'>+		__string(driver, dev_driver_string(ab-&gt;dev))</div><div class='add'>+		__field(u16, len)</div><div class='add'>+		__dynamic_array(u8, data, len)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(device);</div><div class='add'>+		__assign_str(driver);</div><div class='add'>+		__entry-&gt;len = len;</div><div class='add'>+		memcpy(__get_dynamic_array(data), data, len);</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk(</div><div class='add'>+		"%s %s tlv diag len %d",</div><div class='add'>+		__get_str(driver),</div><div class='add'>+		__get_str(device),</div><div class='add'>+		__entry-&gt;len</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#endif /* _TRACE_H_ || TRACE_HEADER_MULTI_READ*/</div><div class='add'>+</div><div class='add'>+/* we don't want to use include/trace/events */</div><div class='add'>+#undef TRACE_INCLUDE_PATH</div><div class='add'>+#define TRACE_INCLUDE_PATH .</div><div class='add'>+#undef TRACE_INCLUDE_FILE</div><div class='add'>+#define TRACE_INCLUDE_FILE trace</div><div class='add'>+</div><div class='add'>+/* This part must be outside protection */</div><div class='add'>+#include &lt;trace/define_trace.h&gt;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/wmi.c b/drivers/net/wireless/ath/ath12k/wmi.c<br/>new file mode 100644<br/>index 000000000000..be8b2943094f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/wmi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/wmi.c</a></div><div class='hunk'>@@ -0,0 +1,11230 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+#include &lt;net/cfg80211.h&gt;</div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/uuid.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "debugfs.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+#include "hw.h"</div><div class='add'>+#include "peer.h"</div><div class='add'>+#include "p2p.h"</div><div class='add'>+#include "testmode.h"</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_svc_ready_parse {</div><div class='add'>+	bool wmi_svc_bitmap_done;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_tlv_fw_stats_parse {</div><div class='add'>+	const struct wmi_stats_event *ev;</div><div class='add'>+	struct ath12k_fw_stats *stats;</div><div class='add'>+	const struct wmi_per_chain_rssi_stat_params *rssi;</div><div class='add'>+	int rssi_num;</div><div class='add'>+	bool chain_rssi_done;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_dma_ring_caps_parse {</div><div class='add'>+	struct ath12k_wmi_dma_ring_caps_params *dma_ring_caps;</div><div class='add'>+	u32 n_dma_ring_caps;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_service_ext_arg {</div><div class='add'>+	u32 default_conc_scan_config_bits;</div><div class='add'>+	u32 default_fw_config_bits;</div><div class='add'>+	struct ath12k_wmi_ppe_threshold_arg ppet;</div><div class='add'>+	u32 he_cap_info;</div><div class='add'>+	u32 mpdu_density;</div><div class='add'>+	u32 max_bssid_rx_filters;</div><div class='add'>+	u32 num_hw_modes;</div><div class='add'>+	u32 num_phy;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_svc_rdy_ext_parse {</div><div class='add'>+	struct ath12k_wmi_service_ext_arg arg;</div><div class='add'>+	const struct ath12k_wmi_soc_mac_phy_hw_mode_caps_params *hw_caps;</div><div class='add'>+	const struct ath12k_wmi_hw_mode_cap_params *hw_mode_caps;</div><div class='add'>+	u32 n_hw_mode_caps;</div><div class='add'>+	u32 tot_phy_id;</div><div class='add'>+	struct ath12k_wmi_hw_mode_cap_params pref_hw_mode_caps;</div><div class='add'>+	struct ath12k_wmi_mac_phy_caps_params *mac_phy_caps;</div><div class='add'>+	u32 n_mac_phy_caps;</div><div class='add'>+	const struct ath12k_wmi_soc_hal_reg_caps_params *soc_hal_reg_caps;</div><div class='add'>+	const struct ath12k_wmi_hal_reg_caps_ext_params *ext_hal_reg_caps;</div><div class='add'>+	u32 n_ext_hal_reg_caps;</div><div class='add'>+	struct ath12k_wmi_dma_ring_caps_parse dma_caps_parse;</div><div class='add'>+	bool hw_mode_done;</div><div class='add'>+	bool mac_phy_done;</div><div class='add'>+	bool ext_hal_reg_done;</div><div class='add'>+	bool mac_phy_chainmask_combo_done;</div><div class='add'>+	bool mac_phy_chainmask_cap_done;</div><div class='add'>+	bool oem_dma_ring_cap_done;</div><div class='add'>+	bool dma_ring_cap_done;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_svc_rdy_ext2_arg {</div><div class='add'>+	u32 reg_db_version;</div><div class='add'>+	u32 hw_min_max_tx_power_2ghz;</div><div class='add'>+	u32 hw_min_max_tx_power_5ghz;</div><div class='add'>+	u32 chwidth_num_peer_caps;</div><div class='add'>+	u32 preamble_puncture_bw;</div><div class='add'>+	u32 max_user_per_ppdu_ofdma;</div><div class='add'>+	u32 max_user_per_ppdu_mumimo;</div><div class='add'>+	u32 target_cap_flags;</div><div class='add'>+	u32 eht_cap_mac_info[WMI_MAX_EHTCAP_MAC_SIZE];</div><div class='add'>+	u32 max_num_linkview_peers;</div><div class='add'>+	u32 max_num_msduq_supported_per_tid;</div><div class='add'>+	u32 default_num_msduq_supported_per_tid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_svc_rdy_ext2_parse {</div><div class='add'>+	struct ath12k_wmi_svc_rdy_ext2_arg arg;</div><div class='add'>+	struct ath12k_wmi_dma_ring_caps_parse dma_caps_parse;</div><div class='add'>+	bool dma_ring_cap_done;</div><div class='add'>+	bool spectral_bin_scaling_done;</div><div class='add'>+	bool mac_phy_caps_ext_done;</div><div class='add'>+	bool hal_reg_caps_ext2_done;</div><div class='add'>+	bool scan_radio_caps_ext2_done;</div><div class='add'>+	bool twt_caps_done;</div><div class='add'>+	bool htt_msdu_idx_to_qtype_map_done;</div><div class='add'>+	bool dbs_or_sbs_cap_ext_done;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_rdy_parse {</div><div class='add'>+	u32 num_extra_mac_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_dma_buf_release_arg {</div><div class='add'>+	struct ath12k_wmi_dma_buf_release_fixed_params fixed;</div><div class='add'>+	const struct ath12k_wmi_dma_buf_release_entry_params *buf_entry;</div><div class='add'>+	const struct ath12k_wmi_dma_buf_release_meta_data_params *meta_data;</div><div class='add'>+	u32 num_buf_entry;</div><div class='add'>+	u32 num_meta;</div><div class='add'>+	bool buf_entry_done;</div><div class='add'>+	bool meta_data_done;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_tlv_policy {</div><div class='add'>+	size_t min_len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_tlv_mgmt_rx_parse {</div><div class='add'>+	const struct ath12k_wmi_mgmt_rx_params *fixed;</div><div class='add'>+	const u8 *frame_buf;</div><div class='add'>+	bool frame_buf_done;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ath12k_wmi_tlv_policy ath12k_wmi_tlv_policies[] = {</div><div class='add'>+	[WMI_TAG_ARRAY_BYTE] = { .min_len = 0 },</div><div class='add'>+	[WMI_TAG_ARRAY_UINT32] = { .min_len = 0 },</div><div class='add'>+	[WMI_TAG_SERVICE_READY_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_service_ready_event) },</div><div class='add'>+	[WMI_TAG_SERVICE_READY_EXT_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_service_ready_ext_event) },</div><div class='add'>+	[WMI_TAG_SOC_MAC_PHY_HW_MODE_CAPS] = {</div><div class='add'>+		.min_len = sizeof(struct ath12k_wmi_soc_mac_phy_hw_mode_caps_params) },</div><div class='add'>+	[WMI_TAG_SOC_HAL_REG_CAPABILITIES] = {</div><div class='add'>+		.min_len = sizeof(struct ath12k_wmi_soc_hal_reg_caps_params) },</div><div class='add'>+	[WMI_TAG_VDEV_START_RESPONSE_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_vdev_start_resp_event) },</div><div class='add'>+	[WMI_TAG_PEER_DELETE_RESP_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_peer_delete_resp_event) },</div><div class='add'>+	[WMI_TAG_OFFLOAD_BCN_TX_STATUS_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_bcn_tx_status_event) },</div><div class='add'>+	[WMI_TAG_VDEV_STOPPED_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_vdev_stopped_event) },</div><div class='add'>+	[WMI_TAG_REG_CHAN_LIST_CC_EXT_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_reg_chan_list_cc_ext_event) },</div><div class='add'>+	[WMI_TAG_MGMT_RX_HDR] = {</div><div class='add'>+		.min_len = sizeof(struct ath12k_wmi_mgmt_rx_params) },</div><div class='add'>+	[WMI_TAG_MGMT_TX_COMPL_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_mgmt_tx_compl_event) },</div><div class='add'>+	[WMI_TAG_SCAN_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_scan_event) },</div><div class='add'>+	[WMI_TAG_PEER_STA_KICKOUT_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_peer_sta_kickout_event) },</div><div class='add'>+	[WMI_TAG_ROAM_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_roam_event) },</div><div class='add'>+	[WMI_TAG_CHAN_INFO_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_chan_info_event) },</div><div class='add'>+	[WMI_TAG_PDEV_BSS_CHAN_INFO_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_pdev_bss_chan_info_event) },</div><div class='add'>+	[WMI_TAG_VDEV_INSTALL_KEY_COMPLETE_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_vdev_install_key_compl_event) },</div><div class='add'>+	[WMI_TAG_READY_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct ath12k_wmi_ready_event_min_params) },</div><div class='add'>+	[WMI_TAG_SERVICE_AVAILABLE_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_service_available_event) },</div><div class='add'>+	[WMI_TAG_PEER_ASSOC_CONF_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_peer_assoc_conf_event) },</div><div class='add'>+	[WMI_TAG_RFKILL_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_rfkill_state_change_event) },</div><div class='add'>+	[WMI_TAG_PDEV_CTL_FAILSAFE_CHECK_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_pdev_ctl_failsafe_chk_event) },</div><div class='add'>+	[WMI_TAG_HOST_SWFDA_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_fils_discovery_event) },</div><div class='add'>+	[WMI_TAG_OFFLOAD_PRB_RSP_TX_STATUS_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_probe_resp_tx_status_event) },</div><div class='add'>+	[WMI_TAG_VDEV_DELETE_RESP_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_vdev_delete_resp_event) },</div><div class='add'>+	[WMI_TAG_TWT_ENABLE_COMPLETE_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_twt_enable_event) },</div><div class='add'>+	[WMI_TAG_TWT_DISABLE_COMPLETE_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_twt_disable_event) },</div><div class='add'>+	[WMI_TAG_P2P_NOA_INFO] = {</div><div class='add'>+		.min_len = sizeof(struct ath12k_wmi_p2p_noa_info) },</div><div class='add'>+	[WMI_TAG_P2P_NOA_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_p2p_noa_event) },</div><div class='add'>+	[WMI_TAG_11D_NEW_COUNTRY_EVENT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_11d_new_cc_event) },</div><div class='add'>+	[WMI_TAG_PER_CHAIN_RSSI_STATS] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_per_chain_rssi_stat_params) },</div><div class='add'>+	[WMI_TAG_OBSS_COLOR_COLLISION_EVT] = {</div><div class='add'>+		.min_len = sizeof(struct wmi_obss_color_collision_event) },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+__le32 ath12k_wmi_tlv_hdr(u32 cmd, u32 len)</div><div class='add'>+{</div><div class='add'>+	return le32_encode_bits(cmd, WMI_TLV_TAG) |</div><div class='add'>+		le32_encode_bits(len, WMI_TLV_LEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __le32 ath12k_wmi_tlv_cmd_hdr(u32 cmd, u32 len)</div><div class='add'>+{</div><div class='add'>+	return ath12k_wmi_tlv_hdr(cmd, len - TLV_HDR_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_wmi_init_qcn9274(struct ath12k_base *ab,</div><div class='add'>+			     struct ath12k_wmi_resource_config_arg *config)</div><div class='add'>+{</div><div class='add'>+	config-&gt;num_vdevs = ab-&gt;num_radios * TARGET_NUM_VDEVS(ab);</div><div class='add'>+	config-&gt;num_peers = ab-&gt;num_radios *</div><div class='add'>+		ath12k_core_get_max_peers_per_radio(ab);</div><div class='add'>+	config-&gt;num_offload_peers = TARGET_NUM_OFFLD_PEERS;</div><div class='add'>+	config-&gt;num_offload_reorder_buffs = TARGET_NUM_OFFLD_REORDER_BUFFS;</div><div class='add'>+	config-&gt;num_peer_keys = TARGET_NUM_PEER_KEYS;</div><div class='add'>+	config-&gt;ast_skid_limit = TARGET_AST_SKID_LIMIT;</div><div class='add'>+	config-&gt;tx_chain_mask = (1 &lt;&lt; ab-&gt;target_caps.num_rf_chains) - 1;</div><div class='add'>+	config-&gt;rx_chain_mask = (1 &lt;&lt; ab-&gt;target_caps.num_rf_chains) - 1;</div><div class='add'>+	config-&gt;rx_timeout_pri[0] = TARGET_RX_TIMEOUT_LO_PRI;</div><div class='add'>+	config-&gt;rx_timeout_pri[1] = TARGET_RX_TIMEOUT_LO_PRI;</div><div class='add'>+	config-&gt;rx_timeout_pri[2] = TARGET_RX_TIMEOUT_LO_PRI;</div><div class='add'>+	config-&gt;rx_timeout_pri[3] = TARGET_RX_TIMEOUT_HI_PRI;</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH12K_FLAG_RAW_MODE, &amp;ab-&gt;dev_flags))</div><div class='add'>+		config-&gt;rx_decap_mode = TARGET_DECAP_MODE_RAW;</div><div class='add'>+	else</div><div class='add'>+		config-&gt;rx_decap_mode = TARGET_DECAP_MODE_NATIVE_WIFI;</div><div class='add'>+</div><div class='add'>+	config-&gt;scan_max_pending_req = TARGET_SCAN_MAX_PENDING_REQS;</div><div class='add'>+	config-&gt;bmiss_offload_max_vdev = TARGET_BMISS_OFFLOAD_MAX_VDEV;</div><div class='add'>+	config-&gt;roam_offload_max_vdev = TARGET_ROAM_OFFLOAD_MAX_VDEV;</div><div class='add'>+	config-&gt;roam_offload_max_ap_profiles = TARGET_ROAM_OFFLOAD_MAX_AP_PROFILES;</div><div class='add'>+	config-&gt;num_mcast_groups = TARGET_NUM_MCAST_GROUPS;</div><div class='add'>+	config-&gt;num_mcast_table_elems = TARGET_NUM_MCAST_TABLE_ELEMS;</div><div class='add'>+	config-&gt;mcast2ucast_mode = TARGET_MCAST2UCAST_MODE;</div><div class='add'>+	config-&gt;tx_dbg_log_size = TARGET_TX_DBG_LOG_SIZE;</div><div class='add'>+	config-&gt;num_wds_entries = TARGET_NUM_WDS_ENTRIES;</div><div class='add'>+	config-&gt;dma_burst_size = TARGET_DMA_BURST_SIZE;</div><div class='add'>+	config-&gt;rx_skip_defrag_timeout_dup_detection_check =</div><div class='add'>+		TARGET_RX_SKIP_DEFRAG_TIMEOUT_DUP_DETECTION_CHECK;</div><div class='add'>+	config-&gt;vow_config = TARGET_VOW_CONFIG;</div><div class='add'>+	config-&gt;gtk_offload_max_vdev = TARGET_GTK_OFFLOAD_MAX_VDEV;</div><div class='add'>+	config-&gt;num_msdu_desc = TARGET_NUM_MSDU_DESC;</div><div class='add'>+	config-&gt;beacon_tx_offload_max_vdev = ab-&gt;num_radios * TARGET_MAX_BCN_OFFLD;</div><div class='add'>+	config-&gt;rx_batchmode = TARGET_RX_BATCHMODE;</div><div class='add'>+	/* Indicates host supports peer map v3 and unmap v2 support */</div><div class='add'>+	config-&gt;peer_map_unmap_version = 0x32;</div><div class='add'>+	config-&gt;twt_ap_pdev_count = ab-&gt;num_radios;</div><div class='add'>+	config-&gt;twt_ap_sta_count = 1000;</div><div class='add'>+	config-&gt;ema_max_vap_cnt = ab-&gt;num_radios;</div><div class='add'>+	config-&gt;ema_max_profile_period = TARGET_EMA_MAX_PROFILE_PERIOD;</div><div class='add'>+	config-&gt;beacon_tx_offload_max_vdev += config-&gt;ema_max_vap_cnt;</div><div class='add'>+</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_PEER_METADATA_V1A_V1B_SUPPORT, ab-&gt;wmi_ab.svc_map))</div><div class='add'>+		config-&gt;peer_metadata_ver = ATH12K_PEER_METADATA_V1B;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_wmi_init_wcn7850(struct ath12k_base *ab,</div><div class='add'>+			     struct ath12k_wmi_resource_config_arg *config)</div><div class='add'>+{</div><div class='add'>+	config-&gt;num_vdevs = 4;</div><div class='add'>+	config-&gt;num_peers = 16;</div><div class='add'>+	config-&gt;num_tids = 32;</div><div class='add'>+</div><div class='add'>+	config-&gt;num_offload_peers = 3;</div><div class='add'>+	config-&gt;num_offload_reorder_buffs = 3;</div><div class='add'>+	config-&gt;num_peer_keys = TARGET_NUM_PEER_KEYS;</div><div class='add'>+	config-&gt;ast_skid_limit = TARGET_AST_SKID_LIMIT;</div><div class='add'>+	config-&gt;tx_chain_mask = (1 &lt;&lt; ab-&gt;target_caps.num_rf_chains) - 1;</div><div class='add'>+	config-&gt;rx_chain_mask = (1 &lt;&lt; ab-&gt;target_caps.num_rf_chains) - 1;</div><div class='add'>+	config-&gt;rx_timeout_pri[0] = TARGET_RX_TIMEOUT_LO_PRI;</div><div class='add'>+	config-&gt;rx_timeout_pri[1] = TARGET_RX_TIMEOUT_LO_PRI;</div><div class='add'>+	config-&gt;rx_timeout_pri[2] = TARGET_RX_TIMEOUT_LO_PRI;</div><div class='add'>+	config-&gt;rx_timeout_pri[3] = TARGET_RX_TIMEOUT_HI_PRI;</div><div class='add'>+	config-&gt;rx_decap_mode = TARGET_DECAP_MODE_NATIVE_WIFI;</div><div class='add'>+	config-&gt;scan_max_pending_req = TARGET_SCAN_MAX_PENDING_REQS;</div><div class='add'>+	config-&gt;bmiss_offload_max_vdev = TARGET_BMISS_OFFLOAD_MAX_VDEV;</div><div class='add'>+	config-&gt;roam_offload_max_vdev = TARGET_ROAM_OFFLOAD_MAX_VDEV;</div><div class='add'>+	config-&gt;roam_offload_max_ap_profiles = TARGET_ROAM_OFFLOAD_MAX_AP_PROFILES;</div><div class='add'>+	config-&gt;num_mcast_groups = 0;</div><div class='add'>+	config-&gt;num_mcast_table_elems = 0;</div><div class='add'>+	config-&gt;mcast2ucast_mode = 0;</div><div class='add'>+	config-&gt;tx_dbg_log_size = TARGET_TX_DBG_LOG_SIZE;</div><div class='add'>+	config-&gt;num_wds_entries = 0;</div><div class='add'>+	config-&gt;dma_burst_size = 0;</div><div class='add'>+	config-&gt;rx_skip_defrag_timeout_dup_detection_check = 0;</div><div class='add'>+	config-&gt;vow_config = TARGET_VOW_CONFIG;</div><div class='add'>+	config-&gt;gtk_offload_max_vdev = 2;</div><div class='add'>+	config-&gt;num_msdu_desc = 0x400;</div><div class='add'>+	config-&gt;beacon_tx_offload_max_vdev = 2;</div><div class='add'>+	config-&gt;rx_batchmode = TARGET_RX_BATCHMODE;</div><div class='add'>+</div><div class='add'>+	config-&gt;peer_map_unmap_version = 0x1;</div><div class='add'>+	config-&gt;use_pdev_id = 1;</div><div class='add'>+	config-&gt;max_frag_entries = 0xa;</div><div class='add'>+	config-&gt;num_tdls_vdevs = 0x1;</div><div class='add'>+	config-&gt;num_tdls_conn_table_entries = 8;</div><div class='add'>+	config-&gt;beacon_tx_offload_max_vdev = 0x2;</div><div class='add'>+	config-&gt;num_multicast_filter_entries = 0x20;</div><div class='add'>+	config-&gt;num_wow_filters = 0x16;</div><div class='add'>+	config-&gt;num_keep_alive_pattern = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define PRIMAP(_hw_mode_) \</div><div class='add'>+	[_hw_mode_] = _hw_mode_##_PRI</div><div class='add'>+</div><div class='add'>+static const int ath12k_hw_mode_pri_map[] = {</div><div class='add'>+	PRIMAP(WMI_HOST_HW_MODE_SINGLE),</div><div class='add'>+	PRIMAP(WMI_HOST_HW_MODE_DBS),</div><div class='add'>+	PRIMAP(WMI_HOST_HW_MODE_SBS_PASSIVE),</div><div class='add'>+	PRIMAP(WMI_HOST_HW_MODE_SBS),</div><div class='add'>+	PRIMAP(WMI_HOST_HW_MODE_DBS_SBS),</div><div class='add'>+	PRIMAP(WMI_HOST_HW_MODE_DBS_OR_SBS),</div><div class='add'>+	/* keep last */</div><div class='add'>+	PRIMAP(WMI_HOST_HW_MODE_MAX),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_wmi_tlv_iter(struct ath12k_base *ab, const void *ptr, size_t len,</div><div class='add'>+		    int (*iter)(struct ath12k_base *ab, u16 tag, u16 len,</div><div class='add'>+				const void *ptr, void *data),</div><div class='add'>+		    void *data)</div><div class='add'>+{</div><div class='add'>+	const void *begin = ptr;</div><div class='add'>+	const struct wmi_tlv *tlv;</div><div class='add'>+	u16 tlv_tag, tlv_len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	while (len &gt; 0) {</div><div class='add'>+		if (len &lt; sizeof(*tlv)) {</div><div class='add'>+			ath12k_err(ab, "wmi tlv parse failure at byte %zd (%zu bytes left, %zu expected)\n",</div><div class='add'>+				   ptr - begin, len, sizeof(*tlv));</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tlv = ptr;</div><div class='add'>+		tlv_tag = le32_get_bits(tlv-&gt;header, WMI_TLV_TAG);</div><div class='add'>+		tlv_len = le32_get_bits(tlv-&gt;header, WMI_TLV_LEN);</div><div class='add'>+		ptr += sizeof(*tlv);</div><div class='add'>+		len -= sizeof(*tlv);</div><div class='add'>+</div><div class='add'>+		if (tlv_len &gt; len) {</div><div class='add'>+			ath12k_err(ab, "wmi tlv parse failure of tag %u at byte %zd (%zu bytes left, %u expected)\n",</div><div class='add'>+				   tlv_tag, ptr - begin, len, tlv_len);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (tlv_tag &lt; ARRAY_SIZE(ath12k_wmi_tlv_policies) &amp;&amp;</div><div class='add'>+		    ath12k_wmi_tlv_policies[tlv_tag].min_len &amp;&amp;</div><div class='add'>+		    ath12k_wmi_tlv_policies[tlv_tag].min_len &gt; tlv_len) {</div><div class='add'>+			ath12k_err(ab, "wmi tlv parse failure of tag %u at byte %zd (%u bytes is less than min length %zu)\n",</div><div class='add'>+				   tlv_tag, ptr - begin, tlv_len,</div><div class='add'>+				   ath12k_wmi_tlv_policies[tlv_tag].min_len);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = iter(ab, tlv_tag, tlv_len, ptr, data);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ptr += tlv_len;</div><div class='add'>+		len -= tlv_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_tlv_iter_parse(struct ath12k_base *ab, u16 tag, u16 len,</div><div class='add'>+				     const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	const void **tb = data;</div><div class='add'>+</div><div class='add'>+	if (tag &lt; WMI_TAG_MAX)</div><div class='add'>+		tb[tag] = ptr;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_tlv_parse(struct ath12k_base *ar, const void **tb,</div><div class='add'>+				const void *ptr, size_t len)</div><div class='add'>+{</div><div class='add'>+	return ath12k_wmi_tlv_iter(ar, ptr, len, ath12k_wmi_tlv_iter_parse,</div><div class='add'>+				   (void *)tb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const void **</div><div class='add'>+ath12k_wmi_tlv_parse_alloc(struct ath12k_base *ab,</div><div class='add'>+			   struct sk_buff *skb, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = kcalloc(WMI_TAG_MAX, sizeof(*tb), gfp);</div><div class='add'>+	if (!tb)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_tlv_parse(ab, tb, skb-&gt;data, skb-&gt;len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return tb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_cmd_send_nowait(struct ath12k_wmi_pdev *wmi, struct sk_buff *skb,</div><div class='add'>+				      u32 cmd_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_skb_cb *skb_cb = ATH12K_SKB_CB(skb);</div><div class='add'>+	struct ath12k_base *ab = wmi-&gt;wmi_ab-&gt;ab;</div><div class='add'>+	struct wmi_cmd_hdr *cmd_hdr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!skb_push(skb, sizeof(struct wmi_cmd_hdr)))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd_hdr = (struct wmi_cmd_hdr *)skb-&gt;data;</div><div class='add'>+	cmd_hdr-&gt;cmd_id = le32_encode_bits(cmd_id, WMI_CMD_HDR_CMD_ID);</div><div class='add'>+</div><div class='add'>+	memset(skb_cb, 0, sizeof(*skb_cb));</div><div class='add'>+	ret = ath12k_htc_send(&amp;ab-&gt;htc, wmi-&gt;eid, skb);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_pull;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_pull:</div><div class='add'>+	skb_pull(skb, sizeof(struct wmi_cmd_hdr));</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_cmd_send(struct ath12k_wmi_pdev *wmi, struct sk_buff *skb,</div><div class='add'>+			u32 cmd_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_base *wmi_ab = wmi-&gt;wmi_ab;</div><div class='add'>+	int ret = -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	wait_event_timeout(wmi_ab-&gt;tx_credits_wq, ({</div><div class='add'>+		ret = ath12k_wmi_cmd_send_nowait(wmi, skb, cmd_id);</div><div class='add'>+</div><div class='add'>+		if (ret &amp;&amp; test_bit(ATH12K_FLAG_CRASH_FLUSH, &amp;wmi_ab-&gt;ab-&gt;dev_flags))</div><div class='add'>+			ret = -ESHUTDOWN;</div><div class='add'>+</div><div class='add'>+		(ret != -EAGAIN);</div><div class='add'>+	}), WMI_SEND_TIMEOUT_HZ);</div><div class='add'>+</div><div class='add'>+	if (ret == -EAGAIN)</div><div class='add'>+		ath12k_warn(wmi_ab-&gt;ab, "wmi command %d timeout\n", cmd_id);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pull_svc_ready_ext(struct ath12k_wmi_pdev *wmi_handle,</div><div class='add'>+				     const void *ptr,</div><div class='add'>+				     struct ath12k_wmi_service_ext_arg *arg)</div><div class='add'>+{</div><div class='add'>+	const struct wmi_service_ready_ext_event *ev = ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!ev)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Move this to host based bitmap */</div><div class='add'>+	arg-&gt;default_conc_scan_config_bits =</div><div class='add'>+		le32_to_cpu(ev-&gt;default_conc_scan_config_bits);</div><div class='add'>+	arg-&gt;default_fw_config_bits = le32_to_cpu(ev-&gt;default_fw_config_bits);</div><div class='add'>+	arg-&gt;he_cap_info = le32_to_cpu(ev-&gt;he_cap_info);</div><div class='add'>+	arg-&gt;mpdu_density = le32_to_cpu(ev-&gt;mpdu_density);</div><div class='add'>+	arg-&gt;max_bssid_rx_filters = le32_to_cpu(ev-&gt;max_bssid_rx_filters);</div><div class='add'>+	arg-&gt;ppet.numss_m1 = le32_to_cpu(ev-&gt;ppet.numss_m1);</div><div class='add'>+	arg-&gt;ppet.ru_bit_mask = le32_to_cpu(ev-&gt;ppet.ru_info);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WMI_MAX_NUM_SS; i++)</div><div class='add'>+		arg-&gt;ppet.ppet16_ppet8_ru3_ru0[i] =</div><div class='add'>+			le32_to_cpu(ev-&gt;ppet.ppet16_ppet8_ru3_ru0[i]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_pull_mac_phy_cap_svc_ready_ext(struct ath12k_wmi_pdev *wmi_handle,</div><div class='add'>+				      struct ath12k_wmi_svc_rdy_ext_parse *svc,</div><div class='add'>+				      u8 hw_mode_id, u8 phy_id,</div><div class='add'>+				      struct ath12k_pdev *pdev)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_wmi_mac_phy_caps_params *mac_caps;</div><div class='add'>+	const struct ath12k_wmi_soc_mac_phy_hw_mode_caps_params *hw_caps = svc-&gt;hw_caps;</div><div class='add'>+	const struct ath12k_wmi_hw_mode_cap_params *wmi_hw_mode_caps = svc-&gt;hw_mode_caps;</div><div class='add'>+	const struct ath12k_wmi_mac_phy_caps_params *wmi_mac_phy_caps = svc-&gt;mac_phy_caps;</div><div class='add'>+	struct ath12k_base *ab = wmi_handle-&gt;wmi_ab-&gt;ab;</div><div class='add'>+	struct ath12k_band_cap *cap_band;</div><div class='add'>+	struct ath12k_pdev_cap *pdev_cap = &amp;pdev-&gt;cap;</div><div class='add'>+	struct ath12k_fw_pdev *fw_pdev;</div><div class='add'>+	u32 phy_map;</div><div class='add'>+	u32 hw_idx, phy_idx = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!hw_caps || !wmi_hw_mode_caps || !svc-&gt;soc_hal_reg_caps)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (hw_idx = 0; hw_idx &lt; le32_to_cpu(hw_caps-&gt;num_hw_modes); hw_idx++) {</div><div class='add'>+		if (hw_mode_id == le32_to_cpu(wmi_hw_mode_caps[hw_idx].hw_mode_id))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		phy_map = le32_to_cpu(wmi_hw_mode_caps[hw_idx].phy_id_map);</div><div class='add'>+		phy_idx = fls(phy_map);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hw_idx == le32_to_cpu(hw_caps-&gt;num_hw_modes))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	phy_idx += phy_id;</div><div class='add'>+	if (phy_id &gt;= le32_to_cpu(svc-&gt;soc_hal_reg_caps-&gt;num_phy))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mac_caps = wmi_mac_phy_caps + phy_idx;</div><div class='add'>+</div><div class='add'>+	pdev-&gt;pdev_id = ath12k_wmi_mac_phy_get_pdev_id(mac_caps);</div><div class='add'>+	pdev-&gt;hw_link_id = ath12k_wmi_mac_phy_get_hw_link_id(mac_caps);</div><div class='add'>+	pdev_cap-&gt;supported_bands |= le32_to_cpu(mac_caps-&gt;supported_bands);</div><div class='add'>+	pdev_cap-&gt;ampdu_density = le32_to_cpu(mac_caps-&gt;ampdu_density);</div><div class='add'>+</div><div class='add'>+	fw_pdev = &amp;ab-&gt;fw_pdev[ab-&gt;fw_pdev_count];</div><div class='add'>+	fw_pdev-&gt;supported_bands = le32_to_cpu(mac_caps-&gt;supported_bands);</div><div class='add'>+	fw_pdev-&gt;pdev_id = ath12k_wmi_mac_phy_get_pdev_id(mac_caps);</div><div class='add'>+	fw_pdev-&gt;phy_id = le32_to_cpu(mac_caps-&gt;phy_id);</div><div class='add'>+	ab-&gt;fw_pdev_count++;</div><div class='add'>+</div><div class='add'>+	/* Take non-zero tx/rx chainmask. If tx/rx chainmask differs from</div><div class='add'>+	 * band to band for a single radio, need to see how this should be</div><div class='add'>+	 * handled.</div><div class='add'>+	 */</div><div class='add'>+	if (le32_to_cpu(mac_caps-&gt;supported_bands) &amp; WMI_HOST_WLAN_2GHZ_CAP) {</div><div class='add'>+		pdev_cap-&gt;tx_chain_mask = le32_to_cpu(mac_caps-&gt;tx_chain_mask_2g);</div><div class='add'>+		pdev_cap-&gt;rx_chain_mask = le32_to_cpu(mac_caps-&gt;rx_chain_mask_2g);</div><div class='add'>+	} else if (le32_to_cpu(mac_caps-&gt;supported_bands) &amp; WMI_HOST_WLAN_5GHZ_CAP) {</div><div class='add'>+		pdev_cap-&gt;vht_cap = le32_to_cpu(mac_caps-&gt;vht_cap_info_5g);</div><div class='add'>+		pdev_cap-&gt;vht_mcs = le32_to_cpu(mac_caps-&gt;vht_supp_mcs_5g);</div><div class='add'>+		pdev_cap-&gt;he_mcs = le32_to_cpu(mac_caps-&gt;he_supp_mcs_5g);</div><div class='add'>+		pdev_cap-&gt;tx_chain_mask = le32_to_cpu(mac_caps-&gt;tx_chain_mask_5g);</div><div class='add'>+		pdev_cap-&gt;rx_chain_mask = le32_to_cpu(mac_caps-&gt;rx_chain_mask_5g);</div><div class='add'>+		pdev_cap-&gt;nss_ratio_enabled =</div><div class='add'>+			WMI_NSS_RATIO_EN_DIS_GET(mac_caps-&gt;nss_ratio);</div><div class='add'>+		pdev_cap-&gt;nss_ratio_info =</div><div class='add'>+			WMI_NSS_RATIO_INFO_GET(mac_caps-&gt;nss_ratio);</div><div class='add'>+	} else {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* tx/rx chainmask reported from fw depends on the actual hw chains used,</div><div class='add'>+	 * For example, for 4x4 capable macphys, first 4 chains can be used for first</div><div class='add'>+	 * mac and the remaining 4 chains can be used for the second mac or vice-versa.</div><div class='add'>+	 * In this case, tx/rx chainmask 0xf will be advertised for first mac and 0xf0</div><div class='add'>+	 * will be advertised for second mac or vice-versa. Compute the shift value</div><div class='add'>+	 * for tx/rx chainmask which will be used to advertise supported ht/vht rates to</div><div class='add'>+	 * mac80211.</div><div class='add'>+	 */</div><div class='add'>+	pdev_cap-&gt;tx_chain_mask_shift =</div><div class='add'>+			find_first_bit((unsigned long *)&amp;pdev_cap-&gt;tx_chain_mask, 32);</div><div class='add'>+	pdev_cap-&gt;rx_chain_mask_shift =</div><div class='add'>+			find_first_bit((unsigned long *)&amp;pdev_cap-&gt;rx_chain_mask, 32);</div><div class='add'>+</div><div class='add'>+	if (le32_to_cpu(mac_caps-&gt;supported_bands) &amp; WMI_HOST_WLAN_2GHZ_CAP) {</div><div class='add'>+		cap_band = &amp;pdev_cap-&gt;band[NL80211_BAND_2GHZ];</div><div class='add'>+		cap_band-&gt;phy_id = le32_to_cpu(mac_caps-&gt;phy_id);</div><div class='add'>+		cap_band-&gt;max_bw_supported = le32_to_cpu(mac_caps-&gt;max_bw_supported_2g);</div><div class='add'>+		cap_band-&gt;ht_cap_info = le32_to_cpu(mac_caps-&gt;ht_cap_info_2g);</div><div class='add'>+		cap_band-&gt;he_cap_info[0] = le32_to_cpu(mac_caps-&gt;he_cap_info_2g);</div><div class='add'>+		cap_band-&gt;he_cap_info[1] = le32_to_cpu(mac_caps-&gt;he_cap_info_2g_ext);</div><div class='add'>+		cap_band-&gt;he_mcs = le32_to_cpu(mac_caps-&gt;he_supp_mcs_2g);</div><div class='add'>+		for (i = 0; i &lt; WMI_MAX_HECAP_PHY_SIZE; i++)</div><div class='add'>+			cap_band-&gt;he_cap_phy_info[i] =</div><div class='add'>+				le32_to_cpu(mac_caps-&gt;he_cap_phy_info_2g[i]);</div><div class='add'>+</div><div class='add'>+		cap_band-&gt;he_ppet.numss_m1 = le32_to_cpu(mac_caps-&gt;he_ppet2g.numss_m1);</div><div class='add'>+		cap_band-&gt;he_ppet.ru_bit_mask = le32_to_cpu(mac_caps-&gt;he_ppet2g.ru_info);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; WMI_MAX_NUM_SS; i++)</div><div class='add'>+			cap_band-&gt;he_ppet.ppet16_ppet8_ru3_ru0[i] =</div><div class='add'>+				le32_to_cpu(mac_caps-&gt;he_ppet2g.ppet16_ppet8_ru3_ru0[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (le32_to_cpu(mac_caps-&gt;supported_bands) &amp; WMI_HOST_WLAN_5GHZ_CAP) {</div><div class='add'>+		cap_band = &amp;pdev_cap-&gt;band[NL80211_BAND_5GHZ];</div><div class='add'>+		cap_band-&gt;phy_id = le32_to_cpu(mac_caps-&gt;phy_id);</div><div class='add'>+		cap_band-&gt;max_bw_supported =</div><div class='add'>+			le32_to_cpu(mac_caps-&gt;max_bw_supported_5g);</div><div class='add'>+		cap_band-&gt;ht_cap_info = le32_to_cpu(mac_caps-&gt;ht_cap_info_5g);</div><div class='add'>+		cap_band-&gt;he_cap_info[0] = le32_to_cpu(mac_caps-&gt;he_cap_info_5g);</div><div class='add'>+		cap_band-&gt;he_cap_info[1] = le32_to_cpu(mac_caps-&gt;he_cap_info_5g_ext);</div><div class='add'>+		cap_band-&gt;he_mcs = le32_to_cpu(mac_caps-&gt;he_supp_mcs_5g);</div><div class='add'>+		for (i = 0; i &lt; WMI_MAX_HECAP_PHY_SIZE; i++)</div><div class='add'>+			cap_band-&gt;he_cap_phy_info[i] =</div><div class='add'>+				le32_to_cpu(mac_caps-&gt;he_cap_phy_info_5g[i]);</div><div class='add'>+</div><div class='add'>+		cap_band-&gt;he_ppet.numss_m1 = le32_to_cpu(mac_caps-&gt;he_ppet5g.numss_m1);</div><div class='add'>+		cap_band-&gt;he_ppet.ru_bit_mask = le32_to_cpu(mac_caps-&gt;he_ppet5g.ru_info);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; WMI_MAX_NUM_SS; i++)</div><div class='add'>+			cap_band-&gt;he_ppet.ppet16_ppet8_ru3_ru0[i] =</div><div class='add'>+				le32_to_cpu(mac_caps-&gt;he_ppet5g.ppet16_ppet8_ru3_ru0[i]);</div><div class='add'>+</div><div class='add'>+		cap_band = &amp;pdev_cap-&gt;band[NL80211_BAND_6GHZ];</div><div class='add'>+		cap_band-&gt;max_bw_supported =</div><div class='add'>+			le32_to_cpu(mac_caps-&gt;max_bw_supported_5g);</div><div class='add'>+		cap_band-&gt;ht_cap_info = le32_to_cpu(mac_caps-&gt;ht_cap_info_5g);</div><div class='add'>+		cap_band-&gt;he_cap_info[0] = le32_to_cpu(mac_caps-&gt;he_cap_info_5g);</div><div class='add'>+		cap_band-&gt;he_cap_info[1] = le32_to_cpu(mac_caps-&gt;he_cap_info_5g_ext);</div><div class='add'>+		cap_band-&gt;he_mcs = le32_to_cpu(mac_caps-&gt;he_supp_mcs_5g);</div><div class='add'>+		for (i = 0; i &lt; WMI_MAX_HECAP_PHY_SIZE; i++)</div><div class='add'>+			cap_band-&gt;he_cap_phy_info[i] =</div><div class='add'>+				le32_to_cpu(mac_caps-&gt;he_cap_phy_info_5g[i]);</div><div class='add'>+</div><div class='add'>+		cap_band-&gt;he_ppet.numss_m1 = le32_to_cpu(mac_caps-&gt;he_ppet5g.numss_m1);</div><div class='add'>+		cap_band-&gt;he_ppet.ru_bit_mask = le32_to_cpu(mac_caps-&gt;he_ppet5g.ru_info);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; WMI_MAX_NUM_SS; i++)</div><div class='add'>+			cap_band-&gt;he_ppet.ppet16_ppet8_ru3_ru0[i] =</div><div class='add'>+				le32_to_cpu(mac_caps-&gt;he_ppet5g.ppet16_ppet8_ru3_ru0[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_pull_reg_cap_svc_rdy_ext(struct ath12k_wmi_pdev *wmi_handle,</div><div class='add'>+				const struct ath12k_wmi_soc_hal_reg_caps_params *reg_caps,</div><div class='add'>+				const struct ath12k_wmi_hal_reg_caps_ext_params *ext_caps,</div><div class='add'>+				u8 phy_idx,</div><div class='add'>+				struct ath12k_wmi_hal_reg_capabilities_ext_arg *param)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_wmi_hal_reg_caps_ext_params *ext_reg_cap;</div><div class='add'>+</div><div class='add'>+	if (!reg_caps || !ext_caps)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (phy_idx &gt;= le32_to_cpu(reg_caps-&gt;num_phy))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ext_reg_cap = &amp;ext_caps[phy_idx];</div><div class='add'>+</div><div class='add'>+	param-&gt;phy_id = le32_to_cpu(ext_reg_cap-&gt;phy_id);</div><div class='add'>+	param-&gt;eeprom_reg_domain = le32_to_cpu(ext_reg_cap-&gt;eeprom_reg_domain);</div><div class='add'>+	param-&gt;eeprom_reg_domain_ext =</div><div class='add'>+		le32_to_cpu(ext_reg_cap-&gt;eeprom_reg_domain_ext);</div><div class='add'>+	param-&gt;regcap1 = le32_to_cpu(ext_reg_cap-&gt;regcap1);</div><div class='add'>+	param-&gt;regcap2 = le32_to_cpu(ext_reg_cap-&gt;regcap2);</div><div class='add'>+	/* check if param-&gt;wireless_mode is needed */</div><div class='add'>+	param-&gt;low_2ghz_chan = le32_to_cpu(ext_reg_cap-&gt;low_2ghz_chan);</div><div class='add'>+	param-&gt;high_2ghz_chan = le32_to_cpu(ext_reg_cap-&gt;high_2ghz_chan);</div><div class='add'>+	param-&gt;low_5ghz_chan = le32_to_cpu(ext_reg_cap-&gt;low_5ghz_chan);</div><div class='add'>+	param-&gt;high_5ghz_chan = le32_to_cpu(ext_reg_cap-&gt;high_5ghz_chan);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pull_service_ready_tlv(struct ath12k_base *ab,</div><div class='add'>+					 const void *evt_buf,</div><div class='add'>+					 struct ath12k_wmi_target_cap_arg *cap)</div><div class='add'>+{</div><div class='add'>+	const struct wmi_service_ready_event *ev = evt_buf;</div><div class='add'>+</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_err(ab, "%s: failed by NULL param\n",</div><div class='add'>+			   __func__);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cap-&gt;phy_capability = le32_to_cpu(ev-&gt;phy_capability);</div><div class='add'>+	cap-&gt;max_frag_entry = le32_to_cpu(ev-&gt;max_frag_entry);</div><div class='add'>+	cap-&gt;num_rf_chains = le32_to_cpu(ev-&gt;num_rf_chains);</div><div class='add'>+	cap-&gt;ht_cap_info = le32_to_cpu(ev-&gt;ht_cap_info);</div><div class='add'>+	cap-&gt;vht_cap_info = le32_to_cpu(ev-&gt;vht_cap_info);</div><div class='add'>+	cap-&gt;vht_supp_mcs = le32_to_cpu(ev-&gt;vht_supp_mcs);</div><div class='add'>+	cap-&gt;hw_min_tx_power = le32_to_cpu(ev-&gt;hw_min_tx_power);</div><div class='add'>+	cap-&gt;hw_max_tx_power = le32_to_cpu(ev-&gt;hw_max_tx_power);</div><div class='add'>+	cap-&gt;sys_cap_info = le32_to_cpu(ev-&gt;sys_cap_info);</div><div class='add'>+	cap-&gt;min_pkt_size_enable = le32_to_cpu(ev-&gt;min_pkt_size_enable);</div><div class='add'>+	cap-&gt;max_bcn_ie_size = le32_to_cpu(ev-&gt;max_bcn_ie_size);</div><div class='add'>+	cap-&gt;max_num_scan_channels = le32_to_cpu(ev-&gt;max_num_scan_channels);</div><div class='add'>+	cap-&gt;max_supported_macs = le32_to_cpu(ev-&gt;max_supported_macs);</div><div class='add'>+	cap-&gt;wmi_fw_sub_feat_caps = le32_to_cpu(ev-&gt;wmi_fw_sub_feat_caps);</div><div class='add'>+	cap-&gt;txrx_chainmask = le32_to_cpu(ev-&gt;txrx_chainmask);</div><div class='add'>+	cap-&gt;default_dbs_hw_mode_index = le32_to_cpu(ev-&gt;default_dbs_hw_mode_index);</div><div class='add'>+	cap-&gt;num_msdu_desc = le32_to_cpu(ev-&gt;num_msdu_desc);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Save the wmi_service_bitmap into a linear bitmap. The wmi_services in</div><div class='add'>+ * wmi_service ready event are advertised in b0-b3 (LSB 4-bits) of each</div><div class='add'>+ * 4-byte word.</div><div class='add'>+ */</div><div class='add'>+static void ath12k_wmi_service_bitmap_copy(struct ath12k_wmi_pdev *wmi,</div><div class='add'>+					   const u32 *wmi_svc_bm)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0, j = 0; i &lt; WMI_SERVICE_BM_SIZE &amp;&amp; j &lt; WMI_MAX_SERVICE; i++) {</div><div class='add'>+		do {</div><div class='add'>+			if (wmi_svc_bm[i] &amp; BIT(j % WMI_SERVICE_BITS_IN_SIZE32))</div><div class='add'>+				set_bit(j, wmi-&gt;wmi_ab-&gt;svc_map);</div><div class='add'>+		} while (++j % WMI_SERVICE_BITS_IN_SIZE32);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_svc_rdy_parse(struct ath12k_base *ab, u16 tag, u16 len,</div><div class='add'>+				    const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_svc_ready_parse *svc_ready = data;</div><div class='add'>+	struct ath12k_wmi_pdev *wmi_handle = &amp;ab-&gt;wmi_ab.wmi[0];</div><div class='add'>+	u16 expect_len;</div><div class='add'>+</div><div class='add'>+	switch (tag) {</div><div class='add'>+	case WMI_TAG_SERVICE_READY_EVENT:</div><div class='add'>+		if (ath12k_pull_service_ready_tlv(ab, ptr, &amp;ab-&gt;target_caps))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WMI_TAG_ARRAY_UINT32:</div><div class='add'>+		if (!svc_ready-&gt;wmi_svc_bitmap_done) {</div><div class='add'>+			expect_len = WMI_SERVICE_BM_SIZE * sizeof(u32);</div><div class='add'>+			if (len &lt; expect_len) {</div><div class='add'>+				ath12k_warn(ab, "invalid len %d for the tag 0x%x\n",</div><div class='add'>+					    len, tag);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ath12k_wmi_service_bitmap_copy(wmi_handle, ptr);</div><div class='add'>+</div><div class='add'>+			svc_ready-&gt;wmi_svc_bitmap_done = true;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_service_ready_event(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_svc_ready_parse svc_ready = { };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_tlv_iter(ab, skb-&gt;data, skb-&gt;len,</div><div class='add'>+				  ath12k_wmi_svc_rdy_parse,</div><div class='add'>+				  &amp;svc_ready);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ath12k_wmi_mgmt_get_freq(struct ath12k *ar,</div><div class='add'>+				    struct ieee80211_tx_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	u32 freq = 0;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;single_pdev_only &amp;&amp;</div><div class='add'>+	    ar-&gt;scan.is_roc &amp;&amp;</div><div class='add'>+	    (info-&gt;flags &amp; IEEE80211_TX_CTL_TX_OFFCHAN))</div><div class='add'>+		freq = ar-&gt;scan.roc_freq;</div><div class='add'>+</div><div class='add'>+	return freq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sk_buff *ath12k_wmi_alloc_skb(struct ath12k_wmi_base *wmi_ab, u32 len)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct ath12k_base *ab = wmi_ab-&gt;ab;</div><div class='add'>+	u32 round_len = roundup(len, 4);</div><div class='add'>+</div><div class='add'>+	skb = ath12k_htc_alloc_skb(ab, WMI_SKB_HEADROOM + round_len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb, WMI_SKB_HEADROOM);</div><div class='add'>+	if (!IS_ALIGNED((unsigned long)skb-&gt;data, 4))</div><div class='add'>+		ath12k_warn(ab, "unaligned WMI skb data\n");</div><div class='add'>+</div><div class='add'>+	skb_put(skb, round_len);</div><div class='add'>+	memset(skb-&gt;data, 0, round_len);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_mgmt_send(struct ath12k_link_vif *arvif, u32 buf_id,</div><div class='add'>+			 struct sk_buff *frame)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_mgmt_send_cmd *cmd;</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(frame);</div><div class='add'>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)frame-&gt;data;</div><div class='add'>+	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif-&gt;ahvif);</div><div class='add'>+	int cmd_len = sizeof(struct ath12k_wmi_mgmt_send_tx_params);</div><div class='add'>+	struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)hdr;</div><div class='add'>+	struct ath12k_wmi_mlo_mgmt_send_params *ml_params;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct wmi_tlv *frame_tlv, *tlv;</div><div class='add'>+	struct ath12k_skb_cb *skb_cb;</div><div class='add'>+	u32 buf_len, buf_len_aligned;</div><div class='add'>+	u32 vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+	bool link_agnostic = false;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret, len;</div><div class='add'>+	void *ptr;</div><div class='add'>+</div><div class='add'>+	buf_len = min_t(int, frame-&gt;len, WMI_MGMT_SEND_DOWNLD_LEN);</div><div class='add'>+</div><div class='add'>+	buf_len_aligned = roundup(buf_len, sizeof(u32));</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd) + sizeof(*frame_tlv) + buf_len_aligned;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_is_mld(vif)) {</div><div class='add'>+		skb_cb = ATH12K_SKB_CB(frame);</div><div class='add'>+		if ((skb_cb-&gt;flags &amp; ATH12K_SKB_MLO_STA) &amp;&amp;</div><div class='add'>+		    ab-&gt;hw_params-&gt;hw_ops-&gt;is_frame_link_agnostic &amp;&amp;</div><div class='add'>+		    ab-&gt;hw_params-&gt;hw_ops-&gt;is_frame_link_agnostic(arvif, mgmt)) {</div><div class='add'>+			len += cmd_len + TLV_HDR_SIZE + sizeof(*ml_params);</div><div class='add'>+			ath12k_generic_dbg(ATH12K_DBG_MGMT,</div><div class='add'>+					   "Sending Mgmt Frame fc 0x%0x as link agnostic",</div><div class='add'>+					   mgmt-&gt;frame_control);</div><div class='add'>+			link_agnostic = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_mgmt_send_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_MGMT_TX_SEND_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;desc_id = cpu_to_le32(buf_id);</div><div class='add'>+	cmd-&gt;chanfreq = cpu_to_le32(ath12k_wmi_mgmt_get_freq(ar, info));</div><div class='add'>+	cmd-&gt;paddr_lo = cpu_to_le32(lower_32_bits(ATH12K_SKB_CB(frame)-&gt;paddr));</div><div class='add'>+	cmd-&gt;paddr_hi = cpu_to_le32(upper_32_bits(ATH12K_SKB_CB(frame)-&gt;paddr));</div><div class='add'>+	cmd-&gt;frame_len = cpu_to_le32(frame-&gt;len);</div><div class='add'>+	cmd-&gt;buf_len = cpu_to_le32(buf_len);</div><div class='add'>+	cmd-&gt;tx_params_valid = 0;</div><div class='add'>+</div><div class='add'>+	frame_tlv = (struct wmi_tlv *)(skb-&gt;data + sizeof(*cmd));</div><div class='add'>+	frame_tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE, buf_len_aligned);</div><div class='add'>+</div><div class='add'>+	memcpy(frame_tlv-&gt;value, frame-&gt;data, buf_len);</div><div class='add'>+</div><div class='add'>+	if (!link_agnostic)</div><div class='add'>+		goto send;</div><div class='add'>+</div><div class='add'>+	ptr = skb-&gt;data + sizeof(*cmd) + sizeof(*frame_tlv) + buf_len_aligned;</div><div class='add'>+</div><div class='add'>+	tlv = ptr;</div><div class='add'>+</div><div class='add'>+	/* Tx params not used currently */</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_TX_SEND_PARAMS, cmd_len);</div><div class='add'>+	ptr += cmd_len;</div><div class='add'>+</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, sizeof(*ml_params));</div><div class='add'>+	ptr += TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	ml_params = ptr;</div><div class='add'>+	ml_params-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_MLO_TX_SEND_PARAMS,</div><div class='add'>+						       sizeof(*ml_params));</div><div class='add'>+</div><div class='add'>+	ml_params-&gt;hw_link_id = cpu_to_le32(WMI_MGMT_LINK_AGNOSTIC_ID);</div><div class='add'>+</div><div class='add'>+send:</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_MGMT_TX_SEND_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to submit WMI_MGMT_TX_SEND_CMDID cmd\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_stats_request_cmd(struct ath12k *ar, u32 stats_id,</div><div class='add'>+				      u32 vdev_id, u32 pdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_request_stats_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_request_stats_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_REQUEST_STATS_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;stats_id = cpu_to_le32(stats_id);</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;pdev_id = cpu_to_le32(pdev_id);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_REQUEST_STATS_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to send WMI_REQUEST_STATS cmd\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI request stats 0x%x vdev id %d pdev id %d\n",</div><div class='add'>+		   stats_id, vdev_id, pdev_id);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_vdev_create(struct ath12k *ar, u8 *macaddr,</div><div class='add'>+			   struct ath12k_wmi_vdev_create_arg *args)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_vdev_create_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct ath12k_wmi_vdev_txrx_streams_params *txrx_streams;</div><div class='add'>+	bool is_ml_vdev = is_valid_ether_addr(args-&gt;mld_addr);</div><div class='add'>+	struct wmi_vdev_create_mlo_params *ml_params;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	int ret, len;</div><div class='add'>+	void *ptr;</div><div class='add'>+</div><div class='add'>+	/* It can be optimized my sending tx/rx chain configuration</div><div class='add'>+	 * only for supported bands instead of always sending it for</div><div class='add'>+	 * both the bands.</div><div class='add'>+	 */</div><div class='add'>+	len = sizeof(*cmd) + TLV_HDR_SIZE +</div><div class='add'>+		(WMI_NUM_SUPPORTED_BAND_MAX * sizeof(*txrx_streams)) +</div><div class='add'>+		(is_ml_vdev ? TLV_HDR_SIZE + sizeof(*ml_params) : 0);</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_vdev_create_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_VDEV_CREATE_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(args-&gt;if_id);</div><div class='add'>+	cmd-&gt;vdev_type = cpu_to_le32(args-&gt;type);</div><div class='add'>+	cmd-&gt;vdev_subtype = cpu_to_le32(args-&gt;subtype);</div><div class='add'>+	cmd-&gt;num_cfg_txrx_streams = cpu_to_le32(WMI_NUM_SUPPORTED_BAND_MAX);</div><div class='add'>+	cmd-&gt;pdev_id = cpu_to_le32(args-&gt;pdev_id);</div><div class='add'>+	cmd-&gt;mbssid_flags = cpu_to_le32(args-&gt;mbssid_flags);</div><div class='add'>+	cmd-&gt;mbssid_tx_vdev_id = cpu_to_le32(args-&gt;mbssid_tx_vdev_id);</div><div class='add'>+	cmd-&gt;vdev_stats_id = cpu_to_le32(args-&gt;if_stats_id);</div><div class='add'>+	ether_addr_copy(cmd-&gt;vdev_macaddr.addr, macaddr);</div><div class='add'>+</div><div class='add'>+	if (args-&gt;if_stats_id != ATH12K_INVAL_VDEV_STATS_ID)</div><div class='add'>+		cmd-&gt;vdev_stats_id_valid = cpu_to_le32(BIT(0));</div><div class='add'>+</div><div class='add'>+	ptr = skb-&gt;data + sizeof(*cmd);</div><div class='add'>+	len = WMI_NUM_SUPPORTED_BAND_MAX * sizeof(*txrx_streams);</div><div class='add'>+</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, len);</div><div class='add'>+</div><div class='add'>+	ptr += TLV_HDR_SIZE;</div><div class='add'>+	txrx_streams = ptr;</div><div class='add'>+	len = sizeof(*txrx_streams);</div><div class='add'>+	txrx_streams-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_VDEV_TXRX_STREAMS,</div><div class='add'>+							  len);</div><div class='add'>+	txrx_streams-&gt;band = cpu_to_le32(WMI_TPC_CHAINMASK_CONFIG_BAND_2G);</div><div class='add'>+	txrx_streams-&gt;supported_tx_streams =</div><div class='add'>+				cpu_to_le32(args-&gt;chains[NL80211_BAND_2GHZ].tx);</div><div class='add'>+	txrx_streams-&gt;supported_rx_streams =</div><div class='add'>+				cpu_to_le32(args-&gt;chains[NL80211_BAND_2GHZ].rx);</div><div class='add'>+</div><div class='add'>+	txrx_streams++;</div><div class='add'>+	txrx_streams-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_VDEV_TXRX_STREAMS,</div><div class='add'>+							  len);</div><div class='add'>+	txrx_streams-&gt;band = cpu_to_le32(WMI_TPC_CHAINMASK_CONFIG_BAND_5G);</div><div class='add'>+	txrx_streams-&gt;supported_tx_streams =</div><div class='add'>+				cpu_to_le32(args-&gt;chains[NL80211_BAND_5GHZ].tx);</div><div class='add'>+	txrx_streams-&gt;supported_rx_streams =</div><div class='add'>+				cpu_to_le32(args-&gt;chains[NL80211_BAND_5GHZ].rx);</div><div class='add'>+</div><div class='add'>+	ptr += WMI_NUM_SUPPORTED_BAND_MAX * sizeof(*txrx_streams);</div><div class='add'>+</div><div class='add'>+	if (is_ml_vdev) {</div><div class='add'>+		tlv = ptr;</div><div class='add'>+		tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT,</div><div class='add'>+						 sizeof(*ml_params));</div><div class='add'>+		ptr += TLV_HDR_SIZE;</div><div class='add'>+		ml_params = ptr;</div><div class='add'>+</div><div class='add'>+		ml_params-&gt;tlv_header =</div><div class='add'>+			ath12k_wmi_tlv_cmd_hdr(WMI_TAG_MLO_VDEV_CREATE_PARAMS,</div><div class='add'>+					       sizeof(*ml_params));</div><div class='add'>+		ether_addr_copy(ml_params-&gt;mld_macaddr.addr, args-&gt;mld_addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI vdev create: id %d type %d subtype %d macaddr %pM pdevid %d\n",</div><div class='add'>+		   args-&gt;if_id, args-&gt;type, args-&gt;subtype,</div><div class='add'>+		   macaddr, args-&gt;pdev_id);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_VDEV_CREATE_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to submit WMI_VDEV_CREATE_CMDID\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_vdev_delete(struct ath12k *ar, u8 vdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_vdev_delete_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_vdev_delete_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_VDEV_DELETE_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI, "WMI vdev delete id %d\n", vdev_id);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_VDEV_DELETE_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to submit WMI_VDEV_DELETE_CMDID\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_vdev_stop(struct ath12k *ar, u8 vdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_vdev_stop_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_vdev_stop_cmd *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_VDEV_STOP_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI, "WMI vdev stop id 0x%x\n", vdev_id);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_VDEV_STOP_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to submit WMI_VDEV_STOP cmd\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_vdev_down(struct ath12k *ar, u8 vdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_vdev_down_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_vdev_down_cmd *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_VDEV_DOWN_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI, "WMI vdev down id 0x%x\n", vdev_id);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_VDEV_DOWN_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to submit WMI_VDEV_DOWN cmd\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_put_wmi_channel(struct ath12k_wmi_channel_params *chan,</div><div class='add'>+				       struct wmi_vdev_start_req_arg *arg)</div><div class='add'>+{</div><div class='add'>+	u32 center_freq1 = arg-&gt;band_center_freq1;</div><div class='add'>+</div><div class='add'>+	memset(chan, 0, sizeof(*chan));</div><div class='add'>+</div><div class='add'>+	chan-&gt;mhz = cpu_to_le32(arg-&gt;freq);</div><div class='add'>+	chan-&gt;band_center_freq1 = cpu_to_le32(center_freq1);</div><div class='add'>+	if (arg-&gt;mode == MODE_11BE_EHT320) {</div><div class='add'>+		if (arg-&gt;freq &gt; center_freq1)</div><div class='add'>+			chan-&gt;band_center_freq1 = cpu_to_le32(center_freq1 + 80);</div><div class='add'>+		else</div><div class='add'>+			chan-&gt;band_center_freq1 = cpu_to_le32(center_freq1 - 80);</div><div class='add'>+</div><div class='add'>+		chan-&gt;band_center_freq2 = cpu_to_le32(center_freq1);</div><div class='add'>+</div><div class='add'>+	} else if (arg-&gt;mode == MODE_11BE_EHT160 ||</div><div class='add'>+		   arg-&gt;mode == MODE_11AX_HE160) {</div><div class='add'>+		if (arg-&gt;freq &gt; center_freq1)</div><div class='add'>+			chan-&gt;band_center_freq1 = cpu_to_le32(center_freq1 + 40);</div><div class='add'>+		else</div><div class='add'>+			chan-&gt;band_center_freq1 = cpu_to_le32(center_freq1 - 40);</div><div class='add'>+</div><div class='add'>+		chan-&gt;band_center_freq2 = cpu_to_le32(center_freq1);</div><div class='add'>+	} else {</div><div class='add'>+		chan-&gt;band_center_freq2 = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chan-&gt;info |= le32_encode_bits(arg-&gt;mode, WMI_CHAN_INFO_MODE);</div><div class='add'>+	if (arg-&gt;passive)</div><div class='add'>+		chan-&gt;info |= cpu_to_le32(WMI_CHAN_INFO_PASSIVE);</div><div class='add'>+	if (arg-&gt;allow_ibss)</div><div class='add'>+		chan-&gt;info |= cpu_to_le32(WMI_CHAN_INFO_ADHOC_ALLOWED);</div><div class='add'>+	if (arg-&gt;allow_ht)</div><div class='add'>+		chan-&gt;info |= cpu_to_le32(WMI_CHAN_INFO_ALLOW_HT);</div><div class='add'>+	if (arg-&gt;allow_vht)</div><div class='add'>+		chan-&gt;info |= cpu_to_le32(WMI_CHAN_INFO_ALLOW_VHT);</div><div class='add'>+	if (arg-&gt;allow_he)</div><div class='add'>+		chan-&gt;info |= cpu_to_le32(WMI_CHAN_INFO_ALLOW_HE);</div><div class='add'>+	if (arg-&gt;ht40plus)</div><div class='add'>+		chan-&gt;info |= cpu_to_le32(WMI_CHAN_INFO_HT40_PLUS);</div><div class='add'>+	if (arg-&gt;chan_radar)</div><div class='add'>+		chan-&gt;info |= cpu_to_le32(WMI_CHAN_INFO_DFS);</div><div class='add'>+	if (arg-&gt;freq2_radar)</div><div class='add'>+		chan-&gt;info |= cpu_to_le32(WMI_CHAN_INFO_DFS_FREQ2);</div><div class='add'>+</div><div class='add'>+	chan-&gt;reg_info_1 = le32_encode_bits(arg-&gt;max_power,</div><div class='add'>+					    WMI_CHAN_REG_INFO1_MAX_PWR) |</div><div class='add'>+		le32_encode_bits(arg-&gt;max_reg_power,</div><div class='add'>+				 WMI_CHAN_REG_INFO1_MAX_REG_PWR);</div><div class='add'>+</div><div class='add'>+	chan-&gt;reg_info_2 = le32_encode_bits(arg-&gt;max_antenna_gain,</div><div class='add'>+					    WMI_CHAN_REG_INFO2_ANT_MAX) |</div><div class='add'>+		le32_encode_bits(arg-&gt;max_power, WMI_CHAN_REG_INFO2_MAX_TX_PWR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_vdev_start(struct ath12k *ar, struct wmi_vdev_start_req_arg *arg,</div><div class='add'>+			  bool restart)</div><div class='add'>+{</div><div class='add'>+	struct wmi_vdev_start_mlo_params *ml_params;</div><div class='add'>+	struct wmi_partner_link_info *partner_info;</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_vdev_start_request_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct ath12k_wmi_channel_params *chan;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	void *ptr;</div><div class='add'>+	int ret, len, i, ml_arg_size = 0;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(arg-&gt;ssid_len &gt; sizeof(cmd-&gt;ssid.ssid)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd) + sizeof(*chan) + TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	if (!restart &amp;&amp; arg-&gt;ml.enabled) {</div><div class='add'>+		ml_arg_size = TLV_HDR_SIZE + sizeof(*ml_params) +</div><div class='add'>+			      TLV_HDR_SIZE + (arg-&gt;ml.num_partner_links *</div><div class='add'>+					      sizeof(*partner_info));</div><div class='add'>+		len += ml_arg_size;</div><div class='add'>+	}</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_vdev_start_request_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_VDEV_START_REQUEST_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(arg-&gt;vdev_id);</div><div class='add'>+	cmd-&gt;beacon_interval = cpu_to_le32(arg-&gt;bcn_intval);</div><div class='add'>+	cmd-&gt;bcn_tx_rate = cpu_to_le32(arg-&gt;bcn_tx_rate);</div><div class='add'>+	cmd-&gt;dtim_period = cpu_to_le32(arg-&gt;dtim_period);</div><div class='add'>+	cmd-&gt;num_noa_descriptors = cpu_to_le32(arg-&gt;num_noa_descriptors);</div><div class='add'>+	cmd-&gt;preferred_rx_streams = cpu_to_le32(arg-&gt;pref_rx_streams);</div><div class='add'>+	cmd-&gt;preferred_tx_streams = cpu_to_le32(arg-&gt;pref_tx_streams);</div><div class='add'>+	cmd-&gt;cac_duration_ms = cpu_to_le32(arg-&gt;cac_duration_ms);</div><div class='add'>+	cmd-&gt;regdomain = cpu_to_le32(arg-&gt;regdomain);</div><div class='add'>+	cmd-&gt;he_ops = cpu_to_le32(arg-&gt;he_ops);</div><div class='add'>+	cmd-&gt;punct_bitmap = cpu_to_le32(arg-&gt;punct_bitmap);</div><div class='add'>+	cmd-&gt;mbssid_flags = cpu_to_le32(arg-&gt;mbssid_flags);</div><div class='add'>+	cmd-&gt;mbssid_tx_vdev_id = cpu_to_le32(arg-&gt;mbssid_tx_vdev_id);</div><div class='add'>+</div><div class='add'>+	if (!restart) {</div><div class='add'>+		if (arg-&gt;ssid) {</div><div class='add'>+			cmd-&gt;ssid.ssid_len = cpu_to_le32(arg-&gt;ssid_len);</div><div class='add'>+			memcpy(cmd-&gt;ssid.ssid, arg-&gt;ssid, arg-&gt;ssid_len);</div><div class='add'>+		}</div><div class='add'>+		if (arg-&gt;hidden_ssid)</div><div class='add'>+			cmd-&gt;flags |= cpu_to_le32(WMI_VDEV_START_HIDDEN_SSID);</div><div class='add'>+		if (arg-&gt;pmf_enabled)</div><div class='add'>+			cmd-&gt;flags |= cpu_to_le32(WMI_VDEV_START_PMF_ENABLED);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd-&gt;flags |= cpu_to_le32(WMI_VDEV_START_LDPC_RX_ENABLED);</div><div class='add'>+</div><div class='add'>+	ptr = skb-&gt;data + sizeof(*cmd);</div><div class='add'>+	chan = ptr;</div><div class='add'>+</div><div class='add'>+	ath12k_wmi_put_wmi_channel(chan, arg);</div><div class='add'>+</div><div class='add'>+	chan-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_CHANNEL,</div><div class='add'>+						  sizeof(*chan));</div><div class='add'>+	ptr += sizeof(*chan);</div><div class='add'>+</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, 0);</div><div class='add'>+</div><div class='add'>+	/* Note: This is a nested TLV containing:</div><div class='add'>+	 * [wmi_tlv][ath12k_wmi_p2p_noa_descriptor][wmi_tlv]..</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*tlv);</div><div class='add'>+</div><div class='add'>+	if (ml_arg_size) {</div><div class='add'>+		tlv = ptr;</div><div class='add'>+		tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT,</div><div class='add'>+						 sizeof(*ml_params));</div><div class='add'>+		ptr += TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+		ml_params = ptr;</div><div class='add'>+</div><div class='add'>+		ml_params-&gt;tlv_header =</div><div class='add'>+			ath12k_wmi_tlv_cmd_hdr(WMI_TAG_MLO_VDEV_START_PARAMS,</div><div class='add'>+					       sizeof(*ml_params));</div><div class='add'>+</div><div class='add'>+		ml_params-&gt;flags = le32_encode_bits(arg-&gt;ml.enabled,</div><div class='add'>+						    ATH12K_WMI_FLAG_MLO_ENABLED) |</div><div class='add'>+				   le32_encode_bits(arg-&gt;ml.assoc_link,</div><div class='add'>+						    ATH12K_WMI_FLAG_MLO_ASSOC_LINK) |</div><div class='add'>+				   le32_encode_bits(arg-&gt;ml.mcast_link,</div><div class='add'>+						    ATH12K_WMI_FLAG_MLO_MCAST_VDEV) |</div><div class='add'>+				   le32_encode_bits(arg-&gt;ml.link_add,</div><div class='add'>+						    ATH12K_WMI_FLAG_MLO_LINK_ADD);</div><div class='add'>+</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI, "vdev %d start ml flags 0x%x\n",</div><div class='add'>+			   arg-&gt;vdev_id, ml_params-&gt;flags);</div><div class='add'>+</div><div class='add'>+		ptr += sizeof(*ml_params);</div><div class='add'>+</div><div class='add'>+		tlv = ptr;</div><div class='add'>+		tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT,</div><div class='add'>+						 arg-&gt;ml.num_partner_links *</div><div class='add'>+						 sizeof(*partner_info));</div><div class='add'>+		ptr += TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+		partner_info = ptr;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; arg-&gt;ml.num_partner_links; i++) {</div><div class='add'>+			partner_info-&gt;tlv_header =</div><div class='add'>+				ath12k_wmi_tlv_cmd_hdr(WMI_TAG_MLO_PARTNER_LINK_PARAMS,</div><div class='add'>+						       sizeof(*partner_info));</div><div class='add'>+			partner_info-&gt;vdev_id =</div><div class='add'>+				cpu_to_le32(arg-&gt;ml.partner_info[i].vdev_id);</div><div class='add'>+			partner_info-&gt;hw_link_id =</div><div class='add'>+				cpu_to_le32(arg-&gt;ml.partner_info[i].hw_link_id);</div><div class='add'>+			ether_addr_copy(partner_info-&gt;vdev_addr.addr,</div><div class='add'>+					arg-&gt;ml.partner_info[i].addr);</div><div class='add'>+</div><div class='add'>+			ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI, "partner vdev %d hw_link_id %d macaddr%pM\n",</div><div class='add'>+				   partner_info-&gt;vdev_id, partner_info-&gt;hw_link_id,</div><div class='add'>+				   partner_info-&gt;vdev_addr.addr);</div><div class='add'>+</div><div class='add'>+			partner_info++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ptr = partner_info;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI, "vdev %s id 0x%x freq 0x%x mode 0x%x\n",</div><div class='add'>+		   restart ? "restart" : "start", arg-&gt;vdev_id,</div><div class='add'>+		   arg-&gt;freq, arg-&gt;mode);</div><div class='add'>+</div><div class='add'>+	if (restart)</div><div class='add'>+		ret = ath12k_wmi_cmd_send(wmi, skb,</div><div class='add'>+					  WMI_VDEV_RESTART_REQUEST_CMDID);</div><div class='add'>+	else</div><div class='add'>+		ret = ath12k_wmi_cmd_send(wmi, skb,</div><div class='add'>+					  WMI_VDEV_START_REQUEST_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to submit vdev_%s cmd\n",</div><div class='add'>+			    restart ? "restart" : "start");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_vdev_up(struct ath12k *ar, struct ath12k_wmi_vdev_up_params *params)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_vdev_up_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_vdev_up_cmd *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_VDEV_UP_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(params-&gt;vdev_id);</div><div class='add'>+	cmd-&gt;vdev_assoc_id = cpu_to_le32(params-&gt;aid);</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(cmd-&gt;vdev_bssid.addr, params-&gt;bssid);</div><div class='add'>+</div><div class='add'>+	if (params-&gt;tx_bssid) {</div><div class='add'>+		ether_addr_copy(cmd-&gt;tx_vdev_bssid.addr, params-&gt;tx_bssid);</div><div class='add'>+		cmd-&gt;nontx_profile_idx = cpu_to_le32(params-&gt;nontx_profile_idx);</div><div class='add'>+		cmd-&gt;nontx_profile_cnt = cpu_to_le32(params-&gt;nontx_profile_cnt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI mgmt vdev up id 0x%x assoc id %d bssid %pM\n",</div><div class='add'>+		   params-&gt;vdev_id, params-&gt;aid, params-&gt;bssid);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_VDEV_UP_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to submit WMI_VDEV_UP cmd\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_peer_create_cmd(struct ath12k *ar,</div><div class='add'>+				    struct ath12k_wmi_peer_create_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_peer_create_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret, len;</div><div class='add'>+	struct wmi_peer_create_mlo_params *ml_param;</div><div class='add'>+	void *ptr;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd) + TLV_HDR_SIZE + sizeof(*ml_param);</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_peer_create_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PEER_CREATE_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(cmd-&gt;peer_macaddr.addr, arg-&gt;peer_addr);</div><div class='add'>+	cmd-&gt;peer_type = cpu_to_le32(arg-&gt;peer_type);</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(arg-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	ptr = skb-&gt;data + sizeof(*cmd);</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT,</div><div class='add'>+					 sizeof(*ml_param));</div><div class='add'>+	ptr += TLV_HDR_SIZE;</div><div class='add'>+	ml_param = ptr;</div><div class='add'>+	ml_param-&gt;tlv_header =</div><div class='add'>+			ath12k_wmi_tlv_cmd_hdr(WMI_TAG_MLO_PEER_CREATE_PARAMS,</div><div class='add'>+					       sizeof(*ml_param));</div><div class='add'>+	if (arg-&gt;ml_enabled)</div><div class='add'>+		ml_param-&gt;flags = cpu_to_le32(ATH12K_WMI_FLAG_MLO_ENABLED);</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*ml_param);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI peer create vdev_id %d peer_addr %pM ml_flags 0x%x\n",</div><div class='add'>+		   arg-&gt;vdev_id, arg-&gt;peer_addr, ml_param-&gt;flags);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_PEER_CREATE_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to submit WMI_PEER_CREATE cmd\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_peer_delete_cmd(struct ath12k *ar,</div><div class='add'>+				    const u8 *peer_addr, u8 vdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_peer_delete_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_peer_delete_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PEER_DELETE_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(cmd-&gt;peer_macaddr.addr, peer_addr);</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI peer delete vdev_id %d peer_addr %pM\n",</div><div class='add'>+		   vdev_id,  peer_addr);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_PEER_DELETE_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to send WMI_PEER_DELETE cmd\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_pdev_set_regdomain(struct ath12k *ar,</div><div class='add'>+				       struct ath12k_wmi_pdev_set_regdomain_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_pdev_set_regdomain_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_pdev_set_regdomain_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PDEV_SET_REGDOMAIN_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;reg_domain = cpu_to_le32(arg-&gt;current_rd_in_use);</div><div class='add'>+	cmd-&gt;reg_domain_2g = cpu_to_le32(arg-&gt;current_rd_2g);</div><div class='add'>+	cmd-&gt;reg_domain_5g = cpu_to_le32(arg-&gt;current_rd_5g);</div><div class='add'>+	cmd-&gt;conformance_test_limit_2g = cpu_to_le32(arg-&gt;ctl_2g);</div><div class='add'>+	cmd-&gt;conformance_test_limit_5g = cpu_to_le32(arg-&gt;ctl_5g);</div><div class='add'>+	cmd-&gt;dfs_domain = cpu_to_le32(arg-&gt;dfs_domain);</div><div class='add'>+	cmd-&gt;pdev_id = cpu_to_le32(arg-&gt;pdev_id);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI pdev regd rd %d rd2g %d rd5g %d domain %d pdev id %d\n",</div><div class='add'>+		   arg-&gt;current_rd_in_use, arg-&gt;current_rd_2g,</div><div class='add'>+		   arg-&gt;current_rd_5g, arg-&gt;dfs_domain, arg-&gt;pdev_id);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_PDEV_SET_REGDOMAIN_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_PDEV_SET_REGDOMAIN cmd\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_set_peer_param(struct ath12k *ar, const u8 *peer_addr,</div><div class='add'>+			      u32 vdev_id, u32 param_id, u32 param_val)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_peer_set_param_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_peer_set_param_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PEER_SET_PARAM_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	ether_addr_copy(cmd-&gt;peer_macaddr.addr, peer_addr);</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;param_id = cpu_to_le32(param_id);</div><div class='add'>+	cmd-&gt;param_value = cpu_to_le32(param_val);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI vdev %d peer 0x%pM set param %d value %d\n",</div><div class='add'>+		   vdev_id, peer_addr, param_id, param_val);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_PEER_SET_PARAM_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to send WMI_PEER_SET_PARAM cmd\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_peer_flush_tids_cmd(struct ath12k *ar,</div><div class='add'>+					u8 peer_addr[ETH_ALEN],</div><div class='add'>+					u32 peer_tid_bitmap,</div><div class='add'>+					u8 vdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_peer_flush_tids_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_peer_flush_tids_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PEER_FLUSH_TIDS_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(cmd-&gt;peer_macaddr.addr, peer_addr);</div><div class='add'>+	cmd-&gt;peer_tid_bitmap = cpu_to_le32(peer_tid_bitmap);</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI peer flush vdev_id %d peer_addr %pM tids %08x\n",</div><div class='add'>+		   vdev_id, peer_addr, peer_tid_bitmap);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_PEER_FLUSH_TIDS_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_PEER_FLUSH_TIDS cmd\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_peer_rx_reorder_queue_setup(struct ath12k *ar,</div><div class='add'>+					   int vdev_id, const u8 *addr,</div><div class='add'>+					   dma_addr_t paddr, u8 tid,</div><div class='add'>+					   u8 ba_window_size_valid,</div><div class='add'>+					   u32 ba_window_size)</div><div class='add'>+{</div><div class='add'>+	struct wmi_peer_reorder_queue_setup_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_peer_reorder_queue_setup_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_REORDER_QUEUE_SETUP_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(cmd-&gt;peer_macaddr.addr, addr);</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;tid = cpu_to_le32(tid);</div><div class='add'>+	cmd-&gt;queue_ptr_lo = cpu_to_le32(lower_32_bits(paddr));</div><div class='add'>+	cmd-&gt;queue_ptr_hi = cpu_to_le32(upper_32_bits(paddr));</div><div class='add'>+	cmd-&gt;queue_no = cpu_to_le32(tid);</div><div class='add'>+	cmd-&gt;ba_window_size_valid = cpu_to_le32(ba_window_size_valid);</div><div class='add'>+	cmd-&gt;ba_window_size = cpu_to_le32(ba_window_size);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "wmi rx reorder queue setup addr %pM vdev_id %d tid %d\n",</div><div class='add'>+		   addr, vdev_id, tid);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(ar-&gt;wmi, skb,</div><div class='add'>+				  WMI_PEER_REORDER_QUEUE_SETUP_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_PEER_REORDER_QUEUE_SETUP\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+ath12k_wmi_rx_reord_queue_remove(struct ath12k *ar,</div><div class='add'>+				 struct ath12k_wmi_rx_reorder_queue_remove_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_peer_reorder_queue_remove_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_peer_reorder_queue_remove_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_REORDER_QUEUE_REMOVE_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(cmd-&gt;peer_macaddr.addr, arg-&gt;peer_macaddr);</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(arg-&gt;vdev_id);</div><div class='add'>+	cmd-&gt;tid_mask = cpu_to_le32(arg-&gt;peer_tid_bitmap);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "%s: peer_macaddr %pM vdev_id %d, tid_map %d", __func__,</div><div class='add'>+		   arg-&gt;peer_macaddr, arg-&gt;vdev_id, arg-&gt;peer_tid_bitmap);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb,</div><div class='add'>+				  WMI_PEER_REORDER_QUEUE_REMOVE_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_PEER_REORDER_QUEUE_REMOVE_CMDID");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_pdev_set_param(struct ath12k *ar, u32 param_id,</div><div class='add'>+			      u32 param_value, u8 pdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_pdev_set_param_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_pdev_set_param_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PDEV_SET_PARAM_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;pdev_id = cpu_to_le32(pdev_id);</div><div class='add'>+	cmd-&gt;param_id = cpu_to_le32(param_id);</div><div class='add'>+	cmd-&gt;param_value = cpu_to_le32(param_value);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI pdev set param %d pdev id %d value %d\n",</div><div class='add'>+		   param_id, pdev_id, param_value);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_PDEV_SET_PARAM_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to send WMI_PDEV_SET_PARAM cmd\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_pdev_set_ps_mode(struct ath12k *ar, int vdev_id, u32 enable)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_pdev_set_ps_mode_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_pdev_set_ps_mode_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_STA_POWERSAVE_MODE_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;sta_ps_mode = cpu_to_le32(enable);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI vdev set psmode %d vdev id %d\n",</div><div class='add'>+		   enable, vdev_id);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_STA_POWERSAVE_MODE_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to send WMI_PDEV_SET_PARAM cmd\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_pdev_suspend(struct ath12k *ar, u32 suspend_opt,</div><div class='add'>+			    u32 pdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_pdev_suspend_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_pdev_suspend_cmd *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PDEV_SUSPEND_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;suspend_opt = cpu_to_le32(suspend_opt);</div><div class='add'>+	cmd-&gt;pdev_id = cpu_to_le32(pdev_id);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI pdev suspend pdev_id %d\n", pdev_id);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_PDEV_SUSPEND_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to send WMI_PDEV_SUSPEND cmd\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_pdev_resume(struct ath12k *ar, u32 pdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_pdev_resume_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_pdev_resume_cmd *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PDEV_RESUME_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;pdev_id = cpu_to_le32(pdev_id);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI pdev resume pdev id %d\n", pdev_id);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_PDEV_RESUME_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to send WMI_PDEV_RESUME cmd\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* TODO FW Support for the cmd is not available yet.</div><div class='add'>+ * Can be tested once the command and corresponding</div><div class='add'>+ * event is implemented in FW</div><div class='add'>+ */</div><div class='add'>+int ath12k_wmi_pdev_bss_chan_info_request(struct ath12k *ar,</div><div class='add'>+					  enum wmi_bss_chan_info_req_type type)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_pdev_bss_chan_info_req_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_pdev_bss_chan_info_req_cmd *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PDEV_BSS_CHAN_INFO_REQUEST,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;req_type = cpu_to_le32(type);</div><div class='add'>+	cmd-&gt;pdev_id = cpu_to_le32(ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI bss chan info req type %d\n", type);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb,</div><div class='add'>+				  WMI_PDEV_BSS_CHAN_INFO_REQUEST_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_PDEV_BSS_CHAN_INFO_REQUEST cmd\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_set_ap_ps_param_cmd(struct ath12k *ar, u8 *peer_addr,</div><div class='add'>+					struct ath12k_wmi_ap_ps_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_ap_ps_peer_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_ap_ps_peer_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_AP_PS_PEER_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(arg-&gt;vdev_id);</div><div class='add'>+	ether_addr_copy(cmd-&gt;peer_macaddr.addr, peer_addr);</div><div class='add'>+	cmd-&gt;param = cpu_to_le32(arg-&gt;param);</div><div class='add'>+	cmd-&gt;value = cpu_to_le32(arg-&gt;value);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI set ap ps vdev id %d peer %pM param %d value %d\n",</div><div class='add'>+		   arg-&gt;vdev_id, peer_addr, arg-&gt;param, arg-&gt;value);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_AP_PS_PEER_PARAM_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_AP_PS_PEER_PARAM_CMDID\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_set_sta_ps_param(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+				u32 param, u32 param_value)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_sta_powersave_param_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_sta_powersave_param_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_STA_POWERSAVE_PARAM_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;param = cpu_to_le32(param);</div><div class='add'>+	cmd-&gt;value = cpu_to_le32(param_value);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI set sta ps vdev_id %d param %d value %d\n",</div><div class='add'>+		   vdev_id, param, param_value);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_STA_POWERSAVE_PARAM_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to send WMI_STA_POWERSAVE_PARAM_CMDID");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_force_fw_hang_cmd(struct ath12k *ar, u32 type, u32 delay_time_ms)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_force_fw_hang_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret, len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_force_fw_hang_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_FORCE_FW_HANG_CMD,</div><div class='add'>+						 len);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;type = cpu_to_le32(type);</div><div class='add'>+	cmd-&gt;delay_time_ms = cpu_to_le32(delay_time_ms);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_FORCE_FW_HANG_CMDID);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "Failed to send WMI_FORCE_FW_HANG_CMDID");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_vdev_set_param_cmd(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+				  u32 param_id, u32 param_value)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_vdev_set_param_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_vdev_set_param_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_VDEV_SET_PARAM_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;param_id = cpu_to_le32(param_id);</div><div class='add'>+	cmd-&gt;param_value = cpu_to_le32(param_value);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI vdev id 0x%x set param %d value %d\n",</div><div class='add'>+		   vdev_id, param_id, param_value);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_VDEV_SET_PARAM_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_VDEV_SET_PARAM_CMDID\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_pdev_temperature_cmd(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_get_pdev_temperature_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_get_pdev_temperature_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PDEV_GET_TEMPERATURE_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;pdev_id = cpu_to_le32(ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI pdev get temperature for pdev_id %d\n", ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_PDEV_GET_TEMPERATURE_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to send WMI_PDEV_GET_TEMPERATURE cmd\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_bcn_offload_control_cmd(struct ath12k *ar,</div><div class='add'>+					    u32 vdev_id, u32 bcn_ctrl_op)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_bcn_offload_ctrl_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_bcn_offload_ctrl_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_BCN_OFFLOAD_CTRL_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;bcn_ctrl_op = cpu_to_le32(bcn_ctrl_op);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI bcn ctrl offload vdev id %d ctrl_op %d\n",</div><div class='add'>+		   vdev_id, bcn_ctrl_op);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_BCN_OFFLOAD_CTRL_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_BCN_OFFLOAD_CTRL_CMDID\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_p2p_go_bcn_ie(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+			     const u8 *p2p_ie)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_p2p_go_set_beacon_ie_cmd *cmd;</div><div class='add'>+	size_t p2p_ie_len, aligned_len;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	void *ptr;</div><div class='add'>+	int ret, len;</div><div class='add'>+</div><div class='add'>+	p2p_ie_len = p2p_ie[1] + 2;</div><div class='add'>+	aligned_len = roundup(p2p_ie_len, sizeof(u32));</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd) + TLV_HDR_SIZE + aligned_len;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ptr = skb-&gt;data;</div><div class='add'>+	cmd = ptr;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_P2P_GO_SET_BEACON_IE,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;ie_buf_len = cpu_to_le32(p2p_ie_len);</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*cmd);</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_ARRAY_BYTE,</div><div class='add'>+					     aligned_len);</div><div class='add'>+	memcpy(tlv-&gt;value, p2p_ie, p2p_ie_len);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_P2P_GO_SET_BEACON_IE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to send WMI_P2P_GO_SET_BEACON_IE\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_bcn_tmpl(struct ath12k_link_vif *arvif,</div><div class='add'>+			struct ieee80211_mutable_offsets *offs,</div><div class='add'>+			struct sk_buff *bcn,</div><div class='add'>+			struct ath12k_wmi_bcn_tmpl_ema_arg *ema_args)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct wmi_bcn_tmpl_cmd *cmd;</div><div class='add'>+	struct ath12k_wmi_bcn_prb_info_params *bcn_prb_info;</div><div class='add'>+	struct ath12k_vif *ahvif = arvif-&gt;ahvif;</div><div class='add'>+	struct ieee80211_bss_conf *conf;</div><div class='add'>+	u32 vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u32 ema_params = 0;</div><div class='add'>+	void *ptr;</div><div class='add'>+	int ret, len;</div><div class='add'>+	size_t aligned_len = roundup(bcn-&gt;len, 4);</div><div class='add'>+</div><div class='add'>+	conf = ath12k_mac_get_link_bss_conf(arvif);</div><div class='add'>+	if (!conf) {</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "unable to access bss link conf in beacon template command for vif %pM link %u\n",</div><div class='add'>+			    ahvif-&gt;vif-&gt;addr, arvif-&gt;link_id);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd) + sizeof(*bcn_prb_info) + TLV_HDR_SIZE + aligned_len;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_bcn_tmpl_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_BCN_TMPL_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;tim_ie_offset = cpu_to_le32(offs-&gt;tim_offset);</div><div class='add'>+</div><div class='add'>+	if (conf-&gt;csa_active) {</div><div class='add'>+		cmd-&gt;csa_switch_count_offset =</div><div class='add'>+				cpu_to_le32(offs-&gt;cntdwn_counter_offs[0]);</div><div class='add'>+		cmd-&gt;ext_csa_switch_count_offset =</div><div class='add'>+				cpu_to_le32(offs-&gt;cntdwn_counter_offs[1]);</div><div class='add'>+		cmd-&gt;csa_event_bitmap = cpu_to_le32(0xFFFFFFFF);</div><div class='add'>+		arvif-&gt;current_cntdown_counter = bcn-&gt;data[offs-&gt;cntdwn_counter_offs[0]];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd-&gt;buf_len = cpu_to_le32(bcn-&gt;len);</div><div class='add'>+	cmd-&gt;mbssid_ie_offset = cpu_to_le32(offs-&gt;mbssid_off);</div><div class='add'>+	if (ema_args) {</div><div class='add'>+		u32p_replace_bits(&amp;ema_params, ema_args-&gt;bcn_cnt, WMI_EMA_BEACON_CNT);</div><div class='add'>+		u32p_replace_bits(&amp;ema_params, ema_args-&gt;bcn_index, WMI_EMA_BEACON_IDX);</div><div class='add'>+		if (ema_args-&gt;bcn_index == 0)</div><div class='add'>+			u32p_replace_bits(&amp;ema_params, 1, WMI_EMA_BEACON_FIRST);</div><div class='add'>+		if (ema_args-&gt;bcn_index + 1 == ema_args-&gt;bcn_cnt)</div><div class='add'>+			u32p_replace_bits(&amp;ema_params, 1, WMI_EMA_BEACON_LAST);</div><div class='add'>+		cmd-&gt;ema_params = cpu_to_le32(ema_params);</div><div class='add'>+	}</div><div class='add'>+	cmd-&gt;feature_enable_bitmap =</div><div class='add'>+		cpu_to_le32(u32_encode_bits(arvif-&gt;beacon_prot,</div><div class='add'>+					    WMI_BEACON_PROTECTION_EN_BIT));</div><div class='add'>+</div><div class='add'>+	ptr = skb-&gt;data + sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	bcn_prb_info = ptr;</div><div class='add'>+	len = sizeof(*bcn_prb_info);</div><div class='add'>+	bcn_prb_info-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_BCN_PRB_INFO,</div><div class='add'>+							  len);</div><div class='add'>+	bcn_prb_info-&gt;caps = 0;</div><div class='add'>+	bcn_prb_info-&gt;erp = 0;</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*bcn_prb_info);</div><div class='add'>+</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE, aligned_len);</div><div class='add'>+	memcpy(tlv-&gt;value, bcn-&gt;data, bcn-&gt;len);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_BCN_TMPL_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to send WMI_BCN_TMPL_CMDID\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_vdev_install_key(struct ath12k *ar,</div><div class='add'>+				struct wmi_vdev_install_key_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_vdev_install_key_cmd *cmd;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret, len, key_len_aligned;</div><div class='add'>+</div><div class='add'>+	/* WMI_TAG_ARRAY_BYTE needs to be aligned with 4, the actual key</div><div class='add'>+	 * length is specified in cmd-&gt;key_len.</div><div class='add'>+	 */</div><div class='add'>+	key_len_aligned = roundup(arg-&gt;key_len, 4);</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd) + TLV_HDR_SIZE + key_len_aligned;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_vdev_install_key_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_VDEV_INSTALL_KEY_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(arg-&gt;vdev_id);</div><div class='add'>+	ether_addr_copy(cmd-&gt;peer_macaddr.addr, arg-&gt;macaddr);</div><div class='add'>+	cmd-&gt;key_idx = cpu_to_le32(arg-&gt;key_idx);</div><div class='add'>+	cmd-&gt;key_flags = cpu_to_le32(arg-&gt;key_flags);</div><div class='add'>+	cmd-&gt;key_cipher = cpu_to_le32(arg-&gt;key_cipher);</div><div class='add'>+	cmd-&gt;key_len = cpu_to_le32(arg-&gt;key_len);</div><div class='add'>+	cmd-&gt;key_txmic_len = cpu_to_le32(arg-&gt;key_txmic_len);</div><div class='add'>+	cmd-&gt;key_rxmic_len = cpu_to_le32(arg-&gt;key_rxmic_len);</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;key_rsc_counter)</div><div class='add'>+		cmd-&gt;key_rsc_counter = cpu_to_le64(arg-&gt;key_rsc_counter);</div><div class='add'>+</div><div class='add'>+	tlv = (struct wmi_tlv *)(skb-&gt;data + sizeof(*cmd));</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE, key_len_aligned);</div><div class='add'>+	memcpy(tlv-&gt;value, arg-&gt;key_data, arg-&gt;key_len);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI vdev install key idx %d cipher %d len %d\n",</div><div class='add'>+		   arg-&gt;key_idx, arg-&gt;key_cipher, arg-&gt;key_len);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_VDEV_INSTALL_KEY_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_VDEV_INSTALL_KEY cmd\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_copy_peer_flags(struct wmi_peer_assoc_complete_cmd *cmd,</div><div class='add'>+				       struct ath12k_wmi_peer_assoc_arg *arg,</div><div class='add'>+				       bool hw_crypto_disabled)</div><div class='add'>+{</div><div class='add'>+	cmd-&gt;peer_flags = 0;</div><div class='add'>+	cmd-&gt;peer_flags_ext = 0;</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;is_wme_set) {</div><div class='add'>+		if (arg-&gt;qos_flag)</div><div class='add'>+			cmd-&gt;peer_flags |= cpu_to_le32(WMI_PEER_QOS);</div><div class='add'>+		if (arg-&gt;apsd_flag)</div><div class='add'>+			cmd-&gt;peer_flags |= cpu_to_le32(WMI_PEER_APSD);</div><div class='add'>+		if (arg-&gt;ht_flag)</div><div class='add'>+			cmd-&gt;peer_flags |= cpu_to_le32(WMI_PEER_HT);</div><div class='add'>+		if (arg-&gt;bw_40)</div><div class='add'>+			cmd-&gt;peer_flags |= cpu_to_le32(WMI_PEER_40MHZ);</div><div class='add'>+		if (arg-&gt;bw_80)</div><div class='add'>+			cmd-&gt;peer_flags |= cpu_to_le32(WMI_PEER_80MHZ);</div><div class='add'>+		if (arg-&gt;bw_160)</div><div class='add'>+			cmd-&gt;peer_flags |= cpu_to_le32(WMI_PEER_160MHZ);</div><div class='add'>+		if (arg-&gt;bw_320)</div><div class='add'>+			cmd-&gt;peer_flags_ext |= cpu_to_le32(WMI_PEER_EXT_320MHZ);</div><div class='add'>+</div><div class='add'>+		/* Typically if STBC is enabled for VHT it should be enabled</div><div class='add'>+		 * for HT as well</div><div class='add'>+		 **/</div><div class='add'>+		if (arg-&gt;stbc_flag)</div><div class='add'>+			cmd-&gt;peer_flags |= cpu_to_le32(WMI_PEER_STBC);</div><div class='add'>+</div><div class='add'>+		/* Typically if LDPC is enabled for VHT it should be enabled</div><div class='add'>+		 * for HT as well</div><div class='add'>+		 **/</div><div class='add'>+		if (arg-&gt;ldpc_flag)</div><div class='add'>+			cmd-&gt;peer_flags |= cpu_to_le32(WMI_PEER_LDPC);</div><div class='add'>+</div><div class='add'>+		if (arg-&gt;static_mimops_flag)</div><div class='add'>+			cmd-&gt;peer_flags |= cpu_to_le32(WMI_PEER_STATIC_MIMOPS);</div><div class='add'>+		if (arg-&gt;dynamic_mimops_flag)</div><div class='add'>+			cmd-&gt;peer_flags |= cpu_to_le32(WMI_PEER_DYN_MIMOPS);</div><div class='add'>+		if (arg-&gt;spatial_mux_flag)</div><div class='add'>+			cmd-&gt;peer_flags |= cpu_to_le32(WMI_PEER_SPATIAL_MUX);</div><div class='add'>+		if (arg-&gt;vht_flag)</div><div class='add'>+			cmd-&gt;peer_flags |= cpu_to_le32(WMI_PEER_VHT);</div><div class='add'>+		if (arg-&gt;he_flag)</div><div class='add'>+			cmd-&gt;peer_flags |= cpu_to_le32(WMI_PEER_HE);</div><div class='add'>+		if (arg-&gt;twt_requester)</div><div class='add'>+			cmd-&gt;peer_flags |= cpu_to_le32(WMI_PEER_TWT_REQ);</div><div class='add'>+		if (arg-&gt;twt_responder)</div><div class='add'>+			cmd-&gt;peer_flags |= cpu_to_le32(WMI_PEER_TWT_RESP);</div><div class='add'>+		if (arg-&gt;eht_flag)</div><div class='add'>+			cmd-&gt;peer_flags_ext |= cpu_to_le32(WMI_PEER_EXT_EHT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Suppress authorization for all AUTH modes that need 4-way handshake</div><div class='add'>+	 * (during re-association).</div><div class='add'>+	 * Authorization will be done for these modes on key installation.</div><div class='add'>+	 */</div><div class='add'>+	if (arg-&gt;auth_flag)</div><div class='add'>+		cmd-&gt;peer_flags |= cpu_to_le32(WMI_PEER_AUTH);</div><div class='add'>+	if (arg-&gt;need_ptk_4_way) {</div><div class='add'>+		cmd-&gt;peer_flags |= cpu_to_le32(WMI_PEER_NEED_PTK_4_WAY);</div><div class='add'>+		if (!hw_crypto_disabled &amp;&amp; arg-&gt;is_assoc)</div><div class='add'>+			cmd-&gt;peer_flags &amp;= cpu_to_le32(~WMI_PEER_AUTH);</div><div class='add'>+	}</div><div class='add'>+	if (arg-&gt;need_gtk_2_way)</div><div class='add'>+		cmd-&gt;peer_flags |= cpu_to_le32(WMI_PEER_NEED_GTK_2_WAY);</div><div class='add'>+	/* safe mode bypass the 4-way handshake */</div><div class='add'>+	if (arg-&gt;safe_mode_enabled)</div><div class='add'>+		cmd-&gt;peer_flags &amp;= cpu_to_le32(~(WMI_PEER_NEED_PTK_4_WAY |</div><div class='add'>+						 WMI_PEER_NEED_GTK_2_WAY));</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;is_pmf_enabled)</div><div class='add'>+		cmd-&gt;peer_flags |= cpu_to_le32(WMI_PEER_PMF);</div><div class='add'>+</div><div class='add'>+	/* Disable AMSDU for station transmit, if user configures it */</div><div class='add'>+	/* Disable AMSDU for AP transmit to 11n Stations, if user configures</div><div class='add'>+	 * it</div><div class='add'>+	 * if (arg-&gt;amsdu_disable) Add after FW support</div><div class='add'>+	 **/</div><div class='add'>+</div><div class='add'>+	/* Target asserts if node is marked HT and all MCS is set to 0.</div><div class='add'>+	 * Mark the node as non-HT if all the mcs rates are disabled through</div><div class='add'>+	 * iwpriv</div><div class='add'>+	 **/</div><div class='add'>+	if (arg-&gt;peer_ht_rates.num_rates == 0)</div><div class='add'>+		cmd-&gt;peer_flags &amp;= cpu_to_le32(~WMI_PEER_HT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_peer_assoc_cmd(struct ath12k *ar,</div><div class='add'>+				   struct ath12k_wmi_peer_assoc_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_peer_assoc_complete_cmd *cmd;</div><div class='add'>+	struct ath12k_wmi_vht_rate_set_params *mcs;</div><div class='add'>+	struct ath12k_wmi_he_rate_set_params *he_mcs;</div><div class='add'>+	struct ath12k_wmi_eht_rate_set_params *eht_mcs;</div><div class='add'>+	struct wmi_peer_assoc_mlo_params *ml_params;</div><div class='add'>+	struct wmi_peer_assoc_mlo_partner_info_params *partner_info;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	void *ptr;</div><div class='add'>+	u32 peer_legacy_rates_align, eml_pad_delay, eml_trans_delay;</div><div class='add'>+	u32 peer_ht_rates_align, eml_trans_timeout;</div><div class='add'>+	int i, ret, len;</div><div class='add'>+	u16 eml_cap;</div><div class='add'>+	__le32 v;</div><div class='add'>+</div><div class='add'>+	peer_legacy_rates_align = roundup(arg-&gt;peer_legacy_rates.num_rates,</div><div class='add'>+					  sizeof(u32));</div><div class='add'>+	peer_ht_rates_align = roundup(arg-&gt;peer_ht_rates.num_rates,</div><div class='add'>+				      sizeof(u32));</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd) +</div><div class='add'>+	      TLV_HDR_SIZE + (peer_legacy_rates_align * sizeof(u8)) +</div><div class='add'>+	      TLV_HDR_SIZE + (peer_ht_rates_align * sizeof(u8)) +</div><div class='add'>+	      sizeof(*mcs) + TLV_HDR_SIZE +</div><div class='add'>+	      (sizeof(*he_mcs) * arg-&gt;peer_he_mcs_count) +</div><div class='add'>+	      TLV_HDR_SIZE + (sizeof(*eht_mcs) * arg-&gt;peer_eht_mcs_count);</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;ml.enabled)</div><div class='add'>+		len += TLV_HDR_SIZE + sizeof(*ml_params) +</div><div class='add'>+		       TLV_HDR_SIZE + (arg-&gt;ml.num_partner_links * sizeof(*partner_info));</div><div class='add'>+	else</div><div class='add'>+		len += (2 * TLV_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ptr = skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	cmd = ptr;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PEER_ASSOC_COMPLETE_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(arg-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;peer_new_assoc = cpu_to_le32(arg-&gt;peer_new_assoc);</div><div class='add'>+	cmd-&gt;peer_associd = cpu_to_le32(arg-&gt;peer_associd);</div><div class='add'>+	cmd-&gt;punct_bitmap = cpu_to_le32(arg-&gt;punct_bitmap);</div><div class='add'>+</div><div class='add'>+	ath12k_wmi_copy_peer_flags(cmd, arg,</div><div class='add'>+				   test_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED,</div><div class='add'>+					    &amp;ar-&gt;ab-&gt;dev_flags));</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(cmd-&gt;peer_macaddr.addr, arg-&gt;peer_mac);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;peer_rate_caps = cpu_to_le32(arg-&gt;peer_rate_caps);</div><div class='add'>+	cmd-&gt;peer_caps = cpu_to_le32(arg-&gt;peer_caps);</div><div class='add'>+	cmd-&gt;peer_listen_intval = cpu_to_le32(arg-&gt;peer_listen_intval);</div><div class='add'>+	cmd-&gt;peer_ht_caps = cpu_to_le32(arg-&gt;peer_ht_caps);</div><div class='add'>+	cmd-&gt;peer_max_mpdu = cpu_to_le32(arg-&gt;peer_max_mpdu);</div><div class='add'>+	cmd-&gt;peer_mpdu_density = cpu_to_le32(arg-&gt;peer_mpdu_density);</div><div class='add'>+	cmd-&gt;peer_vht_caps = cpu_to_le32(arg-&gt;peer_vht_caps);</div><div class='add'>+	cmd-&gt;peer_phymode = cpu_to_le32(arg-&gt;peer_phymode);</div><div class='add'>+</div><div class='add'>+	/* Update 11ax capabilities */</div><div class='add'>+	cmd-&gt;peer_he_cap_info = cpu_to_le32(arg-&gt;peer_he_cap_macinfo[0]);</div><div class='add'>+	cmd-&gt;peer_he_cap_info_ext = cpu_to_le32(arg-&gt;peer_he_cap_macinfo[1]);</div><div class='add'>+	cmd-&gt;peer_he_cap_info_internal = cpu_to_le32(arg-&gt;peer_he_cap_macinfo_internal);</div><div class='add'>+	cmd-&gt;peer_he_caps_6ghz = cpu_to_le32(arg-&gt;peer_he_caps_6ghz);</div><div class='add'>+	cmd-&gt;peer_he_ops = cpu_to_le32(arg-&gt;peer_he_ops);</div><div class='add'>+	for (i = 0; i &lt; WMI_MAX_HECAP_PHY_SIZE; i++)</div><div class='add'>+		cmd-&gt;peer_he_cap_phy[i] =</div><div class='add'>+			cpu_to_le32(arg-&gt;peer_he_cap_phyinfo[i]);</div><div class='add'>+	cmd-&gt;peer_ppet.numss_m1 = cpu_to_le32(arg-&gt;peer_ppet.numss_m1);</div><div class='add'>+	cmd-&gt;peer_ppet.ru_info = cpu_to_le32(arg-&gt;peer_ppet.ru_bit_mask);</div><div class='add'>+	for (i = 0; i &lt; WMI_MAX_NUM_SS; i++)</div><div class='add'>+		cmd-&gt;peer_ppet.ppet16_ppet8_ru3_ru0[i] =</div><div class='add'>+			cpu_to_le32(arg-&gt;peer_ppet.ppet16_ppet8_ru3_ru0[i]);</div><div class='add'>+</div><div class='add'>+	/* Update 11be capabilities */</div><div class='add'>+	memcpy_and_pad(cmd-&gt;peer_eht_cap_mac, sizeof(cmd-&gt;peer_eht_cap_mac),</div><div class='add'>+		       arg-&gt;peer_eht_cap_mac, sizeof(arg-&gt;peer_eht_cap_mac),</div><div class='add'>+		       0);</div><div class='add'>+	memcpy_and_pad(cmd-&gt;peer_eht_cap_phy, sizeof(cmd-&gt;peer_eht_cap_phy),</div><div class='add'>+		       arg-&gt;peer_eht_cap_phy, sizeof(arg-&gt;peer_eht_cap_phy),</div><div class='add'>+		       0);</div><div class='add'>+	memcpy_and_pad(&amp;cmd-&gt;peer_eht_ppet, sizeof(cmd-&gt;peer_eht_ppet),</div><div class='add'>+		       &amp;arg-&gt;peer_eht_ppet, sizeof(arg-&gt;peer_eht_ppet), 0);</div><div class='add'>+</div><div class='add'>+	/* Update peer legacy rate information */</div><div class='add'>+	ptr += sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE, peer_legacy_rates_align);</div><div class='add'>+</div><div class='add'>+	ptr += TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;num_peer_legacy_rates = cpu_to_le32(arg-&gt;peer_legacy_rates.num_rates);</div><div class='add'>+	memcpy(ptr, arg-&gt;peer_legacy_rates.rates,</div><div class='add'>+	       arg-&gt;peer_legacy_rates.num_rates);</div><div class='add'>+</div><div class='add'>+	/* Update peer HT rate information */</div><div class='add'>+	ptr += peer_legacy_rates_align;</div><div class='add'>+</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE, peer_ht_rates_align);</div><div class='add'>+	ptr += TLV_HDR_SIZE;</div><div class='add'>+	cmd-&gt;num_peer_ht_rates = cpu_to_le32(arg-&gt;peer_ht_rates.num_rates);</div><div class='add'>+	memcpy(ptr, arg-&gt;peer_ht_rates.rates,</div><div class='add'>+	       arg-&gt;peer_ht_rates.num_rates);</div><div class='add'>+</div><div class='add'>+	/* VHT Rates */</div><div class='add'>+	ptr += peer_ht_rates_align;</div><div class='add'>+</div><div class='add'>+	mcs = ptr;</div><div class='add'>+</div><div class='add'>+	mcs-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_VHT_RATE_SET,</div><div class='add'>+						 sizeof(*mcs));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;peer_nss = cpu_to_le32(arg-&gt;peer_nss);</div><div class='add'>+</div><div class='add'>+	/* Update bandwidth-NSS mapping */</div><div class='add'>+	cmd-&gt;peer_bw_rxnss_override = 0;</div><div class='add'>+	cmd-&gt;peer_bw_rxnss_override |= cpu_to_le32(arg-&gt;peer_bw_rxnss_override);</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;vht_capable) {</div><div class='add'>+		/* Firmware interprets mcs-&gt;tx_mcs_set field as peer's</div><div class='add'>+		 * RX capability</div><div class='add'>+		 */</div><div class='add'>+		mcs-&gt;rx_max_rate = cpu_to_le32(arg-&gt;tx_max_rate);</div><div class='add'>+		mcs-&gt;rx_mcs_set = cpu_to_le32(arg-&gt;tx_mcs_set);</div><div class='add'>+		mcs-&gt;tx_max_rate = cpu_to_le32(arg-&gt;rx_max_rate);</div><div class='add'>+		mcs-&gt;tx_mcs_set = cpu_to_le32(arg-&gt;rx_mcs_set);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* HE Rates */</div><div class='add'>+	cmd-&gt;peer_he_mcs = cpu_to_le32(arg-&gt;peer_he_mcs_count);</div><div class='add'>+	cmd-&gt;min_data_rate = cpu_to_le32(arg-&gt;min_data_rate);</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*mcs);</div><div class='add'>+</div><div class='add'>+	len = arg-&gt;peer_he_mcs_count * sizeof(*he_mcs);</div><div class='add'>+</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, len);</div><div class='add'>+	ptr += TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	/* Loop through the HE rate set */</div><div class='add'>+	for (i = 0; i &lt; arg-&gt;peer_he_mcs_count; i++) {</div><div class='add'>+		he_mcs = ptr;</div><div class='add'>+		he_mcs-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_HE_RATE_SET,</div><div class='add'>+							    sizeof(*he_mcs));</div><div class='add'>+</div><div class='add'>+		he_mcs-&gt;rx_mcs_set = cpu_to_le32(arg-&gt;peer_he_rx_mcs_set[i]);</div><div class='add'>+		he_mcs-&gt;tx_mcs_set = cpu_to_le32(arg-&gt;peer_he_tx_mcs_set[i]);</div><div class='add'>+		ptr += sizeof(*he_mcs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	len = arg-&gt;ml.enabled ? sizeof(*ml_params) : 0;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, len);</div><div class='add'>+	ptr += TLV_HDR_SIZE;</div><div class='add'>+	if (!len)</div><div class='add'>+		goto skip_ml_params;</div><div class='add'>+</div><div class='add'>+	ml_params = ptr;</div><div class='add'>+	ml_params-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_MLO_PEER_ASSOC_PARAMS,</div><div class='add'>+						       len);</div><div class='add'>+	ml_params-&gt;flags = cpu_to_le32(ATH12K_WMI_FLAG_MLO_ENABLED);</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;ml.assoc_link)</div><div class='add'>+		ml_params-&gt;flags |= cpu_to_le32(ATH12K_WMI_FLAG_MLO_ASSOC_LINK);</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;ml.primary_umac)</div><div class='add'>+		ml_params-&gt;flags |= cpu_to_le32(ATH12K_WMI_FLAG_MLO_PRIMARY_UMAC);</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;ml.logical_link_idx_valid)</div><div class='add'>+		ml_params-&gt;flags |=</div><div class='add'>+			cpu_to_le32(ATH12K_WMI_FLAG_MLO_LOGICAL_LINK_IDX_VALID);</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;ml.peer_id_valid)</div><div class='add'>+		ml_params-&gt;flags |= cpu_to_le32(ATH12K_WMI_FLAG_MLO_PEER_ID_VALID);</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(ml_params-&gt;mld_addr.addr, arg-&gt;ml.mld_addr);</div><div class='add'>+	ml_params-&gt;logical_link_idx = cpu_to_le32(arg-&gt;ml.logical_link_idx);</div><div class='add'>+	ml_params-&gt;ml_peer_id = cpu_to_le32(arg-&gt;ml.ml_peer_id);</div><div class='add'>+	ml_params-&gt;ieee_link_id = cpu_to_le32(arg-&gt;ml.ieee_link_id);</div><div class='add'>+</div><div class='add'>+	eml_cap = arg-&gt;ml.eml_cap;</div><div class='add'>+	if (u16_get_bits(eml_cap, IEEE80211_EML_CAP_EMLSR_SUPP)) {</div><div class='add'>+		ml_params-&gt;flags |= cpu_to_le32(ATH12K_WMI_FLAG_MLO_EMLSR_SUPPORT);</div><div class='add'>+		/* Padding delay */</div><div class='add'>+		eml_pad_delay = ieee80211_emlsr_pad_delay_in_us(eml_cap);</div><div class='add'>+		ml_params-&gt;emlsr_padding_delay_us = cpu_to_le32(eml_pad_delay);</div><div class='add'>+		/* Transition delay */</div><div class='add'>+		eml_trans_delay = ieee80211_emlsr_trans_delay_in_us(eml_cap);</div><div class='add'>+		ml_params-&gt;emlsr_trans_delay_us = cpu_to_le32(eml_trans_delay);</div><div class='add'>+		/* Transition timeout */</div><div class='add'>+		eml_trans_timeout = ieee80211_eml_trans_timeout_in_us(eml_cap);</div><div class='add'>+		ml_params-&gt;emlsr_trans_timeout_us =</div><div class='add'>+					cpu_to_le32(eml_trans_timeout);</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI, "wmi peer %pM emlsr padding delay %u, trans delay %u trans timeout %u",</div><div class='add'>+			   arg-&gt;peer_mac, eml_pad_delay, eml_trans_delay,</div><div class='add'>+			   eml_trans_timeout);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*ml_params);</div><div class='add'>+</div><div class='add'>+skip_ml_params:</div><div class='add'>+	/* Loop through the EHT rate set */</div><div class='add'>+	len = arg-&gt;peer_eht_mcs_count * sizeof(*eht_mcs);</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, len);</div><div class='add'>+	ptr += TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; arg-&gt;peer_eht_mcs_count; i++) {</div><div class='add'>+		eht_mcs = ptr;</div><div class='add'>+		eht_mcs-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_EHT_RATE_SET,</div><div class='add'>+							     sizeof(*eht_mcs));</div><div class='add'>+</div><div class='add'>+		eht_mcs-&gt;rx_mcs_set = cpu_to_le32(arg-&gt;peer_eht_rx_mcs_set[i]);</div><div class='add'>+		eht_mcs-&gt;tx_mcs_set = cpu_to_le32(arg-&gt;peer_eht_tx_mcs_set[i]);</div><div class='add'>+		ptr += sizeof(*eht_mcs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update MCS15 capability */</div><div class='add'>+	if (arg-&gt;eht_disable_mcs15)</div><div class='add'>+		cmd-&gt;peer_eht_ops = cpu_to_le32(IEEE80211_EHT_OPER_MCS15_DISABLE);</div><div class='add'>+</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	len = arg-&gt;ml.enabled ? arg-&gt;ml.num_partner_links * sizeof(*partner_info) : 0;</div><div class='add'>+	/* fill ML Partner links */</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, len);</div><div class='add'>+	ptr += TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	if (len == 0)</div><div class='add'>+		goto send;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; arg-&gt;ml.num_partner_links; i++) {</div><div class='add'>+		u32 cmd = WMI_TAG_MLO_PARTNER_LINK_PARAMS_PEER_ASSOC;</div><div class='add'>+</div><div class='add'>+		partner_info = ptr;</div><div class='add'>+		partner_info-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(cmd,</div><div class='add'>+								  sizeof(*partner_info));</div><div class='add'>+		partner_info-&gt;vdev_id = cpu_to_le32(arg-&gt;ml.partner_info[i].vdev_id);</div><div class='add'>+		partner_info-&gt;hw_link_id =</div><div class='add'>+			cpu_to_le32(arg-&gt;ml.partner_info[i].hw_link_id);</div><div class='add'>+		partner_info-&gt;flags = cpu_to_le32(ATH12K_WMI_FLAG_MLO_ENABLED);</div><div class='add'>+</div><div class='add'>+		if (arg-&gt;ml.partner_info[i].assoc_link)</div><div class='add'>+			partner_info-&gt;flags |=</div><div class='add'>+				cpu_to_le32(ATH12K_WMI_FLAG_MLO_ASSOC_LINK);</div><div class='add'>+</div><div class='add'>+		if (arg-&gt;ml.partner_info[i].primary_umac)</div><div class='add'>+			partner_info-&gt;flags |=</div><div class='add'>+				cpu_to_le32(ATH12K_WMI_FLAG_MLO_PRIMARY_UMAC);</div><div class='add'>+</div><div class='add'>+		if (arg-&gt;ml.partner_info[i].logical_link_idx_valid) {</div><div class='add'>+			v = cpu_to_le32(ATH12K_WMI_FLAG_MLO_LINK_ID_VALID);</div><div class='add'>+			partner_info-&gt;flags |= v;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		partner_info-&gt;logical_link_idx =</div><div class='add'>+			cpu_to_le32(arg-&gt;ml.partner_info[i].logical_link_idx);</div><div class='add'>+		ptr += sizeof(*partner_info);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+send:</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "wmi peer assoc vdev id %d assoc id %d peer mac %pM peer_flags %x rate_caps %x peer_caps %x listen_intval %d ht_caps %x max_mpdu %d nss %d phymode %d peer_mpdu_density %d vht_caps %x he cap_info %x he ops %x he cap_info_ext %x he phy %x %x %x peer_bw_rxnss_override %x peer_flags_ext %x eht mac_cap %x %x eht phy_cap %x %x %x peer_eht_ops %x\n",</div><div class='add'>+		   cmd-&gt;vdev_id, cmd-&gt;peer_associd, arg-&gt;peer_mac,</div><div class='add'>+		   cmd-&gt;peer_flags, cmd-&gt;peer_rate_caps, cmd-&gt;peer_caps,</div><div class='add'>+		   cmd-&gt;peer_listen_intval, cmd-&gt;peer_ht_caps,</div><div class='add'>+		   cmd-&gt;peer_max_mpdu, cmd-&gt;peer_nss, cmd-&gt;peer_phymode,</div><div class='add'>+		   cmd-&gt;peer_mpdu_density,</div><div class='add'>+		   cmd-&gt;peer_vht_caps, cmd-&gt;peer_he_cap_info,</div><div class='add'>+		   cmd-&gt;peer_he_ops, cmd-&gt;peer_he_cap_info_ext,</div><div class='add'>+		   cmd-&gt;peer_he_cap_phy[0], cmd-&gt;peer_he_cap_phy[1],</div><div class='add'>+		   cmd-&gt;peer_he_cap_phy[2],</div><div class='add'>+		   cmd-&gt;peer_bw_rxnss_override, cmd-&gt;peer_flags_ext,</div><div class='add'>+		   cmd-&gt;peer_eht_cap_mac[0], cmd-&gt;peer_eht_cap_mac[1],</div><div class='add'>+		   cmd-&gt;peer_eht_cap_phy[0], cmd-&gt;peer_eht_cap_phy[1],</div><div class='add'>+		   cmd-&gt;peer_eht_cap_phy[2], cmd-&gt;peer_eht_ops);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_PEER_ASSOC_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_PEER_ASSOC_CMDID\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_wmi_start_scan_init(struct ath12k *ar,</div><div class='add'>+				struct ath12k_wmi_scan_req_arg *arg)</div><div class='add'>+{</div><div class='add'>+	/* setup commonly used values */</div><div class='add'>+	arg-&gt;scan_req_id = 1;</div><div class='add'>+	arg-&gt;scan_priority = WMI_SCAN_PRIORITY_LOW;</div><div class='add'>+	arg-&gt;dwell_time_active = 50;</div><div class='add'>+	arg-&gt;dwell_time_active_2g = 0;</div><div class='add'>+	arg-&gt;dwell_time_passive = 150;</div><div class='add'>+	arg-&gt;dwell_time_active_6g = 70;</div><div class='add'>+	arg-&gt;dwell_time_passive_6g = 70;</div><div class='add'>+	arg-&gt;min_rest_time = 50;</div><div class='add'>+	arg-&gt;max_rest_time = 500;</div><div class='add'>+	arg-&gt;repeat_probe_time = 0;</div><div class='add'>+	arg-&gt;probe_spacing_time = 0;</div><div class='add'>+	arg-&gt;idle_time = 0;</div><div class='add'>+	arg-&gt;max_scan_time = 20000;</div><div class='add'>+	arg-&gt;probe_delay = 5;</div><div class='add'>+	arg-&gt;notify_scan_events = WMI_SCAN_EVENT_STARTED |</div><div class='add'>+				  WMI_SCAN_EVENT_COMPLETED |</div><div class='add'>+				  WMI_SCAN_EVENT_BSS_CHANNEL |</div><div class='add'>+				  WMI_SCAN_EVENT_FOREIGN_CHAN |</div><div class='add'>+				  WMI_SCAN_EVENT_DEQUEUED;</div><div class='add'>+	arg-&gt;scan_f_chan_stat_evnt = 1;</div><div class='add'>+	arg-&gt;num_bssid = 1;</div><div class='add'>+</div><div class='add'>+	/* fill bssid_list[0] with 0xff, otherwise bssid and RA will be</div><div class='add'>+	 * ZEROs in probe request</div><div class='add'>+	 */</div><div class='add'>+	eth_broadcast_addr(arg-&gt;bssid_list[0].addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_copy_scan_event_cntrl_flags(struct wmi_start_scan_cmd *cmd,</div><div class='add'>+						   struct ath12k_wmi_scan_req_arg *arg)</div><div class='add'>+{</div><div class='add'>+	/* Scan events subscription */</div><div class='add'>+	if (arg-&gt;scan_ev_started)</div><div class='add'>+		cmd-&gt;notify_scan_events |= cpu_to_le32(WMI_SCAN_EVENT_STARTED);</div><div class='add'>+	if (arg-&gt;scan_ev_completed)</div><div class='add'>+		cmd-&gt;notify_scan_events |= cpu_to_le32(WMI_SCAN_EVENT_COMPLETED);</div><div class='add'>+	if (arg-&gt;scan_ev_bss_chan)</div><div class='add'>+		cmd-&gt;notify_scan_events |= cpu_to_le32(WMI_SCAN_EVENT_BSS_CHANNEL);</div><div class='add'>+	if (arg-&gt;scan_ev_foreign_chan)</div><div class='add'>+		cmd-&gt;notify_scan_events |= cpu_to_le32(WMI_SCAN_EVENT_FOREIGN_CHAN);</div><div class='add'>+	if (arg-&gt;scan_ev_dequeued)</div><div class='add'>+		cmd-&gt;notify_scan_events |= cpu_to_le32(WMI_SCAN_EVENT_DEQUEUED);</div><div class='add'>+	if (arg-&gt;scan_ev_preempted)</div><div class='add'>+		cmd-&gt;notify_scan_events |= cpu_to_le32(WMI_SCAN_EVENT_PREEMPTED);</div><div class='add'>+	if (arg-&gt;scan_ev_start_failed)</div><div class='add'>+		cmd-&gt;notify_scan_events |= cpu_to_le32(WMI_SCAN_EVENT_START_FAILED);</div><div class='add'>+	if (arg-&gt;scan_ev_restarted)</div><div class='add'>+		cmd-&gt;notify_scan_events |= cpu_to_le32(WMI_SCAN_EVENT_RESTARTED);</div><div class='add'>+	if (arg-&gt;scan_ev_foreign_chn_exit)</div><div class='add'>+		cmd-&gt;notify_scan_events |= cpu_to_le32(WMI_SCAN_EVENT_FOREIGN_CHAN_EXIT);</div><div class='add'>+	if (arg-&gt;scan_ev_suspended)</div><div class='add'>+		cmd-&gt;notify_scan_events |= cpu_to_le32(WMI_SCAN_EVENT_SUSPENDED);</div><div class='add'>+	if (arg-&gt;scan_ev_resumed)</div><div class='add'>+		cmd-&gt;notify_scan_events |= cpu_to_le32(WMI_SCAN_EVENT_RESUMED);</div><div class='add'>+</div><div class='add'>+	/** Set scan control flags */</div><div class='add'>+	cmd-&gt;scan_ctrl_flags = 0;</div><div class='add'>+	if (arg-&gt;scan_f_passive)</div><div class='add'>+		cmd-&gt;scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_FLAG_PASSIVE);</div><div class='add'>+	if (arg-&gt;scan_f_strict_passive_pch)</div><div class='add'>+		cmd-&gt;scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_FLAG_STRICT_PASSIVE_ON_PCHN);</div><div class='add'>+	if (arg-&gt;scan_f_promisc_mode)</div><div class='add'>+		cmd-&gt;scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_FILTER_PROMISCUOS);</div><div class='add'>+	if (arg-&gt;scan_f_capture_phy_err)</div><div class='add'>+		cmd-&gt;scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_CAPTURE_PHY_ERROR);</div><div class='add'>+	if (arg-&gt;scan_f_half_rate)</div><div class='add'>+		cmd-&gt;scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_FLAG_HALF_RATE_SUPPORT);</div><div class='add'>+	if (arg-&gt;scan_f_quarter_rate)</div><div class='add'>+		cmd-&gt;scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_FLAG_QUARTER_RATE_SUPPORT);</div><div class='add'>+	if (arg-&gt;scan_f_cck_rates)</div><div class='add'>+		cmd-&gt;scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_ADD_CCK_RATES);</div><div class='add'>+	if (arg-&gt;scan_f_ofdm_rates)</div><div class='add'>+		cmd-&gt;scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_ADD_OFDM_RATES);</div><div class='add'>+	if (arg-&gt;scan_f_chan_stat_evnt)</div><div class='add'>+		cmd-&gt;scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_CHAN_STAT_EVENT);</div><div class='add'>+	if (arg-&gt;scan_f_filter_prb_req)</div><div class='add'>+		cmd-&gt;scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_FILTER_PROBE_REQ);</div><div class='add'>+	if (arg-&gt;scan_f_bcast_probe)</div><div class='add'>+		cmd-&gt;scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_ADD_BCAST_PROBE_REQ);</div><div class='add'>+	if (arg-&gt;scan_f_offchan_mgmt_tx)</div><div class='add'>+		cmd-&gt;scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_OFFCHAN_MGMT_TX);</div><div class='add'>+	if (arg-&gt;scan_f_offchan_data_tx)</div><div class='add'>+		cmd-&gt;scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_OFFCHAN_DATA_TX);</div><div class='add'>+	if (arg-&gt;scan_f_force_active_dfs_chn)</div><div class='add'>+		cmd-&gt;scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_FLAG_FORCE_ACTIVE_ON_DFS);</div><div class='add'>+	if (arg-&gt;scan_f_add_tpc_ie_in_probe)</div><div class='add'>+		cmd-&gt;scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_ADD_TPC_IE_IN_PROBE_REQ);</div><div class='add'>+	if (arg-&gt;scan_f_add_ds_ie_in_probe)</div><div class='add'>+		cmd-&gt;scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_ADD_DS_IE_IN_PROBE_REQ);</div><div class='add'>+	if (arg-&gt;scan_f_add_spoofed_mac_in_probe)</div><div class='add'>+		cmd-&gt;scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_ADD_SPOOF_MAC_IN_PROBE_REQ);</div><div class='add'>+	if (arg-&gt;scan_f_add_rand_seq_in_probe)</div><div class='add'>+		cmd-&gt;scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_RANDOM_SEQ_NO_IN_PROBE_REQ);</div><div class='add'>+	if (arg-&gt;scan_f_en_ie_whitelist_in_probe)</div><div class='add'>+		cmd-&gt;scan_ctrl_flags |=</div><div class='add'>+			cpu_to_le32(WMI_SCAN_ENABLE_IE_WHTELIST_IN_PROBE_REQ);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;scan_ctrl_flags |= le32_encode_bits(arg-&gt;adaptive_dwell_time_mode,</div><div class='add'>+						 WMI_SCAN_DWELL_MODE_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_scan_start_cmd(struct ath12k *ar,</div><div class='add'>+				   struct ath12k_wmi_scan_req_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_start_scan_cmd *cmd;</div><div class='add'>+	struct ath12k_wmi_ssid_params *ssid = NULL;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params *bssid;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	void *ptr;</div><div class='add'>+	int i, ret, len;</div><div class='add'>+	u32 *tmp_ptr, extraie_len_with_pad = 0;</div><div class='add'>+	struct ath12k_wmi_hint_short_ssid_arg *s_ssid = NULL;</div><div class='add'>+	struct ath12k_wmi_hint_bssid_arg *hint_bssid = NULL;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	len += TLV_HDR_SIZE;</div><div class='add'>+	if (arg-&gt;num_chan)</div><div class='add'>+		len += arg-&gt;num_chan * sizeof(u32);</div><div class='add'>+</div><div class='add'>+	len += TLV_HDR_SIZE;</div><div class='add'>+	if (arg-&gt;num_ssids)</div><div class='add'>+		len += arg-&gt;num_ssids * sizeof(*ssid);</div><div class='add'>+</div><div class='add'>+	len += TLV_HDR_SIZE;</div><div class='add'>+	if (arg-&gt;num_bssid)</div><div class='add'>+		len += sizeof(*bssid) * arg-&gt;num_bssid;</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;num_hint_bssid)</div><div class='add'>+		len += TLV_HDR_SIZE +</div><div class='add'>+		       arg-&gt;num_hint_bssid * sizeof(*hint_bssid);</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;num_hint_s_ssid)</div><div class='add'>+		len += TLV_HDR_SIZE +</div><div class='add'>+		       arg-&gt;num_hint_s_ssid * sizeof(*s_ssid);</div><div class='add'>+</div><div class='add'>+	len += TLV_HDR_SIZE;</div><div class='add'>+	if (arg-&gt;extraie.len)</div><div class='add'>+		extraie_len_with_pad =</div><div class='add'>+			roundup(arg-&gt;extraie.len, sizeof(u32));</div><div class='add'>+	if (extraie_len_with_pad &lt;= (wmi-&gt;wmi_ab-&gt;max_msg_len[ar-&gt;pdev_idx] - len)) {</div><div class='add'>+		len += extraie_len_with_pad;</div><div class='add'>+	} else {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "discard large size %d bytes extraie for scan start\n",</div><div class='add'>+			    arg-&gt;extraie.len);</div><div class='add'>+		extraie_len_with_pad = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ptr = skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	cmd = ptr;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_START_SCAN_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;scan_id = cpu_to_le32(arg-&gt;scan_id);</div><div class='add'>+	cmd-&gt;scan_req_id = cpu_to_le32(arg-&gt;scan_req_id);</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(arg-&gt;vdev_id);</div><div class='add'>+	if (ar-&gt;state_11d == ATH12K_11D_PREPARING)</div><div class='add'>+		arg-&gt;scan_priority = WMI_SCAN_PRIORITY_MEDIUM;</div><div class='add'>+	else</div><div class='add'>+		arg-&gt;scan_priority = WMI_SCAN_PRIORITY_LOW;</div><div class='add'>+	cmd-&gt;notify_scan_events = cpu_to_le32(arg-&gt;notify_scan_events);</div><div class='add'>+</div><div class='add'>+	ath12k_wmi_copy_scan_event_cntrl_flags(cmd, arg);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;dwell_time_active = cpu_to_le32(arg-&gt;dwell_time_active);</div><div class='add'>+	cmd-&gt;dwell_time_active_2g = cpu_to_le32(arg-&gt;dwell_time_active_2g);</div><div class='add'>+	cmd-&gt;dwell_time_passive = cpu_to_le32(arg-&gt;dwell_time_passive);</div><div class='add'>+	cmd-&gt;dwell_time_active_6g = cpu_to_le32(arg-&gt;dwell_time_active_6g);</div><div class='add'>+	cmd-&gt;dwell_time_passive_6g = cpu_to_le32(arg-&gt;dwell_time_passive_6g);</div><div class='add'>+	cmd-&gt;min_rest_time = cpu_to_le32(arg-&gt;min_rest_time);</div><div class='add'>+	cmd-&gt;max_rest_time = cpu_to_le32(arg-&gt;max_rest_time);</div><div class='add'>+	cmd-&gt;repeat_probe_time = cpu_to_le32(arg-&gt;repeat_probe_time);</div><div class='add'>+	cmd-&gt;probe_spacing_time = cpu_to_le32(arg-&gt;probe_spacing_time);</div><div class='add'>+	cmd-&gt;idle_time = cpu_to_le32(arg-&gt;idle_time);</div><div class='add'>+	cmd-&gt;max_scan_time = cpu_to_le32(arg-&gt;max_scan_time);</div><div class='add'>+	cmd-&gt;probe_delay = cpu_to_le32(arg-&gt;probe_delay);</div><div class='add'>+	cmd-&gt;burst_duration = cpu_to_le32(arg-&gt;burst_duration);</div><div class='add'>+	cmd-&gt;num_chan = cpu_to_le32(arg-&gt;num_chan);</div><div class='add'>+	cmd-&gt;num_bssid = cpu_to_le32(arg-&gt;num_bssid);</div><div class='add'>+	cmd-&gt;num_ssids = cpu_to_le32(arg-&gt;num_ssids);</div><div class='add'>+	cmd-&gt;ie_len = cpu_to_le32(arg-&gt;extraie.len);</div><div class='add'>+	cmd-&gt;n_probes = cpu_to_le32(arg-&gt;n_probes);</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	len = arg-&gt;num_chan * sizeof(u32);</div><div class='add'>+</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_UINT32, len);</div><div class='add'>+	ptr += TLV_HDR_SIZE;</div><div class='add'>+	tmp_ptr = (u32 *)ptr;</div><div class='add'>+</div><div class='add'>+	memcpy(tmp_ptr, arg-&gt;chan_list, arg-&gt;num_chan * 4);</div><div class='add'>+</div><div class='add'>+	ptr += len;</div><div class='add'>+</div><div class='add'>+	len = arg-&gt;num_ssids * sizeof(*ssid);</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_FIXED_STRUCT, len);</div><div class='add'>+</div><div class='add'>+	ptr += TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;num_ssids) {</div><div class='add'>+		ssid = ptr;</div><div class='add'>+		for (i = 0; i &lt; arg-&gt;num_ssids; ++i) {</div><div class='add'>+			ssid-&gt;ssid_len = cpu_to_le32(arg-&gt;ssid[i].ssid_len);</div><div class='add'>+			memcpy(ssid-&gt;ssid, arg-&gt;ssid[i].ssid,</div><div class='add'>+			       arg-&gt;ssid[i].ssid_len);</div><div class='add'>+			ssid++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptr += (arg-&gt;num_ssids * sizeof(*ssid));</div><div class='add'>+	len = arg-&gt;num_bssid * sizeof(*bssid);</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_FIXED_STRUCT, len);</div><div class='add'>+</div><div class='add'>+	ptr += TLV_HDR_SIZE;</div><div class='add'>+	bssid = ptr;</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;num_bssid) {</div><div class='add'>+		for (i = 0; i &lt; arg-&gt;num_bssid; ++i) {</div><div class='add'>+			ether_addr_copy(bssid-&gt;addr,</div><div class='add'>+					arg-&gt;bssid_list[i].addr);</div><div class='add'>+			bssid++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptr += arg-&gt;num_bssid * sizeof(*bssid);</div><div class='add'>+</div><div class='add'>+	len = extraie_len_with_pad;</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE, len);</div><div class='add'>+	ptr += TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	if (extraie_len_with_pad)</div><div class='add'>+		memcpy(ptr, arg-&gt;extraie.ptr,</div><div class='add'>+		       arg-&gt;extraie.len);</div><div class='add'>+</div><div class='add'>+	ptr += extraie_len_with_pad;</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;num_hint_s_ssid) {</div><div class='add'>+		len = arg-&gt;num_hint_s_ssid * sizeof(*s_ssid);</div><div class='add'>+		tlv = ptr;</div><div class='add'>+		tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_FIXED_STRUCT, len);</div><div class='add'>+		ptr += TLV_HDR_SIZE;</div><div class='add'>+		s_ssid = ptr;</div><div class='add'>+		for (i = 0; i &lt; arg-&gt;num_hint_s_ssid; ++i) {</div><div class='add'>+			s_ssid-&gt;freq_flags = arg-&gt;hint_s_ssid[i].freq_flags;</div><div class='add'>+			s_ssid-&gt;short_ssid = arg-&gt;hint_s_ssid[i].short_ssid;</div><div class='add'>+			s_ssid++;</div><div class='add'>+		}</div><div class='add'>+		ptr += len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;num_hint_bssid) {</div><div class='add'>+		len = arg-&gt;num_hint_bssid * sizeof(struct ath12k_wmi_hint_bssid_arg);</div><div class='add'>+		tlv = ptr;</div><div class='add'>+		tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_FIXED_STRUCT, len);</div><div class='add'>+		ptr += TLV_HDR_SIZE;</div><div class='add'>+		hint_bssid = ptr;</div><div class='add'>+		for (i = 0; i &lt; arg-&gt;num_hint_bssid; ++i) {</div><div class='add'>+			hint_bssid-&gt;freq_flags =</div><div class='add'>+				arg-&gt;hint_bssid[i].freq_flags;</div><div class='add'>+			ether_addr_copy(&amp;arg-&gt;hint_bssid[i].bssid.addr[0],</div><div class='add'>+					&amp;hint_bssid-&gt;bssid.addr[0]);</div><div class='add'>+			hint_bssid++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb,</div><div class='add'>+				  WMI_START_SCAN_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to send WMI_START_SCAN_CMDID\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_scan_stop_cmd(struct ath12k *ar,</div><div class='add'>+				  struct ath12k_wmi_scan_cancel_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_stop_scan_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_stop_scan_cmd *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_STOP_SCAN_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(arg-&gt;vdev_id);</div><div class='add'>+	cmd-&gt;requestor = cpu_to_le32(arg-&gt;requester);</div><div class='add'>+	cmd-&gt;scan_id = cpu_to_le32(arg-&gt;scan_id);</div><div class='add'>+	cmd-&gt;pdev_id = cpu_to_le32(arg-&gt;pdev_id);</div><div class='add'>+	/* stop the scan with the corresponding scan_id */</div><div class='add'>+	if (arg-&gt;req_type == WLAN_SCAN_CANCEL_PDEV_ALL) {</div><div class='add'>+		/* Cancelling all scans */</div><div class='add'>+		cmd-&gt;req_type = cpu_to_le32(WMI_SCAN_STOP_ALL);</div><div class='add'>+	} else if (arg-&gt;req_type == WLAN_SCAN_CANCEL_VDEV_ALL) {</div><div class='add'>+		/* Cancelling VAP scans */</div><div class='add'>+		cmd-&gt;req_type = cpu_to_le32(WMI_SCAN_STOP_VAP_ALL);</div><div class='add'>+	} else if (arg-&gt;req_type == WLAN_SCAN_CANCEL_SINGLE) {</div><div class='add'>+		/* Cancelling specific scan */</div><div class='add'>+		cmd-&gt;req_type = WMI_SCAN_STOP_ONE;</div><div class='add'>+	} else {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "invalid scan cancel req_type %d",</div><div class='add'>+			    arg-&gt;req_type);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb,</div><div class='add'>+				  WMI_STOP_SCAN_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to send WMI_STOP_SCAN_CMDID\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_scan_chan_list_cmd(struct ath12k *ar,</div><div class='add'>+				       struct ath12k_wmi_scan_chan_list_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_scan_chan_list_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct ath12k_wmi_channel_params *chan_info;</div><div class='add'>+	struct ath12k_wmi_channel_arg *channel_arg;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	void *ptr;</div><div class='add'>+	int i, ret, len;</div><div class='add'>+	u16 num_send_chans, num_sends = 0, max_chan_limit = 0;</div><div class='add'>+	__le32 *reg1, *reg2;</div><div class='add'>+</div><div class='add'>+	channel_arg = &amp;arg-&gt;channel[0];</div><div class='add'>+	while (arg-&gt;nallchans) {</div><div class='add'>+		len = sizeof(*cmd) + TLV_HDR_SIZE;</div><div class='add'>+		max_chan_limit = (wmi-&gt;wmi_ab-&gt;max_msg_len[ar-&gt;pdev_idx] - len) /</div><div class='add'>+			sizeof(*chan_info);</div><div class='add'>+</div><div class='add'>+		num_send_chans = min(arg-&gt;nallchans, max_chan_limit);</div><div class='add'>+</div><div class='add'>+		arg-&gt;nallchans -= num_send_chans;</div><div class='add'>+		len += sizeof(*chan_info) * num_send_chans;</div><div class='add'>+</div><div class='add'>+		skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+		if (!skb)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		cmd = (struct wmi_scan_chan_list_cmd *)skb-&gt;data;</div><div class='add'>+		cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_SCAN_CHAN_LIST_CMD,</div><div class='add'>+							 sizeof(*cmd));</div><div class='add'>+		cmd-&gt;pdev_id = cpu_to_le32(arg-&gt;pdev_id);</div><div class='add'>+		cmd-&gt;num_scan_chans = cpu_to_le32(num_send_chans);</div><div class='add'>+		if (num_sends)</div><div class='add'>+			cmd-&gt;flags |= cpu_to_le32(WMI_APPEND_TO_EXISTING_CHAN_LIST_FLAG);</div><div class='add'>+</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+			   "WMI no.of chan = %d len = %d pdev_id = %d num_sends = %d\n",</div><div class='add'>+			   num_send_chans, len, cmd-&gt;pdev_id, num_sends);</div><div class='add'>+</div><div class='add'>+		ptr = skb-&gt;data + sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+		len = sizeof(*chan_info) * num_send_chans;</div><div class='add'>+		tlv = ptr;</div><div class='add'>+		tlv-&gt;header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_ARRAY_STRUCT,</div><div class='add'>+						     len);</div><div class='add'>+		ptr += TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; num_send_chans; ++i) {</div><div class='add'>+			chan_info = ptr;</div><div class='add'>+			memset(chan_info, 0, sizeof(*chan_info));</div><div class='add'>+			len = sizeof(*chan_info);</div><div class='add'>+			chan_info-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_CHANNEL,</div><div class='add'>+								       len);</div><div class='add'>+</div><div class='add'>+			reg1 = &amp;chan_info-&gt;reg_info_1;</div><div class='add'>+			reg2 = &amp;chan_info-&gt;reg_info_2;</div><div class='add'>+			chan_info-&gt;mhz = cpu_to_le32(channel_arg-&gt;mhz);</div><div class='add'>+			chan_info-&gt;band_center_freq1 = cpu_to_le32(channel_arg-&gt;cfreq1);</div><div class='add'>+			chan_info-&gt;band_center_freq2 = cpu_to_le32(channel_arg-&gt;cfreq2);</div><div class='add'>+</div><div class='add'>+			if (channel_arg-&gt;is_chan_passive)</div><div class='add'>+				chan_info-&gt;info |= cpu_to_le32(WMI_CHAN_INFO_PASSIVE);</div><div class='add'>+			if (channel_arg-&gt;allow_he)</div><div class='add'>+				chan_info-&gt;info |= cpu_to_le32(WMI_CHAN_INFO_ALLOW_HE);</div><div class='add'>+			else if (channel_arg-&gt;allow_vht)</div><div class='add'>+				chan_info-&gt;info |= cpu_to_le32(WMI_CHAN_INFO_ALLOW_VHT);</div><div class='add'>+			else if (channel_arg-&gt;allow_ht)</div><div class='add'>+				chan_info-&gt;info |= cpu_to_le32(WMI_CHAN_INFO_ALLOW_HT);</div><div class='add'>+			if (channel_arg-&gt;half_rate)</div><div class='add'>+				chan_info-&gt;info |= cpu_to_le32(WMI_CHAN_INFO_HALF_RATE);</div><div class='add'>+			if (channel_arg-&gt;quarter_rate)</div><div class='add'>+				chan_info-&gt;info |=</div><div class='add'>+					cpu_to_le32(WMI_CHAN_INFO_QUARTER_RATE);</div><div class='add'>+</div><div class='add'>+			if (channel_arg-&gt;psc_channel)</div><div class='add'>+				chan_info-&gt;info |= cpu_to_le32(WMI_CHAN_INFO_PSC);</div><div class='add'>+</div><div class='add'>+			if (channel_arg-&gt;dfs_set)</div><div class='add'>+				chan_info-&gt;info |= cpu_to_le32(WMI_CHAN_INFO_DFS);</div><div class='add'>+</div><div class='add'>+			chan_info-&gt;info |= le32_encode_bits(channel_arg-&gt;phy_mode,</div><div class='add'>+							    WMI_CHAN_INFO_MODE);</div><div class='add'>+			*reg1 |= le32_encode_bits(channel_arg-&gt;minpower,</div><div class='add'>+						  WMI_CHAN_REG_INFO1_MIN_PWR);</div><div class='add'>+			*reg1 |= le32_encode_bits(channel_arg-&gt;maxpower,</div><div class='add'>+						  WMI_CHAN_REG_INFO1_MAX_PWR);</div><div class='add'>+			*reg1 |= le32_encode_bits(channel_arg-&gt;maxregpower,</div><div class='add'>+						  WMI_CHAN_REG_INFO1_MAX_REG_PWR);</div><div class='add'>+			*reg1 |= le32_encode_bits(channel_arg-&gt;reg_class_id,</div><div class='add'>+						  WMI_CHAN_REG_INFO1_REG_CLS);</div><div class='add'>+			*reg2 |= le32_encode_bits(channel_arg-&gt;antennamax,</div><div class='add'>+						  WMI_CHAN_REG_INFO2_ANT_MAX);</div><div class='add'>+			*reg2 |= le32_encode_bits(channel_arg-&gt;maxregpower,</div><div class='add'>+						  WMI_CHAN_REG_INFO2_MAX_TX_PWR);</div><div class='add'>+</div><div class='add'>+			ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+				   "WMI chan scan list chan[%d] = %u, chan_info-&gt;info %8x\n",</div><div class='add'>+				   i, chan_info-&gt;mhz, chan_info-&gt;info);</div><div class='add'>+</div><div class='add'>+			ptr += sizeof(*chan_info);</div><div class='add'>+</div><div class='add'>+			channel_arg++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ath12k_wmi_cmd_send(wmi, skb, WMI_SCAN_CHAN_LIST_CMDID);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to send WMI_SCAN_CHAN_LIST cmd\n");</div><div class='add'>+			dev_kfree_skb(skb);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		num_sends++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_wmm_update_cmd(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+				   struct wmi_wmm_params_all_arg *param)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_vdev_set_wmm_params_cmd *cmd;</div><div class='add'>+	struct wmi_wmm_params *wmm_param;</div><div class='add'>+	struct wmi_wmm_params_arg *wmi_wmm_arg;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret, ac;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_vdev_set_wmm_params_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_VDEV_SET_WMM_PARAMS_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;wmm_param_type = 0;</div><div class='add'>+</div><div class='add'>+	for (ac = 0; ac &lt; WME_NUM_AC; ac++) {</div><div class='add'>+		switch (ac) {</div><div class='add'>+		case WME_AC_BE:</div><div class='add'>+			wmi_wmm_arg = &amp;param-&gt;ac_be;</div><div class='add'>+			break;</div><div class='add'>+		case WME_AC_BK:</div><div class='add'>+			wmi_wmm_arg = &amp;param-&gt;ac_bk;</div><div class='add'>+			break;</div><div class='add'>+		case WME_AC_VI:</div><div class='add'>+			wmi_wmm_arg = &amp;param-&gt;ac_vi;</div><div class='add'>+			break;</div><div class='add'>+		case WME_AC_VO:</div><div class='add'>+			wmi_wmm_arg = &amp;param-&gt;ac_vo;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		wmm_param = (struct wmi_wmm_params *)&amp;cmd-&gt;wmm_params[ac];</div><div class='add'>+		wmm_param-&gt;tlv_header =</div><div class='add'>+			ath12k_wmi_tlv_cmd_hdr(WMI_TAG_VDEV_SET_WMM_PARAMS_CMD,</div><div class='add'>+					       sizeof(*wmm_param));</div><div class='add'>+</div><div class='add'>+		wmm_param-&gt;aifs = cpu_to_le32(wmi_wmm_arg-&gt;aifs);</div><div class='add'>+		wmm_param-&gt;cwmin = cpu_to_le32(wmi_wmm_arg-&gt;cwmin);</div><div class='add'>+		wmm_param-&gt;cwmax = cpu_to_le32(wmi_wmm_arg-&gt;cwmax);</div><div class='add'>+		wmm_param-&gt;txoplimit = cpu_to_le32(wmi_wmm_arg-&gt;txop);</div><div class='add'>+		wmm_param-&gt;acm = cpu_to_le32(wmi_wmm_arg-&gt;acm);</div><div class='add'>+		wmm_param-&gt;no_ack = cpu_to_le32(wmi_wmm_arg-&gt;no_ack);</div><div class='add'>+</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+			   "wmi wmm set ac %d aifs %d cwmin %d cwmax %d txop %d acm %d no_ack %d\n",</div><div class='add'>+			   ac, wmm_param-&gt;aifs, wmm_param-&gt;cwmin,</div><div class='add'>+			   wmm_param-&gt;cwmax, wmm_param-&gt;txoplimit,</div><div class='add'>+			   wmm_param-&gt;acm, wmm_param-&gt;no_ack);</div><div class='add'>+	}</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb,</div><div class='add'>+				  WMI_VDEV_SET_WMM_PARAMS_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_VDEV_SET_WMM_PARAMS_CMDID");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_dfs_phyerr_offload_enable_cmd(struct ath12k *ar,</div><div class='add'>+						  u32 pdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_dfs_phyerr_offload_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_dfs_phyerr_offload_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header =</div><div class='add'>+		ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PDEV_DFS_PHYERR_OFFLOAD_ENABLE_CMD,</div><div class='add'>+				       sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;pdev_id = cpu_to_le32(pdev_id);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI dfs phy err offload enable pdev id %d\n", pdev_id);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb,</div><div class='add'>+				  WMI_PDEV_DFS_PHYERR_OFFLOAD_ENABLE_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_PDEV_DFS_PHYERR_OFFLOAD_ENABLE cmd\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_set_bios_cmd(struct ath12k_base *ab, u32 param_id,</div><div class='add'>+			    const u8 *buf, size_t buf_len)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_base *wmi_ab = &amp;ab-&gt;wmi_ab;</div><div class='add'>+	struct wmi_pdev_set_bios_interface_cmd *cmd;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u8 *ptr;</div><div class='add'>+	u32 len, len_aligned;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	len_aligned = roundup(buf_len, sizeof(u32));</div><div class='add'>+	len = sizeof(*cmd) + TLV_HDR_SIZE + len_aligned;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_pdev_set_bios_interface_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PDEV_SET_BIOS_INTERFACE_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;pdev_id = cpu_to_le32(WMI_PDEV_ID_SOC);</div><div class='add'>+	cmd-&gt;param_type_id = cpu_to_le32(param_id);</div><div class='add'>+	cmd-&gt;length = cpu_to_le32(buf_len);</div><div class='add'>+</div><div class='add'>+	ptr = skb-&gt;data + sizeof(*cmd);</div><div class='add'>+	tlv = (struct wmi_tlv *)ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE, len_aligned);</div><div class='add'>+	ptr += TLV_HDR_SIZE;</div><div class='add'>+	memcpy(ptr, buf, buf_len);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(&amp;wmi_ab-&gt;wmi[0],</div><div class='add'>+				  skb,</div><div class='add'>+				  WMI_PDEV_SET_BIOS_INTERFACE_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "failed to send WMI_PDEV_SET_BIOS_INTERFACE_CMDID parameter id %d: %d\n",</div><div class='add'>+			    param_id, ret);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_set_bios_sar_cmd(struct ath12k_base *ab, const u8 *psar_table)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_base *wmi_ab = &amp;ab-&gt;wmi_ab;</div><div class='add'>+	struct wmi_pdev_set_bios_sar_table_cmd *cmd;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 *buf_ptr;</div><div class='add'>+	u32 len, sar_table_len_aligned, sar_dbs_backoff_len_aligned;</div><div class='add'>+	const u8 *psar_value = psar_table + ATH12K_ACPI_POWER_LIMIT_DATA_OFFSET;</div><div class='add'>+	const u8 *pdbs_value = psar_table + ATH12K_ACPI_DBS_BACKOFF_DATA_OFFSET;</div><div class='add'>+</div><div class='add'>+	sar_table_len_aligned = roundup(ATH12K_ACPI_BIOS_SAR_TABLE_LEN, sizeof(u32));</div><div class='add'>+	sar_dbs_backoff_len_aligned = roundup(ATH12K_ACPI_BIOS_SAR_DBS_BACKOFF_LEN,</div><div class='add'>+					      sizeof(u32));</div><div class='add'>+	len = sizeof(*cmd) + TLV_HDR_SIZE + sar_table_len_aligned +</div><div class='add'>+		TLV_HDR_SIZE + sar_dbs_backoff_len_aligned;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_pdev_set_bios_sar_table_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PDEV_SET_BIOS_SAR_TABLE_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;pdev_id = cpu_to_le32(WMI_PDEV_ID_SOC);</div><div class='add'>+	cmd-&gt;sar_len = cpu_to_le32(ATH12K_ACPI_BIOS_SAR_TABLE_LEN);</div><div class='add'>+	cmd-&gt;dbs_backoff_len = cpu_to_le32(ATH12K_ACPI_BIOS_SAR_DBS_BACKOFF_LEN);</div><div class='add'>+</div><div class='add'>+	buf_ptr = skb-&gt;data + sizeof(*cmd);</div><div class='add'>+	tlv = (struct wmi_tlv *)buf_ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE,</div><div class='add'>+					 sar_table_len_aligned);</div><div class='add'>+	buf_ptr += TLV_HDR_SIZE;</div><div class='add'>+	memcpy(buf_ptr, psar_value, ATH12K_ACPI_BIOS_SAR_TABLE_LEN);</div><div class='add'>+</div><div class='add'>+	buf_ptr += sar_table_len_aligned;</div><div class='add'>+	tlv = (struct wmi_tlv *)buf_ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE,</div><div class='add'>+					 sar_dbs_backoff_len_aligned);</div><div class='add'>+	buf_ptr += TLV_HDR_SIZE;</div><div class='add'>+	memcpy(buf_ptr, pdbs_value, ATH12K_ACPI_BIOS_SAR_DBS_BACKOFF_LEN);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(&amp;wmi_ab-&gt;wmi[0],</div><div class='add'>+				  skb,</div><div class='add'>+				  WMI_PDEV_SET_BIOS_SAR_TABLE_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "failed to send WMI_PDEV_SET_BIOS_INTERFACE_CMDID %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_set_bios_geo_cmd(struct ath12k_base *ab, const u8 *pgeo_table)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_base *wmi_ab = &amp;ab-&gt;wmi_ab;</div><div class='add'>+	struct wmi_pdev_set_bios_geo_table_cmd *cmd;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 *buf_ptr;</div><div class='add'>+	u32 len, sar_geo_len_aligned;</div><div class='add'>+	const u8 *pgeo_value = pgeo_table + ATH12K_ACPI_GEO_OFFSET_DATA_OFFSET;</div><div class='add'>+</div><div class='add'>+	sar_geo_len_aligned = roundup(ATH12K_ACPI_BIOS_SAR_GEO_OFFSET_LEN, sizeof(u32));</div><div class='add'>+	len = sizeof(*cmd) + TLV_HDR_SIZE + sar_geo_len_aligned;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_pdev_set_bios_geo_table_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PDEV_SET_BIOS_GEO_TABLE_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;pdev_id = cpu_to_le32(WMI_PDEV_ID_SOC);</div><div class='add'>+	cmd-&gt;geo_len = cpu_to_le32(ATH12K_ACPI_BIOS_SAR_GEO_OFFSET_LEN);</div><div class='add'>+</div><div class='add'>+	buf_ptr = skb-&gt;data + sizeof(*cmd);</div><div class='add'>+	tlv = (struct wmi_tlv *)buf_ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE, sar_geo_len_aligned);</div><div class='add'>+	buf_ptr += TLV_HDR_SIZE;</div><div class='add'>+	memcpy(buf_ptr, pgeo_value, ATH12K_ACPI_BIOS_SAR_GEO_OFFSET_LEN);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(&amp;wmi_ab-&gt;wmi[0],</div><div class='add'>+				  skb,</div><div class='add'>+				  WMI_PDEV_SET_BIOS_GEO_TABLE_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "failed to send WMI_PDEV_SET_BIOS_GEO_TABLE_CMDID %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_delba_send(struct ath12k *ar, u32 vdev_id, const u8 *mac,</div><div class='add'>+			  u32 tid, u32 initiator, u32 reason)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_delba_send_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_delba_send_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_DELBA_SEND_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	ether_addr_copy(cmd-&gt;peer_macaddr.addr, mac);</div><div class='add'>+	cmd-&gt;tid = cpu_to_le32(tid);</div><div class='add'>+	cmd-&gt;initiator = cpu_to_le32(initiator);</div><div class='add'>+	cmd-&gt;reasoncode = cpu_to_le32(reason);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "wmi delba send vdev_id 0x%X mac_addr %pM tid %u initiator %u reason %u\n",</div><div class='add'>+		   vdev_id, mac, tid, initiator, reason);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_DELBA_SEND_CMDID);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_DELBA_SEND_CMDID cmd\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_addba_set_resp(struct ath12k *ar, u32 vdev_id, const u8 *mac,</div><div class='add'>+			      u32 tid, u32 status)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_addba_setresponse_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_addba_setresponse_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header =</div><div class='add'>+		ath12k_wmi_tlv_cmd_hdr(WMI_TAG_ADDBA_SETRESPONSE_CMD,</div><div class='add'>+				       sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	ether_addr_copy(cmd-&gt;peer_macaddr.addr, mac);</div><div class='add'>+	cmd-&gt;tid = cpu_to_le32(tid);</div><div class='add'>+	cmd-&gt;statuscode = cpu_to_le32(status);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "wmi addba set resp vdev_id 0x%X mac_addr %pM tid %u status %u\n",</div><div class='add'>+		   vdev_id, mac, tid, status);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_ADDBA_SET_RESP_CMDID);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_ADDBA_SET_RESP_CMDID cmd\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_addba_send(struct ath12k *ar, u32 vdev_id, const u8 *mac,</div><div class='add'>+			  u32 tid, u32 buf_size)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_addba_send_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_addba_send_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_ADDBA_SEND_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	ether_addr_copy(cmd-&gt;peer_macaddr.addr, mac);</div><div class='add'>+	cmd-&gt;tid = cpu_to_le32(tid);</div><div class='add'>+	cmd-&gt;buffersize = cpu_to_le32(buf_size);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "wmi addba send vdev_id 0x%X mac_addr %pM tid %u bufsize %u\n",</div><div class='add'>+		   vdev_id, mac, tid, buf_size);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_ADDBA_SEND_CMDID);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_ADDBA_SEND_CMDID cmd\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_addba_clear_resp(struct ath12k *ar, u32 vdev_id, const u8 *mac)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_addba_clear_resp_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_addba_clear_resp_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header =</div><div class='add'>+		ath12k_wmi_tlv_cmd_hdr(WMI_TAG_ADDBA_CLEAR_RESP_CMD,</div><div class='add'>+				       sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	ether_addr_copy(cmd-&gt;peer_macaddr.addr, mac);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "wmi addba clear resp vdev_id 0x%X mac_addr %pM\n",</div><div class='add'>+		   vdev_id, mac);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_ADDBA_CLEAR_RESP_CMDID);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_ADDBA_CLEAR_RESP_CMDID cmd\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_init_country_cmd(struct ath12k *ar,</div><div class='add'>+				     struct ath12k_wmi_init_country_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_init_country_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_init_country_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header =</div><div class='add'>+		ath12k_wmi_tlv_cmd_hdr(WMI_TAG_SET_INIT_COUNTRY_CMD,</div><div class='add'>+				       sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;pdev_id = cpu_to_le32(ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+</div><div class='add'>+	switch (arg-&gt;flags) {</div><div class='add'>+	case ALPHA_IS_SET:</div><div class='add'>+		cmd-&gt;init_cc_type = WMI_COUNTRY_INFO_TYPE_ALPHA;</div><div class='add'>+		memcpy(&amp;cmd-&gt;cc_info.alpha2, arg-&gt;cc_info.alpha2, 3);</div><div class='add'>+		break;</div><div class='add'>+	case CC_IS_SET:</div><div class='add'>+		cmd-&gt;init_cc_type = cpu_to_le32(WMI_COUNTRY_INFO_TYPE_COUNTRY_CODE);</div><div class='add'>+		cmd-&gt;cc_info.country_code =</div><div class='add'>+			cpu_to_le32(arg-&gt;cc_info.country_code);</div><div class='add'>+		break;</div><div class='add'>+	case REGDMN_IS_SET:</div><div class='add'>+		cmd-&gt;init_cc_type = cpu_to_le32(WMI_COUNTRY_INFO_TYPE_REGDOMAIN);</div><div class='add'>+		cmd-&gt;cc_info.regdom_id = cpu_to_le32(arg-&gt;cc_info.regdom_id);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb,</div><div class='add'>+				  WMI_SET_INIT_COUNTRY_CMDID);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_SET_INIT_COUNTRY CMD :%d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_set_current_country_cmd(struct ath12k *ar,</div><div class='add'>+					    struct wmi_set_current_country_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_set_current_country_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_set_current_country_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header =</div><div class='add'>+		ath12k_wmi_tlv_cmd_hdr(WMI_TAG_SET_CURRENT_COUNTRY_CMD,</div><div class='add'>+				       sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;pdev_id = cpu_to_le32(ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+	memcpy(&amp;cmd-&gt;new_alpha2, &amp;arg-&gt;alpha2, sizeof(arg-&gt;alpha2));</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_SET_CURRENT_COUNTRY_CMDID);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "set current country pdev id %d alpha2 %c%c\n",</div><div class='add'>+		   ar-&gt;pdev-&gt;pdev_id,</div><div class='add'>+		   arg-&gt;alpha2[0],</div><div class='add'>+		   arg-&gt;alpha2[1]);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_SET_CURRENT_COUNTRY_CMDID: %d\n", ret);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_11d_scan_start_cmd(struct ath12k *ar,</div><div class='add'>+				       struct wmi_11d_scan_start_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_11d_scan_start_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_11d_scan_start_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header =</div><div class='add'>+		ath12k_wmi_tlv_cmd_hdr(WMI_TAG_11D_SCAN_START_CMD,</div><div class='add'>+				       sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(arg-&gt;vdev_id);</div><div class='add'>+	cmd-&gt;scan_period_msec = cpu_to_le32(arg-&gt;scan_period_msec);</div><div class='add'>+	cmd-&gt;start_interval_msec = cpu_to_le32(arg-&gt;start_interval_msec);</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_11D_SCAN_START_CMDID);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "send 11d scan start vdev id %d period %d ms internal %d ms\n",</div><div class='add'>+		   arg-&gt;vdev_id, arg-&gt;scan_period_msec,</div><div class='add'>+		   arg-&gt;start_interval_msec);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_11D_SCAN_START_CMDID: %d\n", ret);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_11d_scan_stop_cmd(struct ath12k *ar, u32 vdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_11d_scan_stop_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_11d_scan_stop_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header =</div><div class='add'>+		ath12k_wmi_tlv_cmd_hdr(WMI_TAG_11D_SCAN_STOP_CMD,</div><div class='add'>+				       sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_11D_SCAN_STOP_CMDID);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "send 11d scan stop vdev id %d\n",</div><div class='add'>+		   cmd-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send WMI_11D_SCAN_STOP_CMDID: %d\n", ret);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+ath12k_wmi_send_twt_enable_cmd(struct ath12k *ar, u32 pdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct ath12k_base *ab = wmi-&gt;wmi_ab-&gt;ab;</div><div class='add'>+	struct wmi_twt_enable_params_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret, len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_twt_enable_params_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_TWT_ENABLE_CMD,</div><div class='add'>+						 len);</div><div class='add'>+	cmd-&gt;pdev_id = cpu_to_le32(pdev_id);</div><div class='add'>+	cmd-&gt;sta_cong_timer_ms = cpu_to_le32(ATH12K_TWT_DEF_STA_CONG_TIMER_MS);</div><div class='add'>+	cmd-&gt;default_slot_size = cpu_to_le32(ATH12K_TWT_DEF_DEFAULT_SLOT_SIZE);</div><div class='add'>+	cmd-&gt;congestion_thresh_setup =</div><div class='add'>+		cpu_to_le32(ATH12K_TWT_DEF_CONGESTION_THRESH_SETUP);</div><div class='add'>+	cmd-&gt;congestion_thresh_teardown =</div><div class='add'>+		cpu_to_le32(ATH12K_TWT_DEF_CONGESTION_THRESH_TEARDOWN);</div><div class='add'>+	cmd-&gt;congestion_thresh_critical =</div><div class='add'>+		cpu_to_le32(ATH12K_TWT_DEF_CONGESTION_THRESH_CRITICAL);</div><div class='add'>+	cmd-&gt;interference_thresh_teardown =</div><div class='add'>+		cpu_to_le32(ATH12K_TWT_DEF_INTERFERENCE_THRESH_TEARDOWN);</div><div class='add'>+	cmd-&gt;interference_thresh_setup =</div><div class='add'>+		cpu_to_le32(ATH12K_TWT_DEF_INTERFERENCE_THRESH_SETUP);</div><div class='add'>+	cmd-&gt;min_no_sta_setup = cpu_to_le32(ATH12K_TWT_DEF_MIN_NO_STA_SETUP);</div><div class='add'>+	cmd-&gt;min_no_sta_teardown = cpu_to_le32(ATH12K_TWT_DEF_MIN_NO_STA_TEARDOWN);</div><div class='add'>+	cmd-&gt;no_of_bcast_mcast_slots =</div><div class='add'>+		cpu_to_le32(ATH12K_TWT_DEF_NO_OF_BCAST_MCAST_SLOTS);</div><div class='add'>+	cmd-&gt;min_no_twt_slots = cpu_to_le32(ATH12K_TWT_DEF_MIN_NO_TWT_SLOTS);</div><div class='add'>+	cmd-&gt;max_no_sta_twt = cpu_to_le32(ATH12K_TWT_DEF_MAX_NO_STA_TWT);</div><div class='add'>+	cmd-&gt;mode_check_interval = cpu_to_le32(ATH12K_TWT_DEF_MODE_CHECK_INTERVAL);</div><div class='add'>+	cmd-&gt;add_sta_slot_interval = cpu_to_le32(ATH12K_TWT_DEF_ADD_STA_SLOT_INTERVAL);</div><div class='add'>+	cmd-&gt;remove_sta_slot_interval =</div><div class='add'>+		cpu_to_le32(ATH12K_TWT_DEF_REMOVE_STA_SLOT_INTERVAL);</div><div class='add'>+	/* TODO add MBSSID support */</div><div class='add'>+	cmd-&gt;mbss_support = 0;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb,</div><div class='add'>+				  WMI_TWT_ENABLE_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "Failed to send WMI_TWT_ENABLE_CMDID");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+ath12k_wmi_send_twt_disable_cmd(struct ath12k *ar, u32 pdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct ath12k_base *ab = wmi-&gt;wmi_ab-&gt;ab;</div><div class='add'>+	struct wmi_twt_disable_params_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret, len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_twt_disable_params_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_TWT_DISABLE_CMD,</div><div class='add'>+						 len);</div><div class='add'>+	cmd-&gt;pdev_id = cpu_to_le32(pdev_id);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb,</div><div class='add'>+				  WMI_TWT_DISABLE_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "Failed to send WMI_TWT_DISABLE_CMDID");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+ath12k_wmi_send_obss_spr_cmd(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+			     struct ieee80211_he_obss_pd *he_obss_pd)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct ath12k_base *ab = wmi-&gt;wmi_ab-&gt;ab;</div><div class='add'>+	struct wmi_obss_spatial_reuse_params_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret, len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_obss_spatial_reuse_params_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_OBSS_SPATIAL_REUSE_SET_CMD,</div><div class='add'>+						 len);</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;enable = cpu_to_le32(he_obss_pd-&gt;enable);</div><div class='add'>+	cmd-&gt;obss_min = a_cpu_to_sle32(he_obss_pd-&gt;min_offset);</div><div class='add'>+	cmd-&gt;obss_max = a_cpu_to_sle32(he_obss_pd-&gt;max_offset);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb,</div><div class='add'>+				  WMI_PDEV_OBSS_PD_SPATIAL_REUSE_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "Failed to send WMI_PDEV_OBSS_PD_SPATIAL_REUSE_CMDID");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_obss_color_cfg_cmd(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+				  u8 bss_color, u32 period,</div><div class='add'>+				  bool enable)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct ath12k_base *ab = wmi-&gt;wmi_ab-&gt;ab;</div><div class='add'>+	struct wmi_obss_color_collision_cfg_params_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret, len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_obss_color_collision_cfg_params_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_OBSS_COLOR_COLLISION_DET_CONFIG,</div><div class='add'>+						 len);</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;evt_type = enable ? cpu_to_le32(ATH12K_OBSS_COLOR_COLLISION_DETECTION) :</div><div class='add'>+		cpu_to_le32(ATH12K_OBSS_COLOR_COLLISION_DETECTION_DISABLE);</div><div class='add'>+	cmd-&gt;current_bss_color = cpu_to_le32(bss_color);</div><div class='add'>+	cmd-&gt;detection_period_ms = cpu_to_le32(period);</div><div class='add'>+	cmd-&gt;scan_period_ms = cpu_to_le32(ATH12K_BSS_COLOR_COLLISION_SCAN_PERIOD_MS);</div><div class='add'>+	cmd-&gt;free_slot_expiry_time_ms = 0;</div><div class='add'>+	cmd-&gt;flags = 0;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "wmi_send_obss_color_collision_cfg id %d type %d bss_color %d detect_period %d scan_period %d\n",</div><div class='add'>+		   cmd-&gt;vdev_id, cmd-&gt;evt_type, cmd-&gt;current_bss_color,</div><div class='add'>+		   cmd-&gt;detection_period_ms, cmd-&gt;scan_period_ms);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb,</div><div class='add'>+				  WMI_OBSS_COLOR_COLLISION_DET_CONFIG_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "Failed to send WMI_OBSS_COLOR_COLLISION_DET_CONFIG_CMDID");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_bss_color_change_enable_cmd(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+						bool enable)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct ath12k_base *ab = wmi-&gt;wmi_ab-&gt;ab;</div><div class='add'>+	struct wmi_bss_color_change_enable_params_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret, len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_bss_color_change_enable_params_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_BSS_COLOR_CHANGE_ENABLE,</div><div class='add'>+						 len);</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;enable = enable ? cpu_to_le32(1) : 0;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "wmi_send_bss_color_change_enable id %d enable %d\n",</div><div class='add'>+		   cmd-&gt;vdev_id, cmd-&gt;enable);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb,</div><div class='add'>+				  WMI_BSS_COLOR_CHANGE_ENABLE_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "Failed to send WMI_BSS_COLOR_CHANGE_ENABLE_CMDID");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_fils_discovery_tmpl(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+				   struct sk_buff *tmpl)</div><div class='add'>+{</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	void *ptr;</div><div class='add'>+	int ret, len;</div><div class='add'>+	size_t aligned_len;</div><div class='add'>+	struct wmi_fils_discovery_tmpl_cmd *cmd;</div><div class='add'>+</div><div class='add'>+	aligned_len = roundup(tmpl-&gt;len, 4);</div><div class='add'>+	len = sizeof(*cmd) + TLV_HDR_SIZE + aligned_len;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI vdev %i set FILS discovery template\n", vdev_id);</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_fils_discovery_tmpl_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_FILS_DISCOVERY_TMPL_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;buf_len = cpu_to_le32(tmpl-&gt;len);</div><div class='add'>+	ptr = skb-&gt;data + sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE, aligned_len);</div><div class='add'>+	memcpy(tlv-&gt;value, tmpl-&gt;data, tmpl-&gt;len);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_FILS_DISCOVERY_TMPL_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "WMI vdev %i failed to send FILS discovery template command\n",</div><div class='add'>+			    vdev_id);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_probe_resp_tmpl(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+			       struct sk_buff *tmpl)</div><div class='add'>+{</div><div class='add'>+	struct wmi_probe_tmpl_cmd *cmd;</div><div class='add'>+	struct ath12k_wmi_bcn_prb_info_params *probe_info;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	void *ptr;</div><div class='add'>+	int ret, len;</div><div class='add'>+	size_t aligned_len = roundup(tmpl-&gt;len, 4);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI vdev %i set probe response template\n", vdev_id);</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd) + sizeof(*probe_info) + TLV_HDR_SIZE + aligned_len;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_probe_tmpl_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PRB_TMPL_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;buf_len = cpu_to_le32(tmpl-&gt;len);</div><div class='add'>+</div><div class='add'>+	ptr = skb-&gt;data + sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	probe_info = ptr;</div><div class='add'>+	len = sizeof(*probe_info);</div><div class='add'>+	probe_info-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_BCN_PRB_INFO,</div><div class='add'>+							len);</div><div class='add'>+	probe_info-&gt;caps = 0;</div><div class='add'>+	probe_info-&gt;erp = 0;</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*probe_info);</div><div class='add'>+</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE, aligned_len);</div><div class='add'>+	memcpy(tlv-&gt;value, tmpl-&gt;data, tmpl-&gt;len);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_PRB_TMPL_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "WMI vdev %i failed to send probe response template command\n",</div><div class='add'>+			    vdev_id);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_fils_discovery(struct ath12k *ar, u32 vdev_id, u32 interval,</div><div class='add'>+			      bool unsol_bcast_probe_resp_enabled)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret, len;</div><div class='add'>+	struct wmi_fils_discovery_cmd *cmd;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI vdev %i set %s interval to %u TU\n",</div><div class='add'>+		   vdev_id, unsol_bcast_probe_resp_enabled ?</div><div class='add'>+		   "unsolicited broadcast probe response" : "FILS discovery",</div><div class='add'>+		   interval);</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_fils_discovery_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_ENABLE_FILS_CMD,</div><div class='add'>+						 len);</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;interval = cpu_to_le32(interval);</div><div class='add'>+	cmd-&gt;config = cpu_to_le32(unsol_bcast_probe_resp_enabled);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_ENABLE_FILS_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "WMI vdev %i failed to send FILS discovery enable/disable command\n",</div><div class='add'>+			    vdev_id);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_obss_color_collision_event(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct wmi_obss_color_collision_event *ev;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	u32 vdev_id, evt_type;</div><div class='add'>+	u64 bitmap;</div><div class='add'>+</div><div class='add'>+	const void **tb __free(kfree) = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ath12k_warn(ab, "failed to parse OBSS color collision tlv %ld\n",</div><div class='add'>+			    PTR_ERR(tb));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_OBSS_COLOR_COLLISION_EVT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch OBSS color collision event\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vdev_id = le32_to_cpu(ev-&gt;vdev_id);</div><div class='add'>+	evt_type = le32_to_cpu(ev-&gt;evt_type);</div><div class='add'>+	bitmap = le64_to_cpu(ev-&gt;obss_color_bitmap);</div><div class='add'>+</div><div class='add'>+	guard(rcu)();</div><div class='add'>+</div><div class='add'>+	arvif = ath12k_mac_get_arvif_by_vdev_id(ab, vdev_id);</div><div class='add'>+	if (!arvif) {</div><div class='add'>+		ath12k_warn(ab, "no arvif found for vdev %u in OBSS color collision event\n",</div><div class='add'>+			    vdev_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (evt_type) {</div><div class='add'>+	case WMI_BSS_COLOR_COLLISION_DETECTION:</div><div class='add'>+		ieee80211_obss_color_collision_notify(arvif-&gt;ahvif-&gt;vif,</div><div class='add'>+						      bitmap,</div><div class='add'>+						      arvif-&gt;link_id);</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+			   "obss color collision detected vdev %u event %d bitmap %016llx\n",</div><div class='add'>+			   vdev_id, evt_type, bitmap);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_BSS_COLOR_COLLISION_DISABLE:</div><div class='add'>+	case WMI_BSS_COLOR_FREE_SLOT_TIMER_EXPIRY:</div><div class='add'>+	case WMI_BSS_COLOR_FREE_SLOT_AVAILABLE:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_warn(ab, "unknown OBSS color collision event type %d\n", evt_type);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_fill_band_to_mac_param(struct ath12k_base  *soc,</div><div class='add'>+			      struct ath12k_wmi_pdev_band_arg *arg)</div><div class='add'>+{</div><div class='add'>+	u8 i;</div><div class='add'>+	struct ath12k_wmi_hal_reg_capabilities_ext_arg *hal_reg_cap;</div><div class='add'>+	struct ath12k_pdev *pdev;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; soc-&gt;num_radios; i++) {</div><div class='add'>+		pdev = &amp;soc-&gt;pdevs[i];</div><div class='add'>+		hal_reg_cap = &amp;soc-&gt;hal_reg_cap[i];</div><div class='add'>+		arg[i].pdev_id = pdev-&gt;pdev_id;</div><div class='add'>+</div><div class='add'>+		switch (pdev-&gt;cap.supported_bands) {</div><div class='add'>+		case WMI_HOST_WLAN_2GHZ_5GHZ_CAP:</div><div class='add'>+			arg[i].start_freq = hal_reg_cap-&gt;low_2ghz_chan;</div><div class='add'>+			arg[i].end_freq = hal_reg_cap-&gt;high_5ghz_chan;</div><div class='add'>+			break;</div><div class='add'>+		case WMI_HOST_WLAN_2GHZ_CAP:</div><div class='add'>+			arg[i].start_freq = hal_reg_cap-&gt;low_2ghz_chan;</div><div class='add'>+			arg[i].end_freq = hal_reg_cap-&gt;high_2ghz_chan;</div><div class='add'>+			break;</div><div class='add'>+		case WMI_HOST_WLAN_5GHZ_CAP:</div><div class='add'>+			arg[i].start_freq = hal_reg_cap-&gt;low_5ghz_chan;</div><div class='add'>+			arg[i].end_freq = hal_reg_cap-&gt;high_5ghz_chan;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_copy_resource_config(struct ath12k_base *ab,</div><div class='add'>+				struct ath12k_wmi_resource_config_params *wmi_cfg,</div><div class='add'>+				struct ath12k_wmi_resource_config_arg *tg_cfg)</div><div class='add'>+{</div><div class='add'>+	wmi_cfg-&gt;num_vdevs = cpu_to_le32(tg_cfg-&gt;num_vdevs);</div><div class='add'>+	wmi_cfg-&gt;num_peers = cpu_to_le32(tg_cfg-&gt;num_peers);</div><div class='add'>+	wmi_cfg-&gt;num_offload_peers = cpu_to_le32(tg_cfg-&gt;num_offload_peers);</div><div class='add'>+	wmi_cfg-&gt;num_offload_reorder_buffs =</div><div class='add'>+		cpu_to_le32(tg_cfg-&gt;num_offload_reorder_buffs);</div><div class='add'>+	wmi_cfg-&gt;num_peer_keys = cpu_to_le32(tg_cfg-&gt;num_peer_keys);</div><div class='add'>+	wmi_cfg-&gt;num_tids = cpu_to_le32(tg_cfg-&gt;num_tids);</div><div class='add'>+	wmi_cfg-&gt;ast_skid_limit = cpu_to_le32(tg_cfg-&gt;ast_skid_limit);</div><div class='add'>+	wmi_cfg-&gt;tx_chain_mask = cpu_to_le32(tg_cfg-&gt;tx_chain_mask);</div><div class='add'>+	wmi_cfg-&gt;rx_chain_mask = cpu_to_le32(tg_cfg-&gt;rx_chain_mask);</div><div class='add'>+	wmi_cfg-&gt;rx_timeout_pri[0] = cpu_to_le32(tg_cfg-&gt;rx_timeout_pri[0]);</div><div class='add'>+	wmi_cfg-&gt;rx_timeout_pri[1] = cpu_to_le32(tg_cfg-&gt;rx_timeout_pri[1]);</div><div class='add'>+	wmi_cfg-&gt;rx_timeout_pri[2] = cpu_to_le32(tg_cfg-&gt;rx_timeout_pri[2]);</div><div class='add'>+	wmi_cfg-&gt;rx_timeout_pri[3] = cpu_to_le32(tg_cfg-&gt;rx_timeout_pri[3]);</div><div class='add'>+	wmi_cfg-&gt;rx_decap_mode = cpu_to_le32(tg_cfg-&gt;rx_decap_mode);</div><div class='add'>+	wmi_cfg-&gt;scan_max_pending_req = cpu_to_le32(tg_cfg-&gt;scan_max_pending_req);</div><div class='add'>+	wmi_cfg-&gt;bmiss_offload_max_vdev = cpu_to_le32(tg_cfg-&gt;bmiss_offload_max_vdev);</div><div class='add'>+	wmi_cfg-&gt;roam_offload_max_vdev = cpu_to_le32(tg_cfg-&gt;roam_offload_max_vdev);</div><div class='add'>+	wmi_cfg-&gt;roam_offload_max_ap_profiles =</div><div class='add'>+		cpu_to_le32(tg_cfg-&gt;roam_offload_max_ap_profiles);</div><div class='add'>+	wmi_cfg-&gt;num_mcast_groups = cpu_to_le32(tg_cfg-&gt;num_mcast_groups);</div><div class='add'>+	wmi_cfg-&gt;num_mcast_table_elems = cpu_to_le32(tg_cfg-&gt;num_mcast_table_elems);</div><div class='add'>+	wmi_cfg-&gt;mcast2ucast_mode = cpu_to_le32(tg_cfg-&gt;mcast2ucast_mode);</div><div class='add'>+	wmi_cfg-&gt;tx_dbg_log_size = cpu_to_le32(tg_cfg-&gt;tx_dbg_log_size);</div><div class='add'>+	wmi_cfg-&gt;num_wds_entries = cpu_to_le32(tg_cfg-&gt;num_wds_entries);</div><div class='add'>+	wmi_cfg-&gt;dma_burst_size = cpu_to_le32(tg_cfg-&gt;dma_burst_size);</div><div class='add'>+	wmi_cfg-&gt;mac_aggr_delim = cpu_to_le32(tg_cfg-&gt;mac_aggr_delim);</div><div class='add'>+	wmi_cfg-&gt;rx_skip_defrag_timeout_dup_detection_check =</div><div class='add'>+		cpu_to_le32(tg_cfg-&gt;rx_skip_defrag_timeout_dup_detection_check);</div><div class='add'>+	wmi_cfg-&gt;vow_config = cpu_to_le32(tg_cfg-&gt;vow_config);</div><div class='add'>+	wmi_cfg-&gt;gtk_offload_max_vdev = cpu_to_le32(tg_cfg-&gt;gtk_offload_max_vdev);</div><div class='add'>+	wmi_cfg-&gt;num_msdu_desc = cpu_to_le32(tg_cfg-&gt;num_msdu_desc);</div><div class='add'>+	wmi_cfg-&gt;max_frag_entries = cpu_to_le32(tg_cfg-&gt;max_frag_entries);</div><div class='add'>+	wmi_cfg-&gt;num_tdls_vdevs = cpu_to_le32(tg_cfg-&gt;num_tdls_vdevs);</div><div class='add'>+	wmi_cfg-&gt;num_tdls_conn_table_entries =</div><div class='add'>+		cpu_to_le32(tg_cfg-&gt;num_tdls_conn_table_entries);</div><div class='add'>+	wmi_cfg-&gt;beacon_tx_offload_max_vdev =</div><div class='add'>+		cpu_to_le32(tg_cfg-&gt;beacon_tx_offload_max_vdev);</div><div class='add'>+	wmi_cfg-&gt;num_multicast_filter_entries =</div><div class='add'>+		cpu_to_le32(tg_cfg-&gt;num_multicast_filter_entries);</div><div class='add'>+	wmi_cfg-&gt;num_wow_filters = cpu_to_le32(tg_cfg-&gt;num_wow_filters);</div><div class='add'>+	wmi_cfg-&gt;num_keep_alive_pattern = cpu_to_le32(tg_cfg-&gt;num_keep_alive_pattern);</div><div class='add'>+	wmi_cfg-&gt;keep_alive_pattern_size = cpu_to_le32(tg_cfg-&gt;keep_alive_pattern_size);</div><div class='add'>+	wmi_cfg-&gt;max_tdls_concurrent_sleep_sta =</div><div class='add'>+		cpu_to_le32(tg_cfg-&gt;max_tdls_concurrent_sleep_sta);</div><div class='add'>+	wmi_cfg-&gt;max_tdls_concurrent_buffer_sta =</div><div class='add'>+		cpu_to_le32(tg_cfg-&gt;max_tdls_concurrent_buffer_sta);</div><div class='add'>+	wmi_cfg-&gt;wmi_send_separate = cpu_to_le32(tg_cfg-&gt;wmi_send_separate);</div><div class='add'>+	wmi_cfg-&gt;num_ocb_vdevs = cpu_to_le32(tg_cfg-&gt;num_ocb_vdevs);</div><div class='add'>+	wmi_cfg-&gt;num_ocb_channels = cpu_to_le32(tg_cfg-&gt;num_ocb_channels);</div><div class='add'>+	wmi_cfg-&gt;num_ocb_schedules = cpu_to_le32(tg_cfg-&gt;num_ocb_schedules);</div><div class='add'>+	wmi_cfg-&gt;bpf_instruction_size = cpu_to_le32(tg_cfg-&gt;bpf_instruction_size);</div><div class='add'>+	wmi_cfg-&gt;max_bssid_rx_filters = cpu_to_le32(tg_cfg-&gt;max_bssid_rx_filters);</div><div class='add'>+	wmi_cfg-&gt;use_pdev_id = cpu_to_le32(tg_cfg-&gt;use_pdev_id);</div><div class='add'>+	wmi_cfg-&gt;flag1 = cpu_to_le32(tg_cfg-&gt;atf_config |</div><div class='add'>+				     WMI_RSRC_CFG_FLAG1_BSS_CHANNEL_INFO_64 |</div><div class='add'>+				     WMI_RSRC_CFG_FLAG1_ACK_RSSI);</div><div class='add'>+	wmi_cfg-&gt;peer_map_unmap_version = cpu_to_le32(tg_cfg-&gt;peer_map_unmap_version);</div><div class='add'>+	wmi_cfg-&gt;sched_params = cpu_to_le32(tg_cfg-&gt;sched_params);</div><div class='add'>+	wmi_cfg-&gt;twt_ap_pdev_count = cpu_to_le32(tg_cfg-&gt;twt_ap_pdev_count);</div><div class='add'>+	wmi_cfg-&gt;twt_ap_sta_count = cpu_to_le32(tg_cfg-&gt;twt_ap_sta_count);</div><div class='add'>+	wmi_cfg-&gt;flags2 = le32_encode_bits(tg_cfg-&gt;peer_metadata_ver,</div><div class='add'>+					   WMI_RSRC_CFG_FLAGS2_RX_PEER_METADATA_VERSION);</div><div class='add'>+	wmi_cfg-&gt;host_service_flags = cpu_to_le32(tg_cfg-&gt;is_reg_cc_ext_event_supported &lt;&lt;</div><div class='add'>+				WMI_RSRC_CFG_HOST_SVC_FLAG_REG_CC_EXT_SUPPORT_BIT);</div><div class='add'>+	if (ab-&gt;hw_params-&gt;reoq_lut_support)</div><div class='add'>+		wmi_cfg-&gt;host_service_flags |=</div><div class='add'>+			cpu_to_le32(1 &lt;&lt; WMI_RSRC_CFG_HOST_SVC_FLAG_REO_QREF_SUPPORT_BIT);</div><div class='add'>+	wmi_cfg-&gt;ema_max_vap_cnt = cpu_to_le32(tg_cfg-&gt;ema_max_vap_cnt);</div><div class='add'>+	wmi_cfg-&gt;ema_max_profile_period = cpu_to_le32(tg_cfg-&gt;ema_max_profile_period);</div><div class='add'>+	wmi_cfg-&gt;flags2 |= cpu_to_le32(WMI_RSRC_CFG_FLAGS2_CALC_NEXT_DTIM_COUNT_SET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_init_cmd_send(struct ath12k_wmi_pdev *wmi,</div><div class='add'>+				struct ath12k_wmi_init_cmd_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = wmi-&gt;wmi_ab-&gt;ab;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct wmi_init_cmd *cmd;</div><div class='add'>+	struct ath12k_wmi_resource_config_params *cfg;</div><div class='add'>+	struct ath12k_wmi_pdev_set_hw_mode_cmd *hw_mode;</div><div class='add'>+	struct ath12k_wmi_pdev_band_to_mac_params *band_to_mac;</div><div class='add'>+	struct ath12k_wmi_host_mem_chunk_params *host_mem_chunks;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	size_t ret, len;</div><div class='add'>+	void *ptr;</div><div class='add'>+	u32 hw_mode_len = 0;</div><div class='add'>+	u16 idx;</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;hw_mode_id != WMI_HOST_HW_MODE_MAX)</div><div class='add'>+		hw_mode_len = sizeof(*hw_mode) + TLV_HDR_SIZE +</div><div class='add'>+			      (arg-&gt;num_band_to_mac * sizeof(*band_to_mac));</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd) + TLV_HDR_SIZE + sizeof(*cfg) + hw_mode_len +</div><div class='add'>+	      (arg-&gt;num_mem_chunks ? (sizeof(*host_mem_chunks) * WMI_MAX_MEM_REQS) : 0);</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_init_cmd *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_INIT_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	ptr = skb-&gt;data + sizeof(*cmd);</div><div class='add'>+	cfg = ptr;</div><div class='add'>+</div><div class='add'>+	ath12k_wmi_copy_resource_config(ab, cfg, &amp;arg-&gt;res_cfg);</div><div class='add'>+</div><div class='add'>+	cfg-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_RESOURCE_CONFIG,</div><div class='add'>+						 sizeof(*cfg));</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*cfg);</div><div class='add'>+	host_mem_chunks = ptr + TLV_HDR_SIZE;</div><div class='add'>+	len = sizeof(struct ath12k_wmi_host_mem_chunk_params);</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; arg-&gt;num_mem_chunks; ++idx) {</div><div class='add'>+		host_mem_chunks[idx].tlv_header =</div><div class='add'>+			ath12k_wmi_tlv_hdr(WMI_TAG_WLAN_HOST_MEMORY_CHUNK,</div><div class='add'>+					   len);</div><div class='add'>+</div><div class='add'>+		host_mem_chunks[idx].ptr = cpu_to_le32(arg-&gt;mem_chunks[idx].paddr);</div><div class='add'>+		host_mem_chunks[idx].size = cpu_to_le32(arg-&gt;mem_chunks[idx].len);</div><div class='add'>+		host_mem_chunks[idx].req_id = cpu_to_le32(arg-&gt;mem_chunks[idx].req_id);</div><div class='add'>+</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+			   "WMI host mem chunk req_id %d paddr 0x%llx len %d\n",</div><div class='add'>+			   arg-&gt;mem_chunks[idx].req_id,</div><div class='add'>+			   (u64)arg-&gt;mem_chunks[idx].paddr,</div><div class='add'>+			   arg-&gt;mem_chunks[idx].len);</div><div class='add'>+	}</div><div class='add'>+	cmd-&gt;num_host_mem_chunks = cpu_to_le32(arg-&gt;num_mem_chunks);</div><div class='add'>+	len = sizeof(struct ath12k_wmi_host_mem_chunk_params) * arg-&gt;num_mem_chunks;</div><div class='add'>+</div><div class='add'>+	/* num_mem_chunks is zero */</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, len);</div><div class='add'>+	ptr += TLV_HDR_SIZE + len;</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;hw_mode_id != WMI_HOST_HW_MODE_MAX) {</div><div class='add'>+		hw_mode = (struct ath12k_wmi_pdev_set_hw_mode_cmd *)ptr;</div><div class='add'>+		hw_mode-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PDEV_SET_HW_MODE_CMD,</div><div class='add'>+							     sizeof(*hw_mode));</div><div class='add'>+</div><div class='add'>+		hw_mode-&gt;hw_mode_index = cpu_to_le32(arg-&gt;hw_mode_id);</div><div class='add'>+		hw_mode-&gt;num_band_to_mac = cpu_to_le32(arg-&gt;num_band_to_mac);</div><div class='add'>+</div><div class='add'>+		ptr += sizeof(*hw_mode);</div><div class='add'>+</div><div class='add'>+		len = arg-&gt;num_band_to_mac * sizeof(*band_to_mac);</div><div class='add'>+		tlv = ptr;</div><div class='add'>+		tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, len);</div><div class='add'>+</div><div class='add'>+		ptr += TLV_HDR_SIZE;</div><div class='add'>+		len = sizeof(*band_to_mac);</div><div class='add'>+</div><div class='add'>+		for (idx = 0; idx &lt; arg-&gt;num_band_to_mac; idx++) {</div><div class='add'>+			band_to_mac = (void *)ptr;</div><div class='add'>+</div><div class='add'>+			band_to_mac-&gt;tlv_header =</div><div class='add'>+				ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PDEV_BAND_TO_MAC,</div><div class='add'>+						       len);</div><div class='add'>+			band_to_mac-&gt;pdev_id = cpu_to_le32(arg-&gt;band_to_mac[idx].pdev_id);</div><div class='add'>+			band_to_mac-&gt;start_freq =</div><div class='add'>+				cpu_to_le32(arg-&gt;band_to_mac[idx].start_freq);</div><div class='add'>+			band_to_mac-&gt;end_freq =</div><div class='add'>+				cpu_to_le32(arg-&gt;band_to_mac[idx].end_freq);</div><div class='add'>+			ptr += sizeof(*band_to_mac);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_INIT_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to send WMI_INIT_CMDID\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_pdev_lro_cfg(struct ath12k *ar,</div><div class='add'>+			    int pdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev_lro_config_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct ath12k_wmi_pdev_lro_config_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_LRO_INFO_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	get_random_bytes(cmd-&gt;th_4, sizeof(cmd-&gt;th_4));</div><div class='add'>+	get_random_bytes(cmd-&gt;th_6, sizeof(cmd-&gt;th_6));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;pdev_id = cpu_to_le32(pdev_id);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI lro cfg cmd pdev_id 0x%x\n", pdev_id);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_LRO_CONFIG_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send lro cfg req wmi cmd\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_wait_for_service_ready(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	unsigned long time_left;</div><div class='add'>+</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;ab-&gt;wmi_ab.service_ready,</div><div class='add'>+						WMI_SERVICE_READY_TIMEOUT_HZ);</div><div class='add'>+	if (!time_left)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_wait_for_unified_ready(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	unsigned long time_left;</div><div class='add'>+</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;ab-&gt;wmi_ab.unified_ready,</div><div class='add'>+						WMI_SERVICE_READY_TIMEOUT_HZ);</div><div class='add'>+	if (!time_left)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_set_hw_mode(struct ath12k_base *ab,</div><div class='add'>+			   enum wmi_host_hw_mode_config_type mode)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev_set_hw_mode_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct ath12k_wmi_base *wmi_ab = &amp;ab-&gt;wmi_ab;</div><div class='add'>+	int len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct ath12k_wmi_pdev_set_hw_mode_cmd *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PDEV_SET_HW_MODE_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;pdev_id = WMI_PDEV_ID_SOC;</div><div class='add'>+	cmd-&gt;hw_mode_index = cpu_to_le32(mode);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(&amp;wmi_ab-&gt;wmi[0], skb, WMI_PDEV_SET_HW_MODE_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to send WMI_PDEV_SET_HW_MODE_CMDID\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_cmd_init(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_base *wmi_ab = &amp;ab-&gt;wmi_ab;</div><div class='add'>+	struct ath12k_wmi_init_cmd_arg arg = {};</div><div class='add'>+</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_REG_CC_EXT_EVENT_SUPPORT,</div><div class='add'>+		     ab-&gt;wmi_ab.svc_map))</div><div class='add'>+		arg.res_cfg.is_reg_cc_ext_event_supported = true;</div><div class='add'>+</div><div class='add'>+	ab-&gt;hw_params-&gt;wmi_init(ab, &amp;arg.res_cfg);</div><div class='add'>+	ab-&gt;wow.wmi_conf_rx_decap_mode = arg.res_cfg.rx_decap_mode;</div><div class='add'>+</div><div class='add'>+	arg.num_mem_chunks = wmi_ab-&gt;num_mem_chunks;</div><div class='add'>+	arg.hw_mode_id = wmi_ab-&gt;preferred_hw_mode;</div><div class='add'>+	arg.mem_chunks = wmi_ab-&gt;mem_chunks;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;single_pdev_only)</div><div class='add'>+		arg.hw_mode_id = WMI_HOST_HW_MODE_MAX;</div><div class='add'>+</div><div class='add'>+	arg.num_band_to_mac = ab-&gt;num_radios;</div><div class='add'>+	ath12k_fill_band_to_mac_param(ab, arg.band_to_mac);</div><div class='add'>+</div><div class='add'>+	ab-&gt;dp.peer_metadata_ver = arg.res_cfg.peer_metadata_ver;</div><div class='add'>+</div><div class='add'>+	return ath12k_init_cmd_send(&amp;wmi_ab-&gt;wmi[0], &amp;arg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_vdev_spectral_conf(struct ath12k *ar,</div><div class='add'>+				  struct ath12k_wmi_vdev_spectral_conf_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_vdev_spectral_conf_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct ath12k_wmi_vdev_spectral_conf_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_VDEV_SPECTRAL_CONFIGURE_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(arg-&gt;vdev_id);</div><div class='add'>+	cmd-&gt;scan_count = cpu_to_le32(arg-&gt;scan_count);</div><div class='add'>+	cmd-&gt;scan_period = cpu_to_le32(arg-&gt;scan_period);</div><div class='add'>+	cmd-&gt;scan_priority = cpu_to_le32(arg-&gt;scan_priority);</div><div class='add'>+	cmd-&gt;scan_fft_size = cpu_to_le32(arg-&gt;scan_fft_size);</div><div class='add'>+	cmd-&gt;scan_gc_ena = cpu_to_le32(arg-&gt;scan_gc_ena);</div><div class='add'>+	cmd-&gt;scan_restart_ena = cpu_to_le32(arg-&gt;scan_restart_ena);</div><div class='add'>+	cmd-&gt;scan_noise_floor_ref = cpu_to_le32(arg-&gt;scan_noise_floor_ref);</div><div class='add'>+	cmd-&gt;scan_init_delay = cpu_to_le32(arg-&gt;scan_init_delay);</div><div class='add'>+	cmd-&gt;scan_nb_tone_thr = cpu_to_le32(arg-&gt;scan_nb_tone_thr);</div><div class='add'>+	cmd-&gt;scan_str_bin_thr = cpu_to_le32(arg-&gt;scan_str_bin_thr);</div><div class='add'>+	cmd-&gt;scan_wb_rpt_mode = cpu_to_le32(arg-&gt;scan_wb_rpt_mode);</div><div class='add'>+	cmd-&gt;scan_rssi_rpt_mode = cpu_to_le32(arg-&gt;scan_rssi_rpt_mode);</div><div class='add'>+	cmd-&gt;scan_rssi_thr = cpu_to_le32(arg-&gt;scan_rssi_thr);</div><div class='add'>+	cmd-&gt;scan_pwr_format = cpu_to_le32(arg-&gt;scan_pwr_format);</div><div class='add'>+	cmd-&gt;scan_rpt_mode = cpu_to_le32(arg-&gt;scan_rpt_mode);</div><div class='add'>+	cmd-&gt;scan_bin_scale = cpu_to_le32(arg-&gt;scan_bin_scale);</div><div class='add'>+	cmd-&gt;scan_dbm_adj = cpu_to_le32(arg-&gt;scan_dbm_adj);</div><div class='add'>+	cmd-&gt;scan_chn_mask = cpu_to_le32(arg-&gt;scan_chn_mask);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI spectral scan config cmd vdev_id 0x%x\n",</div><div class='add'>+		   arg-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(ar-&gt;wmi, skb,</div><div class='add'>+				  WMI_VDEV_SPECTRAL_SCAN_CONFIGURE_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send spectral scan config wmi cmd\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_vdev_spectral_enable(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+				    u32 trigger, u32 enable)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_vdev_spectral_enable_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct ath12k_wmi_vdev_spectral_enable_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_VDEV_SPECTRAL_ENABLE_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;trigger_cmd = cpu_to_le32(trigger);</div><div class='add'>+	cmd-&gt;enable_cmd = cpu_to_le32(enable);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI spectral enable cmd vdev id 0x%x\n",</div><div class='add'>+		   vdev_id);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(ar-&gt;wmi, skb,</div><div class='add'>+				  WMI_VDEV_SPECTRAL_SCAN_ENABLE_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send spectral enable wmi cmd\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_pdev_dma_ring_cfg(struct ath12k *ar,</div><div class='add'>+				 struct ath12k_wmi_pdev_dma_ring_cfg_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev_dma_ring_cfg_req_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct ath12k_wmi_pdev_dma_ring_cfg_req_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_DMA_RING_CFG_REQ,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;pdev_id = cpu_to_le32(arg-&gt;pdev_id);</div><div class='add'>+	cmd-&gt;module_id = cpu_to_le32(arg-&gt;module_id);</div><div class='add'>+	cmd-&gt;base_paddr_lo = cpu_to_le32(arg-&gt;base_paddr_lo);</div><div class='add'>+	cmd-&gt;base_paddr_hi = cpu_to_le32(arg-&gt;base_paddr_hi);</div><div class='add'>+	cmd-&gt;head_idx_paddr_lo = cpu_to_le32(arg-&gt;head_idx_paddr_lo);</div><div class='add'>+	cmd-&gt;head_idx_paddr_hi = cpu_to_le32(arg-&gt;head_idx_paddr_hi);</div><div class='add'>+	cmd-&gt;tail_idx_paddr_lo = cpu_to_le32(arg-&gt;tail_idx_paddr_lo);</div><div class='add'>+	cmd-&gt;tail_idx_paddr_hi = cpu_to_le32(arg-&gt;tail_idx_paddr_hi);</div><div class='add'>+	cmd-&gt;num_elems = cpu_to_le32(arg-&gt;num_elems);</div><div class='add'>+	cmd-&gt;buf_size = cpu_to_le32(arg-&gt;buf_size);</div><div class='add'>+	cmd-&gt;num_resp_per_event = cpu_to_le32(arg-&gt;num_resp_per_event);</div><div class='add'>+	cmd-&gt;event_timeout_ms = cpu_to_le32(arg-&gt;event_timeout_ms);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI DMA ring cfg req cmd pdev_id 0x%x\n",</div><div class='add'>+		   arg-&gt;pdev_id);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(ar-&gt;wmi, skb,</div><div class='add'>+				  WMI_PDEV_DMA_RING_CFG_REQ_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to send dma ring cfg req wmi cmd\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_dma_buf_entry_parse(struct ath12k_base *soc,</div><div class='add'>+					  u16 tag, u16 len,</div><div class='add'>+					  const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_dma_buf_release_arg *arg = data;</div><div class='add'>+</div><div class='add'>+	if (tag != WMI_TAG_DMA_BUF_RELEASE_ENTRY)</div><div class='add'>+		return -EPROTO;</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;num_buf_entry &gt;= le32_to_cpu(arg-&gt;fixed.num_buf_release_entry))</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	arg-&gt;num_buf_entry++;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_dma_buf_meta_parse(struct ath12k_base *soc,</div><div class='add'>+					 u16 tag, u16 len,</div><div class='add'>+					 const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_dma_buf_release_arg *arg = data;</div><div class='add'>+</div><div class='add'>+	if (tag != WMI_TAG_DMA_BUF_RELEASE_SPECTRAL_META_DATA)</div><div class='add'>+		return -EPROTO;</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;num_meta &gt;= le32_to_cpu(arg-&gt;fixed.num_meta_data_entry))</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	arg-&gt;num_meta++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_dma_buf_parse(struct ath12k_base *ab,</div><div class='add'>+				    u16 tag, u16 len,</div><div class='add'>+				    const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_dma_buf_release_arg *arg = data;</div><div class='add'>+	const struct ath12k_wmi_dma_buf_release_fixed_params *fixed;</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (tag) {</div><div class='add'>+	case WMI_TAG_DMA_BUF_RELEASE:</div><div class='add'>+		fixed = ptr;</div><div class='add'>+		arg-&gt;fixed = *fixed;</div><div class='add'>+		pdev_id = DP_HW2SW_MACID(le32_to_cpu(fixed-&gt;pdev_id));</div><div class='add'>+		arg-&gt;fixed.pdev_id = cpu_to_le32(pdev_id);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TAG_ARRAY_STRUCT:</div><div class='add'>+		if (!arg-&gt;buf_entry_done) {</div><div class='add'>+			arg-&gt;num_buf_entry = 0;</div><div class='add'>+			arg-&gt;buf_entry = ptr;</div><div class='add'>+</div><div class='add'>+			ret = ath12k_wmi_tlv_iter(ab, ptr, len,</div><div class='add'>+						  ath12k_wmi_dma_buf_entry_parse,</div><div class='add'>+						  arg);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_warn(ab, "failed to parse dma buf entry tlv %d\n",</div><div class='add'>+					    ret);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			arg-&gt;buf_entry_done = true;</div><div class='add'>+		} else if (!arg-&gt;meta_data_done) {</div><div class='add'>+			arg-&gt;num_meta = 0;</div><div class='add'>+			arg-&gt;meta_data = ptr;</div><div class='add'>+</div><div class='add'>+			ret = ath12k_wmi_tlv_iter(ab, ptr, len,</div><div class='add'>+						  ath12k_wmi_dma_buf_meta_parse,</div><div class='add'>+						  arg);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_warn(ab, "failed to parse dma buf meta tlv %d\n",</div><div class='add'>+					    ret);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			arg-&gt;meta_data_done = true;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_pdev_dma_ring_buf_release_event(struct ath12k_base *ab,</div><div class='add'>+						       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_dma_buf_release_arg arg = {};</div><div class='add'>+	struct ath12k_dbring_buf_release_event param;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_tlv_iter(ab, skb-&gt;data, skb-&gt;len,</div><div class='add'>+				  ath12k_wmi_dma_buf_parse,</div><div class='add'>+				  &amp;arg);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to parse dma buf release tlv %d\n", ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	param.fixed = arg.fixed;</div><div class='add'>+	param.buf_entry = arg.buf_entry;</div><div class='add'>+	param.num_buf_entry = arg.num_buf_entry;</div><div class='add'>+	param.meta_data = arg.meta_data;</div><div class='add'>+	param.num_meta = arg.num_meta;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_dbring_buffer_release_event(ab, &amp;param);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to handle dma buf release event %d\n", ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_hw_mode_caps_parse(struct ath12k_base *soc,</div><div class='add'>+					 u16 tag, u16 len,</div><div class='add'>+					 const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_svc_rdy_ext_parse *svc_rdy_ext = data;</div><div class='add'>+	struct ath12k_wmi_hw_mode_cap_params *hw_mode_cap;</div><div class='add'>+	u32 phy_map = 0;</div><div class='add'>+</div><div class='add'>+	if (tag != WMI_TAG_HW_MODE_CAPABILITIES)</div><div class='add'>+		return -EPROTO;</div><div class='add'>+</div><div class='add'>+	if (svc_rdy_ext-&gt;n_hw_mode_caps &gt;= svc_rdy_ext-&gt;arg.num_hw_modes)</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	hw_mode_cap = container_of(ptr, struct ath12k_wmi_hw_mode_cap_params,</div><div class='add'>+				   hw_mode_id);</div><div class='add'>+	svc_rdy_ext-&gt;n_hw_mode_caps++;</div><div class='add'>+</div><div class='add'>+	phy_map = le32_to_cpu(hw_mode_cap-&gt;phy_id_map);</div><div class='add'>+	svc_rdy_ext-&gt;tot_phy_id += fls(phy_map);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_hw_mode_caps(struct ath12k_base *soc,</div><div class='add'>+				   u16 len, const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_svc_ext_info *svc_ext_info = &amp;soc-&gt;wmi_ab.svc_ext_info;</div><div class='add'>+	struct ath12k_wmi_svc_rdy_ext_parse *svc_rdy_ext = data;</div><div class='add'>+	const struct ath12k_wmi_hw_mode_cap_params *hw_mode_caps;</div><div class='add'>+	enum wmi_host_hw_mode_config_type mode, pref;</div><div class='add'>+	u32 i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	svc_rdy_ext-&gt;n_hw_mode_caps = 0;</div><div class='add'>+	svc_rdy_ext-&gt;hw_mode_caps = ptr;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_tlv_iter(soc, ptr, len,</div><div class='add'>+				  ath12k_wmi_hw_mode_caps_parse,</div><div class='add'>+				  svc_rdy_ext);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(soc, "failed to parse tlv %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0 ; i &lt; svc_rdy_ext-&gt;n_hw_mode_caps; i++) {</div><div class='add'>+		hw_mode_caps = &amp;svc_rdy_ext-&gt;hw_mode_caps[i];</div><div class='add'>+		mode = le32_to_cpu(hw_mode_caps-&gt;hw_mode_id);</div><div class='add'>+</div><div class='add'>+		if (mode &gt;= WMI_HOST_HW_MODE_MAX)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		pref = soc-&gt;wmi_ab.preferred_hw_mode;</div><div class='add'>+</div><div class='add'>+		if (ath12k_hw_mode_pri_map[mode] &lt; ath12k_hw_mode_pri_map[pref]) {</div><div class='add'>+			svc_rdy_ext-&gt;pref_hw_mode_caps = *hw_mode_caps;</div><div class='add'>+			soc-&gt;wmi_ab.preferred_hw_mode = mode;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	svc_ext_info-&gt;num_hw_modes = svc_rdy_ext-&gt;n_hw_mode_caps;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(soc, ATH12K_DBG_WMI, "num hw modes %u preferred_hw_mode %d\n",</div><div class='add'>+		   svc_ext_info-&gt;num_hw_modes, soc-&gt;wmi_ab.preferred_hw_mode);</div><div class='add'>+</div><div class='add'>+	if (soc-&gt;wmi_ab.preferred_hw_mode == WMI_HOST_HW_MODE_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_mac_phy_caps_parse(struct ath12k_base *soc,</div><div class='add'>+					 u16 tag, u16 len,</div><div class='add'>+					 const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_svc_rdy_ext_parse *svc_rdy_ext = data;</div><div class='add'>+</div><div class='add'>+	if (tag != WMI_TAG_MAC_PHY_CAPABILITIES)</div><div class='add'>+		return -EPROTO;</div><div class='add'>+</div><div class='add'>+	if (svc_rdy_ext-&gt;n_mac_phy_caps &gt;= svc_rdy_ext-&gt;tot_phy_id)</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	len = min_t(u16, len, sizeof(struct ath12k_wmi_mac_phy_caps_params));</div><div class='add'>+	if (!svc_rdy_ext-&gt;n_mac_phy_caps) {</div><div class='add'>+		svc_rdy_ext-&gt;mac_phy_caps = kzalloc((svc_rdy_ext-&gt;tot_phy_id) * len,</div><div class='add'>+						    GFP_ATOMIC);</div><div class='add'>+		if (!svc_rdy_ext-&gt;mac_phy_caps)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(svc_rdy_ext-&gt;mac_phy_caps + svc_rdy_ext-&gt;n_mac_phy_caps, ptr, len);</div><div class='add'>+	svc_rdy_ext-&gt;n_mac_phy_caps++;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_ext_hal_reg_caps_parse(struct ath12k_base *soc,</div><div class='add'>+					     u16 tag, u16 len,</div><div class='add'>+					     const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_svc_rdy_ext_parse *svc_rdy_ext = data;</div><div class='add'>+</div><div class='add'>+	if (tag != WMI_TAG_HAL_REG_CAPABILITIES_EXT)</div><div class='add'>+		return -EPROTO;</div><div class='add'>+</div><div class='add'>+	if (svc_rdy_ext-&gt;n_ext_hal_reg_caps &gt;= svc_rdy_ext-&gt;arg.num_phy)</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	svc_rdy_ext-&gt;n_ext_hal_reg_caps++;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_ext_hal_reg_caps(struct ath12k_base *soc,</div><div class='add'>+				       u16 len, const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi_handle = &amp;soc-&gt;wmi_ab.wmi[0];</div><div class='add'>+	struct ath12k_wmi_svc_rdy_ext_parse *svc_rdy_ext = data;</div><div class='add'>+	struct ath12k_wmi_hal_reg_capabilities_ext_arg reg_cap;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	svc_rdy_ext-&gt;n_ext_hal_reg_caps = 0;</div><div class='add'>+	svc_rdy_ext-&gt;ext_hal_reg_caps = ptr;</div><div class='add'>+	ret = ath12k_wmi_tlv_iter(soc, ptr, len,</div><div class='add'>+				  ath12k_wmi_ext_hal_reg_caps_parse,</div><div class='add'>+				  svc_rdy_ext);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(soc, "failed to parse tlv %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; svc_rdy_ext-&gt;arg.num_phy; i++) {</div><div class='add'>+		ret = ath12k_pull_reg_cap_svc_rdy_ext(wmi_handle,</div><div class='add'>+						      svc_rdy_ext-&gt;soc_hal_reg_caps,</div><div class='add'>+						      svc_rdy_ext-&gt;ext_hal_reg_caps, i,</div><div class='add'>+						      &amp;reg_cap);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(soc, "failed to extract reg cap %d\n", i);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (reg_cap.phy_id &gt;= MAX_RADIOS) {</div><div class='add'>+			ath12k_warn(soc, "unexpected phy id %u\n", reg_cap.phy_id);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		soc-&gt;hal_reg_cap[reg_cap.phy_id] = reg_cap;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_ext_soc_hal_reg_caps_parse(struct ath12k_base *soc,</div><div class='add'>+						 u16 len, const void *ptr,</div><div class='add'>+						 void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi_handle = &amp;soc-&gt;wmi_ab.wmi[0];</div><div class='add'>+	struct ath12k_wmi_svc_rdy_ext_parse *svc_rdy_ext = data;</div><div class='add'>+	u8 hw_mode_id = le32_to_cpu(svc_rdy_ext-&gt;pref_hw_mode_caps.hw_mode_id);</div><div class='add'>+	u32 phy_id_map;</div><div class='add'>+	int pdev_index = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	svc_rdy_ext-&gt;soc_hal_reg_caps = ptr;</div><div class='add'>+	svc_rdy_ext-&gt;arg.num_phy = le32_to_cpu(svc_rdy_ext-&gt;soc_hal_reg_caps-&gt;num_phy);</div><div class='add'>+</div><div class='add'>+	soc-&gt;num_radios = 0;</div><div class='add'>+	phy_id_map = le32_to_cpu(svc_rdy_ext-&gt;pref_hw_mode_caps.phy_id_map);</div><div class='add'>+	soc-&gt;fw_pdev_count = 0;</div><div class='add'>+</div><div class='add'>+	while (phy_id_map &amp;&amp; soc-&gt;num_radios &lt; MAX_RADIOS) {</div><div class='add'>+		ret = ath12k_pull_mac_phy_cap_svc_ready_ext(wmi_handle,</div><div class='add'>+							    svc_rdy_ext,</div><div class='add'>+							    hw_mode_id, soc-&gt;num_radios,</div><div class='add'>+							    &amp;soc-&gt;pdevs[pdev_index]);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(soc, "failed to extract mac caps, idx :%d\n",</div><div class='add'>+				    soc-&gt;num_radios);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		soc-&gt;num_radios++;</div><div class='add'>+</div><div class='add'>+		/* For single_pdev_only targets,</div><div class='add'>+		 * save mac_phy capability in the same pdev</div><div class='add'>+		 */</div><div class='add'>+		if (soc-&gt;hw_params-&gt;single_pdev_only)</div><div class='add'>+			pdev_index = 0;</div><div class='add'>+		else</div><div class='add'>+			pdev_index = soc-&gt;num_radios;</div><div class='add'>+</div><div class='add'>+		/* TODO: mac_phy_cap prints */</div><div class='add'>+		phy_id_map &gt;&gt;= 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (soc-&gt;hw_params-&gt;single_pdev_only) {</div><div class='add'>+		soc-&gt;num_radios = 1;</div><div class='add'>+		soc-&gt;pdevs[0].pdev_id = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_dma_ring_caps_parse(struct ath12k_base *soc,</div><div class='add'>+					  u16 tag, u16 len,</div><div class='add'>+					  const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_dma_ring_caps_parse *parse = data;</div><div class='add'>+</div><div class='add'>+	if (tag != WMI_TAG_DMA_RING_CAPABILITIES)</div><div class='add'>+		return -EPROTO;</div><div class='add'>+</div><div class='add'>+	parse-&gt;n_dma_ring_caps++;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_alloc_dbring_caps(struct ath12k_base *ab,</div><div class='add'>+					u32 num_cap)</div><div class='add'>+{</div><div class='add'>+	size_t sz;</div><div class='add'>+	void *ptr;</div><div class='add'>+</div><div class='add'>+	sz = num_cap * sizeof(struct ath12k_dbring_cap);</div><div class='add'>+	ptr = kzalloc(sz, GFP_ATOMIC);</div><div class='add'>+	if (!ptr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ab-&gt;db_caps = ptr;</div><div class='add'>+	ab-&gt;num_db_cap = num_cap;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_free_dbring_caps(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	kfree(ab-&gt;db_caps);</div><div class='add'>+	ab-&gt;db_caps = NULL;</div><div class='add'>+	ab-&gt;num_db_cap = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_dma_ring_caps(struct ath12k_base *ab,</div><div class='add'>+				    u16 len, const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_dma_ring_caps_parse *dma_caps_parse = data;</div><div class='add'>+	struct ath12k_wmi_dma_ring_caps_params *dma_caps;</div><div class='add'>+	struct ath12k_dbring_cap *dir_buff_caps;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	dma_caps_parse-&gt;n_dma_ring_caps = 0;</div><div class='add'>+	dma_caps = (struct ath12k_wmi_dma_ring_caps_params *)ptr;</div><div class='add'>+	ret = ath12k_wmi_tlv_iter(ab, ptr, len,</div><div class='add'>+				  ath12k_wmi_dma_ring_caps_parse,</div><div class='add'>+				  dma_caps_parse);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to parse dma ring caps tlv %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!dma_caps_parse-&gt;n_dma_ring_caps)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;num_db_cap) {</div><div class='add'>+		ath12k_warn(ab, "Already processed, so ignoring dma ring caps\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_alloc_dbring_caps(ab, dma_caps_parse-&gt;n_dma_ring_caps);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	dir_buff_caps = ab-&gt;db_caps;</div><div class='add'>+	for (i = 0; i &lt; dma_caps_parse-&gt;n_dma_ring_caps; i++) {</div><div class='add'>+		if (le32_to_cpu(dma_caps[i].module_id) &gt;= WMI_DIRECT_BUF_MAX) {</div><div class='add'>+			ath12k_warn(ab, "Invalid module id %d\n",</div><div class='add'>+				    le32_to_cpu(dma_caps[i].module_id));</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto free_dir_buff;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dir_buff_caps[i].id = le32_to_cpu(dma_caps[i].module_id);</div><div class='add'>+		dir_buff_caps[i].pdev_id =</div><div class='add'>+			DP_HW2SW_MACID(le32_to_cpu(dma_caps[i].pdev_id));</div><div class='add'>+		dir_buff_caps[i].min_elem = le32_to_cpu(dma_caps[i].min_elem);</div><div class='add'>+		dir_buff_caps[i].min_buf_sz = le32_to_cpu(dma_caps[i].min_buf_sz);</div><div class='add'>+		dir_buff_caps[i].min_buf_align = le32_to_cpu(dma_caps[i].min_buf_align);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_dir_buff:</div><div class='add'>+	ath12k_wmi_free_dbring_caps(ab);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_save_mac_phy_info(struct ath12k_base *ab,</div><div class='add'>+			     const struct ath12k_wmi_mac_phy_caps_params *mac_phy_cap,</div><div class='add'>+			     struct ath12k_svc_ext_mac_phy_info *mac_phy_info)</div><div class='add'>+{</div><div class='add'>+	mac_phy_info-&gt;phy_id = __le32_to_cpu(mac_phy_cap-&gt;phy_id);</div><div class='add'>+	mac_phy_info-&gt;supported_bands = __le32_to_cpu(mac_phy_cap-&gt;supported_bands);</div><div class='add'>+	mac_phy_info-&gt;hw_freq_range.low_2ghz_freq =</div><div class='add'>+					__le32_to_cpu(mac_phy_cap-&gt;low_2ghz_chan_freq);</div><div class='add'>+	mac_phy_info-&gt;hw_freq_range.high_2ghz_freq =</div><div class='add'>+					__le32_to_cpu(mac_phy_cap-&gt;high_2ghz_chan_freq);</div><div class='add'>+	mac_phy_info-&gt;hw_freq_range.low_5ghz_freq =</div><div class='add'>+					__le32_to_cpu(mac_phy_cap-&gt;low_5ghz_chan_freq);</div><div class='add'>+	mac_phy_info-&gt;hw_freq_range.high_5ghz_freq =</div><div class='add'>+					__le32_to_cpu(mac_phy_cap-&gt;high_5ghz_chan_freq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_save_all_mac_phy_info(struct ath12k_base *ab,</div><div class='add'>+				 struct ath12k_wmi_svc_rdy_ext_parse *svc_rdy_ext)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_svc_ext_info *svc_ext_info = &amp;ab-&gt;wmi_ab.svc_ext_info;</div><div class='add'>+	const struct ath12k_wmi_mac_phy_caps_params *mac_phy_cap;</div><div class='add'>+	const struct ath12k_wmi_hw_mode_cap_params *hw_mode_cap;</div><div class='add'>+	struct ath12k_svc_ext_mac_phy_info *mac_phy_info;</div><div class='add'>+	u32 hw_mode_id, phy_bit_map;</div><div class='add'>+	u8 hw_idx;</div><div class='add'>+</div><div class='add'>+	mac_phy_info = &amp;svc_ext_info-&gt;mac_phy_info[0];</div><div class='add'>+	mac_phy_cap = svc_rdy_ext-&gt;mac_phy_caps;</div><div class='add'>+</div><div class='add'>+	for (hw_idx = 0; hw_idx &lt; svc_ext_info-&gt;num_hw_modes; hw_idx++) {</div><div class='add'>+		hw_mode_cap = &amp;svc_rdy_ext-&gt;hw_mode_caps[hw_idx];</div><div class='add'>+		hw_mode_id = __le32_to_cpu(hw_mode_cap-&gt;hw_mode_id);</div><div class='add'>+		phy_bit_map = __le32_to_cpu(hw_mode_cap-&gt;phy_id_map);</div><div class='add'>+</div><div class='add'>+		while (phy_bit_map) {</div><div class='add'>+			ath12k_wmi_save_mac_phy_info(ab, mac_phy_cap, mac_phy_info);</div><div class='add'>+			mac_phy_info-&gt;hw_mode_config_type =</div><div class='add'>+					le32_get_bits(hw_mode_cap-&gt;hw_mode_config_type,</div><div class='add'>+						      WMI_HW_MODE_CAP_CFG_TYPE);</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+				   "hw_idx %u hw_mode_id %u hw_mode_config_type %u supported_bands %u phy_id %u 2 GHz [%u - %u] 5 GHz [%u - %u]\n",</div><div class='add'>+				   hw_idx, hw_mode_id,</div><div class='add'>+				   mac_phy_info-&gt;hw_mode_config_type,</div><div class='add'>+				   mac_phy_info-&gt;supported_bands, mac_phy_info-&gt;phy_id,</div><div class='add'>+				   mac_phy_info-&gt;hw_freq_range.low_2ghz_freq,</div><div class='add'>+				   mac_phy_info-&gt;hw_freq_range.high_2ghz_freq,</div><div class='add'>+				   mac_phy_info-&gt;hw_freq_range.low_5ghz_freq,</div><div class='add'>+				   mac_phy_info-&gt;hw_freq_range.high_5ghz_freq);</div><div class='add'>+</div><div class='add'>+			mac_phy_cap++;</div><div class='add'>+			mac_phy_info++;</div><div class='add'>+</div><div class='add'>+			phy_bit_map &gt;&gt;= 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_svc_rdy_ext_parse(struct ath12k_base *ab,</div><div class='add'>+					u16 tag, u16 len,</div><div class='add'>+					const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi_handle = &amp;ab-&gt;wmi_ab.wmi[0];</div><div class='add'>+	struct ath12k_wmi_svc_rdy_ext_parse *svc_rdy_ext = data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (tag) {</div><div class='add'>+	case WMI_TAG_SERVICE_READY_EXT_EVENT:</div><div class='add'>+		ret = ath12k_pull_svc_ready_ext(wmi_handle, ptr,</div><div class='add'>+						&amp;svc_rdy_ext-&gt;arg);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "unable to extract ext params\n");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WMI_TAG_SOC_MAC_PHY_HW_MODE_CAPS:</div><div class='add'>+		svc_rdy_ext-&gt;hw_caps = ptr;</div><div class='add'>+		svc_rdy_ext-&gt;arg.num_hw_modes =</div><div class='add'>+			le32_to_cpu(svc_rdy_ext-&gt;hw_caps-&gt;num_hw_modes);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WMI_TAG_SOC_HAL_REG_CAPABILITIES:</div><div class='add'>+		ret = ath12k_wmi_ext_soc_hal_reg_caps_parse(ab, len, ptr,</div><div class='add'>+							    svc_rdy_ext);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WMI_TAG_ARRAY_STRUCT:</div><div class='add'>+		if (!svc_rdy_ext-&gt;hw_mode_done) {</div><div class='add'>+			ret = ath12k_wmi_hw_mode_caps(ab, len, ptr, svc_rdy_ext);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+</div><div class='add'>+			svc_rdy_ext-&gt;hw_mode_done = true;</div><div class='add'>+		} else if (!svc_rdy_ext-&gt;mac_phy_done) {</div><div class='add'>+			svc_rdy_ext-&gt;n_mac_phy_caps = 0;</div><div class='add'>+			ret = ath12k_wmi_tlv_iter(ab, ptr, len,</div><div class='add'>+						  ath12k_wmi_mac_phy_caps_parse,</div><div class='add'>+						  svc_rdy_ext);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_warn(ab, "failed to parse tlv %d\n", ret);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ath12k_wmi_save_all_mac_phy_info(ab, svc_rdy_ext);</div><div class='add'>+</div><div class='add'>+			svc_rdy_ext-&gt;mac_phy_done = true;</div><div class='add'>+		} else if (!svc_rdy_ext-&gt;ext_hal_reg_done) {</div><div class='add'>+			ret = ath12k_wmi_ext_hal_reg_caps(ab, len, ptr, svc_rdy_ext);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+</div><div class='add'>+			svc_rdy_ext-&gt;ext_hal_reg_done = true;</div><div class='add'>+		} else if (!svc_rdy_ext-&gt;mac_phy_chainmask_combo_done) {</div><div class='add'>+			svc_rdy_ext-&gt;mac_phy_chainmask_combo_done = true;</div><div class='add'>+		} else if (!svc_rdy_ext-&gt;mac_phy_chainmask_cap_done) {</div><div class='add'>+			svc_rdy_ext-&gt;mac_phy_chainmask_cap_done = true;</div><div class='add'>+		} else if (!svc_rdy_ext-&gt;oem_dma_ring_cap_done) {</div><div class='add'>+			svc_rdy_ext-&gt;oem_dma_ring_cap_done = true;</div><div class='add'>+		} else if (!svc_rdy_ext-&gt;dma_ring_cap_done) {</div><div class='add'>+			ret = ath12k_wmi_dma_ring_caps(ab, len, ptr,</div><div class='add'>+						       &amp;svc_rdy_ext-&gt;dma_caps_parse);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+</div><div class='add'>+			svc_rdy_ext-&gt;dma_ring_cap_done = true;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_service_ready_ext_event(struct ath12k_base *ab,</div><div class='add'>+					  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_svc_rdy_ext_parse svc_rdy_ext = { };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_tlv_iter(ab, skb-&gt;data, skb-&gt;len,</div><div class='add'>+				  ath12k_wmi_svc_rdy_ext_parse,</div><div class='add'>+				  &amp;svc_rdy_ext);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv %d\n", ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!test_bit(WMI_TLV_SERVICE_EXT2_MSG, ab-&gt;wmi_ab.svc_map))</div><div class='add'>+		complete(&amp;ab-&gt;wmi_ab.service_ready);</div><div class='add'>+</div><div class='add'>+	kfree(svc_rdy_ext.mac_phy_caps);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	kfree(svc_rdy_ext.mac_phy_caps);</div><div class='add'>+	ath12k_wmi_free_dbring_caps(ab);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pull_svc_ready_ext2(struct ath12k_wmi_pdev *wmi_handle,</div><div class='add'>+				      const void *ptr,</div><div class='add'>+				      struct ath12k_wmi_svc_rdy_ext2_arg *arg)</div><div class='add'>+{</div><div class='add'>+	const struct wmi_service_ready_ext2_event *ev = ptr;</div><div class='add'>+</div><div class='add'>+	if (!ev)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	arg-&gt;reg_db_version = le32_to_cpu(ev-&gt;reg_db_version);</div><div class='add'>+	arg-&gt;hw_min_max_tx_power_2ghz = le32_to_cpu(ev-&gt;hw_min_max_tx_power_2ghz);</div><div class='add'>+	arg-&gt;hw_min_max_tx_power_5ghz = le32_to_cpu(ev-&gt;hw_min_max_tx_power_5ghz);</div><div class='add'>+	arg-&gt;chwidth_num_peer_caps = le32_to_cpu(ev-&gt;chwidth_num_peer_caps);</div><div class='add'>+	arg-&gt;preamble_puncture_bw = le32_to_cpu(ev-&gt;preamble_puncture_bw);</div><div class='add'>+	arg-&gt;max_user_per_ppdu_ofdma = le32_to_cpu(ev-&gt;max_user_per_ppdu_ofdma);</div><div class='add'>+	arg-&gt;max_user_per_ppdu_mumimo = le32_to_cpu(ev-&gt;max_user_per_ppdu_mumimo);</div><div class='add'>+	arg-&gt;target_cap_flags = le32_to_cpu(ev-&gt;target_cap_flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_eht_caps_parse(struct ath12k_pdev *pdev, u32 band,</div><div class='add'>+				      const __le32 cap_mac_info[],</div><div class='add'>+				      const __le32 cap_phy_info[],</div><div class='add'>+				      const __le32 supp_mcs[],</div><div class='add'>+				      const struct ath12k_wmi_ppe_threshold_params *ppet,</div><div class='add'>+				       __le32 cap_info_internal)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_band_cap *cap_band = &amp;pdev-&gt;cap.band[band];</div><div class='add'>+	u32 support_320mhz;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (band == NL80211_BAND_6GHZ)</div><div class='add'>+		support_320mhz = cap_band-&gt;eht_cap_phy_info[0] &amp;</div><div class='add'>+					IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WMI_MAX_EHTCAP_MAC_SIZE; i++)</div><div class='add'>+		cap_band-&gt;eht_cap_mac_info[i] = le32_to_cpu(cap_mac_info[i]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WMI_MAX_EHTCAP_PHY_SIZE; i++)</div><div class='add'>+		cap_band-&gt;eht_cap_phy_info[i] = le32_to_cpu(cap_phy_info[i]);</div><div class='add'>+</div><div class='add'>+	if (band == NL80211_BAND_6GHZ)</div><div class='add'>+		cap_band-&gt;eht_cap_phy_info[0] |= support_320mhz;</div><div class='add'>+</div><div class='add'>+	cap_band-&gt;eht_mcs_20_only = le32_to_cpu(supp_mcs[0]);</div><div class='add'>+	cap_band-&gt;eht_mcs_80 = le32_to_cpu(supp_mcs[1]);</div><div class='add'>+	if (band != NL80211_BAND_2GHZ) {</div><div class='add'>+		cap_band-&gt;eht_mcs_160 = le32_to_cpu(supp_mcs[2]);</div><div class='add'>+		cap_band-&gt;eht_mcs_320 = le32_to_cpu(supp_mcs[3]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cap_band-&gt;eht_ppet.numss_m1 = le32_to_cpu(ppet-&gt;numss_m1);</div><div class='add'>+	cap_band-&gt;eht_ppet.ru_bit_mask = le32_to_cpu(ppet-&gt;ru_info);</div><div class='add'>+	for (i = 0; i &lt; WMI_MAX_NUM_SS; i++)</div><div class='add'>+		cap_band-&gt;eht_ppet.ppet16_ppet8_ru3_ru0[i] =</div><div class='add'>+			le32_to_cpu(ppet-&gt;ppet16_ppet8_ru3_ru0[i]);</div><div class='add'>+</div><div class='add'>+	cap_band-&gt;eht_cap_info_internal = le32_to_cpu(cap_info_internal);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_wmi_tlv_mac_phy_caps_ext_parse(struct ath12k_base *ab,</div><div class='add'>+				      const struct ath12k_wmi_caps_ext_params *caps,</div><div class='add'>+				      struct ath12k_pdev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_band_cap *cap_band;</div><div class='add'>+	u32 bands, support_320mhz;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;single_pdev_only) {</div><div class='add'>+		if (caps-&gt;hw_mode_id == WMI_HOST_HW_MODE_SINGLE) {</div><div class='add'>+			support_320mhz = le32_to_cpu(caps-&gt;eht_cap_phy_info_5ghz[0]) &amp;</div><div class='add'>+				IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ;</div><div class='add'>+			cap_band = &amp;pdev-&gt;cap.band[NL80211_BAND_6GHZ];</div><div class='add'>+			cap_band-&gt;eht_cap_phy_info[0] |= support_320mhz;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ab-&gt;fw_pdev_count; i++) {</div><div class='add'>+			struct ath12k_fw_pdev *fw_pdev = &amp;ab-&gt;fw_pdev[i];</div><div class='add'>+</div><div class='add'>+			if (fw_pdev-&gt;pdev_id == ath12k_wmi_caps_ext_get_pdev_id(caps) &amp;&amp;</div><div class='add'>+			    fw_pdev-&gt;phy_id == le32_to_cpu(caps-&gt;phy_id)) {</div><div class='add'>+				bands = fw_pdev-&gt;supported_bands;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (i == ab-&gt;fw_pdev_count)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		bands = pdev-&gt;cap.supported_bands;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bands &amp; WMI_HOST_WLAN_2GHZ_CAP) {</div><div class='add'>+		ath12k_wmi_eht_caps_parse(pdev, NL80211_BAND_2GHZ,</div><div class='add'>+					  caps-&gt;eht_cap_mac_info_2ghz,</div><div class='add'>+					  caps-&gt;eht_cap_phy_info_2ghz,</div><div class='add'>+					  caps-&gt;eht_supp_mcs_ext_2ghz,</div><div class='add'>+					  &amp;caps-&gt;eht_ppet_2ghz,</div><div class='add'>+					  caps-&gt;eht_cap_info_internal);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bands &amp; WMI_HOST_WLAN_5GHZ_CAP) {</div><div class='add'>+		ath12k_wmi_eht_caps_parse(pdev, NL80211_BAND_5GHZ,</div><div class='add'>+					  caps-&gt;eht_cap_mac_info_5ghz,</div><div class='add'>+					  caps-&gt;eht_cap_phy_info_5ghz,</div><div class='add'>+					  caps-&gt;eht_supp_mcs_ext_5ghz,</div><div class='add'>+					  &amp;caps-&gt;eht_ppet_5ghz,</div><div class='add'>+					  caps-&gt;eht_cap_info_internal);</div><div class='add'>+</div><div class='add'>+		ath12k_wmi_eht_caps_parse(pdev, NL80211_BAND_6GHZ,</div><div class='add'>+					  caps-&gt;eht_cap_mac_info_5ghz,</div><div class='add'>+					  caps-&gt;eht_cap_phy_info_5ghz,</div><div class='add'>+					  caps-&gt;eht_supp_mcs_ext_5ghz,</div><div class='add'>+					  &amp;caps-&gt;eht_ppet_5ghz,</div><div class='add'>+					  caps-&gt;eht_cap_info_internal);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pdev-&gt;cap.eml_cap = le32_to_cpu(caps-&gt;eml_capability);</div><div class='add'>+	pdev-&gt;cap.mld_cap = le32_to_cpu(caps-&gt;mld_capability);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_tlv_mac_phy_caps_ext(struct ath12k_base *ab, u16 tag,</div><div class='add'>+					   u16 len, const void *ptr,</div><div class='add'>+					   void *data)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_wmi_caps_ext_params *caps = ptr;</div><div class='add'>+	int i = 0, ret;</div><div class='add'>+</div><div class='add'>+	if (tag != WMI_TAG_MAC_PHY_CAPABILITIES_EXT)</div><div class='add'>+		return -EPROTO;</div><div class='add'>+</div><div class='add'>+	if (ab-&gt;hw_params-&gt;single_pdev_only) {</div><div class='add'>+		if (ab-&gt;wmi_ab.preferred_hw_mode != le32_to_cpu(caps-&gt;hw_mode_id) &amp;&amp;</div><div class='add'>+		    caps-&gt;hw_mode_id != WMI_HOST_HW_MODE_SINGLE)</div><div class='add'>+			return 0;</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+			if (ab-&gt;pdevs[i].pdev_id ==</div><div class='add'>+			    ath12k_wmi_caps_ext_get_pdev_id(caps))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (i == ab-&gt;num_radios)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_tlv_mac_phy_caps_ext_parse(ab, caps, &amp;ab-&gt;pdevs[i]);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "failed to parse extended MAC PHY capabilities for pdev %d: %d\n",</div><div class='add'>+			    ret, ab-&gt;pdevs[i].pdev_id);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_update_freq_info(struct ath12k_base *ab,</div><div class='add'>+			    struct ath12k_svc_ext_mac_phy_info *mac_cap,</div><div class='add'>+			    enum ath12k_hw_mode mode,</div><div class='add'>+			    u32 phy_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_mode_info *hw_mode_info = &amp;ab-&gt;wmi_ab.hw_mode_info;</div><div class='add'>+	struct ath12k_hw_mode_freq_range_arg *mac_range;</div><div class='add'>+</div><div class='add'>+	mac_range = &amp;hw_mode_info-&gt;freq_range_caps[mode][phy_id];</div><div class='add'>+</div><div class='add'>+	if (mac_cap-&gt;supported_bands &amp; WMI_HOST_WLAN_2GHZ_CAP) {</div><div class='add'>+		mac_range-&gt;low_2ghz_freq = max_t(u32,</div><div class='add'>+						 mac_cap-&gt;hw_freq_range.low_2ghz_freq,</div><div class='add'>+						 ATH12K_MIN_2GHZ_FREQ);</div><div class='add'>+		mac_range-&gt;high_2ghz_freq = mac_cap-&gt;hw_freq_range.high_2ghz_freq ?</div><div class='add'>+					    min_t(u32,</div><div class='add'>+						  mac_cap-&gt;hw_freq_range.high_2ghz_freq,</div><div class='add'>+						  ATH12K_MAX_2GHZ_FREQ) :</div><div class='add'>+					    ATH12K_MAX_2GHZ_FREQ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mac_cap-&gt;supported_bands &amp; WMI_HOST_WLAN_5GHZ_CAP) {</div><div class='add'>+		mac_range-&gt;low_5ghz_freq = max_t(u32,</div><div class='add'>+						 mac_cap-&gt;hw_freq_range.low_5ghz_freq,</div><div class='add'>+						 ATH12K_MIN_5GHZ_FREQ);</div><div class='add'>+		mac_range-&gt;high_5ghz_freq = mac_cap-&gt;hw_freq_range.high_5ghz_freq ?</div><div class='add'>+					    min_t(u32,</div><div class='add'>+						  mac_cap-&gt;hw_freq_range.high_5ghz_freq,</div><div class='add'>+						  ATH12K_MAX_6GHZ_FREQ) :</div><div class='add'>+					    ATH12K_MAX_6GHZ_FREQ;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+ath12k_wmi_all_phy_range_updated(struct ath12k_base *ab,</div><div class='add'>+				 enum ath12k_hw_mode hwmode)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_mode_info *hw_mode_info = &amp;ab-&gt;wmi_ab.hw_mode_info;</div><div class='add'>+	struct ath12k_hw_mode_freq_range_arg *mac_range;</div><div class='add'>+	u8 phy_id;</div><div class='add'>+</div><div class='add'>+	for (phy_id = 0; phy_id &lt; MAX_RADIOS; phy_id++) {</div><div class='add'>+		mac_range = &amp;hw_mode_info-&gt;freq_range_caps[hwmode][phy_id];</div><div class='add'>+		/* modify SBS/DBS range only when both phy for DBS are filled */</div><div class='add'>+		if (!mac_range-&gt;low_2ghz_freq &amp;&amp; !mac_range-&gt;low_5ghz_freq)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_update_dbs_freq_info(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_mode_info *hw_mode_info = &amp;ab-&gt;wmi_ab.hw_mode_info;</div><div class='add'>+	struct ath12k_hw_mode_freq_range_arg *mac_range;</div><div class='add'>+	u8 phy_id;</div><div class='add'>+</div><div class='add'>+	mac_range = hw_mode_info-&gt;freq_range_caps[ATH12K_HW_MODE_DBS];</div><div class='add'>+	/* Reset 5 GHz range for shared mac for DBS */</div><div class='add'>+	for (phy_id = 0; phy_id &lt; MAX_RADIOS; phy_id++) {</div><div class='add'>+		if (mac_range[phy_id].low_2ghz_freq &amp;&amp;</div><div class='add'>+		    mac_range[phy_id].low_5ghz_freq) {</div><div class='add'>+			mac_range[phy_id].low_5ghz_freq = 0;</div><div class='add'>+			mac_range[phy_id].high_5ghz_freq = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+ath12k_wmi_get_highest_5ghz_freq_from_range(struct ath12k_hw_mode_freq_range_arg *range)</div><div class='add'>+{</div><div class='add'>+	u32 highest_freq = 0;</div><div class='add'>+	u8 phy_id;</div><div class='add'>+</div><div class='add'>+	for (phy_id = 0; phy_id &lt; MAX_RADIOS; phy_id++) {</div><div class='add'>+		if (range[phy_id].high_5ghz_freq &gt; highest_freq)</div><div class='add'>+			highest_freq = range[phy_id].high_5ghz_freq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return highest_freq ? highest_freq : ATH12K_MAX_6GHZ_FREQ;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+ath12k_wmi_get_lowest_5ghz_freq_from_range(struct ath12k_hw_mode_freq_range_arg *range)</div><div class='add'>+{</div><div class='add'>+	u32 lowest_freq = 0;</div><div class='add'>+	u8 phy_id;</div><div class='add'>+</div><div class='add'>+	for (phy_id = 0; phy_id &lt; MAX_RADIOS; phy_id++) {</div><div class='add'>+		if ((!lowest_freq &amp;&amp; range[phy_id].low_5ghz_freq) ||</div><div class='add'>+		    range[phy_id].low_5ghz_freq &lt; lowest_freq)</div><div class='add'>+			lowest_freq = range[phy_id].low_5ghz_freq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return lowest_freq ? lowest_freq : ATH12K_MIN_5GHZ_FREQ;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_fill_upper_share_sbs_freq(struct ath12k_base *ab,</div><div class='add'>+				     u16 sbs_range_sep,</div><div class='add'>+				     struct ath12k_hw_mode_freq_range_arg *ref_freq)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_mode_info *hw_mode_info = &amp;ab-&gt;wmi_ab.hw_mode_info;</div><div class='add'>+	struct ath12k_hw_mode_freq_range_arg *upper_sbs_freq_range;</div><div class='add'>+	u8 phy_id;</div><div class='add'>+</div><div class='add'>+	upper_sbs_freq_range =</div><div class='add'>+			hw_mode_info-&gt;freq_range_caps[ATH12K_HW_MODE_SBS_UPPER_SHARE];</div><div class='add'>+</div><div class='add'>+	for (phy_id = 0; phy_id &lt; MAX_RADIOS; phy_id++) {</div><div class='add'>+		upper_sbs_freq_range[phy_id].low_2ghz_freq =</div><div class='add'>+						ref_freq[phy_id].low_2ghz_freq;</div><div class='add'>+		upper_sbs_freq_range[phy_id].high_2ghz_freq =</div><div class='add'>+						ref_freq[phy_id].high_2ghz_freq;</div><div class='add'>+</div><div class='add'>+		/* update for shared mac */</div><div class='add'>+		if (upper_sbs_freq_range[phy_id].low_2ghz_freq) {</div><div class='add'>+			upper_sbs_freq_range[phy_id].low_5ghz_freq = sbs_range_sep + 10;</div><div class='add'>+			upper_sbs_freq_range[phy_id].high_5ghz_freq =</div><div class='add'>+				ath12k_wmi_get_highest_5ghz_freq_from_range(ref_freq);</div><div class='add'>+		} else {</div><div class='add'>+			upper_sbs_freq_range[phy_id].low_5ghz_freq =</div><div class='add'>+				ath12k_wmi_get_lowest_5ghz_freq_from_range(ref_freq);</div><div class='add'>+			upper_sbs_freq_range[phy_id].high_5ghz_freq = sbs_range_sep;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_fill_lower_share_sbs_freq(struct ath12k_base *ab,</div><div class='add'>+				     u16 sbs_range_sep,</div><div class='add'>+				     struct ath12k_hw_mode_freq_range_arg *ref_freq)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_mode_info *hw_mode_info = &amp;ab-&gt;wmi_ab.hw_mode_info;</div><div class='add'>+	struct ath12k_hw_mode_freq_range_arg *lower_sbs_freq_range;</div><div class='add'>+	u8 phy_id;</div><div class='add'>+</div><div class='add'>+	lower_sbs_freq_range =</div><div class='add'>+			hw_mode_info-&gt;freq_range_caps[ATH12K_HW_MODE_SBS_LOWER_SHARE];</div><div class='add'>+</div><div class='add'>+	for (phy_id = 0; phy_id &lt; MAX_RADIOS; phy_id++) {</div><div class='add'>+		lower_sbs_freq_range[phy_id].low_2ghz_freq =</div><div class='add'>+						ref_freq[phy_id].low_2ghz_freq;</div><div class='add'>+		lower_sbs_freq_range[phy_id].high_2ghz_freq =</div><div class='add'>+						ref_freq[phy_id].high_2ghz_freq;</div><div class='add'>+</div><div class='add'>+		/* update for shared mac */</div><div class='add'>+		if (lower_sbs_freq_range[phy_id].low_2ghz_freq) {</div><div class='add'>+			lower_sbs_freq_range[phy_id].low_5ghz_freq =</div><div class='add'>+				ath12k_wmi_get_lowest_5ghz_freq_from_range(ref_freq);</div><div class='add'>+			lower_sbs_freq_range[phy_id].high_5ghz_freq = sbs_range_sep;</div><div class='add'>+		} else {</div><div class='add'>+			lower_sbs_freq_range[phy_id].low_5ghz_freq = sbs_range_sep + 10;</div><div class='add'>+			lower_sbs_freq_range[phy_id].high_5ghz_freq =</div><div class='add'>+				ath12k_wmi_get_highest_5ghz_freq_from_range(ref_freq);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *ath12k_wmi_hw_mode_to_str(enum ath12k_hw_mode hw_mode)</div><div class='add'>+{</div><div class='add'>+	static const char * const mode_str[] = {</div><div class='add'>+		[ATH12K_HW_MODE_SMM] = "SMM",</div><div class='add'>+		[ATH12K_HW_MODE_DBS] = "DBS",</div><div class='add'>+		[ATH12K_HW_MODE_SBS] = "SBS",</div><div class='add'>+		[ATH12K_HW_MODE_SBS_UPPER_SHARE] = "SBS_UPPER_SHARE",</div><div class='add'>+		[ATH12K_HW_MODE_SBS_LOWER_SHARE] = "SBS_LOWER_SHARE",</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (hw_mode &gt;= ARRAY_SIZE(mode_str))</div><div class='add'>+		return "Unknown";</div><div class='add'>+</div><div class='add'>+	return mode_str[hw_mode];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_dump_freq_range_per_mac(struct ath12k_base *ab,</div><div class='add'>+				   struct ath12k_hw_mode_freq_range_arg *freq_range,</div><div class='add'>+				   enum ath12k_hw_mode hw_mode)</div><div class='add'>+{</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_RADIOS; i++)</div><div class='add'>+		if (freq_range[i].low_2ghz_freq || freq_range[i].low_5ghz_freq)</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+				   "frequency range: %s(%d) mac %d 2 GHz [%d - %d] 5 GHz [%d - %d]",</div><div class='add'>+				   ath12k_wmi_hw_mode_to_str(hw_mode),</div><div class='add'>+				   hw_mode, i,</div><div class='add'>+				   freq_range[i].low_2ghz_freq,</div><div class='add'>+				   freq_range[i].high_2ghz_freq,</div><div class='add'>+				   freq_range[i].low_5ghz_freq,</div><div class='add'>+				   freq_range[i].high_5ghz_freq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_dump_freq_range(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_mode_freq_range_arg *freq_range;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	for (i = ATH12K_HW_MODE_SMM; i &lt; ATH12K_HW_MODE_MAX; i++) {</div><div class='add'>+		freq_range = ab-&gt;wmi_ab.hw_mode_info.freq_range_caps[i];</div><div class='add'>+		ath12k_wmi_dump_freq_range_per_mac(ab, freq_range, i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_modify_sbs_freq(struct ath12k_base *ab, u8 phy_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_mode_info *hw_mode_info = &amp;ab-&gt;wmi_ab.hw_mode_info;</div><div class='add'>+	struct ath12k_hw_mode_freq_range_arg *sbs_mac_range, *shared_mac_range;</div><div class='add'>+	struct ath12k_hw_mode_freq_range_arg *non_shared_range;</div><div class='add'>+	u8 shared_phy_id;</div><div class='add'>+</div><div class='add'>+	sbs_mac_range = &amp;hw_mode_info-&gt;freq_range_caps[ATH12K_HW_MODE_SBS][phy_id];</div><div class='add'>+</div><div class='add'>+	/* if SBS mac range has both 2.4 and 5 GHz ranges, i.e. shared phy_id</div><div class='add'>+	 * keep the range as it is in SBS</div><div class='add'>+	 */</div><div class='add'>+	if (sbs_mac_range-&gt;low_2ghz_freq &amp;&amp; sbs_mac_range-&gt;low_5ghz_freq)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (sbs_mac_range-&gt;low_2ghz_freq &amp;&amp; !sbs_mac_range-&gt;low_5ghz_freq) {</div><div class='add'>+		ath12k_err(ab, "Invalid DBS/SBS mode with only 2.4Ghz");</div><div class='add'>+		ath12k_wmi_dump_freq_range_per_mac(ab, sbs_mac_range, ATH12K_HW_MODE_SBS);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	non_shared_range = sbs_mac_range;</div><div class='add'>+	/* if SBS mac range has only 5 GHz then it's the non-shared phy, so</div><div class='add'>+	 * modify the range as per the shared mac.</div><div class='add'>+	 */</div><div class='add'>+	shared_phy_id = phy_id ? 0 : 1;</div><div class='add'>+	shared_mac_range =</div><div class='add'>+		&amp;hw_mode_info-&gt;freq_range_caps[ATH12K_HW_MODE_SBS][shared_phy_id];</div><div class='add'>+</div><div class='add'>+	if (shared_mac_range-&gt;low_5ghz_freq &gt; non_shared_range-&gt;low_5ghz_freq) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_WMI, "high 5 GHz shared");</div><div class='add'>+		/* If the shared mac lower 5 GHz frequency is greater than</div><div class='add'>+		 * non-shared mac lower 5 GHz frequency then the shared mac has</div><div class='add'>+		 * high 5 GHz shared with 2.4 GHz. So non-shared mac's 5 GHz high</div><div class='add'>+		 * freq should be less than the shared mac's low 5 GHz freq.</div><div class='add'>+		 */</div><div class='add'>+		if (non_shared_range-&gt;high_5ghz_freq &gt;=</div><div class='add'>+		    shared_mac_range-&gt;low_5ghz_freq)</div><div class='add'>+			non_shared_range-&gt;high_5ghz_freq =</div><div class='add'>+				max_t(u32, shared_mac_range-&gt;low_5ghz_freq - 10,</div><div class='add'>+				      non_shared_range-&gt;low_5ghz_freq);</div><div class='add'>+	} else if (shared_mac_range-&gt;high_5ghz_freq &lt;</div><div class='add'>+		   non_shared_range-&gt;high_5ghz_freq) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_WMI, "low 5 GHz shared");</div><div class='add'>+		/* If the shared mac high 5 GHz frequency is less than</div><div class='add'>+		 * non-shared mac high 5 GHz frequency then the shared mac has</div><div class='add'>+		 * low 5 GHz shared with 2.4 GHz. So non-shared mac's 5 GHz low</div><div class='add'>+		 * freq should be greater than the shared mac's high 5 GHz freq.</div><div class='add'>+		 */</div><div class='add'>+		if (shared_mac_range-&gt;high_5ghz_freq &gt;=</div><div class='add'>+		    non_shared_range-&gt;low_5ghz_freq)</div><div class='add'>+			non_shared_range-&gt;low_5ghz_freq =</div><div class='add'>+				min_t(u32, shared_mac_range-&gt;high_5ghz_freq + 10,</div><div class='add'>+				      non_shared_range-&gt;high_5ghz_freq);</div><div class='add'>+	} else {</div><div class='add'>+		ath12k_warn(ab, "invalid SBS range with all 5 GHz shared");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_update_sbs_freq_info(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw_mode_info *hw_mode_info = &amp;ab-&gt;wmi_ab.hw_mode_info;</div><div class='add'>+	struct ath12k_hw_mode_freq_range_arg *mac_range;</div><div class='add'>+	u16 sbs_range_sep;</div><div class='add'>+	u8 phy_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mac_range = hw_mode_info-&gt;freq_range_caps[ATH12K_HW_MODE_SBS];</div><div class='add'>+</div><div class='add'>+	/* If sbs_lower_band_end_freq has a value, then the frequency range</div><div class='add'>+	 * will be split using that value.</div><div class='add'>+	 */</div><div class='add'>+	sbs_range_sep = ab-&gt;wmi_ab.sbs_lower_band_end_freq;</div><div class='add'>+	if (sbs_range_sep) {</div><div class='add'>+		ath12k_wmi_fill_upper_share_sbs_freq(ab, sbs_range_sep,</div><div class='add'>+						     mac_range);</div><div class='add'>+		ath12k_wmi_fill_lower_share_sbs_freq(ab, sbs_range_sep,</div><div class='add'>+						     mac_range);</div><div class='add'>+		/* Hardware specifies the range boundary with sbs_range_sep,</div><div class='add'>+		 * (i.e. the boundary between 5 GHz high and 5 GHz low),</div><div class='add'>+		 * reset the original one to make sure it will not get used.</div><div class='add'>+		 */</div><div class='add'>+		memset(mac_range, 0, sizeof(*mac_range) * MAX_RADIOS);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If sbs_lower_band_end_freq is not set that means firmware will send one</div><div class='add'>+	 * shared mac range and one non-shared mac range. so update that freq.</div><div class='add'>+	 */</div><div class='add'>+	for (phy_id = 0; phy_id &lt; MAX_RADIOS; phy_id++) {</div><div class='add'>+		ret = ath12k_wmi_modify_sbs_freq(ab, phy_id);</div><div class='add'>+		if (ret) {</div><div class='add'>+			memset(mac_range, 0, sizeof(*mac_range) * MAX_RADIOS);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_update_mac_freq_info(struct ath12k_base *ab,</div><div class='add'>+				enum wmi_host_hw_mode_config_type hw_config_type,</div><div class='add'>+				u32 phy_id,</div><div class='add'>+				struct ath12k_svc_ext_mac_phy_info *mac_cap)</div><div class='add'>+{</div><div class='add'>+	if (phy_id &gt;= MAX_RADIOS) {</div><div class='add'>+		ath12k_err(ab, "mac more than two not supported: %d", phy_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "hw_mode_cfg %d mac %d band 0x%x SBS cutoff freq %d 2 GHz [%d - %d] 5 GHz [%d - %d]",</div><div class='add'>+		   hw_config_type, phy_id, mac_cap-&gt;supported_bands,</div><div class='add'>+		   ab-&gt;wmi_ab.sbs_lower_band_end_freq,</div><div class='add'>+		   mac_cap-&gt;hw_freq_range.low_2ghz_freq,</div><div class='add'>+		   mac_cap-&gt;hw_freq_range.high_2ghz_freq,</div><div class='add'>+		   mac_cap-&gt;hw_freq_range.low_5ghz_freq,</div><div class='add'>+		   mac_cap-&gt;hw_freq_range.high_5ghz_freq);</div><div class='add'>+</div><div class='add'>+	switch (hw_config_type) {</div><div class='add'>+	case WMI_HOST_HW_MODE_SINGLE:</div><div class='add'>+		if (phy_id) {</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_WMI, "mac phy 1 is not supported");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ath12k_wmi_update_freq_info(ab, mac_cap, ATH12K_HW_MODE_SMM, phy_id);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WMI_HOST_HW_MODE_DBS:</div><div class='add'>+		if (!ath12k_wmi_all_phy_range_updated(ab, ATH12K_HW_MODE_DBS))</div><div class='add'>+			ath12k_wmi_update_freq_info(ab, mac_cap,</div><div class='add'>+						    ATH12K_HW_MODE_DBS, phy_id);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_HOST_HW_MODE_DBS_SBS:</div><div class='add'>+	case WMI_HOST_HW_MODE_DBS_OR_SBS:</div><div class='add'>+		ath12k_wmi_update_freq_info(ab, mac_cap, ATH12K_HW_MODE_DBS, phy_id);</div><div class='add'>+		if (ab-&gt;wmi_ab.sbs_lower_band_end_freq ||</div><div class='add'>+		    mac_cap-&gt;hw_freq_range.low_5ghz_freq ||</div><div class='add'>+		    mac_cap-&gt;hw_freq_range.low_2ghz_freq)</div><div class='add'>+			ath12k_wmi_update_freq_info(ab, mac_cap, ATH12K_HW_MODE_SBS,</div><div class='add'>+						    phy_id);</div><div class='add'>+</div><div class='add'>+		if (ath12k_wmi_all_phy_range_updated(ab, ATH12K_HW_MODE_DBS))</div><div class='add'>+			ath12k_wmi_update_dbs_freq_info(ab);</div><div class='add'>+		if (ath12k_wmi_all_phy_range_updated(ab, ATH12K_HW_MODE_SBS))</div><div class='add'>+			ath12k_wmi_update_sbs_freq_info(ab);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_HOST_HW_MODE_SBS:</div><div class='add'>+	case WMI_HOST_HW_MODE_SBS_PASSIVE:</div><div class='add'>+		ath12k_wmi_update_freq_info(ab, mac_cap, ATH12K_HW_MODE_SBS, phy_id);</div><div class='add'>+		if (ath12k_wmi_all_phy_range_updated(ab, ATH12K_HW_MODE_SBS))</div><div class='add'>+			ath12k_wmi_update_sbs_freq_info(ab);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath12k_wmi_sbs_range_present(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	if (ath12k_wmi_all_phy_range_updated(ab, ATH12K_HW_MODE_SBS) ||</div><div class='add'>+	    (ab-&gt;wmi_ab.sbs_lower_band_end_freq &amp;&amp;</div><div class='add'>+	     ath12k_wmi_all_phy_range_updated(ab, ATH12K_HW_MODE_SBS_LOWER_SHARE) &amp;&amp;</div><div class='add'>+	     ath12k_wmi_all_phy_range_updated(ab, ATH12K_HW_MODE_SBS_UPPER_SHARE)))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_update_hw_mode_list(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_svc_ext_info *svc_ext_info = &amp;ab-&gt;wmi_ab.svc_ext_info;</div><div class='add'>+	struct ath12k_hw_mode_info *info = &amp;ab-&gt;wmi_ab.hw_mode_info;</div><div class='add'>+	enum wmi_host_hw_mode_config_type hw_config_type;</div><div class='add'>+	struct ath12k_svc_ext_mac_phy_info *tmp;</div><div class='add'>+	bool dbs_mode = false, sbs_mode = false;</div><div class='add'>+	u32 i, j = 0;</div><div class='add'>+</div><div class='add'>+	if (!svc_ext_info-&gt;num_hw_modes) {</div><div class='add'>+		ath12k_err(ab, "invalid number of hw modes");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI, "updated HW mode list: num modes %d",</div><div class='add'>+		   svc_ext_info-&gt;num_hw_modes);</div><div class='add'>+</div><div class='add'>+	memset(info-&gt;freq_range_caps, 0, sizeof(info-&gt;freq_range_caps));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; svc_ext_info-&gt;num_hw_modes; i++) {</div><div class='add'>+		if (j &gt;= ATH12K_MAX_MAC_PHY_CAP)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/* Update for MAC0 */</div><div class='add'>+		tmp = &amp;svc_ext_info-&gt;mac_phy_info[j++];</div><div class='add'>+		hw_config_type = tmp-&gt;hw_mode_config_type;</div><div class='add'>+		ath12k_wmi_update_mac_freq_info(ab, hw_config_type, tmp-&gt;phy_id, tmp);</div><div class='add'>+</div><div class='add'>+		/* SBS and DBS have dual MAC. Up to 2 MACs are considered. */</div><div class='add'>+		if (hw_config_type == WMI_HOST_HW_MODE_DBS ||</div><div class='add'>+		    hw_config_type == WMI_HOST_HW_MODE_SBS_PASSIVE ||</div><div class='add'>+		    hw_config_type == WMI_HOST_HW_MODE_SBS ||</div><div class='add'>+		    hw_config_type == WMI_HOST_HW_MODE_DBS_OR_SBS) {</div><div class='add'>+			if (j &gt;= ATH12K_MAX_MAC_PHY_CAP)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			/* Update for MAC1 */</div><div class='add'>+			tmp = &amp;svc_ext_info-&gt;mac_phy_info[j++];</div><div class='add'>+			ath12k_wmi_update_mac_freq_info(ab, hw_config_type,</div><div class='add'>+							tmp-&gt;phy_id, tmp);</div><div class='add'>+</div><div class='add'>+			if (hw_config_type == WMI_HOST_HW_MODE_DBS ||</div><div class='add'>+			    hw_config_type == WMI_HOST_HW_MODE_DBS_OR_SBS)</div><div class='add'>+				dbs_mode = true;</div><div class='add'>+</div><div class='add'>+			if (ath12k_wmi_sbs_range_present(ab) &amp;&amp;</div><div class='add'>+			    (hw_config_type == WMI_HOST_HW_MODE_SBS_PASSIVE ||</div><div class='add'>+			     hw_config_type == WMI_HOST_HW_MODE_SBS ||</div><div class='add'>+			     hw_config_type == WMI_HOST_HW_MODE_DBS_OR_SBS))</div><div class='add'>+				sbs_mode = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info-&gt;support_dbs = dbs_mode;</div><div class='add'>+	info-&gt;support_sbs = sbs_mode;</div><div class='add'>+</div><div class='add'>+	ath12k_wmi_dump_freq_range(ab);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_svc_rdy_ext2_parse(struct ath12k_base *ab,</div><div class='add'>+					 u16 tag, u16 len,</div><div class='add'>+					 const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_wmi_dbs_or_sbs_cap_params *dbs_or_sbs_caps;</div><div class='add'>+	struct ath12k_wmi_pdev *wmi_handle = &amp;ab-&gt;wmi_ab.wmi[0];</div><div class='add'>+	struct ath12k_wmi_svc_rdy_ext2_parse *parse = data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (tag) {</div><div class='add'>+	case WMI_TAG_SERVICE_READY_EXT2_EVENT:</div><div class='add'>+		ret = ath12k_pull_svc_ready_ext2(wmi_handle, ptr,</div><div class='add'>+						 &amp;parse-&gt;arg);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab,</div><div class='add'>+				    "failed to extract wmi service ready ext2 parameters: %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WMI_TAG_ARRAY_STRUCT:</div><div class='add'>+		if (!parse-&gt;dma_ring_cap_done) {</div><div class='add'>+			ret = ath12k_wmi_dma_ring_caps(ab, len, ptr,</div><div class='add'>+						       &amp;parse-&gt;dma_caps_parse);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+</div><div class='add'>+			parse-&gt;dma_ring_cap_done = true;</div><div class='add'>+		} else if (!parse-&gt;spectral_bin_scaling_done) {</div><div class='add'>+			/* TODO: This is a place-holder as WMI tag for</div><div class='add'>+			 * spectral scaling is before</div><div class='add'>+			 * WMI_TAG_MAC_PHY_CAPABILITIES_EXT</div><div class='add'>+			 */</div><div class='add'>+			parse-&gt;spectral_bin_scaling_done = true;</div><div class='add'>+		} else if (!parse-&gt;mac_phy_caps_ext_done) {</div><div class='add'>+			ret = ath12k_wmi_tlv_iter(ab, ptr, len,</div><div class='add'>+						  ath12k_wmi_tlv_mac_phy_caps_ext,</div><div class='add'>+						  parse);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_warn(ab, "failed to parse extended MAC PHY capabilities WMI TLV: %d\n",</div><div class='add'>+					    ret);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			parse-&gt;mac_phy_caps_ext_done = true;</div><div class='add'>+		} else if (!parse-&gt;hal_reg_caps_ext2_done) {</div><div class='add'>+			parse-&gt;hal_reg_caps_ext2_done = true;</div><div class='add'>+		} else if (!parse-&gt;scan_radio_caps_ext2_done) {</div><div class='add'>+			parse-&gt;scan_radio_caps_ext2_done = true;</div><div class='add'>+		} else if (!parse-&gt;twt_caps_done) {</div><div class='add'>+			parse-&gt;twt_caps_done = true;</div><div class='add'>+		} else if (!parse-&gt;htt_msdu_idx_to_qtype_map_done) {</div><div class='add'>+			parse-&gt;htt_msdu_idx_to_qtype_map_done = true;</div><div class='add'>+		} else if (!parse-&gt;dbs_or_sbs_cap_ext_done) {</div><div class='add'>+			dbs_or_sbs_caps = ptr;</div><div class='add'>+			ab-&gt;wmi_ab.sbs_lower_band_end_freq =</div><div class='add'>+				__le32_to_cpu(dbs_or_sbs_caps-&gt;sbs_lower_band_end_freq);</div><div class='add'>+</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_WMI, "sbs_lower_band_end_freq %u\n",</div><div class='add'>+				   ab-&gt;wmi_ab.sbs_lower_band_end_freq);</div><div class='add'>+</div><div class='add'>+			ret = ath12k_wmi_update_hw_mode_list(ab);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_warn(ab, "failed to update hw mode list: %d\n",</div><div class='add'>+					    ret);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			parse-&gt;dbs_or_sbs_cap_ext_done = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_service_ready_ext2_event(struct ath12k_base *ab,</div><div class='add'>+					   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_svc_rdy_ext2_parse svc_rdy_ext2 = { };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_tlv_iter(ab, skb-&gt;data, skb-&gt;len,</div><div class='add'>+				  ath12k_wmi_svc_rdy_ext2_parse,</div><div class='add'>+				  &amp;svc_rdy_ext2);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to parse ext2 event tlv %d\n", ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	complete(&amp;ab-&gt;wmi_ab.service_ready);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	ath12k_wmi_free_dbring_caps(ab);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pull_vdev_start_resp_tlv(struct ath12k_base *ab, struct sk_buff *skb,</div><div class='add'>+					   struct wmi_vdev_start_resp_event *vdev_rsp)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_vdev_start_resp_event *ev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_VDEV_START_RESPONSE_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch vdev start resp ev");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*vdev_rsp = *ev;</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ath12k_reg_rule</div><div class='add'>+*create_ext_reg_rules_from_wmi(u32 num_reg_rules,</div><div class='add'>+			       struct ath12k_wmi_reg_rule_ext_params *wmi_reg_rule)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_reg_rule *reg_rule_ptr;</div><div class='add'>+	u32 count;</div><div class='add'>+</div><div class='add'>+	reg_rule_ptr = kzalloc((num_reg_rules * sizeof(*reg_rule_ptr)),</div><div class='add'>+			       GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+	if (!reg_rule_ptr)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	for (count = 0; count &lt; num_reg_rules; count++) {</div><div class='add'>+		reg_rule_ptr[count].start_freq =</div><div class='add'>+			le32_get_bits(wmi_reg_rule[count].freq_info,</div><div class='add'>+				      REG_RULE_START_FREQ);</div><div class='add'>+		reg_rule_ptr[count].end_freq =</div><div class='add'>+			le32_get_bits(wmi_reg_rule[count].freq_info,</div><div class='add'>+				      REG_RULE_END_FREQ);</div><div class='add'>+		reg_rule_ptr[count].max_bw =</div><div class='add'>+			le32_get_bits(wmi_reg_rule[count].bw_pwr_info,</div><div class='add'>+				      REG_RULE_MAX_BW);</div><div class='add'>+		reg_rule_ptr[count].reg_power =</div><div class='add'>+			le32_get_bits(wmi_reg_rule[count].bw_pwr_info,</div><div class='add'>+				      REG_RULE_REG_PWR);</div><div class='add'>+		reg_rule_ptr[count].ant_gain =</div><div class='add'>+			le32_get_bits(wmi_reg_rule[count].bw_pwr_info,</div><div class='add'>+				      REG_RULE_ANT_GAIN);</div><div class='add'>+		reg_rule_ptr[count].flags =</div><div class='add'>+			le32_get_bits(wmi_reg_rule[count].flag_info,</div><div class='add'>+				      REG_RULE_FLAGS);</div><div class='add'>+		reg_rule_ptr[count].psd_flag =</div><div class='add'>+			le32_get_bits(wmi_reg_rule[count].psd_power_info,</div><div class='add'>+				      REG_RULE_PSD_INFO);</div><div class='add'>+		reg_rule_ptr[count].psd_eirp =</div><div class='add'>+			le32_get_bits(wmi_reg_rule[count].psd_power_info,</div><div class='add'>+				      REG_RULE_PSD_EIRP);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return reg_rule_ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ath12k_wmi_ignore_num_extra_rules(struct ath12k_wmi_reg_rule_ext_params *rule,</div><div class='add'>+					    u32 num_reg_rules)</div><div class='add'>+{</div><div class='add'>+	u8 num_invalid_5ghz_rules = 0;</div><div class='add'>+	u32 count, start_freq;</div><div class='add'>+</div><div class='add'>+	for (count = 0; count &lt; num_reg_rules; count++) {</div><div class='add'>+		start_freq = le32_get_bits(rule[count].freq_info, REG_RULE_START_FREQ);</div><div class='add'>+</div><div class='add'>+		if (start_freq &gt;= ATH12K_MIN_6GHZ_FREQ)</div><div class='add'>+			num_invalid_5ghz_rules++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return num_invalid_5ghz_rules;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pull_reg_chan_list_ext_update_ev(struct ath12k_base *ab,</div><div class='add'>+						   struct sk_buff *skb,</div><div class='add'>+						   struct ath12k_reg_info *reg_info)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_reg_chan_list_cc_ext_event *ev;</div><div class='add'>+	struct ath12k_wmi_reg_rule_ext_params *ext_wmi_reg_rule;</div><div class='add'>+	u32 num_2g_reg_rules, num_5g_reg_rules;</div><div class='add'>+	u32 num_6g_reg_rules_ap[WMI_REG_CURRENT_MAX_AP_TYPE];</div><div class='add'>+	u32 num_6g_reg_rules_cl[WMI_REG_CURRENT_MAX_AP_TYPE][WMI_REG_MAX_CLIENT_TYPE];</div><div class='add'>+	u8 num_invalid_5ghz_ext_rules;</div><div class='add'>+	u32 total_reg_rules = 0;</div><div class='add'>+	int ret, i, j;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI, "processing regulatory ext channel list\n");</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_REG_CHAN_LIST_CC_EXT_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch reg chan list ext update ev\n");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg_info-&gt;num_2g_reg_rules = le32_to_cpu(ev-&gt;num_2g_reg_rules);</div><div class='add'>+	reg_info-&gt;num_5g_reg_rules = le32_to_cpu(ev-&gt;num_5g_reg_rules);</div><div class='add'>+	reg_info-&gt;num_6g_reg_rules_ap[WMI_REG_INDOOR_AP] =</div><div class='add'>+		le32_to_cpu(ev-&gt;num_6g_reg_rules_ap_lpi);</div><div class='add'>+	reg_info-&gt;num_6g_reg_rules_ap[WMI_REG_STD_POWER_AP] =</div><div class='add'>+		le32_to_cpu(ev-&gt;num_6g_reg_rules_ap_sp);</div><div class='add'>+	reg_info-&gt;num_6g_reg_rules_ap[WMI_REG_VLP_AP] =</div><div class='add'>+		le32_to_cpu(ev-&gt;num_6g_reg_rules_ap_vlp);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WMI_REG_MAX_CLIENT_TYPE; i++) {</div><div class='add'>+		reg_info-&gt;num_6g_reg_rules_cl[WMI_REG_INDOOR_AP][i] =</div><div class='add'>+			le32_to_cpu(ev-&gt;num_6g_reg_rules_cl_lpi[i]);</div><div class='add'>+		reg_info-&gt;num_6g_reg_rules_cl[WMI_REG_STD_POWER_AP][i] =</div><div class='add'>+			le32_to_cpu(ev-&gt;num_6g_reg_rules_cl_sp[i]);</div><div class='add'>+		reg_info-&gt;num_6g_reg_rules_cl[WMI_REG_VLP_AP][i] =</div><div class='add'>+			le32_to_cpu(ev-&gt;num_6g_reg_rules_cl_vlp[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	num_2g_reg_rules = reg_info-&gt;num_2g_reg_rules;</div><div class='add'>+	total_reg_rules += num_2g_reg_rules;</div><div class='add'>+	num_5g_reg_rules = reg_info-&gt;num_5g_reg_rules;</div><div class='add'>+	total_reg_rules += num_5g_reg_rules;</div><div class='add'>+</div><div class='add'>+	if (num_2g_reg_rules &gt; MAX_REG_RULES || num_5g_reg_rules &gt; MAX_REG_RULES) {</div><div class='add'>+		ath12k_warn(ab, "Num reg rules for 2G/5G exceeds max limit (num_2g_reg_rules: %d num_5g_reg_rules: %d max_rules: %d)\n",</div><div class='add'>+			    num_2g_reg_rules, num_5g_reg_rules, MAX_REG_RULES);</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WMI_REG_CURRENT_MAX_AP_TYPE; i++) {</div><div class='add'>+		num_6g_reg_rules_ap[i] = reg_info-&gt;num_6g_reg_rules_ap[i];</div><div class='add'>+</div><div class='add'>+		if (num_6g_reg_rules_ap[i] &gt; MAX_6GHZ_REG_RULES) {</div><div class='add'>+			ath12k_warn(ab, "Num 6G reg rules for AP mode(%d) exceeds max limit (num_6g_reg_rules_ap: %d, max_rules: %d)\n",</div><div class='add'>+				    i, num_6g_reg_rules_ap[i], MAX_6GHZ_REG_RULES);</div><div class='add'>+			kfree(tb);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		total_reg_rules += num_6g_reg_rules_ap[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WMI_REG_MAX_CLIENT_TYPE; i++) {</div><div class='add'>+		num_6g_reg_rules_cl[WMI_REG_INDOOR_AP][i] =</div><div class='add'>+				reg_info-&gt;num_6g_reg_rules_cl[WMI_REG_INDOOR_AP][i];</div><div class='add'>+		total_reg_rules += num_6g_reg_rules_cl[WMI_REG_INDOOR_AP][i];</div><div class='add'>+</div><div class='add'>+		num_6g_reg_rules_cl[WMI_REG_STD_POWER_AP][i] =</div><div class='add'>+				reg_info-&gt;num_6g_reg_rules_cl[WMI_REG_STD_POWER_AP][i];</div><div class='add'>+		total_reg_rules += num_6g_reg_rules_cl[WMI_REG_STD_POWER_AP][i];</div><div class='add'>+</div><div class='add'>+		num_6g_reg_rules_cl[WMI_REG_VLP_AP][i] =</div><div class='add'>+				reg_info-&gt;num_6g_reg_rules_cl[WMI_REG_VLP_AP][i];</div><div class='add'>+		total_reg_rules += num_6g_reg_rules_cl[WMI_REG_VLP_AP][i];</div><div class='add'>+</div><div class='add'>+		if (num_6g_reg_rules_cl[WMI_REG_INDOOR_AP][i] &gt; MAX_6GHZ_REG_RULES ||</div><div class='add'>+		    num_6g_reg_rules_cl[WMI_REG_STD_POWER_AP][i] &gt; MAX_6GHZ_REG_RULES ||</div><div class='add'>+		    num_6g_reg_rules_cl[WMI_REG_VLP_AP][i] &gt;  MAX_6GHZ_REG_RULES) {</div><div class='add'>+			ath12k_warn(ab, "Num 6g client reg rules exceeds max limit, for client(type: %d)\n",</div><div class='add'>+				    i);</div><div class='add'>+			kfree(tb);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!total_reg_rules) {</div><div class='add'>+		ath12k_warn(ab, "No reg rules available\n");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(reg_info-&gt;alpha2, &amp;ev-&gt;alpha2, REG_ALPHA2_LEN);</div><div class='add'>+</div><div class='add'>+	reg_info-&gt;dfs_region = le32_to_cpu(ev-&gt;dfs_region);</div><div class='add'>+	reg_info-&gt;phybitmap = le32_to_cpu(ev-&gt;phybitmap);</div><div class='add'>+	reg_info-&gt;num_phy = le32_to_cpu(ev-&gt;num_phy);</div><div class='add'>+	reg_info-&gt;phy_id = le32_to_cpu(ev-&gt;phy_id);</div><div class='add'>+	reg_info-&gt;ctry_code = le32_to_cpu(ev-&gt;country_id);</div><div class='add'>+	reg_info-&gt;reg_dmn_pair = le32_to_cpu(ev-&gt;domain_code);</div><div class='add'>+</div><div class='add'>+	switch (le32_to_cpu(ev-&gt;status_code)) {</div><div class='add'>+	case WMI_REG_SET_CC_STATUS_PASS:</div><div class='add'>+		reg_info-&gt;status_code = REG_SET_CC_STATUS_PASS;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_REG_CURRENT_ALPHA2_NOT_FOUND:</div><div class='add'>+		reg_info-&gt;status_code = REG_CURRENT_ALPHA2_NOT_FOUND;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_REG_INIT_ALPHA2_NOT_FOUND:</div><div class='add'>+		reg_info-&gt;status_code = REG_INIT_ALPHA2_NOT_FOUND;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_REG_SET_CC_CHANGE_NOT_ALLOWED:</div><div class='add'>+		reg_info-&gt;status_code = REG_SET_CC_CHANGE_NOT_ALLOWED;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_REG_SET_CC_STATUS_NO_MEMORY:</div><div class='add'>+		reg_info-&gt;status_code = REG_SET_CC_STATUS_NO_MEMORY;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_REG_SET_CC_STATUS_FAIL:</div><div class='add'>+		reg_info-&gt;status_code = REG_SET_CC_STATUS_FAIL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg_info-&gt;is_ext_reg_event = true;</div><div class='add'>+</div><div class='add'>+	reg_info-&gt;min_bw_2g = le32_to_cpu(ev-&gt;min_bw_2g);</div><div class='add'>+	reg_info-&gt;max_bw_2g = le32_to_cpu(ev-&gt;max_bw_2g);</div><div class='add'>+	reg_info-&gt;min_bw_5g = le32_to_cpu(ev-&gt;min_bw_5g);</div><div class='add'>+	reg_info-&gt;max_bw_5g = le32_to_cpu(ev-&gt;max_bw_5g);</div><div class='add'>+	reg_info-&gt;min_bw_6g_ap[WMI_REG_INDOOR_AP] = le32_to_cpu(ev-&gt;min_bw_6g_ap_lpi);</div><div class='add'>+	reg_info-&gt;max_bw_6g_ap[WMI_REG_INDOOR_AP] = le32_to_cpu(ev-&gt;max_bw_6g_ap_lpi);</div><div class='add'>+	reg_info-&gt;min_bw_6g_ap[WMI_REG_STD_POWER_AP] = le32_to_cpu(ev-&gt;min_bw_6g_ap_sp);</div><div class='add'>+	reg_info-&gt;max_bw_6g_ap[WMI_REG_STD_POWER_AP] = le32_to_cpu(ev-&gt;max_bw_6g_ap_sp);</div><div class='add'>+	reg_info-&gt;min_bw_6g_ap[WMI_REG_VLP_AP] = le32_to_cpu(ev-&gt;min_bw_6g_ap_vlp);</div><div class='add'>+	reg_info-&gt;max_bw_6g_ap[WMI_REG_VLP_AP] = le32_to_cpu(ev-&gt;max_bw_6g_ap_vlp);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WMI_REG_MAX_CLIENT_TYPE; i++) {</div><div class='add'>+		reg_info-&gt;min_bw_6g_client[WMI_REG_INDOOR_AP][i] =</div><div class='add'>+			le32_to_cpu(ev-&gt;min_bw_6g_client_lpi[i]);</div><div class='add'>+		reg_info-&gt;max_bw_6g_client[WMI_REG_INDOOR_AP][i] =</div><div class='add'>+			le32_to_cpu(ev-&gt;max_bw_6g_client_lpi[i]);</div><div class='add'>+		reg_info-&gt;min_bw_6g_client[WMI_REG_STD_POWER_AP][i] =</div><div class='add'>+			le32_to_cpu(ev-&gt;min_bw_6g_client_sp[i]);</div><div class='add'>+		reg_info-&gt;max_bw_6g_client[WMI_REG_STD_POWER_AP][i] =</div><div class='add'>+			le32_to_cpu(ev-&gt;max_bw_6g_client_sp[i]);</div><div class='add'>+		reg_info-&gt;min_bw_6g_client[WMI_REG_VLP_AP][i] =</div><div class='add'>+			le32_to_cpu(ev-&gt;min_bw_6g_client_vlp[i]);</div><div class='add'>+		reg_info-&gt;max_bw_6g_client[WMI_REG_VLP_AP][i] =</div><div class='add'>+			le32_to_cpu(ev-&gt;max_bw_6g_client_vlp[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "%s:cc_ext %s dfs %d BW: min_2g %d max_2g %d min_5g %d max_5g %d phy_bitmap 0x%x",</div><div class='add'>+		   __func__, reg_info-&gt;alpha2, reg_info-&gt;dfs_region,</div><div class='add'>+		   reg_info-&gt;min_bw_2g, reg_info-&gt;max_bw_2g,</div><div class='add'>+		   reg_info-&gt;min_bw_5g, reg_info-&gt;max_bw_5g,</div><div class='add'>+		   reg_info-&gt;phybitmap);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "num_2g_reg_rules %d num_5g_reg_rules %d",</div><div class='add'>+		   num_2g_reg_rules, num_5g_reg_rules);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "num_6g_reg_rules_ap_lpi: %d num_6g_reg_rules_ap_sp: %d num_6g_reg_rules_ap_vlp: %d",</div><div class='add'>+		   num_6g_reg_rules_ap[WMI_REG_INDOOR_AP],</div><div class='add'>+		   num_6g_reg_rules_ap[WMI_REG_STD_POWER_AP],</div><div class='add'>+		   num_6g_reg_rules_ap[WMI_REG_VLP_AP]);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "6g Regular client: num_6g_reg_rules_lpi: %d num_6g_reg_rules_sp: %d num_6g_reg_rules_vlp: %d",</div><div class='add'>+		   num_6g_reg_rules_cl[WMI_REG_INDOOR_AP][WMI_REG_DEFAULT_CLIENT],</div><div class='add'>+		   num_6g_reg_rules_cl[WMI_REG_STD_POWER_AP][WMI_REG_DEFAULT_CLIENT],</div><div class='add'>+		   num_6g_reg_rules_cl[WMI_REG_VLP_AP][WMI_REG_DEFAULT_CLIENT]);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "6g Subordinate client: num_6g_reg_rules_lpi: %d num_6g_reg_rules_sp: %d num_6g_reg_rules_vlp: %d",</div><div class='add'>+		   num_6g_reg_rules_cl[WMI_REG_INDOOR_AP][WMI_REG_SUBORDINATE_CLIENT],</div><div class='add'>+		   num_6g_reg_rules_cl[WMI_REG_STD_POWER_AP][WMI_REG_SUBORDINATE_CLIENT],</div><div class='add'>+		   num_6g_reg_rules_cl[WMI_REG_VLP_AP][WMI_REG_SUBORDINATE_CLIENT]);</div><div class='add'>+</div><div class='add'>+	ext_wmi_reg_rule =</div><div class='add'>+		(struct ath12k_wmi_reg_rule_ext_params *)((u8 *)ev</div><div class='add'>+			+ sizeof(*ev)</div><div class='add'>+			+ sizeof(struct wmi_tlv));</div><div class='add'>+</div><div class='add'>+	if (num_2g_reg_rules) {</div><div class='add'>+		reg_info-&gt;reg_rules_2g_ptr =</div><div class='add'>+			create_ext_reg_rules_from_wmi(num_2g_reg_rules,</div><div class='add'>+						      ext_wmi_reg_rule);</div><div class='add'>+</div><div class='add'>+		if (!reg_info-&gt;reg_rules_2g_ptr) {</div><div class='add'>+			kfree(tb);</div><div class='add'>+			ath12k_warn(ab, "Unable to Allocate memory for 2g rules\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ext_wmi_reg_rule += num_2g_reg_rules;</div><div class='add'>+</div><div class='add'>+	/* Firmware might include 6 GHz reg rule in 5 GHz rule list</div><div class='add'>+	 * for few countries along with separate 6 GHz rule.</div><div class='add'>+	 * Having same 6 GHz reg rule in 5 GHz and 6 GHz rules list</div><div class='add'>+	 * causes intersect check to be true, and same rules will be</div><div class='add'>+	 * shown multiple times in iw cmd.</div><div class='add'>+	 * Hence, avoid parsing 6 GHz rule from 5 GHz reg rule list</div><div class='add'>+	 */</div><div class='add'>+	num_invalid_5ghz_ext_rules = ath12k_wmi_ignore_num_extra_rules(ext_wmi_reg_rule,</div><div class='add'>+								       num_5g_reg_rules);</div><div class='add'>+</div><div class='add'>+	if (num_invalid_5ghz_ext_rules) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+			   "CC: %s 5 GHz reg rules number %d from fw, %d number of invalid 5 GHz rules",</div><div class='add'>+			   reg_info-&gt;alpha2, reg_info-&gt;num_5g_reg_rules,</div><div class='add'>+			   num_invalid_5ghz_ext_rules);</div><div class='add'>+</div><div class='add'>+		num_5g_reg_rules = num_5g_reg_rules - num_invalid_5ghz_ext_rules;</div><div class='add'>+		reg_info-&gt;num_5g_reg_rules = num_5g_reg_rules;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (num_5g_reg_rules) {</div><div class='add'>+		reg_info-&gt;reg_rules_5g_ptr =</div><div class='add'>+			create_ext_reg_rules_from_wmi(num_5g_reg_rules,</div><div class='add'>+						      ext_wmi_reg_rule);</div><div class='add'>+</div><div class='add'>+		if (!reg_info-&gt;reg_rules_5g_ptr) {</div><div class='add'>+			kfree(tb);</div><div class='add'>+			ath12k_warn(ab, "Unable to Allocate memory for 5g rules\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We have adjusted the number of 5 GHz reg rules above. But still those</div><div class='add'>+	 * many rules needs to be adjusted in ext_wmi_reg_rule.</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE: num_invalid_5ghz_ext_rules will be 0 for rest other cases.</div><div class='add'>+	 */</div><div class='add'>+	ext_wmi_reg_rule += (num_5g_reg_rules + num_invalid_5ghz_ext_rules);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WMI_REG_CURRENT_MAX_AP_TYPE; i++) {</div><div class='add'>+		reg_info-&gt;reg_rules_6g_ap_ptr[i] =</div><div class='add'>+			create_ext_reg_rules_from_wmi(num_6g_reg_rules_ap[i],</div><div class='add'>+						      ext_wmi_reg_rule);</div><div class='add'>+</div><div class='add'>+		if (!reg_info-&gt;reg_rules_6g_ap_ptr[i]) {</div><div class='add'>+			kfree(tb);</div><div class='add'>+			ath12k_warn(ab, "Unable to Allocate memory for 6g ap rules\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ext_wmi_reg_rule += num_6g_reg_rules_ap[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; WMI_REG_CURRENT_MAX_AP_TYPE; j++) {</div><div class='add'>+		for (i = 0; i &lt; WMI_REG_MAX_CLIENT_TYPE; i++) {</div><div class='add'>+			reg_info-&gt;reg_rules_6g_client_ptr[j][i] =</div><div class='add'>+				create_ext_reg_rules_from_wmi(num_6g_reg_rules_cl[j][i],</div><div class='add'>+							      ext_wmi_reg_rule);</div><div class='add'>+</div><div class='add'>+			if (!reg_info-&gt;reg_rules_6g_client_ptr[j][i]) {</div><div class='add'>+				kfree(tb);</div><div class='add'>+				ath12k_warn(ab, "Unable to Allocate memory for 6g client rules\n");</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ext_wmi_reg_rule += num_6g_reg_rules_cl[j][i];</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg_info-&gt;client_type = le32_to_cpu(ev-&gt;client_type);</div><div class='add'>+	reg_info-&gt;rnr_tpe_usable = ev-&gt;rnr_tpe_usable;</div><div class='add'>+	reg_info-&gt;unspecified_ap_usable = ev-&gt;unspecified_ap_usable;</div><div class='add'>+	reg_info-&gt;domain_code_6g_ap[WMI_REG_INDOOR_AP] =</div><div class='add'>+		le32_to_cpu(ev-&gt;domain_code_6g_ap_lpi);</div><div class='add'>+	reg_info-&gt;domain_code_6g_ap[WMI_REG_STD_POWER_AP] =</div><div class='add'>+		le32_to_cpu(ev-&gt;domain_code_6g_ap_sp);</div><div class='add'>+	reg_info-&gt;domain_code_6g_ap[WMI_REG_VLP_AP] =</div><div class='add'>+		le32_to_cpu(ev-&gt;domain_code_6g_ap_vlp);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WMI_REG_MAX_CLIENT_TYPE; i++) {</div><div class='add'>+		reg_info-&gt;domain_code_6g_client[WMI_REG_INDOOR_AP][i] =</div><div class='add'>+			le32_to_cpu(ev-&gt;domain_code_6g_client_lpi[i]);</div><div class='add'>+		reg_info-&gt;domain_code_6g_client[WMI_REG_STD_POWER_AP][i] =</div><div class='add'>+			le32_to_cpu(ev-&gt;domain_code_6g_client_sp[i]);</div><div class='add'>+		reg_info-&gt;domain_code_6g_client[WMI_REG_VLP_AP][i] =</div><div class='add'>+			le32_to_cpu(ev-&gt;domain_code_6g_client_vlp[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg_info-&gt;domain_code_6g_super_id = le32_to_cpu(ev-&gt;domain_code_6g_super_id);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI, "6g client_type: %d domain_code_6g_super_id: %d",</div><div class='add'>+		   reg_info-&gt;client_type, reg_info-&gt;domain_code_6g_super_id);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI, "processed regulatory ext channel list\n");</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pull_peer_del_resp_ev(struct ath12k_base *ab, struct sk_buff *skb,</div><div class='add'>+					struct wmi_peer_delete_resp_event *peer_del_resp)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_peer_delete_resp_event *ev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_PEER_DELETE_RESP_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch peer delete resp ev");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(peer_del_resp, 0, sizeof(*peer_del_resp));</div><div class='add'>+</div><div class='add'>+	peer_del_resp-&gt;vdev_id = ev-&gt;vdev_id;</div><div class='add'>+	ether_addr_copy(peer_del_resp-&gt;peer_macaddr.addr,</div><div class='add'>+			ev-&gt;peer_macaddr.addr);</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pull_vdev_del_resp_ev(struct ath12k_base *ab,</div><div class='add'>+					struct sk_buff *skb,</div><div class='add'>+					u32 *vdev_id)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_vdev_delete_resp_event *ev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_VDEV_DELETE_RESP_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch vdev delete resp ev");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*vdev_id = le32_to_cpu(ev-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pull_bcn_tx_status_ev(struct ath12k_base *ab,</div><div class='add'>+					struct sk_buff *skb,</div><div class='add'>+					u32 *vdev_id, u32 *tx_status)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_bcn_tx_status_event *ev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_OFFLOAD_BCN_TX_STATUS_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch bcn tx status ev");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*vdev_id = le32_to_cpu(ev-&gt;vdev_id);</div><div class='add'>+	*tx_status = le32_to_cpu(ev-&gt;tx_status);</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pull_vdev_stopped_param_tlv(struct ath12k_base *ab, struct sk_buff *skb,</div><div class='add'>+					      u32 *vdev_id)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_vdev_stopped_event *ev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_VDEV_STOPPED_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch vdev stop ev");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*vdev_id = le32_to_cpu(ev-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_tlv_mgmt_rx_parse(struct ath12k_base *ab,</div><div class='add'>+					u16 tag, u16 len,</div><div class='add'>+					const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct wmi_tlv_mgmt_rx_parse *parse = data;</div><div class='add'>+</div><div class='add'>+	switch (tag) {</div><div class='add'>+	case WMI_TAG_MGMT_RX_HDR:</div><div class='add'>+		parse-&gt;fixed = ptr;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TAG_ARRAY_BYTE:</div><div class='add'>+		if (!parse-&gt;frame_buf_done) {</div><div class='add'>+			parse-&gt;frame_buf = ptr;</div><div class='add'>+			parse-&gt;frame_buf_done = true;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pull_mgmt_rx_params_tlv(struct ath12k_base *ab,</div><div class='add'>+					  struct sk_buff *skb,</div><div class='add'>+					  struct ath12k_wmi_mgmt_rx_arg *hdr)</div><div class='add'>+{</div><div class='add'>+	struct wmi_tlv_mgmt_rx_parse parse = { };</div><div class='add'>+	const struct ath12k_wmi_mgmt_rx_params *ev;</div><div class='add'>+	const u8 *frame;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_tlv_iter(ab, skb-&gt;data, skb-&gt;len,</div><div class='add'>+				  ath12k_wmi_tlv_mgmt_rx_parse,</div><div class='add'>+				  &amp;parse);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to parse mgmt rx tlv %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = parse.fixed;</div><div class='add'>+	frame = parse.frame_buf;</div><div class='add'>+</div><div class='add'>+	if (!ev || !frame) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch mgmt rx hdr");</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr-&gt;pdev_id = le32_to_cpu(ev-&gt;pdev_id);</div><div class='add'>+	hdr-&gt;chan_freq = le32_to_cpu(ev-&gt;chan_freq);</div><div class='add'>+	hdr-&gt;channel = le32_to_cpu(ev-&gt;channel);</div><div class='add'>+	hdr-&gt;snr = le32_to_cpu(ev-&gt;snr);</div><div class='add'>+	hdr-&gt;rate = le32_to_cpu(ev-&gt;rate);</div><div class='add'>+	hdr-&gt;phy_mode = le32_to_cpu(ev-&gt;phy_mode);</div><div class='add'>+	hdr-&gt;buf_len = le32_to_cpu(ev-&gt;buf_len);</div><div class='add'>+	hdr-&gt;status = le32_to_cpu(ev-&gt;status);</div><div class='add'>+	hdr-&gt;flags = le32_to_cpu(ev-&gt;flags);</div><div class='add'>+	hdr-&gt;rssi = a_sle32_to_cpu(ev-&gt;rssi);</div><div class='add'>+	hdr-&gt;tsf_delta = le32_to_cpu(ev-&gt;tsf_delta);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATH_MAX_ANTENNA; i++)</div><div class='add'>+		hdr-&gt;rssi_ctl[i] = le32_to_cpu(ev-&gt;rssi_ctl[i]);</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &lt; (frame - skb-&gt;data) + hdr-&gt;buf_len) {</div><div class='add'>+		ath12k_warn(ab, "invalid length in mgmt rx hdr ev");</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* shift the sk_buff to point to `frame` */</div><div class='add'>+	skb_trim(skb, 0);</div><div class='add'>+	skb_put(skb, frame - skb-&gt;data);</div><div class='add'>+	skb_pull(skb, frame - skb-&gt;data);</div><div class='add'>+	skb_put(skb, hdr-&gt;buf_len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wmi_process_mgmt_tx_comp(struct ath12k *ar, u32 desc_id,</div><div class='add'>+				    u32 status, u32 ack_rssi)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *msdu;</div><div class='add'>+	struct ieee80211_tx_info *info;</div><div class='add'>+	struct ath12k_skb_cb *skb_cb;</div><div class='add'>+	int num_mgmt;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;txmgmt_idr_lock);</div><div class='add'>+	msdu = idr_find(&amp;ar-&gt;txmgmt_idr, desc_id);</div><div class='add'>+</div><div class='add'>+	if (!msdu) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "received mgmt tx compl for invalid msdu_id: %d\n",</div><div class='add'>+			    desc_id);</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;txmgmt_idr_lock);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	idr_remove(&amp;ar-&gt;txmgmt_idr, desc_id);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;txmgmt_idr_lock);</div><div class='add'>+</div><div class='add'>+	skb_cb = ATH12K_SKB_CB(msdu);</div><div class='add'>+	dma_unmap_single(ar-&gt;ab-&gt;dev, skb_cb-&gt;paddr, msdu-&gt;len, DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	info = IEEE80211_SKB_CB(msdu);</div><div class='add'>+	memset(&amp;info-&gt;status, 0, sizeof(info-&gt;status));</div><div class='add'>+</div><div class='add'>+	/* skip tx rate update from ieee80211_status*/</div><div class='add'>+	info-&gt;status.rates[0].idx = -1;</div><div class='add'>+</div><div class='add'>+	if ((!(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)) &amp;&amp; !status) {</div><div class='add'>+		info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='add'>+		info-&gt;status.ack_signal = ack_rssi;</div><div class='add'>+		info-&gt;status.flags |= IEEE80211_TX_STATUS_ACK_SIGNAL_VALID;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK) &amp;&amp; !status)</div><div class='add'>+		info-&gt;flags |= IEEE80211_TX_STAT_NOACK_TRANSMITTED;</div><div class='add'>+</div><div class='add'>+	ieee80211_tx_status_irqsafe(ath12k_ar_to_hw(ar), msdu);</div><div class='add'>+</div><div class='add'>+	num_mgmt = atomic_dec_if_positive(&amp;ar-&gt;num_pending_mgmt_tx);</div><div class='add'>+</div><div class='add'>+	/* WARN when we received this event without doing any mgmt tx */</div><div class='add'>+	if (num_mgmt &lt; 0)</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+</div><div class='add'>+	if (!num_mgmt)</div><div class='add'>+		wake_up(&amp;ar-&gt;txmgmt_empty_waitq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pull_mgmt_tx_compl_param_tlv(struct ath12k_base *ab,</div><div class='add'>+					       struct sk_buff *skb,</div><div class='add'>+					       struct wmi_mgmt_tx_compl_event *param)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_mgmt_tx_compl_event *ev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_MGMT_TX_COMPL_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch mgmt tx compl ev");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	param-&gt;pdev_id = ev-&gt;pdev_id;</div><div class='add'>+	param-&gt;desc_id = ev-&gt;desc_id;</div><div class='add'>+	param-&gt;status = ev-&gt;status;</div><div class='add'>+	param-&gt;ppdu_id = ev-&gt;ppdu_id;</div><div class='add'>+	param-&gt;ack_rssi = ev-&gt;ack_rssi;</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_event_scan_started(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	switch (ar-&gt;scan.state) {</div><div class='add'>+	case ATH12K_SCAN_IDLE:</div><div class='add'>+	case ATH12K_SCAN_RUNNING:</div><div class='add'>+	case ATH12K_SCAN_ABORTING:</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "received scan started event in an invalid scan state: %s (%d)\n",</div><div class='add'>+			    ath12k_scan_state_str(ar-&gt;scan.state),</div><div class='add'>+			    ar-&gt;scan.state);</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_SCAN_STARTING:</div><div class='add'>+		ar-&gt;scan.state = ATH12K_SCAN_RUNNING;</div><div class='add'>+</div><div class='add'>+		if (ar-&gt;scan.is_roc)</div><div class='add'>+			ieee80211_ready_on_channel(ath12k_ar_to_hw(ar));</div><div class='add'>+</div><div class='add'>+		complete(&amp;ar-&gt;scan.started);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_event_scan_start_failed(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	switch (ar-&gt;scan.state) {</div><div class='add'>+	case ATH12K_SCAN_IDLE:</div><div class='add'>+	case ATH12K_SCAN_RUNNING:</div><div class='add'>+	case ATH12K_SCAN_ABORTING:</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "received scan start failed event in an invalid scan state: %s (%d)\n",</div><div class='add'>+			    ath12k_scan_state_str(ar-&gt;scan.state),</div><div class='add'>+			    ar-&gt;scan.state);</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_SCAN_STARTING:</div><div class='add'>+		complete(&amp;ar-&gt;scan.started);</div><div class='add'>+		__ath12k_mac_scan_finish(ar);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_event_scan_completed(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	switch (ar-&gt;scan.state) {</div><div class='add'>+	case ATH12K_SCAN_IDLE:</div><div class='add'>+	case ATH12K_SCAN_STARTING:</div><div class='add'>+		/* One suspected reason scan can be completed while starting is</div><div class='add'>+		 * if firmware fails to deliver all scan events to the host,</div><div class='add'>+		 * e.g. when transport pipe is full. This has been observed</div><div class='add'>+		 * with spectral scan phyerr events starving wmi transport</div><div class='add'>+		 * pipe. In such case the "scan completed" event should be (and</div><div class='add'>+		 * is) ignored by the host as it may be just firmware's scan</div><div class='add'>+		 * state machine recovering.</div><div class='add'>+		 */</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "received scan completed event in an invalid scan state: %s (%d)\n",</div><div class='add'>+			    ath12k_scan_state_str(ar-&gt;scan.state),</div><div class='add'>+			    ar-&gt;scan.state);</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_SCAN_RUNNING:</div><div class='add'>+	case ATH12K_SCAN_ABORTING:</div><div class='add'>+		__ath12k_mac_scan_finish(ar);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_event_scan_bss_chan(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	switch (ar-&gt;scan.state) {</div><div class='add'>+	case ATH12K_SCAN_IDLE:</div><div class='add'>+	case ATH12K_SCAN_STARTING:</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "received scan bss chan event in an invalid scan state: %s (%d)\n",</div><div class='add'>+			    ath12k_scan_state_str(ar-&gt;scan.state),</div><div class='add'>+			    ar-&gt;scan.state);</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_SCAN_RUNNING:</div><div class='add'>+	case ATH12K_SCAN_ABORTING:</div><div class='add'>+		ar-&gt;scan_channel = NULL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_event_scan_foreign_chan(struct ath12k *ar, u32 freq)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = ath12k_ar_to_hw(ar);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	switch (ar-&gt;scan.state) {</div><div class='add'>+	case ATH12K_SCAN_IDLE:</div><div class='add'>+	case ATH12K_SCAN_STARTING:</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "received scan foreign chan event in an invalid scan state: %s (%d)\n",</div><div class='add'>+			    ath12k_scan_state_str(ar-&gt;scan.state),</div><div class='add'>+			    ar-&gt;scan.state);</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_SCAN_RUNNING:</div><div class='add'>+	case ATH12K_SCAN_ABORTING:</div><div class='add'>+		ar-&gt;scan_channel = ieee80211_get_channel(hw-&gt;wiphy, freq);</div><div class='add'>+</div><div class='add'>+		if (ar-&gt;scan.is_roc &amp;&amp; ar-&gt;scan.roc_freq == freq)</div><div class='add'>+			complete(&amp;ar-&gt;scan.on_channel);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *</div><div class='add'>+ath12k_wmi_event_scan_type_str(enum wmi_scan_event_type type,</div><div class='add'>+			       enum wmi_scan_completion_reason reason)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case WMI_SCAN_EVENT_STARTED:</div><div class='add'>+		return "started";</div><div class='add'>+	case WMI_SCAN_EVENT_COMPLETED:</div><div class='add'>+		switch (reason) {</div><div class='add'>+		case WMI_SCAN_REASON_COMPLETED:</div><div class='add'>+			return "completed";</div><div class='add'>+		case WMI_SCAN_REASON_CANCELLED:</div><div class='add'>+			return "completed [cancelled]";</div><div class='add'>+		case WMI_SCAN_REASON_PREEMPTED:</div><div class='add'>+			return "completed [preempted]";</div><div class='add'>+		case WMI_SCAN_REASON_TIMEDOUT:</div><div class='add'>+			return "completed [timedout]";</div><div class='add'>+		case WMI_SCAN_REASON_INTERNAL_FAILURE:</div><div class='add'>+			return "completed [internal err]";</div><div class='add'>+		case WMI_SCAN_REASON_MAX:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		return "completed [unknown]";</div><div class='add'>+	case WMI_SCAN_EVENT_BSS_CHANNEL:</div><div class='add'>+		return "bss channel";</div><div class='add'>+	case WMI_SCAN_EVENT_FOREIGN_CHAN:</div><div class='add'>+		return "foreign channel";</div><div class='add'>+	case WMI_SCAN_EVENT_DEQUEUED:</div><div class='add'>+		return "dequeued";</div><div class='add'>+	case WMI_SCAN_EVENT_PREEMPTED:</div><div class='add'>+		return "preempted";</div><div class='add'>+	case WMI_SCAN_EVENT_START_FAILED:</div><div class='add'>+		return "start failed";</div><div class='add'>+	case WMI_SCAN_EVENT_RESTARTED:</div><div class='add'>+		return "restarted";</div><div class='add'>+	case WMI_SCAN_EVENT_FOREIGN_CHAN_EXIT:</div><div class='add'>+		return "foreign channel exit";</div><div class='add'>+	default:</div><div class='add'>+		return "unknown";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pull_scan_ev(struct ath12k_base *ab, struct sk_buff *skb,</div><div class='add'>+			       struct wmi_scan_event *scan_evt_param)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_scan_event *ev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_SCAN_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch scan ev");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	scan_evt_param-&gt;event_type = ev-&gt;event_type;</div><div class='add'>+	scan_evt_param-&gt;reason = ev-&gt;reason;</div><div class='add'>+	scan_evt_param-&gt;channel_freq = ev-&gt;channel_freq;</div><div class='add'>+	scan_evt_param-&gt;scan_req_id = ev-&gt;scan_req_id;</div><div class='add'>+	scan_evt_param-&gt;scan_id = ev-&gt;scan_id;</div><div class='add'>+	scan_evt_param-&gt;vdev_id = ev-&gt;vdev_id;</div><div class='add'>+	scan_evt_param-&gt;tsf_timestamp = ev-&gt;tsf_timestamp;</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pull_peer_sta_kickout_ev(struct ath12k_base *ab, struct sk_buff *skb,</div><div class='add'>+					   struct wmi_peer_sta_kickout_arg *arg)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_peer_sta_kickout_event *ev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_PEER_STA_KICKOUT_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch peer sta kickout ev");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arg-&gt;mac_addr = ev-&gt;peer_macaddr.addr;</div><div class='add'>+	arg-&gt;reason = le32_to_cpu(ev-&gt;reason);</div><div class='add'>+	arg-&gt;rssi = le32_to_cpu(ev-&gt;rssi);</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pull_roam_ev(struct ath12k_base *ab, struct sk_buff *skb,</div><div class='add'>+			       struct wmi_roam_event *roam_ev)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_roam_event *ev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_ROAM_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch roam ev");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	roam_ev-&gt;vdev_id = ev-&gt;vdev_id;</div><div class='add'>+	roam_ev-&gt;reason = ev-&gt;reason;</div><div class='add'>+	roam_ev-&gt;rssi = ev-&gt;rssi;</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int freq_to_idx(struct ath12k *ar, int freq)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	struct ieee80211_hw *hw = ath12k_ar_to_hw(ar);</div><div class='add'>+	int band, ch, idx = 0;</div><div class='add'>+</div><div class='add'>+	for (band = NL80211_BAND_2GHZ; band &lt; NUM_NL80211_BANDS; band++) {</div><div class='add'>+		if (!ar-&gt;mac.sbands[band].channels)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		sband = hw-&gt;wiphy-&gt;bands[band];</div><div class='add'>+		if (!sband)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (ch = 0; ch &lt; sband-&gt;n_channels; ch++, idx++) {</div><div class='add'>+			if (sband-&gt;channels[ch].center_freq &lt;</div><div class='add'>+			    KHZ_TO_MHZ(ar-&gt;freq_range.start_freq) ||</div><div class='add'>+			    sband-&gt;channels[ch].center_freq &gt;</div><div class='add'>+			    KHZ_TO_MHZ(ar-&gt;freq_range.end_freq))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (sband-&gt;channels[ch].center_freq == freq)</div><div class='add'>+				goto exit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	return idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pull_chan_info_ev(struct ath12k_base *ab, struct sk_buff *skb,</div><div class='add'>+				    struct wmi_chan_info_event *ch_info_ev)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_chan_info_event *ev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_CHAN_INFO_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch chan info ev");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ch_info_ev-&gt;err_code = ev-&gt;err_code;</div><div class='add'>+	ch_info_ev-&gt;freq = ev-&gt;freq;</div><div class='add'>+	ch_info_ev-&gt;cmd_flags = ev-&gt;cmd_flags;</div><div class='add'>+	ch_info_ev-&gt;noise_floor = ev-&gt;noise_floor;</div><div class='add'>+	ch_info_ev-&gt;rx_clear_count = ev-&gt;rx_clear_count;</div><div class='add'>+	ch_info_ev-&gt;cycle_count = ev-&gt;cycle_count;</div><div class='add'>+	ch_info_ev-&gt;chan_tx_pwr_range = ev-&gt;chan_tx_pwr_range;</div><div class='add'>+	ch_info_ev-&gt;chan_tx_pwr_tp = ev-&gt;chan_tx_pwr_tp;</div><div class='add'>+	ch_info_ev-&gt;rx_frame_count = ev-&gt;rx_frame_count;</div><div class='add'>+	ch_info_ev-&gt;tx_frame_cnt = ev-&gt;tx_frame_cnt;</div><div class='add'>+	ch_info_ev-&gt;mac_clk_mhz = ev-&gt;mac_clk_mhz;</div><div class='add'>+	ch_info_ev-&gt;vdev_id = ev-&gt;vdev_id;</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_pull_pdev_bss_chan_info_ev(struct ath12k_base *ab, struct sk_buff *skb,</div><div class='add'>+				  struct wmi_pdev_bss_chan_info_event *bss_ch_info_ev)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_pdev_bss_chan_info_event *ev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_PDEV_BSS_CHAN_INFO_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch pdev bss chan info ev");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bss_ch_info_ev-&gt;pdev_id = ev-&gt;pdev_id;</div><div class='add'>+	bss_ch_info_ev-&gt;freq = ev-&gt;freq;</div><div class='add'>+	bss_ch_info_ev-&gt;noise_floor = ev-&gt;noise_floor;</div><div class='add'>+	bss_ch_info_ev-&gt;rx_clear_count_low = ev-&gt;rx_clear_count_low;</div><div class='add'>+	bss_ch_info_ev-&gt;rx_clear_count_high = ev-&gt;rx_clear_count_high;</div><div class='add'>+	bss_ch_info_ev-&gt;cycle_count_low = ev-&gt;cycle_count_low;</div><div class='add'>+	bss_ch_info_ev-&gt;cycle_count_high = ev-&gt;cycle_count_high;</div><div class='add'>+	bss_ch_info_ev-&gt;tx_cycle_count_low = ev-&gt;tx_cycle_count_low;</div><div class='add'>+	bss_ch_info_ev-&gt;tx_cycle_count_high = ev-&gt;tx_cycle_count_high;</div><div class='add'>+	bss_ch_info_ev-&gt;rx_cycle_count_low = ev-&gt;rx_cycle_count_low;</div><div class='add'>+	bss_ch_info_ev-&gt;rx_cycle_count_high = ev-&gt;rx_cycle_count_high;</div><div class='add'>+	bss_ch_info_ev-&gt;rx_bss_cycle_count_low = ev-&gt;rx_bss_cycle_count_low;</div><div class='add'>+	bss_ch_info_ev-&gt;rx_bss_cycle_count_high = ev-&gt;rx_bss_cycle_count_high;</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_pull_vdev_install_key_compl_ev(struct ath12k_base *ab, struct sk_buff *skb,</div><div class='add'>+				      struct wmi_vdev_install_key_complete_arg *arg)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_vdev_install_key_compl_event *ev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_VDEV_INSTALL_KEY_COMPLETE_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch vdev install key compl ev");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arg-&gt;vdev_id = le32_to_cpu(ev-&gt;vdev_id);</div><div class='add'>+	arg-&gt;macaddr = ev-&gt;peer_macaddr.addr;</div><div class='add'>+	arg-&gt;key_idx = le32_to_cpu(ev-&gt;key_idx);</div><div class='add'>+	arg-&gt;key_flags = le32_to_cpu(ev-&gt;key_flags);</div><div class='add'>+	arg-&gt;status = le32_to_cpu(ev-&gt;status);</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_pull_peer_assoc_conf_ev(struct ath12k_base *ab, struct sk_buff *skb,</div><div class='add'>+					  struct wmi_peer_assoc_conf_arg *peer_assoc_conf)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_peer_assoc_conf_event *ev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_PEER_ASSOC_CONF_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch peer assoc conf ev");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	peer_assoc_conf-&gt;vdev_id = le32_to_cpu(ev-&gt;vdev_id);</div><div class='add'>+	peer_assoc_conf-&gt;macaddr = ev-&gt;peer_macaddr.addr;</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_pull_pdev_temp_ev(struct ath12k_base *ab, struct sk_buff *skb,</div><div class='add'>+			 const struct wmi_pdev_temperature_event *ev)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_PDEV_TEMPERATURE_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch pdev temp ev");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_op_ep_tx_credits(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	/* try to send pending beacons first. they take priority */</div><div class='add'>+	wake_up(&amp;ab-&gt;wmi_ab.tx_credits_wq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_reg_11d_new_cc_event(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct wmi_11d_new_cc_event *ev;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_pdev *pdev;</div><div class='add'>+	const void **tb;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_11D_NEW_COUNTRY_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		kfree(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to fetch 11d new cc ev");</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	memcpy(&amp;ab-&gt;new_alpha2, &amp;ev-&gt;new_alpha2, REG_ALPHA2_LEN);</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI, "wmi 11d new cc %c%c\n",</div><div class='add'>+		   ab-&gt;new_alpha2[0],</div><div class='add'>+		   ab-&gt;new_alpha2[1]);</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		pdev = &amp;ab-&gt;pdevs[i];</div><div class='add'>+		ar = pdev-&gt;ar;</div><div class='add'>+		ar-&gt;state_11d = ATH12K_11D_IDLE;</div><div class='add'>+		ar-&gt;ah-&gt;regd_updated = false;</div><div class='add'>+		complete(&amp;ar-&gt;completed_11d_scan);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	queue_work(ab-&gt;workqueue, &amp;ab-&gt;update_11d_work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_htc_tx_complete(struct ath12k_base *ab,</div><div class='add'>+				       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_reg_chan_list_event(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_reg_info *reg_info;</div><div class='add'>+	struct ath12k *ar = NULL;</div><div class='add'>+	u8 pdev_idx = 255;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	reg_info = kzalloc(sizeof(*reg_info), GFP_ATOMIC);</div><div class='add'>+	if (!reg_info) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto fallback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_pull_reg_chan_list_ext_update_ev(ab, skb, reg_info);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to extract regulatory info from received event\n");</div><div class='add'>+		goto mem_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_reg_validate_reg_info(ab, reg_info);</div><div class='add'>+	if (ret == ATH12K_REG_STATUS_FALLBACK) {</div><div class='add'>+		ath12k_warn(ab, "failed to validate reg info %d\n", ret);</div><div class='add'>+		/* firmware has successfully switches to new regd but host can not</div><div class='add'>+		 * continue, so free reginfo and fallback to old regd</div><div class='add'>+		 */</div><div class='add'>+		goto mem_free;</div><div class='add'>+	} else if (ret == ATH12K_REG_STATUS_DROP) {</div><div class='add'>+		/* reg info is valid but we will not store it and</div><div class='add'>+		 * not going to create new regd for it</div><div class='add'>+		 */</div><div class='add'>+		ret = ATH12K_REG_STATUS_VALID;</div><div class='add'>+		goto mem_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* free old reg_info if it exist */</div><div class='add'>+	pdev_idx = reg_info-&gt;phy_id;</div><div class='add'>+	if (ab-&gt;reg_info[pdev_idx]) {</div><div class='add'>+		ath12k_reg_reset_reg_info(ab-&gt;reg_info[pdev_idx]);</div><div class='add'>+		kfree(ab-&gt;reg_info[pdev_idx]);</div><div class='add'>+	}</div><div class='add'>+	/* reg_info is valid, we store it for later use</div><div class='add'>+	 * even below regd build failed</div><div class='add'>+	 */</div><div class='add'>+	ab-&gt;reg_info[pdev_idx] = reg_info;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_reg_handle_chan_list(ab, reg_info, WMI_VDEV_TYPE_UNSPEC,</div><div class='add'>+					  IEEE80211_REG_UNSET_AP);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to handle chan list %d\n", ret);</div><div class='add'>+		goto fallback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+mem_free:</div><div class='add'>+	ath12k_reg_reset_reg_info(reg_info);</div><div class='add'>+	kfree(reg_info);</div><div class='add'>+</div><div class='add'>+	if (ret == ATH12K_REG_STATUS_VALID)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+fallback:</div><div class='add'>+	/* Fallback to older reg (by sending previous country setting</div><div class='add'>+	 * again if fw has succeeded and we failed to process here.</div><div class='add'>+	 * The Regdomain should be uniform across driver and fw. Since the</div><div class='add'>+	 * FW has processed the command and sent a success status, we expect</div><div class='add'>+	 * this function to succeed as well. If it doesn't, CTRY needs to be</div><div class='add'>+	 * reverted at the fw and the old SCAN_CHAN_LIST cmd needs to be sent.</div><div class='add'>+	 */</div><div class='add'>+	/* TODO: This is rare, but still should also be handled */</div><div class='add'>+	WARN_ON(1);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	/* In some error cases, even a valid pdev_idx might not be available */</div><div class='add'>+	if (pdev_idx != 255)</div><div class='add'>+		ar = ab-&gt;pdevs[pdev_idx].ar;</div><div class='add'>+</div><div class='add'>+	/* During the boot-time update, 'ar' might not be allocated,</div><div class='add'>+	 * so the completion cannot be marked at that point.</div><div class='add'>+	 * This boot-time update is handled in ath12k_mac_hw_register()</div><div class='add'>+	 * before registering the hardware.</div><div class='add'>+	 */</div><div class='add'>+	if (ar)</div><div class='add'>+		complete_all(&amp;ar-&gt;regd_update_completed);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_rdy_parse(struct ath12k_base *ab, u16 tag, u16 len,</div><div class='add'>+				const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_rdy_parse *rdy_parse = data;</div><div class='add'>+	struct wmi_ready_event fixed_param;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params *addr_list;</div><div class='add'>+	struct ath12k_pdev *pdev;</div><div class='add'>+	u32 num_mac_addr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	switch (tag) {</div><div class='add'>+	case WMI_TAG_READY_EVENT:</div><div class='add'>+		memset(&amp;fixed_param, 0, sizeof(fixed_param));</div><div class='add'>+		memcpy(&amp;fixed_param, (struct wmi_ready_event *)ptr,</div><div class='add'>+		       min_t(u16, sizeof(fixed_param), len));</div><div class='add'>+		ab-&gt;wlan_init_status = le32_to_cpu(fixed_param.ready_event_min.status);</div><div class='add'>+		rdy_parse-&gt;num_extra_mac_addr =</div><div class='add'>+			le32_to_cpu(fixed_param.ready_event_min.num_extra_mac_addr);</div><div class='add'>+</div><div class='add'>+		ether_addr_copy(ab-&gt;mac_addr,</div><div class='add'>+				fixed_param.ready_event_min.mac_addr.addr);</div><div class='add'>+		ab-&gt;pktlog_defs_checksum = le32_to_cpu(fixed_param.pktlog_defs_checksum);</div><div class='add'>+		ab-&gt;wmi_ready = true;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TAG_ARRAY_FIXED_STRUCT:</div><div class='add'>+		addr_list = (struct ath12k_wmi_mac_addr_params *)ptr;</div><div class='add'>+		num_mac_addr = rdy_parse-&gt;num_extra_mac_addr;</div><div class='add'>+</div><div class='add'>+		if (!(ab-&gt;num_radios &gt; 1 &amp;&amp; num_mac_addr &gt;= ab-&gt;num_radios))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+			pdev = &amp;ab-&gt;pdevs[i];</div><div class='add'>+			ether_addr_copy(pdev-&gt;mac_addr, addr_list[i].addr);</div><div class='add'>+		}</div><div class='add'>+		ab-&gt;pdevs_macaddr_valid = true;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_ready_event(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_rdy_parse rdy_parse = { };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_tlv_iter(ab, skb-&gt;data, skb-&gt;len,</div><div class='add'>+				  ath12k_wmi_rdy_parse, &amp;rdy_parse);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	complete(&amp;ab-&gt;wmi_ab.unified_ready);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_peer_delete_resp_event(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct wmi_peer_delete_resp_event peer_del_resp;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+</div><div class='add'>+	if (ath12k_pull_peer_del_resp_ev(ab, skb, &amp;peer_del_resp) != 0) {</div><div class='add'>+		ath12k_warn(ab, "failed to extract peer delete resp");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ar = ath12k_mac_get_ar_by_vdev_id(ab, le32_to_cpu(peer_del_resp.vdev_id));</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath12k_warn(ab, "invalid vdev id in peer delete resp ev %d",</div><div class='add'>+			    peer_del_resp.vdev_id);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	complete(&amp;ar-&gt;peer_delete_done);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI, "peer delete resp for vdev id %d addr %pM\n",</div><div class='add'>+		   peer_del_resp.vdev_id, peer_del_resp.peer_macaddr.addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_vdev_delete_resp_event(struct ath12k_base *ab,</div><div class='add'>+					  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	u32 vdev_id = 0;</div><div class='add'>+</div><div class='add'>+	if (ath12k_pull_vdev_del_resp_ev(ab, skb, &amp;vdev_id) != 0) {</div><div class='add'>+		ath12k_warn(ab, "failed to extract vdev delete resp");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ar = ath12k_mac_get_ar_by_vdev_id(ab, vdev_id);</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath12k_warn(ab, "invalid vdev id in vdev delete resp ev %d",</div><div class='add'>+			    vdev_id);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	complete(&amp;ar-&gt;vdev_delete_done);</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI, "vdev delete resp for vdev id %d\n",</div><div class='add'>+		   vdev_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *ath12k_wmi_vdev_resp_print(u32 vdev_resp_status)</div><div class='add'>+{</div><div class='add'>+	switch (vdev_resp_status) {</div><div class='add'>+	case WMI_VDEV_START_RESPONSE_INVALID_VDEVID:</div><div class='add'>+		return "invalid vdev id";</div><div class='add'>+	case WMI_VDEV_START_RESPONSE_NOT_SUPPORTED:</div><div class='add'>+		return "not supported";</div><div class='add'>+	case WMI_VDEV_START_RESPONSE_DFS_VIOLATION:</div><div class='add'>+		return "dfs violation";</div><div class='add'>+	case WMI_VDEV_START_RESPONSE_INVALID_REGDOMAIN:</div><div class='add'>+		return "invalid regdomain";</div><div class='add'>+	default:</div><div class='add'>+		return "unknown";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_vdev_start_resp_event(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct wmi_vdev_start_resp_event vdev_start_resp;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	u32 status;</div><div class='add'>+</div><div class='add'>+	if (ath12k_pull_vdev_start_resp_tlv(ab, skb, &amp;vdev_start_resp) != 0) {</div><div class='add'>+		ath12k_warn(ab, "failed to extract vdev start resp");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ar = ath12k_mac_get_ar_by_vdev_id(ab, le32_to_cpu(vdev_start_resp.vdev_id));</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath12k_warn(ab, "invalid vdev id in vdev start resp ev %d",</div><div class='add'>+			    vdev_start_resp.vdev_id);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;last_wmi_vdev_start_status = 0;</div><div class='add'>+</div><div class='add'>+	status = le32_to_cpu(vdev_start_resp.status);</div><div class='add'>+	if (WARN_ON_ONCE(status)) {</div><div class='add'>+		ath12k_warn(ab, "vdev start resp error status %d (%s)\n",</div><div class='add'>+			    status, ath12k_wmi_vdev_resp_print(status));</div><div class='add'>+		ar-&gt;last_wmi_vdev_start_status = status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;max_allowed_tx_power = (s8)le32_to_cpu(vdev_start_resp.max_allowed_tx_power);</div><div class='add'>+</div><div class='add'>+	complete(&amp;ar-&gt;vdev_setup_done);</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI, "vdev start resp for vdev id %d",</div><div class='add'>+		   vdev_start_resp.vdev_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_bcn_tx_status_event(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	u32 vdev_id, tx_status;</div><div class='add'>+</div><div class='add'>+	if (ath12k_pull_bcn_tx_status_ev(ab, skb, &amp;vdev_id, &amp;tx_status) != 0) {</div><div class='add'>+		ath12k_warn(ab, "failed to extract bcn tx status");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	guard(rcu)();</div><div class='add'>+</div><div class='add'>+	arvif = ath12k_mac_get_arvif_by_vdev_id(ab, vdev_id);</div><div class='add'>+	if (!arvif) {</div><div class='add'>+		ath12k_warn(ab, "invalid vdev %u in bcn tx status\n",</div><div class='add'>+			    vdev_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar = arvif-&gt;ar;</div><div class='add'>+	wiphy_work_queue(ath12k_ar_to_hw(ar)-&gt;wiphy, &amp;arvif-&gt;bcn_tx_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_vdev_stopped_event(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	u32 vdev_id = 0;</div><div class='add'>+</div><div class='add'>+	if (ath12k_pull_vdev_stopped_param_tlv(ab, skb, &amp;vdev_id) != 0) {</div><div class='add'>+		ath12k_warn(ab, "failed to extract vdev stopped event");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ar = ath12k_mac_get_ar_by_vdev_id(ab, vdev_id);</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath12k_warn(ab, "invalid vdev id in vdev stopped ev %d",</div><div class='add'>+			    vdev_id);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	complete(&amp;ar-&gt;vdev_setup_done);</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI, "vdev stopped for vdev id %d", vdev_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mgmt_rx_event(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_mgmt_rx_arg rx_ev = {};</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	u16 fc;</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	s32 noise_floor;</div><div class='add'>+</div><div class='add'>+	if (ath12k_pull_mgmt_rx_params_tlv(ab, skb, &amp;rx_ev) != 0) {</div><div class='add'>+		ath12k_warn(ab, "failed to extract mgmt rx event");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(status, 0, sizeof(*status));</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MGMT, "mgmt rx event status %08x\n",</div><div class='add'>+		   rx_ev.status);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ar = ath12k_mac_get_ar_by_pdev_id(ab, rx_ev.pdev_id);</div><div class='add'>+</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath12k_warn(ab, "invalid pdev_id %d in mgmt_rx_event\n",</div><div class='add'>+			    rx_ev.pdev_id);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((test_bit(ATH12K_FLAG_CAC_RUNNING, &amp;ar-&gt;dev_flags)) ||</div><div class='add'>+	    (rx_ev.status &amp; (WMI_RX_STATUS_ERR_DECRYPT |</div><div class='add'>+			     WMI_RX_STATUS_ERR_KEY_CACHE_MISS |</div><div class='add'>+			     WMI_RX_STATUS_ERR_CRC))) {</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rx_ev.status &amp; WMI_RX_STATUS_ERR_MIC)</div><div class='add'>+		status-&gt;flag |= RX_FLAG_MMIC_ERROR;</div><div class='add'>+</div><div class='add'>+	if (rx_ev.chan_freq &gt;= ATH12K_MIN_6GHZ_FREQ &amp;&amp;</div><div class='add'>+	    rx_ev.chan_freq &lt;= ATH12K_MAX_6GHZ_FREQ) {</div><div class='add'>+		status-&gt;band = NL80211_BAND_6GHZ;</div><div class='add'>+		status-&gt;freq = rx_ev.chan_freq;</div><div class='add'>+	} else if (rx_ev.channel &gt;= 1 &amp;&amp; rx_ev.channel &lt;= 14) {</div><div class='add'>+		status-&gt;band = NL80211_BAND_2GHZ;</div><div class='add'>+	} else if (rx_ev.channel &gt;= 36 &amp;&amp; rx_ev.channel &lt;= ATH12K_MAX_5GHZ_CHAN) {</div><div class='add'>+		status-&gt;band = NL80211_BAND_5GHZ;</div><div class='add'>+	} else {</div><div class='add'>+		/* Shouldn't happen unless list of advertised channels to</div><div class='add'>+		 * mac80211 has been changed.</div><div class='add'>+		 */</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rx_ev.phy_mode == MODE_11B &amp;&amp;</div><div class='add'>+	    (status-&gt;band == NL80211_BAND_5GHZ || status-&gt;band == NL80211_BAND_6GHZ))</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+			   "wmi mgmt rx 11b (CCK) on 5/6GHz, band = %d\n", status-&gt;band);</div><div class='add'>+</div><div class='add'>+	sband = &amp;ar-&gt;mac.sbands[status-&gt;band];</div><div class='add'>+</div><div class='add'>+	if (status-&gt;band != NL80211_BAND_6GHZ)</div><div class='add'>+		status-&gt;freq = ieee80211_channel_to_frequency(rx_ev.channel,</div><div class='add'>+							      status-&gt;band);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	noise_floor = ath12k_pdev_get_noise_floor(ar);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	status-&gt;signal = rx_ev.snr + noise_floor;</div><div class='add'>+	status-&gt;rate_idx = ath12k_mac_bitrate_to_idx(sband, rx_ev.rate / 100);</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	fc = le16_to_cpu(hdr-&gt;frame_control);</div><div class='add'>+</div><div class='add'>+	/* Firmware is guaranteed to report all essential management frames via</div><div class='add'>+	 * WMI while it can deliver some extra via HTT. Since there can be</div><div class='add'>+	 * duplicates split the reporting wrt monitor/sniffing.</div><div class='add'>+	 */</div><div class='add'>+	status-&gt;flag |= RX_FLAG_SKIP_MONITOR;</div><div class='add'>+</div><div class='add'>+	/* In case of PMF, FW delivers decrypted frames with Protected Bit set</div><div class='add'>+	 * including group privacy action frames.</div><div class='add'>+	 */</div><div class='add'>+	if (ieee80211_has_protected(hdr-&gt;frame_control)) {</div><div class='add'>+		status-&gt;flag |= RX_FLAG_DECRYPTED;</div><div class='add'>+</div><div class='add'>+		if (!ieee80211_is_robust_mgmt_frame(skb)) {</div><div class='add'>+			status-&gt;flag |= RX_FLAG_IV_STRIPPED |</div><div class='add'>+					RX_FLAG_MMIC_STRIPPED;</div><div class='add'>+			hdr-&gt;frame_control = __cpu_to_le16(fc &amp;</div><div class='add'>+					     ~IEEE80211_FCTL_PROTECTED);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_beacon(hdr-&gt;frame_control))</div><div class='add'>+		ath12k_mac_handle_beacon(ar, skb);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MGMT,</div><div class='add'>+		   "event mgmt rx skb %p len %d ftype %02x stype %02x\n",</div><div class='add'>+		   skb, skb-&gt;len,</div><div class='add'>+		   fc &amp; IEEE80211_FCTL_FTYPE, fc &amp; IEEE80211_FCTL_STYPE);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MGMT,</div><div class='add'>+		   "event mgmt rx freq %d band %d snr %d, rate_idx %d\n",</div><div class='add'>+		   status-&gt;freq, status-&gt;band, status-&gt;signal,</div><div class='add'>+		   status-&gt;rate_idx);</div><div class='add'>+</div><div class='add'>+	ieee80211_rx_ni(ath12k_ar_to_hw(ar), skb);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_mgmt_tx_compl_event(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct wmi_mgmt_tx_compl_event tx_compl_param = {};</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+</div><div class='add'>+	if (ath12k_pull_mgmt_tx_compl_param_tlv(ab, skb, &amp;tx_compl_param) != 0) {</div><div class='add'>+		ath12k_warn(ab, "failed to extract mgmt tx compl event");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ar = ath12k_mac_get_ar_by_pdev_id(ab, le32_to_cpu(tx_compl_param.pdev_id));</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath12k_warn(ab, "invalid pdev id %d in mgmt_tx_compl_event\n",</div><div class='add'>+			    tx_compl_param.pdev_id);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wmi_process_mgmt_tx_comp(ar, le32_to_cpu(tx_compl_param.desc_id),</div><div class='add'>+				 le32_to_cpu(tx_compl_param.status),</div><div class='add'>+				 le32_to_cpu(tx_compl_param.ack_rssi));</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MGMT,</div><div class='add'>+		   "mgmt tx compl ev pdev_id %d, desc_id %d, status %d",</div><div class='add'>+		   tx_compl_param.pdev_id, tx_compl_param.desc_id,</div><div class='add'>+		   tx_compl_param.status);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ath12k *ath12k_get_ar_on_scan_state(struct ath12k_base *ab,</div><div class='add'>+						  u32 vdev_id,</div><div class='add'>+						  enum ath12k_scan_state state)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct ath12k_pdev *pdev;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		pdev = rcu_dereference(ab-&gt;pdevs_active[i]);</div><div class='add'>+		if (pdev &amp;&amp; pdev-&gt;ar) {</div><div class='add'>+			ar = pdev-&gt;ar;</div><div class='add'>+</div><div class='add'>+			spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+			if (ar-&gt;scan.state == state &amp;&amp;</div><div class='add'>+			    ar-&gt;scan.arvif &amp;&amp;</div><div class='add'>+			    ar-&gt;scan.arvif-&gt;vdev_id == vdev_id) {</div><div class='add'>+				spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+				return ar;</div><div class='add'>+			}</div><div class='add'>+			spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_scan_event(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct wmi_scan_event scan_ev = {};</div><div class='add'>+</div><div class='add'>+	if (ath12k_pull_scan_ev(ab, skb, &amp;scan_ev) != 0) {</div><div class='add'>+		ath12k_warn(ab, "failed to extract scan event");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	/* In case the scan was cancelled, ex. during interface teardown,</div><div class='add'>+	 * the interface will not be found in active interfaces.</div><div class='add'>+	 * Rather, in such scenarios, iterate over the active pdev's to</div><div class='add'>+	 * search 'ar' if the corresponding 'ar' scan is ABORTING and the</div><div class='add'>+	 * aborting scan's vdev id matches this event info.</div><div class='add'>+	 */</div><div class='add'>+	if (le32_to_cpu(scan_ev.event_type) == WMI_SCAN_EVENT_COMPLETED &amp;&amp;</div><div class='add'>+	    le32_to_cpu(scan_ev.reason) == WMI_SCAN_REASON_CANCELLED) {</div><div class='add'>+		ar = ath12k_get_ar_on_scan_state(ab, le32_to_cpu(scan_ev.vdev_id),</div><div class='add'>+						 ATH12K_SCAN_ABORTING);</div><div class='add'>+		if (!ar)</div><div class='add'>+			ar = ath12k_get_ar_on_scan_state(ab, le32_to_cpu(scan_ev.vdev_id),</div><div class='add'>+							 ATH12K_SCAN_RUNNING);</div><div class='add'>+	} else {</div><div class='add'>+		ar = ath12k_mac_get_ar_by_vdev_id(ab, le32_to_cpu(scan_ev.vdev_id));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath12k_warn(ab, "Received scan event for unknown vdev");</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "scan event %s type %d reason %d freq %d req_id %d scan_id %d vdev_id %d state %s (%d)\n",</div><div class='add'>+		   ath12k_wmi_event_scan_type_str(le32_to_cpu(scan_ev.event_type),</div><div class='add'>+						  le32_to_cpu(scan_ev.reason)),</div><div class='add'>+		   le32_to_cpu(scan_ev.event_type),</div><div class='add'>+		   le32_to_cpu(scan_ev.reason),</div><div class='add'>+		   le32_to_cpu(scan_ev.channel_freq),</div><div class='add'>+		   le32_to_cpu(scan_ev.scan_req_id),</div><div class='add'>+		   le32_to_cpu(scan_ev.scan_id),</div><div class='add'>+		   le32_to_cpu(scan_ev.vdev_id),</div><div class='add'>+		   ath12k_scan_state_str(ar-&gt;scan.state), ar-&gt;scan.state);</div><div class='add'>+</div><div class='add'>+	switch (le32_to_cpu(scan_ev.event_type)) {</div><div class='add'>+	case WMI_SCAN_EVENT_STARTED:</div><div class='add'>+		ath12k_wmi_event_scan_started(ar);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_SCAN_EVENT_COMPLETED:</div><div class='add'>+		ath12k_wmi_event_scan_completed(ar);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_SCAN_EVENT_BSS_CHANNEL:</div><div class='add'>+		ath12k_wmi_event_scan_bss_chan(ar);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_SCAN_EVENT_FOREIGN_CHAN:</div><div class='add'>+		ath12k_wmi_event_scan_foreign_chan(ar, le32_to_cpu(scan_ev.channel_freq));</div><div class='add'>+		break;</div><div class='add'>+	case WMI_SCAN_EVENT_START_FAILED:</div><div class='add'>+		ath12k_warn(ab, "received scan start failure event\n");</div><div class='add'>+		ath12k_wmi_event_scan_start_failed(ar);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_SCAN_EVENT_DEQUEUED:</div><div class='add'>+		__ath12k_mac_scan_finish(ar);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_SCAN_EVENT_PREEMPTED:</div><div class='add'>+	case WMI_SCAN_EVENT_RESTARTED:</div><div class='add'>+	case WMI_SCAN_EVENT_FOREIGN_CHAN_EXIT:</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_peer_sta_kickout_event(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct wmi_peer_sta_kickout_arg arg = {};</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct ath12k_peer *peer;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+</div><div class='add'>+	if (ath12k_pull_peer_sta_kickout_ev(ab, skb, &amp;arg) != 0) {</div><div class='add'>+		ath12k_warn(ab, "failed to extract peer sta kickout event");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	peer = ath12k_peer_find_by_addr(ab, arg.mac_addr);</div><div class='add'>+</div><div class='add'>+	if (!peer) {</div><div class='add'>+		ath12k_warn(ab, "peer not found %pM\n",</div><div class='add'>+			    arg.mac_addr);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arvif = ath12k_mac_get_arvif_by_vdev_id(ab, peer-&gt;vdev_id);</div><div class='add'>+	if (!arvif) {</div><div class='add'>+		ath12k_warn(ab, "invalid vdev id in peer sta kickout ev %d",</div><div class='add'>+			    peer-&gt;vdev_id);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar = arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	if (peer-&gt;mlo) {</div><div class='add'>+		sta = ieee80211_find_sta_by_link_addrs(ath12k_ar_to_hw(ar),</div><div class='add'>+						       arg.mac_addr,</div><div class='add'>+						       NULL, &amp;link_id);</div><div class='add'>+		if (peer-&gt;link_id != link_id) {</div><div class='add'>+			ath12k_warn(ab,</div><div class='add'>+				    "Spurious quick kickout for MLO STA %pM with invalid link_id, peer: %d, sta: %d\n",</div><div class='add'>+				    arg.mac_addr, peer-&gt;link_id, link_id);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		sta = ieee80211_find_sta_by_ifaddr(ath12k_ar_to_hw(ar),</div><div class='add'>+						   arg.mac_addr, NULL);</div><div class='add'>+	}</div><div class='add'>+	if (!sta) {</div><div class='add'>+		ath12k_warn(ab, "Spurious quick kickout for %sSTA %pM\n",</div><div class='add'>+			    peer-&gt;mlo ? "MLO " : "", arg.mac_addr);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "peer sta kickout event %pM reason: %d rssi: %d\n",</div><div class='add'>+		   arg.mac_addr, arg.reason, arg.rssi);</div><div class='add'>+</div><div class='add'>+	switch (arg.reason) {</div><div class='add'>+	case WMI_PEER_STA_KICKOUT_REASON_INACTIVITY:</div><div class='add'>+		if (arvif-&gt;ahvif-&gt;vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='add'>+			ath12k_mac_handle_beacon_miss(ar, arvif);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		ieee80211_report_low_ack(sta, 10);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_roam_event(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct wmi_roam_event roam_ev = {};</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u8 roam_reason;</div><div class='add'>+</div><div class='add'>+	if (ath12k_pull_roam_ev(ab, skb, &amp;roam_ev) != 0) {</div><div class='add'>+		ath12k_warn(ab, "failed to extract roam event");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vdev_id = le32_to_cpu(roam_ev.vdev_id);</div><div class='add'>+	roam_reason = u32_get_bits(le32_to_cpu(roam_ev.reason),</div><div class='add'>+				   WMI_ROAM_REASON_MASK);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "wmi roam event vdev %u reason %d rssi %d\n",</div><div class='add'>+		   vdev_id, roam_reason, roam_ev.rssi);</div><div class='add'>+</div><div class='add'>+	guard(rcu)();</div><div class='add'>+	arvif = ath12k_mac_get_arvif_by_vdev_id(ab, vdev_id);</div><div class='add'>+	if (!arvif) {</div><div class='add'>+		ath12k_warn(ab, "invalid vdev id in roam ev %d", vdev_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar = arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	if (roam_reason &gt;= WMI_ROAM_REASON_MAX)</div><div class='add'>+		ath12k_warn(ab, "ignoring unknown roam event reason %d on vdev %i\n",</div><div class='add'>+			    roam_reason, vdev_id);</div><div class='add'>+</div><div class='add'>+	switch (roam_reason) {</div><div class='add'>+	case WMI_ROAM_REASON_BEACON_MISS:</div><div class='add'>+		ath12k_mac_handle_beacon_miss(ar, arvif);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_ROAM_REASON_BETTER_AP:</div><div class='add'>+	case WMI_ROAM_REASON_LOW_RSSI:</div><div class='add'>+	case WMI_ROAM_REASON_SUITABLE_AP_FOUND:</div><div class='add'>+	case WMI_ROAM_REASON_HO_FAILED:</div><div class='add'>+		ath12k_warn(ab, "ignoring not implemented roam event reason %d on vdev %i\n",</div><div class='add'>+			    roam_reason, vdev_id);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_chan_info_event(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct wmi_chan_info_event ch_info_ev = {};</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct survey_info *survey;</div><div class='add'>+	int idx;</div><div class='add'>+	/* HW channel counters frequency value in hertz */</div><div class='add'>+	u32 cc_freq_hz = ab-&gt;cc_freq_hz;</div><div class='add'>+</div><div class='add'>+	if (ath12k_pull_chan_info_ev(ab, skb, &amp;ch_info_ev) != 0) {</div><div class='add'>+		ath12k_warn(ab, "failed to extract chan info event");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "chan info vdev_id %d err_code %d freq %d cmd_flags %d noise_floor %d rx_clear_count %d cycle_count %d mac_clk_mhz %d\n",</div><div class='add'>+		   ch_info_ev.vdev_id, ch_info_ev.err_code, ch_info_ev.freq,</div><div class='add'>+		   ch_info_ev.cmd_flags, ch_info_ev.noise_floor,</div><div class='add'>+		   ch_info_ev.rx_clear_count, ch_info_ev.cycle_count,</div><div class='add'>+		   ch_info_ev.mac_clk_mhz);</div><div class='add'>+</div><div class='add'>+	if (le32_to_cpu(ch_info_ev.cmd_flags) == WMI_CHAN_INFO_END_RESP) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_WMI, "chan info report completed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ar = ath12k_mac_get_ar_by_vdev_id(ab, le32_to_cpu(ch_info_ev.vdev_id));</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath12k_warn(ab, "invalid vdev id in chan info ev %d",</div><div class='add'>+			    ch_info_ev.vdev_id);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	switch (ar-&gt;scan.state) {</div><div class='add'>+	case ATH12K_SCAN_IDLE:</div><div class='add'>+	case ATH12K_SCAN_STARTING:</div><div class='add'>+		ath12k_warn(ab, "received chan info event without a scan request, ignoring\n");</div><div class='add'>+		goto exit;</div><div class='add'>+	case ATH12K_SCAN_RUNNING:</div><div class='add'>+	case ATH12K_SCAN_ABORTING:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	idx = freq_to_idx(ar, le32_to_cpu(ch_info_ev.freq));</div><div class='add'>+	if (idx &gt;= ARRAY_SIZE(ar-&gt;survey)) {</div><div class='add'>+		ath12k_warn(ab, "chan info: invalid frequency %d (idx %d out of bounds)\n",</div><div class='add'>+			    ch_info_ev.freq, idx);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If FW provides MAC clock frequency in Mhz, overriding the initialized</div><div class='add'>+	 * HW channel counters frequency value</div><div class='add'>+	 */</div><div class='add'>+	if (ch_info_ev.mac_clk_mhz)</div><div class='add'>+		cc_freq_hz = (le32_to_cpu(ch_info_ev.mac_clk_mhz) * 1000);</div><div class='add'>+</div><div class='add'>+	if (ch_info_ev.cmd_flags == WMI_CHAN_INFO_START_RESP) {</div><div class='add'>+		survey = &amp;ar-&gt;survey[idx];</div><div class='add'>+		memset(survey, 0, sizeof(*survey));</div><div class='add'>+		survey-&gt;noise = le32_to_cpu(ch_info_ev.noise_floor);</div><div class='add'>+		survey-&gt;filled = SURVEY_INFO_NOISE_DBM | SURVEY_INFO_TIME |</div><div class='add'>+				 SURVEY_INFO_TIME_BUSY;</div><div class='add'>+		survey-&gt;time = div_u64(le32_to_cpu(ch_info_ev.cycle_count), cc_freq_hz);</div><div class='add'>+		survey-&gt;time_busy = div_u64(le32_to_cpu(ch_info_ev.rx_clear_count),</div><div class='add'>+					    cc_freq_hz);</div><div class='add'>+	}</div><div class='add'>+exit:</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_pdev_bss_chan_info_event(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct wmi_pdev_bss_chan_info_event bss_ch_info_ev = {};</div><div class='add'>+	struct survey_info *survey;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	u32 cc_freq_hz = ab-&gt;cc_freq_hz;</div><div class='add'>+	u64 busy, total, tx, rx, rx_bss;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	if (ath12k_pull_pdev_bss_chan_info_ev(ab, skb, &amp;bss_ch_info_ev) != 0) {</div><div class='add'>+		ath12k_warn(ab, "failed to extract pdev bss chan info event");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	busy = (u64)(le32_to_cpu(bss_ch_info_ev.rx_clear_count_high)) &lt;&lt; 32 |</div><div class='add'>+		le32_to_cpu(bss_ch_info_ev.rx_clear_count_low);</div><div class='add'>+</div><div class='add'>+	total = (u64)(le32_to_cpu(bss_ch_info_ev.cycle_count_high)) &lt;&lt; 32 |</div><div class='add'>+		le32_to_cpu(bss_ch_info_ev.cycle_count_low);</div><div class='add'>+</div><div class='add'>+	tx = (u64)(le32_to_cpu(bss_ch_info_ev.tx_cycle_count_high)) &lt;&lt; 32 |</div><div class='add'>+		le32_to_cpu(bss_ch_info_ev.tx_cycle_count_low);</div><div class='add'>+</div><div class='add'>+	rx = (u64)(le32_to_cpu(bss_ch_info_ev.rx_cycle_count_high)) &lt;&lt; 32 |</div><div class='add'>+		le32_to_cpu(bss_ch_info_ev.rx_cycle_count_low);</div><div class='add'>+</div><div class='add'>+	rx_bss = (u64)(le32_to_cpu(bss_ch_info_ev.rx_bss_cycle_count_high)) &lt;&lt; 32 |</div><div class='add'>+		le32_to_cpu(bss_ch_info_ev.rx_bss_cycle_count_low);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "pdev bss chan info:\n pdev_id: %d freq: %d noise: %d cycle: busy %llu total %llu tx %llu rx %llu rx_bss %llu\n",</div><div class='add'>+		   bss_ch_info_ev.pdev_id, bss_ch_info_ev.freq,</div><div class='add'>+		   bss_ch_info_ev.noise_floor, busy, total,</div><div class='add'>+		   tx, rx, rx_bss);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ar = ath12k_mac_get_ar_by_pdev_id(ab, le32_to_cpu(bss_ch_info_ev.pdev_id));</div><div class='add'>+</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath12k_warn(ab, "invalid pdev id %d in bss_chan_info event\n",</div><div class='add'>+			    bss_ch_info_ev.pdev_id);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	idx = freq_to_idx(ar, le32_to_cpu(bss_ch_info_ev.freq));</div><div class='add'>+	if (idx &gt;= ARRAY_SIZE(ar-&gt;survey)) {</div><div class='add'>+		ath12k_warn(ab, "bss chan info: invalid frequency %d (idx %d out of bounds)\n",</div><div class='add'>+			    bss_ch_info_ev.freq, idx);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	survey = &amp;ar-&gt;survey[idx];</div><div class='add'>+</div><div class='add'>+	survey-&gt;noise     = le32_to_cpu(bss_ch_info_ev.noise_floor);</div><div class='add'>+	survey-&gt;time      = div_u64(total, cc_freq_hz);</div><div class='add'>+	survey-&gt;time_busy = div_u64(busy, cc_freq_hz);</div><div class='add'>+	survey-&gt;time_rx   = div_u64(rx_bss, cc_freq_hz);</div><div class='add'>+	survey-&gt;time_tx   = div_u64(tx, cc_freq_hz);</div><div class='add'>+	survey-&gt;filled   |= (SURVEY_INFO_NOISE_DBM |</div><div class='add'>+			     SURVEY_INFO_TIME |</div><div class='add'>+			     SURVEY_INFO_TIME_BUSY |</div><div class='add'>+			     SURVEY_INFO_TIME_RX |</div><div class='add'>+			     SURVEY_INFO_TIME_TX);</div><div class='add'>+exit:</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	complete(&amp;ar-&gt;bss_survey_done);</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_vdev_install_key_compl_event(struct ath12k_base *ab,</div><div class='add'>+						struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct wmi_vdev_install_key_complete_arg install_key_compl = {};</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+</div><div class='add'>+	if (ath12k_pull_vdev_install_key_compl_ev(ab, skb, &amp;install_key_compl) != 0) {</div><div class='add'>+		ath12k_warn(ab, "failed to extract install key compl event");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "vdev install key ev idx %d flags %08x macaddr %pM status %d\n",</div><div class='add'>+		   install_key_compl.key_idx, install_key_compl.key_flags,</div><div class='add'>+		   install_key_compl.macaddr, install_key_compl.status);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ar = ath12k_mac_get_ar_by_vdev_id(ab, install_key_compl.vdev_id);</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath12k_warn(ab, "invalid vdev id in install key compl ev %d",</div><div class='add'>+			    install_key_compl.vdev_id);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;install_key_status = 0;</div><div class='add'>+</div><div class='add'>+	if (install_key_compl.status != WMI_VDEV_INSTALL_KEY_COMPL_STATUS_SUCCESS) {</div><div class='add'>+		ath12k_warn(ab, "install key failed for %pM status %d\n",</div><div class='add'>+			    install_key_compl.macaddr, install_key_compl.status);</div><div class='add'>+		ar-&gt;install_key_status = install_key_compl.status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	complete(&amp;ar-&gt;install_key_done);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_tlv_services_parser(struct ath12k_base *ab,</div><div class='add'>+					  u16 tag, u16 len,</div><div class='add'>+					  const void *ptr,</div><div class='add'>+					  void *data)</div><div class='add'>+{</div><div class='add'>+	const struct wmi_service_available_event *ev;</div><div class='add'>+	u16 wmi_ext2_service_words;</div><div class='add'>+	__le32 *wmi_ext2_service_bitmap;</div><div class='add'>+	int i, j;</div><div class='add'>+	u16 expected_len;</div><div class='add'>+</div><div class='add'>+	expected_len = WMI_SERVICE_SEGMENT_BM_SIZE32 * sizeof(u32);</div><div class='add'>+	if (len &lt; expected_len) {</div><div class='add'>+		ath12k_warn(ab, "invalid length %d for the WMI services available tag 0x%x\n",</div><div class='add'>+			    len, tag);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (tag) {</div><div class='add'>+	case WMI_TAG_SERVICE_AVAILABLE_EVENT:</div><div class='add'>+		ev = (struct wmi_service_available_event *)ptr;</div><div class='add'>+		for (i = 0, j = WMI_MAX_SERVICE;</div><div class='add'>+		     i &lt; WMI_SERVICE_SEGMENT_BM_SIZE32 &amp;&amp; j &lt; WMI_MAX_EXT_SERVICE;</div><div class='add'>+		     i++) {</div><div class='add'>+			do {</div><div class='add'>+				if (le32_to_cpu(ev-&gt;wmi_service_segment_bitmap[i]) &amp;</div><div class='add'>+				    BIT(j % WMI_AVAIL_SERVICE_BITS_IN_SIZE32))</div><div class='add'>+					set_bit(j, ab-&gt;wmi_ab.svc_map);</div><div class='add'>+			} while (++j % WMI_AVAIL_SERVICE_BITS_IN_SIZE32);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+			   "wmi_ext_service_bitmap 0x%x 0x%x 0x%x 0x%x",</div><div class='add'>+			   ev-&gt;wmi_service_segment_bitmap[0],</div><div class='add'>+			   ev-&gt;wmi_service_segment_bitmap[1],</div><div class='add'>+			   ev-&gt;wmi_service_segment_bitmap[2],</div><div class='add'>+			   ev-&gt;wmi_service_segment_bitmap[3]);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TAG_ARRAY_UINT32:</div><div class='add'>+		wmi_ext2_service_bitmap = (__le32 *)ptr;</div><div class='add'>+		wmi_ext2_service_words = len / sizeof(u32);</div><div class='add'>+		for (i = 0, j = WMI_MAX_EXT_SERVICE;</div><div class='add'>+		     i &lt; wmi_ext2_service_words &amp;&amp; j &lt; WMI_MAX_EXT2_SERVICE;</div><div class='add'>+		     i++) {</div><div class='add'>+			do {</div><div class='add'>+				if (__le32_to_cpu(wmi_ext2_service_bitmap[i]) &amp;</div><div class='add'>+				    BIT(j % WMI_AVAIL_SERVICE_BITS_IN_SIZE32))</div><div class='add'>+					set_bit(j, ab-&gt;wmi_ab.svc_map);</div><div class='add'>+			} while (++j % WMI_AVAIL_SERVICE_BITS_IN_SIZE32);</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+				   "wmi_ext2_service bitmap 0x%08x\n",</div><div class='add'>+				   __le32_to_cpu(wmi_ext2_service_bitmap[i]));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_service_available_event(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_tlv_iter(ab, skb-&gt;data, skb-&gt;len,</div><div class='add'>+				  ath12k_wmi_tlv_services_parser,</div><div class='add'>+				  NULL);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_peer_assoc_conf_event(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct wmi_peer_assoc_conf_arg peer_assoc_conf = {};</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+</div><div class='add'>+	if (ath12k_pull_peer_assoc_conf_ev(ab, skb, &amp;peer_assoc_conf) != 0) {</div><div class='add'>+		ath12k_warn(ab, "failed to extract peer assoc conf event");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "peer assoc conf ev vdev id %d macaddr %pM\n",</div><div class='add'>+		   peer_assoc_conf.vdev_id, peer_assoc_conf.macaddr);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ar = ath12k_mac_get_ar_by_vdev_id(ab, peer_assoc_conf.vdev_id);</div><div class='add'>+</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath12k_warn(ab, "invalid vdev id in peer assoc conf ev %d",</div><div class='add'>+			    peer_assoc_conf.vdev_id);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	complete(&amp;ar-&gt;peer_assoc_done);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_fw_vdev_stats_dump(struct ath12k *ar,</div><div class='add'>+			      struct ath12k_fw_stats *fw_stats,</div><div class='add'>+			      char *buf, u32 *length)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_fw_stats_vdev *vdev;</div><div class='add'>+	u32 buf_len = ATH12K_FW_STATS_BUF_SIZE;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	u32 len = *length;</div><div class='add'>+	u8 *vif_macaddr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s\n",</div><div class='add'>+			 "ath12k VDEV stats");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s\n\n",</div><div class='add'>+			 "=================");</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(vdev, &amp;fw_stats-&gt;vdevs, list) {</div><div class='add'>+		arvif = ath12k_mac_get_arvif(ar, vdev-&gt;vdev_id);</div><div class='add'>+		if (!arvif)</div><div class='add'>+			continue;</div><div class='add'>+		vif_macaddr = arvif-&gt;ahvif-&gt;vif-&gt;addr;</div><div class='add'>+</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%30s %u\n",</div><div class='add'>+				 "VDEV ID", vdev-&gt;vdev_id);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%30s %pM\n",</div><div class='add'>+				 "VDEV MAC address", vif_macaddr);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%30s %u\n",</div><div class='add'>+				 "beacon snr", vdev-&gt;beacon_snr);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%30s %u\n",</div><div class='add'>+				 "data snr", vdev-&gt;data_snr);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%30s %u\n",</div><div class='add'>+				 "num rx frames", vdev-&gt;num_rx_frames);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%30s %u\n",</div><div class='add'>+				 "num rts fail", vdev-&gt;num_rts_fail);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%30s %u\n",</div><div class='add'>+				 "num rts success", vdev-&gt;num_rts_success);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%30s %u\n",</div><div class='add'>+				 "num rx err", vdev-&gt;num_rx_err);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%30s %u\n",</div><div class='add'>+				 "num rx discard", vdev-&gt;num_rx_discard);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%30s %u\n",</div><div class='add'>+				 "num tx not acked", vdev-&gt;num_tx_not_acked);</div><div class='add'>+</div><div class='add'>+		for (i = 0 ; i &lt; WLAN_MAX_AC; i++)</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					"%25s [%02d] %u\n",</div><div class='add'>+					"num tx frames", i,</div><div class='add'>+					vdev-&gt;num_tx_frames[i]);</div><div class='add'>+</div><div class='add'>+		for (i = 0 ; i &lt; WLAN_MAX_AC; i++)</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					"%25s [%02d] %u\n",</div><div class='add'>+					"num tx frames retries", i,</div><div class='add'>+					vdev-&gt;num_tx_frames_retries[i]);</div><div class='add'>+</div><div class='add'>+		for (i = 0 ; i &lt; WLAN_MAX_AC; i++)</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					"%25s [%02d] %u\n",</div><div class='add'>+					"num tx frames failures", i,</div><div class='add'>+					vdev-&gt;num_tx_frames_failures[i]);</div><div class='add'>+</div><div class='add'>+		for (i = 0 ; i &lt; MAX_TX_RATE_VALUES; i++)</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					"%25s [%02d] 0x%08x\n",</div><div class='add'>+					"tx rate history", i,</div><div class='add'>+					vdev-&gt;tx_rate_history[i]);</div><div class='add'>+		for (i = 0 ; i &lt; MAX_TX_RATE_VALUES; i++)</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+					"%25s [%02d] %u\n",</div><div class='add'>+					"beacon rssi history", i,</div><div class='add'>+					vdev-&gt;beacon_rssi_history[i]);</div><div class='add'>+</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+		*length = len;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_fw_bcn_stats_dump(struct ath12k *ar,</div><div class='add'>+			     struct ath12k_fw_stats *fw_stats,</div><div class='add'>+			     char *buf, u32 *length)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_fw_stats_bcn *bcn;</div><div class='add'>+	u32 buf_len = ATH12K_FW_STATS_BUF_SIZE;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	u32 len = *length;</div><div class='add'>+	size_t num_bcn;</div><div class='add'>+</div><div class='add'>+	num_bcn = list_count_nodes(&amp;fw_stats-&gt;bcn);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s (%zu)\n",</div><div class='add'>+			 "ath12k Beacon stats", num_bcn);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s\n\n",</div><div class='add'>+			 "===================");</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(bcn, &amp;fw_stats-&gt;bcn, list) {</div><div class='add'>+		arvif = ath12k_mac_get_arvif(ar, bcn-&gt;vdev_id);</div><div class='add'>+		if (!arvif)</div><div class='add'>+			continue;</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%30s %u\n",</div><div class='add'>+				 "VDEV ID", bcn-&gt;vdev_id);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%30s %pM\n",</div><div class='add'>+				 "VDEV MAC address", arvif-&gt;ahvif-&gt;vif-&gt;addr);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%30s\n\n",</div><div class='add'>+				 "================");</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%30s %u\n",</div><div class='add'>+				 "Num of beacon tx success", bcn-&gt;tx_bcn_succ_cnt);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "%30s %u\n",</div><div class='add'>+				 "Num of beacon tx failures", bcn-&gt;tx_bcn_outage_cnt);</div><div class='add'>+</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+		*length = len;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_fw_pdev_base_stats_dump(const struct ath12k_fw_stats_pdev *pdev,</div><div class='add'>+				   char *buf, u32 *length, u64 fw_soc_drop_cnt)</div><div class='add'>+{</div><div class='add'>+	u32 len = *length;</div><div class='add'>+	u32 buf_len = ATH12K_FW_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	len = scnprintf(buf + len, buf_len - len, "\n");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s\n",</div><div class='add'>+			"ath12k PDEV stats");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s\n\n",</div><div class='add'>+			"=================");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			"Channel noise floor", pdev-&gt;ch_noise_floor);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			"Channel TX power", pdev-&gt;chan_tx_power);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			"TX frame count", pdev-&gt;tx_frame_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			"RX frame count", pdev-&gt;rx_frame_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			"RX clear count", pdev-&gt;rx_clear_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			"Cycle count", pdev-&gt;cycle_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			"PHY error count", pdev-&gt;phy_err_count);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10llu\n",</div><div class='add'>+			"soc drop count", fw_soc_drop_cnt);</div><div class='add'>+</div><div class='add'>+	*length = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_fw_pdev_tx_stats_dump(const struct ath12k_fw_stats_pdev *pdev,</div><div class='add'>+				 char *buf, u32 *length)</div><div class='add'>+{</div><div class='add'>+	u32 len = *length;</div><div class='add'>+	u32 buf_len = ATH12K_FW_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n%30s\n",</div><div class='add'>+			 "ath12k PDEV TX stats");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s\n\n",</div><div class='add'>+			 "====================");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "HTT cookies queued", pdev-&gt;comp_queued);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "HTT cookies disp.", pdev-&gt;comp_delivered);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "MSDU queued", pdev-&gt;msdu_enqued);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "MPDU queued", pdev-&gt;mpdu_enqued);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "MSDUs dropped", pdev-&gt;wmm_drop);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "Local enqued", pdev-&gt;local_enqued);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "Local freed", pdev-&gt;local_freed);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "HW queued", pdev-&gt;hw_queued);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "PPDUs reaped", pdev-&gt;hw_reaped);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "Num underruns", pdev-&gt;underrun);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "PPDUs cleaned", pdev-&gt;tx_abort);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "MPDUs requeued", pdev-&gt;mpdus_requed);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			 "Excessive retries", pdev-&gt;tx_ko);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			 "HW rate", pdev-&gt;data_rc);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			 "Sched self triggers", pdev-&gt;self_triggers);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			 "Dropped due to SW retries",</div><div class='add'>+			 pdev-&gt;sw_retry_failure);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			 "Illegal rate phy errors",</div><div class='add'>+			 pdev-&gt;illgl_rate_phy_err);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			 "PDEV continuous xretry", pdev-&gt;pdev_cont_xretry);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			 "TX timeout", pdev-&gt;pdev_tx_timeout);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			 "PDEV resets", pdev-&gt;pdev_resets);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			 "Stateless TIDs alloc failures",</div><div class='add'>+			 pdev-&gt;stateless_tid_alloc_failure);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			 "PHY underrun", pdev-&gt;phy_underrun);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",</div><div class='add'>+			 "MPDU is more than txop limit", pdev-&gt;txop_ovf);</div><div class='add'>+	*length = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_fw_pdev_rx_stats_dump(const struct ath12k_fw_stats_pdev *pdev,</div><div class='add'>+				 char *buf, u32 *length)</div><div class='add'>+{</div><div class='add'>+	u32 len = *length;</div><div class='add'>+	u32 buf_len = ATH12K_FW_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n%30s\n",</div><div class='add'>+			 "ath12k PDEV RX stats");</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s\n\n",</div><div class='add'>+			 "====================");</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "Mid PPDU route change",</div><div class='add'>+			 pdev-&gt;mid_ppdu_route_change);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "Tot. number of statuses", pdev-&gt;status_rcvd);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "Extra frags on rings 0", pdev-&gt;r0_frags);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "Extra frags on rings 1", pdev-&gt;r1_frags);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "Extra frags on rings 2", pdev-&gt;r2_frags);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "Extra frags on rings 3", pdev-&gt;r3_frags);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "MSDUs delivered to HTT", pdev-&gt;htt_msdus);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "MPDUs delivered to HTT", pdev-&gt;htt_mpdus);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "MSDUs delivered to stack", pdev-&gt;loc_msdus);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "MPDUs delivered to stack", pdev-&gt;loc_mpdus);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "Oversized AMSUs", pdev-&gt;oversize_amsdu);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "PHY errors", pdev-&gt;phy_errs);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "PHY errors drops", pdev-&gt;phy_err_drop);</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",</div><div class='add'>+			 "MPDU errors (FCS, MIC, ENC)", pdev-&gt;mpdu_errs);</div><div class='add'>+	*length = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_fw_pdev_stats_dump(struct ath12k *ar,</div><div class='add'>+			      struct ath12k_fw_stats *fw_stats,</div><div class='add'>+			      char *buf, u32 *length)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_fw_stats_pdev *pdev;</div><div class='add'>+	u32 len = *length;</div><div class='add'>+</div><div class='add'>+	pdev = list_first_entry_or_null(&amp;fw_stats-&gt;pdevs,</div><div class='add'>+					struct ath12k_fw_stats_pdev, list);</div><div class='add'>+	if (!pdev) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to get pdev stats\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_wmi_fw_pdev_base_stats_dump(pdev, buf, &amp;len,</div><div class='add'>+					   ar-&gt;ab-&gt;fw_soc_drop_count);</div><div class='add'>+	ath12k_wmi_fw_pdev_tx_stats_dump(pdev, buf, &amp;len);</div><div class='add'>+	ath12k_wmi_fw_pdev_rx_stats_dump(pdev, buf, &amp;len);</div><div class='add'>+</div><div class='add'>+	*length = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_wmi_fw_stats_dump(struct ath12k *ar,</div><div class='add'>+			      struct ath12k_fw_stats *fw_stats,</div><div class='add'>+			      u32 stats_id, char *buf)</div><div class='add'>+{</div><div class='add'>+	u32 len = 0;</div><div class='add'>+	u32 buf_len = ATH12K_FW_STATS_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	switch (stats_id) {</div><div class='add'>+	case WMI_REQUEST_VDEV_STAT:</div><div class='add'>+		ath12k_wmi_fw_vdev_stats_dump(ar, fw_stats, buf, &amp;len);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_REQUEST_BCN_STAT:</div><div class='add'>+		ath12k_wmi_fw_bcn_stats_dump(ar, fw_stats, buf, &amp;len);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_REQUEST_PDEV_STAT:</div><div class='add'>+		ath12k_wmi_fw_pdev_stats_dump(ar, fw_stats, buf, &amp;len);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	if (len &gt;= buf_len)</div><div class='add'>+		buf[len - 1] = 0;</div><div class='add'>+	else</div><div class='add'>+		buf[len] = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_pull_vdev_stats(const struct wmi_vdev_stats_params *src,</div><div class='add'>+			   struct ath12k_fw_stats_vdev *dst)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	dst-&gt;vdev_id = le32_to_cpu(src-&gt;vdev_id);</div><div class='add'>+	dst-&gt;beacon_snr = le32_to_cpu(src-&gt;beacon_snr);</div><div class='add'>+	dst-&gt;data_snr = le32_to_cpu(src-&gt;data_snr);</div><div class='add'>+	dst-&gt;num_rx_frames = le32_to_cpu(src-&gt;num_rx_frames);</div><div class='add'>+	dst-&gt;num_rts_fail = le32_to_cpu(src-&gt;num_rts_fail);</div><div class='add'>+	dst-&gt;num_rts_success = le32_to_cpu(src-&gt;num_rts_success);</div><div class='add'>+	dst-&gt;num_rx_err = le32_to_cpu(src-&gt;num_rx_err);</div><div class='add'>+	dst-&gt;num_rx_discard = le32_to_cpu(src-&gt;num_rx_discard);</div><div class='add'>+	dst-&gt;num_tx_not_acked = le32_to_cpu(src-&gt;num_tx_not_acked);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WLAN_MAX_AC; i++)</div><div class='add'>+		dst-&gt;num_tx_frames[i] =</div><div class='add'>+			le32_to_cpu(src-&gt;num_tx_frames[i]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WLAN_MAX_AC; i++)</div><div class='add'>+		dst-&gt;num_tx_frames_retries[i] =</div><div class='add'>+			le32_to_cpu(src-&gt;num_tx_frames_retries[i]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WLAN_MAX_AC; i++)</div><div class='add'>+		dst-&gt;num_tx_frames_failures[i] =</div><div class='add'>+			le32_to_cpu(src-&gt;num_tx_frames_failures[i]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_TX_RATE_VALUES; i++)</div><div class='add'>+		dst-&gt;tx_rate_history[i] =</div><div class='add'>+			le32_to_cpu(src-&gt;tx_rate_history[i]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_TX_RATE_VALUES; i++)</div><div class='add'>+		dst-&gt;beacon_rssi_history[i] =</div><div class='add'>+			le32_to_cpu(src-&gt;beacon_rssi_history[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_pull_bcn_stats(const struct ath12k_wmi_bcn_stats_params *src,</div><div class='add'>+			  struct ath12k_fw_stats_bcn *dst)</div><div class='add'>+{</div><div class='add'>+	dst-&gt;vdev_id = le32_to_cpu(src-&gt;vdev_id);</div><div class='add'>+	dst-&gt;tx_bcn_succ_cnt = le32_to_cpu(src-&gt;tx_bcn_succ_cnt);</div><div class='add'>+	dst-&gt;tx_bcn_outage_cnt = le32_to_cpu(src-&gt;tx_bcn_outage_cnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_pull_pdev_stats_base(const struct ath12k_wmi_pdev_base_stats_params *src,</div><div class='add'>+				struct ath12k_fw_stats_pdev *dst)</div><div class='add'>+{</div><div class='add'>+	dst-&gt;ch_noise_floor = a_sle32_to_cpu(src-&gt;chan_nf);</div><div class='add'>+	dst-&gt;tx_frame_count = __le32_to_cpu(src-&gt;tx_frame_count);</div><div class='add'>+	dst-&gt;rx_frame_count = __le32_to_cpu(src-&gt;rx_frame_count);</div><div class='add'>+	dst-&gt;rx_clear_count = __le32_to_cpu(src-&gt;rx_clear_count);</div><div class='add'>+	dst-&gt;cycle_count = __le32_to_cpu(src-&gt;cycle_count);</div><div class='add'>+	dst-&gt;phy_err_count = __le32_to_cpu(src-&gt;phy_err_count);</div><div class='add'>+	dst-&gt;chan_tx_power = __le32_to_cpu(src-&gt;chan_tx_pwr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_pull_pdev_stats_tx(const struct ath12k_wmi_pdev_tx_stats_params *src,</div><div class='add'>+			      struct ath12k_fw_stats_pdev *dst)</div><div class='add'>+{</div><div class='add'>+	dst-&gt;comp_queued = a_sle32_to_cpu(src-&gt;comp_queued);</div><div class='add'>+	dst-&gt;comp_delivered = a_sle32_to_cpu(src-&gt;comp_delivered);</div><div class='add'>+	dst-&gt;msdu_enqued = a_sle32_to_cpu(src-&gt;msdu_enqued);</div><div class='add'>+	dst-&gt;mpdu_enqued = a_sle32_to_cpu(src-&gt;mpdu_enqued);</div><div class='add'>+	dst-&gt;wmm_drop = a_sle32_to_cpu(src-&gt;wmm_drop);</div><div class='add'>+	dst-&gt;local_enqued = a_sle32_to_cpu(src-&gt;local_enqued);</div><div class='add'>+	dst-&gt;local_freed = a_sle32_to_cpu(src-&gt;local_freed);</div><div class='add'>+	dst-&gt;hw_queued = a_sle32_to_cpu(src-&gt;hw_queued);</div><div class='add'>+	dst-&gt;hw_reaped = a_sle32_to_cpu(src-&gt;hw_reaped);</div><div class='add'>+	dst-&gt;underrun = a_sle32_to_cpu(src-&gt;underrun);</div><div class='add'>+	dst-&gt;tx_abort = a_sle32_to_cpu(src-&gt;tx_abort);</div><div class='add'>+	dst-&gt;mpdus_requed = a_sle32_to_cpu(src-&gt;mpdus_requed);</div><div class='add'>+	dst-&gt;tx_ko = __le32_to_cpu(src-&gt;tx_ko);</div><div class='add'>+	dst-&gt;data_rc = __le32_to_cpu(src-&gt;data_rc);</div><div class='add'>+	dst-&gt;self_triggers = __le32_to_cpu(src-&gt;self_triggers);</div><div class='add'>+	dst-&gt;sw_retry_failure = __le32_to_cpu(src-&gt;sw_retry_failure);</div><div class='add'>+	dst-&gt;illgl_rate_phy_err = __le32_to_cpu(src-&gt;illgl_rate_phy_err);</div><div class='add'>+	dst-&gt;pdev_cont_xretry = __le32_to_cpu(src-&gt;pdev_cont_xretry);</div><div class='add'>+	dst-&gt;pdev_tx_timeout = __le32_to_cpu(src-&gt;pdev_tx_timeout);</div><div class='add'>+	dst-&gt;pdev_resets = __le32_to_cpu(src-&gt;pdev_resets);</div><div class='add'>+	dst-&gt;stateless_tid_alloc_failure =</div><div class='add'>+		__le32_to_cpu(src-&gt;stateless_tid_alloc_failure);</div><div class='add'>+	dst-&gt;phy_underrun = __le32_to_cpu(src-&gt;phy_underrun);</div><div class='add'>+	dst-&gt;txop_ovf = __le32_to_cpu(src-&gt;txop_ovf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_pull_pdev_stats_rx(const struct ath12k_wmi_pdev_rx_stats_params *src,</div><div class='add'>+			      struct ath12k_fw_stats_pdev *dst)</div><div class='add'>+{</div><div class='add'>+	dst-&gt;mid_ppdu_route_change =</div><div class='add'>+		a_sle32_to_cpu(src-&gt;mid_ppdu_route_change);</div><div class='add'>+	dst-&gt;status_rcvd = a_sle32_to_cpu(src-&gt;status_rcvd);</div><div class='add'>+	dst-&gt;r0_frags = a_sle32_to_cpu(src-&gt;r0_frags);</div><div class='add'>+	dst-&gt;r1_frags = a_sle32_to_cpu(src-&gt;r1_frags);</div><div class='add'>+	dst-&gt;r2_frags = a_sle32_to_cpu(src-&gt;r2_frags);</div><div class='add'>+	dst-&gt;r3_frags = a_sle32_to_cpu(src-&gt;r3_frags);</div><div class='add'>+	dst-&gt;htt_msdus = a_sle32_to_cpu(src-&gt;htt_msdus);</div><div class='add'>+	dst-&gt;htt_mpdus = a_sle32_to_cpu(src-&gt;htt_mpdus);</div><div class='add'>+	dst-&gt;loc_msdus = a_sle32_to_cpu(src-&gt;loc_msdus);</div><div class='add'>+	dst-&gt;loc_mpdus = a_sle32_to_cpu(src-&gt;loc_mpdus);</div><div class='add'>+	dst-&gt;oversize_amsdu = a_sle32_to_cpu(src-&gt;oversize_amsdu);</div><div class='add'>+	dst-&gt;phy_errs = a_sle32_to_cpu(src-&gt;phy_errs);</div><div class='add'>+	dst-&gt;phy_err_drop = a_sle32_to_cpu(src-&gt;phy_err_drop);</div><div class='add'>+	dst-&gt;mpdu_errs = a_sle32_to_cpu(src-&gt;mpdu_errs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_tlv_fw_stats_data_parse(struct ath12k_base *ab,</div><div class='add'>+					      struct wmi_tlv_fw_stats_parse *parse,</div><div class='add'>+					      const void *ptr,</div><div class='add'>+					      u16 len)</div><div class='add'>+{</div><div class='add'>+	const struct wmi_stats_event *ev = parse-&gt;ev;</div><div class='add'>+	struct ath12k_fw_stats *stats = parse-&gt;stats;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct ath12k_sta *ahsta;</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+	const void *data = ptr;</div><div class='add'>+</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch update stats ev");</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!stats)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	stats-&gt;pdev_id = le32_to_cpu(ev-&gt;pdev_id);</div><div class='add'>+	ar = ath12k_mac_get_ar_by_pdev_id(ab, stats-&gt;pdev_id);</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath12k_warn(ab, "invalid pdev id %d in update stats event\n",</div><div class='add'>+			    le32_to_cpu(ev-&gt;pdev_id));</div><div class='add'>+		ret = -EPROTO;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; le32_to_cpu(ev-&gt;num_vdev_stats); i++) {</div><div class='add'>+		const struct wmi_vdev_stats_params *src;</div><div class='add'>+		struct ath12k_fw_stats_vdev *dst;</div><div class='add'>+</div><div class='add'>+		src = data;</div><div class='add'>+		if (len &lt; sizeof(*src)) {</div><div class='add'>+			ret = -EPROTO;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		arvif = ath12k_mac_get_arvif(ar, le32_to_cpu(src-&gt;vdev_id));</div><div class='add'>+		if (arvif) {</div><div class='add'>+			sta = ieee80211_find_sta_by_ifaddr(ath12k_ar_to_hw(ar),</div><div class='add'>+							   arvif-&gt;bssid,</div><div class='add'>+							   NULL);</div><div class='add'>+			if (sta) {</div><div class='add'>+				ahsta = ath12k_sta_to_ahsta(sta);</div><div class='add'>+				arsta = &amp;ahsta-&gt;deflink;</div><div class='add'>+				arsta-&gt;rssi_beacon = le32_to_cpu(src-&gt;beacon_snr);</div><div class='add'>+				ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+					   "wmi stats vdev id %d snr %d\n",</div><div class='add'>+					   src-&gt;vdev_id, src-&gt;beacon_snr);</div><div class='add'>+			} else {</div><div class='add'>+				ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+					   "not found station bssid %pM for vdev stat\n",</div><div class='add'>+					   arvif-&gt;bssid);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		data += sizeof(*src);</div><div class='add'>+		len -= sizeof(*src);</div><div class='add'>+		dst = kzalloc(sizeof(*dst), GFP_ATOMIC);</div><div class='add'>+		if (!dst)</div><div class='add'>+			continue;</div><div class='add'>+		ath12k_wmi_pull_vdev_stats(src, dst);</div><div class='add'>+		stats-&gt;stats_id = WMI_REQUEST_VDEV_STAT;</div><div class='add'>+		list_add_tail(&amp;dst-&gt;list, &amp;stats-&gt;vdevs);</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; le32_to_cpu(ev-&gt;num_bcn_stats); i++) {</div><div class='add'>+		const struct ath12k_wmi_bcn_stats_params *src;</div><div class='add'>+		struct ath12k_fw_stats_bcn *dst;</div><div class='add'>+</div><div class='add'>+		src = data;</div><div class='add'>+		if (len &lt; sizeof(*src)) {</div><div class='add'>+			ret = -EPROTO;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		data += sizeof(*src);</div><div class='add'>+		len -= sizeof(*src);</div><div class='add'>+		dst = kzalloc(sizeof(*dst), GFP_ATOMIC);</div><div class='add'>+		if (!dst)</div><div class='add'>+			continue;</div><div class='add'>+		ath12k_wmi_pull_bcn_stats(src, dst);</div><div class='add'>+		stats-&gt;stats_id = WMI_REQUEST_BCN_STAT;</div><div class='add'>+		list_add_tail(&amp;dst-&gt;list, &amp;stats-&gt;bcn);</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; le32_to_cpu(ev-&gt;num_pdev_stats); i++) {</div><div class='add'>+		const struct ath12k_wmi_pdev_stats_params *src;</div><div class='add'>+		struct ath12k_fw_stats_pdev *dst;</div><div class='add'>+</div><div class='add'>+		src = data;</div><div class='add'>+		if (len &lt; sizeof(*src)) {</div><div class='add'>+			ret = -EPROTO;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		stats-&gt;stats_id = WMI_REQUEST_PDEV_STAT;</div><div class='add'>+</div><div class='add'>+		data += sizeof(*src);</div><div class='add'>+		len -= sizeof(*src);</div><div class='add'>+</div><div class='add'>+		dst = kzalloc(sizeof(*dst), GFP_ATOMIC);</div><div class='add'>+		if (!dst)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ath12k_wmi_pull_pdev_stats_base(&amp;src-&gt;base, dst);</div><div class='add'>+		ath12k_wmi_pull_pdev_stats_tx(&amp;src-&gt;tx, dst);</div><div class='add'>+		ath12k_wmi_pull_pdev_stats_rx(&amp;src-&gt;rx, dst);</div><div class='add'>+		list_add_tail(&amp;dst-&gt;list, &amp;stats-&gt;pdevs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_tlv_rssi_chain_parse(struct ath12k_base *ab,</div><div class='add'>+					   u16 tag, u16 len,</div><div class='add'>+					   const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	const struct wmi_rssi_stat_params *stats_rssi = ptr;</div><div class='add'>+	struct wmi_tlv_fw_stats_parse *parse = data;</div><div class='add'>+	const struct wmi_stats_event *ev = parse-&gt;ev;</div><div class='add'>+	struct ath12k_fw_stats *stats = parse-&gt;stats;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k_link_sta *arsta;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct ath12k_sta *ahsta;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int vdev_id;</div><div class='add'>+	int j;</div><div class='add'>+</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch update stats ev");</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tag != WMI_TAG_RSSI_STATS)</div><div class='add'>+		return -EPROTO;</div><div class='add'>+</div><div class='add'>+	if (!stats)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	stats-&gt;pdev_id = le32_to_cpu(ev-&gt;pdev_id);</div><div class='add'>+	vdev_id = le32_to_cpu(stats_rssi-&gt;vdev_id);</div><div class='add'>+	guard(rcu)();</div><div class='add'>+	ar = ath12k_mac_get_ar_by_pdev_id(ab, stats-&gt;pdev_id);</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath12k_warn(ab, "invalid pdev id %d in rssi chain parse\n",</div><div class='add'>+			    stats-&gt;pdev_id);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arvif = ath12k_mac_get_arvif(ar, vdev_id);</div><div class='add'>+	if (!arvif) {</div><div class='add'>+		ath12k_warn(ab, "not found vif for vdev id %d\n", vdev_id);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "stats bssid %pM vif %p\n",</div><div class='add'>+		   arvif-&gt;bssid, arvif-&gt;ahvif-&gt;vif);</div><div class='add'>+</div><div class='add'>+	sta = ieee80211_find_sta_by_ifaddr(ath12k_ar_to_hw(ar),</div><div class='add'>+					   arvif-&gt;bssid,</div><div class='add'>+					   NULL);</div><div class='add'>+	if (!sta) {</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+			   "not found station of bssid %pM for rssi chain\n",</div><div class='add'>+			   arvif-&gt;bssid);</div><div class='add'>+		return -EPROTO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ahsta = ath12k_sta_to_ahsta(sta);</div><div class='add'>+	arsta = &amp;ahsta-&gt;deflink;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(arsta-&gt;chain_signal) &gt;</div><div class='add'>+		     ARRAY_SIZE(stats_rssi-&gt;rssi_avg_beacon));</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; ARRAY_SIZE(arsta-&gt;chain_signal); j++)</div><div class='add'>+		arsta-&gt;chain_signal[j] = le32_to_cpu(stats_rssi-&gt;rssi_avg_beacon[j]);</div><div class='add'>+</div><div class='add'>+	stats-&gt;stats_id = WMI_REQUEST_RSSI_PER_CHAIN_STAT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_tlv_fw_stats_parse(struct ath12k_base *ab,</div><div class='add'>+					 u16 tag, u16 len,</div><div class='add'>+					 const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct wmi_tlv_fw_stats_parse *parse = data;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (tag) {</div><div class='add'>+	case WMI_TAG_STATS_EVENT:</div><div class='add'>+		parse-&gt;ev = ptr;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TAG_ARRAY_BYTE:</div><div class='add'>+		ret = ath12k_wmi_tlv_fw_stats_data_parse(ab, parse, ptr, len);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TAG_PER_CHAIN_RSSI_STATS:</div><div class='add'>+		parse-&gt;rssi = ptr;</div><div class='add'>+		if (le32_to_cpu(parse-&gt;ev-&gt;stats_id) &amp; WMI_REQUEST_RSSI_PER_CHAIN_STAT)</div><div class='add'>+			parse-&gt;rssi_num = le32_to_cpu(parse-&gt;rssi-&gt;num_per_chain_rssi);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TAG_ARRAY_STRUCT:</div><div class='add'>+		if (parse-&gt;rssi_num &amp;&amp; !parse-&gt;chain_rssi_done) {</div><div class='add'>+			ret = ath12k_wmi_tlv_iter(ab, ptr, len,</div><div class='add'>+						  ath12k_wmi_tlv_rssi_chain_parse,</div><div class='add'>+						  parse);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+</div><div class='add'>+			parse-&gt;chain_rssi_done = true;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_pull_fw_stats(struct ath12k_base *ab, struct sk_buff *skb,</div><div class='add'>+				    struct ath12k_fw_stats *stats)</div><div class='add'>+{</div><div class='add'>+	struct wmi_tlv_fw_stats_parse parse = {};</div><div class='add'>+</div><div class='add'>+	stats-&gt;stats_id = 0;</div><div class='add'>+	parse.stats = stats;</div><div class='add'>+</div><div class='add'>+	return ath12k_wmi_tlv_iter(ab, skb-&gt;data, skb-&gt;len,</div><div class='add'>+				   ath12k_wmi_tlv_fw_stats_parse,</div><div class='add'>+				   &amp;parse);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_fw_stats_process(struct ath12k *ar,</div><div class='add'>+					struct ath12k_fw_stats *stats)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	struct ath12k_pdev *pdev;</div><div class='add'>+	bool is_end = true;</div><div class='add'>+	size_t total_vdevs_started = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (stats-&gt;stats_id == WMI_REQUEST_VDEV_STAT) {</div><div class='add'>+		if (list_empty(&amp;stats-&gt;vdevs)) {</div><div class='add'>+			ath12k_warn(ab, "empty vdev stats");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		/* FW sends all the active VDEV stats irrespective of PDEV,</div><div class='add'>+		 * hence limit until the count of all VDEVs started</div><div class='add'>+		 */</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+			pdev = rcu_dereference(ab-&gt;pdevs_active[i]);</div><div class='add'>+			if (pdev &amp;&amp; pdev-&gt;ar)</div><div class='add'>+				total_vdevs_started += pdev-&gt;ar-&gt;num_started_vdevs;</div><div class='add'>+		}</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		if (total_vdevs_started)</div><div class='add'>+			is_end = ((++ar-&gt;fw_stats.num_vdev_recvd) ==</div><div class='add'>+				  total_vdevs_started);</div><div class='add'>+</div><div class='add'>+		list_splice_tail_init(&amp;stats-&gt;vdevs,</div><div class='add'>+				      &amp;ar-&gt;fw_stats.vdevs);</div><div class='add'>+</div><div class='add'>+		if (is_end)</div><div class='add'>+			complete(&amp;ar-&gt;fw_stats_done);</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (stats-&gt;stats_id == WMI_REQUEST_BCN_STAT) {</div><div class='add'>+		if (list_empty(&amp;stats-&gt;bcn)) {</div><div class='add'>+			ath12k_warn(ab, "empty beacon stats");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		list_splice_tail_init(&amp;stats-&gt;bcn,</div><div class='add'>+				      &amp;ar-&gt;fw_stats.bcn);</div><div class='add'>+		complete(&amp;ar-&gt;fw_stats_done);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_update_stats_event(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_fw_stats stats = {};</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;stats.pdevs);</div><div class='add'>+	INIT_LIST_HEAD(&amp;stats.vdevs);</div><div class='add'>+	INIT_LIST_HEAD(&amp;stats.bcn);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_pull_fw_stats(ab, skb, &amp;stats);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to pull fw stats: %d\n", ret);</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI, "event update stats");</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ar = ath12k_mac_get_ar_by_pdev_id(ab, stats.pdev_id);</div><div class='add'>+	if (!ar) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		ath12k_warn(ab, "failed to get ar for pdev_id %d: %d\n",</div><div class='add'>+			    stats.pdev_id, ret);</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	/* Handle WMI_REQUEST_PDEV_STAT status update */</div><div class='add'>+	if (stats.stats_id == WMI_REQUEST_PDEV_STAT) {</div><div class='add'>+		list_splice_tail_init(&amp;stats.pdevs, &amp;ar-&gt;fw_stats.pdevs);</div><div class='add'>+		complete(&amp;ar-&gt;fw_stats_done);</div><div class='add'>+		goto complete;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Handle WMI_REQUEST_RSSI_PER_CHAIN_STAT status update */</div><div class='add'>+	if (stats.stats_id == WMI_REQUEST_RSSI_PER_CHAIN_STAT) {</div><div class='add'>+		complete(&amp;ar-&gt;fw_stats_done);</div><div class='add'>+		goto complete;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Handle WMI_REQUEST_VDEV_STAT and WMI_REQUEST_BCN_STAT updates. */</div><div class='add'>+	ath12k_wmi_fw_stats_process(ar, &amp;stats);</div><div class='add'>+</div><div class='add'>+complete:</div><div class='add'>+	complete(&amp;ar-&gt;fw_stats_complete);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	/* Since the stats's pdev, vdev and beacon list are spliced and reinitialised</div><div class='add'>+	 * at this point, no need to free the individual list.</div><div class='add'>+	 */</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+free:</div><div class='add'>+	ath12k_fw_stats_free(&amp;stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* PDEV_CTL_FAILSAFE_CHECK_EVENT is received from FW when the frequency scanned</div><div class='add'>+ * is not part of BDF CTL(Conformance test limits) table entries.</div><div class='add'>+ */</div><div class='add'>+static void ath12k_pdev_ctl_failsafe_check_event(struct ath12k_base *ab,</div><div class='add'>+						 struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_pdev_ctl_failsafe_chk_event *ev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_PDEV_CTL_FAILSAFE_CHECK_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch pdev ctl failsafe check ev");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "pdev ctl failsafe check ev status %d\n",</div><div class='add'>+		   ev-&gt;ctl_failsafe_status);</div><div class='add'>+</div><div class='add'>+	/* If ctl_failsafe_status is set to 1 FW will max out the Transmit power</div><div class='add'>+	 * to 10 dBm else the CTL power entry in the BDF would be picked up.</div><div class='add'>+	 */</div><div class='add'>+	if (ev-&gt;ctl_failsafe_status != 0)</div><div class='add'>+		ath12k_warn(ab, "pdev ctl failsafe failure status %d",</div><div class='add'>+			    ev-&gt;ctl_failsafe_status);</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_process_csa_switch_count_event(struct ath12k_base *ab,</div><div class='add'>+					  const struct ath12k_wmi_pdev_csa_event *ev,</div><div class='add'>+					  const u32 *vdev_ids)</div><div class='add'>+{</div><div class='add'>+	u32 current_switch_count = le32_to_cpu(ev-&gt;current_switch_count);</div><div class='add'>+	u32 num_vdevs = le32_to_cpu(ev-&gt;num_vdevs);</div><div class='add'>+	struct ieee80211_bss_conf *conf;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k_vif *ahvif;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for (i = 0; i &lt; num_vdevs; i++) {</div><div class='add'>+		arvif = ath12k_mac_get_arvif_by_vdev_id(ab, vdev_ids[i]);</div><div class='add'>+</div><div class='add'>+		if (!arvif) {</div><div class='add'>+			ath12k_warn(ab, "Recvd csa status for unknown vdev %d",</div><div class='add'>+				    vdev_ids[i]);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		ahvif = arvif-&gt;ahvif;</div><div class='add'>+</div><div class='add'>+		if (arvif-&gt;link_id &gt;= IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+			ath12k_warn(ab, "Invalid CSA switch count even link id: %d\n",</div><div class='add'>+				    arvif-&gt;link_id);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		conf = rcu_dereference(ahvif-&gt;vif-&gt;link_conf[arvif-&gt;link_id]);</div><div class='add'>+		if (!conf) {</div><div class='add'>+			ath12k_warn(ab, "unable to access bss link conf in process csa for vif %pM link %u\n",</div><div class='add'>+				    ahvif-&gt;vif-&gt;addr, arvif-&gt;link_id);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!arvif-&gt;is_up || !conf-&gt;csa_active)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Finish CSA when counter reaches zero */</div><div class='add'>+		if (!current_switch_count) {</div><div class='add'>+			ieee80211_csa_finish(ahvif-&gt;vif, arvif-&gt;link_id);</div><div class='add'>+			arvif-&gt;current_cntdown_counter = 0;</div><div class='add'>+		} else if (current_switch_count &gt; 1) {</div><div class='add'>+			/* If the count in event is not what we expect, don't update the</div><div class='add'>+			 * mac80211 count. Since during beacon Tx failure, count in the</div><div class='add'>+			 * firmware will not decrement and this event will come with the</div><div class='add'>+			 * previous count value again</div><div class='add'>+			 */</div><div class='add'>+			if (current_switch_count != arvif-&gt;current_cntdown_counter)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			arvif-&gt;current_cntdown_counter =</div><div class='add'>+				ieee80211_beacon_update_cntdwn(ahvif-&gt;vif,</div><div class='add'>+							       arvif-&gt;link_id);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_pdev_csa_switch_count_status_event(struct ath12k_base *ab,</div><div class='add'>+					      struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct ath12k_wmi_pdev_csa_event *ev;</div><div class='add'>+	const u32 *vdev_ids;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_PDEV_CSA_SWITCH_COUNT_STATUS_EVENT];</div><div class='add'>+	vdev_ids = tb[WMI_TAG_ARRAY_UINT32];</div><div class='add'>+</div><div class='add'>+	if (!ev || !vdev_ids) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch pdev csa switch count ev");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "pdev csa switch count %d for pdev %d, num_vdevs %d",</div><div class='add'>+		   ev-&gt;current_switch_count, ev-&gt;pdev_id,</div><div class='add'>+		   ev-&gt;num_vdevs);</div><div class='add'>+</div><div class='add'>+	ath12k_wmi_process_csa_switch_count_event(ab, ev, vdev_ids);</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_pdev_dfs_radar_detected_event(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	struct ath12k_mac_get_any_chanctx_conf_arg arg;</div><div class='add'>+	const struct ath12k_wmi_pdev_radar_event *ev;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_PDEV_DFS_RADAR_DETECTION_EVENT];</div><div class='add'>+</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch pdev dfs radar detected ev");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "pdev dfs radar detected on pdev %d, detection mode %d, chan freq %d, chan_width %d, detector id %d, seg id %d, timestamp %d, chirp %d, freq offset %d, sidx %d",</div><div class='add'>+		   ev-&gt;pdev_id, ev-&gt;detection_mode, ev-&gt;chan_freq, ev-&gt;chan_width,</div><div class='add'>+		   ev-&gt;detector_id, ev-&gt;segment_id, ev-&gt;timestamp, ev-&gt;is_chirp,</div><div class='add'>+		   ev-&gt;freq_offset, ev-&gt;sidx);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	ar = ath12k_mac_get_ar_by_pdev_id(ab, le32_to_cpu(ev-&gt;pdev_id));</div><div class='add'>+</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath12k_warn(ab, "radar detected in invalid pdev %d\n",</div><div class='add'>+			    ev-&gt;pdev_id);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arg.ar = ar;</div><div class='add'>+	arg.chanctx_conf = NULL;</div><div class='add'>+	ieee80211_iter_chan_contexts_atomic(ath12k_ar_to_hw(ar),</div><div class='add'>+					    ath12k_mac_get_any_chanctx_conf_iter, &amp;arg);</div><div class='add'>+	if (!arg.chanctx_conf) {</div><div class='add'>+		ath12k_warn(ab, "failed to find valid chanctx_conf in radar detected event\n");</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_REG, "DFS Radar Detected in pdev %d\n",</div><div class='add'>+		   ev-&gt;pdev_id);</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;dfs_block_radar_events)</div><div class='add'>+		ath12k_info(ab, "DFS Radar detected, but ignored as requested\n");</div><div class='add'>+	else</div><div class='add'>+		ieee80211_radar_detected(ath12k_ar_to_hw(ar), arg.chanctx_conf);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_tm_wmi_event_segmented(struct ath12k_base *ab, u32 cmd_id,</div><div class='add'>+					  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_wmi_ftm_event *ev;</div><div class='add'>+	const void **tb;</div><div class='add'>+	int ret;</div><div class='add'>+	u16 length;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse ftm event tlv: %d\n", ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_ARRAY_BYTE];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch ftm msg\n");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	length = skb-&gt;len - TLV_HDR_SIZE;</div><div class='add'>+	ath12k_tm_process_event(ab, cmd_id, ev, length);</div><div class='add'>+	kfree(tb);</div><div class='add'>+	tb = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_pdev_temperature_event(struct ath12k_base *ab,</div><div class='add'>+				  struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	struct wmi_pdev_temperature_event ev = {};</div><div class='add'>+</div><div class='add'>+	if (ath12k_pull_pdev_temp_ev(ab, skb, &amp;ev) != 0) {</div><div class='add'>+		ath12k_warn(ab, "failed to extract pdev temperature event");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "pdev temperature ev temp %d pdev_id %d\n", ev.temp, ev.pdev_id);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	ar = ath12k_mac_get_ar_by_pdev_id(ab, le32_to_cpu(ev.pdev_id));</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath12k_warn(ab, "invalid pdev id in pdev temperature ev %d", ev.pdev_id);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_fils_discovery_event(struct ath12k_base *ab,</div><div class='add'>+					struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_fils_discovery_event *ev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "failed to parse FILS discovery event tlv %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_HOST_SWFDA_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch FILS discovery event\n");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_warn(ab,</div><div class='add'>+		    "FILS discovery frame expected from host for vdev_id: %u, transmission scheduled at %u, next TBTT: %u\n",</div><div class='add'>+		    ev-&gt;vdev_id, ev-&gt;fils_tt, ev-&gt;tbtt);</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_probe_resp_tx_status_event(struct ath12k_base *ab,</div><div class='add'>+					      struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_probe_resp_tx_status_event *ev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "failed to parse probe response transmission status event tlv: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_OFFLOAD_PRB_RSP_TX_STATUS_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "failed to fetch probe response transmission status event");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ev-&gt;tx_status)</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "Probe response transmission failed for vdev_id %u, status %u\n",</div><div class='add'>+			    ev-&gt;vdev_id, ev-&gt;tx_status);</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_p2p_noa_event(struct ath12k_base *ab,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_p2p_noa_event *ev;</div><div class='add'>+	const struct ath12k_wmi_p2p_noa_info *noa;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	int ret, vdev_id;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse P2P NoA TLV: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_P2P_NOA_EVENT];</div><div class='add'>+	noa = tb[WMI_TAG_P2P_NOA_INFO];</div><div class='add'>+</div><div class='add'>+	if (!ev || !noa) {</div><div class='add'>+		ret = -EPROTO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vdev_id = __le32_to_cpu(ev-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "wmi tlv p2p noa vdev_id %i descriptors %u\n",</div><div class='add'>+		   vdev_id, le32_get_bits(noa-&gt;noa_attr, WMI_P2P_NOA_INFO_DESC_NUM));</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ar = ath12k_mac_get_ar_by_vdev_id(ab, vdev_id);</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath12k_warn(ab, "invalid vdev id %d in P2P NoA event\n",</div><div class='add'>+			    vdev_id);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_p2p_noa_update_by_vdev_id(ar, vdev_id, noa);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+out:</div><div class='add'>+	kfree(tb);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_rfkill_state_change_event(struct ath12k_base *ab,</div><div class='add'>+					     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct wmi_rfkill_state_change_event *ev;</div><div class='add'>+	const void **tb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_RFKILL_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MAC,</div><div class='add'>+		   "wmi tlv rfkill state change gpio %d type %d radio_state %d\n",</div><div class='add'>+		   le32_to_cpu(ev-&gt;gpio_pin_num),</div><div class='add'>+		   le32_to_cpu(ev-&gt;int_type),</div><div class='add'>+		   le32_to_cpu(ev-&gt;radio_state));</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+	ab-&gt;rfkill_radio_on = (ev-&gt;radio_state == cpu_to_le32(WMI_RFKILL_RADIO_STATE_ON));</div><div class='add'>+	spin_unlock_bh(&amp;ab-&gt;base_lock);</div><div class='add'>+</div><div class='add'>+	queue_work(ab-&gt;workqueue, &amp;ab-&gt;rfkill_work);</div><div class='add'>+	kfree(tb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_diag_event(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	trace_ath12k_wmi_diag(ab, skb-&gt;data, skb-&gt;len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_twt_enable_event(struct ath12k_base *ab,</div><div class='add'>+					struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_twt_enable_event *ev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse wmi twt enable status event tlv: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_TWT_ENABLE_COMPLETE_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch twt enable wmi event\n");</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MAC, "wmi twt enable event pdev id %u status %u\n",</div><div class='add'>+		   le32_to_cpu(ev-&gt;pdev_id),</div><div class='add'>+		   le32_to_cpu(ev-&gt;status));</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	kfree(tb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_twt_disable_event(struct ath12k_base *ab,</div><div class='add'>+					 struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const void **tb;</div><div class='add'>+	const struct wmi_twt_disable_event *ev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse wmi twt disable status event tlv: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_TWT_DISABLE_COMPLETE_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch twt disable wmi event\n");</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_MAC, "wmi twt disable event pdev id %d status %u\n",</div><div class='add'>+		   le32_to_cpu(ev-&gt;pdev_id),</div><div class='add'>+		   le32_to_cpu(ev-&gt;status));</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	kfree(tb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_wow_wakeup_host_parse(struct ath12k_base *ab,</div><div class='add'>+					    u16 tag, u16 len,</div><div class='add'>+					    const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	const struct wmi_wow_ev_pg_fault_param *pf_param;</div><div class='add'>+	const struct wmi_wow_ev_param *param;</div><div class='add'>+	struct wmi_wow_ev_arg *arg = data;</div><div class='add'>+	int pf_len;</div><div class='add'>+</div><div class='add'>+	switch (tag) {</div><div class='add'>+	case WMI_TAG_WOW_EVENT_INFO:</div><div class='add'>+		param = ptr;</div><div class='add'>+		arg-&gt;wake_reason = le32_to_cpu(param-&gt;wake_reason);</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_WMI, "wow wakeup host reason %d %s\n",</div><div class='add'>+			   arg-&gt;wake_reason, wow_reason(arg-&gt;wake_reason));</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WMI_TAG_ARRAY_BYTE:</div><div class='add'>+		if (arg &amp;&amp; arg-&gt;wake_reason == WOW_REASON_PAGE_FAULT) {</div><div class='add'>+			pf_param = ptr;</div><div class='add'>+			pf_len = le32_to_cpu(pf_param-&gt;len);</div><div class='add'>+			if (pf_len &gt; len - sizeof(pf_len) ||</div><div class='add'>+			    pf_len &lt; 0) {</div><div class='add'>+				ath12k_warn(ab, "invalid wo reason page fault buffer len %d\n",</div><div class='add'>+					    pf_len);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_WMI, "wow_reason_page_fault len %d\n",</div><div class='add'>+				   pf_len);</div><div class='add'>+			ath12k_dbg_dump(ab, ATH12K_DBG_WMI,</div><div class='add'>+					"wow_reason_page_fault packet present",</div><div class='add'>+					"wow_pg_fault ",</div><div class='add'>+					pf_param-&gt;data,</div><div class='add'>+					pf_len);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_event_wow_wakeup_host(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct wmi_wow_ev_arg arg = { };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_tlv_iter(ab, skb-&gt;data, skb-&gt;len,</div><div class='add'>+				  ath12k_wmi_wow_wakeup_host_parse,</div><div class='add'>+				  &amp;arg);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to parse wmi wow wakeup host event tlv: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	complete(&amp;ab-&gt;wow.wakeup_completed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_gtk_offload_status_event(struct ath12k_base *ab,</div><div class='add'>+						struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct wmi_gtk_offload_status_event *ev;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	__be64 replay_ctr_be;</div><div class='add'>+	u64 replay_ctr;</div><div class='add'>+	const void **tb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse tlv: %d\n", ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_GTK_OFFLOAD_STATUS_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch gtk offload status ev");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	arvif = ath12k_mac_get_arvif_by_vdev_id(ab, le32_to_cpu(ev-&gt;vdev_id));</div><div class='add'>+	if (!arvif) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		ath12k_warn(ab, "failed to get arvif for vdev_id:%d\n",</div><div class='add'>+			    le32_to_cpu(ev-&gt;vdev_id));</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	replay_ctr = le64_to_cpu(ev-&gt;replay_ctr);</div><div class='add'>+	arvif-&gt;rekey_data.replay_ctr = replay_ctr;</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI, "wmi gtk offload event refresh_cnt %d replay_ctr %llu\n",</div><div class='add'>+		   le32_to_cpu(ev-&gt;refresh_cnt), replay_ctr);</div><div class='add'>+</div><div class='add'>+	/* supplicant expects big-endian replay counter */</div><div class='add'>+	replay_ctr_be = cpu_to_be64(replay_ctr);</div><div class='add'>+</div><div class='add'>+	ieee80211_gtk_rekey_notify(arvif-&gt;ahvif-&gt;vif, arvif-&gt;bssid,</div><div class='add'>+				   (void *)&amp;replay_ctr_be, GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_event_mlo_setup_complete(struct ath12k_base *ab,</div><div class='add'>+						struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct wmi_mlo_setup_complete_event *ev;</div><div class='add'>+	struct ath12k *ar = NULL;</div><div class='add'>+	struct ath12k_pdev *pdev;</div><div class='add'>+	const void **tb;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse mlo setup complete event tlv: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_MLO_SETUP_COMPLETE_EVENT];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch mlo setup complete event\n");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (le32_to_cpu(ev-&gt;pdev_id) &gt; ab-&gt;num_radios)</div><div class='add'>+		goto skip_lookup;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;num_radios; i++) {</div><div class='add'>+		pdev = &amp;ab-&gt;pdevs[i];</div><div class='add'>+		if (pdev &amp;&amp; pdev-&gt;pdev_id == le32_to_cpu(ev-&gt;pdev_id)) {</div><div class='add'>+			ar = pdev-&gt;ar;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+skip_lookup:</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath12k_warn(ab, "invalid pdev_id %d status %u in setup complete event\n",</div><div class='add'>+			    ev-&gt;pdev_id, ev-&gt;status);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;mlo_setup_status = le32_to_cpu(ev-&gt;status);</div><div class='add'>+	complete(&amp;ar-&gt;mlo_setup_done);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(tb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_event_teardown_complete(struct ath12k_base *ab,</div><div class='add'>+					       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct wmi_mlo_teardown_complete_event *ev;</div><div class='add'>+	const void **tb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tb = ath12k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);</div><div class='add'>+	if (IS_ERR(tb)) {</div><div class='add'>+		ret = PTR_ERR(tb);</div><div class='add'>+		ath12k_warn(ab, "failed to parse teardown complete event tlv: %d\n", ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev = tb[WMI_TAG_MLO_TEARDOWN_COMPLETE];</div><div class='add'>+	if (!ev) {</div><div class='add'>+		ath12k_warn(ab, "failed to fetch teardown complete event\n");</div><div class='add'>+		kfree(tb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(tb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ATH12K_DEBUGFS</div><div class='add'>+static int ath12k_wmi_tpc_stats_copy_buffer(struct ath12k_base *ab,</div><div class='add'>+					    const void *ptr, u16 tag, u16 len,</div><div class='add'>+					    struct wmi_tpc_stats_arg *tpc_stats)</div><div class='add'>+{</div><div class='add'>+	u32 len1, len2, len3, len4;</div><div class='add'>+	s16 *dst_ptr;</div><div class='add'>+	s8 *dst_ptr_ctl;</div><div class='add'>+</div><div class='add'>+	len1 = le32_to_cpu(tpc_stats-&gt;max_reg_allowed_power.tpc_reg_pwr.reg_array_len);</div><div class='add'>+	len2 = le32_to_cpu(tpc_stats-&gt;rates_array1.tpc_rates_array.rate_array_len);</div><div class='add'>+	len3 = le32_to_cpu(tpc_stats-&gt;rates_array2.tpc_rates_array.rate_array_len);</div><div class='add'>+	len4 = le32_to_cpu(tpc_stats-&gt;ctl_array.tpc_ctl_pwr.ctl_array_len);</div><div class='add'>+</div><div class='add'>+	switch (tpc_stats-&gt;event_count) {</div><div class='add'>+	case ATH12K_TPC_STATS_CONFIG_REG_PWR_EVENT:</div><div class='add'>+		if (len1 &gt; len)</div><div class='add'>+			return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+		if (tpc_stats-&gt;tlvs_rcvd &amp; WMI_TPC_REG_PWR_ALLOWED) {</div><div class='add'>+			dst_ptr = tpc_stats-&gt;max_reg_allowed_power.reg_pwr_array;</div><div class='add'>+			memcpy(dst_ptr, ptr, len1);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_TPC_STATS_RATES_EVENT1:</div><div class='add'>+		if (len2 &gt; len)</div><div class='add'>+			return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+		if (tpc_stats-&gt;tlvs_rcvd &amp; WMI_TPC_RATES_ARRAY1) {</div><div class='add'>+			dst_ptr = tpc_stats-&gt;rates_array1.rate_array;</div><div class='add'>+			memcpy(dst_ptr, ptr, len2);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_TPC_STATS_RATES_EVENT2:</div><div class='add'>+		if (len3 &gt; len)</div><div class='add'>+			return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+		if (tpc_stats-&gt;tlvs_rcvd &amp; WMI_TPC_RATES_ARRAY2) {</div><div class='add'>+			dst_ptr = tpc_stats-&gt;rates_array2.rate_array;</div><div class='add'>+			memcpy(dst_ptr, ptr, len3);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_TPC_STATS_CTL_TABLE_EVENT:</div><div class='add'>+		if (len4 &gt; len)</div><div class='add'>+			return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+		if (tpc_stats-&gt;tlvs_rcvd &amp; WMI_TPC_CTL_PWR_ARRAY) {</div><div class='add'>+			dst_ptr_ctl = tpc_stats-&gt;ctl_array.ctl_pwr_table;</div><div class='add'>+			memcpy(dst_ptr_ctl, ptr, len4);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_tpc_get_reg_pwr(struct ath12k_base *ab,</div><div class='add'>+				  struct wmi_tpc_stats_arg *tpc_stats,</div><div class='add'>+				  struct wmi_max_reg_power_fixed_params *ev)</div><div class='add'>+{</div><div class='add'>+	struct wmi_max_reg_power_allowed_arg *reg_pwr;</div><div class='add'>+	u32 total_size;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "Received reg power array type %d length %d for tpc stats\n",</div><div class='add'>+		   ev-&gt;reg_power_type, ev-&gt;reg_array_len);</div><div class='add'>+</div><div class='add'>+	switch (le32_to_cpu(ev-&gt;reg_power_type)) {</div><div class='add'>+	case TPC_STATS_REG_PWR_ALLOWED_TYPE:</div><div class='add'>+		reg_pwr = &amp;tpc_stats-&gt;max_reg_allowed_power;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Each entry is 2 byte hence multiplying the indices with 2 */</div><div class='add'>+	total_size = le32_to_cpu(ev-&gt;d1) * le32_to_cpu(ev-&gt;d2) *</div><div class='add'>+		     le32_to_cpu(ev-&gt;d3) * le32_to_cpu(ev-&gt;d4) * 2;</div><div class='add'>+	if (le32_to_cpu(ev-&gt;reg_array_len) != total_size) {</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "Total size and reg_array_len doesn't match for tpc stats\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;reg_pwr-&gt;tpc_reg_pwr, ev, sizeof(struct wmi_max_reg_power_fixed_params));</div><div class='add'>+</div><div class='add'>+	reg_pwr-&gt;reg_pwr_array = kzalloc(le32_to_cpu(reg_pwr-&gt;tpc_reg_pwr.reg_array_len),</div><div class='add'>+					 GFP_ATOMIC);</div><div class='add'>+	if (!reg_pwr-&gt;reg_pwr_array)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	tpc_stats-&gt;tlvs_rcvd |= WMI_TPC_REG_PWR_ALLOWED;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_tpc_get_rate_array(struct ath12k_base *ab,</div><div class='add'>+				     struct wmi_tpc_stats_arg *tpc_stats,</div><div class='add'>+				     struct wmi_tpc_rates_array_fixed_params *ev)</div><div class='add'>+{</div><div class='add'>+	struct wmi_tpc_rates_array_arg *rates_array;</div><div class='add'>+	u32 flag = 0, rate_array_len;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "Received rates array type %d length %d for tpc stats\n",</div><div class='add'>+		   ev-&gt;rate_array_type, ev-&gt;rate_array_len);</div><div class='add'>+</div><div class='add'>+	switch (le32_to_cpu(ev-&gt;rate_array_type)) {</div><div class='add'>+	case ATH12K_TPC_STATS_RATES_ARRAY1:</div><div class='add'>+		rates_array = &amp;tpc_stats-&gt;rates_array1;</div><div class='add'>+		flag = WMI_TPC_RATES_ARRAY1;</div><div class='add'>+		break;</div><div class='add'>+	case ATH12K_TPC_STATS_RATES_ARRAY2:</div><div class='add'>+		rates_array = &amp;tpc_stats-&gt;rates_array2;</div><div class='add'>+		flag = WMI_TPC_RATES_ARRAY2;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "Received invalid type of rates array for tpc stats\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	memcpy(&amp;rates_array-&gt;tpc_rates_array, ev,</div><div class='add'>+	       sizeof(struct wmi_tpc_rates_array_fixed_params));</div><div class='add'>+	rate_array_len = le32_to_cpu(rates_array-&gt;tpc_rates_array.rate_array_len);</div><div class='add'>+	rates_array-&gt;rate_array = kzalloc(rate_array_len, GFP_ATOMIC);</div><div class='add'>+	if (!rates_array-&gt;rate_array)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	tpc_stats-&gt;tlvs_rcvd |= flag;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_tpc_get_ctl_pwr_tbl(struct ath12k_base *ab,</div><div class='add'>+				      struct wmi_tpc_stats_arg *tpc_stats,</div><div class='add'>+				      struct wmi_tpc_ctl_pwr_fixed_params *ev)</div><div class='add'>+{</div><div class='add'>+	struct wmi_tpc_ctl_pwr_table_arg *ctl_array;</div><div class='add'>+	u32 total_size, ctl_array_len, flag = 0;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "Received ctl array type %d length %d for tpc stats\n",</div><div class='add'>+		   ev-&gt;ctl_array_type, ev-&gt;ctl_array_len);</div><div class='add'>+</div><div class='add'>+	switch (le32_to_cpu(ev-&gt;ctl_array_type)) {</div><div class='add'>+	case ATH12K_TPC_STATS_CTL_ARRAY:</div><div class='add'>+		ctl_array = &amp;tpc_stats-&gt;ctl_array;</div><div class='add'>+		flag = WMI_TPC_CTL_PWR_ARRAY;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "Received invalid type of ctl pwr table for tpc stats\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	total_size = le32_to_cpu(ev-&gt;d1) * le32_to_cpu(ev-&gt;d2) *</div><div class='add'>+		     le32_to_cpu(ev-&gt;d3) * le32_to_cpu(ev-&gt;d4);</div><div class='add'>+	if (le32_to_cpu(ev-&gt;ctl_array_len) != total_size) {</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "Total size and ctl_array_len doesn't match for tpc stats\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;ctl_array-&gt;tpc_ctl_pwr, ev, sizeof(struct wmi_tpc_ctl_pwr_fixed_params));</div><div class='add'>+	ctl_array_len = le32_to_cpu(ctl_array-&gt;tpc_ctl_pwr.ctl_array_len);</div><div class='add'>+	ctl_array-&gt;ctl_pwr_table = kzalloc(ctl_array_len, GFP_ATOMIC);</div><div class='add'>+	if (!ctl_array-&gt;ctl_pwr_table)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	tpc_stats-&gt;tlvs_rcvd |= flag;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_tpc_stats_subtlv_parser(struct ath12k_base *ab,</div><div class='add'>+					      u16 tag, u16 len,</div><div class='add'>+					      const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct wmi_tpc_rates_array_fixed_params *tpc_rates_array;</div><div class='add'>+	struct wmi_max_reg_power_fixed_params *tpc_reg_pwr;</div><div class='add'>+	struct wmi_tpc_ctl_pwr_fixed_params *tpc_ctl_pwr;</div><div class='add'>+	struct wmi_tpc_stats_arg *tpc_stats = data;</div><div class='add'>+	struct wmi_tpc_config_params *tpc_config;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!tpc_stats) {</div><div class='add'>+		ath12k_warn(ab, "tpc stats memory unavailable\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (tag) {</div><div class='add'>+	case WMI_TAG_TPC_STATS_CONFIG_EVENT:</div><div class='add'>+		tpc_config = (struct wmi_tpc_config_params *)ptr;</div><div class='add'>+		memcpy(&amp;tpc_stats-&gt;tpc_config, tpc_config,</div><div class='add'>+		       sizeof(struct wmi_tpc_config_params));</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TAG_TPC_STATS_REG_PWR_ALLOWED:</div><div class='add'>+		tpc_reg_pwr = (struct wmi_max_reg_power_fixed_params *)ptr;</div><div class='add'>+		ret = ath12k_tpc_get_reg_pwr(ab, tpc_stats, tpc_reg_pwr);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TAG_TPC_STATS_RATES_ARRAY:</div><div class='add'>+		tpc_rates_array = (struct wmi_tpc_rates_array_fixed_params *)ptr;</div><div class='add'>+		ret = ath12k_tpc_get_rate_array(ab, tpc_stats, tpc_rates_array);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TAG_TPC_STATS_CTL_PWR_TABLE_EVENT:</div><div class='add'>+		tpc_ctl_pwr = (struct wmi_tpc_ctl_pwr_fixed_params *)ptr;</div><div class='add'>+		ret = ath12k_tpc_get_ctl_pwr_tbl(ab, tpc_stats, tpc_ctl_pwr);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "Received invalid tag for tpc stats in subtlvs\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wmi_tpc_stats_event_parser(struct ath12k_base *ab,</div><div class='add'>+					     u16 tag, u16 len,</div><div class='add'>+					     const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct wmi_tpc_stats_arg *tpc_stats = (struct wmi_tpc_stats_arg *)data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (tag) {</div><div class='add'>+	case WMI_TAG_HALPHY_CTRL_PATH_EVENT_FIXED_PARAM:</div><div class='add'>+		ret = 0;</div><div class='add'>+		/* Fixed param is already processed*/</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TAG_ARRAY_STRUCT:</div><div class='add'>+		/* len 0 is expected for array of struct when there</div><div class='add'>+		 * is no content of that type to pack inside that tlv</div><div class='add'>+		 */</div><div class='add'>+		if (len == 0)</div><div class='add'>+			return 0;</div><div class='add'>+		ret = ath12k_wmi_tlv_iter(ab, ptr, len,</div><div class='add'>+					  ath12k_wmi_tpc_stats_subtlv_parser,</div><div class='add'>+					  tpc_stats);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TAG_ARRAY_INT16:</div><div class='add'>+		if (len == 0)</div><div class='add'>+			return 0;</div><div class='add'>+		ret = ath12k_wmi_tpc_stats_copy_buffer(ab, ptr,</div><div class='add'>+						       WMI_TAG_ARRAY_INT16,</div><div class='add'>+						       len, tpc_stats);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TAG_ARRAY_BYTE:</div><div class='add'>+		if (len == 0)</div><div class='add'>+			return 0;</div><div class='add'>+		ret = ath12k_wmi_tpc_stats_copy_buffer(ab, ptr,</div><div class='add'>+						       WMI_TAG_ARRAY_BYTE,</div><div class='add'>+						       len, tpc_stats);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_warn(ab, "Received invalid tag for tpc stats\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_wmi_free_tpc_stats_mem(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct wmi_tpc_stats_arg *tpc_stats = ar-&gt;debug.tpc_stats;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;data_lock);</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI, "tpc stats mem free\n");</div><div class='add'>+	if (tpc_stats) {</div><div class='add'>+		kfree(tpc_stats-&gt;max_reg_allowed_power.reg_pwr_array);</div><div class='add'>+		kfree(tpc_stats-&gt;rates_array1.rate_array);</div><div class='add'>+		kfree(tpc_stats-&gt;rates_array2.rate_array);</div><div class='add'>+		kfree(tpc_stats-&gt;ctl_array.ctl_pwr_table);</div><div class='add'>+		kfree(tpc_stats);</div><div class='add'>+		ar-&gt;debug.tpc_stats = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_process_tpc_stats(struct ath12k_base *ab,</div><div class='add'>+					 struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev_tpc_stats_event_fixed_params *fixed_param;</div><div class='add'>+	struct wmi_tpc_stats_arg *tpc_stats;</div><div class='add'>+	const struct wmi_tlv *tlv;</div><div class='add'>+	void *ptr = skb-&gt;data;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	u16 tlv_tag;</div><div class='add'>+	u32 event_count;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!skb-&gt;data) {</div><div class='add'>+		ath12k_warn(ab, "No data present in tpc stats event\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &lt; (sizeof(*fixed_param) + TLV_HDR_SIZE)) {</div><div class='add'>+		ath12k_warn(ab, "TPC stats event size invalid\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tlv = (struct wmi_tlv *)ptr;</div><div class='add'>+	tlv_tag = le32_get_bits(tlv-&gt;header, WMI_TLV_TAG);</div><div class='add'>+	ptr += sizeof(*tlv);</div><div class='add'>+</div><div class='add'>+	if (tlv_tag != WMI_TAG_HALPHY_CTRL_PATH_EVENT_FIXED_PARAM) {</div><div class='add'>+		ath12k_warn(ab, "TPC stats without fixed param tlv at start\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fixed_param = (struct ath12k_wmi_pdev_tpc_stats_event_fixed_params *)ptr;</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ar = ath12k_mac_get_ar_by_pdev_id(ab, le32_to_cpu(fixed_param-&gt;pdev_id) + 1);</div><div class='add'>+	if (!ar) {</div><div class='add'>+		ath12k_warn(ab, "Failed to get ar for tpc stats\n");</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	if (!ar-&gt;debug.tpc_request) {</div><div class='add'>+		/* Event is received either without request or the</div><div class='add'>+		 * timeout, if memory is already allocated free it</div><div class='add'>+		 */</div><div class='add'>+		if (ar-&gt;debug.tpc_stats) {</div><div class='add'>+			ath12k_warn(ab, "Freeing memory for tpc_stats\n");</div><div class='add'>+			ath12k_wmi_free_tpc_stats_mem(ar);</div><div class='add'>+		}</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	event_count = le32_to_cpu(fixed_param-&gt;event_count);</div><div class='add'>+	if (event_count == 0) {</div><div class='add'>+		if (ar-&gt;debug.tpc_stats) {</div><div class='add'>+			ath12k_warn(ab,</div><div class='add'>+				    "Invalid tpc memory present\n");</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+		ar-&gt;debug.tpc_stats =</div><div class='add'>+			kzalloc(sizeof(struct wmi_tpc_stats_arg),</div><div class='add'>+				GFP_ATOMIC);</div><div class='add'>+		if (!ar-&gt;debug.tpc_stats) {</div><div class='add'>+			ath12k_warn(ab,</div><div class='add'>+				    "Failed to allocate memory for tpc stats\n");</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tpc_stats = ar-&gt;debug.tpc_stats;</div><div class='add'>+	if (!tpc_stats) {</div><div class='add'>+		ath12k_warn(ab, "tpc stats memory unavailable\n");</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(event_count == 0)) {</div><div class='add'>+		if (event_count != tpc_stats-&gt;event_count + 1) {</div><div class='add'>+			ath12k_warn(ab,</div><div class='add'>+				    "Invalid tpc event received\n");</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	tpc_stats-&gt;pdev_id = le32_to_cpu(fixed_param-&gt;pdev_id);</div><div class='add'>+	tpc_stats-&gt;end_of_event = le32_to_cpu(fixed_param-&gt;end_of_event);</div><div class='add'>+	tpc_stats-&gt;event_count = le32_to_cpu(fixed_param-&gt;event_count);</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "tpc stats event_count %d\n",</div><div class='add'>+		   tpc_stats-&gt;event_count);</div><div class='add'>+	ret = ath12k_wmi_tlv_iter(ab, skb-&gt;data, skb-&gt;len,</div><div class='add'>+				  ath12k_wmi_tpc_stats_event_parser,</div><div class='add'>+				  tpc_stats);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_wmi_free_tpc_stats_mem(ar);</div><div class='add'>+		ath12k_warn(ab, "failed to parse tpc_stats tlv: %d\n", ret);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tpc_stats-&gt;end_of_event)</div><div class='add'>+		complete(&amp;ar-&gt;debug.tpc_complete);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void ath12k_wmi_process_tpc_stats(struct ath12k_base *ab,</div><div class='add'>+					 struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_wmi_rssi_dbm_conv_info_evt_subtlv_parser(struct ath12k_base *ab,</div><div class='add'>+						u16 tag, u16 len,</div><div class='add'>+						const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	const struct ath12k_wmi_rssi_dbm_conv_temp_info_params *temp_info;</div><div class='add'>+	const struct ath12k_wmi_rssi_dbm_conv_info_params *param_info;</div><div class='add'>+	struct ath12k_wmi_rssi_dbm_conv_info_arg *rssi_info = data;</div><div class='add'>+	struct ath12k_wmi_rssi_dbm_conv_param_arg param_arg;</div><div class='add'>+	s32 nf_hw_dbm[ATH12K_MAX_NUM_NF_HW_DBM];</div><div class='add'>+	u8 num_20mhz_segments;</div><div class='add'>+	s8 min_nf, *nf_ptr;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	switch (tag) {</div><div class='add'>+	case WMI_TAG_RSSI_DBM_CONVERSION_PARAMS_INFO:</div><div class='add'>+		if (len &lt; sizeof(*param_info)) {</div><div class='add'>+			ath12k_warn(ab,</div><div class='add'>+				    "RSSI dbm conv subtlv 0x%x invalid len %d rcvd",</div><div class='add'>+				    tag, len);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		param_info = ptr;</div><div class='add'>+</div><div class='add'>+		param_arg.curr_bw = le32_to_cpu(param_info-&gt;curr_bw);</div><div class='add'>+		param_arg.curr_rx_chainmask = le32_to_cpu(param_info-&gt;curr_rx_chainmask);</div><div class='add'>+</div><div class='add'>+		/* The received array is actually a 2D byte-array for per chain,</div><div class='add'>+		 * per 20MHz subband. Convert to 2D byte-array</div><div class='add'>+		 */</div><div class='add'>+		nf_ptr = &amp;param_arg.nf_hw_dbm[0][0];</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ATH12K_MAX_NUM_NF_HW_DBM; i++) {</div><div class='add'>+			nf_hw_dbm[i] = a_sle32_to_cpu(param_info-&gt;nf_hw_dbm[i]);</div><div class='add'>+</div><div class='add'>+			for (j = 0; j &lt; 4; j++) {</div><div class='add'>+				*nf_ptr = (nf_hw_dbm[i] &gt;&gt; (j * 8)) &amp; 0xFF;</div><div class='add'>+				nf_ptr++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (param_arg.curr_bw) {</div><div class='add'>+		case WMI_CHAN_WIDTH_20:</div><div class='add'>+			num_20mhz_segments = 1;</div><div class='add'>+			break;</div><div class='add'>+		case WMI_CHAN_WIDTH_40:</div><div class='add'>+			num_20mhz_segments = 2;</div><div class='add'>+			break;</div><div class='add'>+		case WMI_CHAN_WIDTH_80:</div><div class='add'>+			num_20mhz_segments = 4;</div><div class='add'>+			break;</div><div class='add'>+		case WMI_CHAN_WIDTH_160:</div><div class='add'>+			num_20mhz_segments = 8;</div><div class='add'>+			break;</div><div class='add'>+		case WMI_CHAN_WIDTH_320:</div><div class='add'>+			num_20mhz_segments = 16;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ath12k_warn(ab, "Invalid current bandwidth %d in RSSI dbm event",</div><div class='add'>+				    param_arg.curr_bw);</div><div class='add'>+			/* In error case, still consider the primary 20 MHz segment since</div><div class='add'>+			 * that would be much better than instead of dropping the whole</div><div class='add'>+			 * event</div><div class='add'>+			 */</div><div class='add'>+			num_20mhz_segments = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		min_nf = ATH12K_DEFAULT_NOISE_FLOOR;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ATH12K_MAX_NUM_ANTENNA; i++) {</div><div class='add'>+			if (!(param_arg.curr_rx_chainmask &amp; BIT(i)))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			for (j = 0; j &lt; num_20mhz_segments; j++) {</div><div class='add'>+				if (param_arg.nf_hw_dbm[i][j] &lt; min_nf)</div><div class='add'>+					min_nf = param_arg.nf_hw_dbm[i][j];</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rssi_info-&gt;min_nf_dbm = min_nf;</div><div class='add'>+		rssi_info-&gt;nf_dbm_present = true;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TAG_RSSI_DBM_CONVERSION_TEMP_OFFSET_INFO:</div><div class='add'>+		if (len &lt; sizeof(*temp_info)) {</div><div class='add'>+			ath12k_warn(ab,</div><div class='add'>+				    "RSSI dbm conv subtlv 0x%x invalid len %d rcvd",</div><div class='add'>+				    tag, len);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		temp_info = ptr;</div><div class='add'>+		rssi_info-&gt;temp_offset = a_sle32_to_cpu(temp_info-&gt;offset);</div><div class='add'>+		rssi_info-&gt;temp_offset_present = true;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+			   "Unknown subtlv 0x%x in RSSI dbm conversion event\n", tag);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_wmi_rssi_dbm_conv_info_event_parser(struct ath12k_base *ab,</div><div class='add'>+					   u16 tag, u16 len,</div><div class='add'>+					   const void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (tag) {</div><div class='add'>+	case WMI_TAG_RSSI_DBM_CONVERSION_PARAMS_INFO_FIXED_PARAM:</div><div class='add'>+		/* Fixed param is already processed*/</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TAG_ARRAY_STRUCT:</div><div class='add'>+		/* len 0 is expected for array of struct when there</div><div class='add'>+		 * is no content of that type inside that tlv</div><div class='add'>+		 */</div><div class='add'>+		if (len == 0)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		ret = ath12k_wmi_tlv_iter(ab, ptr, len,</div><div class='add'>+					  ath12k_wmi_rssi_dbm_conv_info_evt_subtlv_parser,</div><div class='add'>+					  data);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+			   "Received invalid tag 0x%x for RSSI dbm conv info event\n",</div><div class='add'>+			   tag);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_wmi_rssi_dbm_conv_info_process_fixed_param(struct ath12k_base *ab, u8 *ptr,</div><div class='add'>+						  size_t len, int *pdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_rssi_dbm_conv_info_fixed_params *fixed_param;</div><div class='add'>+	const struct wmi_tlv *tlv;</div><div class='add'>+	u16 tlv_tag;</div><div class='add'>+</div><div class='add'>+	if (len &lt; (sizeof(*fixed_param) + TLV_HDR_SIZE)) {</div><div class='add'>+		ath12k_warn(ab, "invalid RSSI dbm conv event size %zu\n", len);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tlv = (struct wmi_tlv *)ptr;</div><div class='add'>+	tlv_tag = le32_get_bits(tlv-&gt;header, WMI_TLV_TAG);</div><div class='add'>+	ptr += sizeof(*tlv);</div><div class='add'>+</div><div class='add'>+	if (tlv_tag != WMI_TAG_RSSI_DBM_CONVERSION_PARAMS_INFO_FIXED_PARAM) {</div><div class='add'>+		ath12k_warn(ab, "RSSI dbm conv event received without fixed param tlv\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fixed_param = (struct ath12k_wmi_rssi_dbm_conv_info_fixed_params *)ptr;</div><div class='add'>+	*pdev_id = le32_to_cpu(fixed_param-&gt;pdev_id);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_update_rssi_offsets(struct ath12k *ar,</div><div class='add'>+			       struct ath12k_wmi_rssi_dbm_conv_info_arg *rssi_info)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_pdev_rssi_offsets *info = &amp;ar-&gt;rssi_info;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	if (rssi_info-&gt;temp_offset_present)</div><div class='add'>+		info-&gt;temp_offset = rssi_info-&gt;temp_offset;</div><div class='add'>+</div><div class='add'>+	if (rssi_info-&gt;nf_dbm_present)</div><div class='add'>+		info-&gt;min_nf_dbm = rssi_info-&gt;min_nf_dbm;</div><div class='add'>+</div><div class='add'>+	info-&gt;noise_floor = info-&gt;min_nf_dbm + info-&gt;temp_offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ath12k_wmi_rssi_dbm_conversion_params_info_event(struct ath12k_base *ab,</div><div class='add'>+						 struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_rssi_dbm_conv_info_arg rssi_info;</div><div class='add'>+	struct ath12k *ar;</div><div class='add'>+	s32 noise_floor;</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_rssi_dbm_conv_info_process_fixed_param(ab, skb-&gt;data, skb-&gt;len,</div><div class='add'>+								&amp;pdev_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to parse fixed param in RSSI dbm conv event: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ar = ath12k_mac_get_ar_by_pdev_id(ab, pdev_id);</div><div class='add'>+	/* If pdev is not active, ignore the event */</div><div class='add'>+	if (!ar)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_tlv_iter(ab, skb-&gt;data, skb-&gt;len,</div><div class='add'>+				  ath12k_wmi_rssi_dbm_conv_info_event_parser,</div><div class='add'>+				  &amp;rssi_info);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "unable to parse RSSI dbm conversion event\n");</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+	ath12k_wmi_update_rssi_offsets(ar, &amp;rssi_info);</div><div class='add'>+	noise_floor = ath12k_pdev_get_noise_floor(ar);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;data_lock);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "RSSI noise floor updated, new value is %d dbm\n", noise_floor);</div><div class='add'>+out_unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_op_rx(struct ath12k_base *ab, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct wmi_cmd_hdr *cmd_hdr;</div><div class='add'>+	enum wmi_tlv_event_id id;</div><div class='add'>+</div><div class='add'>+	cmd_hdr = (struct wmi_cmd_hdr *)skb-&gt;data;</div><div class='add'>+	id = le32_get_bits(cmd_hdr-&gt;cmd_id, WMI_CMD_HDR_CMD_ID);</div><div class='add'>+</div><div class='add'>+	if (!skb_pull(skb, sizeof(struct wmi_cmd_hdr)))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	switch (id) {</div><div class='add'>+		/* Process all the WMI events here */</div><div class='add'>+	case WMI_SERVICE_READY_EVENTID:</div><div class='add'>+		ath12k_service_ready_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_SERVICE_READY_EXT_EVENTID:</div><div class='add'>+		ath12k_service_ready_ext_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_SERVICE_READY_EXT2_EVENTID:</div><div class='add'>+		ath12k_service_ready_ext2_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_REG_CHAN_LIST_CC_EXT_EVENTID:</div><div class='add'>+		ath12k_reg_chan_list_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_READY_EVENTID:</div><div class='add'>+		ath12k_ready_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_PEER_DELETE_RESP_EVENTID:</div><div class='add'>+		ath12k_peer_delete_resp_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_VDEV_START_RESP_EVENTID:</div><div class='add'>+		ath12k_vdev_start_resp_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_OFFLOAD_BCN_TX_STATUS_EVENTID:</div><div class='add'>+		ath12k_bcn_tx_status_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_VDEV_STOPPED_EVENTID:</div><div class='add'>+		ath12k_vdev_stopped_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_MGMT_RX_EVENTID:</div><div class='add'>+		ath12k_mgmt_rx_event(ab, skb);</div><div class='add'>+		/* mgmt_rx_event() owns the skb now! */</div><div class='add'>+		return;</div><div class='add'>+	case WMI_MGMT_TX_COMPLETION_EVENTID:</div><div class='add'>+		ath12k_mgmt_tx_compl_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_SCAN_EVENTID:</div><div class='add'>+		ath12k_scan_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_PEER_STA_KICKOUT_EVENTID:</div><div class='add'>+		ath12k_peer_sta_kickout_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_ROAM_EVENTID:</div><div class='add'>+		ath12k_roam_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_CHAN_INFO_EVENTID:</div><div class='add'>+		ath12k_chan_info_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_PDEV_BSS_CHAN_INFO_EVENTID:</div><div class='add'>+		ath12k_pdev_bss_chan_info_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_VDEV_INSTALL_KEY_COMPLETE_EVENTID:</div><div class='add'>+		ath12k_vdev_install_key_compl_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_SERVICE_AVAILABLE_EVENTID:</div><div class='add'>+		ath12k_service_available_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_PEER_ASSOC_CONF_EVENTID:</div><div class='add'>+		ath12k_peer_assoc_conf_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_UPDATE_STATS_EVENTID:</div><div class='add'>+		ath12k_update_stats_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_PDEV_CTL_FAILSAFE_CHECK_EVENTID:</div><div class='add'>+		ath12k_pdev_ctl_failsafe_check_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_PDEV_CSA_SWITCH_COUNT_STATUS_EVENTID:</div><div class='add'>+		ath12k_wmi_pdev_csa_switch_count_status_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_PDEV_TEMPERATURE_EVENTID:</div><div class='add'>+		ath12k_wmi_pdev_temperature_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_PDEV_DMA_RING_BUF_RELEASE_EVENTID:</div><div class='add'>+		ath12k_wmi_pdev_dma_ring_buf_release_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_HOST_FILS_DISCOVERY_EVENTID:</div><div class='add'>+		ath12k_fils_discovery_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_OFFLOAD_PROB_RESP_TX_STATUS_EVENTID:</div><div class='add'>+		ath12k_probe_resp_tx_status_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_RFKILL_STATE_CHANGE_EVENTID:</div><div class='add'>+		ath12k_rfkill_state_change_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TWT_ENABLE_EVENTID:</div><div class='add'>+		ath12k_wmi_twt_enable_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_TWT_DISABLE_EVENTID:</div><div class='add'>+		ath12k_wmi_twt_disable_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_P2P_NOA_EVENTID:</div><div class='add'>+		ath12k_wmi_p2p_noa_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_PDEV_DFS_RADAR_DETECTION_EVENTID:</div><div class='add'>+		ath12k_wmi_pdev_dfs_radar_detected_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_VDEV_DELETE_RESP_EVENTID:</div><div class='add'>+		ath12k_vdev_delete_resp_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_DIAG_EVENTID:</div><div class='add'>+		ath12k_wmi_diag_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_WOW_WAKEUP_HOST_EVENTID:</div><div class='add'>+		ath12k_wmi_event_wow_wakeup_host(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_GTK_OFFLOAD_STATUS_EVENTID:</div><div class='add'>+		ath12k_wmi_gtk_offload_status_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_MLO_SETUP_COMPLETE_EVENTID:</div><div class='add'>+		ath12k_wmi_event_mlo_setup_complete(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_MLO_TEARDOWN_COMPLETE_EVENTID:</div><div class='add'>+		ath12k_wmi_event_teardown_complete(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_HALPHY_STATS_CTRL_PATH_EVENTID:</div><div class='add'>+		ath12k_wmi_process_tpc_stats(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_11D_NEW_COUNTRY_EVENTID:</div><div class='add'>+		ath12k_reg_11d_new_cc_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_PDEV_RSSI_DBM_CONVERSION_PARAMS_INFO_EVENTID:</div><div class='add'>+		ath12k_wmi_rssi_dbm_conversion_params_info_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_OBSS_COLOR_COLLISION_DETECTION_EVENTID:</div><div class='add'>+		ath12k_wmi_obss_color_collision_event(ab, skb);</div><div class='add'>+		break;</div><div class='add'>+	/* add Unsupported events (rare) here */</div><div class='add'>+	case WMI_TBTTOFFSET_EXT_UPDATE_EVENTID:</div><div class='add'>+	case WMI_PEER_OPER_MODE_CHANGE_EVENTID:</div><div class='add'>+	case WMI_PDEV_DMA_RING_CFG_RSP_EVENTID:</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+			   "ignoring unsupported event 0x%x\n", id);</div><div class='add'>+		break;</div><div class='add'>+	/* add Unsupported events (frequent) here */</div><div class='add'>+	case WMI_PDEV_GET_HALPHY_CAL_STATUS_EVENTID:</div><div class='add'>+	case WMI_MGMT_RX_FW_CONSUMED_EVENTID:</div><div class='add'>+		/* debug might flood hence silently ignore (no-op) */</div><div class='add'>+		break;</div><div class='add'>+	case WMI_PDEV_UTF_EVENTID:</div><div class='add'>+		if (test_bit(ATH12K_FLAG_FTM_SEGMENTED, &amp;ab-&gt;dev_flags))</div><div class='add'>+			ath12k_tm_wmi_event_segmented(ab, id, skb);</div><div class='add'>+		else</div><div class='add'>+			ath12k_tm_wmi_event_unsegmented(ab, id, skb);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_WMI, "Unknown eventid: 0x%x\n", id);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_connect_pdev_htc_service(struct ath12k_base *ab,</div><div class='add'>+					   u32 pdev_idx)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	static const u32 svc_id[] = {</div><div class='add'>+		ATH12K_HTC_SVC_ID_WMI_CONTROL,</div><div class='add'>+		ATH12K_HTC_SVC_ID_WMI_CONTROL_MAC1,</div><div class='add'>+		ATH12K_HTC_SVC_ID_WMI_CONTROL_MAC2</div><div class='add'>+	};</div><div class='add'>+	struct ath12k_htc_svc_conn_req conn_req = {};</div><div class='add'>+	struct ath12k_htc_svc_conn_resp conn_resp = {};</div><div class='add'>+</div><div class='add'>+	/* these fields are the same for all service endpoints */</div><div class='add'>+	conn_req.ep_ops.ep_tx_complete = ath12k_wmi_htc_tx_complete;</div><div class='add'>+	conn_req.ep_ops.ep_rx_complete = ath12k_wmi_op_rx;</div><div class='add'>+	conn_req.ep_ops.ep_tx_credits = ath12k_wmi_op_ep_tx_credits;</div><div class='add'>+</div><div class='add'>+	/* connect to control service */</div><div class='add'>+	conn_req.service_id = svc_id[pdev_idx];</div><div class='add'>+</div><div class='add'>+	status = ath12k_htc_connect_service(&amp;ab-&gt;htc, &amp;conn_req, &amp;conn_resp);</div><div class='add'>+	if (status) {</div><div class='add'>+		ath12k_warn(ab, "failed to connect to WMI CONTROL service status: %d\n",</div><div class='add'>+			    status);</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ab-&gt;wmi_ab.wmi_endpoint_id[pdev_idx] = conn_resp.eid;</div><div class='add'>+	ab-&gt;wmi_ab.wmi[pdev_idx].eid = conn_resp.eid;</div><div class='add'>+	ab-&gt;wmi_ab.max_msg_len[pdev_idx] = conn_resp.max_msg_len;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_wmi_send_unit_test_cmd(struct ath12k *ar,</div><div class='add'>+			      struct wmi_unit_test_cmd ut_cmd,</div><div class='add'>+			      u32 *test_args)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_unit_test_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	void *ptr;</div><div class='add'>+	u32 *ut_cmd_args;</div><div class='add'>+	int buf_len, arg_len;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	arg_len = sizeof(u32) * le32_to_cpu(ut_cmd.num_args);</div><div class='add'>+	buf_len = sizeof(ut_cmd) + arg_len + TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, buf_len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_unit_test_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_UNIT_TEST_CMD,</div><div class='add'>+						 sizeof(ut_cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = ut_cmd.vdev_id;</div><div class='add'>+	cmd-&gt;module_id = ut_cmd.module_id;</div><div class='add'>+	cmd-&gt;num_args = ut_cmd.num_args;</div><div class='add'>+	cmd-&gt;diag_token = ut_cmd.diag_token;</div><div class='add'>+</div><div class='add'>+	ptr = skb-&gt;data + sizeof(ut_cmd);</div><div class='add'>+</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_UINT32, arg_len);</div><div class='add'>+</div><div class='add'>+	ptr += TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	ut_cmd_args = ptr;</div><div class='add'>+	for (i = 0; i &lt; le32_to_cpu(ut_cmd.num_args); i++)</div><div class='add'>+		ut_cmd_args[i] = test_args[i];</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "WMI unit test : module %d vdev %d n_args %d token %d\n",</div><div class='add'>+		   cmd-&gt;module_id, cmd-&gt;vdev_id, cmd-&gt;num_args,</div><div class='add'>+		   cmd-&gt;diag_token);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_UNIT_TEST_CMDID);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to send WMI_UNIT_TEST CMD :%d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_simulate_radar(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	u32 dfs_args[DFS_MAX_TEST_ARGS];</div><div class='add'>+	struct wmi_unit_test_cmd wmi_ut;</div><div class='add'>+	bool arvif_found = false;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+		if (arvif-&gt;is_started &amp;&amp; arvif-&gt;ahvif-&gt;vdev_type == WMI_VDEV_TYPE_AP) {</div><div class='add'>+			arvif_found = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!arvif_found)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	dfs_args[DFS_TEST_CMDID] = 0;</div><div class='add'>+	dfs_args[DFS_TEST_PDEV_ID] = ar-&gt;pdev-&gt;pdev_id;</div><div class='add'>+	/* Currently we could pass segment_id(b0 - b1), chirp(b2)</div><div class='add'>+	 * freq offset (b3 - b10) to unit test. For simulation</div><div class='add'>+	 * purpose this can be set to 0 which is valid.</div><div class='add'>+	 */</div><div class='add'>+	dfs_args[DFS_TEST_RADAR_PARAM] = 0;</div><div class='add'>+</div><div class='add'>+	wmi_ut.vdev_id = cpu_to_le32(arvif-&gt;vdev_id);</div><div class='add'>+	wmi_ut.module_id = cpu_to_le32(DFS_UNIT_TEST_MODULE);</div><div class='add'>+	wmi_ut.num_args = cpu_to_le32(DFS_MAX_TEST_ARGS);</div><div class='add'>+	wmi_ut.diag_token = cpu_to_le32(DFS_UNIT_TEST_TOKEN);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_REG, "Triggering Radar Simulation\n");</div><div class='add'>+</div><div class='add'>+	return ath12k_wmi_send_unit_test_cmd(ar, wmi_ut, dfs_args);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_tpc_stats_request(struct ath12k *ar,</div><div class='add'>+				      enum wmi_halphy_ctrl_path_stats_id tpc_stats_type)</div><div class='add'>+{</div><div class='add'>+	struct wmi_request_halphy_ctrl_path_stats_cmd_fixed_params *cmd;</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	__le32 *pdev_id;</div><div class='add'>+	u32 buf_len;</div><div class='add'>+	void *ptr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	buf_len = sizeof(*cmd) + TLV_HDR_SIZE + sizeof(u32) + TLV_HDR_SIZE + TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, buf_len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	cmd = (struct wmi_request_halphy_ctrl_path_stats_cmd_fixed_params *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_HALPHY_CTRL_PATH_CMD_FIXED_PARAM,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;stats_id_mask = cpu_to_le32(WMI_REQ_CTRL_PATH_PDEV_TX_STAT);</div><div class='add'>+	cmd-&gt;action = cpu_to_le32(WMI_REQUEST_CTRL_PATH_STAT_GET);</div><div class='add'>+	cmd-&gt;subid = cpu_to_le32(tpc_stats_type);</div><div class='add'>+</div><div class='add'>+	ptr = skb-&gt;data + sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	/* The below TLV arrays optionally follow this fixed param TLV structure</div><div class='add'>+	 * 1. ARRAY_UINT32 pdev_ids[]</div><div class='add'>+	 *      If this array is present and non-zero length, stats should only</div><div class='add'>+	 *      be provided from the pdevs identified in the array.</div><div class='add'>+	 * 2. ARRAY_UNIT32 vdev_ids[]</div><div class='add'>+	 *      If this array is present and non-zero length, stats should only</div><div class='add'>+	 *      be provided from the vdevs identified in the array.</div><div class='add'>+	 * 3. ath12k_wmi_mac_addr_params peer_macaddr[];</div><div class='add'>+	 *      If this array is present and non-zero length, stats should only</div><div class='add'>+	 *      be provided from the peers with the MAC addresses specified</div><div class='add'>+	 *      in the array</div><div class='add'>+	 */</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_UINT32, sizeof(u32));</div><div class='add'>+	ptr += TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	pdev_id = ptr;</div><div class='add'>+	*pdev_id = cpu_to_le32(ath12k_mac_get_target_pdev_id(ar));</div><div class='add'>+	ptr += sizeof(*pdev_id);</div><div class='add'>+</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_UINT32, 0);</div><div class='add'>+	ptr += TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_FIXED_STRUCT, 0);</div><div class='add'>+	ptr += TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_REQUEST_HALPHY_CTRL_PATH_STATS_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab,</div><div class='add'>+			    "failed to submit WMI_REQUEST_STATS_CTRL_PATH_CMDID\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI, "WMI get TPC STATS sent on pdev %d\n",</div><div class='add'>+		   ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_connect(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+	u8 wmi_ep_count;</div><div class='add'>+</div><div class='add'>+	wmi_ep_count = ab-&gt;htc.wmi_ep_count;</div><div class='add'>+	if (wmi_ep_count &gt; ab-&gt;hw_params-&gt;max_radios)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; wmi_ep_count; i++)</div><div class='add'>+		ath12k_connect_pdev_htc_service(ab, i);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_pdev_detach(struct ath12k_base *ab, u8 pdev_id)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(pdev_id &gt;= MAX_RADIOS))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* TODO: Deinit any pdev specific wmi resource */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_pdev_attach(struct ath12k_base *ab,</div><div class='add'>+			   u8 pdev_id)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_wmi_pdev *wmi_handle;</div><div class='add'>+</div><div class='add'>+	if (pdev_id &gt;= ab-&gt;hw_params-&gt;max_radios)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	wmi_handle = &amp;ab-&gt;wmi_ab.wmi[pdev_id];</div><div class='add'>+</div><div class='add'>+	wmi_handle-&gt;wmi_ab = &amp;ab-&gt;wmi_ab;</div><div class='add'>+</div><div class='add'>+	ab-&gt;wmi_ab.ab = ab;</div><div class='add'>+	/* TODO: Init remaining resource specific to pdev */</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_attach(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_pdev_attach(ab, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ab-&gt;wmi_ab.ab = ab;</div><div class='add'>+	ab-&gt;wmi_ab.preferred_hw_mode = WMI_HOST_HW_MODE_MAX;</div><div class='add'>+</div><div class='add'>+	/* It's overwritten when service_ext_ready is handled */</div><div class='add'>+	if (ab-&gt;hw_params-&gt;single_pdev_only)</div><div class='add'>+		ab-&gt;wmi_ab.preferred_hw_mode = WMI_HOST_HW_MODE_SINGLE;</div><div class='add'>+</div><div class='add'>+	/* TODO: Init remaining wmi soc resources required */</div><div class='add'>+	init_completion(&amp;ab-&gt;wmi_ab.service_ready);</div><div class='add'>+	init_completion(&amp;ab-&gt;wmi_ab.unified_ready);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_wmi_detach(struct ath12k_base *ab)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* TODO: Deinit wmi resource specific to SOC as required */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ab-&gt;htc.wmi_ep_count; i++)</div><div class='add'>+		ath12k_wmi_pdev_detach(ab, i);</div><div class='add'>+</div><div class='add'>+	ath12k_wmi_free_dbring_caps(ab);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_hw_data_filter_cmd(struct ath12k *ar, struct wmi_hw_data_filter_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct wmi_hw_data_filter_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_hw_data_filter_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_HW_DATA_FILTER_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(arg-&gt;vdev_id);</div><div class='add'>+	cmd-&gt;enable = cpu_to_le32(arg-&gt;enable ? 1 : 0);</div><div class='add'>+</div><div class='add'>+	/* Set all modes in case of disable */</div><div class='add'>+	if (arg-&gt;enable)</div><div class='add'>+		cmd-&gt;hw_filter_bitmap = cpu_to_le32(arg-&gt;hw_filter_bitmap);</div><div class='add'>+	else</div><div class='add'>+		cmd-&gt;hw_filter_bitmap = cpu_to_le32((u32)~0U);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "wmi hw data filter enable %d filter_bitmap 0x%x\n",</div><div class='add'>+		   arg-&gt;enable, arg-&gt;hw_filter_bitmap);</div><div class='add'>+</div><div class='add'>+	return ath12k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_HW_DATA_FILTER_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_wow_host_wakeup_ind(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct wmi_wow_host_wakeup_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_wow_host_wakeup_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_WOW_HOSTWAKEUP_FROM_SLEEP_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI, "wmi tlv wow host wakeup ind\n");</div><div class='add'>+</div><div class='add'>+	return ath12k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_WOW_HOSTWAKEUP_FROM_SLEEP_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_wow_enable(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct wmi_wow_enable_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_wow_enable_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_WOW_ENABLE_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;enable = cpu_to_le32(1);</div><div class='add'>+	cmd-&gt;pause_iface_config = cpu_to_le32(WOW_IFACE_PAUSE_ENABLED);</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI, "wmi tlv wow enable\n");</div><div class='add'>+</div><div class='add'>+	return ath12k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_WOW_ENABLE_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_wow_add_wakeup_event(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+				    enum wmi_wow_wakeup_event event,</div><div class='add'>+				    u32 enable)</div><div class='add'>+{</div><div class='add'>+	struct wmi_wow_add_del_event_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_wow_add_del_event_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_WOW_ADD_DEL_EVT_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;is_add = cpu_to_le32(enable);</div><div class='add'>+	cmd-&gt;event_bitmap = cpu_to_le32((1 &lt;&lt; event));</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI, "wmi tlv wow add wakeup event %s enable %d vdev_id %d\n",</div><div class='add'>+		   wow_wakeup_event(event), enable, vdev_id);</div><div class='add'>+</div><div class='add'>+	return ath12k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_WOW_ENABLE_DISABLE_WAKE_EVENT_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_wow_add_pattern(struct ath12k *ar, u32 vdev_id, u32 pattern_id,</div><div class='add'>+			       const u8 *pattern, const u8 *mask,</div><div class='add'>+			       int pattern_len, int pattern_offset)</div><div class='add'>+{</div><div class='add'>+	struct wmi_wow_add_pattern_cmd *cmd;</div><div class='add'>+	struct wmi_wow_bitmap_pattern_params *bitmap;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	void *ptr;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd) +</div><div class='add'>+	      sizeof(*tlv) +			/* array struct */</div><div class='add'>+	      sizeof(*bitmap) +			/* bitmap */</div><div class='add'>+	      sizeof(*tlv) +			/* empty ipv4 sync */</div><div class='add'>+	      sizeof(*tlv) +			/* empty ipv6 sync */</div><div class='add'>+	      sizeof(*tlv) +			/* empty magic */</div><div class='add'>+	      sizeof(*tlv) +			/* empty info timeout */</div><div class='add'>+	      sizeof(*tlv) + sizeof(u32);	/* ratelimit interval */</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* cmd */</div><div class='add'>+	ptr = skb-&gt;data;</div><div class='add'>+	cmd = ptr;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_WOW_ADD_PATTERN_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;pattern_id = cpu_to_le32(pattern_id);</div><div class='add'>+	cmd-&gt;pattern_type = cpu_to_le32(WOW_BITMAP_PATTERN);</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	/* bitmap */</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, sizeof(*bitmap));</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*tlv);</div><div class='add'>+</div><div class='add'>+	bitmap = ptr;</div><div class='add'>+	bitmap-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_WOW_BITMAP_PATTERN_T,</div><div class='add'>+						    sizeof(*bitmap));</div><div class='add'>+	memcpy(bitmap-&gt;patternbuf, pattern, pattern_len);</div><div class='add'>+	memcpy(bitmap-&gt;bitmaskbuf, mask, pattern_len);</div><div class='add'>+	bitmap-&gt;pattern_offset = cpu_to_le32(pattern_offset);</div><div class='add'>+	bitmap-&gt;pattern_len = cpu_to_le32(pattern_len);</div><div class='add'>+	bitmap-&gt;bitmask_len = cpu_to_le32(pattern_len);</div><div class='add'>+	bitmap-&gt;pattern_id = cpu_to_le32(pattern_id);</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*bitmap);</div><div class='add'>+</div><div class='add'>+	/* ipv4 sync */</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, 0);</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*tlv);</div><div class='add'>+</div><div class='add'>+	/* ipv6 sync */</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, 0);</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*tlv);</div><div class='add'>+</div><div class='add'>+	/* magic */</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, 0);</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*tlv);</div><div class='add'>+</div><div class='add'>+	/* pattern info timeout */</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_UINT32, 0);</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*tlv);</div><div class='add'>+</div><div class='add'>+	/* ratelimit interval */</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_UINT32, sizeof(u32));</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI, "wmi tlv wow add pattern vdev_id %d pattern_id %d pattern_offset %d pattern_len %d\n",</div><div class='add'>+		   vdev_id, pattern_id, pattern_offset, pattern_len);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg_dump(ar-&gt;ab, ATH12K_DBG_WMI, NULL, "wow pattern: ",</div><div class='add'>+			bitmap-&gt;patternbuf, pattern_len);</div><div class='add'>+	ath12k_dbg_dump(ar-&gt;ab, ATH12K_DBG_WMI, NULL, "wow bitmask: ",</div><div class='add'>+			bitmap-&gt;bitmaskbuf, pattern_len);</div><div class='add'>+</div><div class='add'>+	return ath12k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_WOW_ADD_WAKE_PATTERN_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_wow_del_pattern(struct ath12k *ar, u32 vdev_id, u32 pattern_id)</div><div class='add'>+{</div><div class='add'>+	struct wmi_wow_del_pattern_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_wow_del_pattern_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_WOW_DEL_PATTERN_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;pattern_id = cpu_to_le32(pattern_id);</div><div class='add'>+	cmd-&gt;pattern_type = cpu_to_le32(WOW_BITMAP_PATTERN);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI, "wmi tlv wow del pattern vdev_id %d pattern_id %d\n",</div><div class='add'>+		   vdev_id, pattern_id);</div><div class='add'>+</div><div class='add'>+	return ath12k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_WOW_DEL_WAKE_PATTERN_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *</div><div class='add'>+ath12k_wmi_op_gen_config_pno_start(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+				   struct wmi_pno_scan_req_arg *pno)</div><div class='add'>+{</div><div class='add'>+	struct nlo_configured_params *nlo_list;</div><div class='add'>+	size_t len, nlo_list_len, channel_list_len;</div><div class='add'>+	struct wmi_wow_nlo_config_cmd *cmd;</div><div class='add'>+	__le32 *channel_list;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	void *ptr;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd) +</div><div class='add'>+	      sizeof(*tlv) +</div><div class='add'>+	      /* TLV place holder for array of structures</div><div class='add'>+	       * nlo_configured_params(nlo_list)</div><div class='add'>+	       */</div><div class='add'>+	      sizeof(*tlv);</div><div class='add'>+	      /* TLV place holder for array of uint32 channel_list */</div><div class='add'>+</div><div class='add'>+	channel_list_len = sizeof(u32) * pno-&gt;a_networks[0].channel_count;</div><div class='add'>+	len += channel_list_len;</div><div class='add'>+</div><div class='add'>+	nlo_list_len = sizeof(*nlo_list) * pno-&gt;uc_networks_count;</div><div class='add'>+	len += nlo_list_len;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	ptr = skb-&gt;data;</div><div class='add'>+	cmd = ptr;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_NLO_CONFIG_CMD, sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(pno-&gt;vdev_id);</div><div class='add'>+	cmd-&gt;flags = cpu_to_le32(WMI_NLO_CONFIG_START | WMI_NLO_CONFIG_SSID_HIDE_EN);</div><div class='add'>+</div><div class='add'>+	/* current FW does not support min-max range for dwell time */</div><div class='add'>+	cmd-&gt;active_dwell_time = cpu_to_le32(pno-&gt;active_max_time);</div><div class='add'>+	cmd-&gt;passive_dwell_time = cpu_to_le32(pno-&gt;passive_max_time);</div><div class='add'>+</div><div class='add'>+	if (pno-&gt;do_passive_scan)</div><div class='add'>+		cmd-&gt;flags |= cpu_to_le32(WMI_NLO_CONFIG_SCAN_PASSIVE);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;fast_scan_period = cpu_to_le32(pno-&gt;fast_scan_period);</div><div class='add'>+	cmd-&gt;slow_scan_period = cpu_to_le32(pno-&gt;slow_scan_period);</div><div class='add'>+	cmd-&gt;fast_scan_max_cycles = cpu_to_le32(pno-&gt;fast_scan_max_cycles);</div><div class='add'>+	cmd-&gt;delay_start_time = cpu_to_le32(pno-&gt;delay_start_time);</div><div class='add'>+</div><div class='add'>+	if (pno-&gt;enable_pno_scan_randomization) {</div><div class='add'>+		cmd-&gt;flags |= cpu_to_le32(WMI_NLO_CONFIG_SPOOFED_MAC_IN_PROBE_REQ |</div><div class='add'>+					  WMI_NLO_CONFIG_RANDOM_SEQ_NO_IN_PROBE_REQ);</div><div class='add'>+		ether_addr_copy(cmd-&gt;mac_addr.addr, pno-&gt;mac_addr);</div><div class='add'>+		ether_addr_copy(cmd-&gt;mac_mask.addr, pno-&gt;mac_addr_mask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	/* nlo_configured_params(nlo_list) */</div><div class='add'>+	cmd-&gt;no_of_ssids = cpu_to_le32(pno-&gt;uc_networks_count);</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, nlo_list_len);</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*tlv);</div><div class='add'>+	nlo_list = ptr;</div><div class='add'>+	for (i = 0; i &lt; pno-&gt;uc_networks_count; i++) {</div><div class='add'>+		tlv = (struct wmi_tlv *)(&amp;nlo_list[i].tlv_header);</div><div class='add'>+		tlv-&gt;header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_ARRAY_BYTE,</div><div class='add'>+						     sizeof(*nlo_list));</div><div class='add'>+</div><div class='add'>+		nlo_list[i].ssid.valid = cpu_to_le32(1);</div><div class='add'>+		nlo_list[i].ssid.ssid.ssid_len =</div><div class='add'>+			cpu_to_le32(pno-&gt;a_networks[i].ssid.ssid_len);</div><div class='add'>+		memcpy(nlo_list[i].ssid.ssid.ssid,</div><div class='add'>+		       pno-&gt;a_networks[i].ssid.ssid,</div><div class='add'>+		       le32_to_cpu(nlo_list[i].ssid.ssid.ssid_len));</div><div class='add'>+</div><div class='add'>+		if (pno-&gt;a_networks[i].rssi_threshold &amp;&amp;</div><div class='add'>+		    pno-&gt;a_networks[i].rssi_threshold &gt; -300) {</div><div class='add'>+			nlo_list[i].rssi_cond.valid = cpu_to_le32(1);</div><div class='add'>+			nlo_list[i].rssi_cond.rssi =</div><div class='add'>+					cpu_to_le32(pno-&gt;a_networks[i].rssi_threshold);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nlo_list[i].bcast_nw_type.valid = cpu_to_le32(1);</div><div class='add'>+		nlo_list[i].bcast_nw_type.bcast_nw_type =</div><div class='add'>+					cpu_to_le32(pno-&gt;a_networks[i].bcast_nw_type);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptr += nlo_list_len;</div><div class='add'>+	cmd-&gt;num_of_channels = cpu_to_le32(pno-&gt;a_networks[0].channel_count);</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header =  ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_UINT32, channel_list_len);</div><div class='add'>+	ptr += sizeof(*tlv);</div><div class='add'>+	channel_list = ptr;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pno-&gt;a_networks[0].channel_count; i++)</div><div class='add'>+		channel_list[i] = cpu_to_le32(pno-&gt;a_networks[0].channels[i]);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI, "wmi tlv start pno config vdev_id %d\n",</div><div class='add'>+		   vdev_id);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ath12k_wmi_op_gen_config_pno_stop(struct ath12k *ar,</div><div class='add'>+							 u32 vdev_id)</div><div class='add'>+{</div><div class='add'>+	struct wmi_wow_nlo_config_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_wow_nlo_config_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_NLO_CONFIG_CMD, len);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;flags = cpu_to_le32(WMI_NLO_CONFIG_STOP);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "wmi tlv stop pno config vdev_id %d\n", vdev_id);</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_wow_config_pno(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+			      struct wmi_pno_scan_req_arg  *pno_scan)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (pno_scan-&gt;enable)</div><div class='add'>+		skb = ath12k_wmi_op_gen_config_pno_start(ar, vdev_id, pno_scan);</div><div class='add'>+	else</div><div class='add'>+		skb = ath12k_wmi_op_gen_config_pno_stop(ar, vdev_id);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR_OR_NULL(skb))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return ath12k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_NETWORK_LIST_OFFLOAD_CONFIG_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_fill_ns_offload(struct ath12k *ar,</div><div class='add'>+				       struct wmi_arp_ns_offload_arg *offload,</div><div class='add'>+				       void **ptr,</div><div class='add'>+				       bool enable,</div><div class='add'>+				       bool ext)</div><div class='add'>+{</div><div class='add'>+	struct wmi_ns_offload_params *ns;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	void *buf_ptr = *ptr;</div><div class='add'>+	u32 ns_cnt, ns_ext_tuples;</div><div class='add'>+	int i, max_offloads;</div><div class='add'>+</div><div class='add'>+	ns_cnt = offload-&gt;ipv6_count;</div><div class='add'>+</div><div class='add'>+	tlv  = buf_ptr;</div><div class='add'>+</div><div class='add'>+	if (ext) {</div><div class='add'>+		ns_ext_tuples = offload-&gt;ipv6_count - WMI_MAX_NS_OFFLOADS;</div><div class='add'>+		tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT,</div><div class='add'>+						 ns_ext_tuples * sizeof(*ns));</div><div class='add'>+		i = WMI_MAX_NS_OFFLOADS;</div><div class='add'>+		max_offloads = offload-&gt;ipv6_count;</div><div class='add'>+	} else {</div><div class='add'>+		tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT,</div><div class='add'>+						 WMI_MAX_NS_OFFLOADS * sizeof(*ns));</div><div class='add'>+		i = 0;</div><div class='add'>+		max_offloads = WMI_MAX_NS_OFFLOADS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buf_ptr += sizeof(*tlv);</div><div class='add'>+</div><div class='add'>+	for (; i &lt; max_offloads; i++) {</div><div class='add'>+		ns = buf_ptr;</div><div class='add'>+		ns-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_NS_OFFLOAD_TUPLE,</div><div class='add'>+							sizeof(*ns));</div><div class='add'>+</div><div class='add'>+		if (enable) {</div><div class='add'>+			if (i &lt; ns_cnt)</div><div class='add'>+				ns-&gt;flags |= cpu_to_le32(WMI_NSOL_FLAGS_VALID);</div><div class='add'>+</div><div class='add'>+			memcpy(ns-&gt;target_ipaddr[0], offload-&gt;ipv6_addr[i], 16);</div><div class='add'>+			memcpy(ns-&gt;solicitation_ipaddr, offload-&gt;self_ipv6_addr[i], 16);</div><div class='add'>+</div><div class='add'>+			if (offload-&gt;ipv6_type[i])</div><div class='add'>+				ns-&gt;flags |= cpu_to_le32(WMI_NSOL_FLAGS_IS_IPV6_ANYCAST);</div><div class='add'>+</div><div class='add'>+			memcpy(ns-&gt;target_mac.addr, offload-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+			if (!is_zero_ether_addr(ns-&gt;target_mac.addr))</div><div class='add'>+				ns-&gt;flags |= cpu_to_le32(WMI_NSOL_FLAGS_MAC_VALID);</div><div class='add'>+</div><div class='add'>+			ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+				   "wmi index %d ns_solicited %pI6 target %pI6",</div><div class='add'>+				   i, ns-&gt;solicitation_ipaddr,</div><div class='add'>+				   ns-&gt;target_ipaddr[0]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buf_ptr += sizeof(*ns);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*ptr = buf_ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wmi_fill_arp_offload(struct ath12k *ar,</div><div class='add'>+					struct wmi_arp_ns_offload_arg *offload,</div><div class='add'>+					void **ptr,</div><div class='add'>+					bool enable)</div><div class='add'>+{</div><div class='add'>+	struct wmi_arp_offload_params *arp;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	void *buf_ptr = *ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* fill arp tuple */</div><div class='add'>+	tlv = buf_ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT,</div><div class='add'>+					 WMI_MAX_ARP_OFFLOADS * sizeof(*arp));</div><div class='add'>+	buf_ptr += sizeof(*tlv);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WMI_MAX_ARP_OFFLOADS; i++) {</div><div class='add'>+		arp = buf_ptr;</div><div class='add'>+		arp-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_ARP_OFFLOAD_TUPLE,</div><div class='add'>+							 sizeof(*arp));</div><div class='add'>+</div><div class='add'>+		if (enable &amp;&amp; i &lt; offload-&gt;ipv4_count) {</div><div class='add'>+			/* Copy the target ip addr and flags */</div><div class='add'>+			arp-&gt;flags = cpu_to_le32(WMI_ARPOL_FLAGS_VALID);</div><div class='add'>+			memcpy(arp-&gt;target_ipaddr, offload-&gt;ipv4_addr[i], 4);</div><div class='add'>+</div><div class='add'>+			ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI, "wmi arp offload address %pI4",</div><div class='add'>+				   arp-&gt;target_ipaddr);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buf_ptr += sizeof(*arp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*ptr = buf_ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_arp_ns_offload(struct ath12k *ar,</div><div class='add'>+			      struct ath12k_link_vif *arvif,</div><div class='add'>+			      struct wmi_arp_ns_offload_arg *offload,</div><div class='add'>+			      bool enable)</div><div class='add'>+{</div><div class='add'>+	struct wmi_set_arp_ns_offload_cmd *cmd;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	void *buf_ptr;</div><div class='add'>+	size_t len;</div><div class='add'>+	u8 ns_cnt, ns_ext_tuples = 0;</div><div class='add'>+</div><div class='add'>+	ns_cnt = offload-&gt;ipv6_count;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd) +</div><div class='add'>+	      sizeof(*tlv) +</div><div class='add'>+	      WMI_MAX_NS_OFFLOADS * sizeof(struct wmi_ns_offload_params) +</div><div class='add'>+	      sizeof(*tlv) +</div><div class='add'>+	      WMI_MAX_ARP_OFFLOADS * sizeof(struct wmi_arp_offload_params);</div><div class='add'>+</div><div class='add'>+	if (ns_cnt &gt; WMI_MAX_NS_OFFLOADS) {</div><div class='add'>+		ns_ext_tuples = ns_cnt - WMI_MAX_NS_OFFLOADS;</div><div class='add'>+		len += sizeof(*tlv) +</div><div class='add'>+		       ns_ext_tuples * sizeof(struct wmi_ns_offload_params);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	buf_ptr = skb-&gt;data;</div><div class='add'>+	cmd = buf_ptr;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_SET_ARP_NS_OFFLOAD_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;flags = cpu_to_le32(0);</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(arvif-&gt;vdev_id);</div><div class='add'>+	cmd-&gt;num_ns_ext_tuples = cpu_to_le32(ns_ext_tuples);</div><div class='add'>+</div><div class='add'>+	buf_ptr += sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	ath12k_wmi_fill_ns_offload(ar, offload, &amp;buf_ptr, enable, 0);</div><div class='add'>+	ath12k_wmi_fill_arp_offload(ar, offload, &amp;buf_ptr, enable);</div><div class='add'>+</div><div class='add'>+	if (ns_ext_tuples)</div><div class='add'>+		ath12k_wmi_fill_ns_offload(ar, offload, &amp;buf_ptr, enable, 1);</div><div class='add'>+</div><div class='add'>+	return ath12k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_SET_ARP_NS_OFFLOAD_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_gtk_rekey_offload(struct ath12k *ar,</div><div class='add'>+				 struct ath12k_link_vif *arvif, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_rekey_data *rekey_data = &amp;arvif-&gt;rekey_data;</div><div class='add'>+	struct wmi_gtk_rekey_offload_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	__le64 replay_ctr;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+	skb =  ath12k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_gtk_rekey_offload_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_GTK_OFFLOAD_CMD, sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(arvif-&gt;vdev_id);</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		cmd-&gt;flags = cpu_to_le32(GTK_OFFLOAD_ENABLE_OPCODE);</div><div class='add'>+</div><div class='add'>+		/* the length in rekey_data and cmd is equal */</div><div class='add'>+		memcpy(cmd-&gt;kck, rekey_data-&gt;kck, sizeof(cmd-&gt;kck));</div><div class='add'>+		memcpy(cmd-&gt;kek, rekey_data-&gt;kek, sizeof(cmd-&gt;kek));</div><div class='add'>+</div><div class='add'>+		replay_ctr = cpu_to_le64(rekey_data-&gt;replay_ctr);</div><div class='add'>+		memcpy(cmd-&gt;replay_ctr, &amp;replay_ctr,</div><div class='add'>+		       sizeof(replay_ctr));</div><div class='add'>+	} else {</div><div class='add'>+		cmd-&gt;flags = cpu_to_le32(GTK_OFFLOAD_DISABLE_OPCODE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI, "offload gtk rekey vdev: %d %d\n",</div><div class='add'>+		   arvif-&gt;vdev_id, enable);</div><div class='add'>+	return ath12k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_GTK_OFFLOAD_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_gtk_rekey_getinfo(struct ath12k *ar,</div><div class='add'>+				 struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct wmi_gtk_rekey_offload_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+	skb =  ath12k_wmi_alloc_skb(ar-&gt;wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_gtk_rekey_offload_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_GTK_OFFLOAD_CMD, sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(arvif-&gt;vdev_id);</div><div class='add'>+	cmd-&gt;flags = cpu_to_le32(GTK_OFFLOAD_REQUEST_STATUS_OPCODE);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI, "get gtk rekey vdev_id: %d\n",</div><div class='add'>+		   arvif-&gt;vdev_id);</div><div class='add'>+	return ath12k_wmi_cmd_send(ar-&gt;wmi, skb, WMI_GTK_OFFLOAD_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_sta_keepalive(struct ath12k *ar,</div><div class='add'>+			     const struct wmi_sta_keepalive_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct wmi_sta_keepalive_arp_resp_params *arp;</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_sta_keepalive_cmd *cmd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd) + sizeof(*arp);</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_sta_keepalive_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_STA_KEEPALIVE_CMD, sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(arg-&gt;vdev_id);</div><div class='add'>+	cmd-&gt;enabled = cpu_to_le32(arg-&gt;enabled);</div><div class='add'>+	cmd-&gt;interval = cpu_to_le32(arg-&gt;interval);</div><div class='add'>+	cmd-&gt;method = cpu_to_le32(arg-&gt;method);</div><div class='add'>+</div><div class='add'>+	arp = (struct wmi_sta_keepalive_arp_resp_params *)(cmd + 1);</div><div class='add'>+	arp-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_STA_KEEPALVE_ARP_RESPONSE,</div><div class='add'>+						 sizeof(*arp));</div><div class='add'>+	if (arg-&gt;method == WMI_STA_KEEPALIVE_METHOD_UNSOLICITED_ARP_RESPONSE ||</div><div class='add'>+	    arg-&gt;method == WMI_STA_KEEPALIVE_METHOD_GRATUITOUS_ARP_REQUEST) {</div><div class='add'>+		arp-&gt;src_ip4_addr = cpu_to_le32(arg-&gt;src_ip4_addr);</div><div class='add'>+		arp-&gt;dest_ip4_addr = cpu_to_le32(arg-&gt;dest_ip4_addr);</div><div class='add'>+		ether_addr_copy(arp-&gt;dest_mac_addr.addr, arg-&gt;dest_mac_addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "wmi sta keepalive vdev %d enabled %d method %d interval %d\n",</div><div class='add'>+		   arg-&gt;vdev_id, arg-&gt;enabled, arg-&gt;method, arg-&gt;interval);</div><div class='add'>+</div><div class='add'>+	return ath12k_wmi_cmd_send(wmi, skb, WMI_STA_KEEPALIVE_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_mlo_setup(struct ath12k *ar, struct wmi_mlo_setup_arg *mlo_params)</div><div class='add'>+{</div><div class='add'>+	struct wmi_mlo_setup_cmd *cmd;</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	u32 *partner_links, num_links;</div><div class='add'>+	int i, ret, buf_len, arg_len;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	void *ptr;</div><div class='add'>+</div><div class='add'>+	num_links = mlo_params-&gt;num_partner_links;</div><div class='add'>+	arg_len = num_links * sizeof(u32);</div><div class='add'>+	buf_len = sizeof(*cmd) + TLV_HDR_SIZE + arg_len;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, buf_len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_mlo_setup_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_MLO_SETUP_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;mld_group_id = mlo_params-&gt;group_id;</div><div class='add'>+	cmd-&gt;pdev_id = cpu_to_le32(ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+	ptr = skb-&gt;data + sizeof(*cmd);</div><div class='add'>+</div><div class='add'>+	tlv = ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_UINT32, arg_len);</div><div class='add'>+	ptr += TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	partner_links = ptr;</div><div class='add'>+	for (i = 0; i &lt; num_links; i++)</div><div class='add'>+		partner_links[i] = mlo_params-&gt;partner_link_id[i];</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_MLO_SETUP_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to submit WMI_MLO_SETUP_CMDID command: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_mlo_ready(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct wmi_mlo_ready_cmd *cmd;</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret, len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_mlo_ready_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_MLO_READY_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;pdev_id = cpu_to_le32(ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_MLO_READY_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to submit WMI_MLO_READY_CMDID command: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_mlo_teardown(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct wmi_mlo_teardown_cmd *cmd;</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret, len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cmd);</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_mlo_teardown_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_MLO_TEARDOWN_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;pdev_id = cpu_to_le32(ar-&gt;pdev-&gt;pdev_id);</div><div class='add'>+	cmd-&gt;reason_code = WMI_MLO_TEARDOWN_SSR_REASON;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_MLO_TEARDOWN_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to submit WMI MLO teardown command: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool ath12k_wmi_supports_6ghz_cc_ext(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	return test_bit(WMI_TLV_SERVICE_REG_CC_EXT_EVENT_SUPPORT,</div><div class='add'>+			ar-&gt;ab-&gt;wmi_ab.svc_map) &amp;&amp; ar-&gt;supports_6ghz;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_vdev_set_tpc_power(struct ath12k *ar,</div><div class='add'>+				       u32 vdev_id,</div><div class='add'>+				       struct ath12k_reg_tpc_power_info *param)</div><div class='add'>+{</div><div class='add'>+	struct wmi_vdev_set_tpc_power_cmd *cmd;</div><div class='add'>+	struct ath12k_wmi_pdev *wmi = ar-&gt;wmi;</div><div class='add'>+	struct wmi_vdev_ch_power_params *ch;</div><div class='add'>+	int i, ret, len, array_len;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	u8 *ptr;</div><div class='add'>+</div><div class='add'>+	array_len = sizeof(*ch) * param-&gt;num_pwr_levels;</div><div class='add'>+	len = sizeof(*cmd) + TLV_HDR_SIZE + array_len;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi-&gt;wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ptr = skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_vdev_set_tpc_power_cmd *)ptr;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_VDEV_SET_TPC_POWER_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;vdev_id = cpu_to_le32(vdev_id);</div><div class='add'>+	cmd-&gt;psd_power = cpu_to_le32(param-&gt;is_psd_power);</div><div class='add'>+	cmd-&gt;eirp_power = cpu_to_le32(param-&gt;eirp_power);</div><div class='add'>+	cmd-&gt;power_type_6ghz = cpu_to_le32(param-&gt;ap_power_type);</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "tpc vdev id %d is psd power %d eirp power %d 6 ghz power type %d\n",</div><div class='add'>+		   vdev_id, param-&gt;is_psd_power, param-&gt;eirp_power, param-&gt;ap_power_type);</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(*cmd);</div><div class='add'>+	tlv = (struct wmi_tlv *)ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, array_len);</div><div class='add'>+</div><div class='add'>+	ptr += TLV_HDR_SIZE;</div><div class='add'>+	ch = (struct wmi_vdev_ch_power_params *)ptr;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; param-&gt;num_pwr_levels; i++, ch++) {</div><div class='add'>+		ch-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_VDEV_CH_POWER_INFO,</div><div class='add'>+							sizeof(*ch));</div><div class='add'>+		ch-&gt;chan_cfreq = cpu_to_le32(param-&gt;chan_power_info[i].chan_cfreq);</div><div class='add'>+		ch-&gt;tx_power = cpu_to_le32(param-&gt;chan_power_info[i].tx_power);</div><div class='add'>+</div><div class='add'>+		ath12k_dbg(ar-&gt;ab, ATH12K_DBG_WMI, "tpc chan freq %d TX power %d\n",</div><div class='add'>+			   ch-&gt;chan_cfreq, ch-&gt;tx_power);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(wmi, skb, WMI_VDEV_SET_TPC_POWER_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to send WMI_VDEV_SET_TPC_POWER_CMDID\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_wmi_fill_disallowed_bmap(struct ath12k_base *ab,</div><div class='add'>+				struct wmi_disallowed_mlo_mode_bitmap_params *dislw_bmap,</div><div class='add'>+				struct wmi_mlo_link_set_active_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct wmi_ml_disallow_mode_bmap_arg *dislw_bmap_arg;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;num_disallow_mode_comb &gt;</div><div class='add'>+	    ARRAY_SIZE(arg-&gt;disallow_bmap)) {</div><div class='add'>+		ath12k_warn(ab, "invalid num_disallow_mode_comb: %d",</div><div class='add'>+			    arg-&gt;num_disallow_mode_comb);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dislw_bmap_arg = &amp;arg-&gt;disallow_bmap[0];</div><div class='add'>+	for (i = 0; i &lt; arg-&gt;num_disallow_mode_comb; i++) {</div><div class='add'>+		dislw_bmap-&gt;tlv_header =</div><div class='add'>+				ath12k_wmi_tlv_cmd_hdr(0, sizeof(*dislw_bmap));</div><div class='add'>+		dislw_bmap-&gt;disallowed_mode_bitmap =</div><div class='add'>+				cpu_to_le32(dislw_bmap_arg-&gt;disallowed_mode);</div><div class='add'>+		dislw_bmap-&gt;ieee_link_id_comb =</div><div class='add'>+			le32_encode_bits(dislw_bmap_arg-&gt;ieee_link_id[0],</div><div class='add'>+					 WMI_DISALW_MLO_MODE_BMAP_IEEE_LINK_ID_COMB_1) |</div><div class='add'>+			le32_encode_bits(dislw_bmap_arg-&gt;ieee_link_id[1],</div><div class='add'>+					 WMI_DISALW_MLO_MODE_BMAP_IEEE_LINK_ID_COMB_2) |</div><div class='add'>+			le32_encode_bits(dislw_bmap_arg-&gt;ieee_link_id[2],</div><div class='add'>+					 WMI_DISALW_MLO_MODE_BMAP_IEEE_LINK_ID_COMB_3) |</div><div class='add'>+			le32_encode_bits(dislw_bmap_arg-&gt;ieee_link_id[3],</div><div class='add'>+					 WMI_DISALW_MLO_MODE_BMAP_IEEE_LINK_ID_COMB_4);</div><div class='add'>+</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+			   "entry %d disallowed_mode %d ieee_link_id_comb 0x%x",</div><div class='add'>+			   i, dislw_bmap_arg-&gt;disallowed_mode,</div><div class='add'>+			   dislw_bmap_arg-&gt;ieee_link_id_comb);</div><div class='add'>+		dislw_bmap++;</div><div class='add'>+		dislw_bmap_arg++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_mlo_link_set_active_cmd(struct ath12k_base *ab,</div><div class='add'>+					    struct wmi_mlo_link_set_active_arg *arg)</div><div class='add'>+{</div><div class='add'>+	struct wmi_disallowed_mlo_mode_bitmap_params *disallowed_mode_bmap;</div><div class='add'>+	struct wmi_mlo_set_active_link_number_params *link_num_param;</div><div class='add'>+	u32 num_link_num_param = 0, num_vdev_bitmap = 0;</div><div class='add'>+	struct ath12k_wmi_base *wmi_ab = &amp;ab-&gt;wmi_ab;</div><div class='add'>+	struct wmi_mlo_link_set_active_cmd *cmd;</div><div class='add'>+	u32 num_inactive_vdev_bitmap = 0;</div><div class='add'>+	u32 num_disallow_mode_comb = 0;</div><div class='add'>+	struct wmi_tlv *tlv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	__le32 *vdev_bitmap;</div><div class='add'>+	void *buf_ptr;</div><div class='add'>+	int i, ret;</div><div class='add'>+	u32 len;</div><div class='add'>+</div><div class='add'>+	if (!arg-&gt;num_vdev_bitmap &amp;&amp; !arg-&gt;num_link_entry) {</div><div class='add'>+		ath12k_warn(ab, "Invalid num_vdev_bitmap and num_link_entry");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (arg-&gt;force_mode) {</div><div class='add'>+	case WMI_MLO_LINK_FORCE_MODE_ACTIVE_LINK_NUM:</div><div class='add'>+	case WMI_MLO_LINK_FORCE_MODE_INACTIVE_LINK_NUM:</div><div class='add'>+		num_link_num_param = arg-&gt;num_link_entry;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case WMI_MLO_LINK_FORCE_MODE_ACTIVE:</div><div class='add'>+	case WMI_MLO_LINK_FORCE_MODE_INACTIVE:</div><div class='add'>+	case WMI_MLO_LINK_FORCE_MODE_NO_FORCE:</div><div class='add'>+		num_vdev_bitmap = arg-&gt;num_vdev_bitmap;</div><div class='add'>+		break;</div><div class='add'>+	case WMI_MLO_LINK_FORCE_MODE_ACTIVE_INACTIVE:</div><div class='add'>+		num_vdev_bitmap = arg-&gt;num_vdev_bitmap;</div><div class='add'>+		num_inactive_vdev_bitmap = arg-&gt;num_inactive_vdev_bitmap;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath12k_warn(ab, "Invalid force mode: %u", arg-&gt;force_mode);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	num_disallow_mode_comb = arg-&gt;num_disallow_mode_comb;</div><div class='add'>+	len = sizeof(*cmd) +</div><div class='add'>+	      TLV_HDR_SIZE + sizeof(*link_num_param) * num_link_num_param +</div><div class='add'>+	      TLV_HDR_SIZE + sizeof(*vdev_bitmap) * num_vdev_bitmap +</div><div class='add'>+	      TLV_HDR_SIZE + TLV_HDR_SIZE + TLV_HDR_SIZE +</div><div class='add'>+	      TLV_HDR_SIZE + sizeof(*disallowed_mode_bmap) * num_disallow_mode_comb;</div><div class='add'>+	if (arg-&gt;force_mode == WMI_MLO_LINK_FORCE_MODE_ACTIVE_INACTIVE)</div><div class='add'>+		len += sizeof(*vdev_bitmap) * num_inactive_vdev_bitmap;</div><div class='add'>+</div><div class='add'>+	skb = ath12k_wmi_alloc_skb(wmi_ab, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_mlo_link_set_active_cmd *)skb-&gt;data;</div><div class='add'>+	cmd-&gt;tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_MLO_LINK_SET_ACTIVE_CMD,</div><div class='add'>+						 sizeof(*cmd));</div><div class='add'>+	cmd-&gt;force_mode = cpu_to_le32(arg-&gt;force_mode);</div><div class='add'>+	cmd-&gt;reason = cpu_to_le32(arg-&gt;reason);</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+		   "mode %d reason %d num_link_num_param %d num_vdev_bitmap %d inactive %d num_disallow_mode_comb %d",</div><div class='add'>+		   arg-&gt;force_mode, arg-&gt;reason, num_link_num_param,</div><div class='add'>+		   num_vdev_bitmap, num_inactive_vdev_bitmap,</div><div class='add'>+		   num_disallow_mode_comb);</div><div class='add'>+</div><div class='add'>+	buf_ptr = skb-&gt;data + sizeof(*cmd);</div><div class='add'>+	tlv = buf_ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT,</div><div class='add'>+					 sizeof(*link_num_param) * num_link_num_param);</div><div class='add'>+	buf_ptr += TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	if (num_link_num_param) {</div><div class='add'>+		cmd-&gt;ctrl_flags =</div><div class='add'>+			le32_encode_bits(arg-&gt;ctrl_flags.dync_force_link_num ? 1 : 0,</div><div class='add'>+					 CRTL_F_DYNC_FORCE_LINK_NUM);</div><div class='add'>+</div><div class='add'>+		link_num_param = buf_ptr;</div><div class='add'>+		for (i = 0; i &lt; num_link_num_param; i++) {</div><div class='add'>+			link_num_param-&gt;tlv_header =</div><div class='add'>+				ath12k_wmi_tlv_cmd_hdr(0, sizeof(*link_num_param));</div><div class='add'>+			link_num_param-&gt;num_of_link =</div><div class='add'>+				cpu_to_le32(arg-&gt;link_num[i].num_of_link);</div><div class='add'>+			link_num_param-&gt;vdev_type =</div><div class='add'>+				cpu_to_le32(arg-&gt;link_num[i].vdev_type);</div><div class='add'>+			link_num_param-&gt;vdev_subtype =</div><div class='add'>+				cpu_to_le32(arg-&gt;link_num[i].vdev_subtype);</div><div class='add'>+			link_num_param-&gt;home_freq =</div><div class='add'>+				cpu_to_le32(arg-&gt;link_num[i].home_freq);</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+				   "entry %d num_of_link %d vdev type %d subtype %d freq %d control_flags %d",</div><div class='add'>+				   i, arg-&gt;link_num[i].num_of_link,</div><div class='add'>+				   arg-&gt;link_num[i].vdev_type,</div><div class='add'>+				   arg-&gt;link_num[i].vdev_subtype,</div><div class='add'>+				   arg-&gt;link_num[i].home_freq,</div><div class='add'>+				   __le32_to_cpu(cmd-&gt;ctrl_flags));</div><div class='add'>+			link_num_param++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buf_ptr += sizeof(*link_num_param) * num_link_num_param;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tlv = buf_ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_UINT32,</div><div class='add'>+					 sizeof(*vdev_bitmap) * num_vdev_bitmap);</div><div class='add'>+	buf_ptr += TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	if (num_vdev_bitmap) {</div><div class='add'>+		vdev_bitmap = buf_ptr;</div><div class='add'>+		for (i = 0; i &lt; num_vdev_bitmap; i++) {</div><div class='add'>+			vdev_bitmap[i] = cpu_to_le32(arg-&gt;vdev_bitmap[i]);</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_WMI, "entry %d vdev_id_bitmap 0x%x",</div><div class='add'>+				   i, arg-&gt;vdev_bitmap[i]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buf_ptr += sizeof(*vdev_bitmap) * num_vdev_bitmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;force_mode == WMI_MLO_LINK_FORCE_MODE_ACTIVE_INACTIVE) {</div><div class='add'>+		tlv = buf_ptr;</div><div class='add'>+		tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_UINT32,</div><div class='add'>+						 sizeof(*vdev_bitmap) *</div><div class='add'>+						 num_inactive_vdev_bitmap);</div><div class='add'>+		buf_ptr += TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+		if (num_inactive_vdev_bitmap) {</div><div class='add'>+			vdev_bitmap = buf_ptr;</div><div class='add'>+			for (i = 0; i &lt; num_inactive_vdev_bitmap; i++) {</div><div class='add'>+				vdev_bitmap[i] =</div><div class='add'>+					cpu_to_le32(arg-&gt;inactive_vdev_bitmap[i]);</div><div class='add'>+				ath12k_dbg(ab, ATH12K_DBG_WMI,</div><div class='add'>+					   "entry %d inactive_vdev_id_bitmap 0x%x",</div><div class='add'>+					    i, arg-&gt;inactive_vdev_bitmap[i]);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			buf_ptr += sizeof(*vdev_bitmap) * num_inactive_vdev_bitmap;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* add empty vdev bitmap2 tlv */</div><div class='add'>+		tlv = buf_ptr;</div><div class='add'>+		tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_UINT32, 0);</div><div class='add'>+		buf_ptr += TLV_HDR_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* add empty ieee_link_id_bitmap tlv */</div><div class='add'>+	tlv = buf_ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_UINT32, 0);</div><div class='add'>+	buf_ptr += TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	/* add empty ieee_link_id_bitmap2 tlv */</div><div class='add'>+	tlv = buf_ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_UINT32, 0);</div><div class='add'>+	buf_ptr += TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	tlv = buf_ptr;</div><div class='add'>+	tlv-&gt;header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT,</div><div class='add'>+					 sizeof(*disallowed_mode_bmap) *</div><div class='add'>+					 arg-&gt;num_disallow_mode_comb);</div><div class='add'>+	buf_ptr += TLV_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_fill_disallowed_bmap(ab, buf_ptr, arg);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free_skb;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_cmd_send(&amp;wmi_ab-&gt;wmi[0], skb, WMI_MLO_LINK_SET_ACTIVE_CMDID);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab,</div><div class='add'>+			    "failed to send WMI_MLO_LINK_SET_ACTIVE_CMDID: %d\n", ret);</div><div class='add'>+		goto free_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WMI, "WMI mlo link set active cmd");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+free_skb:</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/wmi.h b/drivers/net/wireless/ath/ath12k/wmi.h<br/>new file mode 100644<br/>index 000000000000..f99fced1610e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/wmi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/wmi.h</a></div><div class='hunk'>@@ -0,0 +1,6526 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH12K_WMI_H</div><div class='add'>+#define ATH12K_WMI_H</div><div class='add'>+</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+#include "htc.h"</div><div class='add'>+</div><div class='add'>+/* Naming conventions for structures:</div><div class='add'>+ *</div><div class='add'>+ * _cmd means that this is a firmware command sent from host to firmware.</div><div class='add'>+ *</div><div class='add'>+ * _event means that this is a firmware event sent from firmware to host</div><div class='add'>+ *</div><div class='add'>+ * _params is a structure which is embedded either into _cmd or _event (or</div><div class='add'>+ * both), it is not sent individually.</div><div class='add'>+ *</div><div class='add'>+ * _arg is used inside the host, the firmware does not see that at all.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct ath12k_base;</div><div class='add'>+struct ath12k;</div><div class='add'>+struct ath12k_link_vif;</div><div class='add'>+struct ath12k_fw_stats;</div><div class='add'>+struct ath12k_reg_tpc_power_info;</div><div class='add'>+</div><div class='add'>+/* There is no signed version of __le32, so for a temporary solution come</div><div class='add'>+ * up with our own version. The idea is from fs/ntfs/endian.h.</div><div class='add'>+ *</div><div class='add'>+ * Use a_ prefix so that it doesn't conflict if we get proper support to</div><div class='add'>+ * linux/types.h.</div><div class='add'>+ */</div><div class='add'>+typedef __s32 __bitwise a_sle32;</div><div class='add'>+</div><div class='add'>+static inline a_sle32 a_cpu_to_sle32(s32 val)</div><div class='add'>+{</div><div class='add'>+	return (__force a_sle32)cpu_to_le32(val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline s32 a_sle32_to_cpu(a_sle32 val)</div><div class='add'>+{</div><div class='add'>+	return le32_to_cpu((__force __le32)val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* defines to set Packet extension values which can be 0 us, 8 usec or 16 usec */</div><div class='add'>+#define MAX_HE_NSS               8</div><div class='add'>+#define MAX_HE_MODULATION        8</div><div class='add'>+#define MAX_HE_RU                4</div><div class='add'>+#define HE_MODULATION_NONE       7</div><div class='add'>+#define HE_PET_0_USEC            0</div><div class='add'>+#define HE_PET_8_USEC            1</div><div class='add'>+#define HE_PET_16_USEC           2</div><div class='add'>+</div><div class='add'>+#define WMI_MAX_CHAINS		 8</div><div class='add'>+</div><div class='add'>+#define WMI_MAX_NUM_SS                    MAX_HE_NSS</div><div class='add'>+#define WMI_MAX_NUM_RU                    MAX_HE_RU</div><div class='add'>+</div><div class='add'>+#define WMI_TLV_CMD(grp_id) (((grp_id) &lt;&lt; 12) | 0x1)</div><div class='add'>+#define WMI_TLV_EV(grp_id) (((grp_id) &lt;&lt; 12) | 0x1)</div><div class='add'>+#define WMI_TLV_CMD_UNSUPPORTED 0</div><div class='add'>+#define WMI_TLV_PDEV_PARAM_UNSUPPORTED 0</div><div class='add'>+#define WMI_TLV_VDEV_PARAM_UNSUPPORTED 0</div><div class='add'>+</div><div class='add'>+struct wmi_cmd_hdr {</div><div class='add'>+	__le32 cmd_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_tlv {</div><div class='add'>+	__le32 header;</div><div class='add'>+	u8 value[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_TLV_LEN	GENMASK(15, 0)</div><div class='add'>+#define WMI_TLV_TAG	GENMASK(31, 16)</div><div class='add'>+#define TLV_HDR_SIZE	sizeof_field(struct wmi_tlv, header)</div><div class='add'>+</div><div class='add'>+#define WMI_CMD_HDR_CMD_ID      GENMASK(23, 0)</div><div class='add'>+#define WMI_MAX_MEM_REQS        32</div><div class='add'>+#define ATH12K_MAX_HW_LISTEN_INTERVAL 5</div><div class='add'>+</div><div class='add'>+#define WMI_HOST_RC_DS_FLAG			0x01</div><div class='add'>+#define WMI_HOST_RC_CW40_FLAG			0x02</div><div class='add'>+#define WMI_HOST_RC_SGI_FLAG			0x04</div><div class='add'>+#define WMI_HOST_RC_HT_FLAG			0x08</div><div class='add'>+#define WMI_HOST_RC_RTSCTS_FLAG			0x10</div><div class='add'>+#define WMI_HOST_RC_TX_STBC_FLAG		0x20</div><div class='add'>+#define WMI_HOST_RC_RX_STBC_FLAG		0xC0</div><div class='add'>+#define WMI_HOST_RC_RX_STBC_FLAG_S		6</div><div class='add'>+#define WMI_HOST_RC_WEP_TKIP_FLAG		0x100</div><div class='add'>+#define WMI_HOST_RC_TS_FLAG			0x200</div><div class='add'>+#define WMI_HOST_RC_UAPSD_FLAG			0x400</div><div class='add'>+</div><div class='add'>+#define WMI_HT_CAP_ENABLED			0x0001</div><div class='add'>+#define WMI_HT_CAP_HT20_SGI			0x0002</div><div class='add'>+#define WMI_HT_CAP_DYNAMIC_SMPS			0x0004</div><div class='add'>+#define WMI_HT_CAP_TX_STBC			0x0008</div><div class='add'>+#define WMI_HT_CAP_TX_STBC_MASK_SHIFT		3</div><div class='add'>+#define WMI_HT_CAP_RX_STBC			0x0030</div><div class='add'>+#define WMI_HT_CAP_RX_STBC_MASK_SHIFT		4</div><div class='add'>+#define WMI_HT_CAP_LDPC				0x0040</div><div class='add'>+#define WMI_HT_CAP_L_SIG_TXOP_PROT		0x0080</div><div class='add'>+#define WMI_HT_CAP_MPDU_DENSITY			0x0700</div><div class='add'>+#define WMI_HT_CAP_MPDU_DENSITY_MASK_SHIFT	8</div><div class='add'>+#define WMI_HT_CAP_HT40_SGI			0x0800</div><div class='add'>+#define WMI_HT_CAP_RX_LDPC			0x1000</div><div class='add'>+#define WMI_HT_CAP_TX_LDPC			0x2000</div><div class='add'>+#define WMI_HT_CAP_IBF_BFER			0x4000</div><div class='add'>+</div><div class='add'>+/* These macros should be used when we wish to advertise STBC support for</div><div class='add'>+ * only 1SS or 2SS or 3SS.</div><div class='add'>+ */</div><div class='add'>+#define WMI_HT_CAP_RX_STBC_1SS			0x0010</div><div class='add'>+#define WMI_HT_CAP_RX_STBC_2SS			0x0020</div><div class='add'>+#define WMI_HT_CAP_RX_STBC_3SS			0x0030</div><div class='add'>+</div><div class='add'>+#define WMI_HT_CAP_DEFAULT_ALL (WMI_HT_CAP_ENABLED    | \</div><div class='add'>+				WMI_HT_CAP_HT20_SGI   | \</div><div class='add'>+				WMI_HT_CAP_HT40_SGI   | \</div><div class='add'>+				WMI_HT_CAP_TX_STBC    | \</div><div class='add'>+				WMI_HT_CAP_RX_STBC    | \</div><div class='add'>+				WMI_HT_CAP_LDPC)</div><div class='add'>+</div><div class='add'>+#define WMI_VHT_CAP_MAX_MPDU_LEN_MASK		0x00000003</div><div class='add'>+#define WMI_VHT_CAP_RX_LDPC			0x00000010</div><div class='add'>+#define WMI_VHT_CAP_SGI_80MHZ			0x00000020</div><div class='add'>+#define WMI_VHT_CAP_SGI_160MHZ			0x00000040</div><div class='add'>+#define WMI_VHT_CAP_TX_STBC			0x00000080</div><div class='add'>+#define WMI_VHT_CAP_RX_STBC_MASK		0x00000300</div><div class='add'>+#define WMI_VHT_CAP_RX_STBC_MASK_SHIFT		8</div><div class='add'>+#define WMI_VHT_CAP_SU_BFER			0x00000800</div><div class='add'>+#define WMI_VHT_CAP_SU_BFEE			0x00001000</div><div class='add'>+#define WMI_VHT_CAP_MAX_CS_ANT_MASK		0x0000E000</div><div class='add'>+#define WMI_VHT_CAP_MAX_CS_ANT_MASK_SHIFT	13</div><div class='add'>+#define WMI_VHT_CAP_MAX_SND_DIM_MASK		0x00070000</div><div class='add'>+#define WMI_VHT_CAP_MAX_SND_DIM_MASK_SHIFT	16</div><div class='add'>+#define WMI_VHT_CAP_MU_BFER			0x00080000</div><div class='add'>+#define WMI_VHT_CAP_MU_BFEE			0x00100000</div><div class='add'>+#define WMI_VHT_CAP_MAX_AMPDU_LEN_EXP		0x03800000</div><div class='add'>+#define WMI_VHT_CAP_MAX_AMPDU_LEN_EXP_SHIT	23</div><div class='add'>+#define WMI_VHT_CAP_RX_FIXED_ANT		0x10000000</div><div class='add'>+#define WMI_VHT_CAP_TX_FIXED_ANT		0x20000000</div><div class='add'>+</div><div class='add'>+#define WMI_VHT_CAP_MAX_MPDU_LEN_11454		0x00000002</div><div class='add'>+</div><div class='add'>+/* These macros should be used when we wish to advertise STBC support for</div><div class='add'>+ * only 1SS or 2SS or 3SS.</div><div class='add'>+ */</div><div class='add'>+#define WMI_VHT_CAP_RX_STBC_1SS			0x00000100</div><div class='add'>+#define WMI_VHT_CAP_RX_STBC_2SS			0x00000200</div><div class='add'>+#define WMI_VHT_CAP_RX_STBC_3SS			0x00000300</div><div class='add'>+</div><div class='add'>+#define WMI_VHT_CAP_DEFAULT_ALL (WMI_VHT_CAP_MAX_MPDU_LEN_11454  | \</div><div class='add'>+				 WMI_VHT_CAP_SGI_80MHZ      |       \</div><div class='add'>+				 WMI_VHT_CAP_TX_STBC        |       \</div><div class='add'>+				 WMI_VHT_CAP_RX_STBC_MASK   |       \</div><div class='add'>+				 WMI_VHT_CAP_RX_LDPC        |       \</div><div class='add'>+				 WMI_VHT_CAP_MAX_AMPDU_LEN_EXP   |  \</div><div class='add'>+				 WMI_VHT_CAP_RX_FIXED_ANT   |       \</div><div class='add'>+				 WMI_VHT_CAP_TX_FIXED_ANT)</div><div class='add'>+</div><div class='add'>+#define WLAN_SCAN_MAX_HINT_S_SSID        10</div><div class='add'>+#define WLAN_SCAN_MAX_HINT_BSSID         10</div><div class='add'>+#define MAX_RNR_BSS                    5</div><div class='add'>+</div><div class='add'>+#define WMI_APPEND_TO_EXISTING_CHAN_LIST_FLAG 1</div><div class='add'>+</div><div class='add'>+#define WMI_BA_MODE_BUFFER_SIZE_256  3</div><div class='add'>+</div><div class='add'>+/* HW mode config type replicated from FW header</div><div class='add'>+ * @WMI_HOST_HW_MODE_SINGLE: Only one PHY is active.</div><div class='add'>+ * @WMI_HOST_HW_MODE_DBS: Both PHYs are active in different bands,</div><div class='add'>+ *                        one in 2G and another in 5G.</div><div class='add'>+ * @WMI_HOST_HW_MODE_SBS_PASSIVE: Both PHYs are in passive mode (only rx) in</div><div class='add'>+ *                        same band; no tx allowed.</div><div class='add'>+ * @WMI_HOST_HW_MODE_SBS: Both PHYs are active in the same band.</div><div class='add'>+ *                        Support for both PHYs within one band is planned</div><div class='add'>+ *                        for 5G only(as indicated in WMI_MAC_PHY_CAPABILITIES),</div><div class='add'>+ *                        but could be extended to other bands in the future.</div><div class='add'>+ *                        The separation of the band between the two PHYs needs</div><div class='add'>+ *                        to be communicated separately.</div><div class='add'>+ * @WMI_HOST_HW_MODE_DBS_SBS: 3 PHYs, with 2 on the same band doing SBS</div><div class='add'>+ *                           as in WMI_HW_MODE_SBS, and 3rd on the other band</div><div class='add'>+ * @WMI_HOST_HW_MODE_DBS_OR_SBS: Two PHY with one PHY capabale of both 2G and</div><div class='add'>+ *                        5G. It can support SBS (5G + 5G) OR DBS (5G + 2G).</div><div class='add'>+ * @WMI_HOST_HW_MODE_MAX: Max hw_mode_id. Used to indicate invalid mode.</div><div class='add'>+ */</div><div class='add'>+enum wmi_host_hw_mode_config_type {</div><div class='add'>+	WMI_HOST_HW_MODE_SINGLE       = 0,</div><div class='add'>+	WMI_HOST_HW_MODE_DBS          = 1,</div><div class='add'>+	WMI_HOST_HW_MODE_SBS_PASSIVE  = 2,</div><div class='add'>+	WMI_HOST_HW_MODE_SBS          = 3,</div><div class='add'>+	WMI_HOST_HW_MODE_DBS_SBS      = 4,</div><div class='add'>+	WMI_HOST_HW_MODE_DBS_OR_SBS   = 5,</div><div class='add'>+</div><div class='add'>+	/* keep last */</div><div class='add'>+	WMI_HOST_HW_MODE_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* HW mode priority values used to detect the preferred HW mode</div><div class='add'>+ * on the available modes.</div><div class='add'>+ */</div><div class='add'>+enum wmi_host_hw_mode_priority {</div><div class='add'>+	WMI_HOST_HW_MODE_DBS_SBS_PRI,</div><div class='add'>+	WMI_HOST_HW_MODE_DBS_PRI,</div><div class='add'>+	WMI_HOST_HW_MODE_DBS_OR_SBS_PRI,</div><div class='add'>+	WMI_HOST_HW_MODE_SBS_PRI,</div><div class='add'>+	WMI_HOST_HW_MODE_SBS_PASSIVE_PRI,</div><div class='add'>+	WMI_HOST_HW_MODE_SINGLE_PRI,</div><div class='add'>+</div><div class='add'>+	/* keep last the lowest priority */</div><div class='add'>+	WMI_HOST_HW_MODE_MAX_PRI</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum WMI_HOST_WLAN_BAND {</div><div class='add'>+	WMI_HOST_WLAN_2GHZ_CAP		= 1,</div><div class='add'>+	WMI_HOST_WLAN_5GHZ_CAP		= 2,</div><div class='add'>+	WMI_HOST_WLAN_2GHZ_5GHZ_CAP	= 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Parameters used for WMI_VDEV_PARAM_AUTORATE_MISC_CFG command.</div><div class='add'>+ * Used for HE and EHT auto rate mode.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	/* LTF related configuration */</div><div class='add'>+	WMI_AUTORATE_LTF_1X = BIT(0),</div><div class='add'>+	WMI_AUTORATE_LTF_2X = BIT(1),</div><div class='add'>+	WMI_AUTORATE_LTF_4X = BIT(2),</div><div class='add'>+</div><div class='add'>+	/* GI related configuration */</div><div class='add'>+	WMI_AUTORATE_400NS_GI = BIT(8),</div><div class='add'>+	WMI_AUTORATE_800NS_GI = BIT(9),</div><div class='add'>+	WMI_AUTORATE_1600NS_GI = BIT(10),</div><div class='add'>+	WMI_AUTORATE_3200NS_GI = BIT(11),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_cmd_group {</div><div class='add'>+	/* 0 to 2 are reserved */</div><div class='add'>+	WMI_GRP_START = 0x3,</div><div class='add'>+	WMI_GRP_SCAN = WMI_GRP_START,</div><div class='add'>+	WMI_GRP_PDEV		= 0x4,</div><div class='add'>+	WMI_GRP_VDEV           = 0x5,</div><div class='add'>+	WMI_GRP_PEER           = 0x6,</div><div class='add'>+	WMI_GRP_MGMT           = 0x7,</div><div class='add'>+	WMI_GRP_BA_NEG         = 0x8,</div><div class='add'>+	WMI_GRP_STA_PS         = 0x9,</div><div class='add'>+	WMI_GRP_DFS            = 0xa,</div><div class='add'>+	WMI_GRP_ROAM           = 0xb,</div><div class='add'>+	WMI_GRP_OFL_SCAN       = 0xc,</div><div class='add'>+	WMI_GRP_P2P            = 0xd,</div><div class='add'>+	WMI_GRP_AP_PS          = 0xe,</div><div class='add'>+	WMI_GRP_RATE_CTRL      = 0xf,</div><div class='add'>+	WMI_GRP_PROFILE        = 0x10,</div><div class='add'>+	WMI_GRP_SUSPEND        = 0x11,</div><div class='add'>+	WMI_GRP_BCN_FILTER     = 0x12,</div><div class='add'>+	WMI_GRP_WOW            = 0x13,</div><div class='add'>+	WMI_GRP_RTT            = 0x14,</div><div class='add'>+	WMI_GRP_SPECTRAL       = 0x15,</div><div class='add'>+	WMI_GRP_STATS          = 0x16,</div><div class='add'>+	WMI_GRP_ARP_NS_OFL     = 0x17,</div><div class='add'>+	WMI_GRP_NLO_OFL        = 0x18,</div><div class='add'>+	WMI_GRP_GTK_OFL        = 0x19,</div><div class='add'>+	WMI_GRP_CSA_OFL        = 0x1a,</div><div class='add'>+	WMI_GRP_CHATTER        = 0x1b,</div><div class='add'>+	WMI_GRP_TID_ADDBA      = 0x1c,</div><div class='add'>+	WMI_GRP_MISC           = 0x1d,</div><div class='add'>+	WMI_GRP_GPIO           = 0x1e,</div><div class='add'>+	WMI_GRP_FWTEST         = 0x1f,</div><div class='add'>+	WMI_GRP_TDLS           = 0x20,</div><div class='add'>+	WMI_GRP_RESMGR         = 0x21,</div><div class='add'>+	WMI_GRP_STA_SMPS       = 0x22,</div><div class='add'>+	WMI_GRP_WLAN_HB        = 0x23,</div><div class='add'>+	WMI_GRP_RMC            = 0x24,</div><div class='add'>+	WMI_GRP_MHF_OFL        = 0x25,</div><div class='add'>+	WMI_GRP_LOCATION_SCAN  = 0x26,</div><div class='add'>+	WMI_GRP_OEM            = 0x27,</div><div class='add'>+	WMI_GRP_NAN            = 0x28,</div><div class='add'>+	WMI_GRP_COEX           = 0x29,</div><div class='add'>+	WMI_GRP_OBSS_OFL       = 0x2a,</div><div class='add'>+	WMI_GRP_LPI            = 0x2b,</div><div class='add'>+	WMI_GRP_EXTSCAN        = 0x2c,</div><div class='add'>+	WMI_GRP_DHCP_OFL       = 0x2d,</div><div class='add'>+	WMI_GRP_IPA            = 0x2e,</div><div class='add'>+	WMI_GRP_MDNS_OFL       = 0x2f,</div><div class='add'>+	WMI_GRP_SAP_OFL        = 0x30,</div><div class='add'>+	WMI_GRP_OCB            = 0x31,</div><div class='add'>+	WMI_GRP_SOC            = 0x32,</div><div class='add'>+	WMI_GRP_PKT_FILTER     = 0x33,</div><div class='add'>+	WMI_GRP_MAWC           = 0x34,</div><div class='add'>+	WMI_GRP_PMF_OFFLOAD    = 0x35,</div><div class='add'>+	WMI_GRP_BPF_OFFLOAD    = 0x36,</div><div class='add'>+	WMI_GRP_NAN_DATA       = 0x37,</div><div class='add'>+	WMI_GRP_PROTOTYPE      = 0x38,</div><div class='add'>+	WMI_GRP_MONITOR        = 0x39,</div><div class='add'>+	WMI_GRP_REGULATORY     = 0x3a,</div><div class='add'>+	WMI_GRP_HW_DATA_FILTER = 0x3b,</div><div class='add'>+	WMI_GRP_WLM            = 0x3c,</div><div class='add'>+	WMI_GRP_11K_OFFLOAD    = 0x3d,</div><div class='add'>+	WMI_GRP_TWT            = 0x3e,</div><div class='add'>+	WMI_GRP_MOTION_DET     = 0x3f,</div><div class='add'>+	WMI_GRP_SPATIAL_REUSE  = 0x40,</div><div class='add'>+	WMI_GRP_MLO            = 0x48,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WMI_CMD_GRP(grp_id) (((grp_id) &lt;&lt; 12) | 0x1)</div><div class='add'>+#define WMI_EVT_GRP_START_ID(grp_id) (((grp_id) &lt;&lt; 12) | 0x1)</div><div class='add'>+</div><div class='add'>+enum wmi_tlv_cmd_id {</div><div class='add'>+	WMI_CMD_UNSUPPORTED = 0,</div><div class='add'>+	WMI_INIT_CMDID = 0x1,</div><div class='add'>+	WMI_START_SCAN_CMDID = WMI_TLV_CMD(WMI_GRP_SCAN),</div><div class='add'>+	WMI_STOP_SCAN_CMDID,</div><div class='add'>+	WMI_SCAN_CHAN_LIST_CMDID,</div><div class='add'>+	WMI_SCAN_SCH_PRIO_TBL_CMDID,</div><div class='add'>+	WMI_SCAN_UPDATE_REQUEST_CMDID,</div><div class='add'>+	WMI_SCAN_PROB_REQ_OUI_CMDID,</div><div class='add'>+	WMI_SCAN_ADAPTIVE_DWELL_CONFIG_CMDID,</div><div class='add'>+	WMI_PDEV_SET_REGDOMAIN_CMDID = WMI_TLV_CMD(WMI_GRP_PDEV),</div><div class='add'>+	WMI_PDEV_SET_CHANNEL_CMDID,</div><div class='add'>+	WMI_PDEV_SET_PARAM_CMDID,</div><div class='add'>+	WMI_PDEV_PKTLOG_ENABLE_CMDID,</div><div class='add'>+	WMI_PDEV_PKTLOG_DISABLE_CMDID,</div><div class='add'>+	WMI_PDEV_SET_WMM_PARAMS_CMDID,</div><div class='add'>+	WMI_PDEV_SET_HT_CAP_IE_CMDID,</div><div class='add'>+	WMI_PDEV_SET_VHT_CAP_IE_CMDID,</div><div class='add'>+	WMI_PDEV_SET_DSCP_TID_MAP_CMDID,</div><div class='add'>+	WMI_PDEV_SET_QUIET_MODE_CMDID,</div><div class='add'>+	WMI_PDEV_GREEN_AP_PS_ENABLE_CMDID,</div><div class='add'>+	WMI_PDEV_GET_TPC_CONFIG_CMDID,</div><div class='add'>+	WMI_PDEV_SET_BASE_MACADDR_CMDID,</div><div class='add'>+	WMI_PDEV_DUMP_CMDID,</div><div class='add'>+	WMI_PDEV_SET_LED_CONFIG_CMDID,</div><div class='add'>+	WMI_PDEV_GET_TEMPERATURE_CMDID,</div><div class='add'>+	WMI_PDEV_SET_LED_FLASHING_CMDID,</div><div class='add'>+	WMI_PDEV_SMART_ANT_ENABLE_CMDID,</div><div class='add'>+	WMI_PDEV_SMART_ANT_SET_RX_ANTENNA_CMDID,</div><div class='add'>+	WMI_PDEV_SET_ANTENNA_SWITCH_TABLE_CMDID,</div><div class='add'>+	WMI_PDEV_SET_CTL_TABLE_CMDID,</div><div class='add'>+	WMI_PDEV_SET_MIMOGAIN_TABLE_CMDID,</div><div class='add'>+	WMI_PDEV_FIPS_CMDID,</div><div class='add'>+	WMI_PDEV_GET_ANI_CCK_CONFIG_CMDID,</div><div class='add'>+	WMI_PDEV_GET_ANI_OFDM_CONFIG_CMDID,</div><div class='add'>+	WMI_PDEV_GET_NFCAL_POWER_CMDID,</div><div class='add'>+	WMI_PDEV_GET_TPC_CMDID,</div><div class='add'>+	WMI_MIB_STATS_ENABLE_CMDID,</div><div class='add'>+	WMI_PDEV_SET_PCL_CMDID,</div><div class='add'>+	WMI_PDEV_SET_HW_MODE_CMDID,</div><div class='add'>+	WMI_PDEV_SET_MAC_CONFIG_CMDID,</div><div class='add'>+	WMI_PDEV_SET_ANTENNA_MODE_CMDID,</div><div class='add'>+	WMI_SET_PERIODIC_CHANNEL_STATS_CONFIG_CMDID,</div><div class='add'>+	WMI_PDEV_WAL_POWER_DEBUG_CMDID,</div><div class='add'>+	WMI_PDEV_SET_REORDER_TIMEOUT_VAL_CMDID,</div><div class='add'>+	WMI_PDEV_SET_WAKEUP_CONFIG_CMDID,</div><div class='add'>+	WMI_PDEV_GET_ANTDIV_STATUS_CMDID,</div><div class='add'>+	WMI_PDEV_GET_CHIP_POWER_STATS_CMDID,</div><div class='add'>+	WMI_PDEV_SET_STATS_THRESHOLD_CMDID,</div><div class='add'>+	WMI_PDEV_MULTIPLE_VDEV_RESTART_REQUEST_CMDID,</div><div class='add'>+	WMI_PDEV_UPDATE_PKT_ROUTING_CMDID,</div><div class='add'>+	WMI_PDEV_CHECK_CAL_VERSION_CMDID,</div><div class='add'>+	WMI_PDEV_SET_DIVERSITY_GAIN_CMDID,</div><div class='add'>+	WMI_PDEV_DIV_GET_RSSI_ANTID_CMDID,</div><div class='add'>+	WMI_PDEV_BSS_CHAN_INFO_REQUEST_CMDID,</div><div class='add'>+	WMI_PDEV_UPDATE_PMK_CACHE_CMDID,</div><div class='add'>+	WMI_PDEV_UPDATE_FILS_HLP_PKT_CMDID,</div><div class='add'>+	WMI_PDEV_UPDATE_CTLTABLE_REQUEST_CMDID,</div><div class='add'>+	WMI_PDEV_CONFIG_VENDOR_OUI_ACTION_CMDID,</div><div class='add'>+	WMI_PDEV_SET_AC_TX_QUEUE_OPTIMIZED_CMDID,</div><div class='add'>+	WMI_PDEV_SET_RX_FILTER_PROMISCUOUS_CMDID,</div><div class='add'>+	WMI_PDEV_DMA_RING_CFG_REQ_CMDID,</div><div class='add'>+	WMI_PDEV_HE_TB_ACTION_FRM_CMDID,</div><div class='add'>+	WMI_PDEV_PKTLOG_FILTER_CMDID,</div><div class='add'>+	WMI_PDEV_SET_BIOS_SAR_TABLE_CMDID = 0x4044,</div><div class='add'>+	WMI_PDEV_SET_BIOS_GEO_TABLE_CMDID = 0x4045,</div><div class='add'>+	WMI_PDEV_SET_BIOS_INTERFACE_CMDID = 0x404A,</div><div class='add'>+	WMI_VDEV_CREATE_CMDID = WMI_TLV_CMD(WMI_GRP_VDEV),</div><div class='add'>+	WMI_VDEV_DELETE_CMDID,</div><div class='add'>+	WMI_VDEV_START_REQUEST_CMDID,</div><div class='add'>+	WMI_VDEV_RESTART_REQUEST_CMDID,</div><div class='add'>+	WMI_VDEV_UP_CMDID,</div><div class='add'>+	WMI_VDEV_STOP_CMDID,</div><div class='add'>+	WMI_VDEV_DOWN_CMDID,</div><div class='add'>+	WMI_VDEV_SET_PARAM_CMDID,</div><div class='add'>+	WMI_VDEV_INSTALL_KEY_CMDID,</div><div class='add'>+	WMI_VDEV_WNM_SLEEPMODE_CMDID,</div><div class='add'>+	WMI_VDEV_WMM_ADDTS_CMDID,</div><div class='add'>+	WMI_VDEV_WMM_DELTS_CMDID,</div><div class='add'>+	WMI_VDEV_SET_WMM_PARAMS_CMDID,</div><div class='add'>+	WMI_VDEV_SET_GTX_PARAMS_CMDID,</div><div class='add'>+	WMI_VDEV_IPSEC_NATKEEPALIVE_FILTER_CMDID,</div><div class='add'>+	WMI_VDEV_PLMREQ_START_CMDID,</div><div class='add'>+	WMI_VDEV_PLMREQ_STOP_CMDID,</div><div class='add'>+	WMI_VDEV_TSF_TSTAMP_ACTION_CMDID,</div><div class='add'>+	WMI_VDEV_SET_IE_CMDID,</div><div class='add'>+	WMI_VDEV_RATEMASK_CMDID,</div><div class='add'>+	WMI_VDEV_ATF_REQUEST_CMDID,</div><div class='add'>+	WMI_VDEV_SET_DSCP_TID_MAP_CMDID,</div><div class='add'>+	WMI_VDEV_FILTER_NEIGHBOR_RX_PACKETS_CMDID,</div><div class='add'>+	WMI_VDEV_SET_QUIET_MODE_CMDID,</div><div class='add'>+	WMI_VDEV_SET_CUSTOM_AGGR_SIZE_CMDID,</div><div class='add'>+	WMI_VDEV_ENCRYPT_DECRYPT_DATA_REQ_CMDID,</div><div class='add'>+	WMI_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_CMDID,</div><div class='add'>+	WMI_VDEV_SET_ARP_STAT_CMDID,</div><div class='add'>+	WMI_VDEV_GET_ARP_STAT_CMDID,</div><div class='add'>+	WMI_VDEV_GET_TX_POWER_CMDID,</div><div class='add'>+	WMI_VDEV_LIMIT_OFFCHAN_CMDID,</div><div class='add'>+	WMI_VDEV_SET_CUSTOM_SW_RETRY_TH_CMDID,</div><div class='add'>+	WMI_VDEV_CHAINMASK_CONFIG_CMDID,</div><div class='add'>+	WMI_VDEV_GET_BCN_RECEPTION_STATS_CMDID,</div><div class='add'>+	WMI_VDEV_GET_MWS_COEX_INFO_CMDID,</div><div class='add'>+	WMI_VDEV_DELETE_ALL_PEER_CMDID,</div><div class='add'>+	WMI_VDEV_BSS_MAX_IDLE_TIME_CMDID,</div><div class='add'>+	WMI_VDEV_AUDIO_SYNC_TRIGGER_CMDID,</div><div class='add'>+	WMI_VDEV_AUDIO_SYNC_QTIMER_CMDID,</div><div class='add'>+	WMI_VDEV_SET_PCL_CMDID,</div><div class='add'>+	WMI_VDEV_GET_BIG_DATA_CMDID,</div><div class='add'>+	WMI_VDEV_GET_BIG_DATA_P2_CMDID,</div><div class='add'>+	WMI_VDEV_SET_TPC_POWER_CMDID,</div><div class='add'>+	WMI_PEER_CREATE_CMDID = WMI_TLV_CMD(WMI_GRP_PEER),</div><div class='add'>+	WMI_PEER_DELETE_CMDID,</div><div class='add'>+	WMI_PEER_FLUSH_TIDS_CMDID,</div><div class='add'>+	WMI_PEER_SET_PARAM_CMDID,</div><div class='add'>+	WMI_PEER_ASSOC_CMDID,</div><div class='add'>+	WMI_PEER_ADD_WDS_ENTRY_CMDID,</div><div class='add'>+	WMI_PEER_REMOVE_WDS_ENTRY_CMDID,</div><div class='add'>+	WMI_PEER_MCAST_GROUP_CMDID,</div><div class='add'>+	WMI_PEER_INFO_REQ_CMDID,</div><div class='add'>+	WMI_PEER_GET_ESTIMATED_LINKSPEED_CMDID,</div><div class='add'>+	WMI_PEER_SET_RATE_REPORT_CONDITION_CMDID,</div><div class='add'>+	WMI_PEER_UPDATE_WDS_ENTRY_CMDID,</div><div class='add'>+	WMI_PEER_ADD_PROXY_STA_ENTRY_CMDID,</div><div class='add'>+	WMI_PEER_SMART_ANT_SET_TX_ANTENNA_CMDID,</div><div class='add'>+	WMI_PEER_SMART_ANT_SET_TRAIN_INFO_CMDID,</div><div class='add'>+	WMI_PEER_SMART_ANT_SET_NODE_CONFIG_OPS_CMDID,</div><div class='add'>+	WMI_PEER_ATF_REQUEST_CMDID,</div><div class='add'>+	WMI_PEER_BWF_REQUEST_CMDID,</div><div class='add'>+	WMI_PEER_REORDER_QUEUE_SETUP_CMDID,</div><div class='add'>+	WMI_PEER_REORDER_QUEUE_REMOVE_CMDID,</div><div class='add'>+	WMI_PEER_SET_RX_BLOCKSIZE_CMDID,</div><div class='add'>+	WMI_PEER_ANTDIV_INFO_REQ_CMDID,</div><div class='add'>+	WMI_BCN_TX_CMDID = WMI_TLV_CMD(WMI_GRP_MGMT),</div><div class='add'>+	WMI_PDEV_SEND_BCN_CMDID,</div><div class='add'>+	WMI_BCN_TMPL_CMDID,</div><div class='add'>+	WMI_BCN_FILTER_RX_CMDID,</div><div class='add'>+	WMI_PRB_REQ_FILTER_RX_CMDID,</div><div class='add'>+	WMI_MGMT_TX_CMDID,</div><div class='add'>+	WMI_PRB_TMPL_CMDID,</div><div class='add'>+	WMI_MGMT_TX_SEND_CMDID,</div><div class='add'>+	WMI_OFFCHAN_DATA_TX_SEND_CMDID,</div><div class='add'>+	WMI_PDEV_SEND_FD_CMDID,</div><div class='add'>+	WMI_BCN_OFFLOAD_CTRL_CMDID,</div><div class='add'>+	WMI_BSS_COLOR_CHANGE_ENABLE_CMDID,</div><div class='add'>+	WMI_VDEV_BCN_OFFLOAD_QUIET_CONFIG_CMDID,</div><div class='add'>+	WMI_FILS_DISCOVERY_TMPL_CMDID,</div><div class='add'>+	WMI_ADDBA_CLEAR_RESP_CMDID = WMI_TLV_CMD(WMI_GRP_BA_NEG),</div><div class='add'>+	WMI_ADDBA_SEND_CMDID,</div><div class='add'>+	WMI_ADDBA_STATUS_CMDID,</div><div class='add'>+	WMI_DELBA_SEND_CMDID,</div><div class='add'>+	WMI_ADDBA_SET_RESP_CMDID,</div><div class='add'>+	WMI_SEND_SINGLEAMSDU_CMDID,</div><div class='add'>+	WMI_STA_POWERSAVE_MODE_CMDID = WMI_TLV_CMD(WMI_GRP_STA_PS),</div><div class='add'>+	WMI_STA_POWERSAVE_PARAM_CMDID,</div><div class='add'>+	WMI_STA_MIMO_PS_MODE_CMDID,</div><div class='add'>+	WMI_PDEV_DFS_ENABLE_CMDID = WMI_TLV_CMD(WMI_GRP_DFS),</div><div class='add'>+	WMI_PDEV_DFS_DISABLE_CMDID,</div><div class='add'>+	WMI_DFS_PHYERR_FILTER_ENA_CMDID,</div><div class='add'>+	WMI_DFS_PHYERR_FILTER_DIS_CMDID,</div><div class='add'>+	WMI_PDEV_DFS_PHYERR_OFFLOAD_ENABLE_CMDID,</div><div class='add'>+	WMI_PDEV_DFS_PHYERR_OFFLOAD_DISABLE_CMDID,</div><div class='add'>+	WMI_VDEV_ADFS_CH_CFG_CMDID,</div><div class='add'>+	WMI_VDEV_ADFS_OCAC_ABORT_CMDID,</div><div class='add'>+	WMI_ROAM_SCAN_MODE = WMI_TLV_CMD(WMI_GRP_ROAM),</div><div class='add'>+	WMI_ROAM_SCAN_RSSI_THRESHOLD,</div><div class='add'>+	WMI_ROAM_SCAN_PERIOD,</div><div class='add'>+	WMI_ROAM_SCAN_RSSI_CHANGE_THRESHOLD,</div><div class='add'>+	WMI_ROAM_AP_PROFILE,</div><div class='add'>+	WMI_ROAM_CHAN_LIST,</div><div class='add'>+	WMI_ROAM_SCAN_CMD,</div><div class='add'>+	WMI_ROAM_SYNCH_COMPLETE,</div><div class='add'>+	WMI_ROAM_SET_RIC_REQUEST_CMDID,</div><div class='add'>+	WMI_ROAM_INVOKE_CMDID,</div><div class='add'>+	WMI_ROAM_FILTER_CMDID,</div><div class='add'>+	WMI_ROAM_SUBNET_CHANGE_CONFIG_CMDID,</div><div class='add'>+	WMI_ROAM_CONFIGURE_MAWC_CMDID,</div><div class='add'>+	WMI_ROAM_SET_MBO_PARAM_CMDID,</div><div class='add'>+	WMI_ROAM_PER_CONFIG_CMDID,</div><div class='add'>+	WMI_ROAM_BTM_CONFIG_CMDID,</div><div class='add'>+	WMI_ENABLE_FILS_CMDID,</div><div class='add'>+	WMI_OFL_SCAN_ADD_AP_PROFILE = WMI_TLV_CMD(WMI_GRP_OFL_SCAN),</div><div class='add'>+	WMI_OFL_SCAN_REMOVE_AP_PROFILE,</div><div class='add'>+	WMI_OFL_SCAN_PERIOD,</div><div class='add'>+	WMI_P2P_DEV_SET_DEVICE_INFO = WMI_TLV_CMD(WMI_GRP_P2P),</div><div class='add'>+	WMI_P2P_DEV_SET_DISCOVERABILITY,</div><div class='add'>+	WMI_P2P_GO_SET_BEACON_IE,</div><div class='add'>+	WMI_P2P_GO_SET_PROBE_RESP_IE,</div><div class='add'>+	WMI_P2P_SET_VENDOR_IE_DATA_CMDID,</div><div class='add'>+	WMI_P2P_DISC_OFFLOAD_CONFIG_CMDID,</div><div class='add'>+	WMI_P2P_DISC_OFFLOAD_APPIE_CMDID,</div><div class='add'>+	WMI_P2P_DISC_OFFLOAD_PATTERN_CMDID,</div><div class='add'>+	WMI_P2P_SET_OPPPS_PARAM_CMDID,</div><div class='add'>+	WMI_P2P_LISTEN_OFFLOAD_START_CMDID,</div><div class='add'>+	WMI_P2P_LISTEN_OFFLOAD_STOP_CMDID,</div><div class='add'>+	WMI_AP_PS_PEER_PARAM_CMDID = WMI_TLV_CMD(WMI_GRP_AP_PS),</div><div class='add'>+	WMI_AP_PS_PEER_UAPSD_COEX_CMDID,</div><div class='add'>+	WMI_AP_PS_EGAP_PARAM_CMDID,</div><div class='add'>+	WMI_PEER_RATE_RETRY_SCHED_CMDID = WMI_TLV_CMD(WMI_GRP_RATE_CTRL),</div><div class='add'>+	WMI_WLAN_PROFILE_TRIGGER_CMDID = WMI_TLV_CMD(WMI_GRP_PROFILE),</div><div class='add'>+	WMI_WLAN_PROFILE_SET_HIST_INTVL_CMDID,</div><div class='add'>+	WMI_WLAN_PROFILE_GET_PROFILE_DATA_CMDID,</div><div class='add'>+	WMI_WLAN_PROFILE_ENABLE_PROFILE_ID_CMDID,</div><div class='add'>+	WMI_WLAN_PROFILE_LIST_PROFILE_ID_CMDID,</div><div class='add'>+	WMI_PDEV_SUSPEND_CMDID = WMI_TLV_CMD(WMI_GRP_SUSPEND),</div><div class='add'>+	WMI_PDEV_RESUME_CMDID,</div><div class='add'>+	WMI_ADD_BCN_FILTER_CMDID = WMI_TLV_CMD(WMI_GRP_BCN_FILTER),</div><div class='add'>+	WMI_RMV_BCN_FILTER_CMDID,</div><div class='add'>+	WMI_WOW_ADD_WAKE_PATTERN_CMDID = WMI_TLV_CMD(WMI_GRP_WOW),</div><div class='add'>+	WMI_WOW_DEL_WAKE_PATTERN_CMDID,</div><div class='add'>+	WMI_WOW_ENABLE_DISABLE_WAKE_EVENT_CMDID,</div><div class='add'>+	WMI_WOW_ENABLE_CMDID,</div><div class='add'>+	WMI_WOW_HOSTWAKEUP_FROM_SLEEP_CMDID,</div><div class='add'>+	WMI_WOW_IOAC_ADD_KEEPALIVE_CMDID,</div><div class='add'>+	WMI_WOW_IOAC_DEL_KEEPALIVE_CMDID,</div><div class='add'>+	WMI_WOW_IOAC_ADD_WAKE_PATTERN_CMDID,</div><div class='add'>+	WMI_WOW_IOAC_DEL_WAKE_PATTERN_CMDID,</div><div class='add'>+	WMI_D0_WOW_ENABLE_DISABLE_CMDID,</div><div class='add'>+	WMI_EXTWOW_ENABLE_CMDID,</div><div class='add'>+	WMI_EXTWOW_SET_APP_TYPE1_PARAMS_CMDID,</div><div class='add'>+	WMI_EXTWOW_SET_APP_TYPE2_PARAMS_CMDID,</div><div class='add'>+	WMI_WOW_ENABLE_ICMPV6_NA_FLT_CMDID,</div><div class='add'>+	WMI_WOW_UDP_SVC_OFLD_CMDID,</div><div class='add'>+	WMI_WOW_HOSTWAKEUP_GPIO_PIN_PATTERN_CONFIG_CMDID,</div><div class='add'>+	WMI_WOW_SET_ACTION_WAKE_UP_CMDID,</div><div class='add'>+	WMI_RTT_MEASREQ_CMDID = WMI_TLV_CMD(WMI_GRP_RTT),</div><div class='add'>+	WMI_RTT_TSF_CMDID,</div><div class='add'>+	WMI_VDEV_SPECTRAL_SCAN_CONFIGURE_CMDID = WMI_TLV_CMD(WMI_GRP_SPECTRAL),</div><div class='add'>+	WMI_VDEV_SPECTRAL_SCAN_ENABLE_CMDID,</div><div class='add'>+	WMI_REQUEST_STATS_CMDID = WMI_TLV_CMD(WMI_GRP_STATS),</div><div class='add'>+	WMI_MCC_SCHED_TRAFFIC_STATS_CMDID,</div><div class='add'>+	WMI_REQUEST_STATS_EXT_CMDID,</div><div class='add'>+	WMI_REQUEST_LINK_STATS_CMDID,</div><div class='add'>+	WMI_START_LINK_STATS_CMDID,</div><div class='add'>+	WMI_CLEAR_LINK_STATS_CMDID,</div><div class='add'>+	WMI_GET_FW_MEM_DUMP_CMDID,</div><div class='add'>+	WMI_DEBUG_MESG_FLUSH_CMDID,</div><div class='add'>+	WMI_DIAG_EVENT_LOG_CONFIG_CMDID,</div><div class='add'>+	WMI_REQUEST_WLAN_STATS_CMDID,</div><div class='add'>+	WMI_REQUEST_RCPI_CMDID,</div><div class='add'>+	WMI_REQUEST_PEER_STATS_INFO_CMDID,</div><div class='add'>+	WMI_REQUEST_RADIO_CHAN_STATS_CMDID,</div><div class='add'>+	WMI_REQUEST_WLM_STATS_CMDID,</div><div class='add'>+	WMI_REQUEST_CTRL_PATH_STATS_CMDID,</div><div class='add'>+	WMI_REQUEST_HALPHY_CTRL_PATH_STATS_CMDID = WMI_REQUEST_CTRL_PATH_STATS_CMDID + 3,</div><div class='add'>+	WMI_SET_ARP_NS_OFFLOAD_CMDID = WMI_TLV_CMD(WMI_GRP_ARP_NS_OFL),</div><div class='add'>+	WMI_ADD_PROACTIVE_ARP_RSP_PATTERN_CMDID,</div><div class='add'>+	WMI_DEL_PROACTIVE_ARP_RSP_PATTERN_CMDID,</div><div class='add'>+	WMI_NETWORK_LIST_OFFLOAD_CONFIG_CMDID = WMI_TLV_CMD(WMI_GRP_NLO_OFL),</div><div class='add'>+	WMI_APFIND_CMDID,</div><div class='add'>+	WMI_PASSPOINT_LIST_CONFIG_CMDID,</div><div class='add'>+	WMI_NLO_CONFIGURE_MAWC_CMDID,</div><div class='add'>+	WMI_GTK_OFFLOAD_CMDID = WMI_TLV_CMD(WMI_GRP_GTK_OFL),</div><div class='add'>+	WMI_CSA_OFFLOAD_ENABLE_CMDID = WMI_TLV_CMD(WMI_GRP_CSA_OFL),</div><div class='add'>+	WMI_CSA_OFFLOAD_CHANSWITCH_CMDID,</div><div class='add'>+	WMI_CHATTER_SET_MODE_CMDID = WMI_TLV_CMD(WMI_GRP_CHATTER),</div><div class='add'>+	WMI_CHATTER_ADD_COALESCING_FILTER_CMDID,</div><div class='add'>+	WMI_CHATTER_DELETE_COALESCING_FILTER_CMDID,</div><div class='add'>+	WMI_CHATTER_COALESCING_QUERY_CMDID,</div><div class='add'>+	WMI_PEER_TID_ADDBA_CMDID = WMI_TLV_CMD(WMI_GRP_TID_ADDBA),</div><div class='add'>+	WMI_PEER_TID_DELBA_CMDID,</div><div class='add'>+	WMI_STA_DTIM_PS_METHOD_CMDID,</div><div class='add'>+	WMI_STA_UAPSD_AUTO_TRIG_CMDID,</div><div class='add'>+	WMI_STA_KEEPALIVE_CMDID,</div><div class='add'>+	WMI_BA_REQ_SSN_CMDID,</div><div class='add'>+	WMI_ECHO_CMDID = WMI_TLV_CMD(WMI_GRP_MISC),</div><div class='add'>+	WMI_PDEV_UTF_CMDID,</div><div class='add'>+	WMI_DBGLOG_CFG_CMDID,</div><div class='add'>+	WMI_PDEV_QVIT_CMDID,</div><div class='add'>+	WMI_PDEV_FTM_INTG_CMDID,</div><div class='add'>+	WMI_VDEV_SET_KEEPALIVE_CMDID,</div><div class='add'>+	WMI_VDEV_GET_KEEPALIVE_CMDID,</div><div class='add'>+	WMI_FORCE_FW_HANG_CMDID,</div><div class='add'>+	WMI_SET_MCASTBCAST_FILTER_CMDID,</div><div class='add'>+	WMI_THERMAL_MGMT_CMDID,</div><div class='add'>+	WMI_HOST_AUTO_SHUTDOWN_CFG_CMDID,</div><div class='add'>+	WMI_TPC_CHAINMASK_CONFIG_CMDID,</div><div class='add'>+	WMI_SET_ANTENNA_DIVERSITY_CMDID,</div><div class='add'>+	WMI_OCB_SET_SCHED_CMDID,</div><div class='add'>+	WMI_RSSI_BREACH_MONITOR_CONFIG_CMDID,</div><div class='add'>+	WMI_LRO_CONFIG_CMDID,</div><div class='add'>+	WMI_TRANSFER_DATA_TO_FLASH_CMDID,</div><div class='add'>+	WMI_CONFIG_ENHANCED_MCAST_FILTER_CMDID,</div><div class='add'>+	WMI_VDEV_WISA_CMDID,</div><div class='add'>+	WMI_DBGLOG_TIME_STAMP_SYNC_CMDID,</div><div class='add'>+	WMI_SET_MULTIPLE_MCAST_FILTER_CMDID,</div><div class='add'>+	WMI_READ_DATA_FROM_FLASH_CMDID,</div><div class='add'>+	WMI_THERM_THROT_SET_CONF_CMDID,</div><div class='add'>+	WMI_RUNTIME_DPD_RECAL_CMDID,</div><div class='add'>+	WMI_GET_TPC_POWER_CMDID,</div><div class='add'>+	WMI_IDLE_TRIGGER_MONITOR_CMDID,</div><div class='add'>+	WMI_GPIO_CONFIG_CMDID = WMI_TLV_CMD(WMI_GRP_GPIO),</div><div class='add'>+	WMI_GPIO_OUTPUT_CMDID,</div><div class='add'>+	WMI_TXBF_CMDID,</div><div class='add'>+	WMI_FWTEST_VDEV_MCC_SET_TBTT_MODE_CMDID = WMI_TLV_CMD(WMI_GRP_FWTEST),</div><div class='add'>+	WMI_FWTEST_P2P_SET_NOA_PARAM_CMDID,</div><div class='add'>+	WMI_UNIT_TEST_CMDID,</div><div class='add'>+	WMI_FWTEST_CMDID,</div><div class='add'>+	WMI_QBOOST_CFG_CMDID,</div><div class='add'>+	WMI_TDLS_SET_STATE_CMDID = WMI_TLV_CMD(WMI_GRP_TDLS),</div><div class='add'>+	WMI_TDLS_PEER_UPDATE_CMDID,</div><div class='add'>+	WMI_TDLS_SET_OFFCHAN_MODE_CMDID,</div><div class='add'>+	WMI_RESMGR_ADAPTIVE_OCS_EN_DIS_CMDID = WMI_TLV_CMD(WMI_GRP_RESMGR),</div><div class='add'>+	WMI_RESMGR_SET_CHAN_TIME_QUOTA_CMDID,</div><div class='add'>+	WMI_RESMGR_SET_CHAN_LATENCY_CMDID,</div><div class='add'>+	WMI_STA_SMPS_FORCE_MODE_CMDID = WMI_TLV_CMD(WMI_GRP_STA_SMPS),</div><div class='add'>+	WMI_STA_SMPS_PARAM_CMDID,</div><div class='add'>+	WMI_HB_SET_ENABLE_CMDID = WMI_TLV_CMD(WMI_GRP_WLAN_HB),</div><div class='add'>+	WMI_HB_SET_TCP_PARAMS_CMDID,</div><div class='add'>+	WMI_HB_SET_TCP_PKT_FILTER_CMDID,</div><div class='add'>+	WMI_HB_SET_UDP_PARAMS_CMDID,</div><div class='add'>+	WMI_HB_SET_UDP_PKT_FILTER_CMDID,</div><div class='add'>+	WMI_RMC_SET_MODE_CMDID = WMI_TLV_CMD(WMI_GRP_RMC),</div><div class='add'>+	WMI_RMC_SET_ACTION_PERIOD_CMDID,</div><div class='add'>+	WMI_RMC_CONFIG_CMDID,</div><div class='add'>+	WMI_RMC_SET_MANUAL_LEADER_CMDID,</div><div class='add'>+	WMI_MHF_OFFLOAD_SET_MODE_CMDID = WMI_TLV_CMD(WMI_GRP_MHF_OFL),</div><div class='add'>+	WMI_MHF_OFFLOAD_PLUMB_ROUTING_TBL_CMDID,</div><div class='add'>+	WMI_BATCH_SCAN_ENABLE_CMDID = WMI_TLV_CMD(WMI_GRP_LOCATION_SCAN),</div><div class='add'>+	WMI_BATCH_SCAN_DISABLE_CMDID,</div><div class='add'>+	WMI_BATCH_SCAN_TRIGGER_RESULT_CMDID,</div><div class='add'>+	WMI_OEM_REQ_CMDID = WMI_TLV_CMD(WMI_GRP_OEM),</div><div class='add'>+	WMI_OEM_REQUEST_CMDID,</div><div class='add'>+	WMI_LPI_OEM_REQ_CMDID,</div><div class='add'>+	WMI_NAN_CMDID = WMI_TLV_CMD(WMI_GRP_NAN),</div><div class='add'>+	WMI_MODEM_POWER_STATE_CMDID = WMI_TLV_CMD(WMI_GRP_COEX),</div><div class='add'>+	WMI_CHAN_AVOID_UPDATE_CMDID,</div><div class='add'>+	WMI_COEX_CONFIG_CMDID,</div><div class='add'>+	WMI_CHAN_AVOID_RPT_ALLOW_CMDID,</div><div class='add'>+	WMI_COEX_GET_ANTENNA_ISOLATION_CMDID,</div><div class='add'>+	WMI_SAR_LIMITS_CMDID,</div><div class='add'>+	WMI_OBSS_SCAN_ENABLE_CMDID = WMI_TLV_CMD(WMI_GRP_OBSS_OFL),</div><div class='add'>+	WMI_OBSS_SCAN_DISABLE_CMDID,</div><div class='add'>+	WMI_OBSS_COLOR_COLLISION_DET_CONFIG_CMDID,</div><div class='add'>+	WMI_LPI_MGMT_SNOOPING_CONFIG_CMDID = WMI_TLV_CMD(WMI_GRP_LPI),</div><div class='add'>+	WMI_LPI_START_SCAN_CMDID,</div><div class='add'>+	WMI_LPI_STOP_SCAN_CMDID,</div><div class='add'>+	WMI_EXTSCAN_START_CMDID = WMI_TLV_CMD(WMI_GRP_EXTSCAN),</div><div class='add'>+	WMI_EXTSCAN_STOP_CMDID,</div><div class='add'>+	WMI_EXTSCAN_CONFIGURE_WLAN_CHANGE_MONITOR_CMDID,</div><div class='add'>+	WMI_EXTSCAN_CONFIGURE_HOTLIST_MONITOR_CMDID,</div><div class='add'>+	WMI_EXTSCAN_GET_CACHED_RESULTS_CMDID,</div><div class='add'>+	WMI_EXTSCAN_GET_WLAN_CHANGE_RESULTS_CMDID,</div><div class='add'>+	WMI_EXTSCAN_SET_CAPABILITIES_CMDID,</div><div class='add'>+	WMI_EXTSCAN_GET_CAPABILITIES_CMDID,</div><div class='add'>+	WMI_EXTSCAN_CONFIGURE_HOTLIST_SSID_MONITOR_CMDID,</div><div class='add'>+	WMI_EXTSCAN_CONFIGURE_MAWC_CMDID,</div><div class='add'>+	WMI_SET_DHCP_SERVER_OFFLOAD_CMDID = WMI_TLV_CMD(WMI_GRP_DHCP_OFL),</div><div class='add'>+	WMI_IPA_OFFLOAD_ENABLE_DISABLE_CMDID = WMI_TLV_CMD(WMI_GRP_IPA),</div><div class='add'>+	WMI_MDNS_OFFLOAD_ENABLE_CMDID = WMI_TLV_CMD(WMI_GRP_MDNS_OFL),</div><div class='add'>+	WMI_MDNS_SET_FQDN_CMDID,</div><div class='add'>+	WMI_MDNS_SET_RESPONSE_CMDID,</div><div class='add'>+	WMI_MDNS_GET_STATS_CMDID,</div><div class='add'>+	WMI_SAP_OFL_ENABLE_CMDID = WMI_TLV_CMD(WMI_GRP_SAP_OFL),</div><div class='add'>+	WMI_SAP_SET_BLACKLIST_PARAM_CMDID,</div><div class='add'>+	WMI_OCB_SET_CONFIG_CMDID = WMI_TLV_CMD(WMI_GRP_OCB),</div><div class='add'>+	WMI_OCB_SET_UTC_TIME_CMDID,</div><div class='add'>+	WMI_OCB_START_TIMING_ADVERT_CMDID,</div><div class='add'>+	WMI_OCB_STOP_TIMING_ADVERT_CMDID,</div><div class='add'>+	WMI_OCB_GET_TSF_TIMER_CMDID,</div><div class='add'>+	WMI_DCC_GET_STATS_CMDID,</div><div class='add'>+	WMI_DCC_CLEAR_STATS_CMDID,</div><div class='add'>+	WMI_DCC_UPDATE_NDL_CMDID,</div><div class='add'>+	WMI_SOC_SET_PCL_CMDID = WMI_TLV_CMD(WMI_GRP_SOC),</div><div class='add'>+	WMI_SOC_SET_HW_MODE_CMDID,</div><div class='add'>+	WMI_SOC_SET_DUAL_MAC_CONFIG_CMDID,</div><div class='add'>+	WMI_SOC_SET_ANTENNA_MODE_CMDID,</div><div class='add'>+	WMI_PACKET_FILTER_CONFIG_CMDID = WMI_TLV_CMD(WMI_GRP_PKT_FILTER),</div><div class='add'>+	WMI_PACKET_FILTER_ENABLE_CMDID,</div><div class='add'>+	WMI_MAWC_SENSOR_REPORT_IND_CMDID = WMI_TLV_CMD(WMI_GRP_MAWC),</div><div class='add'>+	WMI_PMF_OFFLOAD_SET_SA_QUERY_CMDID = WMI_TLV_CMD(WMI_GRP_PMF_OFFLOAD),</div><div class='add'>+	WMI_BPF_GET_CAPABILITY_CMDID = WMI_TLV_CMD(WMI_GRP_BPF_OFFLOAD),</div><div class='add'>+	WMI_BPF_GET_VDEV_STATS_CMDID,</div><div class='add'>+	WMI_BPF_SET_VDEV_INSTRUCTIONS_CMDID,</div><div class='add'>+	WMI_BPF_DEL_VDEV_INSTRUCTIONS_CMDID,</div><div class='add'>+	WMI_BPF_SET_VDEV_ACTIVE_MODE_CMDID,</div><div class='add'>+	WMI_MNT_FILTER_CMDID = WMI_TLV_CMD(WMI_GRP_MONITOR),</div><div class='add'>+	WMI_SET_CURRENT_COUNTRY_CMDID = WMI_TLV_CMD(WMI_GRP_REGULATORY),</div><div class='add'>+	WMI_11D_SCAN_START_CMDID,</div><div class='add'>+	WMI_11D_SCAN_STOP_CMDID,</div><div class='add'>+	WMI_SET_INIT_COUNTRY_CMDID,</div><div class='add'>+	WMI_NDI_GET_CAP_REQ_CMDID = WMI_TLV_CMD(WMI_GRP_PROTOTYPE),</div><div class='add'>+	WMI_NDP_INITIATOR_REQ_CMDID,</div><div class='add'>+	WMI_NDP_RESPONDER_REQ_CMDID,</div><div class='add'>+	WMI_NDP_END_REQ_CMDID,</div><div class='add'>+	WMI_HW_DATA_FILTER_CMDID = WMI_TLV_CMD(WMI_GRP_HW_DATA_FILTER),</div><div class='add'>+	WMI_TWT_ENABLE_CMDID = WMI_TLV_CMD(WMI_GRP_TWT),</div><div class='add'>+	WMI_TWT_DISABLE_CMDID,</div><div class='add'>+	WMI_TWT_ADD_DIALOG_CMDID,</div><div class='add'>+	WMI_TWT_DEL_DIALOG_CMDID,</div><div class='add'>+	WMI_TWT_PAUSE_DIALOG_CMDID,</div><div class='add'>+	WMI_TWT_RESUME_DIALOG_CMDID,</div><div class='add'>+	WMI_PDEV_OBSS_PD_SPATIAL_REUSE_CMDID =</div><div class='add'>+				WMI_TLV_CMD(WMI_GRP_SPATIAL_REUSE),</div><div class='add'>+	WMI_PDEV_OBSS_PD_SPATIAL_REUSE_SET_DEF_OBSS_THRESH_CMDID,</div><div class='add'>+	WMI_MLO_LINK_SET_ACTIVE_CMDID = WMI_TLV_CMD(WMI_GRP_MLO),</div><div class='add'>+	WMI_MLO_SETUP_CMDID,</div><div class='add'>+	WMI_MLO_READY_CMDID,</div><div class='add'>+	WMI_MLO_TEARDOWN_CMDID,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_tlv_event_id {</div><div class='add'>+	WMI_SERVICE_READY_EVENTID = 0x1,</div><div class='add'>+	WMI_READY_EVENTID,</div><div class='add'>+	WMI_SERVICE_AVAILABLE_EVENTID,</div><div class='add'>+	WMI_SCAN_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_SCAN),</div><div class='add'>+	WMI_PDEV_TPC_CONFIG_EVENTID = WMI_TLV_CMD(WMI_GRP_PDEV),</div><div class='add'>+	WMI_CHAN_INFO_EVENTID,</div><div class='add'>+	WMI_PHYERR_EVENTID,</div><div class='add'>+	WMI_PDEV_DUMP_EVENTID,</div><div class='add'>+	WMI_TX_PAUSE_EVENTID,</div><div class='add'>+	WMI_DFS_RADAR_EVENTID,</div><div class='add'>+	WMI_PDEV_L1SS_TRACK_EVENTID,</div><div class='add'>+	WMI_PDEV_TEMPERATURE_EVENTID,</div><div class='add'>+	WMI_SERVICE_READY_EXT_EVENTID,</div><div class='add'>+	WMI_PDEV_FIPS_EVENTID,</div><div class='add'>+	WMI_PDEV_CHANNEL_HOPPING_EVENTID,</div><div class='add'>+	WMI_PDEV_ANI_CCK_LEVEL_EVENTID,</div><div class='add'>+	WMI_PDEV_ANI_OFDM_LEVEL_EVENTID,</div><div class='add'>+	WMI_PDEV_TPC_EVENTID,</div><div class='add'>+	WMI_PDEV_NFCAL_POWER_ALL_CHANNELS_EVENTID,</div><div class='add'>+	WMI_PDEV_SET_HW_MODE_RESP_EVENTID,</div><div class='add'>+	WMI_PDEV_HW_MODE_TRANSITION_EVENTID,</div><div class='add'>+	WMI_PDEV_SET_MAC_CONFIG_RESP_EVENTID,</div><div class='add'>+	WMI_PDEV_ANTDIV_STATUS_EVENTID,</div><div class='add'>+	WMI_PDEV_CHIP_POWER_STATS_EVENTID,</div><div class='add'>+	WMI_PDEV_CHIP_POWER_SAVE_FAILURE_DETECTED_EVENTID,</div><div class='add'>+	WMI_PDEV_CSA_SWITCH_COUNT_STATUS_EVENTID,</div><div class='add'>+	WMI_PDEV_CHECK_CAL_VERSION_EVENTID,</div><div class='add'>+	WMI_PDEV_DIV_RSSI_ANTID_EVENTID,</div><div class='add'>+	WMI_PDEV_BSS_CHAN_INFO_EVENTID,</div><div class='add'>+	WMI_PDEV_UPDATE_CTLTABLE_EVENTID,</div><div class='add'>+	WMI_PDEV_DMA_RING_CFG_RSP_EVENTID,</div><div class='add'>+	WMI_PDEV_DMA_RING_BUF_RELEASE_EVENTID,</div><div class='add'>+	WMI_PDEV_CTL_FAILSAFE_CHECK_EVENTID,</div><div class='add'>+	WMI_PDEV_CSC_SWITCH_COUNT_STATUS_EVENTID,</div><div class='add'>+	WMI_PDEV_COLD_BOOT_CAL_DATA_EVENTID,</div><div class='add'>+	WMI_PDEV_RAP_INFO_EVENTID,</div><div class='add'>+	WMI_CHAN_RF_CHARACTERIZATION_INFO_EVENTID,</div><div class='add'>+	WMI_SERVICE_READY_EXT2_EVENTID,</div><div class='add'>+	WMI_PDEV_GET_HALPHY_CAL_STATUS_EVENTID =</div><div class='add'>+					WMI_SERVICE_READY_EXT2_EVENTID + 4,</div><div class='add'>+	WMI_PDEV_RSSI_DBM_CONVERSION_PARAMS_INFO_EVENTID =</div><div class='add'>+				WMI_PDEV_GET_HALPHY_CAL_STATUS_EVENTID + 5,</div><div class='add'>+	WMI_VDEV_START_RESP_EVENTID = WMI_TLV_CMD(WMI_GRP_VDEV),</div><div class='add'>+	WMI_VDEV_STOPPED_EVENTID,</div><div class='add'>+	WMI_VDEV_INSTALL_KEY_COMPLETE_EVENTID,</div><div class='add'>+	WMI_VDEV_MCC_BCN_INTERVAL_CHANGE_REQ_EVENTID,</div><div class='add'>+	WMI_VDEV_TSF_REPORT_EVENTID,</div><div class='add'>+	WMI_VDEV_DELETE_RESP_EVENTID,</div><div class='add'>+	WMI_VDEV_ENCRYPT_DECRYPT_DATA_RESP_EVENTID,</div><div class='add'>+	WMI_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_STATUS_EVENTID,</div><div class='add'>+	WMI_PEER_STA_KICKOUT_EVENTID = WMI_TLV_CMD(WMI_GRP_PEER),</div><div class='add'>+	WMI_PEER_INFO_EVENTID,</div><div class='add'>+	WMI_PEER_TX_FAIL_CNT_THR_EVENTID,</div><div class='add'>+	WMI_PEER_ESTIMATED_LINKSPEED_EVENTID,</div><div class='add'>+	WMI_PEER_STATE_EVENTID,</div><div class='add'>+	WMI_PEER_ASSOC_CONF_EVENTID,</div><div class='add'>+	WMI_PEER_DELETE_RESP_EVENTID,</div><div class='add'>+	WMI_PEER_RATECODE_LIST_EVENTID,</div><div class='add'>+	WMI_WDS_PEER_EVENTID,</div><div class='add'>+	WMI_PEER_STA_PS_STATECHG_EVENTID,</div><div class='add'>+	WMI_PEER_ANTDIV_INFO_EVENTID,</div><div class='add'>+	WMI_PEER_RESERVED0_EVENTID,</div><div class='add'>+	WMI_PEER_RESERVED1_EVENTID,</div><div class='add'>+	WMI_PEER_RESERVED2_EVENTID,</div><div class='add'>+	WMI_PEER_RESERVED3_EVENTID,</div><div class='add'>+	WMI_PEER_RESERVED4_EVENTID,</div><div class='add'>+	WMI_PEER_RESERVED5_EVENTID,</div><div class='add'>+	WMI_PEER_RESERVED6_EVENTID,</div><div class='add'>+	WMI_PEER_RESERVED7_EVENTID,</div><div class='add'>+	WMI_PEER_RESERVED8_EVENTID,</div><div class='add'>+	WMI_PEER_RESERVED9_EVENTID,</div><div class='add'>+	WMI_PEER_RESERVED10_EVENTID,</div><div class='add'>+	WMI_PEER_OPER_MODE_CHANGE_EVENTID,</div><div class='add'>+	WMI_MGMT_RX_EVENTID = WMI_TLV_CMD(WMI_GRP_MGMT),</div><div class='add'>+	WMI_HOST_SWBA_EVENTID,</div><div class='add'>+	WMI_TBTTOFFSET_UPDATE_EVENTID,</div><div class='add'>+	WMI_OFFLOAD_BCN_TX_STATUS_EVENTID,</div><div class='add'>+	WMI_OFFLOAD_PROB_RESP_TX_STATUS_EVENTID,</div><div class='add'>+	WMI_MGMT_TX_COMPLETION_EVENTID,</div><div class='add'>+	WMI_MGMT_TX_BUNDLE_COMPLETION_EVENTID,</div><div class='add'>+	WMI_TBTTOFFSET_EXT_UPDATE_EVENTID,</div><div class='add'>+	WMI_OFFCHAN_DATA_TX_COMPLETION_EVENTID,</div><div class='add'>+	WMI_HOST_FILS_DISCOVERY_EVENTID,</div><div class='add'>+	WMI_MGMT_RX_FW_CONSUMED_EVENTID = WMI_HOST_FILS_DISCOVERY_EVENTID + 3,</div><div class='add'>+	WMI_TX_DELBA_COMPLETE_EVENTID = WMI_TLV_CMD(WMI_GRP_BA_NEG),</div><div class='add'>+	WMI_TX_ADDBA_COMPLETE_EVENTID,</div><div class='add'>+	WMI_BA_RSP_SSN_EVENTID,</div><div class='add'>+	WMI_AGGR_STATE_TRIG_EVENTID,</div><div class='add'>+	WMI_ROAM_EVENTID = WMI_TLV_CMD(WMI_GRP_ROAM),</div><div class='add'>+	WMI_PROFILE_MATCH,</div><div class='add'>+	WMI_ROAM_SYNCH_EVENTID,</div><div class='add'>+	WMI_P2P_DISC_EVENTID = WMI_TLV_CMD(WMI_GRP_P2P),</div><div class='add'>+	WMI_P2P_NOA_EVENTID,</div><div class='add'>+	WMI_P2P_LISTEN_OFFLOAD_STOPPED_EVENTID,</div><div class='add'>+	WMI_AP_PS_EGAP_INFO_EVENTID = WMI_TLV_CMD(WMI_GRP_AP_PS),</div><div class='add'>+	WMI_PDEV_RESUME_EVENTID = WMI_TLV_CMD(WMI_GRP_SUSPEND),</div><div class='add'>+	WMI_WOW_WAKEUP_HOST_EVENTID = WMI_TLV_CMD(WMI_GRP_WOW),</div><div class='add'>+	WMI_D0_WOW_DISABLE_ACK_EVENTID,</div><div class='add'>+	WMI_WOW_INITIAL_WAKEUP_EVENTID,</div><div class='add'>+	WMI_RTT_MEASUREMENT_REPORT_EVENTID = WMI_TLV_CMD(WMI_GRP_RTT),</div><div class='add'>+	WMI_TSF_MEASUREMENT_REPORT_EVENTID,</div><div class='add'>+	WMI_RTT_ERROR_REPORT_EVENTID,</div><div class='add'>+	WMI_STATS_EXT_EVENTID = WMI_TLV_CMD(WMI_GRP_STATS),</div><div class='add'>+	WMI_IFACE_LINK_STATS_EVENTID,</div><div class='add'>+	WMI_PEER_LINK_STATS_EVENTID,</div><div class='add'>+	WMI_RADIO_LINK_STATS_EVENTID,</div><div class='add'>+	WMI_UPDATE_FW_MEM_DUMP_EVENTID,</div><div class='add'>+	WMI_DIAG_EVENT_LOG_SUPPORTED_EVENTID,</div><div class='add'>+	WMI_INST_RSSI_STATS_EVENTID,</div><div class='add'>+	WMI_RADIO_TX_POWER_LEVEL_STATS_EVENTID,</div><div class='add'>+	WMI_REPORT_STATS_EVENTID,</div><div class='add'>+	WMI_UPDATE_RCPI_EVENTID,</div><div class='add'>+	WMI_PEER_STATS_INFO_EVENTID,</div><div class='add'>+	WMI_RADIO_CHAN_STATS_EVENTID,</div><div class='add'>+	WMI_WLM_STATS_EVENTID,</div><div class='add'>+	WMI_CTRL_PATH_STATS_EVENTID,</div><div class='add'>+	WMI_HALPHY_STATS_CTRL_PATH_EVENTID,</div><div class='add'>+	WMI_NLO_MATCH_EVENTID = WMI_TLV_CMD(WMI_GRP_NLO_OFL),</div><div class='add'>+	WMI_NLO_SCAN_COMPLETE_EVENTID,</div><div class='add'>+	WMI_APFIND_EVENTID,</div><div class='add'>+	WMI_PASSPOINT_MATCH_EVENTID,</div><div class='add'>+	WMI_GTK_OFFLOAD_STATUS_EVENTID = WMI_TLV_CMD(WMI_GRP_GTK_OFL),</div><div class='add'>+	WMI_GTK_REKEY_FAIL_EVENTID,</div><div class='add'>+	WMI_CSA_HANDLING_EVENTID = WMI_TLV_CMD(WMI_GRP_CSA_OFL),</div><div class='add'>+	WMI_CHATTER_PC_QUERY_EVENTID = WMI_TLV_CMD(WMI_GRP_CHATTER),</div><div class='add'>+	WMI_PDEV_DFS_RADAR_DETECTION_EVENTID = WMI_TLV_CMD(WMI_GRP_DFS),</div><div class='add'>+	WMI_VDEV_DFS_CAC_COMPLETE_EVENTID,</div><div class='add'>+	WMI_VDEV_ADFS_OCAC_COMPLETE_EVENTID,</div><div class='add'>+	WMI_ECHO_EVENTID = WMI_TLV_CMD(WMI_GRP_MISC),</div><div class='add'>+	WMI_PDEV_UTF_EVENTID,</div><div class='add'>+	WMI_DEBUG_MESG_EVENTID,</div><div class='add'>+	WMI_UPDATE_STATS_EVENTID,</div><div class='add'>+	WMI_DEBUG_PRINT_EVENTID,</div><div class='add'>+	WMI_DCS_INTERFERENCE_EVENTID,</div><div class='add'>+	WMI_PDEV_QVIT_EVENTID,</div><div class='add'>+	WMI_WLAN_PROFILE_DATA_EVENTID,</div><div class='add'>+	WMI_PDEV_FTM_INTG_EVENTID,</div><div class='add'>+	WMI_WLAN_FREQ_AVOID_EVENTID,</div><div class='add'>+	WMI_VDEV_GET_KEEPALIVE_EVENTID,</div><div class='add'>+	WMI_THERMAL_MGMT_EVENTID,</div><div class='add'>+	WMI_DIAG_DATA_CONTAINER_EVENTID,</div><div class='add'>+	WMI_HOST_AUTO_SHUTDOWN_EVENTID,</div><div class='add'>+	WMI_UPDATE_WHAL_MIB_STATS_EVENTID,</div><div class='add'>+	WMI_UPDATE_VDEV_RATE_STATS_EVENTID,</div><div class='add'>+	WMI_DIAG_EVENTID,</div><div class='add'>+	WMI_OCB_SET_SCHED_EVENTID,</div><div class='add'>+	WMI_DEBUG_MESG_FLUSH_COMPLETE_EVENTID,</div><div class='add'>+	WMI_RSSI_BREACH_EVENTID,</div><div class='add'>+	WMI_TRANSFER_DATA_TO_FLASH_COMPLETE_EVENTID,</div><div class='add'>+	WMI_PDEV_UTF_SCPC_EVENTID,</div><div class='add'>+	WMI_READ_DATA_FROM_FLASH_EVENTID,</div><div class='add'>+	WMI_REPORT_RX_AGGR_FAILURE_EVENTID,</div><div class='add'>+	WMI_PKGID_EVENTID,</div><div class='add'>+	WMI_GPIO_INPUT_EVENTID = WMI_TLV_CMD(WMI_GRP_GPIO),</div><div class='add'>+	WMI_UPLOADH_EVENTID,</div><div class='add'>+	WMI_CAPTUREH_EVENTID,</div><div class='add'>+	WMI_RFKILL_STATE_CHANGE_EVENTID,</div><div class='add'>+	WMI_TDLS_PEER_EVENTID = WMI_TLV_CMD(WMI_GRP_TDLS),</div><div class='add'>+	WMI_STA_SMPS_FORCE_MODE_COMPL_EVENTID = WMI_TLV_CMD(WMI_GRP_STA_SMPS),</div><div class='add'>+	WMI_BATCH_SCAN_ENABLED_EVENTID = WMI_TLV_CMD(WMI_GRP_LOCATION_SCAN),</div><div class='add'>+	WMI_BATCH_SCAN_RESULT_EVENTID,</div><div class='add'>+	WMI_OEM_CAPABILITY_EVENTID = WMI_TLV_CMD(WMI_GRP_OEM),</div><div class='add'>+	WMI_OEM_MEASUREMENT_REPORT_EVENTID,</div><div class='add'>+	WMI_OEM_ERROR_REPORT_EVENTID,</div><div class='add'>+	WMI_OEM_RESPONSE_EVENTID,</div><div class='add'>+	WMI_NAN_EVENTID = WMI_TLV_CMD(WMI_GRP_NAN),</div><div class='add'>+	WMI_NAN_DISC_IFACE_CREATED_EVENTID,</div><div class='add'>+	WMI_NAN_DISC_IFACE_DELETED_EVENTID,</div><div class='add'>+	WMI_NAN_STARTED_CLUSTER_EVENTID,</div><div class='add'>+	WMI_NAN_JOINED_CLUSTER_EVENTID,</div><div class='add'>+	WMI_COEX_REPORT_ANTENNA_ISOLATION_EVENTID = WMI_TLV_CMD(WMI_GRP_COEX),</div><div class='add'>+	WMI_LPI_RESULT_EVENTID = WMI_TLV_CMD(WMI_GRP_LPI),</div><div class='add'>+	WMI_LPI_STATUS_EVENTID,</div><div class='add'>+	WMI_LPI_HANDOFF_EVENTID,</div><div class='add'>+	WMI_EXTSCAN_START_STOP_EVENTID = WMI_TLV_CMD(WMI_GRP_EXTSCAN),</div><div class='add'>+	WMI_EXTSCAN_OPERATION_EVENTID,</div><div class='add'>+	WMI_EXTSCAN_TABLE_USAGE_EVENTID,</div><div class='add'>+	WMI_EXTSCAN_CACHED_RESULTS_EVENTID,</div><div class='add'>+	WMI_EXTSCAN_WLAN_CHANGE_RESULTS_EVENTID,</div><div class='add'>+	WMI_EXTSCAN_HOTLIST_MATCH_EVENTID,</div><div class='add'>+	WMI_EXTSCAN_CAPABILITIES_EVENTID,</div><div class='add'>+	WMI_EXTSCAN_HOTLIST_SSID_MATCH_EVENTID,</div><div class='add'>+	WMI_MDNS_STATS_EVENTID = WMI_TLV_CMD(WMI_GRP_MDNS_OFL),</div><div class='add'>+	WMI_SAP_OFL_ADD_STA_EVENTID = WMI_TLV_CMD(WMI_GRP_SAP_OFL),</div><div class='add'>+	WMI_SAP_OFL_DEL_STA_EVENTID,</div><div class='add'>+	WMI_OBSS_COLOR_COLLISION_DETECTION_EVENTID =</div><div class='add'>+				    WMI_EVT_GRP_START_ID(WMI_GRP_OBSS_OFL),</div><div class='add'>+	WMI_OCB_SET_CONFIG_RESP_EVENTID = WMI_TLV_CMD(WMI_GRP_OCB),</div><div class='add'>+	WMI_OCB_GET_TSF_TIMER_RESP_EVENTID,</div><div class='add'>+	WMI_DCC_GET_STATS_RESP_EVENTID,</div><div class='add'>+	WMI_DCC_UPDATE_NDL_RESP_EVENTID,</div><div class='add'>+	WMI_DCC_STATS_EVENTID,</div><div class='add'>+	WMI_SOC_SET_HW_MODE_RESP_EVENTID = WMI_TLV_CMD(WMI_GRP_SOC),</div><div class='add'>+	WMI_SOC_HW_MODE_TRANSITION_EVENTID,</div><div class='add'>+	WMI_SOC_SET_DUAL_MAC_CONFIG_RESP_EVENTID,</div><div class='add'>+	WMI_MAWC_ENABLE_SENSOR_EVENTID = WMI_TLV_CMD(WMI_GRP_MAWC),</div><div class='add'>+	WMI_BPF_CAPABILIY_INFO_EVENTID = WMI_TLV_CMD(WMI_GRP_BPF_OFFLOAD),</div><div class='add'>+	WMI_BPF_VDEV_STATS_INFO_EVENTID,</div><div class='add'>+	WMI_RMC_NEW_LEADER_EVENTID = WMI_TLV_CMD(WMI_GRP_RMC),</div><div class='add'>+	WMI_REG_CHAN_LIST_CC_EVENTID = WMI_TLV_CMD(WMI_GRP_REGULATORY),</div><div class='add'>+	WMI_11D_NEW_COUNTRY_EVENTID,</div><div class='add'>+	WMI_REG_CHAN_LIST_CC_EXT_EVENTID,</div><div class='add'>+	WMI_NDI_CAP_RSP_EVENTID = WMI_TLV_CMD(WMI_GRP_PROTOTYPE),</div><div class='add'>+	WMI_NDP_INITIATOR_RSP_EVENTID,</div><div class='add'>+	WMI_NDP_RESPONDER_RSP_EVENTID,</div><div class='add'>+	WMI_NDP_END_RSP_EVENTID,</div><div class='add'>+	WMI_NDP_INDICATION_EVENTID,</div><div class='add'>+	WMI_NDP_CONFIRM_EVENTID,</div><div class='add'>+	WMI_NDP_END_INDICATION_EVENTID,</div><div class='add'>+</div><div class='add'>+	WMI_TWT_ENABLE_EVENTID = WMI_TLV_CMD(WMI_GRP_TWT),</div><div class='add'>+	WMI_TWT_DISABLE_EVENTID,</div><div class='add'>+	WMI_TWT_ADD_DIALOG_EVENTID,</div><div class='add'>+	WMI_TWT_DEL_DIALOG_EVENTID,</div><div class='add'>+	WMI_TWT_PAUSE_DIALOG_EVENTID,</div><div class='add'>+	WMI_TWT_RESUME_DIALOG_EVENTID,</div><div class='add'>+	WMI_MLO_LINK_SET_ACTIVE_RESP_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_MLO),</div><div class='add'>+	WMI_MLO_SETUP_COMPLETE_EVENTID,</div><div class='add'>+	WMI_MLO_TEARDOWN_COMPLETE_EVENTID,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_tlv_pdev_param {</div><div class='add'>+	WMI_PDEV_PARAM_TX_CHAIN_MASK = 0x1,</div><div class='add'>+	WMI_PDEV_PARAM_RX_CHAIN_MASK,</div><div class='add'>+	WMI_PDEV_PARAM_TXPOWER_LIMIT2G,</div><div class='add'>+	WMI_PDEV_PARAM_TXPOWER_LIMIT5G,</div><div class='add'>+	WMI_PDEV_PARAM_TXPOWER_SCALE,</div><div class='add'>+	WMI_PDEV_PARAM_BEACON_GEN_MODE,</div><div class='add'>+	WMI_PDEV_PARAM_BEACON_TX_MODE,</div><div class='add'>+	WMI_PDEV_PARAM_RESMGR_OFFCHAN_MODE,</div><div class='add'>+	WMI_PDEV_PARAM_PROTECTION_MODE,</div><div class='add'>+	WMI_PDEV_PARAM_DYNAMIC_BW,</div><div class='add'>+	WMI_PDEV_PARAM_NON_AGG_SW_RETRY_TH,</div><div class='add'>+	WMI_PDEV_PARAM_AGG_SW_RETRY_TH,</div><div class='add'>+	WMI_PDEV_PARAM_STA_KICKOUT_TH,</div><div class='add'>+	WMI_PDEV_PARAM_AC_AGGRSIZE_SCALING,</div><div class='add'>+	WMI_PDEV_PARAM_LTR_ENABLE,</div><div class='add'>+	WMI_PDEV_PARAM_LTR_AC_LATENCY_BE,</div><div class='add'>+	WMI_PDEV_PARAM_LTR_AC_LATENCY_BK,</div><div class='add'>+	WMI_PDEV_PARAM_LTR_AC_LATENCY_VI,</div><div class='add'>+	WMI_PDEV_PARAM_LTR_AC_LATENCY_VO,</div><div class='add'>+	WMI_PDEV_PARAM_LTR_AC_LATENCY_TIMEOUT,</div><div class='add'>+	WMI_PDEV_PARAM_LTR_SLEEP_OVERRIDE,</div><div class='add'>+	WMI_PDEV_PARAM_LTR_RX_OVERRIDE,</div><div class='add'>+	WMI_PDEV_PARAM_LTR_TX_ACTIVITY_TIMEOUT,</div><div class='add'>+	WMI_PDEV_PARAM_L1SS_ENABLE,</div><div class='add'>+	WMI_PDEV_PARAM_DSLEEP_ENABLE,</div><div class='add'>+	WMI_PDEV_PARAM_PCIELP_TXBUF_FLUSH,</div><div class='add'>+	WMI_PDEV_PARAM_PCIELP_TXBUF_WATERMARK,</div><div class='add'>+	WMI_PDEV_PARAM_PCIELP_TXBUF_TMO_EN,</div><div class='add'>+	WMI_PDEV_PARAM_PCIELP_TXBUF_TMO_VALUE,</div><div class='add'>+	WMI_PDEV_PARAM_PDEV_STATS_UPDATE_PERIOD,</div><div class='add'>+	WMI_PDEV_PARAM_VDEV_STATS_UPDATE_PERIOD,</div><div class='add'>+	WMI_PDEV_PARAM_PEER_STATS_UPDATE_PERIOD,</div><div class='add'>+	WMI_PDEV_PARAM_BCNFLT_STATS_UPDATE_PERIOD,</div><div class='add'>+	WMI_PDEV_PARAM_PMF_QOS,</div><div class='add'>+	WMI_PDEV_PARAM_ARP_AC_OVERRIDE,</div><div class='add'>+	WMI_PDEV_PARAM_DCS,</div><div class='add'>+	WMI_PDEV_PARAM_ANI_ENABLE,</div><div class='add'>+	WMI_PDEV_PARAM_ANI_POLL_PERIOD,</div><div class='add'>+	WMI_PDEV_PARAM_ANI_LISTEN_PERIOD,</div><div class='add'>+	WMI_PDEV_PARAM_ANI_OFDM_LEVEL,</div><div class='add'>+	WMI_PDEV_PARAM_ANI_CCK_LEVEL,</div><div class='add'>+	WMI_PDEV_PARAM_DYNTXCHAIN,</div><div class='add'>+	WMI_PDEV_PARAM_PROXY_STA,</div><div class='add'>+	WMI_PDEV_PARAM_IDLE_PS_CONFIG,</div><div class='add'>+	WMI_PDEV_PARAM_POWER_GATING_SLEEP,</div><div class='add'>+	WMI_PDEV_PARAM_RFKILL_ENABLE,</div><div class='add'>+	WMI_PDEV_PARAM_BURST_DUR,</div><div class='add'>+	WMI_PDEV_PARAM_BURST_ENABLE,</div><div class='add'>+	WMI_PDEV_PARAM_HW_RFKILL_CONFIG,</div><div class='add'>+	WMI_PDEV_PARAM_LOW_POWER_RF_ENABLE,</div><div class='add'>+	WMI_PDEV_PARAM_L1SS_TRACK,</div><div class='add'>+	WMI_PDEV_PARAM_HYST_EN,</div><div class='add'>+	WMI_PDEV_PARAM_POWER_COLLAPSE_ENABLE,</div><div class='add'>+	WMI_PDEV_PARAM_LED_SYS_STATE,</div><div class='add'>+	WMI_PDEV_PARAM_LED_ENABLE,</div><div class='add'>+	WMI_PDEV_PARAM_AUDIO_OVER_WLAN_LATENCY,</div><div class='add'>+	WMI_PDEV_PARAM_AUDIO_OVER_WLAN_ENABLE,</div><div class='add'>+	WMI_PDEV_PARAM_WHAL_MIB_STATS_UPDATE_ENABLE,</div><div class='add'>+	WMI_PDEV_PARAM_VDEV_RATE_STATS_UPDATE_PERIOD,</div><div class='add'>+	WMI_PDEV_PARAM_CTS_CBW,</div><div class='add'>+	WMI_PDEV_PARAM_WNTS_CONFIG,</div><div class='add'>+	WMI_PDEV_PARAM_ADAPTIVE_EARLY_RX_ENABLE,</div><div class='add'>+	WMI_PDEV_PARAM_ADAPTIVE_EARLY_RX_MIN_SLEEP_SLOP,</div><div class='add'>+	WMI_PDEV_PARAM_ADAPTIVE_EARLY_RX_INC_DEC_STEP,</div><div class='add'>+	WMI_PDEV_PARAM_EARLY_RX_FIX_SLEEP_SLOP,</div><div class='add'>+	WMI_PDEV_PARAM_BMISS_BASED_ADAPTIVE_BTO_ENABLE,</div><div class='add'>+	WMI_PDEV_PARAM_BMISS_BTO_MIN_BCN_TIMEOUT,</div><div class='add'>+	WMI_PDEV_PARAM_BMISS_BTO_INC_DEC_STEP,</div><div class='add'>+	WMI_PDEV_PARAM_BTO_FIX_BCN_TIMEOUT,</div><div class='add'>+	WMI_PDEV_PARAM_CE_BASED_ADAPTIVE_BTO_ENABLE,</div><div class='add'>+	WMI_PDEV_PARAM_CE_BTO_COMBO_CE_VALUE,</div><div class='add'>+	WMI_PDEV_PARAM_TX_CHAIN_MASK_2G,</div><div class='add'>+	WMI_PDEV_PARAM_RX_CHAIN_MASK_2G,</div><div class='add'>+	WMI_PDEV_PARAM_TX_CHAIN_MASK_5G,</div><div class='add'>+	WMI_PDEV_PARAM_RX_CHAIN_MASK_5G,</div><div class='add'>+	WMI_PDEV_PARAM_TX_CHAIN_MASK_CCK,</div><div class='add'>+	WMI_PDEV_PARAM_TX_CHAIN_MASK_1SS,</div><div class='add'>+	WMI_PDEV_PARAM_CTS2SELF_FOR_P2P_GO_CONFIG,</div><div class='add'>+	WMI_PDEV_PARAM_TXPOWER_DECR_DB,</div><div class='add'>+	WMI_PDEV_PARAM_AGGR_BURST,</div><div class='add'>+	WMI_PDEV_PARAM_RX_DECAP_MODE,</div><div class='add'>+	WMI_PDEV_PARAM_FAST_CHANNEL_RESET,</div><div class='add'>+	WMI_PDEV_PARAM_SMART_ANTENNA_DEFAULT_ANTENNA,</div><div class='add'>+	WMI_PDEV_PARAM_ANTENNA_GAIN,</div><div class='add'>+	WMI_PDEV_PARAM_RX_FILTER,</div><div class='add'>+	WMI_PDEV_SET_MCAST_TO_UCAST_TID,</div><div class='add'>+	WMI_PDEV_PARAM_PROXY_STA_MODE,</div><div class='add'>+	WMI_PDEV_PARAM_SET_MCAST2UCAST_MODE,</div><div class='add'>+	WMI_PDEV_PARAM_SET_MCAST2UCAST_BUFFER,</div><div class='add'>+	WMI_PDEV_PARAM_REMOVE_MCAST2UCAST_BUFFER,</div><div class='add'>+	WMI_PDEV_PEER_STA_PS_STATECHG_ENABLE,</div><div class='add'>+	WMI_PDEV_PARAM_IGMPMLD_AC_OVERRIDE,</div><div class='add'>+	WMI_PDEV_PARAM_BLOCK_INTERBSS,</div><div class='add'>+	WMI_PDEV_PARAM_SET_DISABLE_RESET_CMDID,</div><div class='add'>+	WMI_PDEV_PARAM_SET_MSDU_TTL_CMDID,</div><div class='add'>+	WMI_PDEV_PARAM_SET_PPDU_DURATION_CMDID,</div><div class='add'>+	WMI_PDEV_PARAM_TXBF_SOUND_PERIOD_CMDID,</div><div class='add'>+	WMI_PDEV_PARAM_SET_PROMISC_MODE_CMDID,</div><div class='add'>+	WMI_PDEV_PARAM_SET_BURST_MODE_CMDID,</div><div class='add'>+	WMI_PDEV_PARAM_EN_STATS,</div><div class='add'>+	WMI_PDEV_PARAM_MU_GROUP_POLICY,</div><div class='add'>+	WMI_PDEV_PARAM_NOISE_DETECTION,</div><div class='add'>+	WMI_PDEV_PARAM_NOISE_THRESHOLD,</div><div class='add'>+	WMI_PDEV_PARAM_DPD_ENABLE,</div><div class='add'>+	WMI_PDEV_PARAM_SET_MCAST_BCAST_ECHO,</div><div class='add'>+	WMI_PDEV_PARAM_ATF_STRICT_SCH,</div><div class='add'>+	WMI_PDEV_PARAM_ATF_SCHED_DURATION,</div><div class='add'>+	WMI_PDEV_PARAM_ANT_PLZN,</div><div class='add'>+	WMI_PDEV_PARAM_MGMT_RETRY_LIMIT,</div><div class='add'>+	WMI_PDEV_PARAM_SENSITIVITY_LEVEL,</div><div class='add'>+	WMI_PDEV_PARAM_SIGNED_TXPOWER_2G,</div><div class='add'>+	WMI_PDEV_PARAM_SIGNED_TXPOWER_5G,</div><div class='add'>+	WMI_PDEV_PARAM_ENABLE_PER_TID_AMSDU,</div><div class='add'>+	WMI_PDEV_PARAM_ENABLE_PER_TID_AMPDU,</div><div class='add'>+	WMI_PDEV_PARAM_CCA_THRESHOLD,</div><div class='add'>+	WMI_PDEV_PARAM_RTS_FIXED_RATE,</div><div class='add'>+	WMI_PDEV_PARAM_PDEV_RESET,</div><div class='add'>+	WMI_PDEV_PARAM_WAPI_MBSSID_OFFSET,</div><div class='add'>+	WMI_PDEV_PARAM_ARP_DBG_SRCADDR,</div><div class='add'>+	WMI_PDEV_PARAM_ARP_DBG_DSTADDR,</div><div class='add'>+	WMI_PDEV_PARAM_ATF_OBSS_NOISE_SCH,</div><div class='add'>+	WMI_PDEV_PARAM_ATF_OBSS_NOISE_SCALING_FACTOR,</div><div class='add'>+	WMI_PDEV_PARAM_CUST_TXPOWER_SCALE,</div><div class='add'>+	WMI_PDEV_PARAM_ATF_DYNAMIC_ENABLE,</div><div class='add'>+	WMI_PDEV_PARAM_CTRL_RETRY_LIMIT,</div><div class='add'>+	WMI_PDEV_PARAM_PROPAGATION_DELAY,</div><div class='add'>+	WMI_PDEV_PARAM_ENA_ANT_DIV,</div><div class='add'>+	WMI_PDEV_PARAM_FORCE_CHAIN_ANT,</div><div class='add'>+	WMI_PDEV_PARAM_ANT_DIV_SELFTEST,</div><div class='add'>+	WMI_PDEV_PARAM_ANT_DIV_SELFTEST_INTVL,</div><div class='add'>+	WMI_PDEV_PARAM_STATS_OBSERVATION_PERIOD,</div><div class='add'>+	WMI_PDEV_PARAM_TX_PPDU_DELAY_BIN_SIZE_MS,</div><div class='add'>+	WMI_PDEV_PARAM_TX_PPDU_DELAY_ARRAY_LEN,</div><div class='add'>+	WMI_PDEV_PARAM_TX_MPDU_AGGR_ARRAY_LEN,</div><div class='add'>+	WMI_PDEV_PARAM_RX_MPDU_AGGR_ARRAY_LEN,</div><div class='add'>+	WMI_PDEV_PARAM_TX_SCH_DELAY,</div><div class='add'>+	WMI_PDEV_PARAM_ENABLE_RTS_SIFS_BURSTING,</div><div class='add'>+	WMI_PDEV_PARAM_MAX_MPDUS_IN_AMPDU,</div><div class='add'>+	WMI_PDEV_PARAM_PEER_STATS_INFO_ENABLE,</div><div class='add'>+	WMI_PDEV_PARAM_FAST_PWR_TRANSITION,</div><div class='add'>+	WMI_PDEV_PARAM_RADIO_CHAN_STATS_ENABLE,</div><div class='add'>+	WMI_PDEV_PARAM_RADIO_DIAGNOSIS_ENABLE,</div><div class='add'>+	WMI_PDEV_PARAM_MESH_MCAST_ENABLE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_tlv_vdev_param {</div><div class='add'>+	WMI_VDEV_PARAM_RTS_THRESHOLD = 0x1,</div><div class='add'>+	WMI_VDEV_PARAM_FRAGMENTATION_THRESHOLD,</div><div class='add'>+	WMI_VDEV_PARAM_BEACON_INTERVAL,</div><div class='add'>+	WMI_VDEV_PARAM_LISTEN_INTERVAL,</div><div class='add'>+	WMI_VDEV_PARAM_MULTICAST_RATE,</div><div class='add'>+	WMI_VDEV_PARAM_MGMT_TX_RATE,</div><div class='add'>+	WMI_VDEV_PARAM_SLOT_TIME,</div><div class='add'>+	WMI_VDEV_PARAM_PREAMBLE,</div><div class='add'>+	WMI_VDEV_PARAM_SWBA_TIME,</div><div class='add'>+	WMI_VDEV_STATS_UPDATE_PERIOD,</div><div class='add'>+	WMI_VDEV_PWRSAVE_AGEOUT_TIME,</div><div class='add'>+	WMI_VDEV_HOST_SWBA_INTERVAL,</div><div class='add'>+	WMI_VDEV_PARAM_DTIM_PERIOD,</div><div class='add'>+	WMI_VDEV_OC_SCHEDULER_AIR_TIME_LIMIT,</div><div class='add'>+	WMI_VDEV_PARAM_WDS,</div><div class='add'>+	WMI_VDEV_PARAM_ATIM_WINDOW,</div><div class='add'>+	WMI_VDEV_PARAM_BMISS_COUNT_MAX,</div><div class='add'>+	WMI_VDEV_PARAM_BMISS_FIRST_BCNT,</div><div class='add'>+	WMI_VDEV_PARAM_BMISS_FINAL_BCNT,</div><div class='add'>+	WMI_VDEV_PARAM_FEATURE_WMM,</div><div class='add'>+	WMI_VDEV_PARAM_CHWIDTH,</div><div class='add'>+	WMI_VDEV_PARAM_CHEXTOFFSET,</div><div class='add'>+	WMI_VDEV_PARAM_DISABLE_HTPROTECTION,</div><div class='add'>+	WMI_VDEV_PARAM_STA_QUICKKICKOUT,</div><div class='add'>+	WMI_VDEV_PARAM_MGMT_RATE,</div><div class='add'>+	WMI_VDEV_PARAM_PROTECTION_MODE,</div><div class='add'>+	WMI_VDEV_PARAM_FIXED_RATE,</div><div class='add'>+	WMI_VDEV_PARAM_SGI,</div><div class='add'>+	WMI_VDEV_PARAM_LDPC,</div><div class='add'>+	WMI_VDEV_PARAM_TX_STBC,</div><div class='add'>+	WMI_VDEV_PARAM_RX_STBC,</div><div class='add'>+	WMI_VDEV_PARAM_INTRA_BSS_FWD,</div><div class='add'>+	WMI_VDEV_PARAM_DEF_KEYID,</div><div class='add'>+	WMI_VDEV_PARAM_NSS,</div><div class='add'>+	WMI_VDEV_PARAM_BCAST_DATA_RATE,</div><div class='add'>+	WMI_VDEV_PARAM_MCAST_DATA_RATE,</div><div class='add'>+	WMI_VDEV_PARAM_MCAST_INDICATE,</div><div class='add'>+	WMI_VDEV_PARAM_DHCP_INDICATE,</div><div class='add'>+	WMI_VDEV_PARAM_UNKNOWN_DEST_INDICATE,</div><div class='add'>+	WMI_VDEV_PARAM_AP_KEEPALIVE_MIN_IDLE_INACTIVE_TIME_SECS,</div><div class='add'>+	WMI_VDEV_PARAM_AP_KEEPALIVE_MAX_IDLE_INACTIVE_TIME_SECS,</div><div class='add'>+	WMI_VDEV_PARAM_AP_KEEPALIVE_MAX_UNRESPONSIVE_TIME_SECS,</div><div class='add'>+	WMI_VDEV_PARAM_AP_ENABLE_NAWDS,</div><div class='add'>+	WMI_VDEV_PARAM_ENABLE_RTSCTS,</div><div class='add'>+	WMI_VDEV_PARAM_TXBF,</div><div class='add'>+	WMI_VDEV_PARAM_PACKET_POWERSAVE,</div><div class='add'>+	WMI_VDEV_PARAM_DROP_UNENCRY,</div><div class='add'>+	WMI_VDEV_PARAM_TX_ENCAP_TYPE,</div><div class='add'>+	WMI_VDEV_PARAM_AP_DETECT_OUT_OF_SYNC_SLEEPING_STA_TIME_SECS,</div><div class='add'>+	WMI_VDEV_PARAM_EARLY_RX_ADJUST_ENABLE,</div><div class='add'>+	WMI_VDEV_PARAM_EARLY_RX_TGT_BMISS_NUM,</div><div class='add'>+	WMI_VDEV_PARAM_EARLY_RX_BMISS_SAMPLE_CYCLE,</div><div class='add'>+	WMI_VDEV_PARAM_EARLY_RX_SLOP_STEP,</div><div class='add'>+	WMI_VDEV_PARAM_EARLY_RX_INIT_SLOP,</div><div class='add'>+	WMI_VDEV_PARAM_EARLY_RX_ADJUST_PAUSE,</div><div class='add'>+	WMI_VDEV_PARAM_TX_PWRLIMIT,</div><div class='add'>+	WMI_VDEV_PARAM_SNR_NUM_FOR_CAL,</div><div class='add'>+	WMI_VDEV_PARAM_ROAM_FW_OFFLOAD,</div><div class='add'>+	WMI_VDEV_PARAM_ENABLE_RMC,</div><div class='add'>+	WMI_VDEV_PARAM_IBSS_MAX_BCN_LOST_MS,</div><div class='add'>+	WMI_VDEV_PARAM_MAX_RATE,</div><div class='add'>+	WMI_VDEV_PARAM_EARLY_RX_DRIFT_SAMPLE,</div><div class='add'>+	WMI_VDEV_PARAM_SET_IBSS_TX_FAIL_CNT_THR,</div><div class='add'>+	WMI_VDEV_PARAM_EBT_RESYNC_TIMEOUT,</div><div class='add'>+	WMI_VDEV_PARAM_AGGR_TRIG_EVENT_ENABLE,</div><div class='add'>+	WMI_VDEV_PARAM_IS_IBSS_POWER_SAVE_ALLOWED,</div><div class='add'>+	WMI_VDEV_PARAM_IS_POWER_COLLAPSE_ALLOWED,</div><div class='add'>+	WMI_VDEV_PARAM_IS_AWAKE_ON_TXRX_ENABLED,</div><div class='add'>+	WMI_VDEV_PARAM_INACTIVITY_CNT,</div><div class='add'>+	WMI_VDEV_PARAM_TXSP_END_INACTIVITY_TIME_MS,</div><div class='add'>+	WMI_VDEV_PARAM_DTIM_POLICY,</div><div class='add'>+	WMI_VDEV_PARAM_IBSS_PS_WARMUP_TIME_SECS,</div><div class='add'>+	WMI_VDEV_PARAM_IBSS_PS_1RX_CHAIN_IN_ATIM_WINDOW_ENABLE,</div><div class='add'>+	WMI_VDEV_PARAM_RX_LEAK_WINDOW,</div><div class='add'>+	WMI_VDEV_PARAM_STATS_AVG_FACTOR,</div><div class='add'>+	WMI_VDEV_PARAM_DISCONNECT_TH,</div><div class='add'>+	WMI_VDEV_PARAM_RTSCTS_RATE,</div><div class='add'>+	WMI_VDEV_PARAM_MCC_RTSCTS_PROTECTION_ENABLE,</div><div class='add'>+	WMI_VDEV_PARAM_MCC_BROADCAST_PROBE_ENABLE,</div><div class='add'>+	WMI_VDEV_PARAM_TXPOWER_SCALE,</div><div class='add'>+	WMI_VDEV_PARAM_TXPOWER_SCALE_DECR_DB,</div><div class='add'>+	WMI_VDEV_PARAM_MCAST2UCAST_SET,</div><div class='add'>+	WMI_VDEV_PARAM_RC_NUM_RETRIES,</div><div class='add'>+	WMI_VDEV_PARAM_CABQ_MAXDUR,</div><div class='add'>+	WMI_VDEV_PARAM_MFPTEST_SET,</div><div class='add'>+	WMI_VDEV_PARAM_RTS_FIXED_RATE,</div><div class='add'>+	WMI_VDEV_PARAM_VHT_SGIMASK,</div><div class='add'>+	WMI_VDEV_PARAM_VHT80_RATEMASK,</div><div class='add'>+	WMI_VDEV_PARAM_PROXY_STA,</div><div class='add'>+	WMI_VDEV_PARAM_VIRTUAL_CELL_MODE,</div><div class='add'>+	WMI_VDEV_PARAM_RX_DECAP_TYPE,</div><div class='add'>+	WMI_VDEV_PARAM_BW_NSS_RATEMASK,</div><div class='add'>+	WMI_VDEV_PARAM_SENSOR_AP,</div><div class='add'>+	WMI_VDEV_PARAM_BEACON_RATE,</div><div class='add'>+	WMI_VDEV_PARAM_DTIM_ENABLE_CTS,</div><div class='add'>+	WMI_VDEV_PARAM_STA_KICKOUT,</div><div class='add'>+	WMI_VDEV_PARAM_CAPABILITIES,</div><div class='add'>+	WMI_VDEV_PARAM_TSF_INCREMENT,</div><div class='add'>+	WMI_VDEV_PARAM_AMPDU_PER_AC,</div><div class='add'>+	WMI_VDEV_PARAM_RX_FILTER,</div><div class='add'>+	WMI_VDEV_PARAM_MGMT_TX_POWER,</div><div class='add'>+	WMI_VDEV_PARAM_NON_AGG_SW_RETRY_TH,</div><div class='add'>+	WMI_VDEV_PARAM_AGG_SW_RETRY_TH,</div><div class='add'>+	WMI_VDEV_PARAM_DISABLE_DYN_BW_RTS,</div><div class='add'>+	WMI_VDEV_PARAM_ATF_SSID_SCHED_POLICY,</div><div class='add'>+	WMI_VDEV_PARAM_HE_DCM,</div><div class='add'>+	WMI_VDEV_PARAM_HE_RANGE_EXT,</div><div class='add'>+	WMI_VDEV_PARAM_ENABLE_BCAST_PROBE_RESPONSE,</div><div class='add'>+	WMI_VDEV_PARAM_FILS_MAX_CHANNEL_GUARD_TIME,</div><div class='add'>+	WMI_VDEV_PARAM_HE_LTF = 0x74,</div><div class='add'>+	WMI_VDEV_PARAM_BA_MODE = 0x7e,</div><div class='add'>+	WMI_VDEV_PARAM_AUTORATE_MISC_CFG = 0x80,</div><div class='add'>+	WMI_VDEV_PARAM_SET_HE_SOUNDING_MODE = 0x87,</div><div class='add'>+	WMI_VDEV_PARAM_6GHZ_PARAMS = 0x99,</div><div class='add'>+	WMI_VDEV_PARAM_PROTOTYPE = 0x8000,</div><div class='add'>+	WMI_VDEV_PARAM_BSS_COLOR,</div><div class='add'>+	WMI_VDEV_PARAM_SET_HEMU_MODE,</div><div class='add'>+	WMI_VDEV_PARAM_HEOPS_0_31 = 0x8003,</div><div class='add'>+	WMI_VDEV_PARAM_SET_EHT_MU_MODE = 0x8005,</div><div class='add'>+	WMI_VDEV_PARAM_EHT_LTF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_tlv_peer_flags {</div><div class='add'>+	WMI_PEER_AUTH		= 0x00000001,</div><div class='add'>+	WMI_PEER_QOS		= 0x00000002,</div><div class='add'>+	WMI_PEER_NEED_PTK_4_WAY	= 0x00000004,</div><div class='add'>+	WMI_PEER_NEED_GTK_2_WAY	= 0x00000010,</div><div class='add'>+	WMI_PEER_HE		= 0x00000400,</div><div class='add'>+	WMI_PEER_APSD		= 0x00000800,</div><div class='add'>+	WMI_PEER_HT		= 0x00001000,</div><div class='add'>+	WMI_PEER_40MHZ		= 0x00002000,</div><div class='add'>+	WMI_PEER_STBC		= 0x00008000,</div><div class='add'>+	WMI_PEER_LDPC		= 0x00010000,</div><div class='add'>+	WMI_PEER_DYN_MIMOPS	= 0x00020000,</div><div class='add'>+	WMI_PEER_STATIC_MIMOPS	= 0x00040000,</div><div class='add'>+	WMI_PEER_SPATIAL_MUX	= 0x00200000,</div><div class='add'>+	WMI_PEER_TWT_REQ	= 0x00400000,</div><div class='add'>+	WMI_PEER_TWT_RESP	= 0x00800000,</div><div class='add'>+	WMI_PEER_VHT		= 0x02000000,</div><div class='add'>+	WMI_PEER_80MHZ		= 0x04000000,</div><div class='add'>+	WMI_PEER_PMF		= 0x08000000,</div><div class='add'>+	WMI_PEER_IS_P2P_CAPABLE = 0x20000000,</div><div class='add'>+	WMI_PEER_160MHZ         = 0x40000000,</div><div class='add'>+	WMI_PEER_SAFEMODE_EN    = 0x80000000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_tlv_peer_flags_ext {</div><div class='add'>+	WMI_PEER_EXT_EHT = BIT(0),</div><div class='add'>+	WMI_PEER_EXT_320MHZ = BIT(1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/** Enum list of TLV Tags for each parameter structure type. */</div><div class='add'>+enum wmi_tlv_tag {</div><div class='add'>+	WMI_TAG_LAST_RESERVED = 15,</div><div class='add'>+	WMI_TAG_FIRST_ARRAY_ENUM,</div><div class='add'>+	WMI_TAG_ARRAY_UINT32 = WMI_TAG_FIRST_ARRAY_ENUM,</div><div class='add'>+	WMI_TAG_ARRAY_BYTE,</div><div class='add'>+	WMI_TAG_ARRAY_STRUCT,</div><div class='add'>+	WMI_TAG_ARRAY_FIXED_STRUCT,</div><div class='add'>+	WMI_TAG_ARRAY_INT16,</div><div class='add'>+	WMI_TAG_LAST_ARRAY_ENUM = 31,</div><div class='add'>+	WMI_TAG_SERVICE_READY_EVENT,</div><div class='add'>+	WMI_TAG_HAL_REG_CAPABILITIES,</div><div class='add'>+	WMI_TAG_WLAN_HOST_MEM_REQ,</div><div class='add'>+	WMI_TAG_READY_EVENT,</div><div class='add'>+	WMI_TAG_SCAN_EVENT,</div><div class='add'>+	WMI_TAG_PDEV_TPC_CONFIG_EVENT,</div><div class='add'>+	WMI_TAG_CHAN_INFO_EVENT,</div><div class='add'>+	WMI_TAG_COMB_PHYERR_RX_HDR,</div><div class='add'>+	WMI_TAG_VDEV_START_RESPONSE_EVENT,</div><div class='add'>+	WMI_TAG_VDEV_STOPPED_EVENT,</div><div class='add'>+	WMI_TAG_VDEV_INSTALL_KEY_COMPLETE_EVENT,</div><div class='add'>+	WMI_TAG_PEER_STA_KICKOUT_EVENT,</div><div class='add'>+	WMI_TAG_MGMT_RX_HDR,</div><div class='add'>+	WMI_TAG_TBTT_OFFSET_EVENT,</div><div class='add'>+	WMI_TAG_TX_DELBA_COMPLETE_EVENT,</div><div class='add'>+	WMI_TAG_TX_ADDBA_COMPLETE_EVENT,</div><div class='add'>+	WMI_TAG_ROAM_EVENT,</div><div class='add'>+	WMI_TAG_WOW_EVENT_INFO,</div><div class='add'>+	WMI_TAG_WOW_EVENT_INFO_SECTION_BITMAP,</div><div class='add'>+	WMI_TAG_RTT_EVENT_HEADER,</div><div class='add'>+	WMI_TAG_RTT_ERROR_REPORT_EVENT,</div><div class='add'>+	WMI_TAG_RTT_MEAS_EVENT,</div><div class='add'>+	WMI_TAG_ECHO_EVENT,</div><div class='add'>+	WMI_TAG_FTM_INTG_EVENT,</div><div class='add'>+	WMI_TAG_VDEV_GET_KEEPALIVE_EVENT,</div><div class='add'>+	WMI_TAG_GPIO_INPUT_EVENT,</div><div class='add'>+	WMI_TAG_CSA_EVENT,</div><div class='add'>+	WMI_TAG_GTK_OFFLOAD_STATUS_EVENT,</div><div class='add'>+	WMI_TAG_IGTK_INFO,</div><div class='add'>+	WMI_TAG_DCS_INTERFERENCE_EVENT,</div><div class='add'>+	WMI_TAG_ATH_DCS_CW_INT,</div><div class='add'>+	WMI_TAG_WLAN_DCS_CW_INT = /* ALIAS */</div><div class='add'>+		WMI_TAG_ATH_DCS_CW_INT,</div><div class='add'>+	WMI_TAG_ATH_DCS_WLAN_INT_STAT,</div><div class='add'>+	WMI_TAG_WLAN_DCS_IM_TGT_STATS_T = /* ALIAS */</div><div class='add'>+		WMI_TAG_ATH_DCS_WLAN_INT_STAT,</div><div class='add'>+	WMI_TAG_WLAN_PROFILE_CTX_T,</div><div class='add'>+	WMI_TAG_WLAN_PROFILE_T,</div><div class='add'>+	WMI_TAG_PDEV_QVIT_EVENT,</div><div class='add'>+	WMI_TAG_HOST_SWBA_EVENT,</div><div class='add'>+	WMI_TAG_TIM_INFO,</div><div class='add'>+	WMI_TAG_P2P_NOA_INFO,</div><div class='add'>+	WMI_TAG_STATS_EVENT,</div><div class='add'>+	WMI_TAG_AVOID_FREQ_RANGES_EVENT,</div><div class='add'>+	WMI_TAG_AVOID_FREQ_RANGE_DESC,</div><div class='add'>+	WMI_TAG_GTK_REKEY_FAIL_EVENT,</div><div class='add'>+	WMI_TAG_INIT_CMD,</div><div class='add'>+	WMI_TAG_RESOURCE_CONFIG,</div><div class='add'>+	WMI_TAG_WLAN_HOST_MEMORY_CHUNK,</div><div class='add'>+	WMI_TAG_START_SCAN_CMD,</div><div class='add'>+	WMI_TAG_STOP_SCAN_CMD,</div><div class='add'>+	WMI_TAG_SCAN_CHAN_LIST_CMD,</div><div class='add'>+	WMI_TAG_CHANNEL,</div><div class='add'>+	WMI_TAG_PDEV_SET_REGDOMAIN_CMD,</div><div class='add'>+	WMI_TAG_PDEV_SET_PARAM_CMD,</div><div class='add'>+	WMI_TAG_PDEV_SET_WMM_PARAMS_CMD,</div><div class='add'>+	WMI_TAG_WMM_PARAMS,</div><div class='add'>+	WMI_TAG_PDEV_SET_QUIET_CMD,</div><div class='add'>+	WMI_TAG_VDEV_CREATE_CMD,</div><div class='add'>+	WMI_TAG_VDEV_DELETE_CMD,</div><div class='add'>+	WMI_TAG_VDEV_START_REQUEST_CMD,</div><div class='add'>+	WMI_TAG_P2P_NOA_DESCRIPTOR,</div><div class='add'>+	WMI_TAG_P2P_GO_SET_BEACON_IE,</div><div class='add'>+	WMI_TAG_GTK_OFFLOAD_CMD,</div><div class='add'>+	WMI_TAG_VDEV_UP_CMD,</div><div class='add'>+	WMI_TAG_VDEV_STOP_CMD,</div><div class='add'>+	WMI_TAG_VDEV_DOWN_CMD,</div><div class='add'>+	WMI_TAG_VDEV_SET_PARAM_CMD,</div><div class='add'>+	WMI_TAG_VDEV_INSTALL_KEY_CMD,</div><div class='add'>+	WMI_TAG_PEER_CREATE_CMD,</div><div class='add'>+	WMI_TAG_PEER_DELETE_CMD,</div><div class='add'>+	WMI_TAG_PEER_FLUSH_TIDS_CMD,</div><div class='add'>+	WMI_TAG_PEER_SET_PARAM_CMD,</div><div class='add'>+	WMI_TAG_PEER_ASSOC_COMPLETE_CMD,</div><div class='add'>+	WMI_TAG_VHT_RATE_SET,</div><div class='add'>+	WMI_TAG_BCN_TMPL_CMD,</div><div class='add'>+	WMI_TAG_PRB_TMPL_CMD,</div><div class='add'>+	WMI_TAG_BCN_PRB_INFO,</div><div class='add'>+	WMI_TAG_PEER_TID_ADDBA_CMD,</div><div class='add'>+	WMI_TAG_PEER_TID_DELBA_CMD,</div><div class='add'>+	WMI_TAG_STA_POWERSAVE_MODE_CMD,</div><div class='add'>+	WMI_TAG_STA_POWERSAVE_PARAM_CMD,</div><div class='add'>+	WMI_TAG_STA_DTIM_PS_METHOD_CMD,</div><div class='add'>+	WMI_TAG_ROAM_SCAN_MODE,</div><div class='add'>+	WMI_TAG_ROAM_SCAN_RSSI_THRESHOLD,</div><div class='add'>+	WMI_TAG_ROAM_SCAN_PERIOD,</div><div class='add'>+	WMI_TAG_ROAM_SCAN_RSSI_CHANGE_THRESHOLD,</div><div class='add'>+	WMI_TAG_PDEV_SUSPEND_CMD,</div><div class='add'>+	WMI_TAG_PDEV_RESUME_CMD,</div><div class='add'>+	WMI_TAG_ADD_BCN_FILTER_CMD,</div><div class='add'>+	WMI_TAG_RMV_BCN_FILTER_CMD,</div><div class='add'>+	WMI_TAG_WOW_ENABLE_CMD,</div><div class='add'>+	WMI_TAG_WOW_HOSTWAKEUP_FROM_SLEEP_CMD,</div><div class='add'>+	WMI_TAG_STA_UAPSD_AUTO_TRIG_CMD,</div><div class='add'>+	WMI_TAG_STA_UAPSD_AUTO_TRIG_PARAM,</div><div class='add'>+	WMI_TAG_SET_ARP_NS_OFFLOAD_CMD,</div><div class='add'>+	WMI_TAG_ARP_OFFLOAD_TUPLE,</div><div class='add'>+	WMI_TAG_NS_OFFLOAD_TUPLE,</div><div class='add'>+	WMI_TAG_FTM_INTG_CMD,</div><div class='add'>+	WMI_TAG_STA_KEEPALIVE_CMD,</div><div class='add'>+	WMI_TAG_STA_KEEPALVE_ARP_RESPONSE,</div><div class='add'>+	WMI_TAG_P2P_SET_VENDOR_IE_DATA_CMD,</div><div class='add'>+	WMI_TAG_AP_PS_PEER_CMD,</div><div class='add'>+	WMI_TAG_PEER_RATE_RETRY_SCHED_CMD,</div><div class='add'>+	WMI_TAG_WLAN_PROFILE_TRIGGER_CMD,</div><div class='add'>+	WMI_TAG_WLAN_PROFILE_SET_HIST_INTVL_CMD,</div><div class='add'>+	WMI_TAG_WLAN_PROFILE_GET_PROF_DATA_CMD,</div><div class='add'>+	WMI_TAG_WLAN_PROFILE_ENABLE_PROFILE_ID_CMD,</div><div class='add'>+	WMI_TAG_WOW_DEL_PATTERN_CMD,</div><div class='add'>+	WMI_TAG_WOW_ADD_DEL_EVT_CMD,</div><div class='add'>+	WMI_TAG_RTT_MEASREQ_HEAD,</div><div class='add'>+	WMI_TAG_RTT_MEASREQ_BODY,</div><div class='add'>+	WMI_TAG_RTT_TSF_CMD,</div><div class='add'>+	WMI_TAG_VDEV_SPECTRAL_CONFIGURE_CMD,</div><div class='add'>+	WMI_TAG_VDEV_SPECTRAL_ENABLE_CMD,</div><div class='add'>+	WMI_TAG_REQUEST_STATS_CMD,</div><div class='add'>+	WMI_TAG_NLO_CONFIG_CMD,</div><div class='add'>+	WMI_TAG_NLO_CONFIGURED_PARAMETERS,</div><div class='add'>+	WMI_TAG_CSA_OFFLOAD_ENABLE_CMD,</div><div class='add'>+	WMI_TAG_CSA_OFFLOAD_CHANSWITCH_CMD,</div><div class='add'>+	WMI_TAG_CHATTER_SET_MODE_CMD,</div><div class='add'>+	WMI_TAG_ECHO_CMD,</div><div class='add'>+	WMI_TAG_VDEV_SET_KEEPALIVE_CMD,</div><div class='add'>+	WMI_TAG_VDEV_GET_KEEPALIVE_CMD,</div><div class='add'>+	WMI_TAG_FORCE_FW_HANG_CMD,</div><div class='add'>+	WMI_TAG_GPIO_CONFIG_CMD,</div><div class='add'>+	WMI_TAG_GPIO_OUTPUT_CMD,</div><div class='add'>+	WMI_TAG_PEER_ADD_WDS_ENTRY_CMD,</div><div class='add'>+	WMI_TAG_PEER_REMOVE_WDS_ENTRY_CMD,</div><div class='add'>+	WMI_TAG_BCN_TX_HDR,</div><div class='add'>+	WMI_TAG_BCN_SEND_FROM_HOST_CMD,</div><div class='add'>+	WMI_TAG_MGMT_TX_HDR,</div><div class='add'>+	WMI_TAG_ADDBA_CLEAR_RESP_CMD,</div><div class='add'>+	WMI_TAG_ADDBA_SEND_CMD,</div><div class='add'>+	WMI_TAG_DELBA_SEND_CMD,</div><div class='add'>+	WMI_TAG_ADDBA_SETRESPONSE_CMD,</div><div class='add'>+	WMI_TAG_SEND_SINGLEAMSDU_CMD,</div><div class='add'>+	WMI_TAG_PDEV_PKTLOG_ENABLE_CMD,</div><div class='add'>+	WMI_TAG_PDEV_PKTLOG_DISABLE_CMD,</div><div class='add'>+	WMI_TAG_PDEV_SET_HT_IE_CMD,</div><div class='add'>+	WMI_TAG_PDEV_SET_VHT_IE_CMD,</div><div class='add'>+	WMI_TAG_PDEV_SET_DSCP_TID_MAP_CMD,</div><div class='add'>+	WMI_TAG_PDEV_GREEN_AP_PS_ENABLE_CMD,</div><div class='add'>+	WMI_TAG_PDEV_GET_TPC_CONFIG_CMD,</div><div class='add'>+	WMI_TAG_PDEV_SET_BASE_MACADDR_CMD,</div><div class='add'>+	WMI_TAG_PEER_MCAST_GROUP_CMD,</div><div class='add'>+	WMI_TAG_ROAM_AP_PROFILE,</div><div class='add'>+	WMI_TAG_AP_PROFILE,</div><div class='add'>+	WMI_TAG_SCAN_SCH_PRIORITY_TABLE_CMD,</div><div class='add'>+	WMI_TAG_PDEV_DFS_ENABLE_CMD,</div><div class='add'>+	WMI_TAG_PDEV_DFS_DISABLE_CMD,</div><div class='add'>+	WMI_TAG_WOW_ADD_PATTERN_CMD,</div><div class='add'>+	WMI_TAG_WOW_BITMAP_PATTERN_T,</div><div class='add'>+	WMI_TAG_WOW_IPV4_SYNC_PATTERN_T,</div><div class='add'>+	WMI_TAG_WOW_IPV6_SYNC_PATTERN_T,</div><div class='add'>+	WMI_TAG_WOW_MAGIC_PATTERN_CMD,</div><div class='add'>+	WMI_TAG_SCAN_UPDATE_REQUEST_CMD,</div><div class='add'>+	WMI_TAG_CHATTER_PKT_COALESCING_FILTER,</div><div class='add'>+	WMI_TAG_CHATTER_COALESCING_ADD_FILTER_CMD,</div><div class='add'>+	WMI_TAG_CHATTER_COALESCING_DELETE_FILTER_CMD,</div><div class='add'>+	WMI_TAG_CHATTER_COALESCING_QUERY_CMD,</div><div class='add'>+	WMI_TAG_TXBF_CMD,</div><div class='add'>+	WMI_TAG_DEBUG_LOG_CONFIG_CMD,</div><div class='add'>+	WMI_TAG_NLO_EVENT,</div><div class='add'>+	WMI_TAG_CHATTER_QUERY_REPLY_EVENT,</div><div class='add'>+	WMI_TAG_UPLOAD_H_HDR,</div><div class='add'>+	WMI_TAG_CAPTURE_H_EVENT_HDR,</div><div class='add'>+	WMI_TAG_VDEV_WNM_SLEEPMODE_CMD,</div><div class='add'>+	WMI_TAG_VDEV_IPSEC_NATKEEPALIVE_FILTER_CMD,</div><div class='add'>+	WMI_TAG_VDEV_WMM_ADDTS_CMD,</div><div class='add'>+	WMI_TAG_VDEV_WMM_DELTS_CMD,</div><div class='add'>+	WMI_TAG_VDEV_SET_WMM_PARAMS_CMD,</div><div class='add'>+	WMI_TAG_TDLS_SET_STATE_CMD,</div><div class='add'>+	WMI_TAG_TDLS_PEER_UPDATE_CMD,</div><div class='add'>+	WMI_TAG_TDLS_PEER_EVENT,</div><div class='add'>+	WMI_TAG_TDLS_PEER_CAPABILITIES,</div><div class='add'>+	WMI_TAG_VDEV_MCC_SET_TBTT_MODE_CMD,</div><div class='add'>+	WMI_TAG_ROAM_CHAN_LIST,</div><div class='add'>+	WMI_TAG_VDEV_MCC_BCN_INTVL_CHANGE_EVENT,</div><div class='add'>+	WMI_TAG_RESMGR_ADAPTIVE_OCS_ENABLE_DISABLE_CMD,</div><div class='add'>+	WMI_TAG_RESMGR_SET_CHAN_TIME_QUOTA_CMD,</div><div class='add'>+	WMI_TAG_RESMGR_SET_CHAN_LATENCY_CMD,</div><div class='add'>+	WMI_TAG_BA_REQ_SSN_CMD,</div><div class='add'>+	WMI_TAG_BA_RSP_SSN_EVENT,</div><div class='add'>+	WMI_TAG_STA_SMPS_FORCE_MODE_CMD,</div><div class='add'>+	WMI_TAG_SET_MCASTBCAST_FILTER_CMD,</div><div class='add'>+	WMI_TAG_P2P_SET_OPPPS_CMD,</div><div class='add'>+	WMI_TAG_P2P_SET_NOA_CMD,</div><div class='add'>+	WMI_TAG_BA_REQ_SSN_CMD_SUB_STRUCT_PARAM,</div><div class='add'>+	WMI_TAG_BA_REQ_SSN_EVENT_SUB_STRUCT_PARAM,</div><div class='add'>+	WMI_TAG_STA_SMPS_PARAM_CMD,</div><div class='add'>+	WMI_TAG_VDEV_SET_GTX_PARAMS_CMD,</div><div class='add'>+	WMI_TAG_MCC_SCHED_TRAFFIC_STATS_CMD,</div><div class='add'>+	WMI_TAG_MCC_SCHED_STA_TRAFFIC_STATS,</div><div class='add'>+	WMI_TAG_OFFLOAD_BCN_TX_STATUS_EVENT,</div><div class='add'>+	WMI_TAG_P2P_NOA_EVENT,</div><div class='add'>+	WMI_TAG_HB_SET_ENABLE_CMD,</div><div class='add'>+	WMI_TAG_HB_SET_TCP_PARAMS_CMD,</div><div class='add'>+	WMI_TAG_HB_SET_TCP_PKT_FILTER_CMD,</div><div class='add'>+	WMI_TAG_HB_SET_UDP_PARAMS_CMD,</div><div class='add'>+	WMI_TAG_HB_SET_UDP_PKT_FILTER_CMD,</div><div class='add'>+	WMI_TAG_HB_IND_EVENT,</div><div class='add'>+	WMI_TAG_TX_PAUSE_EVENT,</div><div class='add'>+	WMI_TAG_RFKILL_EVENT,</div><div class='add'>+	WMI_TAG_DFS_RADAR_EVENT,</div><div class='add'>+	WMI_TAG_DFS_PHYERR_FILTER_ENA_CMD,</div><div class='add'>+	WMI_TAG_DFS_PHYERR_FILTER_DIS_CMD,</div><div class='add'>+	WMI_TAG_BATCH_SCAN_RESULT_SCAN_LIST,</div><div class='add'>+	WMI_TAG_BATCH_SCAN_RESULT_NETWORK_INFO,</div><div class='add'>+	WMI_TAG_BATCH_SCAN_ENABLE_CMD,</div><div class='add'>+	WMI_TAG_BATCH_SCAN_DISABLE_CMD,</div><div class='add'>+	WMI_TAG_BATCH_SCAN_TRIGGER_RESULT_CMD,</div><div class='add'>+	WMI_TAG_BATCH_SCAN_ENABLED_EVENT,</div><div class='add'>+	WMI_TAG_BATCH_SCAN_RESULT_EVENT,</div><div class='add'>+	WMI_TAG_VDEV_PLMREQ_START_CMD,</div><div class='add'>+	WMI_TAG_VDEV_PLMREQ_STOP_CMD,</div><div class='add'>+	WMI_TAG_THERMAL_MGMT_CMD,</div><div class='add'>+	WMI_TAG_THERMAL_MGMT_EVENT,</div><div class='add'>+	WMI_TAG_PEER_INFO_REQ_CMD,</div><div class='add'>+	WMI_TAG_PEER_INFO_EVENT,</div><div class='add'>+	WMI_TAG_PEER_INFO,</div><div class='add'>+	WMI_TAG_PEER_TX_FAIL_CNT_THR_EVENT,</div><div class='add'>+	WMI_TAG_RMC_SET_MODE_CMD,</div><div class='add'>+	WMI_TAG_RMC_SET_ACTION_PERIOD_CMD,</div><div class='add'>+	WMI_TAG_RMC_CONFIG_CMD,</div><div class='add'>+	WMI_TAG_MHF_OFFLOAD_SET_MODE_CMD,</div><div class='add'>+	WMI_TAG_MHF_OFFLOAD_PLUMB_ROUTING_TABLE_CMD,</div><div class='add'>+	WMI_TAG_ADD_PROACTIVE_ARP_RSP_PATTERN_CMD,</div><div class='add'>+	WMI_TAG_DEL_PROACTIVE_ARP_RSP_PATTERN_CMD,</div><div class='add'>+	WMI_TAG_NAN_CMD_PARAM,</div><div class='add'>+	WMI_TAG_NAN_EVENT_HDR,</div><div class='add'>+	WMI_TAG_PDEV_L1SS_TRACK_EVENT,</div><div class='add'>+	WMI_TAG_DIAG_DATA_CONTAINER_EVENT,</div><div class='add'>+	WMI_TAG_MODEM_POWER_STATE_CMD_PARAM,</div><div class='add'>+	WMI_TAG_PEER_GET_ESTIMATED_LINKSPEED_CMD,</div><div class='add'>+	WMI_TAG_PEER_ESTIMATED_LINKSPEED_EVENT,</div><div class='add'>+	WMI_TAG_AGGR_STATE_TRIG_EVENT,</div><div class='add'>+	WMI_TAG_MHF_OFFLOAD_ROUTING_TABLE_ENTRY,</div><div class='add'>+	WMI_TAG_ROAM_SCAN_CMD,</div><div class='add'>+	WMI_TAG_REQ_STATS_EXT_CMD,</div><div class='add'>+	WMI_TAG_STATS_EXT_EVENT,</div><div class='add'>+	WMI_TAG_OBSS_SCAN_ENABLE_CMD,</div><div class='add'>+	WMI_TAG_OBSS_SCAN_DISABLE_CMD,</div><div class='add'>+	WMI_TAG_OFFLOAD_PRB_RSP_TX_STATUS_EVENT,</div><div class='add'>+	WMI_TAG_PDEV_SET_LED_CONFIG_CMD,</div><div class='add'>+	WMI_TAG_HOST_AUTO_SHUTDOWN_CFG_CMD,</div><div class='add'>+	WMI_TAG_HOST_AUTO_SHUTDOWN_EVENT,</div><div class='add'>+	WMI_TAG_UPDATE_WHAL_MIB_STATS_EVENT,</div><div class='add'>+	WMI_TAG_CHAN_AVOID_UPDATE_CMD_PARAM,</div><div class='add'>+	WMI_TAG_WOW_IOAC_PKT_PATTERN_T,</div><div class='add'>+	WMI_TAG_WOW_IOAC_TMR_PATTERN_T,</div><div class='add'>+	WMI_TAG_WOW_IOAC_ADD_KEEPALIVE_CMD,</div><div class='add'>+	WMI_TAG_WOW_IOAC_DEL_KEEPALIVE_CMD,</div><div class='add'>+	WMI_TAG_WOW_IOAC_KEEPALIVE_T,</div><div class='add'>+	WMI_TAG_WOW_IOAC_ADD_PATTERN_CMD,</div><div class='add'>+	WMI_TAG_WOW_IOAC_DEL_PATTERN_CMD,</div><div class='add'>+	WMI_TAG_START_LINK_STATS_CMD,</div><div class='add'>+	WMI_TAG_CLEAR_LINK_STATS_CMD,</div><div class='add'>+	WMI_TAG_REQUEST_LINK_STATS_CMD,</div><div class='add'>+	WMI_TAG_IFACE_LINK_STATS_EVENT,</div><div class='add'>+	WMI_TAG_RADIO_LINK_STATS_EVENT,</div><div class='add'>+	WMI_TAG_PEER_STATS_EVENT,</div><div class='add'>+	WMI_TAG_CHANNEL_STATS,</div><div class='add'>+	WMI_TAG_RADIO_LINK_STATS,</div><div class='add'>+	WMI_TAG_RATE_STATS,</div><div class='add'>+	WMI_TAG_PEER_LINK_STATS,</div><div class='add'>+	WMI_TAG_WMM_AC_STATS,</div><div class='add'>+	WMI_TAG_IFACE_LINK_STATS,</div><div class='add'>+	WMI_TAG_LPI_MGMT_SNOOPING_CONFIG_CMD,</div><div class='add'>+	WMI_TAG_LPI_START_SCAN_CMD,</div><div class='add'>+	WMI_TAG_LPI_STOP_SCAN_CMD,</div><div class='add'>+	WMI_TAG_LPI_RESULT_EVENT,</div><div class='add'>+	WMI_TAG_PEER_STATE_EVENT,</div><div class='add'>+	WMI_TAG_EXTSCAN_BUCKET_CMD,</div><div class='add'>+	WMI_TAG_EXTSCAN_BUCKET_CHANNEL_EVENT,</div><div class='add'>+	WMI_TAG_EXTSCAN_START_CMD,</div><div class='add'>+	WMI_TAG_EXTSCAN_STOP_CMD,</div><div class='add'>+	WMI_TAG_EXTSCAN_CONFIGURE_WLAN_CHANGE_MONITOR_CMD,</div><div class='add'>+	WMI_TAG_EXTSCAN_WLAN_CHANGE_BSSID_PARAM_CMD,</div><div class='add'>+	WMI_TAG_EXTSCAN_CONFIGURE_HOTLIST_MONITOR_CMD,</div><div class='add'>+	WMI_TAG_EXTSCAN_GET_CACHED_RESULTS_CMD,</div><div class='add'>+	WMI_TAG_EXTSCAN_GET_WLAN_CHANGE_RESULTS_CMD,</div><div class='add'>+	WMI_TAG_EXTSCAN_SET_CAPABILITIES_CMD,</div><div class='add'>+	WMI_TAG_EXTSCAN_GET_CAPABILITIES_CMD,</div><div class='add'>+	WMI_TAG_EXTSCAN_OPERATION_EVENT,</div><div class='add'>+	WMI_TAG_EXTSCAN_START_STOP_EVENT,</div><div class='add'>+	WMI_TAG_EXTSCAN_TABLE_USAGE_EVENT,</div><div class='add'>+	WMI_TAG_EXTSCAN_WLAN_DESCRIPTOR_EVENT,</div><div class='add'>+	WMI_TAG_EXTSCAN_RSSI_INFO_EVENT,</div><div class='add'>+	WMI_TAG_EXTSCAN_CACHED_RESULTS_EVENT,</div><div class='add'>+	WMI_TAG_EXTSCAN_WLAN_CHANGE_RESULTS_EVENT,</div><div class='add'>+	WMI_TAG_EXTSCAN_WLAN_CHANGE_RESULT_BSSID_EVENT,</div><div class='add'>+	WMI_TAG_EXTSCAN_HOTLIST_MATCH_EVENT,</div><div class='add'>+	WMI_TAG_EXTSCAN_CAPABILITIES_EVENT,</div><div class='add'>+	WMI_TAG_EXTSCAN_CACHE_CAPABILITIES_EVENT,</div><div class='add'>+	WMI_TAG_EXTSCAN_WLAN_CHANGE_MONITOR_CAPABILITIES_EVENT,</div><div class='add'>+	WMI_TAG_EXTSCAN_HOTLIST_MONITOR_CAPABILITIES_EVENT,</div><div class='add'>+	WMI_TAG_D0_WOW_ENABLE_DISABLE_CMD,</div><div class='add'>+	WMI_TAG_D0_WOW_DISABLE_ACK_EVENT,</div><div class='add'>+	WMI_TAG_UNIT_TEST_CMD,</div><div class='add'>+	WMI_TAG_ROAM_OFFLOAD_TLV_PARAM,</div><div class='add'>+	WMI_TAG_ROAM_11I_OFFLOAD_TLV_PARAM,</div><div class='add'>+	WMI_TAG_ROAM_11R_OFFLOAD_TLV_PARAM,</div><div class='add'>+	WMI_TAG_ROAM_ESE_OFFLOAD_TLV_PARAM,</div><div class='add'>+	WMI_TAG_ROAM_SYNCH_EVENT,</div><div class='add'>+	WMI_TAG_ROAM_SYNCH_COMPLETE,</div><div class='add'>+	WMI_TAG_EXTWOW_ENABLE_CMD,</div><div class='add'>+	WMI_TAG_EXTWOW_SET_APP_TYPE1_PARAMS_CMD,</div><div class='add'>+	WMI_TAG_EXTWOW_SET_APP_TYPE2_PARAMS_CMD,</div><div class='add'>+	WMI_TAG_LPI_STATUS_EVENT,</div><div class='add'>+	WMI_TAG_LPI_HANDOFF_EVENT,</div><div class='add'>+	WMI_TAG_VDEV_RATE_STATS_EVENT,</div><div class='add'>+	WMI_TAG_VDEV_RATE_HT_INFO,</div><div class='add'>+	WMI_TAG_RIC_REQUEST,</div><div class='add'>+	WMI_TAG_PDEV_GET_TEMPERATURE_CMD,</div><div class='add'>+	WMI_TAG_PDEV_TEMPERATURE_EVENT,</div><div class='add'>+	WMI_TAG_SET_DHCP_SERVER_OFFLOAD_CMD,</div><div class='add'>+	WMI_TAG_TPC_CHAINMASK_CONFIG_CMD,</div><div class='add'>+	WMI_TAG_RIC_TSPEC,</div><div class='add'>+	WMI_TAG_TPC_CHAINMASK_CONFIG,</div><div class='add'>+	WMI_TAG_IPA_OFFLOAD_ENABLE_DISABLE_CMD,</div><div class='add'>+	WMI_TAG_SCAN_PROB_REQ_OUI_CMD,</div><div class='add'>+	WMI_TAG_KEY_MATERIAL,</div><div class='add'>+	WMI_TAG_TDLS_SET_OFFCHAN_MODE_CMD,</div><div class='add'>+	WMI_TAG_SET_LED_FLASHING_CMD,</div><div class='add'>+	WMI_TAG_MDNS_OFFLOAD_CMD,</div><div class='add'>+	WMI_TAG_MDNS_SET_FQDN_CMD,</div><div class='add'>+	WMI_TAG_MDNS_SET_RESP_CMD,</div><div class='add'>+	WMI_TAG_MDNS_GET_STATS_CMD,</div><div class='add'>+	WMI_TAG_MDNS_STATS_EVENT,</div><div class='add'>+	WMI_TAG_ROAM_INVOKE_CMD,</div><div class='add'>+	WMI_TAG_PDEV_RESUME_EVENT,</div><div class='add'>+	WMI_TAG_PDEV_SET_ANTENNA_DIVERSITY_CMD,</div><div class='add'>+	WMI_TAG_SAP_OFL_ENABLE_CMD,</div><div class='add'>+	WMI_TAG_SAP_OFL_ADD_STA_EVENT,</div><div class='add'>+	WMI_TAG_SAP_OFL_DEL_STA_EVENT,</div><div class='add'>+	WMI_TAG_APFIND_CMD_PARAM,</div><div class='add'>+	WMI_TAG_APFIND_EVENT_HDR,</div><div class='add'>+	WMI_TAG_OCB_SET_SCHED_CMD,</div><div class='add'>+	WMI_TAG_OCB_SET_SCHED_EVENT,</div><div class='add'>+	WMI_TAG_OCB_SET_CONFIG_CMD,</div><div class='add'>+	WMI_TAG_OCB_SET_CONFIG_RESP_EVENT,</div><div class='add'>+	WMI_TAG_OCB_SET_UTC_TIME_CMD,</div><div class='add'>+	WMI_TAG_OCB_START_TIMING_ADVERT_CMD,</div><div class='add'>+	WMI_TAG_OCB_STOP_TIMING_ADVERT_CMD,</div><div class='add'>+	WMI_TAG_OCB_GET_TSF_TIMER_CMD,</div><div class='add'>+	WMI_TAG_OCB_GET_TSF_TIMER_RESP_EVENT,</div><div class='add'>+	WMI_TAG_DCC_GET_STATS_CMD,</div><div class='add'>+	WMI_TAG_DCC_CHANNEL_STATS_REQUEST,</div><div class='add'>+	WMI_TAG_DCC_GET_STATS_RESP_EVENT,</div><div class='add'>+	WMI_TAG_DCC_CLEAR_STATS_CMD,</div><div class='add'>+	WMI_TAG_DCC_UPDATE_NDL_CMD,</div><div class='add'>+	WMI_TAG_DCC_UPDATE_NDL_RESP_EVENT,</div><div class='add'>+	WMI_TAG_DCC_STATS_EVENT,</div><div class='add'>+	WMI_TAG_OCB_CHANNEL,</div><div class='add'>+	WMI_TAG_OCB_SCHEDULE_ELEMENT,</div><div class='add'>+	WMI_TAG_DCC_NDL_STATS_PER_CHANNEL,</div><div class='add'>+	WMI_TAG_DCC_NDL_CHAN,</div><div class='add'>+	WMI_TAG_QOS_PARAMETER,</div><div class='add'>+	WMI_TAG_DCC_NDL_ACTIVE_STATE_CONFIG,</div><div class='add'>+	WMI_TAG_ROAM_SCAN_EXTENDED_THRESHOLD_PARAM,</div><div class='add'>+	WMI_TAG_ROAM_FILTER,</div><div class='add'>+	WMI_TAG_PASSPOINT_CONFIG_CMD,</div><div class='add'>+	WMI_TAG_PASSPOINT_EVENT_HDR,</div><div class='add'>+	WMI_TAG_EXTSCAN_CONFIGURE_HOTLIST_SSID_MONITOR_CMD,</div><div class='add'>+	WMI_TAG_EXTSCAN_HOTLIST_SSID_MATCH_EVENT,</div><div class='add'>+	WMI_TAG_VDEV_TSF_TSTAMP_ACTION_CMD,</div><div class='add'>+	WMI_TAG_VDEV_TSF_REPORT_EVENT,</div><div class='add'>+	WMI_TAG_GET_FW_MEM_DUMP,</div><div class='add'>+	WMI_TAG_UPDATE_FW_MEM_DUMP,</div><div class='add'>+	WMI_TAG_FW_MEM_DUMP_PARAMS,</div><div class='add'>+	WMI_TAG_DEBUG_MESG_FLUSH,</div><div class='add'>+	WMI_TAG_DEBUG_MESG_FLUSH_COMPLETE,</div><div class='add'>+	WMI_TAG_PEER_SET_RATE_REPORT_CONDITION,</div><div class='add'>+	WMI_TAG_ROAM_SUBNET_CHANGE_CONFIG,</div><div class='add'>+	WMI_TAG_VDEV_SET_IE_CMD,</div><div class='add'>+	WMI_TAG_RSSI_BREACH_MONITOR_CONFIG,</div><div class='add'>+	WMI_TAG_RSSI_BREACH_EVENT,</div><div class='add'>+	WMI_TAG_WOW_EVENT_INITIAL_WAKEUP,</div><div class='add'>+	WMI_TAG_SOC_SET_PCL_CMD,</div><div class='add'>+	WMI_TAG_SOC_SET_HW_MODE_CMD,</div><div class='add'>+	WMI_TAG_SOC_SET_HW_MODE_RESPONSE_EVENT,</div><div class='add'>+	WMI_TAG_SOC_HW_MODE_TRANSITION_EVENT,</div><div class='add'>+	WMI_TAG_VDEV_TXRX_STREAMS,</div><div class='add'>+	WMI_TAG_SOC_SET_HW_MODE_RESPONSE_VDEV_MAC_ENTRY,</div><div class='add'>+	WMI_TAG_SOC_SET_DUAL_MAC_CONFIG_CMD,</div><div class='add'>+	WMI_TAG_SOC_SET_DUAL_MAC_CONFIG_RESPONSE_EVENT,</div><div class='add'>+	WMI_TAG_WOW_IOAC_SOCK_PATTERN_T,</div><div class='add'>+	WMI_TAG_WOW_ENABLE_ICMPV6_NA_FLT_CMD,</div><div class='add'>+	WMI_TAG_DIAG_EVENT_LOG_CONFIG,</div><div class='add'>+	WMI_TAG_DIAG_EVENT_LOG_SUPPORTED_EVENT_FIXED_PARAMS,</div><div class='add'>+	WMI_TAG_PACKET_FILTER_CONFIG,</div><div class='add'>+	WMI_TAG_PACKET_FILTER_ENABLE,</div><div class='add'>+	WMI_TAG_SAP_SET_BLACKLIST_PARAM_CMD,</div><div class='add'>+	WMI_TAG_MGMT_TX_SEND_CMD,</div><div class='add'>+	WMI_TAG_MGMT_TX_COMPL_EVENT,</div><div class='add'>+	WMI_TAG_SOC_SET_ANTENNA_MODE_CMD,</div><div class='add'>+	WMI_TAG_WOW_UDP_SVC_OFLD_CMD,</div><div class='add'>+	WMI_TAG_LRO_INFO_CMD,</div><div class='add'>+	WMI_TAG_ROAM_EARLYSTOP_RSSI_THRES_PARAM,</div><div class='add'>+	WMI_TAG_SERVICE_READY_EXT_EVENT,</div><div class='add'>+	WMI_TAG_MAWC_SENSOR_REPORT_IND_CMD,</div><div class='add'>+	WMI_TAG_MAWC_ENABLE_SENSOR_EVENT,</div><div class='add'>+	WMI_TAG_ROAM_CONFIGURE_MAWC_CMD,</div><div class='add'>+	WMI_TAG_NLO_CONFIGURE_MAWC_CMD,</div><div class='add'>+	WMI_TAG_EXTSCAN_CONFIGURE_MAWC_CMD,</div><div class='add'>+	WMI_TAG_PEER_ASSOC_CONF_EVENT,</div><div class='add'>+	WMI_TAG_WOW_HOSTWAKEUP_GPIO_PIN_PATTERN_CONFIG_CMD,</div><div class='add'>+	WMI_TAG_AP_PS_EGAP_PARAM_CMD,</div><div class='add'>+	WMI_TAG_AP_PS_EGAP_INFO_EVENT,</div><div class='add'>+	WMI_TAG_PMF_OFFLOAD_SET_SA_QUERY_CMD,</div><div class='add'>+	WMI_TAG_TRANSFER_DATA_TO_FLASH_CMD,</div><div class='add'>+	WMI_TAG_TRANSFER_DATA_TO_FLASH_COMPLETE_EVENT,</div><div class='add'>+	WMI_TAG_SCPC_EVENT,</div><div class='add'>+	WMI_TAG_AP_PS_EGAP_INFO_CHAINMASK_LIST,</div><div class='add'>+	WMI_TAG_STA_SMPS_FORCE_MODE_COMPLETE_EVENT,</div><div class='add'>+	WMI_TAG_BPF_GET_CAPABILITY_CMD,</div><div class='add'>+	WMI_TAG_BPF_CAPABILITY_INFO_EVT,</div><div class='add'>+	WMI_TAG_BPF_GET_VDEV_STATS_CMD,</div><div class='add'>+	WMI_TAG_BPF_VDEV_STATS_INFO_EVT,</div><div class='add'>+	WMI_TAG_BPF_SET_VDEV_INSTRUCTIONS_CMD,</div><div class='add'>+	WMI_TAG_BPF_DEL_VDEV_INSTRUCTIONS_CMD,</div><div class='add'>+	WMI_TAG_VDEV_DELETE_RESP_EVENT,</div><div class='add'>+	WMI_TAG_PEER_DELETE_RESP_EVENT,</div><div class='add'>+	WMI_TAG_ROAM_DENSE_THRES_PARAM,</div><div class='add'>+	WMI_TAG_ENLO_CANDIDATE_SCORE_PARAM,</div><div class='add'>+	WMI_TAG_PEER_UPDATE_WDS_ENTRY_CMD,</div><div class='add'>+	WMI_TAG_VDEV_CONFIG_RATEMASK,</div><div class='add'>+	WMI_TAG_PDEV_FIPS_CMD,</div><div class='add'>+	WMI_TAG_PDEV_SMART_ANT_ENABLE_CMD,</div><div class='add'>+	WMI_TAG_PDEV_SMART_ANT_SET_RX_ANTENNA_CMD,</div><div class='add'>+	WMI_TAG_PEER_SMART_ANT_SET_TX_ANTENNA_CMD,</div><div class='add'>+	WMI_TAG_PEER_SMART_ANT_SET_TRAIN_ANTENNA_CMD,</div><div class='add'>+	WMI_TAG_PEER_SMART_ANT_SET_NODE_CONFIG_OPS_CMD,</div><div class='add'>+	WMI_TAG_PDEV_SET_ANT_SWITCH_TBL_CMD,</div><div class='add'>+	WMI_TAG_PDEV_SET_CTL_TABLE_CMD,</div><div class='add'>+	WMI_TAG_PDEV_SET_MIMOGAIN_TABLE_CMD,</div><div class='add'>+	WMI_TAG_FWTEST_SET_PARAM_CMD,</div><div class='add'>+	WMI_TAG_PEER_ATF_REQUEST,</div><div class='add'>+	WMI_TAG_VDEV_ATF_REQUEST,</div><div class='add'>+	WMI_TAG_PDEV_GET_ANI_CCK_CONFIG_CMD,</div><div class='add'>+	WMI_TAG_PDEV_GET_ANI_OFDM_CONFIG_CMD,</div><div class='add'>+	WMI_TAG_INST_RSSI_STATS_RESP,</div><div class='add'>+	WMI_TAG_MED_UTIL_REPORT_EVENT,</div><div class='add'>+	WMI_TAG_PEER_STA_PS_STATECHANGE_EVENT,</div><div class='add'>+	WMI_TAG_WDS_ADDR_EVENT,</div><div class='add'>+	WMI_TAG_PEER_RATECODE_LIST_EVENT,</div><div class='add'>+	WMI_TAG_PDEV_NFCAL_POWER_ALL_CHANNELS_EVENT,</div><div class='add'>+	WMI_TAG_PDEV_TPC_EVENT,</div><div class='add'>+	WMI_TAG_ANI_OFDM_EVENT,</div><div class='add'>+	WMI_TAG_ANI_CCK_EVENT,</div><div class='add'>+	WMI_TAG_PDEV_CHANNEL_HOPPING_EVENT,</div><div class='add'>+	WMI_TAG_PDEV_FIPS_EVENT,</div><div class='add'>+	WMI_TAG_ATF_PEER_INFO,</div><div class='add'>+	WMI_TAG_PDEV_GET_TPC_CMD,</div><div class='add'>+	WMI_TAG_VDEV_FILTER_NRP_CONFIG_CMD,</div><div class='add'>+	WMI_TAG_QBOOST_CFG_CMD,</div><div class='add'>+	WMI_TAG_PDEV_SMART_ANT_GPIO_HANDLE,</div><div class='add'>+	WMI_TAG_PEER_SMART_ANT_SET_TX_ANTENNA_SERIES,</div><div class='add'>+	WMI_TAG_PEER_SMART_ANT_SET_TRAIN_ANTENNA_PARAM,</div><div class='add'>+	WMI_TAG_PDEV_SET_ANT_CTRL_CHAIN,</div><div class='add'>+	WMI_TAG_PEER_CCK_OFDM_RATE_INFO,</div><div class='add'>+	WMI_TAG_PEER_MCS_RATE_INFO,</div><div class='add'>+	WMI_TAG_PDEV_NFCAL_POWER_ALL_CHANNELS_NFDBR,</div><div class='add'>+	WMI_TAG_PDEV_NFCAL_POWER_ALL_CHANNELS_NFDBM,</div><div class='add'>+	WMI_TAG_PDEV_NFCAL_POWER_ALL_CHANNELS_FREQNUM,</div><div class='add'>+	WMI_TAG_MU_REPORT_TOTAL_MU,</div><div class='add'>+	WMI_TAG_VDEV_SET_DSCP_TID_MAP_CMD,</div><div class='add'>+	WMI_TAG_ROAM_SET_MBO,</div><div class='add'>+	WMI_TAG_MIB_STATS_ENABLE_CMD,</div><div class='add'>+	WMI_TAG_NAN_DISC_IFACE_CREATED_EVENT,</div><div class='add'>+	WMI_TAG_NAN_DISC_IFACE_DELETED_EVENT,</div><div class='add'>+	WMI_TAG_NAN_STARTED_CLUSTER_EVENT,</div><div class='add'>+	WMI_TAG_NAN_JOINED_CLUSTER_EVENT,</div><div class='add'>+	WMI_TAG_NDI_GET_CAP_REQ,</div><div class='add'>+	WMI_TAG_NDP_INITIATOR_REQ,</div><div class='add'>+	WMI_TAG_NDP_RESPONDER_REQ,</div><div class='add'>+	WMI_TAG_NDP_END_REQ,</div><div class='add'>+	WMI_TAG_NDI_CAP_RSP_EVENT,</div><div class='add'>+	WMI_TAG_NDP_INITIATOR_RSP_EVENT,</div><div class='add'>+	WMI_TAG_NDP_RESPONDER_RSP_EVENT,</div><div class='add'>+	WMI_TAG_NDP_END_RSP_EVENT,</div><div class='add'>+	WMI_TAG_NDP_INDICATION_EVENT,</div><div class='add'>+	WMI_TAG_NDP_CONFIRM_EVENT,</div><div class='add'>+	WMI_TAG_NDP_END_INDICATION_EVENT,</div><div class='add'>+	WMI_TAG_VDEV_SET_QUIET_CMD,</div><div class='add'>+	WMI_TAG_PDEV_SET_PCL_CMD,</div><div class='add'>+	WMI_TAG_PDEV_SET_HW_MODE_CMD,</div><div class='add'>+	WMI_TAG_PDEV_SET_MAC_CONFIG_CMD,</div><div class='add'>+	WMI_TAG_PDEV_SET_ANTENNA_MODE_CMD,</div><div class='add'>+	WMI_TAG_PDEV_SET_HW_MODE_RESPONSE_EVENT,</div><div class='add'>+	WMI_TAG_PDEV_HW_MODE_TRANSITION_EVENT,</div><div class='add'>+	WMI_TAG_PDEV_SET_HW_MODE_RESPONSE_VDEV_MAC_ENTRY,</div><div class='add'>+	WMI_TAG_PDEV_SET_MAC_CONFIG_RESPONSE_EVENT,</div><div class='add'>+	WMI_TAG_COEX_CONFIG_CMD,</div><div class='add'>+	WMI_TAG_CONFIG_ENHANCED_MCAST_FILTER,</div><div class='add'>+	WMI_TAG_CHAN_AVOID_RPT_ALLOW_CMD,</div><div class='add'>+	WMI_TAG_SET_PERIODIC_CHANNEL_STATS_CONFIG,</div><div class='add'>+	WMI_TAG_VDEV_SET_CUSTOM_AGGR_SIZE_CMD,</div><div class='add'>+	WMI_TAG_PDEV_WAL_POWER_DEBUG_CMD,</div><div class='add'>+	WMI_TAG_MAC_PHY_CAPABILITIES,</div><div class='add'>+	WMI_TAG_HW_MODE_CAPABILITIES,</div><div class='add'>+	WMI_TAG_SOC_MAC_PHY_HW_MODE_CAPS,</div><div class='add'>+	WMI_TAG_HAL_REG_CAPABILITIES_EXT,</div><div class='add'>+	WMI_TAG_SOC_HAL_REG_CAPABILITIES,</div><div class='add'>+	WMI_TAG_VDEV_WISA_CMD,</div><div class='add'>+	WMI_TAG_TX_POWER_LEVEL_STATS_EVT,</div><div class='add'>+	WMI_TAG_SCAN_ADAPTIVE_DWELL_PARAMETERS_TLV,</div><div class='add'>+	WMI_TAG_SCAN_ADAPTIVE_DWELL_CONFIG,</div><div class='add'>+	WMI_TAG_WOW_SET_ACTION_WAKE_UP_CMD,</div><div class='add'>+	WMI_TAG_NDP_END_RSP_PER_NDI,</div><div class='add'>+	WMI_TAG_PEER_BWF_REQUEST,</div><div class='add'>+	WMI_TAG_BWF_PEER_INFO,</div><div class='add'>+	WMI_TAG_DBGLOG_TIME_STAMP_SYNC_CMD,</div><div class='add'>+	WMI_TAG_RMC_SET_LEADER_CMD,</div><div class='add'>+	WMI_TAG_RMC_MANUAL_LEADER_EVENT,</div><div class='add'>+	WMI_TAG_PER_CHAIN_RSSI_STATS,</div><div class='add'>+	WMI_TAG_RSSI_STATS,</div><div class='add'>+	WMI_TAG_P2P_LO_START_CMD,</div><div class='add'>+	WMI_TAG_P2P_LO_STOP_CMD,</div><div class='add'>+	WMI_TAG_P2P_LO_STOPPED_EVENT,</div><div class='add'>+	WMI_TAG_REORDER_QUEUE_SETUP_CMD,</div><div class='add'>+	WMI_TAG_REORDER_QUEUE_REMOVE_CMD,</div><div class='add'>+	WMI_TAG_SET_MULTIPLE_MCAST_FILTER_CMD,</div><div class='add'>+	WMI_TAG_MGMT_TX_COMPL_BUNDLE_EVENT,</div><div class='add'>+	WMI_TAG_READ_DATA_FROM_FLASH_CMD,</div><div class='add'>+	WMI_TAG_READ_DATA_FROM_FLASH_EVENT,</div><div class='add'>+	WMI_TAG_PDEV_SET_REORDER_TIMEOUT_VAL_CMD,</div><div class='add'>+	WMI_TAG_PEER_SET_RX_BLOCKSIZE_CMD,</div><div class='add'>+	WMI_TAG_PDEV_SET_WAKEUP_CONFIG_CMDID,</div><div class='add'>+	WMI_TAG_TLV_BUF_LEN_PARAM,</div><div class='add'>+	WMI_TAG_SERVICE_AVAILABLE_EVENT,</div><div class='add'>+	WMI_TAG_PEER_ANTDIV_INFO_REQ_CMD,</div><div class='add'>+	WMI_TAG_PEER_ANTDIV_INFO_EVENT,</div><div class='add'>+	WMI_TAG_PEER_ANTDIV_INFO,</div><div class='add'>+	WMI_TAG_PDEV_GET_ANTDIV_STATUS_CMD,</div><div class='add'>+	WMI_TAG_PDEV_ANTDIV_STATUS_EVENT,</div><div class='add'>+	WMI_TAG_MNT_FILTER_CMD,</div><div class='add'>+	WMI_TAG_GET_CHIP_POWER_STATS_CMD,</div><div class='add'>+	WMI_TAG_PDEV_CHIP_POWER_STATS_EVENT,</div><div class='add'>+	WMI_TAG_COEX_GET_ANTENNA_ISOLATION_CMD,</div><div class='add'>+	WMI_TAG_COEX_REPORT_ISOLATION_EVENT,</div><div class='add'>+	WMI_TAG_CHAN_CCA_STATS,</div><div class='add'>+	WMI_TAG_PEER_SIGNAL_STATS,</div><div class='add'>+	WMI_TAG_TX_STATS,</div><div class='add'>+	WMI_TAG_PEER_AC_TX_STATS,</div><div class='add'>+	WMI_TAG_RX_STATS,</div><div class='add'>+	WMI_TAG_PEER_AC_RX_STATS,</div><div class='add'>+	WMI_TAG_REPORT_STATS_EVENT,</div><div class='add'>+	WMI_TAG_CHAN_CCA_STATS_THRESH,</div><div class='add'>+	WMI_TAG_PEER_SIGNAL_STATS_THRESH,</div><div class='add'>+	WMI_TAG_TX_STATS_THRESH,</div><div class='add'>+	WMI_TAG_RX_STATS_THRESH,</div><div class='add'>+	WMI_TAG_PDEV_SET_STATS_THRESHOLD_CMD,</div><div class='add'>+	WMI_TAG_REQUEST_WLAN_STATS_CMD,</div><div class='add'>+	WMI_TAG_RX_AGGR_FAILURE_EVENT,</div><div class='add'>+	WMI_TAG_RX_AGGR_FAILURE_INFO,</div><div class='add'>+	WMI_TAG_VDEV_ENCRYPT_DECRYPT_DATA_REQ_CMD,</div><div class='add'>+	WMI_TAG_VDEV_ENCRYPT_DECRYPT_DATA_RESP_EVENT,</div><div class='add'>+	WMI_TAG_PDEV_BAND_TO_MAC,</div><div class='add'>+	WMI_TAG_TBTT_OFFSET_INFO,</div><div class='add'>+	WMI_TAG_TBTT_OFFSET_EXT_EVENT,</div><div class='add'>+	WMI_TAG_SAR_LIMITS_CMD,</div><div class='add'>+	WMI_TAG_SAR_LIMIT_CMD_ROW,</div><div class='add'>+	WMI_TAG_PDEV_DFS_PHYERR_OFFLOAD_ENABLE_CMD,</div><div class='add'>+	WMI_TAG_PDEV_DFS_PHYERR_OFFLOAD_DISABLE_CMD,</div><div class='add'>+	WMI_TAG_VDEV_ADFS_CH_CFG_CMD,</div><div class='add'>+	WMI_TAG_VDEV_ADFS_OCAC_ABORT_CMD,</div><div class='add'>+	WMI_TAG_PDEV_DFS_RADAR_DETECTION_EVENT,</div><div class='add'>+	WMI_TAG_VDEV_ADFS_OCAC_COMPLETE_EVENT,</div><div class='add'>+	WMI_TAG_VDEV_DFS_CAC_COMPLETE_EVENT,</div><div class='add'>+	WMI_TAG_VENDOR_OUI,</div><div class='add'>+	WMI_TAG_REQUEST_RCPI_CMD,</div><div class='add'>+	WMI_TAG_UPDATE_RCPI_EVENT,</div><div class='add'>+	WMI_TAG_REQUEST_PEER_STATS_INFO_CMD,</div><div class='add'>+	WMI_TAG_PEER_STATS_INFO,</div><div class='add'>+	WMI_TAG_PEER_STATS_INFO_EVENT,</div><div class='add'>+	WMI_TAG_PKGID_EVENT,</div><div class='add'>+	WMI_TAG_CONNECTED_NLO_RSSI_PARAMS,</div><div class='add'>+	WMI_TAG_SET_CURRENT_COUNTRY_CMD,</div><div class='add'>+	WMI_TAG_REGULATORY_RULE_STRUCT,</div><div class='add'>+	WMI_TAG_REG_CHAN_LIST_CC_EVENT,</div><div class='add'>+	WMI_TAG_11D_SCAN_START_CMD,</div><div class='add'>+	WMI_TAG_11D_SCAN_STOP_CMD,</div><div class='add'>+	WMI_TAG_11D_NEW_COUNTRY_EVENT,</div><div class='add'>+	WMI_TAG_REQUEST_RADIO_CHAN_STATS_CMD,</div><div class='add'>+	WMI_TAG_RADIO_CHAN_STATS,</div><div class='add'>+	WMI_TAG_RADIO_CHAN_STATS_EVENT,</div><div class='add'>+	WMI_TAG_ROAM_PER_CONFIG,</div><div class='add'>+	WMI_TAG_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_CMD,</div><div class='add'>+	WMI_TAG_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_STATUS_EVENT,</div><div class='add'>+	WMI_TAG_BPF_SET_VDEV_ACTIVE_MODE_CMD,</div><div class='add'>+	WMI_TAG_HW_DATA_FILTER_CMD,</div><div class='add'>+	WMI_TAG_CONNECTED_NLO_BSS_BAND_RSSI_PREF,</div><div class='add'>+	WMI_TAG_PEER_OPER_MODE_CHANGE_EVENT,</div><div class='add'>+	WMI_TAG_CHIP_POWER_SAVE_FAILURE_DETECTED,</div><div class='add'>+	WMI_TAG_PDEV_MULTIPLE_VDEV_RESTART_REQUEST_CMD,</div><div class='add'>+	WMI_TAG_PDEV_CSA_SWITCH_COUNT_STATUS_EVENT,</div><div class='add'>+	WMI_TAG_PDEV_UPDATE_PKT_ROUTING_CMD,</div><div class='add'>+	WMI_TAG_PDEV_CHECK_CAL_VERSION_CMD,</div><div class='add'>+	WMI_TAG_PDEV_CHECK_CAL_VERSION_EVENT,</div><div class='add'>+	WMI_TAG_PDEV_SET_DIVERSITY_GAIN_CMD,</div><div class='add'>+	WMI_TAG_MAC_PHY_CHAINMASK_COMBO,</div><div class='add'>+	WMI_TAG_MAC_PHY_CHAINMASK_CAPABILITY,</div><div class='add'>+	WMI_TAG_VDEV_SET_ARP_STATS_CMD,</div><div class='add'>+	WMI_TAG_VDEV_GET_ARP_STATS_CMD,</div><div class='add'>+	WMI_TAG_VDEV_GET_ARP_STATS_EVENT,</div><div class='add'>+	WMI_TAG_IFACE_OFFLOAD_STATS,</div><div class='add'>+	WMI_TAG_REQUEST_STATS_CMD_SUB_STRUCT_PARAM,</div><div class='add'>+	WMI_TAG_RSSI_CTL_EXT,</div><div class='add'>+	WMI_TAG_SINGLE_PHYERR_EXT_RX_HDR,</div><div class='add'>+	WMI_TAG_COEX_BT_ACTIVITY_EVENT,</div><div class='add'>+	WMI_TAG_VDEV_GET_TX_POWER_CMD,</div><div class='add'>+	WMI_TAG_VDEV_TX_POWER_EVENT,</div><div class='add'>+	WMI_TAG_OFFCHAN_DATA_TX_COMPL_EVENT,</div><div class='add'>+	WMI_TAG_OFFCHAN_DATA_TX_SEND_CMD,</div><div class='add'>+	WMI_TAG_TX_SEND_PARAMS,</div><div class='add'>+	WMI_TAG_HE_RATE_SET,</div><div class='add'>+	WMI_TAG_CONGESTION_STATS,</div><div class='add'>+	WMI_TAG_SET_INIT_COUNTRY_CMD,</div><div class='add'>+	WMI_TAG_SCAN_DBS_DUTY_CYCLE,</div><div class='add'>+	WMI_TAG_SCAN_DBS_DUTY_CYCLE_PARAM_TLV,</div><div class='add'>+	WMI_TAG_PDEV_DIV_GET_RSSI_ANTID,</div><div class='add'>+	WMI_TAG_THERM_THROT_CONFIG_REQUEST,</div><div class='add'>+	WMI_TAG_THERM_THROT_LEVEL_CONFIG_INFO,</div><div class='add'>+	WMI_TAG_THERM_THROT_STATS_EVENT,</div><div class='add'>+	WMI_TAG_THERM_THROT_LEVEL_STATS_INFO,</div><div class='add'>+	WMI_TAG_PDEV_DIV_RSSI_ANTID_EVENT,</div><div class='add'>+	WMI_TAG_OEM_DMA_RING_CAPABILITIES,</div><div class='add'>+	WMI_TAG_OEM_DMA_RING_CFG_REQ,</div><div class='add'>+	WMI_TAG_OEM_DMA_RING_CFG_RSP,</div><div class='add'>+	WMI_TAG_OEM_INDIRECT_DATA,</div><div class='add'>+	WMI_TAG_OEM_DMA_BUF_RELEASE,</div><div class='add'>+	WMI_TAG_OEM_DMA_BUF_RELEASE_ENTRY,</div><div class='add'>+	WMI_TAG_PDEV_BSS_CHAN_INFO_REQUEST,</div><div class='add'>+	WMI_TAG_PDEV_BSS_CHAN_INFO_EVENT,</div><div class='add'>+	WMI_TAG_ROAM_LCA_DISALLOW_CONFIG,</div><div class='add'>+	WMI_TAG_VDEV_LIMIT_OFFCHAN_CMD,</div><div class='add'>+	WMI_TAG_ROAM_RSSI_REJECTION_OCE_CONFIG,</div><div class='add'>+	WMI_TAG_UNIT_TEST_EVENT,</div><div class='add'>+	WMI_TAG_ROAM_FILS_OFFLOAD,</div><div class='add'>+	WMI_TAG_PDEV_UPDATE_PMK_CACHE_CMD,</div><div class='add'>+	WMI_TAG_PMK_CACHE,</div><div class='add'>+	WMI_TAG_PDEV_UPDATE_FILS_HLP_PKT_CMD,</div><div class='add'>+	WMI_TAG_ROAM_FILS_SYNCH,</div><div class='add'>+	WMI_TAG_GTK_OFFLOAD_EXTENDED,</div><div class='add'>+	WMI_TAG_ROAM_BG_SCAN_ROAMING,</div><div class='add'>+	WMI_TAG_OIC_PING_OFFLOAD_PARAMS_CMD,</div><div class='add'>+	WMI_TAG_OIC_PING_OFFLOAD_SET_ENABLE_CMD,</div><div class='add'>+	WMI_TAG_OIC_PING_HANDOFF_EVENT,</div><div class='add'>+	WMI_TAG_DHCP_LEASE_RENEW_OFFLOAD_CMD,</div><div class='add'>+	WMI_TAG_DHCP_LEASE_RENEW_EVENT,</div><div class='add'>+	WMI_TAG_BTM_CONFIG,</div><div class='add'>+	WMI_TAG_DEBUG_MESG_FW_DATA_STALL,</div><div class='add'>+	WMI_TAG_WLM_CONFIG_CMD,</div><div class='add'>+	WMI_TAG_PDEV_UPDATE_CTLTABLE_REQUEST,</div><div class='add'>+	WMI_TAG_PDEV_UPDATE_CTLTABLE_EVENT,</div><div class='add'>+	WMI_TAG_ROAM_CND_SCORING_PARAM,</div><div class='add'>+	WMI_TAG_PDEV_CONFIG_VENDOR_OUI_ACTION,</div><div class='add'>+	WMI_TAG_VENDOR_OUI_EXT,</div><div class='add'>+	WMI_TAG_ROAM_SYNCH_FRAME_EVENT,</div><div class='add'>+	WMI_TAG_FD_SEND_FROM_HOST_CMD,</div><div class='add'>+	WMI_TAG_ENABLE_FILS_CMD,</div><div class='add'>+	WMI_TAG_HOST_SWFDA_EVENT,</div><div class='add'>+	WMI_TAG_BCN_OFFLOAD_CTRL_CMD,</div><div class='add'>+	WMI_TAG_PDEV_SET_AC_TX_QUEUE_OPTIMIZED_CMD,</div><div class='add'>+	WMI_TAG_STATS_PERIOD,</div><div class='add'>+	WMI_TAG_NDL_SCHEDULE_UPDATE,</div><div class='add'>+	WMI_TAG_PEER_TID_MSDUQ_QDEPTH_THRESH_UPDATE_CMD,</div><div class='add'>+	WMI_TAG_MSDUQ_QDEPTH_THRESH_UPDATE,</div><div class='add'>+	WMI_TAG_PDEV_SET_RX_FILTER_PROMISCUOUS_CMD,</div><div class='add'>+	WMI_TAG_SAR2_RESULT_EVENT,</div><div class='add'>+	WMI_TAG_SAR_CAPABILITIES,</div><div class='add'>+	WMI_TAG_SAP_OBSS_DETECTION_CFG_CMD,</div><div class='add'>+	WMI_TAG_SAP_OBSS_DETECTION_INFO_EVT,</div><div class='add'>+	WMI_TAG_DMA_RING_CAPABILITIES,</div><div class='add'>+	WMI_TAG_DMA_RING_CFG_REQ,</div><div class='add'>+	WMI_TAG_DMA_RING_CFG_RSP,</div><div class='add'>+	WMI_TAG_DMA_BUF_RELEASE,</div><div class='add'>+	WMI_TAG_DMA_BUF_RELEASE_ENTRY,</div><div class='add'>+	WMI_TAG_SAR_GET_LIMITS_CMD,</div><div class='add'>+	WMI_TAG_SAR_GET_LIMITS_EVENT,</div><div class='add'>+	WMI_TAG_SAR_GET_LIMITS_EVENT_ROW,</div><div class='add'>+	WMI_TAG_OFFLOAD_11K_REPORT,</div><div class='add'>+	WMI_TAG_INVOKE_NEIGHBOR_REPORT,</div><div class='add'>+	WMI_TAG_NEIGHBOR_REPORT_OFFLOAD,</div><div class='add'>+	WMI_TAG_VDEV_SET_CONNECTIVITY_CHECK_STATS,</div><div class='add'>+	WMI_TAG_VDEV_GET_CONNECTIVITY_CHECK_STATS,</div><div class='add'>+	WMI_TAG_BPF_SET_VDEV_ENABLE_CMD,</div><div class='add'>+	WMI_TAG_BPF_SET_VDEV_WORK_MEMORY_CMD,</div><div class='add'>+	WMI_TAG_BPF_GET_VDEV_WORK_MEMORY_CMD,</div><div class='add'>+	WMI_TAG_BPF_GET_VDEV_WORK_MEMORY_RESP_EVT,</div><div class='add'>+	WMI_TAG_PDEV_GET_NFCAL_POWER,</div><div class='add'>+	WMI_TAG_BSS_COLOR_CHANGE_ENABLE,</div><div class='add'>+	WMI_TAG_OBSS_COLOR_COLLISION_DET_CONFIG,</div><div class='add'>+	WMI_TAG_OBSS_COLOR_COLLISION_EVT,</div><div class='add'>+	WMI_TAG_RUNTIME_DPD_RECAL_CMD,</div><div class='add'>+	WMI_TAG_TWT_ENABLE_CMD,</div><div class='add'>+	WMI_TAG_TWT_DISABLE_CMD,</div><div class='add'>+	WMI_TAG_TWT_ADD_DIALOG_CMD,</div><div class='add'>+	WMI_TAG_TWT_DEL_DIALOG_CMD,</div><div class='add'>+	WMI_TAG_TWT_PAUSE_DIALOG_CMD,</div><div class='add'>+	WMI_TAG_TWT_RESUME_DIALOG_CMD,</div><div class='add'>+	WMI_TAG_TWT_ENABLE_COMPLETE_EVENT,</div><div class='add'>+	WMI_TAG_TWT_DISABLE_COMPLETE_EVENT,</div><div class='add'>+	WMI_TAG_TWT_ADD_DIALOG_COMPLETE_EVENT,</div><div class='add'>+	WMI_TAG_TWT_DEL_DIALOG_COMPLETE_EVENT,</div><div class='add'>+	WMI_TAG_TWT_PAUSE_DIALOG_COMPLETE_EVENT,</div><div class='add'>+	WMI_TAG_TWT_RESUME_DIALOG_COMPLETE_EVENT,</div><div class='add'>+	WMI_TAG_REQUEST_ROAM_SCAN_STATS_CMD,</div><div class='add'>+	WMI_TAG_ROAM_SCAN_STATS_EVENT,</div><div class='add'>+	WMI_TAG_PEER_TID_CONFIGURATIONS_CMD,</div><div class='add'>+	WMI_TAG_VDEV_SET_CUSTOM_SW_RETRY_TH_CMD,</div><div class='add'>+	WMI_TAG_GET_TPC_POWER_CMD,</div><div class='add'>+	WMI_TAG_GET_TPC_POWER_EVENT,</div><div class='add'>+	WMI_TAG_DMA_BUF_RELEASE_SPECTRAL_META_DATA,</div><div class='add'>+	WMI_TAG_MOTION_DET_CONFIG_PARAMS_CMD,</div><div class='add'>+	WMI_TAG_MOTION_DET_BASE_LINE_CONFIG_PARAMS_CMD,</div><div class='add'>+	WMI_TAG_MOTION_DET_START_STOP_CMD,</div><div class='add'>+	WMI_TAG_MOTION_DET_BASE_LINE_START_STOP_CMD,</div><div class='add'>+	WMI_TAG_MOTION_DET_EVENT,</div><div class='add'>+	WMI_TAG_MOTION_DET_BASE_LINE_EVENT,</div><div class='add'>+	WMI_TAG_NDP_TRANSPORT_IP,</div><div class='add'>+	WMI_TAG_OBSS_SPATIAL_REUSE_SET_CMD,</div><div class='add'>+	WMI_TAG_ESP_ESTIMATE_EVENT,</div><div class='add'>+	WMI_TAG_NAN_HOST_CONFIG,</div><div class='add'>+	WMI_TAG_SPECTRAL_BIN_SCALING_PARAMS,</div><div class='add'>+	WMI_TAG_PEER_CFR_CAPTURE_CMD,</div><div class='add'>+	WMI_TAG_PEER_CHAN_WIDTH_SWITCH_CMD,</div><div class='add'>+	WMI_TAG_CHAN_WIDTH_PEER_LIST,</div><div class='add'>+	WMI_TAG_OBSS_SPATIAL_REUSE_SET_DEF_OBSS_THRESH_CMD,</div><div class='add'>+	WMI_TAG_PDEV_HE_TB_ACTION_FRM_CMD,</div><div class='add'>+	WMI_TAG_PEER_EXTD2_STATS,</div><div class='add'>+	WMI_TAG_HPCS_PULSE_START_CMD,</div><div class='add'>+	WMI_TAG_PDEV_CTL_FAILSAFE_CHECK_EVENT,</div><div class='add'>+	WMI_TAG_VDEV_CHAINMASK_CONFIG_CMD,</div><div class='add'>+	WMI_TAG_VDEV_BCN_OFFLOAD_QUIET_CONFIG_CMD,</div><div class='add'>+	WMI_TAG_NAN_EVENT_INFO,</div><div class='add'>+	WMI_TAG_NDP_CHANNEL_INFO,</div><div class='add'>+	WMI_TAG_NDP_CMD,</div><div class='add'>+	WMI_TAG_NDP_EVENT,</div><div class='add'>+	/* TODO add all the missing cmds */</div><div class='add'>+	WMI_TAG_PDEV_PEER_PKTLOG_FILTER_CMD = 0x301,</div><div class='add'>+	WMI_TAG_PDEV_PEER_PKTLOG_FILTER_INFO,</div><div class='add'>+	WMI_TAG_SERVICE_READY_EXT2_EVENT = 0x334,</div><div class='add'>+	WMI_TAG_FILS_DISCOVERY_TMPL_CMD = 0x344,</div><div class='add'>+	WMI_TAG_MAC_PHY_CAPABILITIES_EXT = 0x36F,</div><div class='add'>+	WMI_TAG_REGULATORY_RULE_EXT_STRUCT = 0x3A9,</div><div class='add'>+	WMI_TAG_REG_CHAN_LIST_CC_EXT_EVENT,</div><div class='add'>+	WMI_TAG_TPC_STATS_GET_CMD = 0x38B,</div><div class='add'>+	WMI_TAG_TPC_STATS_EVENT_FIXED_PARAM,</div><div class='add'>+	WMI_TAG_TPC_STATS_CONFIG_EVENT,</div><div class='add'>+	WMI_TAG_TPC_STATS_REG_PWR_ALLOWED,</div><div class='add'>+	WMI_TAG_TPC_STATS_RATES_ARRAY,</div><div class='add'>+	WMI_TAG_TPC_STATS_CTL_PWR_TABLE_EVENT,</div><div class='add'>+	WMI_TAG_VDEV_SET_TPC_POWER_CMD = 0x3B5,</div><div class='add'>+	WMI_TAG_VDEV_CH_POWER_INFO,</div><div class='add'>+	WMI_TAG_MLO_LINK_SET_ACTIVE_CMD = 0x3BE,</div><div class='add'>+	WMI_TAG_EHT_RATE_SET = 0x3C4,</div><div class='add'>+	WMI_TAG_DCS_AWGN_INT_TYPE = 0x3C5,</div><div class='add'>+	WMI_TAG_MLO_TX_SEND_PARAMS,</div><div class='add'>+	WMI_TAG_MLO_PARTNER_LINK_PARAMS,</div><div class='add'>+	WMI_TAG_MLO_PARTNER_LINK_PARAMS_PEER_ASSOC,</div><div class='add'>+	WMI_TAG_MLO_SETUP_CMD = 0x3C9,</div><div class='add'>+	WMI_TAG_MLO_SETUP_COMPLETE_EVENT,</div><div class='add'>+	WMI_TAG_MLO_READY_CMD,</div><div class='add'>+	WMI_TAG_MLO_TEARDOWN_CMD,</div><div class='add'>+	WMI_TAG_MLO_TEARDOWN_COMPLETE,</div><div class='add'>+	WMI_TAG_MLO_PEER_ASSOC_PARAMS = 0x3D0,</div><div class='add'>+	WMI_TAG_MLO_PEER_CREATE_PARAMS = 0x3D5,</div><div class='add'>+	WMI_TAG_MLO_VDEV_START_PARAMS = 0x3D6,</div><div class='add'>+	WMI_TAG_MLO_VDEV_CREATE_PARAMS = 0x3D7,</div><div class='add'>+	WMI_TAG_PDEV_SET_BIOS_SAR_TABLE_CMD = 0x3D8,</div><div class='add'>+	WMI_TAG_PDEV_SET_BIOS_GEO_TABLE_CMD = 0x3D9,</div><div class='add'>+	WMI_TAG_PDEV_SET_BIOS_INTERFACE_CMD = 0x3FB,</div><div class='add'>+	WMI_TAG_RSSI_DBM_CONVERSION_PARAMS_INFO_FIXED_PARAM = 0x427,</div><div class='add'>+	WMI_TAG_RSSI_DBM_CONVERSION_PARAMS_INFO,</div><div class='add'>+	WMI_TAG_RSSI_DBM_CONVERSION_TEMP_OFFSET_INFO,</div><div class='add'>+	WMI_TAG_HALPHY_CTRL_PATH_CMD_FIXED_PARAM = 0x442,</div><div class='add'>+	WMI_TAG_HALPHY_CTRL_PATH_EVENT_FIXED_PARAM,</div><div class='add'>+	WMI_TAG_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_tlv_service {</div><div class='add'>+	WMI_TLV_SERVICE_BEACON_OFFLOAD = 0,</div><div class='add'>+	WMI_TLV_SERVICE_SCAN_OFFLOAD = 1,</div><div class='add'>+	WMI_TLV_SERVICE_ROAM_SCAN_OFFLOAD = 2,</div><div class='add'>+	WMI_TLV_SERVICE_BCN_MISS_OFFLOAD = 3,</div><div class='add'>+	WMI_TLV_SERVICE_STA_PWRSAVE = 4,</div><div class='add'>+	WMI_TLV_SERVICE_STA_ADVANCED_PWRSAVE = 5,</div><div class='add'>+	WMI_TLV_SERVICE_AP_UAPSD = 6,</div><div class='add'>+	WMI_TLV_SERVICE_AP_DFS = 7,</div><div class='add'>+	WMI_TLV_SERVICE_11AC = 8,</div><div class='add'>+	WMI_TLV_SERVICE_BLOCKACK = 9,</div><div class='add'>+	WMI_TLV_SERVICE_PHYERR = 10,</div><div class='add'>+	WMI_TLV_SERVICE_BCN_FILTER = 11,</div><div class='add'>+	WMI_TLV_SERVICE_RTT = 12,</div><div class='add'>+	WMI_TLV_SERVICE_WOW = 13,</div><div class='add'>+	WMI_TLV_SERVICE_RATECTRL_CACHE = 14,</div><div class='add'>+	WMI_TLV_SERVICE_IRAM_TIDS = 15,</div><div class='add'>+	WMI_TLV_SERVICE_ARPNS_OFFLOAD = 16,</div><div class='add'>+	WMI_TLV_SERVICE_NLO = 17,</div><div class='add'>+	WMI_TLV_SERVICE_GTK_OFFLOAD = 18,</div><div class='add'>+	WMI_TLV_SERVICE_SCAN_SCH = 19,</div><div class='add'>+	WMI_TLV_SERVICE_CSA_OFFLOAD = 20,</div><div class='add'>+	WMI_TLV_SERVICE_CHATTER = 21,</div><div class='add'>+	WMI_TLV_SERVICE_COEX_FREQAVOID = 22,</div><div class='add'>+	WMI_TLV_SERVICE_PACKET_POWER_SAVE = 23,</div><div class='add'>+	WMI_TLV_SERVICE_FORCE_FW_HANG = 24,</div><div class='add'>+	WMI_TLV_SERVICE_GPIO = 25,</div><div class='add'>+	WMI_TLV_SERVICE_STA_DTIM_PS_MODULATED_DTIM = 26,</div><div class='add'>+	WMI_STA_UAPSD_BASIC_AUTO_TRIG = 27,</div><div class='add'>+	WMI_STA_UAPSD_VAR_AUTO_TRIG = 28,</div><div class='add'>+	WMI_TLV_SERVICE_STA_KEEP_ALIVE = 29,</div><div class='add'>+	WMI_TLV_SERVICE_TX_ENCAP = 30,</div><div class='add'>+	WMI_TLV_SERVICE_AP_PS_DETECT_OUT_OF_SYNC = 31,</div><div class='add'>+	WMI_TLV_SERVICE_EARLY_RX = 32,</div><div class='add'>+	WMI_TLV_SERVICE_STA_SMPS = 33,</div><div class='add'>+	WMI_TLV_SERVICE_FWTEST = 34,</div><div class='add'>+	WMI_TLV_SERVICE_STA_WMMAC = 35,</div><div class='add'>+	WMI_TLV_SERVICE_TDLS = 36,</div><div class='add'>+	WMI_TLV_SERVICE_BURST = 37,</div><div class='add'>+	WMI_TLV_SERVICE_MCC_BCN_INTERVAL_CHANGE = 38,</div><div class='add'>+	WMI_TLV_SERVICE_ADAPTIVE_OCS = 39,</div><div class='add'>+	WMI_TLV_SERVICE_BA_SSN_SUPPORT = 40,</div><div class='add'>+	WMI_TLV_SERVICE_FILTER_IPSEC_NATKEEPALIVE = 41,</div><div class='add'>+	WMI_TLV_SERVICE_WLAN_HB = 42,</div><div class='add'>+	WMI_TLV_SERVICE_LTE_ANT_SHARE_SUPPORT = 43,</div><div class='add'>+	WMI_TLV_SERVICE_BATCH_SCAN = 44,</div><div class='add'>+	WMI_TLV_SERVICE_QPOWER = 45,</div><div class='add'>+	WMI_TLV_SERVICE_PLMREQ = 46,</div><div class='add'>+	WMI_TLV_SERVICE_THERMAL_MGMT = 47,</div><div class='add'>+	WMI_TLV_SERVICE_RMC = 48,</div><div class='add'>+	WMI_TLV_SERVICE_MHF_OFFLOAD = 49,</div><div class='add'>+	WMI_TLV_SERVICE_COEX_SAR = 50,</div><div class='add'>+	WMI_TLV_SERVICE_BCN_TXRATE_OVERRIDE = 51,</div><div class='add'>+	WMI_TLV_SERVICE_NAN = 52,</div><div class='add'>+	WMI_TLV_SERVICE_L1SS_STAT = 53,</div><div class='add'>+	WMI_TLV_SERVICE_ESTIMATE_LINKSPEED = 54,</div><div class='add'>+	WMI_TLV_SERVICE_OBSS_SCAN = 55,</div><div class='add'>+	WMI_TLV_SERVICE_TDLS_OFFCHAN = 56,</div><div class='add'>+	WMI_TLV_SERVICE_TDLS_UAPSD_BUFFER_STA = 57,</div><div class='add'>+	WMI_TLV_SERVICE_TDLS_UAPSD_SLEEP_STA = 58,</div><div class='add'>+	WMI_TLV_SERVICE_IBSS_PWRSAVE = 59,</div><div class='add'>+	WMI_TLV_SERVICE_LPASS = 60,</div><div class='add'>+	WMI_TLV_SERVICE_EXTSCAN = 61,</div><div class='add'>+	WMI_TLV_SERVICE_D0WOW = 62,</div><div class='add'>+	WMI_TLV_SERVICE_HSOFFLOAD = 63,</div><div class='add'>+	WMI_TLV_SERVICE_ROAM_HO_OFFLOAD = 64,</div><div class='add'>+	WMI_TLV_SERVICE_RX_FULL_REORDER = 65,</div><div class='add'>+	WMI_TLV_SERVICE_DHCP_OFFLOAD = 66,</div><div class='add'>+	WMI_TLV_SERVICE_STA_RX_IPA_OFFLOAD_SUPPORT = 67,</div><div class='add'>+	WMI_TLV_SERVICE_MDNS_OFFLOAD = 68,</div><div class='add'>+	WMI_TLV_SERVICE_SAP_AUTH_OFFLOAD = 69,</div><div class='add'>+	WMI_TLV_SERVICE_DUAL_BAND_SIMULTANEOUS_SUPPORT = 70,</div><div class='add'>+	WMI_TLV_SERVICE_OCB = 71,</div><div class='add'>+	WMI_TLV_SERVICE_AP_ARPNS_OFFLOAD = 72,</div><div class='add'>+	WMI_TLV_SERVICE_PER_BAND_CHAINMASK_SUPPORT = 73,</div><div class='add'>+	WMI_TLV_SERVICE_PACKET_FILTER_OFFLOAD = 74,</div><div class='add'>+	WMI_TLV_SERVICE_MGMT_TX_HTT = 75,</div><div class='add'>+	WMI_TLV_SERVICE_MGMT_TX_WMI = 76,</div><div class='add'>+	WMI_TLV_SERVICE_EXT_MSG = 77,</div><div class='add'>+	WMI_TLV_SERVICE_MAWC = 78,</div><div class='add'>+	WMI_TLV_SERVICE_PEER_ASSOC_CONF = 79,</div><div class='add'>+	WMI_TLV_SERVICE_EGAP = 80,</div><div class='add'>+	WMI_TLV_SERVICE_STA_PMF_OFFLOAD = 81,</div><div class='add'>+	WMI_TLV_SERVICE_UNIFIED_WOW_CAPABILITY = 82,</div><div class='add'>+	WMI_TLV_SERVICE_ENHANCED_PROXY_STA = 83,</div><div class='add'>+	WMI_TLV_SERVICE_ATF = 84,</div><div class='add'>+	WMI_TLV_SERVICE_COEX_GPIO = 85,</div><div class='add'>+	WMI_TLV_SERVICE_AUX_SPECTRAL_INTF = 86,</div><div class='add'>+	WMI_TLV_SERVICE_AUX_CHAN_LOAD_INTF = 87,</div><div class='add'>+	WMI_TLV_SERVICE_BSS_CHANNEL_INFO_64 = 88,</div><div class='add'>+	WMI_TLV_SERVICE_ENTERPRISE_MESH = 89,</div><div class='add'>+	WMI_TLV_SERVICE_RESTRT_CHNL_SUPPORT = 90,</div><div class='add'>+	WMI_TLV_SERVICE_BPF_OFFLOAD = 91,</div><div class='add'>+	WMI_TLV_SERVICE_SYNC_DELETE_CMDS = 92,</div><div class='add'>+	WMI_TLV_SERVICE_SMART_ANTENNA_SW_SUPPORT = 93,</div><div class='add'>+	WMI_TLV_SERVICE_SMART_ANTENNA_HW_SUPPORT = 94,</div><div class='add'>+	WMI_TLV_SERVICE_RATECTRL_LIMIT_MAX_MIN_RATES = 95,</div><div class='add'>+	WMI_TLV_SERVICE_NAN_DATA = 96,</div><div class='add'>+	WMI_TLV_SERVICE_NAN_RTT = 97,</div><div class='add'>+	WMI_TLV_SERVICE_11AX = 98,</div><div class='add'>+	WMI_TLV_SERVICE_DEPRECATED_REPLACE = 99,</div><div class='add'>+	WMI_TLV_SERVICE_TDLS_CONN_TRACKER_IN_HOST_MODE = 100,</div><div class='add'>+	WMI_TLV_SERVICE_ENHANCED_MCAST_FILTER = 101,</div><div class='add'>+	WMI_TLV_SERVICE_PERIODIC_CHAN_STAT_SUPPORT = 102,</div><div class='add'>+	WMI_TLV_SERVICE_MESH_11S = 103,</div><div class='add'>+	WMI_TLV_SERVICE_HALF_RATE_QUARTER_RATE_SUPPORT = 104,</div><div class='add'>+	WMI_TLV_SERVICE_VDEV_RX_FILTER = 105,</div><div class='add'>+	WMI_TLV_SERVICE_P2P_LISTEN_OFFLOAD_SUPPORT = 106,</div><div class='add'>+	WMI_TLV_SERVICE_MARK_FIRST_WAKEUP_PACKET = 107,</div><div class='add'>+	WMI_TLV_SERVICE_MULTIPLE_MCAST_FILTER_SET = 108,</div><div class='add'>+	WMI_TLV_SERVICE_HOST_MANAGED_RX_REORDER = 109,</div><div class='add'>+	WMI_TLV_SERVICE_FLASH_RDWR_SUPPORT = 110,</div><div class='add'>+	WMI_TLV_SERVICE_WLAN_STATS_REPORT = 111,</div><div class='add'>+	WMI_TLV_SERVICE_TX_MSDU_ID_NEW_PARTITION_SUPPORT = 112,</div><div class='add'>+	WMI_TLV_SERVICE_DFS_PHYERR_OFFLOAD = 113,</div><div class='add'>+	WMI_TLV_SERVICE_RCPI_SUPPORT = 114,</div><div class='add'>+	WMI_TLV_SERVICE_FW_MEM_DUMP_SUPPORT = 115,</div><div class='add'>+	WMI_TLV_SERVICE_PEER_STATS_INFO = 116,</div><div class='add'>+	WMI_TLV_SERVICE_REGULATORY_DB = 117,</div><div class='add'>+	WMI_TLV_SERVICE_11D_OFFLOAD = 118,</div><div class='add'>+	WMI_TLV_SERVICE_HW_DATA_FILTERING = 119,</div><div class='add'>+	WMI_TLV_SERVICE_MULTIPLE_VDEV_RESTART = 120,</div><div class='add'>+	WMI_TLV_SERVICE_PKT_ROUTING = 121,</div><div class='add'>+	WMI_TLV_SERVICE_CHECK_CAL_VERSION = 122,</div><div class='add'>+	WMI_TLV_SERVICE_OFFCHAN_TX_WMI = 123,</div><div class='add'>+	WMI_TLV_SERVICE_8SS_TX_BFEE  = 124,</div><div class='add'>+	WMI_TLV_SERVICE_EXTENDED_NSS_SUPPORT = 125,</div><div class='add'>+	WMI_TLV_SERVICE_ACK_TIMEOUT = 126,</div><div class='add'>+	WMI_TLV_SERVICE_PDEV_BSS_CHANNEL_INFO_64 = 127,</div><div class='add'>+</div><div class='add'>+	WMI_MAX_SERVICE = 128,</div><div class='add'>+</div><div class='add'>+	WMI_TLV_SERVICE_CHAN_LOAD_INFO = 128,</div><div class='add'>+	WMI_TLV_SERVICE_TX_PPDU_INFO_STATS_SUPPORT = 129,</div><div class='add'>+	WMI_TLV_SERVICE_VDEV_LIMIT_OFFCHAN_SUPPORT = 130,</div><div class='add'>+	WMI_TLV_SERVICE_FILS_SUPPORT = 131,</div><div class='add'>+	WMI_TLV_SERVICE_WLAN_OIC_PING_OFFLOAD = 132,</div><div class='add'>+	WMI_TLV_SERVICE_WLAN_DHCP_RENEW = 133,</div><div class='add'>+	WMI_TLV_SERVICE_MAWC_SUPPORT = 134,</div><div class='add'>+	WMI_TLV_SERVICE_VDEV_LATENCY_CONFIG = 135,</div><div class='add'>+	WMI_TLV_SERVICE_PDEV_UPDATE_CTLTABLE_SUPPORT = 136,</div><div class='add'>+	WMI_TLV_SERVICE_PKTLOG_SUPPORT_OVER_HTT = 137,</div><div class='add'>+	WMI_TLV_SERVICE_VDEV_MULTI_GROUP_KEY_SUPPORT = 138,</div><div class='add'>+	WMI_TLV_SERVICE_SCAN_PHYMODE_SUPPORT = 139,</div><div class='add'>+	WMI_TLV_SERVICE_THERM_THROT = 140,</div><div class='add'>+	WMI_TLV_SERVICE_BCN_OFFLOAD_START_STOP_SUPPORT = 141,</div><div class='add'>+	WMI_TLV_SERVICE_WOW_WAKEUP_BY_TIMER_PATTERN = 142,</div><div class='add'>+	WMI_TLV_SERVICE_PEER_MAP_UNMAP_V2_SUPPORT = 143,</div><div class='add'>+	WMI_TLV_SERVICE_OFFCHAN_DATA_TID_SUPPORT = 144,</div><div class='add'>+	WMI_TLV_SERVICE_RX_PROMISC_ENABLE_SUPPORT = 145,</div><div class='add'>+	WMI_TLV_SERVICE_SUPPORT_DIRECT_DMA = 146,</div><div class='add'>+	WMI_TLV_SERVICE_AP_OBSS_DETECTION_OFFLOAD = 147,</div><div class='add'>+	WMI_TLV_SERVICE_11K_NEIGHBOUR_REPORT_SUPPORT = 148,</div><div class='add'>+	WMI_TLV_SERVICE_LISTEN_INTERVAL_OFFLOAD_SUPPORT = 149,</div><div class='add'>+	WMI_TLV_SERVICE_BSS_COLOR_OFFLOAD = 150,</div><div class='add'>+	WMI_TLV_SERVICE_RUNTIME_DPD_RECAL = 151,</div><div class='add'>+	WMI_TLV_SERVICE_STA_TWT = 152,</div><div class='add'>+	WMI_TLV_SERVICE_AP_TWT = 153,</div><div class='add'>+	WMI_TLV_SERVICE_GMAC_OFFLOAD_SUPPORT = 154,</div><div class='add'>+	WMI_TLV_SERVICE_SPOOF_MAC_SUPPORT = 155,</div><div class='add'>+	WMI_TLV_SERVICE_PEER_TID_CONFIGS_SUPPORT = 156,</div><div class='add'>+	WMI_TLV_SERVICE_VDEV_SWRETRY_PER_AC_CONFIG_SUPPORT = 157,</div><div class='add'>+	WMI_TLV_SERVICE_DUAL_BEACON_ON_SINGLE_MAC_SCC_SUPPORT = 158,</div><div class='add'>+	WMI_TLV_SERVICE_DUAL_BEACON_ON_SINGLE_MAC_MCC_SUPPORT = 159,</div><div class='add'>+	WMI_TLV_SERVICE_MOTION_DET = 160,</div><div class='add'>+	WMI_TLV_SERVICE_INFRA_MBSSID = 161,</div><div class='add'>+	WMI_TLV_SERVICE_OBSS_SPATIAL_REUSE = 162,</div><div class='add'>+	WMI_TLV_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORT = 163,</div><div class='add'>+	WMI_TLV_SERVICE_NAN_DBS_SUPPORT = 164,</div><div class='add'>+	WMI_TLV_SERVICE_NDI_DBS_SUPPORT = 165,</div><div class='add'>+	WMI_TLV_SERVICE_NAN_SAP_SUPPORT = 166,</div><div class='add'>+	WMI_TLV_SERVICE_NDI_SAP_SUPPORT = 167,</div><div class='add'>+	WMI_TLV_SERVICE_CFR_CAPTURE_SUPPORT = 168,</div><div class='add'>+	WMI_TLV_SERVICE_CFR_CAPTURE_IND_MSG_TYPE_1 = 169,</div><div class='add'>+	WMI_TLV_SERVICE_ESP_SUPPORT = 170,</div><div class='add'>+	WMI_TLV_SERVICE_PEER_CHWIDTH_CHANGE = 171,</div><div class='add'>+	WMI_TLV_SERVICE_WLAN_HPCS_PULSE = 172,</div><div class='add'>+	WMI_TLV_SERVICE_PER_VDEV_CHAINMASK_CONFIG_SUPPORT = 173,</div><div class='add'>+	WMI_TLV_SERVICE_TX_DATA_MGMT_ACK_RSSI = 174,</div><div class='add'>+	WMI_TLV_SERVICE_NAN_DISABLE_SUPPORT = 175,</div><div class='add'>+	WMI_TLV_SERVICE_HTT_H2T_NO_HTC_HDR_LEN_IN_MSG_LEN = 176,</div><div class='add'>+	WMI_TLV_SERVICE_COEX_SUPPORT_UNEQUAL_ISOLATION = 177,</div><div class='add'>+	WMI_TLV_SERVICE_HW_DB2DBM_CONVERSION_SUPPORT = 178,</div><div class='add'>+	WMI_TLV_SERVICE_SUPPORT_EXTEND_ADDRESS = 179,</div><div class='add'>+	WMI_TLV_SERVICE_BEACON_RECEPTION_STATS = 180,</div><div class='add'>+	WMI_TLV_SERVICE_FETCH_TX_PN = 181,</div><div class='add'>+	WMI_TLV_SERVICE_PEER_UNMAP_RESPONSE_SUPPORT = 182,</div><div class='add'>+	WMI_TLV_SERVICE_TX_PER_PEER_AMPDU_SIZE = 183,</div><div class='add'>+	WMI_TLV_SERVICE_BSS_COLOR_SWITCH_COUNT = 184,</div><div class='add'>+	WMI_TLV_SERVICE_HTT_PEER_STATS_SUPPORT = 185,</div><div class='add'>+	WMI_TLV_SERVICE_UL_RU26_ALLOWED = 186,</div><div class='add'>+	WMI_TLV_SERVICE_GET_MWS_COEX_STATE = 187,</div><div class='add'>+	WMI_TLV_SERVICE_GET_MWS_DPWB_STATE = 188,</div><div class='add'>+	WMI_TLV_SERVICE_GET_MWS_TDM_STATE = 189,</div><div class='add'>+	WMI_TLV_SERVICE_GET_MWS_IDRX_STATE = 190,</div><div class='add'>+	WMI_TLV_SERVICE_GET_MWS_ANTENNA_SHARING_STATE = 191,</div><div class='add'>+	WMI_TLV_SERVICE_ENHANCED_TPC_CONFIG_EVENT = 192,</div><div class='add'>+	WMI_TLV_SERVICE_WLM_STATS_REQUEST = 193,</div><div class='add'>+	WMI_TLV_SERVICE_EXT_PEER_TID_CONFIGS_SUPPORT = 194,</div><div class='add'>+	WMI_TLV_SERVICE_WPA3_FT_SAE_SUPPORT = 195,</div><div class='add'>+	WMI_TLV_SERVICE_WPA3_FT_SUITE_B_SUPPORT = 196,</div><div class='add'>+	WMI_TLV_SERVICE_VOW_ENABLE = 197,</div><div class='add'>+	WMI_TLV_SERVICE_CFR_CAPTURE_IND_EVT_TYPE_1 = 198,</div><div class='add'>+	WMI_TLV_SERVICE_BROADCAST_TWT = 199,</div><div class='add'>+	WMI_TLV_SERVICE_RAP_DETECTION_SUPPORT = 200,</div><div class='add'>+	WMI_TLV_SERVICE_PS_TDCC = 201,</div><div class='add'>+	WMI_TLV_SERVICE_THREE_WAY_COEX_CONFIG_LEGACY   = 202,</div><div class='add'>+	WMI_TLV_SERVICE_THREE_WAY_COEX_CONFIG_OVERRIDE = 203,</div><div class='add'>+	WMI_TLV_SERVICE_TX_PWR_PER_PEER = 204,</div><div class='add'>+	WMI_TLV_SERVICE_STA_PLUS_STA_SUPPORT = 205,</div><div class='add'>+	WMI_TLV_SERVICE_WPA3_FT_FILS = 206,</div><div class='add'>+	WMI_TLV_SERVICE_ADAPTIVE_11R_ROAM = 207,</div><div class='add'>+	WMI_TLV_SERVICE_CHAN_RF_CHARACTERIZATION_INFO = 208,</div><div class='add'>+	WMI_TLV_SERVICE_FW_IFACE_COMBINATION_SUPPORT = 209,</div><div class='add'>+	WMI_TLV_SERVICE_TX_COMPL_TSF64 = 210,</div><div class='add'>+	WMI_TLV_SERVICE_DSM_ROAM_FILTER = 211,</div><div class='add'>+	WMI_TLV_SERVICE_PACKET_CAPTURE_SUPPORT = 212,</div><div class='add'>+	WMI_TLV_SERVICE_PER_PEER_HTT_STATS_RESET = 213,</div><div class='add'>+	WMI_TLV_SERVICE_FREQINFO_IN_METADATA = 219,</div><div class='add'>+	WMI_TLV_SERVICE_EXT2_MSG = 220,</div><div class='add'>+	WMI_TLV_SERVICE_BEACON_PROTECTION_SUPPORT = 244,</div><div class='add'>+	WMI_TLV_SERVICE_MBSS_PARAM_IN_VDEV_START_SUPPORT = 253,</div><div class='add'>+</div><div class='add'>+	WMI_MAX_EXT_SERVICE = 256,</div><div class='add'>+</div><div class='add'>+	WMI_TLV_SERVICE_EXT_TPC_REG_SUPPORT = 280,</div><div class='add'>+</div><div class='add'>+	WMI_TLV_SERVICE_REG_CC_EXT_EVENT_SUPPORT = 281,</div><div class='add'>+</div><div class='add'>+	WMI_TLV_SERVICE_11BE = 289,</div><div class='add'>+</div><div class='add'>+	WMI_TLV_SERVICE_WMSK_COMPACTION_RX_TLVS = 361,</div><div class='add'>+</div><div class='add'>+	WMI_TLV_SERVICE_PEER_METADATA_V1A_V1B_SUPPORT = 365,</div><div class='add'>+	WMI_TLV_SERVICE_ETH_OFFLOAD = 461,</div><div class='add'>+</div><div class='add'>+	WMI_MAX_EXT2_SERVICE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	WMI_SMPS_FORCED_MODE_NONE = 0,</div><div class='add'>+	WMI_SMPS_FORCED_MODE_DISABLED,</div><div class='add'>+	WMI_SMPS_FORCED_MODE_STATIC,</div><div class='add'>+	WMI_SMPS_FORCED_MODE_DYNAMIC</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_tpc_chainmask {</div><div class='add'>+	WMI_TPC_CHAINMASK_CONFIG_BAND_2G = 0,</div><div class='add'>+	WMI_TPC_CHAINMASK_CONFIG_BAND_5G = 1,</div><div class='add'>+	WMI_NUM_SUPPORTED_BAND_MAX = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_peer_param {</div><div class='add'>+	WMI_PEER_MIMO_PS_STATE = 1,</div><div class='add'>+	WMI_PEER_AMPDU = 2,</div><div class='add'>+	WMI_PEER_AUTHORIZE = 3,</div><div class='add'>+	WMI_PEER_CHWIDTH = 4,</div><div class='add'>+	WMI_PEER_NSS = 5,</div><div class='add'>+	WMI_PEER_USE_4ADDR = 6,</div><div class='add'>+	WMI_PEER_MEMBERSHIP = 7,</div><div class='add'>+	WMI_PEER_USERPOS = 8,</div><div class='add'>+	WMI_PEER_CRIT_PROTO_HINT_ENABLED = 9,</div><div class='add'>+	WMI_PEER_TX_FAIL_CNT_THR = 10,</div><div class='add'>+	WMI_PEER_SET_HW_RETRY_CTS2S = 11,</div><div class='add'>+	WMI_PEER_IBSS_ATIM_WINDOW_LENGTH = 12,</div><div class='add'>+	WMI_PEER_PHYMODE = 13,</div><div class='add'>+	WMI_PEER_USE_FIXED_PWR = 14,</div><div class='add'>+	WMI_PEER_PARAM_FIXED_RATE = 15,</div><div class='add'>+	WMI_PEER_SET_MU_WHITELIST = 16,</div><div class='add'>+	WMI_PEER_SET_MAX_TX_RATE = 17,</div><div class='add'>+	WMI_PEER_SET_MIN_TX_RATE = 18,</div><div class='add'>+	WMI_PEER_SET_DEFAULT_ROUTING = 19,</div><div class='add'>+	WMI_PEER_CHWIDTH_PUNCTURE_20MHZ_BITMAP = 39,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WMI_PEER_PUNCTURE_BITMAP		GENMASK(23, 8)</div><div class='add'>+</div><div class='add'>+enum wmi_slot_time {</div><div class='add'>+	WMI_VDEV_SLOT_TIME_LONG = 1,</div><div class='add'>+	WMI_VDEV_SLOT_TIME_SHORT = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_preamble {</div><div class='add'>+	WMI_VDEV_PREAMBLE_LONG = 1,</div><div class='add'>+	WMI_VDEV_PREAMBLE_SHORT = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_peer_smps_state {</div><div class='add'>+	WMI_PEER_SMPS_PS_NONE =	0,</div><div class='add'>+	WMI_PEER_SMPS_STATIC  = 1,</div><div class='add'>+	WMI_PEER_SMPS_DYNAMIC = 2</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_peer_chwidth {</div><div class='add'>+	WMI_PEER_CHWIDTH_20MHZ = 0,</div><div class='add'>+	WMI_PEER_CHWIDTH_40MHZ = 1,</div><div class='add'>+	WMI_PEER_CHWIDTH_80MHZ = 2,</div><div class='add'>+	WMI_PEER_CHWIDTH_160MHZ = 3,</div><div class='add'>+	WMI_PEER_CHWIDTH_320MHZ = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_beacon_gen_mode {</div><div class='add'>+	WMI_BEACON_STAGGERED_MODE = 0,</div><div class='add'>+	WMI_BEACON_BURST_MODE = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_direct_buffer_module {</div><div class='add'>+	WMI_DIRECT_BUF_SPECTRAL = 0,</div><div class='add'>+	WMI_DIRECT_BUF_CFR = 1,</div><div class='add'>+</div><div class='add'>+	/* keep it last */</div><div class='add'>+	WMI_DIRECT_BUF_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum wmi_nss_ratio - NSS ratio received from FW during service ready ext event</div><div class='add'>+ * @WMI_NSS_RATIO_1BY2_NSS: Max nss of 160MHz is equals to half of the max nss of 80MHz</div><div class='add'>+ * @WMI_NSS_RATIO_3BY4_NSS: Max nss of 160MHz is equals to 3/4 of the max nss of 80MHz</div><div class='add'>+ * @WMI_NSS_RATIO_1_NSS: Max nss of 160MHz is equals to the max nss of 80MHz</div><div class='add'>+ * @WMI_NSS_RATIO_2_NSS: Max nss of 160MHz is equals to two times the max nss of 80MHz</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum wmi_nss_ratio {</div><div class='add'>+	WMI_NSS_RATIO_1BY2_NSS,</div><div class='add'>+	WMI_NSS_RATIO_3BY4_NSS,</div><div class='add'>+	WMI_NSS_RATIO_1_NSS,</div><div class='add'>+	WMI_NSS_RATIO_2_NSS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_pdev_band_arg {</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+	u32 start_freq;</div><div class='add'>+	u32 end_freq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_ppe_threshold_arg {</div><div class='add'>+	u32 numss_m1;</div><div class='add'>+	u32 ru_bit_mask;</div><div class='add'>+	u32 ppet16_ppet8_ru3_ru0[WMI_MAX_NUM_SS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PSOC_HOST_MAX_PHY_SIZE (3)</div><div class='add'>+#define ATH12K_11B_SUPPORT                 BIT(0)</div><div class='add'>+#define ATH12K_11G_SUPPORT                 BIT(1)</div><div class='add'>+#define ATH12K_11A_SUPPORT                 BIT(2)</div><div class='add'>+#define ATH12K_11N_SUPPORT                 BIT(3)</div><div class='add'>+#define ATH12K_11AC_SUPPORT                BIT(4)</div><div class='add'>+#define ATH12K_11AX_SUPPORT                BIT(5)</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_hal_reg_capabilities_ext_arg {</div><div class='add'>+	u32 phy_id;</div><div class='add'>+	u32 eeprom_reg_domain;</div><div class='add'>+	u32 eeprom_reg_domain_ext;</div><div class='add'>+	u32 regcap1;</div><div class='add'>+	u32 regcap2;</div><div class='add'>+	u32 wireless_modes;</div><div class='add'>+	u32 low_2ghz_chan;</div><div class='add'>+	u32 high_2ghz_chan;</div><div class='add'>+	u32 low_5ghz_chan;</div><div class='add'>+	u32 high_5ghz_chan;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WMI_HOST_MAX_PDEV 3</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_host_mem_chunk_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 req_id;</div><div class='add'>+	__le32 ptr;</div><div class='add'>+	__le32 size;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_host_mem_chunk_arg {</div><div class='add'>+	void *vaddr;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	u32 len;</div><div class='add'>+	u32 req_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_peer_metadata_version {</div><div class='add'>+	ATH12K_PEER_METADATA_V0,</div><div class='add'>+	ATH12K_PEER_METADATA_V1,</div><div class='add'>+	ATH12K_PEER_METADATA_V1A,</div><div class='add'>+	ATH12K_PEER_METADATA_V1B</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_resource_config_arg {</div><div class='add'>+	u32 num_vdevs;</div><div class='add'>+	u32 num_peers;</div><div class='add'>+	u32 num_active_peers;</div><div class='add'>+	u32 num_offload_peers;</div><div class='add'>+	u32 num_offload_reorder_buffs;</div><div class='add'>+	u32 num_peer_keys;</div><div class='add'>+	u32 num_tids;</div><div class='add'>+	u32 ast_skid_limit;</div><div class='add'>+	u32 tx_chain_mask;</div><div class='add'>+	u32 rx_chain_mask;</div><div class='add'>+	u32 rx_timeout_pri[4];</div><div class='add'>+	u32 rx_decap_mode;</div><div class='add'>+	u32 scan_max_pending_req;</div><div class='add'>+	u32 bmiss_offload_max_vdev;</div><div class='add'>+	u32 roam_offload_max_vdev;</div><div class='add'>+	u32 roam_offload_max_ap_profiles;</div><div class='add'>+	u32 num_mcast_groups;</div><div class='add'>+	u32 num_mcast_table_elems;</div><div class='add'>+	u32 mcast2ucast_mode;</div><div class='add'>+	u32 tx_dbg_log_size;</div><div class='add'>+	u32 num_wds_entries;</div><div class='add'>+	u32 dma_burst_size;</div><div class='add'>+	u32 mac_aggr_delim;</div><div class='add'>+	u32 rx_skip_defrag_timeout_dup_detection_check;</div><div class='add'>+	u32 vow_config;</div><div class='add'>+	u32 gtk_offload_max_vdev;</div><div class='add'>+	u32 num_msdu_desc;</div><div class='add'>+	u32 max_frag_entries;</div><div class='add'>+	u32 max_peer_ext_stats;</div><div class='add'>+	u32 smart_ant_cap;</div><div class='add'>+	u32 bk_minfree;</div><div class='add'>+	u32 be_minfree;</div><div class='add'>+	u32 vi_minfree;</div><div class='add'>+	u32 vo_minfree;</div><div class='add'>+	u32 rx_batchmode;</div><div class='add'>+	u32 tt_support;</div><div class='add'>+	u32 atf_config;</div><div class='add'>+	u32 iphdr_pad_config;</div><div class='add'>+	u32 qwrap_config:16,</div><div class='add'>+	    alloc_frag_desc_for_data_pkt:16;</div><div class='add'>+	u32 num_tdls_vdevs;</div><div class='add'>+	u32 num_tdls_conn_table_entries;</div><div class='add'>+	u32 beacon_tx_offload_max_vdev;</div><div class='add'>+	u32 num_multicast_filter_entries;</div><div class='add'>+	u32 num_wow_filters;</div><div class='add'>+	u32 num_keep_alive_pattern;</div><div class='add'>+	u32 keep_alive_pattern_size;</div><div class='add'>+	u32 max_tdls_concurrent_sleep_sta;</div><div class='add'>+	u32 max_tdls_concurrent_buffer_sta;</div><div class='add'>+	u32 wmi_send_separate;</div><div class='add'>+	u32 num_ocb_vdevs;</div><div class='add'>+	u32 num_ocb_channels;</div><div class='add'>+	u32 num_ocb_schedules;</div><div class='add'>+	u32 num_ns_ext_tuples_cfg;</div><div class='add'>+	u32 bpf_instruction_size;</div><div class='add'>+	u32 max_bssid_rx_filters;</div><div class='add'>+	u32 use_pdev_id;</div><div class='add'>+	u32 peer_map_unmap_version;</div><div class='add'>+	u32 sched_params;</div><div class='add'>+	u32 twt_ap_pdev_count;</div><div class='add'>+	u32 twt_ap_sta_count;</div><div class='add'>+	enum ath12k_peer_metadata_version peer_metadata_ver;</div><div class='add'>+	u32 ema_max_vap_cnt;</div><div class='add'>+	u32 ema_max_profile_period;</div><div class='add'>+	bool is_reg_cc_ext_event_supported;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_init_cmd_arg {</div><div class='add'>+	struct ath12k_wmi_resource_config_arg res_cfg;</div><div class='add'>+	u8 num_mem_chunks;</div><div class='add'>+	struct ath12k_wmi_host_mem_chunk_arg *mem_chunks;</div><div class='add'>+	u32 hw_mode_id;</div><div class='add'>+	u32 num_band_to_mac;</div><div class='add'>+	struct ath12k_wmi_pdev_band_arg band_to_mac[WMI_HOST_MAX_PDEV];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_pdev_band_to_mac_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 start_freq;</div><div class='add'>+	__le32 end_freq;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* This is both individual command WMI_PDEV_SET_HW_MODE_CMDID and also part</div><div class='add'>+ * of WMI_TAG_INIT_CMD.</div><div class='add'>+ */</div><div class='add'>+struct ath12k_wmi_pdev_set_hw_mode_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 hw_mode_index;</div><div class='add'>+	__le32 num_band_to_mac;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_ppe_threshold_params {</div><div class='add'>+	__le32 numss_m1; /** NSS - 1*/</div><div class='add'>+	__le32 ru_info;</div><div class='add'>+	__le32 ppet16_ppet8_ru3_ru0[WMI_MAX_NUM_SS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HW_BD_INFO_SIZE       5</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_abi_version_params {</div><div class='add'>+	__le32 abi_version_0;</div><div class='add'>+	__le32 abi_version_1;</div><div class='add'>+	__le32 abi_version_ns_0;</div><div class='add'>+	__le32 abi_version_ns_1;</div><div class='add'>+	__le32 abi_version_ns_2;</div><div class='add'>+	__le32 abi_version_ns_3;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_init_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	struct ath12k_wmi_abi_version_params host_abi_vers;</div><div class='add'>+	__le32 num_host_mem_chunks;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_RSRC_CFG_HOST_SVC_FLAG_REG_CC_EXT_SUPPORT_BIT 4</div><div class='add'>+#define WMI_RSRC_CFG_HOST_SVC_FLAG_REO_QREF_SUPPORT_BIT   12</div><div class='add'>+#define WMI_RSRC_CFG_FLAGS2_RX_PEER_METADATA_VERSION		GENMASK(5, 4)</div><div class='add'>+#define WMI_RSRC_CFG_FLAG1_BSS_CHANNEL_INFO_64	BIT(5)</div><div class='add'>+#define WMI_RSRC_CFG_FLAGS2_CALC_NEXT_DTIM_COUNT_SET      BIT(9)</div><div class='add'>+#define WMI_RSRC_CFG_FLAG1_ACK_RSSI	BIT(18)</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_resource_config_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 num_vdevs;</div><div class='add'>+	__le32 num_peers;</div><div class='add'>+	__le32 num_offload_peers;</div><div class='add'>+	__le32 num_offload_reorder_buffs;</div><div class='add'>+	__le32 num_peer_keys;</div><div class='add'>+	__le32 num_tids;</div><div class='add'>+	__le32 ast_skid_limit;</div><div class='add'>+	__le32 tx_chain_mask;</div><div class='add'>+	__le32 rx_chain_mask;</div><div class='add'>+	__le32 rx_timeout_pri[4];</div><div class='add'>+	__le32 rx_decap_mode;</div><div class='add'>+	__le32 scan_max_pending_req;</div><div class='add'>+	__le32 bmiss_offload_max_vdev;</div><div class='add'>+	__le32 roam_offload_max_vdev;</div><div class='add'>+	__le32 roam_offload_max_ap_profiles;</div><div class='add'>+	__le32 num_mcast_groups;</div><div class='add'>+	__le32 num_mcast_table_elems;</div><div class='add'>+	__le32 mcast2ucast_mode;</div><div class='add'>+	__le32 tx_dbg_log_size;</div><div class='add'>+	__le32 num_wds_entries;</div><div class='add'>+	__le32 dma_burst_size;</div><div class='add'>+	__le32 mac_aggr_delim;</div><div class='add'>+	__le32 rx_skip_defrag_timeout_dup_detection_check;</div><div class='add'>+	__le32 vow_config;</div><div class='add'>+	__le32 gtk_offload_max_vdev;</div><div class='add'>+	__le32 num_msdu_desc;</div><div class='add'>+	__le32 max_frag_entries;</div><div class='add'>+	__le32 num_tdls_vdevs;</div><div class='add'>+	__le32 num_tdls_conn_table_entries;</div><div class='add'>+	__le32 beacon_tx_offload_max_vdev;</div><div class='add'>+	__le32 num_multicast_filter_entries;</div><div class='add'>+	__le32 num_wow_filters;</div><div class='add'>+	__le32 num_keep_alive_pattern;</div><div class='add'>+	__le32 keep_alive_pattern_size;</div><div class='add'>+	__le32 max_tdls_concurrent_sleep_sta;</div><div class='add'>+	__le32 max_tdls_concurrent_buffer_sta;</div><div class='add'>+	__le32 wmi_send_separate;</div><div class='add'>+	__le32 num_ocb_vdevs;</div><div class='add'>+	__le32 num_ocb_channels;</div><div class='add'>+	__le32 num_ocb_schedules;</div><div class='add'>+	__le32 flag1;</div><div class='add'>+	__le32 smart_ant_cap;</div><div class='add'>+	__le32 bk_minfree;</div><div class='add'>+	__le32 be_minfree;</div><div class='add'>+	__le32 vi_minfree;</div><div class='add'>+	__le32 vo_minfree;</div><div class='add'>+	__le32 alloc_frag_desc_for_data_pkt;</div><div class='add'>+	__le32 num_ns_ext_tuples_cfg;</div><div class='add'>+	__le32 bpf_instruction_size;</div><div class='add'>+	__le32 max_bssid_rx_filters;</div><div class='add'>+	__le32 use_pdev_id;</div><div class='add'>+	__le32 max_num_dbs_scan_duty_cycle;</div><div class='add'>+	__le32 max_num_group_keys;</div><div class='add'>+	__le32 peer_map_unmap_version;</div><div class='add'>+	__le32 sched_params;</div><div class='add'>+	__le32 twt_ap_pdev_count;</div><div class='add'>+	__le32 twt_ap_sta_count;</div><div class='add'>+	__le32 max_nlo_ssids;</div><div class='add'>+	__le32 num_pkt_filters;</div><div class='add'>+	__le32 num_max_sta_vdevs;</div><div class='add'>+	__le32 max_bssid_indicator;</div><div class='add'>+	__le32 ul_resp_config;</div><div class='add'>+	__le32 msdu_flow_override_config0;</div><div class='add'>+	__le32 msdu_flow_override_config1;</div><div class='add'>+	__le32 flags2;</div><div class='add'>+	__le32 host_service_flags;</div><div class='add'>+	__le32 max_rnr_neighbours;</div><div class='add'>+	__le32 ema_max_vap_cnt;</div><div class='add'>+	__le32 ema_max_profile_period;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_service_ready_event {</div><div class='add'>+	__le32 fw_build_vers;</div><div class='add'>+	struct ath12k_wmi_abi_version_params fw_abi_vers;</div><div class='add'>+	__le32 phy_capability;</div><div class='add'>+	__le32 max_frag_entry;</div><div class='add'>+	__le32 num_rf_chains;</div><div class='add'>+	__le32 ht_cap_info;</div><div class='add'>+	__le32 vht_cap_info;</div><div class='add'>+	__le32 vht_supp_mcs;</div><div class='add'>+	__le32 hw_min_tx_power;</div><div class='add'>+	__le32 hw_max_tx_power;</div><div class='add'>+	__le32 sys_cap_info;</div><div class='add'>+	__le32 min_pkt_size_enable;</div><div class='add'>+	__le32 max_bcn_ie_size;</div><div class='add'>+	__le32 num_mem_reqs;</div><div class='add'>+	__le32 max_num_scan_channels;</div><div class='add'>+	__le32 hw_bd_id;</div><div class='add'>+	__le32 hw_bd_info[HW_BD_INFO_SIZE];</div><div class='add'>+	__le32 max_supported_macs;</div><div class='add'>+	__le32 wmi_fw_sub_feat_caps;</div><div class='add'>+	__le32 num_dbs_hw_modes;</div><div class='add'>+	/* txrx_chainmask</div><div class='add'>+	 *    [7:0]   - 2G band tx chain mask</div><div class='add'>+	 *    [15:8]  - 2G band rx chain mask</div><div class='add'>+	 *    [23:16] - 5G band tx chain mask</div><div class='add'>+	 *    [31:24] - 5G band rx chain mask</div><div class='add'>+	 */</div><div class='add'>+	__le32 txrx_chainmask;</div><div class='add'>+	__le32 default_dbs_hw_mode_index;</div><div class='add'>+	__le32 num_msdu_desc;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_SERVICE_BM_SIZE	((WMI_MAX_SERVICE + sizeof(u32) - 1) / sizeof(u32))</div><div class='add'>+</div><div class='add'>+#define WMI_SERVICE_SEGMENT_BM_SIZE32 4 /* 4x u32 = 128 bits */</div><div class='add'>+#define WMI_SERVICE_EXT_BM_SIZE (WMI_SERVICE_SEGMENT_BM_SIZE32 * sizeof(u32))</div><div class='add'>+#define WMI_AVAIL_SERVICE_BITS_IN_SIZE32 32</div><div class='add'>+#define WMI_SERVICE_BITS_IN_SIZE32 4</div><div class='add'>+</div><div class='add'>+struct wmi_service_ready_ext_event {</div><div class='add'>+	__le32 default_conc_scan_config_bits;</div><div class='add'>+	__le32 default_fw_config_bits;</div><div class='add'>+	struct ath12k_wmi_ppe_threshold_params ppet;</div><div class='add'>+	__le32 he_cap_info;</div><div class='add'>+	__le32 mpdu_density;</div><div class='add'>+	__le32 max_bssid_rx_filters;</div><div class='add'>+	__le32 fw_build_vers_ext;</div><div class='add'>+	__le32 max_nlo_ssids;</div><div class='add'>+	__le32 max_bssid_indicator;</div><div class='add'>+	__le32 he_cap_info_ext;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_soc_mac_phy_hw_mode_caps_params {</div><div class='add'>+	__le32 num_hw_modes;</div><div class='add'>+	__le32 num_chainmask_tables;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_HW_MODE_CAP_CFG_TYPE	GENMASK(27, 0)</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_hw_mode_cap_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 hw_mode_id;</div><div class='add'>+	__le32 phy_id_map;</div><div class='add'>+	__le32 hw_mode_config_type;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_MAX_HECAP_PHY_SIZE                 (3)</div><div class='add'>+#define WMI_NSS_RATIO_EN_DIS_BITPOS    BIT(0)</div><div class='add'>+#define WMI_NSS_RATIO_EN_DIS_GET(_val) \</div><div class='add'>+	le32_get_bits(_val, WMI_NSS_RATIO_EN_DIS_BITPOS)</div><div class='add'>+#define WMI_NSS_RATIO_INFO_BITPOS              GENMASK(4, 1)</div><div class='add'>+#define WMI_NSS_RATIO_INFO_GET(_val) \</div><div class='add'>+	le32_get_bits(_val, WMI_NSS_RATIO_INFO_BITPOS)</div><div class='add'>+</div><div class='add'>+/* pdev_id is present in lower 16 bits of pdev_and_hw_link_ids in</div><div class='add'>+ * ath12k_wmi_mac_phy_caps_params &amp; ath12k_wmi_caps_ext_params.</div><div class='add'>+ *</div><div class='add'>+ * hw_link_id is present in higher 16 bits of pdev_and_hw_link_ids.</div><div class='add'>+ */</div><div class='add'>+#define WMI_CAPS_PARAMS_PDEV_ID		GENMASK(15, 0)</div><div class='add'>+#define WMI_CAPS_PARAMS_HW_LINK_ID	GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_mac_phy_caps_params {</div><div class='add'>+	__le32 hw_mode_id;</div><div class='add'>+	__le32 pdev_and_hw_link_ids;</div><div class='add'>+	__le32 phy_id;</div><div class='add'>+	__le32 supported_flags;</div><div class='add'>+	__le32 supported_bands;</div><div class='add'>+	__le32 ampdu_density;</div><div class='add'>+	__le32 max_bw_supported_2g;</div><div class='add'>+	__le32 ht_cap_info_2g;</div><div class='add'>+	__le32 vht_cap_info_2g;</div><div class='add'>+	__le32 vht_supp_mcs_2g;</div><div class='add'>+	__le32 he_cap_info_2g;</div><div class='add'>+	__le32 he_supp_mcs_2g;</div><div class='add'>+	__le32 tx_chain_mask_2g;</div><div class='add'>+	__le32 rx_chain_mask_2g;</div><div class='add'>+	__le32 max_bw_supported_5g;</div><div class='add'>+	__le32 ht_cap_info_5g;</div><div class='add'>+	__le32 vht_cap_info_5g;</div><div class='add'>+	__le32 vht_supp_mcs_5g;</div><div class='add'>+	__le32 he_cap_info_5g;</div><div class='add'>+	__le32 he_supp_mcs_5g;</div><div class='add'>+	__le32 tx_chain_mask_5g;</div><div class='add'>+	__le32 rx_chain_mask_5g;</div><div class='add'>+	__le32 he_cap_phy_info_2g[WMI_MAX_HECAP_PHY_SIZE];</div><div class='add'>+	__le32 he_cap_phy_info_5g[WMI_MAX_HECAP_PHY_SIZE];</div><div class='add'>+	struct ath12k_wmi_ppe_threshold_params he_ppet2g;</div><div class='add'>+	struct ath12k_wmi_ppe_threshold_params he_ppet5g;</div><div class='add'>+	__le32 chainmask_table_id;</div><div class='add'>+	__le32 lmac_id;</div><div class='add'>+	__le32 he_cap_info_2g_ext;</div><div class='add'>+	__le32 he_cap_info_5g_ext;</div><div class='add'>+	__le32 he_cap_info_internal;</div><div class='add'>+	__le32 wireless_modes;</div><div class='add'>+	__le32 low_2ghz_chan_freq;</div><div class='add'>+	__le32 high_2ghz_chan_freq;</div><div class='add'>+	__le32 low_5ghz_chan_freq;</div><div class='add'>+	__le32 high_5ghz_chan_freq;</div><div class='add'>+	__le32 nss_ratio;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_hal_reg_caps_ext_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 phy_id;</div><div class='add'>+	__le32 eeprom_reg_domain;</div><div class='add'>+	__le32 eeprom_reg_domain_ext;</div><div class='add'>+	__le32 regcap1;</div><div class='add'>+	__le32 regcap2;</div><div class='add'>+	__le32 wireless_modes;</div><div class='add'>+	__le32 low_2ghz_chan;</div><div class='add'>+	__le32 high_2ghz_chan;</div><div class='add'>+	__le32 low_5ghz_chan;</div><div class='add'>+	__le32 high_5ghz_chan;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_soc_hal_reg_caps_params {</div><div class='add'>+	__le32 num_phy;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum wmi_channel_width {</div><div class='add'>+	WMI_CHAN_WIDTH_20 = 0,</div><div class='add'>+	WMI_CHAN_WIDTH_40 = 1,</div><div class='add'>+	WMI_CHAN_WIDTH_80 = 2,</div><div class='add'>+	WMI_CHAN_WIDTH_160 = 3,</div><div class='add'>+	WMI_CHAN_WIDTH_80P80 = 4,</div><div class='add'>+	WMI_CHAN_WIDTH_5 = 5,</div><div class='add'>+	WMI_CHAN_WIDTH_10 = 6,</div><div class='add'>+	WMI_CHAN_WIDTH_165 = 7,</div><div class='add'>+	WMI_CHAN_WIDTH_160P160 = 8,</div><div class='add'>+	WMI_CHAN_WIDTH_320 = 9,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WMI_MAX_EHTCAP_MAC_SIZE  2</div><div class='add'>+#define WMI_MAX_EHTCAP_PHY_SIZE  3</div><div class='add'>+#define WMI_MAX_EHTCAP_RATE_SET  3</div><div class='add'>+</div><div class='add'>+/* Used for EHT MCS-NSS array. Data at each array index follows the format given</div><div class='add'>+ * in IEEE P802.11be/D2.0, May 20229.4.2.313.4.</div><div class='add'>+ *</div><div class='add'>+ * Index interpretation:</div><div class='add'>+ * 0 - 20 MHz only sta, all 4 bytes valid</div><div class='add'>+ * 1 - index for bandwidths &lt;= 80 MHz except 20 MHz-only, first 3 bytes valid</div><div class='add'>+ * 2 - index for 160 MHz, first 3 bytes valid</div><div class='add'>+ * 3 - index for 320 MHz, first 3 bytes valid</div><div class='add'>+ */</div><div class='add'>+#define WMI_MAX_EHT_SUPP_MCS_2GHZ_SIZE  2</div><div class='add'>+#define WMI_MAX_EHT_SUPP_MCS_5GHZ_SIZE  4</div><div class='add'>+</div><div class='add'>+#define WMI_EHTCAP_TXRX_MCS_NSS_IDX_80    0</div><div class='add'>+#define WMI_EHTCAP_TXRX_MCS_NSS_IDX_160   1</div><div class='add'>+#define WMI_EHTCAP_TXRX_MCS_NSS_IDX_320   2</div><div class='add'>+</div><div class='add'>+#define WMI_EHT_MCS_NSS_0_7    GENMASK(3, 0)</div><div class='add'>+#define WMI_EHT_MCS_NSS_8_9    GENMASK(7, 4)</div><div class='add'>+#define WMI_EHT_MCS_NSS_10_11  GENMASK(11, 8)</div><div class='add'>+#define WMI_EHT_MCS_NSS_12_13  GENMASK(15, 12)</div><div class='add'>+</div><div class='add'>+struct wmi_service_ready_ext2_event {</div><div class='add'>+	__le32 reg_db_version;</div><div class='add'>+	__le32 hw_min_max_tx_power_2ghz;</div><div class='add'>+	__le32 hw_min_max_tx_power_5ghz;</div><div class='add'>+	__le32 chwidth_num_peer_caps;</div><div class='add'>+	__le32 preamble_puncture_bw;</div><div class='add'>+	__le32 max_user_per_ppdu_ofdma;</div><div class='add'>+	__le32 max_user_per_ppdu_mumimo;</div><div class='add'>+	__le32 target_cap_flags;</div><div class='add'>+	__le32 eht_cap_mac_info[WMI_MAX_EHTCAP_MAC_SIZE];</div><div class='add'>+	__le32 max_num_linkview_peers;</div><div class='add'>+	__le32 max_num_msduq_supported_per_tid;</div><div class='add'>+	__le32 default_num_msduq_supported_per_tid;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_dbs_or_sbs_cap_params {</div><div class='add'>+	__le32 hw_mode_id;</div><div class='add'>+	__le32 sbs_lower_band_end_freq;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_caps_ext_params {</div><div class='add'>+	__le32 hw_mode_id;</div><div class='add'>+	__le32 pdev_and_hw_link_ids;</div><div class='add'>+	__le32 phy_id;</div><div class='add'>+	__le32 wireless_modes_ext;</div><div class='add'>+	__le32 eht_cap_mac_info_2ghz[WMI_MAX_EHTCAP_MAC_SIZE];</div><div class='add'>+	__le32 eht_cap_mac_info_5ghz[WMI_MAX_EHTCAP_MAC_SIZE];</div><div class='add'>+	__le32 rsvd0[2];</div><div class='add'>+	__le32 eht_cap_phy_info_2ghz[WMI_MAX_EHTCAP_PHY_SIZE];</div><div class='add'>+	__le32 eht_cap_phy_info_5ghz[WMI_MAX_EHTCAP_PHY_SIZE];</div><div class='add'>+	struct ath12k_wmi_ppe_threshold_params eht_ppet_2ghz;</div><div class='add'>+	struct ath12k_wmi_ppe_threshold_params eht_ppet_5ghz;</div><div class='add'>+	__le32 eht_cap_info_internal;</div><div class='add'>+	__le32 eht_supp_mcs_ext_2ghz[WMI_MAX_EHT_SUPP_MCS_2GHZ_SIZE];</div><div class='add'>+	__le32 eht_supp_mcs_ext_5ghz[WMI_MAX_EHT_SUPP_MCS_5GHZ_SIZE];</div><div class='add'>+	__le32 eml_capability;</div><div class='add'>+	__le32 mld_capability;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* 2 word representation of MAC addr */</div><div class='add'>+struct ath12k_wmi_mac_addr_params {</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+	u8 padding[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_dma_ring_caps_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 module_id;</div><div class='add'>+	__le32 min_elem;</div><div class='add'>+	__le32 min_buf_sz;</div><div class='add'>+	__le32 min_buf_align;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_ready_event_min_params {</div><div class='add'>+	struct ath12k_wmi_abi_version_params fw_abi_vers;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params mac_addr;</div><div class='add'>+	__le32 status;</div><div class='add'>+	__le32 num_dscp_table;</div><div class='add'>+	__le32 num_extra_mac_addr;</div><div class='add'>+	__le32 num_total_peers;</div><div class='add'>+	__le32 num_extra_peers;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_ready_event {</div><div class='add'>+	struct ath12k_wmi_ready_event_min_params ready_event_min;</div><div class='add'>+	__le32 max_ast_index;</div><div class='add'>+	__le32 pktlog_defs_checksum;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_service_available_event {</div><div class='add'>+	__le32 wmi_service_segment_offset;</div><div class='add'>+	__le32 wmi_service_segment_bitmap[WMI_SERVICE_SEGMENT_BM_SIZE32];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_vdev_create_arg {</div><div class='add'>+	u8 if_id;</div><div class='add'>+	u32 type;</div><div class='add'>+	u32 subtype;</div><div class='add'>+	struct {</div><div class='add'>+		u8 tx;</div><div class='add'>+		u8 rx;</div><div class='add'>+	} chains[NUM_NL80211_BANDS];</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+	u8 if_stats_id;</div><div class='add'>+	u32 mbssid_flags;</div><div class='add'>+	u32 mbssid_tx_vdev_id;</div><div class='add'>+	u8 mld_addr[ETH_ALEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_MAX_VDEV_STATS_ID	0x30</div><div class='add'>+#define ATH12K_INVAL_VDEV_STATS_ID	0xFF</div><div class='add'>+</div><div class='add'>+struct wmi_vdev_create_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 vdev_type;</div><div class='add'>+	__le32 vdev_subtype;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params vdev_macaddr;</div><div class='add'>+	__le32 num_cfg_txrx_streams;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 mbssid_flags;</div><div class='add'>+	__le32 mbssid_tx_vdev_id;</div><div class='add'>+	__le32 vdev_stats_id_valid;</div><div class='add'>+	__le32 vdev_stats_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_vdev_txrx_streams_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 band;</div><div class='add'>+	__le32 supported_tx_streams;</div><div class='add'>+	__le32 supported_rx_streams;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_vdev_create_mlo_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params mld_macaddr;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_WMI_FLAG_MLO_ENABLED			BIT(0)</div><div class='add'>+#define ATH12K_WMI_FLAG_MLO_ASSOC_LINK			BIT(1)</div><div class='add'>+#define ATH12K_WMI_FLAG_MLO_PRIMARY_UMAC		BIT(2)</div><div class='add'>+#define ATH12K_WMI_FLAG_MLO_LOGICAL_LINK_IDX_VALID	BIT(3)</div><div class='add'>+#define ATH12K_WMI_FLAG_MLO_PEER_ID_VALID		BIT(4)</div><div class='add'>+#define ATH12K_WMI_FLAG_MLO_MCAST_VDEV			BIT(5)</div><div class='add'>+#define ATH12K_WMI_FLAG_MLO_EMLSR_SUPPORT		BIT(6)</div><div class='add'>+#define ATH12K_WMI_FLAG_MLO_FORCED_INACTIVE		BIT(7)</div><div class='add'>+#define ATH12K_WMI_FLAG_MLO_LINK_ADD			BIT(8)</div><div class='add'>+</div><div class='add'>+struct wmi_vdev_start_mlo_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 flags;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_partner_link_info {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 hw_link_id;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params vdev_addr;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_vdev_delete_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_vdev_up_params {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 aid;</div><div class='add'>+	const u8 *bssid;</div><div class='add'>+	const u8 *tx_bssid;</div><div class='add'>+	u32 nontx_profile_idx;</div><div class='add'>+	u32 nontx_profile_cnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_vdev_up_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 vdev_assoc_id;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params vdev_bssid;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params tx_vdev_bssid;</div><div class='add'>+	__le32 nontx_profile_idx;</div><div class='add'>+	__le32 nontx_profile_cnt;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_vdev_stop_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_vdev_down_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_VDEV_START_HIDDEN_SSID  BIT(0)</div><div class='add'>+#define WMI_VDEV_START_PMF_ENABLED  BIT(1)</div><div class='add'>+#define WMI_VDEV_START_LDPC_RX_ENABLED BIT(3)</div><div class='add'>+</div><div class='add'>+#define ATH12K_WMI_SSID_LEN 32</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_ssid_params {</div><div class='add'>+	__le32 ssid_len;</div><div class='add'>+	u8 ssid[ATH12K_WMI_SSID_LEN];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_VDEV_SETUP_TIMEOUT_HZ (5 * HZ)</div><div class='add'>+</div><div class='add'>+enum wmi_vdev_mbssid_flags {</div><div class='add'>+	WMI_VDEV_MBSSID_FLAGS_NON_MBSSID_AP	= BIT(0),</div><div class='add'>+	WMI_VDEV_MBSSID_FLAGS_TRANSMIT_AP	= BIT(1),</div><div class='add'>+	WMI_VDEV_MBSSID_FLAGS_NON_TRANSMIT_AP	= BIT(2),</div><div class='add'>+	WMI_VDEV_MBSSID_FLAGS_EMA_MODE		= BIT(3),</div><div class='add'>+	WMI_VDEV_MBSSID_FLAGS_SCAN_MODE_VAP	= BIT(4),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_vdev_start_request_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 requestor_id;</div><div class='add'>+	__le32 beacon_interval;</div><div class='add'>+	__le32 dtim_period;</div><div class='add'>+	__le32 flags;</div><div class='add'>+	struct ath12k_wmi_ssid_params ssid;</div><div class='add'>+	__le32 bcn_tx_rate;</div><div class='add'>+	__le32 bcn_txpower;</div><div class='add'>+	__le32 num_noa_descriptors;</div><div class='add'>+	__le32 disable_hw_ack;</div><div class='add'>+	__le32 preferred_tx_streams;</div><div class='add'>+	__le32 preferred_rx_streams;</div><div class='add'>+	__le32 he_ops;</div><div class='add'>+	__le32 cac_duration_ms;</div><div class='add'>+	__le32 regdomain;</div><div class='add'>+	__le32 min_data_rate;</div><div class='add'>+	__le32 mbssid_flags; /* uses enum wmi_vdev_mbssid_flags */</div><div class='add'>+	__le32 mbssid_tx_vdev_id;</div><div class='add'>+	__le32 eht_ops;</div><div class='add'>+	__le32 punct_bitmap;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define MGMT_TX_DL_FRM_LEN		     64</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_channel_arg {</div><div class='add'>+	u8 chan_id;</div><div class='add'>+	u8 pwr;</div><div class='add'>+	u32 mhz;</div><div class='add'>+	u32 half_rate:1,</div><div class='add'>+	    quarter_rate:1,</div><div class='add'>+	    dfs_set:1,</div><div class='add'>+	    dfs_set_cfreq2:1,</div><div class='add'>+	    is_chan_passive:1,</div><div class='add'>+	    allow_ht:1,</div><div class='add'>+	    allow_vht:1,</div><div class='add'>+	    allow_he:1,</div><div class='add'>+	    set_agile:1,</div><div class='add'>+	    psc_channel:1;</div><div class='add'>+	u32 phy_mode;</div><div class='add'>+	u32 cfreq1;</div><div class='add'>+	u32 cfreq2;</div><div class='add'>+	char   maxpower;</div><div class='add'>+	char   minpower;</div><div class='add'>+	char   maxregpower;</div><div class='add'>+	u8  antennamax;</div><div class='add'>+	u8  reg_class_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_phy_mode {</div><div class='add'>+	MODE_11A        = 0,</div><div class='add'>+	MODE_11G        = 1,   /* 11b/g Mode */</div><div class='add'>+	MODE_11B        = 2,   /* 11b Mode */</div><div class='add'>+	MODE_11GONLY    = 3,   /* 11g only Mode */</div><div class='add'>+	MODE_11NA_HT20   = 4,</div><div class='add'>+	MODE_11NG_HT20   = 5,</div><div class='add'>+	MODE_11NA_HT40   = 6,</div><div class='add'>+	MODE_11NG_HT40   = 7,</div><div class='add'>+	MODE_11AC_VHT20 = 8,</div><div class='add'>+	MODE_11AC_VHT40 = 9,</div><div class='add'>+	MODE_11AC_VHT80 = 10,</div><div class='add'>+	MODE_11AC_VHT20_2G = 11,</div><div class='add'>+	MODE_11AC_VHT40_2G = 12,</div><div class='add'>+	MODE_11AC_VHT80_2G = 13,</div><div class='add'>+	MODE_11AC_VHT80_80 = 14,</div><div class='add'>+	MODE_11AC_VHT160 = 15,</div><div class='add'>+	MODE_11AX_HE20 = 16,</div><div class='add'>+	MODE_11AX_HE40 = 17,</div><div class='add'>+	MODE_11AX_HE80 = 18,</div><div class='add'>+	MODE_11AX_HE80_80 = 19,</div><div class='add'>+	MODE_11AX_HE160 = 20,</div><div class='add'>+	MODE_11AX_HE20_2G = 21,</div><div class='add'>+	MODE_11AX_HE40_2G = 22,</div><div class='add'>+	MODE_11AX_HE80_2G = 23,</div><div class='add'>+	MODE_11BE_EHT20 = 24,</div><div class='add'>+	MODE_11BE_EHT40 = 25,</div><div class='add'>+	MODE_11BE_EHT80 = 26,</div><div class='add'>+	MODE_11BE_EHT80_80 = 27,</div><div class='add'>+	MODE_11BE_EHT160 = 28,</div><div class='add'>+	MODE_11BE_EHT160_160 = 29,</div><div class='add'>+	MODE_11BE_EHT320 = 30,</div><div class='add'>+	MODE_11BE_EHT20_2G = 31,</div><div class='add'>+	MODE_11BE_EHT40_2G = 32,</div><div class='add'>+	MODE_UNKNOWN = 33,</div><div class='add'>+	MODE_MAX = 33,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_WMI_MLO_MAX_LINKS 4</div><div class='add'>+</div><div class='add'>+struct wmi_ml_partner_info {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 hw_link_id;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+	bool assoc_link;</div><div class='add'>+	bool primary_umac;</div><div class='add'>+	bool logical_link_idx_valid;</div><div class='add'>+	u32 logical_link_idx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_ml_arg {</div><div class='add'>+	bool enabled;</div><div class='add'>+	bool assoc_link;</div><div class='add'>+	bool mcast_link;</div><div class='add'>+	bool link_add;</div><div class='add'>+	u8 num_partner_links;</div><div class='add'>+	struct wmi_ml_partner_info partner_info[ATH12K_WMI_MLO_MAX_LINKS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_vdev_start_req_arg {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 freq;</div><div class='add'>+	u32 band_center_freq1;</div><div class='add'>+	u32 band_center_freq2;</div><div class='add'>+	bool passive;</div><div class='add'>+	bool allow_ibss;</div><div class='add'>+	bool allow_ht;</div><div class='add'>+	bool allow_vht;</div><div class='add'>+	bool ht40plus;</div><div class='add'>+	bool chan_radar;</div><div class='add'>+	bool freq2_radar;</div><div class='add'>+	bool allow_he;</div><div class='add'>+	u32 min_power;</div><div class='add'>+	u32 max_power;</div><div class='add'>+	u32 max_reg_power;</div><div class='add'>+	u32 max_antenna_gain;</div><div class='add'>+	enum wmi_phy_mode mode;</div><div class='add'>+	u32 bcn_intval;</div><div class='add'>+	u32 dtim_period;</div><div class='add'>+	u8 *ssid;</div><div class='add'>+	u32 ssid_len;</div><div class='add'>+	u32 bcn_tx_rate;</div><div class='add'>+	u32 bcn_tx_power;</div><div class='add'>+	bool disable_hw_ack;</div><div class='add'>+	bool hidden_ssid;</div><div class='add'>+	bool pmf_enabled;</div><div class='add'>+	u32 he_ops;</div><div class='add'>+	u32 cac_duration_ms;</div><div class='add'>+	u32 regdomain;</div><div class='add'>+	u32 pref_rx_streams;</div><div class='add'>+	u32 pref_tx_streams;</div><div class='add'>+	u32 num_noa_descriptors;</div><div class='add'>+	u32 min_data_rate;</div><div class='add'>+	u32 mbssid_flags;</div><div class='add'>+	u32 mbssid_tx_vdev_id;</div><div class='add'>+	u32 punct_bitmap;</div><div class='add'>+	struct wmi_ml_arg ml;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_peer_create_arg {</div><div class='add'>+	const u8 *peer_addr;</div><div class='add'>+	u32 peer_type;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	bool ml_enabled;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_peer_create_mlo_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_pdev_set_regdomain_arg {</div><div class='add'>+	u16 current_rd_in_use;</div><div class='add'>+	u16 current_rd_2g;</div><div class='add'>+	u16 current_rd_5g;</div><div class='add'>+	u32 ctl_2g;</div><div class='add'>+	u32 ctl_5g;</div><div class='add'>+	u8 dfs_domain;</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_rx_reorder_queue_remove_arg {</div><div class='add'>+	u8 *peer_macaddr;</div><div class='add'>+	u16 vdev_id;</div><div class='add'>+	u32 peer_tid_bitmap;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WMI_HOST_PDEV_ID_SOC 0xFF</div><div class='add'>+#define WMI_HOST_PDEV_ID_0   0</div><div class='add'>+#define WMI_HOST_PDEV_ID_1   1</div><div class='add'>+#define WMI_HOST_PDEV_ID_2   2</div><div class='add'>+</div><div class='add'>+#define WMI_PDEV_ID_SOC         0</div><div class='add'>+#define WMI_PDEV_ID_1ST         1</div><div class='add'>+#define WMI_PDEV_ID_2ND         2</div><div class='add'>+#define WMI_PDEV_ID_3RD         3</div><div class='add'>+</div><div class='add'>+/* Freq units in MHz */</div><div class='add'>+#define REG_RULE_START_FREQ			0x0000ffff</div><div class='add'>+#define REG_RULE_END_FREQ			0xffff0000</div><div class='add'>+#define REG_RULE_FLAGS				0x0000ffff</div><div class='add'>+#define REG_RULE_MAX_BW				0x0000ffff</div><div class='add'>+#define REG_RULE_REG_PWR			0x00ff0000</div><div class='add'>+#define REG_RULE_ANT_GAIN			0xff000000</div><div class='add'>+#define REG_RULE_PSD_INFO			BIT(2)</div><div class='add'>+#define REG_RULE_PSD_EIRP			0xffff0000</div><div class='add'>+</div><div class='add'>+#define WMI_VDEV_PARAM_TXBF_SU_TX_BFEE BIT(0)</div><div class='add'>+#define WMI_VDEV_PARAM_TXBF_MU_TX_BFEE BIT(1)</div><div class='add'>+#define WMI_VDEV_PARAM_TXBF_SU_TX_BFER BIT(2)</div><div class='add'>+#define WMI_VDEV_PARAM_TXBF_MU_TX_BFER BIT(3)</div><div class='add'>+</div><div class='add'>+#define HE_MODE_SU_TX_BFEE	BIT(0)</div><div class='add'>+#define HE_MODE_SU_TX_BFER	BIT(1)</div><div class='add'>+#define HE_MODE_MU_TX_BFEE	BIT(2)</div><div class='add'>+#define HE_MODE_MU_TX_BFER	BIT(3)</div><div class='add'>+#define HE_MODE_DL_OFDMA	BIT(4)</div><div class='add'>+#define HE_MODE_UL_OFDMA	BIT(5)</div><div class='add'>+#define HE_MODE_UL_MUMIMO	BIT(6)</div><div class='add'>+</div><div class='add'>+#define HE_DL_MUOFDMA_ENABLE	1</div><div class='add'>+#define HE_UL_MUOFDMA_ENABLE	1</div><div class='add'>+#define HE_DL_MUMIMO_ENABLE	1</div><div class='add'>+#define HE_UL_MUMIMO_ENABLE	1</div><div class='add'>+#define HE_MU_BFEE_ENABLE	1</div><div class='add'>+#define HE_SU_BFEE_ENABLE	1</div><div class='add'>+#define HE_MU_BFER_ENABLE	1</div><div class='add'>+#define HE_SU_BFER_ENABLE	1</div><div class='add'>+</div><div class='add'>+#define EHT_MODE_SU_TX_BFEE		BIT(0)</div><div class='add'>+#define EHT_MODE_SU_TX_BFER		BIT(1)</div><div class='add'>+#define EHT_MODE_MU_TX_BFEE		BIT(2)</div><div class='add'>+#define EHT_MODE_MU_TX_BFER		BIT(3)</div><div class='add'>+#define EHT_MODE_DL_OFDMA		BIT(4)</div><div class='add'>+#define EHT_MODE_UL_OFDMA		BIT(5)</div><div class='add'>+#define EHT_MODE_MUMIMO			BIT(6)</div><div class='add'>+#define EHT_MODE_DL_OFDMA_TXBF		BIT(7)</div><div class='add'>+#define EHT_MODE_DL_OFDMA_MUMIMO	BIT(8)</div><div class='add'>+#define EHT_MODE_UL_OFDMA_MUMIMO	BIT(9)</div><div class='add'>+</div><div class='add'>+#define EHT_DL_MUOFDMA_ENABLE    1</div><div class='add'>+#define EHT_UL_MUOFDMA_ENABLE    1</div><div class='add'>+#define EHT_DL_MUMIMO_ENABLE     1</div><div class='add'>+#define EHT_UL_MUMIMO_ENABLE     1</div><div class='add'>+#define EHT_MU_BFEE_ENABLE       1</div><div class='add'>+#define EHT_SU_BFEE_ENABLE       1</div><div class='add'>+#define EHT_MU_BFER_ENABLE       1</div><div class='add'>+#define EHT_SU_BFER_ENABLE       1</div><div class='add'>+</div><div class='add'>+#define HE_VHT_SOUNDING_MODE_ENABLE		1</div><div class='add'>+#define HE_SU_MU_SOUNDING_MODE_ENABLE		1</div><div class='add'>+#define HE_TRIG_NONTRIG_SOUNDING_MODE_ENABLE	1</div><div class='add'>+</div><div class='add'>+/* HE or VHT Sounding */</div><div class='add'>+#define HE_VHT_SOUNDING_MODE		BIT(0)</div><div class='add'>+/* SU or MU Sounding */</div><div class='add'>+#define HE_SU_MU_SOUNDING_MODE		BIT(2)</div><div class='add'>+/* Trig or Non-Trig Sounding */</div><div class='add'>+#define HE_TRIG_NONTRIG_SOUNDING_MODE	BIT(3)</div><div class='add'>+</div><div class='add'>+#define WMI_TXBF_STS_CAP_OFFSET_LSB	4</div><div class='add'>+#define WMI_TXBF_STS_CAP_OFFSET_MASK	0x70</div><div class='add'>+#define WMI_BF_SOUND_DIM_OFFSET_LSB	8</div><div class='add'>+#define WMI_BF_SOUND_DIM_OFFSET_MASK	0x700</div><div class='add'>+</div><div class='add'>+enum wmi_peer_type {</div><div class='add'>+	WMI_PEER_TYPE_DEFAULT = 0,</div><div class='add'>+	WMI_PEER_TYPE_BSS = 1,</div><div class='add'>+	WMI_PEER_TYPE_TDLS = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_peer_create_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params peer_macaddr;</div><div class='add'>+	__le32 peer_type;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_peer_delete_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params peer_macaddr;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_peer_reorder_queue_setup_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params peer_macaddr;</div><div class='add'>+	__le32 tid;</div><div class='add'>+	__le32 queue_ptr_lo;</div><div class='add'>+	__le32 queue_ptr_hi;</div><div class='add'>+	__le32 queue_no;</div><div class='add'>+	__le32 ba_window_size_valid;</div><div class='add'>+	__le32 ba_window_size;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_peer_reorder_queue_remove_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params peer_macaddr;</div><div class='add'>+	__le32 tid_mask;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum wmi_bss_chan_info_req_type {</div><div class='add'>+	WMI_BSS_SURVEY_REQ_TYPE_READ = 1,</div><div class='add'>+	WMI_BSS_SURVEY_REQ_TYPE_READ_CLEAR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_pdev_set_param_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 param_id;</div><div class='add'>+	__le32 param_value;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_pdev_set_ps_mode_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 sta_ps_mode;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_pdev_suspend_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 suspend_opt;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_pdev_resume_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_pdev_bss_chan_info_req_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	/* ref wmi_bss_chan_info_req_type */</div><div class='add'>+	__le32 req_type;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_ap_ps_peer_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params peer_macaddr;</div><div class='add'>+	__le32 param;</div><div class='add'>+	__le32 value;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_sta_powersave_param_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 param;</div><div class='add'>+	__le32 value;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_pdev_set_regdomain_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 reg_domain;</div><div class='add'>+	__le32 reg_domain_2g;</div><div class='add'>+	__le32 reg_domain_5g;</div><div class='add'>+	__le32 conformance_test_limit_2g;</div><div class='add'>+	__le32 conformance_test_limit_5g;</div><div class='add'>+	__le32 dfs_domain;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_peer_set_param_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params peer_macaddr;</div><div class='add'>+	__le32 param_id;</div><div class='add'>+	__le32 param_value;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_peer_flush_tids_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params peer_macaddr;</div><div class='add'>+	__le32 peer_tid_bitmap;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_dfs_phyerr_offload_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_bcn_offload_ctrl_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 bcn_ctrl_op;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum scan_dwelltime_adaptive_mode {</div><div class='add'>+	SCAN_DWELL_MODE_DEFAULT = 0,</div><div class='add'>+	SCAN_DWELL_MODE_CONSERVATIVE = 1,</div><div class='add'>+	SCAN_DWELL_MODE_MODERATE = 2,</div><div class='add'>+	SCAN_DWELL_MODE_AGGRESSIVE = 3,</div><div class='add'>+	SCAN_DWELL_MODE_STATIC = 4</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WLAN_SCAN_MAX_NUM_SSID          10</div><div class='add'>+#define WLAN_SCAN_MAX_NUM_BSSID         10</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_element_info_arg {</div><div class='add'>+	u32 len;</div><div class='add'>+	u8 *ptr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WMI_IE_BITMAP_SIZE             8</div><div class='add'>+</div><div class='add'>+#define WMI_SCAN_MAX_NUM_SSID                0x0A</div><div class='add'>+/* prefix used by scan requestor ids on the host */</div><div class='add'>+#define WMI_HOST_SCAN_REQUESTOR_ID_PREFIX 0xA000</div><div class='add'>+</div><div class='add'>+/* prefix used by scan request ids generated on the host */</div><div class='add'>+/* host cycles through the lower 12 bits to generate ids */</div><div class='add'>+#define WMI_HOST_SCAN_REQ_ID_PREFIX 0xA000</div><div class='add'>+</div><div class='add'>+#define WLAN_SCAN_PARAMS_MAX_SSID    16</div><div class='add'>+#define WLAN_SCAN_PARAMS_MAX_BSSID   4</div><div class='add'>+#define WLAN_SCAN_PARAMS_MAX_IE_LEN  512</div><div class='add'>+</div><div class='add'>+/* Values lower than this may be refused by some firmware revisions with a scan</div><div class='add'>+ * completion with a timedout reason.</div><div class='add'>+ */</div><div class='add'>+#define WMI_SCAN_CHAN_MIN_TIME_MSEC 40</div><div class='add'>+</div><div class='add'>+/* Scan priority numbers must be sequential, starting with 0 */</div><div class='add'>+enum wmi_scan_priority {</div><div class='add'>+	WMI_SCAN_PRIORITY_VERY_LOW = 0,</div><div class='add'>+	WMI_SCAN_PRIORITY_LOW,</div><div class='add'>+	WMI_SCAN_PRIORITY_MEDIUM,</div><div class='add'>+	WMI_SCAN_PRIORITY_HIGH,</div><div class='add'>+	WMI_SCAN_PRIORITY_VERY_HIGH,</div><div class='add'>+	WMI_SCAN_PRIORITY_COUNT   /* number of priorities supported */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_scan_event_type {</div><div class='add'>+	WMI_SCAN_EVENT_STARTED              = BIT(0),</div><div class='add'>+	WMI_SCAN_EVENT_COMPLETED            = BIT(1),</div><div class='add'>+	WMI_SCAN_EVENT_BSS_CHANNEL          = BIT(2),</div><div class='add'>+	WMI_SCAN_EVENT_FOREIGN_CHAN         = BIT(3),</div><div class='add'>+	WMI_SCAN_EVENT_DEQUEUED             = BIT(4),</div><div class='add'>+	/* possibly by high-prio scan */</div><div class='add'>+	WMI_SCAN_EVENT_PREEMPTED            = BIT(5),</div><div class='add'>+	WMI_SCAN_EVENT_START_FAILED         = BIT(6),</div><div class='add'>+	WMI_SCAN_EVENT_RESTARTED            = BIT(7),</div><div class='add'>+	WMI_SCAN_EVENT_FOREIGN_CHAN_EXIT    = BIT(8),</div><div class='add'>+	WMI_SCAN_EVENT_SUSPENDED            = BIT(9),</div><div class='add'>+	WMI_SCAN_EVENT_RESUMED              = BIT(10),</div><div class='add'>+	WMI_SCAN_EVENT_MAX                  = BIT(15),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_scan_completion_reason {</div><div class='add'>+	WMI_SCAN_REASON_COMPLETED,</div><div class='add'>+	WMI_SCAN_REASON_CANCELLED,</div><div class='add'>+	WMI_SCAN_REASON_PREEMPTED,</div><div class='add'>+	WMI_SCAN_REASON_TIMEDOUT,</div><div class='add'>+	WMI_SCAN_REASON_INTERNAL_FAILURE,</div><div class='add'>+	WMI_SCAN_REASON_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct  wmi_start_scan_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 scan_id;</div><div class='add'>+	__le32 scan_req_id;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 scan_priority;</div><div class='add'>+	__le32 notify_scan_events;</div><div class='add'>+	__le32 dwell_time_active;</div><div class='add'>+	__le32 dwell_time_passive;</div><div class='add'>+	__le32 min_rest_time;</div><div class='add'>+	__le32 max_rest_time;</div><div class='add'>+	__le32 repeat_probe_time;</div><div class='add'>+	__le32 probe_spacing_time;</div><div class='add'>+	__le32 idle_time;</div><div class='add'>+	__le32 max_scan_time;</div><div class='add'>+	__le32 probe_delay;</div><div class='add'>+	__le32 scan_ctrl_flags;</div><div class='add'>+	__le32 burst_duration;</div><div class='add'>+	__le32 num_chan;</div><div class='add'>+	__le32 num_bssid;</div><div class='add'>+	__le32 num_ssids;</div><div class='add'>+	__le32 ie_len;</div><div class='add'>+	__le32 n_probes;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params mac_addr;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params mac_mask;</div><div class='add'>+	u32 ie_bitmap[WMI_IE_BITMAP_SIZE];</div><div class='add'>+	__le32 num_vendor_oui;</div><div class='add'>+	__le32 scan_ctrl_flags_ext;</div><div class='add'>+	__le32 dwell_time_active_2g;</div><div class='add'>+	__le32 dwell_time_active_6g;</div><div class='add'>+	__le32 dwell_time_passive_6g;</div><div class='add'>+	__le32 scan_start_offset;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_SCAN_FLAG_PASSIVE        0x1</div><div class='add'>+#define WMI_SCAN_ADD_BCAST_PROBE_REQ 0x2</div><div class='add'>+#define WMI_SCAN_ADD_CCK_RATES       0x4</div><div class='add'>+#define WMI_SCAN_ADD_OFDM_RATES      0x8</div><div class='add'>+#define WMI_SCAN_CHAN_STAT_EVENT     0x10</div><div class='add'>+#define WMI_SCAN_FILTER_PROBE_REQ    0x20</div><div class='add'>+#define WMI_SCAN_BYPASS_DFS_CHN      0x40</div><div class='add'>+#define WMI_SCAN_CONTINUE_ON_ERROR   0x80</div><div class='add'>+#define WMI_SCAN_FILTER_PROMISCUOS   0x100</div><div class='add'>+#define WMI_SCAN_FLAG_FORCE_ACTIVE_ON_DFS 0x200</div><div class='add'>+#define WMI_SCAN_ADD_TPC_IE_IN_PROBE_REQ  0x400</div><div class='add'>+#define WMI_SCAN_ADD_DS_IE_IN_PROBE_REQ   0x800</div><div class='add'>+#define WMI_SCAN_ADD_SPOOF_MAC_IN_PROBE_REQ   0x1000</div><div class='add'>+#define WMI_SCAN_OFFCHAN_MGMT_TX    0x2000</div><div class='add'>+#define WMI_SCAN_OFFCHAN_DATA_TX    0x4000</div><div class='add'>+#define WMI_SCAN_CAPTURE_PHY_ERROR  0x8000</div><div class='add'>+#define WMI_SCAN_FLAG_STRICT_PASSIVE_ON_PCHN 0x10000</div><div class='add'>+#define WMI_SCAN_FLAG_HALF_RATE_SUPPORT      0x20000</div><div class='add'>+#define WMI_SCAN_FLAG_QUARTER_RATE_SUPPORT   0x40000</div><div class='add'>+#define WMI_SCAN_RANDOM_SEQ_NO_IN_PROBE_REQ 0x80000</div><div class='add'>+#define WMI_SCAN_ENABLE_IE_WHTELIST_IN_PROBE_REQ 0x100000</div><div class='add'>+</div><div class='add'>+#define WMI_SCAN_DWELL_MODE_MASK GENMASK(23, 21)</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	WMI_SCAN_DWELL_MODE_DEFAULT      = 0,</div><div class='add'>+	WMI_SCAN_DWELL_MODE_CONSERVATIVE = 1,</div><div class='add'>+	WMI_SCAN_DWELL_MODE_MODERATE     = 2,</div><div class='add'>+	WMI_SCAN_DWELL_MODE_AGGRESSIVE   = 3,</div><div class='add'>+	WMI_SCAN_DWELL_MODE_STATIC       = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_hint_short_ssid_arg {</div><div class='add'>+	u32 freq_flags;</div><div class='add'>+	u32 short_ssid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_hint_bssid_arg {</div><div class='add'>+	u32 freq_flags;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params bssid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_scan_req_arg {</div><div class='add'>+	u32 scan_id;</div><div class='add'>+	u32 scan_req_id;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+	enum wmi_scan_priority scan_priority;</div><div class='add'>+	u32 scan_ev_started:1,</div><div class='add'>+	    scan_ev_completed:1,</div><div class='add'>+	    scan_ev_bss_chan:1,</div><div class='add'>+	    scan_ev_foreign_chan:1,</div><div class='add'>+	    scan_ev_dequeued:1,</div><div class='add'>+	    scan_ev_preempted:1,</div><div class='add'>+	    scan_ev_start_failed:1,</div><div class='add'>+	    scan_ev_restarted:1,</div><div class='add'>+	    scan_ev_foreign_chn_exit:1,</div><div class='add'>+	    scan_ev_invalid:1,</div><div class='add'>+	    scan_ev_gpio_timeout:1,</div><div class='add'>+	    scan_ev_suspended:1,</div><div class='add'>+	    scan_ev_resumed:1;</div><div class='add'>+	u32 dwell_time_active;</div><div class='add'>+	u32 dwell_time_active_2g;</div><div class='add'>+	u32 dwell_time_passive;</div><div class='add'>+	u32 dwell_time_active_6g;</div><div class='add'>+	u32 dwell_time_passive_6g;</div><div class='add'>+	u32 min_rest_time;</div><div class='add'>+	u32 max_rest_time;</div><div class='add'>+	u32 repeat_probe_time;</div><div class='add'>+	u32 probe_spacing_time;</div><div class='add'>+	u32 idle_time;</div><div class='add'>+	u32 max_scan_time;</div><div class='add'>+	u32 probe_delay;</div><div class='add'>+	u32 scan_f_passive:1,</div><div class='add'>+	    scan_f_bcast_probe:1,</div><div class='add'>+	    scan_f_cck_rates:1,</div><div class='add'>+	    scan_f_ofdm_rates:1,</div><div class='add'>+	    scan_f_chan_stat_evnt:1,</div><div class='add'>+	    scan_f_filter_prb_req:1,</div><div class='add'>+	    scan_f_bypass_dfs_chn:1,</div><div class='add'>+	    scan_f_continue_on_err:1,</div><div class='add'>+	    scan_f_offchan_mgmt_tx:1,</div><div class='add'>+	    scan_f_offchan_data_tx:1,</div><div class='add'>+	    scan_f_promisc_mode:1,</div><div class='add'>+	    scan_f_capture_phy_err:1,</div><div class='add'>+	    scan_f_strict_passive_pch:1,</div><div class='add'>+	    scan_f_half_rate:1,</div><div class='add'>+	    scan_f_quarter_rate:1,</div><div class='add'>+	    scan_f_force_active_dfs_chn:1,</div><div class='add'>+	    scan_f_add_tpc_ie_in_probe:1,</div><div class='add'>+	    scan_f_add_ds_ie_in_probe:1,</div><div class='add'>+	    scan_f_add_spoofed_mac_in_probe:1,</div><div class='add'>+	    scan_f_add_rand_seq_in_probe:1,</div><div class='add'>+	    scan_f_en_ie_whitelist_in_probe:1,</div><div class='add'>+	    scan_f_forced:1,</div><div class='add'>+	    scan_f_2ghz:1,</div><div class='add'>+	    scan_f_5ghz:1,</div><div class='add'>+	    scan_f_80mhz:1;</div><div class='add'>+	enum scan_dwelltime_adaptive_mode adaptive_dwell_time_mode;</div><div class='add'>+	u32 burst_duration;</div><div class='add'>+	u32 num_chan;</div><div class='add'>+	u32 num_bssid;</div><div class='add'>+	u32 num_ssids;</div><div class='add'>+	u32 n_probes;</div><div class='add'>+	u32 *chan_list;</div><div class='add'>+	u32 notify_scan_events;</div><div class='add'>+	struct cfg80211_ssid ssid[WLAN_SCAN_MAX_NUM_SSID];</div><div class='add'>+	struct ath12k_wmi_mac_addr_params bssid_list[WLAN_SCAN_MAX_NUM_BSSID];</div><div class='add'>+	struct ath12k_wmi_element_info_arg extraie;</div><div class='add'>+	u32 num_hint_s_ssid;</div><div class='add'>+	u32 num_hint_bssid;</div><div class='add'>+	struct ath12k_wmi_hint_short_ssid_arg hint_s_ssid[WLAN_SCAN_MAX_HINT_S_SSID];</div><div class='add'>+	struct ath12k_wmi_hint_bssid_arg hint_bssid[WLAN_SCAN_MAX_HINT_BSSID];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_ssid_arg {</div><div class='add'>+	int len;</div><div class='add'>+	const u8 *ssid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_bssid_arg {</div><div class='add'>+	const u8 *bssid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WMI_SCAN_STOP_ONE       0x00000000</div><div class='add'>+#define WMI_SCAN_STOP_VAP_ALL   0x01000000</div><div class='add'>+#define WMI_SCAN_STOP_ALL       0x04000000</div><div class='add'>+</div><div class='add'>+/* Prefix 0xA000 indicates that the scan request</div><div class='add'>+ * is trigger by HOST</div><div class='add'>+ */</div><div class='add'>+#define ATH12K_SCAN_ID          0xA000</div><div class='add'>+</div><div class='add'>+enum scan_cancel_req_type {</div><div class='add'>+	WLAN_SCAN_CANCEL_SINGLE = 1,</div><div class='add'>+	WLAN_SCAN_CANCEL_VDEV_ALL,</div><div class='add'>+	WLAN_SCAN_CANCEL_PDEV_ALL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_scan_cancel_arg {</div><div class='add'>+	u32 requester;</div><div class='add'>+	u32 scan_id;</div><div class='add'>+	enum scan_cancel_req_type req_type;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WMI_CHAN_INFO_MODE		GENMASK(5, 0)</div><div class='add'>+#define WMI_CHAN_INFO_HT40_PLUS		BIT(6)</div><div class='add'>+#define WMI_CHAN_INFO_PASSIVE		BIT(7)</div><div class='add'>+#define WMI_CHAN_INFO_ADHOC_ALLOWED	BIT(8)</div><div class='add'>+#define WMI_CHAN_INFO_AP_DISABLED	BIT(9)</div><div class='add'>+#define WMI_CHAN_INFO_DFS		BIT(10)</div><div class='add'>+#define WMI_CHAN_INFO_ALLOW_HT		BIT(11)</div><div class='add'>+#define WMI_CHAN_INFO_ALLOW_VHT		BIT(12)</div><div class='add'>+#define WMI_CHAN_INFO_CHAN_CHANGE_CAUSE_CSA	BIT(13)</div><div class='add'>+#define WMI_CHAN_INFO_HALF_RATE		BIT(14)</div><div class='add'>+#define WMI_CHAN_INFO_QUARTER_RATE	BIT(15)</div><div class='add'>+#define WMI_CHAN_INFO_DFS_FREQ2		BIT(16)</div><div class='add'>+#define WMI_CHAN_INFO_ALLOW_HE		BIT(17)</div><div class='add'>+#define WMI_CHAN_INFO_PSC		BIT(18)</div><div class='add'>+</div><div class='add'>+#define WMI_CHAN_REG_INFO1_MIN_PWR	GENMASK(7, 0)</div><div class='add'>+#define WMI_CHAN_REG_INFO1_MAX_PWR	GENMASK(15, 8)</div><div class='add'>+#define WMI_CHAN_REG_INFO1_MAX_REG_PWR	GENMASK(23, 16)</div><div class='add'>+#define WMI_CHAN_REG_INFO1_REG_CLS	GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+#define WMI_CHAN_REG_INFO2_ANT_MAX	GENMASK(7, 0)</div><div class='add'>+#define WMI_CHAN_REG_INFO2_MAX_TX_PWR	GENMASK(15, 8)</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_channel_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 mhz;</div><div class='add'>+	__le32 band_center_freq1;</div><div class='add'>+	__le32 band_center_freq2;</div><div class='add'>+	__le32 info;</div><div class='add'>+	__le32 reg_info_1;</div><div class='add'>+	__le32 reg_info_2;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum wmi_sta_ps_mode {</div><div class='add'>+	WMI_STA_PS_MODE_DISABLED = 0,</div><div class='add'>+	WMI_STA_PS_MODE_ENABLED = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WMI_SMPS_MASK_LOWER_16BITS 0xFF</div><div class='add'>+#define WMI_SMPS_MASK_UPPER_3BITS 0x7</div><div class='add'>+#define WMI_SMPS_PARAM_VALUE_SHIFT 29</div><div class='add'>+</div><div class='add'>+#define ATH12K_WMI_FW_HANG_ASSERT_TYPE 1</div><div class='add'>+#define ATH12K_WMI_FW_HANG_DELAY 0</div><div class='add'>+</div><div class='add'>+/* type, 0:unused 1: ASSERT 2: not respond detect command</div><div class='add'>+ * delay_time_ms, the simulate will delay time</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct wmi_force_fw_hang_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 type;</div><div class='add'>+	__le32 delay_time_ms;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* Param values to be sent for WMI_VDEV_PARAM_SGI param_id</div><div class='add'>+ * which are used in 11n, 11ac systems</div><div class='add'>+ * @WMI_GI_800_NS - Always uses 0.8us (Long GI)</div><div class='add'>+ * @WMI_GI_400_NS - Firmware switches between 0.4us (Short GI)</div><div class='add'>+ *			and 0.8us (Long GI) based on packet error rate.</div><div class='add'>+ */</div><div class='add'>+#define WMI_GI_800_NS 0</div><div class='add'>+#define WMI_GI_400_NS 1</div><div class='add'>+</div><div class='add'>+struct wmi_vdev_set_param_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 param_id;</div><div class='add'>+	__le32 param_value;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_get_pdev_temperature_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 param;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_P2P_MAX_NOA_DESCRIPTORS		4</div><div class='add'>+</div><div class='add'>+struct wmi_p2p_noa_event {</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_p2p_noa_descriptor {</div><div class='add'>+	__le32 type_count; /* 255: continuous schedule, 0: reserved */</div><div class='add'>+	__le32 duration;  /* Absent period duration in micro seconds */</div><div class='add'>+	__le32 interval;   /* Absent period interval in micro seconds */</div><div class='add'>+	__le32 start_time; /* 32 bit tsf time when in starts */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_P2P_NOA_INFO_CHANGED_FLAG		BIT(0)</div><div class='add'>+#define WMI_P2P_NOA_INFO_INDEX			GENMASK(15, 8)</div><div class='add'>+#define WMI_P2P_NOA_INFO_OPP_PS			BIT(16)</div><div class='add'>+#define WMI_P2P_NOA_INFO_CTWIN_TU		GENMASK(23, 17)</div><div class='add'>+#define WMI_P2P_NOA_INFO_DESC_NUM		GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_p2p_noa_info {</div><div class='add'>+	/* Bit 0 - Flag to indicate an update in NOA schedule</div><div class='add'>+	 * Bits 7-1 - Reserved</div><div class='add'>+	 * Bits 15-8 - Index (identifies the instance of NOA sub element)</div><div class='add'>+	 * Bit  16 - Opp PS state of the AP</div><div class='add'>+	 * Bits 23-17 -  Ctwindow in TUs</div><div class='add'>+	 * Bits 31-24 -  Number of NOA descriptors</div><div class='add'>+	 */</div><div class='add'>+	__le32 noa_attr;</div><div class='add'>+	struct ath12k_wmi_p2p_noa_descriptor descriptors[WMI_P2P_MAX_NOA_DESCRIPTORS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define MAX_WMI_UTF_LEN 252</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_ftm_seg_hdr_params {</div><div class='add'>+	__le32 len;</div><div class='add'>+	__le32 msgref;</div><div class='add'>+	__le32 segmentinfo;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_ftm_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	struct ath12k_wmi_ftm_seg_hdr_params seg_hdr;</div><div class='add'>+	u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_ftm_event {</div><div class='add'>+	struct ath12k_wmi_ftm_seg_hdr_params seg_hdr;</div><div class='add'>+	u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_BEACON_TX_BUFFER_SIZE	512</div><div class='add'>+</div><div class='add'>+#define WMI_EMA_BEACON_CNT      GENMASK(7, 0)</div><div class='add'>+#define WMI_EMA_BEACON_IDX      GENMASK(15, 8)</div><div class='add'>+#define WMI_EMA_BEACON_FIRST    GENMASK(23, 16)</div><div class='add'>+#define WMI_EMA_BEACON_LAST     GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+#define WMI_BEACON_PROTECTION_EN_BIT	BIT(0)</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_bcn_tmpl_ema_arg {</div><div class='add'>+	u8 bcn_cnt;</div><div class='add'>+	u8 bcn_index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_bcn_tmpl_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 tim_ie_offset;</div><div class='add'>+	__le32 buf_len;</div><div class='add'>+	__le32 csa_switch_count_offset;</div><div class='add'>+	__le32 ext_csa_switch_count_offset;</div><div class='add'>+	__le32 csa_event_bitmap;</div><div class='add'>+	__le32 mbssid_ie_offset;</div><div class='add'>+	__le32 esp_ie_offset;</div><div class='add'>+	__le32 csc_switch_count_offset;</div><div class='add'>+	__le32 csc_event_bitmap;</div><div class='add'>+	__le32 mu_edca_ie_offset;</div><div class='add'>+	__le32 feature_enable_bitmap;</div><div class='add'>+	__le32 ema_params;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_p2p_go_set_beacon_ie_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 ie_buf_len;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_vdev_install_key_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params peer_macaddr;</div><div class='add'>+	__le32 key_idx;</div><div class='add'>+	__le32 key_flags;</div><div class='add'>+	__le32 key_cipher;</div><div class='add'>+	__le64 key_rsc_counter;</div><div class='add'>+	__le64 key_global_rsc_counter;</div><div class='add'>+	__le64 key_tsc_counter;</div><div class='add'>+	u8 wpi_key_rsc_counter[16];</div><div class='add'>+	u8 wpi_key_tsc_counter[16];</div><div class='add'>+	__le32 key_len;</div><div class='add'>+	__le32 key_txmic_len;</div><div class='add'>+	__le32 key_rxmic_len;</div><div class='add'>+	__le32 is_group_key_id_valid;</div><div class='add'>+	__le32 group_key_id;</div><div class='add'>+</div><div class='add'>+	/* Followed by key_data containing key followed by</div><div class='add'>+	 * tx mic and then rx mic</div><div class='add'>+	 */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_vdev_install_key_arg {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	const u8 *macaddr;</div><div class='add'>+	u32 key_idx;</div><div class='add'>+	u32 key_flags;</div><div class='add'>+	u32 key_cipher;</div><div class='add'>+	u32 ieee80211_key_cipher;</div><div class='add'>+	u32 key_len;</div><div class='add'>+	u32 key_txmic_len;</div><div class='add'>+	u32 key_rxmic_len;</div><div class='add'>+	u64 key_rsc_counter;</div><div class='add'>+	const void *key_data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WMI_MAX_SUPPORTED_RATES			128</div><div class='add'>+#define WMI_HOST_MAX_HECAP_PHY_SIZE		3</div><div class='add'>+#define WMI_HOST_MAX_HE_RATE_SET		3</div><div class='add'>+#define WMI_HECAP_TXRX_MCS_NSS_IDX_80		0</div><div class='add'>+#define WMI_HECAP_TXRX_MCS_NSS_IDX_160		1</div><div class='add'>+</div><div class='add'>+#define ATH12K_WMI_MLO_MAX_PARTNER_LINKS \</div><div class='add'>+	(ATH12K_WMI_MLO_MAX_LINKS + ATH12K_MAX_NUM_BRIDGE_LINKS - 1)</div><div class='add'>+</div><div class='add'>+struct peer_assoc_mlo_params {</div><div class='add'>+	bool enabled;</div><div class='add'>+	bool assoc_link;</div><div class='add'>+	bool primary_umac;</div><div class='add'>+	bool peer_id_valid;</div><div class='add'>+	bool logical_link_idx_valid;</div><div class='add'>+	bool bridge_peer;</div><div class='add'>+	u8 mld_addr[ETH_ALEN];</div><div class='add'>+	u32 logical_link_idx;</div><div class='add'>+	u32 ml_peer_id;</div><div class='add'>+	u32 ieee_link_id;</div><div class='add'>+	u8 num_partner_links;</div><div class='add'>+	struct wmi_ml_partner_info partner_info[ATH12K_WMI_MLO_MAX_LINKS];</div><div class='add'>+	u16 eml_cap;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_rate_set_arg {</div><div class='add'>+	u32 num_rates;</div><div class='add'>+	u8 rates[WMI_MAX_SUPPORTED_RATES];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_peer_assoc_arg {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 peer_new_assoc;</div><div class='add'>+	u32 peer_associd;</div><div class='add'>+	u32 peer_flags;</div><div class='add'>+	u32 peer_caps;</div><div class='add'>+	u32 peer_listen_intval;</div><div class='add'>+	u32 peer_ht_caps;</div><div class='add'>+	u32 peer_max_mpdu;</div><div class='add'>+	u32 peer_mpdu_density;</div><div class='add'>+	u32 peer_rate_caps;</div><div class='add'>+	u32 peer_nss;</div><div class='add'>+	u32 peer_vht_caps;</div><div class='add'>+	u32 peer_phymode;</div><div class='add'>+	u32 peer_ht_info[2];</div><div class='add'>+	struct wmi_rate_set_arg peer_legacy_rates;</div><div class='add'>+	struct wmi_rate_set_arg peer_ht_rates;</div><div class='add'>+	u32 rx_max_rate;</div><div class='add'>+	u32 rx_mcs_set;</div><div class='add'>+	u32 tx_max_rate;</div><div class='add'>+	u32 tx_mcs_set;</div><div class='add'>+	u8 vht_capable;</div><div class='add'>+	u8 min_data_rate;</div><div class='add'>+	u32 tx_max_mcs_nss;</div><div class='add'>+	u32 peer_bw_rxnss_override;</div><div class='add'>+	bool is_pmf_enabled;</div><div class='add'>+	bool is_wme_set;</div><div class='add'>+	bool qos_flag;</div><div class='add'>+	bool apsd_flag;</div><div class='add'>+	bool ht_flag;</div><div class='add'>+	bool bw_40;</div><div class='add'>+	bool bw_80;</div><div class='add'>+	bool bw_160;</div><div class='add'>+	bool bw_320;</div><div class='add'>+	bool stbc_flag;</div><div class='add'>+	bool ldpc_flag;</div><div class='add'>+	bool static_mimops_flag;</div><div class='add'>+	bool dynamic_mimops_flag;</div><div class='add'>+	bool spatial_mux_flag;</div><div class='add'>+	bool vht_flag;</div><div class='add'>+	bool vht_ng_flag;</div><div class='add'>+	bool need_ptk_4_way;</div><div class='add'>+	bool need_gtk_2_way;</div><div class='add'>+	bool auth_flag;</div><div class='add'>+	bool safe_mode_enabled;</div><div class='add'>+	bool amsdu_disable;</div><div class='add'>+	/* Use common structure */</div><div class='add'>+	u8 peer_mac[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+	bool he_flag;</div><div class='add'>+	u32 peer_he_cap_macinfo[2];</div><div class='add'>+	u32 peer_he_cap_macinfo_internal;</div><div class='add'>+	u32 peer_he_caps_6ghz;</div><div class='add'>+	u32 peer_he_ops;</div><div class='add'>+	u32 peer_he_cap_phyinfo[WMI_HOST_MAX_HECAP_PHY_SIZE];</div><div class='add'>+	u32 peer_he_mcs_count;</div><div class='add'>+	u32 peer_he_rx_mcs_set[WMI_HOST_MAX_HE_RATE_SET];</div><div class='add'>+	u32 peer_he_tx_mcs_set[WMI_HOST_MAX_HE_RATE_SET];</div><div class='add'>+	bool twt_responder;</div><div class='add'>+	bool twt_requester;</div><div class='add'>+	struct ath12k_wmi_ppe_threshold_arg peer_ppet;</div><div class='add'>+	bool eht_flag;</div><div class='add'>+	u32 peer_eht_cap_mac[WMI_MAX_EHTCAP_MAC_SIZE];</div><div class='add'>+	u32 peer_eht_cap_phy[WMI_MAX_EHTCAP_PHY_SIZE];</div><div class='add'>+	u32 peer_eht_mcs_count;</div><div class='add'>+	u32 peer_eht_rx_mcs_set[WMI_MAX_EHTCAP_RATE_SET];</div><div class='add'>+	u32 peer_eht_tx_mcs_set[WMI_MAX_EHTCAP_RATE_SET];</div><div class='add'>+	struct ath12k_wmi_ppe_threshold_arg peer_eht_ppet;</div><div class='add'>+	u32 punct_bitmap;</div><div class='add'>+	bool is_assoc;</div><div class='add'>+	struct peer_assoc_mlo_params ml;</div><div class='add'>+	bool eht_disable_mcs15;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_WMI_FLAG_MLO_ENABLED			BIT(0)</div><div class='add'>+#define ATH12K_WMI_FLAG_MLO_ASSOC_LINK			BIT(1)</div><div class='add'>+#define ATH12K_WMI_FLAG_MLO_PRIMARY_UMAC		BIT(2)</div><div class='add'>+#define ATH12K_WMI_FLAG_MLO_LINK_ID_VALID		BIT(3)</div><div class='add'>+#define ATH12K_WMI_FLAG_MLO_PEER_ID_VALID		BIT(4)</div><div class='add'>+</div><div class='add'>+struct wmi_peer_assoc_mlo_partner_info_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 hw_link_id;</div><div class='add'>+	__le32 flags;</div><div class='add'>+	__le32 logical_link_idx;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_peer_assoc_mlo_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 flags;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params mld_addr;</div><div class='add'>+	__le32 logical_link_idx;</div><div class='add'>+	__le32 ml_peer_id;</div><div class='add'>+	__le32 ieee_link_id;</div><div class='add'>+	__le32 emlsr_trans_timeout_us;</div><div class='add'>+	__le32 emlsr_trans_delay_us;</div><div class='add'>+	__le32 emlsr_padding_delay_us;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_peer_assoc_complete_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params peer_macaddr;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 peer_new_assoc;</div><div class='add'>+	__le32 peer_associd;</div><div class='add'>+	__le32 peer_flags;</div><div class='add'>+	__le32 peer_caps;</div><div class='add'>+	__le32 peer_listen_intval;</div><div class='add'>+	__le32 peer_ht_caps;</div><div class='add'>+	__le32 peer_max_mpdu;</div><div class='add'>+	__le32 peer_mpdu_density;</div><div class='add'>+	__le32 peer_rate_caps;</div><div class='add'>+	__le32 peer_nss;</div><div class='add'>+	__le32 peer_vht_caps;</div><div class='add'>+	__le32 peer_phymode;</div><div class='add'>+	__le32 peer_ht_info[2];</div><div class='add'>+	__le32 num_peer_legacy_rates;</div><div class='add'>+	__le32 num_peer_ht_rates;</div><div class='add'>+	__le32 peer_bw_rxnss_override;</div><div class='add'>+	struct ath12k_wmi_ppe_threshold_params peer_ppet;</div><div class='add'>+	__le32 peer_he_cap_info;</div><div class='add'>+	__le32 peer_he_ops;</div><div class='add'>+	__le32 peer_he_cap_phy[WMI_MAX_HECAP_PHY_SIZE];</div><div class='add'>+	__le32 peer_he_mcs;</div><div class='add'>+	__le32 peer_he_cap_info_ext;</div><div class='add'>+	__le32 peer_he_cap_info_internal;</div><div class='add'>+	__le32 min_data_rate;</div><div class='add'>+	__le32 peer_he_caps_6ghz;</div><div class='add'>+	__le32 sta_type;</div><div class='add'>+	__le32 bss_max_idle_option;</div><div class='add'>+	__le32 auth_mode;</div><div class='add'>+	__le32 peer_flags_ext;</div><div class='add'>+	__le32 punct_bitmap;</div><div class='add'>+	__le32 peer_eht_cap_mac[WMI_MAX_EHTCAP_MAC_SIZE];</div><div class='add'>+	__le32 peer_eht_cap_phy[WMI_MAX_EHTCAP_PHY_SIZE];</div><div class='add'>+	__le32 peer_eht_ops;</div><div class='add'>+	struct ath12k_wmi_ppe_threshold_params peer_eht_ppet;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_stop_scan_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 requestor;</div><div class='add'>+	__le32 scan_id;</div><div class='add'>+	__le32 req_type;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_scan_chan_list_arg {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+	u16 nallchans;</div><div class='add'>+	struct ath12k_wmi_channel_arg channel[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_scan_chan_list_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 num_scan_chans;</div><div class='add'>+	__le32 flags;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_MGMT_SEND_DOWNLD_LEN	64</div><div class='add'>+#define WMI_MGMT_LINK_AGNOSTIC_ID	0xFFFFFFFF</div><div class='add'>+</div><div class='add'>+#define WMI_TX_PARAMS_DWORD0_POWER		GENMASK(7, 0)</div><div class='add'>+#define WMI_TX_PARAMS_DWORD0_MCS_MASK		GENMASK(19, 8)</div><div class='add'>+#define WMI_TX_PARAMS_DWORD0_NSS_MASK		GENMASK(27, 20)</div><div class='add'>+#define WMI_TX_PARAMS_DWORD0_RETRY_LIMIT	GENMASK(31, 28)</div><div class='add'>+</div><div class='add'>+#define WMI_TX_PARAMS_DWORD1_CHAIN_MASK		GENMASK(7, 0)</div><div class='add'>+#define WMI_TX_PARAMS_DWORD1_BW_MASK		GENMASK(14, 8)</div><div class='add'>+#define WMI_TX_PARAMS_DWORD1_PREAMBLE_TYPE	GENMASK(19, 15)</div><div class='add'>+#define WMI_TX_PARAMS_DWORD1_FRAME_TYPE		BIT(20)</div><div class='add'>+#define WMI_TX_PARAMS_DWORD1_RSVD		GENMASK(31, 21)</div><div class='add'>+</div><div class='add'>+struct wmi_mgmt_send_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 desc_id;</div><div class='add'>+	__le32 chanfreq;</div><div class='add'>+	__le32 paddr_lo;</div><div class='add'>+	__le32 paddr_hi;</div><div class='add'>+	__le32 frame_len;</div><div class='add'>+	__le32 buf_len;</div><div class='add'>+	__le32 tx_params_valid;</div><div class='add'>+</div><div class='add'>+	/* This TLV is followed by struct wmi_mgmt_frame */</div><div class='add'>+</div><div class='add'>+	/* Followed by struct ath12k_wmi_mlo_mgmt_send_params */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_mlo_mgmt_send_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 hw_link_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_mgmt_send_tx_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 tx_param_dword0;</div><div class='add'>+	__le32 tx_param_dword1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_sta_powersave_mode_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 sta_ps_mode;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_sta_smps_force_mode_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 forced_mode;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_sta_smps_param_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 param;</div><div class='add'>+	__le32 value;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_bcn_prb_info_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 caps;</div><div class='add'>+	__le32 erp;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	WMI_PDEV_SUSPEND,</div><div class='add'>+	WMI_PDEV_SUSPEND_AND_DISABLE_INTR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_pdev_green_ap_ps_enable_cmd_param {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 enable;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_ap_ps_arg {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 param;</div><div class='add'>+	u32 value;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum set_init_cc_type {</div><div class='add'>+	WMI_COUNTRY_INFO_TYPE_ALPHA,</div><div class='add'>+	WMI_COUNTRY_INFO_TYPE_COUNTRY_CODE,</div><div class='add'>+	WMI_COUNTRY_INFO_TYPE_REGDOMAIN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum set_init_cc_flags {</div><div class='add'>+	INVALID_CC,</div><div class='add'>+	CC_IS_SET,</div><div class='add'>+	REGDMN_IS_SET,</div><div class='add'>+	ALPHA_IS_SET,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_init_country_arg {</div><div class='add'>+	union {</div><div class='add'>+		u16 country_code;</div><div class='add'>+		u16 regdom_id;</div><div class='add'>+		u8 alpha2[3];</div><div class='add'>+	} cc_info;</div><div class='add'>+	enum set_init_cc_flags flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_init_country_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 init_cc_type;</div><div class='add'>+	union {</div><div class='add'>+		__le32 country_code;</div><div class='add'>+		__le32 regdom_id;</div><div class='add'>+		__le32 alpha2;</div><div class='add'>+	} cc_info;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_11d_scan_start_arg {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 scan_period_msec;</div><div class='add'>+	u32 start_interval_msec;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_11d_scan_start_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 scan_period_msec;</div><div class='add'>+	__le32 start_interval_msec;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_11d_scan_stop_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_11d_new_cc_event {</div><div class='add'>+	__le32 new_alpha2;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_delba_send_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params peer_macaddr;</div><div class='add'>+	__le32 tid;</div><div class='add'>+	__le32 initiator;</div><div class='add'>+	__le32 reasoncode;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_addba_setresponse_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params peer_macaddr;</div><div class='add'>+	__le32 tid;</div><div class='add'>+	__le32 statuscode;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_addba_send_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params peer_macaddr;</div><div class='add'>+	__le32 tid;</div><div class='add'>+	__le32 buffersize;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_addba_clear_resp_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params peer_macaddr;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define DFS_PHYERR_UNIT_TEST_CMD 0</div><div class='add'>+#define DFS_UNIT_TEST_MODULE	0x2b</div><div class='add'>+#define DFS_UNIT_TEST_TOKEN	0xAA</div><div class='add'>+</div><div class='add'>+enum dfs_test_args_idx {</div><div class='add'>+	DFS_TEST_CMDID = 0,</div><div class='add'>+	DFS_TEST_PDEV_ID,</div><div class='add'>+	DFS_TEST_RADAR_PARAM,</div><div class='add'>+	DFS_MAX_TEST_ARGS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_dfs_unit_test_arg {</div><div class='add'>+	u32 cmd_id;</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+	u32 radar_param;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_unit_test_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 module_id;</div><div class='add'>+	__le32 num_args;</div><div class='add'>+	__le32 diag_token;</div><div class='add'>+	/* Followed by test args*/</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define MAX_SUPPORTED_RATES 128</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_vht_rate_set_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 rx_max_rate;</div><div class='add'>+	/* MCS at which the peer can transmit */</div><div class='add'>+	__le32 rx_mcs_set;</div><div class='add'>+	__le32 tx_max_rate;</div><div class='add'>+	/* MCS at which the peer can receive */</div><div class='add'>+	__le32 tx_mcs_set;</div><div class='add'>+	__le32 tx_max_mcs_nss;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_he_rate_set_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 rx_mcs_set;</div><div class='add'>+	__le32 tx_mcs_set;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_eht_rate_set_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 rx_mcs_set;</div><div class='add'>+	__le32 tx_mcs_set;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define MAX_REG_RULES 10</div><div class='add'>+#define REG_ALPHA2_LEN 2</div><div class='add'>+#define MAX_6GHZ_REG_RULES 5</div><div class='add'>+</div><div class='add'>+struct wmi_set_current_country_arg {</div><div class='add'>+	u8 alpha2[REG_ALPHA2_LEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_set_current_country_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 new_alpha2;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum wmi_start_event_param {</div><div class='add'>+	WMI_VDEV_START_RESP_EVENT = 0,</div><div class='add'>+	WMI_VDEV_RESTART_RESP_EVENT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_vdev_start_resp_event {</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 requestor_id;</div><div class='add'>+	/* enum wmi_start_event_param */</div><div class='add'>+	__le32 resp_type;</div><div class='add'>+	__le32 status;</div><div class='add'>+	__le32 chain_mask;</div><div class='add'>+	__le32 smps_mode;</div><div class='add'>+	union {</div><div class='add'>+		__le32 mac_id;</div><div class='add'>+		__le32 pdev_id;</div><div class='add'>+	};</div><div class='add'>+	__le32 cfgd_tx_streams;</div><div class='add'>+	__le32 cfgd_rx_streams;</div><div class='add'>+	__le32 max_allowed_tx_power;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* VDEV start response status codes */</div><div class='add'>+enum wmi_vdev_start_resp_status_code {</div><div class='add'>+	WMI_VDEV_START_RESPONSE_STATUS_SUCCESS = 0,</div><div class='add'>+	WMI_VDEV_START_RESPONSE_INVALID_VDEVID = 1,</div><div class='add'>+	WMI_VDEV_START_RESPONSE_NOT_SUPPORTED = 2,</div><div class='add'>+	WMI_VDEV_START_RESPONSE_DFS_VIOLATION = 3,</div><div class='add'>+	WMI_VDEV_START_RESPONSE_INVALID_REGDOMAIN = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_reg_6g_ap_type {</div><div class='add'>+	WMI_REG_INDOOR_AP = 0,</div><div class='add'>+	WMI_REG_STD_POWER_AP = 1,</div><div class='add'>+	WMI_REG_VLP_AP = 2,</div><div class='add'>+	WMI_REG_CURRENT_MAX_AP_TYPE,</div><div class='add'>+	WMI_REG_MAX_SUPP_AP_TYPE = WMI_REG_VLP_AP,</div><div class='add'>+	WMI_REG_MAX_AP_TYPE = 7,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_reg_6g_client_type {</div><div class='add'>+	WMI_REG_DEFAULT_CLIENT = 0,</div><div class='add'>+	WMI_REG_SUBORDINATE_CLIENT = 1,</div><div class='add'>+	WMI_REG_MAX_CLIENT_TYPE = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Regulatory Rule Flags Passed by FW */</div><div class='add'>+#define REGULATORY_CHAN_DISABLED     BIT(0)</div><div class='add'>+#define REGULATORY_CHAN_NO_IR        BIT(1)</div><div class='add'>+#define REGULATORY_CHAN_RADAR        BIT(3)</div><div class='add'>+#define REGULATORY_CHAN_NO_OFDM      BIT(6)</div><div class='add'>+#define REGULATORY_CHAN_INDOOR_ONLY  BIT(9)</div><div class='add'>+</div><div class='add'>+#define REGULATORY_CHAN_NO_HT40      BIT(4)</div><div class='add'>+#define REGULATORY_CHAN_NO_80MHZ     BIT(7)</div><div class='add'>+#define REGULATORY_CHAN_NO_160MHZ    BIT(8)</div><div class='add'>+#define REGULATORY_CHAN_NO_20MHZ     BIT(11)</div><div class='add'>+#define REGULATORY_CHAN_NO_10MHZ     BIT(12)</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	WMI_REG_SET_CC_STATUS_PASS = 0,</div><div class='add'>+	WMI_REG_CURRENT_ALPHA2_NOT_FOUND = 1,</div><div class='add'>+	WMI_REG_INIT_ALPHA2_NOT_FOUND = 2,</div><div class='add'>+	WMI_REG_SET_CC_CHANGE_NOT_ALLOWED = 3,</div><div class='add'>+	WMI_REG_SET_CC_STATUS_NO_MEMORY = 4,</div><div class='add'>+	WMI_REG_SET_CC_STATUS_FAIL = 5,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WMI_REG_CLIENT_MAX 4</div><div class='add'>+</div><div class='add'>+struct wmi_reg_chan_list_cc_ext_event {</div><div class='add'>+	__le32 status_code;</div><div class='add'>+	__le32 phy_id;</div><div class='add'>+	__le32 alpha2;</div><div class='add'>+	__le32 num_phy;</div><div class='add'>+	__le32 country_id;</div><div class='add'>+	__le32 domain_code;</div><div class='add'>+	__le32 dfs_region;</div><div class='add'>+	__le32 phybitmap;</div><div class='add'>+	__le32 min_bw_2g;</div><div class='add'>+	__le32 max_bw_2g;</div><div class='add'>+	__le32 min_bw_5g;</div><div class='add'>+	__le32 max_bw_5g;</div><div class='add'>+	__le32 num_2g_reg_rules;</div><div class='add'>+	__le32 num_5g_reg_rules;</div><div class='add'>+	__le32 client_type;</div><div class='add'>+	__le32 rnr_tpe_usable;</div><div class='add'>+	__le32 unspecified_ap_usable;</div><div class='add'>+	__le32 domain_code_6g_ap_lpi;</div><div class='add'>+	__le32 domain_code_6g_ap_sp;</div><div class='add'>+	__le32 domain_code_6g_ap_vlp;</div><div class='add'>+	__le32 domain_code_6g_client_lpi[WMI_REG_CLIENT_MAX];</div><div class='add'>+	__le32 domain_code_6g_client_sp[WMI_REG_CLIENT_MAX];</div><div class='add'>+	__le32 domain_code_6g_client_vlp[WMI_REG_CLIENT_MAX];</div><div class='add'>+	__le32 domain_code_6g_super_id;</div><div class='add'>+	__le32 min_bw_6g_ap_sp;</div><div class='add'>+	__le32 max_bw_6g_ap_sp;</div><div class='add'>+	__le32 min_bw_6g_ap_lpi;</div><div class='add'>+	__le32 max_bw_6g_ap_lpi;</div><div class='add'>+	__le32 min_bw_6g_ap_vlp;</div><div class='add'>+	__le32 max_bw_6g_ap_vlp;</div><div class='add'>+	__le32 min_bw_6g_client_sp[WMI_REG_CLIENT_MAX];</div><div class='add'>+	__le32 max_bw_6g_client_sp[WMI_REG_CLIENT_MAX];</div><div class='add'>+	__le32 min_bw_6g_client_lpi[WMI_REG_CLIENT_MAX];</div><div class='add'>+	__le32 max_bw_6g_client_lpi[WMI_REG_CLIENT_MAX];</div><div class='add'>+	__le32 min_bw_6g_client_vlp[WMI_REG_CLIENT_MAX];</div><div class='add'>+	__le32 max_bw_6g_client_vlp[WMI_REG_CLIENT_MAX];</div><div class='add'>+	__le32 num_6g_reg_rules_ap_sp;</div><div class='add'>+	__le32 num_6g_reg_rules_ap_lpi;</div><div class='add'>+	__le32 num_6g_reg_rules_ap_vlp;</div><div class='add'>+	__le32 num_6g_reg_rules_cl_sp[WMI_REG_CLIENT_MAX];</div><div class='add'>+	__le32 num_6g_reg_rules_cl_lpi[WMI_REG_CLIENT_MAX];</div><div class='add'>+	__le32 num_6g_reg_rules_cl_vlp[WMI_REG_CLIENT_MAX];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_reg_rule_ext_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 freq_info;</div><div class='add'>+	__le32 bw_pwr_info;</div><div class='add'>+	__le32 flag_info;</div><div class='add'>+	__le32 psd_power_info;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_vdev_delete_resp_event {</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_peer_delete_resp_event {</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params peer_macaddr;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_bcn_tx_status_event {</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 tx_status;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_vdev_stopped_event {</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_pdev_bss_chan_info_event {</div><div class='add'>+	__le32 freq;	/* Units in MHz */</div><div class='add'>+	__le32 noise_floor;	/* units are dBm */</div><div class='add'>+	/* rx clear - how often the channel was unused */</div><div class='add'>+	__le32 rx_clear_count_low;</div><div class='add'>+	__le32 rx_clear_count_high;</div><div class='add'>+	/* cycle count - elapsed time during measured period, in clock ticks */</div><div class='add'>+	__le32 cycle_count_low;</div><div class='add'>+	__le32 cycle_count_high;</div><div class='add'>+	/* tx cycle count - elapsed time spent in tx, in clock ticks */</div><div class='add'>+	__le32 tx_cycle_count_low;</div><div class='add'>+	__le32 tx_cycle_count_high;</div><div class='add'>+	/* rx cycle count - elapsed time spent in rx, in clock ticks */</div><div class='add'>+	__le32 rx_cycle_count_low;</div><div class='add'>+	__le32 rx_cycle_count_high;</div><div class='add'>+	/*rx_cycle cnt for my bss in 64bits format */</div><div class='add'>+	__le32 rx_bss_cycle_count_low;</div><div class='add'>+	__le32 rx_bss_cycle_count_high;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_VDEV_INSTALL_KEY_COMPL_STATUS_SUCCESS 0</div><div class='add'>+</div><div class='add'>+struct wmi_vdev_install_key_compl_event {</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params peer_macaddr;</div><div class='add'>+	__le32 key_idx;</div><div class='add'>+	__le32 key_flags;</div><div class='add'>+	__le32 status;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_vdev_install_key_complete_arg {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	const u8 *macaddr;</div><div class='add'>+	u32 key_idx;</div><div class='add'>+	u32 key_flags;</div><div class='add'>+	u32 status;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_peer_assoc_conf_event {</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params peer_macaddr;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_peer_assoc_conf_arg {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	const u8 *macaddr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_fils_discovery_event {</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 fils_tt;</div><div class='add'>+	__le32 tbtt;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_probe_resp_tx_status_event {</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 tx_status;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_pdev_ctl_failsafe_chk_event {</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 ctl_failsafe_status;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_pdev_csa_event {</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 current_switch_count;</div><div class='add'>+	__le32 num_vdevs;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_pdev_radar_event {</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 detection_mode;</div><div class='add'>+	__le32 chan_freq;</div><div class='add'>+	__le32 chan_width;</div><div class='add'>+	__le32 detector_id;</div><div class='add'>+	__le32 segment_id;</div><div class='add'>+	__le32 timestamp;</div><div class='add'>+	__le32 is_chirp;</div><div class='add'>+	a_sle32 freq_offset;</div><div class='add'>+	a_sle32 sidx;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_pdev_temperature_event {</div><div class='add'>+	/* temperature value in Celsius degree */</div><div class='add'>+	a_sle32 temp;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_RX_STATUS_OK			0x00</div><div class='add'>+#define WMI_RX_STATUS_ERR_CRC			0x01</div><div class='add'>+#define WMI_RX_STATUS_ERR_DECRYPT		0x08</div><div class='add'>+#define WMI_RX_STATUS_ERR_MIC			0x10</div><div class='add'>+#define WMI_RX_STATUS_ERR_KEY_CACHE_MISS	0x20</div><div class='add'>+</div><div class='add'>+#define WLAN_MGMT_TXRX_HOST_MAX_ANTENNA 4</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_mgmt_rx_arg {</div><div class='add'>+	u32 chan_freq;</div><div class='add'>+	u32 channel;</div><div class='add'>+	u32 snr;</div><div class='add'>+	u8 rssi_ctl[WLAN_MGMT_TXRX_HOST_MAX_ANTENNA];</div><div class='add'>+	u32 rate;</div><div class='add'>+	enum wmi_phy_mode phy_mode;</div><div class='add'>+	u32 buf_len;</div><div class='add'>+	int status;</div><div class='add'>+	u32 flags;</div><div class='add'>+	int rssi;</div><div class='add'>+	u32 tsf_delta;</div><div class='add'>+	u8 pdev_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH_MAX_ANTENNA 4</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_mgmt_rx_params {</div><div class='add'>+	__le32 channel;</div><div class='add'>+	__le32 snr;</div><div class='add'>+	__le32 rate;</div><div class='add'>+	__le32 phy_mode;</div><div class='add'>+	__le32 buf_len;</div><div class='add'>+	__le32 status;</div><div class='add'>+	__le32 rssi_ctl[ATH_MAX_ANTENNA];</div><div class='add'>+	__le32 flags;</div><div class='add'>+	a_sle32 rssi;</div><div class='add'>+	__le32 tsf_delta;</div><div class='add'>+	__le32 rx_tsf_l32;</div><div class='add'>+	__le32 rx_tsf_u32;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 chan_freq;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define MAX_ANTENNA_EIGHT 8</div><div class='add'>+</div><div class='add'>+struct wmi_mgmt_tx_compl_event {</div><div class='add'>+	__le32 desc_id;</div><div class='add'>+	__le32 status;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 ppdu_id;</div><div class='add'>+	__le32 ack_rssi;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_scan_event {</div><div class='add'>+	__le32 event_type; /* %WMI_SCAN_EVENT_ */</div><div class='add'>+	__le32 reason; /* %WMI_SCAN_REASON_ */</div><div class='add'>+	__le32 channel_freq; /* only valid for WMI_SCAN_EVENT_FOREIGN_CHANNEL */</div><div class='add'>+	__le32 scan_req_id;</div><div class='add'>+	__le32 scan_id;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	/* TSF Timestamp when the scan event (%WMI_SCAN_EVENT_) is completed</div><div class='add'>+	 * In case of AP it is TSF of the AP vdev</div><div class='add'>+	 * In case of STA connected state, this is the TSF of the AP</div><div class='add'>+	 * In case of STA not connected, it will be the free running HW timer</div><div class='add'>+	 */</div><div class='add'>+	__le32 tsf_timestamp;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum wmi_peer_sta_kickout_reason {</div><div class='add'>+	WMI_PEER_STA_KICKOUT_REASON_UNSPECIFIED = 0,</div><div class='add'>+	WMI_PEER_STA_KICKOUT_REASON_XRETRY = 1,</div><div class='add'>+	WMI_PEER_STA_KICKOUT_REASON_INACTIVITY = 2,</div><div class='add'>+	WMI_PEER_STA_KICKOUT_REASON_IBSS_DISCONNECT = 3,</div><div class='add'>+	WMI_PEER_STA_KICKOUT_REASON_TDLS_DISCONNECT = 4,</div><div class='add'>+	WMI_PEER_STA_KICKOUT_REASON_SA_QUERY_TIMEOUT = 5,</div><div class='add'>+	WMI_PEER_STA_KICKOUT_REASON_ROAMING_EVENT = 6,</div><div class='add'>+	WMI_PEER_STA_KICKOUT_REASON_PMF_ERROR = 7,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_peer_sta_kickout_arg {</div><div class='add'>+	const u8 *mac_addr;</div><div class='add'>+	enum wmi_peer_sta_kickout_reason reason;</div><div class='add'>+	u32 rssi;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_peer_sta_kickout_event {</div><div class='add'>+	struct ath12k_wmi_mac_addr_params peer_macaddr;</div><div class='add'>+	__le32 reason;</div><div class='add'>+	__le32 rssi;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_ROAM_REASON_MASK		GENMASK(3, 0)</div><div class='add'>+#define WMI_ROAM_SUBNET_STATUS_MASK	GENMASK(5, 4)</div><div class='add'>+</div><div class='add'>+enum wmi_roam_reason {</div><div class='add'>+	WMI_ROAM_REASON_BETTER_AP = 1,</div><div class='add'>+	WMI_ROAM_REASON_BEACON_MISS = 2,</div><div class='add'>+	WMI_ROAM_REASON_LOW_RSSI = 3,</div><div class='add'>+	WMI_ROAM_REASON_SUITABLE_AP_FOUND = 4,</div><div class='add'>+	WMI_ROAM_REASON_HO_FAILED = 5,</div><div class='add'>+</div><div class='add'>+	/* keep last */</div><div class='add'>+	WMI_ROAM_REASON_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_roam_event {</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 reason;</div><div class='add'>+	__le32 rssi;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_CHAN_INFO_START_RESP 0</div><div class='add'>+#define WMI_CHAN_INFO_END_RESP 1</div><div class='add'>+</div><div class='add'>+struct wmi_chan_info_event {</div><div class='add'>+	__le32 err_code;</div><div class='add'>+	__le32 freq;</div><div class='add'>+	__le32 cmd_flags;</div><div class='add'>+	__le32 noise_floor;</div><div class='add'>+	__le32 rx_clear_count;</div><div class='add'>+	__le32 cycle_count;</div><div class='add'>+	__le32 chan_tx_pwr_range;</div><div class='add'>+	__le32 chan_tx_pwr_tp;</div><div class='add'>+	__le32 rx_frame_count;</div><div class='add'>+	__le32 my_bss_rx_cycle_count;</div><div class='add'>+	__le32 rx_11b_mode_data_duration;</div><div class='add'>+	__le32 tx_frame_cnt;</div><div class='add'>+	__le32 mac_clk_mhz;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_target_cap_arg {</div><div class='add'>+	u32 phy_capability;</div><div class='add'>+	u32 max_frag_entry;</div><div class='add'>+	u32 num_rf_chains;</div><div class='add'>+	u32 ht_cap_info;</div><div class='add'>+	u32 vht_cap_info;</div><div class='add'>+	u32 vht_supp_mcs;</div><div class='add'>+	u32 hw_min_tx_power;</div><div class='add'>+	u32 hw_max_tx_power;</div><div class='add'>+	u32 sys_cap_info;</div><div class='add'>+	u32 min_pkt_size_enable;</div><div class='add'>+	u32 max_bcn_ie_size;</div><div class='add'>+	u32 max_num_scan_channels;</div><div class='add'>+	u32 max_supported_macs;</div><div class='add'>+	u32 wmi_fw_sub_feat_caps;</div><div class='add'>+	u32 txrx_chainmask;</div><div class='add'>+	u32 default_dbs_hw_mode_index;</div><div class='add'>+	u32 num_msdu_desc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_vdev_type {</div><div class='add'>+	WMI_VDEV_TYPE_UNSPEC  = 0,</div><div class='add'>+	WMI_VDEV_TYPE_AP      = 1,</div><div class='add'>+	WMI_VDEV_TYPE_STA     = 2,</div><div class='add'>+	WMI_VDEV_TYPE_IBSS    = 3,</div><div class='add'>+	WMI_VDEV_TYPE_MONITOR = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_vdev_subtype {</div><div class='add'>+	WMI_VDEV_SUBTYPE_NONE,</div><div class='add'>+	WMI_VDEV_SUBTYPE_P2P_DEVICE,</div><div class='add'>+	WMI_VDEV_SUBTYPE_P2P_CLIENT,</div><div class='add'>+	WMI_VDEV_SUBTYPE_P2P_GO,</div><div class='add'>+	WMI_VDEV_SUBTYPE_PROXY_STA,</div><div class='add'>+	WMI_VDEV_SUBTYPE_MESH_NON_11S,</div><div class='add'>+	WMI_VDEV_SUBTYPE_MESH_11S,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_sta_powersave_param {</div><div class='add'>+	WMI_STA_PS_PARAM_RX_WAKE_POLICY = 0,</div><div class='add'>+	WMI_STA_PS_PARAM_TX_WAKE_THRESHOLD = 1,</div><div class='add'>+	WMI_STA_PS_PARAM_PSPOLL_COUNT = 2,</div><div class='add'>+	WMI_STA_PS_PARAM_INACTIVITY_TIME = 3,</div><div class='add'>+	WMI_STA_PS_PARAM_UAPSD = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_sta_ps_param_uapsd {</div><div class='add'>+	WMI_STA_PS_UAPSD_AC0_DELIVERY_EN = (1 &lt;&lt; 0),</div><div class='add'>+	WMI_STA_PS_UAPSD_AC0_TRIGGER_EN  = (1 &lt;&lt; 1),</div><div class='add'>+	WMI_STA_PS_UAPSD_AC1_DELIVERY_EN = (1 &lt;&lt; 2),</div><div class='add'>+	WMI_STA_PS_UAPSD_AC1_TRIGGER_EN  = (1 &lt;&lt; 3),</div><div class='add'>+	WMI_STA_PS_UAPSD_AC2_DELIVERY_EN = (1 &lt;&lt; 4),</div><div class='add'>+	WMI_STA_PS_UAPSD_AC2_TRIGGER_EN  = (1 &lt;&lt; 5),</div><div class='add'>+	WMI_STA_PS_UAPSD_AC3_DELIVERY_EN = (1 &lt;&lt; 6),</div><div class='add'>+	WMI_STA_PS_UAPSD_AC3_TRIGGER_EN  = (1 &lt;&lt; 7),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_sta_ps_param_tx_wake_threshold {</div><div class='add'>+	WMI_STA_PS_TX_WAKE_THRESHOLD_NEVER = 0,</div><div class='add'>+	WMI_STA_PS_TX_WAKE_THRESHOLD_ALWAYS = 1,</div><div class='add'>+</div><div class='add'>+	/* Values greater than one indicate that many TX attempts per beacon</div><div class='add'>+	 * interval before the STA will wake up</div><div class='add'>+	 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The maximum number of PS-Poll frames the FW will send in response to</div><div class='add'>+ * traffic advertised in TIM before waking up (by sending a null frame with PS</div><div class='add'>+ * = 0). Value 0 has a special meaning: there is no maximum count and the FW</div><div class='add'>+ * will send as many PS-Poll as are necessary to retrieve buffered BU. This</div><div class='add'>+ * parameter is used when the RX wake policy is</div><div class='add'>+ * WMI_STA_PS_RX_WAKE_POLICY_POLL_UAPSD and ignored when the RX wake</div><div class='add'>+ * policy is WMI_STA_PS_RX_WAKE_POLICY_WAKE.</div><div class='add'>+ */</div><div class='add'>+enum wmi_sta_ps_param_pspoll_count {</div><div class='add'>+	WMI_STA_PS_PSPOLL_COUNT_NO_MAX = 0,</div><div class='add'>+	/* Values greater than 0 indicate the maximum number of PS-Poll frames</div><div class='add'>+	 * FW will send before waking up.</div><div class='add'>+	 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* U-APSD configuration of peer station from (re)assoc request and TSPECs */</div><div class='add'>+enum wmi_ap_ps_param_uapsd {</div><div class='add'>+	WMI_AP_PS_UAPSD_AC0_DELIVERY_EN = (1 &lt;&lt; 0),</div><div class='add'>+	WMI_AP_PS_UAPSD_AC0_TRIGGER_EN  = (1 &lt;&lt; 1),</div><div class='add'>+	WMI_AP_PS_UAPSD_AC1_DELIVERY_EN = (1 &lt;&lt; 2),</div><div class='add'>+	WMI_AP_PS_UAPSD_AC1_TRIGGER_EN  = (1 &lt;&lt; 3),</div><div class='add'>+	WMI_AP_PS_UAPSD_AC2_DELIVERY_EN = (1 &lt;&lt; 4),</div><div class='add'>+	WMI_AP_PS_UAPSD_AC2_TRIGGER_EN  = (1 &lt;&lt; 5),</div><div class='add'>+	WMI_AP_PS_UAPSD_AC3_DELIVERY_EN = (1 &lt;&lt; 6),</div><div class='add'>+	WMI_AP_PS_UAPSD_AC3_TRIGGER_EN  = (1 &lt;&lt; 7),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* U-APSD maximum service period of peer station */</div><div class='add'>+enum wmi_ap_ps_peer_param_max_sp {</div><div class='add'>+	WMI_AP_PS_PEER_PARAM_MAX_SP_UNLIMITED = 0,</div><div class='add'>+	WMI_AP_PS_PEER_PARAM_MAX_SP_2 = 1,</div><div class='add'>+	WMI_AP_PS_PEER_PARAM_MAX_SP_4 = 2,</div><div class='add'>+	WMI_AP_PS_PEER_PARAM_MAX_SP_6 = 3,</div><div class='add'>+	MAX_WMI_AP_PS_PEER_PARAM_MAX_SP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_ap_ps_peer_param {</div><div class='add'>+	/** Set uapsd configuration for a given peer.</div><div class='add'>+	 *</div><div class='add'>+	 * This include the delivery and trigger enabled state for each AC.</div><div class='add'>+	 * The host MLME needs to set this based on AP capability and stations</div><div class='add'>+	 * request Set in the association request  received from the station.</div><div class='add'>+	 *</div><div class='add'>+	 * Lower 8 bits of the value specify the UAPSD configuration.</div><div class='add'>+	 *</div><div class='add'>+	 * (see enum wmi_ap_ps_param_uapsd)</div><div class='add'>+	 * The default value is 0.</div><div class='add'>+	 */</div><div class='add'>+	WMI_AP_PS_PEER_PARAM_UAPSD = 0,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * Set the service period for a UAPSD capable station</div><div class='add'>+	 *</div><div class='add'>+	 * The service period from wme ie in the (re)assoc request frame.</div><div class='add'>+	 *</div><div class='add'>+	 * (see enum wmi_ap_ps_peer_param_max_sp)</div><div class='add'>+	 */</div><div class='add'>+	WMI_AP_PS_PEER_PARAM_MAX_SP = 1,</div><div class='add'>+</div><div class='add'>+	/** Time in seconds for aging out buffered frames</div><div class='add'>+	 * for STA in power save</div><div class='add'>+	 */</div><div class='add'>+	WMI_AP_PS_PEER_PARAM_AGEOUT_TIME = 2,</div><div class='add'>+</div><div class='add'>+	/** Specify frame types that are considered SIFS</div><div class='add'>+	 * RESP trigger frame</div><div class='add'>+	 */</div><div class='add'>+	WMI_AP_PS_PEER_PARAM_SIFS_RESP_FRMTYPE = 3,</div><div class='add'>+</div><div class='add'>+	/** Specifies the trigger state of TID.</div><div class='add'>+	 * Valid only for UAPSD frame type</div><div class='add'>+	 */</div><div class='add'>+	WMI_AP_PS_PEER_PARAM_SIFS_RESP_UAPSD = 4,</div><div class='add'>+</div><div class='add'>+	/* Specifies the WNM sleep state of a STA */</div><div class='add'>+	WMI_AP_PS_PEER_PARAM_WNM_SLEEP = 5,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DISABLE_SIFS_RESPONSE_TRIGGER 0</div><div class='add'>+</div><div class='add'>+#define WMI_MAX_KEY_INDEX   7</div><div class='add'>+#define WMI_MAX_KEY_LEN     32</div><div class='add'>+</div><div class='add'>+enum wmi_key_type {</div><div class='add'>+	WMI_KEY_PAIRWISE = 0,</div><div class='add'>+	WMI_KEY_GROUP = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_cipher_type {</div><div class='add'>+	WMI_CIPHER_NONE = 0, /* clear key */</div><div class='add'>+	WMI_CIPHER_WEP = 1,</div><div class='add'>+	WMI_CIPHER_TKIP = 2,</div><div class='add'>+	WMI_CIPHER_AES_OCB = 3,</div><div class='add'>+	WMI_CIPHER_AES_CCM = 4,</div><div class='add'>+	WMI_CIPHER_WAPI = 5,</div><div class='add'>+	WMI_CIPHER_CKIP = 6,</div><div class='add'>+	WMI_CIPHER_AES_CMAC = 7,</div><div class='add'>+	WMI_CIPHER_ANY = 8,</div><div class='add'>+	WMI_CIPHER_AES_GCM = 9,</div><div class='add'>+	WMI_CIPHER_AES_GMAC = 10,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Value to disable fixed rate setting */</div><div class='add'>+#define WMI_FIXED_RATE_NONE	(0xffff)</div><div class='add'>+</div><div class='add'>+#define ATH12K_RC_VERSION_OFFSET	28</div><div class='add'>+#define ATH12K_RC_PREAMBLE_OFFSET	8</div><div class='add'>+#define ATH12K_RC_NSS_OFFSET		5</div><div class='add'>+</div><div class='add'>+#define ATH12K_HW_RATE_CODE(rate, nss, preamble)	\</div><div class='add'>+	((1 &lt;&lt; ATH12K_RC_VERSION_OFFSET) |		\</div><div class='add'>+	 ((nss) &lt;&lt; ATH12K_RC_NSS_OFFSET) |		\</div><div class='add'>+	 ((preamble) &lt;&lt; ATH12K_RC_PREAMBLE_OFFSET) |	\</div><div class='add'>+	 (rate))</div><div class='add'>+</div><div class='add'>+/* Preamble types to be used with VDEV fixed rate configuration */</div><div class='add'>+enum wmi_rate_preamble {</div><div class='add'>+	WMI_RATE_PREAMBLE_OFDM,</div><div class='add'>+	WMI_RATE_PREAMBLE_CCK,</div><div class='add'>+	WMI_RATE_PREAMBLE_HT,</div><div class='add'>+	WMI_RATE_PREAMBLE_VHT,</div><div class='add'>+	WMI_RATE_PREAMBLE_HE,</div><div class='add'>+	WMI_RATE_PREAMBLE_EHT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum wmi_rtscts_prot_mode - Enable/Disable RTS/CTS and CTS2Self Protection.</div><div class='add'>+ * @WMI_RTS_CTS_DISABLED: RTS/CTS protection is disabled.</div><div class='add'>+ * @WMI_USE_RTS_CTS: RTS/CTS Enabled.</div><div class='add'>+ * @WMI_USE_CTS2SELF: CTS to self protection Enabled.</div><div class='add'>+ */</div><div class='add'>+enum wmi_rtscts_prot_mode {</div><div class='add'>+	WMI_RTS_CTS_DISABLED = 0,</div><div class='add'>+	WMI_USE_RTS_CTS = 1,</div><div class='add'>+	WMI_USE_CTS2SELF = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum wmi_rtscts_profile - Selection of RTS CTS profile along with enabling</div><div class='add'>+ *                           protection mode.</div><div class='add'>+ * @WMI_RTSCTS_FOR_NO_RATESERIES: Neither of rate-series should use RTS-CTS</div><div class='add'>+ * @WMI_RTSCTS_FOR_SECOND_RATESERIES: Only second rate-series will use RTS-CTS</div><div class='add'>+ * @WMI_RTSCTS_ACROSS_SW_RETRIES: Only the second rate-series will use RTS-CTS,</div><div class='add'>+ *                                but if there's a sw retry, both the rate</div><div class='add'>+ *                                series will use RTS-CTS.</div><div class='add'>+ * @WMI_RTSCTS_ERP: RTS/CTS used for ERP protection for every PPDU.</div><div class='add'>+ * @WMI_RTSCTS_FOR_ALL_RATESERIES: Enable RTS-CTS for all rate series.</div><div class='add'>+ */</div><div class='add'>+enum wmi_rtscts_profile {</div><div class='add'>+	WMI_RTSCTS_FOR_NO_RATESERIES = 0,</div><div class='add'>+	WMI_RTSCTS_FOR_SECOND_RATESERIES = 1,</div><div class='add'>+	WMI_RTSCTS_ACROSS_SW_RETRIES = 2,</div><div class='add'>+	WMI_RTSCTS_ERP = 3,</div><div class='add'>+	WMI_RTSCTS_FOR_ALL_RATESERIES = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WMI_SKB_HEADROOM sizeof(struct wmi_cmd_hdr)</div><div class='add'>+</div><div class='add'>+enum wmi_sta_ps_param_rx_wake_policy {</div><div class='add'>+	WMI_STA_PS_RX_WAKE_POLICY_WAKE = 0,</div><div class='add'>+	WMI_STA_PS_RX_WAKE_POLICY_POLL_UAPSD = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Do not change existing values! Used by ath12k_frame_mode parameter</div><div class='add'>+ * module parameter.</div><div class='add'>+ */</div><div class='add'>+enum ath12k_hw_txrx_mode {</div><div class='add'>+	ATH12K_HW_TXRX_RAW = 0,</div><div class='add'>+	ATH12K_HW_TXRX_NATIVE_WIFI = 1,</div><div class='add'>+	ATH12K_HW_TXRX_ETHERNET = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_wmm_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 cwmin;</div><div class='add'>+	__le32 cwmax;</div><div class='add'>+	__le32 aifs;</div><div class='add'>+	__le32 txoplimit;</div><div class='add'>+	__le32 acm;</div><div class='add'>+	__le32 no_ack;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_wmm_params_arg {</div><div class='add'>+	u8 acm;</div><div class='add'>+	u8 aifs;</div><div class='add'>+	u16 cwmin;</div><div class='add'>+	u16 cwmax;</div><div class='add'>+	u16 txop;</div><div class='add'>+	u8 no_ack;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_vdev_set_wmm_params_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	struct wmi_wmm_params wmm_params[4];</div><div class='add'>+	__le32 wmm_param_type;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_wmm_params_all_arg {</div><div class='add'>+	struct wmi_wmm_params_arg ac_be;</div><div class='add'>+	struct wmi_wmm_params_arg ac_bk;</div><div class='add'>+	struct wmi_wmm_params_arg ac_vi;</div><div class='add'>+	struct wmi_wmm_params_arg ac_vo;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_TWT_DEF_STA_CONG_TIMER_MS		5000</div><div class='add'>+#define ATH12K_TWT_DEF_DEFAULT_SLOT_SIZE		10</div><div class='add'>+#define ATH12K_TWT_DEF_CONGESTION_THRESH_SETUP		50</div><div class='add'>+#define ATH12K_TWT_DEF_CONGESTION_THRESH_TEARDOWN	20</div><div class='add'>+#define ATH12K_TWT_DEF_CONGESTION_THRESH_CRITICAL	100</div><div class='add'>+#define ATH12K_TWT_DEF_INTERFERENCE_THRESH_TEARDOWN	80</div><div class='add'>+#define ATH12K_TWT_DEF_INTERFERENCE_THRESH_SETUP	50</div><div class='add'>+#define ATH12K_TWT_DEF_MIN_NO_STA_SETUP			10</div><div class='add'>+#define ATH12K_TWT_DEF_MIN_NO_STA_TEARDOWN		2</div><div class='add'>+#define ATH12K_TWT_DEF_NO_OF_BCAST_MCAST_SLOTS		2</div><div class='add'>+#define ATH12K_TWT_DEF_MIN_NO_TWT_SLOTS			2</div><div class='add'>+#define ATH12K_TWT_DEF_MAX_NO_STA_TWT			500</div><div class='add'>+#define ATH12K_TWT_DEF_MODE_CHECK_INTERVAL		10000</div><div class='add'>+#define ATH12K_TWT_DEF_ADD_STA_SLOT_INTERVAL		1000</div><div class='add'>+#define ATH12K_TWT_DEF_REMOVE_STA_SLOT_INTERVAL		5000</div><div class='add'>+</div><div class='add'>+struct wmi_twt_enable_params_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 sta_cong_timer_ms;</div><div class='add'>+	__le32 mbss_support;</div><div class='add'>+	__le32 default_slot_size;</div><div class='add'>+	__le32 congestion_thresh_setup;</div><div class='add'>+	__le32 congestion_thresh_teardown;</div><div class='add'>+	__le32 congestion_thresh_critical;</div><div class='add'>+	__le32 interference_thresh_teardown;</div><div class='add'>+	__le32 interference_thresh_setup;</div><div class='add'>+	__le32 min_no_sta_setup;</div><div class='add'>+	__le32 min_no_sta_teardown;</div><div class='add'>+	__le32 no_of_bcast_mcast_slots;</div><div class='add'>+	__le32 min_no_twt_slots;</div><div class='add'>+	__le32 max_no_sta_twt;</div><div class='add'>+	__le32 mode_check_interval;</div><div class='add'>+	__le32 add_sta_slot_interval;</div><div class='add'>+	__le32 remove_sta_slot_interval;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_twt_disable_params_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_obss_spatial_reuse_params_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 enable;</div><div class='add'>+	a_sle32 obss_min;</div><div class='add'>+	a_sle32 obss_max;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_BSS_COLOR_COLLISION_SCAN_PERIOD_MS		200</div><div class='add'>+#define ATH12K_OBSS_COLOR_COLLISION_DETECTION_DISABLE		0</div><div class='add'>+#define ATH12K_OBSS_COLOR_COLLISION_DETECTION			1</div><div class='add'>+</div><div class='add'>+#define ATH12K_BSS_COLOR_STA_PERIODS				10000</div><div class='add'>+#define ATH12K_BSS_COLOR_AP_PERIODS				5000</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum wmi_bss_color_collision - Event types for BSS color collision handling</div><div class='add'>+ * @WMI_BSS_COLOR_COLLISION_DISABLE: Indicates that BSS color collision detection</div><div class='add'>+ *                                   is disabled.</div><div class='add'>+ * @WMI_BSS_COLOR_COLLISION_DETECTION: Event triggered when a BSS color collision</div><div class='add'>+ *                                     is detected.</div><div class='add'>+ * @WMI_BSS_COLOR_FREE_SLOT_TIMER_EXPIRY: Event indicating that the timer for waiting</div><div class='add'>+ *                                        on a free BSS color slot has expired.</div><div class='add'>+ * @WMI_BSS_COLOR_FREE_SLOT_AVAILABLE: Event indicating that a free BSS color slot</div><div class='add'>+ *                                     has become available.</div><div class='add'>+ */</div><div class='add'>+enum wmi_bss_color_collision {</div><div class='add'>+	WMI_BSS_COLOR_COLLISION_DISABLE = 0,</div><div class='add'>+	WMI_BSS_COLOR_COLLISION_DETECTION,</div><div class='add'>+	WMI_BSS_COLOR_FREE_SLOT_TIMER_EXPIRY,</div><div class='add'>+	WMI_BSS_COLOR_FREE_SLOT_AVAILABLE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_obss_color_collision_cfg_params_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 flags;</div><div class='add'>+	__le32 evt_type;</div><div class='add'>+	__le32 current_bss_color;</div><div class='add'>+	__le32 detection_period_ms;</div><div class='add'>+	__le32 scan_period_ms;</div><div class='add'>+	__le32 free_slot_expiry_time_ms;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_bss_color_change_enable_params_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 enable;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_obss_color_collision_event {</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 evt_type;</div><div class='add'>+	__le64 obss_color_bitmap;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_IPV4_TH_SEED_SIZE 5</div><div class='add'>+#define ATH12K_IPV6_TH_SEED_SIZE 11</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_pdev_lro_config_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 lro_enable;</div><div class='add'>+	__le32 res;</div><div class='add'>+	u32 th_4[ATH12K_IPV4_TH_SEED_SIZE];</div><div class='add'>+	u32 th_6[ATH12K_IPV6_TH_SEED_SIZE];</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_WMI_SPECTRAL_COUNT_DEFAULT                 0</div><div class='add'>+#define ATH12K_WMI_SPECTRAL_PERIOD_DEFAULT              224</div><div class='add'>+#define ATH12K_WMI_SPECTRAL_PRIORITY_DEFAULT              1</div><div class='add'>+#define ATH12K_WMI_SPECTRAL_FFT_SIZE_DEFAULT              7</div><div class='add'>+#define ATH12K_WMI_SPECTRAL_GC_ENA_DEFAULT                1</div><div class='add'>+#define ATH12K_WMI_SPECTRAL_RESTART_ENA_DEFAULT           0</div><div class='add'>+#define ATH12K_WMI_SPECTRAL_NOISE_FLOOR_REF_DEFAULT     -96</div><div class='add'>+#define ATH12K_WMI_SPECTRAL_INIT_DELAY_DEFAULT           80</div><div class='add'>+#define ATH12K_WMI_SPECTRAL_NB_TONE_THR_DEFAULT          12</div><div class='add'>+#define ATH12K_WMI_SPECTRAL_STR_BIN_THR_DEFAULT           8</div><div class='add'>+#define ATH12K_WMI_SPECTRAL_WB_RPT_MODE_DEFAULT           0</div><div class='add'>+#define ATH12K_WMI_SPECTRAL_RSSI_RPT_MODE_DEFAULT         0</div><div class='add'>+#define ATH12K_WMI_SPECTRAL_RSSI_THR_DEFAULT           0xf0</div><div class='add'>+#define ATH12K_WMI_SPECTRAL_PWR_FORMAT_DEFAULT            0</div><div class='add'>+#define ATH12K_WMI_SPECTRAL_RPT_MODE_DEFAULT              2</div><div class='add'>+#define ATH12K_WMI_SPECTRAL_BIN_SCALE_DEFAULT             1</div><div class='add'>+#define ATH12K_WMI_SPECTRAL_DBM_ADJ_DEFAULT               1</div><div class='add'>+#define ATH12K_WMI_SPECTRAL_CHN_MASK_DEFAULT              1</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_vdev_spectral_conf_arg {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 scan_count;</div><div class='add'>+	u32 scan_period;</div><div class='add'>+	u32 scan_priority;</div><div class='add'>+	u32 scan_fft_size;</div><div class='add'>+	u32 scan_gc_ena;</div><div class='add'>+	u32 scan_restart_ena;</div><div class='add'>+	u32 scan_noise_floor_ref;</div><div class='add'>+	u32 scan_init_delay;</div><div class='add'>+	u32 scan_nb_tone_thr;</div><div class='add'>+	u32 scan_str_bin_thr;</div><div class='add'>+	u32 scan_wb_rpt_mode;</div><div class='add'>+	u32 scan_rssi_rpt_mode;</div><div class='add'>+	u32 scan_rssi_thr;</div><div class='add'>+	u32 scan_pwr_format;</div><div class='add'>+	u32 scan_rpt_mode;</div><div class='add'>+	u32 scan_bin_scale;</div><div class='add'>+	u32 scan_dbm_adj;</div><div class='add'>+	u32 scan_chn_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_vdev_spectral_conf_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 scan_count;</div><div class='add'>+	__le32 scan_period;</div><div class='add'>+	__le32 scan_priority;</div><div class='add'>+	__le32 scan_fft_size;</div><div class='add'>+	__le32 scan_gc_ena;</div><div class='add'>+	__le32 scan_restart_ena;</div><div class='add'>+	__le32 scan_noise_floor_ref;</div><div class='add'>+	__le32 scan_init_delay;</div><div class='add'>+	__le32 scan_nb_tone_thr;</div><div class='add'>+	__le32 scan_str_bin_thr;</div><div class='add'>+	__le32 scan_wb_rpt_mode;</div><div class='add'>+	__le32 scan_rssi_rpt_mode;</div><div class='add'>+	__le32 scan_rssi_thr;</div><div class='add'>+	__le32 scan_pwr_format;</div><div class='add'>+	__le32 scan_rpt_mode;</div><div class='add'>+	__le32 scan_bin_scale;</div><div class='add'>+	__le32 scan_dbm_adj;</div><div class='add'>+	__le32 scan_chn_mask;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_WMI_SPECTRAL_TRIGGER_CMD_TRIGGER  1</div><div class='add'>+#define ATH12K_WMI_SPECTRAL_TRIGGER_CMD_CLEAR    2</div><div class='add'>+#define ATH12K_WMI_SPECTRAL_ENABLE_CMD_ENABLE    1</div><div class='add'>+#define ATH12K_WMI_SPECTRAL_ENABLE_CMD_DISABLE   2</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_vdev_spectral_enable_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 trigger_cmd;</div><div class='add'>+	__le32 enable_cmd;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_pdev_dma_ring_cfg_arg {</div><div class='add'>+	u32 tlv_header;</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+	u32 module_id;</div><div class='add'>+	u32 base_paddr_lo;</div><div class='add'>+	u32 base_paddr_hi;</div><div class='add'>+	u32 head_idx_paddr_lo;</div><div class='add'>+	u32 head_idx_paddr_hi;</div><div class='add'>+	u32 tail_idx_paddr_lo;</div><div class='add'>+	u32 tail_idx_paddr_hi;</div><div class='add'>+	u32 num_elems;</div><div class='add'>+	u32 buf_size;</div><div class='add'>+	u32 num_resp_per_event;</div><div class='add'>+	u32 event_timeout_ms;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_pdev_dma_ring_cfg_req_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 module_id;		/* see enum wmi_direct_buffer_module */</div><div class='add'>+	__le32 base_paddr_lo;</div><div class='add'>+	__le32 base_paddr_hi;</div><div class='add'>+	__le32 head_idx_paddr_lo;</div><div class='add'>+	__le32 head_idx_paddr_hi;</div><div class='add'>+	__le32 tail_idx_paddr_lo;</div><div class='add'>+	__le32 tail_idx_paddr_hi;</div><div class='add'>+	__le32 num_elems;		/* Number of elems in the ring */</div><div class='add'>+	__le32 buf_size;		/* size of allocated buffer in bytes */</div><div class='add'>+</div><div class='add'>+	/* Number of wmi_dma_buf_release_entry packed together */</div><div class='add'>+	__le32 num_resp_per_event;</div><div class='add'>+</div><div class='add'>+	/* Target should timeout and send whatever resp</div><div class='add'>+	 * it has if this time expires, units in milliseconds</div><div class='add'>+	 */</div><div class='add'>+	__le32 event_timeout_ms;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_dma_buf_release_fixed_params {</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 module_id;</div><div class='add'>+	__le32 num_buf_release_entry;</div><div class='add'>+	__le32 num_meta_data_entry;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_dma_buf_release_entry_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 paddr_lo;</div><div class='add'>+</div><div class='add'>+	/* Bits 11:0:   address of data</div><div class='add'>+	 * Bits 31:12:  host context data</div><div class='add'>+	 */</div><div class='add'>+	__le32 paddr_hi;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_SPECTRAL_META_INFO1_FREQ1		GENMASK(15, 0)</div><div class='add'>+#define WMI_SPECTRAL_META_INFO1_FREQ2		GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define WMI_SPECTRAL_META_INFO2_CHN_WIDTH	GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_dma_buf_release_meta_data_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	a_sle32 noise_floor[WMI_MAX_CHAINS];</div><div class='add'>+	__le32 reset_delay;</div><div class='add'>+	__le32 freq1;</div><div class='add'>+	__le32 freq2;</div><div class='add'>+	__le32 ch_width;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum wmi_fils_discovery_cmd_type {</div><div class='add'>+	WMI_FILS_DISCOVERY_CMD,</div><div class='add'>+	WMI_UNSOL_BCAST_PROBE_RESP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_fils_discovery_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 interval;</div><div class='add'>+	__le32 config; /* enum wmi_fils_discovery_cmd_type */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_fils_discovery_tmpl_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 buf_len;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_probe_tmpl_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 buf_len;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define MAX_RADIOS 2</div><div class='add'>+</div><div class='add'>+#define WMI_MLO_CMD_TIMEOUT_HZ (5 * HZ)</div><div class='add'>+#define WMI_SERVICE_READY_TIMEOUT_HZ (5 * HZ)</div><div class='add'>+#define WMI_SEND_TIMEOUT_HZ (3 * HZ)</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_pdev {</div><div class='add'>+	struct ath12k_wmi_base *wmi_ab;</div><div class='add'>+	enum ath12k_htc_ep_id eid;</div><div class='add'>+	u32 rx_decap_mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_hw_mode_freq_range_arg {</div><div class='add'>+	u32 low_2ghz_freq;</div><div class='add'>+	u32 high_2ghz_freq;</div><div class='add'>+	u32 low_5ghz_freq;</div><div class='add'>+	u32 high_5ghz_freq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_svc_ext_mac_phy_info {</div><div class='add'>+	enum wmi_host_hw_mode_config_type hw_mode_config_type;</div><div class='add'>+	u32 phy_id;</div><div class='add'>+	u32 supported_bands;</div><div class='add'>+	struct ath12k_hw_mode_freq_range_arg hw_freq_range;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_MAX_MAC_PHY_CAP	8</div><div class='add'>+</div><div class='add'>+struct ath12k_svc_ext_info {</div><div class='add'>+	u32 num_hw_modes;</div><div class='add'>+	struct ath12k_svc_ext_mac_phy_info mac_phy_info[ATH12K_MAX_MAC_PHY_CAP];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum ath12k_hw_mode - enum for host mode</div><div class='add'>+ * @ATH12K_HW_MODE_SMM: Single mac mode</div><div class='add'>+ * @ATH12K_HW_MODE_DBS: DBS mode</div><div class='add'>+ * @ATH12K_HW_MODE_SBS: SBS mode with either high share or low share</div><div class='add'>+ * @ATH12K_HW_MODE_SBS_UPPER_SHARE: Higher 5 GHz shared with 2.4 GHz</div><div class='add'>+ * @ATH12K_HW_MODE_SBS_LOWER_SHARE: Lower 5 GHz shared with 2.4 GHz</div><div class='add'>+ * @ATH12K_HW_MODE_MAX: Max, used to indicate invalid mode</div><div class='add'>+ */</div><div class='add'>+enum ath12k_hw_mode {</div><div class='add'>+	ATH12K_HW_MODE_SMM,</div><div class='add'>+	ATH12K_HW_MODE_DBS,</div><div class='add'>+	ATH12K_HW_MODE_SBS,</div><div class='add'>+	ATH12K_HW_MODE_SBS_UPPER_SHARE,</div><div class='add'>+	ATH12K_HW_MODE_SBS_LOWER_SHARE,</div><div class='add'>+	ATH12K_HW_MODE_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_hw_mode_info {</div><div class='add'>+	bool support_dbs:1;</div><div class='add'>+	bool support_sbs:1;</div><div class='add'>+</div><div class='add'>+	struct ath12k_hw_mode_freq_range_arg freq_range_caps[ATH12K_HW_MODE_MAX]</div><div class='add'>+							    [MAX_RADIOS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_base {</div><div class='add'>+	struct ath12k_base *ab;</div><div class='add'>+	struct ath12k_wmi_pdev wmi[MAX_RADIOS];</div><div class='add'>+	enum ath12k_htc_ep_id wmi_endpoint_id[MAX_RADIOS];</div><div class='add'>+	u32 max_msg_len[MAX_RADIOS];</div><div class='add'>+</div><div class='add'>+	struct completion service_ready;</div><div class='add'>+	struct completion unified_ready;</div><div class='add'>+	DECLARE_BITMAP(svc_map, WMI_MAX_EXT2_SERVICE);</div><div class='add'>+	wait_queue_head_t tx_credits_wq;</div><div class='add'>+	u32 num_mem_chunks;</div><div class='add'>+	u32 rx_decap_mode;</div><div class='add'>+	struct ath12k_wmi_host_mem_chunk_arg mem_chunks[WMI_MAX_MEM_REQS];</div><div class='add'>+</div><div class='add'>+	enum wmi_host_hw_mode_config_type preferred_hw_mode;</div><div class='add'>+</div><div class='add'>+	struct ath12k_wmi_target_cap_arg *targ_cap;</div><div class='add'>+</div><div class='add'>+	struct ath12k_svc_ext_info svc_ext_info;</div><div class='add'>+	u32 sbs_lower_band_end_freq;</div><div class='add'>+	struct ath12k_hw_mode_info hw_mode_info;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_pdev_set_bios_interface_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 param_type_id;</div><div class='add'>+	__le32 length;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum wmi_bios_param_type {</div><div class='add'>+	WMI_BIOS_PARAM_CCA_THRESHOLD_TYPE	= 0,</div><div class='add'>+	WMI_BIOS_PARAM_TAS_CONFIG_TYPE		= 1,</div><div class='add'>+	WMI_BIOS_PARAM_TAS_DATA_TYPE		= 2,</div><div class='add'>+</div><div class='add'>+	/* bandedge control power */</div><div class='add'>+	WMI_BIOS_PARAM_TYPE_BANDEDGE		= 3,</div><div class='add'>+</div><div class='add'>+	WMI_BIOS_PARAM_TYPE_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_pdev_set_bios_sar_table_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 sar_len;</div><div class='add'>+	__le32 dbs_backoff_len;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_pdev_set_bios_geo_table_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 geo_len;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ATH12K_FW_STATS_BUF_SIZE (1024 * 1024)</div><div class='add'>+</div><div class='add'>+enum wmi_sys_cap_info_flags {</div><div class='add'>+	WMI_SYS_CAP_INFO_RXTX_LED	= BIT(0),</div><div class='add'>+	WMI_SYS_CAP_INFO_RFKILL		= BIT(1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WMI_RFKILL_CFG_GPIO_PIN_NUM		GENMASK(5, 0)</div><div class='add'>+#define WMI_RFKILL_CFG_RADIO_LEVEL		BIT(6)</div><div class='add'>+#define WMI_RFKILL_CFG_PIN_AS_GPIO		GENMASK(10, 7)</div><div class='add'>+</div><div class='add'>+enum wmi_rfkill_enable_radio {</div><div class='add'>+	WMI_RFKILL_ENABLE_RADIO_ON	= 0,</div><div class='add'>+	WMI_RFKILL_ENABLE_RADIO_OFF	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_rfkill_radio_state {</div><div class='add'>+	WMI_RFKILL_RADIO_STATE_OFF	= 1,</div><div class='add'>+	WMI_RFKILL_RADIO_STATE_ON	= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_rfkill_state_change_event {</div><div class='add'>+	__le32 gpio_pin_num;</div><div class='add'>+	__le32 int_type;</div><div class='add'>+	__le32 radio_state;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_twt_enable_event {</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 status;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_twt_disable_event {</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 status;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_mlo_setup_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 mld_group_id;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_mlo_setup_arg {</div><div class='add'>+	__le32 group_id;</div><div class='add'>+	u8 num_partner_links;</div><div class='add'>+	u8 *partner_link_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_mlo_ready_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum wmi_mlo_tear_down_reason_code_type {</div><div class='add'>+	WMI_MLO_TEARDOWN_SSR_REASON,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_mlo_teardown_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 reason_code;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_mlo_setup_complete_event {</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 status;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_mlo_teardown_complete_event {</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 status;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* WOW structures */</div><div class='add'>+enum wmi_wow_wakeup_event {</div><div class='add'>+	WOW_BMISS_EVENT = 0,</div><div class='add'>+	WOW_BETTER_AP_EVENT,</div><div class='add'>+	WOW_DEAUTH_RECVD_EVENT,</div><div class='add'>+	WOW_MAGIC_PKT_RECVD_EVENT,</div><div class='add'>+	WOW_GTK_ERR_EVENT,</div><div class='add'>+	WOW_FOURWAY_HSHAKE_EVENT,</div><div class='add'>+	WOW_EAPOL_RECVD_EVENT,</div><div class='add'>+	WOW_NLO_DETECTED_EVENT,</div><div class='add'>+	WOW_DISASSOC_RECVD_EVENT,</div><div class='add'>+	WOW_PATTERN_MATCH_EVENT,</div><div class='add'>+	WOW_CSA_IE_EVENT,</div><div class='add'>+	WOW_PROBE_REQ_WPS_IE_EVENT,</div><div class='add'>+	WOW_AUTH_REQ_EVENT,</div><div class='add'>+	WOW_ASSOC_REQ_EVENT,</div><div class='add'>+	WOW_HTT_EVENT,</div><div class='add'>+	WOW_RA_MATCH_EVENT,</div><div class='add'>+	WOW_HOST_AUTO_SHUTDOWN_EVENT,</div><div class='add'>+	WOW_IOAC_MAGIC_EVENT,</div><div class='add'>+	WOW_IOAC_SHORT_EVENT,</div><div class='add'>+	WOW_IOAC_EXTEND_EVENT,</div><div class='add'>+	WOW_IOAC_TIMER_EVENT,</div><div class='add'>+	WOW_DFS_PHYERR_RADAR_EVENT,</div><div class='add'>+	WOW_BEACON_EVENT,</div><div class='add'>+	WOW_CLIENT_KICKOUT_EVENT,</div><div class='add'>+	WOW_EVENT_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_wow_interface_cfg {</div><div class='add'>+	WOW_IFACE_PAUSE_ENABLED,</div><div class='add'>+	WOW_IFACE_PAUSE_DISABLED</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define C2S(x) case x: return #x</div><div class='add'>+</div><div class='add'>+static inline const char *wow_wakeup_event(enum wmi_wow_wakeup_event ev)</div><div class='add'>+{</div><div class='add'>+	switch (ev) {</div><div class='add'>+	C2S(WOW_BMISS_EVENT);</div><div class='add'>+	C2S(WOW_BETTER_AP_EVENT);</div><div class='add'>+	C2S(WOW_DEAUTH_RECVD_EVENT);</div><div class='add'>+	C2S(WOW_MAGIC_PKT_RECVD_EVENT);</div><div class='add'>+	C2S(WOW_GTK_ERR_EVENT);</div><div class='add'>+	C2S(WOW_FOURWAY_HSHAKE_EVENT);</div><div class='add'>+	C2S(WOW_EAPOL_RECVD_EVENT);</div><div class='add'>+	C2S(WOW_NLO_DETECTED_EVENT);</div><div class='add'>+	C2S(WOW_DISASSOC_RECVD_EVENT);</div><div class='add'>+	C2S(WOW_PATTERN_MATCH_EVENT);</div><div class='add'>+	C2S(WOW_CSA_IE_EVENT);</div><div class='add'>+	C2S(WOW_PROBE_REQ_WPS_IE_EVENT);</div><div class='add'>+	C2S(WOW_AUTH_REQ_EVENT);</div><div class='add'>+	C2S(WOW_ASSOC_REQ_EVENT);</div><div class='add'>+	C2S(WOW_HTT_EVENT);</div><div class='add'>+	C2S(WOW_RA_MATCH_EVENT);</div><div class='add'>+	C2S(WOW_HOST_AUTO_SHUTDOWN_EVENT);</div><div class='add'>+	C2S(WOW_IOAC_MAGIC_EVENT);</div><div class='add'>+	C2S(WOW_IOAC_SHORT_EVENT);</div><div class='add'>+	C2S(WOW_IOAC_EXTEND_EVENT);</div><div class='add'>+	C2S(WOW_IOAC_TIMER_EVENT);</div><div class='add'>+	C2S(WOW_DFS_PHYERR_RADAR_EVENT);</div><div class='add'>+	C2S(WOW_BEACON_EVENT);</div><div class='add'>+	C2S(WOW_CLIENT_KICKOUT_EVENT);</div><div class='add'>+	C2S(WOW_EVENT_MAX);</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum wmi_wow_wake_reason {</div><div class='add'>+	WOW_REASON_UNSPECIFIED = -1,</div><div class='add'>+	WOW_REASON_NLOD = 0,</div><div class='add'>+	WOW_REASON_AP_ASSOC_LOST,</div><div class='add'>+	WOW_REASON_LOW_RSSI,</div><div class='add'>+	WOW_REASON_DEAUTH_RECVD,</div><div class='add'>+	WOW_REASON_DISASSOC_RECVD,</div><div class='add'>+	WOW_REASON_GTK_HS_ERR,</div><div class='add'>+	WOW_REASON_EAP_REQ,</div><div class='add'>+	WOW_REASON_FOURWAY_HS_RECV,</div><div class='add'>+	WOW_REASON_TIMER_INTR_RECV,</div><div class='add'>+	WOW_REASON_PATTERN_MATCH_FOUND,</div><div class='add'>+	WOW_REASON_RECV_MAGIC_PATTERN,</div><div class='add'>+	WOW_REASON_P2P_DISC,</div><div class='add'>+	WOW_REASON_WLAN_HB,</div><div class='add'>+	WOW_REASON_CSA_EVENT,</div><div class='add'>+	WOW_REASON_PROBE_REQ_WPS_IE_RECV,</div><div class='add'>+	WOW_REASON_AUTH_REQ_RECV,</div><div class='add'>+	WOW_REASON_ASSOC_REQ_RECV,</div><div class='add'>+	WOW_REASON_HTT_EVENT,</div><div class='add'>+	WOW_REASON_RA_MATCH,</div><div class='add'>+	WOW_REASON_HOST_AUTO_SHUTDOWN,</div><div class='add'>+	WOW_REASON_IOAC_MAGIC_EVENT,</div><div class='add'>+	WOW_REASON_IOAC_SHORT_EVENT,</div><div class='add'>+	WOW_REASON_IOAC_EXTEND_EVENT,</div><div class='add'>+	WOW_REASON_IOAC_TIMER_EVENT,</div><div class='add'>+	WOW_REASON_ROAM_HO,</div><div class='add'>+	WOW_REASON_DFS_PHYERR_RADADR_EVENT,</div><div class='add'>+	WOW_REASON_BEACON_RECV,</div><div class='add'>+	WOW_REASON_CLIENT_KICKOUT_EVENT,</div><div class='add'>+	WOW_REASON_PAGE_FAULT = 0x3a,</div><div class='add'>+	WOW_REASON_DEBUG_TEST = 0xFF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline const char *wow_reason(enum wmi_wow_wake_reason reason)</div><div class='add'>+{</div><div class='add'>+	switch (reason) {</div><div class='add'>+	C2S(WOW_REASON_UNSPECIFIED);</div><div class='add'>+	C2S(WOW_REASON_NLOD);</div><div class='add'>+	C2S(WOW_REASON_AP_ASSOC_LOST);</div><div class='add'>+	C2S(WOW_REASON_LOW_RSSI);</div><div class='add'>+	C2S(WOW_REASON_DEAUTH_RECVD);</div><div class='add'>+	C2S(WOW_REASON_DISASSOC_RECVD);</div><div class='add'>+	C2S(WOW_REASON_GTK_HS_ERR);</div><div class='add'>+	C2S(WOW_REASON_EAP_REQ);</div><div class='add'>+	C2S(WOW_REASON_FOURWAY_HS_RECV);</div><div class='add'>+	C2S(WOW_REASON_TIMER_INTR_RECV);</div><div class='add'>+	C2S(WOW_REASON_PATTERN_MATCH_FOUND);</div><div class='add'>+	C2S(WOW_REASON_RECV_MAGIC_PATTERN);</div><div class='add'>+	C2S(WOW_REASON_P2P_DISC);</div><div class='add'>+	C2S(WOW_REASON_WLAN_HB);</div><div class='add'>+	C2S(WOW_REASON_CSA_EVENT);</div><div class='add'>+	C2S(WOW_REASON_PROBE_REQ_WPS_IE_RECV);</div><div class='add'>+	C2S(WOW_REASON_AUTH_REQ_RECV);</div><div class='add'>+	C2S(WOW_REASON_ASSOC_REQ_RECV);</div><div class='add'>+	C2S(WOW_REASON_HTT_EVENT);</div><div class='add'>+	C2S(WOW_REASON_RA_MATCH);</div><div class='add'>+	C2S(WOW_REASON_HOST_AUTO_SHUTDOWN);</div><div class='add'>+	C2S(WOW_REASON_IOAC_MAGIC_EVENT);</div><div class='add'>+	C2S(WOW_REASON_IOAC_SHORT_EVENT);</div><div class='add'>+	C2S(WOW_REASON_IOAC_EXTEND_EVENT);</div><div class='add'>+	C2S(WOW_REASON_IOAC_TIMER_EVENT);</div><div class='add'>+	C2S(WOW_REASON_ROAM_HO);</div><div class='add'>+	C2S(WOW_REASON_DFS_PHYERR_RADADR_EVENT);</div><div class='add'>+	C2S(WOW_REASON_BEACON_RECV);</div><div class='add'>+	C2S(WOW_REASON_CLIENT_KICKOUT_EVENT);</div><div class='add'>+	C2S(WOW_REASON_PAGE_FAULT);</div><div class='add'>+	C2S(WOW_REASON_DEBUG_TEST);</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#undef C2S</div><div class='add'>+</div><div class='add'>+#define WOW_DEFAULT_BITMAP_PATTERN_SIZE		148</div><div class='add'>+#define WOW_DEFAULT_BITMASK_SIZE		148</div><div class='add'>+</div><div class='add'>+#define WOW_MIN_PATTERN_SIZE	1</div><div class='add'>+#define WOW_MAX_PATTERN_SIZE	148</div><div class='add'>+#define WOW_MAX_PKT_OFFSET	128</div><div class='add'>+#define WOW_HDR_LEN	(sizeof(struct ieee80211_hdr_3addr) + \</div><div class='add'>+	sizeof(struct rfc1042_hdr))</div><div class='add'>+#define WOW_MAX_REDUCE	(WOW_HDR_LEN - sizeof(struct ethhdr) - \</div><div class='add'>+	offsetof(struct ieee80211_hdr_3addr, addr1))</div><div class='add'>+</div><div class='add'>+struct wmi_wow_bitmap_pattern_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	u8 patternbuf[WOW_DEFAULT_BITMAP_PATTERN_SIZE];</div><div class='add'>+	u8 bitmaskbuf[WOW_DEFAULT_BITMASK_SIZE];</div><div class='add'>+	__le32 pattern_offset;</div><div class='add'>+	__le32 pattern_len;</div><div class='add'>+	__le32 bitmask_len;</div><div class='add'>+	__le32 pattern_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_wow_add_pattern_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 pattern_id;</div><div class='add'>+	__le32 pattern_type;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_wow_del_pattern_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 pattern_id;</div><div class='add'>+	__le32 pattern_type;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum wmi_tlv_pattern_type {</div><div class='add'>+	WOW_PATTERN_MIN = 0,</div><div class='add'>+	WOW_BITMAP_PATTERN = WOW_PATTERN_MIN,</div><div class='add'>+	WOW_IPV4_SYNC_PATTERN,</div><div class='add'>+	WOW_IPV6_SYNC_PATTERN,</div><div class='add'>+	WOW_WILD_CARD_PATTERN,</div><div class='add'>+	WOW_TIMER_PATTERN,</div><div class='add'>+	WOW_MAGIC_PATTERN,</div><div class='add'>+	WOW_IPV6_RA_PATTERN,</div><div class='add'>+	WOW_IOAC_PKT_PATTERN,</div><div class='add'>+	WOW_IOAC_TMR_PATTERN,</div><div class='add'>+	WOW_PATTERN_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_wow_add_del_event_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 is_add;</div><div class='add'>+	__le32 event_bitmap;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_wow_enable_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 enable;</div><div class='add'>+	__le32 pause_iface_config;</div><div class='add'>+	__le32 flags;</div><div class='add'>+}  __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_wow_host_wakeup_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 reserved;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_wow_ev_param {</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 flag;</div><div class='add'>+	__le32 wake_reason;</div><div class='add'>+	__le32 data_len;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_wow_ev_pg_fault_param {</div><div class='add'>+	__le32 len;</div><div class='add'>+	u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_wow_ev_arg {</div><div class='add'>+	enum wmi_wow_wake_reason wake_reason;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WMI_PNO_MAX_SCHED_SCAN_PLANS      2</div><div class='add'>+#define WMI_PNO_MAX_SCHED_SCAN_PLAN_INT   7200</div><div class='add'>+#define WMI_PNO_MAX_SCHED_SCAN_PLAN_ITRNS 100</div><div class='add'>+#define WMI_PNO_MAX_NETW_CHANNELS         26</div><div class='add'>+#define WMI_PNO_MAX_NETW_CHANNELS_EX      60</div><div class='add'>+#define WMI_PNO_MAX_SUPP_NETWORKS         WLAN_SCAN_PARAMS_MAX_SSID</div><div class='add'>+#define WMI_PNO_MAX_IE_LENGTH             WLAN_SCAN_PARAMS_MAX_IE_LEN</div><div class='add'>+</div><div class='add'>+/* size based of dot11 declaration without extra IEs as we will not carry those for PNO */</div><div class='add'>+#define WMI_PNO_MAX_PB_REQ_SIZE    450</div><div class='add'>+</div><div class='add'>+#define WMI_PNO_24GHZ_DEFAULT_CH     1</div><div class='add'>+#define WMI_PNO_5GHZ_DEFAULT_CH      36</div><div class='add'>+</div><div class='add'>+#define WMI_ACTIVE_MAX_CHANNEL_TIME 40</div><div class='add'>+#define WMI_PASSIVE_MAX_CHANNEL_TIME   110</div><div class='add'>+</div><div class='add'>+/* SSID broadcast type */</div><div class='add'>+enum wmi_ssid_bcast_type {</div><div class='add'>+	BCAST_UNKNOWN      = 0,</div><div class='add'>+	BCAST_NORMAL       = 1,</div><div class='add'>+	BCAST_HIDDEN       = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WMI_NLO_MAX_SSIDS    16</div><div class='add'>+#define WMI_NLO_MAX_CHAN     48</div><div class='add'>+</div><div class='add'>+#define WMI_NLO_CONFIG_STOP                             BIT(0)</div><div class='add'>+#define WMI_NLO_CONFIG_START                            BIT(1)</div><div class='add'>+#define WMI_NLO_CONFIG_RESET                            BIT(2)</div><div class='add'>+#define WMI_NLO_CONFIG_SLOW_SCAN                        BIT(4)</div><div class='add'>+#define WMI_NLO_CONFIG_FAST_SCAN                        BIT(5)</div><div class='add'>+#define WMI_NLO_CONFIG_SSID_HIDE_EN                     BIT(6)</div><div class='add'>+</div><div class='add'>+/* This bit is used to indicate if EPNO or supplicant PNO is enabled.</div><div class='add'>+ * Only one of them can be enabled at a given time</div><div class='add'>+ */</div><div class='add'>+#define WMI_NLO_CONFIG_ENLO                             BIT(7)</div><div class='add'>+#define WMI_NLO_CONFIG_SCAN_PASSIVE                     BIT(8)</div><div class='add'>+#define WMI_NLO_CONFIG_ENLO_RESET                       BIT(9)</div><div class='add'>+#define WMI_NLO_CONFIG_SPOOFED_MAC_IN_PROBE_REQ         BIT(10)</div><div class='add'>+#define WMI_NLO_CONFIG_RANDOM_SEQ_NO_IN_PROBE_REQ       BIT(11)</div><div class='add'>+#define WMI_NLO_CONFIG_ENABLE_IE_WHITELIST_IN_PROBE_REQ BIT(12)</div><div class='add'>+#define WMI_NLO_CONFIG_ENABLE_CNLO_RSSI_CONFIG          BIT(13)</div><div class='add'>+</div><div class='add'>+struct wmi_nlo_ssid_params {</div><div class='add'>+	__le32 valid;</div><div class='add'>+	struct ath12k_wmi_ssid_params ssid;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_nlo_enc_params {</div><div class='add'>+	__le32 valid;</div><div class='add'>+	__le32 enc_type;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_nlo_auth_params {</div><div class='add'>+	__le32 valid;</div><div class='add'>+	__le32 auth_type;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_nlo_bcast_nw_params {</div><div class='add'>+	__le32 valid;</div><div class='add'>+	__le32 bcast_nw_type;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_nlo_rssi_params {</div><div class='add'>+	__le32 valid;</div><div class='add'>+	__le32 rssi;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct nlo_configured_params {</div><div class='add'>+	/* TLV tag and len;*/</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	struct wmi_nlo_ssid_params ssid;</div><div class='add'>+	struct wmi_nlo_enc_params enc_type;</div><div class='add'>+	struct wmi_nlo_auth_params auth_type;</div><div class='add'>+	struct wmi_nlo_rssi_params rssi_cond;</div><div class='add'>+</div><div class='add'>+	/* indicates if the SSID is hidden or not */</div><div class='add'>+	struct wmi_nlo_bcast_nw_params bcast_nw_type;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_network_type_arg {</div><div class='add'>+	struct cfg80211_ssid ssid;</div><div class='add'>+	u32 authentication;</div><div class='add'>+	u32 encryption;</div><div class='add'>+	u32 bcast_nw_type;</div><div class='add'>+	u8 channel_count;</div><div class='add'>+	u16 channels[WMI_PNO_MAX_NETW_CHANNELS_EX];</div><div class='add'>+	s32 rssi_threshold;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_pno_scan_req_arg {</div><div class='add'>+	u8 enable;</div><div class='add'>+	u8 vdev_id;</div><div class='add'>+	u8 uc_networks_count;</div><div class='add'>+	struct wmi_network_type_arg a_networks[WMI_PNO_MAX_SUPP_NETWORKS];</div><div class='add'>+	u32 fast_scan_period;</div><div class='add'>+	u32 slow_scan_period;</div><div class='add'>+	u8 fast_scan_max_cycles;</div><div class='add'>+</div><div class='add'>+	bool do_passive_scan;</div><div class='add'>+</div><div class='add'>+	u32 delay_start_time;</div><div class='add'>+	u32 active_min_time;</div><div class='add'>+	u32 active_max_time;</div><div class='add'>+	u32 passive_min_time;</div><div class='add'>+	u32 passive_max_time;</div><div class='add'>+</div><div class='add'>+	/* mac address randomization attributes */</div><div class='add'>+	u32 enable_pno_scan_randomization;</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='add'>+	u8 mac_addr_mask[ETH_ALEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_wow_nlo_config_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 flags;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 fast_scan_max_cycles;</div><div class='add'>+	__le32 active_dwell_time;</div><div class='add'>+	__le32 passive_dwell_time;</div><div class='add'>+	__le32 probe_bundle_size;</div><div class='add'>+</div><div class='add'>+	/* ART = IRT */</div><div class='add'>+	__le32 rest_time;</div><div class='add'>+</div><div class='add'>+	/* max value that can be reached after scan_backoff_multiplier */</div><div class='add'>+	__le32 max_rest_time;</div><div class='add'>+</div><div class='add'>+	__le32 scan_backoff_multiplier;</div><div class='add'>+	__le32 fast_scan_period;</div><div class='add'>+</div><div class='add'>+	/* specific to windows */</div><div class='add'>+	__le32 slow_scan_period;</div><div class='add'>+</div><div class='add'>+	__le32 no_of_ssids;</div><div class='add'>+</div><div class='add'>+	__le32 num_of_channels;</div><div class='add'>+</div><div class='add'>+	/* NLO scan start delay time in milliseconds */</div><div class='add'>+	__le32 delay_start_time;</div><div class='add'>+</div><div class='add'>+	/* MAC Address to use in Probe Req as SA */</div><div class='add'>+	struct ath12k_wmi_mac_addr_params mac_addr;</div><div class='add'>+</div><div class='add'>+	/* Mask on which MAC has to be randomized */</div><div class='add'>+	struct ath12k_wmi_mac_addr_params mac_mask;</div><div class='add'>+</div><div class='add'>+	/* IE bitmap to use in Probe Req */</div><div class='add'>+	__le32 ie_bitmap[8];</div><div class='add'>+</div><div class='add'>+	/* Number of vendor OUIs. In the TLV vendor_oui[] */</div><div class='add'>+	__le32 num_vendor_oui;</div><div class='add'>+</div><div class='add'>+	/* Number of connected NLO band preferences */</div><div class='add'>+	__le32 num_cnlo_band_pref;</div><div class='add'>+</div><div class='add'>+	/* The TLVs will follow.</div><div class='add'>+	 * nlo_configured_params nlo_list[];</div><div class='add'>+	 * u32 channel_list[num_of_channels];</div><div class='add'>+	 */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* Definition of HW data filtering */</div><div class='add'>+enum hw_data_filter_type {</div><div class='add'>+	WMI_HW_DATA_FILTER_DROP_NON_ARP_BC = BIT(0),</div><div class='add'>+	WMI_HW_DATA_FILTER_DROP_NON_ICMPV6_MC = BIT(1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_hw_data_filter_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 enable;</div><div class='add'>+	__le32 hw_filter_bitmap;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_hw_data_filter_arg {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	bool enable;</div><div class='add'>+	u32 hw_filter_bitmap;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WMI_IPV6_UC_TYPE     0</div><div class='add'>+#define WMI_IPV6_AC_TYPE     1</div><div class='add'>+</div><div class='add'>+#define WMI_IPV6_MAX_COUNT   16</div><div class='add'>+#define WMI_IPV4_MAX_COUNT   2</div><div class='add'>+</div><div class='add'>+struct wmi_arp_ns_offload_arg {</div><div class='add'>+	u8  ipv4_addr[WMI_IPV4_MAX_COUNT][4];</div><div class='add'>+	u32 ipv4_count;</div><div class='add'>+	u32 ipv6_count;</div><div class='add'>+	u8  ipv6_addr[WMI_IPV6_MAX_COUNT][16];</div><div class='add'>+	u8  self_ipv6_addr[WMI_IPV6_MAX_COUNT][16];</div><div class='add'>+	u8  ipv6_type[WMI_IPV6_MAX_COUNT];</div><div class='add'>+	bool ipv6_valid[WMI_IPV6_MAX_COUNT];</div><div class='add'>+	u8  mac_addr[ETH_ALEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WMI_MAX_NS_OFFLOADS           2</div><div class='add'>+#define WMI_MAX_ARP_OFFLOADS          2</div><div class='add'>+</div><div class='add'>+#define WMI_ARPOL_FLAGS_VALID              BIT(0)</div><div class='add'>+#define WMI_ARPOL_FLAGS_MAC_VALID          BIT(1)</div><div class='add'>+#define WMI_ARPOL_FLAGS_REMOTE_IP_VALID    BIT(2)</div><div class='add'>+</div><div class='add'>+struct wmi_arp_offload_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 flags;</div><div class='add'>+	u8 target_ipaddr[4];</div><div class='add'>+	u8 remote_ipaddr[4];</div><div class='add'>+	struct ath12k_wmi_mac_addr_params target_mac;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_NSOL_FLAGS_VALID               BIT(0)</div><div class='add'>+#define WMI_NSOL_FLAGS_MAC_VALID           BIT(1)</div><div class='add'>+#define WMI_NSOL_FLAGS_REMOTE_IP_VALID     BIT(2)</div><div class='add'>+#define WMI_NSOL_FLAGS_IS_IPV6_ANYCAST     BIT(3)</div><div class='add'>+</div><div class='add'>+#define WMI_NSOL_MAX_TARGET_IPS    2</div><div class='add'>+</div><div class='add'>+struct wmi_ns_offload_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 flags;</div><div class='add'>+	u8 target_ipaddr[WMI_NSOL_MAX_TARGET_IPS][16];</div><div class='add'>+	u8 solicitation_ipaddr[16];</div><div class='add'>+	u8 remote_ipaddr[16];</div><div class='add'>+	struct ath12k_wmi_mac_addr_params target_mac;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_set_arp_ns_offload_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 flags;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 num_ns_ext_tuples;</div><div class='add'>+	/* The TLVs follow:</div><div class='add'>+	 * wmi_ns_offload_params  ns[WMI_MAX_NS_OFFLOADS];</div><div class='add'>+	 * wmi_arp_offload_params arp[WMI_MAX_ARP_OFFLOADS];</div><div class='add'>+	 * wmi_ns_offload_params  ns_ext[num_ns_ext_tuples];</div><div class='add'>+	 */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define GTK_OFFLOAD_OPCODE_MASK             0xFF000000</div><div class='add'>+#define GTK_OFFLOAD_ENABLE_OPCODE           0x01000000</div><div class='add'>+#define GTK_OFFLOAD_DISABLE_OPCODE          0x02000000</div><div class='add'>+#define GTK_OFFLOAD_REQUEST_STATUS_OPCODE   0x04000000</div><div class='add'>+</div><div class='add'>+#define GTK_OFFLOAD_KEK_BYTES       16</div><div class='add'>+#define GTK_OFFLOAD_KCK_BYTES       16</div><div class='add'>+#define GTK_REPLAY_COUNTER_BYTES    8</div><div class='add'>+#define WMI_MAX_KEY_LEN             32</div><div class='add'>+#define IGTK_PN_SIZE                6</div><div class='add'>+</div><div class='add'>+struct wmi_gtk_offload_status_event {</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 flags;</div><div class='add'>+	__le32 refresh_cnt;</div><div class='add'>+	__le64 replay_ctr;</div><div class='add'>+	u8 igtk_key_index;</div><div class='add'>+	u8 igtk_key_length;</div><div class='add'>+	u8 igtk_key_rsc[IGTK_PN_SIZE];</div><div class='add'>+	u8 igtk_key[WMI_MAX_KEY_LEN];</div><div class='add'>+	u8 gtk_key_index;</div><div class='add'>+	u8 gtk_key_length;</div><div class='add'>+	u8 gtk_key_rsc[GTK_REPLAY_COUNTER_BYTES];</div><div class='add'>+	u8 gtk_key[WMI_MAX_KEY_LEN];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_gtk_rekey_offload_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 flags;</div><div class='add'>+	u8 kek[GTK_OFFLOAD_KEK_BYTES];</div><div class='add'>+	u8 kck[GTK_OFFLOAD_KCK_BYTES];</div><div class='add'>+	u8 replay_ctr[GTK_REPLAY_COUNTER_BYTES];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_sta_keepalive_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 enabled;</div><div class='add'>+</div><div class='add'>+	/* WMI_STA_KEEPALIVE_METHOD_ */</div><div class='add'>+	__le32 method;</div><div class='add'>+</div><div class='add'>+	/* in seconds */</div><div class='add'>+	__le32 interval;</div><div class='add'>+</div><div class='add'>+	/* following this structure is the TLV for struct</div><div class='add'>+	 * wmi_sta_keepalive_arp_resp_params</div><div class='add'>+	 */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_sta_keepalive_arp_resp_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 src_ip4_addr;</div><div class='add'>+	__le32 dest_ip4_addr;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params dest_mac_addr;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_sta_keepalive_arg {</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 enabled;</div><div class='add'>+	u32 method;</div><div class='add'>+	u32 interval;</div><div class='add'>+	u32 src_ip4_addr;</div><div class='add'>+	u32 dest_ip4_addr;</div><div class='add'>+	const u8 dest_mac_addr[ETH_ALEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_sta_keepalive_method {</div><div class='add'>+	WMI_STA_KEEPALIVE_METHOD_NULL_FRAME = 1,</div><div class='add'>+	WMI_STA_KEEPALIVE_METHOD_UNSOLICITED_ARP_RESPONSE = 2,</div><div class='add'>+	WMI_STA_KEEPALIVE_METHOD_ETHERNET_LOOPBACK = 3,</div><div class='add'>+	WMI_STA_KEEPALIVE_METHOD_GRATUITOUS_ARP_REQUEST = 4,</div><div class='add'>+	WMI_STA_KEEPALIVE_METHOD_MGMT_VENDOR_ACTION = 5,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WMI_STA_KEEPALIVE_INTERVAL_DEFAULT	30</div><div class='add'>+#define WMI_STA_KEEPALIVE_INTERVAL_DISABLE	0</div><div class='add'>+</div><div class='add'>+struct wmi_stats_event {</div><div class='add'>+	__le32 stats_id;</div><div class='add'>+	__le32 num_pdev_stats;</div><div class='add'>+	__le32 num_vdev_stats;</div><div class='add'>+	__le32 num_peer_stats;</div><div class='add'>+	__le32 num_bcnflt_stats;</div><div class='add'>+	__le32 num_chan_stats;</div><div class='add'>+	__le32 num_mib_stats;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 num_bcn_stats;</div><div class='add'>+	__le32 num_peer_extd_stats;</div><div class='add'>+	__le32 num_peer_extd2_stats;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum wmi_stats_id {</div><div class='add'>+	WMI_REQUEST_PDEV_STAT		= BIT(2),</div><div class='add'>+	WMI_REQUEST_VDEV_STAT		= BIT(3),</div><div class='add'>+	WMI_REQUEST_RSSI_PER_CHAIN_STAT	= BIT(8),</div><div class='add'>+	WMI_REQUEST_BCN_STAT		= BIT(11),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_request_stats_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 stats_id;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params peer_macaddr;</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_rssi_stat_params {</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 rssi_avg_beacon[WMI_MAX_CHAINS];</div><div class='add'>+	__le32 rssi_avg_data[WMI_MAX_CHAINS];</div><div class='add'>+	struct ath12k_wmi_mac_addr_params peer_macaddr;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_per_chain_rssi_stat_params {</div><div class='add'>+	__le32 num_per_chain_rssi;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WLAN_MAX_AC 4</div><div class='add'>+#define MAX_TX_RATE_VALUES 10</div><div class='add'>+</div><div class='add'>+struct wmi_vdev_stats_params {</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 beacon_snr;</div><div class='add'>+	__le32 data_snr;</div><div class='add'>+	__le32 num_tx_frames[WLAN_MAX_AC];</div><div class='add'>+	__le32 num_rx_frames;</div><div class='add'>+	__le32 num_tx_frames_retries[WLAN_MAX_AC];</div><div class='add'>+	__le32 num_tx_frames_failures[WLAN_MAX_AC];</div><div class='add'>+	__le32 num_rts_fail;</div><div class='add'>+	__le32 num_rts_success;</div><div class='add'>+	__le32 num_rx_err;</div><div class='add'>+	__le32 num_rx_discard;</div><div class='add'>+	__le32 num_tx_not_acked;</div><div class='add'>+	__le32 tx_rate_history[MAX_TX_RATE_VALUES];</div><div class='add'>+	__le32 beacon_rssi_history[MAX_TX_RATE_VALUES];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_bcn_stats_params {</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+	__le32 tx_bcn_succ_cnt;</div><div class='add'>+	__le32 tx_bcn_outage_cnt;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_pdev_base_stats_params {</div><div class='add'>+	a_sle32 chan_nf;</div><div class='add'>+	__le32 tx_frame_count; /* Cycles spent transmitting frames */</div><div class='add'>+	__le32 rx_frame_count; /* Cycles spent receiving frames */</div><div class='add'>+	__le32 rx_clear_count; /* Total channel busy time, evidently */</div><div class='add'>+	__le32 cycle_count; /* Total on-channel time */</div><div class='add'>+	__le32 phy_err_count;</div><div class='add'>+	__le32 chan_tx_pwr;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_pdev_tx_stats_params {</div><div class='add'>+	a_sle32 comp_queued;</div><div class='add'>+	a_sle32 comp_delivered;</div><div class='add'>+	a_sle32 msdu_enqued;</div><div class='add'>+	a_sle32 mpdu_enqued;</div><div class='add'>+	a_sle32 wmm_drop;</div><div class='add'>+	a_sle32 local_enqued;</div><div class='add'>+	a_sle32 local_freed;</div><div class='add'>+	a_sle32 hw_queued;</div><div class='add'>+	a_sle32 hw_reaped;</div><div class='add'>+	a_sle32 underrun;</div><div class='add'>+	a_sle32 tx_abort;</div><div class='add'>+	a_sle32 mpdus_requed;</div><div class='add'>+	__le32 tx_ko;</div><div class='add'>+	__le32 data_rc;</div><div class='add'>+	__le32 self_triggers;</div><div class='add'>+	__le32 sw_retry_failure;</div><div class='add'>+	__le32 illgl_rate_phy_err;</div><div class='add'>+	__le32 pdev_cont_xretry;</div><div class='add'>+	__le32 pdev_tx_timeout;</div><div class='add'>+	__le32 pdev_resets;</div><div class='add'>+	__le32 stateless_tid_alloc_failure;</div><div class='add'>+	__le32 phy_underrun;</div><div class='add'>+	__le32 txop_ovf;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_pdev_rx_stats_params {</div><div class='add'>+	a_sle32 mid_ppdu_route_change;</div><div class='add'>+	a_sle32 status_rcvd;</div><div class='add'>+	a_sle32 r0_frags;</div><div class='add'>+	a_sle32 r1_frags;</div><div class='add'>+	a_sle32 r2_frags;</div><div class='add'>+	a_sle32 r3_frags;</div><div class='add'>+	a_sle32 htt_msdus;</div><div class='add'>+	a_sle32 htt_mpdus;</div><div class='add'>+	a_sle32 loc_msdus;</div><div class='add'>+	a_sle32 loc_mpdus;</div><div class='add'>+	a_sle32 oversize_amsdu;</div><div class='add'>+	a_sle32 phy_errs;</div><div class='add'>+	a_sle32 phy_err_drop;</div><div class='add'>+	a_sle32 mpdu_errs;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_pdev_stats_params {</div><div class='add'>+	struct ath12k_wmi_pdev_base_stats_params base;</div><div class='add'>+	struct ath12k_wmi_pdev_tx_stats_params tx;</div><div class='add'>+	struct ath12k_wmi_pdev_rx_stats_params rx;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_fw_stats_req_params {</div><div class='add'>+	u32 stats_id;</div><div class='add'>+	u32 vdev_id;</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WMI_REQ_CTRL_PATH_PDEV_TX_STAT		1</div><div class='add'>+#define WMI_REQUEST_CTRL_PATH_STAT_GET		1</div><div class='add'>+</div><div class='add'>+#define WMI_TPC_CONFIG			BIT(1)</div><div class='add'>+#define WMI_TPC_REG_PWR_ALLOWED		BIT(2)</div><div class='add'>+#define WMI_TPC_RATES_ARRAY1		BIT(3)</div><div class='add'>+#define WMI_TPC_RATES_ARRAY2		BIT(4)</div><div class='add'>+#define WMI_TPC_RATES_DL_OFDMA_ARRAY	BIT(5)</div><div class='add'>+#define WMI_TPC_CTL_PWR_ARRAY		BIT(6)</div><div class='add'>+#define WMI_TPC_CONFIG_PARAM		0x1</div><div class='add'>+#define ATH12K_TPC_RATE_ARRAY_MU	GENMASK(15, 8)</div><div class='add'>+#define ATH12K_TPC_RATE_ARRAY_SU	GENMASK(7, 0)</div><div class='add'>+#define TPC_STATS_REG_PWR_ALLOWED_TYPE	0</div><div class='add'>+</div><div class='add'>+enum wmi_halphy_ctrl_path_stats_id {</div><div class='add'>+	WMI_HALPHY_PDEV_TX_SU_STATS = 0,</div><div class='add'>+	WMI_HALPHY_PDEV_TX_SUTXBF_STATS,</div><div class='add'>+	WMI_HALPHY_PDEV_TX_MU_STATS,</div><div class='add'>+	WMI_HALPHY_PDEV_TX_MUTXBF_STATS,</div><div class='add'>+	WMI_HALPHY_PDEV_TX_STATS_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_wmi_tpc_stats_rates_array {</div><div class='add'>+	ATH12K_TPC_STATS_RATES_ARRAY1,</div><div class='add'>+	ATH12K_TPC_STATS_RATES_ARRAY2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_wmi_tpc_stats_ctl_array {</div><div class='add'>+	ATH12K_TPC_STATS_CTL_ARRAY,</div><div class='add'>+	ATH12K_TPC_STATS_CTL_160ARRAY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath12k_wmi_tpc_stats_events {</div><div class='add'>+	ATH12K_TPC_STATS_CONFIG_REG_PWR_EVENT,</div><div class='add'>+	ATH12K_TPC_STATS_RATES_EVENT1,</div><div class='add'>+	ATH12K_TPC_STATS_RATES_EVENT2,</div><div class='add'>+	ATH12K_TPC_STATS_CTL_TABLE_EVENT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_request_halphy_ctrl_path_stats_cmd_fixed_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 stats_id_mask;</div><div class='add'>+	__le32 request_id;</div><div class='add'>+	__le32 action;</div><div class='add'>+	__le32 subid;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_pdev_tpc_stats_event_fixed_params {</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+	__le32 end_of_event;</div><div class='add'>+	__le32 event_count;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_tpc_config_params {</div><div class='add'>+	__le32 reg_domain;</div><div class='add'>+	__le32 chan_freq;</div><div class='add'>+	__le32 phy_mode;</div><div class='add'>+	__le32 twice_antenna_reduction;</div><div class='add'>+	__le32 twice_max_reg_power;</div><div class='add'>+	__le32 twice_antenna_gain;</div><div class='add'>+	__le32 power_limit;</div><div class='add'>+	__le32 rate_max;</div><div class='add'>+	__le32 num_tx_chain;</div><div class='add'>+	__le32 ctl;</div><div class='add'>+	__le32 flags;</div><div class='add'>+	__le32 caps;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_max_reg_power_fixed_params {</div><div class='add'>+	__le32 reg_power_type;</div><div class='add'>+	__le32 reg_array_len;</div><div class='add'>+	__le32 d1;</div><div class='add'>+	__le32 d2;</div><div class='add'>+	__le32 d3;</div><div class='add'>+	__le32 d4;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_max_reg_power_allowed_arg {</div><div class='add'>+	struct wmi_max_reg_power_fixed_params tpc_reg_pwr;</div><div class='add'>+	s16 *reg_pwr_array;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_tpc_rates_array_fixed_params {</div><div class='add'>+	__le32 rate_array_type;</div><div class='add'>+	__le32 rate_array_len;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_tpc_rates_array_arg {</div><div class='add'>+	struct wmi_tpc_rates_array_fixed_params tpc_rates_array;</div><div class='add'>+	s16 *rate_array;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_tpc_ctl_pwr_fixed_params {</div><div class='add'>+	__le32 ctl_array_type;</div><div class='add'>+	__le32 ctl_array_len;</div><div class='add'>+	__le32 end_of_ctl_pwr;</div><div class='add'>+	__le32 ctl_pwr_count;</div><div class='add'>+	__le32 d1;</div><div class='add'>+	__le32 d2;</div><div class='add'>+	__le32 d3;</div><div class='add'>+	__le32 d4;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_tpc_ctl_pwr_table_arg {</div><div class='add'>+	struct wmi_tpc_ctl_pwr_fixed_params tpc_ctl_pwr;</div><div class='add'>+	s8 *ctl_pwr_table;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_tpc_stats_arg {</div><div class='add'>+	u32 pdev_id;</div><div class='add'>+	u32 event_count;</div><div class='add'>+	u32 end_of_event;</div><div class='add'>+	u32 tlvs_rcvd;</div><div class='add'>+	struct wmi_max_reg_power_allowed_arg max_reg_allowed_power;</div><div class='add'>+	struct wmi_tpc_rates_array_arg rates_array1;</div><div class='add'>+	struct wmi_tpc_rates_array_arg rates_array2;</div><div class='add'>+	struct wmi_tpc_config_params tpc_config;</div><div class='add'>+	struct wmi_tpc_ctl_pwr_table_arg ctl_array;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_vdev_ch_power_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+</div><div class='add'>+	/* Channel center frequency (MHz) */</div><div class='add'>+	__le32 chan_cfreq;</div><div class='add'>+</div><div class='add'>+	/* Unit: dBm, either PSD/EIRP power for this frequency or</div><div class='add'>+	 * incremental for non-PSD BW</div><div class='add'>+	 */</div><div class='add'>+	__le32 tx_power;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_vdev_set_tpc_power_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 vdev_id;</div><div class='add'>+</div><div class='add'>+	/* Value: 0 or 1, is PSD power or not */</div><div class='add'>+	__le32 psd_power;</div><div class='add'>+</div><div class='add'>+	 /* Maximum EIRP power (dBm units), valid only if power is PSD */</div><div class='add'>+	__le32 eirp_power;</div><div class='add'>+</div><div class='add'>+	/* Type: WMI_6GHZ_REG_TYPE, used for halphy CTL lookup */</div><div class='add'>+	__le32 power_type_6ghz;</div><div class='add'>+</div><div class='add'>+	/* This fixed_param TLV is followed by the below TLVs:</div><div class='add'>+	 * num_pwr_levels of wmi_vdev_ch_power_info</div><div class='add'>+	 * For PSD power, it is the PSD/EIRP power of the frequency (20 MHz chunks).</div><div class='add'>+	 * For non-PSD power, the power values are for 20, 40, and till</div><div class='add'>+	 * BSS BW power levels.</div><div class='add'>+	 * The num_pwr_levels will be checked by sw how many elements present</div><div class='add'>+	 * in the variable-length array.</div><div class='add'>+	 */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define CRTL_F_DYNC_FORCE_LINK_NUM GENMASK(3, 2)</div><div class='add'>+</div><div class='add'>+struct wmi_mlo_link_set_active_cmd {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 force_mode;</div><div class='add'>+	__le32 reason;</div><div class='add'>+	__le32 use_ieee_link_id_bitmap;</div><div class='add'>+	struct ath12k_wmi_mac_addr_params ap_mld_mac_addr;</div><div class='add'>+	__le32 ctrl_flags;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wmi_mlo_set_active_link_number_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 num_of_link;</div><div class='add'>+	__le32 vdev_type;</div><div class='add'>+	__le32 vdev_subtype;</div><div class='add'>+	__le32 home_freq;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WMI_DISALW_MLO_MODE_BMAP_IEEE_LINK_ID_COMB_1 GENMASK(7, 0)</div><div class='add'>+#define WMI_DISALW_MLO_MODE_BMAP_IEEE_LINK_ID_COMB_2 GENMASK(15, 8)</div><div class='add'>+#define WMI_DISALW_MLO_MODE_BMAP_IEEE_LINK_ID_COMB_3 GENMASK(23, 16)</div><div class='add'>+#define WMI_DISALW_MLO_MODE_BMAP_IEEE_LINK_ID_COMB_4 GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+struct wmi_disallowed_mlo_mode_bitmap_params {</div><div class='add'>+	__le32 tlv_header;</div><div class='add'>+	__le32 disallowed_mode_bitmap;</div><div class='add'>+	__le32 ieee_link_id_comb;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum wmi_mlo_link_force_mode {</div><div class='add'>+	WMI_MLO_LINK_FORCE_MODE_ACTIVE			= 1,</div><div class='add'>+	WMI_MLO_LINK_FORCE_MODE_INACTIVE		= 2,</div><div class='add'>+	WMI_MLO_LINK_FORCE_MODE_ACTIVE_LINK_NUM		= 3,</div><div class='add'>+	WMI_MLO_LINK_FORCE_MODE_INACTIVE_LINK_NUM	= 4,</div><div class='add'>+	WMI_MLO_LINK_FORCE_MODE_NO_FORCE		= 5,</div><div class='add'>+	WMI_MLO_LINK_FORCE_MODE_ACTIVE_INACTIVE		= 6,</div><div class='add'>+	WMI_MLO_LINK_FORCE_MODE_NON_FORCE_UPDATE	= 7,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wmi_mlo_link_force_reason {</div><div class='add'>+	WMI_MLO_LINK_FORCE_REASON_NEW_CONNECT		= 1,</div><div class='add'>+	WMI_MLO_LINK_FORCE_REASON_NEW_DISCONNECT	= 2,</div><div class='add'>+	WMI_MLO_LINK_FORCE_REASON_LINK_REMOVAL		= 3,</div><div class='add'>+	WMI_MLO_LINK_FORCE_REASON_TDLS			= 4,</div><div class='add'>+	WMI_MLO_LINK_FORCE_REASON_REVERT_FAILURE	= 5,</div><div class='add'>+	WMI_MLO_LINK_FORCE_REASON_LINK_DELETE		= 6,</div><div class='add'>+	WMI_MLO_LINK_FORCE_REASON_SINGLE_LINK_EMLSR_OP	= 7,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_mlo_link_num_arg {</div><div class='add'>+	u32 num_of_link;</div><div class='add'>+	u32 vdev_type;</div><div class='add'>+	u32 vdev_subtype;</div><div class='add'>+	u32 home_freq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_mlo_control_flags_arg {</div><div class='add'>+	bool overwrite_force_active_bitmap;</div><div class='add'>+	bool overwrite_force_inactive_bitmap;</div><div class='add'>+	bool dync_force_link_num;</div><div class='add'>+	bool post_re_evaluate;</div><div class='add'>+	u8 post_re_evaluate_loops;</div><div class='add'>+	bool dont_reschedule_workqueue;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_ml_link_force_cmd_arg {</div><div class='add'>+	u8 ap_mld_mac_addr[ETH_ALEN];</div><div class='add'>+	u16 ieee_link_id_bitmap;</div><div class='add'>+	u16 ieee_link_id_bitmap2;</div><div class='add'>+	u8 link_num;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_ml_disallow_mode_bmap_arg {</div><div class='add'>+	u32 disallowed_mode;</div><div class='add'>+	union {</div><div class='add'>+		u32 ieee_link_id_comb;</div><div class='add'>+		u8 ieee_link_id[4];</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* maximum size of link number param array</div><div class='add'>+ * for MLO link set active command</div><div class='add'>+ */</div><div class='add'>+#define WMI_MLO_LINK_NUM_SZ 2</div><div class='add'>+</div><div class='add'>+/* maximum size of vdev bitmap array for</div><div class='add'>+ * MLO link set active command</div><div class='add'>+ */</div><div class='add'>+#define WMI_MLO_VDEV_BITMAP_SZ 2</div><div class='add'>+</div><div class='add'>+/* Max number of disallowed bitmap combination</div><div class='add'>+ * sent to firmware</div><div class='add'>+ */</div><div class='add'>+#define WMI_ML_MAX_DISALLOW_BMAP_COMB 4</div><div class='add'>+</div><div class='add'>+struct wmi_mlo_link_set_active_arg {</div><div class='add'>+	enum wmi_mlo_link_force_mode force_mode;</div><div class='add'>+	enum wmi_mlo_link_force_reason reason;</div><div class='add'>+	u32 num_link_entry;</div><div class='add'>+	u32 num_vdev_bitmap;</div><div class='add'>+	u32 num_inactive_vdev_bitmap;</div><div class='add'>+	struct wmi_mlo_link_num_arg link_num[WMI_MLO_LINK_NUM_SZ];</div><div class='add'>+	u32 vdev_bitmap[WMI_MLO_VDEV_BITMAP_SZ];</div><div class='add'>+	u32 inactive_vdev_bitmap[WMI_MLO_VDEV_BITMAP_SZ];</div><div class='add'>+	struct wmi_mlo_control_flags_arg ctrl_flags;</div><div class='add'>+	bool use_ieee_link_id;</div><div class='add'>+	struct wmi_ml_link_force_cmd_arg force_cmd;</div><div class='add'>+	u32 num_disallow_mode_comb;</div><div class='add'>+	struct wmi_ml_disallow_mode_bmap_arg disallow_bmap[WMI_ML_MAX_DISALLOW_BMAP_COMB];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ATH12K_MAX_20MHZ_SEGMENTS	16</div><div class='add'>+#define ATH12K_MAX_NUM_ANTENNA		8</div><div class='add'>+#define ATH12K_MAX_NUM_NF_HW_DBM	32</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_rssi_dbm_conv_info_fixed_params {</div><div class='add'>+	__le32 pdev_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_rssi_dbm_conv_info_params {</div><div class='add'>+	__le32 curr_bw;</div><div class='add'>+	__le32 curr_rx_chainmask;</div><div class='add'>+	__le32 xbar_config;</div><div class='add'>+	a_sle32 xlna_bypass_offset;</div><div class='add'>+	a_sle32 xlna_bypass_threshold;</div><div class='add'>+	a_sle32 nf_hw_dbm[ATH12K_MAX_NUM_NF_HW_DBM];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_rssi_dbm_conv_temp_info_params {</div><div class='add'>+	a_sle32 offset;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_rssi_dbm_conv_param_arg {</div><div class='add'>+	u32 curr_bw;</div><div class='add'>+	u32 curr_rx_chainmask;</div><div class='add'>+	u32 xbar_config;</div><div class='add'>+	s32 xlna_bypass_offset;</div><div class='add'>+	s32 xlna_bypass_threshold;</div><div class='add'>+	s8 nf_hw_dbm[ATH12K_MAX_NUM_ANTENNA][ATH12K_MAX_20MHZ_SEGMENTS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_wmi_rssi_dbm_conv_info_arg {</div><div class='add'>+	bool temp_offset_present;</div><div class='add'>+	s32 temp_offset;</div><div class='add'>+	bool nf_dbm_present;</div><div class='add'>+	s8 min_nf_dbm;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath12k_wmi_init_qcn9274(struct ath12k_base *ab,</div><div class='add'>+			     struct ath12k_wmi_resource_config_arg *config);</div><div class='add'>+void ath12k_wmi_init_wcn7850(struct ath12k_base *ab,</div><div class='add'>+			     struct ath12k_wmi_resource_config_arg *config);</div><div class='add'>+int ath12k_wmi_cmd_send(struct ath12k_wmi_pdev *wmi, struct sk_buff *skb,</div><div class='add'>+			u32 cmd_id);</div><div class='add'>+struct sk_buff *ath12k_wmi_alloc_skb(struct ath12k_wmi_base *wmi_sc, u32 len);</div><div class='add'>+int ath12k_wmi_mgmt_send(struct ath12k_link_vif *arvif, u32 buf_id,</div><div class='add'>+			 struct sk_buff *frame);</div><div class='add'>+int ath12k_wmi_p2p_go_bcn_ie(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+			     const u8 *p2p_ie);</div><div class='add'>+int ath12k_wmi_bcn_tmpl(struct ath12k_link_vif *arvif,</div><div class='add'>+			struct ieee80211_mutable_offsets *offs,</div><div class='add'>+			struct sk_buff *bcn,</div><div class='add'>+			struct ath12k_wmi_bcn_tmpl_ema_arg *ema_args);</div><div class='add'>+int ath12k_wmi_vdev_down(struct ath12k *ar, u8 vdev_id);</div><div class='add'>+int ath12k_wmi_vdev_up(struct ath12k *ar, struct ath12k_wmi_vdev_up_params *params);</div><div class='add'>+int ath12k_wmi_vdev_stop(struct ath12k *ar, u8 vdev_id);</div><div class='add'>+int ath12k_wmi_vdev_start(struct ath12k *ar, struct wmi_vdev_start_req_arg *arg,</div><div class='add'>+			  bool restart);</div><div class='add'>+int ath12k_wmi_set_peer_param(struct ath12k *ar, const u8 *peer_addr,</div><div class='add'>+			      u32 vdev_id, u32 param_id, u32 param_val);</div><div class='add'>+int ath12k_wmi_pdev_set_param(struct ath12k *ar, u32 param_id,</div><div class='add'>+			      u32 param_value, u8 pdev_id);</div><div class='add'>+int ath12k_wmi_pdev_set_ps_mode(struct ath12k *ar, int vdev_id, u32 enable);</div><div class='add'>+int ath12k_wmi_wait_for_unified_ready(struct ath12k_base *ab);</div><div class='add'>+int ath12k_wmi_cmd_init(struct ath12k_base *ab);</div><div class='add'>+int ath12k_wmi_wait_for_service_ready(struct ath12k_base *ab);</div><div class='add'>+int ath12k_wmi_connect(struct ath12k_base *ab);</div><div class='add'>+int ath12k_wmi_pdev_attach(struct ath12k_base *ab,</div><div class='add'>+			   u8 pdev_id);</div><div class='add'>+int ath12k_wmi_attach(struct ath12k_base *ab);</div><div class='add'>+void ath12k_wmi_detach(struct ath12k_base *ab);</div><div class='add'>+int ath12k_wmi_vdev_create(struct ath12k *ar, u8 *macaddr,</div><div class='add'>+			   struct ath12k_wmi_vdev_create_arg *arg);</div><div class='add'>+int ath12k_wmi_send_peer_create_cmd(struct ath12k *ar,</div><div class='add'>+				    struct ath12k_wmi_peer_create_arg *arg);</div><div class='add'>+int ath12k_wmi_vdev_set_param_cmd(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+				  u32 param_id, u32 param_value);</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_set_sta_ps_param(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+				u32 param, u32 param_value);</div><div class='add'>+int ath12k_wmi_force_fw_hang_cmd(struct ath12k *ar, u32 type, u32 delay_time_ms);</div><div class='add'>+int ath12k_wmi_send_peer_delete_cmd(struct ath12k *ar,</div><div class='add'>+				    const u8 *peer_addr, u8 vdev_id);</div><div class='add'>+int ath12k_wmi_vdev_delete(struct ath12k *ar, u8 vdev_id);</div><div class='add'>+void ath12k_wmi_start_scan_init(struct ath12k *ar,</div><div class='add'>+				struct ath12k_wmi_scan_req_arg *arg);</div><div class='add'>+int ath12k_wmi_send_scan_start_cmd(struct ath12k *ar,</div><div class='add'>+				   struct ath12k_wmi_scan_req_arg *arg);</div><div class='add'>+int ath12k_wmi_send_scan_stop_cmd(struct ath12k *ar,</div><div class='add'>+				  struct ath12k_wmi_scan_cancel_arg *arg);</div><div class='add'>+int ath12k_wmi_send_wmm_update_cmd(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+				   struct wmi_wmm_params_all_arg *param);</div><div class='add'>+int ath12k_wmi_pdev_suspend(struct ath12k *ar, u32 suspend_opt,</div><div class='add'>+			    u32 pdev_id);</div><div class='add'>+int ath12k_wmi_pdev_resume(struct ath12k *ar, u32 pdev_id);</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_peer_assoc_cmd(struct ath12k *ar,</div><div class='add'>+				   struct ath12k_wmi_peer_assoc_arg *arg);</div><div class='add'>+int ath12k_wmi_vdev_install_key(struct ath12k *ar,</div><div class='add'>+				struct wmi_vdev_install_key_arg *arg);</div><div class='add'>+int ath12k_wmi_pdev_bss_chan_info_request(struct ath12k *ar,</div><div class='add'>+					  enum wmi_bss_chan_info_req_type type);</div><div class='add'>+int ath12k_wmi_send_pdev_temperature_cmd(struct ath12k *ar);</div><div class='add'>+int ath12k_wmi_send_peer_flush_tids_cmd(struct ath12k *ar,</div><div class='add'>+					u8 peer_addr[ETH_ALEN],</div><div class='add'>+					u32 peer_tid_bitmap,</div><div class='add'>+					u8 vdev_id);</div><div class='add'>+int ath12k_wmi_send_set_ap_ps_param_cmd(struct ath12k *ar, u8 *peer_addr,</div><div class='add'>+					struct ath12k_wmi_ap_ps_arg *arg);</div><div class='add'>+int ath12k_wmi_send_scan_chan_list_cmd(struct ath12k *ar,</div><div class='add'>+				       struct ath12k_wmi_scan_chan_list_arg *arg);</div><div class='add'>+int ath12k_wmi_send_dfs_phyerr_offload_enable_cmd(struct ath12k *ar,</div><div class='add'>+						  u32 pdev_id);</div><div class='add'>+int ath12k_wmi_addba_clear_resp(struct ath12k *ar, u32 vdev_id, const u8 *mac);</div><div class='add'>+int ath12k_wmi_addba_send(struct ath12k *ar, u32 vdev_id, const u8 *mac,</div><div class='add'>+			  u32 tid, u32 buf_size);</div><div class='add'>+int ath12k_wmi_addba_set_resp(struct ath12k *ar, u32 vdev_id, const u8 *mac,</div><div class='add'>+			      u32 tid, u32 status);</div><div class='add'>+int ath12k_wmi_delba_send(struct ath12k *ar, u32 vdev_id, const u8 *mac,</div><div class='add'>+			  u32 tid, u32 initiator, u32 reason);</div><div class='add'>+int ath12k_wmi_send_bcn_offload_control_cmd(struct ath12k *ar,</div><div class='add'>+					    u32 vdev_id, u32 bcn_ctrl_op);</div><div class='add'>+int ath12k_wmi_send_init_country_cmd(struct ath12k *ar,</div><div class='add'>+				     struct ath12k_wmi_init_country_arg *arg);</div><div class='add'>+int</div><div class='add'>+ath12k_wmi_send_set_current_country_cmd(struct ath12k *ar,</div><div class='add'>+					struct wmi_set_current_country_arg *arg);</div><div class='add'>+int ath12k_wmi_peer_rx_reorder_queue_setup(struct ath12k *ar,</div><div class='add'>+					   int vdev_id, const u8 *addr,</div><div class='add'>+					   dma_addr_t paddr, u8 tid,</div><div class='add'>+					   u8 ba_window_size_valid,</div><div class='add'>+					   u32 ba_window_size);</div><div class='add'>+int ath12k_wmi_send_11d_scan_start_cmd(struct ath12k *ar,</div><div class='add'>+				       struct wmi_11d_scan_start_arg *arg);</div><div class='add'>+int ath12k_wmi_send_11d_scan_stop_cmd(struct ath12k *ar, u32 vdev_id);</div><div class='add'>+int</div><div class='add'>+ath12k_wmi_rx_reord_queue_remove(struct ath12k *ar,</div><div class='add'>+				 struct ath12k_wmi_rx_reorder_queue_remove_arg *arg);</div><div class='add'>+int ath12k_wmi_send_pdev_set_regdomain(struct ath12k *ar,</div><div class='add'>+				       struct ath12k_wmi_pdev_set_regdomain_arg *arg);</div><div class='add'>+int ath12k_wmi_simulate_radar(struct ath12k *ar);</div><div class='add'>+int ath12k_wmi_send_twt_enable_cmd(struct ath12k *ar, u32 pdev_id);</div><div class='add'>+int ath12k_wmi_send_twt_disable_cmd(struct ath12k *ar, u32 pdev_id);</div><div class='add'>+int ath12k_wmi_send_obss_spr_cmd(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+				 struct ieee80211_he_obss_pd *he_obss_pd);</div><div class='add'>+int ath12k_wmi_obss_color_cfg_cmd(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+				  u8 bss_color, u32 period,</div><div class='add'>+				  bool enable);</div><div class='add'>+int ath12k_wmi_send_bss_color_change_enable_cmd(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+						bool enable);</div><div class='add'>+int ath12k_wmi_pdev_lro_cfg(struct ath12k *ar, int pdev_id);</div><div class='add'>+int ath12k_wmi_pdev_dma_ring_cfg(struct ath12k *ar,</div><div class='add'>+				 struct ath12k_wmi_pdev_dma_ring_cfg_arg *arg);</div><div class='add'>+int ath12k_wmi_vdev_spectral_enable(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+				    u32 trigger, u32 enable);</div><div class='add'>+int ath12k_wmi_vdev_spectral_conf(struct ath12k *ar,</div><div class='add'>+				  struct ath12k_wmi_vdev_spectral_conf_arg *arg);</div><div class='add'>+int ath12k_wmi_fils_discovery_tmpl(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+				   struct sk_buff *tmpl);</div><div class='add'>+int ath12k_wmi_fils_discovery(struct ath12k *ar, u32 vdev_id, u32 interval,</div><div class='add'>+			      bool unsol_bcast_probe_resp_enabled);</div><div class='add'>+int ath12k_wmi_probe_resp_tmpl(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+			       struct sk_buff *tmpl);</div><div class='add'>+int ath12k_wmi_set_hw_mode(struct ath12k_base *ab,</div><div class='add'>+			   enum wmi_host_hw_mode_config_type mode);</div><div class='add'>+int ath12k_wmi_set_bios_cmd(struct ath12k_base *ab, u32 param_id,</div><div class='add'>+			    const u8 *buf, size_t buf_len);</div><div class='add'>+int ath12k_wmi_set_bios_sar_cmd(struct ath12k_base *ab, const u8 *psar_table);</div><div class='add'>+int ath12k_wmi_set_bios_geo_cmd(struct ath12k_base *ab, const u8 *pgeo_table);</div><div class='add'>+int ath12k_wmi_send_stats_request_cmd(struct ath12k *ar, u32 stats_id,</div><div class='add'>+				      u32 vdev_id, u32 pdev_id);</div><div class='add'>+__le32 ath12k_wmi_tlv_hdr(u32 cmd, u32 len);</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_send_tpc_stats_request(struct ath12k *ar,</div><div class='add'>+				      enum wmi_halphy_ctrl_path_stats_id tpc_stats_type);</div><div class='add'>+void ath12k_wmi_free_tpc_stats_mem(struct ath12k *ar);</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+ath12k_wmi_caps_ext_get_pdev_id(const struct ath12k_wmi_caps_ext_params *param)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(param-&gt;pdev_and_hw_link_ids, WMI_CAPS_PARAMS_PDEV_ID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+ath12k_wmi_caps_ext_get_hw_link_id(const struct ath12k_wmi_caps_ext_params *param)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(param-&gt;pdev_and_hw_link_ids, WMI_CAPS_PARAMS_HW_LINK_ID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+ath12k_wmi_mac_phy_get_pdev_id(const struct ath12k_wmi_mac_phy_caps_params *param)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(param-&gt;pdev_and_hw_link_ids,</div><div class='add'>+			     WMI_CAPS_PARAMS_PDEV_ID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+ath12k_wmi_mac_phy_get_hw_link_id(const struct ath12k_wmi_mac_phy_caps_params *param)</div><div class='add'>+{</div><div class='add'>+	return le32_get_bits(param-&gt;pdev_and_hw_link_ids,</div><div class='add'>+			     WMI_CAPS_PARAMS_HW_LINK_ID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wmi_wow_host_wakeup_ind(struct ath12k *ar);</div><div class='add'>+int ath12k_wmi_wow_enable(struct ath12k *ar);</div><div class='add'>+int ath12k_wmi_wow_del_pattern(struct ath12k *ar, u32 vdev_id, u32 pattern_id);</div><div class='add'>+int ath12k_wmi_wow_add_pattern(struct ath12k *ar, u32 vdev_id, u32 pattern_id,</div><div class='add'>+			       const u8 *pattern, const u8 *mask,</div><div class='add'>+			       int pattern_len, int pattern_offset);</div><div class='add'>+int ath12k_wmi_wow_add_wakeup_event(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+				    enum wmi_wow_wakeup_event event,</div><div class='add'>+				    u32 enable);</div><div class='add'>+int ath12k_wmi_wow_config_pno(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+			      struct wmi_pno_scan_req_arg  *pno_scan);</div><div class='add'>+int ath12k_wmi_hw_data_filter_cmd(struct ath12k *ar,</div><div class='add'>+				  struct wmi_hw_data_filter_arg *arg);</div><div class='add'>+int ath12k_wmi_arp_ns_offload(struct ath12k *ar,</div><div class='add'>+			      struct ath12k_link_vif *arvif,</div><div class='add'>+			      struct wmi_arp_ns_offload_arg *offload,</div><div class='add'>+			      bool enable);</div><div class='add'>+int ath12k_wmi_gtk_rekey_offload(struct ath12k *ar,</div><div class='add'>+				 struct ath12k_link_vif *arvif, bool enable);</div><div class='add'>+int ath12k_wmi_gtk_rekey_getinfo(struct ath12k *ar,</div><div class='add'>+				 struct ath12k_link_vif *arvif);</div><div class='add'>+int ath12k_wmi_sta_keepalive(struct ath12k *ar,</div><div class='add'>+			     const struct wmi_sta_keepalive_arg *arg);</div><div class='add'>+int ath12k_wmi_mlo_setup(struct ath12k *ar, struct wmi_mlo_setup_arg *mlo_params);</div><div class='add'>+int ath12k_wmi_mlo_ready(struct ath12k *ar);</div><div class='add'>+int ath12k_wmi_mlo_teardown(struct ath12k *ar);</div><div class='add'>+void ath12k_wmi_fw_stats_dump(struct ath12k *ar,</div><div class='add'>+			      struct ath12k_fw_stats *fw_stats, u32 stats_id,</div><div class='add'>+			      char *buf);</div><div class='add'>+bool ath12k_wmi_supports_6ghz_cc_ext(struct ath12k *ar);</div><div class='add'>+int ath12k_wmi_send_vdev_set_tpc_power(struct ath12k *ar,</div><div class='add'>+				       u32 vdev_id,</div><div class='add'>+				       struct ath12k_reg_tpc_power_info *param);</div><div class='add'>+int ath12k_wmi_send_mlo_link_set_active_cmd(struct ath12k_base *ab,</div><div class='add'>+					    struct wmi_mlo_link_set_active_arg *param);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/wow.c b/drivers/net/wireless/ath/ath12k/wow.c<br/>new file mode 100644<br/>index 000000000000..e8481626f194<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/wow.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/wow.c</a></div><div class='hunk'>@@ -0,0 +1,1029 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/inetdevice.h&gt;</div><div class='add'>+#include &lt;net/addrconf.h&gt;</div><div class='add'>+#include &lt;net/if_inet6.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mac.h"</div><div class='add'>+</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "hif.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "wmi.h"</div><div class='add'>+#include "wow.h"</div><div class='add'>+</div><div class='add'>+static const struct wiphy_wowlan_support ath12k_wowlan_support = {</div><div class='add'>+	.flags = WIPHY_WOWLAN_DISCONNECT |</div><div class='add'>+		 WIPHY_WOWLAN_MAGIC_PKT |</div><div class='add'>+		 WIPHY_WOWLAN_SUPPORTS_GTK_REKEY |</div><div class='add'>+		 WIPHY_WOWLAN_GTK_REKEY_FAILURE,</div><div class='add'>+	.pattern_min_len = WOW_MIN_PATTERN_SIZE,</div><div class='add'>+	.pattern_max_len = WOW_MAX_PATTERN_SIZE,</div><div class='add'>+	.max_pkt_offset = WOW_MAX_PKT_OFFSET,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline bool ath12k_wow_is_p2p_vdev(struct ath12k_vif *ahvif)</div><div class='add'>+{</div><div class='add'>+	return (ahvif-&gt;vdev_subtype == WMI_VDEV_SUBTYPE_P2P_DEVICE ||</div><div class='add'>+		ahvif-&gt;vdev_subtype == WMI_VDEV_SUBTYPE_P2P_CLIENT ||</div><div class='add'>+		ahvif-&gt;vdev_subtype == WMI_VDEV_SUBTYPE_P2P_GO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wow_enable(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	clear_bit(ATH12K_FLAG_HTC_SUSPEND_COMPLETE, &amp;ab-&gt;dev_flags);</div><div class='add'>+</div><div class='add'>+	/* The firmware might be busy and it can not enter WoW immediately.</div><div class='add'>+	 * In that case firmware notifies host with</div><div class='add'>+	 * ATH12K_HTC_MSG_NACK_SUSPEND message, asking host to try again</div><div class='add'>+	 * later. Per the firmware team there could be up to 10 loops.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; ATH12K_WOW_RETRY_NUM; i++) {</div><div class='add'>+		reinit_completion(&amp;ab-&gt;htc_suspend);</div><div class='add'>+</div><div class='add'>+		ret = ath12k_wmi_wow_enable(ar);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ab, "failed to issue wow enable: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = wait_for_completion_timeout(&amp;ab-&gt;htc_suspend, 3 * HZ);</div><div class='add'>+		if (ret == 0) {</div><div class='add'>+			ath12k_warn(ab,</div><div class='add'>+				    "timed out while waiting for htc suspend completion\n");</div><div class='add'>+			return -ETIMEDOUT;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (test_bit(ATH12K_FLAG_HTC_SUSPEND_COMPLETE, &amp;ab-&gt;dev_flags))</div><div class='add'>+			/* success, suspend complete received */</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		ath12k_warn(ab, "htc suspend not complete, retrying (try %d)\n",</div><div class='add'>+			    i);</div><div class='add'>+		msleep(ATH12K_WOW_RETRY_WAIT_MS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_warn(ab, "htc suspend not complete, failing after %d tries\n", i);</div><div class='add'>+</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wow_wakeup(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_base *ab = ar-&gt;ab;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;ab-&gt;wow.wakeup_completed);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wmi_wow_host_wakeup_ind(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ab, "failed to send wow wakeup indication: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = wait_for_completion_timeout(&amp;ab-&gt;wow.wakeup_completed, 3 * HZ);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		ath12k_warn(ab, "timed out while waiting for wow wakeup completion\n");</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wow_vif_cleanup(struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WOW_EVENT_MAX; i++) {</div><div class='add'>+		ret = ath12k_wmi_wow_add_wakeup_event(ar, arvif-&gt;vdev_id, i, 0);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to issue wow wakeup for event %s on vdev %i: %d\n",</div><div class='add'>+				    wow_wakeup_event(i), arvif-&gt;vdev_id, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ar-&gt;wow.max_num_patterns; i++) {</div><div class='add'>+		ret = ath12k_wmi_wow_del_pattern(ar, arvif-&gt;vdev_id, i);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to delete wow pattern %d for vdev %i: %d\n",</div><div class='add'>+				    i, arvif-&gt;vdev_id, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wow_cleanup(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+		ret = ath12k_wow_vif_cleanup(arvif);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to clean wow wakeups on vdev %i: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Convert a 802.3 format to a 802.11 format.</div><div class='add'>+ *         +------------+-----------+--------+----------------+</div><div class='add'>+ * 802.3:  |dest mac(6B)|src mac(6B)|type(2B)|     body...    |</div><div class='add'>+ *         +------------+-----------+--------+----------------+</div><div class='add'>+ *                |__         |_______    |____________  |________</div><div class='add'>+ *                   |                |                |          |</div><div class='add'>+ *         +--+------------+----+-----------+---------------+-----------+</div><div class='add'>+ * 802.11: |4B|dest mac(6B)| 6B |src mac(6B)|  8B  |type(2B)|  body...  |</div><div class='add'>+ *         +--+------------+----+-----------+---------------+-----------+</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ath12k_wow_convert_8023_to_80211(struct ath12k *ar,</div><div class='add'>+				 const struct cfg80211_pkt_pattern *eth_pattern,</div><div class='add'>+				 struct ath12k_pkt_pattern *i80211_pattern)</div><div class='add'>+{</div><div class='add'>+	size_t r1042_eth_ofs = offsetof(struct rfc1042_hdr, eth_type);</div><div class='add'>+	size_t a1_ofs = offsetof(struct ieee80211_hdr_3addr, addr1);</div><div class='add'>+	size_t a3_ofs = offsetof(struct ieee80211_hdr_3addr, addr3);</div><div class='add'>+	size_t i80211_hdr_len = sizeof(struct ieee80211_hdr_3addr);</div><div class='add'>+	size_t prot_ofs = offsetof(struct ethhdr, h_proto);</div><div class='add'>+	size_t src_ofs = offsetof(struct ethhdr, h_source);</div><div class='add'>+	u8 eth_bytemask[WOW_MAX_PATTERN_SIZE] = {};</div><div class='add'>+	const u8 *eth_pat = eth_pattern-&gt;pattern;</div><div class='add'>+	size_t eth_pat_len = eth_pattern-&gt;pattern_len;</div><div class='add'>+	size_t eth_pkt_ofs = eth_pattern-&gt;pkt_offset;</div><div class='add'>+	u8 *bytemask = i80211_pattern-&gt;bytemask;</div><div class='add'>+	u8 *pat = i80211_pattern-&gt;pattern;</div><div class='add'>+	size_t pat_len = 0;</div><div class='add'>+	size_t pkt_ofs = 0;</div><div class='add'>+	size_t delta;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* convert bitmask to bytemask */</div><div class='add'>+	for (i = 0; i &lt; eth_pat_len; i++)</div><div class='add'>+		if (eth_pattern-&gt;mask[i / 8] &amp; BIT(i % 8))</div><div class='add'>+			eth_bytemask[i] = 0xff;</div><div class='add'>+</div><div class='add'>+	if (eth_pkt_ofs &lt; ETH_ALEN) {</div><div class='add'>+		pkt_ofs = eth_pkt_ofs + a1_ofs;</div><div class='add'>+</div><div class='add'>+		if (size_add(eth_pkt_ofs, eth_pat_len) &lt; ETH_ALEN) {</div><div class='add'>+			memcpy(pat, eth_pat, eth_pat_len);</div><div class='add'>+			memcpy(bytemask, eth_bytemask, eth_pat_len);</div><div class='add'>+</div><div class='add'>+			pat_len = eth_pat_len;</div><div class='add'>+		} else if (size_add(eth_pkt_ofs, eth_pat_len) &lt; prot_ofs) {</div><div class='add'>+			memcpy(pat, eth_pat, ETH_ALEN - eth_pkt_ofs);</div><div class='add'>+			memcpy(bytemask, eth_bytemask, ETH_ALEN - eth_pkt_ofs);</div><div class='add'>+</div><div class='add'>+			delta = eth_pkt_ofs + eth_pat_len - src_ofs;</div><div class='add'>+			memcpy(pat + a3_ofs - pkt_ofs,</div><div class='add'>+			       eth_pat + ETH_ALEN - eth_pkt_ofs,</div><div class='add'>+			       delta);</div><div class='add'>+			memcpy(bytemask + a3_ofs - pkt_ofs,</div><div class='add'>+			       eth_bytemask + ETH_ALEN - eth_pkt_ofs,</div><div class='add'>+			       delta);</div><div class='add'>+</div><div class='add'>+			pat_len = a3_ofs - pkt_ofs + delta;</div><div class='add'>+		} else {</div><div class='add'>+			memcpy(pat, eth_pat, ETH_ALEN - eth_pkt_ofs);</div><div class='add'>+			memcpy(bytemask, eth_bytemask, ETH_ALEN - eth_pkt_ofs);</div><div class='add'>+</div><div class='add'>+			memcpy(pat + a3_ofs - pkt_ofs,</div><div class='add'>+			       eth_pat + ETH_ALEN - eth_pkt_ofs,</div><div class='add'>+			       ETH_ALEN);</div><div class='add'>+			memcpy(bytemask + a3_ofs - pkt_ofs,</div><div class='add'>+			       eth_bytemask + ETH_ALEN - eth_pkt_ofs,</div><div class='add'>+			       ETH_ALEN);</div><div class='add'>+</div><div class='add'>+			delta = eth_pkt_ofs + eth_pat_len - prot_ofs;</div><div class='add'>+			memcpy(pat + i80211_hdr_len + r1042_eth_ofs - pkt_ofs,</div><div class='add'>+			       eth_pat + prot_ofs - eth_pkt_ofs,</div><div class='add'>+			       delta);</div><div class='add'>+			memcpy(bytemask + i80211_hdr_len + r1042_eth_ofs - pkt_ofs,</div><div class='add'>+			       eth_bytemask + prot_ofs - eth_pkt_ofs,</div><div class='add'>+			       delta);</div><div class='add'>+</div><div class='add'>+			pat_len = i80211_hdr_len + r1042_eth_ofs - pkt_ofs + delta;</div><div class='add'>+		}</div><div class='add'>+	} else if (eth_pkt_ofs &lt; prot_ofs) {</div><div class='add'>+		pkt_ofs = eth_pkt_ofs - ETH_ALEN + a3_ofs;</div><div class='add'>+</div><div class='add'>+		if (size_add(eth_pkt_ofs, eth_pat_len) &lt; prot_ofs) {</div><div class='add'>+			memcpy(pat, eth_pat, eth_pat_len);</div><div class='add'>+			memcpy(bytemask, eth_bytemask, eth_pat_len);</div><div class='add'>+</div><div class='add'>+			pat_len = eth_pat_len;</div><div class='add'>+		} else {</div><div class='add'>+			memcpy(pat, eth_pat, prot_ofs - eth_pkt_ofs);</div><div class='add'>+			memcpy(bytemask, eth_bytemask, prot_ofs - eth_pkt_ofs);</div><div class='add'>+</div><div class='add'>+			delta = eth_pkt_ofs + eth_pat_len - prot_ofs;</div><div class='add'>+			memcpy(pat + i80211_hdr_len + r1042_eth_ofs - pkt_ofs,</div><div class='add'>+			       eth_pat +  prot_ofs - eth_pkt_ofs,</div><div class='add'>+			       delta);</div><div class='add'>+			memcpy(bytemask + i80211_hdr_len + r1042_eth_ofs - pkt_ofs,</div><div class='add'>+			       eth_bytemask + prot_ofs - eth_pkt_ofs,</div><div class='add'>+			       delta);</div><div class='add'>+</div><div class='add'>+			pat_len =  i80211_hdr_len + r1042_eth_ofs - pkt_ofs + delta;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		pkt_ofs = eth_pkt_ofs - prot_ofs + i80211_hdr_len + r1042_eth_ofs;</div><div class='add'>+</div><div class='add'>+		memcpy(pat, eth_pat, eth_pat_len);</div><div class='add'>+		memcpy(bytemask, eth_bytemask, eth_pat_len);</div><div class='add'>+</div><div class='add'>+		pat_len = eth_pat_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i80211_pattern-&gt;pattern_len = pat_len;</div><div class='add'>+	i80211_pattern-&gt;pkt_offset = pkt_ofs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ath12k_wow_pno_check_and_convert(struct ath12k *ar, u32 vdev_id,</div><div class='add'>+				 const struct cfg80211_sched_scan_request *nd_config,</div><div class='add'>+				 struct wmi_pno_scan_req_arg *pno)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+	u8 ssid_len;</div><div class='add'>+</div><div class='add'>+	pno-&gt;enable = 1;</div><div class='add'>+	pno-&gt;vdev_id = vdev_id;</div><div class='add'>+	pno-&gt;uc_networks_count = nd_config-&gt;n_match_sets;</div><div class='add'>+</div><div class='add'>+	if (!pno-&gt;uc_networks_count ||</div><div class='add'>+	    pno-&gt;uc_networks_count &gt; WMI_PNO_MAX_SUPP_NETWORKS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (nd_config-&gt;n_channels &gt; WMI_PNO_MAX_NETW_CHANNELS_EX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Filling per profile params */</div><div class='add'>+	for (i = 0; i &lt; pno-&gt;uc_networks_count; i++) {</div><div class='add'>+		ssid_len = nd_config-&gt;match_sets[i].ssid.ssid_len;</div><div class='add'>+</div><div class='add'>+		if (ssid_len == 0 || ssid_len &gt; 32)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		pno-&gt;a_networks[i].ssid.ssid_len = ssid_len;</div><div class='add'>+</div><div class='add'>+		memcpy(pno-&gt;a_networks[i].ssid.ssid,</div><div class='add'>+		       nd_config-&gt;match_sets[i].ssid.ssid,</div><div class='add'>+		       ssid_len);</div><div class='add'>+		pno-&gt;a_networks[i].authentication = 0;</div><div class='add'>+		pno-&gt;a_networks[i].encryption     = 0;</div><div class='add'>+		pno-&gt;a_networks[i].bcast_nw_type  = 0;</div><div class='add'>+</div><div class='add'>+		/* Copying list of valid channel into request */</div><div class='add'>+		pno-&gt;a_networks[i].channel_count = nd_config-&gt;n_channels;</div><div class='add'>+		pno-&gt;a_networks[i].rssi_threshold = nd_config-&gt;match_sets[i].rssi_thold;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; nd_config-&gt;n_channels; j++) {</div><div class='add'>+			pno-&gt;a_networks[i].channels[j] =</div><div class='add'>+					nd_config-&gt;channels[j]-&gt;center_freq;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set scan to passive if no SSIDs are specified in the request */</div><div class='add'>+	if (nd_config-&gt;n_ssids == 0)</div><div class='add'>+		pno-&gt;do_passive_scan = true;</div><div class='add'>+	else</div><div class='add'>+		pno-&gt;do_passive_scan = false;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nd_config-&gt;n_ssids; i++) {</div><div class='add'>+		for (j = 0; j &lt; pno-&gt;uc_networks_count; j++) {</div><div class='add'>+			if (pno-&gt;a_networks[j].ssid.ssid_len ==</div><div class='add'>+				nd_config-&gt;ssids[i].ssid_len &amp;&amp;</div><div class='add'>+			    !memcmp(pno-&gt;a_networks[j].ssid.ssid,</div><div class='add'>+				    nd_config-&gt;ssids[i].ssid,</div><div class='add'>+				    pno-&gt;a_networks[j].ssid.ssid_len)) {</div><div class='add'>+				pno-&gt;a_networks[j].bcast_nw_type = BCAST_HIDDEN;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nd_config-&gt;n_scan_plans == 2) {</div><div class='add'>+		pno-&gt;fast_scan_period = nd_config-&gt;scan_plans[0].interval * MSEC_PER_SEC;</div><div class='add'>+		pno-&gt;fast_scan_max_cycles = nd_config-&gt;scan_plans[0].iterations;</div><div class='add'>+		pno-&gt;slow_scan_period =</div><div class='add'>+			nd_config-&gt;scan_plans[1].interval * MSEC_PER_SEC;</div><div class='add'>+	} else if (nd_config-&gt;n_scan_plans == 1) {</div><div class='add'>+		pno-&gt;fast_scan_period = nd_config-&gt;scan_plans[0].interval * MSEC_PER_SEC;</div><div class='add'>+		pno-&gt;fast_scan_max_cycles = 1;</div><div class='add'>+		pno-&gt;slow_scan_period = nd_config-&gt;scan_plans[0].interval * MSEC_PER_SEC;</div><div class='add'>+	} else {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "Invalid number of PNO scan plans: %d",</div><div class='add'>+			    nd_config-&gt;n_scan_plans);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nd_config-&gt;flags &amp; NL80211_SCAN_FLAG_RANDOM_ADDR) {</div><div class='add'>+		/* enable mac randomization */</div><div class='add'>+		pno-&gt;enable_pno_scan_randomization = 1;</div><div class='add'>+		memcpy(pno-&gt;mac_addr, nd_config-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+		memcpy(pno-&gt;mac_addr_mask, nd_config-&gt;mac_addr_mask, ETH_ALEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pno-&gt;delay_start_time = nd_config-&gt;delay;</div><div class='add'>+</div><div class='add'>+	/* Current FW does not support min-max range for dwell time */</div><div class='add'>+	pno-&gt;active_max_time = WMI_ACTIVE_MAX_CHANNEL_TIME;</div><div class='add'>+	pno-&gt;passive_max_time = WMI_PASSIVE_MAX_CHANNEL_TIME;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wow_vif_set_wakeups(struct ath12k_link_vif *arvif,</div><div class='add'>+				      struct cfg80211_wowlan *wowlan)</div><div class='add'>+{</div><div class='add'>+	const struct cfg80211_pkt_pattern *patterns = wowlan-&gt;patterns;</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+	unsigned long wow_mask = 0;</div><div class='add'>+	int pattern_id = 0;</div><div class='add'>+	int ret, i, j;</div><div class='add'>+</div><div class='add'>+	/* Setup requested WOW features */</div><div class='add'>+	switch (arvif-&gt;ahvif-&gt;vdev_type) {</div><div class='add'>+	case WMI_VDEV_TYPE_IBSS:</div><div class='add'>+		__set_bit(WOW_BEACON_EVENT, &amp;wow_mask);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case WMI_VDEV_TYPE_AP:</div><div class='add'>+		__set_bit(WOW_DEAUTH_RECVD_EVENT, &amp;wow_mask);</div><div class='add'>+		__set_bit(WOW_DISASSOC_RECVD_EVENT, &amp;wow_mask);</div><div class='add'>+		__set_bit(WOW_PROBE_REQ_WPS_IE_EVENT, &amp;wow_mask);</div><div class='add'>+		__set_bit(WOW_AUTH_REQ_EVENT, &amp;wow_mask);</div><div class='add'>+		__set_bit(WOW_ASSOC_REQ_EVENT, &amp;wow_mask);</div><div class='add'>+		__set_bit(WOW_HTT_EVENT, &amp;wow_mask);</div><div class='add'>+		__set_bit(WOW_RA_MATCH_EVENT, &amp;wow_mask);</div><div class='add'>+		break;</div><div class='add'>+	case WMI_VDEV_TYPE_STA:</div><div class='add'>+		if (wowlan-&gt;disconnect) {</div><div class='add'>+			__set_bit(WOW_DEAUTH_RECVD_EVENT, &amp;wow_mask);</div><div class='add'>+			__set_bit(WOW_DISASSOC_RECVD_EVENT, &amp;wow_mask);</div><div class='add'>+			__set_bit(WOW_BMISS_EVENT, &amp;wow_mask);</div><div class='add'>+			__set_bit(WOW_CSA_IE_EVENT, &amp;wow_mask);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (wowlan-&gt;magic_pkt)</div><div class='add'>+			__set_bit(WOW_MAGIC_PKT_RECVD_EVENT, &amp;wow_mask);</div><div class='add'>+</div><div class='add'>+		if (wowlan-&gt;nd_config) {</div><div class='add'>+			struct wmi_pno_scan_req_arg *pno;</div><div class='add'>+			int ret;</div><div class='add'>+</div><div class='add'>+			pno = kzalloc(sizeof(*pno), GFP_KERNEL);</div><div class='add'>+			if (!pno)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+</div><div class='add'>+			ar-&gt;nlo_enabled = true;</div><div class='add'>+</div><div class='add'>+			ret = ath12k_wow_pno_check_and_convert(ar, arvif-&gt;vdev_id,</div><div class='add'>+							       wowlan-&gt;nd_config, pno);</div><div class='add'>+			if (!ret) {</div><div class='add'>+				ath12k_wmi_wow_config_pno(ar, arvif-&gt;vdev_id, pno);</div><div class='add'>+				__set_bit(WOW_NLO_DETECTED_EVENT, &amp;wow_mask);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			kfree(pno);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; wowlan-&gt;n_patterns; i++) {</div><div class='add'>+		const struct cfg80211_pkt_pattern *eth_pattern = &amp;patterns[i];</div><div class='add'>+		struct ath12k_pkt_pattern new_pattern = {};</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(eth_pattern-&gt;pattern_len &gt; WOW_MAX_PATTERN_SIZE))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (ar-&gt;ab-&gt;wow.wmi_conf_rx_decap_mode ==</div><div class='add'>+		    ATH12K_HW_TXRX_NATIVE_WIFI) {</div><div class='add'>+			ath12k_wow_convert_8023_to_80211(ar, eth_pattern,</div><div class='add'>+							 &amp;new_pattern);</div><div class='add'>+</div><div class='add'>+			if (WARN_ON(new_pattern.pattern_len &gt; WOW_MAX_PATTERN_SIZE))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		} else {</div><div class='add'>+			memcpy(new_pattern.pattern, eth_pattern-&gt;pattern,</div><div class='add'>+			       eth_pattern-&gt;pattern_len);</div><div class='add'>+</div><div class='add'>+			/* convert bitmask to bytemask */</div><div class='add'>+			for (j = 0; j &lt; eth_pattern-&gt;pattern_len; j++)</div><div class='add'>+				if (eth_pattern-&gt;mask[j / 8] &amp; BIT(j % 8))</div><div class='add'>+					new_pattern.bytemask[j] = 0xff;</div><div class='add'>+</div><div class='add'>+			new_pattern.pattern_len = eth_pattern-&gt;pattern_len;</div><div class='add'>+			new_pattern.pkt_offset = eth_pattern-&gt;pkt_offset;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ath12k_wmi_wow_add_pattern(ar, arvif-&gt;vdev_id,</div><div class='add'>+						 pattern_id,</div><div class='add'>+						 new_pattern.pattern,</div><div class='add'>+						 new_pattern.bytemask,</div><div class='add'>+						 new_pattern.pattern_len,</div><div class='add'>+						 new_pattern.pkt_offset);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to add pattern %i to vdev %i: %d\n",</div><div class='add'>+				    pattern_id,</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pattern_id++;</div><div class='add'>+		__set_bit(WOW_PATTERN_MATCH_EVENT, &amp;wow_mask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WOW_EVENT_MAX; i++) {</div><div class='add'>+		if (!test_bit(i, &amp;wow_mask))</div><div class='add'>+			continue;</div><div class='add'>+		ret = ath12k_wmi_wow_add_wakeup_event(ar, arvif-&gt;vdev_id, i, 1);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to enable wakeup event %s on vdev %i: %d\n",</div><div class='add'>+				    wow_wakeup_event(i), arvif-&gt;vdev_id, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wow_set_wakeups(struct ath12k *ar,</div><div class='add'>+				  struct cfg80211_wowlan *wowlan)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+		if (ath12k_wow_is_p2p_vdev(arvif-&gt;ahvif))</div><div class='add'>+			continue;</div><div class='add'>+		ret = ath12k_wow_vif_set_wakeups(arvif, wowlan);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to set wow wakeups on vdev %i: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wow_vdev_clean_nlo(struct ath12k *ar, u32 vdev_id)</div><div class='add'>+{</div><div class='add'>+	struct wmi_pno_scan_req_arg *pno;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!ar-&gt;nlo_enabled)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	pno = kzalloc(sizeof(*pno), GFP_KERNEL);</div><div class='add'>+	if (!pno)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pno-&gt;enable = 0;</div><div class='add'>+	ret = ath12k_wmi_wow_config_pno(ar, vdev_id, pno);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to disable PNO: %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;nlo_enabled = false;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(pno);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wow_vif_clean_nlo(struct ath12k_link_vif *arvif)</div><div class='add'>+{</div><div class='add'>+	struct ath12k *ar = arvif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	switch (arvif-&gt;ahvif-&gt;vdev_type) {</div><div class='add'>+	case WMI_VDEV_TYPE_STA:</div><div class='add'>+		return ath12k_wow_vdev_clean_nlo(ar, arvif-&gt;vdev_id);</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wow_nlo_cleanup(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+		if (ath12k_wow_is_p2p_vdev(arvif-&gt;ahvif))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = ath12k_wow_vif_clean_nlo(arvif);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to clean nlo settings on vdev %i: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wow_set_hw_filter(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct wmi_hw_data_filter_arg arg;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+		if (arvif-&gt;ahvif-&gt;vdev_type != WMI_VDEV_TYPE_STA)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		arg.vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+		arg.enable = true;</div><div class='add'>+		arg.hw_filter_bitmap = WMI_HW_DATA_FILTER_DROP_NON_ICMPV6_MC;</div><div class='add'>+		ret = ath12k_wmi_hw_data_filter_cmd(ar, &amp;arg);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to set hw data filter on vdev %i: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wow_clear_hw_filter(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	struct wmi_hw_data_filter_arg arg;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+		if (arvif-&gt;ahvif-&gt;vdev_type != WMI_VDEV_TYPE_STA)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		arg.vdev_id = arvif-&gt;vdev_id;</div><div class='add'>+		arg.enable = false;</div><div class='add'>+		arg.hw_filter_bitmap = 0;</div><div class='add'>+		ret = ath12k_wmi_hw_data_filter_cmd(ar, &amp;arg);</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to clear hw data filter on vdev %i: %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wow_generate_ns_mc_addr(struct ath12k_base *ab,</div><div class='add'>+					   struct wmi_arp_ns_offload_arg *offload)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; offload-&gt;ipv6_count; i++) {</div><div class='add'>+		offload-&gt;self_ipv6_addr[i][0] = 0xff;</div><div class='add'>+		offload-&gt;self_ipv6_addr[i][1] = 0x02;</div><div class='add'>+		offload-&gt;self_ipv6_addr[i][11] = 0x01;</div><div class='add'>+		offload-&gt;self_ipv6_addr[i][12] = 0xff;</div><div class='add'>+		offload-&gt;self_ipv6_addr[i][13] =</div><div class='add'>+					offload-&gt;ipv6_addr[i][13];</div><div class='add'>+		offload-&gt;self_ipv6_addr[i][14] =</div><div class='add'>+					offload-&gt;ipv6_addr[i][14];</div><div class='add'>+		offload-&gt;self_ipv6_addr[i][15] =</div><div class='add'>+					offload-&gt;ipv6_addr[i][15];</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_WOW, "NS solicited addr %pI6\n",</div><div class='add'>+			   offload-&gt;self_ipv6_addr[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wow_prepare_ns_offload(struct ath12k_link_vif *arvif,</div><div class='add'>+					  struct wmi_arp_ns_offload_arg *offload)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = ieee80211_vif_to_wdev(arvif-&gt;ahvif-&gt;vif)-&gt;netdev;</div><div class='add'>+	struct ath12k_base *ab = arvif-&gt;ar-&gt;ab;</div><div class='add'>+	struct inet6_ifaddr *ifa6;</div><div class='add'>+	struct ifacaddr6 *ifaca6;</div><div class='add'>+	struct inet6_dev *idev;</div><div class='add'>+	u32 count = 0, scope;</div><div class='add'>+</div><div class='add'>+	if (!ndev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	idev = in6_dev_get(ndev);</div><div class='add'>+	if (!idev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WOW, "wow prepare ns offload\n");</div><div class='add'>+</div><div class='add'>+	read_lock_bh(&amp;idev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* get unicast address */</div><div class='add'>+	list_for_each_entry(ifa6, &amp;idev-&gt;addr_list, if_list) {</div><div class='add'>+		if (count &gt;= WMI_IPV6_MAX_COUNT)</div><div class='add'>+			goto unlock;</div><div class='add'>+</div><div class='add'>+		if (ifa6-&gt;flags &amp; IFA_F_DADFAILED)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		scope = ipv6_addr_src_scope(&amp;ifa6-&gt;addr);</div><div class='add'>+		if (scope != IPV6_ADDR_SCOPE_LINKLOCAL &amp;&amp;</div><div class='add'>+		    scope != IPV6_ADDR_SCOPE_GLOBAL) {</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_WOW,</div><div class='add'>+				   "Unsupported ipv6 scope: %d\n", scope);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memcpy(offload-&gt;ipv6_addr[count], &amp;ifa6-&gt;addr.s6_addr,</div><div class='add'>+		       sizeof(ifa6-&gt;addr.s6_addr));</div><div class='add'>+		offload-&gt;ipv6_type[count] = WMI_IPV6_UC_TYPE;</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_WOW, "mac count %d ipv6 uc %pI6 scope %d\n",</div><div class='add'>+			   count, offload-&gt;ipv6_addr[count],</div><div class='add'>+			   scope);</div><div class='add'>+		count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get anycast address */</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	for (ifaca6 = rcu_dereference(idev-&gt;ac_list); ifaca6;</div><div class='add'>+	     ifaca6 = rcu_dereference(ifaca6-&gt;aca_next)) {</div><div class='add'>+		if (count &gt;= WMI_IPV6_MAX_COUNT) {</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		scope = ipv6_addr_src_scope(&amp;ifaca6-&gt;aca_addr);</div><div class='add'>+		if (scope != IPV6_ADDR_SCOPE_LINKLOCAL &amp;&amp;</div><div class='add'>+		    scope != IPV6_ADDR_SCOPE_GLOBAL) {</div><div class='add'>+			ath12k_dbg(ab, ATH12K_DBG_WOW,</div><div class='add'>+				   "Unsupported ipv scope: %d\n", scope);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memcpy(offload-&gt;ipv6_addr[count], &amp;ifaca6-&gt;aca_addr,</div><div class='add'>+		       sizeof(ifaca6-&gt;aca_addr));</div><div class='add'>+		offload-&gt;ipv6_type[count] = WMI_IPV6_AC_TYPE;</div><div class='add'>+		ath12k_dbg(ab, ATH12K_DBG_WOW, "mac count %d ipv6 ac %pI6 scope %d\n",</div><div class='add'>+			   count, offload-&gt;ipv6_addr[count],</div><div class='add'>+			   scope);</div><div class='add'>+		count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	in6_dev_put(idev);</div><div class='add'>+</div><div class='add'>+	offload-&gt;ipv6_count = count;</div><div class='add'>+	ath12k_wow_generate_ns_mc_addr(ab, offload);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath12k_wow_prepare_arp_offload(struct ath12k_link_vif *arvif,</div><div class='add'>+					   struct wmi_arp_ns_offload_arg *offload)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = arvif-&gt;ahvif-&gt;vif;</div><div class='add'>+	struct ieee80211_vif_cfg vif_cfg = vif-&gt;cfg;</div><div class='add'>+	struct ath12k_base *ab = arvif-&gt;ar-&gt;ab;</div><div class='add'>+	u32 ipv4_cnt;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WOW, "wow prepare arp offload\n");</div><div class='add'>+</div><div class='add'>+	ipv4_cnt = min(vif_cfg.arp_addr_cnt, WMI_IPV4_MAX_COUNT);</div><div class='add'>+	memcpy(offload-&gt;ipv4_addr, vif_cfg.arp_addr_list, ipv4_cnt * sizeof(u32));</div><div class='add'>+	offload-&gt;ipv4_count = ipv4_cnt;</div><div class='add'>+</div><div class='add'>+	ath12k_dbg(ab, ATH12K_DBG_WOW,</div><div class='add'>+		   "wow arp_addr_cnt %d vif-&gt;addr %pM, offload_addr %pI4\n",</div><div class='add'>+		   vif_cfg.arp_addr_cnt, vif-&gt;addr, offload-&gt;ipv4_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wow_arp_ns_offload(struct ath12k *ar, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct wmi_arp_ns_offload_arg *offload;</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	struct ath12k_vif *ahvif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	offload = kmalloc(sizeof(*offload), GFP_KERNEL);</div><div class='add'>+	if (!offload)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+		ahvif = arvif-&gt;ahvif;</div><div class='add'>+</div><div class='add'>+		if (ahvif-&gt;vdev_type != WMI_VDEV_TYPE_STA)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		memset(offload, 0, sizeof(*offload));</div><div class='add'>+</div><div class='add'>+		memcpy(offload-&gt;mac_addr, ahvif-&gt;vif-&gt;addr, ETH_ALEN);</div><div class='add'>+		ath12k_wow_prepare_ns_offload(arvif, offload);</div><div class='add'>+		ath12k_wow_prepare_arp_offload(arvif, offload);</div><div class='add'>+</div><div class='add'>+		ret = ath12k_wmi_arp_ns_offload(ar, arvif, offload, enable);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to set arp ns offload vdev %i: enable %d, ret %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, enable, ret);</div><div class='add'>+			kfree(offload);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(offload);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_gtk_rekey_offload(struct ath12k *ar, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+		if (arvif-&gt;ahvif-&gt;vdev_type != WMI_VDEV_TYPE_STA ||</div><div class='add'>+		    !arvif-&gt;is_up ||</div><div class='add'>+		    !arvif-&gt;rekey_data.enable_offload)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* get rekey info before disable rekey offload */</div><div class='add'>+		if (!enable) {</div><div class='add'>+			ret = ath12k_wmi_gtk_rekey_getinfo(ar, arvif);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath12k_warn(ar-&gt;ab, "failed to request rekey info vdev %i, ret %d\n",</div><div class='add'>+					    arvif-&gt;vdev_id, ret);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ath12k_wmi_gtk_rekey_offload(ar, arvif, enable);</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "failed to offload gtk reky vdev %i: enable %d, ret %d\n",</div><div class='add'>+				    arvif-&gt;vdev_id, enable, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wow_protocol_offload(struct ath12k *ar, bool enable)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wow_arp_ns_offload(ar, enable);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to offload ARP and NS %d %d\n",</div><div class='add'>+			    enable, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_gtk_rekey_offload(ar, enable);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to offload gtk rekey %d %d\n",</div><div class='add'>+			    enable, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath12k_wow_set_keepalive(struct ath12k *ar,</div><div class='add'>+				    enum wmi_sta_keepalive_method method,</div><div class='add'>+				    u32 interval)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_link_vif *arvif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(ath12k_ar_to_hw(ar)-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(arvif, &amp;ar-&gt;arvifs, list) {</div><div class='add'>+		ret = ath12k_mac_vif_set_keepalive(arvif, method, interval);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wow_op_suspend(struct ieee80211_hw *hw,</div><div class='add'>+			  struct cfg80211_wowlan *wowlan)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	struct ath12k *ar = ath12k_ah_to_ar(ah, 0);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ret =  ath12k_wow_cleanup(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to clear wow wakeup events: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wow_set_wakeups(ar, wowlan);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set wow wakeup events: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wow_protocol_offload(ar, true);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set wow protocol offload events: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_mac_wait_tx_complete(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to wait tx complete: %d\n", ret);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wow_set_hw_filter(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to set hw filter: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wow_set_keepalive(ar,</div><div class='add'>+				       WMI_STA_KEEPALIVE_METHOD_NULL_FRAME,</div><div class='add'>+				       WMI_STA_KEEPALIVE_INTERVAL_DEFAULT);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to enable wow keepalive: %d\n", ret);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wow_enable(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to start wow: %d\n", ret);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_hif_irq_disable(ar-&gt;ab);</div><div class='add'>+	ath12k_hif_ce_irq_disable(ar-&gt;ab);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_hif_suspend(ar-&gt;ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to suspend hif: %d\n", ret);</div><div class='add'>+		goto wakeup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	goto exit;</div><div class='add'>+</div><div class='add'>+wakeup:</div><div class='add'>+	ath12k_wow_wakeup(ar);</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	ath12k_wow_cleanup(ar);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	return ret ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath12k_wow_op_set_wakeup(struct ieee80211_hw *hw, bool enabled)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	struct ath12k *ar = ath12k_ah_to_ar(ah, 0);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	device_set_wakeup_enable(ar-&gt;ab-&gt;dev, enabled);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wow_op_resume(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);</div><div class='add'>+	struct ath12k *ar = ath12k_ah_to_ar(ah, 0);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_hif_resume(ar-&gt;ab);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to resume hif: %d\n", ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath12k_hif_ce_irq_enable(ar-&gt;ab);</div><div class='add'>+	ath12k_hif_irq_enable(ar-&gt;ab);</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wow_wakeup(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to wakeup from wow: %d\n", ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wow_nlo_cleanup(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to cleanup nlo: %d\n", ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wow_clear_hw_filter(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to clear hw filter: %d\n", ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wow_protocol_offload(ar, false);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to clear wow protocol offload events: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath12k_wow_set_keepalive(ar,</div><div class='add'>+				       WMI_STA_KEEPALIVE_METHOD_NULL_FRAME,</div><div class='add'>+				       WMI_STA_KEEPALIVE_INTERVAL_DISABLE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath12k_warn(ar-&gt;ab, "failed to disable wow keepalive: %d\n", ret);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	if (ret) {</div><div class='add'>+		switch (ah-&gt;state) {</div><div class='add'>+		case ATH12K_HW_STATE_ON:</div><div class='add'>+			ah-&gt;state = ATH12K_HW_STATE_RESTARTING;</div><div class='add'>+			ret = 1;</div><div class='add'>+			break;</div><div class='add'>+		case ATH12K_HW_STATE_OFF:</div><div class='add'>+		case ATH12K_HW_STATE_RESTARTING:</div><div class='add'>+		case ATH12K_HW_STATE_RESTARTED:</div><div class='add'>+		case ATH12K_HW_STATE_WEDGED:</div><div class='add'>+		case ATH12K_HW_STATE_TM:</div><div class='add'>+			ath12k_warn(ar-&gt;ab, "encountered unexpected device state %d on resume, cannot recover\n",</div><div class='add'>+				    ah-&gt;state);</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath12k_wow_init(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	if (!test_bit(WMI_TLV_SERVICE_WOW, ar-&gt;wmi-&gt;wmi_ab-&gt;svc_map))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ar-&gt;wow.wowlan_support = ath12k_wowlan_support;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;ab-&gt;wow.wmi_conf_rx_decap_mode == ATH12K_HW_TXRX_NATIVE_WIFI) {</div><div class='add'>+		ar-&gt;wow.wowlan_support.pattern_max_len -= WOW_MAX_REDUCE;</div><div class='add'>+		ar-&gt;wow.wowlan_support.max_pkt_offset -= WOW_MAX_REDUCE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(WMI_TLV_SERVICE_NLO, ar-&gt;wmi-&gt;wmi_ab-&gt;svc_map)) {</div><div class='add'>+		ar-&gt;wow.wowlan_support.flags |= WIPHY_WOWLAN_NET_DETECT;</div><div class='add'>+		ar-&gt;wow.wowlan_support.max_nd_match_sets = WMI_PNO_MAX_SUPP_NETWORKS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ar-&gt;wow.max_num_patterns = ATH12K_WOW_PATTERNS;</div><div class='add'>+	ar-&gt;wow.wowlan_support.n_patterns = ar-&gt;wow.max_num_patterns;</div><div class='add'>+	ar-&gt;ah-&gt;hw-&gt;wiphy-&gt;wowlan = &amp;ar-&gt;wow.wowlan_support;</div><div class='add'>+</div><div class='add'>+	device_set_wakeup_capable(ar-&gt;ab-&gt;dev, true);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath12k/wow.h b/drivers/net/wireless/ath/ath12k/wow.h<br/>new file mode 100644<br/>index 000000000000..af9be5fadcc3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath12k/wow.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath12k/wow.h</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022, 2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ATH12K_WOW_H</div><div class='add'>+#define ATH12K_WOW_H</div><div class='add'>+</div><div class='add'>+#define ATH12K_WOW_RETRY_NUM		10</div><div class='add'>+#define ATH12K_WOW_RETRY_WAIT_MS	200</div><div class='add'>+#define ATH12K_WOW_PATTERNS		22</div><div class='add'>+</div><div class='add'>+struct ath12k_wow {</div><div class='add'>+	u32 max_num_patterns;</div><div class='add'>+	struct completion wakeup_completed;</div><div class='add'>+	struct wiphy_wowlan_support wowlan_support;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath12k_pkt_pattern {</div><div class='add'>+	u8 pattern[WOW_MAX_PATTERN_SIZE];</div><div class='add'>+	u8 bytemask[WOW_MAX_PATTERN_SIZE];</div><div class='add'>+	int pattern_len;</div><div class='add'>+	int pkt_offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rfc1042_hdr {</div><div class='add'>+	u8 llc_dsap;</div><div class='add'>+	u8 llc_ssap;</div><div class='add'>+	u8 llc_ctrl;</div><div class='add'>+	u8 snap_oui[3];</div><div class='add'>+	__be16 eth_type;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+int ath12k_wow_init(struct ath12k *ar);</div><div class='add'>+int ath12k_wow_op_suspend(struct ieee80211_hw *hw,</div><div class='add'>+			  struct cfg80211_wowlan *wowlan);</div><div class='add'>+int ath12k_wow_op_resume(struct ieee80211_hw *hw);</div><div class='add'>+void ath12k_wow_op_set_wakeup(struct ieee80211_hw *hw, bool enabled);</div><div class='add'>+int ath12k_wow_enable(struct ath12k *ar);</div><div class='add'>+int ath12k_wow_wakeup(struct ath12k *ar);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline int ath12k_wow_init(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath12k_wow_enable(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath12k_wow_wakeup(struct ath12k *ar)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+#endif /* ATH12K_WOW_H */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/Kconfig b/drivers/net/wireless/ath/ath5k/Kconfig<br/>index f35cd8de228e..6914b37bb0fb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath5k/Kconfig</a></div><div class='hunk'>@@ -3,9 +3,7 @@ config ATH5K</div><div class='ctx'> 	tristate "Atheros 5xxx wireless cards support"</div><div class='ctx'> 	depends on (PCI || ATH25) &amp;&amp; MAC80211</div><div class='ctx'> 	select ATH_COMMON</div><div class='del'>-	select MAC80211_LEDS</div><div class='del'>-	select LEDS_CLASS</div><div class='del'>-	select NEW_LEDS</div><div class='add'>+	select MAC80211_LEDS if LEDS_CLASS=y || LEDS_CLASS=MAC80211</div><div class='ctx'> 	select ATH5K_AHB if ATH25</div><div class='ctx'> 	select ATH5K_PCI if !ATH25</div><div class='ctx'> 	help</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/ahb.c b/drivers/net/wireless/ath/ath5k/ahb.c<br/>index 2c9cec8b53d9..cb3e891ee1bd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/ahb.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/ahb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/ahb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath5k/ahb.c</a></div><div class='hunk'>@@ -113,15 +113,12 @@ static int ath_ahb_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);</div><div class='del'>-	if (res == NULL) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "no IRQ resource found\n");</div><div class='del'>-		ret = -ENXIO;</div><div class='add'>+	irq = platform_get_irq(pdev, 0);</div><div class='add'>+	if (irq &lt; 0) {</div><div class='add'>+		ret = irq;</div><div class='ctx'> 		goto err_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	irq = res-&gt;start;</div><div class='del'>-</div><div class='ctx'> 	hw = ieee80211_alloc_hw(sizeof(struct ath5k_hw), &amp;ath5k_hw_ops);</div><div class='ctx'> 	if (hw == NULL) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "no memory for ieee80211_hw\n");</div><div class='hunk'>@@ -188,7 +185,7 @@ static int ath_ahb_probe(struct platform_device *pdev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath_ahb_remove(struct platform_device *pdev)</div><div class='add'>+static void ath_ahb_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ar231x_board_config *bcfg = dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='ctx'> 	struct ieee80211_hw *hw = platform_get_drvdata(pdev);</div><div class='hunk'>@@ -196,7 +193,7 @@ static int ath_ahb_remove(struct platform_device *pdev)</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='ctx'> 	if (!hw)</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	ah = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -218,15 +215,13 @@ static int ath_ahb_remove(struct platform_device *pdev)</div><div class='ctx'> 	ath5k_deinit_ah(ah);</div><div class='ctx'> 	iounmap(ah-&gt;iobase);</div><div class='ctx'> 	ieee80211_free_hw(hw);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver ath_ahb_driver = {</div><div class='del'>-	.probe      = ath_ahb_probe,</div><div class='del'>-	.remove     = ath_ahb_remove,</div><div class='del'>-	.driver		= {</div><div class='del'>-		.name	= "ar231x-wmac",</div><div class='add'>+	.probe = ath_ahb_probe,</div><div class='add'>+	.remove = ath_ahb_remove,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "ar231x-wmac",</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h<br/>index 234ea939d316..f595204f493d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/ath5k.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/ath5k.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/ath5k.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath5k/ath5k.h</a></div><div class='hunk'>@@ -1395,10 +1395,6 @@ struct ath5k_hw {</div><div class='ctx'> 	u32			ah_txq_imr_nofrm;</div><div class='ctx'> </div><div class='ctx'> 	u32			ah_txq_isr_txok_all;</div><div class='del'>-	u32			ah_txq_isr_txurn;</div><div class='del'>-	u32			ah_txq_isr_qcborn;</div><div class='del'>-	u32			ah_txq_isr_qcburn;</div><div class='del'>-	u32			ah_txq_isr_qtrig;</div><div class='ctx'> </div><div class='ctx'> 	u32			*ah_rf_banks;</div><div class='ctx'> 	size_t			ah_rf_banks_size;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c<br/>index cef17f33c69e..4d88b02ffa79 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/base.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/base.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/base.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath5k/base.c</a></div><div class='hunk'>@@ -59,7 +59,7 @@</div><div class='ctx'> #include &lt;net/cfg80211.h&gt;</div><div class='ctx'> #include &lt;net/ieee80211_radiotap.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='ctx'> #include "base.h"</div><div class='hunk'>@@ -230,13 +230,13 @@ ath5k_chip_name(enum ath5k_srev_type type, u_int16_t val)</div><div class='ctx'> }</div><div class='ctx'> static unsigned int ath5k_ioread32(void *hw_priv, u32 reg_offset)</div><div class='ctx'> {</div><div class='del'>-	struct ath5k_hw *ah = (struct ath5k_hw *) hw_priv;</div><div class='add'>+	struct ath5k_hw *ah = hw_priv;</div><div class='ctx'> 	return ath5k_hw_reg_read(ah, reg_offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath5k_iowrite32(void *hw_priv, u32 val, u32 reg_offset)</div><div class='ctx'> {</div><div class='del'>-	struct ath5k_hw *ah = (struct ath5k_hw *) hw_priv;</div><div class='add'>+	struct ath5k_hw *ah = hw_priv;</div><div class='ctx'> 	ath5k_hw_reg_write(ah, val, reg_offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -727,6 +727,43 @@ ath5k_get_rate_hw_value(const struct ieee80211_hw *hw,</div><div class='ctx'> 	return hw_rate;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ath5k_merge_ratetbl(struct ieee80211_sta *sta,</div><div class='add'>+				struct ath5k_buf *bf,</div><div class='add'>+				struct ieee80211_tx_info *tx_info)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta_rates *ratetbl;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (!sta)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	ratetbl = rcu_dereference(sta-&gt;rates);</div><div class='add'>+	if (!ratetbl)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (tx_info-&gt;control.rates[0].idx &lt; 0 ||</div><div class='add'>+	    tx_info-&gt;control.rates[0].count == 0)</div><div class='add'>+	{</div><div class='add'>+		i = 0;</div><div class='add'>+	} else {</div><div class='add'>+		bf-&gt;rates[0] = tx_info-&gt;control.rates[0];</div><div class='add'>+		i = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for ( ; i &lt; IEEE80211_TX_MAX_RATES; i++) {</div><div class='add'>+		bf-&gt;rates[i].idx = ratetbl-&gt;rate[i].idx;</div><div class='add'>+		bf-&gt;rates[i].flags = ratetbl-&gt;rate[i].flags;</div><div class='add'>+		if (tx_info-&gt;control.use_rts)</div><div class='add'>+			bf-&gt;rates[i].count = ratetbl-&gt;rate[i].count_rts;</div><div class='add'>+		else if (tx_info-&gt;control.use_cts_prot)</div><div class='add'>+			bf-&gt;rates[i].count = ratetbl-&gt;rate[i].count_cts;</div><div class='add'>+		else</div><div class='add'>+			bf-&gt;rates[i].count = ratetbl-&gt;rate[i].count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> ath5k_txbuf_setup(struct ath5k_hw *ah, struct ath5k_buf *bf,</div><div class='ctx'> 		  struct ath5k_txq *txq, int padsize,</div><div class='hunk'>@@ -737,6 +774,7 @@ ath5k_txbuf_setup(struct ath5k_hw *ah, struct ath5k_buf *bf,</div><div class='ctx'> 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='ctx'> 	unsigned int pktlen, flags, keyidx = AR5K_TXKEYIX_INVALID;</div><div class='ctx'> 	struct ieee80211_rate *rate;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='ctx'> 	unsigned int mrr_rate[3], mrr_tries[3];</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> 	u16 hw_rate;</div><div class='hunk'>@@ -753,8 +791,16 @@ ath5k_txbuf_setup(struct ath5k_hw *ah, struct ath5k_buf *bf,</div><div class='ctx'> 	if (dma_mapping_error(ah-&gt;dev, bf-&gt;skbaddr))</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> </div><div class='del'>-	ieee80211_get_tx_rates(info-&gt;control.vif, (control) ? control-&gt;sta : NULL, skb, bf-&gt;rates,</div><div class='del'>-			       ARRAY_SIZE(bf-&gt;rates));</div><div class='add'>+	if (control)</div><div class='add'>+		sta = control-&gt;sta;</div><div class='add'>+	else</div><div class='add'>+		sta = NULL;</div><div class='add'>+</div><div class='add'>+	if (!ath5k_merge_ratetbl(sta, bf, info)) {</div><div class='add'>+		ieee80211_get_tx_rates(info-&gt;control.vif,</div><div class='add'>+				       sta, skb, bf-&gt;rates,</div><div class='add'>+				       ARRAY_SIZE(bf-&gt;rates));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rate = ath5k_get_rate(ah-&gt;hw, info, bf, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -1724,7 +1770,7 @@ ath5k_tx_frame_completed(struct ath5k_hw *ah, struct sk_buff *skb,</div><div class='ctx'> 		ah-&gt;stats.antenna_tx[0]++; /* invalid */</div><div class='ctx'> </div><div class='ctx'> 	trace_ath5k_tx_complete(ah, skb, txq, ts);</div><div class='del'>-	ieee80211_tx_status(ah-&gt;hw, skb);</div><div class='add'>+	ieee80211_tx_status_skb(ah-&gt;hw, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -1900,7 +1946,7 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb = ieee80211_beacon_get(hw, vif);</div><div class='add'>+	skb = ieee80211_beacon_get(hw, vif, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (!skb) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -1936,7 +1982,7 @@ ath5k_beacon_send(struct ath5k_hw *ah)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check if the previous beacon has gone out.  If</div><div class='del'>-	 * not, don't don't try to post another: skip this</div><div class='add'>+	 * not, don't try to post another: skip this</div><div class='ctx'> 	 * period and wait for the next.  Missed beacons</div><div class='ctx'> 	 * indicate a problem and should not occur.  If we</div><div class='ctx'> 	 * miss too many consecutive beacons reset the device.</div><div class='hunk'>@@ -2801,7 +2847,7 @@ static void ath5k_stop_tasklets(struct ath5k_hw *ah)</div><div class='ctx'>  * if another thread does a system call and the thread doing the</div><div class='ctx'>  * stop is preempted).</div><div class='ctx'>  */</div><div class='del'>-void ath5k_stop(struct ieee80211_hw *hw)</div><div class='add'>+void ath5k_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_hw *ah = hw-&gt;priv;</div><div class='ctx'> 	int ret;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/base.h b/drivers/net/wireless/ath/ath5k/base.h<br/>index 97469d0fbad7..594e5b945cb7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/base.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/base.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/base.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath5k/base.h</a></div><div class='hunk'>@@ -92,7 +92,7 @@ void ath5k_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif);</div><div class='ctx'> bool ath5k_any_vif_assoc(struct ath5k_hw *ah);</div><div class='ctx'> </div><div class='ctx'> int ath5k_start(struct ieee80211_hw *hw);</div><div class='del'>-void ath5k_stop(struct ieee80211_hw *hw);</div><div class='add'>+void ath5k_stop(struct ieee80211_hw *hw, bool suspend);</div><div class='ctx'> </div><div class='ctx'> void ath5k_beacon_update_timers(struct ath5k_hw *ah, u64 bc_tsf);</div><div class='ctx'> int ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c<br/>index 4b41160e5d38..ec130510aeb2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/debug.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/debug.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/debug.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath5k/debug.c</a></div><div class='hunk'>@@ -982,8 +982,6 @@ ath5k_debug_init_device(struct ath5k_hw *ah)</div><div class='ctx'> 	ah-&gt;debug.level = ath5k_debug;</div><div class='ctx'> </div><div class='ctx'> 	phydir = debugfs_create_dir("ath5k", ah-&gt;hw-&gt;wiphy-&gt;debugfsdir);</div><div class='del'>-	if (!phydir)</div><div class='del'>-		return;</div><div class='ctx'> </div><div class='ctx'> 	debugfs_create_file("debug", 0600, phydir, ah, &amp;fops_debug);</div><div class='ctx'> 	debugfs_create_file("registers", 0400, phydir, ah, &amp;registers_fops);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/dma.c b/drivers/net/wireless/ath/ath5k/dma.c<br/>index e6c52f7c26e7..d9e376eb040e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/dma.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/dma.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/dma.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath5k/dma.c</a></div><div class='hunk'>@@ -650,6 +650,7 @@ ath5k_hw_get_isr(struct ath5k_hw *ah, enum ath5k_int *interrupt_mask)</div><div class='ctx'> 		 */</div><div class='ctx'> 		*interrupt_mask = (pisr &amp; AR5K_INT_COMMON) &amp; ah-&gt;ah_imr;</div><div class='ctx'> </div><div class='add'>+		ah-&gt;ah_txq_isr_txok_all = 0;</div><div class='ctx'> </div><div class='ctx'> 		/* We treat TXOK,TXDESC, TXERR and TXEOL</div><div class='ctx'> 		 * the same way (schedule the tx tasklet)</div><div class='hunk'>@@ -670,13 +671,6 @@ ath5k_hw_get_isr(struct ath5k_hw *ah, enum ath5k_int *interrupt_mask)</div><div class='ctx'> 			ah-&gt;ah_txq_isr_txok_all |= AR5K_REG_MS(sisr1,</div><div class='ctx'> 						AR5K_SISR1_QCU_TXEOL);</div><div class='ctx'> </div><div class='del'>-		/* Currently this is not much useful since we treat</div><div class='del'>-		 * all queues the same way if we get a TXURN (update</div><div class='del'>-		 * tx trigger level) but we might need it later on*/</div><div class='del'>-		if (pisr &amp; AR5K_ISR_TXURN)</div><div class='del'>-			ah-&gt;ah_txq_isr_txurn |= AR5K_REG_MS(sisr2,</div><div class='del'>-						AR5K_SISR2_QCU_TXURN);</div><div class='del'>-</div><div class='ctx'> 		/* Misc Beacon related interrupts */</div><div class='ctx'> </div><div class='ctx'> 		/* For AR5211 */</div><div class='hunk'>@@ -709,25 +703,16 @@ ath5k_hw_get_isr(struct ath5k_hw *ah, enum ath5k_int *interrupt_mask)</div><div class='ctx'> 			*interrupt_mask |= AR5K_INT_BNR;</div><div class='ctx'> </div><div class='ctx'> 		/* A queue got CBR overrun */</div><div class='del'>-		if (unlikely(pisr &amp; (AR5K_ISR_QCBRORN))) {</div><div class='add'>+		if (unlikely(pisr &amp; (AR5K_ISR_QCBRORN)))</div><div class='ctx'> 			*interrupt_mask |= AR5K_INT_QCBRORN;</div><div class='del'>-			ah-&gt;ah_txq_isr_qcborn |= AR5K_REG_MS(sisr3,</div><div class='del'>-						AR5K_SISR3_QCBRORN);</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		/* A queue got CBR underrun */</div><div class='del'>-		if (unlikely(pisr &amp; (AR5K_ISR_QCBRURN))) {</div><div class='add'>+		if (unlikely(pisr &amp; (AR5K_ISR_QCBRURN)))</div><div class='ctx'> 			*interrupt_mask |= AR5K_INT_QCBRURN;</div><div class='del'>-			ah-&gt;ah_txq_isr_qcburn |= AR5K_REG_MS(sisr3,</div><div class='del'>-						AR5K_SISR3_QCBRURN);</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		/* A queue got triggered */</div><div class='del'>-		if (unlikely(pisr &amp; (AR5K_ISR_QTRIG))) {</div><div class='add'>+		if (unlikely(pisr &amp; (AR5K_ISR_QTRIG)))</div><div class='ctx'> 			*interrupt_mask |= AR5K_INT_QTRIG;</div><div class='del'>-			ah-&gt;ah_txq_isr_qtrig |= AR5K_REG_MS(sisr4,</div><div class='del'>-						AR5K_SISR4_QTRIG);</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		data = pisr;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/eeprom.c b/drivers/net/wireless/ath/ath5k/eeprom.c<br/>index 1fbc2c19848f..58d3e86f6256 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/eeprom.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/eeprom.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/eeprom.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath5k/eeprom.c</a></div><div class='hunk'>@@ -529,7 +529,7 @@ ath5k_eeprom_read_freq_list(struct ath5k_hw *ah, int *offset, int max,</div><div class='ctx'> 		ee-&gt;ee_n_piers[mode]++;</div><div class='ctx'> </div><div class='ctx'> 		freq2 = (val &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-		if (!freq2)</div><div class='add'>+		if (!freq2 || i &gt;= max)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		pc[i++].freq = ath5k_eeprom_bin2freq(ee,</div><div class='hunk'>@@ -746,6 +746,9 @@ ath5k_eeprom_convert_pcal_info_5111(struct ath5k_hw *ah, int mode,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (idx == AR5K_EEPROM_N_PD_CURVES)</div><div class='add'>+			goto err_out;</div><div class='add'>+</div><div class='ctx'> 		ee-&gt;ee_pd_gains[mode] = 1;</div><div class='ctx'> </div><div class='ctx'> 		pd = &amp;chinfo[pier].pd_curves[idx];</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/eeprom.h b/drivers/net/wireless/ath/ath5k/eeprom.h<br/>index 693296ee9693..e85b713950b1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/eeprom.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/eeprom.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/eeprom.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath5k/eeprom.h</a></div><div class='hunk'>@@ -489,7 +489,4 @@ struct ath5k_eeprom_info {</div><div class='ctx'> </div><div class='ctx'> 	/* Spur mitigation data (fbin values for spur channels) */</div><div class='ctx'> 	u16	ee_spur_chans[AR5K_EEPROM_N_SPUR_CHANS][AR5K_EEPROM_N_FREQ_BANDS];</div><div class='del'>-</div><div class='del'>-	/* Antenna raw switch tables */</div><div class='del'>-	u32	ee_antenna[AR5K_EEPROM_N_MODES][AR5K_ANT_MAX];</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/led.c b/drivers/net/wireless/ath/ath5k/led.c<br/>index 6a2a16856763..439052984796 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/led.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/led.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/led.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath5k/led.c</a></div><div class='hunk'>@@ -89,7 +89,8 @@ static const struct pci_device_id ath5k_led_devices[] = {</div><div class='ctx'> </div><div class='ctx'> void ath5k_led_enable(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='del'>-	if (test_bit(ATH_STAT_LEDSOFT, ah-&gt;status)) {</div><div class='add'>+	if (IS_ENABLED(CONFIG_MAC80211_LEDS) &amp;&amp;</div><div class='add'>+	    test_bit(ATH_STAT_LEDSOFT, ah-&gt;status)) {</div><div class='ctx'> 		ath5k_hw_set_gpio_output(ah, ah-&gt;led_pin);</div><div class='ctx'> 		ath5k_led_off(ah);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -104,7 +105,8 @@ static void ath5k_led_on(struct ath5k_hw *ah)</div><div class='ctx'> </div><div class='ctx'> void ath5k_led_off(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='del'>-	if (!test_bit(ATH_STAT_LEDSOFT, ah-&gt;status))</div><div class='add'>+	if (!IS_ENABLED(CONFIG_MAC80211_LEDS) ||</div><div class='add'>+	    !test_bit(ATH_STAT_LEDSOFT, ah-&gt;status))</div><div class='ctx'> 		return;</div><div class='ctx'> 	ath5k_hw_set_gpio(ah, ah-&gt;led_pin, !ah-&gt;led_on);</div><div class='ctx'> }</div><div class='hunk'>@@ -129,8 +131,7 @@ ath5k_register_led(struct ath5k_hw *ah, struct ath5k_led *led,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	led-&gt;ah = ah;</div><div class='del'>-	strncpy(led-&gt;name, name, sizeof(led-&gt;name));</div><div class='del'>-	led-&gt;name[sizeof(led-&gt;name)-1] = 0;</div><div class='add'>+	strscpy(led-&gt;name, name, sizeof(led-&gt;name));</div><div class='ctx'> 	led-&gt;led_dev.name = led-&gt;name;</div><div class='ctx'> 	led-&gt;led_dev.default_trigger = trigger;</div><div class='ctx'> 	led-&gt;led_dev.brightness_set = ath5k_led_brightness_set;</div><div class='hunk'>@@ -146,7 +147,7 @@ ath5k_register_led(struct ath5k_hw *ah, struct ath5k_led *led,</div><div class='ctx'> static void</div><div class='ctx'> ath5k_unregister_led(struct ath5k_led *led)</div><div class='ctx'> {</div><div class='del'>-	if (!led-&gt;ah)</div><div class='add'>+	if (!IS_ENABLED(CONFIG_MAC80211_LEDS) || !led-&gt;ah)</div><div class='ctx'> 		return;</div><div class='ctx'> 	led_classdev_unregister(&amp;led-&gt;led_dev);</div><div class='ctx'> 	ath5k_led_off(led-&gt;ah);</div><div class='hunk'>@@ -169,7 +170,7 @@ int ath5k_init_leds(struct ath5k_hw *ah)</div><div class='ctx'> 	char name[ATH5K_LED_MAX_NAME_LEN + 1];</div><div class='ctx'> 	const struct pci_device_id *match;</div><div class='ctx'> </div><div class='del'>-	if (!ah-&gt;pdev)</div><div class='add'>+	if (!IS_ENABLED(CONFIG_MAC80211_LEDS) || !ah-&gt;pdev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ATH5K_AHB</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/mac80211-ops.c b/drivers/net/wireless/ath/ath5k/mac80211-ops.c<br/>index 532eeac9e83e..eca8145d3874 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/mac80211-ops.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/mac80211-ops.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/mac80211-ops.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath5k/mac80211-ops.c</a></div><div class='hunk'>@@ -44,7 +44,7 @@</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ath5k.h"</div><div class='ctx'> #include "base.h"</div><div class='hunk'>@@ -192,7 +192,7 @@ ath5k_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'>  * TODO: Phy disable/diversity etc</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-ath5k_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+ath5k_config(struct ieee80211_hw *hw, int radio_idx, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_hw *ah = hw-&gt;priv;</div><div class='ctx'> 	struct ieee80211_conf *conf = &amp;hw-&gt;conf;</div><div class='hunk'>@@ -250,7 +250,7 @@ unlock:</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> ath5k_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-		       struct ieee80211_bss_conf *bss_conf, u32 changes)</div><div class='add'>+		       struct ieee80211_bss_conf *bss_conf, u64 changes)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_vif *avf = (void *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct ath5k_hw *ah = hw-&gt;priv;</div><div class='hunk'>@@ -278,9 +278,9 @@ ath5k_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changes &amp; BSS_CHANGED_ASSOC) {</div><div class='del'>-		avf-&gt;assoc = bss_conf-&gt;assoc;</div><div class='del'>-		if (bss_conf-&gt;assoc)</div><div class='del'>-			ah-&gt;assoc = bss_conf-&gt;assoc;</div><div class='add'>+		avf-&gt;assoc = vif-&gt;cfg.assoc;</div><div class='add'>+		if (vif-&gt;cfg.assoc)</div><div class='add'>+			ah-&gt;assoc = vif-&gt;cfg.assoc;</div><div class='ctx'> 		else</div><div class='ctx'> 			ah-&gt;assoc = ath5k_any_vif_assoc(ah);</div><div class='ctx'> </div><div class='hunk'>@@ -288,11 +288,11 @@ ath5k_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 			ath5k_set_beacon_filter(hw, ah-&gt;assoc);</div><div class='ctx'> 		ath5k_hw_set_ledstate(ah, ah-&gt;assoc ?</div><div class='ctx'> 			AR5K_LED_ASSOC : AR5K_LED_INIT);</div><div class='del'>-		if (bss_conf-&gt;assoc) {</div><div class='add'>+		if (vif-&gt;cfg.assoc) {</div><div class='ctx'> 			ATH5K_DBG(ah, ATH5K_DEBUG_ANY,</div><div class='ctx'> 				  "Bss Info ASSOC %d, bssid: %pM\n",</div><div class='del'>-				  bss_conf-&gt;aid, common-&gt;curbssid);</div><div class='del'>-			common-&gt;curaid = bss_conf-&gt;aid;</div><div class='add'>+				  vif-&gt;cfg.aid, common-&gt;curbssid);</div><div class='add'>+			common-&gt;curaid = vif-&gt;cfg.aid;</div><div class='ctx'> 			ath5k_hw_set_bssid(ah);</div><div class='ctx'> 			/* Once ANI is available you would start it here */</div><div class='ctx'> 		}</div><div class='hunk'>@@ -382,7 +382,6 @@ ath5k_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags,</div><div class='ctx'> 	mfilt[1] = multicast &gt;&gt; 32;</div><div class='ctx'> </div><div class='ctx'> 	/* Only deal with supported flags */</div><div class='del'>-	changed_flags &amp;= SUPPORTED_FIF_FLAGS;</div><div class='ctx'> 	*new_flags &amp;= SUPPORTED_FIF_FLAGS;</div><div class='ctx'> </div><div class='ctx'> 	/* If HW detects any phy or radar errors, leave those filters on.</div><div class='hunk'>@@ -410,7 +409,7 @@ ath5k_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags,</div><div class='ctx'> 	/* FIF_CONTROL doc says we should only pass on control frames for this</div><div class='ctx'> 	 * station. This needs testing. I believe right now this</div><div class='ctx'> 	 * enables *all* control frames, which is OK.. but</div><div class='del'>-	 * but we should see if we can improve on granularity */</div><div class='add'>+	 * we should see if we can improve on granularity */</div><div class='ctx'> 	if (*new_flags &amp; FIF_CONTROL)</div><div class='ctx'> 		rfilt |= AR5K_RX_FILTER_CONTROL;</div><div class='ctx'> </div><div class='hunk'>@@ -572,7 +571,8 @@ ath5k_get_stats(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-ath5k_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue,</div><div class='add'>+ath5k_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+	      unsigned int link_id, u16 queue,</div><div class='ctx'> 	      const struct ieee80211_tx_queue_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_hw *ah = hw-&gt;priv;</div><div class='hunk'>@@ -686,6 +686,7 @@ ath5k_get_survey(struct ieee80211_hw *hw, int idx, struct survey_info *survey)</div><div class='ctx'>  * ath5k_set_coverage_class - Set IEEE 802.11 coverage class</div><div class='ctx'>  *</div><div class='ctx'>  * @hw: struct ieee80211_hw pointer</div><div class='add'>+ * @radio_idx: Radio index</div><div class='ctx'>  * @coverage_class: IEEE 802.11 coverage class number</div><div class='ctx'>  *</div><div class='ctx'>  * Mac80211 callback. Sets slot time, ACK timeout and CTS timeout for given</div><div class='hunk'>@@ -693,7 +694,8 @@ ath5k_get_survey(struct ieee80211_hw *hw, int idx, struct survey_info *survey)</div><div class='ctx'>  * reset.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-ath5k_set_coverage_class(struct ieee80211_hw *hw, s16 coverage_class)</div><div class='add'>+ath5k_set_coverage_class(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+			 s16 coverage_class)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_hw *ah = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -704,7 +706,8 @@ ath5k_set_coverage_class(struct ieee80211_hw *hw, s16 coverage_class)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-ath5k_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)</div><div class='add'>+ath5k_set_antenna(struct ieee80211_hw *hw, int radio_idx, u32 tx_ant,</div><div class='add'>+		  u32 rx_ant)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_hw *ah = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -721,7 +724,8 @@ ath5k_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-ath5k_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant)</div><div class='add'>+ath5k_get_antenna(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+		  u32 *tx_ant, u32 *rx_ant)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_hw *ah = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -779,7 +783,12 @@ static int ath5k_set_ringparam(struct ieee80211_hw *hw, u32 tx, u32 rx)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> const struct ieee80211_ops ath5k_hw_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.tx			= ath5k_tx,</div><div class='add'>+	.wake_tx_queue		= ieee80211_handle_wake_tx_queue,</div><div class='ctx'> 	.start			= ath5k_start,</div><div class='ctx'> 	.stop			= ath5k_stop,</div><div class='ctx'> 	.add_interface		= ath5k_add_interface,</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/pci.c b/drivers/net/wireless/ath/ath5k/pci.c<br/>index 43b4ae86e5fb..f5ca2fe0d074 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/pci.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/pci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath5k/pci.c</a></div><div class='hunk'>@@ -46,6 +46,8 @@ static const struct pci_device_id ath5k_pci_id_table[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(ATHEROS, 0x001b) }, /* 5413 Eagle */</div><div class='ctx'> 	{ PCI_VDEVICE(ATHEROS, 0x001c) }, /* PCI-E cards */</div><div class='ctx'> 	{ PCI_VDEVICE(ATHEROS, 0x001d) }, /* 2417 Nala */</div><div class='add'>+	{ PCI_VDEVICE(ATHEROS, 0xff16) }, /* Gigaset SX76[23] AR241[34]A */</div><div class='add'>+	{ PCI_VDEVICE(ATHEROS, 0xff1a) }, /* Arcadyan ARV45XX AR2417 */</div><div class='ctx'> 	{ PCI_VDEVICE(ATHEROS, 0xff1b) }, /* AR5BXB63 */</div><div class='ctx'> 	{ 0 }</div><div class='ctx'> };</div><div class='hunk'>@@ -54,7 +56,7 @@ MODULE_DEVICE_TABLE(pci, ath5k_pci_id_table);</div><div class='ctx'> /* return bus cachesize in 4B word units */</div><div class='ctx'> static void ath5k_pci_read_cachesize(struct ath_common *common, int *csz)</div><div class='ctx'> {</div><div class='del'>-	struct ath5k_hw *ah = (struct ath5k_hw *) common-&gt;priv;</div><div class='add'>+	struct ath5k_hw *ah = common-&gt;priv;</div><div class='ctx'> 	u8 u8tmp;</div><div class='ctx'> </div><div class='ctx'> 	pci_read_config_byte(ah-&gt;pdev, PCI_CACHE_LINE_SIZE, &amp;u8tmp);</div><div class='hunk'>@@ -76,7 +78,7 @@ static void ath5k_pci_read_cachesize(struct ath_common *common, int *csz)</div><div class='ctx'> static bool</div><div class='ctx'> ath5k_pci_eeprom_read(struct ath_common *common, u32 offset, u16 *data)</div><div class='ctx'> {</div><div class='del'>-	struct ath5k_hw *ah = (struct ath5k_hw *) common-&gt;ah;</div><div class='add'>+	struct ath5k_hw *ah = common-&gt;ah;</div><div class='ctx'> 	u32 status, timeout;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -191,7 +193,7 @@ ath5k_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* XXX 32-bit addressing only */</div><div class='del'>-	ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='add'>+	ret = dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "32-bit DMA not available\n");</div><div class='ctx'> 		goto err_dis;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/pcu.c b/drivers/net/wireless/ath/ath5k/pcu.c<br/>index f2db7cf16566..90e0859a8e50 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/pcu.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/pcu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/pcu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath5k/pcu.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> * Protocol Control Unit Functions *</div><div class='ctx'> \*********************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ath5k.h"</div><div class='ctx'> #include "reg.h"</div><div class='hunk'>@@ -855,7 +855,7 @@ ath5k_hw_start_rx_pcu(struct ath5k_hw *ah)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * at5k_hw_stop_rx_pcu() - Stop RX engine</div><div class='add'>+ * ath5k_hw_stop_rx_pcu() - Stop RX engine</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  *</div><div class='ctx'>  * Stops RX engine on PCU</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c<br/>index 00f9e347d414..66b2dee39155 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/phy.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/phy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/phy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath5k/phy.c</a></div><div class='hunk'>@@ -26,7 +26,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/sort.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ath5k.h"</div><div class='ctx'> #include "reg.h"</div><div class='hunk'>@@ -1554,6 +1555,11 @@ static void ath5k_hw_update_nfcal_hist(struct ath5k_hw *ah, s16 noise_floor)</div><div class='ctx'> 	hist-&gt;nfval[hist-&gt;index] = noise_floor;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cmps16(const void *a, const void *b)</div><div class='add'>+{</div><div class='add'>+	return *(s16 *)a - *(s16 *)b;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * ath5k_hw_get_median_noise_floor() - Get median NF from history buffer</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='hunk'>@@ -1561,25 +1567,16 @@ static void ath5k_hw_update_nfcal_hist(struct ath5k_hw *ah, s16 noise_floor)</div><div class='ctx'> static s16</div><div class='ctx'> ath5k_hw_get_median_noise_floor(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='del'>-	s16 sort[ATH5K_NF_CAL_HIST_MAX];</div><div class='del'>-	s16 tmp;</div><div class='del'>-	int i, j;</div><div class='del'>-</div><div class='del'>-	memcpy(sort, ah-&gt;ah_nfcal_hist.nfval, sizeof(sort));</div><div class='del'>-	for (i = 0; i &lt; ATH5K_NF_CAL_HIST_MAX - 1; i++) {</div><div class='del'>-		for (j = 1; j &lt; ATH5K_NF_CAL_HIST_MAX - i; j++) {</div><div class='del'>-			if (sort[j] &gt; sort[j - 1]) {</div><div class='del'>-				tmp = sort[j];</div><div class='del'>-				sort[j] = sort[j - 1];</div><div class='del'>-				sort[j - 1] = tmp;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	s16 sorted_nfval[ATH5K_NF_CAL_HIST_MAX];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	memcpy(sorted_nfval, ah-&gt;ah_nfcal_hist.nfval, sizeof(sorted_nfval));</div><div class='add'>+	sort(sorted_nfval, ATH5K_NF_CAL_HIST_MAX, sizeof(s16), cmps16, NULL);</div><div class='ctx'> 	for (i = 0; i &lt; ATH5K_NF_CAL_HIST_MAX; i++) {</div><div class='ctx'> 		ATH5K_DBG(ah, ATH5K_DEBUG_CALIBRATE,</div><div class='del'>-			"cal %d:%d\n", i, sort[i]);</div><div class='add'>+			"cal %d:%d\n", i, sorted_nfval[i]);</div><div class='ctx'> 	}</div><div class='del'>-	return sort[(ATH5K_NF_CAL_HIST_MAX - 1) / 2];</div><div class='add'>+	return sorted_nfval[(ATH5K_NF_CAL_HIST_MAX - 1) / 2];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3119,10 +3116,7 @@ ath5k_combine_pwr_to_pdadc_curves(struct ath5k_hw *ah,</div><div class='ctx'> 							pd_gain_overlap;</div><div class='ctx'> </div><div class='ctx'> 		/* Force each power step to be at least 0.5 dB */</div><div class='del'>-		if ((pdadc_tmp[1] - pdadc_tmp[0]) &gt; 1)</div><div class='del'>-			pwr_step = pdadc_tmp[1] - pdadc_tmp[0];</div><div class='del'>-		else</div><div class='del'>-			pwr_step = 1;</div><div class='add'>+		pwr_step = max(pdadc_tmp[1] - pdadc_tmp[0], 1);</div><div class='ctx'> </div><div class='ctx'> 		/* If pdadc_0 is negative, we need to extrapolate</div><div class='ctx'> 		 * below this pdgain by a number of pwr_steps */</div><div class='hunk'>@@ -3136,7 +3130,7 @@ ath5k_combine_pwr_to_pdadc_curves(struct ath5k_hw *ah,</div><div class='ctx'> 		pdadc_n = gain_boundaries[pdg] + pd_gain_overlap - pwr_min[pdg];</div><div class='ctx'> 		/* Limit it to be inside pwr range */</div><div class='ctx'> 		table_size = pwr_max[pdg] - pwr_min[pdg];</div><div class='del'>-		max_idx = (pdadc_n &lt; table_size) ? pdadc_n : table_size;</div><div class='add'>+		max_idx = min(pdadc_n, table_size);</div><div class='ctx'> </div><div class='ctx'> 		/* Fill pdadc_out table */</div><div class='ctx'> 		while (pdadc_0 &lt; max_idx &amp;&amp; pdadc_i &lt; 128)</div><div class='hunk'>@@ -3147,11 +3141,8 @@ ath5k_combine_pwr_to_pdadc_curves(struct ath5k_hw *ah,</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* Force each power step to be at least 0.5 dB */</div><div class='del'>-		if ((pdadc_tmp[table_size - 1] - pdadc_tmp[table_size - 2]) &gt; 1)</div><div class='del'>-			pwr_step = pdadc_tmp[table_size - 1] -</div><div class='del'>-						pdadc_tmp[table_size - 2];</div><div class='del'>-		else</div><div class='del'>-			pwr_step = 1;</div><div class='add'>+		pwr_step = max(pdadc_tmp[table_size - 1] -</div><div class='add'>+			       pdadc_tmp[table_size - 2], 1);</div><div class='ctx'> </div><div class='ctx'> 		/* Extrapolate above */</div><div class='ctx'> 		while ((pdadc_0 &lt; (s16) pdadc_n) &amp;&amp;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/reg.h b/drivers/net/wireless/ath/ath5k/reg.h<br/>index 0ea1608b47fd..22101c96713f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/reg.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/reg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/reg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath5k/reg.h</a></div><div class='hunk'>@@ -543,7 +543,7 @@</div><div class='ctx'>  * Queue control unit (QCU) registers [5211+]</div><div class='ctx'>  *</div><div class='ctx'>  * Card has 12 TX Queues but i see that only 0-9 are used (?)</div><div class='del'>- * both in binary HAL (see ah.h) and ar5k. Each queue has it's own</div><div class='add'>+ * both in binary HAL (see ah.h) and ar5k. Each queue has its own</div><div class='ctx'>  * TXDP at addresses 0x0800 - 0x082c, a CBR (Constant Bit Rate)</div><div class='ctx'>  * configuration register (0x08c0 - 0x08ec), a ready time configuration</div><div class='ctx'>  * register (0x0900 - 0x092c), a misc configuration register (0x09c0 -</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c<br/>index 9fdb5283b39c..c67f163c0858 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/reset.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/reset.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/reset.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath5k/reset.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pci.h&gt;		/* To determine if a card is pci-e */</div><div class='ctx'> #include &lt;linux/log2.h&gt;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/sysfs.c b/drivers/net/wireless/ath/ath5k/sysfs.c<br/>index 8113baddd8fc..37bf64106473 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/sysfs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath5k/sysfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath5k/sysfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath5k/sysfs.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@ static ssize_t ath5k_attr_show_##name(struct device *dev,		\</div><div class='ctx'> {									\</div><div class='ctx'> 	struct ieee80211_hw *hw = dev_get_drvdata(dev);			\</div><div class='ctx'> 	struct ath5k_hw *ah = hw-&gt;priv;				\</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n", get);			\</div><div class='add'>+	return sysfs_emit(buf, "%d\n", get);			\</div><div class='ctx'> }									\</div><div class='ctx'> 									\</div><div class='ctx'> static ssize_t ath5k_attr_store_##name(struct device *dev,		\</div><div class='hunk'>@@ -41,7 +41,7 @@ static ssize_t ath5k_attr_show_##name(struct device *dev,		\</div><div class='ctx'> {									\</div><div class='ctx'> 	struct ieee80211_hw *hw = dev_get_drvdata(dev);			\</div><div class='ctx'> 	struct ath5k_hw *ah = hw-&gt;priv;				\</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n", get);			\</div><div class='add'>+	return sysfs_emit(buf, "%d\n", get);			\</div><div class='ctx'> }									\</div><div class='ctx'> static DEVICE_ATTR(name, 0444, ath5k_attr_show_##name, NULL)</div><div class='ctx'> </div><div class='hunk'>@@ -64,7 +64,7 @@ static ssize_t ath5k_attr_show_noise_immunity_level_max(struct device *dev,</div><div class='ctx'> 			struct device_attribute *attr,</div><div class='ctx'> 			char *buf)</div><div class='ctx'> {</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n", ATH5K_ANI_MAX_NOISE_IMM_LVL);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", ATH5K_ANI_MAX_NOISE_IMM_LVL);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(noise_immunity_level_max, 0444,</div><div class='ctx'> 		   ath5k_attr_show_noise_immunity_level_max, NULL);</div><div class='hunk'>@@ -73,7 +73,7 @@ static ssize_t ath5k_attr_show_firstep_level_max(struct device *dev,</div><div class='ctx'> 			struct device_attribute *attr,</div><div class='ctx'> 			char *buf)</div><div class='ctx'> {</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n", ATH5K_ANI_MAX_FIRSTEP_LVL);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", ATH5K_ANI_MAX_FIRSTEP_LVL);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(firstep_level_max, 0444,</div><div class='ctx'> 		   ath5k_attr_show_firstep_level_max, NULL);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/bmi.c b/drivers/net/wireless/ath/ath6kl/bmi.c<br/>index bde5a10d470c..5a9e93fd1ef4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/bmi.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/bmi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/bmi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath6kl/bmi.c</a></div><div class='hunk'>@@ -87,7 +87,9 @@ int ath6kl_bmi_get_target_info(struct ath6kl *ar,</div><div class='ctx'> 		 * We need to do some backwards compatibility to make this work.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (le32_to_cpu(targ_info-&gt;byte_count) != sizeof(*targ_info)) {</div><div class='del'>-			WARN_ON(1);</div><div class='add'>+			ath6kl_err("mismatched byte count %d vs. expected %zd\n",</div><div class='add'>+				   le32_to_cpu(targ_info-&gt;byte_count),</div><div class='add'>+				   sizeof(*targ_info));</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -246,7 +248,7 @@ int ath6kl_bmi_execute(struct ath6kl *ar, u32 addr, u32 *param)</div><div class='ctx'> 		return -EACCES;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	size = sizeof(cid) + sizeof(addr) + sizeof(param);</div><div class='add'>+	size = sizeof(cid) + sizeof(addr) + sizeof(*param);</div><div class='ctx'> 	if (size &gt; ar-&gt;bmi.max_cmd_size) {</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c<br/>index 29527e8dcced..88f0197fc041 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/cfg80211.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/cfg80211.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/cfg80211.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath6kl/cfg80211.c</a></div><div class='hunk'>@@ -149,7 +149,7 @@ static bool __ath6kl_cfg80211_sscan_stop(struct ath6kl_vif *vif)</div><div class='ctx'> 	if (!test_and_clear_bit(SCHED_SCANNING, &amp;vif-&gt;flags))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;vif-&gt;sched_scan_timer);</div><div class='add'>+	timer_delete_sync(&amp;vif-&gt;sched_scan_timer);</div><div class='ctx'> </div><div class='ctx'> 	if (ar-&gt;state == ATH6KL_STATE_RECOVERY)</div><div class='ctx'> 		return true;</div><div class='hunk'>@@ -807,7 +807,7 @@ void ath6kl_cfg80211_connect_event(struct ath6kl_vif *vif, u16 channel,</div><div class='ctx'> 		cfg80211_put_bss(ar-&gt;wiphy, bss);</div><div class='ctx'> 	} else if (vif-&gt;sme_state == SME_CONNECTED) {</div><div class='ctx'> 		struct cfg80211_roam_info roam_info = {</div><div class='del'>-			.bss = bss,</div><div class='add'>+			.links[0].bss = bss,</div><div class='ctx'> 			.req_ie = assoc_req_ie,</div><div class='ctx'> 			.req_ie_len = assoc_req_len,</div><div class='ctx'> 			.resp_ie = assoc_resp_ie,</div><div class='hunk'>@@ -1118,13 +1118,13 @@ void ath6kl_cfg80211_ch_switch_notify(struct ath6kl_vif *vif, int freq,</div><div class='ctx'> 				 ath6kl_band_2ghz.ht_cap.ht_supported) ?</div><div class='ctx'> 					NL80211_CHAN_HT20 : NL80211_CHAN_NO_HT);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;vif-&gt;wdev.mtx);</div><div class='del'>-	cfg80211_ch_switch_notify(vif-&gt;ndev, &amp;chandef);</div><div class='del'>-	mutex_unlock(&amp;vif-&gt;wdev.mtx);</div><div class='add'>+	wiphy_lock(vif-&gt;ar-&gt;wiphy);</div><div class='add'>+	cfg80211_ch_switch_notify(vif-&gt;ndev, &amp;chandef, 0);</div><div class='add'>+	wiphy_unlock(vif-&gt;ar-&gt;wiphy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='del'>-				   u8 key_index, bool pairwise,</div><div class='add'>+				   int link_id, u8 key_index, bool pairwise,</div><div class='ctx'> 				   const u8 *mac_addr,</div><div class='ctx'> 				   struct key_params *params)</div><div class='ctx'> {</div><div class='hunk'>@@ -1200,7 +1200,7 @@ static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 	if (((vif-&gt;auth_mode == WPA_PSK_AUTH) ||</div><div class='ctx'> 	     (vif-&gt;auth_mode == WPA2_PSK_AUTH)) &amp;&amp;</div><div class='ctx'> 	    (key_usage &amp; GROUP_USAGE))</div><div class='del'>-		del_timer(&amp;vif-&gt;disconnect_timer);</div><div class='add'>+		timer_delete(&amp;vif-&gt;disconnect_timer);</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,</div><div class='ctx'> 		   "%s: index %d, key_len %d, key_type 0x%x, key_usage 0x%x, seq_len %d\n",</div><div class='hunk'>@@ -1249,7 +1249,7 @@ static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='del'>-				   u8 key_index, bool pairwise,</div><div class='add'>+				   int link_id, u8 key_index, bool pairwise,</div><div class='ctx'> 				   const u8 *mac_addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = ath6kl_priv(ndev);</div><div class='hunk'>@@ -1279,7 +1279,7 @@ static int ath6kl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='del'>-				   u8 key_index, bool pairwise,</div><div class='add'>+				   int link_id, u8 key_index, bool pairwise,</div><div class='ctx'> 				   const u8 *mac_addr, void *cookie,</div><div class='ctx'> 				   void (*callback) (void *cookie,</div><div class='ctx'> 						     struct key_params *))</div><div class='hunk'>@@ -1314,7 +1314,7 @@ static int ath6kl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_cfg80211_set_default_key(struct wiphy *wiphy,</div><div class='del'>-					   struct net_device *ndev,</div><div class='add'>+					   struct net_device *ndev, int link_id,</div><div class='ctx'> 					   u8 key_index, bool unicast,</div><div class='ctx'> 					   bool multicast)</div><div class='ctx'> {</div><div class='hunk'>@@ -1376,7 +1376,8 @@ void ath6kl_cfg80211_tkip_micerr_event(struct ath6kl_vif *vif, u8 keyid,</div><div class='ctx'> 				     GFP_KERNEL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)</div><div class='add'>+static int ath6kl_cfg80211_set_wiphy_params(struct wiphy *wiphy, int radio_idx,</div><div class='add'>+					    u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = (struct ath6kl *)wiphy_priv(wiphy);</div><div class='ctx'> 	struct ath6kl_vif *vif;</div><div class='hunk'>@@ -1405,6 +1406,7 @@ static int ath6kl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_cfg80211_set_txpower(struct wiphy *wiphy,</div><div class='ctx'> 				       struct wireless_dev *wdev,</div><div class='add'>+				       int radio_idx,</div><div class='ctx'> 				       enum nl80211_tx_power_setting type,</div><div class='ctx'> 				       int mbm)</div><div class='ctx'> {</div><div class='hunk'>@@ -1441,6 +1443,8 @@ static int ath6kl_cfg80211_set_txpower(struct wiphy *wiphy,</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_cfg80211_get_txpower(struct wiphy *wiphy,</div><div class='ctx'> 				       struct wireless_dev *wdev,</div><div class='add'>+				       int radio_idx,</div><div class='add'>+				       unsigned int link_id,</div><div class='ctx'> 				       int *dbm)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = (struct ath6kl *)wiphy_priv(wiphy);</div><div class='hunk'>@@ -2954,7 +2958,7 @@ static int ath6kl_start_ap(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_change_beacon(struct wiphy *wiphy, struct net_device *dev,</div><div class='del'>-				struct cfg80211_beacon_data *beacon)</div><div class='add'>+				struct cfg80211_ap_update *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -2964,10 +2968,11 @@ static int ath6kl_change_beacon(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	if (vif-&gt;next_mode != AP_NETWORK)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return ath6kl_set_ies(vif, beacon);</div><div class='add'>+	return ath6kl_set_ies(vif, &amp;params-&gt;beacon);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_stop_ap(struct wiphy *wiphy, struct net_device *dev)</div><div class='add'>+static int ath6kl_stop_ap(struct wiphy *wiphy, struct net_device *dev,</div><div class='add'>+			  unsigned int link_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = ath6kl_priv(dev);</div><div class='ctx'> 	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='hunk'>@@ -3240,7 +3245,7 @@ static int ath6kl_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,</div><div class='ctx'> 					wait, buf, len, no_cck);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_get_antenna(struct wiphy *wiphy,</div><div class='add'>+static int ath6kl_get_antenna(struct wiphy *wiphy, int radio_idx,</div><div class='ctx'> 			      u32 *tx_ant, u32 *rx_ant)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = wiphy_priv(wiphy);</div><div class='hunk'>@@ -3303,8 +3308,8 @@ static int ath6kl_cfg80211_sscan_start(struct wiphy *wiphy,</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	} else {</div><div class='del'>-		 ret = ath6kl_wmi_bssfilter_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='del'>-						MATCHED_SSID_FILTER, 0);</div><div class='add'>+		ret = ath6kl_wmi_bssfilter_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+					       MATCHED_SSID_FILTER, 0);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3368,6 +3373,7 @@ static int ath6kl_cfg80211_sscan_stop(struct wiphy *wiphy,</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_cfg80211_set_bitrate(struct wiphy *wiphy,</div><div class='ctx'> 				       struct net_device *dev,</div><div class='add'>+				       unsigned int link_id,</div><div class='ctx'> 				       const u8 *addr,</div><div class='ctx'> 				       const struct cfg80211_bitrate_mask *mask)</div><div class='ctx'> {</div><div class='hunk'>@@ -3609,7 +3615,7 @@ void ath6kl_cfg80211_vif_stop(struct ath6kl_vif *vif, bool wmi_ready)</div><div class='ctx'> 		discon_issued = test_bit(CONNECTED, &amp;vif-&gt;flags) ||</div><div class='ctx'> 				test_bit(CONNECT_PEND, &amp;vif-&gt;flags);</div><div class='ctx'> 		ath6kl_disconnect(vif);</div><div class='del'>-		del_timer(&amp;vif-&gt;disconnect_timer);</div><div class='add'>+		timer_delete(&amp;vif-&gt;disconnect_timer);</div><div class='ctx'> </div><div class='ctx'> 		if (discon_issued)</div><div class='ctx'> 			ath6kl_disconnect_event(vif, DISCONNECT_CMD,</div><div class='hunk'>@@ -3781,6 +3787,7 @@ struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, const char *name,</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev;</div><div class='ctx'> 	struct ath6kl_vif *vif;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> </div><div class='ctx'> 	ndev = alloc_netdev(sizeof(*vif), name, name_assign_type, ether_setup);</div><div class='ctx'> 	if (!ndev)</div><div class='hunk'>@@ -3803,14 +3810,14 @@ struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, const char *name,</div><div class='ctx'> 	vif-&gt;htcap[NL80211_BAND_2GHZ].ht_enable = true;</div><div class='ctx'> 	vif-&gt;htcap[NL80211_BAND_5GHZ].ht_enable = true;</div><div class='ctx'> </div><div class='del'>-	memcpy(ndev-&gt;dev_addr, ar-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+	ether_addr_copy(addr, ar-&gt;mac_addr);</div><div class='ctx'> 	if (fw_vif_idx != 0) {</div><div class='del'>-		ndev-&gt;dev_addr[0] = (ndev-&gt;dev_addr[0] ^ (1 &lt;&lt; fw_vif_idx)) |</div><div class='del'>-				     0x2;</div><div class='add'>+		addr[0] = (addr[0] ^ (1 &lt;&lt; fw_vif_idx)) | 0x2;</div><div class='ctx'> 		if (test_bit(ATH6KL_FW_CAPABILITY_CUSTOM_MAC_ADDR,</div><div class='ctx'> 			     ar-&gt;fw_capabilities))</div><div class='del'>-			ndev-&gt;dev_addr[4] ^= 0x80;</div><div class='add'>+			addr[4] ^= 0x80;</div><div class='ctx'> 	}</div><div class='add'>+	eth_hw_addr_set(ndev, addr);</div><div class='ctx'> </div><div class='ctx'> 	init_netdev(ndev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/core.c b/drivers/net/wireless/ath/ath6kl/core.c<br/>index 4f0a7a185fc9..830350bda531 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/core.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath6kl/core.c</a></div><div class='hunk'>@@ -91,7 +91,7 @@ int ath6kl_core_init(struct ath6kl *ar, enum ath6kl_htc_type htc_type)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Turn on power to get hardware (target) version and leave power</div><div class='del'>-	 * on delibrately as we will boot the hardware anyway within few</div><div class='add'>+	 * on deliberately as we will boot the hardware anyway within few</div><div class='ctx'> 	 * seconds.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = ath6kl_hif_power_on(ar);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/debug.c b/drivers/net/wireless/ath/ath6kl/debug.c<br/>index 7506cea46f58..b837d31416df 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/debug.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/debug.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/debug.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath6kl/debug.c</a></div><div class='hunk'>@@ -1027,14 +1027,17 @@ static ssize_t ath6kl_lrssi_roam_write(struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = file-&gt;private_data;</div><div class='ctx'> 	unsigned long lrssi_roam_threshold;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (kstrtoul_from_user(user_buf, count, 0, &amp;lrssi_roam_threshold))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;lrssi_roam_threshold = lrssi_roam_threshold;</div><div class='ctx'> </div><div class='del'>-	ath6kl_wmi_set_roam_lrssi_cmd(ar-&gt;wmi, ar-&gt;lrssi_roam_threshold);</div><div class='add'>+	ret = ath6kl_wmi_set_roam_lrssi_cmd(ar-&gt;wmi, ar-&gt;lrssi_roam_threshold);</div><div class='ctx'> </div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1790,8 +1793,6 @@ int ath6kl_debug_init_fs(struct ath6kl *ar)</div><div class='ctx'> {</div><div class='ctx'> 	ar-&gt;debugfs_phy = debugfs_create_dir("ath6kl",</div><div class='ctx'> 					     ar-&gt;wiphy-&gt;debugfsdir);</div><div class='del'>-	if (!ar-&gt;debugfs_phy)</div><div class='del'>-		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	debugfs_create_file("tgt_stats", 0400, ar-&gt;debugfs_phy, ar,</div><div class='ctx'> 			    &amp;fops_tgt_stats);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/hif.c b/drivers/net/wireless/ath/ath6kl/hif.c<br/>index d1942537ea10..c693783bb9de 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/hif.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/hif.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/hif.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath6kl/hif.c</a></div><div class='hunk'>@@ -513,7 +513,7 @@ static int proc_pending_irqs(struct ath6kl_device *dev, bool *done)</div><div class='ctx'> out:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * An optimization to bypass reading the IRQ status registers</div><div class='del'>-	 * unecessarily which can re-wake the target, if upper layers</div><div class='add'>+	 * unnecessarily which can re-wake the target, if upper layers</div><div class='ctx'> 	 * determine that we are in a low-throughput mode, we can rely on</div><div class='ctx'> 	 * taking another interrupt rather than re-checking the status</div><div class='ctx'> 	 * registers which can re-wake the target.</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/hif.h b/drivers/net/wireless/ath/ath6kl/hif.h<br/>index f9d3f3a5edfe..ba16b98c872d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/hif.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/hif.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/hif.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath6kl/hif.h</a></div><div class='hunk'>@@ -92,7 +92,7 @@ struct bus_request {</div><div class='ctx'>  *     emode - This indicates the whether the command is to be executed in a</div><div class='ctx'>  *             blocking or non-blocking fashion (HIF_SYNCHRONOUS/</div><div class='ctx'>  *             HIF_ASYNCHRONOUS). The read/write data paths in HTC have been</div><div class='del'>- *             implemented using the asynchronous mode allowing the the bus</div><div class='add'>+ *             implemented using the asynchronous mode allowing the bus</div><div class='ctx'>  *             driver to indicate the completion of operation through the</div><div class='ctx'>  *             registered callback routine. The requirement primarily comes</div><div class='ctx'>  *             from the contexts these operations get called from (a driver's</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/htc.h b/drivers/net/wireless/ath/ath6kl/htc.h<br/>index 112d8a9b8d43..d61be202677c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/htc.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/htc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/htc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath6kl/htc.h</a></div><div class='hunk'>@@ -153,12 +153,19 @@</div><div class='ctx'>  * implementations.</div><div class='ctx'>  */</div><div class='ctx'> struct htc_frame_hdr {</div><div class='del'>-	u8 eid;</div><div class='del'>-	u8 flags;</div><div class='del'>-</div><div class='del'>-	/* length of data (including trailer) that follows the header */</div><div class='del'>-	__le16 payld_len;</div><div class='del'>-</div><div class='add'>+	struct_group_tagged(htc_frame_look_ahead, header,</div><div class='add'>+		union {</div><div class='add'>+			struct {</div><div class='add'>+				u8 eid;</div><div class='add'>+				u8 flags;</div><div class='add'>+</div><div class='add'>+				/* length of data (including trailer) that follows the header */</div><div class='add'>+				__le16 payld_len;</div><div class='add'>+</div><div class='add'>+			};</div><div class='add'>+			u32 word;</div><div class='add'>+		};</div><div class='add'>+	);</div><div class='ctx'> 	/* end of 4-byte lookahead */</div><div class='ctx'> </div><div class='ctx'> 	u8 ctrl[2];</div><div class='hunk'>@@ -478,7 +485,7 @@ struct htc_endpoint_stats {</div><div class='ctx'> 	/* count of credits received via another endpoint */</div><div class='ctx'> 	u32 cred_from_ep0;</div><div class='ctx'> </div><div class='del'>-	/* count of consummed credits */</div><div class='add'>+	/* count of consumed credits */</div><div class='ctx'> 	u32 cred_cosumd;</div><div class='ctx'> </div><div class='ctx'> 	/* count of credits returned */</div><div class='hunk'>@@ -589,7 +596,7 @@ struct htc_target {</div><div class='ctx'> 	/* protects free_ctrl_txbuf and free_ctrl_rxbuf */</div><div class='ctx'> 	spinlock_t htc_lock;</div><div class='ctx'> </div><div class='del'>-	/* FIXME: does this protext rx_bufq and endpoint structures or what? */</div><div class='add'>+	/* FIXME: does this protect rx_bufq and endpoint structures or what? */</div><div class='ctx'> 	spinlock_t rx_lock;</div><div class='ctx'> </div><div class='ctx'> 	/* protects endpoint-&gt;txq */</div><div class='hunk'>@@ -617,7 +624,7 @@ struct htc_target {</div><div class='ctx'> </div><div class='ctx'> 	int chk_irq_status_cnt;</div><div class='ctx'> </div><div class='del'>-	/* counts the number of Tx without bundling continously per AC */</div><div class='add'>+	/* counts the number of Tx without bundling continuously per AC */</div><div class='ctx'> 	u32 ac_tx_count[WMM_NUM_AC];</div><div class='ctx'> </div><div class='ctx'> 	struct {</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/htc_mbox.c b/drivers/net/wireless/ath/ath6kl/htc_mbox.c<br/>index 998947ef63b6..122e07ef3965 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/htc_mbox.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/htc_mbox.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/htc_mbox.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath6kl/htc_mbox.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include "hif-ops.h"</div><div class='ctx'> #include "trace.h"</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CALC_TXRX_PADDED_LEN(dev, len)  (__ALIGN_MASK((len), (dev)-&gt;block_mask))</div><div class='ctx'> </div><div class='hunk'>@@ -364,8 +364,7 @@ static void ath6kl_htc_tx_prep_pkt(struct htc_packet *packet, u8 flags,</div><div class='ctx'> 	packet-&gt;buf -= HTC_HDR_LENGTH;</div><div class='ctx'> 	hdr =  (struct htc_frame_hdr *)packet-&gt;buf;</div><div class='ctx'> </div><div class='del'>-	/* Endianess? */</div><div class='del'>-	put_unaligned((u16)packet-&gt;act_len, &amp;hdr-&gt;payld_len);</div><div class='add'>+	put_unaligned_le16(packet-&gt;act_len, &amp;hdr-&gt;payld_len);</div><div class='ctx'> 	hdr-&gt;flags = flags;</div><div class='ctx'> 	hdr-&gt;eid = packet-&gt;endpoint;</div><div class='ctx'> 	hdr-&gt;ctrl[0] = ctrl0;</div><div class='hunk'>@@ -939,7 +938,7 @@ static void ath6kl_htc_tx_from_queue(struct htc_target *target,</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * if an AC has bundling disabled and no tx bundling</div><div class='del'>-		 * has occured continously for a certain number of TX,</div><div class='add'>+		 * has occurred continuously for a certain number of TX,</div><div class='ctx'> 		 * enable tx bundling for this AC</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!bundle_sent) {</div><div class='hunk'>@@ -1538,7 +1537,7 @@ static int ath6kl_htc_rx_alloc(struct htc_target *target,</div><div class='ctx'> 					     queue, n_msg);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * This is due to unavailabilty of buffers to rx entire data.</div><div class='add'>+		 * This is due to unavailability of buffers to rx entire data.</div><div class='ctx'> 		 * Return no error so that free buffers from queue can be used</div><div class='ctx'> 		 * to receive partial data.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -2260,19 +2259,16 @@ int ath6kl_htc_rxmsg_pending_handler(struct htc_target *target,</div><div class='ctx'> static struct htc_packet *htc_wait_for_ctrl_msg(struct htc_target *target)</div><div class='ctx'> {</div><div class='ctx'> 	struct htc_packet *packet = NULL;</div><div class='del'>-	struct htc_frame_hdr *htc_hdr;</div><div class='del'>-	u32 look_ahead;</div><div class='add'>+	struct htc_frame_look_ahead look_ahead;</div><div class='ctx'> </div><div class='del'>-	if (ath6kl_hif_poll_mboxmsg_rx(target-&gt;dev, &amp;look_ahead,</div><div class='add'>+	if (ath6kl_hif_poll_mboxmsg_rx(target-&gt;dev, &amp;look_ahead.word,</div><div class='ctx'> 				       HTC_TARGET_RESPONSE_TIMEOUT))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='del'>-		   "htc rx wait ctrl look_ahead 0x%X\n", look_ahead);</div><div class='del'>-</div><div class='del'>-	htc_hdr = (struct htc_frame_hdr *)&amp;look_ahead;</div><div class='add'>+		   "htc rx wait ctrl look_ahead 0x%X\n", look_ahead.word);</div><div class='ctx'> </div><div class='del'>-	if (htc_hdr-&gt;eid != ENDPOINT_0)</div><div class='add'>+	if (look_ahead.eid != ENDPOINT_0)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	packet = htc_get_control_buf(target, false);</div><div class='hunk'>@@ -2281,8 +2277,8 @@ static struct htc_packet *htc_wait_for_ctrl_msg(struct htc_target *target)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	packet-&gt;info.rx.rx_flags = 0;</div><div class='del'>-	packet-&gt;info.rx.exp_hdr = look_ahead;</div><div class='del'>-	packet-&gt;act_len = le16_to_cpu(htc_hdr-&gt;payld_len) + HTC_HDR_LENGTH;</div><div class='add'>+	packet-&gt;info.rx.exp_hdr = look_ahead.word;</div><div class='add'>+	packet-&gt;act_len = le16_to_cpu(look_ahead.payld_len) + HTC_HDR_LENGTH;</div><div class='ctx'> </div><div class='ctx'> 	if (packet-&gt;act_len &gt; packet-&gt;buf_len)</div><div class='ctx'> 		goto fail_ctrl_rx;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/htc_pipe.c b/drivers/net/wireless/ath/ath6kl/htc_pipe.c<br/>index c68848819a52..7b823be9d846 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/htc_pipe.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/htc_pipe.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/htc_pipe.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath6kl/htc_pipe.c</a></div><div class='hunk'>@@ -237,8 +237,7 @@ static int htc_issue_packets(struct htc_target *target,</div><div class='ctx'> </div><div class='ctx'> 		packet-&gt;info.tx.flags |= HTC_FLAGS_TX_FIXUP_NETBUF;</div><div class='ctx'> </div><div class='del'>-		/* Endianess? */</div><div class='del'>-		put_unaligned((u16) payload_len, &amp;htc_hdr-&gt;payld_len);</div><div class='add'>+		put_unaligned_le16(payload_len, &amp;htc_hdr-&gt;payld_len);</div><div class='ctx'> 		htc_hdr-&gt;flags = packet-&gt;info.tx.flags;</div><div class='ctx'> 		htc_hdr-&gt;eid = (u8) packet-&gt;endpoint;</div><div class='ctx'> 		htc_hdr-&gt;ctrl[0] = 0;</div><div class='hunk'>@@ -719,7 +718,7 @@ static struct htc_packet *htc_lookup_tx_packet(struct htc_target *target,</div><div class='ctx'> 	spin_lock_bh(&amp;target-&gt;tx_lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * interate from the front of tx lookup queue</div><div class='add'>+	 * iterate from the front of tx lookup queue</div><div class='ctx'> 	 * this lookup should be fast since lower layers completes in-order and</div><div class='ctx'> 	 * so the completed packet should be at the head of the list generally</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -960,8 +959,8 @@ static int ath6kl_htc_pipe_rx_complete(struct ath6kl *ar, struct sk_buff *skb,</div><div class='ctx'> 	 * Thus the possibility of ar-&gt;htc_target being NULL</div><div class='ctx'> 	 * via ath6kl_recv_complete -&gt; ath6kl_usb_io_comp_work.</div><div class='ctx'> 	 */</div><div class='del'>-	if (WARN_ON_ONCE(!target)) {</div><div class='del'>-		ath6kl_err("Target not yet initialized\n");</div><div class='add'>+	if (!target) {</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_HTC, "Target not yet initialized\n");</div><div class='ctx'> 		status = -EINVAL;</div><div class='ctx'> 		goto free_skb;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c<br/>index 9b5c7d8f2b95..782209dcb782 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/init.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/init.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/init.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath6kl/init.c</a></div><div class='hunk'>@@ -207,7 +207,7 @@ static const struct ath6kl_hw hw_list[] = {</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This configuration item sets the value of disconnect timeout</div><div class='del'>- * Firmware delays sending the disconnec event to the host for this</div><div class='add'>+ * Firmware delays sending the disconnect event to the host for this</div><div class='ctx'>  * timeout after is gets disconnected from the current AP.</div><div class='ctx'>  * If the firmware successly roams within the disconnect timeout</div><div class='ctx'>  * it sends a new connect event</div><div class='hunk'>@@ -221,7 +221,7 @@ struct sk_buff *ath6kl_buf_alloc(int size)</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	u16 reserved;</div><div class='ctx'> </div><div class='del'>-	/* Add chacheline space at front and back of buffer */</div><div class='add'>+	/* Add cacheline space at front and back of buffer */</div><div class='ctx'> 	reserved = roundup((2 * L1_CACHE_BYTES) + ATH6KL_DATA_OFFSET +</div><div class='ctx'> 		   sizeof(struct htc_packet) + ATH6KL_HTC_ALIGN_BYTES, 4);</div><div class='ctx'> 	skb = dev_alloc_skb(size + reserved);</div><div class='hunk'>@@ -1014,7 +1014,7 @@ static int ath6kl_fetch_fw_apin(struct ath6kl *ar, const char *name)</div><div class='ctx'> </div><div class='ctx'> 		switch (ie_id) {</div><div class='ctx'> 		case ATH6KL_FW_IE_FW_VERSION:</div><div class='del'>-			strlcpy(ar-&gt;wiphy-&gt;fw_version, data,</div><div class='add'>+			strscpy(ar-&gt;wiphy-&gt;fw_version, data,</div><div class='ctx'> 				min(sizeof(ar-&gt;wiphy-&gt;fw_version), ie_len+1));</div><div class='ctx'> </div><div class='ctx'> 			ath6kl_dbg(ATH6KL_DBG_BOOT,</div><div class='hunk'>@@ -1677,7 +1677,7 @@ static void ath6kl_init_get_fwcaps(struct ath6kl *ar, char *buf, size_t buf_len)</div><div class='ctx'> </div><div class='ctx'> 			/* add "..." to the end of string */</div><div class='ctx'> 			trunc_len = strlen(trunc) + 1;</div><div class='del'>-			strncpy(buf + buf_len - trunc_len, trunc, trunc_len);</div><div class='add'>+			memcpy(buf + buf_len - trunc_len, trunc, trunc_len);</div><div class='ctx'> </div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1915,7 +1915,7 @@ void ath6kl_stop_txrx(struct ath6kl *ar)</div><div class='ctx'> 	clear_bit(WMI_READY, &amp;ar-&gt;flag);</div><div class='ctx'> </div><div class='ctx'> 	if (ar-&gt;fw_recovery.enable)</div><div class='del'>-		del_timer_sync(&amp;ar-&gt;fw_recovery.hb_timer);</div><div class='add'>+		timer_delete_sync(&amp;ar-&gt;fw_recovery.hb_timer);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * After wmi_shudown all WMI events will be dropped. We</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c<br/>index d3aa9e7a37c2..59068ea3879b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath6kl/main.c</a></div><div class='hunk'>@@ -503,7 +503,7 @@ void ath6kl_connect_ap_mode_sta(struct ath6kl_vif *vif, u16 aid, u8 *mac_addr,</div><div class='ctx'> </div><div class='ctx'> void disconnect_timer_handler(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ath6kl_vif *vif = from_timer(vif, t, disconnect_timer);</div><div class='add'>+	struct ath6kl_vif *vif = timer_container_of(vif, t, disconnect_timer);</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_init_profile_info(vif);</div><div class='ctx'> 	ath6kl_disconnect(vif);</div><div class='hunk'>@@ -583,7 +583,7 @@ static int ath6kl_commit_ch_switch(struct ath6kl_vif *vif, u16 channel)</div><div class='ctx'> 	switch (vif-&gt;nw_type) {</div><div class='ctx'> 	case AP_NETWORK:</div><div class='ctx'> 		/*</div><div class='del'>-		 * reconfigure any saved RSN IE capabilites in the beacon /</div><div class='add'>+		 * reconfigure any saved RSN IE capabilities in the beacon /</div><div class='ctx'> 		 * probe response to stay in sync with the supplicant.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (vif-&gt;rsn_capab &amp;&amp;</div><div class='hunk'>@@ -852,14 +852,14 @@ void ath6kl_tgt_stats_event(struct ath6kl_vif *vif, u8 *ptr, u32 len)</div><div class='ctx'> </div><div class='ctx'> void ath6kl_wakeup_event(void *dev)</div><div class='ctx'> {</div><div class='del'>-	struct ath6kl *ar = (struct ath6kl *) dev;</div><div class='add'>+	struct ath6kl *ar = dev;</div><div class='ctx'> </div><div class='ctx'> 	wake_up(&amp;ar-&gt;event_wq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ath6kl_txpwr_rx_evt(void *devt, u8 tx_pwr)</div><div class='ctx'> {</div><div class='del'>-	struct ath6kl *ar = (struct ath6kl *) devt;</div><div class='add'>+	struct ath6kl *ar = devt;</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;tx_pwr = tx_pwr;</div><div class='ctx'> 	wake_up(&amp;ar-&gt;event_wq);</div><div class='hunk'>@@ -1027,7 +1027,7 @@ void ath6kl_disconnect_event(struct ath6kl_vif *vif, u8 reason, u8 *bssid,</div><div class='ctx'> </div><div class='ctx'> 	aggr_reset_state(vif-&gt;aggr_cntxt-&gt;aggr_conn);</div><div class='ctx'> </div><div class='del'>-	del_timer(&amp;vif-&gt;disconnect_timer);</div><div class='add'>+	timer_delete(&amp;vif-&gt;disconnect_timer);</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "disconnect reason is %d\n", reason);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/recovery.c b/drivers/net/wireless/ath/ath6kl/recovery.c<br/>index c09e40c9010f..43186c193df1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/recovery.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/recovery.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/recovery.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath6kl/recovery.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@ static void ath6kl_recovery_work(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;state = ATH6KL_STATE_RECOVERY;</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;ar-&gt;fw_recovery.hb_timer);</div><div class='add'>+	timer_delete_sync(&amp;ar-&gt;fw_recovery.hb_timer);</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_init_hw_restart(ar);</div><div class='ctx'> </div><div class='hunk'>@@ -62,7 +62,7 @@ void ath6kl_recovery_hb_event(struct ath6kl *ar, u32 cookie)</div><div class='ctx'> </div><div class='ctx'> static void ath6kl_recovery_hb_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ath6kl *ar = from_timer(ar, t, fw_recovery.hb_timer);</div><div class='add'>+	struct ath6kl *ar = timer_container_of(ar, t, fw_recovery.hb_timer);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(RECOVERY_CLEANUP, &amp;ar-&gt;flag) ||</div><div class='hunk'>@@ -119,7 +119,7 @@ void ath6kl_recovery_cleanup(struct ath6kl *ar)</div><div class='ctx'> </div><div class='ctx'> 	set_bit(RECOVERY_CLEANUP, &amp;ar-&gt;flag);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;ar-&gt;fw_recovery.hb_timer);</div><div class='add'>+	timer_delete_sync(&amp;ar-&gt;fw_recovery.hb_timer);</div><div class='ctx'> 	cancel_work_sync(&amp;ar-&gt;fw_recovery.recovery_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c<br/>index 6b51a2dceadc..83de40bc4445 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/sdio.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/sdio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/sdio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath6kl/sdio.c</a></div><div class='hunk'>@@ -486,7 +486,7 @@ static void ath6kl_sdio_irq_handler(struct sdio_func *func)</div><div class='ctx'> 	ar_sdio = sdio_get_drvdata(func);</div><div class='ctx'> 	atomic_set(&amp;ar_sdio-&gt;irq_handling, 1);</div><div class='ctx'> 	/*</div><div class='del'>-	 * Release the host during interrups so we can pick it back up when</div><div class='add'>+	 * Release the host during interrupts so we can pick it back up when</div><div class='ctx'> 	 * we process commands.</div><div class='ctx'> 	 */</div><div class='ctx'> 	sdio_release_host(ar_sdio-&gt;func);</div><div class='hunk'>@@ -1185,7 +1185,7 @@ static int ath6kl_sdio_bmi_read(struct ath6kl *ar, u8 *buf, u32 len)</div><div class='ctx'> 	 *        Wait for first 4 bytes to be in FIFO</div><div class='ctx'> 	 *        If CONSERVATIVE_BMI_READ is enabled, also wait for</div><div class='ctx'> 	 *        a BMI command credit, which indicates that the ENTIRE</div><div class='del'>-	 *        response is available in the the FIFO</div><div class='add'>+	 *        response is available in the FIFO</div><div class='ctx'> 	 *</div><div class='ctx'> 	 *  CASE 3: length &gt; 128</div><div class='ctx'> 	 *        Wait for the first 4 bytes to be in FIFO</div><div class='hunk'>@@ -1427,25 +1427,7 @@ static struct sdio_driver ath6kl_sdio_driver = {</div><div class='ctx'> 	.remove = ath6kl_sdio_remove,</div><div class='ctx'> 	.drv.pm = ATH6KL_SDIO_PM_OPS,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init ath6kl_sdio_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = sdio_register_driver(&amp;ath6kl_sdio_driver);</div><div class='del'>-	if (ret)</div><div class='del'>-		ath6kl_err("sdio driver registration failed: %d\n", ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ath6kl_sdio_exit(void)</div><div class='del'>-{</div><div class='del'>-	sdio_unregister_driver(&amp;ath6kl_sdio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ath6kl_sdio_init);</div><div class='del'>-module_exit(ath6kl_sdio_exit);</div><div class='add'>+module_sdio_driver(ath6kl_sdio_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Atheros Communications, Inc.");</div><div class='ctx'> MODULE_DESCRIPTION("Driver support for Atheros AR600x SDIO devices");</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/trace.h b/drivers/net/wireless/ath/ath6kl/trace.h<br/>index a3d3740419eb..8577aa459c58 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/trace.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/trace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath6kl/trace.h</a></div><div class='hunk'>@@ -253,13 +253,10 @@ DECLARE_EVENT_CLASS(ath6kl_log_event,</div><div class='ctx'> 	TP_PROTO(struct va_format *vaf),</div><div class='ctx'> 	TP_ARGS(vaf),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='del'>-		__dynamic_array(char, msg, ATH6KL_MSG_MAX)</div><div class='add'>+		__vstring(msg, vaf-&gt;fmt, vaf-&gt;va)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),</div><div class='del'>-				       ATH6KL_MSG_MAX,</div><div class='del'>-				       vaf-&gt;fmt,</div><div class='del'>-				       *vaf-&gt;va) &gt;= ATH6KL_MSG_MAX);</div><div class='add'>+		__assign_vstr(msg, vaf-&gt;fmt, vaf-&gt;va);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%s", __get_str(msg))</div><div class='ctx'> );</div><div class='hunk'>@@ -284,14 +281,11 @@ TRACE_EVENT(ath6kl_log_dbg,</div><div class='ctx'> 	TP_ARGS(level, vaf),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		__field(unsigned int, level)</div><div class='del'>-		__dynamic_array(char, msg, ATH6KL_MSG_MAX)</div><div class='add'>+		__vstring(msg, vaf-&gt;fmt, vaf-&gt;va)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;level = level;</div><div class='del'>-		WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),</div><div class='del'>-				       ATH6KL_MSG_MAX,</div><div class='del'>-				       vaf-&gt;fmt,</div><div class='del'>-				       *vaf-&gt;va) &gt;= ATH6KL_MSG_MAX);</div><div class='add'>+		__assign_vstr(msg, vaf-&gt;fmt, vaf-&gt;va);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%s", __get_str(msg))</div><div class='ctx'> );</div><div class='hunk'>@@ -310,8 +304,8 @@ TRACE_EVENT(ath6kl_log_dbg_dump,</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(msg, msg);</div><div class='del'>-		__assign_str(prefix, prefix);</div><div class='add'>+		__assign_str(msg);</div><div class='add'>+		__assign_str(prefix);</div><div class='ctx'> 		__entry-&gt;buf_len = buf_len;</div><div class='ctx'> 		memcpy(__get_dynamic_array(buf), buf, buf_len);</div><div class='ctx'> 	),</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c b/drivers/net/wireless/ath/ath6kl/txrx.c<br/>index b22ed499f7ba..c3b06b515c4f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/txrx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/txrx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/txrx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath6kl/txrx.c</a></div><div class='hunk'>@@ -708,7 +708,7 @@ void ath6kl_tx_complete(struct htc_target *target,</div><div class='ctx'> 				 packet-&gt;endpoint &gt;= ENDPOINT_MAX))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		ath6kl_cookie = (struct ath6kl_cookie *)packet-&gt;pkt_cntxt;</div><div class='add'>+		ath6kl_cookie = packet-&gt;pkt_cntxt;</div><div class='ctx'> 		if (WARN_ON_ONCE(!ath6kl_cookie))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -839,7 +839,7 @@ static void ath6kl_deliver_frames_to_nw_stack(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;protocol = eth_type_trans(skb, skb-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	netif_rx_ni(skb);</div><div class='add'>+	netif_rx(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath6kl_alloc_netbufs(struct sk_buff_head *q, u16 num)</div><div class='hunk'>@@ -1623,7 +1623,8 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet)</div><div class='ctx'> static void aggr_timeout(struct timer_list *t)</div><div class='ctx'> {</div><div class='ctx'> 	u8 i, j;</div><div class='del'>-	struct aggr_info_conn *aggr_conn = from_timer(aggr_conn, t, timer);</div><div class='add'>+	struct aggr_info_conn *aggr_conn = timer_container_of(aggr_conn, t,</div><div class='add'>+						              timer);</div><div class='ctx'> 	struct rxtid *rxtid;</div><div class='ctx'> 	struct rxtid_stats *stats;</div><div class='ctx'> </div><div class='hunk'>@@ -1827,7 +1828,7 @@ void aggr_reset_state(struct aggr_info_conn *aggr_conn)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (aggr_conn-&gt;timer_scheduled) {</div><div class='del'>-		del_timer(&amp;aggr_conn-&gt;timer);</div><div class='add'>+		timer_delete(&amp;aggr_conn-&gt;timer);</div><div class='ctx'> 		aggr_conn-&gt;timer_scheduled = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/usb.c b/drivers/net/wireless/ath/ath6kl/usb.c<br/>index 5372e948e761..38bb501fc553 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/usb.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/usb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/usb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath6kl/usb.c</a></div><div class='hunk'>@@ -71,6 +71,7 @@ struct ath6kl_usb {</div><div class='ctx'> 	u8 *diag_cmd_buffer;</div><div class='ctx'> 	u8 *diag_resp_buffer;</div><div class='ctx'> 	struct ath6kl *ar;</div><div class='add'>+	struct workqueue_struct *wq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* usb urb object */</div><div class='hunk'>@@ -92,7 +93,7 @@ struct ath6kl_urb_context {</div><div class='ctx'> #define ATH6KL_USB_EP_ADDR_APP_DATA_MP_OUT      0x03</div><div class='ctx'> #define ATH6KL_USB_EP_ADDR_APP_DATA_HP_OUT      0x04</div><div class='ctx'> </div><div class='del'>-/* diagnostic command defnitions */</div><div class='add'>+/* diagnostic command definitions */</div><div class='ctx'> #define ATH6KL_USB_CONTROL_REQ_SEND_BMI_CMD        1</div><div class='ctx'> #define ATH6KL_USB_CONTROL_REQ_RECV_BMI_RESP       2</div><div class='ctx'> #define ATH6KL_USB_CONTROL_REQ_DIAG_CMD            3</div><div class='hunk'>@@ -340,6 +341,11 @@ static int ath6kl_usb_setup_pipe_resources(struct ath6kl_usb *ar_usb)</div><div class='ctx'> 				   le16_to_cpu(endpoint-&gt;wMaxPacketSize),</div><div class='ctx'> 				   endpoint-&gt;bInterval);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		/* Ignore broken descriptors. */</div><div class='add'>+		if (usb_endpoint_maxp(endpoint) == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		urbcount = 0;</div><div class='ctx'> </div><div class='ctx'> 		pipe_num =</div><div class='hunk'>@@ -473,7 +479,7 @@ static void ath6kl_usb_flush_all(struct ath6kl_usb *ar_usb)</div><div class='ctx'> 	 * Flushing any pending I/O may schedule work this call will block</div><div class='ctx'> 	 * until all scheduled work runs to completion.</div><div class='ctx'> 	 */</div><div class='del'>-	flush_scheduled_work();</div><div class='add'>+	flush_workqueue(ar_usb-&gt;wq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath6kl_usb_start_recv_pipes(struct ath6kl_usb *ar_usb)</div><div class='hunk'>@@ -539,7 +545,7 @@ static void ath6kl_usb_recv_complete(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 	/* note: queue implements a lock */</div><div class='ctx'> 	skb_queue_tail(&amp;pipe-&gt;io_comp_queue, skb);</div><div class='del'>-	schedule_work(&amp;pipe-&gt;io_complete_work);</div><div class='add'>+	queue_work(pipe-&gt;ar_usb-&gt;wq, &amp;pipe-&gt;io_complete_work);</div><div class='ctx'> </div><div class='ctx'> cleanup_recv_urb:</div><div class='ctx'> 	ath6kl_usb_cleanup_recv_urb(urb_context);</div><div class='hunk'>@@ -574,7 +580,7 @@ static void ath6kl_usb_usb_transmit_complete(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 	/* note: queue implements a lock */</div><div class='ctx'> 	skb_queue_tail(&amp;pipe-&gt;io_comp_queue, skb);</div><div class='del'>-	schedule_work(&amp;pipe-&gt;io_complete_work);</div><div class='add'>+	queue_work(pipe-&gt;ar_usb-&gt;wq, &amp;pipe-&gt;io_complete_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath6kl_usb_io_comp_work(struct work_struct *work)</div><div class='hunk'>@@ -614,6 +620,7 @@ static void ath6kl_usb_destroy(struct ath6kl_usb *ar_usb)</div><div class='ctx'> </div><div class='ctx'> 	kfree(ar_usb-&gt;diag_cmd_buffer);</div><div class='ctx'> 	kfree(ar_usb-&gt;diag_resp_buffer);</div><div class='add'>+	destroy_workqueue(ar_usb-&gt;wq);</div><div class='ctx'> </div><div class='ctx'> 	kfree(ar_usb);</div><div class='ctx'> }</div><div class='hunk'>@@ -626,9 +633,15 @@ static struct ath6kl_usb *ath6kl_usb_create(struct usb_interface *interface)</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	/* ath6kl_usb_destroy() needs ar_usb != NULL &amp;&amp; ar_usb-&gt;wq != NULL. */</div><div class='ctx'> 	ar_usb = kzalloc(sizeof(struct ath6kl_usb), GFP_KERNEL);</div><div class='ctx'> 	if (ar_usb == NULL)</div><div class='del'>-		goto fail_ath6kl_usb_create;</div><div class='add'>+		return NULL;</div><div class='add'>+	ar_usb-&gt;wq = alloc_workqueue("ath6kl_wq", 0, 0);</div><div class='add'>+	if (!ar_usb-&gt;wq) {</div><div class='add'>+		kfree(ar_usb);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata(interface, ar_usb);</div><div class='ctx'> 	spin_lock_init(&amp;(ar_usb-&gt;cs_lock));</div><div class='hunk'>@@ -869,7 +882,7 @@ static int ath6kl_usb_submit_ctrl_out(struct ath6kl_usb *ar_usb,</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* note: if successful returns number of bytes transfered */</div><div class='add'>+	/* note: if successful returns number of bytes transferred */</div><div class='ctx'> 	ret = usb_control_msg(ar_usb-&gt;udev,</div><div class='ctx'> 			      usb_sndctrlpipe(ar_usb-&gt;udev, 0),</div><div class='ctx'> 			      req,</div><div class='hunk'>@@ -901,13 +914,13 @@ static int ath6kl_usb_submit_ctrl_in(struct ath6kl_usb *ar_usb,</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* note: if successful returns number of bytes transfered */</div><div class='add'>+	/* note: if successful returns number of bytes transferred */</div><div class='ctx'> 	ret = usb_control_msg(ar_usb-&gt;udev,</div><div class='ctx'> 				 usb_rcvctrlpipe(ar_usb-&gt;udev, 0),</div><div class='ctx'> 				 req,</div><div class='ctx'> 				 USB_DIR_IN | USB_TYPE_VENDOR |</div><div class='ctx'> 				 USB_RECIP_DEVICE, value, index, buf,</div><div class='del'>-				 size, 2 * HZ);</div><div class='add'>+				 size, 2000);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		ath6kl_warn("Failed to read usb control message: %d\n", ret);</div><div class='hunk'>@@ -1212,6 +1225,7 @@ static int ath6kl_usb_pm_resume(struct usb_interface *interface)</div><div class='ctx'> static const struct usb_device_id ath6kl_usb_ids[] = {</div><div class='ctx'> 	{USB_DEVICE(0x0cf3, 0x9375)},</div><div class='ctx'> 	{USB_DEVICE(0x0cf3, 0x9374)},</div><div class='add'>+	{USB_DEVICE(0x04da, 0x390d)},</div><div class='ctx'> 	{ /* Terminating entry */ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c<br/>index b137e7f34397..08a154bce139 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/wmi.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/wmi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/wmi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath6kl/wmi.c</a></div><div class='hunk'>@@ -1078,7 +1078,7 @@ static int ath6kl_wmi_tkip_micerr_event_rx(struct wmi *wmi, u8 *datap, int len,</div><div class='ctx'> </div><div class='ctx'> void ath6kl_wmi_sscan_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ath6kl_vif *vif = from_timer(vif, t, sched_scan_timer);</div><div class='add'>+	struct ath6kl_vif *vif = timer_container_of(vif, t, sched_scan_timer);</div><div class='ctx'> </div><div class='ctx'> 	cfg80211_sched_scan_results(vif-&gt;ar-&gt;wiphy, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -1750,7 +1750,6 @@ static int ath6kl_wmi_snr_threshold_event_rx(struct wmi *wmi, u8 *datap,</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_wmi_aplist_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> {</div><div class='del'>-	u16 ap_info_entry_size;</div><div class='ctx'> 	struct wmi_aplist_event *ev = (struct wmi_aplist_event *) datap;</div><div class='ctx'> 	struct wmi_ap_info_v1 *ap_info_v1;</div><div class='ctx'> 	u8 index;</div><div class='hunk'>@@ -1759,14 +1758,12 @@ static int ath6kl_wmi_aplist_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> 	    ev-&gt;ap_list_ver != APLIST_VER1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ap_info_entry_size = sizeof(struct wmi_ap_info_v1);</div><div class='ctx'> 	ap_info_v1 = (struct wmi_ap_info_v1 *) ev-&gt;ap_list;</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WMI,</div><div class='ctx'> 		   "number of APs in aplist event: %d\n", ev-&gt;num_ap);</div><div class='ctx'> </div><div class='del'>-	if (len &lt; (int) (sizeof(struct wmi_aplist_event) +</div><div class='del'>-			 (ev-&gt;num_ap - 1) * ap_info_entry_size))</div><div class='add'>+	if (len &lt; struct_size(ev, ap_list, ev-&gt;num_ap))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* AP list version 1 contents */</div><div class='hunk'>@@ -1959,21 +1956,15 @@ static int ath6kl_wmi_startscan_cmd(struct wmi *wmi, u8 if_idx,</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_start_scan_cmd *sc;</div><div class='del'>-	s8 size;</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> </div><div class='del'>-	size = sizeof(struct wmi_start_scan_cmd);</div><div class='del'>-</div><div class='ctx'> 	if ((scan_type != WMI_LONG_SCAN) &amp;&amp; (scan_type != WMI_SHORT_SCAN))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (num_chan &gt; WMI_MAX_CHANNELS)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (num_chan)</div><div class='del'>-		size += sizeof(u16) * (num_chan - 1);</div><div class='del'>-</div><div class='del'>-	skb = ath6kl_wmi_get_new_buf(size);</div><div class='add'>+	skb = ath6kl_wmi_get_new_buf(struct_size(sc, ch_list, num_chan));</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -2008,7 +1999,7 @@ int ath6kl_wmi_beginscan_cmd(struct wmi *wmi, u8 if_idx,</div><div class='ctx'> 	struct ieee80211_supported_band *sband;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_begin_scan_cmd *sc;</div><div class='del'>-	s8 size, *supp_rates;</div><div class='add'>+	s8 *supp_rates;</div><div class='ctx'> 	int i, band, ret;</div><div class='ctx'> 	struct ath6kl *ar = wmi-&gt;parent_dev;</div><div class='ctx'> 	int num_rates;</div><div class='hunk'>@@ -2023,18 +2014,13 @@ int ath6kl_wmi_beginscan_cmd(struct wmi *wmi, u8 if_idx,</div><div class='ctx'> 						num_chan, ch_list);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	size = sizeof(struct wmi_begin_scan_cmd);</div><div class='del'>-</div><div class='ctx'> 	if ((scan_type != WMI_LONG_SCAN) &amp;&amp; (scan_type != WMI_SHORT_SCAN))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (num_chan &gt; WMI_MAX_CHANNELS)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (num_chan)</div><div class='del'>-		size += sizeof(u16) * (num_chan - 1);</div><div class='del'>-</div><div class='del'>-	skb = ath6kl_wmi_get_new_buf(size);</div><div class='add'>+	skb = ath6kl_wmi_get_new_buf(struct_size(sc, ch_list, num_chan));</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -2504,8 +2490,10 @@ static int ath6kl_wmi_sync_point(struct wmi *wmi, u8 if_idx)</div><div class='ctx'> 		goto free_data_skb;</div><div class='ctx'> </div><div class='ctx'> 	for (index = 0; index &lt; num_pri_streams; index++) {</div><div class='del'>-		if (WARN_ON(!data_sync_bufs[index].skb))</div><div class='add'>+		if (WARN_ON(!data_sync_bufs[index].skb)) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='ctx'> 			goto free_data_skb;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		ep_id = ath6kl_ac2_endpoint_id(wmi-&gt;parent_dev,</div><div class='ctx'> 					       data_sync_bufs[index].</div><div class='hunk'>@@ -2613,7 +2601,7 @@ int ath6kl_wmi_create_pstream_cmd(struct wmi *wmi, u8 if_idx,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Indicate activty change to driver layer only if this is the</div><div class='add'>+	 * Indicate activity change to driver layer only if this is the</div><div class='ctx'> 	 * first TSID to get created in this AC explicitly or an implicit</div><div class='ctx'> 	 * fat pipe is getting created.</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h<br/>index 784940ba4c90..3080d82e25cc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/wmi.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath6kl/wmi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath6kl/wmi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath6kl/wmi.h</a></div><div class='hunk'>@@ -655,7 +655,7 @@ enum wmi_mgmt_frame_type {</div><div class='ctx'> </div><div class='ctx'> enum wmi_ie_field_type {</div><div class='ctx'> 	WMI_RSN_IE_CAPB	= 0x1,</div><div class='del'>-	WMI_IE_FULL	= 0xFF,  /* indicats full IE */</div><div class='add'>+	WMI_IE_FULL	= 0xFF,  /* indicates full IE */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* WMI_CONNECT_CMDID  */</div><div class='hunk'>@@ -698,7 +698,7 @@ enum auth_mode {</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * NB: these values are ordered carefully; there are lots of</div><div class='del'>- * of implications in any reordering.  In particular beware</div><div class='add'>+ * implications in any reordering.  In particular beware</div><div class='ctx'>  * that 4 is not used to avoid conflicting with IEEE80211_F_PRIVACY.</div><div class='ctx'>  */</div><div class='ctx'> #define ATH6KL_CIPHER_WEP            0</div><div class='hunk'>@@ -863,7 +863,7 @@ struct wmi_begin_scan_cmd {</div><div class='ctx'> 	u8 num_ch;</div><div class='ctx'> </div><div class='ctx'> 	/* channels in Mhz */</div><div class='del'>-	__le16 ch_list[1];</div><div class='add'>+	__le16 ch_list[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* wmi_start_scan_cmd is to be deprecated. Use</div><div class='hunk'>@@ -889,7 +889,7 @@ struct wmi_start_scan_cmd {</div><div class='ctx'> 	u8 num_ch;</div><div class='ctx'> </div><div class='ctx'> 	/* channels in Mhz */</div><div class='del'>-	__le16 ch_list[1];</div><div class='add'>+	__le16 ch_list[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1178,10 +1178,10 @@ struct wmi_create_pstream_cmd {</div><div class='ctx'> 	__le32 sba;</div><div class='ctx'> 	__le32 medium_time;</div><div class='ctx'> </div><div class='del'>-	/* in octects */</div><div class='add'>+	/* in octets */</div><div class='ctx'> 	__le16 nominal_msdu;</div><div class='ctx'> </div><div class='del'>-	/* in octects */</div><div class='add'>+	/* in octets */</div><div class='ctx'> 	__le16 max_msdu;</div><div class='ctx'> </div><div class='ctx'> 	u8 traffic_class;</div><div class='hunk'>@@ -1249,7 +1249,7 @@ struct wmi_rssi_threshold_params_cmd {</div><div class='ctx'> 	/* highest of upper */</div><div class='ctx'> 	a_sle16 thresh_above6_val;</div><div class='ctx'> </div><div class='del'>-	/* lowest of bellow */</div><div class='add'>+	/* lowest of below */</div><div class='ctx'> 	a_sle16 thresh_below1_val;</div><div class='ctx'> </div><div class='ctx'> 	a_sle16 thresh_below2_val;</div><div class='hunk'>@@ -1257,7 +1257,7 @@ struct wmi_rssi_threshold_params_cmd {</div><div class='ctx'> 	a_sle16 thresh_below4_val;</div><div class='ctx'> 	a_sle16 thresh_below5_val;</div><div class='ctx'> </div><div class='del'>-	/* highest of bellow */</div><div class='add'>+	/* highest of below */</div><div class='ctx'> 	a_sle16 thresh_below6_val;</div><div class='ctx'> </div><div class='ctx'> 	/* "alpha" */</div><div class='hunk'>@@ -1278,7 +1278,7 @@ struct wmi_snr_threshold_params_cmd {</div><div class='ctx'> 	/* "alpha" */</div><div class='ctx'> 	u8 weight;</div><div class='ctx'> </div><div class='del'>-	/* lowest of uppper */</div><div class='add'>+	/* lowest of upper */</div><div class='ctx'> 	u8 thresh_above1_val;</div><div class='ctx'> </div><div class='ctx'> 	u8 thresh_above2_val;</div><div class='hunk'>@@ -1287,13 +1287,13 @@ struct wmi_snr_threshold_params_cmd {</div><div class='ctx'> 	/* highest of upper */</div><div class='ctx'> 	u8 thresh_above4_val;</div><div class='ctx'> </div><div class='del'>-	/* lowest of bellow */</div><div class='add'>+	/* lowest of below */</div><div class='ctx'> 	u8 thresh_below1_val;</div><div class='ctx'> </div><div class='ctx'> 	u8 thresh_below2_val;</div><div class='ctx'> 	u8 thresh_below3_val;</div><div class='ctx'> </div><div class='del'>-	/* highest of bellow */</div><div class='add'>+	/* highest of below */</div><div class='ctx'> 	u8 thresh_below4_val;</div><div class='ctx'> </div><div class='ctx'> 	u8 reserved[3];</div><div class='hunk'>@@ -1373,7 +1373,7 @@ struct wmi_channel_list_reply {</div><div class='ctx'> 	u8 num_ch;</div><div class='ctx'> </div><div class='ctx'> 	/* channel in Mhz */</div><div class='del'>-	__le16 ch_list[1];</div><div class='add'>+	__le16 ch_list[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* List of Events (target to host) */</div><div class='hunk'>@@ -1545,7 +1545,7 @@ struct wmi_connect_event {</div><div class='ctx'> 	u8 beacon_ie_len;</div><div class='ctx'> 	u8 assoc_req_len;</div><div class='ctx'> 	u8 assoc_resp_len;</div><div class='del'>-	u8 assoc_info[1];</div><div class='add'>+	u8 assoc_info[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* Disconnect Event */</div><div class='hunk'>@@ -1596,7 +1596,7 @@ struct wmi_disconnect_event {</div><div class='ctx'> 	u8 disconn_reason;</div><div class='ctx'> </div><div class='ctx'> 	u8 assoc_resp_len;</div><div class='del'>-	u8 assoc_info[1];</div><div class='add'>+	u8 assoc_info[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1637,7 +1637,7 @@ struct bss_bias {</div><div class='ctx'> </div><div class='ctx'> struct bss_bias_info {</div><div class='ctx'> 	u8 num_bss;</div><div class='del'>-	struct bss_bias bss_bias[0];</div><div class='add'>+	struct bss_bias bss_bias[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct low_rssi_scan_params {</div><div class='hunk'>@@ -1720,7 +1720,7 @@ struct wmi_neighbor_info {</div><div class='ctx'> </div><div class='ctx'> struct wmi_neighbor_report_event {</div><div class='ctx'> 	u8 num_neighbors;</div><div class='del'>-	struct wmi_neighbor_info neighbor[0];</div><div class='add'>+	struct wmi_neighbor_info neighbor[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* TKIP MIC Error Event */</div><div class='hunk'>@@ -1742,7 +1742,7 @@ struct wmi_scan_complete_event {</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Special frame receive Event.</div><div class='del'>- * Mechanism used to inform host of the receiption of the special frames.</div><div class='add'>+ * Mechanism used to inform host of the reception of the special frames.</div><div class='ctx'>  * Consists of special frame info header followed by special frame body.</div><div class='ctx'>  * The 802.11 header is not included.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1860,7 +1860,7 @@ struct wmi_target_stats {</div><div class='ctx'> /*</div><div class='ctx'>  * WMI_RSSI_THRESHOLD_EVENTID.</div><div class='ctx'>  * Indicate the RSSI events to host. Events are indicated when we breach a</div><div class='del'>- * thresold value.</div><div class='add'>+ * threshold value.</div><div class='ctx'>  */</div><div class='ctx'> enum wmi_rssi_threshold_val {</div><div class='ctx'> 	WMI_RSSI_THRESHOLD1_ABOVE = 0,</div><div class='hunk'>@@ -1957,7 +1957,7 @@ union wmi_ap_info {</div><div class='ctx'> struct wmi_aplist_event {</div><div class='ctx'> 	u8 ap_list_ver;</div><div class='ctx'> 	u8 num_ap;</div><div class='del'>-	union wmi_ap_info ap_list[1];</div><div class='add'>+	union wmi_ap_info ap_list[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* Developer Commands */</div><div class='hunk'>@@ -2051,7 +2051,7 @@ struct wmi_get_keepalive_cmd {</div><div class='ctx'> struct wmi_set_appie_cmd {</div><div class='ctx'> 	u8 mgmt_frm_type; /* enum wmi_mgmt_frame_type */</div><div class='ctx'> 	u8 ie_len;</div><div class='del'>-	u8 ie_info[0];</div><div class='add'>+	u8 ie_info[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_set_ie_cmd {</div><div class='hunk'>@@ -2059,7 +2059,7 @@ struct wmi_set_ie_cmd {</div><div class='ctx'> 	u8 ie_field;	/* enum wmi_ie_field_type */</div><div class='ctx'> 	u8 ie_len;</div><div class='ctx'> 	u8 reserved;</div><div class='del'>-	u8 ie_info[0];</div><div class='add'>+	u8 ie_info[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* Notify the WSC registration status to the target */</div><div class='hunk'>@@ -2127,7 +2127,7 @@ struct wmi_add_wow_pattern_cmd {</div><div class='ctx'> 	u8 filter_list_id;</div><div class='ctx'> 	u8 filter_size;</div><div class='ctx'> 	u8 filter_offset;</div><div class='del'>-	u8 filter[0];</div><div class='add'>+	u8 filter[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_del_wow_pattern_cmd {</div><div class='hunk'>@@ -2360,7 +2360,7 @@ struct wmi_send_action_cmd {</div><div class='ctx'> 	__le32 freq;</div><div class='ctx'> 	__le32 wait;</div><div class='ctx'> 	__le16 len;</div><div class='del'>-	u8 data[0];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_send_mgmt_cmd {</div><div class='hunk'>@@ -2369,7 +2369,7 @@ struct wmi_send_mgmt_cmd {</div><div class='ctx'> 	__le32 wait;</div><div class='ctx'> 	__le32 no_cck;</div><div class='ctx'> 	__le16 len;</div><div class='del'>-	u8 data[0];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_tx_status_event {</div><div class='hunk'>@@ -2389,7 +2389,7 @@ struct wmi_set_appie_extended_cmd {</div><div class='ctx'> 	u8 role_id;</div><div class='ctx'> 	u8 mgmt_frm_type;</div><div class='ctx'> 	u8 ie_len;</div><div class='del'>-	u8 ie_info[0];</div><div class='add'>+	u8 ie_info[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_remain_on_chnl_event {</div><div class='hunk'>@@ -2406,18 +2406,18 @@ struct wmi_cancel_remain_on_chnl_event {</div><div class='ctx'> struct wmi_rx_action_event {</div><div class='ctx'> 	__le32 freq;</div><div class='ctx'> 	__le16 len;</div><div class='del'>-	u8 data[0];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_p2p_capabilities_event {</div><div class='ctx'> 	__le16 len;</div><div class='del'>-	u8 data[0];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_p2p_rx_probe_req_event {</div><div class='ctx'> 	__le32 freq;</div><div class='ctx'> 	__le16 len;</div><div class='del'>-	u8 data[0];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define P2P_FLAG_CAPABILITIES_REQ   (0x00000001)</div><div class='hunk'>@@ -2431,7 +2431,7 @@ struct wmi_get_p2p_info {</div><div class='ctx'> struct wmi_p2p_info_event {</div><div class='ctx'> 	__le32 info_req_flags;</div><div class='ctx'> 	__le16 len;</div><div class='del'>-	u8 data[0];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wmi_p2p_capabilities {</div><div class='hunk'>@@ -2450,7 +2450,7 @@ struct wmi_p2p_probe_response_cmd {</div><div class='ctx'> 	__le32 freq;</div><div class='ctx'> 	u8 destination_addr[ETH_ALEN];</div><div class='ctx'> 	__le16 len;</div><div class='del'>-	u8 data[0];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* Extended WMI (WMIX)</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/Kconfig b/drivers/net/wireless/ath/ath9k/Kconfig<br/>index e150d82eddb6..0c47be06c153 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/Kconfig</a></div><div class='hunk'>@@ -57,8 +57,7 @@ config ATH9K_AHB</div><div class='ctx'> </div><div class='ctx'> config ATH9K_DEBUGFS</div><div class='ctx'> 	bool "Atheros ath9k debugging"</div><div class='del'>-	depends on ATH9K &amp;&amp; DEBUG_FS</div><div class='del'>-	select MAC80211_DEBUGFS</div><div class='add'>+	depends on ATH9K &amp;&amp; DEBUG_FS &amp;&amp; MAC80211_DEBUGFS</div><div class='ctx'> 	select ATH9K_COMMON_DEBUG</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y, if you need access to ath9k's statistics for</div><div class='hunk'>@@ -70,7 +69,6 @@ config ATH9K_DEBUGFS</div><div class='ctx'> config ATH9K_STATION_STATISTICS</div><div class='ctx'> 	bool "Detailed station statistics"</div><div class='ctx'> 	depends on ATH9K &amp;&amp; ATH9K_DEBUGFS &amp;&amp; DEBUG_FS</div><div class='del'>-	select MAC80211_DEBUGFS</div><div class='ctx'> 	default n</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables detailed statistics for association stations.</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c<br/>index cdefb8e2daf1..802e6596a6a8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ahb.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ahb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ahb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/ahb.c</a></div><div class='hunk'>@@ -16,37 +16,21 @@</div><div class='ctx'>  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/nl80211.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "ath9k.h"</div><div class='ctx'> </div><div class='del'>-static const struct platform_device_id ath9k_platform_id_table[] = {</div><div class='del'>-	{</div><div class='del'>-		.name = "ath9k",</div><div class='del'>-		.driver_data = AR5416_AR9100_DEVID,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.name = "ar933x_wmac",</div><div class='del'>-		.driver_data = AR9300_DEVID_AR9330,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.name = "ar934x_wmac",</div><div class='del'>-		.driver_data = AR9300_DEVID_AR9340,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.name = "qca955x_wmac",</div><div class='del'>-		.driver_data = AR9300_DEVID_QCA955X,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.name = "qca953x_wmac",</div><div class='del'>-		.driver_data = AR9300_DEVID_AR953X,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.name = "qca956x_wmac",</div><div class='del'>-		.driver_data = AR9300_DEVID_QCA956X,</div><div class='del'>-	},</div><div class='add'>+static const struct of_device_id ath9k_of_match_table[] = {</div><div class='add'>+	{ .compatible = "qca,ar9130-wifi", .data = (void *)AR5416_AR9100_DEVID },</div><div class='add'>+	{ .compatible = "qca,ar9330-wifi", .data = (void *)AR9300_DEVID_AR9330 },</div><div class='add'>+	{ .compatible = "qca,ar9340-wifi", .data = (void *)AR9300_DEVID_AR9340 },</div><div class='add'>+	{ .compatible = "qca,qca9530-wifi", .data = (void *)AR9300_DEVID_AR953X },</div><div class='add'>+	{ .compatible = "qca,qca9550-wifi", .data = (void *)AR9300_DEVID_QCA955X },</div><div class='add'>+	{ .compatible = "qca,qca9560-wifi", .data = (void *)AR9300_DEVID_QCA956X },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -71,40 +55,24 @@ static const struct ath_bus_ops ath_ahb_bus_ops  = {</div><div class='ctx'> </div><div class='ctx'> static int ath_ahb_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	void __iomem *mem;</div><div class='del'>-	struct ath_softc *sc;</div><div class='ctx'> 	struct ieee80211_hw *hw;</div><div class='del'>-	struct resource *res;</div><div class='del'>-	const struct platform_device_id *id = platform_get_device_id(pdev);</div><div class='del'>-	int irq;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	struct ath_softc *sc;</div><div class='ctx'> 	struct ath_hw *ah;</div><div class='add'>+	void __iomem *mem;</div><div class='ctx'> 	char hw_name[64];</div><div class='add'>+	u16 dev_id;</div><div class='add'>+	int irq;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!dev_get_platdata(&amp;pdev-&gt;dev)) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "no platform data specified\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	if (res == NULL) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "no memory resource found\n");</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mem = devm_ioremap(&amp;pdev-&gt;dev, res-&gt;start, resource_size(res));</div><div class='del'>-	if (mem == NULL) {</div><div class='add'>+	mem = devm_platform_ioremap_resource(pdev, 0);</div><div class='add'>+	if (IS_ERR(mem)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "ioremap failed\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);</div><div class='del'>-	if (res == NULL) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "no IRQ resource found\n");</div><div class='del'>-		return -ENXIO;</div><div class='add'>+		return PTR_ERR(mem);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	irq = res-&gt;start;</div><div class='add'>+	irq = platform_get_irq(pdev, 0);</div><div class='add'>+	if (irq &lt; 0)</div><div class='add'>+		return irq;</div><div class='ctx'> </div><div class='ctx'> 	ath9k_fill_chanctx_ops();</div><div class='ctx'> 	hw = ieee80211_alloc_hw(sizeof(struct ath_softc), &amp;ath9k_ops);</div><div class='hunk'>@@ -128,7 +96,8 @@ static int ath_ahb_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err_free_hw;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ath9k_init_device(id-&gt;driver_data, sc, &amp;ath_ahb_bus_ops);</div><div class='add'>+	dev_id = (u16)(kernel_ulong_t)of_device_get_match_data(&amp;pdev-&gt;dev);</div><div class='add'>+	ret = ath9k_init_device(dev_id, sc, &amp;ath_ahb_bus_ops);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to initialize device\n");</div><div class='ctx'> 		goto err_irq;</div><div class='hunk'>@@ -136,8 +105,8 @@ static int ath_ahb_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	ah = sc-&gt;sc_ah;</div><div class='ctx'> 	ath9k_hw_name(ah, hw_name, sizeof(hw_name));</div><div class='del'>-	wiphy_info(hw-&gt;wiphy, "%s mem=0x%lx, irq=%d\n",</div><div class='del'>-		   hw_name, (unsigned long)mem, irq);</div><div class='add'>+	wiphy_info(hw-&gt;wiphy, "%s mem=0x%p, irq=%d\n",</div><div class='add'>+		   hw_name, mem, irq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -148,7 +117,7 @@ static int ath_ahb_probe(struct platform_device *pdev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath_ahb_remove(struct platform_device *pdev)</div><div class='add'>+static void ath_ahb_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hw *hw = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='hunk'>@@ -159,20 +128,18 @@ static int ath_ahb_remove(struct platform_device *pdev)</div><div class='ctx'> 		free_irq(sc-&gt;irq, sc);</div><div class='ctx'> 		ieee80211_free_hw(sc-&gt;hw);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver ath_ahb_driver = {</div><div class='del'>-	.probe      = ath_ahb_probe,</div><div class='del'>-	.remove     = ath_ahb_remove,</div><div class='del'>-	.driver		= {</div><div class='del'>-		.name	= "ath9k",</div><div class='add'>+	.probe = ath_ahb_probe,</div><div class='add'>+	.remove = ath_ahb_remove,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "ath9k",</div><div class='add'>+		.of_match_table = ath9k_of_match_table,</div><div class='ctx'> 	},</div><div class='del'>-	.id_table    = ath9k_platform_id_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-MODULE_DEVICE_TABLE(platform, ath9k_platform_id_table);</div><div class='add'>+MODULE_DEVICE_TABLE(of, ath9k_of_match_table);</div><div class='ctx'> </div><div class='ctx'> int ath_ahb_init(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/antenna.c b/drivers/net/wireless/ath/ath9k/antenna.c<br/>index 988222cea9df..e5e274bc9e68 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/antenna.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/antenna.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/antenna.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/antenna.c</a></div><div class='hunk'>@@ -193,7 +193,7 @@ static void ath_lnaconf_alt_good_scan(struct ath_ant_comb *antcomb,</div><div class='ctx'> static void ath_ant_set_alt_ratio(struct ath_ant_comb *antcomb,</div><div class='ctx'> 				  struct ath_hw_antcomb_conf *conf)</div><div class='ctx'> {</div><div class='del'>-	/* set alt to the conf with maximun ratio */</div><div class='add'>+	/* set alt to the conf with maximum ratio */</div><div class='ctx'> 	if (antcomb-&gt;first_ratio &amp;&amp; antcomb-&gt;second_ratio) {</div><div class='ctx'> 		if (antcomb-&gt;rssi_second &gt; antcomb-&gt;rssi_third) {</div><div class='ctx'> 			/* first alt*/</div><div class='hunk'>@@ -643,7 +643,7 @@ static void ath_ant_try_scan(struct ath_ant_comb *antcomb,</div><div class='ctx'> 				conf-&gt;main_lna_conf = ATH_ANT_DIV_COMB_LNA1;</div><div class='ctx'> 				conf-&gt;alt_lna_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;</div><div class='ctx'> 			} else if (antcomb-&gt;rssi_sub &gt;</div><div class='del'>-				   antcomb-&gt;rssi_lna1) {</div><div class='add'>+				   antcomb-&gt;rssi_lna2) {</div><div class='ctx'> 				/* set to A-B */</div><div class='ctx'> 				conf-&gt;main_lna_conf = ATH_ANT_DIV_COMB_LNA1;</div><div class='ctx'> 				conf-&gt;alt_lna_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c b/drivers/net/wireless/ath/ath9k/ar5008_phy.c<br/>index 6610d76131fa..7a45f5f62826 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar5008_phy.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar5008_phy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar5008_phy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/ar5008_phy.c</a></div><div class='hunk'>@@ -1277,13 +1277,13 @@ static void ar5008_hw_set_radar_conf(struct ath_hw *ah)</div><div class='ctx'> </div><div class='ctx'> static void ar5008_hw_init_txpower_cck(struct ath_hw *ah, int16_t *rate_array)</div><div class='ctx'> {</div><div class='del'>-#define CCK_DELTA(x) ((OLC_FOR_AR9280_20_LATER) ? max((x) - 2, 0) : (x))</div><div class='del'>-	ah-&gt;tx_power[0] = CCK_DELTA(rate_array[rate1l]);</div><div class='del'>-	ah-&gt;tx_power[1] = CCK_DELTA(min(rate_array[rate2l],</div><div class='add'>+#define CCK_DELTA(_ah, x) ((OLC_FOR_AR9280_20_LATER(_ah)) ? max((x) - 2, 0) : (x))</div><div class='add'>+	ah-&gt;tx_power[0] = CCK_DELTA(ah, rate_array[rate1l]);</div><div class='add'>+	ah-&gt;tx_power[1] = CCK_DELTA(ah, min(rate_array[rate2l],</div><div class='ctx'> 					rate_array[rate2s]));</div><div class='del'>-	ah-&gt;tx_power[2] = CCK_DELTA(min(rate_array[rate5_5l],</div><div class='add'>+	ah-&gt;tx_power[2] = CCK_DELTA(ah, min(rate_array[rate5_5l],</div><div class='ctx'> 					rate_array[rate5_5s]));</div><div class='del'>-	ah-&gt;tx_power[3] = CCK_DELTA(min(rate_array[rate11l],</div><div class='add'>+	ah-&gt;tx_power[3] = CCK_DELTA(ah, min(rate_array[rate11l],</div><div class='ctx'> 					rate_array[rate11s]));</div><div class='ctx'> #undef CCK_DELTA</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9002_calib.c b/drivers/net/wireless/ath/ath9k/ar9002_calib.c<br/>index fd53b5f9e9b5..c8b3f3aaa45b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9002_calib.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9002_calib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9002_calib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/ar9002_calib.c</a></div><div class='hunk'>@@ -659,9 +659,9 @@ static void ar9002_hw_pa_cal(struct ath_hw *ah, bool is_reset)</div><div class='ctx'> </div><div class='ctx'> static void ar9002_hw_olc_temp_compensation(struct ath_hw *ah)</div><div class='ctx'> {</div><div class='del'>-	if (OLC_FOR_AR9287_10_LATER)</div><div class='add'>+	if (OLC_FOR_AR9287_10_LATER(ah))</div><div class='ctx'> 		ar9287_hw_olc_temp_compensation(ah);</div><div class='del'>-	else if (OLC_FOR_AR9280_20_LATER)</div><div class='add'>+	else if (OLC_FOR_AR9280_20_LATER(ah))</div><div class='ctx'> 		ar9280_hw_olc_temp_compensation(ah);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -672,7 +672,7 @@ static int ar9002_hw_calibrate(struct ath_hw *ah, struct ath9k_channel *chan,</div><div class='ctx'> 	bool nfcal, nfcal_pending = false, percal_pending;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	nfcal = !!(REG_READ(ah, AR_PHY_AGC_CONTROL) &amp; AR_PHY_AGC_CONTROL_NF);</div><div class='add'>+	nfcal = !!(REG_READ(ah, AR_PHY_AGC_CONTROL(ah)) &amp; AR_PHY_AGC_CONTROL_NF);</div><div class='ctx'> 	if (ah-&gt;caldata) {</div><div class='ctx'> 		nfcal_pending = test_bit(NFCAL_PENDING, &amp;ah-&gt;caldata-&gt;cal_flags);</div><div class='ctx'> 		if (longcal)		/* Remember to not miss */</div><div class='hunk'>@@ -752,11 +752,11 @@ static bool ar9285_hw_cl_cal(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='ctx'> 	if (IS_CHAN_HT20(chan)) {</div><div class='ctx'> 		REG_SET_BIT(ah, AR_PHY_CL_CAL_CTL, AR_PHY_PARALLEL_CAL_ENABLE);</div><div class='ctx'> 		REG_SET_BIT(ah, AR_PHY_TURBO, AR_PHY_FC_DYN2040_EN);</div><div class='del'>-		REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+		REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 			    AR_PHY_AGC_CONTROL_FLTR_CAL);</div><div class='ctx'> 		REG_CLR_BIT(ah, AR_PHY_TPCRG1, AR_PHY_TPCRG1_PD_CAL_ENABLE);</div><div class='del'>-		REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_CAL);</div><div class='del'>-		if (!ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+		REG_SET_BIT(ah, AR_PHY_AGC_CONTROL(ah), AR_PHY_AGC_CONTROL_CAL);</div><div class='add'>+		if (!ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 				  AR_PHY_AGC_CONTROL_CAL, 0, AH_WAIT_TIMEOUT)) {</div><div class='ctx'> 			ath_dbg(common, CALIBRATE,</div><div class='ctx'> 				"offset calibration failed to complete in %d ms; noisy environment?\n",</div><div class='hunk'>@@ -768,10 +768,10 @@ static bool ar9285_hw_cl_cal(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='ctx'> 		REG_CLR_BIT(ah, AR_PHY_CL_CAL_CTL, AR_PHY_CL_CAL_ENABLE);</div><div class='ctx'> 	}</div><div class='ctx'> 	REG_CLR_BIT(ah, AR_PHY_ADC_CTL, AR_PHY_ADC_CTL_OFF_PWDADC);</div><div class='del'>-	REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_FLTR_CAL);</div><div class='add'>+	REG_SET_BIT(ah, AR_PHY_AGC_CONTROL(ah), AR_PHY_AGC_CONTROL_FLTR_CAL);</div><div class='ctx'> 	REG_SET_BIT(ah, AR_PHY_TPCRG1, AR_PHY_TPCRG1_PD_CAL_ENABLE);</div><div class='del'>-	REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_CAL);</div><div class='del'>-	if (!ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_CAL,</div><div class='add'>+	REG_SET_BIT(ah, AR_PHY_AGC_CONTROL(ah), AR_PHY_AGC_CONTROL_CAL);</div><div class='add'>+	if (!ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL(ah), AR_PHY_AGC_CONTROL_CAL,</div><div class='ctx'> 			  0, AH_WAIT_TIMEOUT)) {</div><div class='ctx'> 		ath_dbg(common, CALIBRATE,</div><div class='ctx'> 			"offset calibration failed to complete in %d ms; noisy environment?\n",</div><div class='hunk'>@@ -781,7 +781,7 @@ static bool ar9285_hw_cl_cal(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='ctx'> </div><div class='ctx'> 	REG_SET_BIT(ah, AR_PHY_ADC_CTL, AR_PHY_ADC_CTL_OFF_PWDADC);</div><div class='ctx'> 	REG_CLR_BIT(ah, AR_PHY_CL_CAL_CTL, AR_PHY_CL_CAL_ENABLE);</div><div class='del'>-	REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_FLTR_CAL);</div><div class='add'>+	REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL(ah), AR_PHY_AGC_CONTROL_FLTR_CAL);</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -857,17 +857,17 @@ static bool ar9002_hw_init_cal(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='ctx'> 			if (!AR_SREV_9287_11_OR_LATER(ah))</div><div class='ctx'> 				REG_CLR_BIT(ah, AR_PHY_ADC_CTL,</div><div class='ctx'> 					    AR_PHY_ADC_CTL_OFF_PWDADC);</div><div class='del'>-			REG_SET_BIT(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+			REG_SET_BIT(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 				    AR_PHY_AGC_CONTROL_FLTR_CAL);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Calibrate the AGC */</div><div class='del'>-		REG_WRITE(ah, AR_PHY_AGC_CONTROL,</div><div class='del'>-			  REG_READ(ah, AR_PHY_AGC_CONTROL) |</div><div class='add'>+		REG_WRITE(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='add'>+			  REG_READ(ah, AR_PHY_AGC_CONTROL(ah)) |</div><div class='ctx'> 			  AR_PHY_AGC_CONTROL_CAL);</div><div class='ctx'> </div><div class='ctx'> 		/* Poll for offset calibration complete */</div><div class='del'>-		if (!ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+		if (!ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 				   AR_PHY_AGC_CONTROL_CAL,</div><div class='ctx'> 				   0, AH_WAIT_TIMEOUT)) {</div><div class='ctx'> 			ath_dbg(common, CALIBRATE,</div><div class='hunk'>@@ -880,7 +880,7 @@ static bool ar9002_hw_init_cal(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='ctx'> 			if (!AR_SREV_9287_11_OR_LATER(ah))</div><div class='ctx'> 				REG_SET_BIT(ah, AR_PHY_ADC_CTL,</div><div class='ctx'> 					    AR_PHY_ADC_CTL_OFF_PWDADC);</div><div class='del'>-			REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+			REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 				    AR_PHY_AGC_CONTROL_FLTR_CAL);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9002_hw.c b/drivers/net/wireless/ath/ath9k/ar9002_hw.c<br/>index ae68f674829b..b26224480041 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9002_hw.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9002_hw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9002_hw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/ar9002_hw.c</a></div><div class='hunk'>@@ -249,9 +249,9 @@ static void ar9002_hw_configpcipowersave(struct ath_hw *ah,</div><div class='ctx'> </div><div class='ctx'> 	if (power_off) {</div><div class='ctx'> 		/* clear bit 19 to disable L1 */</div><div class='del'>-		REG_CLR_BIT(ah, AR_PCIE_PM_CTRL, AR_PCIE_PM_CTRL_ENA);</div><div class='add'>+		REG_CLR_BIT(ah, AR_PCIE_PM_CTRL(ah), AR_PCIE_PM_CTRL_ENA);</div><div class='ctx'> </div><div class='del'>-		val = REG_READ(ah, AR_WA);</div><div class='add'>+		val = REG_READ(ah, AR_WA(ah));</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Set PCIe workaround bits</div><div class='hunk'>@@ -286,7 +286,7 @@ static void ar9002_hw_configpcipowersave(struct ath_hw *ah,</div><div class='ctx'> 		if (AR_SREV_9285E_20(ah))</div><div class='ctx'> 			val |= AR_WA_BIT23;</div><div class='ctx'> </div><div class='del'>-		REG_WRITE(ah, AR_WA, val);</div><div class='add'>+		REG_WRITE(ah, AR_WA(ah), val);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (ah-&gt;config.pcie_waen) {</div><div class='ctx'> 			val = ah-&gt;config.pcie_waen;</div><div class='hunk'>@@ -314,10 +314,10 @@ static void ar9002_hw_configpcipowersave(struct ath_hw *ah,</div><div class='ctx'> 		if (AR_SREV_9285E_20(ah))</div><div class='ctx'> 			val |= AR_WA_BIT23;</div><div class='ctx'> </div><div class='del'>-		REG_WRITE(ah, AR_WA, val);</div><div class='add'>+		REG_WRITE(ah, AR_WA(ah), val);</div><div class='ctx'> </div><div class='ctx'> 		/* set bit 19 to allow forcing of pcie core into L1 state */</div><div class='del'>-		REG_SET_BIT(ah, AR_PCIE_PM_CTRL, AR_PCIE_PM_CTRL_ENA);</div><div class='add'>+		REG_SET_BIT(ah, AR_PCIE_PM_CTRL(ah), AR_PCIE_PM_CTRL_ENA);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -395,7 +395,7 @@ static void ar9002_hw_init_hang_checks(struct ath_hw *ah)</div><div class='ctx'> 		ah-&gt;config.hw_hang_checks |= HW_MAC_HANG;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Sets up the AR5008/AR9001/AR9002 hardware familiy callbacks */</div><div class='add'>+/* Sets up the AR5008/AR9001/AR9002 hardware family callbacks */</div><div class='ctx'> int ar9002_hw_attach_ops(struct ath_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c<br/>index ce9a0a53771e..b70cd4af1ae0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9002_mac.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9002_mac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9002_mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/ar9002_mac.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> static void ar9002_hw_rx_enable(struct ath_hw *ah)</div><div class='ctx'> {</div><div class='del'>-	REG_WRITE(ah, AR_CR, AR_CR_RXE);</div><div class='add'>+	REG_WRITE(ah, AR_CR, AR_CR_RXE(ah));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ar9002_hw_set_desc_link(void *ds, u32 ds_link)</div><div class='hunk'>@@ -40,14 +40,14 @@ static bool ar9002_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked,</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='ctx'> </div><div class='ctx'> 	if (!AR_SREV_9100(ah)) {</div><div class='del'>-		if (REG_READ(ah, AR_INTR_ASYNC_CAUSE) &amp; AR_INTR_MAC_IRQ) {</div><div class='del'>-			if ((REG_READ(ah, AR_RTC_STATUS) &amp; AR_RTC_STATUS_M)</div><div class='add'>+		if (REG_READ(ah, AR_INTR_ASYNC_CAUSE(ah)) &amp; AR_INTR_MAC_IRQ) {</div><div class='add'>+			if ((REG_READ(ah, AR_RTC_STATUS(ah)) &amp; AR_RTC_STATUS_M(ah))</div><div class='ctx'> 			    == AR_RTC_STATUS_ON) {</div><div class='ctx'> 				isr = REG_READ(ah, AR_ISR);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		sync_cause = REG_READ(ah, AR_INTR_SYNC_CAUSE) &amp;</div><div class='add'>+		sync_cause = REG_READ(ah, AR_INTR_SYNC_CAUSE(ah)) &amp;</div><div class='ctx'> 			AR_INTR_SYNC_DEFAULT;</div><div class='ctx'> </div><div class='ctx'> 		*masked = 0;</div><div class='hunk'>@@ -120,7 +120,7 @@ static bool ar9002_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked,</div><div class='ctx'> 					 AR_ISR_TXEOL);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			ah-&gt;intr_txqs |= MS(s0_s, AR_ISR_S0_QCU_TXOK);</div><div class='add'>+			ah-&gt;intr_txqs = MS(s0_s, AR_ISR_S0_QCU_TXOK);</div><div class='ctx'> 			ah-&gt;intr_txqs |= MS(s0_s, AR_ISR_S0_QCU_TXDESC);</div><div class='ctx'> 			ah-&gt;intr_txqs |= MS(s1_s, AR_ISR_S1_QCU_TXERR);</div><div class='ctx'> 			ah-&gt;intr_txqs |= MS(s1_s, AR_ISR_S1_QCU_TXEOL);</div><div class='hunk'>@@ -138,7 +138,7 @@ static bool ar9002_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked,</div><div class='ctx'> 		u32 s5_s;</div><div class='ctx'> </div><div class='ctx'> 		if (pCap-&gt;hw_caps &amp; ATH9K_HW_CAP_RAC_SUPPORTED) {</div><div class='del'>-			s5_s = REG_READ(ah, AR_ISR_S5_S);</div><div class='add'>+			s5_s = REG_READ(ah, AR_ISR_S5_S(ah));</div><div class='ctx'> 		} else {</div><div class='ctx'> 			s5_s = REG_READ(ah, AR_ISR_S5);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -201,8 +201,8 @@ static bool ar9002_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked,</div><div class='ctx'> 				"AR_INTR_SYNC_LOCAL_TIMEOUT\n");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		REG_WRITE(ah, AR_INTR_SYNC_CAUSE_CLR, sync_cause);</div><div class='del'>-		(void) REG_READ(ah, AR_INTR_SYNC_CAUSE_CLR);</div><div class='add'>+		REG_WRITE(ah, AR_INTR_SYNC_CAUSE_CLR(ah), sync_cause);</div><div class='add'>+		(void) REG_READ(ah, AR_INTR_SYNC_CAUSE_CLR(ah));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -301,10 +301,11 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)</div><div class='ctx'> 	WRITE_ONCE(ads-&gt;ds_ctl5, set11nPktDurRTSCTS(i-&gt;rates, 2)</div><div class='ctx'> 		| set11nPktDurRTSCTS(i-&gt;rates, 3));</div><div class='ctx'> </div><div class='del'>-	WRITE_ONCE(ads-&gt;ds_ctl7, set11nRateFlags(i-&gt;rates, 0)</div><div class='del'>-		| set11nRateFlags(i-&gt;rates, 1)</div><div class='del'>-		| set11nRateFlags(i-&gt;rates, 2)</div><div class='del'>-		| set11nRateFlags(i-&gt;rates, 3)</div><div class='add'>+	WRITE_ONCE(ads-&gt;ds_ctl7,</div><div class='add'>+		  set11nRateFlags(i-&gt;rates, 0) | set11nChainSel(i-&gt;rates, 0)</div><div class='add'>+		| set11nRateFlags(i-&gt;rates, 1) | set11nChainSel(i-&gt;rates, 1)</div><div class='add'>+		| set11nRateFlags(i-&gt;rates, 2) | set11nChainSel(i-&gt;rates, 2)</div><div class='add'>+		| set11nRateFlags(i-&gt;rates, 3) | set11nChainSel(i-&gt;rates, 3)</div><div class='ctx'> 		| SM(i-&gt;rtscts_rate, AR_RTSCTSRate));</div><div class='ctx'> </div><div class='ctx'> 	WRITE_ONCE(ads-&gt;ds_ctl9, SM(i-&gt;txpower[1], AR_XmitPower1));</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9002_phy.c b/drivers/net/wireless/ath/ath9k/ar9002_phy.c<br/>index fcfed8e59d29..23ac6b7c2cbd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9002_phy.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9002_phy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9002_phy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/ar9002_phy.c</a></div><div class='hunk'>@@ -281,10 +281,10 @@ static void ar9002_olc_init(struct ath_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	if (!OLC_FOR_AR9280_20_LATER)</div><div class='add'>+	if (!OLC_FOR_AR9280_20_LATER(ah))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (OLC_FOR_AR9287_10_LATER) {</div><div class='add'>+	if (OLC_FOR_AR9287_10_LATER(ah)) {</div><div class='ctx'> 		REG_SET_BIT(ah, AR_PHY_TX_PWRCTRL9,</div><div class='ctx'> 				AR_PHY_TX_PWRCTRL9_RES_DC_REMOVAL);</div><div class='ctx'> 		ath9k_hw_analog_shift_rmw(ah, AR9287_AN_TXPC0,</div><div class='hunk'>@@ -498,7 +498,7 @@ static void ar9002_hw_spectral_scan_config(struct ath_hw *ah,</div><div class='ctx'> 	else</div><div class='ctx'> 		REG_CLR_BIT(ah, AR_PHY_SPECTRAL_SCAN, repeat_bit);</div><div class='ctx'> </div><div class='del'>-	/* on AR92xx, the highest bit of count will make the the chip send</div><div class='add'>+	/* on AR92xx, the highest bit of count will make the chip send</div><div class='ctx'> 	 * spectral samples endlessly. Check if this really was intended,</div><div class='ctx'> 	 * and fix otherwise.</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9003_aic.c b/drivers/net/wireless/ath/ath9k/ar9003_aic.c<br/>index d0f1e8bcc846..45a7ca660f47 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9003_aic.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9003_aic.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9003_aic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/ar9003_aic.c</a></div><div class='hunk'>@@ -409,13 +409,11 @@ static bool ar9003_aic_cal_post_process(struct ath_hw *ah)</div><div class='ctx'> 		sram.valid = true;</div><div class='ctx'> </div><div class='ctx'> 		sram.rot_dir_att_db =</div><div class='del'>-			min(max(rot_dir_path_att_db,</div><div class='del'>-				(int16_t)ATH_AIC_MIN_ROT_DIR_ATT_DB),</div><div class='del'>-			    ATH_AIC_MAX_ROT_DIR_ATT_DB);</div><div class='add'>+			clamp(rot_dir_path_att_db, (int16_t)ATH_AIC_MIN_ROT_DIR_ATT_DB,</div><div class='add'>+			      ATH_AIC_MAX_ROT_DIR_ATT_DB);</div><div class='ctx'> 		sram.rot_quad_att_db =</div><div class='del'>-			min(max(rot_quad_path_att_db,</div><div class='del'>-				(int16_t)ATH_AIC_MIN_ROT_QUAD_ATT_DB),</div><div class='del'>-			    ATH_AIC_MAX_ROT_QUAD_ATT_DB);</div><div class='add'>+			clamp(rot_quad_path_att_db, (int16_t)ATH_AIC_MIN_ROT_QUAD_ATT_DB,</div><div class='add'>+			      ATH_AIC_MAX_ROT_QUAD_ATT_DB);</div><div class='ctx'> </div><div class='ctx'> 		aic-&gt;aic_sram[i] = (SM(sram.vga_dir_sign,</div><div class='ctx'> 				       AR_PHY_AIC_SRAM_VGA_DIR_SIGN) |</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c<br/>index 7e27a06e5df1..2224cb74b1d4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9003_calib.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9003_calib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9003_calib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/ar9003_calib.c</a></div><div class='hunk'>@@ -177,7 +177,7 @@ static void ar9003_hw_iqcal_collect(struct ath_hw *ah)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Accumulate IQ cal measures for active chains */</div><div class='del'>-	for (i = 0; i &lt; AR5416_MAX_CHAINS; i++) {</div><div class='add'>+	for (i = 0; i &lt; AR9300_MAX_CHAINS; i++) {</div><div class='ctx'> 		if (ah-&gt;txchainmask &amp; BIT(i)) {</div><div class='ctx'> 			ah-&gt;totalPowerMeasI[i] +=</div><div class='ctx'> 				REG_READ(ah, AR_PHY_CAL_MEAS_0(i));</div><div class='hunk'>@@ -346,14 +346,14 @@ static bool ar9003_hw_dynamic_osdac_selection(struct ath_hw *ah,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Clear offset and IQ calibration, run AGC cal.</div><div class='ctx'> 	 */</div><div class='del'>-	REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+	REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 		    AR_PHY_AGC_CONTROL_OFFSET_CAL);</div><div class='del'>-	REG_CLR_BIT(ah, AR_PHY_TX_IQCAL_CONTROL_0,</div><div class='add'>+	REG_CLR_BIT(ah, AR_PHY_TX_IQCAL_CONTROL_0(ah),</div><div class='ctx'> 		    AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL);</div><div class='del'>-	REG_WRITE(ah, AR_PHY_AGC_CONTROL,</div><div class='del'>-		  REG_READ(ah, AR_PHY_AGC_CONTROL) | AR_PHY_AGC_CONTROL_CAL);</div><div class='add'>+	REG_WRITE(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='add'>+		  REG_READ(ah, AR_PHY_AGC_CONTROL(ah)) | AR_PHY_AGC_CONTROL_CAL);</div><div class='ctx'> </div><div class='del'>-	status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+	status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 			       AR_PHY_AGC_CONTROL_CAL,</div><div class='ctx'> 			       0, AH_WAIT_TIMEOUT);</div><div class='ctx'> 	if (!status) {</div><div class='hunk'>@@ -367,13 +367,13 @@ static bool ar9003_hw_dynamic_osdac_selection(struct ath_hw *ah,</div><div class='ctx'> 	 * (Carrier Leak calibration, TX Filter calibration and</div><div class='ctx'> 	 *  Peak Detector offset calibration).</div><div class='ctx'> 	 */</div><div class='del'>-	REG_SET_BIT(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+	REG_SET_BIT(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 		    AR_PHY_AGC_CONTROL_OFFSET_CAL);</div><div class='ctx'> 	REG_CLR_BIT(ah, AR_PHY_CL_CAL_CTL,</div><div class='ctx'> 		    AR_PHY_CL_CAL_ENABLE);</div><div class='del'>-	REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+	REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 		    AR_PHY_AGC_CONTROL_FLTR_CAL);</div><div class='del'>-	REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+	REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 		    AR_PHY_AGC_CONTROL_PKDET_CAL);</div><div class='ctx'> </div><div class='ctx'> 	ch0_done = 0;</div><div class='hunk'>@@ -387,10 +387,10 @@ static bool ar9003_hw_dynamic_osdac_selection(struct ath_hw *ah,</div><div class='ctx'> </div><div class='ctx'> 		REG_SET_BIT(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);</div><div class='ctx'> </div><div class='del'>-		REG_WRITE(ah, AR_PHY_AGC_CONTROL,</div><div class='del'>-			  REG_READ(ah, AR_PHY_AGC_CONTROL) | AR_PHY_AGC_CONTROL_CAL);</div><div class='add'>+		REG_WRITE(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='add'>+			  REG_READ(ah, AR_PHY_AGC_CONTROL(ah)) | AR_PHY_AGC_CONTROL_CAL);</div><div class='ctx'> </div><div class='del'>-		status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+		status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 				       AR_PHY_AGC_CONTROL_CAL,</div><div class='ctx'> 				       0, AH_WAIT_TIMEOUT);</div><div class='ctx'> 		if (!status) {</div><div class='hunk'>@@ -531,7 +531,7 @@ static bool ar9003_hw_dynamic_osdac_selection(struct ath_hw *ah,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+	REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 		    AR_PHY_AGC_CONTROL_OFFSET_CAL);</div><div class='ctx'> 	REG_SET_BIT(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);</div><div class='ctx'> </div><div class='hunk'>@@ -539,7 +539,7 @@ static bool ar9003_hw_dynamic_osdac_selection(struct ath_hw *ah,</div><div class='ctx'> 	 * We don't need to check txiqcal_done here since it is always</div><div class='ctx'> 	 * set for AR9550.</div><div class='ctx'> 	 */</div><div class='del'>-	REG_SET_BIT(ah, AR_PHY_TX_IQCAL_CONTROL_0,</div><div class='add'>+	REG_SET_BIT(ah, AR_PHY_TX_IQCAL_CONTROL_0(ah),</div><div class='ctx'> 		    AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL);</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -897,7 +897,7 @@ static void ar9003_hw_tx_iq_cal_outlier_detection(struct ath_hw *ah,</div><div class='ctx'> 	memset(tx_corr_coeff, 0, sizeof(tx_corr_coeff));</div><div class='ctx'> 	for (i = 0; i &lt; MAX_MEASUREMENT / 2; i++) {</div><div class='ctx'> 		tx_corr_coeff[i * 2][0] = tx_corr_coeff[(i * 2) + 1][0] =</div><div class='del'>-					AR_PHY_TX_IQCAL_CORR_COEFF_B0(i);</div><div class='add'>+					AR_PHY_TX_IQCAL_CORR_COEFF_B0(ah, i);</div><div class='ctx'> 		if (!AR_SREV_9485(ah)) {</div><div class='ctx'> 			tx_corr_coeff[i * 2][1] =</div><div class='ctx'> 			tx_corr_coeff[(i * 2) + 1][1] =</div><div class='hunk'>@@ -914,7 +914,7 @@ static void ar9003_hw_tx_iq_cal_outlier_detection(struct ath_hw *ah,</div><div class='ctx'> 		if (!(ah-&gt;txchainmask &amp; (1 &lt;&lt; i)))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		nmeasurement = REG_READ_FIELD(ah,</div><div class='del'>-				AR_PHY_TX_IQCAL_STATUS_B0,</div><div class='add'>+				AR_PHY_TX_IQCAL_STATUS_B0(ah),</div><div class='ctx'> 				AR_PHY_CALIBRATED_GAINS_0);</div><div class='ctx'> </div><div class='ctx'> 		if (nmeasurement &gt; MAX_MEASUREMENT)</div><div class='hunk'>@@ -988,10 +988,10 @@ static bool ar9003_hw_tx_iq_cal_run(struct ath_hw *ah)</div><div class='ctx'> 		REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,</div><div class='ctx'> 			      AR_PHY_TXGAIN_FORCE, 0);</div><div class='ctx'> </div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_START,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_START(ah),</div><div class='ctx'> 		      AR_PHY_TX_IQCAL_START_DO_CAL, 1);</div><div class='ctx'> </div><div class='del'>-	if (!ath9k_hw_wait(ah, AR_PHY_TX_IQCAL_START,</div><div class='add'>+	if (!ath9k_hw_wait(ah, AR_PHY_TX_IQCAL_START(ah),</div><div class='ctx'> 			AR_PHY_TX_IQCAL_START_DO_CAL, 0,</div><div class='ctx'> 			AH_WAIT_TIMEOUT)) {</div><div class='ctx'> 		ath_dbg(common, CALIBRATE, "Tx IQ Cal is not completed\n");</div><div class='hunk'>@@ -1005,24 +1005,20 @@ static void __ar955x_tx_iq_cal_sort(struct ath_hw *ah,</div><div class='ctx'> 				    int i, int nmeasurement)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='del'>-	int im, ix, iy, temp;</div><div class='add'>+	int im, ix, iy;</div><div class='ctx'> </div><div class='ctx'> 	for (im = 0; im &lt; nmeasurement; im++) {</div><div class='ctx'> 		for (ix = 0; ix &lt; MAXIQCAL - 1; ix++) {</div><div class='ctx'> 			for (iy = ix + 1; iy &lt;= MAXIQCAL - 1; iy++) {</div><div class='ctx'> 				if (coeff-&gt;mag_coeff[i][im][iy] &lt;</div><div class='ctx'> 				    coeff-&gt;mag_coeff[i][im][ix]) {</div><div class='del'>-					temp = coeff-&gt;mag_coeff[i][im][ix];</div><div class='del'>-					coeff-&gt;mag_coeff[i][im][ix] =</div><div class='del'>-						coeff-&gt;mag_coeff[i][im][iy];</div><div class='del'>-					coeff-&gt;mag_coeff[i][im][iy] = temp;</div><div class='add'>+					swap(coeff-&gt;mag_coeff[i][im][ix],</div><div class='add'>+					     coeff-&gt;mag_coeff[i][im][iy]);</div><div class='ctx'> 				}</div><div class='ctx'> 				if (coeff-&gt;phs_coeff[i][im][iy] &lt;</div><div class='ctx'> 				    coeff-&gt;phs_coeff[i][im][ix]) {</div><div class='del'>-					temp = coeff-&gt;phs_coeff[i][im][ix];</div><div class='del'>-					coeff-&gt;phs_coeff[i][im][ix] =</div><div class='del'>-						coeff-&gt;phs_coeff[i][im][iy];</div><div class='del'>-					coeff-&gt;phs_coeff[i][im][iy] = temp;</div><div class='add'>+					swap(coeff-&gt;phs_coeff[i][im][ix],</div><div class='add'>+					     coeff-&gt;phs_coeff[i][im][iy]);</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1060,7 +1056,7 @@ static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='ctx'> 	const u32 txiqcal_status[AR9300_MAX_CHAINS] = {</div><div class='del'>-		AR_PHY_TX_IQCAL_STATUS_B0,</div><div class='add'>+		AR_PHY_TX_IQCAL_STATUS_B0(ah),</div><div class='ctx'> 		AR_PHY_TX_IQCAL_STATUS_B1,</div><div class='ctx'> 		AR_PHY_TX_IQCAL_STATUS_B2,</div><div class='ctx'> 	};</div><div class='hunk'>@@ -1080,7 +1076,7 @@ static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah,</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		nmeasurement = REG_READ_FIELD(ah,</div><div class='del'>-				AR_PHY_TX_IQCAL_STATUS_B0,</div><div class='add'>+				AR_PHY_TX_IQCAL_STATUS_B0(ah),</div><div class='ctx'> 				AR_PHY_CALIBRATED_GAINS_0);</div><div class='ctx'> 		if (nmeasurement &gt; MAX_MEASUREMENT)</div><div class='ctx'> 			nmeasurement = MAX_MEASUREMENT;</div><div class='hunk'>@@ -1100,7 +1096,7 @@ static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah,</div><div class='ctx'> 				u32 idx = 2 * j, offset = 4 * (3 * im + j);</div><div class='ctx'> </div><div class='ctx'> 				REG_RMW_FIELD(ah,</div><div class='del'>-						AR_PHY_CHAN_INFO_MEMORY,</div><div class='add'>+						AR_PHY_CHAN_INFO_MEMORY(ah),</div><div class='ctx'> 						AR_PHY_CHAN_INFO_TAB_S2_READ,</div><div class='ctx'> 						0);</div><div class='ctx'> </div><div class='hunk'>@@ -1110,7 +1106,7 @@ static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah,</div><div class='ctx'> 						offset);</div><div class='ctx'> </div><div class='ctx'> 				REG_RMW_FIELD(ah,</div><div class='del'>-						AR_PHY_CHAN_INFO_MEMORY,</div><div class='add'>+						AR_PHY_CHAN_INFO_MEMORY(ah),</div><div class='ctx'> 						AR_PHY_CHAN_INFO_TAB_S2_READ,</div><div class='ctx'> 						1);</div><div class='ctx'> </div><div class='hunk'>@@ -1165,7 +1161,7 @@ static void ar9003_hw_tx_iq_cal_reload(struct ath_hw *ah)</div><div class='ctx'> 	memset(tx_corr_coeff, 0, sizeof(tx_corr_coeff));</div><div class='ctx'> 	for (i = 0; i &lt; MAX_MEASUREMENT / 2; i++) {</div><div class='ctx'> 		tx_corr_coeff[i * 2][0] = tx_corr_coeff[(i * 2) + 1][0] =</div><div class='del'>-					AR_PHY_TX_IQCAL_CORR_COEFF_B0(i);</div><div class='add'>+					AR_PHY_TX_IQCAL_CORR_COEFF_B0(ah, i);</div><div class='ctx'> 		if (!AR_SREV_9485(ah)) {</div><div class='ctx'> 			tx_corr_coeff[i * 2][1] =</div><div class='ctx'> 			tx_corr_coeff[(i * 2) + 1][1] =</div><div class='hunk'>@@ -1350,7 +1346,7 @@ static void ar9003_hw_cl_cal_post_proc(struct ath_hw *ah, bool is_reusable)</div><div class='ctx'> 	if (!caldata || !(ah-&gt;enabled_cals &amp; TX_CL_CAL))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	txclcal_done = !!(REG_READ(ah, AR_PHY_AGC_CONTROL) &amp;</div><div class='add'>+	txclcal_done = !!(REG_READ(ah, AR_PHY_AGC_CONTROL(ah)) &amp;</div><div class='ctx'> 			  AR_PHY_AGC_CONTROL_CLC_SUCCESS);</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(TXCLCAL_DONE, &amp;caldata-&gt;cal_flags)) {</div><div class='hunk'>@@ -1428,12 +1424,12 @@ static bool ar9003_hw_init_cal_pcoem(struct ath_hw *ah,</div><div class='ctx'> </div><div class='ctx'> 	if (rtt) {</div><div class='ctx'> 		if (!run_rtt_cal) {</div><div class='del'>-			agc_ctrl = REG_READ(ah, AR_PHY_AGC_CONTROL);</div><div class='add'>+			agc_ctrl = REG_READ(ah, AR_PHY_AGC_CONTROL(ah));</div><div class='ctx'> 			agc_supp_cals &amp;= agc_ctrl;</div><div class='ctx'> 			agc_ctrl &amp;= ~(AR_PHY_AGC_CONTROL_OFFSET_CAL |</div><div class='ctx'> 				      AR_PHY_AGC_CONTROL_FLTR_CAL |</div><div class='ctx'> 				      AR_PHY_AGC_CONTROL_PKDET_CAL);</div><div class='del'>-			REG_WRITE(ah, AR_PHY_AGC_CONTROL, agc_ctrl);</div><div class='add'>+			REG_WRITE(ah, AR_PHY_AGC_CONTROL(ah), agc_ctrl);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (ah-&gt;ah_flags &amp; AH_FASTCC)</div><div class='ctx'> 				run_agc_cal = true;</div><div class='hunk'>@@ -1456,7 +1452,7 @@ static bool ar9003_hw_init_cal_pcoem(struct ath_hw *ah,</div><div class='ctx'> 		goto skip_tx_iqcal;</div><div class='ctx'> </div><div class='ctx'> 	/* Do Tx IQ Calibration */</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_1,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_1(ah),</div><div class='ctx'> 		      AR_PHY_TX_IQCAL_CONTROL_1_IQCORR_I_Q_COFF_DELPT,</div><div class='ctx'> 		      DELPT);</div><div class='ctx'> </div><div class='hunk'>@@ -1466,10 +1462,10 @@ static bool ar9003_hw_init_cal_pcoem(struct ath_hw *ah,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ah-&gt;enabled_cals &amp; TX_IQ_ON_AGC_CAL) {</div><div class='ctx'> 		if (caldata &amp;&amp; !test_bit(TXIQCAL_DONE, &amp;caldata-&gt;cal_flags))</div><div class='del'>-			REG_SET_BIT(ah, AR_PHY_TX_IQCAL_CONTROL_0,</div><div class='add'>+			REG_SET_BIT(ah, AR_PHY_TX_IQCAL_CONTROL_0(ah),</div><div class='ctx'> 				    AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL);</div><div class='ctx'> 		else</div><div class='del'>-			REG_CLR_BIT(ah, AR_PHY_TX_IQCAL_CONTROL_0,</div><div class='add'>+			REG_CLR_BIT(ah, AR_PHY_TX_IQCAL_CONTROL_0(ah),</div><div class='ctx'> 				    AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL);</div><div class='ctx'> 		txiqcal_done = run_agc_cal = true;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1489,12 +1485,12 @@ skip_tx_iqcal:</div><div class='ctx'> </div><div class='ctx'> 	if (run_agc_cal || !(ah-&gt;ah_flags &amp; AH_FASTCC)) {</div><div class='ctx'> 		/* Calibrate the AGC */</div><div class='del'>-		REG_WRITE(ah, AR_PHY_AGC_CONTROL,</div><div class='del'>-			  REG_READ(ah, AR_PHY_AGC_CONTROL) |</div><div class='add'>+		REG_WRITE(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='add'>+			  REG_READ(ah, AR_PHY_AGC_CONTROL(ah)) |</div><div class='ctx'> 			  AR_PHY_AGC_CONTROL_CAL);</div><div class='ctx'> </div><div class='ctx'> 		/* Poll for offset calibration complete */</div><div class='del'>-		status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+		status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 				       AR_PHY_AGC_CONTROL_CAL,</div><div class='ctx'> 				       0, AH_WAIT_TIMEOUT);</div><div class='ctx'> </div><div class='hunk'>@@ -1511,7 +1507,7 @@ skip_tx_iqcal:</div><div class='ctx'> </div><div class='ctx'> 	if (rtt &amp;&amp; !run_rtt_cal) {</div><div class='ctx'> 		agc_ctrl |= agc_supp_cals;</div><div class='del'>-		REG_WRITE(ah, AR_PHY_AGC_CONTROL, agc_ctrl);</div><div class='add'>+		REG_WRITE(ah, AR_PHY_AGC_CONTROL(ah), agc_ctrl);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!status) {</div><div class='hunk'>@@ -1562,11 +1558,11 @@ static bool do_ar9003_agc_cal(struct ath_hw *ah)</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='ctx'> 	bool status;</div><div class='ctx'> </div><div class='del'>-	REG_WRITE(ah, AR_PHY_AGC_CONTROL,</div><div class='del'>-		  REG_READ(ah, AR_PHY_AGC_CONTROL) |</div><div class='add'>+	REG_WRITE(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='add'>+		  REG_READ(ah, AR_PHY_AGC_CONTROL(ah)) |</div><div class='ctx'> 		  AR_PHY_AGC_CONTROL_CAL);</div><div class='ctx'> </div><div class='del'>-	status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+	status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 			       AR_PHY_AGC_CONTROL_CAL,</div><div class='ctx'> 			       0, AH_WAIT_TIMEOUT);</div><div class='ctx'> 	if (!status) {</div><div class='hunk'>@@ -1600,7 +1596,7 @@ static bool ar9003_hw_init_cal_soc(struct ath_hw *ah,</div><div class='ctx'> 		goto skip_tx_iqcal;</div><div class='ctx'> </div><div class='ctx'> 	/* Do Tx IQ Calibration */</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_1,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_1(ah),</div><div class='ctx'> 		      AR_PHY_TX_IQCAL_CONTROL_1_IQCORR_I_Q_COFF_DELPT,</div><div class='ctx'> 		      DELPT);</div><div class='ctx'> </div><div class='hunk'>@@ -1609,7 +1605,7 @@ static bool ar9003_hw_init_cal_soc(struct ath_hw *ah,</div><div class='ctx'> 	 * AGC calibration. Specifically, AR9550 in SoC chips.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ah-&gt;enabled_cals &amp; TX_IQ_ON_AGC_CAL) {</div><div class='del'>-		if (REG_READ_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_0,</div><div class='add'>+		if (REG_READ_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_0(ah),</div><div class='ctx'> 				   AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL)) {</div><div class='ctx'> 				txiqcal_done = true;</div><div class='ctx'> 		} else {</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c<br/>index b4885a700296..73c38a6b4880 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9003_eeprom.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/ar9003_eeprom.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'>  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include "hw.h"</div><div class='ctx'> #include "ar9003_phy.h"</div><div class='hunk'>@@ -3084,13 +3084,13 @@ error:</div><div class='ctx'> </div><div class='ctx'> static bool ar9300_otp_read_word(struct ath_hw *ah, int addr, u32 *data)</div><div class='ctx'> {</div><div class='del'>-	REG_READ(ah, AR9300_OTP_BASE + (4 * addr));</div><div class='add'>+	REG_READ(ah, AR9300_OTP_BASE(ah) + (4 * addr));</div><div class='ctx'> </div><div class='del'>-	if (!ath9k_hw_wait(ah, AR9300_OTP_STATUS, AR9300_OTP_STATUS_TYPE,</div><div class='add'>+	if (!ath9k_hw_wait(ah, AR9300_OTP_STATUS(ah), AR9300_OTP_STATUS_TYPE,</div><div class='ctx'> 			   AR9300_OTP_STATUS_VALID, 1000))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	*data = REG_READ(ah, AR9300_OTP_READ_DATA);</div><div class='add'>+	*data = REG_READ(ah, AR9300_OTP_READ_DATA(ah));</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3351,7 +3351,8 @@ found:</div><div class='ctx'> 			"Found block at %x: code=%d ref=%d length=%d major=%d minor=%d\n",</div><div class='ctx'> 			cptr, code, reference, length, major, minor);</div><div class='ctx'> 		if ((!AR_SREV_9485(ah) &amp;&amp; length &gt;= 1024) ||</div><div class='del'>-		    (AR_SREV_9485(ah) &amp;&amp; length &gt; EEPROM_DATA_LEN_9485)) {</div><div class='add'>+		    (AR_SREV_9485(ah) &amp;&amp; length &gt; EEPROM_DATA_LEN_9485) ||</div><div class='add'>+		    (length &gt; cptr)) {</div><div class='ctx'> 			ath_dbg(common, EEPROM, "Skipping bad header\n");</div><div class='ctx'> 			cptr -= COMP_HDR_LEN;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -3606,15 +3607,15 @@ static void ar9003_hw_xpa_bias_level_apply(struct ath_hw *ah, bool is2ghz)</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9485(ah) || AR_SREV_9330(ah) || AR_SREV_9340(ah) ||</div><div class='ctx'> 	    AR_SREV_9531(ah) || AR_SREV_9561(ah))</div><div class='del'>-		REG_RMW_FIELD(ah, AR_CH0_TOP2, AR_CH0_TOP2_XPABIASLVL, bias);</div><div class='add'>+		REG_RMW_FIELD(ah, AR_CH0_TOP2(ah), AR_CH0_TOP2_XPABIASLVL, bias);</div><div class='ctx'> 	else if (AR_SREV_9462(ah) || AR_SREV_9550(ah) || AR_SREV_9565(ah))</div><div class='del'>-		REG_RMW_FIELD(ah, AR_CH0_TOP, AR_CH0_TOP_XPABIASLVL, bias);</div><div class='add'>+		REG_RMW_FIELD(ah, AR_CH0_TOP(ah), AR_CH0_TOP_XPABIASLVL, bias);</div><div class='ctx'> 	else {</div><div class='del'>-		REG_RMW_FIELD(ah, AR_CH0_TOP, AR_CH0_TOP_XPABIASLVL, bias);</div><div class='del'>-		REG_RMW_FIELD(ah, AR_CH0_THERM,</div><div class='add'>+		REG_RMW_FIELD(ah, AR_CH0_TOP(ah), AR_CH0_TOP_XPABIASLVL, bias);</div><div class='add'>+		REG_RMW_FIELD(ah, AR_CH0_THERM(ah),</div><div class='ctx'> 				AR_CH0_THERM_XPABIASLVL_MSB,</div><div class='ctx'> 				bias &gt;&gt; 2);</div><div class='del'>-		REG_RMW_FIELD(ah, AR_CH0_THERM,</div><div class='add'>+		REG_RMW_FIELD(ah, AR_CH0_THERM(ah),</div><div class='ctx'> 				AR_CH0_THERM_XPASHORT2GND, 1);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -3910,7 +3911,7 @@ static void ar9003_hw_atten_apply(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Test value. if 0 then attenuation is unused. Don't load anything. */</div><div class='del'>-	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+	for (i = 0; i &lt; AR9300_MAX_CHAINS; i++) {</div><div class='ctx'> 		if (ah-&gt;txchainmask &amp; BIT(i)) {</div><div class='ctx'> 			value = ar9003_hw_atten_chain_get(ah, i, chan);</div><div class='ctx'> 			REG_RMW_FIELD(ah, ext_atten_reg[i],</div><div class='hunk'>@@ -3959,9 +3960,9 @@ void ar9003_hw_internal_regulator_apply(struct ath_hw *ah)</div><div class='ctx'> 		if (AR_SREV_9330(ah) || AR_SREV_9485(ah)) {</div><div class='ctx'> 			int reg_pmu_set;</div><div class='ctx'> </div><div class='del'>-			reg_pmu_set = REG_READ(ah, AR_PHY_PMU2) &amp; ~AR_PHY_PMU2_PGM;</div><div class='del'>-			REG_WRITE(ah, AR_PHY_PMU2, reg_pmu_set);</div><div class='del'>-			if (!is_pmu_set(ah, AR_PHY_PMU2, reg_pmu_set))</div><div class='add'>+			reg_pmu_set = REG_READ(ah, AR_PHY_PMU2(ah)) &amp; ~AR_PHY_PMU2_PGM;</div><div class='add'>+			REG_WRITE(ah, AR_PHY_PMU2(ah), reg_pmu_set);</div><div class='add'>+			if (!is_pmu_set(ah, AR_PHY_PMU2(ah), reg_pmu_set))</div><div class='ctx'> 				return;</div><div class='ctx'> </div><div class='ctx'> 			if (AR_SREV_9330(ah)) {</div><div class='hunk'>@@ -3983,28 +3984,28 @@ void ar9003_hw_internal_regulator_apply(struct ath_hw *ah)</div><div class='ctx'> 					      (3 &lt;&lt; 24) | (1 &lt;&lt; 28);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			REG_WRITE(ah, AR_PHY_PMU1, reg_pmu_set);</div><div class='del'>-			if (!is_pmu_set(ah, AR_PHY_PMU1, reg_pmu_set))</div><div class='add'>+			REG_WRITE(ah, AR_PHY_PMU1(ah), reg_pmu_set);</div><div class='add'>+			if (!is_pmu_set(ah, AR_PHY_PMU1(ah), reg_pmu_set))</div><div class='ctx'> 				return;</div><div class='ctx'> </div><div class='del'>-			reg_pmu_set = (REG_READ(ah, AR_PHY_PMU2) &amp; ~0xFFC00000)</div><div class='add'>+			reg_pmu_set = (REG_READ(ah, AR_PHY_PMU2(ah)) &amp; ~0xFFC00000)</div><div class='ctx'> 					| (4 &lt;&lt; 26);</div><div class='del'>-			REG_WRITE(ah, AR_PHY_PMU2, reg_pmu_set);</div><div class='del'>-			if (!is_pmu_set(ah, AR_PHY_PMU2, reg_pmu_set))</div><div class='add'>+			REG_WRITE(ah, AR_PHY_PMU2(ah), reg_pmu_set);</div><div class='add'>+			if (!is_pmu_set(ah, AR_PHY_PMU2(ah), reg_pmu_set))</div><div class='ctx'> 				return;</div><div class='ctx'> </div><div class='del'>-			reg_pmu_set = (REG_READ(ah, AR_PHY_PMU2) &amp; ~0x00200000)</div><div class='add'>+			reg_pmu_set = (REG_READ(ah, AR_PHY_PMU2(ah)) &amp; ~0x00200000)</div><div class='ctx'> 					| (1 &lt;&lt; 21);</div><div class='del'>-			REG_WRITE(ah, AR_PHY_PMU2, reg_pmu_set);</div><div class='del'>-			if (!is_pmu_set(ah, AR_PHY_PMU2, reg_pmu_set))</div><div class='add'>+			REG_WRITE(ah, AR_PHY_PMU2(ah), reg_pmu_set);</div><div class='add'>+			if (!is_pmu_set(ah, AR_PHY_PMU2(ah), reg_pmu_set))</div><div class='ctx'> 				return;</div><div class='ctx'> 		} else if (AR_SREV_9462(ah) || AR_SREV_9565(ah) ||</div><div class='ctx'> 			   AR_SREV_9561(ah)) {</div><div class='ctx'> 			reg_val = le32_to_cpu(pBase-&gt;swreg);</div><div class='del'>-			REG_WRITE(ah, AR_PHY_PMU1, reg_val);</div><div class='add'>+			REG_WRITE(ah, AR_PHY_PMU1(ah), reg_val);</div><div class='ctx'> </div><div class='ctx'> 			if (AR_SREV_9561(ah))</div><div class='del'>-				REG_WRITE(ah, AR_PHY_PMU2, 0x10200000);</div><div class='add'>+				REG_WRITE(ah, AR_PHY_PMU2(ah), 0x10200000);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Internal regulator is ON. Write swreg register. */</div><div class='ctx'> 			reg_val = le32_to_cpu(pBase-&gt;swreg);</div><div class='hunk'>@@ -4020,25 +4021,25 @@ void ar9003_hw_internal_regulator_apply(struct ath_hw *ah)</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (AR_SREV_9330(ah) || AR_SREV_9485(ah)) {</div><div class='del'>-			REG_RMW_FIELD(ah, AR_PHY_PMU2, AR_PHY_PMU2_PGM, 0);</div><div class='del'>-			while (REG_READ_FIELD(ah, AR_PHY_PMU2,</div><div class='add'>+			REG_RMW_FIELD(ah, AR_PHY_PMU2(ah), AR_PHY_PMU2_PGM, 0);</div><div class='add'>+			while (REG_READ_FIELD(ah, AR_PHY_PMU2(ah),</div><div class='ctx'> 						AR_PHY_PMU2_PGM))</div><div class='ctx'> 				udelay(10);</div><div class='ctx'> </div><div class='del'>-			REG_RMW_FIELD(ah, AR_PHY_PMU1, AR_PHY_PMU1_PWD, 0x1);</div><div class='del'>-			while (!REG_READ_FIELD(ah, AR_PHY_PMU1,</div><div class='add'>+			REG_RMW_FIELD(ah, AR_PHY_PMU1(ah), AR_PHY_PMU1_PWD, 0x1);</div><div class='add'>+			while (!REG_READ_FIELD(ah, AR_PHY_PMU1(ah),</div><div class='ctx'> 						AR_PHY_PMU1_PWD))</div><div class='ctx'> 				udelay(10);</div><div class='del'>-			REG_RMW_FIELD(ah, AR_PHY_PMU2, AR_PHY_PMU2_PGM, 0x1);</div><div class='del'>-			while (!REG_READ_FIELD(ah, AR_PHY_PMU2,</div><div class='add'>+			REG_RMW_FIELD(ah, AR_PHY_PMU2(ah), AR_PHY_PMU2_PGM, 0x1);</div><div class='add'>+			while (!REG_READ_FIELD(ah, AR_PHY_PMU2(ah),</div><div class='ctx'> 						AR_PHY_PMU2_PGM))</div><div class='ctx'> 				udelay(10);</div><div class='ctx'> 		} else if (AR_SREV_9462(ah) || AR_SREV_9565(ah))</div><div class='del'>-			REG_RMW_FIELD(ah, AR_PHY_PMU1, AR_PHY_PMU1_PWD, 0x1);</div><div class='add'>+			REG_RMW_FIELD(ah, AR_PHY_PMU1(ah), AR_PHY_PMU1_PWD, 0x1);</div><div class='ctx'> 		else {</div><div class='del'>-			reg_val = REG_READ(ah, AR_RTC_SLEEP_CLK) |</div><div class='add'>+			reg_val = REG_READ(ah, AR_RTC_SLEEP_CLK(ah)) |</div><div class='ctx'> 				AR_RTC_FORCE_SWREG_PRD;</div><div class='del'>-			REG_WRITE(ah, AR_RTC_SLEEP_CLK, reg_val);</div><div class='add'>+			REG_WRITE(ah, AR_RTC_SLEEP_CLK(ah), reg_val);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4054,9 +4055,9 @@ static void ar9003_hw_apply_tuning_caps(struct ath_hw *ah)</div><div class='ctx'> </div><div class='ctx'> 	if (eep-&gt;baseEepHeader.featureEnable &amp; 0x40) {</div><div class='ctx'> 		tuning_caps_param &amp;= 0x7f;</div><div class='del'>-		REG_RMW_FIELD(ah, AR_CH0_XTAL, AR_CH0_XTAL_CAPINDAC,</div><div class='add'>+		REG_RMW_FIELD(ah, AR_CH0_XTAL(ah), AR_CH0_XTAL_CAPINDAC,</div><div class='ctx'> 			      tuning_caps_param);</div><div class='del'>-		REG_RMW_FIELD(ah, AR_CH0_XTAL, AR_CH0_XTAL_CAPOUTDAC,</div><div class='add'>+		REG_RMW_FIELD(ah, AR_CH0_XTAL(ah), AR_CH0_XTAL_CAPOUTDAC,</div><div class='ctx'> 			      tuning_caps_param);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -4746,7 +4747,7 @@ static void ar9003_hw_get_target_power_eeprom(struct ath_hw *ah,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ar9003_hw_cal_pier_get(struct ath_hw *ah,</div><div class='del'>-				  int mode,</div><div class='add'>+				  bool is2ghz,</div><div class='ctx'> 				  int ipier,</div><div class='ctx'> 				  int ichain,</div><div class='ctx'> 				  int *pfrequency,</div><div class='hunk'>@@ -4756,7 +4757,6 @@ static int ar9003_hw_cal_pier_get(struct ath_hw *ah,</div><div class='ctx'> {</div><div class='ctx'> 	u8 *pCalPier;</div><div class='ctx'> 	struct ar9300_cal_data_per_freq_op_loop *pCalPierStruct;</div><div class='del'>-	int is2GHz;</div><div class='ctx'> 	struct ar9300_eeprom *eep = &amp;ah-&gt;eeprom.ar9300_eep;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='ctx'> </div><div class='hunk'>@@ -4767,17 +4767,7 @@ static int ar9003_hw_cal_pier_get(struct ath_hw *ah,</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mode) {		/* 5GHz */</div><div class='del'>-		if (ipier &gt;= AR9300_NUM_5G_CAL_PIERS) {</div><div class='del'>-			ath_dbg(common, EEPROM,</div><div class='del'>-				"Invalid 5GHz cal pier index, must be less than %d\n",</div><div class='del'>-				AR9300_NUM_5G_CAL_PIERS);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		pCalPier = &amp;(eep-&gt;calFreqPier5G[ipier]);</div><div class='del'>-		pCalPierStruct = &amp;(eep-&gt;calPierData5G[ichain][ipier]);</div><div class='del'>-		is2GHz = 0;</div><div class='del'>-	} else {</div><div class='add'>+	if (is2ghz) {</div><div class='ctx'> 		if (ipier &gt;= AR9300_NUM_2G_CAL_PIERS) {</div><div class='ctx'> 			ath_dbg(common, EEPROM,</div><div class='ctx'> 				"Invalid 2GHz cal pier index, must be less than %d\n",</div><div class='hunk'>@@ -4787,10 +4777,18 @@ static int ar9003_hw_cal_pier_get(struct ath_hw *ah,</div><div class='ctx'> </div><div class='ctx'> 		pCalPier = &amp;(eep-&gt;calFreqPier2G[ipier]);</div><div class='ctx'> 		pCalPierStruct = &amp;(eep-&gt;calPierData2G[ichain][ipier]);</div><div class='del'>-		is2GHz = 1;</div><div class='add'>+	} else {</div><div class='add'>+		if (ipier &gt;= AR9300_NUM_5G_CAL_PIERS) {</div><div class='add'>+			ath_dbg(common, EEPROM,</div><div class='add'>+				"Invalid 5GHz cal pier index, must be less than %d\n",</div><div class='add'>+				AR9300_NUM_5G_CAL_PIERS);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+		pCalPier = &amp;(eep-&gt;calFreqPier5G[ipier]);</div><div class='add'>+		pCalPierStruct = &amp;(eep-&gt;calPierData5G[ichain][ipier]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*pfrequency = ath9k_hw_fbin2freq(*pCalPier, is2GHz);</div><div class='add'>+	*pfrequency = ath9k_hw_fbin2freq(*pCalPier, is2ghz);</div><div class='ctx'> 	*pcorrection = pCalPierStruct-&gt;refPower;</div><div class='ctx'> 	*ptemperature = pCalPierStruct-&gt;tempMeas;</div><div class='ctx'> 	*pvoltage = pCalPierStruct-&gt;voltMeas;</div><div class='hunk'>@@ -4959,7 +4957,6 @@ tempslope:</div><div class='ctx'> static int ar9003_hw_calibration_apply(struct ath_hw *ah, int frequency)</div><div class='ctx'> {</div><div class='ctx'> 	int ichain, ipier, npier;</div><div class='del'>-	int mode;</div><div class='ctx'> 	int lfrequency[AR9300_MAX_CHAINS],</div><div class='ctx'> 	    lcorrection[AR9300_MAX_CHAINS],</div><div class='ctx'> 	    ltemperature[AR9300_MAX_CHAINS], lvoltage[AR9300_MAX_CHAINS],</div><div class='hunk'>@@ -4975,12 +4972,12 @@ static int ar9003_hw_calibration_apply(struct ath_hw *ah, int frequency)</div><div class='ctx'> 	int pfrequency, pcorrection, ptemperature, pvoltage,</div><div class='ctx'> 	    pnf_cal, pnf_pwr;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	bool is2ghz = frequency &lt; 4000;</div><div class='ctx'> </div><div class='del'>-	mode = (frequency &gt;= 4000);</div><div class='del'>-	if (mode)</div><div class='del'>-		npier = AR9300_NUM_5G_CAL_PIERS;</div><div class='del'>-	else</div><div class='add'>+	if (is2ghz)</div><div class='ctx'> 		npier = AR9300_NUM_2G_CAL_PIERS;</div><div class='add'>+	else</div><div class='add'>+		npier = AR9300_NUM_5G_CAL_PIERS;</div><div class='ctx'> </div><div class='ctx'> 	for (ichain = 0; ichain &lt; AR9300_MAX_CHAINS; ichain++) {</div><div class='ctx'> 		lfrequency[ichain] = 0;</div><div class='hunk'>@@ -4989,7 +4986,7 @@ static int ar9003_hw_calibration_apply(struct ath_hw *ah, int frequency)</div><div class='ctx'> 	/* identify best lower and higher frequency calibration measurement */</div><div class='ctx'> 	for (ichain = 0; ichain &lt; AR9300_MAX_CHAINS; ichain++) {</div><div class='ctx'> 		for (ipier = 0; ipier &lt; npier; ipier++) {</div><div class='del'>-			if (!ar9003_hw_cal_pier_get(ah, mode, ipier, ichain,</div><div class='add'>+			if (!ar9003_hw_cal_pier_get(ah, is2ghz, ipier, ichain,</div><div class='ctx'> 						    &amp;pfrequency, &amp;pcorrection,</div><div class='ctx'> 						    &amp;ptemperature, &amp;pvoltage,</div><div class='ctx'> 						    &amp;pnf_cal, &amp;pnf_pwr)) {</div><div class='hunk'>@@ -5125,13 +5122,13 @@ static int ar9003_hw_calibration_apply(struct ath_hw *ah, int frequency)</div><div class='ctx'> 		frequency, correction[0], correction[1], correction[2]);</div><div class='ctx'> </div><div class='ctx'> 	/* Store calibrated noise floor values */</div><div class='del'>-	for (ichain = 0; ichain &lt; AR5416_MAX_CHAINS; ichain++)</div><div class='del'>-		if (mode) {</div><div class='del'>-			ah-&gt;nf_5g.cal[ichain] = nf_cal[ichain];</div><div class='del'>-			ah-&gt;nf_5g.pwr[ichain] = nf_pwr[ichain];</div><div class='del'>-		} else {</div><div class='add'>+	for (ichain = 0; ichain &lt; AR9300_MAX_CHAINS; ichain++)</div><div class='add'>+		if (is2ghz) {</div><div class='ctx'> 			ah-&gt;nf_2g.cal[ichain] = nf_cal[ichain];</div><div class='ctx'> 			ah-&gt;nf_2g.pwr[ichain] = nf_pwr[ichain];</div><div class='add'>+		} else {</div><div class='add'>+			ah-&gt;nf_5g.cal[ichain] = nf_cal[ichain];</div><div class='add'>+			ah-&gt;nf_5g.pwr[ichain] = nf_pwr[ichain];</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -5448,8 +5445,6 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='del'>-	struct ar9300_eeprom *eep = &amp;ah-&gt;eeprom.ar9300_eep;</div><div class='del'>-	struct ar9300_modal_eep_header *modal_hdr;</div><div class='ctx'> 	u8 targetPowerValT2[ar9300RateSize];</div><div class='ctx'> 	u8 target_power_val_t2_eep[ar9300RateSize];</div><div class='ctx'> 	u8 targetPowerValT2_tpc[ar9300RateSize];</div><div class='hunk'>@@ -5464,17 +5459,12 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah,</div><div class='ctx'> 	ar9003_hw_get_target_power_eeprom(ah, chan, targetPowerValT2);</div><div class='ctx'> </div><div class='ctx'> 	if (ar9003_is_paprd_enabled(ah)) {</div><div class='del'>-		if (IS_CHAN_2GHZ(chan))</div><div class='del'>-			modal_hdr = &amp;eep-&gt;modalHeader2G;</div><div class='del'>-		else</div><div class='del'>-			modal_hdr = &amp;eep-&gt;modalHeader5G;</div><div class='del'>-</div><div class='ctx'> 		ah-&gt;paprd_ratemask =</div><div class='del'>-			le32_to_cpu(modal_hdr-&gt;papdRateMaskHt20) &amp;</div><div class='add'>+			ar9003_get_paprd_rate_mask_ht20(ah, IS_CHAN_2GHZ(chan)) &amp;</div><div class='ctx'> 			AR9300_PAPRD_RATE_MASK;</div><div class='ctx'> </div><div class='ctx'> 		ah-&gt;paprd_ratemask_ht40 =</div><div class='del'>-			le32_to_cpu(modal_hdr-&gt;papdRateMaskHt40) &amp;</div><div class='add'>+			ar9003_get_paprd_rate_mask_ht40(ah, IS_CHAN_2GHZ(chan)) &amp;</div><div class='ctx'> 			AR9300_PAPRD_RATE_MASK;</div><div class='ctx'> </div><div class='ctx'> 		paprd_scale_factor = ar9003_get_paprd_scale_factor(ah, chan);</div><div class='hunk'>@@ -5591,30 +5581,40 @@ u8 *ar9003_get_spur_chan_ptr(struct ath_hw *ah, bool is2ghz)</div><div class='ctx'> 	return ar9003_modal_header(ah, is2ghz)-&gt;spurChans;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+u32 ar9003_get_paprd_rate_mask_ht20(struct ath_hw *ah, bool is2ghz)</div><div class='add'>+{</div><div class='add'>+	return le32_to_cpu(ar9003_modal_header(ah, is2ghz)-&gt;papdRateMaskHt20);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 ar9003_get_paprd_rate_mask_ht40(struct ath_hw *ah, bool is2ghz)</div><div class='add'>+{</div><div class='add'>+	return le32_to_cpu(ar9003_modal_header(ah, is2ghz)-&gt;papdRateMaskHt40);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> unsigned int ar9003_get_paprd_scale_factor(struct ath_hw *ah,</div><div class='ctx'> 					   struct ath9k_channel *chan)</div><div class='ctx'> {</div><div class='del'>-	struct ar9300_eeprom *eep = &amp;ah-&gt;eeprom.ar9300_eep;</div><div class='add'>+	bool is2ghz = IS_CHAN_2GHZ(chan);</div><div class='ctx'> </div><div class='del'>-	if (IS_CHAN_2GHZ(chan))</div><div class='del'>-		return MS(le32_to_cpu(eep-&gt;modalHeader2G.papdRateMaskHt20),</div><div class='add'>+	if (is2ghz)</div><div class='add'>+		return MS(ar9003_get_paprd_rate_mask_ht20(ah, is2ghz),</div><div class='ctx'> 			  AR9300_PAPRD_SCALE_1);</div><div class='ctx'> 	else {</div><div class='ctx'> 		if (chan-&gt;channel &gt;= 5700)</div><div class='del'>-			return MS(le32_to_cpu(eep-&gt;modalHeader5G.papdRateMaskHt20),</div><div class='add'>+			return MS(ar9003_get_paprd_rate_mask_ht20(ah, is2ghz),</div><div class='ctx'> 				  AR9300_PAPRD_SCALE_1);</div><div class='ctx'> 		else if (chan-&gt;channel &gt;= 5400)</div><div class='del'>-			return MS(le32_to_cpu(eep-&gt;modalHeader5G.papdRateMaskHt40),</div><div class='add'>+			return MS(ar9003_get_paprd_rate_mask_ht40(ah, is2ghz),</div><div class='ctx'> 				  AR9300_PAPRD_SCALE_2);</div><div class='ctx'> 		else</div><div class='del'>-			return MS(le32_to_cpu(eep-&gt;modalHeader5G.papdRateMaskHt40),</div><div class='add'>+			return MS(ar9003_get_paprd_rate_mask_ht40(ah, is2ghz),</div><div class='ctx'> 				  AR9300_PAPRD_SCALE_1);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u8 ar9003_get_eepmisc(struct ath_hw *ah)</div><div class='ctx'> {</div><div class='del'>-	return ah-&gt;eeprom.map4k.baseEepHeader.eepMisc;</div><div class='add'>+	return ah-&gt;eeprom.ar9300_eep.baseEepHeader.opCapFlags.eepMisc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct eeprom_ops eep_ar9300_ops = {</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h<br/>index e8fda54acfe3..b91ef1250ba8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9003_eeprom.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/ar9003_eeprom.h</a></div><div class='hunk'>@@ -82,16 +82,16 @@</div><div class='ctx'> /* AR5416_EEPMISC_BIG_ENDIAN not set indicates little endian */</div><div class='ctx'> #define AR9300_EEPMISC_LITTLE_ENDIAN 0</div><div class='ctx'> </div><div class='del'>-#define AR9300_OTP_BASE \</div><div class='del'>-		((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x30000 : 0x14000)</div><div class='del'>-#define AR9300_OTP_STATUS \</div><div class='del'>-		((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x31018 : 0x15f18)</div><div class='add'>+#define AR9300_OTP_BASE(_ah) \</div><div class='add'>+		((AR_SREV_9340(_ah) || AR_SREV_9550(_ah)) ? 0x30000 : 0x14000)</div><div class='add'>+#define AR9300_OTP_STATUS(_ah) \</div><div class='add'>+		((AR_SREV_9340(_ah) || AR_SREV_9550(_ah)) ? 0x31018 : 0x15f18)</div><div class='ctx'> #define AR9300_OTP_STATUS_TYPE		0x7</div><div class='ctx'> #define AR9300_OTP_STATUS_VALID		0x4</div><div class='ctx'> #define AR9300_OTP_STATUS_ACCESS_BUSY	0x2</div><div class='ctx'> #define AR9300_OTP_STATUS_SM_BUSY	0x1</div><div class='del'>-#define AR9300_OTP_READ_DATA \</div><div class='del'>-		((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x3101c : 0x15f1c)</div><div class='add'>+#define AR9300_OTP_READ_DATA(_ah) \</div><div class='add'>+		((AR_SREV_9340(_ah) || AR_SREV_9550(_ah)) ? 0x3101c : 0x15f1c)</div><div class='ctx'> </div><div class='ctx'> enum targetPowerHTRates {</div><div class='ctx'> 	HT_TARGET_RATE_0_8_16,</div><div class='hunk'>@@ -363,6 +363,8 @@ u32 ar9003_hw_ant_ctrl_common_2_get(struct ath_hw *ah, bool is2ghz);</div><div class='ctx'> </div><div class='ctx'> u8 *ar9003_get_spur_chan_ptr(struct ath_hw *ah, bool is_2ghz);</div><div class='ctx'> </div><div class='add'>+u32 ar9003_get_paprd_rate_mask_ht20(struct ath_hw *ah, bool is2ghz);</div><div class='add'>+u32 ar9003_get_paprd_rate_mask_ht40(struct ath_hw *ah, bool is2ghz);</div><div class='ctx'> unsigned int ar9003_get_paprd_scale_factor(struct ath_hw *ah,</div><div class='ctx'> 					   struct ath9k_channel *chan);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9003_hw.c b/drivers/net/wireless/ath/ath9k/ar9003_hw.c<br/>index 42f00a2a8c80..6595eca74997 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9003_hw.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9003_hw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9003_hw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/ar9003_hw.c</a></div><div class='hunk'>@@ -1032,8 +1032,8 @@ static void ar9003_hw_configpcipowersave(struct ath_hw *ah,</div><div class='ctx'> 	/* Nothing to do on restore for 11N */</div><div class='ctx'> 	if (!power_off /* !restore */) {</div><div class='ctx'> 		/* set bit 19 to allow forcing of pcie core into L1 state */</div><div class='del'>-		REG_SET_BIT(ah, AR_PCIE_PM_CTRL, AR_PCIE_PM_CTRL_ENA);</div><div class='del'>-		REG_WRITE(ah, AR_WA, ah-&gt;WARegVal);</div><div class='add'>+		REG_SET_BIT(ah, AR_PCIE_PM_CTRL(ah), AR_PCIE_PM_CTRL_ENA);</div><div class='add'>+		REG_WRITE(ah, AR_WA(ah), ah-&gt;WARegVal);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1099,17 +1099,22 @@ static bool ath9k_hw_verify_hang(struct ath_hw *ah, unsigned int queue)</div><div class='ctx'> {</div><div class='ctx'> 	u32 dma_dbg_chain, dma_dbg_complete;</div><div class='ctx'> 	u8 dcu_chain_state, dcu_complete_state;</div><div class='add'>+	unsigned int dbg_reg, reg_offset;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; NUM_STATUS_READS; i++) {</div><div class='del'>-		if (queue &lt; 6)</div><div class='del'>-			dma_dbg_chain = REG_READ(ah, AR_DMADBG_4);</div><div class='del'>-		else</div><div class='del'>-			dma_dbg_chain = REG_READ(ah, AR_DMADBG_5);</div><div class='add'>+	if (queue &lt; 6) {</div><div class='add'>+		dbg_reg = AR_DMADBG_4;</div><div class='add'>+		reg_offset = queue * 5;</div><div class='add'>+	} else {</div><div class='add'>+		dbg_reg = AR_DMADBG_5;</div><div class='add'>+		reg_offset = (queue - 6) * 5;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; NUM_STATUS_READS; i++) {</div><div class='add'>+		dma_dbg_chain = REG_READ(ah, dbg_reg);</div><div class='ctx'> 		dma_dbg_complete = REG_READ(ah, AR_DMADBG_6);</div><div class='ctx'> </div><div class='del'>-		dcu_chain_state = (dma_dbg_chain &gt;&gt; (5 * queue)) &amp; 0x1f;</div><div class='add'>+		dcu_chain_state = (dma_dbg_chain &gt;&gt; reg_offset) &amp; 0x1f;</div><div class='ctx'> 		dcu_complete_state = dma_dbg_complete &amp; 0x3;</div><div class='ctx'> </div><div class='ctx'> 		if ((dcu_chain_state != 0x6) || (dcu_complete_state != 0x1))</div><div class='hunk'>@@ -1128,6 +1133,7 @@ static bool ar9003_hw_detect_mac_hang(struct ath_hw *ah)</div><div class='ctx'> 	u8 dcu_chain_state, dcu_complete_state;</div><div class='ctx'> 	bool dcu_wait_frdone = false;</div><div class='ctx'> 	unsigned long chk_dcu = 0;</div><div class='add'>+	unsigned int reg_offset;</div><div class='ctx'> 	unsigned int i = 0;</div><div class='ctx'> </div><div class='ctx'> 	dma_dbg_4 = REG_READ(ah, AR_DMADBG_4);</div><div class='hunk'>@@ -1139,12 +1145,15 @@ static bool ar9003_hw_detect_mac_hang(struct ath_hw *ah)</div><div class='ctx'> 		goto exit;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ATH9K_NUM_TX_QUEUES; i++) {</div><div class='del'>-		if (i &lt; 6)</div><div class='add'>+		if (i &lt; 6) {</div><div class='ctx'> 			chk_dbg = dma_dbg_4;</div><div class='del'>-		else</div><div class='add'>+			reg_offset = i * 5;</div><div class='add'>+		} else {</div><div class='ctx'> 			chk_dbg = dma_dbg_5;</div><div class='add'>+			reg_offset = (i - 6) * 5;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		dcu_chain_state = (chk_dbg &gt;&gt; (5 * i)) &amp; 0x1f;</div><div class='add'>+		dcu_chain_state = (chk_dbg &gt;&gt; reg_offset) &amp; 0x1f;</div><div class='ctx'> 		if (dcu_chain_state == 0x6) {</div><div class='ctx'> 			dcu_wait_frdone = true;</div><div class='ctx'> 			chk_dcu |= BIT(i);</div><div class='hunk'>@@ -1161,7 +1170,7 @@ exit:</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Sets up the AR9003 hardware familiy callbacks */</div><div class='add'>+/* Sets up the AR9003 hardware family callbacks */</div><div class='ctx'> void ar9003_hw_attach_ops(struct ath_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c<br/>index 76b538942a79..a8bc003077dc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9003_mac.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9003_mac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9003_mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/ar9003_mac.c</a></div><div class='hunk'>@@ -144,10 +144,11 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)</div><div class='ctx'> 	WRITE_ONCE(ads-&gt;ctl16, set11nPktDurRTSCTS(i-&gt;rates, 2)</div><div class='ctx'> 		| set11nPktDurRTSCTS(i-&gt;rates, 3));</div><div class='ctx'> </div><div class='del'>-	WRITE_ONCE(ads-&gt;ctl18, set11nRateFlags(i-&gt;rates, 0)</div><div class='del'>-		| set11nRateFlags(i-&gt;rates, 1)</div><div class='del'>-		| set11nRateFlags(i-&gt;rates, 2)</div><div class='del'>-		| set11nRateFlags(i-&gt;rates, 3)</div><div class='add'>+	WRITE_ONCE(ads-&gt;ctl18,</div><div class='add'>+		  set11nRateFlags(i-&gt;rates, 0) | set11nChainSel(i-&gt;rates, 0)</div><div class='add'>+		| set11nRateFlags(i-&gt;rates, 1) | set11nChainSel(i-&gt;rates, 1)</div><div class='add'>+		| set11nRateFlags(i-&gt;rates, 2) | set11nChainSel(i-&gt;rates, 2)</div><div class='add'>+		| set11nRateFlags(i-&gt;rates, 3) | set11nChainSel(i-&gt;rates, 3)</div><div class='ctx'> 		| SM(i-&gt;rtscts_rate, AR_RTSCTSRate));</div><div class='ctx'> </div><div class='ctx'> 	WRITE_ONCE(ads-&gt;ctl19, AR_Not_Sounding);</div><div class='hunk'>@@ -192,16 +193,16 @@ static bool ar9003_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked,</div><div class='ctx'> 	if (ath9k_hw_mci_is_enabled(ah))</div><div class='ctx'> 		async_mask |= AR_INTR_ASYNC_MASK_MCI;</div><div class='ctx'> </div><div class='del'>-	async_cause = REG_READ(ah, AR_INTR_ASYNC_CAUSE);</div><div class='add'>+	async_cause = REG_READ(ah, AR_INTR_ASYNC_CAUSE(ah));</div><div class='ctx'> </div><div class='ctx'> 	if (async_cause &amp; async_mask) {</div><div class='del'>-		if ((REG_READ(ah, AR_RTC_STATUS) &amp; AR_RTC_STATUS_M)</div><div class='add'>+		if ((REG_READ(ah, AR_RTC_STATUS(ah)) &amp; AR_RTC_STATUS_M(ah))</div><div class='ctx'> 				== AR_RTC_STATUS_ON)</div><div class='ctx'> 			isr = REG_READ(ah, AR_ISR);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	sync_cause = REG_READ(ah, AR_INTR_SYNC_CAUSE) &amp; AR_INTR_SYNC_DEFAULT;</div><div class='add'>+	sync_cause = REG_READ(ah, AR_INTR_SYNC_CAUSE(ah)) &amp; AR_INTR_SYNC_DEFAULT;</div><div class='ctx'> </div><div class='ctx'> 	*masked = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -279,7 +280,7 @@ static bool ar9003_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked,</div><div class='ctx'> 			u32 s5;</div><div class='ctx'> </div><div class='ctx'> 			if (pCap-&gt;hw_caps &amp; ATH9K_HW_CAP_RAC_SUPPORTED)</div><div class='del'>-				s5 = REG_READ(ah, AR_ISR_S5_S);</div><div class='add'>+				s5 = REG_READ(ah, AR_ISR_S5_S(ah));</div><div class='ctx'> 			else</div><div class='ctx'> 				s5 = REG_READ(ah, AR_ISR_S5);</div><div class='ctx'> </div><div class='hunk'>@@ -344,8 +345,8 @@ static bool ar9003_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked,</div><div class='ctx'> 			ath_dbg(common, INTERRUPT,</div><div class='ctx'> 				"AR_INTR_SYNC_LOCAL_TIMEOUT\n");</div><div class='ctx'> </div><div class='del'>-		REG_WRITE(ah, AR_INTR_SYNC_CAUSE_CLR, sync_cause);</div><div class='del'>-		(void) REG_READ(ah, AR_INTR_SYNC_CAUSE_CLR);</div><div class='add'>+		REG_WRITE(ah, AR_INTR_SYNC_CAUSE_CLR(ah), sync_cause);</div><div class='add'>+		(void) REG_READ(ah, AR_INTR_SYNC_CAUSE_CLR(ah));</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -522,6 +523,8 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs,</div><div class='ctx'> 	rxs-&gt;rs_moreaggr = (rxsp-&gt;status11 &amp; AR_RxMoreAggr) ? 1 : 0;</div><div class='ctx'> 	rxs-&gt;rs_antenna = (MS(rxsp-&gt;status4, AR_RxAntenna) &amp; 0x7);</div><div class='ctx'> 	rxs-&gt;enc_flags |= (rxsp-&gt;status4 &amp; AR_GI) ? RX_ENC_FLAG_SHORT_GI : 0;</div><div class='add'>+	rxs-&gt;enc_flags |=</div><div class='add'>+		(rxsp-&gt;status4 &amp; AR_STBC) ? (1 &lt;&lt; RX_ENC_FLAG_STBC_SHIFT) : 0;</div><div class='ctx'> 	rxs-&gt;bw = (rxsp-&gt;status4 &amp; AR_2040) ? RATE_INFO_BW_40 : RATE_INFO_BW_20;</div><div class='ctx'> </div><div class='ctx'> 	rxs-&gt;evm0 = rxsp-&gt;status6;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mci.c b/drivers/net/wireless/ath/ath9k/ar9003_mci.c<br/>index 9899661f9a60..3f0543e55d9b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9003_mci.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9003_mci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9003_mci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/ar9003_mci.c</a></div><div class='hunk'>@@ -458,7 +458,7 @@ static void ar9003_mci_observation_set_up(struct ath_hw *ah)</div><div class='ctx'> 	} else</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL, AR_GPIO_JTAG_DISABLE);</div><div class='add'>+	REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL(ah), AR_GPIO_JTAG_DISABLE);</div><div class='ctx'> </div><div class='ctx'> 	REG_RMW_FIELD(ah, AR_PHY_GLB_CONTROL, AR_GLB_DS_JTAG_DISABLE, 1);</div><div class='ctx'> 	REG_RMW_FIELD(ah, AR_PHY_GLB_CONTROL, AR_GLB_WLAN_UART_INTF_EN, 0);</div><div class='hunk'>@@ -466,12 +466,12 @@ static void ar9003_mci_observation_set_up(struct ath_hw *ah)</div><div class='ctx'> </div><div class='ctx'> 	REG_RMW_FIELD(ah, AR_BTCOEX_CTRL2, AR_BTCOEX_CTRL2_GPIO_OBS_SEL, 0);</div><div class='ctx'> 	REG_RMW_FIELD(ah, AR_BTCOEX_CTRL2, AR_BTCOEX_CTRL2_MAC_BB_OBS_SEL, 1);</div><div class='del'>-	REG_WRITE(ah, AR_OBS, 0x4b);</div><div class='add'>+	REG_WRITE(ah, AR_OBS(ah), 0x4b);</div><div class='ctx'> 	REG_RMW_FIELD(ah, AR_DIAG_SW, AR_DIAG_OBS_PT_SEL1, 0x03);</div><div class='ctx'> 	REG_RMW_FIELD(ah, AR_DIAG_SW, AR_DIAG_OBS_PT_SEL2, 0x01);</div><div class='ctx'> 	REG_RMW_FIELD(ah, AR_MACMISC, AR_MACMISC_MISC_OBS_BUS_LSB, 0x02);</div><div class='ctx'> 	REG_RMW_FIELD(ah, AR_MACMISC, AR_MACMISC_MISC_OBS_BUS_MSB, 0x03);</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_TEST_CTL_STATUS,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_TEST_CTL_STATUS(ah),</div><div class='ctx'> 		      AR_PHY_TEST_CTL_DEBUGPORT_SEL, 0x07);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -585,7 +585,7 @@ static u32 ar9003_mci_wait_for_gpm(struct ath_hw *ah, u8 gpm_type,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='ctx'> 	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='del'>-	u32 *p_gpm = NULL, mismatch = 0, more_data;</div><div class='add'>+	u32 *p_gpm = NULL, more_data;</div><div class='ctx'> 	u32 offset;</div><div class='ctx'> 	u8 recv_type = 0, recv_opcode = 0;</div><div class='ctx'> 	bool b_is_bt_cal_done = (gpm_type == MCI_GPM_BT_CAL_DONE);</div><div class='hunk'>@@ -637,7 +637,7 @@ static u32 ar9003_mci_wait_for_gpm(struct ath_hw *ah, u8 gpm_type,</div><div class='ctx'> 		 * same time. Since BT's calibration doesn't happen</div><div class='ctx'> 		 * that often, we'll let BT completes calibration then</div><div class='ctx'> 		 * we continue to wait for cal_grant from BT.</div><div class='del'>-		 * Orginal: Wait BT_CAL_GRANT.</div><div class='add'>+		 * Original: Wait BT_CAL_GRANT.</div><div class='ctx'> 		 * New: Receive BT_CAL_REQ -&gt; send WLAN_CAL_GRANT-&gt;wait</div><div class='ctx'> 		 * BT_CAL_DONE -&gt; Wait BT_CAL_GRANT.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -656,7 +656,6 @@ static u32 ar9003_mci_wait_for_gpm(struct ath_hw *ah, u8 gpm_type,</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ath_dbg(common, MCI, "MCI GPM subtype not match 0x%x\n",</div><div class='ctx'> 				*(p_gpm + 1));</div><div class='del'>-			mismatch++;</div><div class='ctx'> 			ar9003_mci_process_gpm_extra(ah, recv_type,</div><div class='ctx'> 						     recv_opcode, p_gpm);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -748,7 +747,7 @@ int ar9003_mci_end_reset(struct ath_hw *ah, struct ath9k_channel *chan,</div><div class='ctx'> 	 * BT is sleeping. Check if BT wakes up during</div><div class='ctx'> 	 * WLAN calibration. If BT wakes up during</div><div class='ctx'> 	 * WLAN calibration, need to go through all</div><div class='del'>-	 * message exchanges again and recal.</div><div class='add'>+	 * message exchanges again and recalibrate.</div><div class='ctx'> 	 */</div><div class='ctx'> 	REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,</div><div class='ctx'> 		  (AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET |</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c<br/>index 34e100940284..83d993fff695 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9003_paprd.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9003_paprd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9003_paprd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/ar9003_paprd.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> void ar9003_paprd_enable(struct ath_hw *ah, bool val)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath9k_channel *chan = ah-&gt;curchan;</div><div class='del'>-	struct ar9300_eeprom *eep = &amp;ah-&gt;eeprom.ar9300_eep;</div><div class='add'>+	bool is2ghz = IS_CHAN_2GHZ(chan);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * 3 bits for modalHeader5G.papdRateMaskHt20</div><div class='hunk'>@@ -36,17 +36,17 @@ void ar9003_paprd_enable(struct ath_hw *ah, bool val)</div><div class='ctx'> 	 * -- disable PAPRD for lower band 5GHz</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	if (IS_CHAN_5GHZ(chan)) {</div><div class='add'>+	if (!is2ghz) {</div><div class='ctx'> 		if (chan-&gt;channel &gt;= UPPER_5G_SUB_BAND_START) {</div><div class='del'>-			if (le32_to_cpu(eep-&gt;modalHeader5G.papdRateMaskHt20)</div><div class='add'>+			if (ar9003_get_paprd_rate_mask_ht20(ah, is2ghz)</div><div class='ctx'> 								  &amp; BIT(30))</div><div class='ctx'> 				val = false;</div><div class='ctx'> 		} else if (chan-&gt;channel &gt;= MID_5G_SUB_BAND_START) {</div><div class='del'>-			if (le32_to_cpu(eep-&gt;modalHeader5G.papdRateMaskHt20)</div><div class='add'>+			if (ar9003_get_paprd_rate_mask_ht20(ah, is2ghz)</div><div class='ctx'> 								  &amp; BIT(29))</div><div class='ctx'> 				val = false;</div><div class='ctx'> 		} else {</div><div class='del'>-			if (le32_to_cpu(eep-&gt;modalHeader5G.papdRateMaskHt20)</div><div class='add'>+			if (ar9003_get_paprd_rate_mask_ht20(ah, is2ghz)</div><div class='ctx'> 								  &amp; BIT(28))</div><div class='ctx'> 				val = false;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -201,19 +201,19 @@ static int ar9003_paprd_setup_single_table(struct ath_hw *ah)</div><div class='ctx'> </div><div class='ctx'> 	ar9003_paprd_enable(ah, false);</div><div class='ctx'> </div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1(ah),</div><div class='ctx'> 		      AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_SKIP, 0x30);</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1(ah),</div><div class='ctx'> 		      AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_ENABLE, 1);</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1(ah),</div><div class='ctx'> 		      AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_TX_GAIN_FORCE, 1);</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1(ah),</div><div class='ctx'> 		      AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_RX_BB_GAIN_FORCE, 0);</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1(ah),</div><div class='ctx'> 		      AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_IQCORR_ENABLE, 0);</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1(ah),</div><div class='ctx'> 		      AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_AGC2_SETTLING, 28);</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1(ah),</div><div class='ctx'> 		      AR_PHY_PAPRD_TRAINER_CNTL1_CF_CF_PAPRD_TRAIN_ENABLE, 1);</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9485(ah)) {</div><div class='hunk'>@@ -229,15 +229,15 @@ static int ar9003_paprd_setup_single_table(struct ath_hw *ah)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL2,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL2(ah),</div><div class='ctx'> 		      AR_PHY_PAPRD_TRAINER_CNTL2_CF_PAPRD_INIT_RX_BB_GAIN, val);</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3(ah),</div><div class='ctx'> 		      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_FINE_CORR_LEN, 4);</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3(ah),</div><div class='ctx'> 		      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_COARSE_CORR_LEN, 4);</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3(ah),</div><div class='ctx'> 		      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_NUM_CORR_STAGES, 7);</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3(ah),</div><div class='ctx'> 		      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_MIN_LOOPBACK_DEL, 1);</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9485(ah) ||</div><div class='hunk'>@@ -246,10 +246,10 @@ static int ar9003_paprd_setup_single_table(struct ath_hw *ah)</div><div class='ctx'> 	    AR_SREV_9550(ah) ||</div><div class='ctx'> 	    AR_SREV_9330(ah) ||</div><div class='ctx'> 	    AR_SREV_9340(ah))</div><div class='del'>-		REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3(ah),</div><div class='ctx'> 			      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_QUICK_DROP, -3);</div><div class='ctx'> 	else</div><div class='del'>-		REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3(ah),</div><div class='ctx'> 			      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_QUICK_DROP, -6);</div><div class='ctx'> </div><div class='ctx'> 	val = -10;</div><div class='hunk'>@@ -257,16 +257,16 @@ static int ar9003_paprd_setup_single_table(struct ath_hw *ah)</div><div class='ctx'> 	if (IS_CHAN_2GHZ(ah-&gt;curchan) &amp;&amp; !AR_SREV_9462(ah) &amp;&amp; !AR_SREV_9565(ah))</div><div class='ctx'> 		val = -15;</div><div class='ctx'> </div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3(ah),</div><div class='ctx'> 		      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_ADC_DESIRED_SIZE,</div><div class='ctx'> 		      val);</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3(ah),</div><div class='ctx'> 		      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_BBTXMIX_DISABLE, 1);</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL4,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL4(ah),</div><div class='ctx'> 		      AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_SAFETY_DELTA, 0);</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL4,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL4(ah),</div><div class='ctx'> 		      AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_MIN_CORR, 400);</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL4,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL4(ah),</div><div class='ctx'> 		      AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_NUM_TRAIN_SAMPLES,</div><div class='ctx'> 		      100);</div><div class='ctx'> 	REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_0_B0,</div><div class='hunk'>@@ -313,7 +313,7 @@ static unsigned int ar9003_get_desired_gain(struct ath_hw *ah, int chain,</div><div class='ctx'> 	int desired_scale, desired_gain = 0;</div><div class='ctx'> 	u32 reg_olpc  = 0, reg_cl_gain  = 0;</div><div class='ctx'> </div><div class='del'>-	REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1,</div><div class='add'>+	REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1(ah),</div><div class='ctx'> 		    AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);</div><div class='ctx'> 	desired_scale = REG_READ_FIELD(ah, AR_PHY_TPC_12,</div><div class='ctx'> 				       AR_PHY_TPC_12_DESIRED_SCALE_HT40_5);</div><div class='hunk'>@@ -812,7 +812,7 @@ void ar9003_paprd_setup_gain_table(struct ath_hw *ah, int chain)</div><div class='ctx'> </div><div class='ctx'> 	ar9003_tx_force_gain(ah, gain_index);</div><div class='ctx'> </div><div class='del'>-	REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1,</div><div class='add'>+	REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1(ah),</div><div class='ctx'> 			AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ar9003_paprd_setup_gain_table);</div><div class='hunk'>@@ -833,7 +833,7 @@ static bool ar9003_paprd_retrain_pa_in(struct ath_hw *ah,</div><div class='ctx'> 	capdiv2g = REG_READ_FIELD(ah, AR_PHY_65NM_CH0_TXRF3,</div><div class='ctx'> 				  AR_PHY_65NM_CH0_TXRF3_CAPDIV2G);</div><div class='ctx'> </div><div class='del'>-	quick_drop = REG_READ_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,</div><div class='add'>+	quick_drop = REG_READ_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3(ah),</div><div class='ctx'> 				    AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_QUICK_DROP);</div><div class='ctx'> </div><div class='ctx'> 	if (quick_drop)</div><div class='hunk'>@@ -906,7 +906,7 @@ static bool ar9003_paprd_retrain_pa_in(struct ath_hw *ah,</div><div class='ctx'> </div><div class='ctx'> 	REG_RMW_FIELD(ah, AR_PHY_65NM_CH0_TXRF3,</div><div class='ctx'> 		      AR_PHY_65NM_CH0_TXRF3_CAPDIV2G, capdiv2g);</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3(ah),</div><div class='ctx'> 		      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_QUICK_DROP,</div><div class='ctx'> 		      quick_drop);</div><div class='ctx'> </div><div class='hunk'>@@ -932,14 +932,14 @@ int ar9003_paprd_create_curve(struct ath_hw *ah,</div><div class='ctx'> 	data_L = &amp;buf[0];</div><div class='ctx'> 	data_U = &amp;buf[48];</div><div class='ctx'> </div><div class='del'>-	REG_CLR_BIT(ah, AR_PHY_CHAN_INFO_MEMORY,</div><div class='add'>+	REG_CLR_BIT(ah, AR_PHY_CHAN_INFO_MEMORY(ah),</div><div class='ctx'> 		    AR_PHY_CHAN_INFO_MEMORY_CHANINFOMEM_S2_READ);</div><div class='ctx'> </div><div class='ctx'> 	reg = AR_PHY_CHAN_INFO_TAB_0;</div><div class='ctx'> 	for (i = 0; i &lt; 48; i++)</div><div class='ctx'> 		data_L[i] = REG_READ(ah, reg + (i &lt;&lt; 2));</div><div class='ctx'> </div><div class='del'>-	REG_SET_BIT(ah, AR_PHY_CHAN_INFO_MEMORY,</div><div class='add'>+	REG_SET_BIT(ah, AR_PHY_CHAN_INFO_MEMORY(ah),</div><div class='ctx'> 		    AR_PHY_CHAN_INFO_MEMORY_CHANINFOMEM_S2_READ);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 48; i++)</div><div class='hunk'>@@ -951,7 +951,7 @@ int ar9003_paprd_create_curve(struct ath_hw *ah,</div><div class='ctx'> 	if (ar9003_paprd_retrain_pa_in(ah, caldata, chain))</div><div class='ctx'> 		status = -EINPROGRESS;</div><div class='ctx'> </div><div class='del'>-	REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1,</div><div class='add'>+	REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1(ah),</div><div class='ctx'> 		    AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);</div><div class='ctx'> </div><div class='ctx'> 	kfree(buf);</div><div class='hunk'>@@ -977,14 +977,14 @@ bool ar9003_paprd_is_done(struct ath_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	int paprd_done, agc2_pwr;</div><div class='ctx'> </div><div class='del'>-	paprd_done = REG_READ_FIELD(ah, AR_PHY_PAPRD_TRAINER_STAT1,</div><div class='add'>+	paprd_done = REG_READ_FIELD(ah, AR_PHY_PAPRD_TRAINER_STAT1(ah),</div><div class='ctx'> 				AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9485(ah))</div><div class='ctx'> 		goto exit;</div><div class='ctx'> </div><div class='ctx'> 	if (paprd_done == 0x1) {</div><div class='del'>-		agc2_pwr = REG_READ_FIELD(ah, AR_PHY_PAPRD_TRAINER_STAT1,</div><div class='add'>+		agc2_pwr = REG_READ_FIELD(ah, AR_PHY_PAPRD_TRAINER_STAT1(ah),</div><div class='ctx'> 				AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_AGC2_PWR);</div><div class='ctx'> </div><div class='ctx'> 		ath_dbg(ath9k_hw_common(ah), CALIBRATE,</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c<br/>index daf30f9946b4..6274d1624261 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9003_phy.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9003_phy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9003_phy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/ar9003_phy.c</a></div><div class='hunk'>@@ -296,7 +296,7 @@ static void ar9003_hw_spur_mitigate_mrc_cck(struct ath_hw *ah,</div><div class='ctx'> </div><div class='ctx'> 			cck_spur_freq = cck_spur_freq &amp; 0xfffff;</div><div class='ctx'> </div><div class='del'>-			REG_RMW_FIELD(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+			REG_RMW_FIELD(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 				      AR_PHY_AGC_CONTROL_YCOK_MAX, 0x7);</div><div class='ctx'> 			REG_RMW_FIELD(ah, AR_PHY_CCK_SPUR_MIT,</div><div class='ctx'> 				      AR_PHY_CCK_SPUR_MIT_SPUR_RSSI_THR, 0x7f);</div><div class='hunk'>@@ -314,7 +314,7 @@ static void ar9003_hw_spur_mitigate_mrc_cck(struct ath_hw *ah,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 		      AR_PHY_AGC_CONTROL_YCOK_MAX, 0x5);</div><div class='ctx'> 	REG_RMW_FIELD(ah, AR_PHY_CCK_SPUR_MIT,</div><div class='ctx'> 		      AR_PHY_CCK_SPUR_MIT_USE_CCK_SPUR_MIT, 0x0);</div><div class='hunk'>@@ -352,7 +352,7 @@ static void ar9003_hw_spur_ofdm_clear(struct ath_hw *ah)</div><div class='ctx'> 		      AR_PHY_TIMING4_ENABLE_CHAN_MASK, 0);</div><div class='ctx'> 	REG_RMW_FIELD(ah, AR_PHY_PILOT_SPUR_MASK,</div><div class='ctx'> 		      AR_PHY_PILOT_SPUR_MASK_CF_PILOT_MASK_IDX_A, 0);</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_SPUR_MASK_A,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_SPUR_MASK_A(ah),</div><div class='ctx'> 		      AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_IDX_A, 0);</div><div class='ctx'> 	REG_RMW_FIELD(ah, AR_PHY_CHAN_SPUR_MASK,</div><div class='ctx'> 		      AR_PHY_CHAN_SPUR_MASK_CF_CHAN_MASK_IDX_A, 0);</div><div class='hunk'>@@ -360,7 +360,7 @@ static void ar9003_hw_spur_ofdm_clear(struct ath_hw *ah)</div><div class='ctx'> 		      AR_PHY_PILOT_SPUR_MASK_CF_PILOT_MASK_A, 0);</div><div class='ctx'> 	REG_RMW_FIELD(ah, AR_PHY_CHAN_SPUR_MASK,</div><div class='ctx'> 		      AR_PHY_CHAN_SPUR_MASK_CF_CHAN_MASK_A, 0);</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_SPUR_MASK_A,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_SPUR_MASK_A(ah),</div><div class='ctx'> 		      AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_A, 0);</div><div class='ctx'> 	REG_RMW_FIELD(ah, AR_PHY_SPUR_REG,</div><div class='ctx'> 		      AR_PHY_SPUR_REG_MASK_RATE_CNTL, 0);</div><div class='hunk'>@@ -419,7 +419,7 @@ static void ar9003_hw_spur_ofdm(struct ath_hw *ah,</div><div class='ctx'> 		      AR_PHY_TIMING4_ENABLE_CHAN_MASK, 0x1);</div><div class='ctx'> 	REG_RMW_FIELD(ah, AR_PHY_PILOT_SPUR_MASK,</div><div class='ctx'> 		      AR_PHY_PILOT_SPUR_MASK_CF_PILOT_MASK_IDX_A, mask_index);</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_SPUR_MASK_A,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_SPUR_MASK_A(ah),</div><div class='ctx'> 		      AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_IDX_A, mask_index);</div><div class='ctx'> 	REG_RMW_FIELD(ah, AR_PHY_CHAN_SPUR_MASK,</div><div class='ctx'> 		      AR_PHY_CHAN_SPUR_MASK_CF_CHAN_MASK_IDX_A, mask_index);</div><div class='hunk'>@@ -427,7 +427,7 @@ static void ar9003_hw_spur_ofdm(struct ath_hw *ah,</div><div class='ctx'> 		      AR_PHY_PILOT_SPUR_MASK_CF_PILOT_MASK_A, 0xc);</div><div class='ctx'> 	REG_RMW_FIELD(ah, AR_PHY_CHAN_SPUR_MASK,</div><div class='ctx'> 		      AR_PHY_CHAN_SPUR_MASK_CF_CHAN_MASK_A, 0xc);</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_SPUR_MASK_A,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_SPUR_MASK_A(ah),</div><div class='ctx'> 		      AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_A, 0xa0);</div><div class='ctx'> 	REG_RMW_FIELD(ah, AR_PHY_SPUR_REG,</div><div class='ctx'> 		      AR_PHY_SPUR_REG_MASK_RATE_CNTL, 0xff);</div><div class='hunk'>@@ -449,7 +449,7 @@ static void ar9003_hw_spur_ofdm_9565(struct ath_hw *ah,</div><div class='ctx'> 		      mask_index);</div><div class='ctx'> </div><div class='ctx'> 	/* A == B */</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_SPUR_MASK_B,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_SPUR_MASK_B(ah),</div><div class='ctx'> 		      AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_IDX_A,</div><div class='ctx'> 		      mask_index);</div><div class='ctx'> </div><div class='hunk'>@@ -462,7 +462,7 @@ static void ar9003_hw_spur_ofdm_9565(struct ath_hw *ah,</div><div class='ctx'> 		      AR_PHY_CHAN_SPUR_MASK_CF_CHAN_MASK_B, 0xe);</div><div class='ctx'> </div><div class='ctx'> 	/* A == B */</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_SPUR_MASK_B,</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_SPUR_MASK_B(ah),</div><div class='ctx'> 		      AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_A, 0xa0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -523,21 +523,10 @@ static void ar9003_hw_spur_mitigate_ofdm(struct ath_hw *ah,</div><div class='ctx'> 	int synth_freq;</div><div class='ctx'> 	int range = 10;</div><div class='ctx'> 	int freq_offset = 0;</div><div class='del'>-	int mode;</div><div class='del'>-	u8* spurChansPtr;</div><div class='add'>+	u8 *spur_fbin_ptr = ar9003_get_spur_chan_ptr(ah, IS_CHAN_2GHZ(chan));</div><div class='ctx'> 	unsigned int i;</div><div class='del'>-	struct ar9300_eeprom *eep = &amp;ah-&gt;eeprom.ar9300_eep;</div><div class='del'>-</div><div class='del'>-	if (IS_CHAN_5GHZ(chan)) {</div><div class='del'>-		spurChansPtr = &amp;(eep-&gt;modalHeader5G.spurChans[0]);</div><div class='del'>-		mode = 0;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		spurChansPtr = &amp;(eep-&gt;modalHeader2G.spurChans[0]);</div><div class='del'>-		mode = 1;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (spurChansPtr[0] == 0)</div><div class='add'>+	if (spur_fbin_ptr[0] == 0)</div><div class='ctx'> 		return; /* No spur in the mode */</div><div class='ctx'> </div><div class='ctx'> 	if (IS_CHAN_HT40(chan)) {</div><div class='hunk'>@@ -554,16 +543,18 @@ static void ar9003_hw_spur_mitigate_ofdm(struct ath_hw *ah,</div><div class='ctx'> </div><div class='ctx'> 	ar9003_hw_spur_ofdm_clear(ah);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; AR_EEPROM_MODAL_SPURS &amp;&amp; spurChansPtr[i]; i++) {</div><div class='del'>-		freq_offset = ath9k_hw_fbin2freq(spurChansPtr[i], mode);</div><div class='add'>+	for (i = 0; i &lt; AR_EEPROM_MODAL_SPURS &amp;&amp; spur_fbin_ptr[i]; i++) {</div><div class='add'>+		freq_offset = ath9k_hw_fbin2freq(spur_fbin_ptr[i],</div><div class='add'>+						 IS_CHAN_2GHZ(chan));</div><div class='ctx'> 		freq_offset -= synth_freq;</div><div class='ctx'> 		if (abs(freq_offset) &lt; range) {</div><div class='ctx'> 			ar9003_hw_spur_ofdm_work(ah, chan, freq_offset,</div><div class='ctx'> 						 range, synth_freq);</div><div class='ctx'> </div><div class='ctx'> 			if (AR_SREV_9565(ah) &amp;&amp; (i &lt; 4)) {</div><div class='del'>-				freq_offset = ath9k_hw_fbin2freq(spurChansPtr[i + 1],</div><div class='del'>-								 mode);</div><div class='add'>+				freq_offset =</div><div class='add'>+					ath9k_hw_fbin2freq(spur_fbin_ptr[i + 1],</div><div class='add'>+							   IS_CHAN_2GHZ(chan));</div><div class='ctx'> 				freq_offset -= synth_freq;</div><div class='ctx'> 				if (abs(freq_offset) &lt; range)</div><div class='ctx'> 					ar9003_hw_spur_ofdm_9565(ah, freq_offset);</div><div class='hunk'>@@ -719,7 +710,7 @@ static void ar9003_hw_override_ini(struct ath_hw *ah)</div><div class='ctx'> 		REG_WRITE(ah, AR_GLB_SWREG_DISCONT_MODE,</div><div class='ctx'> 			  AR_GLB_SWREG_DISCONT_EN_BT_WLAN);</div><div class='ctx'> </div><div class='del'>-		if (REG_READ_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_0,</div><div class='add'>+		if (REG_READ_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_0(ah),</div><div class='ctx'> 				   AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL))</div><div class='ctx'> 			ah-&gt;enabled_cals |= TX_IQ_CAL;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -735,11 +726,11 @@ static void ar9003_hw_override_ini(struct ath_hw *ah)</div><div class='ctx'> 	if (AR_SREV_9340(ah) || AR_SREV_9531(ah) || AR_SREV_9550(ah) ||</div><div class='ctx'> 	    AR_SREV_9561(ah)) {</div><div class='ctx'> 		if (ah-&gt;is_clk_25mhz) {</div><div class='del'>-			REG_WRITE(ah, AR_RTC_DERIVED_CLK, 0x17c &lt;&lt; 1);</div><div class='add'>+			REG_WRITE(ah, AR_RTC_DERIVED_CLK(ah), 0x17c &lt;&lt; 1);</div><div class='ctx'> 			REG_WRITE(ah, AR_SLP32_MODE, 0x0010f3d7);</div><div class='ctx'> 			REG_WRITE(ah, AR_SLP32_INC, 0x0001e7ae);</div><div class='ctx'> 		} else {</div><div class='del'>-			REG_WRITE(ah, AR_RTC_DERIVED_CLK, 0x261 &lt;&lt; 1);</div><div class='add'>+			REG_WRITE(ah, AR_RTC_DERIVED_CLK(ah), 0x261 &lt;&lt; 1);</div><div class='ctx'> 			REG_WRITE(ah, AR_SLP32_MODE, 0x0010f400);</div><div class='ctx'> 			REG_WRITE(ah, AR_SLP32_INC, 0x0001e800);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -775,10 +766,10 @@ static void ar9003_hw_prog_ini(struct ath_hw *ah,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ar9550_hw_get_modes_txgain_index(struct ath_hw *ah,</div><div class='add'>+static u32 ar9550_hw_get_modes_txgain_index(struct ath_hw *ah,</div><div class='ctx'> 					    struct ath9k_channel *chan)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	u32 ret;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_CHAN_2GHZ(chan)) {</div><div class='ctx'> 		if (IS_CHAN_HT40(chan))</div><div class='hunk'>@@ -800,7 +791,7 @@ static int ar9550_hw_get_modes_txgain_index(struct ath_hw *ah,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ar9561_hw_get_modes_txgain_index(struct ath_hw *ah,</div><div class='add'>+static u32 ar9561_hw_get_modes_txgain_index(struct ath_hw *ah,</div><div class='ctx'> 					    struct ath9k_channel *chan)</div><div class='ctx'> {</div><div class='ctx'> 	if (IS_CHAN_2GHZ(chan)) {</div><div class='hunk'>@@ -925,7 +916,7 @@ static int ar9003_hw_process_ini(struct ath_hw *ah,</div><div class='ctx'> 	 * TXGAIN initvals.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (AR_SREV_9550(ah) || AR_SREV_9531(ah) || AR_SREV_9561(ah)) {</div><div class='del'>-		int modes_txgain_index = 1;</div><div class='add'>+		u32 modes_txgain_index = 1;</div><div class='ctx'> </div><div class='ctx'> 		if (AR_SREV_9550(ah))</div><div class='ctx'> 			modes_txgain_index = ar9550_hw_get_modes_txgain_index(ah, chan);</div><div class='hunk'>@@ -934,9 +925,6 @@ static int ar9003_hw_process_ini(struct ath_hw *ah,</div><div class='ctx'> 			modes_txgain_index =</div><div class='ctx'> 				ar9561_hw_get_modes_txgain_index(ah, chan);</div><div class='ctx'> </div><div class='del'>-		if (modes_txgain_index &lt; 0)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 		REG_WRITE_ARRAY(&amp;ah-&gt;iniModesTxGain, modes_txgain_index,</div><div class='ctx'> 				regWrites);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1753,7 +1741,7 @@ static void ar9003_hw_spectral_scan_config(struct ath_hw *ah,</div><div class='ctx'> 	REG_SET_BIT(ah, AR_PHY_RADAR_0, AR_PHY_RADAR_0_FFT_ENA);</div><div class='ctx'> 	REG_SET_BIT(ah, AR_PHY_SPECTRAL_SCAN, AR_PHY_SPECTRAL_SCAN_ENABLE);</div><div class='ctx'> </div><div class='del'>-	/* on AR93xx and newer, count = 0 will make the the chip send</div><div class='add'>+	/* on AR93xx and newer, count = 0 will make the chip send</div><div class='ctx'> 	 * spectral samples endlessly. Check if this really was intended,</div><div class='ctx'> 	 * and fix otherwise.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1804,7 +1792,7 @@ static void ar9003_hw_spectral_scan_wait(struct ath_hw *ah)</div><div class='ctx'> </div><div class='ctx'> static void ar9003_hw_tx99_start(struct ath_hw *ah, u32 qnum)</div><div class='ctx'> {</div><div class='del'>-	REG_SET_BIT(ah, AR_PHY_TEST, PHY_AGC_CLR);</div><div class='add'>+	REG_SET_BIT(ah, AR_PHY_TEST(ah), PHY_AGC_CLR);</div><div class='ctx'> 	REG_CLR_BIT(ah, AR_DIAG_SW, AR_DIAG_RX_DIS);</div><div class='ctx'> 	REG_WRITE(ah, AR_CR, AR_CR_RXD);</div><div class='ctx'> 	REG_WRITE(ah, AR_DLCL_IFS(qnum), 0);</div><div class='hunk'>@@ -1817,7 +1805,7 @@ static void ar9003_hw_tx99_start(struct ath_hw *ah, u32 qnum)</div><div class='ctx'> </div><div class='ctx'> static void ar9003_hw_tx99_stop(struct ath_hw *ah)</div><div class='ctx'> {</div><div class='del'>-	REG_CLR_BIT(ah, AR_PHY_TEST, PHY_AGC_CLR);</div><div class='add'>+	REG_CLR_BIT(ah, AR_PHY_TEST(ah), PHY_AGC_CLR);</div><div class='ctx'> 	REG_SET_BIT(ah, AR_DIAG_SW, AR_DIAG_RX_DIS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.h b/drivers/net/wireless/ath/ath9k/ar9003_phy.h<br/>index a171dbb29fbb..e13873fb8e2f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9003_phy.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9003_phy.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9003_phy.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/ar9003_phy.h</a></div><div class='hunk'>@@ -246,7 +246,7 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * MRC Feild Definitions</div><div class='add'>+ * MRC Field Definitions</div><div class='ctx'>  */</div><div class='ctx'> #define AR_PHY_SGI_DSC_MAN   0x0007FFF0</div><div class='ctx'> #define AR_PHY_SGI_DSC_MAN_S 4</div><div class='hunk'>@@ -454,8 +454,8 @@</div><div class='ctx'> #define AR_PHY_GEN_CTRL          (AR_SM_BASE + 0x4)</div><div class='ctx'> #define AR_PHY_MODE              (AR_SM_BASE + 0x8)</div><div class='ctx'> #define AR_PHY_ACTIVE            (AR_SM_BASE + 0xc)</div><div class='del'>-#define AR_PHY_SPUR_MASK_A       (AR_SM_BASE + (AR_SREV_9561(ah) ? 0x18 : 0x20))</div><div class='del'>-#define AR_PHY_SPUR_MASK_B       (AR_SM_BASE + (AR_SREV_9561(ah) ? 0x1c : 0x24))</div><div class='add'>+#define AR_PHY_SPUR_MASK_A(_ah)  (AR_SM_BASE + (AR_SREV_9561(_ah) ? 0x18 : 0x20))</div><div class='add'>+#define AR_PHY_SPUR_MASK_B(_ah)  (AR_SM_BASE + (AR_SREV_9561(_ah) ? 0x1c : 0x24))</div><div class='ctx'> #define AR_PHY_SPECTRAL_SCAN     (AR_SM_BASE + 0x28)</div><div class='ctx'> #define AR_PHY_RADAR_BW_FILTER   (AR_SM_BASE + 0x2c)</div><div class='ctx'> #define AR_PHY_SEARCH_START_DELAY (AR_SM_BASE + 0x30)</div><div class='hunk'>@@ -498,7 +498,7 @@</div><div class='ctx'> #define AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_A                       0x3FF</div><div class='ctx'> #define AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_A_S                     0</div><div class='ctx'> </div><div class='del'>-#define AR_PHY_TEST              (AR_SM_BASE + (AR_SREV_9561(ah) ? 0x15c : 0x160))</div><div class='add'>+#define AR_PHY_TEST(_ah)         (AR_SM_BASE + (AR_SREV_9561(_ah) ? 0x15c : 0x160))</div><div class='ctx'> </div><div class='ctx'> #define AR_PHY_TEST_BBB_OBS_SEL       0x780000</div><div class='ctx'> #define AR_PHY_TEST_BBB_OBS_SEL_S     19</div><div class='hunk'>@@ -509,7 +509,7 @@</div><div class='ctx'> #define AR_PHY_TEST_CHAIN_SEL      0xC0000000</div><div class='ctx'> #define AR_PHY_TEST_CHAIN_SEL_S    30</div><div class='ctx'> </div><div class='del'>-#define AR_PHY_TEST_CTL_STATUS   (AR_SM_BASE + (AR_SREV_9561(ah) ? 0x160 : 0x164))</div><div class='add'>+#define AR_PHY_TEST_CTL_STATUS(_ah) (AR_SM_BASE + (AR_SREV_9561(_ah) ? 0x160 : 0x164))</div><div class='ctx'> #define AR_PHY_TEST_CTL_TSTDAC_EN         0x1</div><div class='ctx'> #define AR_PHY_TEST_CTL_TSTDAC_EN_S       0</div><div class='ctx'> #define AR_PHY_TEST_CTL_TX_OBS_SEL        0x1C</div><div class='hunk'>@@ -524,22 +524,22 @@</div><div class='ctx'> #define AR_PHY_TEST_CTL_DEBUGPORT_SEL_S	  29</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define AR_PHY_TSTDAC            (AR_SM_BASE + (AR_SREV_9561(ah) ? 0x164 : 0x168))</div><div class='add'>+#define AR_PHY_TSTDAC(_ah)       (AR_SM_BASE + (AR_SREV_9561(_ah) ? 0x164 : 0x168))</div><div class='ctx'> </div><div class='del'>-#define AR_PHY_CHAN_STATUS       (AR_SM_BASE + (AR_SREV_9561(ah) ? 0x168 : 0x16c))</div><div class='add'>+#define AR_PHY_CHAN_STATUS(_ah)  (AR_SM_BASE + (AR_SREV_9561(_ah) ? 0x168 : 0x16c))</div><div class='ctx'> </div><div class='del'>-#define AR_PHY_CHAN_INFO_MEMORY (AR_SM_BASE + (AR_SREV_9561(ah) ? 0x16c : 0x170))</div><div class='add'>+#define AR_PHY_CHAN_INFO_MEMORY(_ah) (AR_SM_BASE + (AR_SREV_9561(_ah) ? 0x16c : 0x170))</div><div class='ctx'> #define AR_PHY_CHAN_INFO_MEMORY_CHANINFOMEM_S2_READ	0x00000008</div><div class='ctx'> #define AR_PHY_CHAN_INFO_MEMORY_CHANINFOMEM_S2_READ_S	3</div><div class='ctx'> </div><div class='del'>-#define AR_PHY_CHNINFO_NOISEPWR  (AR_SM_BASE + (AR_SREV_9561(ah) ? 0x170 : 0x174))</div><div class='del'>-#define AR_PHY_CHNINFO_GAINDIFF  (AR_SM_BASE + (AR_SREV_9561(ah) ? 0x174 : 0x178))</div><div class='del'>-#define AR_PHY_CHNINFO_FINETIM   (AR_SM_BASE + (AR_SREV_9561(ah) ? 0x178 : 0x17c))</div><div class='del'>-#define AR_PHY_CHAN_INFO_GAIN_0  (AR_SM_BASE + (AR_SREV_9561(ah) ? 0x17c : 0x180))</div><div class='del'>-#define AR_PHY_SCRAMBLER_SEED    (AR_SM_BASE + (AR_SREV_9561(ah) ? 0x184 : 0x190))</div><div class='del'>-#define AR_PHY_CCK_TX_CTRL       (AR_SM_BASE + (AR_SREV_9561(ah) ? 0x188 : 0x194))</div><div class='add'>+#define AR_PHY_CHNINFO_NOISEPWR(_ah)  (AR_SM_BASE + (AR_SREV_9561(_ah) ? 0x170 : 0x174))</div><div class='add'>+#define AR_PHY_CHNINFO_GAINDIFF(_ah)  (AR_SM_BASE + (AR_SREV_9561(_ah) ? 0x174 : 0x178))</div><div class='add'>+#define AR_PHY_CHNINFO_FINETIM(_ah)   (AR_SM_BASE + (AR_SREV_9561(_ah) ? 0x178 : 0x17c))</div><div class='add'>+#define AR_PHY_CHAN_INFO_GAIN_0(_ah)  (AR_SM_BASE + (AR_SREV_9561(_ah) ? 0x17c : 0x180))</div><div class='add'>+#define AR_PHY_SCRAMBLER_SEED(_ah)    (AR_SM_BASE + (AR_SREV_9561(_ah) ? 0x184 : 0x190))</div><div class='add'>+#define AR_PHY_CCK_TX_CTRL(_ah)       (AR_SM_BASE + (AR_SREV_9561(_ah) ? 0x188 : 0x194))</div><div class='ctx'> </div><div class='del'>-#define AR_PHY_HEAVYCLIP_CTL     (AR_SM_BASE + (AR_SREV_9561(ah) ? 0x198 : 0x1a4))</div><div class='add'>+#define AR_PHY_HEAVYCLIP_CTL(_ah) (AR_SM_BASE + (AR_SREV_9561(_ah) ? 0x198 : 0x1a4))</div><div class='ctx'> #define AR_PHY_HEAVYCLIP_20      (AR_SM_BASE + 0x1a8)</div><div class='ctx'> #define AR_PHY_HEAVYCLIP_40      (AR_SM_BASE + 0x1ac)</div><div class='ctx'> #define AR_PHY_HEAVYCLIP_1	 (AR_SM_BASE + 0x19c)</div><div class='hunk'>@@ -611,16 +611,16 @@</div><div class='ctx'> </div><div class='ctx'> #define AR_PHY_TXGAIN_TABLE      (AR_SM_BASE + 0x300)</div><div class='ctx'> </div><div class='del'>-#define AR_PHY_TX_IQCAL_CONTROL_0   (AR_SM_BASE + (AR_SREV_9485(ah) ? \</div><div class='add'>+#define AR_PHY_TX_IQCAL_CONTROL_0(_ah)   (AR_SM_BASE + (AR_SREV_9485(_ah) ? \</div><div class='ctx'> 						 0x3c4 : 0x444))</div><div class='del'>-#define AR_PHY_TX_IQCAL_CONTROL_1   (AR_SM_BASE + (AR_SREV_9485(ah) ? \</div><div class='add'>+#define AR_PHY_TX_IQCAL_CONTROL_1(_ah)   (AR_SM_BASE + (AR_SREV_9485(_ah) ? \</div><div class='ctx'> 						 0x3c8 : 0x448))</div><div class='del'>-#define AR_PHY_TX_IQCAL_START       (AR_SM_BASE + (AR_SREV_9485(ah) ? \</div><div class='add'>+#define AR_PHY_TX_IQCAL_START(_ah)       (AR_SM_BASE + (AR_SREV_9485(_ah) ? \</div><div class='ctx'> 						 0x3c4 : 0x440))</div><div class='del'>-#define AR_PHY_TX_IQCAL_STATUS_B0   (AR_SM_BASE + (AR_SREV_9485(ah) ? \</div><div class='add'>+#define AR_PHY_TX_IQCAL_STATUS_B0(_ah)   (AR_SM_BASE + (AR_SREV_9485(_ah) ? \</div><div class='ctx'> 						 0x3f0 : 0x48c))</div><div class='del'>-#define AR_PHY_TX_IQCAL_CORR_COEFF_B0(_i)    (AR_SM_BASE + \</div><div class='del'>-					     (AR_SREV_9485(ah) ? \</div><div class='add'>+#define AR_PHY_TX_IQCAL_CORR_COEFF_B0(_ah, _i)    (AR_SM_BASE + \</div><div class='add'>+					     (AR_SREV_9485(_ah) ? \</div><div class='ctx'> 					      0x3d0 : 0x450) + ((_i) &lt;&lt; 2))</div><div class='ctx'> #define AR_PHY_RTT_CTRL			(AR_SM_BASE + 0x380)</div><div class='ctx'> </div><div class='hunk'>@@ -684,8 +684,8 @@</div><div class='ctx'> #define AR_PHY_65NM_CH0_RXTX2_SYNTHOVR_MASK        0x00000008</div><div class='ctx'> #define AR_PHY_65NM_CH0_RXTX2_SYNTHOVR_MASK_S      3</div><div class='ctx'> </div><div class='del'>-#define AR_CH0_TOP	(AR_SREV_9300(ah) ? 0x16288 : \</div><div class='del'>-			 (((AR_SREV_9462(ah) || AR_SREV_9565(ah)) ? 0x1628c : 0x16280)))</div><div class='add'>+#define AR_CH0_TOP(_ah)	(AR_SREV_9300(_ah) ? 0x16288 : \</div><div class='add'>+			 (((AR_SREV_9462(_ah) || AR_SREV_9565(_ah)) ? 0x1628c : 0x16280)))</div><div class='ctx'> #define AR_CH0_TOP_XPABIASLVL (AR_SREV_9550(ah) ? 0x3c0 : 0x300)</div><div class='ctx'> #define AR_CH0_TOP_XPABIASLVL_S (AR_SREV_9550(ah) ? 6 : 8)</div><div class='ctx'> </div><div class='hunk'>@@ -705,8 +705,8 @@</div><div class='ctx'> #define AR_SWITCH_TABLE_ALL (0xfff)</div><div class='ctx'> #define AR_SWITCH_TABLE_ALL_S (0)</div><div class='ctx'> </div><div class='del'>-#define AR_CH0_THERM       (AR_SREV_9300(ah) ? 0x16290 :\</div><div class='del'>-			    ((AR_SREV_9462(ah) || AR_SREV_9565(ah)) ? 0x16294 : 0x1628c))</div><div class='add'>+#define AR_CH0_THERM(_ah)  (AR_SREV_9300(_ah) ? 0x16290 :\</div><div class='add'>+			    ((AR_SREV_9462(_ah) || AR_SREV_9565(_ah)) ? 0x16294 : 0x1628c))</div><div class='ctx'> #define AR_CH0_THERM_XPABIASLVL_MSB 0x3</div><div class='ctx'> #define AR_CH0_THERM_XPABIASLVL_MSB_S 0</div><div class='ctx'> #define AR_CH0_THERM_XPASHORT2GND 0x4</div><div class='hunk'>@@ -717,26 +717,26 @@</div><div class='ctx'> #define AR_CH0_THERM_SAR_ADC_OUT   0x0000ff00</div><div class='ctx'> #define AR_CH0_THERM_SAR_ADC_OUT_S 8</div><div class='ctx'> </div><div class='del'>-#define AR_CH0_TOP2		(AR_SREV_9300(ah) ? 0x1628c : \</div><div class='del'>-					(AR_SREV_9462(ah) ? 0x16290 : 0x16284))</div><div class='add'>+#define AR_CH0_TOP2(_ah)		(AR_SREV_9300(_ah) ? 0x1628c : \</div><div class='add'>+					(AR_SREV_9462(_ah) ? 0x16290 : 0x16284))</div><div class='ctx'> #define AR_CH0_TOP2_XPABIASLVL		(AR_SREV_9561(ah) ? 0x1e00 : 0xf000)</div><div class='del'>-#define AR_CH0_TOP2_XPABIASLVL_S	12</div><div class='add'>+#define AR_CH0_TOP2_XPABIASLVL_S	(AR_SREV_9561(ah) ? 9 : 12)</div><div class='ctx'> </div><div class='del'>-#define AR_CH0_XTAL		(AR_SREV_9300(ah) ? 0x16294 : \</div><div class='del'>-				 ((AR_SREV_9462(ah) || AR_SREV_9565(ah)) ? 0x16298 : \</div><div class='del'>-				  (AR_SREV_9561(ah) ? 0x162c0 : 0x16290)))</div><div class='add'>+#define AR_CH0_XTAL(_ah)	(AR_SREV_9300(_ah) ? 0x16294 : \</div><div class='add'>+				 ((AR_SREV_9462(_ah) || AR_SREV_9565(_ah)) ? 0x16298 : \</div><div class='add'>+				  (AR_SREV_9561(_ah) ? 0x162c0 : 0x16290)))</div><div class='ctx'> #define AR_CH0_XTAL_CAPINDAC	0x7f000000</div><div class='ctx'> #define AR_CH0_XTAL_CAPINDAC_S	24</div><div class='ctx'> #define AR_CH0_XTAL_CAPOUTDAC	0x00fe0000</div><div class='ctx'> #define AR_CH0_XTAL_CAPOUTDAC_S	17</div><div class='ctx'> </div><div class='del'>-#define AR_PHY_PMU1		((AR_SREV_9462(ah) || AR_SREV_9565(ah)) ? 0x16340 : \</div><div class='del'>-				 (AR_SREV_9561(ah) ? 0x16cc0 : 0x16c40))</div><div class='add'>+#define AR_PHY_PMU1(_ah)	((AR_SREV_9462(_ah) || AR_SREV_9565(_ah)) ? 0x16340 : \</div><div class='add'>+				 (AR_SREV_9561(_ah) ? 0x16cc0 : 0x16c40))</div><div class='ctx'> #define AR_PHY_PMU1_PWD		0x1</div><div class='ctx'> #define AR_PHY_PMU1_PWD_S	0</div><div class='ctx'> </div><div class='del'>-#define AR_PHY_PMU2		((AR_SREV_9462(ah) || AR_SREV_9565(ah)) ? 0x16344 : \</div><div class='del'>-				 (AR_SREV_9561(ah) ? 0x16cc4 : 0x16c44))</div><div class='add'>+#define AR_PHY_PMU2(_ah)	((AR_SREV_9462(_ah) || AR_SREV_9565(_ah)) ? 0x16344 : \</div><div class='add'>+				 (AR_SREV_9561(_ah) ? 0x16cc4 : 0x16c44))</div><div class='ctx'> #define AR_PHY_PMU2_PGM		0x00200000</div><div class='ctx'> #define AR_PHY_PMU2_PGM_S	21</div><div class='ctx'> </div><div class='hunk'>@@ -851,8 +851,6 @@</div><div class='ctx'> #define AR_PHY_TXGAIN_FORCED_TXBB1DBGAIN  0x0000000e</div><div class='ctx'> #define AR_PHY_TXGAIN_FORCED_TXBB1DBGAIN_S 1</div><div class='ctx'> </div><div class='del'>-#define AR_PHY_POWER_TX_RATE1   0x9934</div><div class='del'>-#define AR_PHY_POWER_TX_RATE2   0x9938</div><div class='ctx'> #define AR_PHY_POWER_TX_RATE_MAX    0x993c</div><div class='ctx'> #define AR_PHY_POWER_TX_RATE_MAX_TPC_ENABLE 0x00000040</div><div class='ctx'> #define PHY_AGC_CLR             0x10000000</div><div class='hunk'>@@ -974,7 +972,7 @@</div><div class='ctx'> #define AR_PHY_TPC_5_B1         (AR_SM1_BASE + 0x208)</div><div class='ctx'> #define AR_PHY_TPC_6_B1         (AR_SM1_BASE + 0x20c)</div><div class='ctx'> #define AR_PHY_TPC_11_B1        (AR_SM1_BASE + 0x220)</div><div class='del'>-#define AR_PHY_PDADC_TAB_1	(AR_SM1_BASE + (AR_SREV_9462_20_OR_LATER(ah) ? \</div><div class='add'>+#define AR_PHY_PDADC_TAB_1(_ah)	(AR_SM1_BASE + (AR_SREV_9462_20_OR_LATER(_ah) ? \</div><div class='ctx'> 					0x280 : 0x240))</div><div class='ctx'> #define AR_PHY_TPC_19_B1	(AR_SM1_BASE + 0x240)</div><div class='ctx'> #define AR_PHY_TPC_19_B1_ALPHA_THERM		0xff</div><div class='hunk'>@@ -1041,13 +1039,6 @@</div><div class='ctx'> </div><div class='ctx'> #define AR_PHY_TX_IQCAL_STATUS_B2_FAILED    0x00000001</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * AGC 3 Register Map</div><div class='del'>- */</div><div class='del'>-#define AR_AGC3_BASE	0xce00</div><div class='del'>-</div><div class='del'>-#define AR_PHY_RSSI_3            (AR_AGC3_BASE + 0x180)</div><div class='del'>-</div><div class='ctx'> /* GLB Registers */</div><div class='ctx'> #define AR_GLB_BASE	0x20000</div><div class='ctx'> #define AR_GLB_GPIO_CONTROL	(AR_GLB_BASE)</div><div class='hunk'>@@ -1152,7 +1143,7 @@</div><div class='ctx'> #define AR_PHY_PAPRD_CTRL1_PAPRD_MAG_SCALE_FACT		0x0ffe0000</div><div class='ctx'> #define AR_PHY_PAPRD_CTRL1_PAPRD_MAG_SCALE_FACT_S	17</div><div class='ctx'> </div><div class='del'>-#define AR_PHY_PAPRD_TRAINER_CNTL1 (AR_SM_BASE + (AR_SREV_9485(ah) ? 0x580 : 0x490))</div><div class='add'>+#define AR_PHY_PAPRD_TRAINER_CNTL1(_ah) (AR_SM_BASE + (AR_SREV_9485(_ah) ? 0x580 : 0x490))</div><div class='ctx'> </div><div class='ctx'> #define AR_PHY_PAPRD_TRAINER_CNTL1_CF_CF_PAPRD_TRAIN_ENABLE	0x00000001</div><div class='ctx'> #define AR_PHY_PAPRD_TRAINER_CNTL1_CF_CF_PAPRD_TRAIN_ENABLE_S	0</div><div class='hunk'>@@ -1169,12 +1160,12 @@</div><div class='ctx'> #define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_SKIP		0x0003f000</div><div class='ctx'> #define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_SKIP_S		12</div><div class='ctx'> </div><div class='del'>-#define AR_PHY_PAPRD_TRAINER_CNTL2 (AR_SM_BASE + (AR_SREV_9485(ah) ? 0x584 : 0x494))</div><div class='add'>+#define AR_PHY_PAPRD_TRAINER_CNTL2(_ah) (AR_SM_BASE + (AR_SREV_9485(_ah) ? 0x584 : 0x494))</div><div class='ctx'> </div><div class='ctx'> #define AR_PHY_PAPRD_TRAINER_CNTL2_CF_PAPRD_INIT_RX_BB_GAIN	0xFFFFFFFF</div><div class='ctx'> #define AR_PHY_PAPRD_TRAINER_CNTL2_CF_PAPRD_INIT_RX_BB_GAIN_S	0</div><div class='ctx'> </div><div class='del'>-#define AR_PHY_PAPRD_TRAINER_CNTL3 (AR_SM_BASE + (AR_SREV_9485(ah) ? 0x588 : 0x498))</div><div class='add'>+#define AR_PHY_PAPRD_TRAINER_CNTL3(_ah) (AR_SM_BASE + (AR_SREV_9485(_ah) ? 0x588 : 0x498))</div><div class='ctx'> </div><div class='ctx'> #define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_ADC_DESIRED_SIZE	0x0000003f</div><div class='ctx'> #define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_ADC_DESIRED_SIZE_S	0</div><div class='hunk'>@@ -1191,7 +1182,7 @@</div><div class='ctx'> #define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_BBTXMIX_DISABLE	0x20000000</div><div class='ctx'> #define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_BBTXMIX_DISABLE_S	29</div><div class='ctx'> </div><div class='del'>-#define AR_PHY_PAPRD_TRAINER_CNTL4 (AR_SM_BASE + (AR_SREV_9485(ah) ? 0x58c : 0x49c))</div><div class='add'>+#define AR_PHY_PAPRD_TRAINER_CNTL4(_ah) (AR_SM_BASE + (AR_SREV_9485(_ah) ? 0x58c : 0x49c))</div><div class='ctx'> </div><div class='ctx'> #define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_NUM_TRAIN_SAMPLES	0x03ff0000</div><div class='ctx'> #define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_NUM_TRAIN_SAMPLES_S	16</div><div class='hunk'>@@ -1211,7 +1202,7 @@</div><div class='ctx'> #define AR_PHY_PAPRD_PRE_POST_SCALING				0x3FFFF</div><div class='ctx'> #define AR_PHY_PAPRD_PRE_POST_SCALING_S				0</div><div class='ctx'> </div><div class='del'>-#define AR_PHY_PAPRD_TRAINER_STAT1 (AR_SM_BASE + (AR_SREV_9485(ah) ? 0x590 : 0x4a0))</div><div class='add'>+#define AR_PHY_PAPRD_TRAINER_STAT1(_ah) (AR_SM_BASE + (AR_SREV_9485(_ah) ? 0x590 : 0x4a0))</div><div class='ctx'> </div><div class='ctx'> #define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE		0x00000001</div><div class='ctx'> #define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE_S		0</div><div class='hunk'>@@ -1226,7 +1217,7 @@</div><div class='ctx'> #define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_AGC2_PWR		0x0001fe00</div><div class='ctx'> #define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_AGC2_PWR_S		9</div><div class='ctx'> </div><div class='del'>-#define AR_PHY_PAPRD_TRAINER_STAT2 (AR_SM_BASE + (AR_SREV_9485(ah) ? 0x594 : 0x4a4))</div><div class='add'>+#define AR_PHY_PAPRD_TRAINER_STAT2(_ah) (AR_SM_BASE + (AR_SREV_9485(_ah) ? 0x594 : 0x4a4))</div><div class='ctx'> </div><div class='ctx'> #define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_FINE_VAL		0x0000ffff</div><div class='ctx'> #define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_FINE_VAL_S		0</div><div class='hunk'>@@ -1235,7 +1226,7 @@</div><div class='ctx'> #define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_FINE_IDX		0x00600000</div><div class='ctx'> #define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_FINE_IDX_S		21</div><div class='ctx'> </div><div class='del'>-#define AR_PHY_PAPRD_TRAINER_STAT3 (AR_SM_BASE + (AR_SREV_9485(ah) ? 0x598 : 0x4a8))</div><div class='add'>+#define AR_PHY_PAPRD_TRAINER_STAT3(_ah) (AR_SM_BASE + (AR_SREV_9485(_ah) ? 0x598 : 0x4a8))</div><div class='ctx'> </div><div class='ctx'> #define AR_PHY_PAPRD_TRAINER_STAT3_PAPRD_TRAIN_SAMPLES_CNT	0x000fffff</div><div class='ctx'> #define AR_PHY_PAPRD_TRAINER_STAT3_PAPRD_TRAIN_SAMPLES_CNT_S	0</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9003_wow.c b/drivers/net/wireless/ath/ath9k/ar9003_wow.c<br/>index bea41df9fbd7..ac32afbf2c97 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9003_wow.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ar9003_wow.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ar9003_wow.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/ar9003_wow.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@ static void ath9k_hw_set_powermode_wow_sleep(struct ath_hw *ah)</div><div class='ctx'> 	/* set rx disable bit */</div><div class='ctx'> 	REG_WRITE(ah, AR_CR, AR_CR_RXD);</div><div class='ctx'> </div><div class='del'>-	if (!ath9k_hw_wait(ah, AR_CR, AR_CR_RXE, 0, AH_WAIT_TIMEOUT)) {</div><div class='add'>+	if (!ath9k_hw_wait(ah, AR_CR, AR_CR_RXE(ah), 0, AH_WAIT_TIMEOUT)) {</div><div class='ctx'> 		ath_err(common, "Failed to stop Rx DMA in 10ms AR_CR=0x%08x AR_DIAG_SW=0x%08x\n",</div><div class='ctx'> 			REG_READ(ah, AR_CR), REG_READ(ah, AR_DIAG_SW));</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -61,7 +61,7 @@ static void ath9k_hw_set_powermode_wow_sleep(struct ath_hw *ah)</div><div class='ctx'> 	if (ath9k_hw_mci_is_enabled(ah))</div><div class='ctx'> 		REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);</div><div class='ctx'> </div><div class='del'>-	REG_WRITE(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_ON_INT);</div><div class='add'>+	REG_WRITE(ah, AR_RTC_FORCE_WAKE(ah), AR_RTC_FORCE_WAKE_ON_INT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath9k_wow_create_keep_alive_pattern(struct ath_hw *ah)</div><div class='hunk'>@@ -226,7 +226,7 @@ u32 ath9k_hw_wow_wakeup(struct ath_hw *ah)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	/* do we need to check the bit value 0x01000000 (7-10) ?? */</div><div class='del'>-	REG_RMW(ah, AR_PCIE_PM_CTRL, AR_PMCTRL_WOW_PME_CLR,</div><div class='add'>+	REG_RMW(ah, AR_PCIE_PM_CTRL(ah), AR_PMCTRL_WOW_PME_CLR,</div><div class='ctx'> 		AR_PMCTRL_PWR_STATE_D1D3);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -278,12 +278,12 @@ static void ath9k_hw_wow_set_arwr_reg(struct ath_hw *ah)</div><div class='ctx'> 	 * to the external PCI-E reset. We also need to tie</div><div class='ctx'> 	 * the PCI-E Phy reset to the PCI-E reset.</div><div class='ctx'> 	 */</div><div class='del'>-	wa_reg = REG_READ(ah, AR_WA);</div><div class='add'>+	wa_reg = REG_READ(ah, AR_WA(ah));</div><div class='ctx'> 	wa_reg &amp;= ~AR_WA_UNTIE_RESET_EN;</div><div class='ctx'> 	wa_reg |= AR_WA_RESET_EN;</div><div class='ctx'> 	wa_reg |= AR_WA_POR_SHORT;</div><div class='ctx'> </div><div class='del'>-	REG_WRITE(ah, AR_WA, wa_reg);</div><div class='add'>+	REG_WRITE(ah, AR_WA(ah), wa_reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ath9k_hw_wow_enable(struct ath_hw *ah, u32 pattern_enable)</div><div class='hunk'>@@ -309,11 +309,11 @@ void ath9k_hw_wow_enable(struct ath_hw *ah, u32 pattern_enable)</div><div class='ctx'> 	 * Set and clear WOW_PME_CLEAR for the chip</div><div class='ctx'> 	 * to generate next wow signal.</div><div class='ctx'> 	 */</div><div class='del'>-	REG_SET_BIT(ah, AR_PCIE_PM_CTRL, AR_PMCTRL_HOST_PME_EN |</div><div class='add'>+	REG_SET_BIT(ah, AR_PCIE_PM_CTRL(ah), AR_PMCTRL_HOST_PME_EN |</div><div class='ctx'> 		    			 AR_PMCTRL_PWR_PM_CTRL_ENA |</div><div class='ctx'> 		    			 AR_PMCTRL_AUX_PWR_DET |</div><div class='ctx'> 		    			 AR_PMCTRL_WOW_PME_CLR);</div><div class='del'>-	REG_CLR_BIT(ah, AR_PCIE_PM_CTRL, AR_PMCTRL_WOW_PME_CLR);</div><div class='add'>+	REG_CLR_BIT(ah, AR_PCIE_PM_CTRL(ah), AR_PMCTRL_WOW_PME_CLR);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Random Backoff.</div><div class='hunk'>@@ -414,7 +414,7 @@ void ath9k_hw_wow_enable(struct ath_hw *ah, u32 pattern_enable)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set the power states appropriately and enable PME.</div><div class='ctx'> 	 */</div><div class='del'>-	host_pm_ctrl = REG_READ(ah, AR_PCIE_PM_CTRL);</div><div class='add'>+	host_pm_ctrl = REG_READ(ah, AR_PCIE_PM_CTRL(ah));</div><div class='ctx'> 	host_pm_ctrl |= AR_PMCTRL_PWR_STATE_D1D3 |</div><div class='ctx'> 			AR_PMCTRL_HOST_PME_EN |</div><div class='ctx'> 			AR_PMCTRL_PWR_PM_CTRL_ENA;</div><div class='hunk'>@@ -430,7 +430,7 @@ void ath9k_hw_wow_enable(struct ath_hw *ah, u32 pattern_enable)</div><div class='ctx'> 		host_pm_ctrl |= AR_PMCTRL_PWR_STATE_D1D3_REAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	REG_WRITE(ah, AR_PCIE_PM_CTRL, host_pm_ctrl);</div><div class='add'>+	REG_WRITE(ah, AR_PCIE_PM_CTRL(ah), host_pm_ctrl);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Enable sequence number generation when asleep.</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h<br/>index ef6f5ea06c1f..6e38aa7351e3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ath9k.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ath9k.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ath9k.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/ath9k.h</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/kstrtox.h&gt;</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='hunk'>@@ -38,6 +39,7 @@ extern int ath9k_modparam_nohwcrypt;</div><div class='ctx'> extern int ath9k_led_blink;</div><div class='ctx'> extern bool is_ath9k_unloaded;</div><div class='ctx'> extern int ath9k_use_chanctx;</div><div class='add'>+extern int ath9k_use_msi;</div><div class='ctx'> </div><div class='ctx'> /*************************/</div><div class='ctx'> /* Descriptor Management */</div><div class='hunk'>@@ -272,7 +274,6 @@ struct ath_node {</div><div class='ctx'> </div><div class='ctx'> struct ath_tx_control {</div><div class='ctx'> 	struct ath_txq *txq;</div><div class='del'>-	struct ath_node *an;</div><div class='ctx'> 	struct ieee80211_sta *sta;</div><div class='ctx'> 	u8 paprd;</div><div class='ctx'> };</div><div class='hunk'>@@ -336,7 +337,7 @@ struct ath_chanctx {</div><div class='ctx'> </div><div class='ctx'> 	struct ath_beacon_config beacon;</div><div class='ctx'> 	struct ath9k_hw_cal_data caldata;</div><div class='del'>-	struct timespec64 tsf_ts;</div><div class='add'>+	ktime_t tsf_ts;</div><div class='ctx'> 	u64 tsf_val;</div><div class='ctx'> 	u32 last_beacon;</div><div class='ctx'> </div><div class='hunk'>@@ -590,8 +591,8 @@ void ath_txq_schedule_all(struct ath_softc *sc);</div><div class='ctx'> int ath_tx_init(struct ath_softc *sc, int nbufs);</div><div class='ctx'> int ath_txq_update(struct ath_softc *sc, int qnum,</div><div class='ctx'> 		   struct ath9k_tx_queue_info *q);</div><div class='del'>-u32 ath_pkt_duration(struct ath_softc *sc, u8 rix, int pktlen,</div><div class='del'>-		     int width, int half_gi, bool shortPreamble);</div><div class='add'>+u32 ath_pkt_duration(u8 rix, int pktlen, int width,</div><div class='add'>+		     int half_gi, bool shortPreamble);</div><div class='ctx'> void ath_update_max_aggr_framelen(struct ath_softc *sc, int queue, int txop);</div><div class='ctx'> void ath_assign_seq(struct ath_common *common, struct sk_buff *skb);</div><div class='ctx'> int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,</div><div class='hunk'>@@ -1009,13 +1010,15 @@ struct ath_softc {</div><div class='ctx'> 	struct ath_offchannel offchannel;</div><div class='ctx'> 	struct ath_chanctx *next_chan;</div><div class='ctx'> 	struct completion go_beacon;</div><div class='del'>-	struct timespec64 last_event_time;</div><div class='add'>+	ktime_t last_event_time;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	unsigned long driver_data;</div><div class='ctx'> </div><div class='ctx'> 	u8 gtt_cnt;</div><div class='ctx'> 	u32 intrstatus;</div><div class='add'>+	unsigned long rx_active_check_time;</div><div class='add'>+	u32 rx_active_count;</div><div class='ctx'> 	u16 ps_flags; /* PS_* */</div><div class='ctx'> 	bool ps_enabled;</div><div class='ctx'> 	bool ps_idle;</div><div class='hunk'>@@ -1071,8 +1074,9 @@ struct ath_softc {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ATH9K_HWRNG</div><div class='add'>+	struct hwrng rng_ops;</div><div class='ctx'> 	u32 rng_last;</div><div class='del'>-	struct task_struct *rng_task;</div><div class='add'>+	char rng_name[sizeof("ath9k_65535")];</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1127,7 +1131,6 @@ void ath_restart_work(struct ath_softc *sc);</div><div class='ctx'> int ath9k_init_device(u16 devid, struct ath_softc *sc,</div><div class='ctx'> 		    const struct ath_bus_ops *bus_ops);</div><div class='ctx'> void ath9k_deinit_device(struct ath_softc *sc);</div><div class='del'>-void ath9k_reload_chainmask_settings(struct ath_softc *sc);</div><div class='ctx'> u8 ath_txchainmask_reduction(struct ath_softc *sc, u8 chainmask, u32 rate);</div><div class='ctx'> void ath_start_rfkill_poll(struct ath_softc *sc);</div><div class='ctx'> void ath9k_rfkill_poll_state(struct ieee80211_hw *hw);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c b/drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c<br/>index 56d1a7764b9f..fe1013a3a588 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c</a></div><div class='hunk'>@@ -18,10 +18,14 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/ath9k_platform.h&gt;</div><div class='add'>+#include &lt;linux/nvmem-consumer.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct owl_ctx {</div><div class='add'>+	struct pci_dev *pdev;</div><div class='ctx'> 	struct completion eeprom_load;</div><div class='add'>+	struct work_struct work;</div><div class='add'>+	struct nvmem_cell *cell;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define EEPROM_FILENAME_LEN 100</div><div class='hunk'>@@ -42,6 +46,12 @@ static int ath9k_pci_fixup(struct pci_dev *pdev, const u16 *cal_data,</div><div class='ctx'> 	u32 bar0;</div><div class='ctx'> 	bool swap_needed = false;</div><div class='ctx'> </div><div class='add'>+	/* also note that we are doing *u16 operations on the file */</div><div class='add'>+	if (cal_len &gt; 4096 || cal_len &lt; 0x200 || (cal_len &amp; 1) == 1) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "eeprom has an invalid size.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (*cal_data != AR5416_EEPROM_MAGIC) {</div><div class='ctx'> 		if (*cal_data != swab16(AR5416_EEPROM_MAGIC)) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "invalid calibration data\n");</div><div class='hunk'>@@ -54,7 +64,7 @@ static int ath9k_pci_fixup(struct pci_dev *pdev, const u16 *cal_data,</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;pdev-&gt;dev, "fixup device configuration\n");</div><div class='ctx'> </div><div class='del'>-	mem = pcim_iomap(pdev, 0, 0);</div><div class='add'>+	mem = pci_iomap(pdev, 0, 0);</div><div class='ctx'> 	if (!mem) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "ioremap error\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -92,45 +102,38 @@ static int ath9k_pci_fixup(struct pci_dev *pdev, const u16 *cal_data,</div><div class='ctx'> 	pci_write_config_word(pdev, PCI_COMMAND, cmd);</div><div class='ctx'> </div><div class='ctx'> 	pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, bar0);</div><div class='del'>-	pcim_iounmap(pdev, mem);</div><div class='add'>+	pci_iounmap(pdev, mem);</div><div class='ctx'> </div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void owl_fw_cb(const struct firmware *fw, void *context)</div><div class='add'>+static void owl_rescan(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = (struct pci_dev *)context;</div><div class='del'>-	struct owl_ctx *ctx = (struct owl_ctx *)pci_get_drvdata(pdev);</div><div class='del'>-	struct pci_bus *bus;</div><div class='del'>-</div><div class='del'>-	complete(&amp;ctx-&gt;eeprom_load);</div><div class='del'>-</div><div class='del'>-	if (!fw) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "no eeprom data received.\n");</div><div class='del'>-		goto release;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* also note that we are doing *u16 operations on the file */</div><div class='del'>-	if (fw-&gt;size &gt; 4096 || fw-&gt;size &lt; 0x200 || (fw-&gt;size &amp; 1) == 1) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "eeprom file has an invalid size.\n");</div><div class='del'>-		goto release;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ath9k_pci_fixup(pdev, (const u16 *)fw-&gt;data, fw-&gt;size))</div><div class='del'>-		goto release;</div><div class='add'>+	struct pci_bus *bus = pdev-&gt;bus;</div><div class='ctx'> </div><div class='ctx'> 	pci_lock_rescan_remove();</div><div class='del'>-	bus = pdev-&gt;bus;</div><div class='ctx'> 	pci_stop_and_remove_bus_device(pdev);</div><div class='ctx'> 	/* the device should come back with the proper</div><div class='ctx'> 	 * ProductId. But we have to initiate a rescan.</div><div class='ctx'> 	 */</div><div class='ctx'> 	pci_rescan_bus(bus);</div><div class='ctx'> 	pci_unlock_rescan_remove();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_fw_cb(const struct firmware *fw, void *context)</div><div class='add'>+{</div><div class='add'>+	struct owl_ctx *ctx = context;</div><div class='ctx'> </div><div class='del'>-release:</div><div class='add'>+	complete(&amp;ctx-&gt;eeprom_load);</div><div class='add'>+</div><div class='add'>+	if (fw) {</div><div class='add'>+		ath9k_pci_fixup(ctx-&gt;pdev, (const u16 *)fw-&gt;data, fw-&gt;size);</div><div class='add'>+		owl_rescan(ctx-&gt;pdev);</div><div class='add'>+	} else {</div><div class='add'>+		dev_err(&amp;ctx-&gt;pdev-&gt;dev, "no eeprom data received.\n");</div><div class='add'>+	}</div><div class='ctx'> 	release_firmware(fw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -152,6 +155,43 @@ static const char *owl_get_eeprom_name(struct pci_dev *pdev)</div><div class='ctx'> 	return eeprom_name;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void owl_nvmem_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct owl_ctx *ctx = container_of(work, struct owl_ctx, work);</div><div class='add'>+	void *buf;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	complete(&amp;ctx-&gt;eeprom_load);</div><div class='add'>+</div><div class='add'>+	buf = nvmem_cell_read(ctx-&gt;cell, &amp;len);</div><div class='add'>+	if (!IS_ERR(buf)) {</div><div class='add'>+		ath9k_pci_fixup(ctx-&gt;pdev, buf, len);</div><div class='add'>+		kfree(buf);</div><div class='add'>+		owl_rescan(ctx-&gt;pdev);</div><div class='add'>+	} else {</div><div class='add'>+		dev_err(&amp;ctx-&gt;pdev-&gt;dev, "no nvmem data received.\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int owl_nvmem_probe(struct owl_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;cell = devm_nvmem_cell_get(&amp;ctx-&gt;pdev-&gt;dev, "calibration");</div><div class='add'>+	if (IS_ERR(ctx-&gt;cell)) {</div><div class='add'>+		err = PTR_ERR(ctx-&gt;cell);</div><div class='add'>+		if (err == -ENOENT || err == -EOPNOTSUPP)</div><div class='add'>+			return 1; /* not present, try firmware_request */</div><div class='add'>+</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;ctx-&gt;work, owl_nvmem_work);</div><div class='add'>+	schedule_work(&amp;ctx-&gt;work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int owl_probe(struct pci_dev *pdev,</div><div class='ctx'> 		     const struct pci_device_id *id)</div><div class='ctx'> {</div><div class='hunk'>@@ -159,26 +199,30 @@ static int owl_probe(struct pci_dev *pdev,</div><div class='ctx'> 	const char *eeprom_name;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (pcim_enable_device(pdev))</div><div class='add'>+	if (pci_enable_device(pdev))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	pcim_pin_device(pdev);</div><div class='del'>-</div><div class='del'>-	eeprom_name = owl_get_eeprom_name(pdev);</div><div class='del'>-	if (!eeprom_name) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "no eeprom filename found.\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ctx = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*ctx), GFP_KERNEL);</div><div class='ctx'> 	if (!ctx)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	init_completion(&amp;ctx-&gt;eeprom_load);</div><div class='add'>+	ctx-&gt;pdev = pdev;</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pdev, ctx);</div><div class='add'>+</div><div class='add'>+	err = owl_nvmem_probe(ctx);</div><div class='add'>+	if (err &lt;= 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	eeprom_name = owl_get_eeprom_name(pdev);</div><div class='add'>+	if (!eeprom_name) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "no eeprom filename found.\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = request_firmware_nowait(THIS_MODULE, true, eeprom_name,</div><div class='del'>-				      &amp;pdev-&gt;dev, GFP_KERNEL, pdev, owl_fw_cb);</div><div class='add'>+				      &amp;pdev-&gt;dev, GFP_KERNEL, ctx, owl_fw_cb);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to request caldata (%d).\n", err);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c<br/>index 72e2e71aac0e..4a27e3753c03 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/beacon.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/beacon.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/beacon.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/beacon.c</a></div><div class='hunk'>@@ -135,7 +135,7 @@ static struct ath_buf *ath9k_beacon_generate(struct ieee80211_hw *hw,</div><div class='ctx'> 		bf-&gt;bf_mpdu = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb = ieee80211_beacon_get(hw, vif);</div><div class='add'>+	skb = ieee80211_beacon_get(hw, vif, 0);</div><div class='ctx'> 	if (skb == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -293,7 +293,7 @@ void ath9k_beacon_ensure_primary_slot(struct ath_softc *sc)</div><div class='ctx'> 	/* Modify TSF as required and update the HW. */</div><div class='ctx'> 	avp-&gt;chanctx-&gt;tsf_val += tsfadjust;</div><div class='ctx'> 	if (sc-&gt;cur_chan == avp-&gt;chanctx) {</div><div class='del'>-		offset = ath9k_hw_get_tsf_offset(&amp;avp-&gt;chanctx-&gt;tsf_ts, NULL);</div><div class='add'>+		offset = ath9k_hw_get_tsf_offset(avp-&gt;chanctx-&gt;tsf_ts, 0);</div><div class='ctx'> 		ath9k_hw_settsf64(sc-&gt;sc_ah, avp-&gt;chanctx-&gt;tsf_val + offset);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -362,13 +362,13 @@ static void ath9k_set_tsfadjust(struct ath_softc *sc,</div><div class='ctx'> </div><div class='ctx'> bool ath9k_csa_is_finished(struct ath_softc *sc, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	if (!vif || !vif-&gt;csa_active)</div><div class='add'>+	if (!vif || !vif-&gt;bss_conf.csa_active)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (!ieee80211_beacon_cntdwn_is_complete(vif))</div><div class='add'>+	if (!ieee80211_beacon_cntdwn_is_complete(vif, 0))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	ieee80211_csa_finish(vif);</div><div class='add'>+	ieee80211_csa_finish(vif, 0);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -585,8 +585,9 @@ static void ath9k_beacon_config_adhoc(struct ath_softc *sc,</div><div class='ctx'> </div><div class='ctx'> static void ath9k_cache_beacon_config(struct ath_softc *sc,</div><div class='ctx'> 				      struct ath_chanctx *ctx,</div><div class='del'>-				      struct ieee80211_bss_conf *bss_conf)</div><div class='add'>+				      struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_bss_conf *bss_conf = &amp;vif-&gt;bss_conf;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(sc-&gt;sc_ah);</div><div class='ctx'> 	struct ath_beacon_config *cur_conf = &amp;ctx-&gt;beacon;</div><div class='ctx'> </div><div class='hunk'>@@ -596,7 +597,7 @@ static void ath9k_cache_beacon_config(struct ath_softc *sc,</div><div class='ctx'> 	cur_conf-&gt;beacon_interval = bss_conf-&gt;beacon_int;</div><div class='ctx'> 	cur_conf-&gt;dtim_period = bss_conf-&gt;dtim_period;</div><div class='ctx'> 	cur_conf-&gt;dtim_count = 1;</div><div class='del'>-	cur_conf-&gt;ibss_creator = bss_conf-&gt;ibss_creator;</div><div class='add'>+	cur_conf-&gt;ibss_creator = vif-&gt;cfg.ibss_creator;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * It looks like mac80211 may end up using beacon interval of zero in</div><div class='hunk'>@@ -649,7 +650,7 @@ void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *main_vif,</div><div class='ctx'> 	cur_conf-&gt;enable_beacon = beacons;</div><div class='ctx'> </div><div class='ctx'> 	if (sc-&gt;sc_ah-&gt;opmode == NL80211_IFTYPE_STATION) {</div><div class='del'>-		ath9k_cache_beacon_config(sc, ctx, &amp;main_vif-&gt;bss_conf);</div><div class='add'>+		ath9k_cache_beacon_config(sc, ctx, main_vif);</div><div class='ctx'> </div><div class='ctx'> 		ath9k_set_beacon(sc);</div><div class='ctx'> 		set_bit(ATH_OP_BEACONS, &amp;common-&gt;op_flags);</div><div class='hunk'>@@ -657,7 +658,7 @@ void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *main_vif,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Update the beacon configuration. */</div><div class='del'>-	ath9k_cache_beacon_config(sc, ctx, &amp;main_vif-&gt;bss_conf);</div><div class='add'>+	ath9k_cache_beacon_config(sc, ctx, main_vif);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Configure the HW beacon registers only when we have a valid</div><div class='hunk'>@@ -670,7 +671,7 @@ void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *main_vif,</div><div class='ctx'> 		 * IBSS interface.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (sc-&gt;sc_ah-&gt;opmode == NL80211_IFTYPE_ADHOC &amp;&amp;</div><div class='del'>-		    !enabled &amp;&amp; beacons &amp;&amp; !main_vif-&gt;bss_conf.ibss_creator) {</div><div class='add'>+		    !enabled &amp;&amp; beacons &amp;&amp; !main_vif-&gt;cfg.ibss_creator) {</div><div class='ctx'> 			spin_lock_irqsave(&amp;sc-&gt;sc_pm_lock, flags);</div><div class='ctx'> 			sc-&gt;ps_flags |= PS_BEACON_SYNC | PS_WAIT_FOR_BEACON;</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;sc-&gt;sc_pm_lock, flags);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/btcoex.c b/drivers/net/wireless/ath/ath9k/btcoex.c<br/>index 618c9df35fc1..ad3a3fda1b9c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/btcoex.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/btcoex.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/btcoex.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/btcoex.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/ath9k_platform.h&gt;</div><div class='ctx'> #include "hw.h"</div><div class='ctx'> </div><div class='ctx'> enum ath_bt_mode {</div><div class='hunk'>@@ -115,23 +114,14 @@ static void ath9k_hw_btcoex_pin_init(struct ath_hw *ah, u8 wlanactive_gpio,</div><div class='ctx'> 				     u8 btactive_gpio, u8 btpriority_gpio)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_btcoex_hw *btcoex_hw = &amp;ah-&gt;btcoex_hw;</div><div class='del'>-	struct ath9k_platform_data *pdata = ah-&gt;dev-&gt;platform_data;</div><div class='ctx'> </div><div class='ctx'> 	if (btcoex_hw-&gt;scheme != ATH_BTCOEX_CFG_2WIRE &amp;&amp;</div><div class='ctx'> 	    btcoex_hw-&gt;scheme != ATH_BTCOEX_CFG_3WIRE)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* bt priority GPIO will be ignored by 2 wire scheme */</div><div class='del'>-	if (pdata &amp;&amp; (pdata-&gt;bt_active_pin || pdata-&gt;bt_priority_pin ||</div><div class='del'>-		      pdata-&gt;wlan_active_pin)) {</div><div class='del'>-		btcoex_hw-&gt;btactive_gpio = pdata-&gt;bt_active_pin;</div><div class='del'>-		btcoex_hw-&gt;wlanactive_gpio = pdata-&gt;wlan_active_pin;</div><div class='del'>-		btcoex_hw-&gt;btpriority_gpio = pdata-&gt;bt_priority_pin;</div><div class='del'>-	} else {</div><div class='del'>-		btcoex_hw-&gt;btactive_gpio = btactive_gpio;</div><div class='del'>-		btcoex_hw-&gt;wlanactive_gpio = wlanactive_gpio;</div><div class='del'>-		btcoex_hw-&gt;btpriority_gpio = btpriority_gpio;</div><div class='del'>-	}</div><div class='add'>+	btcoex_hw-&gt;btactive_gpio = btactive_gpio;</div><div class='add'>+	btcoex_hw-&gt;wlanactive_gpio = wlanactive_gpio;</div><div class='add'>+	btcoex_hw-&gt;btpriority_gpio = btpriority_gpio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ath9k_hw_btcoex_init_scheme(struct ath_hw *ah)</div><div class='hunk'>@@ -173,16 +163,16 @@ void ath9k_hw_btcoex_init_2wire(struct ath_hw *ah)</div><div class='ctx'> 	struct ath_btcoex_hw *btcoex_hw = &amp;ah-&gt;btcoex_hw;</div><div class='ctx'> </div><div class='ctx'> 	/* connect bt_active to baseband */</div><div class='del'>-	REG_CLR_BIT(ah, AR_GPIO_INPUT_EN_VAL,</div><div class='add'>+	REG_CLR_BIT(ah, AR_GPIO_INPUT_EN_VAL(ah),</div><div class='ctx'> 		    (AR_GPIO_INPUT_EN_VAL_BT_PRIORITY_DEF |</div><div class='ctx'> 		     AR_GPIO_INPUT_EN_VAL_BT_FREQUENCY_DEF));</div><div class='ctx'> </div><div class='del'>-	REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL,</div><div class='add'>+	REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL(ah),</div><div class='ctx'> 		    AR_GPIO_INPUT_EN_VAL_BT_ACTIVE_BB);</div><div class='ctx'> </div><div class='ctx'> 	/* Set input mux for bt_active to gpio pin */</div><div class='ctx'> 	if (!AR_SREV_SOC(ah))</div><div class='del'>-		REG_RMW_FIELD(ah, AR_GPIO_INPUT_MUX1,</div><div class='add'>+		REG_RMW_FIELD(ah, AR_GPIO_INPUT_MUX1(ah),</div><div class='ctx'> 			      AR_GPIO_INPUT_MUX1_BT_ACTIVE,</div><div class='ctx'> 			      btcoex_hw-&gt;btactive_gpio);</div><div class='ctx'> </div><div class='hunk'>@@ -197,17 +187,17 @@ void ath9k_hw_btcoex_init_3wire(struct ath_hw *ah)</div><div class='ctx'> 	struct ath_btcoex_hw *btcoex_hw = &amp;ah-&gt;btcoex_hw;</div><div class='ctx'> </div><div class='ctx'> 	/* btcoex 3-wire */</div><div class='del'>-	REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL,</div><div class='add'>+	REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL(ah),</div><div class='ctx'> 			(AR_GPIO_INPUT_EN_VAL_BT_PRIORITY_BB |</div><div class='ctx'> 			 AR_GPIO_INPUT_EN_VAL_BT_ACTIVE_BB));</div><div class='ctx'> </div><div class='ctx'> 	/* Set input mux for bt_prority_async and</div><div class='ctx'> 	 *                  bt_active_async to GPIO pins */</div><div class='ctx'> 	if (!AR_SREV_SOC(ah)) {</div><div class='del'>-		REG_RMW_FIELD(ah, AR_GPIO_INPUT_MUX1,</div><div class='add'>+		REG_RMW_FIELD(ah, AR_GPIO_INPUT_MUX1(ah),</div><div class='ctx'> 			      AR_GPIO_INPUT_MUX1_BT_ACTIVE,</div><div class='ctx'> 			      btcoex_hw-&gt;btactive_gpio);</div><div class='del'>-		REG_RMW_FIELD(ah, AR_GPIO_INPUT_MUX1,</div><div class='add'>+		REG_RMW_FIELD(ah, AR_GPIO_INPUT_MUX1(ah),</div><div class='ctx'> 			      AR_GPIO_INPUT_MUX1_BT_PRIORITY,</div><div class='ctx'> 			      btcoex_hw-&gt;btpriority_gpio);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -404,7 +394,7 @@ void ath9k_hw_btcoex_enable(struct ath_hw *ah)</div><div class='ctx'> </div><div class='ctx'> 	if (ath9k_hw_get_btcoex_scheme(ah) != ATH_BTCOEX_CFG_MCI &amp;&amp;</div><div class='ctx'> 	    !AR_SREV_SOC(ah)) {</div><div class='del'>-		REG_RMW(ah, AR_GPIO_PDPU,</div><div class='add'>+		REG_RMW(ah, AR_GPIO_PDPU(ah),</div><div class='ctx'> 			(0x2 &lt;&lt; (btcoex_hw-&gt;btactive_gpio * 2)),</div><div class='ctx'> 			(0x3 &lt;&lt; (btcoex_hw-&gt;btactive_gpio * 2)));</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c<br/>index 0422a33395b7..b4ab85bd7895 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/calib.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/calib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/calib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/calib.c</a></div><div class='hunk'>@@ -16,32 +16,25 @@</div><div class='ctx'> </div><div class='ctx'> #include "hw.h"</div><div class='ctx'> #include "hw-ops.h"</div><div class='add'>+#include &lt;linux/sort.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Common calibration code */</div><div class='ctx'> </div><div class='add'>+static int rcmp_i16(const void *x, const void *y)</div><div class='add'>+{</div><div class='add'>+	/* Sort in reverse order. */</div><div class='add'>+	return *(int16_t *)y - *(int16_t *)x;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int16_t ath9k_hw_get_nf_hist_mid(int16_t *nfCalBuffer)</div><div class='ctx'> {</div><div class='del'>-	int16_t nfval;</div><div class='del'>-	int16_t sort[ATH9K_NF_CAL_HIST_MAX];</div><div class='del'>-	int i, j;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ATH9K_NF_CAL_HIST_MAX; i++)</div><div class='del'>-		sort[i] = nfCalBuffer[i];</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ATH9K_NF_CAL_HIST_MAX - 1; i++) {</div><div class='del'>-		for (j = 1; j &lt; ATH9K_NF_CAL_HIST_MAX - i; j++) {</div><div class='del'>-			if (sort[j] &gt; sort[j - 1]) {</div><div class='del'>-				nfval = sort[j];</div><div class='del'>-				sort[j] = sort[j - 1];</div><div class='del'>-				sort[j - 1] = nfval;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	nfval = sort[(ATH9K_NF_CAL_HIST_MAX - 1) &gt;&gt; 1];</div><div class='add'>+	int16_t nfcal[ATH9K_NF_CAL_HIST_MAX];</div><div class='add'>+</div><div class='add'>+	memcpy(nfcal, nfCalBuffer, sizeof(nfcal));</div><div class='add'>+	sort(nfcal, ATH9K_NF_CAL_HIST_MAX, sizeof(int16_t), rcmp_i16, NULL);</div><div class='ctx'> </div><div class='del'>-	return nfval;</div><div class='add'>+	return nfcal[(ATH9K_NF_CAL_HIST_MAX - 1) &gt;&gt; 1];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ath_nf_limits *ath9k_hw_get_nf_limits(struct ath_hw *ah,</div><div class='hunk'>@@ -231,17 +224,17 @@ void ath9k_hw_start_nfcal(struct ath_hw *ah, bool update)</div><div class='ctx'> 	if (ah-&gt;caldata)</div><div class='ctx'> 		set_bit(NFCAL_PENDING, &amp;ah-&gt;caldata-&gt;cal_flags);</div><div class='ctx'> </div><div class='del'>-	REG_SET_BIT(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+	REG_SET_BIT(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 		    AR_PHY_AGC_CONTROL_ENABLE_NF);</div><div class='ctx'> </div><div class='ctx'> 	if (update)</div><div class='del'>-		REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+		REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 		    AR_PHY_AGC_CONTROL_NO_UPDATE_NF);</div><div class='ctx'> 	else</div><div class='del'>-		REG_SET_BIT(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+		REG_SET_BIT(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 		    AR_PHY_AGC_CONTROL_NO_UPDATE_NF);</div><div class='ctx'> </div><div class='del'>-	REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);</div><div class='add'>+	REG_SET_BIT(ah, AR_PHY_AGC_CONTROL(ah), AR_PHY_AGC_CONTROL_NF);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='hunk'>@@ -251,7 +244,7 @@ int ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='ctx'> 	u8 chainmask = (ah-&gt;rxchainmask &lt;&lt; 3) | ah-&gt;rxchainmask;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='ctx'> 	s16 default_nf = ath9k_hw_get_nf_limits(ah, chan)-&gt;nominal;</div><div class='del'>-	u32 bb_agc_ctl = REG_READ(ah, AR_PHY_AGC_CONTROL);</div><div class='add'>+	u32 bb_agc_ctl = REG_READ(ah, AR_PHY_AGC_CONTROL(ah));</div><div class='ctx'> </div><div class='ctx'> 	if (ah-&gt;caldata)</div><div class='ctx'> 		h = ah-&gt;caldata-&gt;nfCalHist;</div><div class='hunk'>@@ -286,7 +279,7 @@ int ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='ctx'> 	 * (or after end rx/tx frame if ongoing)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (bb_agc_ctl &amp; AR_PHY_AGC_CONTROL_NF) {</div><div class='del'>-		REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);</div><div class='add'>+		REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL(ah), AR_PHY_AGC_CONTROL_NF);</div><div class='ctx'> 		REG_RMW_BUFFER_FLUSH(ah);</div><div class='ctx'> 		ENABLE_REG_RMW_BUFFER(ah);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -295,11 +288,11 @@ int ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='ctx'> 	 * Load software filtered NF value into baseband internal minCCApwr</div><div class='ctx'> 	 * variable.</div><div class='ctx'> 	 */</div><div class='del'>-	REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+	REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 		    AR_PHY_AGC_CONTROL_ENABLE_NF);</div><div class='del'>-	REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+	REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 		    AR_PHY_AGC_CONTROL_NO_UPDATE_NF);</div><div class='del'>-	REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);</div><div class='add'>+	REG_SET_BIT(ah, AR_PHY_AGC_CONTROL(ah), AR_PHY_AGC_CONTROL_NF);</div><div class='ctx'> 	REG_RMW_BUFFER_FLUSH(ah);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -309,7 +302,7 @@ int ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='ctx'> 	 * (11n max length 22.1 msec)</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (j = 0; j &lt; 22200; j++) {</div><div class='del'>-		if ((REG_READ(ah, AR_PHY_AGC_CONTROL) &amp;</div><div class='add'>+		if ((REG_READ(ah, AR_PHY_AGC_CONTROL(ah)) &amp;</div><div class='ctx'> 			      AR_PHY_AGC_CONTROL_NF) == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		udelay(10);</div><div class='hunk'>@@ -321,12 +314,12 @@ int ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='ctx'> 	if (bb_agc_ctl &amp; AR_PHY_AGC_CONTROL_NF) {</div><div class='ctx'> 		ENABLE_REG_RMW_BUFFER(ah);</div><div class='ctx'> 		if (bb_agc_ctl &amp; AR_PHY_AGC_CONTROL_ENABLE_NF)</div><div class='del'>-			REG_SET_BIT(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+			REG_SET_BIT(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 				    AR_PHY_AGC_CONTROL_ENABLE_NF);</div><div class='ctx'> 		if (bb_agc_ctl &amp; AR_PHY_AGC_CONTROL_NO_UPDATE_NF)</div><div class='del'>-			REG_SET_BIT(ah, AR_PHY_AGC_CONTROL,</div><div class='add'>+			REG_SET_BIT(ah, AR_PHY_AGC_CONTROL(ah),</div><div class='ctx'> 				    AR_PHY_AGC_CONTROL_NO_UPDATE_NF);</div><div class='del'>-		REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);</div><div class='add'>+		REG_SET_BIT(ah, AR_PHY_AGC_CONTROL(ah), AR_PHY_AGC_CONTROL_NF);</div><div class='ctx'> 		REG_RMW_BUFFER_FLUSH(ah);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -342,7 +335,7 @@ int ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='ctx'> 	if (j == 22200) {</div><div class='ctx'> 		ath_dbg(common, ANY,</div><div class='ctx'> 			"Timeout while waiting for nf to load: AR_PHY_AGC_CONTROL=0x%x\n",</div><div class='del'>-			REG_READ(ah, AR_PHY_AGC_CONTROL));</div><div class='add'>+			REG_READ(ah, AR_PHY_AGC_CONTROL(ah)));</div><div class='ctx'> 		return -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -410,7 +403,7 @@ bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='ctx'> 	struct ieee80211_channel *c = chan-&gt;chan;</div><div class='ctx'> 	struct ath9k_hw_cal_data *caldata = ah-&gt;caldata;</div><div class='ctx'> </div><div class='del'>-	if (REG_READ(ah, AR_PHY_AGC_CONTROL) &amp; AR_PHY_AGC_CONTROL_NF) {</div><div class='add'>+	if (REG_READ(ah, AR_PHY_AGC_CONTROL(ah)) &amp; AR_PHY_AGC_CONTROL_NF) {</div><div class='ctx'> 		ath_dbg(common, CALIBRATE,</div><div class='ctx'> 			"NF did not complete in calibration window\n");</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -478,7 +471,7 @@ void ath9k_hw_bstuck_nfcal(struct ath_hw *ah)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!test_bit(NFCAL_PENDING, &amp;caldata-&gt;cal_flags))</div><div class='ctx'> 		ath9k_hw_start_nfcal(ah, true);</div><div class='del'>-	else if (!(REG_READ(ah, AR_PHY_AGC_CONTROL) &amp; AR_PHY_AGC_CONTROL_NF))</div><div class='add'>+	else if (!(REG_READ(ah, AR_PHY_AGC_CONTROL(ah)) &amp; AR_PHY_AGC_CONTROL_NF))</div><div class='ctx'> 		ath9k_hw_getnf(ah, ah-&gt;curchan);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(NFCAL_INTF, &amp;caldata-&gt;cal_flags);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/channel.c b/drivers/net/wireless/ath/ath9k/channel.c<br/>index 6cf087522157..121e51ce1bc0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/channel.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/channel.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/channel.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/channel.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include "ath9k.h"</div><div class='ctx'> </div><div class='ctx'> /* Set/change channels.  If the channel is really being changed, it's done</div><div class='del'>- * by reseting the chip.  To accomplish this we must first cleanup any pending</div><div class='add'>+ * by resetting the chip.  To accomplish this we must first cleanup any pending</div><div class='ctx'>  * DMA, then restart stuff.</div><div class='ctx'>  */</div><div class='ctx'> static int ath_set_channel(struct ath_softc *sc)</div><div class='hunk'>@@ -232,16 +232,11 @@ static const char *chanctx_state_string(enum ath_chanctx_state state)</div><div class='ctx'> </div><div class='ctx'> static u32 chanctx_event_delta(struct ath_softc *sc)</div><div class='ctx'> {</div><div class='del'>-	u64 ms;</div><div class='del'>-	struct timespec64 ts, *old;</div><div class='add'>+	ktime_t ts = ktime_get_raw();</div><div class='add'>+	s64 ms = ktime_ms_delta(ts, sc-&gt;last_event_time);</div><div class='ctx'> </div><div class='del'>-	ktime_get_raw_ts64(&amp;ts);</div><div class='del'>-	old = &amp;sc-&gt;last_event_time;</div><div class='del'>-	ms = ts.tv_sec * 1000 + ts.tv_nsec / 1000000;</div><div class='del'>-	ms -= old-&gt;tv_sec * 1000 + old-&gt;tv_nsec / 1000000;</div><div class='ctx'> 	sc-&gt;last_event_time = ts;</div><div class='del'>-</div><div class='del'>-	return (u32)ms;</div><div class='add'>+	return ms;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ath_chanctx_check_active(struct ath_softc *sc, struct ath_chanctx *ctx)</div><div class='hunk'>@@ -334,8 +329,8 @@ ath_chanctx_get_next(struct ath_softc *sc, struct ath_chanctx *ctx)</div><div class='ctx'> static void ath_chanctx_adjust_tbtt_delta(struct ath_softc *sc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_chanctx *prev, *cur;</div><div class='del'>-	struct timespec64 ts;</div><div class='ctx'> 	u32 cur_tsf, prev_tsf, beacon_int;</div><div class='add'>+	ktime_t ts;</div><div class='ctx'> 	s32 offset;</div><div class='ctx'> </div><div class='ctx'> 	beacon_int = TU_TO_USEC(sc-&gt;cur_chan-&gt;beacon.beacon_interval);</div><div class='hunk'>@@ -346,12 +341,12 @@ static void ath_chanctx_adjust_tbtt_delta(struct ath_softc *sc)</div><div class='ctx'> 	if (!prev-&gt;switch_after_beacon)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ktime_get_raw_ts64(&amp;ts);</div><div class='add'>+	ts = ktime_get_raw();</div><div class='ctx'> 	cur_tsf = (u32) cur-&gt;tsf_val +</div><div class='del'>-		  ath9k_hw_get_tsf_offset(&amp;cur-&gt;tsf_ts, &amp;ts);</div><div class='add'>+		  ath9k_hw_get_tsf_offset(cur-&gt;tsf_ts, ts);</div><div class='ctx'> </div><div class='ctx'> 	prev_tsf = prev-&gt;last_beacon - (u32) prev-&gt;tsf_val + cur_tsf;</div><div class='del'>-	prev_tsf -= ath9k_hw_get_tsf_offset(&amp;prev-&gt;tsf_ts, &amp;ts);</div><div class='add'>+	prev_tsf -= ath9k_hw_get_tsf_offset(prev-&gt;tsf_ts, ts);</div><div class='ctx'> </div><div class='ctx'> 	/* Adjust the TSF time of the AP chanctx to keep its beacons</div><div class='ctx'> 	 * at half beacon interval offset relative to the STA chanctx.</div><div class='hunk'>@@ -691,7 +686,7 @@ void ath_chanctx_event(struct ath_softc *sc, struct ieee80211_vif *vif,</div><div class='ctx'> 		 */</div><div class='ctx'> 		tsf_time = sc-&gt;sched.switch_start_time;</div><div class='ctx'> 		tsf_time -= (u32) sc-&gt;cur_chan-&gt;tsf_val +</div><div class='del'>-			ath9k_hw_get_tsf_offset(&amp;sc-&gt;cur_chan-&gt;tsf_ts, NULL);</div><div class='add'>+			ath9k_hw_get_tsf_offset(sc-&gt;cur_chan-&gt;tsf_ts, 0);</div><div class='ctx'> 		tsf_time += ath9k_hw_gettsf32(ah);</div><div class='ctx'> </div><div class='ctx'> 		sc-&gt;sched.beacon_adjust = false;</div><div class='hunk'>@@ -1045,7 +1040,7 @@ static void ath_scan_channel_start(struct ath_softc *sc)</div><div class='ctx'> </div><div class='ctx'> static void ath_chanctx_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ath_softc *sc = from_timer(sc, t, sched.timer);</div><div class='add'>+	struct ath_softc *sc = timer_container_of(sc, t, sched.timer);</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(sc-&gt;sc_ah);</div><div class='ctx'> </div><div class='ctx'> 	ath_dbg(common, CHAN_CTX,</div><div class='hunk'>@@ -1056,7 +1051,7 @@ static void ath_chanctx_timer(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> static void ath_offchannel_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ath_softc *sc = from_timer(sc, t, offchannel.timer);</div><div class='add'>+	struct ath_softc *sc = timer_container_of(sc, t, offchannel.timer);</div><div class='ctx'> 	struct ath_chanctx *ctx;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(sc-&gt;sc_ah);</div><div class='ctx'> </div><div class='hunk'>@@ -1113,7 +1108,7 @@ ath_chanctx_send_vif_ps_frame(struct ath_softc *sc, struct ath_vif *avp,</div><div class='ctx'> 		if (!avp-&gt;assoc)</div><div class='ctx'> 			return false;</div><div class='ctx'> </div><div class='del'>-		skb = ieee80211_nullfunc_get(sc-&gt;hw, vif, false);</div><div class='add'>+		skb = ieee80211_nullfunc_get(sc-&gt;hw, vif, -1, false);</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			return false;</div><div class='ctx'> </div><div class='hunk'>@@ -1230,10 +1225,10 @@ void ath_chanctx_set_next(struct ath_softc *sc, bool force)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(sc-&gt;sc_ah);</div><div class='ctx'> 	struct ath_chanctx *old_ctx;</div><div class='del'>-	struct timespec64 ts;</div><div class='ctx'> 	bool measure_time = false;</div><div class='ctx'> 	bool send_ps = false;</div><div class='ctx'> 	bool queues_stopped = false;</div><div class='add'>+	ktime_t ts;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;sc-&gt;chan_lock);</div><div class='ctx'> 	if (!sc-&gt;next_chan) {</div><div class='hunk'>@@ -1260,7 +1255,7 @@ void ath_chanctx_set_next(struct ath_softc *sc, bool force)</div><div class='ctx'> 		spin_unlock_bh(&amp;sc-&gt;chan_lock);</div><div class='ctx'> </div><div class='ctx'> 		if (sc-&gt;next_chan == &amp;sc-&gt;offchannel.chan) {</div><div class='del'>-			ktime_get_raw_ts64(&amp;ts);</div><div class='add'>+			ts = ktime_get_raw();</div><div class='ctx'> 			measure_time = true;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1277,7 +1272,7 @@ void ath_chanctx_set_next(struct ath_softc *sc, bool force)</div><div class='ctx'> 		spin_lock_bh(&amp;sc-&gt;chan_lock);</div><div class='ctx'> </div><div class='ctx'> 		if (sc-&gt;cur_chan != &amp;sc-&gt;offchannel.chan) {</div><div class='del'>-			ktime_get_raw_ts64(&amp;sc-&gt;cur_chan-&gt;tsf_ts);</div><div class='add'>+			sc-&gt;cur_chan-&gt;tsf_ts = ktime_get_raw();</div><div class='ctx'> 			sc-&gt;cur_chan-&gt;tsf_val = ath9k_hw_gettsf64(sc-&gt;sc_ah);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1303,7 +1298,7 @@ void ath_chanctx_set_next(struct ath_softc *sc, bool force)</div><div class='ctx'> 		ath_set_channel(sc);</div><div class='ctx'> 		if (measure_time)</div><div class='ctx'> 			sc-&gt;sched.channel_switch_time =</div><div class='del'>-				ath9k_hw_get_tsf_offset(&amp;ts, NULL);</div><div class='add'>+				ath9k_hw_get_tsf_offset(ts, 0);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * A reset will ensure that all queues are woken up,</div><div class='ctx'> 		 * so there is no need to awaken them again.</div><div class='hunk'>@@ -1561,7 +1556,7 @@ void ath9k_p2p_ps_timer(void *priv)</div><div class='ctx'> 	struct ath_node *an;</div><div class='ctx'> 	u32 tsf;</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;sc-&gt;sched.timer);</div><div class='add'>+	timer_delete_sync(&amp;sc-&gt;sched.timer);</div><div class='ctx'> 	ath9k_hw_gen_timer_stop(sc-&gt;sc_ah, sc-&gt;p2p_ps_timer);</div><div class='ctx'> 	ath_chanctx_event(sc, NULL, ATH_CHANCTX_EVENT_TSF_TIMER);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/common-beacon.c b/drivers/net/wireless/ath/ath9k/common-beacon.c<br/>index 01d6d3205a65..e4df89f2fa03 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/common-beacon.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/common-beacon.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/common-beacon.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/common-beacon.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'>  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> #define FUDGE 2</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/common-debug.c b/drivers/net/wireless/ath/ath9k/common-debug.c<br/>index 7aefb79f6bed..1ea070200e4a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/common-debug.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/common-debug.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/common-debug.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/common-debug.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'>  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> static ssize_t read_file_modal_eeprom(struct file *file, char __user *user_buf,</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/common-init.c b/drivers/net/wireless/ath/ath9k/common-init.c<br/>index 82de0fadbc95..da102c791712 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/common-init.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/common-init.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/common-init.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/common-init.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> </div><div class='ctx'> /* We use the hw_value as an index into our private channel structure */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> #define CHAN2G(_freq, _idx)  { \</div><div class='hunk'>@@ -124,7 +125,7 @@ static struct ieee80211_rate ath9k_legacy_rates[] = {</div><div class='ctx'> </div><div class='ctx'> int ath9k_cmn_init_channels_rates(struct ath_common *common)</div><div class='ctx'> {</div><div class='del'>-	struct ath_hw *ah = (struct ath_hw *)common-&gt;ah;</div><div class='add'>+	struct ath_hw *ah = common-&gt;ah;</div><div class='ctx'> 	void *channels;</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(ARRAY_SIZE(ath9k_2ghz_chantable) +</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/common-spectral.c b/drivers/net/wireless/ath/ath9k/common-spectral.c<br/>index e055adfb5361..ca01a07f6630 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/common-spectral.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/common-spectral.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/common-spectral.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/common-spectral.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'>  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/relay.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include "ath9k.h"</div><div class='hunk'>@@ -471,7 +472,7 @@ int ath_cmn_process_fft(struct ath_spec_scan_priv *spec_priv, struct ieee80211_h</div><div class='ctx'> 	u8 sample_buf[SPECTRAL_SAMPLE_MAX_LEN] = {0};</div><div class='ctx'> 	struct ath_hw *ah = spec_priv-&gt;ah;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(spec_priv-&gt;ah);</div><div class='del'>-	struct ath_softc *sc = (struct ath_softc *)common-&gt;priv;</div><div class='add'>+	struct ath_softc *sc = common-&gt;priv;</div><div class='ctx'> 	u8 num_bins, *vdata = (u8 *)hdr;</div><div class='ctx'> 	struct ath_radar_info *radar_info;</div><div class='ctx'> 	int len = rs-&gt;rs_datalen;</div><div class='hunk'>@@ -628,12 +629,12 @@ int ath_cmn_process_fft(struct ath_spec_scan_priv *spec_priv, struct ieee80211_h</div><div class='ctx'> 				else</div><div class='ctx'> 					RX_STAT_INC(sc, rx_spectral_sample_err);</div><div class='ctx'> </div><div class='del'>-				memset(sample_buf, 0, SPECTRAL_SAMPLE_MAX_LEN);</div><div class='del'>-</div><div class='ctx'> 				/* Mix the received bins to the /dev/random</div><div class='ctx'> 				 * pool</div><div class='ctx'> 				 */</div><div class='ctx'> 				add_device_randomness(sample_buf, num_bins);</div><div class='add'>+</div><div class='add'>+				memset(sample_buf, 0, SPECTRAL_SAMPLE_MAX_LEN);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* Process a normal frame */</div><div class='hunk'>@@ -734,7 +735,7 @@ void ath9k_cmn_spectral_scan_trigger(struct ath_common *common,</div><div class='ctx'> 				 ATH9K_RX_FILTER_PHYRADAR |</div><div class='ctx'> 				 ATH9K_RX_FILTER_PHYERR);</div><div class='ctx'> </div><div class='del'>-	/* TODO: usually this should not be neccesary, but for some reason</div><div class='add'>+	/* TODO: usually this should not be necessary, but for some reason</div><div class='ctx'> 	 * (or in some mode?) the trigger must be called after the</div><div class='ctx'> 	 * configuration, otherwise the register will have its values reset</div><div class='ctx'> 	 * (on my ar9220 to value 0x01002310)</div><div class='hunk'>@@ -855,16 +856,11 @@ static ssize_t write_file_spectral_short_repeat(struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_spec_scan_priv *spec_priv = file-&gt;private_data;</div><div class='ctx'> 	unsigned long val;</div><div class='del'>-	char buf[32];</div><div class='del'>-	ssize_t len;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	len = min(count, sizeof(buf) - 1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, len))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	buf[len] = '\0';</div><div class='del'>-	if (kstrtoul(buf, 0, &amp;val))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ret = kstrtoul_from_user(user_buf, count, 0, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (val &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -903,17 +899,11 @@ static ssize_t write_file_spectral_count(struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_spec_scan_priv *spec_priv = file-&gt;private_data;</div><div class='ctx'> 	unsigned long val;</div><div class='del'>-	char buf[32];</div><div class='del'>-	ssize_t len;</div><div class='del'>-</div><div class='del'>-	len = min(count, sizeof(buf) - 1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, len))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	buf[len] = '\0';</div><div class='del'>-	if (kstrtoul(buf, 0, &amp;val))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='add'>+	ret = kstrtoul_from_user(user_buf, count, 0, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> 	if (val &gt; 255)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -951,16 +941,11 @@ static ssize_t write_file_spectral_period(struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_spec_scan_priv *spec_priv = file-&gt;private_data;</div><div class='ctx'> 	unsigned long val;</div><div class='del'>-	char buf[32];</div><div class='del'>-	ssize_t len;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	len = min(count, sizeof(buf) - 1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, len))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	buf[len] = '\0';</div><div class='del'>-	if (kstrtoul(buf, 0, &amp;val))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ret = kstrtoul_from_user(user_buf, count, 0, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (val &gt; 255)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -999,16 +984,11 @@ static ssize_t write_file_spectral_fft_period(struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_spec_scan_priv *spec_priv = file-&gt;private_data;</div><div class='ctx'> 	unsigned long val;</div><div class='del'>-	char buf[32];</div><div class='del'>-	ssize_t len;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	len = min(count, sizeof(buf) - 1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, len))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	buf[len] = '\0';</div><div class='del'>-	if (kstrtoul(buf, 0, &amp;val))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ret = kstrtoul_from_user(user_buf, count, 0, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (val &gt; 15)</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/common.c b/drivers/net/wireless/ath/ath9k/common.c<br/>index 099f3d45c594..ffcf2276eb92 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/common.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/common.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/common.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/common.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'>  * Module for common driver code between ath9k and ath9k_htc</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/common.h b/drivers/net/wireless/ath/ath9k/common.h<br/>index f0ab6f9955e4..12204cf86fcf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/common.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/common.h</a></div><div class='hunk'>@@ -85,8 +85,6 @@ struct ath9k_channel *ath9k_cmn_get_channel(struct ieee80211_hw *hw,</div><div class='ctx'> 					    struct ath_hw *ah,</div><div class='ctx'> 					    struct cfg80211_chan_def *chandef);</div><div class='ctx'> int ath9k_cmn_count_streams(unsigned int chainmask, int max);</div><div class='del'>-void ath9k_cmn_btcoex_bt_stomp(struct ath_common *common,</div><div class='del'>-				  enum ath_stomp_type stomp_type);</div><div class='ctx'> void ath9k_cmn_update_txpow(struct ath_hw *ah, u16 cur_txpow,</div><div class='ctx'> 			    u16 new_txpow, u16 *txpower);</div><div class='ctx'> void ath9k_cmn_init_crypto(struct ath_hw *ah);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c<br/>index 4c81b1d7f417..74a0134075cf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/debug.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/debug.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/debug.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/debug.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ath9k.h"</div><div class='ctx'> </div><div class='hunk'>@@ -96,21 +96,16 @@ static ssize_t read_file_debug(struct file *file, char __user *user_buf,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t write_file_debug(struct file *file, const char __user *user_buf,</div><div class='del'>-			     size_t count, loff_t *ppos)</div><div class='add'>+				size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = file-&gt;private_data;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(sc-&gt;sc_ah);</div><div class='ctx'> 	unsigned long mask;</div><div class='del'>-	char buf[32];</div><div class='del'>-	ssize_t len;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	len = min(count, sizeof(buf) - 1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, len))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	buf[len] = '\0';</div><div class='del'>-	if (kstrtoul(buf, 0, &amp;mask))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ret = kstrtoul_from_user(user_buf, count, 0, &amp;mask);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	common-&gt;debug_mask = mask;</div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -191,16 +186,11 @@ static ssize_t write_file_ani(struct file *file,</div><div class='ctx'> 	struct ath_softc *sc = file-&gt;private_data;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(sc-&gt;sc_ah);</div><div class='ctx'> 	unsigned long ani;</div><div class='del'>-	char buf[32];</div><div class='del'>-	ssize_t len;</div><div class='del'>-</div><div class='del'>-	len = min(count, sizeof(buf) - 1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, len))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	buf[len] = '\0';</div><div class='del'>-	if (kstrtoul(buf, 0, &amp;ani))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ret = kstrtoul_from_user(user_buf, count, 0, &amp;ani);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (ani &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -248,20 +238,15 @@ static ssize_t write_file_bt_ant_diversity(struct file *file,</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(sc-&gt;sc_ah);</div><div class='ctx'> 	struct ath9k_hw_capabilities *pCap = &amp;sc-&gt;sc_ah-&gt;caps;</div><div class='ctx'> 	unsigned long bt_ant_diversity;</div><div class='del'>-	char buf[32];</div><div class='del'>-	ssize_t len;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	len = min(count, sizeof(buf) - 1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, len))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	ret = kstrtoul_from_user(user_buf, count, 0, &amp;bt_ant_diversity);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!(pCap-&gt;hw_caps &amp; ATH9K_HW_CAP_BT_ANT_DIV))</div><div class='ctx'> 		goto exit;</div><div class='ctx'> </div><div class='del'>-	buf[len] = '\0';</div><div class='del'>-	if (kstrtoul(buf, 0, &amp;bt_ant_diversity))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	common-&gt;bt_ant_diversity = !!bt_ant_diversity;</div><div class='ctx'> 	ath9k_ps_wakeup(sc);</div><div class='ctx'> 	ath9k_hw_set_bt_ant_diversity(sc-&gt;sc_ah, common-&gt;bt_ant_diversity);</div><div class='hunk'>@@ -749,9 +734,9 @@ static int read_file_misc(struct seq_file *file, void *data)</div><div class='ctx'> </div><div class='ctx'> static int read_file_reset(struct seq_file *file, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_hw *hw = dev_get_drvdata(file-&gt;private);</div><div class='del'>-	struct ath_softc *sc = hw-&gt;priv;</div><div class='add'>+	struct ath_softc *sc = file-&gt;private;</div><div class='ctx'> 	static const char * const reset_cause[__RESET_TYPE_MAX] = {</div><div class='add'>+		[RESET_TYPE_USER] = "User reset",</div><div class='ctx'> 		[RESET_TYPE_BB_HANG] = "Baseband Hang",</div><div class='ctx'> 		[RESET_TYPE_BB_WATCHDOG] = "Baseband Watchdog",</div><div class='ctx'> 		[RESET_TYPE_FATAL_INT] = "Fatal HW Error",</div><div class='hunk'>@@ -765,6 +750,7 @@ static int read_file_reset(struct seq_file *file, void *data)</div><div class='ctx'> 		[RESET_TYPE_CALIBRATION] = "Calibration error",</div><div class='ctx'> 		[RESET_TX_DMA_ERROR] = "Tx DMA stop error",</div><div class='ctx'> 		[RESET_RX_DMA_ERROR] = "Rx DMA stop error",</div><div class='add'>+		[RESET_TYPE_RX_INACTIVE] = "Rx path inactive",</div><div class='ctx'> 	};</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -779,6 +765,50 @@ static int read_file_reset(struct seq_file *file, void *data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int open_file_reset(struct inode *inode, struct file *f)</div><div class='add'>+{</div><div class='add'>+	return single_open(f, read_file_reset, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t write_file_reset(struct file *file,</div><div class='add'>+				const char __user *user_buf,</div><div class='add'>+				size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath_softc *sc = file_inode(file)-&gt;i_private;</div><div class='add'>+	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	unsigned long val;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtoul_from_user(user_buf, count, 0, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (val != 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* avoid rearming hw_reset_work on shutdown */</div><div class='add'>+	mutex_lock(&amp;sc-&gt;mutex);</div><div class='add'>+	if (test_bit(ATH_OP_INVALID, &amp;common-&gt;op_flags)) {</div><div class='add'>+		mutex_unlock(&amp;sc-&gt;mutex);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath9k_queue_reset(sc, RESET_TYPE_USER);</div><div class='add'>+	mutex_unlock(&amp;sc-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_reset = {</div><div class='add'>+	.read = seq_read,</div><div class='add'>+	.write = write_file_reset,</div><div class='add'>+	.open = open_file_reset,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = seq_lseek,</div><div class='add'>+	.release = single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf,</div><div class='ctx'> 		       struct ath_tx_status *ts, struct ath_txq *txq,</div><div class='ctx'> 		       unsigned int flags)</div><div class='hunk'>@@ -837,16 +867,11 @@ static ssize_t write_file_regidx(struct file *file, const char __user *user_buf,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = file-&gt;private_data;</div><div class='ctx'> 	unsigned long regidx;</div><div class='del'>-	char buf[32];</div><div class='del'>-	ssize_t len;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	len = min(count, sizeof(buf) - 1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, len))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	buf[len] = '\0';</div><div class='del'>-	if (kstrtoul(buf, 0, &amp;regidx))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ret = kstrtoul_from_user(user_buf, count, 0, &amp;regidx);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	sc-&gt;debug.regidx = regidx;</div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -882,16 +907,11 @@ static ssize_t write_file_regval(struct file *file, const char __user *user_buf,</div><div class='ctx'> 	struct ath_softc *sc = file-&gt;private_data;</div><div class='ctx'> 	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='ctx'> 	unsigned long regval;</div><div class='del'>-	char buf[32];</div><div class='del'>-	ssize_t len;</div><div class='del'>-</div><div class='del'>-	len = min(count, sizeof(buf) - 1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, len))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	buf[len] = '\0';</div><div class='del'>-	if (kstrtoul(buf, 0, &amp;regval))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ret = kstrtoul_from_user(user_buf, count, 0, &amp;regval);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ath9k_ps_wakeup(sc);</div><div class='ctx'> 	REG_WRITE_D(ah, sc-&gt;debug.regidx, regval);</div><div class='hunk'>@@ -1079,16 +1099,11 @@ static ssize_t write_file_wow(struct file *file, const char __user *user_buf,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = file-&gt;private_data;</div><div class='ctx'> 	unsigned long val;</div><div class='del'>-	char buf[32];</div><div class='del'>-	ssize_t len;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	len = min(count, sizeof(buf) - 1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, len))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	buf[len] = '\0';</div><div class='del'>-	if (kstrtoul(buf, 0, &amp;val))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ret = kstrtoul_from_user(user_buf, count, 0, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (val != 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1142,17 +1157,12 @@ static ssize_t write_file_tpc(struct file *file, const char __user *user_buf,</div><div class='ctx'> 	struct ath_softc *sc = file-&gt;private_data;</div><div class='ctx'> 	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='ctx'> 	unsigned long val;</div><div class='del'>-	char buf[32];</div><div class='del'>-	ssize_t len;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> 	bool tpc_enabled;</div><div class='ctx'> </div><div class='del'>-	len = min(count, sizeof(buf) - 1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, len))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	buf[len] = '\0';</div><div class='del'>-	if (kstrtoul(buf, 0, &amp;val))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ret = kstrtoul_from_user(user_buf, count, 0, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (val &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1284,7 +1294,7 @@ void ath9k_get_et_strings(struct ieee80211_hw *hw,</div><div class='ctx'> 			  u32 sset, u8 *data)</div><div class='ctx'> {</div><div class='ctx'> 	if (sset == ETH_SS_STATS)</div><div class='del'>-		memcpy(data, *ath9k_gstrings_stats,</div><div class='add'>+		memcpy(data, ath9k_gstrings_stats,</div><div class='ctx'> 		       sizeof(ath9k_gstrings_stats));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1316,11 +1326,11 @@ void ath9k_get_et_stats(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> </div><div class='del'>-	data[i++] = (sc-&gt;debug.stats.txstats[PR_QNUM(IEEE80211_AC_BE)].tx_pkts_all +</div><div class='add'>+	data[i++] = ((u64)sc-&gt;debug.stats.txstats[PR_QNUM(IEEE80211_AC_BE)].tx_pkts_all +</div><div class='ctx'> 		     sc-&gt;debug.stats.txstats[PR_QNUM(IEEE80211_AC_BK)].tx_pkts_all +</div><div class='ctx'> 		     sc-&gt;debug.stats.txstats[PR_QNUM(IEEE80211_AC_VI)].tx_pkts_all +</div><div class='ctx'> 		     sc-&gt;debug.stats.txstats[PR_QNUM(IEEE80211_AC_VO)].tx_pkts_all);</div><div class='del'>-	data[i++] = (sc-&gt;debug.stats.txstats[PR_QNUM(IEEE80211_AC_BE)].tx_bytes_all +</div><div class='add'>+	data[i++] = ((u64)sc-&gt;debug.stats.txstats[PR_QNUM(IEEE80211_AC_BE)].tx_bytes_all +</div><div class='ctx'> 		     sc-&gt;debug.stats.txstats[PR_QNUM(IEEE80211_AC_BK)].tx_bytes_all +</div><div class='ctx'> 		     sc-&gt;debug.stats.txstats[PR_QNUM(IEEE80211_AC_VI)].tx_bytes_all +</div><div class='ctx'> 		     sc-&gt;debug.stats.txstats[PR_QNUM(IEEE80211_AC_VO)].tx_bytes_all);</div><div class='hunk'>@@ -1367,12 +1377,10 @@ void ath9k_deinit_debug(struct ath_softc *sc)</div><div class='ctx'> int ath9k_init_debug(struct ath_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='del'>-	struct ath_softc *sc = (struct ath_softc *) common-&gt;priv;</div><div class='add'>+	struct ath_softc *sc = common-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	sc-&gt;debug.debugfs_phy = debugfs_create_dir("ath9k",</div><div class='ctx'> 						   sc-&gt;hw-&gt;wiphy-&gt;debugfsdir);</div><div class='del'>-	if (!sc-&gt;debug.debugfs_phy)</div><div class='del'>-		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ATH_DEBUG</div><div class='ctx'> 	debugfs_create_file("debug", 0600, sc-&gt;debug.debugfs_phy,</div><div class='hunk'>@@ -1393,8 +1401,8 @@ int ath9k_init_debug(struct ath_hw *ah)</div><div class='ctx'> 				    read_file_queues);</div><div class='ctx'> 	debugfs_create_devm_seqfile(sc-&gt;dev, "misc", sc-&gt;debug.debugfs_phy,</div><div class='ctx'> 				    read_file_misc);</div><div class='del'>-	debugfs_create_devm_seqfile(sc-&gt;dev, "reset", sc-&gt;debug.debugfs_phy,</div><div class='del'>-				    read_file_reset);</div><div class='add'>+	debugfs_create_file("reset", 0600, sc-&gt;debug.debugfs_phy,</div><div class='add'>+			    sc, &amp;fops_reset);</div><div class='ctx'> </div><div class='ctx'> 	ath9k_cmn_debug_recv(sc-&gt;debug.debugfs_phy, &amp;sc-&gt;debug.stats.rxstats);</div><div class='ctx'> 	ath9k_cmn_debug_phy_err(sc-&gt;debug.debugfs_phy, &amp;sc-&gt;debug.stats.rxstats);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/debug.h b/drivers/net/wireless/ath/ath9k/debug.h<br/>index 33826aa13687..cb3e75969875 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/debug.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/debug.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/debug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/debug.h</a></div><div class='hunk'>@@ -39,6 +39,7 @@ struct fft_sample_tlv;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> enum ath_reset_type {</div><div class='add'>+	RESET_TYPE_USER,</div><div class='ctx'> 	RESET_TYPE_BB_HANG,</div><div class='ctx'> 	RESET_TYPE_BB_WATCHDOG,</div><div class='ctx'> 	RESET_TYPE_FATAL_INT,</div><div class='hunk'>@@ -52,6 +53,7 @@ enum ath_reset_type {</div><div class='ctx'> 	RESET_TYPE_CALIBRATION,</div><div class='ctx'> 	RESET_TX_DMA_ERROR,</div><div class='ctx'> 	RESET_RX_DMA_ERROR,</div><div class='add'>+	RESET_TYPE_RX_INACTIVE,</div><div class='ctx'> 	__RESET_TYPE_MAX</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/debug_sta.c b/drivers/net/wireless/ath/ath9k/debug_sta.c<br/>index d95cabddce33..1e2a30019fb6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/debug_sta.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/debug_sta.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/debug_sta.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/debug_sta.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@ static ssize_t read_file_node_aggr(struct file *file, char __user *user_buf,</div><div class='ctx'> 	if (buf == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (!an-&gt;sta-&gt;ht_cap.ht_supported) {</div><div class='add'>+	if (!an-&gt;sta-&gt;deflink.ht_cap.ht_supported) {</div><div class='ctx'> 		len = scnprintf(buf, size, "%s\n",</div><div class='ctx'> 				"HT not supported");</div><div class='ctx'> 		goto exit;</div><div class='hunk'>@@ -186,7 +186,7 @@ static ssize_t read_file_node_recv(struct file *file, char __user *user_buf,</div><div class='ctx'> 	band = ah-&gt;curchan-&gt;chan-&gt;band;</div><div class='ctx'> 	rstats = &amp;an-&gt;rx_rate_stats;</div><div class='ctx'> </div><div class='del'>-	if (!sta-&gt;ht_cap.ht_supported)</div><div class='add'>+	if (!sta-&gt;deflink.ht_cap.ht_supported)</div><div class='ctx'> 		goto legacy;</div><div class='ctx'> </div><div class='ctx'> 	len += scnprintf(buf + len, size - len,</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/dfs.c b/drivers/net/wireless/ath/ath9k/dfs.c<br/>index acb9602aa464..2fb73a5e1d51 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/dfs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/dfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/dfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/dfs.c</a></div><div class='hunk'>@@ -79,7 +79,7 @@ static int ath9k_get_max_index_ht40(struct ath9k_dfs_fft_40 *fft,</div><div class='ctx'> 	const int DFS_UPPER_BIN_OFFSET = 64;</div><div class='ctx'> 	/* if detected radar on both channels, select the significant one */</div><div class='ctx'> 	if (is_ctl &amp;&amp; is_ext) {</div><div class='del'>-		/* first check wether channels have 'strong' bins */</div><div class='add'>+		/* first check whether channels have 'strong' bins */</div><div class='ctx'> 		is_ctl = fft_bitmap_weight(fft-&gt;lower_bins) != 0;</div><div class='ctx'> 		is_ext = fft_bitmap_weight(fft-&gt;upper_bins) != 0;</div><div class='ctx'> </div><div class='hunk'>@@ -246,7 +246,7 @@ ath9k_postprocess_radar_event(struct ath_softc *sc,</div><div class='ctx'> 		DFS_STAT_INC(sc, dc_phy_errors);</div><div class='ctx'> </div><div class='ctx'> 		/* when both are present use stronger one */</div><div class='del'>-		rssi = (ard-&gt;rssi &lt; ard-&gt;ext_rssi) ? ard-&gt;ext_rssi : ard-&gt;rssi;</div><div class='add'>+		rssi = max(ard-&gt;rssi, ard-&gt;ext_rssi);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -280,7 +280,7 @@ ath9k_dfs_process_radar_pulse(struct ath_softc *sc, struct pulse_event *pe)</div><div class='ctx'> 	if (!pd-&gt;add_pulse(pd, pe, NULL))</div><div class='ctx'> 		return;</div><div class='ctx'> 	DFS_STAT_INC(sc, radar_detected);</div><div class='del'>-	ieee80211_radar_detected(sc-&gt;hw);</div><div class='add'>+	ieee80211_radar_detected(sc-&gt;hw, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.c b/drivers/net/wireless/ath/ath9k/dfs_debug.c<br/>index 2a79c2fa8415..426caa057396 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/dfs_debug.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/dfs_debug.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/dfs_debug.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/dfs_debug.c</a></div><div class='hunk'>@@ -99,17 +99,11 @@ static ssize_t write_file_dfs(struct file *file, const char __user *user_buf,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = file-&gt;private_data;</div><div class='ctx'> 	unsigned long val;</div><div class='del'>-	char buf[32];</div><div class='del'>-	ssize_t len;</div><div class='del'>-</div><div class='del'>-	len = min(count, sizeof(buf) - 1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, len))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	buf[len] = '\0';</div><div class='del'>-	if (kstrtoul(buf, 0, &amp;val))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='add'>+	ret = kstrtoul_from_user(user_buf, count, 0, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> 	if (val == DFS_STATS_RESET_MAGIC)</div><div class='ctx'> 		memset(&amp;sc-&gt;debug.stats.dfs_stats, 0,</div><div class='ctx'> 		       sizeof(sc-&gt;debug.stats.dfs_stats));</div><div class='hunk'>@@ -122,7 +116,7 @@ static ssize_t write_file_simulate_radar(struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = file-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	ieee80211_radar_detected(sc-&gt;hw);</div><div class='add'>+	ieee80211_radar_detected(sc-&gt;hw, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/dynack.c b/drivers/net/wireless/ath/ath9k/dynack.c<br/>index 321ff54fdb42..598b3a2ad818 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/dynack.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/dynack.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/dynack.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/dynack.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'>  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include "ath9k.h"</div><div class='ctx'> #include "hw.h"</div><div class='ctx'> #include "dynack.h"</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c<br/>index c22d457dbc54..df58dc02e104 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/eeprom.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/eeprom.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/eeprom.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/eeprom.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "hw.h"</div><div class='del'>-#include &lt;linux/ath9k_platform.h&gt;</div><div class='ctx'> </div><div class='ctx'> void ath9k_hw_analog_shift_regwrite(struct ath_hw *ah, u32 reg, u32 val)</div><div class='ctx'> {</div><div class='hunk'>@@ -119,14 +118,6 @@ static bool ath9k_hw_nvram_read_array(u16 *blob, size_t blob_size,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ath9k_hw_nvram_read_pdata(struct ath9k_platform_data *pdata,</div><div class='del'>-				      off_t offset, u16 *data)</div><div class='del'>-{</div><div class='del'>-	return ath9k_hw_nvram_read_array(pdata-&gt;eeprom_data,</div><div class='del'>-					 ARRAY_SIZE(pdata-&gt;eeprom_data),</div><div class='del'>-					 offset, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool ath9k_hw_nvram_read_firmware(const struct firmware *eeprom_blob,</div><div class='ctx'> 					 off_t offset, u16 *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -135,16 +126,23 @@ static bool ath9k_hw_nvram_read_firmware(const struct firmware *eeprom_blob,</div><div class='ctx'> 					 offset, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ath9k_hw_nvram_read_nvmem(struct ath_hw *ah, off_t offset,</div><div class='add'>+				      u16 *data)</div><div class='add'>+{</div><div class='add'>+	return ath9k_hw_nvram_read_array(ah-&gt;nvmem_blob,</div><div class='add'>+					 ah-&gt;nvmem_blob_len / sizeof(u16),</div><div class='add'>+					 offset, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> bool ath9k_hw_nvram_read(struct ath_hw *ah, u32 off, u16 *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='del'>-	struct ath9k_platform_data *pdata = ah-&gt;dev-&gt;platform_data;</div><div class='ctx'> 	bool ret;</div><div class='ctx'> </div><div class='del'>-	if (ah-&gt;eeprom_blob)</div><div class='add'>+	if (ah-&gt;nvmem_blob)</div><div class='add'>+		ret = ath9k_hw_nvram_read_nvmem(ah, off, data);</div><div class='add'>+	else if (ah-&gt;eeprom_blob)</div><div class='ctx'> 		ret = ath9k_hw_nvram_read_firmware(ah-&gt;eeprom_blob, off, data);</div><div class='del'>-	else if (pdata &amp;&amp; !pdata-&gt;use_eeprom)</div><div class='del'>-		ret = ath9k_hw_nvram_read_pdata(pdata, off, data);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = common-&gt;bus_ops-&gt;eeprom_read(common, off, data);</div><div class='ctx'> </div><div class='hunk'>@@ -660,8 +658,6 @@ void ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hw *ah,</div><div class='ctx'> </div><div class='ctx'> int ath9k_hw_eeprom_init(struct ath_hw *ah)</div><div class='ctx'> {</div><div class='del'>-	int status;</div><div class='del'>-</div><div class='ctx'> 	if (AR_SREV_9300_20_OR_LATER(ah))</div><div class='ctx'> 		ah-&gt;eep_ops = &amp;eep_ar9300_ops;</div><div class='ctx'> 	else if (AR_SREV_9287(ah)) {</div><div class='hunk'>@@ -675,7 +671,5 @@ int ath9k_hw_eeprom_init(struct ath_hw *ah)</div><div class='ctx'> 	if (!ah-&gt;eep_ops-&gt;fill_eeprom(ah))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	status = ah-&gt;eep_ops-&gt;check_eeprom(ah);</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='add'>+	return ah-&gt;eep_ops-&gt;check_eeprom(ah);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/eeprom.h b/drivers/net/wireless/ath/ath9k/eeprom.h<br/>index 31390af6c33e..f1cde43fcb55 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/eeprom.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/eeprom.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/eeprom.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/eeprom.h</a></div><div class='hunk'>@@ -68,8 +68,8 @@</div><div class='ctx'> #define AR5416_EEPROM_OFFSET        0x2000</div><div class='ctx'> #define AR5416_EEPROM_MAX           0xae0</div><div class='ctx'> </div><div class='del'>-#define AR5416_EEPROM_START_ADDR \</div><div class='del'>-	(AR_SREV_9100(ah)) ? 0x1fff1000 : 0x503f1200</div><div class='add'>+#define AR5416_EEPROM_START_ADDR(_ah) \</div><div class='add'>+	(AR_SREV_9100(_ah)) ? 0x1fff1000 : 0x503f1200</div><div class='ctx'> </div><div class='ctx'> #define SD_NO_CTL               0xE0</div><div class='ctx'> #define NO_CTL                  0xff</div><div class='hunk'>@@ -110,10 +110,10 @@</div><div class='ctx'> #define FBIN2FREQ(x, y)		((y) ? (2300 + x) : (4800 + 5 * x))</div><div class='ctx'> #define ath9k_hw_use_flash(_ah)	(!(_ah-&gt;ah_flags &amp; AH_USE_EEPROM))</div><div class='ctx'> </div><div class='del'>-#define OLC_FOR_AR9280_20_LATER (AR_SREV_9280_20_OR_LATER(ah) &amp;&amp; \</div><div class='del'>-				 ah-&gt;eep_ops-&gt;get_eeprom(ah, EEP_OL_PWRCTRL))</div><div class='del'>-#define OLC_FOR_AR9287_10_LATER (AR_SREV_9287_11_OR_LATER(ah) &amp;&amp; \</div><div class='del'>-				 ah-&gt;eep_ops-&gt;get_eeprom(ah, EEP_OL_PWRCTRL))</div><div class='add'>+#define OLC_FOR_AR9280_20_LATER(_ah) (AR_SREV_9280_20_OR_LATER(_ah) &amp;&amp; \</div><div class='add'>+				 _ah-&gt;eep_ops-&gt;get_eeprom(_ah, EEP_OL_PWRCTRL))</div><div class='add'>+#define OLC_FOR_AR9287_10_LATER(_ah) (AR_SREV_9287_11_OR_LATER(_ah) &amp;&amp; \</div><div class='add'>+				 _ah-&gt;eep_ops-&gt;get_eeprom(_ah, EEP_OL_PWRCTRL))</div><div class='ctx'> </div><div class='ctx'> #define EEP_RFSILENT_ENABLED        0x0001</div><div class='ctx'> #define EEP_RFSILENT_ENABLED_S      0</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/eeprom_4k.c b/drivers/net/wireless/ath/ath9k/eeprom_4k.c<br/>index e8c2cc03be0c..3e16cfe059f3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/eeprom_4k.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/eeprom_4k.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/eeprom_4k.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/eeprom_4k.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'>  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include "hw.h"</div><div class='ctx'> #include "ar9002_phy.h"</div><div class='ctx'> </div><div class='hunk'>@@ -76,7 +76,7 @@ static bool ath9k_hw_4k_fill_eeprom(struct ath_hw *ah)</div><div class='ctx'> static u32 ath9k_dump_4k_modal_eeprom(char *buf, u32 len, u32 size,</div><div class='ctx'> 				      struct modal_eep_4k_header *modal_hdr)</div><div class='ctx'> {</div><div class='del'>-	PR_EEP("Chain0 Ant. Control", le16_to_cpu(modal_hdr-&gt;antCtrlChain[0]));</div><div class='add'>+	PR_EEP("Chain0 Ant. Control", le32_to_cpu(modal_hdr-&gt;antCtrlChain[0]));</div><div class='ctx'> 	PR_EEP("Ant. Common Control", le32_to_cpu(modal_hdr-&gt;antCtrlCommon));</div><div class='ctx'> 	PR_EEP("Chain0 Ant. Gain", modal_hdr-&gt;antennaGainCh[0]);</div><div class='ctx'> 	PR_EEP("Switch Settle", modal_hdr-&gt;switchSettling);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/eeprom_9287.c b/drivers/net/wireless/ath/ath9k/eeprom_9287.c<br/>index 3caa149b1013..c139ac49ccf6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/eeprom_9287.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/eeprom_9287.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/eeprom_9287.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/eeprom_9287.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'>  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include "hw.h"</div><div class='ctx'> #include "ar9002_phy.h"</div><div class='ctx'> </div><div class='hunk'>@@ -79,8 +79,8 @@ static bool ath9k_hw_ar9287_fill_eeprom(struct ath_hw *ah)</div><div class='ctx'> static u32 ar9287_dump_modal_eeprom(char *buf, u32 len, u32 size,</div><div class='ctx'> 				    struct modal_eep_ar9287_header *modal_hdr)</div><div class='ctx'> {</div><div class='del'>-	PR_EEP("Chain0 Ant. Control", le16_to_cpu(modal_hdr-&gt;antCtrlChain[0]));</div><div class='del'>-	PR_EEP("Chain1 Ant. Control", le16_to_cpu(modal_hdr-&gt;antCtrlChain[1]));</div><div class='add'>+	PR_EEP("Chain0 Ant. Control", le32_to_cpu(modal_hdr-&gt;antCtrlChain[0]));</div><div class='add'>+	PR_EEP("Chain1 Ant. Control", le32_to_cpu(modal_hdr-&gt;antCtrlChain[1]));</div><div class='ctx'> 	PR_EEP("Ant. Common Control", le32_to_cpu(modal_hdr-&gt;antCtrlCommon));</div><div class='ctx'> 	PR_EEP("Chain0 Ant. Gain", modal_hdr-&gt;antennaGainCh[0]);</div><div class='ctx'> 	PR_EEP("Chain1 Ant. Gain", modal_hdr-&gt;antennaGainCh[1]);</div><div class='hunk'>@@ -572,8 +572,7 @@ static void ath9k_hw_set_ar9287_power_per_rate_table(struct ath_hw *ah,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (ctlMode = 0; ctlMode &lt; numCtlModes; ctlMode++) {</div><div class='del'>-		bool isHt40CtlMode =</div><div class='del'>-			(pCtlMode[ctlMode] == CTL_2GHT40) ? true : false;</div><div class='add'>+		bool isHt40CtlMode = pCtlMode[ctlMode] == CTL_2GHT40;</div><div class='ctx'> </div><div class='ctx'> 		if (isHt40CtlMode)</div><div class='ctx'> 			freq = centers.synth_center;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c<br/>index 9729a69d3e2e..5ba467cb7425 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/eeprom_def.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/eeprom_def.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/eeprom_def.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/eeprom_def.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'>  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include "hw.h"</div><div class='ctx'> #include "ar9002_phy.h"</div><div class='ctx'> </div><div class='hunk'>@@ -135,9 +135,9 @@ static bool ath9k_hw_def_fill_eeprom(struct ath_hw *ah)</div><div class='ctx'> static u32 ath9k_def_dump_modal_eeprom(char *buf, u32 len, u32 size,</div><div class='ctx'> 				       struct modal_eep_header *modal_hdr)</div><div class='ctx'> {</div><div class='del'>-	PR_EEP("Chain0 Ant. Control", le16_to_cpu(modal_hdr-&gt;antCtrlChain[0]));</div><div class='del'>-	PR_EEP("Chain1 Ant. Control", le16_to_cpu(modal_hdr-&gt;antCtrlChain[1]));</div><div class='del'>-	PR_EEP("Chain2 Ant. Control", le16_to_cpu(modal_hdr-&gt;antCtrlChain[2]));</div><div class='add'>+	PR_EEP("Chain0 Ant. Control", le32_to_cpu(modal_hdr-&gt;antCtrlChain[0]));</div><div class='add'>+	PR_EEP("Chain1 Ant. Control", le32_to_cpu(modal_hdr-&gt;antCtrlChain[1]));</div><div class='add'>+	PR_EEP("Chain2 Ant. Control", le32_to_cpu(modal_hdr-&gt;antCtrlChain[2]));</div><div class='ctx'> 	PR_EEP("Ant. Common Control", le32_to_cpu(modal_hdr-&gt;antCtrlCommon));</div><div class='ctx'> 	PR_EEP("Chain0 Ant. Gain", modal_hdr-&gt;antennaGainCh[0]);</div><div class='ctx'> 	PR_EEP("Chain1 Ant. Gain", modal_hdr-&gt;antennaGainCh[1]);</div><div class='hunk'>@@ -800,7 +800,7 @@ static void ath9k_hw_set_def_power_cal_table(struct ath_hw *ah,</div><div class='ctx'> 		numPiers = AR5416_NUM_5G_CAL_PIERS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (OLC_FOR_AR9280_20_LATER &amp;&amp; IS_CHAN_2GHZ(chan)) {</div><div class='add'>+	if (OLC_FOR_AR9280_20_LATER(ah) &amp;&amp; IS_CHAN_2GHZ(chan)) {</div><div class='ctx'> 		pRawDataset = pEepData-&gt;calPierData2G[0];</div><div class='ctx'> 		ah-&gt;initPDADC = ((struct calDataPerFreqOpLoop *)</div><div class='ctx'> 				 pRawDataset)-&gt;vpdPdg[0][0];</div><div class='hunk'>@@ -841,7 +841,7 @@ static void ath9k_hw_set_def_power_cal_table(struct ath_hw *ah,</div><div class='ctx'> 				pRawDataset = pEepData-&gt;calPierData5G[i];</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-			if (OLC_FOR_AR9280_20_LATER) {</div><div class='add'>+			if (OLC_FOR_AR9280_20_LATER(ah)) {</div><div class='ctx'> 				u8 pcdacIdx;</div><div class='ctx'> 				u8 txPower;</div><div class='ctx'> </div><div class='hunk'>@@ -869,7 +869,7 @@ static void ath9k_hw_set_def_power_cal_table(struct ath_hw *ah,</div><div class='ctx'> </div><div class='ctx'> 			ENABLE_REGWRITE_BUFFER(ah);</div><div class='ctx'> </div><div class='del'>-			if (OLC_FOR_AR9280_20_LATER) {</div><div class='add'>+			if (OLC_FOR_AR9280_20_LATER(ah)) {</div><div class='ctx'> 				REG_WRITE(ah,</div><div class='ctx'> 					AR_PHY_TPCRG5 + regChainOffset,</div><div class='ctx'> 					SM(0x6,</div><div class='hunk'>@@ -1203,7 +1203,7 @@ static void ath9k_hw_def_set_txpower(struct ath_hw *ah,</div><div class='ctx'> 		  | ATH9K_POW_SM(ratesArray[rate24mb], 0));</div><div class='ctx'> </div><div class='ctx'> 	if (IS_CHAN_2GHZ(chan)) {</div><div class='del'>-		if (OLC_FOR_AR9280_20_LATER) {</div><div class='add'>+		if (OLC_FOR_AR9280_20_LATER(ah)) {</div><div class='ctx'> 			cck_ofdm_delta = 2;</div><div class='ctx'> 			REG_WRITE(ah, AR_PHY_POWER_TX_RATE3,</div><div class='ctx'> 				ATH9K_POW_SM(RT_AR_DELTA(rate2s), 24)</div><div class='hunk'>@@ -1259,7 +1259,7 @@ static void ath9k_hw_def_set_txpower(struct ath_hw *ah,</div><div class='ctx'> 					 ht40PowerIncForPdadc, 8)</div><div class='ctx'> 			  | ATH9K_POW_SM(ratesArray[rateHt40_4] +</div><div class='ctx'> 					 ht40PowerIncForPdadc, 0));</div><div class='del'>-		if (OLC_FOR_AR9280_20_LATER) {</div><div class='add'>+		if (OLC_FOR_AR9280_20_LATER(ah)) {</div><div class='ctx'> 			REG_WRITE(ah, AR_PHY_POWER_TX_RATE9,</div><div class='ctx'> 				ATH9K_POW_SM(ratesArray[rateExtOfdm], 24)</div><div class='ctx'> 				| ATH9K_POW_SM(RT_AR_DELTA(rateExtCck), 16)</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c<br/>index b457e52dd365..2dbc7efdd637 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/gpio.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/gpio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/gpio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/gpio.c</a></div><div class='hunk'>@@ -193,7 +193,7 @@ static void ath_mci_ftp_adjust(struct ath_softc *sc)</div><div class='ctx'>  */</div><div class='ctx'> static void ath_btcoex_period_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ath_softc *sc = from_timer(sc, t, btcoex.period_timer);</div><div class='add'>+	struct ath_softc *sc = timer_container_of(sc, t, btcoex.period_timer);</div><div class='ctx'> 	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='ctx'> 	struct ath_btcoex *btcoex = &amp;sc-&gt;btcoex;</div><div class='ctx'> 	enum ath_stomp_type stomp_type;</div><div class='hunk'>@@ -254,7 +254,8 @@ skip_hw_wakeup:</div><div class='ctx'>  */</div><div class='ctx'> static void ath_btcoex_no_stomp_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ath_softc *sc = from_timer(sc, t, btcoex.no_stomp_timer);</div><div class='add'>+	struct ath_softc *sc = timer_container_of(sc, t,</div><div class='add'>+						  btcoex.no_stomp_timer);</div><div class='ctx'> 	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='ctx'> 	struct ath_btcoex *btcoex = &amp;sc-&gt;btcoex;</div><div class='ctx'> </div><div class='hunk'>@@ -305,7 +306,7 @@ void ath9k_btcoex_timer_resume(struct ath_softc *sc)</div><div class='ctx'> 	ath_dbg(ath9k_hw_common(ah), BTCOEX, "Starting btcoex timers\n");</div><div class='ctx'> </div><div class='ctx'> 	/* make sure duty cycle timer is also stopped when resuming */</div><div class='del'>-	del_timer_sync(&amp;btcoex-&gt;no_stomp_timer);</div><div class='add'>+	timer_delete_sync(&amp;btcoex-&gt;no_stomp_timer);</div><div class='ctx'> </div><div class='ctx'> 	btcoex-&gt;bt_priority_cnt = 0;</div><div class='ctx'> 	btcoex-&gt;bt_priority_time = jiffies;</div><div class='hunk'>@@ -329,15 +330,15 @@ void ath9k_btcoex_timer_pause(struct ath_softc *sc)</div><div class='ctx'> </div><div class='ctx'> 	ath_dbg(ath9k_hw_common(ah), BTCOEX, "Stopping btcoex timers\n");</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;btcoex-&gt;period_timer);</div><div class='del'>-	del_timer_sync(&amp;btcoex-&gt;no_stomp_timer);</div><div class='add'>+	timer_delete_sync(&amp;btcoex-&gt;period_timer);</div><div class='add'>+	timer_delete_sync(&amp;btcoex-&gt;no_stomp_timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ath9k_btcoex_stop_gen_timer(struct ath_softc *sc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_btcoex *btcoex = &amp;sc-&gt;btcoex;</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;btcoex-&gt;no_stomp_timer);</div><div class='add'>+	timer_delete_sync(&amp;btcoex-&gt;no_stomp_timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u16 ath9k_btcoex_aggr_limit(struct ath_softc *sc, u32 max_4ms_framelen)</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c<br/>index 860da13bfb6a..fe9abe8cd268 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/hif_usb.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/hif_usb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/hif_usb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/hif_usb.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'>  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include "htc.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_FIRMWARE(HTC_7010_MODULE_FW);</div><div class='hunk'>@@ -42,8 +42,6 @@ static const struct usb_device_id ath9k_hif_usb_ids[] = {</div><div class='ctx'> </div><div class='ctx'> 	{ USB_DEVICE(0x0cf3, 0x7015),</div><div class='ctx'> 	  .driver_info = AR9287_USB },  /* Atheros */</div><div class='del'>-	{ USB_DEVICE(0x1668, 0x1200),</div><div class='del'>-	  .driver_info = AR9287_USB },  /* Verizon */</div><div class='ctx'> </div><div class='ctx'> 	{ USB_DEVICE(0x0cf3, 0x7010),</div><div class='ctx'> 	  .driver_info = AR9280_USB },  /* Atheros */</div><div class='hunk'>@@ -72,7 +70,7 @@ static int __hif_usb_tx(struct hif_device_usb *hif_dev);</div><div class='ctx'> </div><div class='ctx'> static void hif_usb_regout_cb(struct urb *urb)</div><div class='ctx'> {</div><div class='del'>-	struct cmd_buf *cmd = (struct cmd_buf *)urb-&gt;context;</div><div class='add'>+	struct cmd_buf *cmd = urb-&gt;context;</div><div class='ctx'> </div><div class='ctx'> 	switch (urb-&gt;status) {</div><div class='ctx'> 	case 0:</div><div class='hunk'>@@ -136,7 +134,7 @@ static int hif_usb_send_regout(struct hif_device_usb *hif_dev,</div><div class='ctx'> </div><div class='ctx'> static void hif_usb_mgmt_cb(struct urb *urb)</div><div class='ctx'> {</div><div class='del'>-	struct cmd_buf *cmd = (struct cmd_buf *)urb-&gt;context;</div><div class='add'>+	struct cmd_buf *cmd = urb-&gt;context;</div><div class='ctx'> 	struct hif_device_usb *hif_dev;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	bool txok = true;</div><div class='hunk'>@@ -244,17 +242,17 @@ static inline void ath9k_skb_queue_complete(struct hif_device_usb *hif_dev,</div><div class='ctx'> 		ath9k_htc_txcompletion_cb(hif_dev-&gt;htc_handle,</div><div class='ctx'> 					  skb, txok);</div><div class='ctx'> 		if (txok) {</div><div class='del'>-			TX_STAT_INC(skb_success);</div><div class='del'>-			TX_STAT_ADD(skb_success_bytes, ln);</div><div class='add'>+			TX_STAT_INC(hif_dev, skb_success);</div><div class='add'>+			TX_STAT_ADD(hif_dev, skb_success_bytes, ln);</div><div class='ctx'> 		}</div><div class='ctx'> 		else</div><div class='del'>-			TX_STAT_INC(skb_failed);</div><div class='add'>+			TX_STAT_INC(hif_dev, skb_failed);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hif_usb_tx_cb(struct urb *urb)</div><div class='ctx'> {</div><div class='del'>-	struct tx_buf *tx_buf = (struct tx_buf *) urb-&gt;context;</div><div class='add'>+	struct tx_buf *tx_buf = urb-&gt;context;</div><div class='ctx'> 	struct hif_device_usb *hif_dev;</div><div class='ctx'> 	bool txok = true;</div><div class='ctx'> </div><div class='hunk'>@@ -302,7 +300,7 @@ static void hif_usb_tx_cb(struct urb *urb)</div><div class='ctx'> 	hif_dev-&gt;tx.tx_buf_cnt++;</div><div class='ctx'> 	if (!(hif_dev-&gt;tx.flags &amp; HIF_USB_TX_STOP))</div><div class='ctx'> 		__hif_usb_tx(hif_dev); /* Check for pending SKBs */</div><div class='del'>-	TX_STAT_INC(buf_completed);</div><div class='add'>+	TX_STAT_INC(hif_dev, buf_completed);</div><div class='ctx'> 	spin_unlock(&amp;hif_dev-&gt;tx.tx_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -353,7 +351,7 @@ static int __hif_usb_tx(struct hif_device_usb *hif_dev)</div><div class='ctx'> 			tx_buf-&gt;len += tx_buf-&gt;offset;</div><div class='ctx'> </div><div class='ctx'> 		__skb_queue_tail(&amp;tx_buf-&gt;skb_queue, nskb);</div><div class='del'>-		TX_STAT_INC(skb_queued);</div><div class='add'>+		TX_STAT_INC(hif_dev, skb_queued);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	usb_fill_bulk_urb(tx_buf-&gt;urb, hif_dev-&gt;udev,</div><div class='hunk'>@@ -368,11 +366,10 @@ static int __hif_usb_tx(struct hif_device_usb *hif_dev)</div><div class='ctx'> 		__skb_queue_head_init(&amp;tx_buf-&gt;skb_queue);</div><div class='ctx'> 		list_move_tail(&amp;tx_buf-&gt;list, &amp;hif_dev-&gt;tx.tx_buf);</div><div class='ctx'> 		hif_dev-&gt;tx.tx_buf_cnt++;</div><div class='add'>+	} else {</div><div class='add'>+		TX_STAT_INC(hif_dev, buf_queued);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ret)</div><div class='del'>-		TX_STAT_INC(buf_queued);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -515,7 +512,7 @@ static void hif_usb_sta_drain(void *hif_handle, u8 idx)</div><div class='ctx'> 			ath9k_htc_txcompletion_cb(hif_dev-&gt;htc_handle,</div><div class='ctx'> 						  skb, false);</div><div class='ctx'> 			hif_dev-&gt;tx.tx_skb_cnt--;</div><div class='del'>-			TX_STAT_INC(skb_failed);</div><div class='add'>+			TX_STAT_INC(hif_dev, skb_failed);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -535,6 +532,24 @@ static struct ath9k_htc_hif hif_usb = {</div><div class='ctx'> 	.send = hif_usb_send,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Need to free remain_skb allocated in ath9k_hif_usb_rx_stream</div><div class='add'>+ * in case ath9k_hif_usb_rx_stream wasn't called next time to</div><div class='add'>+ * process the buffer and subsequently free it.</div><div class='add'>+ */</div><div class='add'>+static void ath9k_hif_usb_free_rx_remain_skb(struct hif_device_usb *hif_dev)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;hif_dev-&gt;rx_lock, flags);</div><div class='add'>+	if (hif_dev-&gt;remain_skb) {</div><div class='add'>+		dev_kfree_skb_any(hif_dev-&gt;remain_skb);</div><div class='add'>+		hif_dev-&gt;remain_skb = NULL;</div><div class='add'>+		hif_dev-&gt;rx_remain_len = 0;</div><div class='add'>+		RX_STAT_INC(hif_dev, skb_dropped);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;hif_dev-&gt;rx_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev,</div><div class='ctx'> 				    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -562,11 +577,11 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev,</div><div class='ctx'> 			memcpy(ptr, skb-&gt;data, rx_remain_len);</div><div class='ctx'> </div><div class='ctx'> 			rx_pkt_len += rx_remain_len;</div><div class='del'>-			hif_dev-&gt;rx_remain_len = 0;</div><div class='ctx'> 			skb_put(remain_skb, rx_pkt_len);</div><div class='ctx'> </div><div class='ctx'> 			skb_pool[pool_index++] = remain_skb;</div><div class='del'>-</div><div class='add'>+			hif_dev-&gt;remain_skb = NULL;</div><div class='add'>+			hif_dev-&gt;rx_remain_len = 0;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			index = rx_remain_len;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -585,9 +600,21 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev,</div><div class='ctx'> 		pkt_len = get_unaligned_le16(ptr + index);</div><div class='ctx'> 		pkt_tag = get_unaligned_le16(ptr + index + 2);</div><div class='ctx'> </div><div class='add'>+		/* It is supposed that if we have an invalid pkt_tag or</div><div class='add'>+		 * pkt_len then the whole input SKB is considered invalid</div><div class='add'>+		 * and dropped; the associated packets already in skb_pool</div><div class='add'>+		 * are dropped, too.</div><div class='add'>+		 */</div><div class='ctx'> 		if (pkt_tag != ATH_USB_RX_STREAM_MODE_TAG) {</div><div class='del'>-			RX_STAT_INC(skb_dropped);</div><div class='del'>-			return;</div><div class='add'>+			RX_STAT_INC(hif_dev, skb_dropped);</div><div class='add'>+			goto invalid_pkt;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (pkt_len &gt; 2 * MAX_RX_BUF_SIZE) {</div><div class='add'>+			dev_err(&amp;hif_dev-&gt;udev-&gt;dev,</div><div class='add'>+				"ath9k_htc: invalid pkt_len (%x)\n", pkt_len);</div><div class='add'>+			RX_STAT_INC(hif_dev, skb_dropped);</div><div class='add'>+			goto invalid_pkt;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		pad_len = 4 - (pkt_len &amp; 0x3);</div><div class='hunk'>@@ -599,11 +626,6 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev,</div><div class='ctx'> </div><div class='ctx'> 		if (index &gt; MAX_RX_BUF_SIZE) {</div><div class='ctx'> 			spin_lock(&amp;hif_dev-&gt;rx_lock);</div><div class='del'>-			hif_dev-&gt;rx_remain_len = index - MAX_RX_BUF_SIZE;</div><div class='del'>-			hif_dev-&gt;rx_transfer_len =</div><div class='del'>-				MAX_RX_BUF_SIZE - chk_idx - 4;</div><div class='del'>-			hif_dev-&gt;rx_pad_len = pad_len;</div><div class='del'>-</div><div class='ctx'> 			nskb = __dev_alloc_skb(pkt_len + 32, GFP_ATOMIC);</div><div class='ctx'> 			if (!nskb) {</div><div class='ctx'> 				dev_err(&amp;hif_dev-&gt;udev-&gt;dev,</div><div class='hunk'>@@ -611,8 +633,14 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev,</div><div class='ctx'> 				spin_unlock(&amp;hif_dev-&gt;rx_lock);</div><div class='ctx'> 				goto err;</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='add'>+			hif_dev-&gt;rx_remain_len = index - MAX_RX_BUF_SIZE;</div><div class='add'>+			hif_dev-&gt;rx_transfer_len =</div><div class='add'>+				MAX_RX_BUF_SIZE - chk_idx - 4;</div><div class='add'>+			hif_dev-&gt;rx_pad_len = pad_len;</div><div class='add'>+</div><div class='ctx'> 			skb_reserve(nskb, 32);</div><div class='del'>-			RX_STAT_INC(skb_allocated);</div><div class='add'>+			RX_STAT_INC(hif_dev, skb_allocated);</div><div class='ctx'> </div><div class='ctx'> 			memcpy(nskb-&gt;data, &amp;(skb-&gt;data[chk_idx+4]),</div><div class='ctx'> 			       hif_dev-&gt;rx_transfer_len);</div><div class='hunk'>@@ -633,7 +661,7 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev,</div><div class='ctx'> 				goto err;</div><div class='ctx'> 			}</div><div class='ctx'> 			skb_reserve(nskb, 32);</div><div class='del'>-			RX_STAT_INC(skb_allocated);</div><div class='add'>+			RX_STAT_INC(hif_dev, skb_allocated);</div><div class='ctx'> </div><div class='ctx'> 			memcpy(nskb-&gt;data, &amp;(skb-&gt;data[chk_idx+4]), pkt_len);</div><div class='ctx'> 			skb_put(nskb, pkt_len);</div><div class='hunk'>@@ -643,16 +671,23 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev,</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='ctx'> 	for (i = 0; i &lt; pool_index; i++) {</div><div class='del'>-		RX_STAT_ADD(skb_completed_bytes, skb_pool[i]-&gt;len);</div><div class='add'>+		RX_STAT_ADD(hif_dev, skb_completed_bytes, skb_pool[i]-&gt;len);</div><div class='ctx'> 		ath9k_htc_rx_msg(hif_dev-&gt;htc_handle, skb_pool[i],</div><div class='ctx'> 				 skb_pool[i]-&gt;len, USB_WLAN_RX_PIPE);</div><div class='del'>-		RX_STAT_INC(skb_completed);</div><div class='add'>+		RX_STAT_INC(hif_dev, skb_completed);</div><div class='add'>+	}</div><div class='add'>+	return;</div><div class='add'>+invalid_pkt:</div><div class='add'>+	for (i = 0; i &lt; pool_index; i++) {</div><div class='add'>+		dev_kfree_skb_any(skb_pool[i]);</div><div class='add'>+		RX_STAT_INC(hif_dev, skb_dropped);</div><div class='ctx'> 	}</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath9k_hif_usb_rx_cb(struct urb *urb)</div><div class='ctx'> {</div><div class='del'>-	struct rx_buf *rx_buf = (struct rx_buf *)urb-&gt;context;</div><div class='add'>+	struct rx_buf *rx_buf = urb-&gt;context;</div><div class='ctx'> 	struct hif_device_usb *hif_dev = rx_buf-&gt;hif_dev;</div><div class='ctx'> 	struct sk_buff *skb = rx_buf-&gt;skb;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -681,8 +716,7 @@ static void ath9k_hif_usb_rx_cb(struct urb *urb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> resubmit:</div><div class='del'>-	skb_reset_tail_pointer(skb);</div><div class='del'>-	skb_trim(skb, 0);</div><div class='add'>+	__skb_set_length(skb, 0);</div><div class='ctx'> </div><div class='ctx'> 	usb_anchor_urb(urb, &amp;hif_dev-&gt;rx_submitted);</div><div class='ctx'> 	ret = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='hunk'>@@ -699,17 +733,16 @@ free:</div><div class='ctx'> </div><div class='ctx'> static void ath9k_hif_usb_reg_in_cb(struct urb *urb)</div><div class='ctx'> {</div><div class='del'>-	struct rx_buf *rx_buf = (struct rx_buf *)urb-&gt;context;</div><div class='add'>+	struct rx_buf *rx_buf = urb-&gt;context;</div><div class='ctx'> 	struct hif_device_usb *hif_dev = rx_buf-&gt;hif_dev;</div><div class='ctx'> 	struct sk_buff *skb = rx_buf-&gt;skb;</div><div class='del'>-	struct sk_buff *nskb;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!hif_dev)</div><div class='del'>-		goto free;</div><div class='add'>+		goto free_skb;</div><div class='ctx'> </div><div class='ctx'> 	switch (urb-&gt;status) {</div><div class='ctx'> 	case 0:</div><div class='hunk'>@@ -718,10 +751,9 @@ static void ath9k_hif_usb_reg_in_cb(struct urb *urb)</div><div class='ctx'> 	case -ECONNRESET:</div><div class='ctx'> 	case -ENODEV:</div><div class='ctx'> 	case -ESHUTDOWN:</div><div class='del'>-		goto free;</div><div class='add'>+		goto free_skb;</div><div class='ctx'> 	default:</div><div class='del'>-		skb_reset_tail_pointer(skb);</div><div class='del'>-		skb_trim(skb, 0);</div><div class='add'>+		__skb_set_length(skb, 0);</div><div class='ctx'> </div><div class='ctx'> 		goto resubmit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -729,25 +761,27 @@ static void ath9k_hif_usb_reg_in_cb(struct urb *urb)</div><div class='ctx'> 	if (likely(urb-&gt;actual_length != 0)) {</div><div class='ctx'> 		skb_put(skb, urb-&gt;actual_length);</div><div class='ctx'> </div><div class='del'>-		/* Process the command first */</div><div class='add'>+		/*</div><div class='add'>+		 * Process the command first.</div><div class='add'>+		 * skb is either freed here or passed to be</div><div class='add'>+		 * managed to another callback function.</div><div class='add'>+		 */</div><div class='ctx'> 		ath9k_htc_rx_msg(hif_dev-&gt;htc_handle, skb,</div><div class='ctx'> 				 skb-&gt;len, USB_REG_IN_PIPE);</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-		nskb = alloc_skb(MAX_REG_IN_BUF_SIZE, GFP_ATOMIC);</div><div class='del'>-		if (!nskb) {</div><div class='add'>+		skb = alloc_skb(MAX_REG_IN_BUF_SIZE, GFP_ATOMIC);</div><div class='add'>+		if (!skb) {</div><div class='ctx'> 			dev_err(&amp;hif_dev-&gt;udev-&gt;dev,</div><div class='ctx'> 				"ath9k_htc: REG_IN memory allocation failure\n");</div><div class='del'>-			urb-&gt;context = NULL;</div><div class='del'>-			return;</div><div class='add'>+			goto free_rx_buf;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		rx_buf-&gt;skb = nskb;</div><div class='add'>+		rx_buf-&gt;skb = skb;</div><div class='ctx'> </div><div class='ctx'> 		usb_fill_int_urb(urb, hif_dev-&gt;udev,</div><div class='ctx'> 				 usb_rcvintpipe(hif_dev-&gt;udev,</div><div class='ctx'> 						 USB_REG_IN_PIPE),</div><div class='del'>-				 nskb-&gt;data, MAX_REG_IN_BUF_SIZE,</div><div class='add'>+				 skb-&gt;data, MAX_REG_IN_BUF_SIZE,</div><div class='ctx'> 				 ath9k_hif_usb_reg_in_cb, rx_buf, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -756,12 +790,13 @@ resubmit:</div><div class='ctx'> 	ret = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		usb_unanchor_urb(urb);</div><div class='del'>-		goto free;</div><div class='add'>+		goto free_skb;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='del'>-free:</div><div class='add'>+free_skb:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='add'>+free_rx_buf:</div><div class='ctx'> 	kfree(rx_buf);</div><div class='ctx'> 	urb-&gt;context = NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -774,14 +809,10 @@ static void ath9k_hif_usb_dealloc_tx_urbs(struct hif_device_usb *hif_dev)</div><div class='ctx'> 	spin_lock_irqsave(&amp;hif_dev-&gt;tx.tx_lock, flags);</div><div class='ctx'> 	list_for_each_entry_safe(tx_buf, tx_buf_tmp,</div><div class='ctx'> 				 &amp;hif_dev-&gt;tx.tx_buf, list) {</div><div class='del'>-		usb_get_urb(tx_buf-&gt;urb);</div><div class='del'>-		spin_unlock_irqrestore(&amp;hif_dev-&gt;tx.tx_lock, flags);</div><div class='del'>-		usb_kill_urb(tx_buf-&gt;urb);</div><div class='ctx'> 		list_del(&amp;tx_buf-&gt;list);</div><div class='ctx'> 		usb_free_urb(tx_buf-&gt;urb);</div><div class='ctx'> 		kfree(tx_buf-&gt;buf);</div><div class='ctx'> 		kfree(tx_buf);</div><div class='del'>-		spin_lock_irqsave(&amp;hif_dev-&gt;tx.tx_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;hif_dev-&gt;tx.tx_lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -851,6 +882,7 @@ err:</div><div class='ctx'> static void ath9k_hif_usb_dealloc_rx_urbs(struct hif_device_usb *hif_dev)</div><div class='ctx'> {</div><div class='ctx'> 	usb_kill_anchored_urbs(&amp;hif_dev-&gt;rx_submitted);</div><div class='add'>+	ath9k_hif_usb_free_rx_remain_skb(hif_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath9k_hif_usb_alloc_rx_urbs(struct hif_device_usb *hif_dev)</div><div class='hunk'>@@ -1166,7 +1198,7 @@ static int ath9k_hif_request_firmware(struct hif_device_usb *hif_dev,</div><div class='ctx'> 			filename = FIRMWARE_AR9271;</div><div class='ctx'> </div><div class='ctx'> 		/* expected fw locations:</div><div class='del'>-		 * - htc_9271.fw   (stable version 1.3, depricated)</div><div class='add'>+		 * - htc_9271.fw   (stable version 1.3, deprecated)</div><div class='ctx'> 		 */</div><div class='ctx'> 		snprintf(hif_dev-&gt;fw_name, sizeof(hif_dev-&gt;fw_name),</div><div class='ctx'> 			 "%s", filename);</div><div class='hunk'>@@ -1323,10 +1355,24 @@ static int send_eject_command(struct usb_interface *interface)</div><div class='ctx'> static int ath9k_hif_usb_probe(struct usb_interface *interface,</div><div class='ctx'> 			       const struct usb_device_id *id)</div><div class='ctx'> {</div><div class='add'>+	struct usb_endpoint_descriptor *bulk_in, *bulk_out, *int_in, *int_out;</div><div class='ctx'> 	struct usb_device *udev = interface_to_usbdev(interface);</div><div class='add'>+	struct usb_host_interface *alt;</div><div class='ctx'> 	struct hif_device_usb *hif_dev;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	/* Verify the expected endpoints are present */</div><div class='add'>+	alt = interface-&gt;cur_altsetting;</div><div class='add'>+	if (usb_find_common_endpoints(alt, &amp;bulk_in, &amp;bulk_out, &amp;int_in, &amp;int_out) &lt; 0 ||</div><div class='add'>+	    usb_endpoint_num(bulk_in) != USB_WLAN_RX_PIPE ||</div><div class='add'>+	    usb_endpoint_num(bulk_out) != USB_WLAN_TX_PIPE ||</div><div class='add'>+	    usb_endpoint_num(int_in) != USB_REG_IN_PIPE ||</div><div class='add'>+	    usb_endpoint_num(int_out) != USB_REG_OUT_PIPE) {</div><div class='add'>+		dev_err(&amp;udev-&gt;dev,</div><div class='add'>+			"ath9k_htc: Device endpoint numbers are not the expected ones\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (id-&gt;driver_info == STORAGE_DEVICE)</div><div class='ctx'> 		return send_eject_command(interface);</div><div class='ctx'> </div><div class='hunk'>@@ -1384,7 +1430,7 @@ static void ath9k_hif_usb_disconnect(struct usb_interface *interface)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device *udev = interface_to_usbdev(interface);</div><div class='ctx'> 	struct hif_device_usb *hif_dev = usb_get_intfdata(interface);</div><div class='del'>-	bool unplugged = (udev-&gt;state == USB_STATE_NOTATTACHED) ? true : false;</div><div class='add'>+	bool unplugged = udev-&gt;state == USB_STATE_NOTATTACHED;</div><div class='ctx'> </div><div class='ctx'> 	if (!hif_dev)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1393,8 +1439,6 @@ static void ath9k_hif_usb_disconnect(struct usb_interface *interface)</div><div class='ctx'> </div><div class='ctx'> 	if (hif_dev-&gt;flags &amp; HIF_USB_READY) {</div><div class='ctx'> 		ath9k_htc_hw_deinit(hif_dev-&gt;htc_handle, unplugged);</div><div class='del'>-		ath9k_hif_usb_dev_deinit(hif_dev);</div><div class='del'>-		ath9k_destroy_wmi(hif_dev-&gt;htc_handle-&gt;drv_priv);</div><div class='ctx'> 		ath9k_htc_hw_free(hif_dev-&gt;htc_handle);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1435,31 +1479,31 @@ static int ath9k_hif_usb_resume(struct usb_interface *interface)</div><div class='ctx'> {</div><div class='ctx'> 	struct hif_device_usb *hif_dev = usb_get_intfdata(interface);</div><div class='ctx'> 	struct htc_target *htc_handle = hif_dev-&gt;htc_handle;</div><div class='del'>-	int ret;</div><div class='ctx'> 	const struct firmware *fw;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = ath9k_hif_usb_alloc_urbs(hif_dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (hif_dev-&gt;flags &amp; HIF_USB_READY) {</div><div class='del'>-		/* request cached firmware during suspend/resume cycle */</div><div class='del'>-		ret = request_firmware(&amp;fw, hif_dev-&gt;fw_name,</div><div class='del'>-				       &amp;hif_dev-&gt;udev-&gt;dev);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto fail_resume;</div><div class='del'>-</div><div class='del'>-		hif_dev-&gt;fw_data = fw-&gt;data;</div><div class='del'>-		hif_dev-&gt;fw_size = fw-&gt;size;</div><div class='del'>-		ret = ath9k_hif_usb_download_fw(hif_dev);</div><div class='del'>-		release_firmware(fw);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto fail_resume;</div><div class='del'>-	} else {</div><div class='del'>-		ath9k_hif_usb_dealloc_urbs(hif_dev);</div><div class='del'>-		return -EIO;</div><div class='add'>+	if (!(hif_dev-&gt;flags &amp; HIF_USB_READY)) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto fail_resume;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* request cached firmware during suspend/resume cycle */</div><div class='add'>+	ret = request_firmware(&amp;fw, hif_dev-&gt;fw_name,</div><div class='add'>+			       &amp;hif_dev-&gt;udev-&gt;dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fail_resume;</div><div class='add'>+</div><div class='add'>+	hif_dev-&gt;fw_data = fw-&gt;data;</div><div class='add'>+	hif_dev-&gt;fw_size = fw-&gt;size;</div><div class='add'>+	ret = ath9k_hif_usb_download_fw(hif_dev);</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fail_resume;</div><div class='add'>+</div><div class='ctx'> 	mdelay(100);</div><div class='ctx'> </div><div class='ctx'> 	ret = ath9k_htc_resume(htc_handle);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.h b/drivers/net/wireless/ath/ath9k/hif_usb.h<br/>index 5985aa15ca93..b3e66b0485a5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/hif_usb.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/hif_usb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/hif_usb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/hif_usb.h</a></div><div class='hunk'>@@ -126,7 +126,7 @@ struct hif_device_usb {</div><div class='ctx'> 	struct usb_anchor reg_in_submitted;</div><div class='ctx'> 	struct usb_anchor mgmt_submitted;</div><div class='ctx'> 	struct sk_buff *remain_skb;</div><div class='del'>-	char fw_name[32];</div><div class='add'>+	char fw_name[64];</div><div class='ctx'> 	int fw_minor_index;</div><div class='ctx'> 	int rx_remain_len;</div><div class='ctx'> 	int rx_pkt_len;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h<br/>index 0a1634238e67..6c33e898b300 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/htc.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/htc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/htc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/htc.h</a></div><div class='hunk'>@@ -281,6 +281,7 @@ struct ath9k_htc_rxbuf {</div><div class='ctx'> struct ath9k_htc_rx {</div><div class='ctx'> 	struct list_head rxbuf;</div><div class='ctx'> 	spinlock_t rxbuflock;</div><div class='add'>+	bool initialized;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define ATH9K_HTC_TX_CLEANUP_INTERVAL 50 /* ms */</div><div class='hunk'>@@ -325,14 +326,18 @@ static inline struct ath9k_htc_tx_ctl *HTC_SKB_CB(struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ATH9K_HTC_DEBUGFS</div><div class='del'>-</div><div class='del'>-#define TX_STAT_INC(c) (hif_dev-&gt;htc_handle-&gt;drv_priv-&gt;debug.tx_stats.c++)</div><div class='del'>-#define TX_STAT_ADD(c, a) (hif_dev-&gt;htc_handle-&gt;drv_priv-&gt;debug.tx_stats.c += a)</div><div class='del'>-#define RX_STAT_INC(c) (hif_dev-&gt;htc_handle-&gt;drv_priv-&gt;debug.skbrx_stats.c++)</div><div class='del'>-#define RX_STAT_ADD(c, a) (hif_dev-&gt;htc_handle-&gt;drv_priv-&gt;debug.skbrx_stats.c += a)</div><div class='del'>-#define CAB_STAT_INC   priv-&gt;debug.tx_stats.cab_queued++</div><div class='del'>-</div><div class='del'>-#define TX_QSTAT_INC(q) (priv-&gt;debug.tx_stats.queue_stats[q]++)</div><div class='add'>+#define __STAT_SAFE(hif_dev, expr)	do { ((hif_dev)-&gt;htc_handle-&gt;drv_priv ? (expr) : 0); } while (0)</div><div class='add'>+#define CAB_STAT_INC(priv)		do { ((priv)-&gt;debug.tx_stats.cab_queued++); } while (0)</div><div class='add'>+#define TX_QSTAT_INC(priv, q)		do { ((priv)-&gt;debug.tx_stats.queue_stats[q]++); } while (0)</div><div class='add'>+</div><div class='add'>+#define TX_STAT_INC(hif_dev, c) \</div><div class='add'>+		__STAT_SAFE((hif_dev), (hif_dev)-&gt;htc_handle-&gt;drv_priv-&gt;debug.tx_stats.c++)</div><div class='add'>+#define TX_STAT_ADD(hif_dev, c, a) \</div><div class='add'>+		__STAT_SAFE((hif_dev), (hif_dev)-&gt;htc_handle-&gt;drv_priv-&gt;debug.tx_stats.c += a)</div><div class='add'>+#define RX_STAT_INC(hif_dev, c) \</div><div class='add'>+		__STAT_SAFE((hif_dev), (hif_dev)-&gt;htc_handle-&gt;drv_priv-&gt;debug.skbrx_stats.c++)</div><div class='add'>+#define RX_STAT_ADD(hif_dev, c, a) \</div><div class='add'>+		__STAT_SAFE((hif_dev), (hif_dev)-&gt;htc_handle-&gt;drv_priv-&gt;debug.skbrx_stats.c += a)</div><div class='ctx'> </div><div class='ctx'> void ath9k_htc_err_stat_rx(struct ath9k_htc_priv *priv,</div><div class='ctx'> 			   struct ath_rx_status *rs);</div><div class='hunk'>@@ -372,13 +377,13 @@ void ath9k_htc_get_et_stats(struct ieee80211_hw *hw,</div><div class='ctx'> 			    struct ethtool_stats *stats, u64 *data);</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='del'>-#define TX_STAT_INC(c) do { } while (0)</div><div class='del'>-#define TX_STAT_ADD(c, a) do { } while (0)</div><div class='del'>-#define RX_STAT_INC(c) do { } while (0)</div><div class='del'>-#define RX_STAT_ADD(c, a) do { } while (0)</div><div class='del'>-#define CAB_STAT_INC   do { } while (0)</div><div class='add'>+#define TX_STAT_INC(hif_dev, c)		do { } while (0)</div><div class='add'>+#define TX_STAT_ADD(hif_dev, c, a)	do { } while (0)</div><div class='add'>+#define RX_STAT_INC(hif_dev, c)		do { } while (0)</div><div class='add'>+#define RX_STAT_ADD(hif_dev, c, a)	do { } while (0)</div><div class='ctx'> </div><div class='del'>-#define TX_QSTAT_INC(c) do { } while (0)</div><div class='add'>+#define CAB_STAT_INC(priv)</div><div class='add'>+#define TX_QSTAT_INC(priv, c)</div><div class='ctx'> </div><div class='ctx'> static inline void ath9k_htc_err_stat_rx(struct ath9k_htc_priv *priv,</div><div class='ctx'> 					 struct ath_rx_status *rs)</div><div class='hunk'>@@ -509,6 +514,7 @@ struct ath9k_htc_priv {</div><div class='ctx'> 	unsigned long ps_usecount;</div><div class='ctx'> 	bool ps_enabled;</div><div class='ctx'> 	bool ps_idle;</div><div class='add'>+	bool initialized;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MAC80211_LEDS</div><div class='ctx'> 	enum led_brightness brightness;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c<br/>index c745897aa3d6..81fa7cbad892 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/htc_drv_beacon.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/htc_drv_beacon.c</a></div><div class='hunk'>@@ -215,7 +215,7 @@ static void ath9k_htc_send_beacon(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get a new beacon */</div><div class='del'>-	beacon = ieee80211_beacon_get(priv-&gt;hw, vif);</div><div class='add'>+	beacon = ieee80211_beacon_get(priv-&gt;hw, vif, 0);</div><div class='ctx'> 	if (!beacon) {</div><div class='ctx'> 		spin_unlock_bh(&amp;priv-&gt;beacon_lock);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -290,6 +290,9 @@ void ath9k_htc_swba(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(priv-&gt;ah);</div><div class='ctx'> 	int slot;</div><div class='ctx'> </div><div class='add'>+	if (!priv-&gt;cur_beacon_conf.enable_beacon)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (swba-&gt;beacon_pending != 0) {</div><div class='ctx'> 		priv-&gt;beacon.bmisscnt++;</div><div class='ctx'> 		if (priv-&gt;beacon.bmisscnt &gt; BSTUCK_THRESHOLD) {</div><div class='hunk'>@@ -511,13 +514,13 @@ bool ath9k_htc_csa_is_finished(struct ath9k_htc_priv *priv)</div><div class='ctx'> 	struct ieee80211_vif *vif;</div><div class='ctx'> </div><div class='ctx'> 	vif = priv-&gt;csa_vif;</div><div class='del'>-	if (!vif || !vif-&gt;csa_active)</div><div class='add'>+	if (!vif || !vif-&gt;bss_conf.csa_active)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (!ieee80211_beacon_cntdwn_is_complete(vif))</div><div class='add'>+	if (!ieee80211_beacon_cntdwn_is_complete(vif, 0))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	ieee80211_csa_finish(vif);</div><div class='add'>+	ieee80211_csa_finish(vif, 0);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;csa_vif = NULL;</div><div class='ctx'> 	return true;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c<br/>index b3ed65e5c4da..9437d69877cc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/htc_drv_debug.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/htc_drv_debug.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/htc_drv_debug.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/htc_drv_debug.c</a></div><div class='hunk'>@@ -375,16 +375,11 @@ static ssize_t write_file_debug(struct file *file, const char __user *user_buf,</div><div class='ctx'> 	struct ath9k_htc_priv *priv = file-&gt;private_data;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(priv-&gt;ah);</div><div class='ctx'> 	unsigned long mask;</div><div class='del'>-	char buf[32];</div><div class='del'>-	ssize_t len;</div><div class='del'>-</div><div class='del'>-	len = min(count, sizeof(buf) - 1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, len))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	buf[len] = '\0';</div><div class='del'>-	if (kstrtoul(buf, 0, &amp;mask))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ret = kstrtoul_from_user(user_buf, count, 0, &amp;mask);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	common-&gt;debug_mask = mask;</div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -428,7 +423,7 @@ void ath9k_htc_get_et_strings(struct ieee80211_hw *hw,</div><div class='ctx'> 			      u32 sset, u8 *data)</div><div class='ctx'> {</div><div class='ctx'> 	if (sset == ETH_SS_STATS)</div><div class='del'>-		memcpy(data, *ath9k_htc_gstrings_stats,</div><div class='add'>+		memcpy(data, ath9k_htc_gstrings_stats,</div><div class='ctx'> 		       sizeof(ath9k_htc_gstrings_stats));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -487,12 +482,10 @@ void ath9k_htc_deinit_debug(struct ath9k_htc_priv *priv)</div><div class='ctx'> int ath9k_htc_init_debug(struct ath_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='del'>-	struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common-&gt;priv;</div><div class='add'>+	struct ath9k_htc_priv *priv = common-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;debug.debugfs_phy = debugfs_create_dir(KBUILD_MODNAME,</div><div class='ctx'> 					     priv-&gt;hw-&gt;wiphy-&gt;debugfsdir);</div><div class='del'>-	if (!priv-&gt;debug.debugfs_phy)</div><div class='del'>-		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	ath9k_cmn_spectral_init_debug(&amp;priv-&gt;spec_priv, priv-&gt;debug.debugfs_phy);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c<br/>index ff61ae34ecdf..3633f9eb2c55 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/htc_drv_init.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/htc_drv_init.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/htc_drv_init.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/htc_drv_init.c</a></div><div class='hunk'>@@ -63,12 +63,12 @@ static const struct ieee80211_tpt_blink ath9k_htc_tpt_blink[] = {</div><div class='ctx'> </div><div class='ctx'> static void ath9k_htc_op_ps_wakeup(struct ath_common *common)</div><div class='ctx'> {</div><div class='del'>-	ath9k_htc_ps_wakeup((struct ath9k_htc_priv *) common-&gt;priv);</div><div class='add'>+	ath9k_htc_ps_wakeup(common-&gt;priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath9k_htc_op_ps_restore(struct ath_common *common)</div><div class='ctx'> {</div><div class='del'>-	ath9k_htc_ps_restore((struct ath9k_htc_priv *) common-&gt;priv);</div><div class='add'>+	ath9k_htc_ps_restore(common-&gt;priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ath_ps_ops ath9k_htc_ps_ops = {</div><div class='hunk'>@@ -235,7 +235,7 @@ static unsigned int ath9k_regread(void *hw_priv, u32 reg_offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hw *ah = hw_priv;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='del'>-	struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common-&gt;priv;</div><div class='add'>+	struct ath9k_htc_priv *priv = common-&gt;priv;</div><div class='ctx'> 	__be32 val, reg = cpu_to_be32(reg_offset);</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='hunk'>@@ -257,7 +257,7 @@ static void ath9k_multi_regread(void *hw_priv, u32 *addr,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hw *ah = hw_priv;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='del'>-	struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common-&gt;priv;</div><div class='add'>+	struct ath9k_htc_priv *priv = common-&gt;priv;</div><div class='ctx'> 	__be32 tmpaddr[8];</div><div class='ctx'> 	__be32 tmpval[8];</div><div class='ctx'> 	int i, ret;</div><div class='hunk'>@@ -282,7 +282,7 @@ static void ath9k_multi_regread(void *hw_priv, u32 *addr,</div><div class='ctx'> </div><div class='ctx'> static void ath9k_regwrite_multi(struct ath_common *common)</div><div class='ctx'> {</div><div class='del'>-	struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common-&gt;priv;</div><div class='add'>+	struct ath9k_htc_priv *priv = common-&gt;priv;</div><div class='ctx'> 	u32 rsp_status;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='hunk'>@@ -303,7 +303,7 @@ static void ath9k_regwrite_single(void *hw_priv, u32 val, u32 reg_offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hw *ah = hw_priv;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='del'>-	struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common-&gt;priv;</div><div class='add'>+	struct ath9k_htc_priv *priv = common-&gt;priv;</div><div class='ctx'> 	const __be32 buf[2] = {</div><div class='ctx'> 		cpu_to_be32(reg_offset),</div><div class='ctx'> 		cpu_to_be32(val),</div><div class='hunk'>@@ -324,7 +324,7 @@ static void ath9k_regwrite_buffer(void *hw_priv, u32 val, u32 reg_offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hw *ah = hw_priv;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='del'>-	struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common-&gt;priv;</div><div class='add'>+	struct ath9k_htc_priv *priv = common-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;wmi-&gt;multi_write_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -347,7 +347,7 @@ static void ath9k_regwrite(void *hw_priv, u32 val, u32 reg_offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hw *ah = hw_priv;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='del'>-	struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common-&gt;priv;</div><div class='add'>+	struct ath9k_htc_priv *priv = common-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;priv-&gt;wmi-&gt;mwrite_cnt))</div><div class='ctx'> 		ath9k_regwrite_buffer(hw_priv, val, reg_offset);</div><div class='hunk'>@@ -359,7 +359,7 @@ static void ath9k_enable_regwrite_buffer(void *hw_priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hw *ah = hw_priv;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='del'>-	struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common-&gt;priv;</div><div class='add'>+	struct ath9k_htc_priv *priv = common-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;priv-&gt;wmi-&gt;mwrite_cnt);</div><div class='ctx'> }</div><div class='hunk'>@@ -368,7 +368,7 @@ static void ath9k_regwrite_flush(void *hw_priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hw *ah = hw_priv;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='del'>-	struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common-&gt;priv;</div><div class='add'>+	struct ath9k_htc_priv *priv = common-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	atomic_dec(&amp;priv-&gt;wmi-&gt;mwrite_cnt);</div><div class='ctx'> </div><div class='hunk'>@@ -385,7 +385,7 @@ static void ath9k_reg_rmw_buffer(void *hw_priv,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hw *ah = hw_priv;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='del'>-	struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common-&gt;priv;</div><div class='add'>+	struct ath9k_htc_priv *priv = common-&gt;priv;</div><div class='ctx'> 	u32 rsp_status;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='hunk'>@@ -423,7 +423,7 @@ static void ath9k_reg_rmw_flush(void *hw_priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hw *ah = hw_priv;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='del'>-	struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common-&gt;priv;</div><div class='add'>+	struct ath9k_htc_priv *priv = common-&gt;priv;</div><div class='ctx'> 	u32 rsp_status;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='hunk'>@@ -455,7 +455,7 @@ static void ath9k_enable_rmw_buffer(void *hw_priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hw *ah = hw_priv;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='del'>-	struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common-&gt;priv;</div><div class='add'>+	struct ath9k_htc_priv *priv = common-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(HTC_FWFLAG_NO_RMW, &amp;priv-&gt;fw_flags))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -468,7 +468,7 @@ static void ath9k_reg_rmw_single(void *hw_priv,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hw *ah = hw_priv;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='del'>-	struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common-&gt;priv;</div><div class='add'>+	struct ath9k_htc_priv *priv = common-&gt;priv;</div><div class='ctx'> 	struct register_rmw buf, buf_ret;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -490,7 +490,7 @@ static u32 ath9k_reg_rmw(void *hw_priv, u32 reg_offset, u32 set, u32 clr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hw *ah = hw_priv;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='del'>-	struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common-&gt;priv;</div><div class='add'>+	struct ath9k_htc_priv *priv = common-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(HTC_FWFLAG_NO_RMW, &amp;priv-&gt;fw_flags)) {</div><div class='ctx'> 		u32 val;</div><div class='hunk'>@@ -518,18 +518,18 @@ static void ath_usb_read_cachesize(struct ath_common *common, int *csz)</div><div class='ctx'> </div><div class='ctx'> static bool ath_usb_eeprom_read(struct ath_common *common, u32 off, u16 *data)</div><div class='ctx'> {</div><div class='del'>-	struct ath_hw *ah = (struct ath_hw *) common-&gt;ah;</div><div class='add'>+	struct ath_hw *ah = common-&gt;ah;</div><div class='ctx'> </div><div class='ctx'> 	(void)REG_READ(ah, AR5416_EEPROM_OFFSET + (off &lt;&lt; AR5416_EEPROM_S));</div><div class='ctx'> </div><div class='ctx'> 	if (!ath9k_hw_wait(ah,</div><div class='del'>-			   AR_EEPROM_STATUS_DATA,</div><div class='add'>+			   AR_EEPROM_STATUS_DATA(ah),</div><div class='ctx'> 			   AR_EEPROM_STATUS_DATA_BUSY |</div><div class='ctx'> 			   AR_EEPROM_STATUS_DATA_PROT_ACCESS, 0,</div><div class='ctx'> 			   AH_WAIT_TIMEOUT))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	*data = MS(REG_READ(ah, AR_EEPROM_STATUS_DATA),</div><div class='add'>+	*data = MS(REG_READ(ah, AR_EEPROM_STATUS_DATA(ah)),</div><div class='ctx'> 		   AR_EEPROM_STATUS_DATA_VAL);</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -944,7 +944,6 @@ int ath9k_htc_probe_device(struct htc_target *htc_handle, struct device *dev,</div><div class='ctx'> 	priv-&gt;hw = hw;</div><div class='ctx'> 	priv-&gt;htc = htc_handle;</div><div class='ctx'> 	priv-&gt;dev = dev;</div><div class='del'>-	htc_handle-&gt;drv_priv = priv;</div><div class='ctx'> 	SET_IEEE80211_DEV(hw, priv-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	ret = ath9k_htc_wait_for_target(priv);</div><div class='hunk'>@@ -965,11 +964,17 @@ int ath9k_htc_probe_device(struct htc_target *htc_handle, struct device *dev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_init;</div><div class='ctx'> </div><div class='add'>+	htc_handle-&gt;drv_priv = priv;</div><div class='add'>+</div><div class='add'>+	/* Allow ath9k_wmi_event_tasklet() to operate. */</div><div class='add'>+	smp_wmb();</div><div class='add'>+	priv-&gt;initialized = true;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_init:</div><div class='ctx'> 	ath9k_stop_wmi(priv);</div><div class='del'>-	hif_dev = (struct hif_device_usb *)htc_handle-&gt;hif_dev;</div><div class='add'>+	hif_dev = htc_handle-&gt;hif_dev;</div><div class='ctx'> 	ath9k_hif_usb_dealloc_urbs(hif_dev);</div><div class='ctx'> 	ath9k_destroy_wmi(priv);</div><div class='ctx'> err_free:</div><div class='hunk'>@@ -987,6 +992,8 @@ void ath9k_htc_disconnect_device(struct htc_target *htc_handle, bool hotunplug)</div><div class='ctx'> </div><div class='ctx'> 		ath9k_deinit_device(htc_handle-&gt;drv_priv);</div><div class='ctx'> 		ath9k_stop_wmi(htc_handle-&gt;drv_priv);</div><div class='add'>+		ath9k_hif_usb_dealloc_urbs(htc_handle-&gt;hif_dev);</div><div class='add'>+		ath9k_destroy_wmi(htc_handle-&gt;drv_priv);</div><div class='ctx'> 		ieee80211_free_hw(htc_handle-&gt;drv_priv-&gt;hw);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c<br/>index 72ef319feeda..0d6272ac0dac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/htc_drv_main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/htc_drv_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/htc_drv_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/htc_drv_main.c</a></div><div class='hunk'>@@ -100,7 +100,7 @@ static void ath9k_htc_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif)</div><div class='ctx'> 		priv-&gt;rearm_ani = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bss_conf-&gt;assoc) {</div><div class='add'>+	if (vif-&gt;cfg.assoc) {</div><div class='ctx'> 		priv-&gt;rearm_ani = true;</div><div class='ctx'> 		priv-&gt;reconfig_beacon = true;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -198,7 +198,7 @@ void ath9k_htc_reset(struct ath9k_htc_priv *priv)</div><div class='ctx'> 	ath9k_htc_stop_ani(priv);</div><div class='ctx'> 	ieee80211_stop_queues(priv-&gt;hw);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;priv-&gt;tx.cleanup_timer);</div><div class='add'>+	timer_delete_sync(&amp;priv-&gt;tx.cleanup_timer);</div><div class='ctx'> 	ath9k_htc_tx_drain(priv);</div><div class='ctx'> </div><div class='ctx'> 	WMI_CMD(WMI_DISABLE_INTR_CMDID);</div><div class='hunk'>@@ -260,7 +260,7 @@ static int ath9k_htc_set_channel(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	ath9k_htc_ps_wakeup(priv);</div><div class='ctx'> </div><div class='ctx'> 	ath9k_htc_stop_ani(priv);</div><div class='del'>-	del_timer_sync(&amp;priv-&gt;tx.cleanup_timer);</div><div class='add'>+	timer_delete_sync(&amp;priv-&gt;tx.cleanup_timer);</div><div class='ctx'> 	ath9k_htc_tx_drain(priv);</div><div class='ctx'> </div><div class='ctx'> 	WMI_CMD(WMI_DISABLE_INTR_CMDID);</div><div class='hunk'>@@ -491,7 +491,7 @@ static int ath9k_htc_add_station(struct ath9k_htc_priv *priv,</div><div class='ctx'> 		ista-&gt;index = sta_idx;</div><div class='ctx'> 		tsta.is_vif_sta = 0;</div><div class='ctx'> 		maxampdu = 1 &lt;&lt; (IEEE80211_HT_MAX_AMPDU_FACTOR +</div><div class='del'>-				 sta-&gt;ht_cap.ampdu_factor);</div><div class='add'>+				 sta-&gt;deflink.ht_cap.ampdu_factor);</div><div class='ctx'> 		tsta.maxampdu = cpu_to_be16(maxampdu);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		memcpy(&amp;tsta.macaddr, vif-&gt;addr, ETH_ALEN);</div><div class='hunk'>@@ -602,7 +602,7 @@ static void ath9k_htc_setup_rate(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	sband = priv-&gt;hw-&gt;wiphy-&gt;bands[priv-&gt;hw-&gt;conf.chandef.chan-&gt;band];</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0, j = 0; i &lt; sband-&gt;n_bitrates; i++) {</div><div class='del'>-		if (sta-&gt;supp_rates[sband-&gt;band] &amp; BIT(i)) {</div><div class='add'>+		if (sta-&gt;deflink.supp_rates[sband-&gt;band] &amp; BIT(i)) {</div><div class='ctx'> 			trate-&gt;rates.legacy_rates.rs_rates[j]</div><div class='ctx'> 				= (sband-&gt;bitrates[i].bitrate * 2) / 10;</div><div class='ctx'> 			j++;</div><div class='hunk'>@@ -610,9 +610,9 @@ static void ath9k_htc_setup_rate(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	}</div><div class='ctx'> 	trate-&gt;rates.legacy_rates.rs_nrates = j;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;ht_cap.ht_supported) {</div><div class='add'>+	if (sta-&gt;deflink.ht_cap.ht_supported) {</div><div class='ctx'> 		for (i = 0, j = 0; i &lt; 77; i++) {</div><div class='del'>-			if (sta-&gt;ht_cap.mcs.rx_mask[i/8] &amp; (1&lt;&lt;(i%8)))</div><div class='add'>+			if (sta-&gt;deflink.ht_cap.mcs.rx_mask[i/8] &amp; (1&lt;&lt;(i%8)))</div><div class='ctx'> 				trate-&gt;rates.ht_rates.rs_rates[j++] = i;</div><div class='ctx'> 			if (j == ATH_HTC_RATE_MAX)</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -620,18 +620,18 @@ static void ath9k_htc_setup_rate(struct ath9k_htc_priv *priv,</div><div class='ctx'> 		trate-&gt;rates.ht_rates.rs_nrates = j;</div><div class='ctx'> </div><div class='ctx'> 		caps = WLAN_RC_HT_FLAG;</div><div class='del'>-		if (sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_RX_STBC)</div><div class='add'>+		if (sta-&gt;deflink.ht_cap.cap &amp; IEEE80211_HT_CAP_RX_STBC)</div><div class='ctx'> 			caps |= ATH_RC_TX_STBC_FLAG;</div><div class='del'>-		if (sta-&gt;ht_cap.mcs.rx_mask[1])</div><div class='add'>+		if (sta-&gt;deflink.ht_cap.mcs.rx_mask[1])</div><div class='ctx'> 			caps |= WLAN_RC_DS_FLAG;</div><div class='del'>-		if ((sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SUP_WIDTH_20_40) &amp;&amp;</div><div class='del'>-		     (conf_is_ht40(&amp;priv-&gt;hw-&gt;conf)))</div><div class='add'>+		if ((sta-&gt;deflink.ht_cap.cap &amp; IEEE80211_HT_CAP_SUP_WIDTH_20_40) &amp;&amp;</div><div class='add'>+		    (conf_is_ht40(&amp;priv-&gt;hw-&gt;conf)))</div><div class='ctx'> 			caps |= WLAN_RC_40_FLAG;</div><div class='ctx'> 		if (conf_is_ht40(&amp;priv-&gt;hw-&gt;conf) &amp;&amp;</div><div class='del'>-		    (sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_40))</div><div class='add'>+		    (sta-&gt;deflink.ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_40))</div><div class='ctx'> 			caps |= WLAN_RC_SGI_FLAG;</div><div class='ctx'> 		else if (conf_is_ht20(&amp;priv-&gt;hw-&gt;conf) &amp;&amp;</div><div class='del'>-			 (sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_20))</div><div class='add'>+			 (sta-&gt;deflink.ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_20))</div><div class='ctx'> 			caps |= WLAN_RC_SGI_FLAG;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -719,7 +719,7 @@ static int ath9k_htc_tx_aggr_oper(struct ath9k_htc_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	aggr.sta_index = ista-&gt;index;</div><div class='ctx'> 	aggr.tidno = tid &amp; 0xf;</div><div class='del'>-	aggr.aggr_enable = (action == IEEE80211_AMPDU_TX_START) ? true : false;</div><div class='add'>+	aggr.aggr_enable = action == IEEE80211_AMPDU_TX_START;</div><div class='ctx'> </div><div class='ctx'> 	WMI_CMD_BUF(WMI_TX_AGGR_ENABLE_CMDID, &amp;aggr);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -973,7 +973,7 @@ static int ath9k_htc_start(struct ieee80211_hw *hw)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath9k_htc_stop(struct ieee80211_hw *hw)</div><div class='add'>+static void ath9k_htc_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath9k_htc_priv *priv = hw-&gt;priv;</div><div class='ctx'> 	struct ath_hw *ah = priv-&gt;ah;</div><div class='hunk'>@@ -997,7 +997,7 @@ static void ath9k_htc_stop(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	tasklet_kill(&amp;priv-&gt;rx_tasklet);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;priv-&gt;tx.cleanup_timer);</div><div class='add'>+	timer_delete_sync(&amp;priv-&gt;tx.cleanup_timer);</div><div class='ctx'> 	ath9k_htc_tx_drain(priv);</div><div class='ctx'> 	ath9k_wmi_event_drain(priv);</div><div class='ctx'> </div><div class='hunk'>@@ -1172,7 +1172,7 @@ static void ath9k_htc_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+static int ath9k_htc_config(struct ieee80211_hw *hw, int radio_idx, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath9k_htc_priv *priv = hw-&gt;priv;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(priv-&gt;ah);</div><div class='hunk'>@@ -1264,7 +1264,6 @@ static void ath9k_htc_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> 	u32 rfilt;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	changed_flags &amp;= SUPPORTED_FILTERS;</div><div class='ctx'> 	*total_flags &amp;= SUPPORTED_FILTERS;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(ATH_OP_INVALID, &amp;common-&gt;op_flags)) {</div><div class='hunk'>@@ -1358,8 +1357,10 @@ static int ath9k_htc_sta_remove(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> static void ath9k_htc_sta_rc_update(struct ieee80211_hw *hw,</div><div class='ctx'> 				    struct ieee80211_vif *vif,</div><div class='del'>-				    struct ieee80211_sta *sta, u32 changed)</div><div class='add'>+				    struct ieee80211_link_sta *link_sta,</div><div class='add'>+				    u32 changed)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sta *sta = link_sta-&gt;sta;</div><div class='ctx'> 	struct ath9k_htc_sta *ista = (struct ath9k_htc_sta *) sta-&gt;drv_priv;</div><div class='ctx'> </div><div class='ctx'> 	if (!(changed &amp; IEEE80211_RC_SUPP_RATES_CHANGED))</div><div class='hunk'>@@ -1369,7 +1370,8 @@ static void ath9k_htc_sta_rc_update(struct ieee80211_hw *hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath9k_htc_conf_tx(struct ieee80211_hw *hw,</div><div class='del'>-			     struct ieee80211_vif *vif, u16 queue,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     unsigned int link_id, u16 queue,</div><div class='ctx'> 			     const struct ieee80211_tx_queue_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath9k_htc_priv *priv = hw-&gt;priv;</div><div class='hunk'>@@ -1488,8 +1490,8 @@ static void ath9k_htc_bss_iter(void *data, u8 *mac, struct ieee80211_vif *vif)</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(priv-&gt;ah);</div><div class='ctx'> 	struct ieee80211_bss_conf *bss_conf = &amp;vif-&gt;bss_conf;</div><div class='ctx'> </div><div class='del'>-	if ((vif-&gt;type == NL80211_IFTYPE_STATION) &amp;&amp; bss_conf-&gt;assoc) {</div><div class='del'>-		common-&gt;curaid = bss_conf-&gt;aid;</div><div class='add'>+	if ((vif-&gt;type == NL80211_IFTYPE_STATION) &amp;&amp; vif-&gt;cfg.assoc) {</div><div class='add'>+		common-&gt;curaid = vif-&gt;cfg.aid;</div><div class='ctx'> 		common-&gt;last_rssi = ATH_RSSI_DUMMY_MARKER;</div><div class='ctx'> 		memcpy(common-&gt;curbssid, bss_conf-&gt;bssid, ETH_ALEN);</div><div class='ctx'> 		set_bit(ATH_OP_PRIM_STA_VIF, &amp;common-&gt;op_flags);</div><div class='hunk'>@@ -1509,7 +1511,7 @@ static void ath9k_htc_choose_set_bssid(struct ath9k_htc_priv *priv)</div><div class='ctx'> static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 				       struct ieee80211_vif *vif,</div><div class='ctx'> 				       struct ieee80211_bss_conf *bss_conf,</div><div class='del'>-				       u32 changed)</div><div class='add'>+				       u64 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath9k_htc_priv *priv = hw-&gt;priv;</div><div class='ctx'> 	struct ath_hw *ah = priv-&gt;ah;</div><div class='hunk'>@@ -1521,17 +1523,17 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_ASSOC) {</div><div class='ctx'> 		ath_dbg(common, CONFIG, "BSS Changed ASSOC %d\n",</div><div class='del'>-			bss_conf-&gt;assoc);</div><div class='add'>+			vif-&gt;cfg.assoc);</div><div class='ctx'> </div><div class='del'>-		bss_conf-&gt;assoc ?</div><div class='add'>+		vif-&gt;cfg.assoc ?</div><div class='ctx'> 			priv-&gt;num_sta_assoc_vif++ : priv-&gt;num_sta_assoc_vif--;</div><div class='ctx'> </div><div class='del'>-		if (!bss_conf-&gt;assoc)</div><div class='add'>+		if (!vif-&gt;cfg.assoc)</div><div class='ctx'> 			clear_bit(ATH_OP_PRIM_STA_VIF, &amp;common-&gt;op_flags);</div><div class='ctx'> </div><div class='ctx'> 		if (priv-&gt;ah-&gt;opmode == NL80211_IFTYPE_STATION) {</div><div class='ctx'> 			ath9k_htc_choose_set_bssid(priv);</div><div class='del'>-			if (bss_conf-&gt;assoc &amp;&amp; (priv-&gt;num_sta_assoc_vif == 1))</div><div class='add'>+			if (vif-&gt;cfg.assoc &amp;&amp; (priv-&gt;num_sta_assoc_vif == 1))</div><div class='ctx'> 				ath9k_htc_start_ani(priv);</div><div class='ctx'> 			else if (priv-&gt;num_sta_assoc_vif == 0)</div><div class='ctx'> 				ath9k_htc_stop_ani(priv);</div><div class='hunk'>@@ -1540,7 +1542,7 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_IBSS) {</div><div class='ctx'> 		if (priv-&gt;ah-&gt;opmode == NL80211_IFTYPE_ADHOC) {</div><div class='del'>-			common-&gt;curaid = bss_conf-&gt;aid;</div><div class='add'>+			common-&gt;curaid = vif-&gt;cfg.aid;</div><div class='ctx'> 			memcpy(common-&gt;curbssid, bss_conf-&gt;bssid, ETH_ALEN);</div><div class='ctx'> 			ath9k_htc_set_bssid(priv);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1735,12 +1737,14 @@ static void ath9k_htc_sw_scan_complete(struct ieee80211_hw *hw,</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath9k_htc_set_rts_threshold(struct ieee80211_hw *hw, u32 value)</div><div class='add'>+static int ath9k_htc_set_rts_threshold(struct ieee80211_hw *hw,</div><div class='add'>+				       int radio_idx, u32 value)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath9k_htc_set_coverage_class(struct ieee80211_hw *hw,</div><div class='add'>+					 int radio_idx,</div><div class='ctx'> 					 s16 coverage_class)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath9k_htc_priv *priv = hw-&gt;priv;</div><div class='hunk'>@@ -1839,8 +1843,8 @@ struct base_eep_header *ath9k_htc_get_eeprom_base(struct ath9k_htc_priv *priv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int ath9k_htc_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant,</div><div class='del'>-				 u32 *rx_ant)</div><div class='add'>+static int ath9k_htc_get_antenna(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+				 u32 *tx_ant, u32 *rx_ant)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath9k_htc_priv *priv = hw-&gt;priv;</div><div class='ctx'> 	struct base_eep_header *pBase = ath9k_htc_get_eeprom_base(priv);</div><div class='hunk'>@@ -1868,7 +1872,12 @@ static void ath9k_htc_channel_switch_beacon(struct ieee80211_hw *hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct ieee80211_ops ath9k_htc_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.tx                 = ath9k_htc_tx,</div><div class='add'>+	.wake_tx_queue      = ieee80211_handle_wake_tx_queue,</div><div class='ctx'> 	.start              = ath9k_htc_start,</div><div class='ctx'> 	.stop               = ath9k_htc_stop,</div><div class='ctx'> 	.add_interface      = ath9k_htc_add_interface,</div><div class='hunk'>@@ -1878,7 +1887,7 @@ struct ieee80211_ops ath9k_htc_ops = {</div><div class='ctx'> 	.sta_add            = ath9k_htc_sta_add,</div><div class='ctx'> 	.sta_remove         = ath9k_htc_sta_remove,</div><div class='ctx'> 	.conf_tx            = ath9k_htc_conf_tx,</div><div class='del'>-	.sta_rc_update      = ath9k_htc_sta_rc_update,</div><div class='add'>+	.link_sta_rc_update = ath9k_htc_sta_rc_update,</div><div class='ctx'> 	.bss_info_changed   = ath9k_htc_bss_info_changed,</div><div class='ctx'> 	.set_key            = ath9k_htc_set_key,</div><div class='ctx'> 	.get_tsf            = ath9k_htc_get_tsf,</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c<br/>index 8e69e8989f6d..ee5945cfc10e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/htc_drv_txrx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/htc_drv_txrx.c</a></div><div class='hunk'>@@ -106,20 +106,20 @@ static inline enum htc_endpoint_id get_htc_epid(struct ath9k_htc_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	switch (qnum) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		TX_QSTAT_INC(IEEE80211_AC_VO);</div><div class='add'>+		TX_QSTAT_INC(priv, IEEE80211_AC_VO);</div><div class='ctx'> 		epid = priv-&gt;data_vo_ep;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		TX_QSTAT_INC(IEEE80211_AC_VI);</div><div class='add'>+		TX_QSTAT_INC(priv, IEEE80211_AC_VI);</div><div class='ctx'> 		epid = priv-&gt;data_vi_ep;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		TX_QSTAT_INC(IEEE80211_AC_BE);</div><div class='add'>+		TX_QSTAT_INC(priv, IEEE80211_AC_BE);</div><div class='ctx'> 		epid = priv-&gt;data_be_ep;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='ctx'> 	default:</div><div class='del'>-		TX_QSTAT_INC(IEEE80211_AC_BK);</div><div class='add'>+		TX_QSTAT_INC(priv, IEEE80211_AC_BK);</div><div class='ctx'> 		epid = priv-&gt;data_bk_ep;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -328,7 +328,7 @@ static void ath9k_htc_tx_data(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	memcpy(tx_fhdr, (u8 *) &amp;tx_hdr, sizeof(tx_hdr));</div><div class='ctx'> </div><div class='ctx'> 	if (is_cab) {</div><div class='del'>-		CAB_STAT_INC;</div><div class='add'>+		CAB_STAT_INC(priv);</div><div class='ctx'> 		tx_ctl-&gt;epid = priv-&gt;cab_ep;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -523,7 +523,7 @@ send_mac80211:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Send status to mac80211 */</div><div class='del'>-	ieee80211_tx_status(priv-&gt;hw, skb);</div><div class='add'>+	ieee80211_tx_status_skb(priv-&gt;hw, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void ath9k_htc_tx_drainq(struct ath9k_htc_priv *priv,</div><div class='hunk'>@@ -652,9 +652,10 @@ void ath9k_htc_txstatus(struct ath9k_htc_priv *priv, void *wmi_event)</div><div class='ctx'> 	struct ath9k_htc_tx_event *tx_pend;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; txs-&gt;cnt; i++) {</div><div class='del'>-		WARN_ON(txs-&gt;cnt &gt; HTC_MAX_TX_STATUS);</div><div class='add'>+	if (WARN_ON_ONCE(txs-&gt;cnt &gt; HTC_MAX_TX_STATUS))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; txs-&gt;cnt; i++) {</div><div class='ctx'> 		__txs = &amp;txs-&gt;txstatus[i];</div><div class='ctx'> </div><div class='ctx'> 		skb = ath9k_htc_tx_get_packet(priv, __txs);</div><div class='hunk'>@@ -759,7 +760,8 @@ static void ath9k_htc_tx_cleanup_queue(struct ath9k_htc_priv *priv,</div><div class='ctx'> </div><div class='ctx'> void ath9k_htc_tx_cleanup_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ath9k_htc_priv *priv = from_timer(priv, t, tx.cleanup_timer);</div><div class='add'>+	struct ath9k_htc_priv *priv = timer_container_of(priv, t,</div><div class='add'>+							 tx.cleanup_timer);</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(priv-&gt;ah);</div><div class='ctx'> 	struct ath9k_htc_tx_event *event, *tmp;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -813,6 +815,7 @@ int ath9k_tx_init(struct ath9k_htc_priv *priv)</div><div class='ctx'> 	skb_queue_head_init(&amp;priv-&gt;tx.data_vi_queue);</div><div class='ctx'> 	skb_queue_head_init(&amp;priv-&gt;tx.data_vo_queue);</div><div class='ctx'> 	skb_queue_head_init(&amp;priv-&gt;tx.tx_failed);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1011,6 +1014,14 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv,</div><div class='ctx'> 		goto rx_next;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (rxstatus-&gt;rs_keyix &gt;= ATH_KEYMAX &amp;&amp;</div><div class='add'>+	    rxstatus-&gt;rs_keyix != ATH9K_RXKEYIX_INVALID) {</div><div class='add'>+		ath_dbg(common, ANY,</div><div class='add'>+			"Invalid keyix, dropping (keyix: %d)\n",</div><div class='add'>+			rxstatus-&gt;rs_keyix);</div><div class='add'>+		goto rx_next;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Get the RX status information */</div><div class='ctx'> </div><div class='ctx'> 	memset(rx_status, 0, sizeof(struct ieee80211_rx_status));</div><div class='hunk'>@@ -1130,6 +1141,10 @@ void ath9k_htc_rxep(void *drv_priv, struct sk_buff *skb,</div><div class='ctx'> 	struct ath9k_htc_rxbuf *rxbuf = NULL, *tmp_buf = NULL;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	/* Check if ath9k_rx_init() completed. */</div><div class='add'>+	if (!data_race(priv-&gt;rx.initialized))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;rx.rxbuflock, flags);</div><div class='ctx'> 	list_for_each_entry(tmp_buf, &amp;priv-&gt;rx.rxbuf, list) {</div><div class='ctx'> 		if (!tmp_buf-&gt;in_process) {</div><div class='hunk'>@@ -1185,6 +1200,10 @@ int ath9k_rx_init(struct ath9k_htc_priv *priv)</div><div class='ctx'> 		list_add_tail(&amp;rxbuf-&gt;list, &amp;priv-&gt;rx.rxbuf);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Allow ath9k_htc_rxep() to operate. */</div><div class='add'>+	smp_wmb();</div><div class='add'>+	priv-&gt;rx.initialized = true;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.c b/drivers/net/wireless/ath/ath9k/htc_hst.c<br/>index 510e61e97dbc..b5257b2b4aa5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/htc_hst.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/htc_hst.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/htc_hst.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/htc_hst.c</a></div><div class='hunk'>@@ -30,6 +30,7 @@ static int htc_issue_send(struct htc_target *target, struct sk_buff* skb,</div><div class='ctx'> 	hdr-&gt;endpoint_id = epid;</div><div class='ctx'> 	hdr-&gt;flags = flags;</div><div class='ctx'> 	hdr-&gt;payload_len = cpu_to_be16(len);</div><div class='add'>+	memset(hdr-&gt;control, 0, sizeof(hdr-&gt;control));</div><div class='ctx'> </div><div class='ctx'> 	status = target-&gt;hif-&gt;send(target-&gt;hif_dev, endpoint-&gt;ul_pipeid, skb);</div><div class='ctx'> </div><div class='hunk'>@@ -88,7 +89,7 @@ static void htc_process_target_rdy(struct htc_target *target,</div><div class='ctx'> 				   void *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct htc_endpoint *endpoint;</div><div class='del'>-	struct htc_ready_msg *htc_ready_msg = (struct htc_ready_msg *) buf;</div><div class='add'>+	struct htc_ready_msg *htc_ready_msg = buf;</div><div class='ctx'> </div><div class='ctx'> 	target-&gt;credit_size = be16_to_cpu(htc_ready_msg-&gt;credit_size);</div><div class='ctx'> </div><div class='hunk'>@@ -113,7 +114,13 @@ static void htc_process_conn_rsp(struct htc_target *target,</div><div class='ctx'> </div><div class='ctx'> 	if (svc_rspmsg-&gt;status == HTC_SERVICE_SUCCESS) {</div><div class='ctx'> 		epid = svc_rspmsg-&gt;endpoint_id;</div><div class='del'>-		if (epid &lt; 0 || epid &gt;= ENDPOINT_MAX)</div><div class='add'>+</div><div class='add'>+		/* Check that the received epid for the endpoint to attach</div><div class='add'>+		 * a new service is valid. ENDPOINT0 can't be used here as it</div><div class='add'>+		 * is already reserved for HTC_CTRL_RSVD_SVC service and thus</div><div class='add'>+		 * should not be modified.</div><div class='add'>+		 */</div><div class='add'>+		if (epid &lt;= ENDPOINT0 || epid &gt;= ENDPOINT_MAX)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		service_id = be16_to_cpu(svc_rspmsg-&gt;service_id);</div><div class='hunk'>@@ -272,6 +279,10 @@ int htc_connect_service(struct htc_target *target,</div><div class='ctx'> 	conn_msg-&gt;dl_pipeid = endpoint-&gt;dl_pipeid;</div><div class='ctx'> 	conn_msg-&gt;ul_pipeid = endpoint-&gt;ul_pipeid;</div><div class='ctx'> </div><div class='add'>+	/* To prevent infoleak */</div><div class='add'>+	conn_msg-&gt;svc_meta_len = 0;</div><div class='add'>+	conn_msg-&gt;pad = 0;</div><div class='add'>+</div><div class='ctx'> 	ret = htc_issue_send(target, skb, skb-&gt;len, 0, ENDPOINT0);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -283,6 +294,9 @@ int htc_connect_service(struct htc_target *target,</div><div class='ctx'> 		return -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (target-&gt;conn_rsp_epid &lt; 0 || target-&gt;conn_rsp_epid &gt;= ENDPOINT_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	*conn_rsp_epid = target-&gt;conn_rsp_epid;</div><div class='ctx'> 	return 0;</div><div class='ctx'> err:</div><div class='hunk'>@@ -359,40 +373,34 @@ ret:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath9k_htc_fw_panic_report(struct htc_target *htc_handle,</div><div class='del'>-				      struct sk_buff *skb)</div><div class='add'>+				      struct sk_buff *skb, u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t *pattern = (uint32_t *)skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-	switch (*pattern) {</div><div class='del'>-	case 0x33221199:</div><div class='del'>-		{</div><div class='add'>+	if (*pattern == 0x33221199 &amp;&amp; len &gt;= sizeof(struct htc_panic_bad_vaddr)) {</div><div class='ctx'> 		struct htc_panic_bad_vaddr *htc_panic;</div><div class='ctx'> 		htc_panic = (struct htc_panic_bad_vaddr *) skb-&gt;data;</div><div class='ctx'> 		dev_err(htc_handle-&gt;dev, "ath: firmware panic! "</div><div class='ctx'> 			"exccause: 0x%08x; pc: 0x%08x; badvaddr: 0x%08x.\n",</div><div class='ctx'> 			htc_panic-&gt;exccause, htc_panic-&gt;pc,</div><div class='ctx'> 			htc_panic-&gt;badvaddr);</div><div class='del'>-		break;</div><div class='del'>-		}</div><div class='del'>-	case 0x33221299:</div><div class='del'>-		{</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (*pattern == 0x33221299) {</div><div class='ctx'> 		struct htc_panic_bad_epid *htc_panic;</div><div class='ctx'> 		htc_panic = (struct htc_panic_bad_epid *) skb-&gt;data;</div><div class='ctx'> 		dev_err(htc_handle-&gt;dev, "ath: firmware panic! "</div><div class='ctx'> 			"bad epid: 0x%08x\n", htc_panic-&gt;epid);</div><div class='del'>-		break;</div><div class='del'>-		}</div><div class='del'>-	default:</div><div class='del'>-		dev_err(htc_handle-&gt;dev, "ath: unknown panic pattern!\n");</div><div class='del'>-		break;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+	dev_err(htc_handle-&gt;dev, "ath: unknown panic pattern!\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * HTC Messages are handled directly here and the obtained SKB</div><div class='ctx'>  * is freed.</div><div class='ctx'>  *</div><div class='del'>- * Service messages (Data, WMI) passed to the corresponding</div><div class='add'>+ * Service messages (Data, WMI) are passed to the corresponding</div><div class='ctx'>  * endpoint RX handlers, which have to free the SKB.</div><div class='ctx'>  */</div><div class='ctx'> void ath9k_htc_rx_msg(struct htc_target *htc_handle,</div><div class='hunk'>@@ -406,16 +414,26 @@ void ath9k_htc_rx_msg(struct htc_target *htc_handle,</div><div class='ctx'> 	if (!htc_handle || !skb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	/* A valid message requires len &gt;= 8.</div><div class='add'>+	 *</div><div class='add'>+	 *   sizeof(struct htc_frame_hdr) == 8</div><div class='add'>+	 *   sizeof(struct htc_ready_msg) == 8</div><div class='add'>+	 *   sizeof(struct htc_panic_bad_vaddr) == 16</div><div class='add'>+	 *   sizeof(struct htc_panic_bad_epid) == 8</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(len &lt; sizeof(struct htc_frame_hdr)))</div><div class='add'>+		goto invalid;</div><div class='ctx'> 	htc_hdr = (struct htc_frame_hdr *) skb-&gt;data;</div><div class='ctx'> 	epid = htc_hdr-&gt;endpoint_id;</div><div class='ctx'> </div><div class='ctx'> 	if (epid == 0x99) {</div><div class='del'>-		ath9k_htc_fw_panic_report(htc_handle, skb);</div><div class='add'>+		ath9k_htc_fw_panic_report(htc_handle, skb, len);</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (epid &lt; 0 || epid &gt;= ENDPOINT_MAX) {</div><div class='add'>+invalid:</div><div class='ctx'> 		if (pipe_id != USB_REG_IN_PIPE)</div><div class='ctx'> 			dev_kfree_skb_any(skb);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -427,21 +445,30 @@ void ath9k_htc_rx_msg(struct htc_target *htc_handle,</div><div class='ctx'> </div><div class='ctx'> 		/* Handle trailer */</div><div class='ctx'> 		if (htc_hdr-&gt;flags &amp; HTC_FLAGS_RECV_TRAILER) {</div><div class='del'>-			if (be32_to_cpu(*(__be32 *) skb-&gt;data) == 0x00C60000)</div><div class='add'>+			if (be32_to_cpu(*(__be32 *) skb-&gt;data) == 0x00C60000) {</div><div class='ctx'> 				/* Move past the Watchdog pattern */</div><div class='ctx'> 				htc_hdr = (struct htc_frame_hdr *)(skb-&gt;data + 4);</div><div class='add'>+				len -= 4;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Get the message ID */</div><div class='add'>+		if (unlikely(len &lt; sizeof(struct htc_frame_hdr) + sizeof(__be16)))</div><div class='add'>+			goto invalid;</div><div class='ctx'> 		msg_id = (__be16 *) ((void *) htc_hdr +</div><div class='ctx'> 				     sizeof(struct htc_frame_hdr));</div><div class='ctx'> </div><div class='ctx'> 		/* Now process HTC messages */</div><div class='ctx'> 		switch (be16_to_cpu(*msg_id)) {</div><div class='ctx'> 		case HTC_MSG_READY_ID:</div><div class='add'>+			if (unlikely(len &lt; sizeof(struct htc_ready_msg)))</div><div class='add'>+				goto invalid;</div><div class='ctx'> 			htc_process_target_rdy(htc_handle, htc_hdr);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case HTC_MSG_CONNECT_SERVICE_RESPONSE_ID:</div><div class='add'>+			if (unlikely(len &lt; sizeof(struct htc_frame_hdr) +</div><div class='add'>+				     sizeof(struct htc_conn_svc_rspmsg)))</div><div class='add'>+				goto invalid;</div><div class='ctx'> 			htc_process_conn_rsp(htc_handle, htc_hdr);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -460,6 +487,8 @@ void ath9k_htc_rx_msg(struct htc_target *htc_handle,</div><div class='ctx'> 		if (endpoint-&gt;ep_callbacks.rx)</div><div class='ctx'> 			endpoint-&gt;ep_callbacks.rx(endpoint-&gt;ep_callbacks.priv,</div><div class='ctx'> 						  skb, epid);</div><div class='add'>+		else</div><div class='add'>+			goto invalid;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c<br/>index 2ca3b86714a9..14de62c1a32b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/hw.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/hw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/hw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/hw.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'>  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -21,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "hw.h"</div><div class='ctx'> #include "hw-ops.h"</div><div class='hunk'>@@ -266,7 +267,7 @@ static bool ath9k_hw_read_revisions(struct ath_hw *ah)</div><div class='ctx'> 	case AR9300_DEVID_AR9330:</div><div class='ctx'> 		ah-&gt;hw_version.macVersion = AR_SREV_VERSION_9330;</div><div class='ctx'> 		if (!ah-&gt;get_mac_revision) {</div><div class='del'>-			val = REG_READ(ah, AR_SREV);</div><div class='add'>+			val = REG_READ(ah, AR_SREV(ah));</div><div class='ctx'> 			ah-&gt;hw_version.macRev = MS(val, AR_SREV_REVISION2);</div><div class='ctx'> 		}</div><div class='ctx'> 		return true;</div><div class='hunk'>@@ -284,7 +285,7 @@ static bool ath9k_hw_read_revisions(struct ath_hw *ah)</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	srev = REG_READ(ah, AR_SREV);</div><div class='add'>+	srev = REG_READ(ah, AR_SREV(ah));</div><div class='ctx'> </div><div class='ctx'> 	if (srev == -1) {</div><div class='ctx'> 		ath_err(ath9k_hw_common(ah),</div><div class='hunk'>@@ -292,7 +293,7 @@ static bool ath9k_hw_read_revisions(struct ath_hw *ah)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	val = srev &amp; AR_SREV_ID;</div><div class='add'>+	val = srev &amp; AR_SREV_ID(ah);</div><div class='ctx'> </div><div class='ctx'> 	if (val == 0xFF) {</div><div class='ctx'> 		val = srev;</div><div class='hunk'>@@ -490,7 +491,7 @@ static void ath9k_hw_init_macaddr(struct ath_hw *ah)</div><div class='ctx'> 	u16 eeval;</div><div class='ctx'> 	static const u32 EEP_MAC[] = { EEP_MAC_LSW, EEP_MAC_MID, EEP_MAC_MSW };</div><div class='ctx'> </div><div class='del'>-	/* MAC address may already be loaded via ath9k_platform_data */</div><div class='add'>+	/* MAC address may already be loaded via NVMEM */</div><div class='ctx'> 	if (is_valid_ether_addr(common-&gt;macaddr))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -601,12 +602,12 @@ static int __ath9k_hw_init(struct ath_hw *ah)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Read back AR_WA into a permanent copy and set bits 14 and 17.</div><div class='add'>+	 * Read back AR_WA(ah) into a permanent copy and set bits 14 and 17.</div><div class='ctx'> 	 * We need to do this to avoid RMW of this register. We cannot</div><div class='ctx'> 	 * read the reg when chip is asleep.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (AR_SREV_9300_20_OR_LATER(ah)) {</div><div class='del'>-		ah-&gt;WARegVal = REG_READ(ah, AR_WA);</div><div class='add'>+		ah-&gt;WARegVal = REG_READ(ah, AR_WA(ah));</div><div class='ctx'> 		ah-&gt;WARegVal |= (AR_WA_D3_L1_DISABLE |</div><div class='ctx'> 				 AR_WA_ASPM_TIMER_BASED_DISABLE);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -618,7 +619,7 @@ static int __ath9k_hw_init(struct ath_hw *ah)</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9565(ah)) {</div><div class='ctx'> 		ah-&gt;WARegVal |= AR_WA_BIT22;</div><div class='del'>-		REG_WRITE(ah, AR_WA, ah-&gt;WARegVal);</div><div class='add'>+		REG_WRITE(ah, AR_WA(ah), ah-&gt;WARegVal);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath9k_hw_init_defaults(ah);</div><div class='hunk'>@@ -814,7 +815,7 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,</div><div class='ctx'> 		REG_RMW_FIELD(ah, AR_CH0_DDR_DPLL3,</div><div class='ctx'> 			      AR_CH0_DPLL3_PHASE_SHIFT, 0x1);</div><div class='ctx'> </div><div class='del'>-		REG_WRITE(ah, AR_RTC_PLL_CONTROL,</div><div class='add'>+		REG_WRITE(ah, AR_RTC_PLL_CONTROL(ah),</div><div class='ctx'> 			  pll | AR_RTC_9300_PLL_BYPASS);</div><div class='ctx'> 		udelay(1000);</div><div class='ctx'> </div><div class='hunk'>@@ -832,7 +833,7 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,</div><div class='ctx'> 		   AR_SREV_9561(ah)) {</div><div class='ctx'> 		u32 regval, pll2_divint, pll2_divfrac, refdiv;</div><div class='ctx'> </div><div class='del'>-		REG_WRITE(ah, AR_RTC_PLL_CONTROL,</div><div class='add'>+		REG_WRITE(ah, AR_RTC_PLL_CONTROL(ah),</div><div class='ctx'> 			  pll | AR_RTC_9300_SOC_PLL_BYPASS);</div><div class='ctx'> 		udelay(1000);</div><div class='ctx'> </div><div class='hunk'>@@ -911,7 +912,7 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9565(ah))</div><div class='ctx'> 		pll |= 0x40000;</div><div class='del'>-	REG_WRITE(ah, AR_RTC_PLL_CONTROL, pll);</div><div class='add'>+	REG_WRITE(ah, AR_RTC_PLL_CONTROL(ah), pll);</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9485(ah) || AR_SREV_9340(ah) || AR_SREV_9330(ah) ||</div><div class='ctx'> 	    AR_SREV_9550(ah))</div><div class='hunk'>@@ -925,7 +926,7 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,</div><div class='ctx'> </div><div class='ctx'> 	udelay(RTC_PLL_SETTLE_DELAY);</div><div class='ctx'> </div><div class='del'>-	REG_WRITE(ah, AR_RTC_SLEEP_CLK, AR_RTC_FORCE_DERIVED_CLK);</div><div class='add'>+	REG_WRITE(ah, AR_RTC_SLEEP_CLK(ah), AR_RTC_FORCE_DERIVED_CLK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath9k_hw_init_interrupt_masks(struct ath_hw *ah,</div><div class='hunk'>@@ -977,7 +978,7 @@ static void ath9k_hw_init_interrupt_masks(struct ath_hw *ah,</div><div class='ctx'> 	REG_WRITE(ah, AR_IMR_S2, ah-&gt;imrs2_reg);</div><div class='ctx'> </div><div class='ctx'> 	if (ah-&gt;msi_enabled) {</div><div class='del'>-		ah-&gt;msi_reg = REG_READ(ah, AR_PCIE_MSI);</div><div class='add'>+		ah-&gt;msi_reg = REG_READ(ah, AR_PCIE_MSI(ah));</div><div class='ctx'> 		ah-&gt;msi_reg |= AR_PCIE_MSI_HW_DBI_WR_EN;</div><div class='ctx'> 		ah-&gt;msi_reg &amp;= AR_PCIE_MSI_HW_INT_PENDING_ADDR_MSI_64;</div><div class='ctx'> 		REG_WRITE(ah, AR_INTCFG, msi_cfg);</div><div class='hunk'>@@ -987,18 +988,18 @@ static void ath9k_hw_init_interrupt_masks(struct ath_hw *ah,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!AR_SREV_9100(ah)) {</div><div class='del'>-		REG_WRITE(ah, AR_INTR_SYNC_CAUSE, 0xFFFFFFFF);</div><div class='del'>-		REG_WRITE(ah, AR_INTR_SYNC_ENABLE, sync_default);</div><div class='del'>-		REG_WRITE(ah, AR_INTR_SYNC_MASK, 0);</div><div class='add'>+		REG_WRITE(ah, AR_INTR_SYNC_CAUSE(ah), 0xFFFFFFFF);</div><div class='add'>+		REG_WRITE(ah, AR_INTR_SYNC_ENABLE(ah), sync_default);</div><div class='add'>+		REG_WRITE(ah, AR_INTR_SYNC_MASK(ah), 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	REGWRITE_BUFFER_FLUSH(ah);</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9300_20_OR_LATER(ah)) {</div><div class='del'>-		REG_WRITE(ah, AR_INTR_PRIO_ASYNC_ENABLE, 0);</div><div class='del'>-		REG_WRITE(ah, AR_INTR_PRIO_ASYNC_MASK, 0);</div><div class='del'>-		REG_WRITE(ah, AR_INTR_PRIO_SYNC_ENABLE, 0);</div><div class='del'>-		REG_WRITE(ah, AR_INTR_PRIO_SYNC_MASK, 0);</div><div class='add'>+		REG_WRITE(ah, AR_INTR_PRIO_ASYNC_ENABLE(ah), 0);</div><div class='add'>+		REG_WRITE(ah, AR_INTR_PRIO_ASYNC_MASK(ah), 0);</div><div class='add'>+		REG_WRITE(ah, AR_INTR_PRIO_SYNC_ENABLE(ah), 0);</div><div class='add'>+		REG_WRITE(ah, AR_INTR_PRIO_SYNC_MASK(ah), 0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1341,7 +1342,7 @@ static bool ath9k_hw_ar9330_reset_war(struct ath_hw *ah, int type)</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		REG_WRITE(ah, AR_RTC_RESET, 1);</div><div class='add'>+		REG_WRITE(ah, AR_RTC_RESET(ah), 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -1353,26 +1354,26 @@ static bool ath9k_hw_set_reset(struct ath_hw *ah, int type)</div><div class='ctx'> 	u32 tmpReg;</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9100(ah)) {</div><div class='del'>-		REG_RMW_FIELD(ah, AR_RTC_DERIVED_CLK,</div><div class='add'>+		REG_RMW_FIELD(ah, AR_RTC_DERIVED_CLK(ah),</div><div class='ctx'> 			      AR_RTC_DERIVED_CLK_PERIOD, 1);</div><div class='del'>-		(void)REG_READ(ah, AR_RTC_DERIVED_CLK);</div><div class='add'>+		(void)REG_READ(ah, AR_RTC_DERIVED_CLK(ah));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ENABLE_REGWRITE_BUFFER(ah);</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9300_20_OR_LATER(ah)) {</div><div class='del'>-		REG_WRITE(ah, AR_WA, ah-&gt;WARegVal);</div><div class='add'>+		REG_WRITE(ah, AR_WA(ah), ah-&gt;WARegVal);</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	REG_WRITE(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_EN |</div><div class='add'>+	REG_WRITE(ah, AR_RTC_FORCE_WAKE(ah), AR_RTC_FORCE_WAKE_EN |</div><div class='ctx'> 		  AR_RTC_FORCE_WAKE_ON_INT);</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9100(ah)) {</div><div class='ctx'> 		rst_flags = AR_RTC_RC_MAC_WARM | AR_RTC_RC_MAC_COLD |</div><div class='ctx'> 			AR_RTC_RC_COLD_RESET | AR_RTC_RC_WARM_RESET;</div><div class='ctx'> 	} else {</div><div class='del'>-		tmpReg = REG_READ(ah, AR_INTR_SYNC_CAUSE);</div><div class='add'>+		tmpReg = REG_READ(ah, AR_INTR_SYNC_CAUSE(ah));</div><div class='ctx'> 		if (AR_SREV_9340(ah))</div><div class='ctx'> 			tmpReg &amp;= AR9340_INTR_SYNC_LOCAL_TIMEOUT;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1381,7 +1382,7 @@ static bool ath9k_hw_set_reset(struct ath_hw *ah, int type)</div><div class='ctx'> </div><div class='ctx'> 		if (tmpReg) {</div><div class='ctx'> 			u32 val;</div><div class='del'>-			REG_WRITE(ah, AR_INTR_SYNC_ENABLE, 0);</div><div class='add'>+			REG_WRITE(ah, AR_INTR_SYNC_ENABLE(ah), 0);</div><div class='ctx'> </div><div class='ctx'> 			val = AR_RC_HOSTIF;</div><div class='ctx'> 			if (!AR_SREV_9300_20_OR_LATER(ah))</div><div class='hunk'>@@ -1414,7 +1415,7 @@ static bool ath9k_hw_set_reset(struct ath_hw *ah, int type)</div><div class='ctx'> 		REG_CLR_BIT(ah, AR_CFG, AR_CFG_HALT_REQ);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	REG_WRITE(ah, AR_RTC_RC, rst_flags);</div><div class='add'>+	REG_WRITE(ah, AR_RTC_RC(ah), rst_flags);</div><div class='ctx'> </div><div class='ctx'> 	REGWRITE_BUFFER_FLUSH(ah);</div><div class='ctx'> </div><div class='hunk'>@@ -1425,8 +1426,8 @@ static bool ath9k_hw_set_reset(struct ath_hw *ah, int type)</div><div class='ctx'> 	else</div><div class='ctx'> 		udelay(100);</div><div class='ctx'> </div><div class='del'>-	REG_WRITE(ah, AR_RTC_RC, 0);</div><div class='del'>-	if (!ath9k_hw_wait(ah, AR_RTC_RC, AR_RTC_RC_M, 0, AH_WAIT_TIMEOUT)) {</div><div class='add'>+	REG_WRITE(ah, AR_RTC_RC(ah), 0);</div><div class='add'>+	if (!ath9k_hw_wait(ah, AR_RTC_RC(ah), AR_RTC_RC_M, 0, AH_WAIT_TIMEOUT)) {</div><div class='ctx'> 		ath_dbg(ath9k_hw_common(ah), RESET, "RTC stuck in MAC reset\n");</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1445,17 +1446,17 @@ static bool ath9k_hw_set_reset_power_on(struct ath_hw *ah)</div><div class='ctx'> 	ENABLE_REGWRITE_BUFFER(ah);</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9300_20_OR_LATER(ah)) {</div><div class='del'>-		REG_WRITE(ah, AR_WA, ah-&gt;WARegVal);</div><div class='add'>+		REG_WRITE(ah, AR_WA(ah), ah-&gt;WARegVal);</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	REG_WRITE(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_EN |</div><div class='add'>+	REG_WRITE(ah, AR_RTC_FORCE_WAKE(ah), AR_RTC_FORCE_WAKE_EN |</div><div class='ctx'> 		  AR_RTC_FORCE_WAKE_ON_INT);</div><div class='ctx'> </div><div class='ctx'> 	if (!AR_SREV_9100(ah) &amp;&amp; !AR_SREV_9300_20_OR_LATER(ah))</div><div class='ctx'> 		REG_WRITE(ah, AR_RC, AR_RC_AHB);</div><div class='ctx'> </div><div class='del'>-	REG_WRITE(ah, AR_RTC_RESET, 0);</div><div class='add'>+	REG_WRITE(ah, AR_RTC_RESET(ah), 0);</div><div class='ctx'> </div><div class='ctx'> 	REGWRITE_BUFFER_FLUSH(ah);</div><div class='ctx'> </div><div class='hunk'>@@ -1464,11 +1465,11 @@ static bool ath9k_hw_set_reset_power_on(struct ath_hw *ah)</div><div class='ctx'> 	if (!AR_SREV_9100(ah) &amp;&amp; !AR_SREV_9300_20_OR_LATER(ah))</div><div class='ctx'> 		REG_WRITE(ah, AR_RC, 0);</div><div class='ctx'> </div><div class='del'>-	REG_WRITE(ah, AR_RTC_RESET, 1);</div><div class='add'>+	REG_WRITE(ah, AR_RTC_RESET(ah), 1);</div><div class='ctx'> </div><div class='ctx'> 	if (!ath9k_hw_wait(ah,</div><div class='del'>-			   AR_RTC_STATUS,</div><div class='del'>-			   AR_RTC_STATUS_M,</div><div class='add'>+			   AR_RTC_STATUS(ah),</div><div class='add'>+			   AR_RTC_STATUS_M(ah),</div><div class='ctx'> 			   AR_RTC_STATUS_ON,</div><div class='ctx'> 			   AH_WAIT_TIMEOUT)) {</div><div class='ctx'> 		ath_dbg(ath9k_hw_common(ah), RESET, "RTC not waking up\n");</div><div class='hunk'>@@ -1483,11 +1484,11 @@ static bool ath9k_hw_set_reset_reg(struct ath_hw *ah, u32 type)</div><div class='ctx'> 	bool ret = false;</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9300_20_OR_LATER(ah)) {</div><div class='del'>-		REG_WRITE(ah, AR_WA, ah-&gt;WARegVal);</div><div class='add'>+		REG_WRITE(ah, AR_WA(ah), ah-&gt;WARegVal);</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	REG_WRITE(ah, AR_RTC_FORCE_WAKE,</div><div class='add'>+	REG_WRITE(ah, AR_RTC_FORCE_WAKE(ah),</div><div class='ctx'> 		  AR_RTC_FORCE_WAKE_EN | AR_RTC_FORCE_WAKE_ON_INT);</div><div class='ctx'> </div><div class='ctx'> 	if (!ah-&gt;reset_power_on)</div><div class='hunk'>@@ -1521,7 +1522,7 @@ static bool ath9k_hw_chip_reset(struct ath_hw *ah,</div><div class='ctx'> 		else</div><div class='ctx'> 			reset_type = ATH9K_RESET_COLD;</div><div class='ctx'> 	} else if (ah-&gt;chip_fullsleep || REG_READ(ah, AR_Q_TXE) ||</div><div class='del'>-		   (REG_READ(ah, AR_CR) &amp; AR_CR_RXE))</div><div class='add'>+		   (REG_READ(ah, AR_CR) &amp; AR_CR_RXE(ah)))</div><div class='ctx'> 		reset_type = ATH9K_RESET_COLD;</div><div class='ctx'> </div><div class='ctx'> 	if (!ath9k_hw_set_reset_reg(ah, reset_type))</div><div class='hunk'>@@ -1621,7 +1622,6 @@ static void ath9k_hw_apply_gpio_override(struct ath_hw *ah)</div><div class='ctx'> 		ath9k_hw_gpio_request_out(ah, i, NULL,</div><div class='ctx'> 					  AR_GPIO_OUTPUT_MUX_AS_OUTPUT);</div><div class='ctx'> 		ath9k_hw_set_gpio(ah, i, !!(ah-&gt;gpio_val &amp; BIT(i)));</div><div class='del'>-		ath9k_hw_gpio_free(ah, i);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1848,20 +1848,11 @@ fail:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 ath9k_hw_get_tsf_offset(struct timespec64 *last, struct timespec64 *cur)</div><div class='add'>+u32 ath9k_hw_get_tsf_offset(ktime_t last, ktime_t cur)</div><div class='ctx'> {</div><div class='del'>-	struct timespec64 ts;</div><div class='del'>-	s64 usec;</div><div class='del'>-</div><div class='del'>-	if (!cur) {</div><div class='del'>-		ktime_get_raw_ts64(&amp;ts);</div><div class='del'>-		cur = &amp;ts;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	usec = cur-&gt;tv_sec * 1000000ULL + cur-&gt;tv_nsec / 1000;</div><div class='del'>-	usec -= last-&gt;tv_sec * 1000000ULL + last-&gt;tv_nsec / 1000;</div><div class='del'>-</div><div class='del'>-	return (u32) usec;</div><div class='add'>+	if (cur == 0)</div><div class='add'>+		cur = ktime_get_raw();</div><div class='add'>+	return ktime_us_delta(cur, last);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ath9k_hw_get_tsf_offset);</div><div class='ctx'> </div><div class='hunk'>@@ -1872,7 +1863,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,</div><div class='ctx'> 	u32 saveLedState;</div><div class='ctx'> 	u32 saveDefAntenna;</div><div class='ctx'> 	u32 macStaId1;</div><div class='del'>-	struct timespec64 tsf_ts;</div><div class='add'>+	ktime_t tsf_ts;</div><div class='ctx'> 	u32 tsf_offset;</div><div class='ctx'> 	u64 tsf = 0;</div><div class='ctx'> 	int r;</div><div class='hunk'>@@ -1918,7 +1909,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,</div><div class='ctx'> 	macStaId1 = REG_READ(ah, AR_STA_ID1) &amp; AR_STA_ID1_BASE_RATE_11B;</div><div class='ctx'> </div><div class='ctx'> 	/* Save TSF before chip reset, a cold reset clears it */</div><div class='del'>-	ktime_get_raw_ts64(&amp;tsf_ts);</div><div class='add'>+	tsf_ts = ktime_get_raw();</div><div class='ctx'> 	tsf = ath9k_hw_gettsf64(ah);</div><div class='ctx'> </div><div class='ctx'> 	saveLedState = REG_READ(ah, AR_CFG_LED) &amp;</div><div class='hunk'>@@ -1952,11 +1943,11 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Restore TSF */</div><div class='del'>-	tsf_offset = ath9k_hw_get_tsf_offset(&amp;tsf_ts, NULL);</div><div class='add'>+	tsf_offset = ath9k_hw_get_tsf_offset(tsf_ts, 0);</div><div class='ctx'> 	ath9k_hw_settsf64(ah, tsf + tsf_offset);</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9280_20_OR_LATER(ah))</div><div class='del'>-		REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL, AR_GPIO_JTAG_DISABLE);</div><div class='add'>+		REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL(ah), AR_GPIO_JTAG_DISABLE);</div><div class='ctx'> </div><div class='ctx'> 	if (!AR_SREV_9300_20_OR_LATER(ah))</div><div class='ctx'> 		ar9002_hw_enable_async_fifo(ah);</div><div class='hunk'>@@ -1976,7 +1967,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,</div><div class='ctx'> 	 * value after the initvals have been applied.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (AR_SREV_9100(ah) &amp;&amp; (ath9k_hw_gettsf64(ah) &lt; tsf)) {</div><div class='del'>-		tsf_offset = ath9k_hw_get_tsf_offset(&amp;tsf_ts, NULL);</div><div class='add'>+		tsf_offset = ath9k_hw_get_tsf_offset(tsf_ts, 0);</div><div class='ctx'> 		ath9k_hw_settsf64(ah, tsf + tsf_offset);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2018,7 +2009,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,</div><div class='ctx'> 	ath9k_hw_set_dma(ah);</div><div class='ctx'> </div><div class='ctx'> 	if (!ath9k_hw_mci_is_enabled(ah))</div><div class='del'>-		REG_WRITE(ah, AR_OBS, 8);</div><div class='add'>+		REG_WRITE(ah, AR_OBS(ah), 8);</div><div class='ctx'> </div><div class='ctx'> 	ENABLE_REG_RMW_BUFFER(ah);</div><div class='ctx'> 	if (ah-&gt;config.rx_intr_mitigation) {</div><div class='hunk'>@@ -2112,7 +2103,7 @@ static void ath9k_set_power_sleep(struct ath_hw *ah)</div><div class='ctx'> 	 * Clear the RTC force wake bit to allow the</div><div class='ctx'> 	 * mac to go to sleep.</div><div class='ctx'> 	 */</div><div class='del'>-	REG_CLR_BIT(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_EN);</div><div class='add'>+	REG_CLR_BIT(ah, AR_RTC_FORCE_WAKE(ah), AR_RTC_FORCE_WAKE_EN);</div><div class='ctx'> </div><div class='ctx'> 	if (ath9k_hw_mci_is_enabled(ah))</div><div class='ctx'> 		udelay(100);</div><div class='hunk'>@@ -2122,13 +2113,13 @@ static void ath9k_set_power_sleep(struct ath_hw *ah)</div><div class='ctx'> </div><div class='ctx'> 	/* Shutdown chip. Active low */</div><div class='ctx'> 	if (!AR_SREV_5416(ah) &amp;&amp; !AR_SREV_9271(ah)) {</div><div class='del'>-		REG_CLR_BIT(ah, AR_RTC_RESET, AR_RTC_RESET_EN);</div><div class='add'>+		REG_CLR_BIT(ah, AR_RTC_RESET(ah), AR_RTC_RESET_EN);</div><div class='ctx'> 		udelay(2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Clear Bit 14 of AR_WA after putting chip into Full Sleep mode. */</div><div class='add'>+	/* Clear Bit 14 of AR_WA(ah) after putting chip into Full Sleep mode. */</div><div class='ctx'> 	if (AR_SREV_9300_20_OR_LATER(ah))</div><div class='del'>-		REG_WRITE(ah, AR_WA, ah-&gt;WARegVal &amp; ~AR_WA_D3_L1_DISABLE);</div><div class='add'>+		REG_WRITE(ah, AR_WA(ah), ah-&gt;WARegVal &amp; ~AR_WA_D3_L1_DISABLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2144,13 +2135,13 @@ static void ath9k_set_power_network_sleep(struct ath_hw *ah)</div><div class='ctx'> </div><div class='ctx'> 	if (!(pCap-&gt;hw_caps &amp; ATH9K_HW_CAP_AUTOSLEEP)) {</div><div class='ctx'> 		/* Set WakeOnInterrupt bit; clear ForceWake bit */</div><div class='del'>-		REG_WRITE(ah, AR_RTC_FORCE_WAKE,</div><div class='add'>+		REG_WRITE(ah, AR_RTC_FORCE_WAKE(ah),</div><div class='ctx'> 			  AR_RTC_FORCE_WAKE_ON_INT);</div><div class='ctx'> 	} else {</div><div class='ctx'> </div><div class='ctx'> 		/* When chip goes into network sleep, it could be waken</div><div class='ctx'> 		 * up by MCI_INT interrupt caused by BT's HW messages</div><div class='del'>-		 * (LNA_xxx, CONT_xxx) which chould be in a very fast</div><div class='add'>+		 * (LNA_xxx, CONT_xxx) which could be in a very fast</div><div class='ctx'> 		 * rate (~100us). This will cause chip to leave and</div><div class='ctx'> 		 * re-enter network sleep mode frequently, which in</div><div class='ctx'> 		 * consequence will have WLAN MCI HW to generate lots of</div><div class='hunk'>@@ -2164,15 +2155,15 @@ static void ath9k_set_power_network_sleep(struct ath_hw *ah)</div><div class='ctx'> 		 * Clear the RTC force wake bit to allow the</div><div class='ctx'> 		 * mac to go to sleep.</div><div class='ctx'> 		 */</div><div class='del'>-		REG_CLR_BIT(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_EN);</div><div class='add'>+		REG_CLR_BIT(ah, AR_RTC_FORCE_WAKE(ah), AR_RTC_FORCE_WAKE_EN);</div><div class='ctx'> </div><div class='ctx'> 		if (ath9k_hw_mci_is_enabled(ah))</div><div class='ctx'> 			udelay(30);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Clear Bit 14 of AR_WA after putting chip into Net Sleep mode. */</div><div class='add'>+	/* Clear Bit 14 of AR_WA(ah) after putting chip into Net Sleep mode. */</div><div class='ctx'> 	if (AR_SREV_9300_20_OR_LATER(ah))</div><div class='del'>-		REG_WRITE(ah, AR_WA, ah-&gt;WARegVal &amp; ~AR_WA_D3_L1_DISABLE);</div><div class='add'>+		REG_WRITE(ah, AR_WA(ah), ah-&gt;WARegVal &amp; ~AR_WA_D3_L1_DISABLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool ath9k_hw_set_power_awake(struct ath_hw *ah)</div><div class='hunk'>@@ -2180,14 +2171,14 @@ static bool ath9k_hw_set_power_awake(struct ath_hw *ah)</div><div class='ctx'> 	u32 val;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	/* Set Bits 14 and 17 of AR_WA before powering on the chip. */</div><div class='add'>+	/* Set Bits 14 and 17 of AR_WA(ah) before powering on the chip. */</div><div class='ctx'> 	if (AR_SREV_9300_20_OR_LATER(ah)) {</div><div class='del'>-		REG_WRITE(ah, AR_WA, ah-&gt;WARegVal);</div><div class='add'>+		REG_WRITE(ah, AR_WA(ah), ah-&gt;WARegVal);</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((REG_READ(ah, AR_RTC_STATUS) &amp;</div><div class='del'>-	     AR_RTC_STATUS_M) == AR_RTC_STATUS_SHUTDOWN) {</div><div class='add'>+	if ((REG_READ(ah, AR_RTC_STATUS(ah)) &amp;</div><div class='add'>+	     AR_RTC_STATUS_M(ah)) == AR_RTC_STATUS_SHUTDOWN) {</div><div class='ctx'> 		if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_POWER_ON)) {</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2195,10 +2186,10 @@ static bool ath9k_hw_set_power_awake(struct ath_hw *ah)</div><div class='ctx'> 			ath9k_hw_init_pll(ah, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (AR_SREV_9100(ah))</div><div class='del'>-		REG_SET_BIT(ah, AR_RTC_RESET,</div><div class='add'>+		REG_SET_BIT(ah, AR_RTC_RESET(ah),</div><div class='ctx'> 			    AR_RTC_RESET_EN);</div><div class='ctx'> </div><div class='del'>-	REG_SET_BIT(ah, AR_RTC_FORCE_WAKE,</div><div class='add'>+	REG_SET_BIT(ah, AR_RTC_FORCE_WAKE(ah),</div><div class='ctx'> 		    AR_RTC_FORCE_WAKE_EN);</div><div class='ctx'> 	if (AR_SREV_9100(ah))</div><div class='ctx'> 		mdelay(10);</div><div class='hunk'>@@ -2206,11 +2197,11 @@ static bool ath9k_hw_set_power_awake(struct ath_hw *ah)</div><div class='ctx'> 		udelay(50);</div><div class='ctx'> </div><div class='ctx'> 	for (i = POWER_UP_TIME / 50; i &gt; 0; i--) {</div><div class='del'>-		val = REG_READ(ah, AR_RTC_STATUS) &amp; AR_RTC_STATUS_M;</div><div class='add'>+		val = REG_READ(ah, AR_RTC_STATUS(ah)) &amp; AR_RTC_STATUS_M(ah);</div><div class='ctx'> 		if (val == AR_RTC_STATUS_ON)</div><div class='ctx'> 			break;</div><div class='ctx'> 		udelay(50);</div><div class='del'>-		REG_SET_BIT(ah, AR_RTC_FORCE_WAKE,</div><div class='add'>+		REG_SET_BIT(ah, AR_RTC_FORCE_WAKE(ah),</div><div class='ctx'> 			    AR_RTC_FORCE_WAKE_EN);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (i == 0) {</div><div class='hunk'>@@ -2545,7 +2536,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)</div><div class='ctx'> </div><div class='ctx'> 	pCap-&gt;tx_chainmask = ah-&gt;eep_ops-&gt;get_eeprom(ah, EEP_TX_MASK);</div><div class='ctx'> 	/*</div><div class='del'>-	 * For AR9271 we will temporarilly uses the rx chainmax as read from</div><div class='add'>+	 * For AR9271 we will temporarily use the rx chainmax as read from</div><div class='ctx'> 	 * the EEPROM.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((ah-&gt;hw_version.devid == AR5416_DEVID_PCI) &amp;&amp;</div><div class='hunk'>@@ -2702,16 +2693,16 @@ static void ath9k_hw_gpio_cfg_output_mux(struct ath_hw *ah, u32 gpio, u32 type)</div><div class='ctx'> 	u32 gpio_shift, tmp;</div><div class='ctx'> </div><div class='ctx'> 	if (gpio &gt; 11)</div><div class='del'>-		addr = AR_GPIO_OUTPUT_MUX3;</div><div class='add'>+		addr = AR_GPIO_OUTPUT_MUX3(ah);</div><div class='ctx'> 	else if (gpio &gt; 5)</div><div class='del'>-		addr = AR_GPIO_OUTPUT_MUX2;</div><div class='add'>+		addr = AR_GPIO_OUTPUT_MUX2(ah);</div><div class='ctx'> 	else</div><div class='del'>-		addr = AR_GPIO_OUTPUT_MUX1;</div><div class='add'>+		addr = AR_GPIO_OUTPUT_MUX1(ah);</div><div class='ctx'> </div><div class='ctx'> 	gpio_shift = (gpio % 6) * 5;</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9280_20_OR_LATER(ah) ||</div><div class='del'>-	    (addr != AR_GPIO_OUTPUT_MUX1)) {</div><div class='add'>+	    (addr != AR_GPIO_OUTPUT_MUX1(ah))) {</div><div class='ctx'> 		REG_RMW(ah, addr, (type &lt;&lt; gpio_shift),</div><div class='ctx'> 			(0x1f &lt;&lt; gpio_shift));</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -2728,14 +2719,17 @@ static void ath9k_hw_gpio_cfg_output_mux(struct ath_hw *ah, u32 gpio, u32 type)</div><div class='ctx'> static void ath9k_hw_gpio_cfg_soc(struct ath_hw *ah, u32 gpio, bool out,</div><div class='ctx'> 				  const char *label)</div><div class='ctx'> {</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	if (ah-&gt;caps.gpio_requested &amp; BIT(gpio))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* may be requested by BSP, free anyway */</div><div class='del'>-	gpio_free(gpio);</div><div class='del'>-</div><div class='del'>-	if (gpio_request_one(gpio, out ? GPIOF_OUT_INIT_LOW : GPIOF_IN, label))</div><div class='add'>+	err = devm_gpio_request_one(ah-&gt;dev, gpio, out ? GPIOF_OUT_INIT_LOW : GPIOF_IN, label);</div><div class='add'>+	if (err) {</div><div class='add'>+		ath_err(ath9k_hw_common(ah), "request GPIO%d failed:%d\n",</div><div class='add'>+			gpio, err);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ah-&gt;caps.gpio_requested |= BIT(gpio);</div><div class='ctx'> }</div><div class='hunk'>@@ -2752,13 +2746,13 @@ static void ath9k_hw_gpio_cfg_wmac(struct ath_hw *ah, u32 gpio, bool out,</div><div class='ctx'> 			AR7010_GPIO_OE_MASK &lt;&lt; gpio_shift);</div><div class='ctx'> 	} else if (AR_SREV_SOC(ah)) {</div><div class='ctx'> 		gpio_set = out ? 1 : 0;</div><div class='del'>-		REG_RMW(ah, AR_GPIO_OE_OUT, gpio_set &lt;&lt; gpio_shift,</div><div class='add'>+		REG_RMW(ah, AR_GPIO_OE_OUT(ah), gpio_set &lt;&lt; gpio_shift,</div><div class='ctx'> 			gpio_set &lt;&lt; gpio_shift);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		gpio_shift = gpio &lt;&lt; 1;</div><div class='ctx'> 		gpio_set = out ?</div><div class='ctx'> 			AR_GPIO_OE_OUT_DRV_ALL : AR_GPIO_OE_OUT_DRV_NO;</div><div class='del'>-		REG_RMW(ah, AR_GPIO_OE_OUT, gpio_set &lt;&lt; gpio_shift,</div><div class='add'>+		REG_RMW(ah, AR_GPIO_OE_OUT(ah), gpio_set &lt;&lt; gpio_shift,</div><div class='ctx'> 			AR_GPIO_OE_OUT_DRV &lt;&lt; gpio_shift);</div><div class='ctx'> </div><div class='ctx'> 		if (out)</div><div class='hunk'>@@ -2799,10 +2793,8 @@ void ath9k_hw_gpio_free(struct ath_hw *ah, u32 gpio)</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(gpio &gt;= ah-&gt;caps.num_gpio_pins);</div><div class='ctx'> </div><div class='del'>-	if (ah-&gt;caps.gpio_requested &amp; BIT(gpio)) {</div><div class='del'>-		gpio_free(gpio);</div><div class='add'>+	if (ah-&gt;caps.gpio_requested &amp; BIT(gpio))</div><div class='ctx'> 		ah-&gt;caps.gpio_requested &amp;= ~BIT(gpio);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ath9k_hw_gpio_free);</div><div class='ctx'> </div><div class='hunk'>@@ -2811,7 +2803,7 @@ u32 ath9k_hw_gpio_get(struct ath_hw *ah, u32 gpio)</div><div class='ctx'> 	u32 val = 0xffffffff;</div><div class='ctx'> </div><div class='ctx'> #define MS_REG_READ(x, y) \</div><div class='del'>-	(MS(REG_READ(ah, AR_GPIO_IN_OUT), x##_GPIO_IN_VAL) &amp; BIT(y))</div><div class='add'>+	(MS(REG_READ(ah, AR_GPIO_IN_OUT(ah)), x##_GPIO_IN_VAL) &amp; BIT(y))</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(gpio &gt;= ah-&gt;caps.num_gpio_pins);</div><div class='ctx'> </div><div class='hunk'>@@ -2827,7 +2819,7 @@ u32 ath9k_hw_gpio_get(struct ath_hw *ah, u32 gpio)</div><div class='ctx'> 		else if (AR_DEVID_7010(ah))</div><div class='ctx'> 			val = REG_READ(ah, AR7010_GPIO_IN) &amp; BIT(gpio);</div><div class='ctx'> 		else if (AR_SREV_9300_20_OR_LATER(ah))</div><div class='del'>-			val = REG_READ(ah, AR_GPIO_IN) &amp; BIT(gpio);</div><div class='add'>+			val = REG_READ(ah, AR_GPIO_IN(ah)) &amp; BIT(gpio);</div><div class='ctx'> 		else</div><div class='ctx'> 			val = MS_REG_READ(AR, gpio);</div><div class='ctx'> 	} else if (BIT(gpio) &amp; ah-&gt;caps.gpio_requested) {</div><div class='hunk'>@@ -2851,7 +2843,7 @@ void ath9k_hw_set_gpio(struct ath_hw *ah, u32 gpio, u32 val)</div><div class='ctx'> </div><div class='ctx'> 	if (BIT(gpio) &amp; ah-&gt;caps.gpio_mask) {</div><div class='ctx'> 		u32 out_addr = AR_DEVID_7010(ah) ?</div><div class='del'>-			AR7010_GPIO_OUT : AR_GPIO_IN_OUT;</div><div class='add'>+			AR7010_GPIO_OUT : AR_GPIO_IN_OUT(ah);</div><div class='ctx'> </div><div class='ctx'> 		REG_RMW(ah, out_addr, val &lt;&lt; gpio, BIT(gpio));</div><div class='ctx'> 	} else if (BIT(gpio) &amp; ah-&gt;caps.gpio_requested) {</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h<br/>index b7b65b1c90e8..eaa07d6dbde0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/hw.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/hw.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/hw.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/hw.h</a></div><div class='hunk'>@@ -282,7 +282,7 @@ enum ath9k_hw_caps {</div><div class='ctx'>  * an exact user defined pattern or de-authentication/disassoc pattern.</div><div class='ctx'>  * @ATH9K_HW_WOW_PATTERN_MATCH_DWORD: device requires the first four</div><div class='ctx'>  * bytes of the pattern for user defined pattern, de-authentication and</div><div class='del'>- * disassociation patterns for all types of possible frames recieved</div><div class='add'>+ * disassociation patterns for all types of possible frames received</div><div class='ctx'>  * of those types.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -710,7 +710,7 @@ struct ath_spec_scan {</div><div class='ctx'> /**</div><div class='ctx'>  * struct ath_hw_ops - callbacks used by hardware code and driver code</div><div class='ctx'>  *</div><div class='del'>- * This structure contains callbacks designed to to be used internally by</div><div class='add'>+ * This structure contains callbacks designed to be used internally by</div><div class='ctx'>  * hardware code and also by the lower level driver.</div><div class='ctx'>  *</div><div class='ctx'>  * @config_pci_powersave:</div><div class='hunk'>@@ -977,6 +977,8 @@ struct ath_hw {</div><div class='ctx'> 	bool disable_5ghz;</div><div class='ctx'> </div><div class='ctx'> 	const struct firmware *eeprom_blob;</div><div class='add'>+	u16 *nvmem_blob;	/* devres managed */</div><div class='add'>+	size_t nvmem_blob_len;</div><div class='ctx'> </div><div class='ctx'> 	struct ath_dynack dynack;</div><div class='ctx'> </div><div class='hunk'>@@ -1064,7 +1066,7 @@ u32 ath9k_hw_gettsf32(struct ath_hw *ah);</div><div class='ctx'> u64 ath9k_hw_gettsf64(struct ath_hw *ah);</div><div class='ctx'> void ath9k_hw_settsf64(struct ath_hw *ah, u64 tsf64);</div><div class='ctx'> void ath9k_hw_reset_tsf(struct ath_hw *ah);</div><div class='del'>-u32 ath9k_hw_get_tsf_offset(struct timespec64 *last, struct timespec64 *cur);</div><div class='add'>+u32 ath9k_hw_get_tsf_offset(ktime_t last, ktime_t cur);</div><div class='ctx'> void ath9k_hw_set_tsfadjust(struct ath_hw *ah, bool set);</div><div class='ctx'> void ath9k_hw_init_global_settings(struct ath_hw *ah);</div><div class='ctx'> u32 ar9003_get_pll_sqsum_dvc(struct ath_hw *ah);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c<br/>index e9a36dd7144f..ee951493e993 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/init.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/init.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/init.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/init.c</a></div><div class='hunk'>@@ -18,10 +18,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/ath9k_platform.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='add'>+#include &lt;linux/nvmem-consumer.h&gt;</div><div class='ctx'> #include &lt;linux/relay.h&gt;</div><div class='ctx'> #include &lt;linux/dmi.h&gt;</div><div class='ctx'> #include &lt;net/ieee80211_radiotap.h&gt;</div><div class='hunk'>@@ -150,12 +150,12 @@ static void ath9k_deinit_softc(struct ath_softc *sc);</div><div class='ctx'> </div><div class='ctx'> static void ath9k_op_ps_wakeup(struct ath_common *common)</div><div class='ctx'> {</div><div class='del'>-	ath9k_ps_wakeup((struct ath_softc *) common-&gt;priv);</div><div class='add'>+	ath9k_ps_wakeup(common-&gt;priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath9k_op_ps_restore(struct ath_common *common)</div><div class='ctx'> {</div><div class='del'>-	ath9k_ps_restore((struct ath_softc *) common-&gt;priv);</div><div class='add'>+	ath9k_ps_restore(common-&gt;priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ath_ps_ops ath9k_ps_ops = {</div><div class='hunk'>@@ -173,7 +173,7 @@ static void ath9k_iowrite32(void *hw_priv, u32 val, u32 reg_offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hw *ah = hw_priv;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='del'>-	struct ath_softc *sc = (struct ath_softc *) common-&gt;priv;</div><div class='add'>+	struct ath_softc *sc = common-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	if (NR_CPUS &gt; 1 &amp;&amp; ah-&gt;config.serialize_regmode == SER_REG_MODE_ON) {</div><div class='ctx'> 		unsigned long flags;</div><div class='hunk'>@@ -188,7 +188,7 @@ static unsigned int ath9k_ioread32(void *hw_priv, u32 reg_offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hw *ah = hw_priv;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='del'>-	struct ath_softc *sc = (struct ath_softc *) common-&gt;priv;</div><div class='add'>+	struct ath_softc *sc = common-&gt;priv;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	if (NR_CPUS &gt; 1 &amp;&amp; ah-&gt;config.serialize_regmode == SER_REG_MODE_ON) {</div><div class='hunk'>@@ -228,7 +228,7 @@ static unsigned int ath9k_reg_rmw(void *hw_priv, u32 reg_offset, u32 set, u32 cl</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hw *ah = hw_priv;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='del'>-	struct ath_softc *sc = (struct ath_softc *) common-&gt;priv;</div><div class='add'>+	struct ath_softc *sc = common-&gt;priv;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='hunk'>@@ -568,45 +568,53 @@ static void ath9k_eeprom_release(struct ath_softc *sc)</div><div class='ctx'> 	release_firmware(sc-&gt;sc_ah-&gt;eeprom_blob);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath9k_init_platform(struct ath_softc *sc)</div><div class='add'>+static int ath9k_nvmem_request_eeprom(struct ath_softc *sc)</div><div class='ctx'> {</div><div class='del'>-	struct ath9k_platform_data *pdata = sc-&gt;dev-&gt;platform_data;</div><div class='ctx'> 	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='del'>-	struct ath_common *common = ath9k_hw_common(ah);</div><div class='del'>-	int ret;</div><div class='add'>+	struct nvmem_cell *cell;</div><div class='add'>+	void *buf;</div><div class='add'>+	size_t len;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (!pdata)</div><div class='del'>-		return 0;</div><div class='add'>+	cell = devm_nvmem_cell_get(sc-&gt;dev, "calibration");</div><div class='add'>+	if (IS_ERR(cell)) {</div><div class='add'>+		err = PTR_ERR(cell);</div><div class='ctx'> </div><div class='del'>-	if (!pdata-&gt;use_eeprom) {</div><div class='del'>-		ah-&gt;ah_flags &amp;= ~AH_USE_EEPROM;</div><div class='del'>-		ah-&gt;gpio_mask = pdata-&gt;gpio_mask;</div><div class='del'>-		ah-&gt;gpio_val = pdata-&gt;gpio_val;</div><div class='del'>-		ah-&gt;led_pin = pdata-&gt;led_pin;</div><div class='del'>-		ah-&gt;is_clk_25mhz = pdata-&gt;is_clk_25mhz;</div><div class='del'>-		ah-&gt;get_mac_revision = pdata-&gt;get_mac_revision;</div><div class='del'>-		ah-&gt;external_reset = pdata-&gt;external_reset;</div><div class='del'>-		ah-&gt;disable_2ghz = pdata-&gt;disable_2ghz;</div><div class='del'>-		ah-&gt;disable_5ghz = pdata-&gt;disable_5ghz;</div><div class='del'>-</div><div class='del'>-		if (!pdata-&gt;endian_check)</div><div class='del'>-			ah-&gt;ah_flags |= AH_NO_EEP_SWAP;</div><div class='del'>-	}</div><div class='add'>+		/* nvmem cell might not be defined, or the nvmem</div><div class='add'>+		 * subsystem isn't included. In this case, follow</div><div class='add'>+		 * the established "just return 0;" convention</div><div class='add'>+		 * to say:</div><div class='add'>+		 * "All good. Nothing to see here. Please go on."</div><div class='add'>+		 */</div><div class='add'>+		if (err == -ENOENT || err == -EOPNOTSUPP)</div><div class='add'>+			return 0;</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;eeprom_name) {</div><div class='del'>-		ret = ath9k_eeprom_request(sc, pdata-&gt;eeprom_name);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;led_active_high)</div><div class='del'>-		ah-&gt;config.led_active_high = true;</div><div class='add'>+	buf = nvmem_cell_read(cell, &amp;len);</div><div class='add'>+	if (IS_ERR(buf))</div><div class='add'>+		return PTR_ERR(buf);</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;tx_gain_buffalo)</div><div class='del'>-		ah-&gt;config.tx_gain_buffalo = true;</div><div class='add'>+	/* run basic sanity checks on the returned nvram cell length.</div><div class='add'>+	 * That length has to be a multiple of a "u16" (i.e.: &amp; 1).</div><div class='add'>+	 * Furthermore, it has to be more than "let's say" 512 bytes</div><div class='add'>+	 * but less than the maximum of AR9300_EEPROM_SIZE (16kb).</div><div class='add'>+	 */</div><div class='add'>+	if ((len &amp; 1) == 1 || len &lt; 512 || len &gt;= AR9300_EEPROM_SIZE) {</div><div class='add'>+		kfree(buf);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* devres manages the calibration values release on shutdown */</div><div class='add'>+	ah-&gt;nvmem_blob = devm_kmemdup(sc-&gt;dev, buf, len, GFP_KERNEL);</div><div class='add'>+	kfree(buf);</div><div class='add'>+	if (!ah-&gt;nvmem_blob)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;macaddr)</div><div class='del'>-		ether_addr_copy(common-&gt;macaddr, pdata-&gt;macaddr);</div><div class='add'>+	ah-&gt;nvmem_blob_len = len;</div><div class='add'>+	ah-&gt;ah_flags &amp;= ~AH_USE_EEPROM;</div><div class='add'>+	ah-&gt;ah_flags |= AH_NO_EEP_SWAP;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -639,7 +647,9 @@ static int ath9k_of_init(struct ath_softc *sc)</div><div class='ctx'> 		ah-&gt;ah_flags |= AH_NO_EEP_SWAP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	of_get_mac_address(np, common-&gt;macaddr);</div><div class='add'>+	ret = of_get_mac_address(np, common-&gt;macaddr);</div><div class='add'>+	if (ret == -EPROBE_DEFER)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -696,11 +706,11 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,</div><div class='ctx'> 	 */</div><div class='ctx'> 	ath9k_init_pcoem_platform(sc);</div><div class='ctx'> </div><div class='del'>-	ret = ath9k_init_platform(sc);</div><div class='add'>+	ret = ath9k_of_init(sc);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = ath9k_of_init(sc);</div><div class='add'>+	ret = ath9k_nvmem_request_eeprom(sc);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1038,6 +1048,8 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc,</div><div class='ctx'> 		ARRAY_SIZE(ath9k_tpt_blink));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	wiphy_read_of_freq_limits(hw-&gt;wiphy);</div><div class='add'>+</div><div class='ctx'> 	/* Register with mac80211 */</div><div class='ctx'> 	error = ieee80211_register_hw(hw);</div><div class='ctx'> 	if (error)</div><div class='hunk'>@@ -1087,7 +1099,7 @@ static void ath9k_deinit_softc(struct ath_softc *sc)</div><div class='ctx'> 		if (ATH_TXQ_SETUP(sc, i))</div><div class='ctx'> 			ath_tx_cleanupq(sc, &amp;sc-&gt;tx.txq[i]);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;sc-&gt;sleep_timer);</div><div class='add'>+	timer_delete_sync(&amp;sc-&gt;sleep_timer);</div><div class='ctx'> 	ath9k_hw_deinit(sc-&gt;sc_ah);</div><div class='ctx'> 	if (sc-&gt;dfs_detector != NULL)</div><div class='ctx'> 		sc-&gt;dfs_detector-&gt;exit(sc-&gt;dfs_detector);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/link.c b/drivers/net/wireless/ath/ath9k/link.c<br/>index 9d84003db800..5d7e3ddb6dbc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/link.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/link.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/link.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/link.c</a></div><div class='hunk'>@@ -50,7 +50,36 @@ reset:</div><div class='ctx'> 		"tx hung, resetting the chip\n");</div><div class='ctx'> 	ath9k_queue_reset(sc, RESET_TYPE_TX_HANG);</div><div class='ctx'> 	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define RX_INACTIVE_CHECK_INTERVAL (4 * MSEC_PER_SEC)</div><div class='add'>+</div><div class='add'>+static bool ath_hw_rx_inactive_check(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(sc-&gt;sc_ah);</div><div class='add'>+	u32 interval, count;</div><div class='add'>+</div><div class='add'>+	interval = jiffies_to_msecs(jiffies - sc-&gt;rx_active_check_time);</div><div class='add'>+	count = sc-&gt;rx_active_count;</div><div class='add'>+</div><div class='add'>+	if (interval &lt; RX_INACTIVE_CHECK_INTERVAL)</div><div class='add'>+		return true; /* too soon to check */</div><div class='ctx'> </div><div class='add'>+	sc-&gt;rx_active_count = 0;</div><div class='add'>+	sc-&gt;rx_active_check_time = jiffies;</div><div class='add'>+</div><div class='add'>+	/* Need at least one interrupt per second, and we should only react if</div><div class='add'>+	 * we are within a factor two of the expected interval</div><div class='add'>+	 */</div><div class='add'>+	if (interval &gt; RX_INACTIVE_CHECK_INTERVAL * 2 ||</div><div class='add'>+	    count &gt;= interval / MSEC_PER_SEC)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	ath_dbg(common, RESET,</div><div class='add'>+		"RX inactivity detected. Schedule chip reset\n");</div><div class='add'>+	ath9k_queue_reset(sc, RESET_TYPE_RX_INACTIVE);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ath_hw_check_work(struct work_struct *work)</div><div class='hunk'>@@ -58,8 +87,8 @@ void ath_hw_check_work(struct work_struct *work)</div><div class='ctx'> 	struct ath_softc *sc = container_of(work, struct ath_softc,</div><div class='ctx'> 					    hw_check_work.work);</div><div class='ctx'> </div><div class='del'>-	if (!ath_hw_check(sc) ||</div><div class='del'>-	    !ath_tx_complete_check(sc))</div><div class='add'>+	if (!ath_hw_check(sc) || !ath_tx_complete_check(sc) ||</div><div class='add'>+	    !ath_hw_rx_inactive_check(sc))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_queue_delayed_work(sc-&gt;hw, &amp;sc-&gt;hw_check_work,</div><div class='hunk'>@@ -303,8 +332,8 @@ fail_paprd:</div><div class='ctx'>  */</div><div class='ctx'> void ath_ani_calibrate(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ath_common *common = from_timer(common, t, ani.timer);</div><div class='del'>-	struct ath_softc *sc = (struct ath_softc *)common-&gt;priv;</div><div class='add'>+	struct ath_common *common = timer_container_of(common, t, ani.timer);</div><div class='add'>+	struct ath_softc *sc = common-&gt;priv;</div><div class='ctx'> 	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='ctx'> 	bool longcal = false;</div><div class='ctx'> 	bool shortcal = false;</div><div class='hunk'>@@ -443,7 +472,7 @@ void ath_stop_ani(struct ath_softc *sc)</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(sc-&gt;sc_ah);</div><div class='ctx'> </div><div class='ctx'> 	ath_dbg(common, ANI, "Stopping ANI\n");</div><div class='del'>-	del_timer_sync(&amp;common-&gt;ani.timer);</div><div class='add'>+	timer_delete_sync(&amp;common-&gt;ani.timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ath_check_ani(struct ath_softc *sc)</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c<br/>index 58d02c19b6d0..b070403e083f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/mac.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/mac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/mac.c</a></div><div class='hunk'>@@ -707,7 +707,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset)</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for rx enable bit to go low */</div><div class='ctx'> 	for (i = AH_RX_STOP_DMA_TIMEOUT / AH_TIME_QUANTUM; i != 0; i--) {</div><div class='del'>-		if ((REG_READ(ah, AR_CR) &amp; AR_CR_RXE) == 0)</div><div class='add'>+		if ((REG_READ(ah, AR_CR) &amp; AR_CR_RXE(ah)) == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (!AR_SREV_9300_20_OR_LATER(ah)) {</div><div class='hunk'>@@ -762,14 +762,14 @@ bool ath9k_hw_intrpend(struct ath_hw *ah)</div><div class='ctx'> 	if (AR_SREV_9100(ah))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	host_isr = REG_READ(ah, AR_INTR_ASYNC_CAUSE);</div><div class='add'>+	host_isr = REG_READ(ah, AR_INTR_ASYNC_CAUSE(ah));</div><div class='ctx'> </div><div class='ctx'> 	if (((host_isr &amp; AR_INTR_MAC_IRQ) ||</div><div class='ctx'> 	     (host_isr &amp; AR_INTR_ASYNC_MASK_MCI)) &amp;&amp;</div><div class='ctx'> 	    (host_isr != AR_INTR_SPURIOUS))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	host_isr = REG_READ(ah, AR_INTR_SYNC_CAUSE);</div><div class='add'>+	host_isr = REG_READ(ah, AR_INTR_SYNC_CAUSE(ah));</div><div class='ctx'> 	if ((host_isr &amp; AR_INTR_SYNC_DEFAULT)</div><div class='ctx'> 	    &amp;&amp; (host_isr != AR_INTR_SPURIOUS))</div><div class='ctx'> 		return true;</div><div class='hunk'>@@ -786,11 +786,11 @@ void ath9k_hw_kill_interrupts(struct ath_hw *ah)</div><div class='ctx'> 	REG_WRITE(ah, AR_IER, AR_IER_DISABLE);</div><div class='ctx'> 	(void) REG_READ(ah, AR_IER);</div><div class='ctx'> 	if (!AR_SREV_9100(ah)) {</div><div class='del'>-		REG_WRITE(ah, AR_INTR_ASYNC_ENABLE, 0);</div><div class='del'>-		(void) REG_READ(ah, AR_INTR_ASYNC_ENABLE);</div><div class='add'>+		REG_WRITE(ah, AR_INTR_ASYNC_ENABLE(ah), 0);</div><div class='add'>+		(void) REG_READ(ah, AR_INTR_ASYNC_ENABLE(ah));</div><div class='ctx'> </div><div class='del'>-		REG_WRITE(ah, AR_INTR_SYNC_ENABLE, 0);</div><div class='del'>-		(void) REG_READ(ah, AR_INTR_SYNC_ENABLE);</div><div class='add'>+		REG_WRITE(ah, AR_INTR_SYNC_ENABLE(ah), 0);</div><div class='add'>+		(void) REG_READ(ah, AR_INTR_SYNC_ENABLE(ah));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ath9k_hw_kill_interrupts);</div><div class='hunk'>@@ -824,11 +824,11 @@ static void __ath9k_hw_enable_interrupts(struct ath_hw *ah)</div><div class='ctx'> 	ath_dbg(common, INTERRUPT, "enable IER\n");</div><div class='ctx'> 	REG_WRITE(ah, AR_IER, AR_IER_ENABLE);</div><div class='ctx'> 	if (!AR_SREV_9100(ah)) {</div><div class='del'>-		REG_WRITE(ah, AR_INTR_ASYNC_ENABLE, async_mask);</div><div class='del'>-		REG_WRITE(ah, AR_INTR_ASYNC_MASK, async_mask);</div><div class='add'>+		REG_WRITE(ah, AR_INTR_ASYNC_ENABLE(ah), async_mask);</div><div class='add'>+		REG_WRITE(ah, AR_INTR_ASYNC_MASK(ah), async_mask);</div><div class='ctx'> </div><div class='del'>-		REG_WRITE(ah, AR_INTR_SYNC_ENABLE, sync_default);</div><div class='del'>-		REG_WRITE(ah, AR_INTR_SYNC_MASK, sync_default);</div><div class='add'>+		REG_WRITE(ah, AR_INTR_SYNC_ENABLE(ah), sync_default);</div><div class='add'>+		REG_WRITE(ah, AR_INTR_SYNC_MASK(ah), sync_default);</div><div class='ctx'> 	}</div><div class='ctx'> 	ath_dbg(common, INTERRUPT, "AR_IMR 0x%x IER 0x%x\n",</div><div class='ctx'> 		REG_READ(ah, AR_IMR), REG_READ(ah, AR_IER));</div><div class='hunk'>@@ -841,26 +841,26 @@ static void __ath9k_hw_enable_interrupts(struct ath_hw *ah)</div><div class='ctx'> 		ath_dbg(ath9k_hw_common(ah), INTERRUPT,</div><div class='ctx'> 			"Enabling MSI, msi_mask=0x%X\n", ah-&gt;msi_mask);</div><div class='ctx'> </div><div class='del'>-		REG_WRITE(ah, AR_INTR_PRIO_ASYNC_ENABLE, ah-&gt;msi_mask);</div><div class='del'>-		REG_WRITE(ah, AR_INTR_PRIO_ASYNC_MASK, ah-&gt;msi_mask);</div><div class='add'>+		REG_WRITE(ah, AR_INTR_PRIO_ASYNC_ENABLE(ah), ah-&gt;msi_mask);</div><div class='add'>+		REG_WRITE(ah, AR_INTR_PRIO_ASYNC_MASK(ah), ah-&gt;msi_mask);</div><div class='ctx'> 		ath_dbg(ath9k_hw_common(ah), INTERRUPT,</div><div class='ctx'> 			"AR_INTR_PRIO_ASYNC_ENABLE=0x%X, AR_INTR_PRIO_ASYNC_MASK=0x%X\n",</div><div class='del'>-			REG_READ(ah, AR_INTR_PRIO_ASYNC_ENABLE),</div><div class='del'>-			REG_READ(ah, AR_INTR_PRIO_ASYNC_MASK));</div><div class='add'>+			REG_READ(ah, AR_INTR_PRIO_ASYNC_ENABLE(ah)),</div><div class='add'>+			REG_READ(ah, AR_INTR_PRIO_ASYNC_MASK(ah)));</div><div class='ctx'> </div><div class='ctx'> 		if (ah-&gt;msi_reg == 0)</div><div class='del'>-			ah-&gt;msi_reg = REG_READ(ah, AR_PCIE_MSI);</div><div class='add'>+			ah-&gt;msi_reg = REG_READ(ah, AR_PCIE_MSI(ah));</div><div class='ctx'> </div><div class='ctx'> 		ath_dbg(ath9k_hw_common(ah), INTERRUPT,</div><div class='ctx'> 			"AR_PCIE_MSI=0x%X, ah-&gt;msi_reg = 0x%X\n",</div><div class='del'>-			AR_PCIE_MSI, ah-&gt;msi_reg);</div><div class='add'>+			AR_PCIE_MSI(ah), ah-&gt;msi_reg);</div><div class='ctx'> </div><div class='ctx'> 		i = 0;</div><div class='ctx'> 		do {</div><div class='del'>-			REG_WRITE(ah, AR_PCIE_MSI,</div><div class='add'>+			REG_WRITE(ah, AR_PCIE_MSI(ah),</div><div class='ctx'> 				  (ah-&gt;msi_reg | AR_PCIE_MSI_ENABLE)</div><div class='ctx'> 				  &amp; msi_pend_addr_mask);</div><div class='del'>-			_msi_reg = REG_READ(ah, AR_PCIE_MSI);</div><div class='add'>+			_msi_reg = REG_READ(ah, AR_PCIE_MSI(ah));</div><div class='ctx'> 			i++;</div><div class='ctx'> 		} while ((_msi_reg &amp; AR_PCIE_MSI_ENABLE) == 0 &amp;&amp; i &lt; 200);</div><div class='ctx'> </div><div class='hunk'>@@ -918,8 +918,8 @@ void ath9k_hw_set_interrupts(struct ath_hw *ah)</div><div class='ctx'> 	if (ah-&gt;msi_enabled) {</div><div class='ctx'> 		ath_dbg(common, INTERRUPT, "Clearing AR_INTR_PRIO_ASYNC_ENABLE\n");</div><div class='ctx'> </div><div class='del'>-		REG_WRITE(ah, AR_INTR_PRIO_ASYNC_ENABLE, 0);</div><div class='del'>-		REG_READ(ah, AR_INTR_PRIO_ASYNC_ENABLE);</div><div class='add'>+		REG_WRITE(ah, AR_INTR_PRIO_ASYNC_ENABLE(ah), 0);</div><div class='add'>+		REG_READ(ah, AR_INTR_PRIO_ASYNC_ENABLE(ah));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath_dbg(common, INTERRUPT, "New interrupt mask 0x%x\n", ints);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/mac.h b/drivers/net/wireless/ath/ath9k/mac.h<br/>index fd6aa49adadf..16203e7ecf29 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/mac.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/mac.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/mac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/mac.h</a></div><div class='hunk'>@@ -35,8 +35,10 @@</div><div class='ctx'> 	 |((_series)[_index].RateFlags &amp; ATH9K_RATESERIES_HALFGI ?	\</div><div class='ctx'> 	   AR_GI##_index : 0)						\</div><div class='ctx'> 	 |((_series)[_index].RateFlags &amp; ATH9K_RATESERIES_STBC ?	\</div><div class='del'>-	   AR_STBC##_index : 0)						\</div><div class='del'>-	 |SM((_series)[_index].ChSel, AR_ChainSel##_index))</div><div class='add'>+	   AR_STBC##_index : 0))</div><div class='add'>+</div><div class='add'>+#define set11nChainSel(_series, _index)					\</div><div class='add'>+	(SM((_series)[_index].ChSel, AR_ChainSel##_index))</div><div class='ctx'> </div><div class='ctx'> #define CCK_SIFS_TIME        10</div><div class='ctx'> #define CCK_PREAMBLE_BITS   144</div><div class='hunk'>@@ -113,8 +115,10 @@ struct ath_tx_status {</div><div class='ctx'> 	u8 qid;</div><div class='ctx'> 	u16 desc_id;</div><div class='ctx'> 	u8 tid;</div><div class='del'>-	u32 ba_low;</div><div class='del'>-	u32 ba_high;</div><div class='add'>+	struct_group(ba,</div><div class='add'>+		u32 ba_low;</div><div class='add'>+		u32 ba_high;</div><div class='add'>+	);</div><div class='ctx'> 	u32 evm0;</div><div class='ctx'> 	u32 evm1;</div><div class='ctx'> 	u32 evm2;</div><div class='hunk'>@@ -247,7 +251,7 @@ struct ath_desc {</div><div class='ctx'>  * when the descriptor is specifically marked to generate</div><div class='ctx'>  * an interrupt with this flag. Descriptors should be</div><div class='ctx'>  * marked periodically to insure timely replenishing of the</div><div class='del'>- * supply needed for sending frames. Defering interrupts</div><div class='add'>+ * supply needed for sending frames. Deferring interrupts</div><div class='ctx'>  * reduces system load and potentially allows more concurrent</div><div class='ctx'>  * work to be done but if done to aggressively can cause</div><div class='ctx'>  * senders to backup. When the hardware queue is left too</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c<br/>index 45f6402478b5..740a6fc7b067 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/main.c</a></div><div class='hunk'>@@ -98,7 +98,7 @@ static bool ath9k_setpower(struct ath_softc *sc, enum ath9k_power_mode mode)</div><div class='ctx'> </div><div class='ctx'> void ath_ps_full_sleep(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ath_softc *sc = from_timer(sc, t, sleep_timer);</div><div class='add'>+	struct ath_softc *sc = timer_container_of(sc, t, sleep_timer);</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(sc-&gt;sc_ah);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	bool reset;</div><div class='hunk'>@@ -123,7 +123,7 @@ void ath9k_ps_wakeup(struct ath_softc *sc)</div><div class='ctx'> 	if (++sc-&gt;ps_usecount != 1)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;sc-&gt;sleep_timer);</div><div class='add'>+	timer_delete_sync(&amp;sc-&gt;sleep_timer);</div><div class='ctx'> 	power_mode = sc-&gt;sc_ah-&gt;power_mode;</div><div class='ctx'> 	ath9k_hw_setpower(sc-&gt;sc_ah, ATH9K_PM_AWAKE);</div><div class='ctx'> </div><div class='hunk'>@@ -135,8 +135,7 @@ void ath9k_ps_wakeup(struct ath_softc *sc)</div><div class='ctx'> 	if (power_mode != ATH9K_PM_AWAKE) {</div><div class='ctx'> 		spin_lock(&amp;common-&gt;cc_lock);</div><div class='ctx'> 		ath_hw_cycle_counters_update(common);</div><div class='del'>-		memset(&amp;common-&gt;cc_survey, 0, sizeof(common-&gt;cc_survey));</div><div class='del'>-		memset(&amp;common-&gt;cc_ani, 0, sizeof(common-&gt;cc_ani));</div><div class='add'>+		memset(&amp;common-&gt;cc, 0, sizeof(common-&gt;cc));</div><div class='ctx'> 		spin_unlock(&amp;common-&gt;cc_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -203,7 +202,7 @@ void ath_cancel_work(struct ath_softc *sc)</div><div class='ctx'> void ath_restart_work(struct ath_softc *sc)</div><div class='ctx'> {</div><div class='ctx'> 	ieee80211_queue_delayed_work(sc-&gt;hw, &amp;sc-&gt;hw_check_work,</div><div class='del'>-				     ATH_HW_CHECK_POLL_INT);</div><div class='add'>+				     msecs_to_jiffies(ATH_HW_CHECK_POLL_INT));</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9340(sc-&gt;sc_ah) || AR_SREV_9330(sc-&gt;sc_ah))</div><div class='ctx'> 		ieee80211_queue_delayed_work(sc-&gt;hw, &amp;sc-&gt;hw_pll_work,</div><div class='hunk'>@@ -250,8 +249,7 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start)</div><div class='ctx'> 		if (sc-&gt;cur_chan-&gt;tsf_val) {</div><div class='ctx'> 			u32 offset;</div><div class='ctx'> </div><div class='del'>-			offset = ath9k_hw_get_tsf_offset(&amp;sc-&gt;cur_chan-&gt;tsf_ts,</div><div class='del'>-							 NULL);</div><div class='add'>+			offset = ath9k_hw_get_tsf_offset(sc-&gt;cur_chan-&gt;tsf_ts, 0);</div><div class='ctx'> 			ath9k_hw_settsf64(ah, sc-&gt;cur_chan-&gt;tsf_val + offset);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -307,6 +305,11 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan)</div><div class='ctx'> 		hchan = ah-&gt;curchan;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!hchan) {</div><div class='add'>+		fastcc = false;</div><div class='add'>+		hchan = ath9k_cmn_get_channel(sc-&gt;hw, ah, &amp;sc-&gt;cur_chan-&gt;chandef);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!ath_prepare_reset(sc))</div><div class='ctx'> 		fastcc = false;</div><div class='ctx'> </div><div class='hunk'>@@ -449,6 +452,7 @@ void ath9k_tasklet(struct tasklet_struct *t)</div><div class='ctx'> 			ath_rx_tasklet(sc, 0, true);</div><div class='ctx'> </div><div class='ctx'> 		ath_rx_tasklet(sc, 0, false);</div><div class='add'>+		sc-&gt;rx_active_count++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; ATH9K_INT_TX) {</div><div class='hunk'>@@ -528,8 +532,10 @@ irqreturn_t ath_isr(int irq, void *dev)</div><div class='ctx'> 	ath9k_debug_sync_cause(sc, sync_cause);</div><div class='ctx'> 	status &amp;= ah-&gt;imask;	/* discard unasked-for bits */</div><div class='ctx'> </div><div class='del'>-	if (test_bit(ATH_OP_HW_RESET, &amp;common-&gt;op_flags))</div><div class='add'>+	if (test_bit(ATH_OP_HW_RESET, &amp;common-&gt;op_flags)) {</div><div class='add'>+		ath9k_hw_kill_interrupts(sc-&gt;sc_ah);</div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If there are no status bits set, then this interrupt was not</div><div class='hunk'>@@ -832,7 +838,7 @@ static bool ath9k_txq_list_has_key(struct list_head *txq_list, u32 keyix)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		txinfo = IEEE80211_SKB_CB(bf-&gt;bf_mpdu);</div><div class='del'>-		fi = (struct ath_frame_info *)&amp;txinfo-&gt;rate_driver_data[0];</div><div class='add'>+		fi = (struct ath_frame_info *)&amp;txinfo-&gt;status.status_driver_data[0];</div><div class='ctx'> 		if (fi-&gt;keyix == keyix)</div><div class='ctx'> 			return true;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -843,7 +849,7 @@ static bool ath9k_txq_list_has_key(struct list_head *txq_list, u32 keyix)</div><div class='ctx'> static bool ath9k_txq_has_key(struct ath_softc *sc, u32 keyix)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='del'>-	int i;</div><div class='add'>+	int i, j;</div><div class='ctx'> 	struct ath_txq *txq;</div><div class='ctx'> 	bool key_in_use = false;</div><div class='ctx'> </div><div class='hunk'>@@ -861,8 +867,9 @@ static bool ath9k_txq_has_key(struct ath_softc *sc, u32 keyix)</div><div class='ctx'> 		if (sc-&gt;sc_ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_EDMA) {</div><div class='ctx'> 			int idx = txq-&gt;txq_tailidx;</div><div class='ctx'> </div><div class='del'>-			while (!key_in_use &amp;&amp;</div><div class='del'>-			       !list_empty(&amp;txq-&gt;txq_fifo[idx])) {</div><div class='add'>+			for (j = 0; !key_in_use &amp;&amp;</div><div class='add'>+			     !list_empty(&amp;txq-&gt;txq_fifo[idx]) &amp;&amp;</div><div class='add'>+			     j &lt; ATH_TXFIFO_DEPTH; j++) {</div><div class='ctx'> 				key_in_use = ath9k_txq_list_has_key(</div><div class='ctx'> 					&amp;txq-&gt;txq_fifo[idx], keyix);</div><div class='ctx'> 				INCR(idx, ATH_TXFIFO_DEPTH);</div><div class='hunk'>@@ -888,7 +895,7 @@ static void ath9k_pending_key_del(struct ath_softc *sc, u8 keyix)</div><div class='ctx'> 	ath_key_delete(common, keyix);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath9k_stop(struct ieee80211_hw *hw)</div><div class='add'>+static void ath9k_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='ctx'> 	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='hunk'>@@ -994,7 +1001,7 @@ static bool ath9k_uses_beacons(int type)</div><div class='ctx'> static void ath9k_vif_iter_set_beacon(struct ath9k_vif_iter_data *iter_data,</div><div class='ctx'> 				      struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	/* Use the first (configured) interface, but prefering AP interfaces. */</div><div class='add'>+	/* Use the first (configured) interface, but preferring AP interfaces. */</div><div class='ctx'> 	if (!iter_data-&gt;primary_beacon_vif) {</div><div class='ctx'> 		iter_data-&gt;primary_beacon_vif = vif;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1477,7 +1484,7 @@ static void ath9k_disable_ps(struct ath_softc *sc)</div><div class='ctx'> 	ath_dbg(common, PS, "PowerSave disabled\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath9k_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+static int ath9k_config(struct ieee80211_hw *hw, int radio_idx, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='ctx'> 	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='hunk'>@@ -1563,7 +1570,6 @@ static void ath9k_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct ath_chanctx *ctx;</div><div class='ctx'> 	u32 rfilt;</div><div class='ctx'> </div><div class='del'>-	changed_flags &amp;= SUPPORTED_FILTERS;</div><div class='ctx'> 	*total_flags &amp;= SUPPORTED_FILTERS;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;sc-&gt;chan_lock);</div><div class='hunk'>@@ -1705,7 +1711,8 @@ static void ath9k_sta_notify(struct ieee80211_hw *hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath9k_conf_tx(struct ieee80211_hw *hw,</div><div class='del'>-			 struct ieee80211_vif *vif, u16 queue,</div><div class='add'>+			 struct ieee80211_vif *vif,</div><div class='add'>+			 unsigned int link_id, u16 queue,</div><div class='ctx'> 			 const struct ieee80211_tx_queue_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='hunk'>@@ -1856,7 +1863,7 @@ static int ath9k_set_key(struct ieee80211_hw *hw,</div><div class='ctx'> static void ath9k_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 				   struct ieee80211_vif *vif,</div><div class='ctx'> 				   struct ieee80211_bss_conf *bss_conf,</div><div class='del'>-				   u32 changed)</div><div class='add'>+				   u64 changed)</div><div class='ctx'> {</div><div class='ctx'> #define CHECK_ANI				\</div><div class='ctx'> 	(BSS_CHANGED_ASSOC |			\</div><div class='hunk'>@@ -1874,11 +1881,11 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_ASSOC) {</div><div class='ctx'> 		ath_dbg(common, CONFIG, "BSSID %pM Changed ASSOC %d\n",</div><div class='del'>-			bss_conf-&gt;bssid, bss_conf-&gt;assoc);</div><div class='add'>+			bss_conf-&gt;bssid, vif-&gt;cfg.assoc);</div><div class='ctx'> </div><div class='ctx'> 		memcpy(avp-&gt;bssid, bss_conf-&gt;bssid, ETH_ALEN);</div><div class='del'>-		avp-&gt;aid = bss_conf-&gt;aid;</div><div class='del'>-		avp-&gt;assoc = bss_conf-&gt;assoc;</div><div class='add'>+		avp-&gt;aid = vif-&gt;cfg.aid;</div><div class='add'>+		avp-&gt;assoc = vif-&gt;cfg.assoc;</div><div class='ctx'> </div><div class='ctx'> 		ath9k_calculate_summary_state(sc, avp-&gt;chanctx);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1886,7 +1893,7 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	if ((changed &amp; BSS_CHANGED_IBSS) ||</div><div class='ctx'> 	      (changed &amp; BSS_CHANGED_OCB)) {</div><div class='ctx'> 		memcpy(common-&gt;curbssid, bss_conf-&gt;bssid, ETH_ALEN);</div><div class='del'>-		common-&gt;curaid = bss_conf-&gt;aid;</div><div class='add'>+		common-&gt;curaid = vif-&gt;cfg.aid;</div><div class='ctx'> 		ath9k_hw_write_associd(sc-&gt;sc_ah);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1948,7 +1955,7 @@ static u64 ath9k_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> 		tsf = ath9k_hw_gettsf64(sc-&gt;sc_ah);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		tsf = sc-&gt;cur_chan-&gt;tsf_val +</div><div class='del'>-		      ath9k_hw_get_tsf_offset(&amp;sc-&gt;cur_chan-&gt;tsf_ts, NULL);</div><div class='add'>+		      ath9k_hw_get_tsf_offset(sc-&gt;cur_chan-&gt;tsf_ts, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	tsf += le64_to_cpu(avp-&gt;tsf_adjust);</div><div class='ctx'> 	ath9k_ps_restore(sc);</div><div class='hunk'>@@ -1967,7 +1974,7 @@ static void ath9k_set_tsf(struct ieee80211_hw *hw,</div><div class='ctx'> 	mutex_lock(&amp;sc-&gt;mutex);</div><div class='ctx'> 	ath9k_ps_wakeup(sc);</div><div class='ctx'> 	tsf -= le64_to_cpu(avp-&gt;tsf_adjust);</div><div class='del'>-	ktime_get_raw_ts64(&amp;avp-&gt;chanctx-&gt;tsf_ts);</div><div class='add'>+	avp-&gt;chanctx-&gt;tsf_ts = ktime_get_raw();</div><div class='ctx'> 	if (sc-&gt;cur_chan == avp-&gt;chanctx)</div><div class='ctx'> 		ath9k_hw_settsf64(sc-&gt;sc_ah, tsf);</div><div class='ctx'> 	avp-&gt;chanctx-&gt;tsf_val = tsf;</div><div class='hunk'>@@ -1983,7 +1990,7 @@ static void ath9k_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> 	mutex_lock(&amp;sc-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	ath9k_ps_wakeup(sc);</div><div class='del'>-	ktime_get_raw_ts64(&amp;avp-&gt;chanctx-&gt;tsf_ts);</div><div class='add'>+	avp-&gt;chanctx-&gt;tsf_ts = ktime_get_raw();</div><div class='ctx'> 	if (sc-&gt;cur_chan == avp-&gt;chanctx)</div><div class='ctx'> 		ath9k_hw_reset_tsf(sc-&gt;sc_ah);</div><div class='ctx'> 	avp-&gt;chanctx-&gt;tsf_val = 0;</div><div class='hunk'>@@ -2041,7 +2048,7 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw,</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_OPERATIONAL:</div><div class='ctx'> 		atid = ath_node_to_tid(an, tid);</div><div class='ctx'> 		atid-&gt;baw_size = IEEE80211_MIN_AMPDU_BUF &lt;&lt;</div><div class='del'>-			        sta-&gt;ht_cap.ampdu_factor;</div><div class='add'>+					sta-&gt;deflink.ht_cap.ampdu_factor;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ath_err(ath9k_hw_common(sc-&gt;sc_ah), "Unknown AMPDU action\n");</div><div class='hunk'>@@ -2107,6 +2114,7 @@ static void ath9k_enable_dynack(struct ath_softc *sc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath9k_set_coverage_class(struct ieee80211_hw *hw,</div><div class='add'>+				     int radio_idx,</div><div class='ctx'> 				     s16 coverage_class)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='hunk'>@@ -2231,7 +2239,7 @@ void __ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_queue_delayed_work(hw, &amp;sc-&gt;hw_check_work,</div><div class='del'>-				     ATH_HW_CHECK_POLL_INT);</div><div class='add'>+				     msecs_to_jiffies(ATH_HW_CHECK_POLL_INT));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool ath9k_tx_frames_pending(struct ieee80211_hw *hw)</div><div class='hunk'>@@ -2331,7 +2339,8 @@ static bool validate_antenna_mask(struct ath_hw *ah, u32 val)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath9k_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)</div><div class='add'>+static int ath9k_set_antenna(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+			     u32 tx_ant, u32 rx_ant)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='ctx'> 	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='hunk'>@@ -2360,7 +2369,8 @@ static int ath9k_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath9k_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant)</div><div class='add'>+static int ath9k_get_antenna(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+			     u32 *tx_ant, u32 *rx_ant)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -2375,7 +2385,22 @@ static void ath9k_sw_scan_start(struct ieee80211_hw *hw,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(sc-&gt;sc_ah);</div><div class='add'>+	struct cfg80211_chan_def *chandef = &amp;sc-&gt;cur_chan-&gt;chandef;</div><div class='add'>+	struct ieee80211_channel *chan = chandef-&gt;chan;</div><div class='add'>+	int pos = chan-&gt;hw_value;</div><div class='ctx'> 	set_bit(ATH_OP_SCANNING, &amp;common-&gt;op_flags);</div><div class='add'>+</div><div class='add'>+	/* Reset current survey */</div><div class='add'>+	if (!sc-&gt;cur_chan-&gt;offchannel) {</div><div class='add'>+		if (sc-&gt;cur_survey != &amp;sc-&gt;survey[pos]) {</div><div class='add'>+			if (sc-&gt;cur_survey)</div><div class='add'>+				sc-&gt;cur_survey-&gt;filled &amp;= ~SURVEY_INFO_IN_USE;</div><div class='add'>+			sc-&gt;cur_survey = &amp;sc-&gt;survey[pos];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memset(sc-&gt;cur_survey, 0, sizeof(struct survey_info));</div><div class='add'>+		sc-&gt;cur_survey-&gt;filled |= SURVEY_INFO_IN_USE;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath9k_sw_scan_complete(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -2396,7 +2421,7 @@ static void ath9k_cancel_pending_offchannel(struct ath_softc *sc)</div><div class='ctx'> 		ath_dbg(common, CHAN_CTX,</div><div class='ctx'> 			"%s: Aborting RoC\n", __func__);</div><div class='ctx'> </div><div class='del'>-		del_timer_sync(&amp;sc-&gt;offchannel.timer);</div><div class='add'>+		timer_delete_sync(&amp;sc-&gt;offchannel.timer);</div><div class='ctx'> 		if (sc-&gt;offchannel.state &gt;= ATH_OFFCHANNEL_ROC_START)</div><div class='ctx'> 			ath_roc_complete(sc, ATH_ROC_COMPLETE_ABORT);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2405,7 +2430,7 @@ static void ath9k_cancel_pending_offchannel(struct ath_softc *sc)</div><div class='ctx'> 		ath_dbg(common, CHAN_CTX,</div><div class='ctx'> 			"%s: Aborting HW scan\n", __func__);</div><div class='ctx'> </div><div class='del'>-		del_timer_sync(&amp;sc-&gt;offchannel.timer);</div><div class='add'>+		timer_delete_sync(&amp;sc-&gt;offchannel.timer);</div><div class='ctx'> 		ath_scan_complete(sc, true);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -2454,7 +2479,7 @@ static void ath9k_cancel_hw_scan(struct ieee80211_hw *hw,</div><div class='ctx'> 	ath_dbg(common, CHAN_CTX, "Cancel HW scan on vif: %pM\n", vif-&gt;addr);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;sc-&gt;mutex);</div><div class='del'>-	del_timer_sync(&amp;sc-&gt;offchannel.timer);</div><div class='add'>+	timer_delete_sync(&amp;sc-&gt;offchannel.timer);</div><div class='ctx'> 	ath_scan_complete(sc, true);</div><div class='ctx'> 	mutex_unlock(&amp;sc-&gt;mutex);</div><div class='ctx'> }</div><div class='hunk'>@@ -2504,7 +2529,7 @@ static int ath9k_cancel_remain_on_channel(struct ieee80211_hw *hw,</div><div class='ctx'> 	mutex_lock(&amp;sc-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	ath_dbg(common, CHAN_CTX, "Cancel RoC\n");</div><div class='del'>-	del_timer_sync(&amp;sc-&gt;offchannel.timer);</div><div class='add'>+	timer_delete_sync(&amp;sc-&gt;offchannel.timer);</div><div class='ctx'> </div><div class='ctx'> 	if (sc-&gt;offchannel.roc_vif) {</div><div class='ctx'> 		if (sc-&gt;offchannel.state &gt;= ATH_OFFCHANNEL_ROC_START)</div><div class='hunk'>@@ -2589,6 +2614,7 @@ static void ath9k_change_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> static int ath9k_assign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> 				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct ieee80211_bss_conf *link_conf,</div><div class='ctx'> 				    struct ieee80211_chanctx_conf *conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='hunk'>@@ -2620,6 +2646,7 @@ static int ath9k_assign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> static void ath9k_unassign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> 				       struct ieee80211_vif *vif,</div><div class='add'>+				       struct ieee80211_bss_conf *link_conf,</div><div class='ctx'> 				       struct ieee80211_chanctx_conf *conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='hunk'>@@ -2649,7 +2676,7 @@ static void ath9k_unassign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> static void ath9k_mgd_prepare_tx(struct ieee80211_hw *hw,</div><div class='ctx'> 				 struct ieee80211_vif *vif,</div><div class='del'>-				 u16 duration)</div><div class='add'>+				 struct ieee80211_prep_tx_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(sc-&gt;sc_ah);</div><div class='hunk'>@@ -2743,7 +2770,7 @@ void ath9k_fill_chanctx_ops(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int ath9k_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-			     int *dbm)</div><div class='add'>+			     unsigned int link_id, int *dbm)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='ctx'> 	struct ath_vif *avp = (void *)vif-&gt;drv_priv;</div><div class='hunk'>@@ -2761,6 +2788,10 @@ static int ath9k_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct ieee80211_ops ath9k_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.tx 		    = ath9k_tx,</div><div class='ctx'> 	.start 		    = ath9k_start,</div><div class='ctx'> 	.stop 		    = ath9k_stop,</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/mci.c b/drivers/net/wireless/ath/ath9k/mci.c<br/>index 39d46c203f6b..a0845002d6fe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/mci.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/mci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/mci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/mci.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@ static bool ath_mci_add_profile(struct ath_common *common,</div><div class='ctx'> 				struct ath_mci_profile_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_mci_profile_info *entry;</div><div class='del'>-	u8 voice_priority[] = { 110, 110, 110, 112, 110, 110, 114, 116, 118 };</div><div class='add'>+	static const u8 voice_priority[] = { 110, 110, 110, 112, 110, 110, 114, 116, 118 };</div><div class='ctx'> </div><div class='ctx'> 	if ((mci-&gt;num_sco == ATH_MCI_MAX_SCO_PROFILE) &amp;&amp;</div><div class='ctx'> 	    (info-&gt;type == MCI_GPM_COEX_PROFILE_VOICE))</div><div class='hunk'>@@ -266,7 +266,9 @@ static void ath_mci_set_concur_txprio(struct ath_softc *sc)</div><div class='ctx'> 			stomp_txprio[ATH_BTCOEX_STOMP_NONE] =</div><div class='ctx'> 				ATH_MCI_INQUIRY_PRIO;</div><div class='ctx'> 	} else {</div><div class='del'>-		u8 prof_prio[] = { 50, 90, 94, 52 };/* RFCOMM, A2DP, HID, PAN */</div><div class='add'>+		static const u8 prof_prio[] = {</div><div class='add'>+			50, 90, 94, 52</div><div class='add'>+		}; /* RFCOMM, A2DP, HID, PAN */</div><div class='ctx'> </div><div class='ctx'> 		stomp_txprio[ATH_BTCOEX_STOMP_LOW] =</div><div class='ctx'> 		stomp_txprio[ATH_BTCOEX_STOMP_NONE] = 0xff;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c<br/>index cff9af3af38d..27d4034c814e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/pci.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/pci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/pci.c</a></div><div class='hunk'>@@ -21,8 +21,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include "ath9k.h"</div><div class='ctx'> </div><div class='del'>-extern int ath9k_use_msi;</div><div class='del'>-</div><div class='ctx'> static const struct pci_device_id ath_pci_id_table[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(ATHEROS, 0x0023) }, /* PCI   */</div><div class='ctx'> 	{ PCI_VDEVICE(ATHEROS, 0x0024) }, /* PCI-E */</div><div class='hunk'>@@ -781,7 +779,7 @@ static const struct pci_device_id ath_pci_id_table[] = {</div><div class='ctx'> /* return bus cachesize in 4B word units */</div><div class='ctx'> static void ath_pci_read_cachesize(struct ath_common *common, int *csz)</div><div class='ctx'> {</div><div class='del'>-	struct ath_softc *sc = (struct ath_softc *) common-&gt;priv;</div><div class='add'>+	struct ath_softc *sc = common-&gt;priv;</div><div class='ctx'> 	u8 u8tmp;</div><div class='ctx'> </div><div class='ctx'> 	pci_read_config_byte(to_pci_dev(sc-&gt;dev), PCI_CACHE_LINE_SIZE, &amp;u8tmp);</div><div class='hunk'>@@ -799,19 +797,19 @@ static void ath_pci_read_cachesize(struct ath_common *common, int *csz)</div><div class='ctx'> </div><div class='ctx'> static bool ath_pci_eeprom_read(struct ath_common *common, u32 off, u16 *data)</div><div class='ctx'> {</div><div class='del'>-	struct ath_hw *ah = (struct ath_hw *) common-&gt;ah;</div><div class='add'>+	struct ath_hw *ah = common-&gt;ah;</div><div class='ctx'> </div><div class='ctx'> 	common-&gt;ops-&gt;read(ah, AR5416_EEPROM_OFFSET + (off &lt;&lt; AR5416_EEPROM_S));</div><div class='ctx'> </div><div class='ctx'> 	if (!ath9k_hw_wait(ah,</div><div class='del'>-				AR_EEPROM_STATUS_DATA,</div><div class='add'>+				AR_EEPROM_STATUS_DATA(ah),</div><div class='ctx'> 				AR_EEPROM_STATUS_DATA_BUSY |</div><div class='ctx'> 				AR_EEPROM_STATUS_DATA_PROT_ACCESS, 0,</div><div class='ctx'> 				AH_WAIT_TIMEOUT)) {</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*data = MS(common-&gt;ops-&gt;read(ah, AR_EEPROM_STATUS_DATA),</div><div class='add'>+	*data = MS(common-&gt;ops-&gt;read(ah, AR_EEPROM_STATUS_DATA(ah)),</div><div class='ctx'> 			AR_EEPROM_STATUS_DATA_VAL);</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -820,7 +818,7 @@ static bool ath_pci_eeprom_read(struct ath_common *common, u32 off, u16 *data)</div><div class='ctx'> /* Need to be called after we discover btcoex capabilities */</div><div class='ctx'> static void ath_pci_aspm_init(struct ath_common *common)</div><div class='ctx'> {</div><div class='del'>-	struct ath_softc *sc = (struct ath_softc *) common-&gt;priv;</div><div class='add'>+	struct ath_softc *sc = common-&gt;priv;</div><div class='ctx'> 	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='ctx'> 	struct pci_dev *pdev = to_pci_dev(sc-&gt;dev);</div><div class='ctx'> 	struct pci_dev *parent;</div><div class='hunk'>@@ -896,18 +894,12 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	if (pcim_enable_device(pdev))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	ret =  pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='add'>+	ret = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_err("32-bit DMA not available\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_err("32-bit DMA consistent DMA enable failed\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Cache line size is used to size and align various</div><div class='ctx'> 	 * structures used to communicate with the hardware.</div><div class='hunk'>@@ -994,8 +986,8 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	sc-&gt;sc_ah-&gt;msi_reg = 0;</div><div class='ctx'> </div><div class='ctx'> 	ath9k_hw_name(sc-&gt;sc_ah, hw_name, sizeof(hw_name));</div><div class='del'>-	wiphy_info(hw-&gt;wiphy, "%s mem=0x%lx, irq=%d\n",</div><div class='del'>-		   hw_name, (unsigned long)sc-&gt;mem, pdev-&gt;irq);</div><div class='add'>+	wiphy_info(hw-&gt;wiphy, "%s mem=0x%p, irq=%d\n",</div><div class='add'>+		   hw_name, sc-&gt;mem, pdev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1037,7 +1029,7 @@ static int ath_pci_suspend(struct device *device)</div><div class='ctx'> 	 */</div><div class='ctx'> 	ath9k_stop_btcoex(sc);</div><div class='ctx'> 	ath9k_hw_disable(sc-&gt;sc_ah);</div><div class='del'>-	del_timer_sync(&amp;sc-&gt;sleep_timer);</div><div class='add'>+	timer_delete_sync(&amp;sc-&gt;sleep_timer);</div><div class='ctx'> 	ath9k_hw_setpower(sc-&gt;sc_ah, ATH9K_PM_FULL_SLEEP);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c<br/>index 0c0624a3b40d..34c74ed99b7b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/recv.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/recv.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/recv.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/recv.c</a></div><div class='hunk'>@@ -1042,8 +1042,8 @@ static void ath_rx_count_airtime(struct ath_softc *sc,</div><div class='ctx'> 	if (!!(rxs-&gt;encoding == RX_ENC_HT)) {</div><div class='ctx'> 		/* MCS rates */</div><div class='ctx'> </div><div class='del'>-		airtime += ath_pkt_duration(sc, rxs-&gt;rate_idx, len,</div><div class='del'>-					is_40, is_sgi, is_sp);</div><div class='add'>+		airtime += ath_pkt_duration(rxs-&gt;rate_idx, len,</div><div class='add'>+					    is_40, is_sgi, is_sp);</div><div class='ctx'> 	} else {</div><div class='ctx'> </div><div class='ctx'> 		phy = IS_CCK_RATE(rs-&gt;rs_rate) ? WLAN_RC_PHY_CCK : WLAN_RC_PHY_OFDM;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h<br/>index 653e79611830..9f5b8a538071 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/reg.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/reg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/reg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/reg.h</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include "../reg.h"</div><div class='ctx'> </div><div class='ctx'> #define AR_CR                0x0008</div><div class='del'>-#define AR_CR_RXE            (AR_SREV_9300_20_OR_LATER(ah) ? 0x0000000c : 0x00000004)</div><div class='add'>+#define AR_CR_RXE(_ah)       (AR_SREV_9300_20_OR_LATER(_ah) ? 0x0000000c : 0x00000004)</div><div class='ctx'> #define AR_CR_RXD            0x00000020</div><div class='ctx'> #define AR_CR_SWI            0x00000040</div><div class='ctx'> </div><div class='hunk'>@@ -352,10 +352,10 @@</div><div class='ctx'> #define AR_ISR_S1_QCU_TXEOL    0x03FF0000</div><div class='ctx'> #define AR_ISR_S1_QCU_TXEOL_S  16</div><div class='ctx'> </div><div class='del'>-#define AR_ISR_S2_S           (AR_SREV_9300_20_OR_LATER(ah) ? 0x00d0 : 0x00cc)</div><div class='del'>-#define AR_ISR_S3_S           (AR_SREV_9300_20_OR_LATER(ah) ? 0x00d4 : 0x00d0)</div><div class='del'>-#define AR_ISR_S4_S           (AR_SREV_9300_20_OR_LATER(ah) ? 0x00d8 : 0x00d4)</div><div class='del'>-#define AR_ISR_S5_S           (AR_SREV_9300_20_OR_LATER(ah) ? 0x00dc : 0x00d8)</div><div class='add'>+#define AR_ISR_S2_S(_ah)      (AR_SREV_9300_20_OR_LATER(_ah) ? 0x00d0 : 0x00cc)</div><div class='add'>+#define AR_ISR_S3_S(_ah)      (AR_SREV_9300_20_OR_LATER(_ah) ? 0x00d4 : 0x00d0)</div><div class='add'>+#define AR_ISR_S4_S(_ah)      (AR_SREV_9300_20_OR_LATER(_ah) ? 0x00d8 : 0x00d4)</div><div class='add'>+#define AR_ISR_S5_S(_ah)      (AR_SREV_9300_20_OR_LATER(_ah) ? 0x00dc : 0x00d8)</div><div class='ctx'> #define AR_DMADBG_0           0x00e0</div><div class='ctx'> #define AR_DMADBG_1           0x00e4</div><div class='ctx'> #define AR_DMADBG_2           0x00e8</div><div class='hunk'>@@ -699,7 +699,7 @@</div><div class='ctx'> #define AR_RC_APB            0x00000002</div><div class='ctx'> #define AR_RC_HOSTIF         0x00000100</div><div class='ctx'> </div><div class='del'>-#define AR_WA			(AR_SREV_9340(ah) ? 0x40c4 : 0x4004)</div><div class='add'>+#define AR_WA(_ah)			(AR_SREV_9340(_ah) ? 0x40c4 : 0x4004)</div><div class='ctx'> #define AR_WA_BIT6			(1 &lt;&lt; 6)</div><div class='ctx'> #define AR_WA_BIT7			(1 &lt;&lt; 7)</div><div class='ctx'> #define AR_WA_BIT23			(1 &lt;&lt; 23)</div><div class='hunk'>@@ -721,7 +721,7 @@</div><div class='ctx'> #define AR_PM_STATE                 0x4008</div><div class='ctx'> #define AR_PM_STATE_PME_D3COLD_VAUX 0x00100000</div><div class='ctx'> </div><div class='del'>-#define AR_HOST_TIMEOUT             (AR_SREV_9340(ah) ? 0x4008 : 0x4018)</div><div class='add'>+#define AR_HOST_TIMEOUT(_ah)        (AR_SREV_9340(_ah) ? 0x4008 : 0x4018)</div><div class='ctx'> #define AR_HOST_TIMEOUT_APB_CNTR    0x0000FFFF</div><div class='ctx'> #define AR_HOST_TIMEOUT_APB_CNTR_S  0</div><div class='ctx'> #define AR_HOST_TIMEOUT_LCL_CNTR    0xFFFF0000</div><div class='hunk'>@@ -750,12 +750,12 @@</div><div class='ctx'> #define EEPROM_PROTECT_RP_1024_2047   0x4000</div><div class='ctx'> #define EEPROM_PROTECT_WP_1024_2047   0x8000</div><div class='ctx'> </div><div class='del'>-#define AR_SREV \</div><div class='del'>-	((AR_SREV_9100(ah)) ? 0x0600 : (AR_SREV_9340(ah) \</div><div class='add'>+#define AR_SREV(_ah) \</div><div class='add'>+	((AR_SREV_9100(_ah)) ? 0x0600 : (AR_SREV_9340(_ah) \</div><div class='ctx'> 					? 0x400c : 0x4020))</div><div class='ctx'> </div><div class='del'>-#define AR_SREV_ID \</div><div class='del'>-	((AR_SREV_9100(ah)) ? 0x00000FFF : 0x000000FF)</div><div class='add'>+#define AR_SREV_ID(_ah) \</div><div class='add'>+	((AR_SREV_9100(_ah)) ? 0x00000FFF : 0x000000FF)</div><div class='ctx'> #define AR_SREV_VERSION                       0x000000F0</div><div class='ctx'> #define AR_SREV_VERSION_S                     4</div><div class='ctx'> #define AR_SREV_REVISION                      0x00000007</div><div class='hunk'>@@ -834,8 +834,8 @@</div><div class='ctx'> 	 ((_ah)-&gt;hw_version.macRev &gt;= AR_SREV_REVISION_5416_22)) || \</div><div class='ctx'> 	 ((_ah)-&gt;hw_version.macVersion &gt;= AR_SREV_VERSION_9100))</div><div class='ctx'> </div><div class='del'>-#define AR_SREV_9100(ah) \</div><div class='del'>-	((ah-&gt;hw_version.macVersion) == AR_SREV_VERSION_9100)</div><div class='add'>+#define AR_SREV_9100(_ah) \</div><div class='add'>+	(((_ah)-&gt;hw_version.macVersion == AR_SREV_VERSION_9100))</div><div class='ctx'> #define AR_SREV_9100_OR_LATER(_ah) \</div><div class='ctx'> 	(((_ah)-&gt;hw_version.macVersion &gt;= AR_SREV_VERSION_9100))</div><div class='ctx'> </div><div class='hunk'>@@ -891,7 +891,7 @@</div><div class='ctx'> #define AR_SREV_9300_20_OR_LATER(_ah) \</div><div class='ctx'> 	((_ah)-&gt;hw_version.macVersion &gt;= AR_SREV_VERSION_9300)</div><div class='ctx'> #define AR_SREV_9300_22(_ah) \</div><div class='del'>-	(AR_SREV_9300(ah) &amp;&amp; \</div><div class='add'>+	(AR_SREV_9300((_ah)) &amp;&amp; \</div><div class='ctx'> 	 ((_ah)-&gt;hw_version.macRev == AR_SREV_REVISION_9300_22))</div><div class='ctx'> </div><div class='ctx'> #define AR_SREV_9330(_ah) \</div><div class='hunk'>@@ -994,8 +994,8 @@</div><div class='ctx'> 	(((_ah)-&gt;hw_version.macVersion == AR_SREV_VERSION_9561))</div><div class='ctx'> </div><div class='ctx'> #define AR_SREV_SOC(_ah) \</div><div class='del'>-	(AR_SREV_9340(_ah) || AR_SREV_9531(_ah) || AR_SREV_9550(ah) || \</div><div class='del'>-	 AR_SREV_9561(ah))</div><div class='add'>+	(AR_SREV_9340(_ah) || AR_SREV_9531(_ah) || AR_SREV_9550(_ah) || \</div><div class='add'>+	 AR_SREV_9561(_ah))</div><div class='ctx'> </div><div class='ctx'> /* NOTE: When adding chips newer than Peacock, add chip check here */</div><div class='ctx'> #define AR_SREV_9580_10_OR_LATER(_ah) \</div><div class='hunk'>@@ -1038,11 +1038,11 @@ enum ath_usb_dev {</div><div class='ctx'> #define AR_INTR_SPURIOUS                      0xFFFFFFFF</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define AR_INTR_SYNC_CAUSE                    (AR_SREV_9340(ah) ? 0x4010 : 0x4028)</div><div class='del'>-#define AR_INTR_SYNC_CAUSE_CLR                (AR_SREV_9340(ah) ? 0x4010 : 0x4028)</div><div class='add'>+#define AR_INTR_SYNC_CAUSE(_ah)               (AR_SREV_9340(_ah) ? 0x4010 : 0x4028)</div><div class='add'>+#define AR_INTR_SYNC_CAUSE_CLR(_ah)           (AR_SREV_9340(_ah) ? 0x4010 : 0x4028)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define AR_INTR_SYNC_ENABLE                   (AR_SREV_9340(ah) ? 0x4014 : 0x402c)</div><div class='add'>+#define AR_INTR_SYNC_ENABLE(_ah)              (AR_SREV_9340(_ah) ? 0x4014 : 0x402c)</div><div class='ctx'> #define AR_INTR_SYNC_ENABLE_GPIO              0xFFFC0000</div><div class='ctx'> #define AR_INTR_SYNC_ENABLE_GPIO_S            18</div><div class='ctx'> </div><div class='hunk'>@@ -1084,18 +1084,18 @@ enum {</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define AR_INTR_ASYNC_MASK                       (AR_SREV_9340(ah) ? 0x4018 : 0x4030)</div><div class='add'>+#define AR_INTR_ASYNC_MASK(_ah)                  (AR_SREV_9340(_ah) ? 0x4018 : 0x4030)</div><div class='ctx'> #define AR_INTR_ASYNC_MASK_GPIO                  0xFFFC0000</div><div class='ctx'> #define AR_INTR_ASYNC_MASK_GPIO_S                18</div><div class='ctx'> #define AR_INTR_ASYNC_MASK_MCI                   0x00000080</div><div class='ctx'> #define AR_INTR_ASYNC_MASK_MCI_S                 7</div><div class='ctx'> </div><div class='del'>-#define AR_INTR_SYNC_MASK                        (AR_SREV_9340(ah) ? 0x401c : 0x4034)</div><div class='add'>+#define AR_INTR_SYNC_MASK(_ah)                   (AR_SREV_9340(_ah) ? 0x401c : 0x4034)</div><div class='ctx'> #define AR_INTR_SYNC_MASK_GPIO                   0xFFFC0000</div><div class='ctx'> #define AR_INTR_SYNC_MASK_GPIO_S                 18</div><div class='ctx'> </div><div class='del'>-#define AR_INTR_ASYNC_CAUSE_CLR                  (AR_SREV_9340(ah) ? 0x4020 : 0x4038)</div><div class='del'>-#define AR_INTR_ASYNC_CAUSE                      (AR_SREV_9340(ah) ? 0x4020 : 0x4038)</div><div class='add'>+#define AR_INTR_ASYNC_CAUSE_CLR(_ah)             (AR_SREV_9340(_ah) ? 0x4020 : 0x4038)</div><div class='add'>+#define AR_INTR_ASYNC_CAUSE(_ah)                 (AR_SREV_9340(_ah) ? 0x4020 : 0x4038)</div><div class='ctx'> #define AR_INTR_ASYNC_CAUSE_MCI			 0x00000080</div><div class='ctx'> #define AR_INTR_ASYNC_USED			 (AR_INTR_MAC_IRQ | \</div><div class='ctx'> 						  AR_INTR_ASYNC_CAUSE_MCI)</div><div class='hunk'>@@ -1105,13 +1105,13 @@ enum {</div><div class='ctx'> #define AR_INTR_ASYNC_ENABLE_MCI_S       7</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define AR_INTR_ASYNC_ENABLE                     (AR_SREV_9340(ah) ? 0x4024 : 0x403c)</div><div class='add'>+#define AR_INTR_ASYNC_ENABLE(_ah)                (AR_SREV_9340(_ah) ? 0x4024 : 0x403c)</div><div class='ctx'> #define AR_INTR_ASYNC_ENABLE_GPIO                0xFFFC0000</div><div class='ctx'> #define AR_INTR_ASYNC_ENABLE_GPIO_S              18</div><div class='ctx'> </div><div class='ctx'> #define AR_PCIE_SERDES                           0x4040</div><div class='ctx'> #define AR_PCIE_SERDES2                          0x4044</div><div class='del'>-#define AR_PCIE_PM_CTRL                          (AR_SREV_9340(ah) ? 0x4004 : 0x4014)</div><div class='add'>+#define AR_PCIE_PM_CTRL(_ah)                     (AR_SREV_9340(_ah) ? 0x4004 : 0x4014)</div><div class='ctx'> #define AR_PCIE_PM_CTRL_ENA                      0x00080000</div><div class='ctx'> </div><div class='ctx'> #define AR_PCIE_PHY_REG3			 0x18c08</div><div class='hunk'>@@ -1156,7 +1156,7 @@ enum {</div><div class='ctx'> #define AR9580_GPIO_MASK			 0x0000F4FF</div><div class='ctx'> #define AR7010_GPIO_MASK			 0x0000FFFF</div><div class='ctx'> </div><div class='del'>-#define AR_GPIO_IN_OUT                           (AR_SREV_9340(ah) ? 0x4028 : 0x4048)</div><div class='add'>+#define AR_GPIO_IN_OUT(_ah)                      (AR_SREV_9340(_ah) ? 0x4028 : 0x4048)</div><div class='ctx'> #define AR_GPIO_IN_VAL                           0x0FFFC000</div><div class='ctx'> #define AR_GPIO_IN_VAL_S                         14</div><div class='ctx'> #define AR928X_GPIO_IN_VAL                       0x000FFC00</div><div class='hunk'>@@ -1170,12 +1170,12 @@ enum {</div><div class='ctx'> #define AR7010_GPIO_IN_VAL                       0x0000FFFF</div><div class='ctx'> #define AR7010_GPIO_IN_VAL_S                     0</div><div class='ctx'> </div><div class='del'>-#define AR_GPIO_IN				 (AR_SREV_9340(ah) ? 0x402c : 0x404c)</div><div class='add'>+#define AR_GPIO_IN(_ah)				 (AR_SREV_9340(_ah) ? 0x402c : 0x404c)</div><div class='ctx'> #define AR9300_GPIO_IN_VAL                       0x0001FFFF</div><div class='ctx'> #define AR9300_GPIO_IN_VAL_S                     0</div><div class='ctx'> </div><div class='del'>-#define AR_GPIO_OE_OUT                           (AR_SREV_9340(ah) ? 0x4030 : \</div><div class='del'>-						  (AR_SREV_9300_20_OR_LATER(ah) ? 0x4050 : 0x404c))</div><div class='add'>+#define AR_GPIO_OE_OUT(_ah)                      (AR_SREV_9340(_ah) ? 0x4030 : \</div><div class='add'>+						  (AR_SREV_9300_20_OR_LATER(_ah) ? 0x4050 : 0x404c))</div><div class='ctx'> #define AR_GPIO_OE_OUT_DRV                       0x3</div><div class='ctx'> #define AR_GPIO_OE_OUT_DRV_NO                    0x0</div><div class='ctx'> #define AR_GPIO_OE_OUT_DRV_LOW                   0x1</div><div class='hunk'>@@ -1197,13 +1197,13 @@ enum {</div><div class='ctx'> #define AR7010_GPIO_INT_MASK                     0x52024</div><div class='ctx'> #define AR7010_GPIO_FUNCTION                     0x52028</div><div class='ctx'> </div><div class='del'>-#define AR_GPIO_INTR_POL                         (AR_SREV_9340(ah) ? 0x4038 : \</div><div class='del'>-						  (AR_SREV_9300_20_OR_LATER(ah) ? 0x4058 : 0x4050))</div><div class='add'>+#define AR_GPIO_INTR_POL(_ah)                    (AR_SREV_9340(_ah) ? 0x4038 : \</div><div class='add'>+						  (AR_SREV_9300_20_OR_LATER(_ah) ? 0x4058 : 0x4050))</div><div class='ctx'> #define AR_GPIO_INTR_POL_VAL                     0x0001FFFF</div><div class='ctx'> #define AR_GPIO_INTR_POL_VAL_S                   0</div><div class='ctx'> </div><div class='del'>-#define AR_GPIO_INPUT_EN_VAL                     (AR_SREV_9340(ah) ? 0x403c : \</div><div class='del'>-						  (AR_SREV_9300_20_OR_LATER(ah) ? 0x405c : 0x4054))</div><div class='add'>+#define AR_GPIO_INPUT_EN_VAL(_ah)                (AR_SREV_9340(_ah) ? 0x403c : \</div><div class='add'>+						  (AR_SREV_9300_20_OR_LATER(_ah) ? 0x405c : 0x4054))</div><div class='ctx'> #define AR_GPIO_INPUT_EN_VAL_BT_PRIORITY_DEF     0x00000004</div><div class='ctx'> #define AR_GPIO_INPUT_EN_VAL_BT_PRIORITY_S       2</div><div class='ctx'> #define AR_GPIO_INPUT_EN_VAL_BT_FREQUENCY_DEF    0x00000008</div><div class='hunk'>@@ -1221,15 +1221,15 @@ enum {</div><div class='ctx'> #define AR_GPIO_RTC_RESET_OVERRIDE_ENABLE        0x00010000</div><div class='ctx'> #define AR_GPIO_JTAG_DISABLE                     0x00020000</div><div class='ctx'> </div><div class='del'>-#define AR_GPIO_INPUT_MUX1                       (AR_SREV_9340(ah) ? 0x4040 : \</div><div class='del'>-						  (AR_SREV_9300_20_OR_LATER(ah) ? 0x4060 : 0x4058))</div><div class='add'>+#define AR_GPIO_INPUT_MUX1(_ah)                  (AR_SREV_9340(_ah) ? 0x4040 : \</div><div class='add'>+						  (AR_SREV_9300_20_OR_LATER(_ah) ? 0x4060 : 0x4058))</div><div class='ctx'> #define AR_GPIO_INPUT_MUX1_BT_ACTIVE             0x000f0000</div><div class='ctx'> #define AR_GPIO_INPUT_MUX1_BT_ACTIVE_S           16</div><div class='ctx'> #define AR_GPIO_INPUT_MUX1_BT_PRIORITY           0x00000f00</div><div class='ctx'> #define AR_GPIO_INPUT_MUX1_BT_PRIORITY_S         8</div><div class='ctx'> </div><div class='del'>-#define AR_GPIO_INPUT_MUX2                       (AR_SREV_9340(ah) ? 0x4044 : \</div><div class='del'>-						  (AR_SREV_9300_20_OR_LATER(ah) ? 0x4064 : 0x405c))</div><div class='add'>+#define AR_GPIO_INPUT_MUX2(_ah)                  (AR_SREV_9340(_ah) ? 0x4044 : \</div><div class='add'>+						  (AR_SREV_9300_20_OR_LATER(_ah) ? 0x4064 : 0x405c))</div><div class='ctx'> #define AR_GPIO_INPUT_MUX2_CLK25                 0x0000000f</div><div class='ctx'> #define AR_GPIO_INPUT_MUX2_CLK25_S               0</div><div class='ctx'> #define AR_GPIO_INPUT_MUX2_RFSILENT              0x000000f0</div><div class='hunk'>@@ -1237,18 +1237,18 @@ enum {</div><div class='ctx'> #define AR_GPIO_INPUT_MUX2_RTC_RESET             0x00000f00</div><div class='ctx'> #define AR_GPIO_INPUT_MUX2_RTC_RESET_S           8</div><div class='ctx'> </div><div class='del'>-#define AR_GPIO_OUTPUT_MUX1                      (AR_SREV_9340(ah) ? 0x4048 : \</div><div class='del'>-						  (AR_SREV_9300_20_OR_LATER(ah) ? 0x4068 : 0x4060))</div><div class='del'>-#define AR_GPIO_OUTPUT_MUX2                      (AR_SREV_9340(ah) ? 0x404c : \</div><div class='del'>-						  (AR_SREV_9300_20_OR_LATER(ah) ? 0x406c : 0x4064))</div><div class='del'>-#define AR_GPIO_OUTPUT_MUX3                      (AR_SREV_9340(ah) ? 0x4050 : \</div><div class='del'>-						  (AR_SREV_9300_20_OR_LATER(ah) ? 0x4070 : 0x4068))</div><div class='add'>+#define AR_GPIO_OUTPUT_MUX1(_ah)                 (AR_SREV_9340(_ah) ? 0x4048 : \</div><div class='add'>+						  (AR_SREV_9300_20_OR_LATER(_ah) ? 0x4068 : 0x4060))</div><div class='add'>+#define AR_GPIO_OUTPUT_MUX2(_ah)                 (AR_SREV_9340(_ah) ? 0x404c : \</div><div class='add'>+						  (AR_SREV_9300_20_OR_LATER(_ah) ? 0x406c : 0x4064))</div><div class='add'>+#define AR_GPIO_OUTPUT_MUX3(_ah)                 (AR_SREV_9340(_ah) ? 0x4050 : \</div><div class='add'>+						  (AR_SREV_9300_20_OR_LATER(_ah) ? 0x4070 : 0x4068))</div><div class='ctx'> </div><div class='del'>-#define AR_INPUT_STATE                           (AR_SREV_9340(ah) ? 0x4054 : \</div><div class='del'>-						  (AR_SREV_9300_20_OR_LATER(ah) ? 0x4074 : 0x406c))</div><div class='add'>+#define AR_INPUT_STATE(_ah)                      (AR_SREV_9340(_ah) ? 0x4054 : \</div><div class='add'>+						  (AR_SREV_9300_20_OR_LATER(_ah) ? 0x4074 : 0x406c))</div><div class='ctx'> </div><div class='del'>-#define AR_EEPROM_STATUS_DATA                    (AR_SREV_9340(ah) ? 0x40c8 : \</div><div class='del'>-						  (AR_SREV_9300_20_OR_LATER(ah) ? 0x4084 : 0x407c))</div><div class='add'>+#define AR_EEPROM_STATUS_DATA(_ah)               (AR_SREV_9340(_ah) ? 0x40c8 : \</div><div class='add'>+						  (AR_SREV_9300_20_OR_LATER(_ah) ? 0x4084 : 0x407c))</div><div class='ctx'> #define AR_EEPROM_STATUS_DATA_VAL                0x0000ffff</div><div class='ctx'> #define AR_EEPROM_STATUS_DATA_VAL_S              0</div><div class='ctx'> #define AR_EEPROM_STATUS_DATA_BUSY               0x00010000</div><div class='hunk'>@@ -1256,13 +1256,13 @@ enum {</div><div class='ctx'> #define AR_EEPROM_STATUS_DATA_PROT_ACCESS        0x00040000</div><div class='ctx'> #define AR_EEPROM_STATUS_DATA_ABSENT_ACCESS      0x00080000</div><div class='ctx'> </div><div class='del'>-#define AR_OBS                  (AR_SREV_9340(ah) ? 0x405c : \</div><div class='del'>-				 (AR_SREV_9300_20_OR_LATER(ah) ? 0x4088 : 0x4080))</div><div class='add'>+#define AR_OBS(_ah)             (AR_SREV_9340(_ah) ? 0x405c : \</div><div class='add'>+				 (AR_SREV_9300_20_OR_LATER(_ah) ? 0x4088 : 0x4080))</div><div class='ctx'> </div><div class='del'>-#define AR_GPIO_PDPU                             (AR_SREV_9300_20_OR_LATER(ah) ? 0x4090 : 0x4088)</div><div class='add'>+#define AR_GPIO_PDPU(_ah)                        (AR_SREV_9300_20_OR_LATER(_ah) ? 0x4090 : 0x4088)</div><div class='ctx'> </div><div class='del'>-#define AR_PCIE_MSI                             (AR_SREV_9340(ah) ? 0x40d8 : \</div><div class='del'>-						 (AR_SREV_9300_20_OR_LATER(ah) ? 0x40a4 : 0x4094))</div><div class='add'>+#define AR_PCIE_MSI(_ah)                         (AR_SREV_9340(_ah) ? 0x40d8 : \</div><div class='add'>+						  (AR_SREV_9300_20_OR_LATER(_ah) ? 0x40a4 : 0x4094))</div><div class='ctx'> #define AR_PCIE_MSI_ENABLE                       0x00000001</div><div class='ctx'> #define AR_PCIE_MSI_HW_DBI_WR_EN                 0x02000000</div><div class='ctx'> #define AR_PCIE_MSI_HW_INT_PENDING_ADDR          0xFFA0C1FF /* bits 8..11: value must be 0x5060 */</div><div class='hunk'>@@ -1272,10 +1272,10 @@ enum {</div><div class='ctx'> #define AR_INTR_PRIO_RXLP             0x00000002</div><div class='ctx'> #define AR_INTR_PRIO_RXHP             0x00000004</div><div class='ctx'> </div><div class='del'>-#define AR_INTR_PRIO_SYNC_ENABLE  (AR_SREV_9340(ah) ? 0x4088 : 0x40c4)</div><div class='del'>-#define AR_INTR_PRIO_ASYNC_MASK   (AR_SREV_9340(ah) ? 0x408c : 0x40c8)</div><div class='del'>-#define AR_INTR_PRIO_SYNC_MASK    (AR_SREV_9340(ah) ? 0x4090 : 0x40cc)</div><div class='del'>-#define AR_INTR_PRIO_ASYNC_ENABLE (AR_SREV_9340(ah) ? 0x4094 : 0x40d4)</div><div class='add'>+#define AR_INTR_PRIO_SYNC_ENABLE(_ah)  (AR_SREV_9340(_ah) ? 0x4088 : 0x40c4)</div><div class='add'>+#define AR_INTR_PRIO_ASYNC_MASK(_ah)   (AR_SREV_9340(_ah) ? 0x408c : 0x40c8)</div><div class='add'>+#define AR_INTR_PRIO_SYNC_MASK(_ah)    (AR_SREV_9340(_ah) ? 0x4090 : 0x40cc)</div><div class='add'>+#define AR_INTR_PRIO_ASYNC_ENABLE(_ah) (AR_SREV_9340(_ah) ? 0x4094 : 0x40d4)</div><div class='ctx'> #define AR_ENT_OTP		  0x40d8</div><div class='ctx'> #define AR_ENT_OTP_CHAIN2_DISABLE               0x00020000</div><div class='ctx'> #define AR_ENT_OTP_49GHZ_DISABLE		0x00100000</div><div class='hunk'>@@ -1339,8 +1339,8 @@ enum {</div><div class='ctx'> #define AR_RTC_9160_PLL_CLKSEL_S 14</div><div class='ctx'> </div><div class='ctx'> #define AR_RTC_BASE             0x00020000</div><div class='del'>-#define AR_RTC_RC \</div><div class='del'>-	((AR_SREV_9100(ah)) ? (AR_RTC_BASE + 0x0000) : 0x7000)</div><div class='add'>+#define AR_RTC_RC(_ah) \</div><div class='add'>+	((AR_SREV_9100(_ah)) ? (AR_RTC_BASE + 0x0000) : 0x7000)</div><div class='ctx'> #define AR_RTC_RC_M		0x00000003</div><div class='ctx'> #define AR_RTC_RC_MAC_WARM      0x00000001</div><div class='ctx'> #define AR_RTC_RC_MAC_COLD      0x00000002</div><div class='hunk'>@@ -1357,8 +1357,8 @@ enum {</div><div class='ctx'> #define AR_RTC_REG_CONTROL1     0x700c</div><div class='ctx'> #define AR_RTC_REG_CONTROL1_SWREG_PROGRAM       0x00000001</div><div class='ctx'> </div><div class='del'>-#define AR_RTC_PLL_CONTROL \</div><div class='del'>-	((AR_SREV_9100(ah)) ? (AR_RTC_BASE + 0x0014) : 0x7014)</div><div class='add'>+#define AR_RTC_PLL_CONTROL(_ah) \</div><div class='add'>+	((AR_SREV_9100(_ah)) ? (AR_RTC_BASE + 0x0014) : 0x7014)</div><div class='ctx'> </div><div class='ctx'> #define AR_RTC_PLL_CONTROL2	0x703c</div><div class='ctx'> </div><div class='hunk'>@@ -1378,15 +1378,15 @@ enum {</div><div class='ctx'> #define PLL4_MEAS_DONE    0x8</div><div class='ctx'> #define SQSUM_DVC_MASK 0x007ffff8</div><div class='ctx'> </div><div class='del'>-#define AR_RTC_RESET \</div><div class='del'>-	((AR_SREV_9100(ah)) ? (AR_RTC_BASE + 0x0040) : 0x7040)</div><div class='add'>+#define AR_RTC_RESET(_ah) \</div><div class='add'>+	((AR_SREV_9100(_ah)) ? (AR_RTC_BASE + 0x0040) : 0x7040)</div><div class='ctx'> #define AR_RTC_RESET_EN		(0x00000001)</div><div class='ctx'> </div><div class='del'>-#define AR_RTC_STATUS \</div><div class='del'>-	((AR_SREV_9100(ah)) ? (AR_RTC_BASE + 0x0044) : 0x7044)</div><div class='add'>+#define AR_RTC_STATUS(_ah) \</div><div class='add'>+	((AR_SREV_9100(_ah)) ? (AR_RTC_BASE + 0x0044) : 0x7044)</div><div class='ctx'> </div><div class='del'>-#define AR_RTC_STATUS_M \</div><div class='del'>-	((AR_SREV_9100(ah)) ? 0x0000003f : 0x0000000f)</div><div class='add'>+#define AR_RTC_STATUS_M(_ah) \</div><div class='add'>+	((AR_SREV_9100(_ah)) ? 0x0000003f : 0x0000000f)</div><div class='ctx'> </div><div class='ctx'> #define AR_RTC_PM_STATUS_M      0x0000000f</div><div class='ctx'> </div><div class='hunk'>@@ -1395,32 +1395,32 @@ enum {</div><div class='ctx'> #define AR_RTC_STATUS_SLEEP     0x00000004</div><div class='ctx'> #define AR_RTC_STATUS_WAKEUP    0x00000008</div><div class='ctx'> </div><div class='del'>-#define AR_RTC_SLEEP_CLK \</div><div class='del'>-	((AR_SREV_9100(ah)) ? (AR_RTC_BASE + 0x0048) : 0x7048)</div><div class='add'>+#define AR_RTC_SLEEP_CLK(_ah) \</div><div class='add'>+	((AR_SREV_9100(_ah)) ? (AR_RTC_BASE + 0x0048) : 0x7048)</div><div class='ctx'> #define AR_RTC_FORCE_DERIVED_CLK    0x2</div><div class='ctx'> #define AR_RTC_FORCE_SWREG_PRD      0x00000004</div><div class='ctx'> </div><div class='del'>-#define AR_RTC_FORCE_WAKE \</div><div class='del'>-	((AR_SREV_9100(ah)) ? (AR_RTC_BASE + 0x004c) : 0x704c)</div><div class='add'>+#define AR_RTC_FORCE_WAKE(_ah) \</div><div class='add'>+	((AR_SREV_9100(_ah)) ? (AR_RTC_BASE + 0x004c) : 0x704c)</div><div class='ctx'> #define AR_RTC_FORCE_WAKE_EN        0x00000001</div><div class='ctx'> #define AR_RTC_FORCE_WAKE_ON_INT    0x00000002</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define AR_RTC_INTR_CAUSE \</div><div class='del'>-	((AR_SREV_9100(ah)) ? (AR_RTC_BASE + 0x0050) : 0x7050)</div><div class='add'>+#define AR_RTC_INTR_CAUSE(_ah) \</div><div class='add'>+	((AR_SREV_9100(_ah)) ? (AR_RTC_BASE + 0x0050) : 0x7050)</div><div class='ctx'> </div><div class='del'>-#define AR_RTC_INTR_ENABLE \</div><div class='del'>-	((AR_SREV_9100(ah)) ? (AR_RTC_BASE + 0x0054) : 0x7054)</div><div class='add'>+#define AR_RTC_INTR_ENABLE(_ah) \</div><div class='add'>+	((AR_SREV_9100(_ah)) ? (AR_RTC_BASE + 0x0054) : 0x7054)</div><div class='ctx'> </div><div class='del'>-#define AR_RTC_INTR_MASK \</div><div class='del'>-	((AR_SREV_9100(ah)) ? (AR_RTC_BASE + 0x0058) : 0x7058)</div><div class='add'>+#define AR_RTC_INTR_MASK(_ah) \</div><div class='add'>+	((AR_SREV_9100(_ah)) ? (AR_RTC_BASE + 0x0058) : 0x7058)</div><div class='ctx'> </div><div class='ctx'> #define AR_RTC_KEEP_AWAKE	0x7034</div><div class='ctx'> </div><div class='ctx'> /* RTC_DERIVED_* - only for AR9100 */</div><div class='ctx'> </div><div class='del'>-#define AR_RTC_DERIVED_CLK \</div><div class='del'>-	(AR_SREV_9100(ah) ? (AR_RTC_BASE + 0x0038) : 0x7038)</div><div class='add'>+#define AR_RTC_DERIVED_CLK(_ah) \</div><div class='add'>+	(AR_SREV_9100(_ah) ? (AR_RTC_BASE + 0x0038) : 0x7038)</div><div class='ctx'> #define AR_RTC_DERIVED_CLK_PERIOD    0x0000fffe</div><div class='ctx'> #define AR_RTC_DERIVED_CLK_PERIOD_S  1</div><div class='ctx'> </div><div class='hunk'>@@ -2114,7 +2114,7 @@ enum {</div><div class='ctx'> #define AR9300_SM_BASE				0xa200</div><div class='ctx'> #define AR9002_PHY_AGC_CONTROL			0x9860</div><div class='ctx'> #define AR9003_PHY_AGC_CONTROL			AR9300_SM_BASE + 0xc4</div><div class='del'>-#define AR_PHY_AGC_CONTROL			(AR_SREV_9300_20_OR_LATER(ah) ? AR9003_PHY_AGC_CONTROL : AR9002_PHY_AGC_CONTROL)</div><div class='add'>+#define AR_PHY_AGC_CONTROL(_ah)			(AR_SREV_9300_20_OR_LATER(_ah) ? AR9003_PHY_AGC_CONTROL : AR9002_PHY_AGC_CONTROL)</div><div class='ctx'> #define AR_PHY_AGC_CONTROL_CAL			0x00000001  /* do internal calibration */</div><div class='ctx'> #define AR_PHY_AGC_CONTROL_NF			0x00000002  /* do noise-floor calibration */</div><div class='ctx'> #define AR_PHY_AGC_CONTROL_OFFSET_CAL		0x00000800  /* allow offset calibration */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/reg_aic.h b/drivers/net/wireless/ath/ath9k/reg_aic.h<br/>index 955147ab48a2..f50994910eae 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/reg_aic.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/reg_aic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/reg_aic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/reg_aic.h</a></div><div class='hunk'>@@ -17,10 +17,6 @@</div><div class='ctx'> #ifndef REG_AIC_H</div><div class='ctx'> #define REG_AIC_H</div><div class='ctx'> </div><div class='del'>-#define AR_SM_BASE                              0xa200</div><div class='del'>-#define AR_SM1_BASE                             0xb200</div><div class='del'>-#define AR_AGC_BASE                             0x9e00</div><div class='del'>-</div><div class='ctx'> #define AR_PHY_AIC_CTRL_0_B0                    (AR_SM_BASE + 0x4b0)</div><div class='ctx'> #define AR_PHY_AIC_CTRL_1_B0                    (AR_SM_BASE + 0x4b4)</div><div class='ctx'> #define AR_PHY_AIC_CTRL_2_B0                    (AR_SM_BASE + 0x4b8)</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/rng.c b/drivers/net/wireless/ath/ath9k/rng.c<br/>index f9d3d6eedd3c..e1def77591c6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/rng.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/rng.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/rng.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/rng.c</a></div><div class='hunk'>@@ -21,11 +21,6 @@</div><div class='ctx'> #include "hw.h"</div><div class='ctx'> #include "ar9003_phy.h"</div><div class='ctx'> </div><div class='del'>-#define ATH9K_RNG_BUF_SIZE	320</div><div class='del'>-#define ATH9K_RNG_ENTROPY(x)	(((x) * 8 * 10) &gt;&gt; 5) /* quality: 10/32 */</div><div class='del'>-</div><div class='del'>-static DECLARE_WAIT_QUEUE_HEAD(rng_queue);</div><div class='del'>-</div><div class='ctx'> static int ath9k_rng_data_read(struct ath_softc *sc, u32 *buf, u32 buf_size)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j;</div><div class='hunk'>@@ -34,9 +29,9 @@ static int ath9k_rng_data_read(struct ath_softc *sc, u32 *buf, u32 buf_size)</div><div class='ctx'> </div><div class='ctx'> 	ath9k_ps_wakeup(sc);</div><div class='ctx'> </div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_TEST, AR_PHY_TEST_BBB_OBS_SEL, 1);</div><div class='del'>-	REG_CLR_BIT(ah, AR_PHY_TEST, AR_PHY_TEST_RX_OBS_SEL_BIT5);</div><div class='del'>-	REG_RMW_FIELD(ah, AR_PHY_TEST_CTL_STATUS, AR_PHY_TEST_CTL_RX_OBS_SEL, 0);</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_TEST(ah), AR_PHY_TEST_BBB_OBS_SEL, 1);</div><div class='add'>+	REG_CLR_BIT(ah, AR_PHY_TEST(ah), AR_PHY_TEST_RX_OBS_SEL_BIT5);</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_TEST_CTL_STATUS(ah), AR_PHY_TEST_CTL_RX_OBS_SEL, 0);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0, j = 0; i &lt; buf_size; i++) {</div><div class='ctx'> 		v1 = REG_READ(ah, AR_PHY_TST_ADC) &amp; 0xffff;</div><div class='hunk'>@@ -71,61 +66,57 @@ static u32 ath9k_rng_delay_get(u32 fail_stats)</div><div class='ctx'> 	return delay;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath9k_rng_kthread(void *data)</div><div class='add'>+static int ath9k_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait)</div><div class='ctx'> {</div><div class='del'>-	int bytes_read;</div><div class='del'>-	struct ath_softc *sc = data;</div><div class='del'>-	u32 *rng_buf;</div><div class='del'>-	u32 delay, fail_stats = 0;</div><div class='del'>-</div><div class='del'>-	rng_buf = kmalloc_array(ATH9K_RNG_BUF_SIZE, sizeof(u32), GFP_KERNEL);</div><div class='del'>-	if (!rng_buf)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	while (!kthread_should_stop()) {</div><div class='del'>-		bytes_read = ath9k_rng_data_read(sc, rng_buf,</div><div class='del'>-						 ATH9K_RNG_BUF_SIZE);</div><div class='del'>-		if (unlikely(!bytes_read)) {</div><div class='del'>-			delay = ath9k_rng_delay_get(++fail_stats);</div><div class='del'>-			wait_event_interruptible_timeout(rng_queue,</div><div class='del'>-							 kthread_should_stop(),</div><div class='del'>-							 msecs_to_jiffies(delay));</div><div class='del'>-			continue;</div><div class='add'>+	struct ath_softc *sc = container_of(rng, struct ath_softc, rng_ops);</div><div class='add'>+	u32 fail_stats = 0, word;</div><div class='add'>+	int bytes_read = 0;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		if (max &amp; ~3UL)</div><div class='add'>+			bytes_read = ath9k_rng_data_read(sc, buf, max &gt;&gt; 2);</div><div class='add'>+		if ((max &amp; 3UL) &amp;&amp; ath9k_rng_data_read(sc, &amp;word, 1)) {</div><div class='add'>+			memcpy(buf + bytes_read, &amp;word, max &amp; 3UL);</div><div class='add'>+			bytes_read += max &amp; 3UL;</div><div class='add'>+			memzero_explicit(&amp;word, sizeof(word));</div><div class='ctx'> 		}</div><div class='add'>+		if (!wait || !max || likely(bytes_read) || fail_stats &gt; 110)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-		fail_stats = 0;</div><div class='del'>-</div><div class='del'>-		/* sleep until entropy bits under write_wakeup_threshold */</div><div class='del'>-		add_hwgenerator_randomness((void *)rng_buf, bytes_read,</div><div class='del'>-					   ATH9K_RNG_ENTROPY(bytes_read));</div><div class='add'>+		if (hwrng_msleep(rng, ath9k_rng_delay_get(++fail_stats)))</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(rng_buf);</div><div class='del'>-out:</div><div class='del'>-	sc-&gt;rng_task = NULL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	if (wait &amp;&amp; !bytes_read &amp;&amp; max)</div><div class='add'>+		bytes_read = -EIO;</div><div class='add'>+	return bytes_read;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ath9k_rng_start(struct ath_softc *sc)</div><div class='ctx'> {</div><div class='add'>+	static atomic_t serial = ATOMIC_INIT(0);</div><div class='ctx'> 	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='ctx'> </div><div class='del'>-	if (sc-&gt;rng_task)</div><div class='add'>+	if (sc-&gt;rng_ops.read)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!AR_SREV_9300_20_OR_LATER(ah))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	sc-&gt;rng_task = kthread_run(ath9k_rng_kthread, sc, "ath9k-hwrng");</div><div class='del'>-	if (IS_ERR(sc-&gt;rng_task))</div><div class='del'>-		sc-&gt;rng_task = NULL;</div><div class='add'>+	snprintf(sc-&gt;rng_name, sizeof(sc-&gt;rng_name), "ath9k_%u",</div><div class='add'>+		 (atomic_inc_return(&amp;serial) - 1) &amp; U16_MAX);</div><div class='add'>+	sc-&gt;rng_ops.name = sc-&gt;rng_name;</div><div class='add'>+	sc-&gt;rng_ops.read = ath9k_rng_read;</div><div class='add'>+	sc-&gt;rng_ops.quality = 320;</div><div class='add'>+</div><div class='add'>+	if (devm_hwrng_register(sc-&gt;dev, &amp;sc-&gt;rng_ops))</div><div class='add'>+		sc-&gt;rng_ops.read = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ath9k_rng_stop(struct ath_softc *sc)</div><div class='ctx'> {</div><div class='del'>-	if (sc-&gt;rng_task) {</div><div class='del'>-		kthread_stop(sc-&gt;rng_task);</div><div class='del'>-		sc-&gt;rng_task = NULL;</div><div class='add'>+	if (sc-&gt;rng_ops.read) {</div><div class='add'>+		devm_hwrng_unregister(sc-&gt;dev, &amp;sc-&gt;rng_ops);</div><div class='add'>+		sc-&gt;rng_ops.read = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/tx99.c b/drivers/net/wireless/ath/ath9k/tx99.c<br/>index 95544ce05acf..f2144fd39093 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/tx99.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/tx99.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/tx99.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/tx99.c</a></div><div class='hunk'>@@ -172,9 +172,8 @@ static ssize_t write_file_tx99(struct file *file, const char __user *user_buf,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_softc *sc = file-&gt;private_data;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(sc-&gt;sc_ah);</div><div class='del'>-	char buf[32];</div><div class='ctx'> 	bool start;</div><div class='del'>-	ssize_t len;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='ctx'> 	if (count &lt; 1)</div><div class='hunk'>@@ -183,14 +182,9 @@ static ssize_t write_file_tx99(struct file *file, const char __user *user_buf,</div><div class='ctx'> 	if (sc-&gt;cur_chan-&gt;nvifs &gt; 1)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	len = min(count, sizeof(buf) - 1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, len))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	buf[len] = '\0';</div><div class='del'>-</div><div class='del'>-	if (strtobool(buf, &amp;start))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ret = kstrtobool_from_user(user_buf, count, &amp;start);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;sc-&gt;mutex);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/wmi.c b/drivers/net/wireless/ath/ath9k/wmi.c<br/>index fe29ad4b9023..805ad31edba2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/wmi.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/wmi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/wmi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/wmi.c</a></div><div class='hunk'>@@ -155,6 +155,12 @@ void ath9k_wmi_event_tasklet(struct tasklet_struct *t)</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;wmi-&gt;wmi_lock, flags);</div><div class='ctx'> </div><div class='add'>+		/* Check if ath9k_htc_probe_device() completed. */</div><div class='add'>+		if (!data_race(priv-&gt;initialized)) {</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		hdr = (struct wmi_cmd_hdr *) skb-&gt;data;</div><div class='ctx'> 		cmd_id = be16_to_cpu(hdr-&gt;command_id);</div><div class='ctx'> 		wmi_event = skb_pull(skb, sizeof(struct wmi_cmd_hdr));</div><div class='hunk'>@@ -217,6 +223,10 @@ static void ath9k_wmi_ctrl_rx(void *priv, struct sk_buff *skb,</div><div class='ctx'> 	if (unlikely(wmi-&gt;stopped))</div><div class='ctx'> 		goto free_skb;</div><div class='ctx'> </div><div class='add'>+	/* Validate the obtained SKB. */</div><div class='add'>+	if (unlikely(skb-&gt;len &lt; sizeof(struct wmi_cmd_hdr)))</div><div class='add'>+		goto free_skb;</div><div class='add'>+</div><div class='ctx'> 	hdr = (struct wmi_cmd_hdr *) skb-&gt;data;</div><div class='ctx'> 	cmd_id = be16_to_cpu(hdr-&gt;command_id);</div><div class='ctx'> </div><div class='hunk'>@@ -234,10 +244,10 @@ static void ath9k_wmi_ctrl_rx(void *priv, struct sk_buff *skb,</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;wmi-&gt;wmi_lock, flags);</div><div class='ctx'> 		goto free_skb;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;wmi-&gt;wmi_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* WMI command response */</div><div class='ctx'> 	ath9k_wmi_rsp_callback(wmi, skb);</div><div class='add'>+	spin_unlock_irqrestore(&amp;wmi-&gt;wmi_lock, flags);</div><div class='ctx'> </div><div class='ctx'> free_skb:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='hunk'>@@ -275,7 +285,8 @@ int ath9k_wmi_connect(struct htc_target *htc, struct wmi *wmi,</div><div class='ctx'> </div><div class='ctx'> static int ath9k_wmi_cmd_issue(struct wmi *wmi,</div><div class='ctx'> 			       struct sk_buff *skb,</div><div class='del'>-			       enum wmi_cmd_id cmd, u16 len)</div><div class='add'>+			       enum wmi_cmd_id cmd, u16 len,</div><div class='add'>+			       u8 *rsp_buf, u32 rsp_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_cmd_hdr *hdr;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -285,6 +296,11 @@ static int ath9k_wmi_cmd_issue(struct wmi *wmi,</div><div class='ctx'> 	hdr-&gt;seq_no = cpu_to_be16(++wmi-&gt;tx_seq_id);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;wmi-&gt;wmi_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* record the rsp buffer and length */</div><div class='add'>+	wmi-&gt;cmd_rsp_buf = rsp_buf;</div><div class='add'>+	wmi-&gt;cmd_rsp_len = rsp_len;</div><div class='add'>+</div><div class='ctx'> 	wmi-&gt;last_seq_id = wmi-&gt;tx_seq_id;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;wmi-&gt;wmi_lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -300,8 +316,8 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id,</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='ctx'> 	u16 headroom = sizeof(struct htc_frame_hdr) +</div><div class='ctx'> 		       sizeof(struct wmi_cmd_hdr);</div><div class='add'>+	unsigned long time_left, flags;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	unsigned long time_left;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ah-&gt;ah_flags &amp; AH_UNPLUGGED)</div><div class='hunk'>@@ -325,11 +341,7 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* record the rsp buffer and length */</div><div class='del'>-	wmi-&gt;cmd_rsp_buf = rsp_buf;</div><div class='del'>-	wmi-&gt;cmd_rsp_len = rsp_len;</div><div class='del'>-</div><div class='del'>-	ret = ath9k_wmi_cmd_issue(wmi, skb, cmd_id, cmd_len);</div><div class='add'>+	ret = ath9k_wmi_cmd_issue(wmi, skb, cmd_id, cmd_len, rsp_buf, rsp_len);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -337,6 +349,9 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id,</div><div class='ctx'> 	if (!time_left) {</div><div class='ctx'> 		ath_dbg(common, WMI, "Timeout waiting for WMI command: %s\n",</div><div class='ctx'> 			wmi_cmd_to_name(cmd_id));</div><div class='add'>+		spin_lock_irqsave(&amp;wmi-&gt;wmi_lock, flags);</div><div class='add'>+		wmi-&gt;last_seq_id = 0;</div><div class='add'>+		spin_unlock_irqrestore(&amp;wmi-&gt;wmi_lock, flags);</div><div class='ctx'> 		mutex_unlock(&amp;wmi-&gt;op_mutex);</div><div class='ctx'> 		return -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/wow.c b/drivers/net/wireless/ath/ath9k/wow.c<br/>index 8d0b1730a9d5..ed4152cd44f0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/wow.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/wow.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/wow.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/wow.c</a></div><div class='hunk'>@@ -60,7 +60,7 @@ static int ath9k_wow_add_disassoc_deauth_pattern(struct ath_softc *sc)</div><div class='ctx'> 	memset(dis_deauth_mask, 0, MAX_PATTERN_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Create Dissassociate / Deauthenticate packet filter</div><div class='add'>+	 * Create Disassociate / Deauthenticate packet filter</div><div class='ctx'> 	 *</div><div class='ctx'> 	 *     2 bytes        2 byte    6 bytes   6 bytes  6 bytes</div><div class='ctx'> 	 *  +--------------+----------+---------+--------+--------+----</div><div class='hunk'>@@ -70,7 +70,7 @@ static int ath9k_wow_add_disassoc_deauth_pattern(struct ath_softc *sc)</div><div class='ctx'> 	 * The above is the management frame format for disassociate/</div><div class='ctx'> 	 * deauthenticate pattern, from this we need to match the first byte</div><div class='ctx'> 	 * of 'Frame Control' and DA, SA, and BSSID fields</div><div class='del'>-	 * (skipping 2nd byte of FC and Duration feild.</div><div class='add'>+	 * (skipping 2nd byte of FC and Duration field.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Disassociate pattern</div><div class='ctx'> 	 * --------------------</div><div class='hunk'>@@ -225,7 +225,7 @@ int ath9k_suspend(struct ieee80211_hw *hw,</div><div class='ctx'> 	ath9k_stop_btcoex(sc);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Enable wake up on recieving disassoc/deauth</div><div class='add'>+	 * Enable wake up on receiving disassoc/deauth</div><div class='ctx'> 	 * frame by default.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = ath9k_wow_add_disassoc_deauth_pattern(sc);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c<br/>index 5691bd6eb82c..0ac9212e42f7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/xmit.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/ath9k/xmit.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/ath9k/xmit.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/ath9k/xmit.c</a></div><div class='hunk'>@@ -34,6 +34,12 @@</div><div class='ctx'> #define NUM_SYMBOLS_PER_USEC(_usec) (_usec &gt;&gt; 2)</div><div class='ctx'> #define NUM_SYMBOLS_PER_USEC_HALFGI(_usec) (((_usec*5)-4)/18)</div><div class='ctx'> </div><div class='add'>+/* Shifts in ar5008_phy.c and ar9003_phy.c are equal for all revisions */</div><div class='add'>+#define ATH9K_PWRTBL_11NA_OFDM_SHIFT    0</div><div class='add'>+#define ATH9K_PWRTBL_11NG_OFDM_SHIFT    4</div><div class='add'>+#define ATH9K_PWRTBL_11NA_HT_SHIFT      8</div><div class='add'>+#define ATH9K_PWRTBL_11NG_HT_SHIFT      12</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static u16 bits_per_symbol[][2] = {</div><div class='ctx'> 	/* 20MHz 40MHz */</div><div class='hunk'>@@ -61,8 +67,7 @@ static void ath_tx_txqaddbuf(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> static void ath_tx_rc_status(struct ath_softc *sc, struct ath_buf *bf,</div><div class='ctx'> 			     struct ath_tx_status *ts, int nframes, int nbad,</div><div class='ctx'> 			     int txok);</div><div class='del'>-static void ath_tx_update_baw(struct ath_softc *sc, struct ath_atx_tid *tid,</div><div class='del'>-			      struct ath_buf *bf);</div><div class='add'>+static void ath_tx_update_baw(struct ath_atx_tid *tid, struct ath_buf *bf);</div><div class='ctx'> static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc,</div><div class='ctx'> 					   struct ath_txq *txq,</div><div class='ctx'> 					   struct ath_atx_tid *tid,</div><div class='hunk'>@@ -88,7 +93,7 @@ static void ath_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;flags &amp; (IEEE80211_TX_CTL_REQ_TX_STATUS |</div><div class='ctx'> 			   IEEE80211_TX_STATUS_EOSP)) {</div><div class='del'>-		ieee80211_tx_status(hw, skb);</div><div class='add'>+		ieee80211_tx_status_skb(hw, skb);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -141,8 +146,8 @@ static struct ath_frame_info *get_frame_info(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct ath_frame_info) &gt;</div><div class='del'>-		     sizeof(tx_info-&gt;rate_driver_data));</div><div class='del'>-	return (struct ath_frame_info *) &amp;tx_info-&gt;rate_driver_data[0];</div><div class='add'>+		     sizeof(tx_info-&gt;status.status_driver_data));</div><div class='add'>+	return (struct ath_frame_info *) &amp;tx_info-&gt;status.status_driver_data[0];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath_send_bar(struct ath_atx_tid *tid, u16 seqno)</div><div class='hunk'>@@ -154,17 +159,58 @@ static void ath_send_bar(struct ath_atx_tid *tid, u16 seqno)</div><div class='ctx'> 			   seqno &lt;&lt; IEEE80211_SEQ_SEQ_SHIFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ath_merge_ratetbl(struct ieee80211_sta *sta, struct ath_buf *bf,</div><div class='add'>+			      struct ieee80211_tx_info *tx_info)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta_rates *ratetbl;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (!sta)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	ratetbl = rcu_dereference(sta-&gt;rates);</div><div class='add'>+	if (!ratetbl)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (tx_info-&gt;control.rates[0].idx &lt; 0 ||</div><div class='add'>+	    tx_info-&gt;control.rates[0].count == 0)</div><div class='add'>+	{</div><div class='add'>+		i = 0;</div><div class='add'>+	} else {</div><div class='add'>+		bf-&gt;rates[0] = tx_info-&gt;control.rates[0];</div><div class='add'>+		i = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for ( ; i &lt; IEEE80211_TX_MAX_RATES; i++) {</div><div class='add'>+		bf-&gt;rates[i].idx = ratetbl-&gt;rate[i].idx;</div><div class='add'>+		bf-&gt;rates[i].flags = ratetbl-&gt;rate[i].flags;</div><div class='add'>+		if (tx_info-&gt;control.use_rts)</div><div class='add'>+			bf-&gt;rates[i].count = ratetbl-&gt;rate[i].count_rts;</div><div class='add'>+		else if (tx_info-&gt;control.use_cts_prot)</div><div class='add'>+			bf-&gt;rates[i].count = ratetbl-&gt;rate[i].count_cts;</div><div class='add'>+		else</div><div class='add'>+			bf-&gt;rates[i].count = ratetbl-&gt;rate[i].count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath_set_rates(struct ieee80211_vif *vif, struct ieee80211_sta *sta,</div><div class='ctx'> 			  struct ath_buf *bf)</div><div class='ctx'> {</div><div class='del'>-	ieee80211_get_tx_rates(vif, sta, bf-&gt;bf_mpdu, bf-&gt;rates,</div><div class='del'>-			       ARRAY_SIZE(bf-&gt;rates));</div><div class='add'>+	struct ieee80211_tx_info *tx_info;</div><div class='add'>+</div><div class='add'>+	tx_info = IEEE80211_SKB_CB(bf-&gt;bf_mpdu);</div><div class='add'>+</div><div class='add'>+	if (!ath_merge_ratetbl(sta, bf, tx_info))</div><div class='add'>+		ieee80211_get_tx_rates(vif, sta, bf-&gt;bf_mpdu, bf-&gt;rates,</div><div class='add'>+				       ARRAY_SIZE(bf-&gt;rates));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath_txq_skb_done(struct ath_softc *sc, struct ath_txq *txq,</div><div class='del'>-			     struct sk_buff *skb)</div><div class='add'>+static void ath_txq_skb_done(struct ath_softc *sc, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_frame_info *fi = get_frame_info(skb);</div><div class='add'>+	struct ath_txq *txq;</div><div class='ctx'> 	int q = fi-&gt;txq;</div><div class='ctx'> </div><div class='ctx'> 	if (q &lt; 0)</div><div class='hunk'>@@ -177,7 +223,7 @@ static void ath_txq_skb_done(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ath_atx_tid *</div><div class='del'>-ath_get_skb_tid(struct ath_softc *sc, struct ath_node *an, struct sk_buff *skb)</div><div class='add'>+ath_get_skb_tid(struct ath_node *an, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	u8 tidno = skb-&gt;priority &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='ctx'> 	return ATH_AN_2_TID(an, tidno);</div><div class='hunk'>@@ -247,13 +293,13 @@ static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)</div><div class='ctx'> 		fi = get_frame_info(skb);</div><div class='ctx'> 		bf = fi-&gt;bf;</div><div class='ctx'> 		if (!bf) {</div><div class='del'>-			ath_txq_skb_done(sc, txq, skb);</div><div class='add'>+			ath_txq_skb_done(sc, skb);</div><div class='ctx'> 			ieee80211_free_txskb(sc-&gt;hw, skb);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (fi-&gt;baw_tracked) {</div><div class='del'>-			ath_tx_update_baw(sc, tid, bf);</div><div class='add'>+			ath_tx_update_baw(tid, bf);</div><div class='ctx'> 			sendbar = true;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -268,8 +314,7 @@ static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath_tx_update_baw(struct ath_softc *sc, struct ath_atx_tid *tid,</div><div class='del'>-			      struct ath_buf *bf)</div><div class='add'>+static void ath_tx_update_baw(struct ath_atx_tid *tid, struct ath_buf *bf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_frame_info *fi = get_frame_info(bf-&gt;bf_mpdu);</div><div class='ctx'> 	u16 seqno = bf-&gt;bf_state.seqno;</div><div class='hunk'>@@ -291,8 +336,7 @@ static void ath_tx_update_baw(struct ath_softc *sc, struct ath_atx_tid *tid,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath_tx_addto_baw(struct ath_softc *sc, struct ath_atx_tid *tid,</div><div class='del'>-			     struct ath_buf *bf)</div><div class='add'>+static void ath_tx_addto_baw(struct ath_atx_tid *tid, struct ath_buf *bf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_frame_info *fi = get_frame_info(bf-&gt;bf_mpdu);</div><div class='ctx'> 	u16 seqno = bf-&gt;bf_state.seqno;</div><div class='hunk'>@@ -322,12 +366,11 @@ static void ath_tid_drain(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 	struct list_head bf_head;</div><div class='ctx'> 	struct ath_tx_status ts;</div><div class='ctx'> 	struct ath_frame_info *fi;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;ts, 0, sizeof(ts));</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;bf_head);</div><div class='ctx'> </div><div class='del'>-	while ((ret = ath_tid_dequeue(tid, &amp;skb)) == 0) {</div><div class='add'>+	while (ath_tid_dequeue(tid, &amp;skb) == 0) {</div><div class='ctx'> 		fi = get_frame_info(skb);</div><div class='ctx'> 		bf = fi-&gt;bf;</div><div class='ctx'> </div><div class='hunk'>@@ -406,9 +449,8 @@ static struct ath_buf* ath_clone_txbuf(struct ath_softc *sc, struct ath_buf *bf)</div><div class='ctx'> 	return tbf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath_tx_count_frames(struct ath_softc *sc, struct ath_buf *bf,</div><div class='del'>-			        struct ath_tx_status *ts, int txok,</div><div class='del'>-			        int *nframes, int *nbad)</div><div class='add'>+static void ath_tx_count_frames(struct ath_buf *bf, struct ath_tx_status *ts,</div><div class='add'>+				int txok, int *nframes, int *nbad)</div><div class='ctx'> {</div><div class='ctx'> 	u16 seq_st = 0;</div><div class='ctx'> 	u32 ba[WME_BA_BMP_SIZE &gt;&gt; 5];</div><div class='hunk'>@@ -419,9 +461,11 @@ static void ath_tx_count_frames(struct ath_softc *sc, struct ath_buf *bf,</div><div class='ctx'> 	*nframes = 0;</div><div class='ctx'> </div><div class='ctx'> 	isaggr = bf_isaggr(bf);</div><div class='add'>+	memset(ba, 0, WME_BA_BMP_SIZE &gt;&gt; 3);</div><div class='add'>+</div><div class='ctx'> 	if (isaggr) {</div><div class='ctx'> 		seq_st = ts-&gt;ts_seqnum;</div><div class='del'>-		memcpy(ba, &amp;ts-&gt;ba_low, WME_BA_BMP_SIZE &gt;&gt; 3);</div><div class='add'>+		memcpy(ba, &amp;ts-&gt;ba, WME_BA_BMP_SIZE &gt;&gt; 3);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (bf) {</div><div class='hunk'>@@ -504,12 +548,12 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 	if (isaggr &amp;&amp; txok) {</div><div class='ctx'> 		if (ts-&gt;ts_flags &amp; ATH9K_TX_BA) {</div><div class='ctx'> 			seq_st = ts-&gt;ts_seqnum;</div><div class='del'>-			memcpy(ba, &amp;ts-&gt;ba_low, WME_BA_BMP_SIZE &gt;&gt; 3);</div><div class='add'>+			memcpy(ba, &amp;ts-&gt;ba, WME_BA_BMP_SIZE &gt;&gt; 3);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * AR5416 can become deaf/mute when BA</div><div class='ctx'> 			 * issue happens. Chip needs to be reset.</div><div class='del'>-			 * But AP code may have sychronization issues</div><div class='add'>+			 * But AP code may have synchronization issues</div><div class='ctx'> 			 * when perform internal reset in this routine.</div><div class='ctx'> 			 * Only enable reset in STA mode for now.</div><div class='ctx'> 			 */</div><div class='hunk'>@@ -520,7 +564,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> </div><div class='ctx'> 	__skb_queue_head_init(&amp;bf_pending);</div><div class='ctx'> </div><div class='del'>-	ath_tx_count_frames(sc, bf, ts, txok, &amp;nframes, &amp;nbad);</div><div class='add'>+	ath_tx_count_frames(bf, ts, txok, &amp;nframes, &amp;nbad);</div><div class='ctx'> 	while (bf) {</div><div class='ctx'> 		u16 seqno = bf-&gt;bf_state.seqno;</div><div class='ctx'> </div><div class='hunk'>@@ -573,7 +617,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 			 * complete the acked-ones/xretried ones; update</div><div class='ctx'> 			 * block-ack window</div><div class='ctx'> 			 */</div><div class='del'>-			ath_tx_update_baw(sc, tid, bf);</div><div class='add'>+			ath_tx_update_baw(tid, bf);</div><div class='ctx'> </div><div class='ctx'> 			if (rc_update &amp;&amp; (acked_cnt == 1 || txfail_cnt == 1)) {</div><div class='ctx'> 				memcpy(tx_info-&gt;control.rates, rates, sizeof(rates));</div><div class='hunk'>@@ -603,7 +647,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 				 * run out of tx buf.</div><div class='ctx'> 				 */</div><div class='ctx'> 				if (!tbf) {</div><div class='del'>-					ath_tx_update_baw(sc, tid, bf);</div><div class='add'>+					ath_tx_update_baw(tid, bf);</div><div class='ctx'> </div><div class='ctx'> 					ath_tx_complete_buf(sc, bf, txq,</div><div class='ctx'> 							    &amp;bf_head, NULL, ts,</div><div class='hunk'>@@ -704,7 +748,7 @@ static void ath_tx_process_buffer(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 	sta = ieee80211_find_sta_by_ifaddr(hw, hdr-&gt;addr1, hdr-&gt;addr2);</div><div class='ctx'> 	if (sta) {</div><div class='ctx'> 		struct ath_node *an = (struct ath_node *)sta-&gt;drv_priv;</div><div class='del'>-		tid = ath_get_skb_tid(sc, an, bf-&gt;bf_mpdu);</div><div class='add'>+		tid = ath_get_skb_tid(an, bf-&gt;bf_mpdu);</div><div class='ctx'> 		ath_tx_count_airtime(sc, sta, bf, ts, tid-&gt;tidno);</div><div class='ctx'> 		if (ts-&gt;ts_status &amp; (ATH9K_TXERR_FILT | ATH9K_TXERR_XRETRY))</div><div class='ctx'> 			tid-&gt;clear_ps_filter = true;</div><div class='hunk'>@@ -914,7 +958,7 @@ ath_tx_get_tid_subframe(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 			bf-&gt;bf_state.stale = false;</div><div class='ctx'> </div><div class='ctx'> 		if (!bf) {</div><div class='del'>-			ath_txq_skb_done(sc, txq, skb);</div><div class='add'>+			ath_txq_skb_done(sc, skb);</div><div class='ctx'> 			ieee80211_free_txskb(sc-&gt;hw, skb);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -964,13 +1008,13 @@ ath_tx_get_tid_subframe(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> </div><div class='ctx'> 			INIT_LIST_HEAD(&amp;bf_head);</div><div class='ctx'> 			list_add(&amp;bf-&gt;list, &amp;bf_head);</div><div class='del'>-			ath_tx_update_baw(sc, tid, bf);</div><div class='add'>+			ath_tx_update_baw(tid, bf);</div><div class='ctx'> 			ath_tx_complete_buf(sc, bf, txq, &amp;bf_head, NULL, &amp;ts, 0);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (bf_isampdu(bf))</div><div class='del'>-			ath_tx_addto_baw(sc, tid, bf);</div><div class='add'>+			ath_tx_addto_baw(tid, bf);</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1066,8 +1110,8 @@ finish:</div><div class='ctx'>  * width  - 0 for 20 MHz, 1 for 40 MHz</div><div class='ctx'>  * half_gi - to use 4us v/s 3.6 us for symbol time</div><div class='ctx'>  */</div><div class='del'>-u32 ath_pkt_duration(struct ath_softc *sc, u8 rix, int pktlen,</div><div class='del'>-		     int width, int half_gi, bool shortPreamble)</div><div class='add'>+u32 ath_pkt_duration(u8 rix, int pktlen, int width,</div><div class='add'>+		     int half_gi, bool shortPreamble)</div><div class='ctx'> {</div><div class='ctx'> 	u32 nbits, nsymbits, duration, nsymbols;</div><div class='ctx'> 	int streams;</div><div class='hunk'>@@ -1128,13 +1172,14 @@ void ath_update_max_aggr_framelen(struct ath_softc *sc, int queue, int txop)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u8 ath_get_rate_txpower(struct ath_softc *sc, struct ath_buf *bf,</div><div class='del'>-			       u8 rateidx, bool is_40, bool is_cck)</div><div class='add'>+			       u8 rateidx, bool is_40, bool is_cck, bool is_mcs)</div><div class='ctx'> {</div><div class='ctx'> 	u8 max_power;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct ath_frame_info *fi;</div><div class='ctx'> 	struct ieee80211_tx_info *info;</div><div class='ctx'> 	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='add'>+	bool is_2ghz, is_5ghz, use_stbc;</div><div class='ctx'> </div><div class='ctx'> 	if (sc-&gt;tx99_state || !ah-&gt;tpc_enabled)</div><div class='ctx'> 		return MAX_RATE_POWER;</div><div class='hunk'>@@ -1143,6 +1188,19 @@ static u8 ath_get_rate_txpower(struct ath_softc *sc, struct ath_buf *bf,</div><div class='ctx'> 	fi = get_frame_info(skb);</div><div class='ctx'> 	info = IEEE80211_SKB_CB(skb);</div><div class='ctx'> </div><div class='add'>+	is_2ghz = info-&gt;band == NL80211_BAND_2GHZ;</div><div class='add'>+	is_5ghz = info-&gt;band == NL80211_BAND_5GHZ;</div><div class='add'>+	use_stbc = is_mcs &amp;&amp; rateidx &lt; 8 &amp;&amp; (info-&gt;flags &amp;</div><div class='add'>+					     IEEE80211_TX_CTL_STBC);</div><div class='add'>+</div><div class='add'>+	if (is_mcs)</div><div class='add'>+		rateidx += is_5ghz ? ATH9K_PWRTBL_11NA_HT_SHIFT</div><div class='add'>+				   : ATH9K_PWRTBL_11NG_HT_SHIFT;</div><div class='add'>+	else if (is_2ghz &amp;&amp; !is_cck)</div><div class='add'>+		rateidx += ATH9K_PWRTBL_11NG_OFDM_SHIFT;</div><div class='add'>+	else</div><div class='add'>+		rateidx += ATH9K_PWRTBL_11NA_OFDM_SHIFT;</div><div class='add'>+</div><div class='ctx'> 	if (!AR_SREV_9300_20_OR_LATER(ah)) {</div><div class='ctx'> 		int txpower = fi-&gt;tx_power;</div><div class='ctx'> </div><div class='hunk'>@@ -1152,10 +1210,8 @@ static u8 ath_get_rate_txpower(struct ath_softc *sc, struct ath_buf *bf,</div><div class='ctx'> 			u16 eeprom_rev = ah-&gt;eep_ops-&gt;get_eeprom_rev(ah);</div><div class='ctx'> </div><div class='ctx'> 			if (eeprom_rev &gt;= AR5416_EEP_MINOR_VER_2) {</div><div class='del'>-				bool is_2ghz;</div><div class='ctx'> 				struct modal_eep_header *pmodal;</div><div class='ctx'> </div><div class='del'>-				is_2ghz = info-&gt;band == NL80211_BAND_2GHZ;</div><div class='ctx'> 				pmodal = &amp;eep-&gt;modalHeader[is_2ghz];</div><div class='ctx'> 				power_ht40delta = pmodal-&gt;ht40PowerIncForPdadc;</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -1175,7 +1231,7 @@ static u8 ath_get_rate_txpower(struct ath_softc *sc, struct ath_buf *bf,</div><div class='ctx'> 			txpower -= 2 * power_offset;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (OLC_FOR_AR9280_20_LATER &amp;&amp; is_cck)</div><div class='add'>+		if (OLC_FOR_AR9280_20_LATER(ah) &amp;&amp; is_cck)</div><div class='ctx'> 			txpower -= 2;</div><div class='ctx'> </div><div class='ctx'> 		txpower = max(txpower, 0);</div><div class='hunk'>@@ -1188,7 +1244,7 @@ static u8 ath_get_rate_txpower(struct ath_softc *sc, struct ath_buf *bf,</div><div class='ctx'> 		if (!max_power &amp;&amp; !AR_SREV_9280_20_OR_LATER(ah))</div><div class='ctx'> 			max_power = 1;</div><div class='ctx'> 	} else if (!bf-&gt;bf_state.bfs_paprd) {</div><div class='del'>-		if (rateidx &lt; 8 &amp;&amp; (info-&gt;flags &amp; IEEE80211_TX_CTL_STBC))</div><div class='add'>+		if (use_stbc)</div><div class='ctx'> 			max_power = min_t(u8, ah-&gt;tx_power_stbc[rateidx],</div><div class='ctx'> 					  fi-&gt;tx_power);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1230,7 +1286,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf,</div><div class='ctx'> 		int phy;</div><div class='ctx'> </div><div class='ctx'> 		if (!rates[i].count || (rates[i].idx &lt; 0))</div><div class='del'>-			continue;</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> 		rix = rates[i].idx;</div><div class='ctx'> 		info-&gt;rates[i].Tries = rates[i].count;</div><div class='hunk'>@@ -1267,7 +1323,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf,</div><div class='ctx'> 			info-&gt;rates[i].Rate = rix | 0x80;</div><div class='ctx'> 			info-&gt;rates[i].ChSel = ath_txchainmask_reduction(sc,</div><div class='ctx'> 					ah-&gt;txchainmask, info-&gt;rates[i].Rate);</div><div class='del'>-			info-&gt;rates[i].PktDuration = ath_pkt_duration(sc, rix, len,</div><div class='add'>+			info-&gt;rates[i].PktDuration = ath_pkt_duration(rix, len,</div><div class='ctx'> 				 is_40, is_sgi, is_sp);</div><div class='ctx'> 			if (rix &lt; 8 &amp;&amp; (tx_info-&gt;flags &amp; IEEE80211_TX_CTL_STBC))</div><div class='ctx'> 				info-&gt;rates[i].RateFlags |= ATH9K_RATESERIES_STBC;</div><div class='hunk'>@@ -1278,7 +1334,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf,</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			info-&gt;txpower[i] = ath_get_rate_txpower(sc, bf, rix,</div><div class='del'>-								is_40, false);</div><div class='add'>+								is_40, false, true);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1309,7 +1365,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf,</div><div class='ctx'> </div><div class='ctx'> 		is_cck = IS_CCK_RATE(info-&gt;rates[i].Rate);</div><div class='ctx'> 		info-&gt;txpower[i] = ath_get_rate_txpower(sc, bf, rix, false,</div><div class='del'>-							is_cck);</div><div class='add'>+							is_cck, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* For AR5416 - RTS cannot be followed by a frame larger than 8K */</div><div class='hunk'>@@ -1533,10 +1589,10 @@ int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,</div><div class='ctx'> 	 * in HT IBSS when a beacon with HT-info is received after the station</div><div class='ctx'> 	 * has already been added.</div><div class='ctx'> 	 */</div><div class='del'>-	if (sta-&gt;ht_cap.ht_supported) {</div><div class='add'>+	if (sta-&gt;deflink.ht_cap.ht_supported) {</div><div class='ctx'> 		an-&gt;maxampdu = (1 &lt;&lt; (IEEE80211_HT_MAX_AMPDU_FACTOR +</div><div class='del'>-				      sta-&gt;ht_cap.ampdu_factor)) - 1;</div><div class='del'>-		density = ath9k_parse_mpdudensity(sta-&gt;ht_cap.ampdu_density);</div><div class='add'>+				      sta-&gt;deflink.ht_cap.ampdu_factor)) - 1;</div><div class='add'>+		density = ath9k_parse_mpdudensity(sta-&gt;deflink.ht_cap.ampdu_density);</div><div class='ctx'> 		an-&gt;mpdudensity = density;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1614,8 +1670,14 @@ static void</div><div class='ctx'> ath9k_set_moredata(struct ath_softc *sc, struct ath_buf *bf, bool val)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='del'>-	u16 mask = cpu_to_le16(IEEE80211_FCTL_MOREDATA);</div><div class='del'>-	u16 mask_val = mask * val;</div><div class='add'>+	__le16 mask, mask_val;</div><div class='add'>+</div><div class='add'>+	mask = cpu_to_le16(IEEE80211_FCTL_MOREDATA);</div><div class='add'>+</div><div class='add'>+	if (val)</div><div class='add'>+		mask_val = mask;</div><div class='add'>+	else</div><div class='add'>+		mask_val = 0;</div><div class='ctx'> </div><div class='ctx'> 	hdr = (struct ieee80211_hdr *) bf-&gt;bf_mpdu-&gt;data;</div><div class='ctx'> 	if ((hdr-&gt;frame_control &amp; mask) != mask_val) {</div><div class='hunk'>@@ -1637,7 +1699,6 @@ void ath9k_release_buffered_frames(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct ieee80211_tx_info *info;</div><div class='ctx'> 	struct list_head bf_q;</div><div class='ctx'> 	struct ath_buf *bf_tail = NULL, *bf = NULL;</div><div class='del'>-	int sent = 0;</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;bf_q);</div><div class='hunk'>@@ -1666,7 +1727,6 @@ void ath9k_release_buffered_frames(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 			bf_tail = bf;</div><div class='ctx'> 			nframes--;</div><div class='del'>-			sent++;</div><div class='ctx'> 			TX_STAT_INC(sc, txq-&gt;axq_qnum, a_queued_hw);</div><div class='ctx'> </div><div class='ctx'> 			if (an-&gt;sta &amp;&amp; skb_queue_empty(&amp;tid-&gt;retry_q))</div><div class='hunk'>@@ -2058,7 +2118,7 @@ static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 	bf-&gt;bf_state.bf_type = 0;</div><div class='ctx'> 	if (tid &amp;&amp; (tx_info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU)) {</div><div class='ctx'> 		bf-&gt;bf_state.bf_type = BUF_AMPDU;</div><div class='del'>-		ath_tx_addto_baw(sc, tid, bf);</div><div class='add'>+		ath_tx_addto_baw(tid, bf);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bf-&gt;bf_next = NULL;</div><div class='hunk'>@@ -2119,7 +2179,7 @@ static void setup_frame_info(struct ieee80211_hw *hw,</div><div class='ctx'> 		fi-&gt;keyix = an-&gt;ps_key;</div><div class='ctx'> 	else</div><div class='ctx'> 		fi-&gt;keyix = ATH9K_TXKEYIX_INVALID;</div><div class='del'>-	fi-&gt;dyn_smps = sta &amp;&amp; sta-&gt;smps_mode == IEEE80211_SMPS_DYNAMIC;</div><div class='add'>+	fi-&gt;dyn_smps = sta &amp;&amp; sta-&gt;deflink.smps_mode == IEEE80211_SMPS_DYNAMIC;</div><div class='ctx'> 	fi-&gt;keytype = keytype;</div><div class='ctx'> 	fi-&gt;framelen = framelen;</div><div class='ctx'> 	fi-&gt;tx_power = txpower;</div><div class='hunk'>@@ -2231,19 +2291,10 @@ static int ath_tx_prepare(struct ieee80211_hw *hw, struct sk_buff *skb,</div><div class='ctx'> 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='ctx'> 	struct ieee80211_sta *sta = txctl-&gt;sta;</div><div class='ctx'> 	struct ieee80211_vif *vif = info-&gt;control.vif;</div><div class='del'>-	struct ath_vif *avp;</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='ctx'> 	int frmlen = skb-&gt;len + FCS_LEN;</div><div class='ctx'> 	int padpos, padsize;</div><div class='ctx'> </div><div class='del'>-	/* NOTE:  sta can be NULL according to net/mac80211.h */</div><div class='del'>-	if (sta)</div><div class='del'>-		txctl-&gt;an = (struct ath_node *)sta-&gt;drv_priv;</div><div class='del'>-	else if (vif &amp;&amp; ieee80211_is_data(hdr-&gt;frame_control)) {</div><div class='del'>-		avp = (void *)vif-&gt;drv_priv;</div><div class='del'>-		txctl-&gt;an = &amp;avp-&gt;mcast_node;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (info-&gt;control.hw_key)</div><div class='ctx'> 		frmlen += info-&gt;control.hw_key-&gt;icv_len;</div><div class='ctx'> </div><div class='hunk'>@@ -2304,7 +2355,7 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	if (txctl-&gt;sta) {</div><div class='ctx'> 		an = (struct ath_node *) sta-&gt;drv_priv;</div><div class='del'>-		tid = ath_get_skb_tid(sc, an, skb);</div><div class='add'>+		tid = ath_get_skb_tid(an, skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath_txq_lock(sc, txq);</div><div class='hunk'>@@ -2315,7 +2366,7 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	bf = ath_tx_setup_buffer(sc, txq, tid, skb);</div><div class='ctx'> 	if (!bf) {</div><div class='del'>-		ath_txq_skb_done(sc, txq, skb);</div><div class='add'>+		ath_txq_skb_done(sc, skb);</div><div class='ctx'> 		if (txctl-&gt;paprd)</div><div class='ctx'> 			dev_kfree_skb_any(skb);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -2450,7 +2501,7 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;sc-&gt;sc_pm_lock, flags);</div><div class='ctx'> </div><div class='del'>-	ath_txq_skb_done(sc, txq, skb);</div><div class='add'>+	ath_txq_skb_done(sc, skb);</div><div class='ctx'> 	tx_info-&gt;status.status_driver_data[0] = sta;</div><div class='ctx'> 	__skb_queue_tail(&amp;txq-&gt;complete_q, skb);</div><div class='ctx'> }</div><div class='hunk'>@@ -2501,6 +2552,16 @@ skip_tx_complete:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;sc-&gt;tx.txbuflock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ath_clear_tx_status(struct ieee80211_tx_info *tx_info)</div><div class='add'>+{</div><div class='add'>+	void *ptr = &amp;tx_info-&gt;status;</div><div class='add'>+</div><div class='add'>+	memset(ptr + sizeof(tx_info-&gt;status.rates), 0,</div><div class='add'>+	       sizeof(tx_info-&gt;status) -</div><div class='add'>+	       sizeof(tx_info-&gt;status.rates) -</div><div class='add'>+	       sizeof(tx_info-&gt;status.status_driver_data));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath_tx_rc_status(struct ath_softc *sc, struct ath_buf *bf,</div><div class='ctx'> 			     struct ath_tx_status *ts, int nframes, int nbad,</div><div class='ctx'> 			     int txok)</div><div class='hunk'>@@ -2512,6 +2573,8 @@ static void ath_tx_rc_status(struct ath_softc *sc, struct ath_buf *bf,</div><div class='ctx'> 	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='ctx'> 	u8 i, tx_rateindex;</div><div class='ctx'> </div><div class='add'>+	ath_clear_tx_status(tx_info);</div><div class='add'>+</div><div class='ctx'> 	if (txok)</div><div class='ctx'> 		tx_info-&gt;status.ack_signal = ts-&gt;ts_rssi;</div><div class='ctx'> </div><div class='hunk'>@@ -2526,6 +2589,13 @@ static void ath_tx_rc_status(struct ath_softc *sc, struct ath_buf *bf,</div><div class='ctx'> 	tx_info-&gt;status.ampdu_len = nframes;</div><div class='ctx'> 	tx_info-&gt;status.ampdu_ack_len = nframes - nbad;</div><div class='ctx'> </div><div class='add'>+	tx_info-&gt;status.rates[tx_rateindex].count = ts-&gt;ts_longretry + 1;</div><div class='add'>+</div><div class='add'>+	for (i = tx_rateindex + 1; i &lt; hw-&gt;max_rates; i++) {</div><div class='add'>+		tx_info-&gt;status.rates[i].count = 0;</div><div class='add'>+		tx_info-&gt;status.rates[i].idx = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if ((ts-&gt;ts_status &amp; ATH9K_TXERR_FILT) == 0 &amp;&amp;</div><div class='ctx'> 	    (tx_info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK) == 0) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -2547,16 +2617,6 @@ static void ath_tx_rc_status(struct ath_softc *sc, struct ath_buf *bf,</div><div class='ctx'> 			tx_info-&gt;status.rates[tx_rateindex].count =</div><div class='ctx'> 				hw-&gt;max_rate_tries;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	for (i = tx_rateindex + 1; i &lt; hw-&gt;max_rates; i++) {</div><div class='del'>-		tx_info-&gt;status.rates[i].count = 0;</div><div class='del'>-		tx_info-&gt;status.rates[i].idx = -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tx_info-&gt;status.rates[tx_rateindex].count = ts-&gt;ts_longretry + 1;</div><div class='del'>-</div><div class='del'>-	/* we report airtime in ath_tx_count_airtime(), don't report twice */</div><div class='del'>-	tx_info-&gt;status.tx_time = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)</div><div class='head'>diff --git a/drivers/net/wireless/ath/carl9170/Kconfig b/drivers/net/wireless/ath/carl9170/Kconfig<br/>index b2d760873992..ba9bea79381c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/carl9170/Kconfig</a></div><div class='hunk'>@@ -16,13 +16,11 @@ config CARL9170</div><div class='ctx'> </div><div class='ctx'> config CARL9170_LEDS</div><div class='ctx'> 	bool "SoftLED Support"</div><div class='del'>-	depends on CARL9170</div><div class='del'>-	select MAC80211_LEDS</div><div class='del'>-	select LEDS_CLASS</div><div class='del'>-	select NEW_LEDS</div><div class='ctx'> 	default y</div><div class='add'>+	depends on CARL9170</div><div class='add'>+	depends on MAC80211_LEDS</div><div class='ctx'> 	help</div><div class='del'>-	  This option is necessary, if you want your device' LEDs to blink</div><div class='add'>+	  This option is necessary, if you want your device's LEDs to blink.</div><div class='ctx'> </div><div class='ctx'> 	  Say Y, unless you need the LEDs for firmware debugging.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/carl9170/carl9170.h b/drivers/net/wireless/ath/carl9170/carl9170.h<br/>index 84a8ce0784b1..ba29b4aebe9f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/carl9170.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/carl9170.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/carl9170.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/carl9170/carl9170.h</a></div><div class='hunk'>@@ -458,7 +458,6 @@ struct ar9170 {</div><div class='ctx'> # define CARL9170_HWRNG_CACHE_SIZE	CARL9170_MAX_CMD_PAYLOAD_LEN</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct hwrng rng;</div><div class='del'>-		bool initialized;</div><div class='ctx'> 		char name[30 + 1];</div><div class='ctx'> 		u16 cache[CARL9170_HWRNG_CACHE_SIZE / sizeof(u16)];</div><div class='ctx'> 		unsigned int cache_idx;</div><div class='head'>diff --git a/drivers/net/wireless/ath/carl9170/cmd.c b/drivers/net/wireless/ath/carl9170/cmd.c<br/>index f2b4f537e4c1..b8ed193c0195 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/cmd.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/cmd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/cmd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/carl9170/cmd.c</a></div><div class='hunk'>@@ -120,7 +120,7 @@ struct carl9170_cmd *carl9170_cmd_buf(struct ar9170 *ar,</div><div class='ctx'> {</div><div class='ctx'> 	struct carl9170_cmd *tmp;</div><div class='ctx'> </div><div class='del'>-	tmp = kzalloc(sizeof(struct carl9170_cmd_head) + len, GFP_ATOMIC);</div><div class='add'>+	tmp = kzalloc(sizeof(*tmp), GFP_ATOMIC);</div><div class='ctx'> 	if (tmp) {</div><div class='ctx'> 		tmp-&gt;hdr.cmd = cmd;</div><div class='ctx'> 		tmp-&gt;hdr.len = len;</div><div class='head'>diff --git a/drivers/net/wireless/ath/carl9170/debug.c b/drivers/net/wireless/ath/carl9170/debug.c<br/>index bb40889d7c72..2d734567000a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/debug.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/debug.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/debug.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/carl9170/debug.c</a></div><div class='hunk'>@@ -54,7 +54,6 @@ struct carl9170_debugfs_fops {</div><div class='ctx'> 	char *(*read)(struct ar9170 *ar, char *buf, size_t bufsize,</div><div class='ctx'> 		      ssize_t *len);</div><div class='ctx'> 	ssize_t (*write)(struct ar9170 *aru, const char *buf, size_t size);</div><div class='del'>-	const struct file_operations fops;</div><div class='ctx'> </div><div class='ctx'> 	enum carl9170_device_state req_dev_state;</div><div class='ctx'> };</div><div class='hunk'>@@ -62,7 +61,7 @@ struct carl9170_debugfs_fops {</div><div class='ctx'> static ssize_t carl9170_debugfs_read(struct file *file, char __user *userbuf,</div><div class='ctx'> 				     size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	struct carl9170_debugfs_fops *dfops;</div><div class='add'>+	const struct carl9170_debugfs_fops *dfops;</div><div class='ctx'> 	struct ar9170 *ar;</div><div class='ctx'> 	char *buf = NULL, *res_buf = NULL;</div><div class='ctx'> 	ssize_t ret = 0;</div><div class='hunk'>@@ -75,8 +74,7 @@ static ssize_t carl9170_debugfs_read(struct file *file, char __user *userbuf,</div><div class='ctx'> </div><div class='ctx'> 	if (!ar)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	dfops = container_of(debugfs_real_fops(file),</div><div class='del'>-			     struct carl9170_debugfs_fops, fops);</div><div class='add'>+	dfops = debugfs_get_aux(file);</div><div class='ctx'> </div><div class='ctx'> 	if (!dfops-&gt;read)</div><div class='ctx'> 		return -ENOSYS;</div><div class='hunk'>@@ -113,7 +111,7 @@ out_free:</div><div class='ctx'> static ssize_t carl9170_debugfs_write(struct file *file,</div><div class='ctx'> 	const char __user *userbuf, size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	struct carl9170_debugfs_fops *dfops;</div><div class='add'>+	const struct carl9170_debugfs_fops *dfops;</div><div class='ctx'> 	struct ar9170 *ar;</div><div class='ctx'> 	char *buf = NULL;</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -128,8 +126,7 @@ static ssize_t carl9170_debugfs_write(struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	if (!ar)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	dfops = container_of(debugfs_real_fops(file),</div><div class='del'>-			     struct carl9170_debugfs_fops, fops);</div><div class='add'>+	dfops = debugfs_get_aux(file);</div><div class='ctx'> </div><div class='ctx'> 	if (!dfops-&gt;write)</div><div class='ctx'> 		return -ENOSYS;</div><div class='hunk'>@@ -165,6 +162,11 @@ out_free:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct debugfs_short_fops debugfs_fops = {</div><div class='add'>+	.read	= carl9170_debugfs_read,</div><div class='add'>+	.write	= carl9170_debugfs_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define __DEBUGFS_DECLARE_FILE(name, _read, _write, _read_bufsize,	\</div><div class='ctx'> 			       _attr, _dstate)				\</div><div class='ctx'> static const struct carl9170_debugfs_fops carl_debugfs_##name ##_ops = {\</div><div class='hunk'>@@ -173,12 +175,6 @@ static const struct carl9170_debugfs_fops carl_debugfs_##name ##_ops = {\</div><div class='ctx'> 	.write = _write,						\</div><div class='ctx'> 	.attr = _attr,							\</div><div class='ctx'> 	.req_dev_state = _dstate,					\</div><div class='del'>-	.fops = {							\</div><div class='del'>-		.open	= simple_open,					\</div><div class='del'>-		.read	= carl9170_debugfs_read,			\</div><div class='del'>-		.write	= carl9170_debugfs_write,			\</div><div class='del'>-		.owner	= THIS_MODULE					\</div><div class='del'>-	},								\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define DEBUGFS_DECLARE_FILE(name, _read, _write, _read_bufsize, _attr)	\</div><div class='hunk'>@@ -816,9 +812,9 @@ void carl9170_debugfs_register(struct ar9170 *ar)</div><div class='ctx'> 		ar-&gt;hw-&gt;wiphy-&gt;debugfsdir);</div><div class='ctx'> </div><div class='ctx'> #define DEBUGFS_ADD(name)						\</div><div class='del'>-	debugfs_create_file(#name, carl_debugfs_##name ##_ops.attr,	\</div><div class='del'>-			    ar-&gt;debug_dir, ar,				\</div><div class='del'>-			    &amp;carl_debugfs_##name ## _ops.fops)</div><div class='add'>+	debugfs_create_file_aux(#name, carl_debugfs_##name ##_ops.attr,	\</div><div class='add'>+			    ar-&gt;debug_dir, ar, &amp;carl_debugfs_##name ## _ops, \</div><div class='add'>+			    &amp;debugfs_fops)</div><div class='ctx'> </div><div class='ctx'> 	DEBUGFS_ADD(usb_tx_anch_urbs);</div><div class='ctx'> 	DEBUGFS_ADD(usb_rx_pool_urbs);</div><div class='head'>diff --git a/drivers/net/wireless/ath/carl9170/fw.c b/drivers/net/wireless/ath/carl9170/fw.c<br/>index 1ab09e1c9ec5..419f5530f885 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/fw.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/fw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/fw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/carl9170/fw.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include "fwcmd.h"</div><div class='ctx'> #include "version.h"</div><div class='ctx'> </div><div class='del'>-static const u8 otus_magic[4] = { OTUS_MAGIC };</div><div class='add'>+static const u8 otus_magic[4] __nonstring = { OTUS_MAGIC };</div><div class='ctx'> </div><div class='ctx'> static const void *carl9170_fw_find_desc(struct ar9170 *ar, const u8 descid[4],</div><div class='ctx'> 	const unsigned int len, const u8 compatible_revision)</div><div class='hunk'>@@ -105,7 +105,7 @@ static void carl9170_fw_info(struct ar9170 *ar)</div><div class='ctx'> 			 CARL9170FW_GET_MONTH(fw_date),</div><div class='ctx'> 			 CARL9170FW_GET_DAY(fw_date));</div><div class='ctx'> </div><div class='del'>-		strlcpy(ar-&gt;hw-&gt;wiphy-&gt;fw_version, motd_desc-&gt;release,</div><div class='add'>+		strscpy(ar-&gt;hw-&gt;wiphy-&gt;fw_version, motd_desc-&gt;release,</div><div class='ctx'> 			sizeof(ar-&gt;hw-&gt;wiphy-&gt;fw_version));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/carl9170/fwcmd.h b/drivers/net/wireless/ath/carl9170/fwcmd.h<br/>index 4a500095555c..e5bcc364f088 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/fwcmd.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/fwcmd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/fwcmd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/carl9170/fwcmd.h</a></div><div class='hunk'>@@ -118,10 +118,10 @@ struct carl9170_reg_list {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct carl9170_write_reg {</div><div class='del'>-	struct {</div><div class='add'>+	DECLARE_FLEX_ARRAY(struct {</div><div class='ctx'> 		__le32		addr;</div><div class='ctx'> 		__le32		val;</div><div class='del'>-	} regs[0] __packed;</div><div class='add'>+	} __packed, regs);</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct carl9170_write_reg_byte {</div><div class='hunk'>@@ -320,9 +320,9 @@ struct carl9170_rsp {</div><div class='ctx'> 		struct carl9170_u32_list	rreg_res;</div><div class='ctx'> 		struct carl9170_u32_list	echo;</div><div class='ctx'> #ifdef __CARL9170FW__</div><div class='del'>-		struct carl9170_tx_status	tx_status[0];</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct carl9170_tx_status, tx_status);</div><div class='ctx'> #endif /* __CARL9170FW__ */</div><div class='del'>-		struct _carl9170_tx_status	_tx_status[0];</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct _carl9170_tx_status, _tx_status);</div><div class='ctx'> 		struct carl9170_gpio		gpio;</div><div class='ctx'> 		struct carl9170_tsf_rsp		tsf;</div><div class='ctx'> 		struct carl9170_psm		psm;</div><div class='head'>diff --git a/drivers/net/wireless/ath/carl9170/fwdesc.h b/drivers/net/wireless/ath/carl9170/fwdesc.h<br/>index 503b21abbba5..10acb6ad30d0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/fwdesc.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/fwdesc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/fwdesc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/carl9170/fwdesc.h</a></div><div class='hunk'>@@ -149,7 +149,7 @@ struct carl9170fw_fix_entry {</div><div class='ctx'> </div><div class='ctx'> struct carl9170fw_fix_desc {</div><div class='ctx'> 	struct carl9170fw_desc_head head;</div><div class='del'>-	struct carl9170fw_fix_entry data[0];</div><div class='add'>+	struct carl9170fw_fix_entry data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> #define CARL9170FW_FIX_DESC_SIZE			\</div><div class='ctx'> 	(sizeof(struct carl9170fw_fix_desc))</div><div class='head'>diff --git a/drivers/net/wireless/ath/carl9170/mac.c b/drivers/net/wireless/ath/carl9170/mac.c<br/>index 6cdbee5beb07..20ceed0dd4be 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/mac.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/mac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/carl9170/mac.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'>  *    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "carl9170.h"</div><div class='ctx'> #include "cmd.h"</div><div class='head'>diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c<br/>index cca3b086aa70..a7a9345f3483 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/carl9170/main.c</a></div><div class='hunk'>@@ -307,8 +307,7 @@ static void carl9170_zap_queues(struct ar9170 *ar)</div><div class='ctx'> 	for (i = 0; i &lt; ar-&gt;hw-&gt;queues; i++)</div><div class='ctx'> 		ar-&gt;tx_stats[i].limit = CARL9170_NUM_TX_LIMIT_HARD;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; DIV_ROUND_UP(ar-&gt;fw.mem_blocks, BITS_PER_LONG); i++)</div><div class='del'>-		ar-&gt;mem_bitmap[i] = 0;</div><div class='add'>+	bitmap_zero(ar-&gt;mem_bitmap, ar-&gt;fw.mem_blocks);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	list_for_each_entry_rcu(cvif, &amp;ar-&gt;vif_list, list) {</div><div class='hunk'>@@ -440,7 +439,7 @@ static void carl9170_cancel_worker(struct ar9170 *ar)</div><div class='ctx'> 	cancel_work_sync(&amp;ar-&gt;ampdu_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void carl9170_op_stop(struct ieee80211_hw *hw)</div><div class='add'>+static void carl9170_op_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct ar9170 *ar = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -891,7 +890,7 @@ static void carl9170_stat_work(struct work_struct *work)</div><div class='ctx'> 		round_jiffies(msecs_to_jiffies(CARL9170_STAT_WORK)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int carl9170_op_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+static int carl9170_op_config(struct ieee80211_hw *hw, int radio_idx, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct ar9170 *ar = hw-&gt;priv;</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -1033,7 +1032,7 @@ static void carl9170_op_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> static void carl9170_op_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 					 struct ieee80211_vif *vif,</div><div class='ctx'> 					 struct ieee80211_bss_conf *bss_conf,</div><div class='del'>-					 u32 changed)</div><div class='add'>+					 u64 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct ar9170 *ar = hw-&gt;priv;</div><div class='ctx'> 	struct ath_common *common = &amp;ar-&gt;common;</div><div class='hunk'>@@ -1116,7 +1115,7 @@ static void carl9170_op_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_ASSOC) {</div><div class='del'>-		ar-&gt;common.curaid = bss_conf-&gt;aid;</div><div class='add'>+		ar-&gt;common.curaid = vif-&gt;cfg.aid;</div><div class='ctx'> 		err = carl9170_set_beacon_timers(ar);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -1307,8 +1306,8 @@ static int carl9170_op_sta_add(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;sta_info-&gt;pending_frames, 0);</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;ht_cap.ht_supported) {</div><div class='del'>-		if (sta-&gt;ht_cap.ampdu_density &gt; 6) {</div><div class='add'>+	if (sta-&gt;deflink.ht_cap.ht_supported) {</div><div class='add'>+		if (sta-&gt;deflink.ht_cap.ampdu_density &gt; 6) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * HW does support 16us AMPDU density.</div><div class='ctx'> 			 * No HT-Xmit for station.</div><div class='hunk'>@@ -1320,7 +1319,7 @@ static int carl9170_op_sta_add(struct ieee80211_hw *hw,</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(sta_info-&gt;agg); i++)</div><div class='ctx'> 			RCU_INIT_POINTER(sta_info-&gt;agg[i], NULL);</div><div class='ctx'> </div><div class='del'>-		sta_info-&gt;ampdu_max_len = 1 &lt;&lt; (3 + sta-&gt;ht_cap.ampdu_factor);</div><div class='add'>+		sta_info-&gt;ampdu_max_len = 1 &lt;&lt; (3 + sta-&gt;deflink.ht_cap.ampdu_factor);</div><div class='ctx'> 		sta_info-&gt;ht_sta = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1336,7 +1335,7 @@ static int carl9170_op_sta_remove(struct ieee80211_hw *hw,</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	bool cleanup = false;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;ht_cap.ht_supported) {</div><div class='add'>+	if (sta-&gt;deflink.ht_cap.ht_supported) {</div><div class='ctx'> </div><div class='ctx'> 		sta_info-&gt;ht_sta = false;</div><div class='ctx'> </div><div class='hunk'>@@ -1366,7 +1365,8 @@ static int carl9170_op_sta_remove(struct ieee80211_hw *hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int carl9170_op_conf_tx(struct ieee80211_hw *hw,</div><div class='del'>-			       struct ieee80211_vif *vif, u16 queue,</div><div class='add'>+			       struct ieee80211_vif *vif,</div><div class='add'>+			       unsigned int link_id, u16 queue,</div><div class='ctx'> 			       const struct ieee80211_tx_queue_params *param)</div><div class='ctx'> {</div><div class='ctx'> 	struct ar9170 *ar = hw-&gt;priv;</div><div class='hunk'>@@ -1413,7 +1413,7 @@ static int carl9170_op_ampdu_action(struct ieee80211_hw *hw,</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 		tid_info = kzalloc(sizeof(struct carl9170_sta_tid),</div><div class='del'>-				   GFP_ATOMIC);</div><div class='add'>+				   GFP_KERNEL);</div><div class='ctx'> 		if (!tid_info)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1495,7 +1495,7 @@ static int carl9170_register_wps_button(struct ar9170 *ar)</div><div class='ctx'> 	if (!(ar-&gt;features &amp; CARL9170_WPS_BUTTON))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	input = input_allocate_device();</div><div class='add'>+	input = devm_input_allocate_device(&amp;ar-&gt;udev-&gt;dev);</div><div class='ctx'> 	if (!input)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1513,10 +1513,8 @@ static int carl9170_register_wps_button(struct ar9170 *ar)</div><div class='ctx'> 	input_set_capability(input, EV_KEY, KEY_WPS_BUTTON);</div><div class='ctx'> </div><div class='ctx'> 	err = input_register_device(input);</div><div class='del'>-	if (err) {</div><div class='del'>-		input_free_device(input);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;wps.pbc = input;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1540,7 +1538,7 @@ static int carl9170_rng_get(struct ar9170 *ar)</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(RB &gt; CARL9170_MAX_CMD_PAYLOAD_LEN);</div><div class='ctx'> </div><div class='del'>-	if (!IS_ACCEPTING_CMD(ar) || !ar-&gt;rng.initialized)</div><div class='add'>+	if (!IS_ACCEPTING_CMD(ar))</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 	count = ARRAY_SIZE(ar-&gt;rng.cache);</div><div class='hunk'>@@ -1586,14 +1584,6 @@ static int carl9170_rng_read(struct hwrng *rng, u32 *data)</div><div class='ctx'> 	return sizeof(u16);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void carl9170_unregister_hwrng(struct ar9170 *ar)</div><div class='del'>-{</div><div class='del'>-	if (ar-&gt;rng.initialized) {</div><div class='del'>-		hwrng_unregister(&amp;ar-&gt;rng.rng);</div><div class='del'>-		ar-&gt;rng.initialized = false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int carl9170_register_hwrng(struct ar9170 *ar)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1604,25 +1594,14 @@ static int carl9170_register_hwrng(struct ar9170 *ar)</div><div class='ctx'> 	ar-&gt;rng.rng.data_read = carl9170_rng_read;</div><div class='ctx'> 	ar-&gt;rng.rng.priv = (unsigned long)ar;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(ar-&gt;rng.initialized))</div><div class='del'>-		return -EALREADY;</div><div class='del'>-</div><div class='del'>-	err = hwrng_register(&amp;ar-&gt;rng.rng);</div><div class='add'>+	err = devm_hwrng_register(&amp;ar-&gt;udev-&gt;dev, &amp;ar-&gt;rng.rng);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(&amp;ar-&gt;udev-&gt;dev, "Failed to register the random "</div><div class='ctx'> 			"number generator (%d)\n", err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ar-&gt;rng.initialized = true;</div><div class='del'>-</div><div class='del'>-	err = carl9170_rng_get(ar);</div><div class='del'>-	if (err) {</div><div class='del'>-		carl9170_unregister_hwrng(ar);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return carl9170_rng_get(ar);</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_CARL9170_HWRNG */</div><div class='ctx'> </div><div class='hunk'>@@ -1733,9 +1712,14 @@ static bool carl9170_tx_frames_pending(struct ieee80211_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ieee80211_ops carl9170_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.start			= carl9170_op_start,</div><div class='ctx'> 	.stop			= carl9170_op_stop,</div><div class='ctx'> 	.tx			= carl9170_op_tx,</div><div class='add'>+	.wake_tx_queue		= ieee80211_handle_wake_tx_queue,</div><div class='ctx'> 	.flush			= carl9170_op_flush,</div><div class='ctx'> 	.add_interface		= carl9170_op_add_interface,</div><div class='ctx'> 	.remove_interface	= carl9170_op_remove_interface,</div><div class='hunk'>@@ -1915,7 +1899,7 @@ static int carl9170_parse_eeprom(struct ar9170 *ar)</div><div class='ctx'> 		WARN_ON(!(tx_streams &gt;= 1 &amp;&amp; tx_streams &lt;=</div><div class='ctx'> 			IEEE80211_HT_MCS_TX_MAX_STREAMS));</div><div class='ctx'> </div><div class='del'>-		tx_params = (tx_streams - 1) &lt;&lt;</div><div class='add'>+		tx_params |= (tx_streams - 1) &lt;&lt;</div><div class='ctx'> 			    IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 		carl9170_band_2GHz.ht_cap.mcs.tx_params |= tx_params;</div><div class='hunk'>@@ -1938,7 +1922,8 @@ static int carl9170_parse_eeprom(struct ar9170 *ar)</div><div class='ctx'> 	if (!bands)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ar-&gt;survey = kcalloc(chans, sizeof(struct survey_info), GFP_KERNEL);</div><div class='add'>+	ar-&gt;survey = devm_kcalloc(&amp;ar-&gt;udev-&gt;dev, chans,</div><div class='add'>+				  sizeof(struct survey_info), GFP_KERNEL);</div><div class='ctx'> 	if (!ar-&gt;survey)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	ar-&gt;num_channels = chans;</div><div class='hunk'>@@ -1965,13 +1950,7 @@ int carl9170_register(struct ar9170 *ar)</div><div class='ctx'> 	struct ath_regulatory *regulatory = &amp;ar-&gt;common.regulatory;</div><div class='ctx'> 	int err = 0, i;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(ar-&gt;mem_bitmap))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ar-&gt;mem_bitmap = kcalloc(roundup(ar-&gt;fw.mem_blocks, BITS_PER_LONG),</div><div class='del'>-				 sizeof(unsigned long),</div><div class='del'>-				 GFP_KERNEL);</div><div class='del'>-</div><div class='add'>+	ar-&gt;mem_bitmap = devm_bitmap_zalloc(&amp;ar-&gt;udev-&gt;dev, ar-&gt;fw.mem_blocks, GFP_KERNEL);</div><div class='ctx'> 	if (!ar-&gt;mem_bitmap)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -2060,17 +2039,6 @@ void carl9170_unregister(struct ar9170 *ar)</div><div class='ctx'> 	carl9170_debugfs_unregister(ar);</div><div class='ctx'> #endif /* CONFIG_CARL9170_DEBUGFS */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CARL9170_WPC</div><div class='del'>-	if (ar-&gt;wps.pbc) {</div><div class='del'>-		input_unregister_device(ar-&gt;wps.pbc);</div><div class='del'>-		ar-&gt;wps.pbc = NULL;</div><div class='del'>-	}</div><div class='del'>-#endif /* CONFIG_CARL9170_WPC */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CARL9170_HWRNG</div><div class='del'>-	carl9170_unregister_hwrng(ar);</div><div class='del'>-#endif /* CONFIG_CARL9170_HWRNG */</div><div class='del'>-</div><div class='ctx'> 	carl9170_cancel_worker(ar);</div><div class='ctx'> 	cancel_work_sync(&amp;ar-&gt;restart_work);</div><div class='ctx'> </div><div class='hunk'>@@ -2085,12 +2053,6 @@ void carl9170_free(struct ar9170 *ar)</div><div class='ctx'> 	kfree_skb(ar-&gt;rx_failover);</div><div class='ctx'> 	ar-&gt;rx_failover = NULL;</div><div class='ctx'> </div><div class='del'>-	kfree(ar-&gt;mem_bitmap);</div><div class='del'>-	ar-&gt;mem_bitmap = NULL;</div><div class='del'>-</div><div class='del'>-	kfree(ar-&gt;survey);</div><div class='del'>-	ar-&gt;survey = NULL;</div><div class='del'>-</div><div class='ctx'> 	mutex_destroy(&amp;ar-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_free_hw(ar-&gt;hw);</div><div class='head'>diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c<br/>index 908c4c8b7f82..6833430130f4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/rx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/rx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/rx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/carl9170/rx.c</a></div><div class='hunk'>@@ -555,7 +555,7 @@ static void carl9170_ps_beacon(struct ar9170 *ar, void *data, unsigned int len)</div><div class='ctx'> 	/* Check whenever the PHY can be turned off again. */</div><div class='ctx'> </div><div class='ctx'> 	/* 1. What about buffered unicast traffic for our AID? */</div><div class='del'>-	cam = ieee80211_check_tim(tim_ie, tim_len, ar-&gt;common.curaid);</div><div class='add'>+	cam = ieee80211_check_tim(tim_ie, tim_len, ar-&gt;common.curaid, false);</div><div class='ctx'> </div><div class='ctx'> 	/* 2. Maybe the AP wants to send multicast/broadcast data? */</div><div class='ctx'> 	cam |= !!(tim_ie-&gt;bitmap_ctrl &amp; 0x01);</div><div class='head'>diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c<br/>index 88444fe6d1c6..b7717f9e1e9b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/tx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/tx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/tx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/carl9170/tx.c</a></div><div class='hunk'>@@ -189,7 +189,7 @@ static void carl9170_tx_accounting_free(struct ar9170 *ar, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> static int carl9170_alloc_dev_space(struct ar9170 *ar, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct _carl9170_tx_superframe *super = (void *) skb-&gt;data;</div><div class='add'>+	struct _carl9170_tx_superframe *super;</div><div class='ctx'> 	unsigned int chunks;</div><div class='ctx'> 	int cookie = -1;</div><div class='ctx'> </div><div class='hunk'>@@ -275,12 +275,13 @@ static void carl9170_tx_release(struct kref *ref)</div><div class='ctx'> 	if (WARN_ON_ONCE(!ar))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON(</div><div class='del'>-	    offsetof(struct ieee80211_tx_info, status.ack_signal) != 20);</div><div class='del'>-</div><div class='del'>-	memset(&amp;txinfo-&gt;status.ack_signal, 0,</div><div class='del'>-	       sizeof(struct ieee80211_tx_info) -</div><div class='del'>-	       offsetof(struct ieee80211_tx_info, status.ack_signal));</div><div class='add'>+	/*</div><div class='add'>+	 * This does not call ieee80211_tx_info_clear_status() because</div><div class='add'>+	 * carl9170_tx_fill_rateinfo() has filled the rate information</div><div class='add'>+	 * before we get to this point.</div><div class='add'>+	 */</div><div class='add'>+	memset(&amp;txinfo-&gt;pad, 0, sizeof(txinfo-&gt;pad));</div><div class='add'>+	memset(&amp;txinfo-&gt;rate_driver_data, 0, sizeof(txinfo-&gt;rate_driver_data));</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;ar-&gt;tx_total_queued))</div><div class='ctx'> 		ar-&gt;tx_schedule = true;</div><div class='hunk'>@@ -365,8 +366,7 @@ static void carl9170_tx_shift_bm(struct ar9170 *ar,</div><div class='ctx'> 	if (WARN_ON_ONCE(off &gt;= CARL9170_BAW_BITS))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!bitmap_empty(tid_info-&gt;bitmap, off))</div><div class='del'>-		off = find_first_bit(tid_info-&gt;bitmap, off);</div><div class='add'>+	off = min(off, find_first_bit(tid_info-&gt;bitmap, off));</div><div class='ctx'> </div><div class='ctx'> 	tid_info-&gt;bsn += off;</div><div class='ctx'> 	tid_info-&gt;bsn &amp;= 0x0fff;</div><div class='hunk'>@@ -1044,8 +1044,9 @@ static int carl9170_tx_prepare(struct ar9170 *ar,</div><div class='ctx'> 		if (unlikely(!sta || !cvif))</div><div class='ctx'> 			goto err_out;</div><div class='ctx'> </div><div class='del'>-		factor = min_t(unsigned int, 1u, sta-&gt;ht_cap.ampdu_factor);</div><div class='del'>-		density = sta-&gt;ht_cap.ampdu_density;</div><div class='add'>+		factor = min_t(unsigned int, 1u,</div><div class='add'>+			       sta-&gt;deflink.ht_cap.ampdu_factor);</div><div class='add'>+		density = sta-&gt;deflink.ht_cap.ampdu_density;</div><div class='ctx'> </div><div class='ctx'> 		if (density) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -1558,6 +1559,9 @@ static struct carl9170_vif_info *carl9170_pick_beaconing_vif(struct ar9170 *ar)</div><div class='ctx'> 					goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 		} while (ar-&gt;beacon_enabled &amp;&amp; i--);</div><div class='add'>+</div><div class='add'>+		/* no entry found in list */</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -1624,7 +1628,7 @@ int carl9170_update_beacon(struct ar9170 *ar, const bool submit)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	skb = ieee80211_beacon_get_tim(ar-&gt;hw, carl9170_get_vif(cvif),</div><div class='del'>-		NULL, NULL);</div><div class='add'>+				       NULL, NULL, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (!skb) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='head'>diff --git a/drivers/net/wireless/ath/carl9170/usb.c b/drivers/net/wireless/ath/carl9170/usb.c<br/>index e4eb666c6eea..564ca6a61985 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/usb.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/usb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/usb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/carl9170/usb.c</a></div><div class='hunk'>@@ -178,7 +178,7 @@ static void carl9170_usb_tx_data_complete(struct urb *urb)</div><div class='ctx'> 	switch (urb-&gt;status) {</div><div class='ctx'> 	/* everything is fine */</div><div class='ctx'> 	case 0:</div><div class='del'>-		carl9170_tx_callback(ar, (void *)urb-&gt;context);</div><div class='add'>+		carl9170_tx_callback(ar, urb-&gt;context);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	/* disconnect */</div><div class='hunk'>@@ -369,7 +369,7 @@ void carl9170_usb_handle_tx_err(struct ar9170 *ar)</div><div class='ctx'> 	struct urb *urb;</div><div class='ctx'> </div><div class='ctx'> 	while ((urb = usb_get_from_anchor(&amp;ar-&gt;tx_err))) {</div><div class='del'>-		struct sk_buff *skb = (void *)urb-&gt;context;</div><div class='add'>+		struct sk_buff *skb = urb-&gt;context;</div><div class='ctx'> </div><div class='ctx'> 		carl9170_tx_drop(ar, skb);</div><div class='ctx'> 		carl9170_tx_callback(ar, skb);</div><div class='hunk'>@@ -397,7 +397,7 @@ static void carl9170_usb_tasklet(struct tasklet_struct *t)</div><div class='ctx'> </div><div class='ctx'> static void carl9170_usb_rx_complete(struct urb *urb)</div><div class='ctx'> {</div><div class='del'>-	struct ar9170 *ar = (struct ar9170 *)urb-&gt;context;</div><div class='add'>+	struct ar9170 *ar = urb-&gt;context;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON_ONCE(!ar))</div><div class='hunk'>@@ -438,14 +438,21 @@ static void carl9170_usb_rx_complete(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 		if (atomic_read(&amp;ar-&gt;rx_anch_urbs) == 0) {</div><div class='ctx'> 			/*</div><div class='del'>-			 * The system is too slow to cope with</div><div class='del'>-			 * the enormous workload. We have simply</div><div class='del'>-			 * run out of active rx urbs and this</div><div class='del'>-			 * unfortunately leads to an unpredictable</div><div class='del'>-			 * device.</div><div class='add'>+			 * At this point, either the system is too slow to</div><div class='add'>+			 * cope with the enormous workload (so we have simply</div><div class='add'>+			 * run out of active rx urbs and this unfortunately</div><div class='add'>+			 * leads to an unpredictable device), or the device</div><div class='add'>+			 * is not fully functional after an unsuccessful</div><div class='add'>+			 * firmware loading attempts (so it doesn't pass</div><div class='add'>+			 * ieee80211_register_hw() and there is no internal</div><div class='add'>+			 * workqueue at all).</div><div class='ctx'> 			 */</div><div class='ctx'> </div><div class='del'>-			ieee80211_queue_work(ar-&gt;hw, &amp;ar-&gt;ping_work);</div><div class='add'>+			if (ar-&gt;registered)</div><div class='add'>+				ieee80211_queue_work(ar-&gt;hw, &amp;ar-&gt;ping_work);</div><div class='add'>+			else</div><div class='add'>+				pr_warn_once("device %s is not registered\n",</div><div class='add'>+					     dev_name(&amp;ar-&gt;udev-&gt;dev));</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -559,7 +566,7 @@ static int carl9170_usb_flush(struct ar9170 *ar)</div><div class='ctx'> 	int ret, err = 0;</div><div class='ctx'> </div><div class='ctx'> 	while ((urb = usb_get_from_anchor(&amp;ar-&gt;tx_wait))) {</div><div class='del'>-		struct sk_buff *skb = (void *)urb-&gt;context;</div><div class='add'>+		struct sk_buff *skb = urb-&gt;context;</div><div class='ctx'> 		carl9170_tx_drop(ar, skb);</div><div class='ctx'> 		carl9170_tx_callback(ar, skb);</div><div class='ctx'> 		usb_free_urb(urb);</div><div class='hunk'>@@ -668,7 +675,7 @@ int carl9170_exec_cmd(struct ar9170 *ar, const enum carl9170_cmd_oids cmd,</div><div class='ctx'> 		memcpy(ar-&gt;cmd.data, payload, plen);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ar-&gt;cmd_lock);</div><div class='del'>-	ar-&gt;readbuf = (u8 *)out;</div><div class='add'>+	ar-&gt;readbuf = out;</div><div class='ctx'> 	ar-&gt;readlen = outlen;</div><div class='ctx'> 	spin_unlock_bh(&amp;ar-&gt;cmd_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1069,6 +1076,38 @@ static int carl9170_usb_probe(struct usb_interface *intf,</div><div class='ctx'> 			ar-&gt;usb_ep_cmd_is_bulk = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Verify that all expected endpoints are present */</div><div class='add'>+	if (ar-&gt;usb_ep_cmd_is_bulk) {</div><div class='add'>+		u8 bulk_ep_addr[] = {</div><div class='add'>+			AR9170_USB_EP_RX | USB_DIR_IN,</div><div class='add'>+			AR9170_USB_EP_TX | USB_DIR_OUT,</div><div class='add'>+			AR9170_USB_EP_CMD | USB_DIR_OUT,</div><div class='add'>+			0};</div><div class='add'>+		u8 int_ep_addr[] = {</div><div class='add'>+			AR9170_USB_EP_IRQ | USB_DIR_IN,</div><div class='add'>+			0};</div><div class='add'>+		if (!usb_check_bulk_endpoints(intf, bulk_ep_addr) ||</div><div class='add'>+		    !usb_check_int_endpoints(intf, int_ep_addr))</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+	} else {</div><div class='add'>+		u8 bulk_ep_addr[] = {</div><div class='add'>+			AR9170_USB_EP_RX | USB_DIR_IN,</div><div class='add'>+			AR9170_USB_EP_TX | USB_DIR_OUT,</div><div class='add'>+			0};</div><div class='add'>+		u8 int_ep_addr[] = {</div><div class='add'>+			AR9170_USB_EP_IRQ | USB_DIR_IN,</div><div class='add'>+			AR9170_USB_EP_CMD | USB_DIR_OUT,</div><div class='add'>+			0};</div><div class='add'>+		if (!usb_check_bulk_endpoints(intf, bulk_ep_addr) ||</div><div class='add'>+		    !usb_check_int_endpoints(intf, int_ep_addr))</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		carl9170_free(ar);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	usb_set_intfdata(intf, ar);</div><div class='ctx'> 	SET_IEEE80211_DEV(ar-&gt;hw, &amp;intf-&gt;dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/carl9170/wlan.h b/drivers/net/wireless/ath/carl9170/wlan.h<br/>index bb73553fd7c2..ded2c6d0a759 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/wlan.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/carl9170/wlan.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/carl9170/wlan.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/carl9170/wlan.h</a></div><div class='hunk'>@@ -271,7 +271,7 @@ struct ar9170_tx_frame {</div><div class='ctx'> </div><div class='ctx'> 	union {</div><div class='ctx'> 		struct ieee80211_hdr i3e;</div><div class='del'>-		u8 payload[0];</div><div class='add'>+		DECLARE_FLEX_ARRAY(u8, payload);</div><div class='ctx'> 	} data;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -327,7 +327,7 @@ struct _carl9170_tx_superdesc {</div><div class='ctx'> struct _carl9170_tx_superframe {</div><div class='ctx'> 	struct _carl9170_tx_superdesc s;</div><div class='ctx'> 	struct _ar9170_tx_hwdesc f;</div><div class='del'>-	u8 frame_data[0];</div><div class='add'>+	u8 frame_data[];</div><div class='ctx'> } __packed __aligned(4);</div><div class='ctx'> </div><div class='ctx'> #define	CARL9170_TX_SUPERDESC_LEN		24</div><div class='head'>diff --git a/drivers/net/wireless/ath/dfs_pattern_detector.c b/drivers/net/wireless/ath/dfs_pattern_detector.c<br/>index 80390495ea25..700da9f4531e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/dfs_pattern_detector.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/dfs_pattern_detector.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/dfs_pattern_detector.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/dfs_pattern_detector.c</a></div><div class='hunk'>@@ -161,7 +161,7 @@ get_dfs_domain_radar_types(enum nl80211_dfs_regions region)</div><div class='ctx'> struct channel_detector {</div><div class='ctx'> 	struct list_head head;</div><div class='ctx'> 	u16 freq;</div><div class='del'>-	struct pri_detector **detectors;</div><div class='add'>+	struct pri_detector *detectors[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* channel_detector_reset() - reset detector lines for a given channel */</div><div class='hunk'>@@ -183,31 +183,28 @@ static void channel_detector_exit(struct dfs_pattern_detector *dpd,</div><div class='ctx'> 	if (cd == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> 	list_del(&amp;cd-&gt;head);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; dpd-&gt;num_radar_types; i++) {</div><div class='ctx'> 		struct pri_detector *de = cd-&gt;detectors[i];</div><div class='ctx'> 		if (de != NULL)</div><div class='ctx'> 			de-&gt;exit(de);</div><div class='ctx'> 	}</div><div class='del'>-	kfree(cd-&gt;detectors);</div><div class='add'>+</div><div class='ctx'> 	kfree(cd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct channel_detector *</div><div class='ctx'> channel_detector_create(struct dfs_pattern_detector *dpd, u16 freq)</div><div class='ctx'> {</div><div class='del'>-	u32 sz, i;</div><div class='add'>+	u32 i;</div><div class='ctx'> 	struct channel_detector *cd;</div><div class='ctx'> </div><div class='del'>-	cd = kmalloc(sizeof(*cd), GFP_ATOMIC);</div><div class='add'>+	cd = kzalloc(struct_size(cd, detectors, dpd-&gt;num_radar_types), GFP_ATOMIC);</div><div class='ctx'> 	if (cd == NULL)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;cd-&gt;head);</div><div class='ctx'> 	cd-&gt;freq = freq;</div><div class='del'>-	sz = sizeof(cd-&gt;detectors) * dpd-&gt;num_radar_types;</div><div class='del'>-	cd-&gt;detectors = kzalloc(sz, GFP_ATOMIC);</div><div class='del'>-	if (cd-&gt;detectors == NULL)</div><div class='del'>-		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; dpd-&gt;num_radar_types; i++) {</div><div class='ctx'> 		const struct radar_detector_specs *rs = &amp;dpd-&gt;radar_spec[i];</div><div class='head'>diff --git a/drivers/net/wireless/ath/hw.c b/drivers/net/wireless/ath/hw.c<br/>index eae9abf540a7..b301e6fbce6c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/hw.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/hw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/hw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/hw.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ath.h"</div><div class='ctx'> #include "reg.h"</div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #define REG_WRITE(_ah, _reg, _val)	(common-&gt;ops-&gt;write)(_ah, _val, _reg)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath_hw_set_bssid_mask - filter out bssids we listen</div><div class='add'>+ * ath_hw_setbssidmask - filter out bssids we listen</div><div class='ctx'>  *</div><div class='ctx'>  * @common: the ath_common struct for the device.</div><div class='ctx'>  *</div><div class='hunk'>@@ -48,7 +48,7 @@</div><div class='ctx'>  * the MAC address to obtain the relevant bits and compare the result with</div><div class='ctx'>  * (frame's BSSID &amp; mask) to see if they match.</div><div class='ctx'>  *</div><div class='del'>- * Simple example: on your card you have have two BSSes you have created with</div><div class='add'>+ * Simple example: on your card you have two BSSes you have created with</div><div class='ctx'>  * BSSID-01 and BSSID-02. Lets assume BSSID-01 will not use the MAC address.</div><div class='ctx'>  * There is another BSSID-03 but you are not part of it. For simplicity's sake,</div><div class='ctx'>  * assuming only 4 bits for a mac address and for BSSIDs you can then have:</div><div class='head'>diff --git a/drivers/net/wireless/ath/key.c b/drivers/net/wireless/ath/key.c<br/>index 61b59a804e30..0ae436bd9b66 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/key.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/key.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/key.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/key.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ath.h"</div><div class='hunk'>@@ -104,7 +104,7 @@ bool ath_hw_keysetmac(struct ath_common *common, u16 entry, const u8 *mac)</div><div class='ctx'> 		 * Not setting this bit allows the hardware to use the key</div><div class='ctx'> 		 * for multicast frame decryption.</div><div class='ctx'> 		 */</div><div class='del'>-		if (mac[0] &amp; 0x01)</div><div class='add'>+		if (is_multicast_ether_addr(mac))</div><div class='ctx'> 			unicast_flag = 0;</div><div class='ctx'> </div><div class='ctx'> 		macLo = get_unaligned_le32(mac);</div><div class='hunk'>@@ -503,7 +503,7 @@ int ath_key_config(struct ath_common *common,</div><div class='ctx'> </div><div class='ctx'> 	hk.kv_len = key-&gt;keylen;</div><div class='ctx'> 	if (key-&gt;keylen)</div><div class='del'>-		memcpy(hk.kv_val, key-&gt;key, key-&gt;keylen);</div><div class='add'>+		memcpy(&amp;hk.kv_values, key-&gt;key, key-&gt;keylen);</div><div class='ctx'> </div><div class='ctx'> 	if (!(key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE)) {</div><div class='ctx'> 		switch (vif-&gt;type) {</div><div class='head'>diff --git a/drivers/net/wireless/ath/main.c b/drivers/net/wireless/ath/main.c<br/>index 89f4b0513946..d79d73738a81 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/main.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c<br/>index b2400e2417a5..f15e7bd690b5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/regd.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/regd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/regd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/regd.c</a></div><div class='hunk'>@@ -667,14 +667,14 @@ ath_regd_init_wiphy(struct ath_regulatory *reg,</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Some users have reported their EEPROM programmed with</div><div class='del'>- * 0x8000 or 0x0 set, this is not a supported regulatory</div><div class='del'>- * domain but since we have more than one user with it we</div><div class='del'>- * need a solution for them. We default to 0x64, which is</div><div class='del'>- * the default Atheros world regulatory domain.</div><div class='add'>+ * 0x8000 set, this is not a supported regulatory domain</div><div class='add'>+ * but since we have more than one user with it we need</div><div class='add'>+ * a solution for them. We default to 0x64, which is the</div><div class='add'>+ * default Atheros world regulatory domain.</div><div class='ctx'>  */</div><div class='ctx'> static void ath_regd_sanitize(struct ath_regulatory *reg)</div><div class='ctx'> {</div><div class='del'>-	if (reg-&gt;current_rd != COUNTRY_ERD_FLAG &amp;&amp; reg-&gt;current_rd != 0)</div><div class='add'>+	if (reg-&gt;current_rd != COUNTRY_ERD_FLAG)</div><div class='ctx'> 		return;</div><div class='ctx'> 	printk(KERN_DEBUG "ath: EEPROM regdomain sanitized\n");</div><div class='ctx'> 	reg-&gt;current_rd = 0x64;</div><div class='head'>diff --git a/drivers/net/wireless/ath/regd.h b/drivers/net/wireless/ath/regd.h<br/>index 8d5a16b558e6..774419c7f442 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/regd.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/regd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/regd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/regd.h</a></div><div class='hunk'>@@ -126,6 +126,7 @@ enum CountryCode {</div><div class='ctx'> 	CTRY_KOREA_ROC = 410,</div><div class='ctx'> 	CTRY_KOREA_ROC2 = 411,</div><div class='ctx'> 	CTRY_KOREA_ROC3 = 412,</div><div class='add'>+	CTRY_KOREA_ROC4 = 413,</div><div class='ctx'> 	CTRY_KUWAIT = 414,</div><div class='ctx'> 	CTRY_LATVIA = 428,</div><div class='ctx'> 	CTRY_LEBANON = 422,</div><div class='head'>diff --git a/drivers/net/wireless/ath/regd_common.h b/drivers/net/wireless/ath/regd_common.h<br/>index c4bd26e65949..cdb1e9a23734 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/regd_common.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/regd_common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/regd_common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/regd_common.h</a></div><div class='hunk'>@@ -76,6 +76,7 @@ enum EnumRd {</div><div class='ctx'> 	APL7_FCCA = 0x5C,</div><div class='ctx'> 	APL8_WORLD = 0x5D,</div><div class='ctx'> 	APL9_WORLD = 0x5E,</div><div class='add'>+	APL10_WORLD = 0x5F,</div><div class='ctx'> </div><div class='ctx'> 	WOR0_WORLD = 0x60,</div><div class='ctx'> 	WOR1_WORLD = 0x61,</div><div class='hunk'>@@ -204,6 +205,7 @@ static struct reg_dmn_pair_mapping regDomainPairs[] = {</div><div class='ctx'> 	{APL6_WORLD, CTL_ETSI, CTL_ETSI},</div><div class='ctx'> 	{APL8_WORLD, CTL_ETSI, CTL_ETSI},</div><div class='ctx'> 	{APL9_WORLD, CTL_ETSI, CTL_ETSI},</div><div class='add'>+	{APL10_WORLD, CTL_ETSI, CTL_ETSI},</div><div class='ctx'> </div><div class='ctx'> 	{APL3_FCCA, CTL_FCC, CTL_FCC},</div><div class='ctx'> 	{APL7_FCCA, CTL_FCC, CTL_FCC},</div><div class='hunk'>@@ -426,6 +428,7 @@ static struct country_code_to_enum_rd allCountries[] = {</div><div class='ctx'> 	{CTRY_KOREA_ROC, APL9_WORLD, "KR"},</div><div class='ctx'> 	{CTRY_KOREA_ROC2, APL2_WORLD, "K2"},</div><div class='ctx'> 	{CTRY_KOREA_ROC3, APL9_WORLD, "K3"},</div><div class='add'>+	{CTRY_KOREA_ROC4, APL10_WORLD, "K4"},</div><div class='ctx'> 	{CTRY_KUWAIT, ETSI3_WORLD, "KW"},</div><div class='ctx'> 	{CTRY_LATVIA, ETSI1_WORLD, "LV"},</div><div class='ctx'> 	{CTRY_LEBANON, NULL1_WORLD, "LB"},</div><div class='head'>diff --git a/drivers/net/wireless/ath/spectral_common.h b/drivers/net/wireless/ath/spectral_common.h<br/>index 9c2e5458e425..fe187c1fbeb0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/spectral_common.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/spectral_common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/spectral_common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/spectral_common.h</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  * could be acquired so far.</div><div class='ctx'>  */</div><div class='ctx'> #define SPECTRAL_ATH10K_MAX_NUM_BINS		256</div><div class='del'>-#define SPECTRAL_ATH11K_MAX_NUM_BINS		512</div><div class='ctx'> </div><div class='ctx'> /* FFT sample format given to userspace via debugfs.</div><div class='ctx'>  *</div><div class='hunk'>@@ -109,7 +108,7 @@ struct fft_sample_ath10k {</div><div class='ctx'> 	u8 avgpwr_db;</div><div class='ctx'> 	u8 max_exp;</div><div class='ctx'> </div><div class='del'>-	u8 data[0];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct fft_sample_ath11k {</div><div class='hunk'>@@ -124,7 +123,7 @@ struct fft_sample_ath11k {</div><div class='ctx'> 	__be32 tsf;</div><div class='ctx'> 	__be32 noise;</div><div class='ctx'> </div><div class='del'>-	u8 data[0];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #endif /* SPECTRAL_COMMON_H */</div><div class='head'>diff --git a/drivers/net/wireless/ath/testmode_i.h b/drivers/net/wireless/ath/testmode_i.h<br/>new file mode 100644<br/>index 000000000000..980ef2f3f05f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/testmode_i.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/testmode_i.h</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2023-2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* "API" level of the ath testmode interface. Bump it after every</div><div class='add'>+ * incompatible interface change.</div><div class='add'>+ */</div><div class='add'>+#define ATH_TESTMODE_VERSION_MAJOR 1</div><div class='add'>+</div><div class='add'>+/* Bump this after every _compatible_ interface change, for example</div><div class='add'>+ * addition of a new command or an attribute.</div><div class='add'>+ */</div><div class='add'>+#define ATH_TESTMODE_VERSION_MINOR 1</div><div class='add'>+</div><div class='add'>+#define ATH_TM_DATA_MAX_LEN		5000</div><div class='add'>+#define ATH_FTM_EVENT_MAX_BUF_LENGTH	2048</div><div class='add'>+</div><div class='add'>+enum ath_tm_attr {</div><div class='add'>+	__ATH_TM_ATTR_INVALID		= 0,</div><div class='add'>+	ATH_TM_ATTR_CMD			= 1,</div><div class='add'>+	ATH_TM_ATTR_DATA		= 2,</div><div class='add'>+	ATH_TM_ATTR_WMI_CMDID		= 3,</div><div class='add'>+	ATH_TM_ATTR_VERSION_MAJOR	= 4,</div><div class='add'>+	ATH_TM_ATTR_VERSION_MINOR	= 5,</div><div class='add'>+	ATH_TM_ATTR_WMI_OP_VERSION	= 6,</div><div class='add'>+</div><div class='add'>+	/* keep last */</div><div class='add'>+	__ATH_TM_ATTR_AFTER_LAST,</div><div class='add'>+	ATH_TM_ATTR_MAX			= __ATH_TM_ATTR_AFTER_LAST - 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* All ath testmode interface commands specified in</div><div class='add'>+ * ATH_TM_ATTR_CMD</div><div class='add'>+ */</div><div class='add'>+enum ath_tm_cmd {</div><div class='add'>+	/* Returns the supported ath testmode interface version in</div><div class='add'>+	 * ATH_TM_ATTR_VERSION. Always guaranteed to work. User space</div><div class='add'>+	 * uses this to verify it's using the correct version of the</div><div class='add'>+	 * testmode interface</div><div class='add'>+	 */</div><div class='add'>+	ATH_TM_CMD_GET_VERSION = 0,</div><div class='add'>+</div><div class='add'>+	/* The command used to transmit a WMI command to the firmware and</div><div class='add'>+	 * the event to receive WMI events from the firmware. Without</div><div class='add'>+	 * struct wmi_cmd_hdr header, only the WMI payload. Command id is</div><div class='add'>+	 * provided with ATH_TM_ATTR_WMI_CMDID and payload in</div><div class='add'>+	 * ATH_TM_ATTR_DATA.</div><div class='add'>+	 */</div><div class='add'>+	ATH_TM_CMD_WMI = 1,</div><div class='add'>+</div><div class='add'>+	/* Boots the UTF firmware, the netdev interface must be down at the</div><div class='add'>+	 * time.</div><div class='add'>+	 */</div><div class='add'>+	ATH_TM_CMD_TESTMODE_START = 2,</div><div class='add'>+</div><div class='add'>+	/* The command used to transmit a FTM WMI command to the firmware</div><div class='add'>+	 * and the event to receive WMI events from the firmware. The data</div><div class='add'>+	 * received only contain the payload, need to add the tlv header</div><div class='add'>+	 * and send the cmd to firmware with command id WMI_PDEV_UTF_CMDID.</div><div class='add'>+	 * The data payload size could be large and the driver needs to</div><div class='add'>+	 * send segmented data to firmware.</div><div class='add'>+	 */</div><div class='add'>+	ATH_TM_CMD_WMI_FTM = 3,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/wireless/ath/trace.h b/drivers/net/wireless/ath/trace.h<br/>index ba711644d27e..82aac0a4baff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/trace.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/trace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/trace.h</a></div><div class='hunk'>@@ -40,16 +40,13 @@ TRACE_EVENT(ath_log,</div><div class='ctx'> 	    TP_STRUCT__entry(</div><div class='ctx'> 		    __string(device, wiphy_name(wiphy))</div><div class='ctx'> 		    __string(driver, KBUILD_MODNAME)</div><div class='del'>-		    __dynamic_array(char, msg, ATH_DBG_MAX_LEN)</div><div class='add'>+		    __vstring(msg, vaf-&gt;fmt, vaf-&gt;va)</div><div class='ctx'> 	    ),</div><div class='ctx'> </div><div class='ctx'> 	    TP_fast_assign(</div><div class='del'>-		    __assign_str(device, wiphy_name(wiphy));</div><div class='del'>-		    __assign_str(driver, KBUILD_MODNAME);</div><div class='del'>-		    WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),</div><div class='del'>-					   ATH_DBG_MAX_LEN,</div><div class='del'>-					   vaf-&gt;fmt,</div><div class='del'>-					   *vaf-&gt;va) &gt;= ATH_DBG_MAX_LEN);</div><div class='add'>+		    __assign_str(device);</div><div class='add'>+		    __assign_str(driver);</div><div class='add'>+		    __assign_vstr(msg, vaf-&gt;fmt, vaf-&gt;va);</div><div class='ctx'> 	    ),</div><div class='ctx'> </div><div class='ctx'> 	    TP_printk(</div><div class='head'>diff --git a/drivers/net/wireless/ath/wcn36xx/Makefile b/drivers/net/wireless/ath/wcn36xx/Makefile<br/>index 27413703ad69..26bec795b372 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wcn36xx/Makefile</a></div><div class='hunk'>@@ -5,6 +5,7 @@ wcn36xx-y +=   main.o \</div><div class='ctx'>                txrx.o \</div><div class='ctx'>                smd.o \</div><div class='ctx'>                pmc.o \</div><div class='del'>-               debug.o</div><div class='add'>+               debug.o \</div><div class='add'>+               firmware.o</div><div class='ctx'> </div><div class='ctx'> wcn36xx-$(CONFIG_NL80211_TESTMODE) += testmode.o</div><div class='head'>diff --git a/drivers/net/wireless/ath/wcn36xx/debug.c b/drivers/net/wireless/ath/wcn36xx/debug.c<br/>index 389b5e7129a6..58b3c0501bfd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/debug.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/debug.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/debug.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wcn36xx/debug.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include "wcn36xx.h"</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> #include "pmc.h"</div><div class='add'>+#include "firmware.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_WCN36XX_DEBUGFS</div><div class='ctx'> </div><div class='hunk'>@@ -120,7 +121,7 @@ static ssize_t write_file_dump(struct file *file,</div><div class='ctx'> 		if (begin == NULL)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (kstrtou32(begin, 0, &amp;arg[i]) != 0)</div><div class='add'>+		if (kstrtos32(begin, 0, &amp;arg[i]) != 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -136,6 +137,42 @@ static const struct file_operations fops_wcn36xx_dump = {</div><div class='ctx'> 	.write =       write_file_dump,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static ssize_t read_file_firmware_feature_caps(struct file *file,</div><div class='add'>+					       char __user *user_buf,</div><div class='add'>+					       size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct wcn36xx *wcn = file-&gt;private_data;</div><div class='add'>+	size_t len = 0, buf_len = 2048;</div><div class='add'>+	char *buf;</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(buf_len, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+	for (i = 0; i &lt; MAX_FEATURE_SUPPORTED; i++) {</div><div class='add'>+		if (wcn36xx_firmware_get_feat_caps(wcn-&gt;fw_feat_caps, i)) {</div><div class='add'>+			len += scnprintf(buf + len, buf_len - len, "%s\n",</div><div class='add'>+					 wcn36xx_firmware_get_cap_name(i));</div><div class='add'>+		}</div><div class='add'>+		if (len &gt;= buf_len)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+	kfree(buf);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_wcn36xx_firmware_feat_caps = {</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.read = read_file_firmware_feature_caps,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define ADD_FILE(name, mode, fop, priv_data)		\</div><div class='ctx'> 	do {							\</div><div class='ctx'> 		struct dentry *d;				\</div><div class='hunk'>@@ -163,6 +200,8 @@ void wcn36xx_debugfs_init(struct wcn36xx *wcn)</div><div class='ctx'> </div><div class='ctx'> 	ADD_FILE(bmps_switcher, 0600, &amp;fops_wcn36xx_bmps, wcn);</div><div class='ctx'> 	ADD_FILE(dump, 0200, &amp;fops_wcn36xx_dump, wcn);</div><div class='add'>+	ADD_FILE(firmware_feat_caps, 0200,</div><div class='add'>+		 &amp;fops_wcn36xx_firmware_feat_caps, wcn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void wcn36xx_debugfs_exit(struct wcn36xx *wcn)</div><div class='head'>diff --git a/drivers/net/wireless/ath/wcn36xx/debug.h b/drivers/net/wireless/ath/wcn36xx/debug.h<br/>index 46307aa562d3..7116d96e0543 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/debug.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/debug.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/debug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wcn36xx/debug.h</a></div><div class='hunk'>@@ -31,6 +31,7 @@ struct wcn36xx_dfs_entry {</div><div class='ctx'> 	struct dentry *rootdir;</div><div class='ctx'> 	struct wcn36xx_dfs_file file_bmps_switcher;</div><div class='ctx'> 	struct wcn36xx_dfs_file file_dump;</div><div class='add'>+	struct wcn36xx_dfs_file file_firmware_feat_caps;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void wcn36xx_debugfs_init(struct wcn36xx *wcn);</div><div class='head'>diff --git a/drivers/net/wireless/ath/wcn36xx/dxe.c b/drivers/net/wireless/ath/wcn36xx/dxe.c<br/>index 63079231e48e..0f4df5585fd9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/dxe.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/dxe.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/dxe.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wcn36xx/dxe.c</a></div><div class='hunk'>@@ -112,8 +112,8 @@ int wcn36xx_dxe_alloc_ctl_blks(struct wcn36xx *wcn)</div><div class='ctx'> 	wcn-&gt;dxe_rx_l_ch.desc_num = WCN36XX_DXE_CH_DESC_NUMB_RX_L;</div><div class='ctx'> 	wcn-&gt;dxe_rx_h_ch.desc_num = WCN36XX_DXE_CH_DESC_NUMB_RX_H;</div><div class='ctx'> </div><div class='del'>-	wcn-&gt;dxe_tx_l_ch.dxe_wq =  WCN36XX_DXE_WQ_TX_L;</div><div class='del'>-	wcn-&gt;dxe_tx_h_ch.dxe_wq =  WCN36XX_DXE_WQ_TX_H;</div><div class='add'>+	wcn-&gt;dxe_tx_l_ch.dxe_wq =  WCN36XX_DXE_WQ_TX_L(wcn);</div><div class='add'>+	wcn-&gt;dxe_tx_h_ch.dxe_wq =  WCN36XX_DXE_WQ_TX_H(wcn);</div><div class='ctx'> </div><div class='ctx'> 	wcn-&gt;dxe_tx_l_ch.ctrl_bd = WCN36XX_DXE_CTRL_TX_L_BD;</div><div class='ctx'> 	wcn-&gt;dxe_tx_h_ch.ctrl_bd = WCN36XX_DXE_CTRL_TX_H_BD;</div><div class='hunk'>@@ -165,8 +165,9 @@ void wcn36xx_dxe_free_ctl_blks(struct wcn36xx *wcn)</div><div class='ctx'> 	wcn36xx_dxe_free_ctl_block(&amp;wcn-&gt;dxe_rx_h_ch);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wcn36xx_dxe_init_descs(struct device *dev, struct wcn36xx_dxe_ch *wcn_ch)</div><div class='add'>+static int wcn36xx_dxe_init_descs(struct wcn36xx *wcn, struct wcn36xx_dxe_ch *wcn_ch)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = wcn-&gt;dev;</div><div class='ctx'> 	struct wcn36xx_dxe_desc *cur_dxe = NULL;</div><div class='ctx'> 	struct wcn36xx_dxe_desc *prev_dxe = NULL;</div><div class='ctx'> 	struct wcn36xx_dxe_ctl *cur_ctl = NULL;</div><div class='hunk'>@@ -179,7 +180,7 @@ static int wcn36xx_dxe_init_descs(struct device *dev, struct wcn36xx_dxe_ch *wcn</div><div class='ctx'> 	if (!wcn_ch-&gt;cpu_addr)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	cur_dxe = (struct wcn36xx_dxe_desc *)wcn_ch-&gt;cpu_addr;</div><div class='add'>+	cur_dxe = wcn_ch-&gt;cpu_addr;</div><div class='ctx'> 	cur_ctl = wcn_ch-&gt;head_blk_ctl;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; wcn_ch-&gt;desc_num; i++) {</div><div class='hunk'>@@ -190,11 +191,11 @@ static int wcn36xx_dxe_init_descs(struct device *dev, struct wcn36xx_dxe_ch *wcn</div><div class='ctx'> 		switch (wcn_ch-&gt;ch_type) {</div><div class='ctx'> 		case WCN36XX_DXE_CH_TX_L:</div><div class='ctx'> 			cur_dxe-&gt;ctrl = WCN36XX_DXE_CTRL_TX_L;</div><div class='del'>-			cur_dxe-&gt;dst_addr_l = WCN36XX_DXE_WQ_TX_L;</div><div class='add'>+			cur_dxe-&gt;dst_addr_l = WCN36XX_DXE_WQ_TX_L(wcn);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case WCN36XX_DXE_CH_TX_H:</div><div class='ctx'> 			cur_dxe-&gt;ctrl = WCN36XX_DXE_CTRL_TX_H;</div><div class='del'>-			cur_dxe-&gt;dst_addr_l = WCN36XX_DXE_WQ_TX_H;</div><div class='add'>+			cur_dxe-&gt;dst_addr_l = WCN36XX_DXE_WQ_TX_H(wcn);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case WCN36XX_DXE_CH_RX_L:</div><div class='ctx'> 			cur_dxe-&gt;ctrl = WCN36XX_DXE_CTRL_RX_L;</div><div class='hunk'>@@ -272,6 +273,21 @@ static int wcn36xx_dxe_enable_ch_int(struct wcn36xx *wcn, u16 wcn_ch)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void wcn36xx_dxe_disable_ch_int(struct wcn36xx *wcn, u16 wcn_ch)</div><div class='add'>+{</div><div class='add'>+	int reg_data = 0;</div><div class='add'>+</div><div class='add'>+	wcn36xx_dxe_read_register(wcn,</div><div class='add'>+				  WCN36XX_DXE_INT_MASK_REG,</div><div class='add'>+				  &amp;reg_data);</div><div class='add'>+</div><div class='add'>+	reg_data &amp;= ~wcn_ch;</div><div class='add'>+</div><div class='add'>+	wcn36xx_dxe_write_register(wcn,</div><div class='add'>+				   WCN36XX_DXE_INT_MASK_REG,</div><div class='add'>+				   (int)reg_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int wcn36xx_dxe_fill_skb(struct device *dev,</div><div class='ctx'> 				struct wcn36xx_dxe_ctl *ctl,</div><div class='ctx'> 				gfp_t gfp)</div><div class='hunk'>@@ -334,7 +350,7 @@ void wcn36xx_dxe_tx_ack_ind(struct wcn36xx *wcn, u32 status)</div><div class='ctx'> 	spin_lock_irqsave(&amp;wcn-&gt;dxe_lock, flags);</div><div class='ctx'> 	skb = wcn-&gt;tx_ack_skb;</div><div class='ctx'> 	wcn-&gt;tx_ack_skb = NULL;</div><div class='del'>-	del_timer(&amp;wcn-&gt;tx_ack_timer);</div><div class='add'>+	timer_delete(&amp;wcn-&gt;tx_ack_timer);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;wcn-&gt;dxe_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (!skb) {</div><div class='hunk'>@@ -357,7 +373,7 @@ void wcn36xx_dxe_tx_ack_ind(struct wcn36xx *wcn, u32 status)</div><div class='ctx'> </div><div class='ctx'> static void wcn36xx_dxe_tx_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct wcn36xx *wcn = from_timer(wcn, t, tx_ack_timer);</div><div class='add'>+	struct wcn36xx *wcn = timer_container_of(wcn, t, tx_ack_timer);</div><div class='ctx'> 	struct ieee80211_tx_info *info;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -403,8 +419,21 @@ static void reap_tx_dxes(struct wcn36xx *wcn, struct wcn36xx_dxe_ch *ch)</div><div class='ctx'> 			dma_unmap_single(wcn-&gt;dev, ctl-&gt;desc-&gt;src_addr_l,</div><div class='ctx'> 					 ctl-&gt;skb-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> 			info = IEEE80211_SKB_CB(ctl-&gt;skb);</div><div class='del'>-			if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_REQ_TX_STATUS)) {</div><div class='del'>-				/* Keep frame until TX status comes */</div><div class='add'>+			if (info-&gt;flags &amp; IEEE80211_TX_CTL_REQ_TX_STATUS) {</div><div class='add'>+				if (info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK) {</div><div class='add'>+					info-&gt;flags |= IEEE80211_TX_STAT_NOACK_TRANSMITTED;</div><div class='add'>+					ieee80211_tx_status_irqsafe(wcn-&gt;hw, ctl-&gt;skb);</div><div class='add'>+				} else {</div><div class='add'>+					/* Wait for the TX ack indication or timeout... */</div><div class='add'>+					spin_lock(&amp;wcn-&gt;dxe_lock);</div><div class='add'>+					if (WARN_ON(wcn-&gt;tx_ack_skb))</div><div class='add'>+						ieee80211_free_txskb(wcn-&gt;hw, wcn-&gt;tx_ack_skb);</div><div class='add'>+					wcn-&gt;tx_ack_skb = ctl-&gt;skb; /* Tracking ref */</div><div class='add'>+					mod_timer(&amp;wcn-&gt;tx_ack_timer, jiffies + HZ / 10);</div><div class='add'>+					spin_unlock(&amp;wcn-&gt;dxe_lock);</div><div class='add'>+				}</div><div class='add'>+				/* do not free, ownership transferred to mac80211 status cb */</div><div class='add'>+			} else {</div><div class='ctx'> 				ieee80211_free_txskb(wcn-&gt;hw, ctl-&gt;skb);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -424,9 +453,8 @@ static void reap_tx_dxes(struct wcn36xx *wcn, struct wcn36xx_dxe_ch *ch)</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t wcn36xx_irq_tx_complete(int irq, void *dev)</div><div class='ctx'> {</div><div class='del'>-	struct wcn36xx *wcn = (struct wcn36xx *)dev;</div><div class='add'>+	struct wcn36xx *wcn = dev;</div><div class='ctx'> 	int int_src, int_reason;</div><div class='del'>-	bool transmitted = false;</div><div class='ctx'> </div><div class='ctx'> 	wcn36xx_dxe_read_register(wcn, WCN36XX_DXE_INT_SRC_RAW_REG, &amp;int_src);</div><div class='ctx'> </div><div class='hunk'>@@ -466,7 +494,6 @@ static irqreturn_t wcn36xx_irq_tx_complete(int irq, void *dev)</div><div class='ctx'> 		if (int_reason &amp; (WCN36XX_CH_STAT_INT_DONE_MASK |</div><div class='ctx'> 				  WCN36XX_CH_STAT_INT_ED_MASK)) {</div><div class='ctx'> 			reap_tx_dxes(wcn, &amp;wcn-&gt;dxe_tx_h_ch);</div><div class='del'>-			transmitted = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -479,7 +506,6 @@ static irqreturn_t wcn36xx_irq_tx_complete(int irq, void *dev)</div><div class='ctx'> 					   WCN36XX_DXE_0_INT_CLR,</div><div class='ctx'> 					   WCN36XX_INT_MASK_CHAN_TX_L);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 		if (int_reason &amp; WCN36XX_CH_STAT_INT_ERR_MASK ) {</div><div class='ctx'> 			wcn36xx_dxe_write_register(wcn,</div><div class='ctx'> 						   WCN36XX_DXE_0_INT_ERR_CLR,</div><div class='hunk'>@@ -507,32 +533,15 @@ static irqreturn_t wcn36xx_irq_tx_complete(int irq, void *dev)</div><div class='ctx'> 		if (int_reason &amp; (WCN36XX_CH_STAT_INT_DONE_MASK |</div><div class='ctx'> 				  WCN36XX_CH_STAT_INT_ED_MASK)) {</div><div class='ctx'> 			reap_tx_dxes(wcn, &amp;wcn-&gt;dxe_tx_l_ch);</div><div class='del'>-			transmitted = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;wcn-&gt;dxe_lock);</div><div class='del'>-	if (wcn-&gt;tx_ack_skb &amp;&amp; transmitted) {</div><div class='del'>-		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(wcn-&gt;tx_ack_skb);</div><div class='del'>-</div><div class='del'>-		/* TX complete, no need to wait for 802.11 ack indication */</div><div class='del'>-		if (info-&gt;flags &amp; IEEE80211_TX_CTL_REQ_TX_STATUS &amp;&amp;</div><div class='del'>-		    info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK) {</div><div class='del'>-			info-&gt;flags |= IEEE80211_TX_STAT_NOACK_TRANSMITTED;</div><div class='del'>-			del_timer(&amp;wcn-&gt;tx_ack_timer);</div><div class='del'>-			ieee80211_tx_status_irqsafe(wcn-&gt;hw, wcn-&gt;tx_ack_skb);</div><div class='del'>-			wcn-&gt;tx_ack_skb = NULL;</div><div class='del'>-			ieee80211_wake_queues(wcn-&gt;hw);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;wcn-&gt;dxe_lock);</div><div class='del'>-</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t wcn36xx_irq_rx_ready(int irq, void *dev)</div><div class='ctx'> {</div><div class='del'>-	struct wcn36xx *wcn = (struct wcn36xx *)dev;</div><div class='add'>+	struct wcn36xx *wcn = dev;</div><div class='ctx'> </div><div class='ctx'> 	wcn36xx_dxe_rx_frame(wcn);</div><div class='ctx'> </div><div class='hunk'>@@ -613,6 +622,10 @@ static int wcn36xx_rx_handle_packets(struct wcn36xx *wcn,</div><div class='ctx'> 	dxe = ctl-&gt;desc;</div><div class='ctx'> </div><div class='ctx'> 	while (!(READ_ONCE(dxe-&gt;ctrl) &amp; WCN36xx_DXE_CTRL_VLD)) {</div><div class='add'>+		/* do not read until we own DMA descriptor */</div><div class='add'>+		dma_rmb();</div><div class='add'>+</div><div class='add'>+		/* read/modify DMA descriptor */</div><div class='ctx'> 		skb = ctl-&gt;skb;</div><div class='ctx'> 		dma_addr = dxe-&gt;dst_addr_l;</div><div class='ctx'> 		ret = wcn36xx_dxe_fill_skb(wcn-&gt;dev, ctl, GFP_ATOMIC);</div><div class='hunk'>@@ -623,9 +636,15 @@ static int wcn36xx_rx_handle_packets(struct wcn36xx *wcn,</div><div class='ctx'> 			dma_unmap_single(wcn-&gt;dev, dma_addr, WCN36XX_PKT_SIZE,</div><div class='ctx'> 					DMA_FROM_DEVICE);</div><div class='ctx'> 			wcn36xx_rx_skb(wcn, skb);</div><div class='del'>-		} /* else keep old skb not submitted and use it for rx DMA */</div><div class='add'>+		}</div><div class='add'>+		/* else keep old skb not submitted and reuse it for rx DMA</div><div class='add'>+		 * (dropping the packet that it contained)</div><div class='add'>+		 */</div><div class='ctx'> </div><div class='add'>+		/* flush descriptor changes before re-marking as valid */</div><div class='add'>+		dma_wmb();</div><div class='ctx'> 		dxe-&gt;ctrl = ctrl;</div><div class='add'>+</div><div class='ctx'> 		ctl = ctl-&gt;next;</div><div class='ctx'> 		dxe = ctl-&gt;desc;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -800,7 +819,7 @@ int wcn36xx_dxe_tx_frame(struct wcn36xx *wcn,</div><div class='ctx'> 			 (char *)ctl_skb-&gt;skb-&gt;data, ctl_skb-&gt;skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	/* Move the head of the ring to the next empty descriptor */</div><div class='del'>-	 ch-&gt;head_blk_ctl = ctl_skb-&gt;next;</div><div class='add'>+	ch-&gt;head_blk_ctl = ctl_skb-&gt;next;</div><div class='ctx'> </div><div class='ctx'> 	/* Commit all previous writes and set descriptors to VALID */</div><div class='ctx'> 	wmb();</div><div class='hunk'>@@ -831,6 +850,53 @@ unlock:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool _wcn36xx_dxe_tx_channel_is_empty(struct wcn36xx_dxe_ch *ch)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct wcn36xx_dxe_ctl *ctl_bd_start, *ctl_skb_start;</div><div class='add'>+	struct wcn36xx_dxe_ctl *ctl_bd, *ctl_skb;</div><div class='add'>+	bool ret = true;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ch-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Loop through ring buffer looking for nonempty entries. */</div><div class='add'>+	ctl_bd_start = ch-&gt;head_blk_ctl;</div><div class='add'>+	ctl_bd = ctl_bd_start;</div><div class='add'>+	ctl_skb_start = ctl_bd_start-&gt;next;</div><div class='add'>+	ctl_skb = ctl_skb_start;</div><div class='add'>+	do {</div><div class='add'>+		if (ctl_skb-&gt;skb) {</div><div class='add'>+			ret = false;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+		ctl_bd = ctl_skb-&gt;next;</div><div class='add'>+		ctl_skb = ctl_bd-&gt;next;</div><div class='add'>+	} while (ctl_skb != ctl_skb_start);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock_irqrestore(&amp;ch-&gt;lock, flags);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int wcn36xx_dxe_tx_flush(struct wcn36xx *wcn)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	/* Called with mac80211 queues stopped. Wait for empty HW queues. */</div><div class='add'>+	do {</div><div class='add'>+		if (_wcn36xx_dxe_tx_channel_is_empty(&amp;wcn-&gt;dxe_tx_l_ch) &amp;&amp;</div><div class='add'>+		    _wcn36xx_dxe_tx_channel_is_empty(&amp;wcn-&gt;dxe_tx_h_ch)) {</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		/* This ieee80211_ops callback is specifically allowed to</div><div class='add'>+		 * sleep.</div><div class='add'>+		 */</div><div class='add'>+		usleep_range(1000, 1100);</div><div class='add'>+	} while (++i &lt; 100);</div><div class='add'>+</div><div class='add'>+	return -EBUSY;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int wcn36xx_dxe_init(struct wcn36xx *wcn)</div><div class='ctx'> {</div><div class='ctx'> 	int reg_data = 0, ret;</div><div class='hunk'>@@ -849,7 +915,7 @@ int wcn36xx_dxe_init(struct wcn36xx *wcn)</div><div class='ctx'> 	/***************************************/</div><div class='ctx'> 	/* Init descriptors for TX LOW channel */</div><div class='ctx'> 	/***************************************/</div><div class='del'>-	ret = wcn36xx_dxe_init_descs(wcn-&gt;dev, &amp;wcn-&gt;dxe_tx_l_ch);</div><div class='add'>+	ret = wcn36xx_dxe_init_descs(wcn, &amp;wcn-&gt;dxe_tx_l_ch);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(wcn-&gt;dev, "Error allocating descriptor\n");</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -863,15 +929,14 @@ int wcn36xx_dxe_init(struct wcn36xx *wcn)</div><div class='ctx'> 	/* Program DMA destination addr for TX LOW */</div><div class='ctx'> 	wcn36xx_dxe_write_register(wcn,</div><div class='ctx'> 		WCN36XX_DXE_CH_DEST_ADDR_TX_L,</div><div class='del'>-		WCN36XX_DXE_WQ_TX_L);</div><div class='add'>+		WCN36XX_DXE_WQ_TX_L(wcn));</div><div class='ctx'> </div><div class='ctx'> 	wcn36xx_dxe_read_register(wcn, WCN36XX_DXE_REG_CH_EN, &amp;reg_data);</div><div class='del'>-	wcn36xx_dxe_enable_ch_int(wcn, WCN36XX_INT_MASK_CHAN_TX_L);</div><div class='ctx'> </div><div class='ctx'> 	/***************************************/</div><div class='ctx'> 	/* Init descriptors for TX HIGH channel */</div><div class='ctx'> 	/***************************************/</div><div class='del'>-	ret = wcn36xx_dxe_init_descs(wcn-&gt;dev, &amp;wcn-&gt;dxe_tx_h_ch);</div><div class='add'>+	ret = wcn36xx_dxe_init_descs(wcn, &amp;wcn-&gt;dxe_tx_h_ch);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(wcn-&gt;dev, "Error allocating descriptor\n");</div><div class='ctx'> 		goto out_err_txh_ch;</div><div class='hunk'>@@ -886,23 +951,19 @@ int wcn36xx_dxe_init(struct wcn36xx *wcn)</div><div class='ctx'> 	/* Program DMA destination addr for TX HIGH */</div><div class='ctx'> 	wcn36xx_dxe_write_register(wcn,</div><div class='ctx'> 		WCN36XX_DXE_CH_DEST_ADDR_TX_H,</div><div class='del'>-		WCN36XX_DXE_WQ_TX_H);</div><div class='add'>+		WCN36XX_DXE_WQ_TX_H(wcn));</div><div class='ctx'> </div><div class='ctx'> 	wcn36xx_dxe_read_register(wcn, WCN36XX_DXE_REG_CH_EN, &amp;reg_data);</div><div class='ctx'> </div><div class='del'>-	/* Enable channel interrupts */</div><div class='del'>-	wcn36xx_dxe_enable_ch_int(wcn, WCN36XX_INT_MASK_CHAN_TX_H);</div><div class='del'>-</div><div class='ctx'> 	/***************************************/</div><div class='ctx'> 	/* Init descriptors for RX LOW channel */</div><div class='ctx'> 	/***************************************/</div><div class='del'>-	ret = wcn36xx_dxe_init_descs(wcn-&gt;dev, &amp;wcn-&gt;dxe_rx_l_ch);</div><div class='add'>+	ret = wcn36xx_dxe_init_descs(wcn, &amp;wcn-&gt;dxe_rx_l_ch);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(wcn-&gt;dev, "Error allocating descriptor\n");</div><div class='ctx'> 		goto out_err_rxl_ch;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	/* For RX we need to preallocated buffers */</div><div class='ctx'> 	wcn36xx_dxe_ch_alloc_skb(wcn, &amp;wcn-&gt;dxe_rx_l_ch);</div><div class='ctx'> </div><div class='hunk'>@@ -925,13 +986,10 @@ int wcn36xx_dxe_init(struct wcn36xx *wcn)</div><div class='ctx'> 		WCN36XX_DXE_REG_CTL_RX_L,</div><div class='ctx'> 		WCN36XX_DXE_CH_DEFAULT_CTL_RX_L);</div><div class='ctx'> </div><div class='del'>-	/* Enable channel interrupts */</div><div class='del'>-	wcn36xx_dxe_enable_ch_int(wcn, WCN36XX_INT_MASK_CHAN_RX_L);</div><div class='del'>-</div><div class='ctx'> 	/***************************************/</div><div class='ctx'> 	/* Init descriptors for RX HIGH channel */</div><div class='ctx'> 	/***************************************/</div><div class='del'>-	ret = wcn36xx_dxe_init_descs(wcn-&gt;dev, &amp;wcn-&gt;dxe_rx_h_ch);</div><div class='add'>+	ret = wcn36xx_dxe_init_descs(wcn, &amp;wcn-&gt;dxe_rx_h_ch);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(wcn-&gt;dev, "Error allocating descriptor\n");</div><div class='ctx'> 		goto out_err_rxh_ch;</div><div class='hunk'>@@ -959,15 +1017,18 @@ int wcn36xx_dxe_init(struct wcn36xx *wcn)</div><div class='ctx'> 		WCN36XX_DXE_REG_CTL_RX_H,</div><div class='ctx'> 		WCN36XX_DXE_CH_DEFAULT_CTL_RX_H);</div><div class='ctx'> </div><div class='del'>-	/* Enable channel interrupts */</div><div class='del'>-	wcn36xx_dxe_enable_ch_int(wcn, WCN36XX_INT_MASK_CHAN_RX_H);</div><div class='del'>-</div><div class='ctx'> 	ret = wcn36xx_dxe_request_irqs(wcn);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_err_irq;</div><div class='ctx'> </div><div class='ctx'> 	timer_setup(&amp;wcn-&gt;tx_ack_timer, wcn36xx_dxe_tx_timer, 0);</div><div class='ctx'> </div><div class='add'>+	/* Enable channel interrupts */</div><div class='add'>+	wcn36xx_dxe_enable_ch_int(wcn, WCN36XX_INT_MASK_CHAN_TX_L);</div><div class='add'>+	wcn36xx_dxe_enable_ch_int(wcn, WCN36XX_INT_MASK_CHAN_TX_H);</div><div class='add'>+	wcn36xx_dxe_enable_ch_int(wcn, WCN36XX_INT_MASK_CHAN_RX_L);</div><div class='add'>+	wcn36xx_dxe_enable_ch_int(wcn, WCN36XX_INT_MASK_CHAN_RX_H);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_err_irq:</div><div class='hunk'>@@ -984,15 +1045,32 @@ out_err_txh_ch:</div><div class='ctx'> </div><div class='ctx'> void wcn36xx_dxe_deinit(struct wcn36xx *wcn)</div><div class='ctx'> {</div><div class='add'>+	int reg_data = 0;</div><div class='add'>+</div><div class='add'>+	/* Disable channel interrupts */</div><div class='add'>+	wcn36xx_dxe_disable_ch_int(wcn, WCN36XX_INT_MASK_CHAN_RX_H);</div><div class='add'>+	wcn36xx_dxe_disable_ch_int(wcn, WCN36XX_INT_MASK_CHAN_RX_L);</div><div class='add'>+	wcn36xx_dxe_disable_ch_int(wcn, WCN36XX_INT_MASK_CHAN_TX_H);</div><div class='add'>+	wcn36xx_dxe_disable_ch_int(wcn, WCN36XX_INT_MASK_CHAN_TX_L);</div><div class='add'>+</div><div class='ctx'> 	free_irq(wcn-&gt;tx_irq, wcn);</div><div class='ctx'> 	free_irq(wcn-&gt;rx_irq, wcn);</div><div class='del'>-	del_timer(&amp;wcn-&gt;tx_ack_timer);</div><div class='add'>+	timer_delete(&amp;wcn-&gt;tx_ack_timer);</div><div class='ctx'> </div><div class='ctx'> 	if (wcn-&gt;tx_ack_skb) {</div><div class='ctx'> 		ieee80211_tx_status_irqsafe(wcn-&gt;hw, wcn-&gt;tx_ack_skb);</div><div class='ctx'> 		wcn-&gt;tx_ack_skb = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Put the DXE block into reset before freeing memory */</div><div class='add'>+	reg_data = WCN36XX_DXE_REG_RESET;</div><div class='add'>+	wcn36xx_dxe_write_register(wcn, WCN36XX_DXE_REG_CSR_RESET, reg_data);</div><div class='add'>+</div><div class='ctx'> 	wcn36xx_dxe_ch_free_skbs(wcn, &amp;wcn-&gt;dxe_rx_l_ch);</div><div class='ctx'> 	wcn36xx_dxe_ch_free_skbs(wcn, &amp;wcn-&gt;dxe_rx_h_ch);</div><div class='add'>+</div><div class='add'>+	wcn36xx_dxe_deinit_descs(wcn-&gt;dev, &amp;wcn-&gt;dxe_tx_l_ch);</div><div class='add'>+	wcn36xx_dxe_deinit_descs(wcn-&gt;dev, &amp;wcn-&gt;dxe_tx_h_ch);</div><div class='add'>+	wcn36xx_dxe_deinit_descs(wcn-&gt;dev, &amp;wcn-&gt;dxe_rx_l_ch);</div><div class='add'>+	wcn36xx_dxe_deinit_descs(wcn-&gt;dev, &amp;wcn-&gt;dxe_rx_h_ch);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/wcn36xx/dxe.h b/drivers/net/wireless/ath/wcn36xx/dxe.h<br/>index 31b81b7547a3..dd8c684a3ba7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/dxe.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/dxe.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/dxe.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wcn36xx/dxe.h</a></div><div class='hunk'>@@ -135,8 +135,8 @@ H2H_TEST_RX_TX = DMA2</div><div class='ctx'> 	WCN36xx_DXE_CTRL_ENDIANNESS)</div><div class='ctx'> </div><div class='ctx'> /* TODO This must calculated properly but not hardcoded */</div><div class='del'>-#define WCN36XX_DXE_WQ_TX_L			0x17</div><div class='del'>-#define WCN36XX_DXE_WQ_TX_H			0x17</div><div class='add'>+#define WCN36XX_DXE_WQ_TX_L(wcn)    ((wcn)-&gt;is_pronto_v3 ? 0x6 : 0x17)</div><div class='add'>+#define WCN36XX_DXE_WQ_TX_H(wcn)    ((wcn)-&gt;is_pronto_v3 ? 0x6 : 0x17)</div><div class='ctx'> #define WCN36XX_DXE_WQ_RX_L			0xB</div><div class='ctx'> #define WCN36XX_DXE_WQ_RX_H			0x4</div><div class='ctx'> </div><div class='hunk'>@@ -466,5 +466,6 @@ int wcn36xx_dxe_tx_frame(struct wcn36xx *wcn,</div><div class='ctx'> 			 struct wcn36xx_tx_bd *bd,</div><div class='ctx'> 			 struct sk_buff *skb,</div><div class='ctx'> 			 bool is_low);</div><div class='add'>+int wcn36xx_dxe_tx_flush(struct wcn36xx *wcn);</div><div class='ctx'> void wcn36xx_dxe_tx_ack_ind(struct wcn36xx *wcn, u32 status);</div><div class='ctx'> #endif	/* _DXE_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/ath/wcn36xx/firmware.c b/drivers/net/wireless/ath/wcn36xx/firmware.c<br/>new file mode 100644<br/>index 000000000000..4b7f439e4db5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/firmware.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wcn36xx/firmware.c</a></div><div class='hunk'>@@ -0,0 +1,125 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include "wcn36xx.h"</div><div class='add'>+#include "firmware.h"</div><div class='add'>+</div><div class='add'>+#define DEFINE(s)[s] = #s</div><div class='add'>+</div><div class='add'>+static const char * const wcn36xx_firmware_caps_names[] = {</div><div class='add'>+	DEFINE(MCC),</div><div class='add'>+	DEFINE(P2P),</div><div class='add'>+	DEFINE(DOT11AC),</div><div class='add'>+	DEFINE(SLM_SESSIONIZATION),</div><div class='add'>+	DEFINE(DOT11AC_OPMODE),</div><div class='add'>+	DEFINE(SAP32STA),</div><div class='add'>+	DEFINE(TDLS),</div><div class='add'>+	DEFINE(P2P_GO_NOA_DECOUPLE_INIT_SCAN),</div><div class='add'>+	DEFINE(WLANACTIVE_OFFLOAD),</div><div class='add'>+	DEFINE(BEACON_OFFLOAD),</div><div class='add'>+	DEFINE(SCAN_OFFLOAD),</div><div class='add'>+	DEFINE(ROAM_OFFLOAD),</div><div class='add'>+	DEFINE(BCN_MISS_OFFLOAD),</div><div class='add'>+	DEFINE(STA_POWERSAVE),</div><div class='add'>+	DEFINE(STA_ADVANCED_PWRSAVE),</div><div class='add'>+	DEFINE(AP_UAPSD),</div><div class='add'>+	DEFINE(AP_DFS),</div><div class='add'>+	DEFINE(BLOCKACK),</div><div class='add'>+	DEFINE(PHY_ERR),</div><div class='add'>+	DEFINE(BCN_FILTER),</div><div class='add'>+	DEFINE(RTT),</div><div class='add'>+	DEFINE(RATECTRL),</div><div class='add'>+	DEFINE(WOW),</div><div class='add'>+	DEFINE(WLAN_ROAM_SCAN_OFFLOAD),</div><div class='add'>+	DEFINE(SPECULATIVE_PS_POLL),</div><div class='add'>+	DEFINE(SCAN_SCH),</div><div class='add'>+	DEFINE(IBSS_HEARTBEAT_OFFLOAD),</div><div class='add'>+	DEFINE(WLAN_SCAN_OFFLOAD),</div><div class='add'>+	DEFINE(WLAN_PERIODIC_TX_PTRN),</div><div class='add'>+	DEFINE(ADVANCE_TDLS),</div><div class='add'>+	DEFINE(BATCH_SCAN),</div><div class='add'>+	DEFINE(FW_IN_TX_PATH),</div><div class='add'>+	DEFINE(EXTENDED_NSOFFLOAD_SLOT),</div><div class='add'>+	DEFINE(CH_SWITCH_V1),</div><div class='add'>+	DEFINE(HT40_OBSS_SCAN),</div><div class='add'>+	DEFINE(UPDATE_CHANNEL_LIST),</div><div class='add'>+	DEFINE(WLAN_MCADDR_FLT),</div><div class='add'>+	DEFINE(WLAN_CH144),</div><div class='add'>+	DEFINE(NAN),</div><div class='add'>+	DEFINE(TDLS_SCAN_COEXISTENCE),</div><div class='add'>+	DEFINE(LINK_LAYER_STATS_MEAS),</div><div class='add'>+	DEFINE(MU_MIMO),</div><div class='add'>+	DEFINE(EXTENDED_SCAN),</div><div class='add'>+	DEFINE(DYNAMIC_WMM_PS),</div><div class='add'>+	DEFINE(MAC_SPOOFED_SCAN),</div><div class='add'>+	DEFINE(BMU_ERROR_GENERIC_RECOVERY),</div><div class='add'>+	DEFINE(DISA),</div><div class='add'>+	DEFINE(FW_STATS),</div><div class='add'>+	DEFINE(WPS_PRBRSP_TMPL),</div><div class='add'>+	DEFINE(BCN_IE_FLT_DELTA),</div><div class='add'>+	DEFINE(TDLS_OFF_CHANNEL),</div><div class='add'>+	DEFINE(RTT3),</div><div class='add'>+	DEFINE(MGMT_FRAME_LOGGING),</div><div class='add'>+	DEFINE(ENHANCED_TXBD_COMPLETION),</div><div class='add'>+	DEFINE(LOGGING_ENHANCEMENT),</div><div class='add'>+	DEFINE(EXT_SCAN_ENHANCED),</div><div class='add'>+	DEFINE(MEMORY_DUMP_SUPPORTED),</div><div class='add'>+	DEFINE(PER_PKT_STATS_SUPPORTED),</div><div class='add'>+	DEFINE(EXT_LL_STAT),</div><div class='add'>+	DEFINE(WIFI_CONFIG),</div><div class='add'>+	DEFINE(ANTENNA_DIVERSITY_SELECTION),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#undef DEFINE</div><div class='add'>+</div><div class='add'>+const char *wcn36xx_firmware_get_cap_name(enum wcn36xx_firmware_feat_caps x)</div><div class='add'>+{</div><div class='add'>+	if (x &gt;= ARRAY_SIZE(wcn36xx_firmware_caps_names))</div><div class='add'>+		return "UNKNOWN";</div><div class='add'>+	return wcn36xx_firmware_caps_names[x];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void wcn36xx_firmware_set_feat_caps(u32 *bitmap,</div><div class='add'>+				    enum wcn36xx_firmware_feat_caps cap)</div><div class='add'>+{</div><div class='add'>+	int arr_idx, bit_idx;</div><div class='add'>+</div><div class='add'>+	if (cap &lt; 0 || cap &gt; 127) {</div><div class='add'>+		wcn36xx_warn("error cap idx %d\n", cap);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arr_idx = cap / 32;</div><div class='add'>+	bit_idx = cap % 32;</div><div class='add'>+	bitmap[arr_idx] |= (1 &lt;&lt; bit_idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int wcn36xx_firmware_get_feat_caps(u32 *bitmap,</div><div class='add'>+				   enum wcn36xx_firmware_feat_caps cap)</div><div class='add'>+{</div><div class='add'>+	int arr_idx, bit_idx;</div><div class='add'>+</div><div class='add'>+	if (cap &lt; 0 || cap &gt; 127) {</div><div class='add'>+		wcn36xx_warn("error cap idx %d\n", cap);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arr_idx = cap / 32;</div><div class='add'>+	bit_idx = cap % 32;</div><div class='add'>+</div><div class='add'>+	return (bitmap[arr_idx] &amp; (1 &lt;&lt; bit_idx)) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void wcn36xx_firmware_clear_feat_caps(u32 *bitmap,</div><div class='add'>+				      enum wcn36xx_firmware_feat_caps cap)</div><div class='add'>+{</div><div class='add'>+	int arr_idx, bit_idx;</div><div class='add'>+</div><div class='add'>+	if (cap &lt; 0 || cap &gt; 127) {</div><div class='add'>+		wcn36xx_warn("error cap idx %d\n", cap);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arr_idx = cap / 32;</div><div class='add'>+	bit_idx = cap % 32;</div><div class='add'>+	bitmap[arr_idx] &amp;= ~(1 &lt;&lt; bit_idx);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/wcn36xx/firmware.h b/drivers/net/wireless/ath/wcn36xx/firmware.h<br/>new file mode 100644<br/>index 000000000000..f991cf959f82<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/firmware.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wcn36xx/firmware.h</a></div><div class='hunk'>@@ -0,0 +1,84 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+</div><div class='add'>+#ifndef _FIRMWARE_H_</div><div class='add'>+#define _FIRMWARE_H_</div><div class='add'>+</div><div class='add'>+/* Capability bitmap exchange definitions and macros starts */</div><div class='add'>+</div><div class='add'>+enum wcn36xx_firmware_feat_caps {</div><div class='add'>+	MCC = 0,</div><div class='add'>+	P2P = 1,</div><div class='add'>+	DOT11AC = 2,</div><div class='add'>+	SLM_SESSIONIZATION = 3,</div><div class='add'>+	DOT11AC_OPMODE = 4,</div><div class='add'>+	SAP32STA = 5,</div><div class='add'>+	TDLS = 6,</div><div class='add'>+	P2P_GO_NOA_DECOUPLE_INIT_SCAN = 7,</div><div class='add'>+	WLANACTIVE_OFFLOAD = 8,</div><div class='add'>+	BEACON_OFFLOAD = 9,</div><div class='add'>+	SCAN_OFFLOAD = 10,</div><div class='add'>+	ROAM_OFFLOAD = 11,</div><div class='add'>+	BCN_MISS_OFFLOAD = 12,</div><div class='add'>+	STA_POWERSAVE = 13,</div><div class='add'>+	STA_ADVANCED_PWRSAVE = 14,</div><div class='add'>+	AP_UAPSD = 15,</div><div class='add'>+	AP_DFS = 16,</div><div class='add'>+	BLOCKACK = 17,</div><div class='add'>+	PHY_ERR = 18,</div><div class='add'>+	BCN_FILTER = 19,</div><div class='add'>+	RTT = 20,</div><div class='add'>+	RATECTRL = 21,</div><div class='add'>+	WOW = 22,</div><div class='add'>+	WLAN_ROAM_SCAN_OFFLOAD = 23,</div><div class='add'>+	SPECULATIVE_PS_POLL = 24,</div><div class='add'>+	SCAN_SCH = 25,</div><div class='add'>+	IBSS_HEARTBEAT_OFFLOAD = 26,</div><div class='add'>+	WLAN_SCAN_OFFLOAD = 27,</div><div class='add'>+	WLAN_PERIODIC_TX_PTRN = 28,</div><div class='add'>+	ADVANCE_TDLS = 29,</div><div class='add'>+	BATCH_SCAN = 30,</div><div class='add'>+	FW_IN_TX_PATH = 31,</div><div class='add'>+	EXTENDED_NSOFFLOAD_SLOT = 32,</div><div class='add'>+	CH_SWITCH_V1 = 33,</div><div class='add'>+	HT40_OBSS_SCAN = 34,</div><div class='add'>+	UPDATE_CHANNEL_LIST = 35,</div><div class='add'>+	WLAN_MCADDR_FLT = 36,</div><div class='add'>+	WLAN_CH144 = 37,</div><div class='add'>+	NAN = 38,</div><div class='add'>+	TDLS_SCAN_COEXISTENCE = 39,</div><div class='add'>+	LINK_LAYER_STATS_MEAS = 40,</div><div class='add'>+	MU_MIMO = 41,</div><div class='add'>+	EXTENDED_SCAN = 42,</div><div class='add'>+	DYNAMIC_WMM_PS = 43,</div><div class='add'>+	MAC_SPOOFED_SCAN = 44,</div><div class='add'>+	BMU_ERROR_GENERIC_RECOVERY = 45,</div><div class='add'>+	DISA = 46,</div><div class='add'>+	FW_STATS = 47,</div><div class='add'>+	WPS_PRBRSP_TMPL = 48,</div><div class='add'>+	BCN_IE_FLT_DELTA = 49,</div><div class='add'>+	TDLS_OFF_CHANNEL = 51,</div><div class='add'>+	RTT3 = 52,</div><div class='add'>+	MGMT_FRAME_LOGGING = 53,</div><div class='add'>+	ENHANCED_TXBD_COMPLETION = 54,</div><div class='add'>+	LOGGING_ENHANCEMENT = 55,</div><div class='add'>+	EXT_SCAN_ENHANCED = 56,</div><div class='add'>+	MEMORY_DUMP_SUPPORTED = 57,</div><div class='add'>+	PER_PKT_STATS_SUPPORTED = 58,</div><div class='add'>+	EXT_LL_STAT = 60,</div><div class='add'>+	WIFI_CONFIG = 61,</div><div class='add'>+	ANTENNA_DIVERSITY_SELECTION = 62,</div><div class='add'>+</div><div class='add'>+	MAX_FEATURE_SUPPORTED = 128,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void wcn36xx_firmware_set_feat_caps(u32 *bitmap,</div><div class='add'>+				    enum wcn36xx_firmware_feat_caps cap);</div><div class='add'>+int wcn36xx_firmware_get_feat_caps(u32 *bitmap,</div><div class='add'>+				   enum wcn36xx_firmware_feat_caps cap);</div><div class='add'>+void wcn36xx_firmware_clear_feat_caps(u32 *bitmap,</div><div class='add'>+				      enum wcn36xx_firmware_feat_caps cap);</div><div class='add'>+</div><div class='add'>+const char *wcn36xx_firmware_get_cap_name(enum wcn36xx_firmware_feat_caps x);</div><div class='add'>+</div><div class='add'>+#endif /* _FIRMWARE_H_ */</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/wireless/ath/wcn36xx/hal.h b/drivers/net/wireless/ath/wcn36xx/hal.h<br/>index 65ef893f2736..ef9ea4ff891b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/hal.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/hal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/hal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wcn36xx/hal.h</a></div><div class='hunk'>@@ -359,6 +359,8 @@ enum wcn36xx_hal_host_msg_type {</div><div class='ctx'> 	WCN36XX_HAL_START_SCAN_OFFLOAD_RSP = 205,</div><div class='ctx'> 	WCN36XX_HAL_STOP_SCAN_OFFLOAD_REQ = 206,</div><div class='ctx'> 	WCN36XX_HAL_STOP_SCAN_OFFLOAD_RSP = 207,</div><div class='add'>+	WCN36XX_HAL_UPDATE_CHANNEL_LIST_REQ = 208,</div><div class='add'>+	WCN36XX_HAL_UPDATE_CHANNEL_LIST_RSP = 209,</div><div class='ctx'> 	WCN36XX_HAL_SCAN_OFFLOAD_IND = 210,</div><div class='ctx'> </div><div class='ctx'> 	WCN36XX_HAL_AVOID_FREQ_RANGE_IND = 233,</div><div class='hunk'>@@ -1353,6 +1355,36 @@ struct wcn36xx_hal_stop_scan_offload_rsp_msg {</div><div class='ctx'> 	u32 status;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+#define WCN36XX_HAL_CHAN_REG1_MIN_PWR_MASK  0x000000ff</div><div class='add'>+#define WCN36XX_HAL_CHAN_REG1_MAX_PWR_MASK  0x0000ff00</div><div class='add'>+#define WCN36XX_HAL_CHAN_REG1_REG_PWR_MASK  0x00ff0000</div><div class='add'>+#define WCN36XX_HAL_CHAN_REG1_CLASS_ID_MASK 0xff000000</div><div class='add'>+#define WCN36XX_HAL_CHAN_REG2_ANT_GAIN_MASK 0x000000ff</div><div class='add'>+#define WCN36XX_HAL_CHAN_INFO_FLAG_PASSIVE  BIT(7)</div><div class='add'>+#define WCN36XX_HAL_CHAN_INFO_FLAG_DFS      BIT(10)</div><div class='add'>+#define WCN36XX_HAL_CHAN_INFO_FLAG_HT       BIT(11)</div><div class='add'>+#define WCN36XX_HAL_CHAN_INFO_FLAG_VHT      BIT(12)</div><div class='add'>+#define WCN36XX_HAL_CHAN_INFO_PHY_11A       0</div><div class='add'>+#define WCN36XX_HAL_CHAN_INFO_PHY_11BG      1</div><div class='add'>+#define WCN36XX_HAL_DEFAULT_ANT_GAIN        6</div><div class='add'>+#define WCN36XX_HAL_DEFAULT_MIN_POWER       6</div><div class='add'>+</div><div class='add'>+struct wcn36xx_hal_channel_param {</div><div class='add'>+	u32 mhz;</div><div class='add'>+	u32 band_center_freq1;</div><div class='add'>+	u32 band_center_freq2;</div><div class='add'>+	u32 channel_info;</div><div class='add'>+	u32 reg_info_1;</div><div class='add'>+	u32 reg_info_2;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct wcn36xx_hal_update_channel_list_req_msg {</div><div class='add'>+	struct wcn36xx_hal_msg_header header;</div><div class='add'>+</div><div class='add'>+	u8 num_channel;</div><div class='add'>+	struct wcn36xx_hal_channel_param channels[80];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> enum wcn36xx_hal_rate_index {</div><div class='ctx'> 	HW_RATE_INDEX_1MBPS	= 0x82,</div><div class='ctx'> 	HW_RATE_INDEX_2MBPS	= 0x84,</div><div class='hunk'>@@ -1929,7 +1961,7 @@ struct wcn36xx_hal_config_bss_params {</div><div class='ctx'> </div><div class='ctx'> 	/* HAL should update the existing BSS entry, if this flag is set.</div><div class='ctx'> 	 * UMAC will set this flag in case of reassoc, where we want to</div><div class='del'>-	 * resue the the old BSSID and still return success 0 = Add, 1 =</div><div class='add'>+	 * resue the old BSSID and still return success 0 = Add, 1 =</div><div class='ctx'> 	 * Update */</div><div class='ctx'> 	u8 action;</div><div class='ctx'> </div><div class='hunk'>@@ -2066,7 +2098,7 @@ struct wcn36xx_hal_config_bss_params_v1 {</div><div class='ctx'> </div><div class='ctx'> 	/* HAL should update the existing BSS entry, if this flag is set.</div><div class='ctx'> 	 * UMAC will set this flag in case of reassoc, where we want to</div><div class='del'>-	 * resue the the old BSSID and still return success 0 = Add, 1 =</div><div class='add'>+	 * resue the old BSSID and still return success 0 = Add, 1 =</div><div class='ctx'> 	 * Update */</div><div class='ctx'> 	u8 action;</div><div class='ctx'> </div><div class='hunk'>@@ -2594,7 +2626,12 @@ enum tx_rate_info {</div><div class='ctx'> 	HAL_TX_RATE_SGI = 0x8,</div><div class='ctx'> </div><div class='ctx'> 	/* Rate with Long guard interval */</div><div class='del'>-	HAL_TX_RATE_LGI = 0x10</div><div class='add'>+	HAL_TX_RATE_LGI = 0x10,</div><div class='add'>+</div><div class='add'>+	/* VHT rates */</div><div class='add'>+	HAL_TX_RATE_VHT20  = 0x20,</div><div class='add'>+	HAL_TX_RATE_VHT40  = 0x40,</div><div class='add'>+	HAL_TX_RATE_VHT80  = 0x80,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ani_global_class_a_stats_info {</div><div class='hunk'>@@ -2640,7 +2677,7 @@ struct ani_global_security_stats {</div><div class='ctx'> 	 * management information base (MIB) object is enabled */</div><div class='ctx'> 	u32 rx_wep_unencrypted_frm_cnt;</div><div class='ctx'> </div><div class='del'>-	/* The number of received MSDU packets that that the 802.11 station</div><div class='add'>+	/* The number of received MSDU packets that the 802.11 station</div><div class='ctx'> 	 * discarded because of MIC failures */</div><div class='ctx'> 	u32 rx_mic_fail_cnt;</div><div class='ctx'> </div><div class='hunk'>@@ -3384,11 +3421,11 @@ struct tl_hal_flush_ac_rsp_msg {</div><div class='ctx'> </div><div class='ctx'> struct wcn36xx_hal_enter_imps_req_msg {</div><div class='ctx'> 	struct wcn36xx_hal_msg_header header;</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='del'>-struct wcn36xx_hal_exit_imps_req {</div><div class='add'>+struct wcn36xx_hal_exit_imps_req_msg {</div><div class='ctx'> 	struct wcn36xx_hal_msg_header header;</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct wcn36xx_hal_enter_bmps_req_msg {</div><div class='ctx'> 	struct wcn36xx_hal_msg_header header;</div><div class='hunk'>@@ -3427,9 +3464,6 @@ struct wcn36xx_hal_missed_beacon_ind_msg {</div><div class='ctx'> </div><div class='ctx'> /* Beacon Filtering data structures */</div><div class='ctx'> </div><div class='del'>-/* The above structure would be followed by multiple of below mentioned</div><div class='del'>- * structure</div><div class='del'>- */</div><div class='ctx'> struct beacon_filter_ie {</div><div class='ctx'> 	u8 element_id;</div><div class='ctx'> 	u8 check_ie_presence;</div><div class='hunk'>@@ -3437,7 +3471,27 @@ struct beacon_filter_ie {</div><div class='ctx'> 	u8 value;</div><div class='ctx'> 	u8 bitmask;</div><div class='ctx'> 	u8 ref;</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define WCN36XX_FILTER_CAPABILITY_MASK		0x73cf</div><div class='add'>+#define WCN36XX_FILTER_IE_DS_CHANNEL_MASK	0x00</div><div class='add'>+#define WCN36XX_FILTER_IE_ERP_FILTER_MASK	0xF8</div><div class='add'>+#define WCN36XX_FILTER_IE_EDCA_FILTER_MASK	0xF0</div><div class='add'>+#define WCN36XX_FILTER_IE_QOS_FILTER_MASK	0xF0</div><div class='add'>+#define WCN36XX_FILTER_IE_CHANNEL_SWITCH_MASK	0x00</div><div class='add'>+#define WCN36XX_FILTER_IE_HT_BYTE0_FILTER_MASK	0x00</div><div class='add'>+#define WCN36XX_FILTER_IE_HT_BYTE1_FILTER_MASK	0xF8</div><div class='add'>+#define WCN36XX_FILTER_IE_HT_BYTE2_FILTER_MASK	0xEB</div><div class='add'>+#define WCN36XX_FILTER_IE_HT_BYTE5_FILTER_MASK	0xFD</div><div class='add'>+#define WCN36XX_FILTER_IE_PWR_CONSTRAINT_MASK	0x00</div><div class='add'>+#define WCN36XX_FILTER_IE_OPMODE_NOTIF_MASK	0x00</div><div class='add'>+#define WCN36XX_FILTER_IE_VHTOP_CHWIDTH_MASK	0xFC</div><div class='add'>+#define WCN36XX_FILTER_IE_RSN_MASK		0x00</div><div class='add'>+#define WCN36XX_FILTER_IE_VENDOR_MASK		0x00</div><div class='add'>+</div><div class='add'>+/* The above structure would be followed by multiple of below mentioned</div><div class='add'>+ * structure</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> struct wcn36xx_hal_add_bcn_filter_req_msg {</div><div class='ctx'> 	struct wcn36xx_hal_msg_header header;</div><div class='hunk'>@@ -3448,14 +3502,14 @@ struct wcn36xx_hal_add_bcn_filter_req_msg {</div><div class='ctx'> 	u16 ie_num;</div><div class='ctx'> 	u8 bss_index;</div><div class='ctx'> 	u8 reserved;</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct wcn36xx_hal_rem_bcn_filter_req {</div><div class='ctx'> 	struct wcn36xx_hal_msg_header header;</div><div class='ctx'> </div><div class='ctx'> 	u8 ie_Count;</div><div class='ctx'> 	u8 rem_ie_id[1];</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> #define WCN36XX_HAL_IPV4_ARP_REPLY_OFFLOAD                  0</div><div class='ctx'> #define WCN36XX_HAL_IPV6_NEIGHBOR_DISCOVERY_OFFLOAD         1</div><div class='hunk'>@@ -3464,8 +3518,12 @@ struct wcn36xx_hal_rem_bcn_filter_req {</div><div class='ctx'> #define WCN36XX_HAL_OFFLOAD_DISABLE                         0</div><div class='ctx'> #define WCN36XX_HAL_OFFLOAD_ENABLE                          1</div><div class='ctx'> #define WCN36XX_HAL_OFFLOAD_BCAST_FILTER_ENABLE             0x2</div><div class='add'>+#define WCN36XX_HAL_OFFLOAD_MCAST_FILTER_ENABLE             0x4</div><div class='add'>+#define WCN36XX_HAL_OFFLOAD_NS_AND_MCAST_FILTER_ENABLE	\</div><div class='add'>+	(WCN36XX_HAL_OFFLOAD_ENABLE | WCN36XX_HAL_OFFLOAD_MCAST_FILTER_ENABLE)</div><div class='ctx'> #define WCN36XX_HAL_OFFLOAD_ARP_AND_BCAST_FILTER_ENABLE	\</div><div class='del'>-	(HAL_OFFLOAD_ENABLE|HAL_OFFLOAD_BCAST_FILTER_ENABLE)</div><div class='add'>+	(WCN36XX_HAL_OFFLOAD_ENABLE | WCN36XX_HAL_OFFLOAD_BCAST_FILTER_ENABLE)</div><div class='add'>+#define WCN36XX_HAL_IPV6_OFFLOAD_ADDR_MAX		0x02</div><div class='ctx'> </div><div class='ctx'> struct wcn36xx_hal_ns_offload_params {</div><div class='ctx'> 	u8 src_ipv6_addr[WCN36XX_HAL_IPV6_ADDR_LEN];</div><div class='hunk'>@@ -3487,10 +3545,10 @@ struct wcn36xx_hal_ns_offload_params {</div><div class='ctx'> 	/* slot index for this offload */</div><div class='ctx'> 	u32 slot_index;</div><div class='ctx'> 	u8 bss_index;</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct wcn36xx_hal_host_offload_req {</div><div class='del'>-	u8 offload_Type;</div><div class='add'>+	u8 offload_type;</div><div class='ctx'> </div><div class='ctx'> 	/* enable or disable */</div><div class='ctx'> 	u8 enable;</div><div class='hunk'>@@ -3499,13 +3557,13 @@ struct wcn36xx_hal_host_offload_req {</div><div class='ctx'> 		u8 host_ipv4_addr[4];</div><div class='ctx'> 		u8 host_ipv6_addr[WCN36XX_HAL_IPV6_ADDR_LEN];</div><div class='ctx'> 	} u;</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct wcn36xx_hal_host_offload_req_msg {</div><div class='ctx'> 	struct wcn36xx_hal_msg_header header;</div><div class='ctx'> 	struct wcn36xx_hal_host_offload_req host_offload_params;</div><div class='ctx'> 	struct wcn36xx_hal_ns_offload_params ns_offload_params;</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> /* Packet Types. */</div><div class='ctx'> #define WCN36XX_HAL_KEEP_ALIVE_NULL_PKT              1</div><div class='hunk'>@@ -4084,7 +4142,7 @@ struct wcn36xx_hal_dump_cmd_rsp_msg {</div><div class='ctx'> 	/* Length of the responce message */</div><div class='ctx'> 	u32 rsp_length;</div><div class='ctx'> </div><div class='del'>-	/* FIXME: Currently considering the the responce will be less than</div><div class='add'>+	/* FIXME: Currently considering the responce will be less than</div><div class='ctx'> 	 * 100bytes */</div><div class='ctx'> 	u8 rsp_buffer[DUMPCMD_RSP_BUFFER];</div><div class='ctx'> } __packed;</div><div class='hunk'>@@ -4426,80 +4484,6 @@ struct set_rssi_filter_resp {</div><div class='ctx'> 	u32 status;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Update scan params - sent from host to PNO to be used during PNO</div><div class='del'>- * scanningx */</div><div class='del'>-struct wcn36xx_hal_update_scan_params_req {</div><div class='del'>-</div><div class='del'>-	struct wcn36xx_hal_msg_header header;</div><div class='del'>-</div><div class='del'>-	/* Host setting for 11d */</div><div class='del'>-	u8 dot11d_enabled;</div><div class='del'>-</div><div class='del'>-	/* Lets PNO know that host has determined the regulatory domain */</div><div class='del'>-	u8 dot11d_resolved;</div><div class='del'>-</div><div class='del'>-	/* Channels on which PNO is allowed to scan */</div><div class='del'>-	u8 channel_count;</div><div class='del'>-	u8 channels[WCN36XX_HAL_PNO_MAX_NETW_CHANNELS];</div><div class='del'>-</div><div class='del'>-	/* Minimum channel time */</div><div class='del'>-	u16 active_min_ch_time;</div><div class='del'>-</div><div class='del'>-	/* Maximum channel time */</div><div class='del'>-	u16 active_max_ch_time;</div><div class='del'>-</div><div class='del'>-	/* Minimum channel time */</div><div class='del'>-	u16 passive_min_ch_time;</div><div class='del'>-</div><div class='del'>-	/* Maximum channel time */</div><div class='del'>-	u16 passive_max_ch_time;</div><div class='del'>-</div><div class='del'>-	/* Cb State */</div><div class='del'>-	enum phy_chan_bond_state state;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* Update scan params - sent from host to PNO to be used during PNO</div><div class='del'>- * scanningx */</div><div class='del'>-struct wcn36xx_hal_update_scan_params_req_ex {</div><div class='del'>-</div><div class='del'>-	struct wcn36xx_hal_msg_header header;</div><div class='del'>-</div><div class='del'>-	/* Host setting for 11d */</div><div class='del'>-	u8 dot11d_enabled;</div><div class='del'>-</div><div class='del'>-	/* Lets PNO know that host has determined the regulatory domain */</div><div class='del'>-	u8 dot11d_resolved;</div><div class='del'>-</div><div class='del'>-	/* Channels on which PNO is allowed to scan */</div><div class='del'>-	u8 channel_count;</div><div class='del'>-	u8 channels[WCN36XX_HAL_PNO_MAX_NETW_CHANNELS_EX];</div><div class='del'>-</div><div class='del'>-	/* Minimum channel time */</div><div class='del'>-	u16 active_min_ch_time;</div><div class='del'>-</div><div class='del'>-	/* Maximum channel time */</div><div class='del'>-	u16 active_max_ch_time;</div><div class='del'>-</div><div class='del'>-	/* Minimum channel time */</div><div class='del'>-	u16 passive_min_ch_time;</div><div class='del'>-</div><div class='del'>-	/* Maximum channel time */</div><div class='del'>-	u16 passive_max_ch_time;</div><div class='del'>-</div><div class='del'>-	/* Cb State */</div><div class='del'>-	enum phy_chan_bond_state state;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* Update scan params - sent from host to PNO to be used during PNO</div><div class='del'>- * scanningx */</div><div class='del'>-struct wcn36xx_hal_update_scan_params_resp {</div><div class='del'>-</div><div class='del'>-	struct wcn36xx_hal_msg_header header;</div><div class='del'>-</div><div class='del'>-	/* status of the request */</div><div class='del'>-	u32 status;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='ctx'> struct wcn36xx_hal_set_tx_per_tracking_req_msg {</div><div class='ctx'> 	struct wcn36xx_hal_msg_header header;</div><div class='ctx'> </div><div class='hunk'>@@ -4700,74 +4684,6 @@ struct wcn36xx_hal_set_power_params_resp {</div><div class='ctx'> 	u32 status;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/* Capability bitmap exchange definitions and macros starts */</div><div class='del'>-</div><div class='del'>-enum place_holder_in_cap_bitmap {</div><div class='del'>-	MCC = 0,</div><div class='del'>-	P2P = 1,</div><div class='del'>-	DOT11AC = 2,</div><div class='del'>-	SLM_SESSIONIZATION = 3,</div><div class='del'>-	DOT11AC_OPMODE = 4,</div><div class='del'>-	SAP32STA = 5,</div><div class='del'>-	TDLS = 6,</div><div class='del'>-	P2P_GO_NOA_DECOUPLE_INIT_SCAN = 7,</div><div class='del'>-	WLANACTIVE_OFFLOAD = 8,</div><div class='del'>-	BEACON_OFFLOAD = 9,</div><div class='del'>-	SCAN_OFFLOAD = 10,</div><div class='del'>-	ROAM_OFFLOAD = 11,</div><div class='del'>-	BCN_MISS_OFFLOAD = 12,</div><div class='del'>-	STA_POWERSAVE = 13,</div><div class='del'>-	STA_ADVANCED_PWRSAVE = 14,</div><div class='del'>-	AP_UAPSD = 15,</div><div class='del'>-	AP_DFS = 16,</div><div class='del'>-	BLOCKACK = 17,</div><div class='del'>-	PHY_ERR = 18,</div><div class='del'>-	BCN_FILTER = 19,</div><div class='del'>-	RTT = 20,</div><div class='del'>-	RATECTRL = 21,</div><div class='del'>-	WOW = 22,</div><div class='del'>-	WLAN_ROAM_SCAN_OFFLOAD = 23,</div><div class='del'>-	SPECULATIVE_PS_POLL = 24,</div><div class='del'>-	SCAN_SCH = 25,</div><div class='del'>-	IBSS_HEARTBEAT_OFFLOAD = 26,</div><div class='del'>-	WLAN_SCAN_OFFLOAD = 27,</div><div class='del'>-	WLAN_PERIODIC_TX_PTRN = 28,</div><div class='del'>-	ADVANCE_TDLS = 29,</div><div class='del'>-	BATCH_SCAN = 30,</div><div class='del'>-	FW_IN_TX_PATH = 31,</div><div class='del'>-	EXTENDED_NSOFFLOAD_SLOT = 32,</div><div class='del'>-	CH_SWITCH_V1 = 33,</div><div class='del'>-	HT40_OBSS_SCAN = 34,</div><div class='del'>-	UPDATE_CHANNEL_LIST = 35,</div><div class='del'>-	WLAN_MCADDR_FLT = 36,</div><div class='del'>-	WLAN_CH144 = 37,</div><div class='del'>-	NAN = 38,</div><div class='del'>-	TDLS_SCAN_COEXISTENCE = 39,</div><div class='del'>-	LINK_LAYER_STATS_MEAS = 40,</div><div class='del'>-	MU_MIMO = 41,</div><div class='del'>-	EXTENDED_SCAN = 42,</div><div class='del'>-	DYNAMIC_WMM_PS = 43,</div><div class='del'>-	MAC_SPOOFED_SCAN = 44,</div><div class='del'>-	BMU_ERROR_GENERIC_RECOVERY = 45,</div><div class='del'>-	DISA = 46,</div><div class='del'>-	FW_STATS = 47,</div><div class='del'>-	WPS_PRBRSP_TMPL = 48,</div><div class='del'>-	BCN_IE_FLT_DELTA = 49,</div><div class='del'>-	TDLS_OFF_CHANNEL = 51,</div><div class='del'>-	RTT3 = 52,</div><div class='del'>-	MGMT_FRAME_LOGGING = 53,</div><div class='del'>-	ENHANCED_TXBD_COMPLETION = 54,</div><div class='del'>-	LOGGING_ENHANCEMENT = 55,</div><div class='del'>-	EXT_SCAN_ENHANCED = 56,</div><div class='del'>-	MEMORY_DUMP_SUPPORTED = 57,</div><div class='del'>-	PER_PKT_STATS_SUPPORTED = 58,</div><div class='del'>-	EXT_LL_STAT = 60,</div><div class='del'>-	WIFI_CONFIG = 61,</div><div class='del'>-	ANTENNA_DIVERSITY_SELECTION = 62,</div><div class='del'>-</div><div class='del'>-	MAX_FEATURE_SUPPORTED = 128,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define WCN36XX_HAL_CAPS_SIZE 4</div><div class='ctx'> </div><div class='ctx'> struct wcn36xx_hal_feat_caps_msg {</div><div class='hunk'>@@ -4901,7 +4817,7 @@ struct wcn36xx_hal_gtk_offload_req_msg {</div><div class='ctx'> 	u64 key_replay_counter;</div><div class='ctx'> </div><div class='ctx'> 	u8 bss_index;</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct wcn36xx_hal_gtk_offload_rsp_msg {</div><div class='ctx'> 	struct wcn36xx_hal_msg_header header;</div><div class='hunk'>@@ -4915,7 +4831,7 @@ struct wcn36xx_hal_gtk_offload_rsp_msg {</div><div class='ctx'> struct wcn36xx_hal_gtk_offload_get_info_req_msg {</div><div class='ctx'> 	struct wcn36xx_hal_msg_header header;</div><div class='ctx'> 	u8 bss_index;</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct wcn36xx_hal_gtk_offload_get_info_rsp_msg {</div><div class='ctx'> 	struct wcn36xx_hal_msg_header header;</div><div class='hunk'>@@ -4939,7 +4855,7 @@ struct wcn36xx_hal_gtk_offload_get_info_rsp_msg {</div><div class='ctx'> 	u32 igtk_rekey_count;</div><div class='ctx'> </div><div class='ctx'> 	u8 bss_index;</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct dhcp_info {</div><div class='ctx'> 	/* Indicates the device mode which indicates about the DHCP activity */</div><div class='head'>diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c<br/>index afb4877eaad8..02a525645bfa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wcn36xx/main.c</a></div><div class='hunk'>@@ -19,14 +19,15 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='del'>-#include &lt;linux/of_irq.h&gt;</div><div class='ctx'> #include &lt;linux/rpmsg.h&gt;</div><div class='ctx'> #include &lt;linux/soc/qcom/smem_state.h&gt;</div><div class='ctx'> #include &lt;linux/soc/qcom/wcnss_ctrl.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include "wcn36xx.h"</div><div class='ctx'> #include "testmode.h"</div><div class='add'>+#include "firmware.h"</div><div class='ctx'> </div><div class='ctx'> unsigned int wcn36xx_dbg_mask;</div><div class='ctx'> module_param_named(debug_mask, wcn36xx_dbg_mask, uint, 0644);</div><div class='hunk'>@@ -84,7 +85,9 @@ static struct ieee80211_channel wcn_5ghz_channels[] = {</div><div class='ctx'> 	CHAN5G(5620, 124, PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH),</div><div class='ctx'> 	CHAN5G(5640, 128, PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH),</div><div class='ctx'> 	CHAN5G(5660, 132, PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_LOW),</div><div class='add'>+	CHAN5G(5680, 136, PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_LOW),</div><div class='ctx'> 	CHAN5G(5700, 140, PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH),</div><div class='add'>+	CHAN5G(5720, 144, PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH),</div><div class='ctx'> 	CHAN5G(5745, 149, PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_LOW),</div><div class='ctx'> 	CHAN5G(5765, 153, PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_LOW),</div><div class='ctx'> 	CHAN5G(5785, 157, PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH),</div><div class='hunk'>@@ -134,7 +137,9 @@ static struct ieee80211_supported_band wcn_band_2ghz = {</div><div class='ctx'> 		.cap =	IEEE80211_HT_CAP_GRN_FLD |</div><div class='ctx'> 			IEEE80211_HT_CAP_SGI_20 |</div><div class='ctx'> 			IEEE80211_HT_CAP_DSSSCCK40 |</div><div class='del'>-			IEEE80211_HT_CAP_LSIG_TXOP_PROT,</div><div class='add'>+			IEEE80211_HT_CAP_LSIG_TXOP_PROT |</div><div class='add'>+			IEEE80211_HT_CAP_SGI_40 |</div><div class='add'>+			IEEE80211_HT_CAP_SUP_WIDTH_20_40,</div><div class='ctx'> 		.ht_supported = true,</div><div class='ctx'> 		.ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K,</div><div class='ctx'> 		.ampdu_density = IEEE80211_HT_MPDU_DENSITY_16,</div><div class='hunk'>@@ -172,7 +177,9 @@ static struct ieee80211_supported_band wcn_band_5ghz = {</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> </div><div class='ctx'> static const struct wiphy_wowlan_support wowlan_support = {</div><div class='del'>-	.flags = WIPHY_WOWLAN_ANY</div><div class='add'>+	.flags = WIPHY_WOWLAN_ANY	|</div><div class='add'>+		 WIPHY_WOWLAN_MAGIC_PKT	|</div><div class='add'>+		 WIPHY_WOWLAN_SUPPORTS_GTK_REKEY</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='hunk'>@@ -185,84 +192,15 @@ static inline u8 get_sta_index(struct ieee80211_vif *vif,</div><div class='ctx'> 	       sta_priv-&gt;sta_index;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const char * const wcn36xx_caps_names[] = {</div><div class='del'>-	"MCC",				/* 0 */</div><div class='del'>-	"P2P",				/* 1 */</div><div class='del'>-	"DOT11AC",			/* 2 */</div><div class='del'>-	"SLM_SESSIONIZATION",		/* 3 */</div><div class='del'>-	"DOT11AC_OPMODE",		/* 4 */</div><div class='del'>-	"SAP32STA",			/* 5 */</div><div class='del'>-	"TDLS",				/* 6 */</div><div class='del'>-	"P2P_GO_NOA_DECOUPLE_INIT_SCAN",/* 7 */</div><div class='del'>-	"WLANACTIVE_OFFLOAD",		/* 8 */</div><div class='del'>-	"BEACON_OFFLOAD",		/* 9 */</div><div class='del'>-	"SCAN_OFFLOAD",			/* 10 */</div><div class='del'>-	"ROAM_OFFLOAD",			/* 11 */</div><div class='del'>-	"BCN_MISS_OFFLOAD",		/* 12 */</div><div class='del'>-	"STA_POWERSAVE",		/* 13 */</div><div class='del'>-	"STA_ADVANCED_PWRSAVE",		/* 14 */</div><div class='del'>-	"AP_UAPSD",			/* 15 */</div><div class='del'>-	"AP_DFS",			/* 16 */</div><div class='del'>-	"BLOCKACK",			/* 17 */</div><div class='del'>-	"PHY_ERR",			/* 18 */</div><div class='del'>-	"BCN_FILTER",			/* 19 */</div><div class='del'>-	"RTT",				/* 20 */</div><div class='del'>-	"RATECTRL",			/* 21 */</div><div class='del'>-	"WOW",				/* 22 */</div><div class='del'>-	"WLAN_ROAM_SCAN_OFFLOAD",	/* 23 */</div><div class='del'>-	"SPECULATIVE_PS_POLL",		/* 24 */</div><div class='del'>-	"SCAN_SCH",			/* 25 */</div><div class='del'>-	"IBSS_HEARTBEAT_OFFLOAD",	/* 26 */</div><div class='del'>-	"WLAN_SCAN_OFFLOAD",		/* 27 */</div><div class='del'>-	"WLAN_PERIODIC_TX_PTRN",	/* 28 */</div><div class='del'>-	"ADVANCE_TDLS",			/* 29 */</div><div class='del'>-	"BATCH_SCAN",			/* 30 */</div><div class='del'>-	"FW_IN_TX_PATH",		/* 31 */</div><div class='del'>-	"EXTENDED_NSOFFLOAD_SLOT",	/* 32 */</div><div class='del'>-	"CH_SWITCH_V1",			/* 33 */</div><div class='del'>-	"HT40_OBSS_SCAN",		/* 34 */</div><div class='del'>-	"UPDATE_CHANNEL_LIST",		/* 35 */</div><div class='del'>-	"WLAN_MCADDR_FLT",		/* 36 */</div><div class='del'>-	"WLAN_CH144",			/* 37 */</div><div class='del'>-	"NAN",				/* 38 */</div><div class='del'>-	"TDLS_SCAN_COEXISTENCE",	/* 39 */</div><div class='del'>-	"LINK_LAYER_STATS_MEAS",	/* 40 */</div><div class='del'>-	"MU_MIMO",			/* 41 */</div><div class='del'>-	"EXTENDED_SCAN",		/* 42 */</div><div class='del'>-	"DYNAMIC_WMM_PS",		/* 43 */</div><div class='del'>-	"MAC_SPOOFED_SCAN",		/* 44 */</div><div class='del'>-	"BMU_ERROR_GENERIC_RECOVERY",	/* 45 */</div><div class='del'>-	"DISA",				/* 46 */</div><div class='del'>-	"FW_STATS",			/* 47 */</div><div class='del'>-	"WPS_PRBRSP_TMPL",		/* 48 */</div><div class='del'>-	"BCN_IE_FLT_DELTA",		/* 49 */</div><div class='del'>-	"TDLS_OFF_CHANNEL",		/* 51 */</div><div class='del'>-	"RTT3",				/* 52 */</div><div class='del'>-	"MGMT_FRAME_LOGGING",		/* 53 */</div><div class='del'>-	"ENHANCED_TXBD_COMPLETION",	/* 54 */</div><div class='del'>-	"LOGGING_ENHANCEMENT",		/* 55 */</div><div class='del'>-	"EXT_SCAN_ENHANCED",		/* 56 */</div><div class='del'>-	"MEMORY_DUMP_SUPPORTED",	/* 57 */</div><div class='del'>-	"PER_PKT_STATS_SUPPORTED",	/* 58 */</div><div class='del'>-	"EXT_LL_STAT",			/* 60 */</div><div class='del'>-	"WIFI_CONFIG",			/* 61 */</div><div class='del'>-	"ANTENNA_DIVERSITY_SELECTION",	/* 62 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *wcn36xx_get_cap_name(enum place_holder_in_cap_bitmap x)</div><div class='del'>-{</div><div class='del'>-	if (x &gt;= ARRAY_SIZE(wcn36xx_caps_names))</div><div class='del'>-		return "UNKNOWN";</div><div class='del'>-	return wcn36xx_caps_names[x];</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void wcn36xx_feat_caps_info(struct wcn36xx *wcn)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MAX_FEATURE_SUPPORTED; i++) {</div><div class='del'>-		if (get_feat_caps(wcn-&gt;fw_feat_caps, i))</div><div class='del'>-			wcn36xx_dbg(WCN36XX_DBG_MAC, "FW Cap %s\n", wcn36xx_get_cap_name(i));</div><div class='add'>+		if (wcn36xx_firmware_get_feat_caps(wcn-&gt;fw_feat_caps, i)) {</div><div class='add'>+			wcn36xx_dbg(WCN36XX_DBG_MAC, "FW Cap %s\n",</div><div class='add'>+				    wcn36xx_firmware_get_cap_name(i));</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -293,23 +231,16 @@ static int wcn36xx_start(struct ieee80211_hw *hw)</div><div class='ctx'> 		goto out_free_dxe_pool;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wcn-&gt;hal_buf = kmalloc(WCN36XX_HAL_BUF_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!wcn-&gt;hal_buf) {</div><div class='del'>-		wcn36xx_err("Failed to allocate smd buf\n");</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out_free_dxe_ctl;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ret = wcn36xx_smd_load_nv(wcn);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		wcn36xx_err("Failed to push NV to chip\n");</div><div class='del'>-		goto out_free_smd_buf;</div><div class='add'>+		goto out_free_dxe_ctl;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = wcn36xx_smd_start(wcn);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		wcn36xx_err("Failed to start chip\n");</div><div class='del'>-		goto out_free_smd_buf;</div><div class='add'>+		goto out_free_dxe_ctl;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!wcn36xx_is_fw_version(wcn, 1, 2, 2, 24)) {</div><div class='hunk'>@@ -331,13 +262,12 @@ static int wcn36xx_start(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;wcn-&gt;vif_list);</div><div class='ctx'> 	spin_lock_init(&amp;wcn-&gt;dxe_lock);</div><div class='add'>+	spin_lock_init(&amp;wcn-&gt;survey_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_smd_stop:</div><div class='ctx'> 	wcn36xx_smd_stop(wcn);</div><div class='del'>-out_free_smd_buf:</div><div class='del'>-	kfree(wcn-&gt;hal_buf);</div><div class='ctx'> out_free_dxe_ctl:</div><div class='ctx'> 	wcn36xx_dxe_free_ctl_blks(wcn);</div><div class='ctx'> out_free_dxe_pool:</div><div class='hunk'>@@ -348,7 +278,7 @@ out_err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wcn36xx_stop(struct ieee80211_hw *hw)</div><div class='add'>+static void wcn36xx_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct wcn36xx *wcn = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -372,8 +302,6 @@ static void wcn36xx_stop(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	wcn36xx_dxe_free_mem_pools(wcn);</div><div class='ctx'> 	wcn36xx_dxe_free_ctl_blks(wcn);</div><div class='del'>-</div><div class='del'>-	kfree(wcn-&gt;hal_buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void wcn36xx_change_ps(struct wcn36xx *wcn, bool enable)</div><div class='hunk'>@@ -384,7 +312,7 @@ static void wcn36xx_change_ps(struct wcn36xx *wcn, bool enable)</div><div class='ctx'> 	list_for_each_entry(tmp, &amp;wcn-&gt;vif_list, list) {</div><div class='ctx'> 		vif = wcn36xx_priv_to_vif(tmp);</div><div class='ctx'> 		if (enable &amp;&amp; !wcn-&gt;sw_scan) {</div><div class='del'>-			if (vif-&gt;bss_conf.ps) /* ps allowed ? */</div><div class='add'>+			if (vif-&gt;cfg.ps) /* ps allowed ? */</div><div class='ctx'> 				wcn36xx_pmc_enter_bmps_state(wcn, vif);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			wcn36xx_pmc_exit_bmps_state(wcn, vif);</div><div class='hunk'>@@ -396,16 +324,47 @@ static void wcn36xx_change_opchannel(struct wcn36xx *wcn, int ch)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_vif *vif = NULL;</div><div class='ctx'> 	struct wcn36xx_vif *tmp;</div><div class='add'>+	struct ieee80211_supported_band *band;</div><div class='add'>+	struct ieee80211_channel *channel = NULL;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(wcn-&gt;hw-&gt;wiphy-&gt;bands); i++) {</div><div class='add'>+		band = wcn-&gt;hw-&gt;wiphy-&gt;bands[i];</div><div class='add'>+		if (!band)</div><div class='add'>+			break;</div><div class='add'>+		for (j = 0; j &lt; band-&gt;n_channels; j++) {</div><div class='add'>+			if (HW_VALUE_CHANNEL(band-&gt;channels[j].hw_value) == ch) {</div><div class='add'>+				channel = &amp;band-&gt;channels[j];</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (channel)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!channel) {</div><div class='add'>+		wcn36xx_err("Cannot tune to channel %d\n", ch);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;wcn-&gt;survey_lock, flags);</div><div class='add'>+	wcn-&gt;band = band;</div><div class='add'>+	wcn-&gt;channel = channel;</div><div class='add'>+	spin_unlock_irqrestore(&amp;wcn-&gt;survey_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(tmp, &amp;wcn-&gt;vif_list, list) {</div><div class='ctx'> 		vif = wcn36xx_priv_to_vif(tmp);</div><div class='ctx'> 		wcn36xx_smd_switch_channel(wcn, vif, ch);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wcn36xx_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+static int wcn36xx_config(struct ieee80211_hw *hw, int radio_idx, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct wcn36xx *wcn = hw-&gt;priv;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	wcn36xx_dbg(WCN36XX_DBG_MAC, "mac config changed 0x%08x\n", changed);</div><div class='ctx'> </div><div class='hunk'>@@ -416,19 +375,35 @@ static int wcn36xx_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> 		wcn36xx_dbg(WCN36XX_DBG_MAC, "wcn36xx_config channel switch=%d\n",</div><div class='ctx'> 			    ch);</div><div class='ctx'> </div><div class='del'>-		if (wcn-&gt;sw_scan_opchannel == ch) {</div><div class='add'>+		if (wcn-&gt;sw_scan_opchannel == ch &amp;&amp; wcn-&gt;sw_scan_channel) {</div><div class='ctx'> 			/* If channel is the initial operating channel, we may</div><div class='ctx'> 			 * want to receive/transmit regular data packets, then</div><div class='ctx'> 			 * simply stop the scan session and exit PS mode.</div><div class='ctx'> 			 */</div><div class='del'>-			wcn36xx_smd_finish_scan(wcn, HAL_SYS_MODE_SCAN,</div><div class='del'>-						wcn-&gt;sw_scan_vif);</div><div class='add'>+			if (wcn-&gt;sw_scan_channel)</div><div class='add'>+				wcn36xx_smd_end_scan(wcn, wcn-&gt;sw_scan_channel);</div><div class='add'>+			if (wcn-&gt;sw_scan_init) {</div><div class='add'>+				wcn36xx_smd_finish_scan(wcn, HAL_SYS_MODE_SCAN,</div><div class='add'>+							wcn-&gt;sw_scan_vif);</div><div class='add'>+			}</div><div class='ctx'> 		} else if (wcn-&gt;sw_scan) {</div><div class='ctx'> 			/* A scan is ongoing, do not change the operating</div><div class='ctx'> 			 * channel, but start a scan session on the channel.</div><div class='ctx'> 			 */</div><div class='del'>-			wcn36xx_smd_init_scan(wcn, HAL_SYS_MODE_SCAN,</div><div class='del'>-					      wcn-&gt;sw_scan_vif);</div><div class='add'>+			if (wcn-&gt;sw_scan_channel)</div><div class='add'>+				wcn36xx_smd_end_scan(wcn, wcn-&gt;sw_scan_channel);</div><div class='add'>+			if (!wcn-&gt;sw_scan_init) {</div><div class='add'>+				/* This can fail if we are unable to notify the</div><div class='add'>+				 * operating channel.</div><div class='add'>+				 */</div><div class='add'>+				ret = wcn36xx_smd_init_scan(wcn,</div><div class='add'>+							    HAL_SYS_MODE_SCAN,</div><div class='add'>+							    wcn-&gt;sw_scan_vif);</div><div class='add'>+				if (ret) {</div><div class='add'>+					mutex_unlock(&amp;wcn-&gt;conf_mutex);</div><div class='add'>+					return -EIO;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='ctx'> 			wcn36xx_smd_start_scan(wcn, ch);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			wcn36xx_change_opchannel(wcn, ch);</div><div class='hunk'>@@ -438,6 +413,13 @@ static int wcn36xx_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> 	if (changed &amp; IEEE80211_CONF_CHANGE_PS)</div><div class='ctx'> 		wcn36xx_change_ps(wcn, hw-&gt;conf.flags &amp; IEEE80211_CONF_PS);</div><div class='ctx'> </div><div class='add'>+	if (changed &amp; IEEE80211_CONF_CHANGE_IDLE) {</div><div class='add'>+		if (hw-&gt;conf.flags &amp; IEEE80211_CONF_IDLE)</div><div class='add'>+			wcn36xx_smd_enter_imps(wcn);</div><div class='add'>+		else</div><div class='add'>+			wcn36xx_smd_exit_imps(wcn);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;wcn-&gt;conf_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -575,12 +557,14 @@ static int wcn36xx_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 		if (IEEE80211_KEY_FLAG_PAIRWISE &amp; key_conf-&gt;flags) {</div><div class='ctx'> 			sta_priv-&gt;is_data_encrypted = true;</div><div class='ctx'> 			/* Reconfigure bss with encrypt_type */</div><div class='del'>-			if (NL80211_IFTYPE_STATION == vif-&gt;type)</div><div class='add'>+			if (NL80211_IFTYPE_STATION == vif-&gt;type) {</div><div class='ctx'> 				wcn36xx_smd_config_bss(wcn,</div><div class='ctx'> 						       vif,</div><div class='ctx'> 						       sta,</div><div class='ctx'> 						       sta-&gt;addr,</div><div class='ctx'> 						       true);</div><div class='add'>+				wcn36xx_smd_config_sta(wcn, vif, sta);</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			wcn36xx_smd_set_stakey(wcn,</div><div class='ctx'> 				vif_priv-&gt;encrypt_type,</div><div class='hunk'>@@ -610,15 +594,6 @@ static int wcn36xx_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		/* FIXME: Only enable bmps support when encryption is enabled.</div><div class='del'>-		 * For any reasons, when connected to open/no-security BSS,</div><div class='del'>-		 * the wcn36xx controller in bmps mode does not forward</div><div class='del'>-		 * 'wake-up' beacons despite AP sends DTIM with station AID.</div><div class='del'>-		 * It could be due to a firmware issue or to the way driver</div><div class='del'>-		 * configure the station.</div><div class='del'>-		 */</div><div class='del'>-		if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='del'>-			vif_priv-&gt;allow_bmps = true;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DISABLE_KEY:</div><div class='ctx'> 		if (!(IEEE80211_KEY_FLAG_PAIRWISE &amp; key_conf-&gt;flags)) {</div><div class='hunk'>@@ -656,19 +631,19 @@ static int wcn36xx_hw_scan(struct ieee80211_hw *hw,</div><div class='ctx'> 			   struct ieee80211_scan_request *hw_req)</div><div class='ctx'> {</div><div class='ctx'> 	struct wcn36xx *wcn = hw-&gt;priv;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='del'>-	if (!get_feat_caps(wcn-&gt;fw_feat_caps, SCAN_OFFLOAD)) {</div><div class='add'>+	if (!wcn36xx_firmware_get_feat_caps(wcn-&gt;fw_feat_caps, SCAN_OFFLOAD)) {</div><div class='ctx'> 		/* fallback to mac80211 software scan */</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* For unknown reason, the hardware offloaded scan only works with</div><div class='del'>-	 * 2.4Ghz channels, fallback to software scan in other cases.</div><div class='add'>+	/* Firmware scan offload is limited to 48 channels, fallback to</div><div class='add'>+	 * software driven scanning otherwise.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; hw_req-&gt;req.n_channels; i++) {</div><div class='del'>-		if (hw_req-&gt;req.channels[i]-&gt;band != NL80211_BAND_2GHZ)</div><div class='del'>-			return 1;</div><div class='add'>+	if (hw_req-&gt;req.n_channels &gt; 48) {</div><div class='add'>+		wcn36xx_warn("Offload scan aborted, n_channels=%u",</div><div class='add'>+			     hw_req-&gt;req.n_channels);</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wcn-&gt;scan_lock);</div><div class='hunk'>@@ -682,6 +657,7 @@ static int wcn36xx_hw_scan(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;wcn-&gt;scan_lock);</div><div class='ctx'> </div><div class='add'>+	wcn36xx_smd_update_channel_list(wcn, &amp;hw_req-&gt;req);</div><div class='ctx'> 	return wcn36xx_smd_start_hw_scan(wcn, vif, &amp;hw_req-&gt;req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -694,7 +670,7 @@ static void wcn36xx_cancel_hw_scan(struct ieee80211_hw *hw,</div><div class='ctx'> 	wcn-&gt;scan_aborted = true;</div><div class='ctx'> 	mutex_unlock(&amp;wcn-&gt;scan_lock);</div><div class='ctx'> </div><div class='del'>-	if (get_feat_caps(wcn-&gt;fw_feat_caps, SCAN_OFFLOAD)) {</div><div class='add'>+	if (wcn36xx_firmware_get_feat_caps(wcn-&gt;fw_feat_caps, SCAN_OFFLOAD)) {</div><div class='ctx'> 		/* ieee80211_scan_completed will be called on FW scan</div><div class='ctx'> 		 * indication */</div><div class='ctx'> 		wcn36xx_smd_stop_hw_scan(wcn);</div><div class='hunk'>@@ -708,8 +684,11 @@ static void wcn36xx_sw_scan_start(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct wcn36xx *wcn = hw-&gt;priv;</div><div class='ctx'> 	struct wcn36xx_vif *vif_priv = wcn36xx_vif_to_priv(vif);</div><div class='ctx'> </div><div class='add'>+	wcn36xx_dbg(WCN36XX_DBG_MAC, "sw_scan_start");</div><div class='add'>+</div><div class='ctx'> 	wcn-&gt;sw_scan = true;</div><div class='ctx'> 	wcn-&gt;sw_scan_vif = vif;</div><div class='add'>+	wcn-&gt;sw_scan_channel = 0;</div><div class='ctx'> 	if (vif_priv-&gt;sta_assoc)</div><div class='ctx'> 		wcn-&gt;sw_scan_opchannel = WCN36XX_HW_CHANNEL(wcn);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -721,8 +700,15 @@ static void wcn36xx_sw_scan_complete(struct ieee80211_hw *hw,</div><div class='ctx'> {</div><div class='ctx'> 	struct wcn36xx *wcn = hw-&gt;priv;</div><div class='ctx'> </div><div class='add'>+	wcn36xx_dbg(WCN36XX_DBG_MAC, "sw_scan_complete");</div><div class='add'>+</div><div class='ctx'> 	/* ensure that any scan session is finished */</div><div class='del'>-	wcn36xx_smd_finish_scan(wcn, HAL_SYS_MODE_SCAN, wcn-&gt;sw_scan_vif);</div><div class='add'>+	if (wcn-&gt;sw_scan_channel)</div><div class='add'>+		wcn36xx_smd_end_scan(wcn, wcn-&gt;sw_scan_channel);</div><div class='add'>+	if (wcn-&gt;sw_scan_init) {</div><div class='add'>+		wcn36xx_smd_finish_scan(wcn, HAL_SYS_MODE_SCAN,</div><div class='add'>+					wcn-&gt;sw_scan_vif);</div><div class='add'>+	}</div><div class='ctx'> 	wcn-&gt;sw_scan = false;</div><div class='ctx'> 	wcn-&gt;sw_scan_opchannel = 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -733,7 +719,7 @@ static void wcn36xx_update_allowed_rates(struct ieee80211_sta *sta,</div><div class='ctx'> 	int i, size;</div><div class='ctx'> 	u16 *rates_table;</div><div class='ctx'> 	struct wcn36xx_sta *sta_priv = wcn36xx_sta_to_priv(sta);</div><div class='del'>-	u32 rates = sta-&gt;supp_rates[band];</div><div class='add'>+	u32 rates = sta-&gt;deflink.supp_rates[band];</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;sta_priv-&gt;supported_rates, 0,</div><div class='ctx'> 		sizeof(sta_priv-&gt;supported_rates));</div><div class='hunk'>@@ -759,20 +745,20 @@ static void wcn36xx_update_allowed_rates(struct ieee80211_sta *sta,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;ht_cap.ht_supported) {</div><div class='del'>-		BUILD_BUG_ON(sizeof(sta-&gt;ht_cap.mcs.rx_mask) &gt;</div><div class='del'>-			sizeof(sta_priv-&gt;supported_rates.supported_mcs_set));</div><div class='add'>+	if (sta-&gt;deflink.ht_cap.ht_supported) {</div><div class='add'>+		BUILD_BUG_ON(sizeof(sta-&gt;deflink.ht_cap.mcs.rx_mask) &gt;</div><div class='add'>+			     sizeof(sta_priv-&gt;supported_rates.supported_mcs_set));</div><div class='ctx'> 		memcpy(sta_priv-&gt;supported_rates.supported_mcs_set,</div><div class='del'>-		       sta-&gt;ht_cap.mcs.rx_mask,</div><div class='del'>-		       sizeof(sta-&gt;ht_cap.mcs.rx_mask));</div><div class='add'>+		       sta-&gt;deflink.ht_cap.mcs.rx_mask,</div><div class='add'>+		       sizeof(sta-&gt;deflink.ht_cap.mcs.rx_mask));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;vht_cap.vht_supported) {</div><div class='add'>+	if (sta-&gt;deflink.vht_cap.vht_supported) {</div><div class='ctx'> 		sta_priv-&gt;supported_rates.op_rate_mode = STA_11ac;</div><div class='ctx'> 		sta_priv-&gt;supported_rates.vht_rx_mcs_map =</div><div class='del'>-				sta-&gt;vht_cap.vht_mcs.rx_mcs_map;</div><div class='add'>+			le16_to_cpu(sta-&gt;deflink.vht_cap.vht_mcs.rx_mcs_map);</div><div class='ctx'> 		sta_priv-&gt;supported_rates.vht_tx_mcs_map =</div><div class='del'>-				sta-&gt;vht_cap.vht_mcs.tx_mcs_map;</div><div class='add'>+			le16_to_cpu(sta-&gt;deflink.vht_cap.vht_mcs.tx_mcs_map);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -813,7 +799,7 @@ void wcn36xx_set_default_rates_v1(struct wcn36xx_hal_supported_rates_v1 *rates)</div><div class='ctx'> static void wcn36xx_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 				     struct ieee80211_vif *vif,</div><div class='ctx'> 				     struct ieee80211_bss_conf *bss_conf,</div><div class='del'>-				     u32 changed)</div><div class='add'>+				     u64 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct wcn36xx *wcn = hw-&gt;priv;</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='hunk'>@@ -821,7 +807,7 @@ static void wcn36xx_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	enum wcn36xx_hal_link_state link_state;</div><div class='ctx'> 	struct wcn36xx_vif *vif_priv = wcn36xx_vif_to_priv(vif);</div><div class='ctx'> </div><div class='del'>-	wcn36xx_dbg(WCN36XX_DBG_MAC, "mac bss info changed vif %p changed 0x%08x\n",</div><div class='add'>+	wcn36xx_dbg(WCN36XX_DBG_MAC, "mac bss info changed vif %p changed 0x%llx\n",</div><div class='ctx'> 		    vif, changed);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wcn-&gt;conf_mutex);</div><div class='hunk'>@@ -860,17 +846,17 @@ static void wcn36xx_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 		wcn36xx_dbg(WCN36XX_DBG_MAC,</div><div class='ctx'> 			    "mac bss changed ssid\n");</div><div class='ctx'> 		wcn36xx_dbg_dump(WCN36XX_DBG_MAC, "ssid ",</div><div class='del'>-				 bss_conf-&gt;ssid, bss_conf-&gt;ssid_len);</div><div class='add'>+				 vif-&gt;cfg.ssid, vif-&gt;cfg.ssid_len);</div><div class='ctx'> </div><div class='del'>-		vif_priv-&gt;ssid.length = bss_conf-&gt;ssid_len;</div><div class='add'>+		vif_priv-&gt;ssid.length = vif-&gt;cfg.ssid_len;</div><div class='ctx'> 		memcpy(&amp;vif_priv-&gt;ssid.ssid,</div><div class='del'>-		       bss_conf-&gt;ssid,</div><div class='del'>-		       bss_conf-&gt;ssid_len);</div><div class='add'>+		       vif-&gt;cfg.ssid,</div><div class='add'>+		       vif-&gt;cfg.ssid_len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_ASSOC) {</div><div class='ctx'> 		vif_priv-&gt;is_joining = false;</div><div class='del'>-		if (bss_conf-&gt;assoc) {</div><div class='add'>+		if (vif-&gt;cfg.assoc) {</div><div class='ctx'> 			struct ieee80211_sta *sta;</div><div class='ctx'> 			struct wcn36xx_sta *sta_priv;</div><div class='ctx'> </div><div class='hunk'>@@ -878,7 +864,7 @@ static void wcn36xx_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 				    "mac assoc bss %pM vif %pM AID=%d\n",</div><div class='ctx'> 				     bss_conf-&gt;bssid,</div><div class='ctx'> 				     vif-&gt;addr,</div><div class='del'>-				     bss_conf-&gt;aid);</div><div class='add'>+				     vif-&gt;cfg.aid);</div><div class='ctx'> </div><div class='ctx'> 			vif_priv-&gt;sta_assoc = true;</div><div class='ctx'> </div><div class='hunk'>@@ -904,21 +890,22 @@ static void wcn36xx_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 			wcn36xx_smd_config_bss(wcn, vif, sta,</div><div class='ctx'> 					       bss_conf-&gt;bssid,</div><div class='ctx'> 					       true);</div><div class='del'>-			sta_priv-&gt;aid = bss_conf-&gt;aid;</div><div class='add'>+			sta_priv-&gt;aid = vif-&gt;cfg.aid;</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * config_sta must be called from  because this is the</div><div class='ctx'> 			 * place where AID is available.</div><div class='ctx'> 			 */</div><div class='ctx'> 			wcn36xx_smd_config_sta(wcn, vif, sta);</div><div class='add'>+			if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+				wcn36xx_smd_add_beacon_filter(wcn, vif);</div><div class='ctx'> 			wcn36xx_enable_keep_alive_null_packet(wcn, vif);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			wcn36xx_dbg(WCN36XX_DBG_MAC,</div><div class='ctx'> 				    "disassociated bss %pM vif %pM AID=%d\n",</div><div class='ctx'> 				    bss_conf-&gt;bssid,</div><div class='ctx'> 				    vif-&gt;addr,</div><div class='del'>-				    bss_conf-&gt;aid);</div><div class='add'>+				    vif-&gt;cfg.aid);</div><div class='ctx'> 			vif_priv-&gt;sta_assoc = false;</div><div class='del'>-			vif_priv-&gt;allow_bmps = false;</div><div class='ctx'> 			wcn36xx_smd_set_link_st(wcn,</div><div class='ctx'> 						bss_conf-&gt;bssid,</div><div class='ctx'> 						vif-&gt;addr,</div><div class='hunk'>@@ -950,7 +937,7 @@ static void wcn36xx_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 			wcn36xx_smd_config_bss(wcn, vif, NULL,</div><div class='ctx'> 					       vif-&gt;addr, false);</div><div class='ctx'> 			skb = ieee80211_beacon_get_tim(hw, vif, &amp;tim_off,</div><div class='del'>-						       &amp;tim_len);</div><div class='add'>+						       &amp;tim_len, 0);</div><div class='ctx'> 			if (!skb) {</div><div class='ctx'> 				wcn36xx_err("failed to alloc beacon skb\n");</div><div class='ctx'> 				goto out;</div><div class='hunk'>@@ -978,7 +965,8 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* this is required when using IEEE80211_HW_HAS_RATE_CONTROL */</div><div class='del'>-static int wcn36xx_set_rts_threshold(struct ieee80211_hw *hw, u32 value)</div><div class='add'>+static int wcn36xx_set_rts_threshold(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+				     u32 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct wcn36xx *wcn = hw-&gt;priv;</div><div class='ctx'> 	wcn36xx_dbg(WCN36XX_DBG_MAC, "mac set RTS threshold %d\n", value);</div><div class='hunk'>@@ -1088,28 +1076,102 @@ static int wcn36xx_sta_remove(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> </div><div class='add'>+static struct ieee80211_vif *wcn36xx_get_first_assoc_vif(struct wcn36xx *wcn)</div><div class='add'>+{</div><div class='add'>+	struct wcn36xx_vif *vif_priv = NULL;</div><div class='add'>+	struct ieee80211_vif *vif = NULL;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(vif_priv, &amp;wcn-&gt;vif_list, list) {</div><div class='add'>+		if (vif_priv-&gt;sta_assoc) {</div><div class='add'>+			vif = wcn36xx_priv_to_vif(vif_priv);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return vif;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int wcn36xx_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wow)</div><div class='ctx'> {</div><div class='ctx'> 	struct wcn36xx *wcn = hw-&gt;priv;</div><div class='add'>+	struct ieee80211_vif *vif = NULL;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	wcn36xx_dbg(WCN36XX_DBG_MAC, "mac suspend\n");</div><div class='ctx'> </div><div class='del'>-	flush_workqueue(wcn-&gt;hal_ind_wq);</div><div class='del'>-	wcn36xx_smd_set_power_params(wcn, true);</div><div class='del'>-	return 0;</div><div class='add'>+	mutex_lock(&amp;wcn-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	vif = wcn36xx_get_first_assoc_vif(wcn);</div><div class='add'>+	if (vif) {</div><div class='add'>+		ret = wcn36xx_smd_arp_offload(wcn, vif, true);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+		ret = wcn36xx_smd_ipv6_ns_offload(wcn, vif, true);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+		ret = wcn36xx_smd_gtk_offload(wcn, vif, true);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+		ret = wcn36xx_smd_set_power_params(wcn, true);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+		ret = wcn36xx_smd_wlan_host_suspend_ind(wcn);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable IRQ, we don't want to handle any packet before mac80211 is</div><div class='add'>+	 * resumed and ready to receive packets.</div><div class='add'>+	 */</div><div class='add'>+	disable_irq(wcn-&gt;tx_irq);</div><div class='add'>+	disable_irq(wcn-&gt;rx_irq);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;wcn-&gt;conf_mutex);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int wcn36xx_resume(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct wcn36xx *wcn = hw-&gt;priv;</div><div class='add'>+	struct ieee80211_vif *vif = NULL;</div><div class='ctx'> </div><div class='ctx'> 	wcn36xx_dbg(WCN36XX_DBG_MAC, "mac resume\n");</div><div class='ctx'> </div><div class='del'>-	flush_workqueue(wcn-&gt;hal_ind_wq);</div><div class='del'>-	wcn36xx_smd_set_power_params(wcn, false);</div><div class='add'>+	mutex_lock(&amp;wcn-&gt;conf_mutex);</div><div class='add'>+	vif = wcn36xx_get_first_assoc_vif(wcn);</div><div class='add'>+	if (vif) {</div><div class='add'>+		wcn36xx_smd_host_resume(wcn);</div><div class='add'>+		wcn36xx_smd_set_power_params(wcn, false);</div><div class='add'>+		wcn36xx_smd_gtk_offload_get_info(wcn, vif);</div><div class='add'>+		wcn36xx_smd_gtk_offload(wcn, vif, false);</div><div class='add'>+		wcn36xx_smd_ipv6_ns_offload(wcn, vif, false);</div><div class='add'>+		wcn36xx_smd_arp_offload(wcn, vif, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	enable_irq(wcn-&gt;tx_irq);</div><div class='add'>+	enable_irq(wcn-&gt;rx_irq);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;wcn-&gt;conf_mutex);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void wcn36xx_set_rekey_data(struct ieee80211_hw *hw,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct cfg80211_gtk_rekey_data *data)</div><div class='add'>+{</div><div class='add'>+	struct wcn36xx *wcn = hw-&gt;priv;</div><div class='add'>+	struct wcn36xx_vif *vif_priv = wcn36xx_vif_to_priv(vif);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wcn-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	memcpy(vif_priv-&gt;rekey_data.kek, data-&gt;kek, NL80211_KEK_LEN);</div><div class='add'>+	memcpy(vif_priv-&gt;rekey_data.kck, data-&gt;kck, NL80211_KCK_LEN);</div><div class='add'>+	vif_priv-&gt;rekey_data.replay_ctr =</div><div class='add'>+		cpu_to_le64(be64_to_cpup((__be64 *)data-&gt;replay_ctr));</div><div class='add'>+	vif_priv-&gt;rekey_data.valid = true;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;wcn-&gt;conf_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int wcn36xx_ampdu_action(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -1123,7 +1185,7 @@ static int wcn36xx_ampdu_action(struct ieee80211_hw *hw,</div><div class='ctx'> 	u16 tid = params-&gt;tid;</div><div class='ctx'> 	u16 *ssn = &amp;params-&gt;ssn;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	u8 session;</div><div class='add'>+	int session;</div><div class='ctx'> </div><div class='ctx'> 	wcn36xx_dbg(WCN36XX_DBG_MAC, "mac ampdu action action %d tid %d\n",</div><div class='ctx'> 		    action, tid);</div><div class='hunk'>@@ -1135,9 +1197,11 @@ static int wcn36xx_ampdu_action(struct ieee80211_hw *hw,</div><div class='ctx'> 		sta_priv-&gt;tid = tid;</div><div class='ctx'> 		session = wcn36xx_smd_add_ba_session(wcn, sta, tid, ssn, 0,</div><div class='ctx'> 						     get_sta_index(vif, sta_priv));</div><div class='add'>+		if (session &lt; 0) {</div><div class='add'>+			ret = session;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		wcn36xx_smd_add_ba(wcn, session);</div><div class='del'>-		wcn36xx_smd_trigger_ba(wcn, get_sta_index(vif, sta_priv), tid,</div><div class='del'>-				       session);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_AMPDU_RX_STOP:</div><div class='ctx'> 		wcn36xx_smd_del_ba(wcn, tid, 0, get_sta_index(vif, sta_priv));</div><div class='hunk'>@@ -1147,6 +1211,18 @@ static int wcn36xx_ampdu_action(struct ieee80211_hw *hw,</div><div class='ctx'> 		sta_priv-&gt;ampdu_state[tid] = WCN36XX_AMPDU_START;</div><div class='ctx'> 		spin_unlock_bh(&amp;sta_priv-&gt;ampdu_lock);</div><div class='ctx'> </div><div class='add'>+		/* Replace the mac80211 ssn with the firmware one */</div><div class='add'>+		wcn36xx_dbg(WCN36XX_DBG_MAC, "mac ampdu ssn = %u\n", *ssn);</div><div class='add'>+		wcn36xx_smd_trigger_ba(wcn, get_sta_index(vif, sta_priv), tid, ssn);</div><div class='add'>+		wcn36xx_dbg(WCN36XX_DBG_MAC, "mac ampdu fw-ssn = %u\n", *ssn);</div><div class='add'>+</div><div class='add'>+		/* Start BA session */</div><div class='add'>+		session = wcn36xx_smd_add_ba_session(wcn, sta, tid, ssn, 1,</div><div class='add'>+						     get_sta_index(vif, sta_priv));</div><div class='add'>+		if (session &lt; 0) {</div><div class='add'>+			ret = session;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		ret = IEEE80211_AMPDU_TX_START_IMMEDIATE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_OPERATIONAL:</div><div class='hunk'>@@ -1154,8 +1230,6 @@ static int wcn36xx_ampdu_action(struct ieee80211_hw *hw,</div><div class='ctx'> 		sta_priv-&gt;ampdu_state[tid] = WCN36XX_AMPDU_OPERATIONAL;</div><div class='ctx'> 		spin_unlock_bh(&amp;sta_priv-&gt;ampdu_lock);</div><div class='ctx'> </div><div class='del'>-		wcn36xx_smd_add_ba_session(wcn, sta, tid, ssn, 1,</div><div class='del'>-			get_sta_index(vif, sta_priv));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_STOP_FLUSH:</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:</div><div class='hunk'>@@ -1171,12 +1245,113 @@ static int wcn36xx_ampdu_action(struct ieee80211_hw *hw,</div><div class='ctx'> 		wcn36xx_err("Unknown AMPDU action\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	mutex_unlock(&amp;wcn-&gt;conf_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+static void wcn36xx_ipv6_addr_change(struct ieee80211_hw *hw,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     struct inet6_dev *idev)</div><div class='add'>+{</div><div class='add'>+	struct wcn36xx_vif *vif_priv = wcn36xx_vif_to_priv(vif);</div><div class='add'>+	struct inet6_ifaddr *ifa;</div><div class='add'>+	int idx = 0;</div><div class='add'>+</div><div class='add'>+	memset(vif_priv-&gt;tentative_addrs, 0, sizeof(vif_priv-&gt;tentative_addrs));</div><div class='add'>+</div><div class='add'>+	read_lock_bh(&amp;idev-&gt;lock);</div><div class='add'>+	list_for_each_entry(ifa, &amp;idev-&gt;addr_list, if_list) {</div><div class='add'>+		vif_priv-&gt;target_ipv6_addrs[idx] = ifa-&gt;addr;</div><div class='add'>+		if (ifa-&gt;flags &amp; IFA_F_TENTATIVE)</div><div class='add'>+			__set_bit(idx, vif_priv-&gt;tentative_addrs);</div><div class='add'>+		idx++;</div><div class='add'>+		if (idx &gt;= WCN36XX_HAL_IPV6_OFFLOAD_ADDR_MAX)</div><div class='add'>+			break;</div><div class='add'>+		wcn36xx_dbg(WCN36XX_DBG_MAC, "%pI6 %s\n", &amp;ifa-&gt;addr,</div><div class='add'>+			    (ifa-&gt;flags &amp; IFA_F_TENTATIVE) ? "tentative" : NULL);</div><div class='add'>+	}</div><div class='add'>+	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	vif_priv-&gt;num_target_ipv6_addrs = idx;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void wcn36xx_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			  u32 queues, bool drop)</div><div class='add'>+{</div><div class='add'>+	struct wcn36xx *wcn = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (wcn36xx_dxe_tx_flush(wcn)) {</div><div class='add'>+		wcn36xx_err("Failed to flush hardware tx queues\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wcn36xx_get_survey(struct ieee80211_hw *hw, int idx,</div><div class='add'>+			      struct survey_info *survey)</div><div class='add'>+{</div><div class='add'>+	struct wcn36xx *wcn = hw-&gt;priv;</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	struct wcn36xx_chan_survey *chan_survey;</div><div class='add'>+	int band_idx;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	sband = wcn-&gt;hw-&gt;wiphy-&gt;bands[NL80211_BAND_2GHZ];</div><div class='add'>+	band_idx = idx;</div><div class='add'>+	if (band_idx &gt;= sband-&gt;n_channels) {</div><div class='add'>+		band_idx -= sband-&gt;n_channels;</div><div class='add'>+		sband = wcn-&gt;hw-&gt;wiphy-&gt;bands[NL80211_BAND_5GHZ];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!sband || band_idx &gt;= sband-&gt;n_channels)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;wcn-&gt;survey_lock, flags);</div><div class='add'>+</div><div class='add'>+	chan_survey = &amp;wcn-&gt;chan_survey[idx];</div><div class='add'>+	survey-&gt;channel = &amp;sband-&gt;channels[band_idx];</div><div class='add'>+	survey-&gt;noise = chan_survey-&gt;rssi - chan_survey-&gt;snr;</div><div class='add'>+	survey-&gt;filled = 0;</div><div class='add'>+</div><div class='add'>+	if (chan_survey-&gt;rssi &gt; -100 &amp;&amp; chan_survey-&gt;rssi &lt; 0)</div><div class='add'>+		survey-&gt;filled |= SURVEY_INFO_NOISE_DBM;</div><div class='add'>+</div><div class='add'>+	if (survey-&gt;channel == wcn-&gt;channel)</div><div class='add'>+		survey-&gt;filled |= SURVEY_INFO_IN_USE;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;wcn-&gt;survey_lock, flags);</div><div class='add'>+</div><div class='add'>+	wcn36xx_dbg(WCN36XX_DBG_MAC,</div><div class='add'>+		    "ch %d rssi %d snr %d noise %d filled %x freq %d\n",</div><div class='add'>+		    HW_VALUE_CHANNEL(survey-&gt;channel-&gt;hw_value),</div><div class='add'>+		    chan_survey-&gt;rssi, chan_survey-&gt;snr, survey-&gt;noise,</div><div class='add'>+		    survey-&gt;filled, survey-&gt;channel-&gt;center_freq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wcn36xx_sta_statistics(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_sta *sta, struct station_info *sinfo)</div><div class='add'>+{</div><div class='add'>+	struct wcn36xx *wcn;</div><div class='add'>+	u8 sta_index;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	wcn = hw-&gt;priv;</div><div class='add'>+	sta_index = get_sta_index(vif, wcn36xx_sta_to_priv(sta));</div><div class='add'>+	status = wcn36xx_smd_get_stats(wcn, sta_index, HAL_GLOBAL_CLASS_A_STATS_INFO, sinfo);</div><div class='add'>+</div><div class='add'>+	if (status)</div><div class='add'>+		wcn36xx_err("wcn36xx_smd_get_stats failed\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct ieee80211_ops wcn36xx_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.start			= wcn36xx_start,</div><div class='ctx'> 	.stop			= wcn36xx_stop,</div><div class='ctx'> 	.add_interface		= wcn36xx_add_interface,</div><div class='hunk'>@@ -1184,11 +1359,13 @@ static const struct ieee80211_ops wcn36xx_ops = {</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend		= wcn36xx_suspend,</div><div class='ctx'> 	.resume			= wcn36xx_resume,</div><div class='add'>+	.set_rekey_data		= wcn36xx_set_rekey_data,</div><div class='ctx'> #endif</div><div class='ctx'> 	.config			= wcn36xx_config,</div><div class='ctx'> 	.prepare_multicast	= wcn36xx_prepare_multicast,</div><div class='ctx'> 	.configure_filter       = wcn36xx_configure_filter,</div><div class='ctx'> 	.tx			= wcn36xx_tx,</div><div class='add'>+	.wake_tx_queue		= ieee80211_handle_wake_tx_queue,</div><div class='ctx'> 	.set_key		= wcn36xx_set_key,</div><div class='ctx'> 	.hw_scan		= wcn36xx_hw_scan,</div><div class='ctx'> 	.cancel_hw_scan		= wcn36xx_cancel_hw_scan,</div><div class='hunk'>@@ -1198,7 +1375,13 @@ static const struct ieee80211_ops wcn36xx_ops = {</div><div class='ctx'> 	.set_rts_threshold	= wcn36xx_set_rts_threshold,</div><div class='ctx'> 	.sta_add		= wcn36xx_sta_add,</div><div class='ctx'> 	.sta_remove		= wcn36xx_sta_remove,</div><div class='add'>+	.sta_statistics		= wcn36xx_sta_statistics,</div><div class='ctx'> 	.ampdu_action		= wcn36xx_ampdu_action,</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	.ipv6_addr_change	= wcn36xx_ipv6_addr_change,</div><div class='add'>+#endif</div><div class='add'>+	.flush			= wcn36xx_flush,</div><div class='add'>+	.get_survey		= wcn36xx_get_survey,</div><div class='ctx'> </div><div class='ctx'> 	CFG80211_TESTMODE_CMD(wcn36xx_tm_cmd)</div><div class='ctx'> };</div><div class='hunk'>@@ -1248,7 +1431,6 @@ static int wcn36xx_init_ieee80211(struct wcn36xx *wcn)</div><div class='ctx'> 	ieee80211_hw_set(wcn-&gt;hw, HAS_RATE_CONTROL);</div><div class='ctx'> 	ieee80211_hw_set(wcn-&gt;hw, SINGLE_SCAN_ON_ALL_BANDS);</div><div class='ctx'> 	ieee80211_hw_set(wcn-&gt;hw, REPORTS_TX_ACK_STATUS);</div><div class='del'>-	ieee80211_hw_set(wcn-&gt;hw, CONNECTION_MONITOR);</div><div class='ctx'> </div><div class='ctx'> 	wcn-&gt;hw-&gt;wiphy-&gt;interface_modes = BIT(NL80211_IFTYPE_STATION) |</div><div class='ctx'> 		BIT(NL80211_IFTYPE_AP) |</div><div class='hunk'>@@ -1292,25 +1474,20 @@ static int wcn36xx_platform_get_resources(struct wcn36xx *wcn,</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *mmio_node;</div><div class='ctx'> 	struct device_node *iris_node;</div><div class='del'>-	struct resource *res;</div><div class='ctx'> 	int index;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Set TX IRQ */</div><div class='del'>-	res = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "tx");</div><div class='del'>-	if (!res) {</div><div class='del'>-		wcn36xx_err("failed to get tx_irq\n");</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	}</div><div class='del'>-	wcn-&gt;tx_irq = res-&gt;start;</div><div class='add'>+	ret = platform_get_irq_byname(pdev, "tx");</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	wcn-&gt;tx_irq = ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Set RX IRQ */</div><div class='del'>-	res = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "rx");</div><div class='del'>-	if (!res) {</div><div class='del'>-		wcn36xx_err("failed to get rx_irq\n");</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	}</div><div class='del'>-	wcn-&gt;rx_irq = res-&gt;start;</div><div class='add'>+	ret = platform_get_irq_byname(pdev, "rx");</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	wcn-&gt;rx_irq = ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Acquire SMSM tx enable handle */</div><div class='ctx'> 	wcn-&gt;tx_enable_state = qcom_smem_state_get(&amp;pdev-&gt;dev,</div><div class='hunk'>@@ -1335,6 +1512,7 @@ static int wcn36xx_platform_get_resources(struct wcn36xx *wcn,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wcn-&gt;is_pronto = !!of_device_is_compatible(mmio_node, "qcom,pronto");</div><div class='add'>+	wcn-&gt;is_pronto_v3 = !!of_device_is_compatible(mmio_node, "qcom,pronto-v3-pil");</div><div class='ctx'> </div><div class='ctx'> 	/* Map the CCU memory */</div><div class='ctx'> 	index = of_property_match_string(mmio_node, "reg-names", "ccu");</div><div class='hunk'>@@ -1359,6 +1537,9 @@ static int wcn36xx_platform_get_resources(struct wcn36xx *wcn,</div><div class='ctx'> 	if (iris_node) {</div><div class='ctx'> 		if (of_device_is_compatible(iris_node, "qcom,wcn3620"))</div><div class='ctx'> 			wcn-&gt;rf_id = RF_IRIS_WCN3620;</div><div class='add'>+		if (of_device_is_compatible(iris_node, "qcom,wcn3660") ||</div><div class='add'>+		    of_device_is_compatible(iris_node, "qcom,wcn3660b"))</div><div class='add'>+			wcn-&gt;rf_id = RF_IRIS_WCN3660;</div><div class='ctx'> 		if (of_device_is_compatible(iris_node, "qcom,wcn3680"))</div><div class='ctx'> 			wcn-&gt;rf_id = RF_IRIS_WCN3680;</div><div class='ctx'> 		of_node_put(iris_node);</div><div class='hunk'>@@ -1381,6 +1562,7 @@ static int wcn36xx_probe(struct platform_device *pdev)</div><div class='ctx'> 	void *wcnss;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	const u8 *addr;</div><div class='add'>+	int n_channels;</div><div class='ctx'> </div><div class='ctx'> 	wcn36xx_dbg(WCN36XX_DBG_MAC, "platform probe\n");</div><div class='ctx'> </div><div class='hunk'>@@ -1400,6 +1582,23 @@ static int wcn36xx_probe(struct platform_device *pdev)</div><div class='ctx'> 	mutex_init(&amp;wcn-&gt;conf_mutex);</div><div class='ctx'> 	mutex_init(&amp;wcn-&gt;hal_mutex);</div><div class='ctx'> 	mutex_init(&amp;wcn-&gt;scan_lock);</div><div class='add'>+	__skb_queue_head_init(&amp;wcn-&gt;amsdu);</div><div class='add'>+</div><div class='add'>+	wcn-&gt;hal_buf = devm_kmalloc(wcn-&gt;dev, WCN36XX_HAL_BUF_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!wcn-&gt;hal_buf) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_wq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	n_channels = wcn_band_2ghz.n_channels + wcn_band_5ghz.n_channels;</div><div class='add'>+	wcn-&gt;chan_survey = devm_kcalloc(wcn-&gt;dev,</div><div class='add'>+					n_channels,</div><div class='add'>+					sizeof(struct wcn36xx_chan_survey),</div><div class='add'>+					GFP_KERNEL);</div><div class='add'>+	if (!wcn-&gt;chan_survey) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_wq;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = dma_set_mask_and_coherent(wcn-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -1407,6 +1606,13 @@ static int wcn36xx_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto out_wq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	wcn-&gt;nv_file = WLAN_NV_FILE;</div><div class='add'>+	ret = of_property_read_string(wcn-&gt;dev-&gt;parent-&gt;of_node, "firmware-name", &amp;wcn-&gt;nv_file);</div><div class='add'>+	if (ret &lt; 0 &amp;&amp; ret != -EINVAL) {</div><div class='add'>+		wcn36xx_err("failed to read \"firmware-name\" property: %d\n", ret);</div><div class='add'>+		goto out_wq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	wcn-&gt;smd_channel = qcom_wcnss_open_channel(wcnss, "WLAN_CTRL", wcn36xx_smd_rsp_process, hw);</div><div class='ctx'> 	if (IS_ERR(wcn-&gt;smd_channel)) {</div><div class='ctx'> 		wcn36xx_err("failed to open WLAN_CTRL channel\n");</div><div class='hunk'>@@ -1446,7 +1652,7 @@ out_err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wcn36xx_remove(struct platform_device *pdev)</div><div class='add'>+static void wcn36xx_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hw *hw = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct wcn36xx *wcn = hw-&gt;priv;</div><div class='hunk'>@@ -1464,10 +1670,10 @@ static int wcn36xx_remove(struct platform_device *pdev)</div><div class='ctx'> 	iounmap(wcn-&gt;dxe_base);</div><div class='ctx'> 	iounmap(wcn-&gt;ccu_base);</div><div class='ctx'> </div><div class='add'>+	__skb_queue_purge(&amp;wcn-&gt;amsdu);</div><div class='add'>+</div><div class='ctx'> 	mutex_destroy(&amp;wcn-&gt;hal_mutex);</div><div class='ctx'> 	ieee80211_free_hw(hw);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id wcn36xx_of_match[] = {</div><div class='hunk'>@@ -1477,16 +1683,17 @@ static const struct of_device_id wcn36xx_of_match[] = {</div><div class='ctx'> MODULE_DEVICE_TABLE(of, wcn36xx_of_match);</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver wcn36xx_driver = {</div><div class='del'>-	.probe      = wcn36xx_probe,</div><div class='del'>-	.remove     = wcn36xx_remove,</div><div class='del'>-	.driver         = {</div><div class='del'>-		.name   = "wcn36xx",</div><div class='add'>+	.probe = wcn36xx_probe,</div><div class='add'>+	.remove = wcn36xx_remove,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "wcn36xx",</div><div class='ctx'> 		.of_match_table = wcn36xx_of_match,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> module_platform_driver(wcn36xx_driver);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Qualcomm Atheros WCN3660/3680 wireless driver");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> MODULE_AUTHOR("Eugene Krasnikov k.eugene.e@gmail.com");</div><div class='ctx'> MODULE_FIRMWARE(WLAN_NV_FILE);</div><div class='head'>diff --git a/drivers/net/wireless/ath/wcn36xx/pmc.c b/drivers/net/wireless/ath/wcn36xx/pmc.c<br/>index 2d0780fefd47..2c660458b383 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/pmc.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/pmc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/pmc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wcn36xx/pmc.c</a></div><div class='hunk'>@@ -18,19 +18,19 @@</div><div class='ctx'> </div><div class='ctx'> #include "wcn36xx.h"</div><div class='ctx'> </div><div class='add'>+#define WCN36XX_BMPS_FAIL_THREHOLD 3</div><div class='add'>+</div><div class='ctx'> int wcn36xx_pmc_enter_bmps_state(struct wcn36xx *wcn,</div><div class='ctx'> 				 struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct wcn36xx_vif *vif_priv = wcn36xx_vif_to_priv(vif);</div><div class='del'>-</div><div class='del'>-	if (!vif_priv-&gt;allow_bmps)</div><div class='del'>-		return -ENOTSUPP;</div><div class='del'>-</div><div class='add'>+	/* TODO: Make sure the TX chain clean */</div><div class='ctx'> 	ret = wcn36xx_smd_enter_bmps(wcn, vif);</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		wcn36xx_dbg(WCN36XX_DBG_PMC, "Entered BMPS\n");</div><div class='ctx'> 		vif_priv-&gt;pw_state = WCN36XX_BMPS;</div><div class='add'>+		vif_priv-&gt;bmps_fail_ct = 0;</div><div class='ctx'> 		vif-&gt;driver_flags |= IEEE80211_VIF_BEACON_FILTER;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -39,6 +39,11 @@ int wcn36xx_pmc_enter_bmps_state(struct wcn36xx *wcn,</div><div class='ctx'> 		 * received just after auth complete</div><div class='ctx'> 		 */</div><div class='ctx'> 		wcn36xx_err("Can not enter BMPS!\n");</div><div class='add'>+</div><div class='add'>+		if (vif_priv-&gt;bmps_fail_ct++ == WCN36XX_BMPS_FAIL_THREHOLD) {</div><div class='add'>+			ieee80211_connection_loss(vif);</div><div class='add'>+			vif_priv-&gt;bmps_fail_ct = 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c<br/>index d0c3a1557e8d..136acc414714 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/smd.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/smd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/smd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wcn36xx/smd.c</a></div><div class='hunk'>@@ -16,11 +16,13 @@</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/rpmsg.h&gt;</div><div class='ctx'> #include "smd.h"</div><div class='add'>+#include "firmware.h"</div><div class='ctx'> </div><div class='ctx'> struct wcn36xx_cfg_val {</div><div class='ctx'> 	u32 cfg_id;</div><div class='hunk'>@@ -207,9 +209,9 @@ static void wcn36xx_smd_set_bss_nw_type(struct wcn36xx *wcn,</div><div class='ctx'> {</div><div class='ctx'> 	if (NL80211_BAND_5GHZ == WCN36XX_BAND(wcn))</div><div class='ctx'> 		bss_params-&gt;nw_type = WCN36XX_HAL_11A_NW_TYPE;</div><div class='del'>-	else if (sta &amp;&amp; sta-&gt;ht_cap.ht_supported)</div><div class='add'>+	else if (sta &amp;&amp; sta-&gt;deflink.ht_cap.ht_supported)</div><div class='ctx'> 		bss_params-&gt;nw_type = WCN36XX_HAL_11N_NW_TYPE;</div><div class='del'>-	else if (sta &amp;&amp; (sta-&gt;supp_rates[NL80211_BAND_2GHZ] &amp; 0x7f))</div><div class='add'>+	else if (sta &amp;&amp; (sta-&gt;deflink.supp_rates[NL80211_BAND_2GHZ] &amp; 0x7f))</div><div class='ctx'> 		bss_params-&gt;nw_type = WCN36XX_HAL_11G_NW_TYPE;</div><div class='ctx'> 	else</div><div class='ctx'> 		bss_params-&gt;nw_type = WCN36XX_HAL_11B_NW_TYPE;</div><div class='hunk'>@@ -224,9 +226,10 @@ static void wcn36xx_smd_set_bss_ht_params(struct ieee80211_vif *vif,</div><div class='ctx'> 		struct ieee80211_sta *sta,</div><div class='ctx'> 		struct wcn36xx_hal_config_bss_params *bss_params)</div><div class='ctx'> {</div><div class='del'>-	if (sta &amp;&amp; sta-&gt;ht_cap.ht_supported) {</div><div class='del'>-		unsigned long caps = sta-&gt;ht_cap.cap;</div><div class='del'>-		bss_params-&gt;ht = sta-&gt;ht_cap.ht_supported;</div><div class='add'>+	if (sta &amp;&amp; sta-&gt;deflink.ht_cap.ht_supported) {</div><div class='add'>+		unsigned long caps = sta-&gt;deflink.ht_cap.cap;</div><div class='add'>+</div><div class='add'>+		bss_params-&gt;ht = sta-&gt;deflink.ht_cap.ht_supported;</div><div class='ctx'> 		bss_params-&gt;tx_channel_width_set = is_cap_supported(caps,</div><div class='ctx'> 			IEEE80211_HT_CAP_SUP_WIDTH_20_40);</div><div class='ctx'> 		bss_params-&gt;lsig_tx_op_protection_full_support =</div><div class='hunk'>@@ -249,24 +252,26 @@ wcn36xx_smd_set_bss_vht_params(struct ieee80211_vif *vif,</div><div class='ctx'> 			       struct ieee80211_sta *sta,</div><div class='ctx'> 			       struct wcn36xx_hal_config_bss_params_v1 *bss)</div><div class='ctx'> {</div><div class='del'>-	if (sta &amp;&amp; sta-&gt;vht_cap.vht_supported)</div><div class='add'>+	if (sta &amp;&amp; sta-&gt;deflink.vht_cap.vht_supported)</div><div class='ctx'> 		bss-&gt;vht_capable = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void wcn36xx_smd_set_sta_ht_params(struct ieee80211_sta *sta,</div><div class='ctx'> 		struct wcn36xx_hal_config_sta_params *sta_params)</div><div class='ctx'> {</div><div class='del'>-	if (sta-&gt;ht_cap.ht_supported) {</div><div class='del'>-		unsigned long caps = sta-&gt;ht_cap.cap;</div><div class='del'>-		sta_params-&gt;ht_capable = sta-&gt;ht_cap.ht_supported;</div><div class='add'>+	if (sta-&gt;deflink.ht_cap.ht_supported) {</div><div class='add'>+		unsigned long caps = sta-&gt;deflink.ht_cap.cap;</div><div class='add'>+</div><div class='add'>+		sta_params-&gt;ht_capable = sta-&gt;deflink.ht_cap.ht_supported;</div><div class='ctx'> 		sta_params-&gt;tx_channel_width_set = is_cap_supported(caps,</div><div class='ctx'> 			IEEE80211_HT_CAP_SUP_WIDTH_20_40);</div><div class='ctx'> 		sta_params-&gt;lsig_txop_protection = is_cap_supported(caps,</div><div class='ctx'> 			IEEE80211_HT_CAP_LSIG_TXOP_PROT);</div><div class='ctx'> </div><div class='del'>-		sta_params-&gt;max_ampdu_size = sta-&gt;ht_cap.ampdu_factor;</div><div class='del'>-		sta_params-&gt;max_ampdu_density = sta-&gt;ht_cap.ampdu_density;</div><div class='del'>-		sta_params-&gt;max_amsdu_size = is_cap_supported(caps,</div><div class='add'>+		sta_params-&gt;max_ampdu_size = sta-&gt;deflink.ht_cap.ampdu_factor;</div><div class='add'>+		sta_params-&gt;max_ampdu_density = sta-&gt;deflink.ht_cap.ampdu_density;</div><div class='add'>+		/* max_amsdu_size: 1 : 3839 bytes, 0 : 7935 bytes (max) */</div><div class='add'>+		sta_params-&gt;max_amsdu_size = !is_cap_supported(caps,</div><div class='ctx'> 			IEEE80211_HT_CAP_MAX_AMSDU);</div><div class='ctx'> 		sta_params-&gt;sgi_20Mhz = is_cap_supported(caps,</div><div class='ctx'> 			IEEE80211_HT_CAP_SGI_20);</div><div class='hunk'>@@ -285,13 +290,13 @@ static void wcn36xx_smd_set_sta_vht_params(struct wcn36xx *wcn,</div><div class='ctx'> 		struct ieee80211_sta *sta,</div><div class='ctx'> 		struct wcn36xx_hal_config_sta_params_v1 *sta_params)</div><div class='ctx'> {</div><div class='del'>-	if (sta-&gt;vht_cap.vht_supported) {</div><div class='del'>-		unsigned long caps = sta-&gt;vht_cap.cap;</div><div class='add'>+	if (sta-&gt;deflink.vht_cap.vht_supported) {</div><div class='add'>+		unsigned long caps = sta-&gt;deflink.vht_cap.cap;</div><div class='ctx'> </div><div class='del'>-		sta_params-&gt;vht_capable = sta-&gt;vht_cap.vht_supported;</div><div class='add'>+		sta_params-&gt;vht_capable = sta-&gt;deflink.vht_cap.vht_supported;</div><div class='ctx'> 		sta_params-&gt;vht_ldpc_enabled =</div><div class='ctx'> 			is_cap_supported(caps, IEEE80211_VHT_CAP_RXLDPC);</div><div class='del'>-		if (get_feat_caps(wcn-&gt;fw_feat_caps, MU_MIMO)) {</div><div class='add'>+		if (wcn36xx_firmware_get_feat_caps(wcn-&gt;fw_feat_caps, MU_MIMO)) {</div><div class='ctx'> 			sta_params-&gt;vht_tx_mu_beamformee_capable =</div><div class='ctx'> 				is_cap_supported(caps, IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE);</div><div class='ctx'> 			if (sta_params-&gt;vht_tx_mu_beamformee_capable)</div><div class='hunk'>@@ -306,9 +311,10 @@ static void wcn36xx_smd_set_sta_vht_params(struct wcn36xx *wcn,</div><div class='ctx'> static void wcn36xx_smd_set_sta_ht_ldpc_params(struct ieee80211_sta *sta,</div><div class='ctx'> 		struct wcn36xx_hal_config_sta_params_v1 *sta_params)</div><div class='ctx'> {</div><div class='del'>-	if (sta-&gt;ht_cap.ht_supported) {</div><div class='add'>+	if (sta-&gt;deflink.ht_cap.ht_supported) {</div><div class='ctx'> 		sta_params-&gt;ht_ldpc_enabled =</div><div class='del'>-			is_cap_supported(sta-&gt;ht_cap.cap, IEEE80211_HT_CAP_LDPC_CODING);</div><div class='add'>+			is_cap_supported(sta-&gt;deflink.ht_cap.cap,</div><div class='add'>+					 IEEE80211_HT_CAP_LDPC_CODING);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -445,22 +451,12 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void init_hal_msg(struct wcn36xx_hal_msg_header *hdr,</div><div class='del'>-			 enum wcn36xx_hal_host_msg_type msg_type,</div><div class='del'>-			 size_t msg_size)</div><div class='del'>-{</div><div class='del'>-	memset(hdr, 0, msg_size + sizeof(*hdr));</div><div class='del'>-	hdr-&gt;msg_type = msg_type;</div><div class='del'>-	hdr-&gt;msg_version = WCN36XX_HAL_MSG_VERSION0;</div><div class='del'>-	hdr-&gt;len = msg_size + sizeof(*hdr);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define __INIT_HAL_MSG(msg_body, type, version) \</div><div class='ctx'> 	do {								\</div><div class='del'>-		memset(&amp;msg_body, 0, sizeof(msg_body));			\</div><div class='del'>-		msg_body.header.msg_type = type;			\</div><div class='del'>-		msg_body.header.msg_version = version;			\</div><div class='del'>-		msg_body.header.len = sizeof(msg_body);			\</div><div class='add'>+		memset(&amp;(msg_body), 0, sizeof(msg_body));		\</div><div class='add'>+		(msg_body).header.msg_type = type;			\</div><div class='add'>+		(msg_body).header.msg_version = version;		\</div><div class='add'>+		(msg_body).header.len = sizeof(msg_body);		\</div><div class='ctx'> 	} while (0)							\</div><div class='ctx'> </div><div class='ctx'> #define INIT_HAL_MSG(msg_body, type)	\</div><div class='hunk'>@@ -479,8 +475,8 @@ static void init_hal_msg(struct wcn36xx_hal_msg_header *hdr,</div><div class='ctx'> </div><div class='ctx'> #define PREPARE_HAL_BUF(send_buf, msg_body) \</div><div class='ctx'> 	do {							\</div><div class='del'>-		memset(send_buf, 0, msg_body.header.len);	\</div><div class='del'>-		memcpy(send_buf, &amp;msg_body, sizeof(msg_body));	\</div><div class='add'>+		memcpy_and_pad(send_buf, msg_body.header.len,	\</div><div class='add'>+			       &amp;msg_body, sizeof(msg_body), 0);	\</div><div class='ctx'> 	} while (0)						\</div><div class='ctx'> </div><div class='ctx'> #define PREPARE_HAL_PTT_MSG_BUF(send_buf, p_msg_body) \</div><div class='hunk'>@@ -514,10 +510,10 @@ int wcn36xx_smd_load_nv(struct wcn36xx *wcn)</div><div class='ctx'> 	u16 fm_offset = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!wcn-&gt;nv) {</div><div class='del'>-		ret = request_firmware(&amp;wcn-&gt;nv, WLAN_NV_FILE, wcn-&gt;dev);</div><div class='add'>+		ret = request_firmware(&amp;wcn-&gt;nv, wcn-&gt;nv_file, wcn-&gt;dev);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			wcn36xx_err("Failed to load nv file %s: %d\n",</div><div class='del'>-				      WLAN_NV_FILE, ret);</div><div class='add'>+				    wcn-&gt;nv_file, ret);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -580,7 +576,7 @@ static int wcn36xx_smd_start_rsp(struct wcn36xx *wcn, void *buf, size_t len)</div><div class='ctx'> 	if (len &lt; sizeof(*rsp))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	rsp = (struct wcn36xx_hal_mac_start_rsp_msg *)buf;</div><div class='add'>+	rsp = buf;</div><div class='ctx'> </div><div class='ctx'> 	if (WCN36XX_FW_MSG_RESULT_SUCCESS != rsp-&gt;start_rsp_params.status)</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -730,6 +726,7 @@ int wcn36xx_smd_init_scan(struct wcn36xx *wcn, enum wcn36xx_hal_sys_mode mode,</div><div class='ctx'> 		wcn36xx_err("hal_init_scan response failed err=%d\n", ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	wcn-&gt;sw_scan_init = true;</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;wcn-&gt;hal_mutex);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -760,6 +757,7 @@ int wcn36xx_smd_start_scan(struct wcn36xx *wcn, u8 scan_channel)</div><div class='ctx'> 		wcn36xx_err("hal_start_scan response failed err=%d\n", ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	wcn-&gt;sw_scan_channel = scan_channel;</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;wcn-&gt;hal_mutex);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -790,6 +788,7 @@ int wcn36xx_smd_end_scan(struct wcn36xx *wcn, u8 scan_channel)</div><div class='ctx'> 		wcn36xx_err("hal_end_scan response failed err=%d\n", ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	wcn-&gt;sw_scan_channel = 0;</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;wcn-&gt;hal_mutex);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -831,6 +830,7 @@ int wcn36xx_smd_finish_scan(struct wcn36xx *wcn,</div><div class='ctx'> 		wcn36xx_err("hal_finish_scan response failed err=%d\n", ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	wcn-&gt;sw_scan_init = false;</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;wcn-&gt;hal_mutex);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -937,6 +937,86 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int wcn36xx_smd_update_channel_list(struct wcn36xx *wcn, struct cfg80211_scan_request *req)</div><div class='add'>+{</div><div class='add'>+	struct wcn36xx_hal_update_channel_list_req_msg *msg_body;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	msg_body = kzalloc(sizeof(*msg_body), GFP_KERNEL);</div><div class='add'>+	if (!msg_body)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	INIT_HAL_MSG((*msg_body), WCN36XX_HAL_UPDATE_CHANNEL_LIST_REQ);</div><div class='add'>+</div><div class='add'>+	msg_body-&gt;num_channel = min_t(u8, req-&gt;n_channels, ARRAY_SIZE(msg_body-&gt;channels));</div><div class='add'>+	for (i = 0; i &lt; msg_body-&gt;num_channel; i++) {</div><div class='add'>+		struct wcn36xx_hal_channel_param *param = &amp;msg_body-&gt;channels[i];</div><div class='add'>+		u32 min_power = WCN36XX_HAL_DEFAULT_MIN_POWER;</div><div class='add'>+		u32 ant_gain = WCN36XX_HAL_DEFAULT_ANT_GAIN;</div><div class='add'>+</div><div class='add'>+		param-&gt;mhz = req-&gt;channels[i]-&gt;center_freq;</div><div class='add'>+		param-&gt;band_center_freq1 = req-&gt;channels[i]-&gt;center_freq;</div><div class='add'>+		param-&gt;band_center_freq2 = 0;</div><div class='add'>+</div><div class='add'>+		if (req-&gt;channels[i]-&gt;flags &amp; IEEE80211_CHAN_NO_IR)</div><div class='add'>+			param-&gt;channel_info |= WCN36XX_HAL_CHAN_INFO_FLAG_PASSIVE;</div><div class='add'>+</div><div class='add'>+		if (req-&gt;channels[i]-&gt;flags &amp; IEEE80211_CHAN_RADAR)</div><div class='add'>+			param-&gt;channel_info |= WCN36XX_HAL_CHAN_INFO_FLAG_DFS;</div><div class='add'>+</div><div class='add'>+		if (req-&gt;channels[i]-&gt;band == NL80211_BAND_5GHZ) {</div><div class='add'>+			param-&gt;channel_info |= WCN36XX_HAL_CHAN_INFO_FLAG_HT;</div><div class='add'>+			param-&gt;channel_info |= WCN36XX_HAL_CHAN_INFO_FLAG_VHT;</div><div class='add'>+			param-&gt;channel_info |= WCN36XX_HAL_CHAN_INFO_PHY_11A;</div><div class='add'>+		} else {</div><div class='add'>+			param-&gt;channel_info |= WCN36XX_HAL_CHAN_INFO_PHY_11BG;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (min_power &gt; req-&gt;channels[i]-&gt;max_power)</div><div class='add'>+			min_power = req-&gt;channels[i]-&gt;max_power;</div><div class='add'>+</div><div class='add'>+		if (req-&gt;channels[i]-&gt;max_antenna_gain)</div><div class='add'>+			ant_gain = req-&gt;channels[i]-&gt;max_antenna_gain;</div><div class='add'>+</div><div class='add'>+		u32p_replace_bits(&amp;param-&gt;reg_info_1, min_power,</div><div class='add'>+				  WCN36XX_HAL_CHAN_REG1_MIN_PWR_MASK);</div><div class='add'>+		u32p_replace_bits(&amp;param-&gt;reg_info_1, req-&gt;channels[i]-&gt;max_power,</div><div class='add'>+				  WCN36XX_HAL_CHAN_REG1_MAX_PWR_MASK);</div><div class='add'>+		u32p_replace_bits(&amp;param-&gt;reg_info_1, req-&gt;channels[i]-&gt;max_reg_power,</div><div class='add'>+				  WCN36XX_HAL_CHAN_REG1_REG_PWR_MASK);</div><div class='add'>+		u32p_replace_bits(&amp;param-&gt;reg_info_1, 0,</div><div class='add'>+				  WCN36XX_HAL_CHAN_REG1_CLASS_ID_MASK);</div><div class='add'>+		u32p_replace_bits(&amp;param-&gt;reg_info_2, ant_gain,</div><div class='add'>+				  WCN36XX_HAL_CHAN_REG2_ANT_GAIN_MASK);</div><div class='add'>+</div><div class='add'>+		wcn36xx_dbg(WCN36XX_DBG_HAL,</div><div class='add'>+			    "%s: freq=%u, channel_info=%08x, reg_info1=%08x, reg_info2=%08x\n",</div><div class='add'>+			    __func__, param-&gt;mhz, param-&gt;channel_info, param-&gt;reg_info_1,</div><div class='add'>+			    param-&gt;reg_info_2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+</div><div class='add'>+	PREPARE_HAL_BUF(wcn-&gt;hal_buf, (*msg_body));</div><div class='add'>+</div><div class='add'>+	ret = wcn36xx_smd_send_and_wait(wcn, msg_body-&gt;header.len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		wcn36xx_err("Sending hal_update_channel_list failed\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = wcn36xx_smd_rsp_status_check(wcn-&gt;hal_buf, wcn-&gt;hal_rsp_len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		wcn36xx_err("hal_update_channel_list response failed err=%d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(msg_body);</div><div class='add'>+	mutex_unlock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int wcn36xx_smd_switch_channel_rsp(void *buf, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct wcn36xx_hal_switch_channel_rsp_msg *rsp;</div><div class='hunk'>@@ -945,7 +1025,7 @@ static int wcn36xx_smd_switch_channel_rsp(void *buf, size_t len)</div><div class='ctx'> 	ret = wcn36xx_smd_rsp_status_check(buf, len);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	rsp = (struct wcn36xx_hal_switch_channel_rsp_msg *)buf;</div><div class='add'>+	rsp = buf;</div><div class='ctx'> 	wcn36xx_dbg(WCN36XX_DBG_HAL, "channel switched to: %d, status: %d\n",</div><div class='ctx'> 		    rsp-&gt;channel_number, rsp-&gt;status);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -992,7 +1072,7 @@ static int wcn36xx_smd_process_ptt_msg_rsp(void *buf, size_t len,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	rsp = (struct wcn36xx_hal_process_ptt_msg_rsp_msg *)buf;</div><div class='add'>+	rsp = buf;</div><div class='ctx'> </div><div class='ctx'> 	wcn36xx_dbg(WCN36XX_DBG_HAL, "process ptt msg responded with length %d\n",</div><div class='ctx'> 		    rsp-&gt;header.len);</div><div class='hunk'>@@ -1047,66 +1127,6 @@ out_nomem:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wcn36xx_smd_update_scan_params_rsp(void *buf, size_t len)</div><div class='del'>-{</div><div class='del'>-	struct wcn36xx_hal_update_scan_params_resp *rsp;</div><div class='del'>-</div><div class='del'>-	rsp = (struct wcn36xx_hal_update_scan_params_resp *)buf;</div><div class='del'>-</div><div class='del'>-	/* Remove the PNO version bit */</div><div class='del'>-	rsp-&gt;status &amp;= (~(WCN36XX_FW_MSG_PNO_VERSION_MASK));</div><div class='del'>-</div><div class='del'>-	if (WCN36XX_FW_MSG_RESULT_SUCCESS != rsp-&gt;status) {</div><div class='del'>-		wcn36xx_warn("error response from update scan\n");</div><div class='del'>-		return rsp-&gt;status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int wcn36xx_smd_update_scan_params(struct wcn36xx *wcn,</div><div class='del'>-				   u8 *channels, size_t channel_count)</div><div class='del'>-{</div><div class='del'>-	struct wcn36xx_hal_update_scan_params_req_ex msg_body;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;wcn-&gt;hal_mutex);</div><div class='del'>-	INIT_HAL_MSG(msg_body, WCN36XX_HAL_UPDATE_SCAN_PARAM_REQ);</div><div class='del'>-</div><div class='del'>-	msg_body.dot11d_enabled	= false;</div><div class='del'>-	msg_body.dot11d_resolved = true;</div><div class='del'>-</div><div class='del'>-	msg_body.channel_count = channel_count;</div><div class='del'>-	memcpy(msg_body.channels, channels, channel_count);</div><div class='del'>-	msg_body.active_min_ch_time = 60;</div><div class='del'>-	msg_body.active_max_ch_time = 120;</div><div class='del'>-	msg_body.passive_min_ch_time = 60;</div><div class='del'>-	msg_body.passive_max_ch_time = 110;</div><div class='del'>-	msg_body.state = PHY_SINGLE_CHANNEL_CENTERED;</div><div class='del'>-</div><div class='del'>-	PREPARE_HAL_BUF(wcn-&gt;hal_buf, msg_body);</div><div class='del'>-</div><div class='del'>-	wcn36xx_dbg(WCN36XX_DBG_HAL,</div><div class='del'>-		    "hal update scan params channel_count %d\n",</div><div class='del'>-		    msg_body.channel_count);</div><div class='del'>-</div><div class='del'>-	ret = wcn36xx_smd_send_and_wait(wcn, msg_body.header.len);</div><div class='del'>-	if (ret) {</div><div class='del'>-		wcn36xx_err("Sending hal_update_scan_params failed\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	ret = wcn36xx_smd_update_scan_params_rsp(wcn-&gt;hal_buf,</div><div class='del'>-						 wcn-&gt;hal_rsp_len);</div><div class='del'>-	if (ret) {</div><div class='del'>-		wcn36xx_err("hal_update_scan_params response failed err=%d\n",</div><div class='del'>-			    ret);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;wcn-&gt;hal_mutex);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int wcn36xx_smd_add_sta_self_rsp(struct wcn36xx *wcn,</div><div class='ctx'> 					struct ieee80211_vif *vif,</div><div class='ctx'> 					void *buf,</div><div class='hunk'>@@ -1118,7 +1138,7 @@ static int wcn36xx_smd_add_sta_self_rsp(struct wcn36xx *wcn,</div><div class='ctx'> 	if (len &lt; sizeof(*rsp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	rsp = (struct wcn36xx_hal_add_sta_self_rsp_msg *)buf;</div><div class='add'>+	rsp = buf;</div><div class='ctx'> </div><div class='ctx'> 	if (rsp-&gt;status != WCN36XX_FW_MSG_RESULT_SUCCESS) {</div><div class='ctx'> 		wcn36xx_warn("hal add sta self failure: %d\n",</div><div class='hunk'>@@ -1236,7 +1256,7 @@ static int wcn36xx_smd_join_rsp(void *buf, size_t len)</div><div class='ctx'> 	if (wcn36xx_smd_rsp_status_check(buf, len))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	rsp = (struct wcn36xx_hal_join_rsp_msg *)buf;</div><div class='add'>+	rsp = buf;</div><div class='ctx'> </div><div class='ctx'> 	wcn36xx_dbg(WCN36XX_DBG_HAL,</div><div class='ctx'> 		    "hal rsp join status %d tx_mgmt_power %d\n",</div><div class='hunk'>@@ -1401,7 +1421,7 @@ static int wcn36xx_smd_config_sta_rsp(struct wcn36xx *wcn,</div><div class='ctx'> 	if (len &lt; sizeof(*rsp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	rsp = (struct wcn36xx_hal_config_sta_rsp_msg *)buf;</div><div class='add'>+	rsp = buf;</div><div class='ctx'> 	params = &amp;rsp-&gt;params;</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;status != WCN36XX_FW_MSG_RESULT_SUCCESS) {</div><div class='hunk'>@@ -1769,7 +1789,7 @@ static int wcn36xx_smd_config_bss_rsp(struct wcn36xx *wcn,</div><div class='ctx'> 	if (len &lt; sizeof(*rsp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	rsp = (struct wcn36xx_hal_config_bss_rsp_msg *)buf;</div><div class='add'>+	rsp = buf;</div><div class='ctx'> 	params = &amp;rsp-&gt;bss_rsp_params;</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;status != WCN36XX_FW_MSG_RESULT_SUCCESS) {</div><div class='hunk'>@@ -2194,6 +2214,59 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int wcn36xx_smd_enter_imps(struct wcn36xx *wcn)</div><div class='add'>+{</div><div class='add'>+	struct wcn36xx_hal_enter_imps_req_msg msg_body;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+	INIT_HAL_MSG(msg_body, WCN36XX_HAL_ENTER_IMPS_REQ);</div><div class='add'>+</div><div class='add'>+	PREPARE_HAL_BUF(wcn-&gt;hal_buf, msg_body);</div><div class='add'>+</div><div class='add'>+	ret = wcn36xx_smd_send_and_wait(wcn, msg_body.header.len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		wcn36xx_err("Sending hal_enter_imps failed\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	ret = wcn36xx_smd_rsp_status_check(wcn-&gt;hal_buf, wcn-&gt;hal_rsp_len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		wcn36xx_err("hal_enter_imps response failed err=%d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wcn36xx_dbg(WCN36XX_DBG_HAL, "Entered idle mode\n");</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int wcn36xx_smd_exit_imps(struct wcn36xx *wcn)</div><div class='add'>+{</div><div class='add'>+	struct wcn36xx_hal_exit_imps_req_msg msg_body;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+	INIT_HAL_MSG(msg_body, WCN36XX_HAL_EXIT_IMPS_REQ);</div><div class='add'>+</div><div class='add'>+	PREPARE_HAL_BUF(wcn-&gt;hal_buf, msg_body);</div><div class='add'>+</div><div class='add'>+	ret = wcn36xx_smd_send_and_wait(wcn, msg_body.header.len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		wcn36xx_err("Sending hal_exit_imps failed\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	ret = wcn36xx_smd_rsp_status_check(wcn-&gt;hal_buf, wcn-&gt;hal_rsp_len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		wcn36xx_err("hal_exit_imps response failed err=%d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	wcn36xx_dbg(WCN36XX_DBG_HAL, "Exited idle mode\n");</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int wcn36xx_smd_set_power_params(struct wcn36xx *wcn, bool ignore_dtim)</div><div class='ctx'> {</div><div class='ctx'> 	struct wcn36xx_hal_set_power_params_req_msg msg_body;</div><div class='hunk'>@@ -2299,49 +2372,6 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void set_feat_caps(u32 *bitmap, enum place_holder_in_cap_bitmap cap)</div><div class='del'>-{</div><div class='del'>-	int arr_idx, bit_idx;</div><div class='del'>-</div><div class='del'>-	if (cap &lt; 0 || cap &gt; 127) {</div><div class='del'>-		wcn36xx_warn("error cap idx %d\n", cap);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	arr_idx = cap / 32;</div><div class='del'>-	bit_idx = cap % 32;</div><div class='del'>-	bitmap[arr_idx] |= (1 &lt;&lt; bit_idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int get_feat_caps(u32 *bitmap, enum place_holder_in_cap_bitmap cap)</div><div class='del'>-{</div><div class='del'>-	int arr_idx, bit_idx;</div><div class='del'>-</div><div class='del'>-	if (cap &lt; 0 || cap &gt; 127) {</div><div class='del'>-		wcn36xx_warn("error cap idx %d\n", cap);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	arr_idx = cap / 32;</div><div class='del'>-	bit_idx = cap % 32;</div><div class='del'>-</div><div class='del'>-	return (bitmap[arr_idx] &amp; (1 &lt;&lt; bit_idx)) ? 1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void clear_feat_caps(u32 *bitmap, enum place_holder_in_cap_bitmap cap)</div><div class='del'>-{</div><div class='del'>-	int arr_idx, bit_idx;</div><div class='del'>-</div><div class='del'>-	if (cap &lt; 0 || cap &gt; 127) {</div><div class='del'>-		wcn36xx_warn("error cap idx %d\n", cap);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	arr_idx = cap / 32;</div><div class='del'>-	bit_idx = cap % 32;</div><div class='del'>-	bitmap[arr_idx] &amp;= ~(1 &lt;&lt; bit_idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int wcn36xx_smd_feature_caps_exchange(struct wcn36xx *wcn)</div><div class='ctx'> {</div><div class='ctx'> 	struct wcn36xx_hal_feat_caps_msg msg_body, *rsp;</div><div class='hunk'>@@ -2350,9 +2380,13 @@ int wcn36xx_smd_feature_caps_exchange(struct wcn36xx *wcn)</div><div class='ctx'> 	mutex_lock(&amp;wcn-&gt;hal_mutex);</div><div class='ctx'> 	INIT_HAL_MSG(msg_body, WCN36XX_HAL_FEATURE_CAPS_EXCHANGE_REQ);</div><div class='ctx'> </div><div class='del'>-	set_feat_caps(msg_body.feat_caps, STA_POWERSAVE);</div><div class='del'>-	if (wcn-&gt;rf_id == RF_IRIS_WCN3680)</div><div class='del'>-		set_feat_caps(msg_body.feat_caps, DOT11AC);</div><div class='add'>+	wcn36xx_firmware_set_feat_caps(msg_body.feat_caps, STA_POWERSAVE);</div><div class='add'>+	if (wcn-&gt;rf_id == RF_IRIS_WCN3680) {</div><div class='add'>+		wcn36xx_firmware_set_feat_caps(msg_body.feat_caps, DOT11AC);</div><div class='add'>+		wcn36xx_firmware_set_feat_caps(msg_body.feat_caps, WLAN_CH144);</div><div class='add'>+		wcn36xx_firmware_set_feat_caps(msg_body.feat_caps,</div><div class='add'>+					       ANTENNA_DIVERSITY_SELECTION);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	PREPARE_HAL_BUF(wcn-&gt;hal_buf, msg_body);</div><div class='ctx'> </div><div class='hunk'>@@ -2382,7 +2416,7 @@ static int wcn36xx_smd_add_ba_session_rsp(void *buf, int len, u8 *session)</div><div class='ctx'> 	if (len &lt; sizeof(*rsp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	rsp = (struct wcn36xx_hal_add_ba_session_rsp_msg *)buf;</div><div class='add'>+	rsp = buf;</div><div class='ctx'> 	if (rsp-&gt;status != WCN36XX_FW_MSG_RESULT_SUCCESS)</div><div class='ctx'> 		return rsp-&gt;status;</div><div class='ctx'> </div><div class='hunk'>@@ -2429,6 +2463,7 @@ int wcn36xx_smd_add_ba_session(struct wcn36xx *wcn,</div><div class='ctx'> 					     &amp;session_id);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		wcn36xx_err("hal_add_ba_session response failed err=%d\n", ret);</div><div class='add'>+		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2494,27 +2529,99 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wcn36xx_smd_trigger_ba_rsp(void *buf, int len)</div><div class='add'>+int wcn36xx_smd_get_stats(struct wcn36xx *wcn, u8 sta_index, u32 stats_mask,</div><div class='add'>+			  struct station_info *sinfo)</div><div class='ctx'> {</div><div class='add'>+	struct wcn36xx_hal_stats_req_msg msg_body;</div><div class='add'>+	struct wcn36xx_hal_stats_rsp_msg *rsp;</div><div class='add'>+	void *rsp_body;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (stats_mask &amp; ~HAL_GLOBAL_CLASS_A_STATS_INFO) {</div><div class='add'>+		wcn36xx_err("stats_mask 0x%x contains unimplemented types\n",</div><div class='add'>+			    stats_mask);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+	INIT_HAL_MSG(msg_body, WCN36XX_HAL_GET_STATS_REQ);</div><div class='add'>+</div><div class='add'>+	msg_body.sta_id = sta_index;</div><div class='add'>+	msg_body.stats_mask = stats_mask;</div><div class='add'>+</div><div class='add'>+	PREPARE_HAL_BUF(wcn-&gt;hal_buf, msg_body);</div><div class='add'>+</div><div class='add'>+	ret = wcn36xx_smd_send_and_wait(wcn, msg_body.header.len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		wcn36xx_err("sending hal_get_stats failed\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = wcn36xx_smd_rsp_status_check(wcn-&gt;hal_buf, wcn-&gt;hal_rsp_len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		wcn36xx_err("hal_get_stats response failed err=%d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rsp = (struct wcn36xx_hal_stats_rsp_msg *)wcn-&gt;hal_buf;</div><div class='add'>+	rsp_body = (wcn-&gt;hal_buf + sizeof(struct wcn36xx_hal_stats_rsp_msg));</div><div class='add'>+</div><div class='add'>+	if (rsp-&gt;stats_mask != stats_mask) {</div><div class='add'>+		wcn36xx_err("stats_mask 0x%x differs from requested 0x%x\n",</div><div class='add'>+			    rsp-&gt;stats_mask, stats_mask);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rsp-&gt;stats_mask &amp; HAL_GLOBAL_CLASS_A_STATS_INFO) {</div><div class='add'>+		struct ani_global_class_a_stats_info *stats_info = rsp_body;</div><div class='add'>+</div><div class='add'>+		wcn36xx_process_tx_rate(stats_info, &amp;sinfo-&gt;txrate);</div><div class='add'>+		sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);</div><div class='add'>+		rsp_body += sizeof(struct ani_global_class_a_stats_info);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wcn36xx_smd_trigger_ba_rsp(void *buf, int len, struct add_ba_info *ba_info)</div><div class='add'>+{</div><div class='add'>+	struct wcn36xx_hal_trigger_ba_rsp_candidate *candidate;</div><div class='ctx'> 	struct wcn36xx_hal_trigger_ba_rsp_msg *rsp;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (len &lt; sizeof(*rsp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	rsp = (struct wcn36xx_hal_trigger_ba_rsp_msg *) buf;</div><div class='add'>+	rsp = buf;</div><div class='add'>+</div><div class='add'>+	if (rsp-&gt;candidate_cnt &lt; 1)</div><div class='add'>+		return rsp-&gt;status ? rsp-&gt;status : -EINVAL;</div><div class='add'>+</div><div class='add'>+	candidate = (struct wcn36xx_hal_trigger_ba_rsp_candidate *)(buf + sizeof(*rsp));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; STACFG_MAX_TC; i++) {</div><div class='add'>+		ba_info[i] = candidate-&gt;ba_info[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return rsp-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wcn36xx_smd_trigger_ba(struct wcn36xx *wcn, u8 sta_index, u16 tid, u8 session_id)</div><div class='add'>+int wcn36xx_smd_trigger_ba(struct wcn36xx *wcn, u8 sta_index, u16 tid, u16 *ssn)</div><div class='ctx'> {</div><div class='ctx'> 	struct wcn36xx_hal_trigger_ba_req_msg msg_body;</div><div class='ctx'> 	struct wcn36xx_hal_trigger_ba_req_candidate *candidate;</div><div class='add'>+	struct add_ba_info ba_info[STACFG_MAX_TC];</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (tid &gt;= STACFG_MAX_TC)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;wcn-&gt;hal_mutex);</div><div class='ctx'> 	INIT_HAL_MSG(msg_body, WCN36XX_HAL_TRIGGER_BA_REQ);</div><div class='ctx'> </div><div class='del'>-	msg_body.session_id = session_id;</div><div class='add'>+	msg_body.session_id = 0; /* not really used */</div><div class='ctx'> 	msg_body.candidate_cnt = 1;</div><div class='ctx'> 	msg_body.header.len += sizeof(*candidate);</div><div class='ctx'> 	PREPARE_HAL_BUF(wcn-&gt;hal_buf, msg_body);</div><div class='hunk'>@@ -2529,13 +2636,17 @@ int wcn36xx_smd_trigger_ba(struct wcn36xx *wcn, u8 sta_index, u16 tid, u8 sessio</div><div class='ctx'> 		wcn36xx_err("Sending hal_trigger_ba failed\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	ret = wcn36xx_smd_trigger_ba_rsp(wcn-&gt;hal_buf, wcn-&gt;hal_rsp_len);</div><div class='add'>+	ret = wcn36xx_smd_trigger_ba_rsp(wcn-&gt;hal_buf, wcn-&gt;hal_rsp_len, ba_info);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		wcn36xx_err("hal_trigger_ba response failed err=%d\n", ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+</div><div class='add'>+	if (ssn)</div><div class='add'>+		*ssn = ba_info[tid].starting_seq_num;</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2604,7 +2715,7 @@ static int wcn36xx_smd_missed_beacon_ind(struct wcn36xx *wcn,</div><div class='ctx'> 			wcn36xx_dbg(WCN36XX_DBG_HAL, "beacon missed bss_index %d\n",</div><div class='ctx'> 				    tmp-&gt;bss_index);</div><div class='ctx'> 			vif = wcn36xx_priv_to_vif(tmp);</div><div class='del'>-			ieee80211_connection_loss(vif);</div><div class='add'>+			ieee80211_beacon_loss(vif);</div><div class='ctx'> 		}</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2619,7 +2730,7 @@ static int wcn36xx_smd_missed_beacon_ind(struct wcn36xx *wcn,</div><div class='ctx'> 			wcn36xx_dbg(WCN36XX_DBG_HAL, "beacon missed bss_index %d\n",</div><div class='ctx'> 				    rsp-&gt;bss_index);</div><div class='ctx'> 			vif = wcn36xx_priv_to_vif(tmp);</div><div class='del'>-			ieee80211_connection_loss(vif);</div><div class='add'>+			ieee80211_beacon_loss(vif);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2633,30 +2744,52 @@ static int wcn36xx_smd_delete_sta_context_ind(struct wcn36xx *wcn,</div><div class='ctx'> 					      size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct wcn36xx_hal_delete_sta_context_ind_msg *rsp = buf;</div><div class='del'>-	struct wcn36xx_vif *tmp;</div><div class='add'>+	struct wcn36xx_vif *vif_priv;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct ieee80211_bss_conf *bss_conf;</div><div class='ctx'> 	struct ieee80211_sta *sta;</div><div class='add'>+	bool found = false;</div><div class='ctx'> </div><div class='ctx'> 	if (len != sizeof(*rsp)) {</div><div class='ctx'> 		wcn36xx_warn("Corrupted delete sta indication\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wcn36xx_dbg(WCN36XX_DBG_HAL, "delete station indication %pM index %d\n",</div><div class='del'>-		    rsp-&gt;addr2, rsp-&gt;sta_id);</div><div class='add'>+	wcn36xx_dbg(WCN36XX_DBG_HAL,</div><div class='add'>+		    "delete station indication %pM index %d reason %d\n",</div><div class='add'>+		    rsp-&gt;addr2, rsp-&gt;sta_id, rsp-&gt;reason_code);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(tmp, &amp;wcn-&gt;vif_list, list) {</div><div class='add'>+	list_for_each_entry(vif_priv, &amp;wcn-&gt;vif_list, list) {</div><div class='ctx'> 		rcu_read_lock();</div><div class='del'>-		sta = ieee80211_find_sta(wcn36xx_priv_to_vif(tmp), rsp-&gt;addr2);</div><div class='del'>-		if (sta)</div><div class='del'>-			ieee80211_report_low_ack(sta, 0);</div><div class='add'>+		vif = wcn36xx_priv_to_vif(vif_priv);</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='add'>+			/* We could call ieee80211_find_sta too, but checking</div><div class='add'>+			 * bss_conf is clearer.</div><div class='add'>+			 */</div><div class='add'>+			bss_conf = &amp;vif-&gt;bss_conf;</div><div class='add'>+			if (vif_priv-&gt;sta_assoc &amp;&amp;</div><div class='add'>+			    !memcmp(bss_conf-&gt;bssid, rsp-&gt;addr2, ETH_ALEN)) {</div><div class='add'>+				found = true;</div><div class='add'>+				wcn36xx_dbg(WCN36XX_DBG_HAL,</div><div class='add'>+					    "connection loss bss_index %d\n",</div><div class='add'>+					    vif_priv-&gt;bss_index);</div><div class='add'>+				ieee80211_connection_loss(vif);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			sta = ieee80211_find_sta(vif, rsp-&gt;addr2);</div><div class='add'>+			if (sta) {</div><div class='add'>+				found = true;</div><div class='add'>+				ieee80211_report_low_ack(sta, 0);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		rcu_read_unlock();</div><div class='del'>-		if (sta)</div><div class='add'>+		if (found)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wcn36xx_warn("STA with addr %pM and index %d not found\n",</div><div class='del'>-		     rsp-&gt;addr2,</div><div class='del'>-		     rsp-&gt;sta_id);</div><div class='add'>+	wcn36xx_warn("BSS or STA with addr %pM not found\n", rsp-&gt;addr2);</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2729,8 +2862,7 @@ int wcn36xx_smd_set_mc_list(struct wcn36xx *wcn,</div><div class='ctx'> </div><div class='ctx'> 	msg_body = (struct wcn36xx_hal_rcv_flt_pkt_set_mc_list_req_msg *)</div><div class='ctx'> 		   wcn-&gt;hal_buf;</div><div class='del'>-	init_hal_msg(&amp;msg_body-&gt;header, WCN36XX_HAL_8023_MULTICAST_LIST_REQ,</div><div class='del'>-		     sizeof(msg_body-&gt;mc_addr_list));</div><div class='add'>+	INIT_HAL_MSG(*msg_body, WCN36XX_HAL_8023_MULTICAST_LIST_REQ);</div><div class='ctx'> </div><div class='ctx'> 	/* An empty list means all mc traffic will be received */</div><div class='ctx'> 	if (fp)</div><div class='hunk'>@@ -2756,6 +2888,354 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int wcn36xx_smd_arp_offload(struct wcn36xx *wcn, struct ieee80211_vif *vif,</div><div class='add'>+			    bool enable)</div><div class='add'>+{</div><div class='add'>+	struct wcn36xx_vif *vif_priv = wcn36xx_vif_to_priv(vif);</div><div class='add'>+	struct wcn36xx_hal_host_offload_req_msg msg_body;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+</div><div class='add'>+	INIT_HAL_MSG(msg_body, WCN36XX_HAL_HOST_OFFLOAD_REQ);</div><div class='add'>+	msg_body.host_offload_params.offload_type =</div><div class='add'>+		WCN36XX_HAL_IPV4_ARP_REPLY_OFFLOAD;</div><div class='add'>+	if (enable) {</div><div class='add'>+		msg_body.host_offload_params.enable =</div><div class='add'>+			WCN36XX_HAL_OFFLOAD_ARP_AND_BCAST_FILTER_ENABLE;</div><div class='add'>+		memcpy(&amp;msg_body.host_offload_params.u,</div><div class='add'>+		       &amp;vif-&gt;cfg.arp_addr_list[0], sizeof(__be32));</div><div class='add'>+	}</div><div class='add'>+	msg_body.ns_offload_params.bss_index = vif_priv-&gt;bss_index;</div><div class='add'>+</div><div class='add'>+	PREPARE_HAL_BUF(wcn-&gt;hal_buf, msg_body);</div><div class='add'>+</div><div class='add'>+	ret = wcn36xx_smd_send_and_wait(wcn, msg_body.header.len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		wcn36xx_err("Sending host_offload_arp failed\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	ret = wcn36xx_smd_rsp_status_check(wcn-&gt;hal_buf, wcn-&gt;hal_rsp_len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		wcn36xx_err("host_offload_arp failed err=%d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+int wcn36xx_smd_ipv6_ns_offload(struct wcn36xx *wcn, struct ieee80211_vif *vif,</div><div class='add'>+				bool enable)</div><div class='add'>+{</div><div class='add'>+	struct wcn36xx_vif *vif_priv = wcn36xx_vif_to_priv(vif);</div><div class='add'>+	struct wcn36xx_hal_host_offload_req_msg msg_body;</div><div class='add'>+	struct wcn36xx_hal_ns_offload_params *ns_params;</div><div class='add'>+	struct wcn36xx_hal_host_offload_req *ho_params;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+</div><div class='add'>+	INIT_HAL_MSG(msg_body, WCN36XX_HAL_HOST_OFFLOAD_REQ);</div><div class='add'>+	ho_params = &amp;msg_body.host_offload_params;</div><div class='add'>+	ns_params = &amp;msg_body.ns_offload_params;</div><div class='add'>+</div><div class='add'>+	ho_params-&gt;offload_type = WCN36XX_HAL_IPV6_NS_OFFLOAD;</div><div class='add'>+	if (enable) {</div><div class='add'>+		ho_params-&gt;enable =</div><div class='add'>+			WCN36XX_HAL_OFFLOAD_NS_AND_MCAST_FILTER_ENABLE;</div><div class='add'>+		if (vif_priv-&gt;num_target_ipv6_addrs) {</div><div class='add'>+			memcpy(&amp;ho_params-&gt;u,</div><div class='add'>+			       &amp;vif_priv-&gt;target_ipv6_addrs[0].in6_u,</div><div class='add'>+			       sizeof(struct in6_addr));</div><div class='add'>+			memcpy(&amp;ns_params-&gt;target_ipv6_addr1,</div><div class='add'>+			       &amp;vif_priv-&gt;target_ipv6_addrs[0].in6_u,</div><div class='add'>+			       sizeof(struct in6_addr));</div><div class='add'>+			ns_params-&gt;target_ipv6_addr1_valid = 1;</div><div class='add'>+		}</div><div class='add'>+		if (vif_priv-&gt;num_target_ipv6_addrs &gt; 1) {</div><div class='add'>+			memcpy(&amp;ns_params-&gt;target_ipv6_addr2,</div><div class='add'>+			       &amp;vif_priv-&gt;target_ipv6_addrs[1].in6_u,</div><div class='add'>+			       sizeof(struct in6_addr));</div><div class='add'>+			ns_params-&gt;target_ipv6_addr2_valid = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	memcpy(&amp;ns_params-&gt;self_addr, vif-&gt;addr, ETH_ALEN);</div><div class='add'>+	ns_params-&gt;bss_index = vif_priv-&gt;bss_index;</div><div class='add'>+</div><div class='add'>+	PREPARE_HAL_BUF(wcn-&gt;hal_buf, msg_body);</div><div class='add'>+</div><div class='add'>+	ret = wcn36xx_smd_send_and_wait(wcn, msg_body.header.len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		wcn36xx_err("Sending host_offload_arp failed\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	ret = wcn36xx_smd_rsp_status_check(wcn-&gt;hal_buf, wcn-&gt;hal_rsp_len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		wcn36xx_err("host_offload_arp failed err=%d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+int wcn36xx_smd_ipv6_ns_offload(struct wcn36xx *wcn, struct ieee80211_vif *vif,</div><div class='add'>+				bool enable)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int wcn36xx_smd_gtk_offload(struct wcn36xx *wcn, struct ieee80211_vif *vif,</div><div class='add'>+			    bool enable)</div><div class='add'>+{</div><div class='add'>+	struct wcn36xx_vif *vif_priv = wcn36xx_vif_to_priv(vif);</div><div class='add'>+	struct wcn36xx_hal_gtk_offload_req_msg msg_body;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+</div><div class='add'>+	INIT_HAL_MSG(msg_body, WCN36XX_HAL_GTK_OFFLOAD_REQ);</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		memcpy(&amp;msg_body.kek, vif_priv-&gt;rekey_data.kek, NL80211_KEK_LEN);</div><div class='add'>+		memcpy(&amp;msg_body.kck, vif_priv-&gt;rekey_data.kck, NL80211_KCK_LEN);</div><div class='add'>+		msg_body.key_replay_counter =</div><div class='add'>+			le64_to_cpu(vif_priv-&gt;rekey_data.replay_ctr);</div><div class='add'>+		msg_body.bss_index = vif_priv-&gt;bss_index;</div><div class='add'>+	} else {</div><div class='add'>+		msg_body.flags = WCN36XX_HAL_GTK_OFFLOAD_FLAGS_DISABLE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	PREPARE_HAL_BUF(wcn-&gt;hal_buf, msg_body);</div><div class='add'>+</div><div class='add'>+	ret = wcn36xx_smd_send_and_wait(wcn, msg_body.header.len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		wcn36xx_err("Sending host_offload_arp failed\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	ret = wcn36xx_smd_rsp_status_check(wcn-&gt;hal_buf, wcn-&gt;hal_rsp_len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		wcn36xx_err("host_offload_arp failed err=%d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wcn36xx_smd_gtk_offload_get_info_rsp(struct wcn36xx *wcn,</div><div class='add'>+						struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct wcn36xx_vif *vif_priv = wcn36xx_vif_to_priv(vif);</div><div class='add'>+	struct wcn36xx_hal_gtk_offload_get_info_rsp_msg *rsp;</div><div class='add'>+	__be64 replay_ctr;</div><div class='add'>+</div><div class='add'>+	if (wcn36xx_smd_rsp_status_check(wcn-&gt;hal_buf, wcn-&gt;hal_rsp_len))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	rsp = (struct wcn36xx_hal_gtk_offload_get_info_rsp_msg *)wcn-&gt;hal_buf;</div><div class='add'>+</div><div class='add'>+	if (rsp-&gt;bss_index != vif_priv-&gt;bss_index) {</div><div class='add'>+		wcn36xx_err("gtk_offload_info invalid response bss index %d\n",</div><div class='add'>+			    rsp-&gt;bss_index);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vif_priv-&gt;rekey_data.replay_ctr != cpu_to_le64(rsp-&gt;key_replay_counter)) {</div><div class='add'>+		replay_ctr = cpu_to_be64(rsp-&gt;key_replay_counter);</div><div class='add'>+		vif_priv-&gt;rekey_data.replay_ctr =</div><div class='add'>+			cpu_to_le64(rsp-&gt;key_replay_counter);</div><div class='add'>+		ieee80211_gtk_rekey_notify(vif, vif-&gt;bss_conf.bssid,</div><div class='add'>+					   (void *)&amp;replay_ctr, GFP_KERNEL);</div><div class='add'>+		wcn36xx_dbg(WCN36XX_DBG_HAL,</div><div class='add'>+			    "GTK replay counter increment %llu\n",</div><div class='add'>+			    rsp-&gt;key_replay_counter);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wcn36xx_dbg(WCN36XX_DBG_HAL,</div><div class='add'>+		    "gtk offload info status %d last_rekey_status %d "</div><div class='add'>+		    "replay_counter %llu total_rekey_count %d gtk_rekey_count %d "</div><div class='add'>+		    "igtk_rekey_count %d bss_index %d\n",</div><div class='add'>+		    rsp-&gt;status, rsp-&gt;last_rekey_status,</div><div class='add'>+		    rsp-&gt;key_replay_counter, rsp-&gt;total_rekey_count,</div><div class='add'>+		    rsp-&gt;gtk_rekey_count, rsp-&gt;igtk_rekey_count,</div><div class='add'>+		    rsp-&gt;bss_index);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int wcn36xx_smd_gtk_offload_get_info(struct wcn36xx *wcn,</div><div class='add'>+				     struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct wcn36xx_vif *vif_priv = wcn36xx_vif_to_priv(vif);</div><div class='add'>+	struct wcn36xx_hal_gtk_offload_get_info_req_msg msg_body;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+</div><div class='add'>+	INIT_HAL_MSG(msg_body, WCN36XX_HAL_GTK_OFFLOAD_GETINFO_REQ);</div><div class='add'>+</div><div class='add'>+	msg_body.bss_index = vif_priv-&gt;bss_index;</div><div class='add'>+</div><div class='add'>+	PREPARE_HAL_BUF(wcn-&gt;hal_buf, msg_body);</div><div class='add'>+</div><div class='add'>+	ret = wcn36xx_smd_send_and_wait(wcn, msg_body.header.len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		wcn36xx_err("Sending gtk_offload_get_info failed\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	ret = wcn36xx_smd_rsp_status_check(wcn-&gt;hal_buf, wcn-&gt;hal_rsp_len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		wcn36xx_err("gtk_offload_get_info failed err=%d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	ret = wcn36xx_smd_gtk_offload_get_info_rsp(wcn, vif);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int wcn36xx_smd_wlan_host_suspend_ind(struct wcn36xx *wcn)</div><div class='add'>+{</div><div class='add'>+	struct wcn36xx_hal_wlan_host_suspend_ind_msg msg_body;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+</div><div class='add'>+	INIT_HAL_MSG(msg_body, WCN36XX_HAL_HOST_SUSPEND_IND);</div><div class='add'>+	msg_body.configured_mcst_bcst_filter_setting = 0;</div><div class='add'>+	msg_body.active_session_count = 1;</div><div class='add'>+	PREPARE_HAL_BUF(wcn-&gt;hal_buf, msg_body);</div><div class='add'>+</div><div class='add'>+	ret = rpmsg_send(wcn-&gt;smd_channel, wcn-&gt;hal_buf, msg_body.header.len);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int wcn36xx_smd_host_resume(struct wcn36xx *wcn)</div><div class='add'>+{</div><div class='add'>+	struct wcn36xx_hal_wlan_host_resume_req_msg msg_body;</div><div class='add'>+	struct wcn36xx_hal_host_resume_rsp_msg *rsp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+</div><div class='add'>+	INIT_HAL_MSG(msg_body, WCN36XX_HAL_HOST_RESUME_REQ);</div><div class='add'>+	msg_body.configured_mcst_bcst_filter_setting = 0;</div><div class='add'>+</div><div class='add'>+	PREPARE_HAL_BUF(wcn-&gt;hal_buf, msg_body);</div><div class='add'>+</div><div class='add'>+	ret = wcn36xx_smd_send_and_wait(wcn, msg_body.header.len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		wcn36xx_err("Sending wlan_host_resume failed\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	ret = wcn36xx_smd_rsp_status_check(wcn-&gt;hal_buf, wcn-&gt;hal_rsp_len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		wcn36xx_err("wlan_host_resume err=%d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rsp = (struct wcn36xx_hal_host_resume_rsp_msg *)wcn-&gt;hal_buf;</div><div class='add'>+	if (rsp-&gt;status)</div><div class='add'>+		wcn36xx_warn("wlan_host_resume status=%d\n", rsp-&gt;status);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define BEACON_FILTER(eid, presence, offs, val, mask, ref_val) \</div><div class='add'>+	{					\</div><div class='add'>+		.element_id = eid,		\</div><div class='add'>+		.check_ie_presence = presence,	\</div><div class='add'>+		.offset = offs,			\</div><div class='add'>+		.value = val,			\</div><div class='add'>+		.bitmask = mask,		\</div><div class='add'>+		.ref = ref_val,			\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct beacon_filter_ie bcn_filter_ies[] = {</div><div class='add'>+	BEACON_FILTER(WLAN_EID_DS_PARAMS, 0, 0, 0,</div><div class='add'>+		      WCN36XX_FILTER_IE_DS_CHANNEL_MASK, 0),</div><div class='add'>+	BEACON_FILTER(WLAN_EID_ERP_INFO, 0, 0, 0,</div><div class='add'>+		      WCN36XX_FILTER_IE_ERP_FILTER_MASK, 0),</div><div class='add'>+	BEACON_FILTER(WLAN_EID_EDCA_PARAM_SET, 0, 0, 0,</div><div class='add'>+		      WCN36XX_FILTER_IE_EDCA_FILTER_MASK, 0),</div><div class='add'>+	BEACON_FILTER(WLAN_EID_QOS_CAPA, 0, 0, 0,</div><div class='add'>+		      WCN36XX_FILTER_IE_QOS_FILTER_MASK, 0),</div><div class='add'>+	BEACON_FILTER(WLAN_EID_CHANNEL_SWITCH, 1, 0, 0,</div><div class='add'>+		      WCN36XX_FILTER_IE_CHANNEL_SWITCH_MASK, 0),</div><div class='add'>+	BEACON_FILTER(WLAN_EID_HT_OPERATION, 0, 0, 0,</div><div class='add'>+		      WCN36XX_FILTER_IE_HT_BYTE0_FILTER_MASK, 0),</div><div class='add'>+	BEACON_FILTER(WLAN_EID_HT_OPERATION, 0, 2, 0,</div><div class='add'>+		      WCN36XX_FILTER_IE_HT_BYTE2_FILTER_MASK, 0),</div><div class='add'>+	BEACON_FILTER(WLAN_EID_HT_OPERATION, 0, 5, 0,</div><div class='add'>+		      WCN36XX_FILTER_IE_HT_BYTE5_FILTER_MASK, 0),</div><div class='add'>+	BEACON_FILTER(WLAN_EID_PWR_CONSTRAINT, 0, 0, 0,</div><div class='add'>+		      WCN36XX_FILTER_IE_PWR_CONSTRAINT_MASK, 0),</div><div class='add'>+	BEACON_FILTER(WLAN_EID_OPMODE_NOTIF, 0, 0, 0,</div><div class='add'>+		      WCN36XX_FILTER_IE_OPMODE_NOTIF_MASK, 0),</div><div class='add'>+	BEACON_FILTER(WLAN_EID_VHT_OPERATION, 0, 0, 0,</div><div class='add'>+		      WCN36XX_FILTER_IE_VHTOP_CHWIDTH_MASK, 0),</div><div class='add'>+	BEACON_FILTER(WLAN_EID_RSN, 1, 0, 0,</div><div class='add'>+		      WCN36XX_FILTER_IE_RSN_MASK, 0),</div><div class='add'>+	BEACON_FILTER(WLAN_EID_VENDOR_SPECIFIC, 1, 0, 0,</div><div class='add'>+		      WCN36XX_FILTER_IE_VENDOR_MASK, 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int wcn36xx_smd_add_beacon_filter(struct wcn36xx *wcn,</div><div class='add'>+				  struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct wcn36xx_hal_add_bcn_filter_req_msg msg_body, *body;</div><div class='add'>+	struct wcn36xx_vif *vif_priv = wcn36xx_vif_to_priv(vif);</div><div class='add'>+	u8 *payload;</div><div class='add'>+	size_t payload_size;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!wcn36xx_firmware_get_feat_caps(wcn-&gt;fw_feat_caps, BCN_FILTER))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+	INIT_HAL_MSG(msg_body, WCN36XX_HAL_ADD_BCN_FILTER_REQ);</div><div class='add'>+</div><div class='add'>+	PREPARE_HAL_BUF(wcn-&gt;hal_buf, msg_body);</div><div class='add'>+</div><div class='add'>+	body = (struct wcn36xx_hal_add_bcn_filter_req_msg *)wcn-&gt;hal_buf;</div><div class='add'>+	body-&gt;capability_info = vif-&gt;bss_conf.assoc_capability;</div><div class='add'>+	body-&gt;capability_mask = WCN36XX_FILTER_CAPABILITY_MASK;</div><div class='add'>+	body-&gt;beacon_interval = vif-&gt;bss_conf.beacon_int;</div><div class='add'>+	body-&gt;ie_num = ARRAY_SIZE(bcn_filter_ies);</div><div class='add'>+	body-&gt;bss_index = vif_priv-&gt;bss_index;</div><div class='add'>+</div><div class='add'>+	payload = ((u8 *)body) + body-&gt;header.len;</div><div class='add'>+	payload_size = sizeof(bcn_filter_ies);</div><div class='add'>+	memcpy(payload, &amp;bcn_filter_ies, payload_size);</div><div class='add'>+</div><div class='add'>+	body-&gt;header.len += payload_size;</div><div class='add'>+</div><div class='add'>+	ret = wcn36xx_smd_send_and_wait(wcn, body-&gt;header.len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		wcn36xx_err("Sending add bcn_filter failed\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = wcn36xx_smd_rsp_status_check(wcn-&gt;hal_buf, wcn-&gt;hal_rsp_len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		wcn36xx_err("add bcn filter response failed err=%d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;wcn-&gt;hal_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int wcn36xx_smd_rsp_process(struct rpmsg_device *rpdev,</div><div class='ctx'> 			    void *buf, int len, void *priv, u32 addr)</div><div class='ctx'> {</div><div class='hunk'>@@ -2794,6 +3274,7 @@ int wcn36xx_smd_rsp_process(struct rpmsg_device *rpdev,</div><div class='ctx'> 	case WCN36XX_HAL_ADD_BA_SESSION_RSP:</div><div class='ctx'> 	case WCN36XX_HAL_ADD_BA_RSP:</div><div class='ctx'> 	case WCN36XX_HAL_DEL_BA_RSP:</div><div class='add'>+	case WCN36XX_HAL_GET_STATS_RSP:</div><div class='ctx'> 	case WCN36XX_HAL_TRIGGER_BA_RSP:</div><div class='ctx'> 	case WCN36XX_HAL_UPDATE_CFG_RSP:</div><div class='ctx'> 	case WCN36XX_HAL_JOIN_RSP:</div><div class='hunk'>@@ -2804,6 +3285,14 @@ int wcn36xx_smd_rsp_process(struct rpmsg_device *rpdev,</div><div class='ctx'> 	case WCN36XX_HAL_8023_MULTICAST_LIST_RSP:</div><div class='ctx'> 	case WCN36XX_HAL_START_SCAN_OFFLOAD_RSP:</div><div class='ctx'> 	case WCN36XX_HAL_STOP_SCAN_OFFLOAD_RSP:</div><div class='add'>+	case WCN36XX_HAL_HOST_OFFLOAD_RSP:</div><div class='add'>+	case WCN36XX_HAL_GTK_OFFLOAD_RSP:</div><div class='add'>+	case WCN36XX_HAL_GTK_OFFLOAD_GETINFO_RSP:</div><div class='add'>+	case WCN36XX_HAL_HOST_RESUME_RSP:</div><div class='add'>+	case WCN36XX_HAL_ENTER_IMPS_RSP:</div><div class='add'>+	case WCN36XX_HAL_EXIT_IMPS_RSP:</div><div class='add'>+	case WCN36XX_HAL_UPDATE_CHANNEL_LIST_RSP:</div><div class='add'>+	case WCN36XX_HAL_ADD_BCN_FILTER_RSP:</div><div class='ctx'> 		memcpy(wcn-&gt;hal_buf, buf, len);</div><div class='ctx'> 		wcn-&gt;hal_rsp_len = len;</div><div class='ctx'> 		complete(&amp;wcn-&gt;hal_rsp_compl);</div><div class='hunk'>@@ -2817,7 +3306,7 @@ int wcn36xx_smd_rsp_process(struct rpmsg_device *rpdev,</div><div class='ctx'> 	case WCN36XX_HAL_DELETE_STA_CONTEXT_IND:</div><div class='ctx'> 	case WCN36XX_HAL_PRINT_REG_INFO_IND:</div><div class='ctx'> 	case WCN36XX_HAL_SCAN_OFFLOAD_IND:</div><div class='del'>-		msg_ind = kmalloc(sizeof(*msg_ind) + len, GFP_ATOMIC);</div><div class='add'>+		msg_ind = kmalloc(struct_size(msg_ind, msg, len), GFP_ATOMIC);</div><div class='ctx'> 		if (!msg_ind) {</div><div class='ctx'> 			wcn36xx_err("Run out of memory while handling SMD_EVENT (%d)\n",</div><div class='ctx'> 				    msg_header-&gt;msg_type);</div><div class='head'>diff --git a/drivers/net/wireless/ath/wcn36xx/smd.h b/drivers/net/wireless/ath/wcn36xx/smd.h<br/>index 462860572e1f..4e39df5589b3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/smd.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/smd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/smd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wcn36xx/smd.h</a></div><div class='hunk'>@@ -47,7 +47,7 @@ struct wcn36xx_fw_msg_status_rsp {</div><div class='ctx'> struct wcn36xx_hal_ind_msg {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	size_t msg_len;</div><div class='del'>-	u8 msg[];</div><div class='add'>+	u8 msg[] __counted_by(msg_len);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct wcn36xx;</div><div class='hunk'>@@ -66,10 +66,10 @@ int wcn36xx_smd_finish_scan(struct wcn36xx *wcn, enum wcn36xx_hal_sys_mode mode,</div><div class='ctx'> int wcn36xx_smd_init_scan(struct wcn36xx *wcn, enum wcn36xx_hal_sys_mode mode,</div><div class='ctx'> 			  struct ieee80211_vif *vif);</div><div class='ctx'> </div><div class='del'>-int wcn36xx_smd_update_scan_params(struct wcn36xx *wcn, u8 *channels, size_t channel_count);</div><div class='ctx'> int wcn36xx_smd_start_hw_scan(struct wcn36xx *wcn, struct ieee80211_vif *vif,</div><div class='ctx'> 			      struct cfg80211_scan_request *req);</div><div class='ctx'> int wcn36xx_smd_stop_hw_scan(struct wcn36xx *wcn);</div><div class='add'>+int wcn36xx_smd_update_channel_list(struct wcn36xx *wcn, struct cfg80211_scan_request *req);</div><div class='ctx'> int wcn36xx_smd_add_sta_self(struct wcn36xx *wcn, struct ieee80211_vif *vif);</div><div class='ctx'> int wcn36xx_smd_delete_sta_self(struct wcn36xx *wcn, u8 *addr);</div><div class='ctx'> int wcn36xx_smd_delete_sta(struct wcn36xx *wcn, u8 sta_index);</div><div class='hunk'>@@ -124,9 +124,6 @@ int wcn36xx_smd_keep_alive_req(struct wcn36xx *wcn,</div><div class='ctx'> int wcn36xx_smd_dump_cmd_req(struct wcn36xx *wcn, u32 arg1, u32 arg2,</div><div class='ctx'> 			     u32 arg3, u32 arg4, u32 arg5);</div><div class='ctx'> int wcn36xx_smd_feature_caps_exchange(struct wcn36xx *wcn);</div><div class='del'>-void set_feat_caps(u32 *bitmap, enum place_holder_in_cap_bitmap cap);</div><div class='del'>-int get_feat_caps(u32 *bitmap, enum place_holder_in_cap_bitmap cap);</div><div class='del'>-void clear_feat_caps(u32 *bitmap, enum place_holder_in_cap_bitmap cap);</div><div class='ctx'> </div><div class='ctx'> int wcn36xx_smd_add_ba_session(struct wcn36xx *wcn,</div><div class='ctx'> 		struct ieee80211_sta *sta,</div><div class='hunk'>@@ -136,7 +133,9 @@ int wcn36xx_smd_add_ba_session(struct wcn36xx *wcn,</div><div class='ctx'> 		u8 sta_index);</div><div class='ctx'> int wcn36xx_smd_add_ba(struct wcn36xx *wcn, u8 session_id);</div><div class='ctx'> int wcn36xx_smd_del_ba(struct wcn36xx *wcn, u16 tid, u8 direction, u8 sta_index);</div><div class='del'>-int wcn36xx_smd_trigger_ba(struct wcn36xx *wcn, u8 sta_index, u16 tid, u8 session_id);</div><div class='add'>+int wcn36xx_smd_trigger_ba(struct wcn36xx *wcn, u8 sta_index, u16 tid, u16 *ssn);</div><div class='add'>+int wcn36xx_smd_get_stats(struct wcn36xx *wcn, u8 sta_index, u32 stats_mask,</div><div class='add'>+			  struct station_info *sinfo);</div><div class='ctx'> </div><div class='ctx'> int wcn36xx_smd_update_cfg(struct wcn36xx *wcn, u32 cfg_id, u32 value);</div><div class='ctx'> </div><div class='hunk'>@@ -146,4 +145,27 @@ int wcn36xx_smd_rsp_process(struct rpmsg_device *rpdev,</div><div class='ctx'> int wcn36xx_smd_set_mc_list(struct wcn36xx *wcn,</div><div class='ctx'> 			    struct ieee80211_vif *vif,</div><div class='ctx'> 			    struct wcn36xx_hal_rcv_flt_mc_addr_list_type *fp);</div><div class='add'>+</div><div class='add'>+int wcn36xx_smd_arp_offload(struct wcn36xx *wcn, struct ieee80211_vif *vif,</div><div class='add'>+			    bool enable);</div><div class='add'>+</div><div class='add'>+int wcn36xx_smd_ipv6_ns_offload(struct wcn36xx *wcn, struct ieee80211_vif *vif,</div><div class='add'>+				bool enable);</div><div class='add'>+</div><div class='add'>+int wcn36xx_smd_gtk_offload(struct wcn36xx *wcn, struct ieee80211_vif *vif,</div><div class='add'>+			    bool enable);</div><div class='add'>+</div><div class='add'>+int wcn36xx_smd_gtk_offload_get_info(struct wcn36xx *wcn,</div><div class='add'>+				     struct ieee80211_vif *vif);</div><div class='add'>+</div><div class='add'>+int wcn36xx_smd_wlan_host_suspend_ind(struct wcn36xx *wcn);</div><div class='add'>+</div><div class='add'>+int wcn36xx_smd_host_resume(struct wcn36xx *wcn);</div><div class='add'>+</div><div class='add'>+int wcn36xx_smd_enter_imps(struct wcn36xx *wcn);</div><div class='add'>+int wcn36xx_smd_exit_imps(struct wcn36xx *wcn);</div><div class='add'>+</div><div class='add'>+int wcn36xx_smd_add_beacon_filter(struct wcn36xx *wcn,</div><div class='add'>+				  struct ieee80211_vif *vif);</div><div class='add'>+</div><div class='ctx'> #endif	/* _SMD_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/ath/wcn36xx/testmode.c b/drivers/net/wireless/ath/wcn36xx/testmode.c<br/>index 7ae14b4d2d0e..d7a2a483cbc4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/testmode.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/testmode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/testmode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wcn36xx/testmode.c</a></div><div class='hunk'>@@ -53,10 +53,10 @@ static int wcn36xx_tm_cmd_ptt(struct wcn36xx *wcn, struct ieee80211_vif *vif,</div><div class='ctx'> </div><div class='ctx'> 	buf = nla_data(tb[WCN36XX_TM_ATTR_DATA]);</div><div class='ctx'> 	buf_len = nla_len(tb[WCN36XX_TM_ATTR_DATA]);</div><div class='del'>-	msg = (struct ftm_rsp_msg *)buf;</div><div class='add'>+	msg = buf;</div><div class='ctx'> </div><div class='ctx'> 	wcn36xx_dbg(WCN36XX_DBG_TESTMODE,</div><div class='del'>-		    "testmode cmd wmi msg_id 0x%04X msg_len %d buf %pK buf_len %d\n",</div><div class='add'>+		    "testmode cmd wmi msg_id 0x%04X msg_len %d buf %p buf_len %d\n",</div><div class='ctx'> 		   msg-&gt;msg_id, msg-&gt;msg_body_length,</div><div class='ctx'> 		   buf, buf_len);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/wcn36xx/txrx.c b/drivers/net/wireless/ath/wcn36xx/txrx.c<br/>index 1b831157ede1..8826998797d6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/txrx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/txrx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/txrx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wcn36xx/txrx.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='ctx'> #include "txrx.h"</div><div class='ctx'> </div><div class='ctx'> static inline int get_rssi0(struct wcn36xx_rx_bd *bd)</div><div class='hunk'>@@ -23,6 +24,11 @@ static inline int get_rssi0(struct wcn36xx_rx_bd *bd)</div><div class='ctx'> 	return 100 - ((bd-&gt;phy_stat0 &gt;&gt; 24) &amp; 0xff);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int get_snr(struct wcn36xx_rx_bd *bd)</div><div class='add'>+{</div><div class='add'>+	return ((bd-&gt;phy_stat1 &gt;&gt; 24) &amp; 0xff);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct wcn36xx_rate {</div><div class='ctx'> 	u16 bitrate;</div><div class='ctx'> 	u16 mcs_or_legacy_index;</div><div class='hunk'>@@ -31,6 +37,13 @@ struct wcn36xx_rate {</div><div class='ctx'> 	enum rate_info_bw bw;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Buffer descriptor rx_ch field is limited to 5-bit (4+1), a mapping is used</div><div class='add'>+ * for 11A Channels.</div><div class='add'>+ */</div><div class='add'>+static const u8 ab_rx_ch_map[] = { 36, 40, 44, 48, 52, 56, 60, 64, 100, 104,</div><div class='add'>+				   108, 112, 116, 120, 124, 128, 132, 136, 140,</div><div class='add'>+				   149, 153, 157, 161, 165, 144 };</div><div class='add'>+</div><div class='ctx'> static const struct wcn36xx_rate wcn36xx_rate_table[] = {</div><div class='ctx'> 	/* 11b rates */</div><div class='ctx'> 	{  10, 0, RX_ENC_LEGACY, 0, RATE_INFO_BW_20 },</div><div class='hunk'>@@ -224,13 +237,78 @@ static const struct wcn36xx_rate wcn36xx_rate_table[] = {</div><div class='ctx'> 	{ 4333, 9, RX_ENC_VHT, RX_ENC_FLAG_SHORT_GI, RATE_INFO_BW_80 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct sk_buff *wcn36xx_unchain_msdu(struct sk_buff_head *amsdu)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb, *first;</div><div class='add'>+	int total_len = 0;</div><div class='add'>+	int space;</div><div class='add'>+</div><div class='add'>+	first = __skb_dequeue(amsdu);</div><div class='add'>+</div><div class='add'>+	skb_queue_walk(amsdu, skb)</div><div class='add'>+		total_len += skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	space = total_len - skb_tailroom(first);</div><div class='add'>+	if (space &gt; 0 &amp;&amp; pskb_expand_head(first, 0, space, GFP_ATOMIC) &lt; 0) {</div><div class='add'>+		__skb_queue_head(amsdu, first);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Walk list again, copying contents into msdu_head */</div><div class='add'>+	while ((skb = __skb_dequeue(amsdu))) {</div><div class='add'>+		skb_copy_from_linear_data(skb, skb_put(first, skb-&gt;len),</div><div class='add'>+					  skb-&gt;len);</div><div class='add'>+		dev_kfree_skb_irq(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return first;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __skb_queue_purge_irq(struct sk_buff_head *list)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	while ((skb = __skb_dequeue(list)) != NULL)</div><div class='add'>+		dev_kfree_skb_irq(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wcn36xx_update_survey(struct wcn36xx *wcn, int rssi, int snr,</div><div class='add'>+				  int band, int freq)</div><div class='add'>+{</div><div class='add'>+	static struct ieee80211_channel *channel;</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	int idx;</div><div class='add'>+	int i;</div><div class='add'>+	u8 snr_sample = snr &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	idx = 0;</div><div class='add'>+	if (band == NL80211_BAND_5GHZ)</div><div class='add'>+		idx = wcn-&gt;hw-&gt;wiphy-&gt;bands[NL80211_BAND_2GHZ]-&gt;n_channels;</div><div class='add'>+</div><div class='add'>+	sband = wcn-&gt;hw-&gt;wiphy-&gt;bands[band];</div><div class='add'>+	channel = sband-&gt;channels;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sband-&gt;n_channels; i++, channel++) {</div><div class='add'>+		if (channel-&gt;center_freq == freq) {</div><div class='add'>+			idx += i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;wcn-&gt;survey_lock);</div><div class='add'>+	wcn-&gt;chan_survey[idx].rssi = rssi;</div><div class='add'>+	wcn-&gt;chan_survey[idx].snr = snr;</div><div class='add'>+	spin_unlock(&amp;wcn-&gt;survey_lock);</div><div class='add'>+</div><div class='add'>+	add_device_randomness(&amp;snr_sample, sizeof(snr_sample));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int wcn36xx_rx_skb(struct wcn36xx *wcn, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_rx_status status;</div><div class='ctx'> 	const struct wcn36xx_rate *rate;</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='ctx'> 	struct wcn36xx_rx_bd *bd;</div><div class='del'>-	struct ieee80211_supported_band *sband;</div><div class='ctx'> 	u16 fc, sn;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -240,11 +318,31 @@ int wcn36xx_rx_skb(struct wcn36xx *wcn, struct sk_buff *skb)</div><div class='ctx'> 	memset(&amp;status, 0, sizeof(status));</div><div class='ctx'> </div><div class='ctx'> 	bd = (struct wcn36xx_rx_bd *)skb-&gt;data;</div><div class='del'>-	buff_to_be((u32 *)bd, sizeof(*bd)/sizeof(u32));</div><div class='add'>+	buff_to_be(bd, sizeof(*bd)/sizeof(u32));</div><div class='ctx'> 	wcn36xx_dbg_dump(WCN36XX_DBG_RX_DUMP,</div><div class='ctx'> 			 "BD   &lt;&lt;&lt; ", (char *)bd,</div><div class='ctx'> 			 sizeof(struct wcn36xx_rx_bd));</div><div class='ctx'> </div><div class='add'>+	if (bd-&gt;pdu.mpdu_data_off &lt;= bd-&gt;pdu.mpdu_header_off ||</div><div class='add'>+	    bd-&gt;pdu.mpdu_len &lt; bd-&gt;pdu.mpdu_header_len)</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;asf &amp;&amp; !bd-&gt;esf) { /* chained A-MSDU chunks */</div><div class='add'>+		/* Sanity check */</div><div class='add'>+		if (bd-&gt;pdu.mpdu_data_off + bd-&gt;pdu.mpdu_len &gt; WCN36XX_PKT_SIZE)</div><div class='add'>+			goto drop;</div><div class='add'>+</div><div class='add'>+		skb_put(skb, bd-&gt;pdu.mpdu_data_off + bd-&gt;pdu.mpdu_len);</div><div class='add'>+		skb_pull(skb, bd-&gt;pdu.mpdu_data_off);</div><div class='add'>+</div><div class='add'>+		/* Only set status for first chained BD (with mac header) */</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;pdu.mpdu_header_off &lt; sizeof(*bd) ||</div><div class='add'>+	    bd-&gt;pdu.mpdu_header_off + bd-&gt;pdu.mpdu_len &gt; WCN36XX_PKT_SIZE)</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='ctx'> 	skb_put(skb, bd-&gt;pdu.mpdu_header_off + bd-&gt;pdu.mpdu_len);</div><div class='ctx'> 	skb_pull(skb, bd-&gt;pdu.mpdu_header_off);</div><div class='ctx'> </div><div class='hunk'>@@ -252,8 +350,6 @@ int wcn36xx_rx_skb(struct wcn36xx *wcn, struct sk_buff *skb)</div><div class='ctx'> 	fc = __le16_to_cpu(hdr-&gt;frame_control);</div><div class='ctx'> 	sn = IEEE80211_SEQ_TO_SN(__le16_to_cpu(hdr-&gt;seq_ctrl));</div><div class='ctx'> </div><div class='del'>-	status.freq = WCN36XX_CENTER_FREQ(wcn);</div><div class='del'>-	status.band = WCN36XX_BAND(wcn);</div><div class='ctx'> 	status.mactime = 10;</div><div class='ctx'> 	status.signal = -get_rssi0(bd);</div><div class='ctx'> 	status.antenna = 1;</div><div class='hunk'>@@ -265,18 +361,39 @@ int wcn36xx_rx_skb(struct wcn36xx *wcn, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	wcn36xx_dbg(WCN36XX_DBG_RX, "status.flags=%x\n", status.flag);</div><div class='ctx'> </div><div class='add'>+	if (bd-&gt;scan_learn) {</div><div class='add'>+		/* If packet originate from hardware scanning, extract the</div><div class='add'>+		 * band/channel from bd descriptor.</div><div class='add'>+		 */</div><div class='add'>+		u8 hwch = (bd-&gt;reserved0 &lt;&lt; 4) + bd-&gt;rx_ch;</div><div class='add'>+</div><div class='add'>+		if (bd-&gt;rf_band != 1 &amp;&amp; hwch &lt;= sizeof(ab_rx_ch_map) &amp;&amp; hwch &gt;= 1) {</div><div class='add'>+			status.band = NL80211_BAND_5GHZ;</div><div class='add'>+			status.freq = ieee80211_channel_to_frequency(ab_rx_ch_map[hwch - 1],</div><div class='add'>+								     status.band);</div><div class='add'>+		} else {</div><div class='add'>+			status.band = NL80211_BAND_2GHZ;</div><div class='add'>+			status.freq = ieee80211_channel_to_frequency(hwch, status.band);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		status.band = WCN36XX_BAND(wcn);</div><div class='add'>+		status.freq = WCN36XX_CENTER_FREQ(wcn);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wcn36xx_update_survey(wcn, status.signal, get_snr(bd),</div><div class='add'>+			      status.band, status.freq);</div><div class='add'>+</div><div class='ctx'> 	if (bd-&gt;rate_id &lt; ARRAY_SIZE(wcn36xx_rate_table)) {</div><div class='ctx'> 		rate = &amp;wcn36xx_rate_table[bd-&gt;rate_id];</div><div class='ctx'> 		status.encoding = rate-&gt;encoding;</div><div class='ctx'> 		status.enc_flags = rate-&gt;encoding_flags;</div><div class='ctx'> 		status.bw = rate-&gt;bw;</div><div class='ctx'> 		status.rate_idx = rate-&gt;mcs_or_legacy_index;</div><div class='del'>-		sband = wcn-&gt;hw-&gt;wiphy-&gt;bands[status.band];</div><div class='ctx'> 		status.nss = 1;</div><div class='ctx'> </div><div class='ctx'> 		if (status.band == NL80211_BAND_5GHZ &amp;&amp;</div><div class='ctx'> 		    status.encoding == RX_ENC_LEGACY &amp;&amp;</div><div class='del'>-		    status.rate_idx &gt;= sband-&gt;n_bitrates) {</div><div class='add'>+		    status.rate_idx &gt;= 4) {</div><div class='ctx'> 			/* no dsss rates in 5Ghz rates table */</div><div class='ctx'> 			status.rate_idx -= 4;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -287,6 +404,10 @@ int wcn36xx_rx_skb(struct wcn36xx *wcn, struct sk_buff *skb)</div><div class='ctx'> 		status.rate_idx = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (ieee80211_is_beacon(hdr-&gt;frame_control) ||</div><div class='add'>+	    ieee80211_is_probe_resp(hdr-&gt;frame_control))</div><div class='add'>+		status.boottime_ns = ktime_get_boottime_ns();</div><div class='add'>+</div><div class='ctx'> 	memcpy(IEEE80211_SKB_RXCB(skb), &amp;status, sizeof(status));</div><div class='ctx'> </div><div class='ctx'> 	if (ieee80211_is_beacon(hdr-&gt;frame_control)) {</div><div class='hunk'>@@ -301,9 +422,37 @@ int wcn36xx_rx_skb(struct wcn36xx *wcn, struct sk_buff *skb)</div><div class='ctx'> 				 (char *)skb-&gt;data, skb-&gt;len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+done:</div><div class='add'>+	/*  Chained AMSDU ? slow path */</div><div class='add'>+	if (unlikely(bd-&gt;asf &amp;&amp; !(bd-&gt;lsf &amp;&amp; bd-&gt;esf))) {</div><div class='add'>+		if (bd-&gt;esf &amp;&amp; !skb_queue_empty(&amp;wcn-&gt;amsdu)) {</div><div class='add'>+			wcn36xx_err("Discarding non complete chain");</div><div class='add'>+			__skb_queue_purge_irq(&amp;wcn-&gt;amsdu);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		__skb_queue_tail(&amp;wcn-&gt;amsdu, skb);</div><div class='add'>+</div><div class='add'>+		if (!bd-&gt;lsf)</div><div class='add'>+			return 0; /* Not the last AMSDU, wait for more */</div><div class='add'>+</div><div class='add'>+		skb = wcn36xx_unchain_msdu(&amp;wcn-&gt;amsdu);</div><div class='add'>+		if (!skb)</div><div class='add'>+			goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ieee80211_rx_irqsafe(wcn-&gt;hw, skb);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+drop: /* drop everything */</div><div class='add'>+	wcn36xx_err("Drop frame! skb:%p len:%u hoff:%u doff:%u asf=%u esf=%u lsf=%u\n",</div><div class='add'>+		    skb, bd-&gt;pdu.mpdu_len, bd-&gt;pdu.mpdu_header_off,</div><div class='add'>+		    bd-&gt;pdu.mpdu_data_off, bd-&gt;asf, bd-&gt;esf, bd-&gt;lsf);</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb_irq(skb);</div><div class='add'>+	__skb_queue_purge_irq(&amp;wcn-&gt;amsdu);</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void wcn36xx_set_tx_pdu(struct wcn36xx_tx_bd *bd,</div><div class='hunk'>@@ -317,8 +466,6 @@ static void wcn36xx_set_tx_pdu(struct wcn36xx_tx_bd *bd,</div><div class='ctx'> 		bd-&gt;pdu.mpdu_header_off;</div><div class='ctx'> 	bd-&gt;pdu.mpdu_len = len;</div><div class='ctx'> 	bd-&gt;pdu.tid = tid;</div><div class='del'>-	/* Use seq number generated by mac80211 */</div><div class='del'>-	bd-&gt;pdu.bd_ssn = WCN36XX_TXBD_SSN_FILL_HOST;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct wcn36xx_vif *get_vif_by_addr(struct wcn36xx *wcn,</div><div class='hunk'>@@ -415,6 +562,9 @@ static void wcn36xx_set_tx_data(struct wcn36xx_tx_bd *bd,</div><div class='ctx'> 		tid = ieee80211_get_tid(hdr);</div><div class='ctx'> 		/* TID-&gt;QID is one-to-one mapping */</div><div class='ctx'> 		bd-&gt;queue_id = tid;</div><div class='add'>+		bd-&gt;pdu.bd_ssn = WCN36XX_TXBD_SSN_FILL_DPU_QOS;</div><div class='add'>+	} else {</div><div class='add'>+		bd-&gt;pdu.bd_ssn = WCN36XX_TXBD_SSN_FILL_DPU_NON_QOS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;flags &amp; IEEE80211_TX_INTFL_DONT_ENCRYPT ||</div><div class='hunk'>@@ -425,6 +575,9 @@ static void wcn36xx_set_tx_data(struct wcn36xx_tx_bd *bd,</div><div class='ctx'> 	if (ieee80211_is_any_nullfunc(hdr-&gt;frame_control)) {</div><div class='ctx'> 		/* Don't use a regular queue for null packet (no ampdu) */</div><div class='ctx'> 		bd-&gt;queue_id = WCN36XX_TX_U_WQ_ID;</div><div class='add'>+		bd-&gt;bd_rate = WCN36XX_BD_RATE_CTRL;</div><div class='add'>+		if (ieee80211_is_qos_nullfunc(hdr-&gt;frame_control))</div><div class='add'>+			bd-&gt;pdu.bd_ssn = WCN36XX_TXBD_SSN_FILL_HOST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (bcast) {</div><div class='hunk'>@@ -484,6 +637,8 @@ static void wcn36xx_set_tx_mgmt(struct wcn36xx_tx_bd *bd,</div><div class='ctx'> 		bd-&gt;queue_id = WCN36XX_TX_U_WQ_ID;</div><div class='ctx'> 	*vif_priv = __vif_priv;</div><div class='ctx'> </div><div class='add'>+	bd-&gt;pdu.bd_ssn = WCN36XX_TXBD_SSN_FILL_DPU_NON_QOS;</div><div class='add'>+</div><div class='ctx'> 	wcn36xx_set_tx_pdu(bd,</div><div class='ctx'> 			   ieee80211_is_data_qos(hdr-&gt;frame_control) ?</div><div class='ctx'> 			   sizeof(struct ieee80211_qos_hdr) :</div><div class='hunk'>@@ -498,10 +653,11 @@ int wcn36xx_start_tx(struct wcn36xx *wcn,</div><div class='ctx'> 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='ctx'> 	struct wcn36xx_vif *vif_priv = NULL;</div><div class='ctx'> 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	bool is_low = ieee80211_is_data(hdr-&gt;frame_control);</div><div class='ctx'> 	bool bcast = is_broadcast_ether_addr(hdr-&gt;addr1) ||</div><div class='ctx'> 		is_multicast_ether_addr(hdr-&gt;addr1);</div><div class='add'>+	bool ack_ind = (info-&gt;flags &amp; IEEE80211_TX_CTL_REQ_TX_STATUS) &amp;&amp;</div><div class='add'>+					!(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK);</div><div class='ctx'> 	struct wcn36xx_tx_bd bd;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -517,30 +673,16 @@ int wcn36xx_start_tx(struct wcn36xx *wcn,</div><div class='ctx'> </div><div class='ctx'> 	bd.dpu_rf = WCN36XX_BMU_WQ_TX;</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;flags &amp; IEEE80211_TX_CTL_REQ_TX_STATUS) {</div><div class='add'>+	if (unlikely(ack_ind)) {</div><div class='ctx'> 		wcn36xx_dbg(WCN36XX_DBG_DXE, "TX_ACK status requested\n");</div><div class='ctx'> </div><div class='del'>-		spin_lock_irqsave(&amp;wcn-&gt;dxe_lock, flags);</div><div class='del'>-		if (wcn-&gt;tx_ack_skb) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;wcn-&gt;dxe_lock, flags);</div><div class='del'>-			wcn36xx_warn("tx_ack_skb already set\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		wcn-&gt;tx_ack_skb = skb;</div><div class='del'>-		spin_unlock_irqrestore(&amp;wcn-&gt;dxe_lock, flags);</div><div class='del'>-</div><div class='ctx'> 		/* Only one at a time is supported by fw. Stop the TX queues</div><div class='ctx'> 		 * until the ack status gets back.</div><div class='ctx'> 		 */</div><div class='ctx'> 		ieee80211_stop_queues(wcn-&gt;hw);</div><div class='ctx'> </div><div class='del'>-		/* TX watchdog if no TX irq or ack indication received  */</div><div class='del'>-		mod_timer(&amp;wcn-&gt;tx_ack_timer, jiffies + HZ / 10);</div><div class='del'>-</div><div class='ctx'> 		/* Request ack indication from the firmware */</div><div class='del'>-		if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK))</div><div class='del'>-			bd.tx_comp = 1;</div><div class='add'>+		bd.tx_comp = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Data frames served first*/</div><div class='hunk'>@@ -550,20 +692,43 @@ int wcn36xx_start_tx(struct wcn36xx *wcn,</div><div class='ctx'> 		/* MGMT and CTRL frames are handeld here*/</div><div class='ctx'> 		wcn36xx_set_tx_mgmt(&amp;bd, wcn, &amp;vif_priv, skb, bcast);</div><div class='ctx'> </div><div class='del'>-	buff_to_be((u32 *)&amp;bd, sizeof(bd)/sizeof(u32));</div><div class='add'>+	buff_to_be(&amp;bd, sizeof(bd)/sizeof(u32));</div><div class='ctx'> 	bd.tx_bd_sign = 0xbdbdbdbd;</div><div class='ctx'> </div><div class='ctx'> 	ret = wcn36xx_dxe_tx_frame(wcn, vif_priv, &amp;bd, skb, is_low);</div><div class='del'>-	if (ret &amp;&amp; (info-&gt;flags &amp; IEEE80211_TX_CTL_REQ_TX_STATUS)) {</div><div class='del'>-		/* If the skb has not been transmitted,</div><div class='del'>-		 * don't keep a reference to it.</div><div class='del'>-		 */</div><div class='del'>-		spin_lock_irqsave(&amp;wcn-&gt;dxe_lock, flags);</div><div class='del'>-		wcn-&gt;tx_ack_skb = NULL;</div><div class='del'>-		spin_unlock_irqrestore(&amp;wcn-&gt;dxe_lock, flags);</div><div class='del'>-</div><div class='add'>+	if (unlikely(ret &amp;&amp; ack_ind)) {</div><div class='add'>+		/* If the skb has not been transmitted, resume TX queue */</div><div class='ctx'> 		ieee80211_wake_queues(wcn-&gt;hw);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void wcn36xx_process_tx_rate(struct ani_global_class_a_stats_info *stats, struct rate_info *info)</div><div class='add'>+{</div><div class='add'>+	/* tx_rate is in units of 500kbps; mac80211 wants them in 100kbps */</div><div class='add'>+	if (stats-&gt;tx_rate_flags &amp; HAL_TX_RATE_LEGACY)</div><div class='add'>+		info-&gt;legacy = stats-&gt;tx_rate * 5;</div><div class='add'>+</div><div class='add'>+	info-&gt;flags = 0;</div><div class='add'>+	info-&gt;mcs = stats-&gt;mcs_index;</div><div class='add'>+	info-&gt;nss = 1;</div><div class='add'>+</div><div class='add'>+	if (stats-&gt;tx_rate_flags &amp; (HAL_TX_RATE_HT20 | HAL_TX_RATE_HT40))</div><div class='add'>+		info-&gt;flags |= RATE_INFO_FLAGS_MCS;</div><div class='add'>+</div><div class='add'>+	if (stats-&gt;tx_rate_flags &amp; (HAL_TX_RATE_VHT20 | HAL_TX_RATE_VHT40 | HAL_TX_RATE_VHT80))</div><div class='add'>+		info-&gt;flags |= RATE_INFO_FLAGS_VHT_MCS;</div><div class='add'>+</div><div class='add'>+	if (stats-&gt;tx_rate_flags &amp; HAL_TX_RATE_SGI)</div><div class='add'>+		info-&gt;flags |= RATE_INFO_FLAGS_SHORT_GI;</div><div class='add'>+</div><div class='add'>+	if (stats-&gt;tx_rate_flags &amp; (HAL_TX_RATE_HT20 | HAL_TX_RATE_VHT20))</div><div class='add'>+		info-&gt;bw = RATE_INFO_BW_20;</div><div class='add'>+</div><div class='add'>+	if (stats-&gt;tx_rate_flags &amp; (HAL_TX_RATE_HT40 | HAL_TX_RATE_VHT40))</div><div class='add'>+		info-&gt;bw = RATE_INFO_BW_40;</div><div class='add'>+</div><div class='add'>+	if (stats-&gt;tx_rate_flags &amp; HAL_TX_RATE_VHT80)</div><div class='add'>+		info-&gt;bw = RATE_INFO_BW_80;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/wcn36xx/txrx.h b/drivers/net/wireless/ath/wcn36xx/txrx.h<br/>index 032216e82b2b..fb0d6cabd52b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/txrx.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/txrx.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/txrx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wcn36xx/txrx.h</a></div><div class='hunk'>@@ -110,7 +110,8 @@ struct wcn36xx_rx_bd {</div><div class='ctx'> 	/* 0x44 */</div><div class='ctx'> 	u32	exp_seq_num:12;</div><div class='ctx'> 	u32	cur_seq_num:12;</div><div class='del'>-	u32	fr_type_subtype:8;</div><div class='add'>+	u32	rf_band:2;</div><div class='add'>+	u32	fr_type_subtype:6;</div><div class='ctx'> </div><div class='ctx'> 	/* 0x48 */</div><div class='ctx'> 	u32	msdu_size:16;</div><div class='hunk'>@@ -163,5 +164,6 @@ int  wcn36xx_rx_skb(struct wcn36xx *wcn, struct sk_buff *skb);</div><div class='ctx'> int wcn36xx_start_tx(struct wcn36xx *wcn,</div><div class='ctx'> 		     struct wcn36xx_sta *sta_priv,</div><div class='ctx'> 		     struct sk_buff *skb);</div><div class='add'>+void wcn36xx_process_tx_rate(struct ani_global_class_a_stats_info *stats, struct rate_info *info);</div><div class='ctx'> </div><div class='ctx'> #endif	/* _TXRX_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h<br/>index 71fa9992b118..7ee79593cd23 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/wcn36xx.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wcn36xx/wcn36xx.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wcn36xx/wcn36xx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wcn36xx/wcn36xx.h</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #define _WCN36XX_H_</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/in6.h&gt;</div><div class='ctx'> #include &lt;linux/printk.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='hunk'>@@ -96,13 +97,17 @@ enum wcn36xx_ampdu_state {</div><div class='ctx'> </div><div class='ctx'> #define RF_UNKNOWN	0x0000</div><div class='ctx'> #define RF_IRIS_WCN3620	0x3620</div><div class='add'>+#define RF_IRIS_WCN3660	0x3660</div><div class='ctx'> #define RF_IRIS_WCN3680	0x3680</div><div class='ctx'> </div><div class='del'>-static inline void buff_to_be(u32 *buf, size_t len)</div><div class='add'>+static inline void buff_to_be(void *buf, size_t len)</div><div class='ctx'> {</div><div class='add'>+	__be32 *to = buf;</div><div class='add'>+	u32 *from = buf;</div><div class='ctx'> 	int i;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; len; i++)</div><div class='del'>-		buf[i] = cpu_to_be32(buf[i]);</div><div class='add'>+		to[i] = cpu_to_be32(from[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct nv_data {</div><div class='hunk'>@@ -127,7 +132,6 @@ struct wcn36xx_vif {</div><div class='ctx'> 	enum wcn36xx_hal_bss_type bss_type;</div><div class='ctx'> </div><div class='ctx'> 	/* Power management */</div><div class='del'>-	bool allow_bmps;</div><div class='ctx'> 	enum wcn36xx_power_state pw_state;</div><div class='ctx'> </div><div class='ctx'> 	u8 bss_index;</div><div class='hunk'>@@ -136,7 +140,22 @@ struct wcn36xx_vif {</div><div class='ctx'> 	u8 self_dpu_desc_index;</div><div class='ctx'> 	u8 self_ucast_dpu_sign;</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	/* IPv6 addresses for WoWLAN */</div><div class='add'>+	struct in6_addr target_ipv6_addrs[WCN36XX_HAL_IPV6_OFFLOAD_ADDR_MAX];</div><div class='add'>+	unsigned long tentative_addrs[BITS_TO_LONGS(WCN36XX_HAL_IPV6_OFFLOAD_ADDR_MAX)];</div><div class='add'>+	int num_target_ipv6_addrs;</div><div class='add'>+#endif</div><div class='add'>+	/* WoWLAN GTK rekey data */</div><div class='add'>+	struct {</div><div class='add'>+		u8 kck[NL80211_KCK_LEN], kek[NL80211_KEK_LEN];</div><div class='add'>+		__le64 replay_ctr;</div><div class='add'>+		bool valid;</div><div class='add'>+	} rekey_data;</div><div class='add'>+</div><div class='ctx'> 	struct list_head sta_list;</div><div class='add'>+</div><div class='add'>+	int bmps_fail_ct;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -148,7 +167,7 @@ struct wcn36xx_vif {</div><div class='ctx'>  * @dpu_desc_index: DPU descriptor index is returned from HW after config_sta</div><div class='ctx'>  * call and is used in TX BD.</div><div class='ctx'>  * @bss_sta_index: STA index is returned from HW after config_bss call and is</div><div class='del'>- * used in both SMD channel and TX BD. See table bellow when it is used.</div><div class='add'>+ * used in both SMD channel and TX BD. See table below when it is used.</div><div class='ctx'>  * @bss_dpu_desc_index: DPU descriptor index is returned from HW after</div><div class='ctx'>  * config_bss call and is used in TX BD.</div><div class='ctx'>  * ______________________________________________</div><div class='hunk'>@@ -179,12 +198,20 @@ struct wcn36xx_sta {</div><div class='ctx'> 	enum wcn36xx_ampdu_state ampdu_state[16];</div><div class='ctx'> 	int non_agg_frame_ct;</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> struct wcn36xx_dxe_ch;</div><div class='add'>+</div><div class='add'>+struct wcn36xx_chan_survey {</div><div class='add'>+	s8	rssi;</div><div class='add'>+	u8	snr;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct wcn36xx {</div><div class='ctx'> 	struct ieee80211_hw	*hw;</div><div class='ctx'> 	struct device		*dev;</div><div class='ctx'> 	struct list_head	vif_list;</div><div class='ctx'> </div><div class='add'>+	const char		*nv_file;</div><div class='ctx'> 	const struct firmware	*nv;</div><div class='ctx'> </div><div class='ctx'> 	u8			fw_revision;</div><div class='hunk'>@@ -193,6 +220,7 @@ struct wcn36xx {</div><div class='ctx'> 	u8			fw_major;</div><div class='ctx'> 	u32			fw_feat_caps[WCN36XX_HAL_CAPS_SIZE];</div><div class='ctx'> 	bool			is_pronto;</div><div class='add'>+	bool			is_pronto_v3;</div><div class='ctx'> </div><div class='ctx'> 	/* extra byte for the NULL termination */</div><div class='ctx'> 	u8			crm_version[WCN36XX_HAL_VERSION_LENGTH + 1];</div><div class='hunk'>@@ -232,6 +260,8 @@ struct wcn36xx {</div><div class='ctx'> 	struct cfg80211_scan_request *scan_req;</div><div class='ctx'> 	bool			sw_scan;</div><div class='ctx'> 	u8			sw_scan_opchannel;</div><div class='add'>+	bool			sw_scan_init;</div><div class='add'>+	u8			sw_scan_channel;</div><div class='ctx'> 	struct ieee80211_vif	*sw_scan_vif;</div><div class='ctx'> 	struct mutex		scan_lock;</div><div class='ctx'> 	bool			scan_aborted;</div><div class='hunk'>@@ -253,6 +283,9 @@ struct wcn36xx {</div><div class='ctx'> 	struct sk_buff		*tx_ack_skb;</div><div class='ctx'> 	struct timer_list	tx_ack_timer;</div><div class='ctx'> </div><div class='add'>+	/* For A-MSDU re-aggregation */</div><div class='add'>+	struct sk_buff_head amsdu;</div><div class='add'>+</div><div class='ctx'> 	/* RF module */</div><div class='ctx'> 	unsigned		rf_id;</div><div class='ctx'> </div><div class='hunk'>@@ -261,6 +294,11 @@ struct wcn36xx {</div><div class='ctx'> 	struct wcn36xx_dfs_entry    dfs;</div><div class='ctx'> #endif /* CONFIG_WCN36XX_DEBUGFS */</div><div class='ctx'> </div><div class='add'>+	struct ieee80211_supported_band *band;</div><div class='add'>+	struct ieee80211_channel *channel;</div><div class='add'>+</div><div class='add'>+	spinlock_t survey_lock;		/* protects chan_survey */</div><div class='add'>+	struct wcn36xx_chan_survey	*chan_survey;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline bool wcn36xx_is_fw_version(struct wcn36xx *wcn,</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c<br/>index 6746fd206d2a..7218fe70f3bc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/cfg80211.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/cfg80211.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/cfg80211.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wil6210/cfg80211.c</a></div><div class='hunk'>@@ -723,11 +723,13 @@ wil_cfg80211_add_iface(struct wiphy *wiphy, const char *name,</div><div class='ctx'> 	ndev = vif_to_ndev(vif);</div><div class='ctx'> 	ether_addr_copy(ndev-&gt;perm_addr, ndev_main-&gt;perm_addr);</div><div class='ctx'> 	if (is_valid_ether_addr(params-&gt;macaddr)) {</div><div class='del'>-		ether_addr_copy(ndev-&gt;dev_addr, params-&gt;macaddr);</div><div class='add'>+		eth_hw_addr_set(ndev, params-&gt;macaddr);</div><div class='ctx'> 	} else {</div><div class='del'>-		ether_addr_copy(ndev-&gt;dev_addr, ndev_main-&gt;perm_addr);</div><div class='del'>-		ndev-&gt;dev_addr[0] = (ndev-&gt;dev_addr[0] ^ (1 &lt;&lt; vif-&gt;mid)) |</div><div class='del'>-			0x2; /* locally administered */</div><div class='add'>+		u8 addr[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+		ether_addr_copy(addr, ndev_main-&gt;perm_addr);</div><div class='add'>+		addr[0] = (addr[0] ^ (1 &lt;&lt; vif-&gt;mid)) |	0x2; /* locally administered */</div><div class='add'>+		eth_hw_addr_set(ndev, addr);</div><div class='ctx'> 	}</div><div class='ctx'> 	wdev = vif_to_wdev(vif);</div><div class='ctx'> 	ether_addr_copy(wdev-&gt;address, ndev-&gt;dev_addr);</div><div class='hunk'>@@ -890,10 +892,8 @@ static int wil_cfg80211_scan(struct wiphy *wiphy,</div><div class='ctx'> 	struct wil6210_priv *wil = wiphy_to_wil(wiphy);</div><div class='ctx'> 	struct wireless_dev *wdev = request-&gt;wdev;</div><div class='ctx'> 	struct wil6210_vif *vif = wdev_to_vif(wil, wdev);</div><div class='del'>-	struct {</div><div class='del'>-		struct wmi_start_scan_cmd cmd;</div><div class='del'>-		u16 chnl[4];</div><div class='del'>-	} __packed cmd;</div><div class='add'>+	DEFINE_FLEX(struct wmi_start_scan_cmd, cmd,</div><div class='add'>+		    channel_list, num_channels, 4);</div><div class='ctx'> 	uint i, n;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='hunk'>@@ -975,9 +975,8 @@ static int wil_cfg80211_scan(struct wiphy *wiphy,</div><div class='ctx'> 	vif-&gt;scan_request = request;</div><div class='ctx'> 	mod_timer(&amp;vif-&gt;scan_timer, jiffies + WIL6210_SCAN_TO);</div><div class='ctx'> </div><div class='del'>-	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-	cmd.cmd.scan_type = WMI_ACTIVE_SCAN;</div><div class='del'>-	cmd.cmd.num_channels = 0;</div><div class='add'>+	cmd-&gt;scan_type = WMI_ACTIVE_SCAN;</div><div class='add'>+	cmd-&gt;num_channels = 0;</div><div class='ctx'> 	n = min(request-&gt;n_channels, 4U);</div><div class='ctx'> 	for (i = 0; i &lt; n; i++) {</div><div class='ctx'> 		int ch = request-&gt;channels[i]-&gt;hw_value;</div><div class='hunk'>@@ -989,7 +988,8 @@ static int wil_cfg80211_scan(struct wiphy *wiphy,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* 0-based channel indexes */</div><div class='del'>-		cmd.cmd.channel_list[cmd.cmd.num_channels++].channel = ch - 1;</div><div class='add'>+		cmd-&gt;num_channels++;</div><div class='add'>+		cmd-&gt;channel_list[cmd-&gt;num_channels - 1].channel = ch - 1;</div><div class='ctx'> 		wil_dbg_misc(wil, "Scan for ch %d  : %d MHz\n", ch,</div><div class='ctx'> 			     request-&gt;channels[i]-&gt;center_freq);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1005,20 +1005,19 @@ static int wil_cfg80211_scan(struct wiphy *wiphy,</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out_restore;</div><div class='ctx'> </div><div class='del'>-	if (wil-&gt;discovery_mode &amp;&amp; cmd.cmd.scan_type == WMI_ACTIVE_SCAN) {</div><div class='del'>-		cmd.cmd.discovery_mode = 1;</div><div class='add'>+	if (wil-&gt;discovery_mode &amp;&amp; cmd-&gt;scan_type == WMI_ACTIVE_SCAN) {</div><div class='add'>+		cmd-&gt;discovery_mode = 1;</div><div class='ctx'> 		wil_dbg_misc(wil, "active scan with discovery_mode=1\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;mid == 0)</div><div class='ctx'> 		wil-&gt;radio_wdev = wdev;</div><div class='ctx'> 	rc = wmi_send(wil, WMI_START_SCAN_CMDID, vif-&gt;mid,</div><div class='del'>-		      &amp;cmd, sizeof(cmd.cmd) +</div><div class='del'>-		      cmd.cmd.num_channels * sizeof(cmd.cmd.channel_list[0]));</div><div class='add'>+		      cmd, struct_size(cmd, channel_list, cmd-&gt;num_channels));</div><div class='ctx'> </div><div class='ctx'> out_restore:</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		del_timer_sync(&amp;vif-&gt;scan_timer);</div><div class='add'>+		timer_delete_sync(&amp;vif-&gt;scan_timer);</div><div class='ctx'> 		if (vif-&gt;mid == 0)</div><div class='ctx'> 			wil-&gt;radio_wdev = wil-&gt;main_ndev-&gt;ieee80211_ptr;</div><div class='ctx'> 		vif-&gt;scan_request = NULL;</div><div class='hunk'>@@ -1409,7 +1408,8 @@ static int wil_cfg80211_disconnect(struct wiphy *wiphy,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wil_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)</div><div class='add'>+static int wil_cfg80211_set_wiphy_params(struct wiphy *wiphy, int radio_idx,</div><div class='add'>+					 u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct wil6210_priv *wil = wiphy_to_wil(wiphy);</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -1494,6 +1494,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int wil_cfg80211_set_channel(struct wiphy *wiphy,</div><div class='add'>+				    struct net_device *dev,</div><div class='ctx'> 				    struct cfg80211_chan_def *chandef)</div><div class='ctx'> {</div><div class='ctx'> 	struct wil6210_priv *wil = wiphy_to_wil(wiphy);</div><div class='hunk'>@@ -1618,7 +1619,7 @@ static void wil_del_rx_key(u8 key_index, enum wmi_key_usage key_usage,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int wil_cfg80211_add_key(struct wiphy *wiphy,</div><div class='del'>-				struct net_device *ndev,</div><div class='add'>+				struct net_device *ndev, int link_id,</div><div class='ctx'> 				u8 key_index, bool pairwise,</div><div class='ctx'> 				const u8 *mac_addr,</div><div class='ctx'> 				struct key_params *params)</div><div class='hunk'>@@ -1651,10 +1652,9 @@ static int wil_cfg80211_add_key(struct wiphy *wiphy,</div><div class='ctx'> 				params-&gt;seq_len, params-&gt;seq);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!IS_ERR(cs))</div><div class='add'>+	} else {</div><div class='ctx'> 		wil_del_rx_key(key_index, key_usage, cs);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;seq &amp;&amp; params-&gt;seq_len != IEEE80211_GCMP_PN_LEN) {</div><div class='ctx'> 		wil_err(wil,</div><div class='hunk'>@@ -1695,7 +1695,7 @@ static int wil_cfg80211_add_key(struct wiphy *wiphy,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int wil_cfg80211_del_key(struct wiphy *wiphy,</div><div class='del'>-				struct net_device *ndev,</div><div class='add'>+				struct net_device *ndev, int link_id,</div><div class='ctx'> 				u8 key_index, bool pairwise,</div><div class='ctx'> 				const u8 *mac_addr)</div><div class='ctx'> {</div><div class='hunk'>@@ -1722,7 +1722,7 @@ static int wil_cfg80211_del_key(struct wiphy *wiphy,</div><div class='ctx'> </div><div class='ctx'> /* Need to be present or wiphy_new() will WARN */</div><div class='ctx'> static int wil_cfg80211_set_default_key(struct wiphy *wiphy,</div><div class='del'>-					struct net_device *ndev,</div><div class='add'>+					struct net_device *ndev, int link_id,</div><div class='ctx'> 					u8 key_index, bool unicast,</div><div class='ctx'> 					bool multicast)</div><div class='ctx'> {</div><div class='hunk'>@@ -2071,8 +2071,8 @@ void wil_cfg80211_ap_recovery(struct wil6210_priv *wil)</div><div class='ctx'> 		key_params.key = vif-&gt;gtk;</div><div class='ctx'> 		key_params.key_len = vif-&gt;gtk_len;</div><div class='ctx'> 		key_params.seq_len = IEEE80211_GCMP_PN_LEN;</div><div class='del'>-		rc = wil_cfg80211_add_key(wiphy, ndev, vif-&gt;gtk_index, false,</div><div class='del'>-					  NULL, &amp;key_params);</div><div class='add'>+		rc = wil_cfg80211_add_key(wiphy, ndev, -1, vif-&gt;gtk_index,</div><div class='add'>+					  false, NULL, &amp;key_params);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			wil_err(wil, "vif %d recovery add key failed (%d)\n",</div><div class='ctx'> 				i, rc);</div><div class='hunk'>@@ -2081,11 +2081,12 @@ void wil_cfg80211_ap_recovery(struct wil6210_priv *wil)</div><div class='ctx'> </div><div class='ctx'> static int wil_cfg80211_change_beacon(struct wiphy *wiphy,</div><div class='ctx'> 				      struct net_device *ndev,</div><div class='del'>-				      struct cfg80211_beacon_data *bcon)</div><div class='add'>+				      struct cfg80211_ap_update *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct wil6210_priv *wil = wiphy_to_wil(wiphy);</div><div class='ctx'> 	struct wireless_dev *wdev = ndev-&gt;ieee80211_ptr;</div><div class='ctx'> 	struct wil6210_vif *vif = ndev_to_vif(ndev);</div><div class='add'>+	struct cfg80211_beacon_data *bcon = &amp;params-&gt;beacon;</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	u32 privacy = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2097,8 +2098,8 @@ static int wil_cfg80211_change_beacon(struct wiphy *wiphy,</div><div class='ctx'> 			     bcon-&gt;tail_len))</div><div class='ctx'> 		privacy = 1;</div><div class='ctx'> </div><div class='del'>-	memcpy(vif-&gt;ssid, wdev-&gt;ssid, wdev-&gt;ssid_len);</div><div class='del'>-	vif-&gt;ssid_len = wdev-&gt;ssid_len;</div><div class='add'>+	memcpy(vif-&gt;ssid, wdev-&gt;u.ap.ssid, wdev-&gt;u.ap.ssid_len);</div><div class='add'>+	vif-&gt;ssid_len = wdev-&gt;u.ap.ssid_len;</div><div class='ctx'> </div><div class='ctx'> 	/* in case privacy has changed, need to restart the AP */</div><div class='ctx'> 	if (vif-&gt;privacy != privacy) {</div><div class='hunk'>@@ -2107,7 +2108,7 @@ static int wil_cfg80211_change_beacon(struct wiphy *wiphy,</div><div class='ctx'> </div><div class='ctx'> 		rc = _wil_cfg80211_start_ap(wiphy, ndev, vif-&gt;ssid,</div><div class='ctx'> 					    vif-&gt;ssid_len, privacy,</div><div class='del'>-					    wdev-&gt;beacon_interval,</div><div class='add'>+					    wdev-&gt;links[0].ap.beacon_interval,</div><div class='ctx'> 					    vif-&gt;channel,</div><div class='ctx'> 					    vif-&gt;wmi_edmg_channel, bcon,</div><div class='ctx'> 					    vif-&gt;hidden_ssid,</div><div class='hunk'>@@ -2185,7 +2186,8 @@ static int wil_cfg80211_start_ap(struct wiphy *wiphy,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int wil_cfg80211_stop_ap(struct wiphy *wiphy,</div><div class='del'>-				struct net_device *ndev)</div><div class='add'>+				struct net_device *ndev,</div><div class='add'>+				unsigned int link_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct wil6210_priv *wil = wiphy_to_wil(wiphy);</div><div class='ctx'> 	struct wil6210_vif *vif = ndev_to_vif(ndev);</div><div class='hunk'>@@ -2706,6 +2708,7 @@ static void wil_wiphy_init(struct wiphy *wiphy)</div><div class='ctx'> 	wiphy-&gt;n_cipher_suites = ARRAY_SIZE(wil_cipher_suites);</div><div class='ctx'> 	wiphy-&gt;mgmt_stypes = wil_mgmt_stypes;</div><div class='ctx'> 	wiphy-&gt;features |= NL80211_FEATURE_SK_TX_STATUS;</div><div class='add'>+	wiphy-&gt;bss_param_support = WIPHY_BSS_PARAM_AP_ISOLATE;</div><div class='ctx'> </div><div class='ctx'> 	wiphy-&gt;n_vendor_commands = ARRAY_SIZE(wil_nl80211_vendor_commands);</div><div class='ctx'> 	wiphy-&gt;vendor_commands = wil_nl80211_vendor_commands;</div><div class='hunk'>@@ -2732,7 +2735,7 @@ int wil_cfg80211_iface_combinations_from_fw(</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	combo = conc-&gt;combos;</div><div class='add'>+	combo = (const struct wil_fw_concurrency_combo *)(conc + 1);</div><div class='ctx'> 	n_combos = le16_to_cpu(conc-&gt;n_combos);</div><div class='ctx'> 	for (i = 0; i &lt; n_combos; i++) {</div><div class='ctx'> 		total_limits += combo-&gt;n_limits;</div><div class='hunk'>@@ -2748,7 +2751,7 @@ int wil_cfg80211_iface_combinations_from_fw(</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	iface_limit = (struct ieee80211_iface_limit *)(iface_combinations +</div><div class='ctx'> 						       n_combos);</div><div class='del'>-	combo = conc-&gt;combos;</div><div class='add'>+	combo = (const struct wil_fw_concurrency_combo *)(conc + 1);</div><div class='ctx'> 	for (i = 0; i &lt; n_combos; i++) {</div><div class='ctx'> 		iface_combinations[i].max_interfaces = combo-&gt;max_interfaces;</div><div class='ctx'> 		iface_combinations[i].num_different_channels =</div><div class='hunk'>@@ -2842,9 +2845,7 @@ void wil_p2p_wdev_free(struct wil6210_priv *wil)</div><div class='ctx'> 	wil-&gt;radio_wdev = wil-&gt;main_ndev-&gt;ieee80211_ptr;</div><div class='ctx'> 	mutex_unlock(&amp;wil-&gt;vif_mutex);</div><div class='ctx'> 	if (p2p_wdev) {</div><div class='del'>-		wiphy_lock(wil-&gt;wiphy);</div><div class='ctx'> 		cfg80211_unregister_wdev(p2p_wdev);</div><div class='del'>-		wiphy_unlock(wil-&gt;wiphy);</div><div class='ctx'> 		kfree(p2p_wdev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c<br/>index 4c944e595978..c021ebcddee7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/debugfs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wil6210/debugfs.c</a></div><div class='hunk'>@@ -1010,20 +1010,14 @@ static ssize_t wil_write_file_wmi(struct file *file, const char __user *buf,</div><div class='ctx'> 	void *cmd;</div><div class='ctx'> 	int cmdlen = len - sizeof(struct wmi_cmd_hdr);</div><div class='ctx'> 	u16 cmdid;</div><div class='del'>-	int rc, rc1;</div><div class='add'>+	int rc1;</div><div class='ctx'> </div><div class='del'>-	if (cmdlen &lt; 0)</div><div class='add'>+	if (cmdlen &lt; 0 || *ppos != 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	wmi = kmalloc(len, GFP_KERNEL);</div><div class='del'>-	if (!wmi)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	rc = simple_write_to_buffer(wmi, len, ppos, buf, len);</div><div class='del'>-	if (rc &lt; 0) {</div><div class='del'>-		kfree(wmi);</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='add'>+	wmi = memdup_user(buf, len);</div><div class='add'>+	if (IS_ERR(wmi))</div><div class='add'>+		return PTR_ERR(wmi);</div><div class='ctx'> </div><div class='ctx'> 	cmd = (cmdlen &gt; 0) ? &amp;wmi[1] : NULL;</div><div class='ctx'> 	cmdid = le16_to_cpu(wmi-&gt;command_id);</div><div class='hunk'>@@ -1033,7 +1027,7 @@ static ssize_t wil_write_file_wmi(struct file *file, const char __user *buf,</div><div class='ctx'> </div><div class='ctx'> 	wil_info(wil, "0x%04x[%d] -&gt; %d\n", cmdid, cmdlen, rc1);</div><div class='ctx'> </div><div class='del'>-	return rc;</div><div class='add'>+	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct file_operations fops_wmi = {</div><div class='hunk'>@@ -1391,19 +1385,6 @@ static int temp_show(struct seq_file *s, void *data)</div><div class='ctx'> }</div><div class='ctx'> DEFINE_SHOW_ATTRIBUTE(temp);</div><div class='ctx'> </div><div class='del'>-/*---------freq------------*/</div><div class='del'>-static int freq_show(struct seq_file *s, void *data)</div><div class='del'>-{</div><div class='del'>-	struct wil6210_priv *wil = s-&gt;private;</div><div class='del'>-	struct wireless_dev *wdev = wil-&gt;main_ndev-&gt;ieee80211_ptr;</div><div class='del'>-	u32 freq = wdev-&gt;chandef.chan ? wdev-&gt;chandef.chan-&gt;center_freq : 0;</div><div class='del'>-</div><div class='del'>-	seq_printf(s, "Freq = %d\n", freq);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-DEFINE_SHOW_ATTRIBUTE(freq);</div><div class='del'>-</div><div class='ctx'> /*---------link------------*/</div><div class='ctx'> static int link_show(struct seq_file *s, void *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -2173,7 +2154,7 @@ static const struct file_operations fops_led_blink_time = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*---------FW capabilities------------*/</div><div class='del'>-static int wil_fw_capabilities_debugfs_show(struct seq_file *s, void *data)</div><div class='add'>+static int fw_capabilities_show(struct seq_file *s, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct wil6210_priv *wil = s-&gt;private;</div><div class='ctx'> </div><div class='hunk'>@@ -2182,22 +2163,10 @@ static int wil_fw_capabilities_debugfs_show(struct seq_file *s, void *data)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static int wil_fw_capabilities_seq_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return single_open(file, wil_fw_capabilities_debugfs_show,</div><div class='del'>-			   inode-&gt;i_private);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations fops_fw_capabilities = {</div><div class='del'>-	.open		= wil_fw_capabilities_seq_open,</div><div class='del'>-	.release	= single_release,</div><div class='del'>-	.read		= seq_read,</div><div class='del'>-	.llseek		= seq_lseek,</div><div class='del'>-};</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(fw_capabilities);</div><div class='ctx'> </div><div class='ctx'> /*---------FW version------------*/</div><div class='del'>-static int wil_fw_version_debugfs_show(struct seq_file *s, void *data)</div><div class='add'>+static int fw_version_show(struct seq_file *s, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct wil6210_priv *wil = s-&gt;private;</div><div class='ctx'> </div><div class='hunk'>@@ -2208,19 +2177,7 @@ static int wil_fw_version_debugfs_show(struct seq_file *s, void *data)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static int wil_fw_version_seq_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return single_open(file, wil_fw_version_debugfs_show,</div><div class='del'>-			   inode-&gt;i_private);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations fops_fw_version = {</div><div class='del'>-	.open		= wil_fw_version_seq_open,</div><div class='del'>-	.release	= single_release,</div><div class='del'>-	.read		= seq_read,</div><div class='del'>-	.llseek		= seq_lseek,</div><div class='del'>-};</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(fw_version);</div><div class='ctx'> </div><div class='ctx'> /*---------suspend_stats---------*/</div><div class='ctx'> static ssize_t wil_write_suspend_stats(struct file *file,</div><div class='hunk'>@@ -2380,14 +2337,13 @@ static const struct {</div><div class='ctx'> 	{"pmcdata",	0444,		&amp;fops_pmcdata},</div><div class='ctx'> 	{"pmcring",	0444,		&amp;fops_pmcring},</div><div class='ctx'> 	{"temp",	0444,		&amp;temp_fops},</div><div class='del'>-	{"freq",	0444,		&amp;freq_fops},</div><div class='ctx'> 	{"link",	0444,		&amp;link_fops},</div><div class='ctx'> 	{"info",	0444,		&amp;info_fops},</div><div class='ctx'> 	{"recovery", 0644,		&amp;fops_recovery},</div><div class='ctx'> 	{"led_cfg",	0644,		&amp;fops_led_cfg},</div><div class='ctx'> 	{"led_blink_time",	0644,	&amp;fops_led_blink_time},</div><div class='del'>-	{"fw_capabilities",	0444,	&amp;fops_fw_capabilities},</div><div class='del'>-	{"fw_version",	0444,		&amp;fops_fw_version},</div><div class='add'>+	{"fw_capabilities",	0444,	&amp;fw_capabilities_fops},</div><div class='add'>+	{"fw_version",	0444,		&amp;fw_version_fops},</div><div class='ctx'> 	{"suspend_stats",	0644,	&amp;fops_suspend_stats},</div><div class='ctx'> 	{"compressed_rx_status", 0644,	&amp;fops_compressed_rx_status},</div><div class='ctx'> 	{"srings",	0444,		&amp;srings_fops},</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/ethtool.c b/drivers/net/wireless/ath/wil6210/ethtool.c<br/>index e481674485c2..29a9f17c2df0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/ethtool.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wil6210/ethtool.c</a></div><div class='hunk'>@@ -11,8 +11,11 @@</div><div class='ctx'> </div><div class='ctx'> #include "wil6210.h"</div><div class='ctx'> </div><div class='del'>-static int wil_ethtoolops_get_coalesce(struct net_device *ndev,</div><div class='del'>-				       struct ethtool_coalesce *cp)</div><div class='add'>+static int</div><div class='add'>+wil_ethtoolops_get_coalesce(struct net_device *ndev,</div><div class='add'>+			    struct ethtool_coalesce *cp,</div><div class='add'>+			    struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct wil6210_priv *wil = ndev_to_wil(ndev);</div><div class='ctx'> 	u32 tx_itr_en, tx_itr_val = 0;</div><div class='hunk'>@@ -45,8 +48,11 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wil_ethtoolops_set_coalesce(struct net_device *ndev,</div><div class='del'>-				       struct ethtool_coalesce *cp)</div><div class='add'>+static int</div><div class='add'>+wil_ethtoolops_set_coalesce(struct net_device *ndev,</div><div class='add'>+			    struct ethtool_coalesce *cp,</div><div class='add'>+			    struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct wil6210_priv *wil = ndev_to_wil(ndev);</div><div class='ctx'> 	struct wireless_dev *wdev = ndev-&gt;ieee80211_ptr;</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/fw.h b/drivers/net/wireless/ath/wil6210/fw.h<br/>index 440614d61156..2079a90ec260 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/fw.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/fw.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/fw.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wil6210/fw.h</a></div><div class='hunk'>@@ -47,7 +47,7 @@ struct wil_fw_record_fill { /* type == wil_fw_type_fill */</div><div class='ctx'>  * for informational purpose, data_size is @head.size from record header</div><div class='ctx'>  */</div><div class='ctx'> struct wil_fw_record_comment { /* type == wil_fw_type_comment */</div><div class='del'>-	u8 data[0]; /* free-form data [data_size], see above */</div><div class='add'>+	DECLARE_FLEX_ARRAY(u8, data); /* free-form data [data_size], see above */</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* Comment header - common for all comment record types */</div><div class='hunk'>@@ -93,7 +93,6 @@ struct wil_fw_record_concurrency { /* type == wil_fw_type_comment */</div><div class='ctx'> 	/* number of concurrency combinations that follow */</div><div class='ctx'> 	__le16 n_combos;</div><div class='ctx'> 	/* keep last - combinations, variable size by n_combos */</div><div class='del'>-	struct wil_fw_concurrency_combo combos[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* brd file info encoded inside a comment record */</div><div class='hunk'>@@ -131,7 +130,7 @@ struct wil_fw_data_dwrite {</div><div class='ctx'>  * data_size is @head.size where @head is record header</div><div class='ctx'>  */</div><div class='ctx'> struct wil_fw_record_direct_write { /* type == wil_fw_type_direct_write */</div><div class='del'>-	struct wil_fw_data_dwrite data[0];</div><div class='add'>+	DECLARE_FLEX_ARRAY(struct wil_fw_data_dwrite, data);</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* verify condition: [@addr] &amp; @mask == @value</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/fw_inc.c b/drivers/net/wireless/ath/wil6210/fw_inc.c<br/>index fbc84c03406b..c3c0b289dcf3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/fw_inc.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/fw_inc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/fw_inc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wil6210/fw_inc.c</a></div><div class='hunk'>@@ -212,8 +212,8 @@ fw_handle_concurrency(struct wil6210_priv *wil, const void *data,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	n_combos = le16_to_cpu(rec-&gt;n_combos);</div><div class='del'>-	remain = size - offsetof(struct wil_fw_record_concurrency, combos);</div><div class='del'>-	combo = rec-&gt;combos;</div><div class='add'>+	remain = size - sizeof(struct wil_fw_record_concurrency);</div><div class='add'>+	combo = (const struct wil_fw_concurrency_combo *)(rec + 1);</div><div class='ctx'> 	for (i = 0; i &lt; n_combos; i++) {</div><div class='ctx'> 		if (remain &lt; sizeof(*combo))</div><div class='ctx'> 			goto out_short;</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/interrupt.c b/drivers/net/wireless/ath/wil6210/interrupt.c<br/>index d13d081fdcc6..89d4394cedcf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/interrupt.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/interrupt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/interrupt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wil6210/interrupt.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #include "wil6210.h"</div><div class='ctx'> #include "trace.h"</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Theory of operation:</div><div class='ctx'>  *</div><div class='ctx'>  * There is ISR pseudo-cause register,</div><div class='hunk'>@@ -179,9 +179,11 @@ void wil_mask_irq(struct wil6210_priv *wil)</div><div class='ctx'> 	wil_dbg_irq(wil, "mask_irq\n");</div><div class='ctx'> </div><div class='ctx'> 	wil6210_mask_irq_tx(wil);</div><div class='del'>-	wil6210_mask_irq_tx_edma(wil);</div><div class='add'>+	if (wil-&gt;use_enhanced_dma_hw)</div><div class='add'>+		wil6210_mask_irq_tx_edma(wil);</div><div class='ctx'> 	wil6210_mask_irq_rx(wil);</div><div class='del'>-	wil6210_mask_irq_rx_edma(wil);</div><div class='add'>+	if (wil-&gt;use_enhanced_dma_hw)</div><div class='add'>+		wil6210_mask_irq_rx_edma(wil);</div><div class='ctx'> 	wil6210_mask_irq_misc(wil, true);</div><div class='ctx'> 	wil6210_mask_irq_pseudo(wil);</div><div class='ctx'> }</div><div class='hunk'>@@ -190,10 +192,12 @@ void wil_unmask_irq(struct wil6210_priv *wil)</div><div class='ctx'> {</div><div class='ctx'> 	wil_dbg_irq(wil, "unmask_irq\n");</div><div class='ctx'> </div><div class='del'>-	wil_w(wil, RGF_DMA_EP_RX_ICR + offsetof(struct RGF_ICR, ICC),</div><div class='del'>-	      WIL_ICR_ICC_VALUE);</div><div class='del'>-	wil_w(wil, RGF_DMA_EP_TX_ICR + offsetof(struct RGF_ICR, ICC),</div><div class='del'>-	      WIL_ICR_ICC_VALUE);</div><div class='add'>+	if (wil-&gt;use_enhanced_dma_hw) {</div><div class='add'>+		wil_w(wil, RGF_DMA_EP_RX_ICR + offsetof(struct RGF_ICR, ICC),</div><div class='add'>+		      WIL_ICR_ICC_VALUE);</div><div class='add'>+		wil_w(wil, RGF_DMA_EP_TX_ICR + offsetof(struct RGF_ICR, ICC),</div><div class='add'>+		      WIL_ICR_ICC_VALUE);</div><div class='add'>+	}</div><div class='ctx'> 	wil_w(wil, RGF_DMA_EP_MISC_ICR + offsetof(struct RGF_ICR, ICC),</div><div class='ctx'> 	      WIL_ICR_ICC_MISC_VALUE);</div><div class='ctx'> 	wil_w(wil, RGF_INT_GEN_TX_ICR + offsetof(struct RGF_ICR, ICC),</div><div class='hunk'>@@ -845,10 +849,12 @@ void wil6210_clear_irq(struct wil6210_priv *wil)</div><div class='ctx'> 		    offsetof(struct RGF_ICR, ICR));</div><div class='ctx'> 	wil_clear32(wil-&gt;csr + HOSTADDR(RGF_DMA_EP_TX_ICR) +</div><div class='ctx'> 		    offsetof(struct RGF_ICR, ICR));</div><div class='del'>-	wil_clear32(wil-&gt;csr + HOSTADDR(RGF_INT_GEN_RX_ICR) +</div><div class='del'>-		    offsetof(struct RGF_ICR, ICR));</div><div class='del'>-	wil_clear32(wil-&gt;csr + HOSTADDR(RGF_INT_GEN_TX_ICR) +</div><div class='del'>-		    offsetof(struct RGF_ICR, ICR));</div><div class='add'>+	if (wil-&gt;use_enhanced_dma_hw) {</div><div class='add'>+		wil_clear32(wil-&gt;csr + HOSTADDR(RGF_INT_GEN_RX_ICR) +</div><div class='add'>+			    offsetof(struct RGF_ICR, ICR));</div><div class='add'>+		wil_clear32(wil-&gt;csr + HOSTADDR(RGF_INT_GEN_TX_ICR) +</div><div class='add'>+			    offsetof(struct RGF_ICR, ICR));</div><div class='add'>+	}</div><div class='ctx'> 	wil_clear32(wil-&gt;csr + HOSTADDR(RGF_DMA_EP_MISC_ICR) +</div><div class='ctx'> 		    offsetof(struct RGF_ICR, ICR));</div><div class='ctx'> 	wmb(); /* make sure write completed */</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c<br/>index 3ba5b2550a8c..44c24c6c8360 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wil6210/main.c</a></div><div class='hunk'>@@ -798,7 +798,7 @@ void wil6210_disconnect(struct wil6210_vif *vif, const u8 *bssid,</div><div class='ctx'> </div><div class='ctx'> 	wil_dbg_misc(wil, "disconnecting\n");</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;vif-&gt;connect_timer);</div><div class='add'>+	timer_delete_sync(&amp;vif-&gt;connect_timer);</div><div class='ctx'> 	_wil6210_disconnect(vif, bssid, reason_code);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -818,7 +818,7 @@ void wil6210_disconnect_complete(struct wil6210_vif *vif, const u8 *bssid,</div><div class='ctx'> </div><div class='ctx'> 	wil_dbg_misc(wil, "got disconnect\n");</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;vif-&gt;connect_timer);</div><div class='add'>+	timer_delete_sync(&amp;vif-&gt;connect_timer);</div><div class='ctx'> 	_wil6210_disconnect_complete(vif, bssid, reason_code);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1305,7 +1305,7 @@ void wil_get_board_file(struct wil6210_priv *wil, char *buf, size_t len)</div><div class='ctx'> 			board_file = WIL_BOARD_FILE_NAME;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strlcpy(buf, board_file, len);</div><div class='add'>+	strscpy(buf, board_file, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int wil_get_bl_info(struct wil6210_priv *wil)</div><div class='hunk'>@@ -1358,7 +1358,7 @@ static int wil_get_bl_info(struct wil6210_priv *wil)</div><div class='ctx'> 	ether_addr_copy(ndev-&gt;perm_addr, mac);</div><div class='ctx'> 	ether_addr_copy(wiphy-&gt;perm_addr, mac);</div><div class='ctx'> 	if (!is_valid_ether_addr(ndev-&gt;dev_addr))</div><div class='del'>-		ether_addr_copy(ndev-&gt;dev_addr, mac);</div><div class='add'>+		eth_hw_addr_set(ndev, mac);</div><div class='ctx'> </div><div class='ctx'> 	if (rf_status) {/* bad RF cable? */</div><div class='ctx'> 		wil_err(wil, "RF communication error 0x%04x",</div><div class='hunk'>@@ -1431,7 +1431,7 @@ static int wil_get_otp_info(struct wil6210_priv *wil)</div><div class='ctx'> 	ether_addr_copy(ndev-&gt;perm_addr, mac);</div><div class='ctx'> 	ether_addr_copy(wiphy-&gt;perm_addr, mac);</div><div class='ctx'> 	if (!is_valid_ether_addr(ndev-&gt;dev_addr))</div><div class='del'>-		ether_addr_copy(ndev-&gt;dev_addr, mac);</div><div class='add'>+		eth_hw_addr_set(ndev, mac);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1465,7 +1465,7 @@ void wil_abort_scan(struct wil6210_vif *vif, bool sync)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	wil_dbg_misc(wil, "Abort scan_request 0x%p\n", vif-&gt;scan_request);</div><div class='del'>-	del_timer_sync(&amp;vif-&gt;scan_timer);</div><div class='add'>+	timer_delete_sync(&amp;vif-&gt;scan_timer);</div><div class='ctx'> 	mutex_unlock(&amp;wil-&gt;vif_mutex);</div><div class='ctx'> 	rc = wmi_abort_scan(vif);</div><div class='ctx'> 	if (!rc &amp;&amp; sync)</div><div class='hunk'>@@ -1609,7 +1609,7 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw)</div><div class='ctx'> 		struct net_device *ndev = wil-&gt;main_ndev;</div><div class='ctx'> </div><div class='ctx'> 		ether_addr_copy(ndev-&gt;perm_addr, mac);</div><div class='del'>-		ether_addr_copy(ndev-&gt;dev_addr, ndev-&gt;perm_addr);</div><div class='add'>+		eth_hw_addr_set(ndev, ndev-&gt;perm_addr);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/netdev.c b/drivers/net/wireless/ath/wil6210/netdev.c<br/>index 0913f0bf60e7..55c267ab2893 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/netdev.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/netdev.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/netdev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wil6210/netdev.c</a></div><div class='hunk'>@@ -200,8 +200,8 @@ static void wil_dev_setup(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static void wil_vif_deinit(struct wil6210_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	del_timer_sync(&amp;vif-&gt;scan_timer);</div><div class='del'>-	del_timer_sync(&amp;vif-&gt;p2p.discovery_timer);</div><div class='add'>+	timer_delete_sync(&amp;vif-&gt;scan_timer);</div><div class='add'>+	timer_delete_sync(&amp;vif-&gt;p2p.discovery_timer);</div><div class='ctx'> 	cancel_work_sync(&amp;vif-&gt;disconnect_worker);</div><div class='ctx'> 	cancel_work_sync(&amp;vif-&gt;p2p.discovery_expired_work);</div><div class='ctx'> 	cancel_work_sync(&amp;vif-&gt;p2p.delayed_listen_work);</div><div class='hunk'>@@ -227,7 +227,7 @@ static void wil_ndev_destructor(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> static void wil_connect_timer_fn(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct wil6210_vif *vif = from_timer(vif, t, connect_timer);</div><div class='add'>+	struct wil6210_vif *vif = timer_container_of(vif, t, connect_timer);</div><div class='ctx'> 	struct wil6210_priv *wil = vif_to_wil(vif);</div><div class='ctx'> 	bool q;</div><div class='ctx'> </div><div class='hunk'>@@ -243,7 +243,7 @@ static void wil_connect_timer_fn(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> static void wil_scan_timer_fn(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct wil6210_vif *vif = from_timer(vif, t, scan_timer);</div><div class='add'>+	struct wil6210_vif *vif = timer_container_of(vif, t, scan_timer);</div><div class='ctx'> 	struct wil6210_priv *wil = vif_to_wil(vif);</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(wil_status_fwready, wil-&gt;status);</div><div class='hunk'>@@ -253,7 +253,8 @@ static void wil_scan_timer_fn(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> static void wil_p2p_discovery_timer_fn(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct wil6210_vif *vif = from_timer(vif, t, p2p.discovery_timer);</div><div class='add'>+	struct wil6210_vif *vif = timer_container_of(vif, t,</div><div class='add'>+						     p2p.discovery_timer);</div><div class='ctx'> 	struct wil6210_priv *wil = vif_to_wil(vif);</div><div class='ctx'> </div><div class='ctx'> 	wil_dbg_misc(wil, "p2p_discovery_timer_fn\n");</div><div class='hunk'>@@ -445,7 +446,7 @@ int wil_if_add(struct wil6210_priv *wil)</div><div class='ctx'> </div><div class='ctx'> 	wil_dbg_misc(wil, "entered");</div><div class='ctx'> </div><div class='del'>-	strlcpy(wiphy-&gt;fw_version, wil-&gt;fw_version, sizeof(wiphy-&gt;fw_version));</div><div class='add'>+	strscpy(wiphy-&gt;fw_version, wil-&gt;fw_version, sizeof(wiphy-&gt;fw_version));</div><div class='ctx'> </div><div class='ctx'> 	rc = wiphy_register(wiphy);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='hunk'>@@ -453,21 +454,22 @@ int wil_if_add(struct wil6210_priv *wil)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	init_dummy_netdev(&amp;wil-&gt;napi_ndev);</div><div class='add'>+	wil-&gt;napi_ndev = alloc_netdev_dummy(0);</div><div class='add'>+	if (!wil-&gt;napi_ndev) {</div><div class='add'>+		wil_err(wil, "failed to allocate dummy netdev");</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto out_wiphy;</div><div class='add'>+	}</div><div class='ctx'> 	if (wil-&gt;use_enhanced_dma_hw) {</div><div class='del'>-		netif_napi_add(&amp;wil-&gt;napi_ndev, &amp;wil-&gt;napi_rx,</div><div class='del'>-			       wil6210_netdev_poll_rx_edma,</div><div class='del'>-			       WIL6210_NAPI_BUDGET);</div><div class='del'>-		netif_tx_napi_add(&amp;wil-&gt;napi_ndev,</div><div class='del'>-				  &amp;wil-&gt;napi_tx, wil6210_netdev_poll_tx_edma,</div><div class='del'>-				  WIL6210_NAPI_BUDGET);</div><div class='add'>+		netif_napi_add(wil-&gt;napi_ndev, &amp;wil-&gt;napi_rx,</div><div class='add'>+			       wil6210_netdev_poll_rx_edma);</div><div class='add'>+		netif_napi_add_tx(wil-&gt;napi_ndev,</div><div class='add'>+				  &amp;wil-&gt;napi_tx, wil6210_netdev_poll_tx_edma);</div><div class='ctx'> 	} else {</div><div class='del'>-		netif_napi_add(&amp;wil-&gt;napi_ndev, &amp;wil-&gt;napi_rx,</div><div class='del'>-			       wil6210_netdev_poll_rx,</div><div class='del'>-			       WIL6210_NAPI_BUDGET);</div><div class='del'>-		netif_tx_napi_add(&amp;wil-&gt;napi_ndev,</div><div class='del'>-				  &amp;wil-&gt;napi_tx, wil6210_netdev_poll_tx,</div><div class='del'>-				  WIL6210_NAPI_BUDGET);</div><div class='add'>+		netif_napi_add(wil-&gt;napi_ndev, &amp;wil-&gt;napi_rx,</div><div class='add'>+			       wil6210_netdev_poll_rx);</div><div class='add'>+		netif_napi_add_tx(wil-&gt;napi_ndev,</div><div class='add'>+				  &amp;wil-&gt;napi_tx, wil6210_netdev_poll_tx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wil_update_net_queues_bh(wil, vif, NULL, true);</div><div class='hunk'>@@ -478,10 +480,12 @@ int wil_if_add(struct wil6210_priv *wil)</div><div class='ctx'> 	wiphy_unlock(wiphy);</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='del'>-		goto out_wiphy;</div><div class='add'>+		goto free_dummy;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+free_dummy:</div><div class='add'>+	free_netdev(wil-&gt;napi_ndev);</div><div class='ctx'> out_wiphy:</div><div class='ctx'> 	wiphy_unregister(wiphy);</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -530,7 +534,7 @@ void wil_vif_remove(struct wil6210_priv *wil, u8 mid)</div><div class='ctx'> 	mutex_unlock(&amp;wil-&gt;vif_mutex);</div><div class='ctx'> </div><div class='ctx'> 	flush_work(&amp;wil-&gt;wmi_event_worker);</div><div class='del'>-	del_timer_sync(&amp;vif-&gt;connect_timer);</div><div class='add'>+	timer_delete_sync(&amp;vif-&gt;connect_timer);</div><div class='ctx'> 	cancel_work_sync(&amp;vif-&gt;disconnect_worker);</div><div class='ctx'> 	wil_probe_client_flush(vif);</div><div class='ctx'> 	cancel_work_sync(&amp;vif-&gt;probe_client_worker);</div><div class='hunk'>@@ -558,5 +562,7 @@ void wil_if_remove(struct wil6210_priv *wil)</div><div class='ctx'> 	netif_napi_del(&amp;wil-&gt;napi_tx);</div><div class='ctx'> 	netif_napi_del(&amp;wil-&gt;napi_rx);</div><div class='ctx'> </div><div class='add'>+	free_netdev(wil-&gt;napi_ndev);</div><div class='add'>+</div><div class='ctx'> 	wiphy_unregister(wiphy);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/p2p.c b/drivers/net/wireless/ath/wil6210/p2p.c<br/>index f26bf046d889..f20caf1a3905 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/p2p.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/p2p.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/p2p.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wil6210/p2p.c</a></div><div class='hunk'>@@ -184,7 +184,7 @@ u8 wil_p2p_stop_discovery(struct wil6210_vif *vif)</div><div class='ctx'> 			/* discovery not really started, only pending */</div><div class='ctx'> 			p2p-&gt;pending_listen_wdev = NULL;</div><div class='ctx'> 		} else {</div><div class='del'>-			del_timer_sync(&amp;p2p-&gt;discovery_timer);</div><div class='add'>+			timer_delete_sync(&amp;p2p-&gt;discovery_timer);</div><div class='ctx'> 			wmi_stop_discovery(vif);</div><div class='ctx'> 		}</div><div class='ctx'> 		p2p-&gt;discovery_started = 0;</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/pm.c b/drivers/net/wireless/ath/wil6210/pm.c<br/>index ed4df561e5c5..c866cfd144c7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/pm.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/pm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/pm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wil6210/pm.c</a></div><div class='hunk'>@@ -445,10 +445,9 @@ int wil_pm_runtime_get(struct wil6210_priv *wil)</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	struct device *dev = wil_to_dev(wil);</div><div class='ctx'> </div><div class='del'>-	rc = pm_runtime_get_sync(dev);</div><div class='add'>+	rc = pm_runtime_resume_and_get(dev);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='del'>-		wil_err(wil, "pm_runtime_get_sync() failed, rc = %d\n", rc);</div><div class='del'>-		pm_runtime_put_noidle(dev);</div><div class='add'>+		wil_err(wil, "pm_runtime_resume_and_get() failed, rc = %d\n", rc);</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -459,6 +458,5 @@ void wil_pm_runtime_put(struct wil6210_priv *wil)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = wil_to_dev(wil);</div><div class='ctx'> </div><div class='del'>-	pm_runtime_mark_last_busy(dev);</div><div class='ctx'> 	pm_runtime_put_autosuspend(dev);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/trace.h b/drivers/net/wireless/ath/wil6210/trace.h<br/>index 11c989e95880..201f44612c31 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/trace.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/trace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wil6210/trace.h</a></div><div class='hunk'>@@ -70,13 +70,10 @@ DECLARE_EVENT_CLASS(wil6210_log_event,</div><div class='ctx'> 	TP_PROTO(struct va_format *vaf),</div><div class='ctx'> 	TP_ARGS(vaf),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='del'>-		__dynamic_array(char, msg, WIL6210_MSG_MAX)</div><div class='add'>+		__vstring(msg, vaf-&gt;fmt, vaf-&gt;va)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),</div><div class='del'>-				       WIL6210_MSG_MAX,</div><div class='del'>-				       vaf-&gt;fmt,</div><div class='del'>-				       *vaf-&gt;va) &gt;= WIL6210_MSG_MAX);</div><div class='add'>+		__assign_vstr(msg, vaf-&gt;fmt, vaf-&gt;va);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%s", __get_str(msg))</div><div class='ctx'> );</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/txrx.c b/drivers/net/wireless/ath/wil6210/txrx.c<br/>index cc830c795b33..19702b6f09c3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/txrx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/txrx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/txrx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wil6210/txrx.c</a></div><div class='hunk'>@@ -306,7 +306,7 @@ static void wil_rx_add_radiotap_header(struct wil6210_priv *wil,</div><div class='ctx'> 				       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct wil6210_rtap {</div><div class='del'>-		struct ieee80211_radiotap_header rthdr;</div><div class='add'>+		struct ieee80211_radiotap_header_fixed rthdr;</div><div class='ctx'> 		/* fields should be in the order of bits in rthdr.it_present */</div><div class='ctx'> 		/* flags */</div><div class='ctx'> 		u8 flags;</div><div class='hunk'>@@ -666,7 +666,7 @@ static int wil_rx_crypto_check(struct wil6210_priv *wil, struct sk_buff *skb)</div><div class='ctx'> 	struct wil_tid_crypto_rx *c = mc ? &amp;s-&gt;group_crypto_rx :</div><div class='ctx'> 				      &amp;s-&gt;tid_crypto_rx[tid];</div><div class='ctx'> 	struct wil_tid_crypto_rx_single *cc = &amp;c-&gt;key_id[key_id];</div><div class='del'>-	const u8 *pn = (u8 *)&amp;d-&gt;mac.pn_15_0;</div><div class='add'>+	const u8 *pn = (u8 *)&amp;d-&gt;mac.pn;</div><div class='ctx'> </div><div class='ctx'> 	if (!cc-&gt;key_set) {</div><div class='ctx'> 		wil_err_ratelimited(wil,</div><div class='hunk'>@@ -958,7 +958,7 @@ void wil_netif_rx(struct sk_buff *skb, struct net_device *ndev, int cid,</div><div class='ctx'> 		if (gro)</div><div class='ctx'> 			napi_gro_receive(&amp;wil-&gt;napi_rx, skb);</div><div class='ctx'> 		else</div><div class='del'>-			netif_rx_ni(skb);</div><div class='add'>+			netif_rx(skb);</div><div class='ctx'> 	}</div><div class='ctx'> 	ndev-&gt;stats.rx_packets++;</div><div class='ctx'> 	stats-&gt;rx_packets++;</div><div class='hunk'>@@ -1782,9 +1782,7 @@ static int __wil_tx_vring_tso(struct wil6210_priv *wil, struct wil6210_vif *vif,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Header Length = MAC header len + IP header len + TCP header len*/</div><div class='del'>-	hdrlen = ETH_HLEN +</div><div class='del'>-		(int)skb_network_header_len(skb) +</div><div class='del'>-		tcp_hdrlen(skb);</div><div class='add'>+	hdrlen = skb_tcp_all_headers(skb);</div><div class='ctx'> </div><div class='ctx'> 	gso_type = skb_shinfo(skb)-&gt;gso_type &amp; (SKB_GSO_TCPV6 | SKB_GSO_TCPV4);</div><div class='ctx'> 	switch (gso_type) {</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/txrx.h b/drivers/net/wireless/ath/wil6210/txrx.h<br/>index 1f4c8ec75be8..fff8b7f8abc5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/txrx.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/txrx.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/txrx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wil6210/txrx.h</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #ifndef WIL6210_TXRX_H</div><div class='ctx'> #define WIL6210_TXRX_H</div><div class='ctx'> </div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='ctx'> #include "wil6210.h"</div><div class='ctx'> #include "txrx_edma.h"</div><div class='ctx'> </div><div class='hunk'>@@ -343,8 +344,10 @@ struct vring_rx_mac {</div><div class='ctx'> 	u32 d0;</div><div class='ctx'> 	u32 d1;</div><div class='ctx'> 	u16 w4;</div><div class='del'>-	u16 pn_15_0;</div><div class='del'>-	u32 pn_47_16;</div><div class='add'>+	struct_group_attr(pn, __packed,</div><div class='add'>+		u16 pn_15_0;</div><div class='add'>+		u32 pn_47_16;</div><div class='add'>+	);</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* Rx descriptor - DMA part</div><div class='hunk'>@@ -356,7 +359,7 @@ struct vring_rx_mac {</div><div class='ctx'>  * bit     10 : cmd_dma_it:1 immediate interrupt</div><div class='ctx'>  * bit 11..15 : reserved:5</div><div class='ctx'>  * bit 16..29 : phy_info_length:14 It is valid when the PII is set.</div><div class='del'>- *		When the FFM bit is set bits 29-27 are used for for</div><div class='add'>+ *		When the FFM bit is set bits 29-27 are used for</div><div class='ctx'>  *		Flex Filter Match. Matching Index to one of the L2</div><div class='ctx'>  *		EtherType Flex Filter</div><div class='ctx'>  * bit 30..31 : l4_type:2 valid if the L4I bit is set in the status field</div><div class='hunk'>@@ -614,8 +617,7 @@ static inline bool wil_need_txstat(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	const u8 *da = wil_skb_get_da(skb);</div><div class='ctx'> </div><div class='del'>-	return is_unicast_ether_addr(da) &amp;&amp; skb-&gt;sk &amp;&amp;</div><div class='del'>-	       (skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_WIFI_STATUS);</div><div class='add'>+	return is_unicast_ether_addr(da) &amp;&amp; sk_requests_wifi_status(skb-&gt;sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void wil_consume_skb(struct sk_buff *skb, bool acked)</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/txrx_edma.c b/drivers/net/wireless/ath/wil6210/txrx_edma.c<br/>index 201c8c35e0c9..1ba1f21ebea2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/txrx_edma.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/txrx_edma.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/txrx_edma.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wil6210/txrx_edma.c</a></div><div class='hunk'>@@ -548,7 +548,7 @@ static int wil_rx_crypto_check_edma(struct wil6210_priv *wil,</div><div class='ctx'> 	s = &amp;wil-&gt;sta[cid];</div><div class='ctx'> 	c = mc ? &amp;s-&gt;group_crypto_rx : &amp;s-&gt;tid_crypto_rx[tid];</div><div class='ctx'> 	cc = &amp;c-&gt;key_id[key_id];</div><div class='del'>-	pn = (u8 *)&amp;st-&gt;ext.pn_15_0;</div><div class='add'>+	pn = (u8 *)&amp;st-&gt;ext.pn;</div><div class='ctx'> </div><div class='ctx'> 	if (!cc-&gt;key_set) {</div><div class='ctx'> 		wil_err_ratelimited(wil,</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/txrx_edma.h b/drivers/net/wireless/ath/wil6210/txrx_edma.h<br/>index c736f7413a35..ee90e225bb05 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/txrx_edma.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/txrx_edma.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/txrx_edma.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wil6210/txrx_edma.h</a></div><div class='hunk'>@@ -330,8 +330,10 @@ struct wil_rx_status_extension {</div><div class='ctx'> 	u32 d0;</div><div class='ctx'> 	u32 d1;</div><div class='ctx'> 	__le16 seq_num; /* only lower 12 bits */</div><div class='del'>-	u16 pn_15_0;</div><div class='del'>-	u32 pn_47_16;</div><div class='add'>+	struct_group_attr(pn, __packed,</div><div class='add'>+		u16 pn_15_0;</div><div class='add'>+		u32 pn_47_16;</div><div class='add'>+	);</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct wil_rx_status_extended {</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h<br/>index 30392eb1cbbd..9bd1286d2857 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/wil6210.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/wil6210.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/wil6210.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wil6210/wil6210.h</a></div><div class='hunk'>@@ -82,7 +82,6 @@ static inline u32 WIL_GET_BITS(u32 x, int b0, int b1)</div><div class='ctx'> #define WIL6210_MAX_TX_RINGS	(24) /* HW limit */</div><div class='ctx'> #define WIL6210_MAX_CID		(20) /* max number of stations */</div><div class='ctx'> #define WIL6210_RX_DESC_MAX_CID	(8)  /* HW limit */</div><div class='del'>-#define WIL6210_NAPI_BUDGET	(16) /* arbitrary */</div><div class='ctx'> #define WIL_MAX_AMPDU_SIZE	(64 * 1024) /* FW/HW limit */</div><div class='ctx'> #define WIL_MAX_AGG_WSIZE	(32) /* FW/HW limit */</div><div class='ctx'> #define WIL_MAX_AMPDU_SIZE_128	(128 * 1024) /* FW/HW limit */</div><div class='hunk'>@@ -984,7 +983,7 @@ struct wil6210_priv {</div><div class='ctx'> 	spinlock_t eap_lock; /* guarding access to eap rekey fields */</div><div class='ctx'> 	struct napi_struct napi_rx;</div><div class='ctx'> 	struct napi_struct napi_tx;</div><div class='del'>-	struct net_device napi_ndev; /* dummy net_device serving all VIFs */</div><div class='add'>+	struct net_device *napi_ndev; /* dummy net_device serving all VIFs */</div><div class='ctx'> </div><div class='ctx'> 	/* DMA related */</div><div class='ctx'> 	struct wil_ring ring_rx;</div><div class='hunk'>@@ -1341,7 +1340,7 @@ struct wil6210_priv *wil_cfg80211_init(struct device *dev);</div><div class='ctx'> void wil_cfg80211_deinit(struct wil6210_priv *wil);</div><div class='ctx'> void wil_p2p_wdev_free(struct wil6210_priv *wil);</div><div class='ctx'> </div><div class='del'>-int wmi_set_mac_address(struct wil6210_priv *wil, void *addr);</div><div class='add'>+int wmi_set_mac_address(struct wil6210_priv *wil, const void *addr);</div><div class='ctx'> int wmi_pcp_start(struct wil6210_vif *vif, int bi, u8 wmi_nettype, u8 chan,</div><div class='ctx'> 		  u8 edmg_chan, u8 hidden_ssid, u8 is_go);</div><div class='ctx'> int wmi_pcp_stop(struct wil6210_vif *vif);</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c<br/>index 02ad44997e87..6d376f85fbde 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/wmi.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/wmi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/wmi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wil6210/wmi.c</a></div><div class='hunk'>@@ -53,7 +53,7 @@ MODULE_PARM_DESC(led_id,</div><div class='ctx'>  *</div><div class='ctx'>  * There are several buses present on the WIL6210 card.</div><div class='ctx'>  * Same memory areas are visible at different address on</div><div class='del'>- * the different busses. There are 3 main bus masters:</div><div class='add'>+ * the different buses. There are 3 main bus masters:</div><div class='ctx'>  *  - MAC CPU (ucode)</div><div class='ctx'>  *  - User CPU (firmware)</div><div class='ctx'>  *  - AHB (host)</div><div class='hunk'>@@ -224,7 +224,7 @@ struct auth_no_hdr {</div><div class='ctx'> u8 led_polarity = LED_POLARITY_LOW_ACTIVE;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * return AHB address for given firmware internal (linker) address</div><div class='add'>+ * wmi_addr_remap - return AHB address for given firmware internal (linker) address</div><div class='ctx'>  * @x: internal address</div><div class='ctx'>  * If address have no valid AHB mapping, return 0</div><div class='ctx'>  */</div><div class='hunk'>@@ -242,7 +242,7 @@ static u32 wmi_addr_remap(u32 x)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * find fw_mapping entry by section name</div><div class='add'>+ * wil_find_fw_mapping - find fw_mapping entry by section name</div><div class='ctx'>  * @section: section name</div><div class='ctx'>  *</div><div class='ctx'>  * Return pointer to section or NULL if not found</div><div class='hunk'>@@ -260,7 +260,7 @@ struct fw_map *wil_find_fw_mapping(const char *section)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Check address validity for WMI buffer; remap if needed</div><div class='add'>+ * wmi_buffer_block - Check address validity for WMI buffer; remap if needed</div><div class='ctx'>  * @wil: driver data</div><div class='ctx'>  * @ptr_: internal (linker) fw/ucode address</div><div class='ctx'>  * @size: if non zero, validate the block does not</div><div class='hunk'>@@ -780,7 +780,7 @@ static void wmi_evt_ready(struct wil6210_vif *vif, int id, void *d, int len)</div><div class='ctx'> 		return; /* FW load will fail after timeout */</div><div class='ctx'> 	}</div><div class='ctx'> 	/* ignore MAC address, we already have it from the boot loader */</div><div class='del'>-	strlcpy(wiphy-&gt;fw_version, wil-&gt;fw_version, sizeof(wiphy-&gt;fw_version));</div><div class='add'>+	strscpy(wiphy-&gt;fw_version, wil-&gt;fw_version, sizeof(wiphy-&gt;fw_version));</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt; offsetof(struct wmi_ready_event, rfc_read_calib_result)) {</div><div class='ctx'> 		wil_dbg_wmi(wil, "rfc calibration result %d\n",</div><div class='hunk'>@@ -870,7 +870,6 @@ static void wmi_evt_rx_mgmt(struct wil6210_vif *vif, int id, void *d, int len)</div><div class='ctx'> 		struct cfg80211_bss *bss;</div><div class='ctx'> 		struct cfg80211_inform_bss bss_data = {</div><div class='ctx'> 			.chan = channel,</div><div class='del'>-			.scan_width = NL80211_BSS_CHAN_WIDTH_20,</div><div class='ctx'> 			.signal = signal,</div><div class='ctx'> 			.boottime_ns = ktime_to_ns(ktime_get_boottime()),</div><div class='ctx'> 		};</div><div class='hunk'>@@ -934,7 +933,7 @@ static void wmi_evt_scan_complete(struct wil6210_vif *vif, int id,</div><div class='ctx'> 		wil_dbg_wmi(wil, "SCAN_COMPLETE(0x%08x)\n", status);</div><div class='ctx'> 		wil_dbg_misc(wil, "Complete scan_request 0x%p aborted %d\n",</div><div class='ctx'> 			     vif-&gt;scan_request, info.aborted);</div><div class='del'>-		del_timer_sync(&amp;vif-&gt;scan_timer);</div><div class='add'>+		timer_delete_sync(&amp;vif-&gt;scan_timer);</div><div class='ctx'> 		cfg80211_scan_done(vif-&gt;scan_request, &amp;info);</div><div class='ctx'> 		if (vif-&gt;mid == 0)</div><div class='ctx'> 			wil-&gt;radio_wdev = wil-&gt;main_ndev-&gt;ieee80211_ptr;</div><div class='hunk'>@@ -1024,7 +1023,7 @@ static void wmi_evt_connect(struct wil6210_vif *vif, int id, void *d, int len)</div><div class='ctx'> 			mutex_unlock(&amp;wil-&gt;mutex);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='del'>-		del_timer_sync(&amp;vif-&gt;connect_timer);</div><div class='add'>+		timer_delete_sync(&amp;vif-&gt;connect_timer);</div><div class='ctx'> 	} else if ((wdev-&gt;iftype == NL80211_IFTYPE_AP) ||</div><div class='ctx'> 		   (wdev-&gt;iftype == NL80211_IFTYPE_P2P_GO)) {</div><div class='ctx'> 		if (wil-&gt;sta[evt-&gt;cid].status != wil_sta_unused) {</div><div class='hunk'>@@ -1199,7 +1198,7 @@ static void wmi_evt_eapol_rx(struct wil6210_vif *vif, int id, void *d, int len)</div><div class='ctx'> 	eth-&gt;h_proto = cpu_to_be16(ETH_P_PAE);</div><div class='ctx'> 	skb_put_data(skb, evt-&gt;eapol, eapol_len);</div><div class='ctx'> 	skb-&gt;protocol = eth_type_trans(skb, ndev);</div><div class='del'>-	if (likely(netif_rx_ni(skb) == NET_RX_SUCCESS)) {</div><div class='add'>+	if (likely(netif_rx(skb) == NET_RX_SUCCESS)) {</div><div class='ctx'> 		ndev-&gt;stats.rx_packets++;</div><div class='ctx'> 		ndev-&gt;stats.rx_bytes += sz;</div><div class='ctx'> 		if (stats) {</div><div class='hunk'>@@ -1389,7 +1388,6 @@ wmi_evt_sched_scan_result(struct wil6210_vif *vif, int id, void *d, int len)</div><div class='ctx'> 	u32 d_len;</div><div class='ctx'> 	struct cfg80211_bss *bss;</div><div class='ctx'> 	struct cfg80211_inform_bss bss_data = {</div><div class='del'>-		.scan_width = NL80211_BSS_CHAN_WIDTH_20,</div><div class='ctx'> 		.boottime_ns = ktime_to_ns(ktime_get_boottime()),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -1816,14 +1814,14 @@ wmi_evt_reassoc_status(struct wil6210_vif *vif, int id, void *d, int len)</div><div class='ctx'> 	wil-&gt;sta[cid].stats.ft_roams++;</div><div class='ctx'> 	ether_addr_copy(wil-&gt;sta[cid].addr, vif-&gt;bss-&gt;bssid);</div><div class='ctx'> 	mutex_unlock(&amp;wil-&gt;mutex);</div><div class='del'>-	del_timer_sync(&amp;vif-&gt;connect_timer);</div><div class='add'>+	timer_delete_sync(&amp;vif-&gt;connect_timer);</div><div class='ctx'> </div><div class='ctx'> 	cfg80211_ref_bss(wiphy, vif-&gt;bss);</div><div class='ctx'> 	freq = ieee80211_channel_to_frequency(ch, NL80211_BAND_60GHZ);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;info, 0, sizeof(info));</div><div class='del'>-	info.channel = ieee80211_get_channel(wiphy, freq);</div><div class='del'>-	info.bss = vif-&gt;bss;</div><div class='add'>+	info.links[0].channel = ieee80211_get_channel(wiphy, freq);</div><div class='add'>+	info.links[0].bss = vif-&gt;bss;</div><div class='ctx'> 	info.req_ie = assoc_req_ie;</div><div class='ctx'> 	info.req_ie_len = assoc_req_ie_len;</div><div class='ctx'> 	info.resp_ie = assoc_resp_ie;</div><div class='hunk'>@@ -2097,7 +2095,7 @@ int wmi_echo(struct wil6210_priv *wil)</div><div class='ctx'> 			WIL_WMI_CALL_GENERAL_TO_MS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wmi_set_mac_address(struct wil6210_priv *wil, void *addr)</div><div class='add'>+int wmi_set_mac_address(struct wil6210_priv *wil, const void *addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct wil6210_vif *vif = ndev_to_vif(wil-&gt;main_ndev);</div><div class='ctx'> 	struct wmi_set_mac_address_cmd cmd;</div><div class='hunk'>@@ -4017,27 +4015,22 @@ int wmi_set_cqm_rssi_config(struct wil6210_priv *wil,</div><div class='ctx'> 	struct wil6210_vif *vif = ndev_to_vif(ndev);</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	struct {</div><div class='del'>-		struct wmi_set_link_monitor_cmd cmd;</div><div class='del'>-		s8 rssi_thold;</div><div class='del'>-	} __packed cmd = {</div><div class='del'>-		.cmd = {</div><div class='del'>-			.rssi_hyst = rssi_hyst,</div><div class='del'>-			.rssi_thresholds_list_size = 1,</div><div class='del'>-		},</div><div class='del'>-		.rssi_thold = rssi_thold,</div><div class='del'>-	};</div><div class='del'>-	struct {</div><div class='ctx'> 		struct wmi_cmd_hdr hdr;</div><div class='ctx'> 		struct wmi_set_link_monitor_event evt;</div><div class='ctx'> 	} __packed reply = {</div><div class='ctx'> 		.evt = {.status = WMI_FW_STATUS_FAILURE},</div><div class='ctx'> 	};</div><div class='add'>+	DEFINE_FLEX(struct wmi_set_link_monitor_cmd, cmd,</div><div class='add'>+		    rssi_thresholds_list, rssi_thresholds_list_size, 1);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;rssi_hyst = rssi_hyst;</div><div class='add'>+	cmd-&gt;rssi_thresholds_list[0] = rssi_thold;</div><div class='ctx'> </div><div class='ctx'> 	if (rssi_thold &gt; S8_MAX || rssi_thold &lt; S8_MIN || rssi_hyst &gt; U8_MAX)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	rc = wmi_call(wil, WMI_SET_LINK_MONITOR_CMDID, vif-&gt;mid, &amp;cmd,</div><div class='del'>-		      sizeof(cmd), WMI_SET_LINK_MONITOR_EVENTID,</div><div class='add'>+	rc = wmi_call(wil, WMI_SET_LINK_MONITOR_CMDID, vif-&gt;mid, cmd,</div><div class='add'>+		      __struct_size(cmd), WMI_SET_LINK_MONITOR_EVENTID,</div><div class='ctx'> 		      &amp;reply, sizeof(reply), WIL_WMI_CALL_GENERAL_TO_MS);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		wil_err(wil, "WMI_SET_LINK_MONITOR_CMDID failed, rc %d\n", rc);</div><div class='head'>diff --git a/drivers/net/wireless/ath/wil6210/wmi.h b/drivers/net/wireless/ath/wil6210/wmi.h<br/>index 9affa4525609..a6761a1e9d7d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/wmi.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/ath/wil6210/wmi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/ath/wil6210/wmi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/ath/wil6210/wmi.h</a></div><div class='hunk'>@@ -474,7 +474,7 @@ struct wmi_start_scan_cmd {</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u8 channel;</div><div class='ctx'> 		u8 reserved;</div><div class='del'>-	} channel_list[];</div><div class='add'>+	} channel_list[] __counted_by(num_channels);</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define WMI_MAX_PNO_SSID_NUM	(16)</div><div class='hunk'>@@ -2763,7 +2763,7 @@ struct wmi_rf_xpm_write_result_event {</div><div class='ctx'> </div><div class='ctx'> /* WMI_TX_MGMT_PACKET_EVENTID */</div><div class='ctx'> struct wmi_tx_mgmt_packet_event {</div><div class='del'>-	u8 payload[0];</div><div class='add'>+	DECLARE_FLEX_ARRAY(u8, payload);</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* WMI_RX_MGMT_PACKET_EVENTID */</div><div class='hunk'>@@ -3320,7 +3320,7 @@ struct wmi_set_link_monitor_cmd {</div><div class='ctx'> 	u8 rssi_hyst;</div><div class='ctx'> 	u8 reserved[12];</div><div class='ctx'> 	u8 rssi_thresholds_list_size;</div><div class='del'>-	s8 rssi_thresholds_list[];</div><div class='add'>+	s8 rssi_thresholds_list[] __counted_by(rssi_thresholds_list_size);</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* wmi_link_monitor_event_type */</div><div class='hunk'>@@ -3495,7 +3495,7 @@ struct wmi_aoa_meas_event {</div><div class='ctx'> 	u8 channel;</div><div class='ctx'> 	/* enum wmi_aoa_meas_type */</div><div class='ctx'> 	u8 aoa_meas_type;</div><div class='del'>-	/* Measurments are from RFs, defined by the mask */</div><div class='add'>+	/* Measurements are from RFs, defined by the mask */</div><div class='ctx'> 	__le32 meas_rf_mask;</div><div class='ctx'> 	/* enum wmi_aoa_meas_status */</div><div class='ctx'> 	u8 meas_status;</div><div class='hunk'>@@ -3634,7 +3634,7 @@ struct wmi_tof_ftm_per_dest_res_event {</div><div class='ctx'> 	__le32 tsf_sync;</div><div class='ctx'> 	/* actual received ftm per burst */</div><div class='ctx'> 	u8 actual_ftm_per_burst;</div><div class='del'>-	/* Measurments are from RFs, defined by the mask */</div><div class='add'>+	/* Measurements are from RFs, defined by the mask */</div><div class='ctx'> 	__le32 meas_rf_mask;</div><div class='ctx'> 	u8 reserved0[3];</div><div class='ctx'> 	struct wmi_responder_ftm_res responder_ftm_res[];</div><div class='head'>diff --git a/drivers/net/wireless/atmel/Kconfig b/drivers/net/wireless/atmel/Kconfig<br/>index ca45a1021cf4..7a2bb7a58ab7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/atmel/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/atmel/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/atmel/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/atmel/Kconfig</a></div><div class='hunk'>@@ -12,41 +12,6 @@ config WLAN_VENDOR_ATMEL</div><div class='ctx'> </div><div class='ctx'> if WLAN_VENDOR_ATMEL</div><div class='ctx'> </div><div class='del'>-config ATMEL</div><div class='del'>-	tristate "Atmel at76c50x chipset  802.11b support"</div><div class='del'>-	depends on CFG80211 &amp;&amp; (PCI || PCMCIA)</div><div class='del'>-	select WIRELESS_EXT</div><div class='del'>-	select WEXT_PRIV</div><div class='del'>-	select FW_LOADER</div><div class='del'>-	select CRC32</div><div class='del'>-	help</div><div class='del'>-	  A driver 802.11b wireless cards based on the Atmel fast-vnet</div><div class='del'>-	  chips. This driver supports standard Linux wireless extensions.</div><div class='del'>-</div><div class='del'>-	  Many  cards based on this chipset do not have flash memory</div><div class='del'>-	  and need their firmware loaded at start-up. If yours is</div><div class='del'>-	  one of these, you will need to provide a firmware image</div><div class='del'>-	  to be loaded into the card by the driver. The Atmel</div><div class='del'>-	  firmware package can be downloaded from</div><div class='del'>-	  &lt;http://www.thekelleys.org.uk/atmel&gt;</div><div class='del'>-</div><div class='del'>-config PCI_ATMEL</div><div class='del'>-	tristate "Atmel at76c506 PCI cards"</div><div class='del'>-	depends on ATMEL &amp;&amp; PCI</div><div class='del'>-	help</div><div class='del'>-	  Enable support for PCI and mini-PCI cards containing the</div><div class='del'>-	  Atmel at76c506 chip.</div><div class='del'>-</div><div class='del'>-config PCMCIA_ATMEL</div><div class='del'>-	tristate "Atmel at76c502/at76c504 PCMCIA cards"</div><div class='del'>-	depends on ATMEL &amp;&amp; PCMCIA</div><div class='del'>-	select WIRELESS_EXT</div><div class='del'>-	select FW_LOADER</div><div class='del'>-	select CRC32</div><div class='del'>-	help</div><div class='del'>-	  Enable support for PCMCIA cards containing the</div><div class='del'>-	  Atmel at76c502 and at76c504 chips.</div><div class='del'>-</div><div class='ctx'> config AT76C50X_USB</div><div class='ctx'> 	tristate "Atmel at76c503/at76c505/at76c505a USB cards"</div><div class='ctx'> 	depends on MAC80211 &amp;&amp; USB</div><div class='head'>diff --git a/drivers/net/wireless/atmel/Makefile b/drivers/net/wireless/atmel/Makefile<br/>index 17e62805677d..8338d7098ba6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/atmel/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/atmel/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/atmel/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/atmel/Makefile</a></div><div class='hunk'>@@ -1,6 +1,2 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-obj-$(CONFIG_ATMEL)             += atmel.o</div><div class='del'>-obj-$(CONFIG_PCI_ATMEL)         += atmel_pci.o </div><div class='del'>-obj-$(CONFIG_PCMCIA_ATMEL)      += atmel_cs.o</div><div class='del'>-</div><div class='ctx'> obj-$(CONFIG_AT76C50X_USB)      += at76c50x-usb.o</div><div class='head'>diff --git a/drivers/net/wireless/atmel/at76c50x-usb.c b/drivers/net/wireless/atmel/at76c50x-usb.c<br/>index 7582761c61e2..aa683eacaf38 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/atmel/at76c50x-usb.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/atmel/at76c50x-usb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/atmel/at76c50x-usb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/atmel/at76c50x-usb.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'>  * Copyright (c) 2007 Kalle Valo &lt;kalle.valo@iki.fi&gt;</div><div class='ctx'>  * Copyright (c) 2010 Sebastian Smolorz &lt;sesmo@gmx.net&gt;</div><div class='ctx'>  *</div><div class='del'>- * This file is part of the Berlios driver for WLAN USB devices based on the</div><div class='add'>+ * This file is part of the Berlios driver for USB WLAN devices based on the</div><div class='ctx'>  * Atmel AT76C503A/505/505A.</div><div class='ctx'>  *</div><div class='ctx'>  * Some iw_handler code was taken from airo.c, (C) 1999 Benjamin Reed</div><div class='hunk'>@@ -143,7 +143,7 @@ static const struct usb_device_id dev_table[] = {</div><div class='ctx'> 	{ USB_DEVICE(0x0cde, 0x0001), USB_DEVICE_DATA(BOARD_503_ISL3861) },</div><div class='ctx'> 	/* Dynalink/Askey WLL013 (intersil) */</div><div class='ctx'> 	{ USB_DEVICE(0x069a, 0x0320), USB_DEVICE_DATA(BOARD_503_ISL3861) },</div><div class='del'>-	/* EZ connect 11Mpbs Wireless USB Adapter SMC2662W v1 */</div><div class='add'>+	/* EZ connect 11Mpbs USB Wireless Adapter SMC2662W v1 */</div><div class='ctx'> 	{ USB_DEVICE(0x0d5c, 0xa001), USB_DEVICE_DATA(BOARD_503_ISL3861) },</div><div class='ctx'> 	/* BenQ AWL300 */</div><div class='ctx'> 	{ USB_DEVICE(0x04a5, 0x9000), USB_DEVICE_DATA(BOARD_503_ISL3861) },</div><div class='hunk'>@@ -195,7 +195,7 @@ static const struct usb_device_id dev_table[] = {</div><div class='ctx'> 	{ USB_DEVICE(0x04a5, 0x9001), USB_DEVICE_DATA(BOARD_503) },</div><div class='ctx'> 	/* 3Com 3CRSHEW696 */</div><div class='ctx'> 	{ USB_DEVICE(0x0506, 0x0a01), USB_DEVICE_DATA(BOARD_503) },</div><div class='del'>-	/* Siemens Santis ADSL WLAN USB adapter WLL 013 */</div><div class='add'>+	/* Siemens Santis ADSL USB WLAN adapter WLL 013 */</div><div class='ctx'> 	{ USB_DEVICE(0x0681, 0x001b), USB_DEVICE_DATA(BOARD_503) },</div><div class='ctx'> 	/* Belkin F5D6050, version 2 */</div><div class='ctx'> 	{ USB_DEVICE(0x050d, 0x0050), USB_DEVICE_DATA(BOARD_503) },</div><div class='hunk'>@@ -238,7 +238,7 @@ static const struct usb_device_id dev_table[] = {</div><div class='ctx'> 	{ USB_DEVICE(0x1915, 0x2233), USB_DEVICE_DATA(BOARD_505_2958) },</div><div class='ctx'> 	/* Xterasys XN-2122B, IBlitzz BWU613B/BWU613SB */</div><div class='ctx'> 	{ USB_DEVICE(0x12fd, 0x1001), USB_DEVICE_DATA(BOARD_505_2958) },</div><div class='del'>-	/* Corega WLAN USB Stick 11 */</div><div class='add'>+	/* Corega USB WLAN Stick 11 */</div><div class='ctx'> 	{ USB_DEVICE(0x07aa, 0x7613), USB_DEVICE_DATA(BOARD_505_2958) },</div><div class='ctx'> 	/* Microstar MSI Box MS6978 */</div><div class='ctx'> 	{ USB_DEVICE(0x0db0, 0x1020), USB_DEVICE_DATA(BOARD_505_2958) },</div><div class='hunk'>@@ -332,7 +332,7 @@ static int at76_dfu_get_status(struct usb_device *udev,</div><div class='ctx'> </div><div class='ctx'> 	ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), DFU_GETSTATUS,</div><div class='ctx'> 			      USB_TYPE_CLASS | USB_DIR_IN | USB_RECIP_INTERFACE,</div><div class='del'>-			      0, 0, status, sizeof(struct dfu_status),</div><div class='add'>+			      0, 0, status, sizeof(*status),</div><div class='ctx'> 			      USB_CTRL_GET_TIMEOUT);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -366,7 +366,7 @@ static int at76_usbdfu_download(struct usb_device *udev, u8 *buf, u32 size,</div><div class='ctx'> 	u32 dfu_timeout = 0;</div><div class='ctx'> 	int bsize = 0;</div><div class='ctx'> 	int blockno = 0;</div><div class='del'>-	struct dfu_status *dfu_stat_buf = NULL;</div><div class='add'>+	struct dfu_status *dfu_stat_buf;</div><div class='ctx'> 	u8 *dfu_state = NULL;</div><div class='ctx'> 	u8 *block = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -378,7 +378,7 @@ static int at76_usbdfu_download(struct usb_device *udev, u8 *buf, u32 size,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dfu_stat_buf = kmalloc(sizeof(struct dfu_status), GFP_KERNEL);</div><div class='add'>+	dfu_stat_buf = kmalloc(sizeof(*dfu_stat_buf), GFP_KERNEL);</div><div class='ctx'> 	if (!dfu_stat_buf) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto exit;</div><div class='hunk'>@@ -721,9 +721,11 @@ static int at76_set_card_command(struct usb_device *udev, u8 cmd, void *buf,</div><div class='ctx'> 				 int buf_size)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct at76_command *cmd_buf = kmalloc(sizeof(struct at76_command) +</div><div class='del'>-					       buf_size, GFP_KERNEL);</div><div class='add'>+	size_t total_size;</div><div class='add'>+	struct at76_command *cmd_buf;</div><div class='ctx'> </div><div class='add'>+	total_size = struct_size(cmd_buf, data, buf_size);</div><div class='add'>+	cmd_buf = kmalloc(total_size, GFP_KERNEL);</div><div class='ctx'> 	if (!cmd_buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -732,15 +734,13 @@ static int at76_set_card_command(struct usb_device *udev, u8 cmd, void *buf,</div><div class='ctx'> 	cmd_buf-&gt;size = cpu_to_le16(buf_size);</div><div class='ctx'> 	memcpy(cmd_buf-&gt;data, buf, buf_size);</div><div class='ctx'> </div><div class='del'>-	at76_dbg_dump(DBG_CMD, cmd_buf, sizeof(struct at76_command) + buf_size,</div><div class='add'>+	at76_dbg_dump(DBG_CMD, cmd_buf, total_size,</div><div class='ctx'> 		      "issuing command %s (0x%02x)",</div><div class='ctx'> 		      at76_get_cmd_string(cmd), cmd);</div><div class='ctx'> </div><div class='ctx'> 	ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x0e,</div><div class='ctx'> 			      USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,</div><div class='del'>-			      0, 0, cmd_buf,</div><div class='del'>-			      sizeof(struct at76_command) + buf_size,</div><div class='del'>-			      USB_CTRL_GET_TIMEOUT);</div><div class='add'>+			      0, 0, cmd_buf, total_size, USB_CTRL_GET_TIMEOUT);</div><div class='ctx'> 	kfree(cmd_buf);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -931,14 +931,12 @@ static void at76_dump_mib_mac_addr(struct at76_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct mib_mac_addr *m = kmalloc(sizeof(struct mib_mac_addr),</div><div class='del'>-					 GFP_KERNEL);</div><div class='add'>+	struct mib_mac_addr *m = kmalloc(sizeof(*m), GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (!m)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ret = at76_get_mib(priv-&gt;udev, MIB_MAC_ADDR, m,</div><div class='del'>-			   sizeof(struct mib_mac_addr));</div><div class='add'>+	ret = at76_get_mib(priv-&gt;udev, MIB_MAC_ADDR, m, sizeof(*m));</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		wiphy_err(priv-&gt;hw-&gt;wiphy,</div><div class='ctx'> 			  "at76_get_mib (MAC_ADDR) failed: %d\n", ret);</div><div class='hunk'>@@ -961,13 +959,12 @@ static void at76_dump_mib_mac_wep(struct at76_priv *priv)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int key_len;</div><div class='del'>-	struct mib_mac_wep *m = kmalloc(sizeof(struct mib_mac_wep), GFP_KERNEL);</div><div class='add'>+	struct mib_mac_wep *m = kmalloc(sizeof(*m), GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (!m)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ret = at76_get_mib(priv-&gt;udev, MIB_MAC_WEP, m,</div><div class='del'>-			   sizeof(struct mib_mac_wep));</div><div class='add'>+	ret = at76_get_mib(priv-&gt;udev, MIB_MAC_WEP, m, sizeof(*m));</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		wiphy_err(priv-&gt;hw-&gt;wiphy,</div><div class='ctx'> 			  "at76_get_mib (MAC_WEP) failed: %d\n", ret);</div><div class='hunk'>@@ -997,14 +994,12 @@ exit:</div><div class='ctx'> static void at76_dump_mib_mac_mgmt(struct at76_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct mib_mac_mgmt *m = kmalloc(sizeof(struct mib_mac_mgmt),</div><div class='del'>-					 GFP_KERNEL);</div><div class='add'>+	struct mib_mac_mgmt *m = kmalloc(sizeof(*m), GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (!m)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ret = at76_get_mib(priv-&gt;udev, MIB_MAC_MGMT, m,</div><div class='del'>-			   sizeof(struct mib_mac_mgmt));</div><div class='add'>+	ret = at76_get_mib(priv-&gt;udev, MIB_MAC_MGMT, m, sizeof(*m));</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		wiphy_err(priv-&gt;hw-&gt;wiphy,</div><div class='ctx'> 			  "at76_get_mib (MAC_MGMT) failed: %d\n", ret);</div><div class='hunk'>@@ -1035,12 +1030,12 @@ exit:</div><div class='ctx'> static void at76_dump_mib_mac(struct at76_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct mib_mac *m = kmalloc(sizeof(struct mib_mac), GFP_KERNEL);</div><div class='add'>+	struct mib_mac *m = kmalloc(sizeof(*m), GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (!m)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ret = at76_get_mib(priv-&gt;udev, MIB_MAC, m, sizeof(struct mib_mac));</div><div class='add'>+	ret = at76_get_mib(priv-&gt;udev, MIB_MAC, m, sizeof(*m));</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		wiphy_err(priv-&gt;hw-&gt;wiphy,</div><div class='ctx'> 			  "at76_get_mib (MAC) failed: %d\n", ret);</div><div class='hunk'>@@ -1072,12 +1067,12 @@ exit:</div><div class='ctx'> static void at76_dump_mib_phy(struct at76_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct mib_phy *m = kmalloc(sizeof(struct mib_phy), GFP_KERNEL);</div><div class='add'>+	struct mib_phy *m = kmalloc(sizeof(*m), GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (!m)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ret = at76_get_mib(priv-&gt;udev, MIB_PHY, m, sizeof(struct mib_phy));</div><div class='add'>+	ret = at76_get_mib(priv-&gt;udev, MIB_PHY, m, sizeof(*m));</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		wiphy_err(priv-&gt;hw-&gt;wiphy,</div><div class='ctx'> 			  "at76_get_mib (PHY) failed: %d\n", ret);</div><div class='hunk'>@@ -1130,13 +1125,12 @@ exit:</div><div class='ctx'> static void at76_dump_mib_mdomain(struct at76_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct mib_mdomain *m = kmalloc(sizeof(struct mib_mdomain), GFP_KERNEL);</div><div class='add'>+	struct mib_mdomain *m = kmalloc(sizeof(*m), GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (!m)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ret = at76_get_mib(priv-&gt;udev, MIB_MDOMAIN, m,</div><div class='del'>-			   sizeof(struct mib_mdomain));</div><div class='add'>+	ret = at76_get_mib(priv-&gt;udev, MIB_MDOMAIN, m, sizeof(*m));</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		wiphy_err(priv-&gt;hw-&gt;wiphy,</div><div class='ctx'> 			  "at76_get_mib (MDOMAIN) failed: %d\n", ret);</div><div class='hunk'>@@ -1375,7 +1369,7 @@ static int at76_startup_device(struct at76_priv *priv)</div><div class='ctx'> 		 priv-&gt;scan_min_time, priv-&gt;scan_max_time,</div><div class='ctx'> 		 priv-&gt;scan_mode == SCAN_TYPE_ACTIVE ? "active" : "passive");</div><div class='ctx'> </div><div class='del'>-	memset(ccfg, 0, sizeof(struct at76_card_config));</div><div class='add'>+	memset(ccfg, 0, sizeof(*ccfg));</div><div class='ctx'> 	ccfg-&gt;promiscuous_mode = 0;</div><div class='ctx'> 	ccfg-&gt;short_retry_limit = priv-&gt;short_retry_limit;</div><div class='ctx'> </div><div class='hunk'>@@ -1411,7 +1405,7 @@ static int at76_startup_device(struct at76_priv *priv)</div><div class='ctx'> 	ccfg-&gt;beacon_period = cpu_to_le16(priv-&gt;beacon_period);</div><div class='ctx'> </div><div class='ctx'> 	ret = at76_set_card_command(priv-&gt;udev, CMD_STARTUP, &amp;priv-&gt;card_config,</div><div class='del'>-				    sizeof(struct at76_card_config));</div><div class='add'>+				    sizeof(*ccfg));</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		wiphy_err(priv-&gt;hw-&gt;wiphy, "at76_set_card_command failed: %d\n",</div><div class='ctx'> 			  ret);</div><div class='hunk'>@@ -1856,7 +1850,7 @@ error:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void at76_mac80211_stop(struct ieee80211_hw *hw)</div><div class='add'>+static void at76_mac80211_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct at76_priv *priv = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -2008,7 +2002,7 @@ exit:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int at76_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+static int at76_config(struct ieee80211_hw *hw, int radio_idx, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct at76_priv *priv = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -2033,7 +2027,7 @@ static int at76_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> static void at76_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 				  struct ieee80211_vif *vif,</div><div class='ctx'> 				  struct ieee80211_bss_conf *conf,</div><div class='del'>-				  u32 changed)</div><div class='add'>+				  u64 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct at76_priv *priv = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -2178,7 +2172,12 @@ static int at76_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ieee80211_ops at76_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.tx = at76_mac80211_tx,</div><div class='add'>+	.wake_tx_queue = ieee80211_handle_wake_tx_queue,</div><div class='ctx'> 	.add_interface = at76_add_interface,</div><div class='ctx'> 	.remove_interface = at76_remove_interface,</div><div class='ctx'> 	.config = at76_config,</div><div class='hunk'>@@ -2418,7 +2417,7 @@ static void at76_delete_device(struct at76_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 	kfree(priv-&gt;bulk_out_buffer);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;ledtrig_tx_timer);</div><div class='add'>+	timer_delete_sync(&amp;ledtrig_tx_timer);</div><div class='ctx'> </div><div class='ctx'> 	kfree_skb(priv-&gt;rx_skb);</div><div class='ctx'> </div><div class='hunk'>@@ -2438,7 +2437,7 @@ static int at76_probe(struct usb_interface *interface,</div><div class='ctx'> 	struct usb_device *udev;</div><div class='ctx'> 	int op_mode;</div><div class='ctx'> 	int need_ext_fw = 0;</div><div class='del'>-	struct mib_fw_version *fwv = NULL;</div><div class='add'>+	struct mib_fw_version *fwv;</div><div class='ctx'> 	int board_type = (int)id-&gt;driver_info;</div><div class='ctx'> </div><div class='ctx'> 	udev = usb_get_dev(interface_to_usbdev(interface));</div><div class='hunk'>@@ -2526,7 +2525,7 @@ static int at76_probe(struct usb_interface *interface,</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata(interface, priv);</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;priv-&gt;fw_version, fwv, sizeof(struct mib_fw_version));</div><div class='add'>+	memcpy(&amp;priv-&gt;fw_version, fwv, sizeof(*fwv));</div><div class='ctx'> 	priv-&gt;board_type = board_type;</div><div class='ctx'> </div><div class='ctx'> 	ret = at76_init_new_device(priv, interface);</div><div class='hunk'>@@ -2553,7 +2552,7 @@ static void at76_disconnect(struct usb_interface *interface)</div><div class='ctx'> </div><div class='ctx'> 	wiphy_info(priv-&gt;hw-&gt;wiphy, "disconnecting\n");</div><div class='ctx'> 	at76_delete_device(priv);</div><div class='del'>-	usb_put_dev(priv-&gt;udev);</div><div class='add'>+	usb_put_dev(interface_to_usbdev(interface));</div><div class='ctx'> 	dev_info(&amp;interface-&gt;dev, "disconnected\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/atmel/at76c50x-usb.h b/drivers/net/wireless/atmel/at76c50x-usb.h<br/>index 746e64dfd8aa..843146a0de64 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/atmel/at76c50x-usb.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/atmel/at76c50x-usb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/atmel/at76c50x-usb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/atmel/at76c50x-usb.h</a></div><div class='hunk'>@@ -151,7 +151,7 @@ struct at76_command {</div><div class='ctx'> 	u8 cmd;</div><div class='ctx'> 	u8 reserved;</div><div class='ctx'> 	__le16 size;</div><div class='del'>-	u8 data[];</div><div class='add'>+	u8 data[] __counted_by_le(size);</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* Length of Atmel-specific Rx header before 802.11 frame */</div><div class='head'>diff --git a/drivers/net/wireless/atmel/atmel.c b/drivers/net/wireless/atmel/atmel.c<br/>deleted file mode 100644<br/>index febce4e8b3dd..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/atmel/atmel.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/atmel/atmel.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4523 +0,0 @@</div><div class='del'>-/*** -*- linux-c -*- **********************************************************</div><div class='del'>-</div><div class='del'>-     Driver for Atmel at76c502 at76c504 and at76c506 wireless cards.</div><div class='del'>-</div><div class='del'>-	Copyright 2000-2001 ATMEL Corporation.</div><div class='del'>-	Copyright 2003-2004 Simon Kelley.</div><div class='del'>-</div><div class='del'>-    This code was developed from version 2.1.1 of the Atmel drivers,</div><div class='del'>-    released by Atmel corp. under the GPL in December 2002. It also</div><div class='del'>-    includes code from the Linux aironet drivers (C) Benjamin Reed,</div><div class='del'>-    and the Linux PCMCIA package, (C) David Hinds and the Linux wireless</div><div class='del'>-    extensions, (C) Jean Tourrilhes.</div><div class='del'>-</div><div class='del'>-    The firmware module for reading the MAC address of the card comes from</div><div class='del'>-    net.russotto.AtmelMACFW, written by Matthew T. Russotto and copyright</div><div class='del'>-    by him. net.russotto.AtmelMACFW is used under the GPL license version 2.</div><div class='del'>-    This file contains the module in binary form and, under the terms</div><div class='del'>-    of the GPL, in source form. The source is located at the end of the file.</div><div class='del'>-</div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of the GNU General Public License as published by</div><div class='del'>-    the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-    (at your option) any later version.</div><div class='del'>-</div><div class='del'>-    This software is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with Atmel wireless lan drivers; if not, see</div><div class='del'>-    &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>-</div><div class='del'>-    For all queries about this code, please contact the current author,</div><div class='del'>-    Simon Kelley &lt;simon@thekelleys.org.uk&gt; and not Atmel Corporation.</div><div class='del'>-</div><div class='del'>-    Credit is due to HP UK and Cambridge Online Systems Ltd for supplying</div><div class='del'>-    hardware used during development of this driver.</div><div class='del'>-</div><div class='del'>-******************************************************************************/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/ptrace.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/fcntl.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/wireless.h&gt;</div><div class='del'>-#include &lt;net/iw_handler.h&gt;</div><div class='del'>-#include &lt;linux/crc32.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/firmware.h&gt;</div><div class='del'>-#include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;net/cfg80211.h&gt;</div><div class='del'>-#include "atmel.h"</div><div class='del'>-</div><div class='del'>-#define DRIVER_MAJOR 0</div><div class='del'>-#define DRIVER_MINOR 98</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Simon Kelley");</div><div class='del'>-MODULE_DESCRIPTION("Support for Atmel at76c50x 802.11 wireless ethernet cards.");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-/* The name of the firmware file to be loaded</div><div class='del'>-   over-rides any automatic selection */</div><div class='del'>-static char *firmware = NULL;</div><div class='del'>-module_param(firmware, charp, 0);</div><div class='del'>-</div><div class='del'>-/* table of firmware file names */</div><div class='del'>-static struct {</div><div class='del'>-	AtmelFWType fw_type;</div><div class='del'>-	const char *fw_file;</div><div class='del'>-	const char *fw_file_ext;</div><div class='del'>-} fw_table[] = {</div><div class='del'>-	{ ATMEL_FW_TYPE_502,		"atmel_at76c502",	"bin" },</div><div class='del'>-	{ ATMEL_FW_TYPE_502D,		"atmel_at76c502d",	"bin" },</div><div class='del'>-	{ ATMEL_FW_TYPE_502E,		"atmel_at76c502e",	"bin" },</div><div class='del'>-	{ ATMEL_FW_TYPE_502_3COM,	"atmel_at76c502_3com",	"bin" },</div><div class='del'>-	{ ATMEL_FW_TYPE_504,		"atmel_at76c504",	"bin" },</div><div class='del'>-	{ ATMEL_FW_TYPE_504_2958,	"atmel_at76c504_2958",	"bin" },</div><div class='del'>-	{ ATMEL_FW_TYPE_504A_2958,	"atmel_at76c504a_2958",	"bin" },</div><div class='del'>-	{ ATMEL_FW_TYPE_506,		"atmel_at76c506",	"bin" },</div><div class='del'>-	{ ATMEL_FW_TYPE_NONE,		NULL,			NULL }</div><div class='del'>-};</div><div class='del'>-MODULE_FIRMWARE("atmel_at76c502-wpa.bin");</div><div class='del'>-MODULE_FIRMWARE("atmel_at76c502.bin");</div><div class='del'>-MODULE_FIRMWARE("atmel_at76c502d-wpa.bin");</div><div class='del'>-MODULE_FIRMWARE("atmel_at76c502d.bin");</div><div class='del'>-MODULE_FIRMWARE("atmel_at76c502e-wpa.bin");</div><div class='del'>-MODULE_FIRMWARE("atmel_at76c502e.bin");</div><div class='del'>-MODULE_FIRMWARE("atmel_at76c502_3com-wpa.bin");</div><div class='del'>-MODULE_FIRMWARE("atmel_at76c502_3com.bin");</div><div class='del'>-MODULE_FIRMWARE("atmel_at76c504-wpa.bin");</div><div class='del'>-MODULE_FIRMWARE("atmel_at76c504.bin");</div><div class='del'>-MODULE_FIRMWARE("atmel_at76c504_2958-wpa.bin");</div><div class='del'>-MODULE_FIRMWARE("atmel_at76c504_2958.bin");</div><div class='del'>-MODULE_FIRMWARE("atmel_at76c504a_2958-wpa.bin");</div><div class='del'>-MODULE_FIRMWARE("atmel_at76c504a_2958.bin");</div><div class='del'>-MODULE_FIRMWARE("atmel_at76c506-wpa.bin");</div><div class='del'>-MODULE_FIRMWARE("atmel_at76c506.bin");</div><div class='del'>-</div><div class='del'>-#define MAX_SSID_LENGTH 32</div><div class='del'>-#define MGMT_JIFFIES (256 * HZ / 100)</div><div class='del'>-</div><div class='del'>-#define MAX_BSS_ENTRIES	64</div><div class='del'>-</div><div class='del'>-/* registers */</div><div class='del'>-#define GCR  0x00    /* (SIR0)  General Configuration Register */</div><div class='del'>-#define BSR  0x02    /* (SIR1)  Bank Switching Select Register */</div><div class='del'>-#define AR   0x04</div><div class='del'>-#define DR   0x08</div><div class='del'>-#define MR1  0x12    /* Mirror Register 1 */</div><div class='del'>-#define MR2  0x14    /* Mirror Register 2 */</div><div class='del'>-#define MR3  0x16    /* Mirror Register 3 */</div><div class='del'>-#define MR4  0x18    /* Mirror Register 4 */</div><div class='del'>-</div><div class='del'>-#define GPR1                            0x0c</div><div class='del'>-#define GPR2                            0x0e</div><div class='del'>-#define GPR3                            0x10</div><div class='del'>-/*</div><div class='del'>- * Constants for the GCR register.</div><div class='del'>- */</div><div class='del'>-#define GCR_REMAP     0x0400          /* Remap internal SRAM to 0 */</div><div class='del'>-#define GCR_SWRES     0x0080          /* BIU reset (ARM and PAI are NOT reset) */</div><div class='del'>-#define GCR_CORES     0x0060          /* Core Reset (ARM and PAI are reset) */</div><div class='del'>-#define GCR_ENINT     0x0002          /* Enable Interrupts */</div><div class='del'>-#define GCR_ACKINT    0x0008          /* Acknowledge Interrupts */</div><div class='del'>-</div><div class='del'>-#define BSS_SRAM      0x0200          /* AMBA module selection --&gt; SRAM */</div><div class='del'>-#define BSS_IRAM      0x0100          /* AMBA module selection --&gt; IRAM */</div><div class='del'>-/*</div><div class='del'>- *Constants for the MR registers.</div><div class='del'>- */</div><div class='del'>-#define MAC_INIT_COMPLETE       0x0001        /* MAC init has been completed */</div><div class='del'>-#define MAC_BOOT_COMPLETE       0x0010        /* MAC boot has been completed */</div><div class='del'>-#define MAC_INIT_OK             0x0002        /* MAC boot has been completed */</div><div class='del'>-</div><div class='del'>-#define MIB_MAX_DATA_BYTES    212</div><div class='del'>-#define MIB_HEADER_SIZE       4    /* first four fields */</div><div class='del'>-</div><div class='del'>-struct get_set_mib {</div><div class='del'>-	u8 type;</div><div class='del'>-	u8 size;</div><div class='del'>-	u8 index;</div><div class='del'>-	u8 reserved;</div><div class='del'>-	u8 data[MIB_MAX_DATA_BYTES];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct rx_desc {</div><div class='del'>-	u32          Next;</div><div class='del'>-	u16          MsduPos;</div><div class='del'>-	u16          MsduSize;</div><div class='del'>-</div><div class='del'>-	u8           State;</div><div class='del'>-	u8           Status;</div><div class='del'>-	u8           Rate;</div><div class='del'>-	u8           Rssi;</div><div class='del'>-	u8           LinkQuality;</div><div class='del'>-	u8           PreambleType;</div><div class='del'>-	u16          Duration;</div><div class='del'>-	u32          RxTime;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define RX_DESC_FLAG_VALID       0x80</div><div class='del'>-#define RX_DESC_FLAG_CONSUMED    0x40</div><div class='del'>-#define RX_DESC_FLAG_IDLE        0x00</div><div class='del'>-</div><div class='del'>-#define RX_STATUS_SUCCESS        0x00</div><div class='del'>-</div><div class='del'>-#define RX_DESC_MSDU_POS_OFFSET      4</div><div class='del'>-#define RX_DESC_MSDU_SIZE_OFFSET     6</div><div class='del'>-#define RX_DESC_FLAGS_OFFSET         8</div><div class='del'>-#define RX_DESC_STATUS_OFFSET        9</div><div class='del'>-#define RX_DESC_RSSI_OFFSET          11</div><div class='del'>-#define RX_DESC_LINK_QUALITY_OFFSET  12</div><div class='del'>-#define RX_DESC_PREAMBLE_TYPE_OFFSET 13</div><div class='del'>-#define RX_DESC_DURATION_OFFSET      14</div><div class='del'>-#define RX_DESC_RX_TIME_OFFSET       16</div><div class='del'>-</div><div class='del'>-struct tx_desc {</div><div class='del'>-	u32       NextDescriptor;</div><div class='del'>-	u16       TxStartOfFrame;</div><div class='del'>-	u16       TxLength;</div><div class='del'>-</div><div class='del'>-	u8        TxState;</div><div class='del'>-	u8        TxStatus;</div><div class='del'>-	u8        RetryCount;</div><div class='del'>-</div><div class='del'>-	u8        TxRate;</div><div class='del'>-</div><div class='del'>-	u8        KeyIndex;</div><div class='del'>-	u8        ChiperType;</div><div class='del'>-	u8        ChipreLength;</div><div class='del'>-	u8        Reserved1;</div><div class='del'>-</div><div class='del'>-	u8        Reserved;</div><div class='del'>-	u8        PacketType;</div><div class='del'>-	u16       HostTxLength;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define TX_DESC_NEXT_OFFSET          0</div><div class='del'>-#define TX_DESC_POS_OFFSET           4</div><div class='del'>-#define TX_DESC_SIZE_OFFSET          6</div><div class='del'>-#define TX_DESC_FLAGS_OFFSET         8</div><div class='del'>-#define TX_DESC_STATUS_OFFSET        9</div><div class='del'>-#define TX_DESC_RETRY_OFFSET         10</div><div class='del'>-#define TX_DESC_RATE_OFFSET          11</div><div class='del'>-#define TX_DESC_KEY_INDEX_OFFSET     12</div><div class='del'>-#define TX_DESC_CIPHER_TYPE_OFFSET   13</div><div class='del'>-#define TX_DESC_CIPHER_LENGTH_OFFSET 14</div><div class='del'>-#define TX_DESC_PACKET_TYPE_OFFSET   17</div><div class='del'>-#define TX_DESC_HOST_LENGTH_OFFSET   18</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Host-MAC interface</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define TX_STATUS_SUCCESS       0x00</div><div class='del'>-</div><div class='del'>-#define TX_FIRM_OWN             0x80</div><div class='del'>-#define TX_DONE                 0x40</div><div class='del'>-</div><div class='del'>-#define TX_ERROR                0x01</div><div class='del'>-</div><div class='del'>-#define TX_PACKET_TYPE_DATA     0x01</div><div class='del'>-#define TX_PACKET_TYPE_MGMT     0x02</div><div class='del'>-</div><div class='del'>-#define ISR_EMPTY               0x00        /* no bits set in ISR */</div><div class='del'>-#define ISR_TxCOMPLETE          0x01        /* packet transmitted */</div><div class='del'>-#define ISR_RxCOMPLETE          0x02        /* packet received */</div><div class='del'>-#define ISR_RxFRAMELOST         0x04        /* Rx Frame lost */</div><div class='del'>-#define ISR_FATAL_ERROR         0x08        /* Fatal error */</div><div class='del'>-#define ISR_COMMAND_COMPLETE    0x10        /* command completed */</div><div class='del'>-#define ISR_OUT_OF_RANGE        0x20        /* command completed */</div><div class='del'>-#define ISR_IBSS_MERGE          0x40        /* (4.1.2.30): IBSS merge */</div><div class='del'>-#define ISR_GENERIC_IRQ         0x80</div><div class='del'>-</div><div class='del'>-#define Local_Mib_Type          0x01</div><div class='del'>-#define Mac_Address_Mib_Type    0x02</div><div class='del'>-#define Mac_Mib_Type            0x03</div><div class='del'>-#define Statistics_Mib_Type     0x04</div><div class='del'>-#define Mac_Mgmt_Mib_Type       0x05</div><div class='del'>-#define Mac_Wep_Mib_Type        0x06</div><div class='del'>-#define Phy_Mib_Type            0x07</div><div class='del'>-#define Multi_Domain_MIB        0x08</div><div class='del'>-</div><div class='del'>-#define MAC_MGMT_MIB_CUR_BSSID_POS            14</div><div class='del'>-#define MAC_MIB_FRAG_THRESHOLD_POS            8</div><div class='del'>-#define MAC_MIB_RTS_THRESHOLD_POS             10</div><div class='del'>-#define MAC_MIB_SHORT_RETRY_POS               16</div><div class='del'>-#define MAC_MIB_LONG_RETRY_POS                17</div><div class='del'>-#define MAC_MIB_SHORT_RETRY_LIMIT_POS         16</div><div class='del'>-#define MAC_MGMT_MIB_BEACON_PER_POS           0</div><div class='del'>-#define MAC_MGMT_MIB_STATION_ID_POS           6</div><div class='del'>-#define MAC_MGMT_MIB_CUR_PRIVACY_POS          11</div><div class='del'>-#define MAC_MGMT_MIB_CUR_BSSID_POS            14</div><div class='del'>-#define MAC_MGMT_MIB_PS_MODE_POS              53</div><div class='del'>-#define MAC_MGMT_MIB_LISTEN_INTERVAL_POS      54</div><div class='del'>-#define MAC_MGMT_MIB_MULTI_DOMAIN_IMPLEMENTED 56</div><div class='del'>-#define MAC_MGMT_MIB_MULTI_DOMAIN_ENABLED     57</div><div class='del'>-#define PHY_MIB_CHANNEL_POS                   14</div><div class='del'>-#define PHY_MIB_RATE_SET_POS                  20</div><div class='del'>-#define PHY_MIB_REG_DOMAIN_POS                26</div><div class='del'>-#define LOCAL_MIB_AUTO_TX_RATE_POS            3</div><div class='del'>-#define LOCAL_MIB_SSID_SIZE                   5</div><div class='del'>-#define LOCAL_MIB_TX_PROMISCUOUS_POS          6</div><div class='del'>-#define LOCAL_MIB_TX_MGMT_RATE_POS            7</div><div class='del'>-#define LOCAL_MIB_TX_CONTROL_RATE_POS         8</div><div class='del'>-#define LOCAL_MIB_PREAMBLE_TYPE               9</div><div class='del'>-#define MAC_ADDR_MIB_MAC_ADDR_POS             0</div><div class='del'>-</div><div class='del'>-#define         CMD_Set_MIB_Vars              0x01</div><div class='del'>-#define         CMD_Get_MIB_Vars              0x02</div><div class='del'>-#define         CMD_Scan                      0x03</div><div class='del'>-#define         CMD_Join                      0x04</div><div class='del'>-#define         CMD_Start                     0x05</div><div class='del'>-#define         CMD_EnableRadio               0x06</div><div class='del'>-#define         CMD_DisableRadio              0x07</div><div class='del'>-#define         CMD_SiteSurvey                0x0B</div><div class='del'>-</div><div class='del'>-#define         CMD_STATUS_IDLE                   0x00</div><div class='del'>-#define         CMD_STATUS_COMPLETE               0x01</div><div class='del'>-#define         CMD_STATUS_UNKNOWN                0x02</div><div class='del'>-#define         CMD_STATUS_INVALID_PARAMETER      0x03</div><div class='del'>-#define         CMD_STATUS_FUNCTION_NOT_SUPPORTED 0x04</div><div class='del'>-#define         CMD_STATUS_TIME_OUT               0x07</div><div class='del'>-#define         CMD_STATUS_IN_PROGRESS            0x08</div><div class='del'>-#define         CMD_STATUS_REJECTED_RADIO_OFF     0x09</div><div class='del'>-#define         CMD_STATUS_HOST_ERROR             0xFF</div><div class='del'>-#define         CMD_STATUS_BUSY                   0xFE</div><div class='del'>-</div><div class='del'>-#define CMD_BLOCK_COMMAND_OFFSET        0</div><div class='del'>-#define CMD_BLOCK_STATUS_OFFSET         1</div><div class='del'>-#define CMD_BLOCK_PARAMETERS_OFFSET     4</div><div class='del'>-</div><div class='del'>-#define SCAN_OPTIONS_SITE_SURVEY        0x80</div><div class='del'>-</div><div class='del'>-#define MGMT_FRAME_BODY_OFFSET		24</div><div class='del'>-#define MAX_AUTHENTICATION_RETRIES	3</div><div class='del'>-#define MAX_ASSOCIATION_RETRIES		3</div><div class='del'>-</div><div class='del'>-#define AUTHENTICATION_RESPONSE_TIME_OUT  1000</div><div class='del'>-</div><div class='del'>-#define MAX_WIRELESS_BODY  2316 /* mtu is 2312, CRC is 4 */</div><div class='del'>-#define LOOP_RETRY_LIMIT   500000</div><div class='del'>-</div><div class='del'>-#define ACTIVE_MODE	1</div><div class='del'>-#define PS_MODE		2</div><div class='del'>-</div><div class='del'>-#define MAX_ENCRYPTION_KEYS 4</div><div class='del'>-#define MAX_ENCRYPTION_KEY_SIZE 40</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 802.11 related definitions</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Regulatory Domains</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define REG_DOMAIN_FCC		0x10	/* Channels	1-11	USA				*/</div><div class='del'>-#define REG_DOMAIN_DOC		0x20	/* Channel	1-11	Canada				*/</div><div class='del'>-#define REG_DOMAIN_ETSI		0x30	/* Channel	1-13	Europe (ex Spain/France)	*/</div><div class='del'>-#define REG_DOMAIN_SPAIN	0x31	/* Channel	10-11	Spain				*/</div><div class='del'>-#define REG_DOMAIN_FRANCE	0x32	/* Channel	10-13	France				*/</div><div class='del'>-#define REG_DOMAIN_MKK		0x40	/* Channel	14	Japan				*/</div><div class='del'>-#define REG_DOMAIN_MKK1		0x41	/* Channel	1-14	Japan(MKK1)			*/</div><div class='del'>-#define REG_DOMAIN_ISRAEL	0x50	/* Channel	3-9	ISRAEL				*/</div><div class='del'>-</div><div class='del'>-#define BSS_TYPE_AD_HOC		1</div><div class='del'>-#define BSS_TYPE_INFRASTRUCTURE 2</div><div class='del'>-</div><div class='del'>-#define SCAN_TYPE_ACTIVE	0</div><div class='del'>-#define SCAN_TYPE_PASSIVE	1</div><div class='del'>-</div><div class='del'>-#define LONG_PREAMBLE		0</div><div class='del'>-#define SHORT_PREAMBLE		1</div><div class='del'>-#define AUTO_PREAMBLE		2</div><div class='del'>-</div><div class='del'>-#define DATA_FRAME_WS_HEADER_SIZE   30</div><div class='del'>-</div><div class='del'>-/* promiscuous mode control */</div><div class='del'>-#define PROM_MODE_OFF			0x0</div><div class='del'>-#define PROM_MODE_UNKNOWN		0x1</div><div class='del'>-#define PROM_MODE_CRC_FAILED		0x2</div><div class='del'>-#define PROM_MODE_DUPLICATED		0x4</div><div class='del'>-#define PROM_MODE_MGMT			0x8</div><div class='del'>-#define PROM_MODE_CTRL			0x10</div><div class='del'>-#define PROM_MODE_BAD_PROTOCOL		0x20</div><div class='del'>-</div><div class='del'>-#define IFACE_INT_STATUS_OFFSET		0</div><div class='del'>-#define IFACE_INT_MASK_OFFSET		1</div><div class='del'>-#define IFACE_LOCKOUT_HOST_OFFSET	2</div><div class='del'>-#define IFACE_LOCKOUT_MAC_OFFSET	3</div><div class='del'>-#define IFACE_FUNC_CTRL_OFFSET		28</div><div class='del'>-#define IFACE_MAC_STAT_OFFSET		30</div><div class='del'>-#define IFACE_GENERIC_INT_TYPE_OFFSET	32</div><div class='del'>-</div><div class='del'>-#define CIPHER_SUITE_NONE     0</div><div class='del'>-#define CIPHER_SUITE_WEP_64   1</div><div class='del'>-#define CIPHER_SUITE_TKIP     2</div><div class='del'>-#define CIPHER_SUITE_AES      3</div><div class='del'>-#define CIPHER_SUITE_CCX      4</div><div class='del'>-#define CIPHER_SUITE_WEP_128  5</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * IFACE MACROS &amp; definitions</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * FuncCtrl field:</div><div class='del'>- */</div><div class='del'>-#define FUNC_CTRL_TxENABLE		0x10</div><div class='del'>-#define FUNC_CTRL_RxENABLE		0x20</div><div class='del'>-#define FUNC_CTRL_INIT_COMPLETE		0x01</div><div class='del'>-</div><div class='del'>-/* A stub firmware image which reads the MAC address from NVRAM on the card.</div><div class='del'>-   For copyright information and source see the end of this file. */</div><div class='del'>-static u8 mac_reader[] = {</div><div class='del'>-	0x06, 0x00, 0x00, 0xea, 0x04, 0x00, 0x00, 0xea, 0x03, 0x00, 0x00, 0xea, 0x02, 0x00, 0x00, 0xea,</div><div class='del'>-	0x01, 0x00, 0x00, 0xea, 0x00, 0x00, 0x00, 0xea, 0xff, 0xff, 0xff, 0xea, 0xfe, 0xff, 0xff, 0xea,</div><div class='del'>-	0xd3, 0x00, 0xa0, 0xe3, 0x00, 0xf0, 0x21, 0xe1, 0x0e, 0x04, 0xa0, 0xe3, 0x00, 0x10, 0xa0, 0xe3,</div><div class='del'>-	0x81, 0x11, 0xa0, 0xe1, 0x00, 0x10, 0x81, 0xe3, 0x00, 0x10, 0x80, 0xe5, 0x1c, 0x10, 0x90, 0xe5,</div><div class='del'>-	0x10, 0x10, 0xc1, 0xe3, 0x1c, 0x10, 0x80, 0xe5, 0x01, 0x10, 0xa0, 0xe3, 0x08, 0x10, 0x80, 0xe5,</div><div class='del'>-	0x02, 0x03, 0xa0, 0xe3, 0x00, 0x10, 0xa0, 0xe3, 0xb0, 0x10, 0xc0, 0xe1, 0xb4, 0x10, 0xc0, 0xe1,</div><div class='del'>-	0xb8, 0x10, 0xc0, 0xe1, 0xbc, 0x10, 0xc0, 0xe1, 0x56, 0xdc, 0xa0, 0xe3, 0x21, 0x00, 0x00, 0xeb,</div><div class='del'>-	0x0a, 0x00, 0xa0, 0xe3, 0x1a, 0x00, 0x00, 0xeb, 0x10, 0x00, 0x00, 0xeb, 0x07, 0x00, 0x00, 0xeb,</div><div class='del'>-	0x02, 0x03, 0xa0, 0xe3, 0x02, 0x14, 0xa0, 0xe3, 0xb4, 0x10, 0xc0, 0xe1, 0x4c, 0x10, 0x9f, 0xe5,</div><div class='del'>-	0xbc, 0x10, 0xc0, 0xe1, 0x10, 0x10, 0xa0, 0xe3, 0xb8, 0x10, 0xc0, 0xe1, 0xfe, 0xff, 0xff, 0xea,</div><div class='del'>-	0x00, 0x40, 0x2d, 0xe9, 0x00, 0x20, 0xa0, 0xe3, 0x02, 0x3c, 0xa0, 0xe3, 0x00, 0x10, 0xa0, 0xe3,</div><div class='del'>-	0x28, 0x00, 0x9f, 0xe5, 0x37, 0x00, 0x00, 0xeb, 0x00, 0x40, 0xbd, 0xe8, 0x1e, 0xff, 0x2f, 0xe1,</div><div class='del'>-	0x00, 0x40, 0x2d, 0xe9, 0x12, 0x2e, 0xa0, 0xe3, 0x06, 0x30, 0xa0, 0xe3, 0x00, 0x10, 0xa0, 0xe3,</div><div class='del'>-	0x02, 0x04, 0xa0, 0xe3, 0x2f, 0x00, 0x00, 0xeb, 0x00, 0x40, 0xbd, 0xe8, 0x1e, 0xff, 0x2f, 0xe1,</div><div class='del'>-	0x00, 0x02, 0x00, 0x02, 0x80, 0x01, 0x90, 0xe0, 0x01, 0x00, 0x00, 0x0a, 0x01, 0x00, 0x50, 0xe2,</div><div class='del'>-	0xfc, 0xff, 0xff, 0xea, 0x1e, 0xff, 0x2f, 0xe1, 0x80, 0x10, 0xa0, 0xe3, 0xf3, 0x06, 0xa0, 0xe3,</div><div class='del'>-	0x00, 0x10, 0x80, 0xe5, 0x00, 0x10, 0xa0, 0xe3, 0x00, 0x10, 0x80, 0xe5, 0x01, 0x10, 0xa0, 0xe3,</div><div class='del'>-	0x04, 0x10, 0x80, 0xe5, 0x00, 0x10, 0x80, 0xe5, 0x0e, 0x34, 0xa0, 0xe3, 0x1c, 0x10, 0x93, 0xe5,</div><div class='del'>-	0x02, 0x1a, 0x81, 0xe3, 0x1c, 0x10, 0x83, 0xe5, 0x58, 0x11, 0x9f, 0xe5, 0x30, 0x10, 0x80, 0xe5,</div><div class='del'>-	0x54, 0x11, 0x9f, 0xe5, 0x34, 0x10, 0x80, 0xe5, 0x38, 0x10, 0x80, 0xe5, 0x3c, 0x10, 0x80, 0xe5,</div><div class='del'>-	0x10, 0x10, 0x90, 0xe5, 0x08, 0x00, 0x90, 0xe5, 0x1e, 0xff, 0x2f, 0xe1, 0xf3, 0x16, 0xa0, 0xe3,</div><div class='del'>-	0x08, 0x00, 0x91, 0xe5, 0x05, 0x00, 0xa0, 0xe3, 0x0c, 0x00, 0x81, 0xe5, 0x10, 0x00, 0x91, 0xe5,</div><div class='del'>-	0x02, 0x00, 0x10, 0xe3, 0xfc, 0xff, 0xff, 0x0a, 0xff, 0x00, 0xa0, 0xe3, 0x0c, 0x00, 0x81, 0xe5,</div><div class='del'>-	0x10, 0x00, 0x91, 0xe5, 0x02, 0x00, 0x10, 0xe3, 0xfc, 0xff, 0xff, 0x0a, 0x08, 0x00, 0x91, 0xe5,</div><div class='del'>-	0x10, 0x00, 0x91, 0xe5, 0x01, 0x00, 0x10, 0xe3, 0xfc, 0xff, 0xff, 0x0a, 0x08, 0x00, 0x91, 0xe5,</div><div class='del'>-	0xff, 0x00, 0x00, 0xe2, 0x1e, 0xff, 0x2f, 0xe1, 0x30, 0x40, 0x2d, 0xe9, 0x00, 0x50, 0xa0, 0xe1,</div><div class='del'>-	0x03, 0x40, 0xa0, 0xe1, 0xa2, 0x02, 0xa0, 0xe1, 0x08, 0x00, 0x00, 0xe2, 0x03, 0x00, 0x80, 0xe2,</div><div class='del'>-	0xd8, 0x10, 0x9f, 0xe5, 0x00, 0x00, 0xc1, 0xe5, 0x01, 0x20, 0xc1, 0xe5, 0xe2, 0xff, 0xff, 0xeb,</div><div class='del'>-	0x01, 0x00, 0x10, 0xe3, 0xfc, 0xff, 0xff, 0x1a, 0x14, 0x00, 0xa0, 0xe3, 0xc4, 0xff, 0xff, 0xeb,</div><div class='del'>-	0x04, 0x20, 0xa0, 0xe1, 0x05, 0x10, 0xa0, 0xe1, 0x02, 0x00, 0xa0, 0xe3, 0x01, 0x00, 0x00, 0xeb,</div><div class='del'>-	0x30, 0x40, 0xbd, 0xe8, 0x1e, 0xff, 0x2f, 0xe1, 0x70, 0x40, 0x2d, 0xe9, 0xf3, 0x46, 0xa0, 0xe3,</div><div class='del'>-	0x00, 0x30, 0xa0, 0xe3, 0x00, 0x00, 0x50, 0xe3, 0x08, 0x00, 0x00, 0x9a, 0x8c, 0x50, 0x9f, 0xe5,</div><div class='del'>-	0x03, 0x60, 0xd5, 0xe7, 0x0c, 0x60, 0x84, 0xe5, 0x10, 0x60, 0x94, 0xe5, 0x02, 0x00, 0x16, 0xe3,</div><div class='del'>-	0xfc, 0xff, 0xff, 0x0a, 0x01, 0x30, 0x83, 0xe2, 0x00, 0x00, 0x53, 0xe1, 0xf7, 0xff, 0xff, 0x3a,</div><div class='del'>-	0xff, 0x30, 0xa0, 0xe3, 0x0c, 0x30, 0x84, 0xe5, 0x08, 0x00, 0x94, 0xe5, 0x10, 0x00, 0x94, 0xe5,</div><div class='del'>-	0x01, 0x00, 0x10, 0xe3, 0xfc, 0xff, 0xff, 0x0a, 0x08, 0x00, 0x94, 0xe5, 0x00, 0x00, 0xa0, 0xe3,</div><div class='del'>-	0x00, 0x00, 0x52, 0xe3, 0x0b, 0x00, 0x00, 0x9a, 0x10, 0x50, 0x94, 0xe5, 0x02, 0x00, 0x15, 0xe3,</div><div class='del'>-	0xfc, 0xff, 0xff, 0x0a, 0x0c, 0x30, 0x84, 0xe5, 0x10, 0x50, 0x94, 0xe5, 0x01, 0x00, 0x15, 0xe3,</div><div class='del'>-	0xfc, 0xff, 0xff, 0x0a, 0x08, 0x50, 0x94, 0xe5, 0x01, 0x50, 0xc1, 0xe4, 0x01, 0x00, 0x80, 0xe2,</div><div class='del'>-	0x02, 0x00, 0x50, 0xe1, 0xf3, 0xff, 0xff, 0x3a, 0xc8, 0x00, 0xa0, 0xe3, 0x98, 0xff, 0xff, 0xeb,</div><div class='del'>-	0x70, 0x40, 0xbd, 0xe8, 0x1e, 0xff, 0x2f, 0xe1, 0x01, 0x0c, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02,</div><div class='del'>-	0x00, 0x01, 0x00, 0x02</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct atmel_private {</div><div class='del'>-	void *card; /* Bus dependent structure varies for PCcard */</div><div class='del'>-	int (*present_callback)(void *); /* And callback which uses it */</div><div class='del'>-	char firmware_id[32];</div><div class='del'>-	AtmelFWType firmware_type;</div><div class='del'>-	u8 *firmware;</div><div class='del'>-	int firmware_length;</div><div class='del'>-	struct timer_list management_timer;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct device *sys_dev;</div><div class='del'>-	struct iw_statistics wstats;</div><div class='del'>-	spinlock_t irqlock, timerlock;	/* spinlocks */</div><div class='del'>-	enum { BUS_TYPE_PCCARD, BUS_TYPE_PCI } bus_type;</div><div class='del'>-	enum {</div><div class='del'>-		CARD_TYPE_PARALLEL_FLASH,</div><div class='del'>-		CARD_TYPE_SPI_FLASH,</div><div class='del'>-		CARD_TYPE_EEPROM</div><div class='del'>-	} card_type;</div><div class='del'>-	int do_rx_crc; /* If we need to CRC incoming packets */</div><div class='del'>-	int probe_crc; /* set if we don't yet know */</div><div class='del'>-	int crc_ok_cnt, crc_ko_cnt; /* counters for probing */</div><div class='del'>-	u16 rx_desc_head;</div><div class='del'>-	u16 tx_desc_free, tx_desc_head, tx_desc_tail, tx_desc_previous;</div><div class='del'>-	u16 tx_free_mem, tx_buff_head, tx_buff_tail;</div><div class='del'>-</div><div class='del'>-	u16 frag_seq, frag_len, frag_no;</div><div class='del'>-	u8 frag_source[6];</div><div class='del'>-</div><div class='del'>-	u8 wep_is_on, default_key, exclude_unencrypted, encryption_level;</div><div class='del'>-	u8 group_cipher_suite, pairwise_cipher_suite;</div><div class='del'>-	u8 wep_keys[MAX_ENCRYPTION_KEYS][MAX_ENCRYPTION_KEY_SIZE];</div><div class='del'>-	int wep_key_len[MAX_ENCRYPTION_KEYS];</div><div class='del'>-	int use_wpa, radio_on_broken; /* firmware dependent stuff. */</div><div class='del'>-</div><div class='del'>-	u16 host_info_base;</div><div class='del'>-	struct host_info_struct {</div><div class='del'>-		/* NB this is matched to the hardware, don't change. */</div><div class='del'>-		u8 volatile int_status;</div><div class='del'>-		u8 volatile int_mask;</div><div class='del'>-		u8 volatile lockout_host;</div><div class='del'>-		u8 volatile lockout_mac;</div><div class='del'>-</div><div class='del'>-		u16 tx_buff_pos;</div><div class='del'>-		u16 tx_buff_size;</div><div class='del'>-		u16 tx_desc_pos;</div><div class='del'>-		u16 tx_desc_count;</div><div class='del'>-</div><div class='del'>-		u16 rx_buff_pos;</div><div class='del'>-		u16 rx_buff_size;</div><div class='del'>-		u16 rx_desc_pos;</div><div class='del'>-		u16 rx_desc_count;</div><div class='del'>-</div><div class='del'>-		u16 build_version;</div><div class='del'>-		u16 command_pos;</div><div class='del'>-</div><div class='del'>-		u16 major_version;</div><div class='del'>-		u16 minor_version;</div><div class='del'>-</div><div class='del'>-		u16 func_ctrl;</div><div class='del'>-		u16 mac_status;</div><div class='del'>-		u16 generic_IRQ_type;</div><div class='del'>-		u8  reserved[2];</div><div class='del'>-	} host_info;</div><div class='del'>-</div><div class='del'>-	enum {</div><div class='del'>-		STATION_STATE_SCANNING,</div><div class='del'>-		STATION_STATE_JOINNING,</div><div class='del'>-		STATION_STATE_AUTHENTICATING,</div><div class='del'>-		STATION_STATE_ASSOCIATING,</div><div class='del'>-		STATION_STATE_READY,</div><div class='del'>-		STATION_STATE_REASSOCIATING,</div><div class='del'>-		STATION_STATE_DOWN,</div><div class='del'>-		STATION_STATE_MGMT_ERROR</div><div class='del'>-	} station_state;</div><div class='del'>-</div><div class='del'>-	int operating_mode, power_mode;</div><div class='del'>-	unsigned long last_qual;</div><div class='del'>-	int beacons_this_sec;</div><div class='del'>-	int channel;</div><div class='del'>-	int reg_domain, config_reg_domain;</div><div class='del'>-	int tx_rate;</div><div class='del'>-	int auto_tx_rate;</div><div class='del'>-	int rts_threshold;</div><div class='del'>-	int frag_threshold;</div><div class='del'>-	int long_retry, short_retry;</div><div class='del'>-	int preamble;</div><div class='del'>-	int default_beacon_period, beacon_period, listen_interval;</div><div class='del'>-	int CurrentAuthentTransactionSeqNum, ExpectedAuthentTransactionSeqNum;</div><div class='del'>-	int AuthenticationRequestRetryCnt, AssociationRequestRetryCnt, ReAssociationRequestRetryCnt;</div><div class='del'>-	enum {</div><div class='del'>-		SITE_SURVEY_IDLE,</div><div class='del'>-		SITE_SURVEY_IN_PROGRESS,</div><div class='del'>-		SITE_SURVEY_COMPLETED</div><div class='del'>-	} site_survey_state;</div><div class='del'>-	unsigned long last_survey;</div><div class='del'>-</div><div class='del'>-	int station_was_associated, station_is_associated;</div><div class='del'>-	int fast_scan;</div><div class='del'>-</div><div class='del'>-	struct bss_info {</div><div class='del'>-		int channel;</div><div class='del'>-		int SSIDsize;</div><div class='del'>-		int RSSI;</div><div class='del'>-		int UsingWEP;</div><div class='del'>-		int preamble;</div><div class='del'>-		int beacon_period;</div><div class='del'>-		int BSStype;</div><div class='del'>-		u8 BSSID[6];</div><div class='del'>-		u8 SSID[MAX_SSID_LENGTH];</div><div class='del'>-	} BSSinfo[MAX_BSS_ENTRIES];</div><div class='del'>-	int BSS_list_entries, current_BSS;</div><div class='del'>-	int connect_to_any_BSS;</div><div class='del'>-	int SSID_size, new_SSID_size;</div><div class='del'>-	u8 CurrentBSSID[6], BSSID[6];</div><div class='del'>-	u8 SSID[MAX_SSID_LENGTH], new_SSID[MAX_SSID_LENGTH];</div><div class='del'>-	u64 last_beacon_timestamp;</div><div class='del'>-	u8 rx_buf[MAX_WIRELESS_BODY];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static u8 atmel_basic_rates[4] = {0x82, 0x84, 0x0b, 0x16};</div><div class='del'>-</div><div class='del'>-static const struct {</div><div class='del'>-	int reg_domain;</div><div class='del'>-	int min, max;</div><div class='del'>-	char *name;</div><div class='del'>-} channel_table[] = { { REG_DOMAIN_FCC, 1, 11, "USA" },</div><div class='del'>-		      { REG_DOMAIN_DOC, 1, 11, "Canada" },</div><div class='del'>-		      { REG_DOMAIN_ETSI, 1, 13, "Europe" },</div><div class='del'>-		      { REG_DOMAIN_SPAIN, 10, 11, "Spain" },</div><div class='del'>-		      { REG_DOMAIN_FRANCE, 10, 13, "France" },</div><div class='del'>-		      { REG_DOMAIN_MKK, 14, 14, "MKK" },</div><div class='del'>-		      { REG_DOMAIN_MKK1, 1, 14, "MKK1" },</div><div class='del'>-		      { REG_DOMAIN_ISRAEL, 3, 9, "Israel"} };</div><div class='del'>-</div><div class='del'>-static void build_wpa_mib(struct atmel_private *priv);</div><div class='del'>-static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);</div><div class='del'>-static void atmel_copy_to_card(struct net_device *dev, u16 dest,</div><div class='del'>-			       const unsigned char *src, u16 len);</div><div class='del'>-static void atmel_copy_to_host(struct net_device *dev, unsigned char *dest,</div><div class='del'>-			       u16 src, u16 len);</div><div class='del'>-static void atmel_set_gcr(struct net_device *dev, u16 mask);</div><div class='del'>-static void atmel_clear_gcr(struct net_device *dev, u16 mask);</div><div class='del'>-static int atmel_lock_mac(struct atmel_private *priv);</div><div class='del'>-static void atmel_wmem32(struct atmel_private *priv, u16 pos, u32 data);</div><div class='del'>-static void atmel_command_irq(struct atmel_private *priv);</div><div class='del'>-static int atmel_validate_channel(struct atmel_private *priv, int channel);</div><div class='del'>-static void atmel_management_frame(struct atmel_private *priv,</div><div class='del'>-				   struct ieee80211_hdr *header,</div><div class='del'>-				   u16 frame_len, u8 rssi);</div><div class='del'>-static void atmel_management_timer(struct timer_list *t);</div><div class='del'>-static void atmel_send_command(struct atmel_private *priv, int command,</div><div class='del'>-			       void *cmd, int cmd_size);</div><div class='del'>-static int atmel_send_command_wait(struct atmel_private *priv, int command,</div><div class='del'>-				   void *cmd, int cmd_size);</div><div class='del'>-static void atmel_transmit_management_frame(struct atmel_private *priv,</div><div class='del'>-					    struct ieee80211_hdr *header,</div><div class='del'>-					    u8 *body, int body_len);</div><div class='del'>-</div><div class='del'>-static u8 atmel_get_mib8(struct atmel_private *priv, u8 type, u8 index);</div><div class='del'>-static void atmel_set_mib8(struct atmel_private *priv, u8 type, u8 index,</div><div class='del'>-			   u8 data);</div><div class='del'>-static void atmel_set_mib16(struct atmel_private *priv, u8 type, u8 index,</div><div class='del'>-			    u16 data);</div><div class='del'>-static void atmel_set_mib(struct atmel_private *priv, u8 type, u8 index,</div><div class='del'>-			  u8 *data, int data_len);</div><div class='del'>-static void atmel_get_mib(struct atmel_private *priv, u8 type, u8 index,</div><div class='del'>-			  u8 *data, int data_len);</div><div class='del'>-static void atmel_scan(struct atmel_private *priv, int specific_ssid);</div><div class='del'>-static void atmel_join_bss(struct atmel_private *priv, int bss_index);</div><div class='del'>-static void atmel_smooth_qual(struct atmel_private *priv);</div><div class='del'>-static void atmel_writeAR(struct net_device *dev, u16 data);</div><div class='del'>-static int probe_atmel_card(struct net_device *dev);</div><div class='del'>-static int reset_atmel_card(struct net_device *dev);</div><div class='del'>-static void atmel_enter_state(struct atmel_private *priv, int new_state);</div><div class='del'>-int atmel_open (struct net_device *dev);</div><div class='del'>-</div><div class='del'>-static inline u16 atmel_hi(struct atmel_private *priv, u16 offset)</div><div class='del'>-{</div><div class='del'>-	return priv-&gt;host_info_base + offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 atmel_co(struct atmel_private *priv, u16 offset)</div><div class='del'>-{</div><div class='del'>-	return priv-&gt;host_info.command_pos + offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 atmel_rx(struct atmel_private *priv, u16 offset, u16 desc)</div><div class='del'>-{</div><div class='del'>-	return priv-&gt;host_info.rx_desc_pos + (sizeof(struct rx_desc) * desc) + offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 atmel_tx(struct atmel_private *priv, u16 offset, u16 desc)</div><div class='del'>-{</div><div class='del'>-	return priv-&gt;host_info.tx_desc_pos + (sizeof(struct tx_desc) * desc) + offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u8 atmel_read8(struct net_device *dev, u16 offset)</div><div class='del'>-{</div><div class='del'>-	return inb(dev-&gt;base_addr + offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void atmel_write8(struct net_device *dev, u16 offset, u8 data)</div><div class='del'>-{</div><div class='del'>-	outb(data, dev-&gt;base_addr + offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 atmel_read16(struct net_device *dev, u16 offset)</div><div class='del'>-{</div><div class='del'>-	return inw(dev-&gt;base_addr + offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void atmel_write16(struct net_device *dev, u16 offset, u16 data)</div><div class='del'>-{</div><div class='del'>-	outw(data, dev-&gt;base_addr + offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u8 atmel_rmem8(struct atmel_private *priv, u16 pos)</div><div class='del'>-{</div><div class='del'>-	atmel_writeAR(priv-&gt;dev, pos);</div><div class='del'>-	return atmel_read8(priv-&gt;dev, DR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void atmel_wmem8(struct atmel_private *priv, u16 pos, u16 data)</div><div class='del'>-{</div><div class='del'>-	atmel_writeAR(priv-&gt;dev, pos);</div><div class='del'>-	atmel_write8(priv-&gt;dev, DR, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 atmel_rmem16(struct atmel_private *priv, u16 pos)</div><div class='del'>-{</div><div class='del'>-	atmel_writeAR(priv-&gt;dev, pos);</div><div class='del'>-	return atmel_read16(priv-&gt;dev, DR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void atmel_wmem16(struct atmel_private *priv, u16 pos, u16 data)</div><div class='del'>-{</div><div class='del'>-	atmel_writeAR(priv-&gt;dev, pos);</div><div class='del'>-	atmel_write16(priv-&gt;dev, DR, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct iw_handler_def atmel_handler_def;</div><div class='del'>-</div><div class='del'>-static void tx_done_irq(struct atmel_private *priv)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0;</div><div class='del'>-	     atmel_rmem8(priv, atmel_tx(priv, TX_DESC_FLAGS_OFFSET, priv-&gt;tx_desc_head)) == TX_DONE &amp;&amp;</div><div class='del'>-		     i &lt; priv-&gt;host_info.tx_desc_count;</div><div class='del'>-	     i++) {</div><div class='del'>-		u8 status = atmel_rmem8(priv, atmel_tx(priv, TX_DESC_STATUS_OFFSET, priv-&gt;tx_desc_head));</div><div class='del'>-		u16 msdu_size = atmel_rmem16(priv, atmel_tx(priv, TX_DESC_SIZE_OFFSET, priv-&gt;tx_desc_head));</div><div class='del'>-		u8 type = atmel_rmem8(priv, atmel_tx(priv, TX_DESC_PACKET_TYPE_OFFSET, priv-&gt;tx_desc_head));</div><div class='del'>-</div><div class='del'>-		atmel_wmem8(priv, atmel_tx(priv, TX_DESC_FLAGS_OFFSET, priv-&gt;tx_desc_head), 0);</div><div class='del'>-</div><div class='del'>-		priv-&gt;tx_free_mem += msdu_size;</div><div class='del'>-		priv-&gt;tx_desc_free++;</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;tx_buff_head + msdu_size &gt; (priv-&gt;host_info.tx_buff_pos + priv-&gt;host_info.tx_buff_size))</div><div class='del'>-			priv-&gt;tx_buff_head = 0;</div><div class='del'>-		else</div><div class='del'>-			priv-&gt;tx_buff_head += msdu_size;</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;tx_desc_head &lt; (priv-&gt;host_info.tx_desc_count - 1))</div><div class='del'>-			priv-&gt;tx_desc_head++ ;</div><div class='del'>-		else</div><div class='del'>-			priv-&gt;tx_desc_head = 0;</div><div class='del'>-</div><div class='del'>-		if (type == TX_PACKET_TYPE_DATA) {</div><div class='del'>-			if (status == TX_STATUS_SUCCESS)</div><div class='del'>-				priv-&gt;dev-&gt;stats.tx_packets++;</div><div class='del'>-			else</div><div class='del'>-				priv-&gt;dev-&gt;stats.tx_errors++;</div><div class='del'>-			netif_wake_queue(priv-&gt;dev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u16 find_tx_buff(struct atmel_private *priv, u16 len)</div><div class='del'>-{</div><div class='del'>-	u16 bottom_free = priv-&gt;host_info.tx_buff_size - priv-&gt;tx_buff_tail;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;tx_desc_free == 3 || priv-&gt;tx_free_mem &lt; len)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (bottom_free &gt;= len)</div><div class='del'>-		return priv-&gt;host_info.tx_buff_pos + priv-&gt;tx_buff_tail;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;tx_free_mem - bottom_free &gt;= len) {</div><div class='del'>-		priv-&gt;tx_buff_tail = 0;</div><div class='del'>-		return priv-&gt;host_info.tx_buff_pos;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tx_update_descriptor(struct atmel_private *priv, int is_bcast,</div><div class='del'>-				 u16 len, u16 buff, u8 type)</div><div class='del'>-{</div><div class='del'>-	atmel_wmem16(priv, atmel_tx(priv, TX_DESC_POS_OFFSET, priv-&gt;tx_desc_tail), buff);</div><div class='del'>-	atmel_wmem16(priv, atmel_tx(priv, TX_DESC_SIZE_OFFSET, priv-&gt;tx_desc_tail), len);</div><div class='del'>-	if (!priv-&gt;use_wpa)</div><div class='del'>-		atmel_wmem16(priv, atmel_tx(priv, TX_DESC_HOST_LENGTH_OFFSET, priv-&gt;tx_desc_tail), len);</div><div class='del'>-	atmel_wmem8(priv, atmel_tx(priv, TX_DESC_PACKET_TYPE_OFFSET, priv-&gt;tx_desc_tail), type);</div><div class='del'>-	atmel_wmem8(priv, atmel_tx(priv, TX_DESC_RATE_OFFSET, priv-&gt;tx_desc_tail), priv-&gt;tx_rate);</div><div class='del'>-	atmel_wmem8(priv, atmel_tx(priv, TX_DESC_RETRY_OFFSET, priv-&gt;tx_desc_tail), 0);</div><div class='del'>-	if (priv-&gt;use_wpa) {</div><div class='del'>-		int cipher_type, cipher_length;</div><div class='del'>-		if (is_bcast) {</div><div class='del'>-			cipher_type = priv-&gt;group_cipher_suite;</div><div class='del'>-			if (cipher_type == CIPHER_SUITE_WEP_64 ||</div><div class='del'>-			    cipher_type == CIPHER_SUITE_WEP_128)</div><div class='del'>-				cipher_length = 8;</div><div class='del'>-			else if (cipher_type == CIPHER_SUITE_TKIP)</div><div class='del'>-				cipher_length = 12;</div><div class='del'>-			else if (priv-&gt;pairwise_cipher_suite == CIPHER_SUITE_WEP_64 ||</div><div class='del'>-				 priv-&gt;pairwise_cipher_suite == CIPHER_SUITE_WEP_128) {</div><div class='del'>-				cipher_type = priv-&gt;pairwise_cipher_suite;</div><div class='del'>-				cipher_length = 8;</div><div class='del'>-			} else {</div><div class='del'>-				cipher_type = CIPHER_SUITE_NONE;</div><div class='del'>-				cipher_length = 0;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			cipher_type = priv-&gt;pairwise_cipher_suite;</div><div class='del'>-			if (cipher_type == CIPHER_SUITE_WEP_64 ||</div><div class='del'>-			    cipher_type == CIPHER_SUITE_WEP_128)</div><div class='del'>-				cipher_length = 8;</div><div class='del'>-			else if (cipher_type == CIPHER_SUITE_TKIP)</div><div class='del'>-				cipher_length = 12;</div><div class='del'>-			else if (priv-&gt;group_cipher_suite == CIPHER_SUITE_WEP_64 ||</div><div class='del'>-				 priv-&gt;group_cipher_suite == CIPHER_SUITE_WEP_128) {</div><div class='del'>-				cipher_type = priv-&gt;group_cipher_suite;</div><div class='del'>-				cipher_length = 8;</div><div class='del'>-			} else {</div><div class='del'>-				cipher_type = CIPHER_SUITE_NONE;</div><div class='del'>-				cipher_length = 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		atmel_wmem8(priv, atmel_tx(priv, TX_DESC_CIPHER_TYPE_OFFSET, priv-&gt;tx_desc_tail),</div><div class='del'>-			    cipher_type);</div><div class='del'>-		atmel_wmem8(priv, atmel_tx(priv, TX_DESC_CIPHER_LENGTH_OFFSET, priv-&gt;tx_desc_tail),</div><div class='del'>-			    cipher_length);</div><div class='del'>-	}</div><div class='del'>-	atmel_wmem32(priv, atmel_tx(priv, TX_DESC_NEXT_OFFSET, priv-&gt;tx_desc_tail), 0x80000000L);</div><div class='del'>-	atmel_wmem8(priv, atmel_tx(priv, TX_DESC_FLAGS_OFFSET, priv-&gt;tx_desc_tail), TX_FIRM_OWN);</div><div class='del'>-	if (priv-&gt;tx_desc_previous != priv-&gt;tx_desc_tail)</div><div class='del'>-		atmel_wmem32(priv, atmel_tx(priv, TX_DESC_NEXT_OFFSET, priv-&gt;tx_desc_previous), 0);</div><div class='del'>-	priv-&gt;tx_desc_previous = priv-&gt;tx_desc_tail;</div><div class='del'>-	if (priv-&gt;tx_desc_tail &lt; (priv-&gt;host_info.tx_desc_count - 1))</div><div class='del'>-		priv-&gt;tx_desc_tail++;</div><div class='del'>-	else</div><div class='del'>-		priv-&gt;tx_desc_tail = 0;</div><div class='del'>-	priv-&gt;tx_desc_free--;</div><div class='del'>-	priv-&gt;tx_free_mem -= len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-	struct ieee80211_hdr header;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u16 buff, frame_ctl, len = (ETH_ZLEN &lt; skb-&gt;len) ? skb-&gt;len : ETH_ZLEN;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;card &amp;&amp; priv-&gt;present_callback &amp;&amp;</div><div class='del'>-	    !(*priv-&gt;present_callback)(priv-&gt;card)) {</div><div class='del'>-		dev-&gt;stats.tx_errors++;</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;station_state != STATION_STATE_READY) {</div><div class='del'>-		dev-&gt;stats.tx_errors++;</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* first ensure the timer func cannot run */</div><div class='del'>-	spin_lock_bh(&amp;priv-&gt;timerlock);</div><div class='del'>-	/* then stop the hardware ISR */</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;irqlock, flags);</div><div class='del'>-	/* nb doing the above in the opposite order will deadlock */</div><div class='del'>-</div><div class='del'>-	/* The Wireless Header is 30 bytes. In the Ethernet packet we "cut" the</div><div class='del'>-	   12 first bytes (containing DA/SA) and put them in the appropriate</div><div class='del'>-	   fields of the Wireless Header. Thus the packet length is then the</div><div class='del'>-	   initial + 18 (+30-12) */</div><div class='del'>-</div><div class='del'>-	if (!(buff = find_tx_buff(priv, len + 18))) {</div><div class='del'>-		dev-&gt;stats.tx_dropped++;</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;irqlock, flags);</div><div class='del'>-		spin_unlock_bh(&amp;priv-&gt;timerlock);</div><div class='del'>-		netif_stop_queue(dev);</div><div class='del'>-		return NETDEV_TX_BUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	frame_ctl = IEEE80211_FTYPE_DATA;</div><div class='del'>-	header.duration_id = 0;</div><div class='del'>-	header.seq_ctrl = 0;</div><div class='del'>-	if (priv-&gt;wep_is_on)</div><div class='del'>-		frame_ctl |= IEEE80211_FCTL_PROTECTED;</div><div class='del'>-	if (priv-&gt;operating_mode == IW_MODE_ADHOC) {</div><div class='del'>-		skb_copy_from_linear_data(skb, &amp;header.addr1, ETH_ALEN);</div><div class='del'>-		memcpy(&amp;header.addr2, dev-&gt;dev_addr, ETH_ALEN);</div><div class='del'>-		memcpy(&amp;header.addr3, priv-&gt;BSSID, ETH_ALEN);</div><div class='del'>-	} else {</div><div class='del'>-		frame_ctl |= IEEE80211_FCTL_TODS;</div><div class='del'>-		memcpy(&amp;header.addr1, priv-&gt;CurrentBSSID, ETH_ALEN);</div><div class='del'>-		memcpy(&amp;header.addr2, dev-&gt;dev_addr, ETH_ALEN);</div><div class='del'>-		skb_copy_from_linear_data(skb, &amp;header.addr3, ETH_ALEN);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;use_wpa)</div><div class='del'>-		memcpy(&amp;header.addr4, rfc1042_header, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	header.frame_control = cpu_to_le16(frame_ctl);</div><div class='del'>-	/* Copy the wireless header into the card */</div><div class='del'>-	atmel_copy_to_card(dev, buff, (unsigned char *)&amp;header, DATA_FRAME_WS_HEADER_SIZE);</div><div class='del'>-	/* Copy the packet sans its 802.3 header addresses which have been replaced */</div><div class='del'>-	atmel_copy_to_card(dev, buff + DATA_FRAME_WS_HEADER_SIZE, skb-&gt;data + 12, len - 12);</div><div class='del'>-	priv-&gt;tx_buff_tail += len - 12 + DATA_FRAME_WS_HEADER_SIZE;</div><div class='del'>-</div><div class='del'>-	/* low bit of first byte of destination tells us if broadcast */</div><div class='del'>-	tx_update_descriptor(priv, *(skb-&gt;data) &amp; 0x01, len + 18, buff, TX_PACKET_TYPE_DATA);</div><div class='del'>-	dev-&gt;stats.tx_bytes += len;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;irqlock, flags);</div><div class='del'>-	spin_unlock_bh(&amp;priv-&gt;timerlock);</div><div class='del'>-	dev_kfree_skb(skb);</div><div class='del'>-</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void atmel_transmit_management_frame(struct atmel_private *priv,</div><div class='del'>-					    struct ieee80211_hdr *header,</div><div class='del'>-					    u8 *body, int body_len)</div><div class='del'>-{</div><div class='del'>-	u16 buff;</div><div class='del'>-	int len = MGMT_FRAME_BODY_OFFSET + body_len;</div><div class='del'>-</div><div class='del'>-	if (!(buff = find_tx_buff(priv, len)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	atmel_copy_to_card(priv-&gt;dev, buff, (u8 *)header, MGMT_FRAME_BODY_OFFSET);</div><div class='del'>-	atmel_copy_to_card(priv-&gt;dev, buff + MGMT_FRAME_BODY_OFFSET, body, body_len);</div><div class='del'>-	priv-&gt;tx_buff_tail += len;</div><div class='del'>-	tx_update_descriptor(priv, header-&gt;addr1[0] &amp; 0x01, len, buff, TX_PACKET_TYPE_MGMT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void fast_rx_path(struct atmel_private *priv,</div><div class='del'>-			 struct ieee80211_hdr *header,</div><div class='del'>-			 u16 msdu_size, u16 rx_packet_loc, u32 crc)</div><div class='del'>-{</div><div class='del'>-	/* fast path: unfragmented packet copy directly into skbuf */</div><div class='del'>-	u8 mac4[6];</div><div class='del'>-	struct sk_buff	*skb;</div><div class='del'>-	unsigned char *skbp;</div><div class='del'>-</div><div class='del'>-	/* get the final, mac 4 header field, this tells us encapsulation */</div><div class='del'>-	atmel_copy_to_host(priv-&gt;dev, mac4, rx_packet_loc + 24, 6);</div><div class='del'>-	msdu_size -= 6;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;do_rx_crc) {</div><div class='del'>-		crc = crc32_le(crc, mac4, 6);</div><div class='del'>-		msdu_size -= 4;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(skb = dev_alloc_skb(msdu_size + 14))) {</div><div class='del'>-		priv-&gt;dev-&gt;stats.rx_dropped++;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_reserve(skb, 2);</div><div class='del'>-	skbp = skb_put(skb, msdu_size + 12);</div><div class='del'>-	atmel_copy_to_host(priv-&gt;dev, skbp + 12, rx_packet_loc + 30, msdu_size);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;do_rx_crc) {</div><div class='del'>-		u32 netcrc;</div><div class='del'>-		crc = crc32_le(crc, skbp + 12, msdu_size);</div><div class='del'>-		atmel_copy_to_host(priv-&gt;dev, (void *)&amp;netcrc, rx_packet_loc + 30 + msdu_size, 4);</div><div class='del'>-		if ((crc ^ 0xffffffff) != netcrc) {</div><div class='del'>-			priv-&gt;dev-&gt;stats.rx_crc_errors++;</div><div class='del'>-			dev_kfree_skb(skb);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(skbp, header-&gt;addr1, ETH_ALEN); /* destination address */</div><div class='del'>-	if (le16_to_cpu(header-&gt;frame_control) &amp; IEEE80211_FCTL_FROMDS)</div><div class='del'>-		memcpy(&amp;skbp[ETH_ALEN], header-&gt;addr3, ETH_ALEN);</div><div class='del'>-	else</div><div class='del'>-		memcpy(&amp;skbp[ETH_ALEN], header-&gt;addr2, ETH_ALEN); /* source address */</div><div class='del'>-</div><div class='del'>-	skb-&gt;protocol = eth_type_trans(skb, priv-&gt;dev);</div><div class='del'>-	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='del'>-	netif_rx(skb);</div><div class='del'>-	priv-&gt;dev-&gt;stats.rx_bytes += 12 + msdu_size;</div><div class='del'>-	priv-&gt;dev-&gt;stats.rx_packets++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Test to see if the packet in card memory at packet_loc has a valid CRC</div><div class='del'>-   It doesn't matter that this is slow: it is only used to proble the first few</div><div class='del'>-   packets. */</div><div class='del'>-static int probe_crc(struct atmel_private *priv, u16 packet_loc, u16 msdu_size)</div><div class='del'>-{</div><div class='del'>-	int i = msdu_size - 4;</div><div class='del'>-	u32 netcrc, crc = 0xffffffff;</div><div class='del'>-</div><div class='del'>-	if (msdu_size &lt; 4)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	atmel_copy_to_host(priv-&gt;dev, (void *)&amp;netcrc, packet_loc + i, 4);</div><div class='del'>-</div><div class='del'>-	atmel_writeAR(priv-&gt;dev, packet_loc);</div><div class='del'>-	while (i--) {</div><div class='del'>-		u8 octet = atmel_read8(priv-&gt;dev, DR);</div><div class='del'>-		crc = crc32_le(crc, &amp;octet, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (crc ^ 0xffffffff) == netcrc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void frag_rx_path(struct atmel_private *priv,</div><div class='del'>-			 struct ieee80211_hdr *header,</div><div class='del'>-			 u16 msdu_size, u16 rx_packet_loc, u32 crc, u16 seq_no,</div><div class='del'>-			 u8 frag_no, int more_frags)</div><div class='del'>-{</div><div class='del'>-	u8 mac4[ETH_ALEN];</div><div class='del'>-	u8 source[ETH_ALEN];</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(header-&gt;frame_control) &amp; IEEE80211_FCTL_FROMDS)</div><div class='del'>-		memcpy(source, header-&gt;addr3, ETH_ALEN);</div><div class='del'>-	else</div><div class='del'>-		memcpy(source, header-&gt;addr2, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	rx_packet_loc += 24; /* skip header */</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;do_rx_crc)</div><div class='del'>-		msdu_size -= 4;</div><div class='del'>-</div><div class='del'>-	if (frag_no == 0) { /* first fragment */</div><div class='del'>-		atmel_copy_to_host(priv-&gt;dev, mac4, rx_packet_loc, ETH_ALEN);</div><div class='del'>-		msdu_size -= ETH_ALEN;</div><div class='del'>-		rx_packet_loc += ETH_ALEN;</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;do_rx_crc)</div><div class='del'>-			crc = crc32_le(crc, mac4, 6);</div><div class='del'>-</div><div class='del'>-		priv-&gt;frag_seq = seq_no;</div><div class='del'>-		priv-&gt;frag_no = 1;</div><div class='del'>-		priv-&gt;frag_len = msdu_size;</div><div class='del'>-		memcpy(priv-&gt;frag_source, source, ETH_ALEN);</div><div class='del'>-		memcpy(&amp;priv-&gt;rx_buf[ETH_ALEN], source, ETH_ALEN);</div><div class='del'>-		memcpy(priv-&gt;rx_buf, header-&gt;addr1, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-		atmel_copy_to_host(priv-&gt;dev, &amp;priv-&gt;rx_buf[12], rx_packet_loc, msdu_size);</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;do_rx_crc) {</div><div class='del'>-			u32 netcrc;</div><div class='del'>-			crc = crc32_le(crc, &amp;priv-&gt;rx_buf[12], msdu_size);</div><div class='del'>-			atmel_copy_to_host(priv-&gt;dev, (void *)&amp;netcrc, rx_packet_loc + msdu_size, 4);</div><div class='del'>-			if ((crc ^ 0xffffffff) != netcrc) {</div><div class='del'>-				priv-&gt;dev-&gt;stats.rx_crc_errors++;</div><div class='del'>-				eth_broadcast_addr(priv-&gt;frag_source);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else if (priv-&gt;frag_no == frag_no &amp;&amp;</div><div class='del'>-		   priv-&gt;frag_seq == seq_no &amp;&amp;</div><div class='del'>-		   memcmp(priv-&gt;frag_source, source, ETH_ALEN) == 0) {</div><div class='del'>-</div><div class='del'>-		atmel_copy_to_host(priv-&gt;dev, &amp;priv-&gt;rx_buf[12 + priv-&gt;frag_len],</div><div class='del'>-				   rx_packet_loc, msdu_size);</div><div class='del'>-		if (priv-&gt;do_rx_crc) {</div><div class='del'>-			u32 netcrc;</div><div class='del'>-			crc = crc32_le(crc,</div><div class='del'>-				       &amp;priv-&gt;rx_buf[12 + priv-&gt;frag_len],</div><div class='del'>-				       msdu_size);</div><div class='del'>-			atmel_copy_to_host(priv-&gt;dev, (void *)&amp;netcrc, rx_packet_loc + msdu_size, 4);</div><div class='del'>-			if ((crc ^ 0xffffffff) != netcrc) {</div><div class='del'>-				priv-&gt;dev-&gt;stats.rx_crc_errors++;</div><div class='del'>-				eth_broadcast_addr(priv-&gt;frag_source);</div><div class='del'>-				more_frags = 1; /* don't send broken assembly */</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		priv-&gt;frag_len += msdu_size;</div><div class='del'>-		priv-&gt;frag_no++;</div><div class='del'>-</div><div class='del'>-		if (!more_frags) { /* last one */</div><div class='del'>-			eth_broadcast_addr(priv-&gt;frag_source);</div><div class='del'>-			if (!(skb = dev_alloc_skb(priv-&gt;frag_len + 14))) {</div><div class='del'>-				priv-&gt;dev-&gt;stats.rx_dropped++;</div><div class='del'>-			} else {</div><div class='del'>-				skb_reserve(skb, 2);</div><div class='del'>-				skb_put_data(skb, priv-&gt;rx_buf,</div><div class='del'>-				             priv-&gt;frag_len + 12);</div><div class='del'>-				skb-&gt;protocol = eth_type_trans(skb, priv-&gt;dev);</div><div class='del'>-				skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='del'>-				netif_rx(skb);</div><div class='del'>-				priv-&gt;dev-&gt;stats.rx_bytes += priv-&gt;frag_len + 12;</div><div class='del'>-				priv-&gt;dev-&gt;stats.rx_packets++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		priv-&gt;wstats.discard.fragment++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rx_done_irq(struct atmel_private *priv)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct ieee80211_hdr header;</div><div class='del'>-</div><div class='del'>-	for (i = 0;</div><div class='del'>-	     atmel_rmem8(priv, atmel_rx(priv, RX_DESC_FLAGS_OFFSET, priv-&gt;rx_desc_head)) == RX_DESC_FLAG_VALID &amp;&amp;</div><div class='del'>-		     i &lt; priv-&gt;host_info.rx_desc_count;</div><div class='del'>-	     i++) {</div><div class='del'>-</div><div class='del'>-		u16 msdu_size, rx_packet_loc, frame_ctl, seq_control;</div><div class='del'>-		u8 status = atmel_rmem8(priv, atmel_rx(priv, RX_DESC_STATUS_OFFSET, priv-&gt;rx_desc_head));</div><div class='del'>-		u32 crc = 0xffffffff;</div><div class='del'>-</div><div class='del'>-		if (status != RX_STATUS_SUCCESS) {</div><div class='del'>-			if (status == 0xc1) /* determined by experiment */</div><div class='del'>-				priv-&gt;wstats.discard.nwid++;</div><div class='del'>-			else</div><div class='del'>-				priv-&gt;dev-&gt;stats.rx_errors++;</div><div class='del'>-			goto next;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		msdu_size = atmel_rmem16(priv, atmel_rx(priv, RX_DESC_MSDU_SIZE_OFFSET, priv-&gt;rx_desc_head));</div><div class='del'>-		rx_packet_loc = atmel_rmem16(priv, atmel_rx(priv, RX_DESC_MSDU_POS_OFFSET, priv-&gt;rx_desc_head));</div><div class='del'>-</div><div class='del'>-		if (msdu_size &lt; 30) {</div><div class='del'>-			priv-&gt;dev-&gt;stats.rx_errors++;</div><div class='del'>-			goto next;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Get header as far as end of seq_ctrl */</div><div class='del'>-		atmel_copy_to_host(priv-&gt;dev, (char *)&amp;header, rx_packet_loc, 24);</div><div class='del'>-		frame_ctl = le16_to_cpu(header.frame_control);</div><div class='del'>-		seq_control = le16_to_cpu(header.seq_ctrl);</div><div class='del'>-</div><div class='del'>-		/* probe for CRC use here if needed  once five packets have</div><div class='del'>-		   arrived with the same crc status, we assume we know what's</div><div class='del'>-		   happening and stop probing */</div><div class='del'>-		if (priv-&gt;probe_crc) {</div><div class='del'>-			if (!priv-&gt;wep_is_on || !(frame_ctl &amp; IEEE80211_FCTL_PROTECTED)) {</div><div class='del'>-				priv-&gt;do_rx_crc = probe_crc(priv, rx_packet_loc, msdu_size);</div><div class='del'>-			} else {</div><div class='del'>-				priv-&gt;do_rx_crc = probe_crc(priv, rx_packet_loc + 24, msdu_size - 24);</div><div class='del'>-			}</div><div class='del'>-			if (priv-&gt;do_rx_crc) {</div><div class='del'>-				if (priv-&gt;crc_ok_cnt++ &gt; 5)</div><div class='del'>-					priv-&gt;probe_crc = 0;</div><div class='del'>-			} else {</div><div class='del'>-				if (priv-&gt;crc_ko_cnt++ &gt; 5)</div><div class='del'>-					priv-&gt;probe_crc = 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* don't CRC header when WEP in use */</div><div class='del'>-		if (priv-&gt;do_rx_crc &amp;&amp; (!priv-&gt;wep_is_on || !(frame_ctl &amp; IEEE80211_FCTL_PROTECTED))) {</div><div class='del'>-			crc = crc32_le(0xffffffff, (unsigned char *)&amp;header, 24);</div><div class='del'>-		}</div><div class='del'>-		msdu_size -= 24; /* header */</div><div class='del'>-</div><div class='del'>-		if ((frame_ctl &amp; IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) {</div><div class='del'>-			int more_fragments = frame_ctl &amp; IEEE80211_FCTL_MOREFRAGS;</div><div class='del'>-			u8 packet_fragment_no = seq_control &amp; IEEE80211_SCTL_FRAG;</div><div class='del'>-			u16 packet_sequence_no = (seq_control &amp; IEEE80211_SCTL_SEQ) &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-			if (!more_fragments &amp;&amp; packet_fragment_no == 0) {</div><div class='del'>-				fast_rx_path(priv, &amp;header, msdu_size, rx_packet_loc, crc);</div><div class='del'>-			} else {</div><div class='del'>-				frag_rx_path(priv, &amp;header, msdu_size, rx_packet_loc, crc,</div><div class='del'>-					     packet_sequence_no, packet_fragment_no, more_fragments);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((frame_ctl &amp; IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT) {</div><div class='del'>-			/* copy rest of packet into buffer */</div><div class='del'>-			atmel_copy_to_host(priv-&gt;dev, (unsigned char *)&amp;priv-&gt;rx_buf, rx_packet_loc + 24, msdu_size);</div><div class='del'>-</div><div class='del'>-			/* we use the same buffer for frag reassembly and control packets */</div><div class='del'>-			eth_broadcast_addr(priv-&gt;frag_source);</div><div class='del'>-</div><div class='del'>-			if (priv-&gt;do_rx_crc) {</div><div class='del'>-				/* last 4 octets is crc */</div><div class='del'>-				msdu_size -= 4;</div><div class='del'>-				crc = crc32_le(crc, (unsigned char *)&amp;priv-&gt;rx_buf, msdu_size);</div><div class='del'>-				if ((crc ^ 0xffffffff) != (*((u32 *)&amp;priv-&gt;rx_buf[msdu_size]))) {</div><div class='del'>-					priv-&gt;dev-&gt;stats.rx_crc_errors++;</div><div class='del'>-					goto next;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			atmel_management_frame(priv, &amp;header, msdu_size,</div><div class='del'>-					       atmel_rmem8(priv, atmel_rx(priv, RX_DESC_RSSI_OFFSET, priv-&gt;rx_desc_head)));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-next:</div><div class='del'>-		/* release descriptor */</div><div class='del'>-		atmel_wmem8(priv, atmel_rx(priv, RX_DESC_FLAGS_OFFSET, priv-&gt;rx_desc_head), RX_DESC_FLAG_CONSUMED);</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;rx_desc_head &lt; (priv-&gt;host_info.rx_desc_count - 1))</div><div class='del'>-			priv-&gt;rx_desc_head++;</div><div class='del'>-		else</div><div class='del'>-			priv-&gt;rx_desc_head = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t service_interrupt(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = (struct net_device *) dev_id;</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-	u8 isr;</div><div class='del'>-	int i = -1;</div><div class='del'>-	static const u8 irq_order[] = {</div><div class='del'>-		ISR_OUT_OF_RANGE,</div><div class='del'>-		ISR_RxCOMPLETE,</div><div class='del'>-		ISR_TxCOMPLETE,</div><div class='del'>-		ISR_RxFRAMELOST,</div><div class='del'>-		ISR_FATAL_ERROR,</div><div class='del'>-		ISR_COMMAND_COMPLETE,</div><div class='del'>-		ISR_IBSS_MERGE,</div><div class='del'>-		ISR_GENERIC_IRQ</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;card &amp;&amp; priv-&gt;present_callback &amp;&amp;</div><div class='del'>-	    !(*priv-&gt;present_callback)(priv-&gt;card))</div><div class='del'>-		return IRQ_HANDLED;</div><div class='del'>-</div><div class='del'>-	/* In this state upper-level code assumes it can mess with</div><div class='del'>-	   the card unhampered by interrupts which may change register state.</div><div class='del'>-	   Note that even though the card shouldn't generate interrupts</div><div class='del'>-	   the inturrupt line may be shared. This allows card setup</div><div class='del'>-	   to go on without disabling interrupts for a long time. */</div><div class='del'>-	if (priv-&gt;station_state == STATION_STATE_DOWN)</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-</div><div class='del'>-	atmel_clear_gcr(dev, GCR_ENINT); /* disable interrupts */</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		if (!atmel_lock_mac(priv)) {</div><div class='del'>-			/* failed to contact card */</div><div class='del'>-			printk(KERN_ALERT "%s: failed to contact MAC.\n", dev-&gt;name);</div><div class='del'>-			return IRQ_HANDLED;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		isr = atmel_rmem8(priv, atmel_hi(priv, IFACE_INT_STATUS_OFFSET));</div><div class='del'>-		atmel_wmem8(priv, atmel_hi(priv, IFACE_LOCKOUT_MAC_OFFSET), 0);</div><div class='del'>-</div><div class='del'>-		if (!isr) {</div><div class='del'>-			atmel_set_gcr(dev, GCR_ENINT); /* enable interrupts */</div><div class='del'>-			return i == -1 ? IRQ_NONE : IRQ_HANDLED;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		atmel_set_gcr(dev, GCR_ACKINT); /* acknowledge interrupt */</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(irq_order); i++)</div><div class='del'>-			if (isr &amp; irq_order[i])</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-		if (!atmel_lock_mac(priv)) {</div><div class='del'>-			/* failed to contact card */</div><div class='del'>-			printk(KERN_ALERT "%s: failed to contact MAC.\n", dev-&gt;name);</div><div class='del'>-			return IRQ_HANDLED;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		isr = atmel_rmem8(priv, atmel_hi(priv, IFACE_INT_STATUS_OFFSET));</div><div class='del'>-		isr ^= irq_order[i];</div><div class='del'>-		atmel_wmem8(priv, atmel_hi(priv, IFACE_INT_STATUS_OFFSET), isr);</div><div class='del'>-		atmel_wmem8(priv, atmel_hi(priv, IFACE_LOCKOUT_MAC_OFFSET), 0);</div><div class='del'>-</div><div class='del'>-		switch (irq_order[i]) {</div><div class='del'>-</div><div class='del'>-		case ISR_OUT_OF_RANGE:</div><div class='del'>-			if (priv-&gt;operating_mode == IW_MODE_INFRA &amp;&amp;</div><div class='del'>-			    priv-&gt;station_state == STATION_STATE_READY) {</div><div class='del'>-				priv-&gt;station_is_associated = 0;</div><div class='del'>-				atmel_scan(priv, 1);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case ISR_RxFRAMELOST:</div><div class='del'>-			priv-&gt;wstats.discard.misc++;</div><div class='del'>-			fallthrough;</div><div class='del'>-		case ISR_RxCOMPLETE:</div><div class='del'>-			rx_done_irq(priv);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case ISR_TxCOMPLETE:</div><div class='del'>-			tx_done_irq(priv);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case ISR_FATAL_ERROR:</div><div class='del'>-			printk(KERN_ALERT "%s: *** FATAL error interrupt ***\n", dev-&gt;name);</div><div class='del'>-			atmel_enter_state(priv, STATION_STATE_MGMT_ERROR);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case ISR_COMMAND_COMPLETE:</div><div class='del'>-			atmel_command_irq(priv);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case ISR_IBSS_MERGE:</div><div class='del'>-			atmel_get_mib(priv, Mac_Mgmt_Mib_Type, MAC_MGMT_MIB_CUR_BSSID_POS,</div><div class='del'>-				      priv-&gt;CurrentBSSID, 6);</div><div class='del'>-			/* The WPA stuff cares about the current AP address */</div><div class='del'>-			if (priv-&gt;use_wpa)</div><div class='del'>-				build_wpa_mib(priv);</div><div class='del'>-			break;</div><div class='del'>-		case ISR_GENERIC_IRQ:</div><div class='del'>-			printk(KERN_INFO "%s: Generic_irq received.\n", dev-&gt;name);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct iw_statistics *atmel_get_wireless_stats(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	/* update the link quality here in case we are seeing no beacons</div><div class='del'>-	   at all to drive the process */</div><div class='del'>-	atmel_smooth_qual(priv);</div><div class='del'>-</div><div class='del'>-	priv-&gt;wstats.status = priv-&gt;station_state;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;operating_mode == IW_MODE_INFRA) {</div><div class='del'>-		if (priv-&gt;station_state != STATION_STATE_READY) {</div><div class='del'>-			priv-&gt;wstats.qual.qual = 0;</div><div class='del'>-			priv-&gt;wstats.qual.level = 0;</div><div class='del'>-			priv-&gt;wstats.qual.updated = (IW_QUAL_QUAL_INVALID</div><div class='del'>-					| IW_QUAL_LEVEL_INVALID);</div><div class='del'>-		}</div><div class='del'>-		priv-&gt;wstats.qual.noise = 0;</div><div class='del'>-		priv-&gt;wstats.qual.updated |= IW_QUAL_NOISE_INVALID;</div><div class='del'>-	} else {</div><div class='del'>-		/* Quality levels cannot be determined in ad-hoc mode,</div><div class='del'>-		   because we can 'hear' more that one remote station. */</div><div class='del'>-		priv-&gt;wstats.qual.qual = 0;</div><div class='del'>-		priv-&gt;wstats.qual.level	= 0;</div><div class='del'>-		priv-&gt;wstats.qual.noise	= 0;</div><div class='del'>-		priv-&gt;wstats.qual.updated = IW_QUAL_QUAL_INVALID</div><div class='del'>-					| IW_QUAL_LEVEL_INVALID</div><div class='del'>-					| IW_QUAL_NOISE_INVALID;</div><div class='del'>-		priv-&gt;wstats.miss.beacon = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return &amp;priv-&gt;wstats;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_set_mac_address(struct net_device *dev, void *p)</div><div class='del'>-{</div><div class='del'>-	struct sockaddr *addr = p;</div><div class='del'>-</div><div class='del'>-	memcpy (dev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='del'>-	return atmel_open(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(atmel_open);</div><div class='del'>-</div><div class='del'>-int atmel_open(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-	int i, channel, err;</div><div class='del'>-</div><div class='del'>-	/* any scheduled timer is no longer needed and might screw things up.. */</div><div class='del'>-	del_timer_sync(&amp;priv-&gt;management_timer);</div><div class='del'>-</div><div class='del'>-	/* Interrupts will not touch the card once in this state... */</div><div class='del'>-	priv-&gt;station_state = STATION_STATE_DOWN;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;new_SSID_size) {</div><div class='del'>-		memcpy(priv-&gt;SSID, priv-&gt;new_SSID, priv-&gt;new_SSID_size);</div><div class='del'>-		priv-&gt;SSID_size = priv-&gt;new_SSID_size;</div><div class='del'>-		priv-&gt;new_SSID_size = 0;</div><div class='del'>-	}</div><div class='del'>-	priv-&gt;BSS_list_entries = 0;</div><div class='del'>-</div><div class='del'>-	priv-&gt;AuthenticationRequestRetryCnt = 0;</div><div class='del'>-	priv-&gt;AssociationRequestRetryCnt = 0;</div><div class='del'>-	priv-&gt;ReAssociationRequestRetryCnt = 0;</div><div class='del'>-	priv-&gt;CurrentAuthentTransactionSeqNum = 0x0001;</div><div class='del'>-	priv-&gt;ExpectedAuthentTransactionSeqNum = 0x0002;</div><div class='del'>-</div><div class='del'>-	priv-&gt;site_survey_state = SITE_SURVEY_IDLE;</div><div class='del'>-	priv-&gt;station_is_associated = 0;</div><div class='del'>-</div><div class='del'>-	err = reset_atmel_card(dev);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;config_reg_domain) {</div><div class='del'>-		priv-&gt;reg_domain = priv-&gt;config_reg_domain;</div><div class='del'>-		atmel_set_mib8(priv, Phy_Mib_Type, PHY_MIB_REG_DOMAIN_POS, priv-&gt;reg_domain);</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;reg_domain = atmel_get_mib8(priv, Phy_Mib_Type, PHY_MIB_REG_DOMAIN_POS);</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(channel_table); i++)</div><div class='del'>-			if (priv-&gt;reg_domain == channel_table[i].reg_domain)</div><div class='del'>-				break;</div><div class='del'>-		if (i == ARRAY_SIZE(channel_table)) {</div><div class='del'>-			priv-&gt;reg_domain = REG_DOMAIN_MKK1;</div><div class='del'>-			printk(KERN_ALERT "%s: failed to get regulatory domain: assuming MKK1.\n", dev-&gt;name);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((channel = atmel_validate_channel(priv, priv-&gt;channel)))</div><div class='del'>-		priv-&gt;channel = channel;</div><div class='del'>-</div><div class='del'>-	/* this moves station_state on.... */</div><div class='del'>-	atmel_scan(priv, 1);</div><div class='del'>-</div><div class='del'>-	atmel_set_gcr(priv-&gt;dev, GCR_ENINT); /* enable interrupts */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_close(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	/* Send event to userspace that we are disassociating */</div><div class='del'>-	if (priv-&gt;station_state == STATION_STATE_READY) {</div><div class='del'>-		union iwreq_data wrqu;</div><div class='del'>-</div><div class='del'>-		wrqu.data.length = 0;</div><div class='del'>-		wrqu.data.flags = 0;</div><div class='del'>-		wrqu.ap_addr.sa_family = ARPHRD_ETHER;</div><div class='del'>-		eth_zero_addr(wrqu.ap_addr.sa_data);</div><div class='del'>-		wireless_send_event(priv-&gt;dev, SIOCGIWAP, &amp;wrqu, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	atmel_enter_state(priv, STATION_STATE_DOWN);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;bus_type == BUS_TYPE_PCCARD)</div><div class='del'>-		atmel_write16(dev, GCR, 0x0060);</div><div class='del'>-	atmel_write16(dev, GCR, 0x0040);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_validate_channel(struct atmel_private *priv, int channel)</div><div class='del'>-{</div><div class='del'>-	/* check that channel is OK, if so return zero,</div><div class='del'>-	   else return suitable default channel */</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(channel_table); i++)</div><div class='del'>-		if (priv-&gt;reg_domain == channel_table[i].reg_domain) {</div><div class='del'>-			if (channel &gt;= channel_table[i].min &amp;&amp;</div><div class='del'>-			    channel &lt;= channel_table[i].max)</div><div class='del'>-				return 0;</div><div class='del'>-			else</div><div class='del'>-				return channel_table[i].min;</div><div class='del'>-		}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-static int atmel_proc_show(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = m-&gt;private;</div><div class='del'>-	int i;</div><div class='del'>-	char *s, *r, *c;</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "Driver version:\t\t%d.%d\n", DRIVER_MAJOR, DRIVER_MINOR);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;station_state != STATION_STATE_DOWN) {</div><div class='del'>-		seq_printf(m,</div><div class='del'>-			   "Firmware version:\t%d.%d build %d\n"</div><div class='del'>-			   "Firmware location:\t",</div><div class='del'>-			   priv-&gt;host_info.major_version,</div><div class='del'>-			   priv-&gt;host_info.minor_version,</div><div class='del'>-			   priv-&gt;host_info.build_version);</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;card_type != CARD_TYPE_EEPROM)</div><div class='del'>-			seq_puts(m, "on card\n");</div><div class='del'>-		else if (priv-&gt;firmware)</div><div class='del'>-			seq_printf(m, "%s loaded by host\n", priv-&gt;firmware_id);</div><div class='del'>-		else</div><div class='del'>-			seq_printf(m, "%s loaded by hotplug\n", priv-&gt;firmware_id);</div><div class='del'>-</div><div class='del'>-		switch (priv-&gt;card_type) {</div><div class='del'>-		case CARD_TYPE_PARALLEL_FLASH:</div><div class='del'>-			c = "Parallel flash";</div><div class='del'>-			break;</div><div class='del'>-		case CARD_TYPE_SPI_FLASH:</div><div class='del'>-			c = "SPI flash\n";</div><div class='del'>-			break;</div><div class='del'>-		case CARD_TYPE_EEPROM:</div><div class='del'>-			c = "EEPROM";</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			c = "&lt;unknown&gt;";</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		r = "&lt;unknown&gt;";</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(channel_table); i++)</div><div class='del'>-			if (priv-&gt;reg_domain == channel_table[i].reg_domain)</div><div class='del'>-				r = channel_table[i].name;</div><div class='del'>-</div><div class='del'>-		seq_printf(m, "MAC memory type:\t%s\n", c);</div><div class='del'>-		seq_printf(m, "Regulatory domain:\t%s\n", r);</div><div class='del'>-		seq_printf(m, "Host CRC checking:\t%s\n",</div><div class='del'>-			 priv-&gt;do_rx_crc ? "On" : "Off");</div><div class='del'>-		seq_printf(m, "WPA-capable firmware:\t%s\n",</div><div class='del'>-			 priv-&gt;use_wpa ? "Yes" : "No");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;station_state) {</div><div class='del'>-	case STATION_STATE_SCANNING:</div><div class='del'>-		s = "Scanning";</div><div class='del'>-		break;</div><div class='del'>-	case STATION_STATE_JOINNING:</div><div class='del'>-		s = "Joining";</div><div class='del'>-		break;</div><div class='del'>-	case STATION_STATE_AUTHENTICATING:</div><div class='del'>-		s = "Authenticating";</div><div class='del'>-		break;</div><div class='del'>-	case STATION_STATE_ASSOCIATING:</div><div class='del'>-		s = "Associating";</div><div class='del'>-		break;</div><div class='del'>-	case STATION_STATE_READY:</div><div class='del'>-		s = "Ready";</div><div class='del'>-		break;</div><div class='del'>-	case STATION_STATE_REASSOCIATING:</div><div class='del'>-		s = "Reassociating";</div><div class='del'>-		break;</div><div class='del'>-	case STATION_STATE_MGMT_ERROR:</div><div class='del'>-		s = "Management error";</div><div class='del'>-		break;</div><div class='del'>-	case STATION_STATE_DOWN:</div><div class='del'>-		s = "Down";</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		s = "&lt;unknown&gt;";</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "Current state:\t\t%s\n", s);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops atmel_netdev_ops = {</div><div class='del'>-	.ndo_open 		= atmel_open,</div><div class='del'>-	.ndo_stop		= atmel_close,</div><div class='del'>-	.ndo_set_mac_address 	= atmel_set_mac_address,</div><div class='del'>-	.ndo_start_xmit 	= start_tx,</div><div class='del'>-	.ndo_do_ioctl 		= atmel_ioctl,</div><div class='del'>-	.ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct net_device *init_atmel_card(unsigned short irq, unsigned long port,</div><div class='del'>-				   const AtmelFWType fw_type,</div><div class='del'>-				   struct device *sys_dev,</div><div class='del'>-				   int (*card_present)(void *), void *card)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct atmel_private *priv;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	/* Create the network device object. */</div><div class='del'>-	dev = alloc_etherdev(sizeof(*priv));</div><div class='del'>-	if (!dev)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (dev_alloc_name(dev, dev-&gt;name) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "atmel: Couldn't get name!\n");</div><div class='del'>-		goto err_out_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv = netdev_priv(dev);</div><div class='del'>-	priv-&gt;dev = dev;</div><div class='del'>-	priv-&gt;sys_dev = sys_dev;</div><div class='del'>-	priv-&gt;present_callback = card_present;</div><div class='del'>-	priv-&gt;card = card;</div><div class='del'>-	priv-&gt;firmware = NULL;</div><div class='del'>-	priv-&gt;firmware_type = fw_type;</div><div class='del'>-	if (firmware) /* module parameter */</div><div class='del'>-		strlcpy(priv-&gt;firmware_id, firmware, sizeof(priv-&gt;firmware_id));</div><div class='del'>-	priv-&gt;bus_type = card_present ? BUS_TYPE_PCCARD : BUS_TYPE_PCI;</div><div class='del'>-	priv-&gt;station_state = STATION_STATE_DOWN;</div><div class='del'>-	priv-&gt;do_rx_crc = 0;</div><div class='del'>-	/* For PCMCIA cards, some chips need CRC, some don't</div><div class='del'>-	   so we have to probe. */</div><div class='del'>-	if (priv-&gt;bus_type == BUS_TYPE_PCCARD) {</div><div class='del'>-		priv-&gt;probe_crc = 1;</div><div class='del'>-		priv-&gt;crc_ok_cnt = priv-&gt;crc_ko_cnt = 0;</div><div class='del'>-	} else</div><div class='del'>-		priv-&gt;probe_crc = 0;</div><div class='del'>-	priv-&gt;last_qual = jiffies;</div><div class='del'>-	priv-&gt;last_beacon_timestamp = 0;</div><div class='del'>-	memset(priv-&gt;frag_source, 0xff, sizeof(priv-&gt;frag_source));</div><div class='del'>-	eth_zero_addr(priv-&gt;BSSID);</div><div class='del'>-	priv-&gt;CurrentBSSID[0] = 0xFF; /* Initialize to something invalid.... */</div><div class='del'>-	priv-&gt;station_was_associated = 0;</div><div class='del'>-</div><div class='del'>-	priv-&gt;last_survey = jiffies;</div><div class='del'>-	priv-&gt;preamble = LONG_PREAMBLE;</div><div class='del'>-	priv-&gt;operating_mode = IW_MODE_INFRA;</div><div class='del'>-	priv-&gt;connect_to_any_BSS = 0;</div><div class='del'>-	priv-&gt;config_reg_domain = 0;</div><div class='del'>-	priv-&gt;reg_domain = 0;</div><div class='del'>-	priv-&gt;tx_rate = 3;</div><div class='del'>-	priv-&gt;auto_tx_rate = 1;</div><div class='del'>-	priv-&gt;channel = 4;</div><div class='del'>-	priv-&gt;power_mode = 0;</div><div class='del'>-	priv-&gt;SSID[0] = '\0';</div><div class='del'>-	priv-&gt;SSID_size = 0;</div><div class='del'>-	priv-&gt;new_SSID_size = 0;</div><div class='del'>-	priv-&gt;frag_threshold = 2346;</div><div class='del'>-	priv-&gt;rts_threshold = 2347;</div><div class='del'>-	priv-&gt;short_retry = 7;</div><div class='del'>-	priv-&gt;long_retry = 4;</div><div class='del'>-</div><div class='del'>-	priv-&gt;wep_is_on = 0;</div><div class='del'>-	priv-&gt;default_key = 0;</div><div class='del'>-	priv-&gt;encryption_level = 0;</div><div class='del'>-	priv-&gt;exclude_unencrypted = 0;</div><div class='del'>-	priv-&gt;group_cipher_suite = priv-&gt;pairwise_cipher_suite = CIPHER_SUITE_NONE;</div><div class='del'>-	priv-&gt;use_wpa = 0;</div><div class='del'>-	memset(priv-&gt;wep_keys, 0, sizeof(priv-&gt;wep_keys));</div><div class='del'>-	memset(priv-&gt;wep_key_len, 0, sizeof(priv-&gt;wep_key_len));</div><div class='del'>-</div><div class='del'>-	priv-&gt;default_beacon_period = priv-&gt;beacon_period = 100;</div><div class='del'>-	priv-&gt;listen_interval = 1;</div><div class='del'>-</div><div class='del'>-	timer_setup(&amp;priv-&gt;management_timer, atmel_management_timer, 0);</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;irqlock);</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;timerlock);</div><div class='del'>-</div><div class='del'>-	dev-&gt;netdev_ops = &amp;atmel_netdev_ops;</div><div class='del'>-	dev-&gt;wireless_handlers = &amp;atmel_handler_def;</div><div class='del'>-	dev-&gt;irq = irq;</div><div class='del'>-	dev-&gt;base_addr = port;</div><div class='del'>-</div><div class='del'>-	/* MTU range: 68 - 2312 */</div><div class='del'>-	dev-&gt;min_mtu = 68;</div><div class='del'>-	dev-&gt;max_mtu = MAX_WIRELESS_BODY - ETH_FCS_LEN;</div><div class='del'>-</div><div class='del'>-	SET_NETDEV_DEV(dev, sys_dev);</div><div class='del'>-</div><div class='del'>-	if ((rc = request_irq(dev-&gt;irq, service_interrupt, IRQF_SHARED, dev-&gt;name, dev))) {</div><div class='del'>-		printk(KERN_ERR "%s: register interrupt %d failed, rc %d\n", dev-&gt;name, irq, rc);</div><div class='del'>-		goto err_out_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!request_region(dev-&gt;base_addr, 32,</div><div class='del'>-			    priv-&gt;bus_type == BUS_TYPE_PCCARD ?  "atmel_cs" : "atmel_pci")) {</div><div class='del'>-		goto err_out_irq;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (register_netdev(dev))</div><div class='del'>-		goto err_out_res;</div><div class='del'>-</div><div class='del'>-	if (!probe_atmel_card(dev)) {</div><div class='del'>-		unregister_netdev(dev);</div><div class='del'>-		goto err_out_res;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	netif_carrier_off(dev);</div><div class='del'>-</div><div class='del'>-	if (!proc_create_single_data("driver/atmel", 0, NULL, atmel_proc_show,</div><div class='del'>-			priv))</div><div class='del'>-		printk(KERN_WARNING "atmel: unable to create /proc entry.\n");</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "%s: Atmel at76c50x. Version %d.%d. MAC %pM\n",</div><div class='del'>-	       dev-&gt;name, DRIVER_MAJOR, DRIVER_MINOR, dev-&gt;dev_addr);</div><div class='del'>-</div><div class='del'>-	return dev;</div><div class='del'>-</div><div class='del'>-err_out_res:</div><div class='del'>-	release_region(dev-&gt;base_addr, 32);</div><div class='del'>-err_out_irq:</div><div class='del'>-	free_irq(dev-&gt;irq, dev);</div><div class='del'>-err_out_free:</div><div class='del'>-	free_netdev(dev);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(init_atmel_card);</div><div class='del'>-</div><div class='del'>-void stop_atmel_card(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	/* put a brick on it... */</div><div class='del'>-	if (priv-&gt;bus_type == BUS_TYPE_PCCARD)</div><div class='del'>-		atmel_write16(dev, GCR, 0x0060);</div><div class='del'>-	atmel_write16(dev, GCR, 0x0040);</div><div class='del'>-</div><div class='del'>-	del_timer_sync(&amp;priv-&gt;management_timer);</div><div class='del'>-	unregister_netdev(dev);</div><div class='del'>-	remove_proc_entry("driver/atmel", NULL);</div><div class='del'>-	free_irq(dev-&gt;irq, dev);</div><div class='del'>-	kfree(priv-&gt;firmware);</div><div class='del'>-	release_region(dev-&gt;base_addr, 32);</div><div class='del'>-	free_netdev(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(stop_atmel_card);</div><div class='del'>-</div><div class='del'>-static int atmel_set_essid(struct net_device *dev,</div><div class='del'>-			   struct iw_request_info *info,</div><div class='del'>-			   struct iw_point *dwrq,</div><div class='del'>-			   char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	/* Check if we asked for `any' */</div><div class='del'>-	if (dwrq-&gt;flags == 0) {</div><div class='del'>-		priv-&gt;connect_to_any_BSS = 1;</div><div class='del'>-	} else {</div><div class='del'>-		int index = (dwrq-&gt;flags &amp; IW_ENCODE_INDEX) - 1;</div><div class='del'>-</div><div class='del'>-		priv-&gt;connect_to_any_BSS = 0;</div><div class='del'>-</div><div class='del'>-		/* Check the size of the string */</div><div class='del'>-		if (dwrq-&gt;length &gt; MAX_SSID_LENGTH)</div><div class='del'>-			 return -E2BIG;</div><div class='del'>-		if (index != 0)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		memcpy(priv-&gt;new_SSID, extra, dwrq-&gt;length);</div><div class='del'>-		priv-&gt;new_SSID_size = dwrq-&gt;length;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EINPROGRESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_get_essid(struct net_device *dev,</div><div class='del'>-			   struct iw_request_info *info,</div><div class='del'>-			   struct iw_point *dwrq,</div><div class='del'>-			   char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	/* Get the current SSID */</div><div class='del'>-	if (priv-&gt;new_SSID_size != 0) {</div><div class='del'>-		memcpy(extra, priv-&gt;new_SSID, priv-&gt;new_SSID_size);</div><div class='del'>-		dwrq-&gt;length = priv-&gt;new_SSID_size;</div><div class='del'>-	} else {</div><div class='del'>-		memcpy(extra, priv-&gt;SSID, priv-&gt;SSID_size);</div><div class='del'>-		dwrq-&gt;length = priv-&gt;SSID_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dwrq-&gt;flags = !priv-&gt;connect_to_any_BSS; /* active */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_get_wap(struct net_device *dev,</div><div class='del'>-			 struct iw_request_info *info,</div><div class='del'>-			 struct sockaddr *awrq,</div><div class='del'>-			 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-	memcpy(awrq-&gt;sa_data, priv-&gt;CurrentBSSID, ETH_ALEN);</div><div class='del'>-	awrq-&gt;sa_family = ARPHRD_ETHER;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_set_encode(struct net_device *dev,</div><div class='del'>-			    struct iw_request_info *info,</div><div class='del'>-			    struct iw_point *dwrq,</div><div class='del'>-			    char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	/* Basic checking: do we have a key to set ?</div><div class='del'>-	 * Note : with the new API, it's impossible to get a NULL pointer.</div><div class='del'>-	 * Therefore, we need to check a key size == 0 instead.</div><div class='del'>-	 * New version of iwconfig properly set the IW_ENCODE_NOKEY flag</div><div class='del'>-	 * when no key is present (only change flags), but older versions</div><div class='del'>-	 * don't do it. - Jean II */</div><div class='del'>-	if (dwrq-&gt;length &gt; 0) {</div><div class='del'>-		int index = (dwrq-&gt;flags &amp; IW_ENCODE_INDEX) - 1;</div><div class='del'>-		int current_index = priv-&gt;default_key;</div><div class='del'>-		/* Check the size of the key */</div><div class='del'>-		if (dwrq-&gt;length &gt; 13) {</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		/* Check the index (none -&gt; use current) */</div><div class='del'>-		if (index &lt; 0 || index &gt;= 4)</div><div class='del'>-			index = current_index;</div><div class='del'>-		else</div><div class='del'>-			priv-&gt;default_key = index;</div><div class='del'>-		/* Set the length */</div><div class='del'>-		if (dwrq-&gt;length &gt; 5)</div><div class='del'>-			priv-&gt;wep_key_len[index] = 13;</div><div class='del'>-		else</div><div class='del'>-			if (dwrq-&gt;length &gt; 0)</div><div class='del'>-				priv-&gt;wep_key_len[index] = 5;</div><div class='del'>-			else</div><div class='del'>-				/* Disable the key */</div><div class='del'>-				priv-&gt;wep_key_len[index] = 0;</div><div class='del'>-		/* Check if the key is not marked as invalid */</div><div class='del'>-		if (!(dwrq-&gt;flags &amp; IW_ENCODE_NOKEY)) {</div><div class='del'>-			/* Cleanup */</div><div class='del'>-			memset(priv-&gt;wep_keys[index], 0, 13);</div><div class='del'>-			/* Copy the key in the driver */</div><div class='del'>-			memcpy(priv-&gt;wep_keys[index], extra, dwrq-&gt;length);</div><div class='del'>-		}</div><div class='del'>-		/* WE specify that if a valid key is set, encryption</div><div class='del'>-		 * should be enabled (user may turn it off later)</div><div class='del'>-		 * This is also how "iwconfig ethX key on" works */</div><div class='del'>-		if (index == current_index &amp;&amp;</div><div class='del'>-		    priv-&gt;wep_key_len[index] &gt; 0) {</div><div class='del'>-			priv-&gt;wep_is_on = 1;</div><div class='del'>-			priv-&gt;exclude_unencrypted = 1;</div><div class='del'>-			if (priv-&gt;wep_key_len[index] &gt; 5) {</div><div class='del'>-				priv-&gt;pairwise_cipher_suite = CIPHER_SUITE_WEP_128;</div><div class='del'>-				priv-&gt;encryption_level = 2;</div><div class='del'>-			} else {</div><div class='del'>-				priv-&gt;pairwise_cipher_suite = CIPHER_SUITE_WEP_64;</div><div class='del'>-				priv-&gt;encryption_level = 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Do we want to just set the transmit key index ? */</div><div class='del'>-		int index = (dwrq-&gt;flags &amp; IW_ENCODE_INDEX) - 1;</div><div class='del'>-		if (index &gt;= 0 &amp;&amp; index &lt; 4) {</div><div class='del'>-			priv-&gt;default_key = index;</div><div class='del'>-		} else</div><div class='del'>-			/* Don't complain if only change the mode */</div><div class='del'>-			if (!(dwrq-&gt;flags &amp; IW_ENCODE_MODE))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	/* Read the flags */</div><div class='del'>-	if (dwrq-&gt;flags &amp; IW_ENCODE_DISABLED) {</div><div class='del'>-		priv-&gt;wep_is_on = 0;</div><div class='del'>-		priv-&gt;encryption_level = 0;</div><div class='del'>-		priv-&gt;pairwise_cipher_suite = CIPHER_SUITE_NONE;</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;wep_is_on = 1;</div><div class='del'>-		if (priv-&gt;wep_key_len[priv-&gt;default_key] &gt; 5) {</div><div class='del'>-			priv-&gt;pairwise_cipher_suite = CIPHER_SUITE_WEP_128;</div><div class='del'>-			priv-&gt;encryption_level = 2;</div><div class='del'>-		} else {</div><div class='del'>-			priv-&gt;pairwise_cipher_suite = CIPHER_SUITE_WEP_64;</div><div class='del'>-			priv-&gt;encryption_level = 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (dwrq-&gt;flags &amp; IW_ENCODE_RESTRICTED)</div><div class='del'>-		priv-&gt;exclude_unencrypted = 1;</div><div class='del'>-	if (dwrq-&gt;flags &amp; IW_ENCODE_OPEN)</div><div class='del'>-		priv-&gt;exclude_unencrypted = 0;</div><div class='del'>-</div><div class='del'>-	return -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_get_encode(struct net_device *dev,</div><div class='del'>-			    struct iw_request_info *info,</div><div class='del'>-			    struct iw_point *dwrq,</div><div class='del'>-			    char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-	int index = (dwrq-&gt;flags &amp; IW_ENCODE_INDEX) - 1;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;wep_is_on)</div><div class='del'>-		dwrq-&gt;flags = IW_ENCODE_DISABLED;</div><div class='del'>-	else {</div><div class='del'>-		if (priv-&gt;exclude_unencrypted)</div><div class='del'>-			dwrq-&gt;flags = IW_ENCODE_RESTRICTED;</div><div class='del'>-		else</div><div class='del'>-			dwrq-&gt;flags = IW_ENCODE_OPEN;</div><div class='del'>-	}</div><div class='del'>-		/* Which key do we want ? -1 -&gt; tx index */</div><div class='del'>-	if (index &lt; 0 || index &gt;= 4)</div><div class='del'>-		index = priv-&gt;default_key;</div><div class='del'>-	dwrq-&gt;flags |= index + 1;</div><div class='del'>-	/* Copy the key to the user buffer */</div><div class='del'>-	dwrq-&gt;length = priv-&gt;wep_key_len[index];</div><div class='del'>-	if (dwrq-&gt;length &gt; 16) {</div><div class='del'>-		dwrq-&gt;length = 0;</div><div class='del'>-	} else {</div><div class='del'>-		memset(extra, 0, 16);</div><div class='del'>-		memcpy(extra, priv-&gt;wep_keys[index], dwrq-&gt;length);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_set_encodeext(struct net_device *dev,</div><div class='del'>-			    struct iw_request_info *info,</div><div class='del'>-			    union iwreq_data *wrqu,</div><div class='del'>-			    char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-	struct iw_point *encoding = &amp;wrqu-&gt;encoding;</div><div class='del'>-	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;</div><div class='del'>-	int idx, key_len, alg = ext-&gt;alg, set_key = 1;</div><div class='del'>-</div><div class='del'>-	/* Determine and validate the key index */</div><div class='del'>-	idx = encoding-&gt;flags &amp; IW_ENCODE_INDEX;</div><div class='del'>-	if (idx) {</div><div class='del'>-		if (idx &lt; 1 || idx &gt; 4)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		idx--;</div><div class='del'>-	} else</div><div class='del'>-		idx = priv-&gt;default_key;</div><div class='del'>-</div><div class='del'>-	if (encoding-&gt;flags &amp; IW_ENCODE_DISABLED)</div><div class='del'>-	    alg = IW_ENCODE_ALG_NONE;</div><div class='del'>-</div><div class='del'>-	if (ext-&gt;ext_flags &amp; IW_ENCODE_EXT_SET_TX_KEY) {</div><div class='del'>-		priv-&gt;default_key = idx;</div><div class='del'>-		set_key = ext-&gt;key_len &gt; 0 ? 1 : 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (set_key) {</div><div class='del'>-		/* Set the requested key first */</div><div class='del'>-		switch (alg) {</div><div class='del'>-		case IW_ENCODE_ALG_NONE:</div><div class='del'>-			priv-&gt;wep_is_on = 0;</div><div class='del'>-			priv-&gt;encryption_level = 0;</div><div class='del'>-			priv-&gt;pairwise_cipher_suite = CIPHER_SUITE_NONE;</div><div class='del'>-			break;</div><div class='del'>-		case IW_ENCODE_ALG_WEP:</div><div class='del'>-			if (ext-&gt;key_len &gt; 5) {</div><div class='del'>-				priv-&gt;wep_key_len[idx] = 13;</div><div class='del'>-				priv-&gt;pairwise_cipher_suite = CIPHER_SUITE_WEP_128;</div><div class='del'>-				priv-&gt;encryption_level = 2;</div><div class='del'>-			} else if (ext-&gt;key_len &gt; 0) {</div><div class='del'>-				priv-&gt;wep_key_len[idx] = 5;</div><div class='del'>-				priv-&gt;pairwise_cipher_suite = CIPHER_SUITE_WEP_64;</div><div class='del'>-				priv-&gt;encryption_level = 1;</div><div class='del'>-			} else {</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			priv-&gt;wep_is_on = 1;</div><div class='del'>-			memset(priv-&gt;wep_keys[idx], 0, 13);</div><div class='del'>-			key_len = min ((int)ext-&gt;key_len, priv-&gt;wep_key_len[idx]);</div><div class='del'>-			memcpy(priv-&gt;wep_keys[idx], ext-&gt;key, key_len);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EINPROGRESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_get_encodeext(struct net_device *dev,</div><div class='del'>-			    struct iw_request_info *info,</div><div class='del'>-			    union iwreq_data *wrqu,</div><div class='del'>-			    char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-	struct iw_point *encoding = &amp;wrqu-&gt;encoding;</div><div class='del'>-	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;</div><div class='del'>-	int idx, max_key_len;</div><div class='del'>-</div><div class='del'>-	max_key_len = encoding-&gt;length - sizeof(*ext);</div><div class='del'>-	if (max_key_len &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	idx = encoding-&gt;flags &amp; IW_ENCODE_INDEX;</div><div class='del'>-	if (idx) {</div><div class='del'>-		if (idx &lt; 1 || idx &gt; 4)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		idx--;</div><div class='del'>-	} else</div><div class='del'>-		idx = priv-&gt;default_key;</div><div class='del'>-</div><div class='del'>-	encoding-&gt;flags = idx + 1;</div><div class='del'>-	memset(ext, 0, sizeof(*ext));</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;wep_is_on) {</div><div class='del'>-		ext-&gt;alg = IW_ENCODE_ALG_NONE;</div><div class='del'>-		ext-&gt;key_len = 0;</div><div class='del'>-		encoding-&gt;flags |= IW_ENCODE_DISABLED;</div><div class='del'>-	} else {</div><div class='del'>-		if (priv-&gt;encryption_level &gt; 0)</div><div class='del'>-			ext-&gt;alg = IW_ENCODE_ALG_WEP;</div><div class='del'>-		else</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		ext-&gt;key_len = priv-&gt;wep_key_len[idx];</div><div class='del'>-		memcpy(ext-&gt;key, priv-&gt;wep_keys[idx], ext-&gt;key_len);</div><div class='del'>-		encoding-&gt;flags |= IW_ENCODE_ENABLED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_set_auth(struct net_device *dev,</div><div class='del'>-			       struct iw_request_info *info,</div><div class='del'>-			       union iwreq_data *wrqu, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-	struct iw_param *param = &amp;wrqu-&gt;param;</div><div class='del'>-</div><div class='del'>-	switch (param-&gt;flags &amp; IW_AUTH_INDEX) {</div><div class='del'>-	case IW_AUTH_WPA_VERSION:</div><div class='del'>-	case IW_AUTH_CIPHER_PAIRWISE:</div><div class='del'>-	case IW_AUTH_CIPHER_GROUP:</div><div class='del'>-	case IW_AUTH_KEY_MGMT:</div><div class='del'>-	case IW_AUTH_RX_UNENCRYPTED_EAPOL:</div><div class='del'>-	case IW_AUTH_PRIVACY_INVOKED:</div><div class='del'>-		/*</div><div class='del'>-		 * atmel does not use these parameters</div><div class='del'>-		 */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_DROP_UNENCRYPTED:</div><div class='del'>-		priv-&gt;exclude_unencrypted = param-&gt;value ? 1 : 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_80211_AUTH_ALG: {</div><div class='del'>-			if (param-&gt;value &amp; IW_AUTH_ALG_SHARED_KEY) {</div><div class='del'>-				priv-&gt;exclude_unencrypted = 1;</div><div class='del'>-			} else if (param-&gt;value &amp; IW_AUTH_ALG_OPEN_SYSTEM) {</div><div class='del'>-				priv-&gt;exclude_unencrypted = 0;</div><div class='del'>-			} else</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_WPA_ENABLED:</div><div class='del'>-		/* Silently accept disable of WPA */</div><div class='del'>-		if (param-&gt;value &gt; 0)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-	return -EINPROGRESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_get_auth(struct net_device *dev,</div><div class='del'>-			       struct iw_request_info *info,</div><div class='del'>-			       union iwreq_data *wrqu, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-	struct iw_param *param = &amp;wrqu-&gt;param;</div><div class='del'>-</div><div class='del'>-	switch (param-&gt;flags &amp; IW_AUTH_INDEX) {</div><div class='del'>-	case IW_AUTH_DROP_UNENCRYPTED:</div><div class='del'>-		param-&gt;value = priv-&gt;exclude_unencrypted;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_80211_AUTH_ALG:</div><div class='del'>-		if (priv-&gt;exclude_unencrypted == 1)</div><div class='del'>-			param-&gt;value = IW_AUTH_ALG_SHARED_KEY;</div><div class='del'>-		else</div><div class='del'>-			param-&gt;value = IW_AUTH_ALG_OPEN_SYSTEM;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_WPA_ENABLED:</div><div class='del'>-		param-&gt;value = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int atmel_get_name(struct net_device *dev,</div><div class='del'>-			  struct iw_request_info *info,</div><div class='del'>-			  char *cwrq,</div><div class='del'>-			  char *extra)</div><div class='del'>-{</div><div class='del'>-	strcpy(cwrq, "IEEE 802.11-DS");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_set_rate(struct net_device *dev,</div><div class='del'>-			  struct iw_request_info *info,</div><div class='del'>-			  struct iw_param *vwrq,</div><div class='del'>-			  char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (vwrq-&gt;fixed == 0) {</div><div class='del'>-		priv-&gt;tx_rate = 3;</div><div class='del'>-		priv-&gt;auto_tx_rate = 1;</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;auto_tx_rate = 0;</div><div class='del'>-</div><div class='del'>-		/* Which type of value ? */</div><div class='del'>-		if ((vwrq-&gt;value &lt; 4) &amp;&amp; (vwrq-&gt;value &gt;= 0)) {</div><div class='del'>-			/* Setting by rate index */</div><div class='del'>-			priv-&gt;tx_rate = vwrq-&gt;value;</div><div class='del'>-		} else {</div><div class='del'>-		/* Setting by frequency value */</div><div class='del'>-			switch (vwrq-&gt;value) {</div><div class='del'>-			case  1000000:</div><div class='del'>-				priv-&gt;tx_rate = 0;</div><div class='del'>-				break;</div><div class='del'>-			case  2000000:</div><div class='del'>-				priv-&gt;tx_rate = 1;</div><div class='del'>-				break;</div><div class='del'>-			case  5500000:</div><div class='del'>-				priv-&gt;tx_rate = 2;</div><div class='del'>-				break;</div><div class='del'>-			case 11000000:</div><div class='del'>-				priv-&gt;tx_rate = 3;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EINPROGRESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_set_mode(struct net_device *dev,</div><div class='del'>-			  struct iw_request_info *info,</div><div class='del'>-			  __u32 *uwrq,</div><div class='del'>-			  char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (*uwrq != IW_MODE_ADHOC &amp;&amp; *uwrq != IW_MODE_INFRA)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;operating_mode = *uwrq;</div><div class='del'>-	return -EINPROGRESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_get_mode(struct net_device *dev,</div><div class='del'>-			  struct iw_request_info *info,</div><div class='del'>-			  __u32 *uwrq,</div><div class='del'>-			  char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	*uwrq = priv-&gt;operating_mode;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_get_rate(struct net_device *dev,</div><div class='del'>-			 struct iw_request_info *info,</div><div class='del'>-			 struct iw_param *vwrq,</div><div class='del'>-			 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;auto_tx_rate) {</div><div class='del'>-		vwrq-&gt;fixed = 0;</div><div class='del'>-		vwrq-&gt;value = 11000000;</div><div class='del'>-	} else {</div><div class='del'>-		vwrq-&gt;fixed = 1;</div><div class='del'>-		switch (priv-&gt;tx_rate) {</div><div class='del'>-		case 0:</div><div class='del'>-			vwrq-&gt;value =  1000000;</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			vwrq-&gt;value =  2000000;</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			vwrq-&gt;value =  5500000;</div><div class='del'>-			break;</div><div class='del'>-		case 3:</div><div class='del'>-			vwrq-&gt;value = 11000000;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_set_power(struct net_device *dev,</div><div class='del'>-			   struct iw_request_info *info,</div><div class='del'>-			   struct iw_param *vwrq,</div><div class='del'>-			   char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-	priv-&gt;power_mode = vwrq-&gt;disabled ? 0 : 1;</div><div class='del'>-	return -EINPROGRESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_get_power(struct net_device *dev,</div><div class='del'>-			   struct iw_request_info *info,</div><div class='del'>-			   struct iw_param *vwrq,</div><div class='del'>-			   char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-	vwrq-&gt;disabled = priv-&gt;power_mode ? 0 : 1;</div><div class='del'>-	vwrq-&gt;flags = IW_POWER_ON;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_set_retry(struct net_device *dev,</div><div class='del'>-			   struct iw_request_info *info,</div><div class='del'>-			   struct iw_param *vwrq,</div><div class='del'>-			   char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (!vwrq-&gt;disabled &amp;&amp; (vwrq-&gt;flags &amp; IW_RETRY_LIMIT)) {</div><div class='del'>-		if (vwrq-&gt;flags &amp; IW_RETRY_LONG)</div><div class='del'>-			priv-&gt;long_retry = vwrq-&gt;value;</div><div class='del'>-		else if (vwrq-&gt;flags &amp; IW_RETRY_SHORT)</div><div class='del'>-			priv-&gt;short_retry = vwrq-&gt;value;</div><div class='del'>-		else {</div><div class='del'>-			/* No modifier : set both */</div><div class='del'>-			priv-&gt;long_retry = vwrq-&gt;value;</div><div class='del'>-			priv-&gt;short_retry = vwrq-&gt;value;</div><div class='del'>-		}</div><div class='del'>-		return -EINPROGRESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_get_retry(struct net_device *dev,</div><div class='del'>-			   struct iw_request_info *info,</div><div class='del'>-			   struct iw_param *vwrq,</div><div class='del'>-			   char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	vwrq-&gt;disabled = 0;      /* Can't be disabled */</div><div class='del'>-</div><div class='del'>-	/* Note : by default, display the short retry number */</div><div class='del'>-	if (vwrq-&gt;flags &amp; IW_RETRY_LONG) {</div><div class='del'>-		vwrq-&gt;flags = IW_RETRY_LIMIT | IW_RETRY_LONG;</div><div class='del'>-		vwrq-&gt;value = priv-&gt;long_retry;</div><div class='del'>-	} else {</div><div class='del'>-		vwrq-&gt;flags = IW_RETRY_LIMIT;</div><div class='del'>-		vwrq-&gt;value = priv-&gt;short_retry;</div><div class='del'>-		if (priv-&gt;long_retry != priv-&gt;short_retry)</div><div class='del'>-			vwrq-&gt;flags |= IW_RETRY_SHORT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_set_rts(struct net_device *dev,</div><div class='del'>-			 struct iw_request_info *info,</div><div class='del'>-			 struct iw_param *vwrq,</div><div class='del'>-			 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-	int rthr = vwrq-&gt;value;</div><div class='del'>-</div><div class='del'>-	if (vwrq-&gt;disabled)</div><div class='del'>-		rthr = 2347;</div><div class='del'>-	if ((rthr &lt; 0) || (rthr &gt; 2347)) {</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	priv-&gt;rts_threshold = rthr;</div><div class='del'>-</div><div class='del'>-	return -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_get_rts(struct net_device *dev,</div><div class='del'>-			 struct iw_request_info *info,</div><div class='del'>-			 struct iw_param *vwrq,</div><div class='del'>-			 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	vwrq-&gt;value = priv-&gt;rts_threshold;</div><div class='del'>-	vwrq-&gt;disabled = (vwrq-&gt;value &gt;= 2347);</div><div class='del'>-	vwrq-&gt;fixed = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_set_frag(struct net_device *dev,</div><div class='del'>-			  struct iw_request_info *info,</div><div class='del'>-			  struct iw_param *vwrq,</div><div class='del'>-			  char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-	int fthr = vwrq-&gt;value;</div><div class='del'>-</div><div class='del'>-	if (vwrq-&gt;disabled)</div><div class='del'>-		fthr = 2346;</div><div class='del'>-	if ((fthr &lt; 256) || (fthr &gt; 2346)) {</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	fthr &amp;= ~0x1;	/* Get an even value - is it really needed ??? */</div><div class='del'>-	priv-&gt;frag_threshold = fthr;</div><div class='del'>-</div><div class='del'>-	return -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_get_frag(struct net_device *dev,</div><div class='del'>-			  struct iw_request_info *info,</div><div class='del'>-			  struct iw_param *vwrq,</div><div class='del'>-			  char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	vwrq-&gt;value = priv-&gt;frag_threshold;</div><div class='del'>-	vwrq-&gt;disabled = (vwrq-&gt;value &gt;= 2346);</div><div class='del'>-	vwrq-&gt;fixed = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_set_freq(struct net_device *dev,</div><div class='del'>-			  struct iw_request_info *info,</div><div class='del'>-			  struct iw_freq *fwrq,</div><div class='del'>-			  char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-	int rc = -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-</div><div class='del'>-	/* If setting by frequency, convert to a channel */</div><div class='del'>-	if (fwrq-&gt;e == 1) {</div><div class='del'>-		int f = fwrq-&gt;m / 100000;</div><div class='del'>-</div><div class='del'>-		/* Hack to fall through... */</div><div class='del'>-		fwrq-&gt;e = 0;</div><div class='del'>-		fwrq-&gt;m = ieee80211_frequency_to_channel(f);</div><div class='del'>-	}</div><div class='del'>-	/* Setting by channel number */</div><div class='del'>-	if (fwrq-&gt;m &lt; 0 || fwrq-&gt;m &gt; 1000 || fwrq-&gt;e &gt; 0)</div><div class='del'>-		rc = -EOPNOTSUPP;</div><div class='del'>-	else {</div><div class='del'>-		int channel = fwrq-&gt;m;</div><div class='del'>-		if (atmel_validate_channel(priv, channel) == 0) {</div><div class='del'>-			priv-&gt;channel = channel;</div><div class='del'>-		} else {</div><div class='del'>-			rc = -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_get_freq(struct net_device *dev,</div><div class='del'>-			  struct iw_request_info *info,</div><div class='del'>-			  struct iw_freq *fwrq,</div><div class='del'>-			  char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	fwrq-&gt;m = priv-&gt;channel;</div><div class='del'>-	fwrq-&gt;e = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_set_scan(struct net_device *dev,</div><div class='del'>-			  struct iw_request_info *info,</div><div class='del'>-			  struct iw_point *dwrq,</div><div class='del'>-			  char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* Note : you may have realised that, as this is a SET operation,</div><div class='del'>-	 * this is privileged and therefore a normal user can't</div><div class='del'>-	 * perform scanning.</div><div class='del'>-	 * This is not an error, while the device perform scanning,</div><div class='del'>-	 * traffic doesn't flow, so it's a perfect DoS...</div><div class='del'>-	 * Jean II */</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;station_state == STATION_STATE_DOWN)</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	/* Timeout old surveys. */</div><div class='del'>-	if (time_after(jiffies, priv-&gt;last_survey + 20 * HZ))</div><div class='del'>-		priv-&gt;site_survey_state = SITE_SURVEY_IDLE;</div><div class='del'>-	priv-&gt;last_survey = jiffies;</div><div class='del'>-</div><div class='del'>-	/* Initiate a scan command */</div><div class='del'>-	if (priv-&gt;site_survey_state == SITE_SURVEY_IN_PROGRESS)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	del_timer_sync(&amp;priv-&gt;management_timer);</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;irqlock, flags);</div><div class='del'>-</div><div class='del'>-	priv-&gt;site_survey_state = SITE_SURVEY_IN_PROGRESS;</div><div class='del'>-	priv-&gt;fast_scan = 0;</div><div class='del'>-	atmel_scan(priv, 0);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;irqlock, flags);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_get_scan(struct net_device *dev,</div><div class='del'>-			  struct iw_request_info *info,</div><div class='del'>-			  struct iw_point *dwrq,</div><div class='del'>-			  char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-	int i;</div><div class='del'>-	char *current_ev = extra;</div><div class='del'>-	struct iw_event	iwe;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;site_survey_state != SITE_SURVEY_COMPLETED)</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;BSS_list_entries; i++) {</div><div class='del'>-		iwe.cmd = SIOCGIWAP;</div><div class='del'>-		iwe.u.ap_addr.sa_family = ARPHRD_ETHER;</div><div class='del'>-		memcpy(iwe.u.ap_addr.sa_data, priv-&gt;BSSinfo[i].BSSID, ETH_ALEN);</div><div class='del'>-		current_ev = iwe_stream_add_event(info, current_ev,</div><div class='del'>-						  extra + IW_SCAN_MAX_DATA,</div><div class='del'>-						  &amp;iwe, IW_EV_ADDR_LEN);</div><div class='del'>-</div><div class='del'>-		iwe.u.data.length =  priv-&gt;BSSinfo[i].SSIDsize;</div><div class='del'>-		if (iwe.u.data.length &gt; 32)</div><div class='del'>-			iwe.u.data.length = 32;</div><div class='del'>-		iwe.cmd = SIOCGIWESSID;</div><div class='del'>-		iwe.u.data.flags = 1;</div><div class='del'>-		current_ev = iwe_stream_add_point(info, current_ev,</div><div class='del'>-						  extra + IW_SCAN_MAX_DATA,</div><div class='del'>-						  &amp;iwe, priv-&gt;BSSinfo[i].SSID);</div><div class='del'>-</div><div class='del'>-		iwe.cmd = SIOCGIWMODE;</div><div class='del'>-		iwe.u.mode = priv-&gt;BSSinfo[i].BSStype;</div><div class='del'>-		current_ev = iwe_stream_add_event(info, current_ev,</div><div class='del'>-						  extra + IW_SCAN_MAX_DATA,</div><div class='del'>-						  &amp;iwe, IW_EV_UINT_LEN);</div><div class='del'>-</div><div class='del'>-		iwe.cmd = SIOCGIWFREQ;</div><div class='del'>-		iwe.u.freq.m = priv-&gt;BSSinfo[i].channel;</div><div class='del'>-		iwe.u.freq.e = 0;</div><div class='del'>-		current_ev = iwe_stream_add_event(info, current_ev,</div><div class='del'>-						  extra + IW_SCAN_MAX_DATA,</div><div class='del'>-						  &amp;iwe, IW_EV_FREQ_LEN);</div><div class='del'>-</div><div class='del'>-		/* Add quality statistics */</div><div class='del'>-		iwe.cmd = IWEVQUAL;</div><div class='del'>-		iwe.u.qual.level = priv-&gt;BSSinfo[i].RSSI;</div><div class='del'>-		iwe.u.qual.qual  = iwe.u.qual.level;</div><div class='del'>-		/* iwe.u.qual.noise  = SOMETHING */</div><div class='del'>-		current_ev = iwe_stream_add_event(info, current_ev,</div><div class='del'>-						  extra + IW_SCAN_MAX_DATA,</div><div class='del'>-						  &amp;iwe, IW_EV_QUAL_LEN);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		iwe.cmd = SIOCGIWENCODE;</div><div class='del'>-		if (priv-&gt;BSSinfo[i].UsingWEP)</div><div class='del'>-			iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;</div><div class='del'>-		else</div><div class='del'>-			iwe.u.data.flags = IW_ENCODE_DISABLED;</div><div class='del'>-		iwe.u.data.length = 0;</div><div class='del'>-		current_ev = iwe_stream_add_point(info, current_ev,</div><div class='del'>-						  extra + IW_SCAN_MAX_DATA,</div><div class='del'>-						  &amp;iwe, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Length of data */</div><div class='del'>-	dwrq-&gt;length = (current_ev - extra);</div><div class='del'>-	dwrq-&gt;flags = 0;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_get_range(struct net_device *dev,</div><div class='del'>-			   struct iw_request_info *info,</div><div class='del'>-			   struct iw_point *dwrq,</div><div class='del'>-			   char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-	struct iw_range *range = (struct iw_range *) extra;</div><div class='del'>-	int k, i, j;</div><div class='del'>-</div><div class='del'>-	dwrq-&gt;length = sizeof(struct iw_range);</div><div class='del'>-	memset(range, 0, sizeof(struct iw_range));</div><div class='del'>-	range-&gt;min_nwid = 0x0000;</div><div class='del'>-	range-&gt;max_nwid = 0x0000;</div><div class='del'>-	range-&gt;num_channels = 0;</div><div class='del'>-	for (j = 0; j &lt; ARRAY_SIZE(channel_table); j++)</div><div class='del'>-		if (priv-&gt;reg_domain == channel_table[j].reg_domain) {</div><div class='del'>-			range-&gt;num_channels = channel_table[j].max - channel_table[j].min + 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	if (range-&gt;num_channels != 0) {</div><div class='del'>-		for (k = 0, i = channel_table[j].min; i &lt;= channel_table[j].max; i++) {</div><div class='del'>-			range-&gt;freq[k].i = i; /* List index */</div><div class='del'>-</div><div class='del'>-			/* Values in MHz -&gt; * 10^5 * 10 */</div><div class='del'>-			range-&gt;freq[k].m = 100000 *</div><div class='del'>-			 ieee80211_channel_to_frequency(i, NL80211_BAND_2GHZ);</div><div class='del'>-			range-&gt;freq[k++].e = 1;</div><div class='del'>-		}</div><div class='del'>-		range-&gt;num_frequency = k;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	range-&gt;max_qual.qual = 100;</div><div class='del'>-	range-&gt;max_qual.level = 100;</div><div class='del'>-	range-&gt;max_qual.noise = 0;</div><div class='del'>-	range-&gt;max_qual.updated = IW_QUAL_NOISE_INVALID;</div><div class='del'>-</div><div class='del'>-	range-&gt;avg_qual.qual = 50;</div><div class='del'>-	range-&gt;avg_qual.level = 50;</div><div class='del'>-	range-&gt;avg_qual.noise = 0;</div><div class='del'>-	range-&gt;avg_qual.updated = IW_QUAL_NOISE_INVALID;</div><div class='del'>-</div><div class='del'>-	range-&gt;sensitivity = 0;</div><div class='del'>-</div><div class='del'>-	range-&gt;bitrate[0] =  1000000;</div><div class='del'>-	range-&gt;bitrate[1] =  2000000;</div><div class='del'>-	range-&gt;bitrate[2] =  5500000;</div><div class='del'>-	range-&gt;bitrate[3] = 11000000;</div><div class='del'>-	range-&gt;num_bitrates = 4;</div><div class='del'>-</div><div class='del'>-	range-&gt;min_rts = 0;</div><div class='del'>-	range-&gt;max_rts = 2347;</div><div class='del'>-	range-&gt;min_frag = 256;</div><div class='del'>-	range-&gt;max_frag = 2346;</div><div class='del'>-</div><div class='del'>-	range-&gt;encoding_size[0] = 5;</div><div class='del'>-	range-&gt;encoding_size[1] = 13;</div><div class='del'>-	range-&gt;num_encoding_sizes = 2;</div><div class='del'>-	range-&gt;max_encoding_tokens = 4;</div><div class='del'>-</div><div class='del'>-	range-&gt;pmp_flags = IW_POWER_ON;</div><div class='del'>-	range-&gt;pmt_flags = IW_POWER_ON;</div><div class='del'>-	range-&gt;pm_capa = 0;</div><div class='del'>-</div><div class='del'>-	range-&gt;we_version_source = WIRELESS_EXT;</div><div class='del'>-	range-&gt;we_version_compiled = WIRELESS_EXT;</div><div class='del'>-	range-&gt;retry_capa = IW_RETRY_LIMIT ;</div><div class='del'>-	range-&gt;retry_flags = IW_RETRY_LIMIT;</div><div class='del'>-	range-&gt;r_time_flags = 0;</div><div class='del'>-	range-&gt;min_retry = 1;</div><div class='del'>-	range-&gt;max_retry = 65535;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_set_wap(struct net_device *dev,</div><div class='del'>-			 struct iw_request_info *info,</div><div class='del'>-			 struct sockaddr *awrq,</div><div class='del'>-			 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-	int i;</div><div class='del'>-	static const u8 any[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };</div><div class='del'>-	static const u8 off[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (awrq-&gt;sa_family != ARPHRD_ETHER)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!memcmp(any, awrq-&gt;sa_data, 6) ||</div><div class='del'>-	    !memcmp(off, awrq-&gt;sa_data, 6)) {</div><div class='del'>-		del_timer_sync(&amp;priv-&gt;management_timer);</div><div class='del'>-		spin_lock_irqsave(&amp;priv-&gt;irqlock, flags);</div><div class='del'>-		atmel_scan(priv, 1);</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;irqlock, flags);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;BSS_list_entries; i++) {</div><div class='del'>-		if (memcmp(priv-&gt;BSSinfo[i].BSSID, awrq-&gt;sa_data, 6) == 0) {</div><div class='del'>-			if (!priv-&gt;wep_is_on &amp;&amp; priv-&gt;BSSinfo[i].UsingWEP) {</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			} else if  (priv-&gt;wep_is_on &amp;&amp; !priv-&gt;BSSinfo[i].UsingWEP) {</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			} else {</div><div class='del'>-				del_timer_sync(&amp;priv-&gt;management_timer);</div><div class='del'>-				spin_lock_irqsave(&amp;priv-&gt;irqlock, flags);</div><div class='del'>-				atmel_join_bss(priv, i);</div><div class='del'>-				spin_unlock_irqrestore(&amp;priv-&gt;irqlock, flags);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_config_commit(struct net_device *dev,</div><div class='del'>-			       struct iw_request_info *info,	/* NULL */</div><div class='del'>-			       void *zwrq,			/* NULL */</div><div class='del'>-			       char *extra)			/* NULL */</div><div class='del'>-{</div><div class='del'>-	return atmel_open(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const iw_handler atmel_handler[] =</div><div class='del'>-{</div><div class='del'>-	(iw_handler) atmel_config_commit,	/* SIOCSIWCOMMIT */</div><div class='del'>-	(iw_handler) atmel_get_name,		/* SIOCGIWNAME */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCSIWNWID */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCGIWNWID */</div><div class='del'>-	(iw_handler) atmel_set_freq,		/* SIOCSIWFREQ */</div><div class='del'>-	(iw_handler) atmel_get_freq,		/* SIOCGIWFREQ */</div><div class='del'>-	(iw_handler) atmel_set_mode,		/* SIOCSIWMODE */</div><div class='del'>-	(iw_handler) atmel_get_mode,		/* SIOCGIWMODE */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCSIWSENS */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCGIWSENS */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCSIWRANGE */</div><div class='del'>-	(iw_handler) atmel_get_range,           /* SIOCGIWRANGE */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCSIWPRIV */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCGIWPRIV */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCSIWSTATS */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCGIWSTATS */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCSIWSPY */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCGIWSPY */</div><div class='del'>-	(iw_handler) NULL,			/* -- hole -- */</div><div class='del'>-	(iw_handler) NULL,			/* -- hole -- */</div><div class='del'>-	(iw_handler) atmel_set_wap,		/* SIOCSIWAP */</div><div class='del'>-	(iw_handler) atmel_get_wap,		/* SIOCGIWAP */</div><div class='del'>-	(iw_handler) NULL,			/* -- hole -- */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCGIWAPLIST */</div><div class='del'>-	(iw_handler) atmel_set_scan,		/* SIOCSIWSCAN */</div><div class='del'>-	(iw_handler) atmel_get_scan,		/* SIOCGIWSCAN */</div><div class='del'>-	(iw_handler) atmel_set_essid,		/* SIOCSIWESSID */</div><div class='del'>-	(iw_handler) atmel_get_essid,		/* SIOCGIWESSID */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCSIWNICKN */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCGIWNICKN */</div><div class='del'>-	(iw_handler) NULL,			/* -- hole -- */</div><div class='del'>-	(iw_handler) NULL,			/* -- hole -- */</div><div class='del'>-	(iw_handler) atmel_set_rate,		/* SIOCSIWRATE */</div><div class='del'>-	(iw_handler) atmel_get_rate,		/* SIOCGIWRATE */</div><div class='del'>-	(iw_handler) atmel_set_rts,		/* SIOCSIWRTS */</div><div class='del'>-	(iw_handler) atmel_get_rts,		/* SIOCGIWRTS */</div><div class='del'>-	(iw_handler) atmel_set_frag,		/* SIOCSIWFRAG */</div><div class='del'>-	(iw_handler) atmel_get_frag,		/* SIOCGIWFRAG */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCSIWTXPOW */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCGIWTXPOW */</div><div class='del'>-	(iw_handler) atmel_set_retry,		/* SIOCSIWRETRY */</div><div class='del'>-	(iw_handler) atmel_get_retry,		/* SIOCGIWRETRY */</div><div class='del'>-	(iw_handler) atmel_set_encode,		/* SIOCSIWENCODE */</div><div class='del'>-	(iw_handler) atmel_get_encode,		/* SIOCGIWENCODE */</div><div class='del'>-	(iw_handler) atmel_set_power,		/* SIOCSIWPOWER */</div><div class='del'>-	(iw_handler) atmel_get_power,		/* SIOCGIWPOWER */</div><div class='del'>-	(iw_handler) NULL,			/* -- hole -- */</div><div class='del'>-	(iw_handler) NULL,			/* -- hole -- */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCSIWGENIE */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCGIWGENIE */</div><div class='del'>-	(iw_handler) atmel_set_auth,		/* SIOCSIWAUTH */</div><div class='del'>-	(iw_handler) atmel_get_auth,		/* SIOCGIWAUTH */</div><div class='del'>-	(iw_handler) atmel_set_encodeext,	/* SIOCSIWENCODEEXT */</div><div class='del'>-	(iw_handler) atmel_get_encodeext,	/* SIOCGIWENCODEEXT */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCSIWPMKSA */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const iw_handler atmel_private_handler[] =</div><div class='del'>-{</div><div class='del'>-	NULL,				/* SIOCIWFIRSTPRIV */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct atmel_priv_ioctl {</div><div class='del'>-	char id[32];</div><div class='del'>-	unsigned char __user *data;</div><div class='del'>-	unsigned short len;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define ATMELFWL	SIOCIWFIRSTPRIV</div><div class='del'>-#define ATMELIDIFC	ATMELFWL + 1</div><div class='del'>-#define ATMELRD		ATMELFWL + 2</div><div class='del'>-#define ATMELMAGIC 0x51807</div><div class='del'>-#define REGDOMAINSZ 20</div><div class='del'>-</div><div class='del'>-static const struct iw_priv_args atmel_private_args[] = {</div><div class='del'>-	{</div><div class='del'>-		.cmd = ATMELFWL,</div><div class='del'>-		.set_args = IW_PRIV_TYPE_BYTE</div><div class='del'>-				| IW_PRIV_SIZE_FIXED</div><div class='del'>-				| sizeof(struct atmel_priv_ioctl),</div><div class='del'>-		.get_args = IW_PRIV_TYPE_NONE,</div><div class='del'>-		.name = "atmelfwl"</div><div class='del'>-	}, {</div><div class='del'>-		.cmd = ATMELIDIFC,</div><div class='del'>-		.set_args = IW_PRIV_TYPE_NONE,</div><div class='del'>-		.get_args = IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,</div><div class='del'>-		.name = "atmelidifc"</div><div class='del'>-	}, {</div><div class='del'>-		.cmd = ATMELRD,</div><div class='del'>-		.set_args = IW_PRIV_TYPE_CHAR | REGDOMAINSZ,</div><div class='del'>-		.get_args = IW_PRIV_TYPE_NONE,</div><div class='del'>-		.name = "regdomain"</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct iw_handler_def atmel_handler_def = {</div><div class='del'>-	.num_standard	= ARRAY_SIZE(atmel_handler),</div><div class='del'>-	.num_private	= ARRAY_SIZE(atmel_private_handler),</div><div class='del'>-	.num_private_args = ARRAY_SIZE(atmel_private_args),</div><div class='del'>-	.standard	= (iw_handler *) atmel_handler,</div><div class='del'>-	.private	= (iw_handler *) atmel_private_handler,</div><div class='del'>-	.private_args	= (struct iw_priv_args *) atmel_private_args,</div><div class='del'>-	.get_wireless_stats = atmel_get_wireless_stats</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='del'>-{</div><div class='del'>-	int i, rc = 0;</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-	struct atmel_priv_ioctl com;</div><div class='del'>-	struct iwreq *wrq = (struct iwreq *) rq;</div><div class='del'>-	unsigned char *new_firmware;</div><div class='del'>-	char domain[REGDOMAINSZ + 1];</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case ATMELIDIFC:</div><div class='del'>-		wrq-&gt;u.param.value = ATMELMAGIC;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ATMELFWL:</div><div class='del'>-		if (copy_from_user(&amp;com, rq-&gt;ifr_data, sizeof(com))) {</div><div class='del'>-			rc = -EFAULT;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!capable(CAP_NET_ADMIN)) {</div><div class='del'>-			rc = -EPERM;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		new_firmware = memdup_user(com.data, com.len);</div><div class='del'>-		if (IS_ERR(new_firmware)) {</div><div class='del'>-			rc = PTR_ERR(new_firmware);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		kfree(priv-&gt;firmware);</div><div class='del'>-</div><div class='del'>-		priv-&gt;firmware = new_firmware;</div><div class='del'>-		priv-&gt;firmware_length = com.len;</div><div class='del'>-		strncpy(priv-&gt;firmware_id, com.id, 31);</div><div class='del'>-		priv-&gt;firmware_id[31] = '\0';</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ATMELRD:</div><div class='del'>-		if (copy_from_user(domain, rq-&gt;ifr_data, REGDOMAINSZ)) {</div><div class='del'>-			rc = -EFAULT;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!capable(CAP_NET_ADMIN)) {</div><div class='del'>-			rc = -EPERM;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		domain[REGDOMAINSZ] = 0;</div><div class='del'>-		rc = -EINVAL;</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(channel_table); i++) {</div><div class='del'>-			if (!strcasecmp(channel_table[i].name, domain)) {</div><div class='del'>-				priv-&gt;config_reg_domain = channel_table[i].reg_domain;</div><div class='del'>-				rc = 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (rc == 0 &amp;&amp;  priv-&gt;station_state != STATION_STATE_DOWN)</div><div class='del'>-			rc = atmel_open(dev);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		rc = -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct auth_body {</div><div class='del'>-	__le16 alg;</div><div class='del'>-	__le16 trans_seq;</div><div class='del'>-	__le16 status;</div><div class='del'>-	u8 el_id;</div><div class='del'>-	u8 chall_text_len;</div><div class='del'>-	u8 chall_text[253];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void atmel_enter_state(struct atmel_private *priv, int new_state)</div><div class='del'>-{</div><div class='del'>-	int old_state = priv-&gt;station_state;</div><div class='del'>-</div><div class='del'>-	if (new_state == old_state)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	priv-&gt;station_state = new_state;</div><div class='del'>-</div><div class='del'>-	if (new_state == STATION_STATE_READY) {</div><div class='del'>-		netif_start_queue(priv-&gt;dev);</div><div class='del'>-		netif_carrier_on(priv-&gt;dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (old_state == STATION_STATE_READY) {</div><div class='del'>-		netif_carrier_off(priv-&gt;dev);</div><div class='del'>-		if (netif_running(priv-&gt;dev))</div><div class='del'>-			netif_stop_queue(priv-&gt;dev);</div><div class='del'>-		priv-&gt;last_beacon_timestamp = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void atmel_scan(struct atmel_private *priv, int specific_ssid)</div><div class='del'>-{</div><div class='del'>-	struct {</div><div class='del'>-		u8 BSSID[ETH_ALEN];</div><div class='del'>-		u8 SSID[MAX_SSID_LENGTH];</div><div class='del'>-		u8 scan_type;</div><div class='del'>-		u8 channel;</div><div class='del'>-		__le16 BSS_type;</div><div class='del'>-		__le16 min_channel_time;</div><div class='del'>-		__le16 max_channel_time;</div><div class='del'>-		u8 options;</div><div class='del'>-		u8 SSID_size;</div><div class='del'>-	} cmd;</div><div class='del'>-</div><div class='del'>-	eth_broadcast_addr(cmd.BSSID);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;fast_scan) {</div><div class='del'>-		cmd.SSID_size = priv-&gt;SSID_size;</div><div class='del'>-		memcpy(cmd.SSID, priv-&gt;SSID, priv-&gt;SSID_size);</div><div class='del'>-		cmd.min_channel_time = cpu_to_le16(10);</div><div class='del'>-		cmd.max_channel_time = cpu_to_le16(50);</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;BSS_list_entries = 0;</div><div class='del'>-		cmd.SSID_size = 0;</div><div class='del'>-		cmd.min_channel_time = cpu_to_le16(10);</div><div class='del'>-		cmd.max_channel_time = cpu_to_le16(120);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cmd.options = 0;</div><div class='del'>-</div><div class='del'>-	if (!specific_ssid)</div><div class='del'>-		cmd.options |= SCAN_OPTIONS_SITE_SURVEY;</div><div class='del'>-</div><div class='del'>-	cmd.channel = (priv-&gt;channel &amp; 0x7f);</div><div class='del'>-	cmd.scan_type = SCAN_TYPE_ACTIVE;</div><div class='del'>-	cmd.BSS_type = cpu_to_le16(priv-&gt;operating_mode == IW_MODE_ADHOC ?</div><div class='del'>-		BSS_TYPE_AD_HOC : BSS_TYPE_INFRASTRUCTURE);</div><div class='del'>-</div><div class='del'>-	atmel_send_command(priv, CMD_Scan, &amp;cmd, sizeof(cmd));</div><div class='del'>-</div><div class='del'>-	/* This must come after all hardware access to avoid being messed up</div><div class='del'>-	   by stuff happening in interrupt context after we leave STATE_DOWN */</div><div class='del'>-	atmel_enter_state(priv, STATION_STATE_SCANNING);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void join(struct atmel_private *priv, int type)</div><div class='del'>-{</div><div class='del'>-	struct {</div><div class='del'>-		u8 BSSID[6];</div><div class='del'>-		u8 SSID[MAX_SSID_LENGTH];</div><div class='del'>-		u8 BSS_type; /* this is a short in a scan command - weird */</div><div class='del'>-		u8 channel;</div><div class='del'>-		__le16 timeout;</div><div class='del'>-		u8 SSID_size;</div><div class='del'>-		u8 reserved;</div><div class='del'>-	} cmd;</div><div class='del'>-</div><div class='del'>-	cmd.SSID_size = priv-&gt;SSID_size;</div><div class='del'>-	memcpy(cmd.SSID, priv-&gt;SSID, priv-&gt;SSID_size);</div><div class='del'>-	memcpy(cmd.BSSID, priv-&gt;CurrentBSSID, ETH_ALEN);</div><div class='del'>-	cmd.channel = (priv-&gt;channel &amp; 0x7f);</div><div class='del'>-	cmd.BSS_type = type;</div><div class='del'>-	cmd.timeout = cpu_to_le16(2000);</div><div class='del'>-</div><div class='del'>-	atmel_send_command(priv, CMD_Join, &amp;cmd, sizeof(cmd));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void start(struct atmel_private *priv, int type)</div><div class='del'>-{</div><div class='del'>-	struct {</div><div class='del'>-		u8 BSSID[6];</div><div class='del'>-		u8 SSID[MAX_SSID_LENGTH];</div><div class='del'>-		u8 BSS_type;</div><div class='del'>-		u8 channel;</div><div class='del'>-		u8 SSID_size;</div><div class='del'>-		u8 reserved[3];</div><div class='del'>-	} cmd;</div><div class='del'>-</div><div class='del'>-	cmd.SSID_size = priv-&gt;SSID_size;</div><div class='del'>-	memcpy(cmd.SSID, priv-&gt;SSID, priv-&gt;SSID_size);</div><div class='del'>-	memcpy(cmd.BSSID, priv-&gt;BSSID, ETH_ALEN);</div><div class='del'>-	cmd.BSS_type = type;</div><div class='del'>-	cmd.channel = (priv-&gt;channel &amp; 0x7f);</div><div class='del'>-</div><div class='del'>-	atmel_send_command(priv, CMD_Start, &amp;cmd, sizeof(cmd));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void handle_beacon_probe(struct atmel_private *priv, u16 capability,</div><div class='del'>-				u8 channel)</div><div class='del'>-{</div><div class='del'>-	int rejoin = 0;</div><div class='del'>-	int new = capability &amp; WLAN_CAPABILITY_SHORT_PREAMBLE ?</div><div class='del'>-		SHORT_PREAMBLE : LONG_PREAMBLE;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;preamble != new) {</div><div class='del'>-		priv-&gt;preamble = new;</div><div class='del'>-		rejoin = 1;</div><div class='del'>-		atmel_set_mib8(priv, Local_Mib_Type, LOCAL_MIB_PREAMBLE_TYPE, new);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;channel != channel) {</div><div class='del'>-		priv-&gt;channel = channel;</div><div class='del'>-		rejoin = 1;</div><div class='del'>-		atmel_set_mib8(priv, Phy_Mib_Type, PHY_MIB_CHANNEL_POS, channel);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rejoin) {</div><div class='del'>-		priv-&gt;station_is_associated = 0;</div><div class='del'>-		atmel_enter_state(priv, STATION_STATE_JOINNING);</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;operating_mode == IW_MODE_INFRA)</div><div class='del'>-			join(priv, BSS_TYPE_INFRASTRUCTURE);</div><div class='del'>-		else</div><div class='del'>-			join(priv, BSS_TYPE_AD_HOC);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void send_authentication_request(struct atmel_private *priv, u16 system,</div><div class='del'>-					u8 *challenge, int challenge_len)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hdr header;</div><div class='del'>-	struct auth_body auth;</div><div class='del'>-</div><div class='del'>-	header.frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_AUTH);</div><div class='del'>-	header.duration_id = cpu_to_le16(0x8000);</div><div class='del'>-	header.seq_ctrl = 0;</div><div class='del'>-	memcpy(header.addr1, priv-&gt;CurrentBSSID, ETH_ALEN);</div><div class='del'>-	memcpy(header.addr2, priv-&gt;dev-&gt;dev_addr, ETH_ALEN);</div><div class='del'>-	memcpy(header.addr3, priv-&gt;CurrentBSSID, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;wep_is_on &amp;&amp; priv-&gt;CurrentAuthentTransactionSeqNum != 1)</div><div class='del'>-		/* no WEP for authentication frames with TrSeqNo 1 */</div><div class='del'>-		header.frame_control |=  cpu_to_le16(IEEE80211_FCTL_PROTECTED);</div><div class='del'>-</div><div class='del'>-	auth.alg = cpu_to_le16(system);</div><div class='del'>-</div><div class='del'>-	auth.status = 0;</div><div class='del'>-	auth.trans_seq = cpu_to_le16(priv-&gt;CurrentAuthentTransactionSeqNum);</div><div class='del'>-	priv-&gt;ExpectedAuthentTransactionSeqNum = priv-&gt;CurrentAuthentTransactionSeqNum+1;</div><div class='del'>-	priv-&gt;CurrentAuthentTransactionSeqNum += 2;</div><div class='del'>-</div><div class='del'>-	if (challenge_len != 0)	{</div><div class='del'>-		auth.el_id = 16; /* challenge_text */</div><div class='del'>-		auth.chall_text_len = challenge_len;</div><div class='del'>-		memcpy(auth.chall_text, challenge, challenge_len);</div><div class='del'>-		atmel_transmit_management_frame(priv, &amp;header, (u8 *)&amp;auth, 8 + challenge_len);</div><div class='del'>-	} else {</div><div class='del'>-		atmel_transmit_management_frame(priv, &amp;header, (u8 *)&amp;auth, 6);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void send_association_request(struct atmel_private *priv, int is_reassoc)</div><div class='del'>-{</div><div class='del'>-	u8 *ssid_el_p;</div><div class='del'>-	int bodysize;</div><div class='del'>-	struct ieee80211_hdr header;</div><div class='del'>-	struct ass_req_format {</div><div class='del'>-		__le16 capability;</div><div class='del'>-		__le16 listen_interval;</div><div class='del'>-		u8 ap[ETH_ALEN]; /* nothing after here directly accessible */</div><div class='del'>-		u8 ssid_el_id;</div><div class='del'>-		u8 ssid_len;</div><div class='del'>-		u8 ssid[MAX_SSID_LENGTH];</div><div class='del'>-		u8 sup_rates_el_id;</div><div class='del'>-		u8 sup_rates_len;</div><div class='del'>-		u8 rates[4];</div><div class='del'>-	} body;</div><div class='del'>-</div><div class='del'>-	header.frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |</div><div class='del'>-		(is_reassoc ? IEEE80211_STYPE_REASSOC_REQ : IEEE80211_STYPE_ASSOC_REQ));</div><div class='del'>-	header.duration_id = cpu_to_le16(0x8000);</div><div class='del'>-	header.seq_ctrl = 0;</div><div class='del'>-</div><div class='del'>-	memcpy(header.addr1, priv-&gt;CurrentBSSID, ETH_ALEN);</div><div class='del'>-	memcpy(header.addr2, priv-&gt;dev-&gt;dev_addr, ETH_ALEN);</div><div class='del'>-	memcpy(header.addr3, priv-&gt;CurrentBSSID, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	body.capability = cpu_to_le16(WLAN_CAPABILITY_ESS);</div><div class='del'>-	if (priv-&gt;wep_is_on)</div><div class='del'>-		body.capability |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY);</div><div class='del'>-	if (priv-&gt;preamble == SHORT_PREAMBLE)</div><div class='del'>-		body.capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_PREAMBLE);</div><div class='del'>-</div><div class='del'>-	body.listen_interval = cpu_to_le16(priv-&gt;listen_interval * priv-&gt;beacon_period);</div><div class='del'>-</div><div class='del'>-	/* current AP address - only in reassoc frame */</div><div class='del'>-	if (is_reassoc) {</div><div class='del'>-		memcpy(body.ap, priv-&gt;CurrentBSSID, ETH_ALEN);</div><div class='del'>-		ssid_el_p = &amp;body.ssid_el_id;</div><div class='del'>-		bodysize = 18 + priv-&gt;SSID_size;</div><div class='del'>-	} else {</div><div class='del'>-		ssid_el_p = &amp;body.ap[0];</div><div class='del'>-		bodysize = 12 + priv-&gt;SSID_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ssid_el_p[0] = WLAN_EID_SSID;</div><div class='del'>-	ssid_el_p[1] = priv-&gt;SSID_size;</div><div class='del'>-	memcpy(ssid_el_p + 2, priv-&gt;SSID, priv-&gt;SSID_size);</div><div class='del'>-	ssid_el_p[2 + priv-&gt;SSID_size] = WLAN_EID_SUPP_RATES;</div><div class='del'>-	ssid_el_p[3 + priv-&gt;SSID_size] = 4; /* len of supported rates */</div><div class='del'>-	memcpy(ssid_el_p + 4 + priv-&gt;SSID_size, atmel_basic_rates, 4);</div><div class='del'>-</div><div class='del'>-	atmel_transmit_management_frame(priv, &amp;header, (void *)&amp;body, bodysize);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int is_frame_from_current_bss(struct atmel_private *priv,</div><div class='del'>-				     struct ieee80211_hdr *header)</div><div class='del'>-{</div><div class='del'>-	if (le16_to_cpu(header-&gt;frame_control) &amp; IEEE80211_FCTL_FROMDS)</div><div class='del'>-		return memcmp(header-&gt;addr3, priv-&gt;CurrentBSSID, 6) == 0;</div><div class='del'>-	else</div><div class='del'>-		return memcmp(header-&gt;addr2, priv-&gt;CurrentBSSID, 6) == 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int retrieve_bss(struct atmel_private *priv)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int max_rssi = -128;</div><div class='del'>-	int max_index = -1;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;BSS_list_entries == 0)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;connect_to_any_BSS) {</div><div class='del'>-		/* Select a BSS with the max-RSSI but of the same type and of</div><div class='del'>-		   the same WEP mode and that it is not marked as 'bad' (i.e.</div><div class='del'>-		   we had previously failed to connect to this BSS with the</div><div class='del'>-		   settings that we currently use) */</div><div class='del'>-		priv-&gt;current_BSS = 0;</div><div class='del'>-		for (i = 0; i &lt; priv-&gt;BSS_list_entries; i++) {</div><div class='del'>-			if (priv-&gt;operating_mode == priv-&gt;BSSinfo[i].BSStype &amp;&amp;</div><div class='del'>-			    ((!priv-&gt;wep_is_on &amp;&amp; !priv-&gt;BSSinfo[i].UsingWEP) ||</div><div class='del'>-			     (priv-&gt;wep_is_on &amp;&amp; priv-&gt;BSSinfo[i].UsingWEP)) &amp;&amp;</div><div class='del'>-			    !(priv-&gt;BSSinfo[i].channel &amp; 0x80)) {</div><div class='del'>-				max_rssi = priv-&gt;BSSinfo[i].RSSI;</div><div class='del'>-				priv-&gt;current_BSS = max_index = i;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		return max_index;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;BSS_list_entries; i++) {</div><div class='del'>-		if (priv-&gt;SSID_size == priv-&gt;BSSinfo[i].SSIDsize &amp;&amp;</div><div class='del'>-		    memcmp(priv-&gt;SSID, priv-&gt;BSSinfo[i].SSID, priv-&gt;SSID_size) == 0 &amp;&amp;</div><div class='del'>-		    priv-&gt;operating_mode == priv-&gt;BSSinfo[i].BSStype &amp;&amp;</div><div class='del'>-		    atmel_validate_channel(priv, priv-&gt;BSSinfo[i].channel) == 0) {</div><div class='del'>-			if (priv-&gt;BSSinfo[i].RSSI &gt;= max_rssi) {</div><div class='del'>-				max_rssi = priv-&gt;BSSinfo[i].RSSI;</div><div class='del'>-				max_index = i;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return max_index;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void store_bss_info(struct atmel_private *priv,</div><div class='del'>-			   struct ieee80211_hdr *header, u16 capability,</div><div class='del'>-			   u16 beacon_period, u8 channel, u8 rssi, u8 ssid_len,</div><div class='del'>-			   u8 *ssid, int is_beacon)</div><div class='del'>-{</div><div class='del'>-	u8 *bss = capability &amp; WLAN_CAPABILITY_ESS ? header-&gt;addr2 : header-&gt;addr3;</div><div class='del'>-	int i, index;</div><div class='del'>-</div><div class='del'>-	for (index = -1, i = 0; i &lt; priv-&gt;BSS_list_entries; i++)</div><div class='del'>-		if (memcmp(bss, priv-&gt;BSSinfo[i].BSSID, ETH_ALEN) == 0)</div><div class='del'>-			index = i;</div><div class='del'>-</div><div class='del'>-	/* If we process a probe and an entry from this BSS exists</div><div class='del'>-	   we will update the BSS entry with the info from this BSS.</div><div class='del'>-	   If we process a beacon we will only update RSSI */</div><div class='del'>-</div><div class='del'>-	if (index == -1) {</div><div class='del'>-		if (priv-&gt;BSS_list_entries == MAX_BSS_ENTRIES)</div><div class='del'>-			return;</div><div class='del'>-		index = priv-&gt;BSS_list_entries++;</div><div class='del'>-		memcpy(priv-&gt;BSSinfo[index].BSSID, bss, ETH_ALEN);</div><div class='del'>-		priv-&gt;BSSinfo[index].RSSI = rssi;</div><div class='del'>-	} else {</div><div class='del'>-		if (rssi &gt; priv-&gt;BSSinfo[index].RSSI)</div><div class='del'>-			priv-&gt;BSSinfo[index].RSSI = rssi;</div><div class='del'>-		if (is_beacon)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;BSSinfo[index].channel = channel;</div><div class='del'>-	priv-&gt;BSSinfo[index].beacon_period = beacon_period;</div><div class='del'>-	priv-&gt;BSSinfo[index].UsingWEP = capability &amp; WLAN_CAPABILITY_PRIVACY;</div><div class='del'>-	memcpy(priv-&gt;BSSinfo[index].SSID, ssid, ssid_len);</div><div class='del'>-	priv-&gt;BSSinfo[index].SSIDsize = ssid_len;</div><div class='del'>-</div><div class='del'>-	if (capability &amp; WLAN_CAPABILITY_IBSS)</div><div class='del'>-		priv-&gt;BSSinfo[index].BSStype = IW_MODE_ADHOC;</div><div class='del'>-	else if (capability &amp; WLAN_CAPABILITY_ESS)</div><div class='del'>-		priv-&gt;BSSinfo[index].BSStype = IW_MODE_INFRA;</div><div class='del'>-</div><div class='del'>-	priv-&gt;BSSinfo[index].preamble = capability &amp; WLAN_CAPABILITY_SHORT_PREAMBLE ?</div><div class='del'>-		SHORT_PREAMBLE : LONG_PREAMBLE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void authenticate(struct atmel_private *priv, u16 frame_len)</div><div class='del'>-{</div><div class='del'>-	struct auth_body *auth = (struct auth_body *)priv-&gt;rx_buf;</div><div class='del'>-	u16 status = le16_to_cpu(auth-&gt;status);</div><div class='del'>-	u16 trans_seq_no = le16_to_cpu(auth-&gt;trans_seq);</div><div class='del'>-	u16 system = le16_to_cpu(auth-&gt;alg);</div><div class='del'>-</div><div class='del'>-	if (status == WLAN_STATUS_SUCCESS &amp;&amp; !priv-&gt;wep_is_on) {</div><div class='del'>-		/* no WEP */</div><div class='del'>-		if (priv-&gt;station_was_associated) {</div><div class='del'>-			atmel_enter_state(priv, STATION_STATE_REASSOCIATING);</div><div class='del'>-			send_association_request(priv, 1);</div><div class='del'>-			return;</div><div class='del'>-		} else {</div><div class='del'>-			atmel_enter_state(priv, STATION_STATE_ASSOCIATING);</div><div class='del'>-			send_association_request(priv, 0);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (status == WLAN_STATUS_SUCCESS &amp;&amp; priv-&gt;wep_is_on) {</div><div class='del'>-		int should_associate = 0;</div><div class='del'>-		/* WEP */</div><div class='del'>-		if (trans_seq_no != priv-&gt;ExpectedAuthentTransactionSeqNum)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		if (system == WLAN_AUTH_OPEN) {</div><div class='del'>-			if (trans_seq_no == 0x0002) {</div><div class='del'>-				should_associate = 1;</div><div class='del'>-			}</div><div class='del'>-		} else if (system == WLAN_AUTH_SHARED_KEY) {</div><div class='del'>-			if (trans_seq_no == 0x0002 &amp;&amp;</div><div class='del'>-			    auth-&gt;el_id == WLAN_EID_CHALLENGE) {</div><div class='del'>-				send_authentication_request(priv, system, auth-&gt;chall_text, auth-&gt;chall_text_len);</div><div class='del'>-				return;</div><div class='del'>-			} else if (trans_seq_no == 0x0004) {</div><div class='del'>-				should_associate = 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (should_associate) {</div><div class='del'>-			if (priv-&gt;station_was_associated) {</div><div class='del'>-				atmel_enter_state(priv, STATION_STATE_REASSOCIATING);</div><div class='del'>-				send_association_request(priv, 1);</div><div class='del'>-				return;</div><div class='del'>-			} else {</div><div class='del'>-				atmel_enter_state(priv, STATION_STATE_ASSOCIATING);</div><div class='del'>-				send_association_request(priv, 0);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (status == WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG) {</div><div class='del'>-		/* Flip back and forth between WEP auth modes until the max</div><div class='del'>-		 * authentication tries has been exceeded.</div><div class='del'>-		 */</div><div class='del'>-		if (system == WLAN_AUTH_OPEN) {</div><div class='del'>-			priv-&gt;CurrentAuthentTransactionSeqNum = 0x001;</div><div class='del'>-			priv-&gt;exclude_unencrypted = 1;</div><div class='del'>-			send_authentication_request(priv, WLAN_AUTH_SHARED_KEY, NULL, 0);</div><div class='del'>-			return;</div><div class='del'>-		} else if (system == WLAN_AUTH_SHARED_KEY</div><div class='del'>-			   &amp;&amp; priv-&gt;wep_is_on) {</div><div class='del'>-			priv-&gt;CurrentAuthentTransactionSeqNum = 0x001;</div><div class='del'>-			priv-&gt;exclude_unencrypted = 0;</div><div class='del'>-			send_authentication_request(priv, WLAN_AUTH_OPEN, NULL, 0);</div><div class='del'>-			return;</div><div class='del'>-		} else if (priv-&gt;connect_to_any_BSS) {</div><div class='del'>-			int bss_index;</div><div class='del'>-</div><div class='del'>-			priv-&gt;BSSinfo[(int)(priv-&gt;current_BSS)].channel |= 0x80;</div><div class='del'>-</div><div class='del'>-			if ((bss_index  = retrieve_bss(priv)) != -1) {</div><div class='del'>-				atmel_join_bss(priv, bss_index);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;AuthenticationRequestRetryCnt = 0;</div><div class='del'>-	atmel_enter_state(priv,  STATION_STATE_MGMT_ERROR);</div><div class='del'>-	priv-&gt;station_is_associated = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void associate(struct atmel_private *priv, u16 frame_len, u16 subtype)</div><div class='del'>-{</div><div class='del'>-	struct ass_resp_format {</div><div class='del'>-		__le16 capability;</div><div class='del'>-		__le16 status;</div><div class='del'>-		__le16 ass_id;</div><div class='del'>-		u8 el_id;</div><div class='del'>-		u8 length;</div><div class='del'>-		u8 rates[4];</div><div class='del'>-	} *ass_resp = (struct ass_resp_format *)priv-&gt;rx_buf;</div><div class='del'>-</div><div class='del'>-	u16 status = le16_to_cpu(ass_resp-&gt;status);</div><div class='del'>-	u16 ass_id = le16_to_cpu(ass_resp-&gt;ass_id);</div><div class='del'>-	u16 rates_len = ass_resp-&gt;length &gt; 4 ? 4 : ass_resp-&gt;length;</div><div class='del'>-</div><div class='del'>-	union iwreq_data wrqu;</div><div class='del'>-</div><div class='del'>-	if (frame_len &lt; 8 + rates_len)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (status == WLAN_STATUS_SUCCESS) {</div><div class='del'>-		if (subtype == IEEE80211_STYPE_ASSOC_RESP)</div><div class='del'>-			priv-&gt;AssociationRequestRetryCnt = 0;</div><div class='del'>-		else</div><div class='del'>-			priv-&gt;ReAssociationRequestRetryCnt = 0;</div><div class='del'>-</div><div class='del'>-		atmel_set_mib16(priv, Mac_Mgmt_Mib_Type,</div><div class='del'>-				MAC_MGMT_MIB_STATION_ID_POS, ass_id &amp; 0x3fff);</div><div class='del'>-		atmel_set_mib(priv, Phy_Mib_Type,</div><div class='del'>-			      PHY_MIB_RATE_SET_POS, ass_resp-&gt;rates, rates_len);</div><div class='del'>-		if (priv-&gt;power_mode == 0) {</div><div class='del'>-			priv-&gt;listen_interval = 1;</div><div class='del'>-			atmel_set_mib8(priv, Mac_Mgmt_Mib_Type,</div><div class='del'>-				       MAC_MGMT_MIB_PS_MODE_POS, ACTIVE_MODE);</div><div class='del'>-			atmel_set_mib16(priv, Mac_Mgmt_Mib_Type,</div><div class='del'>-					MAC_MGMT_MIB_LISTEN_INTERVAL_POS, 1);</div><div class='del'>-		} else {</div><div class='del'>-			priv-&gt;listen_interval = 2;</div><div class='del'>-			atmel_set_mib8(priv, Mac_Mgmt_Mib_Type,</div><div class='del'>-				       MAC_MGMT_MIB_PS_MODE_POS,  PS_MODE);</div><div class='del'>-			atmel_set_mib16(priv, Mac_Mgmt_Mib_Type,</div><div class='del'>-					MAC_MGMT_MIB_LISTEN_INTERVAL_POS, 2);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		priv-&gt;station_is_associated = 1;</div><div class='del'>-		priv-&gt;station_was_associated = 1;</div><div class='del'>-		atmel_enter_state(priv, STATION_STATE_READY);</div><div class='del'>-</div><div class='del'>-		/* Send association event to userspace */</div><div class='del'>-		wrqu.data.length = 0;</div><div class='del'>-		wrqu.data.flags = 0;</div><div class='del'>-		memcpy(wrqu.ap_addr.sa_data, priv-&gt;CurrentBSSID, ETH_ALEN);</div><div class='del'>-		wrqu.ap_addr.sa_family = ARPHRD_ETHER;</div><div class='del'>-		wireless_send_event(priv-&gt;dev, SIOCGIWAP, &amp;wrqu, NULL);</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (subtype == IEEE80211_STYPE_ASSOC_RESP &amp;&amp;</div><div class='del'>-	    status != WLAN_STATUS_ASSOC_DENIED_RATES &amp;&amp;</div><div class='del'>-	    status != WLAN_STATUS_CAPS_UNSUPPORTED &amp;&amp;</div><div class='del'>-	    priv-&gt;AssociationRequestRetryCnt &lt; MAX_ASSOCIATION_RETRIES) {</div><div class='del'>-		mod_timer(&amp;priv-&gt;management_timer, jiffies + MGMT_JIFFIES);</div><div class='del'>-		priv-&gt;AssociationRequestRetryCnt++;</div><div class='del'>-		send_association_request(priv, 0);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (subtype == IEEE80211_STYPE_REASSOC_RESP &amp;&amp;</div><div class='del'>-	    status != WLAN_STATUS_ASSOC_DENIED_RATES &amp;&amp;</div><div class='del'>-	    status != WLAN_STATUS_CAPS_UNSUPPORTED &amp;&amp;</div><div class='del'>-	    priv-&gt;ReAssociationRequestRetryCnt &lt; MAX_ASSOCIATION_RETRIES) {</div><div class='del'>-		mod_timer(&amp;priv-&gt;management_timer, jiffies + MGMT_JIFFIES);</div><div class='del'>-		priv-&gt;ReAssociationRequestRetryCnt++;</div><div class='del'>-		send_association_request(priv, 1);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	atmel_enter_state(priv,  STATION_STATE_MGMT_ERROR);</div><div class='del'>-	priv-&gt;station_is_associated = 0;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;connect_to_any_BSS) {</div><div class='del'>-		int bss_index;</div><div class='del'>-		priv-&gt;BSSinfo[(int)(priv-&gt;current_BSS)].channel |= 0x80;</div><div class='del'>-</div><div class='del'>-		if ((bss_index = retrieve_bss(priv)) != -1)</div><div class='del'>-			atmel_join_bss(priv, bss_index);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void atmel_join_bss(struct atmel_private *priv, int bss_index)</div><div class='del'>-{</div><div class='del'>-	struct bss_info *bss =  &amp;priv-&gt;BSSinfo[bss_index];</div><div class='del'>-</div><div class='del'>-	memcpy(priv-&gt;CurrentBSSID, bss-&gt;BSSID, ETH_ALEN);</div><div class='del'>-	memcpy(priv-&gt;SSID, bss-&gt;SSID, priv-&gt;SSID_size = bss-&gt;SSIDsize);</div><div class='del'>-</div><div class='del'>-	/* The WPA stuff cares about the current AP address */</div><div class='del'>-	if (priv-&gt;use_wpa)</div><div class='del'>-		build_wpa_mib(priv);</div><div class='del'>-</div><div class='del'>-	/* When switching to AdHoc turn OFF Power Save if needed */</div><div class='del'>-</div><div class='del'>-	if (bss-&gt;BSStype == IW_MODE_ADHOC &amp;&amp;</div><div class='del'>-	    priv-&gt;operating_mode != IW_MODE_ADHOC &amp;&amp;</div><div class='del'>-	    priv-&gt;power_mode) {</div><div class='del'>-		priv-&gt;power_mode = 0;</div><div class='del'>-		priv-&gt;listen_interval = 1;</div><div class='del'>-		atmel_set_mib8(priv, Mac_Mgmt_Mib_Type,</div><div class='del'>-			       MAC_MGMT_MIB_PS_MODE_POS,  ACTIVE_MODE);</div><div class='del'>-		atmel_set_mib16(priv, Mac_Mgmt_Mib_Type,</div><div class='del'>-				MAC_MGMT_MIB_LISTEN_INTERVAL_POS, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;operating_mode = bss-&gt;BSStype;</div><div class='del'>-	priv-&gt;channel = bss-&gt;channel &amp; 0x7f;</div><div class='del'>-	priv-&gt;beacon_period = bss-&gt;beacon_period;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;preamble != bss-&gt;preamble) {</div><div class='del'>-		priv-&gt;preamble = bss-&gt;preamble;</div><div class='del'>-		atmel_set_mib8(priv, Local_Mib_Type,</div><div class='del'>-			       LOCAL_MIB_PREAMBLE_TYPE, bss-&gt;preamble);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;wep_is_on &amp;&amp; bss-&gt;UsingWEP) {</div><div class='del'>-		atmel_enter_state(priv, STATION_STATE_MGMT_ERROR);</div><div class='del'>-		priv-&gt;station_is_associated = 0;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;wep_is_on &amp;&amp; !bss-&gt;UsingWEP) {</div><div class='del'>-		atmel_enter_state(priv, STATION_STATE_MGMT_ERROR);</div><div class='del'>-		priv-&gt;station_is_associated = 0;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	atmel_enter_state(priv, STATION_STATE_JOINNING);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;operating_mode == IW_MODE_INFRA)</div><div class='del'>-		join(priv, BSS_TYPE_INFRASTRUCTURE);</div><div class='del'>-	else</div><div class='del'>-		join(priv, BSS_TYPE_AD_HOC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void restart_search(struct atmel_private *priv)</div><div class='del'>-{</div><div class='del'>-	int bss_index;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;connect_to_any_BSS) {</div><div class='del'>-		atmel_scan(priv, 1);</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;BSSinfo[(int)(priv-&gt;current_BSS)].channel |= 0x80;</div><div class='del'>-</div><div class='del'>-		if ((bss_index = retrieve_bss(priv)) != -1)</div><div class='del'>-			atmel_join_bss(priv, bss_index);</div><div class='del'>-		else</div><div class='del'>-			atmel_scan(priv, 0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void smooth_rssi(struct atmel_private *priv, u8 rssi)</div><div class='del'>-{</div><div class='del'>-	u8 old = priv-&gt;wstats.qual.level;</div><div class='del'>-	u8 max_rssi = 42; /* 502-rmfd-revd max by experiment, default for now */</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;firmware_type) {</div><div class='del'>-	case ATMEL_FW_TYPE_502E:</div><div class='del'>-		max_rssi = 63; /* 502-rmfd-reve max by experiment */</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rssi = rssi * 100 / max_rssi;</div><div class='del'>-	if ((rssi + old) % 2)</div><div class='del'>-		priv-&gt;wstats.qual.level = (rssi + old) / 2 + 1;</div><div class='del'>-	else</div><div class='del'>-		priv-&gt;wstats.qual.level = (rssi + old) / 2;</div><div class='del'>-	priv-&gt;wstats.qual.updated |= IW_QUAL_LEVEL_UPDATED;</div><div class='del'>-	priv-&gt;wstats.qual.updated &amp;= ~IW_QUAL_LEVEL_INVALID;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void atmel_smooth_qual(struct atmel_private *priv)</div><div class='del'>-{</div><div class='del'>-	unsigned long time_diff = (jiffies - priv-&gt;last_qual) / HZ;</div><div class='del'>-	while (time_diff--) {</div><div class='del'>-		priv-&gt;last_qual += HZ;</div><div class='del'>-		priv-&gt;wstats.qual.qual = priv-&gt;wstats.qual.qual / 2;</div><div class='del'>-		priv-&gt;wstats.qual.qual +=</div><div class='del'>-			priv-&gt;beacons_this_sec * priv-&gt;beacon_period * (priv-&gt;wstats.qual.level + 100) / 4000;</div><div class='del'>-		priv-&gt;beacons_this_sec = 0;</div><div class='del'>-	}</div><div class='del'>-	priv-&gt;wstats.qual.updated |= IW_QUAL_QUAL_UPDATED;</div><div class='del'>-	priv-&gt;wstats.qual.updated &amp;= ~IW_QUAL_QUAL_INVALID;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* deals with incoming management frames. */</div><div class='del'>-static void atmel_management_frame(struct atmel_private *priv,</div><div class='del'>-				   struct ieee80211_hdr *header,</div><div class='del'>-				   u16 frame_len, u8 rssi)</div><div class='del'>-{</div><div class='del'>-	u16 subtype;</div><div class='del'>-</div><div class='del'>-	subtype = le16_to_cpu(header-&gt;frame_control) &amp; IEEE80211_FCTL_STYPE;</div><div class='del'>-	switch (subtype) {</div><div class='del'>-	case IEEE80211_STYPE_BEACON:</div><div class='del'>-	case IEEE80211_STYPE_PROBE_RESP:</div><div class='del'>-</div><div class='del'>-		/* beacon frame has multiple variable-length fields -</div><div class='del'>-		   never let an engineer loose with a data structure design. */</div><div class='del'>-		{</div><div class='del'>-			struct beacon_format {</div><div class='del'>-				__le64 timestamp;</div><div class='del'>-				__le16 interval;</div><div class='del'>-				__le16 capability;</div><div class='del'>-				u8 ssid_el_id;</div><div class='del'>-				u8 ssid_length;</div><div class='del'>-				/* ssid here */</div><div class='del'>-				u8 rates_el_id;</div><div class='del'>-				u8 rates_length;</div><div class='del'>-				/* rates here */</div><div class='del'>-				u8 ds_el_id;</div><div class='del'>-				u8 ds_length;</div><div class='del'>-				/* ds here */</div><div class='del'>-			} *beacon = (struct beacon_format *)priv-&gt;rx_buf;</div><div class='del'>-</div><div class='del'>-			u8 channel, rates_length, ssid_length;</div><div class='del'>-			u64 timestamp = le64_to_cpu(beacon-&gt;timestamp);</div><div class='del'>-			u16 beacon_interval = le16_to_cpu(beacon-&gt;interval);</div><div class='del'>-			u16 capability = le16_to_cpu(beacon-&gt;capability);</div><div class='del'>-			u8 *beaconp = priv-&gt;rx_buf;</div><div class='del'>-			ssid_length = beacon-&gt;ssid_length;</div><div class='del'>-			/* this blows chunks. */</div><div class='del'>-			if (frame_len &lt; 14 || frame_len &lt; ssid_length + 15)</div><div class='del'>-				return;</div><div class='del'>-			rates_length = beaconp[beacon-&gt;ssid_length + 15];</div><div class='del'>-			if (frame_len &lt; ssid_length + rates_length + 18)</div><div class='del'>-				return;</div><div class='del'>-			if (ssid_length &gt;  MAX_SSID_LENGTH)</div><div class='del'>-				return;</div><div class='del'>-			channel = beaconp[ssid_length + rates_length + 18];</div><div class='del'>-</div><div class='del'>-			if (priv-&gt;station_state == STATION_STATE_READY) {</div><div class='del'>-				smooth_rssi(priv, rssi);</div><div class='del'>-				if (is_frame_from_current_bss(priv, header)) {</div><div class='del'>-					priv-&gt;beacons_this_sec++;</div><div class='del'>-					atmel_smooth_qual(priv);</div><div class='del'>-					if (priv-&gt;last_beacon_timestamp) {</div><div class='del'>-						/* Note truncate this to 32 bits - kernel can't divide a long long */</div><div class='del'>-						u32 beacon_delay = timestamp - priv-&gt;last_beacon_timestamp;</div><div class='del'>-						int beacons = beacon_delay / (beacon_interval * 1000);</div><div class='del'>-						if (beacons &gt; 1)</div><div class='del'>-							priv-&gt;wstats.miss.beacon += beacons - 1;</div><div class='del'>-					}</div><div class='del'>-					priv-&gt;last_beacon_timestamp = timestamp;</div><div class='del'>-					handle_beacon_probe(priv, capability, channel);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (priv-&gt;station_state == STATION_STATE_SCANNING)</div><div class='del'>-				store_bss_info(priv, header, capability,</div><div class='del'>-					       beacon_interval, channel, rssi,</div><div class='del'>-					       ssid_length,</div><div class='del'>-					       &amp;beacon-&gt;rates_el_id,</div><div class='del'>-					       subtype == IEEE80211_STYPE_BEACON);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IEEE80211_STYPE_AUTH:</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;station_state == STATION_STATE_AUTHENTICATING)</div><div class='del'>-			authenticate(priv, frame_len);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IEEE80211_STYPE_ASSOC_RESP:</div><div class='del'>-	case IEEE80211_STYPE_REASSOC_RESP:</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;station_state == STATION_STATE_ASSOCIATING ||</div><div class='del'>-		    priv-&gt;station_state == STATION_STATE_REASSOCIATING)</div><div class='del'>-			associate(priv, frame_len, subtype);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IEEE80211_STYPE_DISASSOC:</div><div class='del'>-		if (priv-&gt;station_is_associated &amp;&amp;</div><div class='del'>-		    priv-&gt;operating_mode == IW_MODE_INFRA &amp;&amp;</div><div class='del'>-		    is_frame_from_current_bss(priv, header)) {</div><div class='del'>-			priv-&gt;station_was_associated = 0;</div><div class='del'>-			priv-&gt;station_is_associated = 0;</div><div class='del'>-</div><div class='del'>-			atmel_enter_state(priv, STATION_STATE_JOINNING);</div><div class='del'>-			join(priv, BSS_TYPE_INFRASTRUCTURE);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IEEE80211_STYPE_DEAUTH:</div><div class='del'>-		if (priv-&gt;operating_mode == IW_MODE_INFRA &amp;&amp;</div><div class='del'>-		    is_frame_from_current_bss(priv, header)) {</div><div class='del'>-			priv-&gt;station_was_associated = 0;</div><div class='del'>-</div><div class='del'>-			atmel_enter_state(priv, STATION_STATE_JOINNING);</div><div class='del'>-			join(priv, BSS_TYPE_INFRASTRUCTURE);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* run when timer expires */</div><div class='del'>-static void atmel_management_timer(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	struct atmel_private *priv = from_timer(priv, t, management_timer);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* Check if the card has been yanked. */</div><div class='del'>-	if (priv-&gt;card &amp;&amp; priv-&gt;present_callback &amp;&amp;</div><div class='del'>-		!(*priv-&gt;present_callback)(priv-&gt;card))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;irqlock, flags);</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;station_state) {</div><div class='del'>-</div><div class='del'>-	case STATION_STATE_AUTHENTICATING:</div><div class='del'>-		if (priv-&gt;AuthenticationRequestRetryCnt &gt;= MAX_AUTHENTICATION_RETRIES) {</div><div class='del'>-			atmel_enter_state(priv, STATION_STATE_MGMT_ERROR);</div><div class='del'>-			priv-&gt;station_is_associated = 0;</div><div class='del'>-			priv-&gt;AuthenticationRequestRetryCnt = 0;</div><div class='del'>-			restart_search(priv);</div><div class='del'>-		} else {</div><div class='del'>-			int auth = WLAN_AUTH_OPEN;</div><div class='del'>-			priv-&gt;AuthenticationRequestRetryCnt++;</div><div class='del'>-			priv-&gt;CurrentAuthentTransactionSeqNum = 0x0001;</div><div class='del'>-			mod_timer(&amp;priv-&gt;management_timer, jiffies + MGMT_JIFFIES);</div><div class='del'>-			if (priv-&gt;wep_is_on &amp;&amp; priv-&gt;exclude_unencrypted)</div><div class='del'>-				auth = WLAN_AUTH_SHARED_KEY;</div><div class='del'>-			send_authentication_request(priv, auth, NULL, 0);</div><div class='del'>-	  }</div><div class='del'>-	  break;</div><div class='del'>-</div><div class='del'>-	case STATION_STATE_ASSOCIATING:</div><div class='del'>-		if (priv-&gt;AssociationRequestRetryCnt == MAX_ASSOCIATION_RETRIES) {</div><div class='del'>-			atmel_enter_state(priv, STATION_STATE_MGMT_ERROR);</div><div class='del'>-			priv-&gt;station_is_associated = 0;</div><div class='del'>-			priv-&gt;AssociationRequestRetryCnt = 0;</div><div class='del'>-			restart_search(priv);</div><div class='del'>-		} else {</div><div class='del'>-			priv-&gt;AssociationRequestRetryCnt++;</div><div class='del'>-			mod_timer(&amp;priv-&gt;management_timer, jiffies + MGMT_JIFFIES);</div><div class='del'>-			send_association_request(priv, 0);</div><div class='del'>-		}</div><div class='del'>-	  break;</div><div class='del'>-</div><div class='del'>-	case STATION_STATE_REASSOCIATING:</div><div class='del'>-		if (priv-&gt;ReAssociationRequestRetryCnt == MAX_ASSOCIATION_RETRIES) {</div><div class='del'>-			atmel_enter_state(priv, STATION_STATE_MGMT_ERROR);</div><div class='del'>-			priv-&gt;station_is_associated = 0;</div><div class='del'>-			priv-&gt;ReAssociationRequestRetryCnt = 0;</div><div class='del'>-			restart_search(priv);</div><div class='del'>-		} else {</div><div class='del'>-			priv-&gt;ReAssociationRequestRetryCnt++;</div><div class='del'>-			mod_timer(&amp;priv-&gt;management_timer, jiffies + MGMT_JIFFIES);</div><div class='del'>-			send_association_request(priv, 1);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;irqlock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void atmel_command_irq(struct atmel_private *priv)</div><div class='del'>-{</div><div class='del'>-	u8 status = atmel_rmem8(priv, atmel_co(priv, CMD_BLOCK_STATUS_OFFSET));</div><div class='del'>-	u8 command = atmel_rmem8(priv, atmel_co(priv, CMD_BLOCK_COMMAND_OFFSET));</div><div class='del'>-	int fast_scan;</div><div class='del'>-	union iwreq_data wrqu;</div><div class='del'>-</div><div class='del'>-	if (status == CMD_STATUS_IDLE ||</div><div class='del'>-	    status == CMD_STATUS_IN_PROGRESS)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (command) {</div><div class='del'>-	case CMD_Start:</div><div class='del'>-		if (status == CMD_STATUS_COMPLETE) {</div><div class='del'>-			priv-&gt;station_was_associated = priv-&gt;station_is_associated;</div><div class='del'>-			atmel_get_mib(priv, Mac_Mgmt_Mib_Type, MAC_MGMT_MIB_CUR_BSSID_POS,</div><div class='del'>-				      (u8 *)priv-&gt;CurrentBSSID, 6);</div><div class='del'>-			atmel_enter_state(priv, STATION_STATE_READY);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CMD_Scan:</div><div class='del'>-		fast_scan = priv-&gt;fast_scan;</div><div class='del'>-		priv-&gt;fast_scan = 0;</div><div class='del'>-</div><div class='del'>-		if (status != CMD_STATUS_COMPLETE) {</div><div class='del'>-			atmel_scan(priv, 1);</div><div class='del'>-		} else {</div><div class='del'>-			int bss_index = retrieve_bss(priv);</div><div class='del'>-			int notify_scan_complete = 1;</div><div class='del'>-			if (bss_index != -1) {</div><div class='del'>-				atmel_join_bss(priv, bss_index);</div><div class='del'>-			} else if (priv-&gt;operating_mode == IW_MODE_ADHOC &amp;&amp;</div><div class='del'>-				   priv-&gt;SSID_size != 0) {</div><div class='del'>-				start(priv, BSS_TYPE_AD_HOC);</div><div class='del'>-			} else {</div><div class='del'>-				priv-&gt;fast_scan = !fast_scan;</div><div class='del'>-				atmel_scan(priv, 1);</div><div class='del'>-				notify_scan_complete = 0;</div><div class='del'>-			}</div><div class='del'>-			priv-&gt;site_survey_state = SITE_SURVEY_COMPLETED;</div><div class='del'>-			if (notify_scan_complete) {</div><div class='del'>-				wrqu.data.length = 0;</div><div class='del'>-				wrqu.data.flags = 0;</div><div class='del'>-				wireless_send_event(priv-&gt;dev, SIOCGIWSCAN, &amp;wrqu, NULL);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CMD_SiteSurvey:</div><div class='del'>-		priv-&gt;fast_scan = 0;</div><div class='del'>-</div><div class='del'>-		if (status != CMD_STATUS_COMPLETE)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		priv-&gt;site_survey_state = SITE_SURVEY_COMPLETED;</div><div class='del'>-		if (priv-&gt;station_is_associated) {</div><div class='del'>-			atmel_enter_state(priv, STATION_STATE_READY);</div><div class='del'>-			wrqu.data.length = 0;</div><div class='del'>-			wrqu.data.flags = 0;</div><div class='del'>-			wireless_send_event(priv-&gt;dev, SIOCGIWSCAN, &amp;wrqu, NULL);</div><div class='del'>-		} else {</div><div class='del'>-			atmel_scan(priv, 1);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CMD_Join:</div><div class='del'>-		if (status == CMD_STATUS_COMPLETE) {</div><div class='del'>-			if (priv-&gt;operating_mode == IW_MODE_ADHOC) {</div><div class='del'>-				priv-&gt;station_was_associated = priv-&gt;station_is_associated;</div><div class='del'>-				atmel_enter_state(priv, STATION_STATE_READY);</div><div class='del'>-			} else {</div><div class='del'>-				int auth = WLAN_AUTH_OPEN;</div><div class='del'>-				priv-&gt;AuthenticationRequestRetryCnt = 0;</div><div class='del'>-				atmel_enter_state(priv, STATION_STATE_AUTHENTICATING);</div><div class='del'>-</div><div class='del'>-				mod_timer(&amp;priv-&gt;management_timer, jiffies + MGMT_JIFFIES);</div><div class='del'>-				priv-&gt;CurrentAuthentTransactionSeqNum = 0x0001;</div><div class='del'>-				if (priv-&gt;wep_is_on &amp;&amp; priv-&gt;exclude_unencrypted)</div><div class='del'>-					auth = WLAN_AUTH_SHARED_KEY;</div><div class='del'>-				send_authentication_request(priv, auth, NULL, 0);</div><div class='del'>-			}</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		atmel_scan(priv, 1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_wakeup_firmware(struct atmel_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct host_info_struct *iface = &amp;priv-&gt;host_info;</div><div class='del'>-	u16 mr1, mr3;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;card_type == CARD_TYPE_SPI_FLASH)</div><div class='del'>-		atmel_set_gcr(priv-&gt;dev, GCR_REMAP);</div><div class='del'>-</div><div class='del'>-	/* wake up on-board processor */</div><div class='del'>-	atmel_clear_gcr(priv-&gt;dev, 0x0040);</div><div class='del'>-	atmel_write16(priv-&gt;dev, BSR, BSS_SRAM);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;card_type == CARD_TYPE_SPI_FLASH)</div><div class='del'>-		mdelay(100);</div><div class='del'>-</div><div class='del'>-	/* and wait for it */</div><div class='del'>-	for (i = LOOP_RETRY_LIMIT; i; i--) {</div><div class='del'>-		mr1 = atmel_read16(priv-&gt;dev, MR1);</div><div class='del'>-		mr3 = atmel_read16(priv-&gt;dev, MR3);</div><div class='del'>-</div><div class='del'>-		if (mr3 &amp; MAC_BOOT_COMPLETE)</div><div class='del'>-			break;</div><div class='del'>-		if (mr1 &amp; MAC_BOOT_COMPLETE &amp;&amp;</div><div class='del'>-		    priv-&gt;bus_type == BUS_TYPE_PCCARD)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i == 0) {</div><div class='del'>-		printk(KERN_ALERT "%s: MAC failed to boot.\n", priv-&gt;dev-&gt;name);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((priv-&gt;host_info_base = atmel_read16(priv-&gt;dev, MR2)) == 0xffff) {</div><div class='del'>-		printk(KERN_ALERT "%s: card missing.\n", priv-&gt;dev-&gt;name);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* now check for completion of MAC initialization through</div><div class='del'>-	   the FunCtrl field of the IFACE, poll MR1 to detect completion of</div><div class='del'>-	   MAC initialization, check completion status, set interrupt mask,</div><div class='del'>-	   enables interrupts and calls Tx and Rx initialization functions */</div><div class='del'>-</div><div class='del'>-	atmel_wmem8(priv, atmel_hi(priv, IFACE_FUNC_CTRL_OFFSET), FUNC_CTRL_INIT_COMPLETE);</div><div class='del'>-</div><div class='del'>-	for (i = LOOP_RETRY_LIMIT; i; i--) {</div><div class='del'>-		mr1 = atmel_read16(priv-&gt;dev, MR1);</div><div class='del'>-		mr3 = atmel_read16(priv-&gt;dev, MR3);</div><div class='del'>-</div><div class='del'>-		if (mr3 &amp; MAC_INIT_COMPLETE)</div><div class='del'>-			break;</div><div class='del'>-		if (mr1 &amp; MAC_INIT_COMPLETE &amp;&amp;</div><div class='del'>-		    priv-&gt;bus_type == BUS_TYPE_PCCARD)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i == 0) {</div><div class='del'>-		printk(KERN_ALERT "%s: MAC failed to initialise.\n",</div><div class='del'>-				priv-&gt;dev-&gt;name);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check for MAC_INIT_OK only on the register that the MAC_INIT_OK was set */</div><div class='del'>-	if ((mr3 &amp; MAC_INIT_COMPLETE) &amp;&amp;</div><div class='del'>-	    !(atmel_read16(priv-&gt;dev, MR3) &amp; MAC_INIT_OK)) {</div><div class='del'>-		printk(KERN_ALERT "%s: MAC failed MR3 self-test.\n", priv-&gt;dev-&gt;name);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	if ((mr1 &amp; MAC_INIT_COMPLETE) &amp;&amp;</div><div class='del'>-	    !(atmel_read16(priv-&gt;dev, MR1) &amp; MAC_INIT_OK)) {</div><div class='del'>-		printk(KERN_ALERT "%s: MAC failed MR1 self-test.\n", priv-&gt;dev-&gt;name);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	atmel_copy_to_host(priv-&gt;dev, (unsigned char *)iface,</div><div class='del'>-			   priv-&gt;host_info_base, sizeof(*iface));</div><div class='del'>-</div><div class='del'>-	iface-&gt;tx_buff_pos = le16_to_cpu(iface-&gt;tx_buff_pos);</div><div class='del'>-	iface-&gt;tx_buff_size = le16_to_cpu(iface-&gt;tx_buff_size);</div><div class='del'>-	iface-&gt;tx_desc_pos = le16_to_cpu(iface-&gt;tx_desc_pos);</div><div class='del'>-	iface-&gt;tx_desc_count = le16_to_cpu(iface-&gt;tx_desc_count);</div><div class='del'>-	iface-&gt;rx_buff_pos = le16_to_cpu(iface-&gt;rx_buff_pos);</div><div class='del'>-	iface-&gt;rx_buff_size = le16_to_cpu(iface-&gt;rx_buff_size);</div><div class='del'>-	iface-&gt;rx_desc_pos = le16_to_cpu(iface-&gt;rx_desc_pos);</div><div class='del'>-	iface-&gt;rx_desc_count = le16_to_cpu(iface-&gt;rx_desc_count);</div><div class='del'>-	iface-&gt;build_version = le16_to_cpu(iface-&gt;build_version);</div><div class='del'>-	iface-&gt;command_pos = le16_to_cpu(iface-&gt;command_pos);</div><div class='del'>-	iface-&gt;major_version = le16_to_cpu(iface-&gt;major_version);</div><div class='del'>-	iface-&gt;minor_version = le16_to_cpu(iface-&gt;minor_version);</div><div class='del'>-	iface-&gt;func_ctrl = le16_to_cpu(iface-&gt;func_ctrl);</div><div class='del'>-	iface-&gt;mac_status = le16_to_cpu(iface-&gt;mac_status);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* determine type of memory and MAC address */</div><div class='del'>-static int probe_atmel_card(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	int rc = 0;</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	/* reset pccard */</div><div class='del'>-	if (priv-&gt;bus_type == BUS_TYPE_PCCARD)</div><div class='del'>-		atmel_write16(dev, GCR, 0x0060);</div><div class='del'>-</div><div class='del'>-	atmel_write16(dev, GCR, 0x0040);</div><div class='del'>-	msleep(500);</div><div class='del'>-</div><div class='del'>-	if (atmel_read16(dev, MR2) == 0) {</div><div class='del'>-		/* No stored firmware so load a small stub which just</div><div class='del'>-		   tells us the MAC address */</div><div class='del'>-		int i;</div><div class='del'>-		priv-&gt;card_type = CARD_TYPE_EEPROM;</div><div class='del'>-		atmel_write16(dev, BSR, BSS_IRAM);</div><div class='del'>-		atmel_copy_to_card(dev, 0, mac_reader, sizeof(mac_reader));</div><div class='del'>-		atmel_set_gcr(dev, GCR_REMAP);</div><div class='del'>-		atmel_clear_gcr(priv-&gt;dev, 0x0040);</div><div class='del'>-		atmel_write16(dev, BSR, BSS_SRAM);</div><div class='del'>-		for (i = LOOP_RETRY_LIMIT; i; i--)</div><div class='del'>-			if (atmel_read16(dev, MR3) &amp; MAC_BOOT_COMPLETE)</div><div class='del'>-				break;</div><div class='del'>-		if (i == 0) {</div><div class='del'>-			printk(KERN_ALERT "%s: MAC failed to boot MAC address reader.\n", dev-&gt;name);</div><div class='del'>-		} else {</div><div class='del'>-			atmel_copy_to_host(dev, dev-&gt;dev_addr, atmel_read16(dev, MR2), 6);</div><div class='del'>-			/* got address, now squash it again until the network</div><div class='del'>-			   interface is opened */</div><div class='del'>-			if (priv-&gt;bus_type == BUS_TYPE_PCCARD)</div><div class='del'>-				atmel_write16(dev, GCR, 0x0060);</div><div class='del'>-			atmel_write16(dev, GCR, 0x0040);</div><div class='del'>-			rc = 1;</div><div class='del'>-		}</div><div class='del'>-	} else if (atmel_read16(dev, MR4) == 0) {</div><div class='del'>-		/* Mac address easy in this case. */</div><div class='del'>-		priv-&gt;card_type = CARD_TYPE_PARALLEL_FLASH;</div><div class='del'>-		atmel_write16(dev,  BSR, 1);</div><div class='del'>-		atmel_copy_to_host(dev, dev-&gt;dev_addr, 0xc000, 6);</div><div class='del'>-		atmel_write16(dev,  BSR, 0x200);</div><div class='del'>-		rc = 1;</div><div class='del'>-	} else {</div><div class='del'>-		/* Standard firmware in flash, boot it up and ask</div><div class='del'>-		   for the Mac Address */</div><div class='del'>-		priv-&gt;card_type = CARD_TYPE_SPI_FLASH;</div><div class='del'>-		if (atmel_wakeup_firmware(priv) == 0) {</div><div class='del'>-			atmel_get_mib(priv, Mac_Address_Mib_Type, 0, dev-&gt;dev_addr, 6);</div><div class='del'>-</div><div class='del'>-			/* got address, now squash it again until the network</div><div class='del'>-			   interface is opened */</div><div class='del'>-			if (priv-&gt;bus_type == BUS_TYPE_PCCARD)</div><div class='del'>-				atmel_write16(dev, GCR, 0x0060);</div><div class='del'>-			atmel_write16(dev, GCR, 0x0040);</div><div class='del'>-			rc = 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rc) {</div><div class='del'>-		if (dev-&gt;dev_addr[0] == 0xFF) {</div><div class='del'>-			static const u8 default_mac[] = {</div><div class='del'>-				0x00, 0x04, 0x25, 0x00, 0x00, 0x00</div><div class='del'>-			};</div><div class='del'>-			printk(KERN_ALERT "%s: *** Invalid MAC address. UPGRADE Firmware ****\n", dev-&gt;name);</div><div class='del'>-			memcpy(dev-&gt;dev_addr, default_mac, ETH_ALEN);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Move the encyption information on the MIB structure.</div><div class='del'>-   This routine is for the pre-WPA firmware: later firmware has</div><div class='del'>-   a different format MIB and a different routine. */</div><div class='del'>-static void build_wep_mib(struct atmel_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct { /* NB this is matched to the hardware, don't change. */</div><div class='del'>-		u8 wep_is_on;</div><div class='del'>-		u8 default_key; /* 0..3 */</div><div class='del'>-		u8 reserved;</div><div class='del'>-		u8 exclude_unencrypted;</div><div class='del'>-</div><div class='del'>-		u32 WEPICV_error_count;</div><div class='del'>-		u32 WEP_excluded_count;</div><div class='del'>-</div><div class='del'>-		u8 wep_keys[MAX_ENCRYPTION_KEYS][13];</div><div class='del'>-		u8 encryption_level; /* 0, 1, 2 */</div><div class='del'>-		u8 reserved2[3];</div><div class='del'>-	} mib;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	mib.wep_is_on = priv-&gt;wep_is_on;</div><div class='del'>-	if (priv-&gt;wep_is_on) {</div><div class='del'>-		if (priv-&gt;wep_key_len[priv-&gt;default_key] &gt; 5)</div><div class='del'>-			mib.encryption_level = 2;</div><div class='del'>-		else</div><div class='del'>-			mib.encryption_level = 1;</div><div class='del'>-	} else {</div><div class='del'>-		mib.encryption_level = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mib.default_key = priv-&gt;default_key;</div><div class='del'>-	mib.exclude_unencrypted = priv-&gt;exclude_unencrypted;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MAX_ENCRYPTION_KEYS; i++)</div><div class='del'>-		memcpy(mib.wep_keys[i], priv-&gt;wep_keys[i], 13);</div><div class='del'>-</div><div class='del'>-	atmel_set_mib(priv, Mac_Wep_Mib_Type, 0, (u8 *)&amp;mib, sizeof(mib));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void build_wpa_mib(struct atmel_private *priv)</div><div class='del'>-{</div><div class='del'>-	/* This is for the later (WPA enabled) firmware. */</div><div class='del'>-</div><div class='del'>-	struct { /* NB this is matched to the hardware, don't change. */</div><div class='del'>-		u8 cipher_default_key_value[MAX_ENCRYPTION_KEYS][MAX_ENCRYPTION_KEY_SIZE];</div><div class='del'>-		u8 receiver_address[ETH_ALEN];</div><div class='del'>-		u8 wep_is_on;</div><div class='del'>-		u8 default_key; /* 0..3 */</div><div class='del'>-		u8 group_key;</div><div class='del'>-		u8 exclude_unencrypted;</div><div class='del'>-		u8 encryption_type;</div><div class='del'>-		u8 reserved;</div><div class='del'>-</div><div class='del'>-		u32 WEPICV_error_count;</div><div class='del'>-		u32 WEP_excluded_count;</div><div class='del'>-</div><div class='del'>-		u8 key_RSC[4][8];</div><div class='del'>-	} mib;</div><div class='del'>-</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	mib.wep_is_on = priv-&gt;wep_is_on;</div><div class='del'>-	mib.exclude_unencrypted = priv-&gt;exclude_unencrypted;</div><div class='del'>-	memcpy(mib.receiver_address, priv-&gt;CurrentBSSID, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	/* zero all the keys before adding in valid ones. */</div><div class='del'>-	memset(mib.cipher_default_key_value, 0, sizeof(mib.cipher_default_key_value));</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;wep_is_on) {</div><div class='del'>-		/* There's a comment in the Atmel code to the effect that this</div><div class='del'>-		   is only valid when still using WEP, it may need to be set to</div><div class='del'>-		   something to use WPA */</div><div class='del'>-		memset(mib.key_RSC, 0, sizeof(mib.key_RSC));</div><div class='del'>-</div><div class='del'>-		mib.default_key = mib.group_key = 255;</div><div class='del'>-		for (i = 0; i &lt; MAX_ENCRYPTION_KEYS; i++) {</div><div class='del'>-			if (priv-&gt;wep_key_len[i] &gt; 0) {</div><div class='del'>-				memcpy(mib.cipher_default_key_value[i], priv-&gt;wep_keys[i], MAX_ENCRYPTION_KEY_SIZE);</div><div class='del'>-				if (i == priv-&gt;default_key) {</div><div class='del'>-					mib.default_key = i;</div><div class='del'>-					mib.cipher_default_key_value[i][MAX_ENCRYPTION_KEY_SIZE-1] = 7;</div><div class='del'>-					mib.cipher_default_key_value[i][MAX_ENCRYPTION_KEY_SIZE-2] = priv-&gt;pairwise_cipher_suite;</div><div class='del'>-				} else {</div><div class='del'>-					mib.group_key = i;</div><div class='del'>-					priv-&gt;group_cipher_suite = priv-&gt;pairwise_cipher_suite;</div><div class='del'>-					mib.cipher_default_key_value[i][MAX_ENCRYPTION_KEY_SIZE-1] = 1;</div><div class='del'>-					mib.cipher_default_key_value[i][MAX_ENCRYPTION_KEY_SIZE-2] = priv-&gt;group_cipher_suite;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (mib.default_key == 255)</div><div class='del'>-			mib.default_key = mib.group_key != 255 ? mib.group_key : 0;</div><div class='del'>-		if (mib.group_key == 255)</div><div class='del'>-			mib.group_key = mib.default_key;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	atmel_set_mib(priv, Mac_Wep_Mib_Type, 0, (u8 *)&amp;mib, sizeof(mib));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reset_atmel_card(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	/* do everything necessary to wake up the hardware, including</div><div class='del'>-	   waiting for the lightning strike and throwing the knife switch....</div><div class='del'>-</div><div class='del'>-	   set all the Mib values which matter in the card to match</div><div class='del'>-	   their settings in the atmel_private structure. Some of these</div><div class='del'>-	   can be altered on the fly, but many (WEP, infrastructure or ad-hoc)</div><div class='del'>-	   can only be changed by tearing down the world and coming back through</div><div class='del'>-	   here.</div><div class='del'>-</div><div class='del'>-	   This routine is also responsible for initialising some</div><div class='del'>-	   hardware-specific fields in the atmel_private structure,</div><div class='del'>-	   including a copy of the firmware's hostinfo structure</div><div class='del'>-	   which is the route into the rest of the firmware datastructures. */</div><div class='del'>-</div><div class='del'>-	struct atmel_private *priv = netdev_priv(dev);</div><div class='del'>-	u8 configuration;</div><div class='del'>-	int old_state = priv-&gt;station_state;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	/* data to add to the firmware names, in priority order</div><div class='del'>-	   this implemenents firmware versioning */</div><div class='del'>-</div><div class='del'>-	static char *firmware_modifier[] = {</div><div class='del'>-		"-wpa",</div><div class='del'>-		"",</div><div class='del'>-		NULL</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* reset pccard */</div><div class='del'>-	if (priv-&gt;bus_type == BUS_TYPE_PCCARD)</div><div class='del'>-		atmel_write16(priv-&gt;dev, GCR, 0x0060);</div><div class='del'>-</div><div class='del'>-	/* stop card , disable interrupts */</div><div class='del'>-	atmel_write16(priv-&gt;dev, GCR, 0x0040);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;card_type == CARD_TYPE_EEPROM) {</div><div class='del'>-		/* copy in firmware if needed */</div><div class='del'>-		const struct firmware *fw_entry = NULL;</div><div class='del'>-		const unsigned char *fw;</div><div class='del'>-		int len = priv-&gt;firmware_length;</div><div class='del'>-		if (!(fw = priv-&gt;firmware)) {</div><div class='del'>-			if (priv-&gt;firmware_type == ATMEL_FW_TYPE_NONE) {</div><div class='del'>-				if (strlen(priv-&gt;firmware_id) == 0) {</div><div class='del'>-					printk(KERN_INFO</div><div class='del'>-					       "%s: card type is unknown: assuming at76c502 firmware is OK.\n",</div><div class='del'>-					       dev-&gt;name);</div><div class='del'>-					printk(KERN_INFO</div><div class='del'>-					       "%s: if not, use the firmware= module parameter.\n",</div><div class='del'>-					       dev-&gt;name);</div><div class='del'>-					strcpy(priv-&gt;firmware_id, "atmel_at76c502.bin");</div><div class='del'>-				}</div><div class='del'>-				err = request_firmware(&amp;fw_entry, priv-&gt;firmware_id, priv-&gt;sys_dev);</div><div class='del'>-				if (err != 0) {</div><div class='del'>-					printk(KERN_ALERT</div><div class='del'>-					       "%s: firmware %s is missing, cannot continue.\n",</div><div class='del'>-					       dev-&gt;name, priv-&gt;firmware_id);</div><div class='del'>-					return err;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				int fw_index = 0;</div><div class='del'>-				int success = 0;</div><div class='del'>-</div><div class='del'>-				/* get firmware filename entry based on firmware type ID */</div><div class='del'>-				while (fw_table[fw_index].fw_type != priv-&gt;firmware_type</div><div class='del'>-						&amp;&amp; fw_table[fw_index].fw_type != ATMEL_FW_TYPE_NONE)</div><div class='del'>-					fw_index++;</div><div class='del'>-</div><div class='del'>-				/* construct the actual firmware file name */</div><div class='del'>-				if (fw_table[fw_index].fw_type != ATMEL_FW_TYPE_NONE) {</div><div class='del'>-					int i;</div><div class='del'>-					for (i = 0; firmware_modifier[i]; i++) {</div><div class='del'>-						snprintf(priv-&gt;firmware_id, 32, "%s%s.%s", fw_table[fw_index].fw_file,</div><div class='del'>-							firmware_modifier[i], fw_table[fw_index].fw_file_ext);</div><div class='del'>-						priv-&gt;firmware_id[31] = '\0';</div><div class='del'>-						if (request_firmware(&amp;fw_entry, priv-&gt;firmware_id, priv-&gt;sys_dev) == 0) {</div><div class='del'>-							success = 1;</div><div class='del'>-							break;</div><div class='del'>-						}</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				if (!success) {</div><div class='del'>-					printk(KERN_ALERT</div><div class='del'>-					       "%s: firmware %s is missing, cannot start.\n",</div><div class='del'>-					       dev-&gt;name, priv-&gt;firmware_id);</div><div class='del'>-					priv-&gt;firmware_id[0] = '\0';</div><div class='del'>-					return -ENOENT;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			fw = fw_entry-&gt;data;</div><div class='del'>-			len = fw_entry-&gt;size;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (len &lt;= 0x6000) {</div><div class='del'>-			atmel_write16(priv-&gt;dev, BSR, BSS_IRAM);</div><div class='del'>-			atmel_copy_to_card(priv-&gt;dev, 0, fw, len);</div><div class='del'>-			atmel_set_gcr(priv-&gt;dev, GCR_REMAP);</div><div class='del'>-		} else {</div><div class='del'>-			/* Remap */</div><div class='del'>-			atmel_set_gcr(priv-&gt;dev, GCR_REMAP);</div><div class='del'>-			atmel_write16(priv-&gt;dev, BSR, BSS_IRAM);</div><div class='del'>-			atmel_copy_to_card(priv-&gt;dev, 0, fw, 0x6000);</div><div class='del'>-			atmel_write16(priv-&gt;dev, BSR, 0x2ff);</div><div class='del'>-			atmel_copy_to_card(priv-&gt;dev, 0x8000, &amp;fw[0x6000], len - 0x6000);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		release_firmware(fw_entry);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = atmel_wakeup_firmware(priv);</div><div class='del'>-	if (err != 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/* Check the version and set the correct flag for wpa stuff,</div><div class='del'>-	   old and new firmware is incompatible.</div><div class='del'>-	   The pre-wpa 3com firmware reports major version 5,</div><div class='del'>-	   the wpa 3com firmware is major version 4 and doesn't need</div><div class='del'>-	   the 3com broken-ness filter. */</div><div class='del'>-	priv-&gt;use_wpa = (priv-&gt;host_info.major_version == 4);</div><div class='del'>-	priv-&gt;radio_on_broken = (priv-&gt;host_info.major_version == 5);</div><div class='del'>-</div><div class='del'>-	/* unmask all irq sources */</div><div class='del'>-	atmel_wmem8(priv, atmel_hi(priv, IFACE_INT_MASK_OFFSET), 0xff);</div><div class='del'>-</div><div class='del'>-	/* int Tx system and enable Tx */</div><div class='del'>-	atmel_wmem8(priv, atmel_tx(priv, TX_DESC_FLAGS_OFFSET, 0), 0);</div><div class='del'>-	atmel_wmem32(priv, atmel_tx(priv, TX_DESC_NEXT_OFFSET, 0), 0x80000000L);</div><div class='del'>-	atmel_wmem16(priv, atmel_tx(priv, TX_DESC_POS_OFFSET, 0), 0);</div><div class='del'>-	atmel_wmem16(priv, atmel_tx(priv, TX_DESC_SIZE_OFFSET, 0), 0);</div><div class='del'>-</div><div class='del'>-	priv-&gt;tx_desc_free = priv-&gt;host_info.tx_desc_count;</div><div class='del'>-	priv-&gt;tx_desc_head = 0;</div><div class='del'>-	priv-&gt;tx_desc_tail = 0;</div><div class='del'>-	priv-&gt;tx_desc_previous = 0;</div><div class='del'>-	priv-&gt;tx_free_mem = priv-&gt;host_info.tx_buff_size;</div><div class='del'>-	priv-&gt;tx_buff_head = 0;</div><div class='del'>-	priv-&gt;tx_buff_tail = 0;</div><div class='del'>-</div><div class='del'>-	configuration = atmel_rmem8(priv, atmel_hi(priv, IFACE_FUNC_CTRL_OFFSET));</div><div class='del'>-	atmel_wmem8(priv, atmel_hi(priv, IFACE_FUNC_CTRL_OFFSET),</div><div class='del'>-				   configuration | FUNC_CTRL_TxENABLE);</div><div class='del'>-</div><div class='del'>-	/* init Rx system and enable */</div><div class='del'>-	priv-&gt;rx_desc_head = 0;</div><div class='del'>-</div><div class='del'>-	configuration = atmel_rmem8(priv, atmel_hi(priv, IFACE_FUNC_CTRL_OFFSET));</div><div class='del'>-	atmel_wmem8(priv, atmel_hi(priv, IFACE_FUNC_CTRL_OFFSET),</div><div class='del'>-				   configuration | FUNC_CTRL_RxENABLE);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;radio_on_broken) {</div><div class='del'>-		if (atmel_send_command_wait(priv, CMD_EnableRadio, NULL, 0) ==</div><div class='del'>-		    CMD_STATUS_REJECTED_RADIO_OFF) {</div><div class='del'>-			printk(KERN_INFO "%s: cannot turn the radio on.\n",</div><div class='del'>-			       dev-&gt;name);</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* set up enough MIB values to run. */</div><div class='del'>-	atmel_set_mib8(priv, Local_Mib_Type, LOCAL_MIB_AUTO_TX_RATE_POS, priv-&gt;auto_tx_rate);</div><div class='del'>-	atmel_set_mib8(priv, Local_Mib_Type,  LOCAL_MIB_TX_PROMISCUOUS_POS,  PROM_MODE_OFF);</div><div class='del'>-	atmel_set_mib16(priv, Mac_Mib_Type, MAC_MIB_RTS_THRESHOLD_POS, priv-&gt;rts_threshold);</div><div class='del'>-	atmel_set_mib16(priv, Mac_Mib_Type, MAC_MIB_FRAG_THRESHOLD_POS, priv-&gt;frag_threshold);</div><div class='del'>-	atmel_set_mib8(priv, Mac_Mib_Type, MAC_MIB_SHORT_RETRY_POS, priv-&gt;short_retry);</div><div class='del'>-	atmel_set_mib8(priv, Mac_Mib_Type, MAC_MIB_LONG_RETRY_POS, priv-&gt;long_retry);</div><div class='del'>-	atmel_set_mib8(priv, Local_Mib_Type, LOCAL_MIB_PREAMBLE_TYPE, priv-&gt;preamble);</div><div class='del'>-	atmel_set_mib(priv, Mac_Address_Mib_Type, MAC_ADDR_MIB_MAC_ADDR_POS,</div><div class='del'>-		      priv-&gt;dev-&gt;dev_addr, 6);</div><div class='del'>-	atmel_set_mib8(priv, Mac_Mgmt_Mib_Type, MAC_MGMT_MIB_PS_MODE_POS, ACTIVE_MODE);</div><div class='del'>-	atmel_set_mib16(priv, Mac_Mgmt_Mib_Type, MAC_MGMT_MIB_LISTEN_INTERVAL_POS, 1);</div><div class='del'>-	atmel_set_mib16(priv, Mac_Mgmt_Mib_Type, MAC_MGMT_MIB_BEACON_PER_POS, priv-&gt;default_beacon_period);</div><div class='del'>-	atmel_set_mib(priv, Phy_Mib_Type, PHY_MIB_RATE_SET_POS, atmel_basic_rates, 4);</div><div class='del'>-	atmel_set_mib8(priv, Mac_Mgmt_Mib_Type, MAC_MGMT_MIB_CUR_PRIVACY_POS, priv-&gt;wep_is_on);</div><div class='del'>-	if (priv-&gt;use_wpa)</div><div class='del'>-		build_wpa_mib(priv);</div><div class='del'>-	else</div><div class='del'>-		build_wep_mib(priv);</div><div class='del'>-</div><div class='del'>-	if (old_state == STATION_STATE_READY) {</div><div class='del'>-		union iwreq_data wrqu;</div><div class='del'>-</div><div class='del'>-		wrqu.data.length = 0;</div><div class='del'>-		wrqu.data.flags = 0;</div><div class='del'>-		wrqu.ap_addr.sa_family = ARPHRD_ETHER;</div><div class='del'>-		eth_zero_addr(wrqu.ap_addr.sa_data);</div><div class='del'>-		wireless_send_event(priv-&gt;dev, SIOCGIWAP, &amp;wrqu, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void atmel_send_command(struct atmel_private *priv, int command,</div><div class='del'>-			       void *cmd, int cmd_size)</div><div class='del'>-{</div><div class='del'>-	if (cmd)</div><div class='del'>-		atmel_copy_to_card(priv-&gt;dev, atmel_co(priv, CMD_BLOCK_PARAMETERS_OFFSET),</div><div class='del'>-				   cmd, cmd_size);</div><div class='del'>-</div><div class='del'>-	atmel_wmem8(priv, atmel_co(priv, CMD_BLOCK_COMMAND_OFFSET), command);</div><div class='del'>-	atmel_wmem8(priv, atmel_co(priv, CMD_BLOCK_STATUS_OFFSET), 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_send_command_wait(struct atmel_private *priv, int command,</div><div class='del'>-				   void *cmd, int cmd_size)</div><div class='del'>-{</div><div class='del'>-	int i, status;</div><div class='del'>-</div><div class='del'>-	atmel_send_command(priv, command, cmd, cmd_size);</div><div class='del'>-</div><div class='del'>-	for (i = 5000; i; i--) {</div><div class='del'>-		status = atmel_rmem8(priv, atmel_co(priv, CMD_BLOCK_STATUS_OFFSET));</div><div class='del'>-		if (status != CMD_STATUS_IDLE &amp;&amp;</div><div class='del'>-		    status != CMD_STATUS_IN_PROGRESS)</div><div class='del'>-			break;</div><div class='del'>-		udelay(20);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i == 0) {</div><div class='del'>-		printk(KERN_ALERT "%s: failed to contact MAC.\n", priv-&gt;dev-&gt;name);</div><div class='del'>-		status =  CMD_STATUS_HOST_ERROR;</div><div class='del'>-	} else {</div><div class='del'>-		if (command != CMD_EnableRadio)</div><div class='del'>-			status = CMD_STATUS_COMPLETE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 atmel_get_mib8(struct atmel_private *priv, u8 type, u8 index)</div><div class='del'>-{</div><div class='del'>-	struct get_set_mib m;</div><div class='del'>-	m.type = type;</div><div class='del'>-	m.size = 1;</div><div class='del'>-	m.index = index;</div><div class='del'>-</div><div class='del'>-	atmel_send_command_wait(priv, CMD_Get_MIB_Vars, &amp;m, MIB_HEADER_SIZE + 1);</div><div class='del'>-	return atmel_rmem8(priv, atmel_co(priv, CMD_BLOCK_PARAMETERS_OFFSET + MIB_HEADER_SIZE));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void atmel_set_mib8(struct atmel_private *priv, u8 type, u8 index, u8 data)</div><div class='del'>-{</div><div class='del'>-	struct get_set_mib m;</div><div class='del'>-	m.type = type;</div><div class='del'>-	m.size = 1;</div><div class='del'>-	m.index = index;</div><div class='del'>-	m.data[0] = data;</div><div class='del'>-</div><div class='del'>-	atmel_send_command_wait(priv, CMD_Set_MIB_Vars, &amp;m, MIB_HEADER_SIZE + 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void atmel_set_mib16(struct atmel_private *priv, u8 type, u8 index,</div><div class='del'>-			    u16 data)</div><div class='del'>-{</div><div class='del'>-	struct get_set_mib m;</div><div class='del'>-	m.type = type;</div><div class='del'>-	m.size = 2;</div><div class='del'>-	m.index = index;</div><div class='del'>-	m.data[0] = data;</div><div class='del'>-	m.data[1] = data &gt;&gt; 8;</div><div class='del'>-</div><div class='del'>-	atmel_send_command_wait(priv, CMD_Set_MIB_Vars, &amp;m, MIB_HEADER_SIZE + 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void atmel_set_mib(struct atmel_private *priv, u8 type, u8 index,</div><div class='del'>-			  u8 *data, int data_len)</div><div class='del'>-{</div><div class='del'>-	struct get_set_mib m;</div><div class='del'>-	m.type = type;</div><div class='del'>-	m.size = data_len;</div><div class='del'>-	m.index = index;</div><div class='del'>-</div><div class='del'>-	if (data_len &gt; MIB_MAX_DATA_BYTES)</div><div class='del'>-		printk(KERN_ALERT "%s: MIB buffer too small.\n", priv-&gt;dev-&gt;name);</div><div class='del'>-</div><div class='del'>-	memcpy(m.data, data, data_len);</div><div class='del'>-	atmel_send_command_wait(priv, CMD_Set_MIB_Vars, &amp;m, MIB_HEADER_SIZE + data_len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void atmel_get_mib(struct atmel_private *priv, u8 type, u8 index,</div><div class='del'>-			  u8 *data, int data_len)</div><div class='del'>-{</div><div class='del'>-	struct get_set_mib m;</div><div class='del'>-	m.type = type;</div><div class='del'>-	m.size = data_len;</div><div class='del'>-	m.index = index;</div><div class='del'>-</div><div class='del'>-	if (data_len &gt; MIB_MAX_DATA_BYTES)</div><div class='del'>-		printk(KERN_ALERT "%s: MIB buffer too small.\n", priv-&gt;dev-&gt;name);</div><div class='del'>-</div><div class='del'>-	atmel_send_command_wait(priv, CMD_Get_MIB_Vars, &amp;m, MIB_HEADER_SIZE + data_len);</div><div class='del'>-	atmel_copy_to_host(priv-&gt;dev, data,</div><div class='del'>-			   atmel_co(priv, CMD_BLOCK_PARAMETERS_OFFSET + MIB_HEADER_SIZE), data_len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void atmel_writeAR(struct net_device *dev, u16 data)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	outw(data, dev-&gt;base_addr + AR);</div><div class='del'>-	/* Address register appears to need some convincing..... */</div><div class='del'>-	for (i = 0; data != inw(dev-&gt;base_addr + AR) &amp;&amp; i &lt; 10; i++)</div><div class='del'>-		outw(data, dev-&gt;base_addr + AR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void atmel_copy_to_card(struct net_device *dev, u16 dest,</div><div class='del'>-			       const unsigned char *src, u16 len)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	atmel_writeAR(dev, dest);</div><div class='del'>-	if (dest % 2) {</div><div class='del'>-		atmel_write8(dev, DR, *src);</div><div class='del'>-		src++; len--;</div><div class='del'>-	}</div><div class='del'>-	for (i = len; i &gt; 1 ; i -= 2) {</div><div class='del'>-		u8 lb = *src++;</div><div class='del'>-		u8 hb = *src++;</div><div class='del'>-		atmel_write16(dev, DR, lb | (hb &lt;&lt; 8));</div><div class='del'>-	}</div><div class='del'>-	if (i)</div><div class='del'>-		atmel_write8(dev, DR, *src);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void atmel_copy_to_host(struct net_device *dev, unsigned char *dest,</div><div class='del'>-			       u16 src, u16 len)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	atmel_writeAR(dev, src);</div><div class='del'>-	if (src % 2) {</div><div class='del'>-		*dest = atmel_read8(dev, DR);</div><div class='del'>-		dest++; len--;</div><div class='del'>-	}</div><div class='del'>-	for (i = len; i &gt; 1 ; i -= 2) {</div><div class='del'>-		u16 hw = atmel_read16(dev, DR);</div><div class='del'>-		*dest++ = hw;</div><div class='del'>-		*dest++ = hw &gt;&gt; 8;</div><div class='del'>-	}</div><div class='del'>-	if (i)</div><div class='del'>-		*dest = atmel_read8(dev, DR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void atmel_set_gcr(struct net_device *dev, u16 mask)</div><div class='del'>-{</div><div class='del'>-	outw(inw(dev-&gt;base_addr + GCR) | mask, dev-&gt;base_addr + GCR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void atmel_clear_gcr(struct net_device *dev, u16 mask)</div><div class='del'>-{</div><div class='del'>-	outw(inw(dev-&gt;base_addr + GCR) &amp; ~mask, dev-&gt;base_addr + GCR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_lock_mac(struct atmel_private *priv)</div><div class='del'>-{</div><div class='del'>-	int i, j = 20;</div><div class='del'>- retry:</div><div class='del'>-	for (i = 5000; i; i--) {</div><div class='del'>-		if (!atmel_rmem8(priv, atmel_hi(priv, IFACE_LOCKOUT_HOST_OFFSET)))</div><div class='del'>-			break;</div><div class='del'>-		udelay(20);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!i)</div><div class='del'>-		return 0; /* timed out */</div><div class='del'>-</div><div class='del'>-	atmel_wmem8(priv, atmel_hi(priv, IFACE_LOCKOUT_MAC_OFFSET), 1);</div><div class='del'>-	if (atmel_rmem8(priv, atmel_hi(priv, IFACE_LOCKOUT_HOST_OFFSET))) {</div><div class='del'>-		atmel_wmem8(priv, atmel_hi(priv, IFACE_LOCKOUT_MAC_OFFSET), 0);</div><div class='del'>-		if (!j--)</div><div class='del'>-			return 0; /* timed out */</div><div class='del'>-		goto retry;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void atmel_wmem32(struct atmel_private *priv, u16 pos, u32 data)</div><div class='del'>-{</div><div class='del'>-	atmel_writeAR(priv-&gt;dev, pos);</div><div class='del'>-	atmel_write16(priv-&gt;dev, DR, data); /* card is little-endian */</div><div class='del'>-	atmel_write16(priv-&gt;dev, DR, data &gt;&gt; 16);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/***************************************************************************/</div><div class='del'>-/* There follows the source form of the MAC address reading firmware       */</div><div class='del'>-/***************************************************************************/</div><div class='del'>-#if 0</div><div class='del'>-</div><div class='del'>-/* Copyright 2003 Matthew T. Russotto                                      */</div><div class='del'>-/* But derived from the Atmel 76C502 firmware written by Atmel and         */</div><div class='del'>-/* included in "atmel wireless lan drivers" package                        */</div><div class='del'>-/*</div><div class='del'>-    This file is part of net.russotto.AtmelMACFW, hereto referred to</div><div class='del'>-    as AtmelMACFW</div><div class='del'>-</div><div class='del'>-    AtmelMACFW is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of the GNU General Public License version 2</div><div class='del'>-    as published by the Free Software Foundation.</div><div class='del'>-</div><div class='del'>-    AtmelMACFW is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with AtmelMACFW; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>-</div><div class='del'>-****************************************************************************/</div><div class='del'>-/* This firmware should work on the 76C502 RFMD, RFMD_D, and RFMD_E        */</div><div class='del'>-/* It will probably work on the 76C504 and 76C502 RFMD_3COM                */</div><div class='del'>-/* It only works on SPI EEPROM versions of the card.                       */</div><div class='del'>-</div><div class='del'>-/* This firmware initializes the SPI controller and clock, reads the MAC   */</div><div class='del'>-/* address from the EEPROM into SRAM, and puts the SRAM offset of the MAC  */</div><div class='del'>-/* address in MR2, and sets MR3 to 0x10 to indicate it is done             */</div><div class='del'>-/* It also puts a complete copy of the EEPROM in SRAM with the offset in   */</div><div class='del'>-/* MR4, for investigational purposes (maybe we can determine chip type     */</div><div class='del'>-/* from that?)                                                             */</div><div class='del'>-</div><div class='del'>-	.org 0</div><div class='del'>-    .set MRBASE, 0x8000000</div><div class='del'>-	.set CPSR_INITIAL, 0xD3 /* IRQ/FIQ disabled, ARM mode, Supervisor state */</div><div class='del'>-	.set CPSR_USER, 0xD1 /* IRQ/FIQ disabled, ARM mode, USER state */</div><div class='del'>-	.set SRAM_BASE,  0x02000000</div><div class='del'>-	.set SP_BASE,    0x0F300000</div><div class='del'>-	.set UNK_BASE,   0x0F000000 /* Some internal device, but which one? */</div><div class='del'>-	.set SPI_CGEN_BASE,  0x0E000000 /* Some internal device, but which one? */</div><div class='del'>-	.set UNK3_BASE,  0x02014000 /* Some internal device, but which one? */</div><div class='del'>-	.set STACK_BASE, 0x5600</div><div class='del'>-	.set SP_SR, 0x10</div><div class='del'>-	.set SP_TDRE, 2 /* status register bit -- TDR empty */</div><div class='del'>-	.set SP_RDRF, 1 /* status register bit -- RDR full */</div><div class='del'>-	.set SP_SWRST, 0x80</div><div class='del'>-	.set SP_SPIEN, 0x1</div><div class='del'>-	.set SP_CR, 0   /* control register */</div><div class='del'>-	.set SP_MR, 4   /* mode register */</div><div class='del'>-	.set SP_RDR, 0x08 /* Read Data Register */</div><div class='del'>-	.set SP_TDR, 0x0C /* Transmit Data Register */</div><div class='del'>-	.set SP_CSR0, 0x30 /* chip select registers */</div><div class='del'>-	.set SP_CSR1, 0x34</div><div class='del'>-	.set SP_CSR2, 0x38</div><div class='del'>-	.set SP_CSR3, 0x3C</div><div class='del'>-	.set NVRAM_CMD_RDSR, 5 /* read status register */</div><div class='del'>-	.set NVRAM_CMD_READ, 3 /* read data */</div><div class='del'>-	.set NVRAM_SR_RDY, 1 /* RDY bit.  This bit is inverted */</div><div class='del'>-	.set SPI_8CLOCKS, 0xFF /* Writing this to the TDR doesn't do anything to the</div><div class='del'>-				  serial output, since SO is normally high.  But it</div><div class='del'>-				  does cause 8 clock cycles and thus 8 bits to be</div><div class='del'>-				  clocked in to the chip.  See Atmel's SPI</div><div class='del'>-				  controller (e.g. AT91M55800) timing and 4K</div><div class='del'>-				  SPI EEPROM manuals */</div><div class='del'>-</div><div class='del'>-	.set NVRAM_SCRATCH, 0x02000100  /* arbitrary area for scratchpad memory */</div><div class='del'>-	.set NVRAM_IMAGE, 0x02000200</div><div class='del'>-	.set NVRAM_LENGTH, 0x0200</div><div class='del'>-	.set MAC_ADDRESS_MIB, SRAM_BASE</div><div class='del'>-	.set MAC_ADDRESS_LENGTH, 6</div><div class='del'>-	.set MAC_BOOT_FLAG, 0x10</div><div class='del'>-	.set MR1, 0</div><div class='del'>-	.set MR2, 4</div><div class='del'>-	.set MR3, 8</div><div class='del'>-	.set MR4, 0xC</div><div class='del'>-RESET_VECTOR:</div><div class='del'>-	b RESET_HANDLER</div><div class='del'>-UNDEF_VECTOR:</div><div class='del'>-	b HALT1</div><div class='del'>-SWI_VECTOR:</div><div class='del'>-	b HALT1</div><div class='del'>-IABORT_VECTOR:</div><div class='del'>-	b HALT1</div><div class='del'>-DABORT_VECTOR:</div><div class='del'>-RESERVED_VECTOR:</div><div class='del'>-	b HALT1</div><div class='del'>-IRQ_VECTOR:</div><div class='del'>-	b HALT1</div><div class='del'>-FIQ_VECTOR:</div><div class='del'>-	b HALT1</div><div class='del'>-HALT1:	b HALT1</div><div class='del'>-RESET_HANDLER:</div><div class='del'>-	mov     r0, #CPSR_INITIAL</div><div class='del'>-	msr	CPSR_c, r0	/* This is probably unnecessary */</div><div class='del'>-</div><div class='del'>-/* I'm guessing this is initializing clock generator electronics for SPI */</div><div class='del'>-	ldr	r0, =SPI_CGEN_BASE</div><div class='del'>-	mov	r1, #0</div><div class='del'>-	mov	r1, r1, lsl #3</div><div class='del'>-	orr	r1, r1, #0</div><div class='del'>-	str	r1, [r0]</div><div class='del'>-	ldr	r1, [r0, #28]</div><div class='del'>-	bic	r1, r1, #16</div><div class='del'>-	str	r1, [r0, #28]</div><div class='del'>-	mov	r1, #1</div><div class='del'>-	str	r1, [r0, #8]</div><div class='del'>-</div><div class='del'>-	ldr	r0, =MRBASE</div><div class='del'>-	mov	r1, #0</div><div class='del'>-	strh	r1, [r0, #MR1]</div><div class='del'>-	strh	r1, [r0, #MR2]</div><div class='del'>-	strh	r1, [r0, #MR3]</div><div class='del'>-	strh	r1, [r0, #MR4]</div><div class='del'>-</div><div class='del'>-	mov	sp, #STACK_BASE</div><div class='del'>-	bl	SP_INIT</div><div class='del'>-	mov	r0, #10</div><div class='del'>-	bl	DELAY9</div><div class='del'>-	bl	GET_MAC_ADDR</div><div class='del'>-	bl	GET_WHOLE_NVRAM</div><div class='del'>-	ldr	r0, =MRBASE</div><div class='del'>-	ldr	r1, =MAC_ADDRESS_MIB</div><div class='del'>-	strh	r1, [r0, #MR2]</div><div class='del'>-	ldr	r1, =NVRAM_IMAGE</div><div class='del'>-	strh	r1, [r0, #MR4]</div><div class='del'>-	mov	r1, #MAC_BOOT_FLAG</div><div class='del'>-	strh	r1, [r0, #MR3]</div><div class='del'>-HALT2:	b HALT2</div><div class='del'>-.func Get_Whole_NVRAM, GET_WHOLE_NVRAM</div><div class='del'>-GET_WHOLE_NVRAM:</div><div class='del'>-	stmdb	sp!, {lr}</div><div class='del'>-	mov	r2, #0 /* 0th bytes of NVRAM */</div><div class='del'>-	mov	r3, #NVRAM_LENGTH</div><div class='del'>-	mov	r1, #0		/* not used in routine */</div><div class='del'>-	ldr	r0, =NVRAM_IMAGE</div><div class='del'>-	bl	NVRAM_XFER</div><div class='del'>-	ldmia	sp!, {lr}</div><div class='del'>-	bx	lr</div><div class='del'>-.endfunc</div><div class='del'>-</div><div class='del'>-.func Get_MAC_Addr, GET_MAC_ADDR</div><div class='del'>-GET_MAC_ADDR:</div><div class='del'>-	stmdb	sp!, {lr}</div><div class='del'>-	mov	r2, #0x120	/* address of MAC Address within NVRAM */</div><div class='del'>-	mov	r3, #MAC_ADDRESS_LENGTH</div><div class='del'>-	mov	r1, #0		/* not used in routine */</div><div class='del'>-	ldr	r0, =MAC_ADDRESS_MIB</div><div class='del'>-	bl	NVRAM_XFER</div><div class='del'>-	ldmia	sp!, {lr}</div><div class='del'>-	bx	lr</div><div class='del'>-.endfunc</div><div class='del'>-.ltorg</div><div class='del'>-.func Delay9, DELAY9</div><div class='del'>-DELAY9:</div><div class='del'>-	adds	r0, r0, r0, LSL #3   /* r0 = r0 * 9 */</div><div class='del'>-DELAYLOOP:</div><div class='del'>-	beq	DELAY9_done</div><div class='del'>-	subs	r0, r0, #1</div><div class='del'>-	b	DELAYLOOP</div><div class='del'>-DELAY9_done:</div><div class='del'>-	bx	lr</div><div class='del'>-.endfunc</div><div class='del'>-</div><div class='del'>-.func SP_Init, SP_INIT</div><div class='del'>-SP_INIT:</div><div class='del'>-	mov	r1, #SP_SWRST</div><div class='del'>-	ldr	r0, =SP_BASE</div><div class='del'>-	str	r1, [r0, #SP_CR] /* reset the SPI */</div><div class='del'>-	mov	r1, #0</div><div class='del'>-	str	r1, [r0, #SP_CR] /* release SPI from reset state */</div><div class='del'>-	mov	r1, #SP_SPIEN</div><div class='del'>-	str	r1, [r0, #SP_MR] /* set the SPI to MASTER mode*/</div><div class='del'>-	str	r1, [r0, #SP_CR] /* enable the SPI */</div><div class='del'>-</div><div class='del'>-/*  My guess would be this turns on the SPI clock */</div><div class='del'>-	ldr	r3, =SPI_CGEN_BASE</div><div class='del'>-	ldr	r1, [r3, #28]</div><div class='del'>-	orr	r1, r1, #0x2000</div><div class='del'>-	str	r1, [r3, #28]</div><div class='del'>-</div><div class='del'>-	ldr	r1, =0x2000c01</div><div class='del'>-	str	r1, [r0, #SP_CSR0]</div><div class='del'>-	ldr	r1, =0x2000201</div><div class='del'>-	str	r1, [r0, #SP_CSR1]</div><div class='del'>-	str	r1, [r0, #SP_CSR2]</div><div class='del'>-	str	r1, [r0, #SP_CSR3]</div><div class='del'>-	ldr	r1, [r0, #SP_SR]</div><div class='del'>-	ldr	r0, [r0, #SP_RDR]</div><div class='del'>-	bx	lr</div><div class='del'>-.endfunc</div><div class='del'>-.func NVRAM_Init, NVRAM_INIT</div><div class='del'>-NVRAM_INIT:</div><div class='del'>-	ldr	r1, =SP_BASE</div><div class='del'>-	ldr	r0, [r1, #SP_RDR]</div><div class='del'>-	mov	r0, #NVRAM_CMD_RDSR</div><div class='del'>-	str	r0, [r1, #SP_TDR]</div><div class='del'>-SP_loop1:</div><div class='del'>-	ldr	r0, [r1, #SP_SR]</div><div class='del'>-	tst	r0, #SP_TDRE</div><div class='del'>-	beq	SP_loop1</div><div class='del'>-</div><div class='del'>-	mov	r0, #SPI_8CLOCKS</div><div class='del'>-	str	r0, [r1, #SP_TDR]</div><div class='del'>-SP_loop2:</div><div class='del'>-	ldr	r0, [r1, #SP_SR]</div><div class='del'>-	tst	r0, #SP_TDRE</div><div class='del'>-	beq	SP_loop2</div><div class='del'>-</div><div class='del'>-	ldr	r0, [r1, #SP_RDR]</div><div class='del'>-SP_loop3:</div><div class='del'>-	ldr	r0, [r1, #SP_SR]</div><div class='del'>-	tst	r0, #SP_RDRF</div><div class='del'>-	beq	SP_loop3</div><div class='del'>-</div><div class='del'>-	ldr	r0, [r1, #SP_RDR]</div><div class='del'>-	and	r0, r0, #255</div><div class='del'>-	bx	lr</div><div class='del'>-.endfunc</div><div class='del'>-</div><div class='del'>-.func NVRAM_Xfer, NVRAM_XFER</div><div class='del'>-	/* r0 = dest address */</div><div class='del'>-	/* r1 = not used */</div><div class='del'>-	/* r2 = src address within NVRAM */</div><div class='del'>-	/* r3 = length */</div><div class='del'>-NVRAM_XFER:</div><div class='del'>-	stmdb	sp!, {r4, r5, lr}</div><div class='del'>-	mov	r5, r0		/* save r0 (dest address) */</div><div class='del'>-	mov	r4, r3		/* save r3 (length) */</div><div class='del'>-	mov	r0, r2, LSR #5 /*  SPI memories put A8 in the command field */</div><div class='del'>-	and	r0, r0, #8</div><div class='del'>-	add	r0, r0, #NVRAM_CMD_READ</div><div class='del'>-	ldr	r1, =NVRAM_SCRATCH</div><div class='del'>-	strb	r0, [r1, #0]	/* save command in NVRAM_SCRATCH[0] */</div><div class='del'>-	strb	r2, [r1, #1]    /* save low byte of source address in NVRAM_SCRATCH[1] */</div><div class='del'>-_local1:</div><div class='del'>-	bl	NVRAM_INIT</div><div class='del'>-	tst	r0, #NVRAM_SR_RDY</div><div class='del'>-	bne	_local1</div><div class='del'>-	mov	r0, #20</div><div class='del'>-	bl	DELAY9</div><div class='del'>-	mov	r2, r4		/* length */</div><div class='del'>-	mov	r1, r5		/* dest address */</div><div class='del'>-	mov	r0, #2		/* bytes to transfer in command */</div><div class='del'>-	bl	NVRAM_XFER2</div><div class='del'>-	ldmia	sp!, {r4, r5, lr}</div><div class='del'>-	bx	lr</div><div class='del'>-.endfunc</div><div class='del'>-</div><div class='del'>-.func NVRAM_Xfer2, NVRAM_XFER2</div><div class='del'>-NVRAM_XFER2:</div><div class='del'>-	stmdb	sp!, {r4, r5, r6, lr}</div><div class='del'>-	ldr	r4, =SP_BASE</div><div class='del'>-	mov	r3, #0</div><div class='del'>-	cmp	r0, #0</div><div class='del'>-	bls	_local2</div><div class='del'>-	ldr	r5, =NVRAM_SCRATCH</div><div class='del'>-_local4:</div><div class='del'>-	ldrb	r6, [r5, r3]</div><div class='del'>-	str	r6, [r4, #SP_TDR]</div><div class='del'>-_local3:</div><div class='del'>-	ldr	r6, [r4, #SP_SR]</div><div class='del'>-	tst	r6, #SP_TDRE</div><div class='del'>-	beq	_local3</div><div class='del'>-	add	r3, r3, #1</div><div class='del'>-	cmp	r3, r0 /* r0 is # of bytes to send out (command+addr) */</div><div class='del'>-	blo	_local4</div><div class='del'>-_local2:</div><div class='del'>-	mov	r3, #SPI_8CLOCKS</div><div class='del'>-	str	r3, [r4, #SP_TDR]</div><div class='del'>-	ldr	r0, [r4, #SP_RDR]</div><div class='del'>-_local5:</div><div class='del'>-	ldr	r0, [r4, #SP_SR]</div><div class='del'>-	tst	r0, #SP_RDRF</div><div class='del'>-	beq	_local5</div><div class='del'>-	ldr	r0, [r4, #SP_RDR] /* what's this byte?  It's the byte read while writing the TDR -- nonsense, because the NVRAM doesn't read and write at the same time */</div><div class='del'>-	mov	r0, #0</div><div class='del'>-	cmp	r2, #0  /* r2 is # of bytes to copy in */</div><div class='del'>-	bls	_local6</div><div class='del'>-_local7:</div><div class='del'>-	ldr	r5, [r4, #SP_SR]</div><div class='del'>-	tst	r5, #SP_TDRE</div><div class='del'>-	beq	_local7</div><div class='del'>-	str	r3, [r4, #SP_TDR]  /* r3 has SPI_8CLOCKS */</div><div class='del'>-_local8:</div><div class='del'>-	ldr	r5, [r4, #SP_SR]</div><div class='del'>-	tst	r5, #SP_RDRF</div><div class='del'>-	beq	_local8</div><div class='del'>-	ldr	r5, [r4, #SP_RDR] /* but didn't we read this byte above? */</div><div class='del'>-	strb	r5, [r1], #1 /* postindexed */</div><div class='del'>-	add	r0, r0, #1</div><div class='del'>-	cmp	r0, r2</div><div class='del'>-	blo	_local7 /* since we don't send another address, the NVRAM must be capable of sequential reads */</div><div class='del'>-_local6:</div><div class='del'>-	mov	r0, #200</div><div class='del'>-	bl	DELAY9</div><div class='del'>-	ldmia	sp!, {r4, r5, r6, lr}</div><div class='del'>-	bx	lr</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/net/wireless/atmel/atmel.h b/drivers/net/wireless/atmel/atmel.h<br/>deleted file mode 100644<br/>index d2aa52cf6e8b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/atmel/atmel.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/atmel/atmel.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,31 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*** -*- linux-c -*- **********************************************************</div><div class='del'>-</div><div class='del'>-     Driver for Atmel at76c502 at76c504 and at76c506 wireless cards.</div><div class='del'>-</div><div class='del'>-         Copyright 2005 Dan Williams and Red Hat, Inc.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-******************************************************************************/</div><div class='del'>-</div><div class='del'>-#ifndef _ATMEL_H</div><div class='del'>-#define _ATMEL_H</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	ATMEL_FW_TYPE_NONE = 0,</div><div class='del'>-	ATMEL_FW_TYPE_502,</div><div class='del'>-	ATMEL_FW_TYPE_502D,</div><div class='del'>-	ATMEL_FW_TYPE_502E,</div><div class='del'>-	ATMEL_FW_TYPE_502_3COM,</div><div class='del'>-	ATMEL_FW_TYPE_504,</div><div class='del'>-	ATMEL_FW_TYPE_504_2958,</div><div class='del'>-	ATMEL_FW_TYPE_504A_2958,</div><div class='del'>-	ATMEL_FW_TYPE_506</div><div class='del'>-} AtmelFWType;</div><div class='del'>-</div><div class='del'>-struct net_device *init_atmel_card(unsigned short, unsigned long, const AtmelFWType, struct device *, </div><div class='del'>-				    int (*present_func)(void *), void * );</div><div class='del'>-void stop_atmel_card( struct net_device *);</div><div class='del'>-int atmel_open( struct net_device * );</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/net/wireless/atmel/atmel_cs.c b/drivers/net/wireless/atmel/atmel_cs.c<br/>deleted file mode 100644<br/>index 453bb84cb338..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/atmel/atmel_cs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/atmel/atmel_cs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,283 +0,0 @@</div><div class='del'>-/*** -*- linux-c -*- **********************************************************</div><div class='del'>-</div><div class='del'>-     Driver for Atmel at76c502 at76c504 and at76c506 wireless cards.</div><div class='del'>-</div><div class='del'>-        Copyright 2000-2001 ATMEL Corporation.</div><div class='del'>-        Copyright 2003 Simon Kelley.</div><div class='del'>-</div><div class='del'>-    This code was developed from version 2.1.1 of the Atmel drivers,</div><div class='del'>-    released by Atmel corp. under the GPL in December 2002. It also</div><div class='del'>-    includes code from the Linux aironet drivers (C) Benjamin Reed,</div><div class='del'>-    and the Linux PCMCIA package, (C) David Hinds.</div><div class='del'>-</div><div class='del'>-    For all queries about this code, please contact the current author,</div><div class='del'>-    Simon Kelley &lt;simon@thekelleys.org.uk&gt; and not Atmel Corporation.</div><div class='del'>-</div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of the GNU General Public License as published by</div><div class='del'>-    the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-    (at your option) any later version.</div><div class='del'>-</div><div class='del'>-    This software is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with Atmel wireless lan drivers; if not, see</div><div class='del'>-    &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>-</div><div class='del'>-******************************************************************************/</div><div class='del'>-</div><div class='del'>-#ifdef __IN_PCMCIA_PACKAGE__</div><div class='del'>-#include &lt;pcmcia/k_compat.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/ptrace.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;pcmcia/cistpl.h&gt;</div><div class='del'>-#include &lt;pcmcia/cisreg.h&gt;</div><div class='del'>-#include &lt;pcmcia/ds.h&gt;</div><div class='del'>-#include &lt;pcmcia/ciscode.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;linux/wireless.h&gt;</div><div class='del'>-</div><div class='del'>-#include "atmel.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*====================================================================*/</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Simon Kelley");</div><div class='del'>-MODULE_DESCRIPTION("Support for Atmel at76c50x 802.11 wireless ethernet cards.");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-/*====================================================================*/</div><div class='del'>-</div><div class='del'>-static int atmel_config(struct pcmcia_device *link);</div><div class='del'>-static void atmel_release(struct pcmcia_device *link);</div><div class='del'>-</div><div class='del'>-static void atmel_detach(struct pcmcia_device *p_dev);</div><div class='del'>-</div><div class='del'>-struct local_info {</div><div class='del'>-	struct net_device *eth_dev;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int atmel_probe(struct pcmcia_device *p_dev)</div><div class='del'>-{</div><div class='del'>-	struct local_info *local;</div><div class='del'>-</div><div class='del'>-	dev_dbg(&amp;p_dev-&gt;dev, "atmel_attach()\n");</div><div class='del'>-</div><div class='del'>-	/* Allocate space for private device-specific data */</div><div class='del'>-	local = kzalloc(sizeof(*local), GFP_KERNEL);</div><div class='del'>-	if (!local)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	p_dev-&gt;priv = local;</div><div class='del'>-</div><div class='del'>-	return atmel_config(p_dev);</div><div class='del'>-} /* atmel_attach */</div><div class='del'>-</div><div class='del'>-static void atmel_detach(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	dev_dbg(&amp;link-&gt;dev, "atmel_detach\n");</div><div class='del'>-</div><div class='del'>-	atmel_release(link);</div><div class='del'>-</div><div class='del'>-	kfree(link-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Call-back function to interrogate PCMCIA-specific information</div><div class='del'>-   about the current existence of the card */</div><div class='del'>-static int card_present(void *arg)</div><div class='del'>-{</div><div class='del'>-	struct pcmcia_device *link = (struct pcmcia_device *)arg;</div><div class='del'>-</div><div class='del'>-	if (pcmcia_dev_present(link))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_config_check(struct pcmcia_device *p_dev, void *priv_data)</div><div class='del'>-{</div><div class='del'>-	if (p_dev-&gt;config_index == 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return pcmcia_request_io(p_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_config(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	const struct pcmcia_device_id *did;</div><div class='del'>-</div><div class='del'>-	did = dev_get_drvdata(&amp;link-&gt;dev);</div><div class='del'>-</div><div class='del'>-	dev_dbg(&amp;link-&gt;dev, "atmel_config\n");</div><div class='del'>-</div><div class='del'>-	link-&gt;config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_VPP |</div><div class='del'>-		CONF_AUTO_AUDIO | CONF_AUTO_SET_IO;</div><div class='del'>-</div><div class='del'>-	if (pcmcia_loop_config(link, atmel_config_check, NULL))</div><div class='del'>-		goto failed;</div><div class='del'>-</div><div class='del'>-	if (!link-&gt;irq) {</div><div class='del'>-		dev_err(&amp;link-&gt;dev, "atmel: cannot assign IRQ: check that CONFIG_ISA is set in kernel config.");</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = pcmcia_enable_device(link);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto failed;</div><div class='del'>-</div><div class='del'>-	((struct local_info *)link-&gt;priv)-&gt;eth_dev =</div><div class='del'>-		init_atmel_card(link-&gt;irq,</div><div class='del'>-				link-&gt;resource[0]-&gt;start,</div><div class='del'>-				did ? did-&gt;driver_info : ATMEL_FW_TYPE_NONE,</div><div class='del'>-				&amp;link-&gt;dev,</div><div class='del'>-				card_present,</div><div class='del'>-				link);</div><div class='del'>-	if (!((struct local_info *)link-&gt;priv)-&gt;eth_dev)</div><div class='del'>-			goto failed;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- failed:</div><div class='del'>-	atmel_release(link);</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void atmel_release(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = ((struct local_info *)link-&gt;priv)-&gt;eth_dev;</div><div class='del'>-</div><div class='del'>-	dev_dbg(&amp;link-&gt;dev, "atmel_release\n");</div><div class='del'>-</div><div class='del'>-	if (dev)</div><div class='del'>-		stop_atmel_card(dev);</div><div class='del'>-	((struct local_info *)link-&gt;priv)-&gt;eth_dev = NULL;</div><div class='del'>-</div><div class='del'>-	pcmcia_disable_device(link);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_suspend(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	struct local_info *local = link-&gt;priv;</div><div class='del'>-</div><div class='del'>-	netif_device_detach(local-&gt;eth_dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_resume(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	struct local_info *local = link-&gt;priv;</div><div class='del'>-</div><div class='del'>-	atmel_open(local-&gt;eth_dev);</div><div class='del'>-	netif_device_attach(local-&gt;eth_dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*====================================================================*/</div><div class='del'>-/* We use the driver_info field to store the correct firmware type for a card. */</div><div class='del'>-</div><div class='del'>-#define PCMCIA_DEVICE_MANF_CARD_INFO(manf, card, info) { \</div><div class='del'>-	.match_flags = PCMCIA_DEV_ID_MATCH_MANF_ID| \</div><div class='del'>-			PCMCIA_DEV_ID_MATCH_CARD_ID, \</div><div class='del'>-	.manf_id = (manf), \</div><div class='del'>-	.card_id = (card), \</div><div class='del'>-        .driver_info = (kernel_ulong_t)(info), }</div><div class='del'>-</div><div class='del'>-#define PCMCIA_DEVICE_PROD_ID12_INFO(v1, v2, vh1, vh2, info) { \</div><div class='del'>-	.match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID1| \</div><div class='del'>-			PCMCIA_DEV_ID_MATCH_PROD_ID2, \</div><div class='del'>-	.prod_id = { (v1), (v2), NULL, NULL }, \</div><div class='del'>-	.prod_id_hash = { (vh1), (vh2), 0, 0 }, \</div><div class='del'>-        .driver_info = (kernel_ulong_t)(info), }</div><div class='del'>-</div><div class='del'>-static const struct pcmcia_device_id atmel_ids[] = {</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD_INFO(0x0101, 0x0620, ATMEL_FW_TYPE_502_3COM),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD_INFO(0x0101, 0x0696, ATMEL_FW_TYPE_502_3COM),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD_INFO(0x01bf, 0x3302, ATMEL_FW_TYPE_502E),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD_INFO(0xd601, 0x0007, ATMEL_FW_TYPE_502),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12_INFO("11WAVE", "11WP611AL-E", 0x9eb2da1f, 0xc9a0d3f9, ATMEL_FW_TYPE_502E),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12_INFO("ATMEL", "AT76C502AR", 0xabda4164, 0x41b37e1f, ATMEL_FW_TYPE_502),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12_INFO("ATMEL", "AT76C502AR_D", 0xabda4164, 0x3675d704, ATMEL_FW_TYPE_502D),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12_INFO("ATMEL", "AT76C502AR_E", 0xabda4164, 0x4172e792, ATMEL_FW_TYPE_502E),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12_INFO("ATMEL", "AT76C504_R", 0xabda4164, 0x917f3d72, ATMEL_FW_TYPE_504_2958),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12_INFO("ATMEL", "AT76C504", 0xabda4164, 0x5040670a, ATMEL_FW_TYPE_504),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12_INFO("ATMEL", "AT76C504A", 0xabda4164, 0xe15ed87f, ATMEL_FW_TYPE_504A_2958),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12_INFO("BT", "Voyager 1020 Laptop Adapter", 0xae49b86a, 0x1e957cd5, ATMEL_FW_TYPE_502),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12_INFO("CNet", "CNWLC 11Mbps Wireless PC Card V-5", 0xbc477dde, 0x502fae6b, ATMEL_FW_TYPE_502E),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12_INFO("IEEE 802.11b", "Wireless LAN PC Card", 0x5b878724, 0x122f1df6, ATMEL_FW_TYPE_502),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12_INFO("IEEE 802.11b", "Wireless LAN Card S", 0x5b878724, 0x5fba533a, ATMEL_FW_TYPE_504_2958),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12_INFO("OEM", "11Mbps Wireless LAN PC Card V-3", 0xfea54c90, 0x1c5b0f68, ATMEL_FW_TYPE_502),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12_INFO("SMC", "2632W", 0xc4f8b18b, 0x30f38774, ATMEL_FW_TYPE_502D),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12_INFO("SMC", "2632W-V2", 0xc4f8b18b, 0x172d1377, ATMEL_FW_TYPE_502),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12_INFO("Wireless", "PC_CARD", 0xa407ecdd, 0x119f6314, ATMEL_FW_TYPE_502D),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12_INFO("WLAN", "802.11b PC CARD", 0x575c516c, 0xb1f6dbc4, ATMEL_FW_TYPE_502D),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12_INFO("LG", "LW2100N", 0xb474d43a, 0x6b1fec94, ATMEL_FW_TYPE_502E),</div><div class='del'>-	PCMCIA_DEVICE_NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_DEVICE_TABLE(pcmcia, atmel_ids);</div><div class='del'>-</div><div class='del'>-static struct pcmcia_driver atmel_driver = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.name		= "atmel_cs",</div><div class='del'>-	.probe          = atmel_probe,</div><div class='del'>-	.remove		= atmel_detach,</div><div class='del'>-	.id_table	= atmel_ids,</div><div class='del'>-	.suspend	= atmel_suspend,</div><div class='del'>-	.resume		= atmel_resume,</div><div class='del'>-};</div><div class='del'>-module_pcmcia_driver(atmel_driver);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-    This program is free software; you can redistribute it and/or</div><div class='del'>-    modify it under the terms of the GNU General Public License</div><div class='del'>-    as published by the Free Software Foundation; either version 2</div><div class='del'>-    of the License, or (at your option) any later version.</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    In addition:</div><div class='del'>-</div><div class='del'>-    Redistribution and use in source and binary forms, with or without</div><div class='del'>-    modification, are permitted provided that the following conditions</div><div class='del'>-    are met:</div><div class='del'>-</div><div class='del'>-    1. Redistributions of source code must retain the above copyright</div><div class='del'>-       notice, this list of conditions and the following disclaimer.</div><div class='del'>-    2. Redistributions in binary form must reproduce the above copyright</div><div class='del'>-       notice, this list of conditions and the following disclaimer in the</div><div class='del'>-       documentation and/or other materials provided with the distribution.</div><div class='del'>-    3. The name of the author may not be used to endorse or promote</div><div class='del'>-       products derived from this software without specific prior written</div><div class='del'>-       permission.</div><div class='del'>-</div><div class='del'>-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR</div><div class='del'>-    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='del'>-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>-    ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,</div><div class='del'>-    INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR</div><div class='del'>-    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)</div><div class='del'>-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,</div><div class='del'>-    STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING</div><div class='del'>-    IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE</div><div class='del'>-    POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>-*/</div><div class='head'>diff --git a/drivers/net/wireless/atmel/atmel_pci.c b/drivers/net/wireless/atmel/atmel_pci.c<br/>deleted file mode 100644<br/>index f428dc79d916..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/atmel/atmel_pci.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/atmel/atmel_pci.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,65 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*** -*- linux-c -*- **********************************************************</div><div class='del'>-</div><div class='del'>-     Driver for Atmel at76c502 at76c504 and at76c506 wireless cards.</div><div class='del'>-</div><div class='del'>-         Copyright 2004 Simon Kelley.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-******************************************************************************/</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include "atmel.h"</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Simon Kelley");</div><div class='del'>-MODULE_DESCRIPTION("Support for Atmel at76c50x 802.11 wireless ethernet cards.");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-static const struct pci_device_id card_ids[] = {</div><div class='del'>-	{ 0x1114, 0x0506, PCI_ANY_ID, PCI_ANY_ID },</div><div class='del'>-	{ 0, }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_DEVICE_TABLE(pci, card_ids);</div><div class='del'>-</div><div class='del'>-static int atmel_pci_probe(struct pci_dev *, const struct pci_device_id *);</div><div class='del'>-static void atmel_pci_remove(struct pci_dev *);</div><div class='del'>-</div><div class='del'>-static struct pci_driver atmel_driver = {</div><div class='del'>-	.name     = "atmel",</div><div class='del'>-	.id_table = card_ids,</div><div class='del'>-	.probe    = atmel_pci_probe,</div><div class='del'>-	.remove   = atmel_pci_remove,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int atmel_pci_probe(struct pci_dev *pdev,</div><div class='del'>-				     const struct pci_device_id *pent)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-</div><div class='del'>-	if (pci_enable_device(pdev))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	pci_set_master(pdev);</div><div class='del'>-</div><div class='del'>-	dev = init_atmel_card(pdev-&gt;irq, pdev-&gt;resource[1].start,</div><div class='del'>-			      ATMEL_FW_TYPE_506,</div><div class='del'>-			      &amp;pdev-&gt;dev, NULL, NULL);</div><div class='del'>-	if (!dev) {</div><div class='del'>-		pci_disable_device(pdev);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pci_set_drvdata(pdev, dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void atmel_pci_remove(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	stop_atmel_card(pci_get_drvdata(pdev));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_pci_driver(atmel_driver);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43/b43.h b/drivers/net/wireless/broadcom/b43/b43.h<br/>index 9fc7c088a539..c0d8fc0b22fb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/b43.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/b43.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/b43.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43/b43.h</a></div><div class='hunk'>@@ -651,7 +651,7 @@ struct b43_iv {</div><div class='ctx'> 	union {</div><div class='ctx'> 		__be16 d16;</div><div class='ctx'> 		__be32 d32;</div><div class='del'>-	} data __packed;</div><div class='add'>+	} __packed data;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1082,6 +1082,22 @@ static inline bool b43_using_pio_transfers(struct b43_wldev *dev)</div><div class='ctx'> 	return dev-&gt;__using_pio_transfers;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void b43_wake_queue(struct b43_wldev *dev, int queue_prio)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;qos_enabled)</div><div class='add'>+		ieee80211_wake_queue(dev-&gt;wl-&gt;hw, queue_prio);</div><div class='add'>+	else</div><div class='add'>+		ieee80211_wake_queue(dev-&gt;wl-&gt;hw, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void b43_stop_queue(struct b43_wldev *dev, int queue_prio)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;qos_enabled)</div><div class='add'>+		ieee80211_stop_queue(dev-&gt;wl-&gt;hw, queue_prio);</div><div class='add'>+	else</div><div class='add'>+		ieee80211_stop_queue(dev-&gt;wl-&gt;hw, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Message printing */</div><div class='ctx'> __printf(2, 3) void b43info(struct b43_wl *wl, const char *fmt, ...);</div><div class='ctx'> __printf(2, 3) void b43err(struct b43_wl *wl, const char *fmt, ...);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43/debugfs.c b/drivers/net/wireless/broadcom/b43/debugfs.c<br/>index 89a25aefb327..5a49970afc8c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/debugfs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43/debugfs.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@ static struct dentry *rootdir;</div><div class='ctx'> struct b43_debugfs_fops {</div><div class='ctx'> 	ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);</div><div class='ctx'> 	int (*write)(struct b43_wldev *dev, const char *buf, size_t count);</div><div class='del'>-	struct file_operations fops;</div><div class='ctx'> 	/* Offset of struct b43_dfs_file in struct b43_dfsentry */</div><div class='ctx'> 	size_t file_struct_offset;</div><div class='ctx'> };</div><div class='hunk'>@@ -491,7 +490,7 @@ static ssize_t b43_debugfs_read(struct file *file, char __user *userbuf,</div><div class='ctx'> 				size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_wldev *dev;</div><div class='del'>-	struct b43_debugfs_fops *dfops;</div><div class='add'>+	const struct b43_debugfs_fops *dfops;</div><div class='ctx'> 	struct b43_dfs_file *dfile;</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> 	char *buf;</div><div class='hunk'>@@ -511,8 +510,7 @@ static ssize_t b43_debugfs_read(struct file *file, char __user *userbuf,</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dfops = container_of(debugfs_real_fops(file),</div><div class='del'>-			     struct b43_debugfs_fops, fops);</div><div class='add'>+	dfops = debugfs_get_aux(file);</div><div class='ctx'> 	if (!dfops-&gt;read) {</div><div class='ctx'> 		err = -ENOSYS;</div><div class='ctx'> 		goto out_unlock;</div><div class='hunk'>@@ -555,7 +553,7 @@ static ssize_t b43_debugfs_write(struct file *file,</div><div class='ctx'> 				 size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_wldev *dev;</div><div class='del'>-	struct b43_debugfs_fops *dfops;</div><div class='add'>+	const struct b43_debugfs_fops *dfops;</div><div class='ctx'> 	char *buf;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -573,8 +571,7 @@ static ssize_t b43_debugfs_write(struct file *file,</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dfops = container_of(debugfs_real_fops(file),</div><div class='del'>-			     struct b43_debugfs_fops, fops);</div><div class='add'>+	dfops = debugfs_get_aux(file);</div><div class='ctx'> 	if (!dfops-&gt;write) {</div><div class='ctx'> 		err = -ENOSYS;</div><div class='ctx'> 		goto out_unlock;</div><div class='hunk'>@@ -602,16 +599,16 @@ out_unlock:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+static struct debugfs_short_fops debugfs_ops = {</div><div class='add'>+	.read	= b43_debugfs_read,</div><div class='add'>+	.write	= b43_debugfs_write,</div><div class='add'>+	.llseek = generic_file_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define B43_DEBUGFS_FOPS(name, _read, _write)			\</div><div class='ctx'> 	static struct b43_debugfs_fops fops_##name = {		\</div><div class='ctx'> 		.read	= _read,				\</div><div class='ctx'> 		.write	= _write,				\</div><div class='del'>-		.fops	= {					\</div><div class='del'>-			.open	= simple_open,			\</div><div class='del'>-			.read	= b43_debugfs_read,		\</div><div class='del'>-			.write	= b43_debugfs_write,		\</div><div class='del'>-			.llseek = generic_file_llseek,		\</div><div class='del'>-		},						\</div><div class='ctx'> 		.file_struct_offset = offsetof(struct b43_dfsentry, \</div><div class='ctx'> 					       file_##name),	\</div><div class='ctx'> 	}</div><div class='hunk'>@@ -643,24 +640,14 @@ bool b43_debug(struct b43_wldev *dev, enum b43_dyndbg feature)</div><div class='ctx'> 	return enabled;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void b43_remove_dynamic_debug(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct b43_dfsentry *e = dev-&gt;dfsentry;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; __B43_NR_DYNDBG; i++)</div><div class='del'>-		debugfs_remove(e-&gt;dyn_debug_dentries[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void b43_add_dynamic_debug(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_dfsentry *e = dev-&gt;dfsentry;</div><div class='ctx'> </div><div class='ctx'> #define add_dyn_dbg(name, id, initstate) do {			\</div><div class='ctx'> 	e-&gt;dyn_debug[id] = (initstate);				\</div><div class='del'>-	e-&gt;dyn_debug_dentries[id] =				\</div><div class='del'>-		debugfs_create_bool(name, 0600, e-&gt;subdir,	\</div><div class='del'>-				&amp;(e-&gt;dyn_debug[id]));		\</div><div class='add'>+	debugfs_create_bool(name, 0600, e-&gt;subdir,		\</div><div class='add'>+			    &amp;(e-&gt;dyn_debug[id]));		\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> 	add_dyn_dbg("debug_xmitpower", B43_DBG_XMITPOWER, false);</div><div class='hunk'>@@ -713,10 +700,9 @@ void b43_debugfs_add_device(struct b43_wldev *dev)</div><div class='ctx'> </div><div class='ctx'> #define ADD_FILE(name, mode)	\</div><div class='ctx'> 	do {							\</div><div class='del'>-		e-&gt;file_##name.dentry =				\</div><div class='del'>-			debugfs_create_file(__stringify(name),	\</div><div class='del'>-					mode, e-&gt;subdir, dev,	\</div><div class='del'>-					&amp;fops_##name.fops);	\</div><div class='add'>+		debugfs_create_file_aux(__stringify(name),	\</div><div class='add'>+				mode, e-&gt;subdir, dev,		\</div><div class='add'>+				&amp;fops_##name, &amp;debugfs_ops);	\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -746,19 +732,6 @@ void b43_debugfs_remove_device(struct b43_wldev *dev)</div><div class='ctx'> 	e = dev-&gt;dfsentry;</div><div class='ctx'> 	if (!e)</div><div class='ctx'> 		return;</div><div class='del'>-	b43_remove_dynamic_debug(dev);</div><div class='del'>-</div><div class='del'>-	debugfs_remove(e-&gt;file_shm16read.dentry);</div><div class='del'>-	debugfs_remove(e-&gt;file_shm16write.dentry);</div><div class='del'>-	debugfs_remove(e-&gt;file_shm32read.dentry);</div><div class='del'>-	debugfs_remove(e-&gt;file_shm32write.dentry);</div><div class='del'>-	debugfs_remove(e-&gt;file_mmio16read.dentry);</div><div class='del'>-	debugfs_remove(e-&gt;file_mmio16write.dentry);</div><div class='del'>-	debugfs_remove(e-&gt;file_mmio32read.dentry);</div><div class='del'>-	debugfs_remove(e-&gt;file_mmio32write.dentry);</div><div class='del'>-	debugfs_remove(e-&gt;file_txstat.dentry);</div><div class='del'>-	debugfs_remove(e-&gt;file_restart.dentry);</div><div class='del'>-	debugfs_remove(e-&gt;file_loctls.dentry);</div><div class='ctx'> </div><div class='ctx'> 	debugfs_remove(e-&gt;subdir);</div><div class='ctx'> 	kfree(e-&gt;txstatlog.log);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43/debugfs.h b/drivers/net/wireless/broadcom/b43/debugfs.h<br/>index 0bf437c86c67..6f6b500b8881 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/debugfs.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/debugfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/debugfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43/debugfs.h</a></div><div class='hunk'>@@ -32,7 +32,6 @@ struct b43_txstatus_log {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct b43_dfs_file {</div><div class='del'>-	struct dentry *dentry;</div><div class='ctx'> 	char *buffer;</div><div class='ctx'> 	size_t data_len;</div><div class='ctx'> };</div><div class='hunk'>@@ -70,8 +69,6 @@ struct b43_dfsentry {</div><div class='ctx'> </div><div class='ctx'> 	/* Enabled/Disabled list for the dynamic debugging features. */</div><div class='ctx'> 	bool dyn_debug[__B43_NR_DYNDBG];</div><div class='del'>-	/* Dentries for the dynamic debugging entries. */</div><div class='del'>-	struct dentry *dyn_debug_dentries[__B43_NR_DYNDBG];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> bool b43_debug(struct b43_wldev *dev, enum b43_dyndbg feature);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43/dma.c b/drivers/net/wireless/broadcom/b43/dma.c<br/>index 9a7c62bd5e43..6ac7dcebfff9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/dma.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/dma.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/dma.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43/dma.c</a></div><div class='hunk'>@@ -1399,7 +1399,7 @@ int b43_dma_tx(struct b43_wldev *dev, struct sk_buff *skb)</div><div class='ctx'> 	    should_inject_overflow(ring)) {</div><div class='ctx'> 		/* This TX ring is full. */</div><div class='ctx'> 		unsigned int skb_mapping = skb_get_queue_mapping(skb);</div><div class='del'>-		ieee80211_stop_queue(dev-&gt;wl-&gt;hw, skb_mapping);</div><div class='add'>+		b43_stop_queue(dev, skb_mapping);</div><div class='ctx'> 		dev-&gt;wl-&gt;tx_queue_stopped[skb_mapping] = true;</div><div class='ctx'> 		ring-&gt;stopped = true;</div><div class='ctx'> 		if (b43_debug(dev, B43_DBG_DMAVERBOSE)) {</div><div class='hunk'>@@ -1531,9 +1531,9 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev,</div><div class='ctx'> 				ring-&gt;nr_failed_tx_packets++;</div><div class='ctx'> 			ring-&gt;nr_total_packet_tries += status-&gt;frame_count;</div><div class='ctx'> #endif /* DEBUG */</div><div class='del'>-			ieee80211_tx_status(dev-&gt;wl-&gt;hw, meta-&gt;skb);</div><div class='add'>+			ieee80211_tx_status_skb(dev-&gt;wl-&gt;hw, meta-&gt;skb);</div><div class='ctx'> </div><div class='del'>-			/* skb will be freed by ieee80211_tx_status().</div><div class='add'>+			/* skb will be freed by ieee80211_tx_status_skb().</div><div class='ctx'> 			 * Poison our pointer. */</div><div class='ctx'> 			meta-&gt;skb = B43_DMA_PTR_POISON;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -1570,7 +1570,7 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* If the driver queue is running wake the corresponding</div><div class='ctx'> 		 * mac80211 queue. */</div><div class='del'>-		ieee80211_wake_queue(dev-&gt;wl-&gt;hw, ring-&gt;queue_prio);</div><div class='add'>+		b43_wake_queue(dev, ring-&gt;queue_prio);</div><div class='ctx'> 		if (b43_debug(dev, B43_DBG_DMAVERBOSE)) {</div><div class='ctx'> 			b43dbg(dev-&gt;wl, "Woke up TX ring %d\n", ring-&gt;index);</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43/leds.c b/drivers/net/wireless/broadcom/b43/leds.c<br/>index 982a772a9d87..bfe1be345844 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/leds.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/leds.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/leds.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43/leds.c</a></div><div class='hunk'>@@ -118,7 +118,7 @@ static int b43_register_led(struct b43_wldev *dev, struct b43_led *led,</div><div class='ctx'> 	led-&gt;wl = dev-&gt;wl;</div><div class='ctx'> 	led-&gt;index = led_index;</div><div class='ctx'> 	led-&gt;activelow = activelow;</div><div class='del'>-	strlcpy(led-&gt;name, name, sizeof(led-&gt;name));</div><div class='add'>+	strscpy(led-&gt;name, name, sizeof(led-&gt;name));</div><div class='ctx'> 	atomic_set(&amp;led-&gt;state, 0);</div><div class='ctx'> </div><div class='ctx'> 	led-&gt;led_dev.name = led-&gt;name;</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43/main.c b/drivers/net/wireless/broadcom/b43/main.c<br/>index 17bcec5f3ff7..f1a77c4c445f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43/main.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "b43.h"</div><div class='ctx'> #include "main.h"</div><div class='hunk'>@@ -105,7 +105,7 @@ int b43_modparam_verbose = B43_VERBOSITY_DEFAULT;</div><div class='ctx'> module_param_named(verbose, b43_modparam_verbose, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(verbose, "Log message verbosity: 0=error, 1=warn, 2=info(default), 3=debug");</div><div class='ctx'> </div><div class='del'>-static int b43_modparam_pio = 0;</div><div class='add'>+static int b43_modparam_pio;</div><div class='ctx'> module_param_named(pio, b43_modparam_pio, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(pio, "Use PIO accesses by default: 0=DMA, 1=PIO");</div><div class='ctx'> </div><div class='hunk'>@@ -366,7 +366,7 @@ static int b43_wireless_core_start(struct b43_wldev *dev);</div><div class='ctx'> static void b43_op_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 				    struct ieee80211_vif *vif,</div><div class='ctx'> 				    struct ieee80211_bss_conf *conf,</div><div class='del'>-				    u32 changed);</div><div class='add'>+				    u64 changed);</div><div class='ctx'> </div><div class='ctx'> static int b43_ratelimit(struct b43_wl *wl)</div><div class='ctx'> {</div><div class='hunk'>@@ -1832,7 +1832,7 @@ static void b43_update_templates(struct b43_wl *wl)</div><div class='ctx'> 	 * the TIM field, but that would probably require resizing and</div><div class='ctx'> 	 * moving of data within the beacon template.</div><div class='ctx'> 	 * Simply request a new beacon and let mac80211 do the hard work. */</div><div class='del'>-	beacon = ieee80211_beacon_get(wl-&gt;hw, wl-&gt;vif);</div><div class='add'>+	beacon = ieee80211_beacon_get(wl-&gt;hw, wl-&gt;vif, 0);</div><div class='ctx'> 	if (unlikely(!beacon))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -2166,7 +2166,7 @@ static void b43_print_fw_helptext(struct b43_wl *wl, bool error)</div><div class='ctx'> {</div><div class='ctx'> 	const char text[] =</div><div class='ctx'> 		"You must go to " \</div><div class='del'>-		"https://wireless.wiki.kernel.org/en/users/Drivers/b43#devicefirmware " \</div><div class='add'>+		"https://wireless.docs.kernel.org/en/latest/en/users/drivers/b43/developers.html#list-of-firmware " \</div><div class='ctx'> 		"and download the correct firmware for this driver version. " \</div><div class='ctx'> 		"Please carefully read all instructions on this website.\n";</div><div class='ctx'> </div><div class='hunk'>@@ -2587,7 +2587,8 @@ static void b43_request_firmware(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> start_ieee80211:</div><div class='ctx'> 	wl-&gt;hw-&gt;queues = B43_QOS_QUEUE_NUM;</div><div class='del'>-	if (!modparam_qos || dev-&gt;fw.opensource)</div><div class='add'>+	if (!modparam_qos || dev-&gt;fw.opensource ||</div><div class='add'>+	    dev-&gt;dev-&gt;chip_id == BCMA_CHIP_ID_BCM4331)</div><div class='ctx'> 		wl-&gt;hw-&gt;queues = 1;</div><div class='ctx'> </div><div class='ctx'> 	err = ieee80211_register_hw(wl-&gt;hw);</div><div class='hunk'>@@ -3603,7 +3604,7 @@ static void b43_tx_work(struct work_struct *work)</div><div class='ctx'> 				err = b43_dma_tx(dev, skb);</div><div class='ctx'> 			if (err == -ENOSPC) {</div><div class='ctx'> 				wl-&gt;tx_queue_stopped[queue_num] = true;</div><div class='del'>-				ieee80211_stop_queue(wl-&gt;hw, queue_num);</div><div class='add'>+				b43_stop_queue(dev, queue_num);</div><div class='ctx'> 				skb_queue_head(&amp;wl-&gt;tx_queue[queue_num], skb);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -3627,6 +3628,7 @@ static void b43_op_tx(struct ieee80211_hw *hw,</div><div class='ctx'> 		      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_wl *wl = hw_to_b43_wl(hw);</div><div class='add'>+	u16 skb_queue_mapping;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(skb-&gt;len &lt; 2 + 2 + 6)) {</div><div class='ctx'> 		/* Too short, this can't be a valid frame. */</div><div class='hunk'>@@ -3635,12 +3637,12 @@ static void b43_op_tx(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> 	B43_WARN_ON(skb_shinfo(skb)-&gt;nr_frags);</div><div class='ctx'> </div><div class='del'>-	skb_queue_tail(&amp;wl-&gt;tx_queue[skb-&gt;queue_mapping], skb);</div><div class='del'>-	if (!wl-&gt;tx_queue_stopped[skb-&gt;queue_mapping]) {</div><div class='add'>+	skb_queue_mapping = skb_get_queue_mapping(skb);</div><div class='add'>+	skb_queue_tail(&amp;wl-&gt;tx_queue[skb_queue_mapping], skb);</div><div class='add'>+	if (!wl-&gt;tx_queue_stopped[skb_queue_mapping])</div><div class='ctx'> 		ieee80211_queue_work(wl-&gt;hw, &amp;wl-&gt;tx_work);</div><div class='del'>-	} else {</div><div class='del'>-		ieee80211_stop_queue(wl-&gt;hw, skb-&gt;queue_mapping);</div><div class='del'>-	}</div><div class='add'>+	else</div><div class='add'>+		b43_stop_queue(wl-&gt;current_dev, skb_queue_mapping);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void b43_qos_params_upload(struct b43_wldev *dev,</div><div class='hunk'>@@ -3783,7 +3785,8 @@ static void b43_qos_init(struct b43_wldev *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int b43_op_conf_tx(struct ieee80211_hw *hw,</div><div class='del'>-			  struct ieee80211_vif *vif, u16 _queue,</div><div class='add'>+			  struct ieee80211_vif *vif,</div><div class='add'>+			  unsigned int link_id, u16 _queue,</div><div class='ctx'> 			  const struct ieee80211_tx_queue_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_wl *wl = hw_to_b43_wl(hw);</div><div class='hunk'>@@ -3972,7 +3975,7 @@ static void b43_set_retry_limits(struct b43_wldev *dev,</div><div class='ctx'> 			long_retry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int b43_op_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+static int b43_op_config(struct ieee80211_hw *hw, int radio_idx, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_wl *wl = hw_to_b43_wl(hw);</div><div class='ctx'> 	struct b43_wldev *dev = wl-&gt;current_dev;</div><div class='hunk'>@@ -4097,7 +4100,7 @@ static void b43_update_basic_rates(struct b43_wldev *dev, u32 brates)</div><div class='ctx'> static void b43_op_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 				    struct ieee80211_vif *vif,</div><div class='ctx'> 				    struct ieee80211_bss_conf *conf,</div><div class='del'>-				    u32 changed)</div><div class='add'>+				    u64 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_wl *wl = hw_to_b43_wl(hw);</div><div class='ctx'> 	struct b43_wldev *dev;</div><div class='hunk'>@@ -5070,12 +5073,12 @@ static int b43_op_start(struct ieee80211_hw *hw)</div><div class='ctx'> 	 * may hang the system.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!err)</div><div class='del'>-		b43_op_config(hw, ~0);</div><div class='add'>+		b43_op_config(hw, -1, ~0);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void b43_op_stop(struct ieee80211_hw *hw)</div><div class='add'>+static void b43_op_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_wl *wl = hw_to_b43_wl(hw);</div><div class='ctx'> 	struct b43_wldev *dev = wl-&gt;current_dev;</div><div class='hunk'>@@ -5169,7 +5172,12 @@ static int b43_op_get_survey(struct ieee80211_hw *hw, int idx,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ieee80211_ops b43_hw_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.tx			= b43_op_tx,</div><div class='add'>+	.wake_tx_queue		= ieee80211_handle_wake_tx_queue,</div><div class='ctx'> 	.conf_tx		= b43_op_conf_tx,</div><div class='ctx'> 	.add_interface		= b43_op_add_interface,</div><div class='ctx'> 	.remove_interface	= b43_op_remove_interface,</div><div class='hunk'>@@ -5240,7 +5248,7 @@ out:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* reload configuration */</div><div class='del'>-	b43_op_config(wl-&gt;hw, ~0);</div><div class='add'>+	b43_op_config(wl-&gt;hw, -1, ~0);</div><div class='ctx'> 	if (wl-&gt;vif)</div><div class='ctx'> 		b43_op_bss_info_changed(wl-&gt;hw, wl-&gt;vif, &amp;wl-&gt;vif-&gt;bss_conf, ~0);</div><div class='ctx'> </div><div class='hunk'>@@ -5782,15 +5790,12 @@ void b43_controller_restart(struct b43_wldev *dev, const char *reason)</div><div class='ctx'> </div><div class='ctx'> static void b43_print_driverinfo(void)</div><div class='ctx'> {</div><div class='del'>-	const char *feat_pci = "", *feat_pcmcia = "", *feat_nphy = "",</div><div class='add'>+	const char *feat_pci = "", *feat_nphy = "",</div><div class='ctx'> 		   *feat_leds = "", *feat_sdio = "";</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_B43_PCI_AUTOSELECT</div><div class='ctx'> 	feat_pci = "P";</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_B43_PCMCIA</div><div class='del'>-	feat_pcmcia = "M";</div><div class='del'>-#endif</div><div class='ctx'> #ifdef CONFIG_B43_PHY_N</div><div class='ctx'> 	feat_nphy = "N";</div><div class='ctx'> #endif</div><div class='hunk'>@@ -5801,9 +5806,8 @@ static void b43_print_driverinfo(void)</div><div class='ctx'> 	feat_sdio = "S";</div><div class='ctx'> #endif</div><div class='ctx'> 	printk(KERN_INFO "Broadcom 43xx driver loaded "</div><div class='del'>-	       "[ Features: %s%s%s%s%s ]\n",</div><div class='del'>-	       feat_pci, feat_pcmcia, feat_nphy,</div><div class='del'>-	       feat_leds, feat_sdio);</div><div class='add'>+	       "[ Features: %s%s%s%s ]\n",</div><div class='add'>+	       feat_pci, feat_nphy, feat_leds, feat_sdio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init b43_init(void)</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43/phy_common.h b/drivers/net/wireless/broadcom/b43/phy_common.h<br/>index 4213caca9117..5ec5233acf40 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/phy_common.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/phy_common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/phy_common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43/phy_common.h</a></div><div class='hunk'>@@ -88,7 +88,7 @@ enum b43_txpwr_result {</div><div class='ctx'>  * 			initialized here.</div><div class='ctx'>  * 			Must not be NULL.</div><div class='ctx'>  * @prepare_hardware:	Prepare the PHY. This is called before b43_chip_init to</div><div class='del'>- * 			do some early early PHY hardware init.</div><div class='add'>+ * 			do some early PHY hardware init.</div><div class='ctx'>  * 			Can be NULL, if not required.</div><div class='ctx'>  * @init:		Initialize the PHY.</div><div class='ctx'>  * 			Must not be NULL.</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43/phy_g.c b/drivers/net/wireless/broadcom/b43/phy_g.c<br/>index d5a1a5c58236..ac72ca39e409 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/phy_g.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/phy_g.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/phy_g.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43/phy_g.c</a></div><div class='hunk'>@@ -2297,7 +2297,7 @@ static u8 b43_gphy_aci_scan(struct b43_wldev *dev)</div><div class='ctx'> 	b43_phy_mask(dev, B43_PHY_G_CRS, 0x7FFF);</div><div class='ctx'> 	b43_set_all_gains(dev, 3, 8, 1);</div><div class='ctx'> </div><div class='del'>-	start = (channel - 5 &gt; 0) ? channel - 5 : 1;</div><div class='add'>+	start = (channel &gt; 5) ? channel - 5 : 1;</div><div class='ctx'> 	end = (channel + 5 &lt; 14) ? channel + 5 : 13;</div><div class='ctx'> </div><div class='ctx'> 	for (i = start; i &lt;= end; i++) {</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43/phy_ht.c b/drivers/net/wireless/broadcom/b43/phy_ht.c<br/>index d050971d150a..26a226126bc4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/phy_ht.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/phy_ht.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/phy_ht.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43/phy_ht.c</a></div><div class='hunk'>@@ -322,8 +322,8 @@ static void b43_phy_ht_bphy_reset(struct b43_wldev *dev, bool reset)</div><div class='ctx'> 			    B43_PHY_B_BBCFG_RSTCCA | B43_PHY_B_BBCFG_RSTRX);</div><div class='ctx'> 	else</div><div class='ctx'> 		b43_phy_mask(dev, B43_PHY_B_BBCFG,</div><div class='del'>-			     (u16)~(B43_PHY_B_BBCFG_RSTCCA |</div><div class='del'>-				    B43_PHY_B_BBCFG_RSTRX));</div><div class='add'>+			     0xffff &amp; ~(B43_PHY_B_BBCFG_RSTCCA |</div><div class='add'>+					B43_PHY_B_BBCFG_RSTRX));</div><div class='ctx'> </div><div class='ctx'> 	b43_write16(dev, B43_MMIO_PSM_PHY_HDR, tmp);</div><div class='ctx'> }</div><div class='hunk'>@@ -551,7 +551,7 @@ static void b43_phy_ht_tx_power_ctl(struct b43_wldev *dev, bool enable)</div><div class='ctx'> 				phy_ht-&gt;tx_pwr_idx[i] =</div><div class='ctx'> 					b43_phy_read(dev, status_regs[i]);</div><div class='ctx'> 		}</div><div class='del'>-		b43_phy_mask(dev, B43_PHY_HT_TXPCTL_CMD_C1, ~en_bits);</div><div class='add'>+		b43_phy_mask(dev, B43_PHY_HT_TXPCTL_CMD_C1, 0xffff &amp; ~en_bits);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		b43_phy_set(dev, B43_PHY_HT_TXPCTL_CMD_C1, en_bits);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43/phy_n.c b/drivers/net/wireless/broadcom/b43/phy_n.c<br/>index 665b737fbb0d..4bb005b93f2c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/phy_n.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/phy_n.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/phy_n.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43/phy_n.c</a></div><div class='hunk'>@@ -582,7 +582,7 @@ static void b43_nphy_adjust_lna_gain_table(struct b43_wldev *dev)</div><div class='ctx'> 	u16 data[4];</div><div class='ctx'> 	s16 gain[2];</div><div class='ctx'> 	u16 minmax[2];</div><div class='del'>-	static const u16 lna_gain[4] = { -2, 10, 19, 25 };</div><div class='add'>+	static const s16 lna_gain[4] = { -2, 10, 19, 25 };</div><div class='ctx'> </div><div class='ctx'> 	if (nphy-&gt;hang_avoid)</div><div class='ctx'> 		b43_nphy_stay_in_carrier_search(dev, 1);</div><div class='hunk'>@@ -2479,11 +2479,7 @@ static void b43_nphy_gain_ctl_workarounds_rev19(struct b43_wldev *dev)</div><div class='ctx'> </div><div class='ctx'> static void b43_nphy_gain_ctl_workarounds_rev7(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-</div><div class='del'>-	switch (phy-&gt;rev) {</div><div class='del'>-	/* TODO */</div><div class='del'>-	}</div><div class='add'>+	/* TODO - should depend on phy-&gt;rev */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void b43_nphy_gain_ctl_workarounds_rev3(struct b43_wldev *dev)</div><div class='hunk'>@@ -4592,58 +4588,11 @@ static void b43_nphy_spur_workaround(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='ctx'> </div><div class='del'>-	u8 channel = dev-&gt;phy.channel;</div><div class='del'>-	int tone[2] = { 57, 58 };</div><div class='del'>-	u32 noise[2] = { 0x3FF, 0x3FF };</div><div class='del'>-</div><div class='ctx'> 	B43_WARN_ON(dev-&gt;phy.rev &lt; 3);</div><div class='ctx'> </div><div class='ctx'> 	if (nphy-&gt;hang_avoid)</div><div class='ctx'> 		b43_nphy_stay_in_carrier_search(dev, 1);</div><div class='ctx'> </div><div class='del'>-	if (nphy-&gt;gband_spurwar_en) {</div><div class='del'>-		/* TODO: N PHY Adjust Analog Pfbw (7) */</div><div class='del'>-		if (channel == 11 &amp;&amp; b43_is_40mhz(dev)) {</div><div class='del'>-			; /* TODO: N PHY Adjust Min Noise Var(2, tone, noise)*/</div><div class='del'>-		} else {</div><div class='del'>-			; /* TODO: N PHY Adjust Min Noise Var(0, NULL, NULL)*/</div><div class='del'>-		}</div><div class='del'>-		/* TODO: N PHY Adjust CRS Min Power (0x1E) */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (nphy-&gt;aband_spurwar_en) {</div><div class='del'>-		if (channel == 54) {</div><div class='del'>-			tone[0] = 0x20;</div><div class='del'>-			noise[0] = 0x25F;</div><div class='del'>-		} else if (channel == 38 || channel == 102 || channel == 118) {</div><div class='del'>-			if (0 /* FIXME */) {</div><div class='del'>-				tone[0] = 0x20;</div><div class='del'>-				noise[0] = 0x21F;</div><div class='del'>-			} else {</div><div class='del'>-				tone[0] = 0;</div><div class='del'>-				noise[0] = 0;</div><div class='del'>-			}</div><div class='del'>-		} else if (channel == 134) {</div><div class='del'>-			tone[0] = 0x20;</div><div class='del'>-			noise[0] = 0x21F;</div><div class='del'>-		} else if (channel == 151) {</div><div class='del'>-			tone[0] = 0x10;</div><div class='del'>-			noise[0] = 0x23F;</div><div class='del'>-		} else if (channel == 153 || channel == 161) {</div><div class='del'>-			tone[0] = 0x30;</div><div class='del'>-			noise[0] = 0x23F;</div><div class='del'>-		} else {</div><div class='del'>-			tone[0] = 0;</div><div class='del'>-			noise[0] = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!tone[0] &amp;&amp; !noise[0]) {</div><div class='del'>-			; /* TODO: N PHY Adjust Min Noise Var(1, tone, noise)*/</div><div class='del'>-		} else {</div><div class='del'>-			; /* TODO: N PHY Adjust Min Noise Var(0, NULL, NULL)*/</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (nphy-&gt;hang_avoid)</div><div class='ctx'> 		b43_nphy_stay_in_carrier_search(dev, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -6297,7 +6246,7 @@ static void b43_nphy_channel_setup(struct b43_wldev *dev,</div><div class='ctx'> 		b43_write16(dev, B43_MMIO_PSM_PHY_HDR, tmp16 | 4);</div><div class='ctx'> 		/* Take BPHY out of the reset */</div><div class='ctx'> 		b43_phy_mask(dev, B43_PHY_B_BBCFG,</div><div class='del'>-			     (u16)~(B43_PHY_B_BBCFG_RSTCCA | B43_PHY_B_BBCFG_RSTRX));</div><div class='add'>+			     ~(B43_PHY_B_BBCFG_RSTCCA | B43_PHY_B_BBCFG_RSTRX) &amp; 0xffff);</div><div class='ctx'> 		b43_write16(dev, B43_MMIO_PSM_PHY_HDR, tmp16);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -6428,7 +6377,7 @@ static int b43_nphy_set_channel(struct b43_wldev *dev,</div><div class='ctx'> 	} else if (channel_type == NL80211_CHAN_HT40MINUS) {</div><div class='ctx'> 		b43_phy_mask(dev, B43_NPHY_RXCTL, ~B43_NPHY_RXCTL_BSELU20);</div><div class='ctx'> 		if (phy-&gt;rev &gt;= 7)</div><div class='del'>-			b43_phy_mask(dev, 0x310, (u16)~0x8000);</div><div class='add'>+			b43_phy_mask(dev, 0x310, 0x7fff);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (phy-&gt;rev &gt;= 19) {</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43/pio.c b/drivers/net/wireless/broadcom/b43/pio.c<br/>index 8c28a9250cd1..e41f2f5b4c26 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/pio.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/pio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/pio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43/pio.c</a></div><div class='hunk'>@@ -525,7 +525,7 @@ int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb)</div><div class='ctx'> 	if (total_len &gt; (q-&gt;buffer_size - q-&gt;buffer_used)) {</div><div class='ctx'> 		/* Not enough memory on the queue. */</div><div class='ctx'> 		err = -EBUSY;</div><div class='del'>-		ieee80211_stop_queue(dev-&gt;wl-&gt;hw, skb_get_queue_mapping(skb));</div><div class='add'>+		b43_stop_queue(dev, skb_get_queue_mapping(skb));</div><div class='ctx'> 		q-&gt;stopped = true;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -552,7 +552,7 @@ int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb)</div><div class='ctx'> 	if (((q-&gt;buffer_size - q-&gt;buffer_used) &lt; roundup(2 + 2 + 6, 4)) ||</div><div class='ctx'> 	    (q-&gt;free_packet_slots == 0)) {</div><div class='ctx'> 		/* The queue is full. */</div><div class='del'>-		ieee80211_stop_queue(dev-&gt;wl-&gt;hw, skb_get_queue_mapping(skb));</div><div class='add'>+		b43_stop_queue(dev, skb_get_queue_mapping(skb));</div><div class='ctx'> 		q-&gt;stopped = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -582,12 +582,12 @@ void b43_pio_handle_txstatus(struct b43_wldev *dev,</div><div class='ctx'> 	q-&gt;buffer_used -= total_len;</div><div class='ctx'> 	q-&gt;free_packet_slots += 1;</div><div class='ctx'> </div><div class='del'>-	ieee80211_tx_status(dev-&gt;wl-&gt;hw, pack-&gt;skb);</div><div class='add'>+	ieee80211_tx_status_skb(dev-&gt;wl-&gt;hw, pack-&gt;skb);</div><div class='ctx'> 	pack-&gt;skb = NULL;</div><div class='ctx'> 	list_add(&amp;pack-&gt;list, &amp;q-&gt;packets_list);</div><div class='ctx'> </div><div class='ctx'> 	if (q-&gt;stopped) {</div><div class='del'>-		ieee80211_wake_queue(dev-&gt;wl-&gt;hw, q-&gt;queue_prio);</div><div class='add'>+		b43_wake_queue(dev, q-&gt;queue_prio);</div><div class='ctx'> 		q-&gt;stopped = false;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43/sysfs.c b/drivers/net/wireless/broadcom/b43/sysfs.c<br/>index 0679d132968f..261b2b746a9c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/sysfs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/sysfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/sysfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43/sysfs.c</a></div><div class='hunk'>@@ -53,19 +53,14 @@ static ssize_t b43_attr_interfmode_show(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 	switch (wldev-&gt;phy.g-&gt;interfmode) {</div><div class='ctx'> 	case B43_INTERFMODE_NONE:</div><div class='del'>-		count =</div><div class='del'>-		    snprintf(buf, PAGE_SIZE,</div><div class='del'>-			     "0 (No Interference Mitigation)\n");</div><div class='add'>+		count = sysfs_emit(buf, "0 (No Interference Mitigation)\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case B43_INTERFMODE_NONWLAN:</div><div class='del'>-		count =</div><div class='del'>-		    snprintf(buf, PAGE_SIZE,</div><div class='del'>-			     "1 (Non-WLAN Interference Mitigation)\n");</div><div class='add'>+		count = sysfs_emit(buf,</div><div class='add'>+				   "1 (Non-WLAN Interference Mitigation)\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case B43_INTERFMODE_MANUALWLAN:</div><div class='del'>-		count =</div><div class='del'>-		    snprintf(buf, PAGE_SIZE,</div><div class='del'>-			     "2 (WLAN Interference Mitigation)\n");</div><div class='add'>+		count = sysfs_emit(buf, "2 (WLAN Interference Mitigation)\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		B43_WARN_ON(1);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43/tables_lpphy.c b/drivers/net/wireless/broadcom/b43/tables_lpphy.c<br/>index 71a7cd8dc787..fb70a1e3544b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/tables_lpphy.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/tables_lpphy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/tables_lpphy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43/tables_lpphy.c</a></div><div class='hunk'>@@ -1066,7 +1066,7 @@ static const u32 lpphy_papd_mult_table[] = {</div><div class='ctx'> 	0x00036963, 0x000339f2, 0x00030a89, 0x0002db28,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct lpphy_tx_gain_table_entry lpphy_rev0_nopa_tx_gain_table[] = {</div><div class='add'>+static const struct lpphy_tx_gain_table_entry lpphy_rev0_nopa_tx_gain_table[] = {</div><div class='ctx'> 	{ .gm = 7, .pga = 15, .pad = 14, .dac = 0, .bb_mult = 152, },</div><div class='ctx'> 	{ .gm = 7, .pga = 15, .pad = 14, .dac = 0, .bb_mult = 147, },</div><div class='ctx'> 	{ .gm = 7, .pga = 15, .pad = 14, .dac = 0, .bb_mult = 143, },</div><div class='hunk'>@@ -1197,7 +1197,7 @@ static struct lpphy_tx_gain_table_entry lpphy_rev0_nopa_tx_gain_table[] = {</div><div class='ctx'> 	{ .gm = 7, .pga = 11, .pad = 6, .dac = 0, .bb_mult = 71, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct lpphy_tx_gain_table_entry lpphy_rev0_2ghz_tx_gain_table[] = {</div><div class='add'>+static const struct lpphy_tx_gain_table_entry lpphy_rev0_2ghz_tx_gain_table[] = {</div><div class='ctx'> 	{ .gm = 4, .pga = 15, .pad = 9, .dac = 0, .bb_mult = 64, },</div><div class='ctx'> 	{ .gm = 4, .pga = 15, .pad = 9, .dac = 0, .bb_mult = 62, },</div><div class='ctx'> 	{ .gm = 4, .pga = 15, .pad = 9, .dac = 0, .bb_mult = 60, },</div><div class='hunk'>@@ -1328,7 +1328,7 @@ static struct lpphy_tx_gain_table_entry lpphy_rev0_2ghz_tx_gain_table[] = {</div><div class='ctx'> 	{ .gm = 4, .pga = 4, .pad = 2, .dac = 0, .bb_mult = 72, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct lpphy_tx_gain_table_entry lpphy_rev0_5ghz_tx_gain_table[] = {</div><div class='add'>+static const struct lpphy_tx_gain_table_entry lpphy_rev0_5ghz_tx_gain_table[] = {</div><div class='ctx'> 	{ .gm = 7, .pga = 15, .pad = 15, .dac = 0, .bb_mult = 99, },</div><div class='ctx'> 	{ .gm = 7, .pga = 15, .pad = 15, .dac = 0, .bb_mult = 96, },</div><div class='ctx'> 	{ .gm = 7, .pga = 15, .pad = 15, .dac = 0, .bb_mult = 93, },</div><div class='hunk'>@@ -1459,7 +1459,7 @@ static struct lpphy_tx_gain_table_entry lpphy_rev0_5ghz_tx_gain_table[] = {</div><div class='ctx'> 	{ .gm = 7, .pga = 11, .pad = 6, .dac = 0, .bb_mult = 60, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct lpphy_tx_gain_table_entry lpphy_rev1_nopa_tx_gain_table[] = {</div><div class='add'>+static const struct lpphy_tx_gain_table_entry lpphy_rev1_nopa_tx_gain_table[] = {</div><div class='ctx'> 	{ .gm = 7, .pga = 15, .pad = 14, .dac = 0, .bb_mult = 152, },</div><div class='ctx'> 	{ .gm = 7, .pga = 15, .pad = 14, .dac = 0, .bb_mult = 147, },</div><div class='ctx'> 	{ .gm = 7, .pga = 15, .pad = 14, .dac = 0, .bb_mult = 143, },</div><div class='hunk'>@@ -1599,7 +1599,7 @@ static struct lpphy_tx_gain_table_entry lpphy_rev1_nopa_tx_gain_table[] = {</div><div class='ctx'> 	{ .gm = 7, .pga = 11, .pad = 6, .dac = 0, .bb_mult = 71, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct lpphy_tx_gain_table_entry lpphy_rev1_2ghz_tx_gain_table[] = {</div><div class='add'>+static const struct lpphy_tx_gain_table_entry lpphy_rev1_2ghz_tx_gain_table[] = {</div><div class='ctx'> 	{ .gm = 4, .pga = 15, .pad = 15, .dac = 0, .bb_mult = 90, },</div><div class='ctx'> 	{ .gm = 4, .pga = 15, .pad = 15, .dac = 0, .bb_mult = 88, },</div><div class='ctx'> 	{ .gm = 4, .pga = 15, .pad = 15, .dac = 0, .bb_mult = 85, },</div><div class='hunk'>@@ -1730,7 +1730,7 @@ static struct lpphy_tx_gain_table_entry lpphy_rev1_2ghz_tx_gain_table[] = {</div><div class='ctx'> 	{ .gm = 4, .pga = 10, .pad = 6, .dac = 0, .bb_mult = 60, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct lpphy_tx_gain_table_entry lpphy_rev1_5ghz_tx_gain_table[] = {</div><div class='add'>+static const struct lpphy_tx_gain_table_entry lpphy_rev1_5ghz_tx_gain_table[] = {</div><div class='ctx'> 	{ .gm = 7, .pga = 15, .pad = 15, .dac = 0, .bb_mult = 99, },</div><div class='ctx'> 	{ .gm = 7, .pga = 15, .pad = 15, .dac = 0, .bb_mult = 96, },</div><div class='ctx'> 	{ .gm = 7, .pga = 15, .pad = 15, .dac = 0, .bb_mult = 93, },</div><div class='hunk'>@@ -1861,7 +1861,7 @@ static struct lpphy_tx_gain_table_entry lpphy_rev1_5ghz_tx_gain_table[] = {</div><div class='ctx'> 	{ .gm = 7, .pga = 11, .pad = 6, .dac = 0, .bb_mult = 60, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct lpphy_tx_gain_table_entry lpphy_rev2_nopa_tx_gain_table[] = {</div><div class='add'>+static const struct lpphy_tx_gain_table_entry lpphy_rev2_nopa_tx_gain_table[] = {</div><div class='ctx'> 	{ .gm = 255, .pga = 255, .pad = 203, .dac = 0, .bb_mult = 152, },</div><div class='ctx'> 	{ .gm = 255, .pga = 255, .pad = 203, .dac = 0, .bb_mult = 147, },</div><div class='ctx'> 	{ .gm = 255, .pga = 255, .pad = 203, .dac = 0, .bb_mult = 143, },</div><div class='hunk'>@@ -1992,7 +1992,7 @@ static struct lpphy_tx_gain_table_entry lpphy_rev2_nopa_tx_gain_table[] = {</div><div class='ctx'> 	{ .gm = 255, .pga = 111, .pad = 29, .dac = 0, .bb_mult = 64, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct lpphy_tx_gain_table_entry lpphy_rev2_2ghz_tx_gain_table[] = {</div><div class='add'>+static const struct lpphy_tx_gain_table_entry lpphy_rev2_2ghz_tx_gain_table[] = {</div><div class='ctx'> 	{ .gm = 7, .pga = 99, .pad = 255, .dac = 0, .bb_mult = 64, },</div><div class='ctx'> 	{ .gm = 7, .pga = 96, .pad = 255, .dac = 0, .bb_mult = 64, },</div><div class='ctx'> 	{ .gm = 7, .pga = 93, .pad = 255, .dac = 0, .bb_mult = 64, },</div><div class='hunk'>@@ -2123,7 +2123,7 @@ static struct lpphy_tx_gain_table_entry lpphy_rev2_2ghz_tx_gain_table[] = {</div><div class='ctx'> 	{ .gm = 7, .pga = 13, .pad = 52, .dac = 0, .bb_mult = 64, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct lpphy_tx_gain_table_entry lpphy_rev2_5ghz_tx_gain_table[] = {</div><div class='add'>+static const struct lpphy_tx_gain_table_entry lpphy_rev2_5ghz_tx_gain_table[] = {</div><div class='ctx'> 	{ .gm = 255, .pga = 255, .pad = 255, .dac = 0, .bb_mult = 152, },</div><div class='ctx'> 	{ .gm = 255, .pga = 255, .pad = 255, .dac = 0, .bb_mult = 147, },</div><div class='ctx'> 	{ .gm = 255, .pga = 255, .pad = 255, .dac = 0, .bb_mult = 143, },</div><div class='hunk'>@@ -2392,7 +2392,7 @@ void lpphy_write_gain_table(struct b43_wldev *dev, int offset,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void lpphy_write_gain_table_bulk(struct b43_wldev *dev, int offset, int count,</div><div class='del'>-				 struct lpphy_tx_gain_table_entry *table)</div><div class='add'>+				 const struct lpphy_tx_gain_table_entry *table)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43/tables_lpphy.h b/drivers/net/wireless/broadcom/b43/tables_lpphy.h<br/>index 62002098bbda..1971ccccabf8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/tables_lpphy.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43/tables_lpphy.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43/tables_lpphy.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43/tables_lpphy.h</a></div><div class='hunk'>@@ -36,7 +36,7 @@ struct lpphy_tx_gain_table_entry {</div><div class='ctx'> void lpphy_write_gain_table(struct b43_wldev *dev, int offset,</div><div class='ctx'> 			    struct lpphy_tx_gain_table_entry data);</div><div class='ctx'> void lpphy_write_gain_table_bulk(struct b43_wldev *dev, int offset, int count,</div><div class='del'>-				 struct lpphy_tx_gain_table_entry *table);</div><div class='add'>+				 const struct lpphy_tx_gain_table_entry *table);</div><div class='ctx'> </div><div class='ctx'> void lpphy_rev0_1_table_init(struct b43_wldev *dev);</div><div class='ctx'> void lpphy_rev2plus_table_init(struct b43_wldev *dev);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43legacy/b43legacy.h b/drivers/net/wireless/broadcom/b43legacy/b43legacy.h<br/>index 6b0cec467938..f49365d14619 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43legacy/b43legacy.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43legacy/b43legacy.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43legacy/b43legacy.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43legacy/b43legacy.h</a></div><div class='hunk'>@@ -379,7 +379,7 @@ struct b43legacy_iv {</div><div class='ctx'> 	union {</div><div class='ctx'> 		__be16 d16;</div><div class='ctx'> 		__be32 d32;</div><div class='del'>-	} data __packed;</div><div class='add'>+	} __packed data;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define B43legacy_PHYMODE(phytype)	(1 &lt;&lt; (phytype))</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43legacy/debugfs.c b/drivers/net/wireless/broadcom/b43legacy/debugfs.c<br/>index e7e4293c01f2..5d04bcc216e5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43legacy/debugfs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43legacy/debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43legacy/debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43legacy/debugfs.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@ static struct dentry *rootdir;</div><div class='ctx'> struct b43legacy_debugfs_fops {</div><div class='ctx'> 	ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);</div><div class='ctx'> 	int (*write)(struct b43legacy_wldev *dev, const char *buf, size_t count);</div><div class='del'>-	struct file_operations fops;</div><div class='ctx'> 	/* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */</div><div class='ctx'> 	size_t file_struct_offset;</div><div class='ctx'> 	/* Take wl-&gt;irq_lock before calling read/write? */</div><div class='hunk'>@@ -188,7 +187,7 @@ static ssize_t b43legacy_debugfs_read(struct file *file, char __user *userbuf,</div><div class='ctx'> 				size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43legacy_wldev *dev;</div><div class='del'>-	struct b43legacy_debugfs_fops *dfops;</div><div class='add'>+	const struct b43legacy_debugfs_fops *dfops;</div><div class='ctx'> 	struct b43legacy_dfs_file *dfile;</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> 	char *buf;</div><div class='hunk'>@@ -208,8 +207,7 @@ static ssize_t b43legacy_debugfs_read(struct file *file, char __user *userbuf,</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dfops = container_of(debugfs_real_fops(file),</div><div class='del'>-			     struct b43legacy_debugfs_fops, fops);</div><div class='add'>+	dfops = debugfs_get_aux(file);</div><div class='ctx'> 	if (!dfops-&gt;read) {</div><div class='ctx'> 		err = -ENOSYS;</div><div class='ctx'> 		goto out_unlock;</div><div class='hunk'>@@ -257,7 +255,7 @@ static ssize_t b43legacy_debugfs_write(struct file *file,</div><div class='ctx'> 				 size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43legacy_wldev *dev;</div><div class='del'>-	struct b43legacy_debugfs_fops *dfops;</div><div class='add'>+	const struct b43legacy_debugfs_fops *dfops;</div><div class='ctx'> 	char *buf;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -275,8 +273,7 @@ static ssize_t b43legacy_debugfs_write(struct file *file,</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dfops = container_of(debugfs_real_fops(file),</div><div class='del'>-			     struct b43legacy_debugfs_fops, fops);</div><div class='add'>+	dfops = debugfs_get_aux(file);</div><div class='ctx'> 	if (!dfops-&gt;write) {</div><div class='ctx'> 		err = -ENOSYS;</div><div class='ctx'> 		goto out_unlock;</div><div class='hunk'>@@ -308,17 +305,16 @@ out_unlock:</div><div class='ctx'> 	return err ? err : count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct debugfs_short_fops debugfs_ops = {</div><div class='add'>+	.read	= b43legacy_debugfs_read,</div><div class='add'>+	.write	= b43legacy_debugfs_write,</div><div class='add'>+	.llseek = generic_file_llseek</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> #define B43legacy_DEBUGFS_FOPS(name, _read, _write, _take_irqlock)	\</div><div class='ctx'> 	static struct b43legacy_debugfs_fops fops_##name = {		\</div><div class='ctx'> 		.read	= _read,				\</div><div class='ctx'> 		.write	= _write,				\</div><div class='del'>-		.fops	= {					\</div><div class='del'>-			.open	= simple_open,				\</div><div class='del'>-			.read	= b43legacy_debugfs_read,		\</div><div class='del'>-			.write	= b43legacy_debugfs_write,		\</div><div class='del'>-			.llseek = generic_file_llseek,			\</div><div class='del'>-		},						\</div><div class='ctx'> 		.file_struct_offset = offsetof(struct b43legacy_dfsentry, \</div><div class='ctx'> 					       file_##name),	\</div><div class='ctx'> 		.take_irqlock	= _take_irqlock,		\</div><div class='hunk'>@@ -336,24 +332,14 @@ int b43legacy_debug(struct b43legacy_wldev *dev, enum b43legacy_dyndbg feature)</div><div class='ctx'> 	return !!(dev-&gt;dfsentry &amp;&amp; dev-&gt;dfsentry-&gt;dyn_debug[feature]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void b43legacy_remove_dynamic_debug(struct b43legacy_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct b43legacy_dfsentry *e = dev-&gt;dfsentry;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; __B43legacy_NR_DYNDBG; i++)</div><div class='del'>-		debugfs_remove(e-&gt;dyn_debug_dentries[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void b43legacy_add_dynamic_debug(struct b43legacy_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43legacy_dfsentry *e = dev-&gt;dfsentry;</div><div class='ctx'> </div><div class='ctx'> #define add_dyn_dbg(name, id, initstate) do {			\</div><div class='ctx'> 	e-&gt;dyn_debug[id] = (initstate);				\</div><div class='del'>-	e-&gt;dyn_debug_dentries[id] =				\</div><div class='del'>-		debugfs_create_bool(name, 0600, e-&gt;subdir,	\</div><div class='del'>-				&amp;(e-&gt;dyn_debug[id]));		\</div><div class='add'>+	debugfs_create_bool(name, 0600, e-&gt;subdir,		\</div><div class='add'>+			    &amp;(e-&gt;dyn_debug[id]));		\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> 	add_dyn_dbg("debug_xmitpower", B43legacy_DBG_XMITPOWER, false);</div><div class='hunk'>@@ -396,11 +382,9 @@ void b43legacy_debugfs_add_device(struct b43legacy_wldev *dev)</div><div class='ctx'> </div><div class='ctx'> #define ADD_FILE(name, mode)	\</div><div class='ctx'> 	do {							\</div><div class='del'>-		e-&gt;file_##name.dentry =				\</div><div class='del'>-			debugfs_create_file(__stringify(name),	\</div><div class='del'>-					mode, e-&gt;subdir, dev,	\</div><div class='del'>-					&amp;fops_##name.fops);	\</div><div class='del'>-		e-&gt;file_##name.dentry = NULL;			\</div><div class='add'>+		debugfs_create_file_aux(__stringify(name), mode,	\</div><div class='add'>+				    e-&gt;subdir, dev,		\</div><div class='add'>+				    &amp;fops_##name, &amp;debugfs_ops);	\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -424,13 +408,6 @@ void b43legacy_debugfs_remove_device(struct b43legacy_wldev *dev)</div><div class='ctx'> 	e = dev-&gt;dfsentry;</div><div class='ctx'> 	if (!e)</div><div class='ctx'> 		return;</div><div class='del'>-	b43legacy_remove_dynamic_debug(dev);</div><div class='del'>-</div><div class='del'>-	debugfs_remove(e-&gt;file_tsf.dentry);</div><div class='del'>-	debugfs_remove(e-&gt;file_ucode_regs.dentry);</div><div class='del'>-	debugfs_remove(e-&gt;file_shm.dentry);</div><div class='del'>-	debugfs_remove(e-&gt;file_txstat.dentry);</div><div class='del'>-	debugfs_remove(e-&gt;file_restart.dentry);</div><div class='ctx'> </div><div class='ctx'> 	debugfs_remove(e-&gt;subdir);</div><div class='ctx'> 	kfree(e-&gt;txstatlog.log);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43legacy/debugfs.h b/drivers/net/wireless/broadcom/b43legacy/debugfs.h<br/>index 7a37764406b1..924130880dfe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43legacy/debugfs.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43legacy/debugfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43legacy/debugfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43legacy/debugfs.h</a></div><div class='hunk'>@@ -28,7 +28,6 @@ struct b43legacy_txstatus_log {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct b43legacy_dfs_file {</div><div class='del'>-	struct dentry *dentry;</div><div class='ctx'> 	char *buffer;</div><div class='ctx'> 	size_t data_len;</div><div class='ctx'> };</div><div class='hunk'>@@ -49,8 +48,6 @@ struct b43legacy_dfsentry {</div><div class='ctx'> </div><div class='ctx'> 	/* Enabled/Disabled list for the dynamic debugging features. */</div><div class='ctx'> 	bool dyn_debug[__B43legacy_NR_DYNDBG];</div><div class='del'>-	/* Dentries for the dynamic debugging entries. */</div><div class='del'>-	struct dentry *dyn_debug_dentries[__B43legacy_NR_DYNDBG];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int b43legacy_debug(struct b43legacy_wldev *dev,</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43legacy/dma.c b/drivers/net/wireless/broadcom/b43legacy/dma.c<br/>index 7e2f70c4207c..60e41de72f29 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43legacy/dma.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43legacy/dma.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43legacy/dma.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43legacy/dma.c</a></div><div class='hunk'>@@ -127,14 +127,6 @@ static inline int next_slot(struct b43legacy_dmaring *ring, int slot)</div><div class='ctx'> 	return slot + 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int prev_slot(struct b43legacy_dmaring *ring, int slot)</div><div class='del'>-{</div><div class='del'>-	B43legacy_WARN_ON(!(slot &gt;= 0 &amp;&amp; slot &lt;= ring-&gt;nr_slots - 1));</div><div class='del'>-	if (slot == 0)</div><div class='del'>-		return ring-&gt;nr_slots - 1;</div><div class='del'>-	return slot - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_B43LEGACY_DEBUG</div><div class='ctx'> static void update_max_used_slots(struct b43legacy_dmaring *ring,</div><div class='ctx'> 				  int current_used_slots)</div><div class='hunk'>@@ -213,19 +205,6 @@ return dev-&gt;dma.tx_ring1;</div><div class='ctx'> 	return ring;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Bcm4301-ring to mac80211-queue mapping */</div><div class='del'>-static inline int txring_to_priority(struct b43legacy_dmaring *ring)</div><div class='del'>-{</div><div class='del'>-	static const u8 idx_to_prio[] =</div><div class='del'>-		{ 3, 2, 1, 0, 4, 5, };</div><div class='del'>-</div><div class='del'>-/*FIXME: have only one queue, for now */</div><div class='del'>-return 0;</div><div class='del'>-</div><div class='del'>-	return idx_to_prio[ring-&gt;index];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static u16 b43legacy_dmacontroller_base(enum b43legacy_dmatype type,</div><div class='ctx'> 					int controller_idx)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43legacy/leds.c b/drivers/net/wireless/broadcom/b43legacy/leds.c<br/>index 38b5be3a84e2..79e6fd205bfb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43legacy/leds.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43legacy/leds.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43legacy/leds.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43legacy/leds.c</a></div><div class='hunk'>@@ -88,7 +88,7 @@ static int b43legacy_register_led(struct b43legacy_wldev *dev,</div><div class='ctx'> 	led-&gt;dev = dev;</div><div class='ctx'> 	led-&gt;index = led_index;</div><div class='ctx'> 	led-&gt;activelow = activelow;</div><div class='del'>-	strlcpy(led-&gt;name, name, sizeof(led-&gt;name));</div><div class='add'>+	strscpy(led-&gt;name, name, sizeof(led-&gt;name));</div><div class='ctx'> </div><div class='ctx'> 	led-&gt;led_dev.name = led-&gt;name;</div><div class='ctx'> 	led-&gt;led_dev.default_trigger = default_trigger;</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43legacy/main.c b/drivers/net/wireless/broadcom/b43legacy/main.c<br/>index f64ebff68308..aada342e0b80 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43legacy/main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43legacy/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43legacy/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43legacy/main.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;net/dst.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "b43legacy.h"</div><div class='ctx'> #include "main.h"</div><div class='hunk'>@@ -391,7 +391,7 @@ void b43legacy_tsf_read(struct b43legacy_wldev *dev, u64 *tsf)</div><div class='ctx'> 	 * registers, we should take care of register overflows.</div><div class='ctx'> 	 * In theory, the whole tsf read process should be atomic.</div><div class='ctx'> 	 * We try to be atomic here, by restaring the read process,</div><div class='del'>-	 * if any of the high registers changed (overflew).</div><div class='add'>+	 * if any of the high registers changed (overflowed).</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (dev-&gt;dev-&gt;id.revision &gt;= 3) {</div><div class='ctx'> 		u32 low;</div><div class='hunk'>@@ -1241,7 +1241,7 @@ static void b43legacy_update_templates(struct b43legacy_wl *wl)</div><div class='ctx'> 	 * field, but that would probably require resizing and moving of data</div><div class='ctx'> 	 * within the beacon template. Simply request a new beacon and let</div><div class='ctx'> 	 * mac80211 do the hard work. */</div><div class='del'>-	beacon = ieee80211_beacon_get(wl-&gt;hw, wl-&gt;vif);</div><div class='add'>+	beacon = ieee80211_beacon_get(wl-&gt;hw, wl-&gt;vif, 0);</div><div class='ctx'> 	if (unlikely(!beacon))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -2505,7 +2505,8 @@ static void b43legacy_op_tx(struct ieee80211_hw *hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int b43legacy_op_conf_tx(struct ieee80211_hw *hw,</div><div class='del'>-				struct ieee80211_vif *vif, u16 queue,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				unsigned int link_id, u16 queue,</div><div class='ctx'> 				const struct ieee80211_tx_queue_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2661,7 +2662,7 @@ static void b43legacy_set_retry_limits(struct b43legacy_wldev *dev,</div><div class='ctx'> 	b43legacy_shm_write16(dev, B43legacy_SHM_WIRELESS, 0x0007, long_retry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int b43legacy_op_dev_config(struct ieee80211_hw *hw,</div><div class='add'>+static int b43legacy_op_dev_config(struct ieee80211_hw *hw, int radio_idx,</div><div class='ctx'> 				   u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);</div><div class='hunk'>@@ -2806,7 +2807,7 @@ static void b43legacy_update_basic_rates(struct b43legacy_wldev *dev, u32 brates</div><div class='ctx'> static void b43legacy_op_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 				    struct ieee80211_vif *vif,</div><div class='ctx'> 				    struct ieee80211_bss_conf *conf,</div><div class='del'>-				    u32 changed)</div><div class='add'>+				    u64 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);</div><div class='ctx'> 	struct b43legacy_wldev *dev;</div><div class='hunk'>@@ -2943,7 +2944,7 @@ static void b43legacy_wireless_core_stop(struct b43legacy_wldev *dev)</div><div class='ctx'> 			dev_kfree_skb(skb_dequeue(&amp;wl-&gt;tx_queue[queue_num]));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-b43legacy_mac_suspend(dev);</div><div class='add'>+	b43legacy_mac_suspend(dev);</div><div class='ctx'> 	free_irq(dev-&gt;dev-&gt;irq, dev);</div><div class='ctx'> 	b43legacydbg(wl, "Wireless interface stopped\n");</div><div class='ctx'> }</div><div class='hunk'>@@ -3484,7 +3485,7 @@ out_mutex_unlock:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void b43legacy_op_stop(struct ieee80211_hw *hw)</div><div class='add'>+static void b43legacy_op_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);</div><div class='ctx'> 	struct b43legacy_wldev *dev = wl-&gt;current_dev;</div><div class='hunk'>@@ -3530,7 +3531,12 @@ static int b43legacy_op_get_survey(struct ieee80211_hw *hw, int idx,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ieee80211_ops b43legacy_hw_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.tx			= b43legacy_op_tx,</div><div class='add'>+	.wake_tx_queue		= ieee80211_handle_wake_tx_queue,</div><div class='ctx'> 	.conf_tx		= b43legacy_op_conf_tx,</div><div class='ctx'> 	.add_interface		= b43legacy_op_add_interface,</div><div class='ctx'> 	.remove_interface	= b43legacy_op_remove_interface,</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43legacy/phy.c b/drivers/net/wireless/broadcom/b43legacy/phy.c<br/>index 05404fbd1e70..c1395e622759 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43legacy/phy.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43legacy/phy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43legacy/phy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43legacy/phy.c</a></div><div class='hunk'>@@ -1123,7 +1123,7 @@ void b43legacy_phy_lo_b_measure(struct b43legacy_wldev *dev)</div><div class='ctx'> 	struct b43legacy_phy *phy = &amp;dev-&gt;phy;</div><div class='ctx'> 	u16 regstack[12] = { 0 };</div><div class='ctx'> 	u16 mls;</div><div class='del'>-	u16 fval;</div><div class='add'>+	s16 fval;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int j;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43legacy/radio.c b/drivers/net/wireless/broadcom/b43legacy/radio.c<br/>index 06891b4f837b..8d7eb89c1628 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43legacy/radio.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43legacy/radio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43legacy/radio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43legacy/radio.c</a></div><div class='hunk'>@@ -283,7 +283,7 @@ u8 b43legacy_radio_aci_scan(struct b43legacy_wldev *dev)</div><div class='ctx'> 			    &amp; 0x7FFF);</div><div class='ctx'> 	b43legacy_set_all_gains(dev, 3, 8, 1);</div><div class='ctx'> </div><div class='del'>-	start = (channel - 5 &gt; 0) ? channel - 5 : 1;</div><div class='add'>+	start = (channel &gt; 5) ? channel - 5 : 1;</div><div class='ctx'> 	end = (channel + 5 &lt; 14) ? channel + 5 : 13;</div><div class='ctx'> </div><div class='ctx'> 	for (i = start; i &lt;= end; i++) {</div><div class='hunk'>@@ -1709,23 +1709,6 @@ u16 b43legacy_radio_init2050(struct b43legacy_wldev *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline</div><div class='del'>-u16 freq_r3A_value(u16 frequency)</div><div class='del'>-{</div><div class='del'>-	u16 value;</div><div class='del'>-</div><div class='del'>-	if (frequency &lt; 5091)</div><div class='del'>-		value = 0x0040;</div><div class='del'>-	else if (frequency &lt; 5321)</div><div class='del'>-		value = 0x0000;</div><div class='del'>-	else if (frequency &lt; 5806)</div><div class='del'>-		value = 0x0080;</div><div class='del'>-	else</div><div class='del'>-		value = 0x0040;</div><div class='del'>-</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int b43legacy_radio_selectchannel(struct b43legacy_wldev *dev,</div><div class='ctx'> 				  u8 channel,</div><div class='ctx'> 				  int synthetic_pu_workaround)</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/b43legacy/sysfs.c b/drivers/net/wireless/broadcom/b43legacy/sysfs.c<br/>index eec087ca30e6..d988fe541bf7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43legacy/sysfs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/b43legacy/sysfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/b43legacy/sysfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/b43legacy/sysfs.c</a></div><div class='hunk'>@@ -75,16 +75,14 @@ static ssize_t b43legacy_attr_interfmode_show(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 	switch (wldev-&gt;phy.interfmode) {</div><div class='ctx'> 	case B43legacy_INTERFMODE_NONE:</div><div class='del'>-		count = snprintf(buf, PAGE_SIZE, "0 (No Interference"</div><div class='del'>-				 " Mitigation)\n");</div><div class='add'>+		count = sysfs_emit(buf, "0 (No Interference Mitigation)\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case B43legacy_INTERFMODE_NONWLAN:</div><div class='del'>-		count = snprintf(buf, PAGE_SIZE, "1 (Non-WLAN Interference"</div><div class='del'>-				 " Mitigation)\n");</div><div class='add'>+		count = sysfs_emit(buf,</div><div class='add'>+				   "1 (Non-WLAN Interference Mitigation)\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case B43legacy_INTERFMODE_MANUALWLAN:</div><div class='del'>-		count = snprintf(buf, PAGE_SIZE, "2 (WLAN Interference"</div><div class='del'>-				 " Mitigation)\n");</div><div class='add'>+		count = sysfs_emit(buf, "2 (WLAN Interference Mitigation)\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		B43legacy_WARN_ON(1);</div><div class='hunk'>@@ -155,11 +153,9 @@ static ssize_t b43legacy_attr_preamble_show(struct device *dev,</div><div class='ctx'> 	mutex_lock(&amp;wldev-&gt;wl-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (wldev-&gt;short_preamble)</div><div class='del'>-		count = snprintf(buf, PAGE_SIZE, "1 (Short Preamble"</div><div class='del'>-				 " enabled)\n");</div><div class='add'>+		count = sysfs_emit(buf, "1 (Short Preamble enabled)\n");</div><div class='ctx'> 	else</div><div class='del'>-		count = snprintf(buf, PAGE_SIZE, "0 (Short Preamble"</div><div class='del'>-				 " disabled)\n");</div><div class='add'>+		count = sysfs_emit(buf, "0 (Short Preamble disabled)\n");</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;wldev-&gt;wl-&gt;mutex);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/Kconfig b/drivers/net/wireless/broadcom/brcm80211/Kconfig<br/>index 5bf2318763c5..19d0c003f626 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/Kconfig</a></div><div class='hunk'>@@ -7,22 +7,27 @@ config BRCMSMAC</div><div class='ctx'> 	depends on MAC80211</div><div class='ctx'> 	depends on BCMA_POSSIBLE</div><div class='ctx'> 	select BCMA</div><div class='del'>-	select NEW_LEDS if BCMA_DRIVER_GPIO</div><div class='del'>-	select LEDS_CLASS if BCMA_DRIVER_GPIO</div><div class='ctx'> 	select BRCMUTIL</div><div class='ctx'> 	select FW_LOADER</div><div class='ctx'> 	select CORDIC</div><div class='ctx'> 	help</div><div class='ctx'> 	  This module adds support for PCIe wireless adapters based on Broadcom</div><div class='del'>-	  IEEE802.11n SoftMAC chipsets. It also has WLAN led support, which will</div><div class='del'>-	  be available if you select BCMA_DRIVER_GPIO. If you choose to build a</div><div class='del'>-	  module, the driver will be called brcmsmac.ko.</div><div class='add'>+	  IEEE802.11n SoftMAC chipsets. If you choose to build a module, the</div><div class='add'>+	  driver will be called brcmsmac.ko.</div><div class='add'>+</div><div class='add'>+config BRCMSMAC_LEDS</div><div class='add'>+	def_bool BRCMSMAC &amp;&amp; BCMA_DRIVER_GPIO &amp;&amp; MAC80211_LEDS</div><div class='add'>+	help</div><div class='add'>+	  The brcmsmac LED support depends on the presence of the</div><div class='add'>+	  BCMA_DRIVER_GPIO driver, and it only works if LED support</div><div class='add'>+	  is enabled and reachable from the driver module.</div><div class='ctx'> </div><div class='ctx'> source "drivers/net/wireless/broadcom/brcm80211/brcmfmac/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config BRCM_TRACING</div><div class='ctx'> 	bool "Broadcom device tracing"</div><div class='ctx'> 	depends on BRCMSMAC || BRCMFMAC</div><div class='add'>+	depends on TRACING</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say Y here, the Broadcom wireless drivers will register</div><div class='ctx'> 	  with ftrace to dump event information into the trace ringbuffer.</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile<br/>index 9b15bc3f6054..e5ca0f511822 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile</a></div><div class='hunk'>@@ -6,8 +6,8 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> ccflags-y += \</div><div class='del'>-	-I $(srctree)/$(src) \</div><div class='del'>-	-I $(srctree)/$(src)/../include</div><div class='add'>+	-I $(src) \</div><div class='add'>+	-I $(src)/../include</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_BRCMFMAC) += brcmfmac.o</div><div class='ctx'> brcmfmac-objs += \</div><div class='hunk'>@@ -20,10 +20,12 @@ brcmfmac-objs += \</div><div class='ctx'> 		common.o \</div><div class='ctx'> 		core.o \</div><div class='ctx'> 		firmware.o \</div><div class='add'>+		fwvid.o \</div><div class='ctx'> 		feature.o \</div><div class='ctx'> 		btcoex.o \</div><div class='ctx'> 		vendor.o \</div><div class='del'>-		pno.o</div><div class='add'>+		pno.o \</div><div class='add'>+		xtlv.o</div><div class='ctx'> brcmfmac-$(CONFIG_BRCMFMAC_PROTO_BCDC) += \</div><div class='ctx'> 		bcdc.o \</div><div class='ctx'> 		fwsignal.o</div><div class='hunk'>@@ -46,3 +48,15 @@ brcmfmac-$(CONFIG_OF) += \</div><div class='ctx'> 		of.o</div><div class='ctx'> brcmfmac-$(CONFIG_DMI) += \</div><div class='ctx'> 		dmi.o</div><div class='add'>+brcmfmac-$(CONFIG_ACPI) += \</div><div class='add'>+		acpi.o</div><div class='add'>+</div><div class='add'>+ifeq ($(CONFIG_BRCMFMAC),m)</div><div class='add'>+obj-m += wcc/</div><div class='add'>+obj-m += cyw/</div><div class='add'>+obj-m += bca/</div><div class='add'>+else</div><div class='add'>+brcmfmac-$(CONFIG_BRCMFMAC) += wcc/core.o</div><div class='add'>+brcmfmac-$(CONFIG_BRCMFMAC) += cyw/core.o</div><div class='add'>+brcmfmac-$(CONFIG_BRCMFMAC) += bca/core.o</div><div class='add'>+endif</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/acpi.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/acpi.c<br/>new file mode 100644<br/>index 000000000000..c4a54861bfb4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/acpi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/acpi.c</a></div><div class='hunk'>@@ -0,0 +1,51 @@</div><div class='add'>+// SPDX-License-Identifier: ISC</div><div class='add'>+/*</div><div class='add'>+ * Copyright The Asahi Linux Contributors</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+void brcmf_acpi_probe(struct device *dev, enum brcmf_bus_type bus_type,</div><div class='add'>+		      struct brcmf_mp_device *settings)</div><div class='add'>+{</div><div class='add'>+	acpi_status status;</div><div class='add'>+	const union acpi_object *o;</div><div class='add'>+	struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL};</div><div class='add'>+	struct acpi_device *adev = ACPI_COMPANION(dev);</div><div class='add'>+</div><div class='add'>+	if (!adev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!ACPI_FAILURE(acpi_dev_get_property(adev, "module-instance",</div><div class='add'>+						ACPI_TYPE_STRING, &amp;o))) {</div><div class='add'>+		brcmf_dbg(INFO, "ACPI module-instance=%s\n", o-&gt;string.pointer);</div><div class='add'>+		settings-&gt;board_type = devm_kasprintf(dev, GFP_KERNEL,</div><div class='add'>+						      "apple,%s",</div><div class='add'>+						      o-&gt;string.pointer);</div><div class='add'>+	} else {</div><div class='add'>+		brcmf_dbg(INFO, "No ACPI module-instance\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = acpi_evaluate_object(adev-&gt;handle, "RWCV", NULL, &amp;buf);</div><div class='add'>+	o = buf.pointer;</div><div class='add'>+	if (!ACPI_FAILURE(status) &amp;&amp; o &amp;&amp; o-&gt;type == ACPI_TYPE_BUFFER &amp;&amp;</div><div class='add'>+	    o-&gt;buffer.length &gt;= 2) {</div><div class='add'>+		char *antenna_sku = devm_kzalloc(dev, 3, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+		if (antenna_sku) {</div><div class='add'>+			memcpy(antenna_sku, o-&gt;buffer.pointer, 2);</div><div class='add'>+			brcmf_dbg(INFO, "ACPI RWCV data=%*phN antenna-sku=%s\n",</div><div class='add'>+				  (int)o-&gt;buffer.length, o-&gt;buffer.pointer,</div><div class='add'>+				  antenna_sku);</div><div class='add'>+			settings-&gt;antenna_sku = antenna_sku;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		kfree(buf.pointer);</div><div class='add'>+	} else {</div><div class='add'>+		brcmf_dbg(INFO, "No ACPI antenna-sku\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/Makefile<br/>new file mode 100644<br/>index 000000000000..5e37c638f966<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/Makefile</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+# SPDX-License-Identifier: ISC</div><div class='add'>+#</div><div class='add'>+# Copyright (c) 2022 Broadcom Corporation</div><div class='add'>+</div><div class='add'>+ccflags-y += \</div><div class='add'>+	-I $(src) \</div><div class='add'>+	-I $(src)/.. \</div><div class='add'>+	-I $(src)/../../include</div><div class='add'>+</div><div class='add'>+obj-m += brcmfmac-bca.o</div><div class='add'>+brcmfmac-bca-objs += \</div><div class='add'>+		core.o module.o</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c<br/>new file mode 100644<br/>index 000000000000..f471c962104a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c</a></div><div class='hunk'>@@ -0,0 +1,39 @@</div><div class='add'>+// SPDX-License-Identifier: ISC</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022 Broadcom Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;core.h&gt;</div><div class='add'>+#include &lt;bus.h&gt;</div><div class='add'>+#include &lt;fwvid.h&gt;</div><div class='add'>+#include &lt;feature.h&gt;</div><div class='add'>+</div><div class='add'>+#include "vops.h"</div><div class='add'>+</div><div class='add'>+#define BRCMF_BCA_E_LAST		212</div><div class='add'>+</div><div class='add'>+static void brcmf_bca_feat_attach(struct brcmf_if *ifp)</div><div class='add'>+{</div><div class='add'>+	/* SAE support not confirmed so disabling for now */</div><div class='add'>+	ifp-&gt;drvr-&gt;feat_flags &amp;= ~BIT(BRCMF_FEAT_SAE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int brcmf_bca_alloc_fweh_info(struct brcmf_pub *drvr)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_fweh_info *fweh;</div><div class='add'>+</div><div class='add'>+	fweh = kzalloc(struct_size(fweh, evt_handler, BRCMF_BCA_E_LAST),</div><div class='add'>+		       GFP_KERNEL);</div><div class='add'>+	if (!fweh)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fweh-&gt;num_event_codes = BRCMF_BCA_E_LAST;</div><div class='add'>+	drvr-&gt;fweh = fweh;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct brcmf_fwvid_ops brcmf_bca_ops = {</div><div class='add'>+	.feat_attach = brcmf_bca_feat_attach,</div><div class='add'>+	.alloc_fweh_info = brcmf_bca_alloc_fweh_info,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/module.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/module.c<br/>new file mode 100644<br/>index 000000000000..1e1c79b18c5b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/module.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/module.c</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+// SPDX-License-Identifier: ISC</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022 Broadcom Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;bus.h&gt;</div><div class='add'>+#include &lt;core.h&gt;</div><div class='add'>+#include &lt;fwvid.h&gt;</div><div class='add'>+</div><div class='add'>+#include "vops.h"</div><div class='add'>+</div><div class='add'>+static int __init brcmf_bca_init(void)</div><div class='add'>+{</div><div class='add'>+	return brcmf_fwvid_register_vendor(BRCMF_FWVENDOR_BCA, THIS_MODULE,</div><div class='add'>+					   &amp;brcmf_bca_ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit brcmf_bca_exit(void)</div><div class='add'>+{</div><div class='add'>+	brcmf_fwvid_unregister_vendor(BRCMF_FWVENDOR_BCA, THIS_MODULE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Broadcom FullMAC WLAN driver plugin for Broadcom AP chipsets");</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='add'>+MODULE_IMPORT_NS("BRCMFMAC");</div><div class='add'>+</div><div class='add'>+module_init(brcmf_bca_init);</div><div class='add'>+module_exit(brcmf_bca_exit);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/vops.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/vops.h<br/>new file mode 100644<br/>index 000000000000..7897e6b6eefb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/vops.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/vops.h</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+/* SPDX-License-Identifier: ISC */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022 Broadcom Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef _BRCMFMAC_BCA_VOPS_H</div><div class='add'>+#define _BRCMFMAC_BCA_VOPS_H</div><div class='add'>+</div><div class='add'>+extern const struct brcmf_fwvid_ops brcmf_bca_ops;</div><div class='add'>+#define BCA_VOPS	(&amp;brcmf_bca_ops)</div><div class='add'>+</div><div class='add'>+#endif /* _BRCMFMAC_BCA_VOPS_H */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c<br/>index 3984fd7d918e..9ec0c60b6da1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c</a></div><div class='hunk'>@@ -87,6 +87,8 @@ struct brcmf_proto_bcdc_header {</div><div class='ctx'> 					 * plus any space that might be needed</div><div class='ctx'> 					 * for bus alignment padding.</div><div class='ctx'> 					 */</div><div class='add'>+#define ROUND_UP_MARGIN 2048</div><div class='add'>+</div><div class='ctx'> struct brcmf_bcdc {</div><div class='ctx'> 	u16 reqid;</div><div class='ctx'> 	u8 bus_header[BUS_HEADER_LEN];</div><div class='hunk'>@@ -368,8 +370,7 @@ brcmf_proto_bcdc_txcomplete(struct device *dev, struct sk_buff *txp,</div><div class='ctx'> </div><div class='ctx'> 	/* await txstatus signal for firmware if active */</div><div class='ctx'> 	if (brcmf_fws_fc_active(bcdc-&gt;fws)) {</div><div class='del'>-		if (!success)</div><div class='del'>-			brcmf_fws_bustxfail(bcdc-&gt;fws, txp);</div><div class='add'>+		brcmf_fws_bustxcomplete(bcdc-&gt;fws, txp, success);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (brcmf_proto_bcdc_hdrpull(bus_if-&gt;drvr, false, txp, &amp;ifp))</div><div class='ctx'> 			brcmu_pkt_buf_free_skb(txp);</div><div class='hunk'>@@ -397,9 +398,9 @@ brcmf_proto_bcdc_add_tdls_peer(struct brcmf_pub *drvr, int ifidx,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void brcmf_proto_bcdc_rxreorder(struct brcmf_if *ifp,</div><div class='del'>-				       struct sk_buff *skb, bool inirq)</div><div class='add'>+				       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	brcmf_fws_rxreorder(ifp, skb, inirq);</div><div class='add'>+	brcmf_fws_rxreorder(ifp, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -471,7 +472,7 @@ int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr)</div><div class='ctx'> </div><div class='ctx'> 	drvr-&gt;hdrlen += BCDC_HEADER_LEN + BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES;</div><div class='ctx'> 	drvr-&gt;bus_if-&gt;maxctl = BRCMF_DCMD_MAXLEN +</div><div class='del'>-			sizeof(struct brcmf_proto_bcdc_dcmd);</div><div class='add'>+			sizeof(struct brcmf_proto_bcdc_dcmd) + ROUND_UP_MARGIN;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c<br/>index ce8c102df7b3..6a3f187320fc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c</a></div><div class='hunk'>@@ -128,7 +128,8 @@ int brcmf_sdiod_intr_register(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> </div><div class='ctx'> 		if (sdiodev-&gt;bus_if-&gt;chip == BRCM_CC_43362_CHIP_ID) {</div><div class='ctx'> 			/* assign GPIO to SDIO core */</div><div class='del'>-			addr = CORE_CC_REG(SI_ENUM_BASE, gpiocontrol);</div><div class='add'>+			addr = brcmf_chip_enum_base(sdiodev-&gt;func1-&gt;device);</div><div class='add'>+			addr = CORE_CC_REG(addr, gpiocontrol);</div><div class='ctx'> 			gpiocontrol = brcmf_sdiod_readl(sdiodev, addr, &amp;ret);</div><div class='ctx'> 			gpiocontrol |= 0x2;</div><div class='ctx'> 			brcmf_sdiod_writel(sdiodev, addr, gpiocontrol, &amp;ret);</div><div class='hunk'>@@ -454,6 +455,11 @@ static int brcmf_sdiod_sglist_rw(struct brcmf_sdio_dev *sdiodev,</div><div class='ctx'> 			if (sg_data_sz &gt; max_req_sz - req_sz)</div><div class='ctx'> 				sg_data_sz = max_req_sz - req_sz;</div><div class='ctx'> </div><div class='add'>+			if (!sgl) {</div><div class='add'>+				/* out of (pre-allocated) scatterlist entries */</div><div class='add'>+				ret = -ENOMEM;</div><div class='add'>+				goto exit;</div><div class='add'>+			}</div><div class='ctx'> 			sg_set_buf(sgl, pkt_data, sg_data_sz);</div><div class='ctx'> 			sg_cnt++;</div><div class='ctx'> </div><div class='hunk'>@@ -769,7 +775,7 @@ void brcmf_sdiod_sgtable_alloc(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> </div><div class='ctx'> 	nents = max_t(uint, BRCMF_DEFAULT_RXGLOM_SIZE,</div><div class='ctx'> 		      sdiodev-&gt;settings-&gt;bus.sdio.txglomsz);</div><div class='del'>-	nents += (nents &gt;&gt; 4) + 1;</div><div class='add'>+	nents *= 2;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(nents &gt; sdiodev-&gt;max_segment_count);</div><div class='ctx'> </div><div class='hunk'>@@ -783,9 +789,11 @@ void brcmf_sdiod_sgtable_alloc(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> 	sdiodev-&gt;txglomsz = sdiodev-&gt;settings-&gt;bus.sdio.txglomsz;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> static int brcmf_sdiod_freezer_attach(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> {</div><div class='add'>+	if (!IS_ENABLED(CONFIG_PM_SLEEP))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	sdiodev-&gt;freezer = kzalloc(sizeof(*sdiodev-&gt;freezer), GFP_KERNEL);</div><div class='ctx'> 	if (!sdiodev-&gt;freezer)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -801,6 +809,7 @@ static void brcmf_sdiod_freezer_detach(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> 	if (sdiodev-&gt;freezer) {</div><div class='ctx'> 		WARN_ON(atomic_read(&amp;sdiodev-&gt;freezer-&gt;freezing));</div><div class='ctx'> 		kfree(sdiodev-&gt;freezer);</div><div class='add'>+		sdiodev-&gt;freezer = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -832,7 +841,8 @@ static void brcmf_sdiod_freezer_off(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> </div><div class='ctx'> bool brcmf_sdiod_freezing(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> {</div><div class='del'>-	return atomic_read(&amp;sdiodev-&gt;freezer-&gt;freezing);</div><div class='add'>+	return IS_ENABLED(CONFIG_PM_SLEEP) &amp;&amp;</div><div class='add'>+		atomic_read(&amp;sdiodev-&gt;freezer-&gt;freezing);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void brcmf_sdiod_try_freeze(struct brcmf_sdio_dev *sdiodev)</div><div class='hunk'>@@ -846,24 +856,16 @@ void brcmf_sdiod_try_freeze(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> </div><div class='ctx'> void brcmf_sdiod_freezer_count(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> {</div><div class='del'>-	atomic_inc(&amp;sdiodev-&gt;freezer-&gt;thread_count);</div><div class='add'>+	if (IS_ENABLED(CONFIG_PM_SLEEP))</div><div class='add'>+		atomic_inc(&amp;sdiodev-&gt;freezer-&gt;thread_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void brcmf_sdiod_freezer_uncount(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> {</div><div class='del'>-	atomic_dec(&amp;sdiodev-&gt;freezer-&gt;thread_count);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static int brcmf_sdiod_freezer_attach(struct brcmf_sdio_dev *sdiodev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='add'>+	if (IS_ENABLED(CONFIG_PM_SLEEP))</div><div class='add'>+		atomic_dec(&amp;sdiodev-&gt;freezer-&gt;thread_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void brcmf_sdiod_freezer_detach(struct brcmf_sdio_dev *sdiodev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_PM_SLEEP */</div><div class='del'>-</div><div class='ctx'> int brcmf_sdiod_remove(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> {</div><div class='ctx'> 	sdiodev-&gt;state = BRCMF_SDIOD_DOWN;</div><div class='hunk'>@@ -874,13 +876,9 @@ int brcmf_sdiod_remove(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> </div><div class='ctx'> 	brcmf_sdiod_freezer_detach(sdiodev);</div><div class='ctx'> </div><div class='del'>-	/* Disable Function 2 */</div><div class='del'>-	sdio_claim_host(sdiodev-&gt;func2);</div><div class='del'>-	sdio_disable_func(sdiodev-&gt;func2);</div><div class='del'>-	sdio_release_host(sdiodev-&gt;func2);</div><div class='del'>-</div><div class='del'>-	/* Disable Function 1 */</div><div class='add'>+	/* Disable functions 2 then 1. */</div><div class='ctx'> 	sdio_claim_host(sdiodev-&gt;func1);</div><div class='add'>+	sdio_disable_func(sdiodev-&gt;func2);</div><div class='ctx'> 	sdio_disable_func(sdiodev-&gt;func1);</div><div class='ctx'> 	sdio_release_host(sdiodev-&gt;func1);</div><div class='ctx'> </div><div class='hunk'>@@ -910,7 +908,7 @@ int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		brcmf_err("Failed to set F1 blocksize\n");</div><div class='ctx'> 		sdio_release_host(sdiodev-&gt;func1);</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	switch (sdiodev-&gt;func2-&gt;device) {</div><div class='ctx'> 	case SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373:</div><div class='hunk'>@@ -932,7 +930,7 @@ int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		brcmf_err("Failed to set F2 blocksize\n");</div><div class='ctx'> 		sdio_release_host(sdiodev-&gt;func1);</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		brcmf_dbg(SDIO, "set F2 blocksize to %d\n", f2_blksz);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -954,8 +952,8 @@ int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> </div><div class='ctx'> 	/* try to attach to the target device */</div><div class='ctx'> 	sdiodev-&gt;bus = brcmf_sdio_probe(sdiodev);</div><div class='del'>-	if (!sdiodev-&gt;bus) {</div><div class='del'>-		ret = -ENODEV;</div><div class='add'>+	if (IS_ERR(sdiodev-&gt;bus)) {</div><div class='add'>+		ret = PTR_ERR(sdiodev-&gt;bus);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	brcmf_sdiod_host_fixup(sdiodev-&gt;func2-&gt;card-&gt;host);</div><div class='hunk'>@@ -966,45 +964,77 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define BRCMF_SDIO_DEVICE(dev_id)	\</div><div class='del'>-	{SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, dev_id)}</div><div class='add'>+#define BRCMF_SDIO_DEVICE(dev_id, fw_vend) \</div><div class='add'>+	{ \</div><div class='add'>+		SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, dev_id), \</div><div class='add'>+		.driver_data = BRCMF_FWVENDOR_ ## fw_vend \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define CYW_SDIO_DEVICE(dev_id, fw_vend) \</div><div class='add'>+	{ \</div><div class='add'>+		SDIO_DEVICE(SDIO_VENDOR_ID_CYPRESS, dev_id), \</div><div class='add'>+		.driver_data = BRCMF_FWVENDOR_ ## fw_vend \</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> /* devices we support, null terminated */</div><div class='ctx'> static const struct sdio_device_id brcmf_sdmmc_ids[] = {</div><div class='del'>-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43143),</div><div class='del'>-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43241),</div><div class='del'>-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4329),</div><div class='del'>-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4330),</div><div class='del'>-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4334),</div><div class='del'>-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43340),</div><div class='del'>-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43341),</div><div class='del'>-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43362),</div><div class='del'>-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43364),</div><div class='del'>-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4335_4339),</div><div class='del'>-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4339),</div><div class='del'>-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43430),</div><div class='del'>-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4345),</div><div class='del'>-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43455),</div><div class='del'>-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354),</div><div class='del'>-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4356),</div><div class='del'>-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4359),</div><div class='del'>-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373),</div><div class='del'>-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43012),</div><div class='del'>-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_89359),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43143, WCC),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43241, WCC),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4329, WCC),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4330, WCC),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4334, WCC),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43340, WCC),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43341, WCC),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43362, WCC),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43364, WCC),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4335_4339, WCC),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4339, WCC),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43430, WCC),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43439, WCC),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4345, WCC),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43455, WCC),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354, WCC),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4356, WCC),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4359, WCC),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43751, WCC),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43752, WCC),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373, CYW),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43012, CYW),</div><div class='add'>+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_89359, CYW),</div><div class='add'>+	CYW_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43439, CYW),</div><div class='ctx'> 	{ /* end: all zeroes */ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void brcmf_sdiod_acpi_set_power_manageable(struct device *dev,</div><div class='del'>-						  int val)</div><div class='add'>+static void brcmf_sdiod_acpi_save_power_manageable(struct brcmf_sdio_dev *sdiodev)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_ACPI)</div><div class='add'>+	struct acpi_device *adev;</div><div class='add'>+</div><div class='add'>+	adev = ACPI_COMPANION(&amp;sdiodev-&gt;func1-&gt;dev);</div><div class='add'>+	if (adev)</div><div class='add'>+		sdiodev-&gt;func1_power_manageable = adev-&gt;flags.power_manageable;</div><div class='add'>+</div><div class='add'>+	adev = ACPI_COMPANION(&amp;sdiodev-&gt;func2-&gt;dev);</div><div class='add'>+	if (adev)</div><div class='add'>+		sdiodev-&gt;func2_power_manageable = adev-&gt;flags.power_manageable;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void brcmf_sdiod_acpi_set_power_manageable(struct brcmf_sdio_dev *sdiodev,</div><div class='add'>+						  int enable)</div><div class='ctx'> {</div><div class='ctx'> #if IS_ENABLED(CONFIG_ACPI)</div><div class='ctx'> 	struct acpi_device *adev;</div><div class='ctx'> </div><div class='del'>-	adev = ACPI_COMPANION(dev);</div><div class='add'>+	adev = ACPI_COMPANION(&amp;sdiodev-&gt;func1-&gt;dev);</div><div class='add'>+	if (adev)</div><div class='add'>+		adev-&gt;flags.power_manageable = enable ? sdiodev-&gt;func1_power_manageable : 0;</div><div class='add'>+</div><div class='add'>+	adev = ACPI_COMPANION(&amp;sdiodev-&gt;func2-&gt;dev);</div><div class='ctx'> 	if (adev)</div><div class='del'>-		adev-&gt;flags.power_manageable = 0;</div><div class='add'>+		adev-&gt;flags.power_manageable = enable ? sdiodev-&gt;func2_power_manageable : 0;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1014,7 +1044,11 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct brcmf_sdio_dev *sdiodev;</div><div class='ctx'> 	struct brcmf_bus *bus_if;</div><div class='del'>-	struct device *dev;</div><div class='add'>+</div><div class='add'>+	if (!id) {</div><div class='add'>+		dev_err(&amp;func-&gt;dev, "Error no sdio_device_id passed for %x:%x\n", func-&gt;vendor, func-&gt;device);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(SDIO, "Enter\n");</div><div class='ctx'> 	brcmf_dbg(SDIO, "Class=%x\n", func-&gt;class);</div><div class='hunk'>@@ -1022,14 +1056,9 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,</div><div class='ctx'> 	brcmf_dbg(SDIO, "sdio device ID: 0x%04x\n", func-&gt;device);</div><div class='ctx'> 	brcmf_dbg(SDIO, "Function#: %d\n", func-&gt;num);</div><div class='ctx'> </div><div class='del'>-	dev = &amp;func-&gt;dev;</div><div class='del'>-</div><div class='ctx'> 	/* Set MMC_QUIRK_LENIENT_FN0 for this card */</div><div class='ctx'> 	func-&gt;card-&gt;quirks |= MMC_QUIRK_LENIENT_FN0;</div><div class='ctx'> </div><div class='del'>-	/* prohibit ACPI power management for this device */</div><div class='del'>-	brcmf_sdiod_acpi_set_power_manageable(dev, 0);</div><div class='del'>-</div><div class='ctx'> 	/* Consume func num 1 but dont do anything with it. */</div><div class='ctx'> 	if (func-&gt;num == 1)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1038,10 +1067,10 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,</div><div class='ctx'> 	if (func-&gt;num != 2)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	bus_if = kzalloc(sizeof(struct brcmf_bus), GFP_KERNEL);</div><div class='add'>+	bus_if = kzalloc(sizeof(*bus_if), GFP_KERNEL);</div><div class='ctx'> 	if (!bus_if)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	sdiodev = kzalloc(sizeof(struct brcmf_sdio_dev), GFP_KERNEL);</div><div class='add'>+	sdiodev = kzalloc(sizeof(*sdiodev), GFP_KERNEL);</div><div class='ctx'> 	if (!sdiodev) {</div><div class='ctx'> 		kfree(bus_if);</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -1056,10 +1085,12 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,</div><div class='ctx'> 	sdiodev-&gt;bus_if = bus_if;</div><div class='ctx'> 	bus_if-&gt;bus_priv.sdio = sdiodev;</div><div class='ctx'> 	bus_if-&gt;proto_type = BRCMF_PROTO_BCDC;</div><div class='add'>+	bus_if-&gt;fwvid = id-&gt;driver_data;</div><div class='ctx'> 	dev_set_drvdata(&amp;func-&gt;dev, bus_if);</div><div class='ctx'> 	dev_set_drvdata(&amp;sdiodev-&gt;func1-&gt;dev, bus_if);</div><div class='ctx'> 	sdiodev-&gt;dev = &amp;sdiodev-&gt;func1-&gt;dev;</div><div class='ctx'> </div><div class='add'>+	brcmf_sdiod_acpi_save_power_manageable(sdiodev);</div><div class='ctx'> 	brcmf_sdiod_change_state(sdiodev, BRCMF_SDIOD_DOWN);</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(SDIO, "F2 found, calling brcmf_sdiod_probe...\n");</div><div class='hunk'>@@ -1117,18 +1148,32 @@ void brcmf_sdio_wowl_config(struct device *dev, bool enabled)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_bus *bus_if = dev_get_drvdata(dev);</div><div class='ctx'> 	struct brcmf_sdio_dev *sdiodev = bus_if-&gt;bus_priv.sdio;</div><div class='add'>+	mmc_pm_flag_t pm_caps = sdio_get_host_pm_caps(sdiodev-&gt;func1);</div><div class='add'>+</div><div class='add'>+	/* Power must be preserved to be able to support WOWL. */</div><div class='add'>+	if (!(pm_caps &amp; MMC_PM_KEEP_POWER))</div><div class='add'>+		goto notsup;</div><div class='add'>+</div><div class='add'>+	if (sdiodev-&gt;settings-&gt;bus.sdio.oob_irq_supported ||</div><div class='add'>+	    pm_caps &amp; MMC_PM_WAKE_SDIO_IRQ) {</div><div class='add'>+		/* Stop ACPI from turning off the device when wowl is enabled */</div><div class='add'>+		brcmf_sdiod_acpi_set_power_manageable(sdiodev, !enabled);</div><div class='add'>+		sdiodev-&gt;wowl_enabled = enabled;</div><div class='add'>+		brcmf_dbg(SDIO, "Configuring WOWL, enabled=%d\n", enabled);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	brcmf_dbg(SDIO, "Configuring WOWL, enabled=%d\n", enabled);</div><div class='del'>-	sdiodev-&gt;wowl_enabled = enabled;</div><div class='add'>+notsup:</div><div class='add'>+	brcmf_dbg(SDIO, "WOWL not supported\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> static int brcmf_ops_sdio_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdio_func *func;</div><div class='ctx'> 	struct brcmf_bus *bus_if;</div><div class='ctx'> 	struct brcmf_sdio_dev *sdiodev;</div><div class='del'>-	mmc_pm_flag_t pm_caps, sdio_flags;</div><div class='add'>+	mmc_pm_flag_t sdio_flags;</div><div class='add'>+	bool cap_power_off;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	func = container_of(dev, struct sdio_func, dev);</div><div class='hunk'>@@ -1136,18 +1181,17 @@ static int brcmf_ops_sdio_suspend(struct device *dev)</div><div class='ctx'> 	if (func-&gt;num != 1)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	cap_power_off = !!(func-&gt;card-&gt;host-&gt;caps &amp; MMC_CAP_POWER_OFF_CARD);</div><div class='ctx'> </div><div class='ctx'> 	bus_if = dev_get_drvdata(dev);</div><div class='ctx'> 	sdiodev = bus_if-&gt;bus_priv.sdio;</div><div class='ctx'> </div><div class='del'>-	pm_caps = sdio_get_host_pm_caps(func);</div><div class='del'>-</div><div class='del'>-	if (pm_caps &amp; MMC_PM_KEEP_POWER) {</div><div class='del'>-		/* preserve card power during suspend */</div><div class='add'>+	if (sdiodev-&gt;wowl_enabled || !cap_power_off) {</div><div class='ctx'> 		brcmf_sdiod_freezer_on(sdiodev);</div><div class='ctx'> 		brcmf_sdio_wd_timer(sdiodev-&gt;bus, 0);</div><div class='ctx'> </div><div class='ctx'> 		sdio_flags = MMC_PM_KEEP_POWER;</div><div class='add'>+</div><div class='ctx'> 		if (sdiodev-&gt;wowl_enabled) {</div><div class='ctx'> 			if (sdiodev-&gt;settings-&gt;bus.sdio.oob_irq_supported)</div><div class='ctx'> 				enable_irq_wake(sdiodev-&gt;settings-&gt;bus.sdio.oob_irq_nr);</div><div class='hunk'>@@ -1174,21 +1218,20 @@ static int brcmf_ops_sdio_resume(struct device *dev)</div><div class='ctx'> 	struct brcmf_bus *bus_if = dev_get_drvdata(dev);</div><div class='ctx'> 	struct brcmf_sdio_dev *sdiodev = bus_if-&gt;bus_priv.sdio;</div><div class='ctx'> 	struct sdio_func *func = container_of(dev, struct sdio_func, dev);</div><div class='del'>-	mmc_pm_flag_t pm_caps = sdio_get_host_pm_caps(func);</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	bool cap_power_off = !!(func-&gt;card-&gt;host-&gt;caps &amp; MMC_CAP_POWER_OFF_CARD);</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(SDIO, "Enter: F%d\n", func-&gt;num);</div><div class='ctx'> 	if (func-&gt;num != 2)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!(pm_caps &amp; MMC_PM_KEEP_POWER)) {</div><div class='add'>+	if (!sdiodev-&gt;wowl_enabled &amp;&amp; cap_power_off) {</div><div class='ctx'> 		/* bus was powered off and device removed, probe again */</div><div class='ctx'> 		ret = brcmf_sdiod_probe(sdiodev);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			brcmf_err("Failed to probe device on resume\n");</div><div class='ctx'> 	} else {</div><div class='del'>-		if (sdiodev-&gt;wowl_enabled &amp;&amp;</div><div class='del'>-		    sdiodev-&gt;settings-&gt;bus.sdio.oob_irq_supported)</div><div class='add'>+		if (sdiodev-&gt;wowl_enabled &amp;&amp; sdiodev-&gt;settings-&gt;bus.sdio.oob_irq_supported)</div><div class='ctx'> 			disable_irq_wake(sdiodev-&gt;settings-&gt;bus.sdio.oob_irq_nr);</div><div class='ctx'> </div><div class='ctx'> 		brcmf_sdiod_freezer_off(sdiodev);</div><div class='hunk'>@@ -1197,11 +1240,9 @@ static int brcmf_ops_sdio_resume(struct device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct dev_pm_ops brcmf_sdio_pm_ops = {</div><div class='del'>-	.suspend	= brcmf_ops_sdio_suspend,</div><div class='del'>-	.resume		= brcmf_ops_sdio_resume,</div><div class='del'>-};</div><div class='del'>-#endif	/* CONFIG_PM_SLEEP */</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(brcmf_sdio_pm_ops,</div><div class='add'>+				brcmf_ops_sdio_suspend,</div><div class='add'>+				brcmf_ops_sdio_resume);</div><div class='ctx'> </div><div class='ctx'> static struct sdio_driver brcmf_sdmmc_driver = {</div><div class='ctx'> 	.probe = brcmf_ops_sdio_probe,</div><div class='hunk'>@@ -1209,21 +1250,14 @@ static struct sdio_driver brcmf_sdmmc_driver = {</div><div class='ctx'> 	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = brcmf_sdmmc_ids,</div><div class='ctx'> 	.drv = {</div><div class='del'>-		.owner = THIS_MODULE,</div><div class='del'>-#ifdef CONFIG_PM_SLEEP</div><div class='del'>-		.pm = &amp;brcmf_sdio_pm_ops,</div><div class='del'>-#endif	/* CONFIG_PM_SLEEP */</div><div class='add'>+		.pm = pm_sleep_ptr(&amp;brcmf_sdio_pm_ops),</div><div class='ctx'> 		.coredump = brcmf_dev_coredump,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void brcmf_sdio_register(void)</div><div class='add'>+int brcmf_sdio_register(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = sdio_register_driver(&amp;brcmf_sdmmc_driver);</div><div class='del'>-	if (ret)</div><div class='del'>-		brcmf_err("sdio_register_driver failed: %d\n", ret);</div><div class='add'>+	return sdio_register_driver(&amp;brcmf_sdmmc_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void brcmf_sdio_exit(void)</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c<br/>index f9f18ff451ea..67c0c5a92f99 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c</a></div><div class='hunk'>@@ -123,7 +123,7 @@ static s32 brcmf_btcoex_params_read(struct brcmf_if *ifp, u32 addr, u32 *data)</div><div class='ctx'> {</div><div class='ctx'> 	*data = addr;</div><div class='ctx'> </div><div class='del'>-	return brcmf_fil_iovar_int_get(ifp, "btc_params", data);</div><div class='add'>+	return brcmf_fil_iovar_int_query(ifp, "btc_params", data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -272,7 +272,8 @@ static void brcmf_btcoex_restore_part1(struct brcmf_btcoex_info *btci)</div><div class='ctx'>  */</div><div class='ctx'> static void brcmf_btcoex_timerfunc(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_btcoex_info *bt_local = from_timer(bt_local, t, timer);</div><div class='add'>+	struct brcmf_btcoex_info *bt_local = timer_container_of(bt_local, t,</div><div class='add'>+								timer);</div><div class='ctx'> 	brcmf_dbg(TRACE, "enter\n");</div><div class='ctx'> </div><div class='ctx'> 	bt_local-&gt;timer_on = false;</div><div class='hunk'>@@ -289,7 +290,7 @@ static void brcmf_btcoex_handler(struct work_struct *work)</div><div class='ctx'> 	btci = container_of(work, struct brcmf_btcoex_info, work);</div><div class='ctx'> 	if (btci-&gt;timer_on) {</div><div class='ctx'> 		btci-&gt;timer_on = false;</div><div class='del'>-		del_timer_sync(&amp;btci-&gt;timer);</div><div class='add'>+		timer_delete_sync(&amp;btci-&gt;timer);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (btci-&gt;bt_state) {</div><div class='hunk'>@@ -358,10 +359,10 @@ idle:</div><div class='ctx'>  */</div><div class='ctx'> int brcmf_btcoex_attach(struct brcmf_cfg80211_info *cfg)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_btcoex_info *btci = NULL;</div><div class='add'>+	struct brcmf_btcoex_info *btci;</div><div class='ctx'> 	brcmf_dbg(TRACE, "enter\n");</div><div class='ctx'> </div><div class='del'>-	btci = kmalloc(sizeof(struct brcmf_btcoex_info), GFP_KERNEL);</div><div class='add'>+	btci = kmalloc(sizeof(*btci), GFP_KERNEL);</div><div class='ctx'> 	if (!btci)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -392,10 +393,8 @@ void brcmf_btcoex_detach(struct brcmf_cfg80211_info *cfg)</div><div class='ctx'> 	if (!cfg-&gt;btcoex)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (cfg-&gt;btcoex-&gt;timer_on) {</div><div class='del'>-		cfg-&gt;btcoex-&gt;timer_on = false;</div><div class='del'>-		del_timer_sync(&amp;cfg-&gt;btcoex-&gt;timer);</div><div class='del'>-	}</div><div class='add'>+	timer_shutdown_sync(&amp;cfg-&gt;btcoex-&gt;timer);</div><div class='add'>+	cfg-&gt;btcoex-&gt;timer_on = false;</div><div class='ctx'> </div><div class='ctx'> 	cancel_work_sync(&amp;cfg-&gt;btcoex-&gt;work);</div><div class='ctx'> </div><div class='hunk'>@@ -428,7 +427,7 @@ static void brcmf_btcoex_dhcp_end(struct brcmf_btcoex_info *btci)</div><div class='ctx'> 	if (btci-&gt;timer_on) {</div><div class='ctx'> 		brcmf_dbg(INFO, "disable BT DHCP Timer\n");</div><div class='ctx'> 		btci-&gt;timer_on = false;</div><div class='del'>-		del_timer_sync(&amp;btci-&gt;timer);</div><div class='add'>+		timer_delete_sync(&amp;btci-&gt;timer);</div><div class='ctx'> </div><div class='ctx'> 		/* schedule worker if transition to IDLE is needed */</div><div class='ctx'> 		if (btci-&gt;bt_state != BRCMF_BT_DHCP_IDLE) {</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h<br/>index 08f9d47f2e5c..fe31051a9e11 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h</a></div><div class='hunk'>@@ -6,6 +6,9 @@</div><div class='ctx'> #ifndef BRCMFMAC_BUS_H</div><div class='ctx'> #define BRCMFMAC_BUS_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> </div><div class='ctx'> /* IDs of the 6 default common rings of msgbuf protocol */</div><div class='hunk'>@@ -22,6 +25,21 @@</div><div class='ctx'> #define BRCMF_NROF_COMMON_MSGRINGS	(BRCMF_NROF_H2D_COMMON_MSGRINGS + \</div><div class='ctx'> 					 BRCMF_NROF_D2H_COMMON_MSGRINGS)</div><div class='ctx'> </div><div class='add'>+/* The interval to poll console */</div><div class='add'>+#define BRCMF_CONSOLE	10</div><div class='add'>+</div><div class='add'>+/* The maximum console interval value (5 mins) */</div><div class='add'>+#define MAX_CONSOLE_INTERVAL	(5 * 60)</div><div class='add'>+</div><div class='add'>+enum brcmf_fwvendor {</div><div class='add'>+	BRCMF_FWVENDOR_WCC,</div><div class='add'>+	BRCMF_FWVENDOR_CYW,</div><div class='add'>+	BRCMF_FWVENDOR_BCA,</div><div class='add'>+	/* keep last */</div><div class='add'>+	BRCMF_FWVENDOR_NUM,</div><div class='add'>+	BRCMF_FWVENDOR_INVALID</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* The level of bus communication with the dongle */</div><div class='ctx'> enum brcmf_bus_state {</div><div class='ctx'> 	BRCMF_BUS_DOWN,		/* Not ready for frame transfers */</div><div class='hunk'>@@ -34,6 +52,12 @@ enum brcmf_bus_protocol_type {</div><div class='ctx'> 	BRCMF_PROTO_MSGBUF</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Firmware blobs that may be available */</div><div class='add'>+enum brcmf_blob_type {</div><div class='add'>+	BRCMF_BLOB_CLM,</div><div class='add'>+	BRCMF_BLOB_TXCAP,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct brcmf_mp_device;</div><div class='ctx'> </div><div class='ctx'> struct brcmf_bus_dcmd {</div><div class='hunk'>@@ -60,7 +84,8 @@ struct brcmf_bus_dcmd {</div><div class='ctx'>  * @wowl_config: specify if dongle is configured for wowl when going to suspend</div><div class='ctx'>  * @get_ramsize: obtain size of device memory.</div><div class='ctx'>  * @get_memdump: obtain device memory dump in provided buffer.</div><div class='del'>- * @get_fwname: obtain firmware name.</div><div class='add'>+ * @get_blob: obtain a firmware blob.</div><div class='add'>+ * @remove: initiate unbind of the device.</div><div class='ctx'>  *</div><div class='ctx'>  * This structure provides an abstract interface towards the</div><div class='ctx'>  * bus specific driver. For control messages to common driver</div><div class='hunk'>@@ -77,10 +102,11 @@ struct brcmf_bus_ops {</div><div class='ctx'> 	void (*wowl_config)(struct device *dev, bool enabled);</div><div class='ctx'> 	size_t (*get_ramsize)(struct device *dev);</div><div class='ctx'> 	int (*get_memdump)(struct device *dev, void *data, size_t len);</div><div class='del'>-	int (*get_fwname)(struct device *dev, const char *ext,</div><div class='del'>-			  unsigned char *fw_name);</div><div class='add'>+	int (*get_blob)(struct device *dev, const struct firmware **fw,</div><div class='add'>+			enum brcmf_blob_type type);</div><div class='ctx'> 	void (*debugfs_create)(struct device *dev);</div><div class='ctx'> 	int (*reset)(struct device *dev);</div><div class='add'>+	void (*remove)(struct device *dev);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -89,7 +115,7 @@ struct brcmf_bus_ops {</div><div class='ctx'>  *</div><div class='ctx'>  * @commonrings: commonrings which are always there.</div><div class='ctx'>  * @flowrings: commonrings which are dynamically created and destroyed for data.</div><div class='del'>- * @rx_dataoffset: if set then all rx data has this this offset.</div><div class='add'>+ * @rx_dataoffset: if set then all rx data has this offset.</div><div class='ctx'>  * @max_rxbufpost: maximum number of buffers to post for rx.</div><div class='ctx'>  * @max_flowrings: maximum number of tx flow rings supported.</div><div class='ctx'>  * @max_submissionrings: maximum number of submission rings(h2d) supported.</div><div class='hunk'>@@ -128,10 +154,13 @@ struct brcmf_bus_stats {</div><div class='ctx'>  * @stats: statistics shared between common and bus layer.</div><div class='ctx'>  * @maxctl: maximum size for rxctl request message.</div><div class='ctx'>  * @chip: device identifier of the dongle chip.</div><div class='add'>+ * @chiprev: revision of the dongle chip.</div><div class='add'>+ * @fwvid: firmware vendor-support identifier of the device.</div><div class='ctx'>  * @always_use_fws_queue: bus wants use queue also when fwsignal is inactive.</div><div class='ctx'>  * @wowl_supported: is wowl supported by bus driver.</div><div class='del'>- * @chiprev: revision of the dongle chip.</div><div class='add'>+ * @ops: callbacks for this bus instance.</div><div class='ctx'>  * @msgbuf: msgbuf protocol parameters provided by bus layer.</div><div class='add'>+ * @list: member used to add this bus instance to linked list.</div><div class='ctx'>  */</div><div class='ctx'> struct brcmf_bus {</div><div class='ctx'> 	union {</div><div class='hunk'>@@ -147,11 +176,14 @@ struct brcmf_bus {</div><div class='ctx'> 	uint maxctl;</div><div class='ctx'> 	u32 chip;</div><div class='ctx'> 	u32 chiprev;</div><div class='add'>+	enum brcmf_fwvendor fwvid;</div><div class='ctx'> 	bool always_use_fws_queue;</div><div class='ctx'> 	bool wowl_supported;</div><div class='ctx'> </div><div class='ctx'> 	const struct brcmf_bus_ops *ops;</div><div class='ctx'> 	struct brcmf_bus_msgbuf *msgbuf;</div><div class='add'>+</div><div class='add'>+	struct list_head list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -220,10 +252,10 @@ int brcmf_bus_get_memdump(struct brcmf_bus *bus, void *data, size_t len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline</div><div class='del'>-int brcmf_bus_get_fwname(struct brcmf_bus *bus, const char *ext,</div><div class='del'>-			 unsigned char *fw_name)</div><div class='add'>+int brcmf_bus_get_blob(struct brcmf_bus *bus, const struct firmware **fw,</div><div class='add'>+		       enum brcmf_blob_type type)</div><div class='ctx'> {</div><div class='del'>-	return bus-&gt;ops-&gt;get_fwname(bus-&gt;dev, ext, fw_name);</div><div class='add'>+	return bus-&gt;ops-&gt;get_blob(bus-&gt;dev, fw, type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline</div><div class='hunk'>@@ -244,6 +276,16 @@ int brcmf_bus_reset(struct brcmf_bus *bus)</div><div class='ctx'> 	return bus-&gt;ops-&gt;reset(bus-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void brcmf_bus_remove(struct brcmf_bus *bus)</div><div class='add'>+{</div><div class='add'>+	if (!bus-&gt;ops-&gt;remove) {</div><div class='add'>+		device_release_driver(bus-&gt;dev);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bus-&gt;ops-&gt;remove(bus-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * interface functions from common layer</div><div class='ctx'>  */</div><div class='hunk'>@@ -275,11 +317,26 @@ void brcmf_bus_add_txhdrlen(struct device *dev, uint len);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BRCMFMAC_SDIO</div><div class='ctx'> void brcmf_sdio_exit(void);</div><div class='del'>-void brcmf_sdio_register(void);</div><div class='add'>+int brcmf_sdio_register(void);</div><div class='add'>+#else</div><div class='add'>+static inline void brcmf_sdio_exit(void) { }</div><div class='add'>+static inline int brcmf_sdio_register(void) { return 0; }</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_BRCMFMAC_USB</div><div class='ctx'> void brcmf_usb_exit(void);</div><div class='del'>-void brcmf_usb_register(void);</div><div class='add'>+int brcmf_usb_register(void);</div><div class='add'>+#else</div><div class='add'>+static inline void brcmf_usb_exit(void) { }</div><div class='add'>+static inline int brcmf_usb_register(void) { return 0; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BRCMFMAC_PCIE</div><div class='add'>+void brcmf_pcie_exit(void);</div><div class='add'>+int brcmf_pcie_register(void);</div><div class='add'>+#else</div><div class='add'>+static inline void brcmf_pcie_exit(void) { }</div><div class='add'>+static inline int brcmf_pcie_register(void) { return 0; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* BRCMFMAC_BUS_H */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c<br/>index f4405d7861b6..bb96b87b2a6e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;brcmu_utils.h&gt;</div><div class='ctx'> #include &lt;defs.h&gt;</div><div class='ctx'> #include &lt;brcmu_wifi.h&gt;</div><div class='add'>+#include &lt;brcm_hw_ids.h&gt;</div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> #include "tracepoint.h"</div><div class='hunk'>@@ -31,6 +32,7 @@</div><div class='ctx'> #include "vendor.h"</div><div class='ctx'> #include "bus.h"</div><div class='ctx'> #include "common.h"</div><div class='add'>+#include "fwvid.h"</div><div class='ctx'> </div><div class='ctx'> #define BRCMF_SCAN_IE_LEN_MAX		2048</div><div class='ctx'> </div><div class='hunk'>@@ -72,7 +74,6 @@</div><div class='ctx'> #define VNDR_IE_HDR_SIZE		12</div><div class='ctx'> #define VNDR_IE_PARSE_LIMIT		5</div><div class='ctx'> </div><div class='del'>-#define	DOT11_MGMT_HDR_LEN		24	/* d11 management header len */</div><div class='ctx'> #define	DOT11_BCN_PRB_FIXED_LEN		12	/* beacon/probe fixed length */</div><div class='ctx'> </div><div class='ctx'> #define BRCMF_SCAN_JOIN_ACTIVE_DWELL_TIME_MS	320</div><div class='hunk'>@@ -87,9 +88,42 @@</div><div class='ctx'> </div><div class='ctx'> #define BRCMF_PS_MAX_TIMEOUT_MS		2000</div><div class='ctx'> </div><div class='add'>+/* Dump obss definitions */</div><div class='add'>+#define ACS_MSRMNT_DELAY		80</div><div class='add'>+#define CHAN_NOISE_DUMMY		(-80)</div><div class='add'>+#define OBSS_TOKEN_IDX			15</div><div class='add'>+#define IBSS_TOKEN_IDX			15</div><div class='add'>+#define TX_TOKEN_IDX			14</div><div class='add'>+#define CTG_TOKEN_IDX			13</div><div class='add'>+#define PKT_TOKEN_IDX			15</div><div class='add'>+#define IDLE_TOKEN_IDX			12</div><div class='add'>+</div><div class='ctx'> #define BRCMF_ASSOC_PARAMS_FIXED_SIZE \</div><div class='ctx'> 	(sizeof(struct brcmf_assoc_params_le) - sizeof(u16))</div><div class='ctx'> </div><div class='add'>+#define BRCMF_MAX_CHANSPEC_LIST \</div><div class='add'>+	(BRCMF_DCMD_MEDLEN / sizeof(__le32) - 1)</div><div class='add'>+</div><div class='add'>+struct brcmf_dump_survey {</div><div class='add'>+	u32 obss;</div><div class='add'>+	u32 ibss;</div><div class='add'>+	u32 no_ctg;</div><div class='add'>+	u32 no_pckt;</div><div class='add'>+	u32 tx;</div><div class='add'>+	u32 idle;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cca_stats_n_flags {</div><div class='add'>+	u32 msrmnt_time; /* Time for Measurement (msec) */</div><div class='add'>+	u32 msrmnt_done; /* flag set when measurement complete */</div><div class='add'>+	char buf[1];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cca_msrmnt_query {</div><div class='add'>+	u32 msrmnt_query;</div><div class='add'>+	u32 time_req;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static bool check_vif_up(struct brcmf_cfg80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	if (!test_bit(BRCMF_VIF_STATUS_READY, &amp;vif-&gt;sme_state)) {</div><div class='hunk'>@@ -233,6 +267,48 @@ struct parsed_vndr_ies {</div><div class='ctx'> 	struct parsed_vndr_ie_info ie_info[VNDR_IE_PARSE_LIMIT];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define WL_INTERFACE_CREATE_VER_1		1</div><div class='add'>+#define WL_INTERFACE_CREATE_VER_2		2</div><div class='add'>+#define WL_INTERFACE_CREATE_VER_3		3</div><div class='add'>+#define WL_INTERFACE_CREATE_VER_MAX		WL_INTERFACE_CREATE_VER_3</div><div class='add'>+</div><div class='add'>+#define WL_INTERFACE_MAC_DONT_USE	0x0</div><div class='add'>+#define WL_INTERFACE_MAC_USE		0x2</div><div class='add'>+</div><div class='add'>+#define WL_INTERFACE_CREATE_STA		0x0</div><div class='add'>+#define WL_INTERFACE_CREATE_AP		0x1</div><div class='add'>+</div><div class='add'>+struct wl_interface_create_v1 {</div><div class='add'>+	u16	ver;			/* structure version */</div><div class='add'>+	u32	flags;			/* flags for operation */</div><div class='add'>+	u8	mac_addr[ETH_ALEN];	/* MAC address */</div><div class='add'>+	u32	wlc_index;		/* optional for wlc index */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wl_interface_create_v2 {</div><div class='add'>+	u16	ver;			/* structure version */</div><div class='add'>+	u8	pad1[2];</div><div class='add'>+	u32	flags;			/* flags for operation */</div><div class='add'>+	u8	mac_addr[ETH_ALEN];	/* MAC address */</div><div class='add'>+	u8	iftype;			/* type of interface created */</div><div class='add'>+	u8	pad2;</div><div class='add'>+	u32	wlc_index;		/* optional for wlc index */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wl_interface_create_v3 {</div><div class='add'>+	u16 ver;			/* structure version */</div><div class='add'>+	u16 len;			/* length of structure + data */</div><div class='add'>+	u16 fixed_len;			/* length of structure */</div><div class='add'>+	u8 iftype;			/* type of interface created */</div><div class='add'>+	u8 wlc_index;			/* optional for wlc index */</div><div class='add'>+	u32 flags;			/* flags for operation */</div><div class='add'>+	u8 mac_addr[ETH_ALEN];		/* MAC address */</div><div class='add'>+	u8 bssid[ETH_ALEN];		/* optional for BSSID */</div><div class='add'>+	u8 if_index;			/* interface index request */</div><div class='add'>+	u8 pad[3];</div><div class='add'>+	u8 data[];			/* Optional for specific data */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static u8 nl80211_band_to_fwil(enum nl80211_band band)</div><div class='ctx'> {</div><div class='ctx'> 	switch (band) {</div><div class='hunk'>@@ -520,40 +596,230 @@ static int brcmf_get_first_free_bsscfgidx(struct brcmf_pub *drvr)</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void brcmf_set_vif_sta_macaddr(struct brcmf_if *ifp, u8 *mac_addr)</div><div class='add'>+{</div><div class='add'>+	u8 mac_idx = ifp-&gt;drvr-&gt;sta_mac_idx;</div><div class='add'>+</div><div class='add'>+	/* set difference MAC address with locally administered bit */</div><div class='add'>+	memcpy(mac_addr, ifp-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+	mac_addr[0] |= 0x02;</div><div class='add'>+	mac_addr[3] ^= mac_idx ? 0xC0 : 0xA0;</div><div class='add'>+	mac_idx++;</div><div class='add'>+	mac_idx = mac_idx % 2;</div><div class='add'>+	ifp-&gt;drvr-&gt;sta_mac_idx = mac_idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int brcmf_cfg80211_request_sta_if(struct brcmf_if *ifp, u8 *macaddr)</div><div class='add'>+{</div><div class='add'>+	struct wl_interface_create_v1 iface_v1;</div><div class='add'>+	struct wl_interface_create_v2 iface_v2;</div><div class='add'>+	struct wl_interface_create_v3 iface_v3;</div><div class='add'>+	u32 iface_create_ver;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* interface_create version 1 */</div><div class='add'>+	memset(&amp;iface_v1, 0, sizeof(iface_v1));</div><div class='add'>+	iface_v1.ver = WL_INTERFACE_CREATE_VER_1;</div><div class='add'>+	iface_v1.flags = WL_INTERFACE_CREATE_STA |</div><div class='add'>+			 WL_INTERFACE_MAC_USE;</div><div class='add'>+	if (!is_zero_ether_addr(macaddr))</div><div class='add'>+		memcpy(iface_v1.mac_addr, macaddr, ETH_ALEN);</div><div class='add'>+	else</div><div class='add'>+		brcmf_set_vif_sta_macaddr(ifp, iface_v1.mac_addr);</div><div class='add'>+</div><div class='add'>+	err = brcmf_fil_iovar_data_get(ifp, "interface_create",</div><div class='add'>+				       &amp;iface_v1,</div><div class='add'>+				       sizeof(iface_v1));</div><div class='add'>+	if (err) {</div><div class='add'>+		brcmf_info("failed to create interface(v1), err=%d\n",</div><div class='add'>+			   err);</div><div class='add'>+	} else {</div><div class='add'>+		brcmf_dbg(INFO, "interface created(v1)\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* interface_create version 2 */</div><div class='add'>+	memset(&amp;iface_v2, 0, sizeof(iface_v2));</div><div class='add'>+	iface_v2.ver = WL_INTERFACE_CREATE_VER_2;</div><div class='add'>+	iface_v2.flags = WL_INTERFACE_MAC_USE;</div><div class='add'>+	iface_v2.iftype = WL_INTERFACE_CREATE_STA;</div><div class='add'>+	if (!is_zero_ether_addr(macaddr))</div><div class='add'>+		memcpy(iface_v2.mac_addr, macaddr, ETH_ALEN);</div><div class='add'>+	else</div><div class='add'>+		brcmf_set_vif_sta_macaddr(ifp, iface_v2.mac_addr);</div><div class='add'>+</div><div class='add'>+	err = brcmf_fil_iovar_data_get(ifp, "interface_create",</div><div class='add'>+				       &amp;iface_v2,</div><div class='add'>+				       sizeof(iface_v2));</div><div class='add'>+	if (err) {</div><div class='add'>+		brcmf_info("failed to create interface(v2), err=%d\n",</div><div class='add'>+			   err);</div><div class='add'>+	} else {</div><div class='add'>+		brcmf_dbg(INFO, "interface created(v2)\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* interface_create version 3+ */</div><div class='add'>+	/* get supported version from firmware side */</div><div class='add'>+	iface_create_ver = 0;</div><div class='add'>+	err = brcmf_fil_bsscfg_int_query(ifp, "interface_create",</div><div class='add'>+					 &amp;iface_create_ver);</div><div class='add'>+	if (err) {</div><div class='add'>+		brcmf_err("fail to get supported version, err=%d\n", err);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (iface_create_ver) {</div><div class='add'>+	case WL_INTERFACE_CREATE_VER_3:</div><div class='add'>+		memset(&amp;iface_v3, 0, sizeof(iface_v3));</div><div class='add'>+		iface_v3.ver = WL_INTERFACE_CREATE_VER_3;</div><div class='add'>+		iface_v3.flags = WL_INTERFACE_MAC_USE;</div><div class='add'>+		iface_v3.iftype = WL_INTERFACE_CREATE_STA;</div><div class='add'>+		if (!is_zero_ether_addr(macaddr))</div><div class='add'>+			memcpy(iface_v3.mac_addr, macaddr, ETH_ALEN);</div><div class='add'>+		else</div><div class='add'>+			brcmf_set_vif_sta_macaddr(ifp, iface_v3.mac_addr);</div><div class='add'>+</div><div class='add'>+		err = brcmf_fil_iovar_data_get(ifp, "interface_create",</div><div class='add'>+					       &amp;iface_v3,</div><div class='add'>+					       sizeof(iface_v3));</div><div class='add'>+</div><div class='add'>+		if (!err)</div><div class='add'>+			brcmf_dbg(INFO, "interface created(v3)\n");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		brcmf_err("not support interface create(v%d)\n",</div><div class='add'>+			  iface_create_ver);</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		brcmf_info("station interface creation failed (%d)\n",</div><div class='add'>+			   err);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int brcmf_cfg80211_request_ap_if(struct brcmf_if *ifp)</div><div class='ctx'> {</div><div class='add'>+	struct wl_interface_create_v1 iface_v1;</div><div class='add'>+	struct wl_interface_create_v2 iface_v2;</div><div class='add'>+	struct wl_interface_create_v3 iface_v3;</div><div class='add'>+	u32 iface_create_ver;</div><div class='ctx'> 	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='ctx'> 	struct brcmf_mbss_ssid_le mbss_ssid_le;</div><div class='ctx'> 	int bsscfgidx;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;mbss_ssid_le, 0, sizeof(mbss_ssid_le));</div><div class='del'>-	bsscfgidx = brcmf_get_first_free_bsscfgidx(ifp-&gt;drvr);</div><div class='del'>-	if (bsscfgidx &lt; 0)</div><div class='del'>-		return bsscfgidx;</div><div class='add'>+	/* interface_create version 1 */</div><div class='add'>+	memset(&amp;iface_v1, 0, sizeof(iface_v1));</div><div class='add'>+	iface_v1.ver = WL_INTERFACE_CREATE_VER_1;</div><div class='add'>+	iface_v1.flags = WL_INTERFACE_CREATE_AP |</div><div class='add'>+			 WL_INTERFACE_MAC_USE;</div><div class='ctx'> </div><div class='del'>-	mbss_ssid_le.bsscfgidx = cpu_to_le32(bsscfgidx);</div><div class='del'>-	mbss_ssid_le.SSID_len = cpu_to_le32(5);</div><div class='del'>-	sprintf(mbss_ssid_le.SSID, "ssid%d" , bsscfgidx);</div><div class='add'>+	brcmf_set_vif_sta_macaddr(ifp, iface_v1.mac_addr);</div><div class='ctx'> </div><div class='del'>-	err = brcmf_fil_bsscfg_data_set(ifp, "bsscfg:ssid", &amp;mbss_ssid_le,</div><div class='del'>-					sizeof(mbss_ssid_le));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		bphy_err(drvr, "setting ssid failed %d\n", err);</div><div class='add'>+	err = brcmf_fil_iovar_data_get(ifp, "interface_create",</div><div class='add'>+				       &amp;iface_v1,</div><div class='add'>+				       sizeof(iface_v1));</div><div class='add'>+	if (err) {</div><div class='add'>+		brcmf_info("failed to create interface(v1), err=%d\n",</div><div class='add'>+			   err);</div><div class='add'>+	} else {</div><div class='add'>+		brcmf_dbg(INFO, "interface created(v1)\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* interface_create version 2 */</div><div class='add'>+	memset(&amp;iface_v2, 0, sizeof(iface_v2));</div><div class='add'>+	iface_v2.ver = WL_INTERFACE_CREATE_VER_2;</div><div class='add'>+	iface_v2.flags = WL_INTERFACE_MAC_USE;</div><div class='add'>+	iface_v2.iftype = WL_INTERFACE_CREATE_AP;</div><div class='add'>+</div><div class='add'>+	brcmf_set_vif_sta_macaddr(ifp, iface_v2.mac_addr);</div><div class='add'>+</div><div class='add'>+	err = brcmf_fil_iovar_data_get(ifp, "interface_create",</div><div class='add'>+				       &amp;iface_v2,</div><div class='add'>+				       sizeof(iface_v2));</div><div class='add'>+	if (err) {</div><div class='add'>+		brcmf_info("failed to create interface(v2), err=%d\n",</div><div class='add'>+			   err);</div><div class='add'>+	} else {</div><div class='add'>+		brcmf_dbg(INFO, "interface created(v2)\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* interface_create version 3+ */</div><div class='add'>+	/* get supported version from firmware side */</div><div class='add'>+	iface_create_ver = 0;</div><div class='add'>+	err = brcmf_fil_bsscfg_int_query(ifp, "interface_create",</div><div class='add'>+					 &amp;iface_create_ver);</div><div class='add'>+	if (err) {</div><div class='add'>+		brcmf_err("fail to get supported version, err=%d\n", err);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (iface_create_ver) {</div><div class='add'>+	case WL_INTERFACE_CREATE_VER_3:</div><div class='add'>+		memset(&amp;iface_v3, 0, sizeof(iface_v3));</div><div class='add'>+		iface_v3.ver = WL_INTERFACE_CREATE_VER_3;</div><div class='add'>+		iface_v3.flags = WL_INTERFACE_MAC_USE;</div><div class='add'>+		iface_v3.iftype = WL_INTERFACE_CREATE_AP;</div><div class='add'>+		brcmf_set_vif_sta_macaddr(ifp, iface_v3.mac_addr);</div><div class='add'>+</div><div class='add'>+		err = brcmf_fil_iovar_data_get(ifp, "interface_create",</div><div class='add'>+					       &amp;iface_v3,</div><div class='add'>+					       sizeof(iface_v3));</div><div class='add'>+</div><div class='add'>+		if (!err)</div><div class='add'>+			brcmf_dbg(INFO, "interface created(v3)\n");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		brcmf_err("not support interface create(v%d)\n",</div><div class='add'>+			  iface_create_ver);</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		brcmf_info("Does not support interface_create (%d)\n",</div><div class='add'>+			   err);</div><div class='add'>+		memset(&amp;mbss_ssid_le, 0, sizeof(mbss_ssid_le));</div><div class='add'>+		bsscfgidx = brcmf_get_first_free_bsscfgidx(ifp-&gt;drvr);</div><div class='add'>+		if (bsscfgidx &lt; 0)</div><div class='add'>+			return bsscfgidx;</div><div class='add'>+</div><div class='add'>+		mbss_ssid_le.bsscfgidx = cpu_to_le32(bsscfgidx);</div><div class='add'>+		mbss_ssid_le.SSID_len = cpu_to_le32(5);</div><div class='add'>+		sprintf(mbss_ssid_le.SSID, "ssid%d", bsscfgidx);</div><div class='add'>+</div><div class='add'>+		err = brcmf_fil_bsscfg_data_set(ifp, "bsscfg:ssid", &amp;mbss_ssid_le,</div><div class='add'>+						sizeof(mbss_ssid_le));</div><div class='add'>+</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			bphy_err(drvr, "setting ssid failed %d\n", err);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * brcmf_ap_add_vif() - create a new AP virtual interface for multiple BSS</div><div class='add'>+ * brcmf_apsta_add_vif() - create a new AP or STA virtual interface</div><div class='ctx'>  *</div><div class='ctx'>  * @wiphy: wiphy device of new interface.</div><div class='ctx'>  * @name: name of the new interface.</div><div class='del'>- * @params: contains mac address for AP device.</div><div class='add'>+ * @params: contains mac address for AP or STA device.</div><div class='add'>+ * @type: interface type.</div><div class='add'>+ *</div><div class='add'>+ * Return: pointer to new vif on success, ERR_PTR(-errno) if not</div><div class='ctx'>  */</div><div class='ctx'> static</div><div class='del'>-struct wireless_dev *brcmf_ap_add_vif(struct wiphy *wiphy, const char *name,</div><div class='del'>-				      struct vif_params *params)</div><div class='add'>+struct wireless_dev *brcmf_apsta_add_vif(struct wiphy *wiphy, const char *name,</div><div class='add'>+					 struct vif_params *params,</div><div class='add'>+					 enum nl80211_iftype type)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);</div><div class='ctx'> 	struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));</div><div class='hunk'>@@ -561,18 +827,24 @@ struct wireless_dev *brcmf_ap_add_vif(struct wiphy *wiphy, const char *name,</div><div class='ctx'> 	struct brcmf_cfg80211_vif *vif;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	if (type != NL80211_IFTYPE_STATION &amp;&amp; type != NL80211_IFTYPE_AP)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='ctx'> 	if (brcmf_cfg80211_vif_event_armed(cfg))</div><div class='ctx'> 		return ERR_PTR(-EBUSY);</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(INFO, "Adding vif \"%s\"\n", name);</div><div class='ctx'> </div><div class='del'>-	vif = brcmf_alloc_vif(cfg, NL80211_IFTYPE_AP);</div><div class='add'>+	vif = brcmf_alloc_vif(cfg, type);</div><div class='ctx'> 	if (IS_ERR(vif))</div><div class='ctx'> 		return (struct wireless_dev *)vif;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_cfg80211_arm_vif_event(cfg, vif);</div><div class='ctx'> </div><div class='del'>-	err = brcmf_cfg80211_request_ap_if(ifp);</div><div class='add'>+	if (type == NL80211_IFTYPE_STATION)</div><div class='add'>+		err = brcmf_cfg80211_request_sta_if(ifp, params-&gt;macaddr);</div><div class='add'>+	else</div><div class='add'>+		err = brcmf_cfg80211_request_ap_if(ifp);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		brcmf_cfg80211_arm_vif_event(cfg, NULL);</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -596,7 +868,7 @@ struct wireless_dev *brcmf_ap_add_vif(struct wiphy *wiphy, const char *name,</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strncpy(ifp-&gt;ndev-&gt;name, name, sizeof(ifp-&gt;ndev-&gt;name) - 1);</div><div class='add'>+	strscpy(ifp-&gt;ndev-&gt;name, name, sizeof(ifp-&gt;ndev-&gt;name));</div><div class='ctx'> 	err = brcmf_net_attach(ifp, true);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		bphy_err(drvr, "Registering netdevice failed\n");</div><div class='hunk'>@@ -629,6 +901,8 @@ static bool brcmf_is_ibssmode(struct brcmf_cfg80211_vif *vif)</div><div class='ctx'>  *</div><div class='ctx'>  * @wiphy: wiphy device of new interface.</div><div class='ctx'>  * @name: name of the new interface.</div><div class='add'>+ *</div><div class='add'>+ * Return: pointer to new vif on success, ERR_PTR(-errno) if not</div><div class='ctx'>  */</div><div class='ctx'> static struct wireless_dev *brcmf_mon_add_vif(struct wiphy *wiphy,</div><div class='ctx'> 					      const char *name)</div><div class='hunk'>@@ -719,15 +993,15 @@ static struct wireless_dev *brcmf_cfg80211_add_iface(struct wiphy *wiphy,</div><div class='ctx'> 	}</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 	case NL80211_IFTYPE_AP_VLAN:</div><div class='ctx'> 	case NL80211_IFTYPE_WDS:</div><div class='ctx'> 	case NL80211_IFTYPE_MESH_POINT:</div><div class='ctx'> 		return ERR_PTR(-EOPNOTSUPP);</div><div class='ctx'> 	case NL80211_IFTYPE_MONITOR:</div><div class='ctx'> 		return brcmf_mon_add_vif(wiphy, name);</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='del'>-		wdev = brcmf_ap_add_vif(wiphy, name, params);</div><div class='add'>+		wdev = brcmf_apsta_add_vif(wiphy, name, params, type);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_P2P_CLIENT:</div><div class='ctx'> 	case NL80211_IFTYPE_P2P_GO:</div><div class='hunk'>@@ -769,12 +1043,149 @@ void brcmf_set_mpc(struct brcmf_if *ifp, int mpc)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool brcmf_is_apmode_operating(struct wiphy *wiphy)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);</div><div class='add'>+	struct brcmf_cfg80211_vif *vif;</div><div class='add'>+	bool ret = false;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(vif, &amp;cfg-&gt;vif_list, list) {</div><div class='add'>+		if (brcmf_is_apmode(vif) &amp;&amp;</div><div class='add'>+		    test_bit(BRCMF_VIF_STATUS_AP_CREATED, &amp;vif-&gt;sme_state))</div><div class='add'>+			ret = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void brcmf_scan_params_v2_to_v1(struct brcmf_scan_params_v2_le *params_v2_le,</div><div class='add'>+				       struct brcmf_scan_params_le *params_le)</div><div class='add'>+{</div><div class='add'>+	size_t params_size;</div><div class='add'>+	u32 ch;</div><div class='add'>+	int n_channels, n_ssids;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;params_le-&gt;ssid_le, &amp;params_v2_le-&gt;ssid_le,</div><div class='add'>+	       sizeof(params_le-&gt;ssid_le));</div><div class='add'>+	memcpy(&amp;params_le-&gt;bssid, &amp;params_v2_le-&gt;bssid,</div><div class='add'>+	       sizeof(params_le-&gt;bssid));</div><div class='add'>+</div><div class='add'>+	params_le-&gt;bss_type = params_v2_le-&gt;bss_type;</div><div class='add'>+	params_le-&gt;scan_type = le32_to_cpu(params_v2_le-&gt;scan_type);</div><div class='add'>+	params_le-&gt;nprobes = params_v2_le-&gt;nprobes;</div><div class='add'>+	params_le-&gt;active_time = params_v2_le-&gt;active_time;</div><div class='add'>+	params_le-&gt;passive_time = params_v2_le-&gt;passive_time;</div><div class='add'>+	params_le-&gt;home_time = params_v2_le-&gt;home_time;</div><div class='add'>+	params_le-&gt;channel_num = params_v2_le-&gt;channel_num;</div><div class='add'>+</div><div class='add'>+	ch = le32_to_cpu(params_v2_le-&gt;channel_num);</div><div class='add'>+	n_channels = ch &amp; BRCMF_SCAN_PARAMS_COUNT_MASK;</div><div class='add'>+	n_ssids = ch &gt;&gt; BRCMF_SCAN_PARAMS_NSSID_SHIFT;</div><div class='add'>+</div><div class='add'>+	params_size = sizeof(u16) * n_channels;</div><div class='add'>+	if (n_ssids &gt; 0) {</div><div class='add'>+		params_size = roundup(params_size, sizeof(u32));</div><div class='add'>+		params_size += sizeof(struct brcmf_ssid_le) * n_ssids;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;params_le-&gt;channel_list[0],</div><div class='add'>+	       &amp;params_v2_le-&gt;channel_list[0], params_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void brcmf_escan_prep(struct brcmf_cfg80211_info *cfg,</div><div class='add'>+			     struct brcmf_scan_params_v2_le *params_le,</div><div class='add'>+			     struct cfg80211_scan_request *request)</div><div class='add'>+{</div><div class='add'>+	u32 n_ssids;</div><div class='add'>+	u32 n_channels;</div><div class='add'>+	s32 i;</div><div class='add'>+	s32 offset;</div><div class='add'>+	u16 chanspec;</div><div class='add'>+	char *ptr;</div><div class='add'>+	int length;</div><div class='add'>+	struct brcmf_ssid_le ssid_le;</div><div class='add'>+</div><div class='add'>+	eth_broadcast_addr(params_le-&gt;bssid);</div><div class='add'>+</div><div class='add'>+	length = BRCMF_SCAN_PARAMS_V2_FIXED_SIZE;</div><div class='add'>+</div><div class='add'>+	params_le-&gt;version = cpu_to_le16(BRCMF_SCAN_PARAMS_VERSION_V2);</div><div class='add'>+	params_le-&gt;bss_type = DOT11_BSSTYPE_ANY;</div><div class='add'>+	params_le-&gt;scan_type = cpu_to_le32(BRCMF_SCANTYPE_ACTIVE);</div><div class='add'>+	params_le-&gt;channel_num = 0;</div><div class='add'>+	params_le-&gt;nprobes = cpu_to_le32(-1);</div><div class='add'>+	params_le-&gt;active_time = cpu_to_le32(-1);</div><div class='add'>+	params_le-&gt;passive_time = cpu_to_le32(-1);</div><div class='add'>+	params_le-&gt;home_time = cpu_to_le32(-1);</div><div class='add'>+	memset(&amp;params_le-&gt;ssid_le, 0, sizeof(params_le-&gt;ssid_le));</div><div class='add'>+</div><div class='add'>+	/* Scan abort */</div><div class='add'>+	if (!request) {</div><div class='add'>+		length += sizeof(u16);</div><div class='add'>+		params_le-&gt;channel_num = cpu_to_le32(1);</div><div class='add'>+		params_le-&gt;channel_list[0] = cpu_to_le16(-1);</div><div class='add'>+		params_le-&gt;length = cpu_to_le16(length);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	n_ssids = request-&gt;n_ssids;</div><div class='add'>+	n_channels = request-&gt;n_channels;</div><div class='add'>+</div><div class='add'>+	/* Copy channel array if applicable */</div><div class='add'>+	brcmf_dbg(SCAN, "### List of channelspecs to scan ### %d\n",</div><div class='add'>+		  n_channels);</div><div class='add'>+	if (n_channels &gt; 0) {</div><div class='add'>+		length += roundup(sizeof(u16) * n_channels, sizeof(u32));</div><div class='add'>+		for (i = 0; i &lt; n_channels; i++) {</div><div class='add'>+			chanspec = channel_to_chanspec(&amp;cfg-&gt;d11inf,</div><div class='add'>+						       request-&gt;channels[i]);</div><div class='add'>+			brcmf_dbg(SCAN, "Chan : %d, Channel spec: %x\n",</div><div class='add'>+				  request-&gt;channels[i]-&gt;hw_value, chanspec);</div><div class='add'>+			params_le-&gt;channel_list[i] = cpu_to_le16(chanspec);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		brcmf_dbg(SCAN, "Scanning all channels\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy ssid array if applicable */</div><div class='add'>+	brcmf_dbg(SCAN, "### List of SSIDs to scan ### %d\n", n_ssids);</div><div class='add'>+	if (n_ssids &gt; 0) {</div><div class='add'>+		offset = offsetof(struct brcmf_scan_params_v2_le, channel_list) +</div><div class='add'>+				n_channels * sizeof(u16);</div><div class='add'>+		offset = roundup(offset, sizeof(u32));</div><div class='add'>+		length += sizeof(ssid_le) * n_ssids;</div><div class='add'>+		ptr = (char *)params_le + offset;</div><div class='add'>+		for (i = 0; i &lt; n_ssids; i++) {</div><div class='add'>+			memset(&amp;ssid_le, 0, sizeof(ssid_le));</div><div class='add'>+			ssid_le.SSID_len =</div><div class='add'>+					cpu_to_le32(request-&gt;ssids[i].ssid_len);</div><div class='add'>+			memcpy(ssid_le.SSID, request-&gt;ssids[i].ssid,</div><div class='add'>+			       request-&gt;ssids[i].ssid_len);</div><div class='add'>+			if (!ssid_le.SSID_len)</div><div class='add'>+				brcmf_dbg(SCAN, "%d: Broadcast scan\n", i);</div><div class='add'>+			else</div><div class='add'>+				brcmf_dbg(SCAN, "%d: scan for  %.32s size=%d\n",</div><div class='add'>+					  i, ssid_le.SSID, ssid_le.SSID_len);</div><div class='add'>+			memcpy(ptr, &amp;ssid_le, sizeof(ssid_le));</div><div class='add'>+			ptr += sizeof(ssid_le);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		brcmf_dbg(SCAN, "Performing passive scan\n");</div><div class='add'>+		params_le-&gt;scan_type = cpu_to_le32(BRCMF_SCANTYPE_PASSIVE);</div><div class='add'>+	}</div><div class='add'>+	params_le-&gt;length = cpu_to_le16(length);</div><div class='add'>+	/* Adding mask to channel numbers */</div><div class='add'>+	params_le-&gt;channel_num =</div><div class='add'>+		cpu_to_le32((n_ssids &lt;&lt; BRCMF_SCAN_PARAMS_NSSID_SHIFT) |</div><div class='add'>+			(n_channels &amp; BRCMF_SCAN_PARAMS_COUNT_MASK));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,</div><div class='ctx'> 				struct brcmf_if *ifp, bool aborted,</div><div class='ctx'> 				bool fw_abort)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_pub *drvr = cfg-&gt;pub;</div><div class='del'>-	struct brcmf_scan_params_le params_le;</div><div class='add'>+	struct brcmf_scan_params_v2_le params_v2_le;</div><div class='ctx'> 	struct cfg80211_scan_request *scan_request;</div><div class='ctx'> 	u64 reqid;</div><div class='ctx'> 	u32 bucket;</div><div class='hunk'>@@ -787,26 +1198,28 @@ s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,</div><div class='ctx'> 	scan_request = cfg-&gt;scan_request;</div><div class='ctx'> 	cfg-&gt;scan_request = NULL;</div><div class='ctx'> </div><div class='del'>-	if (timer_pending(&amp;cfg-&gt;escan_timeout))</div><div class='del'>-		del_timer_sync(&amp;cfg-&gt;escan_timeout);</div><div class='add'>+	timer_delete_sync(&amp;cfg-&gt;escan_timeout);</div><div class='ctx'> </div><div class='ctx'> 	if (fw_abort) {</div><div class='ctx'> 		/* Do a scan abort to stop the driver's scan engine */</div><div class='ctx'> 		brcmf_dbg(SCAN, "ABORT scan in firmware\n");</div><div class='del'>-		memset(&amp;params_le, 0, sizeof(params_le));</div><div class='del'>-		eth_broadcast_addr(params_le.bssid);</div><div class='del'>-		params_le.bss_type = DOT11_BSSTYPE_ANY;</div><div class='del'>-		params_le.scan_type = 0;</div><div class='del'>-		params_le.channel_num = cpu_to_le32(1);</div><div class='del'>-		params_le.nprobes = cpu_to_le32(1);</div><div class='del'>-		params_le.active_time = cpu_to_le32(-1);</div><div class='del'>-		params_le.passive_time = cpu_to_le32(-1);</div><div class='del'>-		params_le.home_time = cpu_to_le32(-1);</div><div class='del'>-		/* Scan is aborted by setting channel_list[0] to -1 */</div><div class='del'>-		params_le.channel_list[0] = cpu_to_le16(-1);</div><div class='add'>+</div><div class='add'>+		brcmf_escan_prep(cfg, &amp;params_v2_le, NULL);</div><div class='add'>+</div><div class='ctx'> 		/* E-Scan (or anyother type) can be aborted by SCAN */</div><div class='del'>-		err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SCAN,</div><div class='del'>-					     &amp;params_le, sizeof(params_le));</div><div class='add'>+		if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_SCAN_V2)) {</div><div class='add'>+			err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SCAN,</div><div class='add'>+						     &amp;params_v2_le,</div><div class='add'>+						     sizeof(params_v2_le));</div><div class='add'>+		} else {</div><div class='add'>+			struct brcmf_scan_params_le params_le;</div><div class='add'>+</div><div class='add'>+			brcmf_scan_params_v2_to_v1(&amp;params_v2_le, &amp;params_le);</div><div class='add'>+			err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SCAN,</div><div class='add'>+						     &amp;params_le,</div><div class='add'>+						     sizeof(params_le));</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			bphy_err(drvr, "Scan abort failed\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -847,8 +1260,8 @@ s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int brcmf_cfg80211_del_ap_iface(struct wiphy *wiphy,</div><div class='del'>-				       struct wireless_dev *wdev)</div><div class='add'>+static int brcmf_cfg80211_del_apsta_iface(struct wiphy *wiphy,</div><div class='add'>+					  struct wireless_dev *wdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);</div><div class='ctx'> 	struct net_device *ndev = wdev-&gt;netdev;</div><div class='hunk'>@@ -905,15 +1318,15 @@ int brcmf_cfg80211_del_iface(struct wiphy *wiphy, struct wireless_dev *wdev)</div><div class='ctx'> </div><div class='ctx'> 	switch (wdev-&gt;iftype) {</div><div class='ctx'> 	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 	case NL80211_IFTYPE_AP_VLAN:</div><div class='ctx'> 	case NL80211_IFTYPE_WDS:</div><div class='ctx'> 	case NL80211_IFTYPE_MESH_POINT:</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	case NL80211_IFTYPE_MONITOR:</div><div class='ctx'> 		return brcmf_mon_del_vif(wiphy, wdev);</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='del'>-		return brcmf_cfg80211_del_ap_iface(wiphy, wdev);</div><div class='add'>+		return brcmf_cfg80211_del_apsta_iface(wiphy, wdev);</div><div class='ctx'> 	case NL80211_IFTYPE_P2P_CLIENT:</div><div class='ctx'> 	case NL80211_IFTYPE_P2P_GO:</div><div class='ctx'> 	case NL80211_IFTYPE_P2P_DEVICE:</div><div class='hunk'>@@ -1025,83 +1438,13 @@ done:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void brcmf_escan_prep(struct brcmf_cfg80211_info *cfg,</div><div class='del'>-			     struct brcmf_scan_params_le *params_le,</div><div class='del'>-			     struct cfg80211_scan_request *request)</div><div class='del'>-{</div><div class='del'>-	u32 n_ssids;</div><div class='del'>-	u32 n_channels;</div><div class='del'>-	s32 i;</div><div class='del'>-	s32 offset;</div><div class='del'>-	u16 chanspec;</div><div class='del'>-	char *ptr;</div><div class='del'>-	struct brcmf_ssid_le ssid_le;</div><div class='del'>-</div><div class='del'>-	eth_broadcast_addr(params_le-&gt;bssid);</div><div class='del'>-	params_le-&gt;bss_type = DOT11_BSSTYPE_ANY;</div><div class='del'>-	params_le-&gt;scan_type = BRCMF_SCANTYPE_ACTIVE;</div><div class='del'>-	params_le-&gt;channel_num = 0;</div><div class='del'>-	params_le-&gt;nprobes = cpu_to_le32(-1);</div><div class='del'>-	params_le-&gt;active_time = cpu_to_le32(-1);</div><div class='del'>-	params_le-&gt;passive_time = cpu_to_le32(-1);</div><div class='del'>-	params_le-&gt;home_time = cpu_to_le32(-1);</div><div class='del'>-	memset(&amp;params_le-&gt;ssid_le, 0, sizeof(params_le-&gt;ssid_le));</div><div class='del'>-</div><div class='del'>-	n_ssids = request-&gt;n_ssids;</div><div class='del'>-	n_channels = request-&gt;n_channels;</div><div class='del'>-</div><div class='del'>-	/* Copy channel array if applicable */</div><div class='del'>-	brcmf_dbg(SCAN, "### List of channelspecs to scan ### %d\n",</div><div class='del'>-		  n_channels);</div><div class='del'>-	if (n_channels &gt; 0) {</div><div class='del'>-		for (i = 0; i &lt; n_channels; i++) {</div><div class='del'>-			chanspec = channel_to_chanspec(&amp;cfg-&gt;d11inf,</div><div class='del'>-						       request-&gt;channels[i]);</div><div class='del'>-			brcmf_dbg(SCAN, "Chan : %d, Channel spec: %x\n",</div><div class='del'>-				  request-&gt;channels[i]-&gt;hw_value, chanspec);</div><div class='del'>-			params_le-&gt;channel_list[i] = cpu_to_le16(chanspec);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		brcmf_dbg(SCAN, "Scanning all channels\n");</div><div class='del'>-	}</div><div class='del'>-	/* Copy ssid array if applicable */</div><div class='del'>-	brcmf_dbg(SCAN, "### List of SSIDs to scan ### %d\n", n_ssids);</div><div class='del'>-	if (n_ssids &gt; 0) {</div><div class='del'>-		offset = offsetof(struct brcmf_scan_params_le, channel_list) +</div><div class='del'>-				n_channels * sizeof(u16);</div><div class='del'>-		offset = roundup(offset, sizeof(u32));</div><div class='del'>-		ptr = (char *)params_le + offset;</div><div class='del'>-		for (i = 0; i &lt; n_ssids; i++) {</div><div class='del'>-			memset(&amp;ssid_le, 0, sizeof(ssid_le));</div><div class='del'>-			ssid_le.SSID_len =</div><div class='del'>-					cpu_to_le32(request-&gt;ssids[i].ssid_len);</div><div class='del'>-			memcpy(ssid_le.SSID, request-&gt;ssids[i].ssid,</div><div class='del'>-			       request-&gt;ssids[i].ssid_len);</div><div class='del'>-			if (!ssid_le.SSID_len)</div><div class='del'>-				brcmf_dbg(SCAN, "%d: Broadcast scan\n", i);</div><div class='del'>-			else</div><div class='del'>-				brcmf_dbg(SCAN, "%d: scan for  %.32s size=%d\n",</div><div class='del'>-					  i, ssid_le.SSID, ssid_le.SSID_len);</div><div class='del'>-			memcpy(ptr, &amp;ssid_le, sizeof(ssid_le));</div><div class='del'>-			ptr += sizeof(ssid_le);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		brcmf_dbg(SCAN, "Performing passive scan\n");</div><div class='del'>-		params_le-&gt;scan_type = BRCMF_SCANTYPE_PASSIVE;</div><div class='del'>-	}</div><div class='del'>-	/* Adding mask to channel numbers */</div><div class='del'>-	params_le-&gt;channel_num =</div><div class='del'>-		cpu_to_le32((n_ssids &lt;&lt; BRCMF_SCAN_PARAMS_NSSID_SHIFT) |</div><div class='del'>-			(n_channels &amp; BRCMF_SCAN_PARAMS_COUNT_MASK));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static s32</div><div class='ctx'> brcmf_run_escan(struct brcmf_cfg80211_info *cfg, struct brcmf_if *ifp,</div><div class='ctx'> 		struct cfg80211_scan_request *request)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_pub *drvr = cfg-&gt;pub;</div><div class='del'>-	s32 params_size = BRCMF_SCAN_PARAMS_FIXED_SIZE +</div><div class='del'>-			  offsetof(struct brcmf_escan_params_le, params_le);</div><div class='add'>+	s32 params_size = BRCMF_SCAN_PARAMS_V2_FIXED_SIZE +</div><div class='add'>+			  offsetof(struct brcmf_escan_params_le, params_v2_le);</div><div class='ctx'> 	struct brcmf_escan_params_le *params;</div><div class='ctx'> 	s32 err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1121,8 +1464,26 @@ brcmf_run_escan(struct brcmf_cfg80211_info *cfg, struct brcmf_if *ifp,</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> 	BUG_ON(params_size + sizeof("escan") &gt;= BRCMF_DCMD_MEDLEN);</div><div class='del'>-	brcmf_escan_prep(cfg, &amp;params-&gt;params_le, request);</div><div class='del'>-	params-&gt;version = cpu_to_le32(BRCMF_ESCAN_REQ_VERSION);</div><div class='add'>+	brcmf_escan_prep(cfg, &amp;params-&gt;params_v2_le, request);</div><div class='add'>+</div><div class='add'>+	params-&gt;version = cpu_to_le32(BRCMF_ESCAN_REQ_VERSION_V2);</div><div class='add'>+</div><div class='add'>+	if (!brcmf_feat_is_enabled(ifp, BRCMF_FEAT_SCAN_V2)) {</div><div class='add'>+		struct brcmf_escan_params_le *params_v1;</div><div class='add'>+</div><div class='add'>+		params_size -= BRCMF_SCAN_PARAMS_V2_FIXED_SIZE;</div><div class='add'>+		params_size += BRCMF_SCAN_PARAMS_FIXED_SIZE;</div><div class='add'>+		params_v1 = kzalloc(params_size, GFP_KERNEL);</div><div class='add'>+		if (!params_v1) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto exit_params;</div><div class='add'>+		}</div><div class='add'>+		params_v1-&gt;version = cpu_to_le32(BRCMF_ESCAN_REQ_VERSION);</div><div class='add'>+		brcmf_scan_params_v2_to_v1(&amp;params-&gt;params_v2_le, &amp;params_v1-&gt;params_le);</div><div class='add'>+		kfree(params);</div><div class='add'>+		params = params_v1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	params-&gt;action = cpu_to_le16(WL_ESCAN_ACTION_START);</div><div class='ctx'> 	params-&gt;sync_id = cpu_to_le16(0x1234);</div><div class='ctx'> </div><div class='hunk'>@@ -1134,6 +1495,7 @@ brcmf_run_escan(struct brcmf_cfg80211_info *cfg, struct brcmf_if *ifp,</div><div class='ctx'> 			bphy_err(drvr, "error (%d)\n", err);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+exit_params:</div><div class='ctx'> 	kfree(params);</div><div class='ctx'> exit:</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1197,10 +1559,6 @@ brcmf_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* If scan req comes for p2p0, send it over primary I/F */</div><div class='del'>-	if (vif == cfg-&gt;p2p.bss_idx[P2PAPI_BSSCFG_DEVICE].vif)</div><div class='del'>-		vif = cfg-&gt;p2p.bss_idx[P2PAPI_BSSCFG_PRIMARY].vif;</div><div class='del'>-</div><div class='ctx'> 	brcmf_dbg(SCAN, "START ESCAN\n");</div><div class='ctx'> </div><div class='ctx'> 	cfg-&gt;scan_request = request;</div><div class='hunk'>@@ -1216,6 +1574,10 @@ brcmf_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto scan_out;</div><div class='ctx'> </div><div class='add'>+	/* If scan req comes for p2p0, send it over primary I/F */</div><div class='add'>+	if (vif == cfg-&gt;p2p.bss_idx[P2PAPI_BSSCFG_DEVICE].vif)</div><div class='add'>+		vif = cfg-&gt;p2p.bss_idx[P2PAPI_BSSCFG_PRIMARY].vif;</div><div class='add'>+</div><div class='ctx'> 	err = brcmf_do_escan(vif-&gt;ifp, request);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto scan_out;</div><div class='hunk'>@@ -1275,7 +1637,8 @@ static s32 brcmf_set_retry(struct net_device *ndev, u32 retry, bool l)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static s32 brcmf_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)</div><div class='add'>+static s32 brcmf_cfg80211_set_wiphy_params(struct wiphy *wiphy, int radio_idx,</div><div class='add'>+					   u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);</div><div class='ctx'> 	struct net_device *ndev = cfg_to_ndev(cfg);</div><div class='hunk'>@@ -1343,51 +1706,39 @@ static u16 brcmf_map_fw_linkdown_reason(const struct brcmf_event_msg *e)</div><div class='ctx'> 	return reason;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int brcmf_set_pmk(struct brcmf_if *ifp, const u8 *pmk_data, u16 pmk_len)</div><div class='add'>+int brcmf_set_wsec(struct brcmf_if *ifp, const u8 *key, u16 key_len, u16 flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='ctx'> 	struct brcmf_wsec_pmk_le pmk;</div><div class='del'>-	int i, err;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (key_len &gt; sizeof(pmk.key)) {</div><div class='add'>+		bphy_err(drvr, "key must be less than %zu bytes\n",</div><div class='add'>+			 sizeof(pmk.key));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;pmk, 0, sizeof(pmk));</div><div class='ctx'> </div><div class='del'>-	/* convert to firmware key format */</div><div class='del'>-	pmk.key_len = cpu_to_le16(pmk_len &lt;&lt; 1);</div><div class='del'>-	pmk.flags = cpu_to_le16(BRCMF_WSEC_PASSPHRASE);</div><div class='del'>-	for (i = 0; i &lt; pmk_len; i++)</div><div class='del'>-		snprintf(&amp;pmk.key[2 * i], 3, "%02x", pmk_data[i]);</div><div class='add'>+	/* pass key material directly */</div><div class='add'>+	pmk.key_len = cpu_to_le16(key_len);</div><div class='add'>+	pmk.flags = cpu_to_le16(flags);</div><div class='add'>+	memcpy(pmk.key, key, key_len);</div><div class='ctx'> </div><div class='del'>-	/* store psk in firmware */</div><div class='add'>+	/* store key material in firmware */</div><div class='ctx'> 	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_WSEC_PMK,</div><div class='ctx'> 				     &amp;pmk, sizeof(pmk));</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		bphy_err(drvr, "failed to change PSK in firmware (len=%u)\n",</div><div class='del'>-			 pmk_len);</div><div class='add'>+			 key_len);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+BRCMF_EXPORT_SYMBOL_GPL(brcmf_set_wsec);</div><div class='ctx'> </div><div class='del'>-static int brcmf_set_sae_password(struct brcmf_if *ifp, const u8 *pwd_data,</div><div class='del'>-				  u16 pwd_len)</div><div class='add'>+static int brcmf_set_pmk(struct brcmf_if *ifp, const u8 *pmk_data, u16 pmk_len)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='del'>-	struct brcmf_wsec_sae_pwd_le sae_pwd;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (pwd_len &gt; BRCMF_WSEC_MAX_SAE_PASSWORD_LEN) {</div><div class='del'>-		bphy_err(drvr, "sae_password must be less than %d\n",</div><div class='del'>-			 BRCMF_WSEC_MAX_SAE_PASSWORD_LEN);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sae_pwd.key_len = cpu_to_le16(pwd_len);</div><div class='del'>-	memcpy(sae_pwd.key, pwd_data, pwd_len);</div><div class='del'>-</div><div class='del'>-	err = brcmf_fil_iovar_data_set(ifp, "sae_password", &amp;sae_pwd,</div><div class='del'>-				       sizeof(sae_pwd));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		bphy_err(drvr, "failed to set SAE password in firmware (len=%u)\n",</div><div class='del'>-			 pwd_len);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return brcmf_set_wsec(ifp, pmk_data, pmk_len, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void brcmf_link_down(struct brcmf_cfg80211_vif *vif, u16 reason,</div><div class='hunk'>@@ -1416,6 +1767,8 @@ static void brcmf_link_down(struct brcmf_cfg80211_vif *vif, u16 reason,</div><div class='ctx'> 					      locally_generated, GFP_KERNEL);</div><div class='ctx'> 	}</div><div class='ctx'> 	clear_bit(BRCMF_VIF_STATUS_CONNECTING, &amp;vif-&gt;sme_state);</div><div class='add'>+	clear_bit(BRCMF_VIF_STATUS_EAP_SUCCESS, &amp;vif-&gt;sme_state);</div><div class='add'>+	clear_bit(BRCMF_VIF_STATUS_ASSOC_SUCCESS, &amp;vif-&gt;sme_state);</div><div class='ctx'> 	clear_bit(BRCMF_SCAN_STATUS_SUPPRESS, &amp;cfg-&gt;scan_status);</div><div class='ctx'> 	brcmf_btcoex_set_mode(vif, BRCMF_BTCOEX_ENABLED, 0);</div><div class='ctx'> 	if (vif-&gt;profile.use_fwsup != BRCMF_PROFILE_FWSUP_NONE) {</div><div class='hunk'>@@ -1607,17 +1960,22 @@ static s32 brcmf_set_wpa_version(struct net_device *ndev,</div><div class='ctx'> 	struct brcmf_cfg80211_profile *profile = ndev_to_prof(ndev);</div><div class='ctx'> 	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='ctx'> 	struct brcmf_cfg80211_security *sec;</div><div class='del'>-	s32 val = 0;</div><div class='del'>-	s32 err = 0;</div><div class='add'>+	s32 val;</div><div class='add'>+	s32 err;</div><div class='ctx'> </div><div class='del'>-	if (sme-&gt;crypto.wpa_versions &amp; NL80211_WPA_VERSION_1)</div><div class='add'>+	if (sme-&gt;crypto.wpa_versions &amp; NL80211_WPA_VERSION_1) {</div><div class='ctx'> 		val = WPA_AUTH_PSK | WPA_AUTH_UNSPECIFIED;</div><div class='del'>-	else if (sme-&gt;crypto.wpa_versions &amp; NL80211_WPA_VERSION_2)</div><div class='del'>-		val = WPA2_AUTH_PSK | WPA2_AUTH_UNSPECIFIED;</div><div class='del'>-	else if (sme-&gt;crypto.wpa_versions &amp; NL80211_WPA_VERSION_3)</div><div class='add'>+	} else if (sme-&gt;crypto.wpa_versions &amp; NL80211_WPA_VERSION_2) {</div><div class='add'>+		if (drvr-&gt;bus_if-&gt;fwvid == BRCMF_FWVENDOR_CYW &amp;&amp;</div><div class='add'>+		    sme-&gt;crypto.akm_suites[0] == WLAN_AKM_SUITE_SAE)</div><div class='add'>+			val = WPA3_AUTH_SAE_PSK;</div><div class='add'>+		else</div><div class='add'>+			val = WPA2_AUTH_PSK | WPA2_AUTH_UNSPECIFIED;</div><div class='add'>+	} else if (sme-&gt;crypto.wpa_versions &amp; NL80211_WPA_VERSION_3) {</div><div class='ctx'> 		val = WPA3_AUTH_SAE_PSK;</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='ctx'> 		val = WPA_AUTH_DISABLED;</div><div class='add'>+	}</div><div class='ctx'> 	brcmf_dbg(CONN, "setting wpa_auth to 0x%0x\n", val);</div><div class='ctx'> 	err = brcmf_fil_bsscfg_int_set(ifp, "wpa_auth", val);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -1767,7 +2125,8 @@ brcmf_set_key_mgmt(struct net_device *ndev, struct cfg80211_connect_params *sme)</div><div class='ctx'> 	if (!sme-&gt;crypto.n_akm_suites)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	err = brcmf_fil_bsscfg_int_get(netdev_priv(ndev), "wpa_auth", &amp;val);</div><div class='add'>+	err = brcmf_fil_bsscfg_int_get(netdev_priv(ndev),</div><div class='add'>+				       "wpa_auth", &amp;val);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		bphy_err(drvr, "could not get wpa_auth (%d)\n", err);</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -1783,8 +2142,8 @@ brcmf_set_key_mgmt(struct net_device *ndev, struct cfg80211_connect_params *sme)</div><div class='ctx'> 			val = WPA_AUTH_PSK;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			bphy_err(drvr, "invalid cipher group (%d)\n",</div><div class='del'>-				 sme-&gt;crypto.cipher_group);</div><div class='add'>+			bphy_err(drvr, "invalid akm suite (%d)\n",</div><div class='add'>+				 sme-&gt;crypto.akm_suites[0]);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (val &amp; (WPA2_AUTH_PSK | WPA2_AUTH_UNSPECIFIED)) {</div><div class='hunk'>@@ -1816,28 +2175,33 @@ brcmf_set_key_mgmt(struct net_device *ndev, struct cfg80211_connect_params *sme)</div><div class='ctx'> 			profile-&gt;is_ft = true;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			bphy_err(drvr, "invalid cipher group (%d)\n",</div><div class='del'>-				 sme-&gt;crypto.cipher_group);</div><div class='add'>+			bphy_err(drvr, "invalid akm suite (%d)\n",</div><div class='add'>+				 sme-&gt;crypto.akm_suites[0]);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (val &amp; WPA3_AUTH_SAE_PSK) {</div><div class='ctx'> 		switch (sme-&gt;crypto.akm_suites[0]) {</div><div class='ctx'> 		case WLAN_AKM_SUITE_SAE:</div><div class='ctx'> 			val = WPA3_AUTH_SAE_PSK;</div><div class='del'>-			if (sme-&gt;crypto.sae_pwd) {</div><div class='del'>-				brcmf_dbg(INFO, "using SAE offload\n");</div><div class='del'>-				profile-&gt;use_fwsup = BRCMF_PROFILE_FWSUP_SAE;</div><div class='del'>-			}</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_AKM_SUITE_FT_OVER_SAE:</div><div class='add'>+			val = WPA3_AUTH_SAE_PSK | WPA2_AUTH_FT;</div><div class='add'>+			profile-&gt;is_ft = true;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			bphy_err(drvr, "invalid cipher group (%d)\n",</div><div class='del'>-				 sme-&gt;crypto.cipher_group);</div><div class='add'>+			bphy_err(drvr, "invalid akm suite (%d)\n",</div><div class='add'>+				 sme-&gt;crypto.akm_suites[0]);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='add'>+		if (sme-&gt;crypto.sae_pwd) {</div><div class='add'>+			profile-&gt;use_fwsup = BRCMF_PROFILE_FWSUP_SAE;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (profile-&gt;use_fwsup == BRCMF_PROFILE_FWSUP_1X)</div><div class='ctx'> 		brcmf_dbg(INFO, "using 1X offload\n");</div><div class='add'>+	if (profile-&gt;use_fwsup == BRCMF_PROFILE_FWSUP_SAE)</div><div class='add'>+		brcmf_dbg(INFO, "using SAE offload\n");</div><div class='ctx'> </div><div class='ctx'> 	if (!brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MFP))</div><div class='ctx'> 		goto skip_mfp_config;</div><div class='hunk'>@@ -1874,7 +2238,7 @@ brcmf_set_key_mgmt(struct net_device *ndev, struct cfg80211_connect_params *sme)</div><div class='ctx'> 	brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "mfp", mfp);</div><div class='ctx'> </div><div class='ctx'> skip_mfp_config:</div><div class='del'>-	brcmf_dbg(CONN, "setting wpa_auth to %d\n", val);</div><div class='add'>+	brcmf_dbg(CONN, "setting wpa_auth to 0x%0x\n", val);</div><div class='ctx'> 	err = brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "wpa_auth", val);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		bphy_err(drvr, "could not set wpa_auth (%d)\n", err);</div><div class='hunk'>@@ -2038,6 +2402,12 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (sme-&gt;channel_hint)</div><div class='add'>+		chan = sme-&gt;channel_hint;</div><div class='add'>+</div><div class='add'>+	if (sme-&gt;bssid_hint)</div><div class='add'>+		sme-&gt;bssid = sme-&gt;bssid_hint;</div><div class='add'>+</div><div class='ctx'> 	if (ifp-&gt;vif == cfg-&gt;p2p.bss_idx[P2PAPI_BSSCFG_PRIMARY].vif) {</div><div class='ctx'> 		/* A normal (non P2P) connection request setup. */</div><div class='ctx'> 		ie = NULL;</div><div class='hunk'>@@ -2142,8 +2512,7 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 			bphy_err(drvr, "failed to clean up user-space RSNE\n");</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='del'>-		err = brcmf_set_sae_password(ifp, sme-&gt;crypto.sae_pwd,</div><div class='del'>-					     sme-&gt;crypto.sae_pwd_len);</div><div class='add'>+		err = brcmf_fwvid_set_sae_password(ifp, &amp;sme-&gt;crypto);</div><div class='ctx'> 		if (!err &amp;&amp; sme-&gt;crypto.psk)</div><div class='ctx'> 			err = brcmf_set_pmk(ifp, sme-&gt;crypto.psk,</div><div class='ctx'> 					    BRCMF_WSEC_MAX_PSK_LEN);</div><div class='hunk'>@@ -2158,7 +2527,7 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 		offsetof(struct brcmf_assoc_params_le, chanspec_list);</div><div class='ctx'> 	if (cfg-&gt;channel)</div><div class='ctx'> 		join_params_size += sizeof(u16);</div><div class='del'>-	ext_join_params = kzalloc(join_params_size, GFP_KERNEL);</div><div class='add'>+	ext_join_params = kzalloc(sizeof(*ext_join_params), GFP_KERNEL);</div><div class='ctx'> 	if (ext_join_params == NULL) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto done;</div><div class='hunk'>@@ -2260,6 +2629,8 @@ brcmf_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(BRCMF_VIF_STATUS_CONNECTED, &amp;ifp-&gt;vif-&gt;sme_state);</div><div class='ctx'> 	clear_bit(BRCMF_VIF_STATUS_CONNECTING, &amp;ifp-&gt;vif-&gt;sme_state);</div><div class='add'>+	clear_bit(BRCMF_VIF_STATUS_EAP_SUCCESS, &amp;ifp-&gt;vif-&gt;sme_state);</div><div class='add'>+	clear_bit(BRCMF_VIF_STATUS_ASSOC_SUCCESS, &amp;ifp-&gt;vif-&gt;sme_state);</div><div class='ctx'> 	cfg80211_disconnected(ndev, reason_code, NULL, 0, true, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;scbval.ea, &amp;profile-&gt;bssid, ETH_ALEN);</div><div class='hunk'>@@ -2275,7 +2646,8 @@ brcmf_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> </div><div class='ctx'> static s32</div><div class='ctx'> brcmf_cfg80211_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,</div><div class='del'>-			    enum nl80211_tx_power_setting type, s32 mbm)</div><div class='add'>+			    int radio_idx, enum nl80211_tx_power_setting type,</div><div class='add'>+			    s32 mbm)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);</div><div class='ctx'> 	struct net_device *ndev = cfg_to_ndev(cfg);</div><div class='hunk'>@@ -2326,12 +2698,12 @@ done:</div><div class='ctx'> </div><div class='ctx'> static s32</div><div class='ctx'> brcmf_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,</div><div class='del'>-			    s32 *dbm)</div><div class='add'>+			    int radio_idx, unsigned int link_id, s32 *dbm)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);</div><div class='ctx'> 	struct brcmf_cfg80211_vif *vif = wdev_to_vif(wdev);</div><div class='ctx'> 	struct brcmf_pub *drvr = cfg-&gt;pub;</div><div class='del'>-	s32 qdbm = 0;</div><div class='add'>+	s32 qdbm;</div><div class='ctx'> 	s32 err;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='hunk'>@@ -2352,7 +2724,8 @@ done:</div><div class='ctx'> </div><div class='ctx'> static s32</div><div class='ctx'> brcmf_cfg80211_config_default_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='del'>-				  u8 key_idx, bool unicast, bool multicast)</div><div class='add'>+				  int link_id, u8 key_idx, bool unicast,</div><div class='add'>+				  bool multicast)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_if *ifp = netdev_priv(ndev);</div><div class='ctx'> 	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='hunk'>@@ -2386,7 +2759,8 @@ done:</div><div class='ctx'> </div><div class='ctx'> static s32</div><div class='ctx'> brcmf_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='del'>-		       u8 key_idx, bool pairwise, const u8 *mac_addr)</div><div class='add'>+		       int link_id, u8 key_idx, bool pairwise,</div><div class='add'>+		       const u8 *mac_addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_if *ifp = netdev_priv(ndev);</div><div class='ctx'> 	struct brcmf_wsec_key *key;</div><div class='hunk'>@@ -2423,8 +2797,8 @@ brcmf_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> </div><div class='ctx'> static s32</div><div class='ctx'> brcmf_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='del'>-		       u8 key_idx, bool pairwise, const u8 *mac_addr,</div><div class='del'>-		       struct key_params *params)</div><div class='add'>+		       int link_id, u8 key_idx, bool pairwise,</div><div class='add'>+		       const u8 *mac_addr, struct key_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);</div><div class='ctx'> 	struct brcmf_if *ifp = netdev_priv(ndev);</div><div class='hunk'>@@ -2448,8 +2822,8 @@ brcmf_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;key_len == 0)</div><div class='del'>-		return brcmf_cfg80211_del_key(wiphy, ndev, key_idx, pairwise,</div><div class='del'>-					      mac_addr);</div><div class='add'>+		return brcmf_cfg80211_del_key(wiphy, ndev, -1, key_idx,</div><div class='add'>+					      pairwise, mac_addr);</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;key_len &gt; sizeof(key-&gt;data)) {</div><div class='ctx'> 		bphy_err(drvr, "Too long key length (%u)\n", params-&gt;key_len);</div><div class='hunk'>@@ -2544,8 +2918,9 @@ done:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static s32</div><div class='del'>-brcmf_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev, u8 key_idx,</div><div class='del'>-		       bool pairwise, const u8 *mac_addr, void *cookie,</div><div class='add'>+brcmf_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='add'>+		       int link_id, u8 key_idx, bool pairwise,</div><div class='add'>+		       const u8 *mac_addr, void *cookie,</div><div class='ctx'> 		       void (*callback)(void *cookie,</div><div class='ctx'> 					struct key_params *params))</div><div class='ctx'> {</div><div class='hunk'>@@ -2601,7 +2976,8 @@ done:</div><div class='ctx'> </div><div class='ctx'> static s32</div><div class='ctx'> brcmf_cfg80211_config_default_mgmt_key(struct wiphy *wiphy,</div><div class='del'>-				       struct net_device *ndev, u8 key_idx)</div><div class='add'>+				       struct net_device *ndev, int link_id,</div><div class='add'>+				       u8 key_idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_if *ifp = netdev_priv(ndev);</div><div class='ctx'> </div><div class='hunk'>@@ -2767,8 +3143,9 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 	struct brcmf_sta_info_le sta_info_le;</div><div class='ctx'> 	u32 sta_flags;</div><div class='ctx'> 	u32 is_tdls_peer;</div><div class='del'>-	s32 total_rssi;</div><div class='del'>-	s32 count_rssi;</div><div class='add'>+	s32 total_rssi_avg = 0;</div><div class='add'>+	s32 total_rssi = 0;</div><div class='add'>+	s32 count_rssi = 0;</div><div class='ctx'> 	int rssi;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='hunk'>@@ -2834,25 +3211,27 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 			sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_RX_BYTES);</div><div class='ctx'> 			sinfo-&gt;rx_bytes = le64_to_cpu(sta_info_le.rx_tot_bytes);</div><div class='ctx'> 		}</div><div class='del'>-		total_rssi = 0;</div><div class='del'>-		count_rssi = 0;</div><div class='ctx'> 		for (i = 0; i &lt; BRCMF_ANT_MAX; i++) {</div><div class='del'>-			if (sta_info_le.rssi[i]) {</div><div class='del'>-				sinfo-&gt;chain_signal_avg[count_rssi] =</div><div class='del'>-					sta_info_le.rssi[i];</div><div class='del'>-				sinfo-&gt;chain_signal[count_rssi] =</div><div class='del'>-					sta_info_le.rssi[i];</div><div class='del'>-				total_rssi += sta_info_le.rssi[i];</div><div class='del'>-				count_rssi++;</div><div class='del'>-			}</div><div class='add'>+			if (sta_info_le.rssi[i] == 0 ||</div><div class='add'>+			    sta_info_le.rx_lastpkt_rssi[i] == 0)</div><div class='add'>+				continue;</div><div class='add'>+			sinfo-&gt;chains |= BIT(count_rssi);</div><div class='add'>+			sinfo-&gt;chain_signal[count_rssi] =</div><div class='add'>+				sta_info_le.rx_lastpkt_rssi[i];</div><div class='add'>+			sinfo-&gt;chain_signal_avg[count_rssi] =</div><div class='add'>+				sta_info_le.rssi[i];</div><div class='add'>+			total_rssi += sta_info_le.rx_lastpkt_rssi[i];</div><div class='add'>+			total_rssi_avg += sta_info_le.rssi[i];</div><div class='add'>+			count_rssi++;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (count_rssi) {</div><div class='del'>-			sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL);</div><div class='del'>-			sinfo-&gt;chains = count_rssi;</div><div class='del'>-</div><div class='ctx'> 			sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL);</div><div class='del'>-			total_rssi /= count_rssi;</div><div class='del'>-			sinfo-&gt;signal = total_rssi;</div><div class='add'>+			sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG);</div><div class='add'>+			sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL);</div><div class='add'>+			sinfo-&gt;filled |=</div><div class='add'>+				BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL_AVG);</div><div class='add'>+			sinfo-&gt;signal = total_rssi / count_rssi;</div><div class='add'>+			sinfo-&gt;signal_avg = total_rssi_avg / count_rssi;</div><div class='ctx'> 		} else if (test_bit(BRCMF_VIF_STATUS_CONNECTED,</div><div class='ctx'> 			&amp;ifp-&gt;vif-&gt;sme_state)) {</div><div class='ctx'> 			memset(&amp;scb_val, 0, sizeof(scb_val));</div><div class='hunk'>@@ -2892,8 +3271,13 @@ brcmf_cfg80211_dump_station(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 					     &amp;cfg-&gt;assoclist,</div><div class='ctx'> 					     sizeof(cfg-&gt;assoclist));</div><div class='ctx'> 		if (err) {</div><div class='del'>-			bphy_err(drvr, "BRCMF_C_GET_ASSOCLIST unsupported, err=%d\n",</div><div class='del'>-				 err);</div><div class='add'>+			/* GET_ASSOCLIST unsupported by firmware of older chips */</div><div class='add'>+			if (err == -EBADE)</div><div class='add'>+				bphy_info_once(drvr, "BRCMF_C_GET_ASSOCLIST unsupported\n");</div><div class='add'>+			else</div><div class='add'>+				bphy_err(drvr, "BRCMF_C_GET_ASSOCLIST failed, err=%d\n",</div><div class='add'>+					 err);</div><div class='add'>+</div><div class='ctx'> 			cfg-&gt;assoclist.count = 0;</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2992,7 +3376,6 @@ static s32 brcmf_inform_single_bss(struct brcmf_cfg80211_info *cfg,</div><div class='ctx'> </div><div class='ctx'> 	freq = ieee80211_channel_to_frequency(channel, band);</div><div class='ctx'> 	bss_data.chan = ieee80211_get_channel(wiphy, freq);</div><div class='del'>-	bss_data.scan_width = NL80211_BSS_CHAN_WIDTH_20;</div><div class='ctx'> 	bss_data.boottime_ns = ktime_to_ns(ktime_get_boottime());</div><div class='ctx'> </div><div class='ctx'> 	notify_capability = le16_to_cpu(bi-&gt;capability);</div><div class='hunk'>@@ -3143,10 +3526,7 @@ static s32 brcmf_update_bss_info(struct brcmf_cfg80211_info *cfg,</div><div class='ctx'> 				 struct brcmf_if *ifp)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_pub *drvr = cfg-&gt;pub;</div><div class='del'>-	struct brcmf_bss_info_le *bi;</div><div class='del'>-	const struct brcmf_tlv *tim;</div><div class='del'>-	size_t ie_len;</div><div class='del'>-	u8 *ie;</div><div class='add'>+	struct brcmf_bss_info_le *bi = NULL;</div><div class='ctx'> 	s32 err = 0;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='hunk'>@@ -3160,29 +3540,8 @@ static s32 brcmf_update_bss_info(struct brcmf_cfg80211_info *cfg,</div><div class='ctx'> 		bphy_err(drvr, "Could not get bss info %d\n", err);</div><div class='ctx'> 		goto update_bss_info_out;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	bi = (struct brcmf_bss_info_le *)(cfg-&gt;extra_buf + 4);</div><div class='ctx'> 	err = brcmf_inform_single_bss(cfg, bi);</div><div class='del'>-	if (err)</div><div class='del'>-		goto update_bss_info_out;</div><div class='del'>-</div><div class='del'>-	ie = ((u8 *)bi) + le16_to_cpu(bi-&gt;ie_offset);</div><div class='del'>-	ie_len = le32_to_cpu(bi-&gt;ie_length);</div><div class='del'>-</div><div class='del'>-	tim = brcmf_parse_tlvs(ie, ie_len, WLAN_EID_TIM);</div><div class='del'>-	if (!tim) {</div><div class='del'>-		/*</div><div class='del'>-		* active scan was done so we could not get dtim</div><div class='del'>-		* information out of probe response.</div><div class='del'>-		* so we speficially query dtim information to dongle.</div><div class='del'>-		*/</div><div class='del'>-		u32 var;</div><div class='del'>-		err = brcmf_fil_iovar_int_get(ifp, "dtim_assoc", &amp;var);</div><div class='del'>-		if (err) {</div><div class='del'>-			bphy_err(drvr, "wl dtim_assoc failed (%d)\n", err);</div><div class='del'>-			goto update_bss_info_out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> update_bss_info_out:</div><div class='ctx'> 	brcmf_dbg(TRACE, "Exit");</div><div class='hunk'>@@ -3215,7 +3574,7 @@ static void brcmf_cfg80211_escan_timeout_worker(struct work_struct *work)</div><div class='ctx'> static void brcmf_escan_timeout(struct timer_list *t)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_cfg80211_info *cfg =</div><div class='del'>-			from_timer(cfg, t, escan_timeout);</div><div class='add'>+			timer_container_of(cfg, t, escan_timeout);</div><div class='ctx'> 	struct brcmf_pub *drvr = cfg-&gt;pub;</div><div class='ctx'> </div><div class='ctx'> 	if (cfg-&gt;int_escan_map || cfg-&gt;scan_request) {</div><div class='hunk'>@@ -3429,8 +3788,10 @@ static int brcmf_internal_escan_add_info(struct cfg80211_scan_request *req,</div><div class='ctx'> 		if (req-&gt;channels[i] == chan)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	if (i == req-&gt;n_channels)</div><div class='del'>-		req-&gt;channels[req-&gt;n_channels++] = chan;</div><div class='add'>+	if (i == req-&gt;n_channels) {</div><div class='add'>+		req-&gt;n_channels++;</div><div class='add'>+		req-&gt;channels[i] = chan;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; req-&gt;n_ssids; i++) {</div><div class='ctx'> 		if (req-&gt;ssids[i].ssid_len == ssid_len &amp;&amp;</div><div class='hunk'>@@ -3517,7 +3878,7 @@ brcmf_notify_sched_scan_results(struct brcmf_if *ifp,</div><div class='ctx'> 	brcmf_dbg(SCAN, "Enter\n");</div><div class='ctx'> </div><div class='ctx'> 	if (e-&gt;datalen &lt; (sizeof(*pfn_result) + sizeof(*netinfo))) {</div><div class='del'>-		brcmf_dbg(SCAN, "Event data to small. Ignore\n");</div><div class='add'>+		brcmf_dbg(SCAN, "Event data too small. Ignore\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3685,7 +4046,7 @@ brcmf_wowl_nd_results(struct brcmf_if *ifp, const struct brcmf_event_msg *e,</div><div class='ctx'> 	brcmf_dbg(SCAN, "Enter\n");</div><div class='ctx'> </div><div class='ctx'> 	if (e-&gt;datalen &lt; (sizeof(*pfn_result) + sizeof(*netinfo))) {</div><div class='del'>-		brcmf_dbg(SCAN, "Event data to small. Ignore\n");</div><div class='add'>+		brcmf_dbg(SCAN, "Event data too small. Ignore\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3733,7 +4094,7 @@ static void brcmf_report_wowl_wakeind(struct wiphy *wiphy, struct brcmf_if *ifp)</div><div class='ctx'> 	struct cfg80211_wowlan_wakeup *wakeup;</div><div class='ctx'> 	u32 wakeind;</div><div class='ctx'> 	s32 err;</div><div class='del'>-	int timeout;</div><div class='add'>+	long time_left;</div><div class='ctx'> </div><div class='ctx'> 	err = brcmf_fil_iovar_data_get(ifp, "wowl_wakeind", &amp;wake_ind_le,</div><div class='ctx'> 				       sizeof(wake_ind_le));</div><div class='hunk'>@@ -3775,10 +4136,10 @@ static void brcmf_report_wowl_wakeind(struct wiphy *wiphy, struct brcmf_if *ifp)</div><div class='ctx'> 		}</div><div class='ctx'> 		if (wakeind &amp; BRCMF_WOWL_PFN_FOUND) {</div><div class='ctx'> 			brcmf_dbg(INFO, "WOWL Wake indicator: BRCMF_WOWL_PFN_FOUND\n");</div><div class='del'>-			timeout = wait_event_timeout(cfg-&gt;wowl.nd_data_wait,</div><div class='del'>-				cfg-&gt;wowl.nd_data_completed,</div><div class='del'>-				BRCMF_ND_INFO_TIMEOUT);</div><div class='del'>-			if (!timeout)</div><div class='add'>+			time_left = wait_event_timeout(cfg-&gt;wowl.nd_data_wait,</div><div class='add'>+						       cfg-&gt;wowl.nd_data_completed,</div><div class='add'>+						       BRCMF_ND_INFO_TIMEOUT);</div><div class='add'>+			if (!time_left)</div><div class='ctx'> 				bphy_err(drvr, "No result for wowl net detect\n");</div><div class='ctx'> 			else</div><div class='ctx'> 				wakeup_data.net_detect = cfg-&gt;wowl.nd_info;</div><div class='hunk'>@@ -3885,6 +4246,24 @@ static void brcmf_configure_wowl(struct brcmf_cfg80211_info *cfg,</div><div class='ctx'> 	cfg-&gt;wowl.active = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int brcmf_keepalive_start(struct brcmf_if *ifp, unsigned int interval)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_mkeep_alive_pkt_le kalive = {0};</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Configure Null function/data keepalive */</div><div class='add'>+	kalive.version = cpu_to_le16(1);</div><div class='add'>+	kalive.period_msec = cpu_to_le32(interval * MSEC_PER_SEC);</div><div class='add'>+	kalive.len_bytes = cpu_to_le16(0);</div><div class='add'>+	kalive.keep_alive_id = 0;</div><div class='add'>+</div><div class='add'>+	ret = brcmf_fil_iovar_data_set(ifp, "mkeep_alive", &amp;kalive, sizeof(kalive));</div><div class='add'>+	if (ret)</div><div class='add'>+		brcmf_err("keep-alive packet config failed, ret=%d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static s32 brcmf_cfg80211_suspend(struct wiphy *wiphy,</div><div class='ctx'> 				  struct cfg80211_wowlan *wowl)</div><div class='ctx'> {</div><div class='hunk'>@@ -3929,8 +4308,11 @@ static s32 brcmf_cfg80211_suspend(struct wiphy *wiphy,</div><div class='ctx'> 		brcmf_set_mpc(ifp, 1);</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='del'>-		/* Configure WOWL paramaters */</div><div class='add'>+		/* Configure WOWL parameters */</div><div class='ctx'> 		brcmf_configure_wowl(cfg, ifp, wowl);</div><div class='add'>+</div><div class='add'>+		/* Prevent disassociation due to inactivity with keep-alive */</div><div class='add'>+		brcmf_keepalive_start(ifp, 30);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='hunk'>@@ -3940,13 +4322,53 @@ exit:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static s32</div><div class='add'>+brcmf_pmksa_v3_op(struct brcmf_if *ifp, struct cfg80211_pmksa *pmksa,</div><div class='add'>+		  bool alive)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_pmk_op_v3_le *pmk_op;</div><div class='add'>+	int length = offsetof(struct brcmf_pmk_op_v3_le, pmk);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	pmk_op = kzalloc(sizeof(*pmk_op), GFP_KERNEL);</div><div class='add'>+	if (!pmk_op)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pmk_op-&gt;version = cpu_to_le16(BRCMF_PMKSA_VER_3);</div><div class='add'>+</div><div class='add'>+	if (!pmksa) {</div><div class='add'>+		/* Flush operation, operate on entire list */</div><div class='add'>+		pmk_op-&gt;count = cpu_to_le16(0);</div><div class='add'>+	} else {</div><div class='add'>+		/* Single PMK operation */</div><div class='add'>+		pmk_op-&gt;count = cpu_to_le16(1);</div><div class='add'>+		length += sizeof(struct brcmf_pmksa_v3);</div><div class='add'>+		if (pmksa-&gt;bssid)</div><div class='add'>+			memcpy(pmk_op-&gt;pmk[0].bssid, pmksa-&gt;bssid, ETH_ALEN);</div><div class='add'>+		if (pmksa-&gt;pmkid) {</div><div class='add'>+			memcpy(pmk_op-&gt;pmk[0].pmkid, pmksa-&gt;pmkid, WLAN_PMKID_LEN);</div><div class='add'>+			pmk_op-&gt;pmk[0].pmkid_len = WLAN_PMKID_LEN;</div><div class='add'>+		}</div><div class='add'>+		if (pmksa-&gt;ssid &amp;&amp; pmksa-&gt;ssid_len) {</div><div class='add'>+			memcpy(pmk_op-&gt;pmk[0].ssid.SSID, pmksa-&gt;ssid, pmksa-&gt;ssid_len);</div><div class='add'>+			pmk_op-&gt;pmk[0].ssid.SSID_len = pmksa-&gt;ssid_len;</div><div class='add'>+		}</div><div class='add'>+		pmk_op-&gt;pmk[0].time_left = cpu_to_le32(alive ? BRCMF_PMKSA_NO_EXPIRY : 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pmk_op-&gt;length = cpu_to_le16(length);</div><div class='add'>+</div><div class='add'>+	ret = brcmf_fil_iovar_data_set(ifp, "pmkid_info", pmk_op, sizeof(*pmk_op));</div><div class='add'>+	kfree(pmk_op);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static __used s32</div><div class='ctx'> brcmf_update_pmklist(struct brcmf_cfg80211_info *cfg, struct brcmf_if *ifp)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_pmk_list_le *pmk_list;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 npmk;</div><div class='del'>-	s32 err;</div><div class='ctx'> </div><div class='ctx'> 	pmk_list = &amp;cfg-&gt;pmk_list;</div><div class='ctx'> 	npmk = le32_to_cpu(pmk_list-&gt;npmk);</div><div class='hunk'>@@ -3955,10 +4377,8 @@ brcmf_update_pmklist(struct brcmf_cfg80211_info *cfg, struct brcmf_if *ifp)</div><div class='ctx'> 	for (i = 0; i &lt; npmk; i++)</div><div class='ctx'> 		brcmf_dbg(CONN, "PMK[%d]: %pM\n", i, &amp;pmk_list-&gt;pmk[i].bssid);</div><div class='ctx'> </div><div class='del'>-	err = brcmf_fil_iovar_data_set(ifp, "pmkid_info", pmk_list,</div><div class='del'>-				       sizeof(*pmk_list));</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return brcmf_fil_iovar_data_set(ifp, "pmkid_info", pmk_list,</div><div class='add'>+			sizeof(*pmk_list));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static s32</div><div class='hunk'>@@ -3976,6 +4396,14 @@ brcmf_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 	if (!check_vif_up(ifp-&gt;vif))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='add'>+	brcmf_dbg(CONN, "set_pmksa - PMK bssid: %pM =\n", pmksa-&gt;bssid);</div><div class='add'>+	brcmf_dbg(CONN, "%*ph\n", WLAN_PMKID_LEN, pmksa-&gt;pmkid);</div><div class='add'>+</div><div class='add'>+	if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_PMKID_V3))</div><div class='add'>+		return brcmf_pmksa_v3_op(ifp, pmksa, true);</div><div class='add'>+</div><div class='add'>+	/* TODO: implement PMKID_V2 */</div><div class='add'>+</div><div class='ctx'> 	npmk = le32_to_cpu(cfg-&gt;pmk_list.npmk);</div><div class='ctx'> 	for (i = 0; i &lt; npmk; i++)</div><div class='ctx'> 		if (!memcmp(pmksa-&gt;bssid, pmk[i].bssid, ETH_ALEN))</div><div class='hunk'>@@ -3992,9 +4420,6 @@ brcmf_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	brcmf_dbg(CONN, "set_pmksa - PMK bssid: %pM =\n", pmk[npmk].bssid);</div><div class='del'>-	brcmf_dbg(CONN, "%*ph\n", WLAN_PMKID_LEN, pmk[npmk].pmkid);</div><div class='del'>-</div><div class='ctx'> 	err = brcmf_update_pmklist(cfg, ifp);</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Exit\n");</div><div class='hunk'>@@ -4018,6 +4443,11 @@ brcmf_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(CONN, "del_pmksa - PMK bssid = %pM\n", pmksa-&gt;bssid);</div><div class='ctx'> </div><div class='add'>+	if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_PMKID_V3))</div><div class='add'>+		return brcmf_pmksa_v3_op(ifp, pmksa, false);</div><div class='add'>+</div><div class='add'>+	/* TODO: implement PMKID_V2 */</div><div class='add'>+</div><div class='ctx'> 	npmk = le32_to_cpu(cfg-&gt;pmk_list.npmk);</div><div class='ctx'> 	for (i = 0; i &lt; npmk; i++)</div><div class='ctx'> 		if (!memcmp(pmksa-&gt;bssid, pmk[i].bssid, ETH_ALEN))</div><div class='hunk'>@@ -4054,6 +4484,11 @@ brcmf_cfg80211_flush_pmksa(struct wiphy *wiphy, struct net_device *ndev)</div><div class='ctx'> 	if (!check_vif_up(ifp-&gt;vif))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='add'>+	if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_PMKID_V3))</div><div class='add'>+		return brcmf_pmksa_v3_op(ifp, NULL, false);</div><div class='add'>+</div><div class='add'>+	/* TODO: implement PMKID_V2 */</div><div class='add'>+</div><div class='ctx'> 	memset(&amp;cfg-&gt;pmk_list, 0, sizeof(cfg-&gt;pmk_list));</div><div class='ctx'> 	err = brcmf_update_pmklist(cfg, ifp);</div><div class='ctx'> </div><div class='hunk'>@@ -4144,7 +4579,7 @@ brcmf_configure_wpaie(struct brcmf_if *ifp,</div><div class='ctx'> </div><div class='ctx'> 	if (!brcmf_valid_wpa_oui(&amp;data[offset], is_rsn_ie)) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='del'>-		bphy_err(drvr, "ivalid OUI\n");</div><div class='add'>+		bphy_err(drvr, "invalid OUI\n");</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> 	offset += TLV_OUI_LEN;</div><div class='hunk'>@@ -4183,7 +4618,7 @@ brcmf_configure_wpaie(struct brcmf_if *ifp,</div><div class='ctx'> 	for (i = 0; i &lt; count; i++) {</div><div class='ctx'> 		if (!brcmf_valid_wpa_oui(&amp;data[offset], is_rsn_ie)) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='del'>-			bphy_err(drvr, "ivalid OUI\n");</div><div class='add'>+			bphy_err(drvr, "invalid OUI\n");</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='ctx'> 		offset += TLV_OUI_LEN;</div><div class='hunk'>@@ -4217,7 +4652,7 @@ brcmf_configure_wpaie(struct brcmf_if *ifp,</div><div class='ctx'> 	for (i = 0; i &lt; count; i++) {</div><div class='ctx'> 		if (!brcmf_valid_wpa_oui(&amp;data[offset], is_rsn_ie)) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='del'>-			bphy_err(drvr, "ivalid OUI\n");</div><div class='add'>+			bphy_err(drvr, "invalid OUI\n");</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='ctx'> 		offset += TLV_OUI_LEN;</div><div class='hunk'>@@ -4585,13 +5020,17 @@ exit:</div><div class='ctx'> </div><div class='ctx'> s32 brcmf_vif_clear_mgmt_ies(struct brcmf_cfg80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	s32 pktflags[] = {</div><div class='del'>-		BRCMF_VNDR_IE_PRBREQ_FLAG,</div><div class='add'>+	static const s32 pktflags[] = {</div><div class='ctx'> 		BRCMF_VNDR_IE_PRBRSP_FLAG,</div><div class='ctx'> 		BRCMF_VNDR_IE_BEACON_FLAG</div><div class='ctx'> 	};</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (vif-&gt;wdev.iftype == NL80211_IFTYPE_AP)</div><div class='add'>+		brcmf_vif_set_mgmt_ie(vif, BRCMF_VNDR_IE_ASSOCRSP_FLAG, NULL, 0);</div><div class='add'>+	else</div><div class='add'>+		brcmf_vif_set_mgmt_ie(vif, BRCMF_VNDR_IE_PRBREQ_FLAG, NULL, 0);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(pktflags); i++)</div><div class='ctx'> 		brcmf_vif_set_mgmt_ie(vif, pktflags[i], NULL, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -4699,6 +5138,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 	bool mbss;</div><div class='ctx'> 	int is_11d;</div><div class='ctx'> 	bool supports_11d;</div><div class='add'>+	bool closednet;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "ctrlchn=%d, center=%d, bw=%d, beacon_interval=%d, dtim_period=%d,\n",</div><div class='ctx'> 		  settings-&gt;chandef.chan-&gt;hw_value,</div><div class='hunk'>@@ -4838,8 +5278,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 		if (crypto-&gt;sae_pwd) {</div><div class='ctx'> 			brcmf_dbg(INFO, "using SAE offload\n");</div><div class='ctx'> 			profile-&gt;use_fwauth |= BIT(BRCMF_PROFILE_FWAUTH_SAE);</div><div class='del'>-			err = brcmf_set_sae_password(ifp, crypto-&gt;sae_pwd,</div><div class='del'>-						     crypto-&gt;sae_pwd_len);</div><div class='add'>+			err = brcmf_fwvid_set_sae_password(ifp, crypto);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				goto exit;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4869,12 +5308,12 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = brcmf_fil_iovar_int_set(ifp, "closednet",</div><div class='del'>-					      settings-&gt;hidden_ssid);</div><div class='add'>+		closednet =</div><div class='add'>+			(settings-&gt;hidden_ssid != NL80211_HIDDEN_SSID_NOT_IN_USE);</div><div class='add'>+		err = brcmf_fil_iovar_int_set(ifp, "closednet",	closednet);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			bphy_err(drvr, "%s closednet error (%d)\n",</div><div class='del'>-				 settings-&gt;hidden_ssid ?</div><div class='del'>-				 "enabled" : "disabled",</div><div class='add'>+				 (closednet ? "enabled" : "disabled"),</div><div class='ctx'> 				 err);</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4927,7 +5366,8 @@ exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev)</div><div class='add'>+static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev,</div><div class='add'>+				  unsigned int link_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);</div><div class='ctx'> 	struct brcmf_if *ifp = netdev_priv(ndev);</div><div class='hunk'>@@ -4945,10 +5385,12 @@ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev)</div><div class='ctx'> 		msleep(400);</div><div class='ctx'> </div><div class='ctx'> 		if (profile-&gt;use_fwauth != BIT(BRCMF_PROFILE_FWAUTH_NONE)) {</div><div class='add'>+			struct cfg80211_crypto_settings crypto = {};</div><div class='add'>+</div><div class='ctx'> 			if (profile-&gt;use_fwauth &amp; BIT(BRCMF_PROFILE_FWAUTH_PSK))</div><div class='ctx'> 				brcmf_set_pmk(ifp, NULL, 0);</div><div class='ctx'> 			if (profile-&gt;use_fwauth &amp; BIT(BRCMF_PROFILE_FWAUTH_SAE))</div><div class='del'>-				brcmf_set_sae_password(ifp, NULL, 0);</div><div class='add'>+				brcmf_fwvid_set_sae_password(ifp, &amp;crypto);</div><div class='ctx'> 			profile-&gt;use_fwauth = BIT(BRCMF_PROFILE_FWAUTH_NONE);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -4991,8 +5433,8 @@ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev)</div><div class='ctx'> 			bphy_err(drvr, "bss_enable config failed %d\n", err);</div><div class='ctx'> 	}</div><div class='ctx'> 	brcmf_set_mpc(ifp, 1);</div><div class='del'>-	brcmf_configure_arp_nd_offload(ifp, true);</div><div class='ctx'> 	clear_bit(BRCMF_VIF_STATUS_AP_CREATED, &amp;ifp-&gt;vif-&gt;sme_state);</div><div class='add'>+	brcmf_configure_arp_nd_offload(ifp, true);</div><div class='ctx'> 	brcmf_net_setcarrier(ifp, false);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -5000,16 +5442,13 @@ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> static s32</div><div class='ctx'> brcmf_cfg80211_change_beacon(struct wiphy *wiphy, struct net_device *ndev,</div><div class='del'>-			     struct cfg80211_beacon_data *info)</div><div class='add'>+			     struct cfg80211_ap_update *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_if *ifp = netdev_priv(ndev);</div><div class='del'>-	s32 err;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='del'>-	err = brcmf_config_ap_mgmt_ie(ifp-&gt;vif, info);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return brcmf_config_ap_mgmt_ie(ifp-&gt;vif, &amp;info-&gt;beacon);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -5088,7 +5527,7 @@ brcmf_cfg80211_update_mgmt_frame_registrations(struct wiphy *wiphy,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int</div><div class='add'>+int</div><div class='ctx'> brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,</div><div class='ctx'> 		       struct cfg80211_mgmt_tx_params *params, u64 *cookie)</div><div class='ctx'> {</div><div class='hunk'>@@ -5105,8 +5544,7 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,</div><div class='ctx'> 	struct brcmf_fil_action_frame_le *action_frame;</div><div class='ctx'> 	struct brcmf_fil_af_params_le *af_params;</div><div class='ctx'> 	bool ack;</div><div class='del'>-	s32 chan_nr;</div><div class='del'>-	u32 freq;</div><div class='add'>+	__le32 hw_ch;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='hunk'>@@ -5167,25 +5605,33 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,</div><div class='ctx'> 		/* Add the channel. Use the one specified as parameter if any or</div><div class='ctx'> 		 * the current one (got from the firmware) otherwise</div><div class='ctx'> 		 */</div><div class='del'>-		if (chan)</div><div class='del'>-			freq = chan-&gt;center_freq;</div><div class='del'>-		else</div><div class='del'>-			brcmf_fil_cmd_int_get(vif-&gt;ifp, BRCMF_C_GET_CHANNEL,</div><div class='del'>-					      &amp;freq);</div><div class='del'>-		chan_nr = ieee80211_frequency_to_channel(freq);</div><div class='del'>-		af_params-&gt;channel = cpu_to_le32(chan_nr);</div><div class='add'>+		if (chan) {</div><div class='add'>+			hw_ch = cpu_to_le32(chan-&gt;hw_value);</div><div class='add'>+		} else {</div><div class='add'>+			err = brcmf_fil_cmd_data_get(vif-&gt;ifp,</div><div class='add'>+						     BRCMF_C_GET_CHANNEL,</div><div class='add'>+						     &amp;hw_ch, sizeof(hw_ch));</div><div class='add'>+			if (err) {</div><div class='add'>+				bphy_err(drvr,</div><div class='add'>+					 "unable to get current hw channel\n");</div><div class='add'>+				goto free;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		af_params-&gt;channel = hw_ch;</div><div class='add'>+</div><div class='ctx'> 		af_params-&gt;dwell_time = cpu_to_le32(params-&gt;wait);</div><div class='ctx'> 		memcpy(action_frame-&gt;data, &amp;buf[DOT11_MGMT_HDR_LEN],</div><div class='ctx'> 		       le16_to_cpu(action_frame-&gt;len));</div><div class='ctx'> </div><div class='del'>-		brcmf_dbg(TRACE, "Action frame, cookie=%lld, len=%d, freq=%d\n",</div><div class='del'>-			  *cookie, le16_to_cpu(action_frame-&gt;len), freq);</div><div class='add'>+		brcmf_dbg(TRACE, "Action frame, cookie=%lld, len=%d, channel=%d\n",</div><div class='add'>+			  *cookie, le16_to_cpu(action_frame-&gt;len),</div><div class='add'>+			  le32_to_cpu(af_params-&gt;channel));</div><div class='ctx'> </div><div class='del'>-		ack = brcmf_p2p_send_action_frame(cfg, cfg_to_ndev(cfg),</div><div class='del'>-						  af_params);</div><div class='add'>+		ack = brcmf_p2p_send_action_frame(vif-&gt;ifp, af_params);</div><div class='ctx'> </div><div class='ctx'> 		cfg80211_mgmt_tx_status(wdev, *cookie, buf, len, ack,</div><div class='ctx'> 					GFP_KERNEL);</div><div class='add'>+free:</div><div class='ctx'> 		kfree(af_params);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		brcmf_dbg(TRACE, "Unhandled, fc=%04x!!\n", mgmt-&gt;frame_control);</div><div class='hunk'>@@ -5195,6 +5641,7 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,</div><div class='ctx'> exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+BRCMF_EXPORT_SYMBOL_GPL(brcmf_cfg80211_mgmt_tx);</div><div class='ctx'> </div><div class='ctx'> static int brcmf_cfg80211_set_cqm_rssi_range_config(struct wiphy *wiphy,</div><div class='ctx'> 						    struct net_device *ndev,</div><div class='hunk'>@@ -5264,6 +5711,7 @@ exit:</div><div class='ctx'> </div><div class='ctx'> static int brcmf_cfg80211_get_channel(struct wiphy *wiphy,</div><div class='ctx'> 				      struct wireless_dev *wdev,</div><div class='add'>+				      unsigned int link_id,</div><div class='ctx'> 				      struct cfg80211_chan_def *chandef)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);</div><div class='hunk'>@@ -5509,6 +5957,26 @@ static int brcmf_cfg80211_del_pmk(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	return brcmf_set_pmk(ifp, NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int brcmf_cfg80211_change_bss(struct wiphy *wiphy, struct net_device *dev,</div><div class='add'>+				     struct bss_parameters *params)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_if *ifp = netdev_priv(dev);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* In AP mode, the "ap_isolate" value represents</div><div class='add'>+	 *  0 = allow low-level bridging of frames between associated stations</div><div class='add'>+	 *  1 = restrict low-level bridging of frames to isolate associated stations</div><div class='add'>+	 * -1 = do not change existing setting</div><div class='add'>+	 */</div><div class='add'>+	if (params-&gt;ap_isolate &gt;= 0) {</div><div class='add'>+		ret = brcmf_fil_iovar_int_set(ifp, "ap_isolate", params-&gt;ap_isolate);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			brcmf_err("ap_isolate iovar failed: ret=%d\n", ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct cfg80211_ops brcmf_cfg80211_ops = {</div><div class='ctx'> 	.add_virtual_intf = brcmf_cfg80211_add_iface,</div><div class='ctx'> 	.del_virtual_intf = brcmf_cfg80211_del_iface,</div><div class='hunk'>@@ -5556,6 +6024,7 @@ static struct cfg80211_ops brcmf_cfg80211_ops = {</div><div class='ctx'> 	.update_connect_params = brcmf_cfg80211_update_conn_params,</div><div class='ctx'> 	.set_pmk = brcmf_cfg80211_set_pmk,</div><div class='ctx'> 	.del_pmk = brcmf_cfg80211_del_pmk,</div><div class='add'>+	.change_bss = brcmf_cfg80211_change_bss,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cfg80211_ops *brcmf_cfg80211_get_ops(struct brcmf_mp_device *settings)</div><div class='hunk'>@@ -5587,6 +6056,7 @@ struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg,</div><div class='ctx'> </div><div class='ctx'> 	vif-&gt;wdev.wiphy = cfg-&gt;wiphy;</div><div class='ctx'> 	vif-&gt;wdev.iftype = type;</div><div class='add'>+	init_completion(&amp;vif-&gt;mgmt_tx);</div><div class='ctx'> </div><div class='ctx'> 	brcmf_init_prof(&amp;vif-&gt;profile);</div><div class='ctx'> </div><div class='hunk'>@@ -5871,6 +6341,11 @@ static s32 brcmf_get_assoc_ies(struct brcmf_cfg80211_info *cfg,</div><div class='ctx'> 		(struct brcmf_cfg80211_assoc_ielen_le *)cfg-&gt;extra_buf;</div><div class='ctx'> 	req_len = le32_to_cpu(assoc_info-&gt;req_len);</div><div class='ctx'> 	resp_len = le32_to_cpu(assoc_info-&gt;resp_len);</div><div class='add'>+	if (req_len &gt; WL_EXTRA_BUF_MAX || resp_len &gt; WL_EXTRA_BUF_MAX) {</div><div class='add'>+		bphy_err(drvr, "invalid lengths in assoc info: req %u resp %u\n",</div><div class='add'>+			 req_len, resp_len);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> 	if (req_len) {</div><div class='ctx'> 		err = brcmf_fil_iovar_data_get(ifp, "assoc_req_ies",</div><div class='ctx'> 					       cfg-&gt;extra_buf,</div><div class='hunk'>@@ -5977,8 +6452,8 @@ brcmf_bss_roaming_done(struct brcmf_cfg80211_info *cfg,</div><div class='ctx'> done:</div><div class='ctx'> 	kfree(buf);</div><div class='ctx'> </div><div class='del'>-	roam_info.channel = notify_channel;</div><div class='del'>-	roam_info.bssid = profile-&gt;bssid;</div><div class='add'>+	roam_info.links[0].channel = notify_channel;</div><div class='add'>+	roam_info.links[0].bssid = profile-&gt;bssid;</div><div class='ctx'> 	roam_info.req_ie = conn_info-&gt;req_ie;</div><div class='ctx'> 	roam_info.req_ie_len = conn_info-&gt;req_ie_len;</div><div class='ctx'> 	roam_info.resp_ie = conn_info-&gt;resp_ie;</div><div class='hunk'>@@ -5988,7 +6463,7 @@ done:</div><div class='ctx'> 	brcmf_dbg(CONN, "Report roaming result\n");</div><div class='ctx'> </div><div class='ctx'> 	if (profile-&gt;use_fwsup == BRCMF_PROFILE_FWSUP_1X &amp;&amp; profile-&gt;is_ft) {</div><div class='del'>-		cfg80211_port_authorized(ndev, profile-&gt;bssid, GFP_KERNEL);</div><div class='add'>+		cfg80211_port_authorized(ndev, profile-&gt;bssid, NULL, 0, GFP_KERNEL);</div><div class='ctx'> 		brcmf_dbg(CONN, "Report port authorized\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -6019,9 +6494,13 @@ brcmf_bss_connect_done(struct brcmf_cfg80211_info *cfg,</div><div class='ctx'> 				&amp;ifp-&gt;vif-&gt;sme_state);</div><div class='ctx'> 			conn_params.status = WLAN_STATUS_SUCCESS;</div><div class='ctx'> 		} else {</div><div class='add'>+			clear_bit(BRCMF_VIF_STATUS_EAP_SUCCESS,</div><div class='add'>+				  &amp;ifp-&gt;vif-&gt;sme_state);</div><div class='add'>+			clear_bit(BRCMF_VIF_STATUS_ASSOC_SUCCESS,</div><div class='add'>+				  &amp;ifp-&gt;vif-&gt;sme_state);</div><div class='ctx'> 			conn_params.status = WLAN_STATUS_AUTH_TIMEOUT;</div><div class='ctx'> 		}</div><div class='del'>-		conn_params.bssid = profile-&gt;bssid;</div><div class='add'>+		conn_params.links[0].bssid = profile-&gt;bssid;</div><div class='ctx'> 		conn_params.req_ie = conn_info-&gt;req_ie;</div><div class='ctx'> 		conn_params.req_ie_len = conn_info-&gt;req_ie_len;</div><div class='ctx'> 		conn_params.resp_ie = conn_info-&gt;resp_ie;</div><div class='hunk'>@@ -6116,9 +6595,13 @@ brcmf_notify_connect_status(struct brcmf_if *ifp,</div><div class='ctx'> 	} else if (brcmf_is_linkdown(ifp-&gt;vif, e)) {</div><div class='ctx'> 		brcmf_dbg(CONN, "Linkdown\n");</div><div class='ctx'> 		if (!brcmf_is_ibssmode(ifp-&gt;vif) &amp;&amp;</div><div class='del'>-		    test_bit(BRCMF_VIF_STATUS_CONNECTED,</div><div class='del'>-			     &amp;ifp-&gt;vif-&gt;sme_state)) {</div><div class='del'>-			if (memcmp(profile-&gt;bssid, e-&gt;addr, ETH_ALEN))</div><div class='add'>+		    (test_bit(BRCMF_VIF_STATUS_CONNECTED,</div><div class='add'>+			      &amp;ifp-&gt;vif-&gt;sme_state) ||</div><div class='add'>+		     test_bit(BRCMF_VIF_STATUS_CONNECTING,</div><div class='add'>+			      &amp;ifp-&gt;vif-&gt;sme_state))) {</div><div class='add'>+			if (test_bit(BRCMF_VIF_STATUS_CONNECTED,</div><div class='add'>+				     &amp;ifp-&gt;vif-&gt;sme_state) &amp;&amp;</div><div class='add'>+			    memcmp(profile-&gt;bssid, e-&gt;addr, ETH_ALEN))</div><div class='ctx'> 				return err;</div><div class='ctx'> </div><div class='ctx'> 			brcmf_bss_connect_done(cfg, ndev, e, false);</div><div class='hunk'>@@ -6188,18 +6671,20 @@ static s32 brcmf_notify_rssi(struct brcmf_if *ifp,</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_cfg80211_vif *vif = ifp-&gt;vif;</div><div class='ctx'> 	struct brcmf_rssi_be *info = data;</div><div class='del'>-	s32 rssi, snr, noise;</div><div class='add'>+	s32 rssi, snr = 0, noise = 0;</div><div class='ctx'> 	s32 low, high, last;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;datalen &lt; sizeof(*info)) {</div><div class='add'>+	if (e-&gt;datalen &gt;= sizeof(*info)) {</div><div class='add'>+		rssi = be32_to_cpu(info-&gt;rssi);</div><div class='add'>+		snr = be32_to_cpu(info-&gt;snr);</div><div class='add'>+		noise = be32_to_cpu(info-&gt;noise);</div><div class='add'>+	} else if (e-&gt;datalen &gt;= sizeof(rssi)) {</div><div class='add'>+		rssi = be32_to_cpu(*(__be32 *)data);</div><div class='add'>+	} else {</div><div class='ctx'> 		brcmf_err("insufficient RSSI event data\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rssi = be32_to_cpu(info-&gt;rssi);</div><div class='del'>-	snr = be32_to_cpu(info-&gt;snr);</div><div class='del'>-	noise = be32_to_cpu(info-&gt;noise);</div><div class='del'>-</div><div class='ctx'> 	low = vif-&gt;cqm_rssi_low;</div><div class='ctx'> 	high = vif-&gt;cqm_rssi_high;</div><div class='ctx'> 	last = vif-&gt;cqm_rssi_last;</div><div class='hunk'>@@ -6323,6 +6808,8 @@ static void brcmf_register_event_handlers(struct brcmf_cfg80211_info *cfg)</div><div class='ctx'> 	brcmf_fweh_register(cfg-&gt;pub, BRCMF_E_PSK_SUP,</div><div class='ctx'> 			    brcmf_notify_connect_status);</div><div class='ctx'> 	brcmf_fweh_register(cfg-&gt;pub, BRCMF_E_RSSI, brcmf_notify_rssi);</div><div class='add'>+</div><div class='add'>+	brcmf_fwvid_register_event_handlers(cfg-&gt;pub);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void brcmf_deinit_priv_mem(struct brcmf_cfg80211_info *cfg)</div><div class='hunk'>@@ -6391,6 +6878,7 @@ static void wl_deinit_priv(struct brcmf_cfg80211_info *cfg)</div><div class='ctx'> 	cfg-&gt;dongle_up = false;	/* dongle down */</div><div class='ctx'> 	brcmf_abort_scanning(cfg);</div><div class='ctx'> 	brcmf_deinit_priv_mem(cfg);</div><div class='add'>+	brcmf_clear_assoc_ies(cfg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void init_vif_event(struct brcmf_cfg80211_vif_event *event)</div><div class='hunk'>@@ -6541,6 +7029,13 @@ static int brcmf_construct_chaninfo(struct brcmf_cfg80211_info *cfg,</div><div class='ctx'> 			band-&gt;channels[i].flags = IEEE80211_CHAN_DISABLED;</div><div class='ctx'> </div><div class='ctx'> 	total = le32_to_cpu(list-&gt;count);</div><div class='add'>+	if (total &gt; BRCMF_MAX_CHANSPEC_LIST) {</div><div class='add'>+		bphy_err(drvr, "Invalid count of channel Spec. (%u)\n",</div><div class='add'>+			 total);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto fail_pbuf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; total; i++) {</div><div class='ctx'> 		ch.chspec = (u16)le32_to_cpu(list-&gt;element[i]);</div><div class='ctx'> 		cfg-&gt;d11inf.decchspec(&amp;ch);</div><div class='hunk'>@@ -6610,8 +7105,8 @@ static int brcmf_construct_chaninfo(struct brcmf_cfg80211_info *cfg,</div><div class='ctx'> 			ch.bw = BRCMU_CHAN_BW_20;</div><div class='ctx'> 			cfg-&gt;d11inf.encchspec(&amp;ch);</div><div class='ctx'> 			chaninfo = ch.chspec;</div><div class='del'>-			err = brcmf_fil_bsscfg_int_get(ifp, "per_chan_info",</div><div class='del'>-						       &amp;chaninfo);</div><div class='add'>+			err = brcmf_fil_bsscfg_int_query(ifp, "per_chan_info",</div><div class='add'>+							 &amp;chaninfo);</div><div class='ctx'> 			if (!err) {</div><div class='ctx'> 				if (chaninfo &amp; WL_CHAN_RADAR)</div><div class='ctx'> 					channel-&gt;flags |=</div><div class='hunk'>@@ -6645,7 +7140,7 @@ static int brcmf_enable_bw40_2g(struct brcmf_cfg80211_info *cfg)</div><div class='ctx'> </div><div class='ctx'> 	/* verify support for bw_cap command */</div><div class='ctx'> 	val = WLC_BAND_5G;</div><div class='del'>-	err = brcmf_fil_iovar_int_get(ifp, "bw_cap", &amp;val);</div><div class='add'>+	err = brcmf_fil_iovar_int_query(ifp, "bw_cap", &amp;val);</div><div class='ctx'> </div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		/* only set 2G bandwidth using bw_cap command */</div><div class='hunk'>@@ -6686,6 +7181,13 @@ static int brcmf_enable_bw40_2g(struct brcmf_cfg80211_info *cfg)</div><div class='ctx'> 		band = cfg_to_wiphy(cfg)-&gt;bands[NL80211_BAND_2GHZ];</div><div class='ctx'> 		list = (struct brcmf_chanspec_list *)pbuf;</div><div class='ctx'> 		num_chan = le32_to_cpu(list-&gt;count);</div><div class='add'>+		if (num_chan &gt; BRCMF_MAX_CHANSPEC_LIST) {</div><div class='add'>+			bphy_err(drvr, "Invalid count of channel Spec. (%u)\n",</div><div class='add'>+				 num_chan);</div><div class='add'>+			kfree(pbuf);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		for (i = 0; i &lt; num_chan; i++) {</div><div class='ctx'> 			ch.chspec = (u16)le32_to_cpu(list-&gt;element[i]);</div><div class='ctx'> 			cfg-&gt;d11inf.decchspec(&amp;ch);</div><div class='hunk'>@@ -6714,11 +7216,11 @@ static void brcmf_get_bwcap(struct brcmf_if *ifp, u32 bw_cap[])</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	band = WLC_BAND_2G;</div><div class='del'>-	err = brcmf_fil_iovar_int_get(ifp, "bw_cap", &amp;band);</div><div class='add'>+	err = brcmf_fil_iovar_int_query(ifp, "bw_cap", &amp;band);</div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		bw_cap[NL80211_BAND_2GHZ] = band;</div><div class='ctx'> 		band = WLC_BAND_5G;</div><div class='del'>-		err = brcmf_fil_iovar_int_get(ifp, "bw_cap", &amp;band);</div><div class='add'>+		err = brcmf_fil_iovar_int_query(ifp, "bw_cap", &amp;band);</div><div class='ctx'> 		if (!err) {</div><div class='ctx'> 			bw_cap[NL80211_BAND_5GHZ] = band;</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -6727,7 +7229,6 @@ static void brcmf_get_bwcap(struct brcmf_if *ifp, u32 bw_cap[])</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	brcmf_dbg(INFO, "fallback to mimo_bw_cap info\n");</div><div class='del'>-	mimo_bwcap = 0;</div><div class='ctx'> 	err = brcmf_fil_iovar_int_get(ifp, "mimo_bw_cap", &amp;mimo_bwcap);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		/* assume 20MHz if firmware does not give a clue */</div><div class='hunk'>@@ -6823,7 +7324,7 @@ static int brcmf_setup_wiphybands(struct brcmf_cfg80211_info *cfg)</div><div class='ctx'> 	struct brcmf_pub *drvr = cfg-&gt;pub;</div><div class='ctx'> 	struct brcmf_if *ifp = brcmf_get_ifp(drvr, 0);</div><div class='ctx'> 	struct wiphy *wiphy = cfg_to_wiphy(cfg);</div><div class='del'>-	u32 nmode = 0;</div><div class='add'>+	u32 nmode;</div><div class='ctx'> 	u32 vhtmode = 0;</div><div class='ctx'> 	u32 bw_cap[2] = { WLC_BW_20MHZ_BIT, WLC_BW_20MHZ_BIT };</div><div class='ctx'> 	u32 rxchain;</div><div class='hunk'>@@ -6848,7 +7349,12 @@ static int brcmf_setup_wiphybands(struct brcmf_cfg80211_info *cfg)</div><div class='ctx'> </div><div class='ctx'> 	err = brcmf_fil_iovar_int_get(ifp, "rxchain", &amp;rxchain);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		bphy_err(drvr, "rxchain error (%d)\n", err);</div><div class='add'>+		/* rxchain unsupported by firmware of older chips */</div><div class='add'>+		if (err == -EBADE)</div><div class='add'>+			bphy_info_once(drvr, "rxchain unsupported\n");</div><div class='add'>+		else</div><div class='add'>+			bphy_err(drvr, "rxchain error (%d)\n", err);</div><div class='add'>+</div><div class='ctx'> 		nchain = 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		for (nchain = 0; rxchain; nchain++)</div><div class='hunk'>@@ -6890,6 +7396,7 @@ brcmf_txrx_stypes[NUM_NL80211_IFTYPES] = {</div><div class='ctx'> 	[NL80211_IFTYPE_STATION] = {</div><div class='ctx'> 		.tx = 0xffff,</div><div class='ctx'> 		.rx = BIT(IEEE80211_STYPE_ACTION &gt;&gt; 4) |</div><div class='add'>+		      BIT(IEEE80211_STYPE_AUTH &gt;&gt; 4) |</div><div class='ctx'> 		      BIT(IEEE80211_STYPE_PROBE_REQ &gt;&gt; 4)</div><div class='ctx'> 	},</div><div class='ctx'> 	[NL80211_IFTYPE_P2P_CLIENT] = {</div><div class='hunk'>@@ -6953,13 +7460,15 @@ brcmf_txrx_stypes[NUM_NL80211_IFTYPES] = {</div><div class='ctx'>  *</div><div class='ctx'>  * p2p, mchan, and mbss:</div><div class='ctx'>  *</div><div class='del'>- *	#STA &lt;= 1, #P2P-DEV &lt;= 1, #{P2P-CL, P2P-GO} &lt;= 1, channels = 2, 3 total</div><div class='add'>+ *	#STA &lt;= 2, #P2P-DEV &lt;= 1, #{P2P-CL, P2P-GO} &lt;= 1, channels = 2, 3 total</div><div class='ctx'>  *	#STA &lt;= 1, #P2P-DEV &lt;= 1, #AP &lt;= 1, #P2P-CL &lt;= 1, channels = 1, 4 total</div><div class='ctx'>  *	#AP &lt;= 4, matching BI, channels = 1, 4 total</div><div class='ctx'>  *</div><div class='ctx'>  * p2p, rsdb, and no mbss:</div><div class='ctx'>  *	#STA &lt;= 1, #P2P-DEV &lt;= 1, #{P2P-CL, P2P-GO} &lt;= 2, AP &lt;= 2,</div><div class='ctx'>  *	 channels = 2, 4 total</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, negative errno on failure</div><div class='ctx'>  */</div><div class='ctx'> static int brcmf_setup_ifmodes(struct wiphy *wiphy, struct brcmf_if *ifp)</div><div class='ctx'> {</div><div class='hunk'>@@ -6999,7 +7508,7 @@ static int brcmf_setup_ifmodes(struct wiphy *wiphy, struct brcmf_if *ifp)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	combo[c].num_different_channels = 1 + (rsdb || (p2p &amp;&amp; mchan));</div><div class='del'>-	c0_limits[i].max = 1;</div><div class='add'>+	c0_limits[i].max = 1 + (p2p &amp;&amp; mchan);</div><div class='ctx'> 	c0_limits[i++].types = BIT(NL80211_IFTYPE_STATION);</div><div class='ctx'> 	if (mon_flag) {</div><div class='ctx'> 		c0_limits[i].max = 1;</div><div class='hunk'>@@ -7170,6 +7679,8 @@ static int brcmf_setup_wiphy(struct wiphy *wiphy, struct brcmf_if *ifp)</div><div class='ctx'> 				    BIT(NL80211_BSS_SELECT_ATTR_BAND_PREF) |</div><div class='ctx'> 				    BIT(NL80211_BSS_SELECT_ATTR_RSSI_ADJUST);</div><div class='ctx'> </div><div class='add'>+	wiphy-&gt;bss_param_support = WIPHY_BSS_PARAM_AP_ISOLATE;</div><div class='add'>+</div><div class='ctx'> 	wiphy-&gt;flags |= WIPHY_FLAG_NETNS_OK |</div><div class='ctx'> 			WIPHY_FLAG_PS_ON_BY_DEFAULT |</div><div class='ctx'> 			WIPHY_FLAG_HAVE_AP_SME |</div><div class='hunk'>@@ -7195,6 +7706,8 @@ static int brcmf_setup_wiphy(struct wiphy *wiphy, struct brcmf_if *ifp)</div><div class='ctx'> 			wiphy_ext_feature_set(wiphy,</div><div class='ctx'> 					      NL80211_EXT_FEATURE_SAE_OFFLOAD_AP);</div><div class='ctx'> 	}</div><div class='add'>+	if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_SAE_EXT))</div><div class='add'>+		wiphy-&gt;features |= NL80211_FEATURE_SAE;</div><div class='ctx'> 	wiphy-&gt;mgmt_stypes = brcmf_txrx_stypes;</div><div class='ctx'> 	wiphy-&gt;max_remain_on_channel_duration = 5000;</div><div class='ctx'> 	if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_PNO)) {</div><div class='hunk'>@@ -7372,13 +7885,6 @@ s32 brcmf_cfg80211_down(struct net_device *ndev)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-enum nl80211_iftype brcmf_cfg80211_get_iftype(struct brcmf_if *ifp)</div><div class='del'>-{</div><div class='del'>-	struct wireless_dev *wdev = &amp;ifp-&gt;vif-&gt;wdev;</div><div class='del'>-</div><div class='del'>-	return wdev-&gt;iftype;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> bool brcmf_get_vif_state_any(struct brcmf_cfg80211_info *cfg,</div><div class='ctx'> 			     unsigned long state)</div><div class='ctx'> {</div><div class='hunk'>@@ -7434,6 +7940,22 @@ int brcmf_cfg80211_wait_vif_event(struct brcmf_cfg80211_info *cfg,</div><div class='ctx'> 				  vif_event_equals(event, action), timeout);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool brmcf_use_iso3166_ccode_fallback(struct brcmf_pub *drvr)</div><div class='add'>+{</div><div class='add'>+	if (drvr-&gt;settings-&gt;trivial_ccode_map)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	switch (drvr-&gt;bus_if-&gt;chip) {</div><div class='add'>+	case BRCM_CC_43430_CHIP_ID:</div><div class='add'>+	case BRCM_CC_4345_CHIP_ID:</div><div class='add'>+	case BRCM_CC_4356_CHIP_ID:</div><div class='add'>+	case BRCM_CC_43602_CHIP_ID:</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static s32 brcmf_translate_country_code(struct brcmf_pub *drvr, char alpha2[2],</div><div class='ctx'> 					struct brcmf_fil_country_le *ccreq)</div><div class='ctx'> {</div><div class='hunk'>@@ -7442,18 +7964,28 @@ static s32 brcmf_translate_country_code(struct brcmf_pub *drvr, char alpha2[2],</div><div class='ctx'> 	s32 found_index;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	country_codes = drvr-&gt;settings-&gt;country_codes;</div><div class='del'>-	if (!country_codes) {</div><div class='del'>-		brcmf_dbg(TRACE, "No country codes configured for device\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if ((alpha2[0] == ccreq-&gt;country_abbrev[0]) &amp;&amp;</div><div class='ctx'> 	    (alpha2[1] == ccreq-&gt;country_abbrev[1])) {</div><div class='ctx'> 		brcmf_dbg(TRACE, "Country code already set\n");</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	country_codes = drvr-&gt;settings-&gt;country_codes;</div><div class='add'>+	if (!country_codes) {</div><div class='add'>+		if (brmcf_use_iso3166_ccode_fallback(drvr)) {</div><div class='add'>+			brcmf_dbg(TRACE, "No country codes configured for device, using ISO3166 code and 0 rev\n");</div><div class='add'>+			memset(ccreq, 0, sizeof(*ccreq));</div><div class='add'>+			ccreq-&gt;country_abbrev[0] = alpha2[0];</div><div class='add'>+			ccreq-&gt;country_abbrev[1] = alpha2[1];</div><div class='add'>+			ccreq-&gt;ccode[0] = alpha2[0];</div><div class='add'>+			ccreq-&gt;ccode[1] = alpha2[1];</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		brcmf_dbg(TRACE, "No country codes configured for device\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	found_index = -1;</div><div class='ctx'> 	for (i = 0; i &lt; country_codes-&gt;table_size; i++) {</div><div class='ctx'> 		cc = &amp;country_codes-&gt;table[i];</div><div class='hunk'>@@ -7480,6 +8012,229 @@ static s32 brcmf_translate_country_code(struct brcmf_pub *drvr, char alpha2[2],</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+brcmf_parse_dump_obss(char *buf, struct brcmf_dump_survey *survey)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	char *token;</div><div class='add'>+	char delim[] = "\n ";</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;buf, delim);</div><div class='add'>+	while (token) {</div><div class='add'>+		if (!strcmp(token, "OBSS")) {</div><div class='add'>+			for (i = 0; i &lt; OBSS_TOKEN_IDX; i++)</div><div class='add'>+				token = strsep(&amp;buf, delim);</div><div class='add'>+			err = kstrtoul(token, 10, &amp;val);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+			survey-&gt;obss = val;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!strcmp(token, "IBSS")) {</div><div class='add'>+			for (i = 0; i &lt; IBSS_TOKEN_IDX; i++)</div><div class='add'>+				token = strsep(&amp;buf, delim);</div><div class='add'>+			err = kstrtoul(token, 10, &amp;val);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+			survey-&gt;ibss = val;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!strcmp(token, "TXDur")) {</div><div class='add'>+			for (i = 0; i &lt; TX_TOKEN_IDX; i++)</div><div class='add'>+				token = strsep(&amp;buf, delim);</div><div class='add'>+			err = kstrtoul(token, 10, &amp;val);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+			survey-&gt;tx = val;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!strcmp(token, "Category")) {</div><div class='add'>+			for (i = 0; i &lt; CTG_TOKEN_IDX; i++)</div><div class='add'>+				token = strsep(&amp;buf, delim);</div><div class='add'>+			err = kstrtoul(token, 10, &amp;val);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+			survey-&gt;no_ctg = val;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!strcmp(token, "Packet")) {</div><div class='add'>+			for (i = 0; i &lt; PKT_TOKEN_IDX; i++)</div><div class='add'>+				token = strsep(&amp;buf, delim);</div><div class='add'>+			err = kstrtoul(token, 10, &amp;val);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+			survey-&gt;no_pckt = val;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!strcmp(token, "Opp(time):")) {</div><div class='add'>+			for (i = 0; i &lt; IDLE_TOKEN_IDX; i++)</div><div class='add'>+				token = strsep(&amp;buf, delim);</div><div class='add'>+			err = kstrtoul(token, 10, &amp;val);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+			survey-&gt;idle = val;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		token = strsep(&amp;buf, delim);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+brcmf_dump_obss(struct brcmf_if *ifp, struct cca_msrmnt_query req,</div><div class='add'>+		struct brcmf_dump_survey *survey)</div><div class='add'>+{</div><div class='add'>+	struct cca_stats_n_flags *results;</div><div class='add'>+	char *buf;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(sizeof(char) * BRCMF_DCMD_MEDLEN, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memcpy(buf, &amp;req, sizeof(struct cca_msrmnt_query));</div><div class='add'>+	err = brcmf_fil_iovar_data_get(ifp, "dump_obss",</div><div class='add'>+				       buf, BRCMF_DCMD_MEDLEN);</div><div class='add'>+	if (err) {</div><div class='add'>+		brcmf_err("dump_obss error (%d)\n", err);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	results = (struct cca_stats_n_flags *)(buf);</div><div class='add'>+</div><div class='add'>+	if (req.msrmnt_query)</div><div class='add'>+		brcmf_parse_dump_obss(results-&gt;buf, survey);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static s32</div><div class='add'>+brcmf_set_channel(struct brcmf_cfg80211_info *cfg, struct ieee80211_channel *chan)</div><div class='add'>+{</div><div class='add'>+	u16 chspec = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+	struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));</div><div class='add'>+</div><div class='add'>+	if (chan-&gt;flags &amp; IEEE80211_CHAN_DISABLED)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* set_channel */</div><div class='add'>+	chspec = channel_to_chanspec(&amp;cfg-&gt;d11inf, chan);</div><div class='add'>+	if (chspec != INVCHANSPEC) {</div><div class='add'>+		err = brcmf_fil_iovar_int_set(ifp, "chanspec", chspec);</div><div class='add'>+		if (err) {</div><div class='add'>+			brcmf_err("set chanspec 0x%04x fail, reason %d\n", chspec, err);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		brcmf_err("failed to convert host chanspec to fw chanspec\n");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+brcmf_cfg80211_dump_survey(struct wiphy *wiphy, struct net_device *ndev,</div><div class='add'>+			   int idx, struct survey_info *info)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);</div><div class='add'>+	struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));</div><div class='add'>+	struct brcmf_dump_survey survey = {};</div><div class='add'>+	struct ieee80211_supported_band *band;</div><div class='add'>+	enum nl80211_band band_id;</div><div class='add'>+	struct cca_msrmnt_query req;</div><div class='add'>+	u32 noise;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(TRACE, "Enter: channel idx=%d\n", idx);</div><div class='add'>+</div><div class='add'>+	/* Do not run survey when VIF in CONNECTING / CONNECTED states */</div><div class='add'>+	if ((test_bit(BRCMF_VIF_STATUS_CONNECTING, &amp;ifp-&gt;vif-&gt;sme_state)) ||</div><div class='add'>+	    (test_bit(BRCMF_VIF_STATUS_CONNECTED, &amp;ifp-&gt;vif-&gt;sme_state))) {</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (band_id = 0; band_id &lt; NUM_NL80211_BANDS; band_id++) {</div><div class='add'>+		band = wiphy-&gt;bands[band_id];</div><div class='add'>+		if (!band)</div><div class='add'>+			continue;</div><div class='add'>+		if (idx &gt;= band-&gt;n_channels) {</div><div class='add'>+			idx -= band-&gt;n_channels;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		info-&gt;channel = &amp;band-&gt;channels[idx];</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (band_id == NUM_NL80211_BANDS)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	/* Setting current channel to the requested channel */</div><div class='add'>+	info-&gt;filled = 0;</div><div class='add'>+	if (brcmf_set_channel(cfg, info-&gt;channel))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Disable mpc */</div><div class='add'>+	brcmf_set_mpc(ifp, 0);</div><div class='add'>+</div><div class='add'>+	/* Set interface up, explicitly. */</div><div class='add'>+	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, 1);</div><div class='add'>+	if (err) {</div><div class='add'>+		brcmf_err("set interface up failed, err = %d\n", err);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get noise value */</div><div class='add'>+	err = brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_PHY_NOISE, &amp;noise);</div><div class='add'>+	if (err) {</div><div class='add'>+		brcmf_err("Get Phy Noise failed, use dummy value\n");</div><div class='add'>+		noise = CHAN_NOISE_DUMMY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Start Measurement for obss stats on current channel */</div><div class='add'>+	req.msrmnt_query = 0;</div><div class='add'>+	req.time_req = ACS_MSRMNT_DELAY;</div><div class='add'>+	err = brcmf_dump_obss(ifp, req, &amp;survey);</div><div class='add'>+	if (err)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	/* Add 10 ms for IOVAR completion */</div><div class='add'>+	msleep(ACS_MSRMNT_DELAY + 10);</div><div class='add'>+</div><div class='add'>+	/* Issue IOVAR to collect measurement results */</div><div class='add'>+	req.msrmnt_query = 1;</div><div class='add'>+	err = brcmf_dump_obss(ifp, req, &amp;survey);</div><div class='add'>+	if (err)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	info-&gt;noise = noise;</div><div class='add'>+	info-&gt;time = ACS_MSRMNT_DELAY;</div><div class='add'>+	info-&gt;time_busy = ACS_MSRMNT_DELAY - survey.idle;</div><div class='add'>+	info-&gt;time_rx = survey.obss + survey.ibss + survey.no_ctg +</div><div class='add'>+		survey.no_pckt;</div><div class='add'>+	info-&gt;time_tx = survey.tx;</div><div class='add'>+	info-&gt;filled = SURVEY_INFO_NOISE_DBM | SURVEY_INFO_TIME |</div><div class='add'>+		SURVEY_INFO_TIME_BUSY | SURVEY_INFO_TIME_RX |</div><div class='add'>+		SURVEY_INFO_TIME_TX;</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(INFO, "OBSS dump: channel %d: survey duration %d\n",</div><div class='add'>+		  ieee80211_frequency_to_channel(info-&gt;channel-&gt;center_freq),</div><div class='add'>+		  ACS_MSRMNT_DELAY);</div><div class='add'>+	brcmf_dbg(INFO, "noise(%d) busy(%llu) rx(%llu) tx(%llu)\n",</div><div class='add'>+		  info-&gt;noise, info-&gt;time_busy, info-&gt;time_rx, info-&gt;time_tx);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	if (!brcmf_is_apmode(ifp-&gt;vif))</div><div class='add'>+		brcmf_set_mpc(ifp, 1);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void brcmf_cfg80211_reg_notifier(struct wiphy *wiphy,</div><div class='ctx'> 					struct regulatory_request *req)</div><div class='ctx'> {</div><div class='hunk'>@@ -7605,7 +8360,7 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,</div><div class='ctx'> 	cfg-&gt;d11inf.io_type = (u8)io_type;</div><div class='ctx'> 	brcmu_d11_attach(&amp;cfg-&gt;d11inf);</div><div class='ctx'> </div><div class='del'>-	/* regulatory notifer below needs access to cfg so</div><div class='add'>+	/* regulatory notifier below needs access to cfg so</div><div class='ctx'> 	 * assign it now.</div><div class='ctx'> 	 */</div><div class='ctx'> 	drvr-&gt;config = cfg;</div><div class='hunk'>@@ -7631,6 +8386,9 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,</div><div class='ctx'> 	if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_WOWL_GTK))</div><div class='ctx'> 		ops-&gt;set_rekey_data = brcmf_cfg80211_set_rekey_data;</div><div class='ctx'> #endif</div><div class='add'>+	if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_DUMP_OBSS))</div><div class='add'>+		ops-&gt;dump_survey = brcmf_cfg80211_dump_survey;</div><div class='add'>+</div><div class='ctx'> 	err = wiphy_register(wiphy);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		bphy_err(drvr, "Could not register wiphy device (%d)\n", err);</div><div class='hunk'>@@ -7735,6 +8493,7 @@ void brcmf_cfg80211_detach(struct brcmf_cfg80211_info *cfg)</div><div class='ctx'> 	brcmf_btcoex_detach(cfg);</div><div class='ctx'> 	wiphy_unregister(cfg-&gt;wiphy);</div><div class='ctx'> 	wl_deinit_priv(cfg);</div><div class='add'>+	cancel_work_sync(&amp;cfg-&gt;escan_timeout_work);</div><div class='ctx'> 	brcmf_free_wiphy(cfg-&gt;wiphy);</div><div class='ctx'> 	kfree(cfg);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h<br/>index e90a30808c22..273c80f2d483 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h</a></div><div class='hunk'>@@ -13,6 +13,8 @@</div><div class='ctx'> #include "fwil_types.h"</div><div class='ctx'> #include "p2p.h"</div><div class='ctx'> </div><div class='add'>+#define	DOT11_MGMT_HDR_LEN		24	/* d11 management header len */</div><div class='add'>+</div><div class='ctx'> #define BRCMF_SCAN_IE_LEN_MAX		2048</div><div class='ctx'> </div><div class='ctx'> #define WL_NUM_SCAN_MAX			10</div><div class='hunk'>@@ -142,6 +144,21 @@ enum brcmf_profile_fwauth {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * enum brcmf_mgmt_tx_status - mgmt frame tx status</div><div class='add'>+ *</div><div class='add'>+ * @BRCMF_MGMT_TX_ACK: mgmt frame acked</div><div class='add'>+ * @BRCMF_MGMT_TX_NOACK: mgmt frame not acked</div><div class='add'>+ * @BRCMF_MGMT_TX_OFF_CHAN_COMPLETED: off-channel complete</div><div class='add'>+ * @BRCMF_MGMT_TX_SEND_FRAME: mgmt frame tx is in progres</div><div class='add'>+ */</div><div class='add'>+enum brcmf_mgmt_tx_status {</div><div class='add'>+	BRCMF_MGMT_TX_ACK,</div><div class='add'>+	BRCMF_MGMT_TX_NOACK,</div><div class='add'>+	BRCMF_MGMT_TX_OFF_CHAN_COMPLETED,</div><div class='add'>+	BRCMF_MGMT_TX_SEND_FRAME</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct brcmf_cfg80211_profile - profile information.</div><div class='ctx'>  *</div><div class='ctx'>  * @bssid: bssid of joined/joining ibss.</div><div class='hunk'>@@ -211,6 +228,9 @@ struct vif_saved_ie {</div><div class='ctx'>  * @profile: profile information.</div><div class='ctx'>  * @sme_state: SME state using enum brcmf_vif_status bits.</div><div class='ctx'>  * @list: linked list.</div><div class='add'>+ * @mgmt_tx: completion for management frame transmit.</div><div class='add'>+ * @mgmt_tx_status: status of last management frame sent to firmware.</div><div class='add'>+ * @mgmt_tx_id:</div><div class='ctx'>  * @mgmt_rx_reg: registered rx mgmt frame types.</div><div class='ctx'>  * @mbss: Multiple BSS type, set if not first AP (not relevant for P2P).</div><div class='ctx'>  * @cqm_rssi_low: Lower RSSI limit for CQM monitoring</div><div class='hunk'>@@ -224,6 +244,9 @@ struct brcmf_cfg80211_vif {</div><div class='ctx'> 	unsigned long sme_state;</div><div class='ctx'> 	struct vif_saved_ie saved_ie;</div><div class='ctx'> 	struct list_head list;</div><div class='add'>+	struct completion mgmt_tx;</div><div class='add'>+	unsigned long mgmt_tx_status;</div><div class='add'>+	u32 mgmt_tx_id;</div><div class='ctx'> 	u16 mgmt_rx_reg;</div><div class='ctx'> 	bool mbss;</div><div class='ctx'> 	int is_11d;</div><div class='hunk'>@@ -383,7 +406,7 @@ struct brcmf_cfg80211_info {</div><div class='ctx'> struct brcmf_tlv {</div><div class='ctx'> 	u8 id;</div><div class='ctx'> 	u8 len;</div><div class='del'>-	u8 data[1];</div><div class='add'>+	u8 data[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct wiphy *cfg_to_wiphy(struct brcmf_cfg80211_info *cfg)</div><div class='hunk'>@@ -443,7 +466,6 @@ void brcmf_cfg80211_detach(struct brcmf_cfg80211_info *cfg);</div><div class='ctx'> s32 brcmf_cfg80211_up(struct net_device *ndev);</div><div class='ctx'> s32 brcmf_cfg80211_down(struct net_device *ndev);</div><div class='ctx'> struct cfg80211_ops *brcmf_cfg80211_get_ops(struct brcmf_mp_device *settings);</div><div class='del'>-enum nl80211_iftype brcmf_cfg80211_get_iftype(struct brcmf_if *ifp);</div><div class='ctx'> </div><div class='ctx'> struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg,</div><div class='ctx'> 					   enum nl80211_iftype type);</div><div class='hunk'>@@ -465,7 +487,12 @@ s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,</div><div class='ctx'> 				struct brcmf_if *ifp, bool aborted,</div><div class='ctx'> 				bool fw_abort);</div><div class='ctx'> void brcmf_set_mpc(struct brcmf_if *ndev, int mpc);</div><div class='add'>+bool brcmf_is_apmode_operating(struct wiphy *wiphy);</div><div class='ctx'> void brcmf_abort_scanning(struct brcmf_cfg80211_info *cfg);</div><div class='ctx'> void brcmf_cfg80211_free_netdev(struct net_device *ndev);</div><div class='ctx'> </div><div class='add'>+int brcmf_set_wsec(struct brcmf_if *ifp, const u8 *key, u16 key_len, u16 flags);</div><div class='add'>+int brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,</div><div class='add'>+			   struct cfg80211_mgmt_tx_params *params, u64 *cookie);</div><div class='add'>+</div><div class='ctx'> #endif /* BRCMFMAC_CFG80211_H */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c<br/>index 45037decba40..4239f2b21e54 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c</a></div><div class='hunk'>@@ -139,6 +139,8 @@ struct sbconfig {</div><div class='ctx'> 	u32 sbidhigh;	/* identification */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define INVALID_RAMBASE			((u32)(~0))</div><div class='add'>+</div><div class='ctx'> /* bankidx and bankinfo reg defines corerev &gt;= 8 */</div><div class='ctx'> #define SOCRAM_BANKINFO_RETNTRAM_MASK	0x00010000</div><div class='ctx'> #define SOCRAM_BANKINFO_SZMASK		0x0000007f</div><div class='hunk'>@@ -210,8 +212,9 @@ struct sbsocramregs {</div><div class='ctx'> #define	ARMCR4_TCBANB_MASK	0xf</div><div class='ctx'> #define	ARMCR4_TCBANB_SHIFT	0</div><div class='ctx'> </div><div class='del'>-#define	ARMCR4_BSZ_MASK		0x3f</div><div class='add'>+#define	ARMCR4_BSZ_MASK		0x7f</div><div class='ctx'> #define	ARMCR4_BSZ_MULT		8192</div><div class='add'>+#define	ARMCR4_BLK_1K_MASK	0x200</div><div class='ctx'> </div><div class='ctx'> struct brcmf_core_priv {</div><div class='ctx'> 	struct brcmf_core pub;</div><div class='hunk'>@@ -527,7 +530,7 @@ static int brcmf_chip_cores_check(struct brcmf_chip_priv *ci)</div><div class='ctx'> 	int idx = 1;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(core, &amp;ci-&gt;cores, list) {</div><div class='del'>-		brcmf_dbg(INFO, " [%-2d] core 0x%x:%-2d base 0x%08x wrap 0x%08x\n",</div><div class='add'>+		brcmf_dbg(INFO, " [%-2d] core 0x%x:%-3d base 0x%08x wrap 0x%08x\n",</div><div class='ctx'> 			  idx++, core-&gt;pub.id, core-&gt;pub.rev, core-&gt;pub.base,</div><div class='ctx'> 			  core-&gt;wrapbase);</div><div class='ctx'> </div><div class='hunk'>@@ -639,6 +642,7 @@ static void brcmf_chip_socram_ramsize(struct brcmf_core_priv *sr, u32 *ramsize,</div><div class='ctx'> 			*srsize = (32 * 1024);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BRCM_CC_43430_CHIP_ID:</div><div class='add'>+	case CY_CC_43439_CHIP_ID:</div><div class='ctx'> 		/* assume sr for now as we can not check</div><div class='ctx'> 		 * firmware sr capability at this point.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -681,6 +685,7 @@ static u32 brcmf_chip_tcm_ramsize(struct brcmf_core_priv *cr4)</div><div class='ctx'> 	u32 nbb;</div><div class='ctx'> 	u32 totb;</div><div class='ctx'> 	u32 bxinfo;</div><div class='add'>+	u32 blksize;</div><div class='ctx'> 	u32 idx;</div><div class='ctx'> </div><div class='ctx'> 	corecap = brcmf_chip_core_read32(cr4, ARMCR4_CAP);</div><div class='hunk'>@@ -692,7 +697,11 @@ static u32 brcmf_chip_tcm_ramsize(struct brcmf_core_priv *cr4)</div><div class='ctx'> 	for (idx = 0; idx &lt; totb; idx++) {</div><div class='ctx'> 		brcmf_chip_core_write32(cr4, ARMCR4_BANKIDX, idx);</div><div class='ctx'> 		bxinfo = brcmf_chip_core_read32(cr4, ARMCR4_BANKINFO);</div><div class='del'>-		memsize += ((bxinfo &amp; ARMCR4_BSZ_MASK) + 1) * ARMCR4_BSZ_MULT;</div><div class='add'>+		blksize = ARMCR4_BSZ_MULT;</div><div class='add'>+		if (bxinfo &amp; ARMCR4_BLK_1K_MASK)</div><div class='add'>+			blksize &gt;&gt;= 3;</div><div class='add'>+</div><div class='add'>+		memsize += ((bxinfo &amp; ARMCR4_BSZ_MASK) + 1) * blksize;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return memsize;</div><div class='hunk'>@@ -702,6 +711,7 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci)</div><div class='ctx'> {</div><div class='ctx'> 	switch (ci-&gt;pub.chip) {</div><div class='ctx'> 	case BRCM_CC_4345_CHIP_ID:</div><div class='add'>+	case BRCM_CC_43454_CHIP_ID:</div><div class='ctx'> 		return 0x198000;</div><div class='ctx'> 	case BRCM_CC_4335_CHIP_ID:</div><div class='ctx'> 	case BRCM_CC_4339_CHIP_ID:</div><div class='hunk'>@@ -722,16 +732,25 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci)</div><div class='ctx'> 	case BRCM_CC_43664_CHIP_ID:</div><div class='ctx'> 	case BRCM_CC_43666_CHIP_ID:</div><div class='ctx'> 		return 0x200000;</div><div class='add'>+	case BRCM_CC_4355_CHIP_ID:</div><div class='ctx'> 	case BRCM_CC_4359_CHIP_ID:</div><div class='ctx'> 		return (ci-&gt;pub.chiprev &lt; 9) ? 0x180000 : 0x160000;</div><div class='ctx'> 	case BRCM_CC_4364_CHIP_ID:</div><div class='ctx'> 	case CY_CC_4373_CHIP_ID:</div><div class='ctx'> 		return 0x160000;</div><div class='add'>+	case BRCM_CC_43751_CHIP_ID:</div><div class='add'>+	case BRCM_CC_43752_CHIP_ID:</div><div class='add'>+	case BRCM_CC_4377_CHIP_ID:</div><div class='add'>+		return 0x170000;</div><div class='add'>+	case BRCM_CC_4378_CHIP_ID:</div><div class='add'>+		return 0x352000;</div><div class='add'>+	case BRCM_CC_4387_CHIP_ID:</div><div class='add'>+		return 0x740000;</div><div class='ctx'> 	default:</div><div class='ctx'> 		brcmf_err("unknown chip: %s\n", ci-&gt;pub.name);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	return INVALID_RAMBASE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int brcmf_chip_get_raminfo(struct brcmf_chip *pub)</div><div class='hunk'>@@ -746,7 +765,7 @@ int brcmf_chip_get_raminfo(struct brcmf_chip *pub)</div><div class='ctx'> 		mem_core = container_of(mem, struct brcmf_core_priv, pub);</div><div class='ctx'> 		ci-&gt;pub.ramsize = brcmf_chip_tcm_ramsize(mem_core);</div><div class='ctx'> 		ci-&gt;pub.rambase = brcmf_chip_tcm_rambase(ci);</div><div class='del'>-		if (!ci-&gt;pub.rambase) {</div><div class='add'>+		if (ci-&gt;pub.rambase == INVALID_RAMBASE) {</div><div class='ctx'> 			brcmf_err("RAM base not provided with ARM CR4 core\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -757,7 +776,7 @@ int brcmf_chip_get_raminfo(struct brcmf_chip *pub)</div><div class='ctx'> 						pub);</div><div class='ctx'> 			ci-&gt;pub.ramsize = brcmf_chip_sysmem_ramsize(mem_core);</div><div class='ctx'> 			ci-&gt;pub.rambase = brcmf_chip_tcm_rambase(ci);</div><div class='del'>-			if (!ci-&gt;pub.rambase) {</div><div class='add'>+			if (ci-&gt;pub.rambase == INVALID_RAMBASE) {</div><div class='ctx'> 				brcmf_err("RAM base not provided with ARM CA7 core\n");</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -894,7 +913,8 @@ int brcmf_chip_dmp_erom_scan(struct brcmf_chip_priv *ci)</div><div class='ctx'> 	u32 base, wrap;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	eromaddr = ci-&gt;ops-&gt;read32(ci-&gt;ctx, CORE_CC_REG(SI_ENUM_BASE, eromptr));</div><div class='add'>+	eromaddr = ci-&gt;ops-&gt;read32(ci-&gt;ctx,</div><div class='add'>+				   CORE_CC_REG(ci-&gt;pub.enum_base, eromptr));</div><div class='ctx'> </div><div class='ctx'> 	while (desc_type != DMP_DESC_EOT) {</div><div class='ctx'> 		val = brcmf_chip_dmp_get_desc(ci, &amp;eromaddr, &amp;desc_type);</div><div class='hunk'>@@ -942,19 +962,31 @@ int brcmf_chip_dmp_erom_scan(struct brcmf_chip_priv *ci)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+u32 brcmf_chip_enum_base(u16 devid)</div><div class='add'>+{</div><div class='add'>+	return SI_ENUM_BASE_DEFAULT;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int brcmf_chip_recognition(struct brcmf_chip_priv *ci)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_core *core;</div><div class='ctx'> 	u32 regdata;</div><div class='ctx'> 	u32 socitype;</div><div class='ctx'> 	int ret;</div><div class='add'>+	const u32 READ_FAILED = 0xFFFFFFFF;</div><div class='ctx'> </div><div class='ctx'> 	/* Get CC core rev</div><div class='ctx'> 	 * Chipid is assume to be at offset 0 from SI_ENUM_BASE</div><div class='ctx'> 	 * For different chiptypes or old sdio hosts w/o chipcommon,</div><div class='ctx'> 	 * other ways of recognition should be added here.</div><div class='ctx'> 	 */</div><div class='del'>-	regdata = ci-&gt;ops-&gt;read32(ci-&gt;ctx, CORE_CC_REG(SI_ENUM_BASE, chipid));</div><div class='add'>+	regdata = ci-&gt;ops-&gt;read32(ci-&gt;ctx,</div><div class='add'>+				  CORE_CC_REG(ci-&gt;pub.enum_base, chipid));</div><div class='add'>+	if (regdata == READ_FAILED) {</div><div class='add'>+		brcmf_err("MMIO read failed: 0x%08x\n", regdata);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ci-&gt;pub.chip = regdata &amp; CID_ID_MASK;</div><div class='ctx'> 	ci-&gt;pub.chiprev = (regdata &amp; CID_REV_MASK) &gt;&gt; CID_REV_SHIFT;</div><div class='ctx'> 	socitype = (regdata &amp; CID_TYPE_MASK) &gt;&gt; CID_TYPE_SHIFT;</div><div class='hunk'>@@ -974,7 +1006,7 @@ static int brcmf_chip_recognition(struct brcmf_chip_priv *ci)</div><div class='ctx'> 		ci-&gt;resetcore = brcmf_chip_sb_resetcore;</div><div class='ctx'> </div><div class='ctx'> 		core = brcmf_chip_add_core(ci, BCMA_CORE_CHIPCOMMON,</div><div class='del'>-					   SI_ENUM_BASE, 0);</div><div class='add'>+					   SI_ENUM_BASE_DEFAULT, 0);</div><div class='ctx'> 		brcmf_chip_sb_corerev(ci, core);</div><div class='ctx'> 		core = brcmf_chip_add_core(ci, BCMA_CORE_SDIO_DEV,</div><div class='ctx'> 					   BCM4329_CORE_BUS_BASE, 0);</div><div class='hunk'>@@ -1088,7 +1120,7 @@ static int brcmf_chip_setup(struct brcmf_chip_priv *chip)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct brcmf_chip *brcmf_chip_attach(void *ctx,</div><div class='add'>+struct brcmf_chip *brcmf_chip_attach(void *ctx, u16 devid,</div><div class='ctx'> 				     const struct brcmf_buscore_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_chip_priv *chip;</div><div class='hunk'>@@ -1113,6 +1145,7 @@ struct brcmf_chip *brcmf_chip_attach(void *ctx,</div><div class='ctx'> 	chip-&gt;num_cores = 0;</div><div class='ctx'> 	chip-&gt;ops = ops;</div><div class='ctx'> 	chip-&gt;ctx = ctx;</div><div class='add'>+	chip-&gt;pub.enum_base = brcmf_chip_enum_base(devid);</div><div class='ctx'> </div><div class='ctx'> 	err = ops-&gt;prepare(ctx);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -1245,7 +1278,8 @@ brcmf_chip_cm3_set_passive(struct brcmf_chip_priv *chip)</div><div class='ctx'> 	brcmf_chip_resetcore(core, 0, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* disable bank #3 remap for this device */</div><div class='del'>-	if (chip-&gt;pub.chip == BRCM_CC_43430_CHIP_ID) {</div><div class='add'>+	if (chip-&gt;pub.chip == BRCM_CC_43430_CHIP_ID ||</div><div class='add'>+	    chip-&gt;pub.chip == CY_CC_43439_CHIP_ID) {</div><div class='ctx'> 		sr = container_of(core, struct brcmf_core_priv, pub);</div><div class='ctx'> 		brcmf_chip_core_write32(sr, SOCRAMREGOFFS(bankidx), 3);</div><div class='ctx'> 		brcmf_chip_core_write32(sr, SOCRAMREGOFFS(bankpda), 0);</div><div class='hunk'>@@ -1273,15 +1307,18 @@ static bool brcmf_chip_cm3_set_active(struct brcmf_chip_priv *chip)</div><div class='ctx'> static inline void</div><div class='ctx'> brcmf_chip_cr4_set_passive(struct brcmf_chip_priv *chip)</div><div class='ctx'> {</div><div class='add'>+	int i;</div><div class='ctx'> 	struct brcmf_core *core;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_chip_disable_arm(chip, BCMA_CORE_ARM_CR4);</div><div class='ctx'> </div><div class='del'>-	core = brcmf_chip_get_core(&amp;chip-&gt;pub, BCMA_CORE_80211);</div><div class='del'>-	brcmf_chip_resetcore(core, D11_BCMA_IOCTL_PHYRESET |</div><div class='del'>-				   D11_BCMA_IOCTL_PHYCLOCKEN,</div><div class='del'>-			     D11_BCMA_IOCTL_PHYCLOCKEN,</div><div class='del'>-			     D11_BCMA_IOCTL_PHYCLOCKEN);</div><div class='add'>+	/* Disable the cores only and let the firmware enable them.</div><div class='add'>+	 * Releasing reset ourselves breaks BCM4387 in weird ways.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; (core = brcmf_chip_get_d11core(&amp;chip-&gt;pub, i)); i++)</div><div class='add'>+		brcmf_chip_coredisable(core, D11_BCMA_IOCTL_PHYRESET |</div><div class='add'>+				       D11_BCMA_IOCTL_PHYCLOCKEN,</div><div class='add'>+				       D11_BCMA_IOCTL_PHYCLOCKEN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool brcmf_chip_cr4_set_active(struct brcmf_chip_priv *chip, u32 rstvec)</div><div class='hunk'>@@ -1389,6 +1426,7 @@ bool brcmf_chip_sr_capable(struct brcmf_chip *pub)</div><div class='ctx'> 	case BRCM_CC_4354_CHIP_ID:</div><div class='ctx'> 	case BRCM_CC_4356_CHIP_ID:</div><div class='ctx'> 	case BRCM_CC_4345_CHIP_ID:</div><div class='add'>+	case BRCM_CC_43454_CHIP_ID:</div><div class='ctx'> 		/* explicitly check SR engine enable bit */</div><div class='ctx'> 		pmu_cc3_mask = BIT(2);</div><div class='ctx'> 		fallthrough;</div><div class='hunk'>@@ -1402,15 +1440,19 @@ bool brcmf_chip_sr_capable(struct brcmf_chip *pub)</div><div class='ctx'> 		reg = chip-&gt;ops-&gt;read32(chip-&gt;ctx, addr);</div><div class='ctx'> 		return (reg &amp; pmu_cc3_mask) != 0;</div><div class='ctx'> 	case BRCM_CC_43430_CHIP_ID:</div><div class='add'>+	case CY_CC_43439_CHIP_ID:</div><div class='ctx'> 		addr = CORE_CC_REG(base, sr_control1);</div><div class='ctx'> 		reg = chip-&gt;ops-&gt;read32(chip-&gt;ctx, addr);</div><div class='ctx'> 		return reg != 0;</div><div class='add'>+	case BRCM_CC_4355_CHIP_ID:</div><div class='ctx'> 	case CY_CC_4373_CHIP_ID:</div><div class='ctx'> 		/* explicitly check SR engine enable bit */</div><div class='ctx'> 		addr = CORE_CC_REG(base, sr_control0);</div><div class='ctx'> 		reg = chip-&gt;ops-&gt;read32(chip-&gt;ctx, addr);</div><div class='ctx'> 		return (reg &amp; CC_SR_CTL0_ENABLE_MASK) != 0;</div><div class='ctx'> 	case BRCM_CC_4359_CHIP_ID:</div><div class='add'>+	case BRCM_CC_43751_CHIP_ID:</div><div class='add'>+	case BRCM_CC_43752_CHIP_ID:</div><div class='ctx'> 	case CY_CC_43012_CHIP_ID:</div><div class='ctx'> 		addr = CORE_CC_REG(pmu-&gt;base, retention_ctl);</div><div class='ctx'> 		reg = chip-&gt;ops-&gt;read32(chip-&gt;ctx, addr);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h<br/>index 8fa38658e727..d69f101f5834 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @chip: chip identifier.</div><div class='ctx'>  * @chiprev: chip revision.</div><div class='add'>+ * @enum_base: base address of core enumeration space.</div><div class='ctx'>  * @cc_caps: chipcommon core capabilities.</div><div class='ctx'>  * @cc_caps_ext: chipcommon core extended capabilities.</div><div class='ctx'>  * @pmucaps: PMU capabilities.</div><div class='hunk'>@@ -27,6 +28,7 @@</div><div class='ctx'> struct brcmf_chip {</div><div class='ctx'> 	u32 chip;</div><div class='ctx'> 	u32 chiprev;</div><div class='add'>+	u32 enum_base;</div><div class='ctx'> 	u32 cc_caps;</div><div class='ctx'> 	u32 cc_caps_ext;</div><div class='ctx'> 	u32 pmucaps;</div><div class='hunk'>@@ -70,7 +72,7 @@ struct brcmf_buscore_ops {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int brcmf_chip_get_raminfo(struct brcmf_chip *pub);</div><div class='del'>-struct brcmf_chip *brcmf_chip_attach(void *ctx,</div><div class='add'>+struct brcmf_chip *brcmf_chip_attach(void *ctx, u16 devid,</div><div class='ctx'> 				     const struct brcmf_buscore_ops *ops);</div><div class='ctx'> void brcmf_chip_detach(struct brcmf_chip *chip);</div><div class='ctx'> struct brcmf_core *brcmf_chip_get_core(struct brcmf_chip *chip, u16 coreid);</div><div class='hunk'>@@ -85,5 +87,6 @@ void brcmf_chip_set_passive(struct brcmf_chip *ci);</div><div class='ctx'> bool brcmf_chip_set_active(struct brcmf_chip *ci, u32 rstvec);</div><div class='ctx'> bool brcmf_chip_sr_capable(struct brcmf_chip *pub);</div><div class='ctx'> char *brcmf_chip_name(u32 chipid, u32 chiprev, char *buf, uint len);</div><div class='add'>+u32 brcmf_chip_enum_base(u16 devid);</div><div class='ctx'> </div><div class='ctx'> #endif /* BRCMF_AXIDMP_H */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c<br/>index e3758bd86acf..688f16c51319 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c</a></div><div class='hunk'>@@ -101,7 +101,7 @@ void brcmf_c_set_joinpref_default(struct brcmf_if *ifp)</div><div class='ctx'> </div><div class='ctx'> static int brcmf_c_download(struct brcmf_if *ifp, u16 flag,</div><div class='ctx'> 			    struct brcmf_dload_data_le *dload_buf,</div><div class='del'>-			    u32 len)</div><div class='add'>+			    u32 len, const char *var)</div><div class='ctx'> {</div><div class='ctx'> 	s32 err;</div><div class='ctx'> </div><div class='hunk'>@@ -110,20 +110,19 @@ static int brcmf_c_download(struct brcmf_if *ifp, u16 flag,</div><div class='ctx'> 	dload_buf-&gt;dload_type = cpu_to_le16(DL_TYPE_CLM);</div><div class='ctx'> 	dload_buf-&gt;len = cpu_to_le32(len);</div><div class='ctx'> 	dload_buf-&gt;crc = cpu_to_le32(0);</div><div class='del'>-	len = sizeof(*dload_buf) + len - 1;</div><div class='ctx'> </div><div class='del'>-	err = brcmf_fil_iovar_data_set(ifp, "clmload", dload_buf, len);</div><div class='add'>+	err = brcmf_fil_iovar_data_set(ifp, var, dload_buf,</div><div class='add'>+				       struct_size(dload_buf, data, len));</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int brcmf_c_process_clm_blob(struct brcmf_if *ifp)</div><div class='add'>+static int brcmf_c_download_blob(struct brcmf_if *ifp,</div><div class='add'>+				 const void *data, size_t size,</div><div class='add'>+				 const char *loadvar, const char *statvar)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='del'>-	struct brcmf_bus *bus = drvr-&gt;bus_if;</div><div class='ctx'> 	struct brcmf_dload_data_le *chunk_buf;</div><div class='del'>-	const struct firmware *clm = NULL;</div><div class='del'>-	u8 clm_name[BRCMF_FW_NAME_LEN];</div><div class='ctx'> 	u32 chunk_len;</div><div class='ctx'> 	u32 datalen;</div><div class='ctx'> 	u32 cumulative_len;</div><div class='hunk'>@@ -133,27 +132,14 @@ static int brcmf_c_process_clm_blob(struct brcmf_if *ifp)</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='del'>-	memset(clm_name, 0, sizeof(clm_name));</div><div class='del'>-	err = brcmf_bus_get_fwname(bus, ".clm_blob", clm_name);</div><div class='del'>-	if (err) {</div><div class='del'>-		bphy_err(drvr, "get CLM blob file name failed (%d)\n", err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = firmware_request_nowarn(&amp;clm, clm_name, bus-&gt;dev);</div><div class='del'>-	if (err) {</div><div class='del'>-		brcmf_info("no clm_blob available (err=%d), device may have limited channels available\n",</div><div class='del'>-			   err);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	chunk_buf = kzalloc(sizeof(*chunk_buf) + MAX_CHUNK_LEN - 1, GFP_KERNEL);</div><div class='add'>+	chunk_buf = kzalloc(struct_size(chunk_buf, data, MAX_CHUNK_LEN),</div><div class='add'>+			    GFP_KERNEL);</div><div class='ctx'> 	if (!chunk_buf) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		goto done;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	datalen = clm-&gt;size;</div><div class='add'>+	datalen = size;</div><div class='ctx'> 	cumulative_len = 0;</div><div class='ctx'> 	do {</div><div class='ctx'> 		if (datalen &gt; MAX_CHUNK_LEN) {</div><div class='hunk'>@@ -162,9 +148,10 @@ static int brcmf_c_process_clm_blob(struct brcmf_if *ifp)</div><div class='ctx'> 			chunk_len = datalen;</div><div class='ctx'> 			dl_flag |= DL_END;</div><div class='ctx'> 		}</div><div class='del'>-		memcpy(chunk_buf-&gt;data, clm-&gt;data + cumulative_len, chunk_len);</div><div class='add'>+		memcpy(chunk_buf-&gt;data, data + cumulative_len, chunk_len);</div><div class='ctx'> </div><div class='del'>-		err = brcmf_c_download(ifp, dl_flag, chunk_buf, chunk_len);</div><div class='add'>+		err = brcmf_c_download(ifp, dl_flag, chunk_buf, chunk_len,</div><div class='add'>+				       loadvar);</div><div class='ctx'> </div><div class='ctx'> 		dl_flag &amp;= ~DL_BEGIN;</div><div class='ctx'> </div><div class='hunk'>@@ -173,27 +160,113 @@ static int brcmf_c_process_clm_blob(struct brcmf_if *ifp)</div><div class='ctx'> 	} while ((datalen &gt; 0) &amp;&amp; (err == 0));</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='del'>-		bphy_err(drvr, "clmload (%zu byte file) failed (%d)\n",</div><div class='del'>-			 clm-&gt;size, err);</div><div class='del'>-		/* Retrieve clmload_status and print */</div><div class='del'>-		err = brcmf_fil_iovar_int_get(ifp, "clmload_status", &amp;status);</div><div class='add'>+		bphy_err(drvr, "%s (%zu byte file) failed (%d)\n",</div><div class='add'>+			 loadvar, size, err);</div><div class='add'>+		/* Retrieve status and print */</div><div class='add'>+		err = brcmf_fil_iovar_int_get(ifp, statvar, &amp;status);</div><div class='ctx'> 		if (err)</div><div class='del'>-			bphy_err(drvr, "get clmload_status failed (%d)\n", err);</div><div class='add'>+			bphy_err(drvr, "get %s failed (%d)\n", statvar, err);</div><div class='ctx'> 		else</div><div class='del'>-			brcmf_dbg(INFO, "clmload_status=%d\n", status);</div><div class='add'>+			brcmf_dbg(INFO, "%s=%d\n", statvar, status);</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(chunk_buf);</div><div class='del'>-done:</div><div class='del'>-	release_firmware(clm);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int brcmf_c_process_clm_blob(struct brcmf_if *ifp)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='add'>+	struct brcmf_bus *bus = drvr-&gt;bus_if;</div><div class='add'>+	const struct firmware *fw = NULL;</div><div class='add'>+	s32 err;</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(TRACE, "Enter\n");</div><div class='add'>+</div><div class='add'>+	err = brcmf_bus_get_blob(bus, &amp;fw, BRCMF_BLOB_CLM);</div><div class='add'>+	if (err || !fw) {</div><div class='add'>+		brcmf_info("no clm_blob available (err=%d), device may have limited channels available\n",</div><div class='add'>+			   err);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = brcmf_c_download_blob(ifp, fw-&gt;data, fw-&gt;size,</div><div class='add'>+				    "clmload", "clmload_status");</div><div class='add'>+</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int brcmf_c_process_txcap_blob(struct brcmf_if *ifp)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='add'>+	struct brcmf_bus *bus = drvr-&gt;bus_if;</div><div class='add'>+	const struct firmware *fw = NULL;</div><div class='add'>+	s32 err;</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(TRACE, "Enter\n");</div><div class='add'>+</div><div class='add'>+	err = brcmf_bus_get_blob(bus, &amp;fw, BRCMF_BLOB_TXCAP);</div><div class='add'>+	if (err || !fw) {</div><div class='add'>+		brcmf_info("no txcap_blob available (err=%d)\n", err);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	brcmf_info("TxCap blob found, loading\n");</div><div class='add'>+	err = brcmf_c_download_blob(ifp, fw-&gt;data, fw-&gt;size,</div><div class='add'>+				    "txcapload", "txcapload_status");</div><div class='add'>+</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int brcmf_c_set_cur_etheraddr(struct brcmf_if *ifp, const u8 *addr)</div><div class='add'>+{</div><div class='add'>+	s32 err;</div><div class='add'>+</div><div class='add'>+	err = brcmf_fil_iovar_data_set(ifp, "cur_etheraddr", addr, ETH_ALEN);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		bphy_err(ifp-&gt;drvr, "Setting cur_etheraddr failed, %d\n", err);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* On some boards there is no eeprom to hold the nvram, in this case instead</div><div class='add'>+ * a board specific nvram is loaded from /lib/firmware. On most boards the</div><div class='add'>+ * macaddr setting in the /lib/firmware nvram file is ignored because the</div><div class='add'>+ * wifibt chip has a unique MAC programmed into the chip itself.</div><div class='add'>+ * But in some cases the actual MAC from the /lib/firmware nvram file gets</div><div class='add'>+ * used, leading to MAC conflicts.</div><div class='add'>+ * The MAC addresses in the troublesome nvram files seem to all come from</div><div class='add'>+ * the same nvram file template, so we only need to check for 1 known</div><div class='add'>+ * address to detect this.</div><div class='add'>+ */</div><div class='add'>+static const u8 brcmf_default_mac_address[ETH_ALEN] = {</div><div class='add'>+	0x00, 0x90, 0x4c, 0xc5, 0x12, 0x38</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int brcmf_c_process_cal_blob(struct brcmf_if *ifp)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='add'>+	struct brcmf_mp_device *settings = drvr-&gt;settings;</div><div class='add'>+	s32 err;</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(TRACE, "Enter\n");</div><div class='add'>+</div><div class='add'>+	if (!settings-&gt;cal_blob || !settings-&gt;cal_size)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	brcmf_info("Calibration blob provided by platform, loading\n");</div><div class='add'>+	err = brcmf_c_download_blob(ifp, settings-&gt;cal_blob, settings-&gt;cal_size,</div><div class='add'>+				    "calload", "calload_status");</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='del'>-	s8 eventmask[BRCMF_EVENTING_MASK_LEN];</div><div class='add'>+	struct brcmf_fweh_info *fweh = drvr-&gt;fweh;</div><div class='ctx'> 	u8 buf[BRCMF_DCMD_SMLEN];</div><div class='ctx'> 	struct brcmf_bus *bus;</div><div class='ctx'> 	struct brcmf_rev_info_le revinfo;</div><div class='hunk'>@@ -202,13 +275,30 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)</div><div class='ctx'> 	char *ptr;</div><div class='ctx'> 	s32 err;</div><div class='ctx'> </div><div class='del'>-	/* retreive mac address */</div><div class='del'>-	err = brcmf_fil_iovar_data_get(ifp, "cur_etheraddr", ifp-&gt;mac_addr,</div><div class='del'>-				       sizeof(ifp-&gt;mac_addr));</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		bphy_err(drvr, "Retrieving cur_etheraddr failed, %d\n", err);</div><div class='del'>-		goto done;</div><div class='add'>+	if (is_valid_ether_addr(ifp-&gt;mac_addr)) {</div><div class='add'>+		/* set mac address */</div><div class='add'>+		err = brcmf_c_set_cur_etheraddr(ifp, ifp-&gt;mac_addr);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto done;</div><div class='add'>+	} else {</div><div class='add'>+		/* retrieve mac address */</div><div class='add'>+		err = brcmf_fil_iovar_data_get(ifp, "cur_etheraddr", ifp-&gt;mac_addr,</div><div class='add'>+					       sizeof(ifp-&gt;mac_addr));</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			bphy_err(drvr, "Retrieving cur_etheraddr failed, %d\n", err);</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ether_addr_equal_unaligned(ifp-&gt;mac_addr, brcmf_default_mac_address)) {</div><div class='add'>+			bphy_err(drvr, "Default MAC is used, replacing with random MAC to avoid conflicts\n");</div><div class='add'>+			eth_random_addr(ifp-&gt;mac_addr);</div><div class='add'>+			ifp-&gt;ndev-&gt;addr_assign_type = NET_ADDR_RANDOM;</div><div class='add'>+			err = brcmf_c_set_cur_etheraddr(ifp, ifp-&gt;mac_addr);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto done;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	memcpy(ifp-&gt;drvr-&gt;mac, ifp-&gt;mac_addr, sizeof(ifp-&gt;drvr-&gt;mac));</div><div class='ctx'> 	memcpy(ifp-&gt;drvr-&gt;wiphy-&gt;perm_addr, ifp-&gt;drvr-&gt;mac, ETH_ALEN);</div><div class='ctx'> </div><div class='hunk'>@@ -219,7 +309,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)</div><div class='ctx'> 				     &amp;revinfo, sizeof(revinfo));</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		bphy_err(drvr, "retrieving revision info failed, %d\n", err);</div><div class='del'>-		strlcpy(ri-&gt;chipname, "UNKNOWN", sizeof(ri-&gt;chipname));</div><div class='add'>+		strscpy(ri-&gt;chipname, "UNKNOWN", sizeof(ri-&gt;chipname));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ri-&gt;vendorid = le32_to_cpu(revinfo.vendorid);</div><div class='ctx'> 		ri-&gt;deviceid = le32_to_cpu(revinfo.deviceid);</div><div class='hunk'>@@ -256,6 +346,20 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Do TxCap downloading, if needed */</div><div class='add'>+	err = brcmf_c_process_txcap_blob(ifp);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		bphy_err(drvr, "download TxCap blob file failed, %d\n", err);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Download external calibration blob, if available */</div><div class='add'>+	err = brcmf_c_process_cal_blob(ifp);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		bphy_err(drvr, "download calibration blob file failed, %d\n", err);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* query for 'ver' to get version info from firmware */</div><div class='ctx'> 	memset(buf, 0, sizeof(buf));</div><div class='ctx'> 	err = brcmf_fil_iovar_data_get(ifp, "ver", buf, sizeof(buf));</div><div class='hunk'>@@ -264,6 +368,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)</div><div class='ctx'> 			 err);</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='add'>+	buf[sizeof(buf) - 1] = '\0';</div><div class='ctx'> 	ptr = (char *)buf;</div><div class='ctx'> 	strsep(&amp;ptr, "\n");</div><div class='ctx'> </div><div class='hunk'>@@ -271,8 +376,12 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)</div><div class='ctx'> 	brcmf_info("Firmware: %s %s\n", ri-&gt;chipname, buf);</div><div class='ctx'> </div><div class='ctx'> 	/* locate firmware version number for ethtool */</div><div class='del'>-	ptr = strrchr(buf, ' ') + 1;</div><div class='del'>-	strlcpy(ifp-&gt;drvr-&gt;fwver, ptr, sizeof(ifp-&gt;drvr-&gt;fwver));</div><div class='add'>+	ptr = strrchr(buf, ' ');</div><div class='add'>+	if (!ptr) {</div><div class='add'>+		bphy_err(drvr, "Retrieving version number failed");</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+	strscpy(ifp-&gt;drvr-&gt;fwver, ptr + 1, sizeof(ifp-&gt;drvr-&gt;fwver));</div><div class='ctx'> </div><div class='ctx'> 	/* Query for 'clmver' to get CLM version info from firmware */</div><div class='ctx'> 	memset(buf, 0, sizeof(buf));</div><div class='hunk'>@@ -280,15 +389,17 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		brcmf_dbg(TRACE, "retrieving clmver failed, %d\n", err);</div><div class='ctx'> 	} else {</div><div class='add'>+		buf[sizeof(buf) - 1] = '\0';</div><div class='ctx'> 		clmver = (char *)buf;</div><div class='del'>-		/* store CLM version for adding it to revinfo debugfs file */</div><div class='del'>-		memcpy(ifp-&gt;drvr-&gt;clmver, clmver, sizeof(ifp-&gt;drvr-&gt;clmver));</div><div class='ctx'> </div><div class='ctx'> 		/* Replace all newline/linefeed characters with space</div><div class='ctx'> 		 * character</div><div class='ctx'> 		 */</div><div class='ctx'> 		strreplace(clmver, '\n', ' ');</div><div class='ctx'> </div><div class='add'>+		/* store CLM version for adding it to revinfo debugfs file */</div><div class='add'>+		memcpy(ifp-&gt;drvr-&gt;clmver, clmver, sizeof(ifp-&gt;drvr-&gt;clmver));</div><div class='add'>+</div><div class='ctx'> 		brcmf_dbg(INFO, "CLM version = %s\n", clmver);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -302,15 +413,21 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)</div><div class='ctx'> 	brcmf_c_set_joinpref_default(ifp);</div><div class='ctx'> </div><div class='ctx'> 	/* Setup event_msgs, enable E_IF */</div><div class='del'>-	err = brcmf_fil_iovar_data_get(ifp, "event_msgs", eventmask,</div><div class='del'>-				       BRCMF_EVENTING_MASK_LEN);</div><div class='add'>+	err = brcmf_fil_iovar_data_get(ifp, "event_msgs", fweh-&gt;event_mask,</div><div class='add'>+				       fweh-&gt;event_mask_len);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		bphy_err(drvr, "Get event_msgs error (%d)\n", err);</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='del'>-	setbit(eventmask, BRCMF_E_IF);</div><div class='del'>-	err = brcmf_fil_iovar_data_set(ifp, "event_msgs", eventmask,</div><div class='del'>-				       BRCMF_EVENTING_MASK_LEN);</div><div class='add'>+	/*</div><div class='add'>+	 * BRCMF_E_IF can safely be used to set the appropriate bit</div><div class='add'>+	 * in the event_mask as the firmware event code is guaranteed</div><div class='add'>+	 * to match the value of BRCMF_E_IF because it is old cruft</div><div class='add'>+	 * that all vendors have.</div><div class='add'>+	 */</div><div class='add'>+	setbit(fweh-&gt;event_mask, BRCMF_E_IF);</div><div class='add'>+	err = brcmf_fil_iovar_data_set(ifp, "event_msgs", fweh-&gt;event_mask,</div><div class='add'>+				       fweh-&gt;event_mask_len);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		bphy_err(drvr, "Set event_msgs error (%d)\n", err);</div><div class='ctx'> 		goto done;</div><div class='hunk'>@@ -374,6 +491,7 @@ void __brcmf_dbg(u32 level, const char *func, const char *fmt, ...)</div><div class='ctx'> 	trace_brcmf_dbg(level, func, &amp;vaf);</div><div class='ctx'> 	va_end(args);</div><div class='ctx'> }</div><div class='add'>+BRCMF_EXPORT_SYMBOL_GPL(__brcmf_dbg);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static void brcmf_mp_attach(void)</div><div class='hunk'>@@ -382,11 +500,11 @@ static void brcmf_mp_attach(void)</div><div class='ctx'> 	 * if not set then if available use the platform data version. To make</div><div class='ctx'> 	 * sure it gets initialized at all, always copy the module param version</div><div class='ctx'> 	 */</div><div class='del'>-	strlcpy(brcmf_mp_global.firmware_path, brcmf_firmware_path,</div><div class='add'>+	strscpy(brcmf_mp_global.firmware_path, brcmf_firmware_path,</div><div class='ctx'> 		BRCMF_FW_ALTPATH_LEN);</div><div class='ctx'> 	if ((brcmfmac_pdata) &amp;&amp; (brcmfmac_pdata-&gt;fw_alternative_path) &amp;&amp;</div><div class='ctx'> 	    (brcmf_mp_global.firmware_path[0] == '\0')) {</div><div class='del'>-		strlcpy(brcmf_mp_global.firmware_path,</div><div class='add'>+		strscpy(brcmf_mp_global.firmware_path,</div><div class='ctx'> 			brcmfmac_pdata-&gt;fw_alternative_path,</div><div class='ctx'> 			BRCMF_FW_ALTPATH_LEN);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -407,7 +525,7 @@ struct brcmf_mp_device *brcmf_get_module_param(struct device *dev,</div><div class='ctx'> 	if (!settings)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	/* start by using the module paramaters */</div><div class='add'>+	/* start by using the module parameters */</div><div class='ctx'> 	settings-&gt;p2p_enable = !!brcmf_p2p_enable;</div><div class='ctx'> 	settings-&gt;feature_disable = brcmf_feature_disable;</div><div class='ctx'> 	settings-&gt;fcmode = brcmf_fcmode;</div><div class='hunk'>@@ -444,7 +562,11 @@ struct brcmf_mp_device *brcmf_get_module_param(struct device *dev,</div><div class='ctx'> 	if (!found) {</div><div class='ctx'> 		/* No platform data for this device, try OF and DMI data */</div><div class='ctx'> 		brcmf_dmi_probe(settings, chip, chiprev);</div><div class='del'>-		brcmf_of_probe(dev, bus_type, settings);</div><div class='add'>+		if (brcmf_of_probe(dev, bus_type, settings) == -EPROBE_DEFER) {</div><div class='add'>+			kfree(settings);</div><div class='add'>+			return ERR_PTR(-EPROBE_DEFER);</div><div class='add'>+		}</div><div class='add'>+		brcmf_acpi_probe(dev, bus_type, settings);</div><div class='ctx'> 	}</div><div class='ctx'> 	return settings;</div><div class='ctx'> }</div><div class='hunk'>@@ -466,14 +588,12 @@ static int __init brcmf_common_pd_probe(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int brcmf_common_pd_remove(struct platform_device *pdev)</div><div class='add'>+static void brcmf_common_pd_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	brcmf_dbg(INFO, "Enter\n");</div><div class='ctx'> </div><div class='ctx'> 	if (brcmfmac_pdata-&gt;power_off)</div><div class='ctx'> 		brcmfmac_pdata-&gt;power_off();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver brcmf_pd = {</div><div class='hunk'>@@ -492,7 +612,7 @@ static int __init brcmfmac_module_init(void)</div><div class='ctx'> 	if (err == -ENODEV)</div><div class='ctx'> 		brcmf_dbg(INFO, "No platform data available.\n");</div><div class='ctx'> </div><div class='del'>-	/* Initialize global module paramaters */</div><div class='add'>+	/* Initialize global module parameters */</div><div class='ctx'> 	brcmf_mp_attach();</div><div class='ctx'> </div><div class='ctx'> 	/* Continue the initialization by registering the different busses */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h<br/>index 8b5f49997c8b..3bdb6984b2dd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct brcmf_mp_global_t - Global module paramaters.</div><div class='add'>+ * struct brcmf_mp_global_t - Global module parameters.</div><div class='ctx'>  *</div><div class='ctx'>  * @firmware_path: Alternative firmware path.</div><div class='ctx'>  */</div><div class='hunk'>@@ -31,13 +31,14 @@ struct brcmf_mp_global_t {</div><div class='ctx'> extern struct brcmf_mp_global_t brcmf_mp_global;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct brcmf_mp_device - Device module paramaters.</div><div class='add'>+ * struct brcmf_mp_device - Device module parameters.</div><div class='ctx'>  *</div><div class='ctx'>  * @p2p_enable: Legacy P2P0 enable (old wpa_supplicant).</div><div class='ctx'>  * @feature_disable: Feature_disable bitmask.</div><div class='ctx'>  * @fcmode: FWS flow control.</div><div class='ctx'>  * @roamoff: Firmware roaming off?</div><div class='ctx'>  * @ignore_probe_fail: Ignore probe failure.</div><div class='add'>+ * @trivial_ccode_map: Assume firmware uses ISO3166 country codes with rev 0</div><div class='ctx'>  * @country_codes: If available, pointer to struct for translating country codes</div><div class='ctx'>  * @bus: Bus specific platform data. Only SDIO at the mmoment.</div><div class='ctx'>  */</div><div class='hunk'>@@ -48,8 +49,13 @@ struct brcmf_mp_device {</div><div class='ctx'> 	bool		roamoff;</div><div class='ctx'> 	bool		iapp;</div><div class='ctx'> 	bool		ignore_probe_fail;</div><div class='add'>+	bool		trivial_ccode_map;</div><div class='ctx'> 	struct brcmfmac_pd_cc *country_codes;</div><div class='ctx'> 	const char	*board_type;</div><div class='add'>+	unsigned char	mac[ETH_ALEN];</div><div class='add'>+	const char	*antenna_sku;</div><div class='add'>+	const void	*cal_blob;</div><div class='add'>+	int		cal_size;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct brcmfmac_sdio_pd sdio;</div><div class='ctx'> 	} bus;</div><div class='hunk'>@@ -64,6 +70,7 @@ void brcmf_release_module_param(struct brcmf_mp_device *module_param);</div><div class='ctx'> </div><div class='ctx'> /* Sets dongle media info (drv_version, mac address). */</div><div class='ctx'> int brcmf_c_preinit_dcmds(struct brcmf_if *ifp);</div><div class='add'>+int brcmf_c_set_cur_etheraddr(struct brcmf_if *ifp, const u8 *addr);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DMI</div><div class='ctx'> void brcmf_dmi_probe(struct brcmf_mp_device *settings, u32 chip, u32 chiprev);</div><div class='hunk'>@@ -72,6 +79,15 @@ static inline void</div><div class='ctx'> brcmf_dmi_probe(struct brcmf_mp_device *settings, u32 chip, u32 chiprev) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ACPI</div><div class='add'>+void brcmf_acpi_probe(struct device *dev, enum brcmf_bus_type bus_type,</div><div class='add'>+		      struct brcmf_mp_device *settings);</div><div class='add'>+#else</div><div class='add'>+static inline void brcmf_acpi_probe(struct device *dev,</div><div class='add'>+				    enum brcmf_bus_type bus_type,</div><div class='add'>+				    struct brcmf_mp_device *settings) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> u8 brcmf_map_prio_to_prec(void *cfg, u8 prio);</div><div class='ctx'> </div><div class='ctx'> u8 brcmf_map_prio_to_aci(void *cfg, u8 prio);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c<br/>index 838b09b23abf..862a0336a0b5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/inetdevice.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='ctx'> #include &lt;net/cfg80211.h&gt;</div><div class='ctx'> #include &lt;net/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='hunk'>@@ -17,6 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "bus.h"</div><div class='add'>+#include "fwvid.h"</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> #include "fwil_types.h"</div><div class='ctx'> #include "p2p.h"</div><div class='hunk'>@@ -96,6 +98,11 @@ void brcmf_configure_arp_nd_offload(struct brcmf_if *ifp, bool enable)</div><div class='ctx'> 	s32 err;</div><div class='ctx'> 	u32 mode;</div><div class='ctx'> </div><div class='add'>+	if (enable &amp;&amp; brcmf_is_apmode_operating(ifp-&gt;drvr-&gt;wiphy)) {</div><div class='add'>+		brcmf_dbg(TRACE, "Skip ARP/ND offload enable when soft AP is running\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (enable)</div><div class='ctx'> 		mode = BRCMF_ARP_OL_AGENT | BRCMF_ARP_OL_PEER_AUTO_REPLY;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -188,9 +195,14 @@ static void _brcmf_set_multicast_list(struct work_struct *work)</div><div class='ctx'> 	/*Finally, pick up the PROMISC flag */</div><div class='ctx'> 	cmd_value = (ndev-&gt;flags &amp; IFF_PROMISC) ? true : false;</div><div class='ctx'> 	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PROMISC, cmd_value);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		bphy_err(drvr, "Setting BRCMF_C_SET_PROMISC failed, %d\n",</div><div class='del'>-			 err);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		/* PROMISC unsupported by firmware of older chips */</div><div class='add'>+		if (err == -EBADE)</div><div class='add'>+			bphy_info_once(drvr, "BRCMF_C_SET_PROMISC unsupported\n");</div><div class='add'>+		else</div><div class='add'>+			bphy_err(drvr, "Setting BRCMF_C_SET_PROMISC failed, err=%d\n",</div><div class='add'>+				 err);</div><div class='add'>+	}</div><div class='ctx'> 	brcmf_configure_arp_nd_offload(ifp, !cmd_value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -227,19 +239,15 @@ static int brcmf_netdev_set_mac_address(struct net_device *ndev, void *addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_if *ifp = netdev_priv(ndev);</div><div class='ctx'> 	struct sockaddr *sa = (struct sockaddr *)addr;</div><div class='del'>-	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter, bsscfgidx=%d\n", ifp-&gt;bsscfgidx);</div><div class='ctx'> </div><div class='del'>-	err = brcmf_fil_iovar_data_set(ifp, "cur_etheraddr", sa-&gt;sa_data,</div><div class='del'>-				       ETH_ALEN);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		bphy_err(drvr, "Setting cur_etheraddr failed, %d\n", err);</div><div class='del'>-	} else {</div><div class='add'>+	err = brcmf_c_set_cur_etheraddr(ifp, sa-&gt;sa_data);</div><div class='add'>+	if (err &gt;= 0) {</div><div class='ctx'> 		brcmf_dbg(TRACE, "updated to %pM\n", sa-&gt;sa_data);</div><div class='ctx'> 		memcpy(ifp-&gt;mac_addr, sa-&gt;sa_data, ETH_ALEN);</div><div class='del'>-		memcpy(ifp-&gt;ndev-&gt;dev_addr, ifp-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(ifp-&gt;ndev, ifp-&gt;mac_addr);</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -290,6 +298,7 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='ctx'> 	struct ethhdr *eh;</div><div class='ctx'> 	int head_delta;</div><div class='add'>+	unsigned int tx_bytes = skb-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(DATA, "Enter, bsscfgidx=%d\n", ifp-&gt;bsscfgidx);</div><div class='ctx'> </div><div class='hunk'>@@ -323,8 +332,8 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	if (skb_headroom(skb) &lt; drvr-&gt;hdrlen || skb_header_cloned(skb)) {</div><div class='ctx'> 		head_delta = max_t(int, drvr-&gt;hdrlen - skb_headroom(skb), 0);</div><div class='ctx'> </div><div class='del'>-		brcmf_dbg(INFO, "%s: insufficient headroom (%d)\n",</div><div class='del'>-			  brcmf_ifname(ifp), head_delta);</div><div class='add'>+		brcmf_dbg(INFO, "%s: %s headroom\n", brcmf_ifname(ifp),</div><div class='add'>+			  head_delta ? "insufficient" : "unmodifiable");</div><div class='ctx'> 		atomic_inc(&amp;drvr-&gt;bus_if-&gt;stats.pktcowed);</div><div class='ctx'> 		ret = pskb_expand_head(skb, ALIGN(head_delta, NET_SKB_PAD), 0,</div><div class='ctx'> 				       GFP_ATOMIC);</div><div class='hunk'>@@ -332,6 +341,7 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 			bphy_err(drvr, "%s: failed to expand headroom\n",</div><div class='ctx'> 				 brcmf_ifname(ifp));</div><div class='ctx'> 			atomic_inc(&amp;drvr-&gt;bus_if-&gt;stats.pktcow_failed);</div><div class='add'>+			dev_kfree_skb(skb);</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -364,7 +374,7 @@ done:</div><div class='ctx'> 		ndev-&gt;stats.tx_dropped++;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ndev-&gt;stats.tx_packets++;</div><div class='del'>-		ndev-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='add'>+		ndev-&gt;stats.tx_bytes += tx_bytes;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Return ok: we always eat the packet */</div><div class='hunk'>@@ -395,7 +405,7 @@ void brcmf_txflowblock_if(struct brcmf_if *ifp,</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ifp-&gt;netif_stop_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb, bool inirq)</div><div class='add'>+void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	/* Most of Broadcom's firmwares send 802.11f ADD frame every time a new</div><div class='ctx'> 	 * STA connects to the AP interface. This is an obsoleted standard most</div><div class='hunk'>@@ -418,15 +428,7 @@ void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb, bool inirq)</div><div class='ctx'> 	ifp-&gt;ndev-&gt;stats.rx_packets++;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(DATA, "rx proto=0x%X\n", ntohs(skb-&gt;protocol));</div><div class='del'>-	if (inirq) {</div><div class='del'>-		netif_rx(skb);</div><div class='del'>-	} else {</div><div class='del'>-		/* If the receive is not processed inside an ISR,</div><div class='del'>-		 * the softirqd must be woken explicitly to service</div><div class='del'>-		 * the NET_RX_SOFTIRQ.  This is handled by netif_rx_ni().</div><div class='del'>-		 */</div><div class='del'>-		netif_rx_ni(skb);</div><div class='del'>-	}</div><div class='add'>+	netif_rx(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void brcmf_netif_mon_rx(struct brcmf_if *ifp, struct sk_buff *skb)</div><div class='hunk'>@@ -475,7 +477,7 @@ void brcmf_netif_mon_rx(struct brcmf_if *ifp, struct sk_buff *skb)</div><div class='ctx'> 	skb-&gt;pkt_type = PACKET_OTHERHOST;</div><div class='ctx'> 	skb-&gt;protocol = htons(ETH_P_802_2);</div><div class='ctx'> </div><div class='del'>-	brcmf_netif_rx(ifp, skb, false);</div><div class='add'>+	brcmf_netif_rx(ifp, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int brcmf_rx_hdrpull(struct brcmf_pub *drvr, struct sk_buff *skb,</div><div class='hunk'>@@ -510,7 +512,7 @@ void brcmf_rx_frame(struct device *dev, struct sk_buff *skb, bool handle_event,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (brcmf_proto_is_reorder_skb(skb)) {</div><div class='del'>-		brcmf_proto_rxreorder(ifp, skb, inirq);</div><div class='add'>+		brcmf_proto_rxreorder(ifp, skb);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Process special event packets */</div><div class='ctx'> 		if (handle_event) {</div><div class='hunk'>@@ -519,7 +521,7 @@ void brcmf_rx_frame(struct device *dev, struct sk_buff *skb, bool handle_event,</div><div class='ctx'> 			brcmf_fweh_process_skb(ifp-&gt;drvr, skb,</div><div class='ctx'> 					       BCMILCP_SUBTYPE_VENDOR_LONG, gfp);</div><div class='ctx'> 		}</div><div class='del'>-		brcmf_netif_rx(ifp, skb, inirq);</div><div class='add'>+		brcmf_netif_rx(ifp, skb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -543,6 +545,11 @@ void brcmf_txfinalize(struct brcmf_if *ifp, struct sk_buff *txp, bool success)</div><div class='ctx'> 	struct ethhdr *eh;</div><div class='ctx'> 	u16 type;</div><div class='ctx'> </div><div class='add'>+	if (!ifp) {</div><div class='add'>+		brcmu_pkt_buf_free_skb(txp);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	eh = (struct ethhdr *)(txp-&gt;data);</div><div class='ctx'> 	type = ntohs(eh-&gt;h_proto);</div><div class='ctx'> </div><div class='hunk'>@@ -567,10 +574,10 @@ static void brcmf_ethtool_get_drvinfo(struct net_device *ndev,</div><div class='ctx'> </div><div class='ctx'> 	if (drvr-&gt;revinfo.result == 0)</div><div class='ctx'> 		brcmu_dotrev_str(drvr-&gt;revinfo.driverrev, drev);</div><div class='del'>-	strlcpy(info-&gt;driver, KBUILD_MODNAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, drev, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;fw_version, drvr-&gt;fwver, sizeof(info-&gt;fw_version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, dev_name(drvr-&gt;bus_if-&gt;dev),</div><div class='add'>+	strscpy(info-&gt;driver, KBUILD_MODNAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;version, drev, sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;fw_version, drvr-&gt;fwver, sizeof(info-&gt;fw_version));</div><div class='add'>+	strscpy(info-&gt;bus_info, dev_name(drvr-&gt;bus_if-&gt;dev),</div><div class='ctx'> 		sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -650,7 +657,7 @@ int brcmf_net_attach(struct brcmf_if *ifp, bool locked)</div><div class='ctx'> 	ndev-&gt;ethtool_ops = &amp;brcmf_ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> 	/* set the mac address &amp; netns */</div><div class='del'>-	memcpy(ndev-&gt;dev_addr, ifp-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+	eth_hw_addr_set(ndev, ifp-&gt;mac_addr);</div><div class='ctx'> 	dev_net_set(ndev, wiphy_net(cfg_to_wiphy(drvr-&gt;config)));</div><div class='ctx'> </div><div class='ctx'> 	INIT_WORK(&amp;ifp-&gt;multicast_work, _brcmf_set_multicast_list);</div><div class='hunk'>@@ -825,7 +832,7 @@ static int brcmf_net_p2p_attach(struct brcmf_if *ifp)</div><div class='ctx'> 	ndev-&gt;netdev_ops = &amp;brcmf_netdev_ops_p2p;</div><div class='ctx'> </div><div class='ctx'> 	/* set the mac address */</div><div class='del'>-	memcpy(ndev-&gt;dev_addr, ifp-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+	eth_hw_addr_set(ndev, ifp-&gt;mac_addr);</div><div class='ctx'> </div><div class='ctx'> 	if (register_netdev(ndev) != 0) {</div><div class='ctx'> 		bphy_err(drvr, "couldn't register the p2p net device\n");</div><div class='hunk'>@@ -1140,7 +1147,8 @@ static int brcmf_revinfo_read(struct seq_file *s, void *data)</div><div class='ctx'> 	seq_printf(s, "vendorid: 0x%04x\n", ri-&gt;vendorid);</div><div class='ctx'> 	seq_printf(s, "deviceid: 0x%04x\n", ri-&gt;deviceid);</div><div class='ctx'> 	seq_printf(s, "radiorev: %s\n", brcmu_dotrev_str(ri-&gt;radiorev, drev));</div><div class='del'>-	seq_printf(s, "chip: %s\n", ri-&gt;chipname);</div><div class='add'>+	seq_printf(s, "chip: %s (%s)\n", ri-&gt;chipname,</div><div class='add'>+		   brcmf_fwvid_vendor_name(bus_if-&gt;drvr));</div><div class='ctx'> 	seq_printf(s, "chippkg: %u\n", ri-&gt;chippkg);</div><div class='ctx'> 	seq_printf(s, "corerev: %u\n", ri-&gt;corerev);</div><div class='ctx'> 	seq_printf(s, "boardid: 0x%04x\n", ri-&gt;boardid);</div><div class='hunk'>@@ -1186,7 +1194,6 @@ static ssize_t bus_reset_write(struct file *file, const char __user *user_buf,</div><div class='ctx'> </div><div class='ctx'> static const struct file_operations bus_reset_fops = {</div><div class='ctx'> 	.open	= simple_open,</div><div class='del'>-	.llseek	= no_llseek,</div><div class='ctx'> 	.write	= bus_reset_write,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1200,7 +1207,8 @@ static int brcmf_bus_started(struct brcmf_pub *drvr, struct cfg80211_ops *ops)</div><div class='ctx'> 	brcmf_dbg(TRACE, "\n");</div><div class='ctx'> </div><div class='ctx'> 	/* add primary networking interface */</div><div class='del'>-	ifp = brcmf_add_if(drvr, 0, 0, false, "wlan%d", NULL);</div><div class='add'>+	ifp = brcmf_add_if(drvr, 0, 0, false, "wlan%d",</div><div class='add'>+			   is_valid_ether_addr(drvr-&gt;settings-&gt;mac) ? drvr-&gt;settings-&gt;mac : NULL);</div><div class='ctx'> 	if (IS_ERR(ifp))</div><div class='ctx'> 		return PTR_ERR(ifp);</div><div class='ctx'> </div><div class='hunk'>@@ -1336,6 +1344,12 @@ int brcmf_attach(struct device *dev)</div><div class='ctx'> 	/* Link to bus module */</div><div class='ctx'> 	drvr-&gt;hdrlen = 0;</div><div class='ctx'> </div><div class='add'>+	ret = brcmf_fwvid_attach(drvr);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		bphy_err(drvr, "brcmf_fwvid_attach failed\n");</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Attach and link in the protocol */</div><div class='ctx'> 	ret = brcmf_proto_attach(drvr);</div><div class='ctx'> 	if (ret != 0) {</div><div class='hunk'>@@ -1343,12 +1357,18 @@ int brcmf_attach(struct device *dev)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* attach firmware event handler */</div><div class='add'>+	ret = brcmf_fweh_attach(drvr);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		bphy_err(drvr, "brcmf_fweh_attach failed\n");</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Attach to events important for core code */</div><div class='ctx'> 	brcmf_fweh_register(drvr, BRCMF_E_PSM_WATCHDOG,</div><div class='ctx'> 			    brcmf_psm_watchdog_notify);</div><div class='ctx'> </div><div class='del'>-	/* attach firmware event handler */</div><div class='del'>-	brcmf_fweh_attach(drvr);</div><div class='add'>+	brcmf_fwvid_get_cfg80211_ops(drvr);</div><div class='ctx'> </div><div class='ctx'> 	ret = brcmf_bus_started(drvr, drvr-&gt;ops);</div><div class='ctx'> 	if (ret != 0) {</div><div class='hunk'>@@ -1403,7 +1423,8 @@ void brcmf_fw_crashed(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dev_coredump(dev);</div><div class='ctx'> </div><div class='del'>-	schedule_work(&amp;drvr-&gt;bus_reset);</div><div class='add'>+	if (drvr-&gt;bus_reset.func)</div><div class='add'>+		schedule_work(&amp;drvr-&gt;bus_reset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void brcmf_detach(struct device *dev)</div><div class='hunk'>@@ -1446,6 +1467,8 @@ void brcmf_detach(struct device *dev)</div><div class='ctx'> 		brcmf_cfg80211_detach(drvr-&gt;config);</div><div class='ctx'> 		drvr-&gt;config = NULL;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	brcmf_fwvid_detach(drvr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void brcmf_free(struct device *dev)</div><div class='hunk'>@@ -1485,8 +1508,10 @@ int brcmf_netdev_wait_pend8021x(struct brcmf_if *ifp)</div><div class='ctx'> 				 !brcmf_get_pend_8021x_cnt(ifp),</div><div class='ctx'> 				 MAX_WAIT_FOR_8021X_TX);</div><div class='ctx'> </div><div class='del'>-	if (!err)</div><div class='add'>+	if (!err) {</div><div class='ctx'> 		bphy_err(drvr, "Timed out waiting for no pending 802.1x packets\n");</div><div class='add'>+		atomic_set(&amp;ifp-&gt;pend_8021x_cnt, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return !err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1518,40 +1543,34 @@ void brcmf_bus_change_state(struct brcmf_bus *bus, enum brcmf_bus_state state)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void brcmf_driver_register(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_BRCMFMAC_SDIO</div><div class='del'>-	brcmf_sdio_register();</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_BRCMFMAC_USB</div><div class='del'>-	brcmf_usb_register();</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_BRCMFMAC_PCIE</div><div class='del'>-	brcmf_pcie_register();</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-static DECLARE_WORK(brcmf_driver_work, brcmf_driver_register);</div><div class='del'>-</div><div class='ctx'> int __init brcmf_core_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (!schedule_work(&amp;brcmf_driver_work))</div><div class='del'>-		return -EBUSY;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='add'>+	err = brcmf_sdio_register();</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = brcmf_usb_register();</div><div class='add'>+	if (err)</div><div class='add'>+		goto error_usb_register;</div><div class='add'>+</div><div class='add'>+	err = brcmf_pcie_register();</div><div class='add'>+	if (err)</div><div class='add'>+		goto error_pcie_register;</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+error_pcie_register:</div><div class='add'>+	brcmf_usb_exit();</div><div class='add'>+error_usb_register:</div><div class='add'>+	brcmf_sdio_exit();</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __exit brcmf_core_exit(void)</div><div class='ctx'> {</div><div class='del'>-	cancel_work_sync(&amp;brcmf_driver_work);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BRCMFMAC_SDIO</div><div class='ctx'> 	brcmf_sdio_exit();</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_BRCMFMAC_USB</div><div class='ctx'> 	brcmf_usb_exit();</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_BRCMFMAC_PCIE</div><div class='ctx'> 	brcmf_pcie_exit();</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h<br/>index 8212c9de14f1..399b6810e394 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h</a></div><div class='hunk'>@@ -13,6 +13,12 @@</div><div class='ctx'> #include &lt;net/cfg80211.h&gt;</div><div class='ctx'> #include "fweh.h"</div><div class='ctx'> </div><div class='add'>+#if IS_MODULE(CONFIG_BRCMFMAC)</div><div class='add'>+#define BRCMF_EXPORT_SYMBOL_GPL(__sym)	EXPORT_SYMBOL_NS_GPL(__sym, "BRCMFMAC")</div><div class='add'>+#else</div><div class='add'>+#define BRCMF_EXPORT_SYMBOL_GPL(__sym)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define TOE_TX_CSUM_OL		0x00000001</div><div class='ctx'> #define TOE_RX_CSUM_OL		0x00000002</div><div class='ctx'> </div><div class='hunk'>@@ -42,26 +48,26 @@</div><div class='ctx'> /**</div><div class='ctx'>  * struct brcmf_ampdu_rx_reorder - AMPDU receive reorder info</div><div class='ctx'>  *</div><div class='del'>- * @pktslots: dynamic allocated array for ordering AMPDU packets.</div><div class='ctx'>  * @flow_id: AMPDU flow identifier.</div><div class='ctx'>  * @cur_idx: last AMPDU index from firmware.</div><div class='ctx'>  * @exp_idx: expected next AMPDU index.</div><div class='ctx'>  * @max_idx: maximum amount of packets per AMPDU.</div><div class='ctx'>  * @pend_pkts: number of packets currently in @pktslots.</div><div class='add'>+ * @pktslots: array for ordering AMPDU packets.</div><div class='ctx'>  */</div><div class='ctx'> struct brcmf_ampdu_rx_reorder {</div><div class='del'>-	struct sk_buff **pktslots;</div><div class='ctx'> 	u8 flow_id;</div><div class='ctx'> 	u8 cur_idx;</div><div class='ctx'> 	u8 exp_idx;</div><div class='ctx'> 	u8 max_idx;</div><div class='ctx'> 	u8 pend_pkts;</div><div class='add'>+	struct sk_buff *pktslots[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Forward decls for struct brcmf_pub (see below) */</div><div class='ctx'> struct brcmf_proto;	/* device communication protocol info */</div><div class='ctx'> struct brcmf_fws_info;	/* firmware signalling info */</div><div class='del'>-struct brcmf_mp_device;	/* module paramateres, device specific */</div><div class='add'>+struct brcmf_mp_device;	/* module parameters, device specific */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * struct brcmf_rev_info</div><div class='hunk'>@@ -116,7 +122,7 @@ struct brcmf_pub {</div><div class='ctx'> 	struct mutex proto_block;</div><div class='ctx'> 	unsigned char proto_buf[BRCMF_DCMD_MAXLEN];</div><div class='ctx'> </div><div class='del'>-	struct brcmf_fweh_info fweh;</div><div class='add'>+	struct brcmf_fweh_info *fweh;</div><div class='ctx'> </div><div class='ctx'> 	struct brcmf_ampdu_rx_reorder</div><div class='ctx'> 		*reorder_flows[BRCMF_AMPDU_RX_REORDER_MAXFLOWS];</div><div class='hunk'>@@ -136,6 +142,9 @@ struct brcmf_pub {</div><div class='ctx'> 	struct work_struct bus_reset;</div><div class='ctx'> </div><div class='ctx'> 	u8 clmver[BRCMF_DCMD_SMLEN];</div><div class='add'>+	u8 sta_mac_idx;</div><div class='add'>+	const struct brcmf_fwvid_ops *vops;</div><div class='add'>+	void *vdata;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* forward declarations */</div><div class='hunk'>@@ -208,7 +217,7 @@ void brcmf_remove_interface(struct brcmf_if *ifp, bool locked);</div><div class='ctx'> void brcmf_txflowblock_if(struct brcmf_if *ifp,</div><div class='ctx'> 			  enum brcmf_netif_stop_reason reason, bool state);</div><div class='ctx'> void brcmf_txfinalize(struct brcmf_if *ifp, struct sk_buff *txp, bool success);</div><div class='del'>-void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb, bool inirq);</div><div class='add'>+void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb);</div><div class='ctx'> void brcmf_netif_mon_rx(struct brcmf_if *ifp, struct sk_buff *skb);</div><div class='ctx'> void brcmf_net_detach(struct net_device *ndev, bool locked);</div><div class='ctx'> int brcmf_net_mon_attach(struct brcmf_if *ifp);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/Makefile<br/>new file mode 100644<br/>index 000000000000..33e86724ba14<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/Makefile</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+# SPDX-License-Identifier: ISC</div><div class='add'>+#</div><div class='add'>+# Copyright (c) 2022 Broadcom Corporation</div><div class='add'>+</div><div class='add'>+ccflags-y += \</div><div class='add'>+	-I $(src) \</div><div class='add'>+	-I $(src)/.. \</div><div class='add'>+	-I $(src)/../../include</div><div class='add'>+</div><div class='add'>+obj-m += brcmfmac-cyw.o</div><div class='add'>+brcmfmac-cyw-objs += \</div><div class='add'>+		core.o module.o</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c<br/>new file mode 100644<br/>index 000000000000..4f0ea4347840<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c</a></div><div class='hunk'>@@ -0,0 +1,373 @@</div><div class='add'>+// SPDX-License-Identifier: ISC</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022 Broadcom Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;core.h&gt;</div><div class='add'>+#include &lt;bus.h&gt;</div><div class='add'>+#include &lt;fwvid.h&gt;</div><div class='add'>+#include &lt;fwil.h&gt;</div><div class='add'>+#include &lt;fweh.h&gt;</div><div class='add'>+</div><div class='add'>+#include "vops.h"</div><div class='add'>+#include "fwil_types.h"</div><div class='add'>+</div><div class='add'>+/* event definitions */</div><div class='add'>+#define BRCMF_CYW_E_EXT_AUTH_REQ	187</div><div class='add'>+#define BRCMF_CYW_E_EXT_AUTH_FRAME_RX	188</div><div class='add'>+#define BRCMF_CYW_E_MGMT_FRAME_TXS	189</div><div class='add'>+#define BRCMF_CYW_E_MGMT_FRAME_TXS_OC	190</div><div class='add'>+#define BRCMF_CYW_E_LAST		197</div><div class='add'>+</div><div class='add'>+#define MGMT_AUTH_FRAME_DWELL_TIME	4000</div><div class='add'>+#define MGMT_AUTH_FRAME_WAIT_TIME	(MGMT_AUTH_FRAME_DWELL_TIME + 100)</div><div class='add'>+</div><div class='add'>+static int brcmf_cyw_set_sae_pwd(struct brcmf_if *ifp,</div><div class='add'>+				 struct cfg80211_crypto_settings *crypto)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='add'>+	struct brcmf_wsec_sae_pwd_le sae_pwd;</div><div class='add'>+	u16 pwd_len = crypto-&gt;sae_pwd_len;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (pwd_len &gt; BRCMF_WSEC_MAX_SAE_PASSWORD_LEN) {</div><div class='add'>+		bphy_err(drvr, "sae_password must be less than %d\n",</div><div class='add'>+			 BRCMF_WSEC_MAX_SAE_PASSWORD_LEN);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sae_pwd.key_len = cpu_to_le16(pwd_len);</div><div class='add'>+	memcpy(sae_pwd.key, crypto-&gt;sae_pwd, pwd_len);</div><div class='add'>+</div><div class='add'>+	err = brcmf_fil_iovar_data_set(ifp, "sae_password", &amp;sae_pwd,</div><div class='add'>+				       sizeof(sae_pwd));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		bphy_err(drvr, "failed to set SAE password in firmware (len=%u)\n",</div><div class='add'>+			 pwd_len);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct brcmf_fweh_event_map brcmf_cyw_event_map = {</div><div class='add'>+	.items = {</div><div class='add'>+		{ BRCMF_E_EXT_AUTH_REQ, BRCMF_CYW_E_EXT_AUTH_REQ },</div><div class='add'>+		{ BRCMF_E_EXT_AUTH_FRAME_RX, BRCMF_CYW_E_EXT_AUTH_FRAME_RX },</div><div class='add'>+		{ BRCMF_E_MGMT_FRAME_TXSTATUS, BRCMF_CYW_E_MGMT_FRAME_TXS },</div><div class='add'>+		{</div><div class='add'>+			BRCMF_E_MGMT_FRAME_OFFCHAN_DONE,</div><div class='add'>+			BRCMF_CYW_E_MGMT_FRAME_TXS_OC</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.n_items = 4</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int brcmf_cyw_alloc_fweh_info(struct brcmf_pub *drvr)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_fweh_info *fweh;</div><div class='add'>+</div><div class='add'>+	fweh = kzalloc(struct_size(fweh, evt_handler, BRCMF_CYW_E_LAST),</div><div class='add'>+		       GFP_KERNEL);</div><div class='add'>+	if (!fweh)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fweh-&gt;num_event_codes = BRCMF_CYW_E_LAST;</div><div class='add'>+	fweh-&gt;event_map = &amp;brcmf_cyw_event_map;</div><div class='add'>+	drvr-&gt;fweh = fweh;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int brcmf_cyw_activate_events(struct brcmf_if *ifp)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_fweh_info *fweh = ifp-&gt;drvr-&gt;fweh;</div><div class='add'>+	struct brcmf_eventmsgs_ext *eventmask_msg;</div><div class='add'>+	u32 msglen;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	msglen = sizeof(*eventmask_msg) + fweh-&gt;event_mask_len;</div><div class='add'>+	eventmask_msg = kzalloc(msglen, GFP_KERNEL);</div><div class='add'>+	if (!eventmask_msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	eventmask_msg-&gt;ver = EVENTMSGS_VER;</div><div class='add'>+	eventmask_msg-&gt;command = CYW_EVENTMSGS_SET_MASK;</div><div class='add'>+	eventmask_msg-&gt;len = fweh-&gt;event_mask_len;</div><div class='add'>+	memcpy(eventmask_msg-&gt;mask, fweh-&gt;event_mask, fweh-&gt;event_mask_len);</div><div class='add'>+</div><div class='add'>+	err = brcmf_fil_iovar_data_set(ifp, "event_msgs_ext", eventmask_msg,</div><div class='add'>+				       msglen);</div><div class='add'>+	kfree(eventmask_msg);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+int brcmf_cyw_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,</div><div class='add'>+		      struct cfg80211_mgmt_tx_params *params, u64 *cookie)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);</div><div class='add'>+	struct ieee80211_channel *chan = params-&gt;chan;</div><div class='add'>+	struct brcmf_pub *drvr = cfg-&gt;pub;</div><div class='add'>+	const u8 *buf = params-&gt;buf;</div><div class='add'>+	size_t len = params-&gt;len;</div><div class='add'>+	const struct ieee80211_mgmt *mgmt;</div><div class='add'>+	struct brcmf_cfg80211_vif *vif;</div><div class='add'>+	s32 err = 0;</div><div class='add'>+	bool ack = false;</div><div class='add'>+	__le16 hw_ch;</div><div class='add'>+	struct brcmf_mf_params_le *mf_params;</div><div class='add'>+	u32 mf_params_len;</div><div class='add'>+	s32 ready;</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(TRACE, "Enter\n");</div><div class='add'>+</div><div class='add'>+	mgmt = (const struct ieee80211_mgmt *)buf;</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_is_auth(mgmt-&gt;frame_control))</div><div class='add'>+		return brcmf_cfg80211_mgmt_tx(wiphy, wdev, params, cookie);</div><div class='add'>+</div><div class='add'>+	*cookie = 0;</div><div class='add'>+	vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev);</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;vif-&gt;mgmt_tx);</div><div class='add'>+	clear_bit(BRCMF_MGMT_TX_ACK, &amp;vif-&gt;mgmt_tx_status);</div><div class='add'>+	clear_bit(BRCMF_MGMT_TX_NOACK, &amp;vif-&gt;mgmt_tx_status);</div><div class='add'>+	clear_bit(BRCMF_MGMT_TX_OFF_CHAN_COMPLETED,</div><div class='add'>+		  &amp;vif-&gt;mgmt_tx_status);</div><div class='add'>+	mf_params_len = offsetof(struct brcmf_mf_params_le, data) +</div><div class='add'>+			(len - DOT11_MGMT_HDR_LEN);</div><div class='add'>+	mf_params = kzalloc(mf_params_len, GFP_KERNEL);</div><div class='add'>+	if (!mf_params)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mf_params-&gt;dwell_time = cpu_to_le32(MGMT_AUTH_FRAME_DWELL_TIME);</div><div class='add'>+	mf_params-&gt;len = cpu_to_le16(len - DOT11_MGMT_HDR_LEN);</div><div class='add'>+	mf_params-&gt;frame_control = mgmt-&gt;frame_control;</div><div class='add'>+</div><div class='add'>+	if (chan) {</div><div class='add'>+		hw_ch = cpu_to_le16(chan-&gt;hw_value);</div><div class='add'>+	} else {</div><div class='add'>+		err = brcmf_fil_cmd_data_get(vif-&gt;ifp, BRCMF_C_GET_CHANNEL,</div><div class='add'>+					     &amp;hw_ch, sizeof(hw_ch));</div><div class='add'>+		if (err) {</div><div class='add'>+			bphy_err(drvr, "unable to get current hw channel\n");</div><div class='add'>+			goto free;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mf_params-&gt;channel = hw_ch;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;mf_params-&gt;da[0], &amp;mgmt-&gt;da[0], ETH_ALEN);</div><div class='add'>+	memcpy(&amp;mf_params-&gt;bssid[0], &amp;mgmt-&gt;bssid[0], ETH_ALEN);</div><div class='add'>+	mf_params-&gt;packet_id = cpu_to_le32(*cookie);</div><div class='add'>+	memcpy(mf_params-&gt;data, &amp;buf[DOT11_MGMT_HDR_LEN],</div><div class='add'>+	       le16_to_cpu(mf_params-&gt;len));</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(TRACE, "Auth frame, cookie=%d, fc=%04x, len=%d, channel=%d\n",</div><div class='add'>+		  le32_to_cpu(mf_params-&gt;packet_id),</div><div class='add'>+		  le16_to_cpu(mf_params-&gt;frame_control),</div><div class='add'>+		  le16_to_cpu(mf_params-&gt;len),</div><div class='add'>+		  le16_to_cpu(mf_params-&gt;channel));</div><div class='add'>+</div><div class='add'>+	vif-&gt;mgmt_tx_id = le32_to_cpu(mf_params-&gt;packet_id);</div><div class='add'>+	set_bit(BRCMF_MGMT_TX_SEND_FRAME, &amp;vif-&gt;mgmt_tx_status);</div><div class='add'>+</div><div class='add'>+	err = brcmf_fil_bsscfg_data_set(vif-&gt;ifp, "mgmt_frame",</div><div class='add'>+					mf_params, mf_params_len);</div><div class='add'>+	if (err) {</div><div class='add'>+		bphy_err(drvr, "Failed to send Auth frame: err=%d\n",</div><div class='add'>+			 err);</div><div class='add'>+		goto tx_status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ready = wait_for_completion_timeout(&amp;vif-&gt;mgmt_tx,</div><div class='add'>+					    MGMT_AUTH_FRAME_WAIT_TIME);</div><div class='add'>+	if (test_bit(BRCMF_MGMT_TX_ACK, &amp;vif-&gt;mgmt_tx_status)) {</div><div class='add'>+		brcmf_dbg(TRACE, "TX Auth frame operation is success\n");</div><div class='add'>+		ack = true;</div><div class='add'>+	} else {</div><div class='add'>+		bphy_err(drvr, "TX Auth frame operation is %s: status=%ld)\n",</div><div class='add'>+			 ready ? "failed" : "timedout", vif-&gt;mgmt_tx_status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+tx_status:</div><div class='add'>+	cfg80211_mgmt_tx_status(wdev, *cookie, buf, len, ack,</div><div class='add'>+				GFP_KERNEL);</div><div class='add'>+free:</div><div class='add'>+	kfree(mf_params);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+brcmf_cyw_external_auth(struct wiphy *wiphy, struct net_device *dev,</div><div class='add'>+			struct cfg80211_external_auth_params *params)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_if *ifp;</div><div class='add'>+	struct brcmf_pub *drvr;</div><div class='add'>+	struct brcmf_auth_req_status_le auth_status;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(TRACE, "Enter\n");</div><div class='add'>+</div><div class='add'>+	ifp = netdev_priv(dev);</div><div class='add'>+	drvr = ifp-&gt;drvr;</div><div class='add'>+	if (params-&gt;status == WLAN_STATUS_SUCCESS) {</div><div class='add'>+		auth_status.flags = cpu_to_le16(BRCMF_EXTAUTH_SUCCESS);</div><div class='add'>+	} else {</div><div class='add'>+		bphy_err(drvr, "External authentication failed: status=%d\n",</div><div class='add'>+			 params-&gt;status);</div><div class='add'>+		auth_status.flags = cpu_to_le16(BRCMF_EXTAUTH_FAIL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(auth_status.peer_mac, params-&gt;bssid, ETH_ALEN);</div><div class='add'>+	params-&gt;ssid.ssid_len = min_t(u8, params-&gt;ssid.ssid_len,</div><div class='add'>+				      IEEE80211_MAX_SSID_LEN);</div><div class='add'>+	auth_status.ssid_len = cpu_to_le32(params-&gt;ssid.ssid_len);</div><div class='add'>+	memcpy(auth_status.ssid, params-&gt;ssid.ssid, params-&gt;ssid.ssid_len);</div><div class='add'>+</div><div class='add'>+	ret = brcmf_fil_iovar_data_set(ifp, "auth_status", &amp;auth_status,</div><div class='add'>+				       sizeof(auth_status));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		bphy_err(drvr, "auth_status iovar failed: ret=%d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void brcmf_cyw_get_cfg80211_ops(struct brcmf_pub *drvr)</div><div class='add'>+{</div><div class='add'>+	drvr-&gt;ops-&gt;mgmt_tx = brcmf_cyw_mgmt_tx;</div><div class='add'>+	drvr-&gt;ops-&gt;external_auth = brcmf_cyw_external_auth;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static s32</div><div class='add'>+brcmf_cyw_notify_ext_auth_req(struct brcmf_if *ifp,</div><div class='add'>+			      const struct brcmf_event_msg *e, void *data)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='add'>+	struct cfg80211_external_auth_params params;</div><div class='add'>+	struct brcmf_auth_req_status_le *auth_req =</div><div class='add'>+		(struct brcmf_auth_req_status_le *)data;</div><div class='add'>+	s32 err = 0;</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(INFO, "Enter: event %s (%d) received\n",</div><div class='add'>+		  brcmf_fweh_event_name(e-&gt;event_code), e-&gt;event_code);</div><div class='add'>+</div><div class='add'>+	if (e-&gt;datalen &lt; sizeof(*auth_req)) {</div><div class='add'>+		bphy_err(drvr, "Event %s (%d) data too small. Ignore\n",</div><div class='add'>+			 brcmf_fweh_event_name(e-&gt;event_code), e-&gt;event_code);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;params, 0, sizeof(params));</div><div class='add'>+	params.action = NL80211_EXTERNAL_AUTH_START;</div><div class='add'>+	params.key_mgmt_suite = WLAN_AKM_SUITE_SAE;</div><div class='add'>+	params.status = WLAN_STATUS_SUCCESS;</div><div class='add'>+	params.ssid.ssid_len = min_t(u32, 32, le32_to_cpu(auth_req-&gt;ssid_len));</div><div class='add'>+	memcpy(params.ssid.ssid, auth_req-&gt;ssid, params.ssid.ssid_len);</div><div class='add'>+	memcpy(params.bssid, auth_req-&gt;peer_mac, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	err = cfg80211_external_auth_request(ifp-&gt;ndev, &amp;params, GFP_KERNEL);</div><div class='add'>+	if (err)</div><div class='add'>+		bphy_err(drvr, "Ext Auth request to supplicant failed (%d)\n",</div><div class='add'>+			 err);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static s32</div><div class='add'>+brcmf_notify_auth_frame_rx(struct brcmf_if *ifp,</div><div class='add'>+			   const struct brcmf_event_msg *e, void *data)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='add'>+	struct brcmf_cfg80211_info *cfg = drvr-&gt;config;</div><div class='add'>+	struct wireless_dev *wdev;</div><div class='add'>+	u32 mgmt_frame_len = e-&gt;datalen - sizeof(struct brcmf_rx_mgmt_data);</div><div class='add'>+	struct brcmf_rx_mgmt_data *rxframe = (struct brcmf_rx_mgmt_data *)data;</div><div class='add'>+	u8 *frame = (u8 *)(rxframe + 1);</div><div class='add'>+	struct brcmu_chan ch;</div><div class='add'>+	struct ieee80211_mgmt *mgmt_frame;</div><div class='add'>+	s32 freq;</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(INFO, "Enter: event %s (%d) received\n",</div><div class='add'>+		  brcmf_fweh_event_name(e-&gt;event_code), e-&gt;event_code);</div><div class='add'>+</div><div class='add'>+	if (e-&gt;datalen &lt; sizeof(*rxframe)) {</div><div class='add'>+		bphy_err(drvr, "Event %s (%d) data too small. Ignore\n",</div><div class='add'>+			 brcmf_fweh_event_name(e-&gt;event_code), e-&gt;event_code);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wdev = &amp;ifp-&gt;vif-&gt;wdev;</div><div class='add'>+	WARN_ON(!wdev);</div><div class='add'>+</div><div class='add'>+	ch.chspec = be16_to_cpu(rxframe-&gt;chanspec);</div><div class='add'>+	cfg-&gt;d11inf.decchspec(&amp;ch);</div><div class='add'>+</div><div class='add'>+	mgmt_frame = kzalloc(mgmt_frame_len, GFP_KERNEL);</div><div class='add'>+	if (!mgmt_frame)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mgmt_frame-&gt;frame_control = cpu_to_le16(IEEE80211_STYPE_AUTH);</div><div class='add'>+	memcpy(mgmt_frame-&gt;da, ifp-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+	memcpy(mgmt_frame-&gt;sa, e-&gt;addr, ETH_ALEN);</div><div class='add'>+	brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_BSSID, mgmt_frame-&gt;bssid,</div><div class='add'>+			       ETH_ALEN);</div><div class='add'>+	frame += offsetof(struct ieee80211_mgmt, u);</div><div class='add'>+	memcpy(&amp;mgmt_frame-&gt;u, frame,</div><div class='add'>+	       mgmt_frame_len - offsetof(struct ieee80211_mgmt, u));</div><div class='add'>+</div><div class='add'>+	freq = ieee80211_channel_to_frequency(ch.control_ch_num,</div><div class='add'>+					      ch.band == BRCMU_CHAN_BAND_2G ?</div><div class='add'>+					      NL80211_BAND_2GHZ :</div><div class='add'>+					      NL80211_BAND_5GHZ);</div><div class='add'>+</div><div class='add'>+	cfg80211_rx_mgmt(wdev, freq, 0, (u8 *)mgmt_frame, mgmt_frame_len,</div><div class='add'>+			 NL80211_RXMGMT_FLAG_EXTERNAL_AUTH);</div><div class='add'>+	kfree(mgmt_frame);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static s32</div><div class='add'>+brcmf_notify_mgmt_tx_status(struct brcmf_if *ifp,</div><div class='add'>+			    const struct brcmf_event_msg *e, void *data)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_cfg80211_vif *vif = ifp-&gt;vif;</div><div class='add'>+	u32 *packet_id = (u32 *)data;</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(INFO, "Enter: event %s (%d), status=%d\n",</div><div class='add'>+		  brcmf_fweh_event_name(e-&gt;event_code), e-&gt;event_code,</div><div class='add'>+		  e-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(BRCMF_MGMT_TX_SEND_FRAME, &amp;vif-&gt;mgmt_tx_status) ||</div><div class='add'>+	    (*packet_id != vif-&gt;mgmt_tx_id))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (e-&gt;event_code == BRCMF_E_MGMT_FRAME_TXSTATUS) {</div><div class='add'>+		if (e-&gt;status == BRCMF_E_STATUS_SUCCESS)</div><div class='add'>+			set_bit(BRCMF_MGMT_TX_ACK, &amp;vif-&gt;mgmt_tx_status);</div><div class='add'>+		else</div><div class='add'>+			set_bit(BRCMF_MGMT_TX_NOACK, &amp;vif-&gt;mgmt_tx_status);</div><div class='add'>+	} else {</div><div class='add'>+		set_bit(BRCMF_MGMT_TX_OFF_CHAN_COMPLETED, &amp;vif-&gt;mgmt_tx_status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	complete(&amp;vif-&gt;mgmt_tx);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void brcmf_cyw_register_event_handlers(struct brcmf_pub *drvr)</div><div class='add'>+{</div><div class='add'>+	brcmf_fweh_register(drvr, BRCMF_E_EXT_AUTH_REQ,</div><div class='add'>+			    brcmf_cyw_notify_ext_auth_req);</div><div class='add'>+	brcmf_fweh_register(drvr, BRCMF_E_EXT_AUTH_FRAME_RX,</div><div class='add'>+			    brcmf_notify_auth_frame_rx);</div><div class='add'>+	brcmf_fweh_register(drvr, BRCMF_E_MGMT_FRAME_TXSTATUS,</div><div class='add'>+			    brcmf_notify_mgmt_tx_status);</div><div class='add'>+	brcmf_fweh_register(drvr, BRCMF_E_MGMT_FRAME_OFFCHAN_DONE,</div><div class='add'>+			    brcmf_notify_mgmt_tx_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct brcmf_fwvid_ops brcmf_cyw_ops = {</div><div class='add'>+	.set_sae_password = brcmf_cyw_set_sae_pwd,</div><div class='add'>+	.alloc_fweh_info = brcmf_cyw_alloc_fweh_info,</div><div class='add'>+	.activate_events = brcmf_cyw_activate_events,</div><div class='add'>+	.get_cfg80211_ops = brcmf_cyw_get_cfg80211_ops,</div><div class='add'>+	.register_event_handlers = brcmf_cyw_register_event_handlers,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h<br/>new file mode 100644<br/>index 000000000000..669564382e32<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h</a></div><div class='hunk'>@@ -0,0 +1,87 @@</div><div class='add'>+// SPDX-License-Identifier: ISC</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2012 Broadcom Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef CYW_FWIL_TYPES_H_</div><div class='add'>+#define CYW_FWIL_TYPES_H_</div><div class='add'>+</div><div class='add'>+#include &lt;fwil_types.h&gt;</div><div class='add'>+</div><div class='add'>+enum brcmf_event_msgs_ext_command {</div><div class='add'>+	CYW_EVENTMSGS_NONE	= 0,</div><div class='add'>+	CYW_EVENTMSGS_SET_BIT	= 1,</div><div class='add'>+	CYW_EVENTMSGS_RESET_BIT	= 2,</div><div class='add'>+	CYW_EVENTMSGS_SET_MASK	= 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define EVENTMSGS_VER 1</div><div class='add'>+#define EVENTMSGS_EXT_STRUCT_SIZE	offsetof(struct eventmsgs_ext, mask[0])</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct brcmf_eventmsgs_ext - structure used with "eventmsgs_ext" iovar.</div><div class='add'>+ *</div><div class='add'>+ * @ver: version.</div><div class='add'>+ * @command: requested operation (see &amp;enum event_msgs_ext_command).</div><div class='add'>+ * @len: length of the @mask array.</div><div class='add'>+ * @maxgetsize: indicates maximum mask size that may be returned by firmware</div><div class='add'>+ *	upon iovar GET.</div><div class='add'>+ * @mask: array where each bit represents firmware event.</div><div class='add'>+ */</div><div class='add'>+struct brcmf_eventmsgs_ext {</div><div class='add'>+	u8	ver;</div><div class='add'>+	u8	command;</div><div class='add'>+	u8	len;</div><div class='add'>+	u8	maxgetsize;</div><div class='add'>+	u8	mask[] __counted_by(len);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BRCMF_EXTAUTH_START		1</div><div class='add'>+#define BRCMF_EXTAUTH_ABORT		2</div><div class='add'>+#define BRCMF_EXTAUTH_FAIL		3</div><div class='add'>+#define BRCMF_EXTAUTH_SUCCESS		4</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct brcmf_auth_req_status_le - external auth request and status update</div><div class='add'>+ *</div><div class='add'>+ * @flags: flags for external auth status</div><div class='add'>+ * @peer_mac: peer MAC address</div><div class='add'>+ * @ssid_len: length of ssid</div><div class='add'>+ * @ssid: ssid characters</div><div class='add'>+ * @pmkid: PMKSA identifier</div><div class='add'>+ */</div><div class='add'>+struct brcmf_auth_req_status_le {</div><div class='add'>+	__le16 flags;</div><div class='add'>+	u8 peer_mac[ETH_ALEN];</div><div class='add'>+	__le32 ssid_len;</div><div class='add'>+	u8 ssid[IEEE80211_MAX_SSID_LEN];</div><div class='add'>+	u8 pmkid[WLAN_PMKID_LEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct brcmf_mf_params_le - management frame parameters for mgmt_frame iovar</div><div class='add'>+ *</div><div class='add'>+ * @version: version of the iovar</div><div class='add'>+ * @dwell_time: dwell duration in ms</div><div class='add'>+ * @len: length of frame data</div><div class='add'>+ * @frame_control: frame control</div><div class='add'>+ * @channel: channel</div><div class='add'>+ * @da: peer MAC address</div><div class='add'>+ * @bssid: BSS network identifier</div><div class='add'>+ * @packet_id: packet identifier</div><div class='add'>+ * @data: frame data</div><div class='add'>+ */</div><div class='add'>+struct brcmf_mf_params_le {</div><div class='add'>+	__le32 version;</div><div class='add'>+	__le32 dwell_time;</div><div class='add'>+	__le16 len;</div><div class='add'>+	__le16 frame_control;</div><div class='add'>+	__le16 channel;</div><div class='add'>+	u8 da[ETH_ALEN];</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	__le32 packet_id;</div><div class='add'>+	u8 data[] __counted_by_le(len);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* CYW_FWIL_TYPES_H_ */</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/module.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/module.c<br/>new file mode 100644<br/>index 000000000000..ce5fcfd42a7e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/module.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/module.c</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+// SPDX-License-Identifier: ISC</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022 Broadcom Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;bus.h&gt;</div><div class='add'>+#include &lt;core.h&gt;</div><div class='add'>+#include &lt;fwvid.h&gt;</div><div class='add'>+</div><div class='add'>+#include "vops.h"</div><div class='add'>+</div><div class='add'>+static int __init brcmf_cyw_init(void)</div><div class='add'>+{</div><div class='add'>+	return brcmf_fwvid_register_vendor(BRCMF_FWVENDOR_CYW, THIS_MODULE,</div><div class='add'>+					   &amp;brcmf_cyw_ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit brcmf_cyw_exit(void)</div><div class='add'>+{</div><div class='add'>+	brcmf_fwvid_unregister_vendor(BRCMF_FWVENDOR_CYW, THIS_MODULE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Broadcom FullMAC WLAN driver plugin for Cypress/Infineon chipsets");</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='add'>+MODULE_IMPORT_NS("BRCMFMAC");</div><div class='add'>+</div><div class='add'>+module_init(brcmf_cyw_init);</div><div class='add'>+module_exit(brcmf_cyw_exit);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/vops.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/vops.h<br/>new file mode 100644<br/>index 000000000000..870b5bead436<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/vops.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/vops.h</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+/* SPDX-License-Identifier: ISC */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022 Broadcom Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef _BRCMFMAC_CYW_VOPS_H</div><div class='add'>+#define _BRCMFMAC_CYW_VOPS_H</div><div class='add'>+</div><div class='add'>+extern const struct brcmf_fwvid_ops brcmf_cyw_ops;</div><div class='add'>+#define CYW_VOPS	(&amp;brcmf_cyw_ops)</div><div class='add'>+</div><div class='add'>+#endif /* _BRCMFMAC_CYW_VOPS_H */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h<br/>index 44ba6f389fa9..9bb5f709d41a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h</a></div><div class='hunk'>@@ -60,6 +60,10 @@ void __brcmf_err(struct brcmf_bus *bus, const char *func, const char *fmt, ...);</div><div class='ctx'> 				  ##__VA_ARGS__);			\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='add'>+#define bphy_info_once(drvr, fmt, ...)					\</div><div class='add'>+	wiphy_info_once((drvr)-&gt;wiphy, "%s: " fmt, __func__,		\</div><div class='add'>+			##__VA_ARGS__)</div><div class='add'>+</div><div class='ctx'> #if defined(DEBUG) || defined(CONFIG_BRCM_TRACING)</div><div class='ctx'> </div><div class='ctx'> /* For debug/tracing purposes treat info messages as errors */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c<br/>index 6d5188b78f2d..abe7f6501e5e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c</a></div><div class='hunk'>@@ -24,6 +24,17 @@ static const struct brcmf_dmi_data acepc_t8_data = {</div><div class='ctx'> 	BRCM_CC_4345_CHIP_ID, 6, "acepc-t8"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct brcmf_dmi_data acer_a1_840_data = {</div><div class='add'>+	BRCM_CC_43340_CHIP_ID, 2, "acer-a1-840"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The Chuwi Hi8 Pro uses the same Ampak AP6212 module as the Chuwi Vi8 Plus</div><div class='add'>+ * and the nvram for the Vi8 Plus is already in linux-firmware, so use that.</div><div class='add'>+ */</div><div class='add'>+static const struct brcmf_dmi_data chuwi_hi8_pro_data = {</div><div class='add'>+	BRCM_CC_43430_CHIP_ID, 0, "ilife-S806"</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct brcmf_dmi_data gpd_win_pocket_data = {</div><div class='ctx'> 	BRCM_CC_4356_CHIP_ID, 2, "gpd-win-pocket"</div><div class='ctx'> };</div><div class='hunk'>@@ -76,6 +87,46 @@ static const struct dmi_system_id dmi_platform_data[] = {</div><div class='ctx'> 		.driver_data = (void *)&amp;acepc_t8_data,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		/* ACEPC W5 Pro Cherry Trail Z8350 HDMI stick, same wifi as the T8 */</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_BOARD_NAME, "T3 MRD"),</div><div class='add'>+			DMI_MATCH(DMI_CHASSIS_TYPE, "3"),</div><div class='add'>+			DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),</div><div class='add'>+		},</div><div class='add'>+		.driver_data = (void *)&amp;acepc_t8_data,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		/* Acer Iconia One 8 A1-840 (non FHD version) */</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "BayTrail"),</div><div class='add'>+			/* Above strings are too generic also match BIOS date */</div><div class='add'>+			DMI_MATCH(DMI_BIOS_DATE, "04/01/2014"),</div><div class='add'>+		},</div><div class='add'>+		.driver_data = (void *)&amp;acer_a1_840_data,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		/* Chuwi Hi8 Pro with D2D3_Hi8Pro.233 BIOS */</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "Hampoo"),</div><div class='add'>+			DMI_EXACT_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),</div><div class='add'>+			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "MRD"),</div><div class='add'>+			/* Above strings are too generic, also match on BIOS date */</div><div class='add'>+			DMI_MATCH(DMI_BIOS_DATE, "05/10/2016"),</div><div class='add'>+		},</div><div class='add'>+		.driver_data = (void *)&amp;chuwi_hi8_pro_data,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		/* Cyberbook T116 rugged tablet */</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "Default string"),</div><div class='add'>+			DMI_EXACT_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),</div><div class='add'>+			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "20170531"),</div><div class='add'>+		},</div><div class='add'>+		/* The factory image nvram file is identical to the ACEPC T8 one */</div><div class='add'>+		.driver_data = (void *)&amp;acepc_t8_data,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		/* Match for the GPDwin which unfortunately uses somewhat</div><div class='ctx'> 		 * generic dmi strings, which is why we test for 4 strings.</div><div class='ctx'> 		 * Comparing against 23 other byt/cht boards, board_vendor</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c<br/>index 7c68d9849324..488364ef8ff2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> #include "fwil.h"</div><div class='ctx'> #include "fwil_types.h"</div><div class='add'>+#include "fwvid.h"</div><div class='ctx'> #include "feature.h"</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='hunk'>@@ -41,8 +42,9 @@ static const struct brcmf_feat_fwcap brcmf_fwcap_map[] = {</div><div class='ctx'> 	{ BRCMF_FEAT_MONITOR_FLAG, "rtap" },</div><div class='ctx'> 	{ BRCMF_FEAT_MONITOR_FMT_RADIOTAP, "rtap" },</div><div class='ctx'> 	{ BRCMF_FEAT_DOT11H, "802.11h" },</div><div class='del'>-	{ BRCMF_FEAT_SAE, "sae" },</div><div class='add'>+	{ BRCMF_FEAT_SAE, "sae " },</div><div class='ctx'> 	{ BRCMF_FEAT_FWAUTH, "idauth" },</div><div class='add'>+	{ BRCMF_FEAT_SAE_EXT, "sae_ext" },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='hunk'>@@ -126,6 +128,53 @@ static void brcmf_feat_firmware_overrides(struct brcmf_pub *drv)</div><div class='ctx'> 	drv-&gt;feat_flags |= feat_flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct brcmf_feat_wlcfeat {</div><div class='add'>+	u16 min_ver_major;</div><div class='add'>+	u16 min_ver_minor;</div><div class='add'>+	u32 feat_flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct brcmf_feat_wlcfeat brcmf_feat_wlcfeat_map[] = {</div><div class='add'>+	{ 12, 0, BIT(BRCMF_FEAT_PMKID_V2) },</div><div class='add'>+	{ 13, 0, BIT(BRCMF_FEAT_PMKID_V3) },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void brcmf_feat_wlc_version_overrides(struct brcmf_pub *drv)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_if *ifp = brcmf_get_ifp(drv, 0);</div><div class='add'>+	const struct brcmf_feat_wlcfeat *e;</div><div class='add'>+	struct brcmf_wlc_version_le ver;</div><div class='add'>+	u32 feat_flags = 0;</div><div class='add'>+	int i, err, major, minor;</div><div class='add'>+</div><div class='add'>+	err = brcmf_fil_iovar_data_get(ifp, "wlc_ver", &amp;ver, sizeof(ver));</div><div class='add'>+	if (err)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	major = le16_to_cpu(ver.wlc_ver_major);</div><div class='add'>+	minor = le16_to_cpu(ver.wlc_ver_minor);</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(INFO, "WLC version: %d.%d\n", major, minor);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(brcmf_feat_wlcfeat_map); i++) {</div><div class='add'>+		e = &amp;brcmf_feat_wlcfeat_map[i];</div><div class='add'>+		if (major &gt; e-&gt;min_ver_major ||</div><div class='add'>+		    (major == e-&gt;min_ver_major &amp;&amp;</div><div class='add'>+		     minor &gt;= e-&gt;min_ver_minor)) {</div><div class='add'>+			feat_flags |= e-&gt;feat_flags;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!feat_flags)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BRCMF_FEAT_LAST; i++)</div><div class='add'>+		if (feat_flags &amp; BIT(i))</div><div class='add'>+			brcmf_dbg(INFO, "enabling firmware feature: %s\n",</div><div class='add'>+				  brcmf_feat_names[i]);</div><div class='add'>+	drv-&gt;feat_flags |= feat_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * brcmf_feat_iovar_int_get() - determine feature through iovar query.</div><div class='ctx'>  *</div><div class='hunk'>@@ -143,7 +192,7 @@ static void brcmf_feat_iovar_int_get(struct brcmf_if *ifp,</div><div class='ctx'> 	ifp-&gt;fwil_fwerr = true;</div><div class='ctx'> </div><div class='ctx'> 	err = brcmf_fil_iovar_int_get(ifp, name, &amp;data);</div><div class='del'>-	if (err == 0) {</div><div class='add'>+	if (err != -BRCMF_FW_UNSUPPORTED) {</div><div class='ctx'> 		brcmf_dbg(INFO, "enabling feature: %s\n", brcmf_feat_names[id]);</div><div class='ctx'> 		ifp-&gt;drvr-&gt;feat_flags |= BIT(id);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -248,7 +297,9 @@ void brcmf_feat_attach(struct brcmf_pub *drvr)</div><div class='ctx'> 	brcmf_feat_firmware_capabilities(ifp);</div><div class='ctx'> 	memset(&amp;gscan_cfg, 0, sizeof(gscan_cfg));</div><div class='ctx'> 	if (drvr-&gt;bus_if-&gt;chip != BRCM_CC_43430_CHIP_ID &amp;&amp;</div><div class='del'>-	    drvr-&gt;bus_if-&gt;chip != BRCM_CC_4345_CHIP_ID)</div><div class='add'>+	    drvr-&gt;bus_if-&gt;chip != BRCM_CC_4345_CHIP_ID &amp;&amp;</div><div class='add'>+	    drvr-&gt;bus_if-&gt;chip != BRCM_CC_43454_CHIP_ID &amp;&amp;</div><div class='add'>+	    drvr-&gt;bus_if-&gt;chip != CY_CC_43439_CHIP_ID)</div><div class='ctx'> 		brcmf_feat_iovar_data_set(ifp, BRCMF_FEAT_GSCAN,</div><div class='ctx'> 					  "pfn_gscan_cfg",</div><div class='ctx'> 					  &amp;gscan_cfg, sizeof(gscan_cfg));</div><div class='hunk'>@@ -279,6 +330,7 @@ void brcmf_feat_attach(struct brcmf_pub *drvr)</div><div class='ctx'> 	brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_RSDB, "rsdb_mode");</div><div class='ctx'> 	brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_TDLS, "tdls_enable");</div><div class='ctx'> 	brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_MFP, "mfp");</div><div class='add'>+	brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_DUMP_OBSS, "dump_obss");</div><div class='ctx'> </div><div class='ctx'> 	pfn_mac.version = BRCMF_PFN_MACADDR_CFG_VER;</div><div class='ctx'> 	err = brcmf_fil_iovar_data_get(ifp, "pfn_macaddr", &amp;pfn_mac,</div><div class='hunk'>@@ -287,6 +339,12 @@ void brcmf_feat_attach(struct brcmf_pub *drvr)</div><div class='ctx'> 		ifp-&gt;drvr-&gt;feat_flags |= BIT(BRCMF_FEAT_SCAN_RANDOM_MAC);</div><div class='ctx'> </div><div class='ctx'> 	brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_FWSUP, "sup_wpa");</div><div class='add'>+	brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_SCAN_V2, "scan_ver");</div><div class='add'>+</div><div class='add'>+	brcmf_feat_wlc_version_overrides(drvr);</div><div class='add'>+	brcmf_feat_firmware_overrides(drvr);</div><div class='add'>+</div><div class='add'>+	brcmf_fwvid_feat_attach(ifp);</div><div class='ctx'> </div><div class='ctx'> 	if (drvr-&gt;settings-&gt;feature_disable) {</div><div class='ctx'> 		brcmf_dbg(INFO, "Features: 0x%02x, disable: 0x%02x\n",</div><div class='hunk'>@@ -295,8 +353,6 @@ void brcmf_feat_attach(struct brcmf_pub *drvr)</div><div class='ctx'> 		ifp-&gt;drvr-&gt;feat_flags &amp;= ~drvr-&gt;settings-&gt;feature_disable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	brcmf_feat_firmware_overrides(drvr);</div><div class='del'>-</div><div class='ctx'> 	/* set chip related quirks */</div><div class='ctx'> 	switch (drvr-&gt;bus_if-&gt;chip) {</div><div class='ctx'> 	case BRCM_CC_43236_CHIP_ID:</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h<br/>index d1f4257af696..31f8695ca417 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h</a></div><div class='hunk'>@@ -29,6 +29,9 @@</div><div class='ctx'>  * DOT11H: firmware supports 802.11h</div><div class='ctx'>  * SAE: simultaneous authentication of equals</div><div class='ctx'>  * FWAUTH: Firmware authenticator</div><div class='add'>+ * DUMP_OBSS: Firmware has capable to dump obss info to support ACS</div><div class='add'>+ * SCAN_V2: Version 2 scan params</div><div class='add'>+ * SAE_EXT: SAE authentication handled by user-space supplicant</div><div class='ctx'>  */</div><div class='ctx'> #define BRCMF_FEAT_LIST \</div><div class='ctx'> 	BRCMF_FEAT_DEF(MBSS) \</div><div class='hunk'>@@ -51,7 +54,12 @@</div><div class='ctx'> 	BRCMF_FEAT_DEF(MONITOR_FMT_HW_RX_HDR) \</div><div class='ctx'> 	BRCMF_FEAT_DEF(DOT11H) \</div><div class='ctx'> 	BRCMF_FEAT_DEF(SAE) \</div><div class='del'>-	BRCMF_FEAT_DEF(FWAUTH)</div><div class='add'>+	BRCMF_FEAT_DEF(FWAUTH) \</div><div class='add'>+	BRCMF_FEAT_DEF(DUMP_OBSS) \</div><div class='add'>+	BRCMF_FEAT_DEF(SCAN_V2) \</div><div class='add'>+	BRCMF_FEAT_DEF(PMKID_V2) \</div><div class='add'>+	BRCMF_FEAT_DEF(PMKID_V3) \</div><div class='add'>+	BRCMF_FEAT_DEF(SAE_EXT)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Quirks:</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c<br/>index d40104b8df55..ef79924fd8f4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c</a></div><div class='hunk'>@@ -19,8 +19,10 @@</div><div class='ctx'> </div><div class='ctx'> #define BRCMF_FW_MAX_NVRAM_SIZE			64000</div><div class='ctx'> #define BRCMF_FW_NVRAM_DEVPATH_LEN		19	/* devpath0=pcie/1/4/ */</div><div class='del'>-#define BRCMF_FW_NVRAM_PCIEDEV_LEN		10	/* pcie/1/4/ + \0 */</div><div class='add'>+#define BRCMF_FW_NVRAM_PCIEDEV_LEN		20	/* pcie/1/4/ + \0 */</div><div class='ctx'> #define BRCMF_FW_DEFAULT_BOARDREV		"boardrev=0xff"</div><div class='add'>+#define BRCMF_FW_MACADDR_FMT			"macaddr=%pM"</div><div class='add'>+#define BRCMF_FW_MACADDR_LEN			(7 + ETH_ALEN * 3)</div><div class='ctx'> </div><div class='ctx'> enum nvram_parser_state {</div><div class='ctx'> 	IDLE,</div><div class='hunk'>@@ -44,6 +46,7 @@ enum nvram_parser_state {</div><div class='ctx'>  * @multi_dev_v1: detect pcie multi device v1 (compressed).</div><div class='ctx'>  * @multi_dev_v2: detect pcie multi device v2.</div><div class='ctx'>  * @boardrev_found: nvram contains boardrev information.</div><div class='add'>+ * @strip_mac: strip the MAC address.</div><div class='ctx'>  */</div><div class='ctx'> struct nvram_parser {</div><div class='ctx'> 	enum nvram_parser_state state;</div><div class='hunk'>@@ -57,6 +60,7 @@ struct nvram_parser {</div><div class='ctx'> 	bool multi_dev_v1;</div><div class='ctx'> 	bool multi_dev_v2;</div><div class='ctx'> 	bool boardrev_found;</div><div class='add'>+	bool strip_mac;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -121,6 +125,10 @@ static enum nvram_parser_state brcmf_nvram_handle_key(struct nvram_parser *nvp)</div><div class='ctx'> 			nvp-&gt;multi_dev_v2 = true;</div><div class='ctx'> 		if (strncmp(&amp;nvp-&gt;data[nvp-&gt;entry], "boardrev", 8) == 0)</div><div class='ctx'> 			nvp-&gt;boardrev_found = true;</div><div class='add'>+		/* strip macaddr if platform MAC overrides */</div><div class='add'>+		if (nvp-&gt;strip_mac &amp;&amp;</div><div class='add'>+		    strncmp(&amp;nvp-&gt;data[nvp-&gt;entry], "macaddr", 7) == 0)</div><div class='add'>+			st = COMMENT;</div><div class='ctx'> 	} else if (!is_nvram_char(c) || c == ' ') {</div><div class='ctx'> 		brcmf_dbg(INFO, "warning: ln=%d:col=%d: '=' expected, skip invalid key entry\n",</div><div class='ctx'> 			  nvp-&gt;line, nvp-&gt;column);</div><div class='hunk'>@@ -207,6 +215,9 @@ static int brcmf_init_nvram_parser(struct nvram_parser *nvp,</div><div class='ctx'> 		size = BRCMF_FW_MAX_NVRAM_SIZE;</div><div class='ctx'> 	else</div><div class='ctx'> 		size = data_len;</div><div class='add'>+	/* Add space for properties we may add */</div><div class='add'>+	size += strlen(BRCMF_FW_DEFAULT_BOARDREV) + 1;</div><div class='add'>+	size += BRCMF_FW_MACADDR_LEN + 1;</div><div class='ctx'> 	/* Alloc for extra 0 byte + roundup by 4 + length field */</div><div class='ctx'> 	size += 1 + 3 + sizeof(u32);</div><div class='ctx'> 	nvp-&gt;nvram = kzalloc(size, GFP_KERNEL);</div><div class='hunk'>@@ -227,9 +238,9 @@ static void brcmf_fw_strip_multi_v1(struct nvram_parser *nvp, u16 domain_nr,</div><div class='ctx'> 				    u16 bus_nr)</div><div class='ctx'> {</div><div class='ctx'> 	/* Device path with a leading '=' key-value separator */</div><div class='del'>-	char pci_path[] = "=pci/?/?";</div><div class='add'>+	char pci_path[20];</div><div class='ctx'> 	size_t pci_len;</div><div class='del'>-	char pcie_path[] = "=pcie/?/?";</div><div class='add'>+	char pcie_path[20];</div><div class='ctx'> 	size_t pcie_len;</div><div class='ctx'> </div><div class='ctx'> 	u32 i, j;</div><div class='hunk'>@@ -366,22 +377,37 @@ static void brcmf_fw_add_defaults(struct nvram_parser *nvp)</div><div class='ctx'> 	nvp-&gt;nvram_len++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void brcmf_fw_add_macaddr(struct nvram_parser *nvp, u8 *mac)</div><div class='add'>+{</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = scnprintf(&amp;nvp-&gt;nvram[nvp-&gt;nvram_len], BRCMF_FW_MACADDR_LEN + 1,</div><div class='add'>+			BRCMF_FW_MACADDR_FMT, mac);</div><div class='add'>+	WARN_ON(len != BRCMF_FW_MACADDR_LEN);</div><div class='add'>+	nvp-&gt;nvram_len += len + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* brcmf_nvram_strip :Takes a buffer of "&lt;var&gt;=&lt;value&gt;\n" lines read from a fil</div><div class='ctx'>  * and ending in a NUL. Removes carriage returns, empty lines, comment lines,</div><div class='ctx'>  * and converts newlines to NULs. Shortens buffer as needed and pads with NULs.</div><div class='ctx'>  * End of buffer is completed with token identifying length of buffer.</div><div class='ctx'>  */</div><div class='ctx'> static void *brcmf_fw_nvram_strip(const u8 *data, size_t data_len,</div><div class='del'>-				  u32 *new_length, u16 domain_nr, u16 bus_nr)</div><div class='add'>+				  u32 *new_length, u16 domain_nr, u16 bus_nr,</div><div class='add'>+				  struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct nvram_parser nvp;</div><div class='ctx'> 	u32 pad;</div><div class='ctx'> 	u32 token;</div><div class='ctx'> 	__le32 token_le;</div><div class='add'>+	u8 mac[ETH_ALEN];</div><div class='ctx'> </div><div class='ctx'> 	if (brcmf_init_nvram_parser(&amp;nvp, data, data_len) &lt; 0)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	if (eth_platform_get_mac_address(dev, mac) == 0)</div><div class='add'>+		nvp.strip_mac = true;</div><div class='add'>+</div><div class='ctx'> 	while (nvp.pos &lt; data_len) {</div><div class='ctx'> 		nvp.state = nv_parser_states[nvp.state](&amp;nvp);</div><div class='ctx'> 		if (nvp.state == END)</div><div class='hunk'>@@ -402,6 +428,9 @@ static void *brcmf_fw_nvram_strip(const u8 *data, size_t data_len,</div><div class='ctx'> </div><div class='ctx'> 	brcmf_fw_add_defaults(&amp;nvp);</div><div class='ctx'> </div><div class='add'>+	if (nvp.strip_mac)</div><div class='add'>+		brcmf_fw_add_macaddr(&amp;nvp, mac);</div><div class='add'>+</div><div class='ctx'> 	pad = nvp.nvram_len;</div><div class='ctx'> 	*new_length = roundup(nvp.nvram_len + 1, 4);</div><div class='ctx'> 	while (pad != *new_length) {</div><div class='hunk'>@@ -428,11 +457,10 @@ struct brcmf_fw {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct brcmf_fw_request *req;</div><div class='ctx'> 	u32 curpos;</div><div class='add'>+	unsigned int board_index;</div><div class='ctx'> 	void (*done)(struct device *dev, int err, struct brcmf_fw_request *req);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void brcmf_fw_request_done(const struct firmware *fw, void *ctx);</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_EFI</div><div class='ctx'> /* In some cases the EFI-var stored nvram contains "ccode=ALL" or "ccode=XV"</div><div class='ctx'>  * to specify "worldwide" compatible settings, but these 2 ccode-s do not work</div><div class='hunk'>@@ -459,43 +487,34 @@ static void brcmf_fw_fix_efi_nvram_ccode(char *data, unsigned long data_len)</div><div class='ctx'> </div><div class='ctx'> static u8 *brcmf_fw_nvram_from_efi(size_t *data_len_ret)</div><div class='ctx'> {</div><div class='del'>-	const u16 name[] = { 'n', 'v', 'r', 'a', 'm', 0 };</div><div class='del'>-	struct efivar_entry *nvram_efivar;</div><div class='add'>+	efi_guid_t guid = EFI_GUID(0x74b00bd9, 0x805a, 0x4d61, 0xb5, 0x1f,</div><div class='add'>+				   0x43, 0x26, 0x81, 0x23, 0xd1, 0x13);</div><div class='ctx'> 	unsigned long data_len = 0;</div><div class='add'>+	efi_status_t status;</div><div class='ctx'> 	u8 *data = NULL;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	nvram_efivar = kzalloc(sizeof(*nvram_efivar), GFP_KERNEL);</div><div class='del'>-	if (!nvram_efivar)</div><div class='add'>+	if (!efi_rt_services_supported(EFI_RT_SUPPORTED_GET_VARIABLE))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;nvram_efivar-&gt;var.VariableName, name, sizeof(name));</div><div class='del'>-	nvram_efivar-&gt;var.VendorGuid = EFI_GUID(0x74b00bd9, 0x805a, 0x4d61,</div><div class='del'>-						0xb5, 0x1f, 0x43, 0x26,</div><div class='del'>-						0x81, 0x23, 0xd1, 0x13);</div><div class='del'>-</div><div class='del'>-	err = efivar_entry_size(nvram_efivar, &amp;data_len);</div><div class='del'>-	if (err)</div><div class='add'>+	status = efi.get_variable(L"nvram", &amp;guid, NULL, &amp;data_len, NULL);</div><div class='add'>+	if (status != EFI_BUFFER_TOO_SMALL)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	data = kmalloc(data_len, GFP_KERNEL);</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	err = efivar_entry_get(nvram_efivar, NULL, &amp;data_len, data);</div><div class='del'>-	if (err)</div><div class='add'>+	status = efi.get_variable(L"nvram", &amp;guid, NULL, &amp;data_len, data);</div><div class='add'>+	if (status != EFI_SUCCESS)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_fw_fix_efi_nvram_ccode(data, data_len);</div><div class='ctx'> 	brcmf_info("Using nvram EFI variable\n");</div><div class='ctx'> </div><div class='del'>-	kfree(nvram_efivar);</div><div class='ctx'> 	*data_len_ret = data_len;</div><div class='ctx'> 	return data;</div><div class='del'>-</div><div class='ctx'> fail:</div><div class='ctx'> 	kfree(data);</div><div class='del'>-	kfree(nvram_efivar);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='hunk'>@@ -535,18 +554,23 @@ static int brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx)</div><div class='ctx'> 		data = (u8 *)fw-&gt;data;</div><div class='ctx'> 		data_len = fw-&gt;size;</div><div class='ctx'> 	} else {</div><div class='del'>-		if ((data = bcm47xx_nvram_get_contents(&amp;data_len)))</div><div class='add'>+		data = bcm47xx_nvram_get_contents(&amp;data_len);</div><div class='add'>+		if (data) {</div><div class='ctx'> 			free_bcm47xx_nvram = true;</div><div class='del'>-		else if ((data = brcmf_fw_nvram_from_efi(&amp;data_len)))</div><div class='del'>-			kfree_nvram = true;</div><div class='del'>-		else if (!(cur-&gt;flags &amp; BRCMF_FW_REQF_OPTIONAL))</div><div class='del'>-			goto fail;</div><div class='add'>+		} else {</div><div class='add'>+			data = brcmf_fw_nvram_from_efi(&amp;data_len);</div><div class='add'>+			if (data)</div><div class='add'>+				kfree_nvram = true;</div><div class='add'>+			else if (!(cur-&gt;flags &amp; BRCMF_FW_REQF_OPTIONAL))</div><div class='add'>+				goto fail;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (data)</div><div class='ctx'> 		nvram = brcmf_fw_nvram_strip(data, data_len, &amp;nvram_length,</div><div class='ctx'> 					     fwctx-&gt;req-&gt;domain_nr,</div><div class='del'>-					     fwctx-&gt;req-&gt;bus_nr);</div><div class='add'>+					     fwctx-&gt;req-&gt;bus_nr,</div><div class='add'>+					     fwctx-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (free_bcm47xx_nvram)</div><div class='ctx'> 		bcm47xx_nvram_release_contents(data);</div><div class='hunk'>@@ -594,28 +618,58 @@ static int brcmf_fw_complete_request(const struct firmware *fw,</div><div class='ctx'> 	return (cur-&gt;flags &amp; BRCMF_FW_REQF_OPTIONAL) ? 0 : ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static char *brcm_alt_fw_path(const char *path, const char *board_type)</div><div class='add'>+{</div><div class='add'>+	char base[BRCMF_FW_NAME_LEN];</div><div class='add'>+	const char *suffix;</div><div class='add'>+	char *ret;</div><div class='add'>+</div><div class='add'>+	if (!board_type)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	suffix = strrchr(path, '.');</div><div class='add'>+	if (!suffix || suffix == path)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* strip extension at the end */</div><div class='add'>+	strscpy(base, path, BRCMF_FW_NAME_LEN);</div><div class='add'>+	base[suffix - path] = 0;</div><div class='add'>+</div><div class='add'>+	ret = kasprintf(GFP_KERNEL, "%s.%s%s", base, board_type, suffix);</div><div class='add'>+	if (!ret)</div><div class='add'>+		brcmf_err("out of memory allocating firmware path for '%s'\n",</div><div class='add'>+			  path);</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(TRACE, "FW alt path: %s\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int brcmf_fw_request_firmware(const struct firmware **fw,</div><div class='ctx'> 				     struct brcmf_fw *fwctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_fw_item *cur = &amp;fwctx-&gt;req-&gt;items[fwctx-&gt;curpos];</div><div class='add'>+	unsigned int i;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* nvram files are board-specific, first try a board-specific path */</div><div class='del'>-	if (cur-&gt;type == BRCMF_FW_TYPE_NVRAM &amp;&amp; fwctx-&gt;req-&gt;board_type) {</div><div class='del'>-		char alt_path[BRCMF_FW_NAME_LEN];</div><div class='add'>+	/* Files can be board-specific, first try board-specific paths */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(fwctx-&gt;req-&gt;board_types); i++) {</div><div class='add'>+		char *alt_path;</div><div class='ctx'> </div><div class='del'>-		strlcpy(alt_path, cur-&gt;path, BRCMF_FW_NAME_LEN);</div><div class='del'>-		/* strip .txt at the end */</div><div class='del'>-		alt_path[strlen(alt_path) - 4] = 0;</div><div class='del'>-		strlcat(alt_path, ".", BRCMF_FW_NAME_LEN);</div><div class='del'>-		strlcat(alt_path, fwctx-&gt;req-&gt;board_type, BRCMF_FW_NAME_LEN);</div><div class='del'>-		strlcat(alt_path, ".txt", BRCMF_FW_NAME_LEN);</div><div class='add'>+		if (!fwctx-&gt;req-&gt;board_types[i])</div><div class='add'>+			goto fallback;</div><div class='add'>+		alt_path = brcm_alt_fw_path(cur-&gt;path,</div><div class='add'>+					    fwctx-&gt;req-&gt;board_types[i]);</div><div class='add'>+		if (!alt_path)</div><div class='add'>+			goto fallback;</div><div class='ctx'> </div><div class='del'>-		ret = request_firmware(fw, alt_path, fwctx-&gt;dev);</div><div class='add'>+		ret = firmware_request_nowarn(fw, alt_path, fwctx-&gt;dev);</div><div class='add'>+		kfree(alt_path);</div><div class='ctx'> 		if (ret == 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+fallback:</div><div class='ctx'> 	return request_firmware(fw, cur-&gt;path, fwctx-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -639,6 +693,47 @@ static void brcmf_fw_request_done(const struct firmware *fw, void *ctx)</div><div class='ctx'> 	kfree(fwctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void brcmf_fw_request_done_alt_path(const struct firmware *fw, void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_fw *fwctx = ctx;</div><div class='add'>+	struct brcmf_fw_item *first = &amp;fwctx-&gt;req-&gt;items[0];</div><div class='add'>+	const char *board_type, *alt_path;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (fw) {</div><div class='add'>+		brcmf_fw_request_done(fw, ctx);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Try next board firmware */</div><div class='add'>+	if (fwctx-&gt;board_index &lt; ARRAY_SIZE(fwctx-&gt;req-&gt;board_types)) {</div><div class='add'>+		board_type = fwctx-&gt;req-&gt;board_types[fwctx-&gt;board_index++];</div><div class='add'>+		if (!board_type)</div><div class='add'>+			goto fallback;</div><div class='add'>+		alt_path = brcm_alt_fw_path(first-&gt;path, board_type);</div><div class='add'>+		if (!alt_path)</div><div class='add'>+			goto fallback;</div><div class='add'>+</div><div class='add'>+		ret = request_firmware_nowait(THIS_MODULE, true, alt_path,</div><div class='add'>+					      fwctx-&gt;dev, GFP_KERNEL, fwctx,</div><div class='add'>+					      brcmf_fw_request_done_alt_path);</div><div class='add'>+		kfree(alt_path);</div><div class='add'>+</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			brcmf_fw_request_done(fw, ctx);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+fallback:</div><div class='add'>+	/* Fall back to canonical path if board firmware not found */</div><div class='add'>+	ret = request_firmware_nowait(THIS_MODULE, true, first-&gt;path,</div><div class='add'>+				      fwctx-&gt;dev, GFP_KERNEL, fwctx,</div><div class='add'>+				      brcmf_fw_request_done);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		brcmf_fw_request_done(fw, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool brcmf_fw_request_is_valid(struct brcmf_fw_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_fw_item *item;</div><div class='hunk'>@@ -660,6 +755,7 @@ int brcmf_fw_get_firmwares(struct device *dev, struct brcmf_fw_request *req,</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_fw_item *first = &amp;req-&gt;items[0];</div><div class='ctx'> 	struct brcmf_fw *fwctx;</div><div class='add'>+	char *alt_path = NULL;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(dev));</div><div class='hunk'>@@ -677,9 +773,21 @@ int brcmf_fw_get_firmwares(struct device *dev, struct brcmf_fw_request *req,</div><div class='ctx'> 	fwctx-&gt;req = req;</div><div class='ctx'> 	fwctx-&gt;done = fw_cb;</div><div class='ctx'> </div><div class='del'>-	ret = request_firmware_nowait(THIS_MODULE, true, first-&gt;path,</div><div class='del'>-				      fwctx-&gt;dev, GFP_KERNEL, fwctx,</div><div class='del'>-				      brcmf_fw_request_done);</div><div class='add'>+	/* First try alternative board-specific path if any */</div><div class='add'>+	if (fwctx-&gt;req-&gt;board_types[0])</div><div class='add'>+		alt_path = brcm_alt_fw_path(first-&gt;path,</div><div class='add'>+					    fwctx-&gt;req-&gt;board_types[0]);</div><div class='add'>+	if (alt_path) {</div><div class='add'>+		fwctx-&gt;board_index++;</div><div class='add'>+		ret = request_firmware_nowait(THIS_MODULE, true, alt_path,</div><div class='add'>+					      fwctx-&gt;dev, GFP_KERNEL, fwctx,</div><div class='add'>+					      brcmf_fw_request_done_alt_path);</div><div class='add'>+		kfree(alt_path);</div><div class='add'>+	} else {</div><div class='add'>+		ret = request_firmware_nowait(THIS_MODULE, true, first-&gt;path,</div><div class='add'>+					      fwctx-&gt;dev, GFP_KERNEL, fwctx,</div><div class='add'>+					      brcmf_fw_request_done);</div><div class='add'>+	}</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		brcmf_fw_request_done(NULL, fwctx);</div><div class='ctx'> </div><div class='hunk'>@@ -699,6 +807,11 @@ brcmf_fw_alloc_request(u32 chip, u32 chiprev,</div><div class='ctx'> 	u32 i, j;</div><div class='ctx'> 	char end = '\0';</div><div class='ctx'> </div><div class='add'>+	if (chiprev &gt;= BITS_PER_TYPE(u32)) {</div><div class='add'>+		brcmf_err("Invalid chip revision %u\n", chiprev);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; table_size; i++) {</div><div class='ctx'> 		if (mapping_table[i].chipid == chip &amp;&amp;</div><div class='ctx'> 		    mapping_table[i].revmask &amp; BIT(chiprev))</div><div class='hunk'>@@ -731,7 +844,7 @@ brcmf_fw_alloc_request(u32 chip, u32 chiprev,</div><div class='ctx'> 		fwnames[j].path[0] = '\0';</div><div class='ctx'> 		/* check if firmware path is provided by module parameter */</div><div class='ctx'> 		if (brcmf_mp_global.firmware_path[0] != '\0') {</div><div class='del'>-			strlcpy(fwnames[j].path, mp_path,</div><div class='add'>+			strscpy(fwnames[j].path, mp_path,</div><div class='ctx'> 				BRCMF_FW_NAME_LEN);</div><div class='ctx'> </div><div class='ctx'> 			if (end != '/') {</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h<br/>index 46c66415b4a6..4002d326fd21 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h</a></div><div class='hunk'>@@ -11,6 +11,8 @@</div><div class='ctx'> </div><div class='ctx'> #define BRCMF_FW_DEFAULT_PATH		"brcm/"</div><div class='ctx'> </div><div class='add'>+#define BRCMF_FW_MAX_BOARD_TYPES	8</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct brcmf_firmware_mapping - Used to map chipid/revmask to firmware</div><div class='ctx'>  *	filename and nvram filename. Each bus type implementation should create</div><div class='hunk'>@@ -32,6 +34,13 @@ static const char BRCM_ ## fw_name ## _FIRMWARE_BASENAME[] = \</div><div class='ctx'> 	BRCMF_FW_DEFAULT_PATH fw_base; \</div><div class='ctx'> MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw_base ".bin")</div><div class='ctx'> </div><div class='add'>+/* Firmware and Country Local Matrix files */</div><div class='add'>+#define BRCMF_FW_CLM_DEF(fw_name, fw_base) \</div><div class='add'>+static const char BRCM_ ## fw_name ## _FIRMWARE_BASENAME[] = \</div><div class='add'>+	BRCMF_FW_DEFAULT_PATH fw_base; \</div><div class='add'>+MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw_base ".bin"); \</div><div class='add'>+MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw_base ".clm_blob")</div><div class='add'>+</div><div class='ctx'> #define BRCMF_FW_ENTRY(chipid, mask, name) \</div><div class='ctx'> 	{ chipid, mask, BRCM_ ## name ## _FIRMWARE_BASENAME }</div><div class='ctx'> </div><div class='hunk'>@@ -59,8 +68,8 @@ struct brcmf_fw_request {</div><div class='ctx'> 	u16 domain_nr;</div><div class='ctx'> 	u16 bus_nr;</div><div class='ctx'> 	u32 n_items;</div><div class='del'>-	const char *board_type;</div><div class='del'>-	struct brcmf_fw_item items[];</div><div class='add'>+	const char *board_types[BRCMF_FW_MAX_BOARD_TYPES];</div><div class='add'>+	struct brcmf_fw_item items[] __counted_by(n_items);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct brcmf_fw_name {</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c<br/>index 096f6b969dd8..e1127d7e086d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c</a></div><div class='hunk'>@@ -419,7 +419,6 @@ void brcmf_flowring_configure_addr_mode(struct brcmf_flowring *flow, int ifidx,</div><div class='ctx'> 				flowid = flow-&gt;hash[i].flowid;</div><div class='ctx'> 				if (flow-&gt;rings[flowid]-&gt;status != RING_OPEN)</div><div class='ctx'> 					continue;</div><div class='del'>-				flow-&gt;rings[flowid]-&gt;status = RING_CLOSING;</div><div class='ctx'> 				brcmf_msgbuf_delete_flowring(drvr, flowid);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -458,10 +457,8 @@ void brcmf_flowring_delete_peer(struct brcmf_flowring *flow, int ifidx,</div><div class='ctx'> 		if ((sta || (memcmp(hash[i].mac, peer, ETH_ALEN) == 0)) &amp;&amp;</div><div class='ctx'> 		    (hash[i].ifidx == ifidx)) {</div><div class='ctx'> 			flowid = flow-&gt;hash[i].flowid;</div><div class='del'>-			if (flow-&gt;rings[flowid]-&gt;status == RING_OPEN) {</div><div class='del'>-				flow-&gt;rings[flowid]-&gt;status = RING_CLOSING;</div><div class='add'>+			if (flow-&gt;rings[flowid]-&gt;status == RING_OPEN)</div><div class='ctx'> 				brcmf_msgbuf_delete_flowring(drvr, flowid);</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c<br/>index bc3f4e4edcdf..c2d98ee6652f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c</a></div><div class='hunk'>@@ -14,7 +14,8 @@</div><div class='ctx'> #include "fweh.h"</div><div class='ctx'> #include "fwil.h"</div><div class='ctx'> #include "proto.h"</div><div class='del'>-</div><div class='add'>+#include "bus.h"</div><div class='add'>+#include "fwvid.h"</div><div class='ctx'> /**</div><div class='ctx'>  * struct brcmf_fweh_queue_item - event item on event queue.</div><div class='ctx'>  *</div><div class='hunk'>@@ -28,12 +29,12 @@</div><div class='ctx'>  */</div><div class='ctx'> struct brcmf_fweh_queue_item {</div><div class='ctx'> 	struct list_head q;</div><div class='del'>-	enum brcmf_fweh_event_code code;</div><div class='add'>+	u32 code;</div><div class='ctx'> 	u8 ifidx;</div><div class='ctx'> 	u8 ifaddr[ETH_ALEN];</div><div class='ctx'> 	struct brcmf_event_msg_be emsg;</div><div class='ctx'> 	u32 datalen;</div><div class='del'>-	u8 data[];</div><div class='add'>+	u8 data[] __counted_by(datalen);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -74,6 +75,7 @@ const char *brcmf_fweh_event_name(enum brcmf_fweh_event_code code)</div><div class='ctx'> 	return "nodebug";</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='add'>+BRCMF_EXPORT_SYMBOL_GPL(brcmf_fweh_event_name);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * brcmf_fweh_queue_event() - create and queue event.</div><div class='hunk'>@@ -94,7 +96,7 @@ static void brcmf_fweh_queue_event(struct brcmf_fweh_info *fweh,</div><div class='ctx'> </div><div class='ctx'> static int brcmf_fweh_call_event_handler(struct brcmf_pub *drvr,</div><div class='ctx'> 					 struct brcmf_if *ifp,</div><div class='del'>-					 enum brcmf_fweh_event_code code,</div><div class='add'>+					 u32 fwcode,</div><div class='ctx'> 					 struct brcmf_event_msg *emsg,</div><div class='ctx'> 					 void *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -102,13 +104,13 @@ static int brcmf_fweh_call_event_handler(struct brcmf_pub *drvr,</div><div class='ctx'> 	int err = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (ifp) {</div><div class='del'>-		fweh = &amp;ifp-&gt;drvr-&gt;fweh;</div><div class='add'>+		fweh = ifp-&gt;drvr-&gt;fweh;</div><div class='ctx'> </div><div class='ctx'> 		/* handle the event if valid interface and handler */</div><div class='del'>-		if (fweh-&gt;evt_handler[code])</div><div class='del'>-			err = fweh-&gt;evt_handler[code](ifp, emsg, data);</div><div class='add'>+		if (fweh-&gt;evt_handler[fwcode])</div><div class='add'>+			err = fweh-&gt;evt_handler[fwcode](ifp, emsg, data);</div><div class='ctx'> 		else</div><div class='del'>-			bphy_err(drvr, "unhandled event %d ignored\n", code);</div><div class='add'>+			bphy_err(drvr, "unhandled fwevt %d ignored\n", fwcode);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bphy_err(drvr, "no interface object\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -142,7 +144,7 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr,</div><div class='ctx'> 	is_p2pdev = ((ifevent-&gt;flags &amp; BRCMF_E_IF_FLAG_NOIF) &amp;&amp;</div><div class='ctx'> 		     (ifevent-&gt;role == BRCMF_E_IF_ROLE_P2P_CLIENT ||</div><div class='ctx'> 		      ((ifevent-&gt;role == BRCMF_E_IF_ROLE_STA) &amp;&amp;</div><div class='del'>-		       (drvr-&gt;fweh.p2pdev_setup_ongoing))));</div><div class='add'>+		       (drvr-&gt;fweh-&gt;p2pdev_setup_ongoing))));</div><div class='ctx'> 	if (!is_p2pdev &amp;&amp; (ifevent-&gt;flags &amp; BRCMF_E_IF_FLAG_NOIF)) {</div><div class='ctx'> 		brcmf_dbg(EVENT, "event can be ignored\n");</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -163,7 +165,7 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr,</div><div class='ctx'> 			return;</div><div class='ctx'> 		if (!is_p2pdev)</div><div class='ctx'> 			brcmf_proto_add_if(drvr, ifp);</div><div class='del'>-		if (!drvr-&gt;fweh.evt_handler[BRCMF_E_IF])</div><div class='add'>+		if (!drvr-&gt;fweh-&gt;evt_handler[BRCMF_E_IF])</div><div class='ctx'> 			if (brcmf_net_attach(ifp, false) &lt; 0)</div><div class='ctx'> 				return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -183,6 +185,45 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void brcmf_fweh_map_event_code(struct brcmf_fweh_info *fweh,</div><div class='add'>+				      enum brcmf_fweh_event_code code,</div><div class='add'>+				      u32 *fw_code)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!fw_code))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	*fw_code = code;</div><div class='add'>+	if (fweh-&gt;event_map) {</div><div class='add'>+		for (i = 0; i &lt; fweh-&gt;event_map-&gt;n_items; i++) {</div><div class='add'>+			if (fweh-&gt;event_map-&gt;items[i].code == code) {</div><div class='add'>+				*fw_code = fweh-&gt;event_map-&gt;items[i].fwevt_code;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void brcmf_fweh_map_fwevt_code(struct brcmf_fweh_info *fweh, u32 fw_code,</div><div class='add'>+				      enum brcmf_fweh_event_code *code)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!code))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	*code = fw_code;</div><div class='add'>+	if (fweh-&gt;event_map) {</div><div class='add'>+		for (i = 0; i &lt; fweh-&gt;event_map-&gt;n_items; i++) {</div><div class='add'>+			if (fweh-&gt;event_map-&gt;items[i].fwevt_code == fw_code) {</div><div class='add'>+				*code = fweh-&gt;event_map-&gt;items[i].code;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * brcmf_fweh_dequeue_event() - get event from the queue.</div><div class='ctx'>  *</div><div class='hunk'>@@ -221,19 +262,27 @@ static void brcmf_fweh_event_worker(struct work_struct *work)</div><div class='ctx'> 	struct brcmf_event_msg emsg;</div><div class='ctx'> </div><div class='ctx'> 	fweh = container_of(work, struct brcmf_fweh_info, event_work);</div><div class='del'>-	drvr = container_of(fweh, struct brcmf_pub, fweh);</div><div class='add'>+	drvr = fweh-&gt;drvr;</div><div class='ctx'> </div><div class='ctx'> 	while ((event = brcmf_fweh_dequeue_event(fweh))) {</div><div class='del'>-		brcmf_dbg(EVENT, "event %s (%u) ifidx %u bsscfg %u addr %pM\n",</div><div class='del'>-			  brcmf_fweh_event_name(event-&gt;code), event-&gt;code,</div><div class='add'>+		enum brcmf_fweh_event_code code;</div><div class='add'>+</div><div class='add'>+		brcmf_fweh_map_fwevt_code(fweh, event-&gt;code, &amp;code);</div><div class='add'>+		brcmf_dbg(EVENT, "event %s (%u:%u) ifidx %u bsscfg %u addr %pM\n",</div><div class='add'>+			  brcmf_fweh_event_name(code), code, event-&gt;code,</div><div class='ctx'> 			  event-&gt;emsg.ifidx, event-&gt;emsg.bsscfgidx,</div><div class='ctx'> 			  event-&gt;emsg.addr);</div><div class='add'>+		if (event-&gt;emsg.bsscfgidx &gt;= BRCMF_MAX_IFS) {</div><div class='add'>+			bphy_err(drvr, "invalid bsscfg index: %u\n",</div><div class='add'>+				 event-&gt;emsg.bsscfgidx);</div><div class='add'>+			goto event_free;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* convert event message */</div><div class='ctx'> 		emsg_be = &amp;event-&gt;emsg;</div><div class='ctx'> 		emsg.version = be16_to_cpu(emsg_be-&gt;version);</div><div class='ctx'> 		emsg.flags = be16_to_cpu(emsg_be-&gt;flags);</div><div class='del'>-		emsg.event_code = event-&gt;code;</div><div class='add'>+		emsg.event_code = code;</div><div class='ctx'> 		emsg.status = be32_to_cpu(emsg_be-&gt;status);</div><div class='ctx'> 		emsg.reason = be32_to_cpu(emsg_be-&gt;reason);</div><div class='ctx'> 		emsg.auth_type = be32_to_cpu(emsg_be-&gt;auth_type);</div><div class='hunk'>@@ -279,7 +328,7 @@ event_free:</div><div class='ctx'>  */</div><div class='ctx'> void brcmf_fweh_p2pdev_setup(struct brcmf_if *ifp, bool ongoing)</div><div class='ctx'> {</div><div class='del'>-	ifp-&gt;drvr-&gt;fweh.p2pdev_setup_ongoing = ongoing;</div><div class='add'>+	ifp-&gt;drvr-&gt;fweh-&gt;p2pdev_setup_ongoing = ongoing;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -287,12 +336,27 @@ void brcmf_fweh_p2pdev_setup(struct brcmf_if *ifp, bool ongoing)</div><div class='ctx'>  *</div><div class='ctx'>  * @drvr: driver information object.</div><div class='ctx'>  */</div><div class='del'>-void brcmf_fweh_attach(struct brcmf_pub *drvr)</div><div class='add'>+int brcmf_fweh_attach(struct brcmf_pub *drvr)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_fweh_info *fweh = &amp;drvr-&gt;fweh;</div><div class='add'>+	struct brcmf_fweh_info *fweh;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = brcmf_fwvid_alloc_fweh_info(drvr);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	fweh = drvr-&gt;fweh;</div><div class='add'>+	fweh-&gt;drvr = drvr;</div><div class='add'>+</div><div class='add'>+	fweh-&gt;event_mask_len = DIV_ROUND_UP(fweh-&gt;num_event_codes, 8);</div><div class='add'>+	fweh-&gt;event_mask = kzalloc(fweh-&gt;event_mask_len, GFP_KERNEL);</div><div class='add'>+	if (!fweh-&gt;event_mask)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	INIT_WORK(&amp;fweh-&gt;event_work, brcmf_fweh_event_worker);</div><div class='ctx'> 	spin_lock_init(&amp;fweh-&gt;evt_q_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;fweh-&gt;event_q);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -302,14 +366,19 @@ void brcmf_fweh_attach(struct brcmf_pub *drvr)</div><div class='ctx'>  */</div><div class='ctx'> void brcmf_fweh_detach(struct brcmf_pub *drvr)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_fweh_info *fweh = &amp;drvr-&gt;fweh;</div><div class='add'>+	struct brcmf_fweh_info *fweh = drvr-&gt;fweh;</div><div class='add'>+</div><div class='add'>+	if (!fweh)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* cancel the worker if initialized */</div><div class='ctx'> 	if (fweh-&gt;event_work.func) {</div><div class='ctx'> 		cancel_work_sync(&amp;fweh-&gt;event_work);</div><div class='ctx'> 		WARN_ON(!list_empty(&amp;fweh-&gt;event_q));</div><div class='del'>-		memset(fweh-&gt;evt_handler, 0, sizeof(fweh-&gt;evt_handler));</div><div class='ctx'> 	}</div><div class='add'>+	drvr-&gt;fweh = NULL;</div><div class='add'>+	kfree(fweh-&gt;event_mask);</div><div class='add'>+	kfree(fweh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -322,15 +391,22 @@ void brcmf_fweh_detach(struct brcmf_pub *drvr)</div><div class='ctx'> int brcmf_fweh_register(struct brcmf_pub *drvr, enum brcmf_fweh_event_code code,</div><div class='ctx'> 			brcmf_fweh_handler_t handler)</div><div class='ctx'> {</div><div class='del'>-	if (drvr-&gt;fweh.evt_handler[code]) {</div><div class='add'>+	struct brcmf_fweh_info *fweh = drvr-&gt;fweh;</div><div class='add'>+	u32 evt_handler_idx;</div><div class='add'>+</div><div class='add'>+	brcmf_fweh_map_event_code(fweh, code, &amp;evt_handler_idx);</div><div class='add'>+</div><div class='add'>+	if (fweh-&gt;evt_handler[evt_handler_idx]) {</div><div class='ctx'> 		bphy_err(drvr, "event code %d already registered\n", code);</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> 	}</div><div class='del'>-	drvr-&gt;fweh.evt_handler[code] = handler;</div><div class='add'>+</div><div class='add'>+	fweh-&gt;evt_handler[evt_handler_idx] = handler;</div><div class='ctx'> 	brcmf_dbg(TRACE, "event handler registered for %s\n",</div><div class='ctx'> 		  brcmf_fweh_event_name(code));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+BRCMF_EXPORT_SYMBOL_GPL(brcmf_fweh_register);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * brcmf_fweh_unregister() - remove handler for given code.</div><div class='hunk'>@@ -341,9 +417,12 @@ int brcmf_fweh_register(struct brcmf_pub *drvr, enum brcmf_fweh_event_code code,</div><div class='ctx'> void brcmf_fweh_unregister(struct brcmf_pub *drvr,</div><div class='ctx'> 			   enum brcmf_fweh_event_code code)</div><div class='ctx'> {</div><div class='add'>+	u32 evt_handler_idx;</div><div class='add'>+</div><div class='ctx'> 	brcmf_dbg(TRACE, "event handler cleared for %s\n",</div><div class='ctx'> 		  brcmf_fweh_event_name(code));</div><div class='del'>-	drvr-&gt;fweh.evt_handler[code] = NULL;</div><div class='add'>+	brcmf_fweh_map_event_code(drvr-&gt;fweh, code, &amp;evt_handler_idx);</div><div class='add'>+	drvr-&gt;fweh-&gt;evt_handler[evt_handler_idx] = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -353,28 +432,32 @@ void brcmf_fweh_unregister(struct brcmf_pub *drvr,</div><div class='ctx'>  */</div><div class='ctx'> int brcmf_fweh_activate_events(struct brcmf_if *ifp)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='add'>+	struct brcmf_fweh_info *fweh = ifp-&gt;drvr-&gt;fweh;</div><div class='add'>+	enum brcmf_fweh_event_code code;</div><div class='ctx'> 	int i, err;</div><div class='del'>-	s8 eventmask[BRCMF_EVENTING_MASK_LEN];</div><div class='ctx'> </div><div class='del'>-	memset(eventmask, 0, sizeof(eventmask));</div><div class='del'>-	for (i = 0; i &lt; BRCMF_E_LAST; i++) {</div><div class='del'>-		if (ifp-&gt;drvr-&gt;fweh.evt_handler[i]) {</div><div class='add'>+	memset(fweh-&gt;event_mask, 0, fweh-&gt;event_mask_len);</div><div class='add'>+	for (i = 0; i &lt; fweh-&gt;num_event_codes; i++) {</div><div class='add'>+		if (fweh-&gt;evt_handler[i]) {</div><div class='add'>+			brcmf_fweh_map_fwevt_code(fweh, i, &amp;code);</div><div class='ctx'> 			brcmf_dbg(EVENT, "enable event %s\n",</div><div class='del'>-				  brcmf_fweh_event_name(i));</div><div class='del'>-			setbit(eventmask, i);</div><div class='add'>+				  brcmf_fweh_event_name(code));</div><div class='add'>+			setbit(fweh-&gt;event_mask, i);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* want to handle IF event as well */</div><div class='ctx'> 	brcmf_dbg(EVENT, "enable event IF\n");</div><div class='del'>-	setbit(eventmask, BRCMF_E_IF);</div><div class='add'>+	setbit(fweh-&gt;event_mask, BRCMF_E_IF);</div><div class='ctx'> </div><div class='del'>-	err = brcmf_fil_iovar_data_set(ifp, "event_msgs",</div><div class='del'>-				       eventmask, BRCMF_EVENTING_MASK_LEN);</div><div class='del'>-	if (err)</div><div class='del'>-		bphy_err(drvr, "Set event_msgs error (%d)\n", err);</div><div class='add'>+	/* allow per-vendor method to activate firmware events */</div><div class='add'>+	if (!brcmf_fwvid_activate_events(ifp))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='add'>+	err = brcmf_fil_iovar_data_set(ifp, "event_msgs", fweh-&gt;event_mask,</div><div class='add'>+				       fweh-&gt;event_mask_len);</div><div class='add'>+	if (err)</div><div class='add'>+		bphy_err(fweh-&gt;drvr, "Set event_msgs error (%d)\n", err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -393,38 +476,38 @@ void brcmf_fweh_process_event(struct brcmf_pub *drvr,</div><div class='ctx'> 			      struct brcmf_event *event_packet,</div><div class='ctx'> 			      u32 packet_len, gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	enum brcmf_fweh_event_code code;</div><div class='del'>-	struct brcmf_fweh_info *fweh = &amp;drvr-&gt;fweh;</div><div class='add'>+	u32 fwevt_idx;</div><div class='add'>+	struct brcmf_fweh_info *fweh = drvr-&gt;fweh;</div><div class='ctx'> 	struct brcmf_fweh_queue_item *event;</div><div class='ctx'> 	void *data;</div><div class='ctx'> 	u32 datalen;</div><div class='ctx'> </div><div class='ctx'> 	/* get event info */</div><div class='del'>-	code = get_unaligned_be32(&amp;event_packet-&gt;msg.event_type);</div><div class='add'>+	fwevt_idx = get_unaligned_be32(&amp;event_packet-&gt;msg.event_type);</div><div class='ctx'> 	datalen = get_unaligned_be32(&amp;event_packet-&gt;msg.datalen);</div><div class='ctx'> 	data = &amp;event_packet[1];</div><div class='ctx'> </div><div class='del'>-	if (code &gt;= BRCMF_E_LAST)</div><div class='add'>+	if (fwevt_idx &gt;= fweh-&gt;num_event_codes)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (code != BRCMF_E_IF &amp;&amp; !fweh-&gt;evt_handler[code])</div><div class='add'>+	if (fwevt_idx != BRCMF_E_IF &amp;&amp; !fweh-&gt;evt_handler[fwevt_idx])</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (datalen &gt; BRCMF_DCMD_MAXLEN ||</div><div class='ctx'> 	    datalen + sizeof(*event_packet) &gt; packet_len)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	event = kzalloc(sizeof(*event) + datalen, gfp);</div><div class='add'>+	event = kzalloc(struct_size(event, data, datalen), gfp);</div><div class='ctx'> 	if (!event)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	event-&gt;code = code;</div><div class='add'>+	event-&gt;code = fwevt_idx;</div><div class='add'>+	event-&gt;datalen = datalen;</div><div class='ctx'> 	event-&gt;ifidx = event_packet-&gt;msg.ifidx;</div><div class='ctx'> </div><div class='ctx'> 	/* use memcpy to get aligned event message */</div><div class='ctx'> 	memcpy(&amp;event-&gt;emsg, &amp;event_packet-&gt;msg, sizeof(event-&gt;emsg));</div><div class='ctx'> 	memcpy(event-&gt;data, data, datalen);</div><div class='del'>-	event-&gt;datalen = datalen;</div><div class='ctx'> 	memcpy(event-&gt;ifaddr, event_packet-&gt;eth.h_dest, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	brcmf_fweh_queue_event(fweh, event);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h<br/>index 48414e8b9389..e327dd58d29c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> #ifndef FWEH_H_</div><div class='ctx'> #define FWEH_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/if.h&gt;</div><div class='hunk'>@@ -17,6 +17,10 @@ struct brcmf_pub;</div><div class='ctx'> struct brcmf_if;</div><div class='ctx'> struct brcmf_cfg80211_info;</div><div class='ctx'> </div><div class='add'>+#define BRCMF_ABSTRACT_EVENT_BIT	BIT(31)</div><div class='add'>+#define BRCMF_ABSTRACT_ENUM_DEF(_id, _val) \</div><div class='add'>+	BRCMF_ENUM_DEF(_id, (BRCMF_ABSTRACT_EVENT_BIT | (_val)))</div><div class='add'>+</div><div class='ctx'> /* list of firmware events */</div><div class='ctx'> #define BRCMF_FWEH_EVENT_ENUM_DEFLIST \</div><div class='ctx'> 	BRCMF_ENUM_DEF(SET_SSID, 0) \</div><div class='hunk'>@@ -90,7 +94,11 @@ struct brcmf_cfg80211_info;</div><div class='ctx'> 	BRCMF_ENUM_DEF(FIFO_CREDIT_MAP, 74) \</div><div class='ctx'> 	BRCMF_ENUM_DEF(ACTION_FRAME_RX, 75) \</div><div class='ctx'> 	BRCMF_ENUM_DEF(TDLS_PEER_EVENT, 92) \</div><div class='del'>-	BRCMF_ENUM_DEF(BCMC_CREDIT_SUPPORT, 127)</div><div class='add'>+	BRCMF_ENUM_DEF(BCMC_CREDIT_SUPPORT, 127) \</div><div class='add'>+	BRCMF_ABSTRACT_ENUM_DEF(EXT_AUTH_REQ, 0) \</div><div class='add'>+	BRCMF_ABSTRACT_ENUM_DEF(EXT_AUTH_FRAME_RX, 1) \</div><div class='add'>+	BRCMF_ABSTRACT_ENUM_DEF(MGMT_FRAME_TXSTATUS, 2) \</div><div class='add'>+	BRCMF_ABSTRACT_ENUM_DEF(MGMT_FRAME_OFFCHAN_DONE, 3)</div><div class='ctx'> </div><div class='ctx'> #define BRCMF_ENUM_DEF(id, val) \</div><div class='ctx'> 	BRCMF_E_##id = (val),</div><div class='hunk'>@@ -98,16 +106,9 @@ struct brcmf_cfg80211_info;</div><div class='ctx'> /* firmware event codes sent by the dongle */</div><div class='ctx'> enum brcmf_fweh_event_code {</div><div class='ctx'> 	BRCMF_FWEH_EVENT_ENUM_DEFLIST</div><div class='del'>-	/* this determines event mask length which must match</div><div class='del'>-	 * minimum length check in device firmware so it is</div><div class='del'>-	 * hard-coded here.</div><div class='del'>-	 */</div><div class='del'>-	BRCMF_E_LAST = 139</div><div class='ctx'> };</div><div class='ctx'> #undef BRCMF_ENUM_DEF</div><div class='ctx'> </div><div class='del'>-#define BRCMF_EVENTING_MASK_LEN		DIV_ROUND_UP(BRCMF_E_LAST, 8)</div><div class='del'>-</div><div class='ctx'> /* flags field values in struct brcmf_event_msg */</div><div class='ctx'> #define BRCMF_EVENT_MSG_LINK		0x01</div><div class='ctx'> #define BRCMF_EVENT_MSG_FLUSHTXQ	0x02</div><div class='hunk'>@@ -288,27 +289,66 @@ typedef int (*brcmf_fweh_handler_t)(struct brcmf_if *ifp,</div><div class='ctx'> 				    void *data);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct brcmf_fweh_event_map_item - fweh event and firmware event pair.</div><div class='add'>+ *</div><div class='add'>+ * @code: fweh event code as used by higher layers.</div><div class='add'>+ * @fwevt_code: firmware event code as used by firmware.</div><div class='add'>+ *</div><div class='add'>+ * This mapping is needed when a functionally identical event has a</div><div class='add'>+ * different numerical definition between vendors. When such mapping</div><div class='add'>+ * is needed the higher layer event code should not collide with the</div><div class='add'>+ * firmware event.</div><div class='add'>+ */</div><div class='add'>+struct brcmf_fweh_event_map_item {</div><div class='add'>+	enum brcmf_fweh_event_code code;</div><div class='add'>+	u32 fwevt_code;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct brcmf_fweh_event_map - mapping between firmware event and fweh event.</div><div class='add'>+ *</div><div class='add'>+ * @n_items: number of mapping items.</div><div class='add'>+ * @items: array of fweh event and firmware event pairs.</div><div class='add'>+ */</div><div class='add'>+struct brcmf_fweh_event_map {</div><div class='add'>+	u32 n_items;</div><div class='add'>+	const struct brcmf_fweh_event_map_item items[] __counted_by(n_items);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct brcmf_fweh_info - firmware event handling information.</div><div class='ctx'>  *</div><div class='ctx'>  * @p2pdev_setup_ongoing: P2P device creation in progress.</div><div class='ctx'>  * @event_work: event worker.</div><div class='ctx'>  * @evt_q_lock: lock for event queue protection.</div><div class='ctx'>  * @event_q: event queue.</div><div class='del'>- * @evt_handler: registered event handlers.</div><div class='add'>+ * @event_mask_len: length of @event_mask used to enable firmware events.</div><div class='add'>+ * @event_mask: byte array used in 'event_msgs' iovar command.</div><div class='add'>+ * @event_map: mapping between fweh event and firmware event which</div><div class='add'>+ *	may be provided by vendor-specific module for events that need</div><div class='add'>+ *	mapping.</div><div class='add'>+ * @num_event_codes: number of firmware events supported by firmware which</div><div class='add'>+ *	does a minimum length check for the @event_mask. This value is to</div><div class='add'>+ *	be provided by vendor-specific module determining @event_mask_len</div><div class='add'>+ *	and consequently the allocation size for @event_mask.</div><div class='add'>+ * @evt_handler: event handler registry indexed by firmware event code.</div><div class='ctx'>  */</div><div class='ctx'> struct brcmf_fweh_info {</div><div class='add'>+	struct brcmf_pub *drvr;</div><div class='ctx'> 	bool p2pdev_setup_ongoing;</div><div class='ctx'> 	struct work_struct event_work;</div><div class='ctx'> 	spinlock_t evt_q_lock;</div><div class='ctx'> 	struct list_head event_q;</div><div class='del'>-	int (*evt_handler[BRCMF_E_LAST])(struct brcmf_if *ifp,</div><div class='del'>-					 const struct brcmf_event_msg *evtmsg,</div><div class='del'>-					 void *data);</div><div class='add'>+	uint event_mask_len;</div><div class='add'>+	u8 *event_mask;</div><div class='add'>+	const struct brcmf_fweh_event_map *event_map;</div><div class='add'>+	uint num_event_codes;</div><div class='add'>+	brcmf_fweh_handler_t evt_handler[] __counted_by(num_event_codes);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const char *brcmf_fweh_event_name(enum brcmf_fweh_event_code code);</div><div class='ctx'> </div><div class='del'>-void brcmf_fweh_attach(struct brcmf_pub *drvr);</div><div class='add'>+int brcmf_fweh_attach(struct brcmf_pub *drvr);</div><div class='ctx'> void brcmf_fweh_detach(struct brcmf_pub *drvr);</div><div class='ctx'> int brcmf_fweh_register(struct brcmf_pub *drvr, enum brcmf_fweh_event_code code,</div><div class='ctx'> 			int (*handler)(struct brcmf_if *ifp,</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c<br/>index 9ed85420f3ca..6385a7db7f7d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include "bus.h"</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> #include "tracepoint.h"</div><div class='add'>+#include "xtlv.h"</div><div class='ctx'> #include "fwil.h"</div><div class='ctx'> #include "proto.h"</div><div class='ctx'> </div><div class='hunk'>@@ -141,6 +142,7 @@ brcmf_fil_cmd_data_set(struct brcmf_if *ifp, u32 cmd, void *data, u32 len)</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+BRCMF_EXPORT_SYMBOL_GPL(brcmf_fil_cmd_data_set);</div><div class='ctx'> </div><div class='ctx'> s32</div><div class='ctx'> brcmf_fil_cmd_data_get(struct brcmf_if *ifp, u32 cmd, void *data, u32 len)</div><div class='hunk'>@@ -150,7 +152,8 @@ brcmf_fil_cmd_data_get(struct brcmf_if *ifp, u32 cmd, void *data, u32 len)</div><div class='ctx'> 	mutex_lock(&amp;ifp-&gt;drvr-&gt;proto_block);</div><div class='ctx'> 	err = brcmf_fil_cmd_data(ifp, cmd, data, len, false);</div><div class='ctx'> </div><div class='del'>-	brcmf_dbg(FIL, "ifidx=%d, cmd=%d, len=%d\n", ifp-&gt;ifidx, cmd, len);</div><div class='add'>+	brcmf_dbg(FIL, "ifidx=%d, cmd=%d, len=%d, err=%d\n", ifp-&gt;ifidx, cmd,</div><div class='add'>+		  len, err);</div><div class='ctx'> 	brcmf_dbg_hex_dump(BRCMF_FIL_ON(), data,</div><div class='ctx'> 			   min_t(uint, len, MAX_HEX_DUMP_LEN), "data\n");</div><div class='ctx'> </div><div class='hunk'>@@ -158,39 +161,10 @@ brcmf_fil_cmd_data_get(struct brcmf_if *ifp, u32 cmd, void *data, u32 len)</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-s32</div><div class='del'>-brcmf_fil_cmd_int_set(struct brcmf_if *ifp, u32 cmd, u32 data)</div><div class='del'>-{</div><div class='del'>-	s32 err;</div><div class='del'>-	__le32 data_le = cpu_to_le32(data);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;ifp-&gt;drvr-&gt;proto_block);</div><div class='del'>-	brcmf_dbg(FIL, "ifidx=%d, cmd=%d, value=%d\n", ifp-&gt;ifidx, cmd, data);</div><div class='del'>-	err = brcmf_fil_cmd_data(ifp, cmd, &amp;data_le, sizeof(data_le), true);</div><div class='del'>-	mutex_unlock(&amp;ifp-&gt;drvr-&gt;proto_block);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-s32</div><div class='del'>-brcmf_fil_cmd_int_get(struct brcmf_if *ifp, u32 cmd, u32 *data)</div><div class='del'>-{</div><div class='del'>-	s32 err;</div><div class='del'>-	__le32 data_le = cpu_to_le32(*data);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;ifp-&gt;drvr-&gt;proto_block);</div><div class='del'>-	err = brcmf_fil_cmd_data(ifp, cmd, &amp;data_le, sizeof(data_le), false);</div><div class='del'>-	mutex_unlock(&amp;ifp-&gt;drvr-&gt;proto_block);</div><div class='del'>-	*data = le32_to_cpu(data_le);</div><div class='del'>-	brcmf_dbg(FIL, "ifidx=%d, cmd=%d, value=%d\n", ifp-&gt;ifidx, cmd, *data);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='add'>+BRCMF_EXPORT_SYMBOL_GPL(brcmf_fil_cmd_data_get);</div><div class='ctx'> </div><div class='ctx'> static u32</div><div class='del'>-brcmf_create_iovar(char *name, const char *data, u32 datalen,</div><div class='add'>+brcmf_create_iovar(const char *name, const char *data, u32 datalen,</div><div class='ctx'> 		   char *buf, u32 buflen)</div><div class='ctx'> {</div><div class='ctx'> 	u32 len;</div><div class='hunk'>@@ -211,7 +185,7 @@ brcmf_create_iovar(char *name, const char *data, u32 datalen,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> s32</div><div class='del'>-brcmf_fil_iovar_data_set(struct brcmf_if *ifp, char *name, const void *data,</div><div class='add'>+brcmf_fil_iovar_data_set(struct brcmf_if *ifp, const char *name, const void *data,</div><div class='ctx'> 			 u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='hunk'>@@ -237,9 +211,10 @@ brcmf_fil_iovar_data_set(struct brcmf_if *ifp, char *name, const void *data,</div><div class='ctx'> 	mutex_unlock(&amp;drvr-&gt;proto_block);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+BRCMF_EXPORT_SYMBOL_GPL(brcmf_fil_iovar_data_set);</div><div class='ctx'> </div><div class='ctx'> s32</div><div class='del'>-brcmf_fil_iovar_data_get(struct brcmf_if *ifp, char *name, void *data,</div><div class='add'>+brcmf_fil_iovar_data_get(struct brcmf_if *ifp, const char *name, void *data,</div><div class='ctx'> 			 u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='hunk'>@@ -260,36 +235,18 @@ brcmf_fil_iovar_data_get(struct brcmf_if *ifp, char *name, void *data,</div><div class='ctx'> 		bphy_err(drvr, "Creating iovar failed\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	brcmf_dbg(FIL, "ifidx=%d, name=%s, len=%d\n", ifp-&gt;ifidx, name, len);</div><div class='add'>+	brcmf_dbg(FIL, "ifidx=%d, name=%s, len=%d, err=%d\n", ifp-&gt;ifidx, name,</div><div class='add'>+		  len, err);</div><div class='ctx'> 	brcmf_dbg_hex_dump(BRCMF_FIL_ON(), data,</div><div class='ctx'> 			   min_t(uint, len, MAX_HEX_DUMP_LEN), "data\n");</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;drvr-&gt;proto_block);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-s32</div><div class='del'>-brcmf_fil_iovar_int_set(struct brcmf_if *ifp, char *name, u32 data)</div><div class='del'>-{</div><div class='del'>-	__le32 data_le = cpu_to_le32(data);</div><div class='del'>-</div><div class='del'>-	return brcmf_fil_iovar_data_set(ifp, name, &amp;data_le, sizeof(data_le));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-s32</div><div class='del'>-brcmf_fil_iovar_int_get(struct brcmf_if *ifp, char *name, u32 *data)</div><div class='del'>-{</div><div class='del'>-	__le32 data_le = cpu_to_le32(*data);</div><div class='del'>-	s32 err;</div><div class='del'>-</div><div class='del'>-	err = brcmf_fil_iovar_data_get(ifp, name, &amp;data_le, sizeof(data_le));</div><div class='del'>-	if (err == 0)</div><div class='del'>-		*data = le32_to_cpu(data_le);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='add'>+BRCMF_EXPORT_SYMBOL_GPL(brcmf_fil_iovar_data_get);</div><div class='ctx'> </div><div class='ctx'> static u32</div><div class='del'>-brcmf_create_bsscfg(s32 bsscfgidx, char *name, char *data, u32 datalen,</div><div class='add'>+brcmf_create_bsscfg(s32 bsscfgidx, const char *name, char *data, u32 datalen,</div><div class='ctx'> 		    char *buf, u32 buflen)</div><div class='ctx'> {</div><div class='ctx'> 	const s8 *prefix = "bsscfg:";</div><div class='hunk'>@@ -334,7 +291,7 @@ brcmf_create_bsscfg(s32 bsscfgidx, char *name, char *data, u32 datalen,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> s32</div><div class='del'>-brcmf_fil_bsscfg_data_set(struct brcmf_if *ifp, char *name,</div><div class='add'>+brcmf_fil_bsscfg_data_set(struct brcmf_if *ifp, const char *name,</div><div class='ctx'> 			  void *data, u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='hunk'>@@ -361,9 +318,10 @@ brcmf_fil_bsscfg_data_set(struct brcmf_if *ifp, char *name,</div><div class='ctx'> 	mutex_unlock(&amp;drvr-&gt;proto_block);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+BRCMF_EXPORT_SYMBOL_GPL(brcmf_fil_bsscfg_data_set);</div><div class='ctx'> </div><div class='ctx'> s32</div><div class='del'>-brcmf_fil_bsscfg_data_get(struct brcmf_if *ifp, char *name,</div><div class='add'>+brcmf_fil_bsscfg_data_get(struct brcmf_if *ifp, const char *name,</div><div class='ctx'> 			  void *data, u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='hunk'>@@ -383,34 +341,92 @@ brcmf_fil_bsscfg_data_get(struct brcmf_if *ifp, char *name,</div><div class='ctx'> 		err = -EPERM;</div><div class='ctx'> 		bphy_err(drvr, "Creating bsscfg failed\n");</div><div class='ctx'> 	}</div><div class='del'>-	brcmf_dbg(FIL, "ifidx=%d, bsscfgidx=%d, name=%s, len=%d\n", ifp-&gt;ifidx,</div><div class='del'>-		  ifp-&gt;bsscfgidx, name, len);</div><div class='add'>+	brcmf_dbg(FIL, "ifidx=%d, bsscfgidx=%d, name=%s, len=%d, err=%d\n",</div><div class='add'>+		  ifp-&gt;ifidx, ifp-&gt;bsscfgidx, name, len, err);</div><div class='ctx'> 	brcmf_dbg_hex_dump(BRCMF_FIL_ON(), data,</div><div class='ctx'> 			   min_t(uint, len, MAX_HEX_DUMP_LEN), "data\n");</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;drvr-&gt;proto_block);</div><div class='ctx'> 	return err;</div><div class='add'>+}</div><div class='add'>+BRCMF_EXPORT_SYMBOL_GPL(brcmf_fil_bsscfg_data_get);</div><div class='add'>+</div><div class='add'>+static u32 brcmf_create_xtlv(const char *name, u16 id, char *data, u32 len,</div><div class='add'>+			     char *buf, u32 buflen)</div><div class='add'>+{</div><div class='add'>+	u32 iolen;</div><div class='add'>+	u32 nmlen;</div><div class='add'>+</div><div class='add'>+	nmlen = strlen(name) + 1;</div><div class='add'>+	iolen = nmlen + brcmf_xtlv_data_size(len, BRCMF_XTLV_OPTION_ALIGN32);</div><div class='ctx'> </div><div class='add'>+	if (iolen &gt; buflen) {</div><div class='add'>+		brcmf_err("buffer is too short\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(buf, name, nmlen);</div><div class='add'>+	brcmf_xtlv_pack_header((void *)(buf + nmlen), id, len, data,</div><div class='add'>+			       BRCMF_XTLV_OPTION_ALIGN32);</div><div class='add'>+</div><div class='add'>+	return iolen;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-s32</div><div class='del'>-brcmf_fil_bsscfg_int_set(struct brcmf_if *ifp, char *name, u32 data)</div><div class='add'>+s32 brcmf_fil_xtlv_data_set(struct brcmf_if *ifp, const char *name, u16 id,</div><div class='add'>+			    void *data, u32 len)</div><div class='ctx'> {</div><div class='del'>-	__le32 data_le = cpu_to_le32(data);</div><div class='add'>+	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='add'>+	s32 err;</div><div class='add'>+	u32 buflen;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;drvr-&gt;proto_block);</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(FIL, "ifidx=%d, name=%s, id=%u, len=%u\n", ifp-&gt;ifidx, name,</div><div class='add'>+		  id, len);</div><div class='add'>+	brcmf_dbg_hex_dump(BRCMF_FIL_ON(), data,</div><div class='add'>+			   min_t(uint, len, MAX_HEX_DUMP_LEN), "data\n");</div><div class='add'>+</div><div class='add'>+	buflen = brcmf_create_xtlv(name, id, data, len,</div><div class='add'>+				   drvr-&gt;proto_buf, sizeof(drvr-&gt;proto_buf));</div><div class='add'>+	if (buflen) {</div><div class='add'>+		err = brcmf_fil_cmd_data(ifp, BRCMF_C_SET_VAR, drvr-&gt;proto_buf,</div><div class='add'>+					 buflen, true);</div><div class='add'>+	} else {</div><div class='add'>+		err = -EPERM;</div><div class='add'>+		bphy_err(drvr, "Creating xtlv failed\n");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return brcmf_fil_bsscfg_data_set(ifp, name, &amp;data_le,</div><div class='del'>-					 sizeof(data_le));</div><div class='add'>+	mutex_unlock(&amp;drvr-&gt;proto_block);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='add'>+BRCMF_EXPORT_SYMBOL_GPL(brcmf_fil_xtlv_data_set);</div><div class='ctx'> </div><div class='del'>-s32</div><div class='del'>-brcmf_fil_bsscfg_int_get(struct brcmf_if *ifp, char *name, u32 *data)</div><div class='add'>+s32 brcmf_fil_xtlv_data_get(struct brcmf_if *ifp, const char *name, u16 id,</div><div class='add'>+			    void *data, u32 len)</div><div class='ctx'> {</div><div class='del'>-	__le32 data_le = cpu_to_le32(*data);</div><div class='add'>+	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='ctx'> 	s32 err;</div><div class='add'>+	u32 buflen;</div><div class='ctx'> </div><div class='del'>-	err = brcmf_fil_bsscfg_data_get(ifp, name, &amp;data_le,</div><div class='del'>-					sizeof(data_le));</div><div class='del'>-	if (err == 0)</div><div class='del'>-		*data = le32_to_cpu(data_le);</div><div class='add'>+	mutex_lock(&amp;drvr-&gt;proto_block);</div><div class='add'>+</div><div class='add'>+	buflen = brcmf_create_xtlv(name, id, data, len,</div><div class='add'>+				   drvr-&gt;proto_buf, sizeof(drvr-&gt;proto_buf));</div><div class='add'>+	if (buflen) {</div><div class='add'>+		err = brcmf_fil_cmd_data(ifp, BRCMF_C_GET_VAR, drvr-&gt;proto_buf,</div><div class='add'>+					 buflen, false);</div><div class='add'>+		if (err == 0)</div><div class='add'>+			memcpy(data, drvr-&gt;proto_buf, len);</div><div class='add'>+	} else {</div><div class='add'>+		err = -EPERM;</div><div class='add'>+		bphy_err(drvr, "Creating bsscfg failed\n");</div><div class='add'>+	}</div><div class='add'>+	brcmf_dbg(FIL, "ifidx=%d, name=%s, id=%u, len=%u, err=%d\n",</div><div class='add'>+		  ifp-&gt;ifidx, name, id, len, err);</div><div class='add'>+	brcmf_dbg_hex_dump(BRCMF_FIL_ON(), data,</div><div class='add'>+			   min_t(uint, len, MAX_HEX_DUMP_LEN), "data\n");</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;drvr-&gt;proto_block);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+BRCMF_EXPORT_SYMBOL_GPL(brcmf_fil_xtlv_data_get);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.h<br/>index ae4cf4372908..ab3d6cfcb02b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.h</a></div><div class='hunk'>@@ -6,6 +6,8 @@</div><div class='ctx'> #ifndef _fwil_h_</div><div class='ctx'> #define _fwil_h_</div><div class='ctx'> </div><div class='add'>+#include "debug.h"</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  * Dongle command codes that are interpreted by firmware</div><div class='ctx'>  ******************************************************************************/</div><div class='hunk'>@@ -81,21 +83,142 @@</div><div class='ctx'> </div><div class='ctx'> s32 brcmf_fil_cmd_data_set(struct brcmf_if *ifp, u32 cmd, void *data, u32 len);</div><div class='ctx'> s32 brcmf_fil_cmd_data_get(struct brcmf_if *ifp, u32 cmd, void *data, u32 len);</div><div class='del'>-s32 brcmf_fil_cmd_int_set(struct brcmf_if *ifp, u32 cmd, u32 data);</div><div class='del'>-s32 brcmf_fil_cmd_int_get(struct brcmf_if *ifp, u32 cmd, u32 *data);</div><div class='add'>+static inline</div><div class='add'>+s32 brcmf_fil_cmd_int_set(struct brcmf_if *ifp, u32 cmd, u32 data)</div><div class='add'>+{</div><div class='add'>+	s32 err;</div><div class='add'>+	__le32 data_le = cpu_to_le32(data);</div><div class='ctx'> </div><div class='del'>-s32 brcmf_fil_iovar_data_set(struct brcmf_if *ifp, char *name, const void *data,</div><div class='del'>-			     u32 len);</div><div class='del'>-s32 brcmf_fil_iovar_data_get(struct brcmf_if *ifp, char *name, void *data,</div><div class='add'>+	brcmf_dbg(FIL, "ifidx=%d, cmd=%d, value=%d\n", ifp-&gt;ifidx, cmd, data);</div><div class='add'>+	err = brcmf_fil_cmd_data_set(ifp, cmd, &amp;data_le, sizeof(data_le));</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+static inline</div><div class='add'>+s32 brcmf_fil_cmd_int_get(struct brcmf_if *ifp, u32 cmd, u32 *data)</div><div class='add'>+{</div><div class='add'>+	s32 err;</div><div class='add'>+</div><div class='add'>+	err = brcmf_fil_cmd_data_get(ifp, cmd, data, sizeof(*data));</div><div class='add'>+	if (err == 0)</div><div class='add'>+		*data = le32_to_cpu(*(__le32 *)data);</div><div class='add'>+	brcmf_dbg(FIL, "ifidx=%d, cmd=%d, value=%d\n", ifp-&gt;ifidx, cmd, *data);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+static inline</div><div class='add'>+s32 brcmf_fil_cmd_int_query(struct brcmf_if *ifp, u32 cmd, u32 *data)</div><div class='add'>+{</div><div class='add'>+	__le32 *data_le = (__le32 *)data;</div><div class='add'>+</div><div class='add'>+	*data_le = cpu_to_le32(*data);</div><div class='add'>+	return brcmf_fil_cmd_int_get(ifp, cmd, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+s32 brcmf_fil_iovar_data_set(struct brcmf_if *ifp, const char *name,</div><div class='add'>+			     const void *data, u32 len);</div><div class='add'>+s32 brcmf_fil_iovar_data_get(struct brcmf_if *ifp, const char *name, void *data,</div><div class='ctx'> 			     u32 len);</div><div class='del'>-s32 brcmf_fil_iovar_int_set(struct brcmf_if *ifp, char *name, u32 data);</div><div class='del'>-s32 brcmf_fil_iovar_int_get(struct brcmf_if *ifp, char *name, u32 *data);</div><div class='del'>-</div><div class='del'>-s32 brcmf_fil_bsscfg_data_set(struct brcmf_if *ifp, char *name, void *data,</div><div class='del'>-			      u32 len);</div><div class='del'>-s32 brcmf_fil_bsscfg_data_get(struct brcmf_if *ifp, char *name, void *data,</div><div class='del'>-			      u32 len);</div><div class='del'>-s32 brcmf_fil_bsscfg_int_set(struct brcmf_if *ifp, char *name, u32 data);</div><div class='del'>-s32 brcmf_fil_bsscfg_int_get(struct brcmf_if *ifp, char *name, u32 *data);</div><div class='add'>+static inline</div><div class='add'>+s32 brcmf_fil_iovar_int_set(struct brcmf_if *ifp, const char *name, u32 data)</div><div class='add'>+{</div><div class='add'>+	__le32 data_le = cpu_to_le32(data);</div><div class='add'>+</div><div class='add'>+	return brcmf_fil_iovar_data_set(ifp, name, &amp;data_le, sizeof(data_le));</div><div class='add'>+}</div><div class='add'>+static inline</div><div class='add'>+s32 brcmf_fil_iovar_int_get(struct brcmf_if *ifp, const char *name, u32 *data)</div><div class='add'>+{</div><div class='add'>+	s32 err;</div><div class='add'>+</div><div class='add'>+	err = brcmf_fil_iovar_data_get(ifp, name, data, sizeof(*data));</div><div class='add'>+	if (err == 0)</div><div class='add'>+		*data = le32_to_cpu(*(__le32 *)data);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+static inline</div><div class='add'>+s32 brcmf_fil_iovar_int_query(struct brcmf_if *ifp, const char *name, u32 *data)</div><div class='add'>+{</div><div class='add'>+	__le32 *data_le = (__le32 *)data;</div><div class='add'>+</div><div class='add'>+	*data_le = cpu_to_le32(*data);</div><div class='add'>+	return brcmf_fil_iovar_int_get(ifp, name, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+s32 brcmf_fil_bsscfg_data_set(struct brcmf_if *ifp, const char *name,</div><div class='add'>+			      void *data, u32 len);</div><div class='add'>+s32 brcmf_fil_bsscfg_data_get(struct brcmf_if *ifp, const char *name,</div><div class='add'>+			      void *data, u32 len);</div><div class='add'>+static inline</div><div class='add'>+s32 brcmf_fil_bsscfg_int_set(struct brcmf_if *ifp, const char *name, u32 data)</div><div class='add'>+{</div><div class='add'>+	__le32 data_le = cpu_to_le32(data);</div><div class='add'>+</div><div class='add'>+	return brcmf_fil_bsscfg_data_set(ifp, name, &amp;data_le,</div><div class='add'>+					 sizeof(data_le));</div><div class='add'>+}</div><div class='add'>+static inline</div><div class='add'>+s32 brcmf_fil_bsscfg_int_get(struct brcmf_if *ifp, const char *name, u32 *data)</div><div class='add'>+{</div><div class='add'>+	s32 err;</div><div class='add'>+</div><div class='add'>+	err = brcmf_fil_bsscfg_data_get(ifp, name, data, sizeof(*data));</div><div class='add'>+	if (err == 0)</div><div class='add'>+		*data = le32_to_cpu(*(__le32 *)data);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+static inline</div><div class='add'>+s32 brcmf_fil_bsscfg_int_query(struct brcmf_if *ifp, const char *name, u32 *data)</div><div class='add'>+{</div><div class='add'>+	__le32 *data_le = (__le32 *)data;</div><div class='add'>+</div><div class='add'>+	*data_le = cpu_to_le32(*data);</div><div class='add'>+	return brcmf_fil_bsscfg_int_get(ifp, name, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+s32 brcmf_fil_xtlv_data_set(struct brcmf_if *ifp, const char *name, u16 id,</div><div class='add'>+			    void *data, u32 len);</div><div class='add'>+s32 brcmf_fil_xtlv_data_get(struct brcmf_if *ifp, const char *name, u16 id,</div><div class='add'>+			    void *data, u32 len);</div><div class='add'>+static inline</div><div class='add'>+s32 brcmf_fil_xtlv_int_set(struct brcmf_if *ifp, const char *name, u16 id,</div><div class='add'>+			   u32 data)</div><div class='add'>+{</div><div class='add'>+	__le32 data_le = cpu_to_le32(data);</div><div class='add'>+</div><div class='add'>+	return brcmf_fil_xtlv_data_set(ifp, name, id, &amp;data_le,</div><div class='add'>+					 sizeof(data_le));</div><div class='add'>+}</div><div class='add'>+static inline</div><div class='add'>+s32 brcmf_fil_xtlv_int_get(struct brcmf_if *ifp, const char *name, u16 id,</div><div class='add'>+			   u32 *data)</div><div class='add'>+{</div><div class='add'>+	__le32 data_le = cpu_to_le32(*data);</div><div class='add'>+	s32 err;</div><div class='add'>+</div><div class='add'>+	err = brcmf_fil_xtlv_data_get(ifp, name, id, &amp;data_le, sizeof(data_le));</div><div class='add'>+	if (err == 0)</div><div class='add'>+		*data = le32_to_cpu(data_le);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+static inline</div><div class='add'>+s32 brcmf_fil_xtlv_int8_get(struct brcmf_if *ifp, const char *name, u16 id,</div><div class='add'>+			    u8 *data)</div><div class='add'>+{</div><div class='add'>+	return brcmf_fil_xtlv_data_get(ifp, name, id, data, sizeof(*data));</div><div class='add'>+}</div><div class='add'>+static inline</div><div class='add'>+s32 brcmf_fil_xtlv_int16_get(struct brcmf_if *ifp, const char *name, u16 id,</div><div class='add'>+			     u16 *data)</div><div class='add'>+{</div><div class='add'>+	__le16 data_le = cpu_to_le16(*data);</div><div class='add'>+	s32 err;</div><div class='add'>+</div><div class='add'>+	err = brcmf_fil_xtlv_data_get(ifp, name, id, &amp;data_le, sizeof(data_le));</div><div class='add'>+	if (err == 0)</div><div class='add'>+		*data = le16_to_cpu(data_le);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #endif /* _fwil_h_ */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h<br/>index ff2ef557f0ea..e74a23e11830 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h</a></div><div class='hunk'>@@ -48,6 +48,10 @@</div><div class='ctx'> </div><div class='ctx'> /* size of brcmf_scan_params not including variable length array */</div><div class='ctx'> #define BRCMF_SCAN_PARAMS_FIXED_SIZE	64</div><div class='add'>+#define BRCMF_SCAN_PARAMS_V2_FIXED_SIZE	72</div><div class='add'>+</div><div class='add'>+/* version of brcmf_scan_params structure */</div><div class='add'>+#define BRCMF_SCAN_PARAMS_VERSION_V2	2</div><div class='ctx'> </div><div class='ctx'> /* masks for channel and ssid count */</div><div class='ctx'> #define BRCMF_SCAN_PARAMS_COUNT_MASK	0x0000ffff</div><div class='hunk'>@@ -67,6 +71,7 @@</div><div class='ctx'> #define BRCMF_PRIMARY_KEY		(1 &lt;&lt; 1)</div><div class='ctx'> #define DOT11_BSSTYPE_ANY		2</div><div class='ctx'> #define BRCMF_ESCAN_REQ_VERSION		1</div><div class='add'>+#define BRCMF_ESCAN_REQ_VERSION_V2	2</div><div class='ctx'> </div><div class='ctx'> #define BRCMF_MAXRATES_IN_SET		16	/* max # of rates in rateset */</div><div class='ctx'> </div><div class='hunk'>@@ -135,7 +140,7 @@</div><div class='ctx'> /* Link Down indication in WoWL mode: */</div><div class='ctx'> #define BRCMF_WOWL_LINKDOWN		(1 &lt;&lt; 31)</div><div class='ctx'> </div><div class='del'>-#define BRCMF_WOWL_MAXPATTERNS		8</div><div class='add'>+#define BRCMF_WOWL_MAXPATTERNS		16</div><div class='ctx'> #define BRCMF_WOWL_MAXPATTERNSIZE	128</div><div class='ctx'> </div><div class='ctx'> #define BRCMF_COUNTRY_BUF_SZ		4</div><div class='hunk'>@@ -169,6 +174,10 @@</div><div class='ctx'> </div><div class='ctx'> #define BRCMF_HE_CAP_MCS_MAP_NSS_MAX	8</div><div class='ctx'> </div><div class='add'>+#define BRCMF_PMKSA_VER_2		2</div><div class='add'>+#define BRCMF_PMKSA_VER_3		3</div><div class='add'>+#define BRCMF_PMKSA_NO_EXPIRY		0xffffffff</div><div class='add'>+</div><div class='ctx'> /* MAX_CHUNK_LEN is the maximum length for data passing to firmware in each</div><div class='ctx'>  * ioctl. It is relatively small because firmware has small maximum size input</div><div class='ctx'>  * playload restriction for ioctls.</div><div class='hunk'>@@ -350,6 +359,12 @@ struct brcmf_ssid_le {</div><div class='ctx'> 	unsigned char SSID[IEEE80211_MAX_SSID_LEN];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Alternate SSID structure used in some places... */</div><div class='add'>+struct brcmf_ssid8_le {</div><div class='add'>+	u8 SSID_len;</div><div class='add'>+	unsigned char SSID[IEEE80211_MAX_SSID_LEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct brcmf_scan_params_le {</div><div class='ctx'> 	struct brcmf_ssid_le ssid_le;	/* default: {0, ""} */</div><div class='ctx'> 	u8 bssid[ETH_ALEN];	/* default: bcast */</div><div class='hunk'>@@ -383,7 +398,56 @@ struct brcmf_scan_params_le {</div><div class='ctx'> 				 * fixed parameter portion is assumed, otherwise</div><div class='ctx'> 				 * ssid in the fixed portion is ignored</div><div class='ctx'> 				 */</div><div class='del'>-	__le16 channel_list[1];	/* list of chanspecs */</div><div class='add'>+	union {</div><div class='add'>+		__le16 padding;	/* Reserve space for at least 1 entry for abort</div><div class='add'>+				 * which uses an on stack brcmf_scan_params_le</div><div class='add'>+				 */</div><div class='add'>+		DECLARE_FLEX_ARRAY(__le16, channel_list);	/* chanspecs */</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct brcmf_scan_params_v2_le {</div><div class='add'>+	__le16 version;		/* structure version */</div><div class='add'>+	__le16 length;		/* structure length */</div><div class='add'>+	struct brcmf_ssid_le ssid_le;	/* default: {0, ""} */</div><div class='add'>+	u8 bssid[ETH_ALEN];	/* default: bcast */</div><div class='add'>+	s8 bss_type;		/* default: any,</div><div class='add'>+				 * DOT11_BSSTYPE_ANY/INFRASTRUCTURE/INDEPENDENT</div><div class='add'>+				 */</div><div class='add'>+	u8 pad;</div><div class='add'>+	__le32 scan_type;	/* flags, 0 use default */</div><div class='add'>+	__le32 nprobes;		/* -1 use default, number of probes per channel */</div><div class='add'>+	__le32 active_time;	/* -1 use default, dwell time per channel for</div><div class='add'>+				 * active scanning</div><div class='add'>+				 */</div><div class='add'>+	__le32 passive_time;	/* -1 use default, dwell time per channel</div><div class='add'>+				 * for passive scanning</div><div class='add'>+				 */</div><div class='add'>+	__le32 home_time;	/* -1 use default, dwell time for the</div><div class='add'>+				 * home channel between channel scans</div><div class='add'>+				 */</div><div class='add'>+	__le32 channel_num;	/* count of channels and ssids that follow</div><div class='add'>+				 *</div><div class='add'>+				 * low half is count of channels in</div><div class='add'>+				 * channel_list, 0 means default (use all</div><div class='add'>+				 * available channels)</div><div class='add'>+				 *</div><div class='add'>+				 * high half is entries in struct brcmf_ssid</div><div class='add'>+				 * array that follows channel_list, aligned for</div><div class='add'>+				 * s32 (4 bytes) meaning an odd channel count</div><div class='add'>+				 * implies a 2-byte pad between end of</div><div class='add'>+				 * channel_list and first ssid</div><div class='add'>+				 *</div><div class='add'>+				 * if ssid count is zero, single ssid in the</div><div class='add'>+				 * fixed parameter portion is assumed, otherwise</div><div class='add'>+				 * ssid in the fixed portion is ignored</div><div class='add'>+				 */</div><div class='add'>+	union {</div><div class='add'>+		__le16 padding;	/* Reserve space for at least 1 entry for abort</div><div class='add'>+				 * which uses an on stack brcmf_scan_params_v2_le</div><div class='add'>+				 */</div><div class='add'>+		DECLARE_FLEX_ARRAY(__le16, channel_list);	/* chanspecs */</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct brcmf_scan_results {</div><div class='hunk'>@@ -397,7 +461,10 @@ struct brcmf_escan_params_le {</div><div class='ctx'> 	__le32 version;</div><div class='ctx'> 	__le16 action;</div><div class='ctx'> 	__le16 sync_id;</div><div class='del'>-	struct brcmf_scan_params_le params_le;</div><div class='add'>+	union {</div><div class='add'>+		struct brcmf_scan_params_le params_le;</div><div class='add'>+		struct brcmf_scan_params_v2_le params_v2_le;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct brcmf_escan_result_le {</div><div class='hunk'>@@ -517,7 +584,7 @@ struct brcmf_wsec_key_le {</div><div class='ctx'> struct brcmf_wsec_pmk_le {</div><div class='ctx'> 	__le16  key_len;</div><div class='ctx'> 	__le16  flags;</div><div class='del'>-	u8 key[2 * BRCMF_WSEC_MAX_PSK_LEN + 1];</div><div class='add'>+	u8 key[BRCMF_WSEC_MAX_SAE_PASSWORD_LEN];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -640,7 +707,7 @@ struct brcmf_sta_info_le {</div><div class='ctx'> </div><div class='ctx'> struct brcmf_chanspec_list {</div><div class='ctx'> 	__le32	count;		/* # of entries */</div><div class='del'>-	__le32	element[1];	/* variable length uint32 list */</div><div class='add'>+	__le32  element[];	/* variable length uint32 list */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -742,6 +809,31 @@ struct brcmf_rev_info_le {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct brcmf_wlc_version_le - firmware revision info.</div><div class='add'>+ *</div><div class='add'>+ * @version: structure version.</div><div class='add'>+ * @length: structure length.</div><div class='add'>+ * @epi_ver_major: EPI major version</div><div class='add'>+ * @epi_ver_minor: EPI minor version</div><div class='add'>+ * @epi_ver_rc: EPI rc version</div><div class='add'>+ * @epi_ver_incr: EPI increment version</div><div class='add'>+ * @wlc_ver_major: WLC major version</div><div class='add'>+ * @wlc_ver_minor: WLC minor version</div><div class='add'>+ */</div><div class='add'>+struct brcmf_wlc_version_le {</div><div class='add'>+	__le16 version;</div><div class='add'>+	__le16 length;</div><div class='add'>+</div><div class='add'>+	__le16 epi_ver_major;</div><div class='add'>+	__le16 epi_ver_minor;</div><div class='add'>+	__le16 epi_ver_rc;</div><div class='add'>+	__le16 epi_ver_incr;</div><div class='add'>+</div><div class='add'>+	__le16 wlc_ver_major;</div><div class='add'>+	__le16 wlc_ver_minor;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct brcmf_assoclist_le - request assoc list.</div><div class='ctx'>  *</div><div class='ctx'>  * @count: indicates number of stations.</div><div class='hunk'>@@ -804,6 +896,51 @@ struct brcmf_pmksa {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct brcmf_pmksa_v2 - PMK Security Association</div><div class='add'>+ *</div><div class='add'>+ * @length: Length of the structure.</div><div class='add'>+ * @bssid: The AP's BSSID.</div><div class='add'>+ * @pmkid: The PMK ID.</div><div class='add'>+ * @pmk: PMK material for FILS key derivation.</div><div class='add'>+ * @pmk_len: Length of PMK data.</div><div class='add'>+ * @ssid: The AP's SSID.</div><div class='add'>+ * @fils_cache_id: FILS cache identifier</div><div class='add'>+ */</div><div class='add'>+struct brcmf_pmksa_v2 {</div><div class='add'>+	__le16 length;</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	u8 pmkid[WLAN_PMKID_LEN];</div><div class='add'>+	u8 pmk[WLAN_PMK_LEN_SUITE_B_192];</div><div class='add'>+	__le16 pmk_len;</div><div class='add'>+	struct brcmf_ssid8_le ssid;</div><div class='add'>+	u16 fils_cache_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct brcmf_pmksa_v3 - PMK Security Association</div><div class='add'>+ *</div><div class='add'>+ * @bssid: The AP's BSSID.</div><div class='add'>+ * @pmkid: The PMK ID.</div><div class='add'>+ * @pmkid_len: The length of the PMK ID.</div><div class='add'>+ * @pmk: PMK material for FILS key derivation.</div><div class='add'>+ * @pmk_len: Length of PMK data.</div><div class='add'>+ * @fils_cache_id: FILS cache identifier</div><div class='add'>+ * @ssid: The AP's SSID.</div><div class='add'>+ * @time_left: Remaining time until expiry. 0 = expired, ~0 = no expiry.</div><div class='add'>+ */</div><div class='add'>+struct brcmf_pmksa_v3 {</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	u8 pmkid[WLAN_PMKID_LEN];</div><div class='add'>+	u8 pmkid_len;</div><div class='add'>+	u8 pmk[WLAN_PMK_LEN_SUITE_B_192];</div><div class='add'>+	u8 pmk_len;</div><div class='add'>+	__le16 fils_cache_id;</div><div class='add'>+	u8 pad;</div><div class='add'>+	struct brcmf_ssid8_le ssid;</div><div class='add'>+	__le32 time_left;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct brcmf_pmk_list_le - List of pmksa's.</div><div class='ctx'>  *</div><div class='ctx'>  * @npmk: Number of pmksa's.</div><div class='hunk'>@@ -815,6 +952,34 @@ struct brcmf_pmk_list_le {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct brcmf_pmk_list_v2_le - List of pmksa's.</div><div class='add'>+ *</div><div class='add'>+ * @version: Request version.</div><div class='add'>+ * @length: Length of this structure.</div><div class='add'>+ * @pmk: PMK SA information.</div><div class='add'>+ */</div><div class='add'>+struct brcmf_pmk_list_v2_le {</div><div class='add'>+	__le16 version;</div><div class='add'>+	__le16 length;</div><div class='add'>+	struct brcmf_pmksa_v2 pmk[BRCMF_MAXPMKID];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct brcmf_pmk_op_v3_le - Operation on PMKSA list.</div><div class='add'>+ *</div><div class='add'>+ * @version: Request version.</div><div class='add'>+ * @length: Length of this structure.</div><div class='add'>+ * @pmk: PMK SA information.</div><div class='add'>+ */</div><div class='add'>+struct brcmf_pmk_op_v3_le {</div><div class='add'>+	__le16 version;</div><div class='add'>+	__le16 length;</div><div class='add'>+	__le16 count;</div><div class='add'>+	__le16 pad;</div><div class='add'>+	struct brcmf_pmksa_v3 pmk[BRCMF_MAXPMKID];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct brcmf_pno_param_le - PNO scan configuration parameters</div><div class='ctx'>  *</div><div class='ctx'>  * @version: PNO parameters version.</div><div class='hunk'>@@ -943,7 +1108,7 @@ struct brcmf_dload_data_le {</div><div class='ctx'> 	__le16 dload_type;</div><div class='ctx'> 	__le32 len;</div><div class='ctx'> 	__le32 crc;</div><div class='del'>-	u8 data[1];</div><div class='add'>+	u8 data[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1049,7 +1214,26 @@ struct brcmf_gscan_config {</div><div class='ctx'> 	u8 count_of_channel_buckets;</div><div class='ctx'> 	u8 retry_threshold;</div><div class='ctx'> 	__le16  lost_ap_window;</div><div class='del'>-	struct brcmf_gscan_bucket_config bucket[1];</div><div class='add'>+	struct brcmf_gscan_bucket_config bucket[] __counted_by(count_of_channel_buckets);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct brcmf_mkeep_alive_pkt_le - configuration data for keep-alive frame.</div><div class='add'>+ *</div><div class='add'>+ * @version: version for mkeep_alive</div><div class='add'>+ * @length: length of fixed parameters in the structure.</div><div class='add'>+ * @period_msec: keep-alive period in milliseconds.</div><div class='add'>+ * @len_bytes: size of the data.</div><div class='add'>+ * @keep_alive_id: ID  (0 - 3).</div><div class='add'>+ * @data: keep-alive frame data.</div><div class='add'>+ */</div><div class='add'>+struct brcmf_mkeep_alive_pkt_le {</div><div class='add'>+	__le16  version;</div><div class='add'>+	__le16  length;</div><div class='add'>+	__le32  period_msec;</div><div class='add'>+	__le16  len_bytes;</div><div class='add'>+	u8   keep_alive_id;</div><div class='add'>+	u8   data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> #endif /* FWIL_TYPES_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c<br/>index 19b0f318f93e..b70d20128f98 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c</a></div><div class='hunk'>@@ -688,7 +688,7 @@ static void brcmf_fws_macdesc_set_name(struct brcmf_fws_info *fws,</div><div class='ctx'> 				       struct brcmf_fws_mac_descriptor *desc)</div><div class='ctx'> {</div><div class='ctx'> 	if (desc == &amp;fws-&gt;desc.other)</div><div class='del'>-		strlcpy(desc-&gt;name, "MAC-OTHER", sizeof(desc-&gt;name));</div><div class='add'>+		strscpy(desc-&gt;name, "MAC-OTHER", sizeof(desc-&gt;name));</div><div class='ctx'> 	else if (desc-&gt;mac_handle)</div><div class='ctx'> 		scnprintf(desc-&gt;name, sizeof(desc-&gt;name), "MAC-%d:%d",</div><div class='ctx'> 			  desc-&gt;mac_handle, desc-&gt;interface_id);</div><div class='hunk'>@@ -1664,7 +1664,7 @@ static void brcmf_rxreorder_get_skb_list(struct brcmf_ampdu_rx_reorder *rfi,</div><div class='ctx'> 	rfi-&gt;pend_pkts -= skb_queue_len(skb_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *pkt, bool inirq)</div><div class='add'>+void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *pkt)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='ctx'> 	u8 *reorder_data;</div><div class='hunk'>@@ -1673,7 +1673,6 @@ void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *pkt, bool inirq)</div><div class='ctx'> 	struct sk_buff_head reorder_list;</div><div class='ctx'> 	struct sk_buff *pnext;</div><div class='ctx'> 	u8 flags;</div><div class='del'>-	u32 buf_size;</div><div class='ctx'> </div><div class='ctx'> 	reorder_data = ((struct brcmf_skb_reorder_data *)pkt-&gt;cb)-&gt;reorder;</div><div class='ctx'> 	flow_id = reorder_data[BRCMF_RXREORDER_FLOWID_OFFSET];</div><div class='hunk'>@@ -1682,7 +1681,7 @@ void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *pkt, bool inirq)</div><div class='ctx'> 	/* validate flags and flow id */</div><div class='ctx'> 	if (flags == 0xFF) {</div><div class='ctx'> 		bphy_err(drvr, "invalid flags...so ignore this packet\n");</div><div class='del'>-		brcmf_netif_rx(ifp, pkt, inirq);</div><div class='add'>+		brcmf_netif_rx(ifp, pkt);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1694,7 +1693,7 @@ void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *pkt, bool inirq)</div><div class='ctx'> 		if (rfi == NULL) {</div><div class='ctx'> 			brcmf_dbg(INFO, "received flags to cleanup, but no flow (%d) yet\n",</div><div class='ctx'> 				  flow_id);</div><div class='del'>-			brcmf_netif_rx(ifp, pkt, inirq);</div><div class='add'>+			brcmf_netif_rx(ifp, pkt);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1708,23 +1707,20 @@ void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *pkt, bool inirq)</div><div class='ctx'> 	}</div><div class='ctx'> 	/* from here on we need a flow reorder instance */</div><div class='ctx'> 	if (rfi == NULL) {</div><div class='del'>-		buf_size = sizeof(*rfi);</div><div class='ctx'> 		max_idx = reorder_data[BRCMF_RXREORDER_MAXIDX_OFFSET];</div><div class='ctx'> </div><div class='del'>-		buf_size += (max_idx + 1) * sizeof(pkt);</div><div class='del'>-</div><div class='ctx'> 		/* allocate space for flow reorder info */</div><div class='ctx'> 		brcmf_dbg(INFO, "flow-%d: start, maxidx %d\n",</div><div class='ctx'> 			  flow_id, max_idx);</div><div class='del'>-		rfi = kzalloc(buf_size, GFP_ATOMIC);</div><div class='add'>+		rfi = kzalloc(struct_size(rfi, pktslots, max_idx + 1),</div><div class='add'>+			      GFP_ATOMIC);</div><div class='ctx'> 		if (rfi == NULL) {</div><div class='ctx'> 			bphy_err(drvr, "failed to alloc buffer\n");</div><div class='del'>-			brcmf_netif_rx(ifp, pkt, inirq);</div><div class='add'>+			brcmf_netif_rx(ifp, pkt);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ifp-&gt;drvr-&gt;reorder_flows[flow_id] = rfi;</div><div class='del'>-		rfi-&gt;pktslots = (struct sk_buff **)(rfi + 1);</div><div class='ctx'> 		rfi-&gt;max_idx = max_idx;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (flags &amp; BRCMF_RXREORDER_NEW_HOLE)  {</div><div class='hunk'>@@ -1814,7 +1810,7 @@ void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *pkt, bool inirq)</div><div class='ctx'> 			rfi-&gt;cur_idx = cur_idx;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		/* explicity window move updating the expected index */</div><div class='add'>+		/* explicitly window move updating the expected index */</div><div class='ctx'> 		exp_idx = reorder_data[BRCMF_RXREORDER_EXPIDX_OFFSET];</div><div class='ctx'> </div><div class='ctx'> 		brcmf_dbg(DATA, "flow-%d (0x%x): change expected: %d -&gt; %d\n",</div><div class='hunk'>@@ -1833,7 +1829,7 @@ void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *pkt, bool inirq)</div><div class='ctx'> netif_rx:</div><div class='ctx'> 	skb_queue_walk_safe(&amp;reorder_list, pkt, pnext) {</div><div class='ctx'> 		__skb_unlink(pkt, &amp;reorder_list);</div><div class='del'>-		brcmf_netif_rx(ifp, pkt, inirq);</div><div class='add'>+		brcmf_netif_rx(ifp, pkt);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2475,7 +2471,8 @@ bool brcmf_fws_fc_active(struct brcmf_fws_info *fws)</div><div class='ctx'> 	return fws-&gt;fcmode != BRCMF_FWS_FCMODE_NONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void brcmf_fws_bustxfail(struct brcmf_fws_info *fws, struct sk_buff *skb)</div><div class='add'>+void brcmf_fws_bustxcomplete(struct brcmf_fws_info *fws, struct sk_buff *skb,</div><div class='add'>+			     bool success)</div><div class='ctx'> {</div><div class='ctx'> 	u32 hslot;</div><div class='ctx'> </div><div class='hunk'>@@ -2483,11 +2480,14 @@ void brcmf_fws_bustxfail(struct brcmf_fws_info *fws, struct sk_buff *skb)</div><div class='ctx'> 		brcmu_pkt_buf_free_skb(skb);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	brcmf_fws_lock(fws);</div><div class='del'>-	hslot = brcmf_skb_htod_tag_get_field(skb, HSLOT);</div><div class='del'>-	brcmf_fws_txs_process(fws, BRCMF_FWS_TXSTATUS_HOST_TOSSED, hslot, 0, 0,</div><div class='del'>-			      1);</div><div class='del'>-	brcmf_fws_unlock(fws);</div><div class='add'>+</div><div class='add'>+	if (!success) {</div><div class='add'>+		brcmf_fws_lock(fws);</div><div class='add'>+		hslot = brcmf_skb_htod_tag_get_field(skb, HSLOT);</div><div class='add'>+		brcmf_fws_txs_process(fws, BRCMF_FWS_TXSTATUS_HOST_TOSSED, hslot,</div><div class='add'>+				      0, 0, 1);</div><div class='add'>+		brcmf_fws_unlock(fws);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void brcmf_fws_bus_blocked(struct brcmf_pub *drvr, bool flow_blocked)</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h<br/>index 50e424b5880d..f9c36cd8f1de 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h</a></div><div class='hunk'>@@ -40,8 +40,9 @@ int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb);</div><div class='ctx'> void brcmf_fws_reset_interface(struct brcmf_if *ifp);</div><div class='ctx'> void brcmf_fws_add_interface(struct brcmf_if *ifp);</div><div class='ctx'> void brcmf_fws_del_interface(struct brcmf_if *ifp);</div><div class='del'>-void brcmf_fws_bustxfail(struct brcmf_fws_info *fws, struct sk_buff *skb);</div><div class='add'>+void brcmf_fws_bustxcomplete(struct brcmf_fws_info *fws, struct sk_buff *skb,</div><div class='add'>+			     bool success);</div><div class='ctx'> void brcmf_fws_bus_blocked(struct brcmf_pub *drvr, bool flow_blocked);</div><div class='del'>-void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *skb, bool inirq);</div><div class='add'>+void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *skb);</div><div class='ctx'> </div><div class='ctx'> #endif /* FWSIGNAL_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c<br/>new file mode 100644<br/>index 000000000000..41eafcda77f7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c</a></div><div class='hunk'>@@ -0,0 +1,200 @@</div><div class='add'>+// SPDX-License-Identifier: ISC</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022 Broadcom Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kmod.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/printk.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "bus.h"</div><div class='add'>+#include "debug.h"</div><div class='add'>+#include "fwvid.h"</div><div class='add'>+</div><div class='add'>+#include "wcc/vops.h"</div><div class='add'>+#include "cyw/vops.h"</div><div class='add'>+#include "bca/vops.h"</div><div class='add'>+</div><div class='add'>+struct brcmf_fwvid_entry {</div><div class='add'>+	const char *name;</div><div class='add'>+	const struct brcmf_fwvid_ops *vops;</div><div class='add'>+	struct list_head drvr_list;</div><div class='add'>+#if IS_MODULE(CONFIG_BRCMFMAC)</div><div class='add'>+	struct module *vmod;</div><div class='add'>+	struct completion reg_done;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(fwvid_list_lock);</div><div class='add'>+</div><div class='add'>+#if IS_MODULE(CONFIG_BRCMFMAC)</div><div class='add'>+#define FWVID_ENTRY_INIT(_vid, _name) \</div><div class='add'>+	[BRCMF_FWVENDOR_ ## _vid] = { \</div><div class='add'>+		.name = #_name, \</div><div class='add'>+		.reg_done = COMPLETION_INITIALIZER(fwvid_list[BRCMF_FWVENDOR_ ## _vid].reg_done), \</div><div class='add'>+		.drvr_list = LIST_HEAD_INIT(fwvid_list[BRCMF_FWVENDOR_ ## _vid].drvr_list), \</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='add'>+#define FWVID_ENTRY_INIT(_vid, _name) \</div><div class='add'>+	[BRCMF_FWVENDOR_ ## _vid] = { \</div><div class='add'>+		.name = #_name, \</div><div class='add'>+		.drvr_list = LIST_HEAD_INIT(fwvid_list[BRCMF_FWVENDOR_ ## _vid].drvr_list), \</div><div class='add'>+		.vops = _vid ## _VOPS \</div><div class='add'>+	}</div><div class='add'>+#endif /* IS_MODULE(CONFIG_BRCMFMAC) */</div><div class='add'>+</div><div class='add'>+static struct brcmf_fwvid_entry fwvid_list[BRCMF_FWVENDOR_NUM] = {</div><div class='add'>+	FWVID_ENTRY_INIT(WCC, wcc),</div><div class='add'>+	FWVID_ENTRY_INIT(CYW, cyw),</div><div class='add'>+	FWVID_ENTRY_INIT(BCA, bca),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if IS_MODULE(CONFIG_BRCMFMAC)</div><div class='add'>+static int brcmf_fwvid_request_module(enum brcmf_fwvendor fwvid)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!fwvid_list[fwvid].vmod) {</div><div class='add'>+		struct completion *reg_done = &amp;fwvid_list[fwvid].reg_done;</div><div class='add'>+</div><div class='add'>+		mutex_unlock(&amp;fwvid_list_lock);</div><div class='add'>+</div><div class='add'>+		ret = request_module("brcmfmac-%s", fwvid_list[fwvid].name);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto fail;</div><div class='add'>+</div><div class='add'>+		ret = wait_for_completion_interruptible(reg_done);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto fail;</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;fwvid_list_lock);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	brcmf_err("mod=%s: failed %d\n", fwvid_list[fwvid].name, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int brcmf_fwvid_register_vendor(enum brcmf_fwvendor fwvid, struct module *vmod,</div><div class='add'>+				const struct brcmf_fwvid_ops *vops)</div><div class='add'>+{</div><div class='add'>+	if (fwvid &gt;= BRCMF_FWVENDOR_NUM)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!vmod) || WARN_ON(!vops) ||</div><div class='add'>+	    WARN_ON(!vops-&gt;alloc_fweh_info))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(fwvid_list[fwvid].vmod))</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(TRACE, "mod=%s: enter\n", fwvid_list[fwvid].name);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;fwvid_list_lock);</div><div class='add'>+</div><div class='add'>+	fwvid_list[fwvid].vmod = vmod;</div><div class='add'>+	fwvid_list[fwvid].vops = vops;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;fwvid_list_lock);</div><div class='add'>+</div><div class='add'>+	complete_all(&amp;fwvid_list[fwvid].reg_done);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+BRCMF_EXPORT_SYMBOL_GPL(brcmf_fwvid_register_vendor);</div><div class='add'>+</div><div class='add'>+int brcmf_fwvid_unregister_vendor(enum brcmf_fwvendor fwvid, struct module *mod)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_bus *bus, *tmp;</div><div class='add'>+</div><div class='add'>+	if (fwvid &gt;= BRCMF_FWVENDOR_NUM)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(fwvid_list[fwvid].vmod != mod))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;fwvid_list_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(bus, tmp, &amp;fwvid_list[fwvid].drvr_list, list) {</div><div class='add'>+		mutex_unlock(&amp;fwvid_list_lock);</div><div class='add'>+</div><div class='add'>+		brcmf_dbg(INFO, "mod=%s: removing %s\n", fwvid_list[fwvid].name,</div><div class='add'>+			  dev_name(bus-&gt;dev));</div><div class='add'>+		brcmf_bus_remove(bus);</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;fwvid_list_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fwvid_list[fwvid].vmod = NULL;</div><div class='add'>+	fwvid_list[fwvid].vops = NULL;</div><div class='add'>+	reinit_completion(&amp;fwvid_list[fwvid].reg_done);</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(TRACE, "mod=%s: exit\n", fwvid_list[fwvid].name);</div><div class='add'>+	mutex_unlock(&amp;fwvid_list_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+BRCMF_EXPORT_SYMBOL_GPL(brcmf_fwvid_unregister_vendor);</div><div class='add'>+#else</div><div class='add'>+static inline int brcmf_fwvid_request_module(enum brcmf_fwvendor fwvid)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int brcmf_fwvid_attach(struct brcmf_pub *drvr)</div><div class='add'>+{</div><div class='add'>+	enum brcmf_fwvendor fwvid = drvr-&gt;bus_if-&gt;fwvid;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (fwvid &gt;= ARRAY_SIZE(fwvid_list))</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(TRACE, "mod=%s: enter: dev %s\n", fwvid_list[fwvid].name,</div><div class='add'>+		  dev_name(drvr-&gt;bus_if-&gt;dev));</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;fwvid_list_lock);</div><div class='add'>+</div><div class='add'>+	ret = brcmf_fwvid_request_module(fwvid);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	drvr-&gt;vops = fwvid_list[fwvid].vops;</div><div class='add'>+	list_add(&amp;drvr-&gt;bus_if-&gt;list, &amp;fwvid_list[fwvid].drvr_list);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;fwvid_list_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void brcmf_fwvid_detach(struct brcmf_pub *drvr)</div><div class='add'>+{</div><div class='add'>+	enum brcmf_fwvendor fwvid = drvr-&gt;bus_if-&gt;fwvid;</div><div class='add'>+</div><div class='add'>+	if (fwvid &gt;= ARRAY_SIZE(fwvid_list))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(TRACE, "mod=%s: enter: dev %s\n", fwvid_list[fwvid].name,</div><div class='add'>+		  dev_name(drvr-&gt;bus_if-&gt;dev));</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;fwvid_list_lock);</div><div class='add'>+</div><div class='add'>+	if (drvr-&gt;vops) {</div><div class='add'>+		drvr-&gt;vops = NULL;</div><div class='add'>+		list_del(&amp;drvr-&gt;bus_if-&gt;list);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;fwvid_list_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const char *brcmf_fwvid_vendor_name(struct brcmf_pub *drvr)</div><div class='add'>+{</div><div class='add'>+	return fwvid_list[drvr-&gt;bus_if-&gt;fwvid].name;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h<br/>new file mode 100644<br/>index 000000000000..f3e011d090f2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h</a></div><div class='hunk'>@@ -0,0 +1,88 @@</div><div class='add'>+/* SPDX-License-Identifier: ISC */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022 Broadcom Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef FWVID_H_</div><div class='add'>+#define FWVID_H_</div><div class='add'>+</div><div class='add'>+#include "firmware.h"</div><div class='add'>+#include "cfg80211.h"</div><div class='add'>+</div><div class='add'>+struct brcmf_pub;</div><div class='add'>+struct brcmf_if;</div><div class='add'>+</div><div class='add'>+struct brcmf_fwvid_ops {</div><div class='add'>+	void (*feat_attach)(struct brcmf_if *ifp);</div><div class='add'>+	int (*set_sae_password)(struct brcmf_if *ifp, struct cfg80211_crypto_settings *crypto);</div><div class='add'>+	int (*alloc_fweh_info)(struct brcmf_pub *drvr);</div><div class='add'>+	int (*activate_events)(struct brcmf_if *ifp);</div><div class='add'>+	void (*get_cfg80211_ops)(struct brcmf_pub *drvr);</div><div class='add'>+	void (*register_event_handlers)(struct brcmf_pub *drvr);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* exported functions */</div><div class='add'>+int brcmf_fwvid_register_vendor(enum brcmf_fwvendor fwvid, struct module *mod,</div><div class='add'>+				const struct brcmf_fwvid_ops *ops);</div><div class='add'>+int brcmf_fwvid_unregister_vendor(enum brcmf_fwvendor fwvid, struct module *mod);</div><div class='add'>+</div><div class='add'>+/* core driver functions */</div><div class='add'>+int brcmf_fwvid_attach(struct brcmf_pub *drvr);</div><div class='add'>+void brcmf_fwvid_detach(struct brcmf_pub *drvr);</div><div class='add'>+const char *brcmf_fwvid_vendor_name(struct brcmf_pub *drvr);</div><div class='add'>+</div><div class='add'>+static inline void brcmf_fwvid_feat_attach(struct brcmf_if *ifp)</div><div class='add'>+{</div><div class='add'>+	const struct brcmf_fwvid_ops *vops = ifp-&gt;drvr-&gt;vops;</div><div class='add'>+</div><div class='add'>+	if (!vops-&gt;feat_attach)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vops-&gt;feat_attach(ifp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int brcmf_fwvid_set_sae_password(struct brcmf_if *ifp,</div><div class='add'>+					       struct cfg80211_crypto_settings *crypto)</div><div class='add'>+{</div><div class='add'>+	const struct brcmf_fwvid_ops *vops = ifp-&gt;drvr-&gt;vops;</div><div class='add'>+</div><div class='add'>+	if (!vops || !vops-&gt;set_sae_password)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return vops-&gt;set_sae_password(ifp, crypto);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int brcmf_fwvid_alloc_fweh_info(struct brcmf_pub *drvr)</div><div class='add'>+{</div><div class='add'>+	if (!drvr-&gt;vops)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return drvr-&gt;vops-&gt;alloc_fweh_info(drvr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int brcmf_fwvid_activate_events(struct brcmf_if *ifp)</div><div class='add'>+{</div><div class='add'>+	const struct brcmf_fwvid_ops *vops = ifp-&gt;drvr-&gt;vops;</div><div class='add'>+</div><div class='add'>+	if (!vops || !vops-&gt;activate_events)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return vops-&gt;activate_events(ifp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void brcmf_fwvid_get_cfg80211_ops(struct brcmf_pub *drvr)</div><div class='add'>+{</div><div class='add'>+	if (!drvr-&gt;vops || !drvr-&gt;vops-&gt;get_cfg80211_ops)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	drvr-&gt;vops-&gt;get_cfg80211_ops(drvr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void brcmf_fwvid_register_event_handlers(struct brcmf_pub *drvr)</div><div class='add'>+{</div><div class='add'>+	if (!drvr-&gt;vops || !drvr-&gt;vops-&gt;register_event_handlers)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	drvr-&gt;vops-&gt;register_event_handlers(drvr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* FWVID_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c<br/>index 7c8e08ee8f0f..45fbcbdc7d9e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c</a></div><div class='hunk'>@@ -71,6 +71,7 @@</div><div class='ctx'> #define BRCMF_MSGBUF_TRICKLE_TXWORKER_THRS	32</div><div class='ctx'> #define BRCMF_MSGBUF_UPDATE_RX_PTR_THRS		48</div><div class='ctx'> </div><div class='add'>+#define BRCMF_MAX_TXSTATUS_WAIT_RETRIES		10</div><div class='ctx'> </div><div class='ctx'> struct msgbuf_common_hdr {</div><div class='ctx'> 	u8				msgtype;</div><div class='hunk'>@@ -346,8 +347,11 @@ brcmf_msgbuf_alloc_pktid(struct device *dev,</div><div class='ctx'> 		count++;</div><div class='ctx'> 	} while (count &lt; pktids-&gt;array_size);</div><div class='ctx'> </div><div class='del'>-	if (count == pktids-&gt;array_size)</div><div class='add'>+	if (count == pktids-&gt;array_size) {</div><div class='add'>+		dma_unmap_single(dev, *physaddr, skb-&gt;len - data_offset,</div><div class='add'>+				 pktids-&gt;direction);</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	array[*idx].data_offset = data_offset;</div><div class='ctx'> 	array[*idx].physaddr = *physaddr;</div><div class='hunk'>@@ -536,8 +540,7 @@ static int brcmf_msgbuf_hdrpull(struct brcmf_pub *drvr, bool do_fws,</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void brcmf_msgbuf_rxreorder(struct brcmf_if *ifp, struct sk_buff *skb,</div><div class='del'>-				   bool inirq)</div><div class='add'>+static void brcmf_msgbuf_rxreorder(struct brcmf_if *ifp, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -807,8 +810,12 @@ static int brcmf_msgbuf_tx_queue_data(struct brcmf_pub *drvr, int ifidx,</div><div class='ctx'> 	flowid = brcmf_flowring_lookup(flow, eh-&gt;h_dest, skb-&gt;priority, ifidx);</div><div class='ctx'> 	if (flowid == BRCMF_FLOWRING_INVALID_ID) {</div><div class='ctx'> 		flowid = brcmf_msgbuf_flowring_create(msgbuf, ifidx, skb);</div><div class='del'>-		if (flowid == BRCMF_FLOWRING_INVALID_ID)</div><div class='add'>+		if (flowid == BRCMF_FLOWRING_INVALID_ID) {</div><div class='ctx'> 			return -ENOMEM;</div><div class='add'>+		} else {</div><div class='add'>+			brcmf_flowring_enqueue(flow, flowid, skb);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	queue_count = brcmf_flowring_enqueue(flow, flowid, skb);</div><div class='ctx'> 	force = ((queue_count % BRCMF_MSGBUF_TRICKLE_TXWORKER_THRS) == 0);</div><div class='hunk'>@@ -1191,7 +1198,7 @@ brcmf_msgbuf_process_rx_complete(struct brcmf_msgbuf *msgbuf, void *buf)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;protocol = eth_type_trans(skb, ifp-&gt;ndev);</div><div class='del'>-	brcmf_netif_rx(ifp, skb, false);</div><div class='add'>+	brcmf_netif_rx(ifp, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void brcmf_msgbuf_process_gen_status(struct brcmf_msgbuf *msgbuf,</div><div class='hunk'>@@ -1396,9 +1403,27 @@ void brcmf_msgbuf_delete_flowring(struct brcmf_pub *drvr, u16 flowid)</div><div class='ctx'> 	struct brcmf_msgbuf *msgbuf = (struct brcmf_msgbuf *)drvr-&gt;proto-&gt;pd;</div><div class='ctx'> 	struct msgbuf_tx_flowring_delete_req *delete;</div><div class='ctx'> 	struct brcmf_commonring *commonring;</div><div class='add'>+	struct brcmf_commonring *commonring_del = msgbuf-&gt;flowrings[flowid];</div><div class='add'>+	struct brcmf_flowring *flow = msgbuf-&gt;flow;</div><div class='ctx'> 	void *ret_ptr;</div><div class='ctx'> 	u8 ifidx;</div><div class='ctx'> 	int err;</div><div class='add'>+	int retry = BRCMF_MAX_TXSTATUS_WAIT_RETRIES;</div><div class='add'>+</div><div class='add'>+	/* make sure it is not in txflow */</div><div class='add'>+	brcmf_commonring_lock(commonring_del);</div><div class='add'>+	flow-&gt;rings[flowid]-&gt;status = RING_CLOSING;</div><div class='add'>+	brcmf_commonring_unlock(commonring_del);</div><div class='add'>+</div><div class='add'>+	/* wait for commonring txflow finished */</div><div class='add'>+	while (retry &amp;&amp; atomic_read(&amp;commonring_del-&gt;outstanding_tx)) {</div><div class='add'>+		usleep_range(5000, 10000);</div><div class='add'>+		retry--;</div><div class='add'>+	}</div><div class='add'>+	if (!retry) {</div><div class='add'>+		brcmf_err("timed out waiting for txstatus\n");</div><div class='add'>+		atomic_set(&amp;commonring_del-&gt;outstanding_tx, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* no need to submit if firmware can not be reached */</div><div class='ctx'> 	if (drvr-&gt;bus_if-&gt;state != BRCMF_BUS_UP) {</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h<br/>index 2e322edbb907..6a849f4a94dd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h</a></div><div class='hunk'>@@ -8,10 +8,10 @@</div><div class='ctx'> #ifdef CONFIG_BRCMFMAC_PROTO_MSGBUF</div><div class='ctx'> </div><div class='ctx'> #define BRCMF_H2D_MSGRING_CONTROL_SUBMIT_MAX_ITEM	64</div><div class='del'>-#define BRCMF_H2D_MSGRING_RXPOST_SUBMIT_MAX_ITEM	512</div><div class='add'>+#define BRCMF_H2D_MSGRING_RXPOST_SUBMIT_MAX_ITEM	1024</div><div class='ctx'> #define BRCMF_D2H_MSGRING_CONTROL_COMPLETE_MAX_ITEM	64</div><div class='ctx'> #define BRCMF_D2H_MSGRING_TX_COMPLETE_MAX_ITEM		1024</div><div class='del'>-#define BRCMF_D2H_MSGRING_RX_COMPLETE_MAX_ITEM		512</div><div class='add'>+#define BRCMF_D2H_MSGRING_RX_COMPLETE_MAX_ITEM		1024</div><div class='ctx'> #define BRCMF_H2D_TXFLOWRING_MAX_ITEM			512</div><div class='ctx'> </div><div class='ctx'> #define BRCMF_H2D_MSGRING_CONTROL_SUBMIT_ITEMSIZE	40</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c<br/>index a7554265f95f..1681ad00f82e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c</a></div><div class='hunk'>@@ -5,6 +5,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_irq.h&gt;</div><div class='add'>+#include &lt;linux/of_net.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;defs.h&gt;</div><div class='ctx'> #include "debug.h"</div><div class='hunk'>@@ -12,56 +14,142 @@</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "of.h"</div><div class='ctx'> </div><div class='del'>-void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,</div><div class='del'>-		    struct brcmf_mp_device *settings)</div><div class='add'>+static int brcmf_of_get_country_codes(struct device *dev,</div><div class='add'>+				      struct brcmf_mp_device *settings)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np = dev-&gt;of_node;</div><div class='add'>+	struct brcmfmac_pd_cc_entry *cce;</div><div class='add'>+	struct brcmfmac_pd_cc *cc;</div><div class='add'>+	int count;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	count = of_property_count_strings(np, "brcm,ccode-map");</div><div class='add'>+	if (count &lt; 0) {</div><div class='add'>+		/* If no explicit country code map is specified, check whether</div><div class='add'>+		 * the trivial map should be used.</div><div class='add'>+		 */</div><div class='add'>+		settings-&gt;trivial_ccode_map =</div><div class='add'>+			of_property_read_bool(np, "brcm,ccode-map-trivial");</div><div class='add'>+</div><div class='add'>+		/* The property is optional, so return success if it doesn't</div><div class='add'>+		 * exist. Otherwise propagate the error code.</div><div class='add'>+		 */</div><div class='add'>+		return (count == -EINVAL) ? 0 : count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cc = devm_kzalloc(dev, struct_size(cc, table, count), GFP_KERNEL);</div><div class='add'>+	if (!cc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cc-&gt;table_size = count;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		const char *map;</div><div class='add'>+</div><div class='add'>+		cce = &amp;cc-&gt;table[i];</div><div class='add'>+</div><div class='add'>+		if (of_property_read_string_index(np, "brcm,ccode-map",</div><div class='add'>+						  i, &amp;map))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* String format e.g. US-Q2-86 */</div><div class='add'>+		if (sscanf(map, "%2c-%2c-%d", cce-&gt;iso3166, cce-&gt;cc,</div><div class='add'>+			   &amp;cce-&gt;rev) != 3)</div><div class='add'>+			brcmf_err("failed to read country map %s\n", map);</div><div class='add'>+		else</div><div class='add'>+			brcmf_dbg(INFO, "%s-%s-%d\n", cce-&gt;iso3166, cce-&gt;cc,</div><div class='add'>+				  cce-&gt;rev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	settings-&gt;country_codes = cc;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,</div><div class='add'>+		   struct brcmf_mp_device *settings)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmfmac_sdio_pd *sdio = &amp;settings-&gt;bus.sdio;</div><div class='ctx'> 	struct device_node *root, *np = dev-&gt;of_node;</div><div class='add'>+	struct of_phandle_args oirq;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+	const char *prop;</div><div class='ctx'> 	int irq;</div><div class='add'>+	int err;</div><div class='ctx'> 	u32 irqf;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='add'>+	/* Apple ARM64 platforms have their own idea of board type, passed in</div><div class='add'>+	 * via the device tree. They also have an antenna SKU parameter</div><div class='add'>+	 */</div><div class='add'>+	err = of_property_read_string(np, "brcm,board-type", &amp;prop);</div><div class='add'>+	if (!err)</div><div class='add'>+		settings-&gt;board_type = prop;</div><div class='add'>+</div><div class='add'>+	if (!of_property_read_string(np, "apple,antenna-sku", &amp;prop))</div><div class='add'>+		settings-&gt;antenna_sku = prop;</div><div class='add'>+</div><div class='add'>+	/* The WLAN calibration blob is normally stored in SROM, but Apple</div><div class='add'>+	 * ARM64 platforms pass it via the DT instead.</div><div class='add'>+	 */</div><div class='add'>+	prop = of_get_property(np, "brcm,cal-blob", &amp;settings-&gt;cal_size);</div><div class='add'>+	if (prop &amp;&amp; settings-&gt;cal_size)</div><div class='add'>+		settings-&gt;cal_blob = prop;</div><div class='add'>+</div><div class='ctx'> 	/* Set board-type to the first string of the machine compatible prop */</div><div class='ctx'> 	root = of_find_node_by_path("/");</div><div class='del'>-	if (root) {</div><div class='del'>-		int i, len;</div><div class='del'>-		char *board_type;</div><div class='add'>+	if (root &amp;&amp; err) {</div><div class='add'>+		char *board_type = NULL;</div><div class='ctx'> 		const char *tmp;</div><div class='ctx'> </div><div class='del'>-		of_property_read_string_index(root, "compatible", 0, &amp;tmp);</div><div class='del'>-</div><div class='ctx'> 		/* get rid of '/' in the compatible string to be able to find the FW */</div><div class='del'>-		len = strlen(tmp) + 1;</div><div class='del'>-		board_type = devm_kzalloc(dev, len, GFP_KERNEL);</div><div class='del'>-		strscpy(board_type, tmp, len);</div><div class='del'>-		for (i = 0; i &lt; board_type[i]; i++) {</div><div class='del'>-			if (board_type[i] == '/')</div><div class='del'>-				board_type[i] = '-';</div><div class='add'>+		if (!of_property_read_string_index(root, "compatible", 0, &amp;tmp))</div><div class='add'>+			board_type = devm_kstrdup(dev, tmp, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+		if (!board_type) {</div><div class='add'>+			of_node_put(root);</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='add'>+		strreplace(board_type, '/', '-');</div><div class='ctx'> 		settings-&gt;board_type = board_type;</div><div class='del'>-</div><div class='del'>-		of_node_put(root);</div><div class='ctx'> 	}</div><div class='add'>+	of_node_put(root);</div><div class='ctx'> </div><div class='del'>-	if (!np || bus_type != BRCMF_BUSTYPE_SDIO ||</div><div class='del'>-	    !of_device_is_compatible(np, "brcm,bcm4329-fmac"))</div><div class='del'>-		return;</div><div class='add'>+	clk = devm_clk_get_optional_enabled_with_rate(dev, "lpo", 32768);</div><div class='add'>+	if (IS_ERR(clk))</div><div class='add'>+		return PTR_ERR(clk);</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(INFO, "%s LPO clock\n", clk ? "enable" : "no");</div><div class='add'>+</div><div class='add'>+	if (!np || !of_device_is_compatible(np, "brcm,bcm4329-fmac"))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = brcmf_of_get_country_codes(dev, settings);</div><div class='add'>+	if (err)</div><div class='add'>+		brcmf_err("failed to get OF country code map (err=%d)\n", err);</div><div class='add'>+</div><div class='add'>+	of_get_mac_address(np, settings-&gt;mac);</div><div class='add'>+</div><div class='add'>+	if (bus_type != BRCMF_BUSTYPE_SDIO)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (of_property_read_u32(np, "brcm,drive-strength", &amp;val) == 0)</div><div class='ctx'> 		sdio-&gt;drive_strength = val;</div><div class='ctx'> </div><div class='ctx'> 	/* make sure there are interrupts defined in the node */</div><div class='del'>-	if (!of_find_property(np, "interrupts", NULL))</div><div class='del'>-		return;</div><div class='add'>+	if (of_irq_parse_one(np, 0, &amp;oirq))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	irq = irq_of_parse_and_map(np, 0);</div><div class='add'>+	irq = irq_create_of_mapping(&amp;oirq);</div><div class='ctx'> 	if (!irq) {</div><div class='ctx'> 		brcmf_err("interrupt could not be mapped\n");</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	irqf = irqd_get_trigger_type(irq_get_irq_data(irq));</div><div class='add'>+	irqf = irq_get_trigger_type(irq);</div><div class='ctx'> </div><div class='ctx'> 	sdio-&gt;oob_irq_supported = true;</div><div class='ctx'> 	sdio-&gt;oob_irq_nr = irq;</div><div class='ctx'> 	sdio-&gt;oob_irq_flags = irqf;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h<br/>index 10bf52253337..ae124c73fc3b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h</a></div><div class='hunk'>@@ -3,11 +3,12 @@</div><div class='ctx'>  * Copyright (c) 2014 Broadcom Corporation</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_OF</div><div class='del'>-void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,</div><div class='del'>-		    struct brcmf_mp_device *settings);</div><div class='add'>+int brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,</div><div class='add'>+		   struct brcmf_mp_device *settings);</div><div class='ctx'> #else</div><div class='del'>-static void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,</div><div class='del'>-			   struct brcmf_mp_device *settings)</div><div class='add'>+static int brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,</div><div class='add'>+			  struct brcmf_mp_device *settings)</div><div class='ctx'> {</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_OF */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c<br/>index 34cd8a7401fe..e1752a513c73 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c</a></div><div class='hunk'>@@ -90,8 +90,8 @@</div><div class='ctx'> #define P2PSD_ACTION_CATEGORY		0x04	/* Public action frame */</div><div class='ctx'> #define P2PSD_ACTION_ID_GAS_IREQ	0x0a	/* GAS Initial Request AF */</div><div class='ctx'> #define P2PSD_ACTION_ID_GAS_IRESP	0x0b	/* GAS Initial Response AF */</div><div class='del'>-#define P2PSD_ACTION_ID_GAS_CREQ	0x0c	/* GAS Comback Request AF */</div><div class='del'>-#define P2PSD_ACTION_ID_GAS_CRESP	0x0d	/* GAS Comback Response AF */</div><div class='add'>+#define P2PSD_ACTION_ID_GAS_CREQ	0x0c	/* GAS Comeback Request AF */</div><div class='add'>+#define P2PSD_ACTION_ID_GAS_CRESP	0x0d	/* GAS Comeback Response AF */</div><div class='ctx'> </div><div class='ctx'> #define BRCMF_P2P_DISABLE_TIMEOUT	msecs_to_jiffies(500)</div><div class='ctx'> </div><div class='hunk'>@@ -158,7 +158,7 @@ struct brcmf_p2p_pub_act_frame {</div><div class='ctx'> 	u8	oui_type;</div><div class='ctx'> 	u8	subtype;</div><div class='ctx'> 	u8	dialog_token;</div><div class='del'>-	u8	elts[1];</div><div class='add'>+	u8	elts[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -177,7 +177,7 @@ struct brcmf_p2p_action_frame {</div><div class='ctx'> 	u8	type;</div><div class='ctx'> 	u8	subtype;</div><div class='ctx'> 	u8	dialog_token;</div><div class='del'>-	u8	elts[1];</div><div class='add'>+	u8	elts[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -192,7 +192,7 @@ struct brcmf_p2psd_gas_pub_act_frame {</div><div class='ctx'> 	u8	category;</div><div class='ctx'> 	u8	action;</div><div class='ctx'> 	u8	dialog_token;</div><div class='del'>-	u8	query_data[1];</div><div class='add'>+	u8	query_data[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -225,7 +225,7 @@ static bool brcmf_p2p_is_pub_action(void *frame, u32 frame_len)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	pact_frm = (struct brcmf_p2p_pub_act_frame *)frame;</div><div class='del'>-	if (frame_len &lt; sizeof(struct brcmf_p2p_pub_act_frame) - 1)</div><div class='add'>+	if (frame_len &lt; sizeof(*pact_frm))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (pact_frm-&gt;category == P2P_PUB_AF_CATEGORY &amp;&amp;</div><div class='hunk'>@@ -253,7 +253,7 @@ static bool brcmf_p2p_is_p2p_action(void *frame, u32 frame_len)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	act_frm = (struct brcmf_p2p_action_frame *)frame;</div><div class='del'>-	if (frame_len &lt; sizeof(struct brcmf_p2p_action_frame) - 1)</div><div class='add'>+	if (frame_len &lt; sizeof(*act_frm))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (act_frm-&gt;category == P2P_AF_CATEGORY &amp;&amp;</div><div class='hunk'>@@ -280,7 +280,7 @@ static bool brcmf_p2p_is_gas_action(void *frame, u32 frame_len)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	sd_act_frm = (struct brcmf_p2psd_gas_pub_act_frame *)frame;</div><div class='del'>-	if (frame_len &lt; sizeof(struct brcmf_p2psd_gas_pub_act_frame) - 1)</div><div class='add'>+	if (frame_len &lt; sizeof(*sd_act_frm))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (sd_act_frm-&gt;category != P2PSD_ACTION_CATEGORY)</div><div class='hunk'>@@ -396,11 +396,11 @@ static void brcmf_p2p_print_actframe(bool tx, void *frame, u32 frame_len)</div><div class='ctx'> 				  (tx) ? "TX" : "RX");</div><div class='ctx'> 			break;</div><div class='ctx'> 		case P2PSD_ACTION_ID_GAS_CREQ:</div><div class='del'>-			brcmf_dbg(TRACE, "%s P2P GAS Comback Request\n",</div><div class='add'>+			brcmf_dbg(TRACE, "%s P2P GAS Comeback Request\n",</div><div class='ctx'> 				  (tx) ? "TX" : "RX");</div><div class='ctx'> 			break;</div><div class='ctx'> 		case P2PSD_ACTION_ID_GAS_CRESP:</div><div class='del'>-			brcmf_dbg(TRACE, "%s P2P GAS Comback Response\n",</div><div class='add'>+			brcmf_dbg(TRACE, "%s P2P GAS Comeback Response\n",</div><div class='ctx'> 				  (tx) ? "TX" : "RX");</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -1128,7 +1128,7 @@ static void brcmf_p2p_afx_handler(struct work_struct *work)</div><div class='ctx'> 	if (afx_hdl-&gt;is_listen &amp;&amp; afx_hdl-&gt;my_listen_chan)</div><div class='ctx'> 		/* 100ms ~ 300ms */</div><div class='ctx'> 		err = brcmf_p2p_discover_listen(p2p, afx_hdl-&gt;my_listen_chan,</div><div class='del'>-						100 * (1 + prandom_u32() % 3));</div><div class='add'>+						100 * get_random_u32_inclusive(1, 3));</div><div class='ctx'> 	else</div><div class='ctx'> 		err = brcmf_p2p_act_frm_search(p2p, afx_hdl-&gt;peer_listen_chan);</div><div class='ctx'> </div><div class='hunk'>@@ -1403,7 +1403,7 @@ int brcmf_p2p_notify_action_frame_rx(struct brcmf_if *ifp,</div><div class='ctx'> 	u8 action;</div><div class='ctx'> </div><div class='ctx'> 	if (e-&gt;datalen &lt; sizeof(*rxframe)) {</div><div class='del'>-		brcmf_dbg(SCAN, "Event data to small. Ignore\n");</div><div class='add'>+		brcmf_dbg(SCAN, "Event data too small. Ignore\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1466,8 +1466,8 @@ int brcmf_p2p_notify_action_frame_rx(struct brcmf_if *ifp,</div><div class='ctx'> 			       ETH_ALEN);</div><div class='ctx'> 	memcpy(mgmt_frame-&gt;sa, e-&gt;addr, ETH_ALEN);</div><div class='ctx'> 	mgmt_frame-&gt;frame_control = cpu_to_le16(IEEE80211_STYPE_ACTION);</div><div class='del'>-	memcpy(&amp;mgmt_frame-&gt;u, frame, mgmt_frame_len);</div><div class='del'>-	mgmt_frame_len += offsetof(struct ieee80211_mgmt, u);</div><div class='add'>+	memcpy(mgmt_frame-&gt;u.body, frame, mgmt_frame_len);</div><div class='add'>+	mgmt_frame_len += offsetof(struct ieee80211_mgmt, u.body);</div><div class='ctx'> </div><div class='ctx'> 	freq = ieee80211_channel_to_frequency(ch.control_ch_num,</div><div class='ctx'> 					      ch.band == BRCMU_CHAN_BAND_2G ?</div><div class='hunk'>@@ -1529,6 +1529,7 @@ int brcmf_p2p_notify_action_tx_complete(struct brcmf_if *ifp,</div><div class='ctx'> /**</div><div class='ctx'>  * brcmf_p2p_tx_action_frame() - send action frame over fil.</div><div class='ctx'>  *</div><div class='add'>+ * @ifp: interface to transmit on.</div><div class='ctx'>  * @p2p: p2p info struct for vif.</div><div class='ctx'>  * @af_params: action frame data/info.</div><div class='ctx'>  *</div><div class='hunk'>@@ -1538,12 +1539,11 @@ int brcmf_p2p_notify_action_tx_complete(struct brcmf_if *ifp,</div><div class='ctx'>  * The WLC_E_ACTION_FRAME_COMPLETE event will be received when the action</div><div class='ctx'>  * frame is transmitted.</div><div class='ctx'>  */</div><div class='del'>-static s32 brcmf_p2p_tx_action_frame(struct brcmf_p2p_info *p2p,</div><div class='add'>+static s32 brcmf_p2p_tx_action_frame(struct brcmf_if *ifp,</div><div class='add'>+				     struct brcmf_p2p_info *p2p,</div><div class='ctx'> 				     struct brcmf_fil_af_params_le *af_params)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_pub *drvr = p2p-&gt;cfg-&gt;pub;</div><div class='del'>-	struct brcmf_cfg80211_vif *vif;</div><div class='del'>-	struct brcmf_p2p_action_frame *p2p_af;</div><div class='ctx'> 	s32 err = 0;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='hunk'>@@ -1552,14 +1552,7 @@ static s32 brcmf_p2p_tx_action_frame(struct brcmf_p2p_info *p2p,</div><div class='ctx'> 	clear_bit(BRCMF_P2P_STATUS_ACTION_TX_COMPLETED, &amp;p2p-&gt;status);</div><div class='ctx'> 	clear_bit(BRCMF_P2P_STATUS_ACTION_TX_NOACK, &amp;p2p-&gt;status);</div><div class='ctx'> </div><div class='del'>-	/* check if it is a p2p_presence response */</div><div class='del'>-	p2p_af = (struct brcmf_p2p_action_frame *)af_params-&gt;action_frame.data;</div><div class='del'>-	if (p2p_af-&gt;subtype == P2P_AF_PRESENCE_RSP)</div><div class='del'>-		vif = p2p-&gt;bss_idx[P2PAPI_BSSCFG_CONNECTION].vif;</div><div class='del'>-	else</div><div class='del'>-		vif = p2p-&gt;bss_idx[P2PAPI_BSSCFG_DEVICE].vif;</div><div class='del'>-</div><div class='del'>-	err = brcmf_fil_bsscfg_data_set(vif-&gt;ifp, "actframe", af_params,</div><div class='add'>+	err = brcmf_fil_bsscfg_data_set(ifp, "actframe", af_params,</div><div class='ctx'> 					sizeof(*af_params));</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		bphy_err(drvr, " sending action frame has failed\n");</div><div class='hunk'>@@ -1711,16 +1704,14 @@ static bool brcmf_p2p_check_dwell_overflow(u32 requested_dwell,</div><div class='ctx'> /**</div><div class='ctx'>  * brcmf_p2p_send_action_frame() - send action frame .</div><div class='ctx'>  *</div><div class='del'>- * @cfg: driver private data for cfg80211 interface.</div><div class='del'>- * @ndev: net device to transmit on.</div><div class='add'>+ * @ifp: interface to transmit on.</div><div class='ctx'>  * @af_params: configuration data for action frame.</div><div class='ctx'>  */</div><div class='del'>-bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,</div><div class='del'>-				 struct net_device *ndev,</div><div class='add'>+bool brcmf_p2p_send_action_frame(struct brcmf_if *ifp,</div><div class='ctx'> 				 struct brcmf_fil_af_params_le *af_params)</div><div class='ctx'> {</div><div class='add'>+	struct brcmf_cfg80211_info *cfg = ifp-&gt;drvr-&gt;config;</div><div class='ctx'> 	struct brcmf_p2p_info *p2p = &amp;cfg-&gt;p2p;</div><div class='del'>-	struct brcmf_if *ifp = netdev_priv(ndev);</div><div class='ctx'> 	struct brcmf_fil_action_frame_le *action_frame;</div><div class='ctx'> 	struct brcmf_config_af_params config_af_params;</div><div class='ctx'> 	struct afx_hdl *afx_hdl = &amp;p2p-&gt;afx_hdl;</div><div class='hunk'>@@ -1857,7 +1848,7 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,</div><div class='ctx'> 		if (af_params-&gt;channel)</div><div class='ctx'> 			msleep(P2P_AF_RETRY_DELAY_TIME);</div><div class='ctx'> </div><div class='del'>-		ack = !brcmf_p2p_tx_action_frame(p2p, af_params);</div><div class='add'>+		ack = !brcmf_p2p_tx_action_frame(ifp, p2p, af_params);</div><div class='ctx'> 		tx_retry++;</div><div class='ctx'> 		dwell_overflow = brcmf_p2p_check_dwell_overflow(requested_dwell,</div><div class='ctx'> 								dwell_jiffies);</div><div class='hunk'>@@ -1949,7 +1940,7 @@ s32 brcmf_p2p_notify_rx_mgmt_p2p_probereq(struct brcmf_if *ifp,</div><div class='ctx'> 		  e-&gt;reason);</div><div class='ctx'> </div><div class='ctx'> 	if (e-&gt;datalen &lt; sizeof(*rxframe)) {</div><div class='del'>-		brcmf_dbg(SCAN, "Event data to small. Ignore\n");</div><div class='add'>+		brcmf_dbg(SCAN, "Event data too small. Ignore\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2037,7 +2028,7 @@ static void brcmf_p2p_get_current_chanspec(struct brcmf_p2p_info *p2p,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Change a P2P Role.</div><div class='add'>+ * brcmf_p2p_ifchange - Change a P2P Role.</div><div class='ctx'>  * @cfg: driver private data for cfg80211 interface.</div><div class='ctx'>  * @if_type: interface type.</div><div class='ctx'>  * Returns 0 if success.</div><div class='hunk'>@@ -2125,7 +2116,7 @@ static int brcmf_p2p_disable_p2p_if(struct brcmf_cfg80211_vif *vif)</div><div class='ctx'> 	struct brcmf_cfg80211_info *cfg = wdev_to_cfg(&amp;vif-&gt;wdev);</div><div class='ctx'> 	struct net_device *pri_ndev = cfg_to_ndev(cfg);</div><div class='ctx'> 	struct brcmf_if *ifp = netdev_priv(pri_ndev);</div><div class='del'>-	u8 *addr = vif-&gt;wdev.netdev-&gt;dev_addr;</div><div class='add'>+	const u8 *addr = vif-&gt;wdev.netdev-&gt;dev_addr;</div><div class='ctx'> </div><div class='ctx'> 	return brcmf_fil_iovar_data_set(ifp, "p2p_ifdis", addr, ETH_ALEN);</div><div class='ctx'> }</div><div class='hunk'>@@ -2135,7 +2126,7 @@ static int brcmf_p2p_release_p2p_if(struct brcmf_cfg80211_vif *vif)</div><div class='ctx'> 	struct brcmf_cfg80211_info *cfg = wdev_to_cfg(&amp;vif-&gt;wdev);</div><div class='ctx'> 	struct net_device *pri_ndev = cfg_to_ndev(cfg);</div><div class='ctx'> 	struct brcmf_if *ifp = netdev_priv(pri_ndev);</div><div class='del'>-	u8 *addr = vif-&gt;wdev.netdev-&gt;dev_addr;</div><div class='add'>+	const u8 *addr = vif-&gt;wdev.netdev-&gt;dev_addr;</div><div class='ctx'> </div><div class='ctx'> 	return brcmf_fil_iovar_data_set(ifp, "p2p_ifdel", addr, ETH_ALEN);</div><div class='ctx'> }</div><div class='hunk'>@@ -2217,7 +2208,6 @@ static struct wireless_dev *brcmf_p2p_create_p2pdev(struct brcmf_p2p_info *p2p,</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(p2p_ifp-&gt;bsscfgidx != bsscfgidx);</div><div class='ctx'> </div><div class='del'>-	init_completion(&amp;p2p-&gt;send_af_done);</div><div class='ctx'> 	INIT_WORK(&amp;p2p-&gt;afx_hdl.afx_work, brcmf_p2p_afx_handler);</div><div class='ctx'> 	init_completion(&amp;p2p-&gt;afx_hdl.act_frm_scan);</div><div class='ctx'> 	init_completion(&amp;p2p-&gt;wait_next_af);</div><div class='hunk'>@@ -2334,7 +2324,7 @@ struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name,</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strncpy(ifp-&gt;ndev-&gt;name, name, sizeof(ifp-&gt;ndev-&gt;name) - 1);</div><div class='add'>+	strscpy(ifp-&gt;ndev-&gt;name, name, sizeof(ifp-&gt;ndev-&gt;name));</div><div class='ctx'> 	ifp-&gt;ndev-&gt;name_assign_type = name_assign_type;</div><div class='ctx'> 	err = brcmf_net_attach(ifp, true);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -2424,8 +2414,12 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev)</div><div class='ctx'> 	brcmf_remove_interface(vif-&gt;ifp, true);</div><div class='ctx'> </div><div class='ctx'> 	brcmf_cfg80211_arm_vif_event(cfg, NULL);</div><div class='del'>-	if (iftype != NL80211_IFTYPE_P2P_DEVICE)</div><div class='del'>-		p2p-&gt;bss_idx[P2PAPI_BSSCFG_CONNECTION].vif = NULL;</div><div class='add'>+	if (iftype != NL80211_IFTYPE_P2P_DEVICE) {</div><div class='add'>+		if (vif == p2p-&gt;bss_idx[P2PAPI_BSSCFG_CONNECTION].vif)</div><div class='add'>+			p2p-&gt;bss_idx[P2PAPI_BSSCFG_CONNECTION].vif = NULL;</div><div class='add'>+		if (vif == p2p-&gt;bss_idx[P2PAPI_BSSCFG_CONNECTION2].vif)</div><div class='add'>+			p2p-&gt;bss_idx[P2PAPI_BSSCFG_CONNECTION2].vif = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2509,6 +2503,8 @@ s32 brcmf_p2p_attach(struct brcmf_cfg80211_info *cfg, bool p2pdev_forced)</div><div class='ctx'> 	pri_ifp = brcmf_get_ifp(cfg-&gt;pub, 0);</div><div class='ctx'> 	p2p-&gt;bss_idx[P2PAPI_BSSCFG_PRIMARY].vif = pri_ifp-&gt;vif;</div><div class='ctx'> </div><div class='add'>+	init_completion(&amp;p2p-&gt;send_af_done);</div><div class='add'>+</div><div class='ctx'> 	if (p2pdev_forced) {</div><div class='ctx'> 		err_ptr = brcmf_p2p_create_p2pdev(p2p, NULL, NULL);</div><div class='ctx'> 		if (IS_ERR(err_ptr)) {</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h<br/>index d2ecee565bf2..d3137ebd7158 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h</a></div><div class='hunk'>@@ -168,8 +168,7 @@ int brcmf_p2p_notify_action_frame_rx(struct brcmf_if *ifp,</div><div class='ctx'> int brcmf_p2p_notify_action_tx_complete(struct brcmf_if *ifp,</div><div class='ctx'> 					const struct brcmf_event_msg *e,</div><div class='ctx'> 					void *data);</div><div class='del'>-bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,</div><div class='del'>-				 struct net_device *ndev,</div><div class='add'>+bool brcmf_p2p_send_action_frame(struct brcmf_if *ifp,</div><div class='ctx'> 				 struct brcmf_fil_af_params_le *af_params);</div><div class='ctx'> bool brcmf_p2p_scan_finding_common_channel(struct brcmf_cfg80211_info *cfg,</div><div class='ctx'> 					   struct brcmf_bss_info_le *bi);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c<br/>index ad79e3b7e74a..6327f4eca500 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c</a></div><div class='hunk'>@@ -12,7 +12,11 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/bcma/bcma.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;soc.h&gt;</div><div class='ctx'> #include &lt;chipcommon.h&gt;</div><div class='hunk'>@@ -48,16 +52,35 @@ enum brcmf_pcie_state {</div><div class='ctx'> BRCMF_FW_DEF(43602, "brcmfmac43602-pcie");</div><div class='ctx'> BRCMF_FW_DEF(4350, "brcmfmac4350-pcie");</div><div class='ctx'> BRCMF_FW_DEF(4350C, "brcmfmac4350c2-pcie");</div><div class='del'>-BRCMF_FW_DEF(4356, "brcmfmac4356-pcie");</div><div class='del'>-BRCMF_FW_DEF(43570, "brcmfmac43570-pcie");</div><div class='add'>+BRCMF_FW_CLM_DEF(4355, "brcmfmac4355-pcie");</div><div class='add'>+BRCMF_FW_CLM_DEF(4355C1, "brcmfmac4355c1-pcie");</div><div class='add'>+BRCMF_FW_CLM_DEF(4356, "brcmfmac4356-pcie");</div><div class='add'>+BRCMF_FW_CLM_DEF(43570, "brcmfmac43570-pcie");</div><div class='ctx'> BRCMF_FW_DEF(4358, "brcmfmac4358-pcie");</div><div class='ctx'> BRCMF_FW_DEF(4359, "brcmfmac4359-pcie");</div><div class='del'>-BRCMF_FW_DEF(4364, "brcmfmac4364-pcie");</div><div class='add'>+BRCMF_FW_DEF(4359C, "brcmfmac4359c-pcie");</div><div class='add'>+BRCMF_FW_CLM_DEF(4364B2, "brcmfmac4364b2-pcie");</div><div class='add'>+BRCMF_FW_CLM_DEF(4364B3, "brcmfmac4364b3-pcie");</div><div class='ctx'> BRCMF_FW_DEF(4365B, "brcmfmac4365b-pcie");</div><div class='ctx'> BRCMF_FW_DEF(4365C, "brcmfmac4365c-pcie");</div><div class='ctx'> BRCMF_FW_DEF(4366B, "brcmfmac4366b-pcie");</div><div class='ctx'> BRCMF_FW_DEF(4366C, "brcmfmac4366c-pcie");</div><div class='ctx'> BRCMF_FW_DEF(4371, "brcmfmac4371-pcie");</div><div class='add'>+BRCMF_FW_CLM_DEF(43752, "brcmfmac43752-pcie");</div><div class='add'>+BRCMF_FW_CLM_DEF(4377B3, "brcmfmac4377b3-pcie");</div><div class='add'>+BRCMF_FW_CLM_DEF(4378B1, "brcmfmac4378b1-pcie");</div><div class='add'>+BRCMF_FW_CLM_DEF(4378B3, "brcmfmac4378b3-pcie");</div><div class='add'>+BRCMF_FW_CLM_DEF(4387C2, "brcmfmac4387c2-pcie");</div><div class='add'>+BRCMF_FW_CLM_DEF(54591, "brcmfmac54591-pcie");</div><div class='add'>+</div><div class='add'>+/* firmware config files */</div><div class='add'>+MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.txt");</div><div class='add'>+MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.*.txt");</div><div class='add'>+</div><div class='add'>+/* per-board firmware binaries */</div><div class='add'>+MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.*.bin");</div><div class='add'>+MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.*.clm_blob");</div><div class='add'>+MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.*.txcap_blob");</div><div class='ctx'> </div><div class='ctx'> static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_43602_CHIP_ID, 0xFFFFFFFF, 43602),</div><div class='hunk'>@@ -65,13 +88,18 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_4350_CHIP_ID, 0x000000FF, 4350C),</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_4350_CHIP_ID, 0xFFFFFF00, 4350),</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_43525_CHIP_ID, 0xFFFFFFF0, 4365C),</div><div class='add'>+	BRCMF_FW_ENTRY(BRCM_CC_4355_CHIP_ID, 0x000007FF, 4355),</div><div class='add'>+	BRCMF_FW_ENTRY(BRCM_CC_4355_CHIP_ID, 0x00002000, 54591),</div><div class='add'>+	BRCMF_FW_ENTRY(BRCM_CC_4355_CHIP_ID, 0xFFFFF800, 4355C1), /* rev ID 12/C2 seen */</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356),</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_43567_CHIP_ID, 0xFFFFFFFF, 43570),</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_43569_CHIP_ID, 0xFFFFFFFF, 43570),</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_43570_CHIP_ID, 0xFFFFFFFF, 43570),</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_4358_CHIP_ID, 0xFFFFFFFF, 4358),</div><div class='del'>-	BRCMF_FW_ENTRY(BRCM_CC_4359_CHIP_ID, 0xFFFFFFFF, 4359),</div><div class='del'>-	BRCMF_FW_ENTRY(BRCM_CC_4364_CHIP_ID, 0xFFFFFFFF, 4364),</div><div class='add'>+	BRCMF_FW_ENTRY(BRCM_CC_4359_CHIP_ID, 0x000001FF, 4359),</div><div class='add'>+	BRCMF_FW_ENTRY(BRCM_CC_4359_CHIP_ID, 0xFFFFFE00, 4359C),</div><div class='add'>+	BRCMF_FW_ENTRY(BRCM_CC_4364_CHIP_ID, 0x0000000F, 4364B2), /* 3 */</div><div class='add'>+	BRCMF_FW_ENTRY(BRCM_CC_4364_CHIP_ID, 0xFFFFFFF0, 4364B3), /* 4 */</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_4365_CHIP_ID, 0x0000000F, 4365B),</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_4365_CHIP_ID, 0xFFFFFFF0, 4365C),</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_4366_CHIP_ID, 0x0000000F, 4366B),</div><div class='hunk'>@@ -79,6 +107,11 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_43664_CHIP_ID, 0xFFFFFFF0, 4366C),</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_43666_CHIP_ID, 0xFFFFFFF0, 4366C),</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_4371_CHIP_ID, 0xFFFFFFFF, 4371),</div><div class='add'>+	BRCMF_FW_ENTRY(BRCM_CC_43752_CHIP_ID, 0xFFFFFFFF, 43752),</div><div class='add'>+	BRCMF_FW_ENTRY(BRCM_CC_4377_CHIP_ID, 0xFFFFFFFF, 4377B3), /* revision ID 4 */</div><div class='add'>+	BRCMF_FW_ENTRY(BRCM_CC_4378_CHIP_ID, 0x0000000F, 4378B1), /* revision ID 3 */</div><div class='add'>+	BRCMF_FW_ENTRY(BRCM_CC_4378_CHIP_ID, 0xFFFFFFE0, 4378B3), /* revision ID 5 */</div><div class='add'>+	BRCMF_FW_ENTRY(BRCM_CC_4387_CHIP_ID, 0xFFFFFFFF, 4387C2), /* revision ID 7 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define BRCMF_PCIE_FW_UP_TIMEOUT		5000 /* msec */</div><div class='hunk'>@@ -110,6 +143,12 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {</div><div class='ctx'> #define BRCMF_PCIE_PCIE2REG_H2D_MAILBOX_0	0x140</div><div class='ctx'> #define BRCMF_PCIE_PCIE2REG_H2D_MAILBOX_1	0x144</div><div class='ctx'> </div><div class='add'>+#define BRCMF_PCIE_64_PCIE2REG_INTMASK		0xC14</div><div class='add'>+#define BRCMF_PCIE_64_PCIE2REG_MAILBOXINT	0xC30</div><div class='add'>+#define BRCMF_PCIE_64_PCIE2REG_MAILBOXMASK	0xC34</div><div class='add'>+#define BRCMF_PCIE_64_PCIE2REG_H2D_MAILBOX_0	0xA20</div><div class='add'>+#define BRCMF_PCIE_64_PCIE2REG_H2D_MAILBOX_1	0xA24</div><div class='add'>+</div><div class='ctx'> #define BRCMF_PCIE2_INTA			0x01</div><div class='ctx'> #define BRCMF_PCIE2_INTB			0x02</div><div class='ctx'> </div><div class='hunk'>@@ -129,6 +168,8 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {</div><div class='ctx'> #define	BRCMF_PCIE_MB_INT_D2H3_DB0		0x400000</div><div class='ctx'> #define	BRCMF_PCIE_MB_INT_D2H3_DB1		0x800000</div><div class='ctx'> </div><div class='add'>+#define BRCMF_PCIE_MB_INT_FN0			(BRCMF_PCIE_MB_INT_FN0_0 | \</div><div class='add'>+						 BRCMF_PCIE_MB_INT_FN0_1)</div><div class='ctx'> #define BRCMF_PCIE_MB_INT_D2H_DB		(BRCMF_PCIE_MB_INT_D2H0_DB0 | \</div><div class='ctx'> 						 BRCMF_PCIE_MB_INT_D2H0_DB1 | \</div><div class='ctx'> 						 BRCMF_PCIE_MB_INT_D2H1_DB0 | \</div><div class='hunk'>@@ -138,6 +179,40 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {</div><div class='ctx'> 						 BRCMF_PCIE_MB_INT_D2H3_DB0 | \</div><div class='ctx'> 						 BRCMF_PCIE_MB_INT_D2H3_DB1)</div><div class='ctx'> </div><div class='add'>+#define	BRCMF_PCIE_64_MB_INT_D2H0_DB0		0x1</div><div class='add'>+#define	BRCMF_PCIE_64_MB_INT_D2H0_DB1		0x2</div><div class='add'>+#define	BRCMF_PCIE_64_MB_INT_D2H1_DB0		0x4</div><div class='add'>+#define	BRCMF_PCIE_64_MB_INT_D2H1_DB1		0x8</div><div class='add'>+#define	BRCMF_PCIE_64_MB_INT_D2H2_DB0		0x10</div><div class='add'>+#define	BRCMF_PCIE_64_MB_INT_D2H2_DB1		0x20</div><div class='add'>+#define	BRCMF_PCIE_64_MB_INT_D2H3_DB0		0x40</div><div class='add'>+#define	BRCMF_PCIE_64_MB_INT_D2H3_DB1		0x80</div><div class='add'>+#define	BRCMF_PCIE_64_MB_INT_D2H4_DB0		0x100</div><div class='add'>+#define	BRCMF_PCIE_64_MB_INT_D2H4_DB1		0x200</div><div class='add'>+#define	BRCMF_PCIE_64_MB_INT_D2H5_DB0		0x400</div><div class='add'>+#define	BRCMF_PCIE_64_MB_INT_D2H5_DB1		0x800</div><div class='add'>+#define	BRCMF_PCIE_64_MB_INT_D2H6_DB0		0x1000</div><div class='add'>+#define	BRCMF_PCIE_64_MB_INT_D2H6_DB1		0x2000</div><div class='add'>+#define	BRCMF_PCIE_64_MB_INT_D2H7_DB0		0x4000</div><div class='add'>+#define	BRCMF_PCIE_64_MB_INT_D2H7_DB1		0x8000</div><div class='add'>+</div><div class='add'>+#define BRCMF_PCIE_64_MB_INT_D2H_DB		(BRCMF_PCIE_64_MB_INT_D2H0_DB0 | \</div><div class='add'>+						 BRCMF_PCIE_64_MB_INT_D2H0_DB1 | \</div><div class='add'>+						 BRCMF_PCIE_64_MB_INT_D2H1_DB0 | \</div><div class='add'>+						 BRCMF_PCIE_64_MB_INT_D2H1_DB1 | \</div><div class='add'>+						 BRCMF_PCIE_64_MB_INT_D2H2_DB0 | \</div><div class='add'>+						 BRCMF_PCIE_64_MB_INT_D2H2_DB1 | \</div><div class='add'>+						 BRCMF_PCIE_64_MB_INT_D2H3_DB0 | \</div><div class='add'>+						 BRCMF_PCIE_64_MB_INT_D2H3_DB1 | \</div><div class='add'>+						 BRCMF_PCIE_64_MB_INT_D2H4_DB0 | \</div><div class='add'>+						 BRCMF_PCIE_64_MB_INT_D2H4_DB1 | \</div><div class='add'>+						 BRCMF_PCIE_64_MB_INT_D2H5_DB0 | \</div><div class='add'>+						 BRCMF_PCIE_64_MB_INT_D2H5_DB1 | \</div><div class='add'>+						 BRCMF_PCIE_64_MB_INT_D2H6_DB0 | \</div><div class='add'>+						 BRCMF_PCIE_64_MB_INT_D2H6_DB1 | \</div><div class='add'>+						 BRCMF_PCIE_64_MB_INT_D2H7_DB0 | \</div><div class='add'>+						 BRCMF_PCIE_64_MB_INT_D2H7_DB1)</div><div class='add'>+</div><div class='ctx'> #define BRCMF_PCIE_SHARED_VERSION_7		7</div><div class='ctx'> #define BRCMF_PCIE_MIN_SHARED_VERSION		5</div><div class='ctx'> #define BRCMF_PCIE_MAX_SHARED_VERSION		BRCMF_PCIE_SHARED_VERSION_7</div><div class='hunk'>@@ -242,9 +317,13 @@ struct brcmf_pcie_shared_info {</div><div class='ctx'> 	u8 version;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct brcmf_pcie_core_info {</div><div class='del'>-	u32 base;</div><div class='del'>-	u32 wrapbase;</div><div class='add'>+#define BRCMF_OTP_MAX_PARAM_LEN 16</div><div class='add'>+</div><div class='add'>+struct brcmf_otp_params {</div><div class='add'>+	char module[BRCMF_OTP_MAX_PARAM_LEN];</div><div class='add'>+	char vendor[BRCMF_OTP_MAX_PARAM_LEN];</div><div class='add'>+	char version[BRCMF_OTP_MAX_PARAM_LEN];</div><div class='add'>+	bool valid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct brcmf_pciedev_info {</div><div class='hunk'>@@ -253,6 +332,11 @@ struct brcmf_pciedev_info {</div><div class='ctx'> 	struct pci_dev *pdev;</div><div class='ctx'> 	char fw_name[BRCMF_FW_NAME_LEN];</div><div class='ctx'> 	char nvram_name[BRCMF_FW_NAME_LEN];</div><div class='add'>+	char clm_name[BRCMF_FW_NAME_LEN];</div><div class='add'>+	char txcap_name[BRCMF_FW_NAME_LEN];</div><div class='add'>+	const struct firmware *clm_fw;</div><div class='add'>+	const struct firmware *txcap_fw;</div><div class='add'>+	const struct brcmf_pcie_reginfo *reginfo;</div><div class='ctx'> 	void __iomem *regs;</div><div class='ctx'> 	void __iomem *tcm;</div><div class='ctx'> 	u32 ram_base;</div><div class='hunk'>@@ -272,6 +356,13 @@ struct brcmf_pciedev_info {</div><div class='ctx'> 	void (*write_ptr)(struct brcmf_pciedev_info *devinfo, u32 mem_offset,</div><div class='ctx'> 			  u16 value);</div><div class='ctx'> 	struct brcmf_mp_device *settings;</div><div class='add'>+	struct brcmf_otp_params otp;</div><div class='add'>+	bool fwseed;</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	u32 console_interval;</div><div class='add'>+	bool console_active;</div><div class='add'>+	struct timer_list timer;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct brcmf_pcie_ringbuf {</div><div class='hunk'>@@ -338,10 +429,51 @@ static const u32 brcmf_ring_itemsize[BRCMF_NROF_COMMON_MSGRINGS] = {</div><div class='ctx'> 	BRCMF_D2H_MSGRING_RX_COMPLETE_ITEMSIZE</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct brcmf_pcie_reginfo {</div><div class='add'>+	u32 intmask;</div><div class='add'>+	u32 mailboxint;</div><div class='add'>+	u32 mailboxmask;</div><div class='add'>+	u32 h2d_mailbox_0;</div><div class='add'>+	u32 h2d_mailbox_1;</div><div class='add'>+	u32 int_d2h_db;</div><div class='add'>+	u32 int_fn0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct brcmf_pcie_reginfo brcmf_reginfo_default = {</div><div class='add'>+	.intmask = BRCMF_PCIE_PCIE2REG_INTMASK,</div><div class='add'>+	.mailboxint = BRCMF_PCIE_PCIE2REG_MAILBOXINT,</div><div class='add'>+	.mailboxmask = BRCMF_PCIE_PCIE2REG_MAILBOXMASK,</div><div class='add'>+	.h2d_mailbox_0 = BRCMF_PCIE_PCIE2REG_H2D_MAILBOX_0,</div><div class='add'>+	.h2d_mailbox_1 = BRCMF_PCIE_PCIE2REG_H2D_MAILBOX_1,</div><div class='add'>+	.int_d2h_db = BRCMF_PCIE_MB_INT_D2H_DB,</div><div class='add'>+	.int_fn0 = BRCMF_PCIE_MB_INT_FN0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct brcmf_pcie_reginfo brcmf_reginfo_64 = {</div><div class='add'>+	.intmask = BRCMF_PCIE_64_PCIE2REG_INTMASK,</div><div class='add'>+	.mailboxint = BRCMF_PCIE_64_PCIE2REG_MAILBOXINT,</div><div class='add'>+	.mailboxmask = BRCMF_PCIE_64_PCIE2REG_MAILBOXMASK,</div><div class='add'>+	.h2d_mailbox_0 = BRCMF_PCIE_64_PCIE2REG_H2D_MAILBOX_0,</div><div class='add'>+	.h2d_mailbox_1 = BRCMF_PCIE_64_PCIE2REG_H2D_MAILBOX_1,</div><div class='add'>+	.int_d2h_db = BRCMF_PCIE_64_MB_INT_D2H_DB,</div><div class='add'>+	.int_fn0 = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void brcmf_pcie_setup(struct device *dev, int ret,</div><div class='ctx'> 			     struct brcmf_fw_request *fwreq);</div><div class='ctx'> static struct brcmf_fw_request *</div><div class='ctx'> brcmf_pcie_prepare_fw_request(struct brcmf_pciedev_info *devinfo);</div><div class='add'>+static void</div><div class='add'>+brcmf_pcie_fwcon_timer(struct brcmf_pciedev_info *devinfo, bool active);</div><div class='add'>+static void brcmf_pcie_debugfs_create(struct device *dev);</div><div class='add'>+</div><div class='add'>+static u16</div><div class='add'>+brcmf_pcie_read_reg16(struct brcmf_pciedev_info *devinfo, u32 reg_offset)</div><div class='add'>+{</div><div class='add'>+	void __iomem *address = devinfo-&gt;regs + reg_offset;</div><div class='add'>+</div><div class='add'>+	return ioread16(address);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static u32</div><div class='ctx'> brcmf_pcie_read_reg32(struct brcmf_pciedev_info *devinfo, u32 reg_offset)</div><div class='hunk'>@@ -448,47 +580,6 @@ brcmf_pcie_write_ram32(struct brcmf_pciedev_info *devinfo, u32 mem_offset,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-brcmf_pcie_copy_mem_todev(struct brcmf_pciedev_info *devinfo, u32 mem_offset,</div><div class='del'>-			  void *srcaddr, u32 len)</div><div class='del'>-{</div><div class='del'>-	void __iomem *address = devinfo-&gt;tcm + mem_offset;</div><div class='del'>-	__le32 *src32;</div><div class='del'>-	__le16 *src16;</div><div class='del'>-	u8 *src8;</div><div class='del'>-</div><div class='del'>-	if (((ulong)address &amp; 4) || ((ulong)srcaddr &amp; 4) || (len &amp; 4)) {</div><div class='del'>-		if (((ulong)address &amp; 2) || ((ulong)srcaddr &amp; 2) || (len &amp; 2)) {</div><div class='del'>-			src8 = (u8 *)srcaddr;</div><div class='del'>-			while (len) {</div><div class='del'>-				iowrite8(*src8, address);</div><div class='del'>-				address++;</div><div class='del'>-				src8++;</div><div class='del'>-				len--;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			len = len / 2;</div><div class='del'>-			src16 = (__le16 *)srcaddr;</div><div class='del'>-			while (len) {</div><div class='del'>-				iowrite16(le16_to_cpu(*src16), address);</div><div class='del'>-				address += 2;</div><div class='del'>-				src16++;</div><div class='del'>-				len--;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		len = len / 4;</div><div class='del'>-		src32 = (__le32 *)srcaddr;</div><div class='del'>-		while (len) {</div><div class='del'>-			iowrite32(le32_to_cpu(*src32), address);</div><div class='del'>-			address += 4;</div><div class='del'>-			src32++;</div><div class='del'>-			len--;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='ctx'> brcmf_pcie_copy_dev_tomem(struct brcmf_pciedev_info *devinfo, u32 mem_offset,</div><div class='ctx'> 			  void *dstaddr, u32 len)</div><div class='ctx'> {</div><div class='hunk'>@@ -529,6 +620,8 @@ brcmf_pcie_copy_dev_tomem(struct brcmf_pciedev_info *devinfo, u32 mem_offset,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+#define READCC32(devinfo, reg) brcmf_pcie_read_reg32(devinfo, \</div><div class='add'>+		CHIPCREGOFFS(reg))</div><div class='ctx'> #define WRITECC32(devinfo, reg, value) brcmf_pcie_write_reg32(devinfo, \</div><div class='ctx'> 		CHIPCREGOFFS(reg), value)</div><div class='ctx'> </div><div class='hunk'>@@ -563,17 +656,19 @@ brcmf_pcie_select_core(struct brcmf_pciedev_info *devinfo, u16 coreid)</div><div class='ctx'> static void brcmf_pcie_reset_device(struct brcmf_pciedev_info *devinfo)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_core *core;</div><div class='del'>-	u16 cfg_offset[] = { BRCMF_PCIE_CFGREG_STATUS_CMD,</div><div class='del'>-			     BRCMF_PCIE_CFGREG_PM_CSR,</div><div class='del'>-			     BRCMF_PCIE_CFGREG_MSI_CAP,</div><div class='del'>-			     BRCMF_PCIE_CFGREG_MSI_ADDR_L,</div><div class='del'>-			     BRCMF_PCIE_CFGREG_MSI_ADDR_H,</div><div class='del'>-			     BRCMF_PCIE_CFGREG_MSI_DATA,</div><div class='del'>-			     BRCMF_PCIE_CFGREG_LINK_STATUS_CTRL2,</div><div class='del'>-			     BRCMF_PCIE_CFGREG_RBAR_CTRL,</div><div class='del'>-			     BRCMF_PCIE_CFGREG_PML1_SUB_CTRL1,</div><div class='del'>-			     BRCMF_PCIE_CFGREG_REG_BAR2_CONFIG,</div><div class='del'>-			     BRCMF_PCIE_CFGREG_REG_BAR3_CONFIG };</div><div class='add'>+	static const u16 cfg_offset[] = {</div><div class='add'>+		BRCMF_PCIE_CFGREG_STATUS_CMD,</div><div class='add'>+		BRCMF_PCIE_CFGREG_PM_CSR,</div><div class='add'>+		BRCMF_PCIE_CFGREG_MSI_CAP,</div><div class='add'>+		BRCMF_PCIE_CFGREG_MSI_ADDR_L,</div><div class='add'>+		BRCMF_PCIE_CFGREG_MSI_ADDR_H,</div><div class='add'>+		BRCMF_PCIE_CFGREG_MSI_DATA,</div><div class='add'>+		BRCMF_PCIE_CFGREG_LINK_STATUS_CTRL2,</div><div class='add'>+		BRCMF_PCIE_CFGREG_RBAR_CTRL,</div><div class='add'>+		BRCMF_PCIE_CFGREG_PML1_SUB_CTRL1,</div><div class='add'>+		BRCMF_PCIE_CFGREG_REG_BAR2_CONFIG,</div><div class='add'>+		BRCMF_PCIE_CFGREG_REG_BAR3_CONFIG</div><div class='add'>+	};</div><div class='ctx'> 	u32 i;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> 	u32 lsc;</div><div class='hunk'>@@ -659,7 +754,7 @@ static int brcmf_pcie_exit_download_state(struct brcmf_pciedev_info *devinfo,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!brcmf_chip_set_active(devinfo-&gt;ci, resetintr))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -777,6 +872,8 @@ static void brcmf_pcie_bus_console_read(struct brcmf_pciedev_info *devinfo,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	console = &amp;devinfo-&gt;shared.console;</div><div class='add'>+	if (!console-&gt;base_addr)</div><div class='add'>+		return;</div><div class='ctx'> 	addr = console-&gt;base_addr + BRCMF_CONSOLE_WRITEIDX_OFFSET;</div><div class='ctx'> 	newidx = brcmf_pcie_read_tcm32(devinfo, addr);</div><div class='ctx'> 	while (newidx != console-&gt;read_idx) {</div><div class='hunk'>@@ -810,30 +907,29 @@ static void brcmf_pcie_bus_console_read(struct brcmf_pciedev_info *devinfo,</div><div class='ctx'> </div><div class='ctx'> static void brcmf_pcie_intr_disable(struct brcmf_pciedev_info *devinfo)</div><div class='ctx'> {</div><div class='del'>-	brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXMASK, 0);</div><div class='add'>+	brcmf_pcie_write_reg32(devinfo, devinfo-&gt;reginfo-&gt;mailboxmask, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static void brcmf_pcie_intr_enable(struct brcmf_pciedev_info *devinfo)</div><div class='ctx'> {</div><div class='del'>-	brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXMASK,</div><div class='del'>-			       BRCMF_PCIE_MB_INT_D2H_DB |</div><div class='del'>-			       BRCMF_PCIE_MB_INT_FN0_0 |</div><div class='del'>-			       BRCMF_PCIE_MB_INT_FN0_1);</div><div class='add'>+	brcmf_pcie_write_reg32(devinfo, devinfo-&gt;reginfo-&gt;mailboxmask,</div><div class='add'>+			       devinfo-&gt;reginfo-&gt;int_d2h_db |</div><div class='add'>+			       devinfo-&gt;reginfo-&gt;int_fn0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void brcmf_pcie_hostready(struct brcmf_pciedev_info *devinfo)</div><div class='ctx'> {</div><div class='ctx'> 	if (devinfo-&gt;shared.flags &amp; BRCMF_PCIE_SHARED_HOSTRDY_DB1)</div><div class='ctx'> 		brcmf_pcie_write_reg32(devinfo,</div><div class='del'>-				       BRCMF_PCIE_PCIE2REG_H2D_MAILBOX_1, 1);</div><div class='add'>+				       devinfo-&gt;reginfo-&gt;h2d_mailbox_1, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t brcmf_pcie_quick_check_isr(int irq, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)arg;</div><div class='ctx'> </div><div class='del'>-	if (brcmf_pcie_read_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXINT)) {</div><div class='add'>+	if (brcmf_pcie_read_reg32(devinfo, devinfo-&gt;reginfo-&gt;mailboxint)) {</div><div class='ctx'> 		brcmf_pcie_intr_disable(devinfo);</div><div class='ctx'> 		brcmf_dbg(PCIE, "Enter\n");</div><div class='ctx'> 		return IRQ_WAKE_THREAD;</div><div class='hunk'>@@ -848,15 +944,14 @@ static irqreturn_t brcmf_pcie_isr_thread(int irq, void *arg)</div><div class='ctx'> 	u32 status;</div><div class='ctx'> </div><div class='ctx'> 	devinfo-&gt;in_irq = true;</div><div class='del'>-	status = brcmf_pcie_read_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXINT);</div><div class='add'>+	status = brcmf_pcie_read_reg32(devinfo, devinfo-&gt;reginfo-&gt;mailboxint);</div><div class='ctx'> 	brcmf_dbg(PCIE, "Enter %x\n", status);</div><div class='ctx'> 	if (status) {</div><div class='del'>-		brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXINT,</div><div class='add'>+		brcmf_pcie_write_reg32(devinfo, devinfo-&gt;reginfo-&gt;mailboxint,</div><div class='ctx'> 				       status);</div><div class='del'>-		if (status &amp; (BRCMF_PCIE_MB_INT_FN0_0 |</div><div class='del'>-			      BRCMF_PCIE_MB_INT_FN0_1))</div><div class='add'>+		if (status &amp; devinfo-&gt;reginfo-&gt;int_fn0)</div><div class='ctx'> 			brcmf_pcie_handle_mb_data(devinfo);</div><div class='del'>-		if (status &amp; BRCMF_PCIE_MB_INT_D2H_DB) {</div><div class='add'>+		if (status &amp; devinfo-&gt;reginfo-&gt;int_d2h_db) {</div><div class='ctx'> 			if (devinfo-&gt;state == BRCMFMAC_PCIE_STATE_UP)</div><div class='ctx'> 				brcmf_proto_msgbuf_rx_trigger(</div><div class='ctx'> 							&amp;devinfo-&gt;pdev-&gt;dev);</div><div class='hunk'>@@ -915,8 +1010,8 @@ static void brcmf_pcie_release_irq(struct brcmf_pciedev_info *devinfo)</div><div class='ctx'> 	if (devinfo-&gt;in_irq)</div><div class='ctx'> 		brcmf_err(bus, "Still in IRQ (processing) !!!\n");</div><div class='ctx'> </div><div class='del'>-	status = brcmf_pcie_read_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXINT);</div><div class='del'>-	brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXINT, status);</div><div class='add'>+	status = brcmf_pcie_read_reg32(devinfo, devinfo-&gt;reginfo-&gt;mailboxint);</div><div class='add'>+	brcmf_pcie_write_reg32(devinfo, devinfo-&gt;reginfo-&gt;mailboxint, status);</div><div class='ctx'> </div><div class='ctx'> 	devinfo-&gt;irq_allocated = false;</div><div class='ctx'> }</div><div class='hunk'>@@ -968,7 +1063,7 @@ static int brcmf_pcie_ring_mb_ring_bell(void *ctx)</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(PCIE, "RING !\n");</div><div class='ctx'> 	/* Any arbitrary value will do, lets use 1 */</div><div class='del'>-	brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_H2D_MAILBOX_0, 1);</div><div class='add'>+	brcmf_pcie_write_reg32(devinfo, devinfo-&gt;reginfo-&gt;h2d_mailbox_0, 1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1151,6 +1246,10 @@ static int brcmf_pcie_init_ringbuffers(struct brcmf_pciedev_info *devinfo)</div><div class='ctx'> 				BRCMF_NROF_H2D_COMMON_MSGRINGS;</div><div class='ctx'> 		max_completionrings = BRCMF_NROF_D2H_COMMON_MSGRINGS;</div><div class='ctx'> 	}</div><div class='add'>+	if (max_flowrings &gt; 512) {</div><div class='add'>+		brcmf_err(bus, "invalid max_flowrings(%d)\n", max_flowrings);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (devinfo-&gt;dma_idx_sz != 0) {</div><div class='ctx'> 		bufsz = (max_submissionrings + max_completionrings) *</div><div class='hunk'>@@ -1346,8 +1445,25 @@ fail:</div><div class='ctx'> </div><div class='ctx'> static void brcmf_pcie_down(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct brcmf_bus *bus_if = dev_get_drvdata(dev);</div><div class='add'>+	struct brcmf_pciedev *pcie_bus_dev = bus_if-&gt;bus_priv.pcie;</div><div class='add'>+	struct brcmf_pciedev_info *devinfo = pcie_bus_dev-&gt;devinfo;</div><div class='add'>+</div><div class='add'>+	brcmf_pcie_fwcon_timer(devinfo, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int brcmf_pcie_preinit(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_bus *bus_if = dev_get_drvdata(dev);</div><div class='add'>+	struct brcmf_pciedev *buspub = bus_if-&gt;bus_priv.pcie;</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(PCIE, "Enter\n");</div><div class='add'>+</div><div class='add'>+	brcmf_pcie_intr_enable(buspub-&gt;devinfo);</div><div class='add'>+	brcmf_pcie_hostready(buspub-&gt;devinfo);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int brcmf_pcie_tx(struct device *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -1401,23 +1517,29 @@ static int brcmf_pcie_get_memdump(struct device *dev, void *data, size_t len)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static</div><div class='del'>-int brcmf_pcie_get_fwname(struct device *dev, const char *ext, u8 *fw_name)</div><div class='add'>+static int brcmf_pcie_get_blob(struct device *dev, const struct firmware **fw,</div><div class='add'>+			       enum brcmf_blob_type type)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_bus *bus_if = dev_get_drvdata(dev);</div><div class='del'>-	struct brcmf_fw_request *fwreq;</div><div class='del'>-	struct brcmf_fw_name fwnames[] = {</div><div class='del'>-		{ ext, fw_name },</div><div class='del'>-	};</div><div class='add'>+	struct brcmf_pciedev *buspub = bus_if-&gt;bus_priv.pcie;</div><div class='add'>+	struct brcmf_pciedev_info *devinfo = buspub-&gt;devinfo;</div><div class='ctx'> </div><div class='del'>-	fwreq = brcmf_fw_alloc_request(bus_if-&gt;chip, bus_if-&gt;chiprev,</div><div class='del'>-				       brcmf_pcie_fwnames,</div><div class='del'>-				       ARRAY_SIZE(brcmf_pcie_fwnames),</div><div class='del'>-				       fwnames, ARRAY_SIZE(fwnames));</div><div class='del'>-	if (!fwreq)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	switch (type) {</div><div class='add'>+	case BRCMF_BLOB_CLM:</div><div class='add'>+		*fw = devinfo-&gt;clm_fw;</div><div class='add'>+		devinfo-&gt;clm_fw = NULL;</div><div class='add'>+		break;</div><div class='add'>+	case BRCMF_BLOB_TXCAP:</div><div class='add'>+		*fw = devinfo-&gt;txcap_fw;</div><div class='add'>+		devinfo-&gt;txcap_fw = NULL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!*fw)</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	kfree(fwreq);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1456,6 +1578,7 @@ static int brcmf_pcie_reset(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct brcmf_bus_ops brcmf_pcie_bus_ops = {</div><div class='add'>+	.preinit = brcmf_pcie_preinit,</div><div class='ctx'> 	.txdata = brcmf_pcie_tx,</div><div class='ctx'> 	.stop = brcmf_pcie_down,</div><div class='ctx'> 	.txctl = brcmf_pcie_tx_ctlpkt,</div><div class='hunk'>@@ -1463,8 +1586,9 @@ static const struct brcmf_bus_ops brcmf_pcie_bus_ops = {</div><div class='ctx'> 	.wowl_config = brcmf_pcie_wowl_config,</div><div class='ctx'> 	.get_ramsize = brcmf_pcie_get_ramsize,</div><div class='ctx'> 	.get_memdump = brcmf_pcie_get_memdump,</div><div class='del'>-	.get_fwname = brcmf_pcie_get_fwname,</div><div class='add'>+	.get_blob = brcmf_pcie_get_blob,</div><div class='ctx'> 	.reset = brcmf_pcie_reset,</div><div class='add'>+	.debugfs_create = brcmf_pcie_debugfs_create,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1540,10 +1664,27 @@ brcmf_pcie_init_share_ram_info(struct brcmf_pciedev_info *devinfo,</div><div class='ctx'> 		  shared-&gt;max_rxbufpost, shared-&gt;rx_dataoffset);</div><div class='ctx'> </div><div class='ctx'> 	brcmf_pcie_bus_console_init(devinfo);</div><div class='add'>+	brcmf_pcie_bus_console_read(devinfo, false);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct brcmf_random_seed_footer {</div><div class='add'>+	__le32 length;</div><div class='add'>+	__le32 magic;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BRCMF_RANDOM_SEED_MAGIC		0xfeedc0de</div><div class='add'>+#define BRCMF_RANDOM_SEED_LENGTH	0x100</div><div class='add'>+</div><div class='add'>+static noinline_for_stack void</div><div class='add'>+brcmf_pcie_provide_random_bytes(struct brcmf_pciedev_info *devinfo, u32 address)</div><div class='add'>+{</div><div class='add'>+	u8 randbuf[BRCMF_RANDOM_SEED_LENGTH];</div><div class='add'>+</div><div class='add'>+	get_random_bytes(randbuf, BRCMF_RANDOM_SEED_LENGTH);</div><div class='add'>+	memcpy_toio(devinfo-&gt;tcm + address, randbuf, BRCMF_RANDOM_SEED_LENGTH);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int brcmf_pcie_download_fw_nvram(struct brcmf_pciedev_info *devinfo,</div><div class='ctx'> 					const struct firmware *fw, void *nvram,</div><div class='hunk'>@@ -1563,8 +1704,8 @@ static int brcmf_pcie_download_fw_nvram(struct brcmf_pciedev_info *devinfo,</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(PCIE, "Download FW %s\n", devinfo-&gt;fw_name);</div><div class='del'>-	brcmf_pcie_copy_mem_todev(devinfo, devinfo-&gt;ci-&gt;rambase,</div><div class='del'>-				  (void *)fw-&gt;data, fw-&gt;size);</div><div class='add'>+	memcpy_toio(devinfo-&gt;tcm + devinfo-&gt;ci-&gt;rambase,</div><div class='add'>+		    (void *)fw-&gt;data, fw-&gt;size);</div><div class='ctx'> </div><div class='ctx'> 	resetintr = get_unaligned_le32(fw-&gt;data);</div><div class='ctx'> 	release_firmware(fw);</div><div class='hunk'>@@ -1578,8 +1719,28 @@ static int brcmf_pcie_download_fw_nvram(struct brcmf_pciedev_info *devinfo,</div><div class='ctx'> 		brcmf_dbg(PCIE, "Download NVRAM %s\n", devinfo-&gt;nvram_name);</div><div class='ctx'> 		address = devinfo-&gt;ci-&gt;rambase + devinfo-&gt;ci-&gt;ramsize -</div><div class='ctx'> 			  nvram_len;</div><div class='del'>-		brcmf_pcie_copy_mem_todev(devinfo, address, nvram, nvram_len);</div><div class='add'>+		memcpy_toio(devinfo-&gt;tcm + address, nvram, nvram_len);</div><div class='ctx'> 		brcmf_fw_nvram_free(nvram);</div><div class='add'>+</div><div class='add'>+		if (devinfo-&gt;fwseed) {</div><div class='add'>+			size_t rand_len = BRCMF_RANDOM_SEED_LENGTH;</div><div class='add'>+			struct brcmf_random_seed_footer footer = {</div><div class='add'>+				.length = cpu_to_le32(rand_len),</div><div class='add'>+				.magic = cpu_to_le32(BRCMF_RANDOM_SEED_MAGIC),</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* Some chips/firmwares expect a buffer of random</div><div class='add'>+			 * data to be present before NVRAM</div><div class='add'>+			 */</div><div class='add'>+			brcmf_dbg(PCIE, "Download random seed\n");</div><div class='add'>+</div><div class='add'>+			address -= sizeof(footer);</div><div class='add'>+			memcpy_toio(devinfo-&gt;tcm + address, &amp;footer,</div><div class='add'>+				    sizeof(footer));</div><div class='add'>+</div><div class='add'>+			address -= rand_len;</div><div class='add'>+			brcmf_pcie_provide_random_bytes(devinfo, address);</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		brcmf_dbg(PCIE, "No matching NVRAM file found %s\n",</div><div class='ctx'> 			  devinfo-&gt;nvram_name);</div><div class='hunk'>@@ -1715,15 +1876,22 @@ static int brcmf_pcie_buscoreprep(void *ctx)</div><div class='ctx'> static int brcmf_pcie_buscore_reset(void *ctx, struct brcmf_chip *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)ctx;</div><div class='del'>-	u32 val;</div><div class='add'>+	struct brcmf_core *core;</div><div class='add'>+	u32 val, reg;</div><div class='ctx'> </div><div class='ctx'> 	devinfo-&gt;ci = chip;</div><div class='ctx'> 	brcmf_pcie_reset_device(devinfo);</div><div class='ctx'> </div><div class='del'>-	val = brcmf_pcie_read_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXINT);</div><div class='add'>+	/* reginfo is not ready yet */</div><div class='add'>+	core = brcmf_chip_get_core(chip, BCMA_CORE_PCIE2);</div><div class='add'>+	if (core-&gt;rev &gt;= 64)</div><div class='add'>+		reg = BRCMF_PCIE_64_PCIE2REG_MAILBOXINT;</div><div class='add'>+	else</div><div class='add'>+		reg = BRCMF_PCIE_PCIE2REG_MAILBOXINT;</div><div class='add'>+</div><div class='add'>+	val = brcmf_pcie_read_reg32(devinfo, reg);</div><div class='ctx'> 	if (val != 0xffffffff)</div><div class='del'>-		brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXINT,</div><div class='del'>-				       val);</div><div class='add'>+		brcmf_pcie_write_reg32(devinfo, reg, val);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1746,8 +1914,223 @@ static const struct brcmf_buscore_ops brcmf_pcie_buscore_ops = {</div><div class='ctx'> 	.write32 = brcmf_pcie_buscore_write32,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define BRCMF_OTP_SYS_VENDOR	0x15</div><div class='add'>+#define BRCMF_OTP_BRCM_CIS	0x80</div><div class='add'>+</div><div class='add'>+#define BRCMF_OTP_VENDOR_HDR	0x00000008</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+brcmf_pcie_parse_otp_sys_vendor(struct brcmf_pciedev_info *devinfo,</div><div class='add'>+				u8 *data, size_t size)</div><div class='add'>+{</div><div class='add'>+	int idx = 4;</div><div class='add'>+	const char *chip_params;</div><div class='add'>+	const char *board_params;</div><div class='add'>+	const char *p;</div><div class='add'>+</div><div class='add'>+	/* 4-byte header and two empty strings */</div><div class='add'>+	if (size &lt; 6)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (get_unaligned_le32(data) != BRCMF_OTP_VENDOR_HDR)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	chip_params = &amp;data[idx];</div><div class='add'>+</div><div class='add'>+	/* Skip first string, including terminator */</div><div class='add'>+	idx += strnlen(chip_params, size - idx) + 1;</div><div class='add'>+	if (idx &gt;= size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	board_params = &amp;data[idx];</div><div class='add'>+</div><div class='add'>+	/* Skip to terminator of second string */</div><div class='add'>+	idx += strnlen(board_params, size - idx);</div><div class='add'>+	if (idx &gt;= size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* At this point both strings are guaranteed NUL-terminated */</div><div class='add'>+	brcmf_dbg(PCIE, "OTP: chip_params='%s' board_params='%s'\n",</div><div class='add'>+		  chip_params, board_params);</div><div class='add'>+</div><div class='add'>+	p = skip_spaces(board_params);</div><div class='add'>+	while (*p) {</div><div class='add'>+		char tag = *p++;</div><div class='add'>+		const char *end;</div><div class='add'>+		size_t len;</div><div class='add'>+</div><div class='add'>+		if (*p++ != '=') /* implicit NUL check */</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/* *p might be NUL here, if so end == p and len == 0 */</div><div class='add'>+		end = strchrnul(p, ' ');</div><div class='add'>+		len = end - p;</div><div class='add'>+</div><div class='add'>+		/* leave 1 byte for NUL in destination string */</div><div class='add'>+		if (len &gt; (BRCMF_OTP_MAX_PARAM_LEN - 1))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/* Copy len characters plus a NUL terminator */</div><div class='add'>+		switch (tag) {</div><div class='add'>+		case 'M':</div><div class='add'>+			strscpy(devinfo-&gt;otp.module, p, len + 1);</div><div class='add'>+			break;</div><div class='add'>+		case 'V':</div><div class='add'>+			strscpy(devinfo-&gt;otp.vendor, p, len + 1);</div><div class='add'>+			break;</div><div class='add'>+		case 'm':</div><div class='add'>+			strscpy(devinfo-&gt;otp.version, p, len + 1);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Skip to next arg, if any */</div><div class='add'>+		p = skip_spaces(end);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(PCIE, "OTP: module=%s vendor=%s version=%s\n",</div><div class='add'>+		  devinfo-&gt;otp.module, devinfo-&gt;otp.vendor,</div><div class='add'>+		  devinfo-&gt;otp.version);</div><div class='add'>+</div><div class='add'>+	if (!devinfo-&gt;otp.module[0] ||</div><div class='add'>+	    !devinfo-&gt;otp.vendor[0] ||</div><div class='add'>+	    !devinfo-&gt;otp.version[0])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	devinfo-&gt;otp.valid = true;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+brcmf_pcie_parse_otp(struct brcmf_pciedev_info *devinfo, u8 *otp, size_t size)</div><div class='add'>+{</div><div class='add'>+	int p = 0;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(PCIE, "parse_otp size=%zd\n", size);</div><div class='add'>+</div><div class='add'>+	while (p &lt; (size - 1)) {</div><div class='add'>+		u8 type = otp[p];</div><div class='add'>+		u8 length = otp[p + 1];</div><div class='add'>+</div><div class='add'>+		if (type == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if ((p + 2 + length) &gt; size)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		switch (type) {</div><div class='add'>+		case BRCMF_OTP_SYS_VENDOR:</div><div class='add'>+			brcmf_dbg(PCIE, "OTP @ 0x%x (%d): SYS_VENDOR\n",</div><div class='add'>+				  p, length);</div><div class='add'>+			ret = brcmf_pcie_parse_otp_sys_vendor(devinfo,</div><div class='add'>+							      &amp;otp[p + 2],</div><div class='add'>+							      length);</div><div class='add'>+			break;</div><div class='add'>+		case BRCMF_OTP_BRCM_CIS:</div><div class='add'>+			brcmf_dbg(PCIE, "OTP @ 0x%x (%d): BRCM_CIS\n",</div><div class='add'>+				  p, length);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			brcmf_dbg(PCIE, "OTP @ 0x%x (%d): Unknown type 0x%x\n",</div><div class='add'>+				  p, length, type);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		p += 2 + length;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int brcmf_pcie_read_otp(struct brcmf_pciedev_info *devinfo)</div><div class='add'>+{</div><div class='add'>+	const struct pci_dev *pdev = devinfo-&gt;pdev;</div><div class='add'>+	struct brcmf_bus *bus = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+	u32 coreid, base, words, idx, sromctl;</div><div class='add'>+	u16 *otp;</div><div class='add'>+	struct brcmf_core *core;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (devinfo-&gt;ci-&gt;chip) {</div><div class='add'>+	case BRCM_CC_4355_CHIP_ID:</div><div class='add'>+		coreid = BCMA_CORE_CHIPCOMMON;</div><div class='add'>+		base = 0x8c0;</div><div class='add'>+		words = 0xb2;</div><div class='add'>+		break;</div><div class='add'>+	case BRCM_CC_4364_CHIP_ID:</div><div class='add'>+		coreid = BCMA_CORE_CHIPCOMMON;</div><div class='add'>+		base = 0x8c0;</div><div class='add'>+		words = 0x1a0;</div><div class='add'>+		break;</div><div class='add'>+	case BRCM_CC_4377_CHIP_ID:</div><div class='add'>+	case BRCM_CC_4378_CHIP_ID:</div><div class='add'>+		coreid = BCMA_CORE_GCI;</div><div class='add'>+		base = 0x1120;</div><div class='add'>+		words = 0x170;</div><div class='add'>+		break;</div><div class='add'>+	case BRCM_CC_4387_CHIP_ID:</div><div class='add'>+		coreid = BCMA_CORE_GCI;</div><div class='add'>+		base = 0x113c;</div><div class='add'>+		words = 0x170;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* OTP not supported on this chip */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	core = brcmf_chip_get_core(devinfo-&gt;ci, coreid);</div><div class='add'>+	if (!core) {</div><div class='add'>+		brcmf_err(bus, "No OTP core\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (coreid == BCMA_CORE_CHIPCOMMON) {</div><div class='add'>+		/* Chips with OTP accessed via ChipCommon need additional</div><div class='add'>+		 * handling to access the OTP</div><div class='add'>+		 */</div><div class='add'>+		brcmf_pcie_select_core(devinfo, coreid);</div><div class='add'>+		sromctl = READCC32(devinfo, sromcontrol);</div><div class='add'>+</div><div class='add'>+		if (!(sromctl &amp; BCMA_CC_SROM_CONTROL_OTP_PRESENT)) {</div><div class='add'>+			/* Chip lacks OTP, try without it... */</div><div class='add'>+			brcmf_err(bus,</div><div class='add'>+				  "OTP unavailable, using default firmware\n");</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Map OTP to shadow area */</div><div class='add'>+		WRITECC32(devinfo, sromcontrol,</div><div class='add'>+			  sromctl | BCMA_CC_SROM_CONTROL_OTPSEL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	otp = kcalloc(words, sizeof(u16), GFP_KERNEL);</div><div class='add'>+	if (!otp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Map bus window to SROM/OTP shadow area in core */</div><div class='add'>+	base = brcmf_pcie_buscore_prep_addr(devinfo-&gt;pdev, base + core-&gt;base);</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(PCIE, "OTP data:\n");</div><div class='add'>+	for (idx = 0; idx &lt; words; idx++) {</div><div class='add'>+		otp[idx] = brcmf_pcie_read_reg16(devinfo, base + 2 * idx);</div><div class='add'>+		brcmf_dbg(PCIE, "[%8x] 0x%04x\n", base + 2 * idx, otp[idx]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (coreid == BCMA_CORE_CHIPCOMMON) {</div><div class='add'>+		brcmf_pcie_select_core(devinfo, coreid);</div><div class='add'>+		WRITECC32(devinfo, sromcontrol, sromctl);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = brcmf_pcie_parse_otp(devinfo, (u8 *)otp, 2 * words);</div><div class='add'>+	kfree(otp);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define BRCMF_PCIE_FW_CODE	0</div><div class='ctx'> #define BRCMF_PCIE_FW_NVRAM	1</div><div class='add'>+#define BRCMF_PCIE_FW_CLM	2</div><div class='add'>+#define BRCMF_PCIE_FW_TXCAP	3</div><div class='ctx'> </div><div class='ctx'> static void brcmf_pcie_setup(struct device *dev, int ret,</div><div class='ctx'> 			     struct brcmf_fw_request *fwreq)</div><div class='hunk'>@@ -1760,23 +2143,28 @@ static void brcmf_pcie_setup(struct device *dev, int ret,</div><div class='ctx'> 	struct brcmf_commonring **flowrings;</div><div class='ctx'> 	u32 i, nvram_len;</div><div class='ctx'> </div><div class='add'>+	bus = dev_get_drvdata(dev);</div><div class='add'>+	pcie_bus_dev = bus-&gt;bus_priv.pcie;</div><div class='add'>+	devinfo = pcie_bus_dev-&gt;devinfo;</div><div class='add'>+</div><div class='ctx'> 	/* check firmware loading result */</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	bus = dev_get_drvdata(dev);</div><div class='del'>-	pcie_bus_dev = bus-&gt;bus_priv.pcie;</div><div class='del'>-	devinfo = pcie_bus_dev-&gt;devinfo;</div><div class='ctx'> 	brcmf_pcie_attach(devinfo);</div><div class='ctx'> </div><div class='ctx'> 	fw = fwreq-&gt;items[BRCMF_PCIE_FW_CODE].binary;</div><div class='ctx'> 	nvram = fwreq-&gt;items[BRCMF_PCIE_FW_NVRAM].nv_data.data;</div><div class='ctx'> 	nvram_len = fwreq-&gt;items[BRCMF_PCIE_FW_NVRAM].nv_data.len;</div><div class='add'>+	devinfo-&gt;clm_fw = fwreq-&gt;items[BRCMF_PCIE_FW_CLM].binary;</div><div class='add'>+	devinfo-&gt;txcap_fw = fwreq-&gt;items[BRCMF_PCIE_FW_TXCAP].binary;</div><div class='ctx'> 	kfree(fwreq);</div><div class='ctx'> </div><div class='ctx'> 	ret = brcmf_chip_get_raminfo(devinfo-&gt;ci);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		brcmf_err(bus, "Failed to get RAM info\n");</div><div class='add'>+		release_firmware(fw);</div><div class='add'>+		brcmf_fw_nvram_free(nvram);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1826,18 +2214,20 @@ static void brcmf_pcie_setup(struct device *dev, int ret,</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_head(&amp;devinfo-&gt;mbdata_resp_wait);</div><div class='ctx'> </div><div class='del'>-	brcmf_pcie_intr_enable(devinfo);</div><div class='del'>-	brcmf_pcie_hostready(devinfo);</div><div class='del'>-</div><div class='ctx'> 	ret = brcmf_attach(&amp;devinfo-&gt;pdev-&gt;dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_pcie_bus_console_read(devinfo, false);</div><div class='ctx'> </div><div class='add'>+	brcmf_pcie_fwcon_timer(devinfo, true);</div><div class='add'>+</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='add'>+	brcmf_err(bus, "Dongle setup failed\n");</div><div class='add'>+	brcmf_pcie_bus_console_read(devinfo, true);</div><div class='add'>+	brcmf_fw_crashed(dev);</div><div class='ctx'> 	device_release_driver(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1848,6 +2238,8 @@ brcmf_pcie_prepare_fw_request(struct brcmf_pciedev_info *devinfo)</div><div class='ctx'> 	struct brcmf_fw_name fwnames[] = {</div><div class='ctx'> 		{ ".bin", devinfo-&gt;fw_name },</div><div class='ctx'> 		{ ".txt", devinfo-&gt;nvram_name },</div><div class='add'>+		{ ".clm_blob", devinfo-&gt;clm_name },</div><div class='add'>+		{ ".txcap_blob", devinfo-&gt;txcap_name },</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	fwreq = brcmf_fw_alloc_request(devinfo-&gt;ci-&gt;chip, devinfo-&gt;ci-&gt;chiprev,</div><div class='hunk'>@@ -1860,14 +2252,190 @@ brcmf_pcie_prepare_fw_request(struct brcmf_pciedev_info *devinfo)</div><div class='ctx'> 	fwreq-&gt;items[BRCMF_PCIE_FW_CODE].type = BRCMF_FW_TYPE_BINARY;</div><div class='ctx'> 	fwreq-&gt;items[BRCMF_PCIE_FW_NVRAM].type = BRCMF_FW_TYPE_NVRAM;</div><div class='ctx'> 	fwreq-&gt;items[BRCMF_PCIE_FW_NVRAM].flags = BRCMF_FW_REQF_OPTIONAL;</div><div class='del'>-	fwreq-&gt;board_type = devinfo-&gt;settings-&gt;board_type;</div><div class='add'>+	fwreq-&gt;items[BRCMF_PCIE_FW_CLM].type = BRCMF_FW_TYPE_BINARY;</div><div class='add'>+	fwreq-&gt;items[BRCMF_PCIE_FW_CLM].flags = BRCMF_FW_REQF_OPTIONAL;</div><div class='add'>+	fwreq-&gt;items[BRCMF_PCIE_FW_TXCAP].type = BRCMF_FW_TYPE_BINARY;</div><div class='add'>+	fwreq-&gt;items[BRCMF_PCIE_FW_TXCAP].flags = BRCMF_FW_REQF_OPTIONAL;</div><div class='ctx'> 	/* NVRAM reserves PCI domain 0 for Broadcom's SDK faked bus */</div><div class='ctx'> 	fwreq-&gt;domain_nr = pci_domain_nr(devinfo-&gt;pdev-&gt;bus) + 1;</div><div class='ctx'> 	fwreq-&gt;bus_nr = devinfo-&gt;pdev-&gt;bus-&gt;number;</div><div class='ctx'> </div><div class='add'>+	/* Apple platforms with fancy firmware/NVRAM selection */</div><div class='add'>+	if (devinfo-&gt;settings-&gt;board_type &amp;&amp;</div><div class='add'>+	    devinfo-&gt;settings-&gt;antenna_sku &amp;&amp;</div><div class='add'>+	    devinfo-&gt;otp.valid) {</div><div class='add'>+		const struct brcmf_otp_params *otp = &amp;devinfo-&gt;otp;</div><div class='add'>+		struct device *dev = &amp;devinfo-&gt;pdev-&gt;dev;</div><div class='add'>+		const char **bt = fwreq-&gt;board_types;</div><div class='add'>+</div><div class='add'>+		brcmf_dbg(PCIE, "Apple board: %s\n",</div><div class='add'>+			  devinfo-&gt;settings-&gt;board_type);</div><div class='add'>+</div><div class='add'>+		/* Example: apple,shikoku-RASP-m-6.11-X3 */</div><div class='add'>+		bt[0] = devm_kasprintf(dev, GFP_KERNEL, "%s-%s-%s-%s-%s",</div><div class='add'>+				       devinfo-&gt;settings-&gt;board_type,</div><div class='add'>+				       otp-&gt;module, otp-&gt;vendor, otp-&gt;version,</div><div class='add'>+				       devinfo-&gt;settings-&gt;antenna_sku);</div><div class='add'>+		bt[1] = devm_kasprintf(dev, GFP_KERNEL, "%s-%s-%s-%s",</div><div class='add'>+				       devinfo-&gt;settings-&gt;board_type,</div><div class='add'>+				       otp-&gt;module, otp-&gt;vendor, otp-&gt;version);</div><div class='add'>+		bt[2] = devm_kasprintf(dev, GFP_KERNEL, "%s-%s-%s",</div><div class='add'>+				       devinfo-&gt;settings-&gt;board_type,</div><div class='add'>+				       otp-&gt;module, otp-&gt;vendor);</div><div class='add'>+		bt[3] = devm_kasprintf(dev, GFP_KERNEL, "%s-%s",</div><div class='add'>+				       devinfo-&gt;settings-&gt;board_type,</div><div class='add'>+				       otp-&gt;module);</div><div class='add'>+		bt[4] = devm_kasprintf(dev, GFP_KERNEL, "%s-%s",</div><div class='add'>+				       devinfo-&gt;settings-&gt;board_type,</div><div class='add'>+				       devinfo-&gt;settings-&gt;antenna_sku);</div><div class='add'>+		bt[5] = devinfo-&gt;settings-&gt;board_type;</div><div class='add'>+</div><div class='add'>+		if (!bt[0] || !bt[1] || !bt[2] || !bt[3] || !bt[4]) {</div><div class='add'>+			kfree(fwreq);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		brcmf_dbg(PCIE, "Board: %s\n", devinfo-&gt;settings-&gt;board_type);</div><div class='add'>+		fwreq-&gt;board_types[0] = devinfo-&gt;settings-&gt;board_type;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return fwreq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef DEBUG</div><div class='add'>+static void</div><div class='add'>+brcmf_pcie_fwcon_timer(struct brcmf_pciedev_info *devinfo, bool active)</div><div class='add'>+{</div><div class='add'>+	if (!active) {</div><div class='add'>+		if (devinfo-&gt;console_active) {</div><div class='add'>+			timer_delete_sync(&amp;devinfo-&gt;timer);</div><div class='add'>+			devinfo-&gt;console_active = false;</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* don't start the timer */</div><div class='add'>+	if (devinfo-&gt;state != BRCMFMAC_PCIE_STATE_UP ||</div><div class='add'>+	    !devinfo-&gt;console_interval || !BRCMF_FWCON_ON())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!devinfo-&gt;console_active) {</div><div class='add'>+		devinfo-&gt;timer.expires = jiffies + devinfo-&gt;console_interval;</div><div class='add'>+		add_timer(&amp;devinfo-&gt;timer);</div><div class='add'>+		devinfo-&gt;console_active = true;</div><div class='add'>+	} else {</div><div class='add'>+		/* Reschedule the timer */</div><div class='add'>+		mod_timer(&amp;devinfo-&gt;timer, jiffies + devinfo-&gt;console_interval);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+brcmf_pcie_fwcon(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_pciedev_info *devinfo = timer_container_of(devinfo, t,</div><div class='add'>+								timer);</div><div class='add'>+</div><div class='add'>+	if (!devinfo-&gt;console_active)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	brcmf_pcie_bus_console_read(devinfo, false);</div><div class='add'>+</div><div class='add'>+	/* Reschedule the timer if console interval is not zero */</div><div class='add'>+	mod_timer(&amp;devinfo-&gt;timer, jiffies + devinfo-&gt;console_interval);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int brcmf_pcie_console_interval_get(void *data, u64 *val)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_pciedev_info *devinfo = data;</div><div class='add'>+</div><div class='add'>+	*val = devinfo-&gt;console_interval;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int brcmf_pcie_console_interval_set(void *data, u64 val)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_pciedev_info *devinfo = data;</div><div class='add'>+</div><div class='add'>+	if (val &gt; MAX_CONSOLE_INTERVAL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	devinfo-&gt;console_interval = val;</div><div class='add'>+</div><div class='add'>+	if (!val &amp;&amp; devinfo-&gt;console_active)</div><div class='add'>+		brcmf_pcie_fwcon_timer(devinfo, false);</div><div class='add'>+	else if (val)</div><div class='add'>+		brcmf_pcie_fwcon_timer(devinfo, true);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_SIMPLE_ATTRIBUTE(brcmf_pcie_console_interval_fops,</div><div class='add'>+			brcmf_pcie_console_interval_get,</div><div class='add'>+			brcmf_pcie_console_interval_set,</div><div class='add'>+			"%llu\n");</div><div class='add'>+</div><div class='add'>+static void brcmf_pcie_debugfs_create(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_bus *bus_if = dev_get_drvdata(dev);</div><div class='add'>+	struct brcmf_pub *drvr = bus_if-&gt;drvr;</div><div class='add'>+	struct brcmf_pciedev *pcie_bus_dev = bus_if-&gt;bus_priv.pcie;</div><div class='add'>+	struct brcmf_pciedev_info *devinfo = pcie_bus_dev-&gt;devinfo;</div><div class='add'>+	struct dentry *dentry = brcmf_debugfs_get_devdir(drvr);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR_OR_NULL(dentry))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	devinfo-&gt;console_interval = BRCMF_CONSOLE;</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("console_interval", 0644, dentry, devinfo,</div><div class='add'>+			    &amp;brcmf_pcie_console_interval_fops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+void brcmf_pcie_fwcon_timer(struct brcmf_pciedev_info *devinfo, bool active)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void brcmf_pcie_debugfs_create(struct device *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct brcmf_pcie_drvdata {</div><div class='add'>+	enum brcmf_fwvendor vendor;</div><div class='add'>+	bool fw_seed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	BRCMF_DRVDATA_CYW,</div><div class='add'>+	BRCMF_DRVDATA_BCA,</div><div class='add'>+	BRCMF_DRVDATA_WCC,</div><div class='add'>+	BRCMF_DRVDATA_WCC_SEED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct brcmf_pcie_drvdata drvdata[] = {</div><div class='add'>+	[BRCMF_DRVDATA_CYW] = {</div><div class='add'>+		.vendor = BRCMF_FWVENDOR_CYW,</div><div class='add'>+		.fw_seed = false,</div><div class='add'>+	},</div><div class='add'>+	[BRCMF_DRVDATA_BCA] = {</div><div class='add'>+		.vendor = BRCMF_FWVENDOR_BCA,</div><div class='add'>+		.fw_seed = false,</div><div class='add'>+	},</div><div class='add'>+	[BRCMF_DRVDATA_WCC] = {</div><div class='add'>+		.vendor = BRCMF_FWVENDOR_WCC,</div><div class='add'>+		.fw_seed = false,</div><div class='add'>+	},</div><div class='add'>+	[BRCMF_DRVDATA_WCC_SEED] = {</div><div class='add'>+		.vendor = BRCMF_FWVENDOR_WCC,</div><div class='add'>+		.fw_seed = true,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Forward declaration for pci_match_id() call */</div><div class='add'>+static const struct pci_device_id brcmf_pcie_devid_table[];</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> brcmf_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> {</div><div class='hunk'>@@ -1875,8 +2443,17 @@ brcmf_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	struct brcmf_fw_request *fwreq;</div><div class='ctx'> 	struct brcmf_pciedev_info *devinfo;</div><div class='ctx'> 	struct brcmf_pciedev *pcie_bus_dev;</div><div class='add'>+	struct brcmf_core *core;</div><div class='ctx'> 	struct brcmf_bus *bus;</div><div class='ctx'> </div><div class='add'>+	if (!id) {</div><div class='add'>+		id = pci_match_id(brcmf_pcie_devid_table, pdev);</div><div class='add'>+		if (!id) {</div><div class='add'>+			pci_err(pdev, "Error could not find pci_device_id for %x:%x\n", pdev-&gt;vendor, pdev-&gt;device);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	brcmf_dbg(PCIE, "Enter %x:%x\n", pdev-&gt;vendor, pdev-&gt;device);</div><div class='ctx'> </div><div class='ctx'> 	ret = -ENOMEM;</div><div class='hunk'>@@ -1886,13 +2463,20 @@ brcmf_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> </div><div class='ctx'> 	devinfo-&gt;pdev = pdev;</div><div class='ctx'> 	pcie_bus_dev = NULL;</div><div class='del'>-	devinfo-&gt;ci = brcmf_chip_attach(devinfo, &amp;brcmf_pcie_buscore_ops);</div><div class='add'>+	devinfo-&gt;ci = brcmf_chip_attach(devinfo, pdev-&gt;device,</div><div class='add'>+					&amp;brcmf_pcie_buscore_ops);</div><div class='ctx'> 	if (IS_ERR(devinfo-&gt;ci)) {</div><div class='ctx'> 		ret = PTR_ERR(devinfo-&gt;ci);</div><div class='ctx'> 		devinfo-&gt;ci = NULL;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	core = brcmf_chip_get_core(devinfo-&gt;ci, BCMA_CORE_PCIE2);</div><div class='add'>+	if (core-&gt;rev &gt;= 64)</div><div class='add'>+		devinfo-&gt;reginfo = &amp;brcmf_reginfo_64;</div><div class='add'>+	else</div><div class='add'>+		devinfo-&gt;reginfo = &amp;brcmf_reginfo_default;</div><div class='add'>+</div><div class='ctx'> 	pcie_bus_dev = kzalloc(sizeof(*pcie_bus_dev), GFP_KERNEL);</div><div class='ctx'> 	if (pcie_bus_dev == NULL) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -1907,6 +2491,9 @@ brcmf_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='add'>+	ret = PTR_ERR_OR_ZERO(devinfo-&gt;settings);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	bus = kzalloc(sizeof(*bus), GFP_KERNEL);</div><div class='ctx'> 	if (!bus) {</div><div class='hunk'>@@ -1929,12 +2516,34 @@ brcmf_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	bus-&gt;proto_type = BRCMF_PROTO_MSGBUF;</div><div class='ctx'> 	bus-&gt;chip = devinfo-&gt;coreid;</div><div class='ctx'> 	bus-&gt;wowl_supported = pci_pme_capable(pdev, PCI_D3hot);</div><div class='add'>+	bus-&gt;fwvid = drvdata[id-&gt;driver_data].vendor;</div><div class='add'>+	devinfo-&gt;fwseed = drvdata[id-&gt;driver_data].fw_seed;</div><div class='ctx'> 	dev_set_drvdata(&amp;pdev-&gt;dev, bus);</div><div class='ctx'> </div><div class='ctx'> 	ret = brcmf_alloc(&amp;devinfo-&gt;pdev-&gt;dev, devinfo-&gt;settings);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto fail_bus;</div><div class='ctx'> </div><div class='add'>+	/* otp read operation */</div><div class='add'>+	switch (bus-&gt;fwvid) {</div><div class='add'>+	case BRCMF_FWVENDOR_WCC:</div><div class='add'>+	case BRCMF_FWVENDOR_BCA:</div><div class='add'>+		ret = brcmf_pcie_read_otp(devinfo);</div><div class='add'>+		if (ret) {</div><div class='add'>+			brcmf_err(bus, "failed to parse OTP\n");</div><div class='add'>+			goto fail_brcmf;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case BRCMF_FWVENDOR_CYW:</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	/* Set up the fwcon timer */</div><div class='add'>+	timer_setup(&amp;devinfo-&gt;timer, brcmf_pcie_fwcon, 0);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	fwreq = brcmf_pcie_prepare_fw_request(devinfo);</div><div class='ctx'> 	if (!fwreq) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -1979,6 +2588,8 @@ brcmf_pcie_remove(struct pci_dev *pdev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	devinfo = bus-&gt;bus_priv.pcie-&gt;devinfo;</div><div class='add'>+	brcmf_pcie_bus_console_read(devinfo, false);</div><div class='add'>+	brcmf_pcie_fwcon_timer(devinfo, false);</div><div class='ctx'> </div><div class='ctx'> 	devinfo-&gt;state = BRCMFMAC_PCIE_STATE_DOWN;</div><div class='ctx'> 	if (devinfo-&gt;ci)</div><div class='hunk'>@@ -1997,6 +2608,8 @@ brcmf_pcie_remove(struct pci_dev *pdev)</div><div class='ctx'> 	brcmf_pcie_release_ringbuffers(devinfo);</div><div class='ctx'> 	brcmf_pcie_reset_device(devinfo);</div><div class='ctx'> 	brcmf_pcie_release_resource(devinfo);</div><div class='add'>+	release_firmware(devinfo-&gt;clm_fw);</div><div class='add'>+	release_firmware(devinfo-&gt;txcap_fw);</div><div class='ctx'> </div><div class='ctx'> 	if (devinfo-&gt;ci)</div><div class='ctx'> 		brcmf_chip_detach(devinfo-&gt;ci);</div><div class='hunk'>@@ -2021,6 +2634,7 @@ static int brcmf_pcie_pm_enter_D3(struct device *dev)</div><div class='ctx'> 	bus = dev_get_drvdata(dev);</div><div class='ctx'> 	devinfo = bus-&gt;bus_priv.pcie-&gt;devinfo;</div><div class='ctx'> </div><div class='add'>+	brcmf_pcie_fwcon_timer(devinfo, false);</div><div class='ctx'> 	brcmf_bus_change_state(bus, BRCMF_BUS_DOWN);</div><div class='ctx'> </div><div class='ctx'> 	devinfo-&gt;mbdata_completed = false;</div><div class='hunk'>@@ -2054,7 +2668,7 @@ static int brcmf_pcie_pm_leave_D3(struct device *dev)</div><div class='ctx'> 	brcmf_dbg(PCIE, "Enter, dev=%p, bus=%p\n", dev, bus);</div><div class='ctx'> </div><div class='ctx'> 	/* Check if device is still up and running, if so we are ready */</div><div class='del'>-	if (brcmf_pcie_read_reg32(devinfo, BRCMF_PCIE_PCIE2REG_INTMASK) != 0) {</div><div class='add'>+	if (brcmf_pcie_read_reg32(devinfo, devinfo-&gt;reginfo-&gt;intmask) != 0) {</div><div class='ctx'> 		brcmf_dbg(PCIE, "Try to wakeup device....\n");</div><div class='ctx'> 		if (brcmf_pcie_send_mb_data(devinfo, BRCMF_H2D_HOST_D0_INFORM))</div><div class='ctx'> 			goto cleanup;</div><div class='hunk'>@@ -2064,6 +2678,7 @@ static int brcmf_pcie_pm_leave_D3(struct device *dev)</div><div class='ctx'> 		brcmf_bus_change_state(bus, BRCMF_BUS_UP);</div><div class='ctx'> 		brcmf_pcie_intr_enable(devinfo);</div><div class='ctx'> 		brcmf_pcie_hostready(devinfo);</div><div class='add'>+		brcmf_pcie_fwcon_timer(devinfo, true);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2075,7 +2690,7 @@ cleanup:</div><div class='ctx'> </div><div class='ctx'> 	err = brcmf_pcie_probe(pdev, NULL);</div><div class='ctx'> 	if (err)</div><div class='del'>-		brcmf_err(bus, "probe after resume failed, err=%d\n", err);</div><div class='add'>+		__brcmf_err(NULL, __func__, "probe after resume failed, err=%d\n", err);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2092,34 +2707,51 @@ static const struct dev_pm_ops brcmf_pciedrvr_pm = {</div><div class='ctx'> #endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define BRCMF_PCIE_DEVICE(dev_id)	{ BRCM_PCIE_VENDOR_ID_BROADCOM, dev_id,\</div><div class='del'>-	PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_NETWORK_OTHER &lt;&lt; 8, 0xffff00, 0 }</div><div class='del'>-#define BRCMF_PCIE_DEVICE_SUB(dev_id, subvend, subdev)	{ \</div><div class='del'>-	BRCM_PCIE_VENDOR_ID_BROADCOM, dev_id,\</div><div class='del'>-	subvend, subdev, PCI_CLASS_NETWORK_OTHER &lt;&lt; 8, 0xffff00, 0 }</div><div class='add'>+#define BRCMF_PCIE_DEVICE(dev_id, fw_vend) \</div><div class='add'>+	{ \</div><div class='add'>+		BRCM_PCIE_VENDOR_ID_BROADCOM, (dev_id), \</div><div class='add'>+		PCI_ANY_ID, PCI_ANY_ID, \</div><div class='add'>+		PCI_CLASS_NETWORK_OTHER &lt;&lt; 8, 0xffff00, \</div><div class='add'>+		BRCMF_DRVDATA_ ## fw_vend \</div><div class='add'>+	}</div><div class='add'>+#define BRCMF_PCIE_DEVICE_SUB(dev_id, subvend, subdev, fw_vend) \</div><div class='add'>+	{ \</div><div class='add'>+		BRCM_PCIE_VENDOR_ID_BROADCOM, (dev_id), \</div><div class='add'>+		(subvend), (subdev), \</div><div class='add'>+		PCI_CLASS_NETWORK_OTHER &lt;&lt; 8, 0xffff00, \</div><div class='add'>+		BRCMF_DRVDATA_ ## fw_vend \</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id brcmf_pcie_devid_table[] = {</div><div class='del'>-	BRCMF_PCIE_DEVICE(BRCM_PCIE_4350_DEVICE_ID),</div><div class='del'>-	BRCMF_PCIE_DEVICE_SUB(0x4355, BRCM_PCIE_VENDOR_ID_BROADCOM, 0x4355),</div><div class='del'>-	BRCMF_PCIE_DEVICE(BRCM_PCIE_4354_RAW_DEVICE_ID),</div><div class='del'>-	BRCMF_PCIE_DEVICE(BRCM_PCIE_4356_DEVICE_ID),</div><div class='del'>-	BRCMF_PCIE_DEVICE(BRCM_PCIE_43567_DEVICE_ID),</div><div class='del'>-	BRCMF_PCIE_DEVICE(BRCM_PCIE_43570_DEVICE_ID),</div><div class='del'>-	BRCMF_PCIE_DEVICE(BRCM_PCIE_4358_DEVICE_ID),</div><div class='del'>-	BRCMF_PCIE_DEVICE(BRCM_PCIE_4359_DEVICE_ID),</div><div class='del'>-	BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_DEVICE_ID),</div><div class='del'>-	BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_2G_DEVICE_ID),</div><div class='del'>-	BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_5G_DEVICE_ID),</div><div class='del'>-	BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_RAW_DEVICE_ID),</div><div class='del'>-	BRCMF_PCIE_DEVICE(BRCM_PCIE_4364_DEVICE_ID),</div><div class='del'>-	BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_DEVICE_ID),</div><div class='del'>-	BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_2G_DEVICE_ID),</div><div class='del'>-	BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_5G_DEVICE_ID),</div><div class='del'>-	BRCMF_PCIE_DEVICE_SUB(0x4365, BRCM_PCIE_VENDOR_ID_BROADCOM, 0x4365),</div><div class='del'>-	BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_DEVICE_ID),</div><div class='del'>-	BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_2G_DEVICE_ID),</div><div class='del'>-	BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_5G_DEVICE_ID),</div><div class='del'>-	BRCMF_PCIE_DEVICE(BRCM_PCIE_4371_DEVICE_ID),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_4350_DEVICE_ID, WCC),</div><div class='add'>+	BRCMF_PCIE_DEVICE_SUB(0x4355, BRCM_PCIE_VENDOR_ID_BROADCOM, 0x4355, WCC),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_4354_RAW_DEVICE_ID, WCC),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_4355_DEVICE_ID, WCC_SEED),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_4356_DEVICE_ID, WCC),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_43567_DEVICE_ID, WCC),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_43570_DEVICE_ID, WCC),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_43570_RAW_DEVICE_ID, WCC),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_4358_DEVICE_ID, WCC),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_4359_DEVICE_ID, WCC),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_DEVICE_ID, WCC),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_2G_DEVICE_ID, WCC),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_5G_DEVICE_ID, WCC),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_RAW_DEVICE_ID, WCC),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_4364_DEVICE_ID, WCC_SEED),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_DEVICE_ID, BCA),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_2G_DEVICE_ID, BCA),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_5G_DEVICE_ID, BCA),</div><div class='add'>+	BRCMF_PCIE_DEVICE_SUB(0x4365, BRCM_PCIE_VENDOR_ID_BROADCOM, 0x4365, BCA),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_DEVICE_ID, BCA),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_2G_DEVICE_ID, BCA),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_5G_DEVICE_ID, BCA),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_4371_DEVICE_ID, WCC),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_43596_DEVICE_ID, CYW),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_4377_DEVICE_ID, WCC_SEED),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_4378_DEVICE_ID, WCC_SEED),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_4387_DEVICE_ID, WCC_SEED),</div><div class='add'>+	BRCMF_PCIE_DEVICE(BRCM_PCIE_43752_DEVICE_ID, WCC_SEED),</div><div class='add'>+	BRCMF_PCIE_DEVICE(CY_PCIE_54591_DEVICE_ID, CYW),</div><div class='ctx'> 	{ /* end: all zeroes */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2128,7 +2760,6 @@ MODULE_DEVICE_TABLE(pci, brcmf_pcie_devid_table);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct pci_driver brcmf_pciedrvr = {</div><div class='del'>-	.node = {},</div><div class='ctx'> 	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = brcmf_pcie_devid_table,</div><div class='ctx'> 	.probe = brcmf_pcie_probe,</div><div class='hunk'>@@ -2140,15 +2771,10 @@ static struct pci_driver brcmf_pciedrvr = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-void brcmf_pcie_register(void)</div><div class='add'>+int brcmf_pcie_register(void)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='ctx'> 	brcmf_dbg(PCIE, "Enter\n");</div><div class='del'>-	err = pci_register_driver(&amp;brcmf_pciedrvr);</div><div class='del'>-	if (err)</div><div class='del'>-		brcmf_err(NULL, "PCIE driver registration failed, err=%d\n",</div><div class='del'>-			  err);</div><div class='add'>+	return pci_register_driver(&amp;brcmf_pciedrvr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.h<br/>index d026401d2001..8e6c227e8315 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.h</a></div><div class='hunk'>@@ -11,9 +11,4 @@ struct brcmf_pciedev {</div><div class='ctx'> 	struct brcmf_pciedev_info *devinfo;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-void brcmf_pcie_exit(void);</div><div class='del'>-void brcmf_pcie_register(void);</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #endif /* BRCMFMAC_PCIE_H */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c<br/>index fabfbb0b40b0..05f66ab13bed 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c</a></div><div class='hunk'>@@ -158,12 +158,12 @@ static int brcmf_pno_set_random(struct brcmf_if *ifp, struct brcmf_pno_info *pi)</div><div class='ctx'> 	struct brcmf_pno_macaddr_le pfn_mac;</div><div class='ctx'> 	u8 *mac_addr = NULL;</div><div class='ctx'> 	u8 *mac_mask = NULL;</div><div class='del'>-	int err, i;</div><div class='add'>+	int err, i, ri;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; pi-&gt;n_reqs; i++)</div><div class='del'>-		if (pi-&gt;reqs[i]-&gt;flags &amp; NL80211_SCAN_FLAG_RANDOM_ADDR) {</div><div class='del'>-			mac_addr = pi-&gt;reqs[i]-&gt;mac_addr;</div><div class='del'>-			mac_mask = pi-&gt;reqs[i]-&gt;mac_addr_mask;</div><div class='add'>+	for (ri = 0; ri &lt; pi-&gt;n_reqs; ri++)</div><div class='add'>+		if (pi-&gt;reqs[ri]-&gt;flags &amp; NL80211_SCAN_FLAG_RANDOM_ADDR) {</div><div class='add'>+			mac_addr = pi-&gt;reqs[ri]-&gt;mac_addr;</div><div class='add'>+			mac_mask = pi-&gt;reqs[ri]-&gt;mac_addr_mask;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -177,7 +177,7 @@ static int brcmf_pno_set_random(struct brcmf_if *ifp, struct brcmf_pno_info *pi)</div><div class='ctx'> 	memcpy(pfn_mac.mac, mac_addr, ETH_ALEN);</div><div class='ctx'> 	for (i = 0; i &lt; ETH_ALEN; i++) {</div><div class='ctx'> 		pfn_mac.mac[i] &amp;= mac_mask[i];</div><div class='del'>-		pfn_mac.mac[i] |= get_random_int() &amp; ~(mac_mask[i]);</div><div class='add'>+		pfn_mac.mac[i] |= get_random_u8() &amp; ~(mac_mask[i]);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Clear multi bit */</div><div class='ctx'> 	pfn_mac.mac[0] &amp;= 0xFE;</div><div class='hunk'>@@ -185,7 +185,7 @@ static int brcmf_pno_set_random(struct brcmf_if *ifp, struct brcmf_pno_info *pi)</div><div class='ctx'> 	pfn_mac.mac[0] |= 0x02;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(SCAN, "enabling random mac: reqid=%llu mac=%pM\n",</div><div class='del'>-		  pi-&gt;reqs[i]-&gt;reqid, pfn_mac.mac);</div><div class='add'>+		  pi-&gt;reqs[ri]-&gt;reqid, pfn_mac.mac);</div><div class='ctx'> 	err = brcmf_fil_iovar_data_set(ifp, "pfn_macaddr", &amp;pfn_mac,</div><div class='ctx'> 				       sizeof(pfn_mac));</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -405,7 +405,7 @@ static int brcmf_pno_config_sched_scans(struct brcmf_if *ifp)</div><div class='ctx'> 	if (n_buckets &lt; 0)</div><div class='ctx'> 		return n_buckets;</div><div class='ctx'> </div><div class='del'>-	gsz = sizeof(*gscan_cfg) + (n_buckets - 1) * sizeof(*buckets);</div><div class='add'>+	gsz = struct_size(gscan_cfg, bucket, n_buckets);</div><div class='ctx'> 	gscan_cfg = kzalloc(gsz, GFP_KERNEL);</div><div class='ctx'> 	if (!gscan_cfg) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='hunk'>@@ -434,8 +434,8 @@ static int brcmf_pno_config_sched_scans(struct brcmf_if *ifp)</div><div class='ctx'> 	gscan_cfg-&gt;flags = BRCMF_GSCAN_CFG_ALL_BUCKETS_IN_1ST_SCAN;</div><div class='ctx'> </div><div class='ctx'> 	gscan_cfg-&gt;count_of_channel_buckets = n_buckets;</div><div class='del'>-	memcpy(&amp;gscan_cfg-&gt;bucket[0], buckets,</div><div class='del'>-	       n_buckets * sizeof(*buckets));</div><div class='add'>+	memcpy(gscan_cfg-&gt;bucket, buckets,</div><div class='add'>+	       array_size(n_buckets, sizeof(*buckets)));</div><div class='ctx'> </div><div class='ctx'> 	err = brcmf_fil_iovar_data_set(ifp, "pfn_gscan_cfg", gscan_cfg, gsz);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h<br/>index f4a79e217da5..bd08d3aaa8f4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h</a></div><div class='hunk'>@@ -32,7 +32,7 @@ struct brcmf_proto {</div><div class='ctx'> 			    u8 peer[ETH_ALEN]);</div><div class='ctx'> 	void (*add_tdls_peer)(struct brcmf_pub *drvr, int ifidx,</div><div class='ctx'> 			      u8 peer[ETH_ALEN]);</div><div class='del'>-	void (*rxreorder)(struct brcmf_if *ifp, struct sk_buff *skb, bool inirq);</div><div class='add'>+	void (*rxreorder)(struct brcmf_if *ifp, struct sk_buff *skb);</div><div class='ctx'> 	void (*add_if)(struct brcmf_if *ifp);</div><div class='ctx'> 	void (*del_if)(struct brcmf_if *ifp);</div><div class='ctx'> 	void (*reset_if)(struct brcmf_if *ifp);</div><div class='hunk'>@@ -109,9 +109,9 @@ static inline bool brcmf_proto_is_reorder_skb(struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-brcmf_proto_rxreorder(struct brcmf_if *ifp, struct sk_buff *skb, bool inirq)</div><div class='add'>+brcmf_proto_rxreorder(struct brcmf_if *ifp, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	ifp-&gt;drvr-&gt;proto-&gt;rxreorder(ifp, skb, inirq);</div><div class='add'>+	ifp-&gt;drvr-&gt;proto-&gt;rxreorder(ifp, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c<br/>index 16ed325795a8..8cf9d7e7c3f7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/bcma/bcma.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;defs.h&gt;</div><div class='ctx'> #include &lt;brcmu_wifi.h&gt;</div><div class='ctx'> #include &lt;brcmu_utils.h&gt;</div><div class='hunk'>@@ -135,8 +135,6 @@ struct rte_console {</div><div class='ctx'> </div><div class='ctx'> #define BRCMF_FIRSTREAD	(1 &lt;&lt; 6)</div><div class='ctx'> </div><div class='del'>-#define BRCMF_CONSOLE	10	/* watchdog interval to poll console */</div><div class='del'>-</div><div class='ctx'> /* SBSDIO_DEVICE_CTL */</div><div class='ctx'> </div><div class='ctx'> /* 1: device will assert busy signal when receiving CMD53 */</div><div class='hunk'>@@ -557,7 +555,7 @@ enum brcmf_sdio_frmtype {</div><div class='ctx'> 	BRCMF_SDIO_FT_SUB,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define SDIOD_DRVSTR_KEY(chip, pmu)     (((chip) &lt;&lt; 16) | (pmu))</div><div class='add'>+#define SDIOD_DRVSTR_KEY(chip, pmu)     (((unsigned int)(chip) &lt;&lt; 16) | (pmu))</div><div class='ctx'> </div><div class='ctx'> /* SDIO Pad drive strength to select value mappings */</div><div class='ctx'> struct sdiod_drive_str {</div><div class='hunk'>@@ -616,18 +614,23 @@ BRCMF_FW_DEF(43362, "brcmfmac43362-sdio");</div><div class='ctx'> BRCMF_FW_DEF(4339, "brcmfmac4339-sdio");</div><div class='ctx'> BRCMF_FW_DEF(43430A0, "brcmfmac43430a0-sdio");</div><div class='ctx'> /* Note the names are not postfixed with a1 for backward compatibility */</div><div class='del'>-BRCMF_FW_DEF(43430A1, "brcmfmac43430-sdio");</div><div class='del'>-BRCMF_FW_DEF(43455, "brcmfmac43455-sdio");</div><div class='add'>+BRCMF_FW_CLM_DEF(43430A1, "brcmfmac43430-sdio");</div><div class='add'>+BRCMF_FW_DEF(43430B0, "brcmfmac43430b0-sdio");</div><div class='add'>+BRCMF_FW_CLM_DEF(43439, "brcmfmac43439-sdio");</div><div class='add'>+BRCMF_FW_CLM_DEF(43455, "brcmfmac43455-sdio");</div><div class='ctx'> BRCMF_FW_DEF(43456, "brcmfmac43456-sdio");</div><div class='del'>-BRCMF_FW_DEF(4354, "brcmfmac4354-sdio");</div><div class='del'>-BRCMF_FW_DEF(4356, "brcmfmac4356-sdio");</div><div class='add'>+BRCMF_FW_CLM_DEF(4354, "brcmfmac4354-sdio");</div><div class='add'>+BRCMF_FW_CLM_DEF(4356, "brcmfmac4356-sdio");</div><div class='ctx'> BRCMF_FW_DEF(4359, "brcmfmac4359-sdio");</div><div class='del'>-BRCMF_FW_DEF(4373, "brcmfmac4373-sdio");</div><div class='del'>-BRCMF_FW_DEF(43012, "brcmfmac43012-sdio");</div><div class='add'>+BRCMF_FW_CLM_DEF(4373, "brcmfmac4373-sdio");</div><div class='add'>+BRCMF_FW_CLM_DEF(43012, "brcmfmac43012-sdio");</div><div class='add'>+BRCMF_FW_CLM_DEF(43752, "brcmfmac43752-sdio");</div><div class='ctx'> </div><div class='ctx'> /* firmware config files */</div><div class='del'>-MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac*-sdio.*.txt");</div><div class='del'>-MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac*-pcie.*.txt");</div><div class='add'>+MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-sdio.*.txt");</div><div class='add'>+</div><div class='add'>+/* per-board firmware binaries */</div><div class='add'>+MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-sdio.*.bin");</div><div class='ctx'> </div><div class='ctx'> static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),</div><div class='hunk'>@@ -643,14 +646,19 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, 43362),</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339),</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000001, 43430A0),</div><div class='del'>-	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFE, 43430A1),</div><div class='add'>+	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000002, 43430A1),</div><div class='add'>+	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFC, 43430B0),</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0x00000200, 43456),</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFDC0, 43455),</div><div class='add'>+	BRCMF_FW_ENTRY(BRCM_CC_43454_CHIP_ID, 0x00000040, 43455),</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354),</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356),</div><div class='ctx'> 	BRCMF_FW_ENTRY(BRCM_CC_4359_CHIP_ID, 0xFFFFFFFF, 4359),</div><div class='add'>+	BRCMF_FW_ENTRY(BRCM_CC_43751_CHIP_ID, 0xFFFFFFFF, 43752),</div><div class='add'>+	BRCMF_FW_ENTRY(BRCM_CC_43752_CHIP_ID, 0xFFFFFFFF, 43752),</div><div class='ctx'> 	BRCMF_FW_ENTRY(CY_CC_4373_CHIP_ID, 0xFFFFFFFF, 4373),</div><div class='del'>-	BRCMF_FW_ENTRY(CY_CC_43012_CHIP_ID, 0xFFFFFFFF, 43012)</div><div class='add'>+	BRCMF_FW_ENTRY(CY_CC_43012_CHIP_ID, 0xFFFFFFFF, 43012),</div><div class='add'>+	BRCMF_FW_ENTRY(CY_CC_43439_CHIP_ID, 0xFFFFFFFF, 43439),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define TXCTL_CREDITS	2</div><div class='hunk'>@@ -1291,7 +1299,7 @@ static void brcmf_sdio_free_glom(struct brcmf_sdio *bus)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * brcmfmac sdio bus specific header</div><div class='ctx'>  * This is the lowest layer header wrapped on the packets transmitted between</div><div class='ctx'>  * host and WiFi dongle which contains information needed for SDIO core and</div><div class='hunk'>@@ -1610,7 +1618,7 @@ static u8 brcmf_sdio_rxglom(struct brcmf_sdio *bus, u8 rxseq)</div><div class='ctx'> </div><div class='ctx'> 		/* Do an SDIO read for the superframe.  Configurable iovar to</div><div class='ctx'> 		 * read directly into the chained packet, or allocate a large</div><div class='del'>-		 * packet and and copy into the chain.</div><div class='add'>+		 * packet and copy into the chain.</div><div class='ctx'> 		 */</div><div class='ctx'> 		sdio_claim_host(bus-&gt;sdiodev-&gt;func1);</div><div class='ctx'> 		errcode = brcmf_sdiod_recv_chain(bus-&gt;sdiodev,</div><div class='hunk'>@@ -1877,7 +1885,7 @@ static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		rd-&gt;len_left = rd-&gt;len;</div><div class='del'>-		/* read header first for unknow frame length */</div><div class='add'>+		/* read header first for unknown frame length */</div><div class='ctx'> 		sdio_claim_host(bus-&gt;sdiodev-&gt;func1);</div><div class='ctx'> 		if (!rd-&gt;len) {</div><div class='ctx'> 			ret = brcmf_sdiod_recv_buf(bus-&gt;sdiodev,</div><div class='hunk'>@@ -3405,6 +3413,7 @@ static int brcmf_sdio_download_firmware(struct brcmf_sdio *bus,</div><div class='ctx'> 	/* Take arm out of reset */</div><div class='ctx'> 	if (!brcmf_chip_set_active(bus-&gt;ci, rstvec)) {</div><div class='ctx'> 		brcmf_err("error getting out of ARM core reset\n");</div><div class='add'>+		bcmerror = -EIO;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3416,7 +3425,9 @@ err:</div><div class='ctx'> </div><div class='ctx'> static bool brcmf_sdio_aos_no_decode(struct brcmf_sdio *bus)</div><div class='ctx'> {</div><div class='del'>-	if (bus-&gt;ci-&gt;chip == CY_CC_43012_CHIP_ID)</div><div class='add'>+	if (bus-&gt;ci-&gt;chip == BRCM_CC_43751_CHIP_ID ||</div><div class='add'>+	    bus-&gt;ci-&gt;chip == BRCM_CC_43752_CHIP_ID ||</div><div class='add'>+	    bus-&gt;ci-&gt;chip == CY_CC_43012_CHIP_ID)</div><div class='ctx'> 		return true;</div><div class='ctx'> 	else</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -3907,7 +3918,7 @@ static u32 brcmf_sdio_buscore_read32(void *ctx, u32 addr)</div><div class='ctx'> 	 * It can be identified as 4339 by looking at the chip revision. It</div><div class='ctx'> 	 * is corrected here so the chip.c module has the right info.</div><div class='ctx'> 	 */</div><div class='del'>-	if (addr == CORE_CC_REG(SI_ENUM_BASE, chipid) &amp;&amp;</div><div class='add'>+	if (addr == CORE_CC_REG(SI_ENUM_BASE_DEFAULT, chipid) &amp;&amp;</div><div class='ctx'> 	    (sdiodev-&gt;func1-&gt;device == SDIO_DEVICE_ID_BROADCOM_4339 ||</div><div class='ctx'> 	     sdiodev-&gt;func1-&gt;device == SDIO_DEVICE_ID_BROADCOM_4335_4339)) {</div><div class='ctx'> 		rev = (val &amp; CID_REV_MASK) &gt;&gt; CID_REV_SHIFT;</div><div class='hunk'>@@ -3934,7 +3945,7 @@ static const struct brcmf_buscore_ops brcmf_sdio_buscore_ops = {</div><div class='ctx'> 	.write32 = brcmf_sdio_buscore_write32,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static bool</div><div class='add'>+static int</div><div class='ctx'> brcmf_sdio_probe_attach(struct brcmf_sdio *bus)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_sdio_dev *sdiodev;</div><div class='hunk'>@@ -3943,12 +3954,16 @@ brcmf_sdio_probe_attach(struct brcmf_sdio *bus)</div><div class='ctx'> 	int reg_addr;</div><div class='ctx'> 	u32 reg_val;</div><div class='ctx'> 	u32 drivestrength;</div><div class='add'>+	u32 enum_base;</div><div class='add'>+	int ret = -EBADE;</div><div class='ctx'> </div><div class='ctx'> 	sdiodev = bus-&gt;sdiodev;</div><div class='ctx'> 	sdio_claim_host(sdiodev-&gt;func1);</div><div class='ctx'> </div><div class='del'>-	pr_debug("F1 signature read @0x18000000=0x%4x\n",</div><div class='del'>-		 brcmf_sdiod_readl(sdiodev, SI_ENUM_BASE, NULL));</div><div class='add'>+	enum_base = brcmf_chip_enum_base(sdiodev-&gt;func1-&gt;device);</div><div class='add'>+</div><div class='add'>+	pr_debug("F1 signature read @0x%08x=0x%4x\n", enum_base,</div><div class='add'>+		 brcmf_sdiod_readl(sdiodev, enum_base, NULL));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Force PLL off until brcmf_chip_attach()</div><div class='hunk'>@@ -3967,7 +3982,8 @@ brcmf_sdio_probe_attach(struct brcmf_sdio *bus)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bus-&gt;ci = brcmf_chip_attach(sdiodev, &amp;brcmf_sdio_buscore_ops);</div><div class='add'>+	bus-&gt;ci = brcmf_chip_attach(sdiodev, sdiodev-&gt;func1-&gt;device,</div><div class='add'>+				    &amp;brcmf_sdio_buscore_ops);</div><div class='ctx'> 	if (IS_ERR(bus-&gt;ci)) {</div><div class='ctx'> 		brcmf_err("brcmf_chip_attach failed!\n");</div><div class='ctx'> 		bus-&gt;ci = NULL;</div><div class='hunk'>@@ -3988,8 +4004,9 @@ brcmf_sdio_probe_attach(struct brcmf_sdio *bus)</div><div class='ctx'> 						   BRCMF_BUSTYPE_SDIO,</div><div class='ctx'> 						   bus-&gt;ci-&gt;chip,</div><div class='ctx'> 						   bus-&gt;ci-&gt;chiprev);</div><div class='del'>-	if (!sdiodev-&gt;settings) {</div><div class='add'>+	if (IS_ERR_OR_NULL(sdiodev-&gt;settings)) {</div><div class='ctx'> 		brcmf_err("Failed to get device parameters\n");</div><div class='add'>+		ret = PTR_ERR_OR_ZERO(sdiodev-&gt;settings);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* platform specific configuration:</div><div class='hunk'>@@ -4008,15 +4025,14 @@ brcmf_sdio_probe_attach(struct brcmf_sdio *bus)</div><div class='ctx'> 	 */</div><div class='ctx'> 	brcmf_sdiod_sgtable_alloc(sdiodev);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	/* wowl can be supported when KEEP_POWER is true and (WAKE_SDIO_IRQ</div><div class='ctx'> 	 * is true or when platform data OOB irq is true).</div><div class='ctx'> 	 */</div><div class='del'>-	if ((sdio_get_host_pm_caps(sdiodev-&gt;func1) &amp; MMC_PM_KEEP_POWER) &amp;&amp;</div><div class='add'>+	if (IS_ENABLED(CONFIG_PM_SLEEP) &amp;&amp;</div><div class='add'>+	    (sdio_get_host_pm_caps(sdiodev-&gt;func1) &amp; MMC_PM_KEEP_POWER) &amp;&amp;</div><div class='ctx'> 	    ((sdio_get_host_pm_caps(sdiodev-&gt;func1) &amp; MMC_PM_WAKE_SDIO_IRQ) ||</div><div class='ctx'> 	     (sdiodev-&gt;settings-&gt;bus.sdio.oob_irq_supported)))</div><div class='ctx'> 		sdiodev-&gt;bus_if-&gt;wowl_supported = true;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	if (brcmf_sdio_kso_init(bus)) {</div><div class='ctx'> 		brcmf_err("error enabling KSO\n");</div><div class='hunk'>@@ -4059,7 +4075,7 @@ brcmf_sdio_probe_attach(struct brcmf_sdio *bus)</div><div class='ctx'> 	/* allocate header buffer */</div><div class='ctx'> 	bus-&gt;hdrbuf = kzalloc(MAX_HDR_READ + bus-&gt;head_align, GFP_KERNEL);</div><div class='ctx'> 	if (!bus-&gt;hdrbuf)</div><div class='del'>-		return false;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	/* Locate an appropriately-aligned portion of hdrbuf */</div><div class='ctx'> 	bus-&gt;rxhdr = (u8 *) roundup((unsigned long)&amp;bus-&gt;hdrbuf[0],</div><div class='ctx'> 				    bus-&gt;head_align);</div><div class='hunk'>@@ -4070,11 +4086,11 @@ brcmf_sdio_probe_attach(struct brcmf_sdio *bus)</div><div class='ctx'> 	if (bus-&gt;poll)</div><div class='ctx'> 		bus-&gt;pollrate = 1;</div><div class='ctx'> </div><div class='del'>-	return true;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='ctx'> 	sdio_release_host(sdiodev-&gt;func1);</div><div class='del'>-	return false;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -4107,7 +4123,7 @@ brcmf_sdio_watchdog_thread(void *data)</div><div class='ctx'> static void</div><div class='ctx'> brcmf_sdio_watchdog(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_sdio *bus = from_timer(bus, t, timer);</div><div class='add'>+	struct brcmf_sdio *bus = timer_container_of(bus, t, timer);</div><div class='ctx'> </div><div class='ctx'> 	if (bus-&gt;watchdog_tsk) {</div><div class='ctx'> 		complete(&amp;bus-&gt;watchdog_wait);</div><div class='hunk'>@@ -4118,29 +4134,29 @@ brcmf_sdio_watchdog(struct timer_list *t)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static</div><div class='del'>-int brcmf_sdio_get_fwname(struct device *dev, const char *ext, u8 *fw_name)</div><div class='add'>+static int brcmf_sdio_get_blob(struct device *dev, const struct firmware **fw,</div><div class='add'>+			       enum brcmf_blob_type type)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_bus *bus_if = dev_get_drvdata(dev);</div><div class='del'>-	struct brcmf_fw_request *fwreq;</div><div class='del'>-	struct brcmf_fw_name fwnames[] = {</div><div class='del'>-		{ ext, fw_name },</div><div class='del'>-	};</div><div class='add'>+	struct brcmf_sdio_dev *sdiodev = bus_if-&gt;bus_priv.sdio;</div><div class='ctx'> </div><div class='del'>-	fwreq = brcmf_fw_alloc_request(bus_if-&gt;chip, bus_if-&gt;chiprev,</div><div class='del'>-				       brcmf_sdio_fwnames,</div><div class='del'>-				       ARRAY_SIZE(brcmf_sdio_fwnames),</div><div class='del'>-				       fwnames, ARRAY_SIZE(fwnames));</div><div class='del'>-	if (!fwreq)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	switch (type) {</div><div class='add'>+	case BRCMF_BLOB_CLM:</div><div class='add'>+		*fw = sdiodev-&gt;clm_fw;</div><div class='add'>+		sdiodev-&gt;clm_fw = NULL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!*fw)</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	kfree(fwreq);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int brcmf_sdio_bus_reset(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='ctx'> 	struct brcmf_bus *bus_if = dev_get_drvdata(dev);</div><div class='ctx'> 	struct brcmf_sdio_dev *sdiodev = bus_if-&gt;bus_priv.sdio;</div><div class='ctx'> </div><div class='hunk'>@@ -4153,19 +4169,20 @@ static int brcmf_sdio_bus_reset(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* reset the adapter */</div><div class='ctx'> 	sdio_claim_host(sdiodev-&gt;func1);</div><div class='del'>-	mmc_hw_reset(sdiodev-&gt;func1-&gt;card-&gt;host);</div><div class='add'>+	mmc_hw_reset(sdiodev-&gt;func1-&gt;card);</div><div class='ctx'> 	sdio_release_host(sdiodev-&gt;func1);</div><div class='ctx'> </div><div class='ctx'> 	brcmf_bus_change_state(sdiodev-&gt;bus_if, BRCMF_BUS_DOWN);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ret = brcmf_sdiod_probe(sdiodev);</div><div class='del'>-	if (ret) {</div><div class='del'>-		brcmf_err("Failed to probe after sdio device reset: ret %d\n",</div><div class='del'>-			  ret);</div><div class='del'>-		brcmf_sdiod_remove(sdiodev);</div><div class='del'>-	}</div><div class='add'>+static void brcmf_sdio_bus_remove(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_bus *bus_if = dev_get_drvdata(dev);</div><div class='add'>+	struct brcmf_sdio_dev *sdiod = bus_if-&gt;bus_priv.sdio;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	device_release_driver(&amp;sdiod-&gt;func2-&gt;dev);</div><div class='add'>+	device_release_driver(&amp;sdiod-&gt;func1-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct brcmf_bus_ops brcmf_sdio_bus_ops = {</div><div class='hunk'>@@ -4178,13 +4195,15 @@ static const struct brcmf_bus_ops brcmf_sdio_bus_ops = {</div><div class='ctx'> 	.wowl_config = brcmf_sdio_wowl_config,</div><div class='ctx'> 	.get_ramsize = brcmf_sdio_bus_get_ramsize,</div><div class='ctx'> 	.get_memdump = brcmf_sdio_bus_get_memdump,</div><div class='del'>-	.get_fwname = brcmf_sdio_get_fwname,</div><div class='add'>+	.get_blob = brcmf_sdio_get_blob,</div><div class='ctx'> 	.debugfs_create = brcmf_sdio_debugfs_create,</div><div class='del'>-	.reset = brcmf_sdio_bus_reset</div><div class='add'>+	.reset = brcmf_sdio_bus_reset,</div><div class='add'>+	.remove = brcmf_sdio_bus_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define BRCMF_SDIO_FW_CODE	0</div><div class='ctx'> #define BRCMF_SDIO_FW_NVRAM	1</div><div class='add'>+#define BRCMF_SDIO_FW_CLM	2</div><div class='ctx'> </div><div class='ctx'> static void brcmf_sdio_firmware_callback(struct device *dev, int err,</div><div class='ctx'> 					 struct brcmf_fw_request *fwreq)</div><div class='hunk'>@@ -4207,6 +4226,7 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,</div><div class='ctx'> 	code = fwreq-&gt;items[BRCMF_SDIO_FW_CODE].binary;</div><div class='ctx'> 	nvram = fwreq-&gt;items[BRCMF_SDIO_FW_NVRAM].nv_data.data;</div><div class='ctx'> 	nvram_len = fwreq-&gt;items[BRCMF_SDIO_FW_NVRAM].nv_data.len;</div><div class='add'>+	sdiod-&gt;clm_fw = fwreq-&gt;items[BRCMF_SDIO_FW_CLM].binary;</div><div class='ctx'> 	kfree(fwreq);</div><div class='ctx'> </div><div class='ctx'> 	/* try to download image and nvram to the dongle */</div><div class='hunk'>@@ -4257,6 +4277,8 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,</div><div class='ctx'> 				   bus-&gt;hostintmask, NULL);</div><div class='ctx'> </div><div class='ctx'> 		switch (sdiod-&gt;func1-&gt;device) {</div><div class='add'>+		case SDIO_DEVICE_ID_BROADCOM_43751:</div><div class='add'>+		case SDIO_DEVICE_ID_BROADCOM_43752:</div><div class='ctx'> 		case SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373:</div><div class='ctx'> 			brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes\n",</div><div class='ctx'> 				  CY_4373_F2_WATERMARK);</div><div class='hunk'>@@ -4404,6 +4426,7 @@ brcmf_sdio_prepare_fw_request(struct brcmf_sdio *bus)</div><div class='ctx'> 	struct brcmf_fw_name fwnames[] = {</div><div class='ctx'> 		{ ".bin", bus-&gt;sdiodev-&gt;fw_name },</div><div class='ctx'> 		{ ".txt", bus-&gt;sdiodev-&gt;nvram_name },</div><div class='add'>+		{ ".clm_blob", bus-&gt;sdiodev-&gt;clm_name },</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	fwreq = brcmf_fw_alloc_request(bus-&gt;ci-&gt;chip, bus-&gt;ci-&gt;chiprev,</div><div class='hunk'>@@ -4415,7 +4438,9 @@ brcmf_sdio_prepare_fw_request(struct brcmf_sdio *bus)</div><div class='ctx'> </div><div class='ctx'> 	fwreq-&gt;items[BRCMF_SDIO_FW_CODE].type = BRCMF_FW_TYPE_BINARY;</div><div class='ctx'> 	fwreq-&gt;items[BRCMF_SDIO_FW_NVRAM].type = BRCMF_FW_TYPE_NVRAM;</div><div class='del'>-	fwreq-&gt;board_type = bus-&gt;sdiodev-&gt;settings-&gt;board_type;</div><div class='add'>+	fwreq-&gt;items[BRCMF_SDIO_FW_CLM].type = BRCMF_FW_TYPE_BINARY;</div><div class='add'>+	fwreq-&gt;items[BRCMF_SDIO_FW_CLM].flags = BRCMF_FW_REQF_OPTIONAL;</div><div class='add'>+	fwreq-&gt;board_types[0] = bus-&gt;sdiodev-&gt;settings-&gt;board_type;</div><div class='ctx'> </div><div class='ctx'> 	return fwreq;</div><div class='ctx'> }</div><div class='hunk'>@@ -4430,9 +4455,11 @@ struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate private bus interface state */</div><div class='del'>-	bus = kzalloc(sizeof(struct brcmf_sdio), GFP_ATOMIC);</div><div class='del'>-	if (!bus)</div><div class='add'>+	bus = kzalloc(sizeof(*bus), GFP_ATOMIC);</div><div class='add'>+	if (!bus) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		goto fail;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	bus-&gt;sdiodev = sdiodev;</div><div class='ctx'> 	sdiodev-&gt;bus = bus;</div><div class='hunk'>@@ -4443,10 +4470,11 @@ struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> 	bus-&gt;tx_seq = SDPCM_SEQ_WRAP - 1;</div><div class='ctx'> </div><div class='ctx'> 	/* single-threaded workqueue */</div><div class='del'>-	wq = alloc_ordered_workqueue("brcmf_wq/%s", WQ_MEM_RECLAIM,</div><div class='add'>+	wq = alloc_ordered_workqueue("brcmf_wq/%s", WQ_MEM_RECLAIM | WQ_HIGHPRI,</div><div class='ctx'> 				     dev_name(&amp;sdiodev-&gt;func1-&gt;dev));</div><div class='ctx'> 	if (!wq) {</div><div class='ctx'> 		brcmf_err("insufficient memory to create txworkqueue\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> 	brcmf_sdiod_freezer_count(sdiodev);</div><div class='hunk'>@@ -4454,7 +4482,8 @@ struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> 	bus-&gt;brcmf_wq = wq;</div><div class='ctx'> </div><div class='ctx'> 	/* attempt to attach to the dongle */</div><div class='del'>-	if (!(brcmf_sdio_probe_attach(bus))) {</div><div class='add'>+	ret = brcmf_sdio_probe_attach(bus);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='ctx'> 		brcmf_err("brcmf_sdio_probe_attach failed\n");</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4526,7 +4555,7 @@ struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='ctx'> 	brcmf_sdio_remove(bus);</div><div class='del'>-	return NULL;</div><div class='add'>+	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Detach and free everything */</div><div class='hunk'>@@ -4571,6 +4600,8 @@ void brcmf_sdio_remove(struct brcmf_sdio *bus)</div><div class='ctx'> 		if (bus-&gt;sdiodev-&gt;settings)</div><div class='ctx'> 			brcmf_release_module_param(bus-&gt;sdiodev-&gt;settings);</div><div class='ctx'> </div><div class='add'>+		release_firmware(bus-&gt;sdiodev-&gt;clm_fw);</div><div class='add'>+		bus-&gt;sdiodev-&gt;clm_fw = NULL;</div><div class='ctx'> 		kfree(bus-&gt;rxbuf);</div><div class='ctx'> 		kfree(bus-&gt;hdrbuf);</div><div class='ctx'> 		kfree(bus);</div><div class='hunk'>@@ -4583,7 +4614,7 @@ void brcmf_sdio_wd_timer(struct brcmf_sdio *bus, bool active)</div><div class='ctx'> {</div><div class='ctx'> 	/* Totally stop the timer */</div><div class='ctx'> 	if (!active &amp;&amp; bus-&gt;wd_active) {</div><div class='del'>-		del_timer_sync(&amp;bus-&gt;timer);</div><div class='add'>+		timer_delete_sync(&amp;bus-&gt;timer);</div><div class='ctx'> 		bus-&gt;wd_active = false;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4617,4 +4648,3 @@ int brcmf_sdio_sleep(struct brcmf_sdio *bus, bool sleep)</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h<br/>index 15d2c02fa3ec..0d18ed15b403 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h</a></div><div class='hunk'>@@ -186,9 +186,13 @@ struct brcmf_sdio_dev {</div><div class='ctx'> 	struct sg_table sgtable;</div><div class='ctx'> 	char fw_name[BRCMF_FW_NAME_LEN];</div><div class='ctx'> 	char nvram_name[BRCMF_FW_NAME_LEN];</div><div class='add'>+	char clm_name[BRCMF_FW_NAME_LEN];</div><div class='ctx'> 	bool wowl_enabled;</div><div class='add'>+	bool func1_power_manageable;</div><div class='add'>+	bool func2_power_manageable;</div><div class='ctx'> 	enum brcmf_sdiod_state state;</div><div class='ctx'> 	struct brcmf_sdiod_freezer *freezer;</div><div class='add'>+	const struct firmware *clm_fw;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* sdio core registers */</div><div class='hunk'>@@ -346,26 +350,10 @@ int brcmf_sdiod_abort(struct brcmf_sdio_dev *sdiodev, struct sdio_func *func);</div><div class='ctx'> void brcmf_sdiod_sgtable_alloc(struct brcmf_sdio_dev *sdiodev);</div><div class='ctx'> void brcmf_sdiod_change_state(struct brcmf_sdio_dev *sdiodev,</div><div class='ctx'> 			      enum brcmf_sdiod_state state);</div><div class='del'>-#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> bool brcmf_sdiod_freezing(struct brcmf_sdio_dev *sdiodev);</div><div class='ctx'> void brcmf_sdiod_try_freeze(struct brcmf_sdio_dev *sdiodev);</div><div class='ctx'> void brcmf_sdiod_freezer_count(struct brcmf_sdio_dev *sdiodev);</div><div class='ctx'> void brcmf_sdiod_freezer_uncount(struct brcmf_sdio_dev *sdiodev);</div><div class='del'>-#else</div><div class='del'>-static inline bool brcmf_sdiod_freezing(struct brcmf_sdio_dev *sdiodev)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-static inline void brcmf_sdiod_try_freeze(struct brcmf_sdio_dev *sdiodev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-static inline void brcmf_sdiod_freezer_count(struct brcmf_sdio_dev *sdiodev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-static inline void brcmf_sdiod_freezer_uncount(struct brcmf_sdio_dev *sdiodev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_PM_SLEEP */</div><div class='ctx'> </div><div class='ctx'> int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev);</div><div class='ctx'> int brcmf_sdiod_remove(struct brcmf_sdio_dev *sdiodev);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.h<br/>index 338c66d0c5f8..96032322b165 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.h</a></div><div class='hunk'>@@ -28,18 +28,21 @@ static inline void trace_ ## name(proto) {}</div><div class='ctx'> </div><div class='ctx'> #define MAX_MSG_LEN		100</div><div class='ctx'> </div><div class='add'>+#pragma GCC diagnostic push</div><div class='add'>+#ifndef __clang__</div><div class='add'>+#pragma GCC diagnostic ignored "-Wsuggest-attribute=format"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> TRACE_EVENT(brcmf_err,</div><div class='ctx'> 	TP_PROTO(const char *func, struct va_format *vaf),</div><div class='ctx'> 	TP_ARGS(func, vaf),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		__string(func, func)</div><div class='del'>-		__dynamic_array(char, msg, MAX_MSG_LEN)</div><div class='add'>+		__vstring(msg, vaf-&gt;fmt, vaf-&gt;va)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(func, func);</div><div class='del'>-		WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),</div><div class='del'>-				       MAX_MSG_LEN, vaf-&gt;fmt,</div><div class='del'>-				       *vaf-&gt;va) &gt;= MAX_MSG_LEN);</div><div class='add'>+		__assign_str(func);</div><div class='add'>+		__assign_vstr(msg, vaf-&gt;fmt, vaf-&gt;va);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%s: %s", __get_str(func), __get_str(msg))</div><div class='ctx'> );</div><div class='hunk'>@@ -50,14 +53,12 @@ TRACE_EVENT(brcmf_dbg,</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		__field(u32, level)</div><div class='ctx'> 		__string(func, func)</div><div class='del'>-		__dynamic_array(char, msg, MAX_MSG_LEN)</div><div class='add'>+		__vstring(msg, vaf-&gt;fmt, vaf-&gt;va)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;level = level;</div><div class='del'>-		__assign_str(func, func);</div><div class='del'>-		WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),</div><div class='del'>-				       MAX_MSG_LEN, vaf-&gt;fmt,</div><div class='del'>-				       *vaf-&gt;va) &gt;= MAX_MSG_LEN);</div><div class='add'>+		__assign_str(func);</div><div class='add'>+		__assign_vstr(msg, vaf-&gt;fmt, vaf-&gt;va);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%s: %s", __get_str(func), __get_str(msg))</div><div class='ctx'> );</div><div class='hunk'>@@ -127,6 +128,8 @@ TRACE_EVENT(brcmf_sdpcm_hdr,</div><div class='ctx'> 		  __entry-&gt;len, ((u8 *)__get_dynamic_array(hdr))[4])</div><div class='ctx'> );</div><div class='ctx'> </div><div class='add'>+#pragma GCC diagnostic pop</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_BRCM_TRACING</div><div class='ctx'> </div><div class='ctx'> #undef TRACE_INCLUDE_PATH</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c<br/>index 586f4dfc638b..f0129d10d2b9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c</a></div><div class='hunk'>@@ -117,13 +117,6 @@ struct bootrom_id_le {</div><div class='ctx'> 	__le32 boardrev;	/* Board revision */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct brcmf_usb_image {</div><div class='del'>-	struct list_head list;</div><div class='del'>-	s8 *fwname;</div><div class='del'>-	u8 *image;</div><div class='del'>-	int image_len;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct brcmf_usbdev_info {</div><div class='ctx'> 	struct brcmf_usbdev bus_pub; /* MUST BE FIRST */</div><div class='ctx'> 	spinlock_t qlock;</div><div class='hunk'>@@ -748,15 +741,19 @@ static int brcmf_usb_dl_cmd(struct brcmf_usbdev_info *devinfo, u8 cmd,</div><div class='ctx'> 			    void *buffer, int buflen)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	char *tmpbuf;</div><div class='add'>+	char *tmpbuf = NULL;</div><div class='ctx'> 	u16 size;</div><div class='ctx'> </div><div class='del'>-	if ((!devinfo) || (devinfo-&gt;ctl_urb == NULL))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (!devinfo || !devinfo-&gt;ctl_urb) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	tmpbuf = kmalloc(buflen, GFP_ATOMIC);</div><div class='del'>-	if (!tmpbuf)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (!tmpbuf) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	size = buflen;</div><div class='ctx'> 	devinfo-&gt;ctl_urb-&gt;transfer_buffer_length = size;</div><div class='hunk'>@@ -777,18 +774,23 @@ static int brcmf_usb_dl_cmd(struct brcmf_usbdev_info *devinfo, u8 cmd,</div><div class='ctx'> 	ret = usb_submit_urb(devinfo-&gt;ctl_urb, GFP_ATOMIC);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		brcmf_err("usb_submit_urb failed %d\n", ret);</div><div class='del'>-		goto finalize;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!brcmf_usb_ioctl_resp_wait(devinfo)) {</div><div class='ctx'> 		usb_kill_urb(devinfo-&gt;ctl_urb);</div><div class='ctx'> 		ret = -ETIMEDOUT;</div><div class='add'>+		goto err;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		memcpy(buffer, tmpbuf, buflen);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-finalize:</div><div class='ctx'> 	kfree(tmpbuf);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	kfree(tmpbuf);</div><div class='add'>+	brcmf_err("dl cmd %u failed: err=%d\n", cmd, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -903,14 +905,16 @@ brcmf_usb_dl_writeimage(struct brcmf_usbdev_info *devinfo, u8 *fw, int fwlen)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* 1) Prepare USB boot loader for runtime image */</div><div class='del'>-	brcmf_usb_dl_cmd(devinfo, DL_START, &amp;state, sizeof(state));</div><div class='add'>+	err = brcmf_usb_dl_cmd(devinfo, DL_START, &amp;state, sizeof(state));</div><div class='add'>+	if (err)</div><div class='add'>+		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	rdlstate = le32_to_cpu(state.state);</div><div class='ctx'> 	rdlbytes = le32_to_cpu(state.bytes);</div><div class='ctx'> </div><div class='ctx'> 	/* 2) Check we are in the Waiting state */</div><div class='ctx'> 	if (rdlstate != DL_WAITING) {</div><div class='del'>-		brcmf_err("Failed to DL_START\n");</div><div class='add'>+		brcmf_err("Invalid DL state: %u\n", rdlstate);</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -923,10 +927,7 @@ brcmf_usb_dl_writeimage(struct brcmf_usbdev_info *devinfo, u8 *fw, int fwlen)</div><div class='ctx'> 		/* Wait until the usb device reports it received all</div><div class='ctx'> 		 * the bytes we sent */</div><div class='ctx'> 		if ((rdlbytes == sent) &amp;&amp; (rdlbytes != dllen)) {</div><div class='del'>-			if ((dllen-sent) &lt; TRX_RDL_CHUNK)</div><div class='del'>-				sendlen = dllen-sent;</div><div class='del'>-			else</div><div class='del'>-				sendlen = TRX_RDL_CHUNK;</div><div class='add'>+			sendlen = min(dllen - sent, TRX_RDL_CHUNK);</div><div class='ctx'> </div><div class='ctx'> 			/* simply avoid having to send a ZLP by ensuring we</div><div class='ctx'> 			 * never have an even</div><div class='hunk'>@@ -1154,24 +1155,11 @@ error:</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static</div><div class='del'>-int brcmf_usb_get_fwname(struct device *dev, const char *ext, u8 *fw_name)</div><div class='add'>+static int brcmf_usb_get_blob(struct device *dev, const struct firmware **fw,</div><div class='add'>+			      enum brcmf_blob_type type)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_bus *bus = dev_get_drvdata(dev);</div><div class='del'>-	struct brcmf_fw_request *fwreq;</div><div class='del'>-	struct brcmf_fw_name fwnames[] = {</div><div class='del'>-		{ ext, fw_name },</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	fwreq = brcmf_fw_alloc_request(bus-&gt;chip, bus-&gt;chiprev,</div><div class='del'>-				       brcmf_usb_fwnames,</div><div class='del'>-				       ARRAY_SIZE(brcmf_usb_fwnames),</div><div class='del'>-				       fwnames, ARRAY_SIZE(fwnames));</div><div class='del'>-	if (!fwreq)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	kfree(fwreq);</div><div class='del'>-	return 0;</div><div class='add'>+	/* No blobs for USB devices... */</div><div class='add'>+	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct brcmf_bus_ops brcmf_usb_bus_ops = {</div><div class='hunk'>@@ -1180,7 +1168,7 @@ static const struct brcmf_bus_ops brcmf_usb_bus_ops = {</div><div class='ctx'> 	.txdata = brcmf_usb_tx,</div><div class='ctx'> 	.txctl = brcmf_usb_tx_ctlpkt,</div><div class='ctx'> 	.rxctl = brcmf_usb_rx_ctlpkt,</div><div class='del'>-	.get_fwname = brcmf_usb_get_fwname,</div><div class='add'>+	.get_blob = brcmf_usb_get_blob,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define BRCMF_USB_FW_CODE	0</div><div class='hunk'>@@ -1253,10 +1241,11 @@ brcmf_usb_prepare_fw_request(struct brcmf_usbdev_info *devinfo)</div><div class='ctx'> 	return fwreq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo)</div><div class='add'>+static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo,</div><div class='add'>+			      enum brcmf_fwvendor fwvid)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_bus *bus = NULL;</div><div class='del'>-	struct brcmf_usbdev *bus_pub = NULL;</div><div class='add'>+	struct brcmf_bus *bus;</div><div class='add'>+	struct brcmf_usbdev *bus_pub;</div><div class='ctx'> 	struct device *dev = devinfo-&gt;dev;</div><div class='ctx'> 	struct brcmf_fw_request *fwreq;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1266,7 +1255,7 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo)</div><div class='ctx'> 	if (!bus_pub)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	bus = kzalloc(sizeof(struct brcmf_bus), GFP_ATOMIC);</div><div class='add'>+	bus = kzalloc(sizeof(*bus), GFP_ATOMIC);</div><div class='ctx'> 	if (!bus) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -1278,6 +1267,7 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo)</div><div class='ctx'> 	dev_set_drvdata(dev, bus);</div><div class='ctx'> 	bus-&gt;ops = &amp;brcmf_usb_bus_ops;</div><div class='ctx'> 	bus-&gt;proto_type = BRCMF_PROTO_BCDC;</div><div class='add'>+	bus-&gt;fwvid = fwvid;</div><div class='ctx'> 	bus-&gt;always_use_fws_queue = true;</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	bus-&gt;wowl_supported = true;</div><div class='hunk'>@@ -1290,6 +1280,9 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo)</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='add'>+	ret = PTR_ERR_OR_ZERO(devinfo-&gt;settings);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	if (!brcmf_usb_dlneeded(devinfo)) {</div><div class='ctx'> 		ret = brcmf_alloc(devinfo-&gt;dev, devinfo-&gt;settings);</div><div class='hunk'>@@ -1342,6 +1335,9 @@ brcmf_usb_disconnect_cb(struct brcmf_usbdev_info *devinfo)</div><div class='ctx'> 	brcmf_usb_detach(devinfo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Forward declaration for usb_match_id() call */</div><div class='add'>+static const struct usb_device_id brcmf_usb_devid_table[];</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> brcmf_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)</div><div class='ctx'> {</div><div class='hunk'>@@ -1353,6 +1349,14 @@ brcmf_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)</div><div class='ctx'> 	u32 num_of_eps;</div><div class='ctx'> 	u8 endpoint_num, ep;</div><div class='ctx'> </div><div class='add'>+	if (!id) {</div><div class='add'>+		id = usb_match_id(intf, brcmf_usb_devid_table);</div><div class='add'>+		if (!id) {</div><div class='add'>+			dev_err(&amp;intf-&gt;dev, "Error could not find matching usb_device_id\n");</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	brcmf_dbg(USB, "Enter 0x%04x:0x%04x\n", id-&gt;idVendor, id-&gt;idProduct);</div><div class='ctx'> </div><div class='ctx'> 	devinfo = kzalloc(sizeof(*devinfo), GFP_ATOMIC);</div><div class='hunk'>@@ -1436,7 +1440,7 @@ brcmf_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)</div><div class='ctx'> 	else</div><div class='ctx'> 		brcmf_dbg(USB, "Broadcom full speed USB WLAN interface detected\n");</div><div class='ctx'> </div><div class='del'>-	ret = brcmf_usb_probe_cb(devinfo);</div><div class='add'>+	ret = brcmf_usb_probe_cb(devinfo, id-&gt;driver_info);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='hunk'>@@ -1524,14 +1528,23 @@ static int brcmf_usb_reset_resume(struct usb_interface *intf)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define BRCMF_USB_DEVICE(dev_id)	\</div><div class='del'>-	{ USB_DEVICE(BRCM_USB_VENDOR_ID_BROADCOM, dev_id) }</div><div class='add'>+#define BRCMF_USB_DEVICE(dev_id) \</div><div class='add'>+	{ \</div><div class='add'>+		USB_DEVICE(BRCM_USB_VENDOR_ID_BROADCOM, dev_id), \</div><div class='add'>+		.driver_info = BRCMF_FWVENDOR_WCC \</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-#define LINKSYS_USB_DEVICE(dev_id)	\</div><div class='del'>-	{ USB_DEVICE(BRCM_USB_VENDOR_ID_LINKSYS, dev_id) }</div><div class='add'>+#define LINKSYS_USB_DEVICE(dev_id) \</div><div class='add'>+	{ \</div><div class='add'>+		USB_DEVICE(BRCM_USB_VENDOR_ID_LINKSYS, dev_id), \</div><div class='add'>+		.driver_info = BRCMF_FWVENDOR_WCC \</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-#define CYPRESS_USB_DEVICE(dev_id)	\</div><div class='del'>-	{ USB_DEVICE(CY_USB_VENDOR_ID_CYPRESS, dev_id) }</div><div class='add'>+#define CYPRESS_USB_DEVICE(dev_id) \</div><div class='add'>+	{ \</div><div class='add'>+		USB_DEVICE(CY_USB_VENDOR_ID_CYPRESS, dev_id), \</div><div class='add'>+		.driver_info = BRCMF_FWVENDOR_WCC \</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> static const struct usb_device_id brcmf_usb_devid_table[] = {</div><div class='ctx'> 	BRCMF_USB_DEVICE(BRCM_USB_43143_DEVICE_ID),</div><div class='hunk'>@@ -1572,7 +1585,7 @@ static int brcmf_usb_reset_device(struct device *dev, void *notused)</div><div class='ctx'> </div><div class='ctx'> void brcmf_usb_exit(void)</div><div class='ctx'> {</div><div class='del'>-	struct device_driver *drv = &amp;brcmf_usbdrvr.drvwrap.driver;</div><div class='add'>+	struct device_driver *drv = &amp;brcmf_usbdrvr.driver;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(USB, "Enter\n");</div><div class='hunk'>@@ -1584,12 +1597,8 @@ void brcmf_usb_exit(void)</div><div class='ctx'> 	usb_deregister(&amp;brcmf_usbdrvr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void brcmf_usb_register(void)</div><div class='add'>+int brcmf_usb_register(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='ctx'> 	brcmf_dbg(USB, "Enter\n");</div><div class='del'>-	ret = usb_register(&amp;brcmf_usbdrvr);</div><div class='del'>-	if (ret)</div><div class='del'>-		brcmf_err("usb_register failed %d\n", ret);</div><div class='add'>+	return usb_register(&amp;brcmf_usbdrvr);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/Makefile<br/>new file mode 100644<br/>index 000000000000..3db4cce44f42<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/Makefile</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+# SPDX-License-Identifier: ISC</div><div class='add'>+#</div><div class='add'>+# Copyright (c) 2022 Broadcom Corporation</div><div class='add'>+</div><div class='add'>+ccflags-y += \</div><div class='add'>+	-I $(src) \</div><div class='add'>+	-I $(src)/.. \</div><div class='add'>+	-I $(src)/../../include</div><div class='add'>+</div><div class='add'>+obj-m += brcmfmac-wcc.o</div><div class='add'>+brcmfmac-wcc-objs += \</div><div class='add'>+		core.o module.o</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c<br/>new file mode 100644<br/>index 000000000000..05d7c2a4fba5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+// SPDX-License-Identifier: ISC</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022 Broadcom Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;core.h&gt;</div><div class='add'>+#include &lt;bus.h&gt;</div><div class='add'>+#include &lt;fwvid.h&gt;</div><div class='add'>+#include &lt;cfg80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "vops.h"</div><div class='add'>+</div><div class='add'>+#define BRCMF_WCC_E_LAST		213</div><div class='add'>+</div><div class='add'>+static int brcmf_wcc_set_sae_pwd(struct brcmf_if *ifp,</div><div class='add'>+				 struct cfg80211_crypto_settings *crypto)</div><div class='add'>+{</div><div class='add'>+	return brcmf_set_wsec(ifp, crypto-&gt;sae_pwd, crypto-&gt;sae_pwd_len,</div><div class='add'>+			      BRCMF_WSEC_PASSPHRASE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int brcmf_wcc_alloc_fweh_info(struct brcmf_pub *drvr)</div><div class='add'>+{</div><div class='add'>+	struct brcmf_fweh_info *fweh;</div><div class='add'>+</div><div class='add'>+	fweh = kzalloc(struct_size(fweh, evt_handler, BRCMF_WCC_E_LAST),</div><div class='add'>+		       GFP_KERNEL);</div><div class='add'>+	if (!fweh)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fweh-&gt;num_event_codes = BRCMF_WCC_E_LAST;</div><div class='add'>+	drvr-&gt;fweh = fweh;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct brcmf_fwvid_ops brcmf_wcc_ops = {</div><div class='add'>+	.set_sae_password = brcmf_wcc_set_sae_pwd,</div><div class='add'>+	.alloc_fweh_info = brcmf_wcc_alloc_fweh_info,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/module.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/module.c<br/>new file mode 100644<br/>index 000000000000..cfe01ca63ba6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/module.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/module.c</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+// SPDX-License-Identifier: ISC</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022 Broadcom Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;bus.h&gt;</div><div class='add'>+#include &lt;core.h&gt;</div><div class='add'>+#include &lt;fwvid.h&gt;</div><div class='add'>+</div><div class='add'>+#include "vops.h"</div><div class='add'>+</div><div class='add'>+static int __init brcmf_wcc_init(void)</div><div class='add'>+{</div><div class='add'>+	return brcmf_fwvid_register_vendor(BRCMF_FWVENDOR_WCC, THIS_MODULE,</div><div class='add'>+					   &amp;brcmf_wcc_ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit brcmf_wcc_exit(void)</div><div class='add'>+{</div><div class='add'>+	brcmf_fwvid_unregister_vendor(BRCMF_FWVENDOR_WCC, THIS_MODULE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Broadcom FullMAC WLAN driver plugin for Broadcom mobility chipsets");</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='add'>+MODULE_IMPORT_NS("BRCMFMAC");</div><div class='add'>+</div><div class='add'>+module_init(brcmf_wcc_init);</div><div class='add'>+module_exit(brcmf_wcc_exit);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/vops.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/vops.h<br/>new file mode 100644<br/>index 000000000000..3aec44f80600<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/vops.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/vops.h</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+/* SPDX-License-Identifier: ISC */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022 Broadcom Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef _BRCMFMAC_WCC_VOPS_H</div><div class='add'>+#define _BRCMFMAC_WCC_VOPS_H</div><div class='add'>+</div><div class='add'>+extern const struct brcmf_fwvid_ops brcmf_wcc_ops;</div><div class='add'>+#define WCC_VOPS	(&amp;brcmf_wcc_ops)</div><div class='add'>+</div><div class='add'>+#endif /* _BRCMFMAC_WCC_VOPS_H */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.c<br/>new file mode 100644<br/>index 000000000000..08841b9a5b81<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.c</a></div><div class='hunk'>@@ -0,0 +1,84 @@</div><div class='add'>+// SPDX-License-Identifier: ISC</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2019 Broadcom</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/math.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+</div><div class='add'>+#include "xtlv.h"</div><div class='add'>+</div><div class='add'>+static int brcmf_xtlv_header_size(u16 opts)</div><div class='add'>+{</div><div class='add'>+	int len = (int)offsetof(struct brcmf_xtlv, data);</div><div class='add'>+</div><div class='add'>+	if (opts &amp; BRCMF_XTLV_OPTION_IDU8)</div><div class='add'>+		--len;</div><div class='add'>+	if (opts &amp; BRCMF_XTLV_OPTION_LENU8)</div><div class='add'>+		--len;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int brcmf_xtlv_data_size(int dlen, u16 opts)</div><div class='add'>+{</div><div class='add'>+	int hsz;</div><div class='add'>+</div><div class='add'>+	hsz = brcmf_xtlv_header_size(opts);</div><div class='add'>+	if (opts &amp; BRCMF_XTLV_OPTION_ALIGN32)</div><div class='add'>+		return roundup(dlen + hsz, 4);</div><div class='add'>+</div><div class='add'>+	return dlen + hsz;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void brcmf_xtlv_pack_header(struct brcmf_xtlv *xtlv, u16 id, u16 len,</div><div class='add'>+			    const u8 *data, u16 opts)</div><div class='add'>+{</div><div class='add'>+	u8 *data_buf;</div><div class='add'>+	u16 mask = BRCMF_XTLV_OPTION_IDU8 | BRCMF_XTLV_OPTION_LENU8;</div><div class='add'>+</div><div class='add'>+	if (!(opts &amp; mask)) {</div><div class='add'>+		u8 *idp = (u8 *)xtlv;</div><div class='add'>+		u8 *lenp = idp + sizeof(xtlv-&gt;id);</div><div class='add'>+</div><div class='add'>+		put_unaligned_le16(id, idp);</div><div class='add'>+		put_unaligned_le16(len, lenp);</div><div class='add'>+		data_buf = lenp + sizeof(u16);</div><div class='add'>+	} else if ((opts &amp; mask) == mask) { /* u8 id and u8 len */</div><div class='add'>+		u8 *idp = (u8 *)xtlv;</div><div class='add'>+		u8 *lenp = idp + 1;</div><div class='add'>+</div><div class='add'>+		*idp = (u8)id;</div><div class='add'>+		*lenp = (u8)len;</div><div class='add'>+		data_buf = lenp + sizeof(u8);</div><div class='add'>+	} else if (opts &amp; BRCMF_XTLV_OPTION_IDU8) { /* u8 id, u16 len */</div><div class='add'>+		u8 *idp = (u8 *)xtlv;</div><div class='add'>+		u8 *lenp = idp + 1;</div><div class='add'>+</div><div class='add'>+		*idp = (u8)id;</div><div class='add'>+		put_unaligned_le16(len, lenp);</div><div class='add'>+		data_buf = lenp + sizeof(u16);</div><div class='add'>+	} else if (opts &amp; BRCMF_XTLV_OPTION_LENU8) { /* u16 id, u8 len */</div><div class='add'>+		u8 *idp = (u8 *)xtlv;</div><div class='add'>+		u8 *lenp = idp + sizeof(u16);</div><div class='add'>+</div><div class='add'>+		put_unaligned_le16(id, idp);</div><div class='add'>+		*lenp = (u8)len;</div><div class='add'>+		data_buf = lenp + sizeof(u8);</div><div class='add'>+	} else {</div><div class='add'>+		WARN(true, "Unexpected xtlv option");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (opts &amp; BRCMF_XTLV_OPTION_LENU8) {</div><div class='add'>+		WARN_ON(len &gt; 0x00ff);</div><div class='add'>+		len &amp;= 0xff;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data)</div><div class='add'>+		memcpy(data_buf, data, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.h<br/>new file mode 100644<br/>index 000000000000..b2c7ae8966a1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.h</a></div><div class='hunk'>@@ -0,0 +1,31 @@</div><div class='add'>+// SPDX-License-Identifier: ISC</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2019 Broadcom</div><div class='add'>+ */</div><div class='add'>+#ifndef __BRCMF_XTLV_H</div><div class='add'>+#define __BRCMF_XTLV_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+</div><div class='add'>+/* bcm type(id), length, value with w/16 bit id/len. The structure below</div><div class='add'>+ * is nominal, and is used to support variable length id and type. See</div><div class='add'>+ * xtlv options below.</div><div class='add'>+ */</div><div class='add'>+struct brcmf_xtlv {</div><div class='add'>+	u16 id;</div><div class='add'>+	u16 len;</div><div class='add'>+	u8 data[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum brcmf_xtlv_option {</div><div class='add'>+	BRCMF_XTLV_OPTION_ALIGN32 = BIT(0),</div><div class='add'>+	BRCMF_XTLV_OPTION_IDU8 = BIT(1),</div><div class='add'>+	BRCMF_XTLV_OPTION_LENU8 = BIT(2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int brcmf_xtlv_data_size(int dlen, u16 opts);</div><div class='add'>+void brcmf_xtlv_pack_header(struct brcmf_xtlv *xtlv, u16 id, u16 len,</div><div class='add'>+			    const u8 *data, u16 opts);</div><div class='add'>+</div><div class='add'>+#endif /* __BRCMF_XTLV_H */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile<br/>index 482d7737764d..ffdd17eabe1d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile</a></div><div class='hunk'>@@ -16,9 +16,9 @@</div><div class='ctx'> # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='ctx'> </div><div class='ctx'> ccflags-y := \</div><div class='del'>-	-I $(srctree)/$(src) \</div><div class='del'>-	-I $(srctree)/$(src)/phy \</div><div class='del'>-	-I $(srctree)/$(src)/../include</div><div class='add'>+	-I $(src) \</div><div class='add'>+	-I $(src)/phy \</div><div class='add'>+	-I $(src)/../include</div><div class='ctx'> </div><div class='ctx'> brcmsmac-y := \</div><div class='ctx'> 	mac80211_if.o \</div><div class='hunk'>@@ -42,6 +42,6 @@ brcmsmac-y := \</div><div class='ctx'> 	brcms_trace_events.o \</div><div class='ctx'> 	debug.o</div><div class='ctx'> </div><div class='del'>-brcmsmac-$(CONFIG_BCMA_DRIVER_GPIO) += led.o</div><div class='add'>+brcmsmac-$(CONFIG_BRCMSMAC_LEDS) += led.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_BRCMSMAC)	+= brcmsmac.o</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.c<br/>index 53365977bfd6..0cb64fc56783 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.c</a></div><div class='hunk'>@@ -198,7 +198,7 @@</div><div class='ctx'> #define	CST4313_SPROM_OTP_SEL_SHIFT		0</div><div class='ctx'> </div><div class='ctx'> /* 4313 Chip specific ChipControl register bits */</div><div class='del'>- /* 12 mA drive strengh for later 4313 */</div><div class='add'>+ /* 12 mA drive strength for later 4313 */</div><div class='ctx'> #define CCTRL_4313_12MA_LED_DRIVE    0x00000007</div><div class='ctx'> </div><div class='ctx'> /* Manufacturer Ids */</div><div class='hunk'>@@ -453,7 +453,7 @@ ai_buscore_setup(struct si_info *sii, struct bcma_device *cc)</div><div class='ctx'> 	/* get chipcommon chipstatus */</div><div class='ctx'> 	sii-&gt;chipst = bcma_read32(cc, CHIPCREGOFFS(chipstatus));</div><div class='ctx'> </div><div class='del'>-	/* get chipcommon capabilites */</div><div class='add'>+	/* get chipcommon capabilities */</div><div class='ctx'> 	sii-&gt;pub.cccaps = bcma_read32(cc, CHIPCREGOFFS(capabilities));</div><div class='ctx'> </div><div class='ctx'> 	/* get pmu rev and caps */</div><div class='hunk'>@@ -512,7 +512,7 @@ ai_attach(struct bcma_bus *pbus)</div><div class='ctx'> 	struct si_info *sii;</div><div class='ctx'> </div><div class='ctx'> 	/* alloc struct si_info */</div><div class='del'>-	sii = kzalloc(sizeof(struct si_info), GFP_ATOMIC);</div><div class='add'>+	sii = kzalloc(sizeof(*sii), GFP_ATOMIC);</div><div class='ctx'> 	if (sii == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -531,9 +531,6 @@ void ai_detach(struct si_pub *sih)</div><div class='ctx'> </div><div class='ctx'> 	sii = container_of(sih, struct si_info, pub);</div><div class='ctx'> </div><div class='del'>-	if (sii == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	kfree(sii);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -660,7 +657,7 @@ u16 ai_clkctl_fast_pwrup_delay(struct si_pub *sih)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *  clock control policy function throught chipcommon</div><div class='add'>+ *  clock control policy function through chipcommon</div><div class='ctx'>  *</div><div class='ctx'>  *    set dynamic clk control mode (forceslow, forcefast, dynamic)</div><div class='ctx'>  *    returns true if we are forcing fast clock</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.h<br/>index 2d08c155c23b..e791dd07ca78 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.h</a></div><div class='hunk'>@@ -76,7 +76,7 @@</div><div class='ctx'>  * conventions for the use the flash space:</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* Minumum amount of flash we support */</div><div class='add'>+/* Minimum amount of flash we support */</div><div class='ctx'> #define FLASH_MIN		0x00020000	/* Minimum flash size */</div><div class='ctx'> </div><div class='ctx'> #define	CC_SROM_OTP		0x800	/* SROM/OTP address space */</div><div class='hunk'>@@ -145,14 +145,6 @@ struct si_pub {</div><div class='ctx'> </div><div class='ctx'> struct pci_dev;</div><div class='ctx'> </div><div class='del'>-struct gpioh_item {</div><div class='del'>-	void *arg;</div><div class='del'>-	bool level;</div><div class='del'>-	void (*handler) (u32 stat, void *arg);</div><div class='del'>-	u32 event;</div><div class='del'>-	struct gpioh_item *next;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* misc si info needed by some of the routines */</div><div class='ctx'> struct si_info {</div><div class='ctx'> 	struct si_pub pub;	/* back plane public state (must be first) */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c<br/>index 2631eb7569eb..e1d707a7c964 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c</a></div><div class='hunk'>@@ -143,12 +143,6 @@ struct ampdu_info {</div><div class='ctx'> 	struct brcms_fifo_info fifo_tb[NUM_FFPLD_FIFO];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* used for flushing ampdu packets */</div><div class='del'>-struct cb_del_ampdu_pars {</div><div class='del'>-	struct ieee80211_sta *sta;</div><div class='del'>-	u16 tid;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void brcms_c_scb_ampdu_update_max_txlen(struct ampdu_info *ampdu, u8 dur)</div><div class='ctx'> {</div><div class='ctx'> 	u32 rate, mcs;</div><div class='hunk'>@@ -225,7 +219,7 @@ struct ampdu_info *brcms_c_ampdu_attach(struct brcms_c_info *wlc)</div><div class='ctx'> 	struct ampdu_info *ampdu;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	ampdu = kzalloc(sizeof(struct ampdu_info), GFP_ATOMIC);</div><div class='add'>+	ampdu = kzalloc(sizeof(*ampdu), GFP_ATOMIC);</div><div class='ctx'> 	if (!ampdu)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -357,9 +351,7 @@ static int brcms_c_ffpld_check_txfunfl(struct brcms_c_info *wlc, int fid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ampdu_info *ampdu = wlc-&gt;ampdu;</div><div class='ctx'> 	u32 phy_rate = mcs_2_rate(FFPLD_MAX_MCS, true, false);</div><div class='del'>-	u32 txunfl_ratio;</div><div class='ctx'> 	u8 max_mpdu;</div><div class='del'>-	u32 current_ampdu_cnt = 0;</div><div class='ctx'> 	u16 max_pld_size;</div><div class='ctx'> 	u32 new_txunfl;</div><div class='ctx'> 	struct brcms_fifo_info *fifo = (ampdu-&gt;fifo_tb + fid);</div><div class='hunk'>@@ -395,26 +387,8 @@ static int brcms_c_ffpld_check_txfunfl(struct brcms_c_info *wlc, int fid)</div><div class='ctx'> 	if (fifo-&gt;accum_txfunfl &lt; 10)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	brcms_dbg_ht(wlc-&gt;hw-&gt;d11core, "ampdu_count %d  tx_underflows %d\n",</div><div class='del'>-		     current_ampdu_cnt, fifo-&gt;accum_txfunfl);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	   compute the current ratio of tx unfl per ampdu.</div><div class='del'>-	   When the current ampdu count becomes too</div><div class='del'>-	   big while the ratio remains small, we reset</div><div class='del'>-	   the current count in order to not</div><div class='del'>-	   introduce too big of a latency in detecting a</div><div class='del'>-	   large amount of tx underflows later.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	txunfl_ratio = current_ampdu_cnt / fifo-&gt;accum_txfunfl;</div><div class='add'>+	brcms_dbg_ht(wlc-&gt;hw-&gt;d11core, "tx_underflows %d\n", fifo-&gt;accum_txfunfl);</div><div class='ctx'> </div><div class='del'>-	if (txunfl_ratio &gt; ampdu-&gt;tx_max_funl) {</div><div class='del'>-		if (current_ampdu_cnt &gt;= FFPLD_MAX_AMPDU_CNT)</div><div class='del'>-			fifo-&gt;accum_txfunfl = 0;</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='ctx'> 	max_mpdu = min_t(u8, fifo-&gt;mcs2ampdu_table[FFPLD_MAX_MCS],</div><div class='ctx'> 			 AMPDU_NUM_MPDU_LEGACY);</div><div class='ctx'> </div><div class='hunk'>@@ -476,11 +450,9 @@ static int brcms_c_ffpld_check_txfunfl(struct brcms_c_info *wlc, int fid)</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> brcms_c_ampdu_tx_operational(struct brcms_c_info *wlc, u8 tid,</div><div class='del'>-	u8 ba_wsize,		/* negotiated ba window size (in pdu) */</div><div class='ctx'> 	uint max_rx_ampdu_bytes) /* from ht_cap in beacon */</div><div class='ctx'> {</div><div class='ctx'> 	struct scb_ampdu *scb_ampdu;</div><div class='del'>-	struct scb_ampdu_tid_ini *ini;</div><div class='ctx'> 	struct ampdu_info *ampdu = wlc-&gt;ampdu;</div><div class='ctx'> 	struct scb *scb = &amp;wlc-&gt;pri_scb;</div><div class='ctx'> 	scb_ampdu = &amp;scb-&gt;scb_ampdu;</div><div class='hunk'>@@ -491,10 +463,6 @@ brcms_c_ampdu_tx_operational(struct brcms_c_info *wlc, u8 tid,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ini = &amp;scb_ampdu-&gt;ini[tid];</div><div class='del'>-	ini-&gt;tid = tid;</div><div class='del'>-	ini-&gt;scb = scb_ampdu-&gt;scb;</div><div class='del'>-	ini-&gt;ba_wsize = ba_wsize;</div><div class='ctx'> 	scb_ampdu-&gt;max_rx_ampdu_bytes = max_rx_ampdu_bytes;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -511,7 +479,7 @@ void brcms_c_ampdu_reset_session(struct brcms_ampdu_session *session,</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Preps the given packet for AMPDU based on the session data. If the</div><div class='del'>- * frame cannot be accomodated in the current session, -ENOSPC is</div><div class='add'>+ * frame cannot be accommodated in the current session, -ENOSPC is</div><div class='ctx'>  * returned.</div><div class='ctx'>  */</div><div class='ctx'> int brcms_c_ampdu_add_frame(struct brcms_ampdu_session *session,</div><div class='hunk'>@@ -561,7 +529,7 @@ int brcms_c_ampdu_add_frame(struct brcms_ampdu_session *session,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Now that we're sure this frame can be accomodated, update the</div><div class='add'>+	 * Now that we're sure this frame can be accommodated, update the</div><div class='ctx'> 	 * session information.</div><div class='ctx'> 	 */</div><div class='ctx'> 	session-&gt;ampdu_len += len;</div><div class='hunk'>@@ -845,7 +813,7 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,</div><div class='ctx'> 	u16 seq, start_seq = 0, bindex, index, mcl;</div><div class='ctx'> 	u8 mcs = 0;</div><div class='ctx'> 	bool ba_recd = false, ack_recd = false;</div><div class='del'>-	u8 suc_mpdu = 0, tot_mpdu = 0;</div><div class='add'>+	u8 tot_mpdu = 0;</div><div class='ctx'> 	uint supr_status;</div><div class='ctx'> 	bool retry = true;</div><div class='ctx'> 	u16 mimoantsel = 0;</div><div class='hunk'>@@ -975,7 +943,6 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,</div><div class='ctx'> 				ieee80211_tx_status_irqsafe(wlc-&gt;pub-&gt;ieee_hw,</div><div class='ctx'> 							    p);</div><div class='ctx'> 				ack_recd = true;</div><div class='del'>-				suc_mpdu++;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		/* either retransmit or send bar if ack not recd */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.c<br/>index 54c616919590..f411bc6d795d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.c</a></div><div class='hunk'>@@ -111,7 +111,7 @@ struct antsel_info *brcms_c_antsel_attach(struct brcms_c_info *wlc)</div><div class='ctx'> 	struct antsel_info *asi;</div><div class='ctx'> 	struct ssb_sprom *sprom = &amp;wlc-&gt;hw-&gt;d11core-&gt;bus-&gt;sprom;</div><div class='ctx'> </div><div class='del'>-	asi = kzalloc(sizeof(struct antsel_info), GFP_ATOMIC);</div><div class='add'>+	asi = kzalloc(sizeof(*asi), GFP_ATOMIC);</div><div class='ctx'> 	if (!asi)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h<br/>index a0da3248b942..53b3dba50737 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h</a></div><div class='hunk'>@@ -81,7 +81,7 @@ TRACE_EVENT(brcms_macintstatus,</div><div class='ctx'> 		__field(u32, mask)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(dev, dev_name(dev));</div><div class='add'>+		__assign_str(dev);</div><div class='ctx'> 		__entry-&gt;in_isr = in_isr;</div><div class='ctx'> 		__entry-&gt;macintstatus = macintstatus;</div><div class='ctx'> 		__entry-&gt;mask = mask;</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h<br/>index 0e8a69ab909f..908ce3c864fe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h</a></div><div class='hunk'>@@ -24,16 +24,19 @@</div><div class='ctx'> </div><div class='ctx'> #define MAX_MSG_LEN	100</div><div class='ctx'> </div><div class='add'>+#pragma GCC diagnostic push</div><div class='add'>+#ifndef __clang__</div><div class='add'>+#pragma GCC diagnostic ignored "-Wsuggest-attribute=format"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> DECLARE_EVENT_CLASS(brcms_msg_event,</div><div class='ctx'> 	TP_PROTO(struct va_format *vaf),</div><div class='ctx'> 	TP_ARGS(vaf),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='del'>-		__dynamic_array(char, msg, MAX_MSG_LEN)</div><div class='add'>+		__vstring(msg, vaf-&gt;fmt, vaf-&gt;va)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),</div><div class='del'>-				       MAX_MSG_LEN, vaf-&gt;fmt,</div><div class='del'>-				       *vaf-&gt;va) &gt;= MAX_MSG_LEN);</div><div class='add'>+		__assign_vstr(msg, vaf-&gt;fmt, vaf-&gt;va);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%s", __get_str(msg))</div><div class='ctx'> );</div><div class='hunk'>@@ -64,17 +67,18 @@ TRACE_EVENT(brcms_dbg,</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		__field(u32, level)</div><div class='ctx'> 		__string(func, func)</div><div class='del'>-		__dynamic_array(char, msg, MAX_MSG_LEN)</div><div class='add'>+		__vstring(msg, vaf-&gt;fmt, vaf-&gt;va)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;level = level;</div><div class='del'>-		__assign_str(func, func);</div><div class='del'>-		WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),</div><div class='del'>-				       MAX_MSG_LEN, vaf-&gt;fmt,</div><div class='del'>-				       *vaf-&gt;va) &gt;= MAX_MSG_LEN);</div><div class='add'>+		__assign_str(func);</div><div class='add'>+		__assign_vstr(msg, vaf-&gt;fmt, vaf-&gt;va);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%s: %s", __get_str(func), __get_str(msg))</div><div class='ctx'> );</div><div class='add'>+</div><div class='add'>+#pragma GCC diagnostic pop</div><div class='add'>+</div><div class='ctx'> #endif /* __TRACE_BRCMSMAC_MSG_H */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BRCM_TRACING</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h<br/>index cf2cc070f1e5..24ac34fa0207 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h</a></div><div class='hunk'>@@ -31,7 +31,7 @@ TRACE_EVENT(brcms_txdesc,</div><div class='ctx'> 		__dynamic_array(u8, txh, txh_len)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(dev, dev_name(dev));</div><div class='add'>+		__assign_str(dev);</div><div class='ctx'> 		memcpy(__get_dynamic_array(txh), txh, txh_len);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("[%s] txdesc", __get_str(dev))</div><div class='hunk'>@@ -54,7 +54,7 @@ TRACE_EVENT(brcms_txstatus,</div><div class='ctx'> 		__field(u16, ackphyrxsh)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(dev, dev_name(dev));</div><div class='add'>+		__assign_str(dev);</div><div class='ctx'> 		__entry-&gt;framelen = framelen;</div><div class='ctx'> 		__entry-&gt;frameid = frameid;</div><div class='ctx'> 		__entry-&gt;status = status;</div><div class='hunk'>@@ -85,7 +85,7 @@ TRACE_EVENT(brcms_ampdu_session,</div><div class='ctx'> 		__field(u16, dma_len)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(dev, dev_name(dev));</div><div class='add'>+		__assign_str(dev);</div><div class='ctx'> 		__entry-&gt;max_ampdu_len = max_ampdu_len;</div><div class='ctx'> 		__entry-&gt;max_ampdu_frames = max_ampdu_frames;</div><div class='ctx'> 		__entry-&gt;ampdu_len = ampdu_len;</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c<br/>index 5a6d9c86552a..3878c4124e25 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c</a></div><div class='hunk'>@@ -331,7 +331,7 @@ struct brcms_cm_info *brcms_c_channel_mgr_attach(struct brcms_c_info *wlc)</div><div class='ctx'> 	const char *ccode = sprom-&gt;alpha2;</div><div class='ctx'> 	int ccode_len = sizeof(sprom-&gt;alpha2);</div><div class='ctx'> </div><div class='del'>-	wlc_cm = kzalloc(sizeof(struct brcms_cm_info), GFP_ATOMIC);</div><div class='add'>+	wlc_cm = kzalloc(sizeof(*wlc_cm), GFP_ATOMIC);</div><div class='ctx'> 	if (wlc_cm == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	wlc_cm-&gt;pub = pub;</div><div class='hunk'>@@ -341,7 +341,7 @@ struct brcms_cm_info *brcms_c_channel_mgr_attach(struct brcms_c_info *wlc)</div><div class='ctx'> 	/* store the country code for passing up as a regulatory hint */</div><div class='ctx'> 	wlc_cm-&gt;world_regd = brcms_world_regd(ccode, ccode_len);</div><div class='ctx'> 	if (brcms_c_country_valid(ccode))</div><div class='del'>-		strncpy(wlc-&gt;pub-&gt;srom_ccode, ccode, ccode_len);</div><div class='add'>+		memcpy(wlc-&gt;pub-&gt;srom_ccode, ccode, ccode_len);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If no custom world domain is found in the SROM, use the</div><div class='hunk'>@@ -354,10 +354,10 @@ struct brcms_cm_info *brcms_c_channel_mgr_attach(struct brcms_c_info *wlc)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* save default country for exiting 11d regulatory mode */</div><div class='del'>-	strncpy(wlc-&gt;country_default, ccode, ccode_len);</div><div class='add'>+	memcpy(wlc-&gt;country_default, ccode, ccode_len);</div><div class='ctx'> </div><div class='ctx'> 	/* initialize autocountry_default to driver default */</div><div class='del'>-	strncpy(wlc-&gt;autocountry_default, ccode, ccode_len);</div><div class='add'>+	memcpy(wlc-&gt;autocountry_default, ccode, ccode_len);</div><div class='ctx'> </div><div class='ctx'> 	brcms_c_set_country(wlc_cm, wlc_cm-&gt;world_regd);</div><div class='ctx'> </div><div class='hunk'>@@ -445,7 +445,7 @@ brcms_c_channel_reg_limits(struct brcms_cm_info *wlc_cm, u16 chanspec,</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * OFDM 40 MHz SISO has the same power as the corresponding</div><div class='del'>-		 * MCS0-7 rate unless overriden by the locale specific code.</div><div class='add'>+		 * MCS0-7 rate unless overridden by the locale specific code.</div><div class='ctx'> 		 * We set this value to 0 as a flag (presumably 0 dBm isn't</div><div class='ctx'> 		 * a possibility) and then copy the MCS0-7 value to the 40 MHz</div><div class='ctx'> 		 * value if it wasn't explicitly set.</div><div class='hunk'>@@ -479,7 +479,7 @@ brcms_c_channel_reg_limits(struct brcms_cm_info *wlc_cm, u16 chanspec,</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * 20 MHz has the same power as the corresponding OFDM rate</div><div class='del'>-		 * unless overriden by the locale specific code.</div><div class='add'>+		 * unless overridden by the locale specific code.</div><div class='ctx'> 		 */</div><div class='ctx'> 		txpwr-&gt;mcs_20_siso[i] = txpwr-&gt;ofdm[i];</div><div class='ctx'> 		txpwr-&gt;mcs_40_siso[i] = 0;</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.c<br/>index 6d776ef6ff54..81df41c7fbb5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.c</a></div><div class='hunk'>@@ -56,11 +56,6 @@ void brcms_debugfs_detach(struct brcms_pub *drvr)</div><div class='ctx'> 	debugfs_remove_recursive(drvr-&gt;dbgfs_dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dentry *brcms_debugfs_get_devdir(struct brcms_pub *drvr)</div><div class='del'>-{</div><div class='del'>-	return drvr-&gt;dbgfs_dir;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static</div><div class='ctx'> int brcms_debugfs_hardware_read(struct seq_file *s, void *data)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.h<br/>index 56898e6d789d..d30a9fa30f1b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.h</a></div><div class='hunk'>@@ -70,7 +70,6 @@ void brcms_debugfs_init(void);</div><div class='ctx'> void brcms_debugfs_exit(void);</div><div class='ctx'> void brcms_debugfs_attach(struct brcms_pub *drvr);</div><div class='ctx'> void brcms_debugfs_detach(struct brcms_pub *drvr);</div><div class='del'>-struct dentry *brcms_debugfs_get_devdir(struct brcms_pub *drvr);</div><div class='ctx'> void brcms_debugfs_create_files(struct brcms_pub *drvr);</div><div class='ctx'> </div><div class='ctx'> #endif /* _BRCMS_DEBUG_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c<br/>index b7df576bb84d..c739bf7463b3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c</a></div><div class='hunk'>@@ -558,7 +558,7 @@ struct dma_pub *dma_attach(char *name, struct brcms_c_info *wlc,</div><div class='ctx'> 	struct si_info *sii = container_of(sih, struct si_info, pub);</div><div class='ctx'> </div><div class='ctx'> 	/* allocate private info structure */</div><div class='del'>-	di = kzalloc(sizeof(struct dma_info), GFP_ATOMIC);</div><div class='add'>+	di = kzalloc(sizeof(*di), GFP_ATOMIC);</div><div class='ctx'> 	if (di == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -584,8 +584,7 @@ struct dma_pub *dma_attach(char *name, struct brcms_c_info *wlc,</div><div class='ctx'> 		      rxextheadroom, nrxpost, rxoffset, txregbase, rxregbase);</div><div class='ctx'> </div><div class='ctx'> 	/* make a private copy of our callers name */</div><div class='del'>-	strncpy(di-&gt;name, name, MAXNAMEL);</div><div class='del'>-	di-&gt;name[MAXNAMEL - 1] = '\0';</div><div class='add'>+	strscpy(di-&gt;name, name, sizeof(di-&gt;name));</div><div class='ctx'> </div><div class='ctx'> 	di-&gt;dmadev = core-&gt;dma_dev;</div><div class='ctx'> </div><div class='hunk'>@@ -1349,7 +1348,7 @@ static void prep_ampdu_frame(struct dma_info *di, struct sk_buff *p)</div><div class='ctx'> 	ret = brcms_c_ampdu_add_frame(session, p);</div><div class='ctx'> 	if (ret == -ENOSPC) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * AMPDU cannot accomodate this frame. Close out the in-</div><div class='add'>+		 * AMPDU cannot accommodate this frame. Close out the in-</div><div class='ctx'> 		 * progress AMPDU session and start a new one.</div><div class='ctx'> 		 */</div><div class='ctx'> 		ampdu_finalize(di);</div><div class='hunk'>@@ -1427,15 +1426,6 @@ int dma_txfast(struct brcms_c_info *wlc, struct dma_pub *pub,</div><div class='ctx'> 	return -ENOSPC;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void dma_txflush(struct dma_pub *pub)</div><div class='del'>-{</div><div class='del'>-	struct dma_info *di = container_of(pub, struct dma_info, dma);</div><div class='del'>-	struct brcms_ampdu_session *session = &amp;di-&gt;ampdu_session;</div><div class='del'>-</div><div class='del'>-	if (!skb_queue_empty(&amp;session-&gt;skb_list))</div><div class='del'>-		ampdu_finalize(di);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int dma_txpending(struct dma_pub *pub)</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_info *di = container_of(pub, struct dma_info, dma);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.h<br/>index ff5b80b09046..7905fd081721 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.h</a></div><div class='hunk'>@@ -88,7 +88,6 @@ bool dma_txreset(struct dma_pub *pub);</div><div class='ctx'> void dma_txinit(struct dma_pub *pub);</div><div class='ctx'> int dma_txfast(struct brcms_c_info *wlc, struct dma_pub *pub,</div><div class='ctx'> 	       struct sk_buff *p0);</div><div class='del'>-void dma_txflush(struct dma_pub *pub);</div><div class='ctx'> int dma_txpending(struct dma_pub *pub);</div><div class='ctx'> void dma_kick_tx(struct dma_pub *pub);</div><div class='ctx'> void dma_txsuspend(struct dma_pub *pub);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c<br/>index c1b9ac692d26..9540a05247c2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c</a></div><div class='hunk'>@@ -63,9 +63,6 @@ int brcms_led_register(struct brcms_info *wl)</div><div class='ctx'> 	int hwnum = -1;</div><div class='ctx'> 	enum gpio_lookup_flags lflags = GPIO_ACTIVE_HIGH;</div><div class='ctx'> </div><div class='del'>-	if (!bcma_gpio || !gpio_is_valid(bcma_gpio-&gt;base))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='ctx'> 	/* find radio enabled LED */</div><div class='ctx'> 	for (i = 0; i &lt; BRCMS_LED_NO; i++) {</div><div class='ctx'> 		u8 led = *leds[i];</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h<br/>index d65f5c268fd7..2a5cbeb9e783 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h</a></div><div class='hunk'>@@ -24,7 +24,7 @@ struct brcms_led {</div><div class='ctx'> 	struct gpio_desc *gpiod;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BCMA_DRIVER_GPIO</div><div class='add'>+#ifdef CONFIG_BRCMSMAC_LEDS</div><div class='ctx'> void brcms_led_unregister(struct brcms_info *wl);</div><div class='ctx'> int brcms_led_register(struct brcms_info *wl);</div><div class='ctx'> #else</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c<br/>index 39f3af2d0439..aadcff1e2b5d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/bcma/bcma.h&gt;</div><div class='add'>+#include &lt;linux/string_choices.h&gt;</div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='ctx'> #include &lt;defs.h&gt;</div><div class='ctx'> #include "phy/phy_int.h"</div><div class='hunk'>@@ -48,9 +49,9 @@</div><div class='ctx'> 	FIF_BCN_PRBRESP_PROMISC | \</div><div class='ctx'> 	FIF_PSPOLL)</div><div class='ctx'> </div><div class='del'>-#define CHAN2GHZ(channel, freqency, chflags)  { \</div><div class='add'>+#define CHAN2GHZ(channel, frequency, chflags)  { \</div><div class='ctx'> 	.band = NL80211_BAND_2GHZ, \</div><div class='del'>-	.center_freq = (freqency), \</div><div class='add'>+	.center_freq = (frequency), \</div><div class='ctx'> 	.hw_value = (channel), \</div><div class='ctx'> 	.flags = chflags, \</div><div class='ctx'> 	.max_antenna_gain = 0, \</div><div class='hunk'>@@ -457,7 +458,7 @@ static int brcms_ops_start(struct ieee80211_hw *hw)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void brcms_ops_stop(struct ieee80211_hw *hw)</div><div class='add'>+static void brcms_ops_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_info *wl = hw-&gt;priv;</div><div class='ctx'> 	int status;</div><div class='hunk'>@@ -507,7 +508,7 @@ brcms_ops_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> 		brcms_c_start_station(wl-&gt;wlc, vif-&gt;addr);</div><div class='ctx'> 	else if (vif-&gt;type == NL80211_IFTYPE_AP)</div><div class='ctx'> 		brcms_c_start_ap(wl-&gt;wlc, vif-&gt;addr, vif-&gt;bss_conf.bssid,</div><div class='del'>-				 vif-&gt;bss_conf.ssid, vif-&gt;bss_conf.ssid_len);</div><div class='add'>+				 vif-&gt;cfg.ssid, vif-&gt;cfg.ssid_len);</div><div class='ctx'> 	else if (vif-&gt;type == NL80211_IFTYPE_ADHOC)</div><div class='ctx'> 		brcms_c_start_adhoc(wl-&gt;wlc, vif-&gt;addr);</div><div class='ctx'> 	spin_unlock_bh(&amp;wl-&gt;lock);</div><div class='hunk'>@@ -525,7 +526,8 @@ brcms_ops_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> 	spin_unlock_bh(&amp;wl-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int brcms_ops_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+static int brcms_ops_config(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+			    u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_conf *conf = &amp;hw-&gt;conf;</div><div class='ctx'> 	struct brcms_info *wl = hw-&gt;priv;</div><div class='hunk'>@@ -539,13 +541,13 @@ static int brcms_ops_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> 						   conf-&gt;listen_interval);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (changed &amp; IEEE80211_CONF_CHANGE_MONITOR)</div><div class='del'>-		brcms_dbg_info(core, "%s: change monitor mode: %s\n",</div><div class='del'>-			       __func__, conf-&gt;flags &amp; IEEE80211_CONF_MONITOR ?</div><div class='del'>-			       "true" : "false");</div><div class='add'>+		brcms_dbg_info(core, "%s: change monitor mode: %s\n", __func__,</div><div class='add'>+			       str_true_false(conf-&gt;flags &amp;</div><div class='add'>+					      IEEE80211_CONF_MONITOR));</div><div class='ctx'> 	if (changed &amp; IEEE80211_CONF_CHANGE_PS)</div><div class='ctx'> 		brcms_err(core, "%s: change power-save mode: %s (implement)\n",</div><div class='del'>-			  __func__, conf-&gt;flags &amp; IEEE80211_CONF_PS ?</div><div class='del'>-			  "true" : "false");</div><div class='add'>+			  __func__,</div><div class='add'>+			  str_true_false(conf-&gt;flags &amp; IEEE80211_CONF_PS));</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; IEEE80211_CONF_CHANGE_POWER) {</div><div class='ctx'> 		err = brcms_c_set_tx_power(wl-&gt;wlc, conf-&gt;power_level);</div><div class='hunk'>@@ -582,7 +584,7 @@ static int brcms_ops_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> static void</div><div class='ctx'> brcms_ops_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 			struct ieee80211_vif *vif,</div><div class='del'>-			struct ieee80211_bss_conf *info, u32 changed)</div><div class='add'>+			struct ieee80211_bss_conf *info, u64 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_info *wl = hw-&gt;priv;</div><div class='ctx'> 	struct bcma_device *core = wl-&gt;wlc-&gt;hw-&gt;d11core;</div><div class='hunk'>@@ -592,9 +594,9 @@ brcms_ops_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 		 * also implies a change in the AID.</div><div class='ctx'> 		 */</div><div class='ctx'> 		brcms_err(core, "%s: %s: %sassociated\n", KBUILD_MODNAME,</div><div class='del'>-			  __func__, info-&gt;assoc ? "" : "dis");</div><div class='add'>+			  __func__, vif-&gt;cfg.assoc ? "" : "dis");</div><div class='ctx'> 		spin_lock_bh(&amp;wl-&gt;lock);</div><div class='del'>-		brcms_c_associate_upd(wl-&gt;wlc, info-&gt;assoc);</div><div class='add'>+		brcms_c_associate_upd(wl-&gt;wlc, vif-&gt;cfg.assoc);</div><div class='ctx'> 		spin_unlock_bh(&amp;wl-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_ERP_SLOT) {</div><div class='hunk'>@@ -669,7 +671,7 @@ brcms_ops_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_SSID) {</div><div class='ctx'> 		/* BSSID changed, for whatever reason (IBSS and managed mode) */</div><div class='ctx'> 		spin_lock_bh(&amp;wl-&gt;lock);</div><div class='del'>-		brcms_c_set_ssid(wl-&gt;wlc, info-&gt;ssid, info-&gt;ssid_len);</div><div class='add'>+		brcms_c_set_ssid(wl-&gt;wlc, vif-&gt;cfg.ssid, vif-&gt;cfg.ssid_len);</div><div class='ctx'> 		spin_unlock_bh(&amp;wl-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_BEACON) {</div><div class='hunk'>@@ -678,7 +680,7 @@ brcms_ops_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 		u16 tim_offset = 0;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;wl-&gt;lock);</div><div class='del'>-		beacon = ieee80211_beacon_get_tim(hw, vif, &amp;tim_offset, NULL);</div><div class='add'>+		beacon = ieee80211_beacon_get_tim(hw, vif, &amp;tim_offset, NULL, 0);</div><div class='ctx'> 		brcms_c_set_new_beacon(wl-&gt;wlc, beacon, tim_offset,</div><div class='ctx'> 				       info-&gt;dtim_period);</div><div class='ctx'> 		spin_unlock_bh(&amp;wl-&gt;lock);</div><div class='hunk'>@@ -696,7 +698,7 @@ brcms_ops_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_BEACON_ENABLED) {</div><div class='ctx'> 		/* Beaconing should be enabled/disabled (beaconing modes) */</div><div class='ctx'> 		brcms_err(core, "%s: Beacon enabled: %s\n", __func__,</div><div class='del'>-			  info-&gt;enable_beacon ? "true" : "false");</div><div class='add'>+			  str_true_false(info-&gt;enable_beacon));</div><div class='ctx'> 		if (info-&gt;enable_beacon &amp;&amp;</div><div class='ctx'> 		    hw-&gt;wiphy-&gt;flags &amp; WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD) {</div><div class='ctx'> 			brcms_c_enable_probe_resp(wl-&gt;wlc, true);</div><div class='hunk'>@@ -715,13 +717,13 @@ brcms_ops_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_IBSS) {</div><div class='ctx'> 		/* IBSS join status changed */</div><div class='ctx'> 		brcms_err(core, "%s: IBSS joined: %s (implement)\n",</div><div class='del'>-			  __func__, info-&gt;ibss_joined ? "true" : "false");</div><div class='add'>+			  __func__, str_true_false(vif-&gt;cfg.ibss_joined));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_ARP_FILTER) {</div><div class='ctx'> 		/* Hardware ARP filter address list or state changed */</div><div class='ctx'> 		brcms_err(core, "%s: arp filtering: %d addresses"</div><div class='del'>-			  " (implement)\n", __func__, info-&gt;arp_addr_cnt);</div><div class='add'>+			  " (implement)\n", __func__, vif-&gt;cfg.arp_addr_cnt);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_QOS) {</div><div class='hunk'>@@ -730,7 +732,7 @@ brcms_ops_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 		 * Note that it is only ever disabled for station mode.</div><div class='ctx'> 		 */</div><div class='ctx'> 		brcms_err(core, "%s: qos enabled: %s (implement)\n",</div><div class='del'>-			  __func__, info-&gt;qos ? "true" : "false");</div><div class='add'>+			  __func__, str_true_false(info-&gt;qos));</div><div class='ctx'> 	}</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='hunk'>@@ -787,7 +789,8 @@ static void brcms_ops_sw_scan_complete(struct ieee80211_hw *hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-brcms_ops_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue,</div><div class='add'>+brcms_ops_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		  unsigned int link_id, u16 queue,</div><div class='ctx'> 		  const struct ieee80211_tx_queue_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_info *wl = hw-&gt;priv;</div><div class='hunk'>@@ -809,7 +812,6 @@ brcms_ops_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	brcms_c_init_scb(scb);</div><div class='ctx'> </div><div class='ctx'> 	wl-&gt;pub-&gt;global_ampdu = &amp;(scb-&gt;scb_ampdu);</div><div class='del'>-	wl-&gt;pub-&gt;global_ampdu-&gt;scb = scb;</div><div class='ctx'> 	wl-&gt;pub-&gt;global_ampdu-&gt;max_pdu = 16;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -830,7 +832,6 @@ brcms_ops_ampdu_action(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct ieee80211_sta *sta = params-&gt;sta;</div><div class='ctx'> 	enum ieee80211_ampdu_mlme_action action = params-&gt;action;</div><div class='ctx'> 	u16 tid = params-&gt;tid;</div><div class='del'>-	u8 buf_size = params-&gt;buf_size;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(scb-&gt;magic != SCB_MAGIC))</div><div class='ctx'> 		return -EIDRM;</div><div class='hunk'>@@ -862,13 +863,13 @@ brcms_ops_ampdu_action(struct ieee80211_hw *hw,</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * BA window size from ADDBA response ('buf_size') defines how</div><div class='ctx'> 		 * many outstanding MPDUs are allowed for the BA stream by</div><div class='del'>-		 * recipient and traffic class. 'ampdu_factor' gives maximum</div><div class='del'>-		 * AMPDU size.</div><div class='add'>+		 * recipient and traffic class (this is actually unused by the</div><div class='add'>+		 * rest of the driver). 'ampdu_factor' gives maximum AMPDU size.</div><div class='ctx'> 		 */</div><div class='ctx'> 		spin_lock_bh(&amp;wl-&gt;lock);</div><div class='del'>-		brcms_c_ampdu_tx_operational(wl-&gt;wlc, tid, buf_size,</div><div class='add'>+		brcms_c_ampdu_tx_operational(wl-&gt;wlc, tid,</div><div class='ctx'> 			(1 &lt;&lt; (IEEE80211_HT_MAX_AMPDU_FACTOR +</div><div class='del'>-			 sta-&gt;ht_cap.ampdu_factor)) - 1);</div><div class='add'>+			 sta-&gt;deflink.ht_cap.ampdu_factor)) - 1);</div><div class='ctx'> 		spin_unlock_bh(&amp;wl-&gt;lock);</div><div class='ctx'> 		/* Power save wakeup */</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -908,7 +909,7 @@ static void brcms_ops_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	struct brcms_info *wl = hw-&gt;priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	no_printk("%s: drop = %s\n", __func__, drop ? "true" : "false");</div><div class='add'>+	no_printk("%s: drop = %s\n", __func__, str_true_false(drop));</div><div class='ctx'> </div><div class='ctx'> 	ret = wait_event_timeout(wl-&gt;tx_flush_wq,</div><div class='ctx'> 				 brcms_tx_flush_completed(wl),</div><div class='hunk'>@@ -950,7 +951,7 @@ static int brcms_ops_beacon_set_tim(struct ieee80211_hw *hw,</div><div class='ctx'> 	spin_lock_bh(&amp;wl-&gt;lock);</div><div class='ctx'> 	if (wl-&gt;wlc-&gt;vif)</div><div class='ctx'> 		beacon = ieee80211_beacon_get_tim(hw, wl-&gt;wlc-&gt;vif,</div><div class='del'>-						  &amp;tim_offset, NULL);</div><div class='add'>+						  &amp;tim_offset, NULL, 0);</div><div class='ctx'> 	if (beacon)</div><div class='ctx'> 		brcms_c_set_new_beacon(wl-&gt;wlc, beacon, tim_offset,</div><div class='ctx'> 				       wl-&gt;wlc-&gt;vif-&gt;bss_conf.dtim_period);</div><div class='hunk'>@@ -960,7 +961,12 @@ static int brcms_ops_beacon_set_tim(struct ieee80211_hw *hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ieee80211_ops brcms_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.tx = brcms_ops_tx,</div><div class='add'>+	.wake_tx_queue = ieee80211_handle_wake_tx_queue,</div><div class='ctx'> 	.start = brcms_ops_start,</div><div class='ctx'> 	.stop = brcms_ops_stop,</div><div class='ctx'> 	.add_interface = brcms_ops_add_interface,</div><div class='hunk'>@@ -1046,7 +1052,6 @@ static int ieee_hw_rate_init(struct ieee80211_hw *hw)</div><div class='ctx'> 	struct brcms_info *wl = hw-&gt;priv;</div><div class='ctx'> 	struct brcms_c_info *wlc = wl-&gt;wlc;</div><div class='ctx'> 	struct ieee80211_supported_band *band;</div><div class='del'>-	int has_5g = 0;</div><div class='ctx'> 	u16 phy_type;</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;wiphy-&gt;bands[NL80211_BAND_2GHZ] = NULL;</div><div class='hunk'>@@ -1068,7 +1073,6 @@ static int ieee_hw_rate_init(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	/* Assume all bands use the same phy.  True for 11n devices. */</div><div class='ctx'> 	if (wl-&gt;pub-&gt;_nbands &gt; 1) {</div><div class='del'>-		has_5g++;</div><div class='ctx'> 		if (phy_type == PHY_TYPE_N || phy_type == PHY_TYPE_LCN) {</div><div class='ctx'> 			band = &amp;wlc-&gt;bandstate[BAND_5G_INDEX]-&gt;band;</div><div class='ctx'> 			*band = brcms_band_5GHz_nphy_template;</div><div class='hunk'>@@ -1088,6 +1092,7 @@ static int ieee_hw_init(struct ieee80211_hw *hw)</div><div class='ctx'> 	ieee80211_hw_set(hw, AMPDU_AGGREGATION);</div><div class='ctx'> 	ieee80211_hw_set(hw, SIGNAL_DBM);</div><div class='ctx'> 	ieee80211_hw_set(hw, REPORTS_TX_ACK_STATUS);</div><div class='add'>+	ieee80211_hw_set(hw, MFP_CAPABLE);</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;extra_tx_headroom = brcms_c_get_header_len();</div><div class='ctx'> 	hw-&gt;queues = N_TX_QUEUES;</div><div class='hunk'>@@ -1220,6 +1225,7 @@ static int brcms_bcma_probe(struct bcma_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_info *wl;</div><div class='ctx'> 	struct ieee80211_hw *hw;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;pdev-&gt;dev, "mfg %x core %x rev %d class %d irq %d\n",</div><div class='ctx'> 		 pdev-&gt;id.manuf, pdev-&gt;id.id, pdev-&gt;id.rev, pdev-&gt;id.class,</div><div class='hunk'>@@ -1244,11 +1250,16 @@ static int brcms_bcma_probe(struct bcma_device *pdev)</div><div class='ctx'> 	wl = brcms_attach(pdev);</div><div class='ctx'> 	if (!wl) {</div><div class='ctx'> 		pr_err("%s: brcms_attach failed!\n", __func__);</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto err_free_ieee80211;</div><div class='ctx'> 	}</div><div class='ctx'> 	brcms_led_register(wl);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_free_ieee80211:</div><div class='add'>+	ieee80211_free_hw(hw);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int brcms_suspend(struct bcma_device *pdev)</div><div class='hunk'>@@ -1488,7 +1499,7 @@ struct brcms_timer *brcms_init_timer(struct brcms_info *wl,</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_timer *t;</div><div class='ctx'> </div><div class='del'>-	t = kzalloc(sizeof(struct brcms_timer), GFP_ATOMIC);</div><div class='add'>+	t = kzalloc(sizeof(*t), GFP_ATOMIC);</div><div class='ctx'> 	if (!t)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -1602,10 +1613,9 @@ int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf, u32 idx)</div><div class='ctx'> 			if (le32_to_cpu(hdr-&gt;idx) == idx) {</div><div class='ctx'> 				pdata = wl-&gt;fw.fw_bin[i]-&gt;data +</div><div class='ctx'> 					le32_to_cpu(hdr-&gt;offset);</div><div class='del'>-				*pbuf = kvmalloc(len, GFP_KERNEL);</div><div class='add'>+				*pbuf = kvmemdup(pdata, len, GFP_KERNEL);</div><div class='ctx'> 				if (*pbuf == NULL)</div><div class='del'>-					goto fail;</div><div class='del'>-				memcpy(*pbuf, pdata, len);</div><div class='add'>+					return -ENOMEM;</div><div class='ctx'> 				return 0;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1613,7 +1623,6 @@ int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf, u32 idx)</div><div class='ctx'> 	brcms_err(wl-&gt;wlc-&gt;hw-&gt;d11core,</div><div class='ctx'> 		  "ERROR: ucode buf tag:%d can not be found!\n", idx);</div><div class='ctx'> 	*pbuf = NULL;</div><div class='del'>-fail:</div><div class='ctx'> 	return -ENODATA;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c<br/>index 763e0ec583d7..c1a9c1e442ee 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c</a></div><div class='hunk'>@@ -234,12 +234,6 @@</div><div class='ctx'> /* max # tx status to process in wlc_txstatus() */</div><div class='ctx'> #define TXSBND				8</div><div class='ctx'> </div><div class='del'>-/* brcmu_format_flags() bit description structure */</div><div class='del'>-struct brcms_c_bit_desc {</div><div class='del'>-	u32 bit;</div><div class='del'>-	const char *name;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * The following table lists the buffer memory allocated to xmt fifos in HW.</div><div class='ctx'>  * the size is in units of 256bytes(one block), total size is HW dependent</div><div class='hunk'>@@ -463,11 +457,11 @@ static struct brcms_bss_cfg *brcms_c_bsscfg_malloc(uint unit)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_bss_cfg *cfg;</div><div class='ctx'> </div><div class='del'>-	cfg = kzalloc(sizeof(struct brcms_bss_cfg), GFP_ATOMIC);</div><div class='add'>+	cfg = kzalloc(sizeof(*cfg), GFP_ATOMIC);</div><div class='ctx'> 	if (cfg == NULL)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	cfg-&gt;current_bss = kzalloc(sizeof(struct brcms_bss_info), GFP_ATOMIC);</div><div class='add'>+	cfg-&gt;current_bss = kzalloc(sizeof(*cfg-&gt;current_bss), GFP_ATOMIC);</div><div class='ctx'> 	if (cfg-&gt;current_bss == NULL)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='hunk'>@@ -483,14 +477,14 @@ brcms_c_attach_malloc(uint unit, uint *err, uint devid)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_c_info *wlc;</div><div class='ctx'> </div><div class='del'>-	wlc = kzalloc(sizeof(struct brcms_c_info), GFP_ATOMIC);</div><div class='add'>+	wlc = kzalloc(sizeof(*wlc), GFP_ATOMIC);</div><div class='ctx'> 	if (wlc == NULL) {</div><div class='ctx'> 		*err = 1002;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* allocate struct brcms_c_pub state structure */</div><div class='del'>-	wlc-&gt;pub = kzalloc(sizeof(struct brcms_pub), GFP_ATOMIC);</div><div class='add'>+	wlc-&gt;pub = kzalloc(sizeof(*wlc-&gt;pub), GFP_ATOMIC);</div><div class='ctx'> 	if (wlc-&gt;pub == NULL) {</div><div class='ctx'> 		*err = 1003;</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -499,7 +493,7 @@ brcms_c_attach_malloc(uint unit, uint *err, uint devid)</div><div class='ctx'> </div><div class='ctx'> 	/* allocate struct brcms_hardware state structure */</div><div class='ctx'> </div><div class='del'>-	wlc-&gt;hw = kzalloc(sizeof(struct brcms_hardware), GFP_ATOMIC);</div><div class='add'>+	wlc-&gt;hw = kzalloc(sizeof(*wlc-&gt;hw), GFP_ATOMIC);</div><div class='ctx'> 	if (wlc-&gt;hw == NULL) {</div><div class='ctx'> 		*err = 1005;</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -528,7 +522,7 @@ brcms_c_attach_malloc(uint unit, uint *err, uint devid)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wlc-&gt;default_bss = kzalloc(sizeof(struct brcms_bss_info), GFP_ATOMIC);</div><div class='add'>+	wlc-&gt;default_bss = kzalloc(sizeof(*wlc-&gt;default_bss), GFP_ATOMIC);</div><div class='ctx'> 	if (wlc-&gt;default_bss == NULL) {</div><div class='ctx'> 		*err = 1010;</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -540,21 +534,20 @@ brcms_c_attach_malloc(uint unit, uint *err, uint devid)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wlc-&gt;protection = kzalloc(sizeof(struct brcms_protection),</div><div class='del'>-				  GFP_ATOMIC);</div><div class='add'>+	wlc-&gt;protection = kzalloc(sizeof(*wlc-&gt;protection), GFP_ATOMIC);</div><div class='ctx'> 	if (wlc-&gt;protection == NULL) {</div><div class='ctx'> 		*err = 1016;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wlc-&gt;stf = kzalloc(sizeof(struct brcms_stf), GFP_ATOMIC);</div><div class='add'>+	wlc-&gt;stf = kzalloc(sizeof(*wlc-&gt;stf), GFP_ATOMIC);</div><div class='ctx'> 	if (wlc-&gt;stf == NULL) {</div><div class='ctx'> 		*err = 1017;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wlc-&gt;bandstate[0] =</div><div class='del'>-		kcalloc(MAXBANDS, sizeof(struct brcms_band), GFP_ATOMIC);</div><div class='add'>+		kcalloc(MAXBANDS, sizeof(*wlc-&gt;bandstate[0]), GFP_ATOMIC);</div><div class='ctx'> 	if (wlc-&gt;bandstate[0] == NULL) {</div><div class='ctx'> 		*err = 1025;</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -567,14 +560,14 @@ brcms_c_attach_malloc(uint unit, uint *err, uint devid)</div><div class='ctx'> 				+ (sizeof(struct brcms_band)*i));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wlc-&gt;corestate = kzalloc(sizeof(struct brcms_core), GFP_ATOMIC);</div><div class='add'>+	wlc-&gt;corestate = kzalloc(sizeof(*wlc-&gt;corestate), GFP_ATOMIC);</div><div class='ctx'> 	if (wlc-&gt;corestate == NULL) {</div><div class='ctx'> 		*err = 1026;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wlc-&gt;corestate-&gt;macstat_snapshot =</div><div class='del'>-		kzalloc(sizeof(struct macstat), GFP_ATOMIC);</div><div class='add'>+		kzalloc(sizeof(*wlc-&gt;corestate-&gt;macstat_snapshot), GFP_ATOMIC);</div><div class='ctx'> 	if (wlc-&gt;corestate-&gt;macstat_snapshot == NULL) {</div><div class='ctx'> 		*err = 1027;</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -704,7 +697,7 @@ static void brcms_c_write_inits(struct brcms_hardware *wlc_hw,</div><div class='ctx'> static void brcms_c_write_mhf(struct brcms_hardware *wlc_hw, u16 *mhfs)</div><div class='ctx'> {</div><div class='ctx'> 	u8 idx;</div><div class='del'>-	u16 addr[] = {</div><div class='add'>+	static const u16 addr[] = {</div><div class='ctx'> 		M_HOST_FLAGS1, M_HOST_FLAGS2, M_HOST_FLAGS3, M_HOST_FLAGS4,</div><div class='ctx'> 		M_HOST_FLAGS5</div><div class='ctx'> 	};</div><div class='hunk'>@@ -928,7 +921,7 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs)</div><div class='ctx'> 		 * The "fallback limit" is the number of tx attempts a given</div><div class='ctx'> 		 * MPDU is sent at the "primary" rate. Tx attempts beyond that</div><div class='ctx'> 		 * limit are sent at the "secondary" rate.</div><div class='del'>-		 * A 'short frame' does not exceed RTS treshold.</div><div class='add'>+		 * A 'short frame' does not exceed RTS threshold.</div><div class='ctx'> 		 */</div><div class='ctx'> 		u16 sfbl,	/* Short Frame Rate Fallback Limit */</div><div class='ctx'> 		    lfbl,	/* Long Frame Rate Fallback Limit */</div><div class='hunk'>@@ -3147,10 +3140,8 @@ void brcms_c_init_scb(struct scb *scb)</div><div class='ctx'> 	scb-&gt;flags = SCB_WMECAP | SCB_HTCAP;</div><div class='ctx'> 	for (i = 0; i &lt; NUMPRIO; i++) {</div><div class='ctx'> 		scb-&gt;seqnum[i] = 0;</div><div class='del'>-		scb-&gt;seqctl[i] = 0xFFFF;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	scb-&gt;seqctl_nonqos = 0xFFFF;</div><div class='ctx'> 	scb-&gt;magic = SCB_MAGIC;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3800,7 +3791,7 @@ static void brcms_b_set_shortslot(struct brcms_hardware *wlc_hw, bool shortslot)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Suspend the the MAC and update the slot timing</div><div class='add'>+ * Suspend the MAC and update the slot timing</div><div class='ctx'>  * for standard 11b/g (20us slots) or shortslot 11g (9us slots).</div><div class='ctx'>  */</div><div class='ctx'> static void brcms_c_switch_shortslot(struct brcms_c_info *wlc, bool shortslot)</div><div class='hunk'>@@ -5553,8 +5544,8 @@ int brcms_c_module_register(struct brcms_pub *pub,</div><div class='ctx'> 	/* find an empty entry and just add, no duplication check! */</div><div class='ctx'> 	for (i = 0; i &lt; BRCMS_MAXMODULES; i++) {</div><div class='ctx'> 		if (wlc-&gt;modulecb[i].name[0] == '\0') {</div><div class='del'>-			strncpy(wlc-&gt;modulecb[i].name, name,</div><div class='del'>-				sizeof(wlc-&gt;modulecb[i].name) - 1);</div><div class='add'>+			strscpy(wlc-&gt;modulecb[i].name, name,</div><div class='add'>+				sizeof(wlc-&gt;modulecb[i].name));</div><div class='ctx'> 			wlc-&gt;modulecb[i].hdl = hdl;</div><div class='ctx'> 			wlc-&gt;modulecb[i].down_fn = d_fn;</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -6268,7 +6259,7 @@ brcms_c_d11hdrs_mac80211(struct brcms_c_info *wlc, struct ieee80211_hw *hw,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Currently only support same setting for primay and</div><div class='add'>+		 * Currently only support same setting for primary and</div><div class='ctx'> 		 * fallback rates. Unify flags for each rate into a</div><div class='ctx'> 		 * single value for the frame</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -6607,7 +6598,8 @@ brcms_c_d11hdrs_mac80211(struct brcms_c_info *wlc, struct ieee80211_hw *hw,</div><div class='ctx'> 			rts-&gt;frame_control = cpu_to_le16(IEEE80211_FTYPE_CTL |</div><div class='ctx'> 							 IEEE80211_STYPE_RTS);</div><div class='ctx'> </div><div class='del'>-			memcpy(&amp;rts-&gt;ra, &amp;h-&gt;addr1, 2 * ETH_ALEN);</div><div class='add'>+			memcpy(&amp;rts-&gt;ra, &amp;h-&gt;addr1, ETH_ALEN);</div><div class='add'>+			memcpy(&amp;rts-&gt;ta, &amp;h-&gt;addr2, ETH_ALEN);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* mainrate</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.h<br/>index 9f76b880814e..b7ca0d9891c4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.h</a></div><div class='hunk'>@@ -603,7 +603,7 @@ enum brcms_bss_type {</div><div class='ctx'>  * cur_etheraddr: h/w address</div><div class='ctx'>  * flags: BSSCFG flags; see below</div><div class='ctx'>  *</div><div class='del'>- * current_bss: BSS parms in ASSOCIATED state</div><div class='add'>+ * current_bss: BSS parameters in ASSOCIATED state</div><div class='ctx'>  *</div><div class='ctx'>  *</div><div class='ctx'>  * ID: 'unique' ID of this bsscfg, assigned at bsscfg allocation</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c<br/>index ccc621b8ed9f..ce6ce2dea39c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c</a></div><div class='hunk'>@@ -127,23 +127,6 @@ void wlc_phyreg_exit(struct brcms_phy_pub *pih)</div><div class='ctx'> 	wlapi_bmac_ucode_wake_override_phyreg_clear(pi-&gt;sh-&gt;physhim);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void wlc_radioreg_enter(struct brcms_phy_pub *pih)</div><div class='del'>-{</div><div class='del'>-	struct brcms_phy *pi = container_of(pih, struct brcms_phy, pubpi_ro);</div><div class='del'>-	wlapi_bmac_mctrl(pi-&gt;sh-&gt;physhim, MCTL_LOCK_RADIO, MCTL_LOCK_RADIO);</div><div class='del'>-</div><div class='del'>-	udelay(10);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void wlc_radioreg_exit(struct brcms_phy_pub *pih)</div><div class='del'>-{</div><div class='del'>-	struct brcms_phy *pi = container_of(pih, struct brcms_phy, pubpi_ro);</div><div class='del'>-</div><div class='del'>-	(void)bcma_read16(pi-&gt;d11core, D11REGOFFS(phyversion));</div><div class='del'>-	pi-&gt;phy_wreg = 0;</div><div class='del'>-	wlapi_bmac_mctrl(pi-&gt;sh-&gt;physhim, MCTL_LOCK_RADIO, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> u16 read_radio_reg(struct brcms_phy *pi, u16 addr)</div><div class='ctx'> {</div><div class='ctx'> 	u16 data;</div><div class='hunk'>@@ -263,11 +246,6 @@ void mod_radio_reg(struct brcms_phy *pi, u16 addr, u16 mask, u16 val)</div><div class='ctx'> 	write_radio_reg(pi, addr, (rval &amp; ~mask) | (val &amp; mask));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void write_phy_channel_reg(struct brcms_phy *pi, uint val)</div><div class='del'>-{</div><div class='del'>-	bcma_write16(pi-&gt;d11core, D11REGOFFS(phychannel), val);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> u16 read_phy_reg(struct brcms_phy *pi, u16 addr)</div><div class='ctx'> {</div><div class='ctx'> 	bcma_wflush16(pi-&gt;d11core, D11REGOFFS(phyregaddr), addr);</div><div class='hunk'>@@ -355,7 +333,7 @@ struct shared_phy *wlc_phy_shared_attach(struct shared_phy_params *shp)</div><div class='ctx'> {</div><div class='ctx'> 	struct shared_phy *sh;</div><div class='ctx'> </div><div class='del'>-	sh = kzalloc(sizeof(struct shared_phy), GFP_ATOMIC);</div><div class='add'>+	sh = kzalloc(sizeof(*sh), GFP_ATOMIC);</div><div class='ctx'> 	if (sh == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -383,8 +361,9 @@ struct shared_phy *wlc_phy_shared_attach(struct shared_phy_params *shp)</div><div class='ctx'> 	return sh;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wlc_phy_timercb_phycal(struct brcms_phy *pi)</div><div class='add'>+static void wlc_phy_timercb_phycal(void *ptr)</div><div class='ctx'> {</div><div class='add'>+	struct brcms_phy *pi = ptr;</div><div class='ctx'> 	uint delay = 5;</div><div class='ctx'> </div><div class='ctx'> 	if (PHY_PERICAL_MPHASE_PENDING(pi)) {</div><div class='hunk'>@@ -441,7 +420,7 @@ wlc_phy_attach(struct shared_phy *sh, struct bcma_device *d11core,</div><div class='ctx'> 		return &amp;pi-&gt;pubpi_ro;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pi = kzalloc(sizeof(struct brcms_phy), GFP_ATOMIC);</div><div class='add'>+	pi = kzalloc(sizeof(*pi), GFP_ATOMIC);</div><div class='ctx'> 	if (pi == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	pi-&gt;wiphy = wiphy;</div><div class='hunk'>@@ -551,8 +530,7 @@ wlc_phy_attach(struct shared_phy *sh, struct bcma_device *d11core,</div><div class='ctx'> 		if (!pi-&gt;phycal_timer)</div><div class='ctx'> 			goto err;</div><div class='ctx'> </div><div class='del'>-		if (!wlc_phy_attach_nphy(pi))</div><div class='del'>-			goto err;</div><div class='add'>+		wlc_phy_attach_nphy(pi);</div><div class='ctx'> </div><div class='ctx'> 	} else if (ISLCNPHY(pi)) {</div><div class='ctx'> 		if (!wlc_phy_attach_lcnphy(pi))</div><div class='hunk'>@@ -692,18 +670,6 @@ void wlc_phy_por_inform(struct brcms_phy_pub *ppi)</div><div class='ctx'> 	pi-&gt;phy_init_por = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void wlc_phy_edcrs_lock(struct brcms_phy_pub *pih, bool lock)</div><div class='del'>-{</div><div class='del'>-	struct brcms_phy *pi = container_of(pih, struct brcms_phy, pubpi_ro);</div><div class='del'>-</div><div class='del'>-	pi-&gt;edcrs_threshold_lock = lock;</div><div class='del'>-</div><div class='del'>-	write_phy_reg(pi, 0x22c, 0x46b);</div><div class='del'>-	write_phy_reg(pi, 0x22d, 0x46b);</div><div class='del'>-	write_phy_reg(pi, 0x22e, 0x3c0);</div><div class='del'>-	write_phy_reg(pi, 0x22f, 0x3c0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void wlc_phy_initcal_enable(struct brcms_phy_pub *pih, bool initcal)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_phy *pi = container_of(pih, struct brcms_phy, pubpi_ro);</div><div class='hunk'>@@ -1083,20 +1049,6 @@ void wlc_phy_mute_upd(struct brcms_phy_pub *pih, bool mute, u32 flags)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void wlc_phy_clear_tssi(struct brcms_phy_pub *pih)</div><div class='del'>-{</div><div class='del'>-	struct brcms_phy *pi = container_of(pih, struct brcms_phy, pubpi_ro);</div><div class='del'>-</div><div class='del'>-	if (ISNPHY(pi)) {</div><div class='del'>-		return;</div><div class='del'>-	} else {</div><div class='del'>-		wlapi_bmac_write_shm(pi-&gt;sh-&gt;physhim, M_B_TSSI_0, NULL_TSSI_W);</div><div class='del'>-		wlapi_bmac_write_shm(pi-&gt;sh-&gt;physhim, M_B_TSSI_1, NULL_TSSI_W);</div><div class='del'>-		wlapi_bmac_write_shm(pi-&gt;sh-&gt;physhim, M_G_TSSI_0, NULL_TSSI_W);</div><div class='del'>-		wlapi_bmac_write_shm(pi-&gt;sh-&gt;physhim, M_G_TSSI_1, NULL_TSSI_W);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool wlc_phy_cal_txpower_recalc_sw(struct brcms_phy *pi)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -1136,13 +1088,6 @@ void wlc_phy_switch_radio(struct brcms_phy_pub *pih, bool on)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 wlc_phy_bw_state_get(struct brcms_phy_pub *ppi)</div><div class='del'>-{</div><div class='del'>-	struct brcms_phy *pi = container_of(ppi, struct brcms_phy, pubpi_ro);</div><div class='del'>-</div><div class='del'>-	return pi-&gt;bw;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void wlc_phy_bw_state_set(struct brcms_phy_pub *ppi, u16 bw)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_phy *pi = container_of(ppi, struct brcms_phy, pubpi_ro);</div><div class='hunk'>@@ -1182,36 +1127,6 @@ void wlc_phy_chanspec_set(struct brcms_phy_pub *ppi, u16 chanspec)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wlc_phy_chanspec_freq2bandrange_lpssn(uint freq)</div><div class='del'>-{</div><div class='del'>-	int range = -1;</div><div class='del'>-</div><div class='del'>-	if (freq &lt; 2500)</div><div class='del'>-		range = WL_CHAN_FREQ_RANGE_2G;</div><div class='del'>-	else if (freq &lt;= 5320)</div><div class='del'>-		range = WL_CHAN_FREQ_RANGE_5GL;</div><div class='del'>-	else if (freq &lt;= 5700)</div><div class='del'>-		range = WL_CHAN_FREQ_RANGE_5GM;</div><div class='del'>-	else</div><div class='del'>-		range = WL_CHAN_FREQ_RANGE_5GH;</div><div class='del'>-</div><div class='del'>-	return range;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int wlc_phy_chanspec_bandrange_get(struct brcms_phy *pi, u16 chanspec)</div><div class='del'>-{</div><div class='del'>-	int range = -1;</div><div class='del'>-	uint channel = CHSPEC_CHANNEL(chanspec);</div><div class='del'>-	uint freq = wlc_phy_channel2freq(channel);</div><div class='del'>-</div><div class='del'>-	if (ISNPHY(pi))</div><div class='del'>-		range = wlc_phy_get_chan_freq_range_nphy(pi, channel);</div><div class='del'>-	else if (ISLCNPHY(pi))</div><div class='del'>-		range = wlc_phy_chanspec_freq2bandrange_lpssn(freq);</div><div class='del'>-</div><div class='del'>-	return range;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void wlc_phy_chanspec_ch14_widefilter_set(struct brcms_phy_pub *ppi,</div><div class='ctx'> 					  bool wide_filter)</div><div class='ctx'> {</div><div class='hunk'>@@ -1254,50 +1169,6 @@ wlc_phy_chanspec_band_validch(struct brcms_phy_pub *ppi, uint band,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 wlc_phy_chanspec_band_firstch(struct brcms_phy_pub *ppi, uint band)</div><div class='del'>-{</div><div class='del'>-	struct brcms_phy *pi = container_of(ppi, struct brcms_phy, pubpi_ro);</div><div class='del'>-	uint i;</div><div class='del'>-	uint channel;</div><div class='del'>-	u16 chspec;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(chan_info_all); i++) {</div><div class='del'>-		channel = chan_info_all[i].chan;</div><div class='del'>-</div><div class='del'>-		if (ISNPHY(pi) &amp;&amp; pi-&gt;bw == WL_CHANSPEC_BW_40) {</div><div class='del'>-			uint j;</div><div class='del'>-</div><div class='del'>-			for (j = 0; j &lt; ARRAY_SIZE(chan_info_all); j++) {</div><div class='del'>-				if (chan_info_all[j].chan ==</div><div class='del'>-				    channel + CH_10MHZ_APART)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (j == ARRAY_SIZE(chan_info_all))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			channel = upper_20_sb(channel);</div><div class='del'>-			chspec =  channel | WL_CHANSPEC_BW_40 |</div><div class='del'>-				  WL_CHANSPEC_CTL_SB_LOWER;</div><div class='del'>-			if (band == BRCM_BAND_2G)</div><div class='del'>-				chspec |= WL_CHANSPEC_BAND_2G;</div><div class='del'>-			else</div><div class='del'>-				chspec |= WL_CHANSPEC_BAND_5G;</div><div class='del'>-		} else</div><div class='del'>-			chspec = ch20mhz_chspec(channel);</div><div class='del'>-</div><div class='del'>-		if ((pi-&gt;a_band_high_disable) &amp;&amp; (channel &gt;= FIRST_REF5_CHANNUM)</div><div class='del'>-		    &amp;&amp; (channel &lt;= LAST_REF5_CHANNUM))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if ((band == BRCM_BAND_2G &amp;&amp; channel &lt;= CH_MAX_2G_CHANNEL) ||</div><div class='del'>-		    (band == BRCM_BAND_5G &amp;&amp; channel &gt; CH_MAX_2G_CHANNEL))</div><div class='del'>-			return chspec;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (u16) INVCHANSPEC;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int wlc_phy_txpower_get(struct brcms_phy_pub *ppi, uint *qdbm, bool *override)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_phy *pi = container_of(ppi, struct brcms_phy, pubpi_ro);</div><div class='hunk'>@@ -1308,56 +1179,6 @@ int wlc_phy_txpower_get(struct brcms_phy_pub *ppi, uint *qdbm, bool *override)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void wlc_phy_txpower_target_set(struct brcms_phy_pub *ppi,</div><div class='del'>-				struct txpwr_limits *txpwr)</div><div class='del'>-{</div><div class='del'>-	bool mac_enabled = false;</div><div class='del'>-	struct brcms_phy *pi = container_of(ppi, struct brcms_phy, pubpi_ro);</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;pi-&gt;tx_user_target[TXP_FIRST_CCK],</div><div class='del'>-	       &amp;txpwr-&gt;cck[0], BRCMS_NUM_RATES_CCK);</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;pi-&gt;tx_user_target[TXP_FIRST_OFDM],</div><div class='del'>-	       &amp;txpwr-&gt;ofdm[0], BRCMS_NUM_RATES_OFDM);</div><div class='del'>-	memcpy(&amp;pi-&gt;tx_user_target[TXP_FIRST_OFDM_20_CDD],</div><div class='del'>-	       &amp;txpwr-&gt;ofdm_cdd[0], BRCMS_NUM_RATES_OFDM);</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;pi-&gt;tx_user_target[TXP_FIRST_OFDM_40_SISO],</div><div class='del'>-	       &amp;txpwr-&gt;ofdm_40_siso[0], BRCMS_NUM_RATES_OFDM);</div><div class='del'>-	memcpy(&amp;pi-&gt;tx_user_target[TXP_FIRST_OFDM_40_CDD],</div><div class='del'>-	       &amp;txpwr-&gt;ofdm_40_cdd[0], BRCMS_NUM_RATES_OFDM);</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;pi-&gt;tx_user_target[TXP_FIRST_MCS_20_SISO],</div><div class='del'>-	       &amp;txpwr-&gt;mcs_20_siso[0], BRCMS_NUM_RATES_MCS_1_STREAM);</div><div class='del'>-	memcpy(&amp;pi-&gt;tx_user_target[TXP_FIRST_MCS_20_CDD],</div><div class='del'>-	       &amp;txpwr-&gt;mcs_20_cdd[0], BRCMS_NUM_RATES_MCS_1_STREAM);</div><div class='del'>-	memcpy(&amp;pi-&gt;tx_user_target[TXP_FIRST_MCS_20_STBC],</div><div class='del'>-	       &amp;txpwr-&gt;mcs_20_stbc[0], BRCMS_NUM_RATES_MCS_1_STREAM);</div><div class='del'>-	memcpy(&amp;pi-&gt;tx_user_target[TXP_FIRST_MCS_20_SDM],</div><div class='del'>-	       &amp;txpwr-&gt;mcs_20_mimo[0], BRCMS_NUM_RATES_MCS_2_STREAM);</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;pi-&gt;tx_user_target[TXP_FIRST_MCS_40_SISO],</div><div class='del'>-	       &amp;txpwr-&gt;mcs_40_siso[0], BRCMS_NUM_RATES_MCS_1_STREAM);</div><div class='del'>-	memcpy(&amp;pi-&gt;tx_user_target[TXP_FIRST_MCS_40_CDD],</div><div class='del'>-	       &amp;txpwr-&gt;mcs_40_cdd[0], BRCMS_NUM_RATES_MCS_1_STREAM);</div><div class='del'>-	memcpy(&amp;pi-&gt;tx_user_target[TXP_FIRST_MCS_40_STBC],</div><div class='del'>-	       &amp;txpwr-&gt;mcs_40_stbc[0], BRCMS_NUM_RATES_MCS_1_STREAM);</div><div class='del'>-	memcpy(&amp;pi-&gt;tx_user_target[TXP_FIRST_MCS_40_SDM],</div><div class='del'>-	       &amp;txpwr-&gt;mcs_40_mimo[0], BRCMS_NUM_RATES_MCS_2_STREAM);</div><div class='del'>-</div><div class='del'>-	if (bcma_read32(pi-&gt;d11core, D11REGOFFS(maccontrol)) &amp; MCTL_EN_MAC)</div><div class='del'>-		mac_enabled = true;</div><div class='del'>-</div><div class='del'>-	if (mac_enabled)</div><div class='del'>-		wlapi_suspend_mac_and_wait(pi-&gt;sh-&gt;physhim);</div><div class='del'>-</div><div class='del'>-	wlc_phy_txpower_recalc_target(pi);</div><div class='del'>-	wlc_phy_cal_txpower_recalc_sw(pi);</div><div class='del'>-</div><div class='del'>-	if (mac_enabled)</div><div class='del'>-		wlapi_enable_mac(pi-&gt;sh-&gt;physhim);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int wlc_phy_txpower_set(struct brcms_phy_pub *ppi, uint qdbm, bool override)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_phy *pi = container_of(ppi, struct brcms_phy, pubpi_ro);</div><div class='hunk'>@@ -1441,59 +1262,6 @@ wlc_phy_txpower_sromlimit(struct brcms_phy_pub *ppi, uint channel, u8 *min_pwr,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void</div><div class='del'>-wlc_phy_txpower_sromlimit_max_get(struct brcms_phy_pub *ppi, uint chan,</div><div class='del'>-				  u8 *max_txpwr, u8 *min_txpwr)</div><div class='del'>-{</div><div class='del'>-	struct brcms_phy *pi = container_of(ppi, struct brcms_phy, pubpi_ro);</div><div class='del'>-	u8 tx_pwr_max = 0;</div><div class='del'>-	u8 tx_pwr_min = 255;</div><div class='del'>-	u8 max_num_rate;</div><div class='del'>-	u8 maxtxpwr, mintxpwr, rate, pactrl;</div><div class='del'>-</div><div class='del'>-	pactrl = 0;</div><div class='del'>-</div><div class='del'>-	max_num_rate = ISNPHY(pi) ? TXP_NUM_RATES :</div><div class='del'>-		       ISLCNPHY(pi) ? (TXP_LAST_SISO_MCS_20 +</div><div class='del'>-				       1) : (TXP_LAST_OFDM + 1);</div><div class='del'>-</div><div class='del'>-	for (rate = 0; rate &lt; max_num_rate; rate++) {</div><div class='del'>-</div><div class='del'>-		wlc_phy_txpower_sromlimit(ppi, chan, &amp;mintxpwr, &amp;maxtxpwr,</div><div class='del'>-					  rate);</div><div class='del'>-</div><div class='del'>-		maxtxpwr = (maxtxpwr &gt; pactrl) ? (maxtxpwr - pactrl) : 0;</div><div class='del'>-</div><div class='del'>-		maxtxpwr = (maxtxpwr &gt; 6) ? (maxtxpwr - 6) : 0;</div><div class='del'>-</div><div class='del'>-		tx_pwr_max = max(tx_pwr_max, maxtxpwr);</div><div class='del'>-		tx_pwr_min = min(tx_pwr_min, maxtxpwr);</div><div class='del'>-	}</div><div class='del'>-	*max_txpwr = tx_pwr_max;</div><div class='del'>-	*min_txpwr = tx_pwr_min;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-wlc_phy_txpower_boardlimit_band(struct brcms_phy_pub *ppi, uint bandunit,</div><div class='del'>-				s32 *max_pwr, s32 *min_pwr, u32 *step_pwr)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u8 wlc_phy_txpower_get_target_min(struct brcms_phy_pub *ppi)</div><div class='del'>-{</div><div class='del'>-	struct brcms_phy *pi = container_of(ppi, struct brcms_phy, pubpi_ro);</div><div class='del'>-</div><div class='del'>-	return pi-&gt;tx_power_min;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u8 wlc_phy_txpower_get_target_max(struct brcms_phy_pub *ppi)</div><div class='del'>-{</div><div class='del'>-	struct brcms_phy *pi = container_of(ppi, struct brcms_phy, pubpi_ro);</div><div class='del'>-</div><div class='del'>-	return pi-&gt;tx_power_max;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static s8 wlc_phy_env_measure_vbat(struct brcms_phy *pi)</div><div class='ctx'> {</div><div class='ctx'> 	if (ISLCNPHY(pi))</div><div class='hunk'>@@ -1797,13 +1565,6 @@ wlc_phy_txpower_reg_limit_calc(struct brcms_phy *pi, struct txpwr_limits *txpwr,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void wlc_phy_txpwr_percent_set(struct brcms_phy_pub *ppi, u8 txpwr_percent)</div><div class='del'>-{</div><div class='del'>-	struct brcms_phy *pi = container_of(ppi, struct brcms_phy, pubpi_ro);</div><div class='del'>-</div><div class='del'>-	pi-&gt;txpwr_percent = txpwr_percent;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void wlc_phy_machwcap_set(struct brcms_phy_pub *ppi, u32 machwcap)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_phy *pi = container_of(ppi, struct brcms_phy, pubpi_ro);</div><div class='hunk'>@@ -1811,35 +1572,6 @@ void wlc_phy_machwcap_set(struct brcms_phy_pub *ppi, u32 machwcap)</div><div class='ctx'> 	pi-&gt;sh-&gt;machwcap = machwcap;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void wlc_phy_runbist_config(struct brcms_phy_pub *ppi, bool start_end)</div><div class='del'>-{</div><div class='del'>-	struct brcms_phy *pi = container_of(ppi, struct brcms_phy, pubpi_ro);</div><div class='del'>-	u16 rxc;</div><div class='del'>-	rxc = 0;</div><div class='del'>-</div><div class='del'>-	if (start_end == ON) {</div><div class='del'>-		if (!ISNPHY(pi))</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		if (NREV_IS(pi-&gt;pubpi.phy_rev, 3)</div><div class='del'>-		    || NREV_IS(pi-&gt;pubpi.phy_rev, 4)) {</div><div class='del'>-			bcma_wflush16(pi-&gt;d11core, D11REGOFFS(phyregaddr),</div><div class='del'>-				      0xa0);</div><div class='del'>-			bcma_set16(pi-&gt;d11core, D11REGOFFS(phyregdata),</div><div class='del'>-				   0x1 &lt;&lt; 15);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (NREV_IS(pi-&gt;pubpi.phy_rev, 3)</div><div class='del'>-		    || NREV_IS(pi-&gt;pubpi.phy_rev, 4)) {</div><div class='del'>-			bcma_wflush16(pi-&gt;d11core, D11REGOFFS(phyregaddr),</div><div class='del'>-				      0xa0);</div><div class='del'>-			bcma_write16(pi-&gt;d11core, D11REGOFFS(phyregdata), rxc);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		wlc_phy_por_inform(ppi);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void</div><div class='ctx'> wlc_phy_txpower_limit_set(struct brcms_phy_pub *ppi, struct txpwr_limits *txpwr,</div><div class='ctx'> 			  u16 chanspec)</div><div class='hunk'>@@ -1940,37 +1672,6 @@ bool wlc_phy_txpower_hw_ctrl_get(struct brcms_phy_pub *ppi)</div><div class='ctx'> 		return pi-&gt;hwpwrctrl;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void wlc_phy_txpower_hw_ctrl_set(struct brcms_phy_pub *ppi, bool hwpwrctrl)</div><div class='del'>-{</div><div class='del'>-	struct brcms_phy *pi = container_of(ppi, struct brcms_phy, pubpi_ro);</div><div class='del'>-	bool suspend;</div><div class='del'>-</div><div class='del'>-	if (!pi-&gt;hwpwrctrl_capable)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	pi-&gt;hwpwrctrl = hwpwrctrl;</div><div class='del'>-	pi-&gt;nphy_txpwrctrl = hwpwrctrl;</div><div class='del'>-	pi-&gt;txpwrctrl = hwpwrctrl;</div><div class='del'>-</div><div class='del'>-	if (ISNPHY(pi)) {</div><div class='del'>-		suspend = (0 == (bcma_read32(pi-&gt;d11core,</div><div class='del'>-					     D11REGOFFS(maccontrol)) &amp;</div><div class='del'>-				 MCTL_EN_MAC));</div><div class='del'>-		if (!suspend)</div><div class='del'>-			wlapi_suspend_mac_and_wait(pi-&gt;sh-&gt;physhim);</div><div class='del'>-</div><div class='del'>-		wlc_phy_txpwrctrl_enable_nphy(pi, pi-&gt;nphy_txpwrctrl);</div><div class='del'>-		if (pi-&gt;nphy_txpwrctrl == PHY_TPC_HW_OFF)</div><div class='del'>-			wlc_phy_txpwr_fixpower_nphy(pi);</div><div class='del'>-		else</div><div class='del'>-			mod_phy_reg(pi, 0x1e7, (0x7f &lt;&lt; 0),</div><div class='del'>-				    pi-&gt;saved_txpwr_idx);</div><div class='del'>-</div><div class='del'>-		if (!suspend)</div><div class='del'>-			wlapi_enable_mac(pi-&gt;sh-&gt;physhim);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void wlc_phy_txpower_ipa_upd(struct brcms_phy *pi)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='hunk'>@@ -2128,13 +1829,6 @@ void wlc_phy_antsel_type_set(struct brcms_phy_pub *ppi, u8 antsel_type)</div><div class='ctx'> 	pi-&gt;antsel_type = antsel_type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool wlc_phy_test_ison(struct brcms_phy_pub *ppi)</div><div class='del'>-{</div><div class='del'>-	struct brcms_phy *pi = container_of(ppi, struct brcms_phy, pubpi_ro);</div><div class='del'>-</div><div class='del'>-	return pi-&gt;phytest_on;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void wlc_phy_ant_rxdiv_set(struct brcms_phy_pub *ppi, u8 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_phy *pi = container_of(ppi, struct brcms_phy, pubpi_ro);</div><div class='hunk'>@@ -2448,15 +2142,6 @@ done:</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void wlc_phy_noise_sample_request_external(struct brcms_phy_pub *pih)</div><div class='del'>-{</div><div class='del'>-	u8 channel;</div><div class='del'>-</div><div class='del'>-	channel = CHSPEC_CHANNEL(wlc_phy_chanspec_get(pih));</div><div class='del'>-</div><div class='del'>-	wlc_phy_noise_sample_request(pih, PHY_NOISE_SAMPLE_EXTERNAL, channel);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const s8 lcnphy_gain_index_offset_for_pkt_rssi[] = {</div><div class='ctx'> 	8,</div><div class='ctx'> 	8,</div><div class='hunk'>@@ -2555,27 +2240,6 @@ end:</div><div class='ctx'> 	return rssi;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void wlc_phy_freqtrack_start(struct brcms_phy_pub *pih)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void wlc_phy_freqtrack_end(struct brcms_phy_pub *pih)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void wlc_phy_set_deaf(struct brcms_phy_pub *ppi, bool user_flag)</div><div class='del'>-{</div><div class='del'>-	struct brcms_phy *pi;</div><div class='del'>-	pi = (struct brcms_phy *) ppi;</div><div class='del'>-</div><div class='del'>-	if (ISLCNPHY(pi))</div><div class='del'>-		wlc_lcnphy_deaf_mode(pi, true);</div><div class='del'>-	else if (ISNPHY(pi))</div><div class='del'>-		wlc_nphy_deaf_mode(pi, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void wlc_phy_watchdog(struct brcms_phy_pub *pih)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_phy *pi = container_of(pih, struct brcms_phy, pubpi_ro);</div><div class='hunk'>@@ -2636,28 +2300,6 @@ void wlc_phy_watchdog(struct brcms_phy_pub *pih)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void wlc_phy_BSSinit(struct brcms_phy_pub *pih, bool bonlyap, int rssi)</div><div class='del'>-{</div><div class='del'>-	struct brcms_phy *pi = container_of(pih, struct brcms_phy, pubpi_ro);</div><div class='del'>-	uint i;</div><div class='del'>-	uint k;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MA_WINDOW_SZ; i++)</div><div class='del'>-		pi-&gt;sh-&gt;phy_noise_window[i] = (s8) (rssi &amp; 0xff);</div><div class='del'>-	if (ISLCNPHY(pi)) {</div><div class='del'>-		for (i = 0; i &lt; MA_WINDOW_SZ; i++)</div><div class='del'>-			pi-&gt;sh-&gt;phy_noise_window[i] =</div><div class='del'>-				PHY_NOISE_FIXED_VAL_LCNPHY;</div><div class='del'>-	}</div><div class='del'>-	pi-&gt;sh-&gt;phy_noise_index = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; PHY_NOISE_WINDOW_SZ; i++) {</div><div class='del'>-		for (k = WL_ANT_IDX_1; k &lt; WL_ANT_RX_MAX; k++)</div><div class='del'>-			pi-&gt;nphy_noise_win[k][i] = PHY_NOISE_FIXED_VAL_NPHY;</div><div class='del'>-	}</div><div class='del'>-	pi-&gt;nphy_noise_index = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void</div><div class='ctx'> wlc_phy_papd_decode_epsilon(u32 epsilon, s32 *eps_real, s32 *eps_imag)</div><div class='ctx'> {</div><div class='hunk'>@@ -2812,14 +2454,6 @@ void wlc_phy_stf_chain_set(struct brcms_phy_pub *pih, u8 txchain, u8 rxchain)</div><div class='ctx'> 	pi-&gt;pubpi.phy_corenum = (u8)hweight8(pi-&gt;sh-&gt;phyrxchain);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void wlc_phy_stf_chain_get(struct brcms_phy_pub *pih, u8 *txchain, u8 *rxchain)</div><div class='del'>-{</div><div class='del'>-	struct brcms_phy *pi = container_of(pih, struct brcms_phy, pubpi_ro);</div><div class='del'>-</div><div class='del'>-	*txchain = pi-&gt;sh-&gt;phytxchain;</div><div class='del'>-	*rxchain = pi-&gt;sh-&gt;phyrxchain;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> u8 wlc_phy_stf_chain_active_get(struct brcms_phy_pub *pih)</div><div class='ctx'> {</div><div class='ctx'> 	s16 nphy_currtemp;</div><div class='hunk'>@@ -2852,89 +2486,12 @@ u8 wlc_phy_stf_chain_active_get(struct brcms_phy_pub *pih)</div><div class='ctx'> 	return active_bitmap;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-s8 wlc_phy_stf_ssmode_get(struct brcms_phy_pub *pih, u16 chanspec)</div><div class='del'>-{</div><div class='del'>-	struct brcms_phy *pi = container_of(pih, struct brcms_phy, pubpi_ro);</div><div class='del'>-	u8 siso_mcs_id, cdd_mcs_id;</div><div class='del'>-</div><div class='del'>-	siso_mcs_id =</div><div class='del'>-		(CHSPEC_IS40(chanspec)) ? TXP_FIRST_MCS_40_SISO :</div><div class='del'>-		TXP_FIRST_MCS_20_SISO;</div><div class='del'>-	cdd_mcs_id =</div><div class='del'>-		(CHSPEC_IS40(chanspec)) ? TXP_FIRST_MCS_40_CDD :</div><div class='del'>-		TXP_FIRST_MCS_20_CDD;</div><div class='del'>-</div><div class='del'>-	if (pi-&gt;tx_power_target[siso_mcs_id] &gt;</div><div class='del'>-	    (pi-&gt;tx_power_target[cdd_mcs_id] + 12))</div><div class='del'>-		return PHY_TXC1_MODE_SISO;</div><div class='del'>-	else</div><div class='del'>-		return PHY_TXC1_MODE_CDD;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> const u8 *wlc_phy_get_ofdm_rate_lookup(void)</div><div class='ctx'> {</div><div class='ctx'> 	return ofdm_rate_lookup;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void wlc_lcnphy_epa_switch(struct brcms_phy *pi, bool mode)</div><div class='del'>-{</div><div class='del'>-	if ((pi-&gt;sh-&gt;chip == BCMA_CHIP_ID_BCM4313) &amp;&amp;</div><div class='del'>-	    (pi-&gt;sh-&gt;boardflags &amp; BFL_FEM)) {</div><div class='del'>-		if (mode) {</div><div class='del'>-			u16 txant = 0;</div><div class='del'>-			txant = wlapi_bmac_get_txant(pi-&gt;sh-&gt;physhim);</div><div class='del'>-			if (txant == 1) {</div><div class='del'>-				mod_phy_reg(pi, 0x44d, (0x1 &lt;&lt; 2), (1) &lt;&lt; 2);</div><div class='del'>-</div><div class='del'>-				mod_phy_reg(pi, 0x44c, (0x1 &lt;&lt; 2), (1) &lt;&lt; 2);</div><div class='del'>-</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			bcma_chipco_gpio_control(&amp;pi-&gt;d11core-&gt;bus-&gt;drv_cc,</div><div class='del'>-						 0x0, 0x0);</div><div class='del'>-			bcma_chipco_gpio_out(&amp;pi-&gt;d11core-&gt;bus-&gt;drv_cc,</div><div class='del'>-					     ~0x40, 0x40);</div><div class='del'>-			bcma_chipco_gpio_outen(&amp;pi-&gt;d11core-&gt;bus-&gt;drv_cc,</div><div class='del'>-					       ~0x40, 0x40);</div><div class='del'>-		} else {</div><div class='del'>-			mod_phy_reg(pi, 0x44c, (0x1 &lt;&lt; 2), (0) &lt;&lt; 2);</div><div class='del'>-</div><div class='del'>-			mod_phy_reg(pi, 0x44d, (0x1 &lt;&lt; 2), (0) &lt;&lt; 2);</div><div class='del'>-</div><div class='del'>-			bcma_chipco_gpio_out(&amp;pi-&gt;d11core-&gt;bus-&gt;drv_cc,</div><div class='del'>-					     ~0x40, 0x00);</div><div class='del'>-			bcma_chipco_gpio_outen(&amp;pi-&gt;d11core-&gt;bus-&gt;drv_cc,</div><div class='del'>-					       ~0x40, 0x00);</div><div class='del'>-			bcma_chipco_gpio_control(&amp;pi-&gt;d11core-&gt;bus-&gt;drv_cc,</div><div class='del'>-						 0x0, 0x40);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void wlc_phy_ldpc_override_set(struct brcms_phy_pub *ppi, bool ldpc)</div><div class='ctx'> {</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-wlc_phy_get_pwrdet_offsets(struct brcms_phy *pi, s8 *cckoffset, s8 *ofdmoffset)</div><div class='del'>-{</div><div class='del'>-	*cckoffset = 0;</div><div class='del'>-	*ofdmoffset = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-s8 wlc_phy_upd_rssi_offset(struct brcms_phy *pi, s8 rssi, u16 chanspec)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	return rssi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool wlc_phy_txpower_ipa_ison(struct brcms_phy_pub *ppi)</div><div class='del'>-{</div><div class='del'>-	struct brcms_phy *pi = container_of(ppi, struct brcms_phy, pubpi_ro);</div><div class='del'>-</div><div class='del'>-	if (ISNPHY(pi))</div><div class='del'>-		return wlc_phy_n_txpower_ipa_ison(pi);</div><div class='del'>-	else</div><div class='del'>-		return false;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h<br/>index 2e6a3d454ee8..cab08f0669d1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h</a></div><div class='hunk'>@@ -141,11 +141,6 @@ struct tx_power {</div><div class='ctx'> 	u8 target[WL_TX_POWER_RATES];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct tx_inst_power {</div><div class='del'>-	u8 txpwr_est_Pout[2];   /* Latest estimate for 2.4 and 5 Ghz */</div><div class='del'>-	u8 txpwr_est_Pout_gofdm;        /* Pwr estimate for 2.4 OFDM */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct brcms_chanvec {</div><div class='ctx'> 	u8 vec[MAXCHANNEL / NBBY];</div><div class='ctx'> };</div><div class='hunk'>@@ -191,7 +186,6 @@ void wlc_phy_antsel_init(struct brcms_phy_pub *ppi, bool lut_init);</div><div class='ctx'> void wlc_phy_chanspec_set(struct brcms_phy_pub *ppi, u16 chanspec);</div><div class='ctx'> u16 wlc_phy_chanspec_get(struct brcms_phy_pub *ppi);</div><div class='ctx'> void wlc_phy_chanspec_radio_set(struct brcms_phy_pub *ppi, u16 newch);</div><div class='del'>-u16 wlc_phy_bw_state_get(struct brcms_phy_pub *ppi);</div><div class='ctx'> void wlc_phy_bw_state_set(struct brcms_phy_pub *ppi, u16 bw);</div><div class='ctx'> </div><div class='ctx'> int wlc_phy_rssi_compute(struct brcms_phy_pub *pih, struct d11rxhdr *rxh);</div><div class='hunk'>@@ -199,26 +193,16 @@ void wlc_phy_por_inform(struct brcms_phy_pub *ppi);</div><div class='ctx'> void wlc_phy_noise_sample_intr(struct brcms_phy_pub *ppi);</div><div class='ctx'> bool wlc_phy_bist_check_phy(struct brcms_phy_pub *ppi);</div><div class='ctx'> </div><div class='del'>-void wlc_phy_set_deaf(struct brcms_phy_pub *ppi, bool user_flag);</div><div class='del'>-</div><div class='ctx'> void wlc_phy_switch_radio(struct brcms_phy_pub *ppi, bool on);</div><div class='ctx'> void wlc_phy_anacore(struct brcms_phy_pub *ppi, bool on);</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-void wlc_phy_BSSinit(struct brcms_phy_pub *ppi, bool bonlyap, int rssi);</div><div class='del'>-</div><div class='ctx'> void wlc_phy_chanspec_ch14_widefilter_set(struct brcms_phy_pub *ppi,</div><div class='ctx'> 					  bool wide_filter);</div><div class='ctx'> void wlc_phy_chanspec_band_validch(struct brcms_phy_pub *ppi, uint band,</div><div class='ctx'> 				   struct brcms_chanvec *channels);</div><div class='del'>-u16 wlc_phy_chanspec_band_firstch(struct brcms_phy_pub *ppi, uint band);</div><div class='ctx'> </div><div class='ctx'> void wlc_phy_txpower_sromlimit(struct brcms_phy_pub *ppi, uint chan, u8 *_min_,</div><div class='ctx'> 			       u8 *_max_, int rate);</div><div class='del'>-void wlc_phy_txpower_sromlimit_max_get(struct brcms_phy_pub *ppi, uint chan,</div><div class='del'>-				       u8 *_max_, u8 *_min_);</div><div class='del'>-void wlc_phy_txpower_boardlimit_band(struct brcms_phy_pub *ppi, uint band,</div><div class='del'>-				     s32 *, s32 *, u32 *);</div><div class='ctx'> void wlc_phy_txpower_limit_set(struct brcms_phy_pub *ppi, struct txpwr_limits *,</div><div class='ctx'> 			       u16 chanspec);</div><div class='ctx'> int wlc_phy_txpower_get(struct brcms_phy_pub *ppi, uint *qdbm, bool *override);</div><div class='hunk'>@@ -226,25 +210,16 @@ int wlc_phy_txpower_set(struct brcms_phy_pub *ppi, uint qdbm, bool override);</div><div class='ctx'> void wlc_phy_txpower_target_set(struct brcms_phy_pub *ppi,</div><div class='ctx'> 				struct txpwr_limits *);</div><div class='ctx'> bool wlc_phy_txpower_hw_ctrl_get(struct brcms_phy_pub *ppi);</div><div class='del'>-void wlc_phy_txpower_hw_ctrl_set(struct brcms_phy_pub *ppi, bool hwpwrctrl);</div><div class='del'>-u8 wlc_phy_txpower_get_target_min(struct brcms_phy_pub *ppi);</div><div class='del'>-u8 wlc_phy_txpower_get_target_max(struct brcms_phy_pub *ppi);</div><div class='del'>-bool wlc_phy_txpower_ipa_ison(struct brcms_phy_pub *pih);</div><div class='ctx'> </div><div class='ctx'> void wlc_phy_stf_chain_init(struct brcms_phy_pub *pih, u8 txchain, u8 rxchain);</div><div class='ctx'> void wlc_phy_stf_chain_set(struct brcms_phy_pub *pih, u8 txchain, u8 rxchain);</div><div class='del'>-void wlc_phy_stf_chain_get(struct brcms_phy_pub *pih, u8 *txchain, u8 *rxchain);</div><div class='ctx'> u8 wlc_phy_stf_chain_active_get(struct brcms_phy_pub *pih);</div><div class='del'>-s8 wlc_phy_stf_ssmode_get(struct brcms_phy_pub *pih, u16 chanspec);</div><div class='ctx'> void wlc_phy_ldpc_override_set(struct brcms_phy_pub *ppi, bool val);</div><div class='ctx'> </div><div class='ctx'> void wlc_phy_cal_perical(struct brcms_phy_pub *ppi, u8 reason);</div><div class='del'>-void wlc_phy_noise_sample_request_external(struct brcms_phy_pub *ppi);</div><div class='del'>-void wlc_phy_edcrs_lock(struct brcms_phy_pub *pih, bool lock);</div><div class='ctx'> void wlc_phy_cal_papd_recal(struct brcms_phy_pub *ppi);</div><div class='ctx'> </div><div class='ctx'> void wlc_phy_ant_rxdiv_set(struct brcms_phy_pub *ppi, u8 val);</div><div class='del'>-void wlc_phy_clear_tssi(struct brcms_phy_pub *ppi);</div><div class='ctx'> void wlc_phy_hold_upd(struct brcms_phy_pub *ppi, u32 id, bool val);</div><div class='ctx'> void wlc_phy_mute_upd(struct brcms_phy_pub *ppi, bool val, u32 flags);</div><div class='ctx'> </div><div class='hunk'>@@ -254,17 +229,10 @@ void wlc_phy_txpower_get_current(struct brcms_phy_pub *ppi,</div><div class='ctx'> 				 struct tx_power *power, uint channel);</div><div class='ctx'> </div><div class='ctx'> void wlc_phy_initcal_enable(struct brcms_phy_pub *pih, bool initcal);</div><div class='del'>-bool wlc_phy_test_ison(struct brcms_phy_pub *ppi);</div><div class='del'>-void wlc_phy_txpwr_percent_set(struct brcms_phy_pub *ppi, u8 txpwr_percent);</div><div class='ctx'> void wlc_phy_ofdm_rateset_war(struct brcms_phy_pub *pih, bool war);</div><div class='ctx'> void wlc_phy_bf_preempt_enable(struct brcms_phy_pub *pih, bool bf_preempt);</div><div class='ctx'> void wlc_phy_machwcap_set(struct brcms_phy_pub *ppi, u32 machwcap);</div><div class='ctx'> </div><div class='del'>-void wlc_phy_runbist_config(struct brcms_phy_pub *ppi, bool start_end);</div><div class='del'>-</div><div class='del'>-void wlc_phy_freqtrack_start(struct brcms_phy_pub *ppi);</div><div class='del'>-void wlc_phy_freqtrack_end(struct brcms_phy_pub *ppi);</div><div class='del'>-</div><div class='ctx'> const u8 *wlc_phy_get_ofdm_rate_lookup(void);</div><div class='ctx'> </div><div class='ctx'> s8 wlc_phy_get_tx_power_offset_by_mcs(struct brcms_phy_pub *ppi,</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_int.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_int.h<br/>index 8668fa5558a2..4e80f4d27949 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_int.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_int.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_int.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_int.h</a></div><div class='hunk'>@@ -908,8 +908,6 @@ void write_radio_reg(struct brcms_phy *pi, u16 addr, u16 val);</div><div class='ctx'> </div><div class='ctx'> void wlc_phyreg_enter(struct brcms_phy_pub *pih);</div><div class='ctx'> void wlc_phyreg_exit(struct brcms_phy_pub *pih);</div><div class='del'>-void wlc_radioreg_enter(struct brcms_phy_pub *pih);</div><div class='del'>-void wlc_radioreg_exit(struct brcms_phy_pub *pih);</div><div class='ctx'> </div><div class='ctx'> void wlc_phy_read_table(struct brcms_phy *pi,</div><div class='ctx'> 			const struct phytbl_info *ptbl_info,</div><div class='hunk'>@@ -921,7 +919,6 @@ void wlc_phy_table_addr(struct brcms_phy *pi, uint tbl_id, uint tbl_offset,</div><div class='ctx'> 			u16 tblAddr, u16 tblDataHi, u16 tblDataLo);</div><div class='ctx'> void wlc_phy_table_data_write(struct brcms_phy *pi, uint width, u32 val);</div><div class='ctx'> </div><div class='del'>-void write_phy_channel_reg(struct brcms_phy *pi, uint val);</div><div class='ctx'> void wlc_phy_txpower_update_shm(struct brcms_phy *pi);</div><div class='ctx'> </div><div class='ctx'> u8 wlc_phy_nbits(s32 value);</div><div class='hunk'>@@ -941,7 +938,7 @@ void wlc_phy_papd_decode_epsilon(u32 epsilon, s32 *eps_real, s32 *eps_imag);</div><div class='ctx'> void wlc_phy_cal_perical_mphase_reset(struct brcms_phy *pi);</div><div class='ctx'> void wlc_phy_cal_perical_mphase_restart(struct brcms_phy *pi);</div><div class='ctx'> </div><div class='del'>-bool wlc_phy_attach_nphy(struct brcms_phy *pi);</div><div class='add'>+void wlc_phy_attach_nphy(struct brcms_phy *pi);</div><div class='ctx'> bool wlc_phy_attach_lcnphy(struct brcms_phy *pi);</div><div class='ctx'> </div><div class='ctx'> void wlc_phy_detach_lcnphy(struct brcms_phy *pi);</div><div class='hunk'>@@ -985,7 +982,6 @@ s8 wlc_lcnphy_tempsense_degree(struct brcms_phy *pi, bool mode);</div><div class='ctx'> s8 wlc_lcnphy_vbatsense(struct brcms_phy *pi, bool mode);</div><div class='ctx'> void wlc_phy_carrier_suppress_lcnphy(struct brcms_phy *pi);</div><div class='ctx'> void wlc_lcnphy_crsuprs(struct brcms_phy *pi, int channel);</div><div class='del'>-void wlc_lcnphy_epa_switch(struct brcms_phy *pi, bool mode);</div><div class='ctx'> void wlc_2064_vco_cal(struct brcms_phy *pi);</div><div class='ctx'> </div><div class='ctx'> void wlc_phy_txpower_recalc_target(struct brcms_phy *pi);</div><div class='hunk'>@@ -1031,7 +1027,6 @@ struct phy_iq_est {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void wlc_phy_stay_in_carriersearch_nphy(struct brcms_phy *pi, bool enable);</div><div class='del'>-void wlc_nphy_deaf_mode(struct brcms_phy *pi, bool mode);</div><div class='ctx'> </div><div class='ctx'> #define wlc_phy_write_table_nphy(pi, pti) \</div><div class='ctx'> 	wlc_phy_write_table(pi, pti, 0x72, 0x74, 0x73)</div><div class='hunk'>@@ -1115,10 +1110,4 @@ int wlc_phy_rssi_compute_nphy(struct brcms_phy *pi, struct d11rxhdr *rxh);</div><div class='ctx'> #define NPHY_TESTPATTERN_BPHY_RFCS  1</div><div class='ctx'> </div><div class='ctx'> void wlc_phy_nphy_tkip_rifs_war(struct brcms_phy *pi, u8 rifs);</div><div class='del'>-</div><div class='del'>-void wlc_phy_get_pwrdet_offsets(struct brcms_phy *pi, s8 *cckoffset,</div><div class='del'>-				s8 *ofdmoffset);</div><div class='del'>-s8 wlc_phy_upd_rssi_offset(struct brcms_phy *pi, s8 rssi, u16 chanspec);</div><div class='del'>-</div><div class='del'>-bool wlc_phy_n_txpower_ipa_ison(struct brcms_phy *pih);</div><div class='ctx'> #endif				/* _BRCM_PHY_INT_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c<br/>index 7717eb85a1db..b4bba67a45ec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c</a></div><div class='hunk'>@@ -919,7 +919,7 @@ void wlc_lcnphy_read_table(struct brcms_phy *pi, struct phytbl_info *pti)</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> wlc_lcnphy_common_read_table(struct brcms_phy *pi, u32 tbl_id,</div><div class='del'>-			     const u16 *tbl_ptr, u32 tbl_len,</div><div class='add'>+			     u16 *tbl_ptr, u32 tbl_len,</div><div class='ctx'> 			     u32 tbl_width, u32 tbl_offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct phytbl_info tab;</div><div class='hunk'>@@ -2567,7 +2567,6 @@ wlc_lcnphy_tx_iqlo_cal(struct brcms_phy *pi,</div><div class='ctx'> </div><div class='ctx'> 	struct lcnphy_txgains cal_gains, temp_gains;</div><div class='ctx'> 	u16 hash;</div><div class='del'>-	u8 band_idx;</div><div class='ctx'> 	int j;</div><div class='ctx'> 	u16 ncorr_override[5];</div><div class='ctx'> 	u16 syst_coeffs[] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,</div><div class='hunk'>@@ -2599,6 +2598,9 @@ wlc_lcnphy_tx_iqlo_cal(struct brcms_phy *pi,</div><div class='ctx'> 	u16 *values_to_save;</div><div class='ctx'> 	struct brcms_phy_lcnphy *pi_lcn = pi-&gt;u.pi_lcnphy;</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON(CHSPEC_IS5G(pi-&gt;radio_chanspec)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	values_to_save = kmalloc_array(20, sizeof(u16), GFP_ATOMIC);</div><div class='ctx'> 	if (NULL == values_to_save)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2662,20 +2664,18 @@ wlc_lcnphy_tx_iqlo_cal(struct brcms_phy *pi,</div><div class='ctx'> 	hash = (target_gains-&gt;gm_gain &lt;&lt; 8) |</div><div class='ctx'> 	       (target_gains-&gt;pga_gain &lt;&lt; 4) | (target_gains-&gt;pad_gain);</div><div class='ctx'> </div><div class='del'>-	band_idx = (CHSPEC_IS5G(pi-&gt;radio_chanspec) ? 1 : 0);</div><div class='del'>-</div><div class='ctx'> 	cal_gains = *target_gains;</div><div class='ctx'> 	memset(ncorr_override, 0, sizeof(ncorr_override));</div><div class='del'>-	for (j = 0; j &lt; iqcal_gainparams_numgains_lcnphy[band_idx]; j++) {</div><div class='del'>-		if (hash == tbl_iqcal_gainparams_lcnphy[band_idx][j][0]) {</div><div class='add'>+	for (j = 0; j &lt; iqcal_gainparams_numgains_lcnphy[0]; j++) {</div><div class='add'>+		if (hash == tbl_iqcal_gainparams_lcnphy[0][j][0]) {</div><div class='ctx'> 			cal_gains.gm_gain =</div><div class='del'>-				tbl_iqcal_gainparams_lcnphy[band_idx][j][1];</div><div class='add'>+				tbl_iqcal_gainparams_lcnphy[0][j][1];</div><div class='ctx'> 			cal_gains.pga_gain =</div><div class='del'>-				tbl_iqcal_gainparams_lcnphy[band_idx][j][2];</div><div class='add'>+				tbl_iqcal_gainparams_lcnphy[0][j][2];</div><div class='ctx'> 			cal_gains.pad_gain =</div><div class='del'>-				tbl_iqcal_gainparams_lcnphy[band_idx][j][3];</div><div class='add'>+				tbl_iqcal_gainparams_lcnphy[0][j][3];</div><div class='ctx'> 			memcpy(ncorr_override,</div><div class='del'>-			       &amp;tbl_iqcal_gainparams_lcnphy[band_idx][j][3],</div><div class='add'>+			       &amp;tbl_iqcal_gainparams_lcnphy[0][j][3],</div><div class='ctx'> 			       sizeof(ncorr_override));</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3299,7 +3299,7 @@ wlc_lcnphy_run_samples(struct brcms_phy *pi,</div><div class='ctx'> </div><div class='ctx'> 	if (iqcalmode) {</div><div class='ctx'> </div><div class='del'>-		and_phy_reg(pi, 0x453, (u16) ~(0x1 &lt;&lt; 15));</div><div class='add'>+		and_phy_reg(pi, 0x453, 0xffff &amp; ~(0x1 &lt;&lt; 15));</div><div class='ctx'> 		or_phy_reg(pi, 0x453, (0x1 &lt;&lt; 15));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		write_phy_reg(pi, 0x63f, 1);</div><div class='hunk'>@@ -4968,11 +4968,11 @@ bool wlc_phy_attach_lcnphy(struct brcms_phy *pi)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_phy_lcnphy *pi_lcn;</div><div class='ctx'> </div><div class='del'>-	pi-&gt;u.pi_lcnphy = kzalloc(sizeof(struct brcms_phy_lcnphy), GFP_ATOMIC);</div><div class='del'>-	if (pi-&gt;u.pi_lcnphy == NULL)</div><div class='add'>+	pi_lcn = kzalloc(sizeof(*pi_lcn), GFP_ATOMIC);</div><div class='add'>+	if (!pi_lcn)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	pi_lcn = pi-&gt;u.pi_lcnphy;</div><div class='add'>+	pi-&gt;u.pi_lcnphy = pi_lcn;</div><div class='ctx'> </div><div class='ctx'> 	if (0 == (pi-&gt;sh-&gt;boardflags &amp; BFL_NOPA)) {</div><div class='ctx'> 		pi-&gt;hwpwrctrl = true;</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c<br/>index 8580a2754789..b03d5a1f1a93 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c</a></div><div class='hunk'>@@ -14546,7 +14546,7 @@ static void wlc_phy_txpwr_srom_read_ppr_nphy(struct brcms_phy *pi)</div><div class='ctx'> 	wlc_phy_txpwr_apply_nphy(pi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool wlc_phy_txpwr_srom_read_nphy(struct brcms_phy *pi)</div><div class='add'>+static void wlc_phy_txpwr_srom_read_nphy(struct brcms_phy *pi)</div><div class='ctx'> {</div><div class='ctx'> 	struct ssb_sprom *sprom = &amp;pi-&gt;d11core-&gt;bus-&gt;sprom;</div><div class='ctx'> </div><div class='hunk'>@@ -14595,11 +14595,9 @@ static bool wlc_phy_txpwr_srom_read_nphy(struct brcms_phy *pi)</div><div class='ctx'> 		pi-&gt;phycal_tempdelta = 0;</div><div class='ctx'> </div><div class='ctx'> 	wlc_phy_txpwr_srom_read_ppr_nphy(pi);</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool wlc_phy_attach_nphy(struct brcms_phy *pi)</div><div class='add'>+void wlc_phy_attach_nphy(struct brcms_phy *pi)</div><div class='ctx'> {</div><div class='ctx'> 	uint i;</div><div class='ctx'> </div><div class='hunk'>@@ -14645,10 +14643,7 @@ bool wlc_phy_attach_nphy(struct brcms_phy *pi)</div><div class='ctx'> 	pi-&gt;pi_fptr.chanset = wlc_phy_chanspec_set_nphy;</div><div class='ctx'> 	pi-&gt;pi_fptr.txpwrrecalc = wlc_phy_txpower_recalc_target_nphy;</div><div class='ctx'> </div><div class='del'>-	if (!wlc_phy_txpwr_srom_read_nphy(pi))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='add'>+	wlc_phy_txpwr_srom_read_nphy(pi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static s32 get_rf_pwr_offset(struct brcms_phy *pi, s16 pga_gn, s16 pad_gn)</div><div class='hunk'>@@ -17587,7 +17582,7 @@ static void wlc_phy_txpwrctrl_pwr_setup_nphy(struct brcms_phy *pi)</div><div class='ctx'> 	or_phy_reg(pi, 0x122, (0x1 &lt;&lt; 0));</div><div class='ctx'> </div><div class='ctx'> 	if (NREV_GE(pi-&gt;pubpi.phy_rev, 3))</div><div class='del'>-		and_phy_reg(pi, 0x1e7, (u16) (~(0x1 &lt;&lt; 15)));</div><div class='add'>+		and_phy_reg(pi, 0x1e7, 0x7fff);</div><div class='ctx'> 	else</div><div class='ctx'> 		or_phy_reg(pi, 0x1e7, (0x1 &lt;&lt; 15));</div><div class='ctx'> </div><div class='hunk'>@@ -18086,7 +18081,7 @@ wlc_phy_rfctrlintc_override_nphy(struct brcms_phy *pi, u8 field, u16 value,</div><div class='ctx'> 						   (0x1 &lt;&lt; 10));</div><div class='ctx'> </div><div class='ctx'> 					and_phy_reg(pi, 0x2ff, (u16)</div><div class='del'>-						    ~(0x3 &lt;&lt; 14));</div><div class='add'>+						    0xffff &amp; ~(0x3 &lt;&lt; 14));</div><div class='ctx'> 					or_phy_reg(pi, 0x2ff, (0x1 &lt;&lt; 13));</div><div class='ctx'> 					or_phy_reg(pi, 0x2ff, (0x1 &lt;&lt; 0));</div><div class='ctx'> 				} else {</div><div class='hunk'>@@ -19718,11 +19713,6 @@ u8 wlc_phy_rxcore_getstate_nphy(struct brcms_phy_pub *pih)</div><div class='ctx'> 	return (u8) rxen_bits;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool wlc_phy_n_txpower_ipa_ison(struct brcms_phy *pi)</div><div class='del'>-{</div><div class='del'>-	return PHY_IPA(pi);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void wlc_phy_cal_init_nphy(struct brcms_phy *pi)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='hunk'>@@ -21053,7 +21043,7 @@ wlc_phy_chanspec_nphy_setup(struct brcms_phy *pi, u16 chanspec,</div><div class='ctx'> 		      (val | MAC_PHY_FORCE_CLK));</div><div class='ctx'> </div><div class='ctx'> 		and_phy_reg(pi, (NPHY_TO_BPHY_OFF + BPHY_BB_CONFIG),</div><div class='del'>-			    (u16) (~(BBCFG_RESETCCA | BBCFG_RESETRX)));</div><div class='add'>+			    0xffff &amp; ~(BBCFG_RESETCCA | BBCFG_RESETRX));</div><div class='ctx'> </div><div class='ctx'> 		bcma_write16(pi-&gt;d11core, D11REGOFFS(psm_phy_hdr_param), val);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -21287,7 +21277,8 @@ void wlc_phy_antsel_init(struct brcms_phy_pub *ppi, bool lut_init)</div><div class='ctx'> </div><div class='ctx'> 		bcma_set16(pi-&gt;d11core, D11REGOFFS(psm_gpio_oe), mask);</div><div class='ctx'> </div><div class='del'>-		bcma_mask16(pi-&gt;d11core, D11REGOFFS(psm_gpio_out), ~mask);</div><div class='add'>+		bcma_mask16(pi-&gt;d11core, D11REGOFFS(psm_gpio_out),</div><div class='add'>+			    0xffff &amp; ~mask);</div><div class='ctx'> </div><div class='ctx'> 		if (lut_init) {</div><div class='ctx'> 			write_phy_reg(pi, 0xf8, 0x02d8);</div><div class='hunk'>@@ -23197,7 +23188,7 @@ void wlc_phy_stopplayback_nphy(struct brcms_phy *pi)</div><div class='ctx'> 		or_phy_reg(pi, 0xc3, NPHY_sampleCmd_STOP);</div><div class='ctx'> 	else if (playback_status &amp; 0x2)</div><div class='ctx'> 		and_phy_reg(pi, 0xc2,</div><div class='del'>-			    (u16) ~NPHY_iqloCalCmdGctl_IQLO_CAL_EN);</div><div class='add'>+			    0xffff &amp; ~NPHY_iqloCalCmdGctl_IQLO_CAL_EN);</div><div class='ctx'> </div><div class='ctx'> 	and_phy_reg(pi, 0xc3, (u16) ~(0x1 &lt;&lt; 2));</div><div class='ctx'> </div><div class='hunk'>@@ -23427,6 +23418,9 @@ wlc_phy_iqcal_gainparams_nphy(struct brcms_phy *pi, u16 core_no,</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (WARN_ON(k == NPHY_IQCAL_NUMGAINS))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='ctx'> 		params-&gt;txgm = tbl_iqcal_gainparams_nphy[band_idx][k][1];</div><div class='ctx'> 		params-&gt;pga = tbl_iqcal_gainparams_nphy[band_idx][k][2];</div><div class='ctx'> 		params-&gt;pad = tbl_iqcal_gainparams_nphy[band_idx][k][3];</div><div class='hunk'>@@ -25826,10 +25820,8 @@ wlc_phy_cal_txiqlo_nphy(struct brcms_phy *pi, struct nphy_txgains target_gain,</div><div class='ctx'> </div><div class='ctx'> 		if (mphase) {</div><div class='ctx'> 			cal_cnt = pi-&gt;mphase_txcal_cmdidx;</div><div class='del'>-			if ((cal_cnt + pi-&gt;mphase_txcal_numcmds) &lt; max_cal_cmds)</div><div class='del'>-				num_cals = cal_cnt + pi-&gt;mphase_txcal_numcmds;</div><div class='del'>-			else</div><div class='del'>-				num_cals = max_cal_cmds;</div><div class='add'>+			num_cals = min(cal_cnt + pi-&gt;mphase_txcal_numcmds,</div><div class='add'>+				       max_cal_cmds);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			cal_cnt = 0;</div><div class='ctx'> 			num_cals = max_cal_cmds;</div><div class='hunk'>@@ -28202,8 +28194,9 @@ void wlc_phy_txpwrctrl_enable_nphy(struct brcms_phy *pi, u8 ctrl_type)</div><div class='ctx'> </div><div class='ctx'> 		if (NREV_GE(pi-&gt;pubpi.phy_rev, 3))</div><div class='ctx'> 			and_phy_reg(pi, 0x1e7,</div><div class='del'>-				    (u16) (~((0x1 &lt;&lt; 15) |</div><div class='del'>-					     (0x1 &lt;&lt; 14) | (0x1 &lt;&lt; 13))));</div><div class='add'>+				    0xffff &amp; ~((0x1 &lt;&lt; 15) |</div><div class='add'>+					       (0x1 &lt;&lt; 14) |</div><div class='add'>+					       (0x1 &lt;&lt; 13)));</div><div class='ctx'> 		else</div><div class='ctx'> 			and_phy_reg(pi, 0x1e7,</div><div class='ctx'> 				    (u16) (~((0x1 &lt;&lt; 14) | (0x1 &lt;&lt; 13))));</div><div class='hunk'>@@ -28577,17 +28570,3 @@ void wlc_phy_stay_in_carriersearch_nphy(struct brcms_phy *pi, bool enable)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-void wlc_nphy_deaf_mode(struct brcms_phy *pi, bool mode)</div><div class='del'>-{</div><div class='del'>-	wlapi_suspend_mac_and_wait(pi-&gt;sh-&gt;physhim);</div><div class='del'>-</div><div class='del'>-	if (mode) {</div><div class='del'>-		if (pi-&gt;nphy_deaf_count == 0)</div><div class='del'>-			wlc_phy_stay_in_carriersearch_nphy(pi, true);</div><div class='del'>-	} else if (pi-&gt;nphy_deaf_count &gt; 0) {</div><div class='del'>-		wlc_phy_stay_in_carriersearch_nphy(pi, false);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	wlapi_enable_mac(pi-&gt;sh-&gt;physhim);</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.c<br/>index a0de5db0cd64..8b852581c4e4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.c</a></div><div class='hunk'>@@ -38,9 +38,9 @@ struct phy_shim_info {</div><div class='ctx'> struct phy_shim_info *wlc_phy_shim_attach(struct brcms_hardware *wlc_hw,</div><div class='ctx'> 					  struct brcms_info *wl,</div><div class='ctx'> 					  struct brcms_c_info *wlc) {</div><div class='del'>-	struct phy_shim_info *physhim = NULL;</div><div class='add'>+	struct phy_shim_info *physhim;</div><div class='ctx'> </div><div class='del'>-	physhim = kzalloc(sizeof(struct phy_shim_info), GFP_ATOMIC);</div><div class='add'>+	physhim = kzalloc(sizeof(*physhim), GFP_ATOMIC);</div><div class='ctx'> 	if (!physhim)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -57,12 +57,11 @@ void wlc_phy_shim_detach(struct phy_shim_info *physhim)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct wlapi_timer *wlapi_init_timer(struct phy_shim_info *physhim,</div><div class='del'>-				     void (*fn)(struct brcms_phy *pi),</div><div class='add'>+				     void (*fn)(void *pi),</div><div class='ctx'> 				     void *arg, const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	return (struct wlapi_timer *)</div><div class='del'>-			brcms_init_timer(physhim-&gt;wl, (void (*)(void *))fn,</div><div class='del'>-					 arg, name);</div><div class='add'>+			brcms_init_timer(physhim-&gt;wl, fn, arg, name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void wlapi_free_timer(struct wlapi_timer *t)</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.h<br/>index dd8774717ade..27d0934e600e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.h</a></div><div class='hunk'>@@ -131,7 +131,7 @@ void wlc_phy_shim_detach(struct phy_shim_info *physhim);</div><div class='ctx'> </div><div class='ctx'> /* PHY to WL utility functions */</div><div class='ctx'> struct wlapi_timer *wlapi_init_timer(struct phy_shim_info *physhim,</div><div class='del'>-				     void (*fn)(struct brcms_phy *pi),</div><div class='add'>+				     void (*fn)(void *pi),</div><div class='ctx'> 				     void *arg, const char *name);</div><div class='ctx'> void wlapi_free_timer(struct wlapi_timer *t);</div><div class='ctx'> void wlapi_add_timer(struct wlapi_timer *t, uint ms, int periodic);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/pmu.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/pmu.c<br/>index 71b80381f3ad..c9a29e626daa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/pmu.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/pmu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/pmu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/pmu.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #define EXT_ILP_HZ 32768</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Duration for ILP clock frequency measurment in milliseconds</div><div class='add'>+ * Duration for ILP clock frequency measurement in milliseconds</div><div class='ctx'>  *</div><div class='ctx'>  * remark: 1000 must be an integer multiple of this duration</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/pub.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/pub.h<br/>index 4da38cb4f318..bfc63b2f0537 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/pub.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/pub.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/pub.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/pub.h</a></div><div class='hunk'>@@ -297,7 +297,7 @@ struct brcms_pub *brcms_c_pub(struct brcms_c_info *wlc);</div><div class='ctx'> void brcms_c_ampdu_flush(struct brcms_c_info *wlc, struct ieee80211_sta *sta,</div><div class='ctx'> 			 u16 tid);</div><div class='ctx'> void brcms_c_ampdu_tx_operational(struct brcms_c_info *wlc, u8 tid,</div><div class='del'>-				  u8 ba_wsize, uint max_rx_ampdu_bytes);</div><div class='add'>+				  uint max_rx_ampdu_bytes);</div><div class='ctx'> int brcms_c_module_register(struct brcms_pub *pub, const char *name,</div><div class='ctx'> 			    struct brcms_info *hdl,</div><div class='ctx'> 			    int (*down_fn)(void *handle));</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/scb.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/scb.h<br/>index 3a3d73699f83..d65561227da0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/scb.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/scb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/scb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/scb.h</a></div><div class='hunk'>@@ -36,19 +36,13 @@</div><div class='ctx'> </div><div class='ctx'> /* structure to store per-tid state for the ampdu initiator */</div><div class='ctx'> struct scb_ampdu_tid_ini {</div><div class='del'>-	u8 tid;		  /* initiator tid for easy lookup */</div><div class='ctx'> 	/* tx retry count; indexed by seq modulo */</div><div class='ctx'> 	u8 txretry[AMPDU_TX_BA_MAX_WSIZE];</div><div class='del'>-	struct scb *scb;  /* backptr for easy lookup */</div><div class='del'>-	u8 ba_wsize;	  /* negotiated ba window size (in pdu) */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct scb_ampdu {</div><div class='del'>-	struct scb *scb;	/* back pointer for easy reference */</div><div class='del'>-	u8 mpdu_density;	/* mpdu density */</div><div class='ctx'> 	u8 max_pdu;		/* max pdus allowed in ampdu */</div><div class='ctx'> 	u8 release;		/* # of mpdus released at a time */</div><div class='del'>-	u16 min_len;		/* min mpdu len to support the density */</div><div class='ctx'> 	u32 max_rx_ampdu_bytes;	/* max ampdu rcv length; 8k, 16k, 32k, 64k */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -64,15 +58,7 @@ struct scb_ampdu {</div><div class='ctx'> struct scb {</div><div class='ctx'> 	u32 magic;</div><div class='ctx'> 	u32 flags;	/* various bit flags as defined below */</div><div class='del'>-	u32 flags2;	/* various bit flags2 as defined below */</div><div class='del'>-	u8 state;	/* current state bitfield of auth/assoc process */</div><div class='del'>-	u8 ea[ETH_ALEN];	/* station address */</div><div class='del'>-	uint fragresid[NUMPRIO];/* #bytes unused in frag buffer per prio */</div><div class='del'>-</div><div class='ctx'> 	u16 seqctl[NUMPRIO];	/* seqctl of last received frame (for dups) */</div><div class='del'>-	/* seqctl of last received frame (for dups) for non-QoS data and</div><div class='del'>-	 * management */</div><div class='del'>-	u16 seqctl_nonqos;</div><div class='ctx'> 	u16 seqnum[NUMPRIO];/* WME: driver maintained sw seqnum per priority */</div><div class='ctx'> </div><div class='ctx'> 	struct scb_ampdu scb_ampdu;	/* AMPDU state including per tid info */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/stf.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/stf.h<br/>index aa4ab53bf634..af86c7fc5112 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/stf.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/stf.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/stf.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/stf.h</a></div><div class='hunk'>@@ -29,7 +29,6 @@ void brcms_c_stf_ss_update(struct brcms_c_info *wlc, struct brcms_band *band);</div><div class='ctx'> void brcms_c_stf_phy_txant_upd(struct brcms_c_info *wlc);</div><div class='ctx'> int brcms_c_stf_txchain_set(struct brcms_c_info *wlc, s32 int_val, bool force);</div><div class='ctx'> bool brcms_c_stf_stbc_rx_set(struct brcms_c_info *wlc, s32 int_val);</div><div class='del'>-void brcms_c_stf_phy_txant_upd(struct brcms_c_info *wlc);</div><div class='ctx'> void brcms_c_stf_phy_chain_calc(struct brcms_c_info *wlc);</div><div class='ctx'> u16 brcms_c_stf_phytxchain_sel(struct brcms_c_info *wlc, u32 rspec);</div><div class='ctx'> u16 brcms_c_stf_d11hdrs_phyctl_txant(struct brcms_c_info *wlc, u32 rspec);</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/types.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/types.h<br/>index ae1f3ad40d45..12a0df5b4e98 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/types.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmsmac/types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/types.h</a></div><div class='hunk'>@@ -123,7 +123,7 @@</div><div class='ctx'> 					 */</div><div class='ctx'> </div><div class='ctx'> /********************************************************************</div><div class='del'>- * Phy/Core Configuration.  Defines macros to to check core phy/rev *</div><div class='add'>+ * Phy/Core Configuration.  Defines macros to check core phy/rev *</div><div class='ctx'>  * compile-time configuration.  Defines default core support.       *</div><div class='ctx'>  * ******************************************************************</div><div class='ctx'>  */</div><div class='hunk'>@@ -288,15 +288,6 @@ struct tx_status;</div><div class='ctx'> struct d11rxhdr;</div><div class='ctx'> struct txpwr_limits;</div><div class='ctx'> </div><div class='del'>-/* iovar structure */</div><div class='del'>-struct brcmu_iovar {</div><div class='del'>-	const char *name;	/* name for lookup and display */</div><div class='del'>-	u16 varid;	/* id for switch */</div><div class='del'>-	u16 flags;	/* driver-specific flag bits */</div><div class='del'>-	u16 type;	/* base type of argument */</div><div class='del'>-	u16 minlen;	/* min length for buffer vars */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* brcm_msg_level is a bit vector with defs in defs.h */</div><div class='ctx'> extern u32 brcm_msg_level;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile<br/>index 7a82d615ba2a..f9b40cab766c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Copyright (c) 2011 Broadcom Corporation</div><div class='ctx'> #</div><div class='del'>-ccflags-y := -I $(srctree)/$(src)/../include</div><div class='add'>+ccflags-y := -I $(src)/../include</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_BRCMUTIL)	+= brcmutil.o</div><div class='ctx'> brcmutil-objs	= utils.o d11.o</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c b/drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c<br/>index e87e68cc46e2..fe94db0ba3f3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c</a></div><div class='hunk'>@@ -186,7 +186,7 @@ struct sk_buff *brcmu_pktq_peek_tail(struct pktq *pq, int *prec_out)</div><div class='ctx'> {</div><div class='ctx'> 	int prec;</div><div class='ctx'> </div><div class='del'>-	if (pq-&gt;len == 0)</div><div class='add'>+	if (pktq_empty(pq))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	for (prec = 0; prec &lt; pq-&gt;hi_prec; prec++)</div><div class='hunk'>@@ -223,7 +223,7 @@ struct sk_buff *brcmu_pktq_mdeq(struct pktq *pq, uint prec_bmp,</div><div class='ctx'> 	struct sk_buff *p;</div><div class='ctx'> 	int prec;</div><div class='ctx'> </div><div class='del'>-	if (pq-&gt;len == 0)</div><div class='add'>+	if (pktq_empty(pq))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	while ((prec = pq-&gt;hi_prec) &gt; 0 &amp;&amp;</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h<br/>index 00309b272a0e..df3b67ba4db2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h</a></div><div class='hunk'>@@ -32,10 +32,12 @@</div><div class='ctx'> #define BRCM_CC_4339_CHIP_ID		0x4339</div><div class='ctx'> #define BRCM_CC_43430_CHIP_ID		43430</div><div class='ctx'> #define BRCM_CC_4345_CHIP_ID		0x4345</div><div class='add'>+#define BRCM_CC_43454_CHIP_ID		43454</div><div class='ctx'> #define BRCM_CC_43465_CHIP_ID		43465</div><div class='ctx'> #define BRCM_CC_4350_CHIP_ID		0x4350</div><div class='ctx'> #define BRCM_CC_43525_CHIP_ID		43525</div><div class='ctx'> #define BRCM_CC_4354_CHIP_ID		0x4354</div><div class='add'>+#define BRCM_CC_4355_CHIP_ID		0x4355</div><div class='ctx'> #define BRCM_CC_4356_CHIP_ID		0x4356</div><div class='ctx'> #define BRCM_CC_43566_CHIP_ID		43566</div><div class='ctx'> #define BRCM_CC_43567_CHIP_ID		43567</div><div class='hunk'>@@ -50,8 +52,14 @@</div><div class='ctx'> #define BRCM_CC_43664_CHIP_ID		43664</div><div class='ctx'> #define BRCM_CC_43666_CHIP_ID		43666</div><div class='ctx'> #define BRCM_CC_4371_CHIP_ID		0x4371</div><div class='add'>+#define BRCM_CC_43751_CHIP_ID		43751</div><div class='add'>+#define BRCM_CC_43752_CHIP_ID		43752</div><div class='add'>+#define BRCM_CC_4377_CHIP_ID		0x4377</div><div class='add'>+#define BRCM_CC_4378_CHIP_ID		0x4378</div><div class='add'>+#define BRCM_CC_4387_CHIP_ID		0x4387</div><div class='ctx'> #define CY_CC_4373_CHIP_ID		0x4373</div><div class='ctx'> #define CY_CC_43012_CHIP_ID		43012</div><div class='add'>+#define CY_CC_43439_CHIP_ID		43439</div><div class='ctx'> </div><div class='ctx'> /* USB Device IDs */</div><div class='ctx'> #define BRCM_USB_43143_DEVICE_ID	0xbd1e</div><div class='hunk'>@@ -67,9 +75,11 @@</div><div class='ctx'> #define BRCM_PCIE_4350_DEVICE_ID	0x43a3</div><div class='ctx'> #define BRCM_PCIE_4354_DEVICE_ID	0x43df</div><div class='ctx'> #define BRCM_PCIE_4354_RAW_DEVICE_ID	0x4354</div><div class='add'>+#define BRCM_PCIE_4355_DEVICE_ID	0x43dc</div><div class='ctx'> #define BRCM_PCIE_4356_DEVICE_ID	0x43ec</div><div class='ctx'> #define BRCM_PCIE_43567_DEVICE_ID	0x43d3</div><div class='ctx'> #define BRCM_PCIE_43570_DEVICE_ID	0x43d9</div><div class='add'>+#define BRCM_PCIE_43570_RAW_DEVICE_ID	0xaa31</div><div class='ctx'> #define BRCM_PCIE_4358_DEVICE_ID	0x43e9</div><div class='ctx'> #define BRCM_PCIE_4359_DEVICE_ID	0x43ef</div><div class='ctx'> #define BRCM_PCIE_43602_DEVICE_ID	0x43ba</div><div class='hunk'>@@ -84,7 +94,12 @@</div><div class='ctx'> #define BRCM_PCIE_4366_2G_DEVICE_ID	0x43c4</div><div class='ctx'> #define BRCM_PCIE_4366_5G_DEVICE_ID	0x43c5</div><div class='ctx'> #define BRCM_PCIE_4371_DEVICE_ID	0x440d</div><div class='del'>-</div><div class='add'>+#define BRCM_PCIE_43596_DEVICE_ID	0x4415</div><div class='add'>+#define BRCM_PCIE_43752_DEVICE_ID	0x449d</div><div class='add'>+#define BRCM_PCIE_4377_DEVICE_ID	0x4488</div><div class='add'>+#define BRCM_PCIE_4378_DEVICE_ID	0x4425</div><div class='add'>+#define BRCM_PCIE_4387_DEVICE_ID	0x4433</div><div class='add'>+#define CY_PCIE_54591_DEVICE_ID		0x4417</div><div class='ctx'> </div><div class='ctx'> /* brcmsmac IDs */</div><div class='ctx'> #define BCM4313_D11N2G_ID	0x4727	/* 4313 802.11n 2.4G device */</div><div class='head'>diff --git a/drivers/net/wireless/broadcom/brcm80211/include/soc.h b/drivers/net/wireless/broadcom/brcm80211/include/soc.h<br/>index 92d942b44f2c..824921191366 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/include/soc.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/broadcom/brcm80211/include/soc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/broadcom/brcm80211/include/soc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/broadcom/brcm80211/include/soc.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> #ifndef	_BRCM_SOC_H</div><div class='ctx'> #define	_BRCM_SOC_H</div><div class='ctx'> </div><div class='del'>-#define SI_ENUM_BASE		0x18000000	/* Enumeration space base */</div><div class='add'>+#define SI_ENUM_BASE_DEFAULT	0x18000000</div><div class='ctx'> </div><div class='ctx'> /* Common core control flags */</div><div class='ctx'> #define	SICF_BIST_EN		0x8000</div><div class='head'>diff --git a/drivers/net/wireless/cisco/Kconfig b/drivers/net/wireless/cisco/Kconfig<br/>deleted file mode 100644<br/>index 681bfc2d740a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/cisco/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/cisco/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-config WLAN_VENDOR_CISCO</div><div class='del'>-	bool "Cisco devices"</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  If you have a wireless card belonging to this class, say Y.</div><div class='del'>-</div><div class='del'>-	  Note that the answer to this question doesn't directly affect the</div><div class='del'>-	  kernel: saying N will just cause the configurator to skip all the</div><div class='del'>-	  questions about these cards. If you say Y, you will be asked for</div><div class='del'>-	  your specific card in the following questions.</div><div class='del'>-</div><div class='del'>-if WLAN_VENDOR_CISCO</div><div class='del'>-</div><div class='del'>-config AIRO</div><div class='del'>-	tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"</div><div class='del'>-	depends on CFG80211 &amp;&amp; ISA_DMA_API &amp;&amp; (PCI || BROKEN)</div><div class='del'>-	select WIRELESS_EXT</div><div class='del'>-	select CRYPTO</div><div class='del'>-	select CRYPTO_SKCIPHER</div><div class='del'>-	select WEXT_SPY</div><div class='del'>-	select WEXT_PRIV</div><div class='del'>-	help</div><div class='del'>-	  This is the standard Linux driver to support Cisco/Aironet ISA and</div><div class='del'>-	  PCI 802.11 wireless cards.</div><div class='del'>-	  It supports the new 802.11b cards from Cisco (Cisco 34X, Cisco 35X</div><div class='del'>-	  - with or without encryption) as well as card before the Cisco</div><div class='del'>-	  acquisition (Aironet 4500, Aironet 4800, Aironet 4800B).</div><div class='del'>-</div><div class='del'>-	  This driver support both the standard Linux Wireless Extensions</div><div class='del'>-	  and Cisco proprietary API, so both the Linux Wireless Tools and the</div><div class='del'>-	  Cisco Linux utilities can be used to configure the card.</div><div class='del'>-</div><div class='del'>-	  The driver can be compiled as a module and will be named "airo".</div><div class='del'>-</div><div class='del'>-config AIRO_CS</div><div class='del'>-	tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards"</div><div class='del'>-	depends on CFG80211 &amp;&amp; PCMCIA</div><div class='del'>-	select WIRELESS_EXT</div><div class='del'>-	select WEXT_SPY</div><div class='del'>-	select WEXT_PRIV</div><div class='del'>-	select CRYPTO</div><div class='del'>-	select CRYPTO_AES</div><div class='del'>-	select CRYPTO_CTR</div><div class='del'>-	help</div><div class='del'>-	  This is the standard Linux driver to support Cisco/Aironet PCMCIA</div><div class='del'>-	  802.11 wireless cards.  This driver is the same as the Aironet</div><div class='del'>-	  driver part of the Linux Pcmcia package.</div><div class='del'>-	  It supports the new 802.11b cards from Cisco (Cisco 34X, Cisco 35X</div><div class='del'>-	  - with or without encryption) as well as card before the Cisco</div><div class='del'>-	  acquisition (Aironet 4500, Aironet 4800, Aironet 4800B). It also</div><div class='del'>-	  supports OEM of Cisco such as the DELL TrueMobile 4800 and Xircom</div><div class='del'>-	  802.11b cards.</div><div class='del'>-</div><div class='del'>-	  This driver support both the standard Linux Wireless Extensions</div><div class='del'>-	  and Cisco proprietary API, so both the Linux Wireless Tools and the</div><div class='del'>-	  Cisco Linux utilities can be used to configure the card.</div><div class='del'>-</div><div class='del'>-endif # WLAN_VENDOR_CISCO</div><div class='head'>diff --git a/drivers/net/wireless/cisco/Makefile b/drivers/net/wireless/cisco/Makefile<br/>deleted file mode 100644<br/>index 506a19ce375f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/cisco/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/cisco/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3 +0,0 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-obj-$(CONFIG_AIRO)		+= airo.o</div><div class='del'>-obj-$(CONFIG_AIRO_CS)		+= airo_cs.o airo.o</div><div class='head'>diff --git a/drivers/net/wireless/cisco/airo.c b/drivers/net/wireless/cisco/airo.c<br/>deleted file mode 100644<br/>index fd37d4d2983b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/cisco/airo.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/cisco/airo.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8263 +0,0 @@</div><div class='del'>-/*======================================================================</div><div class='del'>-</div><div class='del'>-    Aironet driver for 4500 and 4800 series cards</div><div class='del'>-</div><div class='del'>-    This code is released under both the GPL version 2 and BSD licenses.</div><div class='del'>-    Either license may be used.  The respective licenses are found at</div><div class='del'>-    the end of this file.</div><div class='del'>-</div><div class='del'>-    This code was developed by Benjamin Reed &lt;breed@users.sourceforge.net&gt;</div><div class='del'>-    including portions of which come from the Aironet PC4500</div><div class='del'>-    Developer's Reference Manual and used with permission.  Copyright</div><div class='del'>-    (C) 1999 Benjamin Reed.  All Rights Reserved.  Permission to use</div><div class='del'>-    code in the Developer's manual was granted for this driver by</div><div class='del'>-    Aironet.  Major code contributions were received from Javier Achirica</div><div class='del'>-    &lt;achirica@users.sourceforge.net&gt; and Jean Tourrilhes &lt;jt@hpl.hp.com&gt;.</div><div class='del'>-    Code was also integrated from the Cisco Aironet driver for Linux.</div><div class='del'>-    Support for MPI350 cards was added by Fabrice Bellet</div><div class='del'>-    &lt;fabrice@bellet.info&gt;.</div><div class='del'>-</div><div class='del'>-======================================================================*/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/ptrace.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/in.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/scatterlist.h&gt;</div><div class='del'>-#include &lt;linux/crypto.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/kthread.h&gt;</div><div class='del'>-#include &lt;linux/freezer.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;crypto/aes.h&gt;</div><div class='del'>-#include &lt;crypto/skcipher.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/cfg80211.h&gt;</div><div class='del'>-#include &lt;net/iw_handler.h&gt;</div><div class='del'>-</div><div class='del'>-#include "airo.h"</div><div class='del'>-</div><div class='del'>-#define DRV_NAME "airo"</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-static const struct pci_device_id card_ids[] = {</div><div class='del'>-	{ 0x14b9, 1, PCI_ANY_ID, PCI_ANY_ID, },</div><div class='del'>-	{ 0x14b9, 0x4500, PCI_ANY_ID, PCI_ANY_ID },</div><div class='del'>-	{ 0x14b9, 0x4800, PCI_ANY_ID, PCI_ANY_ID, },</div><div class='del'>-	{ 0x14b9, 0x0340, PCI_ANY_ID, PCI_ANY_ID, },</div><div class='del'>-	{ 0x14b9, 0x0350, PCI_ANY_ID, PCI_ANY_ID, },</div><div class='del'>-	{ 0x14b9, 0x5000, PCI_ANY_ID, PCI_ANY_ID, },</div><div class='del'>-	{ 0x14b9, 0xa504, PCI_ANY_ID, PCI_ANY_ID, },</div><div class='del'>-	{ 0, }</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(pci, card_ids);</div><div class='del'>-</div><div class='del'>-static int airo_pci_probe(struct pci_dev *, const struct pci_device_id *);</div><div class='del'>-static void airo_pci_remove(struct pci_dev *);</div><div class='del'>-static int __maybe_unused airo_pci_suspend(struct device *dev);</div><div class='del'>-static int __maybe_unused airo_pci_resume(struct device *dev);</div><div class='del'>-</div><div class='del'>-static SIMPLE_DEV_PM_OPS(airo_pci_pm_ops,</div><div class='del'>-			 airo_pci_suspend,</div><div class='del'>-			 airo_pci_resume);</div><div class='del'>-</div><div class='del'>-static struct pci_driver airo_driver = {</div><div class='del'>-	.name      = DRV_NAME,</div><div class='del'>-	.id_table  = card_ids,</div><div class='del'>-	.probe     = airo_pci_probe,</div><div class='del'>-	.remove    = airo_pci_remove,</div><div class='del'>-	.driver.pm = &amp;airo_pci_pm_ops,</div><div class='del'>-};</div><div class='del'>-#endif /* CONFIG_PCI */</div><div class='del'>-</div><div class='del'>-/* Include Wireless Extension definition and check version - Jean II */</div><div class='del'>-#include &lt;linux/wireless.h&gt;</div><div class='del'>-#define WIRELESS_SPY		/* enable iwspy support */</div><div class='del'>-</div><div class='del'>-#define CISCO_EXT		/* enable Cisco extensions */</div><div class='del'>-#ifdef CISCO_EXT</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Hack to do some power saving */</div><div class='del'>-#define POWER_ON_DOWN</div><div class='del'>-</div><div class='del'>-/* As you can see this list is HUGH!</div><div class='del'>-   I really don't know what a lot of these counts are about, but they</div><div class='del'>-   are all here for completeness.  If the IGNLABEL macro is put in</div><div class='del'>-   infront of the label, that statistic will not be included in the list</div><div class='del'>-   of statistics in the /proc filesystem */</div><div class='del'>-</div><div class='del'>-#define IGNLABEL(comment) NULL</div><div class='del'>-static const char *statsLabels[] = {</div><div class='del'>-	"RxOverrun",</div><div class='del'>-	IGNLABEL("RxPlcpCrcErr"),</div><div class='del'>-	IGNLABEL("RxPlcpFormatErr"),</div><div class='del'>-	IGNLABEL("RxPlcpLengthErr"),</div><div class='del'>-	"RxMacCrcErr",</div><div class='del'>-	"RxMacCrcOk",</div><div class='del'>-	"RxWepErr",</div><div class='del'>-	"RxWepOk",</div><div class='del'>-	"RetryLong",</div><div class='del'>-	"RetryShort",</div><div class='del'>-	"MaxRetries",</div><div class='del'>-	"NoAck",</div><div class='del'>-	"NoCts",</div><div class='del'>-	"RxAck",</div><div class='del'>-	"RxCts",</div><div class='del'>-	"TxAck",</div><div class='del'>-	"TxRts",</div><div class='del'>-	"TxCts",</div><div class='del'>-	"TxMc",</div><div class='del'>-	"TxBc",</div><div class='del'>-	"TxUcFrags",</div><div class='del'>-	"TxUcPackets",</div><div class='del'>-	"TxBeacon",</div><div class='del'>-	"RxBeacon",</div><div class='del'>-	"TxSinColl",</div><div class='del'>-	"TxMulColl",</div><div class='del'>-	"DefersNo",</div><div class='del'>-	"DefersProt",</div><div class='del'>-	"DefersEngy",</div><div class='del'>-	"DupFram",</div><div class='del'>-	"RxFragDisc",</div><div class='del'>-	"TxAged",</div><div class='del'>-	"RxAged",</div><div class='del'>-	"LostSync-MaxRetry",</div><div class='del'>-	"LostSync-MissedBeacons",</div><div class='del'>-	"LostSync-ArlExceeded",</div><div class='del'>-	"LostSync-Deauth",</div><div class='del'>-	"LostSync-Disassoced",</div><div class='del'>-	"LostSync-TsfTiming",</div><div class='del'>-	"HostTxMc",</div><div class='del'>-	"HostTxBc",</div><div class='del'>-	"HostTxUc",</div><div class='del'>-	"HostTxFail",</div><div class='del'>-	"HostRxMc",</div><div class='del'>-	"HostRxBc",</div><div class='del'>-	"HostRxUc",</div><div class='del'>-	"HostRxDiscard",</div><div class='del'>-	IGNLABEL("HmacTxMc"),</div><div class='del'>-	IGNLABEL("HmacTxBc"),</div><div class='del'>-	IGNLABEL("HmacTxUc"),</div><div class='del'>-	IGNLABEL("HmacTxFail"),</div><div class='del'>-	IGNLABEL("HmacRxMc"),</div><div class='del'>-	IGNLABEL("HmacRxBc"),</div><div class='del'>-	IGNLABEL("HmacRxUc"),</div><div class='del'>-	IGNLABEL("HmacRxDiscard"),</div><div class='del'>-	IGNLABEL("HmacRxAccepted"),</div><div class='del'>-	"SsidMismatch",</div><div class='del'>-	"ApMismatch",</div><div class='del'>-	"RatesMismatch",</div><div class='del'>-	"AuthReject",</div><div class='del'>-	"AuthTimeout",</div><div class='del'>-	"AssocReject",</div><div class='del'>-	"AssocTimeout",</div><div class='del'>-	IGNLABEL("ReasonOutsideTable"),</div><div class='del'>-	IGNLABEL("ReasonStatus1"),</div><div class='del'>-	IGNLABEL("ReasonStatus2"),</div><div class='del'>-	IGNLABEL("ReasonStatus3"),</div><div class='del'>-	IGNLABEL("ReasonStatus4"),</div><div class='del'>-	IGNLABEL("ReasonStatus5"),</div><div class='del'>-	IGNLABEL("ReasonStatus6"),</div><div class='del'>-	IGNLABEL("ReasonStatus7"),</div><div class='del'>-	IGNLABEL("ReasonStatus8"),</div><div class='del'>-	IGNLABEL("ReasonStatus9"),</div><div class='del'>-	IGNLABEL("ReasonStatus10"),</div><div class='del'>-	IGNLABEL("ReasonStatus11"),</div><div class='del'>-	IGNLABEL("ReasonStatus12"),</div><div class='del'>-	IGNLABEL("ReasonStatus13"),</div><div class='del'>-	IGNLABEL("ReasonStatus14"),</div><div class='del'>-	IGNLABEL("ReasonStatus15"),</div><div class='del'>-	IGNLABEL("ReasonStatus16"),</div><div class='del'>-	IGNLABEL("ReasonStatus17"),</div><div class='del'>-	IGNLABEL("ReasonStatus18"),</div><div class='del'>-	IGNLABEL("ReasonStatus19"),</div><div class='del'>-	"RxMan",</div><div class='del'>-	"TxMan",</div><div class='del'>-	"RxRefresh",</div><div class='del'>-	"TxRefresh",</div><div class='del'>-	"RxPoll",</div><div class='del'>-	"TxPoll",</div><div class='del'>-	"HostRetries",</div><div class='del'>-	"LostSync-HostReq",</div><div class='del'>-	"HostTxBytes",</div><div class='del'>-	"HostRxBytes",</div><div class='del'>-	"ElapsedUsec",</div><div class='del'>-	"ElapsedSec",</div><div class='del'>-	"LostSyncBetterAP",</div><div class='del'>-	"PrivacyMismatch",</div><div class='del'>-	"Jammed",</div><div class='del'>-	"DiscRxNotWepped",</div><div class='del'>-	"PhyEleMismatch",</div><div class='del'>-	(char*)-1 };</div><div class='del'>-#ifndef RUN_AT</div><div class='del'>-#define RUN_AT(x) (jiffies+(x))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* These variables are for insmod, since it seems that the rates</div><div class='del'>-   can only be set in setup_card.  Rates should be a comma separated</div><div class='del'>-   (no spaces) list of rates (up to 8). */</div><div class='del'>-</div><div class='del'>-static int rates[8];</div><div class='del'>-static char *ssids[3];</div><div class='del'>-</div><div class='del'>-static int io[4];</div><div class='del'>-static int irq[4];</div><div class='del'>-</div><div class='del'>-static</div><div class='del'>-int maxencrypt /* = 0 */; /* The highest rate that the card can encrypt at.</div><div class='del'>-		       0 means no limit.  For old cards this was 4 */</div><div class='del'>-</div><div class='del'>-static int auto_wep /* = 0 */; /* If set, it tries to figure out the wep mode */</div><div class='del'>-static int aux_bap /* = 0 */; /* Checks to see if the aux ports are needed to read</div><div class='del'>-		    the bap, needed on some older cards and buses. */</div><div class='del'>-static int adhoc;</div><div class='del'>-</div><div class='del'>-static int probe = 1;</div><div class='del'>-</div><div class='del'>-static kuid_t proc_kuid;</div><div class='del'>-static int proc_uid /* = 0 */;</div><div class='del'>-</div><div class='del'>-static kgid_t proc_kgid;</div><div class='del'>-static int proc_gid /* = 0 */;</div><div class='del'>-</div><div class='del'>-static int airo_perm = 0555;</div><div class='del'>-</div><div class='del'>-static int proc_perm = 0644;</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Benjamin Reed");</div><div class='del'>-MODULE_DESCRIPTION("Support for Cisco/Aironet 802.11 wireless ethernet cards.  "</div><div class='del'>-		   "Direct support for ISA/PCI/MPI cards and support for PCMCIA when used with airo_cs.");</div><div class='del'>-MODULE_LICENSE("Dual BSD/GPL");</div><div class='del'>-module_param_hw_array(io, int, ioport, NULL, 0);</div><div class='del'>-module_param_hw_array(irq, int, irq, NULL, 0);</div><div class='del'>-module_param_array(rates, int, NULL, 0);</div><div class='del'>-module_param_array(ssids, charp, NULL, 0);</div><div class='del'>-module_param(auto_wep, int, 0);</div><div class='del'>-MODULE_PARM_DESC(auto_wep,</div><div class='del'>-		 "If non-zero, the driver will keep looping through the authentication options until an association is made.  "</div><div class='del'>-		 "The value of auto_wep is number of the wep keys to check.  "</div><div class='del'>-		 "A value of 2 will try using the key at index 0 and index 1.");</div><div class='del'>-module_param(aux_bap, int, 0);</div><div class='del'>-MODULE_PARM_DESC(aux_bap,</div><div class='del'>-		 "If non-zero, the driver will switch into a mode that seems to work better for older cards with some older buses.  "</div><div class='del'>-		 "Before switching it checks that the switch is needed.");</div><div class='del'>-module_param(maxencrypt, int, 0);</div><div class='del'>-MODULE_PARM_DESC(maxencrypt,</div><div class='del'>-		 "The maximum speed that the card can do encryption.  "</div><div class='del'>-		 "Units are in 512kbs.  "</div><div class='del'>-		 "Zero (default) means there is no limit.  "</div><div class='del'>-		 "Older cards used to be limited to 2mbs (4).");</div><div class='del'>-module_param(adhoc, int, 0);</div><div class='del'>-MODULE_PARM_DESC(adhoc, "If non-zero, the card will start in adhoc mode.");</div><div class='del'>-module_param(probe, int, 0);</div><div class='del'>-MODULE_PARM_DESC(probe, "If zero, the driver won't start the card.");</div><div class='del'>-</div><div class='del'>-module_param(proc_uid, int, 0);</div><div class='del'>-MODULE_PARM_DESC(proc_uid, "The uid that the /proc files will belong to.");</div><div class='del'>-module_param(proc_gid, int, 0);</div><div class='del'>-MODULE_PARM_DESC(proc_gid, "The gid that the /proc files will belong to.");</div><div class='del'>-module_param(airo_perm, int, 0);</div><div class='del'>-MODULE_PARM_DESC(airo_perm, "The permission bits of /proc/[driver/]aironet.");</div><div class='del'>-module_param(proc_perm, int, 0);</div><div class='del'>-MODULE_PARM_DESC(proc_perm, "The permission bits of the files in /proc");</div><div class='del'>-</div><div class='del'>-/* This is a kind of sloppy hack to get this information to OUT4500 and</div><div class='del'>-   IN4500.  I would be extremely interested in the situation where this</div><div class='del'>-   doesn't work though!!! */</div><div class='del'>-static int do8bitIO /* = 0 */;</div><div class='del'>-</div><div class='del'>-/* Return codes */</div><div class='del'>-#define SUCCESS 0</div><div class='del'>-#define ERROR -1</div><div class='del'>-#define NO_PACKET -2</div><div class='del'>-</div><div class='del'>-/* Commands */</div><div class='del'>-#define NOP2		0x0000</div><div class='del'>-#define MAC_ENABLE	0x0001</div><div class='del'>-#define MAC_DISABLE	0x0002</div><div class='del'>-#define CMD_LOSE_SYNC	0x0003 /* Not sure what this does... */</div><div class='del'>-#define CMD_SOFTRESET	0x0004</div><div class='del'>-#define HOSTSLEEP	0x0005</div><div class='del'>-#define CMD_MAGIC_PKT	0x0006</div><div class='del'>-#define CMD_SETWAKEMASK	0x0007</div><div class='del'>-#define CMD_READCFG	0x0008</div><div class='del'>-#define CMD_SETMODE	0x0009</div><div class='del'>-#define CMD_ALLOCATETX	0x000a</div><div class='del'>-#define CMD_TRANSMIT	0x000b</div><div class='del'>-#define CMD_DEALLOCATETX 0x000c</div><div class='del'>-#define NOP		0x0010</div><div class='del'>-#define CMD_WORKAROUND	0x0011</div><div class='del'>-#define CMD_ALLOCATEAUX 0x0020</div><div class='del'>-#define CMD_ACCESS	0x0021</div><div class='del'>-#define CMD_PCIBAP	0x0022</div><div class='del'>-#define CMD_PCIAUX	0x0023</div><div class='del'>-#define CMD_ALLOCBUF	0x0028</div><div class='del'>-#define CMD_GETTLV	0x0029</div><div class='del'>-#define CMD_PUTTLV	0x002a</div><div class='del'>-#define CMD_DELTLV	0x002b</div><div class='del'>-#define CMD_FINDNEXTTLV	0x002c</div><div class='del'>-#define CMD_PSPNODES	0x0030</div><div class='del'>-#define CMD_SETCW	0x0031</div><div class='del'>-#define CMD_SETPCF	0x0032</div><div class='del'>-#define CMD_SETPHYREG	0x003e</div><div class='del'>-#define CMD_TXTEST	0x003f</div><div class='del'>-#define MAC_ENABLETX	0x0101</div><div class='del'>-#define CMD_LISTBSS	0x0103</div><div class='del'>-#define CMD_SAVECFG	0x0108</div><div class='del'>-#define CMD_ENABLEAUX	0x0111</div><div class='del'>-#define CMD_WRITERID	0x0121</div><div class='del'>-#define CMD_USEPSPNODES	0x0130</div><div class='del'>-#define MAC_ENABLERX	0x0201</div><div class='del'>-</div><div class='del'>-/* Command errors */</div><div class='del'>-#define ERROR_QUALIF 0x00</div><div class='del'>-#define ERROR_ILLCMD 0x01</div><div class='del'>-#define ERROR_ILLFMT 0x02</div><div class='del'>-#define ERROR_INVFID 0x03</div><div class='del'>-#define ERROR_INVRID 0x04</div><div class='del'>-#define ERROR_LARGE 0x05</div><div class='del'>-#define ERROR_NDISABL 0x06</div><div class='del'>-#define ERROR_ALLOCBSY 0x07</div><div class='del'>-#define ERROR_NORD 0x0B</div><div class='del'>-#define ERROR_NOWR 0x0C</div><div class='del'>-#define ERROR_INVFIDTX 0x0D</div><div class='del'>-#define ERROR_TESTACT 0x0E</div><div class='del'>-#define ERROR_TAGNFND 0x12</div><div class='del'>-#define ERROR_DECODE 0x20</div><div class='del'>-#define ERROR_DESCUNAV 0x21</div><div class='del'>-#define ERROR_BADLEN 0x22</div><div class='del'>-#define ERROR_MODE 0x80</div><div class='del'>-#define ERROR_HOP 0x81</div><div class='del'>-#define ERROR_BINTER 0x82</div><div class='del'>-#define ERROR_RXMODE 0x83</div><div class='del'>-#define ERROR_MACADDR 0x84</div><div class='del'>-#define ERROR_RATES 0x85</div><div class='del'>-#define ERROR_ORDER 0x86</div><div class='del'>-#define ERROR_SCAN 0x87</div><div class='del'>-#define ERROR_AUTH 0x88</div><div class='del'>-#define ERROR_PSMODE 0x89</div><div class='del'>-#define ERROR_RTYPE 0x8A</div><div class='del'>-#define ERROR_DIVER 0x8B</div><div class='del'>-#define ERROR_SSID 0x8C</div><div class='del'>-#define ERROR_APLIST 0x8D</div><div class='del'>-#define ERROR_AUTOWAKE 0x8E</div><div class='del'>-#define ERROR_LEAP 0x8F</div><div class='del'>-</div><div class='del'>-/* Registers */</div><div class='del'>-#define COMMAND 0x00</div><div class='del'>-#define PARAM0 0x02</div><div class='del'>-#define PARAM1 0x04</div><div class='del'>-#define PARAM2 0x06</div><div class='del'>-#define STATUS 0x08</div><div class='del'>-#define RESP0 0x0a</div><div class='del'>-#define RESP1 0x0c</div><div class='del'>-#define RESP2 0x0e</div><div class='del'>-#define LINKSTAT 0x10</div><div class='del'>-#define SELECT0 0x18</div><div class='del'>-#define OFFSET0 0x1c</div><div class='del'>-#define RXFID 0x20</div><div class='del'>-#define TXALLOCFID 0x22</div><div class='del'>-#define TXCOMPLFID 0x24</div><div class='del'>-#define DATA0 0x36</div><div class='del'>-#define EVSTAT 0x30</div><div class='del'>-#define EVINTEN 0x32</div><div class='del'>-#define EVACK 0x34</div><div class='del'>-#define SWS0 0x28</div><div class='del'>-#define SWS1 0x2a</div><div class='del'>-#define SWS2 0x2c</div><div class='del'>-#define SWS3 0x2e</div><div class='del'>-#define AUXPAGE 0x3A</div><div class='del'>-#define AUXOFF 0x3C</div><div class='del'>-#define AUXDATA 0x3E</div><div class='del'>-</div><div class='del'>-#define FID_TX 1</div><div class='del'>-#define FID_RX 2</div><div class='del'>-/* Offset into aux memory for descriptors */</div><div class='del'>-#define AUX_OFFSET 0x800</div><div class='del'>-/* Size of allocated packets */</div><div class='del'>-#define PKTSIZE 1840</div><div class='del'>-#define RIDSIZE 2048</div><div class='del'>-/* Size of the transmit queue */</div><div class='del'>-#define MAXTXQ 64</div><div class='del'>-</div><div class='del'>-/* BAP selectors */</div><div class='del'>-#define BAP0 0 /* Used for receiving packets */</div><div class='del'>-#define BAP1 2 /* Used for xmiting packets and working with RIDS */</div><div class='del'>-</div><div class='del'>-/* Flags */</div><div class='del'>-#define COMMAND_BUSY 0x8000</div><div class='del'>-</div><div class='del'>-#define BAP_BUSY 0x8000</div><div class='del'>-#define BAP_ERR 0x4000</div><div class='del'>-#define BAP_DONE 0x2000</div><div class='del'>-</div><div class='del'>-#define PROMISC 0xffff</div><div class='del'>-#define NOPROMISC 0x0000</div><div class='del'>-</div><div class='del'>-#define EV_CMD 0x10</div><div class='del'>-#define EV_CLEARCOMMANDBUSY 0x4000</div><div class='del'>-#define EV_RX 0x01</div><div class='del'>-#define EV_TX 0x02</div><div class='del'>-#define EV_TXEXC 0x04</div><div class='del'>-#define EV_ALLOC 0x08</div><div class='del'>-#define EV_LINK 0x80</div><div class='del'>-#define EV_AWAKE 0x100</div><div class='del'>-#define EV_TXCPY 0x400</div><div class='del'>-#define EV_UNKNOWN 0x800</div><div class='del'>-#define EV_MIC 0x1000 /* Message Integrity Check Interrupt */</div><div class='del'>-#define EV_AWAKEN 0x2000</div><div class='del'>-#define STATUS_INTS (EV_AWAKE|EV_LINK|EV_TXEXC|EV_TX|EV_TXCPY|EV_RX|EV_MIC)</div><div class='del'>-</div><div class='del'>-#ifdef CHECK_UNKNOWN_INTS</div><div class='del'>-#define IGNORE_INTS (EV_CMD | EV_UNKNOWN)</div><div class='del'>-#else</div><div class='del'>-#define IGNORE_INTS (~STATUS_INTS)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* RID TYPES */</div><div class='del'>-#define RID_RW 0x20</div><div class='del'>-</div><div class='del'>-/* The RIDs */</div><div class='del'>-#define RID_CAPABILITIES 0xFF00</div><div class='del'>-#define RID_APINFO     0xFF01</div><div class='del'>-#define RID_RADIOINFO  0xFF02</div><div class='del'>-#define RID_UNKNOWN3   0xFF03</div><div class='del'>-#define RID_RSSI       0xFF04</div><div class='del'>-#define RID_CONFIG     0xFF10</div><div class='del'>-#define RID_SSID       0xFF11</div><div class='del'>-#define RID_APLIST     0xFF12</div><div class='del'>-#define RID_DRVNAME    0xFF13</div><div class='del'>-#define RID_ETHERENCAP 0xFF14</div><div class='del'>-#define RID_WEP_TEMP   0xFF15</div><div class='del'>-#define RID_WEP_PERM   0xFF16</div><div class='del'>-#define RID_MODULATION 0xFF17</div><div class='del'>-#define RID_OPTIONS    0xFF18</div><div class='del'>-#define RID_ACTUALCONFIG 0xFF20 /*readonly*/</div><div class='del'>-#define RID_FACTORYCONFIG 0xFF21</div><div class='del'>-#define RID_UNKNOWN22  0xFF22</div><div class='del'>-#define RID_LEAPUSERNAME 0xFF23</div><div class='del'>-#define RID_LEAPPASSWORD 0xFF24</div><div class='del'>-#define RID_STATUS     0xFF50</div><div class='del'>-#define RID_BEACON_HST 0xFF51</div><div class='del'>-#define RID_BUSY_HST   0xFF52</div><div class='del'>-#define RID_RETRIES_HST 0xFF53</div><div class='del'>-#define RID_UNKNOWN54  0xFF54</div><div class='del'>-#define RID_UNKNOWN55  0xFF55</div><div class='del'>-#define RID_UNKNOWN56  0xFF56</div><div class='del'>-#define RID_MIC        0xFF57</div><div class='del'>-#define RID_STATS16    0xFF60</div><div class='del'>-#define RID_STATS16DELTA 0xFF61</div><div class='del'>-#define RID_STATS16DELTACLEAR 0xFF62</div><div class='del'>-#define RID_STATS      0xFF68</div><div class='del'>-#define RID_STATSDELTA 0xFF69</div><div class='del'>-#define RID_STATSDELTACLEAR 0xFF6A</div><div class='del'>-#define RID_ECHOTEST_RID 0xFF70</div><div class='del'>-#define RID_ECHOTEST_RESULTS 0xFF71</div><div class='del'>-#define RID_BSSLISTFIRST 0xFF72</div><div class='del'>-#define RID_BSSLISTNEXT  0xFF73</div><div class='del'>-#define RID_WPA_BSSLISTFIRST 0xFF74</div><div class='del'>-#define RID_WPA_BSSLISTNEXT  0xFF75</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	u16 cmd;</div><div class='del'>-	u16 parm0;</div><div class='del'>-	u16 parm1;</div><div class='del'>-	u16 parm2;</div><div class='del'>-} Cmd;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	u16 status;</div><div class='del'>-	u16 rsp0;</div><div class='del'>-	u16 rsp1;</div><div class='del'>-	u16 rsp2;</div><div class='del'>-} Resp;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Rids and endian-ness:  The Rids will always be in cpu endian, since</div><div class='del'>- * this all the patches from the big-endian guys end up doing that.</div><div class='del'>- * so all rid access should use the read/writeXXXRid routines.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* This structure came from an email sent to me from an engineer at</div><div class='del'>-   aironet for inclusion into this driver */</div><div class='del'>-typedef struct WepKeyRid WepKeyRid;</div><div class='del'>-struct WepKeyRid {</div><div class='del'>-	__le16 len;</div><div class='del'>-	__le16 kindex;</div><div class='del'>-	u8 mac[ETH_ALEN];</div><div class='del'>-	__le16 klen;</div><div class='del'>-	u8 key[16];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* These structures are from the Aironet's PC4500 Developers Manual */</div><div class='del'>-typedef struct Ssid Ssid;</div><div class='del'>-struct Ssid {</div><div class='del'>-	__le16 len;</div><div class='del'>-	u8 ssid[32];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-typedef struct SsidRid SsidRid;</div><div class='del'>-struct SsidRid {</div><div class='del'>-	__le16 len;</div><div class='del'>-	Ssid ssids[3];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-typedef struct ModulationRid ModulationRid;</div><div class='del'>-struct ModulationRid {</div><div class='del'>-        __le16 len;</div><div class='del'>-        __le16 modulation;</div><div class='del'>-#define MOD_DEFAULT cpu_to_le16(0)</div><div class='del'>-#define MOD_CCK cpu_to_le16(1)</div><div class='del'>-#define MOD_MOK cpu_to_le16(2)</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-typedef struct ConfigRid ConfigRid;</div><div class='del'>-struct ConfigRid {</div><div class='del'>-	__le16 len; /* sizeof(ConfigRid) */</div><div class='del'>-	__le16 opmode; /* operating mode */</div><div class='del'>-#define MODE_STA_IBSS cpu_to_le16(0)</div><div class='del'>-#define MODE_STA_ESS cpu_to_le16(1)</div><div class='del'>-#define MODE_AP cpu_to_le16(2)</div><div class='del'>-#define MODE_AP_RPTR cpu_to_le16(3)</div><div class='del'>-#define MODE_CFG_MASK cpu_to_le16(0xff)</div><div class='del'>-#define MODE_ETHERNET_HOST cpu_to_le16(0&lt;&lt;8) /* rx payloads converted */</div><div class='del'>-#define MODE_LLC_HOST cpu_to_le16(1&lt;&lt;8) /* rx payloads left as is */</div><div class='del'>-#define MODE_AIRONET_EXTEND cpu_to_le16(1&lt;&lt;9) /* enable Aironet extenstions */</div><div class='del'>-#define MODE_AP_INTERFACE cpu_to_le16(1&lt;&lt;10) /* enable ap interface extensions */</div><div class='del'>-#define MODE_ANTENNA_ALIGN cpu_to_le16(1&lt;&lt;11) /* enable antenna alignment */</div><div class='del'>-#define MODE_ETHER_LLC cpu_to_le16(1&lt;&lt;12) /* enable ethernet LLC */</div><div class='del'>-#define MODE_LEAF_NODE cpu_to_le16(1&lt;&lt;13) /* enable leaf node bridge */</div><div class='del'>-#define MODE_CF_POLLABLE cpu_to_le16(1&lt;&lt;14) /* enable CF pollable */</div><div class='del'>-#define MODE_MIC cpu_to_le16(1&lt;&lt;15) /* enable MIC */</div><div class='del'>-	__le16 rmode; /* receive mode */</div><div class='del'>-#define RXMODE_BC_MC_ADDR cpu_to_le16(0)</div><div class='del'>-#define RXMODE_BC_ADDR cpu_to_le16(1) /* ignore multicasts */</div><div class='del'>-#define RXMODE_ADDR cpu_to_le16(2) /* ignore multicast and broadcast */</div><div class='del'>-#define RXMODE_RFMON cpu_to_le16(3) /* wireless monitor mode */</div><div class='del'>-#define RXMODE_RFMON_ANYBSS cpu_to_le16(4)</div><div class='del'>-#define RXMODE_LANMON cpu_to_le16(5) /* lan style monitor -- data packets only */</div><div class='del'>-#define RXMODE_MASK cpu_to_le16(255)</div><div class='del'>-#define RXMODE_DISABLE_802_3_HEADER cpu_to_le16(1&lt;&lt;8) /* disables 802.3 header on rx */</div><div class='del'>-#define RXMODE_FULL_MASK (RXMODE_MASK | RXMODE_DISABLE_802_3_HEADER)</div><div class='del'>-#define RXMODE_NORMALIZED_RSSI cpu_to_le16(1&lt;&lt;9) /* return normalized RSSI */</div><div class='del'>-	__le16 fragThresh;</div><div class='del'>-	__le16 rtsThres;</div><div class='del'>-	u8 macAddr[ETH_ALEN];</div><div class='del'>-	u8 rates[8];</div><div class='del'>-	__le16 shortRetryLimit;</div><div class='del'>-	__le16 longRetryLimit;</div><div class='del'>-	__le16 txLifetime; /* in kusec */</div><div class='del'>-	__le16 rxLifetime; /* in kusec */</div><div class='del'>-	__le16 stationary;</div><div class='del'>-	__le16 ordering;</div><div class='del'>-	__le16 u16deviceType; /* for overriding device type */</div><div class='del'>-	__le16 cfpRate;</div><div class='del'>-	__le16 cfpDuration;</div><div class='del'>-	__le16 _reserved1[3];</div><div class='del'>-	/*---------- Scanning/Associating ----------*/</div><div class='del'>-	__le16 scanMode;</div><div class='del'>-#define SCANMODE_ACTIVE cpu_to_le16(0)</div><div class='del'>-#define SCANMODE_PASSIVE cpu_to_le16(1)</div><div class='del'>-#define SCANMODE_AIROSCAN cpu_to_le16(2)</div><div class='del'>-	__le16 probeDelay; /* in kusec */</div><div class='del'>-	__le16 probeEnergyTimeout; /* in kusec */</div><div class='del'>-        __le16 probeResponseTimeout;</div><div class='del'>-	__le16 beaconListenTimeout;</div><div class='del'>-	__le16 joinNetTimeout;</div><div class='del'>-	__le16 authTimeout;</div><div class='del'>-	__le16 authType;</div><div class='del'>-#define AUTH_OPEN cpu_to_le16(0x1)</div><div class='del'>-#define AUTH_ENCRYPT cpu_to_le16(0x101)</div><div class='del'>-#define AUTH_SHAREDKEY cpu_to_le16(0x102)</div><div class='del'>-#define AUTH_ALLOW_UNENCRYPTED cpu_to_le16(0x200)</div><div class='del'>-	__le16 associationTimeout;</div><div class='del'>-	__le16 specifiedApTimeout;</div><div class='del'>-	__le16 offlineScanInterval;</div><div class='del'>-	__le16 offlineScanDuration;</div><div class='del'>-	__le16 linkLossDelay;</div><div class='del'>-	__le16 maxBeaconLostTime;</div><div class='del'>-	__le16 refreshInterval;</div><div class='del'>-#define DISABLE_REFRESH cpu_to_le16(0xFFFF)</div><div class='del'>-	__le16 _reserved1a[1];</div><div class='del'>-	/*---------- Power save operation ----------*/</div><div class='del'>-	__le16 powerSaveMode;</div><div class='del'>-#define POWERSAVE_CAM cpu_to_le16(0)</div><div class='del'>-#define POWERSAVE_PSP cpu_to_le16(1)</div><div class='del'>-#define POWERSAVE_PSPCAM cpu_to_le16(2)</div><div class='del'>-	__le16 sleepForDtims;</div><div class='del'>-	__le16 listenInterval;</div><div class='del'>-	__le16 fastListenInterval;</div><div class='del'>-	__le16 listenDecay;</div><div class='del'>-	__le16 fastListenDelay;</div><div class='del'>-	__le16 _reserved2[2];</div><div class='del'>-	/*---------- Ap/Ibss config items ----------*/</div><div class='del'>-	__le16 beaconPeriod;</div><div class='del'>-	__le16 atimDuration;</div><div class='del'>-	__le16 hopPeriod;</div><div class='del'>-	__le16 channelSet;</div><div class='del'>-	__le16 channel;</div><div class='del'>-	__le16 dtimPeriod;</div><div class='del'>-	__le16 bridgeDistance;</div><div class='del'>-	__le16 radioID;</div><div class='del'>-	/*---------- Radio configuration ----------*/</div><div class='del'>-	__le16 radioType;</div><div class='del'>-#define RADIOTYPE_DEFAULT cpu_to_le16(0)</div><div class='del'>-#define RADIOTYPE_802_11 cpu_to_le16(1)</div><div class='del'>-#define RADIOTYPE_LEGACY cpu_to_le16(2)</div><div class='del'>-	u8 rxDiversity;</div><div class='del'>-	u8 txDiversity;</div><div class='del'>-	__le16 txPower;</div><div class='del'>-#define TXPOWER_DEFAULT 0</div><div class='del'>-	__le16 rssiThreshold;</div><div class='del'>-#define RSSI_DEFAULT 0</div><div class='del'>-        __le16 modulation;</div><div class='del'>-#define PREAMBLE_AUTO cpu_to_le16(0)</div><div class='del'>-#define PREAMBLE_LONG cpu_to_le16(1)</div><div class='del'>-#define PREAMBLE_SHORT cpu_to_le16(2)</div><div class='del'>-	__le16 preamble;</div><div class='del'>-	__le16 homeProduct;</div><div class='del'>-	__le16 radioSpecific;</div><div class='del'>-	/*---------- Aironet Extensions ----------*/</div><div class='del'>-	u8 nodeName[16];</div><div class='del'>-	__le16 arlThreshold;</div><div class='del'>-	__le16 arlDecay;</div><div class='del'>-	__le16 arlDelay;</div><div class='del'>-	__le16 _reserved4[1];</div><div class='del'>-	/*---------- Aironet Extensions ----------*/</div><div class='del'>-	u8 magicAction;</div><div class='del'>-#define MAGIC_ACTION_STSCHG 1</div><div class='del'>-#define MAGIC_ACTION_RESUME 2</div><div class='del'>-#define MAGIC_IGNORE_MCAST (1&lt;&lt;8)</div><div class='del'>-#define MAGIC_IGNORE_BCAST (1&lt;&lt;9)</div><div class='del'>-#define MAGIC_SWITCH_TO_PSP (0&lt;&lt;10)</div><div class='del'>-#define MAGIC_STAY_IN_CAM (1&lt;&lt;10)</div><div class='del'>-	u8 magicControl;</div><div class='del'>-	__le16 autoWake;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-typedef struct StatusRid StatusRid;</div><div class='del'>-struct StatusRid {</div><div class='del'>-	__le16 len;</div><div class='del'>-	u8 mac[ETH_ALEN];</div><div class='del'>-	__le16 mode;</div><div class='del'>-	__le16 errorCode;</div><div class='del'>-	__le16 sigQuality;</div><div class='del'>-	__le16 SSIDlen;</div><div class='del'>-	char SSID[32];</div><div class='del'>-	char apName[16];</div><div class='del'>-	u8 bssid[4][ETH_ALEN];</div><div class='del'>-	__le16 beaconPeriod;</div><div class='del'>-	__le16 dimPeriod;</div><div class='del'>-	__le16 atimDuration;</div><div class='del'>-	__le16 hopPeriod;</div><div class='del'>-	__le16 channelSet;</div><div class='del'>-	__le16 channel;</div><div class='del'>-	__le16 hopsToBackbone;</div><div class='del'>-	__le16 apTotalLoad;</div><div class='del'>-	__le16 generatedLoad;</div><div class='del'>-	__le16 accumulatedArl;</div><div class='del'>-	__le16 signalQuality;</div><div class='del'>-	__le16 currentXmitRate;</div><div class='del'>-	__le16 apDevExtensions;</div><div class='del'>-	__le16 normalizedSignalStrength;</div><div class='del'>-	__le16 shortPreamble;</div><div class='del'>-	u8 apIP[4];</div><div class='del'>-	u8 noisePercent; /* Noise percent in last second */</div><div class='del'>-	u8 noisedBm; /* Noise dBm in last second */</div><div class='del'>-	u8 noiseAvePercent; /* Noise percent in last minute */</div><div class='del'>-	u8 noiseAvedBm; /* Noise dBm in last minute */</div><div class='del'>-	u8 noiseMaxPercent; /* Highest noise percent in last minute */</div><div class='del'>-	u8 noiseMaxdBm; /* Highest noise dbm in last minute */</div><div class='del'>-	__le16 load;</div><div class='del'>-	u8 carrier[4];</div><div class='del'>-	__le16 assocStatus;</div><div class='del'>-#define STAT_NOPACKETS 0</div><div class='del'>-#define STAT_NOCARRIERSET 10</div><div class='del'>-#define STAT_GOTCARRIERSET 11</div><div class='del'>-#define STAT_WRONGSSID 20</div><div class='del'>-#define STAT_BADCHANNEL 25</div><div class='del'>-#define STAT_BADBITRATES 30</div><div class='del'>-#define STAT_BADPRIVACY 35</div><div class='del'>-#define STAT_APFOUND 40</div><div class='del'>-#define STAT_APREJECTED 50</div><div class='del'>-#define STAT_AUTHENTICATING 60</div><div class='del'>-#define STAT_DEAUTHENTICATED 61</div><div class='del'>-#define STAT_AUTHTIMEOUT 62</div><div class='del'>-#define STAT_ASSOCIATING 70</div><div class='del'>-#define STAT_DEASSOCIATED 71</div><div class='del'>-#define STAT_ASSOCTIMEOUT 72</div><div class='del'>-#define STAT_NOTAIROAP 73</div><div class='del'>-#define STAT_ASSOCIATED 80</div><div class='del'>-#define STAT_LEAPING 90</div><div class='del'>-#define STAT_LEAPFAILED 91</div><div class='del'>-#define STAT_LEAPTIMEDOUT 92</div><div class='del'>-#define STAT_LEAPCOMPLETE 93</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-typedef struct StatsRid StatsRid;</div><div class='del'>-struct StatsRid {</div><div class='del'>-	__le16 len;</div><div class='del'>-	__le16 spacer;</div><div class='del'>-	__le32 vals[100];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-typedef struct APListRid APListRid;</div><div class='del'>-struct APListRid {</div><div class='del'>-	__le16 len;</div><div class='del'>-	u8 ap[4][ETH_ALEN];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-typedef struct CapabilityRid CapabilityRid;</div><div class='del'>-struct CapabilityRid {</div><div class='del'>-	__le16 len;</div><div class='del'>-	char oui[3];</div><div class='del'>-	char zero;</div><div class='del'>-	__le16 prodNum;</div><div class='del'>-	char manName[32];</div><div class='del'>-	char prodName[16];</div><div class='del'>-	char prodVer[8];</div><div class='del'>-	char factoryAddr[ETH_ALEN];</div><div class='del'>-	char aironetAddr[ETH_ALEN];</div><div class='del'>-	__le16 radioType;</div><div class='del'>-	__le16 country;</div><div class='del'>-	char callid[ETH_ALEN];</div><div class='del'>-	char supportedRates[8];</div><div class='del'>-	char rxDiversity;</div><div class='del'>-	char txDiversity;</div><div class='del'>-	__le16 txPowerLevels[8];</div><div class='del'>-	__le16 hardVer;</div><div class='del'>-	__le16 hardCap;</div><div class='del'>-	__le16 tempRange;</div><div class='del'>-	__le16 softVer;</div><div class='del'>-	__le16 softSubVer;</div><div class='del'>-	__le16 interfaceVer;</div><div class='del'>-	__le16 softCap;</div><div class='del'>-	__le16 bootBlockVer;</div><div class='del'>-	__le16 requiredHard;</div><div class='del'>-	__le16 extSoftCap;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* Only present on firmware &gt;= 5.30.17 */</div><div class='del'>-typedef struct BSSListRidExtra BSSListRidExtra;</div><div class='del'>-struct BSSListRidExtra {</div><div class='del'>-  __le16 unknown[4];</div><div class='del'>-  u8 fixed[12]; /* WLAN management frame */</div><div class='del'>-  u8 iep[624];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-typedef struct BSSListRid BSSListRid;</div><div class='del'>-struct BSSListRid {</div><div class='del'>-  __le16 len;</div><div class='del'>-  __le16 index; /* First is 0 and 0xffff means end of list */</div><div class='del'>-#define RADIO_FH 1 /* Frequency hopping radio type */</div><div class='del'>-#define RADIO_DS 2 /* Direct sequence radio type */</div><div class='del'>-#define RADIO_TMA 4 /* Proprietary radio used in old cards (2500) */</div><div class='del'>-  __le16 radioType;</div><div class='del'>-  u8 bssid[ETH_ALEN]; /* Mac address of the BSS */</div><div class='del'>-  u8 zero;</div><div class='del'>-  u8 ssidLen;</div><div class='del'>-  u8 ssid[32];</div><div class='del'>-  __le16 dBm;</div><div class='del'>-#define CAP_ESS cpu_to_le16(1&lt;&lt;0)</div><div class='del'>-#define CAP_IBSS cpu_to_le16(1&lt;&lt;1)</div><div class='del'>-#define CAP_PRIVACY cpu_to_le16(1&lt;&lt;4)</div><div class='del'>-#define CAP_SHORTHDR cpu_to_le16(1&lt;&lt;5)</div><div class='del'>-  __le16 cap;</div><div class='del'>-  __le16 beaconInterval;</div><div class='del'>-  u8 rates[8]; /* Same as rates for config rid */</div><div class='del'>-  struct { /* For frequency hopping only */</div><div class='del'>-    __le16 dwell;</div><div class='del'>-    u8 hopSet;</div><div class='del'>-    u8 hopPattern;</div><div class='del'>-    u8 hopIndex;</div><div class='del'>-    u8 fill;</div><div class='del'>-  } fh;</div><div class='del'>-  __le16 dsChannel;</div><div class='del'>-  __le16 atimWindow;</div><div class='del'>-</div><div class='del'>-  /* Only present on firmware &gt;= 5.30.17 */</div><div class='del'>-  BSSListRidExtra extra;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-  BSSListRid bss;</div><div class='del'>-  struct list_head list;</div><div class='del'>-} BSSListElement;</div><div class='del'>-</div><div class='del'>-typedef struct tdsRssiEntry tdsRssiEntry;</div><div class='del'>-struct tdsRssiEntry {</div><div class='del'>-  u8 rssipct;</div><div class='del'>-  u8 rssidBm;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-typedef struct tdsRssiRid tdsRssiRid;</div><div class='del'>-struct tdsRssiRid {</div><div class='del'>-  u16 len;</div><div class='del'>-  tdsRssiEntry x[256];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-typedef struct MICRid MICRid;</div><div class='del'>-struct MICRid {</div><div class='del'>-	__le16 len;</div><div class='del'>-	__le16 state;</div><div class='del'>-	__le16 multicastValid;</div><div class='del'>-	u8  multicast[16];</div><div class='del'>-	__le16 unicastValid;</div><div class='del'>-	u8  unicast[16];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-typedef struct MICBuffer MICBuffer;</div><div class='del'>-struct MICBuffer {</div><div class='del'>-	__be16 typelen;</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-	    u8 snap[8];</div><div class='del'>-	    struct {</div><div class='del'>-		u8 dsap;</div><div class='del'>-		u8 ssap;</div><div class='del'>-		u8 control;</div><div class='del'>-		u8 orgcode[3];</div><div class='del'>-		u8 fieldtype[2];</div><div class='del'>-	    } llc;</div><div class='del'>-	} u;</div><div class='del'>-	__be32 mic;</div><div class='del'>-	__be32 seq;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	u8 da[ETH_ALEN];</div><div class='del'>-	u8 sa[ETH_ALEN];</div><div class='del'>-} etherHead;</div><div class='del'>-</div><div class='del'>-#define TXCTL_TXOK (1&lt;&lt;1) /* report if tx is ok */</div><div class='del'>-#define TXCTL_TXEX (1&lt;&lt;2) /* report if tx fails */</div><div class='del'>-#define TXCTL_802_3 (0&lt;&lt;3) /* 802.3 packet */</div><div class='del'>-#define TXCTL_802_11 (1&lt;&lt;3) /* 802.11 mac packet */</div><div class='del'>-#define TXCTL_ETHERNET (0&lt;&lt;4) /* payload has ethertype */</div><div class='del'>-#define TXCTL_LLC (1&lt;&lt;4) /* payload is llc */</div><div class='del'>-#define TXCTL_RELEASE (0&lt;&lt;5) /* release after completion */</div><div class='del'>-#define TXCTL_NORELEASE (1&lt;&lt;5) /* on completion returns to host */</div><div class='del'>-</div><div class='del'>-#define BUSY_FID 0x10000</div><div class='del'>-</div><div class='del'>-#ifdef CISCO_EXT</div><div class='del'>-#define AIROMAGIC	0xa55a</div><div class='del'>-/* Warning : SIOCDEVPRIVATE may disapear during 2.5.X - Jean II */</div><div class='del'>-#ifdef SIOCIWFIRSTPRIV</div><div class='del'>-#ifdef SIOCDEVPRIVATE</div><div class='del'>-#define AIROOLDIOCTL	SIOCDEVPRIVATE</div><div class='del'>-#define AIROOLDIDIFC 	AIROOLDIOCTL + 1</div><div class='del'>-#endif /* SIOCDEVPRIVATE */</div><div class='del'>-#else /* SIOCIWFIRSTPRIV */</div><div class='del'>-#define SIOCIWFIRSTPRIV SIOCDEVPRIVATE</div><div class='del'>-#endif /* SIOCIWFIRSTPRIV */</div><div class='del'>-/* This may be wrong. When using the new SIOCIWFIRSTPRIV range, we probably</div><div class='del'>- * should use only "GET" ioctls (last bit set to 1). "SET" ioctls are root</div><div class='del'>- * only and don't return the modified struct ifreq to the application which</div><div class='del'>- * is usually a problem. - Jean II */</div><div class='del'>-#define AIROIOCTL	SIOCIWFIRSTPRIV</div><div class='del'>-#define AIROIDIFC 	AIROIOCTL + 1</div><div class='del'>-</div><div class='del'>-/* Ioctl constants to be used in airo_ioctl.command */</div><div class='del'>-</div><div class='del'>-#define	AIROGCAP  		0	// Capability rid</div><div class='del'>-#define AIROGCFG		1       // USED A LOT</div><div class='del'>-#define AIROGSLIST		2	// System ID list</div><div class='del'>-#define AIROGVLIST		3       // List of specified AP's</div><div class='del'>-#define AIROGDRVNAM		4	//  NOTUSED</div><div class='del'>-#define AIROGEHTENC		5	// NOTUSED</div><div class='del'>-#define AIROGWEPKTMP		6</div><div class='del'>-#define AIROGWEPKNV		7</div><div class='del'>-#define AIROGSTAT		8</div><div class='del'>-#define AIROGSTATSC32		9</div><div class='del'>-#define AIROGSTATSD32		10</div><div class='del'>-#define AIROGMICRID		11</div><div class='del'>-#define AIROGMICSTATS		12</div><div class='del'>-#define AIROGFLAGS		13</div><div class='del'>-#define AIROGID			14</div><div class='del'>-#define AIRORRID		15</div><div class='del'>-#define AIRORSWVERSION		17</div><div class='del'>-</div><div class='del'>-/* Leave gap of 40 commands after AIROGSTATSD32 for future */</div><div class='del'>-</div><div class='del'>-#define AIROPCAP               	AIROGSTATSD32 + 40</div><div class='del'>-#define AIROPVLIST              AIROPCAP      + 1</div><div class='del'>-#define AIROPSLIST		AIROPVLIST    + 1</div><div class='del'>-#define AIROPCFG		AIROPSLIST    + 1</div><div class='del'>-#define AIROPSIDS		AIROPCFG      + 1</div><div class='del'>-#define AIROPAPLIST		AIROPSIDS     + 1</div><div class='del'>-#define AIROPMACON		AIROPAPLIST   + 1	/* Enable mac  */</div><div class='del'>-#define AIROPMACOFF		AIROPMACON    + 1 	/* Disable mac */</div><div class='del'>-#define AIROPSTCLR		AIROPMACOFF   + 1</div><div class='del'>-#define AIROPWEPKEY		AIROPSTCLR    + 1</div><div class='del'>-#define AIROPWEPKEYNV		AIROPWEPKEY   + 1</div><div class='del'>-#define AIROPLEAPPWD            AIROPWEPKEYNV + 1</div><div class='del'>-#define AIROPLEAPUSR            AIROPLEAPPWD  + 1</div><div class='del'>-</div><div class='del'>-/* Flash codes */</div><div class='del'>-</div><div class='del'>-#define AIROFLSHRST	       AIROPWEPKEYNV  + 40</div><div class='del'>-#define AIROFLSHGCHR           AIROFLSHRST    + 1</div><div class='del'>-#define AIROFLSHSTFL           AIROFLSHGCHR   + 1</div><div class='del'>-#define AIROFLSHPCHR           AIROFLSHSTFL   + 1</div><div class='del'>-#define AIROFLPUTBUF           AIROFLSHPCHR   + 1</div><div class='del'>-#define AIRORESTART            AIROFLPUTBUF   + 1</div><div class='del'>-</div><div class='del'>-#define FLASHSIZE	32768</div><div class='del'>-#define AUXMEMSIZE	(256 * 1024)</div><div class='del'>-</div><div class='del'>-typedef struct aironet_ioctl {</div><div class='del'>-	unsigned short command;		// What to do</div><div class='del'>-	unsigned short len;		// Len of data</div><div class='del'>-	unsigned short ridnum;		// rid number</div><div class='del'>-	unsigned char __user *data;	// d-data</div><div class='del'>-} aironet_ioctl;</div><div class='del'>-</div><div class='del'>-static const char swversion[] = "2.1";</div><div class='del'>-#endif /* CISCO_EXT */</div><div class='del'>-</div><div class='del'>-#define NUM_MODULES       2</div><div class='del'>-#define MIC_MSGLEN_MAX    2400</div><div class='del'>-#define EMMH32_MSGLEN_MAX MIC_MSGLEN_MAX</div><div class='del'>-#define AIRO_DEF_MTU      2312</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	u32   size;            // size</div><div class='del'>-	u8    enabled;         // MIC enabled or not</div><div class='del'>-	u32   rxSuccess;       // successful packets received</div><div class='del'>-	u32   rxIncorrectMIC;  // pkts dropped due to incorrect MIC comparison</div><div class='del'>-	u32   rxNotMICed;      // pkts dropped due to not being MIC'd</div><div class='del'>-	u32   rxMICPlummed;    // pkts dropped due to not having a MIC plummed</div><div class='del'>-	u32   rxWrongSequence; // pkts dropped due to sequence number violation</div><div class='del'>-	u32   reserve[32];</div><div class='del'>-} mic_statistics;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	__be32 coeff[((EMMH32_MSGLEN_MAX)+3)&gt;&gt;2];</div><div class='del'>-	u64 accum;	// accumulated mic, reduced to u32 in final()</div><div class='del'>-	int position;	// current position (byte offset) in message</div><div class='del'>-	union {</div><div class='del'>-		u8  d8[4];</div><div class='del'>-		__be32 d32;</div><div class='del'>-	} part;	// saves partial message word across update() calls</div><div class='del'>-} emmh32_context;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	emmh32_context seed;	    // Context - the seed</div><div class='del'>-	u32		 rx;	    // Received sequence number</div><div class='del'>-	u32		 tx;	    // Tx sequence number</div><div class='del'>-	u32		 window;    // Start of window</div><div class='del'>-	u8		 valid;	    // Flag to say if context is valid or not</div><div class='del'>-	u8		 key[16];</div><div class='del'>-} miccntx;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	miccntx mCtx;		// Multicast context</div><div class='del'>-	miccntx uCtx;		// Unicast context</div><div class='del'>-} mic_module;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	unsigned int  rid: 16;</div><div class='del'>-	unsigned int  len: 15;</div><div class='del'>-	unsigned int  valid: 1;</div><div class='del'>-	dma_addr_t host_addr;</div><div class='del'>-} Rid;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	unsigned int  offset: 15;</div><div class='del'>-	unsigned int  eoc: 1;</div><div class='del'>-	unsigned int  len: 15;</div><div class='del'>-	unsigned int  valid: 1;</div><div class='del'>-	dma_addr_t host_addr;</div><div class='del'>-} TxFid;</div><div class='del'>-</div><div class='del'>-struct rx_hdr {</div><div class='del'>-	__le16 status, len;</div><div class='del'>-	u8 rssi[2];</div><div class='del'>-	u8 rate;</div><div class='del'>-	u8 freq;</div><div class='del'>-	__le16 tmp[4];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	unsigned int  ctl: 15;</div><div class='del'>-	unsigned int  rdy: 1;</div><div class='del'>-	unsigned int  len: 15;</div><div class='del'>-	unsigned int  valid: 1;</div><div class='del'>-	dma_addr_t host_addr;</div><div class='del'>-} RxFid;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Host receive descriptor</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	unsigned char __iomem *card_ram_off; /* offset into card memory of the</div><div class='del'>-						desc */</div><div class='del'>-	RxFid         rx_desc;		     /* card receive descriptor */</div><div class='del'>-	char          *virtual_host_addr;    /* virtual address of host receive</div><div class='del'>-					        buffer */</div><div class='del'>-	int           pending;</div><div class='del'>-} HostRxDesc;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Host transmit descriptor</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	unsigned char __iomem *card_ram_off;	     /* offset into card memory of the</div><div class='del'>-						desc */</div><div class='del'>-	TxFid         tx_desc;		     /* card transmit descriptor */</div><div class='del'>-	char          *virtual_host_addr;    /* virtual address of host receive</div><div class='del'>-					        buffer */</div><div class='del'>-	int           pending;</div><div class='del'>-} HostTxDesc;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Host RID descriptor</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	unsigned char __iomem *card_ram_off;      /* offset into card memory of the</div><div class='del'>-					     descriptor */</div><div class='del'>-	Rid           rid_desc;		  /* card RID descriptor */</div><div class='del'>-	char          *virtual_host_addr; /* virtual address of host receive</div><div class='del'>-					     buffer */</div><div class='del'>-} HostRidDesc;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	u16 sw0;</div><div class='del'>-	u16 sw1;</div><div class='del'>-	u16 status;</div><div class='del'>-	u16 len;</div><div class='del'>-#define HOST_SET (1 &lt;&lt; 0)</div><div class='del'>-#define HOST_INT_TX (1 &lt;&lt; 1) /* Interrupt on successful TX */</div><div class='del'>-#define HOST_INT_TXERR (1 &lt;&lt; 2) /* Interrupt on unseccessful TX */</div><div class='del'>-#define HOST_LCC_PAYLOAD (1 &lt;&lt; 4) /* LLC payload, 0 = Ethertype */</div><div class='del'>-#define HOST_DONT_RLSE (1 &lt;&lt; 5) /* Don't release buffer when done */</div><div class='del'>-#define HOST_DONT_RETRY (1 &lt;&lt; 6) /* Don't retry trasmit */</div><div class='del'>-#define HOST_CLR_AID (1 &lt;&lt; 7) /* clear AID failure */</div><div class='del'>-#define HOST_RTS (1 &lt;&lt; 9) /* Force RTS use */</div><div class='del'>-#define HOST_SHORT (1 &lt;&lt; 10) /* Do short preamble */</div><div class='del'>-	u16 ctl;</div><div class='del'>-	u16 aid;</div><div class='del'>-	u16 retries;</div><div class='del'>-	u16 fill;</div><div class='del'>-} TxCtlHdr;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-        u16 ctl;</div><div class='del'>-        u16 duration;</div><div class='del'>-        char addr1[6];</div><div class='del'>-        char addr2[6];</div><div class='del'>-        char addr3[6];</div><div class='del'>-        u16 seq;</div><div class='del'>-        char addr4[6];</div><div class='del'>-} WifiHdr;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	TxCtlHdr ctlhdr;</div><div class='del'>-	u16 fill1;</div><div class='del'>-	u16 fill2;</div><div class='del'>-	WifiHdr wifihdr;</div><div class='del'>-	u16 gaplen;</div><div class='del'>-	u16 status;</div><div class='del'>-} WifiCtlHdr;</div><div class='del'>-</div><div class='del'>-static WifiCtlHdr wifictlhdr8023 = {</div><div class='del'>-	.ctlhdr = {</div><div class='del'>-		.ctl	= HOST_DONT_RLSE,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-// A few details needed for WEP (Wireless Equivalent Privacy)</div><div class='del'>-#define MAX_KEY_SIZE 13			// 128 (?) bits</div><div class='del'>-#define MIN_KEY_SIZE  5			// 40 bits RC4 - WEP</div><div class='del'>-typedef struct wep_key_t {</div><div class='del'>-	u16	len;</div><div class='del'>-	u8	key[16];	/* 40-bit and 104-bit keys */</div><div class='del'>-} wep_key_t;</div><div class='del'>-</div><div class='del'>-/* List of Wireless Handlers (new API) */</div><div class='del'>-static const struct iw_handler_def	airo_handler_def;</div><div class='del'>-</div><div class='del'>-static const char version[] = "airo.c 0.6 (Ben Reed &amp; Javier Achirica)";</div><div class='del'>-</div><div class='del'>-struct airo_info;</div><div class='del'>-</div><div class='del'>-static int get_dec_u16(char *buffer, int *start, int limit);</div><div class='del'>-static void OUT4500(struct airo_info *, u16 reg, u16 value);</div><div class='del'>-static unsigned short IN4500(struct airo_info *, u16 reg);</div><div class='del'>-static u16 setup_card(struct airo_info*, u8 *mac, int lock);</div><div class='del'>-static int enable_MAC(struct airo_info *ai, int lock);</div><div class='del'>-static void disable_MAC(struct airo_info *ai, int lock);</div><div class='del'>-static void enable_interrupts(struct airo_info*);</div><div class='del'>-static void disable_interrupts(struct airo_info*);</div><div class='del'>-static u16 issuecommand(struct airo_info*, Cmd *pCmd, Resp *pRsp,</div><div class='del'>-			bool may_sleep);</div><div class='del'>-static int bap_setup(struct airo_info*, u16 rid, u16 offset, int whichbap);</div><div class='del'>-static int aux_bap_read(struct airo_info*, __le16 *pu16Dst, int bytelen,</div><div class='del'>-			int whichbap);</div><div class='del'>-static int fast_bap_read(struct airo_info*, __le16 *pu16Dst, int bytelen,</div><div class='del'>-			 int whichbap);</div><div class='del'>-static int bap_write(struct airo_info*, const __le16 *pu16Src, int bytelen,</div><div class='del'>-		     int whichbap);</div><div class='del'>-static int PC4500_accessrid(struct airo_info*, u16 rid, u16 accmd);</div><div class='del'>-static int PC4500_readrid(struct airo_info*, u16 rid, void *pBuf, int len, int lock);</div><div class='del'>-static int PC4500_writerid(struct airo_info*, u16 rid, const void</div><div class='del'>-			   *pBuf, int len, int lock);</div><div class='del'>-static int do_writerid(struct airo_info*, u16 rid, const void *rid_data,</div><div class='del'>-			int len, int dummy);</div><div class='del'>-static u16 transmit_allocate(struct airo_info*, int lenPayload, int raw);</div><div class='del'>-static int transmit_802_3_packet(struct airo_info*, int len, char *pPacket,</div><div class='del'>-				 bool may_sleep);</div><div class='del'>-static int transmit_802_11_packet(struct airo_info*, int len, char *pPacket,</div><div class='del'>-				  bool may_sleep);</div><div class='del'>-</div><div class='del'>-static int mpi_send_packet(struct net_device *dev);</div><div class='del'>-static void mpi_unmap_card(struct pci_dev *pci);</div><div class='del'>-static void mpi_receive_802_3(struct airo_info *ai);</div><div class='del'>-static void mpi_receive_802_11(struct airo_info *ai);</div><div class='del'>-static int waitbusy(struct airo_info *ai);</div><div class='del'>-</div><div class='del'>-static irqreturn_t airo_interrupt(int irq, void* dev_id);</div><div class='del'>-static int airo_thread(void *data);</div><div class='del'>-static void timer_func(struct net_device *dev);</div><div class='del'>-static int airo_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);</div><div class='del'>-static struct iw_statistics *airo_get_wireless_stats(struct net_device *dev);</div><div class='del'>-#ifdef CISCO_EXT</div><div class='del'>-static int readrids(struct net_device *dev, aironet_ioctl *comp);</div><div class='del'>-static int writerids(struct net_device *dev, aironet_ioctl *comp);</div><div class='del'>-static int flashcard(struct net_device *dev, aironet_ioctl *comp);</div><div class='del'>-#endif /* CISCO_EXT */</div><div class='del'>-static void micinit(struct airo_info *ai);</div><div class='del'>-static int micsetup(struct airo_info *ai);</div><div class='del'>-static int encapsulate(struct airo_info *ai, etherHead *pPacket, MICBuffer *buffer, int len);</div><div class='del'>-static int decapsulate(struct airo_info *ai, MICBuffer *mic, etherHead *pPacket, u16 payLen);</div><div class='del'>-</div><div class='del'>-static u8 airo_rssi_to_dbm(tdsRssiEntry *rssi_rid, u8 rssi);</div><div class='del'>-static u8 airo_dbm_to_pct(tdsRssiEntry *rssi_rid, u8 dbm);</div><div class='del'>-</div><div class='del'>-static void airo_networks_free(struct airo_info *ai);</div><div class='del'>-</div><div class='del'>-struct airo_info {</div><div class='del'>-	struct net_device             *dev;</div><div class='del'>-	struct list_head              dev_list;</div><div class='del'>-	/* Note, we can have MAX_FIDS outstanding.  FIDs are 16-bits, so we</div><div class='del'>-	   use the high bit to mark whether it is in use. */</div><div class='del'>-#define MAX_FIDS 6</div><div class='del'>-#define MPI_MAX_FIDS 1</div><div class='del'>-	u32                           fids[MAX_FIDS];</div><div class='del'>-	ConfigRid config;</div><div class='del'>-	char keyindex; // Used with auto wep</div><div class='del'>-	char defindex; // Used with auto wep</div><div class='del'>-	struct proc_dir_entry *proc_entry;</div><div class='del'>-        spinlock_t aux_lock;</div><div class='del'>-#define FLAG_RADIO_OFF	0	/* User disabling of MAC */</div><div class='del'>-#define FLAG_RADIO_DOWN	1	/* ifup/ifdown disabling of MAC */</div><div class='del'>-#define FLAG_RADIO_MASK 0x03</div><div class='del'>-#define FLAG_ENABLED	2</div><div class='del'>-#define FLAG_ADHOC	3	/* Needed by MIC */</div><div class='del'>-#define FLAG_MIC_CAPABLE 4</div><div class='del'>-#define FLAG_UPDATE_MULTI 5</div><div class='del'>-#define FLAG_UPDATE_UNI 6</div><div class='del'>-#define FLAG_802_11	7</div><div class='del'>-#define FLAG_PROMISC	8	/* IFF_PROMISC 0x100 - include/linux/if.h */</div><div class='del'>-#define FLAG_PENDING_XMIT 9</div><div class='del'>-#define FLAG_PENDING_XMIT11 10</div><div class='del'>-#define FLAG_MPI	11</div><div class='del'>-#define FLAG_REGISTERED	12</div><div class='del'>-#define FLAG_COMMIT	13</div><div class='del'>-#define FLAG_RESET	14</div><div class='del'>-#define FLAG_FLASHING	15</div><div class='del'>-#define FLAG_WPA_CAPABLE	16</div><div class='del'>-	unsigned long flags;</div><div class='del'>-#define JOB_DIE	0</div><div class='del'>-#define JOB_XMIT	1</div><div class='del'>-#define JOB_XMIT11	2</div><div class='del'>-#define JOB_STATS	3</div><div class='del'>-#define JOB_PROMISC	4</div><div class='del'>-#define JOB_MIC	5</div><div class='del'>-#define JOB_EVENT	6</div><div class='del'>-#define JOB_AUTOWEP	7</div><div class='del'>-#define JOB_SCAN_RESULTS  9</div><div class='del'>-	unsigned long jobs;</div><div class='del'>-	int (*bap_read)(struct airo_info*, __le16 *pu16Dst, int bytelen,</div><div class='del'>-			int whichbap);</div><div class='del'>-	unsigned short *flash;</div><div class='del'>-	tdsRssiEntry *rssi;</div><div class='del'>-	struct task_struct *list_bss_task;</div><div class='del'>-	struct task_struct *airo_thread_task;</div><div class='del'>-	struct semaphore sem;</div><div class='del'>-	wait_queue_head_t thr_wait;</div><div class='del'>-	unsigned long expires;</div><div class='del'>-	struct {</div><div class='del'>-		struct sk_buff *skb;</div><div class='del'>-		int fid;</div><div class='del'>-	} xmit, xmit11;</div><div class='del'>-	struct net_device *wifidev;</div><div class='del'>-	struct iw_statistics	wstats;		// wireless stats</div><div class='del'>-	unsigned long		scan_timeout;	/* Time scan should be read */</div><div class='del'>-	struct iw_spy_data	spy_data;</div><div class='del'>-	struct iw_public_data	wireless_data;</div><div class='del'>-	/* MIC stuff */</div><div class='del'>-	struct crypto_sync_skcipher	*tfm;</div><div class='del'>-	mic_module		mod[2];</div><div class='del'>-	mic_statistics		micstats;</div><div class='del'>-	HostRxDesc rxfids[MPI_MAX_FIDS]; // rx/tx/config MPI350 descriptors</div><div class='del'>-	HostTxDesc txfids[MPI_MAX_FIDS];</div><div class='del'>-	HostRidDesc config_desc;</div><div class='del'>-	unsigned long ridbus; // phys addr of config_desc</div><div class='del'>-	struct sk_buff_head txq;// tx queue used by mpi350 code</div><div class='del'>-	struct pci_dev          *pci;</div><div class='del'>-	unsigned char		__iomem *pcimem;</div><div class='del'>-	unsigned char		__iomem *pciaux;</div><div class='del'>-	unsigned char		*shared;</div><div class='del'>-	dma_addr_t		shared_dma;</div><div class='del'>-	pm_message_t		power;</div><div class='del'>-	SsidRid			*SSID;</div><div class='del'>-	APListRid		APList;</div><div class='del'>-#define	PCI_SHARED_LEN		2*MPI_MAX_FIDS*PKTSIZE+RIDSIZE</div><div class='del'>-	char			proc_name[IFNAMSIZ];</div><div class='del'>-</div><div class='del'>-	int			wep_capable;</div><div class='del'>-	int			max_wep_idx;</div><div class='del'>-	int			last_auth;</div><div class='del'>-</div><div class='del'>-	/* WPA-related stuff */</div><div class='del'>-	unsigned int bssListFirst;</div><div class='del'>-	unsigned int bssListNext;</div><div class='del'>-	unsigned int bssListRidLen;</div><div class='del'>-</div><div class='del'>-	struct list_head network_list;</div><div class='del'>-	struct list_head network_free_list;</div><div class='del'>-	BSSListElement *networks;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline int bap_read(struct airo_info *ai, __le16 *pu16Dst, int bytelen,</div><div class='del'>-			   int whichbap)</div><div class='del'>-{</div><div class='del'>-	return ai-&gt;bap_read(ai, pu16Dst, bytelen, whichbap);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int setup_proc_entry(struct net_device *dev,</div><div class='del'>-			     struct airo_info *apriv);</div><div class='del'>-static int takedown_proc_entry(struct net_device *dev,</div><div class='del'>-				struct airo_info *apriv);</div><div class='del'>-</div><div class='del'>-static int cmdreset(struct airo_info *ai);</div><div class='del'>-static int setflashmode(struct airo_info *ai);</div><div class='del'>-static int flashgchar(struct airo_info *ai, int matchbyte, int dwelltime);</div><div class='del'>-static int flashputbuf(struct airo_info *ai);</div><div class='del'>-static int flashrestart(struct airo_info *ai, struct net_device *dev);</div><div class='del'>-</div><div class='del'>-#define airo_print(type, name, fmt, args...) \</div><div class='del'>-	printk(type DRV_NAME "(%s): " fmt "\n", name, ##args)</div><div class='del'>-</div><div class='del'>-#define airo_print_info(name, fmt, args...) \</div><div class='del'>-	airo_print(KERN_INFO, name, fmt, ##args)</div><div class='del'>-</div><div class='del'>-#define airo_print_dbg(name, fmt, args...) \</div><div class='del'>-	airo_print(KERN_DEBUG, name, fmt, ##args)</div><div class='del'>-</div><div class='del'>-#define airo_print_warn(name, fmt, args...) \</div><div class='del'>-	airo_print(KERN_WARNING, name, fmt, ##args)</div><div class='del'>-</div><div class='del'>-#define airo_print_err(name, fmt, args...) \</div><div class='del'>-	airo_print(KERN_ERR, name, fmt, ##args)</div><div class='del'>-</div><div class='del'>-#define AIRO_FLASH(dev) (((struct airo_info *)dev-&gt;ml_priv)-&gt;flash)</div><div class='del'>-</div><div class='del'>-/***********************************************************************</div><div class='del'>- *                              MIC ROUTINES                           *</div><div class='del'>- ***********************************************************************</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int RxSeqValid(struct airo_info *ai, miccntx *context, int mcast, u32 micSeq);</div><div class='del'>-static void MoveWindow(miccntx *context, u32 micSeq);</div><div class='del'>-static void emmh32_setseed(emmh32_context *context, u8 *pkey, int keylen,</div><div class='del'>-			   struct crypto_sync_skcipher *tfm);</div><div class='del'>-static void emmh32_init(emmh32_context *context);</div><div class='del'>-static void emmh32_update(emmh32_context *context, u8 *pOctets, int len);</div><div class='del'>-static void emmh32_final(emmh32_context *context, u8 digest[4]);</div><div class='del'>-static int flashpchar(struct airo_info *ai, int byte, int dwelltime);</div><div class='del'>-</div><div class='del'>-static void age_mic_context(miccntx *cur, miccntx *old, u8 *key, int key_len,</div><div class='del'>-			    struct crypto_sync_skcipher *tfm)</div><div class='del'>-{</div><div class='del'>-	/* If the current MIC context is valid and its key is the same as</div><div class='del'>-	 * the MIC register, there's nothing to do.</div><div class='del'>-	 */</div><div class='del'>-	if (cur-&gt;valid &amp;&amp; (memcmp(cur-&gt;key, key, key_len) == 0))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Age current mic Context */</div><div class='del'>-	memcpy(old, cur, sizeof(*cur));</div><div class='del'>-</div><div class='del'>-	/* Initialize new context */</div><div class='del'>-	memcpy(cur-&gt;key, key, key_len);</div><div class='del'>-	cur-&gt;window  = 33; /* Window always points to the middle */</div><div class='del'>-	cur-&gt;rx      = 0;  /* Rx Sequence numbers */</div><div class='del'>-	cur-&gt;tx      = 0;  /* Tx sequence numbers */</div><div class='del'>-	cur-&gt;valid   = 1;  /* Key is now valid */</div><div class='del'>-</div><div class='del'>-	/* Give key to mic seed */</div><div class='del'>-	emmh32_setseed(&amp;cur-&gt;seed, key, key_len, tfm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* micinit - Initialize mic seed */</div><div class='del'>-</div><div class='del'>-static void micinit(struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	MICRid mic_rid;</div><div class='del'>-</div><div class='del'>-	clear_bit(JOB_MIC, &amp;ai-&gt;jobs);</div><div class='del'>-	PC4500_readrid(ai, RID_MIC, &amp;mic_rid, sizeof(mic_rid), 0);</div><div class='del'>-	up(&amp;ai-&gt;sem);</div><div class='del'>-</div><div class='del'>-	ai-&gt;micstats.enabled = (le16_to_cpu(mic_rid.state) &amp; 0x00FF) ? 1 : 0;</div><div class='del'>-	if (!ai-&gt;micstats.enabled) {</div><div class='del'>-		/* So next time we have a valid key and mic is enabled, we will</div><div class='del'>-		 * update the sequence number if the key is the same as before.</div><div class='del'>-		 */</div><div class='del'>-		ai-&gt;mod[0].uCtx.valid = 0;</div><div class='del'>-		ai-&gt;mod[0].mCtx.valid = 0;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mic_rid.multicastValid) {</div><div class='del'>-		age_mic_context(&amp;ai-&gt;mod[0].mCtx, &amp;ai-&gt;mod[1].mCtx,</div><div class='del'>-		                mic_rid.multicast, sizeof(mic_rid.multicast),</div><div class='del'>-		                ai-&gt;tfm);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mic_rid.unicastValid) {</div><div class='del'>-		age_mic_context(&amp;ai-&gt;mod[0].uCtx, &amp;ai-&gt;mod[1].uCtx,</div><div class='del'>-				mic_rid.unicast, sizeof(mic_rid.unicast),</div><div class='del'>-				ai-&gt;tfm);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* micsetup - Get ready for business */</div><div class='del'>-</div><div class='del'>-static int micsetup(struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (ai-&gt;tfm == NULL)</div><div class='del'>-		ai-&gt;tfm = crypto_alloc_sync_skcipher("ctr(aes)", 0, 0);</div><div class='del'>-</div><div class='del'>-        if (IS_ERR(ai-&gt;tfm)) {</div><div class='del'>-                airo_print_err(ai-&gt;dev-&gt;name, "failed to load transform for AES");</div><div class='del'>-                ai-&gt;tfm = NULL;</div><div class='del'>-                return ERROR;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_MODULES; i++) {</div><div class='del'>-		memset(&amp;ai-&gt;mod[i].mCtx, 0, sizeof(miccntx));</div><div class='del'>-		memset(&amp;ai-&gt;mod[i].uCtx, 0, sizeof(miccntx));</div><div class='del'>-	}</div><div class='del'>-	return SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const u8 micsnap[] = {0xAA, 0xAA, 0x03, 0x00, 0x40, 0x96, 0x00, 0x02};</div><div class='del'>-</div><div class='del'>-/*===========================================================================</div><div class='del'>- * Description: Mic a packet</div><div class='del'>- *</div><div class='del'>- *      Inputs: etherHead * pointer to an 802.3 frame</div><div class='del'>- *</div><div class='del'>- *     Returns: BOOLEAN if successful, otherwise false.</div><div class='del'>- *             PacketTxLen will be updated with the mic'd packets size.</div><div class='del'>- *</div><div class='del'>- *    Caveats: It is assumed that the frame buffer will already</div><div class='del'>- *             be big enough to hold the largets mic message possible.</div><div class='del'>- *            (No memory allocation is done here).</div><div class='del'>- *</div><div class='del'>- *    Author: sbraneky (10/15/01)</div><div class='del'>- *    Merciless hacks by rwilcher (1/14/02)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int encapsulate(struct airo_info *ai, etherHead *frame, MICBuffer *mic, int payLen)</div><div class='del'>-{</div><div class='del'>-	miccntx   *context;</div><div class='del'>-</div><div class='del'>-	// Determine correct context</div><div class='del'>-	// If not adhoc, always use unicast key</div><div class='del'>-</div><div class='del'>-	if (test_bit(FLAG_ADHOC, &amp;ai-&gt;flags) &amp;&amp; (frame-&gt;da[0] &amp; 0x1))</div><div class='del'>-		context = &amp;ai-&gt;mod[0].mCtx;</div><div class='del'>-	else</div><div class='del'>-		context = &amp;ai-&gt;mod[0].uCtx;</div><div class='del'>-</div><div class='del'>-	if (!context-&gt;valid)</div><div class='del'>-		return ERROR;</div><div class='del'>-</div><div class='del'>-	mic-&gt;typelen = htons(payLen + 16); //Length of Mic'd packet</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;mic-&gt;u.snap, micsnap, sizeof(micsnap)); // Add Snap</div><div class='del'>-</div><div class='del'>-	// Add Tx sequence</div><div class='del'>-	mic-&gt;seq = htonl(context-&gt;tx);</div><div class='del'>-	context-&gt;tx += 2;</div><div class='del'>-</div><div class='del'>-	emmh32_init(&amp;context-&gt;seed); // Mic the packet</div><div class='del'>-	emmh32_update(&amp;context-&gt;seed, frame-&gt;da, ETH_ALEN * 2); // DA, SA</div><div class='del'>-	emmh32_update(&amp;context-&gt;seed, (u8*)&amp;mic-&gt;typelen, 10); // Type/Length and Snap</div><div class='del'>-	emmh32_update(&amp;context-&gt;seed, (u8*)&amp;mic-&gt;seq, sizeof(mic-&gt;seq)); //SEQ</div><div class='del'>-	emmh32_update(&amp;context-&gt;seed, (u8*)(frame + 1), payLen); //payload</div><div class='del'>-	emmh32_final(&amp;context-&gt;seed, (u8*)&amp;mic-&gt;mic);</div><div class='del'>-</div><div class='del'>-	/*    New Type/length ?????????? */</div><div class='del'>-	mic-&gt;typelen = 0; //Let NIC know it could be an oversized packet</div><div class='del'>-	return SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-    NONE,</div><div class='del'>-    NOMIC,</div><div class='del'>-    NOMICPLUMMED,</div><div class='del'>-    SEQUENCE,</div><div class='del'>-    INCORRECTMIC,</div><div class='del'>-} mic_error;</div><div class='del'>-</div><div class='del'>-/*===========================================================================</div><div class='del'>- *  Description: Decapsulates a MIC'd packet and returns the 802.3 packet</div><div class='del'>- *               (removes the MIC stuff) if packet is a valid packet.</div><div class='del'>- *</div><div class='del'>- *       Inputs: etherHead  pointer to the 802.3 packet</div><div class='del'>- *</div><div class='del'>- *      Returns: BOOLEAN - TRUE if packet should be dropped otherwise FALSE</div><div class='del'>- *</div><div class='del'>- *      Author: sbraneky (10/15/01)</div><div class='del'>- *    Merciless hacks by rwilcher (1/14/02)</div><div class='del'>- *---------------------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int decapsulate(struct airo_info *ai, MICBuffer *mic, etherHead *eth, u16 payLen)</div><div class='del'>-{</div><div class='del'>-	int      i;</div><div class='del'>-	u32      micSEQ;</div><div class='del'>-	miccntx  *context;</div><div class='del'>-	u8       digest[4];</div><div class='del'>-	mic_error micError = NONE;</div><div class='del'>-</div><div class='del'>-	// Check if the packet is a Mic'd packet</div><div class='del'>-</div><div class='del'>-	if (!ai-&gt;micstats.enabled) {</div><div class='del'>-		//No Mic set or Mic OFF but we received a MIC'd packet.</div><div class='del'>-		if (memcmp ((u8*)eth + 14, micsnap, sizeof(micsnap)) == 0) {</div><div class='del'>-			ai-&gt;micstats.rxMICPlummed++;</div><div class='del'>-			return ERROR;</div><div class='del'>-		}</div><div class='del'>-		return SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ntohs(mic-&gt;typelen) == 0x888E)</div><div class='del'>-		return SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (memcmp (mic-&gt;u.snap, micsnap, sizeof(micsnap)) != 0) {</div><div class='del'>-	    // Mic enabled but packet isn't Mic'd</div><div class='del'>-		ai-&gt;micstats.rxMICPlummed++;</div><div class='del'>-	    	return ERROR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	micSEQ = ntohl(mic-&gt;seq);            //store SEQ as CPU order</div><div class='del'>-</div><div class='del'>-	//At this point we a have a mic'd packet and mic is enabled</div><div class='del'>-	//Now do the mic error checking.</div><div class='del'>-</div><div class='del'>-	//Receive seq must be odd</div><div class='del'>-	if ((micSEQ &amp; 1) == 0) {</div><div class='del'>-		ai-&gt;micstats.rxWrongSequence++;</div><div class='del'>-		return ERROR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_MODULES; i++) {</div><div class='del'>-		int mcast = eth-&gt;da[0] &amp; 1;</div><div class='del'>-		//Determine proper context</div><div class='del'>-		context = mcast ? &amp;ai-&gt;mod[i].mCtx : &amp;ai-&gt;mod[i].uCtx;</div><div class='del'>-</div><div class='del'>-		//Make sure context is valid</div><div class='del'>-		if (!context-&gt;valid) {</div><div class='del'>-			if (i == 0)</div><div class='del'>-				micError = NOMICPLUMMED;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		//DeMic it</div><div class='del'>-</div><div class='del'>-		if (!mic-&gt;typelen)</div><div class='del'>-			mic-&gt;typelen = htons(payLen + sizeof(MICBuffer) - 2);</div><div class='del'>-</div><div class='del'>-		emmh32_init(&amp;context-&gt;seed);</div><div class='del'>-		emmh32_update(&amp;context-&gt;seed, eth-&gt;da, ETH_ALEN*2);</div><div class='del'>-		emmh32_update(&amp;context-&gt;seed, (u8 *)&amp;mic-&gt;typelen, sizeof(mic-&gt;typelen)+sizeof(mic-&gt;u.snap));</div><div class='del'>-		emmh32_update(&amp;context-&gt;seed, (u8 *)&amp;mic-&gt;seq, sizeof(mic-&gt;seq));</div><div class='del'>-		emmh32_update(&amp;context-&gt;seed, (u8 *)(eth + 1), payLen);</div><div class='del'>-		//Calculate MIC</div><div class='del'>-		emmh32_final(&amp;context-&gt;seed, digest);</div><div class='del'>-</div><div class='del'>-		if (memcmp(digest, &amp;mic-&gt;mic, 4)) { //Make sure the mics match</div><div class='del'>-		  //Invalid Mic</div><div class='del'>-			if (i == 0)</div><div class='del'>-				micError = INCORRECTMIC;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		//Check Sequence number if mics pass</div><div class='del'>-		if (RxSeqValid(ai, context, mcast, micSEQ) == SUCCESS) {</div><div class='del'>-			ai-&gt;micstats.rxSuccess++;</div><div class='del'>-			return SUCCESS;</div><div class='del'>-		}</div><div class='del'>-		if (i == 0)</div><div class='del'>-			micError = SEQUENCE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	// Update statistics</div><div class='del'>-	switch (micError) {</div><div class='del'>-		case NOMICPLUMMED: ai-&gt;micstats.rxMICPlummed++;   break;</div><div class='del'>-		case SEQUENCE:    ai-&gt;micstats.rxWrongSequence++; break;</div><div class='del'>-		case INCORRECTMIC: ai-&gt;micstats.rxIncorrectMIC++; break;</div><div class='del'>-		case NONE:  break;</div><div class='del'>-		case NOMIC: break;</div><div class='del'>-	}</div><div class='del'>-	return ERROR;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*===========================================================================</div><div class='del'>- * Description:  Checks the Rx Seq number to make sure it is valid</div><div class='del'>- *               and hasn't already been received</div><div class='del'>- *</div><div class='del'>- *     Inputs: miccntx - mic context to check seq against</div><div class='del'>- *             micSeq  - the Mic seq number</div><div class='del'>- *</div><div class='del'>- *    Returns: TRUE if valid otherwise FALSE.</div><div class='del'>- *</div><div class='del'>- *    Author: sbraneky (10/15/01)</div><div class='del'>- *    Merciless hacks by rwilcher (1/14/02)</div><div class='del'>- *---------------------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int RxSeqValid(struct airo_info *ai, miccntx *context, int mcast, u32 micSeq)</div><div class='del'>-{</div><div class='del'>-	u32 seq, index;</div><div class='del'>-</div><div class='del'>-	//Allow for the ap being rebooted - if it is then use the next</div><div class='del'>-	//sequence number of the current sequence number - might go backwards</div><div class='del'>-</div><div class='del'>-	if (mcast) {</div><div class='del'>-		if (test_bit(FLAG_UPDATE_MULTI, &amp;ai-&gt;flags)) {</div><div class='del'>-			clear_bit (FLAG_UPDATE_MULTI, &amp;ai-&gt;flags);</div><div class='del'>-			context-&gt;window = (micSeq &gt; 33) ? micSeq : 33;</div><div class='del'>-			context-&gt;rx     = 0;        // Reset rx</div><div class='del'>-		}</div><div class='del'>-	} else if (test_bit(FLAG_UPDATE_UNI, &amp;ai-&gt;flags)) {</div><div class='del'>-		clear_bit (FLAG_UPDATE_UNI, &amp;ai-&gt;flags);</div><div class='del'>-		context-&gt;window = (micSeq &gt; 33) ? micSeq : 33; // Move window</div><div class='del'>-		context-&gt;rx     = 0;        // Reset rx</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	//Make sequence number relative to START of window</div><div class='del'>-	seq = micSeq - (context-&gt;window - 33);</div><div class='del'>-</div><div class='del'>-	//Too old of a SEQ number to check.</div><div class='del'>-	if ((s32)seq &lt; 0)</div><div class='del'>-		return ERROR;</div><div class='del'>-</div><div class='del'>-	if (seq &gt; 64) {</div><div class='del'>-		//Window is infinite forward</div><div class='del'>-		MoveWindow(context, micSeq);</div><div class='del'>-		return SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	// We are in the window. Now check the context rx bit to see if it was already sent</div><div class='del'>-	seq &gt;&gt;= 1;         //divide by 2 because we only have odd numbers</div><div class='del'>-	index = 1 &lt;&lt; seq;  //Get an index number</div><div class='del'>-</div><div class='del'>-	if (!(context-&gt;rx &amp; index)) {</div><div class='del'>-		//micSEQ falls inside the window.</div><div class='del'>-		//Add seqence number to the list of received numbers.</div><div class='del'>-		context-&gt;rx |= index;</div><div class='del'>-</div><div class='del'>-		MoveWindow(context, micSeq);</div><div class='del'>-</div><div class='del'>-		return SUCCESS;</div><div class='del'>-	}</div><div class='del'>-	return ERROR;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void MoveWindow(miccntx *context, u32 micSeq)</div><div class='del'>-{</div><div class='del'>-	u32 shift;</div><div class='del'>-</div><div class='del'>-	//Move window if seq greater than the middle of the window</div><div class='del'>-	if (micSeq &gt; context-&gt;window) {</div><div class='del'>-		shift = (micSeq - context-&gt;window) &gt;&gt; 1;</div><div class='del'>-</div><div class='del'>-		    //Shift out old</div><div class='del'>-		if (shift &lt; 32)</div><div class='del'>-			context-&gt;rx &gt;&gt;= shift;</div><div class='del'>-		else</div><div class='del'>-			context-&gt;rx = 0;</div><div class='del'>-</div><div class='del'>-		context-&gt;window = micSeq;      //Move window</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*==============================================*/</div><div class='del'>-/*========== EMMH ROUTINES  ====================*/</div><div class='del'>-/*==============================================*/</div><div class='del'>-</div><div class='del'>-/* mic accumulate */</div><div class='del'>-#define MIC_ACCUM(val)	\</div><div class='del'>-	context-&gt;accum += (u64)(val) * be32_to_cpu(context-&gt;coeff[coeff_position++]);</div><div class='del'>-</div><div class='del'>-/* expand the key to fill the MMH coefficient array */</div><div class='del'>-static void emmh32_setseed(emmh32_context *context, u8 *pkey, int keylen,</div><div class='del'>-			   struct crypto_sync_skcipher *tfm)</div><div class='del'>-{</div><div class='del'>-  /* take the keying material, expand if necessary, truncate at 16-bytes */</div><div class='del'>-  /* run through AES counter mode to generate context-&gt;coeff[] */</div><div class='del'>-</div><div class='del'>-	SYNC_SKCIPHER_REQUEST_ON_STACK(req, tfm);</div><div class='del'>-	struct scatterlist sg;</div><div class='del'>-	u8 iv[AES_BLOCK_SIZE] = {};</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	crypto_sync_skcipher_setkey(tfm, pkey, 16);</div><div class='del'>-</div><div class='del'>-	memset(context-&gt;coeff, 0, sizeof(context-&gt;coeff));</div><div class='del'>-	sg_init_one(&amp;sg, context-&gt;coeff, sizeof(context-&gt;coeff));</div><div class='del'>-</div><div class='del'>-	skcipher_request_set_sync_tfm(req, tfm);</div><div class='del'>-	skcipher_request_set_callback(req, 0, NULL, NULL);</div><div class='del'>-	skcipher_request_set_crypt(req, &amp;sg, &amp;sg, sizeof(context-&gt;coeff), iv);</div><div class='del'>-</div><div class='del'>-	ret = crypto_skcipher_encrypt(req);</div><div class='del'>-	WARN_ON_ONCE(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* prepare for calculation of a new mic */</div><div class='del'>-static void emmh32_init(emmh32_context *context)</div><div class='del'>-{</div><div class='del'>-	/* prepare for new mic calculation */</div><div class='del'>-	context-&gt;accum = 0;</div><div class='del'>-	context-&gt;position = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add some bytes to the mic calculation */</div><div class='del'>-static void emmh32_update(emmh32_context *context, u8 *pOctets, int len)</div><div class='del'>-{</div><div class='del'>-	int	coeff_position, byte_position;</div><div class='del'>-</div><div class='del'>-	if (len == 0) return;</div><div class='del'>-</div><div class='del'>-	coeff_position = context-&gt;position &gt;&gt; 2;</div><div class='del'>-</div><div class='del'>-	/* deal with partial 32-bit word left over from last update */</div><div class='del'>-	byte_position = context-&gt;position &amp; 3;</div><div class='del'>-	if (byte_position) {</div><div class='del'>-		/* have a partial word in part to deal with */</div><div class='del'>-		do {</div><div class='del'>-			if (len == 0) return;</div><div class='del'>-			context-&gt;part.d8[byte_position++] = *pOctets++;</div><div class='del'>-			context-&gt;position++;</div><div class='del'>-			len--;</div><div class='del'>-		} while (byte_position &lt; 4);</div><div class='del'>-		MIC_ACCUM(ntohl(context-&gt;part.d32));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* deal with full 32-bit words */</div><div class='del'>-	while (len &gt;= 4) {</div><div class='del'>-		MIC_ACCUM(ntohl(*(__be32 *)pOctets));</div><div class='del'>-		context-&gt;position += 4;</div><div class='del'>-		pOctets += 4;</div><div class='del'>-		len -= 4;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* deal with partial 32-bit word that will be left over from this update */</div><div class='del'>-	byte_position = 0;</div><div class='del'>-	while (len &gt; 0) {</div><div class='del'>-		context-&gt;part.d8[byte_position++] = *pOctets++;</div><div class='del'>-		context-&gt;position++;</div><div class='del'>-		len--;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* mask used to zero empty bytes for final partial word */</div><div class='del'>-static u32 mask32[4] = { 0x00000000L, 0xFF000000L, 0xFFFF0000L, 0xFFFFFF00L };</div><div class='del'>-</div><div class='del'>-/* calculate the mic */</div><div class='del'>-static void emmh32_final(emmh32_context *context, u8 digest[4])</div><div class='del'>-{</div><div class='del'>-	int	coeff_position, byte_position;</div><div class='del'>-	u32	val;</div><div class='del'>-</div><div class='del'>-	u64 sum, utmp;</div><div class='del'>-	s64 stmp;</div><div class='del'>-</div><div class='del'>-	coeff_position = context-&gt;position &gt;&gt; 2;</div><div class='del'>-</div><div class='del'>-	/* deal with partial 32-bit word left over from last update */</div><div class='del'>-	byte_position = context-&gt;position &amp; 3;</div><div class='del'>-	if (byte_position) {</div><div class='del'>-		/* have a partial word in part to deal with */</div><div class='del'>-		val = ntohl(context-&gt;part.d32);</div><div class='del'>-		MIC_ACCUM(val &amp; mask32[byte_position]);	/* zero empty bytes */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* reduce the accumulated u64 to a 32-bit MIC */</div><div class='del'>-	sum = context-&gt;accum;</div><div class='del'>-	stmp = (sum  &amp; 0xffffffffLL) - ((sum &gt;&gt; 32)  * 15);</div><div class='del'>-	utmp = (stmp &amp; 0xffffffffLL) - ((stmp &gt;&gt; 32) * 15);</div><div class='del'>-	sum = utmp &amp; 0xffffffffLL;</div><div class='del'>-	if (utmp &gt; 0x10000000fLL)</div><div class='del'>-		sum -= 15;</div><div class='del'>-</div><div class='del'>-	val = (u32)sum;</div><div class='del'>-	digest[0] = (val&gt;&gt;24) &amp; 0xFF;</div><div class='del'>-	digest[1] = (val&gt;&gt;16) &amp; 0xFF;</div><div class='del'>-	digest[2] = (val&gt;&gt;8) &amp; 0xFF;</div><div class='del'>-	digest[3] = val &amp; 0xFF;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int readBSSListRid(struct airo_info *ai, int first,</div><div class='del'>-		      BSSListRid *list)</div><div class='del'>-{</div><div class='del'>-	Cmd cmd;</div><div class='del'>-	Resp rsp;</div><div class='del'>-</div><div class='del'>-	if (first == 1) {</div><div class='del'>-		if (ai-&gt;flags &amp; FLAG_RADIO_MASK) return -ENETDOWN;</div><div class='del'>-		memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-		cmd.cmd = CMD_LISTBSS;</div><div class='del'>-		if (down_interruptible(&amp;ai-&gt;sem))</div><div class='del'>-			return -ERESTARTSYS;</div><div class='del'>-		ai-&gt;list_bss_task = current;</div><div class='del'>-		issuecommand(ai, &amp;cmd, &amp;rsp, true);</div><div class='del'>-		up(&amp;ai-&gt;sem);</div><div class='del'>-		/* Let the command take effect */</div><div class='del'>-		schedule_timeout_uninterruptible(3 * HZ);</div><div class='del'>-		ai-&gt;list_bss_task = NULL;</div><div class='del'>-	}</div><div class='del'>-	return PC4500_readrid(ai, first ? ai-&gt;bssListFirst : ai-&gt;bssListNext,</div><div class='del'>-			    list, ai-&gt;bssListRidLen, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int readWepKeyRid(struct airo_info *ai, WepKeyRid *wkr, int temp, int lock)</div><div class='del'>-{</div><div class='del'>-	return PC4500_readrid(ai, temp ? RID_WEP_TEMP : RID_WEP_PERM,</div><div class='del'>-				wkr, sizeof(*wkr), lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int writeWepKeyRid(struct airo_info *ai, WepKeyRid *wkr, int perm, int lock)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-	rc = PC4500_writerid(ai, RID_WEP_TEMP, wkr, sizeof(*wkr), lock);</div><div class='del'>-	if (rc!=SUCCESS)</div><div class='del'>-		airo_print_err(ai-&gt;dev-&gt;name, "WEP_TEMP set %x", rc);</div><div class='del'>-	if (perm) {</div><div class='del'>-		rc = PC4500_writerid(ai, RID_WEP_PERM, wkr, sizeof(*wkr), lock);</div><div class='del'>-		if (rc!=SUCCESS)</div><div class='del'>-			airo_print_err(ai-&gt;dev-&gt;name, "WEP_PERM set %x", rc);</div><div class='del'>-	}</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int readSsidRid(struct airo_info*ai, SsidRid *ssidr)</div><div class='del'>-{</div><div class='del'>-	return PC4500_readrid(ai, RID_SSID, ssidr, sizeof(*ssidr), 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int writeSsidRid(struct airo_info*ai, SsidRid *pssidr, int lock)</div><div class='del'>-{</div><div class='del'>-	return PC4500_writerid(ai, RID_SSID, pssidr, sizeof(*pssidr), lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int readConfigRid(struct airo_info *ai, int lock)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-	ConfigRid cfg;</div><div class='del'>-</div><div class='del'>-	if (ai-&gt;config.len)</div><div class='del'>-		return SUCCESS;</div><div class='del'>-</div><div class='del'>-	rc = PC4500_readrid(ai, RID_ACTUALCONFIG, &amp;cfg, sizeof(cfg), lock);</div><div class='del'>-	if (rc != SUCCESS)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	ai-&gt;config = cfg;</div><div class='del'>-	return SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void checkThrottle(struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-/* Old hardware had a limit on encryption speed */</div><div class='del'>-	if (ai-&gt;config.authType != AUTH_OPEN &amp;&amp; maxencrypt) {</div><div class='del'>-		for (i = 0; i&lt;8; i++) {</div><div class='del'>-			if (ai-&gt;config.rates[i] &gt; maxencrypt) {</div><div class='del'>-				ai-&gt;config.rates[i] = 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int writeConfigRid(struct airo_info *ai, int lock)</div><div class='del'>-{</div><div class='del'>-	ConfigRid cfgr;</div><div class='del'>-</div><div class='del'>-	if (!test_bit (FLAG_COMMIT, &amp;ai-&gt;flags))</div><div class='del'>-		return SUCCESS;</div><div class='del'>-</div><div class='del'>-	clear_bit (FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-	clear_bit (FLAG_RESET, &amp;ai-&gt;flags);</div><div class='del'>-	checkThrottle(ai);</div><div class='del'>-	cfgr = ai-&gt;config;</div><div class='del'>-</div><div class='del'>-	if ((cfgr.opmode &amp; MODE_CFG_MASK) == MODE_STA_IBSS)</div><div class='del'>-		set_bit(FLAG_ADHOC, &amp;ai-&gt;flags);</div><div class='del'>-	else</div><div class='del'>-		clear_bit(FLAG_ADHOC, &amp;ai-&gt;flags);</div><div class='del'>-</div><div class='del'>-	return PC4500_writerid(ai, RID_CONFIG, &amp;cfgr, sizeof(cfgr), lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int readStatusRid(struct airo_info *ai, StatusRid *statr, int lock)</div><div class='del'>-{</div><div class='del'>-	return PC4500_readrid(ai, RID_STATUS, statr, sizeof(*statr), lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int writeAPListRid(struct airo_info *ai, APListRid *aplr, int lock)</div><div class='del'>-{</div><div class='del'>-	return PC4500_writerid(ai, RID_APLIST, aplr, sizeof(*aplr), lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int readCapabilityRid(struct airo_info *ai, CapabilityRid *capr, int lock)</div><div class='del'>-{</div><div class='del'>-	return PC4500_readrid(ai, RID_CAPABILITIES, capr, sizeof(*capr), lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int readStatsRid(struct airo_info*ai, StatsRid *sr, int rid, int lock)</div><div class='del'>-{</div><div class='del'>-	return PC4500_readrid(ai, rid, sr, sizeof(*sr), lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void try_auto_wep(struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	if (auto_wep &amp;&amp; !test_bit(FLAG_RADIO_DOWN, &amp;ai-&gt;flags)) {</div><div class='del'>-		ai-&gt;expires = RUN_AT(3*HZ);</div><div class='del'>-		wake_up_interruptible(&amp;ai-&gt;thr_wait);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int airo_open(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	if (test_bit(FLAG_FLASHING, &amp;ai-&gt;flags))</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	/* Make sure the card is configured.</div><div class='del'>-	 * Wireless Extensions may postpone config changes until the card</div><div class='del'>-	 * is open (to pipeline changes and speed-up card setup). If</div><div class='del'>-	 * those changes are not yet committed, do it now - Jean II */</div><div class='del'>-	if (test_bit(FLAG_COMMIT, &amp;ai-&gt;flags)) {</div><div class='del'>-		disable_MAC(ai, 1);</div><div class='del'>-		writeConfigRid(ai, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ai-&gt;wifidev != dev) {</div><div class='del'>-		clear_bit(JOB_DIE, &amp;ai-&gt;jobs);</div><div class='del'>-		ai-&gt;airo_thread_task = kthread_run(airo_thread, dev, "%s",</div><div class='del'>-						   dev-&gt;name);</div><div class='del'>-		if (IS_ERR(ai-&gt;airo_thread_task))</div><div class='del'>-			return (int)PTR_ERR(ai-&gt;airo_thread_task);</div><div class='del'>-</div><div class='del'>-		rc = request_irq(dev-&gt;irq, airo_interrupt, IRQF_SHARED,</div><div class='del'>-			dev-&gt;name, dev);</div><div class='del'>-		if (rc) {</div><div class='del'>-			airo_print_err(dev-&gt;name,</div><div class='del'>-				"register interrupt %d failed, rc %d",</div><div class='del'>-				dev-&gt;irq, rc);</div><div class='del'>-			set_bit(JOB_DIE, &amp;ai-&gt;jobs);</div><div class='del'>-			kthread_stop(ai-&gt;airo_thread_task);</div><div class='del'>-			return rc;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Power on the MAC controller (which may have been disabled) */</div><div class='del'>-		clear_bit(FLAG_RADIO_DOWN, &amp;ai-&gt;flags);</div><div class='del'>-		enable_interrupts(ai);</div><div class='del'>-</div><div class='del'>-		try_auto_wep(ai);</div><div class='del'>-	}</div><div class='del'>-	enable_MAC(ai, 1);</div><div class='del'>-</div><div class='del'>-	netif_start_queue(dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static netdev_tx_t mpi_start_xmit(struct sk_buff *skb,</div><div class='del'>-					struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	int npacks, pending;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	if (!skb) {</div><div class='del'>-		airo_print_err(dev-&gt;name, "%s: skb == NULL!",__func__);</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='del'>-	}</div><div class='del'>-	if (skb_padto(skb, ETH_ZLEN)) {</div><div class='del'>-		dev-&gt;stats.tx_dropped++;</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='del'>-	}</div><div class='del'>-	npacks = skb_queue_len (&amp;ai-&gt;txq);</div><div class='del'>-</div><div class='del'>-	if (npacks &gt;= MAXTXQ - 1) {</div><div class='del'>-		netif_stop_queue (dev);</div><div class='del'>-		if (npacks &gt; MAXTXQ) {</div><div class='del'>-			dev-&gt;stats.tx_fifo_errors++;</div><div class='del'>-			return NETDEV_TX_BUSY;</div><div class='del'>-		}</div><div class='del'>-		skb_queue_tail (&amp;ai-&gt;txq, skb);</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;ai-&gt;aux_lock, flags);</div><div class='del'>-	skb_queue_tail (&amp;ai-&gt;txq, skb);</div><div class='del'>-	pending = test_bit(FLAG_PENDING_XMIT, &amp;ai-&gt;flags);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ai-&gt;aux_lock, flags);</div><div class='del'>-	netif_wake_queue (dev);</div><div class='del'>-</div><div class='del'>-	if (pending == 0) {</div><div class='del'>-		set_bit(FLAG_PENDING_XMIT, &amp;ai-&gt;flags);</div><div class='del'>-		mpi_send_packet (dev);</div><div class='del'>-	}</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * @mpi_send_packet</div><div class='del'>- *</div><div class='del'>- * Attempt to transmit a packet. Can be called from interrupt</div><div class='del'>- * or transmit . return number of packets we tried to send</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int mpi_send_packet (struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	unsigned char *buffer;</div><div class='del'>-	s16 len;</div><div class='del'>-	__le16 *payloadLen;</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-	u8 *sendbuf;</div><div class='del'>-</div><div class='del'>-	/* get a packet to send */</div><div class='del'>-</div><div class='del'>-	if ((skb = skb_dequeue(&amp;ai-&gt;txq)) == NULL) {</div><div class='del'>-		airo_print_err(dev-&gt;name,</div><div class='del'>-			"%s: Dequeue'd zero in send_packet()",</div><div class='del'>-			__func__);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check min length*/</div><div class='del'>-	len = ETH_ZLEN &lt; skb-&gt;len ? skb-&gt;len : ETH_ZLEN;</div><div class='del'>-	buffer = skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	ai-&gt;txfids[0].tx_desc.offset = 0;</div><div class='del'>-	ai-&gt;txfids[0].tx_desc.valid = 1;</div><div class='del'>-	ai-&gt;txfids[0].tx_desc.eoc = 1;</div><div class='del'>-	ai-&gt;txfids[0].tx_desc.len =len+sizeof(WifiHdr);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Magic, the cards firmware needs a length count (2 bytes) in the host buffer</div><div class='del'>- * right after  TXFID_HDR.The TXFID_HDR contains the status short so payloadlen</div><div class='del'>- * is immediately after it. ------------------------------------------------</div><div class='del'>- *                         |TXFIDHDR+STATUS|PAYLOADLEN|802.3HDR|PACKETDATA|</div><div class='del'>- *                         ------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-	memcpy(ai-&gt;txfids[0].virtual_host_addr,</div><div class='del'>-		(char *)&amp;wifictlhdr8023, sizeof(wifictlhdr8023));</div><div class='del'>-</div><div class='del'>-	payloadLen = (__le16 *)(ai-&gt;txfids[0].virtual_host_addr +</div><div class='del'>-		sizeof(wifictlhdr8023));</div><div class='del'>-	sendbuf = ai-&gt;txfids[0].virtual_host_addr +</div><div class='del'>-		sizeof(wifictlhdr8023) + 2 ;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Firmware automatically puts 802 header on so</div><div class='del'>-	 * we don't need to account for it in the length</div><div class='del'>-	 */</div><div class='del'>-	if (test_bit(FLAG_MIC_CAPABLE, &amp;ai-&gt;flags) &amp;&amp; ai-&gt;micstats.enabled &amp;&amp;</div><div class='del'>-		(ntohs(((__be16 *)buffer)[6]) != 0x888E)) {</div><div class='del'>-		MICBuffer pMic;</div><div class='del'>-</div><div class='del'>-		if (encapsulate(ai, (etherHead *)buffer, &amp;pMic, len - sizeof(etherHead)) != SUCCESS)</div><div class='del'>-			return ERROR;</div><div class='del'>-</div><div class='del'>-		*payloadLen = cpu_to_le16(len-sizeof(etherHead)+sizeof(pMic));</div><div class='del'>-		ai-&gt;txfids[0].tx_desc.len += sizeof(pMic);</div><div class='del'>-		/* copy data into airo dma buffer */</div><div class='del'>-		memcpy (sendbuf, buffer, sizeof(etherHead));</div><div class='del'>-		buffer += sizeof(etherHead);</div><div class='del'>-		sendbuf += sizeof(etherHead);</div><div class='del'>-		memcpy (sendbuf, &amp;pMic, sizeof(pMic));</div><div class='del'>-		sendbuf += sizeof(pMic);</div><div class='del'>-		memcpy (sendbuf, buffer, len - sizeof(etherHead));</div><div class='del'>-	} else {</div><div class='del'>-		*payloadLen = cpu_to_le16(len - sizeof(etherHead));</div><div class='del'>-</div><div class='del'>-		netif_trans_update(dev);</div><div class='del'>-</div><div class='del'>-		/* copy data into airo dma buffer */</div><div class='del'>-		memcpy(sendbuf, buffer, len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy_toio(ai-&gt;txfids[0].card_ram_off,</div><div class='del'>-		&amp;ai-&gt;txfids[0].tx_desc, sizeof(TxFid));</div><div class='del'>-</div><div class='del'>-	OUT4500(ai, EVACK, 8);</div><div class='del'>-</div><div class='del'>-	dev_kfree_skb_any(skb);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void get_tx_error(struct airo_info *ai, s32 fid)</div><div class='del'>-{</div><div class='del'>-	__le16 status;</div><div class='del'>-</div><div class='del'>-	if (fid &lt; 0)</div><div class='del'>-		status = ((WifiCtlHdr *)ai-&gt;txfids[0].virtual_host_addr)-&gt;ctlhdr.status;</div><div class='del'>-	else {</div><div class='del'>-		if (bap_setup(ai, ai-&gt;fids[fid] &amp; 0xffff, 4, BAP0) != SUCCESS)</div><div class='del'>-			return;</div><div class='del'>-		bap_read(ai, &amp;status, 2, BAP0);</div><div class='del'>-	}</div><div class='del'>-	if (le16_to_cpu(status) &amp; 2) /* Too many retries */</div><div class='del'>-		ai-&gt;dev-&gt;stats.tx_aborted_errors++;</div><div class='del'>-	if (le16_to_cpu(status) &amp; 4) /* Transmit lifetime exceeded */</div><div class='del'>-		ai-&gt;dev-&gt;stats.tx_heartbeat_errors++;</div><div class='del'>-	if (le16_to_cpu(status) &amp; 8) /* Aid fail */</div><div class='del'>-		{ }</div><div class='del'>-	if (le16_to_cpu(status) &amp; 0x10) /* MAC disabled */</div><div class='del'>-		ai-&gt;dev-&gt;stats.tx_carrier_errors++;</div><div class='del'>-	if (le16_to_cpu(status) &amp; 0x20) /* Association lost */</div><div class='del'>-		{ }</div><div class='del'>-	/* We produce a TXDROP event only for retry or lifetime</div><div class='del'>-	 * exceeded, because that's the only status that really mean</div><div class='del'>-	 * that this particular node went away.</div><div class='del'>-	 * Other errors means that *we* screwed up. - Jean II */</div><div class='del'>-	if ((le16_to_cpu(status) &amp; 2) ||</div><div class='del'>-	     (le16_to_cpu(status) &amp; 4)) {</div><div class='del'>-		union iwreq_data	wrqu;</div><div class='del'>-		char junk[0x18];</div><div class='del'>-</div><div class='del'>-		/* Faster to skip over useless data than to do</div><div class='del'>-		 * another bap_setup(). We are at offset 0x6 and</div><div class='del'>-		 * need to go to 0x18 and read 6 bytes - Jean II */</div><div class='del'>-		bap_read(ai, (__le16 *) junk, 0x18, BAP0);</div><div class='del'>-</div><div class='del'>-		/* Copy 802.11 dest address.</div><div class='del'>-		 * We use the 802.11 header because the frame may</div><div class='del'>-		 * not be 802.3 or may be mangled...</div><div class='del'>-		 * In Ad-Hoc mode, it will be the node address.</div><div class='del'>-		 * In managed mode, it will be most likely the AP addr</div><div class='del'>-		 * User space will figure out how to convert it to</div><div class='del'>-		 * whatever it needs (IP address or else).</div><div class='del'>-		 * - Jean II */</div><div class='del'>-		memcpy(wrqu.addr.sa_data, junk + 0x12, ETH_ALEN);</div><div class='del'>-		wrqu.addr.sa_family = ARPHRD_ETHER;</div><div class='del'>-</div><div class='del'>-		/* Send event to user space */</div><div class='del'>-		wireless_send_event(ai-&gt;dev, IWEVTXDROP, &amp;wrqu, NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void airo_end_xmit(struct net_device *dev, bool may_sleep)</div><div class='del'>-{</div><div class='del'>-	u16 status;</div><div class='del'>-	int i;</div><div class='del'>-	struct airo_info *priv = dev-&gt;ml_priv;</div><div class='del'>-	struct sk_buff *skb = priv-&gt;xmit.skb;</div><div class='del'>-	int fid = priv-&gt;xmit.fid;</div><div class='del'>-	u32 *fids = priv-&gt;fids;</div><div class='del'>-</div><div class='del'>-	clear_bit(JOB_XMIT, &amp;priv-&gt;jobs);</div><div class='del'>-	clear_bit(FLAG_PENDING_XMIT, &amp;priv-&gt;flags);</div><div class='del'>-	status = transmit_802_3_packet(priv, fids[fid], skb-&gt;data, may_sleep);</div><div class='del'>-	up(&amp;priv-&gt;sem);</div><div class='del'>-</div><div class='del'>-	i = 0;</div><div class='del'>-	if (status == SUCCESS) {</div><div class='del'>-		netif_trans_update(dev);</div><div class='del'>-		for (; i &lt; MAX_FIDS / 2 &amp;&amp; (priv-&gt;fids[i] &amp; 0xffff0000); i++);</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;fids[fid] &amp;= 0xffff;</div><div class='del'>-		dev-&gt;stats.tx_window_errors++;</div><div class='del'>-	}</div><div class='del'>-	if (i &lt; MAX_FIDS / 2)</div><div class='del'>-		netif_wake_queue(dev);</div><div class='del'>-	dev_kfree_skb(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static netdev_tx_t airo_start_xmit(struct sk_buff *skb,</div><div class='del'>-					 struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	s16 len;</div><div class='del'>-	int i, j;</div><div class='del'>-	struct airo_info *priv = dev-&gt;ml_priv;</div><div class='del'>-	u32 *fids = priv-&gt;fids;</div><div class='del'>-</div><div class='del'>-	if (skb == NULL) {</div><div class='del'>-		airo_print_err(dev-&gt;name, "%s: skb == NULL!", __func__);</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='del'>-	}</div><div class='del'>-	if (skb_padto(skb, ETH_ZLEN)) {</div><div class='del'>-		dev-&gt;stats.tx_dropped++;</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Find a vacant FID */</div><div class='del'>-	for (i = 0; i &lt; MAX_FIDS / 2 &amp;&amp; (fids[i] &amp; 0xffff0000); i++);</div><div class='del'>-	for (j = i + 1; j &lt; MAX_FIDS / 2 &amp;&amp; (fids[j] &amp; 0xffff0000); j++);</div><div class='del'>-</div><div class='del'>-	if (j &gt;= MAX_FIDS / 2) {</div><div class='del'>-		netif_stop_queue(dev);</div><div class='del'>-</div><div class='del'>-		if (i == MAX_FIDS / 2) {</div><div class='del'>-			dev-&gt;stats.tx_fifo_errors++;</div><div class='del'>-			return NETDEV_TX_BUSY;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* check min length*/</div><div class='del'>-	len = ETH_ZLEN &lt; skb-&gt;len ? skb-&gt;len : ETH_ZLEN;</div><div class='del'>-        /* Mark fid as used &amp; save length for later */</div><div class='del'>-	fids[i] |= (len &lt;&lt; 16);</div><div class='del'>-	priv-&gt;xmit.skb = skb;</div><div class='del'>-	priv-&gt;xmit.fid = i;</div><div class='del'>-	if (down_trylock(&amp;priv-&gt;sem) != 0) {</div><div class='del'>-		set_bit(FLAG_PENDING_XMIT, &amp;priv-&gt;flags);</div><div class='del'>-		netif_stop_queue(dev);</div><div class='del'>-		set_bit(JOB_XMIT, &amp;priv-&gt;jobs);</div><div class='del'>-		wake_up_interruptible(&amp;priv-&gt;thr_wait);</div><div class='del'>-	} else</div><div class='del'>-		airo_end_xmit(dev, false);</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void airo_end_xmit11(struct net_device *dev, bool may_sleep)</div><div class='del'>-{</div><div class='del'>-	u16 status;</div><div class='del'>-	int i;</div><div class='del'>-	struct airo_info *priv = dev-&gt;ml_priv;</div><div class='del'>-	struct sk_buff *skb = priv-&gt;xmit11.skb;</div><div class='del'>-	int fid = priv-&gt;xmit11.fid;</div><div class='del'>-	u32 *fids = priv-&gt;fids;</div><div class='del'>-</div><div class='del'>-	clear_bit(JOB_XMIT11, &amp;priv-&gt;jobs);</div><div class='del'>-	clear_bit(FLAG_PENDING_XMIT11, &amp;priv-&gt;flags);</div><div class='del'>-	status = transmit_802_11_packet(priv, fids[fid], skb-&gt;data, may_sleep);</div><div class='del'>-	up(&amp;priv-&gt;sem);</div><div class='del'>-</div><div class='del'>-	i = MAX_FIDS / 2;</div><div class='del'>-	if (status == SUCCESS) {</div><div class='del'>-		netif_trans_update(dev);</div><div class='del'>-		for (; i &lt; MAX_FIDS &amp;&amp; (priv-&gt;fids[i] &amp; 0xffff0000); i++);</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;fids[fid] &amp;= 0xffff;</div><div class='del'>-		dev-&gt;stats.tx_window_errors++;</div><div class='del'>-	}</div><div class='del'>-	if (i &lt; MAX_FIDS)</div><div class='del'>-		netif_wake_queue(dev);</div><div class='del'>-	dev_kfree_skb(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static netdev_tx_t airo_start_xmit11(struct sk_buff *skb,</div><div class='del'>-					   struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	s16 len;</div><div class='del'>-	int i, j;</div><div class='del'>-	struct airo_info *priv = dev-&gt;ml_priv;</div><div class='del'>-	u32 *fids = priv-&gt;fids;</div><div class='del'>-</div><div class='del'>-	if (test_bit(FLAG_MPI, &amp;priv-&gt;flags)) {</div><div class='del'>-		/* Not implemented yet for MPI350 */</div><div class='del'>-		netif_stop_queue(dev);</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (skb == NULL) {</div><div class='del'>-		airo_print_err(dev-&gt;name, "%s: skb == NULL!", __func__);</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='del'>-	}</div><div class='del'>-	if (skb_padto(skb, ETH_ZLEN)) {</div><div class='del'>-		dev-&gt;stats.tx_dropped++;</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Find a vacant FID */</div><div class='del'>-	for (i = MAX_FIDS / 2; i &lt; MAX_FIDS &amp;&amp; (fids[i] &amp; 0xffff0000); i++);</div><div class='del'>-	for (j = i + 1; j &lt; MAX_FIDS &amp;&amp; (fids[j] &amp; 0xffff0000); j++);</div><div class='del'>-</div><div class='del'>-	if (j &gt;= MAX_FIDS) {</div><div class='del'>-		netif_stop_queue(dev);</div><div class='del'>-</div><div class='del'>-		if (i == MAX_FIDS) {</div><div class='del'>-			dev-&gt;stats.tx_fifo_errors++;</div><div class='del'>-			return NETDEV_TX_BUSY;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* check min length*/</div><div class='del'>-	len = ETH_ZLEN &lt; skb-&gt;len ? skb-&gt;len : ETH_ZLEN;</div><div class='del'>-        /* Mark fid as used &amp; save length for later */</div><div class='del'>-	fids[i] |= (len &lt;&lt; 16);</div><div class='del'>-	priv-&gt;xmit11.skb = skb;</div><div class='del'>-	priv-&gt;xmit11.fid = i;</div><div class='del'>-	if (down_trylock(&amp;priv-&gt;sem) != 0) {</div><div class='del'>-		set_bit(FLAG_PENDING_XMIT11, &amp;priv-&gt;flags);</div><div class='del'>-		netif_stop_queue(dev);</div><div class='del'>-		set_bit(JOB_XMIT11, &amp;priv-&gt;jobs);</div><div class='del'>-		wake_up_interruptible(&amp;priv-&gt;thr_wait);</div><div class='del'>-	} else</div><div class='del'>-		airo_end_xmit11(dev, false);</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void airo_read_stats(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-	StatsRid stats_rid;</div><div class='del'>-	__le32 *vals = stats_rid.vals;</div><div class='del'>-</div><div class='del'>-	clear_bit(JOB_STATS, &amp;ai-&gt;jobs);</div><div class='del'>-	if (ai-&gt;power.event) {</div><div class='del'>-		up(&amp;ai-&gt;sem);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	readStatsRid(ai, &amp;stats_rid, RID_STATS, 0);</div><div class='del'>-	up(&amp;ai-&gt;sem);</div><div class='del'>-</div><div class='del'>-	dev-&gt;stats.rx_packets = le32_to_cpu(vals[43]) + le32_to_cpu(vals[44]) +</div><div class='del'>-			       le32_to_cpu(vals[45]);</div><div class='del'>-	dev-&gt;stats.tx_packets = le32_to_cpu(vals[39]) + le32_to_cpu(vals[40]) +</div><div class='del'>-			       le32_to_cpu(vals[41]);</div><div class='del'>-	dev-&gt;stats.rx_bytes = le32_to_cpu(vals[92]);</div><div class='del'>-	dev-&gt;stats.tx_bytes = le32_to_cpu(vals[91]);</div><div class='del'>-	dev-&gt;stats.rx_errors = le32_to_cpu(vals[0]) + le32_to_cpu(vals[2]) +</div><div class='del'>-			      le32_to_cpu(vals[3]) + le32_to_cpu(vals[4]);</div><div class='del'>-	dev-&gt;stats.tx_errors = le32_to_cpu(vals[42]) +</div><div class='del'>-			      dev-&gt;stats.tx_fifo_errors;</div><div class='del'>-	dev-&gt;stats.multicast = le32_to_cpu(vals[43]);</div><div class='del'>-	dev-&gt;stats.collisions = le32_to_cpu(vals[89]);</div><div class='del'>-</div><div class='del'>-	/* detailed rx_errors: */</div><div class='del'>-	dev-&gt;stats.rx_length_errors = le32_to_cpu(vals[3]);</div><div class='del'>-	dev-&gt;stats.rx_crc_errors = le32_to_cpu(vals[4]);</div><div class='del'>-	dev-&gt;stats.rx_frame_errors = le32_to_cpu(vals[2]);</div><div class='del'>-	dev-&gt;stats.rx_fifo_errors = le32_to_cpu(vals[0]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct net_device_stats *airo_get_stats(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local =  dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(JOB_STATS, &amp;local-&gt;jobs)) {</div><div class='del'>-		set_bit(JOB_STATS, &amp;local-&gt;jobs);</div><div class='del'>-		wake_up_interruptible(&amp;local-&gt;thr_wait);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return &amp;dev-&gt;stats;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void airo_set_promisc(struct airo_info *ai, bool may_sleep)</div><div class='del'>-{</div><div class='del'>-	Cmd cmd;</div><div class='del'>-	Resp rsp;</div><div class='del'>-</div><div class='del'>-	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-	cmd.cmd = CMD_SETMODE;</div><div class='del'>-	clear_bit(JOB_PROMISC, &amp;ai-&gt;jobs);</div><div class='del'>-	cmd.parm0=(ai-&gt;flags&amp;IFF_PROMISC) ? PROMISC : NOPROMISC;</div><div class='del'>-	issuecommand(ai, &amp;cmd, &amp;rsp, may_sleep);</div><div class='del'>-	up(&amp;ai-&gt;sem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void airo_set_multicast_list(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	if ((dev-&gt;flags ^ ai-&gt;flags) &amp; IFF_PROMISC) {</div><div class='del'>-		change_bit(FLAG_PROMISC, &amp;ai-&gt;flags);</div><div class='del'>-		if (down_trylock(&amp;ai-&gt;sem) != 0) {</div><div class='del'>-			set_bit(JOB_PROMISC, &amp;ai-&gt;jobs);</div><div class='del'>-			wake_up_interruptible(&amp;ai-&gt;thr_wait);</div><div class='del'>-		} else</div><div class='del'>-			airo_set_promisc(ai, false);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((dev-&gt;flags&amp;IFF_ALLMULTI) || !netdev_mc_empty(dev)) {</div><div class='del'>-		/* Turn on multicast.  (Should be already setup...) */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int airo_set_mac_address(struct net_device *dev, void *p)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-	struct sockaddr *addr = p;</div><div class='del'>-</div><div class='del'>-	readConfigRid(ai, 1);</div><div class='del'>-	memcpy (ai-&gt;config.macAddr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='del'>-	set_bit (FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-	disable_MAC(ai, 1);</div><div class='del'>-	writeConfigRid (ai, 1);</div><div class='del'>-	enable_MAC(ai, 1);</div><div class='del'>-	memcpy (ai-&gt;dev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='del'>-	if (ai-&gt;wifidev)</div><div class='del'>-		memcpy (ai-&gt;wifidev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static LIST_HEAD(airo_devices);</div><div class='del'>-</div><div class='del'>-static void add_airo_dev(struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	/* Upper layers already keep track of PCI devices,</div><div class='del'>-	 * so we only need to remember our non-PCI cards. */</div><div class='del'>-	if (!ai-&gt;pci)</div><div class='del'>-		list_add_tail(&amp;ai-&gt;dev_list, &amp;airo_devices);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void del_airo_dev(struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	if (!ai-&gt;pci)</div><div class='del'>-		list_del(&amp;ai-&gt;dev_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int airo_close(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	netif_stop_queue(dev);</div><div class='del'>-</div><div class='del'>-	if (ai-&gt;wifidev != dev) {</div><div class='del'>-#ifdef POWER_ON_DOWN</div><div class='del'>-		/* Shut power to the card. The idea is that the user can save</div><div class='del'>-		 * power when he doesn't need the card with "ifconfig down".</div><div class='del'>-		 * That's the method that is most friendly towards the network</div><div class='del'>-		 * stack (i.e. the network stack won't try to broadcast</div><div class='del'>-		 * anything on the interface and routes are gone. Jean II */</div><div class='del'>-		set_bit(FLAG_RADIO_DOWN, &amp;ai-&gt;flags);</div><div class='del'>-		disable_MAC(ai, 1);</div><div class='del'>-#endif</div><div class='del'>-		disable_interrupts(ai);</div><div class='del'>-</div><div class='del'>-		free_irq(dev-&gt;irq, dev);</div><div class='del'>-</div><div class='del'>-		set_bit(JOB_DIE, &amp;ai-&gt;jobs);</div><div class='del'>-		kthread_stop(ai-&gt;airo_thread_task);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void stop_airo_card(struct net_device *dev, int freeres)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	set_bit(FLAG_RADIO_DOWN, &amp;ai-&gt;flags);</div><div class='del'>-	disable_MAC(ai, 1);</div><div class='del'>-	disable_interrupts(ai);</div><div class='del'>-	takedown_proc_entry(dev, ai);</div><div class='del'>-	if (test_bit(FLAG_REGISTERED, &amp;ai-&gt;flags)) {</div><div class='del'>-		unregister_netdev(dev);</div><div class='del'>-		if (ai-&gt;wifidev) {</div><div class='del'>-			unregister_netdev(ai-&gt;wifidev);</div><div class='del'>-			free_netdev(ai-&gt;wifidev);</div><div class='del'>-			ai-&gt;wifidev = NULL;</div><div class='del'>-		}</div><div class='del'>-		clear_bit(FLAG_REGISTERED, &amp;ai-&gt;flags);</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Clean out tx queue</div><div class='del'>-	 */</div><div class='del'>-	if (test_bit(FLAG_MPI, &amp;ai-&gt;flags) &amp;&amp; !skb_queue_empty(&amp;ai-&gt;txq)) {</div><div class='del'>-		struct sk_buff *skb = NULL;</div><div class='del'>-		for (;(skb = skb_dequeue(&amp;ai-&gt;txq));)</div><div class='del'>-			dev_kfree_skb(skb);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	airo_networks_free (ai);</div><div class='del'>-</div><div class='del'>-	kfree(ai-&gt;flash);</div><div class='del'>-	kfree(ai-&gt;rssi);</div><div class='del'>-	kfree(ai-&gt;SSID);</div><div class='del'>-	if (freeres) {</div><div class='del'>-		/* PCMCIA frees this stuff, so only for PCI and ISA */</div><div class='del'>-		release_region(dev-&gt;base_addr, 64);</div><div class='del'>-		if (test_bit(FLAG_MPI, &amp;ai-&gt;flags)) {</div><div class='del'>-			if (ai-&gt;pci)</div><div class='del'>-				mpi_unmap_card(ai-&gt;pci);</div><div class='del'>-			if (ai-&gt;pcimem)</div><div class='del'>-				iounmap(ai-&gt;pcimem);</div><div class='del'>-			if (ai-&gt;pciaux)</div><div class='del'>-				iounmap(ai-&gt;pciaux);</div><div class='del'>-			dma_free_coherent(&amp;ai-&gt;pci-&gt;dev, PCI_SHARED_LEN,</div><div class='del'>-					  ai-&gt;shared, ai-&gt;shared_dma);</div><div class='del'>-		}</div><div class='del'>-        }</div><div class='del'>-	crypto_free_sync_skcipher(ai-&gt;tfm);</div><div class='del'>-	del_airo_dev(ai);</div><div class='del'>-	free_netdev(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(stop_airo_card);</div><div class='del'>-</div><div class='del'>-static int wll_header_parse(const struct sk_buff *skb, unsigned char *haddr)</div><div class='del'>-{</div><div class='del'>-	memcpy(haddr, skb_mac_header(skb) + 10, ETH_ALEN);</div><div class='del'>-	return ETH_ALEN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mpi_unmap_card(struct pci_dev *pci)</div><div class='del'>-{</div><div class='del'>-	unsigned long mem_start = pci_resource_start(pci, 1);</div><div class='del'>-	unsigned long mem_len = pci_resource_len(pci, 1);</div><div class='del'>-	unsigned long aux_start = pci_resource_start(pci, 2);</div><div class='del'>-	unsigned long aux_len = AUXMEMSIZE;</div><div class='del'>-</div><div class='del'>-	release_mem_region(aux_start, aux_len);</div><div class='del'>-	release_mem_region(mem_start, mem_len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*************************************************************</div><div class='del'>- *  This routine assumes that descriptors have been setup .</div><div class='del'>- *  Run at insmod time or after reset when the descriptors</div><div class='del'>- *  have been initialized . Returns 0 if all is well nz</div><div class='del'>- *  otherwise . Does not allocate memory but sets up card</div><div class='del'>- *  using previously allocated descriptors.</div><div class='del'>- */</div><div class='del'>-static int mpi_init_descriptors (struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	Cmd cmd;</div><div class='del'>-	Resp rsp;</div><div class='del'>-	int i;</div><div class='del'>-	int rc = SUCCESS;</div><div class='del'>-</div><div class='del'>-	/* Alloc  card RX descriptors */</div><div class='del'>-	netif_stop_queue(ai-&gt;dev);</div><div class='del'>-</div><div class='del'>-	memset(&amp;rsp, 0, sizeof(rsp));</div><div class='del'>-	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-</div><div class='del'>-	cmd.cmd = CMD_ALLOCATEAUX;</div><div class='del'>-	cmd.parm0 = FID_RX;</div><div class='del'>-	cmd.parm1 = (ai-&gt;rxfids[0].card_ram_off - ai-&gt;pciaux);</div><div class='del'>-	cmd.parm2 = MPI_MAX_FIDS;</div><div class='del'>-	rc = issuecommand(ai, &amp;cmd, &amp;rsp, true);</div><div class='del'>-	if (rc != SUCCESS) {</div><div class='del'>-		airo_print_err(ai-&gt;dev-&gt;name, "Couldn't allocate RX FID");</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i&lt;MPI_MAX_FIDS; i++) {</div><div class='del'>-		memcpy_toio(ai-&gt;rxfids[i].card_ram_off,</div><div class='del'>-			&amp;ai-&gt;rxfids[i].rx_desc, sizeof(RxFid));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Alloc card TX descriptors */</div><div class='del'>-</div><div class='del'>-	memset(&amp;rsp, 0, sizeof(rsp));</div><div class='del'>-	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-</div><div class='del'>-	cmd.cmd = CMD_ALLOCATEAUX;</div><div class='del'>-	cmd.parm0 = FID_TX;</div><div class='del'>-	cmd.parm1 = (ai-&gt;txfids[0].card_ram_off - ai-&gt;pciaux);</div><div class='del'>-	cmd.parm2 = MPI_MAX_FIDS;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i&lt;MPI_MAX_FIDS; i++) {</div><div class='del'>-		ai-&gt;txfids[i].tx_desc.valid = 1;</div><div class='del'>-		memcpy_toio(ai-&gt;txfids[i].card_ram_off,</div><div class='del'>-			&amp;ai-&gt;txfids[i].tx_desc, sizeof(TxFid));</div><div class='del'>-	}</div><div class='del'>-	ai-&gt;txfids[i-1].tx_desc.eoc = 1; /* Last descriptor has EOC set */</div><div class='del'>-</div><div class='del'>-	rc = issuecommand(ai, &amp;cmd, &amp;rsp, true);</div><div class='del'>-	if (rc != SUCCESS) {</div><div class='del'>-		airo_print_err(ai-&gt;dev-&gt;name, "Couldn't allocate TX FID");</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Alloc card Rid descriptor */</div><div class='del'>-	memset(&amp;rsp, 0, sizeof(rsp));</div><div class='del'>-	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-</div><div class='del'>-	cmd.cmd = CMD_ALLOCATEAUX;</div><div class='del'>-	cmd.parm0 = RID_RW;</div><div class='del'>-	cmd.parm1 = (ai-&gt;config_desc.card_ram_off - ai-&gt;pciaux);</div><div class='del'>-	cmd.parm2 = 1; /* Magic number... */</div><div class='del'>-	rc = issuecommand(ai, &amp;cmd, &amp;rsp, true);</div><div class='del'>-	if (rc != SUCCESS) {</div><div class='del'>-		airo_print_err(ai-&gt;dev-&gt;name, "Couldn't allocate RID");</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy_toio(ai-&gt;config_desc.card_ram_off,</div><div class='del'>-		&amp;ai-&gt;config_desc.rid_desc, sizeof(Rid));</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We are setting up three things here:</div><div class='del'>- * 1) Map AUX memory for descriptors: Rid, TxFid, or RxFid.</div><div class='del'>- * 2) Map PCI memory for issuing commands.</div><div class='del'>- * 3) Allocate memory (shared) to send and receive ethernet frames.</div><div class='del'>- */</div><div class='del'>-static int mpi_map_card(struct airo_info *ai, struct pci_dev *pci)</div><div class='del'>-{</div><div class='del'>-	unsigned long mem_start, mem_len, aux_start, aux_len;</div><div class='del'>-	int rc = -1;</div><div class='del'>-	int i;</div><div class='del'>-	dma_addr_t busaddroff;</div><div class='del'>-	unsigned char *vpackoff;</div><div class='del'>-	unsigned char __iomem *pciaddroff;</div><div class='del'>-</div><div class='del'>-	mem_start = pci_resource_start(pci, 1);</div><div class='del'>-	mem_len = pci_resource_len(pci, 1);</div><div class='del'>-	aux_start = pci_resource_start(pci, 2);</div><div class='del'>-	aux_len = AUXMEMSIZE;</div><div class='del'>-</div><div class='del'>-	if (!request_mem_region(mem_start, mem_len, DRV_NAME)) {</div><div class='del'>-		airo_print_err("", "Couldn't get region %x[%x]",</div><div class='del'>-			(int)mem_start, (int)mem_len);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	if (!request_mem_region(aux_start, aux_len, DRV_NAME)) {</div><div class='del'>-		airo_print_err("", "Couldn't get region %x[%x]",</div><div class='del'>-			(int)aux_start, (int)aux_len);</div><div class='del'>-		goto free_region1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ai-&gt;pcimem = ioremap(mem_start, mem_len);</div><div class='del'>-	if (!ai-&gt;pcimem) {</div><div class='del'>-		airo_print_err("", "Couldn't map region %x[%x]",</div><div class='del'>-			(int)mem_start, (int)mem_len);</div><div class='del'>-		goto free_region2;</div><div class='del'>-	}</div><div class='del'>-	ai-&gt;pciaux = ioremap(aux_start, aux_len);</div><div class='del'>-	if (!ai-&gt;pciaux) {</div><div class='del'>-		airo_print_err("", "Couldn't map region %x[%x]",</div><div class='del'>-			(int)aux_start, (int)aux_len);</div><div class='del'>-		goto free_memmap;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Reserve PKTSIZE for each fid and 2K for the Rids */</div><div class='del'>-	ai-&gt;shared = dma_alloc_coherent(&amp;pci-&gt;dev, PCI_SHARED_LEN,</div><div class='del'>-					&amp;ai-&gt;shared_dma, GFP_KERNEL);</div><div class='del'>-	if (!ai-&gt;shared) {</div><div class='del'>-		airo_print_err("", "Couldn't alloc_coherent %d",</div><div class='del'>-			PCI_SHARED_LEN);</div><div class='del'>-		goto free_auxmap;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Setup descriptor RX, TX, CONFIG</div><div class='del'>-	 */</div><div class='del'>-	busaddroff = ai-&gt;shared_dma;</div><div class='del'>-	pciaddroff = ai-&gt;pciaux + AUX_OFFSET;</div><div class='del'>-	vpackoff   = ai-&gt;shared;</div><div class='del'>-</div><div class='del'>-	/* RX descriptor setup */</div><div class='del'>-	for (i = 0; i &lt; MPI_MAX_FIDS; i++) {</div><div class='del'>-		ai-&gt;rxfids[i].pending = 0;</div><div class='del'>-		ai-&gt;rxfids[i].card_ram_off = pciaddroff;</div><div class='del'>-		ai-&gt;rxfids[i].virtual_host_addr = vpackoff;</div><div class='del'>-		ai-&gt;rxfids[i].rx_desc.host_addr = busaddroff;</div><div class='del'>-		ai-&gt;rxfids[i].rx_desc.valid = 1;</div><div class='del'>-		ai-&gt;rxfids[i].rx_desc.len = PKTSIZE;</div><div class='del'>-		ai-&gt;rxfids[i].rx_desc.rdy = 0;</div><div class='del'>-</div><div class='del'>-		pciaddroff += sizeof(RxFid);</div><div class='del'>-		busaddroff += PKTSIZE;</div><div class='del'>-		vpackoff   += PKTSIZE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* TX descriptor setup */</div><div class='del'>-	for (i = 0; i &lt; MPI_MAX_FIDS; i++) {</div><div class='del'>-		ai-&gt;txfids[i].card_ram_off = pciaddroff;</div><div class='del'>-		ai-&gt;txfids[i].virtual_host_addr = vpackoff;</div><div class='del'>-		ai-&gt;txfids[i].tx_desc.valid = 1;</div><div class='del'>-		ai-&gt;txfids[i].tx_desc.host_addr = busaddroff;</div><div class='del'>-		memcpy(ai-&gt;txfids[i].virtual_host_addr,</div><div class='del'>-			&amp;wifictlhdr8023, sizeof(wifictlhdr8023));</div><div class='del'>-</div><div class='del'>-		pciaddroff += sizeof(TxFid);</div><div class='del'>-		busaddroff += PKTSIZE;</div><div class='del'>-		vpackoff   += PKTSIZE;</div><div class='del'>-	}</div><div class='del'>-	ai-&gt;txfids[i-1].tx_desc.eoc = 1; /* Last descriptor has EOC set */</div><div class='del'>-</div><div class='del'>-	/* Rid descriptor setup */</div><div class='del'>-	ai-&gt;config_desc.card_ram_off = pciaddroff;</div><div class='del'>-	ai-&gt;config_desc.virtual_host_addr = vpackoff;</div><div class='del'>-	ai-&gt;config_desc.rid_desc.host_addr = busaddroff;</div><div class='del'>-	ai-&gt;ridbus = busaddroff;</div><div class='del'>-	ai-&gt;config_desc.rid_desc.rid = 0;</div><div class='del'>-	ai-&gt;config_desc.rid_desc.len = RIDSIZE;</div><div class='del'>-	ai-&gt;config_desc.rid_desc.valid = 1;</div><div class='del'>-	pciaddroff += sizeof(Rid);</div><div class='del'>-	busaddroff += RIDSIZE;</div><div class='del'>-	vpackoff   += RIDSIZE;</div><div class='del'>-</div><div class='del'>-	/* Tell card about descriptors */</div><div class='del'>-	if (mpi_init_descriptors (ai) != SUCCESS)</div><div class='del'>-		goto free_shared;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>- free_shared:</div><div class='del'>-	dma_free_coherent(&amp;pci-&gt;dev, PCI_SHARED_LEN, ai-&gt;shared,</div><div class='del'>-			  ai-&gt;shared_dma);</div><div class='del'>- free_auxmap:</div><div class='del'>-	iounmap(ai-&gt;pciaux);</div><div class='del'>- free_memmap:</div><div class='del'>-	iounmap(ai-&gt;pcimem);</div><div class='del'>- free_region2:</div><div class='del'>-	release_mem_region(aux_start, aux_len);</div><div class='del'>- free_region1:</div><div class='del'>-	release_mem_region(mem_start, mem_len);</div><div class='del'>- out:</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct header_ops airo_header_ops = {</div><div class='del'>-	.parse = wll_header_parse,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops airo11_netdev_ops = {</div><div class='del'>-	.ndo_open 		= airo_open,</div><div class='del'>-	.ndo_stop 		= airo_close,</div><div class='del'>-	.ndo_start_xmit 	= airo_start_xmit11,</div><div class='del'>-	.ndo_get_stats 		= airo_get_stats,</div><div class='del'>-	.ndo_set_mac_address	= airo_set_mac_address,</div><div class='del'>-	.ndo_do_ioctl		= airo_ioctl,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void wifi_setup(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	dev-&gt;netdev_ops = &amp;airo11_netdev_ops;</div><div class='del'>-	dev-&gt;header_ops = &amp;airo_header_ops;</div><div class='del'>-	dev-&gt;wireless_handlers = &amp;airo_handler_def;</div><div class='del'>-</div><div class='del'>-	dev-&gt;type               = ARPHRD_IEEE80211;</div><div class='del'>-	dev-&gt;hard_header_len    = ETH_HLEN;</div><div class='del'>-	dev-&gt;mtu                = AIRO_DEF_MTU;</div><div class='del'>-	dev-&gt;min_mtu            = 68;</div><div class='del'>-	dev-&gt;max_mtu            = MIC_MSGLEN_MAX;</div><div class='del'>-	dev-&gt;addr_len           = ETH_ALEN;</div><div class='del'>-	dev-&gt;tx_queue_len       = 100;</div><div class='del'>-</div><div class='del'>-	eth_broadcast_addr(dev-&gt;broadcast);</div><div class='del'>-</div><div class='del'>-	dev-&gt;flags              = IFF_BROADCAST|IFF_MULTICAST;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct net_device *init_wifidev(struct airo_info *ai,</div><div class='del'>-					struct net_device *ethdev)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct net_device *dev = alloc_netdev(0, "wifi%d", NET_NAME_UNKNOWN,</div><div class='del'>-					      wifi_setup);</div><div class='del'>-	if (!dev)</div><div class='del'>-		return NULL;</div><div class='del'>-	dev-&gt;ml_priv = ethdev-&gt;ml_priv;</div><div class='del'>-	dev-&gt;irq = ethdev-&gt;irq;</div><div class='del'>-	dev-&gt;base_addr = ethdev-&gt;base_addr;</div><div class='del'>-	dev-&gt;wireless_data = ethdev-&gt;wireless_data;</div><div class='del'>-	SET_NETDEV_DEV(dev, ethdev-&gt;dev.parent);</div><div class='del'>-	eth_hw_addr_inherit(dev, ethdev);</div><div class='del'>-	err = register_netdev(dev);</div><div class='del'>-	if (err&lt;0) {</div><div class='del'>-		free_netdev(dev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	return dev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reset_card(struct net_device *dev, int lock)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	if (lock &amp;&amp; down_interruptible(&amp;ai-&gt;sem))</div><div class='del'>-		return -1;</div><div class='del'>-	waitbusy (ai);</div><div class='del'>-	OUT4500(ai, COMMAND, CMD_SOFTRESET);</div><div class='del'>-	msleep(200);</div><div class='del'>-	waitbusy (ai);</div><div class='del'>-	msleep(200);</div><div class='del'>-	if (lock)</div><div class='del'>-		up(&amp;ai-&gt;sem);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define AIRO_MAX_NETWORK_COUNT	64</div><div class='del'>-static int airo_networks_allocate(struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	if (ai-&gt;networks)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ai-&gt;networks = kcalloc(AIRO_MAX_NETWORK_COUNT, sizeof(BSSListElement),</div><div class='del'>-			       GFP_KERNEL);</div><div class='del'>-	if (!ai-&gt;networks) {</div><div class='del'>-		airo_print_warn("", "Out of memory allocating beacons");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void airo_networks_free(struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	kfree(ai-&gt;networks);</div><div class='del'>-	ai-&gt;networks = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void airo_networks_initialize(struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;ai-&gt;network_free_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;ai-&gt;network_list);</div><div class='del'>-	for (i = 0; i &lt; AIRO_MAX_NETWORK_COUNT; i++)</div><div class='del'>-		list_add_tail(&amp;ai-&gt;networks[i].list,</div><div class='del'>-			      &amp;ai-&gt;network_free_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops airo_netdev_ops = {</div><div class='del'>-	.ndo_open		= airo_open,</div><div class='del'>-	.ndo_stop		= airo_close,</div><div class='del'>-	.ndo_start_xmit		= airo_start_xmit,</div><div class='del'>-	.ndo_get_stats		= airo_get_stats,</div><div class='del'>-	.ndo_set_rx_mode	= airo_set_multicast_list,</div><div class='del'>-	.ndo_set_mac_address	= airo_set_mac_address,</div><div class='del'>-	.ndo_do_ioctl		= airo_ioctl,</div><div class='del'>-	.ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops mpi_netdev_ops = {</div><div class='del'>-	.ndo_open		= airo_open,</div><div class='del'>-	.ndo_stop		= airo_close,</div><div class='del'>-	.ndo_start_xmit		= mpi_start_xmit,</div><div class='del'>-	.ndo_get_stats		= airo_get_stats,</div><div class='del'>-	.ndo_set_rx_mode	= airo_set_multicast_list,</div><div class='del'>-	.ndo_set_mac_address	= airo_set_mac_address,</div><div class='del'>-	.ndo_do_ioctl		= airo_ioctl,</div><div class='del'>-	.ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct net_device *_init_airo_card(unsigned short irq, int port,</div><div class='del'>-					   int is_pcmcia, struct pci_dev *pci,</div><div class='del'>-					   struct device *dmdev)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct airo_info *ai;</div><div class='del'>-	int i, rc;</div><div class='del'>-	CapabilityRid cap_rid;</div><div class='del'>-</div><div class='del'>-	/* Create the network device object. */</div><div class='del'>-	dev = alloc_netdev(sizeof(*ai), "", NET_NAME_UNKNOWN, ether_setup);</div><div class='del'>-	if (!dev) {</div><div class='del'>-		airo_print_err("", "Couldn't alloc_etherdev");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ai = dev-&gt;ml_priv = netdev_priv(dev);</div><div class='del'>-	ai-&gt;wifidev = NULL;</div><div class='del'>-	ai-&gt;flags = 1 &lt;&lt; FLAG_RADIO_DOWN;</div><div class='del'>-	ai-&gt;jobs = 0;</div><div class='del'>-	ai-&gt;dev = dev;</div><div class='del'>-	if (pci &amp;&amp; (pci-&gt;device == 0x5000 || pci-&gt;device == 0xa504)) {</div><div class='del'>-		airo_print_dbg("", "Found an MPI350 card");</div><div class='del'>-		set_bit(FLAG_MPI, &amp;ai-&gt;flags);</div><div class='del'>-	}</div><div class='del'>-	spin_lock_init(&amp;ai-&gt;aux_lock);</div><div class='del'>-	sema_init(&amp;ai-&gt;sem, 1);</div><div class='del'>-	ai-&gt;config.len = 0;</div><div class='del'>-	ai-&gt;pci = pci;</div><div class='del'>-	init_waitqueue_head (&amp;ai-&gt;thr_wait);</div><div class='del'>-	ai-&gt;tfm = NULL;</div><div class='del'>-	add_airo_dev(ai);</div><div class='del'>-	ai-&gt;APList.len = cpu_to_le16(sizeof(struct APListRid));</div><div class='del'>-</div><div class='del'>-	if (airo_networks_allocate (ai))</div><div class='del'>-		goto err_out_free;</div><div class='del'>-	airo_networks_initialize (ai);</div><div class='del'>-</div><div class='del'>-	skb_queue_head_init (&amp;ai-&gt;txq);</div><div class='del'>-</div><div class='del'>-	/* The Airo-specific entries in the device structure. */</div><div class='del'>-	if (test_bit(FLAG_MPI,&amp;ai-&gt;flags))</div><div class='del'>-		dev-&gt;netdev_ops = &amp;mpi_netdev_ops;</div><div class='del'>-	else</div><div class='del'>-		dev-&gt;netdev_ops = &amp;airo_netdev_ops;</div><div class='del'>-	dev-&gt;wireless_handlers = &amp;airo_handler_def;</div><div class='del'>-	ai-&gt;wireless_data.spy_data = &amp;ai-&gt;spy_data;</div><div class='del'>-	dev-&gt;wireless_data = &amp;ai-&gt;wireless_data;</div><div class='del'>-	dev-&gt;irq = irq;</div><div class='del'>-	dev-&gt;base_addr = port;</div><div class='del'>-	dev-&gt;priv_flags &amp;= ~IFF_TX_SKB_SHARING;</div><div class='del'>-	dev-&gt;max_mtu = MIC_MSGLEN_MAX;</div><div class='del'>-</div><div class='del'>-	SET_NETDEV_DEV(dev, dmdev);</div><div class='del'>-</div><div class='del'>-	reset_card (dev, 1);</div><div class='del'>-	msleep(400);</div><div class='del'>-</div><div class='del'>-	if (!is_pcmcia) {</div><div class='del'>-		if (!request_region(dev-&gt;base_addr, 64, DRV_NAME)) {</div><div class='del'>-			rc = -EBUSY;</div><div class='del'>-			airo_print_err(dev-&gt;name, "Couldn't request region");</div><div class='del'>-			goto err_out_nets;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (test_bit(FLAG_MPI,&amp;ai-&gt;flags)) {</div><div class='del'>-		if (mpi_map_card(ai, pci)) {</div><div class='del'>-			airo_print_err("", "Could not map memory");</div><div class='del'>-			goto err_out_res;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (probe) {</div><div class='del'>-		if (setup_card(ai, dev-&gt;dev_addr, 1) != SUCCESS) {</div><div class='del'>-			airo_print_err(dev-&gt;name, "MAC could not be enabled");</div><div class='del'>-			rc = -EIO;</div><div class='del'>-			goto err_out_map;</div><div class='del'>-		}</div><div class='del'>-	} else if (!test_bit(FLAG_MPI,&amp;ai-&gt;flags)) {</div><div class='del'>-		ai-&gt;bap_read = fast_bap_read;</div><div class='del'>-		set_bit(FLAG_FLASHING, &amp;ai-&gt;flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	strcpy(dev-&gt;name, "eth%d");</div><div class='del'>-	rc = register_netdev(dev);</div><div class='del'>-	if (rc) {</div><div class='del'>-		airo_print_err(dev-&gt;name, "Couldn't register_netdev");</div><div class='del'>-		goto err_out_map;</div><div class='del'>-	}</div><div class='del'>-	ai-&gt;wifidev = init_wifidev(ai, dev);</div><div class='del'>-	if (!ai-&gt;wifidev)</div><div class='del'>-		goto err_out_reg;</div><div class='del'>-</div><div class='del'>-	rc = readCapabilityRid(ai, &amp;cap_rid, 1);</div><div class='del'>-	if (rc != SUCCESS) {</div><div class='del'>-		rc = -EIO;</div><div class='del'>-		goto err_out_wifi;</div><div class='del'>-	}</div><div class='del'>-	/* WEP capability discovery */</div><div class='del'>-	ai-&gt;wep_capable = (cap_rid.softCap &amp; cpu_to_le16(0x02)) ? 1 : 0;</div><div class='del'>-	ai-&gt;max_wep_idx = (cap_rid.softCap &amp; cpu_to_le16(0x80)) ? 3 : 0;</div><div class='del'>-</div><div class='del'>-	airo_print_info(dev-&gt;name, "Firmware version %x.%x.%02d",</div><div class='del'>-	                ((le16_to_cpu(cap_rid.softVer) &gt;&gt; 8) &amp; 0xF),</div><div class='del'>-	                (le16_to_cpu(cap_rid.softVer) &amp; 0xFF),</div><div class='del'>-	                le16_to_cpu(cap_rid.softSubVer));</div><div class='del'>-</div><div class='del'>-	/* Test for WPA support */</div><div class='del'>-	/* Only firmware versions 5.30.17 or better can do WPA */</div><div class='del'>-	if (le16_to_cpu(cap_rid.softVer) &gt; 0x530</div><div class='del'>-	 || (le16_to_cpu(cap_rid.softVer) == 0x530</div><div class='del'>-	      &amp;&amp; le16_to_cpu(cap_rid.softSubVer) &gt;= 17)) {</div><div class='del'>-		airo_print_info(ai-&gt;dev-&gt;name, "WPA supported.");</div><div class='del'>-</div><div class='del'>-		set_bit(FLAG_WPA_CAPABLE, &amp;ai-&gt;flags);</div><div class='del'>-		ai-&gt;bssListFirst = RID_WPA_BSSLISTFIRST;</div><div class='del'>-		ai-&gt;bssListNext = RID_WPA_BSSLISTNEXT;</div><div class='del'>-		ai-&gt;bssListRidLen = sizeof(BSSListRid);</div><div class='del'>-	} else {</div><div class='del'>-		airo_print_info(ai-&gt;dev-&gt;name, "WPA unsupported with firmware "</div><div class='del'>-			"versions older than 5.30.17.");</div><div class='del'>-</div><div class='del'>-		ai-&gt;bssListFirst = RID_BSSLISTFIRST;</div><div class='del'>-		ai-&gt;bssListNext = RID_BSSLISTNEXT;</div><div class='del'>-		ai-&gt;bssListRidLen = sizeof(BSSListRid) - sizeof(BSSListRidExtra);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_bit(FLAG_REGISTERED,&amp;ai-&gt;flags);</div><div class='del'>-	airo_print_info(dev-&gt;name, "MAC enabled %pM", dev-&gt;dev_addr);</div><div class='del'>-</div><div class='del'>-	/* Allocate the transmit buffers */</div><div class='del'>-	if (probe &amp;&amp; !test_bit(FLAG_MPI,&amp;ai-&gt;flags))</div><div class='del'>-		for (i = 0; i &lt; MAX_FIDS; i++)</div><div class='del'>-			ai-&gt;fids[i] = transmit_allocate(ai, AIRO_DEF_MTU, i&gt;=MAX_FIDS/2);</div><div class='del'>-</div><div class='del'>-	if (setup_proc_entry(dev, dev-&gt;ml_priv) &lt; 0)</div><div class='del'>-		goto err_out_wifi;</div><div class='del'>-</div><div class='del'>-	return dev;</div><div class='del'>-</div><div class='del'>-err_out_wifi:</div><div class='del'>-	unregister_netdev(ai-&gt;wifidev);</div><div class='del'>-	free_netdev(ai-&gt;wifidev);</div><div class='del'>-err_out_reg:</div><div class='del'>-	unregister_netdev(dev);</div><div class='del'>-err_out_map:</div><div class='del'>-	if (test_bit(FLAG_MPI,&amp;ai-&gt;flags) &amp;&amp; pci) {</div><div class='del'>-		dma_free_coherent(&amp;pci-&gt;dev, PCI_SHARED_LEN, ai-&gt;shared,</div><div class='del'>-				  ai-&gt;shared_dma);</div><div class='del'>-		iounmap(ai-&gt;pciaux);</div><div class='del'>-		iounmap(ai-&gt;pcimem);</div><div class='del'>-		mpi_unmap_card(ai-&gt;pci);</div><div class='del'>-	}</div><div class='del'>-err_out_res:</div><div class='del'>-	if (!is_pcmcia)</div><div class='del'>-		release_region(dev-&gt;base_addr, 64);</div><div class='del'>-err_out_nets:</div><div class='del'>-	airo_networks_free(ai);</div><div class='del'>-err_out_free:</div><div class='del'>-	del_airo_dev(ai);</div><div class='del'>-	free_netdev(dev);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct net_device *init_airo_card(unsigned short irq, int port, int is_pcmcia,</div><div class='del'>-				  struct device *dmdev)</div><div class='del'>-{</div><div class='del'>-	return _init_airo_card (irq, port, is_pcmcia, NULL, dmdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(init_airo_card);</div><div class='del'>-</div><div class='del'>-static int waitbusy (struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	int delay = 0;</div><div class='del'>-	while ((IN4500(ai, COMMAND) &amp; COMMAND_BUSY) &amp;&amp; (delay &lt; 10000)) {</div><div class='del'>-		udelay (10);</div><div class='del'>-		if ((++delay % 20) == 0)</div><div class='del'>-			OUT4500(ai, EVACK, EV_CLEARCOMMANDBUSY);</div><div class='del'>-	}</div><div class='del'>-	return delay &lt; 10000;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int reset_airo_card(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	if (reset_card (dev, 1))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (setup_card(ai, dev-&gt;dev_addr, 1) != SUCCESS) {</div><div class='del'>-		airo_print_err(dev-&gt;name, "MAC could not be enabled");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	airo_print_info(dev-&gt;name, "MAC enabled %pM", dev-&gt;dev_addr);</div><div class='del'>-	/* Allocate the transmit buffers if needed */</div><div class='del'>-	if (!test_bit(FLAG_MPI,&amp;ai-&gt;flags))</div><div class='del'>-		for (i = 0; i &lt; MAX_FIDS; i++)</div><div class='del'>-			ai-&gt;fids[i] = transmit_allocate (ai, AIRO_DEF_MTU, i&gt;=MAX_FIDS/2);</div><div class='del'>-</div><div class='del'>-	enable_interrupts(ai);</div><div class='del'>-	netif_wake_queue(dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(reset_airo_card);</div><div class='del'>-</div><div class='del'>-static void airo_send_event(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-	union iwreq_data wrqu;</div><div class='del'>-	StatusRid status_rid;</div><div class='del'>-</div><div class='del'>-	clear_bit(JOB_EVENT, &amp;ai-&gt;jobs);</div><div class='del'>-	PC4500_readrid(ai, RID_STATUS, &amp;status_rid, sizeof(status_rid), 0);</div><div class='del'>-	up(&amp;ai-&gt;sem);</div><div class='del'>-	wrqu.data.length = 0;</div><div class='del'>-	wrqu.data.flags = 0;</div><div class='del'>-	memcpy(wrqu.ap_addr.sa_data, status_rid.bssid[0], ETH_ALEN);</div><div class='del'>-	wrqu.ap_addr.sa_family = ARPHRD_ETHER;</div><div class='del'>-</div><div class='del'>-	/* Send event to user space */</div><div class='del'>-	wireless_send_event(dev, SIOCGIWAP, &amp;wrqu, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void airo_process_scan_results (struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	union iwreq_data	wrqu;</div><div class='del'>-	BSSListRid bss;</div><div class='del'>-	int rc;</div><div class='del'>-	BSSListElement * loop_net;</div><div class='del'>-	BSSListElement * tmp_net;</div><div class='del'>-</div><div class='del'>-	/* Blow away current list of scan results */</div><div class='del'>-	list_for_each_entry_safe (loop_net, tmp_net, &amp;ai-&gt;network_list, list) {</div><div class='del'>-		list_move_tail (&amp;loop_net-&gt;list, &amp;ai-&gt;network_free_list);</div><div class='del'>-		/* Don't blow away -&gt;list, just BSS data */</div><div class='del'>-		memset (loop_net, 0, sizeof (loop_net-&gt;bss));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Try to read the first entry of the scan result */</div><div class='del'>-	rc = PC4500_readrid(ai, ai-&gt;bssListFirst, &amp;bss, ai-&gt;bssListRidLen, 0);</div><div class='del'>-	if ((rc) || (bss.index == cpu_to_le16(0xffff))) {</div><div class='del'>-		/* No scan results */</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Read and parse all entries */</div><div class='del'>-	tmp_net = NULL;</div><div class='del'>-	while ((!rc) &amp;&amp; (bss.index != cpu_to_le16(0xffff))) {</div><div class='del'>-		/* Grab a network off the free list */</div><div class='del'>-		if (!list_empty(&amp;ai-&gt;network_free_list)) {</div><div class='del'>-			tmp_net = list_entry(ai-&gt;network_free_list.next,</div><div class='del'>-					    BSSListElement, list);</div><div class='del'>-			list_del(ai-&gt;network_free_list.next);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (tmp_net != NULL) {</div><div class='del'>-			memcpy(tmp_net, &amp;bss, sizeof(tmp_net-&gt;bss));</div><div class='del'>-			list_add_tail(&amp;tmp_net-&gt;list, &amp;ai-&gt;network_list);</div><div class='del'>-			tmp_net = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Read next entry */</div><div class='del'>-		rc = PC4500_readrid(ai, ai-&gt;bssListNext,</div><div class='del'>-				    &amp;bss, ai-&gt;bssListRidLen, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	/* write APList back (we cleared it in airo_set_scan) */</div><div class='del'>-	disable_MAC(ai, 2);</div><div class='del'>-	writeAPListRid(ai, &amp;ai-&gt;APList, 0);</div><div class='del'>-	enable_MAC(ai, 0);</div><div class='del'>-</div><div class='del'>-	ai-&gt;scan_timeout = 0;</div><div class='del'>-	clear_bit(JOB_SCAN_RESULTS, &amp;ai-&gt;jobs);</div><div class='del'>-	up(&amp;ai-&gt;sem);</div><div class='del'>-</div><div class='del'>-	/* Send an empty event to user space.</div><div class='del'>-	 * We don't send the received data on</div><div class='del'>-	 * the event because it would require</div><div class='del'>-	 * us to do complex transcoding, and</div><div class='del'>-	 * we want to minimise the work done in</div><div class='del'>-	 * the irq handler. Use a request to</div><div class='del'>-	 * extract the data - Jean II */</div><div class='del'>-	wrqu.data.length = 0;</div><div class='del'>-	wrqu.data.flags = 0;</div><div class='del'>-	wireless_send_event(ai-&gt;dev, SIOCGIWSCAN, &amp;wrqu, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int airo_thread(void *data)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = data;</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-	int locked;</div><div class='del'>-</div><div class='del'>-	set_freezable();</div><div class='del'>-	while (1) {</div><div class='del'>-		/* make swsusp happy with our thread */</div><div class='del'>-		try_to_freeze();</div><div class='del'>-</div><div class='del'>-		if (test_bit(JOB_DIE, &amp;ai-&gt;jobs))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (ai-&gt;jobs) {</div><div class='del'>-			locked = down_interruptible(&amp;ai-&gt;sem);</div><div class='del'>-		} else {</div><div class='del'>-			wait_queue_entry_t wait;</div><div class='del'>-</div><div class='del'>-			init_waitqueue_entry(&amp;wait, current);</div><div class='del'>-			add_wait_queue(&amp;ai-&gt;thr_wait, &amp;wait);</div><div class='del'>-			for (;;) {</div><div class='del'>-				set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-				if (ai-&gt;jobs)</div><div class='del'>-					break;</div><div class='del'>-				if (ai-&gt;expires || ai-&gt;scan_timeout) {</div><div class='del'>-					if (ai-&gt;scan_timeout &amp;&amp;</div><div class='del'>-							time_after_eq(jiffies, ai-&gt;scan_timeout)) {</div><div class='del'>-						set_bit(JOB_SCAN_RESULTS, &amp;ai-&gt;jobs);</div><div class='del'>-						break;</div><div class='del'>-					} else if (ai-&gt;expires &amp;&amp;</div><div class='del'>-							time_after_eq(jiffies, ai-&gt;expires)) {</div><div class='del'>-						set_bit(JOB_AUTOWEP, &amp;ai-&gt;jobs);</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-					if (!kthread_should_stop() &amp;&amp;</div><div class='del'>-					    !freezing(current)) {</div><div class='del'>-						unsigned long wake_at;</div><div class='del'>-						if (!ai-&gt;expires || !ai-&gt;scan_timeout) {</div><div class='del'>-							wake_at = max(ai-&gt;expires,</div><div class='del'>-								ai-&gt;scan_timeout);</div><div class='del'>-						} else {</div><div class='del'>-							wake_at = min(ai-&gt;expires,</div><div class='del'>-								ai-&gt;scan_timeout);</div><div class='del'>-						}</div><div class='del'>-						schedule_timeout(wake_at - jiffies);</div><div class='del'>-						continue;</div><div class='del'>-					}</div><div class='del'>-				} else if (!kthread_should_stop() &amp;&amp;</div><div class='del'>-					   !freezing(current)) {</div><div class='del'>-					schedule();</div><div class='del'>-					continue;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			__set_current_state(TASK_RUNNING);</div><div class='del'>-			remove_wait_queue(&amp;ai-&gt;thr_wait, &amp;wait);</div><div class='del'>-			locked = 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (locked)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (test_bit(JOB_DIE, &amp;ai-&gt;jobs)) {</div><div class='del'>-			up(&amp;ai-&gt;sem);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ai-&gt;power.event || test_bit(FLAG_FLASHING, &amp;ai-&gt;flags)) {</div><div class='del'>-			up(&amp;ai-&gt;sem);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (test_bit(JOB_XMIT, &amp;ai-&gt;jobs))</div><div class='del'>-			airo_end_xmit(dev, true);</div><div class='del'>-		else if (test_bit(JOB_XMIT11, &amp;ai-&gt;jobs))</div><div class='del'>-			airo_end_xmit11(dev, true);</div><div class='del'>-		else if (test_bit(JOB_STATS, &amp;ai-&gt;jobs))</div><div class='del'>-			airo_read_stats(dev);</div><div class='del'>-		else if (test_bit(JOB_PROMISC, &amp;ai-&gt;jobs))</div><div class='del'>-			airo_set_promisc(ai, true);</div><div class='del'>-		else if (test_bit(JOB_MIC, &amp;ai-&gt;jobs))</div><div class='del'>-			micinit(ai);</div><div class='del'>-		else if (test_bit(JOB_EVENT, &amp;ai-&gt;jobs))</div><div class='del'>-			airo_send_event(dev);</div><div class='del'>-		else if (test_bit(JOB_AUTOWEP, &amp;ai-&gt;jobs))</div><div class='del'>-			timer_func(dev);</div><div class='del'>-		else if (test_bit(JOB_SCAN_RESULTS, &amp;ai-&gt;jobs))</div><div class='del'>-			airo_process_scan_results(ai);</div><div class='del'>-		else  /* Shouldn't get here, but we make sure to unlock */</div><div class='del'>-			up(&amp;ai-&gt;sem);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int header_len(__le16 ctl)</div><div class='del'>-{</div><div class='del'>-	u16 fc = le16_to_cpu(ctl);</div><div class='del'>-	switch (fc &amp; 0xc) {</div><div class='del'>-	case 4:</div><div class='del'>-		if ((fc &amp; 0xe0) == 0xc0)</div><div class='del'>-			return 10;	/* one-address control packet */</div><div class='del'>-		return 16;	/* two-address control packet */</div><div class='del'>-	case 8:</div><div class='del'>-		if ((fc &amp; 0x300) == 0x300)</div><div class='del'>-			return 30;	/* WDS packet */</div><div class='del'>-	}</div><div class='del'>-	return 24;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void airo_handle_cisco_mic(struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	if (test_bit(FLAG_MIC_CAPABLE, &amp;ai-&gt;flags)) {</div><div class='del'>-		set_bit(JOB_MIC, &amp;ai-&gt;jobs);</div><div class='del'>-		wake_up_interruptible(&amp;ai-&gt;thr_wait);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Airo Status codes */</div><div class='del'>-#define STAT_NOBEACON	0x8000 /* Loss of sync - missed beacons */</div><div class='del'>-#define STAT_MAXRETRIES	0x8001 /* Loss of sync - max retries */</div><div class='del'>-#define STAT_MAXARL	0x8002 /* Loss of sync - average retry level exceeded*/</div><div class='del'>-#define STAT_FORCELOSS	0x8003 /* Loss of sync - host request */</div><div class='del'>-#define STAT_TSFSYNC	0x8004 /* Loss of sync - TSF synchronization */</div><div class='del'>-#define STAT_DEAUTH	0x8100 /* low byte is 802.11 reason code */</div><div class='del'>-#define STAT_DISASSOC	0x8200 /* low byte is 802.11 reason code */</div><div class='del'>-#define STAT_ASSOC_FAIL	0x8400 /* low byte is 802.11 reason code */</div><div class='del'>-#define STAT_AUTH_FAIL	0x0300 /* low byte is 802.11 reason code */</div><div class='del'>-#define STAT_ASSOC	0x0400 /* Associated */</div><div class='del'>-#define STAT_REASSOC    0x0600 /* Reassociated?  Only on firmware &gt;= 5.30.17 */</div><div class='del'>-</div><div class='del'>-static void airo_print_status(const char *devname, u16 status)</div><div class='del'>-{</div><div class='del'>-	u8 reason = status &amp; 0xFF;</div><div class='del'>-</div><div class='del'>-	switch (status &amp; 0xFF00) {</div><div class='del'>-	case STAT_NOBEACON:</div><div class='del'>-		switch (status) {</div><div class='del'>-		case STAT_NOBEACON:</div><div class='del'>-			airo_print_dbg(devname, "link lost (missed beacons)");</div><div class='del'>-			break;</div><div class='del'>-		case STAT_MAXRETRIES:</div><div class='del'>-		case STAT_MAXARL:</div><div class='del'>-			airo_print_dbg(devname, "link lost (max retries)");</div><div class='del'>-			break;</div><div class='del'>-		case STAT_FORCELOSS:</div><div class='del'>-			airo_print_dbg(devname, "link lost (local choice)");</div><div class='del'>-			break;</div><div class='del'>-		case STAT_TSFSYNC:</div><div class='del'>-			airo_print_dbg(devname, "link lost (TSF sync lost)");</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			airo_print_dbg(devname, "unknown status %x\n", status);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case STAT_DEAUTH:</div><div class='del'>-		airo_print_dbg(devname, "deauthenticated (reason: %d)", reason);</div><div class='del'>-		break;</div><div class='del'>-	case STAT_DISASSOC:</div><div class='del'>-		airo_print_dbg(devname, "disassociated (reason: %d)", reason);</div><div class='del'>-		break;</div><div class='del'>-	case STAT_ASSOC_FAIL:</div><div class='del'>-		airo_print_dbg(devname, "association failed (reason: %d)",</div><div class='del'>-			       reason);</div><div class='del'>-		break;</div><div class='del'>-	case STAT_AUTH_FAIL:</div><div class='del'>-		airo_print_dbg(devname, "authentication failed (reason: %d)",</div><div class='del'>-			       reason);</div><div class='del'>-		break;</div><div class='del'>-	case STAT_ASSOC:</div><div class='del'>-	case STAT_REASSOC:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		airo_print_dbg(devname, "unknown status %x\n", status);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void airo_handle_link(struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	union iwreq_data wrqu;</div><div class='del'>-	int scan_forceloss = 0;</div><div class='del'>-	u16 status;</div><div class='del'>-</div><div class='del'>-	/* Get new status and acknowledge the link change */</div><div class='del'>-	status = le16_to_cpu(IN4500(ai, LINKSTAT));</div><div class='del'>-	OUT4500(ai, EVACK, EV_LINK);</div><div class='del'>-</div><div class='del'>-	if ((status == STAT_FORCELOSS) &amp;&amp; (ai-&gt;scan_timeout &gt; 0))</div><div class='del'>-		scan_forceloss = 1;</div><div class='del'>-</div><div class='del'>-	airo_print_status(ai-&gt;dev-&gt;name, status);</div><div class='del'>-</div><div class='del'>-	if ((status == STAT_ASSOC) || (status == STAT_REASSOC)) {</div><div class='del'>-		if (auto_wep)</div><div class='del'>-			ai-&gt;expires = 0;</div><div class='del'>-		if (ai-&gt;list_bss_task)</div><div class='del'>-			wake_up_process(ai-&gt;list_bss_task);</div><div class='del'>-		set_bit(FLAG_UPDATE_UNI, &amp;ai-&gt;flags);</div><div class='del'>-		set_bit(FLAG_UPDATE_MULTI, &amp;ai-&gt;flags);</div><div class='del'>-</div><div class='del'>-		set_bit(JOB_EVENT, &amp;ai-&gt;jobs);</div><div class='del'>-		wake_up_interruptible(&amp;ai-&gt;thr_wait);</div><div class='del'>-</div><div class='del'>-		netif_carrier_on(ai-&gt;dev);</div><div class='del'>-	} else if (!scan_forceloss) {</div><div class='del'>-		if (auto_wep &amp;&amp; !ai-&gt;expires) {</div><div class='del'>-			ai-&gt;expires = RUN_AT(3*HZ);</div><div class='del'>-			wake_up_interruptible(&amp;ai-&gt;thr_wait);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Send event to user space */</div><div class='del'>-		eth_zero_addr(wrqu.ap_addr.sa_data);</div><div class='del'>-		wrqu.ap_addr.sa_family = ARPHRD_ETHER;</div><div class='del'>-		wireless_send_event(ai-&gt;dev, SIOCGIWAP, &amp;wrqu, NULL);</div><div class='del'>-		netif_carrier_off(ai-&gt;dev);</div><div class='del'>-	} else {</div><div class='del'>-		netif_carrier_off(ai-&gt;dev);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void airo_handle_rx(struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-	__le16 fc, v, *buffer, tmpbuf[4];</div><div class='del'>-	u16 len, hdrlen = 0, gap, fid;</div><div class='del'>-	struct rx_hdr hdr;</div><div class='del'>-	int success = 0;</div><div class='del'>-</div><div class='del'>-	if (test_bit(FLAG_MPI, &amp;ai-&gt;flags)) {</div><div class='del'>-		if (test_bit(FLAG_802_11, &amp;ai-&gt;flags))</div><div class='del'>-			mpi_receive_802_11(ai);</div><div class='del'>-		else</div><div class='del'>-			mpi_receive_802_3(ai);</div><div class='del'>-		OUT4500(ai, EVACK, EV_RX);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fid = IN4500(ai, RXFID);</div><div class='del'>-</div><div class='del'>-	/* Get the packet length */</div><div class='del'>-	if (test_bit(FLAG_802_11, &amp;ai-&gt;flags)) {</div><div class='del'>-		bap_setup (ai, fid, 4, BAP0);</div><div class='del'>-		bap_read (ai, (__le16*)&amp;hdr, sizeof(hdr), BAP0);</div><div class='del'>-		/* Bad CRC. Ignore packet */</div><div class='del'>-		if (le16_to_cpu(hdr.status) &amp; 2)</div><div class='del'>-			hdr.len = 0;</div><div class='del'>-		if (ai-&gt;wifidev == NULL)</div><div class='del'>-			hdr.len = 0;</div><div class='del'>-	} else {</div><div class='del'>-		bap_setup(ai, fid, 0x36, BAP0);</div><div class='del'>-		bap_read(ai, &amp;hdr.len, 2, BAP0);</div><div class='del'>-	}</div><div class='del'>-	len = le16_to_cpu(hdr.len);</div><div class='del'>-</div><div class='del'>-	if (len &gt; AIRO_DEF_MTU) {</div><div class='del'>-		airo_print_err(ai-&gt;dev-&gt;name, "Bad size %d", len);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-	if (len == 0)</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	if (test_bit(FLAG_802_11, &amp;ai-&gt;flags)) {</div><div class='del'>-		bap_read(ai, &amp;fc, sizeof (fc), BAP0);</div><div class='del'>-		hdrlen = header_len(fc);</div><div class='del'>-	} else</div><div class='del'>-		hdrlen = ETH_ALEN * 2;</div><div class='del'>-</div><div class='del'>-	skb = dev_alloc_skb(len + hdrlen + 2 + 2);</div><div class='del'>-	if (!skb) {</div><div class='del'>-		ai-&gt;dev-&gt;stats.rx_dropped++;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_reserve(skb, 2); /* This way the IP header is aligned */</div><div class='del'>-	buffer = skb_put(skb, len + hdrlen);</div><div class='del'>-	if (test_bit(FLAG_802_11, &amp;ai-&gt;flags)) {</div><div class='del'>-		buffer[0] = fc;</div><div class='del'>-		bap_read(ai, buffer + 1, hdrlen - 2, BAP0);</div><div class='del'>-		if (hdrlen == 24)</div><div class='del'>-			bap_read(ai, tmpbuf, 6, BAP0);</div><div class='del'>-</div><div class='del'>-		bap_read(ai, &amp;v, sizeof(v), BAP0);</div><div class='del'>-		gap = le16_to_cpu(v);</div><div class='del'>-		if (gap) {</div><div class='del'>-			if (gap &lt;= 8) {</div><div class='del'>-				bap_read(ai, tmpbuf, gap, BAP0);</div><div class='del'>-			} else {</div><div class='del'>-				airo_print_err(ai-&gt;dev-&gt;name, "gaplen too "</div><div class='del'>-					"big. Problems will follow...");</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		bap_read(ai, buffer + hdrlen/2, len, BAP0);</div><div class='del'>-	} else {</div><div class='del'>-		MICBuffer micbuf;</div><div class='del'>-</div><div class='del'>-		bap_read(ai, buffer, ETH_ALEN * 2, BAP0);</div><div class='del'>-		if (ai-&gt;micstats.enabled) {</div><div class='del'>-			bap_read(ai, (__le16 *) &amp;micbuf, sizeof (micbuf), BAP0);</div><div class='del'>-			if (ntohs(micbuf.typelen) &gt; 0x05DC)</div><div class='del'>-				bap_setup(ai, fid, 0x44, BAP0);</div><div class='del'>-			else {</div><div class='del'>-				if (len &lt;= sizeof (micbuf)) {</div><div class='del'>-					dev_kfree_skb_irq(skb);</div><div class='del'>-					goto done;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				len -= sizeof(micbuf);</div><div class='del'>-				skb_trim(skb, len + hdrlen);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bap_read(ai, buffer + ETH_ALEN, len, BAP0);</div><div class='del'>-		if (decapsulate(ai, &amp;micbuf, (etherHead*) buffer, len))</div><div class='del'>-			dev_kfree_skb_irq (skb);</div><div class='del'>-		else</div><div class='del'>-			success = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef WIRELESS_SPY</div><div class='del'>-	if (success &amp;&amp; (ai-&gt;spy_data.spy_number &gt; 0)) {</div><div class='del'>-		char *sa;</div><div class='del'>-		struct iw_quality wstats;</div><div class='del'>-</div><div class='del'>-		/* Prepare spy data : addr + qual */</div><div class='del'>-		if (!test_bit(FLAG_802_11, &amp;ai-&gt;flags)) {</div><div class='del'>-			sa = (char *) buffer + 6;</div><div class='del'>-			bap_setup(ai, fid, 8, BAP0);</div><div class='del'>-			bap_read(ai, (__le16 *) hdr.rssi, 2, BAP0);</div><div class='del'>-		} else</div><div class='del'>-			sa = (char *) buffer + 10;</div><div class='del'>-		wstats.qual = hdr.rssi[0];</div><div class='del'>-		if (ai-&gt;rssi)</div><div class='del'>-			wstats.level = 0x100 - ai-&gt;rssi[hdr.rssi[1]].rssidBm;</div><div class='del'>-		else</div><div class='del'>-			wstats.level = (hdr.rssi[1] + 321) / 2;</div><div class='del'>-		wstats.noise = ai-&gt;wstats.qual.noise;</div><div class='del'>-		wstats.updated =  IW_QUAL_LEVEL_UPDATED</div><div class='del'>-				| IW_QUAL_QUAL_UPDATED</div><div class='del'>-				| IW_QUAL_DBM;</div><div class='del'>-		/* Update spy records */</div><div class='del'>-		wireless_spy_update(ai-&gt;dev, sa, &amp;wstats);</div><div class='del'>-	}</div><div class='del'>-#endif /* WIRELESS_SPY */</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	OUT4500(ai, EVACK, EV_RX);</div><div class='del'>-</div><div class='del'>-	if (success) {</div><div class='del'>-		if (test_bit(FLAG_802_11, &amp;ai-&gt;flags)) {</div><div class='del'>-			skb_reset_mac_header(skb);</div><div class='del'>-			skb-&gt;pkt_type = PACKET_OTHERHOST;</div><div class='del'>-			skb-&gt;dev = ai-&gt;wifidev;</div><div class='del'>-			skb-&gt;protocol = htons(ETH_P_802_2);</div><div class='del'>-		} else</div><div class='del'>-			skb-&gt;protocol = eth_type_trans(skb, ai-&gt;dev);</div><div class='del'>-		skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='del'>-</div><div class='del'>-		netif_rx(skb);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void airo_handle_tx(struct airo_info *ai, u16 status)</div><div class='del'>-{</div><div class='del'>-	int i, index = -1;</div><div class='del'>-	u16 fid;</div><div class='del'>-</div><div class='del'>-	if (test_bit(FLAG_MPI, &amp;ai-&gt;flags)) {</div><div class='del'>-		unsigned long flags;</div><div class='del'>-</div><div class='del'>-		if (status &amp; EV_TXEXC)</div><div class='del'>-			get_tx_error(ai, -1);</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;ai-&gt;aux_lock, flags);</div><div class='del'>-		if (!skb_queue_empty(&amp;ai-&gt;txq)) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;ai-&gt;aux_lock, flags);</div><div class='del'>-			mpi_send_packet(ai-&gt;dev);</div><div class='del'>-		} else {</div><div class='del'>-			clear_bit(FLAG_PENDING_XMIT, &amp;ai-&gt;flags);</div><div class='del'>-			spin_unlock_irqrestore(&amp;ai-&gt;aux_lock, flags);</div><div class='del'>-			netif_wake_queue(ai-&gt;dev);</div><div class='del'>-		}</div><div class='del'>-		OUT4500(ai, EVACK, status &amp; (EV_TX | EV_TXCPY | EV_TXEXC));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fid = IN4500(ai, TXCOMPLFID);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MAX_FIDS; i++) {</div><div class='del'>-		if ((ai-&gt;fids[i] &amp; 0xffff) == fid)</div><div class='del'>-			index = i;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (index != -1) {</div><div class='del'>-		if (status &amp; EV_TXEXC)</div><div class='del'>-			get_tx_error(ai, index);</div><div class='del'>-</div><div class='del'>-		OUT4500(ai, EVACK, status &amp; (EV_TX | EV_TXEXC));</div><div class='del'>-</div><div class='del'>-		/* Set up to be used again */</div><div class='del'>-		ai-&gt;fids[index] &amp;= 0xffff;</div><div class='del'>-		if (index &lt; MAX_FIDS / 2) {</div><div class='del'>-			if (!test_bit(FLAG_PENDING_XMIT, &amp;ai-&gt;flags))</div><div class='del'>-				netif_wake_queue(ai-&gt;dev);</div><div class='del'>-		} else {</div><div class='del'>-			if (!test_bit(FLAG_PENDING_XMIT11, &amp;ai-&gt;flags))</div><div class='del'>-				netif_wake_queue(ai-&gt;wifidev);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		OUT4500(ai, EVACK, status &amp; (EV_TX | EV_TXCPY | EV_TXEXC));</div><div class='del'>-		airo_print_err(ai-&gt;dev-&gt;name, "Unallocated FID was used to xmit");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t airo_interrupt(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = dev_id;</div><div class='del'>-	u16 status, savedInterrupts = 0;</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-	int handled = 0;</div><div class='del'>-</div><div class='del'>-	if (!netif_device_present(dev))</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-		status = IN4500(ai, EVSTAT);</div><div class='del'>-		if (!(status &amp; STATUS_INTS) || (status == 0xffff))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		handled = 1;</div><div class='del'>-</div><div class='del'>-		if (status &amp; EV_AWAKE) {</div><div class='del'>-			OUT4500(ai, EVACK, EV_AWAKE);</div><div class='del'>-			OUT4500(ai, EVACK, EV_AWAKE);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!savedInterrupts) {</div><div class='del'>-			savedInterrupts = IN4500(ai, EVINTEN);</div><div class='del'>-			OUT4500(ai, EVINTEN, 0);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (status &amp; EV_MIC) {</div><div class='del'>-			OUT4500(ai, EVACK, EV_MIC);</div><div class='del'>-			airo_handle_cisco_mic(ai);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (status &amp; EV_LINK) {</div><div class='del'>-			/* Link status changed */</div><div class='del'>-			airo_handle_link(ai);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Check to see if there is something to receive */</div><div class='del'>-		if (status &amp; EV_RX)</div><div class='del'>-			airo_handle_rx(ai);</div><div class='del'>-</div><div class='del'>-		/* Check to see if a packet has been transmitted */</div><div class='del'>-		if (status &amp; (EV_TX | EV_TXCPY | EV_TXEXC))</div><div class='del'>-			airo_handle_tx(ai, status);</div><div class='del'>-</div><div class='del'>-		if (status &amp; ~STATUS_INTS &amp; ~IGNORE_INTS) {</div><div class='del'>-			airo_print_warn(ai-&gt;dev-&gt;name, "Got weird status %x",</div><div class='del'>-				status &amp; ~STATUS_INTS &amp; ~IGNORE_INTS);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (savedInterrupts)</div><div class='del'>-		OUT4500(ai, EVINTEN, savedInterrupts);</div><div class='del'>-</div><div class='del'>-	return IRQ_RETVAL(handled);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Routines to talk to the card</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  This was originally written for the 4500, hence the name</div><div class='del'>- *  NOTE:  If use with 8bit mode and SMP bad things will happen!</div><div class='del'>- *         Why would some one do 8 bit IO in an SMP machine?!?</div><div class='del'>- */</div><div class='del'>-static void OUT4500(struct airo_info *ai, u16 reg, u16 val)</div><div class='del'>-{</div><div class='del'>-	if (test_bit(FLAG_MPI,&amp;ai-&gt;flags))</div><div class='del'>-		reg &lt;&lt;= 1;</div><div class='del'>-	if (!do8bitIO)</div><div class='del'>-		outw(val, ai-&gt;dev-&gt;base_addr + reg);</div><div class='del'>-	else {</div><div class='del'>-		outb(val &amp; 0xff, ai-&gt;dev-&gt;base_addr + reg);</div><div class='del'>-		outb(val &gt;&gt; 8, ai-&gt;dev-&gt;base_addr + reg + 1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u16 IN4500(struct airo_info *ai, u16 reg)</div><div class='del'>-{</div><div class='del'>-	unsigned short rc;</div><div class='del'>-</div><div class='del'>-	if (test_bit(FLAG_MPI,&amp;ai-&gt;flags))</div><div class='del'>-		reg &lt;&lt;= 1;</div><div class='del'>-	if (!do8bitIO)</div><div class='del'>-		rc = inw(ai-&gt;dev-&gt;base_addr + reg);</div><div class='del'>-	else {</div><div class='del'>-		rc = inb(ai-&gt;dev-&gt;base_addr + reg);</div><div class='del'>-		rc += ((int)inb(ai-&gt;dev-&gt;base_addr + reg + 1)) &lt;&lt; 8;</div><div class='del'>-	}</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int enable_MAC(struct airo_info *ai, int lock)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-	Cmd cmd;</div><div class='del'>-	Resp rsp;</div><div class='del'>-</div><div class='del'>-	/* FLAG_RADIO_OFF : Radio disabled via /proc or Wireless Extensions</div><div class='del'>-	 * FLAG_RADIO_DOWN : Radio disabled via "ifconfig ethX down"</div><div class='del'>-	 * Note : we could try to use !netif_running(dev) in enable_MAC()</div><div class='del'>-	 * instead of this flag, but I don't trust it *within* the</div><div class='del'>-	 * open/close functions, and testing both flags together is</div><div class='del'>-	 * "cheaper" - Jean II */</div><div class='del'>-	if (ai-&gt;flags &amp; FLAG_RADIO_MASK) return SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (lock &amp;&amp; down_interruptible(&amp;ai-&gt;sem))</div><div class='del'>-		return -ERESTARTSYS;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(FLAG_ENABLED, &amp;ai-&gt;flags)) {</div><div class='del'>-		memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-		cmd.cmd = MAC_ENABLE;</div><div class='del'>-		rc = issuecommand(ai, &amp;cmd, &amp;rsp, true);</div><div class='del'>-		if (rc == SUCCESS)</div><div class='del'>-			set_bit(FLAG_ENABLED, &amp;ai-&gt;flags);</div><div class='del'>-	} else</div><div class='del'>-		rc = SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (lock)</div><div class='del'>-	    up(&amp;ai-&gt;sem);</div><div class='del'>-</div><div class='del'>-	if (rc)</div><div class='del'>-		airo_print_err(ai-&gt;dev-&gt;name, "Cannot enable MAC");</div><div class='del'>-	else if ((rsp.status &amp; 0xFF00) != 0) {</div><div class='del'>-		airo_print_err(ai-&gt;dev-&gt;name, "Bad MAC enable reason=%x, "</div><div class='del'>-			"rid=%x, offset=%d", rsp.rsp0, rsp.rsp1, rsp.rsp2);</div><div class='del'>-		rc = ERROR;</div><div class='del'>-	}</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void disable_MAC(struct airo_info *ai, int lock)</div><div class='del'>-{</div><div class='del'>-        Cmd cmd;</div><div class='del'>-	Resp rsp;</div><div class='del'>-</div><div class='del'>-	if (lock == 1 &amp;&amp; down_interruptible(&amp;ai-&gt;sem))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (test_bit(FLAG_ENABLED, &amp;ai-&gt;flags)) {</div><div class='del'>-		if (lock != 2) /* lock == 2 means don't disable carrier */</div><div class='del'>-			netif_carrier_off(ai-&gt;dev);</div><div class='del'>-		memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-		cmd.cmd = MAC_DISABLE; // disable in case already enabled</div><div class='del'>-		issuecommand(ai, &amp;cmd, &amp;rsp, true);</div><div class='del'>-		clear_bit(FLAG_ENABLED, &amp;ai-&gt;flags);</div><div class='del'>-	}</div><div class='del'>-	if (lock == 1)</div><div class='del'>-		up(&amp;ai-&gt;sem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void enable_interrupts(struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	/* Enable the interrupts */</div><div class='del'>-	OUT4500(ai, EVINTEN, STATUS_INTS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void disable_interrupts(struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	OUT4500(ai, EVINTEN, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mpi_receive_802_3(struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	RxFid rxd;</div><div class='del'>-	int len = 0;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	char *buffer;</div><div class='del'>-	int off = 0;</div><div class='del'>-	MICBuffer micbuf;</div><div class='del'>-</div><div class='del'>-	memcpy_fromio(&amp;rxd, ai-&gt;rxfids[0].card_ram_off, sizeof(rxd));</div><div class='del'>-	/* Make sure we got something */</div><div class='del'>-	if (rxd.rdy &amp;&amp; rxd.valid == 0) {</div><div class='del'>-		len = rxd.len + 12;</div><div class='del'>-		if (len &lt; 12 || len &gt; 2048)</div><div class='del'>-			goto badrx;</div><div class='del'>-</div><div class='del'>-		skb = dev_alloc_skb(len);</div><div class='del'>-		if (!skb) {</div><div class='del'>-			ai-&gt;dev-&gt;stats.rx_dropped++;</div><div class='del'>-			goto badrx;</div><div class='del'>-		}</div><div class='del'>-		buffer = skb_put(skb, len);</div><div class='del'>-		memcpy(buffer, ai-&gt;rxfids[0].virtual_host_addr, ETH_ALEN * 2);</div><div class='del'>-		if (ai-&gt;micstats.enabled) {</div><div class='del'>-			memcpy(&amp;micbuf,</div><div class='del'>-				ai-&gt;rxfids[0].virtual_host_addr + ETH_ALEN * 2,</div><div class='del'>-				sizeof(micbuf));</div><div class='del'>-			if (ntohs(micbuf.typelen) &lt;= 0x05DC) {</div><div class='del'>-				if (len &lt;= sizeof(micbuf) + ETH_ALEN * 2)</div><div class='del'>-					goto badmic;</div><div class='del'>-</div><div class='del'>-				off = sizeof(micbuf);</div><div class='del'>-				skb_trim (skb, len - off);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		memcpy(buffer + ETH_ALEN * 2,</div><div class='del'>-			ai-&gt;rxfids[0].virtual_host_addr + ETH_ALEN * 2 + off,</div><div class='del'>-			len - ETH_ALEN * 2 - off);</div><div class='del'>-		if (decapsulate (ai, &amp;micbuf, (etherHead*)buffer, len - off - ETH_ALEN * 2)) {</div><div class='del'>-badmic:</div><div class='del'>-			dev_kfree_skb_irq (skb);</div><div class='del'>-			goto badrx;</div><div class='del'>-		}</div><div class='del'>-#ifdef WIRELESS_SPY</div><div class='del'>-		if (ai-&gt;spy_data.spy_number &gt; 0) {</div><div class='del'>-			char *sa;</div><div class='del'>-			struct iw_quality wstats;</div><div class='del'>-			/* Prepare spy data : addr + qual */</div><div class='del'>-			sa = buffer + ETH_ALEN;</div><div class='del'>-			wstats.qual = 0; /* XXX Where do I get that info from ??? */</div><div class='del'>-			wstats.level = 0;</div><div class='del'>-			wstats.updated = 0;</div><div class='del'>-			/* Update spy records */</div><div class='del'>-			wireless_spy_update(ai-&gt;dev, sa, &amp;wstats);</div><div class='del'>-		}</div><div class='del'>-#endif /* WIRELESS_SPY */</div><div class='del'>-</div><div class='del'>-		skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='del'>-		skb-&gt;protocol = eth_type_trans(skb, ai-&gt;dev);</div><div class='del'>-		netif_rx(skb);</div><div class='del'>-	}</div><div class='del'>-badrx:</div><div class='del'>-	if (rxd.valid == 0) {</div><div class='del'>-		rxd.valid = 1;</div><div class='del'>-		rxd.rdy = 0;</div><div class='del'>-		rxd.len = PKTSIZE;</div><div class='del'>-		memcpy_toio(ai-&gt;rxfids[0].card_ram_off, &amp;rxd, sizeof(rxd));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mpi_receive_802_11(struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	RxFid rxd;</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-	u16 len, hdrlen = 0;</div><div class='del'>-	__le16 fc;</div><div class='del'>-	struct rx_hdr hdr;</div><div class='del'>-	u16 gap;</div><div class='del'>-	u16 *buffer;</div><div class='del'>-	char *ptr = ai-&gt;rxfids[0].virtual_host_addr + 4;</div><div class='del'>-</div><div class='del'>-	memcpy_fromio(&amp;rxd, ai-&gt;rxfids[0].card_ram_off, sizeof(rxd));</div><div class='del'>-	memcpy ((char *)&amp;hdr, ptr, sizeof(hdr));</div><div class='del'>-	ptr += sizeof(hdr);</div><div class='del'>-	/* Bad CRC. Ignore packet */</div><div class='del'>-	if (le16_to_cpu(hdr.status) &amp; 2)</div><div class='del'>-		hdr.len = 0;</div><div class='del'>-	if (ai-&gt;wifidev == NULL)</div><div class='del'>-		hdr.len = 0;</div><div class='del'>-	len = le16_to_cpu(hdr.len);</div><div class='del'>-	if (len &gt; AIRO_DEF_MTU) {</div><div class='del'>-		airo_print_err(ai-&gt;dev-&gt;name, "Bad size %d", len);</div><div class='del'>-		goto badrx;</div><div class='del'>-	}</div><div class='del'>-	if (len == 0)</div><div class='del'>-		goto badrx;</div><div class='del'>-</div><div class='del'>-	fc = get_unaligned((__le16 *)ptr);</div><div class='del'>-	hdrlen = header_len(fc);</div><div class='del'>-</div><div class='del'>-	skb = dev_alloc_skb(len + hdrlen + 2);</div><div class='del'>-	if (!skb) {</div><div class='del'>-		ai-&gt;dev-&gt;stats.rx_dropped++;</div><div class='del'>-		goto badrx;</div><div class='del'>-	}</div><div class='del'>-	buffer = skb_put(skb, len + hdrlen);</div><div class='del'>-	memcpy ((char *)buffer, ptr, hdrlen);</div><div class='del'>-	ptr += hdrlen;</div><div class='del'>-	if (hdrlen == 24)</div><div class='del'>-		ptr += 6;</div><div class='del'>-	gap = get_unaligned_le16(ptr);</div><div class='del'>-	ptr += sizeof(__le16);</div><div class='del'>-	if (gap) {</div><div class='del'>-		if (gap &lt;= 8)</div><div class='del'>-			ptr += gap;</div><div class='del'>-		else</div><div class='del'>-			airo_print_err(ai-&gt;dev-&gt;name,</div><div class='del'>-			    "gaplen too big. Problems will follow...");</div><div class='del'>-	}</div><div class='del'>-	memcpy ((char *)buffer + hdrlen, ptr, len);</div><div class='del'>-	ptr += len;</div><div class='del'>-#ifdef IW_WIRELESS_SPY	  /* defined in iw_handler.h */</div><div class='del'>-	if (ai-&gt;spy_data.spy_number &gt; 0) {</div><div class='del'>-		char *sa;</div><div class='del'>-		struct iw_quality wstats;</div><div class='del'>-		/* Prepare spy data : addr + qual */</div><div class='del'>-		sa = (char*)buffer + 10;</div><div class='del'>-		wstats.qual = hdr.rssi[0];</div><div class='del'>-		if (ai-&gt;rssi)</div><div class='del'>-			wstats.level = 0x100 - ai-&gt;rssi[hdr.rssi[1]].rssidBm;</div><div class='del'>-		else</div><div class='del'>-			wstats.level = (hdr.rssi[1] + 321) / 2;</div><div class='del'>-		wstats.noise = ai-&gt;wstats.qual.noise;</div><div class='del'>-		wstats.updated = IW_QUAL_QUAL_UPDATED</div><div class='del'>-			| IW_QUAL_LEVEL_UPDATED</div><div class='del'>-			| IW_QUAL_DBM;</div><div class='del'>-		/* Update spy records */</div><div class='del'>-		wireless_spy_update(ai-&gt;dev, sa, &amp;wstats);</div><div class='del'>-	}</div><div class='del'>-#endif /* IW_WIRELESS_SPY */</div><div class='del'>-	skb_reset_mac_header(skb);</div><div class='del'>-	skb-&gt;pkt_type = PACKET_OTHERHOST;</div><div class='del'>-	skb-&gt;dev = ai-&gt;wifidev;</div><div class='del'>-	skb-&gt;protocol = htons(ETH_P_802_2);</div><div class='del'>-	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='del'>-	netif_rx(skb);</div><div class='del'>-</div><div class='del'>-badrx:</div><div class='del'>-	if (rxd.valid == 0) {</div><div class='del'>-		rxd.valid = 1;</div><div class='del'>-		rxd.rdy = 0;</div><div class='del'>-		rxd.len = PKTSIZE;</div><div class='del'>-		memcpy_toio(ai-&gt;rxfids[0].card_ram_off, &amp;rxd, sizeof(rxd));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_auth_type(struct airo_info *local, int auth_type)</div><div class='del'>-{</div><div class='del'>-	local-&gt;config.authType = auth_type;</div><div class='del'>-	/* Cache the last auth type used (of AUTH_OPEN and AUTH_ENCRYPT).</div><div class='del'>-	 * Used by airo_set_auth()</div><div class='del'>-	 */</div><div class='del'>-	if (auth_type == AUTH_OPEN || auth_type == AUTH_ENCRYPT)</div><div class='del'>-		local-&gt;last_auth = auth_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int noinline_for_stack airo_readconfig(struct airo_info *ai, u8 *mac, int lock)</div><div class='del'>-{</div><div class='del'>-	int i, status;</div><div class='del'>-	/* large variables, so don't inline this function,</div><div class='del'>-	 * maybe change to kmalloc</div><div class='del'>-	 */</div><div class='del'>-	tdsRssiRid rssi_rid;</div><div class='del'>-	CapabilityRid cap_rid;</div><div class='del'>-</div><div class='del'>-	kfree(ai-&gt;SSID);</div><div class='del'>-	ai-&gt;SSID = NULL;</div><div class='del'>-	// general configuration (read/modify/write)</div><div class='del'>-	status = readConfigRid(ai, lock);</div><div class='del'>-	if (status != SUCCESS) return ERROR;</div><div class='del'>-</div><div class='del'>-	status = readCapabilityRid(ai, &amp;cap_rid, lock);</div><div class='del'>-	if (status != SUCCESS) return ERROR;</div><div class='del'>-</div><div class='del'>-	status = PC4500_readrid(ai, RID_RSSI, &amp;rssi_rid, sizeof(rssi_rid), lock);</div><div class='del'>-	if (status == SUCCESS) {</div><div class='del'>-		if (ai-&gt;rssi || (ai-&gt;rssi = kmalloc(512, GFP_KERNEL)) != NULL)</div><div class='del'>-			memcpy(ai-&gt;rssi, (u8*)&amp;rssi_rid + 2, 512); /* Skip RID length member */</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		kfree(ai-&gt;rssi);</div><div class='del'>-		ai-&gt;rssi = NULL;</div><div class='del'>-		if (cap_rid.softCap &amp; cpu_to_le16(8))</div><div class='del'>-			ai-&gt;config.rmode |= RXMODE_NORMALIZED_RSSI;</div><div class='del'>-		else</div><div class='del'>-			airo_print_warn(ai-&gt;dev-&gt;name, "unknown received signal "</div><div class='del'>-					"level scale");</div><div class='del'>-	}</div><div class='del'>-	ai-&gt;config.opmode = adhoc ? MODE_STA_IBSS : MODE_STA_ESS;</div><div class='del'>-	set_auth_type(ai, AUTH_OPEN);</div><div class='del'>-	ai-&gt;config.modulation = MOD_CCK;</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(cap_rid.len) &gt;= sizeof(cap_rid) &amp;&amp;</div><div class='del'>-	    (cap_rid.extSoftCap &amp; cpu_to_le16(1)) &amp;&amp;</div><div class='del'>-	    micsetup(ai) == SUCCESS) {</div><div class='del'>-		ai-&gt;config.opmode |= MODE_MIC;</div><div class='del'>-		set_bit(FLAG_MIC_CAPABLE, &amp;ai-&gt;flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Save off the MAC */</div><div class='del'>-	for (i = 0; i &lt; ETH_ALEN; i++) {</div><div class='del'>-		mac[i] = ai-&gt;config.macAddr[i];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check to see if there are any insmod configured</div><div class='del'>-	   rates to add */</div><div class='del'>-	if (rates[0]) {</div><div class='del'>-		memset(ai-&gt;config.rates, 0, sizeof(ai-&gt;config.rates));</div><div class='del'>-		for (i = 0; i &lt; 8 &amp;&amp; rates[i]; i++) {</div><div class='del'>-			ai-&gt;config.rates[i] = rates[i];</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	set_bit (FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-</div><div class='del'>-	return SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static u16 setup_card(struct airo_info *ai, u8 *mac, int lock)</div><div class='del'>-{</div><div class='del'>-	Cmd cmd;</div><div class='del'>-	Resp rsp;</div><div class='del'>-	int status;</div><div class='del'>-	SsidRid mySsid;</div><div class='del'>-	__le16 lastindex;</div><div class='del'>-	WepKeyRid wkr;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	memset(&amp;mySsid, 0, sizeof(mySsid));</div><div class='del'>-	kfree (ai-&gt;flash);</div><div class='del'>-	ai-&gt;flash = NULL;</div><div class='del'>-</div><div class='del'>-	/* The NOP is the first step in getting the card going */</div><div class='del'>-	cmd.cmd = NOP;</div><div class='del'>-	cmd.parm0 = cmd.parm1 = cmd.parm2 = 0;</div><div class='del'>-	if (lock &amp;&amp; down_interruptible(&amp;ai-&gt;sem))</div><div class='del'>-		return ERROR;</div><div class='del'>-	if (issuecommand(ai, &amp;cmd, &amp;rsp, true) != SUCCESS) {</div><div class='del'>-		if (lock)</div><div class='del'>-			up(&amp;ai-&gt;sem);</div><div class='del'>-		return ERROR;</div><div class='del'>-	}</div><div class='del'>-	disable_MAC(ai, 0);</div><div class='del'>-</div><div class='del'>-	// Let's figure out if we need to use the AUX port</div><div class='del'>-	if (!test_bit(FLAG_MPI,&amp;ai-&gt;flags)) {</div><div class='del'>-		cmd.cmd = CMD_ENABLEAUX;</div><div class='del'>-		if (issuecommand(ai, &amp;cmd, &amp;rsp, true) != SUCCESS) {</div><div class='del'>-			if (lock)</div><div class='del'>-				up(&amp;ai-&gt;sem);</div><div class='del'>-			airo_print_err(ai-&gt;dev-&gt;name, "Error checking for AUX port");</div><div class='del'>-			return ERROR;</div><div class='del'>-		}</div><div class='del'>-		if (!aux_bap || rsp.status &amp; 0xff00) {</div><div class='del'>-			ai-&gt;bap_read = fast_bap_read;</div><div class='del'>-			airo_print_dbg(ai-&gt;dev-&gt;name, "Doing fast bap_reads");</div><div class='del'>-		} else {</div><div class='del'>-			ai-&gt;bap_read = aux_bap_read;</div><div class='del'>-			airo_print_dbg(ai-&gt;dev-&gt;name, "Doing AUX bap_reads");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (lock)</div><div class='del'>-		up(&amp;ai-&gt;sem);</div><div class='del'>-	if (ai-&gt;config.len == 0) {</div><div class='del'>-		status = airo_readconfig(ai, mac, lock);</div><div class='del'>-		if (status != SUCCESS)</div><div class='del'>-			return ERROR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Setup the SSIDs if present */</div><div class='del'>-	if (ssids[0]) {</div><div class='del'>-		int i;</div><div class='del'>-		for (i = 0; i &lt; 3 &amp;&amp; ssids[i]; i++) {</div><div class='del'>-			size_t len = strlen(ssids[i]);</div><div class='del'>-			if (len &gt; 32)</div><div class='del'>-				len = 32;</div><div class='del'>-			mySsid.ssids[i].len = cpu_to_le16(len);</div><div class='del'>-			memcpy(mySsid.ssids[i].ssid, ssids[i], len);</div><div class='del'>-		}</div><div class='del'>-		mySsid.len = cpu_to_le16(sizeof(mySsid));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = writeConfigRid(ai, lock);</div><div class='del'>-	if (status != SUCCESS) return ERROR;</div><div class='del'>-</div><div class='del'>-	/* Set up the SSID list */</div><div class='del'>-	if (ssids[0]) {</div><div class='del'>-		status = writeSsidRid(ai, &amp;mySsid, lock);</div><div class='del'>-		if (status != SUCCESS) return ERROR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = enable_MAC(ai, lock);</div><div class='del'>-	if (status != SUCCESS)</div><div class='del'>-		return ERROR;</div><div class='del'>-</div><div class='del'>-	/* Grab the initial wep key, we gotta save it for auto_wep */</div><div class='del'>-	rc = readWepKeyRid(ai, &amp;wkr, 1, lock);</div><div class='del'>-	if (rc == SUCCESS) do {</div><div class='del'>-		lastindex = wkr.kindex;</div><div class='del'>-		if (wkr.kindex == cpu_to_le16(0xffff)) {</div><div class='del'>-			ai-&gt;defindex = wkr.mac[0];</div><div class='del'>-		}</div><div class='del'>-		rc = readWepKeyRid(ai, &amp;wkr, 0, lock);</div><div class='del'>-	} while (lastindex != wkr.kindex);</div><div class='del'>-</div><div class='del'>-	try_auto_wep(ai);</div><div class='del'>-</div><div class='del'>-	return SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u16 issuecommand(struct airo_info *ai, Cmd *pCmd, Resp *pRsp,</div><div class='del'>-			bool may_sleep)</div><div class='del'>-{</div><div class='del'>-        // Im really paranoid about letting it run forever!</div><div class='del'>-	int max_tries = 600000;</div><div class='del'>-</div><div class='del'>-	if (IN4500(ai, EVSTAT) &amp; EV_CMD)</div><div class='del'>-		OUT4500(ai, EVACK, EV_CMD);</div><div class='del'>-</div><div class='del'>-	OUT4500(ai, PARAM0, pCmd-&gt;parm0);</div><div class='del'>-	OUT4500(ai, PARAM1, pCmd-&gt;parm1);</div><div class='del'>-	OUT4500(ai, PARAM2, pCmd-&gt;parm2);</div><div class='del'>-	OUT4500(ai, COMMAND, pCmd-&gt;cmd);</div><div class='del'>-</div><div class='del'>-	while (max_tries-- &amp;&amp; (IN4500(ai, EVSTAT) &amp; EV_CMD) == 0) {</div><div class='del'>-		if ((IN4500(ai, COMMAND)) == pCmd-&gt;cmd)</div><div class='del'>-			// PC4500 didn't notice command, try again</div><div class='del'>-			OUT4500(ai, COMMAND, pCmd-&gt;cmd);</div><div class='del'>-		if (may_sleep &amp;&amp; (max_tries &amp; 255) == 0)</div><div class='del'>-			cond_resched();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (max_tries == -1) {</div><div class='del'>-		airo_print_err(ai-&gt;dev-&gt;name,</div><div class='del'>-			"Max tries exceeded when issuing command");</div><div class='del'>-		if (IN4500(ai, COMMAND) &amp; COMMAND_BUSY)</div><div class='del'>-			OUT4500(ai, EVACK, EV_CLEARCOMMANDBUSY);</div><div class='del'>-		return ERROR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	// command completed</div><div class='del'>-	pRsp-&gt;status = IN4500(ai, STATUS);</div><div class='del'>-	pRsp-&gt;rsp0 = IN4500(ai, RESP0);</div><div class='del'>-	pRsp-&gt;rsp1 = IN4500(ai, RESP1);</div><div class='del'>-	pRsp-&gt;rsp2 = IN4500(ai, RESP2);</div><div class='del'>-	if ((pRsp-&gt;status &amp; 0xff00)!=0 &amp;&amp; pCmd-&gt;cmd != CMD_SOFTRESET)</div><div class='del'>-		airo_print_err(ai-&gt;dev-&gt;name,</div><div class='del'>-			"cmd:%x status:%x rsp0:%x rsp1:%x rsp2:%x",</div><div class='del'>-			pCmd-&gt;cmd, pRsp-&gt;status, pRsp-&gt;rsp0, pRsp-&gt;rsp1,</div><div class='del'>-			pRsp-&gt;rsp2);</div><div class='del'>-</div><div class='del'>-	// clear stuck command busy if necessary</div><div class='del'>-	if (IN4500(ai, COMMAND) &amp; COMMAND_BUSY) {</div><div class='del'>-		OUT4500(ai, EVACK, EV_CLEARCOMMANDBUSY);</div><div class='del'>-	}</div><div class='del'>-	// acknowledge processing the status/response</div><div class='del'>-	OUT4500(ai, EVACK, EV_CMD);</div><div class='del'>-</div><div class='del'>-	return SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets up the bap to start exchange data.  whichbap should</div><div class='del'>- * be one of the BAP0 or BAP1 defines.  Locks should be held before</div><div class='del'>- * calling! */</div><div class='del'>-static int bap_setup(struct airo_info *ai, u16 rid, u16 offset, int whichbap)</div><div class='del'>-{</div><div class='del'>-	int timeout = 50;</div><div class='del'>-	int max_tries = 3;</div><div class='del'>-</div><div class='del'>-	OUT4500(ai, SELECT0+whichbap, rid);</div><div class='del'>-	OUT4500(ai, OFFSET0+whichbap, offset);</div><div class='del'>-	while (1) {</div><div class='del'>-		int status = IN4500(ai, OFFSET0+whichbap);</div><div class='del'>-		if (status &amp; BAP_BUSY) {</div><div class='del'>-                        /* This isn't really a timeout, but its kinda</div><div class='del'>-			   close */</div><div class='del'>-			if (timeout--) {</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-		} else if (status &amp; BAP_ERR) {</div><div class='del'>-			/* invalid rid or offset */</div><div class='del'>-			airo_print_err(ai-&gt;dev-&gt;name, "BAP error %x %d",</div><div class='del'>-				status, whichbap);</div><div class='del'>-			return ERROR;</div><div class='del'>-		} else if (status &amp; BAP_DONE) { // success</div><div class='del'>-			return SUCCESS;</div><div class='del'>-		}</div><div class='del'>-		if (!(max_tries--)) {</div><div class='del'>-			airo_print_err(ai-&gt;dev-&gt;name,</div><div class='del'>-				"BAP setup error too many retries\n");</div><div class='del'>-			return ERROR;</div><div class='del'>-		}</div><div class='del'>-		// -- PC4500 missed it, try again</div><div class='del'>-		OUT4500(ai, SELECT0+whichbap, rid);</div><div class='del'>-		OUT4500(ai, OFFSET0+whichbap, offset);</div><div class='del'>-		timeout = 50;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* should only be called by aux_bap_read.  This aux function and the</div><div class='del'>-   following use concepts not documented in the developers guide.  I</div><div class='del'>-   got them from a patch given to my by Aironet */</div><div class='del'>-static u16 aux_setup(struct airo_info *ai, u16 page,</div><div class='del'>-		     u16 offset, u16 *len)</div><div class='del'>-{</div><div class='del'>-	u16 next;</div><div class='del'>-</div><div class='del'>-	OUT4500(ai, AUXPAGE, page);</div><div class='del'>-	OUT4500(ai, AUXOFF, 0);</div><div class='del'>-	next = IN4500(ai, AUXDATA);</div><div class='del'>-	*len = IN4500(ai, AUXDATA)&amp;0xff;</div><div class='del'>-	if (offset != 4) OUT4500(ai, AUXOFF, offset);</div><div class='del'>-	return next;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* requires call to bap_setup() first */</div><div class='del'>-static int aux_bap_read(struct airo_info *ai, __le16 *pu16Dst,</div><div class='del'>-			int bytelen, int whichbap)</div><div class='del'>-{</div><div class='del'>-	u16 len;</div><div class='del'>-	u16 page;</div><div class='del'>-	u16 offset;</div><div class='del'>-	u16 next;</div><div class='del'>-	int words;</div><div class='del'>-	int i;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;ai-&gt;aux_lock, flags);</div><div class='del'>-	page = IN4500(ai, SWS0+whichbap);</div><div class='del'>-	offset = IN4500(ai, SWS2+whichbap);</div><div class='del'>-	next = aux_setup(ai, page, offset, &amp;len);</div><div class='del'>-	words = (bytelen+1)&gt;&gt;1;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i&lt;words;) {</div><div class='del'>-		int count;</div><div class='del'>-		count = (len&gt;&gt;1) &lt; (words-i) ? (len&gt;&gt;1) : (words-i);</div><div class='del'>-		if (!do8bitIO)</div><div class='del'>-			insw(ai-&gt;dev-&gt;base_addr+DATA0+whichbap,</div><div class='del'>-			      pu16Dst+i, count);</div><div class='del'>-		else</div><div class='del'>-			insb(ai-&gt;dev-&gt;base_addr+DATA0+whichbap,</div><div class='del'>-			      pu16Dst+i, count &lt;&lt; 1);</div><div class='del'>-		i += count;</div><div class='del'>-		if (i&lt;words) {</div><div class='del'>-			next = aux_setup(ai, next, 4, &amp;len);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;ai-&gt;aux_lock, flags);</div><div class='del'>-	return SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* requires call to bap_setup() first */</div><div class='del'>-static int fast_bap_read(struct airo_info *ai, __le16 *pu16Dst,</div><div class='del'>-			 int bytelen, int whichbap)</div><div class='del'>-{</div><div class='del'>-	bytelen = (bytelen + 1) &amp; (~1); // round up to even value</div><div class='del'>-	if (!do8bitIO)</div><div class='del'>-		insw(ai-&gt;dev-&gt;base_addr+DATA0+whichbap, pu16Dst, bytelen&gt;&gt;1);</div><div class='del'>-	else</div><div class='del'>-		insb(ai-&gt;dev-&gt;base_addr+DATA0+whichbap, pu16Dst, bytelen);</div><div class='del'>-	return SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* requires call to bap_setup() first */</div><div class='del'>-static int bap_write(struct airo_info *ai, const __le16 *pu16Src,</div><div class='del'>-		     int bytelen, int whichbap)</div><div class='del'>-{</div><div class='del'>-	bytelen = (bytelen + 1) &amp; (~1); // round up to even value</div><div class='del'>-	if (!do8bitIO)</div><div class='del'>-		outsw(ai-&gt;dev-&gt;base_addr+DATA0+whichbap,</div><div class='del'>-		       pu16Src, bytelen&gt;&gt;1);</div><div class='del'>-	else</div><div class='del'>-		outsb(ai-&gt;dev-&gt;base_addr+DATA0+whichbap, pu16Src, bytelen);</div><div class='del'>-	return SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int PC4500_accessrid(struct airo_info *ai, u16 rid, u16 accmd)</div><div class='del'>-{</div><div class='del'>-	Cmd cmd; /* for issuing commands */</div><div class='del'>-	Resp rsp; /* response from commands */</div><div class='del'>-	u16 status;</div><div class='del'>-</div><div class='del'>-	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-	cmd.cmd = accmd;</div><div class='del'>-	cmd.parm0 = rid;</div><div class='del'>-	status = issuecommand(ai, &amp;cmd, &amp;rsp, true);</div><div class='del'>-	if (status != 0) return status;</div><div class='del'>-	if ((rsp.status &amp; 0x7F00) != 0) {</div><div class='del'>-		return (accmd &lt;&lt; 8) + (rsp.rsp0 &amp; 0xFF);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*  Note, that we are using BAP1 which is also used by transmit, so</div><div class='del'>- *  we must get a lock. */</div><div class='del'>-static int PC4500_readrid(struct airo_info *ai, u16 rid, void *pBuf, int len, int lock)</div><div class='del'>-{</div><div class='del'>-	u16 status;</div><div class='del'>-        int rc = SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (lock) {</div><div class='del'>-		if (down_interruptible(&amp;ai-&gt;sem))</div><div class='del'>-			return ERROR;</div><div class='del'>-	}</div><div class='del'>-	if (test_bit(FLAG_MPI,&amp;ai-&gt;flags)) {</div><div class='del'>-		Cmd cmd;</div><div class='del'>-		Resp rsp;</div><div class='del'>-</div><div class='del'>-		memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-		memset(&amp;rsp, 0, sizeof(rsp));</div><div class='del'>-		ai-&gt;config_desc.rid_desc.valid = 1;</div><div class='del'>-		ai-&gt;config_desc.rid_desc.len = RIDSIZE;</div><div class='del'>-		ai-&gt;config_desc.rid_desc.rid = 0;</div><div class='del'>-		ai-&gt;config_desc.rid_desc.host_addr = ai-&gt;ridbus;</div><div class='del'>-</div><div class='del'>-		cmd.cmd = CMD_ACCESS;</div><div class='del'>-		cmd.parm0 = rid;</div><div class='del'>-</div><div class='del'>-		memcpy_toio(ai-&gt;config_desc.card_ram_off,</div><div class='del'>-			&amp;ai-&gt;config_desc.rid_desc, sizeof(Rid));</div><div class='del'>-</div><div class='del'>-		rc = issuecommand(ai, &amp;cmd, &amp;rsp, true);</div><div class='del'>-</div><div class='del'>-		if (rsp.status &amp; 0x7f00)</div><div class='del'>-			rc = rsp.rsp0;</div><div class='del'>-		if (!rc)</div><div class='del'>-			memcpy(pBuf, ai-&gt;config_desc.virtual_host_addr, len);</div><div class='del'>-		goto done;</div><div class='del'>-	} else {</div><div class='del'>-		if ((status = PC4500_accessrid(ai, rid, CMD_ACCESS))!=SUCCESS) {</div><div class='del'>-	                rc = status;</div><div class='del'>-	                goto done;</div><div class='del'>-	        }</div><div class='del'>-		if (bap_setup(ai, rid, 0, BAP1) != SUCCESS) {</div><div class='del'>-			rc = ERROR;</div><div class='del'>-	                goto done;</div><div class='del'>-	        }</div><div class='del'>-		// read the rid length field</div><div class='del'>-		bap_read(ai, pBuf, 2, BAP1);</div><div class='del'>-		// length for remaining part of rid</div><div class='del'>-		len = min(len, (int)le16_to_cpu(*(__le16*)pBuf)) - 2;</div><div class='del'>-</div><div class='del'>-		if (len &lt;= 2) {</div><div class='del'>-			airo_print_err(ai-&gt;dev-&gt;name,</div><div class='del'>-				"Rid %x has a length of %d which is too short",</div><div class='del'>-				(int)rid, (int)len);</div><div class='del'>-			rc = ERROR;</div><div class='del'>-	                goto done;</div><div class='del'>-		}</div><div class='del'>-		// read remainder of the rid</div><div class='del'>-		rc = bap_read(ai, ((__le16*)pBuf)+1, len, BAP1);</div><div class='del'>-	}</div><div class='del'>-done:</div><div class='del'>-	if (lock)</div><div class='del'>-		up(&amp;ai-&gt;sem);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*  Note, that we are using BAP1 which is also used by transmit, so</div><div class='del'>- *  make sure this isn't called when a transmit is happening */</div><div class='del'>-static int PC4500_writerid(struct airo_info *ai, u16 rid,</div><div class='del'>-			   const void *pBuf, int len, int lock)</div><div class='del'>-{</div><div class='del'>-	u16 status;</div><div class='del'>-	int rc = SUCCESS;</div><div class='del'>-</div><div class='del'>-	*(__le16*)pBuf = cpu_to_le16((u16)len);</div><div class='del'>-</div><div class='del'>-	if (lock) {</div><div class='del'>-		if (down_interruptible(&amp;ai-&gt;sem))</div><div class='del'>-			return ERROR;</div><div class='del'>-	}</div><div class='del'>-	if (test_bit(FLAG_MPI,&amp;ai-&gt;flags)) {</div><div class='del'>-		Cmd cmd;</div><div class='del'>-		Resp rsp;</div><div class='del'>-</div><div class='del'>-		if (test_bit(FLAG_ENABLED, &amp;ai-&gt;flags) &amp;&amp; (RID_WEP_TEMP != rid))</div><div class='del'>-			airo_print_err(ai-&gt;dev-&gt;name,</div><div class='del'>-				"%s: MAC should be disabled (rid=%04x)",</div><div class='del'>-				__func__, rid);</div><div class='del'>-		memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-		memset(&amp;rsp, 0, sizeof(rsp));</div><div class='del'>-</div><div class='del'>-		ai-&gt;config_desc.rid_desc.valid = 1;</div><div class='del'>-		ai-&gt;config_desc.rid_desc.len = *((u16 *)pBuf);</div><div class='del'>-		ai-&gt;config_desc.rid_desc.rid = 0;</div><div class='del'>-</div><div class='del'>-		cmd.cmd = CMD_WRITERID;</div><div class='del'>-		cmd.parm0 = rid;</div><div class='del'>-</div><div class='del'>-		memcpy_toio(ai-&gt;config_desc.card_ram_off,</div><div class='del'>-			&amp;ai-&gt;config_desc.rid_desc, sizeof(Rid));</div><div class='del'>-</div><div class='del'>-		if (len &lt; 4 || len &gt; 2047) {</div><div class='del'>-			airo_print_err(ai-&gt;dev-&gt;name, "%s: len=%d", __func__, len);</div><div class='del'>-			rc = -1;</div><div class='del'>-		} else {</div><div class='del'>-			memcpy(ai-&gt;config_desc.virtual_host_addr,</div><div class='del'>-				pBuf, len);</div><div class='del'>-</div><div class='del'>-			rc = issuecommand(ai, &amp;cmd, &amp;rsp, true);</div><div class='del'>-			if ((rc &amp; 0xff00) != 0) {</div><div class='del'>-				airo_print_err(ai-&gt;dev-&gt;name, "%s: Write rid Error %d",</div><div class='del'>-						__func__, rc);</div><div class='del'>-				airo_print_err(ai-&gt;dev-&gt;name, "%s: Cmd=%04x",</div><div class='del'>-						__func__, cmd.cmd);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if ((rsp.status &amp; 0x7f00))</div><div class='del'>-				rc = rsp.rsp0;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		// --- first access so that we can write the rid data</div><div class='del'>-		if ((status = PC4500_accessrid(ai, rid, CMD_ACCESS)) != 0) {</div><div class='del'>-	                rc = status;</div><div class='del'>-	                goto done;</div><div class='del'>-	        }</div><div class='del'>-		// --- now write the rid data</div><div class='del'>-		if (bap_setup(ai, rid, 0, BAP1) != SUCCESS) {</div><div class='del'>-	                rc = ERROR;</div><div class='del'>-	                goto done;</div><div class='del'>-	        }</div><div class='del'>-		bap_write(ai, pBuf, len, BAP1);</div><div class='del'>-		// ---now commit the rid data</div><div class='del'>-		rc = PC4500_accessrid(ai, rid, 0x100|CMD_ACCESS);</div><div class='del'>-	}</div><div class='del'>-done:</div><div class='del'>-	if (lock)</div><div class='del'>-		up(&amp;ai-&gt;sem);</div><div class='del'>-        return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Allocates a FID to be used for transmitting packets.  We only use</div><div class='del'>-   one for now. */</div><div class='del'>-static u16 transmit_allocate(struct airo_info *ai, int lenPayload, int raw)</div><div class='del'>-{</div><div class='del'>-	unsigned int loop = 3000;</div><div class='del'>-	Cmd cmd;</div><div class='del'>-	Resp rsp;</div><div class='del'>-	u16 txFid;</div><div class='del'>-	__le16 txControl;</div><div class='del'>-</div><div class='del'>-	cmd.cmd = CMD_ALLOCATETX;</div><div class='del'>-	cmd.parm0 = lenPayload;</div><div class='del'>-	if (down_interruptible(&amp;ai-&gt;sem))</div><div class='del'>-		return ERROR;</div><div class='del'>-	if (issuecommand(ai, &amp;cmd, &amp;rsp, true) != SUCCESS) {</div><div class='del'>-		txFid = ERROR;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-	if ((rsp.status &amp; 0xFF00) != 0) {</div><div class='del'>-		txFid = ERROR;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-	/* wait for the allocate event/indication</div><div class='del'>-	 * It makes me kind of nervous that this can just sit here and spin,</div><div class='del'>-	 * but in practice it only loops like four times. */</div><div class='del'>-	while (((IN4500(ai, EVSTAT) &amp; EV_ALLOC) == 0) &amp;&amp; --loop);</div><div class='del'>-	if (!loop) {</div><div class='del'>-		txFid = ERROR;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	// get the allocated fid and acknowledge</div><div class='del'>-	txFid = IN4500(ai, TXALLOCFID);</div><div class='del'>-	OUT4500(ai, EVACK, EV_ALLOC);</div><div class='del'>-</div><div class='del'>-	/*  The CARD is pretty cool since it converts the ethernet packet</div><div class='del'>-	 *  into 802.11.  Also note that we don't release the FID since we</div><div class='del'>-	 *  will be using the same one over and over again. */</div><div class='del'>-	/*  We only have to setup the control once since we are not</div><div class='del'>-	 *  releasing the fid. */</div><div class='del'>-	if (raw)</div><div class='del'>-		txControl = cpu_to_le16(TXCTL_TXOK | TXCTL_TXEX | TXCTL_802_11</div><div class='del'>-			| TXCTL_ETHERNET | TXCTL_NORELEASE);</div><div class='del'>-	else</div><div class='del'>-		txControl = cpu_to_le16(TXCTL_TXOK | TXCTL_TXEX | TXCTL_802_3</div><div class='del'>-			| TXCTL_ETHERNET | TXCTL_NORELEASE);</div><div class='del'>-	if (bap_setup(ai, txFid, 0x0008, BAP1) != SUCCESS)</div><div class='del'>-		txFid = ERROR;</div><div class='del'>-	else</div><div class='del'>-		bap_write(ai, &amp;txControl, sizeof(txControl), BAP1);</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	up(&amp;ai-&gt;sem);</div><div class='del'>-</div><div class='del'>-	return txFid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* In general BAP1 is dedicated to transmiting packets.  However,</div><div class='del'>-   since we need a BAP when accessing RIDs, we also use BAP1 for that.</div><div class='del'>-   Make sure the BAP1 spinlock is held when this is called. */</div><div class='del'>-static int transmit_802_3_packet(struct airo_info *ai, int len, char *pPacket,</div><div class='del'>-				 bool may_sleep)</div><div class='del'>-{</div><div class='del'>-	__le16 payloadLen;</div><div class='del'>-	Cmd cmd;</div><div class='del'>-	Resp rsp;</div><div class='del'>-	int miclen = 0;</div><div class='del'>-	u16 txFid = len;</div><div class='del'>-	MICBuffer pMic;</div><div class='del'>-</div><div class='del'>-	len &gt;&gt;= 16;</div><div class='del'>-</div><div class='del'>-	if (len &lt;= ETH_ALEN * 2) {</div><div class='del'>-		airo_print_warn(ai-&gt;dev-&gt;name, "Short packet %d", len);</div><div class='del'>-		return ERROR;</div><div class='del'>-	}</div><div class='del'>-	len -= ETH_ALEN * 2;</div><div class='del'>-</div><div class='del'>-	if (test_bit(FLAG_MIC_CAPABLE, &amp;ai-&gt;flags) &amp;&amp; ai-&gt;micstats.enabled &amp;&amp;</div><div class='del'>-	    (ntohs(((__be16 *)pPacket)[6]) != 0x888E)) {</div><div class='del'>-		if (encapsulate(ai, (etherHead *)pPacket,&amp;pMic, len) != SUCCESS)</div><div class='del'>-			return ERROR;</div><div class='del'>-		miclen = sizeof(pMic);</div><div class='del'>-	}</div><div class='del'>-	// packet is destination[6], source[6], payload[len-12]</div><div class='del'>-	// write the payload length and dst/src/payload</div><div class='del'>-	if (bap_setup(ai, txFid, 0x0036, BAP1) != SUCCESS) return ERROR;</div><div class='del'>-	/* The hardware addresses aren't counted as part of the payload, so</div><div class='del'>-	 * we have to subtract the 12 bytes for the addresses off */</div><div class='del'>-	payloadLen = cpu_to_le16(len + miclen);</div><div class='del'>-	bap_write(ai, &amp;payloadLen, sizeof(payloadLen), BAP1);</div><div class='del'>-	bap_write(ai, (__le16*)pPacket, sizeof(etherHead), BAP1);</div><div class='del'>-	if (miclen)</div><div class='del'>-		bap_write(ai, (__le16*)&amp;pMic, miclen, BAP1);</div><div class='del'>-	bap_write(ai, (__le16*)(pPacket + sizeof(etherHead)), len, BAP1);</div><div class='del'>-	// issue the transmit command</div><div class='del'>-	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-	cmd.cmd = CMD_TRANSMIT;</div><div class='del'>-	cmd.parm0 = txFid;</div><div class='del'>-	if (issuecommand(ai, &amp;cmd, &amp;rsp, may_sleep) != SUCCESS)</div><div class='del'>-		return ERROR;</div><div class='del'>-	if ((rsp.status &amp; 0xFF00) != 0) return ERROR;</div><div class='del'>-	return SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int transmit_802_11_packet(struct airo_info *ai, int len, char *pPacket,</div><div class='del'>-				  bool may_sleep)</div><div class='del'>-{</div><div class='del'>-	__le16 fc, payloadLen;</div><div class='del'>-	Cmd cmd;</div><div class='del'>-	Resp rsp;</div><div class='del'>-	int hdrlen;</div><div class='del'>-	static u8 tail[(30-10) + 2 + 6] = {[30-10] = 6};</div><div class='del'>-	/* padding of header to full size + le16 gaplen (6) + gaplen bytes */</div><div class='del'>-	u16 txFid = len;</div><div class='del'>-	len &gt;&gt;= 16;</div><div class='del'>-</div><div class='del'>-	fc = *(__le16*)pPacket;</div><div class='del'>-	hdrlen = header_len(fc);</div><div class='del'>-</div><div class='del'>-	if (len &lt; hdrlen) {</div><div class='del'>-		airo_print_warn(ai-&gt;dev-&gt;name, "Short packet %d", len);</div><div class='del'>-		return ERROR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* packet is 802.11 header +  payload</div><div class='del'>-	 * write the payload length and dst/src/payload */</div><div class='del'>-	if (bap_setup(ai, txFid, 6, BAP1) != SUCCESS) return ERROR;</div><div class='del'>-	/* The 802.11 header aren't counted as part of the payload, so</div><div class='del'>-	 * we have to subtract the header bytes off */</div><div class='del'>-	payloadLen = cpu_to_le16(len-hdrlen);</div><div class='del'>-	bap_write(ai, &amp;payloadLen, sizeof(payloadLen), BAP1);</div><div class='del'>-	if (bap_setup(ai, txFid, 0x0014, BAP1) != SUCCESS) return ERROR;</div><div class='del'>-	bap_write(ai, (__le16 *)pPacket, hdrlen, BAP1);</div><div class='del'>-	bap_write(ai, (__le16 *)(tail + (hdrlen - 10)), 38 - hdrlen, BAP1);</div><div class='del'>-</div><div class='del'>-	bap_write(ai, (__le16 *)(pPacket + hdrlen), len - hdrlen, BAP1);</div><div class='del'>-	// issue the transmit command</div><div class='del'>-	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-	cmd.cmd = CMD_TRANSMIT;</div><div class='del'>-	cmd.parm0 = txFid;</div><div class='del'>-	if (issuecommand(ai, &amp;cmd, &amp;rsp, may_sleep) != SUCCESS)</div><div class='del'>-		return ERROR;</div><div class='del'>-	if ((rsp.status &amp; 0xFF00) != 0) return ERROR;</div><div class='del'>-	return SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  This is the proc_fs routines.  It is a bit messier than I would</div><div class='del'>- *  like!  Feel free to clean it up!</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static ssize_t proc_read(struct file *file,</div><div class='del'>-			  char __user *buffer,</div><div class='del'>-			  size_t len,</div><div class='del'>-			  loff_t *offset);</div><div class='del'>-</div><div class='del'>-static ssize_t proc_write(struct file *file,</div><div class='del'>-			   const char __user *buffer,</div><div class='del'>-			   size_t len,</div><div class='del'>-			   loff_t *offset);</div><div class='del'>-static int proc_close(struct inode *inode, struct file *file);</div><div class='del'>-</div><div class='del'>-static int proc_stats_open(struct inode *inode, struct file *file);</div><div class='del'>-static int proc_statsdelta_open(struct inode *inode, struct file *file);</div><div class='del'>-static int proc_status_open(struct inode *inode, struct file *file);</div><div class='del'>-static int proc_SSID_open(struct inode *inode, struct file *file);</div><div class='del'>-static int proc_APList_open(struct inode *inode, struct file *file);</div><div class='del'>-static int proc_BSSList_open(struct inode *inode, struct file *file);</div><div class='del'>-static int proc_config_open(struct inode *inode, struct file *file);</div><div class='del'>-static int proc_wepkey_open(struct inode *inode, struct file *file);</div><div class='del'>-</div><div class='del'>-static const struct proc_ops proc_statsdelta_ops = {</div><div class='del'>-	.proc_read	= proc_read,</div><div class='del'>-	.proc_open	= proc_statsdelta_open,</div><div class='del'>-	.proc_release	= proc_close,</div><div class='del'>-	.proc_lseek	= default_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct proc_ops proc_stats_ops = {</div><div class='del'>-	.proc_read	= proc_read,</div><div class='del'>-	.proc_open	= proc_stats_open,</div><div class='del'>-	.proc_release	= proc_close,</div><div class='del'>-	.proc_lseek	= default_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct proc_ops proc_status_ops = {</div><div class='del'>-	.proc_read	= proc_read,</div><div class='del'>-	.proc_open	= proc_status_open,</div><div class='del'>-	.proc_release	= proc_close,</div><div class='del'>-	.proc_lseek	= default_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct proc_ops proc_SSID_ops = {</div><div class='del'>-	.proc_read	= proc_read,</div><div class='del'>-	.proc_write	= proc_write,</div><div class='del'>-	.proc_open	= proc_SSID_open,</div><div class='del'>-	.proc_release	= proc_close,</div><div class='del'>-	.proc_lseek	= default_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct proc_ops proc_BSSList_ops = {</div><div class='del'>-	.proc_read	= proc_read,</div><div class='del'>-	.proc_write	= proc_write,</div><div class='del'>-	.proc_open	= proc_BSSList_open,</div><div class='del'>-	.proc_release	= proc_close,</div><div class='del'>-	.proc_lseek	= default_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct proc_ops proc_APList_ops = {</div><div class='del'>-	.proc_read	= proc_read,</div><div class='del'>-	.proc_write	= proc_write,</div><div class='del'>-	.proc_open	= proc_APList_open,</div><div class='del'>-	.proc_release	= proc_close,</div><div class='del'>-	.proc_lseek	= default_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct proc_ops proc_config_ops = {</div><div class='del'>-	.proc_read	= proc_read,</div><div class='del'>-	.proc_write	= proc_write,</div><div class='del'>-	.proc_open	= proc_config_open,</div><div class='del'>-	.proc_release	= proc_close,</div><div class='del'>-	.proc_lseek	= default_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct proc_ops proc_wepkey_ops = {</div><div class='del'>-	.proc_read	= proc_read,</div><div class='del'>-	.proc_write	= proc_write,</div><div class='del'>-	.proc_open	= proc_wepkey_open,</div><div class='del'>-	.proc_release	= proc_close,</div><div class='del'>-	.proc_lseek	= default_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct proc_dir_entry *airo_entry;</div><div class='del'>-</div><div class='del'>-struct proc_data {</div><div class='del'>-	int release_buffer;</div><div class='del'>-	int readlen;</div><div class='del'>-	char *rbuffer;</div><div class='del'>-	int writelen;</div><div class='del'>-	int maxwritelen;</div><div class='del'>-	char *wbuffer;</div><div class='del'>-	void (*on_close) (struct inode *, struct file *);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int setup_proc_entry(struct net_device *dev,</div><div class='del'>-			     struct airo_info *apriv)</div><div class='del'>-{</div><div class='del'>-	struct proc_dir_entry *entry;</div><div class='del'>-</div><div class='del'>-	/* First setup the device directory */</div><div class='del'>-	strcpy(apriv-&gt;proc_name, dev-&gt;name);</div><div class='del'>-	apriv-&gt;proc_entry = proc_mkdir_mode(apriv-&gt;proc_name, airo_perm,</div><div class='del'>-					    airo_entry);</div><div class='del'>-	if (!apriv-&gt;proc_entry)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	proc_set_user(apriv-&gt;proc_entry, proc_kuid, proc_kgid);</div><div class='del'>-</div><div class='del'>-	/* Setup the StatsDelta */</div><div class='del'>-	entry = proc_create_data("StatsDelta", 0444 &amp; proc_perm,</div><div class='del'>-				 apriv-&gt;proc_entry, &amp;proc_statsdelta_ops, dev);</div><div class='del'>-	if (!entry)</div><div class='del'>-		goto fail;</div><div class='del'>-	proc_set_user(entry, proc_kuid, proc_kgid);</div><div class='del'>-</div><div class='del'>-	/* Setup the Stats */</div><div class='del'>-	entry = proc_create_data("Stats", 0444 &amp; proc_perm,</div><div class='del'>-				 apriv-&gt;proc_entry, &amp;proc_stats_ops, dev);</div><div class='del'>-	if (!entry)</div><div class='del'>-		goto fail;</div><div class='del'>-	proc_set_user(entry, proc_kuid, proc_kgid);</div><div class='del'>-</div><div class='del'>-	/* Setup the Status */</div><div class='del'>-	entry = proc_create_data("Status", 0444 &amp; proc_perm,</div><div class='del'>-				 apriv-&gt;proc_entry, &amp;proc_status_ops, dev);</div><div class='del'>-	if (!entry)</div><div class='del'>-		goto fail;</div><div class='del'>-	proc_set_user(entry, proc_kuid, proc_kgid);</div><div class='del'>-</div><div class='del'>-	/* Setup the Config */</div><div class='del'>-	entry = proc_create_data("Config", proc_perm,</div><div class='del'>-				 apriv-&gt;proc_entry, &amp;proc_config_ops, dev);</div><div class='del'>-	if (!entry)</div><div class='del'>-		goto fail;</div><div class='del'>-	proc_set_user(entry, proc_kuid, proc_kgid);</div><div class='del'>-</div><div class='del'>-	/* Setup the SSID */</div><div class='del'>-	entry = proc_create_data("SSID", proc_perm,</div><div class='del'>-				 apriv-&gt;proc_entry, &amp;proc_SSID_ops, dev);</div><div class='del'>-	if (!entry)</div><div class='del'>-		goto fail;</div><div class='del'>-	proc_set_user(entry, proc_kuid, proc_kgid);</div><div class='del'>-</div><div class='del'>-	/* Setup the APList */</div><div class='del'>-	entry = proc_create_data("APList", proc_perm,</div><div class='del'>-				 apriv-&gt;proc_entry, &amp;proc_APList_ops, dev);</div><div class='del'>-	if (!entry)</div><div class='del'>-		goto fail;</div><div class='del'>-	proc_set_user(entry, proc_kuid, proc_kgid);</div><div class='del'>-</div><div class='del'>-	/* Setup the BSSList */</div><div class='del'>-	entry = proc_create_data("BSSList", proc_perm,</div><div class='del'>-				 apriv-&gt;proc_entry, &amp;proc_BSSList_ops, dev);</div><div class='del'>-	if (!entry)</div><div class='del'>-		goto fail;</div><div class='del'>-	proc_set_user(entry, proc_kuid, proc_kgid);</div><div class='del'>-</div><div class='del'>-	/* Setup the WepKey */</div><div class='del'>-	entry = proc_create_data("WepKey", proc_perm,</div><div class='del'>-				 apriv-&gt;proc_entry, &amp;proc_wepkey_ops, dev);</div><div class='del'>-	if (!entry)</div><div class='del'>-		goto fail;</div><div class='del'>-	proc_set_user(entry, proc_kuid, proc_kgid);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	remove_proc_subtree(apriv-&gt;proc_name, airo_entry);</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int takedown_proc_entry(struct net_device *dev,</div><div class='del'>-				struct airo_info *apriv)</div><div class='del'>-{</div><div class='del'>-	remove_proc_subtree(apriv-&gt;proc_name, airo_entry);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  What we want from the proc_fs is to be able to efficiently read</div><div class='del'>- *  and write the configuration.  To do this, we want to read the</div><div class='del'>- *  configuration when the file is opened and write it when the file is</div><div class='del'>- *  closed.  So basically we allocate a read buffer at open and fill it</div><div class='del'>- *  with data, and allocate a write buffer and read it at close.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  The read routine is generic, it relies on the preallocated rbuffer</div><div class='del'>- *  to supply the data.</div><div class='del'>- */</div><div class='del'>-static ssize_t proc_read(struct file *file,</div><div class='del'>-			  char __user *buffer,</div><div class='del'>-			  size_t len,</div><div class='del'>-			  loff_t *offset)</div><div class='del'>-{</div><div class='del'>-	struct proc_data *priv = file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;rbuffer)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return simple_read_from_buffer(buffer, len, offset, priv-&gt;rbuffer,</div><div class='del'>-					priv-&gt;readlen);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  The write routine is generic, it fills in a preallocated rbuffer</div><div class='del'>- *  to supply the data.</div><div class='del'>- */</div><div class='del'>-static ssize_t proc_write(struct file *file,</div><div class='del'>-			   const char __user *buffer,</div><div class='del'>-			   size_t len,</div><div class='del'>-			   loff_t *offset)</div><div class='del'>-{</div><div class='del'>-	ssize_t ret;</div><div class='del'>-	struct proc_data *priv = file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;wbuffer)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ret = simple_write_to_buffer(priv-&gt;wbuffer, priv-&gt;maxwritelen, offset,</div><div class='del'>-					buffer, len);</div><div class='del'>-	if (ret &gt; 0)</div><div class='del'>-		priv-&gt;writelen = max_t(int, priv-&gt;writelen, *offset);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int proc_status_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct proc_data *data;</div><div class='del'>-	struct net_device *dev = PDE_DATA(inode);</div><div class='del'>-	struct airo_info *apriv = dev-&gt;ml_priv;</div><div class='del'>-	CapabilityRid cap_rid;</div><div class='del'>-	StatusRid status_rid;</div><div class='del'>-	u16 mode;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if ((file-&gt;private_data = kzalloc(sizeof(struct proc_data), GFP_KERNEL)) == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	data = file-&gt;private_data;</div><div class='del'>-	if ((data-&gt;rbuffer = kmalloc(2048, GFP_KERNEL)) == NULL) {</div><div class='del'>-		kfree (file-&gt;private_data);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	readStatusRid(apriv, &amp;status_rid, 1);</div><div class='del'>-	readCapabilityRid(apriv, &amp;cap_rid, 1);</div><div class='del'>-</div><div class='del'>-	mode = le16_to_cpu(status_rid.mode);</div><div class='del'>-</div><div class='del'>-        i = sprintf(data-&gt;rbuffer, "Status: %s%s%s%s%s%s%s%s%s\n",</div><div class='del'>-                    mode &amp; 1 ? "CFG ": "",</div><div class='del'>-                    mode &amp; 2 ? "ACT ": "",</div><div class='del'>-                    mode &amp; 0x10 ? "SYN ": "",</div><div class='del'>-                    mode &amp; 0x20 ? "LNK ": "",</div><div class='del'>-                    mode &amp; 0x40 ? "LEAP ": "",</div><div class='del'>-                    mode &amp; 0x80 ? "PRIV ": "",</div><div class='del'>-                    mode &amp; 0x100 ? "KEY ": "",</div><div class='del'>-                    mode &amp; 0x200 ? "WEP ": "",</div><div class='del'>-                    mode &amp; 0x8000 ? "ERR ": "");</div><div class='del'>-	sprintf(data-&gt;rbuffer+i, "Mode: %x\n"</div><div class='del'>-		 "Signal Strength: %d\n"</div><div class='del'>-		 "Signal Quality: %d\n"</div><div class='del'>-		 "SSID: %-.*s\n"</div><div class='del'>-		 "AP: %-.16s\n"</div><div class='del'>-		 "Freq: %d\n"</div><div class='del'>-		 "BitRate: %dmbs\n"</div><div class='del'>-		 "Driver Version: %s\n"</div><div class='del'>-		 "Device: %s\nManufacturer: %s\nFirmware Version: %s\n"</div><div class='del'>-		 "Radio type: %x\nCountry: %x\nHardware Version: %x\n"</div><div class='del'>-		 "Software Version: %x\nSoftware Subversion: %x\n"</div><div class='del'>-		 "Boot block version: %x\n",</div><div class='del'>-		 le16_to_cpu(status_rid.mode),</div><div class='del'>-		 le16_to_cpu(status_rid.normalizedSignalStrength),</div><div class='del'>-		 le16_to_cpu(status_rid.signalQuality),</div><div class='del'>-		 le16_to_cpu(status_rid.SSIDlen),</div><div class='del'>-		 status_rid.SSID,</div><div class='del'>-		 status_rid.apName,</div><div class='del'>-		 le16_to_cpu(status_rid.channel),</div><div class='del'>-		 le16_to_cpu(status_rid.currentXmitRate) / 2,</div><div class='del'>-		 version,</div><div class='del'>-		 cap_rid.prodName,</div><div class='del'>-		 cap_rid.manName,</div><div class='del'>-		 cap_rid.prodVer,</div><div class='del'>-		 le16_to_cpu(cap_rid.radioType),</div><div class='del'>-		 le16_to_cpu(cap_rid.country),</div><div class='del'>-		 le16_to_cpu(cap_rid.hardVer),</div><div class='del'>-		 le16_to_cpu(cap_rid.softVer),</div><div class='del'>-		 le16_to_cpu(cap_rid.softSubVer),</div><div class='del'>-		 le16_to_cpu(cap_rid.bootBlockVer));</div><div class='del'>-	data-&gt;readlen = strlen(data-&gt;rbuffer);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int proc_stats_rid_open(struct inode*, struct file*, u16);</div><div class='del'>-static int proc_statsdelta_open(struct inode *inode,</div><div class='del'>-				 struct file *file)</div><div class='del'>-{</div><div class='del'>-	if (file-&gt;f_mode&amp;FMODE_WRITE) {</div><div class='del'>-		return proc_stats_rid_open(inode, file, RID_STATSDELTACLEAR);</div><div class='del'>-	}</div><div class='del'>-	return proc_stats_rid_open(inode, file, RID_STATSDELTA);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int proc_stats_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return proc_stats_rid_open(inode, file, RID_STATS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int proc_stats_rid_open(struct inode *inode,</div><div class='del'>-				struct file *file,</div><div class='del'>-				u16 rid)</div><div class='del'>-{</div><div class='del'>-	struct proc_data *data;</div><div class='del'>-	struct net_device *dev = PDE_DATA(inode);</div><div class='del'>-	struct airo_info *apriv = dev-&gt;ml_priv;</div><div class='del'>-	StatsRid stats;</div><div class='del'>-	int i, j;</div><div class='del'>-	__le32 *vals = stats.vals;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	if ((file-&gt;private_data = kzalloc(sizeof(struct proc_data), GFP_KERNEL)) == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	data = file-&gt;private_data;</div><div class='del'>-	if ((data-&gt;rbuffer = kmalloc(4096, GFP_KERNEL)) == NULL) {</div><div class='del'>-		kfree (file-&gt;private_data);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	readStatsRid(apriv, &amp;stats, rid, 1);</div><div class='del'>-	len = le16_to_cpu(stats.len);</div><div class='del'>-</div><div class='del'>-        j = 0;</div><div class='del'>-	for (i = 0; statsLabels[i]!=(char *)-1 &amp;&amp; i*4&lt;len; i++) {</div><div class='del'>-		if (!statsLabels[i]) continue;</div><div class='del'>-		if (j+strlen(statsLabels[i])+16&gt;4096) {</div><div class='del'>-			airo_print_warn(apriv-&gt;dev-&gt;name,</div><div class='del'>-			       "Potentially disastrous buffer overflow averted!");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		j+=sprintf(data-&gt;rbuffer+j, "%s: %u\n", statsLabels[i],</div><div class='del'>-				le32_to_cpu(vals[i]));</div><div class='del'>-	}</div><div class='del'>-	if (i*4 &gt;= len) {</div><div class='del'>-		airo_print_warn(apriv-&gt;dev-&gt;name, "Got a short rid");</div><div class='del'>-	}</div><div class='del'>-	data-&gt;readlen = j;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int get_dec_u16(char *buffer, int *start, int limit)</div><div class='del'>-{</div><div class='del'>-	u16 value;</div><div class='del'>-	int valid = 0;</div><div class='del'>-	for (value = 0; *start &lt; limit &amp;&amp; buffer[*start] &gt;= '0' &amp;&amp;</div><div class='del'>-			buffer[*start] &lt;= '9'; (*start)++) {</div><div class='del'>-		valid = 1;</div><div class='del'>-		value *= 10;</div><div class='del'>-		value += buffer[*start] - '0';</div><div class='del'>-	}</div><div class='del'>-	if (!valid) return -1;</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int airo_config_commit(struct net_device *dev,</div><div class='del'>-			      struct iw_request_info *info, void *zwrq,</div><div class='del'>-			      char *extra);</div><div class='del'>-</div><div class='del'>-static inline int sniffing_mode(struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	return (le16_to_cpu(ai-&gt;config.rmode) &amp; le16_to_cpu(RXMODE_MASK)) &gt;=</div><div class='del'>-		le16_to_cpu(RXMODE_RFMON);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void proc_config_on_close(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct proc_data *data = file-&gt;private_data;</div><div class='del'>-	struct net_device *dev = PDE_DATA(inode);</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-	char *line;</div><div class='del'>-</div><div class='del'>-	if (!data-&gt;writelen) return;</div><div class='del'>-</div><div class='del'>-	readConfigRid(ai, 1);</div><div class='del'>-	set_bit (FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-</div><div class='del'>-	line = data-&gt;wbuffer;</div><div class='del'>-	while (line[0]) {</div><div class='del'>-/*** Mode processing */</div><div class='del'>-		if (!strncmp(line, "Mode: ", 6)) {</div><div class='del'>-			line += 6;</div><div class='del'>-			if (sniffing_mode(ai))</div><div class='del'>-				set_bit (FLAG_RESET, &amp;ai-&gt;flags);</div><div class='del'>-			ai-&gt;config.rmode &amp;= ~RXMODE_FULL_MASK;</div><div class='del'>-			clear_bit (FLAG_802_11, &amp;ai-&gt;flags);</div><div class='del'>-			ai-&gt;config.opmode &amp;= ~MODE_CFG_MASK;</div><div class='del'>-			ai-&gt;config.scanMode = SCANMODE_ACTIVE;</div><div class='del'>-			if (line[0] == 'a') {</div><div class='del'>-				ai-&gt;config.opmode |= MODE_STA_IBSS;</div><div class='del'>-			} else {</div><div class='del'>-				ai-&gt;config.opmode |= MODE_STA_ESS;</div><div class='del'>-				if (line[0] == 'r') {</div><div class='del'>-					ai-&gt;config.rmode |= RXMODE_RFMON | RXMODE_DISABLE_802_3_HEADER;</div><div class='del'>-					ai-&gt;config.scanMode = SCANMODE_PASSIVE;</div><div class='del'>-					set_bit (FLAG_802_11, &amp;ai-&gt;flags);</div><div class='del'>-				} else if (line[0] == 'y') {</div><div class='del'>-					ai-&gt;config.rmode |= RXMODE_RFMON_ANYBSS | RXMODE_DISABLE_802_3_HEADER;</div><div class='del'>-					ai-&gt;config.scanMode = SCANMODE_PASSIVE;</div><div class='del'>-					set_bit (FLAG_802_11, &amp;ai-&gt;flags);</div><div class='del'>-				} else if (line[0] == 'l')</div><div class='del'>-					ai-&gt;config.rmode |= RXMODE_LANMON;</div><div class='del'>-			}</div><div class='del'>-			set_bit (FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-/*** Radio status */</div><div class='del'>-		else if (!strncmp(line,"Radio: ", 7)) {</div><div class='del'>-			line += 7;</div><div class='del'>-			if (!strncmp(line,"off", 3)) {</div><div class='del'>-				set_bit (FLAG_RADIO_OFF, &amp;ai-&gt;flags);</div><div class='del'>-			} else {</div><div class='del'>-				clear_bit (FLAG_RADIO_OFF, &amp;ai-&gt;flags);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-/*** NodeName processing */</div><div class='del'>-		else if (!strncmp(line, "NodeName: ", 10)) {</div><div class='del'>-			int j;</div><div class='del'>-</div><div class='del'>-			line += 10;</div><div class='del'>-			memset(ai-&gt;config.nodeName, 0, 16);</div><div class='del'>-/* Do the name, assume a space between the mode and node name */</div><div class='del'>-			for (j = 0; j &lt; 16 &amp;&amp; line[j] != '\n'; j++) {</div><div class='del'>-				ai-&gt;config.nodeName[j] = line[j];</div><div class='del'>-			}</div><div class='del'>-			set_bit (FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-/*** PowerMode processing */</div><div class='del'>-		else if (!strncmp(line, "PowerMode: ", 11)) {</div><div class='del'>-			line += 11;</div><div class='del'>-			if (!strncmp(line, "PSPCAM", 6)) {</div><div class='del'>-				ai-&gt;config.powerSaveMode = POWERSAVE_PSPCAM;</div><div class='del'>-				set_bit (FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-			} else if (!strncmp(line, "PSP", 3)) {</div><div class='del'>-				ai-&gt;config.powerSaveMode = POWERSAVE_PSP;</div><div class='del'>-				set_bit (FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-			} else {</div><div class='del'>-				ai-&gt;config.powerSaveMode = POWERSAVE_CAM;</div><div class='del'>-				set_bit (FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-			}</div><div class='del'>-		} else if (!strncmp(line, "DataRates: ", 11)) {</div><div class='del'>-			int v, i = 0, k = 0; /* i is index into line,</div><div class='del'>-						k is index to rates */</div><div class='del'>-</div><div class='del'>-			line += 11;</div><div class='del'>-			while ((v = get_dec_u16(line, &amp;i, 3))!=-1) {</div><div class='del'>-				ai-&gt;config.rates[k++] = (u8)v;</div><div class='del'>-				line += i + 1;</div><div class='del'>-				i = 0;</div><div class='del'>-			}</div><div class='del'>-			set_bit (FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-		} else if (!strncmp(line, "Channel: ", 9)) {</div><div class='del'>-			int v, i = 0;</div><div class='del'>-			line += 9;</div><div class='del'>-			v = get_dec_u16(line, &amp;i, i+3);</div><div class='del'>-			if (v != -1) {</div><div class='del'>-				ai-&gt;config.channelSet = cpu_to_le16(v);</div><div class='del'>-				set_bit (FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-			}</div><div class='del'>-		} else if (!strncmp(line, "XmitPower: ", 11)) {</div><div class='del'>-			int v, i = 0;</div><div class='del'>-			line += 11;</div><div class='del'>-			v = get_dec_u16(line, &amp;i, i+3);</div><div class='del'>-			if (v != -1) {</div><div class='del'>-				ai-&gt;config.txPower = cpu_to_le16(v);</div><div class='del'>-				set_bit (FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-			}</div><div class='del'>-		} else if (!strncmp(line, "WEP: ", 5)) {</div><div class='del'>-			line += 5;</div><div class='del'>-			switch(line[0]) {</div><div class='del'>-			case 's':</div><div class='del'>-				set_auth_type(ai, AUTH_SHAREDKEY);</div><div class='del'>-				break;</div><div class='del'>-			case 'e':</div><div class='del'>-				set_auth_type(ai, AUTH_ENCRYPT);</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				set_auth_type(ai, AUTH_OPEN);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			set_bit (FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-		} else if (!strncmp(line, "LongRetryLimit: ", 16)) {</div><div class='del'>-			int v, i = 0;</div><div class='del'>-</div><div class='del'>-			line += 16;</div><div class='del'>-			v = get_dec_u16(line, &amp;i, 3);</div><div class='del'>-			v = (v&lt;0) ? 0 : ((v&gt;255) ? 255 : v);</div><div class='del'>-			ai-&gt;config.longRetryLimit = cpu_to_le16(v);</div><div class='del'>-			set_bit (FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-		} else if (!strncmp(line, "ShortRetryLimit: ", 17)) {</div><div class='del'>-			int v, i = 0;</div><div class='del'>-</div><div class='del'>-			line += 17;</div><div class='del'>-			v = get_dec_u16(line, &amp;i, 3);</div><div class='del'>-			v = (v&lt;0) ? 0 : ((v&gt;255) ? 255 : v);</div><div class='del'>-			ai-&gt;config.shortRetryLimit = cpu_to_le16(v);</div><div class='del'>-			set_bit (FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-		} else if (!strncmp(line, "RTSThreshold: ", 14)) {</div><div class='del'>-			int v, i = 0;</div><div class='del'>-</div><div class='del'>-			line += 14;</div><div class='del'>-			v = get_dec_u16(line, &amp;i, 4);</div><div class='del'>-			v = (v&lt;0) ? 0 : ((v&gt;AIRO_DEF_MTU) ? AIRO_DEF_MTU : v);</div><div class='del'>-			ai-&gt;config.rtsThres = cpu_to_le16(v);</div><div class='del'>-			set_bit (FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-		} else if (!strncmp(line, "TXMSDULifetime: ", 16)) {</div><div class='del'>-			int v, i = 0;</div><div class='del'>-</div><div class='del'>-			line += 16;</div><div class='del'>-			v = get_dec_u16(line, &amp;i, 5);</div><div class='del'>-			v = (v&lt;0) ? 0 : v;</div><div class='del'>-			ai-&gt;config.txLifetime = cpu_to_le16(v);</div><div class='del'>-			set_bit (FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-		} else if (!strncmp(line, "RXMSDULifetime: ", 16)) {</div><div class='del'>-			int v, i = 0;</div><div class='del'>-</div><div class='del'>-			line += 16;</div><div class='del'>-			v = get_dec_u16(line, &amp;i, 5);</div><div class='del'>-			v = (v&lt;0) ? 0 : v;</div><div class='del'>-			ai-&gt;config.rxLifetime = cpu_to_le16(v);</div><div class='del'>-			set_bit (FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-		} else if (!strncmp(line, "TXDiversity: ", 13)) {</div><div class='del'>-			ai-&gt;config.txDiversity =</div><div class='del'>-				(line[13]=='l') ? 1 :</div><div class='del'>-				((line[13]=='r')? 2: 3);</div><div class='del'>-			set_bit (FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-		} else if (!strncmp(line, "RXDiversity: ", 13)) {</div><div class='del'>-			ai-&gt;config.rxDiversity =</div><div class='del'>-				(line[13]=='l') ? 1 :</div><div class='del'>-				((line[13]=='r')? 2: 3);</div><div class='del'>-			set_bit (FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-		} else if (!strncmp(line, "FragThreshold: ", 15)) {</div><div class='del'>-			int v, i = 0;</div><div class='del'>-</div><div class='del'>-			line += 15;</div><div class='del'>-			v = get_dec_u16(line, &amp;i, 4);</div><div class='del'>-			v = (v&lt;256) ? 256 : ((v&gt;AIRO_DEF_MTU) ? AIRO_DEF_MTU : v);</div><div class='del'>-			v = v &amp; 0xfffe; /* Make sure its even */</div><div class='del'>-			ai-&gt;config.fragThresh = cpu_to_le16(v);</div><div class='del'>-			set_bit (FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-		} else if (!strncmp(line, "Modulation: ", 12)) {</div><div class='del'>-			line += 12;</div><div class='del'>-			switch(*line) {</div><div class='del'>-			case 'd':  ai-&gt;config.modulation = MOD_DEFAULT; set_bit(FLAG_COMMIT, &amp;ai-&gt;flags); break;</div><div class='del'>-			case 'c':  ai-&gt;config.modulation = MOD_CCK; set_bit(FLAG_COMMIT, &amp;ai-&gt;flags); break;</div><div class='del'>-			case 'm':  ai-&gt;config.modulation = MOD_MOK; set_bit(FLAG_COMMIT, &amp;ai-&gt;flags); break;</div><div class='del'>-			default: airo_print_warn(ai-&gt;dev-&gt;name, "Unknown modulation");</div><div class='del'>-			}</div><div class='del'>-		} else if (!strncmp(line, "Preamble: ", 10)) {</div><div class='del'>-			line += 10;</div><div class='del'>-			switch(*line) {</div><div class='del'>-			case 'a': ai-&gt;config.preamble = PREAMBLE_AUTO; set_bit(FLAG_COMMIT, &amp;ai-&gt;flags); break;</div><div class='del'>-			case 'l': ai-&gt;config.preamble = PREAMBLE_LONG; set_bit(FLAG_COMMIT, &amp;ai-&gt;flags); break;</div><div class='del'>-			case 's': ai-&gt;config.preamble = PREAMBLE_SHORT; set_bit(FLAG_COMMIT, &amp;ai-&gt;flags); break;</div><div class='del'>-			default: airo_print_warn(ai-&gt;dev-&gt;name, "Unknown preamble");</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			airo_print_warn(ai-&gt;dev-&gt;name, "Couldn't figure out %s", line);</div><div class='del'>-		}</div><div class='del'>-		while (line[0] &amp;&amp; line[0] != '\n') line++;</div><div class='del'>-		if (line[0]) line++;</div><div class='del'>-	}</div><div class='del'>-	airo_config_commit(dev, NULL, NULL, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *get_rmode(__le16 mode)</div><div class='del'>-{</div><div class='del'>-        switch(mode &amp; RXMODE_MASK) {</div><div class='del'>-        case RXMODE_RFMON:  return "rfmon";</div><div class='del'>-        case RXMODE_RFMON_ANYBSS:  return "yna (any) bss rfmon";</div><div class='del'>-        case RXMODE_LANMON:  return "lanmon";</div><div class='del'>-        }</div><div class='del'>-        return "ESS";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int proc_config_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct proc_data *data;</div><div class='del'>-	struct net_device *dev = PDE_DATA(inode);</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-	int i;</div><div class='del'>-	__le16 mode;</div><div class='del'>-</div><div class='del'>-	if ((file-&gt;private_data = kzalloc(sizeof(struct proc_data), GFP_KERNEL)) == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	data = file-&gt;private_data;</div><div class='del'>-	if ((data-&gt;rbuffer = kmalloc(2048, GFP_KERNEL)) == NULL) {</div><div class='del'>-		kfree (file-&gt;private_data);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	if ((data-&gt;wbuffer = kzalloc(2048, GFP_KERNEL)) == NULL) {</div><div class='del'>-		kfree (data-&gt;rbuffer);</div><div class='del'>-		kfree (file-&gt;private_data);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	data-&gt;maxwritelen = 2048;</div><div class='del'>-	data-&gt;on_close = proc_config_on_close;</div><div class='del'>-</div><div class='del'>-	readConfigRid(ai, 1);</div><div class='del'>-</div><div class='del'>-	mode = ai-&gt;config.opmode &amp; MODE_CFG_MASK;</div><div class='del'>-	i = sprintf(data-&gt;rbuffer,</div><div class='del'>-		     "Mode: %s\n"</div><div class='del'>-		     "Radio: %s\n"</div><div class='del'>-		     "NodeName: %-16s\n"</div><div class='del'>-		     "PowerMode: %s\n"</div><div class='del'>-		     "DataRates: %d %d %d %d %d %d %d %d\n"</div><div class='del'>-		     "Channel: %d\n"</div><div class='del'>-		     "XmitPower: %d\n",</div><div class='del'>-		     mode == MODE_STA_IBSS ? "adhoc" :</div><div class='del'>-		     mode == MODE_STA_ESS ? get_rmode(ai-&gt;config.rmode):</div><div class='del'>-		     mode == MODE_AP ? "AP" :</div><div class='del'>-		     mode == MODE_AP_RPTR ? "AP RPTR" : "Error",</div><div class='del'>-		     test_bit(FLAG_RADIO_OFF, &amp;ai-&gt;flags) ? "off" : "on",</div><div class='del'>-		     ai-&gt;config.nodeName,</div><div class='del'>-		     ai-&gt;config.powerSaveMode == POWERSAVE_CAM ? "CAM" :</div><div class='del'>-		     ai-&gt;config.powerSaveMode == POWERSAVE_PSP ? "PSP" :</div><div class='del'>-		     ai-&gt;config.powerSaveMode == POWERSAVE_PSPCAM ? "PSPCAM" :</div><div class='del'>-		     "Error",</div><div class='del'>-		     (int)ai-&gt;config.rates[0],</div><div class='del'>-		     (int)ai-&gt;config.rates[1],</div><div class='del'>-		     (int)ai-&gt;config.rates[2],</div><div class='del'>-		     (int)ai-&gt;config.rates[3],</div><div class='del'>-		     (int)ai-&gt;config.rates[4],</div><div class='del'>-		     (int)ai-&gt;config.rates[5],</div><div class='del'>-		     (int)ai-&gt;config.rates[6],</div><div class='del'>-		     (int)ai-&gt;config.rates[7],</div><div class='del'>-		     le16_to_cpu(ai-&gt;config.channelSet),</div><div class='del'>-		     le16_to_cpu(ai-&gt;config.txPower)</div><div class='del'>-		);</div><div class='del'>-	sprintf(data-&gt;rbuffer + i,</div><div class='del'>-		 "LongRetryLimit: %d\n"</div><div class='del'>-		 "ShortRetryLimit: %d\n"</div><div class='del'>-		 "RTSThreshold: %d\n"</div><div class='del'>-		 "TXMSDULifetime: %d\n"</div><div class='del'>-		 "RXMSDULifetime: %d\n"</div><div class='del'>-		 "TXDiversity: %s\n"</div><div class='del'>-		 "RXDiversity: %s\n"</div><div class='del'>-		 "FragThreshold: %d\n"</div><div class='del'>-		 "WEP: %s\n"</div><div class='del'>-		 "Modulation: %s\n"</div><div class='del'>-		 "Preamble: %s\n",</div><div class='del'>-		 le16_to_cpu(ai-&gt;config.longRetryLimit),</div><div class='del'>-		 le16_to_cpu(ai-&gt;config.shortRetryLimit),</div><div class='del'>-		 le16_to_cpu(ai-&gt;config.rtsThres),</div><div class='del'>-		 le16_to_cpu(ai-&gt;config.txLifetime),</div><div class='del'>-		 le16_to_cpu(ai-&gt;config.rxLifetime),</div><div class='del'>-		 ai-&gt;config.txDiversity == 1 ? "left" :</div><div class='del'>-		 ai-&gt;config.txDiversity == 2 ? "right" : "both",</div><div class='del'>-		 ai-&gt;config.rxDiversity == 1 ? "left" :</div><div class='del'>-		 ai-&gt;config.rxDiversity == 2 ? "right" : "both",</div><div class='del'>-		 le16_to_cpu(ai-&gt;config.fragThresh),</div><div class='del'>-		 ai-&gt;config.authType == AUTH_ENCRYPT ? "encrypt" :</div><div class='del'>-		 ai-&gt;config.authType == AUTH_SHAREDKEY ? "shared" : "open",</div><div class='del'>-		 ai-&gt;config.modulation == MOD_DEFAULT ? "default" :</div><div class='del'>-		 ai-&gt;config.modulation == MOD_CCK ? "cck" :</div><div class='del'>-		 ai-&gt;config.modulation == MOD_MOK ? "mok" : "error",</div><div class='del'>-		 ai-&gt;config.preamble == PREAMBLE_AUTO ? "auto" :</div><div class='del'>-		 ai-&gt;config.preamble == PREAMBLE_LONG ? "long" :</div><div class='del'>-		 ai-&gt;config.preamble == PREAMBLE_SHORT ? "short" : "error"</div><div class='del'>-		);</div><div class='del'>-	data-&gt;readlen = strlen(data-&gt;rbuffer);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void proc_SSID_on_close(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct proc_data *data = file-&gt;private_data;</div><div class='del'>-	struct net_device *dev = PDE_DATA(inode);</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-	SsidRid SSID_rid;</div><div class='del'>-	int i;</div><div class='del'>-	char *p = data-&gt;wbuffer;</div><div class='del'>-	char *end = p + data-&gt;writelen;</div><div class='del'>-</div><div class='del'>-	if (!data-&gt;writelen)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	*end = '\n'; /* sentinel; we have space for it */</div><div class='del'>-</div><div class='del'>-	memset(&amp;SSID_rid, 0, sizeof(SSID_rid));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 3 &amp;&amp; p &lt; end; i++) {</div><div class='del'>-		int j = 0;</div><div class='del'>-		/* copy up to 32 characters from this line */</div><div class='del'>-		while (*p != '\n' &amp;&amp; j &lt; 32)</div><div class='del'>-			SSID_rid.ssids[i].ssid[j++] = *p++;</div><div class='del'>-		if (j == 0)</div><div class='del'>-			break;</div><div class='del'>-		SSID_rid.ssids[i].len = cpu_to_le16(j);</div><div class='del'>-		/* skip to the beginning of the next line */</div><div class='del'>-		while (*p++ != '\n')</div><div class='del'>-			;</div><div class='del'>-	}</div><div class='del'>-	if (i)</div><div class='del'>-		SSID_rid.len = cpu_to_le16(sizeof(SSID_rid));</div><div class='del'>-	disable_MAC(ai, 1);</div><div class='del'>-	writeSsidRid(ai, &amp;SSID_rid, 1);</div><div class='del'>-	enable_MAC(ai, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void proc_APList_on_close(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct proc_data *data = file-&gt;private_data;</div><div class='del'>-	struct net_device *dev = PDE_DATA(inode);</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-	APListRid *APList_rid = &amp;ai-&gt;APList;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!data-&gt;writelen) return;</div><div class='del'>-</div><div class='del'>-	memset(APList_rid, 0, sizeof(*APList_rid));</div><div class='del'>-	APList_rid-&gt;len = cpu_to_le16(sizeof(*APList_rid));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 4 &amp;&amp; data-&gt;writelen &gt;= (i + 1) * 6 * 3; i++)</div><div class='del'>-		mac_pton(data-&gt;wbuffer + i * 6 * 3, APList_rid-&gt;ap[i]);</div><div class='del'>-</div><div class='del'>-	disable_MAC(ai, 1);</div><div class='del'>-	writeAPListRid(ai, APList_rid, 1);</div><div class='del'>-	enable_MAC(ai, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function wraps PC4500_writerid with a MAC disable */</div><div class='del'>-static int do_writerid(struct airo_info *ai, u16 rid, const void *rid_data,</div><div class='del'>-			int len, int dummy)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	disable_MAC(ai, 1);</div><div class='del'>-	rc = PC4500_writerid(ai, rid, rid_data, len, 1);</div><div class='del'>-	enable_MAC(ai, 1);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns the WEP key at the specified index, or -1 if that key does</div><div class='del'>- * not exist.  The buffer is assumed to be at least 16 bytes in length.</div><div class='del'>- */</div><div class='del'>-static int get_wep_key(struct airo_info *ai, u16 index, char *buf, u16 buflen)</div><div class='del'>-{</div><div class='del'>-	WepKeyRid wkr;</div><div class='del'>-	int rc;</div><div class='del'>-	__le16 lastindex;</div><div class='del'>-</div><div class='del'>-	rc = readWepKeyRid(ai, &amp;wkr, 1, 1);</div><div class='del'>-	if (rc != SUCCESS)</div><div class='del'>-		return -1;</div><div class='del'>-	do {</div><div class='del'>-		lastindex = wkr.kindex;</div><div class='del'>-		if (le16_to_cpu(wkr.kindex) == index) {</div><div class='del'>-			int klen = min_t(int, buflen, le16_to_cpu(wkr.klen));</div><div class='del'>-			memcpy(buf, wkr.key, klen);</div><div class='del'>-			return klen;</div><div class='del'>-		}</div><div class='del'>-		rc = readWepKeyRid(ai, &amp;wkr, 0, 1);</div><div class='del'>-		if (rc != SUCCESS)</div><div class='del'>-			return -1;</div><div class='del'>-	} while (lastindex != wkr.kindex);</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int get_wep_tx_idx(struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	WepKeyRid wkr;</div><div class='del'>-	int rc;</div><div class='del'>-	__le16 lastindex;</div><div class='del'>-</div><div class='del'>-	rc = readWepKeyRid(ai, &amp;wkr, 1, 1);</div><div class='del'>-	if (rc != SUCCESS)</div><div class='del'>-		return -1;</div><div class='del'>-	do {</div><div class='del'>-		lastindex = wkr.kindex;</div><div class='del'>-		if (wkr.kindex == cpu_to_le16(0xffff))</div><div class='del'>-			return wkr.mac[0];</div><div class='del'>-		rc = readWepKeyRid(ai, &amp;wkr, 0, 1);</div><div class='del'>-		if (rc != SUCCESS)</div><div class='del'>-			return -1;</div><div class='del'>-	} while (lastindex != wkr.kindex);</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int set_wep_key(struct airo_info *ai, u16 index, const char *key,</div><div class='del'>-		       u16 keylen, int perm, int lock)</div><div class='del'>-{</div><div class='del'>-	static const unsigned char macaddr[ETH_ALEN] = { 0x01, 0, 0, 0, 0, 0 };</div><div class='del'>-	WepKeyRid wkr;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(keylen == 0))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	memset(&amp;wkr, 0, sizeof(wkr));</div><div class='del'>-	wkr.len = cpu_to_le16(sizeof(wkr));</div><div class='del'>-	wkr.kindex = cpu_to_le16(index);</div><div class='del'>-	wkr.klen = cpu_to_le16(keylen);</div><div class='del'>-	memcpy(wkr.key, key, keylen);</div><div class='del'>-	memcpy(wkr.mac, macaddr, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	if (perm) disable_MAC(ai, lock);</div><div class='del'>-	rc = writeWepKeyRid(ai, &amp;wkr, perm, lock);</div><div class='del'>-	if (perm) enable_MAC(ai, lock);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int set_wep_tx_idx(struct airo_info *ai, u16 index, int perm, int lock)</div><div class='del'>-{</div><div class='del'>-	WepKeyRid wkr;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	memset(&amp;wkr, 0, sizeof(wkr));</div><div class='del'>-	wkr.len = cpu_to_le16(sizeof(wkr));</div><div class='del'>-	wkr.kindex = cpu_to_le16(0xffff);</div><div class='del'>-	wkr.mac[0] = (char)index;</div><div class='del'>-</div><div class='del'>-	if (perm) {</div><div class='del'>-		ai-&gt;defindex = (char)index;</div><div class='del'>-		disable_MAC(ai, lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rc = writeWepKeyRid(ai, &amp;wkr, perm, lock);</div><div class='del'>-</div><div class='del'>-	if (perm)</div><div class='del'>-		enable_MAC(ai, lock);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void proc_wepkey_on_close(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct proc_data *data;</div><div class='del'>-	struct net_device *dev = PDE_DATA(inode);</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-	int i, rc;</div><div class='del'>-	char key[16];</div><div class='del'>-	u16 index = 0;</div><div class='del'>-	int j = 0;</div><div class='del'>-</div><div class='del'>-	memset(key, 0, sizeof(key));</div><div class='del'>-</div><div class='del'>-	data = file-&gt;private_data;</div><div class='del'>-	if (!data-&gt;writelen) return;</div><div class='del'>-</div><div class='del'>-	if (data-&gt;wbuffer[0] &gt;= '0' &amp;&amp; data-&gt;wbuffer[0] &lt;= '3' &amp;&amp;</div><div class='del'>-	    (data-&gt;wbuffer[1] == ' ' || data-&gt;wbuffer[1] == '\n')) {</div><div class='del'>-		index = data-&gt;wbuffer[0] - '0';</div><div class='del'>-		if (data-&gt;wbuffer[1] == '\n') {</div><div class='del'>-			rc = set_wep_tx_idx(ai, index, 1, 1);</div><div class='del'>-			if (rc &lt; 0) {</div><div class='del'>-				airo_print_err(ai-&gt;dev-&gt;name, "failed to set "</div><div class='del'>-				               "WEP transmit index to %d: %d.",</div><div class='del'>-				               index, rc);</div><div class='del'>-			}</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		j = 2;</div><div class='del'>-	} else {</div><div class='del'>-		airo_print_err(ai-&gt;dev-&gt;name, "WepKey passed invalid key index");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 16*3 &amp;&amp; data-&gt;wbuffer[i+j]; i++) {</div><div class='del'>-		switch(i%3) {</div><div class='del'>-		case 0:</div><div class='del'>-			key[i/3] = hex_to_bin(data-&gt;wbuffer[i+j])&lt;&lt;4;</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			key[i/3] |= hex_to_bin(data-&gt;wbuffer[i+j]);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rc = set_wep_key(ai, index, key, i/3, 1, 1);</div><div class='del'>-	if (rc &lt; 0) {</div><div class='del'>-		airo_print_err(ai-&gt;dev-&gt;name, "failed to set WEP key at index "</div><div class='del'>-		               "%d: %d.", index, rc);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int proc_wepkey_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct proc_data *data;</div><div class='del'>-	struct net_device *dev = PDE_DATA(inode);</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-	char *ptr;</div><div class='del'>-	WepKeyRid wkr;</div><div class='del'>-	__le16 lastindex;</div><div class='del'>-	int j = 0;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	if ((file-&gt;private_data = kzalloc(sizeof(struct proc_data), GFP_KERNEL)) == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	memset(&amp;wkr, 0, sizeof(wkr));</div><div class='del'>-	data = file-&gt;private_data;</div><div class='del'>-	if ((data-&gt;rbuffer = kzalloc(180, GFP_KERNEL)) == NULL) {</div><div class='del'>-		kfree (file-&gt;private_data);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	data-&gt;writelen = 0;</div><div class='del'>-	data-&gt;maxwritelen = 80;</div><div class='del'>-	if ((data-&gt;wbuffer = kzalloc(80, GFP_KERNEL)) == NULL) {</div><div class='del'>-		kfree (data-&gt;rbuffer);</div><div class='del'>-		kfree (file-&gt;private_data);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	data-&gt;on_close = proc_wepkey_on_close;</div><div class='del'>-</div><div class='del'>-	ptr = data-&gt;rbuffer;</div><div class='del'>-	strcpy(ptr, "No wep keys\n");</div><div class='del'>-	rc = readWepKeyRid(ai, &amp;wkr, 1, 1);</div><div class='del'>-	if (rc == SUCCESS) do {</div><div class='del'>-		lastindex = wkr.kindex;</div><div class='del'>-		if (wkr.kindex == cpu_to_le16(0xffff)) {</div><div class='del'>-			j += sprintf(ptr+j, "Tx key = %d\n",</div><div class='del'>-				     (int)wkr.mac[0]);</div><div class='del'>-		} else {</div><div class='del'>-			j += sprintf(ptr+j, "Key %d set with length = %d\n",</div><div class='del'>-				     le16_to_cpu(wkr.kindex),</div><div class='del'>-				     le16_to_cpu(wkr.klen));</div><div class='del'>-		}</div><div class='del'>-		readWepKeyRid(ai, &amp;wkr, 0, 1);</div><div class='del'>-	} while ((lastindex != wkr.kindex) &amp;&amp; (j &lt; 180-30));</div><div class='del'>-</div><div class='del'>-	data-&gt;readlen = strlen(data-&gt;rbuffer);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int proc_SSID_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct proc_data *data;</div><div class='del'>-	struct net_device *dev = PDE_DATA(inode);</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-	int i;</div><div class='del'>-	char *ptr;</div><div class='del'>-	SsidRid SSID_rid;</div><div class='del'>-</div><div class='del'>-	if ((file-&gt;private_data = kzalloc(sizeof(struct proc_data), GFP_KERNEL)) == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	data = file-&gt;private_data;</div><div class='del'>-	if ((data-&gt;rbuffer = kmalloc(104, GFP_KERNEL)) == NULL) {</div><div class='del'>-		kfree (file-&gt;private_data);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	data-&gt;writelen = 0;</div><div class='del'>-	data-&gt;maxwritelen = 33*3;</div><div class='del'>-	/* allocate maxwritelen + 1; we'll want a sentinel */</div><div class='del'>-	if ((data-&gt;wbuffer = kzalloc(33*3 + 1, GFP_KERNEL)) == NULL) {</div><div class='del'>-		kfree (data-&gt;rbuffer);</div><div class='del'>-		kfree (file-&gt;private_data);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	data-&gt;on_close = proc_SSID_on_close;</div><div class='del'>-</div><div class='del'>-	readSsidRid(ai, &amp;SSID_rid);</div><div class='del'>-	ptr = data-&gt;rbuffer;</div><div class='del'>-	for (i = 0; i &lt; 3; i++) {</div><div class='del'>-		int j;</div><div class='del'>-		size_t len = le16_to_cpu(SSID_rid.ssids[i].len);</div><div class='del'>-		if (!len)</div><div class='del'>-			break;</div><div class='del'>-		if (len &gt; 32)</div><div class='del'>-			len = 32;</div><div class='del'>-		for (j = 0; j &lt; len &amp;&amp; SSID_rid.ssids[i].ssid[j]; j++)</div><div class='del'>-			*ptr++ = SSID_rid.ssids[i].ssid[j];</div><div class='del'>-		*ptr++ = '\n';</div><div class='del'>-	}</div><div class='del'>-	*ptr = '\0';</div><div class='del'>-	data-&gt;readlen = strlen(data-&gt;rbuffer);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int proc_APList_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct proc_data *data;</div><div class='del'>-	struct net_device *dev = PDE_DATA(inode);</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-	int i;</div><div class='del'>-	char *ptr;</div><div class='del'>-	APListRid *APList_rid = &amp;ai-&gt;APList;</div><div class='del'>-</div><div class='del'>-	if ((file-&gt;private_data = kzalloc(sizeof(struct proc_data), GFP_KERNEL)) == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	data = file-&gt;private_data;</div><div class='del'>-	if ((data-&gt;rbuffer = kmalloc(104, GFP_KERNEL)) == NULL) {</div><div class='del'>-		kfree (file-&gt;private_data);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	data-&gt;writelen = 0;</div><div class='del'>-	data-&gt;maxwritelen = 4*6*3;</div><div class='del'>-	if ((data-&gt;wbuffer = kzalloc(data-&gt;maxwritelen, GFP_KERNEL)) == NULL) {</div><div class='del'>-		kfree (data-&gt;rbuffer);</div><div class='del'>-		kfree (file-&gt;private_data);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	data-&gt;on_close = proc_APList_on_close;</div><div class='del'>-</div><div class='del'>-	ptr = data-&gt;rbuffer;</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-// We end when we find a zero MAC</div><div class='del'>-		if (!*(int*)APList_rid-&gt;ap[i] &amp;&amp;</div><div class='del'>-		     !*(int*)&amp;APList_rid-&gt;ap[i][2]) break;</div><div class='del'>-		ptr += sprintf(ptr, "%pM\n", APList_rid-&gt;ap[i]);</div><div class='del'>-	}</div><div class='del'>-	if (i==0) ptr += sprintf(ptr, "Not using specific APs\n");</div><div class='del'>-</div><div class='del'>-	*ptr = '\0';</div><div class='del'>-	data-&gt;readlen = strlen(data-&gt;rbuffer);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int proc_BSSList_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct proc_data *data;</div><div class='del'>-	struct net_device *dev = PDE_DATA(inode);</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-	char *ptr;</div><div class='del'>-	BSSListRid BSSList_rid;</div><div class='del'>-	int rc;</div><div class='del'>-	/* If doLoseSync is not 1, we won't do a Lose Sync */</div><div class='del'>-	int doLoseSync = -1;</div><div class='del'>-</div><div class='del'>-	if ((file-&gt;private_data = kzalloc(sizeof(struct proc_data), GFP_KERNEL)) == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	data = file-&gt;private_data;</div><div class='del'>-	if ((data-&gt;rbuffer = kmalloc(1024, GFP_KERNEL)) == NULL) {</div><div class='del'>-		kfree (file-&gt;private_data);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	data-&gt;writelen = 0;</div><div class='del'>-	data-&gt;maxwritelen = 0;</div><div class='del'>-	data-&gt;wbuffer = NULL;</div><div class='del'>-	data-&gt;on_close = NULL;</div><div class='del'>-</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-		if (!(file-&gt;f_mode &amp; FMODE_READ)) {</div><div class='del'>-			Cmd cmd;</div><div class='del'>-			Resp rsp;</div><div class='del'>-</div><div class='del'>-			if (ai-&gt;flags &amp; FLAG_RADIO_MASK) {</div><div class='del'>-				kfree(data-&gt;rbuffer);</div><div class='del'>-				kfree(file-&gt;private_data);</div><div class='del'>-				return -ENETDOWN;</div><div class='del'>-			}</div><div class='del'>-			memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-			cmd.cmd = CMD_LISTBSS;</div><div class='del'>-			if (down_interruptible(&amp;ai-&gt;sem)) {</div><div class='del'>-				kfree(data-&gt;rbuffer);</div><div class='del'>-				kfree(file-&gt;private_data);</div><div class='del'>-				return -ERESTARTSYS;</div><div class='del'>-			}</div><div class='del'>-			issuecommand(ai, &amp;cmd, &amp;rsp, true);</div><div class='del'>-			up(&amp;ai-&gt;sem);</div><div class='del'>-			data-&gt;readlen = 0;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		doLoseSync = 1;</div><div class='del'>-	}</div><div class='del'>-	ptr = data-&gt;rbuffer;</div><div class='del'>-	/* There is a race condition here if there are concurrent opens.</div><div class='del'>-           Since it is a rare condition, we'll just live with it, otherwise</div><div class='del'>-           we have to add a spin lock... */</div><div class='del'>-	rc = readBSSListRid(ai, doLoseSync, &amp;BSSList_rid);</div><div class='del'>-	while (rc == 0 &amp;&amp; BSSList_rid.index != cpu_to_le16(0xffff)) {</div><div class='del'>-		ptr += sprintf(ptr, "%pM %.*s rssi = %d",</div><div class='del'>-			       BSSList_rid.bssid,</div><div class='del'>-				(int)BSSList_rid.ssidLen,</div><div class='del'>-				BSSList_rid.ssid,</div><div class='del'>-				le16_to_cpu(BSSList_rid.dBm));</div><div class='del'>-		ptr += sprintf(ptr, " channel = %d %s %s %s %s\n",</div><div class='del'>-				le16_to_cpu(BSSList_rid.dsChannel),</div><div class='del'>-				BSSList_rid.cap &amp; CAP_ESS ? "ESS" : "",</div><div class='del'>-				BSSList_rid.cap &amp; CAP_IBSS ? "adhoc" : "",</div><div class='del'>-				BSSList_rid.cap &amp; CAP_PRIVACY ? "wep" : "",</div><div class='del'>-				BSSList_rid.cap &amp; CAP_SHORTHDR ? "shorthdr" : "");</div><div class='del'>-		rc = readBSSListRid(ai, 0, &amp;BSSList_rid);</div><div class='del'>-	}</div><div class='del'>-	*ptr = '\0';</div><div class='del'>-	data-&gt;readlen = strlen(data-&gt;rbuffer);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int proc_close(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct proc_data *data = file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	if (data-&gt;on_close != NULL)</div><div class='del'>-		data-&gt;on_close(inode, file);</div><div class='del'>-	kfree(data-&gt;rbuffer);</div><div class='del'>-	kfree(data-&gt;wbuffer);</div><div class='del'>-	kfree(data);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Since the card doesn't automatically switch to the right WEP mode,</div><div class='del'>-   we will make it do it.  If the card isn't associated, every secs we</div><div class='del'>-   will switch WEP modes to see if that will help.  If the card is</div><div class='del'>-   associated we will check every minute to see if anything has</div><div class='del'>-   changed. */</div><div class='del'>-static void timer_func(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *apriv = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-/* We don't have a link so try changing the authtype */</div><div class='del'>-	readConfigRid(apriv, 0);</div><div class='del'>-	disable_MAC(apriv, 0);</div><div class='del'>-	switch(apriv-&gt;config.authType) {</div><div class='del'>-		case AUTH_ENCRYPT:</div><div class='del'>-/* So drop to OPEN */</div><div class='del'>-			apriv-&gt;config.authType = AUTH_OPEN;</div><div class='del'>-			break;</div><div class='del'>-		case AUTH_SHAREDKEY:</div><div class='del'>-			if (apriv-&gt;keyindex &lt; auto_wep) {</div><div class='del'>-				set_wep_tx_idx(apriv, apriv-&gt;keyindex, 0, 0);</div><div class='del'>-				apriv-&gt;config.authType = AUTH_SHAREDKEY;</div><div class='del'>-				apriv-&gt;keyindex++;</div><div class='del'>-			} else {</div><div class='del'>-			        /* Drop to ENCRYPT */</div><div class='del'>-				apriv-&gt;keyindex = 0;</div><div class='del'>-				set_wep_tx_idx(apriv, apriv-&gt;defindex, 0, 0);</div><div class='del'>-				apriv-&gt;config.authType = AUTH_ENCRYPT;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		default:  /* We'll escalate to SHAREDKEY */</div><div class='del'>-			apriv-&gt;config.authType = AUTH_SHAREDKEY;</div><div class='del'>-	}</div><div class='del'>-	set_bit (FLAG_COMMIT, &amp;apriv-&gt;flags);</div><div class='del'>-	writeConfigRid(apriv, 0);</div><div class='del'>-	enable_MAC(apriv, 0);</div><div class='del'>-	up(&amp;apriv-&gt;sem);</div><div class='del'>-</div><div class='del'>-/* Schedule check to see if the change worked */</div><div class='del'>-	clear_bit(JOB_AUTOWEP, &amp;apriv-&gt;jobs);</div><div class='del'>-	apriv-&gt;expires = RUN_AT(HZ*3);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-static int airo_pci_probe(struct pci_dev *pdev,</div><div class='del'>-				    const struct pci_device_id *pent)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-</div><div class='del'>-	if (pci_enable_device(pdev))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	pci_set_master(pdev);</div><div class='del'>-</div><div class='del'>-	if (pdev-&gt;device == 0x5000 || pdev-&gt;device == 0xa504)</div><div class='del'>-			dev = _init_airo_card(pdev-&gt;irq, pdev-&gt;resource[0].start, 0, pdev, &amp;pdev-&gt;dev);</div><div class='del'>-	else</div><div class='del'>-			dev = _init_airo_card(pdev-&gt;irq, pdev-&gt;resource[2].start, 0, pdev, &amp;pdev-&gt;dev);</div><div class='del'>-	if (!dev) {</div><div class='del'>-		pci_disable_device(pdev);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pci_set_drvdata(pdev, dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void airo_pci_remove(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='del'>-</div><div class='del'>-	airo_print_info(dev-&gt;name, "Unregistering...");</div><div class='del'>-	stop_airo_card(dev, 1);</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __maybe_unused airo_pci_suspend(struct device *dev_d)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = dev_get_drvdata(dev_d);</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-	Cmd cmd;</div><div class='del'>-	Resp rsp;</div><div class='del'>-</div><div class='del'>-	if (!ai-&gt;SSID)</div><div class='del'>-		ai-&gt;SSID = kmalloc(sizeof(SsidRid), GFP_KERNEL);</div><div class='del'>-	if (!ai-&gt;SSID)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	readSsidRid(ai, ai-&gt;SSID);</div><div class='del'>-	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-	/* the lock will be released at the end of the resume callback */</div><div class='del'>-	if (down_interruptible(&amp;ai-&gt;sem))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	disable_MAC(ai, 0);</div><div class='del'>-	netif_device_detach(dev);</div><div class='del'>-	ai-&gt;power = PMSG_SUSPEND;</div><div class='del'>-	cmd.cmd = HOSTSLEEP;</div><div class='del'>-	issuecommand(ai, &amp;cmd, &amp;rsp, true);</div><div class='del'>-</div><div class='del'>-	device_wakeup_enable(dev_d);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __maybe_unused airo_pci_resume(struct device *dev_d)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = dev_get_drvdata(dev_d);</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-	pci_power_t prev_state = to_pci_dev(dev_d)-&gt;current_state;</div><div class='del'>-</div><div class='del'>-	device_wakeup_disable(dev_d);</div><div class='del'>-</div><div class='del'>-	if (prev_state != PCI_D1) {</div><div class='del'>-		reset_card(dev, 0);</div><div class='del'>-		mpi_init_descriptors(ai);</div><div class='del'>-		setup_card(ai, dev-&gt;dev_addr, 0);</div><div class='del'>-		clear_bit(FLAG_RADIO_OFF, &amp;ai-&gt;flags);</div><div class='del'>-		clear_bit(FLAG_PENDING_XMIT, &amp;ai-&gt;flags);</div><div class='del'>-	} else {</div><div class='del'>-		OUT4500(ai, EVACK, EV_AWAKEN);</div><div class='del'>-		OUT4500(ai, EVACK, EV_AWAKEN);</div><div class='del'>-		msleep(100);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_bit(FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-	disable_MAC(ai, 0);</div><div class='del'>-        msleep(200);</div><div class='del'>-	if (ai-&gt;SSID) {</div><div class='del'>-		writeSsidRid(ai, ai-&gt;SSID, 0);</div><div class='del'>-		kfree(ai-&gt;SSID);</div><div class='del'>-		ai-&gt;SSID = NULL;</div><div class='del'>-	}</div><div class='del'>-	writeAPListRid(ai, &amp;ai-&gt;APList, 0);</div><div class='del'>-	writeConfigRid(ai, 0);</div><div class='del'>-	enable_MAC(ai, 0);</div><div class='del'>-	ai-&gt;power = PMSG_ON;</div><div class='del'>-	netif_device_attach(dev);</div><div class='del'>-	netif_wake_queue(dev);</div><div class='del'>-	enable_interrupts(ai);</div><div class='del'>-	up(&amp;ai-&gt;sem);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int __init airo_init_module(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	proc_kuid = make_kuid(&amp;init_user_ns, proc_uid);</div><div class='del'>-	proc_kgid = make_kgid(&amp;init_user_ns, proc_gid);</div><div class='del'>-	if (!uid_valid(proc_kuid) || !gid_valid(proc_kgid))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	airo_entry = proc_mkdir_mode("driver/aironet", airo_perm, NULL);</div><div class='del'>-</div><div class='del'>-	if (airo_entry)</div><div class='del'>-		proc_set_user(airo_entry, proc_kuid, proc_kgid);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 4 &amp;&amp; io[i] &amp;&amp; irq[i]; i++) {</div><div class='del'>-		airo_print_info("", "Trying to configure ISA adapter at irq=%d "</div><div class='del'>-			"io = 0x%x", irq[i], io[i]);</div><div class='del'>-		if (init_airo_card(irq[i], io[i], 0, NULL)) {</div><div class='del'>-			/* do nothing */ ;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	airo_print_info("", "Probing for PCI adapters");</div><div class='del'>-	i = pci_register_driver(&amp;airo_driver);</div><div class='del'>-	airo_print_info("", "Finished probing for PCI adapters");</div><div class='del'>-</div><div class='del'>-	if (i) {</div><div class='del'>-		remove_proc_entry("driver/aironet", NULL);</div><div class='del'>-		return i;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Always exit with success, as we are a library module</div><div class='del'>-	 * as well as a driver module</div><div class='del'>-	 */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit airo_cleanup_module(void)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *ai;</div><div class='del'>-	while (!list_empty(&amp;airo_devices)) {</div><div class='del'>-		ai = list_entry(airo_devices.next, struct airo_info, dev_list);</div><div class='del'>-		airo_print_info(ai-&gt;dev-&gt;name, "Unregistering...");</div><div class='del'>-		stop_airo_card(ai-&gt;dev, 1);</div><div class='del'>-	}</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	pci_unregister_driver(&amp;airo_driver);</div><div class='del'>-#endif</div><div class='del'>-	remove_proc_entry("driver/aironet", NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Initial Wireless Extension code for Aironet driver by :</div><div class='del'>- *	Jean Tourrilhes &lt;jt@hpl.hp.com&gt; - HPL - 17 November 00</div><div class='del'>- * Conversion to new driver API by :</div><div class='del'>- *	Jean Tourrilhes &lt;jt@hpl.hp.com&gt; - HPL - 26 March 02</div><div class='del'>- * Javier also did a good amount of work here, adding some new extensions</div><div class='del'>- * and fixing my code. Let's just say that without him this code just</div><div class='del'>- * would not work at all... - Jean II</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static u8 airo_rssi_to_dbm (tdsRssiEntry *rssi_rid, u8 rssi)</div><div class='del'>-{</div><div class='del'>-	if (!rssi_rid)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return (0x100 - rssi_rid[rssi].rssidBm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 airo_dbm_to_pct (tdsRssiEntry *rssi_rid, u8 dbm)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!rssi_rid)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 256; i++)</div><div class='del'>-		if (rssi_rid[i].rssidBm == dbm)</div><div class='del'>-			return rssi_rid[i].rssipct;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int airo_get_quality (StatusRid *status_rid, CapabilityRid *cap_rid)</div><div class='del'>-{</div><div class='del'>-	int quality = 0;</div><div class='del'>-	u16 sq;</div><div class='del'>-</div><div class='del'>-	if ((status_rid-&gt;mode &amp; cpu_to_le16(0x3f)) != cpu_to_le16(0x3f))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!(cap_rid-&gt;hardCap &amp; cpu_to_le16(8)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	sq = le16_to_cpu(status_rid-&gt;signalQuality);</div><div class='del'>-	if (memcmp(cap_rid-&gt;prodName, "350", 3))</div><div class='del'>-		if (sq &gt; 0x20)</div><div class='del'>-			quality = 0;</div><div class='del'>-		else</div><div class='del'>-			quality = 0x20 - sq;</div><div class='del'>-	else</div><div class='del'>-		if (sq &gt; 0xb0)</div><div class='del'>-			quality = 0;</div><div class='del'>-		else if (sq &lt; 0x10)</div><div class='del'>-			quality = 0xa0;</div><div class='del'>-		else</div><div class='del'>-			quality = 0xb0 - sq;</div><div class='del'>-	return quality;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define airo_get_max_quality(cap_rid) (memcmp((cap_rid)-&gt;prodName, "350", 3) ? 0x20 : 0xa0)</div><div class='del'>-#define airo_get_avg_quality(cap_rid) (memcmp((cap_rid)-&gt;prodName, "350", 3) ? 0x10 : 0x50)</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : get protocol name</div><div class='del'>- */</div><div class='del'>-static int airo_get_name(struct net_device *dev,</div><div class='del'>-			 struct iw_request_info *info,</div><div class='del'>-			 char *cwrq,</div><div class='del'>-			 char *extra)</div><div class='del'>-{</div><div class='del'>-	strcpy(cwrq, "IEEE 802.11-DS");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : set frequency</div><div class='del'>- */</div><div class='del'>-static int airo_set_freq(struct net_device *dev,</div><div class='del'>-			 struct iw_request_info *info,</div><div class='del'>-			 struct iw_freq *fwrq,</div><div class='del'>-			 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-	int rc = -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-</div><div class='del'>-	/* If setting by frequency, convert to a channel */</div><div class='del'>-	if (fwrq-&gt;e == 1) {</div><div class='del'>-		int f = fwrq-&gt;m / 100000;</div><div class='del'>-</div><div class='del'>-		/* Hack to fall through... */</div><div class='del'>-		fwrq-&gt;e = 0;</div><div class='del'>-		fwrq-&gt;m = ieee80211_frequency_to_channel(f);</div><div class='del'>-	}</div><div class='del'>-	/* Setting by channel number */</div><div class='del'>-	if (fwrq-&gt;m &lt; 0 || fwrq-&gt;m &gt; 1000 || fwrq-&gt;e &gt; 0)</div><div class='del'>-		rc = -EOPNOTSUPP;</div><div class='del'>-	else {</div><div class='del'>-		int channel = fwrq-&gt;m;</div><div class='del'>-		/* We should do a better check than that,</div><div class='del'>-		 * based on the card capability !!! */</div><div class='del'>-		if ((channel &lt; 1) || (channel &gt; 14)) {</div><div class='del'>-			airo_print_dbg(dev-&gt;name, "New channel value of %d is invalid!",</div><div class='del'>-				fwrq-&gt;m);</div><div class='del'>-			rc = -EINVAL;</div><div class='del'>-		} else {</div><div class='del'>-			readConfigRid(local, 1);</div><div class='del'>-			/* Yes ! We can set it !!! */</div><div class='del'>-			local-&gt;config.channelSet = cpu_to_le16(channel);</div><div class='del'>-			set_bit (FLAG_COMMIT, &amp;local-&gt;flags);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : get frequency</div><div class='del'>- */</div><div class='del'>-static int airo_get_freq(struct net_device *dev,</div><div class='del'>-			 struct iw_request_info *info,</div><div class='del'>-			 struct iw_freq *fwrq,</div><div class='del'>-			 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-	StatusRid status_rid;		/* Card status info */</div><div class='del'>-	int ch;</div><div class='del'>-</div><div class='del'>-	readConfigRid(local, 1);</div><div class='del'>-	if ((local-&gt;config.opmode &amp; MODE_CFG_MASK) == MODE_STA_ESS)</div><div class='del'>-		status_rid.channel = local-&gt;config.channelSet;</div><div class='del'>-	else</div><div class='del'>-		readStatusRid(local, &amp;status_rid, 1);</div><div class='del'>-</div><div class='del'>-	ch = le16_to_cpu(status_rid.channel);</div><div class='del'>-	if ((ch &gt; 0) &amp;&amp; (ch &lt; 15)) {</div><div class='del'>-		fwrq-&gt;m = 100000 *</div><div class='del'>-			ieee80211_channel_to_frequency(ch, NL80211_BAND_2GHZ);</div><div class='del'>-		fwrq-&gt;e = 1;</div><div class='del'>-	} else {</div><div class='del'>-		fwrq-&gt;m = ch;</div><div class='del'>-		fwrq-&gt;e = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : set ESSID</div><div class='del'>- */</div><div class='del'>-static int airo_set_essid(struct net_device *dev,</div><div class='del'>-			  struct iw_request_info *info,</div><div class='del'>-			  struct iw_point *dwrq,</div><div class='del'>-			  char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-	SsidRid SSID_rid;		/* SSIDs */</div><div class='del'>-</div><div class='del'>-	/* Reload the list of current SSID */</div><div class='del'>-	readSsidRid(local, &amp;SSID_rid);</div><div class='del'>-</div><div class='del'>-	/* Check if we asked for `any' */</div><div class='del'>-	if (dwrq-&gt;flags == 0) {</div><div class='del'>-		/* Just send an empty SSID list */</div><div class='del'>-		memset(&amp;SSID_rid, 0, sizeof(SSID_rid));</div><div class='del'>-	} else {</div><div class='del'>-		unsigned index = (dwrq-&gt;flags &amp; IW_ENCODE_INDEX) - 1;</div><div class='del'>-</div><div class='del'>-		/* Check the size of the string */</div><div class='del'>-		if (dwrq-&gt;length &gt; IW_ESSID_MAX_SIZE)</div><div class='del'>-			return -E2BIG ;</div><div class='del'>-</div><div class='del'>-		/* Check if index is valid */</div><div class='del'>-		if (index &gt;= ARRAY_SIZE(SSID_rid.ssids))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		/* Set the SSID */</div><div class='del'>-		memset(SSID_rid.ssids[index].ssid, 0,</div><div class='del'>-		       sizeof(SSID_rid.ssids[index].ssid));</div><div class='del'>-		memcpy(SSID_rid.ssids[index].ssid, extra, dwrq-&gt;length);</div><div class='del'>-		SSID_rid.ssids[index].len = cpu_to_le16(dwrq-&gt;length);</div><div class='del'>-	}</div><div class='del'>-	SSID_rid.len = cpu_to_le16(sizeof(SSID_rid));</div><div class='del'>-	/* Write it to the card */</div><div class='del'>-	disable_MAC(local, 1);</div><div class='del'>-	writeSsidRid(local, &amp;SSID_rid, 1);</div><div class='del'>-	enable_MAC(local, 1);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : get ESSID</div><div class='del'>- */</div><div class='del'>-static int airo_get_essid(struct net_device *dev,</div><div class='del'>-			  struct iw_request_info *info,</div><div class='del'>-			  struct iw_point *dwrq,</div><div class='del'>-			  char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-	StatusRid status_rid;		/* Card status info */</div><div class='del'>-</div><div class='del'>-	readStatusRid(local, &amp;status_rid, 1);</div><div class='del'>-</div><div class='del'>-	/* Note : if dwrq-&gt;flags != 0, we should</div><div class='del'>-	 * get the relevant SSID from the SSID list... */</div><div class='del'>-</div><div class='del'>-	/* Get the current SSID */</div><div class='del'>-	memcpy(extra, status_rid.SSID, le16_to_cpu(status_rid.SSIDlen));</div><div class='del'>-	/* If none, we may want to get the one that was set */</div><div class='del'>-</div><div class='del'>-	/* Push it out ! */</div><div class='del'>-	dwrq-&gt;length = le16_to_cpu(status_rid.SSIDlen);</div><div class='del'>-	dwrq-&gt;flags = 1; /* active */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : set AP address</div><div class='del'>- */</div><div class='del'>-static int airo_set_wap(struct net_device *dev,</div><div class='del'>-			struct iw_request_info *info,</div><div class='del'>-			struct sockaddr *awrq,</div><div class='del'>-			char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-	Cmd cmd;</div><div class='del'>-	Resp rsp;</div><div class='del'>-	APListRid *APList_rid = &amp;local-&gt;APList;</div><div class='del'>-</div><div class='del'>-	if (awrq-&gt;sa_family != ARPHRD_ETHER)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	else if (is_broadcast_ether_addr(awrq-&gt;sa_data) ||</div><div class='del'>-		 is_zero_ether_addr(awrq-&gt;sa_data)) {</div><div class='del'>-		memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-		cmd.cmd = CMD_LOSE_SYNC;</div><div class='del'>-		if (down_interruptible(&amp;local-&gt;sem))</div><div class='del'>-			return -ERESTARTSYS;</div><div class='del'>-		issuecommand(local, &amp;cmd, &amp;rsp, true);</div><div class='del'>-		up(&amp;local-&gt;sem);</div><div class='del'>-	} else {</div><div class='del'>-		memset(APList_rid, 0, sizeof(*APList_rid));</div><div class='del'>-		APList_rid-&gt;len = cpu_to_le16(sizeof(*APList_rid));</div><div class='del'>-		memcpy(APList_rid-&gt;ap[0], awrq-&gt;sa_data, ETH_ALEN);</div><div class='del'>-		disable_MAC(local, 1);</div><div class='del'>-		writeAPListRid(local, APList_rid, 1);</div><div class='del'>-		enable_MAC(local, 1);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : get AP address</div><div class='del'>- */</div><div class='del'>-static int airo_get_wap(struct net_device *dev,</div><div class='del'>-			struct iw_request_info *info,</div><div class='del'>-			struct sockaddr *awrq,</div><div class='del'>-			char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-	StatusRid status_rid;		/* Card status info */</div><div class='del'>-</div><div class='del'>-	readStatusRid(local, &amp;status_rid, 1);</div><div class='del'>-</div><div class='del'>-	/* Tentative. This seems to work, wow, I'm lucky !!! */</div><div class='del'>-	memcpy(awrq-&gt;sa_data, status_rid.bssid[0], ETH_ALEN);</div><div class='del'>-	awrq-&gt;sa_family = ARPHRD_ETHER;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : set Nickname</div><div class='del'>- */</div><div class='del'>-static int airo_set_nick(struct net_device *dev,</div><div class='del'>-			 struct iw_request_info *info,</div><div class='del'>-			 struct iw_point *dwrq,</div><div class='del'>-			 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	/* Check the size of the string */</div><div class='del'>-	if (dwrq-&gt;length &gt; 16) {</div><div class='del'>-		return -E2BIG;</div><div class='del'>-	}</div><div class='del'>-	readConfigRid(local, 1);</div><div class='del'>-	memset(local-&gt;config.nodeName, 0, sizeof(local-&gt;config.nodeName));</div><div class='del'>-	memcpy(local-&gt;config.nodeName, extra, dwrq-&gt;length);</div><div class='del'>-	set_bit (FLAG_COMMIT, &amp;local-&gt;flags);</div><div class='del'>-</div><div class='del'>-	return -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : get Nickname</div><div class='del'>- */</div><div class='del'>-static int airo_get_nick(struct net_device *dev,</div><div class='del'>-			 struct iw_request_info *info,</div><div class='del'>-			 struct iw_point *dwrq,</div><div class='del'>-			 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	readConfigRid(local, 1);</div><div class='del'>-	strncpy(extra, local-&gt;config.nodeName, 16);</div><div class='del'>-	extra[16] = '\0';</div><div class='del'>-	dwrq-&gt;length = strlen(extra);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : set Bit-Rate</div><div class='del'>- */</div><div class='del'>-static int airo_set_rate(struct net_device *dev,</div><div class='del'>-			 struct iw_request_info *info,</div><div class='del'>-			 struct iw_param *vwrq,</div><div class='del'>-			 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-	CapabilityRid cap_rid;		/* Card capability info */</div><div class='del'>-	u8	brate = 0;</div><div class='del'>-	int	i;</div><div class='del'>-</div><div class='del'>-	/* First : get a valid bit rate value */</div><div class='del'>-	readCapabilityRid(local, &amp;cap_rid, 1);</div><div class='del'>-</div><div class='del'>-	/* Which type of value ? */</div><div class='del'>-	if ((vwrq-&gt;value &lt; 8) &amp;&amp; (vwrq-&gt;value &gt;= 0)) {</div><div class='del'>-		/* Setting by rate index */</div><div class='del'>-		/* Find value in the magic rate table */</div><div class='del'>-		brate = cap_rid.supportedRates[vwrq-&gt;value];</div><div class='del'>-	} else {</div><div class='del'>-		/* Setting by frequency value */</div><div class='del'>-		u8	normvalue = (u8) (vwrq-&gt;value/500000);</div><div class='del'>-</div><div class='del'>-		/* Check if rate is valid */</div><div class='del'>-		for (i = 0 ; i &lt; 8 ; i++) {</div><div class='del'>-			if (normvalue == cap_rid.supportedRates[i]) {</div><div class='del'>-				brate = normvalue;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* -1 designed the max rate (mostly auto mode) */</div><div class='del'>-	if (vwrq-&gt;value == -1) {</div><div class='del'>-		/* Get the highest available rate */</div><div class='del'>-		for (i = 0 ; i &lt; 8 ; i++) {</div><div class='del'>-			if (cap_rid.supportedRates[i] == 0)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		if (i != 0)</div><div class='del'>-			brate = cap_rid.supportedRates[i - 1];</div><div class='del'>-	}</div><div class='del'>-	/* Check that it is valid */</div><div class='del'>-	if (brate == 0) {</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	readConfigRid(local, 1);</div><div class='del'>-	/* Now, check if we want a fixed or auto value */</div><div class='del'>-	if (vwrq-&gt;fixed == 0) {</div><div class='del'>-		/* Fill all the rates up to this max rate */</div><div class='del'>-		memset(local-&gt;config.rates, 0, 8);</div><div class='del'>-		for (i = 0 ; i &lt; 8 ; i++) {</div><div class='del'>-			local-&gt;config.rates[i] = cap_rid.supportedRates[i];</div><div class='del'>-			if (local-&gt;config.rates[i] == brate)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Fixed mode */</div><div class='del'>-		/* One rate, fixed */</div><div class='del'>-		memset(local-&gt;config.rates, 0, 8);</div><div class='del'>-		local-&gt;config.rates[0] = brate;</div><div class='del'>-	}</div><div class='del'>-	set_bit (FLAG_COMMIT, &amp;local-&gt;flags);</div><div class='del'>-</div><div class='del'>-	return -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : get Bit-Rate</div><div class='del'>- */</div><div class='del'>-static int airo_get_rate(struct net_device *dev,</div><div class='del'>-			 struct iw_request_info *info,</div><div class='del'>-			 struct iw_param *vwrq,</div><div class='del'>-			 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-	StatusRid status_rid;		/* Card status info */</div><div class='del'>-</div><div class='del'>-	readStatusRid(local, &amp;status_rid, 1);</div><div class='del'>-</div><div class='del'>-	vwrq-&gt;value = le16_to_cpu(status_rid.currentXmitRate) * 500000;</div><div class='del'>-	/* If more than one rate, set auto */</div><div class='del'>-	readConfigRid(local, 1);</div><div class='del'>-	vwrq-&gt;fixed = (local-&gt;config.rates[1] == 0);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : set RTS threshold</div><div class='del'>- */</div><div class='del'>-static int airo_set_rts(struct net_device *dev,</div><div class='del'>-			struct iw_request_info *info,</div><div class='del'>-			struct iw_param *vwrq,</div><div class='del'>-			char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-	int rthr = vwrq-&gt;value;</div><div class='del'>-</div><div class='del'>-	if (vwrq-&gt;disabled)</div><div class='del'>-		rthr = AIRO_DEF_MTU;</div><div class='del'>-	if ((rthr &lt; 0) || (rthr &gt; AIRO_DEF_MTU)) {</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	readConfigRid(local, 1);</div><div class='del'>-	local-&gt;config.rtsThres = cpu_to_le16(rthr);</div><div class='del'>-	set_bit (FLAG_COMMIT, &amp;local-&gt;flags);</div><div class='del'>-</div><div class='del'>-	return -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : get RTS threshold</div><div class='del'>- */</div><div class='del'>-static int airo_get_rts(struct net_device *dev,</div><div class='del'>-			struct iw_request_info *info,</div><div class='del'>-			struct iw_param *vwrq,</div><div class='del'>-			char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	readConfigRid(local, 1);</div><div class='del'>-	vwrq-&gt;value = le16_to_cpu(local-&gt;config.rtsThres);</div><div class='del'>-	vwrq-&gt;disabled = (vwrq-&gt;value &gt;= AIRO_DEF_MTU);</div><div class='del'>-	vwrq-&gt;fixed = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : set Fragmentation threshold</div><div class='del'>- */</div><div class='del'>-static int airo_set_frag(struct net_device *dev,</div><div class='del'>-			 struct iw_request_info *info,</div><div class='del'>-			 struct iw_param *vwrq,</div><div class='del'>-			 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-	int fthr = vwrq-&gt;value;</div><div class='del'>-</div><div class='del'>-	if (vwrq-&gt;disabled)</div><div class='del'>-		fthr = AIRO_DEF_MTU;</div><div class='del'>-	if ((fthr &lt; 256) || (fthr &gt; AIRO_DEF_MTU)) {</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	fthr &amp;= ~0x1;	/* Get an even value - is it really needed ??? */</div><div class='del'>-	readConfigRid(local, 1);</div><div class='del'>-	local-&gt;config.fragThresh = cpu_to_le16(fthr);</div><div class='del'>-	set_bit (FLAG_COMMIT, &amp;local-&gt;flags);</div><div class='del'>-</div><div class='del'>-	return -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : get Fragmentation threshold</div><div class='del'>- */</div><div class='del'>-static int airo_get_frag(struct net_device *dev,</div><div class='del'>-			 struct iw_request_info *info,</div><div class='del'>-			 struct iw_param *vwrq,</div><div class='del'>-			 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	readConfigRid(local, 1);</div><div class='del'>-	vwrq-&gt;value = le16_to_cpu(local-&gt;config.fragThresh);</div><div class='del'>-	vwrq-&gt;disabled = (vwrq-&gt;value &gt;= AIRO_DEF_MTU);</div><div class='del'>-	vwrq-&gt;fixed = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : set Mode of Operation</div><div class='del'>- */</div><div class='del'>-static int airo_set_mode(struct net_device *dev,</div><div class='del'>-			 struct iw_request_info *info,</div><div class='del'>-			 __u32 *uwrq,</div><div class='del'>-			 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-	int reset = 0;</div><div class='del'>-</div><div class='del'>-	readConfigRid(local, 1);</div><div class='del'>-	if (sniffing_mode(local))</div><div class='del'>-		reset = 1;</div><div class='del'>-</div><div class='del'>-	switch(*uwrq) {</div><div class='del'>-		case IW_MODE_ADHOC:</div><div class='del'>-			local-&gt;config.opmode &amp;= ~MODE_CFG_MASK;</div><div class='del'>-			local-&gt;config.opmode |= MODE_STA_IBSS;</div><div class='del'>-			local-&gt;config.rmode &amp;= ~RXMODE_FULL_MASK;</div><div class='del'>-			local-&gt;config.scanMode = SCANMODE_ACTIVE;</div><div class='del'>-			clear_bit (FLAG_802_11, &amp;local-&gt;flags);</div><div class='del'>-			break;</div><div class='del'>-		case IW_MODE_INFRA:</div><div class='del'>-			local-&gt;config.opmode &amp;= ~MODE_CFG_MASK;</div><div class='del'>-			local-&gt;config.opmode |= MODE_STA_ESS;</div><div class='del'>-			local-&gt;config.rmode &amp;= ~RXMODE_FULL_MASK;</div><div class='del'>-			local-&gt;config.scanMode = SCANMODE_ACTIVE;</div><div class='del'>-			clear_bit (FLAG_802_11, &amp;local-&gt;flags);</div><div class='del'>-			break;</div><div class='del'>-		case IW_MODE_MASTER:</div><div class='del'>-			local-&gt;config.opmode &amp;= ~MODE_CFG_MASK;</div><div class='del'>-			local-&gt;config.opmode |= MODE_AP;</div><div class='del'>-			local-&gt;config.rmode &amp;= ~RXMODE_FULL_MASK;</div><div class='del'>-			local-&gt;config.scanMode = SCANMODE_ACTIVE;</div><div class='del'>-			clear_bit (FLAG_802_11, &amp;local-&gt;flags);</div><div class='del'>-			break;</div><div class='del'>-		case IW_MODE_REPEAT:</div><div class='del'>-			local-&gt;config.opmode &amp;= ~MODE_CFG_MASK;</div><div class='del'>-			local-&gt;config.opmode |= MODE_AP_RPTR;</div><div class='del'>-			local-&gt;config.rmode &amp;= ~RXMODE_FULL_MASK;</div><div class='del'>-			local-&gt;config.scanMode = SCANMODE_ACTIVE;</div><div class='del'>-			clear_bit (FLAG_802_11, &amp;local-&gt;flags);</div><div class='del'>-			break;</div><div class='del'>-		case IW_MODE_MONITOR:</div><div class='del'>-			local-&gt;config.opmode &amp;= ~MODE_CFG_MASK;</div><div class='del'>-			local-&gt;config.opmode |= MODE_STA_ESS;</div><div class='del'>-			local-&gt;config.rmode &amp;= ~RXMODE_FULL_MASK;</div><div class='del'>-			local-&gt;config.rmode |= RXMODE_RFMON | RXMODE_DISABLE_802_3_HEADER;</div><div class='del'>-			local-&gt;config.scanMode = SCANMODE_PASSIVE;</div><div class='del'>-			set_bit (FLAG_802_11, &amp;local-&gt;flags);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (reset)</div><div class='del'>-		set_bit (FLAG_RESET, &amp;local-&gt;flags);</div><div class='del'>-	set_bit (FLAG_COMMIT, &amp;local-&gt;flags);</div><div class='del'>-</div><div class='del'>-	return -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : get Mode of Operation</div><div class='del'>- */</div><div class='del'>-static int airo_get_mode(struct net_device *dev,</div><div class='del'>-			 struct iw_request_info *info,</div><div class='del'>-			 __u32 *uwrq,</div><div class='del'>-			 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	readConfigRid(local, 1);</div><div class='del'>-	/* If not managed, assume it's ad-hoc */</div><div class='del'>-	switch (local-&gt;config.opmode &amp; MODE_CFG_MASK) {</div><div class='del'>-		case MODE_STA_ESS:</div><div class='del'>-			*uwrq = IW_MODE_INFRA;</div><div class='del'>-			break;</div><div class='del'>-		case MODE_AP:</div><div class='del'>-			*uwrq = IW_MODE_MASTER;</div><div class='del'>-			break;</div><div class='del'>-		case MODE_AP_RPTR:</div><div class='del'>-			*uwrq = IW_MODE_REPEAT;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			*uwrq = IW_MODE_ADHOC;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int valid_index(struct airo_info *ai, int index)</div><div class='del'>-{</div><div class='del'>-	return (index &gt;= 0) &amp;&amp; (index &lt;= ai-&gt;max_wep_idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : set Encryption Key</div><div class='del'>- */</div><div class='del'>-static int airo_set_encode(struct net_device *dev,</div><div class='del'>-			   struct iw_request_info *info,</div><div class='del'>-			   struct iw_point *dwrq,</div><div class='del'>-			   char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-	int perm = (dwrq-&gt;flags &amp; IW_ENCODE_TEMP ? 0 : 1);</div><div class='del'>-	__le16 currentAuthType = local-&gt;config.authType;</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	if (!local-&gt;wep_capable)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	readConfigRid(local, 1);</div><div class='del'>-</div><div class='del'>-	/* Basic checking: do we have a key to set ?</div><div class='del'>-	 * Note : with the new API, it's impossible to get a NULL pointer.</div><div class='del'>-	 * Therefore, we need to check a key size == 0 instead.</div><div class='del'>-	 * New version of iwconfig properly set the IW_ENCODE_NOKEY flag</div><div class='del'>-	 * when no key is present (only change flags), but older versions</div><div class='del'>-	 * don't do it. - Jean II */</div><div class='del'>-	if (dwrq-&gt;length &gt; 0) {</div><div class='del'>-		wep_key_t key;</div><div class='del'>-		int index = (dwrq-&gt;flags &amp; IW_ENCODE_INDEX) - 1;</div><div class='del'>-		int current_index;</div><div class='del'>-</div><div class='del'>-		/* Check the size of the key */</div><div class='del'>-		if (dwrq-&gt;length &gt; MAX_KEY_SIZE) {</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		current_index = get_wep_tx_idx(local);</div><div class='del'>-		if (current_index &lt; 0)</div><div class='del'>-			current_index = 0;</div><div class='del'>-</div><div class='del'>-		/* Check the index (none -&gt; use current) */</div><div class='del'>-		if (!valid_index(local, index))</div><div class='del'>-			index = current_index;</div><div class='del'>-</div><div class='del'>-		/* Set the length */</div><div class='del'>-		if (dwrq-&gt;length &gt; MIN_KEY_SIZE)</div><div class='del'>-			key.len = MAX_KEY_SIZE;</div><div class='del'>-		else</div><div class='del'>-			key.len = MIN_KEY_SIZE;</div><div class='del'>-		/* Check if the key is not marked as invalid */</div><div class='del'>-		if (!(dwrq-&gt;flags &amp; IW_ENCODE_NOKEY)) {</div><div class='del'>-			/* Cleanup */</div><div class='del'>-			memset(key.key, 0, MAX_KEY_SIZE);</div><div class='del'>-			/* Copy the key in the driver */</div><div class='del'>-			memcpy(key.key, extra, dwrq-&gt;length);</div><div class='del'>-			/* Send the key to the card */</div><div class='del'>-			rc = set_wep_key(local, index, key.key, key.len, perm, 1);</div><div class='del'>-			if (rc &lt; 0) {</div><div class='del'>-				airo_print_err(local-&gt;dev-&gt;name, "failed to set"</div><div class='del'>-				               " WEP key at index %d: %d.",</div><div class='del'>-				               index, rc);</div><div class='del'>-				return rc;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		/* WE specify that if a valid key is set, encryption</div><div class='del'>-		 * should be enabled (user may turn it off later)</div><div class='del'>-		 * This is also how "iwconfig ethX key on" works */</div><div class='del'>-		if ((index == current_index) &amp;&amp; (key.len &gt; 0) &amp;&amp;</div><div class='del'>-		   (local-&gt;config.authType == AUTH_OPEN))</div><div class='del'>-			set_auth_type(local, AUTH_ENCRYPT);</div><div class='del'>-	} else {</div><div class='del'>-		/* Do we want to just set the transmit key index ? */</div><div class='del'>-		int index = (dwrq-&gt;flags &amp; IW_ENCODE_INDEX) - 1;</div><div class='del'>-		if (valid_index(local, index)) {</div><div class='del'>-			rc = set_wep_tx_idx(local, index, perm, 1);</div><div class='del'>-			if (rc &lt; 0) {</div><div class='del'>-				airo_print_err(local-&gt;dev-&gt;name, "failed to set"</div><div class='del'>-				               " WEP transmit index to %d: %d.",</div><div class='del'>-				               index, rc);</div><div class='del'>-				return rc;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			/* Don't complain if only change the mode */</div><div class='del'>-			if (!(dwrq-&gt;flags &amp; IW_ENCODE_MODE))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* Read the flags */</div><div class='del'>-	if (dwrq-&gt;flags &amp; IW_ENCODE_DISABLED)</div><div class='del'>-		set_auth_type(local, AUTH_OPEN);	/* disable encryption */</div><div class='del'>-	if (dwrq-&gt;flags &amp; IW_ENCODE_RESTRICTED)</div><div class='del'>-		set_auth_type(local, AUTH_SHAREDKEY);	/* Only Both */</div><div class='del'>-	if (dwrq-&gt;flags &amp; IW_ENCODE_OPEN)</div><div class='del'>-		set_auth_type(local, AUTH_ENCRYPT);	/* Only Wep */</div><div class='del'>-	/* Commit the changes to flags if needed */</div><div class='del'>-	if (local-&gt;config.authType != currentAuthType)</div><div class='del'>-		set_bit (FLAG_COMMIT, &amp;local-&gt;flags);</div><div class='del'>-	return -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : get Encryption Key</div><div class='del'>- */</div><div class='del'>-static int airo_get_encode(struct net_device *dev,</div><div class='del'>-			   struct iw_request_info *info,</div><div class='del'>-			   struct iw_point *dwrq,</div><div class='del'>-			   char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-	int index = (dwrq-&gt;flags &amp; IW_ENCODE_INDEX) - 1;</div><div class='del'>-	int wep_key_len;</div><div class='del'>-	u8 buf[16];</div><div class='del'>-</div><div class='del'>-	if (!local-&gt;wep_capable)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	readConfigRid(local, 1);</div><div class='del'>-</div><div class='del'>-	/* Check encryption mode */</div><div class='del'>-	switch(local-&gt;config.authType)	{</div><div class='del'>-		case AUTH_ENCRYPT:</div><div class='del'>-			dwrq-&gt;flags = IW_ENCODE_OPEN;</div><div class='del'>-			break;</div><div class='del'>-		case AUTH_SHAREDKEY:</div><div class='del'>-			dwrq-&gt;flags = IW_ENCODE_RESTRICTED;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-		case AUTH_OPEN:</div><div class='del'>-			dwrq-&gt;flags = IW_ENCODE_DISABLED;</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	/* We can't return the key, so set the proper flag and return zero */</div><div class='del'>-	dwrq-&gt;flags |= IW_ENCODE_NOKEY;</div><div class='del'>-	memset(extra, 0, 16);</div><div class='del'>-</div><div class='del'>-	/* Which key do we want ? -1 -&gt; tx index */</div><div class='del'>-	if (!valid_index(local, index)) {</div><div class='del'>-		index = get_wep_tx_idx(local);</div><div class='del'>-		if (index &lt; 0)</div><div class='del'>-			index = 0;</div><div class='del'>-	}</div><div class='del'>-	dwrq-&gt;flags |= index + 1;</div><div class='del'>-</div><div class='del'>-	/* Copy the key to the user buffer */</div><div class='del'>-	wep_key_len = get_wep_key(local, index, &amp;buf[0], sizeof(buf));</div><div class='del'>-	if (wep_key_len &lt; 0) {</div><div class='del'>-		dwrq-&gt;length = 0;</div><div class='del'>-	} else {</div><div class='del'>-		dwrq-&gt;length = wep_key_len;</div><div class='del'>-		memcpy(extra, buf, dwrq-&gt;length);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : set extended Encryption parameters</div><div class='del'>- */</div><div class='del'>-static int airo_set_encodeext(struct net_device *dev,</div><div class='del'>-			   struct iw_request_info *info,</div><div class='del'>-			    union iwreq_data *wrqu,</div><div class='del'>-			    char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-	struct iw_point *encoding = &amp;wrqu-&gt;encoding;</div><div class='del'>-	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;</div><div class='del'>-	int perm = (encoding-&gt;flags &amp; IW_ENCODE_TEMP ? 0 : 1);</div><div class='del'>-	__le16 currentAuthType = local-&gt;config.authType;</div><div class='del'>-	int idx, key_len, alg = ext-&gt;alg, set_key = 1, rc;</div><div class='del'>-	wep_key_t key;</div><div class='del'>-</div><div class='del'>-	if (!local-&gt;wep_capable)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	readConfigRid(local, 1);</div><div class='del'>-</div><div class='del'>-	/* Determine and validate the key index */</div><div class='del'>-	idx = encoding-&gt;flags &amp; IW_ENCODE_INDEX;</div><div class='del'>-	if (idx) {</div><div class='del'>-		if (!valid_index(local, idx - 1))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		idx--;</div><div class='del'>-	} else {</div><div class='del'>-		idx = get_wep_tx_idx(local);</div><div class='del'>-		if (idx &lt; 0)</div><div class='del'>-			idx = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (encoding-&gt;flags &amp; IW_ENCODE_DISABLED)</div><div class='del'>-		alg = IW_ENCODE_ALG_NONE;</div><div class='del'>-</div><div class='del'>-	if (ext-&gt;ext_flags &amp; IW_ENCODE_EXT_SET_TX_KEY) {</div><div class='del'>-		/* Only set transmit key index here, actual</div><div class='del'>-		 * key is set below if needed.</div><div class='del'>-		 */</div><div class='del'>-		rc = set_wep_tx_idx(local, idx, perm, 1);</div><div class='del'>-		if (rc &lt; 0) {</div><div class='del'>-			airo_print_err(local-&gt;dev-&gt;name, "failed to set "</div><div class='del'>-			               "WEP transmit index to %d: %d.",</div><div class='del'>-			               idx, rc);</div><div class='del'>-			return rc;</div><div class='del'>-		}</div><div class='del'>-		set_key = ext-&gt;key_len &gt; 0 ? 1 : 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (set_key) {</div><div class='del'>-		/* Set the requested key first */</div><div class='del'>-		memset(key.key, 0, MAX_KEY_SIZE);</div><div class='del'>-		switch (alg) {</div><div class='del'>-		case IW_ENCODE_ALG_NONE:</div><div class='del'>-			key.len = 0;</div><div class='del'>-			break;</div><div class='del'>-		case IW_ENCODE_ALG_WEP:</div><div class='del'>-			if (ext-&gt;key_len &gt; MIN_KEY_SIZE) {</div><div class='del'>-				key.len = MAX_KEY_SIZE;</div><div class='del'>-			} else if (ext-&gt;key_len &gt; 0) {</div><div class='del'>-				key.len = MIN_KEY_SIZE;</div><div class='del'>-			} else {</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			key_len = min (ext-&gt;key_len, key.len);</div><div class='del'>-			memcpy(key.key, ext-&gt;key, key_len);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		if (key.len == 0) {</div><div class='del'>-			rc = set_wep_tx_idx(local, idx, perm, 1);</div><div class='del'>-			if (rc &lt; 0) {</div><div class='del'>-				airo_print_err(local-&gt;dev-&gt;name,</div><div class='del'>-					       "failed to set WEP transmit index to %d: %d.",</div><div class='del'>-					       idx, rc);</div><div class='del'>-				return rc;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			rc = set_wep_key(local, idx, key.key, key.len, perm, 1);</div><div class='del'>-			if (rc &lt; 0) {</div><div class='del'>-				airo_print_err(local-&gt;dev-&gt;name,</div><div class='del'>-					       "failed to set WEP key at index %d: %d.",</div><div class='del'>-					       idx, rc);</div><div class='del'>-				return rc;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Read the flags */</div><div class='del'>-	if (encoding-&gt;flags &amp; IW_ENCODE_DISABLED)</div><div class='del'>-		set_auth_type(local, AUTH_OPEN);	/* disable encryption */</div><div class='del'>-	if (encoding-&gt;flags &amp; IW_ENCODE_RESTRICTED)</div><div class='del'>-		set_auth_type(local, AUTH_SHAREDKEY);	/* Only Both */</div><div class='del'>-	if (encoding-&gt;flags &amp; IW_ENCODE_OPEN)</div><div class='del'>-		set_auth_type(local, AUTH_ENCRYPT);</div><div class='del'>-	/* Commit the changes to flags if needed */</div><div class='del'>-	if (local-&gt;config.authType != currentAuthType)</div><div class='del'>-		set_bit (FLAG_COMMIT, &amp;local-&gt;flags);</div><div class='del'>-</div><div class='del'>-	return -EINPROGRESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : get extended Encryption parameters</div><div class='del'>- */</div><div class='del'>-static int airo_get_encodeext(struct net_device *dev,</div><div class='del'>-			    struct iw_request_info *info,</div><div class='del'>-			    union iwreq_data *wrqu,</div><div class='del'>-			    char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-	struct iw_point *encoding = &amp;wrqu-&gt;encoding;</div><div class='del'>-	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;</div><div class='del'>-	int idx, max_key_len, wep_key_len;</div><div class='del'>-	u8 buf[16];</div><div class='del'>-</div><div class='del'>-	if (!local-&gt;wep_capable)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	readConfigRid(local, 1);</div><div class='del'>-</div><div class='del'>-	max_key_len = encoding-&gt;length - sizeof(*ext);</div><div class='del'>-	if (max_key_len &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	idx = encoding-&gt;flags &amp; IW_ENCODE_INDEX;</div><div class='del'>-	if (idx) {</div><div class='del'>-		if (!valid_index(local, idx - 1))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		idx--;</div><div class='del'>-	} else {</div><div class='del'>-		idx = get_wep_tx_idx(local);</div><div class='del'>-		if (idx &lt; 0)</div><div class='del'>-			idx = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	encoding-&gt;flags = idx + 1;</div><div class='del'>-	memset(ext, 0, sizeof(*ext));</div><div class='del'>-</div><div class='del'>-	/* Check encryption mode */</div><div class='del'>-	switch(local-&gt;config.authType) {</div><div class='del'>-		case AUTH_ENCRYPT:</div><div class='del'>-			encoding-&gt;flags = IW_ENCODE_ALG_WEP | IW_ENCODE_ENABLED;</div><div class='del'>-			break;</div><div class='del'>-		case AUTH_SHAREDKEY:</div><div class='del'>-			encoding-&gt;flags = IW_ENCODE_ALG_WEP | IW_ENCODE_ENABLED;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-		case AUTH_OPEN:</div><div class='del'>-			encoding-&gt;flags = IW_ENCODE_ALG_NONE | IW_ENCODE_DISABLED;</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	/* We can't return the key, so set the proper flag and return zero */</div><div class='del'>-	encoding-&gt;flags |= IW_ENCODE_NOKEY;</div><div class='del'>-	memset(extra, 0, 16);</div><div class='del'>-</div><div class='del'>-	/* Copy the key to the user buffer */</div><div class='del'>-	wep_key_len = get_wep_key(local, idx, &amp;buf[0], sizeof(buf));</div><div class='del'>-	if (wep_key_len &lt; 0) {</div><div class='del'>-		ext-&gt;key_len = 0;</div><div class='del'>-	} else {</div><div class='del'>-		ext-&gt;key_len = wep_key_len;</div><div class='del'>-		memcpy(extra, buf, ext-&gt;key_len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : set extended authentication parameters</div><div class='del'>- */</div><div class='del'>-static int airo_set_auth(struct net_device *dev,</div><div class='del'>-			       struct iw_request_info *info,</div><div class='del'>-			       union iwreq_data *wrqu, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-	struct iw_param *param = &amp;wrqu-&gt;param;</div><div class='del'>-	__le16 currentAuthType = local-&gt;config.authType;</div><div class='del'>-</div><div class='del'>-	switch (param-&gt;flags &amp; IW_AUTH_INDEX) {</div><div class='del'>-	case IW_AUTH_WPA_VERSION:</div><div class='del'>-	case IW_AUTH_CIPHER_PAIRWISE:</div><div class='del'>-	case IW_AUTH_CIPHER_GROUP:</div><div class='del'>-	case IW_AUTH_KEY_MGMT:</div><div class='del'>-	case IW_AUTH_RX_UNENCRYPTED_EAPOL:</div><div class='del'>-	case IW_AUTH_PRIVACY_INVOKED:</div><div class='del'>-		/*</div><div class='del'>-		 * airo does not use these parameters</div><div class='del'>-		 */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_DROP_UNENCRYPTED:</div><div class='del'>-		if (param-&gt;value) {</div><div class='del'>-			/* Only change auth type if unencrypted */</div><div class='del'>-			if (currentAuthType == AUTH_OPEN)</div><div class='del'>-				set_auth_type(local, AUTH_ENCRYPT);</div><div class='del'>-		} else {</div><div class='del'>-			set_auth_type(local, AUTH_OPEN);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Commit the changes to flags if needed */</div><div class='del'>-		if (local-&gt;config.authType != currentAuthType)</div><div class='del'>-			set_bit (FLAG_COMMIT, &amp;local-&gt;flags);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_80211_AUTH_ALG: {</div><div class='del'>-			if (param-&gt;value &amp; IW_AUTH_ALG_SHARED_KEY) {</div><div class='del'>-				set_auth_type(local, AUTH_SHAREDKEY);</div><div class='del'>-			} else if (param-&gt;value &amp; IW_AUTH_ALG_OPEN_SYSTEM) {</div><div class='del'>-				/* We don't know here if WEP open system or</div><div class='del'>-				 * unencrypted mode was requested - so use the</div><div class='del'>-				 * last mode (of these two) used last time</div><div class='del'>-				 */</div><div class='del'>-				set_auth_type(local, local-&gt;last_auth);</div><div class='del'>-			} else</div><div class='del'>-				return -EINVAL;</div><div class='del'>-</div><div class='del'>-			/* Commit the changes to flags if needed */</div><div class='del'>-			if (local-&gt;config.authType != currentAuthType)</div><div class='del'>-				set_bit (FLAG_COMMIT, &amp;local-&gt;flags);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_WPA_ENABLED:</div><div class='del'>-		/* Silently accept disable of WPA */</div><div class='del'>-		if (param-&gt;value &gt; 0)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-	return -EINPROGRESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : get extended authentication parameters</div><div class='del'>- */</div><div class='del'>-static int airo_get_auth(struct net_device *dev,</div><div class='del'>-			       struct iw_request_info *info,</div><div class='del'>-			       union iwreq_data *wrqu, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-	struct iw_param *param = &amp;wrqu-&gt;param;</div><div class='del'>-	__le16 currentAuthType = local-&gt;config.authType;</div><div class='del'>-</div><div class='del'>-	switch (param-&gt;flags &amp; IW_AUTH_INDEX) {</div><div class='del'>-	case IW_AUTH_DROP_UNENCRYPTED:</div><div class='del'>-		switch (currentAuthType) {</div><div class='del'>-		case AUTH_SHAREDKEY:</div><div class='del'>-		case AUTH_ENCRYPT:</div><div class='del'>-			param-&gt;value = 1;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			param-&gt;value = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_80211_AUTH_ALG:</div><div class='del'>-		switch (currentAuthType) {</div><div class='del'>-		case AUTH_SHAREDKEY:</div><div class='del'>-			param-&gt;value = IW_AUTH_ALG_SHARED_KEY;</div><div class='del'>-			break;</div><div class='del'>-		case AUTH_ENCRYPT:</div><div class='del'>-		default:</div><div class='del'>-			param-&gt;value = IW_AUTH_ALG_OPEN_SYSTEM;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_WPA_ENABLED:</div><div class='del'>-		param-&gt;value = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : set Tx-Power</div><div class='del'>- */</div><div class='del'>-static int airo_set_txpow(struct net_device *dev,</div><div class='del'>-			  struct iw_request_info *info,</div><div class='del'>-			  struct iw_param *vwrq,</div><div class='del'>-			  char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-	CapabilityRid cap_rid;		/* Card capability info */</div><div class='del'>-	int i;</div><div class='del'>-	int rc = -EINVAL;</div><div class='del'>-	__le16 v = cpu_to_le16(vwrq-&gt;value);</div><div class='del'>-</div><div class='del'>-	readCapabilityRid(local, &amp;cap_rid, 1);</div><div class='del'>-</div><div class='del'>-	if (vwrq-&gt;disabled) {</div><div class='del'>-		set_bit (FLAG_RADIO_OFF, &amp;local-&gt;flags);</div><div class='del'>-		set_bit (FLAG_COMMIT, &amp;local-&gt;flags);</div><div class='del'>-		return -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-	}</div><div class='del'>-	if (vwrq-&gt;flags != IW_TXPOW_MWATT) {</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	clear_bit (FLAG_RADIO_OFF, &amp;local-&gt;flags);</div><div class='del'>-	for (i = 0; i &lt; 8 &amp;&amp; cap_rid.txPowerLevels[i]; i++)</div><div class='del'>-		if (v == cap_rid.txPowerLevels[i]) {</div><div class='del'>-			readConfigRid(local, 1);</div><div class='del'>-			local-&gt;config.txPower = v;</div><div class='del'>-			set_bit (FLAG_COMMIT, &amp;local-&gt;flags);</div><div class='del'>-			rc = -EINPROGRESS;	/* Call commit handler */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : get Tx-Power</div><div class='del'>- */</div><div class='del'>-static int airo_get_txpow(struct net_device *dev,</div><div class='del'>-			  struct iw_request_info *info,</div><div class='del'>-			  struct iw_param *vwrq,</div><div class='del'>-			  char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	readConfigRid(local, 1);</div><div class='del'>-	vwrq-&gt;value = le16_to_cpu(local-&gt;config.txPower);</div><div class='del'>-	vwrq-&gt;fixed = 1;	/* No power control */</div><div class='del'>-	vwrq-&gt;disabled = test_bit(FLAG_RADIO_OFF, &amp;local-&gt;flags);</div><div class='del'>-	vwrq-&gt;flags = IW_TXPOW_MWATT;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : set Retry limits</div><div class='del'>- */</div><div class='del'>-static int airo_set_retry(struct net_device *dev,</div><div class='del'>-			  struct iw_request_info *info,</div><div class='del'>-			  struct iw_param *vwrq,</div><div class='del'>-			  char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-	int rc = -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (vwrq-&gt;disabled) {</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	readConfigRid(local, 1);</div><div class='del'>-	if (vwrq-&gt;flags &amp; IW_RETRY_LIMIT) {</div><div class='del'>-		__le16 v = cpu_to_le16(vwrq-&gt;value);</div><div class='del'>-		if (vwrq-&gt;flags &amp; IW_RETRY_LONG)</div><div class='del'>-			local-&gt;config.longRetryLimit = v;</div><div class='del'>-		else if (vwrq-&gt;flags &amp; IW_RETRY_SHORT)</div><div class='del'>-			local-&gt;config.shortRetryLimit = v;</div><div class='del'>-		else {</div><div class='del'>-			/* No modifier : set both */</div><div class='del'>-			local-&gt;config.longRetryLimit = v;</div><div class='del'>-			local-&gt;config.shortRetryLimit = v;</div><div class='del'>-		}</div><div class='del'>-		set_bit (FLAG_COMMIT, &amp;local-&gt;flags);</div><div class='del'>-		rc = -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-	}</div><div class='del'>-	if (vwrq-&gt;flags &amp; IW_RETRY_LIFETIME) {</div><div class='del'>-		local-&gt;config.txLifetime = cpu_to_le16(vwrq-&gt;value / 1024);</div><div class='del'>-		set_bit (FLAG_COMMIT, &amp;local-&gt;flags);</div><div class='del'>-		rc = -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-	}</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : get Retry limits</div><div class='del'>- */</div><div class='del'>-static int airo_get_retry(struct net_device *dev,</div><div class='del'>-			  struct iw_request_info *info,</div><div class='del'>-			  struct iw_param *vwrq,</div><div class='del'>-			  char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	vwrq-&gt;disabled = 0;      /* Can't be disabled */</div><div class='del'>-</div><div class='del'>-	readConfigRid(local, 1);</div><div class='del'>-	/* Note : by default, display the min retry number */</div><div class='del'>-	if ((vwrq-&gt;flags &amp; IW_RETRY_TYPE) == IW_RETRY_LIFETIME) {</div><div class='del'>-		vwrq-&gt;flags = IW_RETRY_LIFETIME;</div><div class='del'>-		vwrq-&gt;value = le16_to_cpu(local-&gt;config.txLifetime) * 1024;</div><div class='del'>-	} else if ((vwrq-&gt;flags &amp; IW_RETRY_LONG)) {</div><div class='del'>-		vwrq-&gt;flags = IW_RETRY_LIMIT | IW_RETRY_LONG;</div><div class='del'>-		vwrq-&gt;value = le16_to_cpu(local-&gt;config.longRetryLimit);</div><div class='del'>-	} else {</div><div class='del'>-		vwrq-&gt;flags = IW_RETRY_LIMIT;</div><div class='del'>-		vwrq-&gt;value = le16_to_cpu(local-&gt;config.shortRetryLimit);</div><div class='del'>-		if (local-&gt;config.shortRetryLimit != local-&gt;config.longRetryLimit)</div><div class='del'>-			vwrq-&gt;flags |= IW_RETRY_SHORT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : get range info</div><div class='del'>- */</div><div class='del'>-static int airo_get_range(struct net_device *dev,</div><div class='del'>-			  struct iw_request_info *info,</div><div class='del'>-			  struct iw_point *dwrq,</div><div class='del'>-			  char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-	struct iw_range *range = (struct iw_range *) extra;</div><div class='del'>-	CapabilityRid cap_rid;		/* Card capability info */</div><div class='del'>-	int		i;</div><div class='del'>-	int		k;</div><div class='del'>-</div><div class='del'>-	readCapabilityRid(local, &amp;cap_rid, 1);</div><div class='del'>-</div><div class='del'>-	dwrq-&gt;length = sizeof(struct iw_range);</div><div class='del'>-	memset(range, 0, sizeof(*range));</div><div class='del'>-	range-&gt;min_nwid = 0x0000;</div><div class='del'>-	range-&gt;max_nwid = 0x0000;</div><div class='del'>-	range-&gt;num_channels = 14;</div><div class='del'>-	/* Should be based on cap_rid.country to give only</div><div class='del'>-	 * what the current card support */</div><div class='del'>-	k = 0;</div><div class='del'>-	for (i = 0; i &lt; 14; i++) {</div><div class='del'>-		range-&gt;freq[k].i = i + 1; /* List index */</div><div class='del'>-		range-&gt;freq[k].m = 100000 *</div><div class='del'>-		     ieee80211_channel_to_frequency(i + 1, NL80211_BAND_2GHZ);</div><div class='del'>-		range-&gt;freq[k++].e = 1;	/* Values in MHz -&gt; * 10^5 * 10 */</div><div class='del'>-	}</div><div class='del'>-	range-&gt;num_frequency = k;</div><div class='del'>-</div><div class='del'>-	range-&gt;sensitivity = 65535;</div><div class='del'>-</div><div class='del'>-	/* Hum... Should put the right values there */</div><div class='del'>-	if (local-&gt;rssi)</div><div class='del'>-		range-&gt;max_qual.qual = 100;	/* % */</div><div class='del'>-	else</div><div class='del'>-		range-&gt;max_qual.qual = airo_get_max_quality(&amp;cap_rid);</div><div class='del'>-	range-&gt;max_qual.level = 0x100 - 120;	/* -120 dBm */</div><div class='del'>-	range-&gt;max_qual.noise = 0x100 - 120;	/* -120 dBm */</div><div class='del'>-</div><div class='del'>-	/* Experimental measurements - boundary 11/5.5 Mb/s */</div><div class='del'>-	/* Note : with or without the (local-&gt;rssi), results</div><div class='del'>-	 * are somewhat different. - Jean II */</div><div class='del'>-	if (local-&gt;rssi) {</div><div class='del'>-		range-&gt;avg_qual.qual = 50;		/* % */</div><div class='del'>-		range-&gt;avg_qual.level = 0x100 - 70;	/* -70 dBm */</div><div class='del'>-	} else {</div><div class='del'>-		range-&gt;avg_qual.qual = airo_get_avg_quality(&amp;cap_rid);</div><div class='del'>-		range-&gt;avg_qual.level = 0x100 - 80;	/* -80 dBm */</div><div class='del'>-	}</div><div class='del'>-	range-&gt;avg_qual.noise = 0x100 - 85;		/* -85 dBm */</div><div class='del'>-</div><div class='del'>-	for (i = 0 ; i &lt; 8 ; i++) {</div><div class='del'>-		range-&gt;bitrate[i] = cap_rid.supportedRates[i] * 500000;</div><div class='del'>-		if (range-&gt;bitrate[i] == 0)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	range-&gt;num_bitrates = i;</div><div class='del'>-</div><div class='del'>-	/* Set an indication of the max TCP throughput</div><div class='del'>-	 * in bit/s that we can expect using this interface.</div><div class='del'>-	 * May be use for QoS stuff... Jean II */</div><div class='del'>-	if (i &gt; 2)</div><div class='del'>-		range-&gt;throughput = 5000 * 1000;</div><div class='del'>-	else</div><div class='del'>-		range-&gt;throughput = 1500 * 1000;</div><div class='del'>-</div><div class='del'>-	range-&gt;min_rts = 0;</div><div class='del'>-	range-&gt;max_rts = AIRO_DEF_MTU;</div><div class='del'>-	range-&gt;min_frag = 256;</div><div class='del'>-	range-&gt;max_frag = AIRO_DEF_MTU;</div><div class='del'>-</div><div class='del'>-	if (cap_rid.softCap &amp; cpu_to_le16(2)) {</div><div class='del'>-		// WEP: RC4 40 bits</div><div class='del'>-		range-&gt;encoding_size[0] = 5;</div><div class='del'>-		// RC4 ~128 bits</div><div class='del'>-		if (cap_rid.softCap &amp; cpu_to_le16(0x100)) {</div><div class='del'>-			range-&gt;encoding_size[1] = 13;</div><div class='del'>-			range-&gt;num_encoding_sizes = 2;</div><div class='del'>-		} else</div><div class='del'>-			range-&gt;num_encoding_sizes = 1;</div><div class='del'>-		range-&gt;max_encoding_tokens =</div><div class='del'>-			cap_rid.softCap &amp; cpu_to_le16(0x80) ? 4 : 1;</div><div class='del'>-	} else {</div><div class='del'>-		range-&gt;num_encoding_sizes = 0;</div><div class='del'>-		range-&gt;max_encoding_tokens = 0;</div><div class='del'>-	}</div><div class='del'>-	range-&gt;min_pmp = 0;</div><div class='del'>-	range-&gt;max_pmp = 5000000;	/* 5 secs */</div><div class='del'>-	range-&gt;min_pmt = 0;</div><div class='del'>-	range-&gt;max_pmt = 65535 * 1024;	/* ??? */</div><div class='del'>-	range-&gt;pmp_flags = IW_POWER_PERIOD;</div><div class='del'>-	range-&gt;pmt_flags = IW_POWER_TIMEOUT;</div><div class='del'>-	range-&gt;pm_capa = IW_POWER_PERIOD | IW_POWER_TIMEOUT | IW_POWER_ALL_R;</div><div class='del'>-</div><div class='del'>-	/* Transmit Power - values are in mW */</div><div class='del'>-	for (i = 0 ; i &lt; 8 ; i++) {</div><div class='del'>-		range-&gt;txpower[i] = le16_to_cpu(cap_rid.txPowerLevels[i]);</div><div class='del'>-		if (range-&gt;txpower[i] == 0)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	range-&gt;num_txpower = i;</div><div class='del'>-	range-&gt;txpower_capa = IW_TXPOW_MWATT;</div><div class='del'>-	range-&gt;we_version_source = 19;</div><div class='del'>-	range-&gt;we_version_compiled = WIRELESS_EXT;</div><div class='del'>-	range-&gt;retry_capa = IW_RETRY_LIMIT | IW_RETRY_LIFETIME;</div><div class='del'>-	range-&gt;retry_flags = IW_RETRY_LIMIT;</div><div class='del'>-	range-&gt;r_time_flags = IW_RETRY_LIFETIME;</div><div class='del'>-	range-&gt;min_retry = 1;</div><div class='del'>-	range-&gt;max_retry = 65535;</div><div class='del'>-	range-&gt;min_r_time = 1024;</div><div class='del'>-	range-&gt;max_r_time = 65535 * 1024;</div><div class='del'>-</div><div class='del'>-	/* Event capability (kernel + driver) */</div><div class='del'>-	range-&gt;event_capa[0] = (IW_EVENT_CAPA_K_0 |</div><div class='del'>-				IW_EVENT_CAPA_MASK(SIOCGIWTHRSPY) |</div><div class='del'>-				IW_EVENT_CAPA_MASK(SIOCGIWAP) |</div><div class='del'>-				IW_EVENT_CAPA_MASK(SIOCGIWSCAN));</div><div class='del'>-	range-&gt;event_capa[1] = IW_EVENT_CAPA_K_1;</div><div class='del'>-	range-&gt;event_capa[4] = IW_EVENT_CAPA_MASK(IWEVTXDROP);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : set Power Management</div><div class='del'>- */</div><div class='del'>-static int airo_set_power(struct net_device *dev,</div><div class='del'>-			  struct iw_request_info *info,</div><div class='del'>-			  struct iw_param *vwrq,</div><div class='del'>-			  char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	readConfigRid(local, 1);</div><div class='del'>-	if (vwrq-&gt;disabled) {</div><div class='del'>-		if (sniffing_mode(local))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		local-&gt;config.powerSaveMode = POWERSAVE_CAM;</div><div class='del'>-		local-&gt;config.rmode &amp;= ~RXMODE_MASK;</div><div class='del'>-		local-&gt;config.rmode |= RXMODE_BC_MC_ADDR;</div><div class='del'>-		set_bit (FLAG_COMMIT, &amp;local-&gt;flags);</div><div class='del'>-		return -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-	}</div><div class='del'>-	if ((vwrq-&gt;flags &amp; IW_POWER_TYPE) == IW_POWER_TIMEOUT) {</div><div class='del'>-		local-&gt;config.fastListenDelay = cpu_to_le16((vwrq-&gt;value + 500) / 1024);</div><div class='del'>-		local-&gt;config.powerSaveMode = POWERSAVE_PSPCAM;</div><div class='del'>-		set_bit (FLAG_COMMIT, &amp;local-&gt;flags);</div><div class='del'>-	} else if ((vwrq-&gt;flags &amp; IW_POWER_TYPE) == IW_POWER_PERIOD) {</div><div class='del'>-		local-&gt;config.fastListenInterval =</div><div class='del'>-		local-&gt;config.listenInterval =</div><div class='del'>-			cpu_to_le16((vwrq-&gt;value + 500) / 1024);</div><div class='del'>-		local-&gt;config.powerSaveMode = POWERSAVE_PSPCAM;</div><div class='del'>-		set_bit (FLAG_COMMIT, &amp;local-&gt;flags);</div><div class='del'>-	}</div><div class='del'>-	switch (vwrq-&gt;flags &amp; IW_POWER_MODE) {</div><div class='del'>-		case IW_POWER_UNICAST_R:</div><div class='del'>-			if (sniffing_mode(local))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			local-&gt;config.rmode &amp;= ~RXMODE_MASK;</div><div class='del'>-			local-&gt;config.rmode |= RXMODE_ADDR;</div><div class='del'>-			set_bit (FLAG_COMMIT, &amp;local-&gt;flags);</div><div class='del'>-			break;</div><div class='del'>-		case IW_POWER_ALL_R:</div><div class='del'>-			if (sniffing_mode(local))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			local-&gt;config.rmode &amp;= ~RXMODE_MASK;</div><div class='del'>-			local-&gt;config.rmode |= RXMODE_BC_MC_ADDR;</div><div class='del'>-			set_bit (FLAG_COMMIT, &amp;local-&gt;flags);</div><div class='del'>-			break;</div><div class='del'>-		case IW_POWER_ON:</div><div class='del'>-			/* This is broken, fixme ;-) */</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	// Note : we may want to factor local-&gt;need_commit here</div><div class='del'>-	// Note2 : may also want to factor RXMODE_RFMON test</div><div class='del'>-	return -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : get Power Management</div><div class='del'>- */</div><div class='del'>-static int airo_get_power(struct net_device *dev,</div><div class='del'>-			  struct iw_request_info *info,</div><div class='del'>-			  struct iw_param *vwrq,</div><div class='del'>-			  char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-	__le16 mode;</div><div class='del'>-</div><div class='del'>-	readConfigRid(local, 1);</div><div class='del'>-	mode = local-&gt;config.powerSaveMode;</div><div class='del'>-	if ((vwrq-&gt;disabled = (mode == POWERSAVE_CAM)))</div><div class='del'>-		return 0;</div><div class='del'>-	if ((vwrq-&gt;flags &amp; IW_POWER_TYPE) == IW_POWER_TIMEOUT) {</div><div class='del'>-		vwrq-&gt;value = le16_to_cpu(local-&gt;config.fastListenDelay) * 1024;</div><div class='del'>-		vwrq-&gt;flags = IW_POWER_TIMEOUT;</div><div class='del'>-	} else {</div><div class='del'>-		vwrq-&gt;value = le16_to_cpu(local-&gt;config.fastListenInterval) * 1024;</div><div class='del'>-		vwrq-&gt;flags = IW_POWER_PERIOD;</div><div class='del'>-	}</div><div class='del'>-	if ((local-&gt;config.rmode &amp; RXMODE_MASK) == RXMODE_ADDR)</div><div class='del'>-		vwrq-&gt;flags |= IW_POWER_UNICAST_R;</div><div class='del'>-	else</div><div class='del'>-		vwrq-&gt;flags |= IW_POWER_ALL_R;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : set Sensitivity</div><div class='del'>- */</div><div class='del'>-static int airo_set_sens(struct net_device *dev,</div><div class='del'>-			 struct iw_request_info *info,</div><div class='del'>-			 struct iw_param *vwrq,</div><div class='del'>-			 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	readConfigRid(local, 1);</div><div class='del'>-	local-&gt;config.rssiThreshold =</div><div class='del'>-		cpu_to_le16(vwrq-&gt;disabled ? RSSI_DEFAULT : vwrq-&gt;value);</div><div class='del'>-	set_bit (FLAG_COMMIT, &amp;local-&gt;flags);</div><div class='del'>-</div><div class='del'>-	return -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : get Sensitivity</div><div class='del'>- */</div><div class='del'>-static int airo_get_sens(struct net_device *dev,</div><div class='del'>-			 struct iw_request_info *info,</div><div class='del'>-			 struct iw_param *vwrq,</div><div class='del'>-			 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	readConfigRid(local, 1);</div><div class='del'>-	vwrq-&gt;value = le16_to_cpu(local-&gt;config.rssiThreshold);</div><div class='del'>-	vwrq-&gt;disabled = (vwrq-&gt;value == 0);</div><div class='del'>-	vwrq-&gt;fixed = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : get AP List</div><div class='del'>- * Note : this is deprecated in favor of IWSCAN</div><div class='del'>- */</div><div class='del'>-static int airo_get_aplist(struct net_device *dev,</div><div class='del'>-			   struct iw_request_info *info,</div><div class='del'>-			   struct iw_point *dwrq,</div><div class='del'>-			   char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-	struct sockaddr *address = (struct sockaddr *) extra;</div><div class='del'>-	struct iw_quality *qual;</div><div class='del'>-	BSSListRid BSSList;</div><div class='del'>-	int i;</div><div class='del'>-	int loseSync = capable(CAP_NET_ADMIN) ? 1: -1;</div><div class='del'>-</div><div class='del'>-	qual = kmalloc_array(IW_MAX_AP, sizeof(*qual), GFP_KERNEL);</div><div class='del'>-	if (!qual)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; IW_MAX_AP; i++) {</div><div class='del'>-		u16 dBm;</div><div class='del'>-		if (readBSSListRid(local, loseSync, &amp;BSSList))</div><div class='del'>-			break;</div><div class='del'>-		loseSync = 0;</div><div class='del'>-		memcpy(address[i].sa_data, BSSList.bssid, ETH_ALEN);</div><div class='del'>-		address[i].sa_family = ARPHRD_ETHER;</div><div class='del'>-		dBm = le16_to_cpu(BSSList.dBm);</div><div class='del'>-		if (local-&gt;rssi) {</div><div class='del'>-			qual[i].level = 0x100 - dBm;</div><div class='del'>-			qual[i].qual = airo_dbm_to_pct(local-&gt;rssi, dBm);</div><div class='del'>-			qual[i].updated = IW_QUAL_QUAL_UPDATED</div><div class='del'>-					| IW_QUAL_LEVEL_UPDATED</div><div class='del'>-					| IW_QUAL_DBM;</div><div class='del'>-		} else {</div><div class='del'>-			qual[i].level = (dBm + 321) / 2;</div><div class='del'>-			qual[i].qual = 0;</div><div class='del'>-			qual[i].updated = IW_QUAL_QUAL_INVALID</div><div class='del'>-					| IW_QUAL_LEVEL_UPDATED</div><div class='del'>-					| IW_QUAL_DBM;</div><div class='del'>-		}</div><div class='del'>-		qual[i].noise = local-&gt;wstats.qual.noise;</div><div class='del'>-		if (BSSList.index == cpu_to_le16(0xffff))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (!i) {</div><div class='del'>-		StatusRid status_rid;		/* Card status info */</div><div class='del'>-		readStatusRid(local, &amp;status_rid, 1);</div><div class='del'>-		for (i = 0;</div><div class='del'>-		     i &lt; min(IW_MAX_AP, 4) &amp;&amp;</div><div class='del'>-			     (status_rid.bssid[i][0]</div><div class='del'>-			      &amp; status_rid.bssid[i][1]</div><div class='del'>-			      &amp; status_rid.bssid[i][2]</div><div class='del'>-			      &amp; status_rid.bssid[i][3]</div><div class='del'>-			      &amp; status_rid.bssid[i][4]</div><div class='del'>-			      &amp; status_rid.bssid[i][5])!=0xff &amp;&amp;</div><div class='del'>-			     (status_rid.bssid[i][0]</div><div class='del'>-			      | status_rid.bssid[i][1]</div><div class='del'>-			      | status_rid.bssid[i][2]</div><div class='del'>-			      | status_rid.bssid[i][3]</div><div class='del'>-			      | status_rid.bssid[i][4]</div><div class='del'>-			      | status_rid.bssid[i][5]);</div><div class='del'>-		     i++) {</div><div class='del'>-			memcpy(address[i].sa_data,</div><div class='del'>-			       status_rid.bssid[i], ETH_ALEN);</div><div class='del'>-			address[i].sa_family = ARPHRD_ETHER;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		dwrq-&gt;flags = 1; /* Should be define'd */</div><div class='del'>-		memcpy(extra + sizeof(struct sockaddr) * i, qual,</div><div class='del'>-		       sizeof(struct iw_quality) * i);</div><div class='del'>-	}</div><div class='del'>-	dwrq-&gt;length = i;</div><div class='del'>-</div><div class='del'>-	kfree(qual);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : Initiate Scan</div><div class='del'>- */</div><div class='del'>-static int airo_set_scan(struct net_device *dev,</div><div class='del'>-			 struct iw_request_info *info,</div><div class='del'>-			 struct iw_point *dwrq,</div><div class='del'>-			 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-	Cmd cmd;</div><div class='del'>-	Resp rsp;</div><div class='del'>-	int wake = 0;</div><div class='del'>-	APListRid APList_rid_empty;</div><div class='del'>-</div><div class='del'>-	/* Note : you may have realised that, as this is a SET operation,</div><div class='del'>-	 * this is privileged and therefore a normal user can't</div><div class='del'>-	 * perform scanning.</div><div class='del'>-	 * This is not an error, while the device perform scanning,</div><div class='del'>-	 * traffic doesn't flow, so it's a perfect DoS...</div><div class='del'>-	 * Jean II */</div><div class='del'>-	if (ai-&gt;flags &amp; FLAG_RADIO_MASK) return -ENETDOWN;</div><div class='del'>-</div><div class='del'>-	if (down_interruptible(&amp;ai-&gt;sem))</div><div class='del'>-		return -ERESTARTSYS;</div><div class='del'>-</div><div class='del'>-	/* If there's already a scan in progress, don't</div><div class='del'>-	 * trigger another one. */</div><div class='del'>-	if (ai-&gt;scan_timeout &gt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Clear APList as it affects scan results */</div><div class='del'>-	memset(&amp;APList_rid_empty, 0, sizeof(APList_rid_empty));</div><div class='del'>-	APList_rid_empty.len = cpu_to_le16(sizeof(APList_rid_empty));</div><div class='del'>-	disable_MAC(ai, 2);</div><div class='del'>-	writeAPListRid(ai, &amp;APList_rid_empty, 0);</div><div class='del'>-	enable_MAC(ai, 0);</div><div class='del'>-</div><div class='del'>-	/* Initiate a scan command */</div><div class='del'>-	ai-&gt;scan_timeout = RUN_AT(3*HZ);</div><div class='del'>-	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-	cmd.cmd = CMD_LISTBSS;</div><div class='del'>-	issuecommand(ai, &amp;cmd, &amp;rsp, true);</div><div class='del'>-	wake = 1;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	up(&amp;ai-&gt;sem);</div><div class='del'>-	if (wake)</div><div class='del'>-		wake_up_interruptible(&amp;ai-&gt;thr_wait);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Translate scan data returned from the card to a card independent</div><div class='del'>- * format that the Wireless Tools will understand - Jean II</div><div class='del'>- */</div><div class='del'>-static inline char *airo_translate_scan(struct net_device *dev,</div><div class='del'>-					struct iw_request_info *info,</div><div class='del'>-					char *current_ev,</div><div class='del'>-					char *end_buf,</div><div class='del'>-					BSSListRid *bss)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-	struct iw_event		iwe;		/* Temporary buffer */</div><div class='del'>-	__le16			capabilities;</div><div class='del'>-	char *			current_val;	/* For rates */</div><div class='del'>-	int			i;</div><div class='del'>-	char *		buf;</div><div class='del'>-	u16 dBm;</div><div class='del'>-</div><div class='del'>-	/* First entry *MUST* be the AP MAC address */</div><div class='del'>-	iwe.cmd = SIOCGIWAP;</div><div class='del'>-	iwe.u.ap_addr.sa_family = ARPHRD_ETHER;</div><div class='del'>-	memcpy(iwe.u.ap_addr.sa_data, bss-&gt;bssid, ETH_ALEN);</div><div class='del'>-	current_ev = iwe_stream_add_event(info, current_ev, end_buf,</div><div class='del'>-					  &amp;iwe, IW_EV_ADDR_LEN);</div><div class='del'>-</div><div class='del'>-	/* Other entries will be displayed in the order we give them */</div><div class='del'>-</div><div class='del'>-	/* Add the ESSID */</div><div class='del'>-	iwe.u.data.length = bss-&gt;ssidLen;</div><div class='del'>-	if (iwe.u.data.length &gt; 32)</div><div class='del'>-		iwe.u.data.length = 32;</div><div class='del'>-	iwe.cmd = SIOCGIWESSID;</div><div class='del'>-	iwe.u.data.flags = 1;</div><div class='del'>-	current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='del'>-					  &amp;iwe, bss-&gt;ssid);</div><div class='del'>-</div><div class='del'>-	/* Add mode */</div><div class='del'>-	iwe.cmd = SIOCGIWMODE;</div><div class='del'>-	capabilities = bss-&gt;cap;</div><div class='del'>-	if (capabilities &amp; (CAP_ESS | CAP_IBSS)) {</div><div class='del'>-		if (capabilities &amp; CAP_ESS)</div><div class='del'>-			iwe.u.mode = IW_MODE_MASTER;</div><div class='del'>-		else</div><div class='del'>-			iwe.u.mode = IW_MODE_ADHOC;</div><div class='del'>-		current_ev = iwe_stream_add_event(info, current_ev, end_buf,</div><div class='del'>-						  &amp;iwe, IW_EV_UINT_LEN);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Add frequency */</div><div class='del'>-	iwe.cmd = SIOCGIWFREQ;</div><div class='del'>-	iwe.u.freq.m = le16_to_cpu(bss-&gt;dsChannel);</div><div class='del'>-	iwe.u.freq.m = 100000 *</div><div class='del'>-	      ieee80211_channel_to_frequency(iwe.u.freq.m, NL80211_BAND_2GHZ);</div><div class='del'>-	iwe.u.freq.e = 1;</div><div class='del'>-	current_ev = iwe_stream_add_event(info, current_ev, end_buf,</div><div class='del'>-					  &amp;iwe, IW_EV_FREQ_LEN);</div><div class='del'>-</div><div class='del'>-	dBm = le16_to_cpu(bss-&gt;dBm);</div><div class='del'>-</div><div class='del'>-	/* Add quality statistics */</div><div class='del'>-	iwe.cmd = IWEVQUAL;</div><div class='del'>-	if (ai-&gt;rssi) {</div><div class='del'>-		iwe.u.qual.level = 0x100 - dBm;</div><div class='del'>-		iwe.u.qual.qual = airo_dbm_to_pct(ai-&gt;rssi, dBm);</div><div class='del'>-		iwe.u.qual.updated = IW_QUAL_QUAL_UPDATED</div><div class='del'>-				| IW_QUAL_LEVEL_UPDATED</div><div class='del'>-				| IW_QUAL_DBM;</div><div class='del'>-	} else {</div><div class='del'>-		iwe.u.qual.level = (dBm + 321) / 2;</div><div class='del'>-		iwe.u.qual.qual = 0;</div><div class='del'>-		iwe.u.qual.updated = IW_QUAL_QUAL_INVALID</div><div class='del'>-				| IW_QUAL_LEVEL_UPDATED</div><div class='del'>-				| IW_QUAL_DBM;</div><div class='del'>-	}</div><div class='del'>-	iwe.u.qual.noise = ai-&gt;wstats.qual.noise;</div><div class='del'>-	current_ev = iwe_stream_add_event(info, current_ev, end_buf,</div><div class='del'>-					  &amp;iwe, IW_EV_QUAL_LEN);</div><div class='del'>-</div><div class='del'>-	/* Add encryption capability */</div><div class='del'>-	iwe.cmd = SIOCGIWENCODE;</div><div class='del'>-	if (capabilities &amp; CAP_PRIVACY)</div><div class='del'>-		iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;</div><div class='del'>-	else</div><div class='del'>-		iwe.u.data.flags = IW_ENCODE_DISABLED;</div><div class='del'>-	iwe.u.data.length = 0;</div><div class='del'>-	current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='del'>-					  &amp;iwe, bss-&gt;ssid);</div><div class='del'>-</div><div class='del'>-	/* Rate : stuffing multiple values in a single event require a bit</div><div class='del'>-	 * more of magic - Jean II */</div><div class='del'>-	current_val = current_ev + iwe_stream_lcp_len(info);</div><div class='del'>-</div><div class='del'>-	iwe.cmd = SIOCGIWRATE;</div><div class='del'>-	/* Those two flags are ignored... */</div><div class='del'>-	iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;</div><div class='del'>-	/* Max 8 values */</div><div class='del'>-	for (i = 0 ; i &lt; 8 ; i++) {</div><div class='del'>-		/* NULL terminated */</div><div class='del'>-		if (bss-&gt;rates[i] == 0)</div><div class='del'>-			break;</div><div class='del'>-		/* Bit rate given in 500 kb/s units (+ 0x80) */</div><div class='del'>-		iwe.u.bitrate.value = ((bss-&gt;rates[i] &amp; 0x7f) * 500000);</div><div class='del'>-		/* Add new value to event */</div><div class='del'>-		current_val = iwe_stream_add_value(info, current_ev,</div><div class='del'>-						   current_val, end_buf,</div><div class='del'>-						   &amp;iwe, IW_EV_PARAM_LEN);</div><div class='del'>-	}</div><div class='del'>-	/* Check if we added any event */</div><div class='del'>-	if ((current_val - current_ev) &gt; iwe_stream_lcp_len(info))</div><div class='del'>-		current_ev = current_val;</div><div class='del'>-</div><div class='del'>-	/* Beacon interval */</div><div class='del'>-	buf = kmalloc(30, GFP_KERNEL);</div><div class='del'>-	if (buf) {</div><div class='del'>-		iwe.cmd = IWEVCUSTOM;</div><div class='del'>-		sprintf(buf, "bcn_int=%d", bss-&gt;beaconInterval);</div><div class='del'>-		iwe.u.data.length = strlen(buf);</div><div class='del'>-		current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='del'>-						  &amp;iwe, buf);</div><div class='del'>-		kfree(buf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Put WPA/RSN Information Elements into the event stream */</div><div class='del'>-	if (test_bit(FLAG_WPA_CAPABLE, &amp;ai-&gt;flags)) {</div><div class='del'>-		unsigned int num_null_ies = 0;</div><div class='del'>-		u16 length = sizeof (bss-&gt;extra.iep);</div><div class='del'>-		u8 *ie = (void *)&amp;bss-&gt;extra.iep;</div><div class='del'>-</div><div class='del'>-		while ((length &gt;= 2) &amp;&amp; (num_null_ies &lt; 2)) {</div><div class='del'>-			if (2 + ie[1] &gt; length) {</div><div class='del'>-				/* Invalid element, don't continue parsing IE */</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			switch (ie[0]) {</div><div class='del'>-			case WLAN_EID_SSID:</div><div class='del'>-				/* Two zero-length SSID elements</div><div class='del'>-				 * mean we're done parsing elements */</div><div class='del'>-				if (!ie[1])</div><div class='del'>-					num_null_ies++;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case WLAN_EID_VENDOR_SPECIFIC:</div><div class='del'>-				if (ie[1] &gt;= 4 &amp;&amp;</div><div class='del'>-				    ie[2] == 0x00 &amp;&amp;</div><div class='del'>-				    ie[3] == 0x50 &amp;&amp;</div><div class='del'>-				    ie[4] == 0xf2 &amp;&amp;</div><div class='del'>-				    ie[5] == 0x01) {</div><div class='del'>-					iwe.cmd = IWEVGENIE;</div><div class='del'>-					/* 64 is an arbitrary cut-off */</div><div class='del'>-					iwe.u.data.length = min(ie[1] + 2,</div><div class='del'>-								64);</div><div class='del'>-					current_ev = iwe_stream_add_point(</div><div class='del'>-							info, current_ev,</div><div class='del'>-							end_buf, &amp;iwe, ie);</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case WLAN_EID_RSN:</div><div class='del'>-				iwe.cmd = IWEVGENIE;</div><div class='del'>-				/* 64 is an arbitrary cut-off */</div><div class='del'>-				iwe.u.data.length = min(ie[1] + 2, 64);</div><div class='del'>-				current_ev = iwe_stream_add_point(</div><div class='del'>-					info, current_ev, end_buf,</div><div class='del'>-					&amp;iwe, ie);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			default:</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			length -= 2 + ie[1];</div><div class='del'>-			ie += 2 + ie[1];</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return current_ev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Wireless Handler : Read Scan Results</div><div class='del'>- */</div><div class='del'>-static int airo_get_scan(struct net_device *dev,</div><div class='del'>-			 struct iw_request_info *info,</div><div class='del'>-			 struct iw_point *dwrq,</div><div class='del'>-			 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-	BSSListElement *net;</div><div class='del'>-	int err = 0;</div><div class='del'>-	char *current_ev = extra;</div><div class='del'>-</div><div class='del'>-	/* If a scan is in-progress, return -EAGAIN */</div><div class='del'>-	if (ai-&gt;scan_timeout &gt; 0)</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	if (down_interruptible(&amp;ai-&gt;sem))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry (net, &amp;ai-&gt;network_list, list) {</div><div class='del'>-		/* Translate to WE format this entry */</div><div class='del'>-		current_ev = airo_translate_scan(dev, info, current_ev,</div><div class='del'>-						 extra + dwrq-&gt;length,</div><div class='del'>-						 &amp;net-&gt;bss);</div><div class='del'>-</div><div class='del'>-		/* Check if there is space for one more entry */</div><div class='del'>-		if ((extra + dwrq-&gt;length - current_ev) &lt;= IW_EV_ADDR_LEN) {</div><div class='del'>-			/* Ask user space to try again with a bigger buffer */</div><div class='del'>-			err = -E2BIG;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Length of data */</div><div class='del'>-	dwrq-&gt;length = (current_ev - extra);</div><div class='del'>-	dwrq-&gt;flags = 0;	/* todo */</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	up(&amp;ai-&gt;sem);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Commit handler : called after a bunch of SET operations</div><div class='del'>- */</div><div class='del'>-static int airo_config_commit(struct net_device *dev,</div><div class='del'>-			      struct iw_request_info *info,	/* NULL */</div><div class='del'>-			      void *zwrq,			/* NULL */</div><div class='del'>-			      char *extra)			/* NULL */</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	if (!test_bit (FLAG_COMMIT, &amp;local-&gt;flags))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Some of the "SET" function may have modified some of the</div><div class='del'>-	 * parameters. It's now time to commit them in the card */</div><div class='del'>-	disable_MAC(local, 1);</div><div class='del'>-	if (test_bit (FLAG_RESET, &amp;local-&gt;flags)) {</div><div class='del'>-		SsidRid SSID_rid;</div><div class='del'>-</div><div class='del'>-		readSsidRid(local, &amp;SSID_rid);</div><div class='del'>-		if (test_bit(FLAG_MPI,&amp;local-&gt;flags))</div><div class='del'>-			setup_card(local, dev-&gt;dev_addr, 1);</div><div class='del'>-		else</div><div class='del'>-			reset_airo_card(dev);</div><div class='del'>-		disable_MAC(local, 1);</div><div class='del'>-		writeSsidRid(local, &amp;SSID_rid, 1);</div><div class='del'>-		writeAPListRid(local, &amp;local-&gt;APList, 1);</div><div class='del'>-	}</div><div class='del'>-	if (down_interruptible(&amp;local-&gt;sem))</div><div class='del'>-		return -ERESTARTSYS;</div><div class='del'>-	writeConfigRid(local, 0);</div><div class='del'>-	enable_MAC(local, 0);</div><div class='del'>-	if (test_bit (FLAG_RESET, &amp;local-&gt;flags))</div><div class='del'>-		airo_set_promisc(local, true);</div><div class='del'>-	else</div><div class='del'>-		up(&amp;local-&gt;sem);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Structures to export the Wireless Handlers</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static const struct iw_priv_args airo_private_args[] = {</div><div class='del'>-/*{ cmd,         set_args,                            get_args, name } */</div><div class='del'>-  { AIROIOCTL, IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | sizeof (aironet_ioctl),</div><div class='del'>-    IW_PRIV_TYPE_BYTE | 2047, "airoioctl" },</div><div class='del'>-  { AIROIDIFC, IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | sizeof (aironet_ioctl),</div><div class='del'>-    IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "airoidifc" },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const iw_handler		airo_handler[] =</div><div class='del'>-{</div><div class='del'>-	(iw_handler) airo_config_commit,	/* SIOCSIWCOMMIT */</div><div class='del'>-	(iw_handler) airo_get_name,		/* SIOCGIWNAME */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCSIWNWID */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCGIWNWID */</div><div class='del'>-	(iw_handler) airo_set_freq,		/* SIOCSIWFREQ */</div><div class='del'>-	(iw_handler) airo_get_freq,		/* SIOCGIWFREQ */</div><div class='del'>-	(iw_handler) airo_set_mode,		/* SIOCSIWMODE */</div><div class='del'>-	(iw_handler) airo_get_mode,		/* SIOCGIWMODE */</div><div class='del'>-	(iw_handler) airo_set_sens,		/* SIOCSIWSENS */</div><div class='del'>-	(iw_handler) airo_get_sens,		/* SIOCGIWSENS */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCSIWRANGE */</div><div class='del'>-	(iw_handler) airo_get_range,		/* SIOCGIWRANGE */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCSIWPRIV */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCGIWPRIV */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCSIWSTATS */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCGIWSTATS */</div><div class='del'>-	iw_handler_set_spy,			/* SIOCSIWSPY */</div><div class='del'>-	iw_handler_get_spy,			/* SIOCGIWSPY */</div><div class='del'>-	iw_handler_set_thrspy,			/* SIOCSIWTHRSPY */</div><div class='del'>-	iw_handler_get_thrspy,			/* SIOCGIWTHRSPY */</div><div class='del'>-	(iw_handler) airo_set_wap,		/* SIOCSIWAP */</div><div class='del'>-	(iw_handler) airo_get_wap,		/* SIOCGIWAP */</div><div class='del'>-	(iw_handler) NULL,			/* -- hole -- */</div><div class='del'>-	(iw_handler) airo_get_aplist,		/* SIOCGIWAPLIST */</div><div class='del'>-	(iw_handler) airo_set_scan,		/* SIOCSIWSCAN */</div><div class='del'>-	(iw_handler) airo_get_scan,		/* SIOCGIWSCAN */</div><div class='del'>-	(iw_handler) airo_set_essid,		/* SIOCSIWESSID */</div><div class='del'>-	(iw_handler) airo_get_essid,		/* SIOCGIWESSID */</div><div class='del'>-	(iw_handler) airo_set_nick,		/* SIOCSIWNICKN */</div><div class='del'>-	(iw_handler) airo_get_nick,		/* SIOCGIWNICKN */</div><div class='del'>-	(iw_handler) NULL,			/* -- hole -- */</div><div class='del'>-	(iw_handler) NULL,			/* -- hole -- */</div><div class='del'>-	(iw_handler) airo_set_rate,		/* SIOCSIWRATE */</div><div class='del'>-	(iw_handler) airo_get_rate,		/* SIOCGIWRATE */</div><div class='del'>-	(iw_handler) airo_set_rts,		/* SIOCSIWRTS */</div><div class='del'>-	(iw_handler) airo_get_rts,		/* SIOCGIWRTS */</div><div class='del'>-	(iw_handler) airo_set_frag,		/* SIOCSIWFRAG */</div><div class='del'>-	(iw_handler) airo_get_frag,		/* SIOCGIWFRAG */</div><div class='del'>-	(iw_handler) airo_set_txpow,		/* SIOCSIWTXPOW */</div><div class='del'>-	(iw_handler) airo_get_txpow,		/* SIOCGIWTXPOW */</div><div class='del'>-	(iw_handler) airo_set_retry,		/* SIOCSIWRETRY */</div><div class='del'>-	(iw_handler) airo_get_retry,		/* SIOCGIWRETRY */</div><div class='del'>-	(iw_handler) airo_set_encode,		/* SIOCSIWENCODE */</div><div class='del'>-	(iw_handler) airo_get_encode,		/* SIOCGIWENCODE */</div><div class='del'>-	(iw_handler) airo_set_power,		/* SIOCSIWPOWER */</div><div class='del'>-	(iw_handler) airo_get_power,		/* SIOCGIWPOWER */</div><div class='del'>-	(iw_handler) NULL,			/* -- hole -- */</div><div class='del'>-	(iw_handler) NULL,			/* -- hole -- */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCSIWGENIE */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCGIWGENIE */</div><div class='del'>-	(iw_handler) airo_set_auth,		/* SIOCSIWAUTH */</div><div class='del'>-	(iw_handler) airo_get_auth,		/* SIOCGIWAUTH */</div><div class='del'>-	(iw_handler) airo_set_encodeext,	/* SIOCSIWENCODEEXT */</div><div class='del'>-	(iw_handler) airo_get_encodeext,	/* SIOCGIWENCODEEXT */</div><div class='del'>-	(iw_handler) NULL,			/* SIOCSIWPMKSA */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Note : don't describe AIROIDIFC and AIROOLDIDIFC in here.</div><div class='del'>- * We want to force the use of the ioctl code, because those can't be</div><div class='del'>- * won't work the iw_handler code (because they simultaneously read</div><div class='del'>- * and write data and iw_handler can't do that).</div><div class='del'>- * Note that it's perfectly legal to read/write on a single ioctl command,</div><div class='del'>- * you just can't use iwpriv and need to force it via the ioctl handler.</div><div class='del'>- * Jean II */</div><div class='del'>-static const iw_handler		airo_private_handler[] =</div><div class='del'>-{</div><div class='del'>-	NULL,				/* SIOCIWFIRSTPRIV */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct iw_handler_def	airo_handler_def =</div><div class='del'>-{</div><div class='del'>-	.num_standard	= ARRAY_SIZE(airo_handler),</div><div class='del'>-	.num_private	= ARRAY_SIZE(airo_private_handler),</div><div class='del'>-	.num_private_args = ARRAY_SIZE(airo_private_args),</div><div class='del'>-	.standard	= airo_handler,</div><div class='del'>-	.private	= airo_private_handler,</div><div class='del'>-	.private_args	= airo_private_args,</div><div class='del'>-	.get_wireless_stats = airo_get_wireless_stats,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This defines the configuration part of the Wireless Extensions</div><div class='del'>- * Note : irq and spinlock protection will occur in the subroutines</div><div class='del'>- *</div><div class='del'>- * TODO :</div><div class='del'>- *	o Check input value more carefully and fill correct values in range</div><div class='del'>- *	o Test and shakeout the bugs (if any)</div><div class='del'>- *</div><div class='del'>- * Jean II</div><div class='del'>- *</div><div class='del'>- * Javier Achirica did a great job of merging code from the unnamed CISCO</div><div class='del'>- * developer that added support for flashing the card.</div><div class='del'>- */</div><div class='del'>-static int airo_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='del'>-{</div><div class='del'>-	int rc = 0;</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	if (ai-&gt;power.event)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-#ifdef CISCO_EXT</div><div class='del'>-	case AIROIDIFC:</div><div class='del'>-#ifdef AIROOLDIDIFC</div><div class='del'>-	case AIROOLDIDIFC:</div><div class='del'>-#endif</div><div class='del'>-	{</div><div class='del'>-		int val = AIROMAGIC;</div><div class='del'>-		aironet_ioctl com;</div><div class='del'>-		if (copy_from_user(&amp;com, rq-&gt;ifr_data, sizeof(com)))</div><div class='del'>-			rc = -EFAULT;</div><div class='del'>-		else if (copy_to_user(com.data, (char *)&amp;val, sizeof(val)))</div><div class='del'>-			rc = -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-	case AIROIOCTL:</div><div class='del'>-#ifdef AIROOLDIOCTL</div><div class='del'>-	case AIROOLDIOCTL:</div><div class='del'>-#endif</div><div class='del'>-		/* Get the command struct and hand it off for evaluation by</div><div class='del'>-		 * the proper subfunction</div><div class='del'>-		 */</div><div class='del'>-	{</div><div class='del'>-		aironet_ioctl com;</div><div class='del'>-		if (copy_from_user(&amp;com, rq-&gt;ifr_data, sizeof(com))) {</div><div class='del'>-			rc = -EFAULT;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Separate R/W functions bracket legality here</div><div class='del'>-		 */</div><div class='del'>-		if (com.command == AIRORSWVERSION) {</div><div class='del'>-			if (copy_to_user(com.data, swversion, sizeof(swversion)))</div><div class='del'>-				rc = -EFAULT;</div><div class='del'>-			else</div><div class='del'>-				rc = 0;</div><div class='del'>-		}</div><div class='del'>-		else if (com.command &lt;= AIRORRID)</div><div class='del'>-			rc = readrids(dev,&amp;com);</div><div class='del'>-		else if (com.command &gt;= AIROPCAP &amp;&amp; com.command &lt;= (AIROPLEAPUSR+2))</div><div class='del'>-			rc = writerids(dev,&amp;com);</div><div class='del'>-		else if (com.command &gt;= AIROFLSHRST &amp;&amp; com.command &lt;= AIRORESTART)</div><div class='del'>-			rc = flashcard(dev,&amp;com);</div><div class='del'>-		else</div><div class='del'>-			rc = -EINVAL;      /* Bad command in ioctl */</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-#endif /* CISCO_EXT */</div><div class='del'>-</div><div class='del'>-	// All other calls are currently unsupported</div><div class='del'>-	default:</div><div class='del'>-		rc = -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get the Wireless stats out of the driver</div><div class='del'>- * Note : irq and spinlock protection will occur in the subroutines</div><div class='del'>- *</div><div class='del'>- * TODO :</div><div class='del'>- *	o Check if work in Ad-Hoc mode (otherwise, use SPY, as in wvlan_cs)</div><div class='del'>- *</div><div class='del'>- * Jean</div><div class='del'>- */</div><div class='del'>-static void airo_read_wireless_stats(struct airo_info *local)</div><div class='del'>-{</div><div class='del'>-	StatusRid status_rid;</div><div class='del'>-	StatsRid stats_rid;</div><div class='del'>-	CapabilityRid cap_rid;</div><div class='del'>-	__le32 *vals = stats_rid.vals;</div><div class='del'>-</div><div class='del'>-	/* Get stats out of the card */</div><div class='del'>-	if (local-&gt;power.event)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	readCapabilityRid(local, &amp;cap_rid, 0);</div><div class='del'>-	readStatusRid(local, &amp;status_rid, 0);</div><div class='del'>-	readStatsRid(local, &amp;stats_rid, RID_STATS, 0);</div><div class='del'>-</div><div class='del'>-	/* The status */</div><div class='del'>-	local-&gt;wstats.status = le16_to_cpu(status_rid.mode);</div><div class='del'>-</div><div class='del'>-	/* Signal quality and co */</div><div class='del'>-	if (local-&gt;rssi) {</div><div class='del'>-		local-&gt;wstats.qual.level =</div><div class='del'>-			airo_rssi_to_dbm(local-&gt;rssi,</div><div class='del'>-					 le16_to_cpu(status_rid.sigQuality));</div><div class='del'>-		/* normalizedSignalStrength appears to be a percentage */</div><div class='del'>-		local-&gt;wstats.qual.qual =</div><div class='del'>-			le16_to_cpu(status_rid.normalizedSignalStrength);</div><div class='del'>-	} else {</div><div class='del'>-		local-&gt;wstats.qual.level =</div><div class='del'>-			(le16_to_cpu(status_rid.normalizedSignalStrength) + 321) / 2;</div><div class='del'>-		local-&gt;wstats.qual.qual = airo_get_quality(&amp;status_rid, &amp;cap_rid);</div><div class='del'>-	}</div><div class='del'>-	if (le16_to_cpu(status_rid.len) &gt;= 124) {</div><div class='del'>-		local-&gt;wstats.qual.noise = 0x100 - status_rid.noisedBm;</div><div class='del'>-		local-&gt;wstats.qual.updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;</div><div class='del'>-	} else {</div><div class='del'>-		local-&gt;wstats.qual.noise = 0;</div><div class='del'>-		local-&gt;wstats.qual.updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED | IW_QUAL_NOISE_INVALID | IW_QUAL_DBM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Packets discarded in the wireless adapter due to wireless</div><div class='del'>-	 * specific problems */</div><div class='del'>-	local-&gt;wstats.discard.nwid = le32_to_cpu(vals[56]) +</div><div class='del'>-				     le32_to_cpu(vals[57]) +</div><div class='del'>-				     le32_to_cpu(vals[58]); /* SSID Mismatch */</div><div class='del'>-	local-&gt;wstats.discard.code = le32_to_cpu(vals[6]);/* RxWepErr */</div><div class='del'>-	local-&gt;wstats.discard.fragment = le32_to_cpu(vals[30]);</div><div class='del'>-	local-&gt;wstats.discard.retries = le32_to_cpu(vals[10]);</div><div class='del'>-	local-&gt;wstats.discard.misc = le32_to_cpu(vals[1]) +</div><div class='del'>-				     le32_to_cpu(vals[32]);</div><div class='del'>-	local-&gt;wstats.miss.beacon = le32_to_cpu(vals[34]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct iw_statistics *airo_get_wireless_stats(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *local =  dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	if (!down_interruptible(&amp;local-&gt;sem)) {</div><div class='del'>-		airo_read_wireless_stats(local);</div><div class='del'>-		up(&amp;local-&gt;sem);</div><div class='del'>-	}</div><div class='del'>-	return &amp;local-&gt;wstats;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CISCO_EXT</div><div class='del'>-/*</div><div class='del'>- * This just translates from driver IOCTL codes to the command codes to</div><div class='del'>- * feed to the radio's host interface. Things can be added/deleted</div><div class='del'>- * as needed.  This represents the READ side of control I/O to</div><div class='del'>- * the card</div><div class='del'>- */</div><div class='del'>-static int readrids(struct net_device *dev, aironet_ioctl *comp)</div><div class='del'>-{</div><div class='del'>-	unsigned short ridcode;</div><div class='del'>-	unsigned char *iobuf;</div><div class='del'>-	int len;</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	if (test_bit(FLAG_FLASHING, &amp;ai-&gt;flags))</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	switch(comp-&gt;command)</div><div class='del'>-	{</div><div class='del'>-	case AIROGCAP:      ridcode = RID_CAPABILITIES; break;</div><div class='del'>-	case AIROGCFG:      ridcode = RID_CONFIG;</div><div class='del'>-		if (test_bit(FLAG_COMMIT, &amp;ai-&gt;flags)) {</div><div class='del'>-			disable_MAC (ai, 1);</div><div class='del'>-			writeConfigRid (ai, 1);</div><div class='del'>-			enable_MAC(ai, 1);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case AIROGSLIST:    ridcode = RID_SSID;         break;</div><div class='del'>-	case AIROGVLIST:    ridcode = RID_APLIST;       break;</div><div class='del'>-	case AIROGDRVNAM:   ridcode = RID_DRVNAME;      break;</div><div class='del'>-	case AIROGEHTENC:   ridcode = RID_ETHERENCAP;   break;</div><div class='del'>-	case AIROGWEPKTMP:  ridcode = RID_WEP_TEMP;	break;</div><div class='del'>-	case AIROGWEPKNV:   ridcode = RID_WEP_PERM;	break;</div><div class='del'>-	case AIROGSTAT:     ridcode = RID_STATUS;       break;</div><div class='del'>-	case AIROGSTATSD32: ridcode = RID_STATSDELTA;   break;</div><div class='del'>-	case AIROGSTATSC32: ridcode = RID_STATS;        break;</div><div class='del'>-	case AIROGMICSTATS:</div><div class='del'>-		if (copy_to_user(comp-&gt;data, &amp;ai-&gt;micstats,</div><div class='del'>-				 min((int)comp-&gt;len, (int)sizeof(ai-&gt;micstats))))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='del'>-	case AIRORRID:      ridcode = comp-&gt;ridnum;     break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ridcode == RID_WEP_TEMP || ridcode == RID_WEP_PERM) {</div><div class='del'>-		/* Only super-user can read WEP keys */</div><div class='del'>-		if (!capable(CAP_NET_ADMIN))</div><div class='del'>-			return -EPERM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((iobuf = kzalloc(RIDSIZE, GFP_KERNEL)) == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	PC4500_readrid(ai, ridcode, iobuf, RIDSIZE, 1);</div><div class='del'>-	/* get the count of bytes in the rid  docs say 1st 2 bytes is it.</div><div class='del'>-	 * then return it to the user</div><div class='del'>-	 * 9/22/2000 Honor user given length</div><div class='del'>-	 */</div><div class='del'>-	len = comp-&gt;len;</div><div class='del'>-</div><div class='del'>-	if (copy_to_user(comp-&gt;data, iobuf, min(len, (int)RIDSIZE))) {</div><div class='del'>-		kfree (iobuf);</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	kfree (iobuf);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Danger Will Robinson write the rids here</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int writerids(struct net_device *dev, aironet_ioctl *comp)</div><div class='del'>-{</div><div class='del'>-	struct airo_info *ai = dev-&gt;ml_priv;</div><div class='del'>-	int  ridcode;</div><div class='del'>-        int  enabled;</div><div class='del'>-	int (*writer)(struct airo_info *, u16 rid, const void *, int, int);</div><div class='del'>-	unsigned char *iobuf;</div><div class='del'>-</div><div class='del'>-	/* Only super-user can write RIDs */</div><div class='del'>-	if (!capable(CAP_NET_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (test_bit(FLAG_FLASHING, &amp;ai-&gt;flags))</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	ridcode = 0;</div><div class='del'>-	writer = do_writerid;</div><div class='del'>-</div><div class='del'>-	switch(comp-&gt;command)</div><div class='del'>-	{</div><div class='del'>-	case AIROPSIDS:     ridcode = RID_SSID;         break;</div><div class='del'>-	case AIROPCAP:      ridcode = RID_CAPABILITIES; break;</div><div class='del'>-	case AIROPAPLIST:   ridcode = RID_APLIST;       break;</div><div class='del'>-	case AIROPCFG: ai-&gt;config.len = 0;</div><div class='del'>-			    clear_bit(FLAG_COMMIT, &amp;ai-&gt;flags);</div><div class='del'>-			    ridcode = RID_CONFIG;       break;</div><div class='del'>-	case AIROPWEPKEYNV: ridcode = RID_WEP_PERM;     break;</div><div class='del'>-	case AIROPLEAPUSR:  ridcode = RID_LEAPUSERNAME; break;</div><div class='del'>-	case AIROPLEAPPWD:  ridcode = RID_LEAPPASSWORD; break;</div><div class='del'>-	case AIROPWEPKEY:   ridcode = RID_WEP_TEMP; writer = PC4500_writerid;</div><div class='del'>-		break;</div><div class='del'>-	case AIROPLEAPUSR+1: ridcode = 0xFF2A;          break;</div><div class='del'>-	case AIROPLEAPUSR+2: ridcode = 0xFF2B;          break;</div><div class='del'>-</div><div class='del'>-		/* this is not really a rid but a command given to the card</div><div class='del'>-		 * same with MAC off</div><div class='del'>-		 */</div><div class='del'>-	case AIROPMACON:</div><div class='del'>-		if (enable_MAC(ai, 1) != 0)</div><div class='del'>-			return -EIO;</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Evidently this code in the airo driver does not get a symbol</div><div class='del'>-		 * as disable_MAC. it's probably so short the compiler does not gen one.</div><div class='del'>-		 */</div><div class='del'>-	case AIROPMACOFF:</div><div class='del'>-		disable_MAC(ai, 1);</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-		/* This command merely clears the counts does not actually store any data</div><div class='del'>-		 * only reads rid. But as it changes the cards state, I put it in the</div><div class='del'>-		 * writerid routines.</div><div class='del'>-		 */</div><div class='del'>-	case AIROPSTCLR:</div><div class='del'>-		if ((iobuf = kmalloc(RIDSIZE, GFP_KERNEL)) == NULL)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-</div><div class='del'>-		PC4500_readrid(ai, RID_STATSDELTACLEAR, iobuf, RIDSIZE, 1);</div><div class='del'>-</div><div class='del'>-		enabled = ai-&gt;micstats.enabled;</div><div class='del'>-		memset(&amp;ai-&gt;micstats, 0, sizeof(ai-&gt;micstats));</div><div class='del'>-		ai-&gt;micstats.enabled = enabled;</div><div class='del'>-</div><div class='del'>-		if (copy_to_user(comp-&gt;data, iobuf,</div><div class='del'>-				 min((int)comp-&gt;len, (int)RIDSIZE))) {</div><div class='del'>-			kfree (iobuf);</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-		kfree (iobuf);</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;	/* Blarg! */</div><div class='del'>-	}</div><div class='del'>-	if (comp-&gt;len &gt; RIDSIZE)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if ((iobuf = kmalloc(RIDSIZE, GFP_KERNEL)) == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(iobuf, comp-&gt;data, comp-&gt;len)) {</div><div class='del'>-		kfree (iobuf);</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (comp-&gt;command == AIROPCFG) {</div><div class='del'>-		ConfigRid *cfg = (ConfigRid *)iobuf;</div><div class='del'>-</div><div class='del'>-		if (test_bit(FLAG_MIC_CAPABLE, &amp;ai-&gt;flags))</div><div class='del'>-			cfg-&gt;opmode |= MODE_MIC;</div><div class='del'>-</div><div class='del'>-		if ((cfg-&gt;opmode &amp; MODE_CFG_MASK) == MODE_STA_IBSS)</div><div class='del'>-			set_bit (FLAG_ADHOC, &amp;ai-&gt;flags);</div><div class='del'>-		else</div><div class='del'>-			clear_bit (FLAG_ADHOC, &amp;ai-&gt;flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((*writer)(ai, ridcode, iobuf, comp-&gt;len, 1)) {</div><div class='del'>-		kfree (iobuf);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	kfree (iobuf);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*****************************************************************************</div><div class='del'>- * Ancillary flash / mod functions much black magic lurkes here              *</div><div class='del'>- *****************************************************************************</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Flash command switch table</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int flashcard(struct net_device *dev, aironet_ioctl *comp)</div><div class='del'>-{</div><div class='del'>-	int z;</div><div class='del'>-</div><div class='del'>-	/* Only super-user can modify flash */</div><div class='del'>-	if (!capable(CAP_NET_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	switch(comp-&gt;command)</div><div class='del'>-	{</div><div class='del'>-	case AIROFLSHRST:</div><div class='del'>-		return cmdreset((struct airo_info *)dev-&gt;ml_priv);</div><div class='del'>-</div><div class='del'>-	case AIROFLSHSTFL:</div><div class='del'>-		if (!AIRO_FLASH(dev) &amp;&amp;</div><div class='del'>-		    (AIRO_FLASH(dev) = kmalloc(FLASHSIZE, GFP_KERNEL)) == NULL)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		return setflashmode((struct airo_info *)dev-&gt;ml_priv);</div><div class='del'>-</div><div class='del'>-	case AIROFLSHGCHR: /* Get char from aux */</div><div class='del'>-		if (comp-&gt;len != sizeof(int))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (copy_from_user(&amp;z, comp-&gt;data, comp-&gt;len))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return flashgchar((struct airo_info *)dev-&gt;ml_priv, z, 8000);</div><div class='del'>-</div><div class='del'>-	case AIROFLSHPCHR: /* Send char to card. */</div><div class='del'>-		if (comp-&gt;len != sizeof(int))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (copy_from_user(&amp;z, comp-&gt;data, comp-&gt;len))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return flashpchar((struct airo_info *)dev-&gt;ml_priv, z, 8000);</div><div class='del'>-</div><div class='del'>-	case AIROFLPUTBUF: /* Send 32k to card */</div><div class='del'>-		if (!AIRO_FLASH(dev))</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		if (comp-&gt;len &gt; FLASHSIZE)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (copy_from_user(AIRO_FLASH(dev), comp-&gt;data, comp-&gt;len))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		flashputbuf((struct airo_info *)dev-&gt;ml_priv);</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case AIRORESTART:</div><div class='del'>-		if (flashrestart((struct airo_info *)dev-&gt;ml_priv, dev))</div><div class='del'>-			return -EIO;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define FLASH_COMMAND  0x7e7e</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * STEP 1)</div><div class='del'>- * Disable MAC and do soft reset on</div><div class='del'>- * card.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int cmdreset(struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	disable_MAC(ai, 1);</div><div class='del'>-</div><div class='del'>-	if (!waitbusy (ai)) {</div><div class='del'>-		airo_print_info(ai-&gt;dev-&gt;name, "Waitbusy hang before RESET");</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	OUT4500(ai, COMMAND, CMD_SOFTRESET);</div><div class='del'>-</div><div class='del'>-	ssleep(1);			/* WAS 600 12/7/00 */</div><div class='del'>-</div><div class='del'>-	if (!waitbusy (ai)) {</div><div class='del'>-		airo_print_info(ai-&gt;dev-&gt;name, "Waitbusy hang AFTER RESET");</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* STEP 2)</div><div class='del'>- * Put the card in legendary flash</div><div class='del'>- * mode</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int setflashmode (struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	set_bit (FLAG_FLASHING, &amp;ai-&gt;flags);</div><div class='del'>-</div><div class='del'>-	OUT4500(ai, SWS0, FLASH_COMMAND);</div><div class='del'>-	OUT4500(ai, SWS1, FLASH_COMMAND);</div><div class='del'>-	if (probe) {</div><div class='del'>-		OUT4500(ai, SWS0, FLASH_COMMAND);</div><div class='del'>-		OUT4500(ai, COMMAND, 0x10);</div><div class='del'>-	} else {</div><div class='del'>-		OUT4500(ai, SWS2, FLASH_COMMAND);</div><div class='del'>-		OUT4500(ai, SWS3, FLASH_COMMAND);</div><div class='del'>-		OUT4500(ai, COMMAND, 0);</div><div class='del'>-	}</div><div class='del'>-	msleep(500);		/* 500ms delay */</div><div class='del'>-</div><div class='del'>-	if (!waitbusy(ai)) {</div><div class='del'>-		clear_bit (FLAG_FLASHING, &amp;ai-&gt;flags);</div><div class='del'>-		airo_print_info(ai-&gt;dev-&gt;name, "Waitbusy hang after setflash mode");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Put character to SWS0 wait for dwelltime</div><div class='del'>- * x 50us for  echo .</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int flashpchar(struct airo_info *ai, int byte, int dwelltime)</div><div class='del'>-{</div><div class='del'>-	int echo;</div><div class='del'>-	int waittime;</div><div class='del'>-</div><div class='del'>-	byte |= 0x8000;</div><div class='del'>-</div><div class='del'>-	if (dwelltime == 0)</div><div class='del'>-		dwelltime = 200;</div><div class='del'>-</div><div class='del'>-	waittime = dwelltime;</div><div class='del'>-</div><div class='del'>-	/* Wait for busy bit d15 to go false indicating buffer empty */</div><div class='del'>-	while ((IN4500 (ai, SWS0) &amp; 0x8000) &amp;&amp; waittime &gt; 0) {</div><div class='del'>-		udelay (50);</div><div class='del'>-		waittime -= 50;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* timeout for busy clear wait */</div><div class='del'>-	if (waittime &lt;= 0) {</div><div class='del'>-		airo_print_info(ai-&gt;dev-&gt;name, "flash putchar busywait timeout!");</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Port is clear now write byte and wait for it to echo back */</div><div class='del'>-	do {</div><div class='del'>-		OUT4500(ai, SWS0, byte);</div><div class='del'>-		udelay(50);</div><div class='del'>-		dwelltime -= 50;</div><div class='del'>-		echo = IN4500(ai, SWS1);</div><div class='del'>-	} while (dwelltime &gt;= 0 &amp;&amp; echo != byte);</div><div class='del'>-</div><div class='del'>-	OUT4500(ai, SWS1, 0);</div><div class='del'>-</div><div class='del'>-	return (echo == byte) ? 0 : -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get a character from the card matching matchbyte</div><div class='del'>- * Step 3)</div><div class='del'>- */</div><div class='del'>-static int flashgchar(struct airo_info *ai, int matchbyte, int dwelltime)</div><div class='del'>-{</div><div class='del'>-	int           rchar;</div><div class='del'>-	unsigned char rbyte = 0;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		rchar = IN4500(ai, SWS1);</div><div class='del'>-</div><div class='del'>-		if (dwelltime &amp;&amp; !(0x8000 &amp; rchar)) {</div><div class='del'>-			dwelltime -= 10;</div><div class='del'>-			mdelay(10);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		rbyte = 0xff &amp; rchar;</div><div class='del'>-</div><div class='del'>-		if ((rbyte == matchbyte) &amp;&amp; (0x8000 &amp; rchar)) {</div><div class='del'>-			OUT4500(ai, SWS1, 0);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		if (rbyte == 0x81 || rbyte == 0x82 || rbyte == 0x83 || rbyte == 0x1a || 0xffff == rchar)</div><div class='del'>-			break;</div><div class='del'>-		OUT4500(ai, SWS1, 0);</div><div class='del'>-</div><div class='del'>-	} while (dwelltime &gt; 0);</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Transfer 32k of firmware data from user buffer to our buffer and</div><div class='del'>- * send to the card</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int flashputbuf(struct airo_info *ai)</div><div class='del'>-{</div><div class='del'>-	int            nwords;</div><div class='del'>-</div><div class='del'>-	/* Write stuff */</div><div class='del'>-	if (test_bit(FLAG_MPI,&amp;ai-&gt;flags))</div><div class='del'>-		memcpy_toio(ai-&gt;pciaux + 0x8000, ai-&gt;flash, FLASHSIZE);</div><div class='del'>-	else {</div><div class='del'>-		OUT4500(ai, AUXPAGE, 0x100);</div><div class='del'>-		OUT4500(ai, AUXOFF, 0);</div><div class='del'>-</div><div class='del'>-		for (nwords = 0; nwords != FLASHSIZE / 2; nwords++) {</div><div class='del'>-			OUT4500(ai, AUXDATA, ai-&gt;flash[nwords] &amp; 0xffff);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	OUT4500(ai, SWS0, 0x8000);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static int flashrestart(struct airo_info *ai, struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	int    i, status;</div><div class='del'>-</div><div class='del'>-	ssleep(1);			/* Added 12/7/00 */</div><div class='del'>-	clear_bit (FLAG_FLASHING, &amp;ai-&gt;flags);</div><div class='del'>-	if (test_bit(FLAG_MPI, &amp;ai-&gt;flags)) {</div><div class='del'>-		status = mpi_init_descriptors(ai);</div><div class='del'>-		if (status != SUCCESS)</div><div class='del'>-			return status;</div><div class='del'>-	}</div><div class='del'>-	status = setup_card(ai, dev-&gt;dev_addr, 1);</div><div class='del'>-</div><div class='del'>-	if (!test_bit(FLAG_MPI,&amp;ai-&gt;flags))</div><div class='del'>-		for (i = 0; i &lt; MAX_FIDS; i++) {</div><div class='del'>-			ai-&gt;fids[i] = transmit_allocate</div><div class='del'>-				(ai, AIRO_DEF_MTU, i &gt;= MAX_FIDS / 2);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	ssleep(1);			/* Added 12/7/00 */</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-#endif /* CISCO_EXT */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-    This program is free software; you can redistribute it and/or</div><div class='del'>-    modify it under the terms of the GNU General Public License</div><div class='del'>-    as published by the Free Software Foundation; either version 2</div><div class='del'>-    of the License, or (at your option) any later version.</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    In addition:</div><div class='del'>-</div><div class='del'>-    Redistribution and use in source and binary forms, with or without</div><div class='del'>-    modification, are permitted provided that the following conditions</div><div class='del'>-    are met:</div><div class='del'>-</div><div class='del'>-    1. Redistributions of source code must retain the above copyright</div><div class='del'>-       notice, this list of conditions and the following disclaimer.</div><div class='del'>-    2. Redistributions in binary form must reproduce the above copyright</div><div class='del'>-       notice, this list of conditions and the following disclaimer in the</div><div class='del'>-       documentation and/or other materials provided with the distribution.</div><div class='del'>-    3. The name of the author may not be used to endorse or promote</div><div class='del'>-       products derived from this software without specific prior written</div><div class='del'>-       permission.</div><div class='del'>-</div><div class='del'>-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR</div><div class='del'>-    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='del'>-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>-    ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,</div><div class='del'>-    INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR</div><div class='del'>-    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)</div><div class='del'>-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,</div><div class='del'>-    STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING</div><div class='del'>-    IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE</div><div class='del'>-    POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-module_init(airo_init_module);</div><div class='del'>-module_exit(airo_cleanup_module);</div><div class='head'>diff --git a/drivers/net/wireless/cisco/airo.h b/drivers/net/wireless/cisco/airo.h<br/>deleted file mode 100644<br/>index 8a02977a2e2b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/cisco/airo.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/cisco/airo.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _AIRO_H_</div><div class='del'>-#define _AIRO_H_</div><div class='del'>-</div><div class='del'>-struct net_device *init_airo_card(unsigned short irq, int port, int is_pcmcia,</div><div class='del'>-				  struct device *dmdev);</div><div class='del'>-int reset_airo_card(struct net_device *dev);</div><div class='del'>-void stop_airo_card(struct net_device *dev, int freeres);</div><div class='del'>-</div><div class='del'>-#endif  /*  _AIRO_H_  */</div><div class='head'>diff --git a/drivers/net/wireless/cisco/airo_cs.c b/drivers/net/wireless/cisco/airo_cs.c<br/>deleted file mode 100644<br/>index fcfe4c6d62f0..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/cisco/airo_cs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/cisco/airo_cs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,218 +0,0 @@</div><div class='del'>-/*======================================================================</div><div class='del'>-</div><div class='del'>-    Aironet driver for 4500 and 4800 series cards</div><div class='del'>-</div><div class='del'>-    This code is released under both the GPL version 2 and BSD licenses.</div><div class='del'>-    Either license may be used.  The respective licenses are found at</div><div class='del'>-    the end of this file.</div><div class='del'>-</div><div class='del'>-    This code was developed by Benjamin Reed &lt;breed@users.sourceforge.net&gt;</div><div class='del'>-    including portions of which come from the Aironet PC4500</div><div class='del'>-    Developer's Reference Manual and used with permission.  Copyright</div><div class='del'>-    (C) 1999 Benjamin Reed.  All Rights Reserved.  Permission to use</div><div class='del'>-    code in the Developer's manual was granted for this driver by</div><div class='del'>-    Aironet.</div><div class='del'>-</div><div class='del'>-    In addition this module was derived from dummy_cs.</div><div class='del'>-    The initial developer of dummy_cs is David A. Hinds</div><div class='del'>-    &lt;dahinds@users.sourceforge.net&gt;.  Portions created by David A. Hinds</div><div class='del'>-    are Copyright (C) 1999 David A. Hinds.  All Rights Reserved.</div><div class='del'>-</div><div class='del'>-======================================================================*/</div><div class='del'>-</div><div class='del'>-#ifdef __IN_PCMCIA_PACKAGE__</div><div class='del'>-#include &lt;pcmcia/k_compat.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/ptrace.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;pcmcia/cistpl.h&gt;</div><div class='del'>-#include &lt;pcmcia/cisreg.h&gt;</div><div class='del'>-#include &lt;pcmcia/ds.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include "airo.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*====================================================================*/</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Benjamin Reed");</div><div class='del'>-MODULE_DESCRIPTION("Support for Cisco/Aironet 802.11 wireless ethernet "</div><div class='del'>-		   "cards.  This is the module that links the PCMCIA card "</div><div class='del'>-		   "with the airo module.");</div><div class='del'>-MODULE_LICENSE("Dual BSD/GPL");</div><div class='del'>-</div><div class='del'>-/*====================================================================*/</div><div class='del'>-</div><div class='del'>-static int airo_config(struct pcmcia_device *link);</div><div class='del'>-static void airo_release(struct pcmcia_device *link);</div><div class='del'>-</div><div class='del'>-static void airo_detach(struct pcmcia_device *p_dev);</div><div class='del'>-</div><div class='del'>-struct local_info {</div><div class='del'>-	struct net_device *eth_dev;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int airo_probe(struct pcmcia_device *p_dev)</div><div class='del'>-{</div><div class='del'>-	struct local_info *local;</div><div class='del'>-</div><div class='del'>-	dev_dbg(&amp;p_dev-&gt;dev, "airo_attach()\n");</div><div class='del'>-</div><div class='del'>-	/* Allocate space for private device-specific data */</div><div class='del'>-	local = kzalloc(sizeof(*local), GFP_KERNEL);</div><div class='del'>-	if (!local)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	p_dev-&gt;priv = local;</div><div class='del'>-</div><div class='del'>-	return airo_config(p_dev);</div><div class='del'>-} /* airo_attach */</div><div class='del'>-</div><div class='del'>-static void airo_detach(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	dev_dbg(&amp;link-&gt;dev, "airo_detach\n");</div><div class='del'>-</div><div class='del'>-	airo_release(link);</div><div class='del'>-</div><div class='del'>-	if (((struct local_info *)link-&gt;priv)-&gt;eth_dev) {</div><div class='del'>-		stop_airo_card(((struct local_info *)link-&gt;priv)-&gt;eth_dev,</div><div class='del'>-			       0);</div><div class='del'>-	}</div><div class='del'>-	((struct local_info *)link-&gt;priv)-&gt;eth_dev = NULL;</div><div class='del'>-</div><div class='del'>-	kfree(link-&gt;priv);</div><div class='del'>-} /* airo_detach */</div><div class='del'>-</div><div class='del'>-static int airo_cs_config_check(struct pcmcia_device *p_dev, void *priv_data)</div><div class='del'>-{</div><div class='del'>-	if (p_dev-&gt;config_index == 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return pcmcia_request_io(p_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int airo_config(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	dev_dbg(&amp;link-&gt;dev, "airo_config\n");</div><div class='del'>-</div><div class='del'>-	link-&gt;config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_VPP |</div><div class='del'>-		CONF_AUTO_AUDIO | CONF_AUTO_SET_IO;</div><div class='del'>-</div><div class='del'>-	ret = pcmcia_loop_config(link, airo_cs_config_check, NULL);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto failed;</div><div class='del'>-</div><div class='del'>-	if (!link-&gt;irq)</div><div class='del'>-		goto failed;</div><div class='del'>-</div><div class='del'>-	ret = pcmcia_enable_device(link);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto failed;</div><div class='del'>-	((struct local_info *)link-&gt;priv)-&gt;eth_dev =</div><div class='del'>-		init_airo_card(link-&gt;irq,</div><div class='del'>-			       link-&gt;resource[0]-&gt;start, 1, &amp;link-&gt;dev);</div><div class='del'>-	if (!((struct local_info *)link-&gt;priv)-&gt;eth_dev)</div><div class='del'>-		goto failed;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- failed:</div><div class='del'>-	airo_release(link);</div><div class='del'>-	return -ENODEV;</div><div class='del'>-} /* airo_config */</div><div class='del'>-</div><div class='del'>-static void airo_release(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	dev_dbg(&amp;link-&gt;dev, "airo_release\n");</div><div class='del'>-	pcmcia_disable_device(link);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int airo_suspend(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	struct local_info *local = link-&gt;priv;</div><div class='del'>-</div><div class='del'>-	netif_device_detach(local-&gt;eth_dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int airo_resume(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	struct local_info *local = link-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (link-&gt;open) {</div><div class='del'>-		reset_airo_card(local-&gt;eth_dev);</div><div class='del'>-		netif_device_attach(local-&gt;eth_dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct pcmcia_device_id airo_ids[] = {</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x015f, 0x000a),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x015f, 0x0005),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x015f, 0x0007),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x0105, 0x0007),</div><div class='del'>-	PCMCIA_DEVICE_NULL,</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(pcmcia, airo_ids);</div><div class='del'>-</div><div class='del'>-static struct pcmcia_driver airo_driver = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.name		= "airo_cs",</div><div class='del'>-	.probe		= airo_probe,</div><div class='del'>-	.remove		= airo_detach,</div><div class='del'>-	.id_table       = airo_ids,</div><div class='del'>-	.suspend	= airo_suspend,</div><div class='del'>-	.resume		= airo_resume,</div><div class='del'>-};</div><div class='del'>-module_pcmcia_driver(airo_driver);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-    This program is free software; you can redistribute it and/or</div><div class='del'>-    modify it under the terms of the GNU General Public License</div><div class='del'>-    as published by the Free Software Foundation; either version 2</div><div class='del'>-    of the License, or (at your option) any later version.</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    In addition:</div><div class='del'>-</div><div class='del'>-    Redistribution and use in source and binary forms, with or without</div><div class='del'>-    modification, are permitted provided that the following conditions</div><div class='del'>-    are met:</div><div class='del'>-</div><div class='del'>-    1. Redistributions of source code must retain the above copyright</div><div class='del'>-       notice, this list of conditions and the following disclaimer.</div><div class='del'>-    2. Redistributions in binary form must reproduce the above copyright</div><div class='del'>-       notice, this list of conditions and the following disclaimer in the</div><div class='del'>-       documentation and/or other materials provided with the distribution.</div><div class='del'>-    3. The name of the author may not be used to endorse or promote</div><div class='del'>-       products derived from this software without specific prior written</div><div class='del'>-       permission.</div><div class='del'>-</div><div class='del'>-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR</div><div class='del'>-    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='del'>-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>-    ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,</div><div class='del'>-    INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR</div><div class='del'>-    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)</div><div class='del'>-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,</div><div class='del'>-    STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING</div><div class='del'>-    IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE</div><div class='del'>-    POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>-*/</div><div class='head'>diff --git a/drivers/net/wireless/intel/Makefile b/drivers/net/wireless/intel/Makefile<br/>index 1364b0014488..208e73a16051 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/Makefile</a></div><div class='hunk'>@@ -5,3 +5,4 @@ obj-$(CONFIG_IPW2200) += ipw2x00/</div><div class='ctx'> obj-$(CONFIG_IWLEGACY)	+= iwlegacy/</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_IWLWIFI)	+= iwlwifi/</div><div class='add'>+obj-$(CONFIG_IWLMEI)	+= iwlwifi/</div><div class='head'>diff --git a/drivers/net/wireless/intel/ipw2x00/Kconfig b/drivers/net/wireless/intel/ipw2x00/Kconfig<br/>index 1650d5865aa0..b92df91adb3a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/ipw2x00/Kconfig</a></div><div class='hunk'>@@ -7,10 +7,8 @@ config IPW2100</div><div class='ctx'> 	tristate "Intel PRO/Wireless 2100 Network Connection"</div><div class='ctx'> 	depends on PCI &amp;&amp; CFG80211</div><div class='ctx'> 	select WIRELESS_EXT</div><div class='del'>-	select WEXT_SPY</div><div class='ctx'> 	select WEXT_PRIV</div><div class='ctx'> 	select FW_LOADER</div><div class='del'>-	select LIB80211</div><div class='ctx'> 	select LIBIPW</div><div class='ctx'> 	help</div><div class='ctx'> 	  A driver for the Intel PRO/Wireless 2100 Network</div><div class='hunk'>@@ -67,12 +65,9 @@ config IPW2100_DEBUG</div><div class='ctx'> config IPW2200</div><div class='ctx'> 	tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"</div><div class='ctx'> 	depends on PCI &amp;&amp; CFG80211</div><div class='del'>-	select CFG80211_WEXT_EXPORT</div><div class='ctx'> 	select WIRELESS_EXT</div><div class='del'>-	select WEXT_SPY</div><div class='ctx'> 	select WEXT_PRIV</div><div class='ctx'> 	select FW_LOADER</div><div class='del'>-	select LIB80211</div><div class='ctx'> 	select LIBIPW</div><div class='ctx'> 	help</div><div class='ctx'> 	  A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network</div><div class='hunk'>@@ -158,14 +153,10 @@ config LIBIPW</div><div class='ctx'> 	tristate</div><div class='ctx'> 	depends on PCI &amp;&amp; CFG80211</div><div class='ctx'> 	select WIRELESS_EXT</div><div class='del'>-	select WEXT_SPY</div><div class='ctx'> 	select CRYPTO</div><div class='ctx'> 	select CRYPTO_MICHAEL_MIC</div><div class='add'>+	select CRYPTO_LIB_ARC4</div><div class='ctx'> 	select CRC32</div><div class='del'>-	select LIB80211</div><div class='del'>-	select LIB80211_CRYPT_WEP</div><div class='del'>-	select LIB80211_CRYPT_TKIP</div><div class='del'>-	select LIB80211_CRYPT_CCMP</div><div class='ctx'> 	help</div><div class='ctx'> 	This option enables the hardware independent IEEE 802.11</div><div class='ctx'> 	networking stack.  This component is deprecated in favor of the</div><div class='head'>diff --git a/drivers/net/wireless/intel/ipw2x00/Makefile b/drivers/net/wireless/intel/ipw2x00/Makefile<br/>index e1ec50359dff..91e6091c4ebf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/ipw2x00/Makefile</a></div><div class='hunk'>@@ -12,4 +12,9 @@ libipw-objs := \</div><div class='ctx'> 	libipw_tx.o \</div><div class='ctx'> 	libipw_rx.o \</div><div class='ctx'> 	libipw_wx.o \</div><div class='del'>-	libipw_geo.o</div><div class='add'>+	libipw_geo.o \</div><div class='add'>+	libipw_spy.o \</div><div class='add'>+	libipw_crypto.o \</div><div class='add'>+	libipw_crypto_ccmp.o \</div><div class='add'>+	libipw_crypto_tkip.o \</div><div class='add'>+	libipw_crypto_wep.o</div><div class='head'>diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c<br/>index 23fbddd0c1f8..c7c5bc0f1650 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/ipw2100.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/ipw2100.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/ipw2100.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/ipw2x00/ipw2100.c</a></div><div class='hunk'>@@ -148,9 +148,6 @@ that only one external action is invoked at a time.</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/pm_qos.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/lib80211.h&gt;</div><div class='del'>-</div><div class='ctx'> #include "ipw2100.h"</div><div class='ctx'> #include "ipw.h"</div><div class='ctx'> </div><div class='hunk'>@@ -317,8 +314,6 @@ static int ipw2100_get_firmware(struct ipw2100_priv *priv,</div><div class='ctx'> 				struct ipw2100_fw *fw);</div><div class='ctx'> static int ipw2100_get_fwversion(struct ipw2100_priv *priv, char *buf,</div><div class='ctx'> 				 size_t max);</div><div class='del'>-static int ipw2100_get_ucodeversion(struct ipw2100_priv *priv, char *buf,</div><div class='del'>-				    size_t max);</div><div class='ctx'> static void ipw2100_release_firmware(struct ipw2100_priv *priv,</div><div class='ctx'> 				     struct ipw2100_fw *fw);</div><div class='ctx'> static int ipw2100_ucode_download(struct ipw2100_priv *priv,</div><div class='hunk'>@@ -418,17 +413,6 @@ static inline void write_nic_byte(struct net_device *dev, u32 addr, u8 val)</div><div class='ctx'> 	write_register_byte(dev, IPW_REG_INDIRECT_ACCESS_DATA, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void write_nic_auto_inc_address(struct net_device *dev, u32 addr)</div><div class='del'>-{</div><div class='del'>-	write_register(dev, IPW_REG_AUTOINCREMENT_ADDRESS,</div><div class='del'>-		       addr &amp; IPW_REG_INDIRECT_ADDR_MASK);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void write_nic_dword_auto_inc(struct net_device *dev, u32 val)</div><div class='del'>-{</div><div class='del'>-	write_register(dev, IPW_REG_AUTOINCREMENT_DATA, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void write_nic_memory(struct net_device *dev, u32 addr, u32 len,</div><div class='ctx'> 				    const u8 * buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -2159,7 +2143,7 @@ static void isr_indicate_rf_kill(struct ipw2100_priv *priv, u32 status)</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure the RF Kill check timer is running */</div><div class='ctx'> 	priv-&gt;stop_rf_kill = 0;</div><div class='del'>-	mod_delayed_work(system_wq, &amp;priv-&gt;rf_kill, round_jiffies_relative(HZ));</div><div class='add'>+	mod_delayed_work(system_percpu_wq, &amp;priv-&gt;rf_kill, round_jiffies_relative(HZ));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ipw2100_scan_event(struct work_struct *work)</div><div class='hunk'>@@ -2186,7 +2170,7 @@ static void isr_scan_complete(struct ipw2100_priv *priv, u32 status)</div><div class='ctx'> 				      round_jiffies_relative(msecs_to_jiffies(4000)));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		priv-&gt;user_requested_scan = 0;</div><div class='del'>-		mod_delayed_work(system_wq, &amp;priv-&gt;scan_event, 0);</div><div class='add'>+		mod_delayed_work(system_percpu_wq, &amp;priv-&gt;scan_event, 0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2531,7 +2515,7 @@ static void isr_rx_monitor(struct ipw2100_priv *priv, int i,</div><div class='ctx'> 	 * to build this manually element by element, we can write it much</div><div class='ctx'> 	 * more efficiently than we can parse it. ORDER MATTERS HERE */</div><div class='ctx'> 	struct ipw_rt_hdr {</div><div class='del'>-		struct ieee80211_radiotap_header rt_hdr;</div><div class='add'>+		struct ieee80211_radiotap_header_fixed rt_hdr;</div><div class='ctx'> 		s8 rt_dbmsignal; /* signal in dbM, kluged to signed */</div><div class='ctx'> 	} *ipw_rt;</div><div class='ctx'> </div><div class='hunk'>@@ -3501,7 +3485,7 @@ static void ipw2100_msg_free(struct ipw2100_priv *priv)</div><div class='ctx'> 	priv-&gt;msg_buffers = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_pci(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t pci_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pci_dev = to_pci_dev(d);</div><div class='hunk'>@@ -3521,34 +3505,34 @@ static ssize_t show_pci(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 	return out - buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(pci, 0444, show_pci, NULL);</div><div class='add'>+static DEVICE_ATTR_RO(pci);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_cfg(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t cfg_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw2100_priv *p = dev_get_drvdata(d);</div><div class='ctx'> 	return sprintf(buf, "0x%08x\n", (int)p-&gt;config);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(cfg, 0444, show_cfg, NULL);</div><div class='add'>+static DEVICE_ATTR_RO(cfg);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_status(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t status_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw2100_priv *p = dev_get_drvdata(d);</div><div class='ctx'> 	return sprintf(buf, "0x%08x\n", (int)p-&gt;status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(status, 0444, show_status, NULL);</div><div class='add'>+static DEVICE_ATTR_RO(status);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_capability(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t capability_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			       char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw2100_priv *p = dev_get_drvdata(d);</div><div class='ctx'> 	return sprintf(buf, "0x%08x\n", (int)p-&gt;capability);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(capability, 0444, show_capability, NULL);</div><div class='add'>+static DEVICE_ATTR_RO(capability);</div><div class='ctx'> </div><div class='ctx'> #define IPW2100_REG(x) { IPW_ ##x, #x }</div><div class='ctx'> static const struct {</div><div class='hunk'>@@ -3785,7 +3769,7 @@ IPW2100_ORD(STAT_TX_HOST_REQUESTS, "requested Host Tx's (MSDU)"),</div><div class='ctx'> 	    IPW2100_ORD(NIC_MANF_DATE_TIME, "MANF Date/Time STAMP"),</div><div class='ctx'> 	    IPW2100_ORD(UCODE_VERSION, "Ucode Version"),};</div><div class='ctx'> </div><div class='del'>-static ssize_t show_registers(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t registers_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			      char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -3805,9 +3789,9 @@ static ssize_t show_registers(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 	return out - buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(registers, 0444, show_registers, NULL);</div><div class='add'>+static DEVICE_ATTR_RO(registers);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_hardware(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t hardware_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			     char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw2100_priv *priv = dev_get_drvdata(d);</div><div class='hunk'>@@ -3846,9 +3830,9 @@ static ssize_t show_hardware(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 	return out - buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(hardware, 0444, show_hardware, NULL);</div><div class='add'>+static DEVICE_ATTR_RO(hardware);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_memory(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t memory_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw2100_priv *priv = dev_get_drvdata(d);</div><div class='hunk'>@@ -3905,7 +3889,7 @@ static ssize_t show_memory(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t store_memory(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t memory_store(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw2100_priv *priv = dev_get_drvdata(d);</div><div class='hunk'>@@ -3940,9 +3924,9 @@ static ssize_t store_memory(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(memory, 0644, show_memory, store_memory);</div><div class='add'>+static DEVICE_ATTR_RW(memory);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_ordinals(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t ordinals_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			     char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw2100_priv *priv = dev_get_drvdata(d);</div><div class='hunk'>@@ -3976,9 +3960,9 @@ static ssize_t show_ordinals(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(ordinals, 0444, show_ordinals, NULL);</div><div class='add'>+static DEVICE_ATTR_RO(ordinals);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_stats(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t stats_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			  char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw2100_priv *priv = dev_get_drvdata(d);</div><div class='hunk'>@@ -3997,7 +3981,7 @@ static ssize_t show_stats(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 	return out - buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(stats, 0444, show_stats, NULL);</div><div class='add'>+static DEVICE_ATTR_RO(stats);</div><div class='ctx'> </div><div class='ctx'> static int ipw2100_switch_mode(struct ipw2100_priv *priv, u32 mode)</div><div class='ctx'> {</div><div class='hunk'>@@ -4043,7 +4027,7 @@ static int ipw2100_switch_mode(struct ipw2100_priv *priv, u32 mode)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_internals(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t internals_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			      char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw2100_priv *priv = dev_get_drvdata(d);</div><div class='hunk'>@@ -4095,9 +4079,9 @@ static ssize_t show_internals(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(internals, 0444, show_internals, NULL);</div><div class='add'>+static DEVICE_ATTR_RO(internals);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_bssinfo(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t bssinfo_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			    char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw2100_priv *priv = dev_get_drvdata(d);</div><div class='hunk'>@@ -4140,7 +4124,7 @@ static ssize_t show_bssinfo(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 	return out - buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(bssinfo, 0444, show_bssinfo, NULL);</div><div class='add'>+static DEVICE_ATTR_RO(bssinfo);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPW2100_DEBUG</div><div class='ctx'> static ssize_t debug_level_show(struct device_driver *d, char *buf)</div><div class='hunk'>@@ -4165,7 +4149,7 @@ static ssize_t debug_level_store(struct device_driver *d,</div><div class='ctx'> static DRIVER_ATTR_RW(debug_level);</div><div class='ctx'> #endif				/* CONFIG_IPW2100_DEBUG */</div><div class='ctx'> </div><div class='del'>-static ssize_t show_fatal_error(struct device *d,</div><div class='add'>+static ssize_t fatal_error_show(struct device *d,</div><div class='ctx'> 				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw2100_priv *priv = dev_get_drvdata(d);</div><div class='hunk'>@@ -4190,7 +4174,7 @@ static ssize_t show_fatal_error(struct device *d,</div><div class='ctx'> 	return out - buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t store_fatal_error(struct device *d,</div><div class='add'>+static ssize_t fatal_error_store(struct device *d,</div><div class='ctx'> 				 struct device_attribute *attr, const char *buf,</div><div class='ctx'> 				 size_t count)</div><div class='ctx'> {</div><div class='hunk'>@@ -4199,16 +4183,16 @@ static ssize_t store_fatal_error(struct device *d,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(fatal_error, 0644, show_fatal_error, store_fatal_error);</div><div class='add'>+static DEVICE_ATTR_RW(fatal_error);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_scan_age(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t scan_age_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			     char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw2100_priv *priv = dev_get_drvdata(d);</div><div class='ctx'> 	return sprintf(buf, "%d\n", priv-&gt;ieee-&gt;scan_age);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t store_scan_age(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t scan_age_store(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			      const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw2100_priv *priv = dev_get_drvdata(d);</div><div class='hunk'>@@ -4232,9 +4216,9 @@ static ssize_t store_scan_age(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 	return strnlen(buf, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(scan_age, 0644, show_scan_age, store_scan_age);</div><div class='add'>+static DEVICE_ATTR_RW(scan_age);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_rf_kill(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t rf_kill_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			    char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	/* 0 - RF kill not enabled</div><div class='hunk'>@@ -4268,7 +4252,7 @@ static int ipw_radio_kill_sw(struct ipw2100_priv *priv, int disable_radio)</div><div class='ctx'> 					  "disabled by HW switch\n");</div><div class='ctx'> 			/* Make sure the RF_KILL check timer is running */</div><div class='ctx'> 			priv-&gt;stop_rf_kill = 0;</div><div class='del'>-			mod_delayed_work(system_wq, &amp;priv-&gt;rf_kill,</div><div class='add'>+			mod_delayed_work(system_percpu_wq, &amp;priv-&gt;rf_kill,</div><div class='ctx'> 					 round_jiffies_relative(HZ));</div><div class='ctx'> 		} else</div><div class='ctx'> 			schedule_reset(priv);</div><div class='hunk'>@@ -4278,7 +4262,7 @@ static int ipw_radio_kill_sw(struct ipw2100_priv *priv, int disable_radio)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t store_rf_kill(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t rf_kill_store(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw2100_priv *priv = dev_get_drvdata(d);</div><div class='hunk'>@@ -4286,7 +4270,7 @@ static ssize_t store_rf_kill(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(rf_kill, 0644, show_rf_kill, store_rf_kill);</div><div class='add'>+static DEVICE_ATTR_RW(rf_kill);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *ipw2100_sysfs_entries[] = {</div><div class='ctx'> 	&amp;dev_attr_hardware.attr,</div><div class='hunk'>@@ -4685,7 +4669,7 @@ static int ipw2100_read_mac_address(struct ipw2100_priv *priv)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(priv-&gt;net_dev-&gt;dev_addr, addr, ETH_ALEN);</div><div class='add'>+	eth_hw_addr_set(priv-&gt;net_dev, addr);</div><div class='ctx'> 	IPW_DEBUG_INFO("card MAC is %pM\n", priv-&gt;net_dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -4712,7 +4696,7 @@ static int ipw2100_set_mac_address(struct ipw2100_priv *priv, int batch_mode)</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;config &amp; CFG_CUSTOM_MAC) {</div><div class='ctx'> 		memcpy(cmd.host_command_parameters, priv-&gt;mac_addr, ETH_ALEN);</div><div class='del'>-		memcpy(priv-&gt;net_dev-&gt;dev_addr, priv-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(priv-&gt;net_dev, priv-&gt;mac_addr);</div><div class='ctx'> 	} else</div><div class='ctx'> 		memcpy(cmd.host_command_parameters, priv-&gt;net_dev-&gt;dev_addr,</div><div class='ctx'> 		       ETH_ALEN);</div><div class='hunk'>@@ -5356,7 +5340,7 @@ struct ipw2100_wep_key {</div><div class='ctx'> #define WEP_STR_128(x) x[0],x[1],x[2],x[3],x[4],x[5],x[6],x[7],x[8],x[9],x[10]</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Set a the wep key</div><div class='add'>+ * ipw2100_set_key() - Set a the wep key</div><div class='ctx'>  *</div><div class='ctx'>  * @priv: struct to work on</div><div class='ctx'>  * @idx: index of the key we want to set</div><div class='hunk'>@@ -5905,18 +5889,15 @@ static void ipw_ethtool_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 				    struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw2100_priv *priv = libipw_priv(dev);</div><div class='del'>-	char fw_ver[64], ucode_ver[64];</div><div class='add'>+	char fw_ver[64];</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='ctx'> </div><div class='ctx'> 	ipw2100_get_fwversion(priv, fw_ver, sizeof(fw_ver));</div><div class='del'>-	ipw2100_get_ucodeversion(priv, ucode_ver, sizeof(ucode_ver));</div><div class='ctx'> </div><div class='del'>-	snprintf(info-&gt;fw_version, sizeof(info-&gt;fw_version), "%s:%d:%s",</div><div class='del'>-		 fw_ver, priv-&gt;eeprom_version, ucode_ver);</div><div class='del'>-</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(priv-&gt;pci_dev),</div><div class='add'>+	strscpy(info-&gt;fw_version, fw_ver, sizeof(info-&gt;fw_version));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(priv-&gt;pci_dev),</div><div class='ctx'> 		sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6041,8 +6022,6 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,</div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;ipw2100_netdev_ops;</div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;ipw2100_ethtool_ops;</div><div class='ctx'> 	dev-&gt;wireless_handlers = &amp;ipw2100_wx_handler_def;</div><div class='del'>-	priv-&gt;wireless_data.libipw = priv-&gt;ieee;</div><div class='del'>-	dev-&gt;wireless_data = &amp;priv-&gt;wireless_data;</div><div class='ctx'> 	dev-&gt;watchdog_timeo = 3 * HZ;</div><div class='ctx'> 	dev-&gt;irq = 0;</div><div class='ctx'> 	dev-&gt;min_mtu = 68;</div><div class='hunk'>@@ -6529,7 +6508,7 @@ static struct pci_driver ipw2100_pci_driver = {</div><div class='ctx'> 	.shutdown = ipw2100_shutdown,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Initialize the ipw2100 driver/module</div><div class='ctx'>  *</div><div class='ctx'>  * @returns 0 if ok, &lt; 0 errno node con error.</div><div class='hunk'>@@ -6561,7 +6540,7 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Cleanup ipw2100 driver registration</div><div class='ctx'>  */</div><div class='ctx'> static void __exit ipw2100_exit(void)</div><div class='hunk'>@@ -7587,7 +7566,7 @@ static int ipw2100_wx_set_auth(struct net_device *dev,</div><div class='ctx'> 	struct ipw2100_priv *priv = libipw_priv(dev);</div><div class='ctx'> 	struct libipw_device *ieee = priv-&gt;ieee;</div><div class='ctx'> 	struct iw_param *param = &amp;wrqu-&gt;param;</div><div class='del'>-	struct lib80211_crypt_data *crypt;</div><div class='add'>+	struct libipw_crypt_data *crypt;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -7679,7 +7658,7 @@ static int ipw2100_wx_get_auth(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw2100_priv *priv = libipw_priv(dev);</div><div class='ctx'> 	struct libipw_device *ieee = priv-&gt;ieee;</div><div class='del'>-	struct lib80211_crypt_data *crypt;</div><div class='add'>+	struct libipw_crypt_data *crypt;</div><div class='ctx'> 	struct iw_param *param = &amp;wrqu-&gt;param;</div><div class='ctx'> </div><div class='ctx'> 	switch (param-&gt;flags &amp; IW_AUTH_INDEX) {</div><div class='hunk'>@@ -8417,17 +8396,6 @@ static int ipw2100_get_fwversion(struct ipw2100_priv *priv, char *buf,</div><div class='ctx'> 	return tmp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ipw2100_get_ucodeversion(struct ipw2100_priv *priv, char *buf,</div><div class='del'>-				    size_t max)</div><div class='del'>-{</div><div class='del'>-	u32 ver;</div><div class='del'>-	u32 len = sizeof(ver);</div><div class='del'>-	/* microcode version is a 32 bit integer */</div><div class='del'>-	if (ipw2100_get_ordinal(priv, IPW_ORD_UCODE_VERSION, &amp;ver, &amp;len))</div><div class='del'>-		return -EIO;</div><div class='del'>-	return snprintf(buf, max, "%08X", ver);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * On exit, the firmware will have been freed from the fw list</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2100.h b/drivers/net/wireless/intel/ipw2x00/ipw2100.h<br/>index b34085ade3aa..6f81f509b9cb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/ipw2100.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/ipw2100.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/ipw2100.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/ipw2x00/ipw2100.h</a></div><div class='hunk'>@@ -554,8 +554,6 @@ struct ipw2100_priv {</div><div class='ctx'> 	struct net_device *net_dev;</div><div class='ctx'> 	struct iw_statistics wstats;</div><div class='ctx'> </div><div class='del'>-	struct iw_public_data wireless_data;</div><div class='del'>-</div><div class='ctx'> 	struct tasklet_struct irq_tasklet;</div><div class='ctx'> </div><div class='ctx'> 	struct delayed_work reset_work;</div><div class='head'>diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c<br/>index ada6ce32c1f1..09035a77e775 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/ipw2200.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/ipw2200.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/ipw2200.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/ipw2x00/ipw2200.c</a></div><div class='hunk'>@@ -199,7 +199,7 @@ static int ipw_queue_tx_reclaim(struct ipw_priv *priv,</div><div class='ctx'> 				struct clx2_tx_queue *txq, int qindex);</div><div class='ctx'> static int ipw_queue_reset(struct ipw_priv *priv);</div><div class='ctx'> </div><div class='del'>-static int ipw_queue_tx_hcmd(struct ipw_priv *priv, int hcmd, void *buf,</div><div class='add'>+static int ipw_queue_tx_hcmd(struct ipw_priv *priv, int hcmd, const void *buf,</div><div class='ctx'> 			     int len, int sync);</div><div class='ctx'> </div><div class='ctx'> static void ipw_tx_queue_free(struct ipw_priv *);</div><div class='hunk'>@@ -377,19 +377,6 @@ static inline u8 _ipw_read8(struct ipw_priv *ipw, unsigned long ofs)</div><div class='ctx'> 	_ipw_read8(ipw, ofs); \</div><div class='ctx'> })</div><div class='ctx'> </div><div class='del'>-/* 16-bit direct read (low 4K) */</div><div class='del'>-static inline u16 _ipw_read16(struct ipw_priv *ipw, unsigned long ofs)</div><div class='del'>-{</div><div class='del'>-	return readw(ipw-&gt;hw_base + ofs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* alias to 16-bit direct read (low 4K of SRAM/regs), with debug wrapper */</div><div class='del'>-#define ipw_read16(ipw, ofs) ({ \</div><div class='del'>-	IPW_DEBUG_IO("%s %d: read_direct16(0x%08X)\n", __FILE__, __LINE__, \</div><div class='del'>-			(u32)(ofs)); \</div><div class='del'>-	_ipw_read16(ipw, ofs); \</div><div class='del'>-})</div><div class='del'>-</div><div class='ctx'> /* 32-bit direct read (low 4K) */</div><div class='ctx'> static inline u32 _ipw_read32(struct ipw_priv *ipw, unsigned long ofs)</div><div class='ctx'> {</div><div class='hunk'>@@ -1189,23 +1176,20 @@ static ssize_t debug_level_show(struct device_driver *d, char *buf)</div><div class='ctx'> static ssize_t debug_level_store(struct device_driver *d, const char *buf,</div><div class='ctx'> 				 size_t count)</div><div class='ctx'> {</div><div class='del'>-	char *p = (char *)buf;</div><div class='del'>-	u32 val;</div><div class='add'>+	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (p[1] == 'x' || p[1] == 'X' || p[0] == 'x' || p[0] == 'X') {</div><div class='del'>-		p++;</div><div class='del'>-		if (p[0] == 'x' || p[0] == 'X')</div><div class='del'>-			p++;</div><div class='del'>-		val = simple_strtoul(p, &amp;p, 16);</div><div class='del'>-	} else</div><div class='del'>-		val = simple_strtoul(p, &amp;p, 10);</div><div class='del'>-	if (p == buf)</div><div class='add'>+	int result = kstrtoul(buf, 0, &amp;val);</div><div class='add'>+</div><div class='add'>+	if (result == -EINVAL)</div><div class='ctx'> 		printk(KERN_INFO DRV_NAME</div><div class='ctx'> 		       ": %s is not in hex or decimal form.\n", buf);</div><div class='add'>+	else if (result == -ERANGE)</div><div class='add'>+		printk(KERN_INFO DRV_NAME</div><div class='add'>+			 ": %s has overflowed.\n", buf);</div><div class='ctx'> 	else</div><div class='ctx'> 		ipw_debug_level = val;</div><div class='ctx'> </div><div class='del'>-	return strnlen(buf, count);</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> static DRIVER_ATTR_RW(debug_level);</div><div class='ctx'> </div><div class='hunk'>@@ -1234,9 +1218,9 @@ static struct ipw_fw_error *ipw_alloc_error_log(struct ipw_priv *priv)</div><div class='ctx'> 	u32 base = ipw_read32(priv, IPW_ERROR_LOG);</div><div class='ctx'> 	u32 elem_len = ipw_read_reg32(priv, base);</div><div class='ctx'> </div><div class='del'>-	error = kmalloc(sizeof(*error) +</div><div class='del'>-			sizeof(*error-&gt;elem) * elem_len +</div><div class='del'>-			sizeof(*error-&gt;log) * log_len, GFP_ATOMIC);</div><div class='add'>+	error = kmalloc(size_add(struct_size(error, elem, elem_len),</div><div class='add'>+				 array_size(sizeof(*error-&gt;log), log_len)),</div><div class='add'>+			GFP_ATOMIC);</div><div class='ctx'> 	if (!error) {</div><div class='ctx'> 		IPW_ERROR("Memory allocation for firmware error log "</div><div class='ctx'> 			  "failed.\n");</div><div class='hunk'>@@ -1247,7 +1231,6 @@ static struct ipw_fw_error *ipw_alloc_error_log(struct ipw_priv *priv)</div><div class='ctx'> 	error-&gt;config = priv-&gt;config;</div><div class='ctx'> 	error-&gt;elem_len = elem_len;</div><div class='ctx'> 	error-&gt;log_len = log_len;</div><div class='del'>-	error-&gt;elem = (struct ipw_error_elem *)error-&gt;payload;</div><div class='ctx'> 	error-&gt;log = (struct ipw_event *)(error-&gt;elem + elem_len);</div><div class='ctx'> </div><div class='ctx'> 	ipw_capture_event_log(priv, log_len, error-&gt;log);</div><div class='hunk'>@@ -1259,7 +1242,7 @@ static struct ipw_fw_error *ipw_alloc_error_log(struct ipw_priv *priv)</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_event_log(struct device *d,</div><div class='add'>+static ssize_t event_log_show(struct device *d,</div><div class='ctx'> 			      struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_priv *priv = dev_get_drvdata(d);</div><div class='hunk'>@@ -1289,9 +1272,9 @@ static ssize_t show_event_log(struct device *d,</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(event_log, 0444, show_event_log, NULL);</div><div class='add'>+static DEVICE_ATTR_RO(event_log);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_error(struct device *d,</div><div class='add'>+static ssize_t error_show(struct device *d,</div><div class='ctx'> 			  struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_priv *priv = dev_get_drvdata(d);</div><div class='hunk'>@@ -1326,7 +1309,7 @@ static ssize_t show_error(struct device *d,</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t clear_error(struct device *d,</div><div class='add'>+static ssize_t error_store(struct device *d,</div><div class='ctx'> 			   struct device_attribute *attr,</div><div class='ctx'> 			   const char *buf, size_t count)</div><div class='ctx'> {</div><div class='hunk'>@@ -1337,9 +1320,9 @@ static ssize_t clear_error(struct device *d,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(error, 0644, show_error, clear_error);</div><div class='add'>+static DEVICE_ATTR_RW(error);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_cmd_log(struct device *d,</div><div class='add'>+static ssize_t cmd_log_show(struct device *d,</div><div class='ctx'> 			    struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_priv *priv = dev_get_drvdata(d);</div><div class='hunk'>@@ -1364,12 +1347,12 @@ static ssize_t show_cmd_log(struct device *d,</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(cmd_log, 0444, show_cmd_log, NULL);</div><div class='add'>+static DEVICE_ATTR_RO(cmd_log);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPW2200_PROMISCUOUS</div><div class='ctx'> static void ipw_prom_free(struct ipw_priv *priv);</div><div class='ctx'> static int ipw_prom_alloc(struct ipw_priv *priv);</div><div class='del'>-static ssize_t store_rtap_iface(struct device *d,</div><div class='add'>+static ssize_t rtap_iface_store(struct device *d,</div><div class='ctx'> 			 struct device_attribute *attr,</div><div class='ctx'> 			 const char *buf, size_t count)</div><div class='ctx'> {</div><div class='hunk'>@@ -1414,7 +1397,7 @@ static ssize_t store_rtap_iface(struct device *d,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_rtap_iface(struct device *d,</div><div class='add'>+static ssize_t rtap_iface_show(struct device *d,</div><div class='ctx'> 			struct device_attribute *attr,</div><div class='ctx'> 			char *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -1429,9 +1412,9 @@ static ssize_t show_rtap_iface(struct device *d,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(rtap_iface, 0600, show_rtap_iface, store_rtap_iface);</div><div class='add'>+static DEVICE_ATTR_ADMIN_RW(rtap_iface);</div><div class='ctx'> </div><div class='del'>-static ssize_t store_rtap_filter(struct device *d,</div><div class='add'>+static ssize_t rtap_filter_store(struct device *d,</div><div class='ctx'> 			 struct device_attribute *attr,</div><div class='ctx'> 			 const char *buf, size_t count)</div><div class='ctx'> {</div><div class='hunk'>@@ -1451,7 +1434,7 @@ static ssize_t store_rtap_filter(struct device *d,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_rtap_filter(struct device *d,</div><div class='add'>+static ssize_t rtap_filter_show(struct device *d,</div><div class='ctx'> 			struct device_attribute *attr,</div><div class='ctx'> 			char *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -1460,40 +1443,28 @@ static ssize_t show_rtap_filter(struct device *d,</div><div class='ctx'> 		       priv-&gt;prom_priv ? priv-&gt;prom_priv-&gt;filter : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(rtap_filter, 0600, show_rtap_filter, store_rtap_filter);</div><div class='add'>+static DEVICE_ATTR_ADMIN_RW(rtap_filter);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static ssize_t show_scan_age(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t scan_age_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			     char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_priv *priv = dev_get_drvdata(d);</div><div class='ctx'> 	return sprintf(buf, "%d\n", priv-&gt;ieee-&gt;scan_age);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t store_scan_age(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t scan_age_store(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			      const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_priv *priv = dev_get_drvdata(d);</div><div class='ctx'> 	struct net_device *dev = priv-&gt;net_dev;</div><div class='del'>-	char buffer[] = "00000000";</div><div class='del'>-	unsigned long len =</div><div class='del'>-	    (sizeof(buffer) - 1) &gt; count ? count : sizeof(buffer) - 1;</div><div class='del'>-	unsigned long val;</div><div class='del'>-	char *p = buffer;</div><div class='ctx'> </div><div class='ctx'> 	IPW_DEBUG_INFO("enter\n");</div><div class='ctx'> </div><div class='del'>-	strncpy(buffer, buf, len);</div><div class='del'>-	buffer[len] = 0;</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int result = kstrtoul(buf, 0, &amp;val);</div><div class='ctx'> </div><div class='del'>-	if (p[1] == 'x' || p[1] == 'X' || p[0] == 'x' || p[0] == 'X') {</div><div class='del'>-		p++;</div><div class='del'>-		if (p[0] == 'x' || p[0] == 'X')</div><div class='del'>-			p++;</div><div class='del'>-		val = simple_strtoul(p, &amp;p, 16);</div><div class='del'>-	} else</div><div class='del'>-		val = simple_strtoul(p, &amp;p, 10);</div><div class='del'>-	if (p == buffer) {</div><div class='add'>+	if (result == -EINVAL || result == -ERANGE) {</div><div class='ctx'> 		IPW_DEBUG_INFO("%s: user supplied invalid value.\n", dev-&gt;name);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		priv-&gt;ieee-&gt;scan_age = val;</div><div class='hunk'>@@ -1501,19 +1472,19 @@ static ssize_t store_scan_age(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	IPW_DEBUG_INFO("exit\n");</div><div class='del'>-	return len;</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(scan_age, 0644, show_scan_age, store_scan_age);</div><div class='add'>+static DEVICE_ATTR_RW(scan_age);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_led(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t led_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_priv *priv = dev_get_drvdata(d);</div><div class='ctx'> 	return sprintf(buf, "%d\n", (priv-&gt;config &amp; CFG_NO_LED) ? 0 : 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t store_led(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t led_store(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			 const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_priv *priv = dev_get_drvdata(d);</div><div class='hunk'>@@ -1537,36 +1508,36 @@ static ssize_t store_led(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(led, 0644, show_led, store_led);</div><div class='add'>+static DEVICE_ATTR_RW(led);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_status(struct device *d,</div><div class='add'>+static ssize_t status_show(struct device *d,</div><div class='ctx'> 			   struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_priv *p = dev_get_drvdata(d);</div><div class='ctx'> 	return sprintf(buf, "0x%08x\n", (int)p-&gt;status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(status, 0444, show_status, NULL);</div><div class='add'>+static DEVICE_ATTR_RO(status);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_cfg(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t cfg_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_priv *p = dev_get_drvdata(d);</div><div class='ctx'> 	return sprintf(buf, "0x%08x\n", (int)p-&gt;config);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(cfg, 0444, show_cfg, NULL);</div><div class='add'>+static DEVICE_ATTR_RO(cfg);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_nic_type(struct device *d,</div><div class='add'>+static ssize_t nic_type_show(struct device *d,</div><div class='ctx'> 			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_priv *priv = dev_get_drvdata(d);</div><div class='ctx'> 	return sprintf(buf, "TYPE: %d\n", priv-&gt;nic_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(nic_type, 0444, show_nic_type, NULL);</div><div class='add'>+static DEVICE_ATTR_RO(nic_type);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_ucode_version(struct device *d,</div><div class='add'>+static ssize_t ucode_version_show(struct device *d,</div><div class='ctx'> 				  struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	u32 len = sizeof(u32), tmp = 0;</div><div class='hunk'>@@ -1578,9 +1549,9 @@ static ssize_t show_ucode_version(struct device *d,</div><div class='ctx'> 	return sprintf(buf, "0x%08x\n", tmp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(ucode_version, 0644, show_ucode_version, NULL);</div><div class='add'>+static DEVICE_ATTR_RO(ucode_version);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_rtc(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t rtc_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	u32 len = sizeof(u32), tmp = 0;</div><div class='hunk'>@@ -1592,20 +1563,20 @@ static ssize_t show_rtc(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "0x%08x\n", tmp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(rtc, 0644, show_rtc, NULL);</div><div class='add'>+static DEVICE_ATTR_RO(rtc);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Add a device attribute to view/control the delay between eeprom</div><div class='ctx'>  * operations.</div><div class='ctx'>  */</div><div class='del'>-static ssize_t show_eeprom_delay(struct device *d,</div><div class='add'>+static ssize_t eeprom_delay_show(struct device *d,</div><div class='ctx'> 				 struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_priv *p = dev_get_drvdata(d);</div><div class='ctx'> 	int n = p-&gt;eeprom_delay;</div><div class='ctx'> 	return sprintf(buf, "%i\n", n);</div><div class='ctx'> }</div><div class='del'>-static ssize_t store_eeprom_delay(struct device *d,</div><div class='add'>+static ssize_t eeprom_delay_store(struct device *d,</div><div class='ctx'> 				  struct device_attribute *attr,</div><div class='ctx'> 				  const char *buf, size_t count)</div><div class='ctx'> {</div><div class='hunk'>@@ -1614,9 +1585,9 @@ static ssize_t store_eeprom_delay(struct device *d,</div><div class='ctx'> 	return strnlen(buf, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(eeprom_delay, 0644, show_eeprom_delay, store_eeprom_delay);</div><div class='add'>+static DEVICE_ATTR_RW(eeprom_delay);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_command_event_reg(struct device *d,</div><div class='add'>+static ssize_t command_event_reg_show(struct device *d,</div><div class='ctx'> 				      struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	u32 reg = 0;</div><div class='hunk'>@@ -1625,7 +1596,7 @@ static ssize_t show_command_event_reg(struct device *d,</div><div class='ctx'> 	reg = ipw_read_reg32(p, IPW_INTERNAL_CMD_EVENT);</div><div class='ctx'> 	return sprintf(buf, "0x%08x\n", reg);</div><div class='ctx'> }</div><div class='del'>-static ssize_t store_command_event_reg(struct device *d,</div><div class='add'>+static ssize_t command_event_reg_store(struct device *d,</div><div class='ctx'> 				       struct device_attribute *attr,</div><div class='ctx'> 				       const char *buf, size_t count)</div><div class='ctx'> {</div><div class='hunk'>@@ -1637,10 +1608,9 @@ static ssize_t store_command_event_reg(struct device *d,</div><div class='ctx'> 	return strnlen(buf, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(command_event_reg, 0644,</div><div class='del'>-		   show_command_event_reg, store_command_event_reg);</div><div class='add'>+static DEVICE_ATTR_RW(command_event_reg);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_mem_gpio_reg(struct device *d,</div><div class='add'>+static ssize_t mem_gpio_reg_show(struct device *d,</div><div class='ctx'> 				 struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	u32 reg = 0;</div><div class='hunk'>@@ -1649,7 +1619,7 @@ static ssize_t show_mem_gpio_reg(struct device *d,</div><div class='ctx'> 	reg = ipw_read_reg32(p, 0x301100);</div><div class='ctx'> 	return sprintf(buf, "0x%08x\n", reg);</div><div class='ctx'> }</div><div class='del'>-static ssize_t store_mem_gpio_reg(struct device *d,</div><div class='add'>+static ssize_t mem_gpio_reg_store(struct device *d,</div><div class='ctx'> 				  struct device_attribute *attr,</div><div class='ctx'> 				  const char *buf, size_t count)</div><div class='ctx'> {</div><div class='hunk'>@@ -1661,9 +1631,9 @@ static ssize_t store_mem_gpio_reg(struct device *d,</div><div class='ctx'> 	return strnlen(buf, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(mem_gpio_reg, 0644, show_mem_gpio_reg, store_mem_gpio_reg);</div><div class='add'>+static DEVICE_ATTR_RW(mem_gpio_reg);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_indirect_dword(struct device *d,</div><div class='add'>+static ssize_t indirect_dword_show(struct device *d,</div><div class='ctx'> 				   struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	u32 reg = 0;</div><div class='hunk'>@@ -1676,7 +1646,7 @@ static ssize_t show_indirect_dword(struct device *d,</div><div class='ctx'> </div><div class='ctx'> 	return sprintf(buf, "0x%08x\n", reg);</div><div class='ctx'> }</div><div class='del'>-static ssize_t store_indirect_dword(struct device *d,</div><div class='add'>+static ssize_t indirect_dword_store(struct device *d,</div><div class='ctx'> 				    struct device_attribute *attr,</div><div class='ctx'> 				    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='hunk'>@@ -1687,10 +1657,9 @@ static ssize_t store_indirect_dword(struct device *d,</div><div class='ctx'> 	return strnlen(buf, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(indirect_dword, 0644,</div><div class='del'>-		   show_indirect_dword, store_indirect_dword);</div><div class='add'>+static DEVICE_ATTR_RW(indirect_dword);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_indirect_byte(struct device *d,</div><div class='add'>+static ssize_t indirect_byte_show(struct device *d,</div><div class='ctx'> 				  struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	u8 reg = 0;</div><div class='hunk'>@@ -1703,7 +1672,7 @@ static ssize_t show_indirect_byte(struct device *d,</div><div class='ctx'> </div><div class='ctx'> 	return sprintf(buf, "0x%02x\n", reg);</div><div class='ctx'> }</div><div class='del'>-static ssize_t store_indirect_byte(struct device *d,</div><div class='add'>+static ssize_t indirect_byte_store(struct device *d,</div><div class='ctx'> 				   struct device_attribute *attr,</div><div class='ctx'> 				   const char *buf, size_t count)</div><div class='ctx'> {</div><div class='hunk'>@@ -1714,10 +1683,9 @@ static ssize_t store_indirect_byte(struct device *d,</div><div class='ctx'> 	return strnlen(buf, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(indirect_byte, 0644,</div><div class='del'>-		   show_indirect_byte, store_indirect_byte);</div><div class='add'>+static DEVICE_ATTR_RW(indirect_byte);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_direct_dword(struct device *d,</div><div class='add'>+static ssize_t direct_dword_show(struct device *d,</div><div class='ctx'> 				 struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	u32 reg = 0;</div><div class='hunk'>@@ -1730,7 +1698,7 @@ static ssize_t show_direct_dword(struct device *d,</div><div class='ctx'> </div><div class='ctx'> 	return sprintf(buf, "0x%08x\n", reg);</div><div class='ctx'> }</div><div class='del'>-static ssize_t store_direct_dword(struct device *d,</div><div class='add'>+static ssize_t direct_dword_store(struct device *d,</div><div class='ctx'> 				  struct device_attribute *attr,</div><div class='ctx'> 				  const char *buf, size_t count)</div><div class='ctx'> {</div><div class='hunk'>@@ -1741,7 +1709,7 @@ static ssize_t store_direct_dword(struct device *d,</div><div class='ctx'> 	return strnlen(buf, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(direct_dword, 0644, show_direct_dword, store_direct_dword);</div><div class='add'>+static DEVICE_ATTR_RW(direct_dword);</div><div class='ctx'> </div><div class='ctx'> static int rf_kill_active(struct ipw_priv *priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -1756,7 +1724,7 @@ static int rf_kill_active(struct ipw_priv *priv)</div><div class='ctx'> 	return (priv-&gt;status &amp; STATUS_RF_KILL_HW) ? 1 : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_rf_kill(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t rf_kill_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			    char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	/* 0 - RF kill not enabled</div><div class='hunk'>@@ -1802,7 +1770,7 @@ static int ipw_radio_kill_sw(struct ipw_priv *priv, int disable_radio)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t store_rf_kill(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t rf_kill_store(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_priv *priv = dev_get_drvdata(d);</div><div class='hunk'>@@ -1812,9 +1780,9 @@ static ssize_t store_rf_kill(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(rf_kill, 0644, show_rf_kill, store_rf_kill);</div><div class='add'>+static DEVICE_ATTR_RW(rf_kill);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_speed_scan(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t speed_scan_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			       char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_priv *priv = dev_get_drvdata(d);</div><div class='hunk'>@@ -1829,7 +1797,7 @@ static ssize_t show_speed_scan(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "0\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t store_speed_scan(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t speed_scan_store(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 				const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_priv *priv = dev_get_drvdata(d);</div><div class='hunk'>@@ -1865,16 +1833,16 @@ static ssize_t store_speed_scan(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(speed_scan, 0644, show_speed_scan, store_speed_scan);</div><div class='add'>+static DEVICE_ATTR_RW(speed_scan);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_net_stats(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t net_stats_show(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			      char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_priv *priv = dev_get_drvdata(d);</div><div class='ctx'> 	return sprintf(buf, "%c\n", (priv-&gt;config &amp; CFG_NET_STATS) ? '1' : '0');</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t store_net_stats(struct device *d, struct device_attribute *attr,</div><div class='add'>+static ssize_t net_stats_store(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			       const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_priv *priv = dev_get_drvdata(d);</div><div class='hunk'>@@ -1886,9 +1854,9 @@ static ssize_t store_net_stats(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(net_stats, 0644, show_net_stats, store_net_stats);</div><div class='add'>+static DEVICE_ATTR_RW(net_stats);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_channels(struct device *d,</div><div class='add'>+static ssize_t channels_show(struct device *d,</div><div class='ctx'> 			     struct device_attribute *attr,</div><div class='ctx'> 			     char *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -1932,7 +1900,7 @@ static ssize_t show_channels(struct device *d,</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(channels, 0400, show_channels, NULL);</div><div class='add'>+static DEVICE_ATTR_ADMIN_RO(channels);</div><div class='ctx'> </div><div class='ctx'> static void notify_wx_assoc_event(struct ipw_priv *priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -2264,7 +2232,7 @@ static int ipw_send_cmd_simple(struct ipw_priv *priv, u8 command)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ipw_send_cmd_pdu(struct ipw_priv *priv, u8 command, u8 len,</div><div class='del'>-			    void *data)</div><div class='add'>+			    const void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct host_cmd cmd = {</div><div class='ctx'> 		.cmd = command,</div><div class='hunk'>@@ -2303,7 +2271,7 @@ static int ipw_send_ssid(struct ipw_priv *priv, u8 * ssid, int len)</div><div class='ctx'> 				ssid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ipw_send_adapter_address(struct ipw_priv *priv, u8 * mac)</div><div class='add'>+static int ipw_send_adapter_address(struct ipw_priv *priv, const u8 * mac)</div><div class='ctx'> {</div><div class='ctx'> 	if (!priv || !mac) {</div><div class='ctx'> 		IPW_ERROR("Invalid args\n");</div><div class='hunk'>@@ -2587,7 +2555,7 @@ static int ipw_send_retry_limit(struct ipw_priv *priv, u8 slimit, u8 llimit)</div><div class='ctx'>  * through a couple of memory mapped registers.</div><div class='ctx'>  *</div><div class='ctx'>  * The following is a simplified implementation for pulling data out of the</div><div class='del'>- * the eeprom, along with some helper functions to find information in</div><div class='add'>+ * eeprom, along with some helper functions to find information in</div><div class='ctx'>  * the per device private data's copy of the eeprom.</div><div class='ctx'>  *</div><div class='ctx'>  * NOTE: To better understand how these functions work (i.e what is a chip</div><div class='hunk'>@@ -2998,20 +2966,6 @@ static void ipw_remove_current_network(struct ipw_priv *priv)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;ieee-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Check that card is still alive.</div><div class='del'>- * Reads debug register from domain0.</div><div class='del'>- * If card is present, pre-defined value should</div><div class='del'>- * be found there.</div><div class='del'>- *</div><div class='del'>- * @param priv</div><div class='del'>- * @return 1 if card is present, 0 otherwise</div><div class='del'>- */</div><div class='del'>-static inline int ipw_alive(struct ipw_priv *priv)</div><div class='del'>-{</div><div class='del'>-	return ipw_read32(priv, 0x90) == 0xd55555d5;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* timeout in msec, attempted in 10-msec quanta */</div><div class='ctx'> static int ipw_poll_bit(struct ipw_priv *priv, u32 addr, u32 mask,</div><div class='ctx'> 			       int timeout)</div><div class='hunk'>@@ -3341,7 +3295,7 @@ static int ipw_init_nic(struct ipw_priv *priv)</div><div class='ctx'> 	rc = ipw_poll_bit(priv, IPW_GP_CNTRL_RW,</div><div class='ctx'> 			  IPW_GP_CNTRL_BIT_CLOCK_READY, 250);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='del'>-		IPW_DEBUG_INFO("FAILED wait for clock stablization\n");</div><div class='add'>+		IPW_DEBUG_INFO("FAILED wait for clock stabilization\n");</div><div class='ctx'> </div><div class='ctx'> 	/* assert SW reset */</div><div class='ctx'> 	ipw_set_bit(priv, IPW_RESET_REG, IPW_RESET_REG_SW_RESET);</div><div class='hunk'>@@ -3444,7 +3398,7 @@ static void ipw_rx_queue_reset(struct ipw_priv *priv,</div><div class='ctx'> 			dma_unmap_single(&amp;priv-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 					 rxq-&gt;pool[i].dma_addr,</div><div class='ctx'> 					 IPW_RX_BUF_SIZE, DMA_FROM_DEVICE);</div><div class='del'>-			dev_kfree_skb(rxq-&gt;pool[i].skb);</div><div class='add'>+			dev_kfree_skb_irq(rxq-&gt;pool[i].skb);</div><div class='ctx'> 			rxq-&gt;pool[i].skb = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		list_add_tail(&amp;rxq-&gt;pool[i].list, &amp;rxq-&gt;rx_used);</div><div class='hunk'>@@ -3777,7 +3731,7 @@ static int ipw_queue_tx_init(struct ipw_priv *priv,</div><div class='ctx'> 	    dma_alloc_coherent(&amp;dev-&gt;dev, sizeof(q-&gt;bd[0]) * count,</div><div class='ctx'> 			       &amp;q-&gt;q.dma_addr, GFP_KERNEL);</div><div class='ctx'> 	if (!q-&gt;bd) {</div><div class='del'>-		IPW_ERROR("pci_alloc_consistent(%zd) failed\n",</div><div class='add'>+		IPW_ERROR("dma_alloc_coherent(%zd) failed\n",</div><div class='ctx'> 			  sizeof(q-&gt;bd[0]) * count);</div><div class='ctx'> 		kfree(q-&gt;txb);</div><div class='ctx'> 		q-&gt;txb = NULL;</div><div class='hunk'>@@ -4461,7 +4415,7 @@ static void handle_scan_event(struct ipw_priv *priv)</div><div class='ctx'> 				      round_jiffies_relative(msecs_to_jiffies(4000)));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		priv-&gt;user_requested_scan = 0;</div><div class='del'>-		mod_delayed_work(system_wq, &amp;priv-&gt;scan_event, 0);</div><div class='add'>+		mod_delayed_work(system_percpu_wq, &amp;priv-&gt;scan_event, 0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5033,7 +4987,7 @@ static int ipw_queue_tx_reclaim(struct ipw_priv *priv,</div><div class='ctx'> 	return used;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ipw_queue_tx_hcmd(struct ipw_priv *priv, int hcmd, void *buf,</div><div class='add'>+static int ipw_queue_tx_hcmd(struct ipw_priv *priv, int hcmd, const void *buf,</div><div class='ctx'> 			     int len, int sync)</div><div class='ctx'> {</div><div class='ctx'> 	struct clx2_tx_queue *txq = &amp;priv-&gt;txq_cmd;</div><div class='hunk'>@@ -6509,6 +6463,14 @@ static int ipw_set_rsn_capa(struct ipw_priv *priv,</div><div class='ctx'>  * WE-18 support</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+static int ipw_wx_get_name(struct net_device *dev,</div><div class='add'>+			   struct iw_request_info *info,</div><div class='add'>+			   union iwreq_data *wrqu, char *extra)</div><div class='add'>+{</div><div class='add'>+	strcpy(wrqu-&gt;name, "IEEE 802.11");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* SIOCSIWGENIE */</div><div class='ctx'> static int ipw_wx_set_genie(struct net_device *dev,</div><div class='ctx'> 			    struct iw_request_info *info,</div><div class='hunk'>@@ -6595,7 +6557,7 @@ static int ipw_wx_set_auth(struct net_device *dev,</div><div class='ctx'> 	struct ipw_priv *priv = libipw_priv(dev);</div><div class='ctx'> 	struct libipw_device *ieee = priv-&gt;ieee;</div><div class='ctx'> 	struct iw_param *param = &amp;wrqu-&gt;param;</div><div class='del'>-	struct lib80211_crypt_data *crypt;</div><div class='add'>+	struct libipw_crypt_data *crypt;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -6694,7 +6656,7 @@ static int ipw_wx_get_auth(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_priv *priv = libipw_priv(dev);</div><div class='ctx'> 	struct libipw_device *ieee = priv-&gt;ieee;</div><div class='del'>-	struct lib80211_crypt_data *crypt;</div><div class='add'>+	struct libipw_crypt_data *crypt;</div><div class='ctx'> 	struct iw_param *param = &amp;wrqu-&gt;param;</div><div class='ctx'> </div><div class='ctx'> 	switch (param-&gt;flags &amp; IW_AUTH_INDEX) {</div><div class='hunk'>@@ -9702,31 +9664,30 @@ static int ipw_wx_get_wireless_mode(struct net_device *dev,</div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;mutex);</div><div class='ctx'> 	switch (priv-&gt;ieee-&gt;mode) {</div><div class='ctx'> 	case IEEE_A:</div><div class='del'>-		strncpy(extra, "802.11a (1)", MAX_WX_STRING);</div><div class='add'>+		strscpy_pad(extra, "802.11a (1)", MAX_WX_STRING);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE_B:</div><div class='del'>-		strncpy(extra, "802.11b (2)", MAX_WX_STRING);</div><div class='add'>+		strscpy_pad(extra, "802.11b (2)", MAX_WX_STRING);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE_A | IEEE_B:</div><div class='del'>-		strncpy(extra, "802.11ab (3)", MAX_WX_STRING);</div><div class='add'>+		strscpy_pad(extra, "802.11ab (3)", MAX_WX_STRING);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE_G:</div><div class='del'>-		strncpy(extra, "802.11g (4)", MAX_WX_STRING);</div><div class='add'>+		strscpy_pad(extra, "802.11g (4)", MAX_WX_STRING);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE_A | IEEE_G:</div><div class='del'>-		strncpy(extra, "802.11ag (5)", MAX_WX_STRING);</div><div class='add'>+		strscpy_pad(extra, "802.11ag (5)", MAX_WX_STRING);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE_B | IEEE_G:</div><div class='del'>-		strncpy(extra, "802.11bg (6)", MAX_WX_STRING);</div><div class='add'>+		strscpy_pad(extra, "802.11bg (6)", MAX_WX_STRING);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE_A | IEEE_B | IEEE_G:</div><div class='del'>-		strncpy(extra, "802.11abg (7)", MAX_WX_STRING);</div><div class='add'>+		strscpy_pad(extra, "802.11abg (7)", MAX_WX_STRING);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		strncpy(extra, "unknown", MAX_WX_STRING);</div><div class='add'>+		strscpy_pad(extra, "unknown", MAX_WX_STRING);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	extra[MAX_WX_STRING - 1] = '\0';</div><div class='ctx'> </div><div class='ctx'> 	IPW_DEBUG_WX("PRIV GET MODE: %s\n", extra);</div><div class='ctx'> </div><div class='hunk'>@@ -9873,7 +9834,7 @@ static int ipw_wx_sw_reset(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> /* Rebase the WE IOCTLs to zero for the handler array */</div><div class='ctx'> static iw_handler ipw_wx_handlers[] = {</div><div class='del'>-	IW_HANDLER(SIOCGIWNAME, (iw_handler)cfg80211_wext_giwname),</div><div class='add'>+	IW_HANDLER(SIOCGIWNAME, ipw_wx_get_name),</div><div class='ctx'> 	IW_HANDLER(SIOCSIWFREQ, ipw_wx_set_freq),</div><div class='ctx'> 	IW_HANDLER(SIOCGIWFREQ, ipw_wx_get_freq),</div><div class='ctx'> 	IW_HANDLER(SIOCSIWMODE, ipw_wx_set_mode),</div><div class='hunk'>@@ -9903,10 +9864,10 @@ static iw_handler ipw_wx_handlers[] = {</div><div class='ctx'> 	IW_HANDLER(SIOCGIWENCODE, ipw_wx_get_encode),</div><div class='ctx'> 	IW_HANDLER(SIOCSIWPOWER, ipw_wx_set_power),</div><div class='ctx'> 	IW_HANDLER(SIOCGIWPOWER, ipw_wx_get_power),</div><div class='del'>-	IW_HANDLER(SIOCSIWSPY, iw_handler_set_spy),</div><div class='del'>-	IW_HANDLER(SIOCGIWSPY, iw_handler_get_spy),</div><div class='del'>-	IW_HANDLER(SIOCSIWTHRSPY, iw_handler_set_thrspy),</div><div class='del'>-	IW_HANDLER(SIOCGIWTHRSPY, iw_handler_get_thrspy),</div><div class='add'>+	IW_HANDLER(SIOCSIWSPY, ipw_wx_set_spy),</div><div class='add'>+	IW_HANDLER(SIOCGIWSPY, ipw_wx_get_spy),</div><div class='add'>+	IW_HANDLER(SIOCSIWTHRSPY, ipw_wx_set_thrspy),</div><div class='add'>+	IW_HANDLER(SIOCGIWTHRSPY, ipw_wx_get_thrspy),</div><div class='ctx'> 	IW_HANDLER(SIOCSIWGENIE, ipw_wx_set_genie),</div><div class='ctx'> 	IW_HANDLER(SIOCGIWGENIE, ipw_wx_get_genie),</div><div class='ctx'> 	IW_HANDLER(SIOCSIWMLME, ipw_wx_set_mlme),</div><div class='hunk'>@@ -10424,20 +10385,16 @@ static void ipw_ethtool_get_drvinfo(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_priv *p = libipw_priv(dev);</div><div class='ctx'> 	char vers[64];</div><div class='del'>-	char date[32];</div><div class='ctx'> 	u32 len;</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='ctx'> </div><div class='ctx'> 	len = sizeof(vers);</div><div class='ctx'> 	ipw_get_ordinal(p, IPW_ORD_STAT_FW_VERSION, vers, &amp;len);</div><div class='del'>-	len = sizeof(date);</div><div class='del'>-	ipw_get_ordinal(p, IPW_ORD_STAT_FW_DATE, date, &amp;len);</div><div class='ctx'> </div><div class='del'>-	snprintf(info-&gt;fw_version, sizeof(info-&gt;fw_version), "%s (%s)",</div><div class='del'>-		 vers, date);</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(p-&gt;pci_dev),</div><div class='add'>+	strscpy(info-&gt;fw_version, vers, sizeof(info-&gt;fw_version));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(p-&gt;pci_dev),</div><div class='ctx'> 		sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -11185,7 +11142,7 @@ static int ipw_up(struct ipw_priv *priv)</div><div class='ctx'> 		ipw_init_ordinals(priv);</div><div class='ctx'> 		if (!(priv-&gt;config &amp; CFG_CUSTOM_MAC))</div><div class='ctx'> 			eeprom_parse_mac(priv, priv-&gt;mac_addr);</div><div class='del'>-		memcpy(priv-&gt;net_dev-&gt;dev_addr, priv-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(priv-&gt;net_dev, priv-&gt;mac_addr);</div><div class='ctx'> </div><div class='ctx'> 		ipw_set_geo(priv);</div><div class='ctx'> </div><div class='hunk'>@@ -11400,9 +11357,14 @@ static int ipw_wdev_init(struct net_device *dev)</div><div class='ctx'> 	set_wiphy_dev(wdev-&gt;wiphy, &amp;priv-&gt;pci_dev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	/* With that information in place, we can now register the wiphy... */</div><div class='del'>-	if (wiphy_register(wdev-&gt;wiphy))</div><div class='del'>-		rc = -EIO;</div><div class='add'>+	rc = wiphy_register(wdev-&gt;wiphy);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> out:</div><div class='add'>+	kfree(priv-&gt;ieee-&gt;a_band.channels);</div><div class='add'>+	kfree(priv-&gt;ieee-&gt;bg_band.channels);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -11542,7 +11504,7 @@ static int ipw_prom_alloc(struct ipw_priv *priv)</div><div class='ctx'> 	priv-&gt;prom_priv-&gt;priv = priv;</div><div class='ctx'> </div><div class='ctx'> 	strcpy(priv-&gt;prom_net_dev-&gt;name, "rtap%d");</div><div class='del'>-	memcpy(priv-&gt;prom_net_dev-&gt;dev_addr, priv-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+	eth_hw_addr_set(priv-&gt;prom_net_dev, priv-&gt;mac_addr);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;prom_net_dev-&gt;type = ARPHRD_IEEE80211_RADIOTAP;</div><div class='ctx'> 	priv-&gt;prom_net_dev-&gt;netdev_ops = &amp;ipw_prom_netdev_ops;</div><div class='hunk'>@@ -11682,8 +11644,7 @@ static int ipw_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	priv-&gt;ieee-&gt;worst_rssi = -85;</div><div class='ctx'> </div><div class='ctx'> 	net_dev-&gt;netdev_ops = &amp;ipw_netdev_ops;</div><div class='del'>-	priv-&gt;wireless_data.spy_data = &amp;priv-&gt;ieee-&gt;spy_data;</div><div class='del'>-	net_dev-&gt;wireless_data = &amp;priv-&gt;wireless_data;</div><div class='add'>+	priv-&gt;ieee-&gt;spy_enabled = true;</div><div class='ctx'> 	net_dev-&gt;wireless_handlers = &amp;ipw_wx_handler_def;</div><div class='ctx'> 	net_dev-&gt;ethtool_ops = &amp;ipw_ethtool_ops;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.h b/drivers/net/wireless/intel/ipw2x00/ipw2200.h<br/>index 98fe62737888..19310fd0d8eb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/ipw2200.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/ipw2200.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/ipw2200.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/ipw2x00/ipw2200.h</a></div><div class='hunk'>@@ -31,8 +31,6 @@</div><div class='ctx'> #include &lt;linux/wireless.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/lib80211.h&gt;</div><div class='ctx'> #include &lt;net/ieee80211_radiotap.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"ipw2200"</div><div class='hunk'>@@ -651,7 +649,7 @@ struct ipw_rx_notification {</div><div class='ctx'> 		struct notif_link_deterioration link_deterioration;</div><div class='ctx'> 		struct notif_calibration calibration;</div><div class='ctx'> 		struct notif_noise noise;</div><div class='del'>-		u8 raw[0];</div><div class='add'>+		DECLARE_FLEX_ARRAY(u8, raw);</div><div class='ctx'> 	} u;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -1106,9 +1104,8 @@ struct ipw_fw_error {	 /* XXX */</div><div class='ctx'> 	u32 config;</div><div class='ctx'> 	u32 elem_len;</div><div class='ctx'> 	u32 log_len;</div><div class='del'>-	struct ipw_error_elem *elem;</div><div class='ctx'> 	struct ipw_event *log;</div><div class='del'>-	u8 payload[];</div><div class='add'>+	struct ipw_error_elem elem[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPW2200_PROMISCUOUS</div><div class='hunk'>@@ -1144,7 +1141,7 @@ struct ipw_prom_priv {</div><div class='ctx'>  * structure is provided regardless of any bits unset.</div><div class='ctx'>  */</div><div class='ctx'> struct ipw_rt_hdr {</div><div class='del'>-	struct ieee80211_radiotap_header rt_hdr;</div><div class='add'>+	struct ieee80211_radiotap_header_fixed rt_hdr;</div><div class='ctx'> 	u64 rt_tsf;      /* TSF */	/* XXX */</div><div class='ctx'> 	u8 rt_flags;	/* radiotap packet flags */</div><div class='ctx'> 	u8 rt_rate;	/* rate in 500kb/s */</div><div class='hunk'>@@ -1277,8 +1274,6 @@ struct ipw_priv {</div><div class='ctx'> </div><div class='ctx'> 	struct iw_statistics wstats;</div><div class='ctx'> </div><div class='del'>-	struct iw_public_data wireless_data;</div><div class='del'>-</div><div class='ctx'> 	int user_requested_scan;</div><div class='ctx'> 	u8 direct_scan_ssid[IW_ESSID_MAX_SIZE];</div><div class='ctx'> 	u8 direct_scan_ssid_len;</div><div class='hunk'>@@ -1945,7 +1940,7 @@ struct host_cmd {</div><div class='ctx'> 	u8 cmd;</div><div class='ctx'> 	u8 len;</div><div class='ctx'> 	u16 reserved;</div><div class='del'>-	u32 *param;</div><div class='add'>+	const u32 *param;</div><div class='ctx'> } __packed;	/* XXX */</div><div class='ctx'> </div><div class='ctx'> struct cmdlog_host_cmd {</div><div class='head'>diff --git a/drivers/net/wireless/intel/ipw2x00/libipw.h b/drivers/net/wireless/intel/ipw2x00/libipw.h<br/>index 7964ef7d15f0..e031e8692ca6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/libipw.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/libipw.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/libipw.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/ipw2x00/libipw.h</a></div><div class='hunk'>@@ -25,8 +25,6 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;	/* ARRAY_SIZE */</div><div class='ctx'> #include &lt;linux/wireless.h&gt;</div><div class='ctx'> #include &lt;linux/ieee80211.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/lib80211.h&gt;</div><div class='ctx'> #include &lt;net/cfg80211.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define LIBIPW_VERSION "git-1.1.13"</div><div class='hunk'>@@ -345,14 +343,19 @@ struct libipw_hdr_2addr {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct libipw_hdr_3addr {</div><div class='del'>-	__le16 frame_ctl;</div><div class='del'>-	__le16 duration_id;</div><div class='del'>-	u8 addr1[ETH_ALEN];</div><div class='del'>-	u8 addr2[ETH_ALEN];</div><div class='del'>-	u8 addr3[ETH_ALEN];</div><div class='del'>-	__le16 seq_ctl;</div><div class='add'>+	/* New members MUST be added within the __struct_group() macro below. */</div><div class='add'>+	__struct_group(libipw_hdr_3addr_hdr, hdr, __packed,</div><div class='add'>+		__le16 frame_ctl;</div><div class='add'>+		__le16 duration_id;</div><div class='add'>+		u8 addr1[ETH_ALEN];</div><div class='add'>+		u8 addr2[ETH_ALEN];</div><div class='add'>+		u8 addr3[ETH_ALEN];</div><div class='add'>+		__le16 seq_ctl;</div><div class='add'>+	);</div><div class='ctx'> 	u8 payload[];</div><div class='ctx'> } __packed;</div><div class='add'>+static_assert(offsetof(struct libipw_hdr_3addr, payload) == sizeof(struct libipw_hdr_3addr_hdr),</div><div class='add'>+	      "struct member likely outside of __struct_group()");</div><div class='ctx'> </div><div class='ctx'> struct libipw_hdr_4addr {</div><div class='ctx'> 	__le16 frame_ctl;</div><div class='hunk'>@@ -400,12 +403,12 @@ struct libipw_info_element {</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> struct libipw_auth {</div><div class='del'>-	struct libipw_hdr_3addr header;</div><div class='add'>+	struct libipw_hdr_3addr_hdr header;</div><div class='ctx'> 	__le16 algorithm;</div><div class='ctx'> 	__le16 transaction;</div><div class='ctx'> 	__le16 status;</div><div class='ctx'> 	/* challenge */</div><div class='del'>-	struct libipw_info_element info_element[];</div><div class='add'>+	u8 variable[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct libipw_channel_switch {</div><div class='hunk'>@@ -417,13 +420,12 @@ struct libipw_channel_switch {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct libipw_action {</div><div class='del'>-	struct libipw_hdr_3addr header;</div><div class='add'>+	struct libipw_hdr_3addr_hdr header;</div><div class='ctx'> 	u8 category;</div><div class='ctx'> 	u8 action;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct libipw_action_exchange {</div><div class='ctx'> 			u8 token;</div><div class='del'>-			struct libipw_info_element info_element[0];</div><div class='ctx'> 		} exchange;</div><div class='ctx'> 		struct libipw_channel_switch channel_switch;</div><div class='ctx'> </div><div class='hunk'>@@ -431,7 +433,7 @@ struct libipw_action {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct libipw_disassoc {</div><div class='del'>-	struct libipw_hdr_3addr header;</div><div class='add'>+	struct libipw_hdr_3addr_hdr header;</div><div class='ctx'> 	__le16 reason;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -439,47 +441,39 @@ struct libipw_disassoc {</div><div class='ctx'> #define libipw_deauth libipw_disassoc</div><div class='ctx'> </div><div class='ctx'> struct libipw_probe_request {</div><div class='del'>-	struct libipw_hdr_3addr header;</div><div class='add'>+	struct libipw_hdr_3addr_hdr header;</div><div class='ctx'> 	/* SSID, supported rates */</div><div class='del'>-	struct libipw_info_element info_element[];</div><div class='add'>+	u8 variable[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct libipw_probe_response {</div><div class='del'>-	struct libipw_hdr_3addr header;</div><div class='add'>+	struct libipw_hdr_3addr_hdr header;</div><div class='ctx'> 	__le32 time_stamp[2];</div><div class='ctx'> 	__le16 beacon_interval;</div><div class='ctx'> 	__le16 capability;</div><div class='ctx'> 	/* SSID, supported rates, FH params, DS params,</div><div class='ctx'> 	 * CF params, IBSS params, TIM (if beacon), RSN */</div><div class='del'>-	struct libipw_info_element info_element[];</div><div class='add'>+	u8 variable[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* Alias beacon for probe_response */</div><div class='ctx'> #define libipw_beacon libipw_probe_response</div><div class='ctx'> </div><div class='del'>-struct libipw_assoc_request {</div><div class='del'>-	struct libipw_hdr_3addr header;</div><div class='del'>-	__le16 capability;</div><div class='del'>-	__le16 listen_interval;</div><div class='del'>-	/* SSID, supported rates, RSN */</div><div class='del'>-	struct libipw_info_element info_element[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='ctx'> struct libipw_reassoc_request {</div><div class='del'>-	struct libipw_hdr_3addr header;</div><div class='add'>+	struct libipw_hdr_3addr_hdr header;</div><div class='ctx'> 	__le16 capability;</div><div class='ctx'> 	__le16 listen_interval;</div><div class='ctx'> 	u8 current_ap[ETH_ALEN];</div><div class='del'>-	struct libipw_info_element info_element[];</div><div class='add'>+	u8 variable[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct libipw_assoc_response {</div><div class='del'>-	struct libipw_hdr_3addr header;</div><div class='add'>+	struct libipw_hdr_3addr_hdr header;</div><div class='ctx'> 	__le16 capability;</div><div class='ctx'> 	__le16 status;</div><div class='ctx'> 	__le16 aid;</div><div class='ctx'> 	/* supported rates */</div><div class='del'>-	struct libipw_info_element info_element[];</div><div class='add'>+	u8 variable[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct libipw_txb {</div><div class='hunk'>@@ -489,7 +483,7 @@ struct libipw_txb {</div><div class='ctx'> 	u8 reserved;</div><div class='ctx'> 	u16 frag_size;</div><div class='ctx'> 	u16 payload_size;</div><div class='del'>-	struct sk_buff *fragments[];</div><div class='add'>+	struct sk_buff *fragments[] __counted_by(nr_frags);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* SWEEP TABLE ENTRIES NUMBER */</div><div class='hunk'>@@ -589,13 +583,6 @@ struct libipw_channel_map {</div><div class='ctx'> 	u8 map;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct libipw_ibss_dfs {</div><div class='del'>-	struct libipw_info_element ie;</div><div class='del'>-	u8 owner[ETH_ALEN];</div><div class='del'>-	u8 recovery_interval;</div><div class='del'>-	struct libipw_channel_map channel_map[];</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct libipw_csa {</div><div class='ctx'> 	u8 mode;</div><div class='ctx'> 	u8 channel;</div><div class='hunk'>@@ -710,6 +697,76 @@ struct libipw_geo {</div><div class='ctx'> 	struct libipw_channel a[LIBIPW_52GHZ_CHANNELS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define NUM_WEP_KEYS	4</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	IEEE80211_CRYPTO_TKIP_COUNTERMEASURES = (1 &lt;&lt; 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct module;</div><div class='add'>+</div><div class='add'>+struct libipw_crypto_ops {</div><div class='add'>+	const char *name;</div><div class='add'>+	struct list_head list;</div><div class='add'>+</div><div class='add'>+	/* init new crypto context (e.g., allocate private data space,</div><div class='add'>+	 * select IV, etc.); returns NULL on failure or pointer to allocated</div><div class='add'>+	 * private data on success */</div><div class='add'>+	void *(*init) (int keyidx);</div><div class='add'>+</div><div class='add'>+	/* deinitialize crypto context and free allocated private data */</div><div class='add'>+	void (*deinit) (void *priv);</div><div class='add'>+</div><div class='add'>+	/* encrypt/decrypt return &lt; 0 on error or &gt;= 0 on success. The return</div><div class='add'>+	 * value from decrypt_mpdu is passed as the keyidx value for</div><div class='add'>+	 * decrypt_msdu. skb must have enough head and tail room for the</div><div class='add'>+	 * encryption; if not, error will be returned; these functions are</div><div class='add'>+	 * called for all MPDUs (i.e., fragments).</div><div class='add'>+	 */</div><div class='add'>+	int (*encrypt_mpdu) (struct sk_buff * skb, int hdr_len, void *priv);</div><div class='add'>+	int (*decrypt_mpdu) (struct sk_buff * skb, int hdr_len, void *priv);</div><div class='add'>+</div><div class='add'>+	/* These functions are called for full MSDUs, i.e. full frames.</div><div class='add'>+	 * These can be NULL if full MSDU operations are not needed. */</div><div class='add'>+	int (*encrypt_msdu) (struct sk_buff * skb, int hdr_len, void *priv);</div><div class='add'>+	int (*decrypt_msdu) (struct sk_buff * skb, int keyidx, int hdr_len,</div><div class='add'>+			     void *priv);</div><div class='add'>+</div><div class='add'>+	int (*set_key) (void *key, int len, u8 * seq, void *priv);</div><div class='add'>+	int (*get_key) (void *key, int len, u8 * seq, void *priv);</div><div class='add'>+</div><div class='add'>+	/* procfs handler for printing out key information and possible</div><div class='add'>+	 * statistics */</div><div class='add'>+	void (*print_stats) (struct seq_file *m, void *priv);</div><div class='add'>+</div><div class='add'>+	/* Crypto specific flag get/set for configuration settings */</div><div class='add'>+	unsigned long (*get_flags) (void *priv);</div><div class='add'>+	unsigned long (*set_flags) (unsigned long flags, void *priv);</div><div class='add'>+</div><div class='add'>+	/* maximum number of bytes added by encryption; encrypt buf is</div><div class='add'>+	 * allocated with extra_prefix_len bytes, copy of in_buf, and</div><div class='add'>+	 * extra_postfix_len; encrypt need not use all this space, but</div><div class='add'>+	 * the result must start at the beginning of the buffer and correct</div><div class='add'>+	 * length must be returned */</div><div class='add'>+	int extra_mpdu_prefix_len, extra_mpdu_postfix_len;</div><div class='add'>+	int extra_msdu_prefix_len, extra_msdu_postfix_len;</div><div class='add'>+</div><div class='add'>+	struct module *owner;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct libipw_crypt_info {</div><div class='add'>+	char *name;</div><div class='add'>+	/* Most clients will already have a lock,</div><div class='add'>+	   so just point to that. */</div><div class='add'>+	spinlock_t *lock;</div><div class='add'>+</div><div class='add'>+	struct libipw_crypt_data *crypt[NUM_WEP_KEYS];</div><div class='add'>+	int tx_keyidx;		/* default TX key index (crypt[tx_keyidx]) */</div><div class='add'>+	struct list_head crypt_deinit_list;</div><div class='add'>+	struct timer_list crypt_deinit_timer;</div><div class='add'>+	int crypt_quiesced;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct libipw_device {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct wireless_dev wdev;</div><div class='hunk'>@@ -731,6 +788,7 @@ struct libipw_device {</div><div class='ctx'> </div><div class='ctx'> 	int iw_mode;		/* operating mode (IW_MODE_*) */</div><div class='ctx'> 	struct iw_spy_data spy_data;	/* iwspy support */</div><div class='add'>+	bool spy_enabled;</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> </div><div class='hunk'>@@ -762,7 +820,7 @@ struct libipw_device {</div><div class='ctx'> 	size_t wpa_ie_len;</div><div class='ctx'> 	u8 *wpa_ie;</div><div class='ctx'> </div><div class='del'>-	struct lib80211_crypt_info crypt_info;</div><div class='add'>+	struct libipw_crypt_info crypt_info;</div><div class='ctx'> </div><div class='ctx'> 	int bcrx_sta_key;	/* use individual keys to override default keys even</div><div class='ctx'> 				 * with RX of broad/multicast frames */</div><div class='hunk'>@@ -953,8 +1011,6 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev);</div><div class='ctx'> void libipw_txb_free(struct libipw_txb *);</div><div class='ctx'> </div><div class='ctx'> /* libipw_rx.c */</div><div class='del'>-void libipw_rx_any(struct libipw_device *ieee, struct sk_buff *skb,</div><div class='del'>-		   struct libipw_rx_stats *stats);</div><div class='ctx'> int libipw_rx(struct libipw_device *ieee, struct sk_buff *skb,</div><div class='ctx'> 	      struct libipw_rx_stats *rx_stats);</div><div class='ctx'> /* make sure to set stats-&gt;len */</div><div class='hunk'>@@ -999,4 +1055,43 @@ static inline int libipw_get_scans(struct libipw_device *ieee)</div><div class='ctx'> 	return ieee-&gt;scans;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct libipw_crypt_data {</div><div class='add'>+	struct list_head list;	/* delayed deletion list */</div><div class='add'>+	const struct libipw_crypto_ops *ops;</div><div class='add'>+	void *priv;</div><div class='add'>+	atomic_t refcnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int libipw_crypt_info_init(struct libipw_crypt_info *info, char *name,</div><div class='add'>+			   spinlock_t *lock);</div><div class='add'>+void libipw_crypt_info_free(struct libipw_crypt_info *info);</div><div class='add'>+int libipw_register_crypto_ops(const struct libipw_crypto_ops *ops);</div><div class='add'>+int libipw_unregister_crypto_ops(const struct libipw_crypto_ops *ops);</div><div class='add'>+const struct libipw_crypto_ops *libipw_get_crypto_ops(const char *name);</div><div class='add'>+void libipw_crypt_delayed_deinit(struct libipw_crypt_info *info,</div><div class='add'>+				 struct libipw_crypt_data **crypt);</div><div class='add'>+</div><div class='add'>+/* must be called in the listed order */</div><div class='add'>+int libipw_crypto_init(void);</div><div class='add'>+int libipw_crypto_ccmp_init(void);</div><div class='add'>+int libipw_crypto_tkip_init(void);</div><div class='add'>+int libipw_crypto_wep_init(void);</div><div class='add'>+</div><div class='add'>+void libipw_crypto_wep_exit(void);</div><div class='add'>+void libipw_crypto_tkip_exit(void);</div><div class='add'>+void libipw_crypto_ccmp_exit(void);</div><div class='add'>+void libipw_crypto_exit(void);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int ipw_wx_set_spy(struct net_device *dev, struct iw_request_info *info,</div><div class='add'>+		   union iwreq_data *wrqu, char *extra);</div><div class='add'>+int ipw_wx_get_spy(struct net_device *dev, struct iw_request_info *info,</div><div class='add'>+		   union iwreq_data *wrqu, char *extra);</div><div class='add'>+int ipw_wx_set_thrspy(struct net_device *dev, struct iw_request_info *info,</div><div class='add'>+		      union iwreq_data *wrqu, char *extra);</div><div class='add'>+int ipw_wx_get_thrspy(struct net_device *dev, struct iw_request_info *info,</div><div class='add'>+		      union iwreq_data *wrqu, char *extra);</div><div class='add'>+void libipw_spy_update(struct net_device *dev, unsigned char *address,</div><div class='add'>+		       struct iw_quality *wstats);</div><div class='add'>+</div><div class='ctx'> #endif				/* LIBIPW_H */</div><div class='head'>diff --git a/drivers/net/wireless/intel/ipw2x00/libipw_crypto.c b/drivers/net/wireless/intel/ipw2x00/libipw_crypto.c<br/>new file mode 100644<br/>index 000000000000..243d0c5928a2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/libipw_crypto.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/ipw2x00/libipw_crypto.c</a></div><div class='hunk'>@@ -0,0 +1,246 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * libipw -- common bits for IPW drivers</div><div class='add'>+ *</div><div class='add'>+ * Copyright(c) 2008 John W. Linville &lt;linville@tuxdriver.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Portions copied from old ieee80211 component, w/ original copyright</div><div class='add'>+ * notices below:</div><div class='add'>+ *</div><div class='add'>+ * Host AP crypto routines</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2002-2003, Jouni Malinen &lt;j@w1.fi&gt;</div><div class='add'>+ * Portions Copyright (C) 2004, Intel Corporation &lt;jketreno@linux.intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/ieee80211.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include "libipw.h"</div><div class='add'>+</div><div class='add'>+struct libipw_crypto_alg {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	const struct libipw_crypto_ops *ops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static LIST_HEAD(libipw_crypto_algs);</div><div class='add'>+static DEFINE_SPINLOCK(libipw_crypto_lock);</div><div class='add'>+</div><div class='add'>+static void libipw_crypt_deinit_entries(struct libipw_crypt_info *info,</div><div class='add'>+					  int force);</div><div class='add'>+static void libipw_crypt_quiescing(struct libipw_crypt_info *info);</div><div class='add'>+static void libipw_crypt_deinit_handler(struct timer_list *t);</div><div class='add'>+</div><div class='add'>+int libipw_crypt_info_init(struct libipw_crypt_info *info, char *name,</div><div class='add'>+				spinlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	memset(info, 0, sizeof(*info));</div><div class='add'>+</div><div class='add'>+	info-&gt;name = name;</div><div class='add'>+	info-&gt;lock = lock;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;info-&gt;crypt_deinit_list);</div><div class='add'>+	timer_setup(&amp;info-&gt;crypt_deinit_timer, libipw_crypt_deinit_handler,</div><div class='add'>+		    0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(libipw_crypt_info_init);</div><div class='add'>+</div><div class='add'>+void libipw_crypt_info_free(struct libipw_crypt_info *info)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+        libipw_crypt_quiescing(info);</div><div class='add'>+        timer_delete_sync(&amp;info-&gt;crypt_deinit_timer);</div><div class='add'>+        libipw_crypt_deinit_entries(info, 1);</div><div class='add'>+</div><div class='add'>+        for (i = 0; i &lt; NUM_WEP_KEYS; i++) {</div><div class='add'>+                struct libipw_crypt_data *crypt = info-&gt;crypt[i];</div><div class='add'>+                if (crypt) {</div><div class='add'>+                        if (crypt-&gt;ops) {</div><div class='add'>+                                crypt-&gt;ops-&gt;deinit(crypt-&gt;priv);</div><div class='add'>+                                module_put(crypt-&gt;ops-&gt;owner);</div><div class='add'>+                        }</div><div class='add'>+                        kfree(crypt);</div><div class='add'>+                        info-&gt;crypt[i] = NULL;</div><div class='add'>+                }</div><div class='add'>+        }</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(libipw_crypt_info_free);</div><div class='add'>+</div><div class='add'>+static void libipw_crypt_deinit_entries(struct libipw_crypt_info *info,</div><div class='add'>+					int force)</div><div class='add'>+{</div><div class='add'>+	struct libipw_crypt_data *entry, *next;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(info-&gt;lock, flags);</div><div class='add'>+	list_for_each_entry_safe(entry, next, &amp;info-&gt;crypt_deinit_list, list) {</div><div class='add'>+		if (atomic_read(&amp;entry-&gt;refcnt) != 0 &amp;&amp; !force)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		list_del(&amp;entry-&gt;list);</div><div class='add'>+</div><div class='add'>+		if (entry-&gt;ops) {</div><div class='add'>+			entry-&gt;ops-&gt;deinit(entry-&gt;priv);</div><div class='add'>+			module_put(entry-&gt;ops-&gt;owner);</div><div class='add'>+		}</div><div class='add'>+		kfree(entry);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(info-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* After this, crypt_deinit_list won't accept new members */</div><div class='add'>+static void libipw_crypt_quiescing(struct libipw_crypt_info *info)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(info-&gt;lock, flags);</div><div class='add'>+	info-&gt;crypt_quiesced = 1;</div><div class='add'>+	spin_unlock_irqrestore(info-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void libipw_crypt_deinit_handler(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct libipw_crypt_info *info = timer_container_of(info, t,</div><div class='add'>+							    crypt_deinit_timer);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	libipw_crypt_deinit_entries(info, 0);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(info-&gt;lock, flags);</div><div class='add'>+	if (!list_empty(&amp;info-&gt;crypt_deinit_list) &amp;&amp; !info-&gt;crypt_quiesced) {</div><div class='add'>+		printk(KERN_DEBUG "%s: entries remaining in delayed crypt "</div><div class='add'>+		       "deletion list\n", info-&gt;name);</div><div class='add'>+		info-&gt;crypt_deinit_timer.expires = jiffies + HZ;</div><div class='add'>+		add_timer(&amp;info-&gt;crypt_deinit_timer);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(info-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void libipw_crypt_delayed_deinit(struct libipw_crypt_info *info,</div><div class='add'>+				 struct libipw_crypt_data **crypt)</div><div class='add'>+{</div><div class='add'>+	struct libipw_crypt_data *tmp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (*crypt == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tmp = *crypt;</div><div class='add'>+	*crypt = NULL;</div><div class='add'>+</div><div class='add'>+	/* must not run ops-&gt;deinit() while there may be pending encrypt or</div><div class='add'>+	 * decrypt operations. Use a list of delayed deinits to avoid needing</div><div class='add'>+	 * locking. */</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(info-&gt;lock, flags);</div><div class='add'>+	if (!info-&gt;crypt_quiesced) {</div><div class='add'>+		list_add(&amp;tmp-&gt;list, &amp;info-&gt;crypt_deinit_list);</div><div class='add'>+		if (!timer_pending(&amp;info-&gt;crypt_deinit_timer)) {</div><div class='add'>+			info-&gt;crypt_deinit_timer.expires = jiffies + HZ;</div><div class='add'>+			add_timer(&amp;info-&gt;crypt_deinit_timer);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(info-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(libipw_crypt_delayed_deinit);</div><div class='add'>+</div><div class='add'>+int libipw_register_crypto_ops(const struct libipw_crypto_ops *ops)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct libipw_crypto_alg *alg;</div><div class='add'>+</div><div class='add'>+	alg = kzalloc(sizeof(*alg), GFP_KERNEL);</div><div class='add'>+	if (alg == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	alg-&gt;ops = ops;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;libipw_crypto_lock, flags);</div><div class='add'>+	list_add(&amp;alg-&gt;list, &amp;libipw_crypto_algs);</div><div class='add'>+	spin_unlock_irqrestore(&amp;libipw_crypto_lock, flags);</div><div class='add'>+</div><div class='add'>+	printk(KERN_DEBUG "libipw_crypt: registered algorithm '%s'\n",</div><div class='add'>+	       ops-&gt;name);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(libipw_register_crypto_ops);</div><div class='add'>+</div><div class='add'>+int libipw_unregister_crypto_ops(const struct libipw_crypto_ops *ops)</div><div class='add'>+{</div><div class='add'>+	struct libipw_crypto_alg *alg;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;libipw_crypto_lock, flags);</div><div class='add'>+	list_for_each_entry(alg, &amp;libipw_crypto_algs, list) {</div><div class='add'>+		if (alg-&gt;ops == ops)</div><div class='add'>+			goto found;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;libipw_crypto_lock, flags);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+</div><div class='add'>+      found:</div><div class='add'>+	printk(KERN_DEBUG "libipw_crypt: unregistered algorithm '%s'\n",</div><div class='add'>+	       ops-&gt;name);</div><div class='add'>+	list_del(&amp;alg-&gt;list);</div><div class='add'>+	spin_unlock_irqrestore(&amp;libipw_crypto_lock, flags);</div><div class='add'>+	kfree(alg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(libipw_unregister_crypto_ops);</div><div class='add'>+</div><div class='add'>+const struct libipw_crypto_ops *libipw_get_crypto_ops(const char *name)</div><div class='add'>+{</div><div class='add'>+	struct libipw_crypto_alg *alg;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;libipw_crypto_lock, flags);</div><div class='add'>+	list_for_each_entry(alg, &amp;libipw_crypto_algs, list) {</div><div class='add'>+		if (strcmp(alg-&gt;ops-&gt;name, name) == 0)</div><div class='add'>+			goto found;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;libipw_crypto_lock, flags);</div><div class='add'>+	return NULL;</div><div class='add'>+</div><div class='add'>+      found:</div><div class='add'>+	spin_unlock_irqrestore(&amp;libipw_crypto_lock, flags);</div><div class='add'>+	return alg-&gt;ops;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(libipw_get_crypto_ops);</div><div class='add'>+</div><div class='add'>+static void *libipw_crypt_null_init(int keyidx)</div><div class='add'>+{</div><div class='add'>+	return (void *)1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void libipw_crypt_null_deinit(void *priv)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct libipw_crypto_ops libipw_crypt_null = {</div><div class='add'>+	.name = "NULL",</div><div class='add'>+	.init = libipw_crypt_null_init,</div><div class='add'>+	.deinit = libipw_crypt_null_deinit,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __init libipw_crypto_init(void)</div><div class='add'>+{</div><div class='add'>+	return libipw_register_crypto_ops(&amp;libipw_crypt_null);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void libipw_crypto_exit(void)</div><div class='add'>+{</div><div class='add'>+	libipw_unregister_crypto_ops(&amp;libipw_crypt_null);</div><div class='add'>+	BUG_ON(!list_empty(&amp;libipw_crypto_algs));</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/ipw2x00/libipw_crypto_ccmp.c b/drivers/net/wireless/intel/ipw2x00/libipw_crypto_ccmp.c<br/>new file mode 100644<br/>index 000000000000..bf900d8c8ad3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/libipw_crypto_ccmp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/ipw2x00/libipw_crypto_ccmp.c</a></div><div class='hunk'>@@ -0,0 +1,438 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * libipw crypt: host-based CCMP encryption implementation for libipw</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2003-2004, Jouni Malinen &lt;j@w1.fi&gt;</div><div class='add'>+ * Copyright (c) 2008, John W. Linville &lt;linville@tuxdriver.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;asm/string.h&gt;</div><div class='add'>+#include &lt;linux/wireless.h&gt;</div><div class='add'>+#include &lt;linux/ieee80211.h&gt;</div><div class='add'>+#include &lt;linux/crypto.h&gt;</div><div class='add'>+#include &lt;crypto/aead.h&gt;</div><div class='add'>+#include "libipw.h"</div><div class='add'>+</div><div class='add'>+#define AES_BLOCK_LEN 16</div><div class='add'>+#define CCMP_HDR_LEN 8</div><div class='add'>+#define CCMP_MIC_LEN 8</div><div class='add'>+#define CCMP_TK_LEN 16</div><div class='add'>+#define CCMP_PN_LEN 6</div><div class='add'>+</div><div class='add'>+struct libipw_ccmp_data {</div><div class='add'>+	u8 key[CCMP_TK_LEN];</div><div class='add'>+	int key_set;</div><div class='add'>+</div><div class='add'>+	u8 tx_pn[CCMP_PN_LEN];</div><div class='add'>+	u8 rx_pn[CCMP_PN_LEN];</div><div class='add'>+</div><div class='add'>+	u32 dot11RSNAStatsCCMPFormatErrors;</div><div class='add'>+	u32 dot11RSNAStatsCCMPReplays;</div><div class='add'>+	u32 dot11RSNAStatsCCMPDecryptErrors;</div><div class='add'>+</div><div class='add'>+	int key_idx;</div><div class='add'>+</div><div class='add'>+	struct crypto_aead *tfm;</div><div class='add'>+</div><div class='add'>+	/* scratch buffers for virt_to_page() (crypto API) */</div><div class='add'>+	u8 tx_aad[2 * AES_BLOCK_LEN];</div><div class='add'>+	u8 rx_aad[2 * AES_BLOCK_LEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void *libipw_ccmp_init(int key_idx)</div><div class='add'>+{</div><div class='add'>+	struct libipw_ccmp_data *priv;</div><div class='add'>+</div><div class='add'>+	priv = kzalloc(sizeof(*priv), GFP_ATOMIC);</div><div class='add'>+	if (priv == NULL)</div><div class='add'>+		goto fail;</div><div class='add'>+	priv-&gt;key_idx = key_idx;</div><div class='add'>+</div><div class='add'>+	priv-&gt;tfm = crypto_alloc_aead("ccm(aes)", 0, CRYPTO_ALG_ASYNC);</div><div class='add'>+	if (IS_ERR(priv-&gt;tfm)) {</div><div class='add'>+		priv-&gt;tfm = NULL;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return priv;</div><div class='add'>+</div><div class='add'>+      fail:</div><div class='add'>+	if (priv) {</div><div class='add'>+		if (priv-&gt;tfm)</div><div class='add'>+			crypto_free_aead(priv-&gt;tfm);</div><div class='add'>+		kfree(priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void libipw_ccmp_deinit(void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_ccmp_data *_priv = priv;</div><div class='add'>+	if (_priv &amp;&amp; _priv-&gt;tfm)</div><div class='add'>+		crypto_free_aead(_priv-&gt;tfm);</div><div class='add'>+	kfree(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ccmp_init_iv_and_aad(const struct ieee80211_hdr *hdr,</div><div class='add'>+				const u8 *pn, u8 *iv, u8 *aad)</div><div class='add'>+{</div><div class='add'>+	u8 *pos, qc = 0;</div><div class='add'>+	size_t aad_len;</div><div class='add'>+	int a4_included, qc_included;</div><div class='add'>+</div><div class='add'>+	a4_included = ieee80211_has_a4(hdr-&gt;frame_control);</div><div class='add'>+	qc_included = ieee80211_is_data_qos(hdr-&gt;frame_control);</div><div class='add'>+</div><div class='add'>+	aad_len = 22;</div><div class='add'>+	if (a4_included)</div><div class='add'>+		aad_len += 6;</div><div class='add'>+	if (qc_included) {</div><div class='add'>+		pos = (u8 *) &amp; hdr-&gt;addr4;</div><div class='add'>+		if (a4_included)</div><div class='add'>+			pos += 6;</div><div class='add'>+		qc = *pos &amp; 0x0f;</div><div class='add'>+		aad_len += 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* In CCM, the initial vectors (IV) used for CTR mode encryption and CBC</div><div class='add'>+	 * mode authentication are not allowed to collide, yet both are derived</div><div class='add'>+	 * from the same vector. We only set L := 1 here to indicate that the</div><div class='add'>+	 * data size can be represented in (L+1) bytes. The CCM layer will take</div><div class='add'>+	 * care of storing the data length in the top (L+1) bytes and setting</div><div class='add'>+	 * and clearing the other bits as is required to derive the two IVs.</div><div class='add'>+	 */</div><div class='add'>+	iv[0] = 0x1;</div><div class='add'>+</div><div class='add'>+	/* Nonce: QC | A2 | PN */</div><div class='add'>+	iv[1] = qc;</div><div class='add'>+	memcpy(iv + 2, hdr-&gt;addr2, ETH_ALEN);</div><div class='add'>+	memcpy(iv + 8, pn, CCMP_PN_LEN);</div><div class='add'>+</div><div class='add'>+	/* AAD:</div><div class='add'>+	 * FC with bits 4..6 and 11..13 masked to zero; 14 is always one</div><div class='add'>+	 * A1 | A2 | A3</div><div class='add'>+	 * SC with bits 4..15 (seq#) masked to zero</div><div class='add'>+	 * A4 (if present)</div><div class='add'>+	 * QC (if present)</div><div class='add'>+	 */</div><div class='add'>+	pos = (u8 *) hdr;</div><div class='add'>+	aad[0] = pos[0] &amp; 0x8f;</div><div class='add'>+	aad[1] = pos[1] &amp; 0xc7;</div><div class='add'>+	memcpy(aad + 2, &amp;hdr-&gt;addrs, 3 * ETH_ALEN);</div><div class='add'>+	pos = (u8 *) &amp; hdr-&gt;seq_ctrl;</div><div class='add'>+	aad[20] = pos[0] &amp; 0x0f;</div><div class='add'>+	aad[21] = 0;		/* all bits masked */</div><div class='add'>+	memset(aad + 22, 0, 8);</div><div class='add'>+	if (a4_included)</div><div class='add'>+		memcpy(aad + 22, hdr-&gt;addr4, ETH_ALEN);</div><div class='add'>+	if (qc_included) {</div><div class='add'>+		aad[a4_included ? 28 : 22] = qc;</div><div class='add'>+		/* rest of QC masked */</div><div class='add'>+	}</div><div class='add'>+	return aad_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int libipw_ccmp_hdr(struct sk_buff *skb, int hdr_len,</div><div class='add'>+			      u8 *aeskey, int keylen, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_ccmp_data *key = priv;</div><div class='add'>+	int i;</div><div class='add'>+	u8 *pos;</div><div class='add'>+</div><div class='add'>+	if (skb_headroom(skb) &lt; CCMP_HDR_LEN || skb-&gt;len &lt; hdr_len)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (aeskey != NULL &amp;&amp; keylen &gt;= CCMP_TK_LEN)</div><div class='add'>+		memcpy(aeskey, key-&gt;key, CCMP_TK_LEN);</div><div class='add'>+</div><div class='add'>+	pos = skb_push(skb, CCMP_HDR_LEN);</div><div class='add'>+	memmove(pos, pos + CCMP_HDR_LEN, hdr_len);</div><div class='add'>+	pos += hdr_len;</div><div class='add'>+</div><div class='add'>+	i = CCMP_PN_LEN - 1;</div><div class='add'>+	while (i &gt;= 0) {</div><div class='add'>+		key-&gt;tx_pn[i]++;</div><div class='add'>+		if (key-&gt;tx_pn[i] != 0)</div><div class='add'>+			break;</div><div class='add'>+		i--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*pos++ = key-&gt;tx_pn[5];</div><div class='add'>+	*pos++ = key-&gt;tx_pn[4];</div><div class='add'>+	*pos++ = 0;</div><div class='add'>+	*pos++ = (key-&gt;key_idx &lt;&lt; 6) | (1 &lt;&lt; 5) /* Ext IV included */ ;</div><div class='add'>+	*pos++ = key-&gt;tx_pn[3];</div><div class='add'>+	*pos++ = key-&gt;tx_pn[2];</div><div class='add'>+	*pos++ = key-&gt;tx_pn[1];</div><div class='add'>+	*pos++ = key-&gt;tx_pn[0];</div><div class='add'>+</div><div class='add'>+	return CCMP_HDR_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int libipw_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_ccmp_data *key = priv;</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	struct aead_request *req;</div><div class='add'>+	struct scatterlist sg[2];</div><div class='add'>+	u8 *aad = key-&gt;tx_aad;</div><div class='add'>+	u8 iv[AES_BLOCK_LEN];</div><div class='add'>+	int len, data_len, aad_len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (skb_tailroom(skb) &lt; CCMP_MIC_LEN || skb-&gt;len &lt; hdr_len)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	data_len = skb-&gt;len - hdr_len;</div><div class='add'>+	len = libipw_ccmp_hdr(skb, hdr_len, NULL, 0, priv);</div><div class='add'>+	if (len &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	req = aead_request_alloc(key-&gt;tfm, GFP_ATOMIC);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	aad_len = ccmp_init_iv_and_aad(hdr, key-&gt;tx_pn, iv, aad);</div><div class='add'>+</div><div class='add'>+	skb_put(skb, CCMP_MIC_LEN);</div><div class='add'>+</div><div class='add'>+	sg_init_table(sg, 2);</div><div class='add'>+	sg_set_buf(&amp;sg[0], aad, aad_len);</div><div class='add'>+	sg_set_buf(&amp;sg[1], skb-&gt;data + hdr_len + CCMP_HDR_LEN,</div><div class='add'>+		   data_len + CCMP_MIC_LEN);</div><div class='add'>+</div><div class='add'>+	aead_request_set_callback(req, 0, NULL, NULL);</div><div class='add'>+	aead_request_set_ad(req, aad_len);</div><div class='add'>+	aead_request_set_crypt(req, sg, sg, data_len, iv);</div><div class='add'>+</div><div class='add'>+	ret = crypto_aead_encrypt(req);</div><div class='add'>+	aead_request_free(req);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * deal with seq counter wrapping correctly.</div><div class='add'>+ * refer to timer_after() for jiffies wrapping handling</div><div class='add'>+ */</div><div class='add'>+static inline int ccmp_replay_check(u8 *pn_n, u8 *pn_o)</div><div class='add'>+{</div><div class='add'>+	u32 iv32_n, iv16_n;</div><div class='add'>+	u32 iv32_o, iv16_o;</div><div class='add'>+</div><div class='add'>+	iv32_n = (pn_n[0] &lt;&lt; 24) | (pn_n[1] &lt;&lt; 16) | (pn_n[2] &lt;&lt; 8) | pn_n[3];</div><div class='add'>+	iv16_n = (pn_n[4] &lt;&lt; 8) | pn_n[5];</div><div class='add'>+</div><div class='add'>+	iv32_o = (pn_o[0] &lt;&lt; 24) | (pn_o[1] &lt;&lt; 16) | (pn_o[2] &lt;&lt; 8) | pn_o[3];</div><div class='add'>+	iv16_o = (pn_o[4] &lt;&lt; 8) | pn_o[5];</div><div class='add'>+</div><div class='add'>+	if ((s32)iv32_n - (s32)iv32_o &lt; 0 ||</div><div class='add'>+	    (iv32_n == iv32_o &amp;&amp; iv16_n &lt;= iv16_o))</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int libipw_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_ccmp_data *key = priv;</div><div class='add'>+	u8 keyidx, *pos;</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	struct aead_request *req;</div><div class='add'>+	struct scatterlist sg[2];</div><div class='add'>+	u8 *aad = key-&gt;rx_aad;</div><div class='add'>+	u8 iv[AES_BLOCK_LEN];</div><div class='add'>+	u8 pn[6];</div><div class='add'>+	int aad_len, ret;</div><div class='add'>+	size_t data_len = skb-&gt;len - hdr_len - CCMP_HDR_LEN;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &lt; hdr_len + CCMP_HDR_LEN + CCMP_MIC_LEN) {</div><div class='add'>+		key-&gt;dot11RSNAStatsCCMPFormatErrors++;</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	pos = skb-&gt;data + hdr_len;</div><div class='add'>+	keyidx = pos[3];</div><div class='add'>+	if (!(keyidx &amp; (1 &lt;&lt; 5))) {</div><div class='add'>+		net_dbg_ratelimited("CCMP: received packet without ExtIV flag from %pM\n",</div><div class='add'>+				    hdr-&gt;addr2);</div><div class='add'>+		key-&gt;dot11RSNAStatsCCMPFormatErrors++;</div><div class='add'>+		return -2;</div><div class='add'>+	}</div><div class='add'>+	keyidx &gt;&gt;= 6;</div><div class='add'>+	if (key-&gt;key_idx != keyidx) {</div><div class='add'>+		net_dbg_ratelimited("CCMP: RX tkey-&gt;key_idx=%d frame keyidx=%d\n",</div><div class='add'>+				    key-&gt;key_idx, keyidx);</div><div class='add'>+		return -6;</div><div class='add'>+	}</div><div class='add'>+	if (!key-&gt;key_set) {</div><div class='add'>+		net_dbg_ratelimited("CCMP: received packet from %pM with keyid=%d that does not have a configured key\n",</div><div class='add'>+				    hdr-&gt;addr2, keyidx);</div><div class='add'>+		return -3;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pn[0] = pos[7];</div><div class='add'>+	pn[1] = pos[6];</div><div class='add'>+	pn[2] = pos[5];</div><div class='add'>+	pn[3] = pos[4];</div><div class='add'>+	pn[4] = pos[1];</div><div class='add'>+	pn[5] = pos[0];</div><div class='add'>+	pos += 8;</div><div class='add'>+</div><div class='add'>+	if (ccmp_replay_check(pn, key-&gt;rx_pn)) {</div><div class='add'>+#ifdef CONFIG_LIBIPW_DEBUG</div><div class='add'>+		net_dbg_ratelimited("CCMP: replay detected: STA=%pM previous PN %02x%02x%02x%02x%02x%02x received PN %02x%02x%02x%02x%02x%02x\n",</div><div class='add'>+				    hdr-&gt;addr2,</div><div class='add'>+				    key-&gt;rx_pn[0], key-&gt;rx_pn[1], key-&gt;rx_pn[2],</div><div class='add'>+				    key-&gt;rx_pn[3], key-&gt;rx_pn[4], key-&gt;rx_pn[5],</div><div class='add'>+				    pn[0], pn[1], pn[2], pn[3], pn[4], pn[5]);</div><div class='add'>+#endif</div><div class='add'>+		key-&gt;dot11RSNAStatsCCMPReplays++;</div><div class='add'>+		return -4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req = aead_request_alloc(key-&gt;tfm, GFP_ATOMIC);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	aad_len = ccmp_init_iv_and_aad(hdr, pn, iv, aad);</div><div class='add'>+</div><div class='add'>+	sg_init_table(sg, 2);</div><div class='add'>+	sg_set_buf(&amp;sg[0], aad, aad_len);</div><div class='add'>+	sg_set_buf(&amp;sg[1], pos, data_len);</div><div class='add'>+</div><div class='add'>+	aead_request_set_callback(req, 0, NULL, NULL);</div><div class='add'>+	aead_request_set_ad(req, aad_len);</div><div class='add'>+	aead_request_set_crypt(req, sg, sg, data_len, iv);</div><div class='add'>+</div><div class='add'>+	ret = crypto_aead_decrypt(req);</div><div class='add'>+	aead_request_free(req);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		net_dbg_ratelimited("CCMP: decrypt failed: STA=%pM (%d)\n",</div><div class='add'>+				    hdr-&gt;addr2, ret);</div><div class='add'>+		key-&gt;dot11RSNAStatsCCMPDecryptErrors++;</div><div class='add'>+		return -5;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(key-&gt;rx_pn, pn, CCMP_PN_LEN);</div><div class='add'>+</div><div class='add'>+	/* Remove hdr and MIC */</div><div class='add'>+	memmove(skb-&gt;data + CCMP_HDR_LEN, skb-&gt;data, hdr_len);</div><div class='add'>+	skb_pull(skb, CCMP_HDR_LEN);</div><div class='add'>+	skb_trim(skb, skb-&gt;len - CCMP_MIC_LEN);</div><div class='add'>+</div><div class='add'>+	return keyidx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int libipw_ccmp_set_key(void *key, int len, u8 * seq, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_ccmp_data *data = priv;</div><div class='add'>+	int keyidx;</div><div class='add'>+	struct crypto_aead *tfm = data-&gt;tfm;</div><div class='add'>+</div><div class='add'>+	keyidx = data-&gt;key_idx;</div><div class='add'>+	memset(data, 0, sizeof(*data));</div><div class='add'>+	data-&gt;key_idx = keyidx;</div><div class='add'>+	data-&gt;tfm = tfm;</div><div class='add'>+	if (len == CCMP_TK_LEN) {</div><div class='add'>+		memcpy(data-&gt;key, key, CCMP_TK_LEN);</div><div class='add'>+		data-&gt;key_set = 1;</div><div class='add'>+		if (seq) {</div><div class='add'>+			data-&gt;rx_pn[0] = seq[5];</div><div class='add'>+			data-&gt;rx_pn[1] = seq[4];</div><div class='add'>+			data-&gt;rx_pn[2] = seq[3];</div><div class='add'>+			data-&gt;rx_pn[3] = seq[2];</div><div class='add'>+			data-&gt;rx_pn[4] = seq[1];</div><div class='add'>+			data-&gt;rx_pn[5] = seq[0];</div><div class='add'>+		}</div><div class='add'>+		if (crypto_aead_setauthsize(data-&gt;tfm, CCMP_MIC_LEN) ||</div><div class='add'>+		    crypto_aead_setkey(data-&gt;tfm, data-&gt;key, CCMP_TK_LEN))</div><div class='add'>+			return -1;</div><div class='add'>+	} else if (len == 0)</div><div class='add'>+		data-&gt;key_set = 0;</div><div class='add'>+	else</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int libipw_ccmp_get_key(void *key, int len, u8 * seq, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_ccmp_data *data = priv;</div><div class='add'>+</div><div class='add'>+	if (len &lt; CCMP_TK_LEN)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (!data-&gt;key_set)</div><div class='add'>+		return 0;</div><div class='add'>+	memcpy(key, data-&gt;key, CCMP_TK_LEN);</div><div class='add'>+</div><div class='add'>+	if (seq) {</div><div class='add'>+		seq[0] = data-&gt;tx_pn[5];</div><div class='add'>+		seq[1] = data-&gt;tx_pn[4];</div><div class='add'>+		seq[2] = data-&gt;tx_pn[3];</div><div class='add'>+		seq[3] = data-&gt;tx_pn[2];</div><div class='add'>+		seq[4] = data-&gt;tx_pn[1];</div><div class='add'>+		seq[5] = data-&gt;tx_pn[0];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return CCMP_TK_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void libipw_ccmp_print_stats(struct seq_file *m, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_ccmp_data *ccmp = priv;</div><div class='add'>+</div><div class='add'>+	seq_printf(m,</div><div class='add'>+		   "key[%d] alg=CCMP key_set=%d "</div><div class='add'>+		   "tx_pn=%02x%02x%02x%02x%02x%02x "</div><div class='add'>+		   "rx_pn=%02x%02x%02x%02x%02x%02x "</div><div class='add'>+		   "format_errors=%d replays=%d decrypt_errors=%d\n",</div><div class='add'>+		   ccmp-&gt;key_idx, ccmp-&gt;key_set,</div><div class='add'>+		   ccmp-&gt;tx_pn[0], ccmp-&gt;tx_pn[1], ccmp-&gt;tx_pn[2],</div><div class='add'>+		   ccmp-&gt;tx_pn[3], ccmp-&gt;tx_pn[4], ccmp-&gt;tx_pn[5],</div><div class='add'>+		   ccmp-&gt;rx_pn[0], ccmp-&gt;rx_pn[1], ccmp-&gt;rx_pn[2],</div><div class='add'>+		   ccmp-&gt;rx_pn[3], ccmp-&gt;rx_pn[4], ccmp-&gt;rx_pn[5],</div><div class='add'>+		   ccmp-&gt;dot11RSNAStatsCCMPFormatErrors,</div><div class='add'>+		   ccmp-&gt;dot11RSNAStatsCCMPReplays,</div><div class='add'>+		   ccmp-&gt;dot11RSNAStatsCCMPDecryptErrors);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct libipw_crypto_ops libipw_crypt_ccmp = {</div><div class='add'>+	.name = "CCMP",</div><div class='add'>+	.init = libipw_ccmp_init,</div><div class='add'>+	.deinit = libipw_ccmp_deinit,</div><div class='add'>+	.encrypt_mpdu = libipw_ccmp_encrypt,</div><div class='add'>+	.decrypt_mpdu = libipw_ccmp_decrypt,</div><div class='add'>+	.encrypt_msdu = NULL,</div><div class='add'>+	.decrypt_msdu = NULL,</div><div class='add'>+	.set_key = libipw_ccmp_set_key,</div><div class='add'>+	.get_key = libipw_ccmp_get_key,</div><div class='add'>+	.print_stats = libipw_ccmp_print_stats,</div><div class='add'>+	.extra_mpdu_prefix_len = CCMP_HDR_LEN,</div><div class='add'>+	.extra_mpdu_postfix_len = CCMP_MIC_LEN,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __init libipw_crypto_ccmp_init(void)</div><div class='add'>+{</div><div class='add'>+	return libipw_register_crypto_ops(&amp;libipw_crypt_ccmp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void libipw_crypto_ccmp_exit(void)</div><div class='add'>+{</div><div class='add'>+	libipw_unregister_crypto_ops(&amp;libipw_crypt_ccmp);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/ipw2x00/libipw_crypto_tkip.c b/drivers/net/wireless/intel/ipw2x00/libipw_crypto_tkip.c<br/>new file mode 100644<br/>index 000000000000..32288697da4f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/libipw_crypto_tkip.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/ipw2x00/libipw_crypto_tkip.c</a></div><div class='hunk'>@@ -0,0 +1,728 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * libipw crypt: host-based TKIP encryption implementation for libipw</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2003-2004, Jouni Malinen &lt;j@w1.fi&gt;</div><div class='add'>+ * Copyright (c) 2008, John W. Linville &lt;linville@tuxdriver.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/fips.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;asm/string.h&gt;</div><div class='add'>+#include &lt;linux/wireless.h&gt;</div><div class='add'>+#include &lt;linux/ieee80211.h&gt;</div><div class='add'>+#include &lt;net/iw_handler.h&gt;</div><div class='add'>+#include &lt;crypto/arc4.h&gt;</div><div class='add'>+#include &lt;crypto/hash.h&gt;</div><div class='add'>+#include &lt;linux/crypto.h&gt;</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+#include "libipw.h"</div><div class='add'>+</div><div class='add'>+#define TKIP_HDR_LEN 8</div><div class='add'>+</div><div class='add'>+struct libipw_tkip_data {</div><div class='add'>+#define TKIP_KEY_LEN 32</div><div class='add'>+	u8 key[TKIP_KEY_LEN];</div><div class='add'>+	int key_set;</div><div class='add'>+</div><div class='add'>+	u32 tx_iv32;</div><div class='add'>+	u16 tx_iv16;</div><div class='add'>+	u16 tx_ttak[5];</div><div class='add'>+	int tx_phase1_done;</div><div class='add'>+</div><div class='add'>+	u32 rx_iv32;</div><div class='add'>+	u16 rx_iv16;</div><div class='add'>+	u16 rx_ttak[5];</div><div class='add'>+	int rx_phase1_done;</div><div class='add'>+	u32 rx_iv32_new;</div><div class='add'>+	u16 rx_iv16_new;</div><div class='add'>+</div><div class='add'>+	u32 dot11RSNAStatsTKIPReplays;</div><div class='add'>+	u32 dot11RSNAStatsTKIPICVErrors;</div><div class='add'>+	u32 dot11RSNAStatsTKIPLocalMICFailures;</div><div class='add'>+</div><div class='add'>+	int key_idx;</div><div class='add'>+</div><div class='add'>+	struct arc4_ctx rx_ctx_arc4;</div><div class='add'>+	struct arc4_ctx tx_ctx_arc4;</div><div class='add'>+	struct crypto_shash *rx_tfm_michael;</div><div class='add'>+	struct crypto_shash *tx_tfm_michael;</div><div class='add'>+</div><div class='add'>+	/* scratch buffers for virt_to_page() (crypto API) */</div><div class='add'>+	u8 rx_hdr[16], tx_hdr[16];</div><div class='add'>+</div><div class='add'>+	unsigned long flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned long libipw_tkip_set_flags(unsigned long flags, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_tkip_data *_priv = priv;</div><div class='add'>+	unsigned long old_flags = _priv-&gt;flags;</div><div class='add'>+	_priv-&gt;flags = flags;</div><div class='add'>+	return old_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long libipw_tkip_get_flags(void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_tkip_data *_priv = priv;</div><div class='add'>+	return _priv-&gt;flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *libipw_tkip_init(int key_idx)</div><div class='add'>+{</div><div class='add'>+	struct libipw_tkip_data *priv;</div><div class='add'>+</div><div class='add'>+	if (fips_enabled)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	priv = kzalloc(sizeof(*priv), GFP_ATOMIC);</div><div class='add'>+	if (priv == NULL)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	priv-&gt;key_idx = key_idx;</div><div class='add'>+</div><div class='add'>+	priv-&gt;tx_tfm_michael = crypto_alloc_shash("michael_mic", 0, 0);</div><div class='add'>+	if (IS_ERR(priv-&gt;tx_tfm_michael)) {</div><div class='add'>+		priv-&gt;tx_tfm_michael = NULL;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;rx_tfm_michael = crypto_alloc_shash("michael_mic", 0, 0);</div><div class='add'>+	if (IS_ERR(priv-&gt;rx_tfm_michael)) {</div><div class='add'>+		priv-&gt;rx_tfm_michael = NULL;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return priv;</div><div class='add'>+</div><div class='add'>+      fail:</div><div class='add'>+	if (priv) {</div><div class='add'>+		crypto_free_shash(priv-&gt;tx_tfm_michael);</div><div class='add'>+		crypto_free_shash(priv-&gt;rx_tfm_michael);</div><div class='add'>+		kfree(priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void libipw_tkip_deinit(void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_tkip_data *_priv = priv;</div><div class='add'>+	if (_priv) {</div><div class='add'>+		crypto_free_shash(_priv-&gt;tx_tfm_michael);</div><div class='add'>+		crypto_free_shash(_priv-&gt;rx_tfm_michael);</div><div class='add'>+	}</div><div class='add'>+	kfree_sensitive(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 RotR1(u16 val)</div><div class='add'>+{</div><div class='add'>+	return (val &gt;&gt; 1) | (val &lt;&lt; 15);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 Lo8(u16 val)</div><div class='add'>+{</div><div class='add'>+	return val &amp; 0xff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 Hi8(u16 val)</div><div class='add'>+{</div><div class='add'>+	return val &gt;&gt; 8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 Lo16(u32 val)</div><div class='add'>+{</div><div class='add'>+	return val &amp; 0xffff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 Hi16(u32 val)</div><div class='add'>+{</div><div class='add'>+	return val &gt;&gt; 16;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 Mk16(u8 hi, u8 lo)</div><div class='add'>+{</div><div class='add'>+	return lo | (((u16) hi) &lt;&lt; 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 Mk16_le(__le16 * v)</div><div class='add'>+{</div><div class='add'>+	return le16_to_cpu(*v);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const u16 Sbox[256] = {</div><div class='add'>+	0xC6A5, 0xF884, 0xEE99, 0xF68D, 0xFF0D, 0xD6BD, 0xDEB1, 0x9154,</div><div class='add'>+	0x6050, 0x0203, 0xCEA9, 0x567D, 0xE719, 0xB562, 0x4DE6, 0xEC9A,</div><div class='add'>+	0x8F45, 0x1F9D, 0x8940, 0xFA87, 0xEF15, 0xB2EB, 0x8EC9, 0xFB0B,</div><div class='add'>+	0x41EC, 0xB367, 0x5FFD, 0x45EA, 0x23BF, 0x53F7, 0xE496, 0x9B5B,</div><div class='add'>+	0x75C2, 0xE11C, 0x3DAE, 0x4C6A, 0x6C5A, 0x7E41, 0xF502, 0x834F,</div><div class='add'>+	0x685C, 0x51F4, 0xD134, 0xF908, 0xE293, 0xAB73, 0x6253, 0x2A3F,</div><div class='add'>+	0x080C, 0x9552, 0x4665, 0x9D5E, 0x3028, 0x37A1, 0x0A0F, 0x2FB5,</div><div class='add'>+	0x0E09, 0x2436, 0x1B9B, 0xDF3D, 0xCD26, 0x4E69, 0x7FCD, 0xEA9F,</div><div class='add'>+	0x121B, 0x1D9E, 0x5874, 0x342E, 0x362D, 0xDCB2, 0xB4EE, 0x5BFB,</div><div class='add'>+	0xA4F6, 0x764D, 0xB761, 0x7DCE, 0x527B, 0xDD3E, 0x5E71, 0x1397,</div><div class='add'>+	0xA6F5, 0xB968, 0x0000, 0xC12C, 0x4060, 0xE31F, 0x79C8, 0xB6ED,</div><div class='add'>+	0xD4BE, 0x8D46, 0x67D9, 0x724B, 0x94DE, 0x98D4, 0xB0E8, 0x854A,</div><div class='add'>+	0xBB6B, 0xC52A, 0x4FE5, 0xED16, 0x86C5, 0x9AD7, 0x6655, 0x1194,</div><div class='add'>+	0x8ACF, 0xE910, 0x0406, 0xFE81, 0xA0F0, 0x7844, 0x25BA, 0x4BE3,</div><div class='add'>+	0xA2F3, 0x5DFE, 0x80C0, 0x058A, 0x3FAD, 0x21BC, 0x7048, 0xF104,</div><div class='add'>+	0x63DF, 0x77C1, 0xAF75, 0x4263, 0x2030, 0xE51A, 0xFD0E, 0xBF6D,</div><div class='add'>+	0x814C, 0x1814, 0x2635, 0xC32F, 0xBEE1, 0x35A2, 0x88CC, 0x2E39,</div><div class='add'>+	0x9357, 0x55F2, 0xFC82, 0x7A47, 0xC8AC, 0xBAE7, 0x322B, 0xE695,</div><div class='add'>+	0xC0A0, 0x1998, 0x9ED1, 0xA37F, 0x4466, 0x547E, 0x3BAB, 0x0B83,</div><div class='add'>+	0x8CCA, 0xC729, 0x6BD3, 0x283C, 0xA779, 0xBCE2, 0x161D, 0xAD76,</div><div class='add'>+	0xDB3B, 0x6456, 0x744E, 0x141E, 0x92DB, 0x0C0A, 0x486C, 0xB8E4,</div><div class='add'>+	0x9F5D, 0xBD6E, 0x43EF, 0xC4A6, 0x39A8, 0x31A4, 0xD337, 0xF28B,</div><div class='add'>+	0xD532, 0x8B43, 0x6E59, 0xDAB7, 0x018C, 0xB164, 0x9CD2, 0x49E0,</div><div class='add'>+	0xD8B4, 0xACFA, 0xF307, 0xCF25, 0xCAAF, 0xF48E, 0x47E9, 0x1018,</div><div class='add'>+	0x6FD5, 0xF088, 0x4A6F, 0x5C72, 0x3824, 0x57F1, 0x73C7, 0x9751,</div><div class='add'>+	0xCB23, 0xA17C, 0xE89C, 0x3E21, 0x96DD, 0x61DC, 0x0D86, 0x0F85,</div><div class='add'>+	0xE090, 0x7C42, 0x71C4, 0xCCAA, 0x90D8, 0x0605, 0xF701, 0x1C12,</div><div class='add'>+	0xC2A3, 0x6A5F, 0xAEF9, 0x69D0, 0x1791, 0x9958, 0x3A27, 0x27B9,</div><div class='add'>+	0xD938, 0xEB13, 0x2BB3, 0x2233, 0xD2BB, 0xA970, 0x0789, 0x33A7,</div><div class='add'>+	0x2DB6, 0x3C22, 0x1592, 0xC920, 0x8749, 0xAAFF, 0x5078, 0xA57A,</div><div class='add'>+	0x038F, 0x59F8, 0x0980, 0x1A17, 0x65DA, 0xD731, 0x84C6, 0xD0B8,</div><div class='add'>+	0x82C3, 0x29B0, 0x5A77, 0x1E11, 0x7BCB, 0xA8FC, 0x6DD6, 0x2C3A,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline u16 _S_(u16 v)</div><div class='add'>+{</div><div class='add'>+	u16 t = Sbox[Hi8(v)];</div><div class='add'>+	return Sbox[Lo8(v)] ^ ((t &lt;&lt; 8) | (t &gt;&gt; 8));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define PHASE1_LOOP_COUNT 8</div><div class='add'>+</div><div class='add'>+static void tkip_mixing_phase1(u16 * TTAK, const u8 * TK, const u8 * TA,</div><div class='add'>+			       u32 IV32)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	/* Initialize the 80-bit TTAK from TSC (IV32) and TA[0..5] */</div><div class='add'>+	TTAK[0] = Lo16(IV32);</div><div class='add'>+	TTAK[1] = Hi16(IV32);</div><div class='add'>+	TTAK[2] = Mk16(TA[1], TA[0]);</div><div class='add'>+	TTAK[3] = Mk16(TA[3], TA[2]);</div><div class='add'>+	TTAK[4] = Mk16(TA[5], TA[4]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; PHASE1_LOOP_COUNT; i++) {</div><div class='add'>+		j = 2 * (i &amp; 1);</div><div class='add'>+		TTAK[0] += _S_(TTAK[4] ^ Mk16(TK[1 + j], TK[0 + j]));</div><div class='add'>+		TTAK[1] += _S_(TTAK[0] ^ Mk16(TK[5 + j], TK[4 + j]));</div><div class='add'>+		TTAK[2] += _S_(TTAK[1] ^ Mk16(TK[9 + j], TK[8 + j]));</div><div class='add'>+		TTAK[3] += _S_(TTAK[2] ^ Mk16(TK[13 + j], TK[12 + j]));</div><div class='add'>+		TTAK[4] += _S_(TTAK[3] ^ Mk16(TK[1 + j], TK[0 + j])) + i;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tkip_mixing_phase2(u8 * WEPSeed, const u8 * TK, const u16 * TTAK,</div><div class='add'>+			       u16 IV16)</div><div class='add'>+{</div><div class='add'>+	/* Make temporary area overlap WEP seed so that the final copy can be</div><div class='add'>+	 * avoided on little endian hosts. */</div><div class='add'>+	u16 *PPK = (u16 *) &amp; WEPSeed[4];</div><div class='add'>+</div><div class='add'>+	/* Step 1 - make copy of TTAK and bring in TSC */</div><div class='add'>+	PPK[0] = TTAK[0];</div><div class='add'>+	PPK[1] = TTAK[1];</div><div class='add'>+	PPK[2] = TTAK[2];</div><div class='add'>+	PPK[3] = TTAK[3];</div><div class='add'>+	PPK[4] = TTAK[4];</div><div class='add'>+	PPK[5] = TTAK[4] + IV16;</div><div class='add'>+</div><div class='add'>+	/* Step 2 - 96-bit bijective mixing using S-box */</div><div class='add'>+	PPK[0] += _S_(PPK[5] ^ Mk16_le((__le16 *) &amp; TK[0]));</div><div class='add'>+	PPK[1] += _S_(PPK[0] ^ Mk16_le((__le16 *) &amp; TK[2]));</div><div class='add'>+	PPK[2] += _S_(PPK[1] ^ Mk16_le((__le16 *) &amp; TK[4]));</div><div class='add'>+	PPK[3] += _S_(PPK[2] ^ Mk16_le((__le16 *) &amp; TK[6]));</div><div class='add'>+	PPK[4] += _S_(PPK[3] ^ Mk16_le((__le16 *) &amp; TK[8]));</div><div class='add'>+	PPK[5] += _S_(PPK[4] ^ Mk16_le((__le16 *) &amp; TK[10]));</div><div class='add'>+</div><div class='add'>+	PPK[0] += RotR1(PPK[5] ^ Mk16_le((__le16 *) &amp; TK[12]));</div><div class='add'>+	PPK[1] += RotR1(PPK[0] ^ Mk16_le((__le16 *) &amp; TK[14]));</div><div class='add'>+	PPK[2] += RotR1(PPK[1]);</div><div class='add'>+	PPK[3] += RotR1(PPK[2]);</div><div class='add'>+	PPK[4] += RotR1(PPK[3]);</div><div class='add'>+	PPK[5] += RotR1(PPK[4]);</div><div class='add'>+</div><div class='add'>+	/* Step 3 - bring in last of TK bits, assign 24-bit WEP IV value</div><div class='add'>+	 * WEPSeed[0..2] is transmitted as WEP IV */</div><div class='add'>+	WEPSeed[0] = Hi8(IV16);</div><div class='add'>+	WEPSeed[1] = (Hi8(IV16) | 0x20) &amp; 0x7F;</div><div class='add'>+	WEPSeed[2] = Lo8(IV16);</div><div class='add'>+	WEPSeed[3] = Lo8((PPK[5] ^ Mk16_le((__le16 *) &amp; TK[0])) &gt;&gt; 1);</div><div class='add'>+</div><div class='add'>+#ifdef __BIG_ENDIAN</div><div class='add'>+	{</div><div class='add'>+		int i;</div><div class='add'>+		for (i = 0; i &lt; 6; i++)</div><div class='add'>+			PPK[i] = (PPK[i] &lt;&lt; 8) | (PPK[i] &gt;&gt; 8);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int libipw_tkip_hdr(struct sk_buff *skb, int hdr_len,</div><div class='add'>+			      u8 * rc4key, int keylen, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_tkip_data *tkey = priv;</div><div class='add'>+	u8 *pos;</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (skb_headroom(skb) &lt; TKIP_HDR_LEN || skb-&gt;len &lt; hdr_len)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (rc4key == NULL || keylen &lt; 16)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (!tkey-&gt;tx_phase1_done) {</div><div class='add'>+		tkip_mixing_phase1(tkey-&gt;tx_ttak, tkey-&gt;key, hdr-&gt;addr2,</div><div class='add'>+				   tkey-&gt;tx_iv32);</div><div class='add'>+		tkey-&gt;tx_phase1_done = 1;</div><div class='add'>+	}</div><div class='add'>+	tkip_mixing_phase2(rc4key, tkey-&gt;key, tkey-&gt;tx_ttak, tkey-&gt;tx_iv16);</div><div class='add'>+</div><div class='add'>+	pos = skb_push(skb, TKIP_HDR_LEN);</div><div class='add'>+	memmove(pos, pos + TKIP_HDR_LEN, hdr_len);</div><div class='add'>+	pos += hdr_len;</div><div class='add'>+</div><div class='add'>+	*pos++ = *rc4key;</div><div class='add'>+	*pos++ = *(rc4key + 1);</div><div class='add'>+	*pos++ = *(rc4key + 2);</div><div class='add'>+	*pos++ = (tkey-&gt;key_idx &lt;&lt; 6) | (1 &lt;&lt; 5) /* Ext IV included */ ;</div><div class='add'>+	*pos++ = tkey-&gt;tx_iv32 &amp; 0xff;</div><div class='add'>+	*pos++ = (tkey-&gt;tx_iv32 &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	*pos++ = (tkey-&gt;tx_iv32 &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	*pos++ = (tkey-&gt;tx_iv32 &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	tkey-&gt;tx_iv16++;</div><div class='add'>+	if (tkey-&gt;tx_iv16 == 0) {</div><div class='add'>+		tkey-&gt;tx_phase1_done = 0;</div><div class='add'>+		tkey-&gt;tx_iv32++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return TKIP_HDR_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int libipw_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_tkip_data *tkey = priv;</div><div class='add'>+	int len;</div><div class='add'>+	u8 rc4key[16], *pos, *icv;</div><div class='add'>+	u32 crc;</div><div class='add'>+</div><div class='add'>+	if (tkey-&gt;flags &amp; IEEE80211_CRYPTO_TKIP_COUNTERMEASURES) {</div><div class='add'>+		struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+		net_dbg_ratelimited("TKIP countermeasures: dropped TX packet to %pM\n",</div><div class='add'>+				    hdr-&gt;addr1);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb_tailroom(skb) &lt; 4 || skb-&gt;len &lt; hdr_len)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	len = skb-&gt;len - hdr_len;</div><div class='add'>+	pos = skb-&gt;data + hdr_len;</div><div class='add'>+</div><div class='add'>+	if ((libipw_tkip_hdr(skb, hdr_len, rc4key, 16, priv)) &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	crc = ~crc32_le(~0, pos, len);</div><div class='add'>+	icv = skb_put(skb, 4);</div><div class='add'>+	icv[0] = crc;</div><div class='add'>+	icv[1] = crc &gt;&gt; 8;</div><div class='add'>+	icv[2] = crc &gt;&gt; 16;</div><div class='add'>+	icv[3] = crc &gt;&gt; 24;</div><div class='add'>+</div><div class='add'>+	arc4_setkey(&amp;tkey-&gt;tx_ctx_arc4, rc4key, 16);</div><div class='add'>+	arc4_crypt(&amp;tkey-&gt;tx_ctx_arc4, pos, pos, len + 4);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * deal with seq counter wrapping correctly.</div><div class='add'>+ * refer to timer_after() for jiffies wrapping handling</div><div class='add'>+ */</div><div class='add'>+static inline int tkip_replay_check(u32 iv32_n, u16 iv16_n,</div><div class='add'>+				    u32 iv32_o, u16 iv16_o)</div><div class='add'>+{</div><div class='add'>+	if ((s32)iv32_n - (s32)iv32_o &lt; 0 ||</div><div class='add'>+	    (iv32_n == iv32_o &amp;&amp; iv16_n &lt;= iv16_o))</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int libipw_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_tkip_data *tkey = priv;</div><div class='add'>+	u8 rc4key[16];</div><div class='add'>+	u8 keyidx, *pos;</div><div class='add'>+	u32 iv32;</div><div class='add'>+	u16 iv16;</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	u8 icv[4];</div><div class='add'>+	u32 crc;</div><div class='add'>+	int plen;</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (tkey-&gt;flags &amp; IEEE80211_CRYPTO_TKIP_COUNTERMEASURES) {</div><div class='add'>+		net_dbg_ratelimited("TKIP countermeasures: dropped received packet from %pM\n",</div><div class='add'>+				    hdr-&gt;addr2);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &lt; hdr_len + TKIP_HDR_LEN + 4)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	pos = skb-&gt;data + hdr_len;</div><div class='add'>+	keyidx = pos[3];</div><div class='add'>+	if (!(keyidx &amp; (1 &lt;&lt; 5))) {</div><div class='add'>+		net_dbg_ratelimited("TKIP: received packet without ExtIV flag from %pM\n",</div><div class='add'>+				    hdr-&gt;addr2);</div><div class='add'>+		return -2;</div><div class='add'>+	}</div><div class='add'>+	keyidx &gt;&gt;= 6;</div><div class='add'>+	if (tkey-&gt;key_idx != keyidx) {</div><div class='add'>+		net_dbg_ratelimited("TKIP: RX tkey-&gt;key_idx=%d frame keyidx=%d\n",</div><div class='add'>+				    tkey-&gt;key_idx, keyidx);</div><div class='add'>+		return -6;</div><div class='add'>+	}</div><div class='add'>+	if (!tkey-&gt;key_set) {</div><div class='add'>+		net_dbg_ratelimited("TKIP: received packet from %pM with keyid=%d that does not have a configured key\n",</div><div class='add'>+				    hdr-&gt;addr2, keyidx);</div><div class='add'>+		return -3;</div><div class='add'>+	}</div><div class='add'>+	iv16 = (pos[0] &lt;&lt; 8) | pos[2];</div><div class='add'>+	iv32 = pos[4] | (pos[5] &lt;&lt; 8) | (pos[6] &lt;&lt; 16) | (pos[7] &lt;&lt; 24);</div><div class='add'>+	pos += TKIP_HDR_LEN;</div><div class='add'>+</div><div class='add'>+	if (tkip_replay_check(iv32, iv16, tkey-&gt;rx_iv32, tkey-&gt;rx_iv16)) {</div><div class='add'>+#ifdef CONFIG_LIBIPW_DEBUG</div><div class='add'>+		net_dbg_ratelimited("TKIP: replay detected: STA=%pM previous TSC %08x%04x received TSC %08x%04x\n",</div><div class='add'>+				    hdr-&gt;addr2, tkey-&gt;rx_iv32, tkey-&gt;rx_iv16,</div><div class='add'>+				    iv32, iv16);</div><div class='add'>+#endif</div><div class='add'>+		tkey-&gt;dot11RSNAStatsTKIPReplays++;</div><div class='add'>+		return -4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iv32 != tkey-&gt;rx_iv32 || !tkey-&gt;rx_phase1_done) {</div><div class='add'>+		tkip_mixing_phase1(tkey-&gt;rx_ttak, tkey-&gt;key, hdr-&gt;addr2, iv32);</div><div class='add'>+		tkey-&gt;rx_phase1_done = 1;</div><div class='add'>+	}</div><div class='add'>+	tkip_mixing_phase2(rc4key, tkey-&gt;key, tkey-&gt;rx_ttak, iv16);</div><div class='add'>+</div><div class='add'>+	plen = skb-&gt;len - hdr_len - 12;</div><div class='add'>+</div><div class='add'>+	arc4_setkey(&amp;tkey-&gt;rx_ctx_arc4, rc4key, 16);</div><div class='add'>+	arc4_crypt(&amp;tkey-&gt;rx_ctx_arc4, pos, pos, plen + 4);</div><div class='add'>+</div><div class='add'>+	crc = ~crc32_le(~0, pos, plen);</div><div class='add'>+	icv[0] = crc;</div><div class='add'>+	icv[1] = crc &gt;&gt; 8;</div><div class='add'>+	icv[2] = crc &gt;&gt; 16;</div><div class='add'>+	icv[3] = crc &gt;&gt; 24;</div><div class='add'>+	if (memcmp(icv, pos + plen, 4) != 0) {</div><div class='add'>+		if (iv32 != tkey-&gt;rx_iv32) {</div><div class='add'>+			/* Previously cached Phase1 result was already lost, so</div><div class='add'>+			 * it needs to be recalculated for the next packet. */</div><div class='add'>+			tkey-&gt;rx_phase1_done = 0;</div><div class='add'>+		}</div><div class='add'>+#ifdef CONFIG_LIBIPW_DEBUG</div><div class='add'>+		net_dbg_ratelimited("TKIP: ICV error detected: STA=%pM\n",</div><div class='add'>+				    hdr-&gt;addr2);</div><div class='add'>+#endif</div><div class='add'>+		tkey-&gt;dot11RSNAStatsTKIPICVErrors++;</div><div class='add'>+		return -5;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update real counters only after Michael MIC verification has</div><div class='add'>+	 * completed */</div><div class='add'>+	tkey-&gt;rx_iv32_new = iv32;</div><div class='add'>+	tkey-&gt;rx_iv16_new = iv16;</div><div class='add'>+</div><div class='add'>+	/* Remove IV and ICV */</div><div class='add'>+	memmove(skb-&gt;data + TKIP_HDR_LEN, skb-&gt;data, hdr_len);</div><div class='add'>+	skb_pull(skb, TKIP_HDR_LEN);</div><div class='add'>+	skb_trim(skb, skb-&gt;len - 4);</div><div class='add'>+</div><div class='add'>+	return keyidx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int michael_mic(struct crypto_shash *tfm_michael, u8 *key, u8 *hdr,</div><div class='add'>+		       u8 *data, size_t data_len, u8 *mic)</div><div class='add'>+{</div><div class='add'>+	SHASH_DESC_ON_STACK(desc, tfm_michael);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (tfm_michael == NULL) {</div><div class='add'>+		pr_warn("%s(): tfm_michael == NULL\n", __func__);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc-&gt;tfm = tfm_michael;</div><div class='add'>+</div><div class='add'>+	if (crypto_shash_setkey(tfm_michael, key, 8))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	err = crypto_shash_init(desc);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+	err = crypto_shash_update(desc, hdr, 16);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+	err = crypto_shash_update(desc, data, data_len);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+	err = crypto_shash_final(desc, mic);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	shash_desc_zero(desc);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void michael_mic_hdr(struct sk_buff *skb, u8 * hdr)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr11;</div><div class='add'>+</div><div class='add'>+	hdr11 = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	switch (le16_to_cpu(hdr11-&gt;frame_control) &amp;</div><div class='add'>+		(IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS)) {</div><div class='add'>+	case IEEE80211_FCTL_TODS:</div><div class='add'>+		memcpy(hdr, hdr11-&gt;addr3, ETH_ALEN);	/* DA */</div><div class='add'>+		memcpy(hdr + ETH_ALEN, hdr11-&gt;addr2, ETH_ALEN);	/* SA */</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_FCTL_FROMDS:</div><div class='add'>+		memcpy(hdr, hdr11-&gt;addr1, ETH_ALEN);	/* DA */</div><div class='add'>+		memcpy(hdr + ETH_ALEN, hdr11-&gt;addr3, ETH_ALEN);	/* SA */</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS:</div><div class='add'>+		memcpy(hdr, hdr11-&gt;addr3, ETH_ALEN);	/* DA */</div><div class='add'>+		memcpy(hdr + ETH_ALEN, hdr11-&gt;addr4, ETH_ALEN);	/* SA */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		memcpy(hdr, hdr11-&gt;addr1, ETH_ALEN);	/* DA */</div><div class='add'>+		memcpy(hdr + ETH_ALEN, hdr11-&gt;addr2, ETH_ALEN);	/* SA */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_data_qos(hdr11-&gt;frame_control)) {</div><div class='add'>+		hdr[12] = le16_to_cpu(*((__le16 *)ieee80211_get_qos_ctl(hdr11)))</div><div class='add'>+			&amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='add'>+	} else</div><div class='add'>+		hdr[12] = 0;		/* priority */</div><div class='add'>+</div><div class='add'>+	hdr[13] = hdr[14] = hdr[15] = 0;	/* reserved */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int libipw_michael_mic_add(struct sk_buff *skb, int hdr_len,</div><div class='add'>+				     void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_tkip_data *tkey = priv;</div><div class='add'>+	u8 *pos;</div><div class='add'>+</div><div class='add'>+	if (skb_tailroom(skb) &lt; 8 || skb-&gt;len &lt; hdr_len) {</div><div class='add'>+		printk(KERN_DEBUG "Invalid packet for Michael MIC add "</div><div class='add'>+		       "(tailroom=%d hdr_len=%d skb-&gt;len=%d)\n",</div><div class='add'>+		       skb_tailroom(skb), hdr_len, skb-&gt;len);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	michael_mic_hdr(skb, tkey-&gt;tx_hdr);</div><div class='add'>+	pos = skb_put(skb, 8);</div><div class='add'>+	if (michael_mic(tkey-&gt;tx_tfm_michael, &amp;tkey-&gt;key[16], tkey-&gt;tx_hdr,</div><div class='add'>+			skb-&gt;data + hdr_len, skb-&gt;len - 8 - hdr_len, pos))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void libipw_michael_mic_failure(struct net_device *dev,</div><div class='add'>+					  struct ieee80211_hdr *hdr,</div><div class='add'>+					  int keyidx)</div><div class='add'>+{</div><div class='add'>+	union iwreq_data wrqu;</div><div class='add'>+	struct iw_michaelmicfailure ev;</div><div class='add'>+</div><div class='add'>+	/* TODO: needed parameters: count, keyid, key type, TSC */</div><div class='add'>+	memset(&amp;ev, 0, sizeof(ev));</div><div class='add'>+	ev.flags = keyidx &amp; IW_MICFAILURE_KEY_ID;</div><div class='add'>+	if (hdr-&gt;addr1[0] &amp; 0x01)</div><div class='add'>+		ev.flags |= IW_MICFAILURE_GROUP;</div><div class='add'>+	else</div><div class='add'>+		ev.flags |= IW_MICFAILURE_PAIRWISE;</div><div class='add'>+	ev.src_addr.sa_family = ARPHRD_ETHER;</div><div class='add'>+	memcpy(ev.src_addr.sa_data, hdr-&gt;addr2, ETH_ALEN);</div><div class='add'>+	memset(&amp;wrqu, 0, sizeof(wrqu));</div><div class='add'>+	wrqu.data.length = sizeof(ev);</div><div class='add'>+	wireless_send_event(dev, IWEVMICHAELMICFAILURE, &amp;wrqu, (char *)&amp;ev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int libipw_michael_mic_verify(struct sk_buff *skb, int keyidx,</div><div class='add'>+					int hdr_len, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_tkip_data *tkey = priv;</div><div class='add'>+	u8 mic[8];</div><div class='add'>+</div><div class='add'>+	if (!tkey-&gt;key_set)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	michael_mic_hdr(skb, tkey-&gt;rx_hdr);</div><div class='add'>+	if (michael_mic(tkey-&gt;rx_tfm_michael, &amp;tkey-&gt;key[24], tkey-&gt;rx_hdr,</div><div class='add'>+			skb-&gt;data + hdr_len, skb-&gt;len - 8 - hdr_len, mic))</div><div class='add'>+		return -1;</div><div class='add'>+	if (memcmp(mic, skb-&gt;data + skb-&gt;len - 8, 8) != 0) {</div><div class='add'>+		struct ieee80211_hdr *hdr;</div><div class='add'>+		hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+		printk(KERN_DEBUG "%s: Michael MIC verification failed for "</div><div class='add'>+		       "MSDU from %pM keyidx=%d\n",</div><div class='add'>+		       skb-&gt;dev ? skb-&gt;dev-&gt;name : "N/A", hdr-&gt;addr2,</div><div class='add'>+		       keyidx);</div><div class='add'>+		if (skb-&gt;dev)</div><div class='add'>+			libipw_michael_mic_failure(skb-&gt;dev, hdr, keyidx);</div><div class='add'>+		tkey-&gt;dot11RSNAStatsTKIPLocalMICFailures++;</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update TSC counters for RX now that the packet verification has</div><div class='add'>+	 * completed. */</div><div class='add'>+	tkey-&gt;rx_iv32 = tkey-&gt;rx_iv32_new;</div><div class='add'>+	tkey-&gt;rx_iv16 = tkey-&gt;rx_iv16_new;</div><div class='add'>+</div><div class='add'>+	skb_trim(skb, skb-&gt;len - 8);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int libipw_tkip_set_key(void *key, int len, u8 * seq, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_tkip_data *tkey = priv;</div><div class='add'>+	int keyidx;</div><div class='add'>+	struct crypto_shash *tfm = tkey-&gt;tx_tfm_michael;</div><div class='add'>+	struct arc4_ctx *tfm2 = &amp;tkey-&gt;tx_ctx_arc4;</div><div class='add'>+	struct crypto_shash *tfm3 = tkey-&gt;rx_tfm_michael;</div><div class='add'>+	struct arc4_ctx *tfm4 = &amp;tkey-&gt;rx_ctx_arc4;</div><div class='add'>+</div><div class='add'>+	keyidx = tkey-&gt;key_idx;</div><div class='add'>+	memset(tkey, 0, sizeof(*tkey));</div><div class='add'>+	tkey-&gt;key_idx = keyidx;</div><div class='add'>+	tkey-&gt;tx_tfm_michael = tfm;</div><div class='add'>+	tkey-&gt;tx_ctx_arc4 = *tfm2;</div><div class='add'>+	tkey-&gt;rx_tfm_michael = tfm3;</div><div class='add'>+	tkey-&gt;rx_ctx_arc4 = *tfm4;</div><div class='add'>+	if (len == TKIP_KEY_LEN) {</div><div class='add'>+		memcpy(tkey-&gt;key, key, TKIP_KEY_LEN);</div><div class='add'>+		tkey-&gt;key_set = 1;</div><div class='add'>+		tkey-&gt;tx_iv16 = 1;	/* TSC is initialized to 1 */</div><div class='add'>+		if (seq) {</div><div class='add'>+			tkey-&gt;rx_iv32 = (seq[5] &lt;&lt; 24) | (seq[4] &lt;&lt; 16) |</div><div class='add'>+			    (seq[3] &lt;&lt; 8) | seq[2];</div><div class='add'>+			tkey-&gt;rx_iv16 = (seq[1] &lt;&lt; 8) | seq[0];</div><div class='add'>+		}</div><div class='add'>+	} else if (len == 0)</div><div class='add'>+		tkey-&gt;key_set = 0;</div><div class='add'>+	else</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int libipw_tkip_get_key(void *key, int len, u8 * seq, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_tkip_data *tkey = priv;</div><div class='add'>+</div><div class='add'>+	if (len &lt; TKIP_KEY_LEN)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (!tkey-&gt;key_set)</div><div class='add'>+		return 0;</div><div class='add'>+	memcpy(key, tkey-&gt;key, TKIP_KEY_LEN);</div><div class='add'>+</div><div class='add'>+	if (seq) {</div><div class='add'>+		/*</div><div class='add'>+		 * Not clear if this should return the value as is</div><div class='add'>+		 * or - as the code previously seemed to partially</div><div class='add'>+		 * have been written as - subtract one from it. It</div><div class='add'>+		 * was working this way for a long time so leave it.</div><div class='add'>+		 */</div><div class='add'>+		seq[0] = tkey-&gt;tx_iv16;</div><div class='add'>+		seq[1] = tkey-&gt;tx_iv16 &gt;&gt; 8;</div><div class='add'>+		seq[2] = tkey-&gt;tx_iv32;</div><div class='add'>+		seq[3] = tkey-&gt;tx_iv32 &gt;&gt; 8;</div><div class='add'>+		seq[4] = tkey-&gt;tx_iv32 &gt;&gt; 16;</div><div class='add'>+		seq[5] = tkey-&gt;tx_iv32 &gt;&gt; 24;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return TKIP_KEY_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void libipw_tkip_print_stats(struct seq_file *m, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_tkip_data *tkip = priv;</div><div class='add'>+	seq_printf(m,</div><div class='add'>+		   "key[%d] alg=TKIP key_set=%d "</div><div class='add'>+		   "tx_pn=%02x%02x%02x%02x%02x%02x "</div><div class='add'>+		   "rx_pn=%02x%02x%02x%02x%02x%02x "</div><div class='add'>+		   "replays=%d icv_errors=%d local_mic_failures=%d\n",</div><div class='add'>+		   tkip-&gt;key_idx, tkip-&gt;key_set,</div><div class='add'>+		   (tkip-&gt;tx_iv32 &gt;&gt; 24) &amp; 0xff,</div><div class='add'>+		   (tkip-&gt;tx_iv32 &gt;&gt; 16) &amp; 0xff,</div><div class='add'>+		   (tkip-&gt;tx_iv32 &gt;&gt; 8) &amp; 0xff,</div><div class='add'>+		   tkip-&gt;tx_iv32 &amp; 0xff,</div><div class='add'>+		   (tkip-&gt;tx_iv16 &gt;&gt; 8) &amp; 0xff,</div><div class='add'>+		   tkip-&gt;tx_iv16 &amp; 0xff,</div><div class='add'>+		   (tkip-&gt;rx_iv32 &gt;&gt; 24) &amp; 0xff,</div><div class='add'>+		   (tkip-&gt;rx_iv32 &gt;&gt; 16) &amp; 0xff,</div><div class='add'>+		   (tkip-&gt;rx_iv32 &gt;&gt; 8) &amp; 0xff,</div><div class='add'>+		   tkip-&gt;rx_iv32 &amp; 0xff,</div><div class='add'>+		   (tkip-&gt;rx_iv16 &gt;&gt; 8) &amp; 0xff,</div><div class='add'>+		   tkip-&gt;rx_iv16 &amp; 0xff,</div><div class='add'>+		   tkip-&gt;dot11RSNAStatsTKIPReplays,</div><div class='add'>+		   tkip-&gt;dot11RSNAStatsTKIPICVErrors,</div><div class='add'>+		   tkip-&gt;dot11RSNAStatsTKIPLocalMICFailures);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct libipw_crypto_ops libipw_crypt_tkip = {</div><div class='add'>+	.name = "TKIP",</div><div class='add'>+	.init = libipw_tkip_init,</div><div class='add'>+	.deinit = libipw_tkip_deinit,</div><div class='add'>+	.encrypt_mpdu = libipw_tkip_encrypt,</div><div class='add'>+	.decrypt_mpdu = libipw_tkip_decrypt,</div><div class='add'>+	.encrypt_msdu = libipw_michael_mic_add,</div><div class='add'>+	.decrypt_msdu = libipw_michael_mic_verify,</div><div class='add'>+	.set_key = libipw_tkip_set_key,</div><div class='add'>+	.get_key = libipw_tkip_get_key,</div><div class='add'>+	.print_stats = libipw_tkip_print_stats,</div><div class='add'>+	.extra_mpdu_prefix_len = 4 + 4,	/* IV + ExtIV */</div><div class='add'>+	.extra_mpdu_postfix_len = 4,	/* ICV */</div><div class='add'>+	.extra_msdu_postfix_len = 8,	/* MIC */</div><div class='add'>+	.get_flags = libipw_tkip_get_flags,</div><div class='add'>+	.set_flags = libipw_tkip_set_flags,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __init libipw_crypto_tkip_init(void)</div><div class='add'>+{</div><div class='add'>+	return libipw_register_crypto_ops(&amp;libipw_crypt_tkip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void libipw_crypto_tkip_exit(void)</div><div class='add'>+{</div><div class='add'>+	libipw_unregister_crypto_ops(&amp;libipw_crypt_tkip);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/ipw2x00/libipw_crypto_wep.c b/drivers/net/wireless/intel/ipw2x00/libipw_crypto_wep.c<br/>new file mode 100644<br/>index 000000000000..c3a4ccb9de17<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/libipw_crypto_wep.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/ipw2x00/libipw_crypto_wep.c</a></div><div class='hunk'>@@ -0,0 +1,247 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * libipw crypt: host-based WEP encryption implementation for libipw</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2002-2004, Jouni Malinen &lt;j@w1.fi&gt;</div><div class='add'>+ * Copyright (c) 2008, John W. Linville &lt;linville@tuxdriver.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/fips.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;asm/string.h&gt;</div><div class='add'>+#include &lt;crypto/arc4.h&gt;</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+#include "libipw.h"</div><div class='add'>+</div><div class='add'>+struct libipw_wep_data {</div><div class='add'>+	u32 iv;</div><div class='add'>+#define WEP_KEY_LEN 13</div><div class='add'>+	u8 key[WEP_KEY_LEN + 1];</div><div class='add'>+	u8 key_len;</div><div class='add'>+	u8 key_idx;</div><div class='add'>+	struct arc4_ctx tx_ctx;</div><div class='add'>+	struct arc4_ctx rx_ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void *libipw_wep_init(int keyidx)</div><div class='add'>+{</div><div class='add'>+	struct libipw_wep_data *priv;</div><div class='add'>+</div><div class='add'>+	if (fips_enabled)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	priv = kzalloc(sizeof(*priv), GFP_ATOMIC);</div><div class='add'>+	if (priv == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+	priv-&gt;key_idx = keyidx;</div><div class='add'>+</div><div class='add'>+	/* start WEP IV from a random value */</div><div class='add'>+	get_random_bytes(&amp;priv-&gt;iv, 4);</div><div class='add'>+</div><div class='add'>+	return priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void libipw_wep_deinit(void *priv)</div><div class='add'>+{</div><div class='add'>+	kfree_sensitive(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Add WEP IV/key info to a frame that has at least 4 bytes of headroom */</div><div class='add'>+static int libipw_wep_build_iv(struct sk_buff *skb, int hdr_len,</div><div class='add'>+			       u8 *key, int keylen, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_wep_data *wep = priv;</div><div class='add'>+	u32 klen;</div><div class='add'>+	u8 *pos;</div><div class='add'>+</div><div class='add'>+	if (skb_headroom(skb) &lt; 4 || skb-&gt;len &lt; hdr_len)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	pos = skb_push(skb, 4);</div><div class='add'>+	memmove(pos, pos + 4, hdr_len);</div><div class='add'>+	pos += hdr_len;</div><div class='add'>+</div><div class='add'>+	klen = 3 + wep-&gt;key_len;</div><div class='add'>+</div><div class='add'>+	wep-&gt;iv++;</div><div class='add'>+</div><div class='add'>+	/* Fluhrer, Mantin, and Shamir have reported weaknesses in the key</div><div class='add'>+	 * scheduling algorithm of RC4. At least IVs (KeyByte + 3, 0xff, N)</div><div class='add'>+	 * can be used to speedup attacks, so avoid using them. */</div><div class='add'>+	if ((wep-&gt;iv &amp; 0xff00) == 0xff00) {</div><div class='add'>+		u8 B = (wep-&gt;iv &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+		if (B &gt;= 3 &amp;&amp; B &lt; klen)</div><div class='add'>+			wep-&gt;iv += 0x0100;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Prepend 24-bit IV to RC4 key and TX frame */</div><div class='add'>+	*pos++ = (wep-&gt;iv &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	*pos++ = (wep-&gt;iv &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	*pos++ = wep-&gt;iv &amp; 0xff;</div><div class='add'>+	*pos++ = wep-&gt;key_idx &lt;&lt; 6;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Perform WEP encryption on given skb that has at least 4 bytes of headroom</div><div class='add'>+ * for IV and 4 bytes of tailroom for ICV. Both IV and ICV will be transmitted,</div><div class='add'>+ * so the payload length increases with 8 bytes.</div><div class='add'>+ *</div><div class='add'>+ * WEP frame payload: IV + TX key idx, RC4(data), ICV = RC4(CRC32(data))</div><div class='add'>+ */</div><div class='add'>+static int libipw_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_wep_data *wep = priv;</div><div class='add'>+	u32 crc, klen, len;</div><div class='add'>+	u8 *pos, *icv;</div><div class='add'>+	u8 key[WEP_KEY_LEN + 3];</div><div class='add'>+</div><div class='add'>+	/* other checks are in libipw_wep_build_iv */</div><div class='add'>+	if (skb_tailroom(skb) &lt; 4)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/* add the IV to the frame */</div><div class='add'>+	if (libipw_wep_build_iv(skb, hdr_len, NULL, 0, priv))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/* Copy the IV into the first 3 bytes of the key */</div><div class='add'>+	skb_copy_from_linear_data_offset(skb, hdr_len, key, 3);</div><div class='add'>+</div><div class='add'>+	/* Copy rest of the WEP key (the secret part) */</div><div class='add'>+	memcpy(key + 3, wep-&gt;key, wep-&gt;key_len);</div><div class='add'>+</div><div class='add'>+	len = skb-&gt;len - hdr_len - 4;</div><div class='add'>+	pos = skb-&gt;data + hdr_len + 4;</div><div class='add'>+	klen = 3 + wep-&gt;key_len;</div><div class='add'>+</div><div class='add'>+	/* Append little-endian CRC32 over only the data and encrypt it to produce ICV */</div><div class='add'>+	crc = ~crc32_le(~0, pos, len);</div><div class='add'>+	icv = skb_put(skb, 4);</div><div class='add'>+	icv[0] = crc;</div><div class='add'>+	icv[1] = crc &gt;&gt; 8;</div><div class='add'>+	icv[2] = crc &gt;&gt; 16;</div><div class='add'>+	icv[3] = crc &gt;&gt; 24;</div><div class='add'>+</div><div class='add'>+	arc4_setkey(&amp;wep-&gt;tx_ctx, key, klen);</div><div class='add'>+	arc4_crypt(&amp;wep-&gt;tx_ctx, pos, pos, len + 4);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Perform WEP decryption on given buffer. Buffer includes whole WEP part of</div><div class='add'>+ * the frame: IV (4 bytes), encrypted payload (including SNAP header),</div><div class='add'>+ * ICV (4 bytes). len includes both IV and ICV.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if frame was decrypted successfully and ICV was correct and -1 on</div><div class='add'>+ * failure. If frame is OK, IV and ICV will be removed.</div><div class='add'>+ */</div><div class='add'>+static int libipw_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_wep_data *wep = priv;</div><div class='add'>+	u32 crc, klen, plen;</div><div class='add'>+	u8 key[WEP_KEY_LEN + 3];</div><div class='add'>+	u8 keyidx, *pos, icv[4];</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &lt; hdr_len + 8)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	pos = skb-&gt;data + hdr_len;</div><div class='add'>+	key[0] = *pos++;</div><div class='add'>+	key[1] = *pos++;</div><div class='add'>+	key[2] = *pos++;</div><div class='add'>+	keyidx = *pos++ &gt;&gt; 6;</div><div class='add'>+	if (keyidx != wep-&gt;key_idx)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	klen = 3 + wep-&gt;key_len;</div><div class='add'>+</div><div class='add'>+	/* Copy rest of the WEP key (the secret part) */</div><div class='add'>+	memcpy(key + 3, wep-&gt;key, wep-&gt;key_len);</div><div class='add'>+</div><div class='add'>+	/* Apply RC4 to data and compute CRC32 over decrypted data */</div><div class='add'>+	plen = skb-&gt;len - hdr_len - 8;</div><div class='add'>+</div><div class='add'>+	arc4_setkey(&amp;wep-&gt;rx_ctx, key, klen);</div><div class='add'>+	arc4_crypt(&amp;wep-&gt;rx_ctx, pos, pos, plen + 4);</div><div class='add'>+</div><div class='add'>+	crc = ~crc32_le(~0, pos, plen);</div><div class='add'>+	icv[0] = crc;</div><div class='add'>+	icv[1] = crc &gt;&gt; 8;</div><div class='add'>+	icv[2] = crc &gt;&gt; 16;</div><div class='add'>+	icv[3] = crc &gt;&gt; 24;</div><div class='add'>+	if (memcmp(icv, pos + plen, 4) != 0) {</div><div class='add'>+		/* ICV mismatch - drop frame */</div><div class='add'>+		return -2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Remove IV and ICV */</div><div class='add'>+	memmove(skb-&gt;data + 4, skb-&gt;data, hdr_len);</div><div class='add'>+	skb_pull(skb, 4);</div><div class='add'>+	skb_trim(skb, skb-&gt;len - 4);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int libipw_wep_set_key(void *key, int len, u8 * seq, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_wep_data *wep = priv;</div><div class='add'>+</div><div class='add'>+	if (len &lt; 0 || len &gt; WEP_KEY_LEN)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	memcpy(wep-&gt;key, key, len);</div><div class='add'>+	wep-&gt;key_len = len;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int libipw_wep_get_key(void *key, int len, u8 * seq, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_wep_data *wep = priv;</div><div class='add'>+</div><div class='add'>+	if (len &lt; wep-&gt;key_len)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	memcpy(key, wep-&gt;key, wep-&gt;key_len);</div><div class='add'>+</div><div class='add'>+	return wep-&gt;key_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void libipw_wep_print_stats(struct seq_file *m, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct libipw_wep_data *wep = priv;</div><div class='add'>+	seq_printf(m, "key[%d] alg=WEP len=%d\n", wep-&gt;key_idx, wep-&gt;key_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct libipw_crypto_ops libipw_crypt_wep = {</div><div class='add'>+	.name = "WEP",</div><div class='add'>+	.init = libipw_wep_init,</div><div class='add'>+	.deinit = libipw_wep_deinit,</div><div class='add'>+	.encrypt_mpdu = libipw_wep_encrypt,</div><div class='add'>+	.decrypt_mpdu = libipw_wep_decrypt,</div><div class='add'>+	.encrypt_msdu = NULL,</div><div class='add'>+	.decrypt_msdu = NULL,</div><div class='add'>+	.set_key = libipw_wep_set_key,</div><div class='add'>+	.get_key = libipw_wep_get_key,</div><div class='add'>+	.print_stats = libipw_wep_print_stats,</div><div class='add'>+	.extra_mpdu_prefix_len = 4,	/* IV */</div><div class='add'>+	.extra_mpdu_postfix_len = 4,	/* ICV */</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __init libipw_crypto_wep_init(void)</div><div class='add'>+{</div><div class='add'>+	return libipw_register_crypto_ops(&amp;libipw_crypt_wep);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __exit libipw_crypto_wep_exit(void)</div><div class='add'>+{</div><div class='add'>+	libipw_unregister_crypto_ops(&amp;libipw_crypt_wep);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/ipw2x00/libipw_module.c b/drivers/net/wireless/intel/ipw2x00/libipw_module.c<br/>index 43bab92a4148..2ad085b1f492 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/libipw_module.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/libipw_module.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/libipw_module.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/ipw2x00/libipw_module.c</a></div><div class='hunk'>@@ -83,7 +83,7 @@ void libipw_networks_age(struct libipw_device *ieee,</div><div class='ctx'> {</div><div class='ctx'> 	struct libipw_network *network = NULL;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	unsigned long age_jiffies = msecs_to_jiffies(age_secs * MSEC_PER_SEC);</div><div class='add'>+	unsigned long age_jiffies = secs_to_jiffies(age_secs);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;ieee-&gt;lock, flags);</div><div class='ctx'> 	list_for_each_entry(network, &amp;ieee-&gt;network_list, list) {</div><div class='hunk'>@@ -169,7 +169,7 @@ struct net_device *alloc_libipw(int sizeof_priv, int monitor)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;ieee-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	lib80211_crypt_info_init(&amp;ieee-&gt;crypt_info, dev-&gt;name, &amp;ieee-&gt;lock);</div><div class='add'>+	libipw_crypt_info_init(&amp;ieee-&gt;crypt_info, dev-&gt;name, &amp;ieee-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	ieee-&gt;wpa_enabled = 0;</div><div class='ctx'> 	ieee-&gt;drop_unencrypted = 0;</div><div class='hunk'>@@ -191,7 +191,7 @@ void free_libipw(struct net_device *dev, int monitor)</div><div class='ctx'> {</div><div class='ctx'> 	struct libipw_device *ieee = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	lib80211_crypt_info_free(&amp;ieee-&gt;crypt_info);</div><div class='add'>+	libipw_crypt_info_free(&amp;ieee-&gt;crypt_info);</div><div class='ctx'> </div><div class='ctx'> 	libipw_networks_free(ieee);</div><div class='ctx'> </div><div class='hunk'>@@ -251,6 +251,7 @@ static const struct proc_ops debug_level_proc_ops = {</div><div class='ctx'> </div><div class='ctx'> static int __init libipw_init(void)</div><div class='ctx'> {</div><div class='add'>+	int err;</div><div class='ctx'> #ifdef CONFIG_LIBIPW_DEBUG</div><div class='ctx'> 	struct proc_dir_entry *e;</div><div class='ctx'> </div><div class='hunk'>@@ -273,7 +274,33 @@ static int __init libipw_init(void)</div><div class='ctx'> 	printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION ", " DRV_VERSION "\n");</div><div class='ctx'> 	printk(KERN_INFO DRV_NAME ": " DRV_COPYRIGHT "\n");</div><div class='ctx'> </div><div class='add'>+	err = libipw_crypto_init();</div><div class='add'>+	if (err)</div><div class='add'>+		goto remove_debugfs;</div><div class='add'>+	err = libipw_crypto_ccmp_init();</div><div class='add'>+	if (err)</div><div class='add'>+		goto uninit_crypto;</div><div class='add'>+	err = libipw_crypto_tkip_init();</div><div class='add'>+	if (err)</div><div class='add'>+		goto uninit_crypto_ccmp;</div><div class='add'>+	err = libipw_crypto_wep_init();</div><div class='add'>+	if (err)</div><div class='add'>+		goto uninit_crypto_tkip;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='add'>+uninit_crypto_tkip:</div><div class='add'>+	libipw_crypto_tkip_exit();</div><div class='add'>+uninit_crypto_ccmp:</div><div class='add'>+	libipw_crypto_ccmp_exit();</div><div class='add'>+uninit_crypto:</div><div class='add'>+	libipw_crypto_exit();</div><div class='add'>+remove_debugfs:</div><div class='add'>+#ifdef CONFIG_LIBIPW_DEBUG</div><div class='add'>+	remove_proc_entry("debug_level", libipw_proc);</div><div class='add'>+	remove_proc_entry(DRV_PROCNAME, init_net.proc_net);</div><div class='add'>+	libipw_proc = NULL;</div><div class='add'>+#endif</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit libipw_exit(void)</div><div class='hunk'>@@ -285,6 +312,11 @@ static void __exit libipw_exit(void)</div><div class='ctx'> 		libipw_proc = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> #endif				/* CONFIG_LIBIPW_DEBUG */</div><div class='add'>+</div><div class='add'>+	libipw_crypto_ccmp_exit();</div><div class='add'>+	libipw_crypto_tkip_exit();</div><div class='add'>+	libipw_crypto_wep_exit();</div><div class='add'>+	libipw_crypto_exit();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_LIBIPW_DEBUG</div><div class='head'>diff --git a/drivers/net/wireless/intel/ipw2x00/libipw_rx.c b/drivers/net/wireless/intel/ipw2x00/libipw_rx.c<br/>index 5a2a723e480b..b7bc94f7abd8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/libipw_rx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/libipw_rx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/libipw_rx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/ipw2x00/libipw_rx.c</a></div><div class='hunk'>@@ -27,9 +27,6 @@</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/lib80211.h&gt;</div><div class='del'>-</div><div class='ctx'> #include "libipw.h"</div><div class='ctx'> </div><div class='ctx'> static void libipw_monitor_rx(struct libipw_device *ieee,</div><div class='hunk'>@@ -266,7 +263,7 @@ static int libipw_is_eapol_frame(struct libipw_device *ieee,</div><div class='ctx'> /* Called only as a tasklet (software IRQ), by libipw_rx */</div><div class='ctx'> static int</div><div class='ctx'> libipw_rx_frame_decrypt(struct libipw_device *ieee, struct sk_buff *skb,</div><div class='del'>-			   struct lib80211_crypt_data *crypt)</div><div class='add'>+			   struct libipw_crypt_data *crypt)</div><div class='ctx'> {</div><div class='ctx'> 	struct libipw_hdr_3addr *hdr;</div><div class='ctx'> 	int res, hdrlen;</div><div class='hunk'>@@ -298,7 +295,7 @@ libipw_rx_frame_decrypt(struct libipw_device *ieee, struct sk_buff *skb,</div><div class='ctx'> static int</div><div class='ctx'> libipw_rx_frame_decrypt_msdu(struct libipw_device *ieee,</div><div class='ctx'> 				struct sk_buff *skb, int keyidx,</div><div class='del'>-				struct lib80211_crypt_data *crypt)</div><div class='add'>+				struct libipw_crypt_data *crypt)</div><div class='ctx'> {</div><div class='ctx'> 	struct libipw_hdr_3addr *hdr;</div><div class='ctx'> 	int res, hdrlen;</div><div class='hunk'>@@ -345,7 +342,7 @@ int libipw_rx(struct libipw_device *ieee, struct sk_buff *skb,</div><div class='ctx'> #endif</div><div class='ctx'> 	u8 dst[ETH_ALEN];</div><div class='ctx'> 	u8 src[ETH_ALEN];</div><div class='del'>-	struct lib80211_crypt_data *crypt = NULL;</div><div class='add'>+	struct libipw_crypt_data *crypt = NULL;</div><div class='ctx'> 	int keyidx = 0;</div><div class='ctx'> 	int can_be_decrypted = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -396,7 +393,7 @@ int libipw_rx(struct libipw_device *ieee, struct sk_buff *skb,</div><div class='ctx'> 			wstats.updated |= IW_QUAL_QUAL_INVALID;</div><div class='ctx'> </div><div class='ctx'> 		/* Update spy records */</div><div class='del'>-		wireless_spy_update(ieee-&gt;dev, hdr-&gt;addr2, &amp;wstats);</div><div class='add'>+		libipw_spy_update(ieee-&gt;dev, hdr-&gt;addr2, &amp;wstats);</div><div class='ctx'> 	}</div><div class='ctx'> #endif				/* IW_WIRELESS_SPY */</div><div class='ctx'> #endif				/* CONFIG_WIRELESS_EXT */</div><div class='hunk'>@@ -826,96 +823,6 @@ int libipw_rx(struct libipw_device *ieee, struct sk_buff *skb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Filter out unrelated packets, call libipw_rx[_mgt]</div><div class='del'>- * This function takes over the skb, it should not be used again after calling</div><div class='del'>- * this function. */</div><div class='del'>-void libipw_rx_any(struct libipw_device *ieee,</div><div class='del'>-		     struct sk_buff *skb, struct libipw_rx_stats *stats)</div><div class='del'>-{</div><div class='del'>-	struct libipw_hdr_4addr *hdr;</div><div class='del'>-	int is_packet_for_us;</div><div class='del'>-	u16 fc;</div><div class='del'>-</div><div class='del'>-	if (ieee-&gt;iw_mode == IW_MODE_MONITOR) {</div><div class='del'>-		if (!libipw_rx(ieee, skb, stats))</div><div class='del'>-			dev_kfree_skb_irq(skb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; sizeof(struct ieee80211_hdr))</div><div class='del'>-		goto drop_free;</div><div class='del'>-</div><div class='del'>-	hdr = (struct libipw_hdr_4addr *)skb-&gt;data;</div><div class='del'>-	fc = le16_to_cpu(hdr-&gt;frame_ctl);</div><div class='del'>-</div><div class='del'>-	if ((fc &amp; IEEE80211_FCTL_VERS) != 0)</div><div class='del'>-		goto drop_free;</div><div class='del'>-</div><div class='del'>-	switch (fc &amp; IEEE80211_FCTL_FTYPE) {</div><div class='del'>-	case IEEE80211_FTYPE_MGMT:</div><div class='del'>-		if (skb-&gt;len &lt; sizeof(struct libipw_hdr_3addr))</div><div class='del'>-			goto drop_free;</div><div class='del'>-		libipw_rx_mgt(ieee, hdr, stats);</div><div class='del'>-		dev_kfree_skb_irq(skb);</div><div class='del'>-		return;</div><div class='del'>-	case IEEE80211_FTYPE_DATA:</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_FTYPE_CTL:</div><div class='del'>-		return;</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	is_packet_for_us = 0;</div><div class='del'>-	switch (ieee-&gt;iw_mode) {</div><div class='del'>-	case IW_MODE_ADHOC:</div><div class='del'>-		/* our BSS and not from/to DS */</div><div class='del'>-		if (ether_addr_equal(hdr-&gt;addr3, ieee-&gt;bssid))</div><div class='del'>-		if ((fc &amp; (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == 0) {</div><div class='del'>-			/* promisc: get all */</div><div class='del'>-			if (ieee-&gt;dev-&gt;flags &amp; IFF_PROMISC)</div><div class='del'>-				is_packet_for_us = 1;</div><div class='del'>-			/* to us */</div><div class='del'>-			else if (ether_addr_equal(hdr-&gt;addr1, ieee-&gt;dev-&gt;dev_addr))</div><div class='del'>-				is_packet_for_us = 1;</div><div class='del'>-			/* mcast */</div><div class='del'>-			else if (is_multicast_ether_addr(hdr-&gt;addr1))</div><div class='del'>-				is_packet_for_us = 1;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case IW_MODE_INFRA:</div><div class='del'>-		/* our BSS (== from our AP) and from DS */</div><div class='del'>-		if (ether_addr_equal(hdr-&gt;addr2, ieee-&gt;bssid))</div><div class='del'>-		if ((fc &amp; (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == IEEE80211_FCTL_FROMDS) {</div><div class='del'>-			/* promisc: get all */</div><div class='del'>-			if (ieee-&gt;dev-&gt;flags &amp; IFF_PROMISC)</div><div class='del'>-				is_packet_for_us = 1;</div><div class='del'>-			/* to us */</div><div class='del'>-			else if (ether_addr_equal(hdr-&gt;addr1, ieee-&gt;dev-&gt;dev_addr))</div><div class='del'>-				is_packet_for_us = 1;</div><div class='del'>-			/* mcast */</div><div class='del'>-			else if (is_multicast_ether_addr(hdr-&gt;addr1)) {</div><div class='del'>-				/* not our own packet bcasted from AP */</div><div class='del'>-				if (!ether_addr_equal(hdr-&gt;addr3, ieee-&gt;dev-&gt;dev_addr))</div><div class='del'>-					is_packet_for_us = 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/* ? */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (is_packet_for_us)</div><div class='del'>-		if (!libipw_rx(ieee, skb, stats))</div><div class='del'>-			dev_kfree_skb_irq(skb);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-drop_free:</div><div class='del'>-	dev_kfree_skb_irq(skb);</div><div class='del'>-	ieee-&gt;dev-&gt;stats.rx_dropped++;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define MGMT_FRAME_FIXED_PART_LENGTH		0x24</div><div class='ctx'> </div><div class='ctx'> static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 };</div><div class='hunk'>@@ -927,7 +834,8 @@ static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 };</div><div class='ctx'> static int libipw_verify_qos_info(struct libipw_qos_information_element</div><div class='ctx'> 				     *info_element, int sub_type)</div><div class='ctx'> {</div><div class='del'>-</div><div class='add'>+	if (info_element-&gt;elementID != QOS_ELEMENT_ID)</div><div class='add'>+		return -1;</div><div class='ctx'> 	if (info_element-&gt;qui_subtype != sub_type)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	if (memcmp(info_element-&gt;qui, qos_oui, QOS_OUI_LEN))</div><div class='hunk'>@@ -943,57 +851,34 @@ static int libipw_verify_qos_info(struct libipw_qos_information_element</div><div class='ctx'> /*</div><div class='ctx'>  * Parse a QoS parameter element</div><div class='ctx'>  */</div><div class='del'>-static int libipw_read_qos_param_element(struct libipw_qos_parameter_info</div><div class='del'>-					    *element_param, struct libipw_info_element</div><div class='del'>-					    *info_element)</div><div class='add'>+static int libipw_read_qos_param_element(</div><div class='add'>+			struct libipw_qos_parameter_info *element_param,</div><div class='add'>+			struct libipw_info_element *info_element)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u16 size = sizeof(struct libipw_qos_parameter_info) - 2;</div><div class='add'>+	size_t size = sizeof(*element_param);</div><div class='ctx'> </div><div class='del'>-	if ((info_element == NULL) || (element_param == NULL))</div><div class='add'>+	if (!element_param || !info_element || info_element-&gt;len != size - 2)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	if (info_element-&gt;id == QOS_ELEMENT_ID &amp;&amp; info_element-&gt;len == size) {</div><div class='del'>-		memcpy(element_param-&gt;info_element.qui, info_element-&gt;data,</div><div class='del'>-		       info_element-&gt;len);</div><div class='del'>-		element_param-&gt;info_element.elementID = info_element-&gt;id;</div><div class='del'>-		element_param-&gt;info_element.length = info_element-&gt;len;</div><div class='del'>-	} else</div><div class='del'>-		ret = -1;</div><div class='del'>-	if (ret == 0)</div><div class='del'>-		ret = libipw_verify_qos_info(&amp;element_param-&gt;info_element,</div><div class='del'>-						QOS_OUI_PARAM_SUB_TYPE);</div><div class='del'>-	return ret;</div><div class='add'>+	memcpy(element_param, info_element, size);</div><div class='add'>+	return libipw_verify_qos_info(&amp;element_param-&gt;info_element,</div><div class='add'>+				      QOS_OUI_PARAM_SUB_TYPE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Parse a QoS information element</div><div class='ctx'>  */</div><div class='del'>-static int libipw_read_qos_info_element(struct</div><div class='del'>-					   libipw_qos_information_element</div><div class='del'>-					   *element_info, struct libipw_info_element</div><div class='del'>-					   *info_element)</div><div class='add'>+static int libipw_read_qos_info_element(</div><div class='add'>+			struct libipw_qos_information_element *element_info,</div><div class='add'>+			struct libipw_info_element *info_element)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u16 size = sizeof(struct libipw_qos_information_element) - 2;</div><div class='add'>+	size_t size = sizeof(struct libipw_qos_information_element) - 2;</div><div class='ctx'> </div><div class='del'>-	if (element_info == NULL)</div><div class='del'>-		return -1;</div><div class='del'>-	if (info_element == NULL)</div><div class='add'>+	if (!element_info || !info_element || info_element-&gt;len != size - 2)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	if ((info_element-&gt;id == QOS_ELEMENT_ID) &amp;&amp; (info_element-&gt;len == size)) {</div><div class='del'>-		memcpy(element_info-&gt;qui, info_element-&gt;data,</div><div class='del'>-		       info_element-&gt;len);</div><div class='del'>-		element_info-&gt;elementID = info_element-&gt;id;</div><div class='del'>-		element_info-&gt;length = info_element-&gt;len;</div><div class='del'>-	} else</div><div class='del'>-		ret = -1;</div><div class='del'>-</div><div class='del'>-	if (ret == 0)</div><div class='del'>-		ret = libipw_verify_qos_info(element_info,</div><div class='del'>-						QOS_OUI_INFO_SUB_TYPE);</div><div class='del'>-	return ret;</div><div class='add'>+	memcpy(element_info, info_element, size);</div><div class='add'>+	return libipw_verify_qos_info(element_info, QOS_OUI_INFO_SUB_TYPE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1351,8 +1236,8 @@ static int libipw_handle_assoc_resp(struct libipw_device *ieee, struct libipw_as</div><div class='ctx'> 	network-&gt;wpa_ie_len = 0;</div><div class='ctx'> 	network-&gt;rsn_ie_len = 0;</div><div class='ctx'> </div><div class='del'>-	if (libipw_parse_info_param</div><div class='del'>-	    (frame-&gt;info_element, stats-&gt;len - sizeof(*frame), network))</div><div class='add'>+	if (libipw_parse_info_param((void *)frame-&gt;variable,</div><div class='add'>+				    stats-&gt;len - sizeof(*frame), network))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	network-&gt;mode = 0;</div><div class='hunk'>@@ -1411,8 +1296,8 @@ static int libipw_network_init(struct libipw_device *ieee, struct libipw_probe_r</div><div class='ctx'> 	network-&gt;wpa_ie_len = 0;</div><div class='ctx'> 	network-&gt;rsn_ie_len = 0;</div><div class='ctx'> </div><div class='del'>-	if (libipw_parse_info_param</div><div class='del'>-	    (beacon-&gt;info_element, stats-&gt;len - sizeof(*beacon), network))</div><div class='add'>+	if (libipw_parse_info_param((void *)beacon-&gt;variable,</div><div class='add'>+				    stats-&gt;len - sizeof(*beacon), network))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	network-&gt;mode = 0;</div><div class='hunk'>@@ -1532,7 +1417,7 @@ static void libipw_process_probe_response(struct libipw_device</div><div class='ctx'> 	struct libipw_network *target;</div><div class='ctx'> 	struct libipw_network *oldest = NULL;</div><div class='ctx'> #ifdef CONFIG_LIBIPW_DEBUG</div><div class='del'>-	struct libipw_info_element *info_element = beacon-&gt;info_element;</div><div class='add'>+	struct libipw_info_element *info_element = (void *)beacon-&gt;variable;</div><div class='ctx'> #endif</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -1754,6 +1639,5 @@ void libipw_rx_mgt(struct libipw_device *ieee,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL_GPL(libipw_rx_any);</div><div class='ctx'> EXPORT_SYMBOL(libipw_rx_mgt);</div><div class='ctx'> EXPORT_SYMBOL(libipw_rx);</div><div class='head'>diff --git a/drivers/net/wireless/intel/ipw2x00/libipw_spy.c b/drivers/net/wireless/intel/ipw2x00/libipw_spy.c<br/>new file mode 100644<br/>index 000000000000..ba876e92f7f6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/libipw_spy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/ipw2x00/libipw_spy.c</a></div><div class='hunk'>@@ -0,0 +1,233 @@</div><div class='add'>+/*</div><div class='add'>+ * This file implement the Wireless Extensions spy API.</div><div class='add'>+ *</div><div class='add'>+ * Authors :	Jean Tourrilhes - HPL - &lt;jt@hpl.hp.com&gt;</div><div class='add'>+ * Copyright (c) 1997-2007 Jean Tourrilhes, All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ * (As all part of the Linux kernel, this file is GPL)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/wireless.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;net/iw_handler.h&gt;</div><div class='add'>+#include &lt;net/arp.h&gt;</div><div class='add'>+#include &lt;net/wext.h&gt;</div><div class='add'>+#include "libipw.h"</div><div class='add'>+</div><div class='add'>+static struct iw_spy_data *get_spydata(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct libipw_device *ieee = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (ieee-&gt;spy_enabled)</div><div class='add'>+		return &amp;ieee-&gt;spy_data;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ipw_wx_set_spy(struct net_device *		dev,</div><div class='add'>+		   struct iw_request_info *	info,</div><div class='add'>+		   union iwreq_data *		wrqu,</div><div class='add'>+		   char *			extra)</div><div class='add'>+{</div><div class='add'>+	struct iw_spy_data *	spydata = get_spydata(dev);</div><div class='add'>+	struct sockaddr *	address = (struct sockaddr *) extra;</div><div class='add'>+</div><div class='add'>+	/* Make sure driver is not buggy or using the old API */</div><div class='add'>+	if (!spydata)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* Disable spy collection while we copy the addresses.</div><div class='add'>+	 * While we copy addresses, any call to libipw_spy_update()</div><div class='add'>+	 * will NOP. This is OK, as anyway the addresses are changing. */</div><div class='add'>+	spydata-&gt;spy_number = 0;</div><div class='add'>+</div><div class='add'>+	/* We want to operate without locking, because libipw_spy_update()</div><div class='add'>+	 * most likely will happen in the interrupt handler, and therefore</div><div class='add'>+	 * have its own locking constraints and needs performance.</div><div class='add'>+	 * The rtnl_lock() make sure we don't race with the other iw_handlers.</div><div class='add'>+	 * This make sure libipw_spy_update() "see" that the spy list</div><div class='add'>+	 * is temporarily disabled. */</div><div class='add'>+	smp_wmb();</div><div class='add'>+</div><div class='add'>+	/* Are there are addresses to copy? */</div><div class='add'>+	if (wrqu-&gt;data.length &gt; 0) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		/* Copy addresses */</div><div class='add'>+		for (i = 0; i &lt; wrqu-&gt;data.length; i++)</div><div class='add'>+			memcpy(spydata-&gt;spy_address[i], address[i].sa_data,</div><div class='add'>+			       ETH_ALEN);</div><div class='add'>+		/* Reset stats */</div><div class='add'>+		memset(spydata-&gt;spy_stat, 0,</div><div class='add'>+		       sizeof(struct iw_quality) * IW_MAX_SPY);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Make sure above is updated before re-enabling */</div><div class='add'>+	smp_wmb();</div><div class='add'>+</div><div class='add'>+	/* Enable addresses */</div><div class='add'>+	spydata-&gt;spy_number = wrqu-&gt;data.length;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ipw_wx_set_spy);</div><div class='add'>+</div><div class='add'>+int ipw_wx_get_spy(struct net_device *		dev,</div><div class='add'>+		   struct iw_request_info *	info,</div><div class='add'>+		   union iwreq_data *		wrqu,</div><div class='add'>+		   char *			extra)</div><div class='add'>+{</div><div class='add'>+	struct iw_spy_data *	spydata = get_spydata(dev);</div><div class='add'>+	struct sockaddr *	address = (struct sockaddr *) extra;</div><div class='add'>+	int			i;</div><div class='add'>+</div><div class='add'>+	/* Make sure driver is not buggy or using the old API */</div><div class='add'>+	if (!spydata)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	wrqu-&gt;data.length = spydata-&gt;spy_number;</div><div class='add'>+</div><div class='add'>+	/* Copy addresses. */</div><div class='add'>+	for (i = 0; i &lt; spydata-&gt;spy_number; i++) 	{</div><div class='add'>+		memcpy(address[i].sa_data, spydata-&gt;spy_address[i], ETH_ALEN);</div><div class='add'>+		address[i].sa_family = AF_UNIX;</div><div class='add'>+	}</div><div class='add'>+	/* Copy stats to the user buffer (just after). */</div><div class='add'>+	if (spydata-&gt;spy_number &gt; 0)</div><div class='add'>+		memcpy(extra  + (sizeof(struct sockaddr) *spydata-&gt;spy_number),</div><div class='add'>+		       spydata-&gt;spy_stat,</div><div class='add'>+		       sizeof(struct iw_quality) * spydata-&gt;spy_number);</div><div class='add'>+	/* Reset updated flags. */</div><div class='add'>+	for (i = 0; i &lt; spydata-&gt;spy_number; i++)</div><div class='add'>+		spydata-&gt;spy_stat[i].updated &amp;= ~IW_QUAL_ALL_UPDATED;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ipw_wx_get_spy);</div><div class='add'>+</div><div class='add'>+/*------------------------------------------------------------------*/</div><div class='add'>+/*</div><div class='add'>+ * Standard Wireless Handler : set spy threshold</div><div class='add'>+ */</div><div class='add'>+int ipw_wx_set_thrspy(struct net_device *	dev,</div><div class='add'>+		      struct iw_request_info *	info,</div><div class='add'>+		      union iwreq_data *	wrqu,</div><div class='add'>+		      char *			extra)</div><div class='add'>+{</div><div class='add'>+	struct iw_spy_data *	spydata = get_spydata(dev);</div><div class='add'>+	struct iw_thrspy *	threshold = (struct iw_thrspy *) extra;</div><div class='add'>+</div><div class='add'>+	/* Make sure driver is not buggy or using the old API */</div><div class='add'>+	if (!spydata)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* Just do it */</div><div class='add'>+	spydata-&gt;spy_thr_low = threshold-&gt;low;</div><div class='add'>+	spydata-&gt;spy_thr_high = threshold-&gt;high;</div><div class='add'>+</div><div class='add'>+	/* Clear flag */</div><div class='add'>+	memset(spydata-&gt;spy_thr_under, '\0', sizeof(spydata-&gt;spy_thr_under));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ipw_wx_set_thrspy);</div><div class='add'>+</div><div class='add'>+/*------------------------------------------------------------------*/</div><div class='add'>+/*</div><div class='add'>+ * Standard Wireless Handler : get spy threshold</div><div class='add'>+ */</div><div class='add'>+int ipw_wx_get_thrspy(struct net_device *	dev,</div><div class='add'>+		      struct iw_request_info *	info,</div><div class='add'>+		      union iwreq_data *	wrqu,</div><div class='add'>+		      char *			extra)</div><div class='add'>+{</div><div class='add'>+	struct iw_spy_data *	spydata = get_spydata(dev);</div><div class='add'>+	struct iw_thrspy *	threshold = (struct iw_thrspy *) extra;</div><div class='add'>+</div><div class='add'>+	/* Make sure driver is not buggy or using the old API */</div><div class='add'>+	if (!spydata)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* Just do it */</div><div class='add'>+	threshold-&gt;low = spydata-&gt;spy_thr_low;</div><div class='add'>+	threshold-&gt;high = spydata-&gt;spy_thr_high;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ipw_wx_get_thrspy);</div><div class='add'>+</div><div class='add'>+/*------------------------------------------------------------------*/</div><div class='add'>+/*</div><div class='add'>+ * Prepare and send a Spy Threshold event</div><div class='add'>+ */</div><div class='add'>+static void iw_send_thrspy_event(struct net_device *	dev,</div><div class='add'>+				 struct iw_spy_data *	spydata,</div><div class='add'>+				 unsigned char *	address,</div><div class='add'>+				 struct iw_quality *	wstats)</div><div class='add'>+{</div><div class='add'>+	union iwreq_data	wrqu;</div><div class='add'>+	struct iw_thrspy	threshold;</div><div class='add'>+</div><div class='add'>+	/* Init */</div><div class='add'>+	wrqu.data.length = 1;</div><div class='add'>+	wrqu.data.flags = 0;</div><div class='add'>+	/* Copy address */</div><div class='add'>+	memcpy(threshold.addr.sa_data, address, ETH_ALEN);</div><div class='add'>+	threshold.addr.sa_family = ARPHRD_ETHER;</div><div class='add'>+	/* Copy stats */</div><div class='add'>+	threshold.qual = *wstats;</div><div class='add'>+	/* Copy also thresholds */</div><div class='add'>+	threshold.low = spydata-&gt;spy_thr_low;</div><div class='add'>+	threshold.high = spydata-&gt;spy_thr_high;</div><div class='add'>+</div><div class='add'>+	/* Send event to user space */</div><div class='add'>+	wireless_send_event(dev, SIOCGIWTHRSPY, &amp;wrqu, (char *) &amp;threshold);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ---------------------------------------------------------------- */</div><div class='add'>+/*</div><div class='add'>+ * Call for the driver to update the spy data.</div><div class='add'>+ * For now, the spy data is a simple array. As the size of the array is</div><div class='add'>+ * small, this is good enough. If we wanted to support larger number of</div><div class='add'>+ * spy addresses, we should use something more efficient...</div><div class='add'>+ */</div><div class='add'>+void libipw_spy_update(struct net_device *	dev,</div><div class='add'>+		       unsigned char *		address,</div><div class='add'>+		       struct iw_quality *	wstats)</div><div class='add'>+{</div><div class='add'>+	struct iw_spy_data *	spydata = get_spydata(dev);</div><div class='add'>+	int			i;</div><div class='add'>+	int			match = -1;</div><div class='add'>+</div><div class='add'>+	/* Make sure driver is not buggy or using the old API */</div><div class='add'>+	if (!spydata)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Update all records that match */</div><div class='add'>+	for (i = 0; i &lt; spydata-&gt;spy_number; i++)</div><div class='add'>+		if (ether_addr_equal(address, spydata-&gt;spy_address[i])) {</div><div class='add'>+			memcpy(&amp;(spydata-&gt;spy_stat[i]), wstats,</div><div class='add'>+			       sizeof(struct iw_quality));</div><div class='add'>+			match = i;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	/* Generate an event if we cross the spy threshold.</div><div class='add'>+	 * To avoid event storms, we have a simple hysteresis : we generate</div><div class='add'>+	 * event only when we go under the low threshold or above the</div><div class='add'>+	 * high threshold. */</div><div class='add'>+	if (match &gt;= 0) {</div><div class='add'>+		if (spydata-&gt;spy_thr_under[match]) {</div><div class='add'>+			if (wstats-&gt;level &gt; spydata-&gt;spy_thr_high.level) {</div><div class='add'>+				spydata-&gt;spy_thr_under[match] = 0;</div><div class='add'>+				iw_send_thrspy_event(dev, spydata,</div><div class='add'>+						     address, wstats);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (wstats-&gt;level &lt; spydata-&gt;spy_thr_low.level) {</div><div class='add'>+				spydata-&gt;spy_thr_under[match] = 1;</div><div class='add'>+				iw_send_thrspy_event(dev, spydata,</div><div class='add'>+						     address, wstats);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/ipw2x00/libipw_tx.c b/drivers/net/wireless/intel/ipw2x00/libipw_tx.c<br/>index d9baa2fa603b..80edaa3dea9c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/libipw_tx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/libipw_tx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/libipw_tx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/ipw2x00/libipw_tx.c</a></div><div class='hunk'>@@ -138,7 +138,7 @@ static int libipw_copy_snap(u8 * data, __be16 h_proto)</div><div class='ctx'> static int libipw_encrypt_fragment(struct libipw_device *ieee,</div><div class='ctx'> 					     struct sk_buff *frag, int hdr_len)</div><div class='ctx'> {</div><div class='del'>-	struct lib80211_crypt_data *crypt =</div><div class='add'>+	struct libipw_crypt_data *crypt =</div><div class='ctx'> 		ieee-&gt;crypt_info.crypt[ieee-&gt;crypt_info.tx_keyidx];</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='hunk'>@@ -179,12 +179,11 @@ static struct libipw_txb *libipw_alloc_txb(int nr_frags, int txb_size,</div><div class='ctx'> {</div><div class='ctx'> 	struct libipw_txb *txb;</div><div class='ctx'> 	int i;</div><div class='del'>-	txb = kmalloc(sizeof(struct libipw_txb) + (sizeof(u8 *) * nr_frags),</div><div class='del'>-		      gfp_mask);</div><div class='add'>+</div><div class='add'>+	txb = kzalloc(struct_size(txb, fragments, nr_frags), gfp_mask);</div><div class='ctx'> 	if (!txb)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	memset(txb, 0, sizeof(struct libipw_txb));</div><div class='ctx'> 	txb-&gt;nr_frags = nr_frags;</div><div class='ctx'> 	txb-&gt;frag_size = txb_size;</div><div class='ctx'> </div><div class='hunk'>@@ -256,7 +255,7 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		.qos_ctl = 0</div><div class='ctx'> 	};</div><div class='ctx'> 	u8 dest[ETH_ALEN], src[ETH_ALEN];</div><div class='del'>-	struct lib80211_crypt_data *crypt;</div><div class='add'>+	struct libipw_crypt_data *crypt;</div><div class='ctx'> 	int priority = skb-&gt;priority;</div><div class='ctx'> 	int snapped = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -383,7 +382,7 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 		/* Each fragment may need to have room for encryption</div><div class='ctx'> 		 * pre/postfix */</div><div class='del'>-		if (host_encrypt)</div><div class='add'>+		if (host_encrypt &amp;&amp; crypt &amp;&amp; crypt-&gt;ops)</div><div class='ctx'> 			bytes_per_frag -= crypt-&gt;ops-&gt;extra_mpdu_prefix_len +</div><div class='ctx'> 			    crypt-&gt;ops-&gt;extra_mpdu_postfix_len;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/intel/ipw2x00/libipw_wx.c b/drivers/net/wireless/intel/ipw2x00/libipw_wx.c<br/>index 903de34028ef..db71d81b0d4f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/libipw_wx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/ipw2x00/libipw_wx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/ipw2x00/libipw_wx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/ipw2x00/libipw_wx.c</a></div><div class='hunk'>@@ -21,10 +21,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/lib80211.h&gt;</div><div class='ctx'> #include &lt;linux/wireless.h&gt;</div><div class='del'>-</div><div class='ctx'> #include "libipw.h"</div><div class='ctx'> </div><div class='ctx'> static const char *libipw_modes[] = {</div><div class='hunk'>@@ -303,7 +300,7 @@ int libipw_wx_set_encode(struct libipw_device *ieee,</div><div class='ctx'> 		.flags = 0</div><div class='ctx'> 	};</div><div class='ctx'> 	int i, key, key_provided, len;</div><div class='del'>-	struct lib80211_crypt_data **crypt;</div><div class='add'>+	struct libipw_crypt_data **crypt;</div><div class='ctx'> 	int host_crypto = ieee-&gt;host_encrypt || ieee-&gt;host_decrypt;</div><div class='ctx'> </div><div class='ctx'> 	LIBIPW_DEBUG_WX("SET_ENCODE\n");</div><div class='hunk'>@@ -328,7 +325,7 @@ int libipw_wx_set_encode(struct libipw_device *ieee,</div><div class='ctx'> 		if (key_provided &amp;&amp; *crypt) {</div><div class='ctx'> 			LIBIPW_DEBUG_WX("Disabling encryption on key %d.\n",</div><div class='ctx'> 					   key);</div><div class='del'>-			lib80211_crypt_delayed_deinit(&amp;ieee-&gt;crypt_info, crypt);</div><div class='add'>+			libipw_crypt_delayed_deinit(&amp;ieee-&gt;crypt_info, crypt);</div><div class='ctx'> 		} else</div><div class='ctx'> 			LIBIPW_DEBUG_WX("Disabling encryption.\n");</div><div class='ctx'> </div><div class='hunk'>@@ -338,7 +335,7 @@ int libipw_wx_set_encode(struct libipw_device *ieee,</div><div class='ctx'> 			if (ieee-&gt;crypt_info.crypt[i] != NULL) {</div><div class='ctx'> 				if (key_provided)</div><div class='ctx'> 					break;</div><div class='del'>-				lib80211_crypt_delayed_deinit(&amp;ieee-&gt;crypt_info,</div><div class='add'>+				libipw_crypt_delayed_deinit(&amp;ieee-&gt;crypt_info,</div><div class='ctx'> 							       &amp;ieee-&gt;crypt_info.crypt[i]);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -361,21 +358,21 @@ int libipw_wx_set_encode(struct libipw_device *ieee,</div><div class='ctx'> 	    strcmp((*crypt)-&gt;ops-&gt;name, "WEP") != 0) {</div><div class='ctx'> 		/* changing to use WEP; deinit previously used algorithm</div><div class='ctx'> 		 * on this key */</div><div class='del'>-		lib80211_crypt_delayed_deinit(&amp;ieee-&gt;crypt_info, crypt);</div><div class='add'>+		libipw_crypt_delayed_deinit(&amp;ieee-&gt;crypt_info, crypt);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (*crypt == NULL &amp;&amp; host_crypto) {</div><div class='del'>-		struct lib80211_crypt_data *new_crypt;</div><div class='add'>+		struct libipw_crypt_data *new_crypt;</div><div class='ctx'> </div><div class='ctx'> 		/* take WEP into use */</div><div class='del'>-		new_crypt = kzalloc(sizeof(struct lib80211_crypt_data),</div><div class='add'>+		new_crypt = kzalloc(sizeof(struct libipw_crypt_data),</div><div class='ctx'> 				    GFP_KERNEL);</div><div class='ctx'> 		if (new_crypt == NULL)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		new_crypt-&gt;ops = lib80211_get_crypto_ops("WEP");</div><div class='add'>+		new_crypt-&gt;ops = libipw_get_crypto_ops("WEP");</div><div class='ctx'> 		if (!new_crypt-&gt;ops) {</div><div class='del'>-			request_module("lib80211_crypt_wep");</div><div class='del'>-			new_crypt-&gt;ops = lib80211_get_crypto_ops("WEP");</div><div class='add'>+			request_module("libipw_crypt_wep");</div><div class='add'>+			new_crypt-&gt;ops = libipw_get_crypto_ops("WEP");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (new_crypt-&gt;ops &amp;&amp; try_module_get(new_crypt-&gt;ops-&gt;owner))</div><div class='hunk'>@@ -386,7 +383,7 @@ int libipw_wx_set_encode(struct libipw_device *ieee,</div><div class='ctx'> 			new_crypt = NULL;</div><div class='ctx'> </div><div class='ctx'> 			printk(KERN_WARNING "%s: could not initialize WEP: "</div><div class='del'>-			       "load module lib80211_crypt_wep\n", dev-&gt;name);</div><div class='add'>+			       "load module libipw_crypt_wep\n", dev-&gt;name);</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='ctx'> 		}</div><div class='ctx'> 		*crypt = new_crypt;</div><div class='hunk'>@@ -509,8 +506,8 @@ int libipw_wx_set_encodeext(struct libipw_device *ieee,</div><div class='ctx'> 	int i, idx, ret = 0;</div><div class='ctx'> 	int group_key = 0;</div><div class='ctx'> 	const char *alg, *module;</div><div class='del'>-	struct lib80211_crypto_ops *ops;</div><div class='del'>-	struct lib80211_crypt_data **crypt;</div><div class='add'>+	const struct libipw_crypto_ops *ops;</div><div class='add'>+	struct libipw_crypt_data **crypt;</div><div class='ctx'> </div><div class='ctx'> 	struct libipw_security sec = {</div><div class='ctx'> 		.flags = 0,</div><div class='hunk'>@@ -541,7 +538,7 @@ int libipw_wx_set_encodeext(struct libipw_device *ieee,</div><div class='ctx'> 	if ((encoding-&gt;flags &amp; IW_ENCODE_DISABLED) ||</div><div class='ctx'> 	    ext-&gt;alg == IW_ENCODE_ALG_NONE) {</div><div class='ctx'> 		if (*crypt)</div><div class='del'>-			lib80211_crypt_delayed_deinit(&amp;ieee-&gt;crypt_info, crypt);</div><div class='add'>+			libipw_crypt_delayed_deinit(&amp;ieee-&gt;crypt_info, crypt);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; WEP_KEYS; i++)</div><div class='ctx'> 			if (ieee-&gt;crypt_info.crypt[i] != NULL)</div><div class='hunk'>@@ -567,15 +564,15 @@ int libipw_wx_set_encodeext(struct libipw_device *ieee,</div><div class='ctx'> 	switch (ext-&gt;alg) {</div><div class='ctx'> 	case IW_ENCODE_ALG_WEP:</div><div class='ctx'> 		alg = "WEP";</div><div class='del'>-		module = "lib80211_crypt_wep";</div><div class='add'>+		module = "libipw_crypt_wep";</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IW_ENCODE_ALG_TKIP:</div><div class='ctx'> 		alg = "TKIP";</div><div class='del'>-		module = "lib80211_crypt_tkip";</div><div class='add'>+		module = "libipw_crypt_tkip";</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IW_ENCODE_ALG_CCMP:</div><div class='ctx'> 		alg = "CCMP";</div><div class='del'>-		module = "lib80211_crypt_ccmp";</div><div class='add'>+		module = "libipw_crypt_ccmp";</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		LIBIPW_DEBUG_WX("%s: unknown crypto alg %d\n",</div><div class='hunk'>@@ -584,10 +581,10 @@ int libipw_wx_set_encodeext(struct libipw_device *ieee,</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ops = lib80211_get_crypto_ops(alg);</div><div class='add'>+	ops = libipw_get_crypto_ops(alg);</div><div class='ctx'> 	if (ops == NULL) {</div><div class='ctx'> 		request_module(module);</div><div class='del'>-		ops = lib80211_get_crypto_ops(alg);</div><div class='add'>+		ops = libipw_get_crypto_ops(alg);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ops == NULL) {</div><div class='ctx'> 		LIBIPW_DEBUG_WX("%s: unknown crypto alg %d\n",</div><div class='hunk'>@@ -597,9 +594,9 @@ int libipw_wx_set_encodeext(struct libipw_device *ieee,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (*crypt == NULL || (*crypt)-&gt;ops != ops) {</div><div class='del'>-		struct lib80211_crypt_data *new_crypt;</div><div class='add'>+		struct libipw_crypt_data *new_crypt;</div><div class='ctx'> </div><div class='del'>-		lib80211_crypt_delayed_deinit(&amp;ieee-&gt;crypt_info, crypt);</div><div class='add'>+		libipw_crypt_delayed_deinit(&amp;ieee-&gt;crypt_info, crypt);</div><div class='ctx'> </div><div class='ctx'> 		new_crypt = kzalloc(sizeof(*new_crypt), GFP_KERNEL);</div><div class='ctx'> 		if (new_crypt == NULL) {</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlegacy/3945-mac.c b/drivers/net/wireless/intel/iwlegacy/3945-mac.c<br/>index 6ff2674f8466..104748fcdc33 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/3945-mac.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/3945-mac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/3945-mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlegacy/3945-mac.c</a></div><div class='hunk'>@@ -571,20 +571,18 @@ il3945_tx_skb(struct il_priv *il,</div><div class='ctx'> </div><div class='ctx'> 	/* Physical address of this Tx command's header (not MAC header!),</div><div class='ctx'> 	 * within command buffer array. */</div><div class='del'>-	txcmd_phys =</div><div class='del'>-	    pci_map_single(il-&gt;pci_dev, &amp;out_cmd-&gt;hdr, firstlen,</div><div class='del'>-			   PCI_DMA_TODEVICE);</div><div class='del'>-	if (unlikely(pci_dma_mapping_error(il-&gt;pci_dev, txcmd_phys)))</div><div class='add'>+	txcmd_phys = dma_map_single(&amp;il-&gt;pci_dev-&gt;dev, &amp;out_cmd-&gt;hdr, firstlen,</div><div class='add'>+				    DMA_TO_DEVICE);</div><div class='add'>+	if (unlikely(dma_mapping_error(&amp;il-&gt;pci_dev-&gt;dev, txcmd_phys)))</div><div class='ctx'> 		goto drop_unlock;</div><div class='ctx'> </div><div class='ctx'> 	/* Set up TFD's 2nd entry to point directly to remainder of skb,</div><div class='ctx'> 	 * if any (802.11 null frames have no payload). */</div><div class='ctx'> 	secondlen = skb-&gt;len - hdr_len;</div><div class='ctx'> 	if (secondlen &gt; 0) {</div><div class='del'>-		phys_addr =</div><div class='del'>-		    pci_map_single(il-&gt;pci_dev, skb-&gt;data + hdr_len, secondlen,</div><div class='del'>-				   PCI_DMA_TODEVICE);</div><div class='del'>-		if (unlikely(pci_dma_mapping_error(il-&gt;pci_dev, phys_addr)))</div><div class='add'>+		phys_addr = dma_map_single(&amp;il-&gt;pci_dev-&gt;dev, skb-&gt;data + hdr_len,</div><div class='add'>+					   secondlen, DMA_TO_DEVICE);</div><div class='add'>+		if (unlikely(dma_mapping_error(&amp;il-&gt;pci_dev-&gt;dev, phys_addr)))</div><div class='ctx'> 			goto drop_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1015,11 +1013,11 @@ il3945_rx_allocate(struct il_priv *il, gfp_t priority)</div><div class='ctx'> </div><div class='ctx'> 		/* Get physical address of RB/SKB */</div><div class='ctx'> 		page_dma =</div><div class='del'>-		    pci_map_page(il-&gt;pci_dev, page, 0,</div><div class='add'>+		    dma_map_page(&amp;il-&gt;pci_dev-&gt;dev, page, 0,</div><div class='ctx'> 				 PAGE_SIZE &lt;&lt; il-&gt;hw_params.rx_page_order,</div><div class='del'>-				 PCI_DMA_FROMDEVICE);</div><div class='add'>+				 DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='del'>-		if (unlikely(pci_dma_mapping_error(il-&gt;pci_dev, page_dma))) {</div><div class='add'>+		if (unlikely(dma_mapping_error(&amp;il-&gt;pci_dev-&gt;dev, page_dma))) {</div><div class='ctx'> 			__free_pages(page, il-&gt;hw_params.rx_page_order);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1028,9 +1026,9 @@ il3945_rx_allocate(struct il_priv *il, gfp_t priority)</div><div class='ctx'> </div><div class='ctx'> 		if (list_empty(&amp;rxq-&gt;rx_used)) {</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='del'>-			pci_unmap_page(il-&gt;pci_dev, page_dma,</div><div class='add'>+			dma_unmap_page(&amp;il-&gt;pci_dev-&gt;dev, page_dma,</div><div class='ctx'> 				       PAGE_SIZE &lt;&lt; il-&gt;hw_params.rx_page_order,</div><div class='del'>-				       PCI_DMA_FROMDEVICE);</div><div class='add'>+				       DMA_FROM_DEVICE);</div><div class='ctx'> 			__free_pages(page, il-&gt;hw_params.rx_page_order);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1062,9 +1060,10 @@ il3945_rx_queue_reset(struct il_priv *il, struct il_rx_queue *rxq)</div><div class='ctx'> 		/* In the reset function, these buffers may have been allocated</div><div class='ctx'> 		 * to an SKB, so we need to unmap and free potential storage */</div><div class='ctx'> 		if (rxq-&gt;pool[i].page != NULL) {</div><div class='del'>-			pci_unmap_page(il-&gt;pci_dev, rxq-&gt;pool[i].page_dma,</div><div class='add'>+			dma_unmap_page(&amp;il-&gt;pci_dev-&gt;dev,</div><div class='add'>+				       rxq-&gt;pool[i].page_dma,</div><div class='ctx'> 				       PAGE_SIZE &lt;&lt; il-&gt;hw_params.rx_page_order,</div><div class='del'>-				       PCI_DMA_FROMDEVICE);</div><div class='add'>+				       DMA_FROM_DEVICE);</div><div class='ctx'> 			__il_free_pages(il, rxq-&gt;pool[i].page);</div><div class='ctx'> 			rxq-&gt;pool[i].page = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1111,9 +1110,10 @@ il3945_rx_queue_free(struct il_priv *il, struct il_rx_queue *rxq)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	for (i = 0; i &lt; RX_QUEUE_SIZE + RX_FREE_BUFFERS; i++) {</div><div class='ctx'> 		if (rxq-&gt;pool[i].page != NULL) {</div><div class='del'>-			pci_unmap_page(il-&gt;pci_dev, rxq-&gt;pool[i].page_dma,</div><div class='add'>+			dma_unmap_page(&amp;il-&gt;pci_dev-&gt;dev,</div><div class='add'>+				       rxq-&gt;pool[i].page_dma,</div><div class='ctx'> 				       PAGE_SIZE &lt;&lt; il-&gt;hw_params.rx_page_order,</div><div class='del'>-				       PCI_DMA_FROMDEVICE);</div><div class='add'>+				       DMA_FROM_DEVICE);</div><div class='ctx'> 			__il_free_pages(il, rxq-&gt;pool[i].page);</div><div class='ctx'> 			rxq-&gt;pool[i].page = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1127,44 +1127,6 @@ il3945_rx_queue_free(struct il_priv *il, struct il_rx_queue *rxq)</div><div class='ctx'> 	rxq-&gt;rb_stts = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Convert linear signal-to-noise ratio into dB */</div><div class='del'>-static u8 ratio2dB[100] = {</div><div class='del'>-/*	 0   1   2   3   4   5   6   7   8   9 */</div><div class='del'>-	0, 0, 6, 10, 12, 14, 16, 17, 18, 19,	/* 00 - 09 */</div><div class='del'>-	20, 21, 22, 22, 23, 23, 24, 25, 26, 26,	/* 10 - 19 */</div><div class='del'>-	26, 26, 26, 27, 27, 28, 28, 28, 29, 29,	/* 20 - 29 */</div><div class='del'>-	29, 30, 30, 30, 31, 31, 31, 31, 32, 32,	/* 30 - 39 */</div><div class='del'>-	32, 32, 32, 33, 33, 33, 33, 33, 34, 34,	/* 40 - 49 */</div><div class='del'>-	34, 34, 34, 34, 35, 35, 35, 35, 35, 35,	/* 50 - 59 */</div><div class='del'>-	36, 36, 36, 36, 36, 36, 36, 37, 37, 37,	/* 60 - 69 */</div><div class='del'>-	37, 37, 37, 37, 37, 38, 38, 38, 38, 38,	/* 70 - 79 */</div><div class='del'>-	38, 38, 38, 38, 38, 39, 39, 39, 39, 39,	/* 80 - 89 */</div><div class='del'>-	39, 39, 39, 39, 39, 40, 40, 40, 40, 40	/* 90 - 99 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Calculates a relative dB value from a ratio of linear</div><div class='del'>- *   (i.e. not dB) signal levels.</div><div class='del'>- * Conversion assumes that levels are voltages (20*log), not powers (10*log). */</div><div class='del'>-int</div><div class='del'>-il3945_calc_db_from_ratio(int sig_ratio)</div><div class='del'>-{</div><div class='del'>-	/* 1000:1 or higher just report as 60 dB */</div><div class='del'>-	if (sig_ratio &gt;= 1000)</div><div class='del'>-		return 60;</div><div class='del'>-</div><div class='del'>-	/* 100:1 or higher, divide by 10 and use table,</div><div class='del'>-	 *   add 20 dB to make up for divide by 10 */</div><div class='del'>-	if (sig_ratio &gt;= 100)</div><div class='del'>-		return 20 + (int)ratio2dB[sig_ratio / 10];</div><div class='del'>-</div><div class='del'>-	/* We shouldn't see this */</div><div class='del'>-	if (sig_ratio &lt; 1)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Use table for ratios 1:1 - 99:1 */</div><div class='del'>-	return (int)ratio2dB[sig_ratio];</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * il3945_rx_handle - Main entry function for receiving responses from uCode</div><div class='ctx'>  *</div><div class='hunk'>@@ -1202,8 +1164,6 @@ il3945_rx_handle(struct il_priv *il)</div><div class='ctx'> 		D_RX("r = %d, i = %d\n", r, i);</div><div class='ctx'> </div><div class='ctx'> 	while (i != r) {</div><div class='del'>-		int len;</div><div class='del'>-</div><div class='ctx'> 		rxb = rxq-&gt;queue[i];</div><div class='ctx'> </div><div class='ctx'> 		/* If an RXB doesn't have a Rx queue slot associated with it,</div><div class='hunk'>@@ -1213,14 +1173,10 @@ il3945_rx_handle(struct il_priv *il)</div><div class='ctx'> </div><div class='ctx'> 		rxq-&gt;queue[i] = NULL;</div><div class='ctx'> </div><div class='del'>-		pci_unmap_page(il-&gt;pci_dev, rxb-&gt;page_dma,</div><div class='add'>+		dma_unmap_page(&amp;il-&gt;pci_dev-&gt;dev, rxb-&gt;page_dma,</div><div class='ctx'> 			       PAGE_SIZE &lt;&lt; il-&gt;hw_params.rx_page_order,</div><div class='del'>-			       PCI_DMA_FROMDEVICE);</div><div class='add'>+			       DMA_FROM_DEVICE);</div><div class='ctx'> 		pkt = rxb_addr(rxb);</div><div class='del'>-</div><div class='del'>-		len = le32_to_cpu(pkt-&gt;len_n_flags) &amp; IL_RX_FRAME_SIZE_MSK;</div><div class='del'>-		len += sizeof(u32);	/* account for status word */</div><div class='del'>-</div><div class='ctx'> 		reclaim = il_need_reclaim(il, pkt);</div><div class='ctx'> </div><div class='ctx'> 		/* Based on type of command response or notification,</div><div class='hunk'>@@ -1260,11 +1216,11 @@ il3945_rx_handle(struct il_priv *il)</div><div class='ctx'> 		spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='ctx'> 		if (rxb-&gt;page != NULL) {</div><div class='ctx'> 			rxb-&gt;page_dma =</div><div class='del'>-			    pci_map_page(il-&gt;pci_dev, rxb-&gt;page, 0,</div><div class='del'>-					 PAGE_SIZE &lt;&lt; il-&gt;hw_params.</div><div class='del'>-					 rx_page_order, PCI_DMA_FROMDEVICE);</div><div class='del'>-			if (unlikely(pci_dma_mapping_error(il-&gt;pci_dev,</div><div class='del'>-							   rxb-&gt;page_dma))) {</div><div class='add'>+			    dma_map_page(&amp;il-&gt;pci_dev-&gt;dev, rxb-&gt;page, 0,</div><div class='add'>+					 PAGE_SIZE &lt;&lt; il-&gt;hw_params.rx_page_order,</div><div class='add'>+					 DMA_FROM_DEVICE);</div><div class='add'>+			if (unlikely(dma_mapping_error(&amp;il-&gt;pci_dev-&gt;dev,</div><div class='add'>+						       rxb-&gt;page_dma))) {</div><div class='ctx'> 				__il_free_pages(il, rxb-&gt;page);</div><div class='ctx'> 				rxb-&gt;page = NULL;</div><div class='ctx'> 				list_add_tail(&amp;rxb-&gt;list, &amp;rxq-&gt;rx_used);</div><div class='hunk'>@@ -2232,7 +2188,7 @@ __il3945_down(struct il_priv *il)</div><div class='ctx'> </div><div class='ctx'> 	/* Stop TX queues watchdog. We need to have S_EXIT_PENDING bit set</div><div class='ctx'> 	 * to prevent rearm timer */</div><div class='del'>-	del_timer_sync(&amp;il-&gt;watchdog);</div><div class='add'>+	timer_delete_sync(&amp;il-&gt;watchdog);</div><div class='ctx'> </div><div class='ctx'> 	/* Station information will now be cleared in device */</div><div class='ctx'> 	il_clear_ucode_stations(il);</div><div class='hunk'>@@ -2701,7 +2657,7 @@ il3945_post_associate(struct il_priv *il)</div><div class='ctx'> 	if (!il-&gt;vif || !il-&gt;is_open)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	D_ASSOC("Associated as %d to: %pM\n", il-&gt;vif-&gt;bss_conf.aid,</div><div class='add'>+	D_ASSOC("Associated as %d to: %pM\n", il-&gt;vif-&gt;cfg.aid,</div><div class='ctx'> 		il-&gt;active.bssid_addr);</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='hunk'>@@ -2718,9 +2674,9 @@ il3945_post_associate(struct il_priv *il)</div><div class='ctx'> </div><div class='ctx'> 	il-&gt;staging.filter_flags |= RXON_FILTER_ASSOC_MSK;</div><div class='ctx'> </div><div class='del'>-	il-&gt;staging.assoc_id = cpu_to_le16(il-&gt;vif-&gt;bss_conf.aid);</div><div class='add'>+	il-&gt;staging.assoc_id = cpu_to_le16(il-&gt;vif-&gt;cfg.aid);</div><div class='ctx'> </div><div class='del'>-	D_ASSOC("assoc id %d beacon interval %d\n", il-&gt;vif-&gt;bss_conf.aid,</div><div class='add'>+	D_ASSOC("assoc id %d beacon interval %d\n", il-&gt;vif-&gt;cfg.aid,</div><div class='ctx'> 		il-&gt;vif-&gt;bss_conf.beacon_int);</div><div class='ctx'> </div><div class='ctx'> 	if (il-&gt;vif-&gt;bss_conf.use_short_preamble)</div><div class='hunk'>@@ -2819,7 +2775,7 @@ out_release_irq:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-il3945_mac_stop(struct ieee80211_hw *hw)</div><div class='add'>+il3945_mac_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct il_priv *il = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -3254,7 +3210,7 @@ il3945_store_measurement(struct device *d, struct device_attribute *attr,</div><div class='ctx'> </div><div class='ctx'> 	if (count) {</div><div class='ctx'> 		char *p = buffer;</div><div class='del'>-		strlcpy(buffer, buf, sizeof(buffer));</div><div class='add'>+		strscpy(buffer, buf, sizeof(buffer));</div><div class='ctx'> 		channel = simple_strtoul(p, NULL, 0);</div><div class='ctx'> 		if (channel)</div><div class='ctx'> 			params.channel = channel;</div><div class='hunk'>@@ -3378,10 +3334,12 @@ static DEVICE_ATTR(dump_errors, 0200, NULL, il3945_dump_error_log);</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+static int</div><div class='ctx'> il3945_setup_deferred_work(struct il_priv *il)</div><div class='ctx'> {</div><div class='ctx'> 	il-&gt;workqueue = create_singlethread_workqueue(DRV_NAME);</div><div class='add'>+	if (!il-&gt;workqueue)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_head(&amp;il-&gt;wait_command_queue);</div><div class='ctx'> </div><div class='hunk'>@@ -3398,6 +3356,8 @@ il3945_setup_deferred_work(struct il_priv *il)</div><div class='ctx'> 	timer_setup(&amp;il-&gt;watchdog, il_bg_watchdog, 0);</div><div class='ctx'> </div><div class='ctx'> 	tasklet_setup(&amp;il-&gt;irq_tasklet, il3945_irq_tasklet);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -3434,7 +3394,12 @@ static const struct attribute_group il3945_attribute_group = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ieee80211_ops il3945_mac_ops __ro_after_init = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.tx = il3945_mac_tx,</div><div class='add'>+	.wake_tx_queue = ieee80211_handle_wake_tx_queue,</div><div class='ctx'> 	.start = il3945_mac_start,</div><div class='ctx'> 	.stop = il3945_mac_stop,</div><div class='ctx'> 	.add_interface = il_mac_add_interface,</div><div class='hunk'>@@ -3616,9 +3581,7 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='del'>-	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='del'>-	if (!err)</div><div class='del'>-		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='add'>+	err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		IL_WARN("No suitable DMA available.\n");</div><div class='ctx'> 		goto out_pci_disable_device;</div><div class='hunk'>@@ -3719,7 +3682,10 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	il_set_rxon_channel(il, &amp;il-&gt;bands[NL80211_BAND_2GHZ].channels[5]);</div><div class='del'>-	il3945_setup_deferred_work(il);</div><div class='add'>+	err = il3945_setup_deferred_work(il);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_remove_sysfs;</div><div class='add'>+</div><div class='ctx'> 	il3945_setup_handlers(il);</div><div class='ctx'> 	il_power_initialize(il);</div><div class='ctx'> </div><div class='hunk'>@@ -3731,7 +3697,7 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	err = il3945_setup_mac(il);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_remove_sysfs;</div><div class='add'>+		goto out_destroy_workqueue;</div><div class='ctx'> </div><div class='ctx'> 	il_dbgfs_register(il, DRV_NAME);</div><div class='ctx'> </div><div class='hunk'>@@ -3740,9 +3706,10 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-out_remove_sysfs:</div><div class='add'>+out_destroy_workqueue:</div><div class='ctx'> 	destroy_workqueue(il-&gt;workqueue);</div><div class='ctx'> 	il-&gt;workqueue = NULL;</div><div class='add'>+out_remove_sysfs:</div><div class='ctx'> 	sysfs_remove_group(&amp;pdev-&gt;dev.kobj, &amp;il3945_attribute_group);</div><div class='ctx'> out_release_irq:</div><div class='ctx'> 	free_irq(il-&gt;pci_dev-&gt;irq, il);</div><div class='hunk'>@@ -3821,7 +3788,6 @@ il3945_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> 	il3945_unset_hw_params(il);</div><div class='ctx'> </div><div class='ctx'> 	/*netif_stop_queue(dev); */</div><div class='del'>-	flush_workqueue(il-&gt;workqueue);</div><div class='ctx'> </div><div class='ctx'> 	/* ieee80211_unregister_hw calls il3945_mac_stop, which flushes</div><div class='ctx'> 	 * il-&gt;workqueue... so we can't take down the workqueue</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlegacy/3945-rs.c b/drivers/net/wireless/intel/iwlegacy/3945-rs.c<br/>index b2478cbe558e..1826c37c090c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/3945-rs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/3945-rs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/3945-rs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlegacy/3945-rs.c</a></div><div class='hunk'>@@ -168,7 +168,8 @@ il3945_rate_scale_flush_wins(struct il3945_rs_sta *rs_sta)</div><div class='ctx'> static void</div><div class='ctx'> il3945_bg_rate_scale_flush(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct il3945_rs_sta *rs_sta = from_timer(rs_sta, t, rate_scale_flush);</div><div class='add'>+	struct il3945_rs_sta *rs_sta = timer_container_of(rs_sta, t,</div><div class='add'>+							  rate_scale_flush);</div><div class='ctx'> 	struct il_priv *il __maybe_unused = rs_sta-&gt;il;</div><div class='ctx'> 	int unflushed = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -354,13 +355,13 @@ il3945_rs_rate_init(struct il_priv *il, struct ieee80211_sta *sta, u8 sta_id)</div><div class='ctx'> 	 * after assoc.. */</div><div class='ctx'> </div><div class='ctx'> 	for (i = sband-&gt;n_bitrates - 1; i &gt;= 0; i--) {</div><div class='del'>-		if (sta-&gt;supp_rates[sband-&gt;band] &amp; (1 &lt;&lt; i)) {</div><div class='add'>+		if (sta-&gt;deflink.supp_rates[sband-&gt;band] &amp; (1 &lt;&lt; i)) {</div><div class='ctx'> 			rs_sta-&gt;last_txrate_idx = i;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	il-&gt;_3945.sta_supp_rates = sta-&gt;supp_rates[sband-&gt;band];</div><div class='add'>+	il-&gt;_3945.sta_supp_rates = sta-&gt;deflink.supp_rates[sband-&gt;band];</div><div class='ctx'> 	/* For 5 GHz band it start at IL_FIRST_OFDM_RATE */</div><div class='ctx'> 	if (sband-&gt;band == NL80211_BAND_5GHZ) {</div><div class='ctx'> 		rs_sta-&gt;last_txrate_idx += IL_FIRST_OFDM_RATE;</div><div class='hunk'>@@ -413,7 +414,7 @@ il3945_rs_free_sta(void *il_priv, struct ieee80211_sta *sta, void *il_sta)</div><div class='ctx'> 	 * to use il_priv to print out debugging) since it may not be fully</div><div class='ctx'> 	 * initialized at this point.</div><div class='ctx'> 	 */</div><div class='del'>-	del_timer_sync(&amp;rs_sta-&gt;rate_scale_flush);</div><div class='add'>+	timer_delete_sync(&amp;rs_sta-&gt;rate_scale_flush);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -631,7 +632,7 @@ il3945_rs_get_rate(void *il_r, struct ieee80211_sta *sta, void *il_sta,</div><div class='ctx'> 		il_sta = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rate_mask = sta-&gt;supp_rates[sband-&gt;band];</div><div class='add'>+	rate_mask = sta-&gt;deflink.supp_rates[sband-&gt;band];</div><div class='ctx'> </div><div class='ctx'> 	/* get user max rate if set */</div><div class='ctx'> 	max_rate_idx = fls(txrc-&gt;rate_idx_mask) - 1;</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlegacy/3945.c b/drivers/net/wireless/intel/iwlegacy/3945.c<br/>index 0597d828bee1..b0656b143f77 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/3945.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/3945.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/3945.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlegacy/3945.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "common.h"</div><div class='hunk'>@@ -527,7 +527,7 @@ il3945_hdl_rx(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='ctx'> 	struct ieee80211_hdr *header;</div><div class='ctx'> 	struct ieee80211_rx_status rx_status = {};</div><div class='ctx'> 	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='del'>-	struct il3945_rx_frame_stats *rx_stats = IL_RX_STATS(pkt);</div><div class='add'>+	struct il3945_rx_frame_stats_hdr *rx_stats = IL_RX_STATS(pkt);</div><div class='ctx'> 	struct il3945_rx_frame_hdr *rx_hdr = IL_RX_HDR(pkt);</div><div class='ctx'> 	struct il3945_rx_frame_end *rx_end = IL_RX_END(pkt);</div><div class='ctx'> 	u16 rx_stats_sig_avg __maybe_unused = le16_to_cpu(rx_stats-&gt;sig_avg);</div><div class='hunk'>@@ -652,16 +652,16 @@ il3945_hw_txq_free_tfd(struct il_priv *il, struct il_tx_queue *txq)</div><div class='ctx'> </div><div class='ctx'> 	/* Unmap tx_cmd */</div><div class='ctx'> 	if (counter)</div><div class='del'>-		pci_unmap_single(dev, dma_unmap_addr(&amp;txq-&gt;meta[idx], mapping),</div><div class='add'>+		dma_unmap_single(&amp;dev-&gt;dev,</div><div class='add'>+				 dma_unmap_addr(&amp;txq-&gt;meta[idx], mapping),</div><div class='ctx'> 				 dma_unmap_len(&amp;txq-&gt;meta[idx], len),</div><div class='del'>-				 PCI_DMA_TODEVICE);</div><div class='add'>+				 DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	/* unmap chunks if any */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 1; i &lt; counter; i++)</div><div class='del'>-		pci_unmap_single(dev, le32_to_cpu(tfd-&gt;tbs[i].addr),</div><div class='del'>-				 le32_to_cpu(tfd-&gt;tbs[i].len),</div><div class='del'>-				 PCI_DMA_TODEVICE);</div><div class='add'>+		dma_unmap_single(&amp;dev-&gt;dev, le32_to_cpu(tfd-&gt;tbs[i].addr),</div><div class='add'>+				 le32_to_cpu(tfd-&gt;tbs[i].len), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	/* free SKB */</div><div class='ctx'> 	if (txq-&gt;skbs) {</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlegacy/3945.h b/drivers/net/wireless/intel/iwlegacy/3945.h<br/>index 82e4a4878bc2..fb1e33c89d0e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/3945.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/3945.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/3945.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlegacy/3945.h</a></div><div class='hunk'>@@ -157,8 +157,10 @@ struct il3945_ibss_seq {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IL_RX_HDR(x) ((struct il3945_rx_frame_hdr *)(\</div><div class='del'>-		       x-&gt;u.rx_frame.stats.payload + \</div><div class='del'>-		       x-&gt;u.rx_frame.stats.phy_count))</div><div class='add'>+		      container_of(&amp;x-&gt;u.rx_frame.stats, \</div><div class='add'>+				   struct il3945_rx_frame_stats, \</div><div class='add'>+				   hdr)-&gt;payload + \</div><div class='add'>+		      x-&gt;u.rx_frame.stats.phy_count))</div><div class='ctx'> #define IL_RX_END(x) ((struct il3945_rx_frame_end *)(\</div><div class='ctx'> 		       IL_RX_HDR(x)-&gt;payload + \</div><div class='ctx'> 		       le16_to_cpu(IL_RX_HDR(x)-&gt;len)))</div><div class='hunk'>@@ -171,7 +173,6 @@ struct il3945_ibss_seq {</div><div class='ctx'>  * for use by iwl-*.c</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='del'>-int il3945_calc_db_from_ratio(int sig_ratio);</div><div class='ctx'> void il3945_rx_replenish(void *data);</div><div class='ctx'> void il3945_rx_queue_reset(struct il_priv *il, struct il_rx_queue *rxq);</div><div class='ctx'> unsigned int il3945_fill_beacon_frame(struct il_priv *il,</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlegacy/4965-mac.c b/drivers/net/wireless/intel/iwlegacy/4965-mac.c<br/>index 341d6a2bc690..3588dec75ebd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/4965-mac.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/4965-mac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/4965-mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlegacy/4965-mac.c</a></div><div class='hunk'>@@ -94,9 +94,10 @@ il4965_rx_queue_reset(struct il_priv *il, struct il_rx_queue *rxq)</div><div class='ctx'> 		/* In the reset function, these buffers may have been allocated</div><div class='ctx'> 		 * to an SKB, so we need to unmap and free potential storage */</div><div class='ctx'> 		if (rxq-&gt;pool[i].page != NULL) {</div><div class='del'>-			pci_unmap_page(il-&gt;pci_dev, rxq-&gt;pool[i].page_dma,</div><div class='add'>+			dma_unmap_page(&amp;il-&gt;pci_dev-&gt;dev,</div><div class='add'>+				       rxq-&gt;pool[i].page_dma,</div><div class='ctx'> 				       PAGE_SIZE &lt;&lt; il-&gt;hw_params.rx_page_order,</div><div class='del'>-				       PCI_DMA_FROMDEVICE);</div><div class='add'>+				       DMA_FROM_DEVICE);</div><div class='ctx'> 			__il_free_pages(il, rxq-&gt;pool[i].page);</div><div class='ctx'> 			rxq-&gt;pool[i].page = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -342,11 +343,10 @@ il4965_rx_allocate(struct il_priv *il, gfp_t priority)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Get physical address of the RB */</div><div class='del'>-		page_dma =</div><div class='del'>-		    pci_map_page(il-&gt;pci_dev, page, 0,</div><div class='del'>-				 PAGE_SIZE &lt;&lt; il-&gt;hw_params.rx_page_order,</div><div class='del'>-				 PCI_DMA_FROMDEVICE);</div><div class='del'>-		if (unlikely(pci_dma_mapping_error(il-&gt;pci_dev, page_dma))) {</div><div class='add'>+		page_dma = dma_map_page(&amp;il-&gt;pci_dev-&gt;dev, page, 0,</div><div class='add'>+					PAGE_SIZE &lt;&lt; il-&gt;hw_params.rx_page_order,</div><div class='add'>+					DMA_FROM_DEVICE);</div><div class='add'>+		if (unlikely(dma_mapping_error(&amp;il-&gt;pci_dev-&gt;dev, page_dma))) {</div><div class='ctx'> 			__free_pages(page, il-&gt;hw_params.rx_page_order);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -355,9 +355,9 @@ il4965_rx_allocate(struct il_priv *il, gfp_t priority)</div><div class='ctx'> </div><div class='ctx'> 		if (list_empty(&amp;rxq-&gt;rx_used)) {</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='del'>-			pci_unmap_page(il-&gt;pci_dev, page_dma,</div><div class='add'>+			dma_unmap_page(&amp;il-&gt;pci_dev-&gt;dev, page_dma,</div><div class='ctx'> 				       PAGE_SIZE &lt;&lt; il-&gt;hw_params.rx_page_order,</div><div class='del'>-				       PCI_DMA_FROMDEVICE);</div><div class='add'>+				       DMA_FROM_DEVICE);</div><div class='ctx'> 			__free_pages(page, il-&gt;hw_params.rx_page_order);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -409,9 +409,10 @@ il4965_rx_queue_free(struct il_priv *il, struct il_rx_queue *rxq)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	for (i = 0; i &lt; RX_QUEUE_SIZE + RX_FREE_BUFFERS; i++) {</div><div class='ctx'> 		if (rxq-&gt;pool[i].page != NULL) {</div><div class='del'>-			pci_unmap_page(il-&gt;pci_dev, rxq-&gt;pool[i].page_dma,</div><div class='add'>+			dma_unmap_page(&amp;il-&gt;pci_dev-&gt;dev,</div><div class='add'>+				       rxq-&gt;pool[i].page_dma,</div><div class='ctx'> 				       PAGE_SIZE &lt;&lt; il-&gt;hw_params.rx_page_order,</div><div class='del'>-				       PCI_DMA_FROMDEVICE);</div><div class='add'>+				       DMA_FROM_DEVICE);</div><div class='ctx'> 			__il_free_pages(il, rxq-&gt;pool[i].page);</div><div class='ctx'> 			rxq-&gt;pool[i].page = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1381,7 +1382,7 @@ il4965_hdl_stats(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='ctx'> 	 * we get a thermal update even if the uCode doesn't give us one</div><div class='ctx'> 	 */</div><div class='ctx'> 	mod_timer(&amp;il-&gt;stats_periodic,</div><div class='del'>-		  jiffies + msecs_to_jiffies(recalib_seconds * 1000));</div><div class='add'>+		  jiffies + secs_to_jiffies(recalib_seconds));</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!test_bit(S_SCANNING, &amp;il-&gt;status)) &amp;&amp;</div><div class='ctx'> 	    (pkt-&gt;hdr.cmd == N_STATS)) {</div><div class='hunk'>@@ -1574,8 +1575,11 @@ il4965_tx_cmd_build_rate(struct il_priv *il,</div><div class='ctx'> 	    || rate_idx &gt; RATE_COUNT_LEGACY)</div><div class='ctx'> 		rate_idx = rate_lowest_index(&amp;il-&gt;bands[info-&gt;band], sta);</div><div class='ctx'> 	/* For 5 GHZ band, remap mac80211 rate indices into driver indices */</div><div class='del'>-	if (info-&gt;band == NL80211_BAND_5GHZ)</div><div class='add'>+	if (info-&gt;band == NL80211_BAND_5GHZ) {</div><div class='ctx'> 		rate_idx += IL_FIRST_OFDM_RATE;</div><div class='add'>+		if (rate_idx &gt; IL_LAST_OFDM_RATE)</div><div class='add'>+			rate_idx = IL_LAST_OFDM_RATE;</div><div class='add'>+	}</div><div class='ctx'> 	/* Get PLCP rate for tx_cmd-&gt;rate_n_flags */</div><div class='ctx'> 	rate_plcp = il_rates[rate_idx].plcp;</div><div class='ctx'> 	/* Zero out flags for this packet */</div><div class='hunk'>@@ -1768,7 +1772,7 @@ il4965_tx_skb(struct il_priv *il,</div><div class='ctx'> 	/* Set up first empty entry in queue's array of Tx/cmd buffers */</div><div class='ctx'> 	out_cmd = txq-&gt;cmd[q-&gt;write_ptr];</div><div class='ctx'> 	out_meta = &amp;txq-&gt;meta[q-&gt;write_ptr];</div><div class='del'>-	tx_cmd = &amp;out_cmd-&gt;cmd.tx;</div><div class='add'>+	tx_cmd = container_of(&amp;out_cmd-&gt;cmd.tx, struct il_tx_cmd, __hdr);</div><div class='ctx'> 	memset(&amp;out_cmd-&gt;hdr, 0, sizeof(out_cmd-&gt;hdr));</div><div class='ctx'> 	memset(tx_cmd, 0, sizeof(struct il_tx_cmd));</div><div class='ctx'> </div><div class='hunk'>@@ -1815,20 +1819,18 @@ il4965_tx_skb(struct il_priv *il,</div><div class='ctx'> </div><div class='ctx'> 	/* Physical address of this Tx command's header (not MAC header!),</div><div class='ctx'> 	 * within command buffer array. */</div><div class='del'>-	txcmd_phys =</div><div class='del'>-	    pci_map_single(il-&gt;pci_dev, &amp;out_cmd-&gt;hdr, firstlen,</div><div class='del'>-			   PCI_DMA_BIDIRECTIONAL);</div><div class='del'>-	if (unlikely(pci_dma_mapping_error(il-&gt;pci_dev, txcmd_phys)))</div><div class='add'>+	txcmd_phys = dma_map_single(&amp;il-&gt;pci_dev-&gt;dev, &amp;out_cmd-&gt;hdr, firstlen,</div><div class='add'>+				    DMA_BIDIRECTIONAL);</div><div class='add'>+	if (unlikely(dma_mapping_error(&amp;il-&gt;pci_dev-&gt;dev, txcmd_phys)))</div><div class='ctx'> 		goto drop_unlock;</div><div class='ctx'> </div><div class='ctx'> 	/* Set up TFD's 2nd entry to point directly to remainder of skb,</div><div class='ctx'> 	 * if any (802.11 null frames have no payload). */</div><div class='ctx'> 	secondlen = skb-&gt;len - hdr_len;</div><div class='ctx'> 	if (secondlen &gt; 0) {</div><div class='del'>-		phys_addr =</div><div class='del'>-		    pci_map_single(il-&gt;pci_dev, skb-&gt;data + hdr_len, secondlen,</div><div class='del'>-				   PCI_DMA_TODEVICE);</div><div class='del'>-		if (unlikely(pci_dma_mapping_error(il-&gt;pci_dev, phys_addr)))</div><div class='add'>+		phys_addr = dma_map_single(&amp;il-&gt;pci_dev-&gt;dev, skb-&gt;data + hdr_len,</div><div class='add'>+					   secondlen, DMA_TO_DEVICE);</div><div class='add'>+		if (unlikely(dma_mapping_error(&amp;il-&gt;pci_dev-&gt;dev, phys_addr)))</div><div class='ctx'> 			goto drop_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1853,8 +1855,8 @@ il4965_tx_skb(struct il_priv *il,</div><div class='ctx'> 	    offsetof(struct il_tx_cmd, scratch);</div><div class='ctx'> </div><div class='ctx'> 	/* take back ownership of DMA buffer to enable update */</div><div class='del'>-	pci_dma_sync_single_for_cpu(il-&gt;pci_dev, txcmd_phys, firstlen,</div><div class='del'>-				    PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+	dma_sync_single_for_cpu(&amp;il-&gt;pci_dev-&gt;dev, txcmd_phys, firstlen,</div><div class='add'>+				DMA_BIDIRECTIONAL);</div><div class='ctx'> 	tx_cmd-&gt;dram_lsb_ptr = cpu_to_le32(scratch_phys);</div><div class='ctx'> 	tx_cmd-&gt;dram_msb_ptr = il_get_dma_hi_addr(scratch_phys);</div><div class='ctx'> </div><div class='hunk'>@@ -1869,8 +1871,8 @@ il4965_tx_skb(struct il_priv *il,</div><div class='ctx'> 	if (info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU)</div><div class='ctx'> 		il-&gt;ops-&gt;txq_update_byte_cnt_tbl(il, txq, le16_to_cpu(tx_cmd-&gt;len));</div><div class='ctx'> </div><div class='del'>-	pci_dma_sync_single_for_device(il-&gt;pci_dev, txcmd_phys, firstlen,</div><div class='del'>-				       PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+	dma_sync_single_for_device(&amp;il-&gt;pci_dev-&gt;dev, txcmd_phys, firstlen,</div><div class='add'>+				   DMA_BIDIRECTIONAL);</div><div class='ctx'> </div><div class='ctx'> 	/* Tell device the write idx *just past* this latest filled TFD */</div><div class='ctx'> 	q-&gt;write_ptr = il_queue_inc_wrap(q-&gt;write_ptr, q-&gt;n_bd);</div><div class='hunk'>@@ -3929,15 +3931,15 @@ il4965_hw_txq_free_tfd(struct il_priv *il, struct il_tx_queue *txq)</div><div class='ctx'> </div><div class='ctx'> 	/* Unmap tx_cmd */</div><div class='ctx'> 	if (num_tbs)</div><div class='del'>-		pci_unmap_single(dev, dma_unmap_addr(&amp;txq-&gt;meta[idx], mapping),</div><div class='add'>+		dma_unmap_single(&amp;dev-&gt;dev,</div><div class='add'>+				 dma_unmap_addr(&amp;txq-&gt;meta[idx], mapping),</div><div class='ctx'> 				 dma_unmap_len(&amp;txq-&gt;meta[idx], len),</div><div class='del'>-				 PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+				 DMA_BIDIRECTIONAL);</div><div class='ctx'> </div><div class='ctx'> 	/* Unmap chunks, if any. */</div><div class='ctx'> 	for (i = 1; i &lt; num_tbs; i++)</div><div class='del'>-		pci_unmap_single(dev, il4965_tfd_tb_get_addr(tfd, i),</div><div class='del'>-				 il4965_tfd_tb_get_len(tfd, i),</div><div class='del'>-				 PCI_DMA_TODEVICE);</div><div class='add'>+		dma_unmap_single(&amp;dev-&gt;dev, il4965_tfd_tb_get_addr(tfd, i),</div><div class='add'>+				 il4965_tfd_tb_get_len(tfd, i), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	/* free SKB */</div><div class='ctx'> 	if (txq-&gt;skbs) {</div><div class='hunk'>@@ -4021,7 +4023,7 @@ il4965_hdl_alive(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='ctx'> </div><div class='ctx'> 	if (palive-&gt;ver_subtype == INITIALIZE_SUBTYPE) {</div><div class='ctx'> 		D_INFO("Initialization Alive received.\n");</div><div class='del'>-		memcpy(&amp;il-&gt;card_alive_init, &amp;pkt-&gt;u.alive_frame,</div><div class='add'>+		memcpy(&amp;il-&gt;card_alive_init, &amp;pkt-&gt;u.raw,</div><div class='ctx'> 		       sizeof(struct il_init_alive_resp));</div><div class='ctx'> 		pwork = &amp;il-&gt;init_alive_start;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -4052,7 +4054,7 @@ il4965_hdl_alive(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='ctx'> static void</div><div class='ctx'> il4965_bg_stats_periodic(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct il_priv *il = from_timer(il, t, stats_periodic);</div><div class='add'>+	struct il_priv *il = timer_container_of(il, t, stats_periodic);</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -4232,8 +4234,6 @@ il4965_rx_handle(struct il_priv *il)</div><div class='ctx'> 		fill_rx = 1;</div><div class='ctx'> </div><div class='ctx'> 	while (i != r) {</div><div class='del'>-		int len;</div><div class='del'>-</div><div class='ctx'> 		rxb = rxq-&gt;queue[i];</div><div class='ctx'> </div><div class='ctx'> 		/* If an RXB doesn't have a Rx queue slot associated with it,</div><div class='hunk'>@@ -4243,14 +4243,10 @@ il4965_rx_handle(struct il_priv *il)</div><div class='ctx'> </div><div class='ctx'> 		rxq-&gt;queue[i] = NULL;</div><div class='ctx'> </div><div class='del'>-		pci_unmap_page(il-&gt;pci_dev, rxb-&gt;page_dma,</div><div class='add'>+		dma_unmap_page(&amp;il-&gt;pci_dev-&gt;dev, rxb-&gt;page_dma,</div><div class='ctx'> 			       PAGE_SIZE &lt;&lt; il-&gt;hw_params.rx_page_order,</div><div class='del'>-			       PCI_DMA_FROMDEVICE);</div><div class='add'>+			       DMA_FROM_DEVICE);</div><div class='ctx'> 		pkt = rxb_addr(rxb);</div><div class='del'>-</div><div class='del'>-		len = le32_to_cpu(pkt-&gt;len_n_flags) &amp; IL_RX_FRAME_SIZE_MSK;</div><div class='del'>-		len += sizeof(u32);	/* account for status word */</div><div class='del'>-</div><div class='ctx'> 		reclaim = il_need_reclaim(il, pkt);</div><div class='ctx'> </div><div class='ctx'> 		/* Based on type of command response or notification,</div><div class='hunk'>@@ -4290,12 +4286,12 @@ il4965_rx_handle(struct il_priv *il)</div><div class='ctx'> 		spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='ctx'> 		if (rxb-&gt;page != NULL) {</div><div class='ctx'> 			rxb-&gt;page_dma =</div><div class='del'>-			    pci_map_page(il-&gt;pci_dev, rxb-&gt;page, 0,</div><div class='del'>-					 PAGE_SIZE &lt;&lt; il-&gt;hw_params.</div><div class='del'>-					 rx_page_order, PCI_DMA_FROMDEVICE);</div><div class='add'>+			    dma_map_page(&amp;il-&gt;pci_dev-&gt;dev, rxb-&gt;page, 0,</div><div class='add'>+					 PAGE_SIZE &lt;&lt; il-&gt;hw_params.rx_page_order,</div><div class='add'>+					 DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='del'>-			if (unlikely(pci_dma_mapping_error(il-&gt;pci_dev,</div><div class='del'>-							   rxb-&gt;page_dma))) {</div><div class='add'>+			if (unlikely(dma_mapping_error(&amp;il-&gt;pci_dev-&gt;dev,</div><div class='add'>+						       rxb-&gt;page_dma))) {</div><div class='ctx'> 				__il_free_pages(il, rxb-&gt;page);</div><div class='ctx'> 				rxb-&gt;page = NULL;</div><div class='ctx'> 				list_add_tail(&amp;rxb-&gt;list, &amp;rxq-&gt;rx_used);</div><div class='hunk'>@@ -5357,7 +5353,7 @@ __il4965_down(struct il_priv *il)</div><div class='ctx'> </div><div class='ctx'> 	/* Stop TX queues watchdog. We need to have S_EXIT_PENDING bit set</div><div class='ctx'> 	 * to prevent rearm timer */</div><div class='del'>-	del_timer_sync(&amp;il-&gt;watchdog);</div><div class='add'>+	timer_delete_sync(&amp;il-&gt;watchdog);</div><div class='ctx'> </div><div class='ctx'> 	il_clear_ucode_stations(il);</div><div class='ctx'> </div><div class='hunk'>@@ -5827,7 +5823,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='del'>-il4965_mac_stop(struct ieee80211_hw *hw)</div><div class='add'>+il4965_mac_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct il_priv *il = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -6123,7 +6119,7 @@ il4965_mac_channel_switch(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	if (il-&gt;ops-&gt;set_channel_switch(il, ch_switch)) {</div><div class='ctx'> 		clear_bit(S_CHANNEL_SWITCH_PENDING, &amp;il-&gt;status);</div><div class='ctx'> 		il-&gt;switch_channel = 0;</div><div class='del'>-		ieee80211_chswitch_done(il-&gt;vif, false);</div><div class='add'>+		ieee80211_chswitch_done(il-&gt;vif, false, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -6212,10 +6208,12 @@ out:</div><div class='ctx'> 	mutex_unlock(&amp;il-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+static int</div><div class='ctx'> il4965_setup_deferred_work(struct il_priv *il)</div><div class='ctx'> {</div><div class='ctx'> 	il-&gt;workqueue = create_singlethread_workqueue(DRV_NAME);</div><div class='add'>+	if (!il-&gt;workqueue)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_head(&amp;il-&gt;wait_command_queue);</div><div class='ctx'> </div><div class='hunk'>@@ -6234,6 +6232,8 @@ il4965_setup_deferred_work(struct il_priv *il)</div><div class='ctx'> 	timer_setup(&amp;il-&gt;watchdog, il_bg_watchdog, 0);</div><div class='ctx'> </div><div class='ctx'> 	tasklet_setup(&amp;il-&gt;irq_tasklet, il4965_irq_tasklet);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -6246,7 +6246,7 @@ il4965_cancel_deferred_work(struct il_priv *il)</div><div class='ctx'> </div><div class='ctx'> 	il_cancel_scan_deferred_work(il);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;il-&gt;stats_periodic);</div><div class='add'>+	timer_delete_sync(&amp;il-&gt;stats_periodic);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -6304,7 +6304,12 @@ il4965_tx_queue_set_status(struct il_priv *il, struct il_tx_queue *txq,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ieee80211_ops il4965_mac_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.tx = il4965_mac_tx,</div><div class='add'>+	.wake_tx_queue = ieee80211_handle_wake_tx_queue,</div><div class='ctx'> 	.start = il4965_mac_start,</div><div class='ctx'> 	.stop = il4965_mac_stop,</div><div class='ctx'> 	.add_interface = il_mac_add_interface,</div><div class='hunk'>@@ -6514,14 +6519,9 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='del'>-	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36));</div><div class='del'>-	if (!err)</div><div class='del'>-		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(36));</div><div class='add'>+	err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(36));</div><div class='ctx'> 	if (err) {</div><div class='del'>-		err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='del'>-		if (!err)</div><div class='del'>-			err =</div><div class='del'>-			    pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='add'>+		err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> 		/* both attempts failed: */</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			IL_WARN("No suitable DMA available.\n");</div><div class='hunk'>@@ -6623,7 +6623,10 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		goto out_disable_msi;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	il4965_setup_deferred_work(il);</div><div class='add'>+	err = il4965_setup_deferred_work(il);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free_irq;</div><div class='add'>+</div><div class='ctx'> 	il4965_setup_handlers(il);</div><div class='ctx'> </div><div class='ctx'> 	/*********************************************</div><div class='hunk'>@@ -6661,6 +6664,7 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> out_destroy_workqueue:</div><div class='ctx'> 	destroy_workqueue(il-&gt;workqueue);</div><div class='ctx'> 	il-&gt;workqueue = NULL;</div><div class='add'>+out_free_irq:</div><div class='ctx'> 	free_irq(il-&gt;pci_dev-&gt;irq, il);</div><div class='ctx'> out_disable_msi:</div><div class='ctx'> 	pci_disable_msi(il-&gt;pci_dev);</div><div class='hunk'>@@ -6696,7 +6700,7 @@ il4965_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> 	sysfs_remove_group(&amp;pdev-&gt;dev.kobj, &amp;il_attribute_group);</div><div class='ctx'> </div><div class='ctx'> 	/* ieee80211_unregister_hw call wil cause il_mac_stop to</div><div class='del'>-	 * to be called and il4965_down since we are removing the device</div><div class='add'>+	 * be called and il4965_down since we are removing the device</div><div class='ctx'> 	 * we need to set S_EXIT_PENDING bit.</div><div class='ctx'> 	 */</div><div class='ctx'> 	set_bit(S_EXIT_PENDING, &amp;il-&gt;status);</div><div class='hunk'>@@ -6737,7 +6741,6 @@ il4965_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> 	il_eeprom_free(il);</div><div class='ctx'> </div><div class='ctx'> 	/*netif_stop_queue(dev); */</div><div class='del'>-	flush_workqueue(il-&gt;workqueue);</div><div class='ctx'> </div><div class='ctx'> 	/* ieee80211_unregister_hw calls il_mac_stop, which flushes</div><div class='ctx'> 	 * il-&gt;workqueue... so we can't take down the workqueue</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlegacy/4965-rs.c b/drivers/net/wireless/intel/iwlegacy/4965-rs.c<br/>index 9a491e5db75b..031d88bf6393 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/4965-rs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/4965-rs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/4965-rs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlegacy/4965-rs.c</a></div><div class='hunk'>@@ -132,15 +132,8 @@ static void il4965_rs_fill_link_cmd(struct il_priv *il,</div><div class='ctx'> static void il4965_rs_stay_in_table(struct il_lq_sta *lq_sta,</div><div class='ctx'> 				    bool force_search);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='ctx'> static void il4965_rs_dbgfs_set_mcs(struct il_lq_sta *lq_sta,</div><div class='ctx'> 				    u32 *rate_n_flags, int idx);</div><div class='del'>-#else</div><div class='del'>-static void</div><div class='del'>-il4965_rs_dbgfs_set_mcs(struct il_lq_sta *lq_sta, u32 * rate_n_flags, int idx)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The following tables contain the expected throughput metrics for all rates</div><div class='hunk'>@@ -210,7 +203,8 @@ il4965_rs_extract_rate(u32 rate_n_flags)</div><div class='ctx'> 	return (u8) (rate_n_flags &amp; 0xFF);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+/* noinline works around https://github.com/llvm/llvm-project/issues/143908 */</div><div class='add'>+static noinline_for_stack void</div><div class='ctx'> il4965_rs_rate_scale_clear_win(struct il_rate_scale_data *win)</div><div class='ctx'> {</div><div class='ctx'> 	win-&gt;data = 0;</div><div class='hunk'>@@ -627,7 +621,7 @@ il4965_rs_toggle_antenna(u32 valid_ant, u32 *rate_n_flags,</div><div class='ctx'> static bool</div><div class='ctx'> il4965_rs_use_green(struct il_priv *il, struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	return (sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_GRN_FLD) &amp;&amp;</div><div class='add'>+	return (sta-&gt;deflink.ht_cap.cap &amp; IEEE80211_HT_CAP_GRN_FLD) &amp;&amp;</div><div class='ctx'> 	       !il-&gt;ht.non_gf_sta_present;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -970,7 +964,7 @@ il4965_rs_tx_status(void *il_r, struct ieee80211_supported_band *sband,</div><div class='ctx'> 	lq_sta-&gt;last_rate_n_flags = tx_rate;</div><div class='ctx'> done:</div><div class='ctx'> 	/* See if there's a better rate or modulation mode to try. */</div><div class='del'>-	if (sta-&gt;supp_rates[sband-&gt;band])</div><div class='add'>+	if (sta-&gt;deflink.supp_rates[sband-&gt;band])</div><div class='ctx'> 		il4965_rs_rate_scale_perform(il, skb, sta, lq_sta);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1164,10 +1158,10 @@ il4965_rs_switch_to_mimo2(struct il_priv *il, struct il_lq_sta *lq_sta,</div><div class='ctx'> 	s32 rate;</div><div class='ctx'> 	s8 is_green = lq_sta-&gt;is_green;</div><div class='ctx'> </div><div class='del'>-	if (!conf_is_ht(conf) || !sta-&gt;ht_cap.ht_supported)</div><div class='add'>+	if (!conf_is_ht(conf) || !sta-&gt;deflink.ht_cap.ht_supported)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;smps_mode == IEEE80211_SMPS_STATIC)</div><div class='add'>+	if (sta-&gt;deflink.smps_mode == IEEE80211_SMPS_STATIC)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	/* Need both Tx chains/antennas to support MIMO */</div><div class='hunk'>@@ -1182,7 +1176,7 @@ il4965_rs_switch_to_mimo2(struct il_priv *il, struct il_lq_sta *lq_sta,</div><div class='ctx'> 	tbl-&gt;max_search = IL_MAX_SEARCH;</div><div class='ctx'> 	rate_mask = lq_sta-&gt;active_mimo2_rate;</div><div class='ctx'> </div><div class='del'>-	if (il_is_ht40_tx_allowed(il, &amp;sta-&gt;ht_cap))</div><div class='add'>+	if (il_is_ht40_tx_allowed(il, &amp;sta-&gt;deflink.ht_cap))</div><div class='ctx'> 		tbl-&gt;is_ht40 = 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		tbl-&gt;is_ht40 = 0;</div><div class='hunk'>@@ -1217,7 +1211,7 @@ il4965_rs_switch_to_siso(struct il_priv *il, struct il_lq_sta *lq_sta,</div><div class='ctx'> 	u8 is_green = lq_sta-&gt;is_green;</div><div class='ctx'> 	s32 rate;</div><div class='ctx'> </div><div class='del'>-	if (!conf_is_ht(conf) || !sta-&gt;ht_cap.ht_supported)</div><div class='add'>+	if (!conf_is_ht(conf) || !sta-&gt;deflink.ht_cap.ht_supported)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	D_RATE("LQ: try to switch to SISO\n");</div><div class='hunk'>@@ -1228,7 +1222,7 @@ il4965_rs_switch_to_siso(struct il_priv *il, struct il_lq_sta *lq_sta,</div><div class='ctx'> 	tbl-&gt;max_search = IL_MAX_SEARCH;</div><div class='ctx'> 	rate_mask = lq_sta-&gt;active_siso_rate;</div><div class='ctx'> </div><div class='del'>-	if (il_is_ht40_tx_allowed(il, &amp;sta-&gt;ht_cap))</div><div class='add'>+	if (il_is_ht40_tx_allowed(il, &amp;sta-&gt;deflink.ht_cap))</div><div class='ctx'> 		tbl-&gt;is_ht40 = 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		tbl-&gt;is_ht40 = 0;</div><div class='hunk'>@@ -1384,7 +1378,7 @@ il4965_rs_move_siso_to_other(struct il_priv *il, struct il_lq_sta *lq_sta,</div><div class='ctx'> 	struct il_scale_tbl_info *search_tbl =</div><div class='ctx'> 	    &amp;(lq_sta-&gt;lq_info[(1 - lq_sta-&gt;active_tbl)]);</div><div class='ctx'> 	struct il_rate_scale_data *win = &amp;(tbl-&gt;win[idx]);</div><div class='del'>-	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='add'>+	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;deflink.ht_cap;</div><div class='ctx'> 	u32 sz =</div><div class='ctx'> 	    (sizeof(struct il_scale_tbl_info) -</div><div class='ctx'> 	     (sizeof(struct il_rate_scale_data) * RATE_COUNT));</div><div class='hunk'>@@ -1507,7 +1501,7 @@ il4965_rs_move_mimo2_to_other(struct il_priv *il, struct il_lq_sta *lq_sta,</div><div class='ctx'> 	struct il_scale_tbl_info *search_tbl =</div><div class='ctx'> 	    &amp;(lq_sta-&gt;lq_info[(1 - lq_sta-&gt;active_tbl)]);</div><div class='ctx'> 	struct il_rate_scale_data *win = &amp;(tbl-&gt;win[idx]);</div><div class='del'>-	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='add'>+	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;deflink.ht_cap;</div><div class='ctx'> 	u32 sz =</div><div class='ctx'> 	    (sizeof(struct il_scale_tbl_info) -</div><div class='ctx'> 	     (sizeof(struct il_rate_scale_data) * RATE_COUNT));</div><div class='hunk'>@@ -1760,7 +1754,7 @@ il4965_rs_rate_scale_perform(struct il_priv *il, struct sk_buff *skb,</div><div class='ctx'> 	    (info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	lq_sta-&gt;supp_rates = sta-&gt;supp_rates[lq_sta-&gt;band];</div><div class='add'>+	lq_sta-&gt;supp_rates = sta-&gt;deflink.supp_rates[lq_sta-&gt;band];</div><div class='ctx'> </div><div class='ctx'> 	tid = il4965_rs_tl_add_packet(lq_sta, hdr);</div><div class='ctx'> 	if (tid != MAX_TID_COUNT &amp;&amp; (lq_sta-&gt;tx_agg_tid_en &amp; (1 &lt;&lt; tid))) {</div><div class='hunk'>@@ -2271,7 +2265,7 @@ il4965_rs_rate_init(struct il_priv *il, struct ieee80211_sta *sta, u8 sta_id)</div><div class='ctx'> 	int i, j;</div><div class='ctx'> 	struct ieee80211_hw *hw = il-&gt;hw;</div><div class='ctx'> 	struct ieee80211_conf *conf = &amp;il-&gt;hw-&gt;conf;</div><div class='del'>-	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='add'>+	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;deflink.ht_cap;</div><div class='ctx'> 	struct il_station_priv *sta_priv;</div><div class='ctx'> 	struct il_lq_sta *lq_sta;</div><div class='ctx'> 	struct ieee80211_supported_band *sband;</div><div class='hunk'>@@ -2288,7 +2282,7 @@ il4965_rs_rate_init(struct il_priv *il, struct ieee80211_sta *sta, u8 sta_id)</div><div class='ctx'> 						       win[i]);</div><div class='ctx'> </div><div class='ctx'> 	lq_sta-&gt;flush_timer = 0;</div><div class='del'>-	lq_sta-&gt;supp_rates = sta-&gt;supp_rates[sband-&gt;band];</div><div class='add'>+	lq_sta-&gt;supp_rates = sta-&gt;deflink.supp_rates[sband-&gt;band];</div><div class='ctx'> 	for (j = 0; j &lt; LQ_SIZE; j++)</div><div class='ctx'> 		for (i = 0; i &lt; RATE_COUNT; i++)</div><div class='ctx'> 			il4965_rs_rate_scale_clear_win(&amp;lq_sta-&gt;lq_info[j].</div><div class='hunk'>@@ -2403,7 +2397,7 @@ il4965_rs_fill_link_cmd(struct il_priv *il, struct il_lq_sta *lq_sta,</div><div class='ctx'> 		/* Repeat initial/next rate.</div><div class='ctx'> 		 * For legacy IL_NUMBER_TRY == 1, this loop will not execute.</div><div class='ctx'> 		 * For HT IL_HT_NUMBER_TRY == 3, this executes twice. */</div><div class='del'>-		while (repeat_rate &gt; 0 &amp;&amp; idx &lt; LINK_QUAL_MAX_RETRY_NUM) {</div><div class='add'>+		while (repeat_rate &gt; 0 &amp;&amp; idx &lt; (LINK_QUAL_MAX_RETRY_NUM - 1)) {</div><div class='ctx'> 			if (is_legacy(tbl_type.lq_type)) {</div><div class='ctx'> 				if (ant_toggle_cnt &lt; NUM_TRY_BEFORE_ANT_TOGGLE)</div><div class='ctx'> 					ant_toggle_cnt++;</div><div class='hunk'>@@ -2495,8 +2489,6 @@ il4965_rs_free_sta(void *il_r, struct ieee80211_sta *sta, void *il_sta)</div><div class='ctx'> 	D_RATE("leave\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> il4965_rs_dbgfs_set_mcs(struct il_lq_sta *lq_sta, u32 * rate_n_flags, int idx)</div><div class='ctx'> {</div><div class='hunk'>@@ -2504,6 +2496,9 @@ il4965_rs_dbgfs_set_mcs(struct il_lq_sta *lq_sta, u32 * rate_n_flags, int idx)</div><div class='ctx'> 	u8 valid_tx_ant;</div><div class='ctx'> 	u8 ant_sel_tx;</div><div class='ctx'> </div><div class='add'>+	if (!IS_ENABLED(CONFIG_MAC80211_DEBUGFS))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	il = lq_sta-&gt;drv;</div><div class='ctx'> 	valid_tx_ant = il-&gt;hw_params.valid_tx_ant;</div><div class='ctx'> 	if (lq_sta-&gt;dbg_fixed_rate) {</div><div class='hunk'>@@ -2758,7 +2753,6 @@ il4965_rs_add_debugfs(void *il, void *il_sta, struct dentry *dir)</div><div class='ctx'> 	debugfs_create_u8("tx_agg_tid_enable", 0600, dir,</div><div class='ctx'> 			  &amp;lq_sta-&gt;tx_agg_tid_en);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Initialization of rate scaling information is done by driver after</div><div class='hunk'>@@ -2781,9 +2775,8 @@ static const struct rate_control_ops rs_4965_ops = {</div><div class='ctx'> 	.free = il4965_rs_free,</div><div class='ctx'> 	.alloc_sta = il4965_rs_alloc_sta,</div><div class='ctx'> 	.free_sta = il4965_rs_free_sta,</div><div class='del'>-#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='del'>-	.add_sta_debugfs = il4965_rs_add_debugfs,</div><div class='del'>-#endif</div><div class='add'>+	.add_sta_debugfs = PTR_IF(IS_ENABLED(CONFIG_MAC80211_DEBUGFS),</div><div class='add'>+				  il4965_rs_add_debugfs),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlegacy/4965.c b/drivers/net/wireless/intel/iwlegacy/4965.c<br/>index 9fa556486511..b63e29590b04 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/4965.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/4965.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/4965.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlegacy/4965.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/units.h&gt;</div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "4965.h"</div><div class='hunk'>@@ -1756,9 +1756,9 @@ il4965_post_associate(struct il_priv *il)</div><div class='ctx'> 	if (il-&gt;ops-&gt;set_rxon_chain)</div><div class='ctx'> 		il-&gt;ops-&gt;set_rxon_chain(il);</div><div class='ctx'> </div><div class='del'>-	il-&gt;staging.assoc_id = cpu_to_le16(vif-&gt;bss_conf.aid);</div><div class='add'>+	il-&gt;staging.assoc_id = cpu_to_le16(vif-&gt;cfg.aid);</div><div class='ctx'> </div><div class='del'>-	D_ASSOC("assoc id %d beacon interval %d\n", vif-&gt;bss_conf.aid,</div><div class='add'>+	D_ASSOC("assoc id %d beacon interval %d\n", vif-&gt;cfg.aid,</div><div class='ctx'> 		vif-&gt;bss_conf.beacon_int);</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;bss_conf.use_short_preamble)</div><div class='hunk'>@@ -1775,7 +1775,7 @@ il4965_post_associate(struct il_priv *il)</div><div class='ctx'> </div><div class='ctx'> 	il_commit_rxon(il);</div><div class='ctx'> </div><div class='del'>-	D_ASSOC("Associated as %d to: %pM\n", vif-&gt;bss_conf.aid,</div><div class='add'>+	D_ASSOC("Associated as %d to: %pM\n", vif-&gt;cfg.aid,</div><div class='ctx'> 		il-&gt;active.bssid_addr);</div><div class='ctx'> </div><div class='ctx'> 	switch (vif-&gt;type) {</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlegacy/4965.h b/drivers/net/wireless/intel/iwlegacy/4965.h<br/>index 863e3792d153..951f2245fefb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/4965.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/4965.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/4965.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlegacy/4965.h</a></div><div class='hunk'>@@ -151,7 +151,7 @@ void il4965_mac_tx(struct ieee80211_hw *hw,</div><div class='ctx'> 		   struct ieee80211_tx_control *control,</div><div class='ctx'> 		   struct sk_buff *skb);</div><div class='ctx'> int il4965_mac_start(struct ieee80211_hw *hw);</div><div class='del'>-void il4965_mac_stop(struct ieee80211_hw *hw);</div><div class='add'>+void il4965_mac_stop(struct ieee80211_hw *hw, bool suspend);</div><div class='ctx'> void il4965_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> 			     unsigned int changed_flags,</div><div class='ctx'> 			     unsigned int *total_flags, u64 multicast);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlegacy/Kconfig b/drivers/net/wireless/intel/iwlegacy/Kconfig<br/>index 24fe3f63c321..7eacc8e58ee1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlegacy/Kconfig</a></div><div class='hunk'>@@ -2,14 +2,13 @@</div><div class='ctx'> config IWLEGACY</div><div class='ctx'> 	tristate</div><div class='ctx'> 	select FW_LOADER</div><div class='del'>-	select NEW_LEDS</div><div class='del'>-	select LEDS_CLASS</div><div class='ctx'> 	select LEDS_TRIGGERS</div><div class='ctx'> 	select MAC80211_LEDS</div><div class='ctx'> </div><div class='ctx'> config IWL4965</div><div class='ctx'> 	tristate "Intel Wireless WiFi 4965AGN (iwl4965)"</div><div class='ctx'> 	depends on PCI &amp;&amp; MAC80211</div><div class='add'>+	depends on LEDS_CLASS=y || LEDS_CLASS=MAC80211</div><div class='ctx'> 	select IWLEGACY</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for</div><div class='hunk'>@@ -38,6 +37,7 @@ config IWL4965</div><div class='ctx'> config IWL3945</div><div class='ctx'> 	tristate "Intel PRO/Wireless 3945ABG/BG Network Connection (iwl3945)"</div><div class='ctx'> 	depends on PCI &amp;&amp; MAC80211</div><div class='add'>+	depends on LEDS_CLASS=y || LEDS_CLASS=MAC80211</div><div class='ctx'> 	select IWLEGACY</div><div class='ctx'> 	help</div><div class='ctx'> 	  Select to build the driver supporting the:</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlegacy/commands.h b/drivers/net/wireless/intel/iwlegacy/commands.h<br/>index 89c6671b32bc..b61b8f377702 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/commands.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/commands.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/commands.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlegacy/commands.h</a></div><div class='hunk'>@@ -201,9 +201,6 @@ struct il_cmd_header {</div><div class='ctx'> 	 *  15          unsolicited RX or uCode-originated notification</div><div class='ctx'> 	 */</div><div class='ctx'> 	__le16 sequence;</div><div class='del'>-</div><div class='del'>-	/* command or response/notification data follows immediately */</div><div class='del'>-	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1160,23 +1157,33 @@ struct il_wep_cmd {</div><div class='ctx'> #define RX_MPDU_RES_STATUS_DEC_DONE_MSK	(0x800)</div><div class='ctx'> </div><div class='ctx'> struct il3945_rx_frame_stats {</div><div class='del'>-	u8 phy_count;</div><div class='del'>-	u8 id;</div><div class='del'>-	u8 rssi;</div><div class='del'>-	u8 agc;</div><div class='del'>-	__le16 sig_avg;</div><div class='del'>-	__le16 noise_diff;</div><div class='add'>+	/* New members MUST be added within the __struct_group() macro below. */</div><div class='add'>+	__struct_group(il3945_rx_frame_stats_hdr, hdr, __packed,</div><div class='add'>+		u8 phy_count;</div><div class='add'>+		u8 id;</div><div class='add'>+		u8 rssi;</div><div class='add'>+		u8 agc;</div><div class='add'>+		__le16 sig_avg;</div><div class='add'>+		__le16 noise_diff;</div><div class='add'>+	);</div><div class='ctx'> 	u8 payload[];</div><div class='ctx'> } __packed;</div><div class='add'>+static_assert(offsetof(struct il3945_rx_frame_stats, payload) == sizeof(struct il3945_rx_frame_stats_hdr),</div><div class='add'>+	      "struct member likely outside of __struct_group()");</div><div class='ctx'> </div><div class='ctx'> struct il3945_rx_frame_hdr {</div><div class='del'>-	__le16 channel;</div><div class='del'>-	__le16 phy_flags;</div><div class='del'>-	u8 reserved1;</div><div class='del'>-	u8 rate;</div><div class='del'>-	__le16 len;</div><div class='add'>+	/* New members MUST be added within the __struct_group() macro below. */</div><div class='add'>+	__struct_group(il3945_rx_frame_hdr_hdr, hdr, __packed,</div><div class='add'>+		__le16 channel;</div><div class='add'>+		__le16 phy_flags;</div><div class='add'>+		u8 reserved1;</div><div class='add'>+		u8 rate;</div><div class='add'>+		__le16 len;</div><div class='add'>+	);</div><div class='ctx'> 	u8 payload[];</div><div class='ctx'> } __packed;</div><div class='add'>+static_assert(offsetof(struct il3945_rx_frame_hdr, payload) == sizeof(struct il3945_rx_frame_hdr_hdr),</div><div class='add'>+	      "struct member likely outside of __struct_group()");</div><div class='ctx'> </div><div class='ctx'> struct il3945_rx_frame_end {</div><div class='ctx'> 	__le32 status;</div><div class='hunk'>@@ -1193,8 +1200,8 @@ struct il3945_rx_frame_end {</div><div class='ctx'>  * stats.phy_count</div><div class='ctx'>  */</div><div class='ctx'> struct il3945_rx_frame {</div><div class='del'>-	struct il3945_rx_frame_stats stats;</div><div class='del'>-	struct il3945_rx_frame_hdr hdr;</div><div class='add'>+	struct il3945_rx_frame_stats_hdr stats;</div><div class='add'>+	struct il3945_rx_frame_hdr_hdr hdr;</div><div class='ctx'> 	struct il3945_rx_frame_end end;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -1352,65 +1359,69 @@ struct il_rx_mpdu_res_start {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct il3945_tx_cmd {</div><div class='del'>-	/*</div><div class='del'>-	 * MPDU byte count:</div><div class='del'>-	 * MAC header (24/26/30/32 bytes) + 2 bytes pad if 26/30 header size,</div><div class='del'>-	 * + 8 byte IV for CCM or TKIP (not used for WEP)</div><div class='del'>-	 * + Data payload</div><div class='del'>-	 * + 8-byte MIC (not used for CCM/WEP)</div><div class='del'>-	 * NOTE:  Does not include Tx command bytes, post-MAC pad bytes,</div><div class='del'>-	 *        MIC (CCM) 8 bytes, ICV (WEP/TKIP/CKIP) 4 bytes, CRC 4 bytes.i</div><div class='del'>-	 * Range: 14-2342 bytes.</div><div class='del'>-	 */</div><div class='del'>-	__le16 len;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * MPDU or MSDU byte count for next frame.</div><div class='del'>-	 * Used for fragmentation and bursting, but not 11n aggregation.</div><div class='del'>-	 * Same as "len", but for next frame.  Set to 0 if not applicable.</div><div class='del'>-	 */</div><div class='del'>-	__le16 next_frame_len;</div><div class='del'>-</div><div class='del'>-	__le32 tx_flags;	/* TX_CMD_FLG_* */</div><div class='del'>-</div><div class='del'>-	u8 rate;</div><div class='del'>-</div><div class='del'>-	/* Index of recipient station in uCode's station table */</div><div class='del'>-	u8 sta_id;</div><div class='del'>-	u8 tid_tspec;</div><div class='del'>-	u8 sec_ctl;</div><div class='del'>-	u8 key[16];</div><div class='del'>-	union {</div><div class='del'>-		u8 byte[8];</div><div class='del'>-		__le16 word[4];</div><div class='del'>-		__le32 dw[2];</div><div class='del'>-	} tkip_mic;</div><div class='del'>-	__le32 next_frame_info;</div><div class='del'>-	union {</div><div class='del'>-		__le32 life_time;</div><div class='del'>-		__le32 attempt;</div><div class='del'>-	} stop_time;</div><div class='del'>-	u8 supp_rates[2];</div><div class='del'>-	u8 rts_retry_limit;	/*byte 50 */</div><div class='del'>-	u8 data_retry_limit;	/*byte 51 */</div><div class='del'>-	union {</div><div class='del'>-		__le16 pm_frame_timeout;</div><div class='del'>-		__le16 attempt_duration;</div><div class='del'>-	} timeout;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Duration of EDCA burst Tx Opportunity, in 32-usec units.</div><div class='del'>-	 * Set this if txop time is not specified by HCCA protocol (e.g. by AP).</div><div class='del'>-	 */</div><div class='del'>-	__le16 driver_txop;</div><div class='add'>+	/* New members MUST be added within the __struct_group() macro below. */</div><div class='add'>+	__struct_group(il3945_tx_cmd_hdr, __hdr, __packed,</div><div class='add'>+		/*</div><div class='add'>+		 * MPDU byte count:</div><div class='add'>+		 * MAC header (24/26/30/32 bytes) + 2 bytes pad if 26/30 header size,</div><div class='add'>+		 * + 8 byte IV for CCM or TKIP (not used for WEP)</div><div class='add'>+		 * + Data payload</div><div class='add'>+		 * + 8-byte MIC (not used for CCM/WEP)</div><div class='add'>+		 * NOTE:  Does not include Tx command bytes, post-MAC pad bytes,</div><div class='add'>+		 *        MIC (CCM) 8 bytes, ICV (WEP/TKIP/CKIP) 4 bytes, CRC 4 bytes.i</div><div class='add'>+		 * Range: 14-2342 bytes.</div><div class='add'>+		 */</div><div class='add'>+		__le16 len;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * MPDU or MSDU byte count for next frame.</div><div class='add'>+		 * Used for fragmentation and bursting, but not 11n aggregation.</div><div class='add'>+		 * Same as "len", but for next frame.  Set to 0 if not applicable.</div><div class='add'>+		 */</div><div class='add'>+		__le16 next_frame_len;</div><div class='add'>+</div><div class='add'>+		__le32 tx_flags;	/* TX_CMD_FLG_* */</div><div class='add'>+</div><div class='add'>+		u8 rate;</div><div class='add'>+</div><div class='add'>+		/* Index of recipient station in uCode's station table */</div><div class='add'>+		u8 sta_id;</div><div class='add'>+		u8 tid_tspec;</div><div class='add'>+		u8 sec_ctl;</div><div class='add'>+		u8 key[16];</div><div class='add'>+		union {</div><div class='add'>+			u8 byte[8];</div><div class='add'>+			__le16 word[4];</div><div class='add'>+			__le32 dw[2];</div><div class='add'>+		} tkip_mic;</div><div class='add'>+		__le32 next_frame_info;</div><div class='add'>+		union {</div><div class='add'>+			__le32 life_time;</div><div class='add'>+			__le32 attempt;</div><div class='add'>+		} stop_time;</div><div class='add'>+		u8 supp_rates[2];</div><div class='add'>+		u8 rts_retry_limit;	/*byte 50 */</div><div class='add'>+		u8 data_retry_limit;	/*byte 51 */</div><div class='add'>+		union {</div><div class='add'>+			__le16 pm_frame_timeout;</div><div class='add'>+			__le16 attempt_duration;</div><div class='add'>+		} timeout;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Duration of EDCA burst Tx Opportunity, in 32-usec units.</div><div class='add'>+		 * Set this if txop time is not specified by HCCA protocol (e.g. by AP).</div><div class='add'>+		 */</div><div class='add'>+		__le16 driver_txop;</div><div class='add'>+	);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * MAC header goes here, followed by 2 bytes padding if MAC header</div><div class='ctx'> 	 * length is 26 or 30 bytes, followed by payload data</div><div class='ctx'> 	 */</div><div class='del'>-	u8 payload[0];</div><div class='ctx'> 	struct ieee80211_hdr hdr[];</div><div class='ctx'> } __packed;</div><div class='add'>+static_assert(offsetof(struct il3945_tx_cmd, hdr) == sizeof(struct il3945_tx_cmd_hdr),</div><div class='add'>+	      "struct member likely outside of __struct_group()");</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * C_TX = 0x1c (response)</div><div class='hunk'>@@ -1436,83 +1447,87 @@ struct il_dram_scratch {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct il_tx_cmd {</div><div class='del'>-	/*</div><div class='del'>-	 * MPDU byte count:</div><div class='del'>-	 * MAC header (24/26/30/32 bytes) + 2 bytes pad if 26/30 header size,</div><div class='del'>-	 * + 8 byte IV for CCM or TKIP (not used for WEP)</div><div class='del'>-	 * + Data payload</div><div class='del'>-	 * + 8-byte MIC (not used for CCM/WEP)</div><div class='del'>-	 * NOTE:  Does not include Tx command bytes, post-MAC pad bytes,</div><div class='del'>-	 *        MIC (CCM) 8 bytes, ICV (WEP/TKIP/CKIP) 4 bytes, CRC 4 bytes.i</div><div class='del'>-	 * Range: 14-2342 bytes.</div><div class='del'>-	 */</div><div class='del'>-	__le16 len;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * MPDU or MSDU byte count for next frame.</div><div class='del'>-	 * Used for fragmentation and bursting, but not 11n aggregation.</div><div class='del'>-	 * Same as "len", but for next frame.  Set to 0 if not applicable.</div><div class='del'>-	 */</div><div class='del'>-	__le16 next_frame_len;</div><div class='del'>-</div><div class='del'>-	__le32 tx_flags;	/* TX_CMD_FLG_* */</div><div class='del'>-</div><div class='del'>-	/* uCode may modify this field of the Tx command (in host DRAM!).</div><div class='del'>-	 * Driver must also set dram_lsb_ptr and dram_msb_ptr in this cmd. */</div><div class='del'>-	struct il_dram_scratch scratch;</div><div class='del'>-</div><div class='del'>-	/* Rate for *all* Tx attempts, if TX_CMD_FLG_STA_RATE_MSK is cleared. */</div><div class='del'>-	__le32 rate_n_flags;	/* RATE_MCS_* */</div><div class='del'>-</div><div class='del'>-	/* Index of destination station in uCode's station table */</div><div class='del'>-	u8 sta_id;</div><div class='del'>-</div><div class='del'>-	/* Type of security encryption:  CCM or TKIP */</div><div class='del'>-	u8 sec_ctl;		/* TX_CMD_SEC_* */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Index into rate table (see C_TX_LINK_QUALITY_CMD) for initial</div><div class='del'>-	 * Tx attempt, if TX_CMD_FLG_STA_RATE_MSK is set.  Normally "0" for</div><div class='del'>-	 * data frames, this field may be used to selectively reduce initial</div><div class='del'>-	 * rate (via non-0 value) for special frames (e.g. management), while</div><div class='del'>-	 * still supporting rate scaling for all frames.</div><div class='del'>-	 */</div><div class='del'>-	u8 initial_rate_idx;</div><div class='del'>-	u8 reserved;</div><div class='del'>-	u8 key[16];</div><div class='del'>-	__le16 next_frame_flags;</div><div class='del'>-	__le16 reserved2;</div><div class='del'>-	union {</div><div class='del'>-		__le32 life_time;</div><div class='del'>-		__le32 attempt;</div><div class='del'>-	} stop_time;</div><div class='del'>-</div><div class='del'>-	/* Host DRAM physical address pointer to "scratch" in this command.</div><div class='del'>-	 * Must be dword aligned.  "0" in dram_lsb_ptr disables usage. */</div><div class='del'>-	__le32 dram_lsb_ptr;</div><div class='del'>-	u8 dram_msb_ptr;</div><div class='del'>-</div><div class='del'>-	u8 rts_retry_limit;	/*byte 50 */</div><div class='del'>-	u8 data_retry_limit;	/*byte 51 */</div><div class='del'>-	u8 tid_tspec;</div><div class='del'>-	union {</div><div class='del'>-		__le16 pm_frame_timeout;</div><div class='del'>-		__le16 attempt_duration;</div><div class='del'>-	} timeout;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Duration of EDCA burst Tx Opportunity, in 32-usec units.</div><div class='del'>-	 * Set this if txop time is not specified by HCCA protocol (e.g. by AP).</div><div class='del'>-	 */</div><div class='del'>-	__le16 driver_txop;</div><div class='add'>+	/* New members MUST be added within the __struct_group() macro below. */</div><div class='add'>+	__struct_group(il_tx_cmd_hdr, __hdr, __packed,</div><div class='add'>+		/*</div><div class='add'>+		 * MPDU byte count:</div><div class='add'>+		 * MAC header (24/26/30/32 bytes) + 2 bytes pad if 26/30 header size,</div><div class='add'>+		 * + 8 byte IV for CCM or TKIP (not used for WEP)</div><div class='add'>+		 * + Data payload</div><div class='add'>+		 * + 8-byte MIC (not used for CCM/WEP)</div><div class='add'>+		 * NOTE:  Does not include Tx command bytes, post-MAC pad bytes,</div><div class='add'>+		 *        MIC (CCM) 8 bytes, ICV (WEP/TKIP/CKIP) 4 bytes, CRC 4 bytes.i</div><div class='add'>+		 * Range: 14-2342 bytes.</div><div class='add'>+		 */</div><div class='add'>+		__le16 len;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * MPDU or MSDU byte count for next frame.</div><div class='add'>+		 * Used for fragmentation and bursting, but not 11n aggregation.</div><div class='add'>+		 * Same as "len", but for next frame.  Set to 0 if not applicable.</div><div class='add'>+		 */</div><div class='add'>+		__le16 next_frame_len;</div><div class='add'>+</div><div class='add'>+		__le32 tx_flags;	/* TX_CMD_FLG_* */</div><div class='add'>+</div><div class='add'>+		/* uCode may modify this field of the Tx command (in host DRAM!).</div><div class='add'>+		 * Driver must also set dram_lsb_ptr and dram_msb_ptr in this cmd. */</div><div class='add'>+		struct il_dram_scratch scratch;</div><div class='add'>+</div><div class='add'>+		/* Rate for *all* Tx attempts, if TX_CMD_FLG_STA_RATE_MSK is cleared. */</div><div class='add'>+		__le32 rate_n_flags;	/* RATE_MCS_* */</div><div class='add'>+</div><div class='add'>+		/* Index of destination station in uCode's station table */</div><div class='add'>+		u8 sta_id;</div><div class='add'>+</div><div class='add'>+		/* Type of security encryption:  CCM or TKIP */</div><div class='add'>+		u8 sec_ctl;		/* TX_CMD_SEC_* */</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Index into rate table (see C_TX_LINK_QUALITY_CMD) for initial</div><div class='add'>+		 * Tx attempt, if TX_CMD_FLG_STA_RATE_MSK is set.  Normally "0" for</div><div class='add'>+		 * data frames, this field may be used to selectively reduce initial</div><div class='add'>+		 * rate (via non-0 value) for special frames (e.g. management), while</div><div class='add'>+		 * still supporting rate scaling for all frames.</div><div class='add'>+		 */</div><div class='add'>+		u8 initial_rate_idx;</div><div class='add'>+		u8 reserved;</div><div class='add'>+		u8 key[16];</div><div class='add'>+		__le16 next_frame_flags;</div><div class='add'>+		__le16 reserved2;</div><div class='add'>+		union {</div><div class='add'>+			__le32 life_time;</div><div class='add'>+			__le32 attempt;</div><div class='add'>+		} stop_time;</div><div class='add'>+</div><div class='add'>+		/* Host DRAM physical address pointer to "scratch" in this command.</div><div class='add'>+		 * Must be dword aligned.  "0" in dram_lsb_ptr disables usage. */</div><div class='add'>+		__le32 dram_lsb_ptr;</div><div class='add'>+		u8 dram_msb_ptr;</div><div class='add'>+</div><div class='add'>+		u8 rts_retry_limit;	/*byte 50 */</div><div class='add'>+		u8 data_retry_limit;	/*byte 51 */</div><div class='add'>+		u8 tid_tspec;</div><div class='add'>+		union {</div><div class='add'>+			__le16 pm_frame_timeout;</div><div class='add'>+			__le16 attempt_duration;</div><div class='add'>+		} timeout;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Duration of EDCA burst Tx Opportunity, in 32-usec units.</div><div class='add'>+		 * Set this if txop time is not specified by HCCA protocol (e.g. by AP).</div><div class='add'>+		 */</div><div class='add'>+		__le16 driver_txop;</div><div class='add'>+	);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * MAC header goes here, followed by 2 bytes padding if MAC header</div><div class='ctx'> 	 * length is 26 or 30 bytes, followed by payload data</div><div class='ctx'> 	 */</div><div class='del'>-	u8 payload[0];</div><div class='ctx'> 	struct ieee80211_hdr hdr[];</div><div class='ctx'> } __packed;</div><div class='add'>+static_assert(offsetof(struct il_tx_cmd, hdr) == sizeof(struct il_tx_cmd_hdr),</div><div class='add'>+	      "struct member likely outside of __struct_group()");</div><div class='ctx'> </div><div class='ctx'> /* TX command response is sent after *3945* transmission attempts.</div><div class='ctx'>  *</div><div class='hunk'>@@ -1708,7 +1723,7 @@ struct il4965_tx_resp {</div><div class='ctx'> 	 */</div><div class='ctx'> 	union {</div><div class='ctx'> 		__le32 status;</div><div class='del'>-		struct agg_tx_status agg_status[0];	/* for each agg frame */</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct agg_tx_status, agg_status);	/* for each agg frame */</div><div class='ctx'> 	} u;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -2214,7 +2229,7 @@ struct il_spectrum_notification {</div><div class='ctx'> 	u8 channel;</div><div class='ctx'> 	u8 type;		/* see enum il_measurement_type */</div><div class='ctx'> 	u8 reserved1;</div><div class='del'>-	/* NOTE:  cca_ofdm, cca_cck, basic_type, and histogram are only only</div><div class='add'>+	/* NOTE:  cca_ofdm, cca_cck, basic_type, and histogram are only</div><div class='ctx'> 	 * valid if applicable for measurement type requested. */</div><div class='ctx'> 	__le32 cca_ofdm;	/* cca fraction time in 40Mhz clock periods */</div><div class='ctx'> 	__le32 cca_cck;		/* cca fraction time in 44Mhz clock periods */</div><div class='hunk'>@@ -2500,7 +2515,7 @@ struct il3945_scan_cmd {</div><div class='ctx'> </div><div class='ctx'> 	/* For active scans (set to all-0s for passive scans).</div><div class='ctx'> 	 * Does not include payload.  Must specify Tx rate; no rate scaling. */</div><div class='del'>-	struct il3945_tx_cmd tx_cmd;</div><div class='add'>+	struct il3945_tx_cmd_hdr tx_cmd;</div><div class='ctx'> </div><div class='ctx'> 	/* For directed active scans (set to all-0s otherwise) */</div><div class='ctx'> 	struct il_ssid_ie direct_scan[PROBE_OPTION_MAX_3945];</div><div class='hunk'>@@ -2544,7 +2559,7 @@ struct il_scan_cmd {</div><div class='ctx'> </div><div class='ctx'> 	/* For active scans (set to all-0s for passive scans).</div><div class='ctx'> 	 * Does not include payload.  Must specify Tx rate; no rate scaling. */</div><div class='del'>-	struct il_tx_cmd tx_cmd;</div><div class='add'>+	struct il_tx_cmd_hdr tx_cmd;</div><div class='ctx'> </div><div class='ctx'> 	/* For directed active scans (set to all-0s otherwise) */</div><div class='ctx'> 	struct il_ssid_ie direct_scan[PROBE_OPTION_MAX];</div><div class='hunk'>@@ -2660,7 +2675,7 @@ struct il4965_beacon_notif {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct il3945_tx_beacon_cmd {</div><div class='del'>-	struct il3945_tx_cmd tx;</div><div class='add'>+	struct il3945_tx_cmd_hdr tx;</div><div class='ctx'> 	__le16 tim_idx;</div><div class='ctx'> 	u8 tim_size;</div><div class='ctx'> 	u8 reserved1;</div><div class='hunk'>@@ -2668,7 +2683,7 @@ struct il3945_tx_beacon_cmd {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct il_tx_beacon_cmd {</div><div class='del'>-	struct il_tx_cmd tx;</div><div class='add'>+	struct il_tx_cmd_hdr tx;</div><div class='ctx'> 	__le16 tim_idx;</div><div class='ctx'> 	u8 tim_size;</div><div class='ctx'> 	u8 reserved1;</div><div class='hunk'>@@ -3363,7 +3378,7 @@ struct il_rx_pkt {</div><div class='ctx'> 		struct il_compressed_ba_resp compressed_ba;</div><div class='ctx'> 		struct il_missed_beacon_notif missed_beacon;</div><div class='ctx'> 		__le32 status;</div><div class='del'>-		u8 raw[0];</div><div class='add'>+		DECLARE_FLEX_ARRAY(u8, raw);</div><div class='ctx'> 	} u;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlegacy/common.c b/drivers/net/wireless/intel/iwlegacy/common.c<br/>index 219fed91cac5..b7bd3ec4cc50 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/common.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/common.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/common.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlegacy/common.c</a></div><div class='hunk'>@@ -541,6 +541,9 @@ il_leds_init(struct il_priv *il)</div><div class='ctx'> </div><div class='ctx'> 	il-&gt;led.name =</div><div class='ctx'> 	    kasprintf(GFP_KERNEL, "%s-led", wiphy_name(il-&gt;hw-&gt;wiphy));</div><div class='add'>+	if (!il-&gt;led.name)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	il-&gt;led.brightness_set = il_led_brightness_set;</div><div class='ctx'> 	il-&gt;led.blink_set = il_led_blink_set;</div><div class='ctx'> 	il-&gt;led.max_brightness = 1;</div><div class='hunk'>@@ -1863,22 +1866,22 @@ EXPORT_SYMBOL(il_send_add_sta);</div><div class='ctx'> static void</div><div class='ctx'> il_set_ht_add_station(struct il_priv *il, u8 idx, struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sta_ht_cap *sta_ht_inf = &amp;sta-&gt;ht_cap;</div><div class='add'>+	struct ieee80211_sta_ht_cap *sta_ht_inf = &amp;sta-&gt;deflink.ht_cap;</div><div class='ctx'> 	__le32 sta_flags;</div><div class='ctx'> </div><div class='ctx'> 	if (!sta || !sta_ht_inf-&gt;ht_supported)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='ctx'> 	D_ASSOC("spatial multiplexing power save mode: %s\n",</div><div class='del'>-		(sta-&gt;smps_mode == IEEE80211_SMPS_STATIC) ? "static" :</div><div class='del'>-		(sta-&gt;smps_mode == IEEE80211_SMPS_DYNAMIC) ? "dynamic" :</div><div class='add'>+		(sta-&gt;deflink.smps_mode == IEEE80211_SMPS_STATIC) ? "static" :</div><div class='add'>+		(sta-&gt;deflink.smps_mode == IEEE80211_SMPS_DYNAMIC) ? "dynamic" :</div><div class='ctx'> 		"disabled");</div><div class='ctx'> </div><div class='ctx'> 	sta_flags = il-&gt;stations[idx].sta.station_flags;</div><div class='ctx'> </div><div class='ctx'> 	sta_flags &amp;= ~(STA_FLG_RTS_MIMO_PROT_MSK | STA_FLG_MIMO_DIS_MSK);</div><div class='ctx'> </div><div class='del'>-	switch (sta-&gt;smps_mode) {</div><div class='add'>+	switch (sta-&gt;deflink.smps_mode) {</div><div class='ctx'> 	case IEEE80211_SMPS_STATIC:</div><div class='ctx'> 		sta_flags |= STA_FLG_MIMO_DIS_MSK;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1888,7 +1891,7 @@ il_set_ht_add_station(struct il_priv *il, u8 idx, struct ieee80211_sta *sta)</div><div class='ctx'> 	case IEEE80211_SMPS_OFF:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		IL_WARN("Invalid MIMO PS mode %d\n", sta-&gt;smps_mode);</div><div class='add'>+		IL_WARN("Invalid MIMO PS mode %d\n", sta-&gt;deflink.smps_mode);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1900,7 +1903,7 @@ il_set_ht_add_station(struct il_priv *il, u8 idx, struct ieee80211_sta *sta)</div><div class='ctx'> 	    cpu_to_le32((u32) sta_ht_inf-&gt;</div><div class='ctx'> 			ampdu_density &lt;&lt; STA_FLG_AGG_MPDU_DENSITY_POS);</div><div class='ctx'> </div><div class='del'>-	if (il_is_ht40_tx_allowed(il, &amp;sta-&gt;ht_cap))</div><div class='add'>+	if (il_is_ht40_tx_allowed(il, &amp;sta-&gt;deflink.ht_cap))</div><div class='ctx'> 		sta_flags |= STA_FLG_HT40_EN_MSK;</div><div class='ctx'> 	else</div><div class='ctx'> 		sta_flags &amp;= ~STA_FLG_HT40_EN_MSK;</div><div class='hunk'>@@ -2819,10 +2822,10 @@ il_cmd_queue_unmap(struct il_priv *il)</div><div class='ctx'> 		i = il_get_cmd_idx(q, q-&gt;read_ptr, 0);</div><div class='ctx'> </div><div class='ctx'> 		if (txq-&gt;meta[i].flags &amp; CMD_MAPPED) {</div><div class='del'>-			pci_unmap_single(il-&gt;pci_dev,</div><div class='add'>+			dma_unmap_single(&amp;il-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 					 dma_unmap_addr(&amp;txq-&gt;meta[i], mapping),</div><div class='ctx'> 					 dma_unmap_len(&amp;txq-&gt;meta[i], len),</div><div class='del'>-					 PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+					 DMA_BIDIRECTIONAL);</div><div class='ctx'> 			txq-&gt;meta[i].flags = 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2831,10 +2834,10 @@ il_cmd_queue_unmap(struct il_priv *il)</div><div class='ctx'> </div><div class='ctx'> 	i = q-&gt;n_win;</div><div class='ctx'> 	if (txq-&gt;meta[i].flags &amp; CMD_MAPPED) {</div><div class='del'>-		pci_unmap_single(il-&gt;pci_dev,</div><div class='add'>+		dma_unmap_single(&amp;il-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 				 dma_unmap_addr(&amp;txq-&gt;meta[i], mapping),</div><div class='ctx'> 				 dma_unmap_len(&amp;txq-&gt;meta[i], len),</div><div class='del'>-				 PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+				 DMA_BIDIRECTIONAL);</div><div class='ctx'> 		txq-&gt;meta[i].flags = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -3119,6 +3122,7 @@ il_enqueue_hcmd(struct il_priv *il, struct il_host_cmd *cmd)</div><div class='ctx'> 	struct il_cmd_meta *out_meta;</div><div class='ctx'> 	dma_addr_t phys_addr;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	u8 *out_payload;</div><div class='ctx'> 	u32 idx;</div><div class='ctx'> 	u16 fix_size;</div><div class='ctx'> </div><div class='hunk'>@@ -3154,6 +3158,16 @@ il_enqueue_hcmd(struct il_priv *il, struct il_host_cmd *cmd)</div><div class='ctx'> 	out_cmd = txq-&gt;cmd[idx];</div><div class='ctx'> 	out_meta = &amp;txq-&gt;meta[idx];</div><div class='ctx'> </div><div class='add'>+	/* The payload is in the same place in regular and huge</div><div class='add'>+	 * command buffers, but we need to let the compiler know when</div><div class='add'>+	 * we're using a larger payload buffer to avoid "field-</div><div class='add'>+	 * spanning write" warnings at run-time for huge commands.</div><div class='add'>+	 */</div><div class='add'>+	if (cmd-&gt;flags &amp; CMD_SIZE_HUGE)</div><div class='add'>+		out_payload = ((struct il_device_cmd_huge *)out_cmd)-&gt;cmd.payload;</div><div class='add'>+	else</div><div class='add'>+		out_payload = out_cmd-&gt;cmd.payload;</div><div class='add'>+</div><div class='ctx'> 	if (WARN_ON(out_meta-&gt;flags &amp; CMD_MAPPED)) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;il-&gt;hcmd_lock, flags);</div><div class='ctx'> 		return -ENOSPC;</div><div class='hunk'>@@ -3167,7 +3181,7 @@ il_enqueue_hcmd(struct il_priv *il, struct il_host_cmd *cmd)</div><div class='ctx'> 		out_meta-&gt;callback = cmd-&gt;callback;</div><div class='ctx'> </div><div class='ctx'> 	out_cmd-&gt;hdr.cmd = cmd-&gt;id;</div><div class='del'>-	memcpy(&amp;out_cmd-&gt;cmd.payload, cmd-&gt;data, cmd-&gt;len);</div><div class='add'>+	memcpy(out_payload, cmd-&gt;data, cmd-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	/* At this point, the out_cmd now has all of the incoming cmd</div><div class='ctx'> 	 * information */</div><div class='hunk'>@@ -3197,10 +3211,9 @@ il_enqueue_hcmd(struct il_priv *il, struct il_host_cmd *cmd)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	phys_addr =</div><div class='del'>-	    pci_map_single(il-&gt;pci_dev, &amp;out_cmd-&gt;hdr, fix_size,</div><div class='del'>-			   PCI_DMA_BIDIRECTIONAL);</div><div class='del'>-	if (unlikely(pci_dma_mapping_error(il-&gt;pci_dev, phys_addr))) {</div><div class='add'>+	phys_addr = dma_map_single(&amp;il-&gt;pci_dev-&gt;dev, &amp;out_cmd-&gt;hdr, fix_size,</div><div class='add'>+				   DMA_BIDIRECTIONAL);</div><div class='add'>+	if (unlikely(dma_mapping_error(&amp;il-&gt;pci_dev-&gt;dev, phys_addr))) {</div><div class='ctx'> 		idx = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3298,8 +3311,8 @@ il_tx_cmd_complete(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='ctx'> </div><div class='ctx'> 	txq-&gt;time_stamp = jiffies;</div><div class='ctx'> </div><div class='del'>-	pci_unmap_single(il-&gt;pci_dev, dma_unmap_addr(meta, mapping),</div><div class='del'>-			 dma_unmap_len(meta, len), PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+	dma_unmap_single(&amp;il-&gt;pci_dev-&gt;dev, dma_unmap_addr(meta, mapping),</div><div class='add'>+			 dma_unmap_len(meta, len), DMA_BIDIRECTIONAL);</div><div class='ctx'> </div><div class='ctx'> 	/* Input error checking is done when commands are added to queue. */</div><div class='ctx'> 	if (meta-&gt;flags &amp; CMD_WANT_SKB) {</div><div class='hunk'>@@ -3436,9 +3449,7 @@ il_init_geos(struct il_priv *il)</div><div class='ctx'> 	if (!channels)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	rates =</div><div class='del'>-	    kzalloc((sizeof(struct ieee80211_rate) * RATE_COUNT_LEGACY),</div><div class='del'>-		    GFP_KERNEL);</div><div class='add'>+	rates = kcalloc(RATE_COUNT_LEGACY, sizeof(*rates), GFP_KERNEL);</div><div class='ctx'> 	if (!rates) {</div><div class='ctx'> 		kfree(channels);</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -3904,37 +3915,6 @@ il_set_rxon_ht(struct il_priv *il, struct il_ht_config *ht_conf)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(il_set_rxon_ht);</div><div class='ctx'> </div><div class='del'>-/* Return valid, unused, channel for a passive scan to reset the RF */</div><div class='del'>-u8</div><div class='del'>-il_get_single_channel_number(struct il_priv *il, enum nl80211_band band)</div><div class='del'>-{</div><div class='del'>-	const struct il_channel_info *ch_info;</div><div class='del'>-	int i;</div><div class='del'>-	u8 channel = 0;</div><div class='del'>-	u8 min, max;</div><div class='del'>-</div><div class='del'>-	if (band == NL80211_BAND_5GHZ) {</div><div class='del'>-		min = 14;</div><div class='del'>-		max = il-&gt;channel_count;</div><div class='del'>-	} else {</div><div class='del'>-		min = 0;</div><div class='del'>-		max = 14;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = min; i &lt; max; i++) {</div><div class='del'>-		channel = il-&gt;channel_info[i].channel;</div><div class='del'>-		if (channel == le16_to_cpu(il-&gt;staging.channel))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ch_info = il_get_channel_info(il, band, channel);</div><div class='del'>-		if (il_is_channel_valid(ch_info))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return channel;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(il_get_single_channel_number);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * il_set_rxon_channel - Set the band and channel values in staging RXON</div><div class='ctx'>  * @ch: requested channel as a pointer to struct ieee80211_channel</div><div class='hunk'>@@ -4091,7 +4071,7 @@ il_chswitch_done(struct il_priv *il, bool is_success)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (test_and_clear_bit(S_CHANNEL_SWITCH_PENDING, &amp;il-&gt;status))</div><div class='del'>-		ieee80211_chswitch_done(il-&gt;vif, is_success);</div><div class='add'>+		ieee80211_chswitch_done(il-&gt;vif, is_success, 0);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(il_chswitch_done);</div><div class='ctx'> </div><div class='hunk'>@@ -4481,7 +4461,8 @@ il_clear_isr_stats(struct il_priv *il)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='del'>-il_mac_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue,</div><div class='add'>+il_mac_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+	       unsigned int link_id, u16 queue,</div><div class='ctx'> 	       const struct ieee80211_tx_queue_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct il_priv *il = hw-&gt;priv;</div><div class='hunk'>@@ -4817,13 +4798,13 @@ il_check_stuck_queue(struct il_priv *il, int cnt)</div><div class='ctx'> #define IL_WD_TICK(timeout) ((timeout) / 4)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Watchdog timer callback, we check each tx queue for stuck, if if hung</div><div class='add'>+ * Watchdog timer callback, we check each tx queue for stuck, if hung</div><div class='ctx'>  * we reset the firmware. If everything is fine just rearm the timer.</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='ctx'> il_bg_watchdog(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct il_priv *il = from_timer(il, t, watchdog);</div><div class='add'>+	struct il_priv *il = timer_container_of(il, t, watchdog);</div><div class='ctx'> 	int cnt;</div><div class='ctx'> 	unsigned long timeout;</div><div class='ctx'> </div><div class='hunk'>@@ -4861,7 +4842,7 @@ il_setup_watchdog(struct il_priv *il)</div><div class='ctx'> 		mod_timer(&amp;il-&gt;watchdog,</div><div class='ctx'> 			  jiffies + msecs_to_jiffies(IL_WD_TICK(timeout)));</div><div class='ctx'> 	else</div><div class='del'>-		del_timer(&amp;il-&gt;watchdog);</div><div class='add'>+		timer_delete(&amp;il-&gt;watchdog);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(il_setup_watchdog);</div><div class='ctx'> </div><div class='hunk'>@@ -4961,6 +4942,8 @@ il_pci_resume(struct device *device)</div><div class='ctx'> 	 */</div><div class='ctx'> 	pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);</div><div class='ctx'> </div><div class='add'>+	_il_wr(il, CSR_INT, 0xffffffff);</div><div class='add'>+	_il_wr(il, CSR_FH_INT_STATUS, 0xffffffff);</div><div class='ctx'> 	il_enable_interrupts(il);</div><div class='ctx'> </div><div class='ctx'> 	if (!(_il_rd(il, CSR_GP_CNTRL) &amp; CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW))</div><div class='hunk'>@@ -5007,7 +4990,7 @@ il_update_qos(struct il_priv *il)</div><div class='ctx'>  * il_mac_config - mac80211 config callback</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='del'>-il_mac_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+il_mac_config(struct ieee80211_hw *hw, int radio_idx, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct il_priv *il = hw-&gt;priv;</div><div class='ctx'> 	const struct il_channel_info *ch_info;</div><div class='hunk'>@@ -5174,7 +5157,7 @@ il_mac_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> 	memset(&amp;il-&gt;current_ht_config, 0, sizeof(struct il_ht_config));</div><div class='ctx'> </div><div class='ctx'> 	/* new association get rid of ibss beacon skb */</div><div class='del'>-	dev_kfree_skb(il-&gt;beacon_skb);</div><div class='add'>+	dev_consume_skb_irq(il-&gt;beacon_skb);</div><div class='ctx'> 	il-&gt;beacon_skb = NULL;</div><div class='ctx'> 	il-&gt;timestamp = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -5223,7 +5206,7 @@ il_ht_conf(struct il_priv *il, struct ieee80211_vif *vif)</div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		sta = ieee80211_find_sta(vif, bss_conf-&gt;bssid);</div><div class='ctx'> 		if (sta) {</div><div class='del'>-			struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='add'>+			struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;deflink.ht_cap;</div><div class='ctx'> 			int maxstreams;</div><div class='ctx'> </div><div class='ctx'> 			maxstreams =</div><div class='hunk'>@@ -5277,7 +5260,7 @@ il_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> 	struct il_priv *il = hw-&gt;priv;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	__le64 timestamp;</div><div class='del'>-	struct sk_buff *skb = ieee80211_beacon_get(hw, vif);</div><div class='add'>+	struct sk_buff *skb = ieee80211_beacon_get(hw, vif, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -5293,7 +5276,7 @@ il_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='del'>-	dev_kfree_skb(il-&gt;beacon_skb);</div><div class='add'>+	dev_consume_skb_irq(il-&gt;beacon_skb);</div><div class='ctx'> 	il-&gt;beacon_skb = skb;</div><div class='ctx'> </div><div class='ctx'> 	timestamp = ((struct ieee80211_mgmt *)skb-&gt;data)-&gt;u.beacon.timestamp;</div><div class='hunk'>@@ -5312,13 +5295,13 @@ il_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> il_mac_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-			struct ieee80211_bss_conf *bss_conf, u32 changes)</div><div class='add'>+			struct ieee80211_bss_conf *bss_conf, u64 changes)</div><div class='ctx'> {</div><div class='ctx'> 	struct il_priv *il = hw-&gt;priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;il-&gt;mutex);</div><div class='del'>-	D_MAC80211("enter: changes 0x%x\n", changes);</div><div class='add'>+	D_MAC80211("enter: changes 0x%llx\n", changes);</div><div class='ctx'> </div><div class='ctx'> 	if (!il_is_alive(il)) {</div><div class='ctx'> 		D_MAC80211("leave - not alive\n");</div><div class='hunk'>@@ -5428,8 +5411,8 @@ il_mac_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changes &amp; BSS_CHANGED_ASSOC) {</div><div class='del'>-		D_MAC80211("ASSOC %d\n", bss_conf-&gt;assoc);</div><div class='del'>-		if (bss_conf-&gt;assoc) {</div><div class='add'>+		D_MAC80211("ASSOC %d\n", vif-&gt;cfg.assoc);</div><div class='add'>+		if (vif-&gt;cfg.assoc) {</div><div class='ctx'> 			il-&gt;timestamp = bss_conf-&gt;sync_tsf;</div><div class='ctx'> </div><div class='ctx'> 			if (!il_is_rfkill(il))</div><div class='hunk'>@@ -5438,8 +5421,8 @@ il_mac_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 			il_set_no_assoc(il, vif);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (changes &amp;&amp; il_is_associated(il) &amp;&amp; bss_conf-&gt;aid) {</div><div class='del'>-		D_MAC80211("Changes (%#x) while associated\n", changes);</div><div class='add'>+	if (changes &amp;&amp; il_is_associated(il) &amp;&amp; vif-&gt;cfg.aid) {</div><div class='add'>+		D_MAC80211("Changes (%#llx) while associated\n", changes);</div><div class='ctx'> 		ret = il_send_rxon_assoc(il);</div><div class='ctx'> 		if (!ret) {</div><div class='ctx'> 			/* Sync active_rxon with latest change. */</div><div class='hunk'>@@ -5460,10 +5443,10 @@ il_mac_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> </div><div class='ctx'> 	if (changes &amp; BSS_CHANGED_IBSS) {</div><div class='ctx'> 		ret = il-&gt;ops-&gt;manage_ibss_station(il, vif,</div><div class='del'>-						   bss_conf-&gt;ibss_joined);</div><div class='add'>+						   vif-&gt;cfg.ibss_joined);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			IL_ERR("failed to %s IBSS station %pM\n",</div><div class='del'>-			       bss_conf-&gt;ibss_joined ? "add" : "remove",</div><div class='add'>+			       vif-&gt;cfg.ibss_joined ? "add" : "remove",</div><div class='ctx'> 			       bss_conf-&gt;bssid);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlegacy/common.h b/drivers/net/wireless/intel/iwlegacy/common.h<br/>index 40877ef1fbf2..4c9836ab11dd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/common.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlegacy/common.h</a></div><div class='hunk'>@@ -553,13 +553,25 @@ struct il_device_cmd {</div><div class='ctx'> 		u8 val8;</div><div class='ctx'> 		u16 val16;</div><div class='ctx'> 		u32 val32;</div><div class='del'>-		struct il_tx_cmd tx;</div><div class='add'>+		struct il_tx_cmd_hdr tx;</div><div class='ctx'> 		u8 payload[DEF_CMD_PAYLOAD_SIZE];</div><div class='ctx'> 	} __packed cmd;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define TFD_MAX_PAYLOAD_SIZE (sizeof(struct il_device_cmd))</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct il_device_cmd_huge</div><div class='add'>+ *</div><div class='add'>+ * For use when sending huge commands.</div><div class='add'>+ */</div><div class='add'>+struct il_device_cmd_huge {</div><div class='add'>+	struct il_cmd_header hdr;	/* uCode API */</div><div class='add'>+	union {</div><div class='add'>+		u8 payload[IL_MAX_CMD_SIZE - sizeof(struct il_cmd_header)];</div><div class='add'>+	} __packed cmd;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct il_host_cmd {</div><div class='ctx'> 	const void *data;</div><div class='ctx'> 	unsigned long reply_page;</div><div class='hunk'>@@ -1683,7 +1695,8 @@ struct il_cfg {</div><div class='ctx'>  ***************************/</div><div class='ctx'> </div><div class='ctx'> int il_mac_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-		   u16 queue, const struct ieee80211_tx_queue_params *params);</div><div class='add'>+		   unsigned int link_id, u16 queue,</div><div class='add'>+		   const struct ieee80211_tx_queue_params *params);</div><div class='ctx'> int il_mac_tx_last_beacon(struct ieee80211_hw *hw);</div><div class='ctx'> </div><div class='ctx'> void il_set_rxon_hwcrypto(struct il_priv *il, int hw_decrypt);</div><div class='hunk'>@@ -1692,7 +1705,6 @@ int il_full_rxon_required(struct il_priv *il);</div><div class='ctx'> int il_set_rxon_channel(struct il_priv *il, struct ieee80211_channel *ch);</div><div class='ctx'> void il_set_flags_for_band(struct il_priv *il, enum nl80211_band band,</div><div class='ctx'> 			   struct ieee80211_vif *vif);</div><div class='del'>-u8 il_get_single_channel_number(struct il_priv *il, enum nl80211_band band);</div><div class='ctx'> void il_set_rxon_ht(struct il_priv *il, struct il_ht_config *ht_conf);</div><div class='ctx'> bool il_is_ht40_tx_allowed(struct il_priv *il,</div><div class='ctx'> 			   struct ieee80211_sta_ht_cap *ht_cap);</div><div class='hunk'>@@ -1944,10 +1956,10 @@ il_get_hw_mode(struct il_priv *il, enum nl80211_band band)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* mac80211 handlers */</div><div class='del'>-int il_mac_config(struct ieee80211_hw *hw, u32 changed);</div><div class='add'>+int il_mac_config(struct ieee80211_hw *hw, int radio_idx, u32 changed);</div><div class='ctx'> void il_mac_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif);</div><div class='ctx'> void il_mac_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-			     struct ieee80211_bss_conf *bss_conf, u32 changes);</div><div class='add'>+			     struct ieee80211_bss_conf *bss_conf, u64 changes);</div><div class='ctx'> void il_tx_cmd_protection(struct il_priv *il, struct ieee80211_tx_info *info,</div><div class='ctx'> 			  __le16 fc, __le32 *tx_flags);</div><div class='ctx'> </div><div class='hunk'>@@ -2803,9 +2815,7 @@ struct il_lq_sta {</div><div class='ctx'> 	struct il_scale_tbl_info lq_info[LQ_SIZE];	/* "active", "search" */</div><div class='ctx'> 	struct il_traffic_load load[TID_MAX_LOAD_COUNT];</div><div class='ctx'> 	u8 tx_agg_tid_en;</div><div class='del'>-#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='ctx'> 	u32 dbg_fixed_rate;</div><div class='del'>-#endif</div><div class='ctx'> 	struct il_priv *drv;</div><div class='ctx'> </div><div class='ctx'> 	/* used to be in sta_info */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlegacy/iwl-spectrum.h b/drivers/net/wireless/intel/iwlegacy/iwl-spectrum.h<br/>index 1e8ab704dbfb..f00eb878b94b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/iwl-spectrum.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlegacy/iwl-spectrum.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlegacy/iwl-spectrum.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlegacy/iwl-spectrum.h</a></div><div class='hunk'>@@ -50,28 +50,4 @@ struct ieee80211_measurement_params {</div><div class='ctx'> 	__le16 duration;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct ieee80211_info_element {</div><div class='del'>-	u8 id;</div><div class='del'>-	u8 len;</div><div class='del'>-	u8 data[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct ieee80211_measurement_request {</div><div class='del'>-	struct ieee80211_info_element ie;</div><div class='del'>-	u8 token;</div><div class='del'>-	u8 mode;</div><div class='del'>-	u8 type;</div><div class='del'>-	struct ieee80211_measurement_params params[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct ieee80211_measurement_report {</div><div class='del'>-	struct ieee80211_info_element ie;</div><div class='del'>-	u8 token;</div><div class='del'>-	u8 mode;</div><div class='del'>-	u8 type;</div><div class='del'>-	union {</div><div class='del'>-		struct ieee80211_basic_report basic[0];</div><div class='del'>-	} u;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/Kconfig b/drivers/net/wireless/intel/iwlwifi/Kconfig<br/>index 1085afbefba8..153a8368b412 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/Kconfig</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> config IWLWIFI</div><div class='ctx'> 	tristate "Intel Wireless WiFi Next Gen AGN - Wireless-N/Advanced-N/Ultimate-N (iwlwifi) "</div><div class='ctx'> 	depends on PCI &amp;&amp; HAS_IOMEM &amp;&amp; CFG80211</div><div class='add'>+	depends on IWLMEI || !IWLMEI</div><div class='ctx'> 	select FW_LOADER</div><div class='ctx'> 	help</div><div class='ctx'> 	  Select to build the driver supporting the:</div><div class='hunk'>@@ -45,9 +46,18 @@ config IWLWIFI</div><div class='ctx'> </div><div class='ctx'> if IWLWIFI</div><div class='ctx'> </div><div class='add'>+config IWLWIFI_KUNIT_TESTS</div><div class='add'>+	tristate</div><div class='add'>+	depends on KUNIT</div><div class='add'>+	default KUNIT_ALL_TESTS</div><div class='add'>+	help</div><div class='add'>+	  Enable this option for iwlwifi kunit tests.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config IWLWIFI_LEDS</div><div class='ctx'> 	bool</div><div class='del'>-	depends on LEDS_CLASS=y || LEDS_CLASS=IWLWIFI</div><div class='add'>+	depends on LEDS_CLASS=y || LEDS_CLASS=MAC80211</div><div class='ctx'> 	depends on IWLMVM || IWLDVM</div><div class='ctx'> 	select LEDS_TRIGGERS</div><div class='ctx'> 	select MAC80211_LEDS</div><div class='hunk'>@@ -65,32 +75,32 @@ config IWLMVM</div><div class='ctx'> 	tristate "Intel Wireless WiFi MVM Firmware support"</div><div class='ctx'> 	select WANT_DEV_COREDUMP</div><div class='ctx'> 	depends on MAC80211</div><div class='add'>+	depends on PTP_1588_CLOCK_OPTIONAL</div><div class='ctx'> 	help</div><div class='ctx'> 	  This is the driver that supports the MVM firmware. The list</div><div class='ctx'> 	  of the devices that use this firmware is available here:</div><div class='ctx'> 	  https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi#firmware</div><div class='ctx'> </div><div class='add'>+config IWLMLD</div><div class='add'>+	tristate "Intel Wireless WiFi MLD Firmware support"</div><div class='add'>+	select WANT_DEV_COREDUMP</div><div class='add'>+	depends on MAC80211</div><div class='add'>+	depends on PTP_1588_CLOCK_OPTIONAL</div><div class='add'>+	help</div><div class='add'>+	  This is the driver that supports firmwares of MLD capable devices.</div><div class='add'>+	  The list of the devices that use this firmware is available here:</div><div class='add'>+	  https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi#firmware</div><div class='add'>+</div><div class='ctx'> # don't call it _MODULE -- will confuse Kconfig/fixdep/...</div><div class='ctx'> config IWLWIFI_OPMODE_MODULAR</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y if IWLDVM=m</div><div class='ctx'> 	default y if IWLMVM=m</div><div class='add'>+	default y if IWLMLD=m</div><div class='add'>+	default y if IWLWIFI_KUNIT_TESTS=m</div><div class='ctx'> </div><div class='del'>-comment "WARNING: iwlwifi is useless without IWLDVM or IWLMVM"</div><div class='del'>-	depends on IWLDVM=n &amp;&amp; IWLMVM=n</div><div class='del'>-</div><div class='del'>-config IWLWIFI_BCAST_FILTERING</div><div class='del'>-	bool "Enable broadcast filtering"</div><div class='del'>-	depends on IWLMVM</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to enable default bcast filtering configuration.</div><div class='del'>-</div><div class='del'>-	  Enabling broadcast filtering will drop any incoming wireless</div><div class='del'>-	  broadcast frames, except some very specific predefined</div><div class='del'>-	  patterns (e.g. incoming arp requests).</div><div class='del'>-</div><div class='del'>-	  If unsure, don't enable this option, as some programs might</div><div class='del'>-	  expect incoming broadcasts for their normal operations.</div><div class='add'>+comment "WARNING: iwlwifi is useless without IWLDVM or IWLMVM or IWLMLD"</div><div class='add'>+	depends on IWLDVM=n &amp;&amp; IWLMVM=n &amp;&amp; IWLMLD=n</div><div class='ctx'> </div><div class='ctx'> menu "Debugging Options"</div><div class='ctx'> </div><div class='hunk'>@@ -146,3 +156,30 @@ config IWLWIFI_DEVICE_TRACING</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> endif</div><div class='add'>+</div><div class='add'>+config IWLMEI</div><div class='add'>+	tristate "Intel Management Engine communication over WLAN"</div><div class='add'>+	depends on INTEL_MEI</div><div class='add'>+	depends on PM</div><div class='add'>+	depends on CFG80211</div><div class='add'>+	depends on BROKEN</div><div class='add'>+	help</div><div class='add'>+	  Enables the iwlmei kernel module.</div><div class='add'>+</div><div class='add'>+	  CSME stands for Converged Security and Management Engine. It is a CPU</div><div class='add'>+	  on the chipset and runs a dedicated firmware. AMT (Active Management</div><div class='add'>+	  Technology) is one of the applications that run on that CPU. AMT</div><div class='add'>+	  allows to control the platform remotely.</div><div class='add'>+</div><div class='add'>+	  This kernel module allows to communicate with the Intel Management</div><div class='add'>+	  Engine over Wifi. This is supported starting from Tiger Lake</div><div class='add'>+	  platforms and has been tested on 9260 devices only.</div><div class='add'>+	  If AMT is configured not to use the wireless device, this module is</div><div class='add'>+	  harmless (and useless).</div><div class='add'>+	  Enabling this option on a platform that has a different device and</div><div class='add'>+	  has Wireless enabled on AMT can prevent WiFi from working correctly.</div><div class='add'>+</div><div class='add'>+	  For more information see</div><div class='add'>+	  &lt;https://software.intel.com/en-us/manageability/&gt;</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/Makefile b/drivers/net/wireless/intel/iwlwifi/Makefile<br/>index 14b0db28143b..941257b811b4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/Makefile</a></div><div class='hunk'>@@ -4,21 +4,40 @@ obj-$(CONFIG_IWLWIFI)	+= iwlwifi.o</div><div class='ctx'> iwlwifi-objs		+= iwl-io.o</div><div class='ctx'> iwlwifi-objs		+= iwl-drv.o</div><div class='ctx'> iwlwifi-objs		+= iwl-debug.o</div><div class='del'>-iwlwifi-objs		+= iwl-eeprom-read.o iwl-eeprom-parse.o</div><div class='add'>+iwlwifi-objs		+= iwl-nvm-utils.o</div><div class='add'>+iwlwifi-objs		+= iwl-utils.o</div><div class='ctx'> iwlwifi-objs		+= iwl-phy-db.o iwl-nvm-parse.o</div><div class='del'>-iwlwifi-objs		+= pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o</div><div class='del'>-iwlwifi-objs		+= pcie/ctxt-info.o pcie/ctxt-info-gen3.o</div><div class='del'>-iwlwifi-objs		+= pcie/trans-gen2.o pcie/tx-gen2.o</div><div class='del'>-iwlwifi-$(CONFIG_IWLDVM) += cfg/1000.o cfg/2000.o cfg/5000.o cfg/6000.o</div><div class='del'>-iwlwifi-$(CONFIG_IWLMVM) += cfg/7000.o cfg/8000.o cfg/9000.o cfg/22000.o</div><div class='add'>+</div><div class='add'>+# Bus</div><div class='add'>+iwlwifi-objs		+= pcie/ctxt-info.o pcie/ctxt-info-v2.o pcie/drv.o pcie/utils.o</div><div class='add'>+iwlwifi-objs		+= pcie/gen1_2/rx.o pcie/gen1_2/tx.o pcie/gen1_2/trans.o</div><div class='add'>+iwlwifi-objs		+= pcie/gen1_2/trans-gen2.o pcie/gen1_2/tx-gen2.o</div><div class='add'>+</div><div class='add'>+CFLAGS_pcie/drv.o += -Wno-override-init</div><div class='add'>+</div><div class='add'>+# combined MAC/RF configurations</div><div class='add'>+iwlwifi-$(CONFIG_IWLDVM) += cfg/1000.o cfg/2000.o</div><div class='add'>+iwlwifi-$(CONFIG_IWLDVM) += cfg/5000.o cfg/6000.o</div><div class='add'>+iwlwifi-$(CONFIG_IWLMVM) += cfg/7000.o cfg/8000.o</div><div class='add'>+# MAC configurations</div><div class='add'>+iwlwifi-$(CONFIG_IWLMVM) += cfg/9000.o cfg/22000.o</div><div class='add'>+iwlwifi-$(CONFIG_IWLMVM) += cfg/ax210.o</div><div class='add'>+iwlwifi-$(CONFIG_IWLMVM) += cfg/bz.o cfg/sc.o</div><div class='add'>+iwlwifi-$(CONFIG_IWLMLD) += cfg/bz.o cfg/sc.o cfg/dr.o</div><div class='add'>+# RF configurations</div><div class='add'>+iwlwifi-$(CONFIG_IWLMVM) += cfg/rf-jf.o cfg/rf-hr.o cfg/rf-gf.o</div><div class='add'>+iwlwifi-$(CONFIG_IWLMLD) += cfg/rf-fm.o cfg/rf-wh.o cfg/rf-pe.o</div><div class='add'>+</div><div class='ctx'> iwlwifi-objs		+= iwl-dbg-tlv.o</div><div class='ctx'> iwlwifi-objs		+= iwl-trans.o</div><div class='del'>-iwlwifi-objs		+= queue/tx.o</div><div class='ctx'> </div><div class='del'>-iwlwifi-objs		+= fw/img.o fw/notif-wait.o</div><div class='del'>-iwlwifi-objs		+= fw/dbg.o fw/pnvm.o</div><div class='add'>+iwlwifi-objs		+= fw/img.o fw/notif-wait.o fw/rs.o</div><div class='add'>+iwlwifi-objs		+= fw/dbg.o fw/pnvm.o fw/dump.o</div><div class='add'>+iwlwifi-objs		+= fw/regulatory.o</div><div class='ctx'> iwlwifi-$(CONFIG_IWLMVM) += fw/paging.o fw/smem.o fw/init.o</div><div class='add'>+iwlwifi-$(CONFIG_IWLMLD) += fw/smem.o fw/init.o</div><div class='ctx'> iwlwifi-$(CONFIG_ACPI) += fw/acpi.o</div><div class='add'>+iwlwifi-$(CONFIG_EFI)	+= fw/uefi.o</div><div class='ctx'> iwlwifi-$(CONFIG_IWLWIFI_DEBUGFS) += fw/debugfs.o</div><div class='ctx'> </div><div class='ctx'> iwlwifi-objs += $(iwlwifi-m)</div><div class='hunk'>@@ -29,5 +48,9 @@ ccflags-y += -I$(src)</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_IWLDVM)	+= dvm/</div><div class='ctx'> obj-$(CONFIG_IWLMVM)	+= mvm/</div><div class='add'>+obj-$(CONFIG_IWLMEI)	+= mei/</div><div class='add'>+obj-$(CONFIG_IWLMLD)	+= mld/</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_IWLWIFI_KUNIT_TESTS) += tests/</div><div class='ctx'> </div><div class='ctx'> CFLAGS_iwl-devtrace.o := -I$(src)</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/1000.c b/drivers/net/wireless/intel/iwlwifi/cfg/1000.c<br/>index 44c4fe975390..c029e595e7c2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/1000.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/1000.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/1000.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/cfg/1000.c</a></div><div class='hunk'>@@ -2,12 +2,7 @@</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.</div><div class='del'>- * Copyright(c) 2018 - 2020 Intel Corporation</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='add'>+ * Copyright(c) 2018 - 2020, 2023, 2025 Intel Corporation</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -27,14 +22,14 @@</div><div class='ctx'> #define EEPROM_1000_TX_POWER_VERSION	(4)</div><div class='ctx'> #define EEPROM_1000_EEPROM_VERSION	(0x15C)</div><div class='ctx'> </div><div class='del'>-#define IWL1000_FW_PRE "iwlwifi-1000-"</div><div class='del'>-#define IWL1000_MODULE_FIRMWARE(api) IWL1000_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+#define IWL1000_FW_PRE "iwlwifi-1000"</div><div class='add'>+#define IWL1000_MODULE_FIRMWARE(api) IWL1000_FW_PRE "-" __stringify(api) ".ucode"</div><div class='ctx'> </div><div class='del'>-#define IWL100_FW_PRE "iwlwifi-100-"</div><div class='del'>-#define IWL100_MODULE_FIRMWARE(api) IWL100_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+#define IWL100_FW_PRE "iwlwifi-100"</div><div class='add'>+#define IWL100_MODULE_FIRMWARE(api) IWL100_FW_PRE "-" __stringify(api) ".ucode"</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static const struct iwl_base_params iwl1000_base_params = {</div><div class='add'>+static const struct iwl_family_base_params iwl1000_base = {</div><div class='ctx'> 	.num_of_queues = IWLAGN_NUM_QUEUES,</div><div class='ctx'> 	.max_tfd_queue_size = 256,</div><div class='ctx'> 	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,</div><div class='hunk'>@@ -47,12 +42,6 @@ static const struct iwl_base_params iwl1000_base_params = {</div><div class='ctx'> 	.scd_chain_ext_wa = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct iwl_ht_params iwl1000_ht_params = {</div><div class='del'>-	.ht_greenfield_support = true,</div><div class='del'>-	.use_rts_for_aggregation = true, /* use rts/cts protection */</div><div class='del'>-	.ht40_bands = BIT(NL80211_BAND_2GHZ),</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct iwl_eeprom_params iwl1000_eeprom_params = {</div><div class='ctx'> 	.regulatory_bands = {</div><div class='ctx'> 		EEPROM_REG_BAND_1_CHANNELS,</div><div class='hunk'>@@ -65,54 +54,67 @@ static const struct iwl_eeprom_params iwl1000_eeprom_params = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+const struct iwl_mac_cfg iwl1000_mac_cfg = {</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_1000,</div><div class='add'>+	.base = &amp;iwl1000_base,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define IWL_DEVICE_1000						\</div><div class='ctx'> 	.fw_name_pre = IWL1000_FW_PRE,				\</div><div class='ctx'> 	.ucode_api_max = IWL1000_UCODE_API_MAX,			\</div><div class='ctx'> 	.ucode_api_min = IWL1000_UCODE_API_MIN,			\</div><div class='del'>-	.trans.device_family = IWL_DEVICE_FAMILY_1000,		\</div><div class='ctx'> 	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\</div><div class='ctx'> 	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\</div><div class='ctx'> 	.nvm_ver = EEPROM_1000_EEPROM_VERSION,		\</div><div class='ctx'> 	.nvm_calib_ver = EEPROM_1000_TX_POWER_VERSION,	\</div><div class='del'>-	.trans.base_params = &amp;iwl1000_base_params,		\</div><div class='ctx'> 	.eeprom_params = &amp;iwl1000_eeprom_params,		\</div><div class='ctx'> 	.led_mode = IWL_LED_BLINK</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl1000_bgn_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Wireless-N 1000 BGN",</div><div class='add'>+const struct iwl_rf_cfg iwl1000_bgn_cfg = {</div><div class='ctx'> 	IWL_DEVICE_1000,</div><div class='del'>-	.ht_params = &amp;iwl1000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.ht_greenfield_support = true,</div><div class='add'>+		.use_rts_for_aggregation = true, /* use rts/cts protection */</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ),</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl1000_bg_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Wireless-N 1000 BG",</div><div class='add'>+const char iwl1000_bgn_name[] = "Intel(R) Centrino(R) Wireless-N 1000 BGN";</div><div class='add'>+</div><div class='add'>+const struct iwl_rf_cfg iwl1000_bg_cfg = {</div><div class='ctx'> 	IWL_DEVICE_1000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+const char iwl1000_bg_name[] = "Intel(R) Centrino(R) Wireless-N 1000 BG";</div><div class='add'>+</div><div class='ctx'> #define IWL_DEVICE_100						\</div><div class='ctx'> 	.fw_name_pre = IWL100_FW_PRE,				\</div><div class='ctx'> 	.ucode_api_max = IWL100_UCODE_API_MAX,			\</div><div class='ctx'> 	.ucode_api_min = IWL100_UCODE_API_MIN,			\</div><div class='del'>-	.trans.device_family = IWL_DEVICE_FAMILY_100,		\</div><div class='ctx'> 	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\</div><div class='ctx'> 	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\</div><div class='ctx'> 	.nvm_ver = EEPROM_1000_EEPROM_VERSION,		\</div><div class='ctx'> 	.nvm_calib_ver = EEPROM_1000_TX_POWER_VERSION,	\</div><div class='del'>-	.trans.base_params = &amp;iwl1000_base_params,		\</div><div class='ctx'> 	.eeprom_params = &amp;iwl1000_eeprom_params,		\</div><div class='ctx'> 	.led_mode = IWL_LED_RF_STATE,				\</div><div class='ctx'> 	.rx_with_siso_diversity = true</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl100_bgn_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Wireless-N 100 BGN",</div><div class='add'>+const struct iwl_rf_cfg iwl100_bgn_cfg = {</div><div class='ctx'> 	IWL_DEVICE_100,</div><div class='del'>-	.ht_params = &amp;iwl1000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.ht_greenfield_support = true,</div><div class='add'>+		.use_rts_for_aggregation = true, /* use rts/cts protection */</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ),</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl100_bg_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Wireless-N 100 BG",</div><div class='add'>+const char iwl100_bgn_name[] = "Intel(R) Centrino(R) Wireless-N 100 BGN";</div><div class='add'>+</div><div class='add'>+const struct iwl_rf_cfg iwl100_bg_cfg = {</div><div class='ctx'> 	IWL_DEVICE_100,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+const char iwl100_bg_name[] = "Intel(R) Centrino(R) Wireless-N 100 BG";</div><div class='add'>+</div><div class='ctx'> MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));</div><div class='ctx'> MODULE_FIRMWARE(IWL100_MODULE_FIRMWARE(IWL100_UCODE_API_MAX));</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/2000.c b/drivers/net/wireless/intel/iwlwifi/cfg/2000.c<br/>index df6ac00340b2..47554a5f406e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/2000.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/2000.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/2000.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/cfg/2000.c</a></div><div class='hunk'>@@ -2,12 +2,7 @@</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.</div><div class='del'>- * Copyright(c) 2018 - 2020 Intel Corporation</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='add'>+ * Copyright(c) 2018 - 2020, 2023, 2025 Intel Corporation</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -33,19 +28,19 @@</div><div class='ctx'> #define EEPROM_2000_EEPROM_VERSION	(0x805)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define IWL2030_FW_PRE "iwlwifi-2030-"</div><div class='del'>-#define IWL2030_MODULE_FIRMWARE(api) IWL2030_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+#define IWL2030_FW_PRE "iwlwifi-2030"</div><div class='add'>+#define IWL2030_MODULE_FIRMWARE(api) IWL2030_FW_PRE "-" __stringify(api) ".ucode"</div><div class='ctx'> </div><div class='del'>-#define IWL2000_FW_PRE "iwlwifi-2000-"</div><div class='del'>-#define IWL2000_MODULE_FIRMWARE(api) IWL2000_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+#define IWL2000_FW_PRE "iwlwifi-2000"</div><div class='add'>+#define IWL2000_MODULE_FIRMWARE(api) IWL2000_FW_PRE "-" __stringify(api) ".ucode"</div><div class='ctx'> </div><div class='del'>-#define IWL105_FW_PRE "iwlwifi-105-"</div><div class='del'>-#define IWL105_MODULE_FIRMWARE(api) IWL105_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+#define IWL105_FW_PRE "iwlwifi-105"</div><div class='add'>+#define IWL105_MODULE_FIRMWARE(api) IWL105_FW_PRE "-" __stringify(api) ".ucode"</div><div class='ctx'> </div><div class='del'>-#define IWL135_FW_PRE "iwlwifi-135-"</div><div class='del'>-#define IWL135_MODULE_FIRMWARE(api) IWL135_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+#define IWL135_FW_PRE "iwlwifi-135"</div><div class='add'>+#define IWL135_MODULE_FIRMWARE(api) IWL135_FW_PRE "-" __stringify(api) ".ucode"</div><div class='ctx'> </div><div class='del'>-static const struct iwl_base_params iwl2000_base_params = {</div><div class='add'>+static const struct iwl_family_base_params iwl2000_base = {</div><div class='ctx'> 	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,</div><div class='ctx'> 	.num_of_queues = IWLAGN_NUM_QUEUES,</div><div class='ctx'> 	.max_tfd_queue_size = 256,</div><div class='hunk'>@@ -59,7 +54,7 @@ static const struct iwl_base_params iwl2000_base_params = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static const struct iwl_base_params iwl2030_base_params = {</div><div class='add'>+static const struct iwl_family_base_params iwl2030_base = {</div><div class='ctx'> 	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,</div><div class='ctx'> 	.num_of_queues = IWLAGN_NUM_QUEUES,</div><div class='ctx'> 	.max_tfd_queue_size = 256,</div><div class='hunk'>@@ -72,12 +67,6 @@ static const struct iwl_base_params iwl2030_base_params = {</div><div class='ctx'> 	.scd_chain_ext_wa = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct iwl_ht_params iwl2000_ht_params = {</div><div class='del'>-	.ht_greenfield_support = true,</div><div class='del'>-	.use_rts_for_aggregation = true, /* use rts/cts protection */</div><div class='del'>-	.ht40_bands = BIT(NL80211_BAND_2GHZ),</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct iwl_eeprom_params iwl20x0_eeprom_params = {</div><div class='ctx'> 	.regulatory_bands = {</div><div class='ctx'> 		EEPROM_REG_BAND_1_CHANNELS,</div><div class='hunk'>@@ -91,97 +80,119 @@ static const struct iwl_eeprom_params iwl20x0_eeprom_params = {</div><div class='ctx'> 	.enhanced_txpower = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+const struct iwl_mac_cfg iwl2000_mac_cfg = {</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_2000,</div><div class='add'>+	.base = &amp;iwl2000_base,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define IWL_DEVICE_2000						\</div><div class='ctx'> 	.fw_name_pre = IWL2000_FW_PRE,				\</div><div class='ctx'> 	.ucode_api_max = IWL2000_UCODE_API_MAX,			\</div><div class='ctx'> 	.ucode_api_min = IWL2000_UCODE_API_MIN,			\</div><div class='del'>-	.trans.device_family = IWL_DEVICE_FAMILY_2000,		\</div><div class='ctx'> 	.max_inst_size = IWL60_RTC_INST_SIZE,			\</div><div class='ctx'> 	.max_data_size = IWL60_RTC_DATA_SIZE,			\</div><div class='ctx'> 	.nvm_ver = EEPROM_2000_EEPROM_VERSION,			\</div><div class='ctx'> 	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,		\</div><div class='del'>-	.trans.base_params = &amp;iwl2000_base_params,		\</div><div class='ctx'> 	.eeprom_params = &amp;iwl20x0_eeprom_params,		\</div><div class='ctx'> 	.led_mode = IWL_LED_RF_STATE</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl2000_2bgn_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Wireless-N 2200 BGN",</div><div class='add'>+const struct iwl_rf_cfg iwl2000_2bgn_cfg = {</div><div class='ctx'> 	IWL_DEVICE_2000,</div><div class='del'>-	.ht_params = &amp;iwl2000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.ht_greenfield_support = true,</div><div class='add'>+		.use_rts_for_aggregation = true, /* use rts/cts protection */</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ),</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl2000_2bgn_d_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Wireless-N 2200D BGN",</div><div class='del'>-	IWL_DEVICE_2000,</div><div class='del'>-	.ht_params = &amp;iwl2000_ht_params,</div><div class='add'>+const char iwl2000_2bgn_name[] = "Intel(R) Centrino(R) Wireless-N 2200 BGN";</div><div class='add'>+const char iwl2000_2bgn_d_name[] = "Intel(R) Centrino(R) Wireless-N 2200D BGN";</div><div class='add'>+</div><div class='add'>+const struct iwl_mac_cfg iwl2030_mac_cfg = {</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_2030,</div><div class='add'>+	.base = &amp;iwl2030_base,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IWL_DEVICE_2030						\</div><div class='ctx'> 	.fw_name_pre = IWL2030_FW_PRE,				\</div><div class='ctx'> 	.ucode_api_max = IWL2030_UCODE_API_MAX,			\</div><div class='ctx'> 	.ucode_api_min = IWL2030_UCODE_API_MIN,			\</div><div class='del'>-	.trans.device_family = IWL_DEVICE_FAMILY_2030,		\</div><div class='ctx'> 	.max_inst_size = IWL60_RTC_INST_SIZE,			\</div><div class='ctx'> 	.max_data_size = IWL60_RTC_DATA_SIZE,			\</div><div class='ctx'> 	.nvm_ver = EEPROM_2000_EEPROM_VERSION,		\</div><div class='ctx'> 	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\</div><div class='del'>-	.trans.base_params = &amp;iwl2030_base_params,		\</div><div class='ctx'> 	.eeprom_params = &amp;iwl20x0_eeprom_params,		\</div><div class='ctx'> 	.led_mode = IWL_LED_RF_STATE</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl2030_2bgn_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Wireless-N 2230 BGN",</div><div class='add'>+const struct iwl_rf_cfg iwl2030_2bgn_cfg = {</div><div class='ctx'> 	IWL_DEVICE_2030,</div><div class='del'>-	.ht_params = &amp;iwl2000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.ht_greenfield_support = true,</div><div class='add'>+		.use_rts_for_aggregation = true, /* use rts/cts protection */</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char iwl2030_2bgn_name[] = "Intel(R) Centrino(R) Wireless-N 2230 BGN";</div><div class='add'>+</div><div class='add'>+const struct iwl_mac_cfg iwl105_mac_cfg = {</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_105,</div><div class='add'>+	.base = &amp;iwl2000_base,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IWL_DEVICE_105						\</div><div class='ctx'> 	.fw_name_pre = IWL105_FW_PRE,				\</div><div class='ctx'> 	.ucode_api_max = IWL105_UCODE_API_MAX,			\</div><div class='ctx'> 	.ucode_api_min = IWL105_UCODE_API_MIN,			\</div><div class='del'>-	.trans.device_family = IWL_DEVICE_FAMILY_105,		\</div><div class='ctx'> 	.max_inst_size = IWL60_RTC_INST_SIZE,			\</div><div class='ctx'> 	.max_data_size = IWL60_RTC_DATA_SIZE,			\</div><div class='ctx'> 	.nvm_ver = EEPROM_2000_EEPROM_VERSION,		\</div><div class='ctx'> 	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\</div><div class='del'>-	.trans.base_params = &amp;iwl2000_base_params,		\</div><div class='ctx'> 	.eeprom_params = &amp;iwl20x0_eeprom_params,		\</div><div class='ctx'> 	.led_mode = IWL_LED_RF_STATE,				\</div><div class='ctx'> 	.rx_with_siso_diversity = true</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl105_bgn_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Wireless-N 105 BGN",</div><div class='add'>+const struct iwl_rf_cfg iwl105_bgn_cfg = {</div><div class='ctx'> 	IWL_DEVICE_105,</div><div class='del'>-	.ht_params = &amp;iwl2000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.ht_greenfield_support = true,</div><div class='add'>+		.use_rts_for_aggregation = true, /* use rts/cts protection */</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ),</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl105_bgn_d_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Wireless-N 105D BGN",</div><div class='del'>-	IWL_DEVICE_105,</div><div class='del'>-	.ht_params = &amp;iwl2000_ht_params,</div><div class='add'>+const char iwl105_bgn_name[] = "Intel(R) Centrino(R) Wireless-N 105 BGN";</div><div class='add'>+const char iwl105_bgn_d_name[] = "Intel(R) Centrino(R) Wireless-N 105D BGN";</div><div class='add'>+</div><div class='add'>+const struct iwl_mac_cfg iwl135_mac_cfg = {</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_135,</div><div class='add'>+	.base = &amp;iwl2030_base,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IWL_DEVICE_135						\</div><div class='ctx'> 	.fw_name_pre = IWL135_FW_PRE,				\</div><div class='ctx'> 	.ucode_api_max = IWL135_UCODE_API_MAX,			\</div><div class='ctx'> 	.ucode_api_min = IWL135_UCODE_API_MIN,			\</div><div class='del'>-	.trans.device_family = IWL_DEVICE_FAMILY_135,		\</div><div class='ctx'> 	.max_inst_size = IWL60_RTC_INST_SIZE,			\</div><div class='ctx'> 	.max_data_size = IWL60_RTC_DATA_SIZE,			\</div><div class='ctx'> 	.nvm_ver = EEPROM_2000_EEPROM_VERSION,		\</div><div class='ctx'> 	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\</div><div class='del'>-	.trans.base_params = &amp;iwl2030_base_params,		\</div><div class='ctx'> 	.eeprom_params = &amp;iwl20x0_eeprom_params,		\</div><div class='ctx'> 	.led_mode = IWL_LED_RF_STATE,				\</div><div class='ctx'> 	.rx_with_siso_diversity = true</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl135_bgn_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Wireless-N 135 BGN",</div><div class='add'>+const struct iwl_rf_cfg iwl135_bgn_cfg = {</div><div class='ctx'> 	IWL_DEVICE_135,</div><div class='del'>-	.ht_params = &amp;iwl2000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.ht_greenfield_support = true,</div><div class='add'>+		.use_rts_for_aggregation = true, /* use rts/cts protection */</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ),</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+const char iwl135_bgn_name[] = "Intel(R) Centrino(R) Wireless-N 135 BGN";</div><div class='add'>+</div><div class='ctx'> MODULE_FIRMWARE(IWL2000_MODULE_FIRMWARE(IWL2000_UCODE_API_MAX));</div><div class='ctx'> MODULE_FIRMWARE(IWL2030_MODULE_FIRMWARE(IWL2030_UCODE_API_MAX));</div><div class='ctx'> MODULE_FIRMWARE(IWL105_MODULE_FIRMWARE(IWL105_UCODE_API_MAX));</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c<br/>index c2315dea9a23..f0453f3f6ba6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/22000.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/22000.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/22000.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/cfg/22000.c</a></div><div class='hunk'>@@ -1,111 +1,30 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2018-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/stringify.h&gt;</div><div class='ctx'> #include "iwl-config.h"</div><div class='ctx'> #include "iwl-prph.h"</div><div class='add'>+#include "fw/api/txq.h"</div><div class='ctx'> </div><div class='ctx'> /* Highest firmware API version supported */</div><div class='del'>-#define IWL_22000_UCODE_API_MAX	63</div><div class='add'>+#define IWL_22000_UCODE_API_MAX	77</div><div class='ctx'> </div><div class='ctx'> /* Lowest firmware API version supported */</div><div class='del'>-#define IWL_22000_UCODE_API_MIN	39</div><div class='del'>-</div><div class='del'>-/* NVM versions */</div><div class='del'>-#define IWL_22000_NVM_VERSION		0x0a1d</div><div class='add'>+#define IWL_22000_UCODE_API_MIN	77</div><div class='ctx'> </div><div class='ctx'> /* Memory offsets and lengths */</div><div class='del'>-#define IWL_22000_DCCM_OFFSET		0x800000 /* LMAC1 */</div><div class='del'>-#define IWL_22000_DCCM_LEN		0x10000 /* LMAC1 */</div><div class='del'>-#define IWL_22000_DCCM2_OFFSET		0x880000</div><div class='del'>-#define IWL_22000_DCCM2_LEN		0x8000</div><div class='ctx'> #define IWL_22000_SMEM_OFFSET		0x400000</div><div class='ctx'> #define IWL_22000_SMEM_LEN		0xD0000</div><div class='ctx'> </div><div class='del'>-#define IWL_QU_B_HR_B_FW_PRE		"iwlwifi-Qu-b0-hr-b0-"</div><div class='del'>-#define IWL_QNJ_B_HR_B_FW_PRE		"iwlwifi-QuQnj-b0-hr-b0-"</div><div class='del'>-#define IWL_QU_C_HR_B_FW_PRE		"iwlwifi-Qu-c0-hr-b0-"</div><div class='del'>-#define IWL_QU_B_JF_B_FW_PRE		"iwlwifi-Qu-b0-jf-b0-"</div><div class='del'>-#define IWL_QU_C_JF_B_FW_PRE		"iwlwifi-Qu-c0-jf-b0-"</div><div class='del'>-#define IWL_QUZ_A_HR_B_FW_PRE		"iwlwifi-QuZ-a0-hr-b0-"</div><div class='del'>-#define IWL_QUZ_A_JF_B_FW_PRE		"iwlwifi-QuZ-a0-jf-b0-"</div><div class='del'>-#define IWL_QNJ_B_JF_B_FW_PRE		"iwlwifi-QuQnj-b0-jf-b0-"</div><div class='del'>-#define IWL_CC_A_FW_PRE			"iwlwifi-cc-a0-"</div><div class='del'>-#define IWL_SO_A_JF_B_FW_PRE		"iwlwifi-so-a0-jf-b0-"</div><div class='del'>-#define IWL_SO_A_HR_B_FW_PRE		"iwlwifi-so-a0-hr-b0-"</div><div class='del'>-#define IWL_SO_A_GF_A_FW_PRE		"iwlwifi-so-a0-gf-a0-"</div><div class='del'>-#define IWL_TY_A_GF_A_FW_PRE		"iwlwifi-ty-a0-gf-a0-"</div><div class='del'>-#define IWL_SO_A_GF4_A_FW_PRE		"iwlwifi-so-a0-gf4-a0-"</div><div class='del'>-#define IWL_SNJ_A_GF4_A_FW_PRE		"iwlwifi-SoSnj-a0-gf4-a0-"</div><div class='del'>-#define IWL_SNJ_A_GF_A_FW_PRE		"iwlwifi-SoSnj-a0-gf-a0-"</div><div class='del'>-#define IWL_SNJ_A_HR_B_FW_PRE		"iwlwifi-SoSnj-a0-hr-b0-"</div><div class='del'>-#define IWL_SNJ_A_JF_B_FW_PRE		"iwlwifi-SoSnj-a0-jf-b0-"</div><div class='del'>-#define IWL_MA_A_HR_B_FW_PRE		"iwlwifi-ma-a0-hr-b0-"</div><div class='del'>-#define IWL_MA_A_GF_A_FW_PRE		"iwlwifi-ma-a0-gf-a0-"</div><div class='del'>-#define IWL_MA_A_GF4_A_FW_PRE		"iwlwifi-ma-a0-gf4-a0-"</div><div class='del'>-#define IWL_MA_A_MR_A_FW_PRE		"iwlwifi-ma-a0-mr-a0-"</div><div class='del'>-#define IWL_SNJ_A_MR_A_FW_PRE		"iwlwifi-SoSnj-a0-mr-a0-"</div><div class='del'>-#define IWL_BZ_A_HR_B_FW_PRE		"iwlwifi-bz-a0-hr-b0-"</div><div class='del'>-#define IWL_BZ_A_GF_A_FW_PRE		"iwlwifi-bz-a0-gf-a0-"</div><div class='del'>-#define IWL_BZ_A_GF4_A_FW_PRE		"iwlwifi-bz-a0-gf4-a0-"</div><div class='del'>-#define IWL_BZ_A_MR_A_FW_PRE		"iwlwifi-bz-a0-mr-a0-"</div><div class='add'>+#define IWL_CC_A_FW_PRE			"iwlwifi-cc-a0"</div><div class='ctx'> </div><div class='del'>-#define IWL_QU_B_HR_B_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL_QU_B_HR_B_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_QNJ_B_HR_B_MODULE_FIRMWARE(api)	\</div><div class='del'>-	IWL_QNJ_B_HR_B_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_QUZ_A_HR_B_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL_QUZ_A_HR_B_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_QUZ_A_JF_B_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL_QUZ_A_JF_B_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_QU_C_HR_B_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL_QU_C_HR_B_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_QU_B_JF_B_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL_QU_B_JF_B_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_QNJ_B_JF_B_MODULE_FIRMWARE(api)		\</div><div class='del'>-	IWL_QNJ_B_JF_B_FW_PRE __stringify(api) ".ucode"</div><div class='ctx'> #define IWL_CC_A_MODULE_FIRMWARE(api)			\</div><div class='del'>-	IWL_CC_A_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_SO_A_JF_B_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL_SO_A_JF_B_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_SO_A_HR_B_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL_SO_A_HR_B_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_SO_A_GF_A_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL_SO_A_GF_A_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_TY_A_GF_A_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL_TY_A_GF_A_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_SNJ_A_GF4_A_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL_SNJ_A_GF4_A_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_SNJ_A_GF_A_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL_SNJ_A_GF_A_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_SNJ_A_HR_B_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL_SNJ_A_HR_B_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_SNJ_A_JF_B_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL_SNJ_A_JF_B_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_MA_A_HR_B_FW_MODULE_FIRMWARE(api)		\</div><div class='del'>-	IWL_MA_A_HR_B_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_MA_A_GF_A_FW_MODULE_FIRMWARE(api)		\</div><div class='del'>-	IWL_MA_A_GF_A_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_MA_A_GF4_A_FW_MODULE_FIRMWARE(api)		\</div><div class='del'>-	IWL_MA_A_GF4_A_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_MA_A_MR_A_FW_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL_MA_A_MR_A_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_SNJ_A_MR_A_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL_SNJ_A_MR_A_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_BZ_A_HR_B_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL_BZ_A_HR_B_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_BZ_A_GF_A_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL_BZ_A_GF_A_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_BZ_A_GF4_A_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL_BZ_A_GF4_A_FW_PRE __stringify(api) ".ucode"</div><div class='del'>-#define IWL_BZ_A_MR_A_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL_BZ_A_MR_A_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+	IWL_CC_A_FW_PRE "-" __stringify(api) ".ucode"</div><div class='ctx'> </div><div class='del'>-static const struct iwl_base_params iwl_22000_base_params = {</div><div class='del'>-	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,</div><div class='add'>+static const struct iwl_family_base_params iwl_22000_base = {</div><div class='ctx'> 	.num_of_queues = 512,</div><div class='ctx'> 	.max_tfd_queue_size = 256,</div><div class='ctx'> 	.shadow_ram_support = true,</div><div class='hunk'>@@ -114,283 +33,77 @@ static const struct iwl_base_params iwl_22000_base_params = {</div><div class='ctx'> 	.max_event_log_size = 512,</div><div class='ctx'> 	.shadow_reg_enable = true,</div><div class='ctx'> 	.pcie_l1_allowed = true,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct iwl_base_params iwl_ax210_base_params = {</div><div class='del'>-	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,</div><div class='del'>-	.num_of_queues = 512,</div><div class='del'>-	.max_tfd_queue_size = 65536,</div><div class='del'>-	.shadow_ram_support = true,</div><div class='del'>-	.led_compensation = 57,</div><div class='del'>-	.wd_timeout = IWL_LONG_WD_TIMEOUT,</div><div class='del'>-	.max_event_log_size = 512,</div><div class='del'>-	.shadow_reg_enable = true,</div><div class='del'>-	.pcie_l1_allowed = true,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct iwl_ht_params iwl_22000_ht_params = {</div><div class='del'>-	.stbc = true,</div><div class='del'>-	.ldpc = true,</div><div class='del'>-	.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ) |</div><div class='del'>-		      BIT(NL80211_BAND_6GHZ),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define IWL_DEVICE_22000_COMMON						\</div><div class='del'>-	.ucode_api_max = IWL_22000_UCODE_API_MAX,			\</div><div class='del'>-	.ucode_api_min = IWL_22000_UCODE_API_MIN,			\</div><div class='del'>-	.led_mode = IWL_LED_RF_STATE,					\</div><div class='del'>-	.nvm_hw_section_num = 10,					\</div><div class='del'>-	.non_shared_ant = ANT_B,					\</div><div class='del'>-	.dccm_offset = IWL_22000_DCCM_OFFSET,				\</div><div class='del'>-	.dccm_len = IWL_22000_DCCM_LEN,					\</div><div class='del'>-	.dccm2_offset = IWL_22000_DCCM2_OFFSET,				\</div><div class='del'>-	.dccm2_len = IWL_22000_DCCM2_LEN,				\</div><div class='del'>-	.smem_offset = IWL_22000_SMEM_OFFSET,				\</div><div class='del'>-	.smem_len = IWL_22000_SMEM_LEN,					\</div><div class='del'>-	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,		\</div><div class='del'>-	.apmg_not_supported = true,					\</div><div class='del'>-	.trans.mq_rx_supported = true,					\</div><div class='del'>-	.vht_mu_mimo_supported = true,					\</div><div class='del'>-	.mac_addr_from_csr = true,					\</div><div class='del'>-	.ht_params = &amp;iwl_22000_ht_params,				\</div><div class='del'>-	.nvm_ver = IWL_22000_NVM_VERSION,				\</div><div class='del'>-	.trans.use_tfh = true,						\</div><div class='del'>-	.trans.rf_id = true,						\</div><div class='del'>-	.trans.gen2 = true,						\</div><div class='del'>-	.nvm_type = IWL_NVM_EXT,					\</div><div class='del'>-	.dbgc_supported = true,						\</div><div class='del'>-	.min_umac_error_event_table = 0x400000,				\</div><div class='del'>-	.d3_debug_data_base_addr = 0x401000,				\</div><div class='del'>-	.d3_debug_data_length = 60 * 1024,				\</div><div class='del'>-	.mon_smem_regs = {						\</div><div class='del'>-		.write_ptr = {						\</div><div class='del'>-			.addr = LDBG_M2S_BUF_WPTR,			\</div><div class='del'>-			.mask = LDBG_M2S_BUF_WPTR_VAL_MSK,		\</div><div class='del'>-	},								\</div><div class='del'>-		.cycle_cnt = {						\</div><div class='del'>-			.addr = LDBG_M2S_BUF_WRAP_CNT,			\</div><div class='del'>-			.mask = LDBG_M2S_BUF_WRAP_CNT_VAL_MSK,		\</div><div class='del'>-		},							\</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#define IWL_DEVICE_22500						\</div><div class='del'>-	IWL_DEVICE_22000_COMMON,					\</div><div class='del'>-	.trans.device_family = IWL_DEVICE_FAMILY_22000,			\</div><div class='del'>-	.trans.base_params = &amp;iwl_22000_base_params,			\</div><div class='del'>-	.gp2_reg_addr = 0xa02c68,					\</div><div class='del'>-	.mon_dram_regs = {						\</div><div class='del'>-		.write_ptr = {						\</div><div class='del'>-			.addr = MON_BUFF_WRPTR_VER2,			\</div><div class='del'>-			.mask = 0xffffffff,				\</div><div class='del'>-		},							\</div><div class='del'>-		.cycle_cnt = {						\</div><div class='del'>-			.addr = MON_BUFF_CYCLE_CNT_VER2,		\</div><div class='del'>-			.mask = 0xffffffff,				\</div><div class='del'>-		},							\</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#define IWL_DEVICE_AX210						\</div><div class='del'>-	IWL_DEVICE_22000_COMMON,					\</div><div class='del'>-	.trans.umac_prph_offset = 0x300000,				\</div><div class='del'>-	.trans.device_family = IWL_DEVICE_FAMILY_AX210,			\</div><div class='del'>-	.trans.base_params = &amp;iwl_ax210_base_params,			\</div><div class='del'>-	.min_txq_size = 128,						\</div><div class='del'>-	.gp2_reg_addr = 0xd02c68,					\</div><div class='del'>-	.min_256_ba_txq_size = 1024,					\</div><div class='del'>-	.mon_dram_regs = {						\</div><div class='del'>-		.write_ptr = {						\</div><div class='del'>-			.addr = DBGC_CUR_DBGBUF_STATUS,			\</div><div class='del'>-			.mask = DBGC_CUR_DBGBUF_STATUS_OFFSET_MSK,	\</div><div class='del'>-		},							\</div><div class='del'>-		.cycle_cnt = {						\</div><div class='del'>-			.addr = DBGC_DBGBUF_WRAP_AROUND,		\</div><div class='del'>-			.mask = 0xffffffff,				\</div><div class='del'>-		},							\</div><div class='del'>-		.cur_frag = {						\</div><div class='del'>-			.addr = DBGC_CUR_DBGBUF_STATUS,			\</div><div class='del'>-			.mask = DBGC_CUR_DBGBUF_STATUS_IDX_MSK,		\</div><div class='del'>-		},							\</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg_trans_params iwl_qnj_trans_cfg = {</div><div class='del'>-	.mq_rx_supported = true,</div><div class='del'>-	.use_tfh = true,</div><div class='del'>-	.rf_id = true,</div><div class='del'>-	.gen2 = true,</div><div class='del'>-	.device_family = IWL_DEVICE_FAMILY_22000,</div><div class='del'>-	.base_params = &amp;iwl_22000_base_params,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg_trans_params iwl_qu_trans_cfg = {</div><div class='add'>+	.smem_offset = IWL_22000_SMEM_OFFSET,</div><div class='add'>+	.smem_len = IWL_22000_SMEM_LEN,</div><div class='add'>+	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,</div><div class='add'>+	.apmg_not_supported = true,</div><div class='add'>+	.mac_addr_from_csr = 0x380,</div><div class='add'>+	.d3_debug_data_base_addr = 0x401000,</div><div class='add'>+	.d3_debug_data_length = 60 * 1024,</div><div class='add'>+	.mon_smem_regs = {</div><div class='add'>+		.write_ptr = {</div><div class='add'>+			.addr = LDBG_M2S_BUF_WPTR,</div><div class='add'>+			.mask = LDBG_M2S_BUF_WPTR_VAL_MSK,</div><div class='add'>+	},</div><div class='add'>+		.cycle_cnt = {</div><div class='add'>+			.addr = LDBG_M2S_BUF_WRAP_CNT,</div><div class='add'>+			.mask = LDBG_M2S_BUF_WRAP_CNT_VAL_MSK,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.gp2_reg_addr = 0xa02c68,</div><div class='add'>+	.mon_dram_regs = {</div><div class='add'>+		.write_ptr = {</div><div class='add'>+			.addr = MON_BUFF_WRPTR_VER2,</div><div class='add'>+			.mask = 0xffffffff,</div><div class='add'>+		},</div><div class='add'>+		.cycle_cnt = {</div><div class='add'>+			.addr = MON_BUFF_CYCLE_CNT_VER2,</div><div class='add'>+			.mask = 0xffffffff,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.ucode_api_min = IWL_22000_UCODE_API_MIN,</div><div class='add'>+	.ucode_api_max = IWL_22000_UCODE_API_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct iwl_mac_cfg iwl_qu_mac_cfg = {</div><div class='ctx'> 	.mq_rx_supported = true,</div><div class='del'>-	.use_tfh = true,</div><div class='del'>-	.rf_id = true,</div><div class='ctx'> 	.gen2 = true,</div><div class='ctx'> 	.device_family = IWL_DEVICE_FAMILY_22000,</div><div class='del'>-	.base_params = &amp;iwl_22000_base_params,</div><div class='add'>+	.base = &amp;iwl_22000_base,</div><div class='ctx'> 	.integrated = true,</div><div class='ctx'> 	.xtal_latency = 500,</div><div class='ctx'> 	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_200US,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg_trans_params iwl_qu_medium_latency_trans_cfg = {</div><div class='add'>+const struct iwl_mac_cfg iwl_qu_medium_latency_mac_cfg = {</div><div class='ctx'> 	.mq_rx_supported = true,</div><div class='del'>-	.use_tfh = true,</div><div class='del'>-	.rf_id = true,</div><div class='ctx'> 	.gen2 = true,</div><div class='ctx'> 	.device_family = IWL_DEVICE_FAMILY_22000,</div><div class='del'>-	.base_params = &amp;iwl_22000_base_params,</div><div class='add'>+	.base = &amp;iwl_22000_base,</div><div class='ctx'> 	.integrated = true,</div><div class='ctx'> 	.xtal_latency = 1820,</div><div class='ctx'> 	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_1820US,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg_trans_params iwl_qu_long_latency_trans_cfg = {</div><div class='add'>+const struct iwl_mac_cfg iwl_qu_long_latency_mac_cfg = {</div><div class='ctx'> 	.mq_rx_supported = true,</div><div class='del'>-	.use_tfh = true,</div><div class='del'>-	.rf_id = true,</div><div class='ctx'> 	.gen2 = true,</div><div class='ctx'> 	.device_family = IWL_DEVICE_FAMILY_22000,</div><div class='del'>-	.base_params = &amp;iwl_22000_base_params,</div><div class='add'>+	.base = &amp;iwl_22000_base,</div><div class='ctx'> 	.integrated = true,</div><div class='ctx'> 	.xtal_latency = 12000,</div><div class='ctx'> 	.low_latency_xtal = true,</div><div class='ctx'> 	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg_trans_params iwl_snj_trans_cfg = {</div><div class='del'>-	.mq_rx_supported = true,</div><div class='del'>-	.use_tfh = true,</div><div class='del'>-	.rf_id = true,</div><div class='del'>-	.gen2 = true,</div><div class='del'>-	.device_family = IWL_DEVICE_FAMILY_AX210,</div><div class='del'>-	.base_params = &amp;iwl_ax210_base_params,</div><div class='del'>-	.umac_prph_offset = 0x300000,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg_trans_params iwl_so_trans_cfg = {</div><div class='del'>-	.mq_rx_supported = true,</div><div class='del'>-	.use_tfh = true,</div><div class='del'>-	.rf_id = true,</div><div class='del'>-	.gen2 = true,</div><div class='del'>-	.device_family = IWL_DEVICE_FAMILY_AX210,</div><div class='del'>-	.base_params = &amp;iwl_ax210_base_params,</div><div class='del'>-	.umac_prph_offset = 0x300000,</div><div class='del'>-	.integrated = true,</div><div class='del'>-	/* TODO: the following values need to be checked */</div><div class='del'>-	.xtal_latency = 500,</div><div class='del'>-	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_200US,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg_trans_params iwl_so_long_latency_trans_cfg = {</div><div class='del'>-	.mq_rx_supported = true,</div><div class='del'>-	.use_tfh = true,</div><div class='del'>-	.rf_id = true,</div><div class='del'>-	.gen2 = true,</div><div class='del'>-	.device_family = IWL_DEVICE_FAMILY_AX210,</div><div class='del'>-	.base_params = &amp;iwl_ax210_base_params,</div><div class='del'>-	.umac_prph_offset = 0x300000,</div><div class='del'>-	.integrated = true,</div><div class='del'>-	/* TODO: the following values need to be checked */</div><div class='del'>-	.xtal_latency = 12000,</div><div class='del'>-	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If the device doesn't support HE, no need to have that many buffers.</div><div class='del'>- * 22000 devices can split multiple frames into a single RB, so fewer are</div><div class='del'>- * needed; AX210 cannot (but use smaller RBs by default) - these sizes</div><div class='del'>- * were picked according to 8 MSDUs inside 256 A-MSDUs in an A-MPDU, with</div><div class='del'>- * additional overhead to account for processing time.</div><div class='del'>- */</div><div class='del'>-#define IWL_NUM_RBDS_NON_HE		512</div><div class='del'>-#define IWL_NUM_RBDS_22000_HE		2048</div><div class='del'>-#define IWL_NUM_RBDS_AX210_HE		4096</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * All JF radio modules are part of the 9000 series, but the MAC part</div><div class='del'>- * looks more like 22000.  That's why this device is here, but called</div><div class='del'>- * 9560 nevertheless.</div><div class='del'>- */</div><div class='del'>-const struct iwl_cfg iwl9560_qu_b0_jf_b0_cfg = {</div><div class='del'>-	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_22500,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_NON_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl9560_qu_c0_jf_b0_cfg = {</div><div class='del'>-	.fw_name_pre = IWL_QU_C_JF_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_22500,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_NON_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl9560_quz_a0_jf_b0_cfg = {</div><div class='del'>-	.fw_name_pre = IWL_QUZ_A_JF_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_22500,</div><div class='del'>-	/*</div><div class='del'>-	 * This device doesn't support receiving BlockAck with a large bitmap</div><div class='del'>-	 * so we need to restrict the size of transmitted aggregation to the</div><div class='del'>-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.</div><div class='del'>-	 */</div><div class='del'>-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_NON_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl9560_qnj_b0_jf_b0_cfg = {</div><div class='del'>-	.fw_name_pre = IWL_QNJ_B_JF_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_22500,</div><div class='del'>-	/*</div><div class='del'>-	 * This device doesn't support receiving BlockAck with a large bitmap</div><div class='del'>-	 * so we need to restrict the size of transmitted aggregation to the</div><div class='del'>-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.</div><div class='del'>-	 */</div><div class='del'>-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_NON_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg_trans_params iwl_ax200_trans_cfg = {</div><div class='add'>+const struct iwl_mac_cfg iwl_ax200_mac_cfg = {</div><div class='ctx'> 	.device_family = IWL_DEVICE_FAMILY_22000,</div><div class='del'>-	.base_params = &amp;iwl_22000_base_params,</div><div class='add'>+	.base = &amp;iwl_22000_base,</div><div class='ctx'> 	.mq_rx_supported = true,</div><div class='del'>-	.use_tfh = true,</div><div class='del'>-	.rf_id = true,</div><div class='ctx'> 	.gen2 = true,</div><div class='ctx'> 	.bisr_workaround = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg_trans_params iwl_ma_trans_cfg = {</div><div class='del'>-	.device_family = IWL_DEVICE_FAMILY_AX210,</div><div class='del'>-	.base_params = &amp;iwl_ax210_base_params,</div><div class='del'>-	.mq_rx_supported = true,</div><div class='del'>-	.use_tfh = true,</div><div class='del'>-	.rf_id = true,</div><div class='del'>-	.gen2 = true,</div><div class='del'>-	.integrated = true,</div><div class='del'>-	.umac_prph_offset = 0x300000</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg_trans_params iwl_bz_trans_cfg = {</div><div class='del'>-	.device_family = IWL_DEVICE_FAMILY_AX210,</div><div class='del'>-	.base_params = &amp;iwl_ax210_base_params,</div><div class='del'>-	.mq_rx_supported = true,</div><div class='del'>-	.use_tfh = true,</div><div class='del'>-	.rf_id = true,</div><div class='del'>-	.gen2 = true,</div><div class='del'>-	.integrated = true,</div><div class='del'>-	.umac_prph_offset = 0x300000,</div><div class='del'>-	.xtal_latency = 12000,</div><div class='del'>-	.low_latency_xtal = true,</div><div class='del'>-	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const char iwl_ax101_name[] = "Intel(R) Wi-Fi 6 AX101";</div><div class='del'>-const char iwl_ax200_name[] = "Intel(R) Wi-Fi 6 AX200 160MHz";</div><div class='del'>-const char iwl_ax201_name[] = "Intel(R) Wi-Fi 6 AX201 160MHz";</div><div class='del'>-const char iwl_ax203_name[] = "Intel(R) Wi-Fi 6 AX203";</div><div class='del'>-const char iwl_ax211_name[] = "Intel(R) Wi-Fi 6E AX211 160MHz";</div><div class='del'>-const char iwl_ax221_name[] = "Intel(R) Wi-Fi 6E AX221 160MHz";</div><div class='del'>-const char iwl_ax411_name[] = "Intel(R) Wi-Fi 6E AX411 160MHz";</div><div class='del'>-</div><div class='ctx'> const char iwl_ax200_killer_1650w_name[] =</div><div class='ctx'> 	"Killer(R) Wi-Fi 6 AX1650w 160MHz Wireless Network Adapter (200D2W)";</div><div class='ctx'> const char iwl_ax200_killer_1650x_name[] =</div><div class='hunk'>@@ -399,406 +112,5 @@ const char iwl_ax201_killer_1650s_name[] =</div><div class='ctx'> 	"Killer(R) Wi-Fi 6 AX1650s 160MHz Wireless Network Adapter (201D2W)";</div><div class='ctx'> const char iwl_ax201_killer_1650i_name[] =</div><div class='ctx'> 	"Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW)";</div><div class='del'>-const char iwl_ax210_killer_1675w_name[] =</div><div class='del'>-	"Killer(R) Wi-Fi 6E AX1675w 160MHz Wireless Network Adapter (210D2W)";</div><div class='del'>-const char iwl_ax210_killer_1675x_name[] =</div><div class='del'>-	"Killer(R) Wi-Fi 6E AX1675x 160MHz Wireless Network Adapter (210NGW)";</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_qu_b0_hr1_b0 = {</div><div class='del'>-	.fw_name_pre = IWL_QU_B_HR_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_22500,</div><div class='del'>-	/*</div><div class='del'>-	 * This device doesn't support receiving BlockAck with a large bitmap</div><div class='del'>-	 * so we need to restrict the size of transmitted aggregation to the</div><div class='del'>-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.</div><div class='del'>-	 */</div><div class='del'>-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='del'>-	.tx_with_siso_diversity = true,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_22000_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_qu_b0_hr_b0 = {</div><div class='del'>-	.fw_name_pre = IWL_QU_B_HR_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_22500,</div><div class='del'>-	/*</div><div class='del'>-	 * This device doesn't support receiving BlockAck with a large bitmap</div><div class='del'>-	 * so we need to restrict the size of transmitted aggregation to the</div><div class='del'>-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.</div><div class='del'>-	 */</div><div class='del'>-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_22000_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_ax201_cfg_qu_hr = {</div><div class='del'>-	.name = "Intel(R) Wi-Fi 6 AX201 160MHz",</div><div class='del'>-	.fw_name_pre = IWL_QU_B_HR_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_22500,</div><div class='del'>-	/*</div><div class='del'>-	 * This device doesn't support receiving BlockAck with a large bitmap</div><div class='del'>-	 * so we need to restrict the size of transmitted aggregation to the</div><div class='del'>-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.</div><div class='del'>-	 */</div><div class='del'>-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_22000_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_qu_c0_hr1_b0 = {</div><div class='del'>-	.fw_name_pre = IWL_QU_C_HR_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_22500,</div><div class='del'>-	/*</div><div class='del'>-	 * This device doesn't support receiving BlockAck with a large bitmap</div><div class='del'>-	 * so we need to restrict the size of transmitted aggregation to the</div><div class='del'>-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.</div><div class='del'>-	 */</div><div class='del'>-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='del'>-	.tx_with_siso_diversity = true,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_22000_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_qu_c0_hr_b0 = {</div><div class='del'>-	.fw_name_pre = IWL_QU_C_HR_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_22500,</div><div class='del'>-	/*</div><div class='del'>-	 * This device doesn't support receiving BlockAck with a large bitmap</div><div class='del'>-	 * so we need to restrict the size of transmitted aggregation to the</div><div class='del'>-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.</div><div class='del'>-	 */</div><div class='del'>-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_22000_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_ax201_cfg_qu_c0_hr_b0 = {</div><div class='del'>-	.name = "Intel(R) Wi-Fi 6 AX201 160MHz",</div><div class='del'>-	.fw_name_pre = IWL_QU_C_HR_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_22500,</div><div class='del'>-	/*</div><div class='del'>-	 * This device doesn't support receiving BlockAck with a large bitmap</div><div class='del'>-	 * so we need to restrict the size of transmitted aggregation to the</div><div class='del'>-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.</div><div class='del'>-	 */</div><div class='del'>-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_22000_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_quz_a0_hr1_b0 = {</div><div class='del'>-	.fw_name_pre = IWL_QUZ_A_HR_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_22500,</div><div class='del'>-	/*</div><div class='del'>-	 * This device doesn't support receiving BlockAck with a large bitmap</div><div class='del'>-	 * so we need to restrict the size of transmitted aggregation to the</div><div class='del'>-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.</div><div class='del'>-	 */</div><div class='del'>-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='del'>-	.tx_with_siso_diversity = true,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_22000_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_ax201_cfg_quz_hr = {</div><div class='del'>-	.name = "Intel(R) Wi-Fi 6 AX201 160MHz",</div><div class='del'>-	.fw_name_pre = IWL_QUZ_A_HR_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_22500,</div><div class='del'>-	/*</div><div class='del'>-         * This device doesn't support receiving BlockAck with a large bitmap</div><div class='del'>-         * so we need to restrict the size of transmitted aggregation to the</div><div class='del'>-         * HT size; mac80211 would otherwise pick the HE max (256) by default.</div><div class='del'>-         */</div><div class='del'>-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_22000_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_ax1650s_cfg_quz_hr = {</div><div class='del'>-	.name = "Killer(R) Wi-Fi 6 AX1650s 160MHz Wireless Network Adapter (201D2W)",</div><div class='del'>-	.fw_name_pre = IWL_QUZ_A_HR_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_22500,</div><div class='del'>-	/*</div><div class='del'>-         * This device doesn't support receiving BlockAck with a large bitmap</div><div class='del'>-         * so we need to restrict the size of transmitted aggregation to the</div><div class='del'>-         * HT size; mac80211 would otherwise pick the HE max (256) by default.</div><div class='del'>-         */</div><div class='del'>-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_22000_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_ax1650i_cfg_quz_hr = {</div><div class='del'>-	.name = "Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW)",</div><div class='del'>-	.fw_name_pre = IWL_QUZ_A_HR_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_22500,</div><div class='del'>-	/*</div><div class='del'>-         * This device doesn't support receiving BlockAck with a large bitmap</div><div class='del'>-         * so we need to restrict the size of transmitted aggregation to the</div><div class='del'>-         * HT size; mac80211 would otherwise pick the HE max (256) by default.</div><div class='del'>-         */</div><div class='del'>-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_22000_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_ax200_cfg_cc = {</div><div class='del'>-	.fw_name_pre = IWL_CC_A_FW_PRE,</div><div class='del'>-	IWL_DEVICE_22500,</div><div class='del'>-	/*</div><div class='del'>-	 * This device doesn't support receiving BlockAck with a large bitmap</div><div class='del'>-	 * so we need to restrict the size of transmitted aggregation to the</div><div class='del'>-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.</div><div class='del'>-	 */</div><div class='del'>-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_22000_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0 = {</div><div class='del'>-	.name = "Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW)",</div><div class='del'>-	.fw_name_pre = IWL_QU_B_HR_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_22500,</div><div class='del'>-	/*</div><div class='del'>-	 * This device doesn't support receiving BlockAck with a large bitmap</div><div class='del'>-	 * so we need to restrict the size of transmitted aggregation to the</div><div class='del'>-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.</div><div class='del'>-	 */</div><div class='del'>-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_22000_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg killer1650i_2ax_cfg_qu_b0_hr_b0 = {</div><div class='del'>-	.name = "Killer(R) Wi-Fi 6 AX1650s 160MHz Wireless Network Adapter (201D2W)",</div><div class='del'>-	.fw_name_pre = IWL_QU_B_HR_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_22500,</div><div class='del'>-	/*</div><div class='del'>-	 * This device doesn't support receiving BlockAck with a large bitmap</div><div class='del'>-	 * so we need to restrict the size of transmitted aggregation to the</div><div class='del'>-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.</div><div class='del'>-	 */</div><div class='del'>-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_22000_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg killer1650s_2ax_cfg_qu_c0_hr_b0 = {</div><div class='del'>-	.name = "Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW)",</div><div class='del'>-	.fw_name_pre = IWL_QU_C_HR_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_22500,</div><div class='del'>-	/*</div><div class='del'>-	 * This device doesn't support receiving BlockAck with a large bitmap</div><div class='del'>-	 * so we need to restrict the size of transmitted aggregation to the</div><div class='del'>-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.</div><div class='del'>-	 */</div><div class='del'>-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_22000_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0 = {</div><div class='del'>-	.name = "Killer(R) Wi-Fi 6 AX1650s 160MHz Wireless Network Adapter (201D2W)",</div><div class='del'>-	.fw_name_pre = IWL_QU_C_HR_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_22500,</div><div class='del'>-	/*</div><div class='del'>-	 * This device doesn't support receiving BlockAck with a large bitmap</div><div class='del'>-	 * so we need to restrict the size of transmitted aggregation to the</div><div class='del'>-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.</div><div class='del'>-	 */</div><div class='del'>-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_22000_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_qnj_b0_hr_b0_cfg = {</div><div class='del'>-	.fw_name_pre = IWL_QNJ_B_HR_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_22500,</div><div class='del'>-	/*</div><div class='del'>-	 * This device doesn't support receiving BlockAck with a large bitmap</div><div class='del'>-	 * so we need to restrict the size of transmitted aggregation to the</div><div class='del'>-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.</div><div class='del'>-	 */</div><div class='del'>-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_22000_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwlax210_2ax_cfg_so_jf_b0 = {</div><div class='del'>-	.name = "Intel(R) Wireless-AC 9560 160MHz",</div><div class='del'>-	.fw_name_pre = IWL_SO_A_JF_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_AX210,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_NON_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0 = {</div><div class='del'>-	.name = "Intel(R) Wi-Fi 6 AX210 160MHz",</div><div class='del'>-	.fw_name_pre = IWL_SO_A_HR_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_AX210,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_AX210_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0 = {</div><div class='del'>-	.name = iwl_ax211_name,</div><div class='del'>-	.fw_name_pre = IWL_SO_A_GF_A_FW_PRE,</div><div class='del'>-	.uhb_supported = true,</div><div class='del'>-	IWL_DEVICE_AX210,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_AX210_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0_long = {</div><div class='del'>-	.name = iwl_ax211_name,</div><div class='del'>-	.fw_name_pre = IWL_SO_A_GF_A_FW_PRE,</div><div class='del'>-	.uhb_supported = true,</div><div class='del'>-	IWL_DEVICE_AX210,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_AX210_HE,</div><div class='del'>-	.trans.xtal_latency = 12000,</div><div class='del'>-	.trans.low_latency_xtal = true,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0 = {</div><div class='del'>-	.name = "Intel(R) Wi-Fi 6 AX210 160MHz",</div><div class='del'>-	.fw_name_pre = IWL_TY_A_GF_A_FW_PRE,</div><div class='del'>-	.uhb_supported = true,</div><div class='del'>-	IWL_DEVICE_AX210,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_AX210_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0 = {</div><div class='del'>-	.name = iwl_ax411_name,</div><div class='del'>-	.fw_name_pre = IWL_SO_A_GF4_A_FW_PRE,</div><div class='del'>-	.uhb_supported = true,</div><div class='del'>-	IWL_DEVICE_AX210,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_AX210_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0_long = {</div><div class='del'>-	.name = iwl_ax411_name,</div><div class='del'>-	.fw_name_pre = IWL_SO_A_GF4_A_FW_PRE,</div><div class='del'>-	.uhb_supported = true,</div><div class='del'>-	IWL_DEVICE_AX210,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_AX210_HE,</div><div class='del'>-	.trans.xtal_latency = 12000,</div><div class='del'>-	.trans.low_latency_xtal = true,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwlax411_2ax_cfg_sosnj_gf4_a0 = {</div><div class='del'>-	.name = iwl_ax411_name,</div><div class='del'>-	.fw_name_pre = IWL_SNJ_A_GF4_A_FW_PRE,</div><div class='del'>-	.uhb_supported = true,</div><div class='del'>-	IWL_DEVICE_AX210,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_AX210_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwlax211_cfg_snj_gf_a0 = {</div><div class='del'>-	.name = iwl_ax211_name,</div><div class='del'>-	.fw_name_pre = IWL_SNJ_A_GF_A_FW_PRE,</div><div class='del'>-	.uhb_supported = true,</div><div class='del'>-	IWL_DEVICE_AX210,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_AX210_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_cfg_snj_hr_b0 = {</div><div class='del'>-	.fw_name_pre = IWL_SNJ_A_HR_B_FW_PRE,</div><div class='del'>-	.uhb_supported = true,</div><div class='del'>-	IWL_DEVICE_AX210,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_AX210_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_cfg_snj_a0_jf_b0 = {</div><div class='del'>-	.fw_name_pre = IWL_SNJ_A_JF_B_FW_PRE,</div><div class='del'>-	.uhb_supported = true,</div><div class='del'>-	IWL_DEVICE_AX210,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_AX210_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_cfg_ma_a0_hr_b0 = {</div><div class='del'>-	.fw_name_pre = IWL_MA_A_HR_B_FW_PRE,</div><div class='del'>-	.uhb_supported = true,</div><div class='del'>-	IWL_DEVICE_AX210,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_AX210_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_cfg_ma_a0_gf_a0 = {</div><div class='del'>-	.fw_name_pre = IWL_MA_A_GF_A_FW_PRE,</div><div class='del'>-	.uhb_supported = true,</div><div class='del'>-	IWL_DEVICE_AX210,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_AX210_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_cfg_ma_a0_gf4_a0 = {</div><div class='del'>-	.fw_name_pre = IWL_MA_A_GF4_A_FW_PRE,</div><div class='del'>-	.uhb_supported = true,</div><div class='del'>-	IWL_DEVICE_AX210,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_AX210_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_cfg_ma_a0_mr_a0 = {</div><div class='del'>-	.fw_name_pre = IWL_MA_A_MR_A_FW_PRE,</div><div class='del'>-	.uhb_supported = true,</div><div class='del'>-	IWL_DEVICE_AX210,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_AX210_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_cfg_snj_a0_mr_a0 = {</div><div class='del'>-	.fw_name_pre = IWL_SNJ_A_MR_A_FW_PRE,</div><div class='del'>-	.uhb_supported = true,</div><div class='del'>-	IWL_DEVICE_AX210,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_AX210_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_cfg_so_a0_hr_a0 = {</div><div class='del'>-	.fw_name_pre = IWL_SO_A_HR_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_AX210,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_AX210_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_cfg_quz_a0_hr_b0 = {</div><div class='del'>-	.fw_name_pre = IWL_QUZ_A_HR_B_FW_PRE,</div><div class='del'>-	IWL_DEVICE_22500,</div><div class='del'>-	/*</div><div class='del'>-	 * This device doesn't support receiving BlockAck with a large bitmap</div><div class='del'>-	 * so we need to restrict the size of transmitted aggregation to the</div><div class='del'>-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.</div><div class='del'>-	 */</div><div class='del'>-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_22000_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_cfg_bz_a0_hr_b0 = {</div><div class='del'>-	.fw_name_pre = IWL_BZ_A_HR_B_FW_PRE,</div><div class='del'>-	.uhb_supported = true,</div><div class='del'>-	IWL_DEVICE_AX210,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_AX210_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_cfg_bz_a0_gf_a0 = {</div><div class='del'>-	.fw_name_pre = IWL_BZ_A_GF_A_FW_PRE,</div><div class='del'>-	.uhb_supported = true,</div><div class='del'>-	IWL_DEVICE_AX210,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_AX210_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_cfg_bz_a0_gf4_a0 = {</div><div class='del'>-	.fw_name_pre = IWL_BZ_A_GF4_A_FW_PRE,</div><div class='del'>-	.uhb_supported = true,</div><div class='del'>-	IWL_DEVICE_AX210,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_AX210_HE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl_cfg_bz_a0_mr_a0 = {</div><div class='del'>-	.fw_name_pre = IWL_BZ_A_MR_A_FW_PRE,</div><div class='del'>-	.uhb_supported = true,</div><div class='del'>-	IWL_DEVICE_AX210,</div><div class='del'>-	.num_rbds = IWL_NUM_RBDS_AX210_HE,</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-MODULE_FIRMWARE(IWL_QU_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_QNJ_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_QUZ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_QUZ_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_QNJ_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='ctx'> MODULE_FIRMWARE(IWL_CC_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_SO_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_SO_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_SO_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_TY_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_SNJ_A_GF4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_SNJ_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_SNJ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_SNJ_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_MA_A_HR_B_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_MA_A_GF_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_MA_A_GF4_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_MA_A_MR_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_SNJ_A_MR_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_BZ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_BZ_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_BZ_A_GF4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='del'>-MODULE_FIRMWARE(IWL_BZ_A_MR_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/5000.c b/drivers/net/wireless/intel/iwlwifi/cfg/5000.c<br/>index 6cdd7d983bda..aaae3b1f5433 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/5000.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/5000.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/5000.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/cfg/5000.c</a></div><div class='hunk'>@@ -2,12 +2,7 @@</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.</div><div class='del'>- * Copyright(c) 2018 - 2020 Intel Corporation</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='add'>+ * Copyright(c) 2018 - 2020, 2023, 2025 Intel Corporation</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -29,13 +24,13 @@</div><div class='ctx'> #define EEPROM_5050_TX_POWER_VERSION	(4)</div><div class='ctx'> #define EEPROM_5050_EEPROM_VERSION	(0x21E)</div><div class='ctx'> </div><div class='del'>-#define IWL5000_FW_PRE "iwlwifi-5000-"</div><div class='del'>-#define IWL5000_MODULE_FIRMWARE(api) IWL5000_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+#define IWL5000_FW_PRE "iwlwifi-5000"</div><div class='add'>+#define IWL5000_MODULE_FIRMWARE(api) IWL5000_FW_PRE "-" __stringify(api) ".ucode"</div><div class='ctx'> </div><div class='del'>-#define IWL5150_FW_PRE "iwlwifi-5150-"</div><div class='del'>-#define IWL5150_MODULE_FIRMWARE(api) IWL5150_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+#define IWL5150_FW_PRE "iwlwifi-5150"</div><div class='add'>+#define IWL5150_MODULE_FIRMWARE(api) IWL5150_FW_PRE "-" __stringify(api) ".ucode"</div><div class='ctx'> </div><div class='del'>-static const struct iwl_base_params iwl5000_base_params = {</div><div class='add'>+static const struct iwl_family_base_params iwl5000_base = {</div><div class='ctx'> 	.eeprom_size = IWLAGN_EEPROM_IMG_SIZE,</div><div class='ctx'> 	.num_of_queues = IWLAGN_NUM_QUEUES,</div><div class='ctx'> 	.max_tfd_queue_size = 256,</div><div class='hunk'>@@ -46,11 +41,6 @@ static const struct iwl_base_params iwl5000_base_params = {</div><div class='ctx'> 	.scd_chain_ext_wa = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct iwl_ht_params iwl5000_ht_params = {</div><div class='del'>-	.ht_greenfield_support = true,</div><div class='del'>-	.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct iwl_eeprom_params iwl5000_eeprom_params = {</div><div class='ctx'> 	.regulatory_bands = {</div><div class='ctx'> 		EEPROM_REG_BAND_1_CHANNELS,</div><div class='hunk'>@@ -63,93 +53,107 @@ static const struct iwl_eeprom_params iwl5000_eeprom_params = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+const struct iwl_mac_cfg iwl5000_mac_cfg = {</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_5000,</div><div class='add'>+	.base = &amp;iwl5000_base,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define IWL_DEVICE_5000						\</div><div class='ctx'> 	.fw_name_pre = IWL5000_FW_PRE,				\</div><div class='ctx'> 	.ucode_api_max = IWL5000_UCODE_API_MAX,			\</div><div class='ctx'> 	.ucode_api_min = IWL5000_UCODE_API_MIN,			\</div><div class='del'>-	.trans.device_family = IWL_DEVICE_FAMILY_5000,		\</div><div class='ctx'> 	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\</div><div class='ctx'> 	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\</div><div class='ctx'> 	.nvm_ver = EEPROM_5000_EEPROM_VERSION,		\</div><div class='ctx'> 	.nvm_calib_ver = EEPROM_5000_TX_POWER_VERSION,	\</div><div class='del'>-	.trans.base_params = &amp;iwl5000_base_params,		\</div><div class='ctx'> 	.eeprom_params = &amp;iwl5000_eeprom_params,		\</div><div class='ctx'> 	.led_mode = IWL_LED_BLINK</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl5300_agn_cfg = {</div><div class='del'>-	.name = "Intel(R) Ultimate N WiFi Link 5300 AGN",</div><div class='add'>+const struct iwl_rf_cfg iwl5300_agn_cfg = {</div><div class='ctx'> 	IWL_DEVICE_5000,</div><div class='ctx'> 	/* at least EEPROM 0x11A has wrong info */</div><div class='ctx'> 	.valid_tx_ant = ANT_ABC,	/* .cfg overwrite */</div><div class='ctx'> 	.valid_rx_ant = ANT_ABC,	/* .cfg overwrite */</div><div class='del'>-	.ht_params = &amp;iwl5000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.ht_greenfield_support = true,</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl5100_bgn_cfg = {</div><div class='del'>-	.name = "Intel(R) WiFi Link 5100 BGN",</div><div class='del'>-	IWL_DEVICE_5000,</div><div class='del'>-	.valid_tx_ant = ANT_B,		/* .cfg overwrite */</div><div class='del'>-	.valid_rx_ant = ANT_AB,		/* .cfg overwrite */</div><div class='del'>-	.ht_params = &amp;iwl5000_ht_params,</div><div class='del'>-};</div><div class='add'>+const char iwl5300_agn_name[] = "Intel(R) Ultimate N WiFi Link 5300 AGN";</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl5100_abg_cfg = {</div><div class='del'>-	.name = "Intel(R) WiFi Link 5100 ABG",</div><div class='add'>+const struct iwl_rf_cfg iwl5100_n_cfg = {</div><div class='ctx'> 	IWL_DEVICE_5000,</div><div class='ctx'> 	.valid_tx_ant = ANT_B,		/* .cfg overwrite */</div><div class='ctx'> 	.valid_rx_ant = ANT_AB,		/* .cfg overwrite */</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.ht_greenfield_support = true,</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl5100_agn_cfg = {</div><div class='del'>-	.name = "Intel(R) WiFi Link 5100 AGN",</div><div class='add'>+const char iwl5100_bgn_name[] = "Intel(R) WiFi Link 5100 BGN";</div><div class='add'>+</div><div class='add'>+const struct iwl_rf_cfg iwl5100_abg_cfg = {</div><div class='ctx'> 	IWL_DEVICE_5000,</div><div class='ctx'> 	.valid_tx_ant = ANT_B,		/* .cfg overwrite */</div><div class='ctx'> 	.valid_rx_ant = ANT_AB,		/* .cfg overwrite */</div><div class='del'>-	.ht_params = &amp;iwl5000_ht_params,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl5350_agn_cfg = {</div><div class='del'>-	.name = "Intel(R) WiMAX/WiFi Link 5350 AGN",</div><div class='add'>+const char iwl5100_abg_name[] = "Intel(R) WiFi Link 5100 ABG";</div><div class='add'>+const char iwl5100_agn_name[] = "Intel(R) WiFi Link 5100 AGN";</div><div class='add'>+</div><div class='add'>+const struct iwl_rf_cfg iwl5350_agn_cfg = {</div><div class='ctx'> 	.fw_name_pre = IWL5000_FW_PRE,</div><div class='ctx'> 	.ucode_api_max = IWL5000_UCODE_API_MAX,</div><div class='ctx'> 	.ucode_api_min = IWL5000_UCODE_API_MIN,</div><div class='del'>-	.trans.device_family = IWL_DEVICE_FAMILY_5000,</div><div class='ctx'> 	.max_inst_size = IWLAGN_RTC_INST_SIZE,</div><div class='ctx'> 	.max_data_size = IWLAGN_RTC_DATA_SIZE,</div><div class='ctx'> 	.nvm_ver = EEPROM_5050_EEPROM_VERSION,</div><div class='ctx'> 	.nvm_calib_ver = EEPROM_5050_TX_POWER_VERSION,</div><div class='del'>-	.trans.base_params = &amp;iwl5000_base_params,</div><div class='ctx'> 	.eeprom_params = &amp;iwl5000_eeprom_params,</div><div class='del'>-	.ht_params = &amp;iwl5000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.ht_greenfield_support = true,</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	},</div><div class='ctx'> 	.led_mode = IWL_LED_BLINK,</div><div class='ctx'> 	.internal_wimax_coex = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+const char iwl5350_agn_name[] = "Intel(R) WiMAX/WiFi Link 5350 AGN";</div><div class='add'>+</div><div class='add'>+const struct iwl_mac_cfg iwl5150_mac_cfg = {</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_5150,</div><div class='add'>+	.base = &amp;iwl5000_base,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define IWL_DEVICE_5150						\</div><div class='ctx'> 	.fw_name_pre = IWL5150_FW_PRE,				\</div><div class='ctx'> 	.ucode_api_max = IWL5150_UCODE_API_MAX,			\</div><div class='ctx'> 	.ucode_api_min = IWL5150_UCODE_API_MIN,			\</div><div class='del'>-	.trans.device_family = IWL_DEVICE_FAMILY_5150,		\</div><div class='ctx'> 	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\</div><div class='ctx'> 	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\</div><div class='ctx'> 	.nvm_ver = EEPROM_5050_EEPROM_VERSION,		\</div><div class='ctx'> 	.nvm_calib_ver = EEPROM_5050_TX_POWER_VERSION,	\</div><div class='del'>-	.trans.base_params = &amp;iwl5000_base_params,		\</div><div class='ctx'> 	.eeprom_params = &amp;iwl5000_eeprom_params,		\</div><div class='ctx'> 	.led_mode = IWL_LED_BLINK,				\</div><div class='ctx'> 	.internal_wimax_coex = true</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl5150_agn_cfg = {</div><div class='del'>-	.name = "Intel(R) WiMAX/WiFi Link 5150 AGN",</div><div class='add'>+const struct iwl_rf_cfg iwl5150_agn_cfg = {</div><div class='ctx'> 	IWL_DEVICE_5150,</div><div class='del'>-	.ht_params = &amp;iwl5000_ht_params,</div><div class='del'>-</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.ht_greenfield_support = true,</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl5150_abg_cfg = {</div><div class='del'>-	.name = "Intel(R) WiMAX/WiFi Link 5150 ABG",</div><div class='add'>+const char iwl5150_agn_name[] = "Intel(R) WiMAX/WiFi Link 5150 AGN";</div><div class='add'>+</div><div class='add'>+const struct iwl_rf_cfg iwl5150_abg_cfg = {</div><div class='ctx'> 	IWL_DEVICE_5150,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+const char iwl5150_abg_name[] = "Intel(R) WiMAX/WiFi Link 5150 ABG";</div><div class='add'>+</div><div class='ctx'> MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX));</div><div class='ctx'> MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_MAX));</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/6000.c b/drivers/net/wireless/intel/iwlwifi/cfg/6000.c<br/>index 541a3ec85777..ab13394896e0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/6000.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/6000.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/6000.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/cfg/6000.c</a></div><div class='hunk'>@@ -2,12 +2,7 @@</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.</div><div class='del'>- * Copyright(c) 2018 - 2020 Intel Corporation</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='add'>+ * Copyright(c) 2018 - 2020, 2023, 2025 Intel Corporation</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -42,19 +37,19 @@</div><div class='ctx'> #define EEPROM_6035_TX_POWER_VERSION	(6)</div><div class='ctx'> #define EEPROM_6035_EEPROM_VERSION	(0x753)</div><div class='ctx'> </div><div class='del'>-#define IWL6000_FW_PRE "iwlwifi-6000-"</div><div class='del'>-#define IWL6000_MODULE_FIRMWARE(api) IWL6000_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+#define IWL6000_FW_PRE "iwlwifi-6000"</div><div class='add'>+#define IWL6000_MODULE_FIRMWARE(api) IWL6000_FW_PRE "-" __stringify(api) ".ucode"</div><div class='ctx'> </div><div class='del'>-#define IWL6050_FW_PRE "iwlwifi-6050-"</div><div class='del'>-#define IWL6050_MODULE_FIRMWARE(api) IWL6050_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+#define IWL6050_FW_PRE "iwlwifi-6050"</div><div class='add'>+#define IWL6050_MODULE_FIRMWARE(api) IWL6050_FW_PRE "-" __stringify(api) ".ucode"</div><div class='ctx'> </div><div class='del'>-#define IWL6005_FW_PRE "iwlwifi-6000g2a-"</div><div class='del'>-#define IWL6005_MODULE_FIRMWARE(api) IWL6005_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+#define IWL6005_FW_PRE "iwlwifi-6000g2a"</div><div class='add'>+#define IWL6005_MODULE_FIRMWARE(api) IWL6005_FW_PRE "-" __stringify(api) ".ucode"</div><div class='ctx'> </div><div class='del'>-#define IWL6030_FW_PRE "iwlwifi-6000g2b-"</div><div class='del'>-#define IWL6030_MODULE_FIRMWARE(api) IWL6030_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+#define IWL6030_FW_PRE "iwlwifi-6000g2b"</div><div class='add'>+#define IWL6030_MODULE_FIRMWARE(api) IWL6030_FW_PRE "-" __stringify(api) ".ucode"</div><div class='ctx'> </div><div class='del'>-static const struct iwl_base_params iwl6000_base_params = {</div><div class='add'>+static const struct iwl_family_base_params iwl6000_base = {</div><div class='ctx'> 	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,</div><div class='ctx'> 	.num_of_queues = IWLAGN_NUM_QUEUES,</div><div class='ctx'> 	.max_tfd_queue_size = 256,</div><div class='hunk'>@@ -67,7 +62,7 @@ static const struct iwl_base_params iwl6000_base_params = {</div><div class='ctx'> 	.scd_chain_ext_wa = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct iwl_base_params iwl6050_base_params = {</div><div class='add'>+static const struct iwl_family_base_params iwl6050_base = {</div><div class='ctx'> 	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,</div><div class='ctx'> 	.num_of_queues = IWLAGN_NUM_QUEUES,</div><div class='ctx'> 	.max_tfd_queue_size = 256,</div><div class='hunk'>@@ -80,7 +75,7 @@ static const struct iwl_base_params iwl6050_base_params = {</div><div class='ctx'> 	.scd_chain_ext_wa = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct iwl_base_params iwl6000_g2_base_params = {</div><div class='add'>+static const struct iwl_family_base_params iwl6000_g2_base = {</div><div class='ctx'> 	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,</div><div class='ctx'> 	.num_of_queues = IWLAGN_NUM_QUEUES,</div><div class='ctx'> 	.max_tfd_queue_size = 256,</div><div class='hunk'>@@ -93,12 +88,6 @@ static const struct iwl_base_params iwl6000_g2_base_params = {</div><div class='ctx'> 	.scd_chain_ext_wa = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct iwl_ht_params iwl6000_ht_params = {</div><div class='del'>-	.ht_greenfield_support = true,</div><div class='del'>-	.use_rts_for_aggregation = true, /* use rts/cts protection */</div><div class='del'>-	.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct iwl_eeprom_params iwl6000_eeprom_params = {</div><div class='ctx'> 	.regulatory_bands = {</div><div class='ctx'> 		EEPROM_REG_BAND_1_CHANNELS,</div><div class='hunk'>@@ -112,141 +101,126 @@ static const struct iwl_eeprom_params iwl6000_eeprom_params = {</div><div class='ctx'> 	.enhanced_txpower = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+const struct iwl_mac_cfg iwl6005_mac_cfg = {</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_6005,</div><div class='add'>+	.base = &amp;iwl6000_g2_base,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define IWL_DEVICE_6005						\</div><div class='ctx'> 	.fw_name_pre = IWL6005_FW_PRE,				\</div><div class='ctx'> 	.ucode_api_max = IWL6000G2_UCODE_API_MAX,		\</div><div class='ctx'> 	.ucode_api_min = IWL6000G2_UCODE_API_MIN,		\</div><div class='del'>-	.trans.device_family = IWL_DEVICE_FAMILY_6005,		\</div><div class='ctx'> 	.max_inst_size = IWL60_RTC_INST_SIZE,			\</div><div class='ctx'> 	.max_data_size = IWL60_RTC_DATA_SIZE,			\</div><div class='ctx'> 	.nvm_ver = EEPROM_6005_EEPROM_VERSION,		\</div><div class='ctx'> 	.nvm_calib_ver = EEPROM_6005_TX_POWER_VERSION,	\</div><div class='del'>-	.trans.base_params = &amp;iwl6000_g2_base_params,		\</div><div class='ctx'> 	.eeprom_params = &amp;iwl6000_eeprom_params,		\</div><div class='ctx'> 	.led_mode = IWL_LED_RF_STATE</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl6005_2agn_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Advanced-N 6205 AGN",</div><div class='add'>+const struct iwl_rf_cfg iwl6005_n_cfg = {</div><div class='ctx'> 	IWL_DEVICE_6005,</div><div class='del'>-	.ht_params = &amp;iwl6000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.ht_greenfield_support = true,</div><div class='add'>+		.use_rts_for_aggregation = true, /* use rts/cts protection */</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl6005_2abg_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Advanced-N 6205 ABG",</div><div class='del'>-	IWL_DEVICE_6005,</div><div class='del'>-};</div><div class='add'>+const char iwl6005_2agn_name[] = "Intel(R) Centrino(R) Advanced-N 6205 AGN";</div><div class='add'>+const char iwl6005_2agn_sff_name[] = "Intel(R) Centrino(R) Advanced-N 6205S AGN";</div><div class='add'>+const char iwl6005_2agn_d_name[] = "Intel(R) Centrino(R) Advanced-N 6205D AGN";</div><div class='add'>+const char iwl6005_2agn_mow1_name[] = "Intel(R) Centrino(R) Advanced-N 6206 AGN";</div><div class='add'>+const char iwl6005_2agn_mow2_name[] = "Intel(R) Centrino(R) Advanced-N 6207 AGN";</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl6005_2bg_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Advanced-N 6205 BG",</div><div class='add'>+const struct iwl_rf_cfg iwl6005_non_n_cfg = {</div><div class='ctx'> 	IWL_DEVICE_6005,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl6005_2agn_sff_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Advanced-N 6205S AGN",</div><div class='del'>-	IWL_DEVICE_6005,</div><div class='del'>-	.ht_params = &amp;iwl6000_ht_params,</div><div class='del'>-};</div><div class='add'>+const char iwl6005_2abg_name[] = "Intel(R) Centrino(R) Advanced-N 6205 ABG";</div><div class='add'>+const char iwl6005_2bg_name[] = "Intel(R) Centrino(R) Advanced-N 6205 BG";</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl6005_2agn_d_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Advanced-N 6205D AGN",</div><div class='del'>-	IWL_DEVICE_6005,</div><div class='del'>-	.ht_params = &amp;iwl6000_ht_params,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl6005_2agn_mow1_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Advanced-N 6206 AGN",</div><div class='del'>-	IWL_DEVICE_6005,</div><div class='del'>-	.ht_params = &amp;iwl6000_ht_params,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl6005_2agn_mow2_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Advanced-N 6207 AGN",</div><div class='del'>-	IWL_DEVICE_6005,</div><div class='del'>-	.ht_params = &amp;iwl6000_ht_params,</div><div class='add'>+const struct iwl_mac_cfg iwl6030_mac_cfg = {</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_6030,</div><div class='add'>+	.base = &amp;iwl6000_g2_base,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IWL_DEVICE_6030						\</div><div class='ctx'> 	.fw_name_pre = IWL6030_FW_PRE,				\</div><div class='ctx'> 	.ucode_api_max = IWL6000G2_UCODE_API_MAX,		\</div><div class='ctx'> 	.ucode_api_min = IWL6000G2_UCODE_API_MIN,		\</div><div class='del'>-	.trans.device_family = IWL_DEVICE_FAMILY_6030,		\</div><div class='ctx'> 	.max_inst_size = IWL60_RTC_INST_SIZE,			\</div><div class='ctx'> 	.max_data_size = IWL60_RTC_DATA_SIZE,			\</div><div class='ctx'> 	.nvm_ver = EEPROM_6030_EEPROM_VERSION,		\</div><div class='ctx'> 	.nvm_calib_ver = EEPROM_6030_TX_POWER_VERSION,	\</div><div class='del'>-	.trans.base_params = &amp;iwl6000_g2_base_params,		\</div><div class='ctx'> 	.eeprom_params = &amp;iwl6000_eeprom_params,		\</div><div class='ctx'> 	.led_mode = IWL_LED_RF_STATE</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl6030_2agn_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Advanced-N 6230 AGN",</div><div class='add'>+const struct iwl_rf_cfg iwl6030_n_cfg = {</div><div class='ctx'> 	IWL_DEVICE_6030,</div><div class='del'>-	.ht_params = &amp;iwl6000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.ht_greenfield_support = true,</div><div class='add'>+		.use_rts_for_aggregation = true, /* use rts/cts protection */</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl6030_2abg_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Advanced-N 6230 ABG",</div><div class='del'>-	IWL_DEVICE_6030,</div><div class='del'>-};</div><div class='add'>+const char iwl6030_2agn_name[] = "Intel(R) Centrino(R) Advanced-N 6230 AGN";</div><div class='add'>+const char iwl6030_2bgn_name[] = "Intel(R) Centrino(R) Advanced-N 6230 BGN";</div><div class='add'>+const char iwl1030_bgn_name[] = "Intel(R) Centrino(R) Wireless-N 1030 BGN";</div><div class='add'>+const char iwl1030_bg_name[] = "Intel(R) Centrino(R) Wireless-N 1030 BG";</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl6030_2bgn_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Advanced-N 6230 BGN",</div><div class='add'>+const struct iwl_rf_cfg iwl6030_non_n_cfg = {</div><div class='ctx'> 	IWL_DEVICE_6030,</div><div class='del'>-	.ht_params = &amp;iwl6000_ht_params,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl6030_2bg_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Advanced-N 6230 BG",</div><div class='del'>-	IWL_DEVICE_6030,</div><div class='del'>-};</div><div class='add'>+const char iwl6030_2abg_name[] = "Intel(R) Centrino(R) Advanced-N 6230 ABG";</div><div class='add'>+const char iwl6030_2bg_name[] = "Intel(R) Centrino(R) Advanced-N 6230 BG";</div><div class='ctx'> </div><div class='ctx'> #define IWL_DEVICE_6035						\</div><div class='ctx'> 	.fw_name_pre = IWL6030_FW_PRE,				\</div><div class='ctx'> 	.ucode_api_max = IWL6035_UCODE_API_MAX,			\</div><div class='ctx'> 	.ucode_api_min = IWL6035_UCODE_API_MIN,			\</div><div class='del'>-	.trans.device_family = IWL_DEVICE_FAMILY_6030,		\</div><div class='ctx'> 	.max_inst_size = IWL60_RTC_INST_SIZE,			\</div><div class='ctx'> 	.max_data_size = IWL60_RTC_DATA_SIZE,			\</div><div class='ctx'> 	.nvm_ver = EEPROM_6030_EEPROM_VERSION,		\</div><div class='ctx'> 	.nvm_calib_ver = EEPROM_6030_TX_POWER_VERSION,	\</div><div class='del'>-	.trans.base_params = &amp;iwl6000_g2_base_params,		\</div><div class='ctx'> 	.eeprom_params = &amp;iwl6000_eeprom_params,		\</div><div class='ctx'> 	.led_mode = IWL_LED_RF_STATE</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl6035_2agn_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Advanced-N 6235 AGN",</div><div class='add'>+const struct iwl_rf_cfg iwl6035_2agn_cfg = {</div><div class='ctx'> 	IWL_DEVICE_6035,</div><div class='del'>-	.ht_params = &amp;iwl6000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.ht_greenfield_support = true,</div><div class='add'>+		.use_rts_for_aggregation = true, /* use rts/cts protection */</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl6035_2agn_sff_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Ultimate-N 6235 AGN",</div><div class='del'>-	IWL_DEVICE_6035,</div><div class='del'>-	.ht_params = &amp;iwl6000_ht_params,</div><div class='del'>-};</div><div class='add'>+const char iwl6035_2agn_name[] = "Intel(R) Centrino(R) Advanced-N 6235 AGN";</div><div class='add'>+const char iwl6035_2agn_sff_name[] = "Intel(R) Centrino(R) Ultimate-N 6235 AGN";</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl1030_bgn_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Wireless-N 1030 BGN",</div><div class='add'>+const struct iwl_rf_cfg iwl130_bgn_cfg = {</div><div class='ctx'> 	IWL_DEVICE_6030,</div><div class='del'>-	.ht_params = &amp;iwl6000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.ht_greenfield_support = true,</div><div class='add'>+		.use_rts_for_aggregation = true, /* use rts/cts protection */</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	},</div><div class='add'>+	.rx_with_siso_diversity = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl1030_bg_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Wireless-N 1030 BG",</div><div class='del'>-	IWL_DEVICE_6030,</div><div class='del'>-};</div><div class='add'>+const char iwl130_bgn_name[] = "Intel(R) Centrino(R) Wireless-N 130 BGN";</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl130_bgn_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Wireless-N 130 BGN",</div><div class='add'>+const struct iwl_rf_cfg iwl130_bg_cfg = {</div><div class='ctx'> 	IWL_DEVICE_6030,</div><div class='del'>-	.ht_params = &amp;iwl6000_ht_params,</div><div class='ctx'> 	.rx_with_siso_diversity = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl130_bg_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Wireless-N 130 BG",</div><div class='del'>-	IWL_DEVICE_6030,</div><div class='del'>-	.rx_with_siso_diversity = true,</div><div class='add'>+const char iwl130_bg_name[] = "Intel(R) Centrino(R) Wireless-N 130 BG";</div><div class='add'>+</div><div class='add'>+const struct iwl_mac_cfg iwl6000i_mac_cfg = {</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_6000i,</div><div class='add'>+	.base = &amp;iwl6000_base,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -256,101 +230,127 @@ const struct iwl_cfg iwl130_bg_cfg = {</div><div class='ctx'> 	.fw_name_pre = IWL6000_FW_PRE,				\</div><div class='ctx'> 	.ucode_api_max = IWL6000_UCODE_API_MAX,			\</div><div class='ctx'> 	.ucode_api_min = IWL6000_UCODE_API_MIN,			\</div><div class='del'>-	.trans.device_family = IWL_DEVICE_FAMILY_6000i,		\</div><div class='ctx'> 	.max_inst_size = IWL60_RTC_INST_SIZE,			\</div><div class='ctx'> 	.max_data_size = IWL60_RTC_DATA_SIZE,			\</div><div class='ctx'> 	.valid_tx_ant = ANT_BC,		/* .cfg overwrite */	\</div><div class='ctx'> 	.valid_rx_ant = ANT_BC,		/* .cfg overwrite */	\</div><div class='ctx'> 	.nvm_ver = EEPROM_6000_EEPROM_VERSION,		\</div><div class='ctx'> 	.nvm_calib_ver = EEPROM_6000_TX_POWER_VERSION,	\</div><div class='del'>-	.trans.base_params = &amp;iwl6000_base_params,		\</div><div class='ctx'> 	.eeprom_params = &amp;iwl6000_eeprom_params,		\</div><div class='ctx'> 	.led_mode = IWL_LED_BLINK</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl6000i_2agn_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Advanced-N 6200 AGN",</div><div class='add'>+const struct iwl_rf_cfg iwl6000i_2agn_cfg = {</div><div class='ctx'> 	IWL_DEVICE_6000i,</div><div class='del'>-	.ht_params = &amp;iwl6000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.ht_greenfield_support = true,</div><div class='add'>+		.use_rts_for_aggregation = true, /* use rts/cts protection */</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl6000i_2abg_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Advanced-N 6200 ABG",</div><div class='add'>+const char iwl6000i_2agn_name[] = "Intel(R) Centrino(R) Advanced-N 6200 AGN";</div><div class='add'>+</div><div class='add'>+const struct iwl_rf_cfg iwl6000i_non_n_cfg = {</div><div class='ctx'> 	IWL_DEVICE_6000i,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl6000i_2bg_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Advanced-N 6200 BG",</div><div class='del'>-	IWL_DEVICE_6000i,</div><div class='add'>+const char iwl6000i_2abg_name[] = "Intel(R) Centrino(R) Advanced-N 6200 ABG";</div><div class='add'>+const char iwl6000i_2bg_name[] = "Intel(R) Centrino(R) Advanced-N 6200 BG";</div><div class='add'>+</div><div class='add'>+const struct iwl_mac_cfg iwl6050_mac_cfg = {</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_6050,</div><div class='add'>+	.base = &amp;iwl6050_base,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IWL_DEVICE_6050						\</div><div class='ctx'> 	.fw_name_pre = IWL6050_FW_PRE,				\</div><div class='ctx'> 	.ucode_api_max = IWL6050_UCODE_API_MAX,			\</div><div class='ctx'> 	.ucode_api_min = IWL6050_UCODE_API_MIN,			\</div><div class='del'>-	.trans.device_family = IWL_DEVICE_FAMILY_6050,		\</div><div class='ctx'> 	.max_inst_size = IWL60_RTC_INST_SIZE,			\</div><div class='ctx'> 	.max_data_size = IWL60_RTC_DATA_SIZE,			\</div><div class='ctx'> 	.valid_tx_ant = ANT_AB,		/* .cfg overwrite */	\</div><div class='ctx'> 	.valid_rx_ant = ANT_AB,		/* .cfg overwrite */	\</div><div class='ctx'> 	.nvm_ver = EEPROM_6050_EEPROM_VERSION,		\</div><div class='ctx'> 	.nvm_calib_ver = EEPROM_6050_TX_POWER_VERSION,	\</div><div class='del'>-	.trans.base_params = &amp;iwl6050_base_params,		\</div><div class='ctx'> 	.eeprom_params = &amp;iwl6000_eeprom_params,		\</div><div class='ctx'> 	.led_mode = IWL_LED_BLINK,				\</div><div class='ctx'> 	.internal_wimax_coex = true</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl6050_2agn_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 AGN",</div><div class='add'>+const struct iwl_rf_cfg iwl6050_2agn_cfg = {</div><div class='ctx'> 	IWL_DEVICE_6050,</div><div class='del'>-	.ht_params = &amp;iwl6000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.ht_greenfield_support = true,</div><div class='add'>+		.use_rts_for_aggregation = true, /* use rts/cts protection */</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl6050_2abg_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 ABG",</div><div class='add'>+const char iwl6050_2agn_name[] = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 AGN";</div><div class='add'>+</div><div class='add'>+const struct iwl_rf_cfg iwl6050_2abg_cfg = {</div><div class='ctx'> 	IWL_DEVICE_6050,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+const char iwl6050_2abg_name[] = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 ABG";</div><div class='add'>+</div><div class='add'>+const struct iwl_mac_cfg iwl6150_mac_cfg = {</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_6150,</div><div class='add'>+	.base = &amp;iwl6050_base,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define IWL_DEVICE_6150						\</div><div class='ctx'> 	.fw_name_pre = IWL6050_FW_PRE,				\</div><div class='ctx'> 	.ucode_api_max = IWL6050_UCODE_API_MAX,			\</div><div class='ctx'> 	.ucode_api_min = IWL6050_UCODE_API_MIN,			\</div><div class='del'>-	.trans.device_family = IWL_DEVICE_FAMILY_6150,		\</div><div class='ctx'> 	.max_inst_size = IWL60_RTC_INST_SIZE,			\</div><div class='ctx'> 	.max_data_size = IWL60_RTC_DATA_SIZE,			\</div><div class='ctx'> 	.nvm_ver = EEPROM_6150_EEPROM_VERSION,		\</div><div class='ctx'> 	.nvm_calib_ver = EEPROM_6150_TX_POWER_VERSION,	\</div><div class='del'>-	.trans.base_params = &amp;iwl6050_base_params,		\</div><div class='ctx'> 	.eeprom_params = &amp;iwl6000_eeprom_params,		\</div><div class='ctx'> 	.led_mode = IWL_LED_BLINK,				\</div><div class='ctx'> 	.internal_wimax_coex = true</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl6150_bgn_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BGN",</div><div class='add'>+const struct iwl_rf_cfg iwl6150_bgn_cfg = {</div><div class='ctx'> 	IWL_DEVICE_6150,</div><div class='del'>-	.ht_params = &amp;iwl6000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.ht_greenfield_support = true,</div><div class='add'>+		.use_rts_for_aggregation = true, /* use rts/cts protection */</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl6150_bg_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BG",</div><div class='add'>+const char iwl6150_bgn_name[] = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BGN";</div><div class='add'>+</div><div class='add'>+const struct iwl_rf_cfg iwl6150_bg_cfg = {</div><div class='ctx'> 	IWL_DEVICE_6150,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl6000_3agn_cfg = {</div><div class='del'>-	.name = "Intel(R) Centrino(R) Ultimate-N 6300 AGN",</div><div class='add'>+const char iwl6150_bg_name[] = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BG";</div><div class='add'>+</div><div class='add'>+const struct iwl_mac_cfg iwl6000_mac_cfg = {</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_6000,</div><div class='add'>+	.base = &amp;iwl6000_base,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct iwl_rf_cfg iwl6000_3agn_cfg = {</div><div class='ctx'> 	.fw_name_pre = IWL6000_FW_PRE,</div><div class='ctx'> 	.ucode_api_max = IWL6000_UCODE_API_MAX,</div><div class='ctx'> 	.ucode_api_min = IWL6000_UCODE_API_MIN,</div><div class='del'>-	.trans.device_family = IWL_DEVICE_FAMILY_6000,</div><div class='ctx'> 	.max_inst_size = IWL60_RTC_INST_SIZE,</div><div class='ctx'> 	.max_data_size = IWL60_RTC_DATA_SIZE,</div><div class='ctx'> 	.nvm_ver = EEPROM_6000_EEPROM_VERSION,</div><div class='ctx'> 	.nvm_calib_ver = EEPROM_6000_TX_POWER_VERSION,</div><div class='del'>-	.trans.base_params = &amp;iwl6000_base_params,</div><div class='ctx'> 	.eeprom_params = &amp;iwl6000_eeprom_params,</div><div class='del'>-	.ht_params = &amp;iwl6000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.ht_greenfield_support = true,</div><div class='add'>+		.use_rts_for_aggregation = true, /* use rts/cts protection */</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	},</div><div class='ctx'> 	.led_mode = IWL_LED_BLINK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+const char iwl6000_3agn_name[] = "Intel(R) Centrino(R) Ultimate-N 6300 AGN";</div><div class='add'>+</div><div class='ctx'> MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));</div><div class='ctx'> MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX));</div><div class='ctx'> MODULE_FIRMWARE(IWL6005_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/7000.c b/drivers/net/wireless/intel/iwlwifi/cfg/7000.c<br/>index b24dc5523a52..f987ad3192c1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/7000.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/7000.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/7000.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/cfg/7000.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2020, 2023, 2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2015 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -34,22 +34,22 @@</div><div class='ctx'> #define IWL3160_DCCM_LEN		0x10000</div><div class='ctx'> #define IWL7265_DCCM_LEN		0x17A00</div><div class='ctx'> </div><div class='del'>-#define IWL7260_FW_PRE "iwlwifi-7260-"</div><div class='del'>-#define IWL7260_MODULE_FIRMWARE(api) IWL7260_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+#define IWL7260_FW_PRE "iwlwifi-7260"</div><div class='add'>+#define IWL7260_MODULE_FIRMWARE(api) IWL7260_FW_PRE "-" __stringify(api) ".ucode"</div><div class='ctx'> </div><div class='del'>-#define IWL3160_FW_PRE "iwlwifi-3160-"</div><div class='del'>-#define IWL3160_MODULE_FIRMWARE(api) IWL3160_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+#define IWL3160_FW_PRE "iwlwifi-3160"</div><div class='add'>+#define IWL3160_MODULE_FIRMWARE(api) IWL3160_FW_PRE "-" __stringify(api) ".ucode"</div><div class='ctx'> </div><div class='del'>-#define IWL3168_FW_PRE "iwlwifi-3168-"</div><div class='del'>-#define IWL3168_MODULE_FIRMWARE(api) IWL3168_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+#define IWL3168_FW_PRE "iwlwifi-3168"</div><div class='add'>+#define IWL3168_MODULE_FIRMWARE(api) IWL3168_FW_PRE "-" __stringify(api) ".ucode"</div><div class='ctx'> </div><div class='del'>-#define IWL7265_FW_PRE "iwlwifi-7265-"</div><div class='del'>-#define IWL7265_MODULE_FIRMWARE(api) IWL7265_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+#define IWL7265_FW_PRE "iwlwifi-7265"</div><div class='add'>+#define IWL7265_MODULE_FIRMWARE(api) IWL7265_FW_PRE "-" __stringify(api) ".ucode"</div><div class='ctx'> </div><div class='del'>-#define IWL7265D_FW_PRE "iwlwifi-7265D-"</div><div class='del'>-#define IWL7265D_MODULE_FIRMWARE(api) IWL7265D_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+#define IWL7265D_FW_PRE "iwlwifi-7265D"</div><div class='add'>+#define IWL7265D_MODULE_FIRMWARE(api) IWL7265D_FW_PRE "-" __stringify(api) ".ucode"</div><div class='ctx'> </div><div class='del'>-static const struct iwl_base_params iwl7000_base_params = {</div><div class='add'>+static const struct iwl_family_base_params iwl7000_base = {</div><div class='ctx'> 	.eeprom_size = OTP_LOW_IMAGE_SIZE_16K,</div><div class='ctx'> 	.num_of_queues = 31,</div><div class='ctx'> 	.max_tfd_queue_size = 256,</div><div class='hunk'>@@ -60,6 +60,7 @@ static const struct iwl_base_params iwl7000_base_params = {</div><div class='ctx'> 	.shadow_reg_enable = true,</div><div class='ctx'> 	.pcie_l1_allowed = true,</div><div class='ctx'> 	.apmg_wake_up_wa = true,</div><div class='add'>+	.nvm_hw_section_num = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct iwl_tt_params iwl7000_high_temp_tt_params = {</div><div class='hunk'>@@ -84,16 +85,13 @@ static const struct iwl_tt_params iwl7000_high_temp_tt_params = {</div><div class='ctx'> 	.support_tx_backoff = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct iwl_ht_params iwl7000_ht_params = {</div><div class='del'>-	.stbc = true,</div><div class='del'>-	.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+const struct iwl_mac_cfg iwl7000_mac_cfg = {</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_7000,</div><div class='add'>+	.base = &amp;iwl7000_base,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IWL_DEVICE_7000_COMMON					\</div><div class='del'>-	.trans.device_family = IWL_DEVICE_FAMILY_7000,		\</div><div class='del'>-	.trans.base_params = &amp;iwl7000_base_params,		\</div><div class='ctx'> 	.led_mode = IWL_LED_RF_STATE,				\</div><div class='del'>-	.nvm_hw_section_num = 0,				\</div><div class='ctx'> 	.non_shared_ant = ANT_A,				\</div><div class='ctx'> 	.dccm_offset = IWL7000_DCCM_OFFSET</div><div class='ctx'> </div><div class='hunk'>@@ -117,77 +115,52 @@ static const struct iwl_ht_params iwl7000_ht_params = {</div><div class='ctx'> 	.ucode_api_max = IWL7265D_UCODE_API_MAX,		\</div><div class='ctx'> 	.ucode_api_min = IWL7265D_UCODE_API_MIN</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl7260_2ac_cfg = {</div><div class='del'>-	.name = "Intel(R) Dual Band Wireless AC 7260",</div><div class='add'>+const char iwl7260_2ac_name[] = "Intel(R) Dual Band Wireless AC 7260";</div><div class='add'>+const char iwl7260_2n_name[] = "Intel(R) Dual Band Wireless N 7260";</div><div class='add'>+const char iwl7260_n_name[] = "Intel(R) Wireless N 7260";</div><div class='add'>+const char iwl3160_2ac_name[] = "Intel(R) Dual Band Wireless AC 3160";</div><div class='add'>+const char iwl3160_2n_name[] = "Intel(R) Dual Band Wireless N 3160";</div><div class='add'>+const char iwl3160_n_name[] = "Intel(R) Wireless N 3160";</div><div class='add'>+const char iwl3165_2ac_name[] = "Intel(R) Dual Band Wireless-AC 3165";</div><div class='add'>+const char iwl3168_2ac_name[] = "Intel(R) Dual Band Wireless-AC 3168";</div><div class='add'>+const char iwl7265_2ac_name[] = "Intel(R) Dual Band Wireless-AC 7265";</div><div class='add'>+const char iwl7265_2n_name[] = "Intel(R) Dual Band Wireless-N 7265";</div><div class='add'>+const char iwl7265_n_name[] = "Intel(R) Wireless-N 7265";</div><div class='add'>+</div><div class='add'>+const struct iwl_rf_cfg iwl7260_cfg = {</div><div class='ctx'> 	.fw_name_pre = IWL7260_FW_PRE,</div><div class='ctx'> 	IWL_DEVICE_7000,</div><div class='del'>-	.ht_params = &amp;iwl7000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.stbc = true,</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	},</div><div class='ctx'> 	.nvm_ver = IWL7260_NVM_VERSION,</div><div class='ctx'> 	.host_interrupt_operation_mode = true,</div><div class='ctx'> 	.lp_xtal_workaround = true,</div><div class='ctx'> 	.dccm_len = IWL7260_DCCM_LEN,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl7260_2ac_cfg_high_temp = {</div><div class='del'>-	.name = "Intel(R) Dual Band Wireless AC 7260",</div><div class='add'>+const struct iwl_rf_cfg iwl7260_high_temp_cfg = {</div><div class='ctx'> 	.fw_name_pre = IWL7260_FW_PRE,</div><div class='ctx'> 	IWL_DEVICE_7000,</div><div class='del'>-	.ht_params = &amp;iwl7000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.stbc = true,</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	},</div><div class='ctx'> 	.nvm_ver = IWL7260_NVM_VERSION,</div><div class='del'>-	.high_temp = true,</div><div class='ctx'> 	.host_interrupt_operation_mode = true,</div><div class='ctx'> 	.lp_xtal_workaround = true,</div><div class='ctx'> 	.dccm_len = IWL7260_DCCM_LEN,</div><div class='ctx'> 	.thermal_params = &amp;iwl7000_high_temp_tt_params,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl7260_2n_cfg = {</div><div class='del'>-	.name = "Intel(R) Dual Band Wireless N 7260",</div><div class='del'>-	.fw_name_pre = IWL7260_FW_PRE,</div><div class='del'>-	IWL_DEVICE_7000,</div><div class='del'>-	.ht_params = &amp;iwl7000_ht_params,</div><div class='del'>-	.nvm_ver = IWL7260_NVM_VERSION,</div><div class='del'>-	.host_interrupt_operation_mode = true,</div><div class='del'>-	.lp_xtal_workaround = true,</div><div class='del'>-	.dccm_len = IWL7260_DCCM_LEN,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl7260_n_cfg = {</div><div class='del'>-	.name = "Intel(R) Wireless N 7260",</div><div class='del'>-	.fw_name_pre = IWL7260_FW_PRE,</div><div class='del'>-	IWL_DEVICE_7000,</div><div class='del'>-	.ht_params = &amp;iwl7000_ht_params,</div><div class='del'>-	.nvm_ver = IWL7260_NVM_VERSION,</div><div class='del'>-	.host_interrupt_operation_mode = true,</div><div class='del'>-	.lp_xtal_workaround = true,</div><div class='del'>-	.dccm_len = IWL7260_DCCM_LEN,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl3160_2ac_cfg = {</div><div class='del'>-	.name = "Intel(R) Dual Band Wireless AC 3160",</div><div class='add'>+const struct iwl_rf_cfg iwl3160_cfg = {</div><div class='ctx'> 	.fw_name_pre = IWL3160_FW_PRE,</div><div class='ctx'> 	IWL_DEVICE_7000,</div><div class='del'>-	.ht_params = &amp;iwl7000_ht_params,</div><div class='del'>-	.nvm_ver = IWL3160_NVM_VERSION,</div><div class='del'>-	.host_interrupt_operation_mode = true,</div><div class='del'>-	.dccm_len = IWL3160_DCCM_LEN,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl3160_2n_cfg = {</div><div class='del'>-	.name = "Intel(R) Dual Band Wireless N 3160",</div><div class='del'>-	.fw_name_pre = IWL3160_FW_PRE,</div><div class='del'>-	IWL_DEVICE_7000,</div><div class='del'>-	.ht_params = &amp;iwl7000_ht_params,</div><div class='del'>-	.nvm_ver = IWL3160_NVM_VERSION,</div><div class='del'>-	.host_interrupt_operation_mode = true,</div><div class='del'>-	.dccm_len = IWL3160_DCCM_LEN,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl3160_n_cfg = {</div><div class='del'>-	.name = "Intel(R) Wireless N 3160",</div><div class='del'>-	.fw_name_pre = IWL3160_FW_PRE,</div><div class='del'>-	IWL_DEVICE_7000,</div><div class='del'>-	.ht_params = &amp;iwl7000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.stbc = true,</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	},</div><div class='ctx'> 	.nvm_ver = IWL3160_NVM_VERSION,</div><div class='ctx'> 	.host_interrupt_operation_mode = true,</div><div class='ctx'> 	.dccm_len = IWL3160_DCCM_LEN,</div><div class='hunk'>@@ -204,88 +177,52 @@ static const struct iwl_pwr_tx_backoff iwl7265_pwr_tx_backoffs[] = {</div><div class='ctx'> 	{0},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct iwl_ht_params iwl7265_ht_params = {</div><div class='del'>-	.stbc = true,</div><div class='del'>-	.ldpc = true,</div><div class='del'>-	.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl3165_2ac_cfg = {</div><div class='del'>-	.name = "Intel(R) Dual Band Wireless AC 3165",</div><div class='add'>+const struct iwl_rf_cfg iwl3165_2ac_cfg = {</div><div class='ctx'> 	.fw_name_pre = IWL7265D_FW_PRE,</div><div class='ctx'> 	IWL_DEVICE_7005D,</div><div class='del'>-	.ht_params = &amp;iwl7000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.stbc = true,</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	},</div><div class='ctx'> 	.nvm_ver = IWL3165_NVM_VERSION,</div><div class='ctx'> 	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,</div><div class='ctx'> 	.dccm_len = IWL7265_DCCM_LEN,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl3168_2ac_cfg = {</div><div class='del'>-	.name = "Intel(R) Dual Band Wireless AC 3168",</div><div class='add'>+const struct iwl_rf_cfg iwl3168_2ac_cfg = {</div><div class='ctx'> 	.fw_name_pre = IWL3168_FW_PRE,</div><div class='ctx'> 	IWL_DEVICE_3008,</div><div class='del'>-	.ht_params = &amp;iwl7000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.stbc = true,</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	},</div><div class='ctx'> 	.nvm_ver = IWL3168_NVM_VERSION,</div><div class='ctx'> 	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,</div><div class='ctx'> 	.dccm_len = IWL7265_DCCM_LEN,</div><div class='ctx'> 	.nvm_type = IWL_NVM_SDP,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl7265_2ac_cfg = {</div><div class='del'>-	.name = "Intel(R) Dual Band Wireless AC 7265",</div><div class='del'>-	.fw_name_pre = IWL7265_FW_PRE,</div><div class='del'>-	IWL_DEVICE_7005,</div><div class='del'>-	.ht_params = &amp;iwl7265_ht_params,</div><div class='del'>-	.nvm_ver = IWL7265_NVM_VERSION,</div><div class='del'>-	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,</div><div class='del'>-	.dccm_len = IWL7265_DCCM_LEN,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl7265_2n_cfg = {</div><div class='del'>-	.name = "Intel(R) Dual Band Wireless N 7265",</div><div class='del'>-	.fw_name_pre = IWL7265_FW_PRE,</div><div class='del'>-	IWL_DEVICE_7005,</div><div class='del'>-	.ht_params = &amp;iwl7265_ht_params,</div><div class='del'>-	.nvm_ver = IWL7265_NVM_VERSION,</div><div class='del'>-	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,</div><div class='del'>-	.dccm_len = IWL7265_DCCM_LEN,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl7265_n_cfg = {</div><div class='del'>-	.name = "Intel(R) Wireless N 7265",</div><div class='add'>+const struct iwl_rf_cfg iwl7265_cfg = {</div><div class='ctx'> 	.fw_name_pre = IWL7265_FW_PRE,</div><div class='ctx'> 	IWL_DEVICE_7005,</div><div class='del'>-	.ht_params = &amp;iwl7265_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.stbc = true,</div><div class='add'>+		.ldpc = true,</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	},</div><div class='ctx'> 	.nvm_ver = IWL7265_NVM_VERSION,</div><div class='ctx'> 	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,</div><div class='ctx'> 	.dccm_len = IWL7265_DCCM_LEN,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl7265d_2ac_cfg = {</div><div class='del'>-	.name = "Intel(R) Dual Band Wireless AC 7265",</div><div class='del'>-	.fw_name_pre = IWL7265D_FW_PRE,</div><div class='del'>-	IWL_DEVICE_7005D,</div><div class='del'>-	.ht_params = &amp;iwl7265_ht_params,</div><div class='del'>-	.nvm_ver = IWL7265D_NVM_VERSION,</div><div class='del'>-	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,</div><div class='del'>-	.dccm_len = IWL7265_DCCM_LEN,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl7265d_2n_cfg = {</div><div class='del'>-	.name = "Intel(R) Dual Band Wireless N 7265",</div><div class='add'>+const struct iwl_rf_cfg iwl7265d_cfg = {</div><div class='ctx'> 	.fw_name_pre = IWL7265D_FW_PRE,</div><div class='ctx'> 	IWL_DEVICE_7005D,</div><div class='del'>-	.ht_params = &amp;iwl7265_ht_params,</div><div class='del'>-	.nvm_ver = IWL7265D_NVM_VERSION,</div><div class='del'>-	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,</div><div class='del'>-	.dccm_len = IWL7265_DCCM_LEN,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl7265d_n_cfg = {</div><div class='del'>-	.name = "Intel(R) Wireless N 7265",</div><div class='del'>-	.fw_name_pre = IWL7265D_FW_PRE,</div><div class='del'>-	IWL_DEVICE_7005D,</div><div class='del'>-	.ht_params = &amp;iwl7265_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.stbc = true,</div><div class='add'>+		.ldpc = true,</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	},</div><div class='ctx'> 	.nvm_ver = IWL7265D_NVM_VERSION,</div><div class='ctx'> 	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,</div><div class='ctx'> 	.dccm_len = IWL7265_DCCM_LEN,</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/8000.c b/drivers/net/wireless/intel/iwlwifi/cfg/8000.c<br/>index a6454287d506..3c844cd419e8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/8000.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/8000.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/8000.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/cfg/8000.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2014, 2018-2020, 2023, 2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2014-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -27,17 +27,15 @@</div><div class='ctx'> #define IWL8260_SMEM_OFFSET		0x400000</div><div class='ctx'> #define IWL8260_SMEM_LEN		0x68000</div><div class='ctx'> </div><div class='del'>-#define IWL8000_FW_PRE "iwlwifi-8000C-"</div><div class='add'>+#define IWL8000_FW_PRE "iwlwifi-8000C"</div><div class='ctx'> #define IWL8000_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL8000_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+	IWL8000_FW_PRE "-" __stringify(api) ".ucode"</div><div class='ctx'> </div><div class='del'>-#define IWL8265_FW_PRE "iwlwifi-8265-"</div><div class='add'>+#define IWL8265_FW_PRE "iwlwifi-8265"</div><div class='ctx'> #define IWL8265_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL8265_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+	IWL8265_FW_PRE "-" __stringify(api) ".ucode"</div><div class='ctx'> </div><div class='del'>-#define DEFAULT_NVM_FILE_FAMILY_8000C		"nvmData-8000C"</div><div class='del'>-</div><div class='del'>-static const struct iwl_base_params iwl8000_base_params = {</div><div class='add'>+static const struct iwl_family_base_params iwl8000_base = {</div><div class='ctx'> 	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,</div><div class='ctx'> 	.num_of_queues = 31,</div><div class='ctx'> 	.max_tfd_queue_size = 256,</div><div class='hunk'>@@ -47,12 +45,11 @@ static const struct iwl_base_params iwl8000_base_params = {</div><div class='ctx'> 	.max_event_log_size = 512,</div><div class='ctx'> 	.shadow_reg_enable = true,</div><div class='ctx'> 	.pcie_l1_allowed = true,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct iwl_ht_params iwl8000_ht_params = {</div><div class='del'>-	.stbc = true,</div><div class='del'>-	.ldpc = true,</div><div class='del'>-	.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	.nvm_hw_section_num = 10,</div><div class='add'>+	.features = NETIF_F_RXCSUM,</div><div class='add'>+	.smem_offset = IWL8260_SMEM_OFFSET,</div><div class='add'>+	.smem_len = IWL8260_SMEM_LEN,</div><div class='add'>+	.apmg_not_supported = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct iwl_tt_params iwl8000_tt_params = {</div><div class='hunk'>@@ -76,30 +73,20 @@ static const struct iwl_tt_params iwl8000_tt_params = {</div><div class='ctx'> 	.support_tx_backoff = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+const struct iwl_mac_cfg iwl8000_mac_cfg = {</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_8000,</div><div class='add'>+	.base = &amp;iwl8000_base,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define IWL_DEVICE_8000_COMMON						\</div><div class='del'>-	.trans.device_family = IWL_DEVICE_FAMILY_8000,			\</div><div class='del'>-	.trans.base_params = &amp;iwl8000_base_params,			\</div><div class='ctx'> 	.led_mode = IWL_LED_RF_STATE,					\</div><div class='del'>-	.nvm_hw_section_num = 10,					\</div><div class='del'>-	.features = NETIF_F_RXCSUM,					\</div><div class='ctx'> 	.non_shared_ant = ANT_A,					\</div><div class='ctx'> 	.dccm_offset = IWL8260_DCCM_OFFSET,				\</div><div class='ctx'> 	.dccm_len = IWL8260_DCCM_LEN,					\</div><div class='ctx'> 	.dccm2_offset = IWL8260_DCCM2_OFFSET,				\</div><div class='ctx'> 	.dccm2_len = IWL8260_DCCM2_LEN,					\</div><div class='del'>-	.smem_offset = IWL8260_SMEM_OFFSET,				\</div><div class='del'>-	.smem_len = IWL8260_SMEM_LEN,					\</div><div class='del'>-	.default_nvm_file_C_step = DEFAULT_NVM_FILE_FAMILY_8000C,	\</div><div class='ctx'> 	.thermal_params = &amp;iwl8000_tt_params,				\</div><div class='del'>-	.apmg_not_supported = true,					\</div><div class='del'>-	.nvm_type = IWL_NVM_EXT,					\</div><div class='del'>-	.dbgc_supported = true,						\</div><div class='del'>-	.min_umac_error_event_table = 0x800000</div><div class='del'>-</div><div class='del'>-#define IWL_DEVICE_8000							\</div><div class='del'>-	IWL_DEVICE_8000_COMMON,						\</div><div class='del'>-	.ucode_api_max = IWL8000_UCODE_API_MAX,				\</div><div class='del'>-	.ucode_api_min = IWL8000_UCODE_API_MIN				\</div><div class='add'>+	.nvm_type = IWL_NVM_EXT</div><div class='ctx'> </div><div class='ctx'> #define IWL_DEVICE_8260							\</div><div class='ctx'> 	IWL_DEVICE_8000_COMMON,						\</div><div class='hunk'>@@ -111,47 +98,39 @@ static const struct iwl_tt_params iwl8000_tt_params = {</div><div class='ctx'> 	.ucode_api_max = IWL8265_UCODE_API_MAX,				\</div><div class='ctx'> 	.ucode_api_min = IWL8265_UCODE_API_MIN				\</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl8260_2n_cfg = {</div><div class='del'>-	.name = "Intel(R) Dual Band Wireless N 8260",</div><div class='del'>-	.fw_name_pre = IWL8000_FW_PRE,</div><div class='del'>-	IWL_DEVICE_8260,</div><div class='del'>-	.ht_params = &amp;iwl8000_ht_params,</div><div class='del'>-	.nvm_ver = IWL8000_NVM_VERSION,</div><div class='del'>-};</div><div class='add'>+const char iwl8260_2n_name[] = "Intel(R) Dual Band Wireless-N 8260";</div><div class='add'>+const char iwl8260_2ac_name[] = "Intel(R) Dual Band Wireless-AC 8260";</div><div class='add'>+const char iwl8265_2ac_name[] = "Intel(R) Dual Band Wireless-AC 8265";</div><div class='add'>+const char iwl8275_2ac_name[] = "Intel(R) Dual Band Wireless-AC 8275";</div><div class='add'>+const char iwl4165_2ac_name[] = "Intel(R) Dual Band Wireless-AC 4165";</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl8260_2ac_cfg = {</div><div class='del'>-	.name = "Intel(R) Dual Band Wireless AC 8260",</div><div class='add'>+const char iwl_killer_1435i_name[] =</div><div class='add'>+	"Killer(R) Wireless-AC 1435i Wireless Network Adapter (8265D2W)";</div><div class='add'>+const char iwl_killer_1434_kix_name[] =</div><div class='add'>+	"Killer(R) Wireless-AC 1435-KIX Wireless Network Adapter (8265NGW)";</div><div class='add'>+</div><div class='add'>+const struct iwl_rf_cfg iwl8260_cfg = {</div><div class='ctx'> 	.fw_name_pre = IWL8000_FW_PRE,</div><div class='ctx'> 	IWL_DEVICE_8260,</div><div class='del'>-	.ht_params = &amp;iwl8000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.stbc = true,</div><div class='add'>+		.ldpc = true,</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	},</div><div class='ctx'> 	.nvm_ver = IWL8000_NVM_VERSION,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl8265_2ac_cfg = {</div><div class='del'>-	.name = "Intel(R) Dual Band Wireless AC 8265",</div><div class='add'>+const struct iwl_rf_cfg iwl8265_cfg = {</div><div class='ctx'> 	.fw_name_pre = IWL8265_FW_PRE,</div><div class='ctx'> 	IWL_DEVICE_8265,</div><div class='del'>-	.ht_params = &amp;iwl8000_ht_params,</div><div class='del'>-	.nvm_ver = IWL8000_NVM_VERSION,</div><div class='del'>-	.vht_mu_mimo_supported = true,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl8275_2ac_cfg = {</div><div class='del'>-	.name = "Intel(R) Dual Band Wireless AC 8275",</div><div class='del'>-	.fw_name_pre = IWL8265_FW_PRE,</div><div class='del'>-	IWL_DEVICE_8265,</div><div class='del'>-	.ht_params = &amp;iwl8000_ht_params,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.stbc = true,</div><div class='add'>+		.ldpc = true,</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	},</div><div class='ctx'> 	.nvm_ver = IWL8000_NVM_VERSION,</div><div class='ctx'> 	.vht_mu_mimo_supported = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg iwl4165_2ac_cfg = {</div><div class='del'>-	.name = "Intel(R) Dual Band Wireless AC 4165",</div><div class='del'>-	.fw_name_pre = IWL8000_FW_PRE,</div><div class='del'>-	IWL_DEVICE_8000,</div><div class='del'>-	.ht_params = &amp;iwl8000_ht_params,</div><div class='del'>-	.nvm_ver = IWL8000_NVM_VERSION,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> MODULE_FIRMWARE(IWL8000_MODULE_FIRMWARE(IWL8000_UCODE_API_MAX));</div><div class='ctx'> MODULE_FIRMWARE(IWL8265_MODULE_FIRMWARE(IWL8265_UCODE_API_MAX));</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c<br/>index df1297358379..5872fc9b8caf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/9000.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/cfg/9000.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/9000.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/cfg/9000.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2018-2021, 2023, 2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/stringify.h&gt;</div><div class='hunk'>@@ -15,25 +15,18 @@</div><div class='ctx'> /* Lowest firmware API version supported */</div><div class='ctx'> #define IWL9000_UCODE_API_MIN	30</div><div class='ctx'> </div><div class='del'>-/* NVM versions */</div><div class='del'>-#define IWL9000_NVM_VERSION		0x0a1d</div><div class='del'>-</div><div class='ctx'> /* Memory offsets and lengths */</div><div class='del'>-#define IWL9000_DCCM_OFFSET		0x800000</div><div class='del'>-#define IWL9000_DCCM_LEN		0x18000</div><div class='del'>-#define IWL9000_DCCM2_OFFSET		0x880000</div><div class='del'>-#define IWL9000_DCCM2_LEN		0x8000</div><div class='ctx'> #define IWL9000_SMEM_OFFSET		0x400000</div><div class='ctx'> #define IWL9000_SMEM_LEN		0x68000</div><div class='ctx'> </div><div class='del'>-#define  IWL9000_FW_PRE "iwlwifi-9000-pu-b0-jf-b0-"</div><div class='del'>-#define  IWL9260_FW_PRE "iwlwifi-9260-th-b0-jf-b0-"</div><div class='add'>+#define  IWL9000_FW_PRE "iwlwifi-9000-pu-b0-jf-b0"</div><div class='add'>+#define  IWL9260_FW_PRE "iwlwifi-9260-th-b0-jf-b0"</div><div class='ctx'> #define IWL9000_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL9000_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+	IWL9000_FW_PRE "-" __stringify(api) ".ucode"</div><div class='ctx'> #define IWL9260_MODULE_FIRMWARE(api) \</div><div class='del'>-	IWL9260_FW_PRE __stringify(api) ".ucode"</div><div class='add'>+	IWL9260_FW_PRE "-" __stringify(api) ".ucode"</div><div class='ctx'> </div><div class='del'>-static const struct iwl_base_params iwl9000_base_params = {</div><div class='add'>+static const struct iwl_family_base_params iwl9000_base = {</div><div class='ctx'> 	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,</div><div class='ctx'> 	.num_of_queues = 31,</div><div class='ctx'> 	.max_tfd_queue_size = 256,</div><div class='hunk'>@@ -43,146 +36,68 @@ static const struct iwl_base_params iwl9000_base_params = {</div><div class='ctx'> 	.max_event_log_size = 512,</div><div class='ctx'> 	.shadow_reg_enable = true,</div><div class='ctx'> 	.pcie_l1_allowed = true,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct iwl_ht_params iwl9000_ht_params = {</div><div class='del'>-	.stbc = true,</div><div class='del'>-	.ldpc = true,</div><div class='del'>-	.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct iwl_tt_params iwl9000_tt_params = {</div><div class='del'>-	.ct_kill_entry = 115,</div><div class='del'>-	.ct_kill_exit = 93,</div><div class='del'>-	.ct_kill_duration = 5,</div><div class='del'>-	.dynamic_smps_entry = 111,</div><div class='del'>-	.dynamic_smps_exit = 107,</div><div class='del'>-	.tx_protection_entry = 112,</div><div class='del'>-	.tx_protection_exit = 105,</div><div class='del'>-	.tx_backoff = {</div><div class='del'>-		{.temperature = 110, .backoff = 200},</div><div class='del'>-		{.temperature = 111, .backoff = 600},</div><div class='del'>-		{.temperature = 112, .backoff = 1200},</div><div class='del'>-		{.temperature = 113, .backoff = 2000},</div><div class='del'>-		{.temperature = 114, .backoff = 4000},</div><div class='add'>+	.smem_offset = IWL9000_SMEM_OFFSET,</div><div class='add'>+	.smem_len = IWL9000_SMEM_LEN,</div><div class='add'>+	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,</div><div class='add'>+	.apmg_not_supported = true,</div><div class='add'>+	.mac_addr_from_csr = 0x380,</div><div class='add'>+	.d3_debug_data_base_addr = 0x401000,</div><div class='add'>+	.d3_debug_data_length = 92 * 1024,</div><div class='add'>+	.nvm_hw_section_num = 10,</div><div class='add'>+	.mon_smem_regs = {</div><div class='add'>+		.write_ptr = {</div><div class='add'>+			.addr = LDBG_M2S_BUF_WPTR,</div><div class='add'>+			.mask = LDBG_M2S_BUF_WPTR_VAL_MSK,</div><div class='add'>+		},</div><div class='add'>+		.cycle_cnt = {</div><div class='add'>+			.addr = LDBG_M2S_BUF_WRAP_CNT,</div><div class='add'>+			.mask = LDBG_M2S_BUF_WRAP_CNT_VAL_MSK,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.mon_dram_regs = {</div><div class='add'>+		.write_ptr = {</div><div class='add'>+			.addr = MON_BUFF_WRPTR_VER2,</div><div class='add'>+			.mask = 0xffffffff,</div><div class='add'>+		},</div><div class='add'>+		.cycle_cnt = {</div><div class='add'>+			.addr = MON_BUFF_CYCLE_CNT_VER2,</div><div class='add'>+			.mask = 0xffffffff,</div><div class='add'>+		},</div><div class='ctx'> 	},</div><div class='del'>-	.support_ct_kill = true,</div><div class='del'>-	.support_dynamic_smps = true,</div><div class='del'>-	.support_tx_protection = true,</div><div class='del'>-	.support_tx_backoff = true,</div><div class='add'>+	.ucode_api_max = IWL9000_UCODE_API_MAX,</div><div class='add'>+	.ucode_api_min = IWL9000_UCODE_API_MIN,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define IWL_DEVICE_9000							\</div><div class='del'>-	.ucode_api_max = IWL9000_UCODE_API_MAX,				\</div><div class='del'>-	.ucode_api_min = IWL9000_UCODE_API_MIN,				\</div><div class='del'>-	.led_mode = IWL_LED_RF_STATE,					\</div><div class='del'>-	.nvm_hw_section_num = 10,					\</div><div class='del'>-	.non_shared_ant = ANT_B,					\</div><div class='del'>-	.dccm_offset = IWL9000_DCCM_OFFSET,				\</div><div class='del'>-	.dccm_len = IWL9000_DCCM_LEN,					\</div><div class='del'>-	.dccm2_offset = IWL9000_DCCM2_OFFSET,				\</div><div class='del'>-	.dccm2_len = IWL9000_DCCM2_LEN,					\</div><div class='del'>-	.smem_offset = IWL9000_SMEM_OFFSET,				\</div><div class='del'>-	.smem_len = IWL9000_SMEM_LEN,					\</div><div class='del'>-	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,		\</div><div class='del'>-	.thermal_params = &amp;iwl9000_tt_params,				\</div><div class='del'>-	.apmg_not_supported = true,					\</div><div class='del'>-	.num_rbds = 512,						\</div><div class='del'>-	.vht_mu_mimo_supported = true,					\</div><div class='del'>-	.mac_addr_from_csr = true,					\</div><div class='del'>-	.nvm_type = IWL_NVM_EXT,					\</div><div class='del'>-	.dbgc_supported = true,						\</div><div class='del'>-	.min_umac_error_event_table = 0x800000,				\</div><div class='del'>-	.d3_debug_data_base_addr = 0x401000,				\</div><div class='del'>-	.d3_debug_data_length = 92 * 1024,				\</div><div class='del'>-	.ht_params = &amp;iwl9000_ht_params,				\</div><div class='del'>-	.nvm_ver = IWL9000_NVM_VERSION,					\</div><div class='del'>-	.mon_smem_regs = {						\</div><div class='del'>-		.write_ptr = {						\</div><div class='del'>-			.addr = LDBG_M2S_BUF_WPTR,			\</div><div class='del'>-			.mask = LDBG_M2S_BUF_WPTR_VAL_MSK,		\</div><div class='del'>-		},							\</div><div class='del'>-		.cycle_cnt = {						\</div><div class='del'>-			.addr = LDBG_M2S_BUF_WRAP_CNT,			\</div><div class='del'>-			.mask = LDBG_M2S_BUF_WRAP_CNT_VAL_MSK,		\</div><div class='del'>-		},							\</div><div class='del'>-	},								\</div><div class='del'>-	.mon_dram_regs = {						\</div><div class='del'>-		.write_ptr = {						\</div><div class='del'>-			.addr = MON_BUFF_WRPTR_VER2,			\</div><div class='del'>-			.mask = 0xffffffff,				\</div><div class='del'>-		},							\</div><div class='del'>-		.cycle_cnt = {						\</div><div class='del'>-			.addr = MON_BUFF_CYCLE_CNT_VER2,		\</div><div class='del'>-			.mask = 0xffffffff,				\</div><div class='del'>-		},							\</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg_trans_params iwl9000_trans_cfg = {</div><div class='add'>+const struct iwl_mac_cfg iwl9000_mac_cfg = {</div><div class='ctx'> 	.device_family = IWL_DEVICE_FAMILY_9000,</div><div class='del'>-	.base_params = &amp;iwl9000_base_params,</div><div class='add'>+	.base = &amp;iwl9000_base,</div><div class='ctx'> 	.mq_rx_supported = true,</div><div class='del'>-	.rf_id = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg_trans_params iwl9560_trans_cfg = {</div><div class='add'>+const struct iwl_mac_cfg iwl9560_mac_cfg = {</div><div class='ctx'> 	.device_family = IWL_DEVICE_FAMILY_9000,</div><div class='del'>-	.base_params = &amp;iwl9000_base_params,</div><div class='add'>+	.base = &amp;iwl9000_base,</div><div class='ctx'> 	.mq_rx_supported = true,</div><div class='del'>-	.rf_id = true,</div><div class='ctx'> 	.integrated = true,</div><div class='ctx'> 	.xtal_latency = 650,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg_trans_params iwl9560_long_latency_trans_cfg = {</div><div class='add'>+const struct iwl_mac_cfg iwl9560_long_latency_mac_cfg = {</div><div class='ctx'> 	.device_family = IWL_DEVICE_FAMILY_9000,</div><div class='del'>-	.base_params = &amp;iwl9000_base_params,</div><div class='add'>+	.base = &amp;iwl9000_base,</div><div class='ctx'> 	.mq_rx_supported = true,</div><div class='del'>-	.rf_id = true,</div><div class='ctx'> 	.integrated = true,</div><div class='ctx'> 	.xtal_latency = 2820,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct iwl_cfg_trans_params iwl9560_shared_clk_trans_cfg = {</div><div class='add'>+const struct iwl_mac_cfg iwl9560_shared_clk_mac_cfg = {</div><div class='ctx'> 	.device_family = IWL_DEVICE_FAMILY_9000,</div><div class='del'>-	.base_params = &amp;iwl9000_base_params,</div><div class='add'>+	.base = &amp;iwl9000_base,</div><div class='ctx'> 	.mq_rx_supported = true,</div><div class='del'>-	.rf_id = true,</div><div class='ctx'> 	.integrated = true,</div><div class='ctx'> 	.xtal_latency = 670,</div><div class='ctx'> 	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const char iwl9162_name[] = "Intel(R) Wireless-AC 9162";</div><div class='del'>-const char iwl9260_name[] = "Intel(R) Wireless-AC 9260";</div><div class='del'>-const char iwl9260_1_name[] = "Intel(R) Wireless-AC 9260-1";</div><div class='del'>-const char iwl9270_name[] = "Intel(R) Wireless-AC 9270";</div><div class='del'>-const char iwl9461_name[] = "Intel(R) Wireless-AC 9461";</div><div class='del'>-const char iwl9462_name[] = "Intel(R) Wireless-AC 9462";</div><div class='del'>-const char iwl9560_name[] = "Intel(R) Wireless-AC 9560";</div><div class='del'>-const char iwl9162_160_name[] = "Intel(R) Wireless-AC 9162 160MHz";</div><div class='del'>-const char iwl9260_160_name[] = "Intel(R) Wireless-AC 9260 160MHz";</div><div class='del'>-const char iwl9270_160_name[] = "Intel(R) Wireless-AC 9270 160MHz";</div><div class='del'>-const char iwl9461_160_name[] = "Intel(R) Wireless-AC 9461 160MHz";</div><div class='del'>-const char iwl9462_160_name[] = "Intel(R) Wireless-AC 9462 160MHz";</div><div class='del'>-const char iwl9560_160_name[] = "Intel(R) Wireless-AC 9560 160MHz";</div><div class='del'>-</div><div class='del'>-const char iwl9260_killer_1550_name[] =</div><div class='del'>-	"Killer (R) Wireless-AC 1550 Wireless Network Adapter (9260NGW) 160MHz";</div><div class='del'>-const char iwl9560_killer_1550i_name[] =</div><div class='del'>-	"Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)";</div><div class='del'>-const char iwl9560_killer_1550s_name[] =</div><div class='del'>-	"Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)";</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl9260_2ac_cfg = {</div><div class='del'>-	.fw_name_pre = IWL9260_FW_PRE,</div><div class='del'>-	IWL_DEVICE_9000,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iwl_cfg iwl9560_2ac_cfg_soc = {</div><div class='del'>-	.fw_name_pre = IWL9000_FW_PRE,</div><div class='del'>-	IWL_DEVICE_9000,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> MODULE_FIRMWARE(IWL9000_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));</div><div class='ctx'> MODULE_FIRMWARE(IWL9260_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c b/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c<br/>new file mode 100644<br/>index 000000000000..582f61661062<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/cfg/ax210.c</a></div><div class='hunk'>@@ -0,0 +1,123 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='add'>+ * Copyright (C) 2018-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/stringify.h&gt;</div><div class='add'>+#include "iwl-config.h"</div><div class='add'>+#include "iwl-prph.h"</div><div class='add'>+#include "fw/api/txq.h"</div><div class='add'>+</div><div class='add'>+/* Highest firmware API version supported */</div><div class='add'>+#define IWL_AX210_UCODE_API_MAX	89</div><div class='add'>+</div><div class='add'>+/* Lowest firmware API version supported */</div><div class='add'>+#define IWL_AX210_UCODE_API_MIN	89</div><div class='add'>+</div><div class='add'>+/* Memory offsets and lengths */</div><div class='add'>+#define IWL_AX210_SMEM_OFFSET		0x400000</div><div class='add'>+#define IWL_AX210_SMEM_LEN		0xD0000</div><div class='add'>+</div><div class='add'>+static const struct iwl_family_base_params iwl_ax210_base = {</div><div class='add'>+	.num_of_queues = 512,</div><div class='add'>+	.max_tfd_queue_size = 65536,</div><div class='add'>+	.shadow_ram_support = true,</div><div class='add'>+	.led_compensation = 57,</div><div class='add'>+	.wd_timeout = IWL_LONG_WD_TIMEOUT,</div><div class='add'>+	.max_event_log_size = 512,</div><div class='add'>+	.shadow_reg_enable = true,</div><div class='add'>+	.pcie_l1_allowed = true,</div><div class='add'>+	.smem_offset = IWL_AX210_SMEM_OFFSET,</div><div class='add'>+	.smem_len = IWL_AX210_SMEM_LEN,</div><div class='add'>+	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,</div><div class='add'>+	.apmg_not_supported = true,</div><div class='add'>+	.mac_addr_from_csr = 0x380,</div><div class='add'>+	.d3_debug_data_base_addr = 0x401000,</div><div class='add'>+	.d3_debug_data_length = 60 * 1024,</div><div class='add'>+	.mon_smem_regs = {</div><div class='add'>+		.write_ptr = {</div><div class='add'>+			.addr = LDBG_M2S_BUF_WPTR,</div><div class='add'>+			.mask = LDBG_M2S_BUF_WPTR_VAL_MSK,</div><div class='add'>+		},</div><div class='add'>+		.cycle_cnt = {</div><div class='add'>+			.addr = LDBG_M2S_BUF_WRAP_CNT,</div><div class='add'>+			.mask = LDBG_M2S_BUF_WRAP_CNT_VAL_MSK,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.min_txq_size = 128,</div><div class='add'>+	.gp2_reg_addr = 0xd02c68,</div><div class='add'>+	.min_ba_txq_size = IWL_DEFAULT_QUEUE_SIZE_HE,</div><div class='add'>+	.mon_dram_regs = {</div><div class='add'>+		.write_ptr = {</div><div class='add'>+			.addr = DBGC_CUR_DBGBUF_STATUS,</div><div class='add'>+			.mask = DBGC_CUR_DBGBUF_STATUS_OFFSET_MSK,</div><div class='add'>+		},</div><div class='add'>+		.cycle_cnt = {</div><div class='add'>+			.addr = DBGC_DBGBUF_WRAP_AROUND,</div><div class='add'>+			.mask = 0xffffffff,</div><div class='add'>+		},</div><div class='add'>+		.cur_frag = {</div><div class='add'>+			.addr = DBGC_CUR_DBGBUF_STATUS,</div><div class='add'>+			.mask = DBGC_CUR_DBGBUF_STATUS_IDX_MSK,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.ucode_api_min = IWL_AX210_UCODE_API_MIN,</div><div class='add'>+	.ucode_api_max = IWL_AX210_UCODE_API_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct iwl_mac_cfg iwl_ty_mac_cfg = {</div><div class='add'>+	.mq_rx_supported = true,</div><div class='add'>+	.gen2 = true,</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_AX210,</div><div class='add'>+	.base = &amp;iwl_ax210_base,</div><div class='add'>+	.umac_prph_offset = 0x300000,</div><div class='add'>+	/* TODO: the following values need to be checked */</div><div class='add'>+	.xtal_latency = 500,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct iwl_mac_cfg iwl_so_mac_cfg = {</div><div class='add'>+	.mq_rx_supported = true,</div><div class='add'>+	.gen2 = true,</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_AX210,</div><div class='add'>+	.base = &amp;iwl_ax210_base,</div><div class='add'>+	.umac_prph_offset = 0x300000,</div><div class='add'>+	.integrated = true,</div><div class='add'>+	/* TODO: the following values need to be checked */</div><div class='add'>+	.xtal_latency = 500,</div><div class='add'>+	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_200US,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct iwl_mac_cfg iwl_so_long_latency_mac_cfg = {</div><div class='add'>+	.mq_rx_supported = true,</div><div class='add'>+	.gen2 = true,</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_AX210,</div><div class='add'>+	.base = &amp;iwl_ax210_base,</div><div class='add'>+	.umac_prph_offset = 0x300000,</div><div class='add'>+	.integrated = true,</div><div class='add'>+	.low_latency_xtal = true,</div><div class='add'>+	.xtal_latency = 12000,</div><div class='add'>+	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct iwl_mac_cfg iwl_so_long_latency_imr_mac_cfg = {</div><div class='add'>+	.mq_rx_supported = true,</div><div class='add'>+	.gen2 = true,</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_AX210,</div><div class='add'>+	.base = &amp;iwl_ax210_base,</div><div class='add'>+	.umac_prph_offset = 0x300000,</div><div class='add'>+	.integrated = true,</div><div class='add'>+	.low_latency_xtal = true,</div><div class='add'>+	.xtal_latency = 12000,</div><div class='add'>+	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,</div><div class='add'>+	.imr_enabled = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct iwl_mac_cfg iwl_ma_mac_cfg = {</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_AX210,</div><div class='add'>+	.base = &amp;iwl_ax210_base,</div><div class='add'>+	.mq_rx_supported = true,</div><div class='add'>+	.gen2 = true,</div><div class='add'>+	.integrated = true,</div><div class='add'>+	.umac_prph_offset = 0x300000</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c<br/>new file mode 100644<br/>index 000000000000..d25445bd1e5c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/bz.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/cfg/bz.c</a></div><div class='hunk'>@@ -0,0 +1,108 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='add'>+ * Copyright (C) 2018-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/stringify.h&gt;</div><div class='add'>+#include "iwl-config.h"</div><div class='add'>+#include "iwl-prph.h"</div><div class='add'>+#include "fw/api/txq.h"</div><div class='add'>+</div><div class='add'>+/* Highest firmware core release supported */</div><div class='add'>+#define IWL_BZ_UCODE_CORE_MAX	101</div><div class='add'>+</div><div class='add'>+/* Lowest firmware API version supported */</div><div class='add'>+#define IWL_BZ_UCODE_API_MIN	100</div><div class='add'>+</div><div class='add'>+/* Memory offsets and lengths */</div><div class='add'>+#define IWL_BZ_SMEM_OFFSET		0x400000</div><div class='add'>+#define IWL_BZ_SMEM_LEN			0xD0000</div><div class='add'>+</div><div class='add'>+#define IWL_BZ_A_FM_B_FW_PRE		"iwlwifi-bz-a0-fm-b0"</div><div class='add'>+#define IWL_BZ_A_FM_C_FW_PRE		"iwlwifi-bz-a0-fm-c0"</div><div class='add'>+#define IWL_BZ_A_FM4_B_FW_PRE		"iwlwifi-bz-a0-fm4-b0"</div><div class='add'>+#define IWL_GL_B_FM_B_FW_PRE		"iwlwifi-gl-b0-fm-b0"</div><div class='add'>+#define IWL_GL_C_FM_C_FW_PRE		"iwlwifi-gl-c0-fm-c0"</div><div class='add'>+</div><div class='add'>+static const struct iwl_family_base_params iwl_bz_base = {</div><div class='add'>+	.num_of_queues = 512,</div><div class='add'>+	.max_tfd_queue_size = 65536,</div><div class='add'>+	.shadow_ram_support = true,</div><div class='add'>+	.led_compensation = 57,</div><div class='add'>+	.wd_timeout = IWL_LONG_WD_TIMEOUT,</div><div class='add'>+	.max_event_log_size = 512,</div><div class='add'>+	.shadow_reg_enable = true,</div><div class='add'>+	.pcie_l1_allowed = true,</div><div class='add'>+	.smem_offset = IWL_BZ_SMEM_OFFSET,</div><div class='add'>+	.smem_len = IWL_BZ_SMEM_LEN,</div><div class='add'>+	.apmg_not_supported = true,</div><div class='add'>+	.mac_addr_from_csr = 0x30,</div><div class='add'>+	.d3_debug_data_base_addr = 0x401000,</div><div class='add'>+	.d3_debug_data_length = 60 * 1024,</div><div class='add'>+	.mon_smem_regs = {</div><div class='add'>+		.write_ptr = {</div><div class='add'>+			.addr = LDBG_M2S_BUF_WPTR,</div><div class='add'>+			.mask = LDBG_M2S_BUF_WPTR_VAL_MSK,</div><div class='add'>+	},</div><div class='add'>+		.cycle_cnt = {</div><div class='add'>+			.addr = LDBG_M2S_BUF_WRAP_CNT,</div><div class='add'>+			.mask = LDBG_M2S_BUF_WRAP_CNT_VAL_MSK,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.min_txq_size = 128,</div><div class='add'>+	.gp2_reg_addr = 0xd02c68,</div><div class='add'>+	.min_ba_txq_size = IWL_DEFAULT_QUEUE_SIZE_EHT,</div><div class='add'>+	.mon_dram_regs = {</div><div class='add'>+		.write_ptr = {</div><div class='add'>+			.addr = DBGC_CUR_DBGBUF_STATUS,</div><div class='add'>+			.mask = DBGC_CUR_DBGBUF_STATUS_OFFSET_MSK,</div><div class='add'>+		},</div><div class='add'>+		.cycle_cnt = {</div><div class='add'>+			.addr = DBGC_DBGBUF_WRAP_AROUND,</div><div class='add'>+			.mask = 0xffffffff,</div><div class='add'>+		},</div><div class='add'>+		.cur_frag = {</div><div class='add'>+			.addr = DBGC_CUR_DBGBUF_STATUS,</div><div class='add'>+			.mask = DBGC_CUR_DBGBUF_STATUS_IDX_MSK,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.mon_dbgi_regs = {</div><div class='add'>+		.write_ptr = {</div><div class='add'>+			.addr = DBGI_SRAM_FIFO_POINTERS,</div><div class='add'>+			.mask = DBGI_SRAM_FIFO_POINTERS_WR_PTR_MSK,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,</div><div class='add'>+	.ucode_api_max = ENCODE_CORE_AS_API(IWL_BZ_UCODE_CORE_MAX),</div><div class='add'>+	.ucode_api_min = IWL_BZ_UCODE_API_MIN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct iwl_mac_cfg iwl_bz_mac_cfg = {</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_BZ,</div><div class='add'>+	.base = &amp;iwl_bz_base,</div><div class='add'>+	.mq_rx_supported = true,</div><div class='add'>+	.gen2 = true,</div><div class='add'>+	.integrated = true,</div><div class='add'>+	.umac_prph_offset = 0x300000,</div><div class='add'>+	.xtal_latency = 12000,</div><div class='add'>+	.low_latency_xtal = true,</div><div class='add'>+	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_bz_mac_cfg);</div><div class='add'>+</div><div class='add'>+const struct iwl_mac_cfg iwl_gl_mac_cfg = {</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_BZ,</div><div class='add'>+	.base = &amp;iwl_bz_base,</div><div class='add'>+	.mq_rx_supported = true,</div><div class='add'>+	.gen2 = true,</div><div class='add'>+	.umac_prph_offset = 0x300000,</div><div class='add'>+	.xtal_latency = 12000,</div><div class='add'>+	.low_latency_xtal = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+IWL_CORE_FW(IWL_BZ_A_FM_B_FW_PRE, IWL_BZ_UCODE_CORE_MAX);</div><div class='add'>+IWL_CORE_FW(IWL_BZ_A_FM_C_FW_PRE, IWL_BZ_UCODE_CORE_MAX);</div><div class='add'>+IWL_CORE_FW(IWL_BZ_A_FM4_B_FW_PRE, IWL_BZ_UCODE_CORE_MAX);</div><div class='add'>+IWL_CORE_FW(IWL_GL_B_FM_B_FW_PRE, IWL_BZ_UCODE_CORE_MAX);</div><div class='add'>+IWL_CORE_FW(IWL_GL_C_FM_C_FW_PRE, IWL_BZ_UCODE_CORE_MAX);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/dr.c b/drivers/net/wireless/intel/iwlwifi/cfg/dr.c<br/>new file mode 100644<br/>index 000000000000..a279dcfd3083<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/dr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/cfg/dr.c</a></div><div class='hunk'>@@ -0,0 +1,89 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/stringify.h&gt;</div><div class='add'>+#include "iwl-config.h"</div><div class='add'>+#include "iwl-prph.h"</div><div class='add'>+#include "fw/api/txq.h"</div><div class='add'>+</div><div class='add'>+/* Highest firmware core release supported */</div><div class='add'>+#define IWL_DR_UCODE_CORE_MAX	101</div><div class='add'>+</div><div class='add'>+/* Lowest firmware API version supported */</div><div class='add'>+#define IWL_DR_UCODE_API_MIN	100</div><div class='add'>+</div><div class='add'>+/* Memory offsets and lengths */</div><div class='add'>+#define IWL_DR_SMEM_OFFSET		0x400000</div><div class='add'>+#define IWL_DR_SMEM_LEN			0xD0000</div><div class='add'>+</div><div class='add'>+#define IWL_DR_A_PE_A_FW_PRE		"iwlwifi-dr-a0-pe-a0"</div><div class='add'>+</div><div class='add'>+static const struct iwl_family_base_params iwl_dr_base = {</div><div class='add'>+	.num_of_queues = 512,</div><div class='add'>+	.max_tfd_queue_size = 65536,</div><div class='add'>+	.shadow_ram_support = true,</div><div class='add'>+	.led_compensation = 57,</div><div class='add'>+	.wd_timeout = IWL_LONG_WD_TIMEOUT,</div><div class='add'>+	.max_event_log_size = 512,</div><div class='add'>+	.shadow_reg_enable = true,</div><div class='add'>+	.pcie_l1_allowed = true,</div><div class='add'>+	.smem_offset = IWL_DR_SMEM_OFFSET,</div><div class='add'>+	.smem_len = IWL_DR_SMEM_LEN,</div><div class='add'>+	.apmg_not_supported = true,</div><div class='add'>+	.mac_addr_from_csr = 0x30,</div><div class='add'>+	.d3_debug_data_base_addr = 0x401000,</div><div class='add'>+	.d3_debug_data_length = 60 * 1024,</div><div class='add'>+	.mon_smem_regs = {</div><div class='add'>+		.write_ptr = {</div><div class='add'>+			.addr = LDBG_M2S_BUF_WPTR,</div><div class='add'>+			.mask = LDBG_M2S_BUF_WPTR_VAL_MSK,</div><div class='add'>+		},</div><div class='add'>+		.cycle_cnt = {</div><div class='add'>+			.addr = LDBG_M2S_BUF_WRAP_CNT,</div><div class='add'>+			.mask = LDBG_M2S_BUF_WRAP_CNT_VAL_MSK,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.min_txq_size = 128,</div><div class='add'>+	.gp2_reg_addr = 0xd02c68,</div><div class='add'>+	.min_ba_txq_size = IWL_DEFAULT_QUEUE_SIZE_EHT,</div><div class='add'>+	.mon_dram_regs = {</div><div class='add'>+		.write_ptr = {</div><div class='add'>+			.addr = DBGC_CUR_DBGBUF_STATUS,</div><div class='add'>+			.mask = DBGC_CUR_DBGBUF_STATUS_OFFSET_MSK,</div><div class='add'>+		},</div><div class='add'>+		.cycle_cnt = {</div><div class='add'>+			.addr = DBGC_DBGBUF_WRAP_AROUND,</div><div class='add'>+			.mask = 0xffffffff,</div><div class='add'>+		},</div><div class='add'>+		.cur_frag = {</div><div class='add'>+			.addr = DBGC_CUR_DBGBUF_STATUS,</div><div class='add'>+			.mask = DBGC_CUR_DBGBUF_STATUS_IDX_MSK,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.mon_dbgi_regs = {</div><div class='add'>+		.write_ptr = {</div><div class='add'>+			.addr = DBGI_SRAM_FIFO_POINTERS,</div><div class='add'>+			.mask = DBGI_SRAM_FIFO_POINTERS_WR_PTR_MSK,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,</div><div class='add'>+	.ucode_api_max = ENCODE_CORE_AS_API(IWL_DR_UCODE_CORE_MAX),</div><div class='add'>+	.ucode_api_min = IWL_DR_UCODE_API_MIN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct iwl_mac_cfg iwl_dr_mac_cfg = {</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_DR,</div><div class='add'>+	.base = &amp;iwl_dr_base,</div><div class='add'>+	.mq_rx_supported = true,</div><div class='add'>+	.gen2 = true,</div><div class='add'>+	.integrated = true,</div><div class='add'>+	.umac_prph_offset = 0x300000,</div><div class='add'>+	.xtal_latency = 12000,</div><div class='add'>+	.low_latency_xtal = true,</div><div class='add'>+	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+IWL_CORE_FW(IWL_DR_A_PE_A_FW_PRE, IWL_DR_UCODE_CORE_MAX);</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/rf-fm.c b/drivers/net/wireless/intel/iwlwifi/cfg/rf-fm.c<br/>new file mode 100644<br/>index 000000000000..fd82050e33a3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/rf-fm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/cfg/rf-fm.c</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='add'>+ * Copyright (C) 2018-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include "iwl-config.h"</div><div class='add'>+</div><div class='add'>+/* NVM versions */</div><div class='add'>+#define IWL_FM_NVM_VERSION		0x0a1d</div><div class='add'>+</div><div class='add'>+#define IWL_DEVICE_FM							\</div><div class='add'>+	.ht_params = {							\</div><div class='add'>+		.stbc = true,						\</div><div class='add'>+		.ldpc = true,						\</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) |			\</div><div class='add'>+			      BIT(NL80211_BAND_5GHZ),			\</div><div class='add'>+	},								\</div><div class='add'>+	.led_mode = IWL_LED_RF_STATE,					\</div><div class='add'>+	.non_shared_ant = ANT_B,					\</div><div class='add'>+	.vht_mu_mimo_supported = true,					\</div><div class='add'>+	.uhb_supported = true,						\</div><div class='add'>+	.eht_supported = true,						\</div><div class='add'>+	.num_rbds = IWL_NUM_RBDS_EHT,					\</div><div class='add'>+	.nvm_ver = IWL_FM_NVM_VERSION,					\</div><div class='add'>+	.nvm_type = IWL_NVM_EXT</div><div class='add'>+</div><div class='add'>+const struct iwl_rf_cfg iwl_rf_fm = {</div><div class='add'>+	IWL_DEVICE_FM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct iwl_rf_cfg iwl_rf_fm_160mhz = {</div><div class='add'>+	IWL_DEVICE_FM,</div><div class='add'>+	.bw_limit = 160,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char iwl_killer_be1750s_name[] =</div><div class='add'>+	"Killer(R) Wi-Fi 7 BE1750s 320MHz Wireless Network Adapter (BE201D2W)";</div><div class='add'>+const char iwl_killer_be1750i_name[] =</div><div class='add'>+	"Killer(R) Wi-Fi 7 BE1750i 320MHz Wireless Network Adapter (BE201NGW)";</div><div class='add'>+const char iwl_killer_be1750w_name[] =</div><div class='add'>+	"Killer(TM) Wi-Fi 7 BE1750w 320MHz Wireless Network Adapter (BE200D2W)";</div><div class='add'>+const char iwl_killer_be1750x_name[] =</div><div class='add'>+	"Killer(TM) Wi-Fi 7 BE1750x 320MHz Wireless Network Adapter (BE200NGW)";</div><div class='add'>+const char iwl_killer_be1790s_name[] =</div><div class='add'>+	"Killer(R) Wi-Fi 7 BE1790s 320MHz Wireless Network Adapter (BE401D2W)";</div><div class='add'>+const char iwl_killer_be1790i_name[] =</div><div class='add'>+	"Killer(R) Wi-Fi 7 BE1790i 320MHz Wireless Network Adapter (BE401NGW)";</div><div class='add'>+</div><div class='add'>+const char iwl_be201_name[] = "Intel(R) Wi-Fi 7 BE201 320MHz";</div><div class='add'>+const char iwl_be200_name[] = "Intel(R) Wi-Fi 7 BE200 320MHz";</div><div class='add'>+const char iwl_be202_name[] = "Intel(R) Wi-Fi 7 BE202 160MHz";</div><div class='add'>+const char iwl_be401_name[] = "Intel(R) Wi-Fi 7 BE401 320MHz";</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/rf-gf.c b/drivers/net/wireless/intel/iwlwifi/cfg/rf-gf.c<br/>new file mode 100644<br/>index 000000000000..c16cda087a7c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/rf-gf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/cfg/rf-gf.c</a></div><div class='hunk'>@@ -0,0 +1,85 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='add'>+ * Copyright (C) 2018-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include "iwl-config.h"</div><div class='add'>+</div><div class='add'>+/* Highest firmware API version supported */</div><div class='add'>+#define IWL_GF_UCODE_API_MAX	100</div><div class='add'>+</div><div class='add'>+/* Lowest firmware API version supported */</div><div class='add'>+#define IWL_GF_UCODE_API_MIN	100</div><div class='add'>+</div><div class='add'>+#define IWL_SO_A_GF_A_FW_PRE		"iwlwifi-so-a0-gf-a0"</div><div class='add'>+#define IWL_TY_A_GF_A_FW_PRE		"iwlwifi-ty-a0-gf-a0"</div><div class='add'>+#define IWL_MA_A_GF_A_FW_PRE		"iwlwifi-ma-a0-gf-a0"</div><div class='add'>+#define IWL_MA_B_GF_A_FW_PRE		"iwlwifi-ma-b0-gf-a0"</div><div class='add'>+#define IWL_SO_A_GF4_A_FW_PRE		"iwlwifi-so-a0-gf4-a0"</div><div class='add'>+#define IWL_MA_A_GF4_A_FW_PRE		"iwlwifi-ma-a0-gf4-a0"</div><div class='add'>+#define IWL_MA_B_GF4_A_FW_PRE		"iwlwifi-ma-b0-gf4-a0"</div><div class='add'>+#define IWL_BZ_A_GF_A_FW_PRE		"iwlwifi-bz-a0-gf-a0"</div><div class='add'>+#define IWL_BZ_A_GF4_A_FW_PRE		"iwlwifi-bz-a0-gf4-a0"</div><div class='add'>+#define IWL_SC_A_GF_A_FW_PRE		"iwlwifi-sc-a0-gf-a0"</div><div class='add'>+#define IWL_SC_A_GF4_A_FW_PRE		"iwlwifi-sc-a0-gf4-a0"</div><div class='add'>+</div><div class='add'>+#define IWL_BZ_A_GF_A_MODULE_FIRMWARE(api) \</div><div class='add'>+	IWL_BZ_A_GF_A_FW_PRE "-" __stringify(api) ".ucode"</div><div class='add'>+</div><div class='add'>+#define IWL_BZ_A_GF4_A_MODULE_FIRMWARE(api) \</div><div class='add'>+	IWL_BZ_A_GF4_A_FW_PRE "-" __stringify(api) ".ucode"</div><div class='add'>+</div><div class='add'>+#define IWL_SC_A_GF_A_MODULE_FIRMWARE(api) \</div><div class='add'>+	IWL_SC_A_GF_A_FW_PRE "-" __stringify(api) ".ucode"</div><div class='add'>+</div><div class='add'>+#define IWL_SC_A_GF4_A_MODULE_FIRMWARE(api) \</div><div class='add'>+	IWL_SC_A_GF4_A_FW_PRE "-" __stringify(api) ".ucode"</div><div class='add'>+</div><div class='add'>+/* NVM versions */</div><div class='add'>+#define IWL_GF_NVM_VERSION		0x0a1d</div><div class='add'>+</div><div class='add'>+const struct iwl_rf_cfg iwl_rf_gf = {</div><div class='add'>+	.uhb_supported = true,</div><div class='add'>+	.led_mode = IWL_LED_RF_STATE,</div><div class='add'>+	.non_shared_ant = ANT_B,</div><div class='add'>+	.vht_mu_mimo_supported = true,</div><div class='add'>+	.ht_params = {</div><div class='add'>+		.stbc = true,</div><div class='add'>+		.ldpc = true,</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) |</div><div class='add'>+			      BIT(NL80211_BAND_5GHZ),</div><div class='add'>+	},</div><div class='add'>+	.nvm_ver = IWL_GF_NVM_VERSION,</div><div class='add'>+	.nvm_type = IWL_NVM_EXT,</div><div class='add'>+	.num_rbds = IWL_NUM_RBDS_HE,</div><div class='add'>+	.ucode_api_min = IWL_GF_UCODE_API_MIN,</div><div class='add'>+	.ucode_api_max = IWL_GF_UCODE_API_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char iwl_ax210_killer_1675w_name[] =</div><div class='add'>+	"Killer(R) Wi-Fi 6E AX1675w 160MHz Wireless Network Adapter (210D2W)";</div><div class='add'>+const char iwl_ax210_killer_1675x_name[] =</div><div class='add'>+	"Killer(R) Wi-Fi 6E AX1675x 160MHz Wireless Network Adapter (210NGW)";</div><div class='add'>+const char iwl_ax211_killer_1675s_name[] =</div><div class='add'>+	"Killer(R) Wi-Fi 6E AX1675s 160MHz Wireless Network Adapter (211D2W)";</div><div class='add'>+const char iwl_ax211_killer_1675i_name[] =</div><div class='add'>+	"Killer(R) Wi-Fi 6E AX1675i 160MHz Wireless Network Adapter (211NGW)";</div><div class='add'>+const char iwl_ax411_killer_1690s_name[] =</div><div class='add'>+	"Killer(R) Wi-Fi 6E AX1690s 160MHz Wireless Network Adapter (411D2W)";</div><div class='add'>+const char iwl_ax411_killer_1690i_name[] =</div><div class='add'>+	"Killer(R) Wi-Fi 6E AX1690i 160MHz Wireless Network Adapter (411NGW)";</div><div class='add'>+</div><div class='add'>+const char iwl_ax210_name[] = "Intel(R) Wi-Fi 6E AX210 160MHz";</div><div class='add'>+const char iwl_ax211_name[] = "Intel(R) Wi-Fi 6E AX211 160MHz";</div><div class='add'>+const char iwl_ax411_name[] = "Intel(R) Wi-Fi 6E AX411 160MHz";</div><div class='add'>+</div><div class='add'>+IWL_FW_AND_PNVM(IWL_SO_A_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX);</div><div class='add'>+IWL_FW_AND_PNVM(IWL_TY_A_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX);</div><div class='add'>+IWL_FW_AND_PNVM(IWL_MA_A_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX);</div><div class='add'>+IWL_FW_AND_PNVM(IWL_MA_B_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX);</div><div class='add'>+IWL_FW_AND_PNVM(IWL_MA_A_GF4_A_FW_PRE, IWL_GF_UCODE_API_MAX);</div><div class='add'>+IWL_FW_AND_PNVM(IWL_MA_B_GF4_A_FW_PRE, IWL_GF_UCODE_API_MAX);</div><div class='add'>+MODULE_FIRMWARE(IWL_BZ_A_GF_A_MODULE_FIRMWARE(IWL_GF_UCODE_API_MAX));</div><div class='add'>+MODULE_FIRMWARE(IWL_BZ_A_GF4_A_MODULE_FIRMWARE(IWL_GF_UCODE_API_MAX));</div><div class='add'>+MODULE_FIRMWARE(IWL_SC_A_GF_A_MODULE_FIRMWARE(IWL_GF_UCODE_API_MAX));</div><div class='add'>+MODULE_FIRMWARE(IWL_SC_A_GF4_A_MODULE_FIRMWARE(IWL_GF_UCODE_API_MAX));</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/rf-hr.c b/drivers/net/wireless/intel/iwlwifi/cfg/rf-hr.c<br/>new file mode 100644<br/>index 000000000000..6cf187d92dbf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/rf-hr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/cfg/rf-hr.c</a></div><div class='hunk'>@@ -0,0 +1,89 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='add'>+ * Copyright (C) 2018-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include "iwl-config.h"</div><div class='add'>+</div><div class='add'>+/* Highest firmware API version supported */</div><div class='add'>+#define IWL_HR_UCODE_API_MAX	100</div><div class='add'>+</div><div class='add'>+/* Lowest firmware API version supported */</div><div class='add'>+#define IWL_HR_UCODE_API_MIN	100</div><div class='add'>+</div><div class='add'>+#define IWL_QU_B_HR_B_FW_PRE		"iwlwifi-Qu-b0-hr-b0"</div><div class='add'>+#define IWL_QU_C_HR_B_FW_PRE		"iwlwifi-Qu-c0-hr-b0"</div><div class='add'>+#define IWL_QUZ_A_HR_B_FW_PRE		"iwlwifi-QuZ-a0-hr-b0"</div><div class='add'>+#define IWL_SO_A_HR_B_FW_PRE		"iwlwifi-so-a0-hr-b0"</div><div class='add'>+#define IWL_MA_A_HR_B_FW_PRE		"iwlwifi-ma-a0-hr-b0"</div><div class='add'>+#define IWL_MA_B_HR_B_FW_PRE		"iwlwifi-ma-b0-hr-b0"</div><div class='add'>+#define IWL_BZ_A_HR_B_FW_PRE		"iwlwifi-bz-a0-hr-b0"</div><div class='add'>+#define IWL_SC_A_HR_A_FW_PRE		"iwlwifi-sc-a0-hr-b0"</div><div class='add'>+#define IWL_SC_A_HR_B_FW_PRE		"iwlwifi-sc-a0-hr-b0"</div><div class='add'>+</div><div class='add'>+#define IWL_QU_B_HR_B_MODULE_FIRMWARE(api)	\</div><div class='add'>+	IWL_QU_B_HR_B_FW_PRE "-" __stringify(api) ".ucode"</div><div class='add'>+#define IWL_QUZ_A_HR_B_MODULE_FIRMWARE(api)	\</div><div class='add'>+	IWL_QUZ_A_HR_B_FW_PRE "-" __stringify(api) ".ucode"</div><div class='add'>+#define IWL_QU_C_HR_B_MODULE_FIRMWARE(api)	\</div><div class='add'>+	IWL_QU_C_HR_B_FW_PRE "-" __stringify(api) ".ucode"</div><div class='add'>+#define IWL_SO_A_HR_B_MODULE_FIRMWARE(api)	\</div><div class='add'>+	IWL_SO_A_HR_B_FW_PRE "-" __stringify(api) ".ucode"</div><div class='add'>+#define IWL_MA_A_HR_B_FW_MODULE_FIRMWARE(api)	\</div><div class='add'>+	IWL_MA_A_HR_B_FW_PRE "-" __stringify(api) ".ucode"</div><div class='add'>+#define IWL_MA_B_HR_B_FW_MODULE_FIRMWARE(api)	\</div><div class='add'>+	IWL_MA_B_HR_B_FW_PRE "-" __stringify(api) ".ucode"</div><div class='add'>+#define IWL_BZ_A_HR_B_MODULE_FIRMWARE(api)	\</div><div class='add'>+	IWL_BZ_A_HR_B_FW_PRE "-" __stringify(api) ".ucode"</div><div class='add'>+#define IWL_SC_A_HR_A_FW_MODULE_FIRMWARE(api)	\</div><div class='add'>+	IWL_SC_A_HR_A_FW_PRE "-" __stringify(api) ".ucode"</div><div class='add'>+#define IWL_SC_A_HR_B_FW_MODULE_FIRMWARE(api)	\</div><div class='add'>+	IWL_SC_A_HR_B_FW_PRE "-" __stringify(api) ".ucode"</div><div class='add'>+</div><div class='add'>+/* NVM versions */</div><div class='add'>+#define IWL_HR_NVM_VERSION		0x0a1d</div><div class='add'>+</div><div class='add'>+#define IWL_DEVICE_HR							\</div><div class='add'>+	.led_mode = IWL_LED_RF_STATE,					\</div><div class='add'>+	.non_shared_ant = ANT_B,					\</div><div class='add'>+	.vht_mu_mimo_supported = true,					\</div><div class='add'>+	.ht_params = {							\</div><div class='add'>+		.stbc = true,						\</div><div class='add'>+		.ldpc = true,						\</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) |			\</div><div class='add'>+			      BIT(NL80211_BAND_5GHZ),			\</div><div class='add'>+	},								\</div><div class='add'>+	.num_rbds = IWL_NUM_RBDS_HE,					\</div><div class='add'>+	.nvm_ver = IWL_HR_NVM_VERSION,					\</div><div class='add'>+	.nvm_type = IWL_NVM_EXT,					\</div><div class='add'>+	.ucode_api_min = IWL_HR_UCODE_API_MIN,				\</div><div class='add'>+	.ucode_api_max = IWL_HR_UCODE_API_MAX</div><div class='add'>+</div><div class='add'>+const struct iwl_rf_cfg iwl_rf_hr1 = {</div><div class='add'>+	IWL_DEVICE_HR,</div><div class='add'>+	.tx_with_siso_diversity = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct iwl_rf_cfg iwl_rf_hr = {</div><div class='add'>+	IWL_DEVICE_HR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct iwl_rf_cfg iwl_rf_hr_80mhz = {</div><div class='add'>+	IWL_DEVICE_HR,</div><div class='add'>+	.bw_limit = 80,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char iwl_ax101_name[] = "Intel(R) Wi-Fi 6 AX101";</div><div class='add'>+const char iwl_ax200_name[] = "Intel(R) Wi-Fi 6 AX200 160MHz";</div><div class='add'>+const char iwl_ax201_name[] = "Intel(R) Wi-Fi 6 AX201 160MHz";</div><div class='add'>+const char iwl_ax203_name[] = "Intel(R) Wi-Fi 6 AX203";</div><div class='add'>+</div><div class='add'>+MODULE_FIRMWARE(IWL_QU_B_HR_B_MODULE_FIRMWARE(IWL_HR_UCODE_API_MAX));</div><div class='add'>+MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_HR_UCODE_API_MAX));</div><div class='add'>+MODULE_FIRMWARE(IWL_QUZ_A_HR_B_MODULE_FIRMWARE(IWL_HR_UCODE_API_MAX));</div><div class='add'>+MODULE_FIRMWARE(IWL_SO_A_HR_B_MODULE_FIRMWARE(IWL_HR_UCODE_API_MAX));</div><div class='add'>+MODULE_FIRMWARE(IWL_MA_A_HR_B_FW_MODULE_FIRMWARE(IWL_HR_UCODE_API_MAX));</div><div class='add'>+MODULE_FIRMWARE(IWL_MA_B_HR_B_FW_MODULE_FIRMWARE(IWL_HR_UCODE_API_MAX));</div><div class='add'>+MODULE_FIRMWARE(IWL_BZ_A_HR_B_MODULE_FIRMWARE(IWL_HR_UCODE_API_MAX));</div><div class='add'>+MODULE_FIRMWARE(IWL_SC_A_HR_A_FW_MODULE_FIRMWARE(IWL_HR_UCODE_API_MAX));</div><div class='add'>+MODULE_FIRMWARE(IWL_SC_A_HR_B_FW_MODULE_FIRMWARE(IWL_HR_UCODE_API_MAX));</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/rf-jf.c b/drivers/net/wireless/intel/iwlwifi/cfg/rf-jf.c<br/>new file mode 100644<br/>index 000000000000..0a074e0a3bc6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/rf-jf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/cfg/rf-jf.c</a></div><div class='hunk'>@@ -0,0 +1,111 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='add'>+ * Copyright (C) 2018-2021, 2023, 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include "iwl-config.h"</div><div class='add'>+</div><div class='add'>+/* Highest firmware API version supported */</div><div class='add'>+#define IWL_JF_UCODE_API_MAX	77</div><div class='add'>+</div><div class='add'>+/* Lowest firmware API version supported */</div><div class='add'>+#define IWL_JF_UCODE_API_MIN	77</div><div class='add'>+</div><div class='add'>+#define IWL_QU_B_JF_B_FW_PRE		"iwlwifi-Qu-b0-jf-b0"</div><div class='add'>+#define IWL_QU_C_JF_B_FW_PRE		"iwlwifi-Qu-c0-jf-b0"</div><div class='add'>+#define IWL_QUZ_A_JF_B_FW_PRE		"iwlwifi-QuZ-a0-jf-b0"</div><div class='add'>+#define IWL_SO_A_JF_B_FW_PRE		"iwlwifi-so-a0-jf-b0"</div><div class='add'>+</div><div class='add'>+#define IWL_QUZ_A_JF_B_MODULE_FIRMWARE(api) \</div><div class='add'>+	IWL_QUZ_A_JF_B_FW_PRE "-" __stringify(api) ".ucode"</div><div class='add'>+#define IWL_QU_B_JF_B_MODULE_FIRMWARE(api) \</div><div class='add'>+	IWL_QU_B_JF_B_FW_PRE "-" __stringify(api) ".ucode"</div><div class='add'>+#define IWL_QU_C_JF_B_MODULE_FIRMWARE(api) \</div><div class='add'>+	IWL_QU_C_JF_B_FW_PRE "-" __stringify(api) ".ucode"</div><div class='add'>+#define IWL_SO_A_JF_B_MODULE_FIRMWARE(api) \</div><div class='add'>+	IWL_SO_A_JF_B_FW_PRE "-" __stringify(api) ".ucode"</div><div class='add'>+</div><div class='add'>+/* NVM versions */</div><div class='add'>+#define IWL_JF_NVM_VERSION		0x0a1d</div><div class='add'>+</div><div class='add'>+/* Memory offsets and lengths */</div><div class='add'>+#define IWL9000_DCCM_OFFSET		0x800000</div><div class='add'>+#define IWL9000_DCCM_LEN		0x18000</div><div class='add'>+#define IWL9000_DCCM2_OFFSET		0x880000</div><div class='add'>+#define IWL9000_DCCM2_LEN		0x8000</div><div class='add'>+</div><div class='add'>+static const struct iwl_tt_params iwl_jf_tt_params = {</div><div class='add'>+	.ct_kill_entry = 115,</div><div class='add'>+	.ct_kill_exit = 93,</div><div class='add'>+	.ct_kill_duration = 5,</div><div class='add'>+	.dynamic_smps_entry = 111,</div><div class='add'>+	.dynamic_smps_exit = 107,</div><div class='add'>+	.tx_protection_entry = 112,</div><div class='add'>+	.tx_protection_exit = 105,</div><div class='add'>+	.tx_backoff = {</div><div class='add'>+		{.temperature = 110, .backoff = 200},</div><div class='add'>+		{.temperature = 111, .backoff = 600},</div><div class='add'>+		{.temperature = 112, .backoff = 1200},</div><div class='add'>+		{.temperature = 113, .backoff = 2000},</div><div class='add'>+		{.temperature = 114, .backoff = 4000},</div><div class='add'>+	},</div><div class='add'>+	.support_ct_kill = true,</div><div class='add'>+	.support_dynamic_smps = true,</div><div class='add'>+	.support_tx_protection = true,</div><div class='add'>+	.support_tx_backoff = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* these values are ignored if not with Pu/Th MAC firmware, due to offload */</div><div class='add'>+#define IWL_DEVICE_JF_PU						\</div><div class='add'>+	.dccm_offset = IWL9000_DCCM_OFFSET,				\</div><div class='add'>+	.dccm_len = IWL9000_DCCM_LEN,					\</div><div class='add'>+	.dccm2_offset = IWL9000_DCCM2_OFFSET,				\</div><div class='add'>+	.dccm2_len = IWL9000_DCCM2_LEN,					\</div><div class='add'>+	.thermal_params = &amp;iwl_jf_tt_params</div><div class='add'>+</div><div class='add'>+#define IWL_DEVICE_JF							\</div><div class='add'>+	IWL_DEVICE_JF_PU,						\</div><div class='add'>+	.led_mode = IWL_LED_RF_STATE,					\</div><div class='add'>+	.non_shared_ant = ANT_B,					\</div><div class='add'>+	.num_rbds = IWL_NUM_RBDS_NON_HE,				\</div><div class='add'>+	.vht_mu_mimo_supported = true,					\</div><div class='add'>+	.ht_params = {							\</div><div class='add'>+		.stbc = true,						\</div><div class='add'>+		.ldpc = true,						\</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) |			\</div><div class='add'>+			      BIT(NL80211_BAND_5GHZ),			\</div><div class='add'>+	},								\</div><div class='add'>+	.nvm_ver = IWL_JF_NVM_VERSION,					\</div><div class='add'>+	.nvm_type = IWL_NVM_EXT,					\</div><div class='add'>+	.ucode_api_min = IWL_JF_UCODE_API_MIN,				\</div><div class='add'>+	.ucode_api_max = IWL_JF_UCODE_API_MAX</div><div class='add'>+</div><div class='add'>+const struct iwl_rf_cfg iwl_rf_jf = {</div><div class='add'>+	IWL_DEVICE_JF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct iwl_rf_cfg iwl_rf_jf_80mhz = {</div><div class='add'>+	IWL_DEVICE_JF,</div><div class='add'>+	.bw_limit = 80,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char iwl9260_name[] = "Intel(R) Wireless-AC 9260";</div><div class='add'>+const char iwl9461_name[] = "Intel(R) Wireless-AC 9461";</div><div class='add'>+const char iwl9462_name[] = "Intel(R) Wireless-AC 9462";</div><div class='add'>+const char iwl9560_name[] = "Intel(R) Wireless-AC 9560";</div><div class='add'>+const char iwl9260_160_name[] = "Intel(R) Wireless-AC 9260 160MHz";</div><div class='add'>+const char iwl9461_160_name[] = "Intel(R) Wireless-AC 9461 160MHz";</div><div class='add'>+const char iwl9462_160_name[] = "Intel(R) Wireless-AC 9462 160MHz";</div><div class='add'>+const char iwl9560_160_name[] = "Intel(R) Wireless-AC 9560 160MHz";</div><div class='add'>+</div><div class='add'>+const char iwl9260_killer_1550_name[] =</div><div class='add'>+	"Killer(R) Wireless-AC 1550 Wireless Network Adapter (9260NGW) 160MHz";</div><div class='add'>+const char iwl9560_killer_1550i_name[] =</div><div class='add'>+	"Killer(R) Wireless-AC 1550i Wireless Network Adapter (9560NGW) 160MHz";</div><div class='add'>+const char iwl9560_killer_1550s_name[] =</div><div class='add'>+	"Killer(R) Wireless-AC 1550s Wireless Network Adapter (9560D2W) 160MHz";</div><div class='add'>+</div><div class='add'>+MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_JF_UCODE_API_MAX));</div><div class='add'>+MODULE_FIRMWARE(IWL_QU_C_JF_B_MODULE_FIRMWARE(IWL_JF_UCODE_API_MAX));</div><div class='add'>+MODULE_FIRMWARE(IWL_QUZ_A_JF_B_MODULE_FIRMWARE(IWL_JF_UCODE_API_MAX));</div><div class='add'>+MODULE_FIRMWARE(IWL_SO_A_JF_B_MODULE_FIRMWARE(IWL_JF_UCODE_API_MAX));</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/rf-pe.c b/drivers/net/wireless/intel/iwlwifi/cfg/rf-pe.c<br/>new file mode 100644<br/>index 000000000000..408b9850bd10<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/rf-pe.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/cfg/rf-pe.c</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include "iwl-config.h"</div><div class='add'>+</div><div class='add'>+/* currently iwl_rf_wh/iwl_rf_wh_160mhz are just defines for the FM ones */</div><div class='add'>+</div><div class='add'>+const char iwl_killer_bn1850w2_name[] =</div><div class='add'>+	"Killer(R) Wi-Fi 8 BN1850w2 320MHz Wireless Network Adapter (BN201.D2W)";</div><div class='add'>+const char iwl_killer_bn1850i_name[] =</div><div class='add'>+	"Killer(R) Wi-Fi 8 BN1850i 320MHz Wireless Network Adapter (BN201.NGW)";</div><div class='add'>+</div><div class='add'>+const char iwl_bn201_name[] = "Intel(R) Wi-Fi 8 BN201";</div><div class='add'>+const char iwl_bn203_name[] = "Intel(R) Wi-Fi 8 BN203";</div><div class='add'>+const char iwl_be221_name[] = "Intel(R) Wi-Fi 7 BE221";</div><div class='add'>+const char iwl_be223_name[] = "Intel(R) Wi-Fi 7 BE223";</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/rf-wh.c b/drivers/net/wireless/intel/iwlwifi/cfg/rf-wh.c<br/>new file mode 100644<br/>index 000000000000..b5803ea1eb78<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/rf-wh.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/cfg/rf-wh.c</a></div><div class='hunk'>@@ -0,0 +1,39 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include "iwl-config.h"</div><div class='add'>+</div><div class='add'>+/* NVM versions */</div><div class='add'>+#define IWL_WH_NVM_VERSION		0x0a1d</div><div class='add'>+</div><div class='add'>+#define IWL_DEVICE_WH							\</div><div class='add'>+	.ht_params = {							\</div><div class='add'>+		.stbc = true,						\</div><div class='add'>+		.ldpc = true,						\</div><div class='add'>+		.ht40_bands = BIT(NL80211_BAND_2GHZ) |			\</div><div class='add'>+			      BIT(NL80211_BAND_5GHZ),			\</div><div class='add'>+	},								\</div><div class='add'>+	.led_mode = IWL_LED_RF_STATE,					\</div><div class='add'>+	.non_shared_ant = ANT_B,					\</div><div class='add'>+	.vht_mu_mimo_supported = true,					\</div><div class='add'>+	.uhb_supported = true,						\</div><div class='add'>+	.num_rbds = IWL_NUM_RBDS_EHT,					\</div><div class='add'>+	.nvm_ver = IWL_WH_NVM_VERSION,					\</div><div class='add'>+	.nvm_type = IWL_NVM_EXT</div><div class='add'>+</div><div class='add'>+/* currently iwl_rf_wh/iwl_rf_wh_160mhz are just defines for the FM ones */</div><div class='add'>+</div><div class='add'>+const struct iwl_rf_cfg iwl_rf_wh_non_eht = {</div><div class='add'>+	IWL_DEVICE_WH,</div><div class='add'>+	.eht_supported = false,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char iwl_killer_be1775s_name[] =</div><div class='add'>+	"Killer(R) Wi-Fi 7 BE1775s 320MHz Wireless Network Adapter (BE211D2W)";</div><div class='add'>+const char iwl_killer_be1775i_name[] =</div><div class='add'>+	"Killer(R) Wi-Fi 7 BE1775i 320MHz Wireless Network Adapter (BE211NGW)";</div><div class='add'>+</div><div class='add'>+const char iwl_be211_name[] = "Intel(R) Wi-Fi 7 BE211 320MHz";</div><div class='add'>+const char iwl_be213_name[] = "Intel(R) Wi-Fi 7 BE213 160MHz";</div><div class='add'>+const char iwl_ax221_name[] = "Intel(R) Wi-Fi 6E AX221 160MHz";</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c<br/>new file mode 100644<br/>index 000000000000..ee00b2af7a1d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/cfg/sc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/cfg/sc.c</a></div><div class='hunk'>@@ -0,0 +1,100 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='add'>+ * Copyright (C) 2018-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/stringify.h&gt;</div><div class='add'>+#include "iwl-config.h"</div><div class='add'>+#include "iwl-prph.h"</div><div class='add'>+#include "fw/api/txq.h"</div><div class='add'>+</div><div class='add'>+/* Highest firmware core release supported */</div><div class='add'>+#define IWL_SC_UCODE_CORE_MAX	101</div><div class='add'>+</div><div class='add'>+/* Lowest firmware API version supported */</div><div class='add'>+#define IWL_SC_UCODE_API_MIN	100</div><div class='add'>+</div><div class='add'>+/* NVM versions */</div><div class='add'>+#define IWL_SC_NVM_VERSION		0x0a1d</div><div class='add'>+</div><div class='add'>+/* Memory offsets and lengths */</div><div class='add'>+#define IWL_SC_SMEM_OFFSET		0x400000</div><div class='add'>+#define IWL_SC_SMEM_LEN			0xD0000</div><div class='add'>+</div><div class='add'>+#define IWL_SC_A_FM_B_FW_PRE		"iwlwifi-sc-a0-fm-b0"</div><div class='add'>+#define IWL_SC_A_FM_C_FW_PRE		"iwlwifi-sc-a0-fm-c0"</div><div class='add'>+#define IWL_SC_A_WH_A_FW_PRE		"iwlwifi-sc-a0-wh-a0"</div><div class='add'>+#define IWL_SC2_A_FM_C_FW_PRE		"iwlwifi-sc2-a0-fm-c0"</div><div class='add'>+#define IWL_SC2_A_WH_A_FW_PRE		"iwlwifi-sc2-a0-wh-a0"</div><div class='add'>+</div><div class='add'>+static const struct iwl_family_base_params iwl_sc_base = {</div><div class='add'>+	.num_of_queues = 512,</div><div class='add'>+	.max_tfd_queue_size = 65536,</div><div class='add'>+	.shadow_ram_support = true,</div><div class='add'>+	.led_compensation = 57,</div><div class='add'>+	.wd_timeout = IWL_LONG_WD_TIMEOUT,</div><div class='add'>+	.max_event_log_size = 512,</div><div class='add'>+	.shadow_reg_enable = true,</div><div class='add'>+	.pcie_l1_allowed = true,</div><div class='add'>+	.smem_offset = IWL_SC_SMEM_OFFSET,</div><div class='add'>+	.smem_len = IWL_SC_SMEM_LEN,</div><div class='add'>+	.apmg_not_supported = true,</div><div class='add'>+	.mac_addr_from_csr = 0x30,</div><div class='add'>+	.d3_debug_data_base_addr = 0x401000,</div><div class='add'>+	.d3_debug_data_length = 60 * 1024,</div><div class='add'>+	.mon_smem_regs = {</div><div class='add'>+		.write_ptr = {</div><div class='add'>+			.addr = LDBG_M2S_BUF_WPTR,</div><div class='add'>+			.mask = LDBG_M2S_BUF_WPTR_VAL_MSK,</div><div class='add'>+		},</div><div class='add'>+		.cycle_cnt = {</div><div class='add'>+			.addr = LDBG_M2S_BUF_WRAP_CNT,</div><div class='add'>+			.mask = LDBG_M2S_BUF_WRAP_CNT_VAL_MSK,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.min_txq_size = 128,</div><div class='add'>+	.gp2_reg_addr = 0xd02c68,</div><div class='add'>+	.min_ba_txq_size = IWL_DEFAULT_QUEUE_SIZE_EHT,</div><div class='add'>+	.mon_dram_regs = {</div><div class='add'>+		.write_ptr = {</div><div class='add'>+			.addr = DBGC_CUR_DBGBUF_STATUS,</div><div class='add'>+			.mask = DBGC_CUR_DBGBUF_STATUS_OFFSET_MSK,</div><div class='add'>+		},</div><div class='add'>+		.cycle_cnt = {</div><div class='add'>+			.addr = DBGC_DBGBUF_WRAP_AROUND,</div><div class='add'>+			.mask = 0xffffffff,</div><div class='add'>+		},</div><div class='add'>+		.cur_frag = {</div><div class='add'>+			.addr = DBGC_CUR_DBGBUF_STATUS,</div><div class='add'>+			.mask = DBGC_CUR_DBGBUF_STATUS_IDX_MSK,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.mon_dbgi_regs = {</div><div class='add'>+		.write_ptr = {</div><div class='add'>+			.addr = DBGI_SRAM_FIFO_POINTERS,</div><div class='add'>+			.mask = DBGI_SRAM_FIFO_POINTERS_WR_PTR_MSK,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,</div><div class='add'>+	.ucode_api_max = ENCODE_CORE_AS_API(IWL_SC_UCODE_CORE_MAX),</div><div class='add'>+	.ucode_api_min = IWL_SC_UCODE_API_MIN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct iwl_mac_cfg iwl_sc_mac_cfg = {</div><div class='add'>+	.device_family = IWL_DEVICE_FAMILY_SC,</div><div class='add'>+	.base = &amp;iwl_sc_base,</div><div class='add'>+	.mq_rx_supported = true,</div><div class='add'>+	.gen2 = true,</div><div class='add'>+	.integrated = true,</div><div class='add'>+	.umac_prph_offset = 0x300000,</div><div class='add'>+	.xtal_latency = 12000,</div><div class='add'>+	.low_latency_xtal = true,</div><div class='add'>+	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+IWL_CORE_FW(IWL_SC_A_FM_B_FW_PRE, IWL_SC_UCODE_CORE_MAX);</div><div class='add'>+IWL_CORE_FW(IWL_SC_A_FM_C_FW_PRE, IWL_SC_UCODE_CORE_MAX);</div><div class='add'>+IWL_CORE_FW(IWL_SC_A_WH_A_FW_PRE, IWL_SC_UCODE_CORE_MAX);</div><div class='add'>+IWL_CORE_FW(IWL_SC2_A_FM_C_FW_PRE, IWL_SC_UCODE_CORE_MAX);</div><div class='add'>+IWL_CORE_FW(IWL_SC2_A_WH_A_FW_PRE, IWL_SC_UCODE_CORE_MAX);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/Makefile b/drivers/net/wireless/intel/iwlwifi/dvm/Makefile<br/>index 0486b17d7c41..abcf8aeb010d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/Makefile</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> # DVM</div><div class='ctx'> obj-$(CONFIG_IWLDVM)	+= iwldvm.o</div><div class='ctx'> iwldvm-objs		+= main.o rs.o mac80211.o ucode.o tx.o</div><div class='del'>-iwldvm-objs		+= lib.o calib.o tt.o sta.o rx.o</div><div class='add'>+iwldvm-objs		+= lib.o calib.o tt.o sta.o rx.o eeprom.o</div><div class='ctx'> </div><div class='ctx'> iwldvm-objs		+= power.o</div><div class='ctx'> iwldvm-objs		+= scan.o</div><div class='hunk'>@@ -11,4 +11,4 @@ iwldvm-objs		+= rxon.o devices.o</div><div class='ctx'> iwldvm-$(CONFIG_IWLWIFI_LEDS) += led.o</div><div class='ctx'> iwldvm-$(CONFIG_IWLWIFI_DEBUGFS) += debugfs.o</div><div class='ctx'> </div><div class='del'>-ccflags-y += -I $(srctree)/$(src)/../</div><div class='add'>+ccflags-y += -I $(src)/../</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/agn.h b/drivers/net/wireless/intel/iwlwifi/dvm/agn.h<br/>index 1276df1c7a55..9d99374ee093 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/agn.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/agn.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/agn.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/agn.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2014 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2014, 2021, 2024-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_agn_h__</div><div class='ctx'> #define __iwl_agn_h__</div><div class='hunk'>@@ -88,11 +88,11 @@ void iwl_connection_init_rx_config(struct iwl_priv *priv,</div><div class='ctx'> int iwlagn_set_pan_params(struct iwl_priv *priv);</div><div class='ctx'> int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx);</div><div class='ctx'> void iwlagn_set_rxon_chain(struct iwl_priv *priv, struct iwl_rxon_context *ctx);</div><div class='del'>-int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed);</div><div class='add'>+int iwlagn_mac_config(struct ieee80211_hw *hw, int radio_idx, u32 changed);</div><div class='ctx'> void iwlagn_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 			     struct ieee80211_vif *vif,</div><div class='ctx'> 			     struct ieee80211_bss_conf *bss_conf,</div><div class='del'>-			     u32 changes);</div><div class='add'>+			     u64 changes);</div><div class='ctx'> void iwlagn_config_ht40(struct ieee80211_conf *conf,</div><div class='ctx'> 			struct iwl_rxon_context *ctx);</div><div class='ctx'> void iwl_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_config *ht_conf);</div><div class='hunk'>@@ -112,7 +112,7 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv,</div><div class='ctx'> 			      enum iwl_ucode_type ucode_type);</div><div class='ctx'> int iwl_send_calib_results(struct iwl_priv *priv);</div><div class='ctx'> int iwl_calib_set(struct iwl_priv *priv,</div><div class='del'>-		  const struct iwl_calib_hdr *cmd, int len);</div><div class='add'>+		  const struct iwl_calib_cmd *cmd, size_t len);</div><div class='ctx'> void iwl_calib_free_results(struct iwl_priv *priv);</div><div class='ctx'> int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,</div><div class='ctx'> 			    char **buf);</div><div class='hunk'>@@ -385,6 +385,27 @@ static inline void iwl_dvm_set_pmi(struct iwl_priv *priv, bool state)</div><div class='ctx'> 	iwl_trans_set_pmi(priv-&gt;trans, state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * iwl_parse_eeprom_data - parse EEPROM data and return values</div><div class='add'>+ *</div><div class='add'>+ * @trans: transport we're parsing for, for debug only</div><div class='add'>+ * @cfg: device configuration for parsing and overrides</div><div class='add'>+ * @eeprom: the EEPROM data</div><div class='add'>+ * @eeprom_size: length of the EEPROM data</div><div class='add'>+ *</div><div class='add'>+ * This function parses all EEPROM values we need and then</div><div class='add'>+ * returns a (newly allocated) struct containing all the</div><div class='add'>+ * relevant values for driver use. The struct must be freed</div><div class='add'>+ * later with iwl_free_nvm_data().</div><div class='add'>+ *</div><div class='add'>+ * Return: the parsed NVM data</div><div class='add'>+ */</div><div class='add'>+struct iwl_nvm_data *</div><div class='add'>+iwl_parse_eeprom_data(struct iwl_trans *trans, const struct iwl_rf_cfg *cfg,</div><div class='add'>+		      const u8 *eeprom, size_t eeprom_size);</div><div class='add'>+</div><div class='add'>+int iwl_read_eeprom(struct iwl_trans *trans, u8 **eeprom, size_t *eeprom_size);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> void iwl_dbgfs_register(struct iwl_priv *priv, struct dentry *dbgfs_dir);</div><div class='ctx'> #else</div><div class='hunk'>@@ -398,8 +419,10 @@ do {									\</div><div class='ctx'> 	if (!iwl_is_rfkill((m)))					\</div><div class='ctx'> 		IWL_ERR(m, fmt, ##args);				\</div><div class='ctx'> 	else								\</div><div class='del'>-		__iwl_err((m)-&gt;dev, true,				\</div><div class='del'>-			  !iwl_have_debug_level(IWL_DL_RADIO),		\</div><div class='add'>+		__iwl_err((m)-&gt;dev,					\</div><div class='add'>+			  iwl_have_debug_level(IWL_DL_RADIO) ?		\</div><div class='add'>+				IWL_ERR_MODE_RFKILL :			\</div><div class='add'>+				IWL_ERR_MODE_TRACE_ONLY,		\</div><div class='ctx'> 			  fmt, ##args);					\</div><div class='ctx'> } while (0)</div><div class='ctx'> #else</div><div class='hunk'>@@ -408,7 +431,8 @@ do {									\</div><div class='ctx'> 	if (!iwl_is_rfkill((m)))					\</div><div class='ctx'> 		IWL_ERR(m, fmt, ##args);				\</div><div class='ctx'> 	else								\</div><div class='del'>-		__iwl_err((m)-&gt;dev, true, true, fmt, ##args);	\</div><div class='add'>+		__iwl_err((m)-&gt;dev, IWL_ERR_MODE_TRACE_ONLY,		\</div><div class='add'>+			  fmt, ##args);					\</div><div class='ctx'> } while (0)</div><div class='ctx'> #endif				/* CONFIG_IWLWIFI_DEBUG */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/calib.c b/drivers/net/wireless/intel/iwlwifi/dvm/calib.c<br/>index a11884fa254b..f488620d2844 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/calib.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/calib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/calib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/calib.c</a></div><div class='hunk'>@@ -19,8 +19,7 @@</div><div class='ctx'> struct iwl_calib_result {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	size_t cmd_len;</div><div class='del'>-	struct iwl_calib_hdr hdr;</div><div class='del'>-	/* data follows */</div><div class='add'>+	struct iwl_calib_cmd cmd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct statistics_general_data {</div><div class='hunk'>@@ -43,12 +42,12 @@ int iwl_send_calib_results(struct iwl_priv *priv)</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='ctx'> 		hcmd.len[0] = res-&gt;cmd_len;</div><div class='del'>-		hcmd.data[0] = &amp;res-&gt;hdr;</div><div class='add'>+		hcmd.data[0] = &amp;res-&gt;cmd;</div><div class='ctx'> 		hcmd.dataflags[0] = IWL_HCMD_DFL_NOCOPY;</div><div class='ctx'> 		ret = iwl_dvm_send_cmd(priv, &amp;hcmd);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			IWL_ERR(priv, "Error %d on calib cmd %d\n",</div><div class='del'>-				ret, res-&gt;hdr.op_code);</div><div class='add'>+				ret, res-&gt;cmd.hdr.op_code);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -57,19 +56,22 @@ int iwl_send_calib_results(struct iwl_priv *priv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iwl_calib_set(struct iwl_priv *priv,</div><div class='del'>-		  const struct iwl_calib_hdr *cmd, int len)</div><div class='add'>+		  const struct iwl_calib_cmd *cmd, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_calib_result *res, *tmp;</div><div class='ctx'> </div><div class='del'>-	res = kmalloc(sizeof(*res) + len - sizeof(struct iwl_calib_hdr),</div><div class='del'>-		      GFP_ATOMIC);</div><div class='add'>+	if (check_sub_overflow(len, sizeof(*cmd), &amp;len))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	res = kmalloc(struct_size(res, cmd.data, len), GFP_ATOMIC);</div><div class='ctx'> 	if (!res)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	memcpy(&amp;res-&gt;hdr, cmd, len);</div><div class='del'>-	res-&gt;cmd_len = len;</div><div class='add'>+	res-&gt;cmd = *cmd;</div><div class='add'>+	memcpy(res-&gt;cmd.data, cmd-&gt;data, len);</div><div class='add'>+	res-&gt;cmd_len = struct_size(cmd, data, len);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(tmp, &amp;priv-&gt;calib_results, list) {</div><div class='del'>-		if (tmp-&gt;hdr.op_code == res-&gt;hdr.op_code) {</div><div class='add'>+		if (tmp-&gt;cmd.hdr.op_code == res-&gt;cmd.hdr.op_code) {</div><div class='ctx'> 			list_replace(&amp;tmp-&gt;list, &amp;res-&gt;list);</div><div class='ctx'> 			kfree(tmp);</div><div class='ctx'> 			return 0;</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/commands.h b/drivers/net/wireless/intel/iwlwifi/dvm/commands.h<br/>index 235c7a2e3483..138b11f51d00 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/commands.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/commands.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/commands.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/commands.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2014 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2014, 2023-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> /*</div><div class='ctx'>  * Please use this file (commands.h) only for uCode API definitions.</div><div class='hunk'>@@ -177,7 +177,7 @@ enum {</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * iwlagn rate_n_flags bit fields</div><div class='ctx'>  *</div><div class='ctx'>  * rate_n_flags format is used in following iwlagn commands:</div><div class='hunk'>@@ -251,7 +251,7 @@ enum {</div><div class='ctx'> #define RATE_MCS_SGI_POS 13</div><div class='ctx'> #define RATE_MCS_SGI_MSK 0x2000</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * rate_n_flags Tx antenna masks</div><div class='ctx'>  * bit14:16</div><div class='ctx'>  */</div><div class='hunk'>@@ -270,7 +270,7 @@ enum {</div><div class='ctx'> #define IWL_PWR_NUM_HT_OFDM_ENTRIES		24</div><div class='ctx'> #define IWL_PWR_CCK_ENTRIES			2</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * struct tx_power_dual_stream</div><div class='ctx'>  *</div><div class='ctx'>  * Table entries in REPLY_TX_PWR_TABLE_CMD, REPLY_CHANNEL_SWITCH</div><div class='hunk'>@@ -281,7 +281,7 @@ struct tx_power_dual_stream {</div><div class='ctx'> 	__le32 dw;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Command REPLY_TX_POWER_DBM_CMD = 0x98</div><div class='ctx'>  * struct iwlagn_tx_power_dbm_cmd</div><div class='ctx'>  */</div><div class='hunk'>@@ -295,7 +295,7 @@ struct iwlagn_tx_power_dbm_cmd {</div><div class='ctx'> 	u8 reserved;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Command TX_ANT_CONFIGURATION_CMD = 0x98</div><div class='ctx'>  * This command is used to configure valid Tx antenna.</div><div class='ctx'>  * By default uCode concludes the valid antenna according to the radio flavor.</div><div class='hunk'>@@ -313,7 +313,7 @@ struct iwl_tx_ant_config_cmd {</div><div class='ctx'> </div><div class='ctx'> #define UCODE_VALID_OK	cpu_to_le32(0x1)</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * REPLY_ALIVE = 0x1 (response only, not a command)</div><div class='ctx'>  *</div><div class='ctx'>  * uCode issues this "alive" notification once the runtime image is ready</div><div class='hunk'>@@ -534,7 +534,7 @@ enum {</div><div class='ctx'> /* transfer to host non bssid beacons in associated state */</div><div class='ctx'> #define RXON_FILTER_BCON_AWARE_MSK      cpu_to_le32(1 &lt;&lt; 6)</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * REPLY_RXON = 0x10 (command, has simple generic response)</div><div class='ctx'>  *</div><div class='ctx'>  * RXON tunes the radio tuner to a service channel, and sets up a number</div><div class='hunk'>@@ -614,7 +614,7 @@ struct iwl_rxon_time_cmd {</div><div class='ctx'>  * REPLY_CHANNEL_SWITCH = 0x72 (command, has simple generic response)</div><div class='ctx'>  */</div><div class='ctx'> /**</div><div class='del'>- * struct iwl5000_channel_switch_cmd</div><div class='add'>+ * struct iwl5000_channel_switch_cmd - channel switch command (5000 series)</div><div class='ctx'>  * @band: 0- 5.2GHz, 1- 2.4GHz</div><div class='ctx'>  * @expect_beacon: 0- resume transmits after channel switch</div><div class='ctx'>  *		   1- wait for beacon to resume transmits</div><div class='hunk'>@@ -635,7 +635,7 @@ struct iwl5000_channel_switch_cmd {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl6000_channel_switch_cmd</div><div class='add'>+ * struct iwl6000_channel_switch_cmd - channel switch command (6000 series)</div><div class='ctx'>  * @band: 0- 5.2GHz, 1- 2.4GHz</div><div class='ctx'>  * @expect_beacon: 0- resume transmits after channel switch</div><div class='ctx'>  *		   1- wait for beacon to resume transmits</div><div class='hunk'>@@ -681,6 +681,7 @@ struct iwl_csa_notification {</div><div class='ctx'>  * @aifsn:  Number of slots in Arbitration Interframe Space (before</div><div class='ctx'>  *          performing random backoff timing prior to Tx).  Device default 1.</div><div class='ctx'>  * @edca_txop:  Length of Tx opportunity, in uSecs.  Device default is 0.</div><div class='add'>+ * @reserved1: reserved for alignment</div><div class='ctx'>  *</div><div class='ctx'>  * Device will automatically increase contention window by (2*CW) + 1 for each</div><div class='ctx'>  * transmission retry.  Device uses cw_max as a bit mask, ANDed with new CW</div><div class='hunk'>@@ -790,10 +791,12 @@ struct iwl_keyinfo {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct sta_id_modify</div><div class='del'>- * @addr[ETH_ALEN]: station's MAC address</div><div class='add'>+ * struct sta_id_modify - station modify command</div><div class='add'>+ * @addr: station's MAC address</div><div class='add'>+ * @reserved1: reserved for alignment</div><div class='ctx'>  * @sta_id: index of station in uCode's station table</div><div class='ctx'>  * @modify_mask: STA_MODIFY_*, 1: modify, 0: don't change</div><div class='add'>+ * @reserved2: reserved for alignment</div><div class='ctx'>  *</div><div class='ctx'>  * Driver selects unused table index when adding new station,</div><div class='ctx'>  * or the index to a pre-existing station entry when modifying that station.</div><div class='hunk'>@@ -1177,83 +1180,87 @@ struct iwl_dram_scratch {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct iwl_tx_cmd {</div><div class='del'>-	/*</div><div class='del'>-	 * MPDU byte count:</div><div class='del'>-	 * MAC header (24/26/30/32 bytes) + 2 bytes pad if 26/30 header size,</div><div class='del'>-	 * + 8 byte IV for CCM or TKIP (not used for WEP)</div><div class='del'>-	 * + Data payload</div><div class='del'>-	 * + 8-byte MIC (not used for CCM/WEP)</div><div class='del'>-	 * NOTE:  Does not include Tx command bytes, post-MAC pad bytes,</div><div class='del'>-	 *        MIC (CCM) 8 bytes, ICV (WEP/TKIP/CKIP) 4 bytes, CRC 4 bytes.i</div><div class='del'>-	 * Range: 14-2342 bytes.</div><div class='del'>-	 */</div><div class='del'>-	__le16 len;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * MPDU or MSDU byte count for next frame.</div><div class='del'>-	 * Used for fragmentation and bursting, but not 11n aggregation.</div><div class='del'>-	 * Same as "len", but for next frame.  Set to 0 if not applicable.</div><div class='del'>-	 */</div><div class='del'>-	__le16 next_frame_len;</div><div class='del'>-</div><div class='del'>-	__le32 tx_flags;	/* TX_CMD_FLG_* */</div><div class='del'>-</div><div class='del'>-	/* uCode may modify this field of the Tx command (in host DRAM!).</div><div class='del'>-	 * Driver must also set dram_lsb_ptr and dram_msb_ptr in this cmd. */</div><div class='del'>-	struct iwl_dram_scratch scratch;</div><div class='del'>-</div><div class='del'>-	/* Rate for *all* Tx attempts, if TX_CMD_FLG_STA_RATE_MSK is cleared. */</div><div class='del'>-	__le32 rate_n_flags;	/* RATE_MCS_* */</div><div class='del'>-</div><div class='del'>-	/* Index of destination station in uCode's station table */</div><div class='del'>-	u8 sta_id;</div><div class='del'>-</div><div class='del'>-	/* Type of security encryption:  CCM or TKIP */</div><div class='del'>-	u8 sec_ctl;		/* TX_CMD_SEC_* */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Index into rate table (see REPLY_TX_LINK_QUALITY_CMD) for initial</div><div class='del'>-	 * Tx attempt, if TX_CMD_FLG_STA_RATE_MSK is set.  Normally "0" for</div><div class='del'>-	 * data frames, this field may be used to selectively reduce initial</div><div class='del'>-	 * rate (via non-0 value) for special frames (e.g. management), while</div><div class='del'>-	 * still supporting rate scaling for all frames.</div><div class='del'>-	 */</div><div class='del'>-	u8 initial_rate_index;</div><div class='del'>-	u8 reserved;</div><div class='del'>-	u8 key[16];</div><div class='del'>-	__le16 next_frame_flags;</div><div class='del'>-	__le16 reserved2;</div><div class='del'>-	union {</div><div class='del'>-		__le32 life_time;</div><div class='del'>-		__le32 attempt;</div><div class='del'>-	} stop_time;</div><div class='del'>-</div><div class='del'>-	/* Host DRAM physical address pointer to "scratch" in this command.</div><div class='del'>-	 * Must be dword aligned.  "0" in dram_lsb_ptr disables usage. */</div><div class='del'>-	__le32 dram_lsb_ptr;</div><div class='del'>-	u8 dram_msb_ptr;</div><div class='del'>-</div><div class='del'>-	u8 rts_retry_limit;	/*byte 50 */</div><div class='del'>-	u8 data_retry_limit;	/*byte 51 */</div><div class='del'>-	u8 tid_tspec;</div><div class='del'>-	union {</div><div class='del'>-		__le16 pm_frame_timeout;</div><div class='del'>-		__le16 attempt_duration;</div><div class='del'>-	} timeout;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Duration of EDCA burst Tx Opportunity, in 32-usec units.</div><div class='del'>-	 * Set this if txop time is not specified by HCCA protocol (e.g. by AP).</div><div class='del'>-	 */</div><div class='del'>-	__le16 driver_txop;</div><div class='del'>-</div><div class='add'>+	/* New members MUST be added within the __struct_group() macro below. */</div><div class='add'>+	__struct_group(iwl_tx_cmd_hdr, __hdr, __packed,</div><div class='add'>+		/*</div><div class='add'>+		 * MPDU byte count:</div><div class='add'>+		 * MAC header (24/26/30/32 bytes) + 2 bytes pad if 26/30 header size,</div><div class='add'>+		 * + 8 byte IV for CCM or TKIP (not used for WEP)</div><div class='add'>+		 * + Data payload</div><div class='add'>+		 * + 8-byte MIC (not used for CCM/WEP)</div><div class='add'>+		 * NOTE:  Does not include Tx command bytes, post-MAC pad bytes,</div><div class='add'>+		 *        MIC (CCM) 8 bytes, ICV (WEP/TKIP/CKIP) 4 bytes, CRC 4 bytes.i</div><div class='add'>+		 * Range: 14-2342 bytes.</div><div class='add'>+		 */</div><div class='add'>+		__le16 len;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * MPDU or MSDU byte count for next frame.</div><div class='add'>+		 * Used for fragmentation and bursting, but not 11n aggregation.</div><div class='add'>+		 * Same as "len", but for next frame.  Set to 0 if not applicable.</div><div class='add'>+		 */</div><div class='add'>+		__le16 next_frame_len;</div><div class='add'>+</div><div class='add'>+		__le32 tx_flags;	/* TX_CMD_FLG_* */</div><div class='add'>+</div><div class='add'>+		/* uCode may modify this field of the Tx command (in host DRAM!).</div><div class='add'>+		 * Driver must also set dram_lsb_ptr and dram_msb_ptr in this cmd. */</div><div class='add'>+		struct iwl_dram_scratch scratch;</div><div class='add'>+</div><div class='add'>+		/* Rate for *all* Tx attempts, if TX_CMD_FLG_STA_RATE_MSK is cleared. */</div><div class='add'>+		__le32 rate_n_flags;	/* RATE_MCS_* */</div><div class='add'>+</div><div class='add'>+		/* Index of destination station in uCode's station table */</div><div class='add'>+		u8 sta_id;</div><div class='add'>+</div><div class='add'>+		/* Type of security encryption:  CCM or TKIP */</div><div class='add'>+		u8 sec_ctl;		/* TX_CMD_SEC_* */</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Index into rate table (see REPLY_TX_LINK_QUALITY_CMD) for initial</div><div class='add'>+		 * Tx attempt, if TX_CMD_FLG_STA_RATE_MSK is set.  Normally "0" for</div><div class='add'>+		 * data frames, this field may be used to selectively reduce initial</div><div class='add'>+		 * rate (via non-0 value) for special frames (e.g. management), while</div><div class='add'>+		 * still supporting rate scaling for all frames.</div><div class='add'>+		 */</div><div class='add'>+		u8 initial_rate_index;</div><div class='add'>+		u8 reserved;</div><div class='add'>+		u8 key[16];</div><div class='add'>+		__le16 next_frame_flags;</div><div class='add'>+		__le16 reserved2;</div><div class='add'>+		union {</div><div class='add'>+			__le32 life_time;</div><div class='add'>+			__le32 attempt;</div><div class='add'>+		} stop_time;</div><div class='add'>+</div><div class='add'>+		/* Host DRAM physical address pointer to "scratch" in this command.</div><div class='add'>+		 * Must be dword aligned.  "0" in dram_lsb_ptr disables usage. */</div><div class='add'>+		__le32 dram_lsb_ptr;</div><div class='add'>+		u8 dram_msb_ptr;</div><div class='add'>+</div><div class='add'>+		u8 rts_retry_limit;	/*byte 50 */</div><div class='add'>+		u8 data_retry_limit;	/*byte 51 */</div><div class='add'>+		u8 tid_tspec;</div><div class='add'>+		union {</div><div class='add'>+			__le16 pm_frame_timeout;</div><div class='add'>+			__le16 attempt_duration;</div><div class='add'>+		} timeout;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Duration of EDCA burst Tx Opportunity, in 32-usec units.</div><div class='add'>+		 * Set this if txop time is not specified by HCCA protocol (e.g. by AP).</div><div class='add'>+		 */</div><div class='add'>+		__le16 driver_txop;</div><div class='add'>+</div><div class='add'>+	);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * MAC header goes here, followed by 2 bytes padding if MAC header</div><div class='ctx'> 	 * length is 26 or 30 bytes, followed by payload data</div><div class='ctx'> 	 */</div><div class='del'>-	u8 payload[0];</div><div class='ctx'> 	struct ieee80211_hdr hdr[];</div><div class='ctx'> } __packed;</div><div class='add'>+static_assert(offsetof(struct iwl_tx_cmd, hdr) == sizeof(struct iwl_tx_cmd_hdr),</div><div class='add'>+	      "struct member likely outside of __struct_group()");</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * TX command response is sent after *agn* transmission attempts.</div><div class='hunk'>@@ -1462,7 +1469,7 @@ struct iwl_compressed_ba_resp {</div><div class='ctx'> #define  LINK_QUAL_ANT_MSK   (LINK_QUAL_ANT_A_MSK|LINK_QUAL_ANT_B_MSK)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * struct iwl_link_qual_general_params</div><div class='ctx'>  *</div><div class='ctx'>  * Used in REPLY_TX_LINK_QUALITY_CMD</div><div class='hunk'>@@ -1505,7 +1512,7 @@ struct iwl_link_qual_general_params {</div><div class='ctx'> #define LINK_QUAL_AGG_FRAME_LIMIT_MAX	(63)</div><div class='ctx'> #define LINK_QUAL_AGG_FRAME_LIMIT_MIN	(0)</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * struct iwl_link_qual_agg_params</div><div class='ctx'>  *</div><div class='ctx'>  * Used in REPLY_TX_LINK_QUALITY_CMD</div><div class='hunk'>@@ -2019,7 +2026,7 @@ struct iwl_spectrum_notification {</div><div class='ctx'> 	u8 channel;</div><div class='ctx'> 	u8 type;		/* see enum iwl_measurement_type */</div><div class='ctx'> 	u8 reserved1;</div><div class='del'>-	/* NOTE:  cca_ofdm, cca_cck, basic_type, and histogram are only only</div><div class='add'>+	/* NOTE:  cca_ofdm, cca_cck, basic_type, and histogram are only</div><div class='ctx'> 	 * valid if applicable for measurement type requested. */</div><div class='ctx'> 	__le32 cca_ofdm;	/* cca fraction time in 40Mhz clock periods */</div><div class='ctx'> 	__le32 cca_cck;		/* cca fraction time in 44Mhz clock periods */</div><div class='hunk'>@@ -2038,7 +2045,7 @@ struct iwl_spectrum_notification {</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * struct iwl_powertable_cmd - Power Table Command</div><div class='ctx'>  * @flags: See below:</div><div class='ctx'>  *</div><div class='hunk'>@@ -2169,7 +2176,7 @@ struct iwl_ct_kill_throttling_config {</div><div class='ctx'> #define SCAN_CHANNEL_TYPE_PASSIVE cpu_to_le32(0)</div><div class='ctx'> #define SCAN_CHANNEL_TYPE_ACTIVE  cpu_to_le32(1)</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * struct iwl_scan_channel - entry in REPLY_SCAN_CMD channel table</div><div class='ctx'>  *</div><div class='ctx'>  * One for each channel in the scan list.</div><div class='hunk'>@@ -2208,7 +2215,7 @@ struct iwl_scan_channel {</div><div class='ctx'> /* set number of direct probes __le32 type */</div><div class='ctx'> #define IWL_SCAN_PROBE_MASK(n) 	cpu_to_le32((BIT(n) | (BIT(n) - BIT(1))))</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * struct iwl_ssid_ie - directed scan network information element</div><div class='ctx'>  *</div><div class='ctx'>  * Up to 20 of these may appear in REPLY_SCAN_CMD,</div><div class='hunk'>@@ -2307,7 +2314,7 @@ struct iwl_scan_cmd {</div><div class='ctx'> </div><div class='ctx'> 	/* For active scans (set to all-0s for passive scans).</div><div class='ctx'> 	 * Does not include payload.  Must specify Tx rate; no rate scaling. */</div><div class='del'>-	struct iwl_tx_cmd tx_cmd;</div><div class='add'>+	struct iwl_tx_cmd_hdr tx_cmd;</div><div class='ctx'> </div><div class='ctx'> 	/* For directed active scans (set to all-0s otherwise) */</div><div class='ctx'> 	struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX];</div><div class='hunk'>@@ -2418,7 +2425,7 @@ struct iwlagn_beacon_notif {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct iwl_tx_beacon_cmd {</div><div class='del'>-	struct iwl_tx_cmd tx;</div><div class='add'>+	struct iwl_tx_cmd_hdr tx;</div><div class='ctx'> 	__le16 tim_idx;</div><div class='ctx'> 	u8 tim_size;</div><div class='ctx'> 	u8 reserved1;</div><div class='hunk'>@@ -2558,6 +2565,7 @@ struct statistics_rx_bt {</div><div class='ctx'>  * @ant_a: current tx power on chain a in 1/2 dB step</div><div class='ctx'>  * @ant_b: current tx power on chain b in 1/2 dB step</div><div class='ctx'>  * @ant_c: current tx power on chain c in 1/2 dB step</div><div class='add'>+ * @reserved: reserved for alignment</div><div class='ctx'>  */</div><div class='ctx'> struct statistics_tx_power {</div><div class='ctx'> 	u8 ant_a;</div><div class='hunk'>@@ -2761,7 +2769,7 @@ struct iwl_missed_beacon_notif {</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * SENSITIVITY_CMD = 0xa8 (command, has simple generic response)</div><div class='ctx'>  *</div><div class='ctx'>  * This command sets up the Rx signal detector for a sensitivity level that</div><div class='hunk'>@@ -2984,7 +2992,7 @@ struct iwl_missed_beacon_notif {</div><div class='ctx'> #define SENSITIVITY_CMD_CONTROL_WORK_TABLE	cpu_to_le16(1)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_sensitivity_cmd</div><div class='add'>+ * struct iwl_sensitivity_cmd - sensitivity configuration command</div><div class='ctx'>  * @control:  (1) updates working table, (0) updates default table</div><div class='ctx'>  * @table:  energy threshold values, use HD_* as index into table</div><div class='ctx'>  *</div><div class='hunk'>@@ -3004,7 +3012,7 @@ struct iwl_enhance_sensitivity_cmd {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * REPLY_PHY_CALIBRATION_CMD = 0xb0 (command, has simple generic response)</div><div class='ctx'>  *</div><div class='ctx'>  * This command sets the relative gains of agn device's 3 radio receiver chains.</div><div class='hunk'>@@ -3840,11 +3848,12 @@ struct iwlagn_wowlan_status {</div><div class='ctx'> #define IWL_MIN_SLOT_TIME	20</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_wipan_slot</div><div class='add'>+ * struct iwl_wipan_slot - WiPAN slot configuration</div><div class='ctx'>  * @width: Time in TU</div><div class='ctx'>  * @type:</div><div class='ctx'>  *   0 - BSS</div><div class='ctx'>  *   1 - PAN</div><div class='add'>+ * @reserved: reserved for alignment</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_wipan_slot {</div><div class='ctx'> 	__le16 width;</div><div class='hunk'>@@ -3859,7 +3868,7 @@ struct iwl_wipan_slot {</div><div class='ctx'> #define IWL_WIPAN_PARAMS_FLG_FULL_SLOTTED_MODE		BIT(5)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_wipan_params_cmd</div><div class='add'>+ * struct iwl_wipan_params_cmd - WiPAN parameters</div><div class='ctx'>  * @flags:</div><div class='ctx'>  *   bit0: reserved</div><div class='ctx'>  *   bit1: CP leave channel with CTS</div><div class='hunk'>@@ -3872,6 +3881,8 @@ struct iwl_wipan_slot {</div><div class='ctx'>  *         uCode will perform leaving channel methods in context switch</div><div class='ctx'>  *         also when working in same channel mode</div><div class='ctx'>  * @num_slots: 1 - 10</div><div class='add'>+ * @slots: per-slot data</div><div class='add'>+ * @reserved: reserved for alignment</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_wipan_params_cmd {</div><div class='ctx'> 	__le16 flags;</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c<br/>index 911049201838..ec94c43ba28c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c</a></div><div class='hunk'>@@ -2,11 +2,7 @@</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.</div><div class='del'>- * Copyright (C) 2018 Intel Corporation</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='add'>+ * Copyright (C) 2018, 2025 Intel Corporation</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -1874,7 +1870,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		priv-&gt;event_log.ucode_trace = false;</div><div class='del'>-		del_timer_sync(&amp;priv-&gt;ucode_trace);</div><div class='add'>+		timer_delete_sync(&amp;priv-&gt;ucode_trace);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -2101,7 +2097,8 @@ static ssize_t iwl_dbgfs_protection_mode_read(struct file *file,</div><div class='ctx'> 	char buf[40];</div><div class='ctx'> 	const size_t bufsz = sizeof(buf);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;cfg-&gt;ht_params)</div><div class='add'>+	/* HT devices also have at least one HT40 band */</div><div class='add'>+	if (priv-&gt;cfg-&gt;ht_params.ht40_bands)</div><div class='ctx'> 		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='ctx'> 			 "use %s for aggregation\n",</div><div class='ctx'> 			 (priv-&gt;hw_params.use_rts_for_aggregation) ?</div><div class='hunk'>@@ -2121,7 +2118,8 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,</div><div class='ctx'> 	int buf_size;</div><div class='ctx'> 	int rts;</div><div class='ctx'> </div><div class='del'>-	if (!priv-&gt;cfg-&gt;ht_params)</div><div class='add'>+	/* HT devices also have at least one HT40 band */</div><div class='add'>+	if (!priv-&gt;cfg-&gt;ht_params.ht40_bands)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	memset(buf, 0, sizeof(buf));</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/dev.h b/drivers/net/wireless/intel/iwlwifi/dvm/dev.h<br/>index 4bd792c06ff6..4d12bf901703 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/dev.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/dev.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/dev.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/dev.h</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * Copyright(c) 2003 - 2014, 2020 Intel Corporation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='add'>+ * Copyright(c) 2003 - 2014, 2020, 2023 Intel Corporation. All rights reserved.</div><div class='add'>+ * Copyright (C) 2025 Intel Corporation</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> /*</div><div class='ctx'>  * Please use this file (dev.h) for driver implementation definitions.</div><div class='hunk'>@@ -24,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "fw/img.h"</div><div class='del'>-#include "iwl-eeprom-parse.h"</div><div class='add'>+#include "iwl-nvm-utils.h"</div><div class='ctx'> #include "iwl-csr.h"</div><div class='ctx'> #include "iwl-debug.h"</div><div class='ctx'> #include "iwl-agn-hw.h"</div><div class='hunk'>@@ -108,7 +104,7 @@ struct iwl_qos_info {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum iwl_agg_state</div><div class='add'>+ * enum iwl_agg_state - aggregation state</div><div class='ctx'>  *</div><div class='ctx'>  * The state machine of the BA agreement establishment / tear down.</div><div class='ctx'>  * These states relate to a specific RA / TID.</div><div class='hunk'>@@ -131,11 +127,11 @@ enum iwl_agg_state {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_ht_agg - aggregation state machine</div><div class='del'>-</div><div class='add'>+ *</div><div class='ctx'>  * This structs holds the states for the BA agreement establishment and tear</div><div class='ctx'>  * down. It also holds the state during the BA session itself. This struct is</div><div class='ctx'>  * duplicated for each RA / TID.</div><div class='del'>-</div><div class='add'>+ *</div><div class='ctx'>  * @rate_n_flags: Rate at which Tx was attempted. Holds the data between the</div><div class='ctx'>  *	Tx response (REPLY_TX), and the block ack notification</div><div class='ctx'>  *	(REPLY_COMPRESSED_BA).</div><div class='hunk'>@@ -157,9 +153,9 @@ struct iwl_ht_agg {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_tid_data - one for each RA / TID</div><div class='del'>-</div><div class='add'>+ *</div><div class='ctx'>  * This structs holds the states for each RA / TID.</div><div class='del'>-</div><div class='add'>+ *</div><div class='ctx'>  * @seq_number: the next WiFi sequence number to use</div><div class='ctx'>  * @next_reclaimed: the WiFi sequence number of the next packet to be acked.</div><div class='ctx'>  *	This is basically (last acked packet++).</div><div class='hunk'>@@ -200,7 +196,7 @@ struct iwl_station_priv {</div><div class='ctx'> 	u8 sta_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * struct iwl_vif_priv - driver's private per-interface information</div><div class='ctx'>  *</div><div class='ctx'>  * When mac80211 allocates a virtual interface, it can allocate</div><div class='hunk'>@@ -523,7 +519,7 @@ enum iwl_scan_type {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_hw_params</div><div class='add'>+ * struct iwl_hw_params - HW parameters</div><div class='ctx'>  *</div><div class='ctx'>  * Holds the module parameters</div><div class='ctx'>  *</div><div class='hunk'>@@ -534,6 +530,7 @@ enum iwl_scan_type {</div><div class='ctx'>  *	relevant for 1000, 6000 and up</div><div class='ctx'>  * @struct iwl_sensitivity_ranges: range of sensitivity values</div><div class='ctx'>  * @use_rts_for_aggregation: use rts/cts protection for HT traffic</div><div class='add'>+ * @sens: sensitivity ranges pointer</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_hw_params {</div><div class='ctx'> 	u8  tx_chains_num;</div><div class='hunk'>@@ -552,6 +549,7 @@ struct iwl_hw_params {</div><div class='ctx'>  * @bt_prio_boost: default bt priority boost value</div><div class='ctx'>  * @agg_time_limit: maximum number of uSec in aggregation</div><div class='ctx'>  * @bt_sco_disable: uCode should not response to BT in SCO/ESCO mode</div><div class='add'>+ * @bt_session_2: indicates version 2 of the BT command is used</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_dvm_bt_params {</div><div class='ctx'> 	bool advanced_bt_coexist;</div><div class='hunk'>@@ -630,7 +628,7 @@ struct iwl_priv {</div><div class='ctx'> </div><div class='ctx'> 	struct iwl_trans *trans;</div><div class='ctx'> 	struct device *dev;		/* for debug prints only */</div><div class='del'>-	const struct iwl_cfg *cfg;</div><div class='add'>+	const struct iwl_rf_cfg *cfg;</div><div class='ctx'> 	const struct iwl_fw *fw;</div><div class='ctx'> 	const struct iwl_dvm_cfg *lib;</div><div class='ctx'> 	unsigned long status;</div><div class='hunk'>@@ -701,6 +699,7 @@ struct iwl_priv {</div><div class='ctx'> 	/* Scan related variables */</div><div class='ctx'> 	unsigned long scan_start;</div><div class='ctx'> 	unsigned long scan_start_tsf;</div><div class='add'>+	size_t scan_cmd_size;</div><div class='ctx'> 	void *scan_cmd;</div><div class='ctx'> 	enum nl80211_band scan_band;</div><div class='ctx'> 	struct cfg80211_scan_request *scan_request;</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/devices.c b/drivers/net/wireless/intel/iwlwifi/dvm/devices.c<br/>index c3e25885d194..be7e61e2b291 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/devices.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/devices.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/devices.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/devices.c</a></div><div class='hunk'>@@ -2,12 +2,7 @@</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.</div><div class='del'>- * Copyright (C) 2019 Intel Corporation</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='add'>+ * Copyright (C) 2019, 2025 Intel Corporation</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/units.h&gt;</div><div class='hunk'>@@ -17,7 +12,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include "iwl-io.h"</div><div class='ctx'> #include "iwl-prph.h"</div><div class='del'>-#include "iwl-eeprom-parse.h"</div><div class='add'>+#include "iwl-nvm-utils.h"</div><div class='ctx'> </div><div class='ctx'> #include "agn.h"</div><div class='ctx'> #include "dev.h"</div><div class='hunk'>@@ -60,6 +55,7 @@ static void iwl1000_nic_config(struct iwl_priv *priv)</div><div class='ctx'>  * iwl_beacon_time_mask_low - mask of lower 32 bit of beacon time</div><div class='ctx'>  * @priv: pointer to iwl_priv data structure</div><div class='ctx'>  * @tsf_bits: number of bits need to shift for masking)</div><div class='add'>+ * Return: low 32 bits of beacon time mask</div><div class='ctx'>  */</div><div class='ctx'> static inline u32 iwl_beacon_time_mask_low(struct iwl_priv *priv,</div><div class='ctx'> 					   u16 tsf_bits)</div><div class='hunk'>@@ -71,6 +67,7 @@ static inline u32 iwl_beacon_time_mask_low(struct iwl_priv *priv,</div><div class='ctx'>  * iwl_beacon_time_mask_high - mask of higher 32 bit of beacon time</div><div class='ctx'>  * @priv: pointer to iwl_priv data structure</div><div class='ctx'>  * @tsf_bits: number of bits need to shift for masking)</div><div class='add'>+ * Return: high 32 bits of beacon time mask</div><div class='ctx'>  */</div><div class='ctx'> static inline u32 iwl_beacon_time_mask_high(struct iwl_priv *priv,</div><div class='ctx'> 					    u16 tsf_bits)</div><div class='hunk'>@@ -486,7 +483,7 @@ static void iwl6000_set_ct_threshold(struct iwl_priv *priv)</div><div class='ctx'> /* NIC configuration for 6000 series */</div><div class='ctx'> static void iwl6000_nic_config(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	switch (priv-&gt;trans-&gt;trans_cfg-&gt;device_family) {</div><div class='add'>+	switch (priv-&gt;trans-&gt;mac_cfg-&gt;device_family) {</div><div class='ctx'> 	case IWL_DEVICE_FAMILY_6005:</div><div class='ctx'> 	case IWL_DEVICE_FAMILY_6030:</div><div class='ctx'> 	case IWL_DEVICE_FAMILY_6000:</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c b/drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c<br/>index f12b86563728..d337ab543eb0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c</a></div><div class='hunk'>@@ -1,14 +1,17 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2014, 2018-2020 Intel Corporation</div><div class='del'>- * Copyright (C) 2015 Intel Mobile Communications GmbH</div><div class='add'>+ * Copyright (C) 2005-2014, 2018-2019, 2021, 2024-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "iwl-drv.h"</div><div class='del'>-#include "iwl-modparams.h"</div><div class='del'>-#include "iwl-eeprom-parse.h"</div><div class='add'>+#include "iwl-debug.h"</div><div class='add'>+#include "iwl-io.h"</div><div class='add'>+#include "iwl-prph.h"</div><div class='add'>+#include "iwl-csr.h"</div><div class='add'>+#include "agn.h"</div><div class='ctx'> </div><div class='ctx'> /* EEPROM offset definitions */</div><div class='ctx'> </div><div class='hunk'>@@ -78,7 +81,6 @@ enum eeprom_sku_bits {</div><div class='ctx'> #define EEPROM_RF_CFG_TX_ANT_MSK(x) ((x &gt;&gt; 8)  &amp; 0xF) /* bits 8-11  */</div><div class='ctx'> #define EEPROM_RF_CFG_RX_ANT_MSK(x) ((x &gt;&gt; 12) &amp; 0xF) /* bits 12-15 */</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * EEPROM bands</div><div class='ctx'>  * These are the channel numbers from each band in the order</div><div class='hunk'>@@ -149,7 +151,7 @@ static u16 iwl_eeprom_query16(const u8 *eeprom, size_t eeprom_size, int offset)</div><div class='ctx'> {</div><div class='ctx'> 	if (WARN_ON(offset + sizeof(u16) &gt; eeprom_size))</div><div class='ctx'> 		return 0;</div><div class='del'>-	return le16_to_cpup((__le16 *)(eeprom + offset));</div><div class='add'>+	return le16_to_cpup((const __le16 *)(eeprom + offset));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 eeprom_indirect_address(const u8 *eeprom, size_t eeprom_size,</div><div class='hunk'>@@ -202,8 +204,8 @@ static u32 eeprom_indirect_address(const u8 *eeprom, size_t eeprom_size,</div><div class='ctx'> 	return (address &amp; ADDRESS_MSK) + (offset &lt;&lt; 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const u8 *iwl_eeprom_query_addr(const u8 *eeprom, size_t eeprom_size,</div><div class='del'>-				       u32 offset)</div><div class='add'>+static const void *iwl_eeprom_query_addr(const u8 *eeprom, size_t eeprom_size,</div><div class='add'>+					 u32 offset)</div><div class='ctx'> {</div><div class='ctx'> 	u32 address = eeprom_indirect_address(eeprom, eeprom_size, offset);</div><div class='ctx'> </div><div class='hunk'>@@ -216,10 +218,9 @@ static const u8 *iwl_eeprom_query_addr(const u8 *eeprom, size_t eeprom_size,</div><div class='ctx'> static int iwl_eeprom_read_calib(const u8 *eeprom, size_t eeprom_size,</div><div class='ctx'> 				 struct iwl_nvm_data *data)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_eeprom_calib_hdr *hdr;</div><div class='add'>+	const struct iwl_eeprom_calib_hdr *hdr;</div><div class='ctx'> </div><div class='del'>-	hdr = (void *)iwl_eeprom_query_addr(eeprom, eeprom_size,</div><div class='del'>-					    EEPROM_CALIB_ALL);</div><div class='add'>+	hdr = iwl_eeprom_query_addr(eeprom, eeprom_size, EEPROM_CALIB_ALL);</div><div class='ctx'> 	if (!hdr)</div><div class='ctx'> 		return -ENODATA;</div><div class='ctx'> 	data-&gt;calib_version = hdr-&gt;version;</div><div class='hunk'>@@ -256,7 +257,6 @@ struct iwl_eeprom_channel {</div><div class='ctx'> 	s8 max_power_avg;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> enum iwl_eeprom_enhanced_txpwr_flags {</div><div class='ctx'> 	IWL_EEPROM_ENH_TXP_FL_VALID = BIT(0),</div><div class='ctx'> 	IWL_EEPROM_ENH_TXP_FL_BAND_52G = BIT(1),</div><div class='hunk'>@@ -269,7 +269,7 @@ enum iwl_eeprom_enhanced_txpwr_flags {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_eeprom_enhanced_txpwr</div><div class='add'>+ * struct iwl_eeprom_enhanced_txpwr - enhanced regulatory TX power limits</div><div class='ctx'>  * @flags: entry flags</div><div class='ctx'>  * @channel: channel number</div><div class='ctx'>  * @chain_a_max: chain a max power in 1/2 dBm</div><div class='hunk'>@@ -294,7 +294,7 @@ struct iwl_eeprom_enhanced_txpwr {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> static s8 iwl_get_max_txpwr_half_dbm(const struct iwl_nvm_data *data,</div><div class='del'>-				     struct iwl_eeprom_enhanced_txpwr *txp)</div><div class='add'>+				     const struct iwl_eeprom_enhanced_txpwr *txp)</div><div class='ctx'> {</div><div class='ctx'> 	s8 result = 0; /* (.5 dBm) */</div><div class='ctx'> </div><div class='hunk'>@@ -328,7 +328,7 @@ static s8 iwl_get_max_txpwr_half_dbm(const struct iwl_nvm_data *data,</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> iwl_eeprom_enh_txp_read_element(struct iwl_nvm_data *data,</div><div class='del'>-				struct iwl_eeprom_enhanced_txpwr *txp,</div><div class='add'>+				const struct iwl_eeprom_enhanced_txpwr *txp,</div><div class='ctx'> 				int n_channels, s8 max_txpower_avg)</div><div class='ctx'> {</div><div class='ctx'> 	int ch_idx;</div><div class='hunk'>@@ -359,20 +359,18 @@ static void iwl_eeprom_enhanced_txpower(struct device *dev,</div><div class='ctx'> 					const u8 *eeprom, size_t eeprom_size,</div><div class='ctx'> 					int n_channels)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_eeprom_enhanced_txpwr *txp_array, *txp;</div><div class='add'>+	const struct iwl_eeprom_enhanced_txpwr *txp_array, *txp;</div><div class='ctx'> 	int idx, entries;</div><div class='del'>-	__le16 *txp_len;</div><div class='add'>+	const __le16 *txp_len;</div><div class='ctx'> 	s8 max_txp_avg_halfdbm;</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct iwl_eeprom_enhanced_txpwr) != 8);</div><div class='ctx'> </div><div class='ctx'> 	/* the length is in 16-bit words, but we want entries */</div><div class='del'>-	txp_len = (__le16 *)iwl_eeprom_query_addr(eeprom, eeprom_size,</div><div class='del'>-						  EEPROM_TXP_SZ_OFFS);</div><div class='add'>+	txp_len = iwl_eeprom_query_addr(eeprom, eeprom_size, EEPROM_TXP_SZ_OFFS);</div><div class='ctx'> 	entries = le16_to_cpup(txp_len) * 2 / EEPROM_TXP_ENTRY_LEN;</div><div class='ctx'> </div><div class='del'>-	txp_array = (void *)iwl_eeprom_query_addr(eeprom, eeprom_size,</div><div class='del'>-						  EEPROM_TXP_OFFS);</div><div class='add'>+	txp_array = iwl_eeprom_query_addr(eeprom, eeprom_size, EEPROM_TXP_OFFS);</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; entries; idx++) {</div><div class='ctx'> 		txp = &amp;txp_array[idx];</div><div class='hunk'>@@ -415,7 +413,7 @@ static void iwl_eeprom_enhanced_txpower(struct device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_init_band_reference(const struct iwl_cfg *cfg,</div><div class='add'>+static void iwl_init_band_reference(const struct iwl_rf_cfg *cfg,</div><div class='ctx'> 				    const u8 *eeprom, size_t eeprom_size,</div><div class='ctx'> 				    int eeprom_band, int *eeprom_ch_count,</div><div class='ctx'> 				    const struct iwl_eeprom_channel **ch_info,</div><div class='hunk'>@@ -425,7 +423,7 @@ static void iwl_init_band_reference(const struct iwl_cfg *cfg,</div><div class='ctx'> </div><div class='ctx'> 	offset |= INDIRECT_ADDRESS | INDIRECT_REGULATORY;</div><div class='ctx'> </div><div class='del'>-	*ch_info = (void *)iwl_eeprom_query_addr(eeprom, eeprom_size, offset);</div><div class='add'>+	*ch_info = iwl_eeprom_query_addr(eeprom, eeprom_size, offset);</div><div class='ctx'> </div><div class='ctx'> 	switch (eeprom_band) {</div><div class='ctx'> 	case 1:		/* 2.4GHz band */</div><div class='hunk'>@@ -509,7 +507,7 @@ static void iwl_mod_ht40_chan_info(struct device *dev,</div><div class='ctx'> #define CHECK_AND_PRINT_I(x)	\</div><div class='ctx'> 	((eeprom_ch_info[ch_idx].flags &amp; EEPROM_CHANNEL_##x) ? # x " " : "")</div><div class='ctx'> </div><div class='del'>-static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,</div><div class='add'>+static int iwl_init_channel_map(struct device *dev, const struct iwl_rf_cfg *cfg,</div><div class='ctx'> 				struct iwl_nvm_data *data,</div><div class='ctx'> 				const u8 *eeprom, size_t eeprom_size)</div><div class='ctx'> {</div><div class='hunk'>@@ -647,110 +645,383 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,</div><div class='ctx'> </div><div class='ctx'> 	return n_channels;</div><div class='ctx'> }</div><div class='add'>+/*</div><div class='add'>+ * EEPROM access time values:</div><div class='add'>+ *</div><div class='add'>+ * Driver initiates EEPROM read by writing byte address &lt;&lt; 1 to CSR_EEPROM_REG.</div><div class='add'>+ * Driver then polls CSR_EEPROM_REG for CSR_EEPROM_REG_READ_VALID_MSK (0x1).</div><div class='add'>+ * When polling, wait 10 uSec between polling loops, up to a maximum 5000 uSec.</div><div class='add'>+ * Driver reads 16-bit value from bits 31-16 of CSR_EEPROM_REG.</div><div class='add'>+ */</div><div class='add'>+#define IWL_EEPROM_ACCESS_TIMEOUT	5000 /* uSec */</div><div class='ctx'> </div><div class='del'>-int iwl_init_sband_channels(struct iwl_nvm_data *data,</div><div class='del'>-			    struct ieee80211_supported_band *sband,</div><div class='del'>-			    int n_channels, enum nl80211_band band)</div><div class='add'>+/*</div><div class='add'>+ * The device's EEPROM semaphore prevents conflicts between driver and uCode</div><div class='add'>+ * when accessing the EEPROM; each access is a series of pulses to/from the</div><div class='add'>+ * EEPROM chip, not a single event, so even reads could conflict if they</div><div class='add'>+ * weren't arbitrated by the semaphore.</div><div class='add'>+ */</div><div class='add'>+#define IWL_EEPROM_SEM_TIMEOUT		10   /* microseconds */</div><div class='add'>+#define IWL_EEPROM_SEM_RETRY_LIMIT	1000 /* number of attempts (not time) */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int iwl_eeprom_acquire_semaphore(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_channel *chan = &amp;data-&gt;channels[0];</div><div class='del'>-	int n = 0, idx = 0;</div><div class='add'>+	u16 count;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	for (count = 0; count &lt; IWL_EEPROM_SEM_RETRY_LIMIT; count++) {</div><div class='add'>+		/* Request semaphore */</div><div class='add'>+		iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+			    CSR_HW_IF_CONFIG_REG_EEPROM_OWN_SEM);</div><div class='add'>+</div><div class='add'>+		/* See if we got it */</div><div class='add'>+		ret = iwl_poll_bits(trans, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+				    CSR_HW_IF_CONFIG_REG_EEPROM_OWN_SEM,</div><div class='add'>+				    IWL_EEPROM_SEM_TIMEOUT);</div><div class='add'>+		if (!ret) {</div><div class='add'>+			IWL_DEBUG_EEPROM(trans-&gt;dev,</div><div class='add'>+					 "Acquired semaphore after %d tries.\n",</div><div class='add'>+					 count+1);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	while (idx &lt; n_channels &amp;&amp; chan-&gt;band != band)</div><div class='del'>-		chan = &amp;data-&gt;channels[++idx];</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	sband-&gt;channels = &amp;data-&gt;channels[idx];</div><div class='add'>+static void iwl_eeprom_release_semaphore(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	iwl_clear_bit(trans, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+		      CSR_HW_IF_CONFIG_REG_EEPROM_OWN_SEM);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	while (idx &lt; n_channels &amp;&amp; chan-&gt;band == band) {</div><div class='del'>-		chan = &amp;data-&gt;channels[++idx];</div><div class='del'>-		n++;</div><div class='del'>-	}</div><div class='add'>+static int iwl_eeprom_verify_signature(struct iwl_trans *trans, bool nvm_is_otp)</div><div class='add'>+{</div><div class='add'>+	u32 gp = iwl_read32(trans, CSR_EEPROM_GP) &amp; CSR_EEPROM_GP_VALID_MSK;</div><div class='ctx'> </div><div class='del'>-	sband-&gt;n_channels = n;</div><div class='add'>+	IWL_DEBUG_EEPROM(trans-&gt;dev, "EEPROM signature=0x%08x\n", gp);</div><div class='ctx'> </div><div class='del'>-	return n;</div><div class='add'>+	switch (gp) {</div><div class='add'>+	case CSR_EEPROM_GP_BAD_SIG_EEP_GOOD_SIG_OTP:</div><div class='add'>+		if (!nvm_is_otp) {</div><div class='add'>+			IWL_ERR(trans, "EEPROM with bad signature: 0x%08x\n",</div><div class='add'>+				gp);</div><div class='add'>+			return -ENOENT;</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	case CSR_EEPROM_GP_GOOD_SIG_EEP_LESS_THAN_4K:</div><div class='add'>+	case CSR_EEPROM_GP_GOOD_SIG_EEP_MORE_THAN_4K:</div><div class='add'>+		if (nvm_is_otp) {</div><div class='add'>+			IWL_ERR(trans, "OTP with bad signature: 0x%08x\n", gp);</div><div class='add'>+			return -ENOENT;</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	case CSR_EEPROM_GP_BAD_SIGNATURE_BOTH_EEP_AND_OTP:</div><div class='add'>+	default:</div><div class='add'>+		IWL_ERR(trans,</div><div class='add'>+			"bad EEPROM/OTP signature, type=%s, EEPROM_GP=0x%08x\n",</div><div class='add'>+			nvm_is_otp ? "OTP" : "EEPROM", gp);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define MAX_BIT_RATE_40_MHZ	150 /* Mbps */</div><div class='del'>-#define MAX_BIT_RATE_20_MHZ	72 /* Mbps */</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * OTP related functions</div><div class='add'>+ *</div><div class='add'>+******************************************************************************/</div><div class='ctx'> </div><div class='del'>-void iwl_init_ht_hw_capab(struct iwl_trans *trans,</div><div class='del'>-			  struct iwl_nvm_data *data,</div><div class='del'>-			  struct ieee80211_sta_ht_cap *ht_info,</div><div class='del'>-			  enum nl80211_band band,</div><div class='del'>-			  u8 tx_chains, u8 rx_chains)</div><div class='add'>+static void iwl_set_otp_access_absolute(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='del'>-	const struct iwl_cfg *cfg = trans-&gt;cfg;</div><div class='del'>-	int max_bit_rate = 0;</div><div class='del'>-</div><div class='del'>-	tx_chains = hweight8(tx_chains);</div><div class='del'>-	if (cfg-&gt;rx_with_siso_diversity)</div><div class='del'>-		rx_chains = 1;</div><div class='del'>-	else</div><div class='del'>-		rx_chains = hweight8(rx_chains);</div><div class='del'>-</div><div class='del'>-	if (!(data-&gt;sku_cap_11n_enable) ||</div><div class='del'>-	    (iwlwifi_mod_params.disable_11n &amp; IWL_DISABLE_HT_ALL) ||</div><div class='del'>-	    !cfg-&gt;ht_params) {</div><div class='del'>-		ht_info-&gt;ht_supported = false;</div><div class='del'>-		return;</div><div class='add'>+	iwl_read32(trans, CSR_OTP_GP_REG);</div><div class='add'>+</div><div class='add'>+	iwl_clear_bit(trans, CSR_OTP_GP_REG,</div><div class='add'>+		      CSR_OTP_GP_REG_OTP_ACCESS_MODE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_nvm_is_otp(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	u32 otpgp;</div><div class='add'>+</div><div class='add'>+	/* OTP only valid for CP/PP and after */</div><div class='add'>+	switch (trans-&gt;info.hw_rev &amp; CSR_HW_REV_TYPE_MSK) {</div><div class='add'>+	case CSR_HW_REV_TYPE_NONE:</div><div class='add'>+		IWL_ERR(trans, "Unknown hardware type\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	case CSR_HW_REV_TYPE_5300:</div><div class='add'>+	case CSR_HW_REV_TYPE_5350:</div><div class='add'>+	case CSR_HW_REV_TYPE_5100:</div><div class='add'>+	case CSR_HW_REV_TYPE_5150:</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		otpgp = iwl_read32(trans, CSR_OTP_GP_REG);</div><div class='add'>+		if (otpgp &amp; CSR_OTP_GP_REG_DEVICE_SELECT)</div><div class='add'>+			return 1;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_init_otp_access(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;sku_cap_mimo_disabled)</div><div class='del'>-		rx_chains = 1;</div><div class='add'>+	ret = iwl_trans_activate_nic(trans);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	ht_info-&gt;ht_supported = true;</div><div class='del'>-	ht_info-&gt;cap = IEEE80211_HT_CAP_DSSSCCK40;</div><div class='add'>+	iwl_set_bits_prph(trans, APMG_PS_CTRL_REG,</div><div class='add'>+			  APMG_PS_CTRL_VAL_RESET_REQ);</div><div class='add'>+	udelay(5);</div><div class='add'>+	iwl_clear_bits_prph(trans, APMG_PS_CTRL_REG,</div><div class='add'>+			    APMG_PS_CTRL_VAL_RESET_REQ);</div><div class='ctx'> </div><div class='del'>-	if (cfg-&gt;ht_params-&gt;stbc) {</div><div class='del'>-		ht_info-&gt;cap |= (1 &lt;&lt; IEEE80211_HT_CAP_RX_STBC_SHIFT);</div><div class='add'>+	/*</div><div class='add'>+	 * CSR auto clock gate disable bit -</div><div class='add'>+	 * this is only applicable for HW with OTP shadow RAM</div><div class='add'>+	 */</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;base-&gt;shadow_ram_support)</div><div class='add'>+		iwl_set_bit(trans, CSR_DBG_LINK_PWR_MGMT_REG,</div><div class='add'>+			    CSR_RESET_LINK_PWR_MGMT_DISABLED);</div><div class='ctx'> </div><div class='del'>-		if (tx_chains &gt; 1)</div><div class='del'>-			ht_info-&gt;cap |= IEEE80211_HT_CAP_TX_STBC;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_read_otp_word(struct iwl_trans *trans, u16 addr,</div><div class='add'>+			     __le16 *eeprom_data)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u32 r;</div><div class='add'>+	u32 otpgp;</div><div class='add'>+</div><div class='add'>+	iwl_write32(trans, CSR_EEPROM_REG,</div><div class='add'>+		    CSR_EEPROM_REG_MSK_ADDR &amp; (addr &lt;&lt; 1));</div><div class='add'>+	ret = iwl_poll_bits(trans, CSR_EEPROM_REG,</div><div class='add'>+			    CSR_EEPROM_REG_READ_VALID_MSK,</div><div class='add'>+			    IWL_EEPROM_ACCESS_TIMEOUT);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(trans, "Time out reading OTP[%d]\n", addr);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	r = iwl_read32(trans, CSR_EEPROM_REG);</div><div class='add'>+	/* check for ECC errors: */</div><div class='add'>+	otpgp = iwl_read32(trans, CSR_OTP_GP_REG);</div><div class='add'>+	if (otpgp &amp; CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK) {</div><div class='add'>+		/* stop in this case */</div><div class='add'>+		/* set the uncorrectable OTP ECC bit for acknowledgment */</div><div class='add'>+		iwl_set_bit(trans, CSR_OTP_GP_REG,</div><div class='add'>+			    CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK);</div><div class='add'>+		IWL_ERR(trans, "Uncorrectable OTP ECC error, abort OTP read\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (otpgp &amp; CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK) {</div><div class='add'>+		/* continue in this case */</div><div class='add'>+		/* set the correctable OTP ECC bit for acknowledgment */</div><div class='add'>+		iwl_set_bit(trans, CSR_OTP_GP_REG,</div><div class='add'>+			    CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK);</div><div class='add'>+		IWL_ERR(trans, "Correctable OTP ECC error, continue read\n");</div><div class='ctx'> 	}</div><div class='add'>+	*eeprom_data = cpu_to_le16(r &gt;&gt; 16);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * iwl_is_otp_empty: check for empty OTP</div><div class='add'>+ */</div><div class='add'>+static bool iwl_is_otp_empty(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	u16 next_link_addr = 0;</div><div class='add'>+	__le16 link_value;</div><div class='add'>+	bool is_empty = false;</div><div class='add'>+</div><div class='add'>+	/* locate the beginning of OTP link list */</div><div class='add'>+	if (!iwl_read_otp_word(trans, next_link_addr, &amp;link_value)) {</div><div class='add'>+		if (!link_value) {</div><div class='add'>+			IWL_ERR(trans, "OTP is empty\n");</div><div class='add'>+			is_empty = true;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		IWL_ERR(trans, "Unable to read first block of OTP list.\n");</div><div class='add'>+		is_empty = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return is_empty;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (cfg-&gt;ht_params-&gt;ldpc)</div><div class='del'>-		ht_info-&gt;cap |= IEEE80211_HT_CAP_LDPC_CODING;</div><div class='ctx'> </div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;mq_rx_supported ||</div><div class='del'>-	    iwlwifi_mod_params.amsdu_size &gt;= IWL_AMSDU_8K)</div><div class='del'>-		ht_info-&gt;cap |= IEEE80211_HT_CAP_MAX_AMSDU;</div><div class='add'>+/*</div><div class='add'>+ * iwl_find_otp_image: find EEPROM image in OTP</div><div class='add'>+ *   finding the OTP block that contains the EEPROM image.</div><div class='add'>+ *   the last valid block on the link list (the block _before_ the last block)</div><div class='add'>+ *   is the block we should read and used to configure the device.</div><div class='add'>+ *   If all the available OTP blocks are full, the last block will be the block</div><div class='add'>+ *   we should read and used to configure the device.</div><div class='add'>+ *   only perform this operation if shadow RAM is disabled</div><div class='add'>+ */</div><div class='add'>+static int iwl_find_otp_image(struct iwl_trans *trans,</div><div class='add'>+					u16 *validblockaddr)</div><div class='add'>+{</div><div class='add'>+	u16 next_link_addr = 0, valid_addr;</div><div class='add'>+	__le16 link_value = 0;</div><div class='add'>+	int usedblocks = 0;</div><div class='ctx'> </div><div class='del'>-	ht_info-&gt;ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;</div><div class='del'>-	ht_info-&gt;ampdu_density = IEEE80211_HT_MPDU_DENSITY_4;</div><div class='add'>+	/* set addressing mode to absolute to traverse the link list */</div><div class='add'>+	iwl_set_otp_access_absolute(trans);</div><div class='ctx'> </div><div class='del'>-	ht_info-&gt;mcs.rx_mask[0] = 0xFF;</div><div class='del'>-	if (rx_chains &gt;= 2)</div><div class='del'>-		ht_info-&gt;mcs.rx_mask[1] = 0xFF;</div><div class='del'>-	if (rx_chains &gt;= 3)</div><div class='del'>-		ht_info-&gt;mcs.rx_mask[2] = 0xFF;</div><div class='add'>+	/* checking for empty OTP or error */</div><div class='add'>+	if (iwl_is_otp_empty(trans))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (cfg-&gt;ht_params-&gt;ht_greenfield_support)</div><div class='del'>-		ht_info-&gt;cap |= IEEE80211_HT_CAP_GRN_FLD;</div><div class='del'>-	ht_info-&gt;cap |= IEEE80211_HT_CAP_SGI_20;</div><div class='add'>+	/*</div><div class='add'>+	 * start traverse link list</div><div class='add'>+	 * until reach the max number of OTP blocks</div><div class='add'>+	 * different devices have different number of OTP blocks</div><div class='add'>+	 */</div><div class='add'>+	do {</div><div class='add'>+		/* save current valid block address</div><div class='add'>+		 * check for more block on the link list</div><div class='add'>+		 */</div><div class='add'>+		valid_addr = next_link_addr;</div><div class='add'>+		next_link_addr = le16_to_cpu(link_value) * sizeof(u16);</div><div class='add'>+		IWL_DEBUG_EEPROM(trans-&gt;dev, "OTP blocks %d addr 0x%x\n",</div><div class='add'>+				 usedblocks, next_link_addr);</div><div class='add'>+		if (iwl_read_otp_word(trans, next_link_addr, &amp;link_value))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (!link_value) {</div><div class='add'>+			/*</div><div class='add'>+			 * reach the end of link list, return success and</div><div class='add'>+			 * set address point to the starting address</div><div class='add'>+			 * of the image</div><div class='add'>+			 */</div><div class='add'>+			*validblockaddr = valid_addr;</div><div class='add'>+			/* skip first 2 bytes (link list pointer) */</div><div class='add'>+			*validblockaddr += 2;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		/* more in the link list, continue */</div><div class='add'>+		usedblocks++;</div><div class='add'>+	} while (usedblocks &lt;= trans-&gt;mac_cfg-&gt;base-&gt;max_ll_items);</div><div class='ctx'> </div><div class='del'>-	max_bit_rate = MAX_BIT_RATE_20_MHZ;</div><div class='add'>+	/* OTP has no valid blocks */</div><div class='add'>+	IWL_DEBUG_EEPROM(trans-&gt;dev, "OTP has no valid blocks\n");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (cfg-&gt;ht_params-&gt;ht40_bands &amp; BIT(band)) {</div><div class='del'>-		ht_info-&gt;cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;</div><div class='del'>-		ht_info-&gt;cap |= IEEE80211_HT_CAP_SGI_40;</div><div class='del'>-		max_bit_rate = MAX_BIT_RATE_40_MHZ;</div><div class='add'>+/*</div><div class='add'>+ * iwl_read_eeprom - read EEPROM contents</div><div class='add'>+ *</div><div class='add'>+ * Load the EEPROM contents from adapter and return it</div><div class='add'>+ * and its size.</div><div class='add'>+ *</div><div class='add'>+ * NOTE:  This routine uses the non-debug IO access functions.</div><div class='add'>+ */</div><div class='add'>+int iwl_read_eeprom(struct iwl_trans *trans, u8 **eeprom, size_t *eeprom_size)</div><div class='add'>+{</div><div class='add'>+	__le16 *e;</div><div class='add'>+	u32 gp = iwl_read32(trans, CSR_EEPROM_GP);</div><div class='add'>+	int sz;</div><div class='add'>+	int ret;</div><div class='add'>+	u16 addr;</div><div class='add'>+	u16 validblockaddr = 0;</div><div class='add'>+	u16 cache_addr = 0;</div><div class='add'>+	int nvm_is_otp;</div><div class='add'>+</div><div class='add'>+	if (!eeprom || !eeprom_size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	nvm_is_otp = iwl_nvm_is_otp(trans);</div><div class='add'>+	if (nvm_is_otp &lt; 0)</div><div class='add'>+		return nvm_is_otp;</div><div class='add'>+</div><div class='add'>+	sz = trans-&gt;mac_cfg-&gt;base-&gt;eeprom_size;</div><div class='add'>+	IWL_DEBUG_EEPROM(trans-&gt;dev, "NVM size = %d\n", sz);</div><div class='add'>+</div><div class='add'>+	e = kmalloc(sz, GFP_KERNEL);</div><div class='add'>+	if (!e)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = iwl_eeprom_verify_signature(trans, nvm_is_otp);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(trans, "EEPROM not found, EEPROM_GP=0x%08x\n", gp);</div><div class='add'>+		goto err_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Highest supported Rx data rate */</div><div class='del'>-	max_bit_rate *= rx_chains;</div><div class='del'>-	WARN_ON(max_bit_rate &amp; ~IEEE80211_HT_MCS_RX_HIGHEST_MASK);</div><div class='del'>-	ht_info-&gt;mcs.rx_highest = cpu_to_le16(max_bit_rate);</div><div class='del'>-</div><div class='del'>-	/* Tx MCS capabilities */</div><div class='del'>-	ht_info-&gt;mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;</div><div class='del'>-	if (tx_chains != rx_chains) {</div><div class='del'>-		ht_info-&gt;mcs.tx_params |= IEEE80211_HT_MCS_TX_RX_DIFF;</div><div class='del'>-		ht_info-&gt;mcs.tx_params |= ((tx_chains - 1) &lt;&lt;</div><div class='del'>-				IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT);</div><div class='add'>+	/* Make sure driver (instead of uCode) is allowed to read EEPROM */</div><div class='add'>+	ret = iwl_eeprom_acquire_semaphore(trans);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(trans, "Failed to acquire EEPROM semaphore.\n");</div><div class='add'>+		goto err_free;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (nvm_is_otp) {</div><div class='add'>+		ret = iwl_init_otp_access(trans);</div><div class='add'>+		if (ret) {</div><div class='add'>+			IWL_ERR(trans, "Failed to initialize OTP access.\n");</div><div class='add'>+			goto err_unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		iwl_write32(trans, CSR_EEPROM_GP,</div><div class='add'>+			    iwl_read32(trans, CSR_EEPROM_GP) &amp;</div><div class='add'>+			    ~CSR_EEPROM_GP_IF_OWNER_MSK);</div><div class='add'>+</div><div class='add'>+		iwl_set_bit(trans, CSR_OTP_GP_REG,</div><div class='add'>+			    CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK |</div><div class='add'>+			    CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK);</div><div class='add'>+		/* traversing the linked list if no shadow ram supported */</div><div class='add'>+		if (!trans-&gt;mac_cfg-&gt;base-&gt;shadow_ram_support) {</div><div class='add'>+			ret = iwl_find_otp_image(trans, &amp;validblockaddr);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto err_unlock;</div><div class='add'>+		}</div><div class='add'>+		for (addr = validblockaddr; addr &lt; validblockaddr + sz;</div><div class='add'>+		     addr += sizeof(u16)) {</div><div class='add'>+			__le16 eeprom_data;</div><div class='add'>+</div><div class='add'>+			ret = iwl_read_otp_word(trans, addr, &amp;eeprom_data);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto err_unlock;</div><div class='add'>+			e[cache_addr / 2] = eeprom_data;</div><div class='add'>+			cache_addr += sizeof(u16);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* eeprom is an array of 16bit values */</div><div class='add'>+		for (addr = 0; addr &lt; sz; addr += sizeof(u16)) {</div><div class='add'>+			u32 r;</div><div class='add'>+</div><div class='add'>+			iwl_write32(trans, CSR_EEPROM_REG,</div><div class='add'>+				    CSR_EEPROM_REG_MSK_ADDR &amp; (addr &lt;&lt; 1));</div><div class='add'>+</div><div class='add'>+			ret = iwl_poll_bits(trans, CSR_EEPROM_REG,</div><div class='add'>+					    CSR_EEPROM_REG_READ_VALID_MSK,</div><div class='add'>+					    IWL_EEPROM_ACCESS_TIMEOUT);</div><div class='add'>+			if (ret) {</div><div class='add'>+				IWL_ERR(trans,</div><div class='add'>+					"Time out reading EEPROM[%d]\n", addr);</div><div class='add'>+				goto err_unlock;</div><div class='add'>+			}</div><div class='add'>+			r = iwl_read32(trans, CSR_EEPROM_REG);</div><div class='add'>+			e[addr / 2] = cpu_to_le16(r &gt;&gt; 16);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_EEPROM(trans-&gt;dev, "NVM Type: %s\n",</div><div class='add'>+			 nvm_is_otp ? "OTP" : "EEPROM");</div><div class='add'>+</div><div class='add'>+	iwl_eeprom_release_semaphore(trans);</div><div class='add'>+</div><div class='add'>+	*eeprom_size = sz;</div><div class='add'>+	*eeprom = (u8 *)e;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ err_unlock:</div><div class='add'>+	iwl_eeprom_release_semaphore(trans);</div><div class='add'>+ err_free:</div><div class='add'>+	kfree(e);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_init_sbands(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='add'>+static void iwl_init_sbands(struct iwl_trans *trans, const struct iwl_rf_cfg *cfg,</div><div class='ctx'> 			    struct iwl_nvm_data *data,</div><div class='ctx'> 			    const u8 *eeprom, size_t eeprom_size)</div><div class='ctx'> {</div><div class='hunk'>@@ -784,9 +1055,8 @@ static void iwl_init_sbands(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* EEPROM data functions */</div><div class='del'>-</div><div class='ctx'> struct iwl_nvm_data *</div><div class='del'>-iwl_parse_eeprom_data(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='add'>+iwl_parse_eeprom_data(struct iwl_trans *trans, const struct iwl_rf_cfg *cfg,</div><div class='ctx'> 		      const u8 *eeprom, size_t eeprom_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_nvm_data *data;</div><div class='hunk'>@@ -822,17 +1092,17 @@ iwl_parse_eeprom_data(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='ctx'> 				    EEPROM_RAW_TEMPERATURE);</div><div class='ctx'> 	if (!tmp)</div><div class='ctx'> 		goto err_free;</div><div class='del'>-	data-&gt;raw_temperature = *(__le16 *)tmp;</div><div class='add'>+	data-&gt;raw_temperature = *(const __le16 *)tmp;</div><div class='ctx'> </div><div class='ctx'> 	tmp = iwl_eeprom_query_addr(eeprom, eeprom_size,</div><div class='ctx'> 				    EEPROM_KELVIN_TEMPERATURE);</div><div class='ctx'> 	if (!tmp)</div><div class='ctx'> 		goto err_free;</div><div class='del'>-	data-&gt;kelvin_temperature = *(__le16 *)tmp;</div><div class='del'>-	data-&gt;kelvin_voltage = *((__le16 *)tmp + 1);</div><div class='add'>+	data-&gt;kelvin_temperature = *(const __le16 *)tmp;</div><div class='add'>+	data-&gt;kelvin_voltage = *((const __le16 *)tmp + 1);</div><div class='ctx'> </div><div class='del'>-	radio_cfg = iwl_eeprom_query16(eeprom, eeprom_size,</div><div class='del'>-					     EEPROM_RADIO_CONFIG);</div><div class='add'>+	radio_cfg =</div><div class='add'>+		iwl_eeprom_query16(eeprom, eeprom_size, EEPROM_RADIO_CONFIG);</div><div class='ctx'> 	data-&gt;radio_cfg_dash = EEPROM_RF_CFG_DASH_MSK(radio_cfg);</div><div class='ctx'> 	data-&gt;radio_cfg_pnum = EEPROM_RF_CFG_PNUM_MSK(radio_cfg);</div><div class='ctx'> 	data-&gt;radio_cfg_step = EEPROM_RF_CFG_STEP_MSK(radio_cfg);</div><div class='hunk'>@@ -872,4 +1142,3 @@ iwl_parse_eeprom_data(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_parse_eeprom_data);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/led.c b/drivers/net/wireless/intel/iwlwifi/dvm/led.c<br/>index e8a4d604b910..cec2ebdfd651 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/led.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/led.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/led.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/led.c</a></div><div class='hunk'>@@ -2,12 +2,7 @@</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.</div><div class='del'>- * Copyright (C) 2019 Intel Corporation</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='add'>+ * Copyright (C) 2019, 2025 Intel Corporation</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -18,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include "iwl-io.h"</div><div class='ctx'> #include "iwl-trans.h"</div><div class='ctx'> #include "iwl-modparams.h"</div><div class='hunk'>@@ -121,9 +116,9 @@ static int iwl_led_cmd(struct iwl_priv *priv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	led_cmd.on = iwl_blink_compensation(priv, on,</div><div class='del'>-				priv-&gt;trans-&gt;trans_cfg-&gt;base_params-&gt;led_compensation);</div><div class='add'>+				priv-&gt;trans-&gt;mac_cfg-&gt;base-&gt;led_compensation);</div><div class='ctx'> 	led_cmd.off = iwl_blink_compensation(priv, off,</div><div class='del'>-				priv-&gt;trans-&gt;trans_cfg-&gt;base_params-&gt;led_compensation);</div><div class='add'>+				priv-&gt;trans-&gt;mac_cfg-&gt;base-&gt;led_compensation);</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_send_led_cmd(priv, &amp;led_cmd);</div><div class='ctx'> 	if (!ret) {</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/led.h b/drivers/net/wireless/intel/iwlwifi/dvm/led.h<br/>index 6fe20180dc87..5038fc378a1f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/led.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/led.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/led.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/led.h</a></div><div class='hunk'>@@ -2,11 +2,6 @@</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #ifndef __iwl_leds_h__</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/lib.c b/drivers/net/wireless/intel/iwlwifi/dvm/lib.c<br/>index 3b937a7dd403..48711dbcfa5a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/lib.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/lib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/lib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/lib.c</a></div><div class='hunk'>@@ -1,12 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='add'>+ * Copyright(c) 2008 - 2014, 2022 Intel Corporation. All rights reserved.</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -446,7 +441,7 @@ static void iwlagn_bt_traffic_change_work(struct work_struct *work)</div><div class='ctx'> 		priv-&gt;current_ht_config.smps = smps_request;</div><div class='ctx'> 		for_each_context(priv, ctx) {</div><div class='ctx'> 			if (ctx-&gt;vif &amp;&amp; ctx-&gt;vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='del'>-				ieee80211_request_smps(ctx-&gt;vif, smps_request);</div><div class='add'>+				ieee80211_request_smps(ctx-&gt;vif, 0, smps_request);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -591,7 +586,7 @@ static bool iwlagn_fill_txpower_mode(struct iwl_priv *priv,</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ave_rssi = ieee80211_ave_rssi(ctx-&gt;vif);</div><div class='add'>+	ave_rssi = ieee80211_ave_rssi(ctx-&gt;vif, -1);</div><div class='ctx'> 	if (!ave_rssi) {</div><div class='ctx'> 		/* no rssi data, no changes to reduce tx power */</div><div class='ctx'> 		IWL_DEBUG_COEX(priv, "no rssi data available\n");</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c<br/>index 75e7665773c5..a0a26ef482a5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c</a></div><div class='hunk'>@@ -2,15 +2,10 @@</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.</div><div class='del'>- * Copyright (C) 2018 - 2019 Intel Corporation</div><div class='add'>+ * Copyright(C) 2018 - 2019, 2022 - 2025 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * Portions of this file are derived from the ipw3945 project, as well</div><div class='ctx'>  * as portions of the ieee80211 subsystem header files.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -101,7 +96,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,</div><div class='ctx'> 	ieee80211_hw_set(hw, SUPPORT_FAST_XMIT);</div><div class='ctx'> 	ieee80211_hw_set(hw, WANT_MONITOR_VIF);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;trans-&gt;max_skb_frags)</div><div class='add'>+	if (priv-&gt;trans-&gt;info.max_skb_frags)</div><div class='ctx'> 		hw-&gt;netdev_features = NETIF_F_HIGHDMA | NETIF_F_SG;</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;offchannel_tx_hw_queue = IWL_AUX_QUEUE;</div><div class='hunk'>@@ -150,8 +145,6 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	if (priv-&gt;fw-&gt;img[IWL_UCODE_WOWLAN].num_sec &amp;&amp;</div><div class='del'>-	    priv-&gt;trans-&gt;ops-&gt;d3_suspend &amp;&amp;</div><div class='del'>-	    priv-&gt;trans-&gt;ops-&gt;d3_resume &amp;&amp;</div><div class='ctx'> 	    device_can_wakeup(priv-&gt;trans-&gt;dev)) {</div><div class='ctx'> 		priv-&gt;wowlan_support.flags = WIPHY_WOWLAN_MAGIC_PKT |</div><div class='ctx'> 					     WIPHY_WOWLAN_DISCONNECT |</div><div class='hunk'>@@ -195,7 +188,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,</div><div class='ctx'> 		priv-&gt;hw-&gt;wiphy-&gt;bands[NL80211_BAND_5GHZ] =</div><div class='ctx'> 			&amp;priv-&gt;nvm_data-&gt;bands[NL80211_BAND_5GHZ];</div><div class='ctx'> </div><div class='del'>-	hw-&gt;wiphy-&gt;hw_version = priv-&gt;trans-&gt;hw_id;</div><div class='add'>+	hw-&gt;wiphy-&gt;hw_version = priv-&gt;trans-&gt;info.hw_id;</div><div class='ctx'> </div><div class='ctx'> 	iwl_leds_init(priv);</div><div class='ctx'> </div><div class='hunk'>@@ -304,10 +297,10 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;is_open = 1;</div><div class='ctx'> 	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwlagn_mac_stop(struct ieee80211_hw *hw)</div><div class='add'>+static void iwlagn_mac_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);</div><div class='ctx'> </div><div class='hunk'>@@ -385,7 +378,7 @@ static int iwlagn_mac_suspend(struct ieee80211_hw *hw,</div><div class='ctx'> 	iwl_write32(priv-&gt;trans, CSR_UCODE_DRV_GP1_SET,</div><div class='ctx'> 		    CSR_UCODE_DRV_GP1_BIT_D3_CFG_COMPLETE);</div><div class='ctx'> </div><div class='del'>-	iwl_trans_d3_suspend(priv-&gt;trans, false, true);</div><div class='add'>+	iwl_trans_d3_suspend(priv-&gt;trans, true);</div><div class='ctx'> </div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -429,7 +422,6 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)</div><div class='ctx'> 	struct ieee80211_vif *vif;</div><div class='ctx'> 	u32 base;</div><div class='ctx'> 	int ret;</div><div class='del'>-	enum iwl_d3_status d3_status;</div><div class='ctx'> 	struct error_table_start {</div><div class='ctx'> 		/* cf. struct iwl_error_event_table */</div><div class='ctx'> 		u32 valid;</div><div class='hunk'>@@ -458,15 +450,10 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)</div><div class='ctx'> 	/* we'll clear ctx-&gt;vif during iwlagn_prepare_restart() */</div><div class='ctx'> 	vif = ctx-&gt;vif;</div><div class='ctx'> </div><div class='del'>-	ret = iwl_trans_d3_resume(priv-&gt;trans, &amp;d3_status, false, true);</div><div class='add'>+	ret = iwl_trans_d3_resume(priv-&gt;trans, true);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	if (d3_status != IWL_D3_STATUS_ALIVE) {</div><div class='del'>-		IWL_INFO(priv, "Device was reset during suspend\n");</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* uCode is no longer operating by itself */</div><div class='ctx'> 	iwl_write32(priv-&gt;trans, CSR_UCODE_DRV_GP1_CLR,</div><div class='ctx'> 		    CSR_UCODE_DRV_GP1_BIT_D3_CFG_COMPLETE);</div><div class='hunk'>@@ -556,7 +543,7 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	iwlagn_prepare_restart(priv);</div><div class='ctx'> </div><div class='del'>-	memset((void *)&amp;ctx-&gt;active, 0, sizeof(ctx-&gt;active));</div><div class='add'>+	memset((void *)(uintptr_t)&amp;ctx-&gt;active, 0, sizeof(ctx-&gt;active));</div><div class='ctx'> 	iwl_connection_init_rx_config(priv, ctx);</div><div class='ctx'> 	iwlagn_set_rxon_chain(priv, ctx);</div><div class='ctx'> </div><div class='hunk'>@@ -735,8 +722,6 @@ static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,</div><div class='ctx'> 		ret = iwl_sta_rx_agg_stop(priv, sta, tid);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_START:</div><div class='del'>-		if (!priv-&gt;trans-&gt;ops-&gt;txq_enable)</div><div class='del'>-			break;</div><div class='ctx'> 		if (!iwl_enable_tx_ampdu())</div><div class='ctx'> 			break;</div><div class='ctx'> 		IWL_DEBUG_HT(priv, "start Tx\n");</div><div class='hunk'>@@ -1006,7 +991,7 @@ static void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (priv-&gt;lib-&gt;set_channel_switch(priv, ch_switch)) {</div><div class='ctx'> 		clear_bit(STATUS_CHANNEL_SWITCH_PENDING, &amp;priv-&gt;status);</div><div class='ctx'> 		priv-&gt;switch_channel = 0;</div><div class='del'>-		ieee80211_chswitch_done(ctx-&gt;vif, false);</div><div class='add'>+		ieee80211_chswitch_done(ctx-&gt;vif, false, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -1029,7 +1014,7 @@ void iwl_chswitch_done(struct iwl_priv *priv, bool is_success)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;vif)</div><div class='del'>-		ieee80211_chswitch_done(ctx-&gt;vif, is_success);</div><div class='add'>+		ieee80211_chswitch_done(ctx-&gt;vif, is_success, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwlagn_configure_filter(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -1100,7 +1085,7 @@ static void iwlagn_mac_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	scd_queues = BIT(priv-&gt;trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues) - 1;</div><div class='add'>+	scd_queues = BIT(priv-&gt;trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues) - 1;</div><div class='ctx'> 	scd_queues &amp;= ~(BIT(IWL_IPAN_CMD_QUEUE_NUM) |</div><div class='ctx'> 			BIT(IWL_DEFAULT_CMD_QUEUE_NUM));</div><div class='ctx'> </div><div class='hunk'>@@ -1158,7 +1143,8 @@ static int iwlagn_mac_set_tim(struct ieee80211_hw *hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwlagn_mac_conf_tx(struct ieee80211_hw *hw,</div><div class='del'>-			      struct ieee80211_vif *vif, u16 queue,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      unsigned int link_id, u16 queue,</div><div class='ctx'> 			      const struct ieee80211_tx_queue_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);</div><div class='hunk'>@@ -1573,8 +1559,23 @@ static void iwlagn_mac_sta_notify(struct ieee80211_hw *hw,</div><div class='ctx'> 	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+iwlagn_mac_reconfig_complete(struct ieee80211_hw *hw,</div><div class='add'>+			     enum ieee80211_reconfig_type reconfig_type)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);</div><div class='add'>+</div><div class='add'>+	if (reconfig_type == IEEE80211_RECONFIG_TYPE_RESTART)</div><div class='add'>+		iwl_trans_finish_sw_reset(priv-&gt;trans);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct ieee80211_ops iwlagn_hw_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.tx = iwlagn_mac_tx,</div><div class='add'>+	.wake_tx_queue = ieee80211_handle_wake_tx_queue,</div><div class='ctx'> 	.start = iwlagn_mac_start,</div><div class='ctx'> 	.stop = iwlagn_mac_stop,</div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='hunk'>@@ -1601,6 +1602,7 @@ const struct ieee80211_ops iwlagn_hw_ops = {</div><div class='ctx'> 	.tx_last_beacon = iwlagn_mac_tx_last_beacon,</div><div class='ctx'> 	.event_callback = iwlagn_mac_event_callback,</div><div class='ctx'> 	.set_tim = iwlagn_mac_set_tim,</div><div class='add'>+	.reconfig_complete = iwlagn_mac_reconfig_complete,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* This function both allocates and initializes hw and priv. */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/main.c b/drivers/net/wireless/intel/iwlwifi/dvm/main.c<br/>index c01523f64bfc..2b4dbebc71c2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/main.c</a></div><div class='hunk'>@@ -1,16 +1,12 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * Copyright(c) 2003 - 2014, 2018 - 2020  Intel Corporation. All rights reserved.</div><div class='add'>+ * Copyright(c) 2003 - 2014, 2018 - 2022 Intel Corporation. All rights reserved.</div><div class='add'>+ * Copyright(c) 2024-2025 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2015 Intel Deutschland GmbH</div><div class='ctx'>  *</div><div class='ctx'>  * Portions of this file are derived from the ipw3945 project, as well</div><div class='ctx'>  * as portions of the ieee80211 subsystem header files.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -30,8 +26,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "iwl-eeprom-read.h"</div><div class='del'>-#include "iwl-eeprom-parse.h"</div><div class='add'>+#include "iwl-nvm-utils.h"</div><div class='ctx'> #include "iwl-io.h"</div><div class='ctx'> #include "iwl-trans.h"</div><div class='ctx'> #include "iwl-op-mode.h"</div><div class='hunk'>@@ -52,8 +47,8 @@</div><div class='ctx'> </div><div class='ctx'> #define DRV_DESCRIPTION	"Intel(R) Wireless WiFi Link AGN driver for Linux"</div><div class='ctx'> MODULE_DESCRIPTION(DRV_DESCRIPTION);</div><div class='del'>-MODULE_AUTHOR(DRV_AUTHOR);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_IMPORT_NS("IWLWIFI");</div><div class='ctx'> </div><div class='ctx'> /* Please keep this array *SORTED* by hex value.</div><div class='ctx'>  * Access is done through binary search.</div><div class='hunk'>@@ -289,7 +284,7 @@ static void iwl_bg_beacon_update(struct work_struct *work)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Pull updated AP beacon from mac80211. will fail if not in AP mode */</div><div class='del'>-	beacon = ieee80211_beacon_get(priv-&gt;hw, priv-&gt;beacon_ctx-&gt;vif);</div><div class='add'>+	beacon = ieee80211_beacon_get(priv-&gt;hw, priv-&gt;beacon_ctx-&gt;vif, 0);</div><div class='ctx'> 	if (!beacon) {</div><div class='ctx'> 		IWL_ERR(priv, "update beacon failed -- keeping old\n");</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -386,7 +381,8 @@ int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags, bool clear)</div><div class='ctx'>  */</div><div class='ctx'> static void iwl_bg_statistics_periodic(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_priv *priv = from_timer(priv, t, statistics_periodic);</div><div class='add'>+	struct iwl_priv *priv = timer_container_of(priv, t,</div><div class='add'>+						   statistics_periodic);</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -542,7 +538,7 @@ static void iwl_continuous_event_trace(struct iwl_priv *priv)</div><div class='ctx'>  */</div><div class='ctx'> static void iwl_bg_ucode_trace(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_priv *priv = from_timer(priv, t, ucode_trace);</div><div class='add'>+	struct iwl_priv *priv = timer_container_of(priv, t, ucode_trace);</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -829,11 +825,11 @@ int iwl_alive_start(struct iwl_priv *priv)</div><div class='ctx'> 	iwlagn_send_tx_ant_config(priv, priv-&gt;nvm_data-&gt;valid_tx_ant);</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_is_associated_ctx(ctx) &amp;&amp; !priv-&gt;wowlan) {</div><div class='del'>-		struct iwl_rxon_cmd *active_rxon =</div><div class='del'>-				(struct iwl_rxon_cmd *)&amp;ctx-&gt;active;</div><div class='add'>+		struct iwl_rxon_cmd *active = (void *)(uintptr_t)&amp;ctx-&gt;active;</div><div class='add'>+</div><div class='ctx'> 		/* apply any changes in staging */</div><div class='ctx'> 		ctx-&gt;staging.filter_flags |= RXON_FILTER_ASSOC_MSK;</div><div class='del'>-		active_rxon-&gt;filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='add'>+		active-&gt;filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct iwl_rxon_context *tmp;</div><div class='ctx'> 		/* Initialize our rx_config data */</div><div class='hunk'>@@ -1053,9 +1049,11 @@ static void iwl_bg_restart(struct work_struct *data)</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='del'>-static void iwl_setup_deferred_work(struct iwl_priv *priv)</div><div class='add'>+static int iwl_setup_deferred_work(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	priv-&gt;workqueue = alloc_ordered_workqueue(DRV_NAME, 0);</div><div class='add'>+	if (!priv-&gt;workqueue)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;restart, iwl_bg_restart);</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;beacon_update, iwl_bg_beacon_update);</div><div class='hunk'>@@ -1072,6 +1070,8 @@ static void iwl_setup_deferred_work(struct iwl_priv *priv)</div><div class='ctx'> 	timer_setup(&amp;priv-&gt;statistics_periodic, iwl_bg_statistics_periodic, 0);</div><div class='ctx'> </div><div class='ctx'> 	timer_setup(&amp;priv-&gt;ucode_trace, iwl_bg_ucode_trace, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_cancel_deferred_work(struct iwl_priv *priv)</div><div class='hunk'>@@ -1087,8 +1087,8 @@ void iwl_cancel_deferred_work(struct iwl_priv *priv)</div><div class='ctx'> 	cancel_work_sync(&amp;priv-&gt;bt_full_concurrency);</div><div class='ctx'> 	cancel_work_sync(&amp;priv-&gt;bt_runtime_config);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;priv-&gt;statistics_periodic);</div><div class='del'>-	del_timer_sync(&amp;priv-&gt;ucode_trace);</div><div class='add'>+	timer_delete_sync(&amp;priv-&gt;statistics_periodic);</div><div class='add'>+	timer_delete_sync(&amp;priv-&gt;ucode_trace);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_init_drv(struct iwl_priv *priv)</div><div class='hunk'>@@ -1142,9 +1142,10 @@ static void iwl_uninit_drv(struct iwl_priv *priv)</div><div class='ctx'> </div><div class='ctx'> static void iwl_set_hw_params(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	if (priv-&gt;cfg-&gt;ht_params)</div><div class='add'>+	/* there are no devices with HT but without HT40 on all bands */</div><div class='add'>+	if (priv-&gt;cfg-&gt;ht_params.ht40_bands)</div><div class='ctx'> 		priv-&gt;hw_params.use_rts_for_aggregation =</div><div class='del'>-			priv-&gt;cfg-&gt;ht_params-&gt;use_rts_for_aggregation;</div><div class='add'>+			priv-&gt;cfg-&gt;ht_params.use_rts_for_aggregation;</div><div class='ctx'> </div><div class='ctx'> 	/* Device-specific setup */</div><div class='ctx'> 	priv-&gt;lib-&gt;set_hw_params(priv);</div><div class='hunk'>@@ -1178,8 +1179,9 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_nvm_data *data = priv-&gt;nvm_data;</div><div class='ctx'> </div><div class='add'>+	/* all HT devices also have HT40 on at least one band */</div><div class='ctx'> 	if (data-&gt;sku_cap_11n_enable &amp;&amp;</div><div class='del'>-	    !priv-&gt;cfg-&gt;ht_params) {</div><div class='add'>+	    !priv-&gt;cfg-&gt;ht_params.ht40_bands) {</div><div class='ctx'> 		IWL_ERR(priv, "Invalid 11n configuration\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1229,7 +1231,7 @@ static int iwl_nvm_check_version(struct iwl_nvm_data *data,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,</div><div class='del'>-						 const struct iwl_cfg *cfg,</div><div class='add'>+						 const struct iwl_rf_cfg *cfg,</div><div class='ctx'> 						 const struct iwl_fw *fw,</div><div class='ctx'> 						 struct dentry *dbgfs_dir)</div><div class='ctx'> {</div><div class='hunk'>@@ -1238,7 +1240,6 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,</div><div class='ctx'> 	struct iwl_op_mode *op_mode;</div><div class='ctx'> 	u16 num_mac;</div><div class='ctx'> 	u32 ucode_flags;</div><div class='del'>-	struct iwl_trans_config trans_cfg = {};</div><div class='ctx'> 	static const u8 no_reclaim_cmds[] = {</div><div class='ctx'> 		REPLY_RX_PHY_CMD,</div><div class='ctx'> 		REPLY_RX_MPDU_CMD,</div><div class='hunk'>@@ -1246,14 +1247,16 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,</div><div class='ctx'> 		STATISTICS_NOTIFICATION,</div><div class='ctx'> 		REPLY_TX,</div><div class='ctx'> 	};</div><div class='del'>-	int i;</div><div class='add'>+	int i, err;</div><div class='ctx'> </div><div class='ctx'> 	/************************</div><div class='ctx'> 	 * 1. Allocating HW data</div><div class='ctx'> 	 ************************/</div><div class='ctx'> 	hw = iwl_alloc_all();</div><div class='ctx'> 	if (!hw) {</div><div class='del'>-		pr_err("%s: Cannot allocate network device\n", trans-&gt;name);</div><div class='add'>+		pr_err("%s: Cannot allocate network device\n",</div><div class='add'>+		       trans-&gt;info.name);</div><div class='add'>+		err = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1265,7 +1268,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,</div><div class='ctx'> 	priv-&gt;cfg = cfg;</div><div class='ctx'> 	priv-&gt;fw = fw;</div><div class='ctx'> </div><div class='del'>-	switch (priv-&gt;trans-&gt;trans_cfg-&gt;device_family) {</div><div class='add'>+	switch (priv-&gt;trans-&gt;mac_cfg-&gt;device_family) {</div><div class='ctx'> 	case IWL_DEVICE_FAMILY_1000:</div><div class='ctx'> 	case IWL_DEVICE_FAMILY_100:</div><div class='ctx'> 		priv-&gt;lib = &amp;iwl_dvm_1000_cfg;</div><div class='hunk'>@@ -1304,61 +1307,60 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(!priv-&gt;lib))</div><div class='add'>+	if (WARN_ON(!priv-&gt;lib)) {</div><div class='add'>+		err = -ENODEV;</div><div class='ctx'> 		goto out_free_hw;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Populate the state variables that the transport layer needs</div><div class='ctx'> 	 * to know about.</div><div class='ctx'> 	 */</div><div class='del'>-	trans_cfg.op_mode = op_mode;</div><div class='del'>-	trans_cfg.no_reclaim_cmds = no_reclaim_cmds;</div><div class='del'>-	trans_cfg.n_no_reclaim_cmds = ARRAY_SIZE(no_reclaim_cmds);</div><div class='add'>+	BUILD_BUG_ON(sizeof(no_reclaim_cmds) &gt;</div><div class='add'>+		     sizeof(trans-&gt;conf.no_reclaim_cmds));</div><div class='add'>+	memcpy(trans-&gt;conf.no_reclaim_cmds, no_reclaim_cmds,</div><div class='add'>+	       sizeof(no_reclaim_cmds));</div><div class='add'>+	trans-&gt;conf.n_no_reclaim_cmds = ARRAY_SIZE(no_reclaim_cmds);</div><div class='ctx'> </div><div class='ctx'> 	switch (iwlwifi_mod_params.amsdu_size) {</div><div class='ctx'> 	case IWL_AMSDU_DEF:</div><div class='ctx'> 	case IWL_AMSDU_4K:</div><div class='del'>-		trans_cfg.rx_buf_size = IWL_AMSDU_4K;</div><div class='add'>+		trans-&gt;conf.rx_buf_size = IWL_AMSDU_4K;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IWL_AMSDU_8K:</div><div class='del'>-		trans_cfg.rx_buf_size = IWL_AMSDU_8K;</div><div class='add'>+		trans-&gt;conf.rx_buf_size = IWL_AMSDU_8K;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IWL_AMSDU_12K:</div><div class='ctx'> 	default:</div><div class='del'>-		trans_cfg.rx_buf_size = IWL_AMSDU_4K;</div><div class='add'>+		trans-&gt;conf.rx_buf_size = IWL_AMSDU_4K;</div><div class='ctx'> 		pr_err("Unsupported amsdu_size: %d\n",</div><div class='ctx'> 		       iwlwifi_mod_params.amsdu_size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	trans_cfg.cmd_q_wdg_timeout = IWL_WATCHDOG_DISABLED;</div><div class='add'>+	trans-&gt;conf.command_groups = iwl_dvm_groups;</div><div class='add'>+	trans-&gt;conf.command_groups_size = ARRAY_SIZE(iwl_dvm_groups);</div><div class='ctx'> </div><div class='del'>-	trans_cfg.command_groups = iwl_dvm_groups;</div><div class='del'>-	trans_cfg.command_groups_size = ARRAY_SIZE(iwl_dvm_groups);</div><div class='del'>-</div><div class='del'>-	trans_cfg.cmd_fifo = IWLAGN_CMD_FIFO_NUM;</div><div class='del'>-	trans_cfg.cb_data_offs = offsetof(struct ieee80211_tx_info,</div><div class='del'>-					  driver_data[2]);</div><div class='add'>+	trans-&gt;conf.cmd_fifo = IWLAGN_CMD_FIFO_NUM;</div><div class='add'>+	trans-&gt;conf.cb_data_offs = offsetof(struct ieee80211_tx_info,</div><div class='add'>+					    driver_data[2]);</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(sizeof(priv-&gt;transport_queue_stop) * BITS_PER_BYTE &lt;</div><div class='del'>-		priv-&gt;trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues);</div><div class='add'>+		priv-&gt;trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues);</div><div class='ctx'> </div><div class='ctx'> 	ucode_flags = fw-&gt;ucode_capa.flags;</div><div class='ctx'> </div><div class='ctx'> 	if (ucode_flags &amp; IWL_UCODE_TLV_FLAGS_PAN) {</div><div class='ctx'> 		priv-&gt;sta_key_max_num = STA_KEY_MAX_NUM_PAN;</div><div class='del'>-		trans_cfg.cmd_queue = IWL_IPAN_CMD_QUEUE_NUM;</div><div class='add'>+		trans-&gt;conf.cmd_queue = IWL_IPAN_CMD_QUEUE_NUM;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		priv-&gt;sta_key_max_num = STA_KEY_MAX_NUM;</div><div class='del'>-		trans_cfg.cmd_queue = IWL_DEFAULT_CMD_QUEUE_NUM;</div><div class='add'>+		trans-&gt;conf.cmd_queue = IWL_DEFAULT_CMD_QUEUE_NUM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Configure transport layer */</div><div class='del'>-	iwl_trans_configure(priv-&gt;trans, &amp;trans_cfg);</div><div class='add'>+	trans-&gt;conf.rx_mpdu_cmd = REPLY_RX_MPDU_CMD;</div><div class='add'>+	trans-&gt;conf.rx_mpdu_cmd_hdr_size = sizeof(struct iwl_rx_mpdu_res_start);</div><div class='ctx'> </div><div class='del'>-	trans-&gt;rx_mpdu_cmd = REPLY_RX_MPDU_CMD;</div><div class='del'>-	trans-&gt;rx_mpdu_cmd_hdr_size = sizeof(struct iwl_rx_mpdu_res_start);</div><div class='del'>-	trans-&gt;command_groups = trans_cfg.command_groups;</div><div class='del'>-	trans-&gt;command_groups_size = trans_cfg.command_groups_size;</div><div class='add'>+	iwl_trans_op_mode_enter(priv-&gt;trans, op_mode);</div><div class='ctx'> </div><div class='ctx'> 	/* At this point both hw and priv are allocated. */</div><div class='ctx'> </div><div class='hunk'>@@ -1382,16 +1384,18 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,</div><div class='ctx'> 	 * 2. Read REV register</div><div class='ctx'> 	 ***********************/</div><div class='ctx'> 	IWL_INFO(priv, "Detected %s, REV=0x%X\n",</div><div class='del'>-		priv-&gt;trans-&gt;name, priv-&gt;trans-&gt;hw_rev);</div><div class='add'>+		priv-&gt;trans-&gt;info.name, priv-&gt;trans-&gt;info.hw_rev);</div><div class='ctx'> </div><div class='del'>-	if (iwl_trans_start_hw(priv-&gt;trans))</div><div class='del'>-		goto out_free_hw;</div><div class='add'>+	err = iwl_trans_start_hw(priv-&gt;trans);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_leave_trans;</div><div class='ctx'> </div><div class='ctx'> 	/* Read the EEPROM */</div><div class='del'>-	if (iwl_read_eeprom(priv-&gt;trans, &amp;priv-&gt;eeprom_blob,</div><div class='del'>-			    &amp;priv-&gt;eeprom_blob_size)) {</div><div class='add'>+	err = iwl_read_eeprom(priv-&gt;trans, &amp;priv-&gt;eeprom_blob,</div><div class='add'>+			      &amp;priv-&gt;eeprom_blob_size);</div><div class='add'>+	if (err) {</div><div class='ctx'> 		IWL_ERR(priv, "Unable to init EEPROM\n");</div><div class='del'>-		goto out_free_hw;</div><div class='add'>+		goto out_leave_trans;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Reset chip to save power until we load uCode during "up". */</div><div class='hunk'>@@ -1400,13 +1404,17 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,</div><div class='ctx'> 	priv-&gt;nvm_data = iwl_parse_eeprom_data(priv-&gt;trans, priv-&gt;cfg,</div><div class='ctx'> 					       priv-&gt;eeprom_blob,</div><div class='ctx'> 					       priv-&gt;eeprom_blob_size);</div><div class='del'>-	if (!priv-&gt;nvm_data)</div><div class='add'>+	if (!priv-&gt;nvm_data) {</div><div class='add'>+		err = -ENOMEM;</div><div class='ctx'> 		goto out_free_eeprom_blob;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (iwl_nvm_check_version(priv-&gt;nvm_data, priv-&gt;trans))</div><div class='add'>+	err = iwl_nvm_check_version(priv-&gt;nvm_data, priv-&gt;trans);</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto out_free_eeprom;</div><div class='ctx'> </div><div class='del'>-	if (iwl_eeprom_init_hw_params(priv))</div><div class='add'>+	err = iwl_eeprom_init_hw_params(priv);</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto out_free_eeprom;</div><div class='ctx'> </div><div class='ctx'> 	/* extract MAC Address */</div><div class='hunk'>@@ -1435,10 +1443,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,</div><div class='ctx'> 		 * packaging bug or due to the eeprom check above</div><div class='ctx'> 		 */</div><div class='ctx'> 		priv-&gt;sta_key_max_num = STA_KEY_MAX_NUM;</div><div class='del'>-		trans_cfg.cmd_queue = IWL_DEFAULT_CMD_QUEUE_NUM;</div><div class='del'>-</div><div class='del'>-		/* Configure transport layer again*/</div><div class='del'>-		iwl_trans_configure(priv-&gt;trans, &amp;trans_cfg);</div><div class='add'>+		trans-&gt;conf.cmd_queue = IWL_DEFAULT_CMD_QUEUE_NUM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*******************</div><div class='hunk'>@@ -1453,7 +1458,8 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,</div><div class='ctx'> 		atomic_set(&amp;priv-&gt;queue_stop_count[i], 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (iwl_init_drv(priv))</div><div class='add'>+	err = iwl_init_drv(priv);</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto out_free_eeprom;</div><div class='ctx'> </div><div class='ctx'> 	/* At this point both hw and priv are initialized. */</div><div class='hunk'>@@ -1461,7 +1467,10 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,</div><div class='ctx'> 	/********************</div><div class='ctx'> 	 * 6. Setup services</div><div class='ctx'> 	 ********************/</div><div class='del'>-	iwl_setup_deferred_work(priv);</div><div class='add'>+	err = iwl_setup_deferred_work(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_uninit_drv;</div><div class='add'>+</div><div class='ctx'> 	iwl_setup_rx_handlers(priv);</div><div class='ctx'> </div><div class='ctx'> 	iwl_power_initialize(priv);</div><div class='hunk'>@@ -1469,7 +1478,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,</div><div class='ctx'> </div><div class='ctx'> 	snprintf(priv-&gt;hw-&gt;wiphy-&gt;fw_version,</div><div class='ctx'> 		 sizeof(priv-&gt;hw-&gt;wiphy-&gt;fw_version),</div><div class='del'>-		 "%s", fw-&gt;fw_version);</div><div class='add'>+		 "%.31s", fw-&gt;fw_version);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;new_scan_threshold_behaviour =</div><div class='ctx'> 		!!(ucode_flags &amp; IWL_UCODE_TLV_FLAGS_NEWSCAN);</div><div class='hunk'>@@ -1487,7 +1496,8 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * 7. Setup and register with mac80211 and debugfs</div><div class='ctx'> 	 **************************************************/</div><div class='del'>-	if (iwlagn_mac_setup_register(priv, &amp;fw-&gt;ucode_capa))</div><div class='add'>+	err = iwlagn_mac_setup_register(priv, &amp;fw-&gt;ucode_capa);</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto out_destroy_workqueue;</div><div class='ctx'> </div><div class='ctx'> 	iwl_dbgfs_register(priv, dbgfs_dir);</div><div class='hunk'>@@ -1499,16 +1509,18 @@ out_destroy_workqueue:</div><div class='ctx'> 	iwl_cancel_deferred_work(priv);</div><div class='ctx'> 	destroy_workqueue(priv-&gt;workqueue);</div><div class='ctx'> 	priv-&gt;workqueue = NULL;</div><div class='add'>+out_uninit_drv:</div><div class='ctx'> 	iwl_uninit_drv(priv);</div><div class='ctx'> out_free_eeprom_blob:</div><div class='ctx'> 	kfree(priv-&gt;eeprom_blob);</div><div class='ctx'> out_free_eeprom:</div><div class='ctx'> 	kfree(priv-&gt;nvm_data);</div><div class='add'>+out_leave_trans:</div><div class='add'>+	iwl_trans_op_mode_leave(priv-&gt;trans);</div><div class='ctx'> out_free_hw:</div><div class='ctx'> 	ieee80211_free_hw(priv-&gt;hw);</div><div class='ctx'> out:</div><div class='del'>-	op_mode = NULL;</div><div class='del'>-	return op_mode;</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode)</div><div class='hunk'>@@ -1525,7 +1537,6 @@ static void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode)</div><div class='ctx'> 	kfree(priv-&gt;nvm_data);</div><div class='ctx'> </div><div class='ctx'> 	/*netif_stop_queue(dev); */</div><div class='del'>-	flush_workqueue(priv-&gt;workqueue);</div><div class='ctx'> </div><div class='ctx'> 	/* ieee80211_unregister_hw calls iwlagn_mac_stop, which flushes</div><div class='ctx'> 	 * priv-&gt;workqueue... so we can't take down the workqueue</div><div class='hunk'>@@ -1903,17 +1914,9 @@ static void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)</div><div class='ctx'> 	unsigned int reload_msec;</div><div class='ctx'> 	unsigned long reload_jiffies;</div><div class='ctx'> </div><div class='del'>-	if (iwl_have_debug_level(IWL_DL_FW))</div><div class='del'>-		iwl_print_rx_config_cmd(priv, IWL_RXON_CTX_BSS);</div><div class='del'>-</div><div class='ctx'> 	/* uCode is no longer loaded. */</div><div class='ctx'> 	priv-&gt;ucode_loaded = false;</div><div class='ctx'> </div><div class='del'>-	/* Set the FW error flag -- cleared on iwl_down */</div><div class='del'>-	set_bit(STATUS_FW_ERROR, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	iwl_abort_notification_waits(&amp;priv-&gt;notif_wait);</div><div class='del'>-</div><div class='ctx'> 	/* Keep the restart process from trying to send host</div><div class='ctx'> 	 * commands by clearing the ready bit */</div><div class='ctx'> 	clear_bit(STATUS_READY, &amp;priv-&gt;status);</div><div class='hunk'>@@ -1950,27 +1953,43 @@ static void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_nic_error(struct iwl_op_mode *op_mode)</div><div class='add'>+static void iwl_nic_error(struct iwl_op_mode *op_mode,</div><div class='add'>+			  enum iwl_fw_error_type type)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);</div><div class='ctx'> </div><div class='add'>+	/* Set the FW error flag -- cleared on iwl_down */</div><div class='add'>+	set_bit(STATUS_FW_ERROR, &amp;priv-&gt;status);</div><div class='add'>+</div><div class='add'>+	iwl_abort_notification_waits(&amp;priv-&gt;notif_wait);</div><div class='add'>+</div><div class='add'>+	if (type == IWL_ERR_TYPE_CMD_QUEUE_FULL &amp;&amp; iwl_check_for_ct_kill(priv))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	IWL_ERR(priv, "Loaded firmware version: %s\n",</div><div class='ctx'> 		priv-&gt;fw-&gt;fw_version);</div><div class='ctx'> </div><div class='del'>-	iwl_dump_nic_error_log(priv);</div><div class='del'>-	iwl_dump_nic_event_log(priv, false, NULL);</div><div class='add'>+	if (type == IWL_ERR_TYPE_CMD_QUEUE_FULL) {</div><div class='add'>+		IWL_ERR(priv, "Command queue full!\n");</div><div class='add'>+	} else {</div><div class='add'>+		iwl_dump_nic_error_log(priv);</div><div class='add'>+		iwl_dump_nic_event_log(priv, false, NULL);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	iwlagn_fw_error(priv, false);</div><div class='add'>+	if (iwl_have_debug_level(IWL_DL_FW))</div><div class='add'>+		iwl_print_rx_config_cmd(priv, IWL_RXON_CTX_BSS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_cmd_queue_full(struct iwl_op_mode *op_mode)</div><div class='add'>+static bool iwlagn_sw_reset(struct iwl_op_mode *op_mode,</div><div class='add'>+			    enum iwl_fw_error_type type)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);</div><div class='ctx'> </div><div class='del'>-	if (!iwl_check_for_ct_kill(priv)) {</div><div class='del'>-		IWL_ERR(priv, "Restarting adapter queue is full\n");</div><div class='del'>-		iwlagn_fw_error(priv, false);</div><div class='del'>-	}</div><div class='add'>+	if (type == IWL_ERR_TYPE_CMD_QUEUE_FULL &amp;&amp; iwl_check_for_ct_kill(priv))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	iwlagn_fw_error(priv, false);</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define EEPROM_RF_CONFIG_TYPE_MAX      0x3</div><div class='hunk'>@@ -1981,12 +2000,8 @@ static void iwl_nic_config(struct iwl_op_mode *op_mode)</div><div class='ctx'> </div><div class='ctx'> 	/* SKU Control */</div><div class='ctx'> 	iwl_trans_set_bits_mask(priv-&gt;trans, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-				CSR_HW_IF_CONFIG_REG_MSK_MAC_DASH |</div><div class='del'>-				CSR_HW_IF_CONFIG_REG_MSK_MAC_STEP,</div><div class='del'>-				(CSR_HW_REV_STEP(priv-&gt;trans-&gt;hw_rev) &lt;&lt;</div><div class='del'>-					CSR_HW_IF_CONFIG_REG_POS_MAC_STEP) |</div><div class='del'>-				(CSR_HW_REV_DASH(priv-&gt;trans-&gt;hw_rev) &lt;&lt;</div><div class='del'>-					CSR_HW_IF_CONFIG_REG_POS_MAC_DASH));</div><div class='add'>+				CSR_HW_IF_CONFIG_REG_MSK_MAC_STEP_DASH,</div><div class='add'>+				CSR_HW_REV_STEP_DASH(priv-&gt;trans-&gt;info.hw_rev));</div><div class='ctx'> </div><div class='ctx'> 	/* write radio config values to register */</div><div class='ctx'> 	if (priv-&gt;nvm_data-&gt;radio_cfg_type &lt;= EEPROM_RF_CONFIG_TYPE_MAX) {</div><div class='hunk'>@@ -2129,7 +2144,7 @@ static const struct iwl_op_mode_ops iwl_dvm_ops = {</div><div class='ctx'> 	.hw_rf_kill = iwl_set_hw_rfkill_state,</div><div class='ctx'> 	.free_skb = iwl_free_skb,</div><div class='ctx'> 	.nic_error = iwl_nic_error,</div><div class='del'>-	.cmd_queue_full = iwl_cmd_queue_full,</div><div class='add'>+	.sw_reset = iwlagn_sw_reset,</div><div class='ctx'> 	.nic_config = iwl_nic_config,</div><div class='ctx'> 	.wimax_active = iwl_wimax_active,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/power.c b/drivers/net/wireless/intel/iwlwifi/dvm/power.c<br/>index 93ef023905c9..e7dbba7134f7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/power.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/power.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/power.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/power.c</a></div><div class='hunk'>@@ -2,14 +2,10 @@</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.</div><div class='del'>- * Copyright (C) 2019 Intel Corporation</div><div class='add'>+ * Copyright (C) 2019, 2025 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * Portions of this file are derived from the ipw3945 project, as well</div><div class='ctx'>  * as portions of the ieee80211 subsystem header files.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -68,32 +64,32 @@ struct iwl_power_vec_entry {</div><div class='ctx'> /* for DTIM period 0 through IWL_DTIM_RANGE_0_MAX */</div><div class='ctx'> /* DTIM 0 - 2 */</div><div class='ctx'> static const struct iwl_power_vec_entry range_0[IWL_POWER_NUM] = {</div><div class='del'>-	{{SLP, SLP_TOUT(200), SLP_TOUT(500), SLP_VEC(1, 1, 2, 2, 0xFF)}, 0},</div><div class='del'>-	{{SLP, SLP_TOUT(200), SLP_TOUT(300), SLP_VEC(1, 2, 2, 2, 0xFF)}, 0},</div><div class='del'>-	{{SLP, SLP_TOUT(50), SLP_TOUT(100), SLP_VEC(2, 2, 2, 2, 0xFF)}, 0},</div><div class='del'>-	{{SLP, SLP_TOUT(50), SLP_TOUT(25), SLP_VEC(2, 2, 4, 4, 0xFF)}, 1},</div><div class='del'>-	{{SLP, SLP_TOUT(25), SLP_TOUT(25), SLP_VEC(2, 2, 4, 6, 0xFF)}, 2}</div><div class='add'>+	{{SLP, SLP_TOUT(200), SLP_TOUT(500), SLP_VEC(1, 1, 2, 2, 0xFF), 0}, 0},</div><div class='add'>+	{{SLP, SLP_TOUT(200), SLP_TOUT(300), SLP_VEC(1, 2, 2, 2, 0xFF), 0}, 0},</div><div class='add'>+	{{SLP, SLP_TOUT(50), SLP_TOUT(100), SLP_VEC(2, 2, 2, 2, 0xFF), 0}, 0},</div><div class='add'>+	{{SLP, SLP_TOUT(50), SLP_TOUT(25), SLP_VEC(2, 2, 4, 4, 0xFF), 0}, 1},</div><div class='add'>+	{{SLP, SLP_TOUT(25), SLP_TOUT(25), SLP_VEC(2, 2, 4, 6, 0xFF), 0}, 2}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* for DTIM period IWL_DTIM_RANGE_0_MAX + 1 through IWL_DTIM_RANGE_1_MAX */</div><div class='ctx'> /* DTIM 3 - 10 */</div><div class='ctx'> static const struct iwl_power_vec_entry range_1[IWL_POWER_NUM] = {</div><div class='del'>-	{{SLP, SLP_TOUT(200), SLP_TOUT(500), SLP_VEC(1, 2, 3, 4, 4)}, 0},</div><div class='del'>-	{{SLP, SLP_TOUT(200), SLP_TOUT(300), SLP_VEC(1, 2, 3, 4, 7)}, 0},</div><div class='del'>-	{{SLP, SLP_TOUT(50), SLP_TOUT(100), SLP_VEC(2, 4, 6, 7, 9)}, 0},</div><div class='del'>-	{{SLP, SLP_TOUT(50), SLP_TOUT(25), SLP_VEC(2, 4, 6, 9, 10)}, 1},</div><div class='del'>-	{{SLP, SLP_TOUT(25), SLP_TOUT(25), SLP_VEC(2, 4, 6, 10, 10)}, 2}</div><div class='add'>+	{{SLP, SLP_TOUT(200), SLP_TOUT(500), SLP_VEC(1, 2, 3, 4, 4), 0}, 0},</div><div class='add'>+	{{SLP, SLP_TOUT(200), SLP_TOUT(300), SLP_VEC(1, 2, 3, 4, 7), 0}, 0},</div><div class='add'>+	{{SLP, SLP_TOUT(50), SLP_TOUT(100), SLP_VEC(2, 4, 6, 7, 9), 0}, 0},</div><div class='add'>+	{{SLP, SLP_TOUT(50), SLP_TOUT(25), SLP_VEC(2, 4, 6, 9, 10), 0}, 1},</div><div class='add'>+	{{SLP, SLP_TOUT(25), SLP_TOUT(25), SLP_VEC(2, 4, 6, 10, 10), 0}, 2}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* for DTIM period &gt; IWL_DTIM_RANGE_1_MAX */</div><div class='ctx'> /* DTIM 11 - */</div><div class='ctx'> static const struct iwl_power_vec_entry range_2[IWL_POWER_NUM] = {</div><div class='del'>-	{{SLP, SLP_TOUT(200), SLP_TOUT(500), SLP_VEC(1, 2, 3, 4, 0xFF)}, 0},</div><div class='del'>-	{{SLP, SLP_TOUT(200), SLP_TOUT(300), SLP_VEC(2, 4, 6, 7, 0xFF)}, 0},</div><div class='del'>-	{{SLP, SLP_TOUT(50), SLP_TOUT(100), SLP_VEC(2, 7, 9, 9, 0xFF)}, 0},</div><div class='del'>-	{{SLP, SLP_TOUT(50), SLP_TOUT(25), SLP_VEC(2, 7, 9, 9, 0xFF)}, 0},</div><div class='del'>-	{{SLP, SLP_TOUT(25), SLP_TOUT(25), SLP_VEC(4, 7, 10, 10, 0xFF)}, 0}</div><div class='add'>+	{{SLP, SLP_TOUT(200), SLP_TOUT(500), SLP_VEC(1, 2, 3, 4, 0xFF), 0}, 0},</div><div class='add'>+	{{SLP, SLP_TOUT(200), SLP_TOUT(300), SLP_VEC(2, 4, 6, 7, 0xFF), 0}, 0},</div><div class='add'>+	{{SLP, SLP_TOUT(50), SLP_TOUT(100), SLP_VEC(2, 7, 9, 9, 0xFF), 0}, 0},</div><div class='add'>+	{{SLP, SLP_TOUT(50), SLP_TOUT(25), SLP_VEC(2, 7, 9, 9, 0xFF), 0}, 0},</div><div class='add'>+	{{SLP, SLP_TOUT(25), SLP_TOUT(25), SLP_VEC(4, 7, 10, 10, 0xFF), 0}, 0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* advance power management */</div><div class='hunk'>@@ -200,7 +196,7 @@ static void iwl_static_sleep_cmd(struct iwl_priv *priv,</div><div class='ctx'> 	else</div><div class='ctx'> 		cmd-&gt;flags &amp;= ~IWL_POWER_SLEEP_OVER_DTIM_MSK;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;trans-&gt;trans_cfg-&gt;base_params-&gt;shadow_reg_enable)</div><div class='add'>+	if (priv-&gt;trans-&gt;mac_cfg-&gt;base-&gt;shadow_reg_enable)</div><div class='ctx'> 		cmd-&gt;flags |= IWL_POWER_SHADOW_REG_ENA;</div><div class='ctx'> 	else</div><div class='ctx'> 		cmd-&gt;flags &amp;= ~IWL_POWER_SHADOW_REG_ENA;</div><div class='hunk'>@@ -372,7 +368,7 @@ int iwl_power_update_mode(struct iwl_priv *priv, bool force)</div><div class='ctx'> /* initialize to default */</div><div class='ctx'> void iwl_power_initialize(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	priv-&gt;power_data.bus_pm = priv-&gt;trans-&gt;pm_support;</div><div class='add'>+	priv-&gt;power_data.bus_pm = iwl_trans_is_pm_supported(priv-&gt;trans);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;power_data.debug_sleep_level_override = -1;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/power.h b/drivers/net/wireless/intel/iwlwifi/dvm/power.h<br/>index 3f8db1fc4b59..1a688d942bca 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/power.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/power.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/power.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/power.h</a></div><div class='hunk'>@@ -5,10 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Portions of this file are derived from the ipw3945 project, as well</div><div class='ctx'>  * as portions of the ieee80211 subsystem header files.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> #ifndef __iwl_power_setting_h__</div><div class='ctx'> #define __iwl_power_setting_h__</div><div class='hunk'>@@ -27,6 +23,4 @@ int iwl_power_set_mode(struct iwl_priv *priv, struct iwl_powertable_cmd *cmd,</div><div class='ctx'> int iwl_power_update_mode(struct iwl_priv *priv, bool force);</div><div class='ctx'> void iwl_power_initialize(struct iwl_priv *priv);</div><div class='ctx'> </div><div class='del'>-extern bool no_sleep_autoadjust;</div><div class='del'>-</div><div class='ctx'> #endif  /* __iwl_power_setting_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/rs.c b/drivers/net/wireless/intel/iwlwifi/dvm/rs.c<br/>index 548540dd0c0f..ed964103281e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/rs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/rs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/rs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/rs.c</a></div><div class='hunk'>@@ -2,12 +2,7 @@</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.</div><div class='del'>- * Copyright (C) 2019 - 2020 Intel Corporation</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='add'>+ * Copyright (C) 2019 - 2020, 2022 - 2023 Intel Corporation</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='hunk'>@@ -130,7 +125,7 @@ static int iwl_hwrate_to_plcp_idx(u32 rate_n_flags)</div><div class='ctx'> 				return idx;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return -1;</div><div class='add'>+	return IWL_RATE_INVALID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rs_rate_scale_perform(struct iwl_priv *priv,</div><div class='hunk'>@@ -208,23 +203,6 @@ static const u16 expected_tpt_mimo3_40MHz[4][IWL_RATE_COUNT] = {</div><div class='ctx'> 	{0, 0, 0, 0, 277, 0, 478, 624, 737, 911, 1026, 1070, 1109}, /* AGG+SGI */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* mbps, mcs */</div><div class='del'>-static const struct iwl_rate_mcs_info iwl_rate_mcs[IWL_RATE_COUNT] = {</div><div class='del'>-	{  "1", "BPSK DSSS"},</div><div class='del'>-	{  "2", "QPSK DSSS"},</div><div class='del'>-	{"5.5", "BPSK CCK"},</div><div class='del'>-	{ "11", "QPSK CCK"},</div><div class='del'>-	{  "6", "BPSK 1/2"},</div><div class='del'>-	{  "9", "BPSK 1/2"},</div><div class='del'>-	{ "12", "QPSK 1/2"},</div><div class='del'>-	{ "18", "QPSK 3/4"},</div><div class='del'>-	{ "24", "16QAM 1/2"},</div><div class='del'>-	{ "36", "16QAM 3/4"},</div><div class='del'>-	{ "48", "64QAM 2/3"},</div><div class='del'>-	{ "54", "64QAM 3/4"},</div><div class='del'>-	{ "60", "64QAM 5/6"},</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define MCS_INDEX_PER_STREAM	(8)</div><div class='ctx'> </div><div class='ctx'> static void rs_rate_scale_clear_window(struct iwl_rate_scale_data *window)</div><div class='hunk'>@@ -1044,7 +1022,7 @@ static void rs_tx_status(void *priv_r, struct ieee80211_supported_band *sband,</div><div class='ctx'> 	lq_sta-&gt;last_rate_n_flags = tx_rate;</div><div class='ctx'> done:</div><div class='ctx'> 	/* See if there's a better rate or modulation mode to try. */</div><div class='del'>-	if (sta &amp;&amp; sta-&gt;supp_rates[sband-&gt;band])</div><div class='add'>+	if (sta &amp;&amp; sta-&gt;deflink.supp_rates[sband-&gt;band])</div><div class='ctx'> 		rs_rate_scale_perform(priv, skb, sta, lq_sta);</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;lib-&gt;bt_params &amp;&amp; priv-&gt;lib-&gt;bt_params-&gt;advanced_bt_coexist)</div><div class='hunk'>@@ -1244,10 +1222,10 @@ static int rs_switch_to_mimo2(struct iwl_priv *priv,</div><div class='ctx'> 	struct iwl_station_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='ctx'> 	struct iwl_rxon_context *ctx = sta_priv-&gt;ctx;</div><div class='ctx'> </div><div class='del'>-	if (!conf_is_ht(conf) || !sta-&gt;ht_cap.ht_supported)</div><div class='add'>+	if (!conf_is_ht(conf) || !sta-&gt;deflink.ht_cap.ht_supported)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;smps_mode == IEEE80211_SMPS_STATIC)</div><div class='add'>+	if (sta-&gt;deflink.smps_mode == IEEE80211_SMPS_STATIC)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	/* Need both Tx chains/antennas to support MIMO */</div><div class='hunk'>@@ -1299,10 +1277,10 @@ static int rs_switch_to_mimo3(struct iwl_priv *priv,</div><div class='ctx'> 	struct iwl_station_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='ctx'> 	struct iwl_rxon_context *ctx = sta_priv-&gt;ctx;</div><div class='ctx'> </div><div class='del'>-	if (!conf_is_ht(conf) || !sta-&gt;ht_cap.ht_supported)</div><div class='add'>+	if (!conf_is_ht(conf) || !sta-&gt;deflink.ht_cap.ht_supported)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;smps_mode == IEEE80211_SMPS_STATIC)</div><div class='add'>+	if (sta-&gt;deflink.smps_mode == IEEE80211_SMPS_STATIC)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	/* Need both Tx chains/antennas to support MIMO */</div><div class='hunk'>@@ -1355,7 +1333,7 @@ static int rs_switch_to_siso(struct iwl_priv *priv,</div><div class='ctx'> 	struct iwl_station_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='ctx'> 	struct iwl_rxon_context *ctx = sta_priv-&gt;ctx;</div><div class='ctx'> </div><div class='del'>-	if (!conf_is_ht(conf) || !sta-&gt;ht_cap.ht_supported)</div><div class='add'>+	if (!conf_is_ht(conf) || !sta-&gt;deflink.ht_cap.ht_supported)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_RATE(priv, "LQ: try to switch to SISO\n");</div><div class='hunk'>@@ -1575,7 +1553,7 @@ static void rs_move_siso_to_other(struct iwl_priv *priv,</div><div class='ctx'> 	struct iwl_scale_tbl_info *search_tbl =</div><div class='ctx'> 				&amp;(lq_sta-&gt;lq_info[(1 - lq_sta-&gt;active_tbl)]);</div><div class='ctx'> 	struct iwl_rate_scale_data *window = &amp;(tbl-&gt;win[index]);</div><div class='del'>-	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='add'>+	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;deflink.ht_cap;</div><div class='ctx'> 	u32 sz = (sizeof(struct iwl_scale_tbl_info) -</div><div class='ctx'> 		  (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));</div><div class='ctx'> 	u8 start_action;</div><div class='hunk'>@@ -1745,7 +1723,7 @@ static void rs_move_mimo2_to_other(struct iwl_priv *priv,</div><div class='ctx'> 	struct iwl_scale_tbl_info *search_tbl =</div><div class='ctx'> 				&amp;(lq_sta-&gt;lq_info[(1 - lq_sta-&gt;active_tbl)]);</div><div class='ctx'> 	struct iwl_rate_scale_data *window = &amp;(tbl-&gt;win[index]);</div><div class='del'>-	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='add'>+	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;deflink.ht_cap;</div><div class='ctx'> 	u32 sz = (sizeof(struct iwl_scale_tbl_info) -</div><div class='ctx'> 		  (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));</div><div class='ctx'> 	u8 start_action;</div><div class='hunk'>@@ -1913,7 +1891,7 @@ static void rs_move_mimo3_to_other(struct iwl_priv *priv,</div><div class='ctx'> 	struct iwl_scale_tbl_info *search_tbl =</div><div class='ctx'> 				&amp;(lq_sta-&gt;lq_info[(1 - lq_sta-&gt;active_tbl)]);</div><div class='ctx'> 	struct iwl_rate_scale_data *window = &amp;(tbl-&gt;win[index]);</div><div class='del'>-	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='add'>+	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;deflink.ht_cap;</div><div class='ctx'> 	u32 sz = (sizeof(struct iwl_scale_tbl_info) -</div><div class='ctx'> 		  (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));</div><div class='ctx'> 	u8 start_action;</div><div class='hunk'>@@ -2217,7 +2195,7 @@ static void rs_rate_scale_perform(struct iwl_priv *priv,</div><div class='ctx'> 	    info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	lq_sta-&gt;supp_rates = sta-&gt;supp_rates[lq_sta-&gt;band];</div><div class='add'>+	lq_sta-&gt;supp_rates = sta-&gt;deflink.supp_rates[lq_sta-&gt;band];</div><div class='ctx'> </div><div class='ctx'> 	tid = rs_tl_add_packet(lq_sta, hdr);</div><div class='ctx'> 	if ((tid != IWL_MAX_TID_COUNT) &amp;&amp;</div><div class='hunk'>@@ -2695,20 +2673,16 @@ static void rs_get_rate(void *priv_r, struct ieee80211_sta *sta, void *priv_sta,</div><div class='ctx'> 	IWL_DEBUG_RATE_LIMIT(priv, "rate scale calculate new rate for skb\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Get max rate if user set max rate */</div><div class='del'>-	if (lq_sta) {</div><div class='del'>-		lq_sta-&gt;max_rate_idx = fls(txrc-&gt;rate_idx_mask) - 1;</div><div class='del'>-		if ((sband-&gt;band == NL80211_BAND_5GHZ) &amp;&amp;</div><div class='del'>-		    (lq_sta-&gt;max_rate_idx != -1))</div><div class='del'>-			lq_sta-&gt;max_rate_idx += IWL_FIRST_OFDM_RATE;</div><div class='del'>-		if ((lq_sta-&gt;max_rate_idx &lt; 0) ||</div><div class='del'>-		    (lq_sta-&gt;max_rate_idx &gt;= IWL_RATE_COUNT))</div><div class='del'>-			lq_sta-&gt;max_rate_idx = -1;</div><div class='del'>-	}</div><div class='add'>+	lq_sta-&gt;max_rate_idx = fls(txrc-&gt;rate_idx_mask) - 1;</div><div class='add'>+	if (sband-&gt;band == NL80211_BAND_5GHZ &amp;&amp; lq_sta-&gt;max_rate_idx != -1)</div><div class='add'>+		lq_sta-&gt;max_rate_idx += IWL_FIRST_OFDM_RATE;</div><div class='add'>+	if (lq_sta-&gt;max_rate_idx &lt; 0 || lq_sta-&gt;max_rate_idx &gt;= IWL_RATE_COUNT)</div><div class='add'>+		lq_sta-&gt;max_rate_idx = -1;</div><div class='ctx'> </div><div class='del'>-	/* Treat uninitialized rate scaling data same as non-existing. */</div><div class='del'>-	if (lq_sta &amp;&amp; !lq_sta-&gt;drv) {</div><div class='add'>+	if (!lq_sta-&gt;drv) {</div><div class='ctx'> 		IWL_DEBUG_RATE(priv, "Rate scaling not initialized yet.\n");</div><div class='del'>-		priv_sta = NULL;</div><div class='add'>+		/* mac80211 already set up the data for using low rates */</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rate_idx  = lq_sta-&gt;last_txrate_idx;</div><div class='hunk'>@@ -2768,7 +2742,7 @@ void iwl_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 sta_i</div><div class='ctx'> 	int i, j;</div><div class='ctx'> 	struct ieee80211_hw *hw = priv-&gt;hw;</div><div class='ctx'> 	struct ieee80211_conf *conf = &amp;priv-&gt;hw-&gt;conf;</div><div class='del'>-	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='add'>+	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;deflink.ht_cap;</div><div class='ctx'> 	struct iwl_station_priv *sta_priv;</div><div class='ctx'> 	struct iwl_lq_sta *lq_sta;</div><div class='ctx'> 	struct ieee80211_supported_band *sband;</div><div class='hunk'>@@ -2778,7 +2752,6 @@ void iwl_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 sta_i</div><div class='ctx'> 	lq_sta = &amp;sta_priv-&gt;lq_sta;</div><div class='ctx'> 	sband = hw-&gt;wiphy-&gt;bands[conf-&gt;chandef.chan-&gt;band];</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	lq_sta-&gt;lq.sta_id = sta_id;</div><div class='ctx'> </div><div class='ctx'> 	for (j = 0; j &lt; LQ_SIZE; j++)</div><div class='hunk'>@@ -2786,7 +2759,7 @@ void iwl_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 sta_i</div><div class='ctx'> 			rs_rate_scale_clear_window(&amp;lq_sta-&gt;lq_info[j].win[i]);</div><div class='ctx'> </div><div class='ctx'> 	lq_sta-&gt;flush_timer = 0;</div><div class='del'>-	lq_sta-&gt;supp_rates = sta-&gt;supp_rates[sband-&gt;band];</div><div class='add'>+	lq_sta-&gt;supp_rates = sta-&gt;deflink.supp_rates[sband-&gt;band];</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_RATE(priv, "LQ: *** rate scale station global init for station %d ***\n",</div><div class='ctx'> 		       sta_id);</div><div class='hunk'>@@ -2803,7 +2776,7 @@ void iwl_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 sta_i</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * active legacy rates as per supported rates bitmap</div><div class='ctx'> 	 */</div><div class='del'>-	supp = sta-&gt;supp_rates[sband-&gt;band];</div><div class='add'>+	supp = sta-&gt;deflink.supp_rates[sband-&gt;band];</div><div class='ctx'> 	lq_sta-&gt;active_legacy_rate = 0;</div><div class='ctx'> 	for_each_set_bit(i, &amp;supp, BITS_PER_LONG)</div><div class='ctx'> 		lq_sta-&gt;active_legacy_rate |= BIT(sband-&gt;bitrates[i].hw_value);</div><div class='hunk'>@@ -2926,7 +2899,7 @@ static void rs_fill_link_cmd(struct iwl_priv *priv,</div><div class='ctx'> 		/* Repeat initial/next rate.</div><div class='ctx'> 		 * For legacy IWL_NUMBER_TRY == 1, this loop will not execute.</div><div class='ctx'> 		 * For HT IWL_HT_NUMBER_TRY == 3, this executes twice. */</div><div class='del'>-		while (repeat_rate &gt; 0 &amp;&amp; (index &lt; LINK_QUAL_MAX_RETRY_NUM)) {</div><div class='add'>+		while (repeat_rate &gt; 0 &amp;&amp; index &lt; (LINK_QUAL_MAX_RETRY_NUM - 1)) {</div><div class='ctx'> 			if (is_legacy(tbl_type.lq_type)) {</div><div class='ctx'> 				if (ant_toggle_cnt &lt; NUM_TRY_BEFORE_ANT_TOGGLE)</div><div class='ctx'> 					ant_toggle_cnt++;</div><div class='hunk'>@@ -3094,6 +3067,23 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,</div><div class='ctx'> 	int index = 0;</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='add'>+	/* mbps, mcs */</div><div class='add'>+	static const struct iwl_rate_mcs_info iwl_rate_mcs[IWL_RATE_COUNT] = {</div><div class='add'>+		{  "1", "BPSK DSSS"},</div><div class='add'>+		{  "2", "QPSK DSSS"},</div><div class='add'>+		{"5.5", "BPSK CCK"},</div><div class='add'>+		{ "11", "QPSK CCK"},</div><div class='add'>+		{  "6", "BPSK 1/2"},</div><div class='add'>+		{  "9", "BPSK 1/2"},</div><div class='add'>+		{ "12", "QPSK 1/2"},</div><div class='add'>+		{ "18", "QPSK 3/4"},</div><div class='add'>+		{ "24", "16QAM 1/2"},</div><div class='add'>+		{ "36", "16QAM 3/4"},</div><div class='add'>+		{ "48", "64QAM 2/3"},</div><div class='add'>+		{ "54", "64QAM 3/4"},</div><div class='add'>+		{ "60", "64QAM 5/6"},</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	struct iwl_lq_sta *lq_sta = file-&gt;private_data;</div><div class='ctx'> 	struct iwl_priv *priv;</div><div class='ctx'> 	struct iwl_scale_tbl_info *tbl = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='hunk'>@@ -3151,7 +3141,10 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,</div><div class='ctx'> 	for (i = 0; i &lt; LINK_QUAL_MAX_RETRY_NUM; i++) {</div><div class='ctx'> 		index = iwl_hwrate_to_plcp_idx(</div><div class='ctx'> 			le32_to_cpu(lq_sta-&gt;lq.rs_table[i].rate_n_flags));</div><div class='del'>-		if (is_legacy(tbl-&gt;lq_type)) {</div><div class='add'>+		if (index == IWL_RATE_INVALID) {</div><div class='add'>+			desc += sprintf(buff + desc, " rate[%d] 0x%X invalid rate\n",</div><div class='add'>+				i, le32_to_cpu(lq_sta-&gt;lq.rs_table[i].rate_n_flags));</div><div class='add'>+		} else if (is_legacy(tbl-&gt;lq_type)) {</div><div class='ctx'> 			desc += sprintf(buff+desc, " rate[%d] 0x%X %smbps\n",</div><div class='ctx'> 				i, le32_to_cpu(lq_sta-&gt;lq.rs_table[i].rate_n_flags),</div><div class='ctx'> 				iwl_rate_mcs[index].mbps);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/rs.h b/drivers/net/wireless/intel/iwlwifi/dvm/rs.h<br/>index 68a840d739e8..100cb932c6b8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/rs.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/rs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/rs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/rs.h</a></div><div class='hunk'>@@ -1,12 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='add'>+ * Copyright(c) 2003 - 2014, 2023 Intel Corporation. All rights reserved.</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #ifndef __iwl_agn_rs_h__</div><div class='hunk'>@@ -274,7 +269,7 @@ struct iwl_rate_mcs_info {</div><div class='ctx'> 	char	mcs[IWL_MAX_MCS_DISPLAY_SIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * struct iwl_rate_scale_data -- tx success history for one rate</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_rate_scale_data {</div><div class='hunk'>@@ -286,7 +281,7 @@ struct iwl_rate_scale_data {</div><div class='ctx'> 	unsigned long stamp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * struct iwl_scale_tbl_info -- tx params and success history for all rates</div><div class='ctx'>  *</div><div class='ctx'>  * There are two of these in struct iwl_lq_sta,</div><div class='hunk'>@@ -316,7 +311,7 @@ struct iwl_traffic_load {</div><div class='ctx'> 	u8 head;			/* start of the circular buffer */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * struct iwl_lq_sta -- driver's rate scaling private structure</div><div class='ctx'>  *</div><div class='ctx'>  * Pointer to this gets passed back and forth between driver and mac80211.</div><div class='hunk'>@@ -384,7 +379,7 @@ static inline u8 first_antenna(u8 mask)</div><div class='ctx'> void iwl_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta,</div><div class='ctx'> 		      u8 sta_id);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * iwl_rate_control_register - Register the rate control algorithm callbacks</div><div class='ctx'>  *</div><div class='ctx'>  * Since the rate control algorithm is hardware specific, there is no need</div><div class='hunk'>@@ -396,7 +391,7 @@ void iwl_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta,</div><div class='ctx'>  */</div><div class='ctx'> int iwlagn_rate_control_register(void);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * iwl_rate_control_unregister - Unregister the rate control callbacks</div><div class='ctx'>  *</div><div class='ctx'>  * This should be called after calling ieee80211_unregister_hw, but before</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/rx.c b/drivers/net/wireless/intel/iwlwifi/dvm/rx.c<br/>index 80475c7a6fba..b34ee68f3dce 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/rx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/rx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/rx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/rx.c</a></div><div class='hunk'>@@ -3,22 +3,17 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2015 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018, 2020 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018, 2020-2021, 2025 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * Portions of this file are derived from the ipw3945 project, as well</div><div class='ctx'>  * as portionhelp of the ieee80211 subsystem header files.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "iwl-trans.h"</div><div class='ctx'> #include "iwl-io.h"</div><div class='hunk'>@@ -55,7 +50,7 @@ static void iwlagn_rx_csa(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> 	 * See iwlagn_mac_channel_switch.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-	struct iwl_rxon_cmd *rxon = (void *)&amp;ctx-&gt;active;</div><div class='add'>+	struct iwl_rxon_cmd *rxon = (void *)(uintptr_t)&amp;ctx-&gt;active;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(STATUS_CHANNEL_SWITCH_PENDING, &amp;priv-&gt;status))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -318,7 +313,7 @@ iwlagn_accumulative_statistics(struct iwl_priv *priv,</div><div class='ctx'> 		    (__le32 *)&amp;priv-&gt;delta_stats._name,		\</div><div class='ctx'> 		    (__le32 *)&amp;priv-&gt;max_delta_stats._name,	\</div><div class='ctx'> 		    (__le32 *)&amp;priv-&gt;accum_stats._name,		\</div><div class='del'>-		    sizeof(*_name));</div><div class='add'>+		    sizeof(*_name))</div><div class='ctx'> </div><div class='ctx'> 	ACCUM(common);</div><div class='ctx'> 	ACCUM(rx_non_phy);</div><div class='hunk'>@@ -434,7 +429,7 @@ static void iwlagn_rx_statistics(struct iwl_priv *priv,</div><div class='ctx'> 	 * thermal update even if the uCode doesn't give</div><div class='ctx'> 	 * us one */</div><div class='ctx'> 	mod_timer(&amp;priv-&gt;statistics_periodic, jiffies +</div><div class='del'>-		  msecs_to_jiffies(reg_recalib_period * 1000));</div><div class='add'>+		  secs_to_jiffies(reg_recalib_period));</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!test_bit(STATUS_SCANNING, &amp;priv-&gt;status)) &amp;&amp;</div><div class='ctx'> 	    (pkt-&gt;hdr.cmd == STATISTICS_NOTIFICATION)) {</div><div class='hunk'>@@ -648,8 +643,8 @@ static void iwlagn_pass_packet_to_mac80211(struct iwl_priv *priv,</div><div class='ctx'> 	fraglen = len - hdrlen;</div><div class='ctx'> </div><div class='ctx'> 	if (fraglen) {</div><div class='del'>-		int offset = (void *)hdr + hdrlen -</div><div class='del'>-			     rxb_addr(rxb) + rxb_offset(rxb);</div><div class='add'>+		int offset = (u8 *)hdr + hdrlen -</div><div class='add'>+			     (u8 *)rxb_addr(rxb) + rxb_offset(rxb);</div><div class='ctx'> </div><div class='ctx'> 		skb_add_rx_frag(skb, 0, rxb_steal_page(rxb), offset,</div><div class='ctx'> 				fraglen, rxb-&gt;truesize);</div><div class='hunk'>@@ -920,7 +915,7 @@ static void iwlagn_rx_noa_notification(struct iwl_priv *priv,</div><div class='ctx'> 		len += 1 + 2;</div><div class='ctx'> 		copylen += 1 + 2;</div><div class='ctx'> </div><div class='del'>-		new_data = kmalloc(sizeof(*new_data) + len, GFP_ATOMIC);</div><div class='add'>+		new_data = kmalloc(struct_size(new_data, data, len), GFP_ATOMIC);</div><div class='ctx'> 		if (new_data) {</div><div class='ctx'> 			new_data-&gt;length = len;</div><div class='ctx'> 			new_data-&gt;data[0] = WLAN_EID_VENDOR_SPECIFIC;</div><div class='hunk'>@@ -1020,8 +1015,7 @@ void iwl_rx_dispatch(struct iwl_op_mode *op_mode, struct napi_struct *napi,</div><div class='ctx'> 		/* No handling needed */</div><div class='ctx'> 		IWL_DEBUG_RX(priv, "No handler needed for %s, 0x%02x\n",</div><div class='ctx'> 			     iwl_get_cmd_string(priv-&gt;trans,</div><div class='del'>-						iwl_cmd_id(pkt-&gt;hdr.cmd,</div><div class='del'>-							   0, 0)),</div><div class='add'>+						WIDE_ID(0, pkt-&gt;hdr.cmd)),</div><div class='ctx'> 			     pkt-&gt;hdr.cmd);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/rxon.c b/drivers/net/wireless/intel/iwlwifi/dvm/rxon.c<br/>index 12a3d464ae64..e08e44cae434 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/rxon.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/rxon.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/rxon.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/rxon.c</a></div><div class='hunk'>@@ -1,13 +1,8 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.</div><div class='add'>+ * Copyright(c) 2003 - 2014, 2025 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2015 Intel Deutschland GmbH</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- * Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='hunk'>@@ -188,7 +183,7 @@ static int iwlagn_update_beacon(struct iwl_priv *priv,</div><div class='ctx'> 	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	dev_kfree_skb(priv-&gt;beacon_skb);</div><div class='del'>-	priv-&gt;beacon_skb = ieee80211_beacon_get(priv-&gt;hw, vif);</div><div class='add'>+	priv-&gt;beacon_skb = ieee80211_beacon_get(priv-&gt;hw, vif, 0);</div><div class='ctx'> 	if (!priv-&gt;beacon_skb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	return iwlagn_send_beacon_cmd(priv);</div><div class='hunk'>@@ -346,7 +341,7 @@ static int iwlagn_rxon_disconn(struct iwl_priv *priv,</div><div class='ctx'> 			       struct iwl_rxon_context *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct iwl_rxon_cmd *active = (void *)&amp;ctx-&gt;active;</div><div class='add'>+	struct iwl_rxon_cmd *active = (void *)(uintptr_t)&amp;ctx-&gt;active;</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;ctxid == IWL_RXON_CTX_BSS) {</div><div class='ctx'> 		ret = iwlagn_disable_bss(priv, ctx, &amp;ctx-&gt;staging);</div><div class='hunk'>@@ -446,7 +441,7 @@ static int iwlagn_rxon_connect(struct iwl_priv *priv,</div><div class='ctx'> 			       struct iwl_rxon_context *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct iwl_rxon_cmd *active = (void *)&amp;ctx-&gt;active;</div><div class='add'>+	struct iwl_rxon_cmd *active = (void *)(uintptr_t)&amp;ctx-&gt;active;</div><div class='ctx'> </div><div class='ctx'> 	/* RXON timing must be before associated RXON */</div><div class='ctx'> 	if (ctx-&gt;ctxid == IWL_RXON_CTX_BSS) {</div><div class='hunk'>@@ -567,12 +562,12 @@ int iwlagn_set_pan_params(struct iwl_priv *priv)</div><div class='ctx'> 		slot1 = bcnint - slot0;</div><div class='ctx'> </div><div class='ctx'> 		if (test_bit(STATUS_SCAN_HW, &amp;priv-&gt;status) ||</div><div class='del'>-		    (!ctx_bss-&gt;vif-&gt;bss_conf.idle &amp;&amp;</div><div class='del'>-		     !ctx_bss-&gt;vif-&gt;bss_conf.assoc)) {</div><div class='add'>+		    (!ctx_bss-&gt;vif-&gt;cfg.idle &amp;&amp;</div><div class='add'>+		     !ctx_bss-&gt;vif-&gt;cfg.assoc)) {</div><div class='ctx'> 			slot0 = dtim * bcnint * 3 - IWL_MIN_SLOT_TIME;</div><div class='ctx'> 			slot1 = IWL_MIN_SLOT_TIME;</div><div class='del'>-		} else if (!ctx_pan-&gt;vif-&gt;bss_conf.idle &amp;&amp;</div><div class='del'>-			   !ctx_pan-&gt;vif-&gt;bss_conf.assoc) {</div><div class='add'>+		} else if (!ctx_pan-&gt;vif-&gt;cfg.idle &amp;&amp;</div><div class='add'>+			   !ctx_pan-&gt;vif-&gt;cfg.assoc) {</div><div class='ctx'> 			slot1 = dtim * bcnint * 3 - IWL_MIN_SLOT_TIME;</div><div class='ctx'> 			slot0 = IWL_MIN_SLOT_TIME;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1028,7 +1023,7 @@ static void iwl_calc_basic_rates(struct iwl_priv *priv,</div><div class='ctx'> int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	/* cast away the const for active_rxon in this function */</div><div class='del'>-	struct iwl_rxon_cmd *active = (void *)&amp;ctx-&gt;active;</div><div class='add'>+	struct iwl_rxon_cmd *active = (void *)(uintptr_t)&amp;ctx-&gt;active;</div><div class='ctx'> 	bool new_assoc = !!(ctx-&gt;staging.filter_flags &amp; RXON_FILTER_ASSOC_MSK);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1154,7 +1149,7 @@ void iwlagn_config_ht40(struct ieee80211_conf *conf,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+int iwlagn_mac_config(struct ieee80211_hw *hw, int radio_idx, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);</div><div class='ctx'> 	struct iwl_rxon_context *ctx;</div><div class='hunk'>@@ -1285,7 +1280,7 @@ static void iwlagn_check_needed_chains(struct iwl_priv *priv,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ht_cap = &amp;sta-&gt;ht_cap;</div><div class='add'>+		ht_cap = &amp;sta-&gt;deflink.ht_cap;</div><div class='ctx'> </div><div class='ctx'> 		need_multiple = true;</div><div class='ctx'> </div><div class='hunk'>@@ -1388,7 +1383,7 @@ static void iwlagn_chain_noise_reset(struct iwl_priv *priv)</div><div class='ctx'> void iwlagn_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 			     struct ieee80211_vif *vif,</div><div class='ctx'> 			     struct ieee80211_bss_conf *bss_conf,</div><div class='del'>-			     u32 changes)</div><div class='add'>+			     u64 changes)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);</div><div class='ctx'> 	struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);</div><div class='hunk'>@@ -1397,7 +1392,7 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	if (changes &amp; BSS_CHANGED_IDLE &amp;&amp; bss_conf-&gt;idle) {</div><div class='add'>+	if (changes &amp; BSS_CHANGED_IDLE &amp;&amp; vif-&gt;cfg.idle) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If we go idle, then clearly no "passive-no-rx"</div><div class='ctx'> 		 * workaround is needed any more, this is a reset.</div><div class='hunk'>@@ -1425,14 +1420,14 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 		iwlagn_update_qos(priv, ctx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;staging.assoc_id = cpu_to_le16(vif-&gt;bss_conf.aid);</div><div class='add'>+	ctx-&gt;staging.assoc_id = cpu_to_le16(vif-&gt;cfg.aid);</div><div class='ctx'> 	if (vif-&gt;bss_conf.use_short_preamble)</div><div class='ctx'> 		ctx-&gt;staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='ctx'> 	else</div><div class='ctx'> 		ctx-&gt;staging.flags &amp;= ~RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='ctx'> </div><div class='ctx'> 	if (changes &amp; BSS_CHANGED_ASSOC) {</div><div class='del'>-		if (bss_conf-&gt;assoc) {</div><div class='add'>+		if (vif-&gt;cfg.assoc) {</div><div class='ctx'> 			priv-&gt;timestamp = bss_conf-&gt;sync_tsf;</div><div class='ctx'> 			ctx-&gt;staging.filter_flags |= RXON_FILTER_ASSOC_MSK;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -1488,7 +1483,7 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='del'>-		if (!bss_conf-&gt;assoc)</div><div class='add'>+		if (!vif-&gt;cfg.assoc)</div><div class='ctx'> 			ctx-&gt;staging.filter_flags |= RXON_FILTER_BCON_AWARE_MSK;</div><div class='ctx'> 		else</div><div class='ctx'> 			ctx-&gt;staging.filter_flags &amp;=</div><div class='hunk'>@@ -1498,7 +1493,7 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (force || memcmp(&amp;ctx-&gt;staging, &amp;ctx-&gt;active, sizeof(ctx-&gt;staging)))</div><div class='ctx'> 		iwlagn_commit_rxon(priv, ctx);</div><div class='ctx'> </div><div class='del'>-	if (changes &amp; BSS_CHANGED_ASSOC &amp;&amp; bss_conf-&gt;assoc) {</div><div class='add'>+	if (changes &amp; BSS_CHANGED_ASSOC &amp;&amp; vif-&gt;cfg.assoc) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The chain noise calibration will enable PM upon</div><div class='ctx'> 		 * completion. If calibration has already been run</div><div class='hunk'>@@ -1514,10 +1509,10 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	if (changes &amp; BSS_CHANGED_IBSS) {</div><div class='ctx'> 		ret = iwlagn_manage_ibss_station(priv, vif,</div><div class='del'>-						 bss_conf-&gt;ibss_joined);</div><div class='add'>+						 vif-&gt;cfg.ibss_joined);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			IWL_ERR(priv, "failed to %s IBSS station %pM\n",</div><div class='del'>-				bss_conf-&gt;ibss_joined ? "add" : "remove",</div><div class='add'>+				vif-&gt;cfg.ibss_joined ? "add" : "remove",</div><div class='ctx'> 				bss_conf-&gt;bssid);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/scan.c b/drivers/net/wireless/intel/iwlwifi/dvm/scan.c<br/>index c4ecf6ed2186..a7e85c5c8c72 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/scan.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/scan.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/scan.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/scan.c</a></div><div class='hunk'>@@ -3,10 +3,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2018        Intel Corporation</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -630,7 +626,7 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)</div><div class='ctx'> 	u8 active_chains;</div><div class='ctx'> 	u8 scan_tx_antennas = priv-&gt;nvm_data-&gt;valid_tx_ant;</div><div class='ctx'> 	int ret;</div><div class='del'>-	int scan_cmd_size = sizeof(struct iwl_scan_cmd) +</div><div class='add'>+	size_t scan_cmd_size = sizeof(struct iwl_scan_cmd) +</div><div class='ctx'> 			    MAX_SCAN_CHANNEL * sizeof(struct iwl_scan_channel) +</div><div class='ctx'> 			    priv-&gt;fw-&gt;ucode_capa.max_probe_length;</div><div class='ctx'> 	const u8 *ssid = NULL;</div><div class='hunk'>@@ -653,9 +649,15 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)</div><div class='ctx'> 				       "fail to allocate memory for scan\n");</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='add'>+		priv-&gt;scan_cmd_size = scan_cmd_size;</div><div class='add'>+	}</div><div class='add'>+	if (priv-&gt;scan_cmd_size &lt; scan_cmd_size) {</div><div class='add'>+		IWL_DEBUG_SCAN(priv,</div><div class='add'>+			       "memory needed for scan grew unexpectedly\n");</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	scan = priv-&gt;scan_cmd;</div><div class='del'>-	memset(scan, 0, scan_cmd_size);</div><div class='add'>+	memset(scan, 0, priv-&gt;scan_cmd_size);</div><div class='ctx'> </div><div class='ctx'> 	scan-&gt;quiet_plcp_th = IWL_PLCP_QUIET_THRESH;</div><div class='ctx'> 	scan-&gt;quiet_time = IWL_ACTIVE_QUIET_TIME;</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/sta.c b/drivers/net/wireless/intel/iwlwifi/dvm/sta.c<br/>index ddc14059b07d..8b01ab986cb1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/sta.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/sta.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/sta.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/sta.c</a></div><div class='hunk'>@@ -1,15 +1,10 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.</div><div class='add'>+ * Copyright(c) 2003 - 2014, 2022 Intel Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Portions of this file are derived from the ipw3945 project, as well</div><div class='ctx'>  * as portions of the ieee80211 subsystem header files.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='hunk'>@@ -144,7 +139,7 @@ bool iwl_is_ht40_tx_allowed(struct iwl_priv *priv,</div><div class='ctx'> 	if (!sta)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	return sta-&gt;bandwidth &gt;= IEEE80211_STA_RX_BW_40;</div><div class='add'>+	return sta-&gt;deflink.bandwidth &gt;= IEEE80211_STA_RX_BW_40;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_sta_calc_ht_flags(struct iwl_priv *priv,</div><div class='hunk'>@@ -152,7 +147,7 @@ static void iwl_sta_calc_ht_flags(struct iwl_priv *priv,</div><div class='ctx'> 				  struct iwl_rxon_context *ctx,</div><div class='ctx'> 				  __le32 *flags, __le32 *mask)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sta_ht_cap *sta_ht_inf = &amp;sta-&gt;ht_cap;</div><div class='add'>+	struct ieee80211_sta_ht_cap *sta_ht_inf = &amp;sta-&gt;deflink.ht_cap;</div><div class='ctx'> </div><div class='ctx'> 	*mask = STA_FLG_RTS_MIMO_PROT_MSK |</div><div class='ctx'> 		STA_FLG_MIMO_DIS_MSK |</div><div class='hunk'>@@ -166,12 +161,12 @@ static void iwl_sta_calc_ht_flags(struct iwl_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_INFO(priv, "STA %pM SM PS mode: %s\n",</div><div class='ctx'> 			sta-&gt;addr,</div><div class='del'>-			(sta-&gt;smps_mode == IEEE80211_SMPS_STATIC) ?</div><div class='add'>+			(sta-&gt;deflink.smps_mode == IEEE80211_SMPS_STATIC) ?</div><div class='ctx'> 			"static" :</div><div class='del'>-			(sta-&gt;smps_mode == IEEE80211_SMPS_DYNAMIC) ?</div><div class='add'>+			(sta-&gt;deflink.smps_mode == IEEE80211_SMPS_DYNAMIC) ?</div><div class='ctx'> 			"dynamic" : "disabled");</div><div class='ctx'> </div><div class='del'>-	switch (sta-&gt;smps_mode) {</div><div class='add'>+	switch (sta-&gt;deflink.smps_mode) {</div><div class='ctx'> 	case IEEE80211_SMPS_STATIC:</div><div class='ctx'> 		*flags |= STA_FLG_MIMO_DIS_MSK;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -181,7 +176,7 @@ static void iwl_sta_calc_ht_flags(struct iwl_priv *priv,</div><div class='ctx'> 	case IEEE80211_SMPS_OFF:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		IWL_WARN(priv, "Invalid MIMO PS mode %d\n", sta-&gt;smps_mode);</div><div class='add'>+		IWL_WARN(priv, "Invalid MIMO PS mode %d\n", sta-&gt;deflink.smps_mode);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1086,6 +1081,7 @@ static int iwlagn_send_sta_key(struct iwl_priv *priv,</div><div class='ctx'> {</div><div class='ctx'> 	__le16 key_flags;</div><div class='ctx'> 	struct iwl_addsta_cmd sta_cmd;</div><div class='add'>+	size_t to_copy;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;priv-&gt;sta_lock);</div><div class='hunk'>@@ -1105,7 +1101,9 @@ static int iwlagn_send_sta_key(struct iwl_priv *priv,</div><div class='ctx'> 		sta_cmd.key.tkip_rx_tsc_byte2 = tkip_iv32;</div><div class='ctx'> 		for (i = 0; i &lt; 5; i++)</div><div class='ctx'> 			sta_cmd.key.tkip_rx_ttak[i] = cpu_to_le16(tkip_p1k[i]);</div><div class='del'>-		memcpy(sta_cmd.key.key, keyconf-&gt;key, keyconf-&gt;keylen);</div><div class='add'>+		/* keyconf may contain MIC rx/tx keys which iwl does not use */</div><div class='add'>+		to_copy = min_t(size_t, sizeof(sta_cmd.key.key), keyconf-&gt;keylen);</div><div class='add'>+		memcpy(sta_cmd.key.key, keyconf-&gt;key, to_copy);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_WEP104:</div><div class='ctx'> 		key_flags |= STA_KEY_FLG_KEY_SIZE_MSK;</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/tt.c b/drivers/net/wireless/intel/iwlwifi/dvm/tt.c<br/>index 2684a924ba57..96831ce8da6f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/tt.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/tt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/tt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/tt.c</a></div><div class='hunk'>@@ -6,10 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Portions of this file are derived from the ipw3945 project, as well</div><div class='ctx'>  * as portions of the ieee80211 subsystem header files.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -128,17 +124,6 @@ enum iwl_antenna_ok iwl_tx_ant_restriction(struct iwl_priv *priv)</div><div class='ctx'> 	return restriction-&gt;tx_stream;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-enum iwl_antenna_ok iwl_rx_ant_restriction(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_tt_mgmt *tt = &amp;priv-&gt;thermal_throttle;</div><div class='del'>-	struct iwl_tt_restriction *restriction;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;thermal_throttle.advanced_tt)</div><div class='del'>-		return IWL_ANT_OK_MULTI;</div><div class='del'>-	restriction = tt-&gt;restriction + tt-&gt;state;</div><div class='del'>-	return restriction-&gt;rx_stream;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define CT_KILL_EXIT_DURATION (5)	/* 5 seconds duration */</div><div class='ctx'> #define CT_KILL_WAITING_DURATION (300)	/* 300ms duration */</div><div class='ctx'> </div><div class='hunk'>@@ -152,8 +137,8 @@ enum iwl_antenna_ok iwl_rx_ant_restriction(struct iwl_priv *priv)</div><div class='ctx'>  */</div><div class='ctx'> static void iwl_tt_check_exit_ct_kill(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_priv *priv = from_timer(priv, t,</div><div class='del'>-					   thermal_throttle.ct_kill_exit_tm);</div><div class='add'>+	struct iwl_priv *priv = timer_container_of(priv, t,</div><div class='add'>+						   thermal_throttle.ct_kill_exit_tm);</div><div class='ctx'> 	struct iwl_tt_mgmt *tt = &amp;priv-&gt;thermal_throttle;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='hunk'>@@ -202,8 +187,8 @@ static void iwl_perform_ct_kill_task(struct iwl_priv *priv,</div><div class='ctx'> </div><div class='ctx'> static void iwl_tt_ready_for_ct_kill(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_priv *priv = from_timer(priv, t,</div><div class='del'>-					   thermal_throttle.ct_kill_waiting_tm);</div><div class='add'>+	struct iwl_priv *priv = timer_container_of(priv, t,</div><div class='add'>+						   thermal_throttle.ct_kill_waiting_tm);</div><div class='ctx'> 	struct iwl_tt_mgmt *tt = &amp;priv-&gt;thermal_throttle;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='hunk'>@@ -272,7 +257,7 @@ static void iwl_legacy_tt_handler(struct iwl_priv *priv, s32 temp, bool force)</div><div class='ctx'> 	tt-&gt;tt_previous_temp = temp;</div><div class='ctx'> #endif</div><div class='ctx'> 	/* stop ct_kill_waiting_tm timer */</div><div class='del'>-	del_timer_sync(&amp;priv-&gt;thermal_throttle.ct_kill_waiting_tm);</div><div class='add'>+	timer_delete_sync(&amp;priv-&gt;thermal_throttle.ct_kill_waiting_tm);</div><div class='ctx'> 	if (tt-&gt;state != old_state) {</div><div class='ctx'> 		switch (tt-&gt;state) {</div><div class='ctx'> 		case IWL_TI_0:</div><div class='hunk'>@@ -393,7 +378,7 @@ static void iwl_advance_tt_handler(struct iwl_priv *priv, s32 temp, bool force)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* stop ct_kill_waiting_tm timer */</div><div class='del'>-	del_timer_sync(&amp;priv-&gt;thermal_throttle.ct_kill_waiting_tm);</div><div class='add'>+	timer_delete_sync(&amp;priv-&gt;thermal_throttle.ct_kill_waiting_tm);</div><div class='ctx'> 	if (changed) {</div><div class='ctx'> 		if (tt-&gt;state &gt;= IWL_TI_1) {</div><div class='ctx'> 			/* force PI = IWL_POWER_INDEX_5 in the case of TI &gt; 0 */</div><div class='hunk'>@@ -521,7 +506,7 @@ static void iwl_bg_ct_exit(struct work_struct *work)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* stop ct_kill_exit_tm timer */</div><div class='del'>-	del_timer_sync(&amp;priv-&gt;thermal_throttle.ct_kill_exit_tm);</div><div class='add'>+	timer_delete_sync(&amp;priv-&gt;thermal_throttle.ct_kill_exit_tm);</div><div class='ctx'> </div><div class='ctx'> 	if (tt-&gt;state == IWL_TI_CT_KILL) {</div><div class='ctx'> 		IWL_ERR(priv,</div><div class='hunk'>@@ -655,9 +640,9 @@ void iwl_tt_exit(struct iwl_priv *priv)</div><div class='ctx'> 	struct iwl_tt_mgmt *tt = &amp;priv-&gt;thermal_throttle;</div><div class='ctx'> </div><div class='ctx'> 	/* stop ct_kill_exit_tm timer if activated */</div><div class='del'>-	del_timer_sync(&amp;priv-&gt;thermal_throttle.ct_kill_exit_tm);</div><div class='add'>+	timer_delete_sync(&amp;priv-&gt;thermal_throttle.ct_kill_exit_tm);</div><div class='ctx'> 	/* stop ct_kill_waiting_tm timer if activated */</div><div class='del'>-	del_timer_sync(&amp;priv-&gt;thermal_throttle.ct_kill_waiting_tm);</div><div class='add'>+	timer_delete_sync(&amp;priv-&gt;thermal_throttle.ct_kill_waiting_tm);</div><div class='ctx'> 	cancel_work_sync(&amp;priv-&gt;tt_work);</div><div class='ctx'> 	cancel_work_sync(&amp;priv-&gt;ct_enter);</div><div class='ctx'> 	cancel_work_sync(&amp;priv-&gt;ct_exit);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/tt.h b/drivers/net/wireless/intel/iwlwifi/dvm/tt.h<br/>index 3b0ff458a158..198f934a0d16 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/tt.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/tt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/tt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/tt.h</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.</div><div class='add'>+ * Copyright(c) 2007 - 2014, 2023-2024 Intel Corporation. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Portions of this file are derived from the ipw3945 project, as well</div><div class='ctx'>  * as portions of the ieee80211 subsystem header files.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> #ifndef __iwl_tt_setting_h__</div><div class='ctx'> #define __iwl_tt_setting_h__</div><div class='hunk'>@@ -68,7 +64,7 @@ struct iwl_tt_trans {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_tt_mgnt - Thermal Throttling Management structure</div><div class='add'>+ * struct iwl_tt_mgmt - Thermal Throttling Management structure</div><div class='ctx'>  * @advanced_tt:    advanced thermal throttle required</div><div class='ctx'>  * @state:          current Thermal Throttling state</div><div class='ctx'>  * @tt_power_mode:  Thermal Throttling power mode index</div><div class='hunk'>@@ -76,14 +72,15 @@ struct iwl_tt_trans {</div><div class='ctx'>  *		    when thermal throttling state != IWL_TI_0</div><div class='ctx'>  *		    the tt_power_mode should set to different</div><div class='ctx'>  *		    power mode based on the current tt state</div><div class='del'>- * @tt_previous_temperature: last measured temperature</div><div class='del'>- * @iwl_tt_restriction: ptr to restriction tbl, used by advance</div><div class='add'>+ * @tt_previous_temp: last measured temperature</div><div class='add'>+ * @restriction: ptr to restriction tbl, used by advance</div><div class='ctx'>  *		    thermal throttling to determine how many tx/rx streams</div><div class='ctx'>  *		    should be used in tt state; and can HT be enabled or not</div><div class='del'>- * @iwl_tt_trans: ptr to adv trans table, used by advance thermal throttling</div><div class='add'>+ * @transaction: ptr to adv trans table, used by advance thermal throttling</div><div class='ctx'>  *		    state transaction</div><div class='ctx'>  * @ct_kill_toggle: used to toggle the CSR bit when checking uCode temperature</div><div class='ctx'>  * @ct_kill_exit_tm: timer to exit thermal kill</div><div class='add'>+ * @ct_kill_waiting_tm: timer to enter thermal kill</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_tt_mgmt {</div><div class='ctx'> 	enum iwl_tt_state state;</div><div class='hunk'>@@ -103,7 +100,6 @@ u8 iwl_tt_current_power_mode(struct iwl_priv *priv);</div><div class='ctx'> bool iwl_tt_is_low_power_state(struct iwl_priv *priv);</div><div class='ctx'> bool iwl_ht_enabled(struct iwl_priv *priv);</div><div class='ctx'> enum iwl_antenna_ok iwl_tx_ant_restriction(struct iwl_priv *priv);</div><div class='del'>-enum iwl_antenna_ok iwl_rx_ant_restriction(struct iwl_priv *priv);</div><div class='ctx'> void iwl_tt_enter_ct_kill(struct iwl_priv *priv);</div><div class='ctx'> void iwl_tt_exit_ct_kill(struct iwl_priv *priv);</div><div class='ctx'> void iwl_tt_handler(struct iwl_priv *priv);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/tx.c b/drivers/net/wireless/intel/iwlwifi/dvm/tx.c<br/>index 847b8e07f81c..a7806776a51e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/tx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/tx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/tx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/tx.c</a></div><div class='hunk'>@@ -3,11 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright (C) 2019 Intel Corporation</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='add'>+ * Copyright (C) 2023, 2025 Intel Corporation</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -236,6 +232,8 @@ static void iwlagn_tx_cmd_build_hwcrypto(struct iwl_priv *priv,</div><div class='ctx'>  * that may be %NULL, for example during TX or key setup. In</div><div class='ctx'>  * that case, we need to use the broadcast station, so this</div><div class='ctx'>  * inline wraps that pattern.</div><div class='add'>+ *</div><div class='add'>+ * Return: station ID for mac80211 station (or broadcast if %NULL)</div><div class='ctx'>  */</div><div class='ctx'> static int iwl_sta_id_or_broadcast(struct iwl_rxon_context *context,</div><div class='ctx'> 				   struct ieee80211_sta *sta)</div><div class='hunk'>@@ -467,7 +465,7 @@ static int iwlagn_alloc_agg_txq(struct iwl_priv *priv, int mq)</div><div class='ctx'> 	int q;</div><div class='ctx'> </div><div class='ctx'> 	for (q = IWLAGN_FIRST_AMPDU_QUEUE;</div><div class='del'>-	     q &lt; priv-&gt;trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues; q++) {</div><div class='add'>+	     q &lt; priv-&gt;trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues; q++) {</div><div class='ctx'> 		if (!test_and_set_bit(q, priv-&gt;agg_q_alloc)) {</div><div class='ctx'> 			priv-&gt;queue_to_mac80211[q] = mq;</div><div class='ctx'> 			return q;</div><div class='hunk'>@@ -1174,7 +1172,7 @@ void iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> 			iwlagn_check_ratid_empty(priv, sta_id, tid);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		iwl_trans_reclaim(priv-&gt;trans, txq_id, ssn, &amp;skbs);</div><div class='add'>+		iwl_trans_reclaim(priv-&gt;trans, txq_id, ssn, &amp;skbs, false);</div><div class='ctx'> </div><div class='ctx'> 		freed = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1252,7 +1250,7 @@ void iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> </div><div class='ctx'> 	while (!skb_queue_empty(&amp;skbs)) {</div><div class='ctx'> 		skb = __skb_dequeue(&amp;skbs);</div><div class='del'>-		ieee80211_tx_status(priv-&gt;hw, skb);</div><div class='add'>+		ieee80211_tx_status_skb(priv-&gt;hw, skb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1281,7 +1279,7 @@ void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,</div><div class='ctx'> 	 * (in Tx queue's circular buffer) of first TFD/frame in window */</div><div class='ctx'> 	u16 ba_resp_scd_ssn = le16_to_cpu(ba_resp-&gt;scd_ssn);</div><div class='ctx'> </div><div class='del'>-	if (scd_flow &gt;= priv-&gt;trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues) {</div><div class='add'>+	if (scd_flow &gt;= priv-&gt;trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues) {</div><div class='ctx'> 		IWL_ERR(priv,</div><div class='ctx'> 			"BUG_ON scd_flow is bigger than number of queues\n");</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1320,7 +1318,7 @@ void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,</div><div class='ctx'> 	 * block-ack window (we assume that they've been successfully</div><div class='ctx'> 	 * transmitted ... if not, it's too late anyway). */</div><div class='ctx'> 	iwl_trans_reclaim(priv-&gt;trans, scd_flow, ba_resp_scd_ssn,</div><div class='del'>-			  &amp;reclaimed_skbs);</div><div class='add'>+			  &amp;reclaimed_skbs, false);</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_TX_REPLY(priv, "REPLY_COMPRESSED_BA [%d] Received from %pM, "</div><div class='ctx'> 			   "sta_id = %d\n",</div><div class='hunk'>@@ -1389,6 +1387,6 @@ void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	while (!skb_queue_empty(&amp;reclaimed_skbs)) {</div><div class='ctx'> 		skb = __skb_dequeue(&amp;reclaimed_skbs);</div><div class='del'>-		ieee80211_tx_status(priv-&gt;hw, skb);</div><div class='add'>+		ieee80211_tx_status_skb(priv-&gt;hw, skb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c b/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c<br/>index 24194c791218..ac90191a3973 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/dvm/ucode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/dvm/ucode.c</a></div><div class='hunk'>@@ -3,11 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2015 Intel Deutschland GmbH</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='add'>+ * Copyright (C) 2025 Intel Corporation</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -227,7 +223,7 @@ static int iwl_alive_notify(struct iwl_priv *priv)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	iwl_trans_fw_alive(priv-&gt;trans, 0);</div><div class='add'>+	iwl_trans_fw_alive(priv-&gt;trans);</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;fw-&gt;ucode_capa.flags &amp; IWL_UCODE_TLV_FLAGS_PAN &amp;&amp;</div><div class='ctx'> 	    priv-&gt;nvm_data-&gt;sku_cap_ipan_enable) {</div><div class='hunk'>@@ -298,15 +294,10 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_notification_wait alive_wait;</div><div class='ctx'> 	struct iwl_alive_data alive_data;</div><div class='del'>-	const struct fw_img *fw;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	enum iwl_ucode_type old_type;</div><div class='ctx'> 	static const u16 alive_cmd[] = { REPLY_ALIVE };</div><div class='ctx'> </div><div class='del'>-	fw = iwl_get_ucode_image(priv-&gt;fw, ucode_type);</div><div class='del'>-	if (WARN_ON(!fw))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	old_type = priv-&gt;cur_ucode;</div><div class='ctx'> 	priv-&gt;cur_ucode = ucode_type;</div><div class='ctx'> 	priv-&gt;ucode_loaded = false;</div><div class='hunk'>@@ -315,7 +306,7 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv,</div><div class='ctx'> 				   alive_cmd, ARRAY_SIZE(alive_cmd),</div><div class='ctx'> 				   iwl_alive_fn, &amp;alive_data);</div><div class='ctx'> </div><div class='del'>-	ret = iwl_trans_start_fw(priv-&gt;trans, fw, false);</div><div class='add'>+	ret = iwl_trans_start_fw(priv-&gt;trans, priv-&gt;fw, ucode_type, false);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		priv-&gt;cur_ucode = old_type;</div><div class='ctx'> 		iwl_remove_notification(&amp;priv-&gt;notif_wait, &amp;alive_wait);</div><div class='hunk'>@@ -361,18 +352,18 @@ static bool iwlagn_wait_calib(struct iwl_notif_wait_data *notif_wait,</div><div class='ctx'> 			      struct iwl_rx_packet *pkt, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_priv *priv = data;</div><div class='del'>-	struct iwl_calib_hdr *hdr;</div><div class='add'>+	struct iwl_calib_cmd *cmd;</div><div class='ctx'> </div><div class='ctx'> 	if (pkt-&gt;hdr.cmd != CALIBRATION_RES_NOTIFICATION) {</div><div class='ctx'> 		WARN_ON(pkt-&gt;hdr.cmd != CALIBRATION_COMPLETE_NOTIFICATION);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hdr = (struct iwl_calib_hdr *)pkt-&gt;data;</div><div class='add'>+	cmd = (struct iwl_calib_cmd *)pkt-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if (iwl_calib_set(priv, hdr, iwl_rx_packet_payload_len(pkt)))</div><div class='add'>+	if (iwl_calib_set(priv, cmd, iwl_rx_packet_payload_len(pkt)))</div><div class='ctx'> 		IWL_ERR(priv, "Failed to record calibration data %d\n",</div><div class='del'>-			hdr-&gt;op_code);</div><div class='add'>+			cmd-&gt;hdr.op_code);</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c<br/>index e31bba836c6f..52edc19d8cdd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/acpi.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/acpi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/acpi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/acpi.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2019-2021 Intel Corporation</div><div class='add'>+ * Copyright (C) 2019-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/uuid.h&gt;</div><div class='ctx'> #include "iwl-drv.h"</div><div class='hunk'>@@ -9,15 +9,26 @@</div><div class='ctx'> #include "acpi.h"</div><div class='ctx'> #include "fw/runtime.h"</div><div class='ctx'> </div><div class='del'>-const guid_t iwl_guid = GUID_INIT(0xF21202BF, 0x8F78, 0x4DC6,</div><div class='del'>-				  0xA5, 0xB3, 0x1F, 0x73,</div><div class='del'>-				  0x8E, 0x28, 0x5A, 0xDE);</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_guid);</div><div class='del'>-</div><div class='del'>-const guid_t iwl_rfi_guid = GUID_INIT(0x7266172C, 0x220B, 0x4B29,</div><div class='del'>-				      0x81, 0x4F, 0x75, 0xE4,</div><div class='del'>-				      0xDD, 0x26, 0xB5, 0xFD);</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_rfi_guid);</div><div class='add'>+static const guid_t iwl_guid = GUID_INIT(0xF21202BF, 0x8F78, 0x4DC6,</div><div class='add'>+					 0xA5, 0xB3, 0x1F, 0x73,</div><div class='add'>+					 0x8E, 0x28, 0x5A, 0xDE);</div><div class='add'>+</div><div class='add'>+static const size_t acpi_dsm_size[DSM_FUNC_NUM_FUNCS] = {</div><div class='add'>+	[DSM_FUNC_QUERY] =			sizeof(u32),</div><div class='add'>+	[DSM_FUNC_DISABLE_SRD] =		sizeof(u8),</div><div class='add'>+	[DSM_FUNC_ENABLE_INDONESIA_5G2] =	sizeof(u8),</div><div class='add'>+	[DSM_FUNC_ENABLE_6E] =			sizeof(u32),</div><div class='add'>+	[DSM_FUNC_REGULATORY_CONFIG] =		sizeof(u32),</div><div class='add'>+	/* Not supported in driver */</div><div class='add'>+	[5] =					(size_t)0,</div><div class='add'>+	[DSM_FUNC_11AX_ENABLEMENT] =		sizeof(u32),</div><div class='add'>+	[DSM_FUNC_ENABLE_UNII4_CHAN] =		sizeof(u32),</div><div class='add'>+	[DSM_FUNC_ACTIVATE_CHANNEL] =		sizeof(u32),</div><div class='add'>+	[DSM_FUNC_FORCE_DISABLE_CHANNELS] =	sizeof(u32),</div><div class='add'>+	[DSM_FUNC_ENERGY_DETECTION_THRESHOLD] =	sizeof(u32),</div><div class='add'>+	[DSM_FUNC_RFI_CONFIG] =			sizeof(u32),</div><div class='add'>+	[DSM_FUNC_ENABLE_11BE] =		sizeof(u32),</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static int iwl_acpi_get_handle(struct device *dev, acpi_string method,</div><div class='ctx'> 			       acpi_handle *ret_handle)</div><div class='hunk'>@@ -41,7 +52,7 @@ static int iwl_acpi_get_handle(struct device *dev, acpi_string method,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void *iwl_acpi_get_object(struct device *dev, acpi_string method)</div><div class='add'>+static void *iwl_acpi_get_object(struct device *dev, acpi_string method)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL};</div><div class='ctx'> 	acpi_handle handle;</div><div class='hunk'>@@ -62,16 +73,15 @@ void *iwl_acpi_get_object(struct device *dev, acpi_string method)</div><div class='ctx'> 	}</div><div class='ctx'> 	return buf.pointer;</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_acpi_get_object);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Generic function for evaluating a method defined in the device specific</div><div class='ctx'>  * method (DSM) interface. The returned acpi object must be freed by calling</div><div class='ctx'>  * function.</div><div class='ctx'>  */</div><div class='del'>-static void *iwl_acpi_get_dsm_object(struct device *dev, int rev, int func,</div><div class='del'>-				     union acpi_object *args,</div><div class='del'>-				     const guid_t *guid)</div><div class='add'>+union acpi_object *iwl_acpi_get_dsm_object(struct device *dev, int rev,</div><div class='add'>+					   int func, union acpi_object *args,</div><div class='add'>+					   const guid_t *guid)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_object *obj;</div><div class='ctx'> </div><div class='hunk'>@@ -98,7 +108,7 @@ static int iwl_acpi_get_dsm_integer(struct device *dev, int rev, int func,</div><div class='ctx'> 				    size_t expected_size)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_object *obj;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	obj = iwl_acpi_get_dsm_object(dev, rev, func, NULL, guid);</div><div class='ctx'> 	if (IS_ERR(obj)) {</div><div class='hunk'>@@ -113,8 +123,10 @@ static int iwl_acpi_get_dsm_integer(struct device *dev, int rev, int func,</div><div class='ctx'> 	} else if (obj-&gt;type == ACPI_TYPE_BUFFER) {</div><div class='ctx'> 		__le64 le_value = 0;</div><div class='ctx'> </div><div class='del'>-		if (WARN_ON_ONCE(expected_size &gt; sizeof(le_value)))</div><div class='del'>-			return -EINVAL;</div><div class='add'>+		if (WARN_ON_ONCE(expected_size &gt; sizeof(le_value))) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* if the buffer size doesn't match the expected size */</div><div class='ctx'> 		if (obj-&gt;buffer.length != expected_size)</div><div class='hunk'>@@ -135,37 +147,80 @@ static int iwl_acpi_get_dsm_integer(struct device *dev, int rev, int func,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_DEV_RADIO(dev,</div><div class='del'>-			    "ACPI: DSM method evaluated: func=%d, ret=%d\n",</div><div class='del'>-			    func, ret);</div><div class='add'>+			    "ACPI: DSM method evaluated: func=%d, value=%lld\n",</div><div class='add'>+			    func, *value);</div><div class='add'>+	ret = 0;</div><div class='ctx'> out:</div><div class='ctx'> 	ACPI_FREE(obj);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Evaluate a DSM with no arguments and a u8 return value,</div><div class='add'>+ * This function receives a DSM function number, calculates its expected size</div><div class='add'>+ * according to Intel BIOS spec, and fills in the value in a 32-bit field.</div><div class='add'>+ * In case the expected size is smaller than 32-bit, padding will be added.</div><div class='ctx'>  */</div><div class='del'>-int iwl_acpi_get_dsm_u8(struct device *dev, int rev, int func,</div><div class='del'>-			const guid_t *guid, u8 *value)</div><div class='add'>+int iwl_acpi_get_dsm(struct iwl_fw_runtime *fwrt,</div><div class='add'>+		     enum iwl_dsm_funcs func, u32 *value)</div><div class='ctx'> {</div><div class='add'>+	size_t expected_size;</div><div class='add'>+	u64 tmp;</div><div class='ctx'> 	int ret;</div><div class='del'>-	u64 val;</div><div class='ctx'> </div><div class='del'>-	ret = iwl_acpi_get_dsm_integer(dev, rev, func,</div><div class='del'>-				       guid, &amp;val, sizeof(u8));</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(acpi_dsm_size) != DSM_FUNC_NUM_FUNCS);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(func &gt;= ARRAY_SIZE(acpi_dsm_size) || !func))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	expected_size = acpi_dsm_size[func];</div><div class='ctx'> </div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	/* Currently all ACPI DSMs are either 8-bit or 32-bit */</div><div class='add'>+	if (expected_size != sizeof(u8) &amp;&amp; expected_size != sizeof(u32))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!fwrt-&gt;acpi_dsm_funcs_valid) {</div><div class='add'>+		ret = iwl_acpi_get_dsm_integer(fwrt-&gt;dev, ACPI_DSM_REV,</div><div class='add'>+					       DSM_FUNC_QUERY,</div><div class='add'>+					       &amp;iwl_guid, &amp;tmp,</div><div class='add'>+					       acpi_dsm_size[DSM_FUNC_QUERY]);</div><div class='add'>+		if (ret) {</div><div class='add'>+			/* always indicate BIT(0) to avoid re-reading */</div><div class='add'>+			fwrt-&gt;acpi_dsm_funcs_valid = BIT(0);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "ACPI DSM validity bitmap 0x%x\n",</div><div class='add'>+				(u32)tmp);</div><div class='add'>+		/* always indicate BIT(0) to avoid re-reading */</div><div class='add'>+		fwrt-&gt;acpi_dsm_funcs_valid = tmp | BIT(0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(fwrt-&gt;acpi_dsm_funcs_valid &amp; BIT(func))) {</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "ACPI DSM %d not indicated as valid\n",</div><div class='add'>+				func);</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_acpi_get_dsm_integer(fwrt-&gt;dev, ACPI_DSM_REV, func,</div><div class='add'>+				       &amp;iwl_guid, &amp;tmp, expected_size);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	/* cast val (u64) to be u8 */</div><div class='del'>-	*value = (u8)val;</div><div class='add'>+	if ((expected_size == sizeof(u8) &amp;&amp; tmp != (u8)tmp) ||</div><div class='add'>+	    (expected_size == sizeof(u32) &amp;&amp; tmp != (u32)tmp))</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt,</div><div class='add'>+				"DSM value overflows the expected size, truncating\n");</div><div class='add'>+	*value = (u32)tmp;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_acpi_get_dsm_u8);</div><div class='ctx'> </div><div class='del'>-union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,</div><div class='del'>-					 union acpi_object *data,</div><div class='del'>-					 int data_size, int *tbl_rev)</div><div class='add'>+static union acpi_object *</div><div class='add'>+iwl_acpi_get_wifi_pkg_range(struct device *dev,</div><div class='add'>+			    union acpi_object *data,</div><div class='add'>+			    int min_data_size,</div><div class='add'>+			    int max_data_size,</div><div class='add'>+			    int *tbl_rev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	union acpi_object *wifi_pkg;</div><div class='hunk'>@@ -175,7 +230,7 @@ union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,</div><div class='ctx'> 	 * describes the domain, and one more entry, otherwise there's</div><div class='ctx'> 	 * no point in reading it.</div><div class='ctx'> 	 */</div><div class='del'>-	if (WARN_ON_ONCE(data_size &lt; 2))</div><div class='add'>+	if (WARN_ON_ONCE(min_data_size &lt; 2 || min_data_size &gt; max_data_size))</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -201,7 +256,8 @@ union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 		/* skip entries that are not a package with the right size */</div><div class='ctx'> 		if (wifi_pkg-&gt;type != ACPI_TYPE_PACKAGE ||</div><div class='del'>-		    wifi_pkg-&gt;package.count != data_size)</div><div class='add'>+		    wifi_pkg-&gt;package.count &lt; min_data_size ||</div><div class='add'>+		    wifi_pkg-&gt;package.count &gt; max_data_size)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		domain = &amp;wifi_pkg-&gt;package.elements[0];</div><div class='hunk'>@@ -215,20 +271,28 @@ union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,</div><div class='ctx'> found:</div><div class='ctx'> 	return wifi_pkg;</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_acpi_get_wifi_pkg);</div><div class='ctx'> </div><div class='del'>-int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt,</div><div class='del'>-		     __le32 *block_list_array,</div><div class='del'>-		     int *block_list_size)</div><div class='add'>+static union acpi_object *</div><div class='add'>+iwl_acpi_get_wifi_pkg(struct device *dev,</div><div class='add'>+		      union acpi_object *data,</div><div class='add'>+		      int data_size, int *tbl_rev)</div><div class='add'>+{</div><div class='add'>+	return iwl_acpi_get_wifi_pkg_range(dev, data, data_size, data_size,</div><div class='add'>+					   tbl_rev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_acpi_get_tas_table(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			   struct iwl_tas_data *tas_data)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_object *wifi_pkg, *data;</div><div class='del'>-	int ret, tbl_rev, i;</div><div class='del'>-	bool enabled;</div><div class='add'>+	int ret, tbl_rev, block_list_size, enabled;</div><div class='add'>+	u32 tas_selection;</div><div class='ctx'> </div><div class='ctx'> 	data = iwl_acpi_get_object(fwrt-&gt;dev, ACPI_WTAS_METHOD);</div><div class='ctx'> 	if (IS_ERR(data))</div><div class='ctx'> 		return PTR_ERR(data);</div><div class='ctx'> </div><div class='add'>+	/* try to read wtas table */</div><div class='ctx'> 	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt-&gt;dev, data,</div><div class='ctx'> 					 ACPI_WTAS_WIFI_DATA_SIZE,</div><div class='ctx'> 					 &amp;tbl_rev);</div><div class='hunk'>@@ -237,73 +301,73 @@ int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (wifi_pkg-&gt;package.elements[0].type != ACPI_TYPE_INTEGER ||</div><div class='del'>-	    tbl_rev != 0) {</div><div class='add'>+	if (tbl_rev &lt; 0 || tbl_rev &gt; 2 ||</div><div class='add'>+	    wifi_pkg-&gt;package.elements[1].type != ACPI_TYPE_INTEGER) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	enabled = !!wifi_pkg-&gt;package.elements[0].integer.value;</div><div class='add'>+	tas_selection = (u32)wifi_pkg-&gt;package.elements[1].integer.value;</div><div class='add'>+	enabled = tas_selection &amp; IWL_WTAS_ENABLED_MSK;</div><div class='ctx'> </div><div class='del'>-	if (!enabled) {</div><div class='del'>-		*block_list_size = -1;</div><div class='del'>-		IWL_DEBUG_RADIO(fwrt, "TAS not enabled\n");</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='add'>+	IWL_DEBUG_RADIO(fwrt, "TAS selection as read from BIOS: 0x%x\n",</div><div class='add'>+			tas_selection);</div><div class='add'>+	tas_data-&gt;table_source = BIOS_SOURCE_ACPI;</div><div class='add'>+	tas_data-&gt;table_revision = tbl_rev;</div><div class='add'>+	tas_data-&gt;tas_selection = tas_selection;</div><div class='ctx'> </div><div class='del'>-	if (wifi_pkg-&gt;package.elements[1].type != ACPI_TYPE_INTEGER ||</div><div class='del'>-	    wifi_pkg-&gt;package.elements[1].integer.value &gt;</div><div class='del'>-	    APCI_WTAS_BLACK_LIST_MAX) {</div><div class='add'>+	IWL_DEBUG_RADIO(fwrt, "TAS %s enabled\n",</div><div class='add'>+			enabled ? "is" : "not");</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_RADIO(fwrt, "Reading TAS table revision %d\n", tbl_rev);</div><div class='add'>+	if (wifi_pkg-&gt;package.elements[2].type != ACPI_TYPE_INTEGER ||</div><div class='add'>+	    wifi_pkg-&gt;package.elements[2].integer.value &gt;</div><div class='add'>+	    IWL_WTAS_BLACK_LIST_MAX) {</div><div class='ctx'> 		IWL_DEBUG_RADIO(fwrt, "TAS invalid array size %llu\n",</div><div class='del'>-				wifi_pkg-&gt;package.elements[1].integer.value);</div><div class='add'>+				wifi_pkg-&gt;package.elements[2].integer.value);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='del'>-	*block_list_size = wifi_pkg-&gt;package.elements[1].integer.value;</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_RADIO(fwrt, "TAS array size %d\n", *block_list_size);</div><div class='del'>-	if (*block_list_size &gt; APCI_WTAS_BLACK_LIST_MAX) {</div><div class='del'>-		IWL_DEBUG_RADIO(fwrt, "TAS invalid array size value %u\n",</div><div class='del'>-				*block_list_size);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='add'>+	block_list_size = wifi_pkg-&gt;package.elements[2].integer.value;</div><div class='add'>+	tas_data-&gt;block_list_size = block_list_size;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_RADIO(fwrt, "TAS array size %u\n", block_list_size);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; *block_list_size; i++) {</div><div class='del'>-		u32 country;</div><div class='add'>+	for (int i = 0; i &lt; block_list_size; i++) {</div><div class='add'>+		u16 country;</div><div class='ctx'> </div><div class='del'>-		if (wifi_pkg-&gt;package.elements[2 + i].type !=</div><div class='add'>+		if (wifi_pkg-&gt;package.elements[3 + i].type !=</div><div class='ctx'> 		    ACPI_TYPE_INTEGER) {</div><div class='ctx'> 			IWL_DEBUG_RADIO(fwrt,</div><div class='del'>-					"TAS invalid array elem %d\n", 2 + i);</div><div class='add'>+					"TAS invalid array elem %d\n", 3 + i);</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			goto out_free;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		country = wifi_pkg-&gt;package.elements[2 + i].integer.value;</div><div class='del'>-		block_list_array[i] = cpu_to_le32(country);</div><div class='add'>+		country = wifi_pkg-&gt;package.elements[3 + i].integer.value;</div><div class='add'>+		tas_data-&gt;block_list_array[i] = country;</div><div class='ctx'> 		IWL_DEBUG_RADIO(fwrt, "TAS block list country %d\n", country);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = 0;</div><div class='add'>+	ret = enabled;</div><div class='ctx'> out_free:</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_acpi_get_tas);</div><div class='ctx'> </div><div class='del'>-int iwl_acpi_get_mcc(struct device *dev, char *mcc)</div><div class='add'>+int iwl_acpi_get_mcc(struct iwl_fw_runtime *fwrt, char *mcc)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_object *wifi_pkg, *data;</div><div class='ctx'> 	u32 mcc_val;</div><div class='ctx'> 	int ret, tbl_rev;</div><div class='ctx'> </div><div class='del'>-	data = iwl_acpi_get_object(dev, ACPI_WRDD_METHOD);</div><div class='add'>+	data = iwl_acpi_get_object(fwrt-&gt;dev, ACPI_WRDD_METHOD);</div><div class='ctx'> 	if (IS_ERR(data))</div><div class='ctx'> 		return PTR_ERR(data);</div><div class='ctx'> </div><div class='del'>-	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_WRDD_WIFI_DATA_SIZE,</div><div class='add'>+	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt-&gt;dev, data,</div><div class='add'>+					 ACPI_WRDD_WIFI_DATA_SIZE,</div><div class='ctx'> 					 &amp;tbl_rev);</div><div class='ctx'> 	if (IS_ERR(wifi_pkg)) {</div><div class='ctx'> 		ret = PTR_ERR(wifi_pkg);</div><div class='hunk'>@@ -317,6 +381,11 @@ int iwl_acpi_get_mcc(struct device *dev, char *mcc)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mcc_val = wifi_pkg-&gt;package.elements[1].integer.value;</div><div class='add'>+	if (mcc_val != BIOS_MCC_CHINA) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "ACPI WRDD is supported only for CN\n");</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mcc[0] = (mcc_val &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	mcc[1] = mcc_val &amp; 0xff;</div><div class='hunk'>@@ -327,46 +396,42 @@ out_free:</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_acpi_get_mcc);</div><div class='ctx'> </div><div class='del'>-u64 iwl_acpi_get_pwr_limit(struct device *dev)</div><div class='add'>+int iwl_acpi_get_pwr_limit(struct iwl_fw_runtime *fwrt, u64 *dflt_pwr_limit)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_object *data, *wifi_pkg;</div><div class='del'>-	u64 dflt_pwr_limit;</div><div class='del'>-	int tbl_rev;</div><div class='add'>+	int tbl_rev, ret = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	data = iwl_acpi_get_object(dev, ACPI_SPLC_METHOD);</div><div class='del'>-	if (IS_ERR(data)) {</div><div class='del'>-		dflt_pwr_limit = 0;</div><div class='add'>+	*dflt_pwr_limit = 0;</div><div class='add'>+	data = iwl_acpi_get_object(fwrt-&gt;dev, ACPI_SPLC_METHOD);</div><div class='add'>+	if (IS_ERR(data))</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data,</div><div class='add'>+	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt-&gt;dev, data,</div><div class='ctx'> 					 ACPI_SPLC_WIFI_DATA_SIZE, &amp;tbl_rev);</div><div class='ctx'> 	if (IS_ERR(wifi_pkg) || tbl_rev != 0 ||</div><div class='del'>-	    wifi_pkg-&gt;package.elements[1].integer.value != ACPI_TYPE_INTEGER) {</div><div class='del'>-		dflt_pwr_limit = 0;</div><div class='add'>+	    wifi_pkg-&gt;package.elements[1].integer.value != ACPI_TYPE_INTEGER)</div><div class='ctx'> 		goto out_free;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	dflt_pwr_limit = wifi_pkg-&gt;package.elements[1].integer.value;</div><div class='add'>+	*dflt_pwr_limit = wifi_pkg-&gt;package.elements[1].integer.value;</div><div class='add'>+	ret = 0;</div><div class='ctx'> out_free:</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> out:</div><div class='del'>-	return dflt_pwr_limit;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_acpi_get_pwr_limit);</div><div class='ctx'> </div><div class='del'>-int iwl_acpi_get_eckv(struct device *dev, u32 *extl_clk)</div><div class='add'>+int iwl_acpi_get_eckv(struct iwl_fw_runtime *fwrt, u32 *extl_clk)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_object *wifi_pkg, *data;</div><div class='ctx'> 	int ret, tbl_rev;</div><div class='ctx'> </div><div class='del'>-	data = iwl_acpi_get_object(dev, ACPI_ECKV_METHOD);</div><div class='add'>+	data = iwl_acpi_get_object(fwrt-&gt;dev, ACPI_ECKV_METHOD);</div><div class='ctx'> 	if (IS_ERR(data))</div><div class='ctx'> 		return PTR_ERR(data);</div><div class='ctx'> </div><div class='del'>-	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_ECKV_WIFI_DATA_SIZE,</div><div class='add'>+	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt-&gt;dev, data,</div><div class='add'>+					 ACPI_ECKV_WIFI_DATA_SIZE,</div><div class='ctx'> 					 &amp;tbl_rev);</div><div class='ctx'> 	if (IS_ERR(wifi_pkg)) {</div><div class='ctx'> 		ret = PTR_ERR(wifi_pkg);</div><div class='hunk'>@@ -387,122 +452,104 @@ out_free:</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_acpi_get_eckv);</div><div class='ctx'> </div><div class='del'>-static int iwl_sar_set_profile(union acpi_object *table,</div><div class='del'>-			       struct iwl_sar_profile *profile,</div><div class='del'>-			       bool enabled)</div><div class='add'>+static int</div><div class='add'>+iwl_acpi_parse_chains_table(union acpi_object *table,</div><div class='add'>+			    struct iwl_sar_profile_chain *chains,</div><div class='add'>+			    u8 num_chains, u8 num_sub_bands)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	profile-&gt;enabled = enabled;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ACPI_SAR_TABLE_SIZE; i++) {</div><div class='del'>-		if (table[i].type != ACPI_TYPE_INTEGER ||</div><div class='del'>-		    table[i].integer.value &gt; U8_MAX)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		profile-&gt;table[i] = table[i].integer.value;</div><div class='add'>+	for (u8 chain = 0; chain &lt; num_chains; chain++) {</div><div class='add'>+		for (u8 subband = 0; subband &lt; BIOS_SAR_MAX_SUB_BANDS_NUM;</div><div class='add'>+		     subband++) {</div><div class='add'>+			/* if we don't have the values, use the default */</div><div class='add'>+			if (subband &gt;= num_sub_bands) {</div><div class='add'>+				chains[chain].subbands[subband] = 0;</div><div class='add'>+			} else if (table-&gt;type != ACPI_TYPE_INTEGER ||</div><div class='add'>+				   table-&gt;integer.value &gt; U8_MAX) {</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			} else {</div><div class='add'>+				chains[chain].subbands[subband] =</div><div class='add'>+					table-&gt;integer.value;</div><div class='add'>+				table++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_sar_fill_table(struct iwl_fw_runtime *fwrt,</div><div class='del'>-			      __le16 *per_chain, u32 n_subbands,</div><div class='del'>-			      int prof_a, int prof_b)</div><div class='add'>+int iwl_acpi_get_wrds_table(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='del'>-	int profs[ACPI_SAR_NUM_CHAIN_LIMITS] = { prof_a, prof_b };</div><div class='del'>-	int i, j, idx;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ACPI_SAR_NUM_CHAIN_LIMITS; i++) {</div><div class='del'>-		struct iwl_sar_profile *prof;</div><div class='del'>-</div><div class='del'>-		/* don't allow SAR to be disabled (profile 0 means disable) */</div><div class='del'>-		if (profs[i] == 0)</div><div class='del'>-			return -EPERM;</div><div class='del'>-</div><div class='del'>-		/* we are off by one, so allow up to ACPI_SAR_PROFILE_NUM */</div><div class='del'>-		if (profs[i] &gt; ACPI_SAR_PROFILE_NUM)</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	union acpi_object *wifi_pkg, *table, *data;</div><div class='add'>+	int ret, tbl_rev;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u8 num_chains, num_sub_bands;</div><div class='ctx'> </div><div class='del'>-		/* profiles go from 1 to 4, so decrement to access the array */</div><div class='del'>-		prof = &amp;fwrt-&gt;sar_profiles[profs[i] - 1];</div><div class='add'>+	data = iwl_acpi_get_object(fwrt-&gt;dev, ACPI_WRDS_METHOD);</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return PTR_ERR(data);</div><div class='ctx'> </div><div class='del'>-		/* if the profile is disabled, do nothing */</div><div class='del'>-		if (!prof-&gt;enabled) {</div><div class='del'>-			IWL_DEBUG_RADIO(fwrt, "SAR profile %d is disabled.\n",</div><div class='del'>-					profs[i]);</div><div class='del'>-			/*</div><div class='del'>-			 * if one of the profiles is disabled, we</div><div class='del'>-			 * ignore all of them and return 1 to</div><div class='del'>-			 * differentiate disabled from other failures.</div><div class='del'>-			 */</div><div class='del'>-			return 1;</div><div class='add'>+	/* start by trying to read revision 2 */</div><div class='add'>+	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt-&gt;dev, data,</div><div class='add'>+					 ACPI_WRDS_WIFI_DATA_SIZE_REV2,</div><div class='add'>+					 &amp;tbl_rev);</div><div class='add'>+	if (!IS_ERR(wifi_pkg)) {</div><div class='add'>+		if (tbl_rev != 2) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out_free;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		IWL_DEBUG_INFO(fwrt,</div><div class='del'>-			       "SAR EWRD: chain %d profile index %d\n",</div><div class='del'>-			       i, profs[i]);</div><div class='del'>-		IWL_DEBUG_RADIO(fwrt, "  Chain[%d]:\n", i);</div><div class='del'>-		for (j = 0; j &lt; n_subbands; j++) {</div><div class='del'>-			idx = i * ACPI_SAR_NUM_SUB_BANDS + j;</div><div class='del'>-			per_chain[i * n_subbands + j] =</div><div class='del'>-				cpu_to_le16(prof-&gt;table[idx]);</div><div class='del'>-			IWL_DEBUG_RADIO(fwrt, "    Band[%d] = %d * .125dBm\n",</div><div class='del'>-					j, prof-&gt;table[idx]);</div><div class='del'>-		}</div><div class='add'>+		num_chains = ACPI_SAR_NUM_CHAINS_REV2;</div><div class='add'>+		num_sub_bands = ACPI_SAR_NUM_SUB_BANDS_REV2;</div><div class='add'>+</div><div class='add'>+		goto read_table;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	/* then try revision 1 */</div><div class='add'>+	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt-&gt;dev, data,</div><div class='add'>+					 ACPI_WRDS_WIFI_DATA_SIZE_REV1,</div><div class='add'>+					 &amp;tbl_rev);</div><div class='add'>+	if (!IS_ERR(wifi_pkg)) {</div><div class='add'>+		if (tbl_rev != 1) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-int iwl_sar_select_profile(struct iwl_fw_runtime *fwrt,</div><div class='del'>-			   __le16 *per_chain, u32 n_tables, u32 n_subbands,</div><div class='del'>-			   int prof_a, int prof_b)</div><div class='del'>-{</div><div class='del'>-	int i, ret = 0;</div><div class='add'>+		num_chains = ACPI_SAR_NUM_CHAINS_REV1;</div><div class='add'>+		num_sub_bands = ACPI_SAR_NUM_SUB_BANDS_REV1;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; n_tables; i++) {</div><div class='del'>-		ret = iwl_sar_fill_table(fwrt,</div><div class='del'>-			 &amp;per_chain[i * n_subbands * ACPI_SAR_NUM_CHAIN_LIMITS],</div><div class='del'>-			 n_subbands, prof_a, prof_b);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='add'>+		goto read_table;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_sar_select_profile);</div><div class='del'>-</div><div class='del'>-int iwl_sar_get_wrds_table(struct iwl_fw_runtime *fwrt)</div><div class='del'>-{</div><div class='del'>-	union acpi_object *wifi_pkg, *table, *data;</div><div class='del'>-	bool enabled;</div><div class='del'>-	int ret, tbl_rev;</div><div class='add'>+	/* then finally revision 0 */</div><div class='add'>+	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt-&gt;dev, data,</div><div class='add'>+					 ACPI_WRDS_WIFI_DATA_SIZE_REV0,</div><div class='add'>+					 &amp;tbl_rev);</div><div class='add'>+	if (!IS_ERR(wifi_pkg)) {</div><div class='add'>+		if (tbl_rev != 0) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	data = iwl_acpi_get_object(fwrt-&gt;dev, ACPI_WRDS_METHOD);</div><div class='del'>-	if (IS_ERR(data))</div><div class='del'>-		return PTR_ERR(data);</div><div class='add'>+		num_chains = ACPI_SAR_NUM_CHAINS_REV0;</div><div class='add'>+		num_sub_bands = ACPI_SAR_NUM_SUB_BANDS_REV0;</div><div class='ctx'> </div><div class='del'>-	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt-&gt;dev, data,</div><div class='del'>-					 ACPI_WRDS_WIFI_DATA_SIZE, &amp;tbl_rev);</div><div class='del'>-	if (IS_ERR(wifi_pkg)) {</div><div class='del'>-		ret = PTR_ERR(wifi_pkg);</div><div class='del'>-		goto out_free;</div><div class='add'>+		goto read_table;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (tbl_rev != 0) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='add'>+	ret = PTR_ERR(wifi_pkg);</div><div class='add'>+	goto out_free;</div><div class='ctx'> </div><div class='add'>+read_table:</div><div class='ctx'> 	if (wifi_pkg-&gt;package.elements[1].type != ACPI_TYPE_INTEGER) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	enabled = !!(wifi_pkg-&gt;package.elements[1].integer.value);</div><div class='add'>+	IWL_DEBUG_RADIO(fwrt, "Reading WRDS tbl_rev=%d\n", tbl_rev);</div><div class='add'>+</div><div class='add'>+	flags = wifi_pkg-&gt;package.elements[1].integer.value;</div><div class='add'>+	fwrt-&gt;reduced_power_flags = flags &gt;&gt; IWL_REDUCE_POWER_FLAGS_POS;</div><div class='ctx'> </div><div class='ctx'> 	/* position of the actual table */</div><div class='ctx'> 	table = &amp;wifi_pkg-&gt;package.elements[2];</div><div class='hunk'>@@ -510,36 +557,77 @@ int iwl_sar_get_wrds_table(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> 	/* The profile from WRDS is officially profile 1, but goes</div><div class='ctx'> 	 * into sar_profiles[0] (because we don't have a profile 0).</div><div class='ctx'> 	 */</div><div class='del'>-	ret = iwl_sar_set_profile(table, &amp;fwrt-&gt;sar_profiles[0], enabled);</div><div class='add'>+	ret = iwl_acpi_parse_chains_table(table, fwrt-&gt;sar_profiles[0].chains,</div><div class='add'>+					  num_chains, num_sub_bands);</div><div class='add'>+	if (!ret &amp;&amp; flags &amp; IWL_SAR_ENABLE_MSK)</div><div class='add'>+		fwrt-&gt;sar_profiles[0].enabled = true;</div><div class='add'>+</div><div class='ctx'> out_free:</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_sar_get_wrds_table);</div><div class='ctx'> </div><div class='del'>-int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt)</div><div class='add'>+int iwl_acpi_get_ewrd_table(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_object *wifi_pkg, *data;</div><div class='ctx'> 	bool enabled;</div><div class='ctx'> 	int i, n_profiles, tbl_rev, pos;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	u8 num_sub_bands;</div><div class='ctx'> </div><div class='ctx'> 	data = iwl_acpi_get_object(fwrt-&gt;dev, ACPI_EWRD_METHOD);</div><div class='ctx'> 	if (IS_ERR(data))</div><div class='ctx'> 		return PTR_ERR(data);</div><div class='ctx'> </div><div class='add'>+	/* start by trying to read revision 2 */</div><div class='ctx'> 	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt-&gt;dev, data,</div><div class='del'>-					 ACPI_EWRD_WIFI_DATA_SIZE, &amp;tbl_rev);</div><div class='del'>-	if (IS_ERR(wifi_pkg)) {</div><div class='del'>-		ret = PTR_ERR(wifi_pkg);</div><div class='del'>-		goto out_free;</div><div class='add'>+					 ACPI_EWRD_WIFI_DATA_SIZE_REV2,</div><div class='add'>+					 &amp;tbl_rev);</div><div class='add'>+	if (!IS_ERR(wifi_pkg)) {</div><div class='add'>+		if (tbl_rev != 2) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		num_sub_bands = ACPI_SAR_NUM_SUB_BANDS_REV2;</div><div class='add'>+</div><div class='add'>+		goto read_table;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (tbl_rev != 0) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out_free;</div><div class='add'>+	/* then try revision 1 */</div><div class='add'>+	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt-&gt;dev, data,</div><div class='add'>+					 ACPI_EWRD_WIFI_DATA_SIZE_REV1,</div><div class='add'>+					 &amp;tbl_rev);</div><div class='add'>+	if (!IS_ERR(wifi_pkg)) {</div><div class='add'>+		if (tbl_rev != 1) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		num_sub_bands = ACPI_SAR_NUM_SUB_BANDS_REV1;</div><div class='add'>+</div><div class='add'>+		goto read_table;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* then finally revision 0 */</div><div class='add'>+	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt-&gt;dev, data,</div><div class='add'>+					 ACPI_EWRD_WIFI_DATA_SIZE_REV0,</div><div class='add'>+					 &amp;tbl_rev);</div><div class='add'>+	if (!IS_ERR(wifi_pkg)) {</div><div class='add'>+		if (tbl_rev != 0) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		num_sub_bands = ACPI_SAR_NUM_SUB_BANDS_REV0;</div><div class='add'>+</div><div class='add'>+		goto read_table;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = PTR_ERR(wifi_pkg);</div><div class='add'>+	goto out_free;</div><div class='add'>+</div><div class='add'>+read_table:</div><div class='ctx'> 	if (wifi_pkg-&gt;package.elements[1].type != ACPI_TYPE_INTEGER ||</div><div class='ctx'> 	    wifi_pkg-&gt;package.elements[2].type != ACPI_TYPE_INTEGER) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='hunk'>@@ -554,7 +642,7 @@ int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> 	 * from index 1, so the maximum value allowed here is</div><div class='ctx'> 	 * ACPI_SAR_PROFILES_NUM - 1.</div><div class='ctx'> 	 */</div><div class='del'>-	if (n_profiles &lt;= 0 || n_profiles &gt;= ACPI_SAR_PROFILE_NUM) {</div><div class='add'>+	if (n_profiles &gt;= BIOS_SAR_MAX_PROFILE_NUM) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -562,203 +650,434 @@ int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> 	/* the tables start at element 3 */</div><div class='ctx'> 	pos = 3;</div><div class='ctx'> </div><div class='add'>+	BUILD_BUG_ON(ACPI_SAR_NUM_CHAINS_REV0 != ACPI_SAR_NUM_CHAINS_REV1);</div><div class='add'>+	BUILD_BUG_ON(ACPI_SAR_NUM_CHAINS_REV2 != 2 * ACPI_SAR_NUM_CHAINS_REV0);</div><div class='add'>+</div><div class='add'>+	/* parse non-cdb chains for all profiles */</div><div class='ctx'> 	for (i = 0; i &lt; n_profiles; i++) {</div><div class='add'>+		union acpi_object *table = &amp;wifi_pkg-&gt;package.elements[pos];</div><div class='add'>+</div><div class='ctx'> 		/* The EWRD profiles officially go from 2 to 4, but we</div><div class='ctx'> 		 * save them in sar_profiles[1-3] (because we don't</div><div class='ctx'> 		 * have profile 0).  So in the array we start from 1.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = iwl_sar_set_profile(&amp;wifi_pkg-&gt;package.elements[pos],</div><div class='del'>-					  &amp;fwrt-&gt;sar_profiles[i + 1],</div><div class='del'>-					  enabled);</div><div class='add'>+		ret = iwl_acpi_parse_chains_table(table,</div><div class='add'>+						  fwrt-&gt;sar_profiles[i + 1].chains,</div><div class='add'>+						  ACPI_SAR_NUM_CHAINS_REV0,</div><div class='add'>+						  num_sub_bands);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			break;</div><div class='add'>+			goto out_free;</div><div class='ctx'> </div><div class='ctx'> 		/* go to the next table */</div><div class='del'>-		pos += ACPI_SAR_TABLE_SIZE;</div><div class='add'>+		pos += ACPI_SAR_NUM_CHAINS_REV0 * num_sub_bands;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* non-cdb table revisions */</div><div class='add'>+	if (tbl_rev &lt; 2)</div><div class='add'>+		goto set_enabled;</div><div class='add'>+</div><div class='add'>+	/* parse cdb chains for all profiles */</div><div class='add'>+	for (i = 0; i &lt; n_profiles; i++) {</div><div class='add'>+		struct iwl_sar_profile_chain *chains;</div><div class='add'>+		union acpi_object *table;</div><div class='add'>+</div><div class='add'>+		table = &amp;wifi_pkg-&gt;package.elements[pos];</div><div class='add'>+		chains = &amp;fwrt-&gt;sar_profiles[i + 1].chains[ACPI_SAR_NUM_CHAINS_REV0];</div><div class='add'>+		ret = iwl_acpi_parse_chains_table(table,</div><div class='add'>+						  chains,</div><div class='add'>+						  ACPI_SAR_NUM_CHAINS_REV0,</div><div class='add'>+						  num_sub_bands);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out_free;</div><div class='add'>+</div><div class='add'>+		/* go to the next table */</div><div class='add'>+		pos += ACPI_SAR_NUM_CHAINS_REV0 * num_sub_bands;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+set_enabled:</div><div class='add'>+	for (i = 0; i &lt; n_profiles; i++)</div><div class='add'>+		fwrt-&gt;sar_profiles[i + 1].enabled = enabled;</div><div class='add'>+</div><div class='ctx'> out_free:</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_sar_get_ewrd_table);</div><div class='ctx'> </div><div class='del'>-int iwl_sar_get_wgds_table(struct iwl_fw_runtime *fwrt)</div><div class='add'>+int iwl_acpi_get_wgds_table(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_object *wifi_pkg, *data;</div><div class='del'>-	int i, j, ret, tbl_rev;</div><div class='del'>-	int idx = 1;</div><div class='add'>+	int i, j, k, ret, tbl_rev;</div><div class='add'>+	u8 num_bands, num_profiles;</div><div class='add'>+	static const struct {</div><div class='add'>+		u8 revisions;</div><div class='add'>+		u8 bands;</div><div class='add'>+		u8 profiles;</div><div class='add'>+		u8 min_profiles;</div><div class='add'>+	} rev_data[] = {</div><div class='add'>+		{</div><div class='add'>+			.revisions = BIT(3),</div><div class='add'>+			.bands = ACPI_GEO_NUM_BANDS_REV2,</div><div class='add'>+			.profiles = ACPI_NUM_GEO_PROFILES_REV3,</div><div class='add'>+			.min_profiles = BIOS_GEO_MIN_PROFILE_NUM,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.revisions = BIT(2),</div><div class='add'>+			.bands = ACPI_GEO_NUM_BANDS_REV2,</div><div class='add'>+			.profiles = ACPI_NUM_GEO_PROFILES,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.revisions = BIT(0) | BIT(1),</div><div class='add'>+			.bands = ACPI_GEO_NUM_BANDS_REV0,</div><div class='add'>+			.profiles = ACPI_NUM_GEO_PROFILES,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	int idx;</div><div class='add'>+	/* start from one to skip the domain */</div><div class='add'>+	int entry_idx = 1;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ACPI_NUM_GEO_PROFILES_REV3 != IWL_NUM_GEO_PROFILES_V3);</div><div class='add'>+	BUILD_BUG_ON(ACPI_NUM_GEO_PROFILES != IWL_NUM_GEO_PROFILES);</div><div class='ctx'> </div><div class='ctx'> 	data = iwl_acpi_get_object(fwrt-&gt;dev, ACPI_WGDS_METHOD);</div><div class='ctx'> 	if (IS_ERR(data))</div><div class='ctx'> 		return PTR_ERR(data);</div><div class='ctx'> </div><div class='del'>-	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt-&gt;dev, data,</div><div class='del'>-					 ACPI_WGDS_WIFI_DATA_SIZE, &amp;tbl_rev);</div><div class='add'>+	/* read the highest revision we understand first */</div><div class='add'>+	for (idx = 0; idx &lt; ARRAY_SIZE(rev_data); idx++) {</div><div class='add'>+		/* min_profiles != 0 requires num_profiles header */</div><div class='add'>+		u32 hdr_size = 1 + !!rev_data[idx].min_profiles;</div><div class='add'>+		u32 profile_size = ACPI_GEO_PER_CHAIN_SIZE *</div><div class='add'>+				   rev_data[idx].bands;</div><div class='add'>+		u32 max_size = hdr_size + profile_size * rev_data[idx].profiles;</div><div class='add'>+		u32 min_size;</div><div class='add'>+</div><div class='add'>+		if (!rev_data[idx].min_profiles)</div><div class='add'>+			min_size = max_size;</div><div class='add'>+		else</div><div class='add'>+			min_size = hdr_size +</div><div class='add'>+				   profile_size * rev_data[idx].min_profiles;</div><div class='add'>+</div><div class='add'>+		wifi_pkg = iwl_acpi_get_wifi_pkg_range(fwrt-&gt;dev, data,</div><div class='add'>+						       min_size, max_size,</div><div class='add'>+						       &amp;tbl_rev);</div><div class='add'>+		if (!IS_ERR(wifi_pkg)) {</div><div class='add'>+			if (!(BIT(tbl_rev) &amp; rev_data[idx].revisions))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			num_bands = rev_data[idx].bands;</div><div class='add'>+			num_profiles = rev_data[idx].profiles;</div><div class='add'>+</div><div class='add'>+			if (rev_data[idx].min_profiles) {</div><div class='add'>+				/* read header that says # of profiles */</div><div class='add'>+				union acpi_object *entry;</div><div class='add'>+</div><div class='add'>+				entry = &amp;wifi_pkg-&gt;package.elements[entry_idx];</div><div class='add'>+				entry_idx++;</div><div class='add'>+				if (entry-&gt;type != ACPI_TYPE_INTEGER ||</div><div class='add'>+				    entry-&gt;integer.value &gt; num_profiles ||</div><div class='add'>+				    entry-&gt;integer.value &lt;</div><div class='add'>+					rev_data[idx].min_profiles) {</div><div class='add'>+					ret = -EINVAL;</div><div class='add'>+					goto out_free;</div><div class='add'>+				}</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR(wifi_pkg)) {</div><div class='del'>-		ret = PTR_ERR(wifi_pkg);</div><div class='del'>-		goto out_free;</div><div class='add'>+				/*</div><div class='add'>+				 * Check to see if we received package count</div><div class='add'>+				 * same as max # of profiles</div><div class='add'>+				 */</div><div class='add'>+				if (wifi_pkg-&gt;package.count !=</div><div class='add'>+				    hdr_size + profile_size * num_profiles) {</div><div class='add'>+					ret = -EINVAL;</div><div class='add'>+					goto out_free;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				/* Number of valid profiles */</div><div class='add'>+				num_profiles = entry-&gt;integer.value;</div><div class='add'>+			}</div><div class='add'>+			goto read_table;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (tbl_rev &gt; 1) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='add'>+	if (idx &lt; ARRAY_SIZE(rev_data))</div><div class='add'>+		ret = PTR_ERR(wifi_pkg);</div><div class='add'>+	else</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+	goto out_free;</div><div class='ctx'> </div><div class='add'>+read_table:</div><div class='ctx'> 	fwrt-&gt;geo_rev = tbl_rev;</div><div class='del'>-	for (i = 0; i &lt; ACPI_NUM_GEO_PROFILES; i++) {</div><div class='del'>-		for (j = 0; j &lt; ACPI_GEO_TABLE_SIZE; j++) {</div><div class='add'>+	for (i = 0; i &lt; num_profiles; i++) {</div><div class='add'>+		for (j = 0; j &lt; BIOS_GEO_MAX_NUM_BANDS; j++) {</div><div class='ctx'> 			union acpi_object *entry;</div><div class='ctx'> </div><div class='del'>-			entry = &amp;wifi_pkg-&gt;package.elements[idx++];</div><div class='del'>-			if (entry-&gt;type != ACPI_TYPE_INTEGER ||</div><div class='del'>-			    entry-&gt;integer.value &gt; U8_MAX) {</div><div class='del'>-				ret = -EINVAL;</div><div class='del'>-				goto out_free;</div><div class='add'>+			/*</div><div class='add'>+			 * num_bands is either 2 or 3, if it's only 2 then</div><div class='add'>+			 * fill the third band (6 GHz) with the values from</div><div class='add'>+			 * 5 GHz (second band)</div><div class='add'>+			 */</div><div class='add'>+			if (j &gt;= num_bands) {</div><div class='add'>+				fwrt-&gt;geo_profiles[i].bands[j].max =</div><div class='add'>+					fwrt-&gt;geo_profiles[i].bands[1].max;</div><div class='add'>+			} else {</div><div class='add'>+				entry = &amp;wifi_pkg-&gt;package.elements[entry_idx];</div><div class='add'>+				entry_idx++;</div><div class='add'>+				if (entry-&gt;type != ACPI_TYPE_INTEGER ||</div><div class='add'>+				    entry-&gt;integer.value &gt; U8_MAX) {</div><div class='add'>+					ret = -EINVAL;</div><div class='add'>+					goto out_free;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				fwrt-&gt;geo_profiles[i].bands[j].max =</div><div class='add'>+					entry-&gt;integer.value;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			fwrt-&gt;geo_profiles[i].values[j] = entry-&gt;integer.value;</div><div class='add'>+			for (k = 0; k &lt; BIOS_GEO_NUM_CHAINS; k++) {</div><div class='add'>+				/* same here as above */</div><div class='add'>+				if (j &gt;= num_bands) {</div><div class='add'>+					fwrt-&gt;geo_profiles[i].bands[j].chains[k] =</div><div class='add'>+						fwrt-&gt;geo_profiles[i].bands[1].chains[k];</div><div class='add'>+				} else {</div><div class='add'>+					entry = &amp;wifi_pkg-&gt;package.elements[entry_idx];</div><div class='add'>+					entry_idx++;</div><div class='add'>+					if (entry-&gt;type != ACPI_TYPE_INTEGER ||</div><div class='add'>+					    entry-&gt;integer.value &gt; U8_MAX) {</div><div class='add'>+						ret = -EINVAL;</div><div class='add'>+						goto out_free;</div><div class='add'>+					}</div><div class='add'>+</div><div class='add'>+					fwrt-&gt;geo_profiles[i].bands[j].chains[k] =</div><div class='add'>+						entry-&gt;integer.value;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	fwrt-&gt;geo_num_profiles = num_profiles;</div><div class='add'>+	fwrt-&gt;geo_enabled = true;</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> out_free:</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_sar_get_wgds_table);</div><div class='ctx'> </div><div class='del'>-bool iwl_sar_geo_support(struct iwl_fw_runtime *fwrt)</div><div class='add'>+int iwl_acpi_get_ppag_table(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='add'>+	union acpi_object *wifi_pkg, *data, *flags;</div><div class='add'>+	int i, j, ret, tbl_rev, num_sub_bands = 0;</div><div class='add'>+	int idx = 2;</div><div class='add'>+</div><div class='add'>+	data = iwl_acpi_get_object(fwrt-&gt;dev, ACPI_PPAG_METHOD);</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return PTR_ERR(data);</div><div class='add'>+</div><div class='add'>+	/* try to read ppag table rev 1 to 4 (all have the same data size) */</div><div class='add'>+	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt-&gt;dev, data,</div><div class='add'>+				ACPI_PPAG_WIFI_DATA_SIZE_V2, &amp;tbl_rev);</div><div class='add'>+</div><div class='add'>+	if (!IS_ERR(wifi_pkg)) {</div><div class='add'>+		if (tbl_rev &gt;= 1 &amp;&amp; tbl_rev &lt;= 4) {</div><div class='add'>+			num_sub_bands = IWL_NUM_SUB_BANDS_V2;</div><div class='add'>+			IWL_DEBUG_RADIO(fwrt,</div><div class='add'>+					"Reading PPAG table (tbl_rev=%d)\n",</div><div class='add'>+					tbl_rev);</div><div class='add'>+			goto read_table;</div><div class='add'>+		} else {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* try to read ppag table revision 0 */</div><div class='add'>+	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt-&gt;dev, data,</div><div class='add'>+			ACPI_PPAG_WIFI_DATA_SIZE_V1, &amp;tbl_rev);</div><div class='add'>+</div><div class='add'>+	if (!IS_ERR(wifi_pkg)) {</div><div class='add'>+		if (tbl_rev != 0) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='add'>+		num_sub_bands = IWL_NUM_SUB_BANDS_V1;</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "Reading PPAG table v1 (tbl_rev=0)\n");</div><div class='add'>+		goto read_table;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = PTR_ERR(wifi_pkg);</div><div class='add'>+	goto out_free;</div><div class='add'>+</div><div class='add'>+read_table:</div><div class='add'>+	fwrt-&gt;ppag_bios_rev = tbl_rev;</div><div class='add'>+	flags = &amp;wifi_pkg-&gt;package.elements[1];</div><div class='add'>+</div><div class='add'>+	if (flags-&gt;type != ACPI_TYPE_INTEGER) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fwrt-&gt;ppag_flags = iwl_bios_get_ppag_flags(flags-&gt;integer.value,</div><div class='add'>+						   fwrt-&gt;ppag_bios_rev);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 * The GEO_TX_POWER_LIMIT command is not supported on earlier</div><div class='del'>-	 * firmware versions.  Unfortunately, we don't have a TLV API</div><div class='del'>-	 * flag to rely on, so rely on the major version which is in</div><div class='del'>-	 * the first byte of ucode_ver.  This was implemented</div><div class='del'>-	 * initially on version 38 and then backported to 17.  It was</div><div class='del'>-	 * also backported to 29, but only for 7265D devices.  The</div><div class='del'>-	 * intention was to have it in 36 as well, but not all 8000</div><div class='del'>-	 * family got this feature enabled.  The 8000 family is the</div><div class='del'>-	 * only one using version 36, so skip this version entirely.</div><div class='add'>+	 * read, verify gain values and save them into the PPAG table.</div><div class='add'>+	 * first sub-band (j=0) corresponds to Low-Band (2.4GHz), and the</div><div class='add'>+	 * following sub-bands to High-Band (5GHz).</div><div class='ctx'> 	 */</div><div class='del'>-	return IWL_UCODE_SERIAL(fwrt-&gt;fw-&gt;ucode_ver) &gt;= 38 ||</div><div class='del'>-	       IWL_UCODE_SERIAL(fwrt-&gt;fw-&gt;ucode_ver) == 17 ||</div><div class='del'>-	       (IWL_UCODE_SERIAL(fwrt-&gt;fw-&gt;ucode_ver) == 29 &amp;&amp;</div><div class='del'>-		((fwrt-&gt;trans-&gt;hw_rev &amp; CSR_HW_REV_TYPE_MSK) ==</div><div class='del'>-		 CSR_HW_REV_TYPE_7265D));</div><div class='add'>+	for (i = 0; i &lt; IWL_NUM_CHAIN_LIMITS; i++) {</div><div class='add'>+		for (j = 0; j &lt; num_sub_bands; j++) {</div><div class='add'>+			union acpi_object *ent;</div><div class='add'>+</div><div class='add'>+			ent = &amp;wifi_pkg-&gt;package.elements[idx++];</div><div class='add'>+			if (ent-&gt;type != ACPI_TYPE_INTEGER) {</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto out_free;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			fwrt-&gt;ppag_chains[i].subbands[j] = ent-&gt;integer.value;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fwrt-&gt;ppag_bios_source = BIOS_SOURCE_ACPI;</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree(data);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_sar_geo_support);</div><div class='ctx'> </div><div class='del'>-int iwl_sar_geo_init(struct iwl_fw_runtime *fwrt,</div><div class='del'>-		     struct iwl_per_chain_offset *table, u32 n_bands)</div><div class='add'>+int iwl_acpi_get_phy_filters(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='del'>-	int ret, i, j;</div><div class='add'>+	struct iwl_phy_specific_cfg *filters = &amp;fwrt-&gt;phy_filters;</div><div class='add'>+	struct iwl_phy_specific_cfg tmp = {};</div><div class='add'>+	union acpi_object *wifi_pkg, *data __free(kfree);</div><div class='add'>+	int tbl_rev, i;</div><div class='ctx'> </div><div class='del'>-	if (!iwl_sar_geo_support(fwrt))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+	data = iwl_acpi_get_object(fwrt-&gt;dev, ACPI_WPFC_METHOD);</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return PTR_ERR(data);</div><div class='ctx'> </div><div class='del'>-	ret = iwl_sar_get_wgds_table(fwrt);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		IWL_DEBUG_RADIO(fwrt,</div><div class='del'>-				"Geo SAR BIOS table invalid or unavailable. (%d)\n",</div><div class='del'>-				ret);</div><div class='del'>-		/* we don't fail if the table is not available */</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	}</div><div class='add'>+	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt-&gt;dev, data,</div><div class='add'>+					 ACPI_WPFC_WIFI_DATA_SIZE,</div><div class='add'>+					 &amp;tbl_rev);</div><div class='add'>+	if (IS_ERR(wifi_pkg))</div><div class='add'>+		return PTR_ERR(wifi_pkg);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ACPI_NUM_GEO_PROFILES; i++) {</div><div class='del'>-		for (j = 0; j &lt; n_bands; j++) {</div><div class='del'>-			struct iwl_per_chain_offset *chain =</div><div class='del'>-				&amp;table[i * n_bands + j];</div><div class='del'>-			u8 *value;</div><div class='add'>+	if (tbl_rev != 0)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-			if (j * ACPI_GEO_PER_CHAIN_SIZE &gt;=</div><div class='del'>-			    ARRAY_SIZE(fwrt-&gt;geo_profiles[0].values))</div><div class='del'>-				/*</div><div class='del'>-				 * Currently we only store lb an hb values, and</div><div class='del'>-				 * don't have any special ones for uhb. So leave</div><div class='del'>-				 * those empty for the time being</div><div class='del'>-				 */</div><div class='del'>-				break;</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(filters-&gt;filter_cfg_chains) !=</div><div class='add'>+		     ACPI_WPFC_WIFI_DATA_SIZE - 1);</div><div class='ctx'> </div><div class='del'>-			value = &amp;fwrt-&gt;geo_profiles[i].values[j *</div><div class='del'>-				ACPI_GEO_PER_CHAIN_SIZE];</div><div class='del'>-			chain-&gt;max_tx_power = cpu_to_le16(value[0]);</div><div class='del'>-			chain-&gt;chain_a = value[1];</div><div class='del'>-			chain-&gt;chain_b = value[2];</div><div class='del'>-			IWL_DEBUG_RADIO(fwrt,</div><div class='del'>-					"SAR geographic profile[%d] Band[%d]: chain A = %d chain B = %d max_tx_power = %d\n",</div><div class='del'>-					i, j, value[1], value[2], value[0]);</div><div class='del'>-		}</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(filters-&gt;filter_cfg_chains); i++) {</div><div class='add'>+		if (wifi_pkg-&gt;package.elements[i + 1].type != ACPI_TYPE_INTEGER)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		tmp.filter_cfg_chains[i] =</div><div class='add'>+			cpu_to_le32(wifi_pkg-&gt;package.elements[i + 1].integer.value);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	IWL_DEBUG_RADIO(fwrt, "Loaded WPFC filter config from ACPI\n");</div><div class='add'>+	*filters = tmp;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_sar_geo_init);</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_acpi_get_phy_filters);</div><div class='ctx'> </div><div class='del'>-static u32 iwl_acpi_eval_dsm_func(struct device *dev, enum iwl_dsm_funcs_rev_0 eval_func)</div><div class='add'>+void iwl_acpi_get_guid_lock_status(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='del'>-	union acpi_object *obj;</div><div class='del'>-	u32 ret;</div><div class='add'>+	union acpi_object *wifi_pkg, *data;</div><div class='add'>+	int tbl_rev;</div><div class='ctx'> </div><div class='del'>-	obj = iwl_acpi_get_dsm_object(dev, 0,</div><div class='del'>-				      eval_func, NULL,</div><div class='del'>-				      &amp;iwl_guid);</div><div class='add'>+	data = iwl_acpi_get_object(fwrt-&gt;dev, ACPI_GLAI_METHOD);</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR(obj)) {</div><div class='del'>-		IWL_DEBUG_DEV_RADIO(dev,</div><div class='del'>-				    "ACPI: DSM func '%d': Got Error in obj = %ld\n",</div><div class='del'>-				    eval_func,</div><div class='del'>-				    PTR_ERR(obj));</div><div class='del'>-		return 0;</div><div class='add'>+	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt-&gt;dev, data,</div><div class='add'>+					 ACPI_GLAI_WIFI_DATA_SIZE,</div><div class='add'>+					 &amp;tbl_rev);</div><div class='add'>+	if (IS_ERR(wifi_pkg))</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	if (tbl_rev != 0) {</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "Invalid GLAI revision: %d\n", tbl_rev);</div><div class='add'>+		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (obj-&gt;type != ACPI_TYPE_INTEGER) {</div><div class='del'>-		IWL_DEBUG_DEV_RADIO(dev,</div><div class='del'>-				    "ACPI: DSM func '%d' did not return a valid object, type=%d\n",</div><div class='del'>-				    eval_func,</div><div class='del'>-				    obj-&gt;type);</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out;</div><div class='add'>+	if (wifi_pkg-&gt;package.elements[1].type != ACPI_TYPE_INTEGER ||</div><div class='add'>+	    wifi_pkg-&gt;package.elements[1].integer.value &gt; ACPI_GLAI_MAX_STATUS)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	fwrt-&gt;uefi_tables_lock_status =</div><div class='add'>+		wifi_pkg-&gt;package.elements[1].integer.value;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_RADIO(fwrt,</div><div class='add'>+			"Loaded UEFI WIFI GUID lock status: %d from ACPI\n",</div><div class='add'>+			fwrt-&gt;uefi_tables_lock_status);</div><div class='add'>+out_free:</div><div class='add'>+	kfree(data);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_acpi_get_guid_lock_status);</div><div class='add'>+</div><div class='add'>+int iwl_acpi_get_wbem(struct iwl_fw_runtime *fwrt, u32 *value)</div><div class='add'>+{</div><div class='add'>+	union acpi_object *wifi_pkg, *data;</div><div class='add'>+	int ret = -ENOENT;</div><div class='add'>+	int tbl_rev;</div><div class='add'>+</div><div class='add'>+	data = iwl_acpi_get_object(fwrt-&gt;dev, ACPI_WBEM_METHOD);</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt-&gt;dev, data,</div><div class='add'>+					 ACPI_WBEM_WIFI_DATA_SIZE,</div><div class='add'>+					 &amp;tbl_rev);</div><div class='add'>+	if (IS_ERR(wifi_pkg))</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	if (tbl_rev != IWL_ACPI_WBEM_REVISION) {</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "Unsupported ACPI WBEM revision:%d\n",</div><div class='add'>+				tbl_rev);</div><div class='add'>+		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = obj-&gt;integer.value;</div><div class='del'>-	IWL_DEBUG_DEV_RADIO(dev,</div><div class='del'>-			    "ACPI: DSM method evaluated: func='%d', ret=%d\n",</div><div class='del'>-			    eval_func,</div><div class='del'>-			    ret);</div><div class='del'>-out:</div><div class='del'>-	ACPI_FREE(obj);</div><div class='add'>+	if (wifi_pkg-&gt;package.elements[1].type != ACPI_TYPE_INTEGER)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	*value = wifi_pkg-&gt;package.elements[1].integer.value &amp;</div><div class='add'>+		 IWL_ACPI_WBEM_REV0_MASK;</div><div class='add'>+	IWL_DEBUG_RADIO(fwrt, "Loaded WBEM config from ACPI\n");</div><div class='add'>+	ret = 0;</div><div class='add'>+out_free:</div><div class='add'>+	kfree(data);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__le32 iwl_acpi_get_lari_config_bitmap(struct iwl_fw_runtime *fwrt)</div><div class='add'>+int iwl_acpi_get_dsbr(struct iwl_fw_runtime *fwrt, u32 *value)</div><div class='ctx'> {</div><div class='del'>-	u32 ret;</div><div class='del'>-	__le32 config_bitmap = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 ** Evaluate func 'DSM_FUNC_ENABLE_INDONESIA_5G2'</div><div class='del'>-	 */</div><div class='del'>-	ret = iwl_acpi_eval_dsm_func(fwrt-&gt;dev, DSM_FUNC_ENABLE_INDONESIA_5G2);</div><div class='add'>+	union acpi_object *wifi_pkg, *data;</div><div class='add'>+	int ret = -ENOENT;</div><div class='add'>+	int tbl_rev;</div><div class='ctx'> </div><div class='del'>-	if (ret == DSM_VALUE_INDONESIA_ENABLE)</div><div class='del'>-		config_bitmap |=</div><div class='del'>-			cpu_to_le32(LARI_CONFIG_ENABLE_5G2_IN_INDONESIA_MSK);</div><div class='add'>+	data = iwl_acpi_get_object(fwrt-&gt;dev, ACPI_DSBR_METHOD);</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 ** Evaluate func 'DSM_FUNC_DISABLE_SRD'</div><div class='del'>-	 */</div><div class='del'>-	ret = iwl_acpi_eval_dsm_func(fwrt-&gt;dev, DSM_FUNC_DISABLE_SRD);</div><div class='add'>+	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt-&gt;dev, data,</div><div class='add'>+					 ACPI_DSBR_WIFI_DATA_SIZE,</div><div class='add'>+					 &amp;tbl_rev);</div><div class='add'>+	if (IS_ERR(wifi_pkg))</div><div class='add'>+		goto out_free;</div><div class='ctx'> </div><div class='del'>-	if (ret == DSM_VALUE_SRD_PASSIVE)</div><div class='del'>-		config_bitmap |=</div><div class='del'>-			cpu_to_le32(LARI_CONFIG_CHANGE_ETSI_TO_PASSIVE_MSK);</div><div class='add'>+	if (tbl_rev != ACPI_DSBR_WIFI_DATA_REV) {</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "Unsupported ACPI DSBR revision:%d\n",</div><div class='add'>+				tbl_rev);</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	else if (ret == DSM_VALUE_SRD_DISABLE)</div><div class='del'>-		config_bitmap |=</div><div class='del'>-			cpu_to_le32(LARI_CONFIG_CHANGE_ETSI_TO_DISABLED_MSK);</div><div class='add'>+	if (wifi_pkg-&gt;package.elements[1].type != ACPI_TYPE_INTEGER)</div><div class='add'>+		goto out_free;</div><div class='ctx'> </div><div class='del'>-	return config_bitmap;</div><div class='add'>+	*value = wifi_pkg-&gt;package.elements[1].integer.value;</div><div class='add'>+	IWL_DEBUG_RADIO(fwrt, "Loaded DSBR config from ACPI value: 0x%x\n",</div><div class='add'>+			*value);</div><div class='add'>+	ret = 0;</div><div class='add'>+out_free:</div><div class='add'>+	kfree(data);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_acpi_get_lari_config_bitmap);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.h b/drivers/net/wireless/intel/iwlwifi/fw/acpi.h<br/>index d16e6ec08c9f..06cece4ea6d9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/acpi.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/acpi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/acpi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/acpi.h</a></div><div class='hunk'>@@ -1,16 +1,18 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2018-2021 Intel Corporation</div><div class='add'>+ * Copyright (C) 2018-2023, 2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_fw_acpi__</div><div class='ctx'> #define __iwl_fw_acpi__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='add'>+#include "fw/regulatory.h"</div><div class='ctx'> #include "fw/api/commands.h"</div><div class='ctx'> #include "fw/api/power.h"</div><div class='ctx'> #include "fw/api/phy.h"</div><div class='ctx'> #include "fw/api/nvm-reg.h"</div><div class='add'>+#include "fw/api/config.h"</div><div class='ctx'> #include "fw/img.h"</div><div class='ctx'> #include "iwl-trans.h"</div><div class='ctx'> </div><div class='hunk'>@@ -23,226 +25,247 @@</div><div class='ctx'> #define ACPI_ECKV_METHOD	"ECKV"</div><div class='ctx'> #define ACPI_PPAG_METHOD	"PPAG"</div><div class='ctx'> #define ACPI_WTAS_METHOD	"WTAS"</div><div class='add'>+#define ACPI_WPFC_METHOD	"WPFC"</div><div class='add'>+#define ACPI_GLAI_METHOD	"GLAI"</div><div class='add'>+#define ACPI_WBEM_METHOD	"WBEM"</div><div class='add'>+#define ACPI_DSBR_METHOD	"DSBR"</div><div class='ctx'> </div><div class='ctx'> #define ACPI_WIFI_DOMAIN	(0x07)</div><div class='ctx'> </div><div class='del'>-#define ACPI_SAR_TABLE_SIZE		10</div><div class='ctx'> #define ACPI_SAR_PROFILE_NUM		4</div><div class='ctx'> </div><div class='del'>-#define ACPI_GEO_TABLE_SIZE		6</div><div class='ctx'> #define ACPI_NUM_GEO_PROFILES		3</div><div class='add'>+#define ACPI_NUM_GEO_PROFILES_REV3	8</div><div class='ctx'> #define ACPI_GEO_PER_CHAIN_SIZE		3</div><div class='ctx'> </div><div class='del'>-#define ACPI_SAR_NUM_CHAIN_LIMITS	2</div><div class='del'>-#define ACPI_SAR_NUM_SUB_BANDS		5</div><div class='del'>-#define ACPI_SAR_NUM_TABLES		1</div><div class='add'>+#define ACPI_SAR_NUM_CHAINS_REV0	2</div><div class='add'>+#define ACPI_SAR_NUM_CHAINS_REV1	2</div><div class='add'>+#define ACPI_SAR_NUM_CHAINS_REV2	4</div><div class='add'>+#define ACPI_SAR_NUM_SUB_BANDS_REV0	5</div><div class='add'>+#define ACPI_SAR_NUM_SUB_BANDS_REV1	11</div><div class='add'>+#define ACPI_SAR_NUM_SUB_BANDS_REV2	11</div><div class='add'>+</div><div class='add'>+#define ACPI_WRDS_WIFI_DATA_SIZE_REV0	(ACPI_SAR_NUM_CHAINS_REV0 * \</div><div class='add'>+					 ACPI_SAR_NUM_SUB_BANDS_REV0 + 2)</div><div class='add'>+#define ACPI_WRDS_WIFI_DATA_SIZE_REV1	(ACPI_SAR_NUM_CHAINS_REV1 * \</div><div class='add'>+					 ACPI_SAR_NUM_SUB_BANDS_REV1 + 2)</div><div class='add'>+#define ACPI_WRDS_WIFI_DATA_SIZE_REV2	(ACPI_SAR_NUM_CHAINS_REV2 * \</div><div class='add'>+					 ACPI_SAR_NUM_SUB_BANDS_REV2 + 2)</div><div class='add'>+#define ACPI_EWRD_WIFI_DATA_SIZE_REV0	((ACPI_SAR_PROFILE_NUM - 1) * \</div><div class='add'>+					 ACPI_SAR_NUM_CHAINS_REV0 * \</div><div class='add'>+					 ACPI_SAR_NUM_SUB_BANDS_REV0 + 3)</div><div class='add'>+#define ACPI_EWRD_WIFI_DATA_SIZE_REV1	((ACPI_SAR_PROFILE_NUM - 1) * \</div><div class='add'>+					 ACPI_SAR_NUM_CHAINS_REV1 * \</div><div class='add'>+					 ACPI_SAR_NUM_SUB_BANDS_REV1 + 3)</div><div class='add'>+#define ACPI_EWRD_WIFI_DATA_SIZE_REV2	((ACPI_SAR_PROFILE_NUM - 1) * \</div><div class='add'>+					 ACPI_SAR_NUM_CHAINS_REV2 * \</div><div class='add'>+					 ACPI_SAR_NUM_SUB_BANDS_REV2 + 3)</div><div class='add'>+#define ACPI_WPFC_WIFI_DATA_SIZE	5 /* domain and 4 filter config words */</div><div class='add'>+</div><div class='add'>+/* revision 0 and 1 are identical, except for the semantics in the FW */</div><div class='add'>+#define ACPI_GEO_NUM_BANDS_REV0		2</div><div class='add'>+#define ACPI_GEO_NUM_BANDS_REV2		3</div><div class='ctx'> </div><div class='del'>-#define ACPI_WRDS_WIFI_DATA_SIZE	(ACPI_SAR_TABLE_SIZE + 2)</div><div class='del'>-#define ACPI_EWRD_WIFI_DATA_SIZE	((ACPI_SAR_PROFILE_NUM - 1) * \</div><div class='del'>-					 ACPI_SAR_TABLE_SIZE + 3)</div><div class='del'>-#define ACPI_WGDS_WIFI_DATA_SIZE	19</div><div class='ctx'> #define ACPI_WRDD_WIFI_DATA_SIZE	2</div><div class='ctx'> #define ACPI_SPLC_WIFI_DATA_SIZE	2</div><div class='ctx'> #define ACPI_ECKV_WIFI_DATA_SIZE	2</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * 1 type, 1 enabled, 1 block list size, 16 block list array</div><div class='add'>+ * One element for domain type,</div><div class='add'>+ * and one for enablement of Wi-Fi 320MHz per MCC</div><div class='ctx'>  */</div><div class='del'>-#define APCI_WTAS_BLACK_LIST_MAX	16</div><div class='del'>-#define ACPI_WTAS_WIFI_DATA_SIZE	(3 + APCI_WTAS_BLACK_LIST_MAX)</div><div class='add'>+#define ACPI_WBEM_WIFI_DATA_SIZE	2</div><div class='add'>+/*</div><div class='add'>+ * One element for domain type,</div><div class='add'>+ * and one for DSBR response data</div><div class='add'>+ */</div><div class='add'>+#define ACPI_DSBR_WIFI_DATA_SIZE	2</div><div class='add'>+#define ACPI_DSBR_WIFI_DATA_REV		1</div><div class='ctx'> </div><div class='del'>-#define ACPI_WGDS_TABLE_SIZE		3</div><div class='add'>+/*</div><div class='add'>+ * One element for domain type,</div><div class='add'>+ * and one for the status</div><div class='add'>+ */</div><div class='add'>+#define ACPI_GLAI_WIFI_DATA_SIZE	2</div><div class='add'>+#define ACPI_GLAI_MAX_STATUS		2</div><div class='add'>+/*</div><div class='add'>+ * TAS size: 1 elelment for type,</div><div class='add'>+ *	     1 element for enabled field,</div><div class='add'>+ *	     1 element for block list size,</div><div class='add'>+ *	     16 elements for block list array</div><div class='add'>+ */</div><div class='add'>+#define ACPI_WTAS_WIFI_DATA_SIZE	(3 + IWL_WTAS_BLACK_LIST_MAX)</div><div class='ctx'> </div><div class='ctx'> #define ACPI_PPAG_WIFI_DATA_SIZE_V1	((IWL_NUM_CHAIN_LIMITS * \</div><div class='ctx'> 					  IWL_NUM_SUB_BANDS_V1) + 2)</div><div class='ctx'> #define ACPI_PPAG_WIFI_DATA_SIZE_V2	((IWL_NUM_CHAIN_LIMITS * \</div><div class='ctx'> 					  IWL_NUM_SUB_BANDS_V2) + 2)</div><div class='ctx'> </div><div class='del'>-/* PPAG gain value bounds in 1/8 dBm */</div><div class='del'>-#define ACPI_PPAG_MIN_LB -16</div><div class='del'>-#define ACPI_PPAG_MAX_LB 24</div><div class='del'>-#define ACPI_PPAG_MIN_HB -16</div><div class='del'>-#define ACPI_PPAG_MAX_HB 40</div><div class='add'>+#define IWL_SAR_ENABLE_MSK		BIT(0)</div><div class='add'>+#define IWL_REDUCE_POWER_FLAGS_POS	1</div><div class='ctx'> </div><div class='del'>-struct iwl_sar_profile {</div><div class='del'>-	bool enabled;</div><div class='del'>-	u8 table[ACPI_SAR_TABLE_SIZE];</div><div class='del'>-};</div><div class='add'>+/* The Inidcator whether UEFI WIFI GUID tables are locked is read from ACPI */</div><div class='add'>+#define UEFI_WIFI_GUID_UNLOCKED		0</div><div class='ctx'> </div><div class='del'>-struct iwl_geo_profile {</div><div class='del'>-	u8 values[ACPI_GEO_TABLE_SIZE];</div><div class='del'>-};</div><div class='add'>+#define ACPI_DSM_REV 0</div><div class='ctx'> </div><div class='del'>-enum iwl_dsm_funcs_rev_0 {</div><div class='del'>-	DSM_FUNC_QUERY = 0,</div><div class='del'>-	DSM_FUNC_DISABLE_SRD = 1,</div><div class='del'>-	DSM_FUNC_ENABLE_INDONESIA_5G2 = 2,</div><div class='del'>-	DSM_FUNC_11AX_ENABLEMENT = 6,</div><div class='del'>-};</div><div class='add'>+#define DSM_INTERNAL_FUNC_GET_PLAT_INFO	1</div><div class='add'>+/* TBD: VPRO is BIT(0) in the result, but what's the result? */</div><div class='ctx'> </div><div class='del'>-enum iwl_dsm_values_srd {</div><div class='del'>-	DSM_VALUE_SRD_ACTIVE,</div><div class='del'>-	DSM_VALUE_SRD_PASSIVE,</div><div class='del'>-	DSM_VALUE_SRD_DISABLE,</div><div class='del'>-	DSM_VALUE_SRD_MAX</div><div class='del'>-};</div><div class='add'>+#define DSM_INTERNAL_FUNC_PRODUCT_RESET	2</div><div class='ctx'> </div><div class='del'>-enum iwl_dsm_values_indonesia {</div><div class='del'>-	DSM_VALUE_INDONESIA_DISABLE,</div><div class='del'>-	DSM_VALUE_INDONESIA_ENABLE,</div><div class='del'>-	DSM_VALUE_INDONESIA_RESERVED,</div><div class='del'>-	DSM_VALUE_INDONESIA_MAX</div><div class='add'>+/* DSM_INTERNAL_FUNC_PRODUCT_RESET - product reset (aka "PLDR") */</div><div class='add'>+enum iwl_dsm_internal_product_reset_cmds {</div><div class='add'>+	DSM_INTERNAL_PLDR_CMD_GET_MODE = 1,</div><div class='add'>+	DSM_INTERNAL_PLDR_CMD_SET_MODE = 2,</div><div class='add'>+	DSM_INTERNAL_PLDR_CMD_GET_STATUS = 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* DSM RFI uses a different GUID, so need separate definitions */</div><div class='add'>+enum iwl_dsm_internal_product_reset_mode {</div><div class='add'>+	DSM_INTERNAL_PLDR_MODE_EN_PROD_RESET	= BIT(0),</div><div class='add'>+	DSM_INTERNAL_PLDR_MODE_EN_WIFI_FLR	= BIT(1),</div><div class='add'>+	DSM_INTERNAL_PLDR_MODE_EN_BT_OFF_ON	= BIT(2),</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-#define DSM_RFI_FUNC_ENABLE 3</div><div class='add'>+struct iwl_dsm_internal_product_reset_cmd {</div><div class='add'>+	/* cmd is from enum iwl_dsm_internal_product_reset_cmds */</div><div class='add'>+	u16 cmd;</div><div class='add'>+	u16 value;</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='del'>-enum iwl_dsm_values_rfi {</div><div class='del'>-	DSM_VALUE_RFI_ENABLE,</div><div class='del'>-	DSM_VALUE_RFI_DISABLE,</div><div class='del'>-	DSM_VALUE_RFI_MAX</div><div class='del'>-};</div><div class='add'>+#define IWL_ACPI_WBEM_REV0_MASK (BIT(0) | BIT(1))</div><div class='add'>+#define IWL_ACPI_WBEM_REVISION 0</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='ctx'> </div><div class='ctx'> struct iwl_fw_runtime;</div><div class='ctx'> </div><div class='del'>-extern const guid_t iwl_guid;</div><div class='del'>-extern const guid_t iwl_rfi_guid;</div><div class='del'>-</div><div class='del'>-void *iwl_acpi_get_object(struct device *dev, acpi_string method);</div><div class='del'>-</div><div class='del'>-int iwl_acpi_get_dsm_u8(struct device *dev, int rev, int func,</div><div class='del'>-			const guid_t *guid, u8 *value);</div><div class='del'>-</div><div class='del'>-union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,</div><div class='del'>-					 union acpi_object *data,</div><div class='del'>-					 int data_size, int *tbl_rev);</div><div class='add'>+union acpi_object *iwl_acpi_get_dsm_object(struct device *dev, int rev,</div><div class='add'>+					   int func, union acpi_object *args,</div><div class='add'>+					   const guid_t *guid);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * iwl_acpi_get_mcc - read MCC from ACPI, if available</div><div class='ctx'>  *</div><div class='del'>- * @dev: the struct device</div><div class='add'>+ * @fwrt: the fw runtime struct</div><div class='ctx'>  * @mcc: output buffer (3 bytes) that will get the MCC</div><div class='ctx'>  *</div><div class='ctx'>  * This function tries to read the current MCC from ACPI if available.</div><div class='add'>+ * Return: 0 on success, or a negative error code</div><div class='ctx'>  */</div><div class='del'>-int iwl_acpi_get_mcc(struct device *dev, char *mcc);</div><div class='add'>+int iwl_acpi_get_mcc(struct iwl_fw_runtime *fwrt, char *mcc);</div><div class='ctx'> </div><div class='del'>-u64 iwl_acpi_get_pwr_limit(struct device *dev);</div><div class='add'>+int iwl_acpi_get_pwr_limit(struct iwl_fw_runtime *fwrt, u64 *dflt_pwr_limit);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * iwl_acpi_get_eckv - read external clock validation from ACPI, if available</div><div class='ctx'>  *</div><div class='del'>- * @dev: the struct device</div><div class='add'>+ * @fwrt: the fw runtime struct</div><div class='ctx'>  * @extl_clk: output var (2 bytes) that will get the clk indication.</div><div class='ctx'>  *</div><div class='ctx'>  * This function tries to read the external clock indication</div><div class='ctx'>  * from ACPI if available.</div><div class='ctx'>  */</div><div class='del'>-int iwl_acpi_get_eckv(struct device *dev, u32 *extl_clk);</div><div class='add'>+int iwl_acpi_get_eckv(struct iwl_fw_runtime *fwrt, u32 *extl_clk);</div><div class='ctx'> </div><div class='del'>-int iwl_sar_select_profile(struct iwl_fw_runtime *fwrt,</div><div class='del'>-			   __le16 *per_chain, u32 n_tables, u32 n_subbands,</div><div class='del'>-			   int prof_a, int prof_b);</div><div class='add'>+int iwl_acpi_get_wrds_table(struct iwl_fw_runtime *fwrt);</div><div class='ctx'> </div><div class='del'>-int iwl_sar_get_wrds_table(struct iwl_fw_runtime *fwrt);</div><div class='add'>+int iwl_acpi_get_ewrd_table(struct iwl_fw_runtime *fwrt);</div><div class='ctx'> </div><div class='del'>-int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt);</div><div class='add'>+int iwl_acpi_get_wgds_table(struct iwl_fw_runtime *fwrt);</div><div class='ctx'> </div><div class='del'>-int iwl_sar_get_wgds_table(struct iwl_fw_runtime *fwrt);</div><div class='add'>+int iwl_acpi_get_tas_table(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			   struct iwl_tas_data *data);</div><div class='ctx'> </div><div class='del'>-bool iwl_sar_geo_support(struct iwl_fw_runtime *fwrt);</div><div class='add'>+int iwl_acpi_get_ppag_table(struct iwl_fw_runtime *fwrt);</div><div class='ctx'> </div><div class='del'>-int iwl_sar_geo_init(struct iwl_fw_runtime *fwrt,</div><div class='del'>-		     struct iwl_per_chain_offset *table, u32 n_bands);</div><div class='add'>+int iwl_acpi_get_phy_filters(struct iwl_fw_runtime *fwrt);</div><div class='ctx'> </div><div class='del'>-int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt, __le32 *block_list_array,</div><div class='del'>-		     int *block_list_size);</div><div class='add'>+void iwl_acpi_get_guid_lock_status(struct iwl_fw_runtime *fwrt);</div><div class='ctx'> </div><div class='del'>-__le32 iwl_acpi_get_lari_config_bitmap(struct iwl_fw_runtime *fwrt);</div><div class='add'>+int iwl_acpi_get_dsm(struct iwl_fw_runtime *fwrt,</div><div class='add'>+		     enum iwl_dsm_funcs func, u32 *value);</div><div class='ctx'> </div><div class='del'>-#else /* CONFIG_ACPI */</div><div class='add'>+int iwl_acpi_get_wbem(struct iwl_fw_runtime *fwrt, u32 *value);</div><div class='ctx'> </div><div class='del'>-static inline void *iwl_acpi_get_object(struct device *dev, acpi_string method)</div><div class='del'>-{</div><div class='del'>-	return ERR_PTR(-ENOENT);</div><div class='del'>-}</div><div class='add'>+int iwl_acpi_get_dsbr(struct iwl_fw_runtime *fwrt, u32 *value);</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_ACPI */</div><div class='ctx'> </div><div class='del'>-static inline void *iwl_acpi_get_dsm_object(struct device *dev, int rev,</div><div class='del'>-					    int func, union acpi_object *args)</div><div class='add'>+static inline union acpi_object *</div><div class='add'>+iwl_acpi_get_dsm_object(struct device *dev, int rev, int func,</div><div class='add'>+			union acpi_object *args, const guid_t *guid)</div><div class='ctx'> {</div><div class='ctx'> 	return ERR_PTR(-ENOENT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int iwl_acpi_get_dsm_u8(struct device *dev, int rev, int func,</div><div class='del'>-				      const guid_t *guid, u8 *value)</div><div class='add'>+static inline int iwl_acpi_get_mcc(struct iwl_fw_runtime *fwrt, char *mcc)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,</div><div class='del'>-						       union acpi_object *data,</div><div class='del'>-						       int data_size,</div><div class='del'>-						       int *tbl_rev)</div><div class='add'>+static inline int iwl_acpi_get_pwr_limit(struct iwl_fw_runtime *fwrt,</div><div class='add'>+					 u64 *dflt_pwr_limit)</div><div class='ctx'> {</div><div class='del'>-	return ERR_PTR(-ENOENT);</div><div class='add'>+	*dflt_pwr_limit = 0;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int iwl_acpi_get_mcc(struct device *dev, char *mcc)</div><div class='add'>+static inline int iwl_acpi_get_eckv(struct iwl_fw_runtime *fwrt, u32 *extl_clk)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u64 iwl_acpi_get_pwr_limit(struct device *dev)</div><div class='add'>+static inline int iwl_acpi_get_wrds_table(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int iwl_acpi_get_eckv(struct device *dev, u32 *extl_clk)</div><div class='add'>+static inline int iwl_acpi_get_ewrd_table(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int iwl_sar_select_profile(struct iwl_fw_runtime *fwrt,</div><div class='del'>-			   __le16 *per_chain, u32 n_tables, u32 n_subbands,</div><div class='del'>-			   int prof_a, int prof_b)</div><div class='add'>+static inline int iwl_acpi_get_wgds_table(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='del'>-	return -ENOENT;</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int iwl_sar_get_wrds_table(struct iwl_fw_runtime *fwrt)</div><div class='add'>+static inline int iwl_acpi_get_tas_table(struct iwl_fw_runtime *fwrt,</div><div class='add'>+					 struct iwl_tas_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt)</div><div class='add'>+static inline int iwl_acpi_get_ppag_table(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int iwl_sar_get_wgds_table(struct iwl_fw_runtime *fwrt)</div><div class='add'>+static inline int iwl_acpi_get_phy_filters(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool iwl_sar_geo_support(struct iwl_fw_runtime *fwrt)</div><div class='add'>+static inline void iwl_acpi_get_guid_lock_status(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='del'>-	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt,</div><div class='del'>-				   __le32 *block_list_array,</div><div class='del'>-				   int *block_list_size)</div><div class='add'>+static inline int iwl_acpi_get_dsm(struct iwl_fw_runtime *fwrt,</div><div class='add'>+				   enum iwl_dsm_funcs func, u32 *value)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline __le32 iwl_acpi_get_lari_config_bitmap(struct iwl_fw_runtime *fwrt)</div><div class='add'>+static inline int iwl_acpi_get_wbem(struct iwl_fw_runtime *fwrt, u32 *value)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int iwl_acpi_get_dsbr(struct iwl_fw_runtime *fwrt, u32 *value)</div><div class='add'>+{</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_ACPI */</div><div class='add'>+</div><div class='ctx'> #endif /* __iwl_fw_acpi__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/alive.h b/drivers/net/wireless/intel/iwlwifi/fw/api/alive.h<br/>index c840a97e6a62..ea2ba4b4cb7b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/alive.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/alive.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/alive.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/alive.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018, 2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018, 2020-2021, 2024-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -82,27 +82,37 @@ struct iwl_alive_ntf_v3 {</div><div class='ctx'> 	struct iwl_umac_alive umac_data;</div><div class='ctx'> } __packed; /* UCODE_ALIVE_NTFY_API_S_VER_3 */</div><div class='ctx'> </div><div class='del'>-struct iwl_alive_ntf_v4 {</div><div class='add'>+struct iwl_imr_alive_info {</div><div class='add'>+	__le64 base_addr;</div><div class='add'>+	__le32 size;</div><div class='add'>+	__le32 enabled;</div><div class='add'>+} __packed; /* IMR_ALIVE_INFO_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+struct iwl_alive_ntf_v7 {</div><div class='ctx'> 	__le16 status;</div><div class='ctx'> 	__le16 flags;</div><div class='ctx'> 	struct iwl_lmac_alive lmac_data[2];</div><div class='ctx'> 	struct iwl_umac_alive umac_data;</div><div class='del'>-} __packed; /* UCODE_ALIVE_NTFY_API_S_VER_4 */</div><div class='add'>+	struct iwl_sku_id sku_id;</div><div class='add'>+	struct iwl_imr_alive_info imr;</div><div class='add'>+} __packed; /* UCODE_ALIVE_NTFY_API_S_VER_6 */</div><div class='ctx'> </div><div class='del'>-struct iwl_alive_ntf_v5 {</div><div class='add'>+struct iwl_alive_ntf {</div><div class='ctx'> 	__le16 status;</div><div class='ctx'> 	__le16 flags;</div><div class='ctx'> 	struct iwl_lmac_alive lmac_data[2];</div><div class='ctx'> 	struct iwl_umac_alive umac_data;</div><div class='ctx'> 	struct iwl_sku_id sku_id;</div><div class='del'>-} __packed; /* UCODE_ALIVE_NTFY_API_S_VER_5 */</div><div class='add'>+	struct iwl_imr_alive_info imr;</div><div class='add'>+	__le64 platform_id;</div><div class='add'>+} __packed; /* UCODE_ALIVE_NTFY_API_S_VER_8 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum iwl_extended_cfg_flag - commands driver may send before</div><div class='add'>+ * enum iwl_extended_cfg_flags - commands driver may send before</div><div class='ctx'>  *	finishing init flow</div><div class='ctx'>  * @IWL_INIT_DEBUG_CFG: driver is going to send debug config command</div><div class='ctx'>  * @IWL_INIT_NVM: driver is going to send NVM_ACCESS commands</div><div class='del'>- * @IWL_INIT_PHY: driver is going to send PHY_DB commands</div><div class='add'>+ * @IWL_INIT_PHY: driver is going to send the PHY_CONFIGURATION_CMD</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_extended_cfg_flags {</div><div class='ctx'> 	IWL_INIT_DEBUG_CFG,</div><div class='hunk'>@@ -111,7 +121,7 @@ enum iwl_extended_cfg_flags {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_extended_cfg_cmd - mark what commands ucode should wait for</div><div class='add'>+ * struct iwl_init_extended_cfg_cmd - mark what commands ucode should wait for</div><div class='ctx'>  * before finishing init flows</div><div class='ctx'>  * @init_flags: values from iwl_extended_cfg_flags</div><div class='ctx'>  */</div><div class='hunk'>@@ -143,15 +153,6 @@ enum iwl_card_state_flags {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_radio_version_notif - information on the card state</div><div class='del'>- * ( CARD_STATE_NOTIFICATION = 0xa1 )</div><div class='del'>- * @flags: &amp;enum iwl_card_state_flags</div><div class='del'>- */</div><div class='del'>-struct iwl_card_state_notif {</div><div class='del'>-	__le32 flags;</div><div class='del'>-} __packed; /* CARD_STATE_NTFY_API_S_VER_1 */</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * enum iwl_error_recovery_flags - flags for error recovery cmd</div><div class='ctx'>  * @ERROR_RECOVERY_UPDATE_DB: update db from blob sent</div><div class='ctx'>  * @ERROR_RECOVERY_END_OF_RECOVERY: end of recovery</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/binding.h b/drivers/net/wireless/intel/iwlwifi/fw/api/binding.h<br/>index 29e2816e7052..9b942c4aabd9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/binding.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/binding.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/binding.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/binding.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2020, 2022, 2024 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'>  * ( BINDING_CONTEXT_CMD = 0x2b )</div><div class='ctx'>  * @id_and_color: ID and color of the relevant Binding,</div><div class='ctx'>  *	&amp;enum iwl_ctxt_id_and_color</div><div class='del'>- * @action: action to perform, one of FW_CTXT_ACTION_*</div><div class='add'>+ * @action: action to perform, see &amp;enum iwl_ctxt_action</div><div class='ctx'>  * @macs: array of MAC id and colors which belong to the binding,</div><div class='ctx'>  *	&amp;enum iwl_ctxt_id_and_color</div><div class='ctx'>  * @phy: PHY id and color which belongs to the binding,</div><div class='hunk'>@@ -38,7 +38,7 @@ struct iwl_binding_cmd_v1 {</div><div class='ctx'>  * ( BINDING_CONTEXT_CMD = 0x2b )</div><div class='ctx'>  * @id_and_color: ID and color of the relevant Binding,</div><div class='ctx'>  *	&amp;enum iwl_ctxt_id_and_color</div><div class='del'>- * @action: action to perform, one of FW_CTXT_ACTION_*</div><div class='add'>+ * @action: action to perform, see &amp;enum iwl_ctxt_action</div><div class='ctx'>  * @macs: array of MAC id and colors which belong to the binding</div><div class='ctx'>  *	&amp;enum iwl_ctxt_id_and_color</div><div class='ctx'>  * @phy: PHY id and color which belongs to the binding</div><div class='hunk'>@@ -56,16 +56,6 @@ struct iwl_binding_cmd {</div><div class='ctx'> } __packed; /* BINDING_CMD_API_S_VER_2 */</div><div class='ctx'> </div><div class='ctx'> #define IWL_BINDING_CMD_SIZE_V1	sizeof(struct iwl_binding_cmd_v1)</div><div class='del'>-#define IWL_LMAC_24G_INDEX		0</div><div class='del'>-#define IWL_LMAC_5G_INDEX		1</div><div class='del'>-</div><div class='del'>-static inline u32 iwl_mvm_get_lmac_id(const struct iwl_fw *fw,</div><div class='del'>-				      enum nl80211_band band){</div><div class='del'>-	if (!fw_has_capa(&amp;fw-&gt;ucode_capa, IWL_UCODE_TLV_CAPA_CDB_SUPPORT) ||</div><div class='del'>-	    band == NL80211_BAND_2GHZ)</div><div class='del'>-		return IWL_LMAC_24G_INDEX;</div><div class='del'>-	return IWL_LMAC_5G_INDEX;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> /* The maximal number of fragments in the FW's schedule session */</div><div class='ctx'> #define IWL_MVM_MAX_QUOTA 128</div><div class='hunk'>@@ -85,7 +75,7 @@ struct iwl_time_quota_data_v1 {</div><div class='ctx'> } __packed; /* TIME_QUOTA_DATA_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_time_quota_cmd - configuration of time quota between bindings</div><div class='add'>+ * struct iwl_time_quota_cmd_v1 - configuration of time quota between bindings</div><div class='ctx'>  * ( TIME_QUOTA_CMD = 0x2c )</div><div class='ctx'>  * @quotas: allocations per binding</div><div class='ctx'>  * Note: on non-CDB the fourth one is the auxilary mac and is</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/cmdhdr.h b/drivers/net/wireless/intel/iwlwifi/fw/api/cmdhdr.h<br/>index d130d4f85444..073f003bdc5d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/cmdhdr.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/cmdhdr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/cmdhdr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/cmdhdr.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2014 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2014, 2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -98,7 +98,7 @@ struct iwl_cmd_header {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_cmd_header_wide</div><div class='add'>+ * struct iwl_cmd_header_wide - wide command header</div><div class='ctx'>  *</div><div class='ctx'>  * This header format appears in the beginning of each command sent from the</div><div class='ctx'>  * driver, and each response/notification received from uCode.</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/coex.h b/drivers/net/wireless/intel/iwlwifi/fw/api/coex.h<br/>index 01580c9175f3..616f00a8b603 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/coex.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/coex.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/coex.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/coex.h</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (C) 2023-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2014, 2018-2019 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2017 Intel Deutschland GmbH</div><div class='hunk'>@@ -51,7 +52,7 @@ struct iwl_bt_coex_cmd {</div><div class='ctx'> } __packed; /* BT_COEX_CMD_API_S_VER_6 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_bt_coex_reduced_txp_update_cmd</div><div class='add'>+ * struct iwl_bt_coex_reduced_txp_update_cmd - reduced TX power command</div><div class='ctx'>  * @reduced_txp: bit BT_REDUCED_TX_POWER_BIT to enable / disable, rest of the</div><div class='ctx'>  *	bits are the sta_id (value)</div><div class='ctx'>  */</div><div class='hunk'>@@ -76,73 +77,6 @@ struct iwl_bt_coex_ci_cmd {</div><div class='ctx'> 	__le32 secondary_ch_phy_id;</div><div class='ctx'> } __packed; /* BT_CI_MSG_API_S_VER_2 */</div><div class='ctx'> </div><div class='del'>-#define BT_MBOX(n_dw, _msg, _pos, _nbits)	\</div><div class='del'>-	BT_MBOX##n_dw##_##_msg##_POS = (_pos),	\</div><div class='del'>-	BT_MBOX##n_dw##_##_msg = BITS(_nbits) &lt;&lt; BT_MBOX##n_dw##_##_msg##_POS</div><div class='del'>-</div><div class='del'>-enum iwl_bt_mxbox_dw0 {</div><div class='del'>-	BT_MBOX(0, LE_SLAVE_LAT, 0, 3),</div><div class='del'>-	BT_MBOX(0, LE_PROF1, 3, 1),</div><div class='del'>-	BT_MBOX(0, LE_PROF2, 4, 1),</div><div class='del'>-	BT_MBOX(0, LE_PROF_OTHER, 5, 1),</div><div class='del'>-	BT_MBOX(0, CHL_SEQ_N, 8, 4),</div><div class='del'>-	BT_MBOX(0, INBAND_S, 13, 1),</div><div class='del'>-	BT_MBOX(0, LE_MIN_RSSI, 16, 4),</div><div class='del'>-	BT_MBOX(0, LE_SCAN, 20, 1),</div><div class='del'>-	BT_MBOX(0, LE_ADV, 21, 1),</div><div class='del'>-	BT_MBOX(0, LE_MAX_TX_POWER, 24, 4),</div><div class='del'>-	BT_MBOX(0, OPEN_CON_1, 28, 2),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum iwl_bt_mxbox_dw1 {</div><div class='del'>-	BT_MBOX(1, BR_MAX_TX_POWER, 0, 4),</div><div class='del'>-	BT_MBOX(1, IP_SR, 4, 1),</div><div class='del'>-	BT_MBOX(1, LE_MSTR, 5, 1),</div><div class='del'>-	BT_MBOX(1, AGGR_TRFC_LD, 8, 6),</div><div class='del'>-	BT_MBOX(1, MSG_TYPE, 16, 3),</div><div class='del'>-	BT_MBOX(1, SSN, 19, 2),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum iwl_bt_mxbox_dw2 {</div><div class='del'>-	BT_MBOX(2, SNIFF_ACT, 0, 3),</div><div class='del'>-	BT_MBOX(2, PAG, 3, 1),</div><div class='del'>-	BT_MBOX(2, INQUIRY, 4, 1),</div><div class='del'>-	BT_MBOX(2, CONN, 5, 1),</div><div class='del'>-	BT_MBOX(2, SNIFF_INTERVAL, 8, 5),</div><div class='del'>-	BT_MBOX(2, DISC, 13, 1),</div><div class='del'>-	BT_MBOX(2, SCO_TX_ACT, 16, 2),</div><div class='del'>-	BT_MBOX(2, SCO_RX_ACT, 18, 2),</div><div class='del'>-	BT_MBOX(2, ESCO_RE_TX, 20, 2),</div><div class='del'>-	BT_MBOX(2, SCO_DURATION, 24, 6),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum iwl_bt_mxbox_dw3 {</div><div class='del'>-	BT_MBOX(3, SCO_STATE, 0, 1),</div><div class='del'>-	BT_MBOX(3, SNIFF_STATE, 1, 1),</div><div class='del'>-	BT_MBOX(3, A2DP_STATE, 2, 1),</div><div class='del'>-	BT_MBOX(3, ACL_STATE, 3, 1),</div><div class='del'>-	BT_MBOX(3, MSTR_STATE, 4, 1),</div><div class='del'>-	BT_MBOX(3, OBX_STATE, 5, 1),</div><div class='del'>-	BT_MBOX(3, A2DP_SRC, 6, 1),</div><div class='del'>-	BT_MBOX(3, OPEN_CON_2, 8, 2),</div><div class='del'>-	BT_MBOX(3, TRAFFIC_LOAD, 10, 2),</div><div class='del'>-	BT_MBOX(3, CHL_SEQN_LSB, 12, 1),</div><div class='del'>-	BT_MBOX(3, INBAND_P, 13, 1),</div><div class='del'>-	BT_MBOX(3, MSG_TYPE_2, 16, 3),</div><div class='del'>-	BT_MBOX(3, SSN_2, 19, 2),</div><div class='del'>-	BT_MBOX(3, UPDATE_REQUEST, 21, 1),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BT_MBOX_MSG(_notif, _num, _field)				     \</div><div class='del'>-	((le32_to_cpu((_notif)-&gt;mbox_msg[(_num)]) &amp; BT_MBOX##_num##_##_field)\</div><div class='del'>-	&gt;&gt; BT_MBOX##_num##_##_field##_POS)</div><div class='del'>-</div><div class='del'>-#define BT_MBOX_PRINT(_num, _field, _end)				    \</div><div class='del'>-			pos += scnprintf(buf + pos, bufsz - pos,	    \</div><div class='del'>-					 "\t%s: %d%s",			    \</div><div class='del'>-					 #_field,			    \</div><div class='del'>-					 BT_MBOX_MSG(notif, _num, _field),  \</div><div class='del'>-					 true ? "\n" : ", ");</div><div class='ctx'> enum iwl_bt_activity_grading {</div><div class='ctx'> 	BT_OFF			= 0,</div><div class='ctx'> 	BT_ON_NO_CONNECTION	= 1,</div><div class='hunk'>@@ -161,7 +95,7 @@ enum iwl_bt_ci_compliance {</div><div class='ctx'> }; /* BT_COEX_CI_COMPLIENCE_E_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_bt_coex_profile_notif - notification about BT coex</div><div class='add'>+ * struct iwl_bt_coex_prof_old_notif - notification about BT coex</div><div class='ctx'>  * @mbox_msg: message from BT to WiFi</div><div class='ctx'>  * @msg_idx: the index of the message</div><div class='ctx'>  * @bt_ci_compliance: enum %iwl_bt_ci_compliance</div><div class='hunk'>@@ -170,9 +104,13 @@ enum iwl_bt_ci_compliance {</div><div class='ctx'>  * @bt_activity_grading: the activity of BT &amp;enum iwl_bt_activity_grading</div><div class='ctx'>  * @ttc_status: is TTC enabled - one bit per PHY</div><div class='ctx'>  * @rrc_status: is RRC enabled - one bit per PHY</div><div class='del'>- * @reserved: reserved</div><div class='add'>+ * The following fields are only for version 5, and are reserved in version 4:</div><div class='add'>+ * @wifi_loss_low_rssi: The predicted lost WiFi rate (% of air time that BT is</div><div class='add'>+ *	utilizing) when the RSSI is low (&lt;= -65 dBm)</div><div class='add'>+ * @wifi_loss_mid_high_rssi: The predicted lost WiFi rate (% of air time that</div><div class='add'>+ *	BT is utilizing) when the RSSI is mid/high (&gt;= -65 dBm)</div><div class='ctx'>  */</div><div class='del'>-struct iwl_bt_coex_profile_notif {</div><div class='add'>+struct iwl_bt_coex_prof_old_notif {</div><div class='ctx'> 	__le32 mbox_msg[4];</div><div class='ctx'> 	__le32 msg_idx;</div><div class='ctx'> 	__le32 bt_ci_compliance;</div><div class='hunk'>@@ -182,7 +120,35 @@ struct iwl_bt_coex_profile_notif {</div><div class='ctx'> 	__le32 bt_activity_grading;</div><div class='ctx'> 	u8 ttc_status;</div><div class='ctx'> 	u8 rrc_status;</div><div class='del'>-	__le16 reserved;</div><div class='del'>-} __packed; /* BT_COEX_PROFILE_NTFY_API_S_VER_4 */</div><div class='add'>+	u8 wifi_loss_low_rssi;</div><div class='add'>+	u8 wifi_loss_mid_high_rssi;</div><div class='add'>+} __packed; /* BT_COEX_PROFILE_NTFY_API_S_VER_4</div><div class='add'>+	     * BT_COEX_PROFILE_NTFY_API_S_VER_5</div><div class='add'>+	     */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_bt_coex_subcmd_ids - coex configuration command IDs</div><div class='add'>+ */</div><div class='add'>+enum iwl_bt_coex_subcmd_ids {</div><div class='add'>+       /**</div><div class='add'>+	*@PROFILE_NOTIF: &amp;struct iwl_bt_coex_profile_notif</div><div class='add'>+	*/</div><div class='add'>+	PROFILE_NOTIF = 0xFF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define COEX_NUM_BAND	3</div><div class='add'>+#define COEX_NUM_CHAINS	2</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_bt_coex_profile_notif - notification about BT coex</div><div class='add'>+ * @wifi_loss_low_rssi: The predicted lost WiFi rate (% of air time that BT is</div><div class='add'>+ *	utilizing) when the RSSI is low (&lt;= -65 dBm)</div><div class='add'>+ * @wifi_loss_mid_high_rssi: The predicted lost WiFi rate (% of air time that</div><div class='add'>+ *	BT is utilizing) when the RSSI is mid/high (&gt;= -65 dBm)</div><div class='add'>+ */</div><div class='add'>+struct iwl_bt_coex_profile_notif {</div><div class='add'>+	u8 wifi_loss_low_rssi[COEX_NUM_BAND][COEX_NUM_CHAINS];</div><div class='add'>+	u8 wifi_loss_mid_high_rssi[COEX_NUM_BAND][COEX_NUM_CHAINS];</div><div class='add'>+} __packed; /* BT_COEX_BT_PROFILE_NTF_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> #endif /* __iwl_fw_api_coex_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h b/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h<br/>index c625d319142e..8d64a271bb94 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/commands.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/commands.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2018-2022, 2024-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_fw_api_commands_h__</div><div class='ctx'> #define __iwl_fw_api_commands_h__</div><div class='hunk'>@@ -20,14 +20,20 @@</div><div class='ctx'>  *	&amp;enum iwl_phy_ops_subcmd_ids</div><div class='ctx'>  * @DATA_PATH_GROUP: data path group, uses command IDs from</div><div class='ctx'>  *	&amp;enum iwl_data_path_subcmd_ids</div><div class='add'>+ * @SCAN_GROUP: scan group, uses command IDs from</div><div class='add'>+ *	&amp;enum iwl_scan_subcmd_ids</div><div class='ctx'>  * @NAN_GROUP: NAN group, uses command IDs from &amp;enum iwl_nan_subcmd_ids</div><div class='ctx'>  * @LOCATION_GROUP: location group, uses command IDs from</div><div class='ctx'>  *	&amp;enum iwl_location_subcmd_ids</div><div class='add'>+ * @BT_COEX_GROUP: bt coex group, uses command IDs from</div><div class='add'>+ *	&amp;enum iwl_bt_coex_subcmd_ids</div><div class='ctx'>  * @PROT_OFFLOAD_GROUP: protocol offload group, uses command IDs from</div><div class='ctx'>  *	&amp;enum iwl_prot_offload_subcmd_ids</div><div class='ctx'>  * @REGULATORY_AND_NVM_GROUP: regulatory/NVM group, uses command IDs from</div><div class='ctx'>  *	&amp;enum iwl_regulatory_and_nvm_subcmd_ids</div><div class='ctx'>  * @DEBUG_GROUP: Debug group, uses command IDs from &amp;enum iwl_debug_cmds</div><div class='add'>+ * @STATISTICS_GROUP: Statistics group, uses command IDs from</div><div class='add'>+ *	&amp;enum iwl_statistics_subcmd_ids</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_mvm_command_groups {</div><div class='ctx'> 	LEGACY_GROUP = 0x0,</div><div class='hunk'>@@ -36,11 +42,14 @@ enum iwl_mvm_command_groups {</div><div class='ctx'> 	MAC_CONF_GROUP = 0x3,</div><div class='ctx'> 	PHY_OPS_GROUP = 0x4,</div><div class='ctx'> 	DATA_PATH_GROUP = 0x5,</div><div class='add'>+	SCAN_GROUP = 0x6,</div><div class='ctx'> 	NAN_GROUP = 0x7,</div><div class='ctx'> 	LOCATION_GROUP = 0x8,</div><div class='add'>+	BT_COEX_GROUP = 0x9,</div><div class='ctx'> 	PROT_OFFLOAD_GROUP = 0xb,</div><div class='ctx'> 	REGULATORY_AND_NVM_GROUP = 0xc,</div><div class='ctx'> 	DEBUG_GROUP = 0xf,</div><div class='add'>+	STATISTICS_GROUP = 0x10,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -51,7 +60,7 @@ enum iwl_legacy_cmds {</div><div class='ctx'> 	 * @UCODE_ALIVE_NTFY:</div><div class='ctx'> 	 * Alive data from the firmware, as described in</div><div class='ctx'> 	 * &amp;struct iwl_alive_ntf_v3 or &amp;struct iwl_alive_ntf_v4 or</div><div class='del'>-	 * &amp;struct iwl_alive_ntf_v5.</div><div class='add'>+	 * &amp;struct iwl_alive_ntf_v5 or &amp;struct iwl_alive_ntf_v7.</div><div class='ctx'> 	 */</div><div class='ctx'> 	UCODE_ALIVE_NTFY = 0x1,</div><div class='ctx'> </div><div class='hunk'>@@ -72,7 +81,8 @@ enum iwl_legacy_cmds {</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @PHY_CONTEXT_CMD:</div><div class='del'>-	 * Add/modify/remove a PHY context, using &amp;struct iwl_phy_context_cmd.</div><div class='add'>+	 * Add/modify/remove a PHY context, using &amp;struct iwl_phy_context_cmd</div><div class='add'>+	 *	or &amp;struct iwl_phy_context_cmd_v1.</div><div class='ctx'> 	 */</div><div class='ctx'> 	PHY_CONTEXT_CMD = 0x8,</div><div class='ctx'> </div><div class='hunk'>@@ -90,7 +100,8 @@ enum iwl_legacy_cmds {</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @SCAN_CFG_CMD:</div><div class='del'>-	 * uses &amp;struct iwl_scan_config_v1 or &amp;struct iwl_scan_config</div><div class='add'>+	 * uses &amp;struct iwl_scan_config_v1, &amp;struct iwl_scan_config_v2</div><div class='add'>+	 * or &amp;struct iwl_scan_config</div><div class='ctx'> 	 */</div><div class='ctx'> 	SCAN_CFG_CMD = 0xc,</div><div class='ctx'> </div><div class='hunk'>@@ -134,20 +145,16 @@ enum iwl_legacy_cmds {</div><div class='ctx'> 	REMOVE_STA = 0x19,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @FW_GET_ITEM_CMD: uses &amp;struct iwl_fw_get_item_cmd</div><div class='del'>-	 */</div><div class='del'>-	FW_GET_ITEM_CMD = 0x1a,</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @TX_CMD: uses &amp;struct iwl_tx_cmd or &amp;struct iwl_tx_cmd_gen2 or</div><div class='del'>-	 *	&amp;struct iwl_tx_cmd_gen3,</div><div class='del'>-	 *	response in &amp;struct iwl_mvm_tx_resp or</div><div class='del'>-	 *	&amp;struct iwl_mvm_tx_resp_v3</div><div class='add'>+	 * @TX_CMD: uses &amp;struct iwl_tx_cmd_v6 or &amp;struct iwl_tx_cmd_v9 or</div><div class='add'>+	 *	&amp;struct iwl_tx_cmd,</div><div class='add'>+	 *	response in &amp;struct iwl_tx_resp or</div><div class='add'>+	 *	&amp;struct iwl_tx_resp_v3</div><div class='ctx'> 	 */</div><div class='ctx'> 	TX_CMD = 0x1c,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @TXPATH_FLUSH: &amp;struct iwl_tx_path_flush_cmd</div><div class='add'>+	 *	response in &amp;struct iwl_tx_path_flush_cmd_rsp</div><div class='ctx'> 	 */</div><div class='ctx'> 	TXPATH_FLUSH = 0x1e,</div><div class='ctx'> </div><div class='hunk'>@@ -260,6 +267,24 @@ enum iwl_legacy_cmds {</div><div class='ctx'> 	HOT_SPOT_CMD = 0x53,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @WNM_80211V_TIMING_MEASUREMENT_NOTIFICATION: Time Sync</div><div class='add'>+	 *	measurement notification for TM/FTM. Sent on receipt of</div><div class='add'>+	 *	respective WNM action frame for TM protocol or public action</div><div class='add'>+	 *	frame for FTM protocol from peer device along with additional</div><div class='add'>+	 *	meta data specified in &amp;struct iwl_time_msmt_notify</div><div class='add'>+	 */</div><div class='add'>+	WNM_80211V_TIMING_MEASUREMENT_NOTIFICATION = 0x67,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @WNM_80211V_TIMING_MEASUREMENT_CONFIRM_NOTIFICATION: Time Sync</div><div class='add'>+	 *	measurement confirmation notification for TM/FTM. Sent on</div><div class='add'>+	 *	receipt of Ack from peer for previously Tx'ed TM/FTM</div><div class='add'>+	 *	action frame along with additional meta data specified in</div><div class='add'>+	 *	&amp;struct iwl_time_msmt_cfm_notify</div><div class='add'>+	 */</div><div class='add'>+	WNM_80211V_TIMING_MEASUREMENT_CONFIRM_NOTIFICATION = 0x68,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @SCAN_OFFLOAD_COMPLETE:</div><div class='ctx'> 	 * notification, &amp;struct iwl_periodic_scan_complete</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -321,14 +346,6 @@ enum iwl_legacy_cmds {</div><div class='ctx'> 	REPLY_THERMAL_MNG_BACKOFF = 0x7e,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @DC2DC_CONFIG_CMD:</div><div class='del'>-	 * Set/Get DC2DC frequency tune</div><div class='del'>-	 * Command is &amp;struct iwl_dc2dc_config_cmd,</div><div class='del'>-	 * response is &amp;struct iwl_dc2dc_config_resp</div><div class='del'>-	 */</div><div class='del'>-	DC2DC_CONFIG_CMD = 0x83,</div><div class='del'>-</div><div class='del'>-	/**</div><div class='ctx'> 	 * @NVM_ACCESS_CMD: using &amp;struct iwl_nvm_access_cmd</div><div class='ctx'> 	 */</div><div class='ctx'> 	NVM_ACCESS_CMD = 0x88,</div><div class='hunk'>@@ -356,7 +373,7 @@ enum iwl_legacy_cmds {</div><div class='ctx'> 	 * &amp;struct iwl_notif_statistics_v11,</div><div class='ctx'> 	 * &amp;struct iwl_notif_statistics_v10,</div><div class='ctx'> 	 * &amp;struct iwl_notif_statistics,</div><div class='del'>-	 * &amp;struct iwl_statistics_operational_ntfy</div><div class='add'>+	 * &amp;struct iwl_statistics_operational_ntfy_ver_14</div><div class='ctx'> 	 */</div><div class='ctx'> 	STATISTICS_CMD = 0x9c,</div><div class='ctx'> </div><div class='hunk'>@@ -365,6 +382,7 @@ enum iwl_legacy_cmds {</div><div class='ctx'> 	 * one of &amp;struct iwl_notif_statistics_v10,</div><div class='ctx'> 	 * &amp;struct iwl_notif_statistics_v11,</div><div class='ctx'> 	 * &amp;struct iwl_notif_statistic,</div><div class='add'>+	 * &amp;struct iwl_statistics_operational_ntfy_ver_14</div><div class='ctx'> 	 * &amp;struct iwl_statistics_operational_ntfy</div><div class='ctx'> 	 */</div><div class='ctx'> 	STATISTICS_NOTIFICATION = 0x9d,</div><div class='hunk'>@@ -383,14 +401,7 @@ enum iwl_legacy_cmds {</div><div class='ctx'> 	REDUCE_TX_POWER_CMD = 0x9f,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @CARD_STATE_NOTIFICATION:</div><div class='del'>-	 * Card state (RF/CT kill) notification,</div><div class='del'>-	 * uses &amp;struct iwl_card_state_notif</div><div class='del'>-	 */</div><div class='del'>-	CARD_STATE_NOTIFICATION = 0xa1,</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @MISSED_BEACONS_NOTIFICATION: &amp;struct iwl_missed_beacons_notif</div><div class='add'>+	 * @MISSED_BEACONS_NOTIFICATION: &amp;struct iwl_missed_beacons_notif_v4</div><div class='ctx'> 	 */</div><div class='ctx'> 	MISSED_BEACONS_NOTIFICATION = 0xa2,</div><div class='ctx'> </div><div class='hunk'>@@ -436,7 +447,7 @@ enum iwl_legacy_cmds {</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @BA_NOTIF:</div><div class='del'>-	 * BlockAck notification, uses &amp;struct iwl_mvm_compressed_ba_notif</div><div class='add'>+	 * BlockAck notification, uses &amp;struct iwl_compressed_ba_notif</div><div class='ctx'> 	 * or &amp;struct iwl_mvm_ba_notif depending on the HW</div><div class='ctx'> 	 */</div><div class='ctx'> 	BA_NOTIF = 0xc5,</div><div class='hunk'>@@ -459,7 +470,7 @@ enum iwl_legacy_cmds {</div><div class='ctx'> 	MARKER_CMD = 0xcb,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @BT_PROFILE_NOTIFICATION: &amp;struct iwl_bt_coex_profile_notif</div><div class='add'>+	 * @BT_PROFILE_NOTIFICATION: &amp;struct iwl_bt_coex_prof_old_notif</div><div class='ctx'> 	 */</div><div class='ctx'> 	BT_PROFILE_NOTIFICATION = 0xce,</div><div class='ctx'> </div><div class='hunk'>@@ -491,11 +502,16 @@ enum iwl_legacy_cmds {</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @DTS_MEASUREMENT_NOTIFICATION:</div><div class='ctx'> 	 * &amp;struct iwl_dts_measurement_notif_v1 or</div><div class='del'>-	 * &amp;struct iwl_dts_measurement_notif_v2</div><div class='add'>+	 * &amp;struct iwl_dts_measurement_notif</div><div class='ctx'> 	 */</div><div class='ctx'> 	DTS_MEASUREMENT_NOTIFICATION = 0xdd,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @DEBUG_HOST_COMMAND: &amp;struct iwl_dhc_cmd</div><div class='add'>+	 */</div><div class='add'>+	DEBUG_HOST_COMMAND = 0xf1,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @LDBG_CONFIG_CMD: configure continuous trace recording</div><div class='ctx'> 	 */</div><div class='ctx'> 	LDBG_CONFIG_CMD = 0xf6,</div><div class='hunk'>@@ -506,11 +522,6 @@ enum iwl_legacy_cmds {</div><div class='ctx'> 	DEBUG_LOG_MSG = 0xf7,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @BCAST_FILTER_CMD: &amp;struct iwl_bcast_filter_cmd</div><div class='del'>-	 */</div><div class='del'>-	BCAST_FILTER_CMD = 0xcf,</div><div class='del'>-</div><div class='del'>-	/**</div><div class='ctx'> 	 * @MCAST_FILTER_CMD: &amp;struct iwl_mcast_filter_cmd</div><div class='ctx'> 	 */</div><div class='ctx'> 	MCAST_FILTER_CMD = 0xd0,</div><div class='hunk'>@@ -529,17 +540,6 @@ enum iwl_legacy_cmds {</div><div class='ctx'> 	PROT_OFFLOAD_CONFIG_CMD = 0xd4,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @OFFLOADS_QUERY_CMD:</div><div class='del'>-	 * No data in command, response in &amp;struct iwl_wowlan_status</div><div class='del'>-	 */</div><div class='del'>-	OFFLOADS_QUERY_CMD = 0xd5,</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @REMOTE_WAKE_CONFIG_CMD: &amp;struct iwl_wowlan_remote_wake_config</div><div class='del'>-	 */</div><div class='del'>-	REMOTE_WAKE_CONFIG_CMD = 0xd6,</div><div class='del'>-</div><div class='del'>-	/**</div><div class='ctx'> 	 * @D0I3_END_CMD: End D0i3/D3 state, no command data</div><div class='ctx'> 	 */</div><div class='ctx'> 	D0I3_END_CMD = 0xed,</div><div class='hunk'>@@ -555,7 +555,8 @@ enum iwl_legacy_cmds {</div><div class='ctx'> 	WOWLAN_CONFIGURATION = 0xe1,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @WOWLAN_TSC_RSC_PARAM: &amp;struct iwl_wowlan_rsc_tsc_params_cmd</div><div class='add'>+	 * @WOWLAN_TSC_RSC_PARAM: &amp;struct iwl_wowlan_rsc_tsc_params_cmd_v4,</div><div class='add'>+	 *	&amp;struct iwl_wowlan_rsc_tsc_params_cmd</div><div class='ctx'> 	 */</div><div class='ctx'> 	WOWLAN_TSC_RSC_PARAM = 0xe2,</div><div class='ctx'> </div><div class='hunk'>@@ -565,18 +566,21 @@ enum iwl_legacy_cmds {</div><div class='ctx'> 	WOWLAN_TKIP_PARAM = 0xe3,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @WOWLAN_KEK_KCK_MATERIAL: &amp;struct iwl_wowlan_kek_kck_material_cmd</div><div class='add'>+	 * @WOWLAN_KEK_KCK_MATERIAL: &amp;struct iwl_wowlan_kek_kck_material_cmd_v2,</div><div class='add'>+	 * &amp;struct iwl_wowlan_kek_kck_material_cmd_v3 or</div><div class='add'>+	 * &amp;struct iwl_wowlan_kek_kck_material_cmd_v4</div><div class='ctx'> 	 */</div><div class='ctx'> 	WOWLAN_KEK_KCK_MATERIAL = 0xe4,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @WOWLAN_GET_STATUSES: response in &amp;struct iwl_wowlan_status</div><div class='add'>+	 * @WOWLAN_GET_STATUSES: response in &amp;struct iwl_wowlan_status_v6 or</div><div class='add'>+	 *	&amp;struct iwl_wowlan_status_v7</div><div class='ctx'> 	 */</div><div class='ctx'> 	WOWLAN_GET_STATUSES = 0xe5,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @SCAN_OFFLOAD_PROFILES_QUERY_CMD:</div><div class='del'>-	 * No command data, response is &amp;struct iwl_scan_offload_profiles_query</div><div class='add'>+	 * @SCAN_OFFLOAD_PROFILES_QUERY_CMD: No command data, response is</div><div class='add'>+	 *	&amp;struct iwl_scan_offload_profiles_query_v1</div><div class='ctx'> 	 */</div><div class='ctx'> 	SCAN_OFFLOAD_PROFILES_QUERY_CMD = 0x56,</div><div class='ctx'> };</div><div class='hunk'>@@ -616,6 +620,43 @@ enum iwl_system_subcmd_ids {</div><div class='ctx'> 	 * @RFI_GET_FREQ_TABLE_CMD: &amp;struct iwl_rfi_config_cmd</div><div class='ctx'> 	 */</div><div class='ctx'> 	RFI_GET_FREQ_TABLE_CMD = 0xc,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @SYSTEM_FEATURES_CONTROL_CMD: &amp;struct iwl_system_features_control_cmd</div><div class='add'>+	 */</div><div class='add'>+	SYSTEM_FEATURES_CONTROL_CMD = 0xd,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @SYSTEM_STATISTICS_CMD: &amp;struct iwl_system_statistics_cmd</div><div class='add'>+	 */</div><div class='add'>+	SYSTEM_STATISTICS_CMD = 0xf,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @SYSTEM_STATISTICS_END_NOTIF: &amp;struct iwl_system_statistics_end_notif</div><div class='add'>+	 */</div><div class='add'>+	SYSTEM_STATISTICS_END_NOTIF = 0xfd,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @RFI_DEACTIVATE_NOTIF: &amp;struct iwl_rfi_deactivate_notif</div><div class='add'>+	 */</div><div class='add'>+	RFI_DEACTIVATE_NOTIF = 0xff,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_statistics_subcmd_ids - Statistics group command IDs</div><div class='add'>+ */</div><div class='add'>+enum iwl_statistics_subcmd_ids {</div><div class='add'>+	/**</div><div class='add'>+	 * @STATISTICS_OPER_NOTIF: Notification about operational</div><div class='add'>+	 *	statistics &amp;struct iwl_system_statistics_notif_oper</div><div class='add'>+	 */</div><div class='add'>+	STATISTICS_OPER_NOTIF = 0x0,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @STATISTICS_OPER_PART1_NOTIF: Notification about operational part1</div><div class='add'>+	 *	statistics &amp;struct iwl_system_statistics_part1_notif_oper</div><div class='add'>+	 */</div><div class='add'>+	STATISTICS_OPER_PART1_NOTIF = 0x1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* __iwl_fw_api_commands_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/config.h b/drivers/net/wireless/intel/iwlwifi/fw/api/config.h<br/>index 1ab92f62c414..1fc65469990e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/config.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/config.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/config.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/config.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2019 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2019, 2023-2024 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -67,21 +67,16 @@ enum iwl_calib_cfg {</div><div class='ctx'>  * Sent as part of the phy configuration command (v3) to configure specific FW</div><div class='ctx'>  * defined PHY filters that can be applied to each antenna.</div><div class='ctx'>  *</div><div class='del'>- * @filter_cfg_chain_a: filter config id for LMAC1 chain A</div><div class='del'>- * @filter_cfg_chain_b: filter config id for LMAC1 chain B</div><div class='del'>- * @filter_cfg_chain_c: filter config id for LMAC2 chain A</div><div class='del'>- * @filter_cfg_chain_d: filter config id for LMAC2 chain B</div><div class='del'>- * values: 0 - no filter; 0xffffffff - reserved; otherwise - filter id</div><div class='add'>+ * @filter_cfg_chains: filter config id for LMAC1 chain A, LMAC1 chain B,</div><div class='add'>+ *	LMAC2 chain A, LMAC2 chain B (in that order)</div><div class='add'>+ *	values: 0: no filter; 0xffffffff: reserved; otherwise: filter id</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_phy_specific_cfg {</div><div class='del'>-	__le32 filter_cfg_chain_a;</div><div class='del'>-	__le32 filter_cfg_chain_b;</div><div class='del'>-	__le32 filter_cfg_chain_c;</div><div class='del'>-	__le32 filter_cfg_chain_d;</div><div class='add'>+	__le32 filter_cfg_chains[4];</div><div class='ctx'> } __packed; /* PHY_SPECIFIC_CONFIGURATION_API_VER_1*/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_phy_cfg_cmd - Phy configuration command</div><div class='add'>+ * struct iwl_phy_cfg_cmd_v1 - Phy configuration command</div><div class='ctx'>  *</div><div class='ctx'>  * @phy_cfg: PHY configuration value, uses &amp;enum iwl_fw_phy_cfg</div><div class='ctx'>  * @calib_control: calibration control data</div><div class='hunk'>@@ -114,37 +109,4 @@ enum iwl_dc2dc_config_id {</div><div class='ctx'> 	DCDC_FREQ_TUNE_SET = 0x2,</div><div class='ctx'> }; /* MARKER_ID_API_E_VER_1 */</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct iwl_dc2dc_config_cmd - configure dc2dc values</div><div class='del'>- *</div><div class='del'>- * (DC2DC_CONFIG_CMD = 0x83)</div><div class='del'>- *</div><div class='del'>- * Set/Get &amp; configure dc2dc values.</div><div class='del'>- * The command always returns the current dc2dc values.</div><div class='del'>- *</div><div class='del'>- * @flags: set/get dc2dc</div><div class='del'>- * @enable_low_power_mode: not used.</div><div class='del'>- * @dc2dc_freq_tune0: frequency divider - digital domain</div><div class='del'>- * @dc2dc_freq_tune1: frequency divider - analog domain</div><div class='del'>- */</div><div class='del'>-struct iwl_dc2dc_config_cmd {</div><div class='del'>-	__le32 flags;</div><div class='del'>-	__le32 enable_low_power_mode; /* not used */</div><div class='del'>-	__le32 dc2dc_freq_tune0;</div><div class='del'>-	__le32 dc2dc_freq_tune1;</div><div class='del'>-} __packed; /* DC2DC_CONFIG_CMD_API_S_VER_1 */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iwl_dc2dc_config_resp - response for iwl_dc2dc_config_cmd</div><div class='del'>- *</div><div class='del'>- * Current dc2dc values returned by the FW.</div><div class='del'>- *</div><div class='del'>- * @dc2dc_freq_tune0: frequency divider - digital domain</div><div class='del'>- * @dc2dc_freq_tune1: frequency divider - analog domain</div><div class='del'>- */</div><div class='del'>-struct iwl_dc2dc_config_resp {</div><div class='del'>-	__le32 dc2dc_freq_tune0;</div><div class='del'>-	__le32 dc2dc_freq_tune1;</div><div class='del'>-} __packed; /* DC2DC_CONFIG_RESP_API_S_VER_1 */</div><div class='del'>-</div><div class='ctx'> #endif /* __iwl_fw_api_config_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/context.h b/drivers/net/wireless/intel/iwlwifi/fw/api/context.h<br/>index 105ba7170c3f..464eed9b5e71 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/context.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/context.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/context.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/context.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2022, 2024 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -14,6 +14,9 @@</div><div class='ctx'>  * @FW_CTXT_COLOR_POS: position of the color</div><div class='ctx'>  * @FW_CTXT_COLOR_MSK: mask of the color</div><div class='ctx'>  * @FW_CTXT_INVALID: value used to indicate unused/invalid</div><div class='add'>+ * @FW_CTXT_ID_INVALID: value used to indicate unused/invalid. This can be</div><div class='add'>+ *	used with newer firmware which no longer use the color. Typically,</div><div class='add'>+ *	firmware versions supported by iwlmld can use this value.</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_ctxt_id_and_color {</div><div class='ctx'> 	FW_CTXT_ID_POS		= 0,</div><div class='hunk'>@@ -21,18 +24,27 @@ enum iwl_ctxt_id_and_color {</div><div class='ctx'> 	FW_CTXT_COLOR_POS	= 8,</div><div class='ctx'> 	FW_CTXT_COLOR_MSK	= 0xff &lt;&lt; FW_CTXT_COLOR_POS,</div><div class='ctx'> 	FW_CTXT_INVALID		= 0xffffffff,</div><div class='add'>+	FW_CTXT_ID_INVALID	= 0xff,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define FW_CMD_ID_AND_COLOR(_id, _color) (((_id) &lt;&lt; FW_CTXT_ID_POS) |\</div><div class='ctx'> 					  ((_color) &lt;&lt; FW_CTXT_COLOR_POS))</div><div class='ctx'> </div><div class='del'>-/* Possible actions on PHYs, MACs and Bindings */</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_ctxt_action - Posssible actions on PHYs, MACs, Bindings and other</div><div class='add'>+ * @FW_CTXT_ACTION_INVALID: unused, invalid action</div><div class='add'>+ * @FW_CTXT_ACTION_ADD: add the context</div><div class='add'>+ * @FW_CTXT_ACTION_MODIFY: modify the context</div><div class='add'>+ * @FW_CTXT_ACTION_REMOVE: remove the context</div><div class='add'>+ */</div><div class='ctx'> enum iwl_ctxt_action {</div><div class='del'>-	FW_CTXT_ACTION_STUB = 0,</div><div class='add'>+	FW_CTXT_ACTION_INVALID = 0,</div><div class='ctx'> 	FW_CTXT_ACTION_ADD,</div><div class='ctx'> 	FW_CTXT_ACTION_MODIFY,</div><div class='ctx'> 	FW_CTXT_ACTION_REMOVE,</div><div class='del'>-	FW_CTXT_ACTION_NUM</div><div class='ctx'> }; /* COMMON_CONTEXT_ACTION_API_E_VER_1 */</div><div class='ctx'> </div><div class='add'>+#define IWL_LMAC_24G_INDEX		0</div><div class='add'>+#define IWL_LMAC_5G_INDEX		1</div><div class='add'>+</div><div class='ctx'> #endif /* __iwl_fw_api_context_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h b/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h<br/>index 758639084e0c..d3bed0216df4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/d3.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/d3.h</a></div><div class='hunk'>@@ -1,11 +1,12 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_fw_api_d3_h__</div><div class='ctx'> #define __iwl_fw_api_d3_h__</div><div class='add'>+#include &lt;iwl-trans.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_d0i3_flags - d0i3 flags</div><div class='hunk'>@@ -18,9 +19,11 @@ enum iwl_d0i3_flags {</div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_d3_wakeup_flags - D3 manager wakeup flags</div><div class='ctx'>  * @IWL_WAKEUP_D3_CONFIG_FW_ERROR: wake up on firmware sysassert</div><div class='add'>+ * @IWL_WAKEUP_D3_HOST_TIMER: wake up on host timer expiry</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_d3_wakeup_flags {</div><div class='del'>-	IWL_WAKEUP_D3_CONFIG_FW_ERROR = BIT(0),</div><div class='add'>+	IWL_WAKEUP_D3_CONFIG_FW_ERROR	= BIT(0),</div><div class='add'>+	IWL_WAKEUP_D3_HOST_TIMER	= BIT(1),</div><div class='ctx'> }; /* D3_MANAGER_WAKEUP_CONFIG_API_E_VER_3 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -41,17 +44,19 @@ struct iwl_d3_manager_config {</div><div class='ctx'> /* TODO: OFFLOADS_QUERY_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum iwl_d3_proto_offloads - enabled protocol offloads</div><div class='add'>+ * enum iwl_proto_offloads - enabled protocol offloads</div><div class='ctx'>  * @IWL_D3_PROTO_OFFLOAD_ARP: ARP data is enabled</div><div class='ctx'>  * @IWL_D3_PROTO_OFFLOAD_NS: NS (Neighbor Solicitation) is enabled</div><div class='ctx'>  * @IWL_D3_PROTO_IPV4_VALID: IPv4 data is valid</div><div class='ctx'>  * @IWL_D3_PROTO_IPV6_VALID: IPv6 data is valid</div><div class='add'>+ * @IWL_D3_PROTO_OFFLOAD_BTM: BTM offload is enabled</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_proto_offloads {</div><div class='ctx'> 	IWL_D3_PROTO_OFFLOAD_ARP = BIT(0),</div><div class='ctx'> 	IWL_D3_PROTO_OFFLOAD_NS = BIT(1),</div><div class='ctx'> 	IWL_D3_PROTO_IPV4_VALID = BIT(2),</div><div class='ctx'> 	IWL_D3_PROTO_IPV6_VALID = BIT(3),</div><div class='add'>+	IWL_D3_PROTO_OFFLOAD_BTM = BIT(4),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IWL_PROTO_OFFLOAD_NUM_IPV6_ADDRS_V1	2</div><div class='hunk'>@@ -159,6 +164,22 @@ struct iwl_proto_offload_cmd_v3_large {</div><div class='ctx'> 	struct iwl_ns_config ns_config[IWL_PROTO_OFFLOAD_NUM_NS_CONFIG_V3L];</div><div class='ctx'> } __packed; /* PROT_OFFLOAD_CONFIG_CMD_DB_S_VER_3 */</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct iwl_proto_offload_cmd_v4 - ARP/NS offload configuration</div><div class='add'>+ * @sta_id: station id</div><div class='add'>+ * @common: common/IPv4 configuration</div><div class='add'>+ * @num_valid_ipv6_addrs: number of valid IPv6 addresses</div><div class='add'>+ * @targ_addrs: target IPv6 addresses</div><div class='add'>+ * @ns_config: NS offload configurations</div><div class='add'>+ */</div><div class='add'>+struct iwl_proto_offload_cmd_v4 {</div><div class='add'>+	__le32 sta_id;</div><div class='add'>+	struct iwl_proto_offload_cmd_common common;</div><div class='add'>+	__le32 num_valid_ipv6_addrs;</div><div class='add'>+	struct iwl_targ_addr targ_addrs[IWL_PROTO_OFFLOAD_NUM_IPV6_ADDRS_V3L];</div><div class='add'>+	struct iwl_ns_config ns_config[IWL_PROTO_OFFLOAD_NUM_NS_CONFIG_V3L];</div><div class='add'>+} __packed; /* PROT_OFFLOAD_CONFIG_CMD_DB_S_VER_4 */</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * WOWLAN_PATTERNS</div><div class='ctx'>  */</div><div class='hunk'>@@ -176,7 +197,7 @@ struct iwl_wowlan_pattern_v1 {</div><div class='ctx'> #define IWL_WOWLAN_MAX_PATTERNS	20</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_wowlan_patterns_cmd - WoWLAN wakeup patterns</div><div class='add'>+ * struct iwl_wowlan_patterns_cmd_v1 - WoWLAN wakeup patterns</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_wowlan_patterns_cmd_v1 {</div><div class='ctx'> 	/**</div><div class='hunk'>@@ -302,13 +323,23 @@ struct iwl_wowlan_patterns_cmd {</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @n_patterns: number of patterns</div><div class='ctx'> 	 */</div><div class='del'>-	__le32 n_patterns;</div><div class='add'>+	u8 n_patterns;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @sta_id: sta_id</div><div class='add'>+	 */</div><div class='add'>+	u8 sta_id;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @reserved: reserved for alignment</div><div class='add'>+	 */</div><div class='add'>+	__le16 reserved;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @patterns: the patterns, array length in @n_patterns</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct iwl_wowlan_pattern_v2 patterns[];</div><div class='del'>-} __packed; /* WOWLAN_PATTERN_ARRAY_API_S_VER_2 */</div><div class='add'>+} __packed; /* WOWLAN_PATTERN_ARRAY_API_S_VER_3 */</div><div class='ctx'> </div><div class='ctx'> enum iwl_wowlan_wakeup_filters {</div><div class='ctx'> 	IWL_WOWLAN_WAKEUP_MAGIC_PACKET			= BIT(0),</div><div class='hunk'>@@ -336,12 +367,14 @@ enum iwl_wowlan_flags {</div><div class='ctx'> 	ENABLE_NBNS_FILTERING	= BIT(2),</div><div class='ctx'> 	ENABLE_DHCP_FILTERING	= BIT(3),</div><div class='ctx'> 	ENABLE_STORE_BEACON	= BIT(4),</div><div class='add'>+	HAS_BEACON_PROTECTION	= BIT(5),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_wowlan_config_cmd - WoWLAN configuration</div><div class='add'>+ * struct iwl_wowlan_config_cmd_v6 - WoWLAN configuration (versions 5 and 6)</div><div class='ctx'>  * @wakeup_filter: filter from &amp;enum iwl_wowlan_wakeup_filters</div><div class='del'>- * @non_qos_seq: non-QoS sequence counter to use next</div><div class='add'>+ * @non_qos_seq: non-QoS sequence counter to use next.</div><div class='add'>+ *               Reserved if the struct has version &gt;= 6.</div><div class='ctx'>  * @qos_seq: QoS sequence counters to use next</div><div class='ctx'>  * @wowlan_ba_teardown_tids: bitmap of BA sessions to tear down</div><div class='ctx'>  * @is_11n_connection: indicates HT connection</div><div class='hunk'>@@ -350,7 +383,7 @@ enum iwl_wowlan_flags {</div><div class='ctx'>  * @sta_id: station ID for wowlan.</div><div class='ctx'>  * @reserved: reserved</div><div class='ctx'>  */</div><div class='del'>-struct iwl_wowlan_config_cmd {</div><div class='add'>+struct iwl_wowlan_config_cmd_v6 {</div><div class='ctx'> 	__le32 wakeup_filter;</div><div class='ctx'> 	__le16 non_qos_seq;</div><div class='ctx'> 	__le16 qos_seq[8];</div><div class='hunk'>@@ -360,13 +393,39 @@ struct iwl_wowlan_config_cmd {</div><div class='ctx'> 	u8 flags;</div><div class='ctx'> 	u8 sta_id;</div><div class='ctx'> 	u8 reserved;</div><div class='del'>-} __packed; /* WOWLAN_CONFIG_API_S_VER_5 */</div><div class='add'>+} __packed; /* WOWLAN_CONFIG_API_S_VER_6 */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * WOWLAN_TSC_RSC_PARAMS</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_wowlan_config_cmd - WoWLAN configuration</div><div class='add'>+ * @wakeup_filter: filter from &amp;enum iwl_wowlan_wakeup_filters</div><div class='add'>+ * @wowlan_ba_teardown_tids: bitmap of BA sessions to tear down</div><div class='add'>+ * @is_11n_connection: indicates HT connection</div><div class='add'>+ * @offloading_tid: TID reserved for firmware use</div><div class='add'>+ * @flags: extra flags, see &amp;enum iwl_wowlan_flags</div><div class='add'>+ * @sta_id: station ID for wowlan.</div><div class='add'>+ * @reserved: reserved</div><div class='ctx'>  */</div><div class='add'>+struct iwl_wowlan_config_cmd {</div><div class='add'>+	__le32 wakeup_filter;</div><div class='add'>+	u8 wowlan_ba_teardown_tids;</div><div class='add'>+	u8 is_11n_connection;</div><div class='add'>+	u8 offloading_tid;</div><div class='add'>+	u8 flags;</div><div class='add'>+	u8 sta_id;</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+} __packed; /* WOWLAN_CONFIG_API_S_VER_7 */</div><div class='add'>+</div><div class='ctx'> #define IWL_NUM_RSC	16</div><div class='add'>+#define WOWLAN_KEY_MAX_SIZE	32</div><div class='add'>+#define WOWLAN_GTK_KEYS_NUM     2</div><div class='add'>+#define WOWLAN_IGTK_KEYS_NUM	2</div><div class='add'>+#define WOWLAN_IGTK_MIN_INDEX	4</div><div class='add'>+#define WOWLAN_BIGTK_KEYS_NUM	2</div><div class='add'>+#define WOWLAN_BIGTK_MIN_INDEX	6</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * WOWLAN_TSC_RSC_PARAMS</div><div class='add'>+ */</div><div class='ctx'> struct tkip_sc {</div><div class='ctx'> 	__le16 iv16;</div><div class='ctx'> 	__le16 pad;</div><div class='hunk'>@@ -399,9 +458,12 @@ struct iwl_wowlan_rsc_tsc_params_cmd_ver_2 {</div><div class='ctx'> } __packed; /* ALL_TSC_RSC_API_S_VER_2 */</div><div class='ctx'> </div><div class='ctx'> struct iwl_wowlan_rsc_tsc_params_cmd {</div><div class='del'>-	struct iwl_wowlan_rsc_tsc_params_cmd_ver_2 params;</div><div class='add'>+	__le64 ucast_rsc[IWL_MAX_TID_COUNT];</div><div class='add'>+	__le64 mcast_rsc[WOWLAN_GTK_KEYS_NUM][IWL_MAX_TID_COUNT];</div><div class='ctx'> 	__le32 sta_id;</div><div class='del'>-} __packed; /* ALL_TSC_RSC_API_S_VER_4 */</div><div class='add'>+#define IWL_MCAST_KEY_MAP_INVALID	0xff</div><div class='add'>+	u8 mcast_key_id_map[4];</div><div class='add'>+} __packed; /* ALL_TSC_RSC_API_S_VER_5 */</div><div class='ctx'> </div><div class='ctx'> #define IWL_MIC_KEY_SIZE	8</div><div class='ctx'> struct iwl_mic_keys {</div><div class='hunk'>@@ -456,6 +518,23 @@ struct iwl_wowlan_kek_kck_material_cmd_v3 {</div><div class='ctx'> 	__le32  bigtk_cipher;</div><div class='ctx'> } __packed; /* KEK_KCK_MATERIAL_API_S_VER_3 */</div><div class='ctx'> </div><div class='add'>+struct iwl_wowlan_kek_kck_material_cmd_v4 {</div><div class='add'>+	__le32  sta_id;</div><div class='add'>+	u8	kck[IWL_KCK_MAX_SIZE];</div><div class='add'>+	u8	kek[IWL_KEK_MAX_SIZE];</div><div class='add'>+	__le16	kck_len;</div><div class='add'>+	__le16	kek_len;</div><div class='add'>+	__le64	replay_ctr;</div><div class='add'>+	__le32  akm;</div><div class='add'>+	__le32  gtk_cipher;</div><div class='add'>+	__le32  igtk_cipher;</div><div class='add'>+	__le32  bigtk_cipher;</div><div class='add'>+} __packed; /* KEK_KCK_MATERIAL_API_S_VER_4 */</div><div class='add'>+</div><div class='add'>+struct iwl_wowlan_get_status_cmd {</div><div class='add'>+	__le32  sta_id;</div><div class='add'>+} __packed; /* WOWLAN_GET_STATUSES_CMD_API_S_VER_1 */</div><div class='add'>+</div><div class='ctx'> #define RF_KILL_INDICATOR_FOR_WOWLAN	0x87</div><div class='ctx'> </div><div class='ctx'> enum iwl_wowlan_rekey_status {</div><div class='hunk'>@@ -497,12 +576,8 @@ struct iwl_wowlan_gtk_status_v1 {</div><div class='ctx'> 	struct iwl_wowlan_rsc_tsc_params_cmd_ver_2 rsc;</div><div class='ctx'> } __packed; /* WOWLAN_GTK_MATERIAL_VER_1 */</div><div class='ctx'> </div><div class='del'>-#define WOWLAN_KEY_MAX_SIZE	32</div><div class='del'>-#define WOWLAN_GTK_KEYS_NUM     2</div><div class='del'>-#define WOWLAN_IGTK_KEYS_NUM	2</div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * struct iwl_wowlan_gtk_status - GTK status</div><div class='add'>+ * struct iwl_wowlan_gtk_status_v2 - GTK status</div><div class='ctx'>  * @key: GTK material</div><div class='ctx'>  * @key_len: GTK legth, if set to 0, the key is not available</div><div class='ctx'>  * @key_flags: information about the key:</div><div class='hunk'>@@ -513,7 +588,7 @@ struct iwl_wowlan_gtk_status_v1 {</div><div class='ctx'>  * @tkip_mic_key: TKIP RX MIC key</div><div class='ctx'>  * @rsc: TSC RSC counters</div><div class='ctx'>  */</div><div class='del'>-struct iwl_wowlan_gtk_status {</div><div class='add'>+struct iwl_wowlan_gtk_status_v2 {</div><div class='ctx'> 	u8 key[WOWLAN_KEY_MAX_SIZE];</div><div class='ctx'> 	u8 key_len;</div><div class='ctx'> 	u8 key_flags;</div><div class='hunk'>@@ -522,7 +597,98 @@ struct iwl_wowlan_gtk_status {</div><div class='ctx'> 	struct iwl_wowlan_rsc_tsc_params_cmd_ver_2 rsc;</div><div class='ctx'> } __packed; /* WOWLAN_GTK_MATERIAL_VER_2 */</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct iwl_wowlan_all_rsc_tsc_v5 - key counters</div><div class='add'>+ * @ucast_rsc: unicast RSC values</div><div class='add'>+ * @mcast_rsc: multicast RSC values (per key map value)</div><div class='add'>+ * @sta_id: station ID</div><div class='add'>+ * @mcast_key_id_map: map of key id to @mcast_rsc entry</div><div class='add'>+ */</div><div class='add'>+struct iwl_wowlan_all_rsc_tsc_v5 {</div><div class='add'>+	__le64 ucast_rsc[IWL_MAX_TID_COUNT];</div><div class='add'>+	__le64 mcast_rsc[2][IWL_MAX_TID_COUNT];</div><div class='add'>+	__le32 sta_id;</div><div class='add'>+	u8 mcast_key_id_map[4];</div><div class='add'>+} __packed; /* ALL_TSC_RSC_API_S_VER_5 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_wowlan_gtk_status_v3 - GTK status</div><div class='add'>+ * @key: GTK material</div><div class='add'>+ * @key_len: GTK length, if set to 0, the key is not available</div><div class='add'>+ * @key_flags: information about the key:</div><div class='add'>+ *	bits[0:1]:  key index assigned by the AP</div><div class='add'>+ *	bits[2:6]:  GTK index of the key in the internal DB</div><div class='add'>+ *	bit[7]:     Set iff this is the currently used GTK</div><div class='add'>+ * @reserved: padding</div><div class='add'>+ * @tkip_mic_key: TKIP RX MIC key</div><div class='add'>+ * @sc: RSC/TSC counters</div><div class='add'>+ */</div><div class='add'>+struct iwl_wowlan_gtk_status_v3 {</div><div class='add'>+	u8 key[WOWLAN_KEY_MAX_SIZE];</div><div class='add'>+	u8 key_len;</div><div class='add'>+	u8 key_flags;</div><div class='add'>+	u8 reserved[2];</div><div class='add'>+	u8 tkip_mic_key[IWL_MIC_KEY_SIZE];</div><div class='add'>+	struct iwl_wowlan_all_rsc_tsc_v5 sc;</div><div class='add'>+} __packed; /* WOWLAN_GTK_MATERIAL_VER_3 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_wowlan_key_status - Status of security keys in WoWLAN notifications</div><div class='add'>+ * @IWL_WOWLAN_NOTIF_NO_KEY: No key is present; this entry should be ignored.</div><div class='add'>+ * @IWL_WOWLAN_STATUS_OLD_KEY: old key exists; no rekey occurred, and only</div><div class='add'>+ *	metadata is available.</div><div class='add'>+ * @IWL_WOWLAN_STATUS_NEW_KEY: A new key was created after a rekey; new key</div><div class='add'>+ *	material is available.</div><div class='add'>+ */</div><div class='add'>+enum iwl_wowlan_key_status {</div><div class='add'>+	IWL_WOWLAN_NOTIF_NO_KEY = 0,</div><div class='add'>+	IWL_WOWLAN_STATUS_OLD_KEY = 1,</div><div class='add'>+	IWL_WOWLAN_STATUS_NEW_KEY = 2</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_wowlan_gtk_status - GTK status</div><div class='add'>+ * @key: GTK material</div><div class='add'>+ * @key_len: GTK length, if set to 0, the key is not available</div><div class='add'>+ * @key_flags: information about the key:</div><div class='add'>+ *	bits[0:1]:  key index assigned by the AP</div><div class='add'>+ *	bits[2:6]:  GTK index of the key in the internal DB</div><div class='add'>+ *	bit[7]:     Set iff this is the currently used GTK</div><div class='add'>+ * @key_status: key status, see &amp;enum iwl_wowlan_key_status</div><div class='add'>+ * @reserved: padding</div><div class='add'>+ * @tkip_mic_key: TKIP RX MIC key</div><div class='add'>+ * @sc: RSC/TSC counters</div><div class='add'>+ */</div><div class='add'>+struct iwl_wowlan_gtk_status {</div><div class='add'>+	u8 key[WOWLAN_KEY_MAX_SIZE];</div><div class='add'>+	u8 key_len;</div><div class='add'>+	u8 key_flags;</div><div class='add'>+	u8 key_status;</div><div class='add'>+	u8 reserved;</div><div class='add'>+	u8 tkip_mic_key[IWL_MIC_KEY_SIZE];</div><div class='add'>+	struct iwl_wowlan_all_rsc_tsc_v5 sc;</div><div class='add'>+} __packed; /* WOWLAN_GTK_MATERIAL_VER_4 */</div><div class='add'>+</div><div class='ctx'> #define IWL_WOWLAN_GTK_IDX_MASK		(BIT(0) | BIT(1))</div><div class='add'>+#define IWL_WOWLAN_IGTK_BIGTK_IDX_MASK	(BIT(0))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_wowlan_igtk_status_v1 - IGTK status</div><div class='add'>+ * @key: IGTK material</div><div class='add'>+ * @ipn: the IGTK packet number (replay counter)</div><div class='add'>+ * @key_len: IGTK length, if set to 0, the key is not available</div><div class='add'>+ * @key_flags: information about the key:</div><div class='add'>+ *	bits[0]: key index assigned by the AP (0: index 4, 1: index 5)</div><div class='add'>+ *	(0: index 6, 1: index 7 with bigtk)</div><div class='add'>+ *	bits[1:5]: IGTK index of the key in the internal DB</div><div class='add'>+ *	bit[6]: Set iff this is the currently used IGTK</div><div class='add'>+ */</div><div class='add'>+struct iwl_wowlan_igtk_status_v1 {</div><div class='add'>+	u8 key[WOWLAN_KEY_MAX_SIZE];</div><div class='add'>+	u8 ipn[6];</div><div class='add'>+	u8 key_len;</div><div class='add'>+	u8 key_flags;</div><div class='add'>+} __packed; /* WOWLAN_IGTK_MATERIAL_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_wowlan_igtk_status - IGTK status</div><div class='hunk'>@@ -530,16 +696,21 @@ struct iwl_wowlan_gtk_status {</div><div class='ctx'>  * @ipn: the IGTK packet number (replay counter)</div><div class='ctx'>  * @key_len: IGTK length, if set to 0, the key is not available</div><div class='ctx'>  * @key_flags: information about the key:</div><div class='del'>- *	bits[0]:    key index assigned by the AP (0: index 4, 1: index 5)</div><div class='del'>- *	bits[1:5]:  IGTK index of the key in the internal DB</div><div class='del'>- *	bit[6]:     Set iff this is the currently used IGTK</div><div class='add'>+ *	bits[0]: key index assigned by the AP (0: index 4, 1: index 5)</div><div class='add'>+ *	(0: index 6, 1: index 7 with bigtk)</div><div class='add'>+ *	bits[1:5]: IGTK index of the key in the internal DB</div><div class='add'>+ *	bit[6]: Set iff this is the currently used IGTK</div><div class='add'>+ * @key_status: key status, see &amp;enum iwl_wowlan_key_status</div><div class='add'>+ * @reserved: padding</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_wowlan_igtk_status {</div><div class='ctx'> 	u8 key[WOWLAN_KEY_MAX_SIZE];</div><div class='ctx'> 	u8 ipn[6];</div><div class='ctx'> 	u8 key_len;</div><div class='ctx'> 	u8 key_flags;</div><div class='del'>-} __packed; /* WOWLAN_IGTK_MATERIAL_VER_1 */</div><div class='add'>+	u8 key_status;</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+} __packed; /* WOWLAN_IGTK_MATERIAL_VER_2 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_wowlan_status_v6 - WoWLAN status</div><div class='hunk'>@@ -572,7 +743,7 @@ struct iwl_wowlan_status_v6 {</div><div class='ctx'> } __packed; /* WOWLAN_STATUSES_API_S_VER_6 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_wowlan_status - WoWLAN status</div><div class='add'>+ * struct iwl_wowlan_status_v7 - WoWLAN status</div><div class='ctx'>  * @gtk: GTK data</div><div class='ctx'>  * @igtk: IGTK data</div><div class='ctx'>  * @replay_ctr: GTK rekey replay counter</div><div class='hunk'>@@ -588,8 +759,8 @@ struct iwl_wowlan_status_v6 {</div><div class='ctx'>  * @wake_packet: wakeup packet</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_wowlan_status_v7 {</div><div class='del'>-	struct iwl_wowlan_gtk_status gtk[WOWLAN_GTK_KEYS_NUM];</div><div class='del'>-	struct iwl_wowlan_igtk_status igtk[WOWLAN_IGTK_KEYS_NUM];</div><div class='add'>+	struct iwl_wowlan_gtk_status_v2 gtk[WOWLAN_GTK_KEYS_NUM];</div><div class='add'>+	struct iwl_wowlan_igtk_status_v1 igtk[WOWLAN_IGTK_KEYS_NUM];</div><div class='ctx'> 	__le64 replay_ctr;</div><div class='ctx'> 	__le16 pattern_number;</div><div class='ctx'> 	__le16 non_qos_seq_ctr;</div><div class='hunk'>@@ -604,12 +775,12 @@ struct iwl_wowlan_status_v7 {</div><div class='ctx'> } __packed; /* WOWLAN_STATUSES_API_S_VER_7 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_wowlan_status_v9 - WoWLAN status (version 9)</div><div class='add'>+ * struct iwl_wowlan_info_notif_v1 - WoWLAN information notification</div><div class='ctx'>  * @gtk: GTK data</div><div class='ctx'>  * @igtk: IGTK data</div><div class='ctx'>  * @replay_ctr: GTK rekey replay counter</div><div class='del'>- * @pattern_number: number of the matched pattern</div><div class='del'>- * @non_qos_seq_ctr: non-QoS sequence counter to use next</div><div class='add'>+ * @pattern_number: number of the matched patterns</div><div class='add'>+ * @reserved1: reserved</div><div class='ctx'>  * @qos_seq_ctr: QoS sequence counters to use next</div><div class='ctx'>  * @wakeup_reasons: wakeup reasons, see &amp;enum iwl_wowlan_wakeup_reason</div><div class='ctx'>  * @num_of_gtk_rekeys: number of GTK rekeys</div><div class='hunk'>@@ -618,16 +789,16 @@ struct iwl_wowlan_status_v7 {</div><div class='ctx'>  * @wake_packet_length: wakeup packet length</div><div class='ctx'>  * @wake_packet_bufsize: wakeup packet buffer size</div><div class='ctx'>  * @tid_tear_down: bit mask of tids whose BA sessions were closed</div><div class='del'>- *		   in suspend state</div><div class='del'>- * @reserved: unused</div><div class='del'>- * @wake_packet: wakeup packet</div><div class='add'>+ *	in suspend state</div><div class='add'>+ * @station_id: station id</div><div class='add'>+ * @reserved2: reserved</div><div class='ctx'>  */</div><div class='del'>-struct iwl_wowlan_status_v9 {</div><div class='del'>-	struct iwl_wowlan_gtk_status gtk[WOWLAN_GTK_KEYS_NUM];</div><div class='del'>-	struct iwl_wowlan_igtk_status igtk[WOWLAN_IGTK_KEYS_NUM];</div><div class='add'>+struct iwl_wowlan_info_notif_v1 {</div><div class='add'>+	struct iwl_wowlan_gtk_status_v3 gtk[WOWLAN_GTK_KEYS_NUM];</div><div class='add'>+	struct iwl_wowlan_igtk_status_v1 igtk[WOWLAN_IGTK_KEYS_NUM];</div><div class='ctx'> 	__le64 replay_ctr;</div><div class='ctx'> 	__le16 pattern_number;</div><div class='del'>-	__le16 non_qos_seq_ctr;</div><div class='add'>+	__le16 reserved1;</div><div class='ctx'> 	__le16 qos_seq_ctr[8];</div><div class='ctx'> 	__le32 wakeup_reasons;</div><div class='ctx'> 	__le32 num_of_gtk_rekeys;</div><div class='hunk'>@@ -636,101 +807,190 @@ struct iwl_wowlan_status_v9 {</div><div class='ctx'> 	__le32 wake_packet_length;</div><div class='ctx'> 	__le32 wake_packet_bufsize;</div><div class='ctx'> 	u8 tid_tear_down;</div><div class='del'>-	u8 reserved[3];</div><div class='del'>-	u8 wake_packet[]; /* can be truncated from _length to _bufsize */</div><div class='del'>-} __packed; /* WOWLAN_STATUSES_API_S_VER_9 */</div><div class='add'>+	u8 station_id;</div><div class='add'>+	u8 reserved2[2];</div><div class='add'>+} __packed; /* WOWLAN_INFO_NTFY_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/* MAX MLO keys of non-active links that can arrive in the notification */</div><div class='add'>+#define WOWLAN_MAX_MLO_KEYS 18</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_wowlan_status - WoWLAN status</div><div class='add'>+ * enum iwl_wowlan_mlo_gtk_type - GTK types</div><div class='add'>+ * @WOWLAN_MLO_GTK_KEY_TYPE_GTK: GTK</div><div class='add'>+ * @WOWLAN_MLO_GTK_KEY_TYPE_IGTK: IGTK</div><div class='add'>+ * @WOWLAN_MLO_GTK_KEY_TYPE_BIGTK: BIGTK</div><div class='add'>+ * @WOWLAN_MLO_GTK_KEY_NUM_TYPES: number of key types</div><div class='add'>+ */</div><div class='add'>+enum iwl_wowlan_mlo_gtk_type {</div><div class='add'>+	WOWLAN_MLO_GTK_KEY_TYPE_GTK,</div><div class='add'>+	WOWLAN_MLO_GTK_KEY_TYPE_IGTK,</div><div class='add'>+	WOWLAN_MLO_GTK_KEY_TYPE_BIGTK,</div><div class='add'>+	WOWLAN_MLO_GTK_KEY_NUM_TYPES</div><div class='add'>+}; /* WOWLAN_MLO_GTK_KEY_TYPE_API_E_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_wowlan_mlo_gtk_flag - MLO GTK flags</div><div class='add'>+ * @WOWLAN_MLO_GTK_FLAG_KEY_LEN_MSK: 0 for len 16, 1 for len 32</div><div class='add'>+ * @WOWLAN_MLO_GTK_FLAG_KEY_ID_MSK: key id (ranges from 0 to 7)</div><div class='add'>+ * @WOWLAN_MLO_GTK_FLAG_LINK_ID_MSK: spec link id of the key</div><div class='add'>+ * @WOWLAN_MLO_GTK_FLAG_KEY_TYPE_MSK: &amp;enum iwl_wowlan_mlo_gtk_type</div><div class='add'>+ * @WOWLAN_MLO_GTK_FLAG_LAST_KEY_MSK: is this the last given key per</div><div class='add'>+ *	key-type / link-id - the currently used key</div><div class='add'>+ */</div><div class='add'>+enum iwl_wowlan_mlo_gtk_flag {</div><div class='add'>+	WOWLAN_MLO_GTK_FLAG_KEY_LEN_MSK = 0x0001,</div><div class='add'>+	WOWLAN_MLO_GTK_FLAG_KEY_ID_MSK = 0x000E,</div><div class='add'>+	WOWLAN_MLO_GTK_FLAG_LINK_ID_MSK = 0x00F0,</div><div class='add'>+	WOWLAN_MLO_GTK_FLAG_KEY_TYPE_MSK = 0x0300,</div><div class='add'>+	WOWLAN_MLO_GTK_FLAG_LAST_KEY_MSK = 0x0400</div><div class='add'>+}; /* WOWLAN_MLO_GTK_FLAG_API_E_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_wowlan_mlo_gtk - MLO GTK info</div><div class='add'>+ * @key: key material</div><div class='add'>+ * @flags: &amp;enum iwl_wowlan_mlo_gtk_flag</div><div class='add'>+ * @pn: packet number</div><div class='add'>+ */</div><div class='add'>+struct iwl_wowlan_mlo_gtk {</div><div class='add'>+	u8 key[WOWLAN_KEY_MAX_SIZE];</div><div class='add'>+	__le16 flags;</div><div class='add'>+	u8 pn[6];</div><div class='add'>+} __packed; /* WOWLAN_MLO_GTK_KEY_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_wowlan_info_notif_v3 - WoWLAN information notification</div><div class='ctx'>  * @gtk: GTK data</div><div class='ctx'>  * @igtk: IGTK data</div><div class='ctx'>  * @bigtk: BIGTK data</div><div class='ctx'>  * @replay_ctr: GTK rekey replay counter</div><div class='del'>- * @pattern_number: number of the matched pattern</div><div class='del'>- * @non_qos_seq_ctr: non-QoS sequence counter to use next</div><div class='add'>+ * @pattern_number: number of the matched patterns</div><div class='add'>+ * @reserved1: reserved</div><div class='ctx'>  * @qos_seq_ctr: QoS sequence counters to use next</div><div class='ctx'>  * @wakeup_reasons: wakeup reasons, see &amp;enum iwl_wowlan_wakeup_reason</div><div class='ctx'>  * @num_of_gtk_rekeys: number of GTK rekeys</div><div class='del'>- * @tid_tear_down: bitmap of TIDs torn down</div><div class='del'>- * @reserved: reserved</div><div class='add'>+ * @transmitted_ndps: number of transmitted neighbor discovery packets</div><div class='ctx'>  * @received_beacons: number of received beacons</div><div class='del'>- * @wake_packet_length: wakeup packet length</div><div class='del'>- * @wake_packet_bufsize: wakeup packet buffer size</div><div class='ctx'>  * @tid_tear_down: bit mask of tids whose BA sessions were closed</div><div class='del'>- *		   in suspend state</div><div class='del'>- * @wake_packet: wakeup packet</div><div class='add'>+ *	in suspend state</div><div class='add'>+ * @station_id: station id</div><div class='add'>+ * @reserved2: reserved</div><div class='ctx'>  */</div><div class='del'>-struct iwl_wowlan_status {</div><div class='del'>-	struct iwl_wowlan_gtk_status gtk[1];</div><div class='del'>-	struct iwl_wowlan_igtk_status igtk[1];</div><div class='del'>-	struct iwl_wowlan_igtk_status bigtk[WOWLAN_IGTK_KEYS_NUM];</div><div class='add'>+struct iwl_wowlan_info_notif_v3 {</div><div class='add'>+	struct iwl_wowlan_gtk_status_v3 gtk[WOWLAN_GTK_KEYS_NUM];</div><div class='add'>+	struct iwl_wowlan_igtk_status_v1 igtk[WOWLAN_IGTK_KEYS_NUM];</div><div class='add'>+	struct iwl_wowlan_igtk_status_v1 bigtk[WOWLAN_BIGTK_KEYS_NUM];</div><div class='ctx'> 	__le64 replay_ctr;</div><div class='ctx'> 	__le16 pattern_number;</div><div class='del'>-	__le16 non_qos_seq_ctr;</div><div class='add'>+	__le16 reserved1;</div><div class='ctx'> 	__le16 qos_seq_ctr[8];</div><div class='ctx'> 	__le32 wakeup_reasons;</div><div class='ctx'> 	__le32 num_of_gtk_rekeys;</div><div class='add'>+	__le32 transmitted_ndps;</div><div class='add'>+	__le32 received_beacons;</div><div class='ctx'> 	u8 tid_tear_down;</div><div class='del'>-	u8 reserved[3];</div><div class='add'>+	u8 station_id;</div><div class='add'>+	u8 reserved2[2];</div><div class='add'>+} __packed; /* WOWLAN_INFO_NTFY_API_S_VER_3 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_wowlan_info_notif_v5 - WoWLAN information notification</div><div class='add'>+ * @gtk: GTK data</div><div class='add'>+ * @igtk: IGTK data</div><div class='add'>+ * @bigtk: BIGTK data</div><div class='add'>+ * @replay_ctr: GTK rekey replay counter</div><div class='add'>+ * @pattern_number: number of the matched patterns</div><div class='add'>+ * @qos_seq_ctr: QoS sequence counters to use next</div><div class='add'>+ * @wakeup_reasons: wakeup reasons, see &amp;enum iwl_wowlan_wakeup_reason</div><div class='add'>+ * @num_of_gtk_rekeys: number of GTK rekeys</div><div class='add'>+ * @transmitted_ndps: number of transmitted neighbor discovery packets</div><div class='add'>+ * @received_beacons: number of received beacons</div><div class='add'>+ * @tid_tear_down: bit mask of tids whose BA sessions were closed</div><div class='add'>+ *	in suspend state</div><div class='add'>+ * @station_id: station id</div><div class='add'>+ * @num_mlo_link_keys: number of &amp;struct iwl_wowlan_mlo_gtk structs</div><div class='add'>+ *	following this notif</div><div class='add'>+ * @tid_offloaded_tx: tid used by the firmware to transmit data packets</div><div class='add'>+ *	while in wowlan</div><div class='add'>+ * @mlo_gtks: array of GTKs of size num_mlo_link_keys</div><div class='add'>+ */</div><div class='add'>+struct iwl_wowlan_info_notif_v5 {</div><div class='add'>+	struct iwl_wowlan_gtk_status_v3 gtk[WOWLAN_GTK_KEYS_NUM];</div><div class='add'>+	struct iwl_wowlan_igtk_status_v1 igtk[WOWLAN_IGTK_KEYS_NUM];</div><div class='add'>+	struct iwl_wowlan_igtk_status_v1 bigtk[WOWLAN_BIGTK_KEYS_NUM];</div><div class='add'>+	__le64 replay_ctr;</div><div class='add'>+	__le16 pattern_number;</div><div class='add'>+	__le16 qos_seq_ctr;</div><div class='add'>+	__le32 wakeup_reasons;</div><div class='add'>+	__le32 num_of_gtk_rekeys;</div><div class='add'>+	__le32 transmitted_ndps;</div><div class='add'>+	__le32 received_beacons;</div><div class='add'>+	u8 tid_tear_down;</div><div class='add'>+	u8 station_id;</div><div class='add'>+	u8 num_mlo_link_keys;</div><div class='add'>+	u8 tid_offloaded_tx;</div><div class='add'>+	struct iwl_wowlan_mlo_gtk mlo_gtks[];</div><div class='add'>+} __packed; /* WOWLAN_INFO_NTFY_API_S_VER_5 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_wowlan_info_notif - WoWLAN information notification</div><div class='add'>+ * @gtk: GTK data</div><div class='add'>+ * @igtk: IGTK data</div><div class='add'>+ * @bigtk: BIGTK data</div><div class='add'>+ * @replay_ctr: GTK rekey replay counter</div><div class='add'>+ * @pattern_number: number of the matched patterns</div><div class='add'>+ * @qos_seq_ctr: QoS sequence counters to use next</div><div class='add'>+ * @wakeup_reasons: wakeup reasons, see &amp;enum iwl_wowlan_wakeup_reason</div><div class='add'>+ * @num_of_gtk_rekeys: number of GTK rekeys</div><div class='add'>+ * @transmitted_ndps: number of transmitted neighbor discovery packets</div><div class='add'>+ * @received_beacons: number of received beacons</div><div class='add'>+ * @tid_tear_down: bit mask of tids whose BA sessions were closed</div><div class='add'>+ *	in suspend state</div><div class='add'>+ * @station_id: station id</div><div class='add'>+ * @num_mlo_link_keys: number of &amp;struct iwl_wowlan_mlo_gtk structs</div><div class='add'>+ *	following this notif</div><div class='add'>+ * @tid_offloaded_tx: tid used by the firmware to transmit data packets</div><div class='add'>+ *	while in wowlan</div><div class='add'>+ * @mlo_gtks: array of GTKs of size num_mlo_link_keys</div><div class='add'>+ */</div><div class='add'>+struct iwl_wowlan_info_notif {</div><div class='add'>+	struct iwl_wowlan_gtk_status gtk[WOWLAN_GTK_KEYS_NUM];</div><div class='add'>+	struct iwl_wowlan_igtk_status igtk[WOWLAN_IGTK_KEYS_NUM];</div><div class='add'>+	struct iwl_wowlan_igtk_status bigtk[WOWLAN_BIGTK_KEYS_NUM];</div><div class='add'>+	__le64 replay_ctr;</div><div class='add'>+	__le16 pattern_number;</div><div class='add'>+	__le16 qos_seq_ctr;</div><div class='add'>+	__le32 wakeup_reasons;</div><div class='add'>+	__le32 num_of_gtk_rekeys;</div><div class='add'>+	__le32 transmitted_ndps;</div><div class='ctx'> 	__le32 received_beacons;</div><div class='add'>+	u8 tid_tear_down;</div><div class='add'>+	u8 station_id;</div><div class='add'>+	u8 num_mlo_link_keys;</div><div class='add'>+	u8 tid_offloaded_tx;</div><div class='add'>+	struct iwl_wowlan_mlo_gtk mlo_gtks[];</div><div class='add'>+} __packed; /* WOWLAN_INFO_NTFY_API_S_VER_6 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_wowlan_wake_pkt_notif - WoWLAN wake packet notification</div><div class='add'>+ * @wake_packet_length: wakeup packet length</div><div class='add'>+ * @station_id: station id</div><div class='add'>+ * @reserved: unused</div><div class='add'>+ * @wake_packet: wakeup packet</div><div class='add'>+ */</div><div class='add'>+struct iwl_wowlan_wake_pkt_notif {</div><div class='ctx'> 	__le32 wake_packet_length;</div><div class='del'>-	__le32 wake_packet_bufsize;</div><div class='del'>-	u8 wake_packet[]; /* can be truncated from _length to _bufsize */</div><div class='del'>-} __packed; /* WOWLAN_STATUSES_API_S_VER_11 */</div><div class='del'>-</div><div class='del'>-static inline u8 iwlmvm_wowlan_gtk_idx(struct iwl_wowlan_gtk_status *gtk)</div><div class='del'>-{</div><div class='del'>-	return gtk-&gt;key_flags &amp; IWL_WOWLAN_GTK_IDX_MASK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define IWL_WOWLAN_TCP_MAX_PACKET_LEN		64</div><div class='del'>-#define IWL_WOWLAN_REMOTE_WAKE_MAX_PACKET_LEN	128</div><div class='del'>-#define IWL_WOWLAN_REMOTE_WAKE_MAX_TOKENS	2048</div><div class='del'>-</div><div class='del'>-struct iwl_tcp_packet_info {</div><div class='del'>-	__le16 tcp_pseudo_header_checksum;</div><div class='del'>-	__le16 tcp_payload_length;</div><div class='del'>-} __packed; /* TCP_PACKET_INFO_API_S_VER_2 */</div><div class='del'>-</div><div class='del'>-struct iwl_tcp_packet {</div><div class='del'>-	struct iwl_tcp_packet_info info;</div><div class='del'>-	u8 rx_mask[IWL_WOWLAN_MAX_PATTERN_LEN / 8];</div><div class='del'>-	u8 data[IWL_WOWLAN_TCP_MAX_PACKET_LEN];</div><div class='del'>-} __packed; /* TCP_PROTOCOL_PACKET_API_S_VER_1 */</div><div class='del'>-</div><div class='del'>-struct iwl_remote_wake_packet {</div><div class='del'>-	struct iwl_tcp_packet_info info;</div><div class='del'>-	u8 rx_mask[IWL_WOWLAN_MAX_PATTERN_LEN / 8];</div><div class='del'>-	u8 data[IWL_WOWLAN_REMOTE_WAKE_MAX_PACKET_LEN];</div><div class='del'>-} __packed; /* TCP_PROTOCOL_PACKET_API_S_VER_1 */</div><div class='del'>-</div><div class='del'>-struct iwl_wowlan_remote_wake_config {</div><div class='del'>-	__le32 connection_max_time; /* unused */</div><div class='del'>-	/* TCP_PROTOCOL_CONFIG_API_S_VER_1 */</div><div class='del'>-	u8 max_syn_retries;</div><div class='del'>-	u8 max_data_retries;</div><div class='del'>-	u8 tcp_syn_ack_timeout;</div><div class='del'>-	u8 tcp_ack_timeout;</div><div class='del'>-</div><div class='del'>-	struct iwl_tcp_packet syn_tx;</div><div class='del'>-	struct iwl_tcp_packet synack_rx;</div><div class='del'>-	struct iwl_tcp_packet keepalive_ack_rx;</div><div class='del'>-	struct iwl_tcp_packet fin_tx;</div><div class='del'>-</div><div class='del'>-	struct iwl_remote_wake_packet keepalive_tx;</div><div class='del'>-	struct iwl_remote_wake_packet wake_rx;</div><div class='del'>-</div><div class='del'>-	/* REMOTE_WAKE_OFFSET_INFO_API_S_VER_1 */</div><div class='del'>-	u8 sequence_number_offset;</div><div class='del'>-	u8 sequence_number_length;</div><div class='del'>-	u8 token_offset;</div><div class='del'>-	u8 token_length;</div><div class='del'>-	/* REMOTE_WAKE_PROTOCOL_PARAMS_API_S_VER_1 */</div><div class='del'>-	__le32 initial_sequence_number;</div><div class='del'>-	__le16 keepalive_interval;</div><div class='del'>-	__le16 num_tokens;</div><div class='del'>-	u8 tokens[IWL_WOWLAN_REMOTE_WAKE_MAX_TOKENS];</div><div class='del'>-} __packed; /* REMOTE_WAKE_CONFIG_API_S_VER_2 */</div><div class='add'>+	u8 station_id;</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+	u8 wake_packet[1];</div><div class='add'>+} __packed; /* WOWLAN_WAKE_PKT_NTFY_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mvm_d3_end_notif -  d3 end notification</div><div class='add'>+ * @flags: See &amp;enum iwl_d0i3_flags</div><div class='add'>+ */</div><div class='add'>+struct iwl_d3_end_notif {</div><div class='add'>+	__le32 flags;</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> /* TODO: NetDetect API */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h b/drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h<br/>index d299bba3aa54..6a6e11a57dbf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2022 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -27,17 +28,35 @@ enum iwl_data_path_subcmd_ids {</div><div class='ctx'> 	TRIGGER_RX_QUEUES_NOTIF_CMD = 0x2,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @STA_HE_CTXT_CMD: &amp;struct iwl_he_sta_context_cmd</div><div class='add'>+	 * @WNM_PLATFORM_PTM_REQUEST_CMD: &amp;struct iwl_time_sync_cfg_cmd</div><div class='add'>+	 */</div><div class='add'>+	WNM_PLATFORM_PTM_REQUEST_CMD = 0x3,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @WNM_80211V_TIMING_MEASUREMENT_CONFIG_CMD:</div><div class='add'>+	 *	&amp;struct iwl_time_sync_cfg_cmd</div><div class='add'>+	 */</div><div class='add'>+	WNM_80211V_TIMING_MEASUREMENT_CONFIG_CMD = 0x4,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @STA_HE_CTXT_CMD: &amp;struct iwl_he_sta_context_cmd_v1,</div><div class='add'>+	 *	&amp;struct iwl_he_sta_context_cmd_v2 or</div><div class='add'>+	 *	&amp;struct iwl_he_sta_context_cmd_v3</div><div class='ctx'> 	 */</div><div class='ctx'> 	STA_HE_CTXT_CMD = 0x7,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @RLC_CONFIG_CMD: &amp;struct iwl_rlc_config_cmd</div><div class='add'>+	 */</div><div class='add'>+	RLC_CONFIG_CMD = 0x8,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @RFH_QUEUE_CONFIG_CMD: &amp;struct iwl_rfh_queue_config</div><div class='ctx'> 	 */</div><div class='ctx'> 	RFH_QUEUE_CONFIG_CMD = 0xD,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @TLC_MNG_CONFIG_CMD: &amp;struct iwl_tlc_config_cmd</div><div class='add'>+	 * @TLC_MNG_CONFIG_CMD: &amp;struct iwl_tlc_config_cmd_v4</div><div class='ctx'> 	 */</div><div class='ctx'> 	TLC_MNG_CONFIG_CMD = 0xF,</div><div class='ctx'> </div><div class='hunk'>@@ -53,22 +72,63 @@ enum iwl_data_path_subcmd_ids {</div><div class='ctx'> 	CHEST_COLLECTOR_FILTER_CONFIG_CMD = 0x14,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @RX_BAID_ALLOCATION_CONFIG_CMD: Allocate/deallocate a BAID for an RX</div><div class='add'>+	 *	blockack session, uses &amp;struct iwl_rx_baid_cfg_cmd for the</div><div class='add'>+	 *	command, and &amp;struct iwl_rx_baid_cfg_resp as a response.</div><div class='add'>+	 */</div><div class='add'>+	RX_BAID_ALLOCATION_CONFIG_CMD = 0x16,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @SCD_QUEUE_CONFIG_CMD: new scheduler queue allocation/config/removal</div><div class='add'>+	 *	command, uses &amp;struct iwl_scd_queue_cfg_cmd and the response</div><div class='add'>+	 *	is (same as before) &amp;struct iwl_tx_queue_cfg_rsp.</div><div class='add'>+	 */</div><div class='add'>+	SCD_QUEUE_CONFIG_CMD = 0x17,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @SEC_KEY_CMD: security key command, uses &amp;struct iwl_sec_key_cmd</div><div class='add'>+	 */</div><div class='add'>+	SEC_KEY_CMD = 0x18,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @ESR_MODE_NOTIF: notification to recommend/force a wanted esr mode,</div><div class='add'>+	 *	uses &amp;struct iwl_esr_mode_notif or &amp;struct iwl_esr_mode_notif_v1</div><div class='add'>+	 */</div><div class='add'>+	ESR_MODE_NOTIF = 0xF3,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @MONITOR_NOTIF: Datapath monitoring notification, using</div><div class='ctx'> 	 *	&amp;struct iwl_datapath_monitor_notif</div><div class='ctx'> 	 */</div><div class='ctx'> 	MONITOR_NOTIF = 0xF4,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @RX_NO_DATA_NOTIF: &amp;struct iwl_rx_no_data</div><div class='add'>+	 * @RX_NO_DATA_NOTIF: &amp;struct iwl_rx_no_data or &amp;struct iwl_rx_no_data_ver_3</div><div class='ctx'> 	 */</div><div class='ctx'> 	RX_NO_DATA_NOTIF = 0xF5,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @THERMAL_DUAL_CHAIN_REQUEST: firmware request for SMPS mode,</div><div class='add'>+	 *	&amp;struct iwl_thermal_dual_chain_request</div><div class='add'>+	 */</div><div class='add'>+	THERMAL_DUAL_CHAIN_REQUEST = 0xF6,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @TLC_MNG_UPDATE_NOTIF: &amp;struct iwl_tlc_update_notif</div><div class='ctx'> 	 */</div><div class='ctx'> 	TLC_MNG_UPDATE_NOTIF = 0xF7,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @BEACON_FILTER_IN_NOTIF: &amp;struct iwl_beacon_filter_notif</div><div class='add'>+	 */</div><div class='add'>+	BEACON_FILTER_IN_NOTIF = 0xF8,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @PHY_AIR_SNIFFER_NOTIF: &amp;struct iwl_rx_phy_air_sniffer_ntfy</div><div class='add'>+	 */</div><div class='add'>+	PHY_AIR_SNIFFER_NOTIF = 0xF9,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @STA_PM_NOTIF: &amp;struct iwl_mvm_pm_state_notification</div><div class='ctx'> 	 */</div><div class='ctx'> 	STA_PM_NOTIF = 0xFD,</div><div class='hunk'>@@ -116,6 +176,182 @@ enum iwl_channel_estimation_flags {</div><div class='ctx'> 	IWL_CHANNEL_ESTIMATION_COUNTER	= BIT(2),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum iwl_time_sync_protocol_type {</div><div class='add'>+	IWL_TIME_SYNC_PROTOCOL_TM	= BIT(0),</div><div class='add'>+	IWL_TIME_SYNC_PROTOCOL_FTM	= BIT(1),</div><div class='add'>+}; /* WNM_TIMING_ENABLED_PROTOCOL_API_E_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_time_sync_cfg_cmd - TM/FTM time sync measurement configuration</div><div class='add'>+ *</div><div class='add'>+ * @protocols: The type of frames to raise notifications for. A bitmap</div><div class='add'>+ *	of @iwl_time_sync_protocol_type</div><div class='add'>+ * @peer_addr: peer address with which TM/FTM measurements are required</div><div class='add'>+ * @reserved: for alignment</div><div class='add'>+ */</div><div class='add'>+struct iwl_time_sync_cfg_cmd {</div><div class='add'>+	__le32 protocols;</div><div class='add'>+	u8 peer_addr[ETH_ALEN];</div><div class='add'>+	u8 reserved[2];</div><div class='add'>+} __packed; /* WNM_80211V_TIMING_MEASUREMENT_CONFIG_CMD_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_synced_time_operation - PTM request options</div><div class='add'>+ *</div><div class='add'>+ * @IWL_SYNCED_TIME_OPERATION_READ_ARTB: read only the ARTB time</div><div class='add'>+ * @IWL_SYNCED_TIME_OPERATION_READ_GP2: read only the GP2 time</div><div class='add'>+ * @IWL_SYNCED_TIME_OPERATION_READ_BOTH: latch the ARTB and GP2 clocks and</div><div class='add'>+ *	provide timestamps from both clocks for the same time point</div><div class='add'>+ */</div><div class='add'>+enum iwl_synced_time_operation {</div><div class='add'>+	IWL_SYNCED_TIME_OPERATION_READ_ARTB = 1,</div><div class='add'>+	IWL_SYNCED_TIME_OPERATION_READ_GP2,</div><div class='add'>+	IWL_SYNCED_TIME_OPERATION_READ_BOTH,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_synced_time_cmd - request synced GP2/ARTB timestamps</div><div class='add'>+ *</div><div class='add'>+ * @operation: one of &amp;enum iwl_synced_time_operation</div><div class='add'>+ */</div><div class='add'>+struct iwl_synced_time_cmd {</div><div class='add'>+	__le32 operation;</div><div class='add'>+} __packed; /* WNM_80211V_TIMING_CMD_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_synced_time_rsp - response to iwl_synced_time_cmd</div><div class='add'>+ *</div><div class='add'>+ * @operation: one of &amp;enum iwl_synced_time_operation</div><div class='add'>+ * @platform_timestamp_hi: high DWORD of the ARTB clock timestamp in nanoseconds</div><div class='add'>+ * @platform_timestamp_lo: low DWORD of the ARTB clock timestamp in nanoseconds</div><div class='add'>+ * @gp2_timestamp_hi: high DWORD of the GP2 clock timestamp in 10's of</div><div class='add'>+ *	nanoseconds</div><div class='add'>+ * @gp2_timestamp_lo: low DWORD of the GP2 clock timestamp in 10's of</div><div class='add'>+ *	nanoseconds</div><div class='add'>+ */</div><div class='add'>+struct iwl_synced_time_rsp {</div><div class='add'>+	__le32 operation;</div><div class='add'>+	__le32 platform_timestamp_hi;</div><div class='add'>+	__le32 platform_timestamp_lo;</div><div class='add'>+	__le32 gp2_timestamp_hi;</div><div class='add'>+	__le32 gp2_timestamp_lo;</div><div class='add'>+} __packed; /* WNM_80211V_TIMING_RSP_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/* PTP_CTX_MAX_DATA_SIZE_IN_API_D_VER_1 */</div><div class='add'>+#define PTP_CTX_MAX_DATA_SIZE   128</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_time_msmt_ptp_ctx - Vendor specific element</div><div class='add'>+ * to allow a space for flexibility for the userspace App</div><div class='add'>+ *</div><div class='add'>+ * @ftm: FTM specific vendor element</div><div class='add'>+ * @ftm.element_id: element id of vendor specific ie</div><div class='add'>+ * @ftm.length: length of vendor specific ie</div><div class='add'>+ * @ftm.reserved: for alignment</div><div class='add'>+ * @ftm.data: vendor specific data blob</div><div class='add'>+ * @tm: TM specific vendor element</div><div class='add'>+ * @tm.element_id: element id of vendor specific ie</div><div class='add'>+ * @tm.length: length of vendor specific ie</div><div class='add'>+ * @tm.data: vendor specific data blob</div><div class='add'>+ */</div><div class='add'>+struct iwl_time_msmt_ptp_ctx {</div><div class='add'>+	/* Differentiate between FTM and TM specific Vendor elements */</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u8 element_id;</div><div class='add'>+			u8 length;</div><div class='add'>+			__le16 reserved;</div><div class='add'>+			u8 data[PTP_CTX_MAX_DATA_SIZE];</div><div class='add'>+		} ftm;</div><div class='add'>+		struct {</div><div class='add'>+			u8 element_id;</div><div class='add'>+			u8 length;</div><div class='add'>+			u8 data[PTP_CTX_MAX_DATA_SIZE];</div><div class='add'>+		} tm;</div><div class='add'>+	};</div><div class='add'>+} __packed /* PTP_CTX_VER_1 */;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_time_msmt_notify - Time Sync measurement notification</div><div class='add'>+ * for TM/FTM, along with additional meta data.</div><div class='add'>+ *</div><div class='add'>+ * @peer_addr: peer address</div><div class='add'>+ * @reserved: for alignment</div><div class='add'>+ * @dialog_token: measurement flow dialog token number</div><div class='add'>+ * @followup_dialog_token: Measurement flow previous dialog token number</div><div class='add'>+ * @t1_hi: high dword of t1-time of the Tx'ed action frame departure on</div><div class='add'>+ *	sender side in units of 10 nano seconds</div><div class='add'>+ * @t1_lo: low dword of t1-time of the Tx'ed action frame departure on</div><div class='add'>+ *	sender side in units of 10 nano seconds</div><div class='add'>+ * @t1_max_err: maximum t1-time error in units of 10 nano seconds</div><div class='add'>+ * @t4_hi: high dword of t4-time of the Rx'ed action frame's Ack arrival on</div><div class='add'>+ *	sender side in units of 10 nano seconds</div><div class='add'>+ * @t4_lo: low dword of t4-time of the Rx'ed action frame's Ack arrival on</div><div class='add'>+ *	sender side in units of 10 nano seconds</div><div class='add'>+ * @t4_max_err: maximum t4-time error in units of 10 nano seconds</div><div class='add'>+ * @t2_hi: high dword of t2-time of the Rx'ed action frame arrival on</div><div class='add'>+ *	receiver side in units of 10 nano seconds</div><div class='add'>+ * @t2_lo: low dword of t2-time of the Rx'ed action frame arrival on</div><div class='add'>+ *	receiver side in units of 10 nano seconds</div><div class='add'>+ * @t2_max_err: maximum t2-time error in units of 10 nano seconds</div><div class='add'>+ * @t3_hi: high dword of t3-time of the Tx'ed action frame's Ack departure on</div><div class='add'>+ *	receiver side in units of 10 nano seconds</div><div class='add'>+ * @t3_lo: low dword of t3-time of the Tx'ed action frame's Ack departure on</div><div class='add'>+ *	receiver side in units of 10 nano seconds</div><div class='add'>+ * @t3_max_err: maximum t3-time error in units of 10 nano seconds</div><div class='add'>+ * @ptp: vendor specific information element</div><div class='add'>+ */</div><div class='add'>+struct iwl_time_msmt_notify {</div><div class='add'>+	u8 peer_addr[ETH_ALEN];</div><div class='add'>+	u8 reserved[2];</div><div class='add'>+	__le32 dialog_token;</div><div class='add'>+	__le32 followup_dialog_token;</div><div class='add'>+	__le32 t1_hi;</div><div class='add'>+	__le32 t1_lo;</div><div class='add'>+	__le32 t1_max_err;</div><div class='add'>+	__le32 t4_hi;</div><div class='add'>+	__le32 t4_lo;</div><div class='add'>+	__le32 t4_max_err;</div><div class='add'>+	__le32 t2_hi;</div><div class='add'>+	__le32 t2_lo;</div><div class='add'>+	__le32 t2_max_err;</div><div class='add'>+	__le32 t3_hi;</div><div class='add'>+	__le32 t3_lo;</div><div class='add'>+	__le32 t3_max_err;</div><div class='add'>+	struct iwl_time_msmt_ptp_ctx ptp;</div><div class='add'>+} __packed; /* WNM_80211V_TIMING_MEASUREMENT_NTFY_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_time_msmt_cfm_notify - Time Sync measurement confirmation</div><div class='add'>+ * notification for TM/FTM. Sent on receipt of 802.11 Ack from peer for the</div><div class='add'>+ * Tx'ed TM/FTM measurement action frame.</div><div class='add'>+ *</div><div class='add'>+ * @peer_addr: peer address</div><div class='add'>+ * @reserved: for alignment</div><div class='add'>+ * @dialog_token: measurement flow dialog token number</div><div class='add'>+ * @t1_hi: high dword of t1-time of the Tx'ed action frame departure on</div><div class='add'>+ *	sender side in units of 10 nano seconds</div><div class='add'>+ * @t1_lo: low dword of t1-time of the Tx'ed action frame departure on</div><div class='add'>+ *	sender side in units of 10 nano seconds</div><div class='add'>+ * @t1_max_err: maximum t1-time error in units of 10 nano seconds</div><div class='add'>+ * @t4_hi: high dword of t4-time of the Rx'ed action frame's Ack arrival on</div><div class='add'>+ *	sender side in units of 10 nano seconds</div><div class='add'>+ * @t4_lo: low dword of t4-time of the Rx'ed action frame's Ack arrival on</div><div class='add'>+ *	sender side in units of 10 nano seconds</div><div class='add'>+ * @t4_max_err: maximum t4-time error in units of 10 nano seconds</div><div class='add'>+ */</div><div class='add'>+struct iwl_time_msmt_cfm_notify {</div><div class='add'>+	u8 peer_addr[ETH_ALEN];</div><div class='add'>+	u8 reserved[2];</div><div class='add'>+	__le32 dialog_token;</div><div class='add'>+	__le32 t1_hi;</div><div class='add'>+	__le32 t1_lo;</div><div class='add'>+	__le32 t1_max_err;</div><div class='add'>+	__le32 t4_hi;</div><div class='add'>+	__le32 t4_lo;</div><div class='add'>+	__le32 t4_max_err;</div><div class='add'>+} __packed; /* WNM_80211V_TIMING_MEASUREMENT_CONFIRM_NTFY_API_S_VER_1 */</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_channel_estimation_cfg - channel estimation reporting config</div><div class='ctx'>  */</div><div class='hunk'>@@ -165,8 +401,301 @@ enum iwl_datapath_monitor_notif_type {</div><div class='ctx'> </div><div class='ctx'> struct iwl_datapath_monitor_notif {</div><div class='ctx'> 	__le32 type;</div><div class='del'>-	u8 mac_id;</div><div class='add'>+	u8 link_id;</div><div class='ctx'> 	u8 reserved[3];</div><div class='ctx'> } __packed; /* MONITOR_NTF_API_S_VER_1 */</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * enum iwl_thermal_dual_chain_req_events - firmware SMPS request event</div><div class='add'>+ * @THERMAL_DUAL_CHAIN_REQ_ENABLE: (re-)enable dual-chain operation</div><div class='add'>+ *	(subject to other constraints)</div><div class='add'>+ * @THERMAL_DUAL_CHAIN_REQ_DISABLE: disable dual-chain operation</div><div class='add'>+ *	(static SMPS)</div><div class='add'>+ */</div><div class='add'>+enum iwl_thermal_dual_chain_req_events {</div><div class='add'>+	THERMAL_DUAL_CHAIN_REQ_ENABLE,</div><div class='add'>+	THERMAL_DUAL_CHAIN_REQ_DISABLE,</div><div class='add'>+}; /* THERMAL_DUAL_CHAIN_DISABLE_STATE_API_E_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_thermal_dual_chain_request - SMPS request</div><div class='add'>+ * @event: the type of request, see &amp;enum iwl_thermal_dual_chain_req_events</div><div class='add'>+ */</div><div class='add'>+struct iwl_thermal_dual_chain_request {</div><div class='add'>+	__le32 event;</div><div class='add'>+} __packed; /* THERMAL_DUAL_CHAIN_DISABLE_REQ_NTFY_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+enum iwl_rlc_chain_info {</div><div class='add'>+	IWL_RLC_CHAIN_INFO_DRIVER_FORCE		= BIT(0),</div><div class='add'>+	IWL_RLC_CHAIN_INFO_VALID		= 0x000e,</div><div class='add'>+	IWL_RLC_CHAIN_INFO_FORCE		= 0x0070,</div><div class='add'>+	IWL_RLC_CHAIN_INFO_FORCE_MIMO		= 0x0380,</div><div class='add'>+	IWL_RLC_CHAIN_INFO_COUNT		= 0x0c00,</div><div class='add'>+	IWL_RLC_CHAIN_INFO_MIMO_COUNT		= 0x3000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_rlc_properties - RLC properties</div><div class='add'>+ * @rx_chain_info: RX chain info, &amp;enum iwl_rlc_chain_info</div><div class='add'>+ * @reserved: reserved</div><div class='add'>+ */</div><div class='add'>+struct iwl_rlc_properties {</div><div class='add'>+	__le32 rx_chain_info;</div><div class='add'>+	__le32 reserved;</div><div class='add'>+} __packed; /* RLC_PROPERTIES_S_VER_1 */</div><div class='add'>+</div><div class='add'>+enum iwl_sad_mode {</div><div class='add'>+	IWL_SAD_MODE_ENABLED		= BIT(0),</div><div class='add'>+	IWL_SAD_MODE_DEFAULT_ANT_MSK	= 0x6,</div><div class='add'>+	IWL_SAD_MODE_DEFAULT_ANT_FW	= 0x0,</div><div class='add'>+	IWL_SAD_MODE_DEFAULT_ANT_A	= 0x2,</div><div class='add'>+	IWL_SAD_MODE_DEFAULT_ANT_B	= 0x4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sad_properties - SAD properties</div><div class='add'>+ * @chain_a_sad_mode: chain A SAD mode, &amp;enum iwl_sad_mode</div><div class='add'>+ * @chain_b_sad_mode: chain B SAD mode, &amp;enum iwl_sad_mode</div><div class='add'>+ * @mac_id: MAC index</div><div class='add'>+ * @reserved: reserved</div><div class='add'>+ */</div><div class='add'>+struct iwl_sad_properties {</div><div class='add'>+	__le32 chain_a_sad_mode;</div><div class='add'>+	__le32 chain_b_sad_mode;</div><div class='add'>+	__le32 mac_id;</div><div class='add'>+	__le32 reserved;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_rlc_config_cmd - RLC configuration</div><div class='add'>+ * @phy_id: PHY index</div><div class='add'>+ * @rlc: RLC properties, &amp;struct iwl_rlc_properties</div><div class='add'>+ * @sad: SAD (single antenna diversity) options, &amp;struct iwl_sad_properties</div><div class='add'>+ * @flags: flags (unused)</div><div class='add'>+ * @reserved: reserved</div><div class='add'>+ */</div><div class='add'>+struct iwl_rlc_config_cmd {</div><div class='add'>+	__le32 phy_id;</div><div class='add'>+	struct iwl_rlc_properties rlc;</div><div class='add'>+	struct iwl_sad_properties sad;</div><div class='add'>+	u8 flags;</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+} __packed; /* RLC_CONFIG_CMD_API_S_VER_2 */</div><div class='add'>+</div><div class='add'>+#define IWL_MAX_BAID_OLD	16 /* MAX_IMMEDIATE_BA_API_D_VER_2 */</div><div class='add'>+#define IWL_MAX_BAID		32 /* MAX_IMMEDIATE_BA_API_D_VER_3 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_rx_baid_action - BAID allocation/config action</div><div class='add'>+ * @IWL_RX_BAID_ACTION_ADD: add a new BAID session</div><div class='add'>+ * @IWL_RX_BAID_ACTION_MODIFY: modify the BAID session</div><div class='add'>+ * @IWL_RX_BAID_ACTION_REMOVE: remove the BAID session</div><div class='add'>+ */</div><div class='add'>+enum iwl_rx_baid_action {</div><div class='add'>+	IWL_RX_BAID_ACTION_ADD,</div><div class='add'>+	IWL_RX_BAID_ACTION_MODIFY,</div><div class='add'>+	IWL_RX_BAID_ACTION_REMOVE,</div><div class='add'>+}; /*  RX_BAID_ALLOCATION_ACTION_E_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_rx_baid_cfg_cmd_alloc - BAID allocation data</div><div class='add'>+ * @sta_id_mask: station ID mask</div><div class='add'>+ * @tid: the TID for this session</div><div class='add'>+ * @reserved: reserved</div><div class='add'>+ * @ssn: the starting sequence number</div><div class='add'>+ * @win_size: RX BA session window size</div><div class='add'>+ */</div><div class='add'>+struct iwl_rx_baid_cfg_cmd_alloc {</div><div class='add'>+	__le32 sta_id_mask;</div><div class='add'>+	u8 tid;</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+	__le16 ssn;</div><div class='add'>+	__le16 win_size;</div><div class='add'>+} __packed; /* RX_BAID_ALLOCATION_ADD_CMD_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_rx_baid_cfg_cmd_modify - BAID modification data</div><div class='add'>+ * @old_sta_id_mask: old station ID mask</div><div class='add'>+ * @new_sta_id_mask: new station ID mask</div><div class='add'>+ * @tid: TID of the BAID</div><div class='add'>+ */</div><div class='add'>+struct iwl_rx_baid_cfg_cmd_modify {</div><div class='add'>+	__le32 old_sta_id_mask;</div><div class='add'>+	__le32 new_sta_id_mask;</div><div class='add'>+	__le32 tid;</div><div class='add'>+} __packed; /* RX_BAID_ALLOCATION_MODIFY_CMD_API_S_VER_2 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_rx_baid_cfg_cmd_remove_v1 - BAID removal data</div><div class='add'>+ * @baid: the BAID to remove</div><div class='add'>+ */</div><div class='add'>+struct iwl_rx_baid_cfg_cmd_remove_v1 {</div><div class='add'>+	__le32 baid;</div><div class='add'>+} __packed; /* RX_BAID_ALLOCATION_REMOVE_CMD_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_rx_baid_cfg_cmd_remove - BAID removal data</div><div class='add'>+ * @sta_id_mask: the station mask of the BAID to remove</div><div class='add'>+ * @tid: the TID of the BAID to remove</div><div class='add'>+ */</div><div class='add'>+struct iwl_rx_baid_cfg_cmd_remove {</div><div class='add'>+	__le32 sta_id_mask;</div><div class='add'>+	__le32 tid;</div><div class='add'>+} __packed; /* RX_BAID_ALLOCATION_REMOVE_CMD_API_S_VER_2 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_rx_baid_cfg_cmd - BAID allocation/config command</div><div class='add'>+ * @action: the action, from &amp;enum iwl_rx_baid_action</div><div class='add'>+ * @alloc: allocation data</div><div class='add'>+ * @modify: modify data</div><div class='add'>+ * @remove_v1: remove data (version 1)</div><div class='add'>+ * @remove: remove data</div><div class='add'>+ */</div><div class='add'>+struct iwl_rx_baid_cfg_cmd {</div><div class='add'>+	__le32 action;</div><div class='add'>+	union {</div><div class='add'>+		struct iwl_rx_baid_cfg_cmd_alloc alloc;</div><div class='add'>+		struct iwl_rx_baid_cfg_cmd_modify modify;</div><div class='add'>+		struct iwl_rx_baid_cfg_cmd_remove_v1 remove_v1;</div><div class='add'>+		struct iwl_rx_baid_cfg_cmd_remove remove;</div><div class='add'>+	}; /* RX_BAID_ALLOCATION_OPERATION_API_U_VER_2 */</div><div class='add'>+} __packed; /* RX_BAID_ALLOCATION_CONFIG_CMD_API_S_VER_2 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_rx_baid_cfg_resp - BAID allocation response</div><div class='add'>+ * @baid: the allocated BAID</div><div class='add'>+ */</div><div class='add'>+struct iwl_rx_baid_cfg_resp {</div><div class='add'>+	__le32 baid;</div><div class='add'>+}; /* RX_BAID_ALLOCATION_RESPONSE_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_scd_queue_cfg_operation - scheduler queue operation</div><div class='add'>+ * @IWL_SCD_QUEUE_ADD: allocate a new queue</div><div class='add'>+ * @IWL_SCD_QUEUE_REMOVE: remove a queue</div><div class='add'>+ * @IWL_SCD_QUEUE_MODIFY: modify a queue</div><div class='add'>+ */</div><div class='add'>+enum iwl_scd_queue_cfg_operation {</div><div class='add'>+	IWL_SCD_QUEUE_ADD = 0,</div><div class='add'>+	IWL_SCD_QUEUE_REMOVE = 1,</div><div class='add'>+	IWL_SCD_QUEUE_MODIFY = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_scd_queue_cfg_cmd - scheduler queue allocation command</div><div class='add'>+ * @operation: the operation, see &amp;enum iwl_scd_queue_cfg_operation</div><div class='add'>+ * @u: union depending on command usage</div><div class='add'>+ * @u.add.sta_mask: station mask</div><div class='add'>+ * @u.add.tid: TID</div><div class='add'>+ * @u.add.reserved: reserved</div><div class='add'>+ * @u.add.flags: flags from &amp;enum iwl_tx_queue_cfg_actions, except</div><div class='add'>+ *	%TX_QUEUE_CFG_ENABLE_QUEUE is not valid</div><div class='add'>+ * @u.add.cb_size: size code</div><div class='add'>+ * @u.add.bc_dram_addr: byte-count table IOVA</div><div class='add'>+ * @u.add.tfdq_dram_addr: TFD queue IOVA</div><div class='add'>+ * @u.remove.sta_mask: station mask of queue to remove</div><div class='add'>+ * @u.remove.tid: TID of queue to remove</div><div class='add'>+ * @u.modify.old_sta_mask: old station mask for modify</div><div class='add'>+ * @u.modify.tid: TID of queue to modify</div><div class='add'>+ * @u.modify.new_sta_mask: new station mask for modify</div><div class='add'>+ */</div><div class='add'>+struct iwl_scd_queue_cfg_cmd {</div><div class='add'>+	__le32 operation;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			__le32 sta_mask;</div><div class='add'>+			u8 tid;</div><div class='add'>+			u8 reserved[3];</div><div class='add'>+			__le32 flags;</div><div class='add'>+			__le32 cb_size;</div><div class='add'>+			__le64 bc_dram_addr;</div><div class='add'>+			__le64 tfdq_dram_addr;</div><div class='add'>+		} __packed add; /* TX_QUEUE_CFG_CMD_ADD_API_S_VER_1 */</div><div class='add'>+		struct {</div><div class='add'>+			__le32 sta_mask;</div><div class='add'>+			__le32 tid;</div><div class='add'>+		} __packed remove; /* TX_QUEUE_CFG_CMD_REMOVE_API_S_VER_1 */</div><div class='add'>+		struct {</div><div class='add'>+			__le32 old_sta_mask;</div><div class='add'>+			__le32 tid;</div><div class='add'>+			__le32 new_sta_mask;</div><div class='add'>+		} __packed modify; /* TX_QUEUE_CFG_CMD_MODIFY_API_S_VER_1 */</div><div class='add'>+	} __packed u; /* TX_QUEUE_CFG_CMD_OPERATION_API_U_VER_1 */</div><div class='add'>+} __packed; /* TX_QUEUE_CFG_CMD_API_S_VER_3 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_sec_key_flags - security key command key flags</div><div class='add'>+ * @IWL_SEC_KEY_FLAG_CIPHER_MASK: cipher mask</div><div class='add'>+ * @IWL_SEC_KEY_FLAG_CIPHER_WEP: WEP cipher</div><div class='add'>+ * @IWL_SEC_KEY_FLAG_CIPHER_CCMP: CCMP/CMAC cipher</div><div class='add'>+ * @IWL_SEC_KEY_FLAG_CIPHER_TKIP: TKIP cipher</div><div class='add'>+ * @IWL_SEC_KEY_FLAG_CIPHER_GCMP: GCMP/GMAC cipher</div><div class='add'>+ * @IWL_SEC_KEY_FLAG_NO_TX: don't install for TX</div><div class='add'>+ * @IWL_SEC_KEY_FLAG_KEY_SIZE: large key size (WEP-104, GCMP-256, GMAC-256)</div><div class='add'>+ * @IWL_SEC_KEY_FLAG_MFP: MFP is in used for this key</div><div class='add'>+ * @IWL_SEC_KEY_FLAG_MCAST_KEY: this is a multicast key</div><div class='add'>+ * @IWL_SEC_KEY_FLAG_SPP_AMSDU: SPP A-MSDU should be used</div><div class='add'>+ */</div><div class='add'>+enum iwl_sec_key_flags {</div><div class='add'>+	IWL_SEC_KEY_FLAG_CIPHER_MASK	= 0x07,</div><div class='add'>+	IWL_SEC_KEY_FLAG_CIPHER_WEP	= 0x01,</div><div class='add'>+	IWL_SEC_KEY_FLAG_CIPHER_CCMP	= 0x02,</div><div class='add'>+	IWL_SEC_KEY_FLAG_CIPHER_TKIP	= 0x03,</div><div class='add'>+	IWL_SEC_KEY_FLAG_CIPHER_GCMP	= 0x05,</div><div class='add'>+	IWL_SEC_KEY_FLAG_NO_TX		= 0x08,</div><div class='add'>+	IWL_SEC_KEY_FLAG_KEY_SIZE	= 0x10,</div><div class='add'>+	IWL_SEC_KEY_FLAG_MFP		= 0x20,</div><div class='add'>+	IWL_SEC_KEY_FLAG_MCAST_KEY	= 0x40,</div><div class='add'>+	IWL_SEC_KEY_FLAG_SPP_AMSDU	= 0x80,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IWL_SEC_WEP_KEY_OFFSET	3</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sec_key_cmd - security key command</div><div class='add'>+ * @action: action from &amp;enum iwl_ctxt_action</div><div class='add'>+ * @u: union depending on command type</div><div class='add'>+ * @u.add.sta_mask: station mask for the new key</div><div class='add'>+ * @u.add.key_id: key ID (0-7) for the new key</div><div class='add'>+ * @u.add.key_flags: key flags per &amp;enum iwl_sec_key_flags</div><div class='add'>+ * @u.add.key: key material. WEP keys should start from &amp;IWL_SEC_WEP_KEY_OFFSET.</div><div class='add'>+ * @u.add.tkip_mic_rx_key: TKIP MIC RX key</div><div class='add'>+ * @u.add.tkip_mic_tx_key: TKIP MIC TX key</div><div class='add'>+ * @u.add.rx_seq: RX sequence counter value</div><div class='add'>+ * @u.add.tx_seq: TX sequence counter value</div><div class='add'>+ * @u.modify.old_sta_mask: old station mask</div><div class='add'>+ * @u.modify.new_sta_mask: new station mask</div><div class='add'>+ * @u.modify.key_id: key ID</div><div class='add'>+ * @u.modify.key_flags: new key flags</div><div class='add'>+ * @u.remove.sta_mask: station mask</div><div class='add'>+ * @u.remove.key_id: key ID</div><div class='add'>+ * @u.remove.key_flags: key flags</div><div class='add'>+ */</div><div class='add'>+struct iwl_sec_key_cmd {</div><div class='add'>+	__le32 action;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			__le32 sta_mask;</div><div class='add'>+			__le32 key_id;</div><div class='add'>+			__le32 key_flags;</div><div class='add'>+			u8 key[32];</div><div class='add'>+			u8 tkip_mic_rx_key[8];</div><div class='add'>+			u8 tkip_mic_tx_key[8];</div><div class='add'>+			__le64 rx_seq;</div><div class='add'>+			__le64 tx_seq;</div><div class='add'>+		} __packed add; /* SEC_KEY_ADD_CMD_API_S_VER_1 */</div><div class='add'>+		struct {</div><div class='add'>+			__le32 old_sta_mask;</div><div class='add'>+			__le32 new_sta_mask;</div><div class='add'>+			__le32 key_id;</div><div class='add'>+			__le32 key_flags;</div><div class='add'>+		} __packed modify; /* SEC_KEY_MODIFY_CMD_API_S_VER_1 */</div><div class='add'>+		struct {</div><div class='add'>+			__le32 sta_mask;</div><div class='add'>+			__le32 key_id;</div><div class='add'>+			__le32 key_flags;</div><div class='add'>+		} __packed remove; /* SEC_KEY_REMOVE_CMD_API_S_VER_1 */</div><div class='add'>+	} __packed u; /* SEC_KEY_OPERATION_API_U_VER_1 */</div><div class='add'>+} __packed; /* SEC_KEY_CMD_API_S_VER_1 */</div><div class='add'>+</div><div class='ctx'> #endif /* __iwl_fw_api_datapath_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h b/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h<br/>index 996d5cc5bd9a..b62f0687327a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2018-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_fw_dbg_tlv_h__</div><div class='ctx'> #define __iwl_fw_dbg_tlv_h__</div><div class='hunk'>@@ -11,9 +11,12 @@</div><div class='ctx'> #define IWL_FW_INI_MAX_NAME			32</div><div class='ctx'> #define IWL_FW_INI_MAX_CFG_NAME			64</div><div class='ctx'> #define IWL_FW_INI_DOMAIN_ALWAYS_ON		0</div><div class='add'>+#define IWL_FW_INI_REGION_ID_MASK		GENMASK(15, 0)</div><div class='add'>+#define IWL_FW_INI_REGION_DUMP_POLICY_MASK	GENMASK(31, 16)</div><div class='add'>+#define IWL_FW_INI_PRESET_DISABLE		0xff</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_fw_ini_hcmd</div><div class='add'>+ * struct iwl_fw_ini_hcmd - debug configuration host command</div><div class='ctx'>  *</div><div class='ctx'>  * @id: the debug configuration command type for instance: 0xf6 / 0xf5 / DHC</div><div class='ctx'>  * @group: the desired cmd group</div><div class='hunk'>@@ -24,7 +27,7 @@ struct iwl_fw_ini_hcmd {</div><div class='ctx'> 	u8 id;</div><div class='ctx'> 	u8 group;</div><div class='ctx'> 	__le16 reserved;</div><div class='del'>-	u8 data[0];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed; /* FW_DEBUG_TLV_HCMD_DATA_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -32,15 +35,38 @@ struct iwl_fw_ini_hcmd {</div><div class='ctx'>  *</div><div class='ctx'>  * @version: TLV version</div><div class='ctx'>  * @domain: domain of the TLV. One of &amp;enum iwl_fw_ini_dbg_domain</div><div class='del'>- * @data: TLV data</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_ini_header {</div><div class='ctx'> 	__le32 version;</div><div class='ctx'> 	__le32 domain;</div><div class='del'>-	u8 data[];</div><div class='add'>+	/* followed by the data */</div><div class='ctx'> } __packed; /* FW_TLV_DEBUG_HEADER_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct iwl_fw_ini_addr_size - Base address and size that defines</div><div class='add'>+ * a chunk of memory</div><div class='add'>+ *</div><div class='add'>+ * @addr: the base address (fixed size - 4 bytes)</div><div class='add'>+ * @size: the size to read</div><div class='add'>+ */</div><div class='add'>+struct iwl_fw_ini_addr_size {</div><div class='add'>+	__le32 addr;</div><div class='add'>+	__le32 size;</div><div class='add'>+} __packed; /* FW_TLV_DEBUG_ADDR_SIZE_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_fw_ini_region_dev_addr_range - Configuration to read</div><div class='add'>+ * device address range</div><div class='add'>+ *</div><div class='add'>+ * @offset: offset to add to the base address of each chunk</div><div class='add'>+ * The addrs[] array will be treated as an array of &amp;iwl_fw_ini_addr_size -</div><div class='add'>+ * an array of (addr, size) pairs.</div><div class='add'>+ */</div><div class='add'>+struct iwl_fw_ini_region_dev_addr_range {</div><div class='add'>+	__le32 offset;</div><div class='add'>+} __packed; /* FW_TLV_DEBUG_DEVICE_ADDR_RANGE_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_fw_ini_region_dev_addr - Configuration to read device addresses</div><div class='ctx'>  *</div><div class='ctx'>  * @size: size of each memory chunk</div><div class='hunk'>@@ -121,33 +147,47 @@ struct iwl_fw_ini_region_internal_buffer {</div><div class='ctx'>  * Configures parameters for region data collection</div><div class='ctx'>  *</div><div class='ctx'>  * @hdr: debug header</div><div class='del'>- * @id: region id. Max id is &amp;IWL_FW_INI_MAX_REGION_ID</div><div class='add'>+ * @id: region id. Max id is %IWL_FW_INI_MAX_REGION_ID</div><div class='ctx'>  * @type: region type. One of &amp;enum iwl_fw_ini_region_type</div><div class='add'>+ * @sub_type: region sub type</div><div class='add'>+ * @sub_type_ver: region sub type version</div><div class='add'>+ * @reserved: not in use</div><div class='ctx'>  * @name: region name</div><div class='ctx'>  * @dev_addr: device address configuration. Used by</div><div class='del'>- *	&amp;IWL_FW_INI_REGION_DEVICE_MEMORY, &amp;IWL_FW_INI_REGION_PERIPHERY_MAC,</div><div class='del'>- *	&amp;IWL_FW_INI_REGION_PERIPHERY_PHY, &amp;IWL_FW_INI_REGION_PERIPHERY_AUX,</div><div class='del'>- *	&amp;IWL_FW_INI_REGION_PAGING, &amp;IWL_FW_INI_REGION_CSR,</div><div class='del'>- *	&amp;IWL_FW_INI_REGION_DRAM_IMR and &amp;IWL_FW_INI_REGION_PCI_IOSF_CONFIG</div><div class='del'>- * @fifos: fifos configuration. Used by &amp;IWL_FW_INI_REGION_TXF and</div><div class='del'>- *	&amp;IWL_FW_INI_REGION_RXF</div><div class='add'>+ *	%IWL_FW_INI_REGION_DEVICE_MEMORY, %IWL_FW_INI_REGION_PERIPHERY_MAC,</div><div class='add'>+ *	%IWL_FW_INI_REGION_PERIPHERY_PHY, %IWL_FW_INI_REGION_PERIPHERY_AUX,</div><div class='add'>+ *	%IWL_FW_INI_REGION_PAGING, %IWL_FW_INI_REGION_CSR,</div><div class='add'>+ *	%IWL_FW_INI_REGION_DRAM_IMR and %IWL_FW_INI_REGION_PCI_IOSF_CONFIG</div><div class='add'>+ *	%IWL_FW_INI_REGION_DBGI_SRAM, %FW_TLV_DEBUG_REGION_TYPE_DBGI_SRAM,</div><div class='add'>+ *	%IWL_FW_INI_REGION_PERIPHERY_SNPS_DPHYIP,</div><div class='add'>+ * @dev_addr_range: device address range configuration. Used by</div><div class='add'>+ *	%IWL_FW_INI_REGION_PERIPHERY_MAC_RANGE and</div><div class='add'>+ *	%IWL_FW_INI_REGION_PERIPHERY_PHY_RANGE</div><div class='add'>+ * @fifos: fifos configuration. Used by %IWL_FW_INI_REGION_TXF and</div><div class='add'>+ *	%IWL_FW_INI_REGION_RXF</div><div class='ctx'>  * @err_table: error table configuration. Used by</div><div class='del'>- *	IWL_FW_INI_REGION_LMAC_ERROR_TABLE and</div><div class='del'>- *	IWL_FW_INI_REGION_UMAC_ERROR_TABLE</div><div class='add'>+ *	%IWL_FW_INI_REGION_LMAC_ERROR_TABLE and</div><div class='add'>+ *	%IWL_FW_INI_REGION_UMAC_ERROR_TABLE</div><div class='ctx'>  * @internal_buffer: internal monitor buffer configuration. Used by</div><div class='del'>- *	&amp;IWL_FW_INI_REGION_INTERNAL_BUFFER</div><div class='add'>+ *	%IWL_FW_INI_REGION_INTERNAL_BUFFER</div><div class='add'>+ * @special_mem: special device memory region, used by</div><div class='add'>+ *	%IWL_FW_INI_REGION_SPECIAL_DEVICE_MEMORY</div><div class='ctx'>  * @dram_alloc_id: dram allocation id. One of &amp;enum iwl_fw_ini_allocation_id.</div><div class='del'>- *	Used by &amp;IWL_FW_INI_REGION_DRAM_BUFFER</div><div class='del'>- * @tlv_mask: tlv collection mask. Used by &amp;IWL_FW_INI_REGION_TLV</div><div class='add'>+ *	Used by %IWL_FW_INI_REGION_DRAM_BUFFER</div><div class='add'>+ * @tlv_mask: tlv collection mask. Used by %IWL_FW_INI_REGION_TLV</div><div class='ctx'>  * @addrs: array of addresses attached to the end of the region tlv</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_ini_region_tlv {</div><div class='ctx'> 	struct iwl_fw_ini_header hdr;</div><div class='ctx'> 	__le32 id;</div><div class='del'>-	__le32 type;</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 sub_type;</div><div class='add'>+	u8 sub_type_ver;</div><div class='add'>+	u8 reserved;</div><div class='ctx'> 	u8 name[IWL_FW_INI_MAX_NAME];</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct iwl_fw_ini_region_dev_addr dev_addr;</div><div class='add'>+		struct iwl_fw_ini_region_dev_addr_range dev_addr_range;</div><div class='ctx'> 		struct iwl_fw_ini_region_fifos fifos;</div><div class='ctx'> 		struct iwl_fw_ini_region_err_table err_table;</div><div class='ctx'> 		struct iwl_fw_ini_region_internal_buffer internal_buffer;</div><div class='hunk'>@@ -159,7 +199,7 @@ struct iwl_fw_ini_region_tlv {</div><div class='ctx'> } __packed; /* FW_TLV_DEBUG_REGION_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_fw_ini_debug_info_tlv</div><div class='add'>+ * struct iwl_fw_ini_debug_info_tlv - debug info TLV</div><div class='ctx'>  *</div><div class='ctx'>  * debug configuration name for a specific image</div><div class='ctx'>  *</div><div class='hunk'>@@ -242,13 +282,68 @@ struct iwl_fw_ini_hcmd_tlv {</div><div class='ctx'> } __packed; /* FW_TLV_DEBUG_HCMD_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum iwl_fw_ini_allocation_id</div><div class='add'>+* struct iwl_fw_ini_addr_val - Address and value to set it to</div><div class='add'>+*</div><div class='add'>+* @address: the base address</div><div class='add'>+* @value: value to set at address</div><div class='add'>+*/</div><div class='add'>+struct iwl_fw_ini_addr_val {</div><div class='add'>+	__le32 address;</div><div class='add'>+	__le32 value;</div><div class='add'>+} __packed; /* FW_TLV_DEBUG_ADDR_VALUE_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_fw_ini_conf_set_tlv - configuration TLV to set register/memory.</div><div class='add'>+ *</div><div class='add'>+ * @hdr: debug header</div><div class='add'>+ * @time_point: time point to apply config. One of &amp;enum iwl_fw_ini_time_point</div><div class='add'>+ * @set_type: write access type preset token for time point.</div><div class='add'>+ *  one of &amp;enum iwl_fw_ini_config_set_type</div><div class='add'>+ * @addr_offset: the offset to add to any item in address[0] field</div><div class='add'>+ * @addr_val: address value pair</div><div class='add'>+ */</div><div class='add'>+struct iwl_fw_ini_conf_set_tlv {</div><div class='add'>+	struct iwl_fw_ini_header hdr;</div><div class='add'>+	__le32 time_point;</div><div class='add'>+	__le32 set_type;</div><div class='add'>+	__le32 addr_offset;</div><div class='add'>+	struct iwl_fw_ini_addr_val addr_val[];</div><div class='add'>+} __packed; /* FW_TLV_DEBUG_CONFIG_SET_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_fw_ini_config_set_type - configuration set type</div><div class='add'>+ *</div><div class='add'>+ * @IWL_FW_INI_CONFIG_SET_TYPE_INVALID: invalid config set</div><div class='add'>+ * @IWL_FW_INI_CONFIG_SET_TYPE_DEVICE_PERIPHERY_MAC: for PERIPHERY MAC configuration</div><div class='add'>+ * @IWL_FW_INI_CONFIG_SET_TYPE_DEVICE_PERIPHERY_PHY: for PERIPHERY PHY configuration</div><div class='add'>+ * @IWL_FW_INI_CONFIG_SET_TYPE_DEVICE_PERIPHERY_AUX: for PERIPHERY AUX configuration</div><div class='add'>+ * @IWL_FW_INI_CONFIG_SET_TYPE_DEVICE_MEMORY: for DEVICE MEMORY configuration</div><div class='add'>+ * @IWL_FW_INI_CONFIG_SET_TYPE_CSR: for CSR configuration</div><div class='add'>+ * @IWL_FW_INI_CONFIG_SET_TYPE_DBGC_DRAM_ADDR: for DBGC_DRAM_ADDR configuration</div><div class='add'>+ * @IWL_FW_INI_CONFIG_SET_TYPE_PERIPH_SCRATCH_HWM: for PERIPH SCRATCH HWM configuration</div><div class='add'>+ * @IWL_FW_INI_CONFIG_SET_TYPE_MAX_NUM: max number of configuration supported</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+enum iwl_fw_ini_config_set_type {</div><div class='add'>+	IWL_FW_INI_CONFIG_SET_TYPE_INVALID = 0,</div><div class='add'>+	IWL_FW_INI_CONFIG_SET_TYPE_DEVICE_PERIPHERY_MAC,</div><div class='add'>+	IWL_FW_INI_CONFIG_SET_TYPE_DEVICE_PERIPHERY_PHY,</div><div class='add'>+	IWL_FW_INI_CONFIG_SET_TYPE_DEVICE_PERIPHERY_AUX,</div><div class='add'>+	IWL_FW_INI_CONFIG_SET_TYPE_DEVICE_MEMORY,</div><div class='add'>+	IWL_FW_INI_CONFIG_SET_TYPE_CSR,</div><div class='add'>+	IWL_FW_INI_CONFIG_SET_TYPE_DBGC_DRAM_ADDR,</div><div class='add'>+	IWL_FW_INI_CONFIG_SET_TYPE_PERIPH_SCRATCH_HWM,</div><div class='add'>+	IWL_FW_INI_CONFIG_SET_TYPE_MAX_NUM,</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_fw_ini_allocation_id - allocation ID</div><div class='ctx'>  *</div><div class='ctx'>  * @IWL_FW_INI_ALLOCATION_INVALID: invalid</div><div class='ctx'>  * @IWL_FW_INI_ALLOCATION_ID_DBGC1: allocation meant for DBGC1 configuration</div><div class='ctx'>  * @IWL_FW_INI_ALLOCATION_ID_DBGC2: allocation meant for DBGC2 configuration</div><div class='ctx'>  * @IWL_FW_INI_ALLOCATION_ID_DBGC3: allocation meant for DBGC3 configuration</div><div class='del'>- * @IWL_FW_INI_ALLOCATION_ID_INTERNAL: allocation meant for Intreanl SMEM in D3</div><div class='add'>+ * @IWL_FW_INI_ALLOCATION_ID_DBGC4: allocation meant for DBGC4 configuration</div><div class='ctx'>  * @IWL_FW_INI_ALLOCATION_NUM: number of allocation ids</div><div class='ctx'> */</div><div class='ctx'> enum iwl_fw_ini_allocation_id {</div><div class='hunk'>@@ -256,17 +351,18 @@ enum iwl_fw_ini_allocation_id {</div><div class='ctx'> 	IWL_FW_INI_ALLOCATION_ID_DBGC1,</div><div class='ctx'> 	IWL_FW_INI_ALLOCATION_ID_DBGC2,</div><div class='ctx'> 	IWL_FW_INI_ALLOCATION_ID_DBGC3,</div><div class='del'>-	IWL_FW_INI_ALLOCATION_ID_INTERNAL,</div><div class='add'>+	IWL_FW_INI_ALLOCATION_ID_DBGC4,</div><div class='ctx'> 	IWL_FW_INI_ALLOCATION_NUM,</div><div class='ctx'> }; /* FW_DEBUG_TLV_ALLOCATION_ID_E_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum iwl_fw_ini_buffer_location</div><div class='add'>+ * enum iwl_fw_ini_buffer_location - buffer location</div><div class='ctx'>  *</div><div class='ctx'>  * @IWL_FW_INI_LOCATION_INVALID: invalid</div><div class='ctx'>  * @IWL_FW_INI_LOCATION_SRAM_PATH: SRAM location</div><div class='ctx'>  * @IWL_FW_INI_LOCATION_DRAM_PATH: DRAM location</div><div class='ctx'>  * @IWL_FW_INI_LOCATION_NPK_PATH: NPK location</div><div class='add'>+ * @IWL_FW_INI_LOCATION_NUM: number of valid locations</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_fw_ini_buffer_location {</div><div class='ctx'> 	IWL_FW_INI_LOCATION_INVALID,</div><div class='hunk'>@@ -277,7 +373,7 @@ enum iwl_fw_ini_buffer_location {</div><div class='ctx'> }; /* FW_DEBUG_TLV_BUFFER_LOCATION_E_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum iwl_fw_ini_region_type</div><div class='add'>+ * enum iwl_fw_ini_region_type - region type</div><div class='ctx'>  *</div><div class='ctx'>  * @IWL_FW_INI_REGION_INVALID: invalid</div><div class='ctx'>  * @IWL_FW_INI_REGION_TLV: uCode and debug TLVs</div><div class='hunk'>@@ -297,6 +393,10 @@ enum iwl_fw_ini_buffer_location {</div><div class='ctx'>  * @IWL_FW_INI_REGION_DRAM_IMR: IMR memory</div><div class='ctx'>  * @IWL_FW_INI_REGION_PCI_IOSF_CONFIG: PCI/IOSF config</div><div class='ctx'>  * @IWL_FW_INI_REGION_SPECIAL_DEVICE_MEMORY: special device memory</div><div class='add'>+ * @IWL_FW_INI_REGION_DBGI_SRAM: periphery registers of DBGI SRAM</div><div class='add'>+ * @IWL_FW_INI_REGION_PERIPHERY_MAC_RANGE: a range of periphery registers of MAC</div><div class='add'>+ * @IWL_FW_INI_REGION_PERIPHERY_PHY_RANGE: a range of periphery registers of PHY</div><div class='add'>+ * @IWL_FW_INI_REGION_PERIPHERY_SNPS_DPHYIP: periphery registers of SNPS DPHYIP</div><div class='ctx'>  * @IWL_FW_INI_REGION_NUM: number of region types</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_fw_ini_region_type {</div><div class='hunk'>@@ -318,15 +418,31 @@ enum iwl_fw_ini_region_type {</div><div class='ctx'> 	IWL_FW_INI_REGION_DRAM_IMR,</div><div class='ctx'> 	IWL_FW_INI_REGION_PCI_IOSF_CONFIG,</div><div class='ctx'> 	IWL_FW_INI_REGION_SPECIAL_DEVICE_MEMORY,</div><div class='add'>+	IWL_FW_INI_REGION_DBGI_SRAM,</div><div class='add'>+	IWL_FW_INI_REGION_PERIPHERY_MAC_RANGE,</div><div class='add'>+	IWL_FW_INI_REGION_PERIPHERY_PHY_RANGE,</div><div class='add'>+	IWL_FW_INI_REGION_PERIPHERY_SNPS_DPHYIP,</div><div class='ctx'> 	IWL_FW_INI_REGION_NUM</div><div class='ctx'> }; /* FW_TLV_DEBUG_REGION_TYPE_API_E */</div><div class='ctx'> </div><div class='add'>+enum iwl_fw_ini_region_device_memory_subtype {</div><div class='add'>+	IWL_FW_INI_REGION_DEVICE_MEMORY_SUBTYPE_HW_SMEM = 1,</div><div class='add'>+	IWL_FW_INI_REGION_DEVICE_MEMORY_SUBTYPE_UMAC_ERROR_TABLE = 5,</div><div class='add'>+	IWL_FW_INI_REGION_DEVICE_MEMORY_SUBTYPE_LMAC_1_ERROR_TABLE = 7,</div><div class='add'>+	IWL_FW_INI_REGION_DEVICE_MEMORY_SUBTYPE_LMAC_2_ERROR_TABLE = 10,</div><div class='add'>+	IWL_FW_INI_REGION_DEVICE_MEMORY_SUBTYPE_TCM_1_ERROR_TABLE = 14,</div><div class='add'>+	IWL_FW_INI_REGION_DEVICE_MEMORY_SUBTYPE_TCM_2_ERROR_TABLE = 16,</div><div class='add'>+	IWL_FW_INI_REGION_DEVICE_MEMORY_SUBTYPE_RCM_1_ERROR_TABLE = 18,</div><div class='add'>+	IWL_FW_INI_REGION_DEVICE_MEMORY_SUBTYPE_RCM_2_ERROR_TABLE = 20,</div><div class='add'>+}; /* FW_TLV_DEBUG_REGION_DEVICE_MEMORY_SUBTYPE_API_E */</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * enum iwl_fw_ini_time_point</div><div class='add'>+ * enum iwl_fw_ini_time_point - time point type</div><div class='ctx'>  *</div><div class='ctx'>  * Hard coded time points in which the driver can send hcmd or perform dump</div><div class='ctx'>  * collection</div><div class='ctx'>  *</div><div class='add'>+ * @IWL_FW_INI_TIME_POINT_INVALID: invalid timepoint</div><div class='ctx'>  * @IWL_FW_INI_TIME_POINT_EARLY: pre loading the FW</div><div class='ctx'>  * @IWL_FW_INI_TIME_POINT_AFTER_ALIVE: first cmd from host after alive notif</div><div class='ctx'>  * @IWL_FW_INI_TIME_POINT_POST_INIT: last cmd in series of init sequence</div><div class='hunk'>@@ -356,6 +472,12 @@ enum iwl_fw_ini_region_type {</div><div class='ctx'>  * @IWL_FW_INI_TIME_POINT_EAPOL_FAILED: EAPOL failed</div><div class='ctx'>  * @IWL_FW_INI_TIME_POINT_FAKE_TX: fake Tx</div><div class='ctx'>  * @IWL_FW_INI_TIME_POINT_DEASSOC: de association</div><div class='add'>+ * @IWL_FW_INI_TIME_POINT_PRESET_OVERRIDE_EXT_REQ: request to override preset</div><div class='add'>+ * @IWL_FW_INI_TIME_POINT_PRESET_OVERRIDE_START: start handling override preset</div><div class='add'>+ *	request</div><div class='add'>+ * @IWL_FW_INI_TIME_SCAN_FAILURE: failed scan channel list</div><div class='add'>+ * @IWL_FW_INI_TIME_ESR_LINK_UP: EMLSR is active (several links are activated)</div><div class='add'>+ * @IWL_FW_INI_TIME_ESR_LINK_DOWN: EMLSR is inactive (only one active link left)</div><div class='ctx'>  * @IWL_FW_INI_TIME_POINT_NUM: number of time points</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_fw_ini_time_point {</div><div class='hunk'>@@ -386,6 +508,11 @@ enum iwl_fw_ini_time_point {</div><div class='ctx'> 	IWL_FW_INI_TIME_POINT_EAPOL_FAILED,</div><div class='ctx'> 	IWL_FW_INI_TIME_POINT_FAKE_TX,</div><div class='ctx'> 	IWL_FW_INI_TIME_POINT_DEASSOC,</div><div class='add'>+	IWL_FW_INI_TIME_POINT_PRESET_OVERRIDE_EXT_REQ,</div><div class='add'>+	IWL_FW_INI_TIME_POINT_PRESET_OVERRIDE_START,</div><div class='add'>+	IWL_FW_INI_TIME_SCAN_FAILURE,</div><div class='add'>+	IWL_FW_INI_TIME_ESR_LINK_UP,</div><div class='add'>+	IWL_FW_INI_TIME_ESR_LINK_DOWN,</div><div class='ctx'> 	IWL_FW_INI_TIME_POINT_NUM,</div><div class='ctx'> }; /* FW_TLV_DEBUG_TIME_POINT_API_E */</div><div class='ctx'> </div><div class='hunk'>@@ -399,6 +526,9 @@ enum iwl_fw_ini_time_point {</div><div class='ctx'>  * @IWL_FW_INI_APPLY_POLICY_OVERRIDE_CFG: override trigger configuration</div><div class='ctx'>  * @IWL_FW_INI_APPLY_POLICY_OVERRIDE_DATA: override trigger data.</div><div class='ctx'>  *	Append otherwise</div><div class='add'>+ * @IWL_FW_INI_APPLY_POLICY_DUMP_COMPLETE_CMD: send cmd once dump collected</div><div class='add'>+ * @IWL_FW_INI_APPLY_POLICY_SPLIT_DUMP_RESET: split this dump into regions</div><div class='add'>+ *	before and after the reset handshake</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_fw_ini_trigger_apply_policy {</div><div class='ctx'> 	IWL_FW_INI_APPLY_POLICY_MATCH_TIME_POINT	= BIT(0),</div><div class='hunk'>@@ -406,5 +536,49 @@ enum iwl_fw_ini_trigger_apply_policy {</div><div class='ctx'> 	IWL_FW_INI_APPLY_POLICY_OVERRIDE_REGIONS	= BIT(8),</div><div class='ctx'> 	IWL_FW_INI_APPLY_POLICY_OVERRIDE_CFG		= BIT(9),</div><div class='ctx'> 	IWL_FW_INI_APPLY_POLICY_OVERRIDE_DATA		= BIT(10),</div><div class='add'>+	IWL_FW_INI_APPLY_POLICY_DUMP_COMPLETE_CMD	= BIT(16),</div><div class='add'>+	IWL_FW_INI_APPLY_POLICY_SPLIT_DUMP_RESET	= BIT(17),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_fw_ini_trigger_reset_fw_policy - Determines how to handle reset</div><div class='add'>+ *</div><div class='add'>+ * @IWL_FW_INI_RESET_FW_MODE_NOTHING: do not stop FW and reload (default)</div><div class='add'>+ * @IWL_FW_INI_RESET_FW_MODE_STOP_FW_ONLY: stop FW without reload FW</div><div class='add'>+ * @IWL_FW_INI_RESET_FW_MODE_STOP_AND_RELOAD_FW: stop FW with reload FW</div><div class='add'>+ */</div><div class='add'>+enum iwl_fw_ini_trigger_reset_fw_policy {</div><div class='add'>+	IWL_FW_INI_RESET_FW_MODE_NOTHING = 0,</div><div class='add'>+	IWL_FW_INI_RESET_FW_MODE_STOP_FW_ONLY,</div><div class='add'>+	IWL_FW_INI_RESET_FW_MODE_STOP_AND_RELOAD_FW</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_fw_ini_dump_policy - Determines how to handle dump based on enabled flags</div><div class='add'>+ *</div><div class='add'>+ * @IWL_FW_INI_DEBUG_DUMP_POLICY_NO_LIMIT: OS has no limit of dump size</div><div class='add'>+ * @IWL_FW_INI_DEBUG_DUMP_POLICY_MAX_LIMIT_600KB: mini dump only 600KB region dump</div><div class='add'>+ * @IWL_FW_IWL_DEBUG_DUMP_POLICY_MAX_LIMIT_5MB: mini dump 5MB size dump</div><div class='add'>+ * @IWL_FW_IWL_DEBUG_DUMP_POLICY_BEFORE_RESET: dump this region before reset</div><div class='add'>+ *	handshake (if requested by %IWL_FW_INI_APPLY_POLICY_SPLIT_DUMP_RESET)</div><div class='add'>+ */</div><div class='add'>+enum iwl_fw_ini_dump_policy {</div><div class='add'>+	IWL_FW_INI_DEBUG_DUMP_POLICY_NO_LIMIT           = BIT(0),</div><div class='add'>+	IWL_FW_INI_DEBUG_DUMP_POLICY_MAX_LIMIT_600KB    = BIT(1),</div><div class='add'>+	IWL_FW_IWL_DEBUG_DUMP_POLICY_MAX_LIMIT_5MB      = BIT(2),</div><div class='add'>+	IWL_FW_IWL_DEBUG_DUMP_POLICY_BEFORE_RESET	= BIT(3),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_fw_ini_dump_type - Determines dump type based on size defined by FW.</div><div class='add'>+ *</div><div class='add'>+ * @IWL_FW_INI_DUMP_BRIEF : only dump the most important regions</div><div class='add'>+ * @IWL_FW_INI_DUMP_MEDIUM: dump more regions than "brief", but not all regions</div><div class='add'>+ * @IWL_FW_INI_DUMP_VERBOSE : dump all regions</div><div class='add'>+ */</div><div class='add'>+enum iwl_fw_ini_dump_type {</div><div class='add'>+	IWL_FW_INI_DUMP_BRIEF,</div><div class='add'>+	IWL_FW_INI_DUMP_MEDIUM,</div><div class='add'>+	IWL_FW_INI_DUMP_VERBOSE,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h b/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h<br/>index 8adccd5da095..61a850de26fc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/debug.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/debug.h</a></div><div class='hunk'>@@ -1,11 +1,12 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_fw_api_debug_h__</div><div class='ctx'> #define __iwl_fw_api_debug_h__</div><div class='add'>+#include "dbg-tlv.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_debug_cmds - debug commands</div><div class='hunk'>@@ -30,6 +31,11 @@ enum iwl_debug_cmds {</div><div class='ctx'> 	 */</div><div class='ctx'> 	HOST_EVENT_CFG = 0x3,</div><div class='ctx'> 	/**</div><div class='add'>+	 * @INVALID_WR_PTR_CMD: invalid write pointer, set in the TFD</div><div class='add'>+	 *	when it's not in use</div><div class='add'>+	 */</div><div class='add'>+	INVALID_WR_PTR_CMD = 0x6,</div><div class='add'>+	/**</div><div class='ctx'> 	 * @DBGC_SUSPEND_RESUME:</div><div class='ctx'> 	 * DBGC suspend/resume commad. Uses a single dword as data:</div><div class='ctx'> 	 * 0 - resume DBGC recording</div><div class='hunk'>@@ -43,6 +49,24 @@ enum iwl_debug_cmds {</div><div class='ctx'> 	 */</div><div class='ctx'> 	BUFFER_ALLOCATION = 0x8,</div><div class='ctx'> 	/**</div><div class='add'>+	 * @GET_TAS_STATUS:</div><div class='add'>+	 * sends command to fw to get TAS status</div><div class='add'>+	 * the response is &amp;struct iwl_tas_status_resp</div><div class='add'>+	 */</div><div class='add'>+	GET_TAS_STATUS = 0xA,</div><div class='add'>+	/**</div><div class='add'>+	 * @FW_DUMP_COMPLETE_CMD:</div><div class='add'>+	 * sends command to fw once dump collection completed</div><div class='add'>+	 * &amp;struct iwl_dbg_dump_complete_cmd</div><div class='add'>+	 */</div><div class='add'>+	FW_DUMP_COMPLETE_CMD = 0xB,</div><div class='add'>+	/**</div><div class='add'>+	 * @FW_CLEAR_BUFFER:</div><div class='add'>+	 * clears the firmware's internal buffer</div><div class='add'>+	 * no payload</div><div class='add'>+	 */</div><div class='add'>+	FW_CLEAR_BUFFER = 0xD,</div><div class='add'>+	/**</div><div class='ctx'> 	 * @MFU_ASSERT_DUMP_NTF:</div><div class='ctx'> 	 * &amp;struct iwl_mfu_assert_dump_notif</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -234,7 +258,7 @@ struct iwl_mfu_assert_dump_notif {</div><div class='ctx'> 	__le16   index_num;</div><div class='ctx'> 	__le16   parts_num;</div><div class='ctx'> 	__le32   data_size;</div><div class='del'>-	__le32   data[0];</div><div class='add'>+	__le32   data[];</div><div class='ctx'> } __packed; /* MFU_DUMP_ASSERT_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -270,7 +294,7 @@ struct iwl_mvm_marker {</div><div class='ctx'> 	u8 marker_id;</div><div class='ctx'> 	__le16 reserved;</div><div class='ctx'> 	__le64 timestamp;</div><div class='del'>-	__le32 metadata[0];</div><div class='add'>+	__le32 metadata[];</div><div class='ctx'> } __packed; /* MARKER_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -361,12 +385,172 @@ struct iwl_buf_alloc_cmd {</div><div class='ctx'> 	struct iwl_buf_alloc_frag frags[BUF_ALLOC_MAX_NUM_FRAGS];</div><div class='ctx'> } __packed; /* BUFFER_ALLOCATION_CMD_API_S_VER_2 */</div><div class='ctx'> </div><div class='add'>+#define DRAM_INFO_FIRST_MAGIC_WORD 0x76543210</div><div class='add'>+#define DRAM_INFO_SECOND_MAGIC_WORD 0x89ABCDEF</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * struct iwl_dbg_host_event_cfg_cmd</div><div class='add'>+ * struct iwl_dram_info - DRAM fragments allocation struct</div><div class='add'>+ *</div><div class='add'>+ * Driver will fill in the first 1K(+) of the pointed DRAM fragment</div><div class='add'>+ *</div><div class='add'>+ * @first_word: magic word value</div><div class='add'>+ * @second_word: magic word value</div><div class='add'>+ * @dram_frags: DRAM fragmentaion detail</div><div class='add'>+*/</div><div class='add'>+struct iwl_dram_info {</div><div class='add'>+	__le32 first_word;</div><div class='add'>+	__le32 second_word;</div><div class='add'>+	struct iwl_buf_alloc_cmd dram_frags[IWL_FW_INI_ALLOCATION_NUM - 1];</div><div class='add'>+} __packed; /* INIT_DRAM_FRAGS_ALLOCATIONS_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_dbgc1_info - DBGC1 address and size</div><div class='add'>+ *</div><div class='add'>+ * Driver will fill the dbcg1 address and size at address based on config TLV.</div><div class='add'>+ *</div><div class='add'>+ * @first_word: all 0 set as identifier</div><div class='add'>+ * @dbgc1_add_lsb: LSB bits of DBGC1 physical address</div><div class='add'>+ * @dbgc1_add_msb: MSB bits of DBGC1 physical address</div><div class='add'>+ * @dbgc1_size: DBGC1 size</div><div class='add'>+*/</div><div class='add'>+struct iwl_dbgc1_info {</div><div class='add'>+	__le32 first_word;</div><div class='add'>+	__le32 dbgc1_add_lsb;</div><div class='add'>+	__le32 dbgc1_add_msb;</div><div class='add'>+	__le32 dbgc1_size;</div><div class='add'>+} __packed; /* INIT_DRAM_FRAGS_ALLOCATIONS_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_dbg_host_event_cfg_cmd - host event config command</div><div class='ctx'>  * @enabled_severities: enabled severities</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_dbg_host_event_cfg_cmd {</div><div class='ctx'> 	__le32 enabled_severities;</div><div class='ctx'> } __packed; /* DEBUG_HOST_EVENT_CFG_CMD_API_S_VER_1 */</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct iwl_dbg_dump_complete_cmd - dump complete cmd</div><div class='add'>+ *</div><div class='add'>+ * @tp: timepoint whose dump has completed</div><div class='add'>+ * @tp_data: timepoint data</div><div class='add'>+ */</div><div class='add'>+struct iwl_dbg_dump_complete_cmd {</div><div class='add'>+	__le32 tp;</div><div class='add'>+	__le32 tp_data;</div><div class='add'>+} __packed; /* FW_DUMP_COMPLETE_CMD_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_tas_status_per_mac - tas status per lmac</div><div class='add'>+ * @static_status: tas statically enabled or disabled per lmac - TRUE/FALSE</div><div class='add'>+ * @static_dis_reason: TAS static disable reason, uses</div><div class='add'>+ *	&amp;enum iwl_tas_statically_disabled_reason</div><div class='add'>+ * @dynamic_status: Current TAS  status. uses</div><div class='add'>+ *	&amp;enum iwl_tas_dyna_status</div><div class='add'>+ * @near_disconnection: is TAS currently near disconnection per lmac? - TRUE/FALSE</div><div class='add'>+ * @max_reg_pwr_limit: Regulatory power limits in dBm</div><div class='add'>+ * @sar_limit: SAR limits per lmac in dBm</div><div class='add'>+ * @band: Band per lmac</div><div class='add'>+ * @reserved: reserved</div><div class='add'>+ */</div><div class='add'>+struct iwl_tas_status_per_mac {</div><div class='add'>+	u8 static_status;</div><div class='add'>+	u8 static_dis_reason;</div><div class='add'>+	u8 dynamic_status;</div><div class='add'>+	u8 near_disconnection;</div><div class='add'>+	__le16 max_reg_pwr_limit;</div><div class='add'>+	__le16 sar_limit;</div><div class='add'>+	u8 band;</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+} __packed; /* DEBUG_GET_TAS_STATUS_PER_MAC_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_tas_status_resp - Response to GET_TAS_STATUS</div><div class='add'>+ * @tas_fw_version: TAS FW version</div><div class='add'>+ * @is_uhb_for_usa_enable: is UHB enabled in USA? - TRUE/FALSE</div><div class='add'>+ * @curr_mcc: current mcc</div><div class='add'>+ * @block_list: country block list</div><div class='add'>+ * @tas_status_mac: TAS status per lmac, uses</div><div class='add'>+ *	&amp;struct iwl_tas_status_per_mac</div><div class='add'>+ * @in_dual_radio: is TAS in dual radio? - TRUE/FALSE</div><div class='add'>+ * @uhb_allowed_flags: see &amp;enum iwl_tas_uhb_allowed_flags.</div><div class='add'>+ *	This member is valid only when fw has</div><div class='add'>+ *	%IWL_UCODE_TLV_CAPA_UHB_CANADA_TAS_SUPPORT capability.</div><div class='add'>+ * @reserved: reserved</div><div class='add'>+ */</div><div class='add'>+struct iwl_tas_status_resp {</div><div class='add'>+	u8 tas_fw_version;</div><div class='add'>+	u8 is_uhb_for_usa_enable;</div><div class='add'>+	__le16 curr_mcc;</div><div class='add'>+	__le16 block_list[16];</div><div class='add'>+	struct iwl_tas_status_per_mac tas_status_mac[2];</div><div class='add'>+	u8 in_dual_radio;</div><div class='add'>+	u8 uhb_allowed_flags;</div><div class='add'>+	u8 reserved[2];</div><div class='add'>+} __packed; /* DEBUG_GET_TAS_STATUS_RSP_API_S_VER_3 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_tas_dyna_status - TAS current running status</div><div class='add'>+ * @TAS_DYNA_INACTIVE: TAS status is inactive</div><div class='add'>+ * @TAS_DYNA_INACTIVE_MVM_MODE: TAS is disabled due because FW is in MVM mode</div><div class='add'>+ *	or is in softap mode.</div><div class='add'>+ * @TAS_DYNA_INACTIVE_TRIGGER_MODE: TAS is disabled because FW is in</div><div class='add'>+ *	multi user trigger mode</div><div class='add'>+ * @TAS_DYNA_INACTIVE_BLOCK_LISTED: TAS is disabled because  current mcc</div><div class='add'>+ *	is blocklisted mcc</div><div class='add'>+ * @TAS_DYNA_INACTIVE_UHB_NON_US: TAS is disabled because current band is UHB</div><div class='add'>+ *	and current mcc is USA</div><div class='add'>+ * @TAS_DYNA_ACTIVE: TAS is currently active</div><div class='add'>+ * @TAS_DYNA_STATUS_MAX: TAS status max value</div><div class='add'>+ */</div><div class='add'>+enum iwl_tas_dyna_status {</div><div class='add'>+	TAS_DYNA_INACTIVE,</div><div class='add'>+	TAS_DYNA_INACTIVE_MVM_MODE,</div><div class='add'>+	TAS_DYNA_INACTIVE_TRIGGER_MODE,</div><div class='add'>+	TAS_DYNA_INACTIVE_BLOCK_LISTED,</div><div class='add'>+	TAS_DYNA_INACTIVE_UHB_NON_US,</div><div class='add'>+	TAS_DYNA_ACTIVE,</div><div class='add'>+</div><div class='add'>+	TAS_DYNA_STATUS_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_tas_statically_disabled_reason - TAS statically disabled reason</div><div class='add'>+ * @TAS_DISABLED_DUE_TO_BIOS: TAS is disabled because TAS is disabled in BIOS</div><div class='add'>+ * @TAS_DISABLED_DUE_TO_SAR_6DBM: TAS is disabled because SAR limit is less than 6 Dbm</div><div class='add'>+ * @TAS_DISABLED_REASON_INVALID: TAS disable reason is invalid</div><div class='add'>+ * @TAS_DISABLED_DUE_TO_TABLE_SOURCE_INVALID: TAS is disabled due to</div><div class='add'>+ *	table source invalid</div><div class='add'>+ * @TAS_DISABLED_REASON_MAX: TAS disable reason max value</div><div class='add'>+ */</div><div class='add'>+enum iwl_tas_statically_disabled_reason {</div><div class='add'>+	TAS_DISABLED_DUE_TO_BIOS,</div><div class='add'>+	TAS_DISABLED_DUE_TO_SAR_6DBM,</div><div class='add'>+	TAS_DISABLED_REASON_INVALID,</div><div class='add'>+	TAS_DISABLED_DUE_TO_TABLE_SOURCE_INVALID,</div><div class='add'>+</div><div class='add'>+	TAS_DISABLED_REASON_MAX,</div><div class='add'>+}; /*_TAS_STATICALLY_DISABLED_REASON_E*/</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_fw_dbg_config_cmd_type - types of FW debug config command</div><div class='add'>+ * @DEBUG_TOKEN_CONFIG_TYPE: token config type</div><div class='add'>+ */</div><div class='add'>+enum iwl_fw_dbg_config_cmd_type {</div><div class='add'>+	DEBUG_TOKEN_CONFIG_TYPE = 0x2B,</div><div class='add'>+}; /* LDBG_CFG_CMD_TYPE_API_E_VER_1 */</div><div class='add'>+</div><div class='add'>+/* this token disables debug asserts in the firmware */</div><div class='add'>+#define IWL_FW_DBG_CONFIG_TOKEN 0x00010001</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_fw_dbg_config_cmd - configure FW debug</div><div class='add'>+ *</div><div class='add'>+ * @type: according to &amp;enum iwl_fw_dbg_config_cmd_type</div><div class='add'>+ * @conf: FW configuration</div><div class='add'>+ */</div><div class='add'>+struct iwl_fw_dbg_config_cmd {</div><div class='add'>+	__le32 type;</div><div class='add'>+	__le32 conf;</div><div class='add'>+} __packed; /* LDBG_CFG_CMD_API_S_VER_7 */</div><div class='add'>+</div><div class='ctx'> #endif /* __iwl_fw_api_debug_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/dhc.h b/drivers/net/wireless/intel/iwlwifi/fw/api/dhc.h<br/>new file mode 100644<br/>index 000000000000..b6d79c678cd8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/dhc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/dhc.h</a></div><div class='hunk'>@@ -0,0 +1,226 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_fw_api_dhc_h__</div><div class='add'>+#define __iwl_fw_api_dhc_h__</div><div class='add'>+</div><div class='add'>+#define DHC_TABLE_MASK_POS (28)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_dhc_table_id - DHC table operations index</div><div class='add'>+ */</div><div class='add'>+enum iwl_dhc_table_id {</div><div class='add'>+	/**</div><div class='add'>+	 * @DHC_TABLE_INTEGRATION: select the integration table</div><div class='add'>+	 */</div><div class='add'>+	DHC_TABLE_INTEGRATION	= 2 &lt;&lt; DHC_TABLE_MASK_POS,</div><div class='add'>+	/**</div><div class='add'>+	 * @DHC_TABLE_TOOLS: select the tools table</div><div class='add'>+	 */</div><div class='add'>+	DHC_TABLE_TOOLS		= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_dhc_umac_tools_table - tools operations</div><div class='add'>+ * @DHC_TOOLS_UMAC_GET_TAS_STATUS: Get TAS status.</div><div class='add'>+ *	See @struct iwl_dhc_tas_status_resp</div><div class='add'>+ */</div><div class='add'>+enum iwl_dhc_umac_tools_table {</div><div class='add'>+	DHC_TOOLS_UMAC_GET_TAS_STATUS = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_dhc_umac_integration_table - integration operations</div><div class='add'>+ */</div><div class='add'>+enum iwl_dhc_umac_integration_table {</div><div class='add'>+	/**</div><div class='add'>+	 * @DHC_INT_UMAC_TWT_OPERATION: trigger a TWT operation</div><div class='add'>+	 */</div><div class='add'>+	DHC_INT_UMAC_TWT_OPERATION = 4,</div><div class='add'>+	/**</div><div class='add'>+	 * @DHC_INTEGRATION_TLC_DEBUG_CONFIG: TLC debug</div><div class='add'>+	 */</div><div class='add'>+	DHC_INTEGRATION_TLC_DEBUG_CONFIG = 1,</div><div class='add'>+	/**</div><div class='add'>+	 * @DHC_INTEGRATION_MAX: Maximum UMAC integration table entries</div><div class='add'>+	 */</div><div class='add'>+	DHC_INTEGRATION_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DHC_TARGET_UMAC BIT(27)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_dhc_cmd - debug host command</div><div class='add'>+ * @length: length in DWs of the data structure that is concatenated to the end</div><div class='add'>+ *	of this struct</div><div class='add'>+ * @index_and_mask: bit 31 is 1 for data set operation else it's 0</div><div class='add'>+ *	bits 28-30 is the index of the table of the operation -</div><div class='add'>+ *	&amp;enum iwl_dhc_table_id *</div><div class='add'>+ *	bit 27 is 0 if the cmd targeted to LMAC and 1 if targeted to UMAC,</div><div class='add'>+ *	(LMAC is 0 for backward compatibility)</div><div class='add'>+ *	bit 26 is 0 if the cmd targeted to LMAC0 and 1 if targeted to LMAC1,</div><div class='add'>+ *	relevant only if bit 27 set to 0</div><div class='add'>+ *	bits 0-25 is a specific entry index in the table specified in bits 28-30</div><div class='add'>+ *</div><div class='add'>+ * @data: the concatenated data.</div><div class='add'>+ */</div><div class='add'>+struct iwl_dhc_cmd {</div><div class='add'>+	__le32 length;</div><div class='add'>+	__le32 index_and_mask;</div><div class='add'>+	__le32 data[];</div><div class='add'>+} __packed; /* DHC_CMD_API_S */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_dhc_payload_hdr - DHC payload header</div><div class='add'>+ * @version: a version of a payload</div><div class='add'>+ * @reserved: reserved for alignment</div><div class='add'>+ */</div><div class='add'>+struct iwl_dhc_payload_hdr {</div><div class='add'>+	u8 version;</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+} __packed; /* DHC_PAYLOAD_HDR_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_dhc_tas_status_per_radio - TAS status per radio</div><div class='add'>+ * @band: &amp;PHY_BAND_5 for high band, PHY_BAND_24 for low band and</div><div class='add'>+ *	&amp;PHY_BAND_6 for ultra high band.</div><div class='add'>+ * @static_status: TAS statically enabled or disabled</div><div class='add'>+ * @static_disable_reason: TAS static disable reason, uses</div><div class='add'>+ *	&amp;enum iwl_tas_statically_disabled_reason</div><div class='add'>+ * @near_disconnection: is TAS currently near disconnection per radio</div><div class='add'>+ * @dynamic_status_ant_a: Antenna A current TAS status.</div><div class='add'>+ *	uses &amp;enum iwl_tas_dyna_status</div><div class='add'>+ * @dynamic_status_ant_b: Antenna B current TAS status.</div><div class='add'>+ *	uses &amp;enum iwl_tas_dyna_status</div><div class='add'>+ * @max_reg_pwr_limit_ant_a: Antenna A regulatory power limits in dBm</div><div class='add'>+ * @max_reg_pwr_limit_ant_b: Antenna B regulatory power limits in dBm</div><div class='add'>+ * @sar_limit_ant_a: Antenna A SAR limit per radio in dBm</div><div class='add'>+ * @sar_limit_ant_b: Antenna B SAR limit per radio in dBm</div><div class='add'>+ * @reserved: reserved for alignment</div><div class='add'>+ */</div><div class='add'>+struct iwl_dhc_tas_status_per_radio {</div><div class='add'>+	u8 band;</div><div class='add'>+	u8 static_status;</div><div class='add'>+	u8 static_disable_reason;</div><div class='add'>+	u8 near_disconnection;</div><div class='add'>+	u8 dynamic_status_ant_a;</div><div class='add'>+	u8 dynamic_status_ant_b;</div><div class='add'>+	__le16 max_reg_pwr_limit_ant_a;</div><div class='add'>+	__le16 max_reg_pwr_limit_ant_b;</div><div class='add'>+	__le16 sar_limit_ant_a;</div><div class='add'>+	__le16 sar_limit_ant_b;</div><div class='add'>+	u8 reserved[2];</div><div class='add'>+} __packed; /* DHC_TAS_STATUS_PER_RADIO_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_dhc_tas_status_resp - Response to DHC_TOOLS_UMAC_GET_TAS_STATUS</div><div class='add'>+ * @header: DHC payload header, uses &amp;struct iwl_dhc_payload_hdr</div><div class='add'>+ * @tas_config_info: see @struct bios_value_u32</div><div class='add'>+ * @mcc_block_list: block listed country codes</div><div class='add'>+ * @tas_status_radio: TAS status, uses &amp;struct iwl_dhc_tas_status_per_radio</div><div class='add'>+ * @curr_mcc: current mcc</div><div class='add'>+ * @valid_radio_mask: represent entry in tas_status_per_radio is valid.</div><div class='add'>+ * @reserved: reserved for alignment</div><div class='add'>+ */</div><div class='add'>+struct iwl_dhc_tas_status_resp {</div><div class='add'>+	struct iwl_dhc_payload_hdr header;</div><div class='add'>+	struct bios_value_u32 tas_config_info;</div><div class='add'>+	__le16 mcc_block_list[IWL_WTAS_BLACK_LIST_MAX];</div><div class='add'>+	struct iwl_dhc_tas_status_per_radio tas_status_radio[2];</div><div class='add'>+	__le16 curr_mcc;</div><div class='add'>+	u8 valid_radio_mask;</div><div class='add'>+	u8 reserved;</div><div class='add'>+} __packed; /* DHC_TAS_STATUS_RSP_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_dhc_cmd_resp_v1 - debug host command response</div><div class='add'>+ * @status: status of the command</div><div class='add'>+ * @data: the response data</div><div class='add'>+ */</div><div class='add'>+struct iwl_dhc_cmd_resp_v1 {</div><div class='add'>+	__le32 status;</div><div class='add'>+	__le32 data[];</div><div class='add'>+} __packed; /* DHC_RESP_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_dhc_cmd_resp - debug host command response</div><div class='add'>+ * @status: status of the command</div><div class='add'>+ * @descriptor: command descriptor (index_and_mask) returned</div><div class='add'>+ * @data: the response data</div><div class='add'>+ */</div><div class='add'>+struct iwl_dhc_cmd_resp {</div><div class='add'>+	__le32 status;</div><div class='add'>+	__le32 descriptor;</div><div class='add'>+	__le32 data[];</div><div class='add'>+} __packed; /* DHC_RESP_API_S_VER_2 and DHC_RESP_API_S_VER_3 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_dhc_twt_operation_type - describes the TWT operation type</div><div class='add'>+ *</div><div class='add'>+ * @DHC_TWT_REQUEST: Send a Request TWT command</div><div class='add'>+ * @DHC_TWT_SUGGEST: Send a Suggest TWT command</div><div class='add'>+ * @DHC_TWT_DEMAND: Send a Demand TWT command</div><div class='add'>+ * @DHC_TWT_GROUPING: Send a Grouping TWT command</div><div class='add'>+ * @DHC_TWT_ACCEPT: Send a Accept TWT command</div><div class='add'>+ * @DHC_TWT_ALTERNATE: Send a Alternate TWT command</div><div class='add'>+ * @DHC_TWT_DICTATE: Send a Dictate TWT command</div><div class='add'>+ * @DHC_TWT_REJECT: Send a Reject TWT command</div><div class='add'>+ * @DHC_TWT_TEARDOWN: Send a TearDown TWT command</div><div class='add'>+ */</div><div class='add'>+enum iwl_dhc_twt_operation_type {</div><div class='add'>+	DHC_TWT_REQUEST,</div><div class='add'>+	DHC_TWT_SUGGEST,</div><div class='add'>+	DHC_TWT_DEMAND,</div><div class='add'>+	DHC_TWT_GROUPING,</div><div class='add'>+	DHC_TWT_ACCEPT,</div><div class='add'>+	DHC_TWT_ALTERNATE,</div><div class='add'>+	DHC_TWT_DICTATE,</div><div class='add'>+	DHC_TWT_REJECT,</div><div class='add'>+	DHC_TWT_TEARDOWN,</div><div class='add'>+}; /* DHC_TWT_OPERATION_TYPE_E */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_dhc_twt_operation - trigger a TWT operation</div><div class='add'>+ *</div><div class='add'>+ * @mac_id: the mac Id on which to trigger TWT operation</div><div class='add'>+ * @twt_operation: see &amp;enum iwl_dhc_twt_operation_type</div><div class='add'>+ * @target_wake_time: when should we be on channel</div><div class='add'>+ * @interval_exp: the exponent for the interval</div><div class='add'>+ * @interval_mantissa: the mantissa for the interval</div><div class='add'>+ * @min_wake_duration: the minimum duration for the wake period</div><div class='add'>+ * @trigger: is the TWT triggered or not</div><div class='add'>+ * @flow_type: is the TWT announced or not</div><div class='add'>+ * @flow_id: the TWT flow identifier from 0 to 7</div><div class='add'>+ * @protection: is the TWT protected</div><div class='add'>+ * @ndo_paging_indicator: is ndo_paging_indicator set</div><div class='add'>+ * @responder_pm_mode: is responder_pm_mode set</div><div class='add'>+ * @negotiation_type: if the responder wants to doze outside the TWT SP</div><div class='add'>+ * @twt_request: 1 for TWT request, 0 otherwise</div><div class='add'>+ * @implicit: is TWT implicit</div><div class='add'>+ * @twt_group_assignment: the TWT group assignment</div><div class='add'>+ * @twt_channel: the TWT channel</div><div class='add'>+ * @reserved: reserved</div><div class='add'>+ */</div><div class='add'>+struct iwl_dhc_twt_operation {</div><div class='add'>+	__le32 mac_id;</div><div class='add'>+	__le32 twt_operation;</div><div class='add'>+	__le64 target_wake_time;</div><div class='add'>+	__le32 interval_exp;</div><div class='add'>+	__le32 interval_mantissa;</div><div class='add'>+	__le32 min_wake_duration;</div><div class='add'>+	u8 trigger;</div><div class='add'>+	u8 flow_type;</div><div class='add'>+	u8 flow_id;</div><div class='add'>+	u8 protection;</div><div class='add'>+	u8 ndo_paging_indicator;</div><div class='add'>+	u8 responder_pm_mode;</div><div class='add'>+	u8 negotiation_type;</div><div class='add'>+	u8 twt_request;</div><div class='add'>+	u8 implicit;</div><div class='add'>+	u8 twt_group_assignment;</div><div class='add'>+	u8 twt_channel;</div><div class='add'>+	u8 reserved;</div><div class='add'>+}; /* DHC_TWT_OPERATION_API_S */</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_fw_api_dhc_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/filter.h b/drivers/net/wireless/intel/iwlwifi/fw/api/filter.h<br/>index dd62a63956b3..88fe61d144d4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/filter.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/filter.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/filter.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/filter.h</a></div><div class='hunk'>@@ -33,95 +33,7 @@ struct iwl_mcast_filter_cmd {</div><div class='ctx'> 	u8 pass_all;</div><div class='ctx'> 	u8 bssid[6];</div><div class='ctx'> 	u8 reserved[2];</div><div class='del'>-	u8 addr_list[0];</div><div class='add'>+	u8 addr_list[];</div><div class='ctx'> } __packed; /* MCAST_FILTERING_CMD_API_S_VER_1 */</div><div class='ctx'> </div><div class='del'>-#define MAX_BCAST_FILTERS 8</div><div class='del'>-#define MAX_BCAST_FILTER_ATTRS 2</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * enum iwl_mvm_bcast_filter_attr_offset - written by fw for each Rx packet</div><div class='del'>- * @BCAST_FILTER_OFFSET_PAYLOAD_START: offset is from payload start.</div><div class='del'>- * @BCAST_FILTER_OFFSET_IP_END: offset is from ip header end (i.e.</div><div class='del'>- *	start of ip payload).</div><div class='del'>- */</div><div class='del'>-enum iwl_mvm_bcast_filter_attr_offset {</div><div class='del'>-	BCAST_FILTER_OFFSET_PAYLOAD_START = 0,</div><div class='del'>-	BCAST_FILTER_OFFSET_IP_END = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iwl_fw_bcast_filter_attr - broadcast filter attribute</div><div class='del'>- * @offset_type:	&amp;enum iwl_mvm_bcast_filter_attr_offset.</div><div class='del'>- * @offset:	starting offset of this pattern.</div><div class='del'>- * @reserved1:	reserved</div><div class='del'>- * @val:	value to match - big endian (MSB is the first</div><div class='del'>- *		byte to match from offset pos).</div><div class='del'>- * @mask:	mask to match (big endian).</div><div class='del'>- */</div><div class='del'>-struct iwl_fw_bcast_filter_attr {</div><div class='del'>-	u8 offset_type;</div><div class='del'>-	u8 offset;</div><div class='del'>-	__le16 reserved1;</div><div class='del'>-	__be32 val;</div><div class='del'>-	__be32 mask;</div><div class='del'>-} __packed; /* BCAST_FILTER_ATT_S_VER_1 */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * enum iwl_mvm_bcast_filter_frame_type - filter frame type</div><div class='del'>- * @BCAST_FILTER_FRAME_TYPE_ALL: consider all frames.</div><div class='del'>- * @BCAST_FILTER_FRAME_TYPE_IPV4: consider only ipv4 frames</div><div class='del'>- */</div><div class='del'>-enum iwl_mvm_bcast_filter_frame_type {</div><div class='del'>-	BCAST_FILTER_FRAME_TYPE_ALL = 0,</div><div class='del'>-	BCAST_FILTER_FRAME_TYPE_IPV4 = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iwl_fw_bcast_filter - broadcast filter</div><div class='del'>- * @discard: discard frame (1) or let it pass (0).</div><div class='del'>- * @frame_type: &amp;enum iwl_mvm_bcast_filter_frame_type.</div><div class='del'>- * @reserved1: reserved</div><div class='del'>- * @num_attrs: number of valid attributes in this filter.</div><div class='del'>- * @attrs: attributes of this filter. a filter is considered matched</div><div class='del'>- *	only when all its attributes are matched (i.e. AND relationship)</div><div class='del'>- */</div><div class='del'>-struct iwl_fw_bcast_filter {</div><div class='del'>-	u8 discard;</div><div class='del'>-	u8 frame_type;</div><div class='del'>-	u8 num_attrs;</div><div class='del'>-	u8 reserved1;</div><div class='del'>-	struct iwl_fw_bcast_filter_attr attrs[MAX_BCAST_FILTER_ATTRS];</div><div class='del'>-} __packed; /* BCAST_FILTER_S_VER_1 */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iwl_fw_bcast_mac - per-mac broadcast filtering configuration.</div><div class='del'>- * @default_discard: default action for this mac (discard (1) / pass (0)).</div><div class='del'>- * @reserved1: reserved</div><div class='del'>- * @attached_filters: bitmap of relevant filters for this mac.</div><div class='del'>- */</div><div class='del'>-struct iwl_fw_bcast_mac {</div><div class='del'>-	u8 default_discard;</div><div class='del'>-	u8 reserved1;</div><div class='del'>-	__le16 attached_filters;</div><div class='del'>-} __packed; /* BCAST_MAC_CONTEXT_S_VER_1 */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iwl_bcast_filter_cmd - broadcast filtering configuration</div><div class='del'>- * @disable: enable (0) / disable (1)</div><div class='del'>- * @max_bcast_filters: max number of filters (MAX_BCAST_FILTERS)</div><div class='del'>- * @max_macs: max number of macs (NUM_MAC_INDEX_DRIVER)</div><div class='del'>- * @reserved1: reserved</div><div class='del'>- * @filters: broadcast filters</div><div class='del'>- * @macs: broadcast filtering configuration per-mac</div><div class='del'>- */</div><div class='del'>-struct iwl_bcast_filter_cmd {</div><div class='del'>-	u8 disable;</div><div class='del'>-	u8 max_bcast_filters;</div><div class='del'>-	u8 max_macs;</div><div class='del'>-	u8 reserved1;</div><div class='del'>-	struct iwl_fw_bcast_filter filters[MAX_BCAST_FILTERS];</div><div class='del'>-	struct iwl_fw_bcast_mac macs[NUM_MAC_INDEX_DRIVER];</div><div class='del'>-} __packed; /* BCAST_FILTERING_HCMD_API_S_VER_1 */</div><div class='del'>-</div><div class='ctx'> #endif /* __iwl_fw_api_filter_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/location.h b/drivers/net/wireless/intel/iwlwifi/fw/api/location.h<br/>index 0e38eb1cd75d..2ee3a48aa5df 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/location.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/location.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/location.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/location.h</a></div><div class='hunk'>@@ -1,10 +1,16 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2018-2022 Intel Corporation</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_fw_api_location_h__</div><div class='ctx'> #define __iwl_fw_api_location_h__</div><div class='add'>+#include &lt;linux/ieee80211.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+#include "rs.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_location_subcmd_ids - location group command IDs</div><div class='hunk'>@@ -35,8 +41,11 @@ enum iwl_location_subcmd_ids {</div><div class='ctx'> 	 */</div><div class='ctx'> 	TOF_RANGE_REQ_EXT_CMD = 0x3,</div><div class='ctx'> 	/**</div><div class='del'>-	 * @TOF_RESPONDER_CONFIG_CMD: FTM responder configuration,</div><div class='del'>-	 *	uses &amp;struct iwl_tof_responder_config_cmd</div><div class='add'>+	 * @TOF_RESPONDER_CONFIG_CMD: FTM responder configuration, one of</div><div class='add'>+	 *	&amp;struct iwl_tof_responder_config_cmd_v6,</div><div class='add'>+	 *	&amp;struct iwl_tof_responder_config_cmd_v7,</div><div class='add'>+	 *	&amp;struct iwl_tof_responder_config_cmd_v8 or</div><div class='add'>+	 *	&amp;struct iwl_tof_responder_config_cmd_v9</div><div class='ctx'> 	 */</div><div class='ctx'> 	TOF_RESPONDER_CONFIG_CMD = 0x4,</div><div class='ctx'> 	/**</div><div class='hunk'>@@ -69,8 +78,11 @@ enum iwl_location_subcmd_ids {</div><div class='ctx'> 	 */</div><div class='ctx'> 	TOF_MCSI_DEBUG_NOTIF = 0xFE,</div><div class='ctx'> 	/**</div><div class='del'>-	 * @TOF_RANGE_RESPONSE_NOTIF: ranging response, using</div><div class='del'>-	 *	&amp;struct iwl_tof_range_rsp_ntfy</div><div class='add'>+	 * @TOF_RANGE_RESPONSE_NOTIF: ranging response, using one of</div><div class='add'>+	 *	&amp;struct iwl_tof_range_rsp_ntfy_v5,</div><div class='add'>+	 *	&amp;struct iwl_tof_range_rsp_ntfy_v6,</div><div class='add'>+	 *	&amp;struct iwl_tof_range_rsp_ntfy_v7 or</div><div class='add'>+	 *	&amp;struct iwl_tof_range_rsp_ntfy_v8</div><div class='ctx'> 	 */</div><div class='ctx'> 	TOF_RANGE_RESPONSE_NOTIF = 0xFF,</div><div class='ctx'> };</div><div class='hunk'>@@ -151,6 +163,10 @@ enum iwl_tof_mcsi_enable {</div><div class='ctx'>  *	is valid</div><div class='ctx'>  * @IWL_TOF_RESPONDER_CMD_VALID_NDP_PARAMS: NDP parameters are valid</div><div class='ctx'>  * @IWL_TOF_RESPONDER_CMD_VALID_LMR_FEEDBACK: LMR feedback support is valid</div><div class='add'>+ * @IWL_TOF_RESPONDER_CMD_VALID_SESSION_ID: session id flag is valid</div><div class='add'>+ * @IWL_TOF_RESPONDER_CMD_VALID_BSS_COLOR: the bss_color field is valid</div><div class='add'>+ * @IWL_TOF_RESPONDER_CMD_VALID_MIN_MAX_TIME_BETWEEN_MSR: the</div><div class='add'>+ *	min_time_between_msr and max_time_between_msr fields are valid</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_tof_responder_cmd_valid_field {</div><div class='ctx'> 	IWL_TOF_RESPONDER_CMD_VALID_CHAN_INFO = BIT(0),</div><div class='hunk'>@@ -169,6 +185,9 @@ enum iwl_tof_responder_cmd_valid_field {</div><div class='ctx'> 	IWL_TOF_RESPONDER_CMD_VALID_NDP_SUPPORT = BIT(22),</div><div class='ctx'> 	IWL_TOF_RESPONDER_CMD_VALID_NDP_PARAMS = BIT(23),</div><div class='ctx'> 	IWL_TOF_RESPONDER_CMD_VALID_LMR_FEEDBACK = BIT(24),</div><div class='add'>+	IWL_TOF_RESPONDER_CMD_VALID_SESSION_ID = BIT(25),</div><div class='add'>+	IWL_TOF_RESPONDER_CMD_VALID_BSS_COLOR = BIT(26),</div><div class='add'>+	IWL_TOF_RESPONDER_CMD_VALID_MIN_MAX_TIME_BETWEEN_MSR = BIT(27),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -186,6 +205,8 @@ enum iwl_tof_responder_cmd_valid_field {</div><div class='ctx'>  * @IWL_TOF_RESPONDER_FLAGS_NDP_SUPPORT: support NDP ranging</div><div class='ctx'>  * @IWL_TOF_RESPONDER_FLAGS_LMR_FEEDBACK: request for LMR feedback if the</div><div class='ctx'>  *	initiator supports it</div><div class='add'>+ * @IWL_TOF_RESPONDER_FLAGS_SESSION_ID: send the session id in the initial FTM</div><div class='add'>+ *	frame.</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_tof_responder_cfg_flags {</div><div class='ctx'> 	IWL_TOF_RESPONDER_FLAGS_NON_ASAP_SUPPORT = BIT(0),</div><div class='hunk'>@@ -197,9 +218,10 @@ enum iwl_tof_responder_cfg_flags {</div><div class='ctx'> 	IWL_TOF_RESPONDER_FLAGS_SPECIFIC_CALIB_MODE = BIT(8),</div><div class='ctx'> 	IWL_TOF_RESPONDER_FLAGS_FAST_ALGO_SUPPORT = BIT(9),</div><div class='ctx'> 	IWL_TOF_RESPONDER_FLAGS_RETRY_ON_ALGO_FAIL = BIT(10),</div><div class='del'>-	IWL_TOF_RESPONDER_FLAGS_FTM_TX_ANT = RATE_MCS_ANT_ABC_MSK,</div><div class='add'>+	IWL_TOF_RESPONDER_FLAGS_FTM_TX_ANT = RATE_MCS_ANT_AB_MSK,</div><div class='ctx'> 	IWL_TOF_RESPONDER_FLAGS_NDP_SUPPORT = BIT(24),</div><div class='ctx'> 	IWL_TOF_RESPONDER_FLAGS_LMR_FEEDBACK = BIT(25),</div><div class='add'>+	IWL_TOF_RESPONDER_FLAGS_SESSION_ID = BIT(27),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -297,13 +319,13 @@ struct iwl_tof_responder_config_cmd_v7 {</div><div class='ctx'>  * @r2i_ndp_params: parameters for R2I NDP.</div><div class='ctx'>  *	bits 0 - 2: max number of LTF repetitions</div><div class='ctx'>  *	bits 3 - 5: max number of spatial streams (supported values are &lt; 2)</div><div class='del'>- *	bits 6 - 7: max number of total LTFs</div><div class='del'>- *		    (&amp;enum ieee80211_range_params_max_total_ltf)</div><div class='add'>+ *	bits 6 - 7: max number of total LTFs see</div><div class='add'>+ *	&amp;enum ieee80211_range_params_max_total_ltf</div><div class='ctx'>  * @i2r_ndp_params: parameters for I2R NDP.</div><div class='ctx'>  *	bits 0 - 2: max number of LTF repetitions</div><div class='ctx'>  *	bits 3 - 5: max number of spatial streams</div><div class='del'>- *	bits 6 - 7: max number of total LTFs</div><div class='del'>- *		    (&amp;enum ieee80211_range_params_max_total_ltf)</div><div class='add'>+ *	bits 6 - 7: max number of total LTFs see</div><div class='add'>+ *	&amp;enum ieee80211_range_params_max_total_ltf</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_tof_responder_config_cmd_v8 {</div><div class='ctx'> 	__le32 cmd_valid_fields;</div><div class='hunk'>@@ -322,10 +344,114 @@ struct iwl_tof_responder_config_cmd_v8 {</div><div class='ctx'> 	u8 i2r_ndp_params;</div><div class='ctx'> } __packed; /* TOF_RESPONDER_CONFIG_CMD_API_S_VER_8 */</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct iwl_tof_responder_config_cmd_v9 - ToF AP mode (for debug)</div><div class='add'>+ * @cmd_valid_fields: &amp;iwl_tof_responder_cmd_valid_field</div><div class='add'>+ * @responder_cfg_flags: &amp;iwl_tof_responder_cfg_flags</div><div class='add'>+ * @format_bw: bits 0 - 3: &amp;enum iwl_location_frame_format.</div><div class='add'>+ *             bits 4 - 7: &amp;enum iwl_location_bw.</div><div class='add'>+ * @bss_color: current AP bss_color</div><div class='add'>+ * @channel_num: current AP Channel</div><div class='add'>+ * @ctrl_ch_position: coding of the control channel position relative to</div><div class='add'>+ *	the center frequency, see iwl_mvm_get_ctrl_pos()</div><div class='add'>+ * @sta_id: index of the AP STA when in AP mode</div><div class='add'>+ * @reserved1: reserved</div><div class='add'>+ * @toa_offset: Artificial addition [pSec] for the ToA - to be used for debug</div><div class='add'>+ *	purposes, simulating station movement by adding various values</div><div class='add'>+ *	to this field</div><div class='add'>+ * @common_calib: XVT: common calibration value</div><div class='add'>+ * @specific_calib: XVT: specific calibration value</div><div class='add'>+ * @bssid: Current AP BSSID</div><div class='add'>+ * @r2i_ndp_params: parameters for R2I NDP.</div><div class='add'>+ *	bits 0 - 2: max number of LTF repetitions</div><div class='add'>+ *	bits 3 - 5: max number of spatial streams (supported values are &lt; 2)</div><div class='add'>+ *	bits 6 - 7: max number of total LTFs see</div><div class='add'>+ *	&amp;enum ieee80211_range_params_max_total_ltf</div><div class='add'>+ * @i2r_ndp_params: parameters for I2R NDP.</div><div class='add'>+ *	bits 0 - 2: max number of LTF repetitions</div><div class='add'>+ *	bits 3 - 5: max number of spatial streams</div><div class='add'>+ *	bits 6 - 7: max number of total LTFs see</div><div class='add'>+ *	&amp;enum ieee80211_range_params_max_total_ltf</div><div class='add'>+ * @min_time_between_msr: for non trigger based NDP ranging, minimum time</div><div class='add'>+ *	between measurements in milliseconds.</div><div class='add'>+ * @max_time_between_msr: for non trigger based NDP ranging, maximum time</div><div class='add'>+ *	between measurements in milliseconds.</div><div class='add'>+ */</div><div class='add'>+struct iwl_tof_responder_config_cmd_v9 {</div><div class='add'>+	__le32 cmd_valid_fields;</div><div class='add'>+	__le32 responder_cfg_flags;</div><div class='add'>+	u8 format_bw;</div><div class='add'>+	u8 bss_color;</div><div class='add'>+	u8 channel_num;</div><div class='add'>+	u8 ctrl_ch_position;</div><div class='add'>+	u8 sta_id;</div><div class='add'>+	u8 reserved1;</div><div class='add'>+	__le16 toa_offset;</div><div class='add'>+	__le16 common_calib;</div><div class='add'>+	__le16 specific_calib;</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	u8 r2i_ndp_params;</div><div class='add'>+	u8 i2r_ndp_params;</div><div class='add'>+	__le16 min_time_between_msr;</div><div class='add'>+	__le16 max_time_between_msr;</div><div class='add'>+} __packed; /* TOF_RESPONDER_CONFIG_CMD_API_S_VER_8 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_tof_responder_config_cmd - ToF AP mode</div><div class='add'>+ * @cmd_valid_fields: &amp;iwl_tof_responder_cmd_valid_field</div><div class='add'>+ * @responder_cfg_flags: &amp;iwl_tof_responder_cfg_flags</div><div class='add'>+ * @format_bw: bits 0 - 3: &amp;enum iwl_location_frame_format.</div><div class='add'>+ *             bits 4 - 7: &amp;enum iwl_location_bw.</div><div class='add'>+ * @bss_color: current AP bss_color</div><div class='add'>+ * @channel_num: current AP Channel</div><div class='add'>+ * @ctrl_ch_position: coding of the control channel position relative to</div><div class='add'>+ *	the center frequency, see iwl_mvm_get_ctrl_pos()</div><div class='add'>+ * @sta_id: index of the AP STA when in AP mode</div><div class='add'>+ * @band: current AP band</div><div class='add'>+ * @toa_offset: Artificial addition [pSec] for the ToA - to be used for debug</div><div class='add'>+ *	purposes, simulating station movement by adding various values</div><div class='add'>+ *	to this field</div><div class='add'>+ * @common_calib: XVT: common calibration value</div><div class='add'>+ * @specific_calib: XVT: specific calibration value</div><div class='add'>+ * @bssid: Current AP BSSID</div><div class='add'>+ * @r2i_ndp_params: parameters for R2I NDP.</div><div class='add'>+ *	bits 0 - 2: max number of LTF repetitions</div><div class='add'>+ *	bits 3 - 5: max number of spatial streams (supported values are &lt; 2)</div><div class='add'>+ *	bits 6 - 7: max number of total LTFs see</div><div class='add'>+ *	&amp;enum ieee80211_range_params_max_total_ltf</div><div class='add'>+ * @i2r_ndp_params: parameters for I2R NDP.</div><div class='add'>+ *	bits 0 - 2: max number of LTF repetitions</div><div class='add'>+ *	bits 3 - 5: max number of spatial streams</div><div class='add'>+ *	bits 6 - 7: max number of total LTFs see</div><div class='add'>+ *	&amp;enum ieee80211_range_params_max_total_ltf</div><div class='add'>+ * @min_time_between_msr: for non trigger based NDP ranging, minimum time</div><div class='add'>+ *	between measurements in milliseconds.</div><div class='add'>+ * @max_time_between_msr: for non trigger based NDP ranging, maximum time</div><div class='add'>+ *	between measurements in milliseconds.</div><div class='add'>+ */</div><div class='add'>+struct iwl_tof_responder_config_cmd {</div><div class='add'>+	__le32 cmd_valid_fields;</div><div class='add'>+	__le32 responder_cfg_flags;</div><div class='add'>+	u8 format_bw;</div><div class='add'>+	u8 bss_color;</div><div class='add'>+	u8 channel_num;</div><div class='add'>+	u8 ctrl_ch_position;</div><div class='add'>+	u8 sta_id;</div><div class='add'>+	u8 band;</div><div class='add'>+	__le16 toa_offset;</div><div class='add'>+	__le16 common_calib;</div><div class='add'>+	__le16 specific_calib;</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	u8 r2i_ndp_params;</div><div class='add'>+	u8 i2r_ndp_params;</div><div class='add'>+	__le16 min_time_between_msr;</div><div class='add'>+	__le16 max_time_between_msr;</div><div class='add'>+} __packed; /* TOF_RESPONDER_CONFIG_CMD_API_S_VER_10 */</div><div class='add'>+</div><div class='ctx'> #define IWL_LCI_CIVIC_IE_MAX_SIZE	400</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_tof_responder_dyn_config_cmd - Dynamic responder settings</div><div class='add'>+ * struct iwl_tof_responder_dyn_config_cmd_v2 - Dynamic responder settings</div><div class='ctx'>  * @lci_len: The length of the 1st (LCI) part in the @lci_civic buffer</div><div class='ctx'>  * @civic_len: The length of the 2nd (CIVIC) part in the @lci_civic buffer</div><div class='ctx'>  * @lci_civic: The LCI/CIVIC buffer. LCI data (if exists) comes first, then, if</div><div class='hunk'>@@ -489,6 +615,15 @@ struct iwl_tof_range_req_ap_entry_v2 {</div><div class='ctx'>  *      instead of fw internal values.</div><div class='ctx'>  * @IWL_INITIATOR_AP_FLAGS_PMF: request to protect the negotiation and LMR</div><div class='ctx'>  *      frames with protected management frames.</div><div class='add'>+ * @IWL_INITIATOR_AP_FLAGS_TERMINATE_ON_LMR_FEEDBACK: terminate the session if</div><div class='add'>+ *	the responder asked for LMR feedback although the initiator did not set</div><div class='add'>+ *	the LMR feedback bit in the FTM request. If not set, the initiator will</div><div class='add'>+ *	continue with the session and will provide the LMR feedback.</div><div class='add'>+ * @IWL_INITIATOR_AP_FLAGS_TEST_INCORRECT_SAC: send an incorrect SAC in the</div><div class='add'>+ *	first NDP exchange. This is used for testing.</div><div class='add'>+ * @IWL_INITIATOR_AP_FLAGS_TEST_BAD_SLTF: use incorrect secure LTF tx key. This</div><div class='add'>+ *	is used for testing. Only supported from version 15 of the range request</div><div class='add'>+ *	command.</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_initiator_ap_flags {</div><div class='ctx'> 	IWL_INITIATOR_AP_FLAGS_ASAP = BIT(1),</div><div class='hunk'>@@ -504,6 +639,9 @@ enum iwl_initiator_ap_flags {</div><div class='ctx'> 	IWL_INITIATOR_AP_FLAGS_LMR_FEEDBACK = BIT(12),</div><div class='ctx'> 	IWL_INITIATOR_AP_FLAGS_USE_CALIB = BIT(13),</div><div class='ctx'> 	IWL_INITIATOR_AP_FLAGS_PMF = BIT(14),</div><div class='add'>+	IWL_INITIATOR_AP_FLAGS_TERMINATE_ON_LMR_FEEDBACK = BIT(15),</div><div class='add'>+	IWL_INITIATOR_AP_FLAGS_TEST_INCORRECT_SAC = BIT(16),</div><div class='add'>+	IWL_INITIATOR_AP_FLAGS_TEST_BAD_SLTF = BIT(17),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -557,11 +695,13 @@ enum iwl_location_frame_format {</div><div class='ctx'>  * @IWL_LOCATION_BW_20MHZ: 20MHz</div><div class='ctx'>  * @IWL_LOCATION_BW_40MHZ: 40MHz</div><div class='ctx'>  * @IWL_LOCATION_BW_80MHZ: 80MHz</div><div class='add'>+ * @IWL_LOCATION_BW_160MHZ: 160MHz</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_location_bw {</div><div class='ctx'> 	IWL_LOCATION_BW_20MHZ,</div><div class='ctx'> 	IWL_LOCATION_BW_40MHZ,</div><div class='ctx'> 	IWL_LOCATION_BW_80MHZ,</div><div class='add'>+	IWL_LOCATION_BW_160MHZ,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define TK_11AZ_LEN	32</div><div class='hunk'>@@ -636,7 +776,7 @@ enum iwl_location_cipher {</div><div class='ctx'>  * @num_of_bursts: Recommended value to be sent to the AP. 2s Exponent of</div><div class='ctx'>  *	the number of measurement iterations (min 2^0 = 1, max 2^14)</div><div class='ctx'>  * @sta_id: the station id of the AP. Only relevant when associated to the AP,</div><div class='del'>- *	otherwise should be set to &amp;IWL_MVM_INVALID_STA.</div><div class='add'>+ *	otherwise should be set to &amp;IWL_INVALID_STA.</div><div class='ctx'>  * @cipher: pairwise cipher suite for secured measurement.</div><div class='ctx'>  *          &amp;enum iwl_location_cipher.</div><div class='ctx'>  * @hltk: HLTK to be used for secured 11az measurement</div><div class='hunk'>@@ -683,7 +823,7 @@ struct iwl_tof_range_req_ap_entry_v6 {</div><div class='ctx'>  * @num_of_bursts: Recommended value to be sent to the AP. 2s Exponent of</div><div class='ctx'>  *	the number of measurement iterations (min 2^0 = 1, max 2^14)</div><div class='ctx'>  * @sta_id: the station id of the AP. Only relevant when associated to the AP,</div><div class='del'>- *	otherwise should be set to &amp;IWL_MVM_INVALID_STA.</div><div class='add'>+ *	otherwise should be set to &amp;IWL_INVALID_STA.</div><div class='ctx'>  * @cipher: pairwise cipher suite for secured measurement.</div><div class='ctx'>  *          &amp;enum iwl_location_cipher.</div><div class='ctx'>  * @hltk: HLTK to be used for secured 11az measurement</div><div class='hunk'>@@ -696,10 +836,10 @@ struct iwl_tof_range_req_ap_entry_v6 {</div><div class='ctx'>  *	&amp;IWL_INITIATOR_AP_FLAGS_TB is set.</div><div class='ctx'>  * @rx_pn: the next expected PN for protected management frames Rx. LE byte</div><div class='ctx'>  *	order. Only valid if &amp;IWL_INITIATOR_AP_FLAGS_SECURED is set and sta_id</div><div class='del'>- *	is set to &amp;IWL_MVM_INVALID_STA.</div><div class='add'>+ *	is set to &amp;IWL_INVALID_STA.</div><div class='ctx'>  * @tx_pn: the next PN to use for protected management frames Tx. LE byte</div><div class='ctx'>  *	order. Only valid if &amp;IWL_INITIATOR_AP_FLAGS_SECURED is set and sta_id</div><div class='del'>- *	is set to &amp;IWL_MVM_INVALID_STA.</div><div class='add'>+ *	is set to &amp;IWL_INVALID_STA.</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_tof_range_req_ap_entry_v7 {</div><div class='ctx'> 	__le32 initiator_ap_flags;</div><div class='hunk'>@@ -722,6 +862,7 @@ struct iwl_tof_range_req_ap_entry_v7 {</div><div class='ctx'> } __packed; /* LOCATION_RANGE_REQ_AP_ENTRY_CMD_API_S_VER_7 */</div><div class='ctx'> </div><div class='ctx'> #define IWL_LOCATION_MAX_STS_POS	3</div><div class='add'>+#define IWL_LOCATION_TOTAL_LTF_POS	6</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_tof_range_req_ap_entry_v8 - AP configuration parameters</div><div class='hunk'>@@ -740,7 +881,7 @@ struct iwl_tof_range_req_ap_entry_v7 {</div><div class='ctx'>  * @num_of_bursts: Recommended value to be sent to the AP. 2s Exponent of</div><div class='ctx'>  *	the number of measurement iterations (min 2^0 = 1, max 2^14)</div><div class='ctx'>  * @sta_id: the station id of the AP. Only relevant when associated to the AP,</div><div class='del'>- *	otherwise should be set to &amp;IWL_MVM_INVALID_STA.</div><div class='add'>+ *	otherwise should be set to &amp;IWL_INVALID_STA.</div><div class='ctx'>  * @cipher: pairwise cipher suite for secured measurement.</div><div class='ctx'>  *          &amp;enum iwl_location_cipher.</div><div class='ctx'>  * @hltk: HLTK to be used for secured 11az measurement</div><div class='hunk'>@@ -753,10 +894,10 @@ struct iwl_tof_range_req_ap_entry_v7 {</div><div class='ctx'>  *	&amp;IWL_INITIATOR_AP_FLAGS_TB is set.</div><div class='ctx'>  * @rx_pn: the next expected PN for protected management frames Rx. LE byte</div><div class='ctx'>  *	order. Only valid if &amp;IWL_INITIATOR_AP_FLAGS_SECURED is set and sta_id</div><div class='del'>- *	is set to &amp;IWL_MVM_INVALID_STA.</div><div class='add'>+ *	is set to &amp;IWL_INVALID_STA.</div><div class='ctx'>  * @tx_pn: the next PN to use for protected management frames Tx. LE byte</div><div class='ctx'>  *	order. Only valid if &amp;IWL_INITIATOR_AP_FLAGS_SECURED is set and sta_id</div><div class='del'>- *	is set to &amp;IWL_MVM_INVALID_STA.</div><div class='add'>+ *	is set to &amp;IWL_INVALID_STA.</div><div class='ctx'>  * @r2i_ndp_params: parameters for R2I NDP ranging negotiation.</div><div class='ctx'>  *      bits 0 - 2: max LTF repetitions</div><div class='ctx'>  *      bits 3 - 5: max number of spatial streams</div><div class='hunk'>@@ -795,7 +936,163 @@ struct iwl_tof_range_req_ap_entry_v8 {</div><div class='ctx'> } __packed; /* LOCATION_RANGE_REQ_AP_ENTRY_CMD_API_S_VER_8 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum iwl_tof_response_mode</div><div class='add'>+ * struct iwl_tof_range_req_ap_entry_v9 - AP configuration parameters</div><div class='add'>+ * @initiator_ap_flags: see &amp;enum iwl_initiator_ap_flags.</div><div class='add'>+ * @channel_num: AP Channel number</div><div class='add'>+ * @format_bw: bits 0 - 3: &amp;enum iwl_location_frame_format.</div><div class='add'>+ *             bits 4 - 7: &amp;enum iwl_location_bw.</div><div class='add'>+ * @ctrl_ch_position: Coding of the control channel position relative to the</div><div class='add'>+ *	center frequency, see iwl_mvm_get_ctrl_pos().</div><div class='add'>+ * @ftmr_max_retries: Max number of retries to send the FTMR in case of no</div><div class='add'>+ *	reply from the AP.</div><div class='add'>+ * @bssid: AP's BSSID</div><div class='add'>+ * @burst_period: For EDCA based ranging: Recommended value to be sent to the</div><div class='add'>+ *	AP. Measurement periodicity In units of 100ms. ignored if</div><div class='add'>+ *	num_of_bursts_exp = 0.</div><div class='add'>+ *	For non trigger based NDP ranging, the maximum time between</div><div class='add'>+ *	measurements in units of milliseconds.</div><div class='add'>+ * @samples_per_burst: the number of FTMs pairs in single Burst (1-31);</div><div class='add'>+ * @num_of_bursts: Recommended value to be sent to the AP. 2s Exponent of</div><div class='add'>+ *	the number of measurement iterations (min 2^0 = 1, max 2^14)</div><div class='add'>+ * @sta_id: the station id of the AP. Only relevant when associated to the AP,</div><div class='add'>+ *	otherwise should be set to &amp;IWL_INVALID_STA.</div><div class='add'>+ * @cipher: pairwise cipher suite for secured measurement.</div><div class='add'>+ *          &amp;enum iwl_location_cipher.</div><div class='add'>+ * @hltk: HLTK to be used for secured 11az measurement</div><div class='add'>+ * @tk: TK to be used for secured 11az measurement</div><div class='add'>+ * @calib: An array of calibration values per FTM rx bandwidth.</div><div class='add'>+ *         If &amp;IWL_INITIATOR_AP_FLAGS_USE_CALIB is set, the fw will use the</div><div class='add'>+ *         calibration value that corresponds to the rx bandwidth of the FTM</div><div class='add'>+ *         frame.</div><div class='add'>+ * @beacon_interval: beacon interval of the AP in TUs. Only required if</div><div class='add'>+ *	&amp;IWL_INITIATOR_AP_FLAGS_TB is set.</div><div class='add'>+ * @bss_color: the BSS color of the responder. Only valid if</div><div class='add'>+ *	&amp;IWL_INITIATOR_AP_FLAGS_TB or &amp;IWL_INITIATOR_AP_FLAGS_NON_TB is set.</div><div class='add'>+ * @rx_pn: the next expected PN for protected management frames Rx. LE byte</div><div class='add'>+ *	order. Only valid if &amp;IWL_INITIATOR_AP_FLAGS_SECURED is set and sta_id</div><div class='add'>+ *	is set to &amp;IWL_INVALID_STA.</div><div class='add'>+ * @tx_pn: the next PN to use for protected management frames Tx. LE byte</div><div class='add'>+ *	order. Only valid if &amp;IWL_INITIATOR_AP_FLAGS_SECURED is set and sta_id</div><div class='add'>+ *	is set to &amp;IWL_INVALID_STA.</div><div class='add'>+ * @r2i_ndp_params: parameters for R2I NDP ranging negotiation.</div><div class='add'>+ *      bits 0 - 2: max LTF repetitions</div><div class='add'>+ *      bits 3 - 5: max number of spatial streams</div><div class='add'>+ *      bits 6 - 7: reserved</div><div class='add'>+ * @i2r_ndp_params: parameters for I2R NDP ranging negotiation.</div><div class='add'>+ *      bits 0 - 2: max LTF repetitions</div><div class='add'>+ *      bits 3 - 5: max number of spatial streams (supported values are &lt; 2)</div><div class='add'>+ *      bits 6 - 7: reserved</div><div class='add'>+ * @r2i_max_total_ltf: R2I Max Total LTFs for NDP ranging negotiation.</div><div class='add'>+ *      One of &amp;enum ieee80211_range_params_max_total_ltf.</div><div class='add'>+ * @i2r_max_total_ltf: I2R Max Total LTFs for NDP ranging negotiation.</div><div class='add'>+ *      One of &amp;enum ieee80211_range_params_max_total_ltf.</div><div class='add'>+ * @bss_color: the BSS color of the responder. Only valid if</div><div class='add'>+ *	&amp;IWL_INITIATOR_AP_FLAGS_NON_TB or &amp;IWL_INITIATOR_AP_FLAGS_TB is set.</div><div class='add'>+ * @band: 0 for 5.2 GHz, 1 for 2.4 GHz, 2 for 6GHz</div><div class='add'>+ * @min_time_between_msr: For non trigger based NDP ranging, the minimum time</div><div class='add'>+ *	between measurements in units of milliseconds</div><div class='add'>+ */</div><div class='add'>+struct iwl_tof_range_req_ap_entry_v9 {</div><div class='add'>+	__le32 initiator_ap_flags;</div><div class='add'>+	u8 channel_num;</div><div class='add'>+	u8 format_bw;</div><div class='add'>+	u8 ctrl_ch_position;</div><div class='add'>+	u8 ftmr_max_retries;</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	__le16 burst_period;</div><div class='add'>+	u8 samples_per_burst;</div><div class='add'>+	u8 num_of_bursts;</div><div class='add'>+	u8 sta_id;</div><div class='add'>+	u8 cipher;</div><div class='add'>+	u8 hltk[HLTK_11AZ_LEN];</div><div class='add'>+	u8 tk[TK_11AZ_LEN];</div><div class='add'>+	__le16 calib[IWL_TOF_BW_NUM];</div><div class='add'>+	u16 beacon_interval;</div><div class='add'>+	u8 rx_pn[IEEE80211_CCMP_PN_LEN];</div><div class='add'>+	u8 tx_pn[IEEE80211_CCMP_PN_LEN];</div><div class='add'>+	u8 r2i_ndp_params;</div><div class='add'>+	u8 i2r_ndp_params;</div><div class='add'>+	u8 r2i_max_total_ltf;</div><div class='add'>+	u8 i2r_max_total_ltf;</div><div class='add'>+	u8 bss_color;</div><div class='add'>+	u8 band;</div><div class='add'>+	__le16 min_time_between_msr;</div><div class='add'>+} __packed; /* LOCATION_RANGE_REQ_AP_ENTRY_CMD_API_S_VER_9 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_tof_range_req_ap_entry - AP configuration parameters</div><div class='add'>+ * @initiator_ap_flags: see &amp;enum iwl_initiator_ap_flags.</div><div class='add'>+ * @band: 0 for 5.2 GHz, 1 for 2.4 GHz, 2 for 6GHz</div><div class='add'>+ * @channel_num: AP Channel number</div><div class='add'>+ * @format_bw: bits 0 - 3: &amp;enum iwl_location_frame_format.</div><div class='add'>+ *             bits 4 - 7: &amp;enum iwl_location_bw.</div><div class='add'>+ * @ctrl_ch_position: Coding of the control channel position relative to the</div><div class='add'>+ *	center frequency, see iwl_mvm_get_ctrl_pos().</div><div class='add'>+ * @bssid: AP's BSSID</div><div class='add'>+ * @burst_period: For EDCA based ranging: Recommended value to be sent to the</div><div class='add'>+ *	AP. Measurement periodicity In units of 100ms. ignored if</div><div class='add'>+ *	num_of_bursts_exp = 0.</div><div class='add'>+ *	For non trigger based NDP ranging, the maximum time between</div><div class='add'>+ *	measurements in units of milliseconds.</div><div class='add'>+ * @samples_per_burst: the number of FTMs pairs in single Burst (1-31);</div><div class='add'>+ * @num_of_bursts: Recommended value to be sent to the AP. 2s Exponent of</div><div class='add'>+ *	the number of measurement iterations (min 2^0 = 1, max 2^14)</div><div class='add'>+ * @sta_id: the station id of the AP. Only relevant when associated to the AP,</div><div class='add'>+ *	otherwise should be set to &amp;IWL_INVALID_STA.</div><div class='add'>+ * @cipher: pairwise cipher suite for secured measurement.</div><div class='add'>+ *          &amp;enum iwl_location_cipher.</div><div class='add'>+ * @hltk: HLTK to be used for secured 11az measurement</div><div class='add'>+ * @tk: TK to be used for secured 11az measurement</div><div class='add'>+ * @calib: An array of calibration values per FTM rx bandwidth.</div><div class='add'>+ *         If &amp;IWL_INITIATOR_AP_FLAGS_USE_CALIB is set, the fw will use the</div><div class='add'>+ *         calibration value that corresponds to the rx bandwidth of the FTM</div><div class='add'>+ *         frame.</div><div class='add'>+ * @beacon_interval: beacon interval of the AP in TUs. Only required if</div><div class='add'>+ *	&amp;IWL_INITIATOR_AP_FLAGS_TB is set.</div><div class='add'>+ * @rx_pn: the next expected PN for protected management frames Rx. LE byte</div><div class='add'>+ *	order. Only valid if &amp;IWL_INITIATOR_AP_FLAGS_SECURED is set and sta_id</div><div class='add'>+ *	is set to &amp;IWL_INVALID_STA.</div><div class='add'>+ * @tx_pn: the next PN to use for protected management frames Tx. LE byte</div><div class='add'>+ *	order. Only valid if &amp;IWL_INITIATOR_AP_FLAGS_SECURED is set and sta_id</div><div class='add'>+ *	is set to &amp;IWL_INVALID_STA.</div><div class='add'>+ * @r2i_ndp_params: parameters for R2I NDP ranging negotiation.</div><div class='add'>+ *      bits 0 - 2: max LTF repetitions</div><div class='add'>+ *      bits 3 - 5: max number of spatial streams</div><div class='add'>+ *      bits 6 - 7: max total LTFs. One of</div><div class='add'>+ *		&amp;enum ieee80211_range_params_max_total_ltf.</div><div class='add'>+ * @i2r_ndp_params: parameters for I2R NDP ranging negotiation.</div><div class='add'>+ *      bits 0 - 2: max LTF repetitions</div><div class='add'>+ *      bits 3 - 5: max number of spatial streams (supported values are &lt; 2)</div><div class='add'>+ *      bits 6 - 7: max total LTFs. One of</div><div class='add'>+ *		&amp;enum ieee80211_range_params_max_total_ltf.</div><div class='add'>+ * @min_time_between_msr: For non trigger based NDP ranging, the minimum time</div><div class='add'>+ *	between measurements in units of milliseconds</div><div class='add'>+ */</div><div class='add'>+struct iwl_tof_range_req_ap_entry {</div><div class='add'>+	__le32 initiator_ap_flags;</div><div class='add'>+	u8 band;</div><div class='add'>+	u8 channel_num;</div><div class='add'>+	u8 format_bw;</div><div class='add'>+	u8 ctrl_ch_position;</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	__le16 burst_period;</div><div class='add'>+	u8 samples_per_burst;</div><div class='add'>+	u8 num_of_bursts;</div><div class='add'>+	u8 sta_id;</div><div class='add'>+	u8 cipher;</div><div class='add'>+	u8 hltk[HLTK_11AZ_LEN];</div><div class='add'>+	u8 tk[TK_11AZ_LEN];</div><div class='add'>+	__le16 calib[IWL_TOF_BW_NUM];</div><div class='add'>+	__le16 beacon_interval;</div><div class='add'>+	u8 rx_pn[IEEE80211_CCMP_PN_LEN];</div><div class='add'>+	u8 tx_pn[IEEE80211_CCMP_PN_LEN];</div><div class='add'>+	u8 r2i_ndp_params;</div><div class='add'>+	u8 i2r_ndp_params;</div><div class='add'>+	__le16 min_time_between_msr;</div><div class='add'>+} __packed; /* LOCATION_RANGE_REQ_AP_ENTRY_CMD_API_S_VER_9 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_tof_response_mode - TOF response mode</div><div class='ctx'>  * @IWL_MVM_TOF_RESPONSE_ASAP: report each AP measurement separately as soon as</div><div class='ctx'>  *			       possible (not supported for this release)</div><div class='ctx'>  * @IWL_MVM_TOF_RESPONSE_TIMEOUT: report all AP measurements as a batch upon</div><div class='hunk'>@@ -811,7 +1108,7 @@ enum iwl_tof_response_mode {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum iwl_tof_initiator_flags</div><div class='add'>+ * enum iwl_tof_initiator_flags - TOF initiator flags</div><div class='ctx'>  *</div><div class='ctx'>  * @IWL_TOF_INITIATOR_FLAGS_FAST_ALGO_DISABLED: disable fast algo, meaning run</div><div class='ctx'>  *	the algo on ant A+B, instead of only one of them.</div><div class='hunk'>@@ -842,7 +1139,7 @@ enum iwl_tof_initiator_flags {</div><div class='ctx'> 	IWL_TOF_INITIATOR_FLAGS_NON_ASAP_SUPPORT = BIT(20),</div><div class='ctx'> }; /* LOCATION_RANGE_REQ_CMD_API_S_VER_5 */</div><div class='ctx'> </div><div class='del'>-#define IWL_MVM_TOF_MAX_APS 5</div><div class='add'>+#define IWL_TOF_MAX_APS 5</div><div class='ctx'> #define IWL_MVM_TOF_MAX_TWO_SIDED_APS 5</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -861,7 +1158,7 @@ enum iwl_tof_initiator_flags {</div><div class='ctx'>  *		   when the session is done (successfully / partially).</div><div class='ctx'>  *		   one of iwl_tof_response_mode.</div><div class='ctx'>  * @reserved0: reserved</div><div class='del'>- * @num_of_ap: Number of APs to measure (error if &gt; IWL_MVM_TOF_MAX_APS)</div><div class='add'>+ * @num_of_ap: Number of APs to measure (error if &gt; IWL_TOF_MAX_APS)</div><div class='ctx'>  * @macaddr_random: '0' Use default source MAC address (i.e. p2_p),</div><div class='ctx'>  *	            '1' Use MAC Address randomization according to the below</div><div class='ctx'>  * @range_req_bssid: ranging request BSSID</div><div class='hunk'>@@ -891,7 +1188,7 @@ struct iwl_tof_range_req_cmd_v5 {</div><div class='ctx'> 	u8 ftm_tx_chains;</div><div class='ctx'> 	__le16 common_calib;</div><div class='ctx'> 	__le16 specific_calib;</div><div class='del'>-	struct iwl_tof_range_req_ap_entry_v2 ap[IWL_MVM_TOF_MAX_APS];</div><div class='add'>+	struct iwl_tof_range_req_ap_entry_v2 ap[IWL_TOF_MAX_APS];</div><div class='ctx'> } __packed;</div><div class='ctx'> /* LOCATION_RANGE_REQ_CMD_API_S_VER_5 */</div><div class='ctx'> </div><div class='hunk'>@@ -900,7 +1197,7 @@ struct iwl_tof_range_req_cmd_v5 {</div><div class='ctx'>  * @initiator_flags: see flags @ iwl_tof_initiator_flags</div><div class='ctx'>  * @request_id: A Token incremented per request. The same Token will be</div><div class='ctx'>  *		sent back in the range response</div><div class='del'>- * @num_of_ap: Number of APs to measure (error if &gt; IWL_MVM_TOF_MAX_APS)</div><div class='add'>+ * @num_of_ap: Number of APs to measure (error if &gt; IWL_TOF_MAX_APS)</div><div class='ctx'>  * @range_req_bssid: ranging request BSSID</div><div class='ctx'>  * @macaddr_mask: Bits set to 0 shall be copied from the MAC address template.</div><div class='ctx'>  *		  Bits set to 1 shall be randomized by the UMAC</div><div class='hunk'>@@ -924,7 +1221,7 @@ struct iwl_tof_range_req_cmd_v7 {</div><div class='ctx'> 	__le32 tsf_mac_id;</div><div class='ctx'> 	__le16 common_calib;</div><div class='ctx'> 	__le16 specific_calib;</div><div class='del'>-	struct iwl_tof_range_req_ap_entry_v3 ap[IWL_MVM_TOF_MAX_APS];</div><div class='add'>+	struct iwl_tof_range_req_ap_entry_v3 ap[IWL_TOF_MAX_APS];</div><div class='ctx'> } __packed; /* LOCATION_RANGE_REQ_CMD_API_S_VER_7 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -932,7 +1229,7 @@ struct iwl_tof_range_req_cmd_v7 {</div><div class='ctx'>  * @initiator_flags: see flags @ iwl_tof_initiator_flags</div><div class='ctx'>  * @request_id: A Token incremented per request. The same Token will be</div><div class='ctx'>  *		sent back in the range response</div><div class='del'>- * @num_of_ap: Number of APs to measure (error if &gt; IWL_MVM_TOF_MAX_APS)</div><div class='add'>+ * @num_of_ap: Number of APs to measure (error if &gt; IWL_TOF_MAX_APS)</div><div class='ctx'>  * @range_req_bssid: ranging request BSSID</div><div class='ctx'>  * @macaddr_mask: Bits set to 0 shall be copied from the MAC address template.</div><div class='ctx'>  *		  Bits set to 1 shall be randomized by the UMAC</div><div class='hunk'>@@ -956,7 +1253,7 @@ struct iwl_tof_range_req_cmd_v8 {</div><div class='ctx'> 	__le32 tsf_mac_id;</div><div class='ctx'> 	__le16 common_calib;</div><div class='ctx'> 	__le16 specific_calib;</div><div class='del'>-	struct iwl_tof_range_req_ap_entry_v4 ap[IWL_MVM_TOF_MAX_APS];</div><div class='add'>+	struct iwl_tof_range_req_ap_entry_v4 ap[IWL_TOF_MAX_APS];</div><div class='ctx'> } __packed; /* LOCATION_RANGE_REQ_CMD_API_S_VER_8 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -964,7 +1261,7 @@ struct iwl_tof_range_req_cmd_v8 {</div><div class='ctx'>  * @initiator_flags: see flags @ iwl_tof_initiator_flags</div><div class='ctx'>  * @request_id: A Token incremented per request. The same Token will be</div><div class='ctx'>  *		sent back in the range response</div><div class='del'>- * @num_of_ap: Number of APs to measure (error if &gt; IWL_MVM_TOF_MAX_APS)</div><div class='add'>+ * @num_of_ap: Number of APs to measure (error if &gt; IWL_TOF_MAX_APS)</div><div class='ctx'>  * @range_req_bssid: ranging request BSSID</div><div class='ctx'>  * @macaddr_mask: Bits set to 0 shall be copied from the MAC address template.</div><div class='ctx'>  *		  Bits set to 1 shall be randomized by the UMAC</div><div class='hunk'>@@ -984,7 +1281,7 @@ struct iwl_tof_range_req_cmd_v9 {</div><div class='ctx'> 	u8 macaddr_template[ETH_ALEN];</div><div class='ctx'> 	__le32 req_timeout_ms;</div><div class='ctx'> 	__le32 tsf_mac_id;</div><div class='del'>-	struct iwl_tof_range_req_ap_entry_v6 ap[IWL_MVM_TOF_MAX_APS];</div><div class='add'>+	struct iwl_tof_range_req_ap_entry_v6 ap[IWL_TOF_MAX_APS];</div><div class='ctx'> } __packed; /* LOCATION_RANGE_REQ_CMD_API_S_VER_9 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -992,7 +1289,7 @@ struct iwl_tof_range_req_cmd_v9 {</div><div class='ctx'>  * @initiator_flags: see flags @ iwl_tof_initiator_flags</div><div class='ctx'>  * @request_id: A Token incremented per request. The same Token will be</div><div class='ctx'>  *		sent back in the range response</div><div class='del'>- * @num_of_ap: Number of APs to measure (error if &gt; IWL_MVM_TOF_MAX_APS)</div><div class='add'>+ * @num_of_ap: Number of APs to measure (error if &gt; IWL_TOF_MAX_APS)</div><div class='ctx'>  * @range_req_bssid: ranging request BSSID</div><div class='ctx'>  * @macaddr_mask: Bits set to 0 shall be copied from the MAC address template.</div><div class='ctx'>  *		  Bits set to 1 shall be randomized by the UMAC</div><div class='hunk'>@@ -1012,7 +1309,7 @@ struct iwl_tof_range_req_cmd_v11 {</div><div class='ctx'> 	u8 macaddr_template[ETH_ALEN];</div><div class='ctx'> 	__le32 req_timeout_ms;</div><div class='ctx'> 	__le32 tsf_mac_id;</div><div class='del'>-	struct iwl_tof_range_req_ap_entry_v7 ap[IWL_MVM_TOF_MAX_APS];</div><div class='add'>+	struct iwl_tof_range_req_ap_entry_v7 ap[IWL_TOF_MAX_APS];</div><div class='ctx'> } __packed; /* LOCATION_RANGE_REQ_CMD_API_S_VER_11 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1020,7 +1317,7 @@ struct iwl_tof_range_req_cmd_v11 {</div><div class='ctx'>  * @initiator_flags: see flags @ iwl_tof_initiator_flags</div><div class='ctx'>  * @request_id: A Token incremented per request. The same Token will be</div><div class='ctx'>  *		sent back in the range response</div><div class='del'>- * @num_of_ap: Number of APs to measure (error if &gt; IWL_MVM_TOF_MAX_APS)</div><div class='add'>+ * @num_of_ap: Number of APs to measure (error if &gt; IWL_TOF_MAX_APS)</div><div class='ctx'>  * @range_req_bssid: ranging request BSSID</div><div class='ctx'>  * @macaddr_mask: Bits set to 0 shall be copied from the MAC address template.</div><div class='ctx'>  *		  Bits set to 1 shall be randomized by the UMAC</div><div class='hunk'>@@ -1040,9 +1337,65 @@ struct iwl_tof_range_req_cmd_v12 {</div><div class='ctx'> 	u8 macaddr_template[ETH_ALEN];</div><div class='ctx'> 	__le32 req_timeout_ms;</div><div class='ctx'> 	__le32 tsf_mac_id;</div><div class='del'>-	struct iwl_tof_range_req_ap_entry_v8 ap[IWL_MVM_TOF_MAX_APS];</div><div class='add'>+	struct iwl_tof_range_req_ap_entry_v8 ap[IWL_TOF_MAX_APS];</div><div class='ctx'> } __packed; /* LOCATION_RANGE_REQ_CMD_API_S_VER_12 */</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct iwl_tof_range_req_cmd_v13 - start measurement cmd</div><div class='add'>+ * @initiator_flags: see flags @ iwl_tof_initiator_flags</div><div class='add'>+ * @request_id: A Token incremented per request. The same Token will be</div><div class='add'>+ *		sent back in the range response</div><div class='add'>+ * @num_of_ap: Number of APs to measure (error if &gt; IWL_TOF_MAX_APS)</div><div class='add'>+ * @range_req_bssid: ranging request BSSID</div><div class='add'>+ * @macaddr_mask: Bits set to 0 shall be copied from the MAC address template.</div><div class='add'>+ *		  Bits set to 1 shall be randomized by the UMAC</div><div class='add'>+ * @macaddr_template: MAC address template to use for non-randomized bits</div><div class='add'>+ * @req_timeout_ms: Requested timeout of the response in units of milliseconds.</div><div class='add'>+ *	This is the session time for completing the measurement.</div><div class='add'>+ * @tsf_mac_id: report the measurement start time for each ap in terms of the</div><div class='add'>+ *	TSF of this mac id. 0xff to disable TSF reporting.</div><div class='add'>+ * @ap: per-AP request data, see &amp;struct iwl_tof_range_req_ap_entry_v9.</div><div class='add'>+ */</div><div class='add'>+struct iwl_tof_range_req_cmd_v13 {</div><div class='add'>+	__le32 initiator_flags;</div><div class='add'>+	u8 request_id;</div><div class='add'>+	u8 num_of_ap;</div><div class='add'>+	u8 range_req_bssid[ETH_ALEN];</div><div class='add'>+	u8 macaddr_mask[ETH_ALEN];</div><div class='add'>+	u8 macaddr_template[ETH_ALEN];</div><div class='add'>+	__le32 req_timeout_ms;</div><div class='add'>+	__le32 tsf_mac_id;</div><div class='add'>+	struct iwl_tof_range_req_ap_entry_v9 ap[IWL_TOF_MAX_APS];</div><div class='add'>+} __packed; /* LOCATION_RANGE_REQ_CMD_API_S_VER_13 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_tof_range_req_cmd - start measurement cmd</div><div class='add'>+ * @initiator_flags: see flags @ iwl_tof_initiator_flags</div><div class='add'>+ * @request_id: A Token incremented per request. The same Token will be</div><div class='add'>+ *		sent back in the range response</div><div class='add'>+ * @num_of_ap: Number of APs to measure (error if &gt; IWL_TOF_MAX_APS)</div><div class='add'>+ * @range_req_bssid: ranging request BSSID</div><div class='add'>+ * @macaddr_mask: Bits set to 0 shall be copied from the MAC address template.</div><div class='add'>+ *		  Bits set to 1 shall be randomized by the UMAC</div><div class='add'>+ * @macaddr_template: MAC address template to use for non-randomized bits</div><div class='add'>+ * @req_timeout_ms: Requested timeout of the response in units of milliseconds.</div><div class='add'>+ *	This is the session time for completing the measurement.</div><div class='add'>+ * @tsf_mac_id: report the measurement start time for each ap in terms of the</div><div class='add'>+ *	TSF of this mac id. 0xff to disable TSF reporting.</div><div class='add'>+ * @ap: per-AP request data, see &amp;struct iwl_tof_range_req_ap_entry.</div><div class='add'>+ */</div><div class='add'>+struct iwl_tof_range_req_cmd {</div><div class='add'>+	__le32 initiator_flags;</div><div class='add'>+	u8 request_id;</div><div class='add'>+	u8 num_of_ap;</div><div class='add'>+	u8 range_req_bssid[ETH_ALEN];</div><div class='add'>+	u8 macaddr_mask[ETH_ALEN];</div><div class='add'>+	u8 macaddr_template[ETH_ALEN];</div><div class='add'>+	__le32 req_timeout_ms;</div><div class='add'>+	__le32 tsf_mac_id;</div><div class='add'>+	struct iwl_tof_range_req_ap_entry ap[IWL_TOF_MAX_APS];</div><div class='add'>+} __packed; /* LOCATION_RANGE_REQ_CMD_API_S_VER_15 */</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * enum iwl_tof_range_request_status - status of the sent request</div><div class='ctx'>  * @IWL_TOF_RANGE_REQUEST_STATUS_SUCCESSFUL - FW successfully received the</div><div class='hunk'>@@ -1056,7 +1409,7 @@ enum iwl_tof_range_request_status {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum iwl_tof_entry_status</div><div class='add'>+ * enum iwl_tof_entry_status - TOF entry status</div><div class='ctx'>  *</div><div class='ctx'>  * @IWL_TOF_ENTRY_SUCCESS: successful measurement.</div><div class='ctx'>  * @IWL_TOF_ENTRY_GENERAL_FAILURE: General failure.</div><div class='hunk'>@@ -1261,7 +1614,7 @@ struct iwl_tof_range_rsp_ap_entry_ntfy_v5 {</div><div class='ctx'> } __packed; /* LOCATION_RANGE_RSP_AP_ETRY_NTFY_API_S_VER_5 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_tof_range_rsp_ap_entry_ntfy_v6 - AP parameters (response)</div><div class='add'>+ * struct iwl_tof_range_rsp_ap_entry_ntfy_v7 - AP parameters (response)</div><div class='ctx'>  * @bssid: BSSID of the AP</div><div class='ctx'>  * @measure_status: current APs measurement status, one of</div><div class='ctx'>  *	&amp;enum iwl_tof_entry_status.</div><div class='hunk'>@@ -1297,7 +1650,7 @@ struct iwl_tof_range_rsp_ap_entry_ntfy_v5 {</div><div class='ctx'>  * @tx_pn: the last PN used for this responder Tx in case PMF is configured in</div><div class='ctx'>  *	LE byte order.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_tof_range_rsp_ap_entry_ntfy_v6 {</div><div class='add'>+struct iwl_tof_range_rsp_ap_entry_ntfy_v7 {</div><div class='ctx'> 	u8 bssid[ETH_ALEN];</div><div class='ctx'> 	u8 measure_status;</div><div class='ctx'> 	u8 measure_bw;</div><div class='hunk'>@@ -1321,7 +1674,68 @@ struct iwl_tof_range_rsp_ap_entry_ntfy_v6 {</div><div class='ctx'> 	u8 reserved[3];</div><div class='ctx'> 	u8 rx_pn[IEEE80211_CCMP_PN_LEN];</div><div class='ctx'> 	u8 tx_pn[IEEE80211_CCMP_PN_LEN];</div><div class='del'>-} __packed; /* LOCATION_RANGE_RSP_AP_ETRY_NTFY_API_S_VER_6 */</div><div class='add'>+} __packed; /* LOCATION_RANGE_RSP_AP_ETRY_NTFY_API_S_VER_6,</div><div class='add'>+	       LOCATION_RANGE_RSP_AP_ETRY_NTFY_API_S_VER_7 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_tof_range_rsp_ap_entry_ntfy - AP parameters (response)</div><div class='add'>+ * @bssid: BSSID of the AP</div><div class='add'>+ * @measure_status: current APs measurement status, one of</div><div class='add'>+ *	&amp;enum iwl_tof_entry_status.</div><div class='add'>+ * @measure_bw: Current AP Bandwidth: 0  20MHz, 1  40MHz, 2  80MHz</div><div class='add'>+ * @rtt: The Round Trip Time that took for the last measurement for</div><div class='add'>+ *	current AP [pSec]</div><div class='add'>+ * @rtt_variance: The Variance of the RTT values measured for current AP</div><div class='add'>+ * @rtt_spread: The Difference between the maximum and the minimum RTT</div><div class='add'>+ *	values measured for current AP in the current session [pSec]</div><div class='add'>+ * @rssi: RSSI as uploaded in the Channel Estimation notification</div><div class='add'>+ * @rssi_spread: The Difference between the maximum and the minimum RSSI values</div><div class='add'>+ *	measured for current AP in the current session</div><div class='add'>+ * @last_burst: 1 if no more FTM sessions are scheduled for this responder</div><div class='add'>+ * @refusal_period: refusal period in case of</div><div class='add'>+ *	@IWL_TOF_ENTRY_RESPONDER_CANNOT_COLABORATE [sec]</div><div class='add'>+ * @timestamp: The GP2 Clock [usec] where Channel Estimation notification was</div><div class='add'>+ *	uploaded by the LMAC</div><div class='add'>+ * @start_tsf: measurement start time in TSF of the mac specified in the range</div><div class='add'>+ *	request</div><div class='add'>+ * @reserved1: reserved, for backwards compatibility</div><div class='add'>+ * @t2t3_initiator: as calculated from the algo in the initiator</div><div class='add'>+ * @t1t4_responder: as calculated from the algo in the responder</div><div class='add'>+ * @common_calib: Calib val that was used in for this AP measurement</div><div class='add'>+ * @specific_calib: val that was used in for this AP measurement</div><div class='add'>+ * @papd_calib_output: The result of the tof papd calibration that was injected</div><div class='add'>+ *	into the algorithm.</div><div class='add'>+ * @rttConfidence: a value between 0 - 31 that represents the rtt accuracy.</div><div class='add'>+ * @reserved: for alignment</div><div class='add'>+ * @rx_pn: the last PN used for this responder Rx in case PMF is configured in</div><div class='add'>+ *	LE byte order.</div><div class='add'>+ * @tx_pn: the last PN used for this responder Tx in case PMF is configured in</div><div class='add'>+ *	LE byte order.</div><div class='add'>+ */</div><div class='add'>+struct iwl_tof_range_rsp_ap_entry_ntfy {</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	u8 measure_status;</div><div class='add'>+	u8 measure_bw;</div><div class='add'>+	__le32 rtt;</div><div class='add'>+	__le32 rtt_variance;</div><div class='add'>+	__le32 rtt_spread;</div><div class='add'>+	s8 rssi;</div><div class='add'>+	u8 rssi_spread;</div><div class='add'>+	u8 last_burst;</div><div class='add'>+	u8 refusal_period;</div><div class='add'>+	__le32 timestamp;</div><div class='add'>+	__le32 start_tsf;</div><div class='add'>+	__le32 reserved1[2];</div><div class='add'>+	__le32 t2t3_initiator;</div><div class='add'>+	__le32 t1t4_responder;</div><div class='add'>+	__le16 common_calib;</div><div class='add'>+	__le16 specific_calib;</div><div class='add'>+	__le32 papd_calib_output;</div><div class='add'>+	u8 rttConfidence;</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+	u8 rx_pn[IEEE80211_CCMP_PN_LEN];</div><div class='add'>+	u8 tx_pn[IEEE80211_CCMP_PN_LEN];</div><div class='add'>+} __packed; /* LOCATION_RANGE_RSP_AP_ETRY_NTFY_API_S_VER_8 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_tof_response_status - tof response status</div><div class='hunk'>@@ -1345,7 +1759,7 @@ enum iwl_tof_response_status {</div><div class='ctx'>  * @request_status: status of current measurement session, one of</div><div class='ctx'>  *	&amp;enum iwl_tof_response_status.</div><div class='ctx'>  * @last_in_batch: reprot policy (when not all responses are uploaded at once)</div><div class='del'>- * @num_of_aps: Number of APs to measure (error if &gt; IWL_MVM_TOF_MAX_APS)</div><div class='add'>+ * @num_of_aps: Number of APs to measure (error if &gt; IWL_TOF_MAX_APS)</div><div class='ctx'>  * @ap: per-AP data</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_tof_range_rsp_ntfy_v5 {</div><div class='hunk'>@@ -1353,7 +1767,7 @@ struct iwl_tof_range_rsp_ntfy_v5 {</div><div class='ctx'> 	u8 request_status;</div><div class='ctx'> 	u8 last_in_batch;</div><div class='ctx'> 	u8 num_of_aps;</div><div class='del'>-	struct iwl_tof_range_rsp_ap_entry_ntfy_v3 ap[IWL_MVM_TOF_MAX_APS];</div><div class='add'>+	struct iwl_tof_range_rsp_ap_entry_ntfy_v3 ap[IWL_TOF_MAX_APS];</div><div class='ctx'> } __packed; /* LOCATION_RANGE_RSP_NTFY_API_S_VER_5 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1369,7 +1783,7 @@ struct iwl_tof_range_rsp_ntfy_v6 {</div><div class='ctx'> 	u8 num_of_aps;</div><div class='ctx'> 	u8 last_report;</div><div class='ctx'> 	u8 reserved;</div><div class='del'>-	struct iwl_tof_range_rsp_ap_entry_ntfy_v4 ap[IWL_MVM_TOF_MAX_APS];</div><div class='add'>+	struct iwl_tof_range_rsp_ap_entry_ntfy_v4 ap[IWL_TOF_MAX_APS];</div><div class='ctx'> } __packed; /* LOCATION_RANGE_RSP_NTFY_API_S_VER_6 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1385,24 +1799,42 @@ struct iwl_tof_range_rsp_ntfy_v7 {</div><div class='ctx'> 	u8 num_of_aps;</div><div class='ctx'> 	u8 last_report;</div><div class='ctx'> 	u8 reserved;</div><div class='del'>-	struct iwl_tof_range_rsp_ap_entry_ntfy_v5 ap[IWL_MVM_TOF_MAX_APS];</div><div class='add'>+	struct iwl_tof_range_rsp_ap_entry_ntfy_v5 ap[IWL_TOF_MAX_APS];</div><div class='ctx'> } __packed; /* LOCATION_RANGE_RSP_NTFY_API_S_VER_7 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_tof_range_rsp_ntfy_v8 - ranging response notification</div><div class='add'>+ * struct iwl_tof_range_rsp_ntfy_v9 - ranging response notification</div><div class='add'>+ * @request_id: A Token ID of the corresponding Range request</div><div class='add'>+ * @num_of_aps: Number of APs results</div><div class='add'>+ * @last_report: 1 if no more FTM sessions are scheduled, 0 otherwise.</div><div class='add'>+ * @reserved: reserved</div><div class='add'>+ * @ap: per-AP data</div><div class='add'>+ */</div><div class='add'>+struct iwl_tof_range_rsp_ntfy_v9 {</div><div class='add'>+	u8 request_id;</div><div class='add'>+	u8 num_of_aps;</div><div class='add'>+	u8 last_report;</div><div class='add'>+	u8 reserved;</div><div class='add'>+	struct iwl_tof_range_rsp_ap_entry_ntfy_v7 ap[IWL_TOF_MAX_APS];</div><div class='add'>+} __packed; /* LOCATION_RANGE_RSP_NTFY_API_S_VER_8,</div><div class='add'>+	     * LOCATION_RANGE_RSP_NTFY_API_S_VER_9</div><div class='add'>+	     */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_tof_range_rsp_ntfy - ranging response notification</div><div class='ctx'>  * @request_id: A Token ID of the corresponding Range request</div><div class='ctx'>  * @num_of_aps: Number of APs results</div><div class='ctx'>  * @last_report: 1 if no more FTM sessions are scheduled, 0 otherwise.</div><div class='ctx'>  * @reserved: reserved</div><div class='ctx'>  * @ap: per-AP data</div><div class='ctx'>  */</div><div class='del'>-struct iwl_tof_range_rsp_ntfy_v8 {</div><div class='add'>+struct iwl_tof_range_rsp_ntfy {</div><div class='ctx'> 	u8 request_id;</div><div class='ctx'> 	u8 num_of_aps;</div><div class='ctx'> 	u8 last_report;</div><div class='ctx'> 	u8 reserved;</div><div class='del'>-	struct iwl_tof_range_rsp_ap_entry_ntfy_v6 ap[IWL_MVM_TOF_MAX_APS];</div><div class='del'>-} __packed; /* LOCATION_RANGE_RSP_NTFY_API_S_VER_8 */</div><div class='add'>+	struct iwl_tof_range_rsp_ap_entry_ntfy ap[IWL_TOF_MAX_APS];</div><div class='add'>+} __packed; /* LOCATION_RANGE_RSP_NTFY_API_S_VER_10 */</div><div class='ctx'> </div><div class='ctx'> #define IWL_MVM_TOF_MCSI_BUF_SIZE  (245)</div><div class='ctx'> /**</div><div class='hunk'>@@ -1424,7 +1856,7 @@ struct iwl_tof_mcsi_notif {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_tof_range_abort_cmd</div><div class='add'>+ * struct iwl_tof_range_abort_cmd - TOF range abort command</div><div class='ctx'>  * @request_id: corresponds to a range request</div><div class='ctx'>  * @reserved: reserved</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h b/drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h<br/>index 6610d1234f74..f76cea6e9ec8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h</a></div><div class='hunk'>@@ -1,12 +1,14 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2019 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2019, 2021-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_fw_api_mac_cfg_h__</div><div class='ctx'> #define __iwl_fw_api_mac_cfg_h__</div><div class='ctx'> </div><div class='add'>+#include "mac.h"</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_mac_conf_subcmd_ids - mac configuration command IDs</div><div class='ctx'>  */</div><div class='hunk'>@@ -27,9 +29,56 @@ enum iwl_mac_conf_subcmd_ids {</div><div class='ctx'> 	 * @SESSION_PROTECTION_CMD: &amp;struct iwl_mvm_session_prot_cmd</div><div class='ctx'> 	 */</div><div class='ctx'> 	SESSION_PROTECTION_CMD = 0x5,</div><div class='del'>-</div><div class='ctx'> 	/**</div><div class='del'>-	 * @SESSION_PROTECTION_NOTIF: &amp;struct iwl_mvm_session_prot_notif</div><div class='add'>+	 * @CANCEL_CHANNEL_SWITCH_CMD: &amp;struct iwl_cancel_channel_switch_cmd</div><div class='add'>+	 */</div><div class='add'>+	CANCEL_CHANNEL_SWITCH_CMD = 0x6,</div><div class='add'>+	/**</div><div class='add'>+	 * @MAC_CONFIG_CMD: &amp;struct iwl_mac_config_cmd</div><div class='add'>+	 */</div><div class='add'>+	MAC_CONFIG_CMD = 0x8,</div><div class='add'>+	/**</div><div class='add'>+	 * @LINK_CONFIG_CMD: &amp;struct iwl_link_config_cmd</div><div class='add'>+	 */</div><div class='add'>+	LINK_CONFIG_CMD = 0x9,</div><div class='add'>+	/**</div><div class='add'>+	 * @STA_CONFIG_CMD: &amp;struct iwl_sta_cfg_cmd</div><div class='add'>+	 */</div><div class='add'>+	STA_CONFIG_CMD = 0xA,</div><div class='add'>+	/**</div><div class='add'>+	 * @AUX_STA_CMD: &amp;struct iwl_aux_sta_cmd</div><div class='add'>+	 */</div><div class='add'>+	AUX_STA_CMD = 0xB,</div><div class='add'>+	/**</div><div class='add'>+	 * @STA_REMOVE_CMD: &amp;struct iwl_remove_sta_cmd</div><div class='add'>+	 */</div><div class='add'>+	STA_REMOVE_CMD = 0xC,</div><div class='add'>+	/**</div><div class='add'>+	 * @STA_DISABLE_TX_CMD: &amp;struct iwl_mvm_sta_disable_tx_cmd</div><div class='add'>+	 */</div><div class='add'>+	STA_DISABLE_TX_CMD = 0xD,</div><div class='add'>+	/**</div><div class='add'>+	 * @ROC_CMD: &amp;struct iwl_roc_req</div><div class='add'>+	 */</div><div class='add'>+	ROC_CMD = 0xE,</div><div class='add'>+	/**</div><div class='add'>+	 * @TWT_OPERATION_CMD: &amp;struct iwl_twt_operation_cmd</div><div class='add'>+	 */</div><div class='add'>+	TWT_OPERATION_CMD = 0x10,</div><div class='add'>+	/**</div><div class='add'>+	 * @MISSED_BEACONS_NOTIF: &amp;struct iwl_missed_beacons_notif</div><div class='add'>+	 */</div><div class='add'>+	MISSED_BEACONS_NOTIF = 0xF6,</div><div class='add'>+	/**</div><div class='add'>+	 * @EMLSR_TRANS_FAIL_NOTIF: &amp;struct iwl_esr_trans_fail_notif</div><div class='add'>+	 */</div><div class='add'>+	EMLSR_TRANS_FAIL_NOTIF = 0xF7,</div><div class='add'>+	/**</div><div class='add'>+	 * @ROC_NOTIF: &amp;struct iwl_roc_notif</div><div class='add'>+	 */</div><div class='add'>+	ROC_NOTIF = 0xF8,</div><div class='add'>+	/**</div><div class='add'>+	 * @SESSION_PROTECTION_NOTIF: &amp;struct iwl_session_prot_notif</div><div class='ctx'> 	 */</div><div class='ctx'> 	SESSION_PROTECTION_NOTIF = 0xFB,</div><div class='ctx'> </div><div class='hunk'>@@ -39,9 +88,14 @@ enum iwl_mac_conf_subcmd_ids {</div><div class='ctx'> 	PROBE_RESPONSE_DATA_NOTIF = 0xFC,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @CHANNEL_SWITCH_NOA_NOTIF: &amp;struct iwl_channel_switch_noa_notif</div><div class='add'>+	 * @CHANNEL_SWITCH_START_NOTIF: &amp;struct iwl_channel_switch_start_notif</div><div class='ctx'> 	 */</div><div class='del'>-	CHANNEL_SWITCH_NOA_NOTIF = 0xFF,</div><div class='add'>+	CHANNEL_SWITCH_START_NOTIF = 0xFF,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 *@CHANNEL_SWITCH_ERROR_NOTIF: &amp;struct iwl_channel_switch_error_notif</div><div class='add'>+	 */</div><div class='add'>+	CHANNEL_SWITCH_ERROR_NOTIF = 0xF9,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IWL_P2P_NOA_DESC_COUNT	(2)</div><div class='hunk'>@@ -102,19 +156,64 @@ struct iwl_missed_vap_notif {</div><div class='ctx'> } __packed; /* MISSED_VAP_NTFY_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_channel_switch_noa_notif - Channel switch NOA notification</div><div class='add'>+ * struct iwl_channel_switch_start_notif_v1 - Channel switch start notification</div><div class='ctx'>  *</div><div class='ctx'>  * @id_and_color: ID and color of the MAC</div><div class='ctx'>  */</div><div class='del'>-struct iwl_channel_switch_noa_notif {</div><div class='add'>+struct iwl_channel_switch_start_notif_v1 {</div><div class='ctx'> 	__le32 id_and_color;</div><div class='ctx'> } __packed; /* CHANNEL_SWITCH_START_NTFY_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct iwl_channel_switch_start_notif - Channel switch start notification</div><div class='add'>+ *</div><div class='add'>+ * @link_id: FW link id</div><div class='add'>+ */</div><div class='add'>+struct iwl_channel_switch_start_notif {</div><div class='add'>+	__le32 link_id;</div><div class='add'>+} __packed; /* CHANNEL_SWITCH_START_NTFY_API_S_VER_3 */</div><div class='add'>+</div><div class='add'>+#define CS_ERR_COUNT_ERROR BIT(0)</div><div class='add'>+#define CS_ERR_LONG_DELAY_AFTER_CS BIT(1)</div><div class='add'>+#define CS_ERR_LONG_TX_BLOCK BIT(2)</div><div class='add'>+#define CS_ERR_TX_BLOCK_TIMER_EXPIRED BIT(3)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_channel_switch_error_notif_v1 - Channel switch error notification</div><div class='add'>+ *</div><div class='add'>+ * @mac_id: the mac for which the ucode sends the notification for</div><div class='add'>+ * @csa_err_mask: mask of channel switch error that can occur</div><div class='add'>+ */</div><div class='add'>+struct iwl_channel_switch_error_notif_v1 {</div><div class='add'>+	__le32 mac_id;</div><div class='add'>+	__le32 csa_err_mask;</div><div class='add'>+} __packed; /* CHANNEL_SWITCH_ERROR_NTFY_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_channel_switch_error_notif - Channel switch error notification</div><div class='add'>+ *</div><div class='add'>+ * @link_id: FW link id</div><div class='add'>+ * @csa_err_mask: mask of channel switch error that can occur</div><div class='add'>+ */</div><div class='add'>+struct iwl_channel_switch_error_notif {</div><div class='add'>+	__le32 link_id;</div><div class='add'>+	__le32 csa_err_mask;</div><div class='add'>+} __packed; /* CHANNEL_SWITCH_ERROR_NTFY_API_S_VER_2 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_cancel_channel_switch_cmd - Cancel Channel Switch command</div><div class='add'>+ *</div><div class='add'>+ * @id: the id of the link or mac that should cancel the channel switch</div><div class='add'>+ */</div><div class='add'>+struct iwl_cancel_channel_switch_cmd {</div><div class='add'>+	__le32 id;</div><div class='add'>+} __packed; /* MAC_CANCEL_CHANNEL_SWITCH_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_chan_switch_te_cmd - Channel Switch Time Event command</div><div class='ctx'>  *</div><div class='ctx'>  * @mac_id: MAC ID for channel switch</div><div class='del'>- * @action: action to perform, one of FW_CTXT_ACTION_*</div><div class='add'>+ * @action: action to perform, see &amp;enum iwl_ctxt_action</div><div class='ctx'>  * @tsf: beacon tsf</div><div class='ctx'>  * @cs_count: channel switch count from CSA/eCSA IE</div><div class='ctx'>  * @cs_delayed_bcn_count: if set to N (!= 0) GO/AP can delay N beacon intervals</div><div class='hunk'>@@ -148,4 +247,747 @@ struct iwl_mac_low_latency_cmd {</div><div class='ctx'> 	__le16 reserved;</div><div class='ctx'> } __packed; /* MAC_LOW_LATENCY_API_S_VER_1 */</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mac_client_data - configuration data for client MAC context</div><div class='add'>+ *</div><div class='add'>+ * @is_assoc: 1 for associated state, 0 otherwise</div><div class='add'>+ * @esr_transition_timeout: the timeout required by the AP for the</div><div class='add'>+ *	eSR transition.</div><div class='add'>+ *	Available only from version 2 of the command.</div><div class='add'>+ *	This value comes from the EMLSR transition delay in the EML</div><div class='add'>+ *	Capabilities subfield.</div><div class='add'>+ * @medium_sync_delay: the value as it appears in P802.11be_D2.2 Figure 9-1002j.</div><div class='add'>+ * @assoc_id: unique ID assigned by the AP during association</div><div class='add'>+ * @reserved1: alignment</div><div class='add'>+ * @data_policy: see &amp;enum iwl_mac_data_policy</div><div class='add'>+ * @reserved2: alignment</div><div class='add'>+ * @ctwin: client traffic window in TU (period after TBTT when GO is present).</div><div class='add'>+ *	0 indicates that there is no CT window.</div><div class='add'>+ */</div><div class='add'>+struct iwl_mac_client_data {</div><div class='add'>+	u8 is_assoc;</div><div class='add'>+	u8 esr_transition_timeout;</div><div class='add'>+	__le16 medium_sync_delay;</div><div class='add'>+</div><div class='add'>+	__le16 assoc_id;</div><div class='add'>+	__le16 reserved1;</div><div class='add'>+	__le16 data_policy;</div><div class='add'>+	__le16 reserved2;</div><div class='add'>+	__le32 ctwin;</div><div class='add'>+} __packed; /* MAC_CONTEXT_CONFIG_CLIENT_DATA_API_S_VER_2 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mac_p2p_dev_data  - configuration data for P2P device MAC context</div><div class='add'>+ *</div><div class='add'>+ * @is_disc_extended: if set to true, P2P Device discoverability is enabled on</div><div class='add'>+ *	other channels as well. This should be to true only in case that the</div><div class='add'>+ *	device is discoverable and there is an active GO. Note that setting this</div><div class='add'>+ *	field when not needed, will increase the number of interrupts and have</div><div class='add'>+ *	effect on the platform power, as this setting opens the Rx filters on</div><div class='add'>+ *	all macs.</div><div class='add'>+ */</div><div class='add'>+struct iwl_mac_p2p_dev_data {</div><div class='add'>+	__le32 is_disc_extended;</div><div class='add'>+} __packed; /* MAC_CONTEXT_CONFIG_P2P_DEV_DATA_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_mac_config_filter_flags - MAC context configuration filter flags</div><div class='add'>+ *</div><div class='add'>+ * @MAC_CFG_FILTER_PROMISC: accept all data frames</div><div class='add'>+ * @MAC_CFG_FILTER_ACCEPT_CONTROL_AND_MGMT: pass all management and</div><div class='add'>+ *	control frames to the host</div><div class='add'>+ * @MAC_CFG_FILTER_ACCEPT_GRP: accept multicast frames</div><div class='add'>+ * @MAC_CFG_FILTER_ACCEPT_BEACON: accept beacon frames</div><div class='add'>+ * @MAC_CFG_FILTER_ACCEPT_BCAST_PROBE_RESP: accept broadcast probe response</div><div class='add'>+ * @MAC_CFG_FILTER_ACCEPT_PROBE_REQ: accept probe requests</div><div class='add'>+ */</div><div class='add'>+enum iwl_mac_config_filter_flags {</div><div class='add'>+	MAC_CFG_FILTER_PROMISC			= BIT(0),</div><div class='add'>+	MAC_CFG_FILTER_ACCEPT_CONTROL_AND_MGMT	= BIT(1),</div><div class='add'>+	MAC_CFG_FILTER_ACCEPT_GRP		= BIT(2),</div><div class='add'>+	MAC_CFG_FILTER_ACCEPT_BEACON		= BIT(3),</div><div class='add'>+	MAC_CFG_FILTER_ACCEPT_BCAST_PROBE_RESP	= BIT(4),</div><div class='add'>+	MAC_CFG_FILTER_ACCEPT_PROBE_REQ		= BIT(5),</div><div class='add'>+}; /* MAC_FILTER_FLAGS_MASK_E_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mac_wifi_gen_support_v2 - parameters of iwl_mac_config_cmd</div><div class='add'>+ *	with support up to eht as in version 2 of the command</div><div class='add'>+ *</div><div class='add'>+ * @he_support: does this MAC support HE</div><div class='add'>+ * @he_ap_support: HE AP enabled, "pseudo HE", no trigger frame handling</div><div class='add'>+ * @eht_support: does this MAC support EHT. Requires he_support</div><div class='add'>+ */</div><div class='add'>+struct iwl_mac_wifi_gen_support_v2 {</div><div class='add'>+	__le16 he_support;</div><div class='add'>+	__le16 he_ap_support;</div><div class='add'>+	__le32 eht_support;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mac_wifi_gen_support - parameters of iwl_mac_config_cmd</div><div class='add'>+ *	with support up to uhr as in version 3 of the command</div><div class='add'>+ * ( MAC_CONTEXT_CONFIG_CMD = 0x8 )</div><div class='add'>+ *</div><div class='add'>+ * @he_support: does this MAC support HE</div><div class='add'>+ * @he_ap_support: HE AP enabled, "pseudo HE", no trigger frame handling</div><div class='add'>+ * @eht_support: does this MAC support EHT. Requires he_support</div><div class='add'>+ * @uhr_support: does this MAC support UHR. Requires eht_support</div><div class='add'>+ * @reserved: reserved for alignment and to match version 2's size</div><div class='add'>+ */</div><div class='add'>+struct iwl_mac_wifi_gen_support {</div><div class='add'>+	u8 he_support;</div><div class='add'>+	u8 he_ap_support;</div><div class='add'>+	u8 eht_support;</div><div class='add'>+	u8 uhr_support;</div><div class='add'>+	__le32 reserved;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mac_config_cmd - command structure to configure MAC contexts in</div><div class='add'>+ *	MLD API for versions 2 and 3</div><div class='add'>+ * ( MAC_CONTEXT_CONFIG_CMD = 0x8 )</div><div class='add'>+ *</div><div class='add'>+ * @id_and_color: ID and color of the MAC</div><div class='add'>+ * @action: action to perform, see &amp;enum iwl_ctxt_action</div><div class='add'>+ * @mac_type: one of &amp;enum iwl_mac_types</div><div class='add'>+ * @local_mld_addr: mld address</div><div class='add'>+ * @reserved_for_local_mld_addr: reserved</div><div class='add'>+ * @filter_flags: combination of &amp;enum iwl_mac_config_filter_flags</div><div class='add'>+ * @wifi_gen_v2: he/eht parameters as in cmd version 2</div><div class='add'>+ * @wifi_gen: he/eht/uhr parameters as in cmd version 3</div><div class='add'>+ * @nic_not_ack_enabled: mark that the NIC doesn't support receiving</div><div class='add'>+ *	ACK-enabled AGG, (i.e. both BACK and non-BACK frames in single AGG).</div><div class='add'>+ *	If the NIC is not ACK_ENABLED it may use the EOF-bit in first non-0</div><div class='add'>+ *	len delim to determine if AGG or single.</div><div class='add'>+ * @client: client mac data</div><div class='add'>+ * @p2p_dev: mac data for p2p device</div><div class='add'>+ */</div><div class='add'>+struct iwl_mac_config_cmd {</div><div class='add'>+	__le32 id_and_color;</div><div class='add'>+	__le32 action;</div><div class='add'>+	/* MAC_CONTEXT_TYPE_API_E */</div><div class='add'>+	__le32 mac_type;</div><div class='add'>+	u8 local_mld_addr[6];</div><div class='add'>+	__le16 reserved_for_local_mld_addr;</div><div class='add'>+	__le32 filter_flags;</div><div class='add'>+	union {</div><div class='add'>+		struct iwl_mac_wifi_gen_support_v2 wifi_gen_v2;</div><div class='add'>+		struct iwl_mac_wifi_gen_support wifi_gen;</div><div class='add'>+	};</div><div class='add'>+	__le32 nic_not_ack_enabled;</div><div class='add'>+	/* MAC_CONTEXT_CONFIG_SPECIFIC_DATA_API_U_VER_2 */</div><div class='add'>+	union {</div><div class='add'>+		struct iwl_mac_client_data client;</div><div class='add'>+		struct iwl_mac_p2p_dev_data p2p_dev;</div><div class='add'>+	};</div><div class='add'>+} __packed; /* MAC_CONTEXT_CONFIG_CMD_API_S_VER_2_VER_3 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_link_ctx_modify_flags - indicate to the fw what fields are being</div><div class='add'>+ *	modified in &amp;iwl_link_ctx_cfg_cmd</div><div class='add'>+ *</div><div class='add'>+ * @LINK_CONTEXT_MODIFY_ACTIVE: covers iwl_link_ctx_cfg_cmd::active</div><div class='add'>+ * @LINK_CONTEXT_MODIFY_RATES_INFO: covers iwl_link_ctx_cfg_cmd::cck_rates,</div><div class='add'>+ *	iwl_link_ctx_cfg_cmd::ofdm_rates,</div><div class='add'>+ *	iwl_link_ctx_cfg_cmd::cck_short_preamble,</div><div class='add'>+ *	iwl_link_ctx_cfg_cmd::short_slot</div><div class='add'>+ * @LINK_CONTEXT_MODIFY_PROTECT_FLAGS: covers</div><div class='add'>+ *	iwl_link_ctx_cfg_cmd::protection_flags</div><div class='add'>+ * @LINK_CONTEXT_MODIFY_QOS_PARAMS: covers iwl_link_ctx_cfg_cmd::qos_flags,</div><div class='add'>+ *	iwl_link_ctx_cfg_cmd::ac,</div><div class='add'>+ * @LINK_CONTEXT_MODIFY_BEACON_TIMING: covers iwl_link_ctx_cfg_cmd::bi,</div><div class='add'>+ *	iwl_link_ctx_cfg_cmd::dtim_interval,</div><div class='add'>+ *	iwl_link_ctx_cfg_cmd::dtim_time,</div><div class='add'>+ *	iwl_link_ctx_cfg_cmd::dtim_tsf,</div><div class='add'>+ *	iwl_link_ctx_cfg_cmd::assoc_beacon_arrive_time.</div><div class='add'>+ *	This flag can be set only once after assoc.</div><div class='add'>+ * @LINK_CONTEXT_MODIFY_HE_PARAMS: covers</div><div class='add'>+ *	iwl_link_ctx_cfg_cmd::htc_trig_based_pkt_ext</div><div class='add'>+ *	iwl_link_ctx_cfg_cmd::rand_alloc_ecwmin,</div><div class='add'>+ *	iwl_link_ctx_cfg_cmd::rand_alloc_ecwmax,</div><div class='add'>+ *	iwl_link_ctx_cfg_cmd::trig_based_txf,</div><div class='add'>+ *	iwl_link_ctx_cfg_cmd::bss_color,</div><div class='add'>+ *	iwl_link_ctx_cfg_cmd::ndp_fdbk_buff_th_exp,</div><div class='add'>+ *	iwl_link_ctx_cfg_cmd::ref_bssid_addr</div><div class='add'>+ *	iwl_link_ctx_cfg_cmd::bssid_index,</div><div class='add'>+ *	iwl_link_ctx_cfg_cmd::frame_time_rts_th.</div><div class='add'>+ *	This flag can be set any time.</div><div class='add'>+ * @LINK_CONTEXT_MODIFY_BSS_COLOR_DISABLE: covers</div><div class='add'>+ *	iwl_link_ctx_cfg_cmd::bss_color_disable</div><div class='add'>+ * @LINK_CONTEXT_MODIFY_EHT_PARAMS: covers iwl_link_ctx_cfg_cmd::puncture_mask.</div><div class='add'>+ *	This flag can be set only if the MAC that this link relates to has</div><div class='add'>+ *	eht_support set to true. No longer used since _VER_3 of this command.</div><div class='add'>+ * @LINK_CONTEXT_MODIFY_BANDWIDTH: Covers iwl_link_ctx_cfg_cmd::modify_bandwidth.</div><div class='add'>+ *	Request RX OMI to the AP to modify bandwidth of this link.</div><div class='add'>+ * @LINK_CONTEXT_MODIFY_UHR_PARAMS: covers iwl_link_ctx_cfg_cmd::npca_params and</div><div class='add'>+ *	iwl_link_ctx_cfg_cmd::prio_edca_params. Since _VER_7.</div><div class='add'>+ * @LINK_CONTEXT_MODIFY_ALL: set all above flags</div><div class='add'>+ */</div><div class='add'>+enum iwl_link_ctx_modify_flags {</div><div class='add'>+	LINK_CONTEXT_MODIFY_ACTIVE		= BIT(0),</div><div class='add'>+	LINK_CONTEXT_MODIFY_RATES_INFO		= BIT(1),</div><div class='add'>+	LINK_CONTEXT_MODIFY_PROTECT_FLAGS	= BIT(2),</div><div class='add'>+	LINK_CONTEXT_MODIFY_QOS_PARAMS		= BIT(3),</div><div class='add'>+	LINK_CONTEXT_MODIFY_BEACON_TIMING	= BIT(4),</div><div class='add'>+	LINK_CONTEXT_MODIFY_HE_PARAMS		= BIT(5),</div><div class='add'>+	LINK_CONTEXT_MODIFY_BSS_COLOR_DISABLE	= BIT(6),</div><div class='add'>+	LINK_CONTEXT_MODIFY_EHT_PARAMS		= BIT(7),</div><div class='add'>+	LINK_CONTEXT_MODIFY_BANDWIDTH		= BIT(8),</div><div class='add'>+	LINK_CONTEXT_MODIFY_UHR_PARAMS		= BIT(9),</div><div class='add'>+	LINK_CONTEXT_MODIFY_ALL			= 0xff,</div><div class='add'>+}; /* LINK_CONTEXT_MODIFY_MASK_E_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_link_ctx_protection_flags - link protection flags</div><div class='add'>+ * @LINK_PROT_FLG_TGG_PROTECT: 11g protection when transmitting OFDM frames,</div><div class='add'>+ *	this will require CCK RTS/CTS2self.</div><div class='add'>+ *	RTS/CTS will protect full burst time.</div><div class='add'>+ * @LINK_PROT_FLG_HT_PROT: enable HT protection</div><div class='add'>+ * @LINK_PROT_FLG_FAT_PROT: protect 40 MHz transmissions</div><div class='add'>+ * @LINK_PROT_FLG_SELF_CTS_EN: allow CTS2self</div><div class='add'>+ */</div><div class='add'>+enum iwl_link_ctx_protection_flags {</div><div class='add'>+	LINK_PROT_FLG_TGG_PROTECT	= BIT(0),</div><div class='add'>+	LINK_PROT_FLG_HT_PROT		= BIT(1),</div><div class='add'>+	LINK_PROT_FLG_FAT_PROT		= BIT(2),</div><div class='add'>+	LINK_PROT_FLG_SELF_CTS_EN	= BIT(3),</div><div class='add'>+}; /* LINK_PROTECT_FLAGS_E_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_link_ctx_flags - link context flags</div><div class='add'>+ *</div><div class='add'>+ * @LINK_FLG_BSS_COLOR_DIS: BSS color disable, don't use the BSS</div><div class='add'>+ *	color for RX filter but use MAC header</div><div class='add'>+ *	enabled AGG, i.e. both BACK and non-BACK frames in a single AGG</div><div class='add'>+ * @LINK_FLG_MU_EDCA_CW: indicates that there is an element of MU EDCA</div><div class='add'>+ *	parameter set, i.e. the backoff counters for trig-based ACs</div><div class='add'>+ * @LINK_FLG_RU_2MHZ_BLOCK: indicates that 26-tone RU OFDMA transmission are</div><div class='add'>+ *      not allowed (as there are OBSS that might classify such transmissions as</div><div class='add'>+ *      radar pulses).</div><div class='add'>+ * @LINK_FLG_NDP_FEEDBACK_ENABLED: mark support for NDP feedback and change</div><div class='add'>+ *	of threshold</div><div class='add'>+ */</div><div class='add'>+enum iwl_link_ctx_flags {</div><div class='add'>+	LINK_FLG_BSS_COLOR_DIS		= BIT(0),</div><div class='add'>+	LINK_FLG_MU_EDCA_CW		= BIT(1),</div><div class='add'>+	LINK_FLG_RU_2MHZ_BLOCK		= BIT(2),</div><div class='add'>+	LINK_FLG_NDP_FEEDBACK_ENABLED	= BIT(3),</div><div class='add'>+}; /* LINK_CONTEXT_FLAG_E_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_link_modify_bandwidth - link modify (RX OMI) bandwidth</div><div class='add'>+ * @IWL_LINK_MODIFY_BW_20: request 20 MHz</div><div class='add'>+ * @IWL_LINK_MODIFY_BW_40: request 40 MHz</div><div class='add'>+ * @IWL_LINK_MODIFY_BW_80: request 80 MHz</div><div class='add'>+ * @IWL_LINK_MODIFY_BW_160: request 160 MHz</div><div class='add'>+ * @IWL_LINK_MODIFY_BW_320: request 320 MHz</div><div class='add'>+ */</div><div class='add'>+enum iwl_link_modify_bandwidth {</div><div class='add'>+	IWL_LINK_MODIFY_BW_20,</div><div class='add'>+	IWL_LINK_MODIFY_BW_40,</div><div class='add'>+	IWL_LINK_MODIFY_BW_80,</div><div class='add'>+	IWL_LINK_MODIFY_BW_160,</div><div class='add'>+	IWL_LINK_MODIFY_BW_320,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_npca_params - NPCA parameters (non-primary channel access)</div><div class='add'>+ *</div><div class='add'>+ * @switch_delay: after switch, delay TX according to destination AP</div><div class='add'>+ * @switch_back_delay: switch back to control channel before OBSS frame end</div><div class='add'>+ * @min_dur_threshold: minimum PPDU time to switch to the non-primary</div><div class='add'>+ *	NPCA channel</div><div class='add'>+ * @flags: NPCA flags - bit 0: puncturing allowed, bit 1: new TX allowed</div><div class='add'>+ * @reserved: reserved for alignment purposes</div><div class='add'>+ */</div><div class='add'>+struct iwl_npca_params {</div><div class='add'>+	u8 switch_delay;</div><div class='add'>+	u8 switch_back_delay;</div><div class='add'>+	__le16 min_dur_threshold;</div><div class='add'>+	__le16 flags;</div><div class='add'>+	__le16 reserved;</div><div class='add'>+} __packed; /* NPCA_PARAM_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_link_config_cmd - command structure to configure the LINK context</div><div class='add'>+ *	in MLD API</div><div class='add'>+ * ( LINK_CONFIG_CMD =0x9 )</div><div class='add'>+ *</div><div class='add'>+ * @action: action to perform, see &amp;enum iwl_ctxt_action</div><div class='add'>+ * @link_id: the id of the link that this cmd configures</div><div class='add'>+ * @mac_id: interface ID. Relevant only if action is FW_CTXT_ACTION_ADD</div><div class='add'>+ * @phy_id: PHY index. Can be changed only if the link was inactive</div><div class='add'>+ *	(and stays inactive). If the link is active (or becomes active),</div><div class='add'>+ *	this field is ignored.</div><div class='add'>+ * @local_link_addr: the links MAC address. Can be changed only if the link was</div><div class='add'>+ *	inactive (and stays inactive). If the link is active</div><div class='add'>+ *	(or becomes active), this field is ignored.</div><div class='add'>+ * @reserved_for_local_link_addr: reserved</div><div class='add'>+ * @modify_mask: from &amp;enum iwl_link_ctx_modify_flags, selects what to change.</div><div class='add'>+ *	Relevant only if action is FW_CTXT_ACTION_MODIFY</div><div class='add'>+ * @active: indicates whether the link is active or not</div><div class='add'>+ * @listen_lmac: indicates whether the link should be allocated on the Listen</div><div class='add'>+ *	Lmac or on the Main Lmac. Cannot be changed on an active Link.</div><div class='add'>+ *	Relevant only for eSR.</div><div class='add'>+ * @block_tx: tell the firmware that this link can't Tx. This should be used</div><div class='add'>+ *	only when a link is de-activated because of CSA with mode = 1.</div><div class='add'>+ *	Available since version 5.</div><div class='add'>+ * @modify_bandwidth: bandwidth request value for RX OMI (see also</div><div class='add'>+ *	%LINK_CONTEXT_MODIFY_BANDWIDTH), from &amp;enum iwl_link_modify_bandwidth.</div><div class='add'>+ * @reserved1: in version 2, listen_lmac became reserved</div><div class='add'>+ * @cck_rates: basic rates available for CCK</div><div class='add'>+ * @ofdm_rates: basic rates available for OFDM</div><div class='add'>+ * @cck_short_preamble: 1 for enabling short preamble, 0 otherwise</div><div class='add'>+ * @short_slot: 1 for enabling short slots, 0 otherwise</div><div class='add'>+ * @protection_flags: combination of &amp;enum iwl_link_ctx_protection_flags</div><div class='add'>+ * @qos_flags: from &amp;enum iwl_mac_qos_flags</div><div class='add'>+ * @ac: one iwl_mac_qos configuration for each AC</div><div class='add'>+ * @htc_trig_based_pkt_ext: default PE in 4us units</div><div class='add'>+ * @rand_alloc_ecwmin: random CWmin = 2**ECWmin-1</div><div class='add'>+ * @rand_alloc_ecwmax: random CWmax = 2**ECWmax-1</div><div class='add'>+ * @ndp_fdbk_buff_th_exp: set exponent for the NDP feedback buffered threshold</div><div class='add'>+ * @trig_based_txf: MU EDCA Parameter set for the trigger based traffic queues</div><div class='add'>+ * @bi: beacon interval in TU, applicable only when associated</div><div class='add'>+ * @dtim_interval: DTIM interval in TU.</div><div class='add'>+ *	Relevant only for GO, otherwise this is offloaded.</div><div class='add'>+ * @puncture_mask: puncture mask for EHT (removed in VER_3)</div><div class='add'>+ * @frame_time_rts_th: HE duration RTS threshold, in units of 32us</div><div class='add'>+ * @flags: a combination from &amp;enum iwl_link_ctx_flags</div><div class='add'>+ * @flags_mask: what of %flags have changed. Also &amp;enum iwl_link_ctx_flags</div><div class='add'>+ * Below fields are for multi-bssid:</div><div class='add'>+ * @ref_bssid_addr: reference BSSID used by the AP</div><div class='add'>+ * @reserved_for_ref_bssid_addr: reserved</div><div class='add'>+ * @bssid_index: index of the associated VAP</div><div class='add'>+ * @bss_color: 11ax AP ID that is used in the HE SIG-A to mark inter BSS frame</div><div class='add'>+ * @spec_link_id: link_id as the AP knows it</div><div class='add'>+ * @ul_mu_data_disable: OM Control UL MU Data Disable RX Support (bit 44) in</div><div class='add'>+ *	HE MAC Capabilities information field as defined in figure 9-897 in</div><div class='add'>+ *	IEEE802.11REVme-D5.0</div><div class='add'>+ * @ibss_bssid_addr: bssid for ibss</div><div class='add'>+ * @reserved_for_ibss_bssid_addr: reserved</div><div class='add'>+ * @npca_params: NPCA parameters</div><div class='add'>+ * @prio_edca_params: priority EDCA parameters for enhanced QoS</div><div class='add'>+ * @reserved3: reserved for future use</div><div class='add'>+ */</div><div class='add'>+struct iwl_link_config_cmd {</div><div class='add'>+	__le32 action;</div><div class='add'>+	__le32 link_id;</div><div class='add'>+	__le32 mac_id;</div><div class='add'>+	__le32 phy_id;</div><div class='add'>+	u8 local_link_addr[6];</div><div class='add'>+	__le16 reserved_for_local_link_addr;</div><div class='add'>+	__le32 modify_mask;</div><div class='add'>+	__le32 active;</div><div class='add'>+	union {</div><div class='add'>+		__le32 listen_lmac; /* only _VER_1 */</div><div class='add'>+		struct {</div><div class='add'>+			u8 block_tx; /* since _VER_5 */</div><div class='add'>+			u8 modify_bandwidth; /* since _VER_6 */</div><div class='add'>+			u8 reserved1[2];</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+	__le32 cck_rates;</div><div class='add'>+	__le32 ofdm_rates;</div><div class='add'>+	__le32 cck_short_preamble;</div><div class='add'>+	__le32 short_slot;</div><div class='add'>+	__le32 protection_flags;</div><div class='add'>+	/* MAC_QOS_PARAM_API_S_VER_1 */</div><div class='add'>+	__le32 qos_flags;</div><div class='add'>+	struct iwl_ac_qos ac[AC_NUM + 1];</div><div class='add'>+	u8 htc_trig_based_pkt_ext;</div><div class='add'>+	u8 rand_alloc_ecwmin;</div><div class='add'>+	u8 rand_alloc_ecwmax;</div><div class='add'>+	u8 ndp_fdbk_buff_th_exp;</div><div class='add'>+	struct iwl_he_backoff_conf trig_based_txf[AC_NUM];</div><div class='add'>+	__le32 bi;</div><div class='add'>+	__le32 dtim_interval;</div><div class='add'>+	__le16 puncture_mask; /* removed in _VER_3 */</div><div class='add'>+	__le16 frame_time_rts_th;</div><div class='add'>+	__le32 flags;</div><div class='add'>+	__le32 flags_mask; /* removed in _VER_6 */</div><div class='add'>+	/* The below fields are for multi-bssid */</div><div class='add'>+	u8 ref_bssid_addr[6];</div><div class='add'>+	__le16 reserved_for_ref_bssid_addr;</div><div class='add'>+	u8 bssid_index;</div><div class='add'>+	u8 bss_color;</div><div class='add'>+	u8 spec_link_id;</div><div class='add'>+	u8 ul_mu_data_disable;</div><div class='add'>+	u8 ibss_bssid_addr[6];</div><div class='add'>+	__le16 reserved_for_ibss_bssid_addr;</div><div class='add'>+	struct iwl_npca_params npca_params; /* since _VER_7 */</div><div class='add'>+	struct iwl_ac_qos prio_edca_params; /* since _VER_7 */</div><div class='add'>+	__le32 reserved3[4];</div><div class='add'>+} __packed; /* LINK_CONTEXT_CONFIG_CMD_API_S_VER_1, _VER_2, _VER_3, _VER_4, _VER_5, _VER_6, _VER_7 */</div><div class='add'>+</div><div class='add'>+/* Currently FW supports link ids in the range 0-3 and can have</div><div class='add'>+ * at most two active links for each vif.</div><div class='add'>+ */</div><div class='add'>+#define IWL_FW_MAX_ACTIVE_LINKS_NUM 2</div><div class='add'>+#define IWL_FW_MAX_LINK_ID 3</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_fw_sta_type - FW station types</div><div class='add'>+ * @STATION_TYPE_PEER: represents a peer - AP in BSS, a TDLS sta, a client in</div><div class='add'>+ *	P2P.</div><div class='add'>+ * @STATION_TYPE_BCAST_MGMT: The station used to send beacons and</div><div class='add'>+ *	probe responses. Also used for traffic injection in sniffer mode</div><div class='add'>+ * @STATION_TYPE_MCAST: the station used for BCAST / MCAST in GO. Will be</div><div class='add'>+ *	suspended / resumed at the right timing depending on the clients'</div><div class='add'>+ *	power save state and the DTIM timing</div><div class='add'>+ * @STATION_TYPE_AUX: aux sta. In the FW there is no need for a special type</div><div class='add'>+ *	for the aux sta, so this type is only for driver - internal use.</div><div class='add'>+ */</div><div class='add'>+enum iwl_fw_sta_type {</div><div class='add'>+	STATION_TYPE_PEER,</div><div class='add'>+	STATION_TYPE_BCAST_MGMT,</div><div class='add'>+	STATION_TYPE_MCAST,</div><div class='add'>+	STATION_TYPE_AUX,</div><div class='add'>+}; /* STATION_TYPE_E_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sta_cfg_cmd_v1 - cmd structure to add a peer sta to the uCode's</div><div class='add'>+ *	station table</div><div class='add'>+ * ( STA_CONFIG_CMD = 0xA )</div><div class='add'>+ *</div><div class='add'>+ * @sta_id: index of station in uCode's station table</div><div class='add'>+ * @link_id: the id of the link that is used to communicate with this sta</div><div class='add'>+ * @peer_mld_address: the peers mld address</div><div class='add'>+ * @reserved_for_peer_mld_address: reserved</div><div class='add'>+ * @peer_link_address: the address of the link that is used to communicate</div><div class='add'>+ *	with this sta</div><div class='add'>+ * @reserved_for_peer_link_address: reserved</div><div class='add'>+ * @station_type: type of this station. See &amp;enum iwl_fw_sta_type</div><div class='add'>+ * @assoc_id: for GO only</div><div class='add'>+ * @beamform_flags: beam forming controls</div><div class='add'>+ * @mfp: indicates whether the STA uses management frame protection or not.</div><div class='add'>+ * @mimo: indicates whether the sta uses mimo or not</div><div class='add'>+ * @mimo_protection: indicates whether the sta uses mimo protection or not</div><div class='add'>+ * @ack_enabled: indicates that the AP supports receiving ACK-</div><div class='add'>+ *	enabled AGG, i.e. both BACK and non-BACK frames in a single AGG</div><div class='add'>+ * @trig_rnd_alloc: indicates that trigger based random allocation</div><div class='add'>+ *	is enabled according to UORA element existence</div><div class='add'>+ * @tx_ampdu_spacing: minimum A-MPDU spacing:</div><div class='add'>+ *	4 - 2us density, 5 - 4us density, 6 - 8us density, 7 - 16us density</div><div class='add'>+ * @tx_ampdu_max_size: maximum A-MPDU length: 0 - 8K, 1 - 16K, 2 - 32K,</div><div class='add'>+ *	3 - 64K, 4 - 128K, 5 - 256K, 6 - 512K, 7 - 1024K.</div><div class='add'>+ * @sp_length: the size of the SP in actual number of frames</div><div class='add'>+ * @uapsd_acs:  4 LS bits are trigger enabled ACs, 4 MS bits are the deliver</div><div class='add'>+ *	enabled ACs.</div><div class='add'>+ * @pkt_ext: optional, exists according to PPE-present bit in the HE/EHT-PHY</div><div class='add'>+ *	capa</div><div class='add'>+ * @htc_flags: which features are supported in HTC</div><div class='add'>+ */</div><div class='add'>+struct iwl_sta_cfg_cmd_v1 {</div><div class='add'>+	__le32 sta_id;</div><div class='add'>+	__le32 link_id;</div><div class='add'>+	u8 peer_mld_address[ETH_ALEN];</div><div class='add'>+	__le16 reserved_for_peer_mld_address;</div><div class='add'>+	u8 peer_link_address[ETH_ALEN];</div><div class='add'>+	__le16 reserved_for_peer_link_address;</div><div class='add'>+	__le32 station_type;</div><div class='add'>+	__le32 assoc_id;</div><div class='add'>+	__le32 beamform_flags;</div><div class='add'>+	__le32 mfp;</div><div class='add'>+	__le32 mimo;</div><div class='add'>+	__le32 mimo_protection;</div><div class='add'>+	__le32 ack_enabled;</div><div class='add'>+	__le32 trig_rnd_alloc;</div><div class='add'>+	__le32 tx_ampdu_spacing;</div><div class='add'>+	__le32 tx_ampdu_max_size;</div><div class='add'>+	__le32 sp_length;</div><div class='add'>+	__le32 uapsd_acs;</div><div class='add'>+	struct iwl_he_pkt_ext_v2 pkt_ext;</div><div class='add'>+	__le32 htc_flags;</div><div class='add'>+} __packed; /* STA_CMD_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sta_cfg_cmd - cmd structure to add a peer sta to the uCode's</div><div class='add'>+ *	station table</div><div class='add'>+ * ( STA_CONFIG_CMD = 0xA )</div><div class='add'>+ *</div><div class='add'>+ * @sta_id: index of station in uCode's station table</div><div class='add'>+ * @link_id: the id of the link that is used to communicate with this sta</div><div class='add'>+ * @peer_mld_address: the peers mld address</div><div class='add'>+ * @reserved_for_peer_mld_address: reserved</div><div class='add'>+ * @peer_link_address: the address of the link that is used to communicate</div><div class='add'>+ *	with this sta</div><div class='add'>+ * @reserved_for_peer_link_address: reserved</div><div class='add'>+ * @station_type: type of this station. See &amp;enum iwl_fw_sta_type</div><div class='add'>+ * @assoc_id: for GO only</div><div class='add'>+ * @beamform_flags: beam forming controls</div><div class='add'>+ * @mfp: indicates whether the STA uses management frame protection or not.</div><div class='add'>+ * @mimo: indicates whether the sta uses mimo or not</div><div class='add'>+ * @mimo_protection: indicates whether the sta uses mimo protection or not</div><div class='add'>+ * @ack_enabled: indicates that the AP supports receiving ACK-</div><div class='add'>+ *	enabled AGG, i.e. both BACK and non-BACK frames in a single AGG</div><div class='add'>+ * @trig_rnd_alloc: indicates that trigger based random allocation</div><div class='add'>+ *	is enabled according to UORA element existence</div><div class='add'>+ * @tx_ampdu_spacing: minimum A-MPDU spacing:</div><div class='add'>+ *	4 - 2us density, 5 - 4us density, 6 - 8us density, 7 - 16us density</div><div class='add'>+ * @tx_ampdu_max_size: maximum A-MPDU length: 0 - 8K, 1 - 16K, 2 - 32K,</div><div class='add'>+ *	3 - 64K, 4 - 128K, 5 - 256K, 6 - 512K, 7 - 1024K.</div><div class='add'>+ * @sp_length: the size of the SP in actual number of frames</div><div class='add'>+ * @uapsd_acs:  4 LS bits are trigger enabled ACs, 4 MS bits are the deliver</div><div class='add'>+ *	enabled ACs.</div><div class='add'>+ * @pkt_ext: optional, exists according to PPE-present bit in the HE/EHT-PHY</div><div class='add'>+ *	capa</div><div class='add'>+ * @htc_flags: which features are supported in HTC</div><div class='add'>+ * @use_ldpc_x2_cw: Indicates whether to use LDPC with double CW</div><div class='add'>+ * @use_icf: Indicates whether to use ICF instead of RTS</div><div class='add'>+ * @dps_pad_time: DPS (Dynamic Power Save) padding delay resolution to ensure</div><div class='add'>+ *	proper timing alignment</div><div class='add'>+ * @dps_trans_delay: DPS minimal time that takes the peer to return to low power</div><div class='add'>+ * @mic_prep_pad_delay: MIC prep time padding</div><div class='add'>+ * @mic_compute_pad_delay: MIC compute time padding</div><div class='add'>+ * @reserved: Reserved for alignment</div><div class='add'>+ */</div><div class='add'>+struct iwl_sta_cfg_cmd {</div><div class='add'>+	__le32 sta_id;</div><div class='add'>+	__le32 link_id;</div><div class='add'>+	u8 peer_mld_address[ETH_ALEN];</div><div class='add'>+	__le16 reserved_for_peer_mld_address;</div><div class='add'>+	u8 peer_link_address[ETH_ALEN];</div><div class='add'>+	__le16 reserved_for_peer_link_address;</div><div class='add'>+	__le32 station_type;</div><div class='add'>+	__le32 assoc_id;</div><div class='add'>+	__le32 beamform_flags;</div><div class='add'>+	__le32 mfp;</div><div class='add'>+	__le32 mimo;</div><div class='add'>+	__le32 mimo_protection;</div><div class='add'>+	__le32 ack_enabled;</div><div class='add'>+	__le32 trig_rnd_alloc;</div><div class='add'>+	__le32 tx_ampdu_spacing;</div><div class='add'>+	__le32 tx_ampdu_max_size;</div><div class='add'>+	__le32 sp_length;</div><div class='add'>+	__le32 uapsd_acs;</div><div class='add'>+	struct iwl_he_pkt_ext_v2 pkt_ext;</div><div class='add'>+	__le32 htc_flags;</div><div class='add'>+	u8 use_ldpc_x2_cw;</div><div class='add'>+	u8 use_icf;</div><div class='add'>+	u8 dps_pad_time;</div><div class='add'>+	u8 dps_trans_delay;</div><div class='add'>+	u8 mic_prep_pad_delay;</div><div class='add'>+	u8 mic_compute_pad_delay;</div><div class='add'>+	u8 reserved[2];</div><div class='add'>+} __packed; /* STA_CMD_API_S_VER_2 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_aux_sta_cmd - command for AUX STA configuration</div><div class='add'>+ * ( AUX_STA_CMD = 0xB )</div><div class='add'>+ *</div><div class='add'>+ * @sta_id: index of aux sta to configure</div><div class='add'>+ * @lmac_id: ?</div><div class='add'>+ * @mac_addr: mac addr of the auxilary sta</div><div class='add'>+ * @reserved_for_mac_addr: reserved</div><div class='add'>+ */</div><div class='add'>+struct iwl_aux_sta_cmd {</div><div class='add'>+	__le32 sta_id;</div><div class='add'>+	__le32 lmac_id;</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='add'>+	__le16 reserved_for_mac_addr;</div><div class='add'>+</div><div class='add'>+} __packed; /* AUX_STA_CMD_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_remove_sta_cmd - a cmd structure to remove a sta added by</div><div class='add'>+ *	STA_CONFIG_CMD or AUX_STA_CONFIG_CMD</div><div class='add'>+ * ( STA_REMOVE_CMD = 0xC )</div><div class='add'>+ *</div><div class='add'>+ * @sta_id: index of station to remove</div><div class='add'>+ */</div><div class='add'>+struct iwl_remove_sta_cmd {</div><div class='add'>+	__le32 sta_id;</div><div class='add'>+} __packed; /* REMOVE_STA_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mvm_sta_disable_tx_cmd - disable / re-enable tx to a sta</div><div class='add'>+ * ( STA_DISABLE_TX_CMD = 0xD )</div><div class='add'>+ *</div><div class='add'>+ * @sta_id: index of the station to disable tx to</div><div class='add'>+ * @disable: indicates if to disable or re-enable tx</div><div class='add'>+ */</div><div class='add'>+struct iwl_mvm_sta_disable_tx_cmd {</div><div class='add'>+	__le32 sta_id;</div><div class='add'>+	__le32 disable;</div><div class='add'>+} __packed; /* STA_DISABLE_TX_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_mvm_fw_esr_recommendation - FW recommendation code</div><div class='add'>+ * @ESR_RECOMMEND_LEAVE: recommendation to leave EMLSR</div><div class='add'>+ * @ESR_FORCE_LEAVE: force exiting EMLSR</div><div class='add'>+ * @ESR_RECOMMEND_ENTER: recommendation to enter EMLSR</div><div class='add'>+ */</div><div class='add'>+enum iwl_mvm_fw_esr_recommendation {</div><div class='add'>+	ESR_RECOMMEND_LEAVE,</div><div class='add'>+	ESR_FORCE_LEAVE,</div><div class='add'>+	ESR_RECOMMEND_ENTER,</div><div class='add'>+}; /* ESR_MODE_RECOMMENDATION_CODE_API_E_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_esr_mode_notif_v1 - FW recommendation/force for EMLSR mode</div><div class='add'>+ *</div><div class='add'>+ * @action: the action to apply on EMLSR state.</div><div class='add'>+ *	See &amp;iwl_mvm_fw_esr_recommendation</div><div class='add'>+ */</div><div class='add'>+struct iwl_esr_mode_notif_v1 {</div><div class='add'>+	__le32 action;</div><div class='add'>+} __packed; /* ESR_MODE_RECOMMENDATION_NTFY_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_esr_leave_reason - reasons for leaving EMLSR mode</div><div class='add'>+ *</div><div class='add'>+ * @ESR_LEAVE_REASON_OMI_MU_UL_DISALLOWED: OMI MU UL disallowed</div><div class='add'>+ * @ESR_LEAVE_REASON_NO_TRIG_FOR_ESR_STA: No trigger for EMLSR station</div><div class='add'>+ * @ESR_LEAVE_REASON_NO_ESR_STA_IN_MU_DL: No EMLSR station in MU DL</div><div class='add'>+ * @ESR_LEAVE_REASON_BAD_ACTIV_FRAME_TH: Bad activation frame threshold</div><div class='add'>+ * @ESR_LEAVE_REASON_RTS_IN_DUAL_LISTEN: RTS in dual listen</div><div class='add'>+ */</div><div class='add'>+enum iwl_esr_leave_reason {</div><div class='add'>+	ESR_LEAVE_REASON_OMI_MU_UL_DISALLOWED	= BIT(0),</div><div class='add'>+	ESR_LEAVE_REASON_NO_TRIG_FOR_ESR_STA	= BIT(1),</div><div class='add'>+	ESR_LEAVE_REASON_NO_ESR_STA_IN_MU_DL	= BIT(2),</div><div class='add'>+	ESR_LEAVE_REASON_BAD_ACTIV_FRAME_TH	= BIT(3),</div><div class='add'>+	ESR_LEAVE_REASON_RTS_IN_DUAL_LISTEN	= BIT(4),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_esr_mode_notif - FW recommendation/force for EMLSR mode</div><div class='add'>+ *</div><div class='add'>+ * @action: the action to apply on EMLSR state.</div><div class='add'>+ *	See &amp;iwl_mvm_fw_esr_recommendation</div><div class='add'>+ * @leave_reason_mask: mask for various reasons to leave EMLSR mode.</div><div class='add'>+ *	See &amp;iwl_esr_leave_reason</div><div class='add'>+ */</div><div class='add'>+struct iwl_esr_mode_notif {</div><div class='add'>+	__le32 action;</div><div class='add'>+	__le32 leave_reason_mask;</div><div class='add'>+} __packed; /* ESR_MODE_RECOMMENDATION_NTFY_API_S_VER_2 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_missed_beacons_notif - sent when by the firmware upon beacon loss</div><div class='add'>+ *  ( MISSED_BEACONS_NOTIF = 0xF6 )</div><div class='add'>+ * @link_id: fw link ID</div><div class='add'>+ * @consec_missed_beacons_since_last_rx: number of consecutive missed</div><div class='add'>+ *	beacons since last RX.</div><div class='add'>+ * @consec_missed_beacons: number of consecutive missed beacons</div><div class='add'>+ * @other_link_id: used in EMLSR only. The fw link ID for</div><div class='add'>+ *	&amp;consec_missed_beacons_other_link. IWL_MVM_FW_LINK_ID_INVALID (0xff) if</div><div class='add'>+ *	invalid.</div><div class='add'>+ * @consec_missed_beacons_other_link: number of consecutive missed beacons on</div><div class='add'>+ *	&amp;other_link_id.</div><div class='add'>+ */</div><div class='add'>+struct iwl_missed_beacons_notif {</div><div class='add'>+	__le32 link_id;</div><div class='add'>+	__le32 consec_missed_beacons_since_last_rx;</div><div class='add'>+	__le32 consec_missed_beacons;</div><div class='add'>+	__le32 other_link_id;</div><div class='add'>+	__le32 consec_missed_beacons_other_link;</div><div class='add'>+} __packed; /* MISSED_BEACON_NTFY_API_S_VER_5 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * enum iwl_esr_trans_fail_code: to be used to parse the notif below</div><div class='add'>+ *</div><div class='add'>+ * @ESR_TRANS_FAILED_TX_STATUS_ERROR: failed to TX EML OMN frame</div><div class='add'>+ * @ESR_TRANSITION_FAILED_TX_TIMEOUT: timeout on the EML OMN frame</div><div class='add'>+ * @ESR_TRANSITION_FAILED_BEACONS_NOT_HEARD: can't get a beacon on the new link</div><div class='add'>+ */</div><div class='add'>+enum iwl_esr_trans_fail_code {</div><div class='add'>+	ESR_TRANS_FAILED_TX_STATUS_ERROR,</div><div class='add'>+	ESR_TRANSITION_FAILED_TX_TIMEOUT,</div><div class='add'>+	ESR_TRANSITION_FAILED_BEACONS_NOT_HEARD,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_esr_trans_fail_notif - FW reports a failure in EMLSR transition</div><div class='add'>+ *</div><div class='add'>+ * @link_id: the link_id that still works after the failure</div><div class='add'>+ * @activation: true if the link was activated, false otherwise</div><div class='add'>+ * @err_code: see &amp;enum iwl_esr_trans_fail_code</div><div class='add'>+ */</div><div class='add'>+struct iwl_esr_trans_fail_notif {</div><div class='add'>+	__le32 link_id;</div><div class='add'>+	__le32 activation;</div><div class='add'>+	__le32 err_code;</div><div class='add'>+} __packed; /* ESR_TRANSITION_FAILED_NTFY_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * enum iwl_twt_operation_type: TWT operation in a TWT action frame</div><div class='add'>+ *</div><div class='add'>+ * @TWT_OPERATION_REQUEST: TWT Request</div><div class='add'>+ * @TWT_OPERATION_SUGGEST: TWT Suggest</div><div class='add'>+ * @TWT_OPERATION_DEMAND: TWT Demand</div><div class='add'>+ * @TWT_OPERATION_GROUPING: TWT Grouping</div><div class='add'>+ * @TWT_OPERATION_ACCEPT: TWT Accept</div><div class='add'>+ * @TWT_OPERATION_ALTERNATE: TWT Alternate</div><div class='add'>+ * @TWT_OPERATION_DICTATE: TWT Dictate</div><div class='add'>+ * @TWT_OPERATION_REJECT: TWT Reject</div><div class='add'>+ * @TWT_OPERATION_TEARDOWN: TWT Teardown</div><div class='add'>+ * @TWT_OPERATION_UNAVAILABILITY: TWT Unavailability</div><div class='add'>+ */</div><div class='add'>+enum iwl_twt_operation_type {</div><div class='add'>+	TWT_OPERATION_REQUEST,</div><div class='add'>+	TWT_OPERATION_SUGGEST,</div><div class='add'>+	TWT_OPERATION_DEMAND,</div><div class='add'>+	TWT_OPERATION_GROUPING,</div><div class='add'>+	TWT_OPERATION_ACCEPT,</div><div class='add'>+	TWT_OPERATION_ALTERNATE,</div><div class='add'>+	TWT_OPERATION_DICTATE,</div><div class='add'>+	TWT_OPERATION_REJECT,</div><div class='add'>+	TWT_OPERATION_TEARDOWN,</div><div class='add'>+	TWT_OPERATION_UNAVAILABILITY,</div><div class='add'>+	TWT_OPERATION_MAX,</div><div class='add'>+}; /* TWT_OPERATION_TYPE_E_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_twt_operation_cmd - initiate a TWT session from driver</div><div class='add'>+ *</div><div class='add'>+ * @link_id: FW link id to initiate the TWT</div><div class='add'>+ * @twt_operation: &amp;enum iwl_twt_operation_type</div><div class='add'>+ * @target_wake_time: TSF time to start the TWT</div><div class='add'>+ * @interval_exponent: the exponent for the interval</div><div class='add'>+ * @interval_mantissa: the mantissa for the interval</div><div class='add'>+ * @minimum_wake_duration: the minimum duration for the wake period</div><div class='add'>+ * @trigger: is the TWT triggered or not</div><div class='add'>+ * @flow_type: is the TWT announced (0) or not (1)</div><div class='add'>+ * @flow_id: the TWT flow identifier 0 - 7</div><div class='add'>+ * @twt_protection: is the TWT protected</div><div class='add'>+ * @ndp_paging_indicator: is ndp paging indicator set</div><div class='add'>+ * @responder_pm_mode: is responder pm mode set</div><div class='add'>+ * @negotiation_type: if the responder wants to doze outside the TWT SP</div><div class='add'>+ * @twt_request: 1 for TWT request (STA), 0 for TWT response (AP)</div><div class='add'>+ * @implicit: is TWT implicit</div><div class='add'>+ * @twt_group_assignment: the TWT group assignment</div><div class='add'>+ * @twt_channel: the TWT channel</div><div class='add'>+ * @restricted_info_present: is this a restricted TWT</div><div class='add'>+ * @dl_bitmap_valid: is DL (download) bitmap valid (restricted TWT)</div><div class='add'>+ * @ul_bitmap_valid: is UL (upload) bitmap valid (restricted TWT)</div><div class='add'>+ * @dl_tid_bitmap: DL TID bitmap (restricted TWT)</div><div class='add'>+ * @ul_tid_bitmap: UL TID bitmap (restricted TWT)</div><div class='add'>+ */</div><div class='add'>+struct iwl_twt_operation_cmd {</div><div class='add'>+	__le32 link_id;</div><div class='add'>+	__le32 twt_operation;</div><div class='add'>+	__le64 target_wake_time;</div><div class='add'>+	__le32 interval_exponent;</div><div class='add'>+	__le32 interval_mantissa;</div><div class='add'>+	__le32 minimum_wake_duration;</div><div class='add'>+	u8 trigger;</div><div class='add'>+	u8 flow_type;</div><div class='add'>+	u8 flow_id;</div><div class='add'>+	u8 twt_protection;</div><div class='add'>+	u8 ndp_paging_indicator;</div><div class='add'>+	u8 responder_pm_mode;</div><div class='add'>+	u8 negotiation_type;</div><div class='add'>+	u8 twt_request;</div><div class='add'>+	u8 implicit;</div><div class='add'>+	u8 twt_group_assignment;</div><div class='add'>+	u8 twt_channel;</div><div class='add'>+	u8 restricted_info_present;</div><div class='add'>+	u8 dl_bitmap_valid;</div><div class='add'>+	u8 ul_bitmap_valid;</div><div class='add'>+	u8 dl_tid_bitmap;</div><div class='add'>+	u8 ul_tid_bitmap;</div><div class='add'>+} __packed; /* TWT_OPERATION_API_S_VER_1 */</div><div class='add'>+</div><div class='ctx'> #endif /* __iwl_fw_api_mac_cfg_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/mac.h b/drivers/net/wireless/intel/iwlwifi/fw/api/mac.h<br/>index 93084bbad534..2a174c00b712 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/mac.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/mac.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/mac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/mac.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2022, 2024-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_fw_api_mac_h__</div><div class='hunk'>@@ -16,8 +16,8 @@</div><div class='ctx'> #define NUM_MAC_INDEX		(NUM_MAC_INDEX_DRIVER + 1)</div><div class='ctx'> #define NUM_MAC_INDEX_CDB	(NUM_MAC_INDEX_DRIVER + 2)</div><div class='ctx'> </div><div class='del'>-#define IWL_MVM_STATION_COUNT_MAX	16</div><div class='del'>-#define IWL_MVM_INVALID_STA		0xFF</div><div class='add'>+#define IWL_STATION_COUNT_MAX	16</div><div class='add'>+#define IWL_INVALID_STA		0xFF</div><div class='ctx'> </div><div class='ctx'> enum iwl_ac {</div><div class='ctx'> 	AC_BK,</div><div class='hunk'>@@ -137,12 +137,17 @@ struct iwl_mac_data_ibss {</div><div class='ctx'>  *	early termination detection.</div><div class='ctx'>  * @FLEXIBLE_TWT_SUPPORTED: AP supports flexible TWT schedule</div><div class='ctx'>  * @PROTECTED_TWT_SUPPORTED: AP supports protected TWT frames (with 11w)</div><div class='add'>+ * @BROADCAST_TWT_SUPPORTED: AP and STA support broadcast TWT</div><div class='add'>+ * @COEX_HIGH_PRIORITY_ENABLE: high priority mode for BT coex, to be used</div><div class='add'>+ *	during 802.1X negotiation (and allowed during 4-way-HS)</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_mac_data_policy {</div><div class='ctx'> 	TWT_SUPPORTED = BIT(0),</div><div class='ctx'> 	MORE_DATA_ACK_SUPPORTED = BIT(1),</div><div class='ctx'> 	FLEXIBLE_TWT_SUPPORTED = BIT(2),</div><div class='ctx'> 	PROTECTED_TWT_SUPPORTED = BIT(3),</div><div class='add'>+	BROADCAST_TWT_SUPPORTED = BIT(4),</div><div class='add'>+	COEX_HIGH_PRIORITY_ENABLE = BIT(5),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -282,15 +287,15 @@ struct iwl_ac_qos {</div><div class='ctx'> 	__le16 cw_min;</div><div class='ctx'> 	__le16 cw_max;</div><div class='ctx'> 	u8 aifsn;</div><div class='del'>-	u8 fifos_mask;</div><div class='add'>+	u8 fifos_mask; /* not in use since _VER_3 */</div><div class='ctx'> 	__le16 edca_txop;</div><div class='del'>-} __packed; /* AC_QOS_API_S_VER_2 */</div><div class='add'>+} __packed; /* AC_QOS_API_S_VER_2, _VER_3 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_mac_ctx_cmd - command structure to configure MAC contexts</div><div class='ctx'>  * ( MAC_CONTEXT_CMD = 0x28 )</div><div class='ctx'>  * @id_and_color: ID and color of the MAC</div><div class='del'>- * @action: action to perform, one of FW_CTXT_ACTION_*</div><div class='add'>+ * @action: action to perform, see &amp;enum iwl_ctxt_action</div><div class='ctx'>  * @mac_type: one of &amp;enum iwl_mac_types</div><div class='ctx'>  * @tsf_id: TSF HW timer, one of &amp;enum iwl_tsf_id</div><div class='ctx'>  * @node_addr: MAC address</div><div class='hunk'>@@ -305,6 +310,13 @@ struct iwl_ac_qos {</div><div class='ctx'>  * @filter_flags: combination of &amp;enum iwl_mac_filter_flags</div><div class='ctx'>  * @qos_flags: from &amp;enum iwl_mac_qos_flags</div><div class='ctx'>  * @ac: one iwl_mac_qos configuration for each AC</div><div class='add'>+ * @ap: AP specific config data, see &amp;struct iwl_mac_data_ap</div><div class='add'>+ * @go: GO specific config data, see &amp;struct iwl_mac_data_go</div><div class='add'>+ * @sta: BSS client specific config data, see &amp;struct iwl_mac_data_sta</div><div class='add'>+ * @p2p_sta: P2P client specific config data, see &amp;struct iwl_mac_data_p2p_sta</div><div class='add'>+ * @p2p_dev: P2P-device specific config data, see &amp;struct iwl_mac_data_p2p_dev</div><div class='add'>+ * @pibss: Pseudo-IBSS specific data, unused; see struct iwl_mac_data_pibss</div><div class='add'>+ * @ibss: IBSS specific config data, see &amp;struct iwl_mac_data_ibss</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_mac_ctx_cmd {</div><div class='ctx'> 	/* COMMON_INDEX_HDR_API_S_VER_1 */</div><div class='hunk'>@@ -348,7 +360,7 @@ struct iwl_nonqos_seq_query_cmd {</div><div class='ctx'> } __packed; /* NON_QOS_TX_COUNTER_GET_SET_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_missed_beacons_notif - information on missed beacons</div><div class='add'>+ * struct iwl_missed_beacons_notif_ver_3 - information on missed beacons</div><div class='ctx'>  * ( MISSED_BEACONS_NOTIFICATION = 0xa2 )</div><div class='ctx'>  * @mac_id: interface ID</div><div class='ctx'>  * @consec_missed_beacons_since_last_rx: number of consecutive missed</div><div class='hunk'>@@ -357,7 +369,7 @@ struct iwl_nonqos_seq_query_cmd {</div><div class='ctx'>  * @num_expected_beacons: number of expected beacons</div><div class='ctx'>  * @num_recvd_beacons: number of received beacons</div><div class='ctx'>  */</div><div class='del'>-struct iwl_missed_beacons_notif {</div><div class='add'>+struct iwl_missed_beacons_notif_ver_3 {</div><div class='ctx'> 	__le32 mac_id;</div><div class='ctx'> 	__le32 consec_missed_beacons_since_last_rx;</div><div class='ctx'> 	__le32 consec_missed_beacons;</div><div class='hunk'>@@ -366,6 +378,24 @@ struct iwl_missed_beacons_notif {</div><div class='ctx'> } __packed; /* MISSED_BEACON_NTFY_API_S_VER_3 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct iwl_missed_beacons_notif_v4 - information on missed beacons</div><div class='add'>+ * ( MISSED_BEACONS_NOTIFICATION = 0xa2 )</div><div class='add'>+ * @link_id: fw link ID</div><div class='add'>+ * @consec_missed_beacons_since_last_rx: number of consecutive missed</div><div class='add'>+ *	beacons since last RX.</div><div class='add'>+ * @consec_missed_beacons: number of consecutive missed beacons</div><div class='add'>+ * @num_expected_beacons: number of expected beacons</div><div class='add'>+ * @num_recvd_beacons: number of received beacons</div><div class='add'>+ */</div><div class='add'>+struct iwl_missed_beacons_notif_v4 {</div><div class='add'>+	__le32 link_id;</div><div class='add'>+	__le32 consec_missed_beacons_since_last_rx;</div><div class='add'>+	__le32 consec_missed_beacons;</div><div class='add'>+	__le32 num_expected_beacons;</div><div class='add'>+	__le32 num_recvd_beacons;</div><div class='add'>+} __packed; /* MISSED_BEACON_NTFY_API_S_VER_4 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_he_backoff_conf - used for backoff configuration</div><div class='ctx'>  * Per each trigger-based AC, (set by MU EDCA Parameter set info-element)</div><div class='ctx'>  * used for backoff configuration of TXF5..TXF8 trigger based.</div><div class='hunk'>@@ -393,7 +423,7 @@ struct iwl_he_backoff_conf {</div><div class='ctx'>  * @IWL_HE_PKT_EXT_64QAM: 64-QAM</div><div class='ctx'>  * @IWL_HE_PKT_EXT_256QAM: 256-QAM</div><div class='ctx'>  * @IWL_HE_PKT_EXT_1024QAM: 1024-QAM</div><div class='del'>- * @IWL_HE_PKT_EXT_RESERVED: reserved value</div><div class='add'>+ * @IWL_HE_PKT_EXT_4096QAM: 4096-QAM, for EHT only</div><div class='ctx'>  * @IWL_HE_PKT_EXT_NONE: not defined</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_he_pkt_ext_constellations {</div><div class='hunk'>@@ -403,15 +433,16 @@ enum iwl_he_pkt_ext_constellations {</div><div class='ctx'> 	IWL_HE_PKT_EXT_64QAM,</div><div class='ctx'> 	IWL_HE_PKT_EXT_256QAM,</div><div class='ctx'> 	IWL_HE_PKT_EXT_1024QAM,</div><div class='del'>-	IWL_HE_PKT_EXT_RESERVED,</div><div class='add'>+	IWL_HE_PKT_EXT_4096QAM,</div><div class='ctx'> 	IWL_HE_PKT_EXT_NONE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define MAX_HE_SUPP_NSS	2</div><div class='del'>-#define MAX_HE_CHANNEL_BW_INDX	4</div><div class='add'>+#define MAX_CHANNEL_BW_INDX_API_D_VER_1	4</div><div class='add'>+#define MAX_CHANNEL_BW_INDX_API_D_VER_2	5</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_he_pkt_ext - QAM thresholds</div><div class='add'>+ * struct iwl_he_pkt_ext_v1 - QAM thresholds</div><div class='ctx'>  * The required PPE is set via HE Capabilities IE, per Nss x BW x MCS</div><div class='ctx'>  * The IE is organized in the following way:</div><div class='ctx'>  * Support for Nss x BW (or RU) matrix:</div><div class='hunk'>@@ -430,9 +461,34 @@ enum iwl_he_pkt_ext_constellations {</div><div class='ctx'>  *	Nss (0-siso, 1-mimo2) x BW (0-20MHz, 1-40MHz, 2-80MHz, 3-160MHz) x</div><div class='ctx'>  *		(0-low_th, 1-high_th)</div><div class='ctx'>  */</div><div class='del'>-struct iwl_he_pkt_ext {</div><div class='del'>-	u8 pkt_ext_qam_th[MAX_HE_SUPP_NSS][MAX_HE_CHANNEL_BW_INDX][2];</div><div class='del'>-} __packed; /* PKT_EXT_DOT11AX_API_S */</div><div class='add'>+struct iwl_he_pkt_ext_v1 {</div><div class='add'>+	u8 pkt_ext_qam_th[MAX_HE_SUPP_NSS][MAX_CHANNEL_BW_INDX_API_D_VER_1][2];</div><div class='add'>+} __packed; /* PKT_EXT_DOT11AX_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_he_pkt_ext_v2 - QAM thresholds</div><div class='add'>+ * The required PPE is set via HE Capabilities IE, per Nss x BW x MCS</div><div class='add'>+ * The IE is organized in the following way:</div><div class='add'>+ * Support for Nss x BW (or RU) matrix:</div><div class='add'>+ *	(0=SISO, 1=MIMO2) x (0-20MHz, 1-40MHz, 2-80MHz, 3-160MHz)</div><div class='add'>+ * Each entry contains 2 QAM thresholds for 8us and 16us:</div><div class='add'>+ *	0=BPSK, 1=QPSK, 2=16QAM, 3=64QAM, 4=256QAM, 5=1024QAM, 6=RES, 7=NONE</div><div class='add'>+ * i.e. QAM_th1 &lt; QAM_th2 such if TX uses QAM_tx:</div><div class='add'>+ *	QAM_tx &lt; QAM_th1            --&gt; PPE=0us</div><div class='add'>+ *	QAM_th1 &lt;= QAM_tx &lt; QAM_th2 --&gt; PPE=8us</div><div class='add'>+ *	QAM_th2 &lt;= QAM_tx           --&gt; PPE=16us</div><div class='add'>+ * @pkt_ext_qam_th: QAM thresholds</div><div class='add'>+ *	For each Nss/Bw define 2 QAM thrsholds (0..5)</div><div class='add'>+ *	For rates below the low_th, no need for PPE</div><div class='add'>+ *	For rates between low_th and high_th, need 8us PPE</div><div class='add'>+ *	For rates equal or higher then the high_th, need 16us PPE</div><div class='add'>+ *	Nss (0-siso, 1-mimo2) x</div><div class='add'>+ *	BW (0-20MHz, 1-40MHz, 2-80MHz, 3-160MHz, 4-320MHz) x</div><div class='add'>+ *	(0-low_th, 1-high_th)</div><div class='add'>+ */</div><div class='add'>+struct iwl_he_pkt_ext_v2 {</div><div class='add'>+	u8 pkt_ext_qam_th[MAX_HE_SUPP_NSS][MAX_CHANNEL_BW_INDX_API_D_VER_2][2];</div><div class='add'>+} __packed; /* PKT_EXT_DOT11AX_API_S_VER_2 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_he_sta_ctxt_flags - HE STA context flags</div><div class='hunk'>@@ -459,6 +515,11 @@ struct iwl_he_pkt_ext {</div><div class='ctx'>  * @STA_CTXT_HE_RU_2MHZ_BLOCK: indicates that 26-tone RU OFDMA transmission are</div><div class='ctx'>  *      not allowed (as there are OBSS that might classify such transmissions as</div><div class='ctx'>  *      radar pulses).</div><div class='add'>+ * @STA_CTXT_HE_NDP_FEEDBACK_ENABLED: mark support for NDP feedback and change</div><div class='add'>+ *	of threshold</div><div class='add'>+ * @STA_CTXT_EHT_PUNCTURE_MASK_VALID: indicates the puncture_mask field is valid</div><div class='add'>+ * @STA_CTXT_EHT_LONG_PPE_ENABLED: indicates the PPE requirement should be</div><div class='add'>+ *	extended to 20us for BW &gt; 160Mhz or for MCS w/ 4096-QAM.</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_he_sta_ctxt_flags {</div><div class='ctx'> 	STA_CTXT_HE_REF_BSSID_VALID		= BIT(4),</div><div class='hunk'>@@ -472,6 +533,9 @@ enum iwl_he_sta_ctxt_flags {</div><div class='ctx'> 	STA_CTXT_HE_MU_EDCA_CW			= BIT(12),</div><div class='ctx'> 	STA_CTXT_HE_NIC_NOT_ACK_ENABLED		= BIT(13),</div><div class='ctx'> 	STA_CTXT_HE_RU_2MHZ_BLOCK		= BIT(14),</div><div class='add'>+	STA_CTXT_HE_NDP_FEEDBACK_ENABLED	= BIT(15),</div><div class='add'>+	STA_CTXT_EHT_PUNCTURE_MASK_VALID	= BIT(16),</div><div class='add'>+	STA_CTXT_EHT_LONG_PPE_ENABLED		= BIT(17),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -546,7 +610,7 @@ struct iwl_he_sta_context_cmd_v1 {</div><div class='ctx'> 	u8 frag_min_size;</div><div class='ctx'> </div><div class='ctx'> 	/* The below fields are set via PPE thresholds element */</div><div class='del'>-	struct iwl_he_pkt_ext pkt_ext;</div><div class='add'>+	struct iwl_he_pkt_ext_v1 pkt_ext;</div><div class='ctx'> </div><div class='ctx'> 	/* The below fields are set via HE-Operation IE */</div><div class='ctx'> 	u8 bss_color;</div><div class='hunk'>@@ -563,7 +627,7 @@ struct iwl_he_sta_context_cmd_v1 {</div><div class='ctx'> } __packed; /* STA_CONTEXT_DOT11AX_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_he_sta_context_cmd - configure FW to work with HE AP</div><div class='add'>+ * struct iwl_he_sta_context_cmd_v2 - configure FW to work with HE AP</div><div class='ctx'>  * @sta_id: STA id</div><div class='ctx'>  * @tid_limit: max num of TIDs in TX HE-SU multi-TID agg</div><div class='ctx'>  *	0 - bad value, 1 - multi-tid not supported, 2..8 - tid limit</div><div class='hunk'>@@ -594,7 +658,7 @@ struct iwl_he_sta_context_cmd_v1 {</div><div class='ctx'>  * @bssid_count: actual number of VAPs in the MultiBSS Set</div><div class='ctx'>  * @reserved4: alignment</div><div class='ctx'>  */</div><div class='del'>-struct iwl_he_sta_context_cmd {</div><div class='add'>+struct iwl_he_sta_context_cmd_v2 {</div><div class='ctx'> 	u8 sta_id;</div><div class='ctx'> 	u8 tid_limit;</div><div class='ctx'> 	u8 reserved1;</div><div class='hunk'>@@ -614,7 +678,7 @@ struct iwl_he_sta_context_cmd {</div><div class='ctx'> 	u8 frag_min_size;</div><div class='ctx'> </div><div class='ctx'> 	/* The below fields are set via PPE thresholds element */</div><div class='del'>-	struct iwl_he_pkt_ext pkt_ext;</div><div class='add'>+	struct iwl_he_pkt_ext_v1 pkt_ext;</div><div class='ctx'> </div><div class='ctx'> 	/* The below fields are set via HE-Operation IE */</div><div class='ctx'> 	u8 bss_color;</div><div class='hunk'>@@ -638,6 +702,81 @@ struct iwl_he_sta_context_cmd {</div><div class='ctx'> } __packed; /* STA_CONTEXT_DOT11AX_API_S_VER_2 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct iwl_he_sta_context_cmd_v3 - configure FW to work with HE AP</div><div class='add'>+ * @sta_id: STA id</div><div class='add'>+ * @tid_limit: max num of TIDs in TX HE-SU multi-TID agg</div><div class='add'>+ *	0 - bad value, 1 - multi-tid not supported, 2..8 - tid limit</div><div class='add'>+ * @reserved1: reserved byte for future use</div><div class='add'>+ * @reserved2: reserved byte for future use</div><div class='add'>+ * @flags: see %iwl_11ax_sta_ctxt_flags</div><div class='add'>+ * @ref_bssid_addr: reference BSSID used by the AP</div><div class='add'>+ * @reserved0: reserved 2 bytes for aligning the ref_bssid_addr field to 8 bytes</div><div class='add'>+ * @htc_flags: which features are supported in HTC</div><div class='add'>+ * @frag_flags: frag support in A-MSDU</div><div class='add'>+ * @frag_level: frag support level</div><div class='add'>+ * @frag_max_num: max num of "open" MSDUs in the receiver (in power of 2)</div><div class='add'>+ * @frag_min_size: min frag size (except last frag)</div><div class='add'>+ * @pkt_ext: optional, exists according to PPE-present bit in the HE-PHY capa</div><div class='add'>+ * @bss_color: 11ax AP ID that is used in the HE SIG-A to mark inter BSS frame</div><div class='add'>+ * @htc_trig_based_pkt_ext: default PE in 4us units</div><div class='add'>+ * @frame_time_rts_th: HE duration RTS threshold, in units of 32us</div><div class='add'>+ * @rand_alloc_ecwmin: random CWmin = 2**ECWmin-1</div><div class='add'>+ * @rand_alloc_ecwmax: random CWmax = 2**ECWmax-1</div><div class='add'>+ * @puncture_mask: puncture mask for EHT</div><div class='add'>+ * @trig_based_txf: MU EDCA Parameter set for the trigger based traffic queues</div><div class='add'>+ * @max_bssid_indicator: indicator of the max bssid supported on the associated</div><div class='add'>+ *	bss</div><div class='add'>+ * @bssid_index: index of the associated VAP</div><div class='add'>+ * @ema_ap: AP supports enhanced Multi BSSID advertisement</div><div class='add'>+ * @profile_periodicity: number of Beacon periods that are needed to receive the</div><div class='add'>+ *	complete VAPs info</div><div class='add'>+ * @bssid_count: actual number of VAPs in the MultiBSS Set</div><div class='add'>+ * @reserved4: alignment</div><div class='add'>+ */</div><div class='add'>+struct iwl_he_sta_context_cmd_v3 {</div><div class='add'>+	u8 sta_id;</div><div class='add'>+	u8 tid_limit;</div><div class='add'>+	u8 reserved1;</div><div class='add'>+	u8 reserved2;</div><div class='add'>+	__le32 flags;</div><div class='add'>+</div><div class='add'>+	/* The below fields are set via Multiple BSSID IE */</div><div class='add'>+	u8 ref_bssid_addr[6];</div><div class='add'>+	__le16 reserved0;</div><div class='add'>+</div><div class='add'>+	/* The below fields are set via HE-capabilities IE */</div><div class='add'>+	__le32 htc_flags;</div><div class='add'>+</div><div class='add'>+	u8 frag_flags;</div><div class='add'>+	u8 frag_level;</div><div class='add'>+	u8 frag_max_num;</div><div class='add'>+	u8 frag_min_size;</div><div class='add'>+</div><div class='add'>+	/* The below fields are set via PPE thresholds element */</div><div class='add'>+	struct iwl_he_pkt_ext_v2 pkt_ext;</div><div class='add'>+</div><div class='add'>+	/* The below fields are set via HE-Operation IE */</div><div class='add'>+	u8 bss_color;</div><div class='add'>+	u8 htc_trig_based_pkt_ext;</div><div class='add'>+	__le16 frame_time_rts_th;</div><div class='add'>+</div><div class='add'>+	/* Random access parameter set (i.e. RAPS) */</div><div class='add'>+	u8 rand_alloc_ecwmin;</div><div class='add'>+	u8 rand_alloc_ecwmax;</div><div class='add'>+	__le16 puncture_mask;</div><div class='add'>+</div><div class='add'>+	/* The below fields are set via MU EDCA parameter set element */</div><div class='add'>+	struct iwl_he_backoff_conf trig_based_txf[AC_NUM];</div><div class='add'>+</div><div class='add'>+	u8 max_bssid_indicator;</div><div class='add'>+	u8 bssid_index;</div><div class='add'>+	u8 ema_ap;</div><div class='add'>+	u8 profile_periodicity;</div><div class='add'>+	u8 bssid_count;</div><div class='add'>+	u8 reserved4[3];</div><div class='add'>+} __packed; /* STA_CONTEXT_DOT11AX_API_S_VER_2 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_he_monitor_cmd - configure air sniffer for HE</div><div class='ctx'>  * @bssid: the BSSID to sniff for</div><div class='ctx'>  * @reserved1: reserved for dword alignment</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h b/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h<br/>index dc8f2777e944..4644fc1aa1ec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2021 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -17,7 +17,10 @@ enum iwl_regulatory_and_nvm_subcmd_ids {</div><div class='ctx'> 	NVM_ACCESS_COMPLETE = 0x0,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @LARI_CONFIG_CHANGE: &amp;struct iwl_lari_config_change_cmd</div><div class='add'>+	 * @LARI_CONFIG_CHANGE: &amp;struct iwl_lari_config_change_cmd_v1,</div><div class='add'>+	 *	&amp;struct iwl_lari_config_change_cmd_v6,</div><div class='add'>+	 *	&amp;struct iwl_lari_config_change_cmd_v8,</div><div class='add'>+	 *	&amp;struct iwl_lari_config_change_cmd</div><div class='ctx'> 	 */</div><div class='ctx'> 	LARI_CONFIG_CHANGE = 0x1,</div><div class='ctx'> </div><div class='hunk'>@@ -29,11 +32,21 @@ enum iwl_regulatory_and_nvm_subcmd_ids {</div><div class='ctx'> 	NVM_GET_INFO = 0x2,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @TAS_CONFIG: &amp;struct iwl_tas_config_cmd</div><div class='add'>+	 * @TAS_CONFIG: &amp;union iwl_tas_config_cmd</div><div class='ctx'> 	 */</div><div class='ctx'> 	TAS_CONFIG = 0x3,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @SAR_OFFSET_MAPPING_TABLE_CMD: &amp;struct iwl_sar_offset_mapping_cmd</div><div class='add'>+	 */</div><div class='add'>+	SAR_OFFSET_MAPPING_TABLE_CMD = 0x4,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @MCC_ALLOWED_AP_TYPE_CMD: &amp;struct iwl_mcc_allowed_ap_type_cmd</div><div class='add'>+	 */</div><div class='add'>+	MCC_ALLOWED_AP_TYPE_CMD = 0x5,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @PNVM_INIT_COMPLETE_NTFY: &amp;struct iwl_pnvm_init_complete_ntfy</div><div class='ctx'> 	 */</div><div class='ctx'> 	PNVM_INIT_COMPLETE_NTFY = 0xFE,</div><div class='hunk'>@@ -102,7 +115,7 @@ struct iwl_nvm_access_cmd {</div><div class='ctx'> } __packed; /* NVM_ACCESS_CMD_API_S_VER_2 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_nvm_access_resp_ver2 - response to NVM_ACCESS_CMD</div><div class='add'>+ * struct iwl_nvm_access_resp - response to NVM_ACCESS_CMD</div><div class='ctx'>  * @offset: offset in bytes into the section</div><div class='ctx'>  * @length: in bytes, either how much was written or read</div><div class='ctx'>  * @type: NVM_SECTION_TYPE_*</div><div class='hunk'>@@ -194,7 +207,7 @@ struct iwl_nvm_get_info_phy {</div><div class='ctx'> #define IWL_NUM_CHANNELS	110</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_nvm_get_info_regulatory - regulatory information</div><div class='add'>+ * struct iwl_nvm_get_info_regulatory_v1 - regulatory information</div><div class='ctx'>  * @lar_enabled: is LAR enabled</div><div class='ctx'>  * @channel_profile: regulatory data of this channel</div><div class='ctx'>  * @reserved: reserved</div><div class='hunk'>@@ -253,6 +266,9 @@ struct iwl_nvm_access_complete_cmd {</div><div class='ctx'> 	__le32 reserved;</div><div class='ctx'> } __packed; /* NVM_ACCESS_COMPLETE_CMD_API_S_VER_1 */</div><div class='ctx'> </div><div class='add'>+#define IWL_MCC_US	0x5553</div><div class='add'>+#define IWL_MCC_CANADA	0x4341</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_mcc_update_cmd - Request the device to update geographic</div><div class='ctx'>  * regulatory profile according to the given MCC (Mobile Country Code).</div><div class='hunk'>@@ -312,7 +328,7 @@ struct iwl_mcc_update_resp_v3 {</div><div class='ctx'> } __packed; /* LAR_UPDATE_MCC_CMD_RESP_S_VER_3 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_mcc_update_resp - response to MCC_UPDATE_CMD.</div><div class='add'>+ * struct iwl_mcc_update_resp_v4 - response to MCC_UPDATE_CMD.</div><div class='ctx'>  * Contains the new channel control profile map, if changed, and the new MCC</div><div class='ctx'>  * (mobile country code).</div><div class='ctx'>  * The new MCC may be different than what was requested in MCC_UPDATE_CMD.</div><div class='hunk'>@@ -328,7 +344,7 @@ struct iwl_mcc_update_resp_v3 {</div><div class='ctx'>  * @channels: channel control data map, DWORD for each channel. Only the first</div><div class='ctx'>  *	16bits are used.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_mcc_update_resp {</div><div class='add'>+struct iwl_mcc_update_resp_v4 {</div><div class='ctx'> 	__le32 status;</div><div class='ctx'> 	__le16 mcc;</div><div class='ctx'> 	__le16 cap;</div><div class='hunk'>@@ -341,6 +357,37 @@ struct iwl_mcc_update_resp {</div><div class='ctx'> } __packed; /* LAR_UPDATE_MCC_CMD_RESP_S_VER_4 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct iwl_mcc_update_resp_v8 - response to MCC_UPDATE_CMD.</div><div class='add'>+ * Contains the new channel control profile map, if changed, and the new MCC</div><div class='add'>+ * (mobile country code).</div><div class='add'>+ * The new MCC may be different than what was requested in MCC_UPDATE_CMD.</div><div class='add'>+ * @status: see &amp;enum iwl_mcc_update_status</div><div class='add'>+ * @mcc: the new applied MCC</div><div class='add'>+ * @padding: padding for 2 bytes.</div><div class='add'>+ * @cap: capabilities for all channels which matches the MCC</div><div class='add'>+ * @time: time elapsed from the MCC test start (in units of 30 seconds)</div><div class='add'>+ * @geo_info: geographic specific profile information</div><div class='add'>+ *     see &amp;enum iwl_geo_information.</div><div class='add'>+ * @source_id: the MCC source, see iwl_mcc_source</div><div class='add'>+ * @reserved: for four bytes alignment.</div><div class='add'>+ * @n_channels: number of channels in @channels_data.</div><div class='add'>+ * @channels: channel control data map, DWORD for each channel. Only the first</div><div class='add'>+ *     16bits are used.</div><div class='add'>+ */</div><div class='add'>+struct iwl_mcc_update_resp_v8 {</div><div class='add'>+	__le32 status;</div><div class='add'>+	__le16 mcc;</div><div class='add'>+	u8 padding[2];</div><div class='add'>+	__le32 cap;</div><div class='add'>+	__le16 time;</div><div class='add'>+	__le16 geo_info;</div><div class='add'>+	u8 source_id;</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+	__le32 n_channels;</div><div class='add'>+	__le32 channels[];</div><div class='add'>+} __packed; /* LAR_UPDATE_MCC_CMD_RESP_S_VER_8 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_mcc_chub_notif - chub notifies of mcc change</div><div class='ctx'>  * (MCC_CHUB_UPDATE_CMD = 0xc9)</div><div class='ctx'>  * The Chub (Communication Hub, CommsHUB) is a HW component that connects to</div><div class='hunk'>@@ -388,30 +435,116 @@ enum iwl_mcc_source {</div><div class='ctx'> 	MCC_SOURCE_GETTING_MCC_TEST_MODE = 0x11,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define IWL_TAS_BLACK_LIST_MAX 16</div><div class='add'>+#define IWL_WTAS_BLACK_LIST_MAX		16</div><div class='ctx'> /**</div><div class='del'>- * struct iwl_tas_config_cmd - configures the TAS</div><div class='add'>+ * struct iwl_tas_config_cmd_common - configures the TAS.</div><div class='add'>+ * This is also the v2 structure.</div><div class='ctx'>  * @block_list_size: size of relevant field in block_list_array</div><div class='del'>- * @block_list_array: block list countries (without TAS)</div><div class='add'>+ * @block_list_array: list of countries where TAS must be disabled</div><div class='ctx'>  */</div><div class='del'>-struct iwl_tas_config_cmd {</div><div class='add'>+struct iwl_tas_config_cmd_common {</div><div class='ctx'> 	__le32 block_list_size;</div><div class='del'>-	__le32 block_list_array[IWL_TAS_BLACK_LIST_MAX];</div><div class='add'>+	__le32 block_list_array[IWL_WTAS_BLACK_LIST_MAX];</div><div class='ctx'> } __packed; /* TAS_CONFIG_CMD_API_S_VER_2 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum iwl_lari_configs - bit masks for the various LARI config operations</div><div class='add'>+ * struct iwl_tas_config_cmd_v3 - configures the TAS</div><div class='add'>+ * @override_tas_iec: indicates whether to override default value of IEC regulatory</div><div class='add'>+ * @enable_tas_iec: in case override_tas_iec is set -</div><div class='add'>+ *	indicates whether IEC regulatory is enabled or disabled</div><div class='add'>+ */</div><div class='add'>+struct iwl_tas_config_cmd_v3 {</div><div class='add'>+	__le16 override_tas_iec;</div><div class='add'>+	__le16 enable_tas_iec;</div><div class='add'>+} __packed; /* TAS_CONFIG_CMD_API_S_VER_3 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_tas_uhb_allowed_flags - per country TAS UHB allowed flags.</div><div class='add'>+ * @TAS_UHB_ALLOWED_CANADA: TAS UHB is allowed in Canada. This flag is valid</div><div class='add'>+ *	only when fw has %IWL_UCODE_TLV_CAPA_UHB_CANADA_TAS_SUPPORT capability.</div><div class='add'>+ */</div><div class='add'>+enum iwl_tas_uhb_allowed_flags {</div><div class='add'>+	TAS_UHB_ALLOWED_CANADA	= BIT(0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_tas_config_cmd_v4 - configures the TAS</div><div class='add'>+ * @override_tas_iec: indicates whether to override default value of IEC regulatory</div><div class='add'>+ * @enable_tas_iec: in case override_tas_iec is set -</div><div class='add'>+ *	indicates whether IEC regulatory is enabled or disabled</div><div class='add'>+ * @usa_tas_uhb_allowed: if set, allow TAS UHB in the USA</div><div class='add'>+ * @uhb_allowed_flags: see &amp;enum iwl_tas_uhb_allowed_flags.</div><div class='add'>+ */</div><div class='add'>+struct iwl_tas_config_cmd_v4 {</div><div class='add'>+	u8 override_tas_iec;</div><div class='add'>+	u8 enable_tas_iec;</div><div class='add'>+	u8 usa_tas_uhb_allowed;</div><div class='add'>+	u8 uhb_allowed_flags;</div><div class='add'>+} __packed; /* TAS_CONFIG_CMD_API_S_VER_4 */</div><div class='add'>+</div><div class='add'>+struct iwl_tas_config_cmd_v2_v4 {</div><div class='add'>+	struct iwl_tas_config_cmd_common common;</div><div class='add'>+	union {</div><div class='add'>+		struct iwl_tas_config_cmd_v3 v3;</div><div class='add'>+		struct iwl_tas_config_cmd_v4 v4;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum bios_source - source of bios data</div><div class='add'>+ * @BIOS_SOURCE_NONE: BIOS source is not defined</div><div class='add'>+ * @BIOS_SOURCE_ACPI: BIOS source is ACPI</div><div class='add'>+ * @BIOS_SOURCE_UEFI: BIOS source is UEFI</div><div class='add'>+ */</div><div class='add'>+enum bios_source {</div><div class='add'>+	BIOS_SOURCE_NONE,</div><div class='add'>+	BIOS_SOURCE_ACPI,</div><div class='add'>+	BIOS_SOURCE_UEFI,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct bios_value_u32 - BIOS configuration.</div><div class='add'>+ * @table_source: see &amp;enum bios_source</div><div class='add'>+ * @table_revision: table revision.</div><div class='add'>+ * @reserved: reserved</div><div class='add'>+ * @value: value in bios.</div><div class='add'>+ */</div><div class='add'>+struct bios_value_u32 {</div><div class='add'>+	u8 table_source;</div><div class='add'>+	u8 table_revision;</div><div class='add'>+	u8 reserved[2];</div><div class='add'>+	__le32 value;</div><div class='add'>+} __packed; /* BIOS_TABLE_SOURCE_U32_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_tas_config_cmd - configures the TAS.</div><div class='add'>+ * @block_list_size: size of relevant field in block_list_array</div><div class='add'>+ * @block_list_array: list of countries where TAS must be disabled</div><div class='add'>+ * @reserved: reserved</div><div class='add'>+ * @tas_config_info: see @struct bios_value_u32</div><div class='add'>+ */</div><div class='add'>+struct iwl_tas_config_cmd {</div><div class='add'>+	__le16 block_list_size;</div><div class='add'>+	__le16 block_list_array[IWL_WTAS_BLACK_LIST_MAX];</div><div class='add'>+	u8 reserved[2];</div><div class='add'>+	struct bios_value_u32 tas_config_info;</div><div class='add'>+} __packed; /* TAS_CONFIG_CMD_API_S_VER_5 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_lari_config_masks - bit masks for the various LARI config operations</div><div class='ctx'>  * @LARI_CONFIG_DISABLE_11AC_UKRAINE_MSK: disable 11ac in ukraine</div><div class='ctx'>  * @LARI_CONFIG_CHANGE_ETSI_TO_PASSIVE_MSK: ETSI 5.8GHz SRD passive scan</div><div class='ctx'>  * @LARI_CONFIG_CHANGE_ETSI_TO_DISABLED_MSK: ETSI 5.8GHz SRD disabled</div><div class='ctx'>  * @LARI_CONFIG_ENABLE_5G2_IN_INDONESIA_MSK: enable 5.15/5.35GHz bands in</div><div class='ctx'>  * 	Indonesia</div><div class='add'>+ * @LARI_CONFIG_ENABLE_CHINA_22_REG_SUPPORT_MSK: enable 2022 china regulatory</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_lari_config_masks {</div><div class='ctx'> 	LARI_CONFIG_DISABLE_11AC_UKRAINE_MSK		= BIT(0),</div><div class='ctx'> 	LARI_CONFIG_CHANGE_ETSI_TO_PASSIVE_MSK		= BIT(1),</div><div class='ctx'> 	LARI_CONFIG_CHANGE_ETSI_TO_DISABLED_MSK		= BIT(2),</div><div class='ctx'> 	LARI_CONFIG_ENABLE_5G2_IN_INDONESIA_MSK		= BIT(3),</div><div class='add'>+	LARI_CONFIG_ENABLE_CHINA_22_REG_SUPPORT_MSK	= BIT(7),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IWL_11AX_UKRAINE_MASK 3</div><div class='hunk'>@@ -427,30 +560,114 @@ struct iwl_lari_config_change_cmd_v1 {</div><div class='ctx'> } __packed; /* LARI_CHANGE_CONF_CMD_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_lari_config_change_cmd_v2 - change LARI configuration</div><div class='del'>- * @config_bitmap: bit map of the config commands. each bit will trigger a</div><div class='del'>- * different predefined FW config operation</div><div class='del'>- * @oem_uhb_allow_bitmap: bitmap of UHB enabled MCC sets</div><div class='add'>+ * struct iwl_lari_config_change_cmd_v6 - change LARI configuration</div><div class='add'>+ * @config_bitmap: Bitmap of the config commands. Each bit will trigger a</div><div class='add'>+ *     different predefined FW config operation.</div><div class='add'>+ * @oem_uhb_allow_bitmap: Bitmap of UHB enabled MCC sets.</div><div class='add'>+ * @oem_11ax_allow_bitmap: Bitmap of 11ax allowed MCCs. There are two bits</div><div class='add'>+ *     per country, one to indicate whether to override and the other to</div><div class='add'>+ *     indicate the value to use.</div><div class='add'>+ * @oem_unii4_allow_bitmap: Bitmap of unii4 allowed MCCs.There are two bits</div><div class='add'>+ *     per country, one to indicate whether to override and the other to</div><div class='add'>+ *     indicate allow/disallow unii4 channels.</div><div class='add'>+ * @chan_state_active_bitmap: Bitmap for overriding channel state to active.</div><div class='add'>+ *     Each bit represents a country or region to activate, according to the BIOS</div><div class='add'>+ *     definitions.</div><div class='add'>+ * @force_disable_channels_bitmap: Bitmap of disabled bands/channels.</div><div class='add'>+ *     Each bit represents a set of channels in a specific band that should be disabled</div><div class='ctx'>  */</div><div class='del'>-struct iwl_lari_config_change_cmd_v2 {</div><div class='add'>+struct iwl_lari_config_change_cmd_v6 {</div><div class='ctx'> 	__le32 config_bitmap;</div><div class='ctx'> 	__le32 oem_uhb_allow_bitmap;</div><div class='del'>-} __packed; /* LARI_CHANGE_CONF_CMD_S_VER_2 */</div><div class='add'>+	__le32 oem_11ax_allow_bitmap;</div><div class='add'>+	__le32 oem_unii4_allow_bitmap;</div><div class='add'>+	__le32 chan_state_active_bitmap;</div><div class='add'>+	__le32 force_disable_channels_bitmap;</div><div class='add'>+} __packed; /* LARI_CHANGE_CONF_CMD_S_VER_6 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_lari_config_change_cmd_v3 - change LARI configuration</div><div class='del'>- * @config_bitmap: bit map of the config commands. each bit will trigger a</div><div class='del'>- * different predefined FW config operation</div><div class='del'>- * @oem_uhb_allow_bitmap: bitmap of UHB enabled MCC sets</div><div class='del'>- * @oem_11ax_allow_bitmap: bitmap of 11ax allowed MCCs.</div><div class='del'>- * For each supported country, a pair of regulatory override bit and 11ax mode exist</div><div class='del'>- * in the bit field.</div><div class='add'>+ * struct iwl_lari_config_change_cmd_v8 - change LARI configuration</div><div class='add'>+ * @config_bitmap: Bitmap of the config commands. Each bit will trigger a</div><div class='add'>+ *     different predefined FW config operation.</div><div class='add'>+ * @oem_uhb_allow_bitmap: Bitmap of UHB enabled MCC sets.</div><div class='add'>+ * @oem_11ax_allow_bitmap: Bitmap of 11ax allowed MCCs. There are two bits</div><div class='add'>+ *     per country, one to indicate whether to override and the other to</div><div class='add'>+ *     indicate the value to use.</div><div class='add'>+ * @oem_unii4_allow_bitmap: Bitmap of unii4 allowed MCCs.There are two bits</div><div class='add'>+ *     per country, one to indicate whether to override and the other to</div><div class='add'>+ *     indicate allow/disallow unii4 channels.</div><div class='add'>+ *     bit 0 - 3: supported.</div><div class='add'>+ * @chan_state_active_bitmap: Bitmap to enable different bands per country</div><div class='add'>+ *     or region.</div><div class='add'>+ *     Each bit represents a country or region, and a band to activate</div><div class='add'>+ *     according to the BIOS definitions.</div><div class='add'>+ *     bit 0 - 4: supported.</div><div class='add'>+ * @force_disable_channels_bitmap: Bitmap of disabled bands/channels.</div><div class='add'>+ *     Each bit represents a set of channels in a specific band that should be</div><div class='add'>+ *     disabled</div><div class='add'>+ * @edt_bitmap: Bitmap of energy detection threshold table.</div><div class='add'>+ *	Disable/enable the EDT optimization method for different band.</div><div class='add'>+ */</div><div class='add'>+struct iwl_lari_config_change_cmd_v8 {</div><div class='add'>+	__le32 config_bitmap;</div><div class='add'>+	__le32 oem_uhb_allow_bitmap;</div><div class='add'>+	__le32 oem_11ax_allow_bitmap;</div><div class='add'>+	__le32 oem_unii4_allow_bitmap;</div><div class='add'>+	__le32 chan_state_active_bitmap;</div><div class='add'>+	__le32 force_disable_channels_bitmap;</div><div class='add'>+	__le32 edt_bitmap;</div><div class='add'>+} __packed;</div><div class='add'>+/* LARI_CHANGE_CONF_CMD_S_VER_8 */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_lari_config_change_cmd - change LARI configuration</div><div class='add'>+ * @config_bitmap: Bitmap of the config commands. Each bit will trigger a</div><div class='add'>+ *	different predefined FW config operation.</div><div class='add'>+ * @oem_uhb_allow_bitmap: Bitmap of UHB enabled MCC sets.</div><div class='add'>+ * @oem_11ax_allow_bitmap: Bitmap of 11ax allowed MCCs. There are two bits</div><div class='add'>+ *	per country, one to indicate whether to override and the other to</div><div class='add'>+ *	indicate the value to use.</div><div class='add'>+ * @oem_unii4_allow_bitmap: Bitmap of unii4 allowed MCCs.There are two bits</div><div class='add'>+ *	per country, one to indicate whether to override and the other to</div><div class='add'>+ *	indicate allow/disallow unii4 channels.</div><div class='add'>+ * @chan_state_active_bitmap: Bitmap to enable different bands per country</div><div class='add'>+ *	or region.</div><div class='add'>+ *	Each bit represents a country or region, and a band to activate</div><div class='add'>+ *	according to the BIOS definitions.</div><div class='add'>+ *	bit 0 - 6: supported.</div><div class='add'>+ * @force_disable_channels_bitmap: Bitmap of disabled bands/channels.</div><div class='add'>+ *	Each bit represents a set of channels in a specific band that should be</div><div class='add'>+ *	disabled</div><div class='add'>+ * @edt_bitmap: Bitmap of energy detection threshold table.</div><div class='add'>+ *	Disable/enable the EDT optimization method for different band.</div><div class='add'>+ * @oem_320mhz_allow_bitmap: 320Mhz bandwidth enablement bitmap per MCC.</div><div class='add'>+ *	bit0: enable 320Mhz in Japan.</div><div class='add'>+ *	bit1: enable 320Mhz in South Korea.</div><div class='add'>+ *	bit 2 - 31: reserved.</div><div class='add'>+ * @oem_11be_allow_bitmap: Bitmap of 11be allowed MCCs. No need to mask out the</div><div class='add'>+ *	unsupported bits</div><div class='add'>+ *	bit0: enable 11be in China(CB/CN).</div><div class='add'>+ *	bit1: enable 11be in South Korea.</div><div class='add'>+ *	bit 2 - 31: reserved.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_lari_config_change_cmd_v3 {</div><div class='add'>+struct iwl_lari_config_change_cmd {</div><div class='ctx'> 	__le32 config_bitmap;</div><div class='ctx'> 	__le32 oem_uhb_allow_bitmap;</div><div class='ctx'> 	__le32 oem_11ax_allow_bitmap;</div><div class='del'>-} __packed; /* LARI_CHANGE_CONF_CMD_S_VER_3 */</div><div class='add'>+	__le32 oem_unii4_allow_bitmap;</div><div class='add'>+	__le32 chan_state_active_bitmap;</div><div class='add'>+	__le32 force_disable_channels_bitmap;</div><div class='add'>+	__le32 edt_bitmap;</div><div class='add'>+	__le32 oem_320mhz_allow_bitmap;</div><div class='add'>+	__le32 oem_11be_allow_bitmap;</div><div class='add'>+} __packed;</div><div class='add'>+/* LARI_CHANGE_CONF_CMD_S_VER_12 */</div><div class='add'>+</div><div class='add'>+/* Activate UNII-1 (5.2GHz) for World Wide */</div><div class='add'>+#define ACTIVATE_5G2_IN_WW_MASK			BIT(4)</div><div class='add'>+#define CHAN_STATE_ACTIVE_BITMAP_CMD_V8		0x1F</div><div class='add'>+#define CHAN_STATE_ACTIVE_BITMAP_CMD_V12	0x7F</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_pnvm_init_complete_ntfy - PNVM initialization complete</div><div class='hunk'>@@ -460,4 +677,17 @@ struct iwl_pnvm_init_complete_ntfy {</div><div class='ctx'> 	__le32 status;</div><div class='ctx'> } __packed; /* PNVM_INIT_COMPLETE_NTFY_S_VER_1 */</div><div class='ctx'> </div><div class='add'>+#define UATS_TABLE_ROW_SIZE	26</div><div class='add'>+#define UATS_TABLE_COL_SIZE	13</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mcc_allowed_ap_type_cmd - struct for MCC_ALLOWED_AP_TYPE_CMD</div><div class='add'>+ * @offset_map: mapping a mcc to UHB AP type support (UATS) allowed</div><div class='add'>+ * @reserved: reserved</div><div class='add'>+ */</div><div class='add'>+struct iwl_mcc_allowed_ap_type_cmd {</div><div class='add'>+	u8 offset_map[UATS_TABLE_ROW_SIZE][UATS_TABLE_COL_SIZE];</div><div class='add'>+	__le16 reserved;</div><div class='add'>+} __packed; /* MCC_ALLOWED_AP_TYPE_CMD_API_S_VER_1 */</div><div class='add'>+</div><div class='ctx'> #endif /* __iwl_fw_api_nvm_reg_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/offload.h b/drivers/net/wireless/intel/iwlwifi/fw/api/offload.h<br/>index f06214d418aa..bb801650a565 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/offload.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/offload.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/offload.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/offload.h</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  * Copyright (C) 2012-2014 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='add'>+ * Copyright (C) 2021-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_fw_api_offload_h__</div><div class='ctx'> #define __iwl_fw_api_offload_h__</div><div class='hunk'>@@ -12,7 +13,25 @@</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_prot_offload_subcmd_ids {</div><div class='ctx'> 	/**</div><div class='del'>-	 * @STORED_BEACON_NTF: &amp;struct iwl_stored_beacon_notif</div><div class='add'>+	 * @WOWLAN_WAKE_PKT_NOTIFICATION: Notification in &amp;struct iwl_wowlan_wake_pkt_notif</div><div class='add'>+	 */</div><div class='add'>+	WOWLAN_WAKE_PKT_NOTIFICATION = 0xFC,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @WOWLAN_INFO_NOTIFICATION: Notification in</div><div class='add'>+	 * &amp;struct iwl_wowlan_info_notif_v1, iwl_wowlan_info_notif_v3,</div><div class='add'>+	 * &amp;struct iwl_wowlan_info_notif_v5 or &amp;struct iwl_wowlan_info_notif</div><div class='add'>+	 */</div><div class='add'>+	WOWLAN_INFO_NOTIFICATION = 0xFD,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @D3_END_NOTIFICATION: End D3 state notification</div><div class='add'>+	 */</div><div class='add'>+	D3_END_NOTIFICATION = 0xFE,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @STORED_BEACON_NTF: &amp;struct iwl_stored_beacon_notif_v2 or</div><div class='add'>+	 *	&amp;struct iwl_stored_beacon_notif</div><div class='ctx'> 	 */</div><div class='ctx'> 	STORED_BEACON_NTF = 0xFF,</div><div class='ctx'> };</div><div class='hunk'>@@ -20,7 +39,7 @@ enum iwl_prot_offload_subcmd_ids {</div><div class='ctx'> #define MAX_STORED_BEACON_SIZE 600</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_stored_beacon_notif - Stored beacon notification</div><div class='add'>+ * struct iwl_stored_beacon_notif_common - Stored beacon notif common fields</div><div class='ctx'>  *</div><div class='ctx'>  * @system_time: system time on air rise</div><div class='ctx'>  * @tsf: TSF on air rise</div><div class='hunk'>@@ -29,9 +48,8 @@ enum iwl_prot_offload_subcmd_ids {</div><div class='ctx'>  * @channel: channel this beacon was received on</div><div class='ctx'>  * @rates: rate in ucode internal format</div><div class='ctx'>  * @byte_count: frame's byte count</div><div class='del'>- * @data: beacon data, length in @byte_count</div><div class='ctx'>  */</div><div class='del'>-struct iwl_stored_beacon_notif {</div><div class='add'>+struct iwl_stored_beacon_notif_common {</div><div class='ctx'> 	__le32 system_time;</div><div class='ctx'> 	__le64 tsf;</div><div class='ctx'> 	__le32 beacon_timestamp;</div><div class='hunk'>@@ -39,7 +57,32 @@ struct iwl_stored_beacon_notif {</div><div class='ctx'> 	__le16 channel;</div><div class='ctx'> 	__le32 rates;</div><div class='ctx'> 	__le32 byte_count;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_stored_beacon_notif_v2 - Stored beacon notification</div><div class='add'>+ *</div><div class='add'>+ * @common: fields common for all versions</div><div class='add'>+ * @data: beacon data, length in @byte_count</div><div class='add'>+ */</div><div class='add'>+struct iwl_stored_beacon_notif_v2 {</div><div class='add'>+	struct iwl_stored_beacon_notif_common common;</div><div class='ctx'> 	u8 data[MAX_STORED_BEACON_SIZE];</div><div class='ctx'> } __packed; /* WOWLAN_STROED_BEACON_INFO_S_VER_2 */</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct iwl_stored_beacon_notif - Stored beacon notification</div><div class='add'>+ *</div><div class='add'>+ * @common: fields common for all versions</div><div class='add'>+ * @sta_id: station for which the beacon was received</div><div class='add'>+ * @reserved: reserved for alignment</div><div class='add'>+ * @data: beacon data, length in @byte_count</div><div class='add'>+ */</div><div class='add'>+struct iwl_stored_beacon_notif {</div><div class='add'>+	struct iwl_stored_beacon_notif_common common;</div><div class='add'>+	u8 sta_id;</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+	u8 data[MAX_STORED_BEACON_SIZE];</div><div class='add'>+} __packed; /* WOWLAN_STROED_BEACON_INFO_S_VER_3, _VER_4 */</div><div class='add'>+</div><div class='ctx'> #endif /* __iwl_fw_api_offload_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h b/drivers/net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h<br/>index 68b788b92b7a..4594a7c94bd6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018, 2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018, 2020-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -13,31 +13,30 @@</div><div class='ctx'> #define PHY_BAND_6 (2)</div><div class='ctx'> </div><div class='ctx'> /* Supported channel width, vary if there is VHT support */</div><div class='del'>-#define PHY_VHT_CHANNEL_MODE20	(0x0)</div><div class='del'>-#define PHY_VHT_CHANNEL_MODE40	(0x1)</div><div class='del'>-#define PHY_VHT_CHANNEL_MODE80	(0x2)</div><div class='del'>-#define PHY_VHT_CHANNEL_MODE160	(0x3)</div><div class='add'>+#define IWL_PHY_CHANNEL_MODE20	0x0</div><div class='add'>+#define IWL_PHY_CHANNEL_MODE40	0x1</div><div class='add'>+#define IWL_PHY_CHANNEL_MODE80	0x2</div><div class='add'>+#define IWL_PHY_CHANNEL_MODE160	0x3</div><div class='add'>+/* and 320 MHz for EHT */</div><div class='add'>+#define IWL_PHY_CHANNEL_MODE320	0x4</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Control channel position:</div><div class='ctx'>  * For legacy set bit means upper channel, otherwise lower.</div><div class='ctx'>  * For VHT - bit-2 marks if the control is lower/upper relative to center-freq</div><div class='ctx'>  *   bits-1:0 mark the distance from the center freq. for 20Mhz, offset is 0.</div><div class='del'>- *                                   center_freq</div><div class='del'>- *                                        |</div><div class='del'>- * 40Mhz                          |_______|_______|</div><div class='del'>- * 80Mhz                  |_______|_______|_______|_______|</div><div class='del'>- * 160Mhz |_______|_______|_______|_______|_______|_______|_______|_______|</div><div class='del'>- * code      011     010     001     000  |  100     101     110    111</div><div class='add'>+ * For EHT - bit-3 is used for extended distance</div><div class='add'>+ *                                           center_freq</div><div class='add'>+ *                                                |</div><div class='add'>+ * 40Mhz                                     |____|____|</div><div class='add'>+ * 80Mhz                                |____|____|____|____|</div><div class='add'>+ * 160Mhz                     |____|____|____|____|____|____|____|____|</div><div class='add'>+ * 320MHz |____|____|____|____|____|____|____|____|____|____|____|____|____|____|____|____|</div><div class='add'>+ * code    1011 1010 1001 1000 0011 0010 0001 0000 0100 0101 0110 0111 1100 1101 1110 1111</div><div class='ctx'>  */</div><div class='del'>-#define PHY_VHT_CTRL_POS_1_BELOW  (0x0)</div><div class='del'>-#define PHY_VHT_CTRL_POS_2_BELOW  (0x1)</div><div class='del'>-#define PHY_VHT_CTRL_POS_3_BELOW  (0x2)</div><div class='del'>-#define PHY_VHT_CTRL_POS_4_BELOW  (0x3)</div><div class='del'>-#define PHY_VHT_CTRL_POS_1_ABOVE  (0x4)</div><div class='del'>-#define PHY_VHT_CTRL_POS_2_ABOVE  (0x5)</div><div class='del'>-#define PHY_VHT_CTRL_POS_3_ABOVE  (0x6)</div><div class='del'>-#define PHY_VHT_CTRL_POS_4_ABOVE  (0x7)</div><div class='add'>+#define IWL_PHY_CTRL_POS_ABOVE		0x4</div><div class='add'>+#define IWL_PHY_CTRL_POS_OFFS_EXT	0x8</div><div class='add'>+#define IWL_PHY_CTRL_POS_OFFS_MSK	0x3</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * struct iwl_fw_channel_info_v1 - channel information</div><div class='hunk'>@@ -114,10 +113,10 @@ struct iwl_phy_context_cmd_tail {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_phy_context_cmd - config of the PHY context</div><div class='add'>+ * struct iwl_phy_context_cmd_v1 - config of the PHY context</div><div class='ctx'>  * ( PHY_CONTEXT_CMD = 0x8 )</div><div class='ctx'>  * @id_and_color: ID and color of the relevant Binding</div><div class='del'>- * @action: action to perform, one of FW_CTXT_ACTION_*</div><div class='add'>+ * @action: action to perform, see &amp;enum iwl_ctxt_action</div><div class='ctx'>  * @apply_time: 0 means immediate apply and context switch.</div><div class='ctx'>  *	other value means apply new params after X usecs</div><div class='ctx'>  * @tx_param_color: ???</div><div class='hunk'>@@ -139,22 +138,40 @@ struct iwl_phy_context_cmd_v1 {</div><div class='ctx'>  * struct iwl_phy_context_cmd - config of the PHY context</div><div class='ctx'>  * ( PHY_CONTEXT_CMD = 0x8 )</div><div class='ctx'>  * @id_and_color: ID and color of the relevant Binding</div><div class='del'>- * @action: action to perform, one of FW_CTXT_ACTION_*</div><div class='add'>+ * @action: action to perform, see &amp;enum iwl_ctxt_action</div><div class='ctx'>  * @lmac_id: the lmac id the phy context belongs to</div><div class='ctx'>  * @ci: channel info</div><div class='ctx'>  * @rxchain_info: ???</div><div class='add'>+ * @sbb_bandwidth: 0 disabled, 1 - 40Mhz ... 4 - 320MHz</div><div class='add'>+ * @sbb_ctrl_channel_loc: location of the control channel</div><div class='add'>+ * @puncture_mask: bitmap of punctured subchannels</div><div class='ctx'>  * @dsp_cfg_flags: set to 0</div><div class='add'>+ * @secondary_ctrl_chnl_loc: location of secondary control channel</div><div class='ctx'>  * @reserved: reserved to align to 64 bit</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_phy_context_cmd {</div><div class='ctx'> 	/* COMMON_INDEX_HDR_API_S_VER_1 */</div><div class='ctx'> 	__le32 id_and_color;</div><div class='ctx'> 	__le32 action;</div><div class='del'>-	/* PHY_CONTEXT_DATA_API_S_VER_3 */</div><div class='add'>+	/* PHY_CONTEXT_DATA_API_S_VER_3, PHY_CONTEXT_DATA_API_S_VER_4 */</div><div class='ctx'> 	struct iwl_fw_channel_info ci;</div><div class='ctx'> 	__le32 lmac_id;</div><div class='del'>-	__le32 rxchain_info;</div><div class='add'>+	union {</div><div class='add'>+		__le32 rxchain_info; /* reserved in _VER_4 */</div><div class='add'>+		struct {             /* used for _VER_5/_VER_6 */</div><div class='add'>+			u8 sbb_bandwidth;</div><div class='add'>+			u8 sbb_ctrl_channel_loc;</div><div class='add'>+			__le16 puncture_mask; /* added in VER_6 */</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> 	__le32 dsp_cfg_flags;</div><div class='del'>-	__le32 reserved;</div><div class='del'>-} __packed; /* PHY_CONTEXT_CMD_API_VER_3 */</div><div class='add'>+	u8 secondary_ctrl_chnl_loc;</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+} __packed; /* PHY_CONTEXT_CMD_API_VER_3,</div><div class='add'>+	     * PHY_CONTEXT_CMD_API_VER_4,</div><div class='add'>+	     * PHY_CONTEXT_CMD_API_VER_5,</div><div class='add'>+	     * PHY_CONTEXT_CMD_API_VER_6,</div><div class='add'>+	     * PHY_CONTEXT_CMD_API_S_VER_7</div><div class='add'>+	     */</div><div class='add'>+</div><div class='ctx'> #endif /* __iwl_fw_api_phy_ctxt_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/phy.h b/drivers/net/wireless/intel/iwlwifi/fw/api/phy.h<br/>index d07a632f1af7..f63b25b03b7e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/phy.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/phy.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/phy.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/phy.h</a></div><div class='hunk'>@@ -1,11 +1,13 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2019-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2019-2022, 2024-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_fw_api_phy_h__</div><div class='ctx'> #define __iwl_fw_api_phy_h__</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_phy_ops_subcmd_ids - PHY group commands</div><div class='hunk'>@@ -19,7 +21,7 @@ enum iwl_phy_ops_subcmd_ids {</div><div class='ctx'> 	CMD_DTS_MEASUREMENT_TRIGGER_WIDE = 0x0,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @CTDP_CONFIG_CMD: &amp;struct iwl_mvm_ctdp_cmd</div><div class='add'>+	 * @CTDP_CONFIG_CMD: &amp;struct iwl_ctdp_cmd</div><div class='ctx'> 	 */</div><div class='ctx'> 	CTDP_CONFIG_CMD = 0x03,</div><div class='ctx'> </div><div class='hunk'>@@ -29,16 +31,25 @@ enum iwl_phy_ops_subcmd_ids {</div><div class='ctx'> 	TEMP_REPORTING_THRESHOLDS_CMD = 0x04,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @GEO_TX_POWER_LIMIT: &amp;struct iwl_geo_tx_power_profiles_cmd</div><div class='add'>+	 * @PER_CHAIN_LIMIT_OFFSET_CMD: &amp;struct iwl_geo_tx_power_profiles_cmd_v1,</div><div class='add'>+	 * &amp;struct iwl_geo_tx_power_profiles_cmd_v2,</div><div class='add'>+	 * &amp;struct iwl_geo_tx_power_profiles_cmd_v3,</div><div class='add'>+	 * &amp;struct iwl_geo_tx_power_profiles_cmd_v4 or</div><div class='add'>+	 * &amp;struct iwl_geo_tx_power_profiles_cmd_v5</div><div class='ctx'> 	 */</div><div class='del'>-	GEO_TX_POWER_LIMIT = 0x05,</div><div class='add'>+	PER_CHAIN_LIMIT_OFFSET_CMD = 0x05,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @PER_PLATFORM_ANT_GAIN_CMD: &amp;struct iwl_ppag_table_cmd</div><div class='add'>+	 * @PER_PLATFORM_ANT_GAIN_CMD: &amp;union iwl_ppag_table_cmd</div><div class='ctx'> 	 */</div><div class='ctx'> 	PER_PLATFORM_ANT_GAIN_CMD = 0x07,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @AP_TX_POWER_CONSTRAINTS_CMD: &amp;struct iwl_txpower_constraints_cmd</div><div class='add'>+	 */</div><div class='add'>+	AP_TX_POWER_CONSTRAINTS_CMD = 0x0C,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @CT_KILL_NOTIFICATION: &amp;struct ct_kill_notif</div><div class='ctx'> 	 */</div><div class='ctx'> 	CT_KILL_NOTIFICATION = 0xFE,</div><div class='hunk'>@@ -46,7 +57,7 @@ enum iwl_phy_ops_subcmd_ids {</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @DTS_MEASUREMENT_NOTIF_WIDE:</div><div class='ctx'> 	 * &amp;struct iwl_dts_measurement_notif_v1 or</div><div class='del'>-	 * &amp;struct iwl_dts_measurement_notif_v2</div><div class='add'>+	 * &amp;struct iwl_dts_measurement_notif</div><div class='ctx'> 	 */</div><div class='ctx'> 	DTS_MEASUREMENT_NOTIF_WIDE = 0xFF,</div><div class='ctx'> };</div><div class='hunk'>@@ -143,13 +154,13 @@ struct iwl_dts_measurement_notif_v1 {</div><div class='ctx'> } __packed; /* TEMPERATURE_MEASUREMENT_TRIGGER_NTFY_S_VER_1*/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_dts_measurement_notif_v2 - measurements notification</div><div class='add'>+ * struct iwl_dts_measurement_notif - measurements notification</div><div class='ctx'>  *</div><div class='ctx'>  * @temp: the measured temperature</div><div class='ctx'>  * @voltage: the measured voltage</div><div class='ctx'>  * @threshold_idx: the trip index that was crossed</div><div class='ctx'>  */</div><div class='del'>-struct iwl_dts_measurement_notif_v2 {</div><div class='add'>+struct iwl_dts_measurement_notif {</div><div class='ctx'> 	__le32 temp;</div><div class='ctx'> 	__le32 voltage;</div><div class='ctx'> 	__le32 threshold_idx;</div><div class='hunk'>@@ -166,35 +177,45 @@ struct iwl_dts_measurement_resp {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct ct_kill_notif - CT-kill entry notification</div><div class='add'>+ * This structure represent both versions of this notification.</div><div class='ctx'>  *</div><div class='ctx'>  * @temperature: the current temperature in celsius</div><div class='del'>- * @reserved: reserved</div><div class='add'>+ * @dts: only in v2: DTS that trigger the CT Kill bitmap:</div><div class='add'>+ *			bit 0: ToP master</div><div class='add'>+ *			bit 1: PA chain A master</div><div class='add'>+ *			bit 2: PA chain B master</div><div class='add'>+ *			bit 3: ToP slave</div><div class='add'>+ *			bit 4: PA chain A slave</div><div class='add'>+ *			bit 5: PA chain B slave)</div><div class='add'>+ *			bits 6,7: reserved (set to 0)</div><div class='add'>+ * @scheme: only for v2: scheme that trigger the CT Kill (0-SW, 1-HW)</div><div class='ctx'>  */</div><div class='ctx'> struct ct_kill_notif {</div><div class='ctx'> 	__le16 temperature;</div><div class='del'>-	__le16 reserved;</div><div class='del'>-} __packed; /* GRP_PHY_CT_KILL_NTF */</div><div class='add'>+	u8 dts;</div><div class='add'>+	u8 scheme;</div><div class='add'>+} __packed; /* CT_KILL_NOTIFICATION_API_S_VER_1, CT_KILL_NOTIFICATION_API_S_VER_2 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>-* enum ctdp_cmd_operation - CTDP command operations</div><div class='add'>+* enum iwl_ctdp_cmd_operation - CTDP command operations</div><div class='ctx'> * @CTDP_CMD_OPERATION_START: update the current budget</div><div class='ctx'> * @CTDP_CMD_OPERATION_STOP: stop ctdp</div><div class='ctx'> * @CTDP_CMD_OPERATION_REPORT: get the average budget</div><div class='ctx'> */</div><div class='del'>-enum iwl_mvm_ctdp_cmd_operation {</div><div class='add'>+enum iwl_ctdp_cmd_operation {</div><div class='ctx'> 	CTDP_CMD_OPERATION_START	= 0x1,</div><div class='ctx'> 	CTDP_CMD_OPERATION_STOP		= 0x2,</div><div class='ctx'> 	CTDP_CMD_OPERATION_REPORT	= 0x4,</div><div class='ctx'> };/* CTDP_CMD_OPERATION_TYPE_E */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_mvm_ctdp_cmd - track and manage the FW power consumption budget</div><div class='add'>+ * struct iwl_ctdp_cmd - track and manage the FW power consumption budget</div><div class='ctx'>  *</div><div class='del'>- * @operation: see &amp;enum iwl_mvm_ctdp_cmd_operation</div><div class='add'>+ * @operation: see &amp;enum iwl_ctdp_cmd_operation</div><div class='ctx'>  * @budget: the budget in milliwatt</div><div class='ctx'>  * @window_size: defined in API but not used</div><div class='ctx'>  */</div><div class='del'>-struct iwl_mvm_ctdp_cmd {</div><div class='add'>+struct iwl_ctdp_cmd {</div><div class='ctx'> 	__le32 operation;</div><div class='ctx'> 	__le32 budget;</div><div class='ctx'> 	__le32 window_size;</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/power.h b/drivers/net/wireless/intel/iwlwifi/fw/api/power.h<br/>index 86445385f072..535864e22626 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/power.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/power.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/power.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/power.h</a></div><div class='hunk'>@@ -1,12 +1,14 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_fw_api_power_h__</div><div class='ctx'> #define __iwl_fw_api_power_h__</div><div class='ctx'> </div><div class='add'>+#include "nvm-reg.h"</div><div class='add'>+</div><div class='ctx'> /* Power Management Commands, Responses, Notifications */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -54,7 +56,7 @@ struct iwl_ltr_config_cmd_v1 {</div><div class='ctx'>  * @flags: See &amp;enum iwl_ltr_config_flags</div><div class='ctx'>  * @static_long: static LTR Long register value.</div><div class='ctx'>  * @static_short: static LTR Short register value.</div><div class='del'>- * @ltr_cfg_values: LTR parameters table values (in usec) in folowing order:</div><div class='add'>+ * @ltr_cfg_values: LTR parameters table values (in usec) in following order:</div><div class='ctx'>  *	TX, RX, Short Idle, Long Idle. Used only if %LTR_CFG_FLAG_UPDATE_VALUES</div><div class='ctx'>  *	is set.</div><div class='ctx'>  * @ltr_short_idle_timeout: LTR Short Idle timeout (in usec). Used only if</div><div class='hunk'>@@ -89,6 +91,7 @@ struct iwl_ltr_config_cmd {</div><div class='ctx'>  * @POWER_FLAGS_LPRX_ENA_MSK: Low Power RX enable.</div><div class='ctx'>  * @POWER_FLAGS_UAPSD_MISBEHAVING_ENA_MSK: AP/GO's uAPSD misbehaving</div><div class='ctx'>  *		detection enablement</div><div class='add'>+ * @POWER_FLAGS_ENABLE_SMPS_MSK: SMPS is allowed for this vif</div><div class='ctx'> */</div><div class='ctx'> enum iwl_power_flags {</div><div class='ctx'> 	POWER_FLAGS_POWER_SAVE_ENA_MSK		= BIT(0),</div><div class='hunk'>@@ -99,6 +102,7 @@ enum iwl_power_flags {</div><div class='ctx'> 	POWER_FLAGS_ADVANCE_PM_ENA_MSK		= BIT(9),</div><div class='ctx'> 	POWER_FLAGS_LPRX_ENA_MSK		= BIT(11),</div><div class='ctx'> 	POWER_FLAGS_UAPSD_MISBEHAVING_ENA_MSK	= BIT(12),</div><div class='add'>+	POWER_FLAGS_ENABLE_SMPS_MSK		= BIT(14),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IWL_POWER_VEC_SIZE 5</div><div class='hunk'>@@ -144,6 +148,8 @@ struct iwl_powertable_cmd {</div><div class='ctx'>  *	receiver and transmitter. '0' - does not allow.</div><div class='ctx'>  * @DEVICE_POWER_FLAGS_ALLOW_MEM_RETENTION_MSK:</div><div class='ctx'>  *	Device Retention indication, '1' indicate retention is enabled.</div><div class='add'>+ * @DEVICE_POWER_FLAGS_NO_SLEEP_TILL_D3_MSK:</div><div class='add'>+ *	Prevent power save until entering d3 is completed.</div><div class='ctx'>  * @DEVICE_POWER_FLAGS_32K_CLK_VALID_MSK:</div><div class='ctx'>  *	32Khz external slow clock valid indication, '1' indicate cloack is</div><div class='ctx'>  *	valid.</div><div class='hunk'>@@ -151,6 +157,7 @@ struct iwl_powertable_cmd {</div><div class='ctx'> enum iwl_device_power_flags {</div><div class='ctx'> 	DEVICE_POWER_FLAGS_POWER_SAVE_ENA_MSK		= BIT(0),</div><div class='ctx'> 	DEVICE_POWER_FLAGS_ALLOW_MEM_RETENTION_MSK	= BIT(1),</div><div class='add'>+	DEVICE_POWER_FLAGS_NO_SLEEP_TILL_D3_MSK		= BIT(7),</div><div class='ctx'> 	DEVICE_POWER_FLAGS_32K_CLK_VALID_MSK		= BIT(12),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -162,7 +169,7 @@ enum iwl_device_power_flags {</div><div class='ctx'>  * @reserved: reserved (padding)</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_device_power_cmd {</div><div class='del'>-	/* PM_POWER_TABLE_CMD_API_S_VER_6 */</div><div class='add'>+	/* PM_POWER_TABLE_CMD_API_S_VER_7 */</div><div class='ctx'> 	__le16 flags;</div><div class='ctx'> 	__le16 reserved;</div><div class='ctx'> } __packed;</div><div class='hunk'>@@ -213,7 +220,6 @@ struct iwl_mac_power_cmd {</div><div class='ctx'> 	/* CONTEXT_DESC_API_T_VER_1 */</div><div class='ctx'> 	__le32 id_and_color;</div><div class='ctx'> </div><div class='del'>-	/* CLIENT_PM_POWER_TABLE_S_VER_1 */</div><div class='ctx'> 	__le16 flags;</div><div class='ctx'> 	__le16 keep_alive_seconds;</div><div class='ctx'> 	__le32 rx_data_timeout;</div><div class='hunk'>@@ -234,7 +240,7 @@ struct iwl_mac_power_cmd {</div><div class='ctx'> 	u8 heavy_rx_thld_percentage;</div><div class='ctx'> 	u8 limited_ps_threshold;</div><div class='ctx'> 	u8 reserved;</div><div class='del'>-} __packed;</div><div class='add'>+} __packed; /* CLIENT_PM_POWER_TABLE_S_VER_1, VER_2 */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * struct iwl_uapsd_misbehaving_ap_notif - FW sends this notification when</div><div class='hunk'>@@ -249,21 +255,8 @@ struct iwl_uapsd_misbehaving_ap_notif {</div><div class='ctx'> 	u8 reserved[3];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct iwl_reduce_tx_power_cmd - TX power reduction command</div><div class='del'>- * REDUCE_TX_POWER_CMD = 0x9f</div><div class='del'>- * @flags: (reserved for future implementation)</div><div class='del'>- * @mac_context_id: id of the mac ctx for which we are reducing TX power.</div><div class='del'>- * @pwr_restriction: TX power restriction in dBms.</div><div class='del'>- */</div><div class='del'>-struct iwl_reduce_tx_power_cmd {</div><div class='del'>-	u8 flags;</div><div class='del'>-	u8 mac_context_id;</div><div class='del'>-	__le16 pwr_restriction;</div><div class='del'>-} __packed; /* TX_REDUCED_POWER_API_S_VER_1 */</div><div class='del'>-</div><div class='ctx'> enum iwl_dev_tx_power_cmd_mode {</div><div class='del'>-	IWL_TX_POWER_MODE_SET_MAC = 0,</div><div class='add'>+	IWL_TX_POWER_MODE_SET_LINK = 0,</div><div class='ctx'> 	IWL_TX_POWER_MODE_SET_DEVICE = 1,</div><div class='ctx'> 	IWL_TX_POWER_MODE_SET_CHAINS = 2,</div><div class='ctx'> 	IWL_TX_POWER_MODE_SET_ACK = 3,</div><div class='hunk'>@@ -280,20 +273,16 @@ enum iwl_dev_tx_power_cmd_mode {</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_dev_tx_power_common - Common part of the TX power reduction cmd</div><div class='ctx'>  * @set_mode: see &amp;enum iwl_dev_tx_power_cmd_mode</div><div class='del'>- * @mac_context_id: id of the mac ctx for which we are reducing TX power.</div><div class='add'>+ * @link_id: id of the link ctx for which we are reducing TX power.</div><div class='add'>+ *	For version 9 / 10, this is the link id. For earlier versions, it is</div><div class='add'>+ *	the mac id.</div><div class='ctx'>  * @pwr_restriction: TX power restriction in 1/8 dBms.</div><div class='del'>- * @dev_24: device TX power restriction in 1/8 dBms</div><div class='del'>- * @dev_52_low: device TX power restriction upper band - low</div><div class='del'>- * @dev_52_high: device TX power restriction upper band - high</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_dev_tx_power_common {</div><div class='ctx'> 	__le32 set_mode;</div><div class='del'>-	__le32 mac_context_id;</div><div class='add'>+	__le32 link_id;</div><div class='ctx'> 	__le16 pwr_restriction;</div><div class='del'>-	__le16 dev_24;</div><div class='del'>-	__le16 dev_52_low;</div><div class='del'>-	__le16 dev_52_high;</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_dev_tx_power_cmd_v3 - TX power reduction command version 3</div><div class='hunk'>@@ -340,7 +329,7 @@ struct iwl_dev_tx_power_cmd_v5 {</div><div class='ctx'> } __packed; /* TX_REDUCED_POWER_API_S_VER_5 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_dev_tx_power_cmd_v5 - TX power reduction command version 5</div><div class='add'>+ * struct iwl_dev_tx_power_cmd_v8 - TX power reduction command version 8</div><div class='ctx'>  * @per_chain: per chain restrictions</div><div class='ctx'>  * @enable_ack_reduction: enable or disable close range ack TX power</div><div class='ctx'>  *	reduction.</div><div class='hunk'>@@ -351,36 +340,109 @@ struct iwl_dev_tx_power_cmd_v5 {</div><div class='ctx'>  * @reserved: reserved (padding)</div><div class='ctx'>  * @timer_period: timer in milliseconds. if expires FW will change to default</div><div class='ctx'>  *	BIOS values. relevant if setMode is IWL_TX_POWER_MODE_SET_SAR_TIMER</div><div class='add'>+ * @flags: reduce power flags.</div><div class='add'>+ * @tpc_vlp_backoff_level: user backoff of UNII5,7 VLP channels in USA.</div><div class='add'>+ *	Not in use.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_dev_tx_power_cmd_v6 {</div><div class='add'>+struct iwl_dev_tx_power_cmd_v8 {</div><div class='ctx'> 	__le16 per_chain[IWL_NUM_CHAIN_TABLES_V2][IWL_NUM_CHAIN_LIMITS][IWL_NUM_SUB_BANDS_V2];</div><div class='ctx'> 	u8 enable_ack_reduction;</div><div class='ctx'> 	u8 per_chain_restriction_changed;</div><div class='ctx'> 	u8 reserved[2];</div><div class='ctx'> 	__le32 timer_period;</div><div class='del'>-} __packed; /* TX_REDUCED_POWER_API_S_VER_6 */</div><div class='add'>+	__le32 flags;</div><div class='add'>+	__le32 tpc_vlp_backoff_level;</div><div class='add'>+} __packed; /* TX_REDUCED_POWER_API_S_VER_8 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * @dev_24: device TX power restriction in 1/8 dBms</div><div class='add'>+ * @dev_52_low: device TX power restriction upper band - low</div><div class='add'>+ * @dev_52_high: device TX power restriction upper band - high</div><div class='add'>+ */</div><div class='add'>+struct iwl_dev_tx_power_cmd_per_band {</div><div class='add'>+	__le16 dev_24;</div><div class='add'>+	__le16 dev_52_low;</div><div class='add'>+	__le16 dev_52_high;</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_dev_tx_power_cmd - TX power reduction command (multiversion)</div><div class='add'>+ * struct iwl_dev_tx_power_cmd_v3_v8 - TX power reduction command (multiversion)</div><div class='add'>+ * @per_band: per band restrictions</div><div class='ctx'>  * @common: common part of the command</div><div class='ctx'>  * @v3: version 3 part of the command</div><div class='ctx'>  * @v4: version 4 part of the command</div><div class='ctx'>  * @v5: version 5 part of the command</div><div class='del'>- * @v6: version 6 part of the command</div><div class='add'>+ * @v8: version 8 part of the command</div><div class='ctx'>  */</div><div class='del'>-struct iwl_dev_tx_power_cmd {</div><div class='add'>+struct iwl_dev_tx_power_cmd_v3_v8 {</div><div class='ctx'> 	struct iwl_dev_tx_power_common common;</div><div class='add'>+	struct iwl_dev_tx_power_cmd_per_band per_band;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct iwl_dev_tx_power_cmd_v3 v3;</div><div class='ctx'> 		struct iwl_dev_tx_power_cmd_v4 v4;</div><div class='ctx'> 		struct iwl_dev_tx_power_cmd_v5 v5;</div><div class='del'>-		struct iwl_dev_tx_power_cmd_v6 v6;</div><div class='add'>+		struct iwl_dev_tx_power_cmd_v8 v8;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define IWL_NUM_GEO_PROFILES   3</div><div class='del'>-#define IWL_NUM_BANDS_PER_CHAIN_V1 2</div><div class='del'>-#define IWL_NUM_BANDS_PER_CHAIN_V2 3</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_dev_tx_power_cmd_v9 - TX power reduction cmd</div><div class='add'>+ * @reserved: reserved (padding)</div><div class='add'>+ * @per_chain: per chain restrictions</div><div class='add'>+ * @per_chain_restriction_changed: is per_chain_restriction has changed</div><div class='add'>+ *	from last command. used if set_mode is</div><div class='add'>+ *	IWL_TX_POWER_MODE_SET_SAR_TIMER.</div><div class='add'>+ *	note: if not changed, the command is used for keep alive only.</div><div class='add'>+ * @reserved1: reserved (padding)</div><div class='add'>+ * @timer_period: timer in milliseconds. if expires FW will change to default</div><div class='add'>+ *	BIOS values. relevant if setMode is IWL_TX_POWER_MODE_SET_SAR_TIMER</div><div class='add'>+ */</div><div class='add'>+struct iwl_dev_tx_power_cmd_v9 {</div><div class='add'>+	__le16 reserved;</div><div class='add'>+	__le16 per_chain[IWL_NUM_CHAIN_LIMITS][IWL_NUM_SUB_BANDS_V1];</div><div class='add'>+	u8 per_chain_restriction_changed;</div><div class='add'>+	u8 reserved1[3];</div><div class='add'>+	__le32 timer_period;</div><div class='add'>+} __packed; /* TX_REDUCED_POWER_API_S_VER_9 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_dev_tx_power_cmd_v10 - TX power reduction cmd</div><div class='add'>+ * @per_chain: per chain restrictions</div><div class='add'>+ * @per_chain_restriction_changed: is per_chain_restriction has changed</div><div class='add'>+ *	from last command. used if set_mode is</div><div class='add'>+ *	IWL_TX_POWER_MODE_SET_SAR_TIMER.</div><div class='add'>+ *	note: if not changed, the command is used for keep alive only.</div><div class='add'>+ * @reserved: reserved (padding)</div><div class='add'>+ * @timer_period: timer in milliseconds. if expires FW will change to default</div><div class='add'>+ *	BIOS values. relevant if setMode is IWL_TX_POWER_MODE_SET_SAR_TIMER</div><div class='add'>+ * @flags: reduce power flags.</div><div class='add'>+ */</div><div class='add'>+struct iwl_dev_tx_power_cmd_v10 {</div><div class='add'>+	__le16 per_chain[IWL_NUM_CHAIN_TABLES_V2][IWL_NUM_CHAIN_LIMITS][IWL_NUM_SUB_BANDS_V2];</div><div class='add'>+	u8 per_chain_restriction_changed;</div><div class='add'>+	u8 reserved;</div><div class='add'>+	__le32 timer_period;</div><div class='add'>+	__le32 flags;</div><div class='add'>+} __packed; /* TX_REDUCED_POWER_API_S_VER_10 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct iwl_dev_tx_power_cmd - TX power reduction command (multiversion)</div><div class='add'>+ * @common: common part of the command</div><div class='add'>+ * @v9: version 9 part of the command</div><div class='add'>+ * @v10: version 10 part of the command</div><div class='add'>+ */</div><div class='add'>+struct iwl_dev_tx_power_cmd {</div><div class='add'>+	struct iwl_dev_tx_power_common common;</div><div class='add'>+	union {</div><div class='add'>+		struct iwl_dev_tx_power_cmd_v9 v9;</div><div class='add'>+		struct iwl_dev_tx_power_cmd_v10 v10;</div><div class='add'>+	};</div><div class='add'>+} __packed; /* TX_REDUCED_POWER_API_S_VER_9_VER10 */</div><div class='add'>+</div><div class='add'>+#define IWL_NUM_GEO_PROFILES		3</div><div class='add'>+#define IWL_NUM_GEO_PROFILES_V3		8</div><div class='add'>+#define IWL_NUM_BANDS_PER_CHAIN_V1	2</div><div class='add'>+#define IWL_NUM_BANDS_PER_CHAIN_V2	3</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_geo_per_chain_offset_operation - type of operation</div><div class='hunk'>@@ -390,10 +452,10 @@ struct iwl_dev_tx_power_cmd {</div><div class='ctx'> enum iwl_geo_per_chain_offset_operation {</div><div class='ctx'> 	IWL_PER_CHAIN_OFFSET_SET_TABLES,</div><div class='ctx'> 	IWL_PER_CHAIN_OFFSET_GET_CURRENT_TABLE,</div><div class='del'>-};  /* GEO_TX_POWER_LIMIT FLAGS TYPE */</div><div class='add'>+};  /* PER_CHAIN_OFFSET_OPERATION_E */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_per_chain_offset - embedded struct for GEO_TX_POWER_LIMIT.</div><div class='add'>+ * struct iwl_per_chain_offset - embedded struct for PER_CHAIN_LIMIT_OFFSET_CMD.</div><div class='ctx'>  * @max_tx_power: maximum allowed tx power.</div><div class='ctx'>  * @chain_a: tx power offset for chain a.</div><div class='ctx'>  * @chain_b: tx power offset for chain b.</div><div class='hunk'>@@ -405,79 +467,160 @@ struct iwl_per_chain_offset {</div><div class='ctx'> } __packed; /* PER_CHAIN_LIMIT_OFFSET_PER_CHAIN_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_geo_tx_power_profile_cmd_v1 - struct for GEO_TX_POWER_LIMIT cmd.</div><div class='add'>+ * struct iwl_geo_tx_power_profiles_cmd_v1 - struct for PER_CHAIN_LIMIT_OFFSET_CMD cmd.</div><div class='ctx'>  * @ops: operations, value from &amp;enum iwl_geo_per_chain_offset_operation</div><div class='ctx'>  * @table: offset profile per band.</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_geo_tx_power_profiles_cmd_v1 {</div><div class='ctx'> 	__le32 ops;</div><div class='ctx'> 	struct iwl_per_chain_offset table[IWL_NUM_GEO_PROFILES][IWL_NUM_BANDS_PER_CHAIN_V1];</div><div class='del'>-} __packed; /* GEO_TX_POWER_LIMIT_VER_1 */</div><div class='add'>+} __packed; /* PER_CHAIN_LIMIT_OFFSET_CMD_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_geo_tx_power_profile_cmd_v2 - struct for GEO_TX_POWER_LIMIT cmd.</div><div class='add'>+ * struct iwl_geo_tx_power_profiles_cmd_v2 - struct for PER_CHAIN_LIMIT_OFFSET_CMD cmd.</div><div class='ctx'>  * @ops: operations, value from &amp;enum iwl_geo_per_chain_offset_operation</div><div class='ctx'>  * @table: offset profile per band.</div><div class='del'>- * @table_revision: BIOS table revision.</div><div class='add'>+ * @table_revision: 0 for not-South Korea, 1 for South Korea (the name is misleading)</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_geo_tx_power_profiles_cmd_v2 {</div><div class='ctx'> 	__le32 ops;</div><div class='ctx'> 	struct iwl_per_chain_offset table[IWL_NUM_GEO_PROFILES][IWL_NUM_BANDS_PER_CHAIN_V1];</div><div class='ctx'> 	__le32 table_revision;</div><div class='del'>-} __packed; /* GEO_TX_POWER_LIMIT_VER_2 */</div><div class='add'>+} __packed; /* PER_CHAIN_LIMIT_OFFSET_CMD_VER_2 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_geo_tx_power_profile_cmd_v3 - struct for GEO_TX_POWER_LIMIT cmd.</div><div class='add'>+ * struct iwl_geo_tx_power_profiles_cmd_v3 - struct for PER_CHAIN_LIMIT_OFFSET_CMD cmd.</div><div class='ctx'>  * @ops: operations, value from &amp;enum iwl_geo_per_chain_offset_operation</div><div class='ctx'>  * @table: offset profile per band.</div><div class='del'>- * @table_revision: BIOS table revision.</div><div class='add'>+ * @table_revision: 0 for not-South Korea, 1 for South Korea (the name is misleading)</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_geo_tx_power_profiles_cmd_v3 {</div><div class='ctx'> 	__le32 ops;</div><div class='ctx'> 	struct iwl_per_chain_offset table[IWL_NUM_GEO_PROFILES][IWL_NUM_BANDS_PER_CHAIN_V2];</div><div class='ctx'> 	__le32 table_revision;</div><div class='del'>-} __packed; /* GEO_TX_POWER_LIMIT_VER_3 */</div><div class='add'>+} __packed; /* PER_CHAIN_LIMIT_OFFSET_CMD_VER_3 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_geo_tx_power_profiles_cmd_v4 - struct for PER_CHAIN_LIMIT_OFFSET_CMD cmd.</div><div class='add'>+ * @ops: operations, value from &amp;enum iwl_geo_per_chain_offset_operation</div><div class='add'>+ * @table: offset profile per band.</div><div class='add'>+ * @table_revision: 0 for not-South Korea, 1 for South Korea (the name is misleading)</div><div class='add'>+ */</div><div class='add'>+struct iwl_geo_tx_power_profiles_cmd_v4 {</div><div class='add'>+	__le32 ops;</div><div class='add'>+	struct iwl_per_chain_offset table[IWL_NUM_GEO_PROFILES_V3][IWL_NUM_BANDS_PER_CHAIN_V1];</div><div class='add'>+	__le32 table_revision;</div><div class='add'>+} __packed; /* PER_CHAIN_LIMIT_OFFSET_CMD_VER_4 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_geo_tx_power_profiles_cmd_v5 - struct for PER_CHAIN_LIMIT_OFFSET_CMD cmd.</div><div class='add'>+ * @ops: operations, value from &amp;enum iwl_geo_per_chain_offset_operation</div><div class='add'>+ * @table: offset profile per band.</div><div class='add'>+ * @table_revision: 0 for not-South Korea, 1 for South Korea (the name is misleading)</div><div class='add'>+ */</div><div class='add'>+struct iwl_geo_tx_power_profiles_cmd_v5 {</div><div class='add'>+	__le32 ops;</div><div class='add'>+	struct iwl_per_chain_offset table[IWL_NUM_GEO_PROFILES_V3][IWL_NUM_BANDS_PER_CHAIN_V2];</div><div class='add'>+	__le32 table_revision;</div><div class='add'>+} __packed; /* PER_CHAIN_LIMIT_OFFSET_CMD_VER_5 */</div><div class='ctx'> </div><div class='ctx'> union iwl_geo_tx_power_profiles_cmd {</div><div class='ctx'> 	struct iwl_geo_tx_power_profiles_cmd_v1 v1;</div><div class='ctx'> 	struct iwl_geo_tx_power_profiles_cmd_v2 v2;</div><div class='ctx'> 	struct iwl_geo_tx_power_profiles_cmd_v3 v3;</div><div class='add'>+	struct iwl_geo_tx_power_profiles_cmd_v4 v4;</div><div class='add'>+	struct iwl_geo_tx_power_profiles_cmd_v5 v5;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_geo_tx_power_profiles_resp -  response to GEO_TX_POWER_LIMIT cmd</div><div class='add'>+ * struct iwl_geo_tx_power_profiles_resp -  response to PER_CHAIN_LIMIT_OFFSET_CMD cmd</div><div class='ctx'>  * @profile_idx: current geo profile in use</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_geo_tx_power_profiles_resp {</div><div class='ctx'> 	__le32 profile_idx;</div><div class='del'>-} __packed; /* GEO_TX_POWER_LIMIT_RESP */</div><div class='add'>+} __packed; /* PER_CHAIN_LIMIT_OFFSET_RSP */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_ppag_flags - PPAG enable masks</div><div class='add'>+ * @IWL_PPAG_ETSI_MASK: enable PPAG in ETSI</div><div class='add'>+ * @IWL_PPAG_CHINA_MASK: enable PPAG in China</div><div class='add'>+ * @IWL_PPAG_ETSI_LPI_UHB_MASK: enable LPI in ETSI for UHB</div><div class='add'>+ * @IWL_PPAG_ETSI_VLP_UHB_MASK: enable VLP in ETSI for UHB</div><div class='add'>+ * @IWL_PPAG_ETSI_SP_UHB_MASK: enable SP in ETSI for UHB</div><div class='add'>+ * @IWL_PPAG_USA_LPI_UHB_MASK: enable LPI in USA for UHB</div><div class='add'>+ * @IWL_PPAG_USA_VLP_UHB_MASK: enable VLP in USA for UHB</div><div class='add'>+ * @IWL_PPAG_USA_SP_UHB_MASK: enable SP in USA for UHB</div><div class='add'>+ * @IWL_PPAG_CANADA_LPI_UHB_MASK: enable LPI in CANADA for UHB</div><div class='add'>+ * @IWL_PPAG_CANADA_VLP_UHB_MASK: enable VLP in CANADA for UHB</div><div class='add'>+ * @IWL_PPAG_CANADA_SP_UHB_MASK: enable SP in CANADA for UHB</div><div class='add'>+ */</div><div class='add'>+enum iwl_ppag_flags {</div><div class='add'>+	IWL_PPAG_ETSI_MASK = BIT(0),</div><div class='add'>+	IWL_PPAG_CHINA_MASK = BIT(1),</div><div class='add'>+	IWL_PPAG_ETSI_LPI_UHB_MASK = BIT(2),</div><div class='add'>+	IWL_PPAG_ETSI_VLP_UHB_MASK = BIT(3),</div><div class='add'>+	IWL_PPAG_ETSI_SP_UHB_MASK = BIT(4),</div><div class='add'>+	IWL_PPAG_USA_LPI_UHB_MASK = BIT(5),</div><div class='add'>+	IWL_PPAG_USA_VLP_UHB_MASK = BIT(6),</div><div class='add'>+	IWL_PPAG_USA_SP_UHB_MASK = BIT(7),</div><div class='add'>+	IWL_PPAG_CANADA_LPI_UHB_MASK = BIT(8),</div><div class='add'>+	IWL_PPAG_CANADA_VLP_UHB_MASK = BIT(9),</div><div class='add'>+	IWL_PPAG_CANADA_SP_UHB_MASK = BIT(10),</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * union iwl_ppag_table_cmd - union for all versions of PPAG command</div><div class='del'>- * @v1: version 1</div><div class='del'>- * @v2: version 2</div><div class='del'>- *</div><div class='del'>- * @flags: bit 0 - indicates enablement of PPAG for ETSI</div><div class='del'>- *         bit 1 - indicates enablement of PPAG for CHINA BIOS</div><div class='del'>- *         bit 1 can be used only in v3 (identical to v2)</div><div class='del'>- * @gain: table of antenna gain values per chain and sub-band</div><div class='del'>- * @reserved: reserved</div><div class='add'>+ * @v1: command version 1 structure.</div><div class='add'>+ * @v5: command version 5 structure.</div><div class='add'>+ * @v7: command version 7 structure.</div><div class='add'>+ * @v1.flags: values from &amp;enum iwl_ppag_flags</div><div class='add'>+ * @v1.gain: table of antenna gain values per chain and sub-band</div><div class='add'>+ * @v1.reserved: reserved</div><div class='add'>+ * @v5.flags: values from &amp;enum iwl_ppag_flags</div><div class='add'>+ * @v5.gain: table of antenna gain values per chain and sub-band</div><div class='add'>+ * @v7.ppag_config_info: see @struct bios_value_u32</div><div class='add'>+ * @v7.gain: table of antenna gain values per chain and sub-band</div><div class='add'>+ * @v7.reserved: reserved</div><div class='ctx'>  */</div><div class='ctx'> union iwl_ppag_table_cmd {</div><div class='ctx'> 	struct {</div><div class='ctx'> 		__le32 flags;</div><div class='ctx'> 		s8 gain[IWL_NUM_CHAIN_LIMITS][IWL_NUM_SUB_BANDS_V1];</div><div class='ctx'> 		s8 reserved[2];</div><div class='del'>-	} v1;</div><div class='add'>+	} __packed v1; /* PER_PLAT_ANTENNA_GAIN_CMD_API_S_VER_1 */</div><div class='ctx'> 	struct {</div><div class='ctx'> 		__le32 flags;</div><div class='ctx'> 		s8 gain[IWL_NUM_CHAIN_LIMITS][IWL_NUM_SUB_BANDS_V2];</div><div class='ctx'> 		s8 reserved[2];</div><div class='del'>-	} v2;</div><div class='add'>+	} __packed v5; /* PER_PLAT_ANTENNA_GAIN_CMD_API_S_VER_5 */</div><div class='add'>+	struct {</div><div class='add'>+		struct bios_value_u32 ppag_config_info;</div><div class='add'>+		s8 gain[IWL_NUM_CHAIN_LIMITS][IWL_NUM_SUB_BANDS_V2];</div><div class='add'>+		s8 reserved[2];</div><div class='add'>+	} __packed v7; /* PER_PLAT_ANTENNA_GAIN_CMD_API_S_VER_7 */</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+#define IWL_PPAG_CMD_V1_MASK (IWL_PPAG_ETSI_MASK | IWL_PPAG_CHINA_MASK)</div><div class='add'>+#define IWL_PPAG_CMD_V5_MASK (IWL_PPAG_CMD_V1_MASK | \</div><div class='add'>+			      IWL_PPAG_ETSI_LPI_UHB_MASK | \</div><div class='add'>+			      IWL_PPAG_USA_LPI_UHB_MASK)</div><div class='add'>+</div><div class='add'>+#define MCC_TO_SAR_OFFSET_TABLE_ROW_SIZE	26</div><div class='add'>+#define MCC_TO_SAR_OFFSET_TABLE_COL_SIZE	13</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * struct iwl_beacon_filter_cmd</div><div class='add'>+ * struct iwl_sar_offset_mapping_cmd - struct for SAR_OFFSET_MAPPING_TABLE_CMD</div><div class='add'>+ * @offset_map: mapping a mcc to a geo sar group</div><div class='add'>+ * @reserved: reserved</div><div class='add'>+ */</div><div class='add'>+struct iwl_sar_offset_mapping_cmd {</div><div class='add'>+	u8 offset_map[MCC_TO_SAR_OFFSET_TABLE_ROW_SIZE]</div><div class='add'>+		[MCC_TO_SAR_OFFSET_TABLE_COL_SIZE];</div><div class='add'>+	__le16 reserved;</div><div class='add'>+} __packed; /*SAR_OFFSET_MAPPING_TABLE_CMD_API_S*/</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_beacon_filter_cmd - beacon filter command</div><div class='ctx'>  * REPLY_BEACON_FILTERING_CMD = 0xd2 (command)</div><div class='ctx'>  * @bf_energy_delta: Used for RSSI filtering, if in 'normal' state. Send beacon</div><div class='ctx'>  *      to driver if delta in Energy values calculated for this and last</div><div class='hunk'>@@ -495,7 +638,7 @@ union iwl_ppag_table_cmd {</div><div class='ctx'>  *      Roaming Energy Delta Threshold, otherwise use normal Energy Delta</div><div class='ctx'>  *      Threshold. Typical energy threshold is -72dBm.</div><div class='ctx'>  * @bf_temp_threshold: This threshold determines the type of temperature</div><div class='del'>- *	filtering (Slow or Fast) that is selected (Units are in Celsuis):</div><div class='add'>+ *	filtering (Slow or Fast) that is selected (Units are in Celsius):</div><div class='ctx'>  *	If the current temperature is above this threshold - Fast filter</div><div class='ctx'>  *	will be used, If the current temperature is below this threshold -</div><div class='ctx'>  *	Slow filter will be used.</div><div class='hunk'>@@ -503,12 +646,12 @@ union iwl_ppag_table_cmd {</div><div class='ctx'>  *      calculated for this and the last passed beacon is greater than this</div><div class='ctx'>  *      threshold. Zero value means that the temperature change is ignored for</div><div class='ctx'>  *      beacon filtering; beacons will not be  forced to be sent to driver</div><div class='del'>- *      regardless of whether its temerature has been changed.</div><div class='add'>+ *      regardless of whether its temperature has been changed.</div><div class='ctx'>  * @bf_temp_slow_filter: Send Beacon to driver if delta in temperature values</div><div class='ctx'>  *      calculated for this and the last passed beacon is greater than this</div><div class='ctx'>  *      threshold. Zero value means that the temperature change is ignored for</div><div class='ctx'>  *      beacon filtering; beacons will not be forced to be sent to driver</div><div class='del'>- *      regardless of whether its temerature has been changed.</div><div class='add'>+ *      regardless of whether its temperature has been changed.</div><div class='ctx'>  * @bf_enable_beacon_filter: 1, beacon filtering is enabled; 0, disabled.</div><div class='ctx'>  * @bf_debug_flag: beacon filtering debug configuration</div><div class='ctx'>  * @bf_escape_timer: Send beacons to to driver if no beacons were passed</div><div class='hunk'>@@ -603,4 +746,45 @@ struct iwl_beacon_filter_cmd {</div><div class='ctx'> </div><div class='ctx'> #define IWL_BF_CMD_CONFIG_DEFAULTS IWL_BF_CMD_CONFIG(_DEFAULT)</div><div class='ctx'> #define IWL_BF_CMD_CONFIG_D0I3 IWL_BF_CMD_CONFIG(_D0I3)</div><div class='add'>+</div><div class='add'>+#define DEFAULT_TPE_TX_POWER 0x7F</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Bandwidth: 20/40/80/(160/80+80)/320</div><div class='add'>+ */</div><div class='add'>+#define IWL_MAX_TX_EIRP_PWR_MAX_SIZE 5</div><div class='add'>+#define IWL_MAX_TX_EIRP_PSD_PWR_MAX_SIZE 16</div><div class='add'>+</div><div class='add'>+enum iwl_6ghz_ap_type {</div><div class='add'>+	IWL_6GHZ_AP_TYPE_LPI,</div><div class='add'>+	IWL_6GHZ_AP_TYPE_SP,</div><div class='add'>+	IWL_6GHZ_AP_TYPE_VLP,</div><div class='add'>+}; /* PHY_AP_TYPE_API_E_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_txpower_constraints_cmd - TX power constraints command</div><div class='add'>+ * AP_TX_POWER_CONSTRAINTS_CMD</div><div class='add'>+ * Used for VLP/LPI/AFC Access Point power constraints for 6GHz channels</div><div class='add'>+ * @link_id: linkId</div><div class='add'>+ * @ap_type: see &amp;enum iwl_ap_type</div><div class='add'>+ * @eirp_pwr: 8-bit 2s complement signed integer in the range</div><div class='add'>+ *	-64 dBm to 63 dBm with a 0.5 dB step</div><div class='add'>+ *	default &amp;DEFAULT_TPE_TX_POWER (no maximum limit)</div><div class='add'>+ * @psd_pwr: 8-bit 2s complement signed integer in the range</div><div class='add'>+ *	-63.5 to +63 dBm/MHz with a 0.5 step</div><div class='add'>+ *	value - 128 indicates that the corresponding 20</div><div class='add'>+ *	MHz channel cannot be used for transmission.</div><div class='add'>+ *	value +127 indicates that no maximum PSD limit</div><div class='add'>+ *	is specified for the corresponding 20 MHz channel</div><div class='add'>+ *	default &amp;DEFAULT_TPE_TX_POWER (no maximum limit)</div><div class='add'>+ * @reserved: reserved (padding)</div><div class='add'>+ */</div><div class='add'>+struct iwl_txpower_constraints_cmd {</div><div class='add'>+	__le16 link_id;</div><div class='add'>+	__le16 ap_type;</div><div class='add'>+	__s8 eirp_pwr[IWL_MAX_TX_EIRP_PWR_MAX_SIZE];</div><div class='add'>+	__s8 psd_pwr[IWL_MAX_TX_EIRP_PSD_PWR_MAX_SIZE];</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+} __packed; /* PHY_AP_TX_POWER_CONSTRAINTS_CMD_API_S_VER_1 */</div><div class='add'>+</div><div class='ctx'> #endif /* __iwl_fw_api_power_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/rfi.h b/drivers/net/wireless/intel/iwlwifi/fw/api/rfi.h<br/>index c678b9aa9b55..34d664023473 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/rfi.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/rfi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/rfi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/rfi.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2020-2021, 2023 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_fw_api_rfi_h__</div><div class='ctx'> #define __iwl_fw_api_rfi_h__</div><div class='hunk'>@@ -25,8 +25,9 @@ struct iwl_rfi_lut_entry {</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_rfi_config_cmd - RFI configuration table</div><div class='ctx'>  *</div><div class='del'>- * @entry: a table can have 24 frequency/channel mappings</div><div class='add'>+ * @table: a table can have 24 frequency/channel mappings</div><div class='ctx'>  * @oem: specifies if this is the default table or set by OEM</div><div class='add'>+ * @reserved: (reserved/padding)</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_rfi_config_cmd {</div><div class='ctx'> 	struct iwl_rfi_lut_entry table[IWL_RFI_LUT_SIZE];</div><div class='hunk'>@@ -35,7 +36,7 @@ struct iwl_rfi_config_cmd {</div><div class='ctx'> } __packed; /* RFI_CONFIG_CMD_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * iwl_rfi_freq_table_status - status of the frequency table query</div><div class='add'>+ * enum iwl_rfi_freq_table_status - status of the frequency table query</div><div class='ctx'>  * @RFI_FREQ_TABLE_OK: can be used</div><div class='ctx'>  * @RFI_FREQ_TABLE_DVFS_NOT_READY: DVFS is not ready yet, should try later</div><div class='ctx'>  * @RFI_FREQ_TABLE_DISABLED: the feature is disabled in FW</div><div class='hunk'>@@ -57,4 +58,12 @@ struct iwl_rfi_freq_table_resp_cmd {</div><div class='ctx'> 	__le32 status;</div><div class='ctx'> } __packed; /* RFI_CONFIG_CMD_API_S_VER_1 */</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct iwl_rfi_deactivate_notif - notifcation that FW disaled RFIm</div><div class='add'>+ *</div><div class='add'>+ * @reason: used only for a log message</div><div class='add'>+ */</div><div class='add'>+struct iwl_rfi_deactivate_notif {</div><div class='add'>+	__le32 reason;</div><div class='add'>+} __packed; /* RFI_DEACTIVATE_NTF_S_VER_1 */</div><div class='ctx'> #endif /* __iwl_fw_api_rfi_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/rs.h b/drivers/net/wireless/intel/iwlwifi/fw/api/rs.h<br/>index fc2fa49e9825..9c464e7aba10 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/rs.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/rs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/rs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/rs.h</a></div><div class='hunk'>@@ -1,15 +1,17 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2022, 2024-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_fw_api_rs_h__</div><div class='ctx'> #define __iwl_fw_api_rs_h__</div><div class='del'>-</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='ctx'> #include "mac.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum iwl_tlc_mng_cfg_flags_enum - options for TLC config flags</div><div class='add'>+ * enum iwl_tlc_mng_cfg_flags - options for TLC config flags</div><div class='ctx'>  * @IWL_TLC_MNG_CFG_FLAGS_STBC_MSK: enable STBC. For HE this enables STBC for</div><div class='ctx'>  *				    bandwidths &lt;= 80MHz</div><div class='ctx'>  * @IWL_TLC_MNG_CFG_FLAGS_LDPC_MSK: enable LDPC</div><div class='hunk'>@@ -21,6 +23,9 @@</div><div class='ctx'>  * @IWL_TLC_MNG_CFG_FLAGS_HE_DCM_NSS_2_MSK: enable HE Dual Carrier Modulation</div><div class='ctx'>  *					    for BPSK (MCS 0) with 2 spatial</div><div class='ctx'>  *					    streams</div><div class='add'>+ * @IWL_TLC_MNG_CFG_FLAGS_EHT_EXTRA_LTF_MSK: enable support for EHT extra LTF</div><div class='add'>+ * @IWL_TLC_MNG_CFG_FLAGS_UHR_ELR_1_5_MBPS_MSK: support ELR 1.5 Mbps</div><div class='add'>+ * @IWL_TLC_MNG_CFG_FLAGS_UHR_ELR_3_MBPS_MSK: support ELR 3 Mbps</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_tlc_mng_cfg_flags {</div><div class='ctx'> 	IWL_TLC_MNG_CFG_FLAGS_STBC_MSK			= BIT(0),</div><div class='hunk'>@@ -28,6 +33,9 @@ enum iwl_tlc_mng_cfg_flags {</div><div class='ctx'> 	IWL_TLC_MNG_CFG_FLAGS_HE_STBC_160MHZ_MSK	= BIT(2),</div><div class='ctx'> 	IWL_TLC_MNG_CFG_FLAGS_HE_DCM_NSS_1_MSK		= BIT(3),</div><div class='ctx'> 	IWL_TLC_MNG_CFG_FLAGS_HE_DCM_NSS_2_MSK		= BIT(4),</div><div class='add'>+	IWL_TLC_MNG_CFG_FLAGS_EHT_EXTRA_LTF_MSK		= BIT(6),</div><div class='add'>+	IWL_TLC_MNG_CFG_FLAGS_UHR_ELR_1_5_MBPS_MSK	= BIT(7),</div><div class='add'>+	IWL_TLC_MNG_CFG_FLAGS_UHR_ELR_3_MBPS_MSK	= BIT(8),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -36,14 +44,14 @@ enum iwl_tlc_mng_cfg_flags {</div><div class='ctx'>  * @IWL_TLC_MNG_CH_WIDTH_40MHZ: 40MHZ channel</div><div class='ctx'>  * @IWL_TLC_MNG_CH_WIDTH_80MHZ: 80MHZ channel</div><div class='ctx'>  * @IWL_TLC_MNG_CH_WIDTH_160MHZ: 160MHZ channel</div><div class='del'>- * @IWL_TLC_MNG_CH_WIDTH_LAST: maximum value</div><div class='add'>+ * @IWL_TLC_MNG_CH_WIDTH_320MHZ: 320MHZ channel</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_tlc_mng_cfg_cw {</div><div class='ctx'> 	IWL_TLC_MNG_CH_WIDTH_20MHZ,</div><div class='ctx'> 	IWL_TLC_MNG_CH_WIDTH_40MHZ,</div><div class='ctx'> 	IWL_TLC_MNG_CH_WIDTH_80MHZ,</div><div class='ctx'> 	IWL_TLC_MNG_CH_WIDTH_160MHZ,</div><div class='del'>-	IWL_TLC_MNG_CH_WIDTH_LAST = IWL_TLC_MNG_CH_WIDTH_160MHZ,</div><div class='add'>+	IWL_TLC_MNG_CH_WIDTH_320MHZ,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -64,8 +72,7 @@ enum iwl_tlc_mng_cfg_chains {</div><div class='ctx'>  * @IWL_TLC_MNG_MODE_HT: enable HT</div><div class='ctx'>  * @IWL_TLC_MNG_MODE_VHT: enable VHT</div><div class='ctx'>  * @IWL_TLC_MNG_MODE_HE: enable HE</div><div class='del'>- * @IWL_TLC_MNG_MODE_INVALID: invalid value</div><div class='del'>- * @IWL_TLC_MNG_MODE_NUM: a count of possible modes</div><div class='add'>+ * @IWL_TLC_MNG_MODE_EHT: enable EHT</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_tlc_mng_cfg_mode {</div><div class='ctx'> 	IWL_TLC_MNG_MODE_CCK = 0,</div><div class='hunk'>@@ -74,8 +81,7 @@ enum iwl_tlc_mng_cfg_mode {</div><div class='ctx'> 	IWL_TLC_MNG_MODE_HT,</div><div class='ctx'> 	IWL_TLC_MNG_MODE_VHT,</div><div class='ctx'> 	IWL_TLC_MNG_MODE_HE,</div><div class='del'>-	IWL_TLC_MNG_MODE_INVALID,</div><div class='del'>-	IWL_TLC_MNG_MODE_NUM = IWL_TLC_MNG_MODE_INVALID,</div><div class='add'>+	IWL_TLC_MNG_MODE_EHT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -116,13 +122,24 @@ enum IWL_TLC_MNG_NSS {</div><div class='ctx'> 	IWL_TLC_NSS_MAX</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum IWL_TLC_HT_BW_RATES {</div><div class='del'>-	IWL_TLC_HT_BW_NONE_160,</div><div class='del'>-	IWL_TLC_HT_BW_160,</div><div class='add'>+/**</div><div class='add'>+ * enum IWL_TLC_MCS_PER_BW - mcs index per BW</div><div class='add'>+ * @IWL_TLC_MCS_PER_BW_80: mcs for bw - 20Hhz, 40Hhz, 80Hhz</div><div class='add'>+ * @IWL_TLC_MCS_PER_BW_160: mcs for bw - 160Mhz</div><div class='add'>+ * @IWL_TLC_MCS_PER_BW_320: mcs for bw - 320Mhz</div><div class='add'>+ * @IWL_TLC_MCS_PER_BW_NUM_V3: number of entries up to version 3</div><div class='add'>+ * @IWL_TLC_MCS_PER_BW_NUM_V4: number of entries from version 4</div><div class='add'>+ */</div><div class='add'>+enum IWL_TLC_MCS_PER_BW {</div><div class='add'>+	IWL_TLC_MCS_PER_BW_80,</div><div class='add'>+	IWL_TLC_MCS_PER_BW_160,</div><div class='add'>+	IWL_TLC_MCS_PER_BW_320,</div><div class='add'>+	IWL_TLC_MCS_PER_BW_NUM_V3 = IWL_TLC_MCS_PER_BW_160 + 1,</div><div class='add'>+	IWL_TLC_MCS_PER_BW_NUM_V4 = IWL_TLC_MCS_PER_BW_320 + 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct tlc_config_cmd - TLC configuration</div><div class='add'>+ * struct iwl_tlc_config_cmd_v3 - TLC configuration</div><div class='ctx'>  * @sta_id: station id</div><div class='ctx'>  * @reserved1: reserved</div><div class='ctx'>  * @max_ch_width: max supported channel width from @enum iwl_tlc_mng_cfg_cw</div><div class='hunk'>@@ -131,8 +148,8 @@ enum IWL_TLC_HT_BW_RATES {</div><div class='ctx'>  * @amsdu: TX amsdu is supported</div><div class='ctx'>  * @flags: bitmask of &amp;enum iwl_tlc_mng_cfg_flags</div><div class='ctx'>  * @non_ht_rates: bitmap of supported legacy rates</div><div class='del'>- * @ht_rates: bitmap of &amp;enum iwl_tlc_mng_ht_rates, per &lt;nss, channel-width&gt;</div><div class='del'>- *	      pair (0 - 80mhz width and below, 1 - 160mhz).</div><div class='add'>+ * @ht_rates: bitmap of &amp;enum iwl_tlc_mng_ht_rates, per &amp;enum IWL_TLC_MCS_PER_BW</div><div class='add'>+ *	      &lt;nss, channel-width&gt; pair (0 - 80mhz width and below, 1 - 160mhz).</div><div class='ctx'>  * @max_mpdu_len: max MPDU length, in bytes</div><div class='ctx'>  * @sgi_ch_width_supp: bitmap of SGI support per channel width</div><div class='ctx'>  *		       use BIT(@enum iwl_tlc_mng_cfg_cw)</div><div class='hunk'>@@ -140,7 +157,7 @@ enum IWL_TLC_HT_BW_RATES {</div><div class='ctx'>  * @max_tx_op: max TXOP in uSecs for all AC (BK, BE, VO, VI),</div><div class='ctx'>  *	       set zero for no limit.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_tlc_config_cmd {</div><div class='add'>+struct iwl_tlc_config_cmd_v3 {</div><div class='ctx'> 	u8 sta_id;</div><div class='ctx'> 	u8 reserved1[3];</div><div class='ctx'> 	u8 max_ch_width;</div><div class='hunk'>@@ -149,7 +166,7 @@ struct iwl_tlc_config_cmd {</div><div class='ctx'> 	u8 amsdu;</div><div class='ctx'> 	__le16 flags;</div><div class='ctx'> 	__le16 non_ht_rates;</div><div class='del'>-	__le16 ht_rates[IWL_TLC_NSS_MAX][2];</div><div class='add'>+	__le16 ht_rates[IWL_TLC_NSS_MAX][IWL_TLC_MCS_PER_BW_NUM_V3];</div><div class='ctx'> 	__le16 max_mpdu_len;</div><div class='ctx'> 	u8 sgi_ch_width_supp;</div><div class='ctx'> 	u8 reserved2;</div><div class='hunk'>@@ -157,6 +174,68 @@ struct iwl_tlc_config_cmd {</div><div class='ctx'> } __packed; /* TLC_MNG_CONFIG_CMD_API_S_VER_3 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct iwl_tlc_config_cmd_v4 - TLC configuration</div><div class='add'>+ * @sta_id: station id</div><div class='add'>+ * @reserved1: reserved</div><div class='add'>+ * @max_ch_width: max supported channel width from &amp;enum iwl_tlc_mng_cfg_cw</div><div class='add'>+ * @mode: &amp;enum iwl_tlc_mng_cfg_mode</div><div class='add'>+ * @chains: bitmask of &amp;enum iwl_tlc_mng_cfg_chains</div><div class='add'>+ * @sgi_ch_width_supp: bitmap of SGI support per channel width</div><div class='add'>+ *		       use BIT(&amp;enum iwl_tlc_mng_cfg_cw)</div><div class='add'>+ * @flags: bitmask of &amp;enum iwl_tlc_mng_cfg_flags</div><div class='add'>+ * @non_ht_rates: bitmap of supported legacy rates</div><div class='add'>+ * @ht_rates: bitmap of &amp;enum iwl_tlc_mng_ht_rates, per &lt;nss, channel-width&gt;</div><div class='add'>+ *	      pair (0 - 80mhz width and below, 1 - 160mhz, 2 - 320mhz).</div><div class='add'>+ * @max_mpdu_len: max MPDU length, in bytes</div><div class='add'>+ * @max_tx_op: max TXOP in uSecs for all AC (BK, BE, VO, VI),</div><div class='add'>+ *	       set zero for no limit.</div><div class='add'>+ */</div><div class='add'>+struct iwl_tlc_config_cmd_v4 {</div><div class='add'>+	u8 sta_id;</div><div class='add'>+	u8 reserved1[3];</div><div class='add'>+	u8 max_ch_width;</div><div class='add'>+	u8 mode;</div><div class='add'>+	u8 chains;</div><div class='add'>+	u8 sgi_ch_width_supp;</div><div class='add'>+	__le16 flags;</div><div class='add'>+	__le16 non_ht_rates;</div><div class='add'>+	__le16 ht_rates[IWL_TLC_NSS_MAX][IWL_TLC_MCS_PER_BW_NUM_V4];</div><div class='add'>+	__le16 max_mpdu_len;</div><div class='add'>+	__le16 max_tx_op;</div><div class='add'>+} __packed; /* TLC_MNG_CONFIG_CMD_API_S_VER_4 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_tlc_config_cmd - TLC configuration</div><div class='add'>+ * @sta_id: station id</div><div class='add'>+ * @reserved1: reserved</div><div class='add'>+ * @max_ch_width: max supported channel width from &amp;enum iwl_tlc_mng_cfg_cw</div><div class='add'>+ * @mode: &amp;enum iwl_tlc_mng_cfg_mode</div><div class='add'>+ * @chains: bitmask of &amp;enum iwl_tlc_mng_cfg_chains</div><div class='add'>+ * @sgi_ch_width_supp: bitmap of SGI support per channel width</div><div class='add'>+ *		       use BIT(&amp;enum iwl_tlc_mng_cfg_cw)</div><div class='add'>+ * @flags: bitmask of &amp;enum iwl_tlc_mng_cfg_flags</div><div class='add'>+ * @non_ht_rates: bitmap of supported legacy rates</div><div class='add'>+ * @ht_rates: bitmap of &amp;enum iwl_tlc_mng_ht_rates, per &lt;nss, channel-width&gt;</div><div class='add'>+ *	      pair (0 - 80mhz width and below, 1 - 160mhz, 2 - 320mhz).</div><div class='add'>+ * @max_mpdu_len: max MPDU length, in bytes</div><div class='add'>+ * @max_tx_op: max TXOP in uSecs for all AC (BK, BE, VO, VI),</div><div class='add'>+ *	       set zero for no limit.</div><div class='add'>+ */</div><div class='add'>+struct iwl_tlc_config_cmd {</div><div class='add'>+	u8 sta_id;</div><div class='add'>+	u8 reserved1[3];</div><div class='add'>+	u8 max_ch_width;</div><div class='add'>+	u8 mode;</div><div class='add'>+	u8 chains;</div><div class='add'>+	u8 sgi_ch_width_supp;</div><div class='add'>+	__le16 flags;</div><div class='add'>+	__le16 non_ht_rates;</div><div class='add'>+	__le32 ht_rates[IWL_TLC_NSS_MAX][IWL_TLC_MCS_PER_BW_NUM_V4];</div><div class='add'>+	__le16 max_mpdu_len;</div><div class='add'>+	__le16 max_tx_op;</div><div class='add'>+} __packed; /* TLC_MNG_CONFIG_CMD_API_S_VER_5 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * enum iwl_tlc_update_flags - updated fields</div><div class='ctx'>  * @IWL_TLC_NOTIF_FLAG_RATE: last initial rate update</div><div class='ctx'>  * @IWL_TLC_NOTIF_FLAG_AMSDU: umsdu parameters update</div><div class='hunk'>@@ -171,7 +250,8 @@ enum iwl_tlc_update_flags {</div><div class='ctx'>  * @sta_id: station id</div><div class='ctx'>  * @reserved: reserved</div><div class='ctx'>  * @flags: bitmap of notifications reported</div><div class='del'>- * @rate: current initial rate</div><div class='add'>+ * @rate: current initial rate, format depends on the notification</div><div class='add'>+ *	version</div><div class='ctx'>  * @amsdu_size: Max AMSDU size, in bytes</div><div class='ctx'>  * @amsdu_enabled: bitmap for per-TID AMSDU enablement</div><div class='ctx'>  */</div><div class='hunk'>@@ -182,7 +262,67 @@ struct iwl_tlc_update_notif {</div><div class='ctx'> 	__le32 rate;</div><div class='ctx'> 	__le32 amsdu_size;</div><div class='ctx'> 	__le32 amsdu_enabled;</div><div class='del'>-} __packed; /* TLC_MNG_UPDATE_NTFY_API_S_VER_2 */</div><div class='add'>+} __packed; /* TLC_MNG_UPDATE_NTFY_API_S_VER_2, _VER_3, _VER_4 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_tlc_debug_types - debug options</div><div class='add'>+ */</div><div class='add'>+enum iwl_tlc_debug_types {</div><div class='add'>+	/**</div><div class='add'>+	 *  @IWL_TLC_DEBUG_FIXED_RATE: set fixed rate for rate scaling</div><div class='add'>+	 */</div><div class='add'>+	IWL_TLC_DEBUG_FIXED_RATE,</div><div class='add'>+	/**</div><div class='add'>+	 * @IWL_TLC_DEBUG_AGG_DURATION_LIM: time limit for a BA</div><div class='add'>+	 * session, in usec</div><div class='add'>+	 */</div><div class='add'>+	IWL_TLC_DEBUG_AGG_DURATION_LIM,</div><div class='add'>+	/**</div><div class='add'>+	 * @IWL_TLC_DEBUG_AGG_FRAME_CNT_LIM: set max number of frames</div><div class='add'>+	 * in an aggregation</div><div class='add'>+	 */</div><div class='add'>+	IWL_TLC_DEBUG_AGG_FRAME_CNT_LIM,</div><div class='add'>+	/**</div><div class='add'>+	 * @IWL_TLC_DEBUG_TPC_ENABLED: enable or disable tpc</div><div class='add'>+	 */</div><div class='add'>+	IWL_TLC_DEBUG_TPC_ENABLED,</div><div class='add'>+	/**</div><div class='add'>+	 * @IWL_TLC_DEBUG_TPC_STATS: get number of frames Tx'ed in each</div><div class='add'>+	 * tpc step</div><div class='add'>+	 */</div><div class='add'>+	IWL_TLC_DEBUG_TPC_STATS,</div><div class='add'>+	/**</div><div class='add'>+	 * @IWL_TLC_DEBUG_RTS_DISABLE: disable RTS (bool true/false).</div><div class='add'>+	 */</div><div class='add'>+	IWL_TLC_DEBUG_RTS_DISABLE,</div><div class='add'>+	/**</div><div class='add'>+	 * @IWL_TLC_DEBUG_PARTIAL_FIXED_RATE: set partial fixed rate to fw</div><div class='add'>+	 */</div><div class='add'>+	IWL_TLC_DEBUG_PARTIAL_FIXED_RATE,</div><div class='add'>+}; /* TLC_MNG_DEBUG_TYPES_API_E */</div><div class='add'>+</div><div class='add'>+#define MAX_DATA_IN_DHC_TLC_CMD 10</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_dhc_tlc_cmd - fixed debug config</div><div class='add'>+ * @sta_id: bit 0 - enable/disable, bits 1 - 7 hold station id</div><div class='add'>+ * @reserved1: reserved</div><div class='add'>+ * @type: type id of %enum iwl_tlc_debug_types</div><div class='add'>+ * @data: data to send</div><div class='add'>+ */</div><div class='add'>+struct iwl_dhc_tlc_cmd {</div><div class='add'>+	u8 sta_id;</div><div class='add'>+	u8 reserved1[3];</div><div class='add'>+	__le32 type;</div><div class='add'>+	__le32 data[MAX_DATA_IN_DHC_TLC_CMD];</div><div class='add'>+} __packed; /* TLC_MNG_DEBUG_CMD_S */</div><div class='add'>+</div><div class='add'>+#define IWL_MAX_MCS_DISPLAY_SIZE        12</div><div class='add'>+</div><div class='add'>+struct iwl_rate_mcs_info {</div><div class='add'>+	char    mbps[IWL_MAX_MCS_DISPLAY_SIZE];</div><div class='add'>+	char    mcs[IWL_MAX_MCS_DISPLAY_SIZE];</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * These serve as indexes into</div><div class='hunk'>@@ -226,6 +366,8 @@ enum {</div><div class='ctx'> 	IWL_LAST_HE_RATE = IWL_RATE_MCS_11_INDEX,</div><div class='ctx'> 	IWL_RATE_COUNT_LEGACY = IWL_LAST_NON_HT_RATE + 1,</div><div class='ctx'> 	IWL_RATE_COUNT = IWL_LAST_HE_RATE + 1,</div><div class='add'>+	IWL_RATE_INVM_INDEX = IWL_RATE_COUNT,</div><div class='add'>+	IWL_RATE_INVALID = IWL_RATE_COUNT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IWL_RATE_BIT_MSK(r) BIT(IWL_RATE_##r##M_INDEX)</div><div class='hunk'>@@ -248,7 +390,7 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * rate_n_flags bit fields</div><div class='add'>+ * rate_n_flags bit fields version 1</div><div class='ctx'>  *</div><div class='ctx'>  * The 32-bit value has different layouts in the low 8 bites depending on the</div><div class='ctx'>  * format. There are three formats, HT, VHT and legacy (11abg, with subformats</div><div class='hunk'>@@ -266,15 +408,15 @@ enum {</div><div class='ctx'> </div><div class='ctx'> /* Bit 8: (1) HT format, (0) legacy or VHT format */</div><div class='ctx'> #define RATE_MCS_HT_POS 8</div><div class='del'>-#define RATE_MCS_HT_MSK (1 &lt;&lt; RATE_MCS_HT_POS)</div><div class='add'>+#define RATE_MCS_HT_MSK_V1 BIT(RATE_MCS_HT_POS)</div><div class='ctx'> </div><div class='ctx'> /* Bit 9: (1) CCK, (0) OFDM.  HT (bit 8) must be "0" for this bit to be valid */</div><div class='del'>-#define RATE_MCS_CCK_POS 9</div><div class='del'>-#define RATE_MCS_CCK_MSK (1 &lt;&lt; RATE_MCS_CCK_POS)</div><div class='add'>+#define RATE_MCS_CCK_POS_V1 9</div><div class='add'>+#define RATE_MCS_CCK_MSK_V1 BIT(RATE_MCS_CCK_POS_V1)</div><div class='ctx'> </div><div class='ctx'> /* Bit 26: (1) VHT format, (0) legacy format in bits 8:0 */</div><div class='del'>-#define RATE_MCS_VHT_POS 26</div><div class='del'>-#define RATE_MCS_VHT_MSK (1 &lt;&lt; RATE_MCS_VHT_POS)</div><div class='add'>+#define RATE_MCS_VHT_POS_V1 26</div><div class='add'>+#define RATE_MCS_VHT_MSK_V1 BIT(RATE_MCS_VHT_POS_V1)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -300,15 +442,16 @@ enum {</div><div class='ctx'>  * streams and 16-23 have three streams. We could also support MCS 32</div><div class='ctx'>  * which is the duplicate 20 MHz MCS (bit 5 set, all others zero.)</div><div class='ctx'>  */</div><div class='del'>-#define RATE_HT_MCS_RATE_CODE_MSK	0x7</div><div class='del'>-#define RATE_HT_MCS_NSS_POS             3</div><div class='del'>-#define RATE_HT_MCS_NSS_MSK             (3 &lt;&lt; RATE_HT_MCS_NSS_POS)</div><div class='add'>+#define RATE_HT_MCS_RATE_CODE_MSK_V1	0x7</div><div class='add'>+#define RATE_HT_MCS_NSS_POS_V1          3</div><div class='add'>+#define RATE_HT_MCS_NSS_MSK_V1          (3 &lt;&lt; RATE_HT_MCS_NSS_POS_V1)</div><div class='add'>+#define RATE_HT_MCS_MIMO2_MSK		BIT(RATE_HT_MCS_NSS_POS_V1)</div><div class='ctx'> </div><div class='ctx'> /* Bit 10: (1) Use Green Field preamble */</div><div class='ctx'> #define RATE_HT_MCS_GF_POS		10</div><div class='ctx'> #define RATE_HT_MCS_GF_MSK		(1 &lt;&lt; RATE_HT_MCS_GF_POS)</div><div class='ctx'> </div><div class='del'>-#define RATE_HT_MCS_INDEX_MSK		0x3f</div><div class='add'>+#define RATE_HT_MCS_INDEX_MSK_V1	0x3f</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Very High-throughput (VHT) rate format for bits 7:0</div><div class='hunk'>@@ -322,8 +465,7 @@ enum {</div><div class='ctx'> </div><div class='ctx'> /* Bit 4-5: (0) SISO, (1) MIMO2 (2) MIMO3 */</div><div class='ctx'> #define RATE_VHT_MCS_RATE_CODE_MSK	0xf</div><div class='del'>-#define RATE_VHT_MCS_NSS_POS		4</div><div class='del'>-#define RATE_VHT_MCS_NSS_MSK		(3 &lt;&lt; RATE_VHT_MCS_NSS_POS)</div><div class='add'>+#define RATE_VHT_MCS_NSS_MSK		0x30</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Legacy OFDM rate format for bits 7:0</div><div class='hunk'>@@ -347,37 +489,30 @@ enum {</div><div class='ctx'>  *        110)  11 Mbps</div><div class='ctx'>  * (bit 7 is 0)</div><div class='ctx'>  */</div><div class='del'>-#define RATE_LEGACY_RATE_MSK 0xff</div><div class='add'>+#define RATE_LEGACY_RATE_MSK_V1 0xff</div><div class='ctx'> </div><div class='ctx'> /* Bit 10 - OFDM HE */</div><div class='del'>-#define RATE_MCS_HE_POS		10</div><div class='del'>-#define RATE_MCS_HE_MSK		BIT(RATE_MCS_HE_POS)</div><div class='add'>+#define RATE_MCS_HE_POS_V1	10</div><div class='add'>+#define RATE_MCS_HE_MSK_V1	BIT(RATE_MCS_HE_POS_V1)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Bit 11-12: (0) 20MHz, (1) 40MHz, (2) 80MHz, (3) 160MHz</div><div class='ctx'>  * 0 and 1 are valid for HT and VHT, 2 and 3 only for VHT</div><div class='ctx'>  */</div><div class='ctx'> #define RATE_MCS_CHAN_WIDTH_POS		11</div><div class='del'>-#define RATE_MCS_CHAN_WIDTH_MSK		(3 &lt;&lt; RATE_MCS_CHAN_WIDTH_POS)</div><div class='del'>-#define RATE_MCS_CHAN_WIDTH_20		(0 &lt;&lt; RATE_MCS_CHAN_WIDTH_POS)</div><div class='del'>-#define RATE_MCS_CHAN_WIDTH_40		(1 &lt;&lt; RATE_MCS_CHAN_WIDTH_POS)</div><div class='del'>-#define RATE_MCS_CHAN_WIDTH_80		(2 &lt;&lt; RATE_MCS_CHAN_WIDTH_POS)</div><div class='del'>-#define RATE_MCS_CHAN_WIDTH_160		(3 &lt;&lt; RATE_MCS_CHAN_WIDTH_POS)</div><div class='add'>+#define RATE_MCS_CHAN_WIDTH_MSK_V1	(3 &lt;&lt; RATE_MCS_CHAN_WIDTH_POS)</div><div class='ctx'> </div><div class='ctx'> /* Bit 13: (1) Short guard interval (0.4 usec), (0) normal GI (0.8 usec) */</div><div class='del'>-#define RATE_MCS_SGI_POS		13</div><div class='del'>-#define RATE_MCS_SGI_MSK		(1 &lt;&lt; RATE_MCS_SGI_POS)</div><div class='add'>+#define RATE_MCS_SGI_POS_V1		13</div><div class='add'>+#define RATE_MCS_SGI_MSK_V1		BIT(RATE_MCS_SGI_POS_V1)</div><div class='ctx'> </div><div class='ctx'> /* Bit 14-16: Antenna selection (1) Ant A, (2) Ant B, (4) Ant C */</div><div class='ctx'> #define RATE_MCS_ANT_POS		14</div><div class='ctx'> #define RATE_MCS_ANT_A_MSK		(1 &lt;&lt; RATE_MCS_ANT_POS)</div><div class='ctx'> #define RATE_MCS_ANT_B_MSK		(2 &lt;&lt; RATE_MCS_ANT_POS)</div><div class='del'>-#define RATE_MCS_ANT_C_MSK		(4 &lt;&lt; RATE_MCS_ANT_POS)</div><div class='ctx'> #define RATE_MCS_ANT_AB_MSK		(RATE_MCS_ANT_A_MSK | \</div><div class='ctx'> 					 RATE_MCS_ANT_B_MSK)</div><div class='del'>-#define RATE_MCS_ANT_ABC_MSK		(RATE_MCS_ANT_AB_MSK | \</div><div class='del'>-					 RATE_MCS_ANT_C_MSK)</div><div class='del'>-#define RATE_MCS_ANT_MSK		RATE_MCS_ANT_ABC_MSK</div><div class='add'>+#define RATE_MCS_ANT_MSK		RATE_MCS_ANT_AB_MSK</div><div class='ctx'> </div><div class='ctx'> /* Bit 17: (0) SS, (1) SS*2 */</div><div class='ctx'> #define RATE_MCS_STBC_POS		17</div><div class='hunk'>@@ -404,34 +539,39 @@ enum {</div><div class='ctx'>  *	1			2xLTF+0.8us</div><div class='ctx'>  *	2			2xLTF+1.6us</div><div class='ctx'>  *	3			4xLTF+3.2us</div><div class='del'>- * HE TRIG:</div><div class='add'>+ * HE-EHT TRIG:</div><div class='ctx'>  *	0			1xLTF+1.6us</div><div class='ctx'>  *	1			2xLTF+1.6us</div><div class='ctx'>  *	2			4xLTF+3.2us</div><div class='ctx'>  *	3			(does not occur)</div><div class='add'>+ * EHT MU:</div><div class='add'>+ *	0			2xLTF+0.8us</div><div class='add'>+ *	1			2xLTF+1.6us</div><div class='add'>+ *	2			4xLTF+0.8us</div><div class='add'>+ *	3			4xLTF+3.2us</div><div class='ctx'>  */</div><div class='ctx'> #define RATE_MCS_HE_GI_LTF_POS		20</div><div class='del'>-#define RATE_MCS_HE_GI_LTF_MSK		(3 &lt;&lt; RATE_MCS_HE_GI_LTF_POS)</div><div class='add'>+#define RATE_MCS_HE_GI_LTF_MSK_V1		(3 &lt;&lt; RATE_MCS_HE_GI_LTF_POS)</div><div class='ctx'> </div><div class='ctx'> /* Bit 22-23: HE type. (0) SU, (1) SU_EXT, (2) MU, (3) trigger based */</div><div class='del'>-#define RATE_MCS_HE_TYPE_POS		22</div><div class='del'>-#define RATE_MCS_HE_TYPE_SU		(0 &lt;&lt; RATE_MCS_HE_TYPE_POS)</div><div class='del'>-#define RATE_MCS_HE_TYPE_EXT_SU		(1 &lt;&lt; RATE_MCS_HE_TYPE_POS)</div><div class='del'>-#define RATE_MCS_HE_TYPE_MU		(2 &lt;&lt; RATE_MCS_HE_TYPE_POS)</div><div class='del'>-#define RATE_MCS_HE_TYPE_TRIG		(3 &lt;&lt; RATE_MCS_HE_TYPE_POS)</div><div class='del'>-#define RATE_MCS_HE_TYPE_MSK		(3 &lt;&lt; RATE_MCS_HE_TYPE_POS)</div><div class='add'>+#define RATE_MCS_HE_TYPE_POS_V1		22</div><div class='add'>+#define RATE_MCS_HE_TYPE_SU_V1		(0 &lt;&lt; RATE_MCS_HE_TYPE_POS_V1)</div><div class='add'>+#define RATE_MCS_HE_TYPE_EXT_SU_V1		BIT(RATE_MCS_HE_TYPE_POS_V1)</div><div class='add'>+#define RATE_MCS_HE_TYPE_MU_V1		(2 &lt;&lt; RATE_MCS_HE_TYPE_POS_V1)</div><div class='add'>+#define RATE_MCS_HE_TYPE_TRIG_V1	(3 &lt;&lt; RATE_MCS_HE_TYPE_POS_V1)</div><div class='add'>+#define RATE_MCS_HE_TYPE_MSK_V1		(3 &lt;&lt; RATE_MCS_HE_TYPE_POS_V1)</div><div class='ctx'> </div><div class='ctx'> /* Bit 24-25: (0) 20MHz (no dup), (1) 2x20MHz, (2) 4x20MHz, 3 8x20MHz */</div><div class='del'>-#define RATE_MCS_DUP_POS		24</div><div class='del'>-#define RATE_MCS_DUP_MSK		(3 &lt;&lt; RATE_MCS_DUP_POS)</div><div class='add'>+#define RATE_MCS_DUP_POS_V1		24</div><div class='add'>+#define RATE_MCS_DUP_MSK_V1		(3 &lt;&lt; RATE_MCS_DUP_POS_V1)</div><div class='ctx'> </div><div class='ctx'> /* Bit 27: (1) LDPC enabled, (0) LDPC disabled */</div><div class='del'>-#define RATE_MCS_LDPC_POS		27</div><div class='del'>-#define RATE_MCS_LDPC_MSK		(1 &lt;&lt; RATE_MCS_LDPC_POS)</div><div class='add'>+#define RATE_MCS_LDPC_POS_V1		27</div><div class='add'>+#define RATE_MCS_LDPC_MSK_V1		BIT(RATE_MCS_LDPC_POS_V1)</div><div class='ctx'> </div><div class='ctx'> /* Bit 28: (1) 106-tone RX (8 MHz RU), (0) normal bandwidth */</div><div class='del'>-#define RATE_MCS_HE_106T_POS		28</div><div class='del'>-#define RATE_MCS_HE_106T_MSK		(1 &lt;&lt; RATE_MCS_HE_106T_POS)</div><div class='add'>+#define RATE_MCS_HE_106T_POS_V1		28</div><div class='add'>+#define RATE_MCS_HE_106T_MSK_V1		BIT(RATE_MCS_HE_106T_POS_V1)</div><div class='ctx'> </div><div class='ctx'> /* Bit 30-31: (1) RTS, (2) CTS */</div><div class='ctx'> #define RATE_MCS_RTS_REQUIRED_POS  (30)</div><div class='hunk'>@@ -440,6 +580,163 @@ enum {</div><div class='ctx'> #define RATE_MCS_CTS_REQUIRED_POS  (31)</div><div class='ctx'> #define RATE_MCS_CTS_REQUIRED_MSK  (0x1 &lt;&lt; RATE_MCS_CTS_REQUIRED_POS)</div><div class='ctx'> </div><div class='add'>+/* rate_n_flags bit field version 2 and 3</div><div class='add'>+ *</div><div class='add'>+ * The 32-bit value has different layouts in the low 8 bits depending on the</div><div class='add'>+ * format. There are three formats, HT, VHT and legacy (11abg, with subformats</div><div class='add'>+ * for CCK and OFDM).</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Bits 10-8: rate format</div><div class='add'>+ * (0) Legacy CCK (1) Legacy OFDM (2) High-throughput (HT)</div><div class='add'>+ * (3) Very High-throughput (VHT) (4) High-efficiency (HE)</div><div class='add'>+ * (5) Extremely High-throughput (EHT)</div><div class='add'>+ * (6) Ultra High Reliability (UHR) (v3 rate format only)</div><div class='add'>+ */</div><div class='add'>+#define RATE_MCS_MOD_TYPE_POS		8</div><div class='add'>+#define RATE_MCS_MOD_TYPE_MSK		(0x7 &lt;&lt; RATE_MCS_MOD_TYPE_POS)</div><div class='add'>+#define RATE_MCS_MOD_TYPE_CCK		(0 &lt;&lt; RATE_MCS_MOD_TYPE_POS)</div><div class='add'>+#define RATE_MCS_MOD_TYPE_LEGACY_OFDM	(1 &lt;&lt; RATE_MCS_MOD_TYPE_POS)</div><div class='add'>+#define RATE_MCS_MOD_TYPE_HT		(2 &lt;&lt; RATE_MCS_MOD_TYPE_POS)</div><div class='add'>+#define RATE_MCS_MOD_TYPE_VHT		(3 &lt;&lt; RATE_MCS_MOD_TYPE_POS)</div><div class='add'>+#define RATE_MCS_MOD_TYPE_HE		(4 &lt;&lt; RATE_MCS_MOD_TYPE_POS)</div><div class='add'>+#define RATE_MCS_MOD_TYPE_EHT		(5 &lt;&lt; RATE_MCS_MOD_TYPE_POS)</div><div class='add'>+#define RATE_MCS_MOD_TYPE_UHR		(6 &lt;&lt; RATE_MCS_MOD_TYPE_POS)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Legacy CCK rate format for bits 0:3:</div><div class='add'>+ *</div><div class='add'>+ * (0) 1 Mbps</div><div class='add'>+ * (1) 2 Mbps</div><div class='add'>+ * (2) 5.5 Mbps</div><div class='add'>+ * (3) 11 Mbps</div><div class='add'>+ *</div><div class='add'>+ * Legacy OFDM rate format for bis 3:0:</div><div class='add'>+ *</div><div class='add'>+ * (0) 6 Mbps</div><div class='add'>+ * (1) 9 Mbps</div><div class='add'>+ * (2) 12 Mbps</div><div class='add'>+ * (3) 18 Mbps</div><div class='add'>+ * (4) 24 Mbps</div><div class='add'>+ * (5) 36 Mbps</div><div class='add'>+ * (6) 48 Mbps</div><div class='add'>+ * (7) 54 Mbps</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#define RATE_LEGACY_RATE_MSK		0x7</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * HT, VHT, HE, EHT, UHR rate format</div><div class='add'>+ * Version 2: (not applicable for UHR)</div><div class='add'>+ *   3-0: MCS</div><div class='add'>+ *   4: NSS==2 indicator</div><div class='add'>+ * Version 3:</div><div class='add'>+ *   4-0: MCS</div><div class='add'>+ *   5: NSS==2 indicator</div><div class='add'>+ */</div><div class='add'>+#define RATE_HT_MCS_CODE_MSK		0x7</div><div class='add'>+#define RATE_MCS_NSS_MSK_V2		0x10</div><div class='add'>+#define RATE_MCS_NSS_MSK		0x20</div><div class='add'>+#define RATE_MCS_CODE_MSK		0x1f</div><div class='add'>+#define RATE_HT_MCS_INDEX(r)		((((r) &amp; RATE_MCS_NSS_MSK) &gt;&gt; 2) | \</div><div class='add'>+					 ((r) &amp; RATE_HT_MCS_CODE_MSK))</div><div class='add'>+</div><div class='add'>+/* Bits 7-5: reserved */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Bits 13-11: (0) 20MHz, (1) 40MHz, (2) 80MHz, (3) 160MHz, (4) 320MHz</div><div class='add'>+ */</div><div class='add'>+#define RATE_MCS_CHAN_WIDTH_MSK		(0x7 &lt;&lt; RATE_MCS_CHAN_WIDTH_POS)</div><div class='add'>+#define RATE_MCS_CHAN_WIDTH_20_VAL	0</div><div class='add'>+#define RATE_MCS_CHAN_WIDTH_20		(RATE_MCS_CHAN_WIDTH_20_VAL &lt;&lt; RATE_MCS_CHAN_WIDTH_POS)</div><div class='add'>+#define RATE_MCS_CHAN_WIDTH_40_VAL	1</div><div class='add'>+#define RATE_MCS_CHAN_WIDTH_40		(RATE_MCS_CHAN_WIDTH_40_VAL &lt;&lt; RATE_MCS_CHAN_WIDTH_POS)</div><div class='add'>+#define RATE_MCS_CHAN_WIDTH_80_VAL	2</div><div class='add'>+#define RATE_MCS_CHAN_WIDTH_80		(RATE_MCS_CHAN_WIDTH_80_VAL &lt;&lt; RATE_MCS_CHAN_WIDTH_POS)</div><div class='add'>+#define RATE_MCS_CHAN_WIDTH_160_VAL	3</div><div class='add'>+#define RATE_MCS_CHAN_WIDTH_160		(RATE_MCS_CHAN_WIDTH_160_VAL &lt;&lt; RATE_MCS_CHAN_WIDTH_POS)</div><div class='add'>+#define RATE_MCS_CHAN_WIDTH_320_VAL	4</div><div class='add'>+#define RATE_MCS_CHAN_WIDTH_320		(RATE_MCS_CHAN_WIDTH_320_VAL &lt;&lt; RATE_MCS_CHAN_WIDTH_POS)</div><div class='add'>+</div><div class='add'>+/* Bit 15-14: Antenna selection:</div><div class='add'>+ * Bit 14: Ant A active</div><div class='add'>+ * Bit 15: Ant B active</div><div class='add'>+ *</div><div class='add'>+ * All relevant definitions are same as in v1</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Bit 16 (1) LDPC enables, (0) LDPC disabled */</div><div class='add'>+#define RATE_MCS_LDPC_POS	16</div><div class='add'>+#define RATE_MCS_LDPC_MSK	(1 &lt;&lt; RATE_MCS_LDPC_POS)</div><div class='add'>+</div><div class='add'>+/* Bit 17: (0) SS, (1) SS*2 (same as v1) */</div><div class='add'>+</div><div class='add'>+/* Bit 18: OFDM-HE dual carrier mode (same as v1) */</div><div class='add'>+</div><div class='add'>+/* Bit 19: (0) Beamforming is off, (1) Beamforming is on (same as v1) */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Bit 22-20: HE LTF type and guard interval</div><div class='add'>+ * CCK:</div><div class='add'>+ *	0			long preamble</div><div class='add'>+ *	1			short preamble</div><div class='add'>+ * HT/VHT:</div><div class='add'>+ *	0			0.8us</div><div class='add'>+ *	1			0.4us</div><div class='add'>+ * HE (ext) SU:</div><div class='add'>+ *	0			1xLTF+0.8us</div><div class='add'>+ *	1			2xLTF+0.8us</div><div class='add'>+ *	2			2xLTF+1.6us</div><div class='add'>+ *	3			4xLTF+3.2us</div><div class='add'>+ *	4			4xLTF+0.8us</div><div class='add'>+ * HE MU:</div><div class='add'>+ *	0			4xLTF+0.8us</div><div class='add'>+ *	1			2xLTF+0.8us</div><div class='add'>+ *	2			2xLTF+1.6us</div><div class='add'>+ *	3			4xLTF+3.2us</div><div class='add'>+ * HE TRIG:</div><div class='add'>+ *	0			1xLTF+1.6us</div><div class='add'>+ *	1			2xLTF+1.6us</div><div class='add'>+ *	2			4xLTF+3.2us</div><div class='add'>+ * */</div><div class='add'>+#define RATE_MCS_HE_GI_LTF_MSK		(0x7 &lt;&lt; RATE_MCS_HE_GI_LTF_POS)</div><div class='add'>+#define RATE_MCS_SGI_POS		RATE_MCS_HE_GI_LTF_POS</div><div class='add'>+#define RATE_MCS_SGI_MSK		(1 &lt;&lt; RATE_MCS_SGI_POS)</div><div class='add'>+#define RATE_MCS_HE_SU_4_LTF		3</div><div class='add'>+#define RATE_MCS_HE_SU_4_LTF_08_GI	4</div><div class='add'>+</div><div class='add'>+/* Bit 24-23: HE type. (0) SU, (1) SU_EXT, (2) MU, (3) trigger based */</div><div class='add'>+#define RATE_MCS_HE_TYPE_POS		23</div><div class='add'>+#define RATE_MCS_HE_TYPE_SU		(0 &lt;&lt; RATE_MCS_HE_TYPE_POS)</div><div class='add'>+#define RATE_MCS_HE_TYPE_EXT_SU		(1 &lt;&lt; RATE_MCS_HE_TYPE_POS)</div><div class='add'>+#define RATE_MCS_HE_TYPE_MU		(2 &lt;&lt; RATE_MCS_HE_TYPE_POS)</div><div class='add'>+#define RATE_MCS_HE_TYPE_TRIG		(3 &lt;&lt; RATE_MCS_HE_TYPE_POS)</div><div class='add'>+#define RATE_MCS_HE_TYPE_MSK		(3 &lt;&lt; RATE_MCS_HE_TYPE_POS)</div><div class='add'>+</div><div class='add'>+/* Bit 25: duplicate channel enabled</div><div class='add'>+ *</div><div class='add'>+ * if this bit is set, duplicate is according to BW (bits 11-13):</div><div class='add'>+ *</div><div class='add'>+ * CCK:  2x 20MHz</div><div class='add'>+ * OFDM Legacy: N x 20Mhz, (N = BW \ 2 , either 2, 4, 8, 16)</div><div class='add'>+ * EHT: 2 x BW/2, (80 - 2x40, 160 - 2x80, 320 - 2x160)</div><div class='add'>+ * */</div><div class='add'>+#define RATE_MCS_DUP_POS		25</div><div class='add'>+#define RATE_MCS_DUP_MSK		(1 &lt;&lt; RATE_MCS_DUP_POS)</div><div class='add'>+</div><div class='add'>+/* Bit 26: (1) 106-tone RX (8 MHz RU), (0) normal bandwidth */</div><div class='add'>+#define RATE_MCS_HE_106T_POS		26</div><div class='add'>+#define RATE_MCS_HE_106T_MSK		(1 &lt;&lt; RATE_MCS_HE_106T_POS)</div><div class='add'>+</div><div class='add'>+/* Bit 27: EHT extra LTF:</div><div class='add'>+ * instead of 1 LTF for SISO use 2 LTFs,</div><div class='add'>+ * instead of 2 LTFs for NSTS=2 use 4 LTFs*/</div><div class='add'>+#define RATE_MCS_EHT_EXTRA_LTF_POS	27</div><div class='add'>+#define RATE_MCS_EHT_EXTRA_LTF_MSK	(1 &lt;&lt; RATE_MCS_EHT_EXTRA_LTF_POS)</div><div class='add'>+</div><div class='add'>+/* Bit 31-28: reserved */</div><div class='add'>+</div><div class='ctx'> /* Link Quality definitions */</div><div class='ctx'> </div><div class='ctx'> /* # entries in rate scale table to support Tx retries */</div><div class='hunk'>@@ -557,4 +854,39 @@ struct iwl_lq_cmd {</div><div class='ctx'> 	__le32 ss_params;</div><div class='ctx'> }; /* LINK_QUALITY_CMD_API_S_VER_1 */</div><div class='ctx'> </div><div class='add'>+u8 iwl_fw_rate_idx_to_plcp(int idx);</div><div class='add'>+const struct iwl_rate_mcs_info *iwl_rate_mcs(int idx);</div><div class='add'>+const char *iwl_rs_pretty_ant(u8 ant);</div><div class='add'>+const char *iwl_rs_pretty_bw(int bw);</div><div class='add'>+int rs_pretty_print_rate(char *buf, int bufsz, const u32 rate);</div><div class='add'>+bool iwl_he_is_sgi(u32 rate_n_flags);</div><div class='add'>+</div><div class='add'>+static inline u32 iwl_v3_rate_from_v2_v3(__le32 rate, bool fw_v3)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (fw_v3)</div><div class='add'>+		return le32_to_cpu(rate);</div><div class='add'>+</div><div class='add'>+	val = le32_to_cpu(rate) &amp; ~RATE_MCS_NSS_MSK_V2;</div><div class='add'>+	val |= u32_encode_bits(le32_get_bits(rate, RATE_MCS_NSS_MSK_V2),</div><div class='add'>+			       RATE_MCS_NSS_MSK);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __le32 iwl_v3_rate_to_v2_v3(u32 rate, bool fw_v3)</div><div class='add'>+{</div><div class='add'>+	__le32 val;</div><div class='add'>+</div><div class='add'>+	if (fw_v3)</div><div class='add'>+		return cpu_to_le32(rate);</div><div class='add'>+</div><div class='add'>+	val = cpu_to_le32(rate &amp; ~RATE_MCS_NSS_MSK);</div><div class='add'>+	val |= le32_encode_bits(u32_get_bits(rate, RATE_MCS_NSS_MSK),</div><div class='add'>+				RATE_MCS_NSS_MSK_V2);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* __iwl_fw_api_rs_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h b/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h<br/>index 3f13b572915a..3ed7e0807b90 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/rx.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/rx.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> #define IWL_RX_INFO_ENERGY_ANT_ABC_IDX 1</div><div class='ctx'> #define IWL_RX_INFO_ENERGY_ANT_A_MSK 0x000000ff</div><div class='ctx'> #define IWL_RX_INFO_ENERGY_ANT_B_MSK 0x0000ff00</div><div class='del'>-#define IWL_RX_INFO_ENERGY_ANT_C_MSK 0x00ff0000</div><div class='ctx'> #define IWL_RX_INFO_ENERGY_ANT_A_POS 0</div><div class='ctx'> #define IWL_RX_INFO_ENERGY_ANT_B_POS 8</div><div class='ctx'> #define IWL_RX_INFO_ENERGY_ANT_C_POS 16</div><div class='hunk'>@@ -126,14 +125,12 @@ enum iwl_rx_phy_flags {</div><div class='ctx'>  * @RX_MPDU_RES_STATUS_OVERRUN_OK: there was no RXE overflow</div><div class='ctx'>  * @RX_MPDU_RES_STATUS_SRC_STA_FOUND: station was found</div><div class='ctx'>  * @RX_MPDU_RES_STATUS_KEY_VALID: key was valid</div><div class='del'>- * @RX_MPDU_RES_STATUS_KEY_PARAM_OK: key parameters were usable</div><div class='ctx'>  * @RX_MPDU_RES_STATUS_ICV_OK: ICV is fine, if not, the packet is destroyed</div><div class='ctx'>  * @RX_MPDU_RES_STATUS_MIC_OK: used for CCM alg only. TKIP MIC is checked</div><div class='ctx'>  *	in the driver.</div><div class='ctx'>  * @RX_MPDU_RES_STATUS_TTAK_OK: TTAK is fine</div><div class='ctx'>  * @RX_MPDU_RES_STATUS_MNG_FRAME_REPLAY_ERR:  valid for alg = CCM_CMAC or</div><div class='del'>- *	alg = CCM only. Checks replay attack for 11w frames. Relevant only if</div><div class='del'>- *	%RX_MPDU_RES_STATUS_ROBUST_MNG_FRAME is set.</div><div class='add'>+ *	alg = CCM only. Checks replay attack for 11w frames.</div><div class='ctx'>  * @RX_MPDU_RES_STATUS_SEC_NO_ENC: this frame is not encrypted</div><div class='ctx'>  * @RX_MPDU_RES_STATUS_SEC_WEP_ENC: this frame is encrypted using WEP</div><div class='ctx'>  * @RX_MPDU_RES_STATUS_SEC_CCM_ENC: this frame is encrypted using CCM</div><div class='hunk'>@@ -145,9 +142,6 @@ enum iwl_rx_phy_flags {</div><div class='ctx'>  * @RX_MPDU_RES_STATUS_SEC_ENC_ERR: this frame couldn't be decrypted</div><div class='ctx'>  * @RX_MPDU_RES_STATUS_SEC_ENC_MSK: bitmask of the encryption algorithm</div><div class='ctx'>  * @RX_MPDU_RES_STATUS_DEC_DONE: this frame has been successfully decrypted</div><div class='del'>- * @RX_MPDU_RES_STATUS_EXT_IV_BIT_CMP: extended IV (set with TKIP)</div><div class='del'>- * @RX_MPDU_RES_STATUS_KEY_ID_CMP_BIT: key ID comparison done</div><div class='del'>- * @RX_MPDU_RES_STATUS_ROBUST_MNG_FRAME: this frame is an 11w management frame</div><div class='ctx'>  * @RX_MPDU_RES_STATUS_CSUM_DONE: checksum was done by the hw</div><div class='ctx'>  * @RX_MPDU_RES_STATUS_CSUM_OK: checksum found no errors</div><div class='ctx'>  * @RX_MPDU_RES_STATUS_STA_ID_MSK: station ID mask</div><div class='hunk'>@@ -158,7 +152,6 @@ enum iwl_mvm_rx_status {</div><div class='ctx'> 	RX_MPDU_RES_STATUS_OVERRUN_OK			= BIT(1),</div><div class='ctx'> 	RX_MPDU_RES_STATUS_SRC_STA_FOUND		= BIT(2),</div><div class='ctx'> 	RX_MPDU_RES_STATUS_KEY_VALID			= BIT(3),</div><div class='del'>-	RX_MPDU_RES_STATUS_KEY_PARAM_OK			= BIT(4),</div><div class='ctx'> 	RX_MPDU_RES_STATUS_ICV_OK			= BIT(5),</div><div class='ctx'> 	RX_MPDU_RES_STATUS_MIC_OK			= BIT(6),</div><div class='ctx'> 	RX_MPDU_RES_STATUS_TTAK_OK			= BIT(7),</div><div class='hunk'>@@ -172,9 +165,6 @@ enum iwl_mvm_rx_status {</div><div class='ctx'> 	RX_MPDU_RES_STATUS_SEC_ENC_ERR			= (7 &lt;&lt; 8),</div><div class='ctx'> 	RX_MPDU_RES_STATUS_SEC_ENC_MSK			= (7 &lt;&lt; 8),</div><div class='ctx'> 	RX_MPDU_RES_STATUS_DEC_DONE			= BIT(11),</div><div class='del'>-	RX_MPDU_RES_STATUS_EXT_IV_BIT_CMP		= BIT(13),</div><div class='del'>-	RX_MPDU_RES_STATUS_KEY_ID_CMP_BIT		= BIT(14),</div><div class='del'>-	RX_MPDU_RES_STATUS_ROBUST_MNG_FRAME		= BIT(15),</div><div class='ctx'> 	RX_MPDU_RES_STATUS_CSUM_DONE			= BIT(16),</div><div class='ctx'> 	RX_MPDU_RES_STATUS_CSUM_OK			= BIT(17),</div><div class='ctx'> 	RX_MDPU_RES_STATUS_STA_ID_SHIFT			= 24,</div><div class='hunk'>@@ -203,10 +193,13 @@ enum iwl_rx_mpdu_amsdu_info {</div><div class='ctx'> 	IWL_RX_MPDU_AMSDU_LAST_SUBFRAME		= 0x80,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define RX_MPDU_BAND_POS 6</div><div class='del'>-#define RX_MPDU_BAND_MASK 0xC0</div><div class='del'>-#define BAND_IN_RX_STATUS(_val) \</div><div class='del'>-	(((_val) &amp; RX_MPDU_BAND_MASK) &gt;&gt; RX_MPDU_BAND_POS)</div><div class='add'>+enum iwl_rx_mpdu_mac_phy_band {</div><div class='add'>+	/* whether or not this is MAC or LINK depends on the API */</div><div class='add'>+	IWL_RX_MPDU_MAC_PHY_BAND_MAC_MASK	= 0x0f,</div><div class='add'>+	IWL_RX_MPDU_MAC_PHY_BAND_LINK_MASK	= 0x0f,</div><div class='add'>+	IWL_RX_MPDU_MAC_PHY_BAND_PHY_MASK	= 0x30,</div><div class='add'>+	IWL_RX_MPDU_MAC_PHY_BAND_BAND_MASK	= 0xc0,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> enum iwl_rx_l3_proto_values {</div><div class='ctx'> 	IWL_RX_L3_TYPE_NONE,</div><div class='hunk'>@@ -236,7 +229,6 @@ enum iwl_rx_mpdu_status {</div><div class='ctx'> 	IWL_RX_MPDU_STATUS_OVERRUN_OK		= BIT(1),</div><div class='ctx'> 	IWL_RX_MPDU_STATUS_SRC_STA_FOUND	= BIT(2),</div><div class='ctx'> 	IWL_RX_MPDU_STATUS_KEY_VALID		= BIT(3),</div><div class='del'>-	IWL_RX_MPDU_STATUS_KEY_PARAM_OK		= BIT(4),</div><div class='ctx'> 	IWL_RX_MPDU_STATUS_ICV_OK		= BIT(5),</div><div class='ctx'> 	IWL_RX_MPDU_STATUS_MIC_OK		= BIT(6),</div><div class='ctx'> 	IWL_RX_MPDU_RES_STATUS_TTAK_OK		= BIT(7),</div><div class='hunk'>@@ -251,12 +243,8 @@ enum iwl_rx_mpdu_status {</div><div class='ctx'> 	IWL_RX_MPDU_STATUS_SEC_EXT_ENC		= 0x4 &lt;&lt; 8,</div><div class='ctx'> 	IWL_RX_MPDU_STATUS_SEC_GCM		= 0x5 &lt;&lt; 8,</div><div class='ctx'> 	IWL_RX_MPDU_STATUS_DECRYPTED		= BIT(11),</div><div class='del'>-	IWL_RX_MPDU_STATUS_WEP_MATCH		= BIT(12),</div><div class='del'>-	IWL_RX_MPDU_STATUS_EXT_IV_MATCH		= BIT(13),</div><div class='del'>-	IWL_RX_MPDU_STATUS_KEY_ID_MATCH		= BIT(14),</div><div class='ctx'> 	IWL_RX_MPDU_STATUS_ROBUST_MNG_FRAME	= BIT(15),</div><div class='ctx'> </div><div class='del'>-	IWL_RX_MPDU_STATUS_KEY			= 0x3f0000,</div><div class='ctx'> 	IWL_RX_MPDU_STATUS_DUPLICATE		= BIT(22),</div><div class='ctx'> </div><div class='ctx'> 	IWL_RX_MPDU_STATUS_STA_ID		= 0x1f000000,</div><div class='hunk'>@@ -274,6 +262,7 @@ enum iwl_rx_mpdu_reorder_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum iwl_rx_mpdu_phy_info {</div><div class='add'>+	IWL_RX_MPDU_PHY_EOF_INDICATION	= BIT(0),</div><div class='ctx'> 	IWL_RX_MPDU_PHY_AMPDU		= BIT(5),</div><div class='ctx'> 	IWL_RX_MPDU_PHY_AMPDU_TOGGLE	= BIT(6),</div><div class='ctx'> 	IWL_RX_MPDU_PHY_SHORT_PREAMBLE	= BIT(7),</div><div class='hunk'>@@ -288,7 +277,7 @@ enum iwl_rx_mpdu_mac_info {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* TSF overload low dword */</div><div class='del'>-enum iwl_rx_phy_data0 {</div><div class='add'>+enum iwl_rx_phy_he_data0 {</div><div class='ctx'> 	/* info type: HE any */</div><div class='ctx'> 	IWL_RX_PHY_DATA0_HE_BEAM_CHNG				= 0x00000001,</div><div class='ctx'> 	IWL_RX_PHY_DATA0_HE_UPLINK				= 0x00000002,</div><div class='hunk'>@@ -304,6 +293,25 @@ enum iwl_rx_phy_data0 {</div><div class='ctx'> 	IWL_RX_PHY_DATA0_HE_DELIM_EOF				= 0x80000000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* TSF overload low dword */</div><div class='add'>+enum iwl_rx_phy_eht_data0 {</div><div class='add'>+	/* info type: EHT any */</div><div class='add'>+	IWL_RX_PHY_DATA0_EHT_VALIDATE				= BIT(0),</div><div class='add'>+	IWL_RX_PHY_DATA0_EHT_UPLINK				= BIT(1),</div><div class='add'>+	IWL_RX_PHY_DATA0_EHT_BSS_COLOR_MASK			= 0x000000fc,</div><div class='add'>+	IWL_RX_PHY_DATA0_ETH_SPATIAL_REUSE_MASK			= 0x00000f00,</div><div class='add'>+	IWL_RX_PHY_DATA0_EHT_PS160				= BIT(12),</div><div class='add'>+	IWL_RX_PHY_DATA0_EHT_TXOP_DUR_MASK			= 0x000fe000,</div><div class='add'>+	IWL_RX_PHY_DATA0_EHT_LDPC_EXT_SYM			= BIT(20),</div><div class='add'>+	IWL_RX_PHY_DATA0_EHT_PRE_FEC_PAD_MASK			= 0x00600000,</div><div class='add'>+	IWL_RX_PHY_DATA0_EHT_PE_DISAMBIG			= BIT(23),</div><div class='add'>+	IWL_RX_PHY_DATA0_EHT_BW320_SLOT				= BIT(24),</div><div class='add'>+	IWL_RX_PHY_DATA0_EHT_SIGA_CRC_OK			= BIT(25),</div><div class='add'>+	IWL_RX_PHY_DATA0_EHT_PHY_VER				= 0x1c000000,</div><div class='add'>+	/* 2 bits reserved */</div><div class='add'>+	IWL_RX_PHY_DATA0_EHT_DELIM_EOF				= BIT(31),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum iwl_rx_phy_info_type {</div><div class='ctx'> 	IWL_RX_PHY_INFO_TYPE_NONE				= 0,</div><div class='ctx'> 	IWL_RX_PHY_INFO_TYPE_CCK				= 1,</div><div class='hunk'>@@ -316,19 +324,26 @@ enum iwl_rx_phy_info_type {</div><div class='ctx'> 	IWL_RX_PHY_INFO_TYPE_HE_TB				= 8,</div><div class='ctx'> 	IWL_RX_PHY_INFO_TYPE_HE_MU_EXT				= 9,</div><div class='ctx'> 	IWL_RX_PHY_INFO_TYPE_HE_TB_EXT				= 10,</div><div class='add'>+	IWL_RX_PHY_INFO_TYPE_EHT_MU				= 11,</div><div class='add'>+	IWL_RX_PHY_INFO_TYPE_EHT_TB				= 12,</div><div class='add'>+	IWL_RX_PHY_INFO_TYPE_EHT_MU_EXT				= 13,</div><div class='add'>+	IWL_RX_PHY_INFO_TYPE_EHT_TB_EXT				= 14,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* TSF overload high dword */</div><div class='del'>-enum iwl_rx_phy_data1 {</div><div class='add'>+enum iwl_rx_phy_common_data1 {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * check this first - if TSF overload is set,</div><div class='ctx'> 	 * see &amp;enum iwl_rx_phy_info_type</div><div class='ctx'> 	 */</div><div class='ctx'> 	IWL_RX_PHY_DATA1_INFO_TYPE_MASK				= 0xf0000000,</div><div class='ctx'> </div><div class='del'>-	/* info type: HT/VHT/HE any */</div><div class='add'>+	/* info type: HT/VHT/HE/EHT any */</div><div class='ctx'> 	IWL_RX_PHY_DATA1_LSIG_LEN_MASK				= 0x0fff0000,</div><div class='add'>+};</div><div class='ctx'> </div><div class='add'>+/* TSF overload high dword For HE rates*/</div><div class='add'>+enum iwl_rx_phy_he_data1 {</div><div class='ctx'> 	/* info type: HE MU/MU-EXT */</div><div class='ctx'> 	IWL_RX_PHY_DATA1_HE_MU_SIGB_COMPRESSION			= 0x00000001,</div><div class='ctx'> 	IWL_RX_PHY_DATA1_HE_MU_SIBG_SYM_OR_USER_NUM_MASK	= 0x0000001e,</div><div class='hunk'>@@ -344,8 +359,24 @@ enum iwl_rx_phy_data1 {</div><div class='ctx'> 	IWL_RX_PHY_DATA1_HE_TB_LOW_SS_MASK			= 0x0000000e,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* goes into Metadata DW 7 */</div><div class='del'>-enum iwl_rx_phy_data2 {</div><div class='add'>+/* TSF overload high dword For EHT-MU/TB rates*/</div><div class='add'>+enum iwl_rx_phy_eht_data1 {</div><div class='add'>+	/* info type: EHT-MU */</div><div class='add'>+	IWL_RX_PHY_DATA1_EHT_MU_NUM_SIG_SYM_USIGA2	= 0x0000001f,</div><div class='add'>+	/* info type: EHT-TB */</div><div class='add'>+	IWL_RX_PHY_DATA1_EHT_TB_PILOT_TYPE		= BIT(0),</div><div class='add'>+	IWL_RX_PHY_DATA1_EHT_TB_LOW_SS			= 0x0000001e,</div><div class='add'>+</div><div class='add'>+	/* info type: EHT any */</div><div class='add'>+	/* number of EHT-LTF symbols 0 - 1 EHT-LTF, 1 - 2 EHT-LTFs, 2 - 4 EHT-LTFs,</div><div class='add'>+	 * 3 - 6 EHT-LTFs, 4 - 8 EHT-LTFs */</div><div class='add'>+	IWL_RX_PHY_DATA1_EHT_SIG_LTF_NUM		= 0x000000e0,</div><div class='add'>+	IWL_RX_PHY_DATA1_EHT_RU_ALLOC_B0		= 0x00000100,</div><div class='add'>+	IWL_RX_PHY_DATA1_EHT_RU_ALLOC_B1_B7		= 0x0000fe00,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* goes into Metadata DW 7 (Qu) or 8 (So or higher) */</div><div class='add'>+enum iwl_rx_phy_he_data2 {</div><div class='ctx'> 	/* info type: HE MU-EXT */</div><div class='ctx'> 	/* the a1/a2/... is what the PHY/firmware calls the values */</div><div class='ctx'> 	IWL_RX_PHY_DATA2_HE_MU_EXT_CH1_RU0		= 0x000000ff, /* a1 */</div><div class='hunk'>@@ -360,8 +391,8 @@ enum iwl_rx_phy_data2 {</div><div class='ctx'> 	IWL_RX_PHY_DATA2_HE_TB_EXT_SPTL_REUSE4		= 0x0000f000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* goes into Metadata DW 8 */</div><div class='del'>-enum iwl_rx_phy_data3 {</div><div class='add'>+/* goes into Metadata DW 8 (Qu) or 7 (So or higher) */</div><div class='add'>+enum iwl_rx_phy_he_data3 {</div><div class='ctx'> 	/* info type: HE MU-EXT */</div><div class='ctx'> 	IWL_RX_PHY_DATA3_HE_MU_EXT_CH1_RU1		= 0x000000ff, /* c1 */</div><div class='ctx'> 	IWL_RX_PHY_DATA3_HE_MU_EXT_CH1_RU3		= 0x0000ff00, /* c2 */</div><div class='hunk'>@@ -370,7 +401,7 @@ enum iwl_rx_phy_data3 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* goes into Metadata DW 4 high 16 bits */</div><div class='del'>-enum iwl_rx_phy_data4 {</div><div class='add'>+enum iwl_rx_phy_he_he_data4 {</div><div class='ctx'> 	/* info type: HE MU-EXT */</div><div class='ctx'> 	IWL_RX_PHY_DATA4_HE_MU_EXT_CH1_CTR_RU			= 0x0001,</div><div class='ctx'> 	IWL_RX_PHY_DATA4_HE_MU_EXT_CH2_CTR_RU			= 0x0002,</div><div class='hunk'>@@ -381,6 +412,48 @@ enum iwl_rx_phy_data4 {</div><div class='ctx'> 	IWL_RX_PHY_DATA4_HE_MU_EXT_PREAMBLE_PUNC_TYPE_MASK	= 0x0600,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* goes into Metadata DW 8 (Qu has no EHT) */</div><div class='add'>+enum iwl_rx_phy_eht_data2 {</div><div class='add'>+	/* info type: EHT-MU-EXT */</div><div class='add'>+	IWL_RX_PHY_DATA2_EHT_MU_EXT_RU_ALLOC_A1	= 0x000001ff,</div><div class='add'>+	IWL_RX_PHY_DATA2_EHT_MU_EXT_RU_ALLOC_A2	= 0x0003fe00,</div><div class='add'>+	IWL_RX_PHY_DATA2_EHT_MU_EXT_RU_ALLOC_B1	= 0x07fc0000,</div><div class='add'>+</div><div class='add'>+	/* info type: EHT-TB-EXT */</div><div class='add'>+	IWL_RX_PHY_DATA2_EHT_TB_EXT_TRIG_SIGA1	= 0xffffffff,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* goes into Metadata DW 7 (Qu has no EHT) */</div><div class='add'>+enum iwl_rx_phy_eht_data3 {</div><div class='add'>+	/* note: low 8 bits cannot be used */</div><div class='add'>+	/* info type: EHT-MU-EXT */</div><div class='add'>+	IWL_RX_PHY_DATA3_EHT_MU_EXT_RU_ALLOC_C1	= 0x0003fe00,</div><div class='add'>+	IWL_RX_PHY_DATA3_EHT_MU_EXT_RU_ALLOC_C2	= 0x07fc0000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* goes into Metadata DW 4 */</div><div class='add'>+enum iwl_rx_phy_eht_data4 {</div><div class='add'>+	/* info type: EHT-MU-EXT */</div><div class='add'>+	IWL_RX_PHY_DATA4_EHT_MU_EXT_RU_ALLOC_D1	= 0x000001ff,</div><div class='add'>+	IWL_RX_PHY_DATA4_EHT_MU_EXT_RU_ALLOC_D2	= 0x0003fe00,</div><div class='add'>+	IWL_RX_PHY_DATA4_EHT_MU_EXT_SIGB_MCS	= 0x000c0000,</div><div class='add'>+	IWL_RX_PHY_DATA4_EHT_MU_EXT_RU_ALLOC_B2	= 0x1ff00000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* goes into Metadata DW 16 */</div><div class='add'>+enum iwl_rx_phy_data5 {</div><div class='add'>+	/* info type: EHT any */</div><div class='add'>+	IWL_RX_PHY_DATA5_EHT_TYPE_AND_COMP		= 0x00000003,</div><div class='add'>+	/* info type: EHT-TB */</div><div class='add'>+	IWL_RX_PHY_DATA5_EHT_TB_SPATIAL_REUSE1		= 0x0000003c,</div><div class='add'>+	IWL_RX_PHY_DATA5_EHT_TB_SPATIAL_REUSE2		= 0x000003c0,</div><div class='add'>+	/* info type: EHT-MU */</div><div class='add'>+	IWL_RX_PHY_DATA5_EHT_MU_PUNC_CH_CODE		= 0x0000007c,</div><div class='add'>+	IWL_RX_PHY_DATA5_EHT_MU_STA_ID_USR		= 0x0003ff80,</div><div class='add'>+	IWL_RX_PHY_DATA5_EHT_MU_NUM_USR_NON_OFDMA	= 0x001c0000,</div><div class='add'>+	IWL_RX_PHY_DATA5_EHT_MU_SPATIAL_CONF_USR_FIELD	= 0x0fe00000,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_rx_mpdu_desc_v1 - RX MPDU descriptor</div><div class='ctx'>  */</div><div class='hunk'>@@ -455,12 +528,14 @@ struct iwl_rx_mpdu_desc_v1 {</div><div class='ctx'> 			/**</div><div class='ctx'> 			 * @phy_data1: valid only if</div><div class='ctx'> 			 * %IWL_RX_MPDU_PHY_TSF_OVERLOAD is set,</div><div class='del'>-			 * see &amp;enum iwl_rx_phy_data1.</div><div class='add'>+			 * see &amp;enum iwl_rx_phy_common_data1 or</div><div class='add'>+			 *     &amp;enum iwl_rx_phy_he_data1 or</div><div class='add'>+			 *     &amp;enum iwl_rx_phy_eht_data1.</div><div class='ctx'> 			 */</div><div class='ctx'> 			__le32 phy_data1;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='del'>-} __packed;</div><div class='add'>+} __packed; /* RX_MPDU_RES_START_API_S_VER_4 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_rx_mpdu_desc_v3 - RX MPDU descriptor</div><div class='hunk'>@@ -555,12 +630,22 @@ struct iwl_rx_mpdu_desc_v3 {</div><div class='ctx'> 			__le32 phy_data1;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='del'>-	/* DW16 &amp; DW17 */</div><div class='add'>+	/* DW16 */</div><div class='add'>+	/**</div><div class='add'>+	 * @phy_data5: valid only if</div><div class='add'>+	 * %IWL_RX_MPDU_PHY_TSF_OVERLOAD is set,</div><div class='add'>+	 * see &amp;enum iwl_rx_phy_data5.</div><div class='add'>+	 */</div><div class='add'>+	__le32 phy_data5;</div><div class='add'>+	/* DW17 */</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @reserved: reserved</div><div class='ctx'> 	 */</div><div class='del'>-	__le32 reserved[2];</div><div class='del'>-} __packed; /* RX_MPDU_RES_START_API_S_VER_3 */</div><div class='add'>+	__le32 reserved[1];</div><div class='add'>+} __packed; /* RX_MPDU_RES_START_API_S_VER_3,</div><div class='add'>+	     * RX_MPDU_RES_START_API_S_VER_5,</div><div class='add'>+	     * RX_MPDU_RES_START_API_S_VER_6</div><div class='add'>+	     */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_rx_mpdu_desc - RX MPDU descriptor</div><div class='hunk'>@@ -589,25 +674,35 @@ struct iwl_rx_mpdu_desc {</div><div class='ctx'> 	 */</div><div class='ctx'> 	__le16 phy_info;</div><div class='ctx'> 	/**</div><div class='del'>-	 * @mac_phy_idx: MAC/PHY index</div><div class='add'>+	 * @mac_phy_band: MAC/link ID, PHY ID, band;</div><div class='add'>+	 *	see &amp;enum iwl_rx_mpdu_mac_phy_band</div><div class='ctx'> 	 */</div><div class='del'>-	u8 mac_phy_idx;</div><div class='del'>-	/* DW4 - carries csum data only when rpa_en == 1 */</div><div class='del'>-	/**</div><div class='del'>-	 * @raw_csum: raw checksum (alledgedly unreliable)</div><div class='del'>-	 */</div><div class='del'>-	__le16 raw_csum;</div><div class='del'>-</div><div class='add'>+	u8 mac_phy_band;</div><div class='add'>+	/* DW4 */</div><div class='ctx'> 	union {</div><div class='add'>+		struct {</div><div class='add'>+			/* carries csum data only when rpa_en == 1 */</div><div class='add'>+			/**</div><div class='add'>+			 * @raw_csum: raw checksum (alledgedly unreliable)</div><div class='add'>+			 */</div><div class='add'>+			__le16 raw_csum;</div><div class='add'>+</div><div class='add'>+			union {</div><div class='add'>+				/**</div><div class='add'>+				 * @l3l4_flags: &amp;enum iwl_rx_l3l4_flags</div><div class='add'>+				 */</div><div class='add'>+				__le16 l3l4_flags;</div><div class='add'>+</div><div class='add'>+				/**</div><div class='add'>+				 * @phy_data4: depends on info type, see phy_data1</div><div class='add'>+				 */</div><div class='add'>+				__le16 phy_data4;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='ctx'> 		/**</div><div class='del'>-		 * @l3l4_flags: &amp;enum iwl_rx_l3l4_flags</div><div class='del'>-		 */</div><div class='del'>-		__le16 l3l4_flags;</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * @phy_data4: depends on info type, see phy_data1</div><div class='add'>+		 * @phy_eht_data4: depends on info type, see phy_data1</div><div class='ctx'> 		 */</div><div class='del'>-		__le16 phy_data4;</div><div class='add'>+		__le32 phy_eht_data4;</div><div class='ctx'> 	};</div><div class='ctx'> 	/* DW5 */</div><div class='ctx'> 	/**</div><div class='hunk'>@@ -622,10 +717,22 @@ struct iwl_rx_mpdu_desc {</div><div class='ctx'> 	__le32 reorder_data;</div><div class='ctx'> </div><div class='ctx'> 	union {</div><div class='add'>+		/**</div><div class='add'>+		 * @v1: version 1 of the remaining RX descriptor,</div><div class='add'>+		 *	see &amp;struct iwl_rx_mpdu_desc_v1</div><div class='add'>+		 */</div><div class='ctx'> 		struct iwl_rx_mpdu_desc_v1 v1;</div><div class='add'>+		/**</div><div class='add'>+		 * @v3: version 3 of the remaining RX descriptor,</div><div class='add'>+		 *	see &amp;struct iwl_rx_mpdu_desc_v3</div><div class='add'>+		 */</div><div class='ctx'> 		struct iwl_rx_mpdu_desc_v3 v3;</div><div class='ctx'> 	};</div><div class='del'>-} __packed; /* RX_MPDU_RES_START_API_S_VER_3 */</div><div class='add'>+} __packed; /* RX_MPDU_RES_START_API_S_VER_3,</div><div class='add'>+	     * RX_MPDU_RES_START_API_S_VER_4,</div><div class='add'>+	     * RX_MPDU_RES_START_API_S_VER_5,</div><div class='add'>+	     * RX_MPDU_RES_START_API_S_VER_6</div><div class='add'>+	     */</div><div class='ctx'> </div><div class='ctx'> #define IWL_RX_DESC_SIZE_V1 offsetofend(struct iwl_rx_mpdu_desc, v1)</div><div class='ctx'> </div><div class='hunk'>@@ -642,7 +749,7 @@ struct iwl_rx_mpdu_desc {</div><div class='ctx'> #define RX_NO_DATA_INFO_TYPE_RX_ERR	1</div><div class='ctx'> #define RX_NO_DATA_INFO_TYPE_NDP	2</div><div class='ctx'> #define RX_NO_DATA_INFO_TYPE_MU_UNMATCHED	3</div><div class='del'>-#define RX_NO_DATA_INFO_TYPE_HE_TB_UNMATCHED	4</div><div class='add'>+#define RX_NO_DATA_INFO_TYPE_TB_UNMATCHED	4</div><div class='ctx'> </div><div class='ctx'> #define RX_NO_DATA_INFO_ERR_POS		8</div><div class='ctx'> #define RX_NO_DATA_INFO_ERR_MSK		(0xff &lt;&lt; RX_NO_DATA_INFO_ERR_POS)</div><div class='hunk'>@@ -651,12 +758,43 @@ struct iwl_rx_mpdu_desc {</div><div class='ctx'> #define RX_NO_DATA_INFO_ERR_UNSUPPORTED_RATE	2</div><div class='ctx'> #define RX_NO_DATA_INFO_ERR_NO_DELIM		3</div><div class='ctx'> #define RX_NO_DATA_INFO_ERR_BAD_MAC_HDR	4</div><div class='add'>+#define RX_NO_DATA_INFO_LOW_ENERGY		5</div><div class='ctx'> </div><div class='ctx'> #define RX_NO_DATA_FRAME_TIME_POS	0</div><div class='ctx'> #define RX_NO_DATA_FRAME_TIME_MSK	(0xfffff &lt;&lt; RX_NO_DATA_FRAME_TIME_POS)</div><div class='ctx'> </div><div class='ctx'> #define RX_NO_DATA_RX_VEC0_HE_NSTS_MSK	0x03800000</div><div class='ctx'> #define RX_NO_DATA_RX_VEC0_VHT_NSTS_MSK	0x38000000</div><div class='add'>+#define RX_NO_DATA_RX_VEC2_EHT_NSTS_MSK	0x00f00000</div><div class='add'>+</div><div class='add'>+/* content of OFDM_RX_VECTOR_USIG_A1_OUT */</div><div class='add'>+enum iwl_rx_usig_a1 {</div><div class='add'>+	IWL_RX_USIG_A1_ENHANCED_WIFI_VER_ID	= 0x00000007,</div><div class='add'>+	IWL_RX_USIG_A1_BANDWIDTH		= 0x00000038,</div><div class='add'>+	IWL_RX_USIG_A1_UL_FLAG			= 0x00000040,</div><div class='add'>+	IWL_RX_USIG_A1_BSS_COLOR		= 0x00001f80,</div><div class='add'>+	IWL_RX_USIG_A1_TXOP_DURATION		= 0x000fe000,</div><div class='add'>+	IWL_RX_USIG_A1_DISREGARD		= 0x01f00000,</div><div class='add'>+	IWL_RX_USIG_A1_VALIDATE			= 0x02000000,</div><div class='add'>+	IWL_RX_USIG_A1_EHT_BW320_SLOT		= 0x04000000,</div><div class='add'>+	IWL_RX_USIG_A1_EHT_TYPE			= 0x18000000,</div><div class='add'>+	IWL_RX_USIG_A1_RDY			= 0x80000000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* content of OFDM_RX_VECTOR_USIG_A2_EHT_OUT */</div><div class='add'>+enum iwl_rx_usig_a2_eht {</div><div class='add'>+	IWL_RX_USIG_A2_EHT_PPDU_TYPE		= 0x00000003,</div><div class='add'>+	IWL_RX_USIG_A2_EHT_USIG2_VALIDATE_B2	= 0x00000004,</div><div class='add'>+	IWL_RX_USIG_A2_EHT_PUNC_CHANNEL		= 0x000000f8,</div><div class='add'>+	IWL_RX_USIG_A2_EHT_USIG2_VALIDATE_B8	= 0x00000100,</div><div class='add'>+	IWL_RX_USIG_A2_EHT_SIG_MCS		= 0x00000600,</div><div class='add'>+	IWL_RX_USIG_A2_EHT_SIG_SYM_NUM		= 0x0000f800,</div><div class='add'>+	IWL_RX_USIG_A2_EHT_TRIG_SPATIAL_REUSE_1 = 0x000f0000,</div><div class='add'>+	IWL_RX_USIG_A2_EHT_TRIG_SPATIAL_REUSE_2 = 0x00f00000,</div><div class='add'>+	IWL_RX_USIG_A2_EHT_TRIG_USIG2_DISREGARD	= 0x1f000000,</div><div class='add'>+	IWL_RX_USIG_A2_EHT_CRC_OK		= 0x40000000,</div><div class='add'>+	IWL_RX_USIG_A2_EHT_RDY			= 0x80000000,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_rx_no_data - RX no data descriptor</div><div class='hunk'>@@ -666,7 +804,8 @@ struct iwl_rx_mpdu_desc {</div><div class='ctx'>  * @on_air_rise_time: GP2 during on air rise</div><div class='ctx'>  * @fr_time: frame time</div><div class='ctx'>  * @rate: rate/mcs of frame</div><div class='del'>- * @phy_info: &amp;enum iwl_rx_phy_data0 and &amp;enum iwl_rx_phy_info_type</div><div class='add'>+ * @phy_info: &amp;enum iwl_rx_phy_he_data0 or &amp;enum iwl_rx_phy_eht_data0</div><div class='add'>+ *	      based on &amp;enum iwl_rx_phy_info_type</div><div class='ctx'>  * @rx_vec: DW-12:9 raw RX vectors from DSP according to modulation type.</div><div class='ctx'>  *	for VHT: OFDM_RX_VECTOR_SIGA1_OUT, OFDM_RX_VECTOR_SIGA2_OUT</div><div class='ctx'>  *	for HE: OFDM_RX_VECTOR_HE_SIGA1_OUT, OFDM_RX_VECTOR_HE_SIGA2_OUT</div><div class='hunk'>@@ -679,7 +818,33 @@ struct iwl_rx_no_data {</div><div class='ctx'> 	__le32 rate;</div><div class='ctx'> 	__le32 phy_info[2];</div><div class='ctx'> 	__le32 rx_vec[2];</div><div class='del'>-} __packed; /* RX_NO_DATA_NTFY_API_S_VER_1 */</div><div class='add'>+} __packed; /* RX_NO_DATA_NTFY_API_S_VER_1,</div><div class='add'>+	       RX_NO_DATA_NTFY_API_S_VER_2 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_rx_no_data_ver_3 - RX no data descriptor</div><div class='add'>+ * @info: 7:0 frame type, 15:8 RX error type</div><div class='add'>+ * @rssi: 7:0 energy chain-A,</div><div class='add'>+ *	15:8 chain-B, measured at FINA time (FINA_ENERGY), 16:23 channel</div><div class='add'>+ * @on_air_rise_time: GP2 during on air rise</div><div class='add'>+ * @fr_time: frame time</div><div class='add'>+ * @rate: rate/mcs of frame, format depends on the notification version</div><div class='add'>+ * @phy_info: &amp;enum iwl_rx_phy_eht_data0 and &amp;enum iwl_rx_phy_info_type</div><div class='add'>+ * @rx_vec: DW-12:9 raw RX vectors from DSP according to modulation type.</div><div class='add'>+ *	for VHT: OFDM_RX_VECTOR_SIGA1_OUT, OFDM_RX_VECTOR_SIGA2_OUT</div><div class='add'>+ *	for HE: OFDM_RX_VECTOR_HE_SIGA1_OUT, OFDM_RX_VECTOR_HE_SIGA2_OUT</div><div class='add'>+ *	for EHT: OFDM_RX_VECTOR_USIG_A1_OUT, OFDM_RX_VECTOR_USIG_A2_EHT_OUT,</div><div class='add'>+ *	OFDM_RX_VECTOR_EHT_OUT, OFDM_RX_VECTOR_EHT_USER_FIELD_OUT</div><div class='add'>+ */</div><div class='add'>+struct iwl_rx_no_data_ver_3 {</div><div class='add'>+	__le32 info;</div><div class='add'>+	__le32 rssi;</div><div class='add'>+	__le32 on_air_rise_time;</div><div class='add'>+	__le32 fr_time;</div><div class='add'>+	__le32 rate;</div><div class='add'>+	__le32 phy_info[2];</div><div class='add'>+	__le32 rx_vec[4];</div><div class='add'>+} __packed; /* RX_NO_DATA_NTFY_API_S_VER_3, _VER_4 */</div><div class='ctx'> </div><div class='ctx'> struct iwl_frame_release {</div><div class='ctx'> 	u8 baid;</div><div class='hunk'>@@ -826,7 +991,7 @@ struct iwl_ba_window_status_notif {</div><div class='ctx'> } __packed; /* BA_WINDOW_STATUS_NTFY_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_rfh_queue_config - RX queue configuration</div><div class='add'>+ * struct iwl_rfh_queue_data - RX queue configuration</div><div class='ctx'>  * @q_num: Q num</div><div class='ctx'>  * @enable: enable queue</div><div class='ctx'>  * @reserved: alignment</div><div class='hunk'>@@ -857,4 +1022,309 @@ struct iwl_rfh_queue_config {</div><div class='ctx'> 	struct iwl_rfh_queue_data data[];</div><div class='ctx'> } __packed; /* RFH_QUEUE_CONFIG_API_S_VER_1 */</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct iwl_beacon_filter_notif_v1 - beacon filter notification</div><div class='add'>+ * @average_energy: average energy for the received beacon</div><div class='add'>+ * @mac_id: MAC ID the beacon was received for</div><div class='add'>+ */</div><div class='add'>+struct iwl_beacon_filter_notif_v1 {</div><div class='add'>+	__le32 average_energy;</div><div class='add'>+	__le32 mac_id;</div><div class='add'>+} __packed; /* BEACON_FILTER_IN_NTFY_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_beacon_filter_notif - beacon filter notification</div><div class='add'>+ * @average_energy: average energy for the received beacon</div><div class='add'>+ * @link_id: link ID the beacon was received for</div><div class='add'>+ */</div><div class='add'>+struct iwl_beacon_filter_notif {</div><div class='add'>+	__le32 average_energy;</div><div class='add'>+	__le32 link_id;</div><div class='add'>+} __packed; /* BEACON_FILTER_IN_NTFY_API_S_VER_2 */</div><div class='add'>+</div><div class='add'>+union iwl_legacy_sig {</div><div class='add'>+#define OFDM_RX_LEGACY_LENGTH				0x00000fff</div><div class='add'>+#define OFDM_RX_RATE					0x0000f000</div><div class='add'>+	__le32 ofdm;</div><div class='add'>+#define CCK_CRFR_SHORT_PREAMBLE				0x00000040</div><div class='add'>+	__le32 cck;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_ht_sigs {</div><div class='add'>+#define OFDM_RX_FRAME_HT_MCS				0x0000007f</div><div class='add'>+#define OFDM_RX_FRAME_HT_BANDWIDTH			0x00000080</div><div class='add'>+#define OFDM_RX_FRAME_HT_LENGTH				0x03ffff00</div><div class='add'>+	__le32 a1;</div><div class='add'>+	__le32 a2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_vht_sigs {</div><div class='add'>+#define OFDM_RX_FRAME_VHT_NUM_OF_DATA_SYM		0x000007ff</div><div class='add'>+#define OFDM_RX_FRAME_VHT_NUM_OF_DATA_SYM_VALID		0x80000000</div><div class='add'>+	__le32 a0;</div><div class='add'>+	__le32 a1, a2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_he_sigs {</div><div class='add'>+#define OFDM_RX_FRAME_HE_BEAM_CHANGE			0x00000001</div><div class='add'>+#define OFDM_RX_FRAME_HE_UL_FLAG			0x00000002</div><div class='add'>+#define OFDM_RX_FRAME_HE_MCS				0x0000003c</div><div class='add'>+#define OFDM_RX_FRAME_HE_DCM				0x00000040</div><div class='add'>+#define OFDM_RX_FRAME_HE_BSS_COLOR			0x00001f80</div><div class='add'>+#define OFDM_RX_FRAME_HE_SPATIAL_REUSE			0x0001e000</div><div class='add'>+#define OFDM_RX_FRAME_HE_BANDWIDTH			0x00060000</div><div class='add'>+#define OFDM_RX_FRAME_HE_SU_EXT_BW10			0x00080000</div><div class='add'>+#define OFDM_RX_FRAME_HE_GI_LTF_TYPE			0x00700000</div><div class='add'>+#define OFDM_RX_FRAME_HE_NSTS				0x03800000</div><div class='add'>+#define OFDM_RX_FRAME_HE_PRMBL_PUNC_TYPE		0x0c000000</div><div class='add'>+	__le32 a1;</div><div class='add'>+#define OFDM_RX_FRAME_HE_TXOP_DURATION			0x0000007f</div><div class='add'>+#define OFDM_RX_FRAME_HE_CODING				0x00000080</div><div class='add'>+#define OFDM_RX_FRAME_HE_CODING_EXTRA_SYM		0x00000100</div><div class='add'>+#define OFDM_RX_FRAME_HE_STBC				0x00000200</div><div class='add'>+#define OFDM_RX_FRAME_HE_BF				0x00000400</div><div class='add'>+#define OFDM_RX_FRAME_HE_PRE_FEC_PAD_FACTOR		0x00001800</div><div class='add'>+#define OFDM_RX_FRAME_HE_PE_DISAMBIG			0x00002000</div><div class='add'>+#define OFDM_RX_FRAME_HE_DOPPLER			0x00004000</div><div class='add'>+#define OFDM_RX_FRAME_HE_TYPE				0x00038000</div><div class='add'>+#define OFDM_RX_FRAME_HE_MU_NUM_OF_SIGB_SYM_OR_USER_NUM 0x003c0000</div><div class='add'>+#define OFDM_RX_FRAME_HE_MU_SIGB_COMP			0x00400000</div><div class='add'>+#define OFDM_RX_FRAME_HE_MU_NUM_OF_LTF_SYM		0x03800000</div><div class='add'>+	__le32 a2;</div><div class='add'>+#define OFDM_RX_FRAME_HE_NUM_OF_DATA_SYM		0x000007ff</div><div class='add'>+#define OFDM_RX_FRAME_HE_PE_DURATION			0x00003800</div><div class='add'>+#define OFDM_RX_FRAME_HE_NUM_OF_DATA_SYM_VALID		0x80000000</div><div class='add'>+	__le32 a3;</div><div class='add'>+#define OFDM_RX_FRAME_HE_SIGB_STA_ID_FOUND		0x00000001</div><div class='add'>+#define OFDM_RX_FRAME_HE_SIGB_STA_ID_INDX		0x0000000e</div><div class='add'>+#define OFDM_RX_FRAME_HE_SIGB_NSTS			0x00000070</div><div class='add'>+#define OFDM_RX_FRAME_HE_SIGB_BF			0x00000080</div><div class='add'>+#define OFDM_RX_FRAME_HE_SIGB_MCS			0x00000f00</div><div class='add'>+#define OFDM_RX_FRAME_HE_SIGB_DCM			0x00001000</div><div class='add'>+#define OFDM_RX_FRAME_HE_SIGB_CODING			0x00002000</div><div class='add'>+#define OFDM_RX_FRAME_HE_SIGB_SPATIAL_CONFIG		0x0003c000</div><div class='add'>+#define OFDM_RX_FRAME_HE_SIGB_STA_RU			0x03fc0000</div><div class='add'>+#define OFDM_RX_FRAME_HE_SIGB_NUM_OF_SYM		0x3c000000</div><div class='add'>+#define OFDM_RX_FRAME_HE_SIGB_CRC_OK			0x40000000</div><div class='add'>+	__le32 b;</div><div class='add'>+/* index 0 */</div><div class='add'>+#define OFDM_RX_FRAME_HE_RU_ALLOC_0_A1			0x000000ff</div><div class='add'>+#define OFDM_RX_FRAME_HE_RU_ALLOC_0_A2			0x0000ff00</div><div class='add'>+#define OFDM_RX_FRAME_HE_RU_ALLOC_0_B1			0x00ff0000</div><div class='add'>+#define OFDM_RX_FRAME_HE_RU_ALLOC_0_B2			0xff000000</div><div class='add'>+/* index 1 */</div><div class='add'>+#define OFDM_RX_FRAME_HE_RU_ALLOC_1_C1			0x000000ff</div><div class='add'>+#define OFDM_RX_FRAME_HE_RU_ALLOC_1_C2			0x0000ff00</div><div class='add'>+#define OFDM_RX_FRAME_HE_RU_ALLOC_1_D1			0x00ff0000</div><div class='add'>+#define OFDM_RX_FRAME_HE_RU_ALLOC_1_D2			0xff000000</div><div class='add'>+/* index 2 */</div><div class='add'>+#define OFDM_RX_FRAME_HE_CENTER_RU_CC1			0x00000001</div><div class='add'>+#define OFDM_RX_FRAME_HE_CENTER_RU_CC2			0x00000002</div><div class='add'>+#define OFDM_RX_FRAME_HE_COMMON_CC1_CRC_OK		0x00000004</div><div class='add'>+#define OFDM_RX_FRAME_HE_COMMON_CC2_CRC_OK		0x00000008</div><div class='add'>+	__le32 cmn[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_he_tb_sigs {</div><div class='add'>+#define OFDM_RX_HE_TRIG_FORMAT				0x00000001</div><div class='add'>+#define OFDM_RX_HE_TRIG_BSS_COLOR			0x0000007e</div><div class='add'>+#define OFDM_RX_HE_TRIG_SPATIAL_REUSE_1			0x00000780</div><div class='add'>+#define OFDM_RX_HE_TRIG_SPATIAL_REUSE_2			0x00007800</div><div class='add'>+#define OFDM_RX_HE_TRIG_SPATIAL_REUSE_3			0x00078000</div><div class='add'>+#define OFDM_RX_HE_TRIG_SPATIAL_REUSE_4			0x00780000</div><div class='add'>+#define OFDM_RX_HE_TRIG_BANDWIDTH			0x03000000</div><div class='add'>+	__le32 a1;</div><div class='add'>+#define OFDM_RX_HE_TRIG_TXOP_DURATION			0x0000007f</div><div class='add'>+#define OFDM_RX_HE_TRIG_SIG2_RESERVED			0x0000ff80</div><div class='add'>+#define OFDM_RX_HE_TRIG_FORMAT_ERR			0x08000000</div><div class='add'>+#define OFDM_RX_HE_TRIG_BW_ERR				0x10000000</div><div class='add'>+#define OFDM_RX_HE_TRIG_LEGACY_LENGTH_ERR		0x20000000</div><div class='add'>+#define OFDM_RX_HE_TRIG_CRC_OK				0x40000000</div><div class='add'>+	__le32 a2;</div><div class='add'>+#define OFDM_UCODE_TRIG_BASE_RX_LGCY_LENGTH		0x00000fff</div><div class='add'>+#define OFDM_UCODE_TRIG_BASE_RX_BANDWIDTH		0x00007000</div><div class='add'>+#define OFDM_UCODE_TRIG_BASE_PS160			0x00008000</div><div class='add'>+#define OFDM_UCODE_EHT_TRIG_CONTROL_CHANNEL		0x000f0000</div><div class='add'>+	__le32 tb_rx0;</div><div class='add'>+#define OFDM_UCODE_TRIG_BASE_RX_MCS			0x0000000f</div><div class='add'>+#define OFDM_UCODE_TRIG_BASE_RX_DCM			0x00000010</div><div class='add'>+#define OFDM_UCODE_TRIG_BASE_RX_GI_LTF_TYPE		0x00000060</div><div class='add'>+#define OFDM_UCODE_TRIG_BASE_RX_NSTS			0x00000380</div><div class='add'>+#define OFDM_UCODE_TRIG_BASE_RX_CODING			0x00000400</div><div class='add'>+#define OFDM_UCODE_TRIG_BASE_RX_CODING_EXTRA_SYM	0x00000800</div><div class='add'>+#define OFDM_UCODE_TRIG_BASE_RX_STBC			0x00001000</div><div class='add'>+#define OFDM_UCODE_TRIG_BASE_RX_PRE_FEC_PAD_FACTOR	0x00006000</div><div class='add'>+#define OFDM_UCODE_TRIG_BASE_RX_PE_DISAMBIG		0x00008000</div><div class='add'>+#define OFDM_UCODE_TRIG_BASE_RX_DOPPLER			0x00010000</div><div class='add'>+#define OFDM_UCODE_TRIG_BASE_RX_RU			0x01fe0000</div><div class='add'>+#define OFDM_UCODE_TRIG_BASE_RX_RU_P80			0x00020000</div><div class='add'>+#define OFDM_UCODE_TRIG_BASE_RX_NUM_OF_LTF_SYM		0x0e000000</div><div class='add'>+#define OFDM_UCODE_TRIG_BASE_RX_LTF_PILOT_TYPE		0x10000000</div><div class='add'>+#define OFDM_UCODE_TRIG_BASE_RX_LOWEST_SS_ALLOCATION	0xe0000000</div><div class='add'>+	__le32 tb_rx1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_eht_sigs {</div><div class='add'>+#define OFDM_RX_FRAME_ENHANCED_WIFI_VER_ID		0x00000007</div><div class='add'>+#define OFDM_RX_FRAME_ENHANCED_WIFI_BANDWIDTH		0x00000038</div><div class='add'>+#define OFDM_RX_FRAME_ENHANCED_WIFI_UL_FLAG		0x00000040</div><div class='add'>+#define OFDM_RX_FRAME_ENHANCED_WIFI_BSS_COLOR		0x00001f80</div><div class='add'>+#define OFDM_RX_FRAME_ENHANCED_WIFI_TXOP_DURATION	0x000fe000</div><div class='add'>+#define OFDM_RX_FRAME_EHT_USIG1_DISREGARD		0x01f00000</div><div class='add'>+#define OFDM_RX_FRAME_EHT_USIG1_VALIDATE		0x02000000</div><div class='add'>+#define OFDM_RX_FRAME_EHT_BW320_SLOT			0x04000000</div><div class='add'>+#define OFDM_RX_FRAME_EHT_TYPE				0x18000000</div><div class='add'>+#define OFDM_RX_FRAME_ENHANCED_ER_NO_STREAMS		0x20000000</div><div class='add'>+	__le32 usig_a1;</div><div class='add'>+#define OFDM_RX_FRAME_EHT_PPDU_TYPE			0x00000003</div><div class='add'>+#define OFDM_RX_FRAME_EHT_USIG2_VALIDATE_B2		0x00000004</div><div class='add'>+#define OFDM_RX_FRAME_EHT_PUNC_CHANNEL			0x000000f8</div><div class='add'>+#define OFDM_RX_FRAME_EHT_USIG2_VALIDATE_B8		0x00000100</div><div class='add'>+#define OFDM_RX_FRAME_EHT_SIG_MCS			0x00000600</div><div class='add'>+#define OFDM_RX_FRAME_EHT_SIG_SYM_NUM			0x0000f800</div><div class='add'>+#define OFDM_RX_FRAME_EHT_TRIG_SPATIAL_REUSE_1		0x000f0000</div><div class='add'>+#define OFDM_RX_FRAME_EHT_TRIG_SPATIAL_REUSE_2		0x00f00000</div><div class='add'>+#define OFDM_RX_FRAME_EHT_TRIG_USIG2_DISREGARD		0x1f000000</div><div class='add'>+#define OFDM_RX_FRAME_EHT_TRIG_NO_STREAMS		0x20000000</div><div class='add'>+#define OFDM_RX_USIG_CRC_OK				0x40000000</div><div class='add'>+	__le32 usig_a2_eht;</div><div class='add'>+#define OFDM_RX_FRAME_EHT_SPATIAL_REUSE			0x0000000f</div><div class='add'>+#define OFDM_RX_FRAME_EHT_GI_LTF_TYPE			0x00000030</div><div class='add'>+#define OFDM_RX_FRAME_EHT_NUM_OF_LTF_SYM		0x000001c0</div><div class='add'>+#define OFDM_RX_FRAME_EHT_CODING_EXTRA_SYM		0x00000200</div><div class='add'>+#define OFDM_RX_FRAME_EHT_PRE_FEC_PAD_FACTOR		0x00000c00</div><div class='add'>+#define OFDM_RX_FRAME_EHT_PE_DISAMBIG			0x00001000</div><div class='add'>+#define OFDM_RX_FRAME_EHT_USIG_OVF_DISREGARD		0x0001e000</div><div class='add'>+#define OFDM_RX_FRAME_EHT_NUM_OF_USERS			0x000e0000</div><div class='add'>+#define OFDM_RX_FRAME_EHT_NSTS				0x00f00000</div><div class='add'>+#define OFDM_RX_FRAME_EHT_BF				0x01000000</div><div class='add'>+#define OFDM_RX_FRAME_EHT_USIG_OVF_NDP_DISREGARD	0x06000000</div><div class='add'>+#define OFDM_RX_FRAME_EHTSIG_COMM_CC1_CRC_OK		0x08000000</div><div class='add'>+#define OFDM_RX_FRAME_EHTSIG_COMM_CC2_CRC_OK		0x10000000</div><div class='add'>+#define OFDM_RX_FRAME_EHT_NON_VALID_RU_ALLOC		0x20000000</div><div class='add'>+#define OFDM_RX_FRAME_EHT_NO_STREAMS			0x40000000</div><div class='add'>+	__le32 b1;</div><div class='add'>+#define OFDM_RX_FRAME_EHT_MATCH_ID_FOUND		0x00000001</div><div class='add'>+#define OFDM_RX_FRAME_EHT_ID_INDX			0x0000000e</div><div class='add'>+#define OFDM_RX_FRAME_EHT_MCS				0x000000f0</div><div class='add'>+#define OFDM_RX_FRAME_EHT_CODING			0x00000100</div><div class='add'>+#define OFDM_RX_FRAME_EHT_SPATIAL_CONFIG		0x00007e00</div><div class='add'>+#define OFDM_RX_FRAME_EHT_STA_RU			0x007f8000</div><div class='add'>+#define OFDM_RX_FRAME_EHT_STA_RU_P80			0x00008000</div><div class='add'>+#define OFDM_RX_FRAME_EHT_STA_RU_PS160			0x00800000</div><div class='add'>+#define OFDM_RX_FRAME_EHT_USER_FIELD_CRC_OK		0x40000000</div><div class='add'>+	__le32 b2;</div><div class='add'>+#define OFDM_RX_FRAME_EHT_NUM_OF_DATA_SYM		0x000007ff</div><div class='add'>+#define OFDM_RX_FRAME_EHT_PE_DURATION			0x00003800</div><div class='add'>+#define OFDM_RX_FRAME_EHT_NUM_OF_DATA_SYM_VALID		0x80000000</div><div class='add'>+	__le32 sig2;</div><div class='add'>+#define OFDM_RX_FRAME_EHT_RU_ALLOC_0_A1			0x000001ff</div><div class='add'>+#define OFDM_RX_FRAME_EHT_RU_ALLOC_0_A2			0x0003fe00</div><div class='add'>+#define OFDM_RX_FRAME_EHT_RU_ALLOC_0_A3			0x07fc0000</div><div class='add'>+#define OFDM_RX_FRAME_EHT_RU_ALLOC_1_B1			0x000001ff</div><div class='add'>+#define OFDM_RX_FRAME_EHT_RU_ALLOC_1_B2			0x0003fe00</div><div class='add'>+#define OFDM_RX_FRAME_EHT_RU_ALLOC_1_B3			0x07fc0000</div><div class='add'>+#define OFDM_RX_FRAME_EHT_RU_ALLOC_2_C1			0x000001ff</div><div class='add'>+#define OFDM_RX_FRAME_EHT_RU_ALLOC_2_C2			0x0003fe00</div><div class='add'>+#define OFDM_RX_FRAME_EHT_RU_ALLOC_2_C3			0x07fc0000</div><div class='add'>+#define OFDM_RX_FRAME_EHT_RU_ALLOC_3_D1			0x000001ff</div><div class='add'>+#define OFDM_RX_FRAME_EHT_RU_ALLOC_3_D2			0x0003fe00</div><div class='add'>+#define OFDM_RX_FRAME_EHT_RU_ALLOC_3_D3			0x07fc0000</div><div class='add'>+#define OFDM_RX_FRAME_EHT_RU_ALLOC_4_A4			0x000001ff</div><div class='add'>+#define OFDM_RX_FRAME_EHT_RU_ALLOC_4_B4			0x0003fe00</div><div class='add'>+#define OFDM_RX_FRAME_EHT_RU_ALLOC_5_C4			0x000001ff</div><div class='add'>+#define OFDM_RX_FRAME_EHT_RU_ALLOC_5_D4			0x0003fe00</div><div class='add'>+	__le32 cmn[6];</div><div class='add'>+#define OFDM_RX_FRAME_EHT_USER_FIELD_ID			0x000007ff</div><div class='add'>+	__le32 user_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_eht_tb_sigs {</div><div class='add'>+	/* same as non-TB above */</div><div class='add'>+	__le32 usig_a1, usig_a2_eht;</div><div class='add'>+	/* same as HE TB above */</div><div class='add'>+	__le32 tb_rx0, tb_rx1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_uhr_sigs {</div><div class='add'>+	__le32 usig_a1, usig_a1_uhr, usig_a2_uhr, b1, b2;</div><div class='add'>+	__le32 sig2;</div><div class='add'>+	__le32 cmn[6];</div><div class='add'>+	__le32 user_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_uhr_tb_sigs {</div><div class='add'>+	__le32 usig_a1, usig_a2_uhr, tb_rx0, tb_rx1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_uhr_elr_sigs {</div><div class='add'>+	__le32 usig_a1, usig_a2_uhr;</div><div class='add'>+	__le32 uhr_sig_elr1, uhr_sig_elr2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union iwl_sigs {</div><div class='add'>+	struct iwl_ht_sigs ht;</div><div class='add'>+	struct iwl_vht_sigs vht;</div><div class='add'>+	struct iwl_he_sigs he;</div><div class='add'>+	struct iwl_he_tb_sigs he_tb;</div><div class='add'>+	struct iwl_eht_sigs eht;</div><div class='add'>+	struct iwl_eht_tb_sigs eht_tb;</div><div class='add'>+	struct iwl_uhr_sigs uhr;</div><div class='add'>+	struct iwl_uhr_tb_sigs uhr_tb;</div><div class='add'>+	struct iwl_uhr_elr_sigs uhr_elr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum iwl_sniffer_status {</div><div class='add'>+	IWL_SNIF_STAT_PLCP_RX_OK	= 0,</div><div class='add'>+	IWL_SNIF_STAT_AID_NOT_FOR_US	= 1,</div><div class='add'>+	IWL_SNIF_STAT_PLCP_RX_LSIG_ERR	= 2,</div><div class='add'>+	IWL_SNIF_STAT_PLCP_RX_SIGA_ERR	= 3,</div><div class='add'>+	IWL_SNIF_STAT_PLCP_RX_SIGB_ERR	= 4,</div><div class='add'>+	IWL_SNIF_STAT_UNEXPECTED_TB	= 5,</div><div class='add'>+	IWL_SNIF_STAT_UNSUPPORTED_RATE	= 6,</div><div class='add'>+	IWL_SNIF_STAT_UNKNOWN_ERROR	= 7,</div><div class='add'>+}; /* AIR_SNIFFER_STATUS_E_VER_1 */</div><div class='add'>+</div><div class='add'>+enum iwl_sniffer_flags {</div><div class='add'>+	IWL_SNIF_FLAG_VALID_TB_RX	= BIT(0),</div><div class='add'>+	IWL_SNIF_FLAG_VALID_RU		= BIT(1),</div><div class='add'>+}; /* AIR_SNIFFER_FLAGS_E_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_rx_phy_air_sniffer_ntfy - air sniffer notification</div><div class='add'>+ *</div><div class='add'>+ * @status: &amp;enum iwl_sniffer_status</div><div class='add'>+ * @flags: &amp;enum iwl_sniffer_flags</div><div class='add'>+ * @reserved1: reserved</div><div class='add'>+ * @rssi_a: energy chain-A in negative dBm, measured at FINA time</div><div class='add'>+ * @rssi_b: energy chain-B in negative dBm, measured at FINA time</div><div class='add'>+ * @channel: channel number</div><div class='add'>+ * @band: band information, PHY_BAND_*</div><div class='add'>+ * @on_air_rise_time: GP2 at on air rise</div><div class='add'>+ * @frame_time: frame time in us</div><div class='add'>+ * @rate: RATE_MCS_*</div><div class='add'>+ * @bytecount: byte count for legay and HT, otherwise number of symbols</div><div class='add'>+ * @legacy_sig: CCK signal information if %RATE_MCS_MOD_TYPE_MSK in @rate is</div><div class='add'>+ *	%RATE_MCS_MOD_TYPE_CCK, otherwise OFDM signal information</div><div class='add'>+ * @sigs: PHY signal information, depending on %RATE_MCS_MOD_TYPE_MSK in @rate</div><div class='add'>+ * @reserved2: reserved</div><div class='add'>+ *</div><div class='add'>+ * Sent for every frame and before the normal RX command if data is included.</div><div class='add'>+ */</div><div class='add'>+struct iwl_rx_phy_air_sniffer_ntfy {</div><div class='add'>+	u8 status;</div><div class='add'>+	u8 flags;</div><div class='add'>+	u8 reserved1[2];</div><div class='add'>+	u8 rssi_a, rssi_b;</div><div class='add'>+	u8 channel, band;</div><div class='add'>+	__le32 on_air_rise_time;</div><div class='add'>+	__le32 frame_time;</div><div class='add'>+	/* note: MCS in rate is not valid for MU-VHT */</div><div class='add'>+	__le32 rate;</div><div class='add'>+	__le32 bytecount;</div><div class='add'>+	union iwl_legacy_sig legacy_sig;</div><div class='add'>+	union iwl_sigs sigs;</div><div class='add'>+	__le32 reserved2;</div><div class='add'>+}; /* RX_PHY_AIR_SNIFFER_NTFY_API_S_VER_1 */</div><div class='add'>+</div><div class='ctx'> #endif /* __iwl_fw_api_rx_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h b/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h<br/>index b2605aefc290..60f0a4924ddf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/scan.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/scan.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -9,6 +9,20 @@</div><div class='ctx'> </div><div class='ctx'> /* Scan Commands, Responses, Notifications */</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * enum iwl_scan_subcmd_ids - scan commands</div><div class='add'>+ */</div><div class='add'>+enum iwl_scan_subcmd_ids {</div><div class='add'>+	/**</div><div class='add'>+	 * @CHANNEL_SURVEY_NOTIF: &amp;struct iwl_umac_scan_channel_survey_notif</div><div class='add'>+	 */</div><div class='add'>+	CHANNEL_SURVEY_NOTIF = 0xFB,</div><div class='add'>+	/**</div><div class='add'>+	 * @OFFLOAD_MATCH_INFO_NOTIF: &amp;struct iwl_scan_offload_match_info</div><div class='add'>+	 */</div><div class='add'>+	OFFLOAD_MATCH_INFO_NOTIF = 0xFC,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Max number of IEs for direct SSID scans in a command */</div><div class='ctx'> #define PROBE_OPTION_MAX		20</div><div class='ctx'> </div><div class='hunk'>@@ -52,6 +66,8 @@ struct iwl_ssid_ie {</div><div class='ctx'> #define IWL_FAST_SCHED_SCAN_ITERATIONS 3</div><div class='ctx'> #define IWL_MAX_SCHED_SCAN_PLANS 2</div><div class='ctx'> </div><div class='add'>+#define IWL_MAX_NUM_NOISE_RESULTS 22</div><div class='add'>+</div><div class='ctx'> enum scan_framework_client {</div><div class='ctx'> 	SCAN_CLIENT_SCHED_SCAN		= BIT(0),</div><div class='ctx'> 	SCAN_CLIENT_NETDETECT		= BIT(1),</div><div class='hunk'>@@ -82,6 +98,16 @@ enum iwl_scan_offload_band_selection {</div><div class='ctx'> 	IWL_SCAN_OFFLOAD_SELECT_ANY	= 0xc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum iwl_scan_offload_auth_alg {</div><div class='add'>+	IWL_AUTH_ALGO_UNSUPPORTED  = 0x00,</div><div class='add'>+	IWL_AUTH_ALGO_NONE         = 0x01,</div><div class='add'>+	IWL_AUTH_ALGO_PSK          = 0x02,</div><div class='add'>+	IWL_AUTH_ALGO_8021X        = 0x04,</div><div class='add'>+	IWL_AUTH_ALGO_SAE          = 0x08,</div><div class='add'>+	IWL_AUTH_ALGO_8021X_SHA384 = 0x10,</div><div class='add'>+	IWL_AUTH_ALGO_OWE          = 0x20,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_scan_offload_profile - SCAN_OFFLOAD_PROFILE_S</div><div class='ctx'>  * @ssid_index:		index to ssid list in fixed part</div><div class='hunk'>@@ -103,7 +129,7 @@ struct iwl_scan_offload_profile {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_offload_profile_cfg_data</div><div class='add'>+ * struct iwl_scan_offload_profile_cfg_data - scan offload profile configs</div><div class='ctx'>  * @blocklist_len:	length of blocklist</div><div class='ctx'>  * @num_profiles:	num of profiles in the list</div><div class='ctx'>  * @match_notify:	clients waiting for match found notification</div><div class='hunk'>@@ -123,7 +149,7 @@ struct iwl_scan_offload_profile_cfg_data {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_offload_profile_cfg</div><div class='add'>+ * struct iwl_scan_offload_profile_cfg_v1 - scan offload profile config</div><div class='ctx'>  * @profiles:	profiles to search for match</div><div class='ctx'>  * @data:	the rest of the data for profile_cfg</div><div class='ctx'>  */</div><div class='hunk'>@@ -133,7 +159,7 @@ struct iwl_scan_offload_profile_cfg_v1 {</div><div class='ctx'> } __packed; /* SCAN_OFFLOAD_PROFILES_CFG_API_S_VER_1-2*/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_offload_profile_cfg</div><div class='add'>+ * struct iwl_scan_offload_profile_cfg - scan offload profile config</div><div class='ctx'>  * @profiles:	profiles to search for match</div><div class='ctx'>  * @data:	the rest of the data for profile_cfg</div><div class='ctx'>  */</div><div class='hunk'>@@ -201,7 +227,7 @@ struct iwl_scan_channel_cfg_lmac {</div><div class='ctx'> 	__le32 iter_interval;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_scan_probe_segment - PROBE_SEGMENT_API_S_VER_1</div><div class='ctx'>  * @offset: offset in the data block</div><div class='ctx'>  * @len: length of the segment</div><div class='hunk'>@@ -211,7 +237,8 @@ struct iwl_scan_probe_segment {</div><div class='ctx'> 	__le16 len;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/* iwl_scan_probe_req - PROBE_REQUEST_FRAME_API_S_VER_2</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_scan_probe_req_v1 - PROBE_REQUEST_FRAME_API_S_VER_2</div><div class='ctx'>  * @mac_header: first (and common) part of the probe</div><div class='ctx'>  * @band_data: band specific data</div><div class='ctx'>  * @common_data: last (and common) part of the probe</div><div class='hunk'>@@ -224,7 +251,8 @@ struct iwl_scan_probe_req_v1 {</div><div class='ctx'> 	u8 buf[SCAN_OFFLOAD_PROBE_REQ_SIZE];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/* iwl_scan_probe_req - PROBE_REQUEST_FRAME_API_S_VER_v2</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_scan_probe_req - PROBE_REQUEST_FRAME_API_S_VER_v2</div><div class='ctx'>  * @mac_header: first (and common) part of the probe</div><div class='ctx'>  * @band_data: band specific data</div><div class='ctx'>  * @common_data: last (and common) part of the probe</div><div class='hunk'>@@ -247,7 +275,8 @@ enum iwl_scan_channel_flags {</div><div class='ctx'> 	IWL_SCAN_CHANNEL_FLAG_6G_PSC_NO_FILTER  = BIT(6),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* struct iwl_scan_channel_opt - CHANNEL_OPTIMIZATION_API_S</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_scan_channel_opt - CHANNEL_OPTIMIZATION_API_S</div><div class='ctx'>  * @flags: enum iwl_scan_channel_flags</div><div class='ctx'>  * @non_ebs_ratio: defines the ratio of number of scan iterations where EBS is</div><div class='ctx'>  *	involved.</div><div class='hunk'>@@ -394,7 +423,7 @@ struct iwl_lmac_scan_complete_notif {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_offload_complete - PERIODIC_SCAN_COMPLETE_NTF_API_S_VER_2</div><div class='add'>+ * struct iwl_periodic_scan_complete - PERIODIC_SCAN_COMPLETE_NTF_API_S_VER_2</div><div class='ctx'>  * @last_schedule_line: last schedule line executed (fast or regular)</div><div class='ctx'>  * @last_schedule_iteration: last scan iteration executed before scan abort</div><div class='ctx'>  * @status: &amp;enum iwl_scan_offload_complete_status</div><div class='hunk'>@@ -414,10 +443,10 @@ struct iwl_periodic_scan_complete {</div><div class='ctx'> /* UMAC Scan API */</div><div class='ctx'> </div><div class='ctx'> /* The maximum of either of these cannot exceed 8, because we use an</div><div class='del'>- * 8-bit mask (see IWL_MVM_SCAN_MASK in mvm.h).</div><div class='add'>+ * 8-bit mask (see enum iwl_scan_status).</div><div class='ctx'>  */</div><div class='del'>-#define IWL_MVM_MAX_UMAC_SCANS 4</div><div class='del'>-#define IWL_MVM_MAX_LMAC_SCANS 1</div><div class='add'>+#define IWL_MAX_UMAC_SCANS 4</div><div class='add'>+#define IWL_MAX_LMAC_SCANS 1</div><div class='ctx'> </div><div class='ctx'> enum scan_config_flags {</div><div class='ctx'> 	SCAN_CONFIG_FLAG_ACTIVATE			= BIT(0),</div><div class='hunk'>@@ -478,7 +507,7 @@ enum iwl_uhb_chan_cfg_flags {</div><div class='ctx'> 	IWL_UHB_CHAN_CFG_FLAG_FORCE_PASSIVE         = BIT(26),</div><div class='ctx'> };</div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_dwell</div><div class='add'>+ * struct iwl_scan_dwell - scan dwell configuration</div><div class='ctx'>  * @active:		default dwell time for active scan</div><div class='ctx'>  * @passive:		default dwell time for passive scan</div><div class='ctx'>  * @fragmented:		default dwell time for fragmented scan</div><div class='hunk'>@@ -492,7 +521,7 @@ struct iwl_scan_dwell {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_config_v1</div><div class='add'>+ * struct iwl_scan_config_v1 - scan configuration command</div><div class='ctx'>  * @flags:			enum scan_config_flags</div><div class='ctx'>  * @tx_chains:			valid_tx antenna - ANT_* definitions</div><div class='ctx'>  * @rx_chains:			valid_rx antenna - ANT_* definitions</div><div class='hunk'>@@ -524,6 +553,21 @@ struct iwl_scan_config_v1 {</div><div class='ctx'> #define SCAN_LB_LMAC_IDX 0</div><div class='ctx'> #define SCAN_HB_LMAC_IDX 1</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct iwl_scan_config_v2 - scan configuration command</div><div class='add'>+ * @flags:			enum scan_config_flags</div><div class='add'>+ * @tx_chains:			valid_tx antenna - ANT_* definitions</div><div class='add'>+ * @rx_chains:			valid_rx antenna - ANT_* definitions</div><div class='add'>+ * @legacy_rates:		default legacy rates - enum scan_config_rates</div><div class='add'>+ * @out_of_channel_time:	default max out of serving channel time</div><div class='add'>+ * @suspend_time:		default max suspend time</div><div class='add'>+ * @dwell:			dwells for the scan</div><div class='add'>+ * @mac_addr:			default mac address to be used in probes</div><div class='add'>+ * @bcast_sta_id:		the index of the station in the fw</div><div class='add'>+ * @channel_flags:		default channel flags - enum iwl_channel_flags</div><div class='add'>+ *				scan_config_channel_flag</div><div class='add'>+ * @channel_array:		default supported channels</div><div class='add'>+ */</div><div class='ctx'> struct iwl_scan_config_v2 {</div><div class='ctx'> 	__le32 flags;</div><div class='ctx'> 	__le32 tx_chains;</div><div class='hunk'>@@ -539,7 +583,7 @@ struct iwl_scan_config_v2 {</div><div class='ctx'> } __packed; /* SCAN_CONFIG_DB_CMD_API_S_2 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_config</div><div class='add'>+ * struct iwl_scan_config - scan configuration command</div><div class='ctx'>  * @enable_cam_mode: whether to enable CAM mode.</div><div class='ctx'>  * @enable_promiscouos_mode: whether to enable promiscouos mode</div><div class='ctx'>  * @bcast_sta_id: the index of the station in the fw. Deprecated starting with</div><div class='hunk'>@@ -604,10 +648,13 @@ enum iwl_umac_scan_general_flags {</div><div class='ctx'>  *	notification per channel or not.</div><div class='ctx'>  * @IWL_UMAC_SCAN_GEN_FLAGS2_ALLOW_CHNL_REORDER: Whether to allow channel</div><div class='ctx'>  *	reorder optimization or not.</div><div class='add'>+ * @IWL_UMAC_SCAN_GEN_FLAGS2_COLLECT_CHANNEL_STATS: Enable channel statistics</div><div class='add'>+ *	collection when #IWL_UMAC_SCAN_GEN_FLAGS_V2_FORCE_PASSIVE is set.</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_umac_scan_general_flags2 {</div><div class='ctx'> 	IWL_UMAC_SCAN_GEN_FLAGS2_NOTIF_PER_CHNL		= BIT(0),</div><div class='ctx'> 	IWL_UMAC_SCAN_GEN_FLAGS2_ALLOW_CHNL_REORDER	= BIT(1),</div><div class='add'>+	IWL_UMAC_SCAN_GEN_FLAGS2_COLLECT_CHANNEL_STATS	= BIT(3),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -640,6 +687,10 @@ enum iwl_umac_scan_general_flags2 {</div><div class='ctx'>  * @IWL_UMAC_SCAN_GEN_FLAGS_V2_6GHZ_PASSIVE_SCAN_FILTER_IN: in case</div><div class='ctx'>  *      &amp;IWL_UMAC_SCAN_GEN_FLAGS_V2_6GHZ_PASSIVE_SCAN is enabled and scan is</div><div class='ctx'>  *      activated over 6GHz PSC channels, filter in beacons and probe responses.</div><div class='add'>+ * @IWL_UMAC_SCAN_GEN_FLAGS_V2_OCE: if set, send probe requests in a minimum</div><div class='add'>+ *      rate of 5.5Mpbs, filter in broadcast probe responses and set the max</div><div class='add'>+ *      channel time indication field in the FILS request parameters element</div><div class='add'>+ *      (if included by the driver in the probe request IEs).</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_umac_scan_general_flags_v2 {</div><div class='ctx'> 	IWL_UMAC_SCAN_GEN_FLAGS_V2_PERIODIC             = BIT(0),</div><div class='hunk'>@@ -657,41 +708,73 @@ enum iwl_umac_scan_general_flags_v2 {</div><div class='ctx'> 	IWL_UMAC_SCAN_GEN_FLAGS_V2_TRIGGER_UHB_SCAN     = BIT(12),</div><div class='ctx'> 	IWL_UMAC_SCAN_GEN_FLAGS_V2_6GHZ_PASSIVE_SCAN    = BIT(13),</div><div class='ctx'> 	IWL_UMAC_SCAN_GEN_FLAGS_V2_6GHZ_PASSIVE_SCAN_FILTER_IN = BIT(14),</div><div class='add'>+	IWL_UMAC_SCAN_GEN_FLAGS_V2_OCE                  = BIT(15),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_channel_cfg_umac</div><div class='add'>+ * enum iwl_umac_scan_general_params_flags2 - UMAC scan general flags2</div><div class='add'>+ *</div><div class='add'>+ * @IWL_UMAC_SCAN_GEN_PARAMS_FLAGS2_RESPECT_P2P_GO_LB: scan event scheduling</div><div class='add'>+ *     should be aware of a P2P GO operation on the 2GHz band.</div><div class='add'>+ * @IWL_UMAC_SCAN_GEN_PARAMS_FLAGS2_RESPECT_P2P_GO_HB: scan event scheduling</div><div class='add'>+ *     should be aware of a P2P GO operation on the 5GHz or 6GHz band.</div><div class='add'>+ * @IWL_UMAC_SCAN_GEN_PARAMS_FLAGS2_DONT_TOGGLE_ANT: don't toggle between</div><div class='add'>+ *     valid antennas, and use the same antenna as in previous scan</div><div class='add'>+ */</div><div class='add'>+enum iwl_umac_scan_general_params_flags2 {</div><div class='add'>+	IWL_UMAC_SCAN_GEN_PARAMS_FLAGS2_RESPECT_P2P_GO_LB = BIT(0),</div><div class='add'>+	IWL_UMAC_SCAN_GEN_PARAMS_FLAGS2_RESPECT_P2P_GO_HB = BIT(1),</div><div class='add'>+	IWL_UMAC_SCAN_GEN_PARAMS_FLAGS2_DONT_TOGGLE_ANT   = BIT(2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_scan_channel_cfg_umac - scan channel config</div><div class='ctx'>  * @flags:		bitmap - 0-19:	directed scan to i'th ssid.</div><div class='ctx'>  * @channel_num:	channel number 1-13 etc.</div><div class='del'>- * @band:		band of channel: 0 for 2GHz, 1 for 5GHz</div><div class='del'>- * @iter_count:		repetition count for the channel.</div><div class='del'>- * @iter_interval:	interval between two scan iterations on one channel.</div><div class='add'>+ * @v1:			command version 1</div><div class='add'>+ * @v1.iter_count:	repetition count for the channel.</div><div class='add'>+ * @v1.iter_interval:	interval between two scan iterations on one channel.</div><div class='add'>+ * @v2:			command versions 2-4</div><div class='add'>+ * @v2.band:		band of channel: 0 for 2GHz, 1 for 5GHz</div><div class='add'>+ * @v2.iter_count:	repetition count for the channel.</div><div class='add'>+ * @v2.iter_interval:	interval between two scan iterations on one channel.</div><div class='add'>+ * @v5:			command versions 5 and up</div><div class='add'>+ * @v5.iter_count:	repetition count for the channel.</div><div class='add'>+ * @v5.iter_interval:	interval between two scan iterations on one channel.</div><div class='add'>+ * @v5.psd_20:		highest PSD value for all APs known so far</div><div class='add'>+ *			on this channel.</div><div class='ctx'>  */</div><div class='ctx'> struct  iwl_scan_channel_cfg_umac {</div><div class='add'>+#define IWL_CHAN_CFG_FLAGS_BAND_POS 30</div><div class='ctx'> 	__le32 flags;</div><div class='del'>-	/* Both versions are of the same size, so use a union without adjusting</div><div class='add'>+	u8 channel_num;</div><div class='add'>+</div><div class='add'>+	/* All versions are of the same size, so use a union without adjusting</div><div class='ctx'> 	 * the command size later</div><div class='ctx'> 	 */</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct {</div><div class='del'>-			u8 channel_num;</div><div class='ctx'> 			u8 iter_count;</div><div class='ctx'> 			__le16 iter_interval;</div><div class='del'>-		} v1;  /* SCAN_CHANNEL_CONFIG_API_S_VER_1 */</div><div class='add'>+		} __packed v1;  /* SCAN_CHANNEL_CONFIG_API_S_VER_1 */</div><div class='ctx'> 		struct {</div><div class='del'>-			u8 channel_num;</div><div class='ctx'> 			u8 band;</div><div class='ctx'> 			u8 iter_count;</div><div class='ctx'> 			u8 iter_interval;</div><div class='del'>-		 } v2; /* SCAN_CHANNEL_CONFIG_API_S_VER_2</div><div class='del'>-			* SCAN_CHANNEL_CONFIG_API_S_VER_3</div><div class='del'>-			* SCAN_CHANNEL_CONFIG_API_S_VER_4</div><div class='del'>-			*/</div><div class='del'>-	};</div><div class='add'>+		} __packed v2; /* SCAN_CHANNEL_CONFIG_API_S_VER_2</div><div class='add'>+				* SCAN_CHANNEL_CONFIG_API_S_VER_3</div><div class='add'>+				* SCAN_CHANNEL_CONFIG_API_S_VER_4</div><div class='add'>+				*/</div><div class='add'>+		struct {</div><div class='add'>+			u8 psd_20;</div><div class='add'>+			u8 iter_count;</div><div class='add'>+			u8 iter_interval;</div><div class='add'>+		} __packed v5;  /* SCAN_CHANNEL_CONFIG_API_S_VER_5 */</div><div class='add'>+	} __packed;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_umac_schedule</div><div class='add'>+ * struct iwl_scan_umac_schedule - scan schedule parameters</div><div class='ctx'>  * @interval: interval in seconds between scan iterations</div><div class='ctx'>  * @iter_count: num of scan iterations for schedule plan, 0xff for infinite loop</div><div class='ctx'>  * @reserved: for alignment and future use</div><div class='hunk'>@@ -713,7 +796,7 @@ struct iwl_scan_req_umac_tail_v1 {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_req_umac_tail - the rest of the UMAC scan request command</div><div class='add'>+ * struct iwl_scan_req_umac_tail_v2 - the rest of the UMAC scan request command</div><div class='ctx'>  *      parameters following channels configuration array.</div><div class='ctx'>  * @schedule: two scheduling plans.</div><div class='ctx'>  * @delay: delay in TUs before starting the first scan iteration</div><div class='hunk'>@@ -732,7 +815,7 @@ struct iwl_scan_req_umac_tail_v2 {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_umac_chan_param</div><div class='add'>+ * struct iwl_scan_umac_chan_param - scan channel parameters</div><div class='ctx'>  * @flags: channel flags &amp;enum iwl_scan_channel_flags</div><div class='ctx'>  * @count: num of channels in scan request</div><div class='ctx'>  * @reserved: for future use and alignment</div><div class='hunk'>@@ -744,33 +827,37 @@ struct iwl_scan_umac_chan_param {</div><div class='ctx'> } __packed; /*SCAN_CHANNEL_PARAMS_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_req_umac</div><div class='add'>+ * struct iwl_scan_req_umac - scan request command</div><div class='ctx'>  * @flags: &amp;enum iwl_umac_scan_flags</div><div class='ctx'>  * @uid: scan id, &amp;enum iwl_umac_scan_uid_offsets</div><div class='ctx'>  * @ooc_priority: out of channel priority - &amp;enum iwl_scan_priority</div><div class='ctx'>  * @general_flags: &amp;enum iwl_umac_scan_general_flags</div><div class='add'>+ * @reserved: reserved</div><div class='ctx'>  * @scan_start_mac_id: report the scan start TSF time according to this mac TSF</div><div class='del'>- * @extended_dwell: dwell time for channels 1, 6 and 11</div><div class='del'>- * @active_dwell: dwell time for active scan per LMAC</div><div class='del'>- * @passive_dwell: dwell time for passive scan per LMAC</div><div class='del'>- * @fragmented_dwell: dwell time for fragmented passive scan</div><div class='del'>- * @adwell_default_n_aps: for adaptive dwell the default number of APs</div><div class='add'>+ * @v1: version 1 command data</div><div class='add'>+ * @v6: version 6 command data</div><div class='add'>+ * @v7: version 7 command data</div><div class='add'>+ * @v8: version 8 command data</div><div class='add'>+ * @v9: version 9 command data</div><div class='add'>+ * @v1.extended_dwell: dwell time for channels 1, 6 and 11</div><div class='add'>+ * @v1.active_dwell: dwell time for active scan per LMAC</div><div class='add'>+ * @v1.passive_dwell: dwell time for passive scan per LMAC</div><div class='add'>+ * @v1.fragmented_dwell: dwell time for fragmented passive scan</div><div class='add'>+ * @v7.adwell_default_n_aps: for adaptive dwell the default number of APs</div><div class='ctx'>  *	per channel</div><div class='del'>- * @adwell_default_n_aps_social: for adaptive dwell the default</div><div class='add'>+ * @v7.adwell_default_n_aps_social: for adaptive dwell the default</div><div class='ctx'>  *	number of APs per social (1,6,11) channel</div><div class='del'>- * @general_flags2: &amp;enum iwl_umac_scan_general_flags2</div><div class='del'>- * @adwell_max_budget: for adaptive dwell the maximal budget of TU to be added</div><div class='del'>- *	to total scan time</div><div class='del'>- * @max_out_time: max out of serving channel time, per LMAC - for CDB there</div><div class='del'>- *	are 2 LMACs</div><div class='del'>- * @suspend_time: max suspend time, per LMAC - for CDB there are 2 LMACs</div><div class='del'>- * @scan_priority: scan internal prioritization &amp;enum iwl_scan_priority</div><div class='del'>- * @num_of_fragments: Number of fragments needed for full coverage per band.</div><div class='add'>+ * @v8.general_flags2: &amp;enum iwl_umac_scan_general_flags2</div><div class='add'>+ * @v7.adwell_max_budget: for adaptive dwell the maximal budget of TU to be</div><div class='add'>+ *	added to total scan time</div><div class='add'>+ * @v1.max_out_time: max out of serving channel time, per LMAC - for CDB</div><div class='add'>+ *	there are 2 LMACs</div><div class='add'>+ * @v1.suspend_time: max suspend time, per LMAC - for CDB there are 2 LMACs</div><div class='add'>+ * @v1.scan_priority: scan internal prioritization &amp;enum iwl_scan_priority</div><div class='add'>+ * @v8.num_of_fragments: Number of fragments needed for full coverage per band.</div><div class='ctx'>  *	Relevant only for fragmented scan.</div><div class='del'>- * @channel: &amp;struct iwl_scan_umac_chan_param</div><div class='del'>- * @reserved: for future use and alignment</div><div class='del'>- * @reserved3: for future use and alignment</div><div class='del'>- * @data: &amp;struct iwl_scan_channel_cfg_umac and</div><div class='add'>+ * @v1.channel: &amp;struct iwl_scan_umac_chan_param</div><div class='add'>+ * @v1.data: &amp;struct iwl_scan_channel_cfg_umac and</div><div class='ctx'>  *	&amp;struct iwl_scan_req_umac_tail</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_scan_req_umac {</div><div class='hunk'>@@ -856,7 +943,7 @@ struct iwl_scan_req_umac {</div><div class='ctx'> #define IWL_SCAN_REQ_UMAC_SIZE_V1 36</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_probe_params_v3</div><div class='add'>+ * struct iwl_scan_probe_params_v3 - scan probe parameters</div><div class='ctx'>  * @preq: scan probe request params</div><div class='ctx'>  * @ssid_num: number of valid SSIDs in direct scan array</div><div class='ctx'>  * @short_ssid_num: number of valid short SSIDs in short ssid array</div><div class='hunk'>@@ -874,11 +961,11 @@ struct iwl_scan_probe_params_v3 {</div><div class='ctx'> 	u8 reserved;</div><div class='ctx'> 	struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX];</div><div class='ctx'> 	__le32 short_ssid[SCAN_SHORT_SSID_MAX_SIZE];</div><div class='del'>-	u8 bssid_array[ETH_ALEN][SCAN_BSSID_MAX_SIZE];</div><div class='add'>+	u8 bssid_array[SCAN_BSSID_MAX_SIZE][ETH_ALEN];</div><div class='ctx'> } __packed; /* SCAN_PROBE_PARAMS_API_S_VER_3 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_probe_params_v4</div><div class='add'>+ * struct iwl_scan_probe_params_v4 - scan probe parameters</div><div class='ctx'>  * @preq: scan probe request params</div><div class='ctx'>  * @short_ssid_num: number of valid short SSIDs in short ssid array</div><div class='ctx'>  * @bssid_num: number of valid bssid in bssids array</div><div class='hunk'>@@ -894,13 +981,13 @@ struct iwl_scan_probe_params_v4 {</div><div class='ctx'> 	__le16 reserved;</div><div class='ctx'> 	struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX];</div><div class='ctx'> 	__le32 short_ssid[SCAN_SHORT_SSID_MAX_SIZE];</div><div class='del'>-	u8 bssid_array[ETH_ALEN][SCAN_BSSID_MAX_SIZE];</div><div class='add'>+	u8 bssid_array[SCAN_BSSID_MAX_SIZE][ETH_ALEN];</div><div class='ctx'> } __packed; /* SCAN_PROBE_PARAMS_API_S_VER_4 */</div><div class='ctx'> </div><div class='ctx'> #define SCAN_MAX_NUM_CHANS_V3 67</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_channel_params_v4</div><div class='add'>+ * struct iwl_scan_channel_params_v4 - channel params</div><div class='ctx'>  * @flags: channel flags &amp;enum iwl_scan_channel_flags</div><div class='ctx'>  * @count: num of channels in scan request</div><div class='ctx'>  * @num_of_aps_override: override the number of APs the FW uses to calculate</div><div class='hunk'>@@ -923,7 +1010,7 @@ struct iwl_scan_channel_params_v4 {</div><div class='ctx'> 	       SCAN_CHANNEL_PARAMS_API_S_VER_5 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_channel_params_v6</div><div class='add'>+ * struct iwl_scan_channel_params_v7 - channel params</div><div class='ctx'>  * @flags: channel flags &amp;enum iwl_scan_channel_flags</div><div class='ctx'>  * @count: num of channels in scan request</div><div class='ctx'>  * @n_aps_override: override the number of APs the FW uses to calculate dwell</div><div class='hunk'>@@ -933,7 +1020,7 @@ struct iwl_scan_channel_params_v4 {</div><div class='ctx'>  * @channel_config: array of explicit channel configurations</div><div class='ctx'>  *                  for 2.4Ghz and 5.2Ghz bands</div><div class='ctx'>  */</div><div class='del'>-struct iwl_scan_channel_params_v6 {</div><div class='add'>+struct iwl_scan_channel_params_v7 {</div><div class='ctx'> 	u8 flags;</div><div class='ctx'> 	u8 count;</div><div class='ctx'> 	u8 n_aps_override[2];</div><div class='hunk'>@@ -941,10 +1028,11 @@ struct iwl_scan_channel_params_v6 {</div><div class='ctx'> } __packed; /* SCAN_CHANNEL_PARAMS_API_S_VER_6 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_general_params_v10</div><div class='del'>- * @flags: &amp;enum iwl_umac_scan_flags</div><div class='add'>+ * struct iwl_scan_general_params_v11 - channel params</div><div class='add'>+ * @flags: &amp;enum iwl_umac_scan_general_flags_v2</div><div class='ctx'>  * @reserved: reserved for future</div><div class='del'>- * @scan_start_mac_id: report the scan start TSF time according to this mac TSF</div><div class='add'>+ * @scan_start_mac_or_link_id: report the scan start TSF time according to this</div><div class='add'>+ *     mac (up to verion 11) or link (starting with version 12) TSF</div><div class='ctx'>  * @active_dwell: dwell time for active scan per LMAC</div><div class='ctx'>  * @adwell_default_2g: adaptive dwell default number of APs</div><div class='ctx'>  *                        for 2.4GHz channel</div><div class='hunk'>@@ -952,7 +1040,8 @@ struct iwl_scan_channel_params_v6 {</div><div class='ctx'>  *                        for 5GHz channels</div><div class='ctx'>  * @adwell_default_social_chn: adaptive dwell default number of</div><div class='ctx'>  *                             APs per social channel</div><div class='del'>- * @reserved1: reserved for future</div><div class='add'>+ * @flags2: for version 11 see &amp;enum iwl_umac_scan_general_params_flags2.</div><div class='add'>+ *     Otherwise reserved.</div><div class='ctx'>  * @adwell_max_budget: the maximal number of TUs that adaptive dwell</div><div class='ctx'>  *                     can add to the total scan time</div><div class='ctx'>  * @max_out_of_time: max out of serving channel time, per LMAC</div><div class='hunk'>@@ -963,25 +1052,25 @@ struct iwl_scan_channel_params_v6 {</div><div class='ctx'>  * @num_of_fragments: number of fragments needed for full fragmented</div><div class='ctx'>  *                    scan coverage.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_scan_general_params_v10 {</div><div class='add'>+struct iwl_scan_general_params_v11 {</div><div class='ctx'> 	__le16 flags;</div><div class='ctx'> 	u8 reserved;</div><div class='del'>-	u8 scan_start_mac_id;</div><div class='add'>+	u8 scan_start_mac_or_link_id;</div><div class='ctx'> 	u8 active_dwell[SCAN_TWO_LMACS];</div><div class='ctx'> 	u8 adwell_default_2g;</div><div class='ctx'> 	u8 adwell_default_5g;</div><div class='ctx'> 	u8 adwell_default_social_chn;</div><div class='del'>-	u8 reserved1;</div><div class='add'>+	u8 flags2;</div><div class='ctx'> 	__le16 adwell_max_budget;</div><div class='ctx'> 	__le32 max_out_of_time[SCAN_TWO_LMACS];</div><div class='ctx'> 	__le32 suspend_time[SCAN_TWO_LMACS];</div><div class='ctx'> 	__le32 scan_priority;</div><div class='ctx'> 	u8 passive_dwell[SCAN_TWO_LMACS];</div><div class='ctx'> 	u8 num_of_fragments[SCAN_TWO_LMACS];</div><div class='del'>-} __packed; /* SCAN_GENERAL_PARAMS_API_S_VER_10 */</div><div class='add'>+} __packed; /* SCAN_GENERAL_PARAMS_API_S_VER_12, *_VER_11  and *_VER_10 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_periodic_parms_v1</div><div class='add'>+ * struct iwl_scan_periodic_parms_v1 - periodicity parameters</div><div class='ctx'>  * @schedule: can scheduling parameter</div><div class='ctx'>  * @delay: initial delay of the periodic scan in seconds</div><div class='ctx'>  * @reserved: reserved for future</div><div class='hunk'>@@ -993,35 +1082,35 @@ struct iwl_scan_periodic_parms_v1 {</div><div class='ctx'> } __packed; /* SCAN_PERIODIC_PARAMS_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_req_params_v12</div><div class='del'>- * @general_params: &amp;struct iwl_scan_general_params_v10</div><div class='add'>+ * struct iwl_scan_req_params_v12 - scan request parameters (v12)</div><div class='add'>+ * @general_params: &amp;struct iwl_scan_general_params_v11</div><div class='ctx'>  * @channel_params: &amp;struct iwl_scan_channel_params_v4</div><div class='ctx'>  * @periodic_params: &amp;struct iwl_scan_periodic_parms_v1</div><div class='ctx'>  * @probe_params: &amp;struct iwl_scan_probe_params_v3</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_scan_req_params_v12 {</div><div class='del'>-	struct iwl_scan_general_params_v10 general_params;</div><div class='add'>+	struct iwl_scan_general_params_v11 general_params;</div><div class='ctx'> 	struct iwl_scan_channel_params_v4 channel_params;</div><div class='ctx'> 	struct iwl_scan_periodic_parms_v1 periodic_params;</div><div class='ctx'> 	struct iwl_scan_probe_params_v3 probe_params;</div><div class='ctx'> } __packed; /* SCAN_REQUEST_PARAMS_API_S_VER_12 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_req_params_v14</div><div class='del'>- * @general_params: &amp;struct iwl_scan_general_params_v10</div><div class='del'>- * @channel_params: &amp;struct iwl_scan_channel_params_v6</div><div class='add'>+ * struct iwl_scan_req_params_v17 - scan request parameters (v17)</div><div class='add'>+ * @general_params: &amp;struct iwl_scan_general_params_v11</div><div class='add'>+ * @channel_params: &amp;struct iwl_scan_channel_params_v7</div><div class='ctx'>  * @periodic_params: &amp;struct iwl_scan_periodic_parms_v1</div><div class='ctx'>  * @probe_params: &amp;struct iwl_scan_probe_params_v4</div><div class='ctx'>  */</div><div class='del'>-struct iwl_scan_req_params_v14 {</div><div class='del'>-	struct iwl_scan_general_params_v10 general_params;</div><div class='del'>-	struct iwl_scan_channel_params_v6 channel_params;</div><div class='add'>+struct iwl_scan_req_params_v17 {</div><div class='add'>+	struct iwl_scan_general_params_v11 general_params;</div><div class='add'>+	struct iwl_scan_channel_params_v7 channel_params;</div><div class='ctx'> 	struct iwl_scan_periodic_parms_v1 periodic_params;</div><div class='ctx'> 	struct iwl_scan_probe_params_v4 probe_params;</div><div class='del'>-} __packed; /* SCAN_REQUEST_PARAMS_API_S_VER_14 */</div><div class='add'>+} __packed; /* SCAN_REQUEST_PARAMS_API_S_VER_17 - 14 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_req_umac_v12</div><div class='add'>+ * struct iwl_scan_req_umac_v12 - scan request command (v12)</div><div class='ctx'>  * @uid: scan id, &amp;enum iwl_umac_scan_uid_offsets</div><div class='ctx'>  * @ooc_priority: out of channel priority - &amp;enum iwl_scan_priority</div><div class='ctx'>  * @scan_params: scan parameters</div><div class='hunk'>@@ -1033,19 +1122,19 @@ struct iwl_scan_req_umac_v12 {</div><div class='ctx'> } __packed; /* SCAN_REQUEST_CMD_UMAC_API_S_VER_12 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_req_umac_v14</div><div class='add'>+ * struct iwl_scan_req_umac_v17 - scan request command (v17)</div><div class='ctx'>  * @uid: scan id, &amp;enum iwl_umac_scan_uid_offsets</div><div class='ctx'>  * @ooc_priority: out of channel priority - &amp;enum iwl_scan_priority</div><div class='ctx'>  * @scan_params: scan parameters</div><div class='ctx'>  */</div><div class='del'>-struct iwl_scan_req_umac_v14 {</div><div class='add'>+struct iwl_scan_req_umac_v17 {</div><div class='ctx'> 	__le32 uid;</div><div class='ctx'> 	__le32 ooc_priority;</div><div class='del'>-	struct iwl_scan_req_params_v14 scan_params;</div><div class='del'>-} __packed; /* SCAN_REQUEST_CMD_UMAC_API_S_VER_14 */</div><div class='add'>+	struct iwl_scan_req_params_v17 scan_params;</div><div class='add'>+} __packed; /* SCAN_REQUEST_CMD_UMAC_API_S_VER_17 - 14 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_umac_scan_abort</div><div class='add'>+ * struct iwl_umac_scan_abort - scan abort command</div><div class='ctx'>  * @uid: scan id, &amp;enum iwl_umac_scan_uid_offsets</div><div class='ctx'>  * @flags: reserved</div><div class='ctx'>  */</div><div class='hunk'>@@ -1055,7 +1144,20 @@ struct iwl_umac_scan_abort {</div><div class='ctx'> } __packed; /* SCAN_ABORT_CMD_UMAC_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_umac_scan_complete</div><div class='add'>+ * enum iwl_umac_scan_abort_status - scan abort status</div><div class='add'>+ *</div><div class='add'>+ * @IWL_UMAC_SCAN_ABORT_STATUS_SUCCESS: scan was successfully aborted</div><div class='add'>+ * @IWL_UMAC_SCAN_ABORT_STATUS_IN_PROGRESS: scan abort is in progress</div><div class='add'>+ * @IWL_UMAC_SCAN_ABORT_STATUS_NOT_FOUND: nothing to abort</div><div class='add'>+ */</div><div class='add'>+enum iwl_umac_scan_abort_status {</div><div class='add'>+	IWL_UMAC_SCAN_ABORT_STATUS_SUCCESS = 0,</div><div class='add'>+	IWL_UMAC_SCAN_ABORT_STATUS_IN_PROGRESS,</div><div class='add'>+	IWL_UMAC_SCAN_ABORT_STATUS_NOT_FOUND,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_umac_scan_complete - scan complete notification</div><div class='ctx'>  * @uid: scan id, &amp;enum iwl_umac_scan_uid_offsets</div><div class='ctx'>  * @last_schedule: last scheduling line</div><div class='ctx'>  * @last_iter: last scan iteration number</div><div class='hunk'>@@ -1118,7 +1220,7 @@ struct iwl_scan_offload_profiles_query_v1 {</div><div class='ctx'> 	u8 resume_while_scanning;</div><div class='ctx'> 	u8 self_recovery;</div><div class='ctx'> 	__le16 reserved;</div><div class='del'>-	struct iwl_scan_offload_profile_match_v1 matches[0];</div><div class='add'>+	struct iwl_scan_offload_profile_match_v1 matches[];</div><div class='ctx'> } __packed; /* SCAN_OFFLOAD_PROFILES_QUERY_RSP_S_VER_2 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1141,7 +1243,7 @@ struct iwl_scan_offload_profile_match {</div><div class='ctx'> } __packed; /* SCAN_OFFLOAD_PROFILE_MATCH_RESULTS_S_VER_2 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_offload_profiles_query - match results query response</div><div class='add'>+ * struct iwl_scan_offload_match_info - match results information</div><div class='ctx'>  * @matched_profiles: bitmap of matched profiles, referencing the</div><div class='ctx'>  *	matches passed in the scan offload request</div><div class='ctx'>  * @last_scan_age: age of the last offloaded scan</div><div class='hunk'>@@ -1153,7 +1255,7 @@ struct iwl_scan_offload_profile_match {</div><div class='ctx'>  * @reserved: reserved</div><div class='ctx'>  * @matches: array of match information, one for each match</div><div class='ctx'>  */</div><div class='del'>-struct iwl_scan_offload_profiles_query {</div><div class='add'>+struct iwl_scan_offload_match_info {</div><div class='ctx'> 	__le32 matched_profiles;</div><div class='ctx'> 	__le32 last_scan_age;</div><div class='ctx'> 	__le32 n_scans_done;</div><div class='hunk'>@@ -1162,8 +1264,10 @@ struct iwl_scan_offload_profiles_query {</div><div class='ctx'> 	u8 resume_while_scanning;</div><div class='ctx'> 	u8 self_recovery;</div><div class='ctx'> 	__le16 reserved;</div><div class='del'>-	struct iwl_scan_offload_profile_match matches[0];</div><div class='del'>-} __packed; /* SCAN_OFFLOAD_PROFILES_QUERY_RSP_S_VER_3 */</div><div class='add'>+	struct iwl_scan_offload_profile_match matches[];</div><div class='add'>+} __packed; /* SCAN_OFFLOAD_PROFILES_QUERY_RSP_S_VER_3 and</div><div class='add'>+	     * SCAN_OFFLOAD_MATCH_INFO_NOTIFICATION_S_VER_1</div><div class='add'>+	     */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_umac_scan_iter_complete_notif - notifies end of scanning iteration</div><div class='hunk'>@@ -1187,4 +1291,26 @@ struct iwl_umac_scan_iter_complete_notif {</div><div class='ctx'> 	struct iwl_scan_results_notif results[];</div><div class='ctx'> } __packed; /* SCAN_ITER_COMPLETE_NTF_UMAC_API_S_VER_2 */</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct iwl_umac_scan_channel_survey_notif - data for survey</div><div class='add'>+ * @channel: the channel scanned</div><div class='add'>+ * @band: band of channel</div><div class='add'>+ * @noise: noise floor measurements in negative dBm, invalid 0xff</div><div class='add'>+ * @reserved: for future use and alignment</div><div class='add'>+ * @active_time: time in ms the radio was turned on (on the channel)</div><div class='add'>+ * @busy_time: time in ms the channel was sensed busy, 0 for a clean channel</div><div class='add'>+ * @tx_time: time the radio spent transmitting data</div><div class='add'>+ * @rx_time: time the radio spent receiving data</div><div class='add'>+ */</div><div class='add'>+struct iwl_umac_scan_channel_survey_notif {</div><div class='add'>+	__le32 channel;</div><div class='add'>+	__le32 band;</div><div class='add'>+	u8 noise[IWL_MAX_NUM_NOISE_RESULTS];</div><div class='add'>+	u8 reserved[2];</div><div class='add'>+	__le32 active_time;</div><div class='add'>+	__le32 busy_time;</div><div class='add'>+	__le32 tx_time;</div><div class='add'>+	__le32 rx_time;</div><div class='add'>+} __packed; /* SCAN_CHANNEL_SURVEY_NTF_API_S_VER_1 */</div><div class='add'>+</div><div class='ctx'> #endif /* __iwl_fw_api_scan_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/sta.h b/drivers/net/wireless/intel/iwlwifi/fw/api/sta.h<br/>index 12b2f2c48387..e6f9abdfa546 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/sta.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/sta.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/sta.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/sta.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2021, 2023, 2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -28,6 +28,8 @@</div><div class='ctx'>  * @STA_FLG_MAX_AGG_SIZE_256K: maximal size for A-MPDU (256k supported)</div><div class='ctx'>  * @STA_FLG_MAX_AGG_SIZE_512K: maximal size for A-MPDU (512k supported)</div><div class='ctx'>  * @STA_FLG_MAX_AGG_SIZE_1024K: maximal size for A-MPDU (1024k supported)</div><div class='add'>+ * @STA_FLG_MAX_AGG_SIZE_2M: maximal size for A-MPDU (2M supported)</div><div class='add'>+ * @STA_FLG_MAX_AGG_SIZE_4M: maximal size for A-MPDU (4M supported)</div><div class='ctx'>  * @STA_FLG_AGG_MPDU_DENS_MSK: maximal MPDU density for Tx aggregation</div><div class='ctx'>  * @STA_FLG_FAT_EN_MSK: support for channel width (for Tx). This flag is</div><div class='ctx'>  *	initialised by driver and can be updated by fw upon reception of</div><div class='hunk'>@@ -107,6 +109,7 @@ enum iwl_sta_flags {</div><div class='ctx'>  * @STA_KEY_FLG_EN_MSK: mask for encryption algorithmi value</div><div class='ctx'>  * @STA_KEY_FLG_WEP_KEY_MAP: wep is either a group key (0 - legacy WEP) or from</div><div class='ctx'>  *	station info array (1 - n 1X mode)</div><div class='add'>+ * @STA_KEY_FLG_AMSDU_SPP: SPP (signaling and payload protected) A-MSDU</div><div class='ctx'>  * @STA_KEY_FLG_KEYID_MSK: the index of the key</div><div class='ctx'>  * @STA_KEY_FLG_KEYID_POS: key index bit position</div><div class='ctx'>  * @STA_KEY_NOT_VALID: key is invalid</div><div class='hunk'>@@ -127,6 +130,7 @@ enum iwl_sta_key_flag {</div><div class='ctx'> 	STA_KEY_FLG_EN_MSK		= (7 &lt;&lt; 0),</div><div class='ctx'> </div><div class='ctx'> 	STA_KEY_FLG_WEP_KEY_MAP		= BIT(3),</div><div class='add'>+	STA_KEY_FLG_AMSDU_SPP		= BIT(7),</div><div class='ctx'> 	STA_KEY_FLG_KEYID_POS		 = 8,</div><div class='ctx'> 	STA_KEY_FLG_KEYID_MSK		= (3 &lt;&lt; STA_KEY_FLG_KEYID_POS),</div><div class='ctx'> 	STA_KEY_NOT_VALID		= BIT(11),</div><div class='hunk'>@@ -187,6 +191,7 @@ enum iwl_sta_sleep_flag {</div><div class='ctx'> #define STA_KEY_IDX_INVALID (0xff)</div><div class='ctx'> #define STA_KEY_MAX_DATA_KEY_NUM (4)</div><div class='ctx'> #define IWL_MAX_GLOBAL_KEYS (4)</div><div class='add'>+#define IWL_MAX_NUM_IGTKS 2</div><div class='ctx'> #define STA_KEY_LEN_WEP40 (5)</div><div class='ctx'> #define STA_KEY_LEN_WEP104 (13)</div><div class='ctx'> </div><div class='hunk'>@@ -384,13 +389,17 @@ struct iwl_mvm_add_sta_key_cmd_v1 {</div><div class='ctx'>  * @rx_mic_key: TKIP RX unicast or multicast key</div><div class='ctx'>  * @tx_mic_key: TKIP TX key</div><div class='ctx'>  * @transmit_seq_cnt: TSC, transmit packet number</div><div class='add'>+ *</div><div class='add'>+ * Note: This is used for both v2 and v3, the difference being</div><div class='add'>+ * in the way the common.rx_secur_seq_cnt is used, in v2 that's</div><div class='add'>+ * the strange hole format, in v3 it's just a u64.</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_mvm_add_sta_key_cmd {</div><div class='ctx'> 	struct iwl_mvm_add_sta_key_common common;</div><div class='ctx'> 	__le64 rx_mic_key;</div><div class='ctx'> 	__le64 tx_mic_key;</div><div class='ctx'> 	__le64 transmit_seq_cnt;</div><div class='del'>-} __packed; /* ADD_MODIFY_STA_KEY_API_S_VER_2 */</div><div class='add'>+} __packed; /* ADD_MODIFY_STA_KEY_API_S_VER_2, ADD_MODIFY_STA_KEY_API_S_VER_3 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_mvm_add_sta_rsp_status - status in the response to ADD_STA command</div><div class='hunk'>@@ -419,7 +428,7 @@ struct iwl_mvm_rm_sta_cmd {</div><div class='ctx'> } __packed; /* REMOVE_STA_CMD_API_S_VER_2 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_mvm_mgmt_mcast_key_cmd_v1</div><div class='add'>+ * struct iwl_mvm_mgmt_mcast_key_cmd_v1 - IGTK command</div><div class='ctx'>  * ( MGMT_MCAST_KEY = 0x1f )</div><div class='ctx'>  * @ctrl_flags: &amp;enum iwl_sta_key_flag</div><div class='ctx'>  * @igtk: IGTK key material</div><div class='hunk'>@@ -440,7 +449,7 @@ struct iwl_mvm_mgmt_mcast_key_cmd_v1 {</div><div class='ctx'> } __packed; /* SEC_MGMT_MULTICAST_KEY_CMD_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_mvm_mgmt_mcast_key_cmd</div><div class='add'>+ * struct iwl_mvm_mgmt_mcast_key_cmd - IGTK command</div><div class='ctx'>  * ( MGMT_MCAST_KEY = 0x1f )</div><div class='ctx'>  * @ctrl_flags: &amp;enum iwl_sta_key_flag</div><div class='ctx'>  * @igtk: IGTK master key</div><div class='hunk'>@@ -471,7 +480,7 @@ struct iwl_mvm_wep_key_cmd {</div><div class='ctx'> 	u8 decryption_type;</div><div class='ctx'> 	u8 flags;</div><div class='ctx'> 	u8 reserved;</div><div class='del'>-	struct iwl_mvm_wep_key wep_key[0];</div><div class='add'>+	struct iwl_mvm_wep_key wep_key[];</div><div class='ctx'> } __packed; /* SEC_CURR_WEP_KEY_CMD_API_S_VER_2 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/stats.h b/drivers/net/wireless/intel/iwlwifi/fw/api/stats.h<br/>index 18cca15caa3a..8d9a5058d5a5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/stats.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/stats.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/stats.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/stats.h</a></div><div class='hunk'>@@ -1,12 +1,13 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018, 2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018, 2020-2021, 2023-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_fw_api_stats_h__</div><div class='ctx'> #define __iwl_fw_api_stats_h__</div><div class='ctx'> #include "mac.h"</div><div class='add'>+#include "mac-cfg.h"</div><div class='ctx'> </div><div class='ctx'> struct mvm_statistics_dbg {</div><div class='ctx'> 	__le32 burst_check;</div><div class='hunk'>@@ -25,7 +26,7 @@ struct mvm_statistics_div {</div><div class='ctx'> } __packed; /* STATISTICS_SLOW_DIV_API_S_VER_2 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct mvm_statistics_rx_non_phy</div><div class='add'>+ * struct mvm_statistics_rx_non_phy - non-PHY RX statistics</div><div class='ctx'>  * @bogus_cts: CTS received when not expecting CTS</div><div class='ctx'>  * @bogus_ack: ACK received when not expecting ACK</div><div class='ctx'>  * @non_channel_beacons: beacons with our bss id but not on our serving channel</div><div class='hunk'>@@ -326,14 +327,14 @@ struct mvm_statistics_load {</div><div class='ctx'> 	__le32 air_time[MAC_INDEX_AUX];</div><div class='ctx'> 	__le32 byte_count[MAC_INDEX_AUX];</div><div class='ctx'> 	__le32 pkt_count[MAC_INDEX_AUX];</div><div class='del'>-	u8 avg_energy[IWL_MVM_STATION_COUNT_MAX];</div><div class='add'>+	u8 avg_energy[IWL_STATION_COUNT_MAX];</div><div class='ctx'> } __packed; /* STATISTICS_RX_MAC_STATION_S_VER_3 */</div><div class='ctx'> </div><div class='ctx'> struct mvm_statistics_load_v1 {</div><div class='ctx'> 	__le32 air_time[NUM_MAC_INDEX];</div><div class='ctx'> 	__le32 byte_count[NUM_MAC_INDEX];</div><div class='ctx'> 	__le32 pkt_count[NUM_MAC_INDEX];</div><div class='del'>-	u8 avg_energy[IWL_MVM_STATION_COUNT_MAX];</div><div class='add'>+	u8 avg_energy[IWL_STATION_COUNT_MAX];</div><div class='ctx'> } __packed; /* STATISTICS_RX_MAC_STATION_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> struct mvm_statistics_rx {</div><div class='hunk'>@@ -412,7 +413,50 @@ struct iwl_statistics_cmd {</div><div class='ctx'> #define MAX_BCAST_FILTER_NUM		8</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum iwl_fw_statistics_type</div><div class='add'>+ * enum iwl_statistics_notify_type_id - type_id used in system statistics</div><div class='add'>+ *	command</div><div class='add'>+ * @IWL_STATS_NTFY_TYPE_ID_OPER: request legacy statistics</div><div class='add'>+ * @IWL_STATS_NTFY_TYPE_ID_OPER_PART1: request operational part1 statistics</div><div class='add'>+ * @IWL_STATS_NTFY_TYPE_ID_OPER_PART2: request operational part2 statistics</div><div class='add'>+ * @IWL_STATS_NTFY_TYPE_ID_OPER_PART3: request operational part3 statistics</div><div class='add'>+ * @IWL_STATS_NTFY_TYPE_ID_OPER_PART4: request operational part4 statistics</div><div class='add'>+ */</div><div class='add'>+enum iwl_statistics_notify_type_id {</div><div class='add'>+	IWL_STATS_NTFY_TYPE_ID_OPER		= BIT(0),</div><div class='add'>+	IWL_STATS_NTFY_TYPE_ID_OPER_PART1	= BIT(1),</div><div class='add'>+	IWL_STATS_NTFY_TYPE_ID_OPER_PART2	= BIT(2),</div><div class='add'>+	IWL_STATS_NTFY_TYPE_ID_OPER_PART3	= BIT(3),</div><div class='add'>+	IWL_STATS_NTFY_TYPE_ID_OPER_PART4	= BIT(4),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_statistics_cfg_flags - cfg_mask used in system statistics command</div><div class='add'>+ * @IWL_STATS_CFG_FLG_DISABLE_NTFY_MSK: 0 for enable, 1 for disable</div><div class='add'>+ * @IWL_STATS_CFG_FLG_ON_DEMAND_NTFY_MSK: 0 for periodic, 1 for on-demand</div><div class='add'>+ * @IWL_STATS_CFG_FLG_RESET_MSK: 0 for reset statistics after</div><div class='add'>+ *	sending the notification, 1 for do not reset statistics after sending</div><div class='add'>+ *	the notification</div><div class='add'>+ */</div><div class='add'>+enum iwl_statistics_cfg_flags {</div><div class='add'>+	IWL_STATS_CFG_FLG_DISABLE_NTFY_MSK	= BIT(0),</div><div class='add'>+	IWL_STATS_CFG_FLG_ON_DEMAND_NTFY_MSK	= BIT(1),</div><div class='add'>+	IWL_STATS_CFG_FLG_RESET_MSK		= BIT(2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_system_statistics_cmd - system statistics command</div><div class='add'>+ * @cfg_mask: configuration mask, &amp;enum iwl_statistics_cfg_flags</div><div class='add'>+ * @config_time_sec: time in sec for periodic notification</div><div class='add'>+ * @type_id_mask: type_id masks, &amp;enum iwl_statistics_notify_type_id</div><div class='add'>+ */</div><div class='add'>+struct iwl_system_statistics_cmd {</div><div class='add'>+	__le32 cfg_mask;</div><div class='add'>+	__le32 config_time_sec;</div><div class='add'>+	__le32 type_id_mask;</div><div class='add'>+} __packed; /* STATISTICS_FW_CMD_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_fw_statistics_type - statistics type</div><div class='ctx'>  *</div><div class='ctx'>  * @FW_STATISTICS_OPERATIONAL: operational statistics</div><div class='ctx'>  * @FW_STATISTICS_PHY: phy statistics</div><div class='hunk'>@@ -432,8 +476,9 @@ enum iwl_fw_statistics_type {</div><div class='ctx'> 	FW_STATISTICS_HE,</div><div class='ctx'> }; /* FW_STATISTICS_TYPE_API_E_VER_1 */</div><div class='ctx'> </div><div class='add'>+#define IWL_STATISTICS_TYPE_MSK 0x7f</div><div class='ctx'> /**</div><div class='del'>- * struct iwl_statistics_ntfy_hdr</div><div class='add'>+ * struct iwl_statistics_ntfy_hdr - statistics notification header</div><div class='ctx'>  *</div><div class='ctx'>  * @type: struct type</div><div class='ctx'>  * @version: version of the struct</div><div class='hunk'>@@ -446,7 +491,179 @@ struct iwl_statistics_ntfy_hdr {</div><div class='ctx'> }; /* STATISTICS_NTFY_HDR_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_statistics_operational_ntfy</div><div class='add'>+ * struct iwl_stats_ntfy_per_link - per-link statistics</div><div class='add'>+ *</div><div class='add'>+ * @beacon_filter_average_energy: Average energy [-dBm] of the 2</div><div class='add'>+ *	 antennas.</div><div class='add'>+ * @air_time: air time</div><div class='add'>+ * @beacon_counter: all beacons (both filtered and not filtered)</div><div class='add'>+ * @beacon_average_energy: Average energy [-dBm] of all beacons</div><div class='add'>+ *	(both filtered and not filtered)</div><div class='add'>+ * @beacon_rssi_a: beacon RSSI on antenna A</div><div class='add'>+ * @beacon_rssi_b: beacon RSSI on antenna B</div><div class='add'>+ * @rx_bytes: RX byte count</div><div class='add'>+ */</div><div class='add'>+struct iwl_stats_ntfy_per_link {</div><div class='add'>+	__le32 beacon_filter_average_energy;</div><div class='add'>+	__le32 air_time;</div><div class='add'>+	__le32 beacon_counter;</div><div class='add'>+	__le32 beacon_average_energy;</div><div class='add'>+	__le32 beacon_rssi_a;</div><div class='add'>+	__le32 beacon_rssi_b;</div><div class='add'>+	__le32 rx_bytes;</div><div class='add'>+} __packed; /* STATISTICS_NTFY_PER_LINK_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_stats_ntfy_part1_per_link - part1 per link statistics</div><div class='add'>+ *</div><div class='add'>+ * @rx_time: rx time</div><div class='add'>+ * @tx_time: tx time</div><div class='add'>+ * @rx_action: action frames handled by FW</div><div class='add'>+ * @tx_action: action frames generated and transmitted by FW</div><div class='add'>+ * @cca_defers: cca defer count</div><div class='add'>+ * @beacon_filtered: filtered out beacons</div><div class='add'>+ */</div><div class='add'>+struct iwl_stats_ntfy_part1_per_link {</div><div class='add'>+	__le64 rx_time;</div><div class='add'>+	__le64 tx_time;</div><div class='add'>+	__le32 rx_action;</div><div class='add'>+	__le32 tx_action;</div><div class='add'>+	__le32 cca_defers;</div><div class='add'>+	__le32 beacon_filtered;</div><div class='add'>+} __packed; /* STATISTICS_FW_NTFY_OPERATIONAL_PART1_PER_LINK_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_stats_ntfy_per_mac - per MAC statistics</div><div class='add'>+ *</div><div class='add'>+ * @beacon_filter_average_energy: Average energy [-dBm] of the 2</div><div class='add'>+ *	 antennas.</div><div class='add'>+ * @air_time: air time</div><div class='add'>+ * @beacon_counter: all beacons (both filtered and not filtered)</div><div class='add'>+ * @beacon_average_energy: all beacons (both filtered and not</div><div class='add'>+ *	 filtered)</div><div class='add'>+ * @beacon_rssi_a: beacon RSSI on antenna A</div><div class='add'>+ * @beacon_rssi_b: beacon RSSI on antenna B</div><div class='add'>+ * @rx_bytes: RX byte count</div><div class='add'>+ */</div><div class='add'>+struct iwl_stats_ntfy_per_mac {</div><div class='add'>+	__le32 beacon_filter_average_energy;</div><div class='add'>+	__le32 air_time;</div><div class='add'>+	__le32 beacon_counter;</div><div class='add'>+	__le32 beacon_average_energy;</div><div class='add'>+	__le32 beacon_rssi_a;</div><div class='add'>+	__le32 beacon_rssi_b;</div><div class='add'>+	__le32 rx_bytes;</div><div class='add'>+} __packed; /* STATISTICS_NTFY_PER_MAC_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+#define IWL_STATS_MAX_BW_INDEX 5</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_stats_ntfy_per_phy - per PHY statistics</div><div class='add'>+ * @channel_load: channel load</div><div class='add'>+ * @channel_load_by_us: device contribution to MCLM</div><div class='add'>+ * @channel_load_not_by_us: other devices' contribution to MCLM</div><div class='add'>+ * @clt: CLT HW timer (TIM_CH_LOAD2)</div><div class='add'>+ * @act: active accumulator SW</div><div class='add'>+ * @elp: elapsed time accumulator SW</div><div class='add'>+ * @rx_detected_per_ch_width: number of deferred TX per channel width,</div><div class='add'>+ *	0 - 20, 1/2/3 - 40/80/160</div><div class='add'>+ * @success_per_ch_width: number of frames that got ACK/BACK/CTS</div><div class='add'>+ *	per channel BW. note, BACK counted as 1</div><div class='add'>+ * @fail_per_ch_width: number of frames that didn't get ACK/BACK/CTS</div><div class='add'>+ *	per channel BW. note BACK counted as 1</div><div class='add'>+ * @last_tx_ch_width_indx: last txed frame channel width index</div><div class='add'>+ */</div><div class='add'>+struct iwl_stats_ntfy_per_phy {</div><div class='add'>+	__le32 channel_load;</div><div class='add'>+	__le32 channel_load_by_us;</div><div class='add'>+	__le32 channel_load_not_by_us;</div><div class='add'>+	__le32 clt;</div><div class='add'>+	__le32 act;</div><div class='add'>+	__le32 elp;</div><div class='add'>+	__le32 rx_detected_per_ch_width[IWL_STATS_MAX_BW_INDEX];</div><div class='add'>+	__le32 success_per_ch_width[IWL_STATS_MAX_BW_INDEX];</div><div class='add'>+	__le32 fail_per_ch_width[IWL_STATS_MAX_BW_INDEX];</div><div class='add'>+	__le32 last_tx_ch_width_indx;</div><div class='add'>+} __packed; /* STATISTICS_NTFY_PER_PHY_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/* unknown channel load (due to not being active on channel) */</div><div class='add'>+#define IWL_STATS_UNKNOWN_CHANNEL_LOAD	0xffffffff</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_stats_ntfy_per_sta - per STA statistics</div><div class='add'>+ *</div><div class='add'>+ * @average_energy: in fact it is minus the energy..</div><div class='add'>+ */</div><div class='add'>+struct iwl_stats_ntfy_per_sta {</div><div class='add'>+	__le32 average_energy;</div><div class='add'>+} __packed; /* STATISTICS_NTFY_PER_STA_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+#define IWL_STATS_MAX_PHY_OPERATIONAL 3</div><div class='add'>+#define IWL_STATS_MAX_FW_LINKS	(IWL_FW_MAX_LINK_ID + 1)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_system_statistics_notif_oper - statistics notification</div><div class='add'>+ *</div><div class='add'>+ * @time_stamp: time when the notification is sent from firmware</div><div class='add'>+ * @per_link: per link statistics, &amp;struct iwl_stats_ntfy_per_link</div><div class='add'>+ * @per_phy: per phy statistics, &amp;struct iwl_stats_ntfy_per_phy</div><div class='add'>+ * @per_sta: per sta statistics, &amp;struct iwl_stats_ntfy_per_sta</div><div class='add'>+ */</div><div class='add'>+struct iwl_system_statistics_notif_oper {</div><div class='add'>+	__le32 time_stamp;</div><div class='add'>+	struct iwl_stats_ntfy_per_link per_link[IWL_STATS_MAX_FW_LINKS];</div><div class='add'>+	struct iwl_stats_ntfy_per_phy per_phy[IWL_STATS_MAX_PHY_OPERATIONAL];</div><div class='add'>+	struct iwl_stats_ntfy_per_sta per_sta[IWL_STATION_COUNT_MAX];</div><div class='add'>+} __packed; /* STATISTICS_FW_NTFY_OPERATIONAL_API_S_VER_3 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_system_statistics_part1_notif_oper - part1 stats notification</div><div class='add'>+ *</div><div class='add'>+ * @time_stamp: time when the notification is sent from firmware</div><div class='add'>+ * @per_link: per link statistics &amp;struct iwl_stats_ntfy_part1_per_link</div><div class='add'>+ * @per_phy_crc_error_stats: per phy crc error statistics</div><div class='add'>+ */</div><div class='add'>+struct iwl_system_statistics_part1_notif_oper {</div><div class='add'>+	__le32 time_stamp;</div><div class='add'>+	struct iwl_stats_ntfy_part1_per_link per_link[IWL_STATS_MAX_FW_LINKS];</div><div class='add'>+	__le32 per_phy_crc_error_stats[IWL_STATS_MAX_PHY_OPERATIONAL];</div><div class='add'>+} __packed; /* STATISTICS_FW_NTFY_OPERATIONAL_PART1_API_S_VER_4 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_system_statistics_end_notif - statistics end notification</div><div class='add'>+ *</div><div class='add'>+ * @time_stamp: time when the notification is sent from firmware</div><div class='add'>+ */</div><div class='add'>+struct iwl_system_statistics_end_notif {</div><div class='add'>+	__le32 time_stamp;</div><div class='add'>+} __packed; /* STATISTICS_FW_NTFY_END_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_statistics_operational_ntfy - operational stats notification</div><div class='add'>+ *</div><div class='add'>+ * @hdr: general statistics header</div><div class='add'>+ * @flags: bitmap of possible notification structures</div><div class='add'>+ * @per_mac: per mac statistics, &amp;struct iwl_stats_ntfy_per_mac</div><div class='add'>+ * @per_phy: per phy statistics, &amp;struct iwl_stats_ntfy_per_phy</div><div class='add'>+ * @per_sta: per sta statistics, &amp;struct iwl_stats_ntfy_per_sta</div><div class='add'>+ * @rx_time: rx time</div><div class='add'>+ * @tx_time: usec the radio is transmitting.</div><div class='add'>+ * @on_time_rf: The total time in usec the RF is awake.</div><div class='add'>+ * @on_time_scan: usec the radio is awake due to scan.</div><div class='add'>+ */</div><div class='add'>+struct iwl_statistics_operational_ntfy {</div><div class='add'>+	struct iwl_statistics_ntfy_hdr hdr;</div><div class='add'>+	__le32 flags;</div><div class='add'>+	struct iwl_stats_ntfy_per_mac per_mac[MAC_INDEX_AUX];</div><div class='add'>+	struct iwl_stats_ntfy_per_phy per_phy[IWL_STATS_MAX_PHY_OPERATIONAL];</div><div class='add'>+	struct iwl_stats_ntfy_per_sta per_sta[IWL_STATION_COUNT_MAX];</div><div class='add'>+	__le64 rx_time;</div><div class='add'>+	__le64 tx_time;</div><div class='add'>+	__le64 on_time_rf;</div><div class='add'>+	__le64 on_time_scan;</div><div class='add'>+} __packed; /* STATISTICS_OPERATIONAL_NTFY_API_S_VER_15 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_statistics_operational_ntfy_ver_14 - operational stats notification</div><div class='ctx'>  *</div><div class='ctx'>  * @hdr: general statistics header</div><div class='ctx'>  * @flags: bitmap of possible notification structures</div><div class='hunk'>@@ -469,7 +686,7 @@ struct iwl_statistics_ntfy_hdr {</div><div class='ctx'>  * @average_energy: in fact it is minus the energy..</div><div class='ctx'>  * @reserved: reserved</div><div class='ctx'>  */</div><div class='del'>-struct iwl_statistics_operational_ntfy {</div><div class='add'>+struct iwl_statistics_operational_ntfy_ver_14 {</div><div class='ctx'> 	struct iwl_statistics_ntfy_hdr hdr;</div><div class='ctx'> 	__le32 flags;</div><div class='ctx'> 	__le32 mac_id;</div><div class='hunk'>@@ -486,12 +703,12 @@ struct iwl_statistics_operational_ntfy {</div><div class='ctx'> 	__le64 tx_time;</div><div class='ctx'> 	__le64 on_time_rf;</div><div class='ctx'> 	__le64 on_time_scan;</div><div class='del'>-	__le32 average_energy[IWL_MVM_STATION_COUNT_MAX];</div><div class='add'>+	__le32 average_energy[IWL_STATION_COUNT_MAX];</div><div class='ctx'> 	__le32 reserved;</div><div class='ctx'> } __packed; /* STATISTICS_OPERATIONAL_NTFY_API_S_VER_14 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_statistics_phy_ntfy</div><div class='add'>+ * struct iwl_statistics_phy_ntfy - PHY statistics notification</div><div class='ctx'>  *</div><div class='ctx'>  * @hdr: general statistics header</div><div class='ctx'>  * RX PHY related statistics</div><div class='hunk'>@@ -592,7 +809,7 @@ struct iwl_statistics_phy_ntfy {</div><div class='ctx'> } __packed; /* STATISTICS_PHY_NTFY_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_statistics_mac_ntfy</div><div class='add'>+ * struct iwl_statistics_mac_ntfy - MAC statistics notification</div><div class='ctx'>  *</div><div class='ctx'>  * @hdr: general statistics header</div><div class='ctx'>  * @bcast_filter_passed_per_mac: bcast filter passed per mac</div><div class='hunk'>@@ -611,7 +828,7 @@ struct iwl_statistics_mac_ntfy {</div><div class='ctx'> } __packed; /* STATISTICS_MAC_NTFY_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_statistics_rx_ntfy</div><div class='add'>+ * struct iwl_statistics_rx_ntfy - RX statistics notification</div><div class='ctx'>  *</div><div class='ctx'>  * @hdr: general statistics header</div><div class='ctx'>  * @rx_agg_mpdu_cnt: aggregation frame count (number of</div><div class='hunk'>@@ -651,7 +868,7 @@ struct iwl_statistics_rx_ntfy {</div><div class='ctx'> } __packed; /* STATISTICS_RX_NTFY_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_statistics_tx_ntfy</div><div class='add'>+ * struct iwl_statistics_tx_ntfy - TX statistics notification</div><div class='ctx'>  *</div><div class='ctx'>  * @hdr: general statistics header</div><div class='ctx'>  * @cts_timeout: timeout when waiting for CTS</div><div class='hunk'>@@ -760,7 +977,7 @@ struct iwl_statistics_tx_ntfy {</div><div class='ctx'> } __packed; /* STATISTICS_TX_NTFY_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_statistics_duration_ntfy</div><div class='add'>+ * struct iwl_statistics_duration_ntfy - burst/duration statistics</div><div class='ctx'>  *</div><div class='ctx'>  * @hdr: general statistics header</div><div class='ctx'>  * @cont_burst_chk_cnt: number of times continuation or</div><div class='hunk'>@@ -779,7 +996,7 @@ struct iwl_statistics_duration_ntfy {</div><div class='ctx'> } __packed; /* STATISTICS_DURATION_NTFY_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_statistics_he_ntfy</div><div class='add'>+ * struct iwl_statistics_he_ntfy - HE statistics</div><div class='ctx'>  *</div><div class='ctx'>  * @hdr: general statistics header</div><div class='ctx'>  * received HE frames</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/soc.h b/drivers/net/wireless/intel/iwlwifi/fw/api/system.h<br/>index c5df1171462b..acf5d4b9a214 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/soc.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/soc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/system.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/system.h</a></div><div class='hunk'>@@ -1,11 +1,11 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2019-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2019-2021 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='del'>-#ifndef __iwl_fw_api_soc_h__</div><div class='del'>-#define __iwl_fw_api_soc_h__</div><div class='add'>+#ifndef __iwl_fw_api_system_h__</div><div class='add'>+#define __iwl_fw_api_system_h__</div><div class='ctx'> </div><div class='ctx'> #define SOC_CONFIG_CMD_FLAGS_DISCRETE		BIT(0)</div><div class='ctx'> #define SOC_CONFIG_CMD_FLAGS_LOW_LATENCY	BIT(1)</div><div class='hunk'>@@ -32,4 +32,12 @@ struct iwl_soc_configuration_cmd {</div><div class='ctx'> 	     * SOC_CONFIGURATION_CMD_S_VER_2</div><div class='ctx'> 	     */</div><div class='ctx'> </div><div class='del'>-#endif /* __iwl_fw_api_soc_h__ */</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_system_features_control_cmd - system features control command</div><div class='add'>+ * @features: bitmap of features to disable</div><div class='add'>+ */</div><div class='add'>+struct iwl_system_features_control_cmd {</div><div class='add'>+	__le32 features[4];</div><div class='add'>+} __packed; /* SYSTEM_FEATURES_CONTROL_CMD_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_fw_api_system_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h b/drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h<br/>index 14d35000abed..08edd1d99992 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018, 2024-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include "fw/api/tx.h"</div><div class='ctx'> #include "fw/api/phy-ctxt.h"</div><div class='ctx'> </div><div class='del'>-#define IWL_MVM_TDLS_STA_COUNT	4</div><div class='add'>+#define IWL_TDLS_STA_COUNT	4</div><div class='ctx'> </div><div class='ctx'> /* Type of TDLS request */</div><div class='ctx'> enum iwl_tdls_channel_switch_type {</div><div class='hunk'>@@ -50,7 +50,7 @@ struct iwl_tdls_channel_switch_timing {</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_tdls_channel_switch_frame {</div><div class='ctx'> 	__le32 switch_time_offset;</div><div class='del'>-	struct iwl_tx_cmd tx_cmd;</div><div class='add'>+	struct iwl_tx_cmd_v6_params tx_cmd;</div><div class='ctx'> 	u8 data[IWL_TDLS_CH_SW_FRAME_MAX_SIZE];</div><div class='ctx'> } __packed; /* TDLS_STA_CHANNEL_SWITCH_FRAME_API_S_VER_1 */</div><div class='ctx'> </div><div class='hunk'>@@ -128,11 +128,11 @@ struct iwl_tdls_config_cmd {</div><div class='ctx'> 	u8 tdls_peer_count;</div><div class='ctx'> 	u8 tx_to_ap_tid;</div><div class='ctx'> 	__le16 tx_to_ap_ssn;</div><div class='del'>-	struct iwl_tdls_sta_info sta_info[IWL_MVM_TDLS_STA_COUNT];</div><div class='add'>+	struct iwl_tdls_sta_info sta_info[IWL_TDLS_STA_COUNT];</div><div class='ctx'> </div><div class='ctx'> 	__le32 pti_req_data_offset;</div><div class='del'>-	struct iwl_tx_cmd pti_req_tx_cmd;</div><div class='del'>-	u8 pti_req_template[0];</div><div class='add'>+	struct iwl_tx_cmd_v6_params pti_req_tx_cmd;</div><div class='add'>+	u8 pti_req_template[];</div><div class='ctx'> } __packed; /* TDLS_CONFIG_CMD_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -155,7 +155,7 @@ struct iwl_tdls_config_sta_info_res {</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_tdls_config_res {</div><div class='ctx'> 	__le32 tx_to_ap_last_seq;</div><div class='del'>-	struct iwl_tdls_config_sta_info_res sta_info[IWL_MVM_TDLS_STA_COUNT];</div><div class='add'>+	struct iwl_tdls_config_sta_info_res sta_info[IWL_TDLS_STA_COUNT];</div><div class='ctx'> } __packed; /* TDLS_CONFIG_RSP_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> #endif /* __iwl_fw_api_tdls_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/time-event.h b/drivers/net/wireless/intel/iwlwifi/fw/api/time-event.h<br/>index 904cd78a9fa0..46d35ef4751e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/time-event.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/time-event.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/time-event.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/time-event.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2020, 2022-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -292,7 +292,7 @@ struct iwl_hs20_roc_req_tail {</div><div class='ctx'>  * ( HOT_SPOT_CMD 0x53 )</div><div class='ctx'>  *</div><div class='ctx'>  * @id_and_color: ID and color of the MAC</div><div class='del'>- * @action: action to perform, one of FW_CTXT_ACTION_*</div><div class='add'>+ * @action: action to perform, see &amp;enum iwl_ctxt_action</div><div class='ctx'>  * @event_unique_id: If the action FW_CTXT_ACTION_REMOVE then the</div><div class='ctx'>  *	event_unique_id should be the id of the time event assigned by ucode.</div><div class='ctx'>  *	Otherwise ignore the event_unique_id.</div><div class='hunk'>@@ -335,8 +335,101 @@ struct iwl_hs20_roc_res {</div><div class='ctx'> 	__le32 status;</div><div class='ctx'> } __packed; /* HOT_SPOT_RSP_API_S_VER_1 */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Activity types for the ROC command</div><div class='add'>+ * @ROC_ACTIVITY_HOTSPOT: ROC for hs20 activity</div><div class='add'>+ * @ROC_ACTIVITY_P2P_DISC: ROC for p2p discoverability activity</div><div class='add'>+ * @ROC_ACTIVITY_P2P_TXRX: ROC for p2p action frames activity</div><div class='add'>+ * @ROC_ACTIVITY_P2P_NEG: ROC for p2p negotiation (used also for TX)</div><div class='add'>+ */</div><div class='add'>+enum iwl_roc_activity {</div><div class='add'>+	ROC_ACTIVITY_HOTSPOT,</div><div class='add'>+	ROC_ACTIVITY_P2P_DISC,</div><div class='add'>+	ROC_ACTIVITY_P2P_TXRX,</div><div class='add'>+	ROC_ACTIVITY_P2P_NEG,</div><div class='add'>+	ROC_NUM_ACTIVITIES</div><div class='add'>+}; /* ROC_ACTIVITY_API_E_VER_1 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ROC command v5</div><div class='add'>+ *</div><div class='add'>+ * Command requests the firmware to remain on a channel for a certain duration.</div><div class='add'>+ *</div><div class='add'>+ * ( MAC_CONF_GROUP 0x3, ROC_CMD 0xE )</div><div class='add'>+ *</div><div class='add'>+ * @action: action to perform, see &amp;enum iwl_ctxt_action</div><div class='add'>+ * @activity: type of activity, see &amp;enum iwl_roc_activity</div><div class='add'>+ * @sta_id: station id, resumed during "Remain On Channel" activity.</div><div class='add'>+ * @channel_info: &amp;struct iwl_fw_channel_info</div><div class='add'>+ * @node_addr: node MAC address for Rx filtering</div><div class='add'>+ * @reserved: align to a dword</div><div class='add'>+ * @max_delay: max delay the ROC can start in TU</div><div class='add'>+ * @duration: remain on channel duration in TU</div><div class='add'>+ */</div><div class='add'>+struct iwl_roc_req_v5 {</div><div class='add'>+	__le32 action;</div><div class='add'>+	__le32 activity;</div><div class='add'>+	__le32 sta_id;</div><div class='add'>+	struct iwl_fw_channel_info channel_info;</div><div class='add'>+	u8 node_addr[ETH_ALEN];</div><div class='add'>+	__le16 reserved;</div><div class='add'>+	__le32 max_delay;</div><div class='add'>+	__le32 duration;</div><div class='add'>+} __packed; /* ROC_CMD_API_S_VER_5 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ROC command</div><div class='add'>+ *</div><div class='add'>+ * Command requests the firmware to remain on a channel for a certain duration.</div><div class='add'>+ *</div><div class='add'>+ * ( MAC_CONF_GROUP 0x3, ROC_CMD 0xE )</div><div class='add'>+ *</div><div class='add'>+ * @action: action to perform, see &amp;enum iwl_ctxt_action</div><div class='add'>+ * @activity: type of activity, see &amp;enum iwl_roc_activity</div><div class='add'>+ * @sta_id: station id, resumed during "Remain On Channel" activity.</div><div class='add'>+ * @channel_info: &amp;struct iwl_fw_channel_info</div><div class='add'>+ * @node_addr: node MAC address for Rx filtering</div><div class='add'>+ * @reserved1: align to a dword</div><div class='add'>+ * @max_delay: max delay the ROC can start in TU</div><div class='add'>+ * @duration: remain on channel duration in TU</div><div class='add'>+ * @interval: interval between repetitions (when repetitions &gt; 1).</div><div class='add'>+ * @repetitions: number of repetitions</div><div class='add'>+ *	0xFF: infinite repetitions. 0 or 1: single repetition.</div><div class='add'>+ * @reserved2: align to a dword</div><div class='add'>+ */</div><div class='add'>+struct iwl_roc_req {</div><div class='add'>+	__le32 action;</div><div class='add'>+	__le32 activity;</div><div class='add'>+	__le32 sta_id;</div><div class='add'>+	struct iwl_fw_channel_info channel_info;</div><div class='add'>+	u8 node_addr[ETH_ALEN];</div><div class='add'>+	__le16 reserved1;</div><div class='add'>+	__le32 max_delay;</div><div class='add'>+	__le32 duration;</div><div class='add'>+	__le32 interval;</div><div class='add'>+	u8 repetitions;</div><div class='add'>+	u8 reserved2[3];</div><div class='add'>+} __packed; /* ROC_CMD_API_S_VER_6 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ROC notification</div><div class='add'>+ *</div><div class='add'>+ * Notification when ROC startes and when ROC ended.</div><div class='add'>+ *</div><div class='add'>+ * ( MAC_CONF_GROUP 0x3, ROC_NOTIF 0xf8 )</div><div class='add'>+ *</div><div class='add'>+ * @status: true if ROC succeeded to start</div><div class='add'>+ * @start_end: true if ROC started, false if ROC ended</div><div class='add'>+ * @activity: notification to which activity - &amp;enum iwl_roc_activity</div><div class='add'>+ */</div><div class='add'>+struct iwl_roc_notif {</div><div class='add'>+	__le32 success;</div><div class='add'>+	__le32 started;</div><div class='add'>+	__le32 activity;</div><div class='add'>+} __packed; /* ROC_NOTIF_API_S_VER_1 */</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * enum iwl_mvm_session_prot_conf_id - session protection's configurations</div><div class='add'>+ * enum iwl_session_prot_conf_id - session protection's configurations</div><div class='ctx'>  * @SESSION_PROTECT_CONF_ASSOC: Start a session protection for association.</div><div class='ctx'>  *	The firmware will allocate two events.</div><div class='ctx'>  *	Valid for BSS_STA and P2P_STA.</div><div class='hunk'>@@ -359,13 +452,13 @@ struct iwl_hs20_roc_res {</div><div class='ctx'>  *	listen mode. Will be fragmented. Valid only on the P2P Device MAC.</div><div class='ctx'>  *	Valid only on the P2P Device MAC. The firmware will take into account</div><div class='ctx'>  *	the duration, the interval and the repetition count.</div><div class='del'>- * @SESSION_PROTECT_CONF_P2P_GO_NEGOTIATION: Schedule the P2P Device to be be</div><div class='add'>+ * @SESSION_PROTECT_CONF_P2P_GO_NEGOTIATION: Schedule the P2P Device to be</div><div class='ctx'>  *	able to run the GO Negotiation. Will not be fragmented and not</div><div class='ctx'>  *	repetitive. Valid only on the P2P Device MAC. Only the duration will</div><div class='ctx'>  *	be taken into account.</div><div class='ctx'>  * @SESSION_PROTECT_CONF_MAX_ID: not used</div><div class='ctx'>  */</div><div class='del'>-enum iwl_mvm_session_prot_conf_id {</div><div class='add'>+enum iwl_session_prot_conf_id {</div><div class='ctx'> 	SESSION_PROTECT_CONF_ASSOC,</div><div class='ctx'> 	SESSION_PROTECT_CONF_GO_CLIENT_ASSOC,</div><div class='ctx'> 	SESSION_PROTECT_CONF_P2P_DEVICE_DISCOV,</div><div class='hunk'>@@ -374,11 +467,12 @@ enum iwl_mvm_session_prot_conf_id {</div><div class='ctx'> }; /* SESSION_PROTECTION_CONF_ID_E_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_mvm_session_prot_cmd - configure a session protection</div><div class='del'>- * @id_and_color: the id and color of the mac for which this session protection</div><div class='del'>- *	is sent</div><div class='del'>- * @action: can be either FW_CTXT_ACTION_ADD or FW_CTXT_ACTION_REMOVE</div><div class='del'>- * @conf_id: see &amp;enum iwl_mvm_session_prot_conf_id</div><div class='add'>+ * struct iwl_session_prot_cmd - configure a session protection</div><div class='add'>+ * @id_and_color: the id and color of the link (or mac, for command version 1)</div><div class='add'>+ *	for which this session protection is sent</div><div class='add'>+ * @action: can be either FW_CTXT_ACTION_ADD or FW_CTXT_ACTION_REMOVE,</div><div class='add'>+ *	see &amp;enum iwl_ctxt_action</div><div class='add'>+ * @conf_id: see &amp;enum iwl_session_prot_conf_id</div><div class='ctx'>  * @duration_tu: the duration of the whole protection in TUs.</div><div class='ctx'>  * @repetition_count: not used</div><div class='ctx'>  * @interval: not used</div><div class='hunk'>@@ -388,7 +482,7 @@ enum iwl_mvm_session_prot_conf_id {</div><div class='ctx'>  * The firmware supports only one concurrent session protection per vif.</div><div class='ctx'>  * Adding a new session protection will remove any currently running session.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_mvm_session_prot_cmd {</div><div class='add'>+struct iwl_session_prot_cmd {</div><div class='ctx'> 	/* COMMON_INDEX_HDR_API_S_VER_1 hdr */</div><div class='ctx'> 	__le32 id_and_color;</div><div class='ctx'> 	__le32 action;</div><div class='hunk'>@@ -396,23 +490,30 @@ struct iwl_mvm_session_prot_cmd {</div><div class='ctx'> 	__le32 duration_tu;</div><div class='ctx'> 	__le32 repetition_count;</div><div class='ctx'> 	__le32 interval;</div><div class='del'>-} __packed; /* SESSION_PROTECTION_CMD_API_S_VER_1 */</div><div class='add'>+} __packed;</div><div class='add'>+/* SESSION_PROTECTION_CMD_API_S_VER_1 and</div><div class='add'>+ * SESSION_PROTECTION_CMD_API_S_VER_2</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_mvm_session_prot_notif - session protection started / ended</div><div class='del'>- * @mac_id: the mac id for which the session protection started / ended</div><div class='add'>+ * struct iwl_session_prot_notif - session protection started / ended</div><div class='add'>+ * @mac_link_id: the mac id (or link id, for notif ver &gt; 2) for which the</div><div class='add'>+ *	session protection started / ended</div><div class='ctx'>  * @status: 1 means success, 0 means failure</div><div class='ctx'>  * @start: 1 means the session protection started, 0 means it ended</div><div class='del'>- * @conf_id: see &amp;enum iwl_mvm_session_prot_conf_id</div><div class='add'>+ * @conf_id: see &amp;enum iwl_session_prot_conf_id</div><div class='ctx'>  *</div><div class='ctx'>  * Note that any session protection will always get two notifications: start</div><div class='ctx'>  * and end even the firmware could not schedule it.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_mvm_session_prot_notif {</div><div class='del'>-	__le32 mac_id;</div><div class='add'>+struct iwl_session_prot_notif {</div><div class='add'>+	__le32 mac_link_id;</div><div class='ctx'> 	__le32 status;</div><div class='ctx'> 	__le32 start;</div><div class='ctx'> 	__le32 conf_id;</div><div class='del'>-} __packed; /* SESSION_PROTECTION_NOTIFICATION_API_S_VER_2 */</div><div class='add'>+} __packed;</div><div class='add'>+/* SESSION_PROTECTION_NOTIFICATION_API_S_VER_2 and</div><div class='add'>+ * SESSION_PROTECTION_NOTIFICATION_API_S_VER_3</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> #endif /* __iwl_fw_api_time_event_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/tx.h b/drivers/net/wireless/intel/iwlwifi/fw/api/tx.h<br/>index 24e4a82a55da..31d3336726b4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/tx.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/tx.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/tx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/tx.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_fw_api_tx_h__</div><div class='hunk'>@@ -76,11 +76,17 @@ enum iwl_tx_flags {</div><div class='ctx'>  *	to a secured STA</div><div class='ctx'>  * @IWL_TX_FLAGS_HIGH_PRI: high priority frame (like EAPOL) - can affect rate</div><div class='ctx'>  *	selection, retry limits and BT kill</div><div class='add'>+ * @IWL_TX_FLAGS_RTS: firmware used an RTS</div><div class='add'>+ * @IWL_TX_FLAGS_CTS: firmware used CTS-to-self</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_tx_cmd_flags {</div><div class='ctx'> 	IWL_TX_FLAGS_CMD_RATE		= BIT(0),</div><div class='ctx'> 	IWL_TX_FLAGS_ENCRYPT_DIS	= BIT(1),</div><div class='ctx'> 	IWL_TX_FLAGS_HIGH_PRI		= BIT(2),</div><div class='add'>+	/* Use these flags only from</div><div class='add'>+	 * TX_FLAGS_BITS_API_S_VER_4 and above */</div><div class='add'>+	IWL_TX_FLAGS_RTS		= BIT(3),</div><div class='add'>+	IWL_TX_FLAGS_CTS		= BIT(4),</div><div class='ctx'> }; /* TX_FLAGS_BITS_API_S_VER_3 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -145,7 +151,7 @@ enum iwl_tx_cmd_sec_ctrl {</div><div class='ctx'> #define IWL_LOW_RETRY_LIMIT			7</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum iwl_tx_offload_assist_flags_pos -  set %iwl_tx_cmd offload_assist values</div><div class='add'>+ * enum iwl_tx_offload_assist_flags_pos -  set %iwl_tx_cmd_v6 offload_assist values</div><div class='ctx'>  * @TX_CMD_OFFLD_IP_HDR: offset to start of IP header (in words)</div><div class='ctx'>  *	from mac header end. For normal case it is 4 words for SNAP.</div><div class='ctx'>  *	note: tx_cmd, mac header and pad are not counted in the offset.</div><div class='hunk'>@@ -175,8 +181,8 @@ enum iwl_tx_offload_assist_flags_pos {</div><div class='ctx'> </div><div class='ctx'> /* TODO: complete documentation for try_cnt and btkill_cnt */</div><div class='ctx'> /**</div><div class='del'>- * struct iwl_tx_cmd - TX command struct to FW</div><div class='del'>- * ( TX_CMD = 0x1c )</div><div class='add'>+ * struct iwl_tx_cmd_v6_params - parameters of the TX</div><div class='add'>+ *</div><div class='ctx'>  * @len: in bytes of the payload, see below for details</div><div class='ctx'>  * @offload_assist: TX offload configuration</div><div class='ctx'>  * @tx_flags: combination of TX_CMD_FLG_*, see &amp;enum iwl_tx_flags</div><div class='hunk'>@@ -185,7 +191,7 @@ enum iwl_tx_offload_assist_flags_pos {</div><div class='ctx'>  *	cleared. Combination of RATE_MCS_*</div><div class='ctx'>  * @sta_id: index of destination station in FW station table</div><div class='ctx'>  * @sec_ctl: security control, TX_CMD_SEC_*</div><div class='del'>- * @initial_rate_index: index into the the rate table for initial TX attempt.</div><div class='add'>+ * @initial_rate_index: index into the rate table for initial TX attempt.</div><div class='ctx'>  *	Applied if TX_CMD_FLG_STA_RATE_MSK is set, normally 0 for data frames.</div><div class='ctx'>  * @reserved2: reserved</div><div class='ctx'>  * @key: security key</div><div class='hunk'>@@ -199,8 +205,6 @@ enum iwl_tx_offload_assist_flags_pos {</div><div class='ctx'>  * @tid_tspec: TID/tspec</div><div class='ctx'>  * @pm_frame_timeout: PM TX frame timeout</div><div class='ctx'>  * @reserved4: reserved</div><div class='del'>- * @payload: payload (same as @hdr)</div><div class='del'>- * @hdr: 802.11 header (same as @payload)</div><div class='ctx'>  *</div><div class='ctx'>  * The byte count (both len and next_frame_len) includes MAC header</div><div class='ctx'>  * (24/26/30/32 bytes)</div><div class='hunk'>@@ -211,11 +215,8 @@ enum iwl_tx_offload_assist_flags_pos {</div><div class='ctx'>  * It does not include post-MAC padding, i.e.,</div><div class='ctx'>  * MIC (CCM) 8 bytes, ICV (WEP/TKIP/CKIP) 4 bytes, CRC 4 bytes.</div><div class='ctx'>  * Range of len: 14-2342 bytes.</div><div class='del'>- *</div><div class='del'>- * After the struct fields the MAC header is placed, plus any padding,</div><div class='del'>- * and then the actial payload.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_tx_cmd {</div><div class='add'>+struct iwl_tx_cmd_v6_params {</div><div class='ctx'> 	__le16 len;</div><div class='ctx'> 	__le16 offload_assist;</div><div class='ctx'> 	__le32 tx_flags;</div><div class='hunk'>@@ -239,8 +240,20 @@ struct iwl_tx_cmd {</div><div class='ctx'> 	u8 tid_tspec;</div><div class='ctx'> 	__le16 pm_frame_timeout;</div><div class='ctx'> 	__le16 reserved4;</div><div class='del'>-	u8 payload[0];</div><div class='del'>-	struct ieee80211_hdr hdr[0];</div><div class='add'>+} __packed; /* TX_CMD_API_S_VER_6 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_tx_cmd_v6 - TX command struct to FW</div><div class='add'>+ * ( TX_CMD = 0x1c )</div><div class='add'>+ * @params: parameters of the TX, see &amp;struct iwl_tx_cmd_v6_tx_params</div><div class='add'>+ * @hdr: 802.11 header</div><div class='add'>+ *</div><div class='add'>+ * After &amp;params, the MAC header is placed, plus any padding,</div><div class='add'>+ * and then the actual payload.</div><div class='add'>+ */</div><div class='add'>+struct iwl_tx_cmd_v6 {</div><div class='add'>+	struct iwl_tx_cmd_v6_params params;</div><div class='add'>+	struct ieee80211_hdr hdr[];</div><div class='ctx'> } __packed; /* TX_CMD_API_S_VER_6 */</div><div class='ctx'> </div><div class='ctx'> struct iwl_dram_sec_info {</div><div class='hunk'>@@ -250,7 +263,7 @@ struct iwl_dram_sec_info {</div><div class='ctx'> } __packed; /* DRAM_SEC_INFO_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_tx_cmd_gen2 - TX command struct to FW for 22000 devices</div><div class='add'>+ * struct iwl_tx_cmd_v9 - TX command struct to FW for 22000 devices</div><div class='ctx'>  * ( TX_CMD = 0x1c )</div><div class='ctx'>  * @len: in bytes of the payload, see below for details</div><div class='ctx'>  * @offload_assist: TX offload configuration</div><div class='hunk'>@@ -260,37 +273,39 @@ struct iwl_dram_sec_info {</div><div class='ctx'>  *	cleared. Combination of RATE_MCS_*</div><div class='ctx'>  * @hdr: 802.11 header</div><div class='ctx'>  */</div><div class='del'>-struct iwl_tx_cmd_gen2 {</div><div class='add'>+struct iwl_tx_cmd_v9 {</div><div class='ctx'> 	__le16 len;</div><div class='ctx'> 	__le16 offload_assist;</div><div class='ctx'> 	__le32 flags;</div><div class='ctx'> 	struct iwl_dram_sec_info dram_info;</div><div class='ctx'> 	__le32 rate_n_flags;</div><div class='ctx'> 	struct ieee80211_hdr hdr[];</div><div class='del'>-} __packed; /* TX_CMD_API_S_VER_7 */</div><div class='add'>+} __packed; /* TX_CMD_API_S_VER_7,</div><div class='add'>+	       TX_CMD_API_S_VER_9 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_tx_cmd_gen3 - TX command struct to FW for AX210+ devices</div><div class='add'>+ * struct iwl_tx_cmd - TX command struct to FW for AX210+ devices</div><div class='ctx'>  * ( TX_CMD = 0x1c )</div><div class='ctx'>  * @len: in bytes of the payload, see below for details</div><div class='ctx'>  * @flags: combination of &amp;enum iwl_tx_cmd_flags</div><div class='ctx'>  * @offload_assist: TX offload configuration</div><div class='ctx'>  * @dram_info: FW internal DRAM storage</div><div class='ctx'>  * @rate_n_flags: rate for *all* Tx attempts, if TX_CMD_FLG_STA_RATE_MSK is</div><div class='del'>- *	cleared. Combination of RATE_MCS_*</div><div class='del'>- * @ttl: time to live - packet lifetime limit. The FW should drop if</div><div class='del'>- *	passed.</div><div class='add'>+ *	cleared. Combination of RATE_MCS_*; format depends on version</div><div class='add'>+ * @reserved: reserved</div><div class='ctx'>  * @hdr: 802.11 header</div><div class='ctx'>  */</div><div class='del'>-struct iwl_tx_cmd_gen3 {</div><div class='add'>+struct iwl_tx_cmd {</div><div class='ctx'> 	__le16 len;</div><div class='ctx'> 	__le16 flags;</div><div class='ctx'> 	__le32 offload_assist;</div><div class='ctx'> 	struct iwl_dram_sec_info dram_info;</div><div class='ctx'> 	__le32 rate_n_flags;</div><div class='del'>-	__le64 ttl;</div><div class='add'>+	u8 reserved[8];</div><div class='ctx'> 	struct ieee80211_hdr hdr[];</div><div class='del'>-} __packed; /* TX_CMD_API_S_VER_8 */</div><div class='add'>+} __packed; /* TX_CMD_API_S_VER_10,</div><div class='add'>+	     * TX_CMD_API_S_VER_11</div><div class='add'>+	     */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * TX response related data</div><div class='hunk'>@@ -473,11 +488,11 @@ struct agg_tx_status {</div><div class='ctx'> #define TX_RES_RATE_TABLE_COL_GET(_f) (((_f) &amp; TX_RES_RATE_TABLE_COLOR_MSK) &gt;&gt;\</div><div class='ctx'> 				       TX_RES_RATE_TABLE_COLOR_POS)</div><div class='ctx'> </div><div class='del'>-#define IWL_MVM_TX_RES_GET_TID(_ra_tid) ((_ra_tid) &amp; 0x0f)</div><div class='del'>-#define IWL_MVM_TX_RES_GET_RA(_ra_tid) ((_ra_tid) &gt;&gt; 4)</div><div class='add'>+#define IWL_TX_RES_GET_TID(_ra_tid) ((_ra_tid) &amp; 0x0f)</div><div class='add'>+#define IWL_TX_RES_GET_RA(_ra_tid) ((_ra_tid) &gt;&gt; 4)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_mvm_tx_resp_v3 - notifies that fw is TXing a packet</div><div class='add'>+ * struct iwl_tx_resp_v3 - notifies that fw is TXing a packet</div><div class='ctx'>  * ( REPLY_TX = 0x1c )</div><div class='ctx'>  * @frame_count: 1 no aggregation, &gt;1 aggregation</div><div class='ctx'>  * @bt_kill_count: num of times blocked by bluetooth (unused for agg)</div><div class='hunk'>@@ -508,7 +523,7 @@ struct agg_tx_status {</div><div class='ctx'>  * After the array of statuses comes the SSN of the SCD. Look at</div><div class='ctx'>  * %iwl_mvm_get_scd_ssn for more details.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_mvm_tx_resp_v3 {</div><div class='add'>+struct iwl_tx_resp_v3 {</div><div class='ctx'> 	u8 frame_count;</div><div class='ctx'> 	u8 bt_kill_count;</div><div class='ctx'> 	u8 failure_rts;</div><div class='hunk'>@@ -534,14 +549,14 @@ struct iwl_mvm_tx_resp_v3 {</div><div class='ctx'> } __packed; /* TX_RSP_API_S_VER_3 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_mvm_tx_resp - notifies that fw is TXing a packet</div><div class='add'>+ * struct iwl_tx_resp - notifies that fw is TXing a packet</div><div class='ctx'>  * ( REPLY_TX = 0x1c )</div><div class='ctx'>  * @frame_count: 1 no aggregation, &gt;1 aggregation</div><div class='ctx'>  * @bt_kill_count: num of times blocked by bluetooth (unused for agg)</div><div class='ctx'>  * @failure_rts: num of failures due to unsuccessful RTS</div><div class='ctx'>  * @failure_frame: num failures due to no ACK (unused for agg)</div><div class='ctx'>  * @initial_rate: for non-agg: rate of the successful Tx. For agg: rate of the</div><div class='del'>- *	Tx of all the batch. RATE_MCS_*</div><div class='add'>+ *	Tx of all the batch. RATE_MCS_*; format depends on command version</div><div class='ctx'>  * @wireless_media_time: for non-agg: RTS + CTS + frame tx attempts time + ACK.</div><div class='ctx'>  *	for agg: RTS + CTS + aggregation tx time + block-ack time.</div><div class='ctx'>  *	in usec.</div><div class='hunk'>@@ -566,7 +581,7 @@ struct iwl_mvm_tx_resp_v3 {</div><div class='ctx'>  * After the array of statuses comes the SSN of the SCD. Look at</div><div class='ctx'>  * %iwl_mvm_get_scd_ssn for more details.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_mvm_tx_resp {</div><div class='add'>+struct iwl_tx_resp {</div><div class='ctx'> 	u8 frame_count;</div><div class='ctx'> 	u8 bt_kill_count;</div><div class='ctx'> 	u8 failure_rts;</div><div class='hunk'>@@ -591,7 +606,11 @@ struct iwl_mvm_tx_resp {</div><div class='ctx'> 	__le16 tx_queue;</div><div class='ctx'> 	__le16 reserved2;</div><div class='ctx'> 	struct agg_tx_status status;</div><div class='del'>-} __packed; /* TX_RSP_API_S_VER_6 */</div><div class='add'>+} __packed; /* TX_RSP_API_S_VER_6,</div><div class='add'>+	     * TX_RSP_API_S_VER_7,</div><div class='add'>+	     * TX_RSP_API_S_VER_8,</div><div class='add'>+	     * TX_RSP_API_S_VER_9</div><div class='add'>+	     */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_mvm_ba_notif - notifies about reception of BA</div><div class='hunk'>@@ -628,14 +647,14 @@ struct iwl_mvm_ba_notif {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_mvm_compressed_ba_tfd - progress of a TFD queue</div><div class='add'>+ * struct iwl_compressed_ba_tfd - progress of a TFD queue</div><div class='ctx'>  * @q_num: TFD queue number</div><div class='ctx'>  * @tfd_index: Index of first un-acked frame in the  TFD queue</div><div class='ctx'>  * @scd_queue: For debug only - the physical queue the TFD queue is bound to</div><div class='ctx'>  * @tid: TID of the queue (0-7)</div><div class='ctx'>  * @reserved: reserved for alignment</div><div class='ctx'>  */</div><div class='del'>-struct iwl_mvm_compressed_ba_tfd {</div><div class='add'>+struct iwl_compressed_ba_tfd {</div><div class='ctx'> 	__le16 q_num;</div><div class='ctx'> 	__le16 tfd_index;</div><div class='ctx'> 	u8 scd_queue;</div><div class='hunk'>@@ -644,12 +663,12 @@ struct iwl_mvm_compressed_ba_tfd {</div><div class='ctx'> } __packed; /* COMPRESSED_BA_TFD_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_mvm_compressed_ba_ratid - progress of a RA TID queue</div><div class='add'>+ * struct iwl_compressed_ba_ratid - progress of a RA TID queue</div><div class='ctx'>  * @q_num: RA TID queue number</div><div class='ctx'>  * @tid: TID of the queue</div><div class='ctx'>  * @ssn: BA window current SSN</div><div class='ctx'>  */</div><div class='del'>-struct iwl_mvm_compressed_ba_ratid {</div><div class='add'>+struct iwl_compressed_ba_ratid {</div><div class='ctx'> 	u8 q_num;</div><div class='ctx'> 	u8 tid;</div><div class='ctx'> 	__le16 ssn;</div><div class='hunk'>@@ -675,7 +694,7 @@ enum iwl_mvm_ba_resp_flags {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_mvm_compressed_ba_notif - notifies about reception of BA</div><div class='add'>+ * struct iwl_compressed_ba_notif - notifies about reception of BA</div><div class='ctx'>  * ( BA_NOTIF = 0xc5 )</div><div class='ctx'>  * @flags: status flag, see the &amp;iwl_mvm_ba_resp_flags</div><div class='ctx'>  * @sta_id: Index of recipient (BA-sending) station in fw's station table</div><div class='hunk'>@@ -688,17 +707,19 @@ enum iwl_mvm_ba_resp_flags {</div><div class='ctx'>  * @query_frame_cnt: SCD query frame count</div><div class='ctx'>  * @txed: number of frames sent in the aggregation (all-TIDs)</div><div class='ctx'>  * @done: number of frames that were Acked by the BA (all-TIDs)</div><div class='add'>+ * @rts_retry_cnt: RTS retry count</div><div class='ctx'>  * @reserved: reserved (for alignment)</div><div class='ctx'>  * @wireless_time: Wireless-media time</div><div class='del'>- * @tx_rate: the rate the aggregation was sent at</div><div class='add'>+ * @tx_rate: the rate the aggregation was sent at. Format depends on command</div><div class='add'>+ *	version.</div><div class='ctx'>  * @tfd_cnt: number of TFD-Q elements</div><div class='ctx'>  * @ra_tid_cnt: number of RATID-Q elements</div><div class='del'>- * @tfd: array of TFD queue status updates. See &amp;iwl_mvm_compressed_ba_tfd</div><div class='add'>+ * @tfd: array of TFD queue status updates. See &amp;iwl_compressed_ba_tfd</div><div class='ctx'>  *	for details. Length in @tfd_cnt.</div><div class='ctx'>  * @ra_tid: array of RA-TID queue status updates. For debug purposes only. See</div><div class='del'>- *	&amp;iwl_mvm_compressed_ba_ratid for more details. Length in @ra_tid_cnt.</div><div class='add'>+ *	&amp;iwl_compressed_ba_ratid for more details. Length in @ra_tid_cnt.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_mvm_compressed_ba_notif {</div><div class='add'>+struct iwl_compressed_ba_notif {</div><div class='ctx'> 	__le32 flags;</div><div class='ctx'> 	u8 sta_id;</div><div class='ctx'> 	u8 reduced_txp;</div><div class='hunk'>@@ -708,14 +729,19 @@ struct iwl_mvm_compressed_ba_notif {</div><div class='ctx'> 	__le16 query_frame_cnt;</div><div class='ctx'> 	__le16 txed;</div><div class='ctx'> 	__le16 done;</div><div class='del'>-	__le16 reserved;</div><div class='add'>+	u8 rts_retry_cnt;</div><div class='add'>+	u8 reserved;</div><div class='ctx'> 	__le32 wireless_time;</div><div class='ctx'> 	__le32 tx_rate;</div><div class='ctx'> 	__le16 tfd_cnt;</div><div class='ctx'> 	__le16 ra_tid_cnt;</div><div class='del'>-	struct iwl_mvm_compressed_ba_ratid ra_tid[0];</div><div class='del'>-	struct iwl_mvm_compressed_ba_tfd tfd[];</div><div class='del'>-} __packed; /* COMPRESSED_BA_RES_API_S_VER_4 */</div><div class='add'>+	union {</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct iwl_compressed_ba_ratid, ra_tid);</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct iwl_compressed_ba_tfd, tfd);</div><div class='add'>+	};</div><div class='add'>+} __packed; /* COMPRESSED_BA_RES_API_S_VER_4,</div><div class='add'>+	       COMPRESSED_BA_RES_API_S_VER_6,</div><div class='add'>+	       COMPRESSED_BA_RES_API_S_VER_7 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_mac_beacon_cmd_v6 - beacon template command</div><div class='hunk'>@@ -727,7 +753,7 @@ struct iwl_mvm_compressed_ba_notif {</div><div class='ctx'>  * @frame: the template of the beacon frame</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_mac_beacon_cmd_v6 {</div><div class='del'>-	struct iwl_tx_cmd tx;</div><div class='add'>+	struct iwl_tx_cmd_v6_params tx;</div><div class='ctx'> 	__le32 template_id;</div><div class='ctx'> 	__le32 tim_idx;</div><div class='ctx'> 	__le32 tim_size;</div><div class='hunk'>@@ -746,7 +772,7 @@ struct iwl_mac_beacon_cmd_v6 {</div><div class='ctx'>  * @frame: the template of the beacon frame</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_mac_beacon_cmd_v7 {</div><div class='del'>-	struct iwl_tx_cmd tx;</div><div class='add'>+	struct iwl_tx_cmd_v6_params tx;</div><div class='ctx'> 	__le32 template_id;</div><div class='ctx'> 	__le32 tim_idx;</div><div class='ctx'> 	__le32 tim_size;</div><div class='hunk'>@@ -755,12 +781,20 @@ struct iwl_mac_beacon_cmd_v7 {</div><div class='ctx'> 	struct ieee80211_hdr frame[];</div><div class='ctx'> } __packed; /* BEACON_TEMPLATE_CMD_API_S_VER_7 */</div><div class='ctx'> </div><div class='add'>+/* Bit flags for BEACON_TEMPLATE_CMD_API until version 10 */</div><div class='add'>+enum iwl_mac_beacon_flags_v1 {</div><div class='add'>+	IWL_MAC_BEACON_CCK_V1	= BIT(8),</div><div class='add'>+	IWL_MAC_BEACON_ANT_A_V1 = BIT(9),</div><div class='add'>+	IWL_MAC_BEACON_ANT_B_V1 = BIT(10),</div><div class='add'>+	IWL_MAC_BEACON_FILS_V1	= BIT(12),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Bit flags for BEACON_TEMPLATE_CMD_API version 11 and above */</div><div class='ctx'> enum iwl_mac_beacon_flags {</div><div class='del'>-	IWL_MAC_BEACON_CCK	= BIT(8),</div><div class='del'>-	IWL_MAC_BEACON_ANT_A	= BIT(9),</div><div class='del'>-	IWL_MAC_BEACON_ANT_B	= BIT(10),</div><div class='del'>-	IWL_MAC_BEACON_ANT_C	= BIT(11),</div><div class='del'>-	IWL_MAC_BEACON_FILS	= BIT(12),</div><div class='add'>+	IWL_MAC_BEACON_CCK	= BIT(5),</div><div class='add'>+	IWL_MAC_BEACON_ANT_A	= BIT(6),</div><div class='add'>+	IWL_MAC_BEACON_ANT_B	= BIT(7),</div><div class='add'>+	IWL_MAC_BEACON_FILS	= BIT(8),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -770,9 +804,10 @@ enum iwl_mac_beacon_flags {</div><div class='ctx'>  *	is &amp;enum iwl_mac_beacon_flags.</div><div class='ctx'>  * @short_ssid: Short SSID</div><div class='ctx'>  * @reserved: reserved</div><div class='del'>- * @template_id: currently equal to the mac context id of the coresponding mac.</div><div class='add'>+ * @link_id: the firmware id of the link that will use this beacon</div><div class='ctx'>  * @tim_idx: the offset of the tim IE in the beacon</div><div class='del'>- * @tim_size: the length of the tim IE</div><div class='add'>+ * @tim_size: the length of the tim IE (version &lt; 14)</div><div class='add'>+ * @btwt_offset: offset to the broadcast TWT IE if present (version &gt;= 14)</div><div class='ctx'>  * @ecsa_offset: offset to the ECSA IE if present</div><div class='ctx'>  * @csa_offset: offset to the CSA IE if present</div><div class='ctx'>  * @frame: the template of the beacon frame</div><div class='hunk'>@@ -782,16 +817,24 @@ struct iwl_mac_beacon_cmd {</div><div class='ctx'> 	__le16 flags;</div><div class='ctx'> 	__le32 short_ssid;</div><div class='ctx'> 	__le32 reserved;</div><div class='del'>-	__le32 template_id;</div><div class='add'>+	__le32 link_id;</div><div class='ctx'> 	__le32 tim_idx;</div><div class='del'>-	__le32 tim_size;</div><div class='add'>+	union {</div><div class='add'>+		__le32 tim_size;</div><div class='add'>+		__le32 btwt_offset;</div><div class='add'>+	};</div><div class='ctx'> 	__le32 ecsa_offset;</div><div class='ctx'> 	__le32 csa_offset;</div><div class='ctx'> 	struct ieee80211_hdr frame[];</div><div class='del'>-} __packed; /* BEACON_TEMPLATE_CMD_API_S_VER_10 */</div><div class='add'>+} __packed; /* BEACON_TEMPLATE_CMD_API_S_VER_10,</div><div class='add'>+	     * BEACON_TEMPLATE_CMD_API_S_VER_11,</div><div class='add'>+	     * BEACON_TEMPLATE_CMD_API_S_VER_12,</div><div class='add'>+	     * BEACON_TEMPLATE_CMD_API_S_VER_13,</div><div class='add'>+	     * BEACON_TEMPLATE_CMD_API_S_VER_14</div><div class='add'>+	     */</div><div class='ctx'> </div><div class='ctx'> struct iwl_beacon_notif {</div><div class='del'>-	struct iwl_mvm_tx_resp beacon_notify_hdr;</div><div class='add'>+	struct iwl_tx_resp beacon_notify_hdr;</div><div class='ctx'> 	__le64 tsf;</div><div class='ctx'> 	__le32 ibss_mgr_status;</div><div class='ctx'> } __packed;</div><div class='hunk'>@@ -804,7 +847,7 @@ struct iwl_beacon_notif {</div><div class='ctx'>  * @gp2: last beacon time in gp2</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_extended_beacon_notif_v5 {</div><div class='del'>-	struct iwl_mvm_tx_resp beacon_notify_hdr;</div><div class='add'>+	struct iwl_tx_resp beacon_notify_hdr;</div><div class='ctx'> 	__le64 tsf;</div><div class='ctx'> 	__le32 ibss_mgr_status;</div><div class='ctx'> 	__le32 gp2;</div><div class='hunk'>@@ -826,7 +869,7 @@ struct iwl_extended_beacon_notif {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_dump_control - dump (flush) control flags</div><div class='del'>- * @DUMP_TX_FIFO_FLUSH: Dump MSDUs until the the FIFO is empty</div><div class='add'>+ * @DUMP_TX_FIFO_FLUSH: Dump MSDUs until the FIFO is empty</div><div class='ctx'>  *	and the TFD queues are empty.</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_dump_control {</div><div class='hunk'>@@ -834,7 +877,7 @@ enum iwl_dump_control {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_tx_path_flush_cmd -- queue/FIFO flush command</div><div class='add'>+ * struct iwl_tx_path_flush_cmd_v1 -- queue/FIFO flush command</div><div class='ctx'>  * @queues_ctl: bitmap of queues to flush</div><div class='ctx'>  * @flush_ctl: control flags</div><div class='ctx'>  * @reserved: reserved</div><div class='hunk'>@@ -861,6 +904,7 @@ struct iwl_tx_path_flush_cmd {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_flush_queue_info - virtual flush queue info</div><div class='add'>+ * @tid: the tid to flush</div><div class='ctx'>  * @queue_num: virtual queue id</div><div class='ctx'>  * @read_before_flush: read pointer before flush</div><div class='ctx'>  * @read_after_flush: read pointer after flush</div><div class='hunk'>@@ -874,6 +918,7 @@ struct iwl_flush_queue_info {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_tx_path_flush_cmd_rsp -- queue/FIFO flush command response</div><div class='add'>+ * @sta_id: the station for which the queue was flushed</div><div class='ctx'>  * @num_flushed_queues: number of queues in queues array</div><div class='ctx'>  * @queues: all flushed queues</div><div class='ctx'>  */</div><div class='hunk'>@@ -918,7 +963,7 @@ struct iwl_scd_txq_cfg_cmd {</div><div class='ctx'> } __packed; /* SCD_QUEUE_CFG_CMD_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scd_txq_cfg_rsp</div><div class='add'>+ * struct iwl_scd_txq_cfg_rsp - scheduler TXQ configuration response</div><div class='ctx'>  * @token: taken from the command</div><div class='ctx'>  * @sta_id: station id from the command</div><div class='ctx'>  * @tid: tid from the command</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/txq.h b/drivers/net/wireless/intel/iwlwifi/fw/api/txq.h<br/>index 8b3a00df41da..e6c0f928a6bb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/txq.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/api/txq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/api/txq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/api/txq.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2014, 2019-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2014, 2019-2021, 2023-2024 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -66,6 +66,16 @@ enum iwl_gen2_tx_fifo {</div><div class='ctx'> 	IWL_GEN2_TRIG_TX_FIFO_VO,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum iwl_bz_tx_fifo {</div><div class='add'>+	IWL_BZ_EDCA_TX_FIFO_BK,</div><div class='add'>+	IWL_BZ_EDCA_TX_FIFO_BE,</div><div class='add'>+	IWL_BZ_EDCA_TX_FIFO_VI,</div><div class='add'>+	IWL_BZ_EDCA_TX_FIFO_VO,</div><div class='add'>+	IWL_BZ_TRIG_TX_FIFO_BK,</div><div class='add'>+	IWL_BZ_TRIG_TX_FIFO_BE,</div><div class='add'>+	IWL_BZ_TRIG_TX_FIFO_VI,</div><div class='add'>+	IWL_BZ_TRIG_TX_FIFO_VO,</div><div class='add'>+};</div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_tx_queue_cfg_actions - TXQ config options</div><div class='ctx'>  * @TX_QUEUE_CFG_ENABLE_QUEUE: enable a queue</div><div class='hunk'>@@ -76,6 +86,8 @@ enum iwl_tx_queue_cfg_actions {</div><div class='ctx'> 	TX_QUEUE_CFG_TFD_SHORT_FORMAT		= BIT(1),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define IWL_DEFAULT_QUEUE_SIZE_EHT (512 * 4)</div><div class='add'>+#define IWL_DEFAULT_QUEUE_SIZE_HE 1024</div><div class='ctx'> #define IWL_DEFAULT_QUEUE_SIZE 256</div><div class='ctx'> #define IWL_MGMT_QUEUE_SIZE 16</div><div class='ctx'> #define IWL_CMD_QUEUE_SIZE 32</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c<br/>index cc4e18ca9566..2ce55859641c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/dbg.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/dbg.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/dbg.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/dbg.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2014, 2018-2021 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -12,14 +12,13 @@</div><div class='ctx'> #include "iwl-io.h"</div><div class='ctx'> #include "iwl-prph.h"</div><div class='ctx'> #include "iwl-csr.h"</div><div class='del'>-</div><div class='add'>+#include "iwl-fh.h"</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_fw_dump_ptrs - set of pointers needed for the fw-error-dump</div><div class='ctx'>  *</div><div class='ctx'>  * @fwrt_ptr: pointer to the buffer coming from fwrt</div><div class='ctx'>  * @trans_ptr: pointer to struct %iwl_trans_dump_data which contains the</div><div class='ctx'>  *	transport's data.</div><div class='del'>- * @trans_len: length of the valid data in trans_ptr</div><div class='ctx'>  * @fwrt_len: length of the valid data in fwrt_ptr</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_dump_ptrs {</div><div class='hunk'>@@ -159,11 +158,15 @@ static void iwl_fwrt_dump_txf(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	iwl_trans_read_prph(fwrt-&gt;trans, TXF_READ_MODIFY_DATA + offset);</div><div class='ctx'> </div><div class='ctx'> 	/* Read FIFO */</div><div class='del'>-	fifo_len /= sizeof(u32); /* Size in DWORDS */</div><div class='del'>-	for (i = 0; i &lt; fifo_len; i++)</div><div class='add'>+	for (i = 0; i &lt; fifo_len / sizeof(u32); i++)</div><div class='ctx'> 		fifo_data[i] = iwl_trans_read_prph(fwrt-&gt;trans,</div><div class='ctx'> 						  TXF_READ_MODIFY_DATA +</div><div class='ctx'> 						  offset);</div><div class='add'>+</div><div class='add'>+	if (fwrt-&gt;sanitize_ops &amp;&amp; fwrt-&gt;sanitize_ops-&gt;frob_txf)</div><div class='add'>+		fwrt-&gt;sanitize_ops-&gt;frob_txf(fwrt-&gt;sanitize_ctx,</div><div class='add'>+					     fifo_data, fifo_len);</div><div class='add'>+</div><div class='ctx'> 	*dump_data = iwl_fw_error_next_data(*dump_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -184,7 +187,7 @@ static void iwl_fw_dump_rxf(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		/* Pull RXF2 */</div><div class='ctx'> 		iwl_fwrt_dump_rxf(fwrt, dump_data, cfg-&gt;rxfifo2_size,</div><div class='ctx'> 				  RXF_DIFF_FROM_PREV +</div><div class='del'>-				  fwrt-&gt;trans-&gt;trans_cfg-&gt;umac_prph_offset, 1);</div><div class='add'>+				  fwrt-&gt;trans-&gt;mac_cfg-&gt;umac_prph_offset, 1);</div><div class='ctx'> 		/* Pull LMAC2 RXF1 */</div><div class='ctx'> 		if (fwrt-&gt;smem_cfg.num_lmacs &gt; 1)</div><div class='ctx'> 			iwl_fwrt_dump_rxf(fwrt, dump_data,</div><div class='hunk'>@@ -299,9 +302,6 @@ static void iwl_fw_dump_txf(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	iwl_trans_release_nic_access(fwrt-&gt;trans);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define IWL8260_ICCM_OFFSET		0x44000 /* Only for B-step */</div><div class='del'>-#define IWL8260_ICCM_LEN		0xC000 /* Only for B-step */</div><div class='del'>-</div><div class='ctx'> struct iwl_prph_range {</div><div class='ctx'> 	u32 start, end;</div><div class='ctx'> };</div><div class='hunk'>@@ -558,41 +558,71 @@ static void iwl_dump_prph(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * alloc_sgtable - allocates scallerlist table in the given size,</div><div class='del'>- * fills it with pages and returns it</div><div class='add'>+ * alloc_sgtable - allocates (chained) scatterlist in the given size,</div><div class='add'>+ *	fills it with pages and returns it</div><div class='ctx'>  * @size: the size (in bytes) of the table</div><div class='del'>-*/</div><div class='del'>-static struct scatterlist *alloc_sgtable(int size)</div><div class='add'>+ */</div><div class='add'>+static struct scatterlist *alloc_sgtable(ssize_t size)</div><div class='ctx'> {</div><div class='del'>-	int alloc_size, nents, i;</div><div class='del'>-	struct page *new_page;</div><div class='del'>-	struct scatterlist *iter;</div><div class='del'>-	struct scatterlist *table;</div><div class='add'>+	struct scatterlist *result = NULL, *prev;</div><div class='add'>+	int nents, i, n_prev;</div><div class='ctx'> </div><div class='ctx'> 	nents = DIV_ROUND_UP(size, PAGE_SIZE);</div><div class='del'>-	table = kcalloc(nents, sizeof(*table), GFP_KERNEL);</div><div class='del'>-	if (!table)</div><div class='del'>-		return NULL;</div><div class='del'>-	sg_init_table(table, nents);</div><div class='del'>-	iter = table;</div><div class='del'>-	for_each_sg(table, iter, sg_nents(table), i) {</div><div class='del'>-		new_page = alloc_page(GFP_KERNEL);</div><div class='del'>-		if (!new_page) {</div><div class='del'>-			/* release all previous allocated pages in the table */</div><div class='del'>-			iter = table;</div><div class='del'>-			for_each_sg(table, iter, sg_nents(table), i) {</div><div class='del'>-				new_page = sg_page(iter);</div><div class='del'>-				if (new_page)</div><div class='del'>-					__free_page(new_page);</div><div class='del'>-			}</div><div class='del'>-			kfree(table);</div><div class='add'>+</div><div class='add'>+#define N_ENTRIES_PER_PAGE (PAGE_SIZE / sizeof(*result))</div><div class='add'>+	/*</div><div class='add'>+	 * We need an additional entry for table chaining,</div><div class='add'>+	 * this ensures the loop can finish i.e. we can</div><div class='add'>+	 * fit at least two entries per page (obviously,</div><div class='add'>+	 * many more really fit.)</div><div class='add'>+	 */</div><div class='add'>+	BUILD_BUG_ON(N_ENTRIES_PER_PAGE &lt; 2);</div><div class='add'>+</div><div class='add'>+	while (nents &gt; 0) {</div><div class='add'>+		struct scatterlist *new, *iter;</div><div class='add'>+		int n_fill, n_alloc;</div><div class='add'>+</div><div class='add'>+		if (nents &lt;= N_ENTRIES_PER_PAGE) {</div><div class='add'>+			/* last needed table */</div><div class='add'>+			n_fill = nents;</div><div class='add'>+			n_alloc = nents;</div><div class='add'>+			nents = 0;</div><div class='add'>+		} else {</div><div class='add'>+			/* fill a page with entries */</div><div class='add'>+			n_alloc = N_ENTRIES_PER_PAGE;</div><div class='add'>+			/* reserve one for chaining */</div><div class='add'>+			n_fill = n_alloc - 1;</div><div class='add'>+			nents -= n_fill;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		new = kcalloc(n_alloc, sizeof(*new), GFP_KERNEL);</div><div class='add'>+		if (!new) {</div><div class='add'>+			if (result)</div><div class='add'>+				_devcd_free_sgtable(result);</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='del'>-		alloc_size = min_t(int, size, PAGE_SIZE);</div><div class='del'>-		size -= PAGE_SIZE;</div><div class='del'>-		sg_set_page(iter, new_page, alloc_size, 0);</div><div class='add'>+		sg_init_table(new, n_alloc);</div><div class='add'>+</div><div class='add'>+		if (!result)</div><div class='add'>+			result = new;</div><div class='add'>+		else</div><div class='add'>+			sg_chain(prev, n_prev, new);</div><div class='add'>+		prev = new;</div><div class='add'>+		n_prev = n_alloc;</div><div class='add'>+</div><div class='add'>+		for_each_sg(new, iter, n_fill, i) {</div><div class='add'>+			struct page *new_page = alloc_page(GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+			if (!new_page) {</div><div class='add'>+				_devcd_free_sgtable(result);</div><div class='add'>+				return NULL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			sg_set_page(iter, new_page, PAGE_SIZE, 0);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	return table;</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_fw_get_prph_len(struct iwl_fw_runtime *fwrt,</div><div class='hunk'>@@ -624,10 +654,10 @@ static void iwl_fw_prph_handler(struct iwl_fw_runtime *fwrt, void *ptr,</div><div class='ctx'> {</div><div class='ctx'> 	u32 range_len;</div><div class='ctx'> </div><div class='del'>-	if (fwrt-&gt;trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+	if (fwrt-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='ctx'> 		range_len = ARRAY_SIZE(iwl_prph_dump_addr_ax210);</div><div class='ctx'> 		handler(fwrt, iwl_prph_dump_addr_ax210, range_len, ptr);</div><div class='del'>-	} else if (fwrt-&gt;trans-&gt;trans_cfg-&gt;device_family &gt;=</div><div class='add'>+	} else if (fwrt-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;=</div><div class='ctx'> 		   IWL_DEVICE_FAMILY_22000) {</div><div class='ctx'> 		range_len = ARRAY_SIZE(iwl_prph_dump_addr_22000);</div><div class='ctx'> 		handler(fwrt, iwl_prph_dump_addr_22000, range_len, ptr);</div><div class='hunk'>@@ -635,7 +665,7 @@ static void iwl_fw_prph_handler(struct iwl_fw_runtime *fwrt, void *ptr,</div><div class='ctx'> 		range_len = ARRAY_SIZE(iwl_prph_dump_addr_comm);</div><div class='ctx'> 		handler(fwrt, iwl_prph_dump_addr_comm, range_len, ptr);</div><div class='ctx'> </div><div class='del'>-		if (fwrt-&gt;trans-&gt;trans_cfg-&gt;mq_rx_supported) {</div><div class='add'>+		if (fwrt-&gt;trans-&gt;mac_cfg-&gt;mq_rx_supported) {</div><div class='ctx'> 			range_len = ARRAY_SIZE(iwl_prph_dump_addr_9000);</div><div class='ctx'> 			handler(fwrt, iwl_prph_dump_addr_9000, range_len, ptr);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -659,6 +689,10 @@ static void iwl_fw_dump_mem(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	iwl_trans_read_mem_bytes(fwrt-&gt;trans, ofs, dump_mem-&gt;data, len);</div><div class='ctx'> 	*dump_data = iwl_fw_error_next_data(*dump_data);</div><div class='ctx'> </div><div class='add'>+	if (fwrt-&gt;sanitize_ops &amp;&amp; fwrt-&gt;sanitize_ops-&gt;frob_mem)</div><div class='add'>+		fwrt-&gt;sanitize_ops-&gt;frob_mem(fwrt-&gt;sanitize_ctx, ofs,</div><div class='add'>+					     dump_mem-&gt;data, len);</div><div class='add'>+</div><div class='ctx'> 	IWL_DEBUG_INFO(fwrt, "WRT memory dump. Type=%u\n", dump_mem-&gt;type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -752,6 +786,12 @@ static void iwl_dump_paging(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 					   PAGING_BLOCK_SIZE,</div><div class='ctx'> 					   DMA_BIDIRECTIONAL);</div><div class='ctx'> 		(*data) = iwl_fw_error_next_data(*data);</div><div class='add'>+</div><div class='add'>+		if (fwrt-&gt;sanitize_ops &amp;&amp; fwrt-&gt;sanitize_ops-&gt;frob_mem)</div><div class='add'>+			fwrt-&gt;sanitize_ops-&gt;frob_mem(fwrt-&gt;sanitize_ctx,</div><div class='add'>+						     fwrt-&gt;fw_paging_db[i].fw_offs,</div><div class='add'>+						     paging-&gt;data,</div><div class='add'>+						     PAGING_BLOCK_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -769,13 +809,14 @@ iwl_fw_error_dump_file(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	const struct iwl_fw_dbg_mem_seg_tlv *fw_mem = fwrt-&gt;fw-&gt;dbg.mem_tlv;</div><div class='ctx'> 	struct iwl_fwrt_shared_mem_cfg *mem_cfg = &amp;fwrt-&gt;smem_cfg;</div><div class='ctx'> 	u32 file_len, fifo_len = 0, prph_len = 0, radio_len = 0;</div><div class='del'>-	u32 smem_len = fwrt-&gt;fw-&gt;dbg.n_mem_tlv ? 0 : fwrt-&gt;trans-&gt;cfg-&gt;smem_len;</div><div class='add'>+	u32 smem_len = fwrt-&gt;fw-&gt;dbg.n_mem_tlv ? 0 : fwrt-&gt;trans-&gt;mac_cfg-&gt;base-&gt;smem_len;</div><div class='ctx'> 	u32 sram2_len = fwrt-&gt;fw-&gt;dbg.n_mem_tlv ?</div><div class='ctx'> 				0 : fwrt-&gt;trans-&gt;cfg-&gt;dccm2_len;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* SRAM - include stack CCM if driver knows the values for it */</div><div class='del'>-	if (!fwrt-&gt;trans-&gt;cfg-&gt;dccm_offset || !fwrt-&gt;trans-&gt;cfg-&gt;dccm_len) {</div><div class='add'>+	if (!fwrt-&gt;trans-&gt;cfg-&gt;dccm_offset ||</div><div class='add'>+	    !fwrt-&gt;trans-&gt;cfg-&gt;dccm_len) {</div><div class='ctx'> 		const struct fw_img *img;</div><div class='ctx'> </div><div class='ctx'> 		if (fwrt-&gt;cur_fw_img &gt;= IWL_UCODE_TYPE_MAX)</div><div class='hunk'>@@ -789,7 +830,7 @@ iwl_fw_error_dump_file(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* reading RXF/TXF sizes */</div><div class='del'>-	if (test_bit(STATUS_FW_ERROR, &amp;fwrt-&gt;trans-&gt;status)) {</div><div class='add'>+	if (iwl_trans_is_fw_error(fwrt-&gt;trans)) {</div><div class='ctx'> 		fifo_len = iwl_fw_rxf_len(fwrt, mem_cfg);</div><div class='ctx'> 		fifo_len += iwl_fw_txf_len(fwrt, mem_cfg);</div><div class='ctx'> </div><div class='hunk'>@@ -798,7 +839,7 @@ iwl_fw_error_dump_file(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			iwl_fw_prph_handler(fwrt, &amp;prph_len,</div><div class='ctx'> 					    iwl_fw_get_prph_len);</div><div class='ctx'> </div><div class='del'>-		if (fwrt-&gt;trans-&gt;trans_cfg-&gt;device_family ==</div><div class='add'>+		if (fwrt-&gt;trans-&gt;mac_cfg-&gt;device_family ==</div><div class='ctx'> 		    IWL_DEVICE_FAMILY_7000 &amp;&amp;</div><div class='ctx'> 		    iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_RADIO_REG))</div><div class='ctx'> 			radio_len = sizeof(*dump_data) + RADIO_REG_MAX_READ;</div><div class='hunk'>@@ -836,7 +877,7 @@ iwl_fw_error_dump_file(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_fw_dbg_is_d3_debug_enabled(fwrt) &amp;&amp; fwrt-&gt;dump.d3_debug_data) {</div><div class='ctx'> 		file_len += sizeof(*dump_data) +</div><div class='del'>-			fwrt-&gt;trans-&gt;cfg-&gt;d3_debug_data_length * 2;</div><div class='add'>+			fwrt-&gt;trans-&gt;mac_cfg-&gt;base-&gt;d3_debug_data_length * 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If we only want a monitor dump, reset the file length */</div><div class='hunk'>@@ -864,15 +905,16 @@ iwl_fw_error_dump_file(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		dump_data-&gt;len = cpu_to_le32(sizeof(*dump_info));</div><div class='ctx'> 		dump_info = (void *)dump_data-&gt;data;</div><div class='ctx'> 		dump_info-&gt;hw_type =</div><div class='del'>-			cpu_to_le32(CSR_HW_REV_TYPE(fwrt-&gt;trans-&gt;hw_rev));</div><div class='add'>+			cpu_to_le32(CSR_HW_REV_TYPE(fwrt-&gt;trans-&gt;info.hw_rev));</div><div class='ctx'> 		dump_info-&gt;hw_step =</div><div class='del'>-			cpu_to_le32(CSR_HW_REV_STEP(fwrt-&gt;trans-&gt;hw_rev));</div><div class='add'>+			cpu_to_le32(fwrt-&gt;trans-&gt;info.hw_rev_step);</div><div class='ctx'> 		memcpy(dump_info-&gt;fw_human_readable, fwrt-&gt;fw-&gt;human_readable,</div><div class='ctx'> 		       sizeof(dump_info-&gt;fw_human_readable));</div><div class='del'>-		strncpy(dump_info-&gt;dev_human_readable, fwrt-&gt;trans-&gt;name,</div><div class='del'>-			sizeof(dump_info-&gt;dev_human_readable) - 1);</div><div class='del'>-		strncpy(dump_info-&gt;bus_human_readable, fwrt-&gt;dev-&gt;bus-&gt;name,</div><div class='del'>-			sizeof(dump_info-&gt;bus_human_readable) - 1);</div><div class='add'>+		strscpy_pad(dump_info-&gt;dev_human_readable,</div><div class='add'>+			    fwrt-&gt;trans-&gt;info.name,</div><div class='add'>+			    sizeof(dump_info-&gt;dev_human_readable));</div><div class='add'>+		strscpy_pad(dump_info-&gt;bus_human_readable, fwrt-&gt;dev-&gt;bus-&gt;name,</div><div class='add'>+			sizeof(dump_info-&gt;bus_human_readable));</div><div class='ctx'> 		dump_info-&gt;num_of_lmacs = fwrt-&gt;smem_cfg.num_lmacs;</div><div class='ctx'> 		dump_info-&gt;lmac_err_id[0] =</div><div class='ctx'> 			cpu_to_le32(fwrt-&gt;dump.lmac_err_id[0]);</div><div class='hunk'>@@ -956,7 +998,7 @@ iwl_fw_error_dump_file(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		iwl_fw_dump_mem(fwrt, &amp;dump_data, smem_len,</div><div class='del'>-				fwrt-&gt;trans-&gt;cfg-&gt;smem_offset,</div><div class='add'>+				fwrt-&gt;trans-&gt;mac_cfg-&gt;base-&gt;smem_offset,</div><div class='ctx'> 				IWL_FW_ERROR_DUMP_MEM_SMEM);</div><div class='ctx'> </div><div class='ctx'> 		iwl_fw_dump_mem(fwrt, &amp;dump_data, sram2_len,</div><div class='hunk'>@@ -965,8 +1007,8 @@ iwl_fw_error_dump_file(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_fw_dbg_is_d3_debug_enabled(fwrt) &amp;&amp; fwrt-&gt;dump.d3_debug_data) {</div><div class='del'>-		u32 addr = fwrt-&gt;trans-&gt;cfg-&gt;d3_debug_data_base_addr;</div><div class='del'>-		size_t data_size = fwrt-&gt;trans-&gt;cfg-&gt;d3_debug_data_length;</div><div class='add'>+		u32 addr = fwrt-&gt;trans-&gt;mac_cfg-&gt;base-&gt;d3_debug_data_base_addr;</div><div class='add'>+		size_t data_size = fwrt-&gt;trans-&gt;mac_cfg-&gt;base-&gt;d3_debug_data_length;</div><div class='ctx'> </div><div class='ctx'> 		dump_data-&gt;type = cpu_to_le32(IWL_FW_ERROR_DUMP_D3_DEBUG_DATA);</div><div class='ctx'> 		dump_data-&gt;len = cpu_to_le32(data_size * 2);</div><div class='hunk'>@@ -980,6 +1022,11 @@ iwl_fw_error_dump_file(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 					 dump_data-&gt;data + data_size,</div><div class='ctx'> 					 data_size);</div><div class='ctx'> </div><div class='add'>+		if (fwrt-&gt;sanitize_ops &amp;&amp; fwrt-&gt;sanitize_ops-&gt;frob_mem)</div><div class='add'>+			fwrt-&gt;sanitize_ops-&gt;frob_mem(fwrt-&gt;sanitize_ctx, addr,</div><div class='add'>+						     dump_data-&gt;data + data_size,</div><div class='add'>+						     data_size);</div><div class='add'>+</div><div class='ctx'> 		dump_data = iwl_fw_error_next_data(dump_data);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1005,64 +1052,79 @@ struct iwl_dump_ini_region_data {</div><div class='ctx'> 	struct iwl_fwrt_dump_data *dump_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-iwl_dump_ini_prph_mac_iter(struct iwl_fw_runtime *fwrt,</div><div class='del'>-			   struct iwl_dump_ini_region_data *reg_data,</div><div class='del'>-			   void *range_ptr, int idx)</div><div class='add'>+static int iwl_dump_ini_prph_mac_iter_common(struct iwl_fw_runtime *fwrt,</div><div class='add'>+					     void *range_ptr, u32 addr,</div><div class='add'>+					     __le32 size)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='ctx'> 	struct iwl_fw_ini_error_dump_range *range = range_ptr;</div><div class='ctx'> 	__le32 *val = range-&gt;data;</div><div class='del'>-	u32 prph_val;</div><div class='del'>-	u32 addr = le32_to_cpu(reg-&gt;addrs[idx]) +</div><div class='del'>-		   le32_to_cpu(reg-&gt;dev_addr.offset);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	range-&gt;internal_base_addr = cpu_to_le32(addr);</div><div class='del'>-	range-&gt;range_data_size = reg-&gt;dev_addr.size;</div><div class='del'>-	for (i = 0; i &lt; le32_to_cpu(reg-&gt;dev_addr.size); i += 4) {</div><div class='del'>-		prph_val = iwl_read_prph(fwrt-&gt;trans, addr + i);</div><div class='del'>-		if (prph_val == 0x5a5a5a5a)</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		*val++ = cpu_to_le32(prph_val);</div><div class='del'>-	}</div><div class='add'>+	range-&gt;range_data_size = size;</div><div class='add'>+	for (i = 0; i &lt; le32_to_cpu(size); i += 4)</div><div class='add'>+		*val++ = cpu_to_le32(iwl_read_prph(fwrt-&gt;trans, addr + i));</div><div class='ctx'> </div><div class='ctx'> 	return sizeof(*range) + le32_to_cpu(range-&gt;range_data_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-iwl_dump_ini_prph_phy_iter(struct iwl_fw_runtime *fwrt,</div><div class='add'>+iwl_dump_ini_prph_mac_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			   struct iwl_dump_ini_region_data *reg_data,</div><div class='del'>-			   void *range_ptr, int idx)</div><div class='add'>+			   void *range_ptr, u32 range_len, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='add'>+	u32 addr = le32_to_cpu(reg-&gt;addrs[idx]) +</div><div class='add'>+		   le32_to_cpu(reg-&gt;dev_addr.offset);</div><div class='add'>+</div><div class='add'>+	return iwl_dump_ini_prph_mac_iter_common(fwrt, range_ptr, addr,</div><div class='add'>+						 reg-&gt;dev_addr.size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_dump_ini_prph_mac_block_iter(struct iwl_fw_runtime *fwrt,</div><div class='add'>+				 struct iwl_dump_ini_region_data *reg_data,</div><div class='add'>+				 void *range_ptr, u32 range_len, int idx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='add'>+	struct iwl_fw_ini_addr_size *pairs = (void *)reg-&gt;addrs;</div><div class='add'>+	u32 addr = le32_to_cpu(reg-&gt;dev_addr_range.offset) +</div><div class='add'>+		   le32_to_cpu(pairs[idx].addr);</div><div class='add'>+</div><div class='add'>+	return iwl_dump_ini_prph_mac_iter_common(fwrt, range_ptr, addr,</div><div class='add'>+						 pairs[idx].size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_dump_ini_prph_phy_iter_common(struct iwl_fw_runtime *fwrt,</div><div class='add'>+					     void *range_ptr, u32 addr,</div><div class='add'>+					     __le32 size, __le32 offset)</div><div class='add'>+{</div><div class='ctx'> 	struct iwl_fw_ini_error_dump_range *range = range_ptr;</div><div class='ctx'> 	__le32 *val = range-&gt;data;</div><div class='ctx'> 	u32 indirect_wr_addr = WMAL_INDRCT_RD_CMD1;</div><div class='ctx'> 	u32 indirect_rd_addr = WMAL_MRSPF_1;</div><div class='ctx'> 	u32 prph_val;</div><div class='del'>-	u32 addr = le32_to_cpu(reg-&gt;addrs[idx]);</div><div class='ctx'> 	u32 dphy_state;</div><div class='ctx'> 	u32 dphy_addr;</div><div class='add'>+	u32 prph_stts;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	range-&gt;internal_base_addr = cpu_to_le32(addr);</div><div class='del'>-	range-&gt;range_data_size = reg-&gt;dev_addr.size;</div><div class='add'>+	range-&gt;range_data_size = size;</div><div class='ctx'> </div><div class='del'>-	if (fwrt-&gt;trans-&gt;trans_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+	if (fwrt-&gt;trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210)</div><div class='ctx'> 		indirect_wr_addr = WMAL_INDRCT_CMD1;</div><div class='ctx'> </div><div class='del'>-	indirect_wr_addr += le32_to_cpu(reg-&gt;dev_addr.offset);</div><div class='del'>-	indirect_rd_addr += le32_to_cpu(reg-&gt;dev_addr.offset);</div><div class='add'>+	indirect_wr_addr += le32_to_cpu(offset);</div><div class='add'>+	indirect_rd_addr += le32_to_cpu(offset);</div><div class='ctx'> </div><div class='ctx'> 	if (!iwl_trans_grab_nic_access(fwrt-&gt;trans))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	dphy_addr = (reg-&gt;dev_addr.offset) ? WFPM_LMAC2_PS_CTL_RW :</div><div class='del'>-					     WFPM_LMAC1_PS_CTL_RW;</div><div class='add'>+	dphy_addr = (offset) ? WFPM_LMAC2_PS_CTL_RW : WFPM_LMAC1_PS_CTL_RW;</div><div class='ctx'> 	dphy_state = iwl_read_umac_prph_no_grab(fwrt-&gt;trans, dphy_addr);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; le32_to_cpu(reg-&gt;dev_addr.size); i += 4) {</div><div class='add'>+	for (i = 0; i &lt; le32_to_cpu(size); i += 4) {</div><div class='ctx'> 		if (dphy_state == HBUS_TIMEOUT ||</div><div class='ctx'> 		    (dphy_state &amp; WFPM_PS_CTL_RW_PHYRF_PD_FSM_CURSTATE_MSK) !=</div><div class='ctx'> 		    WFPM_PHYRF_STATE_ON) {</div><div class='hunk'>@@ -1072,6 +1134,21 @@ iwl_dump_ini_prph_phy_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> </div><div class='ctx'> 		iwl_write_prph_no_grab(fwrt-&gt;trans, indirect_wr_addr,</div><div class='ctx'> 				       WMAL_INDRCT_CMD(addr + i));</div><div class='add'>+</div><div class='add'>+		if (fwrt-&gt;trans-&gt;info.hw_rf_id != IWL_CFG_RF_TYPE_JF1 &amp;&amp;</div><div class='add'>+		    fwrt-&gt;trans-&gt;info.hw_rf_id != IWL_CFG_RF_TYPE_JF2 &amp;&amp;</div><div class='add'>+		    fwrt-&gt;trans-&gt;info.hw_rf_id != IWL_CFG_RF_TYPE_HR1 &amp;&amp;</div><div class='add'>+		    fwrt-&gt;trans-&gt;info.hw_rf_id != IWL_CFG_RF_TYPE_HR2) {</div><div class='add'>+			udelay(2);</div><div class='add'>+			prph_stts = iwl_read_prph_no_grab(fwrt-&gt;trans,</div><div class='add'>+							  WMAL_MRSPF_STTS);</div><div class='add'>+</div><div class='add'>+			/* Abort dump if status is 0xA5A5A5A2 or FIFO1 empty */</div><div class='add'>+			if (prph_stts == WMAL_TIMEOUT_VAL ||</div><div class='add'>+			    !WMAL_MRSPF_STTS_IS_FIFO1_NOT_EMPTY(prph_stts))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		prph_val = iwl_read_prph_no_grab(fwrt-&gt;trans,</div><div class='ctx'> 						 indirect_rd_addr);</div><div class='ctx'> 		*val++ = cpu_to_le32(prph_val);</div><div class='hunk'>@@ -1081,9 +1158,36 @@ iwl_dump_ini_prph_phy_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	return sizeof(*range) + le32_to_cpu(range-&gt;range_data_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+iwl_dump_ini_prph_phy_iter(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			   struct iwl_dump_ini_region_data *reg_data,</div><div class='add'>+			   void *range_ptr, u32 range_len, int idx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='add'>+	u32 addr = le32_to_cpu(reg-&gt;addrs[idx]);</div><div class='add'>+</div><div class='add'>+	return iwl_dump_ini_prph_phy_iter_common(fwrt, range_ptr, addr,</div><div class='add'>+						 reg-&gt;dev_addr.size,</div><div class='add'>+						 reg-&gt;dev_addr.offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_dump_ini_prph_phy_block_iter(struct iwl_fw_runtime *fwrt,</div><div class='add'>+				 struct iwl_dump_ini_region_data *reg_data,</div><div class='add'>+				 void *range_ptr, u32 range_len, int idx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='add'>+	struct iwl_fw_ini_addr_size *pairs = (void *)reg-&gt;addrs;</div><div class='add'>+	u32 addr = le32_to_cpu(pairs[idx].addr);</div><div class='add'>+</div><div class='add'>+	return iwl_dump_ini_prph_phy_iter_common(fwrt, range_ptr, addr,</div><div class='add'>+						 pairs[idx].size,</div><div class='add'>+						 reg-&gt;dev_addr_range.offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int iwl_dump_ini_csr_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 				 struct iwl_dump_ini_region_data *reg_data,</div><div class='del'>-				 void *range_ptr, int idx)</div><div class='add'>+				 void *range_ptr, u32 range_len, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='ctx'> 	struct iwl_fw_ini_error_dump_range *range = range_ptr;</div><div class='hunk'>@@ -1102,7 +1206,7 @@ static int iwl_dump_ini_csr_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> </div><div class='ctx'> static int iwl_dump_ini_config_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 				    struct iwl_dump_ini_region_data *reg_data,</div><div class='del'>-				    void *range_ptr, int idx)</div><div class='add'>+				    void *range_ptr, u32 range_len, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans *trans = fwrt-&gt;trans;</div><div class='ctx'> 	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='hunk'>@@ -1112,17 +1216,13 @@ static int iwl_dump_ini_config_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		   le32_to_cpu(reg-&gt;dev_addr.offset);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	/* we shouldn't get here if the trans doesn't have read_config32 */</div><div class='del'>-	if (WARN_ON_ONCE(!trans-&gt;ops-&gt;read_config32))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='ctx'> 	range-&gt;internal_base_addr = cpu_to_le32(addr);</div><div class='ctx'> 	range-&gt;range_data_size = reg-&gt;dev_addr.size;</div><div class='ctx'> 	for (i = 0; i &lt; le32_to_cpu(reg-&gt;dev_addr.size); i += 4) {</div><div class='ctx'> 		int ret;</div><div class='ctx'> 		u32 tmp;</div><div class='ctx'> </div><div class='del'>-		ret = trans-&gt;ops-&gt;read_config32(trans, addr + i, &amp;tmp);</div><div class='add'>+		ret = iwl_trans_read_config32(trans, addr + i, &amp;tmp);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1134,7 +1234,7 @@ static int iwl_dump_ini_config_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> </div><div class='ctx'> static int iwl_dump_ini_dev_mem_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 				     struct iwl_dump_ini_region_data *reg_data,</div><div class='del'>-				     void *range_ptr, int idx)</div><div class='add'>+				     void *range_ptr, u32 range_len, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='ctx'> 	struct iwl_fw_ini_error_dump_range *range = range_ptr;</div><div class='hunk'>@@ -1146,11 +1246,17 @@ static int iwl_dump_ini_dev_mem_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	iwl_trans_read_mem_bytes(fwrt-&gt;trans, addr, range-&gt;data,</div><div class='ctx'> 				 le32_to_cpu(reg-&gt;dev_addr.size));</div><div class='ctx'> </div><div class='add'>+	if (reg-&gt;sub_type == IWL_FW_INI_REGION_DEVICE_MEMORY_SUBTYPE_HW_SMEM &amp;&amp;</div><div class='add'>+	    fwrt-&gt;sanitize_ops &amp;&amp; fwrt-&gt;sanitize_ops-&gt;frob_txf)</div><div class='add'>+		fwrt-&gt;sanitize_ops-&gt;frob_txf(fwrt-&gt;sanitize_ctx,</div><div class='add'>+					     range-&gt;data,</div><div class='add'>+					     le32_to_cpu(reg-&gt;dev_addr.size));</div><div class='add'>+</div><div class='ctx'> 	return sizeof(*range) + le32_to_cpu(range-&gt;range_data_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int _iwl_dump_ini_paging_iter(struct iwl_fw_runtime *fwrt,</div><div class='del'>-				     void *range_ptr, int idx)</div><div class='add'>+				     void *range_ptr, u32 range_len, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page = fwrt-&gt;fw_paging_db[idx].fw_paging_block;</div><div class='ctx'> 	struct iwl_fw_ini_error_dump_range *range = range_ptr;</div><div class='hunk'>@@ -1170,7 +1276,7 @@ static int _iwl_dump_ini_paging_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> </div><div class='ctx'> static int iwl_dump_ini_paging_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 				    struct iwl_dump_ini_region_data *reg_data,</div><div class='del'>-				    void *range_ptr, int idx)</div><div class='add'>+				    void *range_ptr, u32 range_len, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_error_dump_range *range;</div><div class='ctx'> 	u32 page_size;</div><div class='hunk'>@@ -1178,8 +1284,8 @@ static int iwl_dump_ini_paging_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	/* all paged index start from 1 to skip CSS section */</div><div class='ctx'> 	idx++;</div><div class='ctx'> </div><div class='del'>-	if (!fwrt-&gt;trans-&gt;trans_cfg-&gt;gen2)</div><div class='del'>-		return _iwl_dump_ini_paging_iter(fwrt, range_ptr, idx);</div><div class='add'>+	if (!fwrt-&gt;trans-&gt;mac_cfg-&gt;gen2)</div><div class='add'>+		return _iwl_dump_ini_paging_iter(fwrt, range_ptr, range_len, idx);</div><div class='ctx'> </div><div class='ctx'> 	range = range_ptr;</div><div class='ctx'> 	page_size = fwrt-&gt;trans-&gt;init_dram.paging[idx].size;</div><div class='hunk'>@@ -1195,7 +1301,7 @@ static int iwl_dump_ini_paging_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> static int</div><div class='ctx'> iwl_dump_ini_mon_dram_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			   struct iwl_dump_ini_region_data *reg_data,</div><div class='del'>-			   void *range_ptr, int idx)</div><div class='add'>+			   void *range_ptr, u32 range_len, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='ctx'> 	struct iwl_fw_ini_error_dump_range *range = range_ptr;</div><div class='hunk'>@@ -1214,7 +1320,7 @@ iwl_dump_ini_mon_dram_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> </div><div class='ctx'> static int iwl_dump_ini_mon_smem_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 				      struct iwl_dump_ini_region_data *reg_data,</div><div class='del'>-				      void *range_ptr, int idx)</div><div class='add'>+				      void *range_ptr, u32 range_len, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='ctx'> 	struct iwl_fw_ini_error_dump_range *range = range_ptr;</div><div class='hunk'>@@ -1282,7 +1388,7 @@ static bool iwl_ini_txf_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> </div><div class='ctx'> static int iwl_dump_ini_txf_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 				 struct iwl_dump_ini_region_data *reg_data,</div><div class='del'>-				 void *range_ptr, int idx)</div><div class='add'>+				 void *range_ptr, u32 range_len, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='ctx'> 	struct iwl_fw_ini_error_dump_range *range = range_ptr;</div><div class='hunk'>@@ -1338,12 +1444,63 @@ static int iwl_dump_ini_txf_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	for (i = 0; i &lt; iter-&gt;fifo_size; i += sizeof(*data))</div><div class='ctx'> 		*data++ = cpu_to_le32(iwl_read_prph_no_grab(fwrt-&gt;trans, addr));</div><div class='ctx'> </div><div class='add'>+	if (fwrt-&gt;sanitize_ops &amp;&amp; fwrt-&gt;sanitize_ops-&gt;frob_txf)</div><div class='add'>+		fwrt-&gt;sanitize_ops-&gt;frob_txf(fwrt-&gt;sanitize_ctx,</div><div class='add'>+					     reg_dump, iter-&gt;fifo_size);</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	iwl_trans_release_nic_access(fwrt-&gt;trans);</div><div class='ctx'> </div><div class='ctx'> 	return sizeof(*range) + le32_to_cpu(range-&gt;range_data_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+iwl_dump_ini_prph_snps_dphyip_iter(struct iwl_fw_runtime *fwrt,</div><div class='add'>+				   struct iwl_dump_ini_region_data *reg_data,</div><div class='add'>+				   void *range_ptr, u32 range_len, int idx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='add'>+	struct iwl_fw_ini_error_dump_range *range = range_ptr;</div><div class='add'>+	__le32 *val = range-&gt;data;</div><div class='add'>+	__le32 offset = reg-&gt;dev_addr.offset;</div><div class='add'>+	u32 indirect_rd_wr_addr = DPHYIP_INDIRECT;</div><div class='add'>+	u32 addr = le32_to_cpu(reg-&gt;addrs[idx]);</div><div class='add'>+	u32 dphy_state, dphy_addr, prph_val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	range-&gt;internal_base_addr = cpu_to_le32(addr);</div><div class='add'>+	range-&gt;range_data_size = reg-&gt;dev_addr.size;</div><div class='add'>+</div><div class='add'>+	if (!iwl_trans_grab_nic_access(fwrt-&gt;trans))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	indirect_rd_wr_addr += le32_to_cpu(offset);</div><div class='add'>+</div><div class='add'>+	dphy_addr = offset ? WFPM_LMAC2_PS_CTL_RW : WFPM_LMAC1_PS_CTL_RW;</div><div class='add'>+	dphy_state = iwl_read_umac_prph_no_grab(fwrt-&gt;trans, dphy_addr);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; le32_to_cpu(reg-&gt;dev_addr.size); i += 4) {</div><div class='add'>+		if (dphy_state == HBUS_TIMEOUT ||</div><div class='add'>+		    (dphy_state &amp; WFPM_PS_CTL_RW_PHYRF_PD_FSM_CURSTATE_MSK) !=</div><div class='add'>+		    WFPM_PHYRF_STATE_ON) {</div><div class='add'>+			*val++ = cpu_to_le32(WFPM_DPHY_OFF);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		iwl_write_prph_no_grab(fwrt-&gt;trans, indirect_rd_wr_addr,</div><div class='add'>+				       addr + i);</div><div class='add'>+		/* wait a bit for value to be ready in register */</div><div class='add'>+		udelay(1);</div><div class='add'>+		prph_val = iwl_read_prph_no_grab(fwrt-&gt;trans,</div><div class='add'>+						 indirect_rd_wr_addr);</div><div class='add'>+		*val++ = cpu_to_le32((prph_val &amp; DPHYIP_INDIRECT_RD_MSK) &gt;&gt;</div><div class='add'>+				     DPHYIP_INDIRECT_RD_SHIFT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_trans_release_nic_access(fwrt-&gt;trans);</div><div class='add'>+	return sizeof(*range) + le32_to_cpu(range-&gt;range_data_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct iwl_ini_rxf_data {</div><div class='ctx'> 	u32 fifo_num;</div><div class='ctx'> 	u32 size;</div><div class='hunk'>@@ -1362,13 +1519,13 @@ static void iwl_ini_get_rxf_data(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	memset(data, 0, sizeof(*data));</div><div class='add'>+</div><div class='ctx'> 	/* make sure only one bit is set in only one fid */</div><div class='ctx'> 	if (WARN_ONCE(hweight_long(fid1) + hweight_long(fid2) != 1,</div><div class='ctx'> 		      "fid1=%x, fid2=%x\n", fid1, fid2))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	memset(data, 0, sizeof(*data));</div><div class='del'>-</div><div class='ctx'> 	if (fid1) {</div><div class='ctx'> 		fifo_idx = ffs(fid1) - 1;</div><div class='ctx'> 		if (WARN_ONCE(fifo_idx &gt;= MAX_NUM_LMAC, "fifo_idx=%d\n",</div><div class='hunk'>@@ -1413,7 +1570,7 @@ static void iwl_ini_get_rxf_data(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> </div><div class='ctx'> static int iwl_dump_ini_rxf_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 				 struct iwl_dump_ini_region_data *reg_data,</div><div class='del'>-				 void *range_ptr, int idx)</div><div class='add'>+				 void *range_ptr, u32 range_len, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='ctx'> 	struct iwl_fw_ini_error_dump_range *range = range_ptr;</div><div class='hunk'>@@ -1480,7 +1637,7 @@ out:</div><div class='ctx'> static int</div><div class='ctx'> iwl_dump_ini_err_table_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			    struct iwl_dump_ini_region_data *reg_data,</div><div class='del'>-			    void *range_ptr, int idx)</div><div class='add'>+			    void *range_ptr, u32 range_len, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='ctx'> 	struct iwl_fw_ini_region_err_table *err_table = &amp;reg-&gt;err_table;</div><div class='hunk'>@@ -1499,7 +1656,7 @@ iwl_dump_ini_err_table_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> static int</div><div class='ctx'> iwl_dump_ini_special_mem_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			      struct iwl_dump_ini_region_data *reg_data,</div><div class='del'>-			      void *range_ptr, int idx)</div><div class='add'>+			      void *range_ptr, u32 range_len, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='ctx'> 	struct iwl_fw_ini_region_special_device_memory *special_mem =</div><div class='hunk'>@@ -1517,9 +1674,38 @@ iwl_dump_ini_special_mem_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	return sizeof(*range) + le32_to_cpu(range-&gt;range_data_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+iwl_dump_ini_dbgi_sram_iter(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			    struct iwl_dump_ini_region_data *reg_data,</div><div class='add'>+			    void *range_ptr, u32 range_len, int idx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='add'>+	struct iwl_fw_ini_error_dump_range *range = range_ptr;</div><div class='add'>+	__le32 *val = range-&gt;data;</div><div class='add'>+	u32 prph_data;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!iwl_trans_grab_nic_access(fwrt-&gt;trans))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	range-&gt;range_data_size = reg-&gt;dev_addr.size;</div><div class='add'>+	for (i = 0; i &lt; (le32_to_cpu(reg-&gt;dev_addr.size) / 4); i++) {</div><div class='add'>+		prph_data = iwl_read_prph_no_grab(fwrt-&gt;trans, (i % 2) ?</div><div class='add'>+					  DBGI_SRAM_TARGET_ACCESS_RDATA_MSB :</div><div class='add'>+					  DBGI_SRAM_TARGET_ACCESS_RDATA_LSB);</div><div class='add'>+		if (iwl_trans_is_hw_error_value(prph_data)) {</div><div class='add'>+			iwl_trans_release_nic_access(fwrt-&gt;trans);</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+		*val++ = cpu_to_le32(prph_data);</div><div class='add'>+	}</div><div class='add'>+	iwl_trans_release_nic_access(fwrt-&gt;trans);</div><div class='add'>+	return sizeof(*range) + le32_to_cpu(range-&gt;range_data_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int iwl_dump_ini_fw_pkt_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 				    struct iwl_dump_ini_region_data *reg_data,</div><div class='del'>-				    void *range_ptr, int idx)</div><div class='add'>+				    void *range_ptr, u32 range_len, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_error_dump_range *range = range_ptr;</div><div class='ctx'> 	struct iwl_rx_packet *pkt = reg_data-&gt;dump_data-&gt;fw_pkt;</div><div class='hunk'>@@ -1538,25 +1724,54 @@ static int iwl_dump_ini_fw_pkt_iter(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	return sizeof(*range) + le32_to_cpu(range-&gt;range_data_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int iwl_dump_ini_imr_iter(struct iwl_fw_runtime *fwrt,</div><div class='add'>+				 struct iwl_dump_ini_region_data *reg_data,</div><div class='add'>+				 void *range_ptr, u32 range_len, int idx)</div><div class='add'>+{</div><div class='add'>+	/* read the IMR memory and DMA it to SRAM */</div><div class='add'>+	struct iwl_fw_ini_error_dump_range *range = range_ptr;</div><div class='add'>+	u64 imr_curr_addr = fwrt-&gt;trans-&gt;dbg.imr_data.imr_curr_addr;</div><div class='add'>+	u32 imr_rem_bytes = fwrt-&gt;trans-&gt;dbg.imr_data.imr2sram_remainbyte;</div><div class='add'>+	u32 sram_addr = fwrt-&gt;trans-&gt;dbg.imr_data.sram_addr;</div><div class='add'>+	u32 sram_size = fwrt-&gt;trans-&gt;dbg.imr_data.sram_size;</div><div class='add'>+	u32 size_to_dump = (imr_rem_bytes &gt; sram_size) ? sram_size : imr_rem_bytes;</div><div class='add'>+</div><div class='add'>+	range-&gt;range_data_size = cpu_to_le32(size_to_dump);</div><div class='add'>+	if (iwl_trans_write_imr_mem(fwrt-&gt;trans, sram_addr,</div><div class='add'>+				    imr_curr_addr, size_to_dump)) {</div><div class='add'>+		IWL_ERR(fwrt, "WRT_DEBUG: IMR Memory transfer failed\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fwrt-&gt;trans-&gt;dbg.imr_data.imr_curr_addr = imr_curr_addr + size_to_dump;</div><div class='add'>+	fwrt-&gt;trans-&gt;dbg.imr_data.imr2sram_remainbyte -= size_to_dump;</div><div class='add'>+</div><div class='add'>+	iwl_trans_read_mem_bytes(fwrt-&gt;trans, sram_addr, range-&gt;data,</div><div class='add'>+				 size_to_dump);</div><div class='add'>+	return sizeof(*range) + le32_to_cpu(range-&gt;range_data_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void *</div><div class='ctx'> iwl_dump_ini_mem_fill_header(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			     struct iwl_dump_ini_region_data *reg_data,</div><div class='del'>-			     void *data)</div><div class='add'>+			     void *data, u32 data_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_error_dump *dump = data;</div><div class='ctx'> </div><div class='ctx'> 	dump-&gt;header.version = cpu_to_le32(IWL_INI_DUMP_VER);</div><div class='ctx'> </div><div class='del'>-	return dump-&gt;ranges;</div><div class='add'>+	return dump-&gt;data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * mask_apply_and_normalize - applies mask on val and normalize the result</div><div class='ctx'>  *</div><div class='del'>- * The normalization is based on the first set bit in the mask</div><div class='del'>- *</div><div class='ctx'>  * @val: value</div><div class='ctx'>  * @mask: mask to apply and to normalize with</div><div class='add'>+ *</div><div class='add'>+ * The normalization is based on the first set bit in the mask</div><div class='add'>+ *</div><div class='add'>+ * Returns: the extracted value</div><div class='ctx'>  */</div><div class='ctx'> static u32 mask_apply_and_normalize(u32 val, u32 mask)</div><div class='ctx'> {</div><div class='hunk'>@@ -1582,14 +1797,10 @@ static __le32 iwl_get_mon_reg(struct iwl_fw_runtime *fwrt, u32 alloc_id,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *</div><div class='del'>-iwl_dump_ini_mon_fill_header(struct iwl_fw_runtime *fwrt,</div><div class='del'>-			     struct iwl_dump_ini_region_data *reg_data,</div><div class='add'>+iwl_dump_ini_mon_fill_header(struct iwl_fw_runtime *fwrt, u32 alloc_id,</div><div class='ctx'> 			     struct iwl_fw_ini_monitor_dump *data,</div><div class='ctx'> 			     const struct iwl_fw_mon_regs *addrs)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='del'>-	u32 alloc_id = le32_to_cpu(reg-&gt;dram_alloc_id);</div><div class='del'>-</div><div class='ctx'> 	if (!iwl_trans_grab_nic_access(fwrt-&gt;trans)) {</div><div class='ctx'> 		IWL_ERR(fwrt, "Failed to get monitor header\n");</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -1597,7 +1808,7 @@ iwl_dump_ini_mon_fill_header(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;write_ptr = iwl_get_mon_reg(fwrt, alloc_id,</div><div class='ctx'> 					  &amp;addrs-&gt;write_ptr);</div><div class='del'>-	if (fwrt-&gt;trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+	if (fwrt-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='ctx'> 		u32 wrt_ptr = le32_to_cpu(data-&gt;write_ptr);</div><div class='ctx'> </div><div class='ctx'> 		data-&gt;write_ptr = cpu_to_le32(wrt_ptr &gt;&gt; 2);</div><div class='hunk'>@@ -1611,35 +1822,53 @@ iwl_dump_ini_mon_fill_header(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;header.version = cpu_to_le32(IWL_INI_DUMP_VER);</div><div class='ctx'> </div><div class='del'>-	return data-&gt;ranges;</div><div class='add'>+	return data-&gt;data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *</div><div class='ctx'> iwl_dump_ini_mon_dram_fill_header(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 				  struct iwl_dump_ini_region_data *reg_data,</div><div class='del'>-				  void *data)</div><div class='add'>+				  void *data, u32 data_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_monitor_dump *mon_dump = (void *)data;</div><div class='add'>+	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='add'>+	u32 alloc_id = le32_to_cpu(reg-&gt;dram_alloc_id);</div><div class='ctx'> </div><div class='del'>-	return iwl_dump_ini_mon_fill_header(fwrt, reg_data, mon_dump,</div><div class='del'>-					    &amp;fwrt-&gt;trans-&gt;cfg-&gt;mon_dram_regs);</div><div class='add'>+	return iwl_dump_ini_mon_fill_header(fwrt, alloc_id, mon_dump,</div><div class='add'>+					    &amp;fwrt-&gt;trans-&gt;mac_cfg-&gt;base-&gt;mon_dram_regs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *</div><div class='ctx'> iwl_dump_ini_mon_smem_fill_header(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 				  struct iwl_dump_ini_region_data *reg_data,</div><div class='del'>-				  void *data)</div><div class='add'>+				  void *data, u32 data_len)</div><div class='add'>+{</div><div class='add'>+	struct iwl_fw_ini_monitor_dump *mon_dump = (void *)data;</div><div class='add'>+	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='add'>+	u32 alloc_id = le32_to_cpu(reg-&gt;internal_buffer.alloc_id);</div><div class='add'>+</div><div class='add'>+	return iwl_dump_ini_mon_fill_header(fwrt, alloc_id, mon_dump,</div><div class='add'>+					    &amp;fwrt-&gt;trans-&gt;mac_cfg-&gt;base-&gt;mon_smem_regs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *</div><div class='add'>+iwl_dump_ini_mon_dbgi_fill_header(struct iwl_fw_runtime *fwrt,</div><div class='add'>+				  struct iwl_dump_ini_region_data *reg_data,</div><div class='add'>+				  void *data, u32 data_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_monitor_dump *mon_dump = (void *)data;</div><div class='ctx'> </div><div class='del'>-	return iwl_dump_ini_mon_fill_header(fwrt, reg_data, mon_dump,</div><div class='del'>-					    &amp;fwrt-&gt;trans-&gt;cfg-&gt;mon_smem_regs);</div><div class='add'>+	return iwl_dump_ini_mon_fill_header(fwrt,</div><div class='add'>+					    /* no offset calculation later */</div><div class='add'>+					    IWL_FW_INI_ALLOCATION_ID_DBGC1,</div><div class='add'>+					    mon_dump,</div><div class='add'>+					    &amp;fwrt-&gt;trans-&gt;mac_cfg-&gt;base-&gt;mon_dbgi_regs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *</div><div class='ctx'> iwl_dump_ini_err_table_fill_header(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 				   struct iwl_dump_ini_region_data *reg_data,</div><div class='del'>-				   void *data)</div><div class='add'>+				   void *data, u32 data_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='ctx'> 	struct iwl_fw_ini_err_table_dump *dump = data;</div><div class='hunk'>@@ -1647,13 +1876,13 @@ iwl_dump_ini_err_table_fill_header(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	dump-&gt;header.version = cpu_to_le32(IWL_INI_DUMP_VER);</div><div class='ctx'> 	dump-&gt;version = reg-&gt;err_table.version;</div><div class='ctx'> </div><div class='del'>-	return dump-&gt;ranges;</div><div class='add'>+	return dump-&gt;data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *</div><div class='ctx'> iwl_dump_ini_special_mem_fill_header(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 				     struct iwl_dump_ini_region_data *reg_data,</div><div class='del'>-				     void *data)</div><div class='add'>+				     void *data, u32 data_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='ctx'> 	struct iwl_fw_ini_special_device_memory *dump = data;</div><div class='hunk'>@@ -1662,7 +1891,19 @@ iwl_dump_ini_special_mem_fill_header(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	dump-&gt;type = reg-&gt;special_mem.type;</div><div class='ctx'> 	dump-&gt;version = reg-&gt;special_mem.version;</div><div class='ctx'> </div><div class='del'>-	return dump-&gt;ranges;</div><div class='add'>+	return dump-&gt;data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *</div><div class='add'>+iwl_dump_ini_imr_fill_header(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			     struct iwl_dump_ini_region_data *reg_data,</div><div class='add'>+			     void *data, u32 data_len)</div><div class='add'>+{</div><div class='add'>+	struct iwl_fw_ini_error_dump *dump = data;</div><div class='add'>+</div><div class='add'>+	dump-&gt;header.version = cpu_to_le32(IWL_INI_DUMP_VER);</div><div class='add'>+</div><div class='add'>+	return dump-&gt;data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 iwl_dump_ini_mem_ranges(struct iwl_fw_runtime *fwrt,</div><div class='hunk'>@@ -1673,10 +1914,20 @@ static u32 iwl_dump_ini_mem_ranges(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	return iwl_tlv_array_len(reg_data-&gt;reg_tlv, reg, addrs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32</div><div class='add'>+iwl_dump_ini_mem_block_ranges(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			      struct iwl_dump_ini_region_data *reg_data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='add'>+	size_t size = sizeof(struct iwl_fw_ini_addr_size);</div><div class='add'>+</div><div class='add'>+	return iwl_tlv_array_len_with_size(reg_data-&gt;reg_tlv, reg, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u32 iwl_dump_ini_paging_ranges(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 				      struct iwl_dump_ini_region_data *reg_data)</div><div class='ctx'> {</div><div class='del'>-	if (fwrt-&gt;trans-&gt;trans_cfg-&gt;gen2) {</div><div class='add'>+	if (fwrt-&gt;trans-&gt;mac_cfg-&gt;gen2) {</div><div class='ctx'> 		if (fwrt-&gt;trans-&gt;init_dram.paging_cnt)</div><div class='ctx'> 			return fwrt-&gt;trans-&gt;init_dram.paging_cnt - 1;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1724,6 +1975,26 @@ static u32 iwl_dump_ini_single_range(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 iwl_dump_ini_imr_ranges(struct iwl_fw_runtime *fwrt,</div><div class='add'>+				   struct iwl_dump_ini_region_data *reg_data)</div><div class='add'>+{</div><div class='add'>+	/* range is total number of pages need to copied from</div><div class='add'>+	 *IMR memory to SRAM and later from SRAM to DRAM</div><div class='add'>+	 */</div><div class='add'>+	u32 imr_enable = fwrt-&gt;trans-&gt;dbg.imr_data.imr_enable;</div><div class='add'>+	u32 imr_size = fwrt-&gt;trans-&gt;dbg.imr_data.imr_size;</div><div class='add'>+	u32 sram_size = fwrt-&gt;trans-&gt;dbg.imr_data.sram_size;</div><div class='add'>+</div><div class='add'>+	if (imr_enable == 0 || imr_size == 0 || sram_size == 0) {</div><div class='add'>+		IWL_DEBUG_INFO(fwrt,</div><div class='add'>+			       "WRT: Invalid imr data enable: %d, imr_size: %d, sram_size: %d\n",</div><div class='add'>+			       imr_enable, imr_size, sram_size);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return((imr_size % sram_size) ? (imr_size / sram_size + 1) : (imr_size / sram_size));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u32 iwl_dump_ini_mem_get_size(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 				     struct iwl_dump_ini_region_data *reg_data)</div><div class='ctx'> {</div><div class='hunk'>@@ -1739,6 +2010,25 @@ static u32 iwl_dump_ini_mem_get_size(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32</div><div class='add'>+iwl_dump_ini_mem_block_get_size(struct iwl_fw_runtime *fwrt,</div><div class='add'>+				struct iwl_dump_ini_region_data *reg_data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='add'>+	struct iwl_fw_ini_addr_size *pairs = (void *)reg-&gt;addrs;</div><div class='add'>+	u32 ranges = iwl_dump_ini_mem_block_ranges(fwrt, reg_data);</div><div class='add'>+	u32 size = sizeof(struct iwl_fw_ini_error_dump);</div><div class='add'>+	int range;</div><div class='add'>+</div><div class='add'>+	if (!ranges)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (range = 0; range &lt; ranges; range++)</div><div class='add'>+		size += le32_to_cpu(pairs[range].size);</div><div class='add'>+</div><div class='add'>+	return size + ranges * sizeof(struct iwl_fw_ini_error_dump_range);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='ctx'> iwl_dump_ini_paging_get_size(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			     struct iwl_dump_ini_region_data *reg_data)</div><div class='ctx'> {</div><div class='hunk'>@@ -1749,7 +2039,7 @@ iwl_dump_ini_paging_get_size(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	/* start from 1 to skip CSS section */</div><div class='ctx'> 	for (i = 1; i &lt;= iwl_dump_ini_paging_ranges(fwrt, reg_data); i++) {</div><div class='ctx'> 		size += range_header_len;</div><div class='del'>-		if (fwrt-&gt;trans-&gt;trans_cfg-&gt;gen2)</div><div class='add'>+		if (fwrt-&gt;trans-&gt;mac_cfg-&gt;gen2)</div><div class='ctx'> 			size += fwrt-&gt;trans-&gt;init_dram.paging[i].size;</div><div class='ctx'> 		else</div><div class='ctx'> 			size += fwrt-&gt;fw_paging_db[i].fw_paging_size;</div><div class='hunk'>@@ -1801,6 +2091,20 @@ iwl_dump_ini_mon_smem_get_size(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 iwl_dump_ini_mon_dbgi_get_size(struct iwl_fw_runtime *fwrt,</div><div class='add'>+					  struct iwl_dump_ini_region_data *reg_data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='add'>+	u32 size = le32_to_cpu(reg-&gt;dev_addr.size);</div><div class='add'>+	u32 ranges = iwl_dump_ini_mem_ranges(fwrt, reg_data);</div><div class='add'>+</div><div class='add'>+	if (!size || !ranges)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return sizeof(struct iwl_fw_ini_monitor_dump) + ranges *</div><div class='add'>+		(size + sizeof(struct iwl_fw_ini_error_dump_range));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u32 iwl_dump_ini_txf_get_size(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 				     struct iwl_dump_ini_region_data *reg_data)</div><div class='ctx'> {</div><div class='hunk'>@@ -1888,6 +2192,31 @@ iwl_dump_ini_fw_pkt_get_size(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32</div><div class='add'>+iwl_dump_ini_imr_get_size(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			  struct iwl_dump_ini_region_data *reg_data)</div><div class='add'>+{</div><div class='add'>+	u32 ranges = 0;</div><div class='add'>+	u32 imr_enable = fwrt-&gt;trans-&gt;dbg.imr_data.imr_enable;</div><div class='add'>+	u32 imr_size = fwrt-&gt;trans-&gt;dbg.imr_data.imr_size;</div><div class='add'>+	u32 sram_size = fwrt-&gt;trans-&gt;dbg.imr_data.sram_size;</div><div class='add'>+</div><div class='add'>+	if (imr_enable == 0 || imr_size == 0 || sram_size == 0) {</div><div class='add'>+		IWL_DEBUG_INFO(fwrt,</div><div class='add'>+			       "WRT: Invalid imr data enable: %d, imr_size: %d, sram_size: %d\n",</div><div class='add'>+			       imr_enable, imr_size, sram_size);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	ranges = iwl_dump_ini_imr_ranges(fwrt, reg_data);</div><div class='add'>+	if (!ranges) {</div><div class='add'>+		IWL_ERR(fwrt, "WRT: ranges :=%d\n", ranges);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	imr_size += sizeof(struct iwl_fw_ini_error_dump) +</div><div class='add'>+		ranges * sizeof(struct iwl_fw_ini_error_dump_range);</div><div class='add'>+	return imr_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_dump_ini_mem_ops - ini memory dump operations</div><div class='ctx'>  * @get_num_of_ranges: returns the number of memory ranges in the region.</div><div class='hunk'>@@ -1904,22 +2233,23 @@ struct iwl_dump_ini_mem_ops {</div><div class='ctx'> 			struct iwl_dump_ini_region_data *reg_data);</div><div class='ctx'> 	void *(*fill_mem_hdr)(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			      struct iwl_dump_ini_region_data *reg_data,</div><div class='del'>-			      void *data);</div><div class='add'>+			      void *data, u32 data_len);</div><div class='ctx'> 	int (*fill_range)(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			  struct iwl_dump_ini_region_data *reg_data,</div><div class='del'>-			  void *range, int idx);</div><div class='add'>+			  void *range, u32 range_len, int idx);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * iwl_dump_ini_mem</div><div class='del'>- *</div><div class='del'>- * Creates a dump tlv and copy a memory region into it.</div><div class='del'>- * Returns the size of the current dump tlv or 0 if failed</div><div class='add'>+ * iwl_dump_ini_mem - dump memory region</div><div class='ctx'>  *</div><div class='ctx'>  * @fwrt: fw runtime struct</div><div class='ctx'>  * @list: list to add the dump tlv to</div><div class='ctx'>  * @reg_data: memory region</div><div class='ctx'>  * @ops: memory dump operations</div><div class='add'>+ *</div><div class='add'>+ * Creates a dump tlv and copy a memory region into it.</div><div class='add'>+ *</div><div class='add'>+ * Returns: the size of the current dump tlv or 0 if failed</div><div class='ctx'>  */</div><div class='ctx'> static u32 iwl_dump_ini_mem(struct iwl_fw_runtime *fwrt, struct list_head *list,</div><div class='ctx'> 			    struct iwl_dump_ini_region_data *reg_data,</div><div class='hunk'>@@ -1927,19 +2257,56 @@ static u32 iwl_dump_ini_mem(struct iwl_fw_runtime *fwrt, struct list_head *list,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data-&gt;reg_tlv-&gt;data;</div><div class='ctx'> 	struct iwl_fw_ini_dump_entry *entry;</div><div class='del'>-	struct iwl_fw_error_dump_data *tlv;</div><div class='add'>+	struct iwl_fw_ini_error_dump_data *tlv;</div><div class='ctx'> 	struct iwl_fw_ini_error_dump_header *header;</div><div class='del'>-	u32 type = le32_to_cpu(reg-&gt;type), id = le32_to_cpu(reg-&gt;id);</div><div class='add'>+	u32 type = reg-&gt;type;</div><div class='add'>+	u32 id = le32_get_bits(reg-&gt;id, IWL_FW_INI_REGION_ID_MASK);</div><div class='ctx'> 	u32 num_of_ranges, i, size;</div><div class='del'>-	void *range;</div><div class='add'>+	u8 *range;</div><div class='add'>+	u32 free_size;</div><div class='add'>+	u64 header_size;</div><div class='add'>+	u32 dump_policy = IWL_FW_INI_DUMP_VERBOSE;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_FW(fwrt, "WRT: Collecting region: dump type=%d, id=%d, type=%d\n",</div><div class='add'>+		     dump_policy, id, type);</div><div class='add'>+</div><div class='add'>+	if (le32_to_cpu(reg-&gt;hdr.version) &gt;= 2) {</div><div class='add'>+		u32 dp = le32_get_bits(reg-&gt;id,</div><div class='add'>+				       IWL_FW_INI_REGION_DUMP_POLICY_MASK);</div><div class='add'>+</div><div class='add'>+		if (dump_policy == IWL_FW_INI_DUMP_VERBOSE &amp;&amp;</div><div class='add'>+		    !(dp &amp; IWL_FW_INI_DEBUG_DUMP_POLICY_NO_LIMIT)) {</div><div class='add'>+			IWL_DEBUG_FW(fwrt,</div><div class='add'>+				     "WRT: no dump - type %d and policy mismatch=%d\n",</div><div class='add'>+				     dump_policy, dp);</div><div class='add'>+			return 0;</div><div class='add'>+		} else if (dump_policy == IWL_FW_INI_DUMP_MEDIUM &amp;&amp;</div><div class='add'>+			   !(dp &amp; IWL_FW_IWL_DEBUG_DUMP_POLICY_MAX_LIMIT_5MB)) {</div><div class='add'>+			IWL_DEBUG_FW(fwrt,</div><div class='add'>+				     "WRT: no dump - type %d and policy mismatch=%d\n",</div><div class='add'>+				     dump_policy, dp);</div><div class='add'>+			return 0;</div><div class='add'>+		} else if (dump_policy == IWL_FW_INI_DUMP_BRIEF &amp;&amp;</div><div class='add'>+			   !(dp &amp; IWL_FW_INI_DEBUG_DUMP_POLICY_MAX_LIMIT_600KB)) {</div><div class='add'>+			IWL_DEBUG_FW(fwrt,</div><div class='add'>+				     "WRT: no dump - type %d and policy mismatch=%d\n",</div><div class='add'>+				     dump_policy, dp);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ops-&gt;get_num_of_ranges || !ops-&gt;get_size || !ops-&gt;fill_mem_hdr ||</div><div class='del'>-	    !ops-&gt;fill_range)</div><div class='add'>+	    !ops-&gt;fill_range) {</div><div class='add'>+		IWL_DEBUG_FW(fwrt, "WRT: no ops for collecting data\n");</div><div class='ctx'> 		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	size = ops-&gt;get_size(fwrt, reg_data);</div><div class='del'>-	if (!size)</div><div class='add'>+</div><div class='add'>+	if (size &lt; sizeof(*header)) {</div><div class='add'>+		IWL_DEBUG_FW(fwrt, "WRT: size didn't include space for header\n");</div><div class='ctx'> 		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	entry = vzalloc(sizeof(*entry) + sizeof(*tlv) + size);</div><div class='ctx'> 	if (!entry)</div><div class='hunk'>@@ -1949,20 +2316,21 @@ static u32 iwl_dump_ini_mem(struct iwl_fw_runtime *fwrt, struct list_head *list,</div><div class='ctx'> </div><div class='ctx'> 	tlv = (void *)entry-&gt;data;</div><div class='ctx'> 	tlv-&gt;type = reg-&gt;type;</div><div class='add'>+	tlv-&gt;sub_type = reg-&gt;sub_type;</div><div class='add'>+	tlv-&gt;sub_type_ver = reg-&gt;sub_type_ver;</div><div class='add'>+	tlv-&gt;reserved = reg-&gt;reserved;</div><div class='ctx'> 	tlv-&gt;len = cpu_to_le32(size);</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_FW(fwrt, "WRT: Collecting region: id=%d, type=%d\n", id,</div><div class='del'>-		     type);</div><div class='del'>-</div><div class='ctx'> 	num_of_ranges = ops-&gt;get_num_of_ranges(fwrt, reg_data);</div><div class='ctx'> </div><div class='ctx'> 	header = (void *)tlv-&gt;data;</div><div class='del'>-	header-&gt;region_id = reg-&gt;id;</div><div class='add'>+	header-&gt;region_id = cpu_to_le32(id);</div><div class='ctx'> 	header-&gt;num_of_ranges = cpu_to_le32(num_of_ranges);</div><div class='ctx'> 	header-&gt;name_len = cpu_to_le32(IWL_FW_INI_MAX_NAME);</div><div class='ctx'> 	memcpy(header-&gt;name, reg-&gt;name, IWL_FW_INI_MAX_NAME);</div><div class='ctx'> </div><div class='del'>-	range = ops-&gt;fill_mem_hdr(fwrt, reg_data, header);</div><div class='add'>+	free_size = size;</div><div class='add'>+	range = ops-&gt;fill_mem_hdr(fwrt, reg_data, header, free_size);</div><div class='ctx'> 	if (!range) {</div><div class='ctx'> 		IWL_ERR(fwrt,</div><div class='ctx'> 			"WRT: Failed to fill region header: id=%d, type=%d\n",</div><div class='hunk'>@@ -1970,8 +2338,21 @@ static u32 iwl_dump_ini_mem(struct iwl_fw_runtime *fwrt, struct list_head *list,</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	header_size = range - (u8 *)header;</div><div class='add'>+</div><div class='add'>+	if (WARN(header_size &gt; free_size,</div><div class='add'>+		 "header size %llu &gt; free_size %d",</div><div class='add'>+		 header_size, free_size)) {</div><div class='add'>+		IWL_ERR(fwrt,</div><div class='add'>+			"WRT: fill_mem_hdr used more than given free_size\n");</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	free_size -= header_size;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; num_of_ranges; i++) {</div><div class='del'>-		int range_size = ops-&gt;fill_range(fwrt, reg_data, range, i);</div><div class='add'>+		int range_size = ops-&gt;fill_range(fwrt, reg_data, range,</div><div class='add'>+						 free_size, i);</div><div class='ctx'> </div><div class='ctx'> 		if (range_size &lt; 0) {</div><div class='ctx'> 			IWL_ERR(fwrt,</div><div class='hunk'>@@ -1979,6 +2360,15 @@ static u32 iwl_dump_ini_mem(struct iwl_fw_runtime *fwrt, struct list_head *list,</div><div class='ctx'> 				id, type);</div><div class='ctx'> 			goto out_err;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (WARN(range_size &gt; free_size, "range_size %d &gt; free_size %d",</div><div class='add'>+			 range_size, free_size)) {</div><div class='add'>+			IWL_ERR(fwrt,</div><div class='add'>+				"WRT: fill_raged used more than given free_size\n");</div><div class='add'>+			goto out_err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		free_size -= range_size;</div><div class='ctx'> 		range = range + range_size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2003,7 +2393,7 @@ static u32 iwl_dump_ini_info(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	struct iwl_fw_ini_dump_cfg_name *cfg_name;</div><div class='ctx'> 	u32 size = sizeof(*tlv) + sizeof(*dump);</div><div class='ctx'> 	u32 num_of_cfg_names = 0;</div><div class='del'>-	u32 hw_type;</div><div class='add'>+	u32 hw_type, is_cdb;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(node, &amp;fwrt-&gt;trans-&gt;dbg.debug_info_tlv_list, list) {</div><div class='ctx'> 		size += sizeof(*cfg_name);</div><div class='hunk'>@@ -2031,33 +2421,20 @@ static u32 iwl_dump_ini_info(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	dump-&gt;ver_type = cpu_to_le32(fwrt-&gt;dump.fw_ver.type);</div><div class='ctx'> 	dump-&gt;ver_subtype = cpu_to_le32(fwrt-&gt;dump.fw_ver.subtype);</div><div class='ctx'> </div><div class='del'>-	dump-&gt;hw_step = cpu_to_le32(CSR_HW_REV_STEP(fwrt-&gt;trans-&gt;hw_rev));</div><div class='add'>+	dump-&gt;hw_step = cpu_to_le32(fwrt-&gt;trans-&gt;info.hw_rev_step);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Several HWs all have type == 0x42, so we'll override this value</div><div class='del'>-	 * according to the detected HW</div><div class='del'>-	 */</div><div class='del'>-	hw_type = CSR_HW_REV_TYPE(fwrt-&gt;trans-&gt;hw_rev);</div><div class='del'>-	if (hw_type == IWL_AX210_HW_TYPE) {</div><div class='del'>-		u32 prph_val = iwl_read_prph(fwrt-&gt;trans, WFPM_OTP_CFG1_ADDR);</div><div class='del'>-		u32 is_jacket = !!(prph_val &amp; WFPM_OTP_CFG1_IS_JACKET_BIT);</div><div class='del'>-		u32 is_cdb = !!(prph_val &amp; WFPM_OTP_CFG1_IS_CDB_BIT);</div><div class='del'>-		u32 masked_bits = is_jacket | (is_cdb &lt;&lt; 1);</div><div class='add'>+	hw_type = CSR_HW_REV_TYPE(fwrt-&gt;trans-&gt;info.hw_rev);</div><div class='add'>+</div><div class='add'>+	is_cdb = CSR_HW_RFID_IS_CDB(fwrt-&gt;trans-&gt;info.hw_rf_id);</div><div class='add'>+	hw_type |= IWL_CDB_MASK(is_cdb);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * The HW type depends on certain bits in this case, so add</div><div class='del'>-		 * these bits to the HW type. We won't have collisions since we</div><div class='del'>-		 * add these bits after the highest possible bit in the mask.</div><div class='del'>-		 */</div><div class='del'>-		hw_type |= masked_bits &lt;&lt; IWL_AX210_HW_TYPE_ADDITION_SHIFT;</div><div class='del'>-	}</div><div class='ctx'> 	dump-&gt;hw_type = cpu_to_le32(hw_type);</div><div class='ctx'> </div><div class='ctx'> 	dump-&gt;rf_id_flavor =</div><div class='del'>-		cpu_to_le32(CSR_HW_RFID_FLAVOR(fwrt-&gt;trans-&gt;hw_rf_id));</div><div class='del'>-	dump-&gt;rf_id_dash = cpu_to_le32(CSR_HW_RFID_DASH(fwrt-&gt;trans-&gt;hw_rf_id));</div><div class='del'>-	dump-&gt;rf_id_step = cpu_to_le32(CSR_HW_RFID_STEP(fwrt-&gt;trans-&gt;hw_rf_id));</div><div class='del'>-	dump-&gt;rf_id_type = cpu_to_le32(CSR_HW_RFID_TYPE(fwrt-&gt;trans-&gt;hw_rf_id));</div><div class='add'>+		cpu_to_le32(CSR_HW_RFID_FLAVOR(fwrt-&gt;trans-&gt;info.hw_rf_id));</div><div class='add'>+	dump-&gt;rf_id_dash = cpu_to_le32(CSR_HW_RFID_DASH(fwrt-&gt;trans-&gt;info.hw_rf_id));</div><div class='add'>+	dump-&gt;rf_id_step = cpu_to_le32(CSR_HW_RFID_STEP(fwrt-&gt;trans-&gt;info.hw_rf_id));</div><div class='add'>+	dump-&gt;rf_id_type = cpu_to_le32(CSR_HW_RFID_TYPE(fwrt-&gt;trans-&gt;info.hw_rf_id));</div><div class='ctx'> </div><div class='ctx'> 	dump-&gt;lmac_major = cpu_to_le32(fwrt-&gt;dump.fw_ver.lmac_major);</div><div class='ctx'> 	dump-&gt;lmac_minor = cpu_to_le32(fwrt-&gt;dump.fw_ver.lmac_minor);</div><div class='hunk'>@@ -2078,9 +2455,12 @@ static u32 iwl_dump_ini_info(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		struct iwl_fw_ini_debug_info_tlv *debug_info =</div><div class='ctx'> 			(void *)node-&gt;tlv.data;</div><div class='ctx'> </div><div class='add'>+		BUILD_BUG_ON(sizeof(cfg_name-&gt;cfg_name) !=</div><div class='add'>+			     sizeof(debug_info-&gt;debug_cfg_name));</div><div class='add'>+</div><div class='ctx'> 		cfg_name-&gt;image_type = debug_info-&gt;image_type;</div><div class='ctx'> 		cfg_name-&gt;cfg_name_len =</div><div class='del'>-			cpu_to_le32(IWL_FW_INI_MAX_CFG_NAME);</div><div class='add'>+			cpu_to_le32(sizeof(cfg_name-&gt;cfg_name));</div><div class='ctx'> 		memcpy(cfg_name-&gt;cfg_name, debug_info-&gt;debug_cfg_name,</div><div class='ctx'> 		       sizeof(cfg_name-&gt;cfg_name));</div><div class='ctx'> 		cfg_name++;</div><div class='hunk'>@@ -2156,6 +2536,18 @@ static const struct iwl_dump_ini_mem_ops iwl_dump_ini_region_ops[] = {</div><div class='ctx'> 		.fill_mem_hdr = iwl_dump_ini_mem_fill_header,</div><div class='ctx'> 		.fill_range = iwl_dump_ini_prph_phy_iter,</div><div class='ctx'> 	},</div><div class='add'>+	[IWL_FW_INI_REGION_PERIPHERY_MAC_RANGE] = {</div><div class='add'>+		.get_num_of_ranges = iwl_dump_ini_mem_block_ranges,</div><div class='add'>+		.get_size = iwl_dump_ini_mem_block_get_size,</div><div class='add'>+		.fill_mem_hdr = iwl_dump_ini_mem_fill_header,</div><div class='add'>+		.fill_range = iwl_dump_ini_prph_mac_block_iter,</div><div class='add'>+	},</div><div class='add'>+	[IWL_FW_INI_REGION_PERIPHERY_PHY_RANGE] = {</div><div class='add'>+		.get_num_of_ranges = iwl_dump_ini_mem_block_ranges,</div><div class='add'>+		.get_size = iwl_dump_ini_mem_block_get_size,</div><div class='add'>+		.fill_mem_hdr = iwl_dump_ini_mem_fill_header,</div><div class='add'>+		.fill_range = iwl_dump_ini_prph_phy_block_iter,</div><div class='add'>+	},</div><div class='ctx'> 	[IWL_FW_INI_REGION_PERIPHERY_AUX] = {},</div><div class='ctx'> 	[IWL_FW_INI_REGION_PAGING] = {</div><div class='ctx'> 		.fill_mem_hdr = iwl_dump_ini_mem_fill_header,</div><div class='hunk'>@@ -2169,7 +2561,12 @@ static const struct iwl_dump_ini_mem_ops iwl_dump_ini_region_ops[] = {</div><div class='ctx'> 		.fill_mem_hdr = iwl_dump_ini_mem_fill_header,</div><div class='ctx'> 		.fill_range = iwl_dump_ini_csr_iter,</div><div class='ctx'> 	},</div><div class='del'>-	[IWL_FW_INI_REGION_DRAM_IMR] = {},</div><div class='add'>+	[IWL_FW_INI_REGION_DRAM_IMR] = {</div><div class='add'>+		.get_num_of_ranges = iwl_dump_ini_imr_ranges,</div><div class='add'>+		.get_size = iwl_dump_ini_imr_get_size,</div><div class='add'>+		.fill_mem_hdr = iwl_dump_ini_imr_fill_header,</div><div class='add'>+		.fill_range = iwl_dump_ini_imr_iter,</div><div class='add'>+	},</div><div class='ctx'> 	[IWL_FW_INI_REGION_PCI_IOSF_CONFIG] = {</div><div class='ctx'> 		.get_num_of_ranges = iwl_dump_ini_mem_ranges,</div><div class='ctx'> 		.get_size = iwl_dump_ini_mem_get_size,</div><div class='hunk'>@@ -2182,28 +2579,48 @@ static const struct iwl_dump_ini_mem_ops iwl_dump_ini_region_ops[] = {</div><div class='ctx'> 		.fill_mem_hdr = iwl_dump_ini_special_mem_fill_header,</div><div class='ctx'> 		.fill_range = iwl_dump_ini_special_mem_iter,</div><div class='ctx'> 	},</div><div class='add'>+	[IWL_FW_INI_REGION_DBGI_SRAM] = {</div><div class='add'>+		.get_num_of_ranges = iwl_dump_ini_mem_ranges,</div><div class='add'>+		.get_size = iwl_dump_ini_mon_dbgi_get_size,</div><div class='add'>+		.fill_mem_hdr = iwl_dump_ini_mon_dbgi_fill_header,</div><div class='add'>+		.fill_range = iwl_dump_ini_dbgi_sram_iter,</div><div class='add'>+	},</div><div class='add'>+	[IWL_FW_INI_REGION_PERIPHERY_SNPS_DPHYIP] = {</div><div class='add'>+		.get_num_of_ranges = iwl_dump_ini_mem_ranges,</div><div class='add'>+		.get_size = iwl_dump_ini_mem_get_size,</div><div class='add'>+		.fill_mem_hdr = iwl_dump_ini_mem_fill_header,</div><div class='add'>+		.fill_range = iwl_dump_ini_prph_snps_dphyip_iter,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u32 iwl_dump_ini_trigger(struct iwl_fw_runtime *fwrt,</div><div class='del'>-				struct iwl_fwrt_dump_data *dump_data,</div><div class='del'>-				struct list_head *list)</div><div class='add'>+enum iwl_dump_ini_region_selector {</div><div class='add'>+	IWL_INI_DUMP_ALL_REGIONS,</div><div class='add'>+	IWL_INI_DUMP_EARLY_REGIONS,</div><div class='add'>+	IWL_INI_DUMP_LATE_REGIONS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool iwl_dump_due_to_error(enum iwl_fw_ini_time_point tp_id)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_fw_ini_trigger_tlv *trigger = dump_data-&gt;trig;</div><div class='del'>-	enum iwl_fw_ini_time_point tp_id = le32_to_cpu(trigger-&gt;time_point);</div><div class='del'>-	struct iwl_dump_ini_region_data reg_data = {</div><div class='del'>-		.dump_data = dump_data,</div><div class='del'>-	};</div><div class='del'>-	int i;</div><div class='del'>-	u32 size = 0;</div><div class='del'>-	u64 regions_mask = le64_to_cpu(trigger-&gt;regions_mask) &amp;</div><div class='del'>-			   ~(fwrt-&gt;trans-&gt;dbg.unsupported_region_msk);</div><div class='add'>+	return tp_id == IWL_FW_INI_TIME_POINT_FW_ASSERT ||</div><div class='add'>+	       tp_id == IWL_FW_INI_TIME_POINT_FW_HW_ERROR;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON(sizeof(trigger-&gt;regions_mask) != sizeof(regions_mask));</div><div class='del'>-	BUILD_BUG_ON((sizeof(trigger-&gt;regions_mask) * BITS_PER_BYTE) &lt;</div><div class='del'>-		     ARRAY_SIZE(fwrt-&gt;trans-&gt;dbg.active_regions));</div><div class='add'>+static u32</div><div class='add'>+iwl_dump_ini_dump_regions(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			  struct iwl_fwrt_dump_data *dump_data,</div><div class='add'>+			  struct list_head *list,</div><div class='add'>+			  enum iwl_fw_ini_time_point tp_id,</div><div class='add'>+			  u64 regions_mask,</div><div class='add'>+			  struct iwl_dump_ini_region_data *imr_reg_data,</div><div class='add'>+			  enum iwl_dump_ini_region_selector which)</div><div class='add'>+{</div><div class='add'>+	u32 size = 0;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(fwrt-&gt;trans-&gt;dbg.active_regions); i++) {</div><div class='del'>-		u32 reg_type;</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(fwrt-&gt;trans-&gt;dbg.active_regions); i++) {</div><div class='add'>+		struct iwl_dump_ini_region_data reg_data = {</div><div class='add'>+			.dump_data = dump_data,</div><div class='add'>+		};</div><div class='add'>+		u32 reg_type, dp;</div><div class='ctx'> 		struct iwl_fw_ini_region_tlv *reg;</div><div class='ctx'> </div><div class='ctx'> 		if (!(BIT_ULL(i) &amp; regions_mask))</div><div class='hunk'>@@ -2217,11 +2634,15 @@ static u32 iwl_dump_ini_trigger(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		reg = (void *)reg_data.reg_tlv-&gt;data;</div><div class='del'>-		reg_type = le32_to_cpu(reg-&gt;type);</div><div class='add'>+		reg_type = reg-&gt;type;</div><div class='ctx'> 		if (reg_type &gt;= ARRAY_SIZE(iwl_dump_ini_region_ops))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (reg_type == IWL_FW_INI_REGION_PERIPHERY_PHY &amp;&amp;</div><div class='add'>+		dp = le32_get_bits(reg-&gt;id, IWL_FW_INI_REGION_DUMP_POLICY_MASK);</div><div class='add'>+</div><div class='add'>+		if ((reg_type == IWL_FW_INI_REGION_PERIPHERY_PHY ||</div><div class='add'>+		     reg_type == IWL_FW_INI_REGION_PERIPHERY_PHY_RANGE ||</div><div class='add'>+		     reg_type == IWL_FW_INI_REGION_PERIPHERY_SNPS_DPHYIP) &amp;&amp;</div><div class='ctx'> 		    tp_id != IWL_FW_INI_TIME_POINT_FW_ASSERT) {</div><div class='ctx'> 			IWL_WARN(fwrt,</div><div class='ctx'> 				 "WRT: trying to collect phy prph at time point: %d, skipping\n",</div><div class='hunk'>@@ -2229,12 +2650,88 @@ static u32 iwl_dump_ini_trigger(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		switch (which) {</div><div class='add'>+		case IWL_INI_DUMP_ALL_REGIONS:</div><div class='add'>+			break;</div><div class='add'>+		case IWL_INI_DUMP_EARLY_REGIONS:</div><div class='add'>+			if (!(dp &amp; IWL_FW_IWL_DEBUG_DUMP_POLICY_BEFORE_RESET))</div><div class='add'>+				continue;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_INI_DUMP_LATE_REGIONS:</div><div class='add'>+			if (dp &amp; IWL_FW_IWL_DEBUG_DUMP_POLICY_BEFORE_RESET)</div><div class='add'>+				continue;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * DRAM_IMR can be collected only for FW/HW error timepoint</div><div class='add'>+		 * when fw is not alive. In addition, it must be collected</div><div class='add'>+		 * lastly as it overwrites SRAM that can possibly contain</div><div class='add'>+		 * debug data which also need to be collected.</div><div class='add'>+		 */</div><div class='add'>+		if (reg_type == IWL_FW_INI_REGION_DRAM_IMR) {</div><div class='add'>+			if (iwl_dump_due_to_error(tp_id))</div><div class='add'>+				imr_reg_data-&gt;reg_tlv =</div><div class='add'>+					fwrt-&gt;trans-&gt;dbg.active_regions[i];</div><div class='add'>+			else</div><div class='add'>+				IWL_INFO(fwrt,</div><div class='add'>+					 "WRT: trying to collect DRAM_IMR at time point: %d, skipping\n",</div><div class='add'>+					 tp_id);</div><div class='add'>+		/* continue to next region */</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 		size += iwl_dump_ini_mem(fwrt, list, &amp;reg_data,</div><div class='ctx'> 					 &amp;iwl_dump_ini_region_ops[reg_type]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (size)</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 iwl_dump_ini_trigger(struct iwl_fw_runtime *fwrt,</div><div class='add'>+				struct iwl_fwrt_dump_data *dump_data,</div><div class='add'>+				struct list_head *list)</div><div class='add'>+{</div><div class='add'>+	struct iwl_fw_ini_trigger_tlv *trigger = dump_data-&gt;trig;</div><div class='add'>+	enum iwl_fw_ini_time_point tp_id = le32_to_cpu(trigger-&gt;time_point);</div><div class='add'>+	struct iwl_dump_ini_region_data imr_reg_data = {</div><div class='add'>+		.dump_data = dump_data,</div><div class='add'>+	};</div><div class='add'>+	u32 size = 0;</div><div class='add'>+	u64 regions_mask = le64_to_cpu(trigger-&gt;regions_mask) &amp;</div><div class='add'>+			   ~(fwrt-&gt;trans-&gt;dbg.unsupported_region_msk);</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(trigger-&gt;regions_mask) != sizeof(regions_mask));</div><div class='add'>+	BUILD_BUG_ON((sizeof(trigger-&gt;regions_mask) * BITS_PER_BYTE) &lt;</div><div class='add'>+		     ARRAY_SIZE(fwrt-&gt;trans-&gt;dbg.active_regions));</div><div class='add'>+</div><div class='add'>+	if (trigger-&gt;apply_policy &amp;</div><div class='add'>+			cpu_to_le32(IWL_FW_INI_APPLY_POLICY_SPLIT_DUMP_RESET)) {</div><div class='add'>+		size += iwl_dump_ini_dump_regions(fwrt, dump_data, list, tp_id,</div><div class='add'>+						  regions_mask, &amp;imr_reg_data,</div><div class='add'>+						  IWL_INI_DUMP_EARLY_REGIONS);</div><div class='add'>+		iwl_trans_pcie_fw_reset_handshake(fwrt-&gt;trans);</div><div class='add'>+		size += iwl_dump_ini_dump_regions(fwrt, dump_data, list, tp_id,</div><div class='add'>+						  regions_mask, &amp;imr_reg_data,</div><div class='add'>+						  IWL_INI_DUMP_LATE_REGIONS);</div><div class='add'>+	} else {</div><div class='add'>+		if (fw_has_capa(&amp;fwrt-&gt;fw-&gt;ucode_capa,</div><div class='add'>+				IWL_UCODE_TLV_CAPA_RESET_DURING_ASSERT) &amp;&amp;</div><div class='add'>+		    iwl_dump_due_to_error(tp_id))</div><div class='add'>+			iwl_trans_pcie_fw_reset_handshake(fwrt-&gt;trans);</div><div class='add'>+		size += iwl_dump_ini_dump_regions(fwrt, dump_data, list, tp_id,</div><div class='add'>+						  regions_mask, &amp;imr_reg_data,</div><div class='add'>+						  IWL_INI_DUMP_ALL_REGIONS);</div><div class='add'>+	}</div><div class='add'>+	/* collect DRAM_IMR region in the last */</div><div class='add'>+	if (imr_reg_data.reg_tlv)</div><div class='add'>+		size += iwl_dump_ini_mem(fwrt, list, &amp;imr_reg_data,</div><div class='add'>+					 &amp;iwl_dump_ini_region_ops[IWL_FW_INI_REGION_DRAM_IMR]);</div><div class='add'>+</div><div class='add'>+	if (size) {</div><div class='ctx'> 		size += iwl_dump_ini_info(fwrt, trigger, list);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='hunk'>@@ -2314,9 +2811,11 @@ static void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (dump_data-&gt;monitor_only)</div><div class='del'>-		dump_mask &amp;= IWL_FW_ERROR_DUMP_FW_MONITOR;</div><div class='add'>+		dump_mask &amp;= BIT(IWL_FW_ERROR_DUMP_FW_MONITOR);</div><div class='ctx'> </div><div class='del'>-	fw_error_dump.trans_ptr = iwl_trans_dump_data(fwrt-&gt;trans, dump_mask);</div><div class='add'>+	fw_error_dump.trans_ptr = iwl_trans_dump_data(fwrt-&gt;trans, dump_mask,</div><div class='add'>+						      fwrt-&gt;sanitize_ops,</div><div class='add'>+						      fwrt-&gt;sanitize_ctx);</div><div class='ctx'> 	file_len = le32_to_cpu(dump_file-&gt;file_len);</div><div class='ctx'> 	fw_error_dump.fwrt_len = file_len;</div><div class='ctx'> </div><div class='hunk'>@@ -2365,7 +2864,7 @@ static void iwl_fw_error_dump_data_free(struct iwl_fwrt_dump_data *dump_data)</div><div class='ctx'> static void iwl_fw_error_ini_dump(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 				  struct iwl_fwrt_dump_data *dump_data)</div><div class='ctx'> {</div><div class='del'>-	struct list_head dump_list = LIST_HEAD_INIT(dump_list);</div><div class='add'>+	LIST_HEAD(dump_list);</div><div class='ctx'> 	struct scatterlist *sg_dump_data;</div><div class='ctx'> 	u32 file_len = iwl_dump_ini_file_gen(fwrt, dump_data, &amp;dump_list);</div><div class='ctx'> </div><div class='hunk'>@@ -2434,7 +2933,8 @@ int iwl_fw_dbg_collect_desc(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	IWL_WARN(fwrt, "Collecting data: trigger %d fired.\n",</div><div class='ctx'> 		 le32_to_cpu(desc-&gt;trig_desc.type));</div><div class='ctx'> </div><div class='del'>-	schedule_delayed_work(&amp;wk_data-&gt;wk, usecs_to_jiffies(delay));</div><div class='add'>+	queue_delayed_work(system_unbound_wq, &amp;wk_data-&gt;wk,</div><div class='add'>+			   usecs_to_jiffies(delay));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2443,7 +2943,7 @@ IWL_EXPORT_SYMBOL(iwl_fw_dbg_collect_desc);</div><div class='ctx'> int iwl_fw_dbg_error_collect(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			     enum iwl_fw_dbg_trigger trig_type)</div><div class='ctx'> {</div><div class='del'>-	if (!test_bit(STATUS_DEVICE_ENABLED, &amp;fwrt-&gt;trans-&gt;status))</div><div class='add'>+	if (!iwl_trans_device_enabled(fwrt-&gt;trans))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_trans_dbg_ini_valid(fwrt-&gt;trans)) {</div><div class='hunk'>@@ -2489,6 +2989,7 @@ int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	struct iwl_fw_dump_desc *desc;</div><div class='ctx'> 	unsigned int delay = 0;</div><div class='ctx'> 	bool monitor_only = false;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (trigger) {</div><div class='ctx'> 		u16 occurrences = le16_to_cpu(trigger-&gt;occurrences) - 1;</div><div class='hunk'>@@ -2510,7 +3011,7 @@ int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		delay = le32_to_cpu(trigger-&gt;stop_delay) * USEC_PER_MSEC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	desc = kzalloc(sizeof(*desc) + len, GFP_ATOMIC);</div><div class='add'>+	desc = kzalloc(struct_size(desc, trig_desc.data, len), GFP_ATOMIC);</div><div class='ctx'> 	if (!desc)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -2519,60 +3020,19 @@ int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	desc-&gt;trig_desc.type = cpu_to_le32(trig);</div><div class='ctx'> 	memcpy(desc-&gt;trig_desc.data, str, len);</div><div class='ctx'> </div><div class='del'>-	return iwl_fw_dbg_collect_desc(fwrt, desc, monitor_only, delay);</div><div class='del'>-}</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_fw_dbg_collect);</div><div class='del'>-</div><div class='del'>-int iwl_fw_dbg_ini_collect(struct iwl_fw_runtime *fwrt,</div><div class='del'>-			   struct iwl_fwrt_dump_data *dump_data)</div><div class='del'>-{</div><div class='del'>-	struct iwl_fw_ini_trigger_tlv *trig = dump_data-&gt;trig;</div><div class='del'>-	enum iwl_fw_ini_time_point tp_id = le32_to_cpu(trig-&gt;time_point);</div><div class='del'>-	u32 occur, delay;</div><div class='del'>-	unsigned long idx;</div><div class='del'>-</div><div class='del'>-	if (!iwl_fw_ini_trigger_on(fwrt, trig)) {</div><div class='del'>-		IWL_WARN(fwrt, "WRT: Trigger %d is not active, aborting dump\n",</div><div class='del'>-			 tp_id);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	delay = le32_to_cpu(trig-&gt;dump_delay);</div><div class='del'>-	occur = le32_to_cpu(trig-&gt;occurrences);</div><div class='del'>-	if (!occur)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	trig-&gt;occurrences = cpu_to_le32(--occur);</div><div class='del'>-</div><div class='del'>-	/* Check there is an available worker.</div><div class='del'>-	 * ffz return value is undefined if no zero exists,</div><div class='del'>-	 * so check against ~0UL first.</div><div class='del'>-	 */</div><div class='del'>-	if (fwrt-&gt;dump.active_wks == ~0UL)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	idx = ffz(fwrt-&gt;dump.active_wks);</div><div class='del'>-</div><div class='del'>-	if (idx &gt;= IWL_FW_RUNTIME_DUMP_WK_NUM ||</div><div class='del'>-	    test_and_set_bit(fwrt-&gt;dump.wks[idx].idx, &amp;fwrt-&gt;dump.active_wks))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	fwrt-&gt;dump.wks[idx].dump_data = *dump_data;</div><div class='del'>-</div><div class='del'>-	IWL_WARN(fwrt,</div><div class='del'>-		 "WRT: Collecting data: ini trigger %d fired (delay=%dms).\n",</div><div class='del'>-		 tp_id, (u32)(delay / USEC_PER_MSEC));</div><div class='del'>-</div><div class='del'>-	schedule_delayed_work(&amp;fwrt-&gt;dump.wks[idx].wk, usecs_to_jiffies(delay));</div><div class='add'>+	ret = iwl_fw_dbg_collect_desc(fwrt, desc, monitor_only, delay);</div><div class='add'>+	if (ret)</div><div class='add'>+		kfree(desc);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_fw_dbg_collect);</div><div class='ctx'> </div><div class='ctx'> int iwl_fw_dbg_collect_trig(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			    struct iwl_fw_dbg_trigger_tlv *trigger,</div><div class='ctx'> 			    const char *fmt, ...)</div><div class='ctx'> {</div><div class='del'>-	int ret, len = 0;</div><div class='add'>+	int len = 0;</div><div class='ctx'> 	char buf[64];</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_trans_dbg_ini_valid(fwrt-&gt;trans))</div><div class='hunk'>@@ -2594,13 +3054,8 @@ int iwl_fw_dbg_collect_trig(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		len = strlen(buf) + 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = iwl_fw_dbg_collect(fwrt, le32_to_cpu(trigger-&gt;id), buf, len,</div><div class='del'>-				 trigger);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return iwl_fw_dbg_collect(fwrt, le32_to_cpu(trigger-&gt;id), buf, len,</div><div class='add'>+				  trigger);</div><div class='ctx'> }</div><div class='ctx'> IWL_EXPORT_SYMBOL(iwl_fw_dbg_collect_trig);</div><div class='ctx'> </div><div class='hunk'>@@ -2651,6 +3106,27 @@ int iwl_fw_start_dbg_conf(struct iwl_fw_runtime *fwrt, u8 conf_id)</div><div class='ctx'> }</div><div class='ctx'> IWL_EXPORT_SYMBOL(iwl_fw_start_dbg_conf);</div><div class='ctx'> </div><div class='add'>+static void iwl_send_dbg_dump_complete_cmd(struct iwl_fw_runtime *fwrt,</div><div class='add'>+					   u32 timepoint, u32 timepoint_data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_dbg_dump_complete_cmd hcmd_data;</div><div class='add'>+	struct iwl_host_cmd hcmd = {</div><div class='add'>+		.id = WIDE_ID(DEBUG_GROUP, FW_DUMP_COMPLETE_CMD),</div><div class='add'>+		.data[0] = &amp;hcmd_data,</div><div class='add'>+		.len[0] = sizeof(hcmd_data),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (iwl_trans_is_fw_error(fwrt-&gt;trans))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (fw_has_capa(&amp;fwrt-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			IWL_UCODE_TLV_CAPA_DUMP_COMPLETE_SUPPORT)) {</div><div class='add'>+		hcmd_data.tp = cpu_to_le32(timepoint);</div><div class='add'>+		hcmd_data.tp_data = cpu_to_le32(timepoint_data);</div><div class='add'>+		iwl_trans_send_cmd(fwrt-&gt;trans, &amp;hcmd);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* this function assumes dump_start was called beforehand and dump_end will be</div><div class='ctx'>  * called afterwards</div><div class='ctx'>  */</div><div class='hunk'>@@ -2663,13 +3139,19 @@ static void iwl_fw_dbg_collect_sync(struct iwl_fw_runtime *fwrt, u8 wk_idx)</div><div class='ctx'> 	if (!test_bit(wk_idx, &amp;fwrt-&gt;dump.active_wks))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(STATUS_DEVICE_ENABLED, &amp;fwrt-&gt;trans-&gt;status)) {</div><div class='add'>+	/* also checks 'desc' for pre-ini mode, since that shadows in union */</div><div class='add'>+	if (!dump_data-&gt;trig) {</div><div class='add'>+		IWL_ERR(fwrt, "dump trigger data is not set\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!iwl_trans_device_enabled(fwrt-&gt;trans)) {</div><div class='ctx'> 		IWL_ERR(fwrt, "Device is not enabled - cannot dump error\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* there's no point in fw dump if the bus is dead */</div><div class='del'>-	if (test_bit(STATUS_TRANS_DEAD, &amp;fwrt-&gt;trans-&gt;status)) {</div><div class='add'>+	if (iwl_trans_is_dead(fwrt-&gt;trans)) {</div><div class='ctx'> 		IWL_ERR(fwrt, "Skip fw error dump since bus is dead\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2678,13 +3160,25 @@ static void iwl_fw_dbg_collect_sync(struct iwl_fw_runtime *fwrt, u8 wk_idx)</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_FW_INFO(fwrt, "WRT: Data collection start\n");</div><div class='ctx'> 	if (iwl_trans_dbg_ini_valid(fwrt-&gt;trans))</div><div class='del'>-		iwl_fw_error_ini_dump(fwrt, &amp;fwrt-&gt;dump.wks[wk_idx].dump_data);</div><div class='add'>+		iwl_fw_error_ini_dump(fwrt, dump_data);</div><div class='ctx'> 	else</div><div class='del'>-		iwl_fw_error_dump(fwrt, &amp;fwrt-&gt;dump.wks[wk_idx].dump_data);</div><div class='add'>+		iwl_fw_error_dump(fwrt, dump_data);</div><div class='ctx'> 	IWL_DEBUG_FW_INFO(fwrt, "WRT: Data collection done\n");</div><div class='ctx'> </div><div class='ctx'> 	iwl_fw_dbg_stop_restart_recording(fwrt, &amp;params, false);</div><div class='ctx'> </div><div class='add'>+	if (iwl_trans_dbg_ini_valid(fwrt-&gt;trans)) {</div><div class='add'>+		u32 policy = le32_to_cpu(dump_data-&gt;trig-&gt;apply_policy);</div><div class='add'>+		u32 time_point = le32_to_cpu(dump_data-&gt;trig-&gt;time_point);</div><div class='add'>+</div><div class='add'>+		if (policy &amp; IWL_FW_INI_APPLY_POLICY_DUMP_COMPLETE_CMD) {</div><div class='add'>+			IWL_DEBUG_FW_INFO(fwrt, "WRT: sending dump complete\n");</div><div class='add'>+			iwl_send_dbg_dump_complete_cmd(fwrt, time_point, 0);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fwrt-&gt;trans-&gt;dbg.last_tp_resetfw == IWL_FW_INI_RESET_FW_MODE_STOP_FW_ONLY)</div><div class='add'>+		iwl_force_nmi(fwrt-&gt;trans);</div><div class='ctx'> out:</div><div class='ctx'> 	if (iwl_trans_dbg_ini_valid(fwrt-&gt;trans)) {</div><div class='ctx'> 		iwl_fw_error_dump_data_free(dump_data);</div><div class='hunk'>@@ -2696,6 +3190,60 @@ out:</div><div class='ctx'> 	clear_bit(wk_idx, &amp;fwrt-&gt;dump.active_wks);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int iwl_fw_dbg_ini_collect(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			   struct iwl_fwrt_dump_data *dump_data,</div><div class='add'>+			   bool sync)</div><div class='add'>+{</div><div class='add'>+	struct iwl_fw_ini_trigger_tlv *trig = dump_data-&gt;trig;</div><div class='add'>+	enum iwl_fw_ini_time_point tp_id = le32_to_cpu(trig-&gt;time_point);</div><div class='add'>+	u32 occur, delay;</div><div class='add'>+	unsigned long idx;</div><div class='add'>+</div><div class='add'>+	if (!iwl_fw_ini_trigger_on(fwrt, trig)) {</div><div class='add'>+		IWL_WARN(fwrt, "WRT: Trigger %d is not active, aborting dump\n",</div><div class='add'>+			 tp_id);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	delay = le32_to_cpu(trig-&gt;dump_delay);</div><div class='add'>+	occur = le32_to_cpu(trig-&gt;occurrences);</div><div class='add'>+	if (!occur)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	trig-&gt;occurrences = cpu_to_le32(--occur);</div><div class='add'>+</div><div class='add'>+	/* Check there is an available worker.</div><div class='add'>+	 * ffz return value is undefined if no zero exists,</div><div class='add'>+	 * so check against ~0UL first.</div><div class='add'>+	 */</div><div class='add'>+	if (fwrt-&gt;dump.active_wks == ~0UL)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	idx = ffz(fwrt-&gt;dump.active_wks);</div><div class='add'>+</div><div class='add'>+	if (idx &gt;= IWL_FW_RUNTIME_DUMP_WK_NUM ||</div><div class='add'>+	    test_and_set_bit(fwrt-&gt;dump.wks[idx].idx, &amp;fwrt-&gt;dump.active_wks))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	fwrt-&gt;dump.wks[idx].dump_data = *dump_data;</div><div class='add'>+</div><div class='add'>+	if (sync)</div><div class='add'>+		delay = 0;</div><div class='add'>+</div><div class='add'>+	IWL_WARN(fwrt,</div><div class='add'>+		 "WRT: Collecting data: ini trigger %d fired (delay=%dms).\n",</div><div class='add'>+		 tp_id, (u32)(delay / USEC_PER_MSEC));</div><div class='add'>+</div><div class='add'>+	if (sync)</div><div class='add'>+		iwl_fw_dbg_collect_sync(fwrt, idx);</div><div class='add'>+	else</div><div class='add'>+		queue_delayed_work(system_unbound_wq,</div><div class='add'>+				   &amp;fwrt-&gt;dump.wks[idx].wk,</div><div class='add'>+				   usecs_to_jiffies(delay));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void iwl_fw_error_dump_wk(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_fwrt_wk_data *wks =</div><div class='hunk'>@@ -2706,9 +3254,8 @@ void iwl_fw_error_dump_wk(struct work_struct *work)</div><div class='ctx'> 	/* assumes the op mode mutex is locked in dump_start since</div><div class='ctx'> 	 * iwl_fw_dbg_collect_sync can't run in parallel</div><div class='ctx'> 	 */</div><div class='del'>-	if (fwrt-&gt;ops &amp;&amp; fwrt-&gt;ops-&gt;dump_start &amp;&amp;</div><div class='del'>-	    fwrt-&gt;ops-&gt;dump_start(fwrt-&gt;ops_ctx))</div><div class='del'>-		return;</div><div class='add'>+	if (fwrt-&gt;ops &amp;&amp; fwrt-&gt;ops-&gt;dump_start)</div><div class='add'>+		fwrt-&gt;ops-&gt;dump_start(fwrt-&gt;ops_ctx);</div><div class='ctx'> </div><div class='ctx'> 	iwl_fw_dbg_collect_sync(fwrt, wks-&gt;idx);</div><div class='ctx'> </div><div class='hunk'>@@ -2718,13 +3265,13 @@ void iwl_fw_error_dump_wk(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> void iwl_fw_dbg_read_d3_debug_data(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='del'>-	const struct iwl_cfg *cfg = fwrt-&gt;trans-&gt;cfg;</div><div class='add'>+	const struct iwl_mac_cfg *mac_cfg = fwrt-&gt;trans-&gt;mac_cfg;</div><div class='ctx'> </div><div class='ctx'> 	if (!iwl_fw_dbg_is_d3_debug_enabled(fwrt))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!fwrt-&gt;dump.d3_debug_data) {</div><div class='del'>-		fwrt-&gt;dump.d3_debug_data = kmalloc(cfg-&gt;d3_debug_data_length,</div><div class='add'>+		fwrt-&gt;dump.d3_debug_data = kmalloc(mac_cfg-&gt;base-&gt;d3_debug_data_length,</div><div class='ctx'> 						   GFP_KERNEL);</div><div class='ctx'> 		if (!fwrt-&gt;dump.d3_debug_data) {</div><div class='ctx'> 			IWL_ERR(fwrt,</div><div class='hunk'>@@ -2734,9 +3281,15 @@ void iwl_fw_dbg_read_d3_debug_data(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* if the buffer holds previous debug data it is overwritten */</div><div class='del'>-	iwl_trans_read_mem_bytes(fwrt-&gt;trans, cfg-&gt;d3_debug_data_base_addr,</div><div class='add'>+	iwl_trans_read_mem_bytes(fwrt-&gt;trans, mac_cfg-&gt;base-&gt;d3_debug_data_base_addr,</div><div class='ctx'> 				 fwrt-&gt;dump.d3_debug_data,</div><div class='del'>-				 cfg-&gt;d3_debug_data_length);</div><div class='add'>+				 mac_cfg-&gt;base-&gt;d3_debug_data_length);</div><div class='add'>+</div><div class='add'>+	if (fwrt-&gt;sanitize_ops &amp;&amp; fwrt-&gt;sanitize_ops-&gt;frob_mem)</div><div class='add'>+		fwrt-&gt;sanitize_ops-&gt;frob_mem(fwrt-&gt;sanitize_ctx,</div><div class='add'>+					     mac_cfg-&gt;base-&gt;d3_debug_data_base_addr,</div><div class='add'>+					     fwrt-&gt;dump.d3_debug_data,</div><div class='add'>+					     mac_cfg-&gt;base-&gt;d3_debug_data_length);</div><div class='ctx'> }</div><div class='ctx'> IWL_EXPORT_SYMBOL(iwl_fw_dbg_read_d3_debug_data);</div><div class='ctx'> </div><div class='hunk'>@@ -2752,44 +3305,6 @@ void iwl_fw_dbg_stop_sync(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> }</div><div class='ctx'> IWL_EXPORT_SYMBOL(iwl_fw_dbg_stop_sync);</div><div class='ctx'> </div><div class='del'>-#define FSEQ_REG(x) { .addr = (x), .str = #x, }</div><div class='del'>-</div><div class='del'>-void iwl_fw_error_print_fseq_regs(struct iwl_fw_runtime *fwrt)</div><div class='del'>-{</div><div class='del'>-	struct iwl_trans *trans = fwrt-&gt;trans;</div><div class='del'>-	int i;</div><div class='del'>-	struct {</div><div class='del'>-		u32 addr;</div><div class='del'>-		const char *str;</div><div class='del'>-	} fseq_regs[] = {</div><div class='del'>-		FSEQ_REG(FSEQ_ERROR_CODE),</div><div class='del'>-		FSEQ_REG(FSEQ_TOP_INIT_VERSION),</div><div class='del'>-		FSEQ_REG(FSEQ_CNVIO_INIT_VERSION),</div><div class='del'>-		FSEQ_REG(FSEQ_OTP_VERSION),</div><div class='del'>-		FSEQ_REG(FSEQ_TOP_CONTENT_VERSION),</div><div class='del'>-		FSEQ_REG(FSEQ_ALIVE_TOKEN),</div><div class='del'>-		FSEQ_REG(FSEQ_CNVI_ID),</div><div class='del'>-		FSEQ_REG(FSEQ_CNVR_ID),</div><div class='del'>-		FSEQ_REG(CNVI_AUX_MISC_CHIP),</div><div class='del'>-		FSEQ_REG(CNVR_AUX_MISC_CHIP),</div><div class='del'>-		FSEQ_REG(CNVR_SCU_SD_REGS_SD_REG_DIG_DCDC_VTRIM),</div><div class='del'>-		FSEQ_REG(CNVR_SCU_SD_REGS_SD_REG_ACTIVE_VDIG_MIRROR),</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (!iwl_trans_grab_nic_access(trans))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	IWL_ERR(fwrt, "Fseq Registers:\n");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(fseq_regs); i++)</div><div class='del'>-		IWL_ERR(fwrt, "0x%08X | %s\n",</div><div class='del'>-			iwl_read_prph_no_grab(trans, fseq_regs[i].addr),</div><div class='del'>-			fseq_regs[i].str);</div><div class='del'>-</div><div class='del'>-	iwl_trans_release_nic_access(trans);</div><div class='del'>-}</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_fw_error_print_fseq_regs);</div><div class='del'>-</div><div class='ctx'> static int iwl_fw_dbg_suspend_resume_hcmd(struct iwl_trans *trans, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_dbg_suspend_resume_cmd cmd = {</div><div class='hunk'>@@ -2809,7 +3324,7 @@ static int iwl_fw_dbg_suspend_resume_hcmd(struct iwl_trans *trans, bool suspend)</div><div class='ctx'> static void iwl_fw_dbg_stop_recording(struct iwl_trans *trans,</div><div class='ctx'> 				      struct iwl_fw_dbg_params *params)</div><div class='ctx'> {</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family == IWL_DEVICE_FAMILY_7000) {</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family == IWL_DEVICE_FAMILY_7000) {</div><div class='ctx'> 		iwl_set_bits_prph(trans, MON_BUFF_SAMPLE_CTL, 0x100);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2833,7 +3348,7 @@ static int iwl_fw_dbg_restart_recording(struct iwl_trans *trans,</div><div class='ctx'> 	if (!params)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family == IWL_DEVICE_FAMILY_7000) {</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family == IWL_DEVICE_FAMILY_7000) {</div><div class='ctx'> 		iwl_clear_bits_prph(trans, MON_BUFF_SAMPLE_CTL, 0x100);</div><div class='ctx'> 		iwl_clear_bits_prph(trans, MON_BUFF_SAMPLE_CTL, 0x1);</div><div class='ctx'> 		iwl_set_bits_prph(trans, MON_BUFF_SAMPLE_CTL, 0x1);</div><div class='hunk'>@@ -2845,22 +3360,70 @@ static int iwl_fw_dbg_restart_recording(struct iwl_trans *trans,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int iwl_fw_send_timestamp_marker_cmd(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_marker marker = {</div><div class='add'>+		.dw_len = sizeof(struct iwl_mvm_marker) / 4,</div><div class='add'>+		.marker_id = MARKER_ID_SYNC_CLOCK,</div><div class='add'>+	};</div><div class='add'>+	struct iwl_host_cmd hcmd = {</div><div class='add'>+		.flags = CMD_ASYNC,</div><div class='add'>+		.id = WIDE_ID(LONG_GROUP, MARKER_CMD),</div><div class='add'>+		.dataflags = {},</div><div class='add'>+	};</div><div class='add'>+	struct iwl_mvm_marker_rsp *resp;</div><div class='add'>+	int cmd_ver = iwl_fw_lookup_cmd_ver(fwrt-&gt;fw,</div><div class='add'>+					    WIDE_ID(LONG_GROUP, MARKER_CMD),</div><div class='add'>+					    IWL_FW_CMD_VER_UNKNOWN);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (cmd_ver == 1) {</div><div class='add'>+		/* the real timestamp is taken from the ftrace clock</div><div class='add'>+		 * this is for finding the match between fw and kernel logs</div><div class='add'>+		 */</div><div class='add'>+		marker.timestamp = cpu_to_le64(fwrt-&gt;timestamp.seq++);</div><div class='add'>+	} else if (cmd_ver == 2) {</div><div class='add'>+		marker.timestamp = cpu_to_le64(ktime_get_boottime_ns());</div><div class='add'>+	} else {</div><div class='add'>+		IWL_DEBUG_INFO(fwrt,</div><div class='add'>+			       "Invalid version of Marker CMD. Ver = %d\n",</div><div class='add'>+			       cmd_ver);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hcmd.data[0] = &amp;marker;</div><div class='add'>+	hcmd.len[0] = sizeof(marker);</div><div class='add'>+</div><div class='add'>+	ret = iwl_trans_send_cmd(fwrt-&gt;trans, &amp;hcmd);</div><div class='add'>+</div><div class='add'>+	if (cmd_ver &gt; 1 &amp;&amp; hcmd.resp_pkt) {</div><div class='add'>+		resp = (void *)hcmd.resp_pkt-&gt;data;</div><div class='add'>+		IWL_DEBUG_INFO(fwrt, "FW GP2 time: %u\n",</div><div class='add'>+			       le32_to_cpu(resp-&gt;gp2));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void iwl_fw_dbg_stop_restart_recording(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 				       struct iwl_fw_dbg_params *params,</div><div class='ctx'> 				       bool stop)</div><div class='ctx'> {</div><div class='ctx'> 	int ret __maybe_unused = 0;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(STATUS_FW_ERROR, &amp;fwrt-&gt;trans-&gt;status))</div><div class='add'>+	if (!iwl_trans_fw_running(fwrt-&gt;trans))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (fw_has_capa(&amp;fwrt-&gt;fw-&gt;ucode_capa,</div><div class='del'>-			IWL_UCODE_TLV_CAPA_DBG_SUSPEND_RESUME_CMD_SUPP))</div><div class='add'>+			IWL_UCODE_TLV_CAPA_DBG_SUSPEND_RESUME_CMD_SUPP)) {</div><div class='add'>+		if (stop)</div><div class='add'>+			iwl_fw_send_timestamp_marker_cmd(fwrt);</div><div class='ctx'> 		ret = iwl_fw_dbg_suspend_resume_hcmd(fwrt-&gt;trans, stop);</div><div class='del'>-	else if (stop)</div><div class='add'>+	} else if (stop) {</div><div class='ctx'> 		iwl_fw_dbg_stop_recording(fwrt-&gt;trans, params);</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='ctx'> 		ret = iwl_fw_dbg_restart_recording(fwrt-&gt;trans, params);</div><div class='add'>+	}</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		if (stop)</div><div class='hunk'>@@ -2871,3 +3434,47 @@ void iwl_fw_dbg_stop_restart_recording(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> IWL_EXPORT_SYMBOL(iwl_fw_dbg_stop_restart_recording);</div><div class='add'>+</div><div class='add'>+void iwl_fw_disable_dbg_asserts(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_fw_dbg_config_cmd cmd = {</div><div class='add'>+		.type = cpu_to_le32(DEBUG_TOKEN_CONFIG_TYPE),</div><div class='add'>+		.conf = cpu_to_le32(IWL_FW_DBG_CONFIG_TOKEN),</div><div class='add'>+	};</div><div class='add'>+	struct iwl_host_cmd hcmd = {</div><div class='add'>+		.id = WIDE_ID(LONG_GROUP, LDBG_CONFIG_CMD),</div><div class='add'>+		.data[0] = &amp;cmd,</div><div class='add'>+		.len[0] = sizeof(cmd),</div><div class='add'>+	};</div><div class='add'>+	u32 preset = u32_get_bits(fwrt-&gt;trans-&gt;dbg.domains_bitmap,</div><div class='add'>+				  GENMASK(31, IWL_FW_DBG_DOMAIN_POS + 1));</div><div class='add'>+</div><div class='add'>+	/* supported starting from 9000 devices */</div><div class='add'>+	if (fwrt-&gt;trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_9000)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (fwrt-&gt;trans-&gt;dbg.yoyo_bin_loaded || (preset &amp;&amp; preset != 1))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_trans_send_cmd(fwrt-&gt;trans, &amp;hcmd);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_fw_disable_dbg_asserts);</div><div class='add'>+</div><div class='add'>+void iwl_fw_dbg_clear_monitor_buf(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_fw_dbg_params params = {0};</div><div class='add'>+</div><div class='add'>+	iwl_fw_dbg_stop_sync(fwrt);</div><div class='add'>+</div><div class='add'>+	if (fw_has_api(&amp;fwrt-&gt;fw-&gt;ucode_capa,</div><div class='add'>+		       IWL_UCODE_TLV_API_INT_DBG_BUF_CLEAR)) {</div><div class='add'>+		struct iwl_host_cmd hcmd = {</div><div class='add'>+			.id = WIDE_ID(DEBUG_GROUP, FW_CLEAR_BUFFER),</div><div class='add'>+		};</div><div class='add'>+		iwl_trans_send_cmd(fwrt-&gt;trans, &amp;hcmd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_dbg_tlv_init_cfg(fwrt);</div><div class='add'>+	iwl_fw_dbg_stop_restart_recording(fwrt, &amp;params, false);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_fw_dbg_clear_monitor_buf);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.h b/drivers/net/wireless/intel/iwlwifi/fw/dbg.h<br/>index 49fa2f5f8c7e..8034c9ecba69 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/dbg.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/dbg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/dbg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/dbg.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2014, 2018-2019 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2014, 2018-2019, 2021-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -46,7 +46,8 @@ int iwl_fw_dbg_collect_desc(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> int iwl_fw_dbg_error_collect(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			     enum iwl_fw_dbg_trigger trig_type);</div><div class='ctx'> int iwl_fw_dbg_ini_collect(struct iwl_fw_runtime *fwrt,</div><div class='del'>-			   struct iwl_fwrt_dump_data *dump_data);</div><div class='add'>+			   struct iwl_fwrt_dump_data *dump_data,</div><div class='add'>+			   bool sync);</div><div class='ctx'> int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		       enum iwl_fw_dbg_trigger trig, const char *str,</div><div class='ctx'> 		       size_t len, struct iwl_fw_dbg_trigger_tlv *trigger);</div><div class='hunk'>@@ -200,7 +201,7 @@ static inline bool iwl_fw_dbg_is_d3_debug_enabled(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='ctx'> 	return fw_has_capa(&amp;fwrt-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 			   IWL_UCODE_TLV_CAPA_D3_DEBUG) &amp;&amp;</div><div class='del'>-		fwrt-&gt;trans-&gt;cfg-&gt;d3_debug_data_length &amp;&amp; fwrt-&gt;ops &amp;&amp;</div><div class='add'>+		fwrt-&gt;trans-&gt;mac_cfg-&gt;base-&gt;d3_debug_data_length &amp;&amp; fwrt-&gt;ops &amp;&amp;</div><div class='ctx'> 		fwrt-&gt;ops-&gt;d3_debug_enable &amp;&amp;</div><div class='ctx'> 		fwrt-&gt;ops-&gt;d3_debug_enable(fwrt-&gt;ops_ctx) &amp;&amp;</div><div class='ctx'> 		iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_D3_DEBUG_DATA);</div><div class='hunk'>@@ -209,7 +210,7 @@ static inline bool iwl_fw_dbg_is_d3_debug_enabled(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> static inline bool iwl_fw_dbg_is_paging_enabled(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='ctx'> 	return iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_PAGING) &amp;&amp;</div><div class='del'>-		!fwrt-&gt;trans-&gt;trans_cfg-&gt;gen2 &amp;&amp;</div><div class='add'>+		!fwrt-&gt;trans-&gt;mac_cfg-&gt;gen2 &amp;&amp;</div><div class='ctx'> 		fwrt-&gt;cur_fw_img &lt; IWL_UCODE_TYPE_MAX &amp;&amp;</div><div class='ctx'> 		fwrt-&gt;fw-&gt;img[fwrt-&gt;cur_fw_img].paging_mem_size &amp;&amp;</div><div class='ctx'> 		fwrt-&gt;fw_paging_db[0].fw_paging_block;</div><div class='hunk'>@@ -226,6 +227,8 @@ static inline void iwl_fw_flush_dumps(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> 		flush_delayed_work(&amp;fwrt-&gt;dump.wks[i].wk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int iwl_fw_send_timestamp_marker_cmd(struct iwl_fw_runtime *fwrt);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> static inline void iwl_fw_cancel_timestamp(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='hunk'>@@ -300,11 +303,9 @@ static inline void iwl_fw_error_collect(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> 		tp_id = IWL_FW_INI_TIME_POINT_FW_ASSERT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	iwl_dbg_tlv_time_point(fwrt, tp_id, NULL);</div><div class='add'>+	iwl_dbg_tlv_time_point_sync(fwrt, tp_id, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_fw_error_print_fseq_regs(struct iwl_fw_runtime *fwrt);</div><div class='del'>-</div><div class='ctx'> static inline void iwl_fwrt_update_fw_versions(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 					       struct iwl_lmac_alive *lmac,</div><div class='ctx'> 					       struct iwl_umac_alive *umac)</div><div class='hunk'>@@ -321,4 +322,23 @@ static inline void iwl_fwrt_update_fw_versions(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		fwrt-&gt;dump.fw_ver.umac_minor = le32_to_cpu(umac-&gt;umac_minor);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void iwl_fwrt_dump_error_logs(struct iwl_fw_runtime *fwrt);</div><div class='add'>+bool iwl_fwrt_read_err_table(struct iwl_trans *trans, u32 base, u32 *err_id);</div><div class='add'>+void iwl_fw_disable_dbg_asserts(struct iwl_fw_runtime *fwrt);</div><div class='add'>+void iwl_fw_dbg_clear_monitor_buf(struct iwl_fw_runtime *fwrt);</div><div class='add'>+</div><div class='add'>+#define IWL_FW_CHECK_FAILED(_obj, ...)					\</div><div class='add'>+	IWL_ERR_LIMIT(_obj, __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define IWL_FW_CHECK(_obj, _cond, _fmt, ...)				\</div><div class='add'>+	({								\</div><div class='add'>+		bool __cond = (_cond);					\</div><div class='add'>+									\</div><div class='add'>+		if (unlikely(__cond))					\</div><div class='add'>+			IWL_FW_CHECK_FAILED(_obj, _fmt, ##__VA_ARGS__);	\</div><div class='add'>+									\</div><div class='add'>+		unlikely(__cond);					\</div><div class='add'>+	})</div><div class='add'>+</div><div class='ctx'> #endif  /* __iwl_fw_dbg_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/debugfs.c b/drivers/net/wireless/intel/iwlwifi/fw/debugfs.c<br/>index a152ce306475..3b0e8c43ba4a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/debugfs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/debugfs.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2024 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -123,34 +123,30 @@ static const struct file_operations iwl_dbgfs_##name##_ops = {		\</div><div class='ctx'> #define FWRT_DEBUGFS_ADD_FILE(name, parent, mode) \</div><div class='ctx'> 	FWRT_DEBUGFS_ADD_FILE_ALIAS(#name, name, parent, mode)</div><div class='ctx'> </div><div class='del'>-static int iwl_fw_send_timestamp_marker_cmd(struct iwl_fw_runtime *fwrt)</div><div class='add'>+static ssize_t iwl_dbgfs_fw_dbg_collect_write(struct iwl_fw_runtime *fwrt,</div><div class='add'>+					      char *buf, size_t count)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm_marker marker = {</div><div class='del'>-		.dw_len = sizeof(struct iwl_mvm_marker) / 4,</div><div class='del'>-		.marker_id = MARKER_ID_SYNC_CLOCK,</div><div class='del'>-</div><div class='del'>-		/* the real timestamp is taken from the ftrace clock</div><div class='del'>-		 * this is for finding the match between fw and kernel logs</div><div class='del'>-		 */</div><div class='del'>-		.timestamp = cpu_to_le64(fwrt-&gt;timestamp.seq++),</div><div class='del'>-	};</div><div class='add'>+	if (count == 0)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	struct iwl_host_cmd hcmd = {</div><div class='del'>-		.id = MARKER_CMD,</div><div class='del'>-		.flags = CMD_ASYNC,</div><div class='del'>-		.data[0] = &amp;marker,</div><div class='del'>-		.len[0] = sizeof(marker),</div><div class='del'>-	};</div><div class='add'>+	if (!iwl_trans_fw_running(fwrt-&gt;trans))</div><div class='add'>+		return count;</div><div class='add'>+</div><div class='add'>+	iwl_dbg_tlv_time_point(fwrt, IWL_FW_INI_TIME_POINT_USER_TRIGGER, NULL);</div><div class='ctx'> </div><div class='del'>-	return iwl_trans_send_cmd(fwrt-&gt;trans, &amp;hcmd);</div><div class='add'>+	iwl_fw_dbg_collect(fwrt, FW_DBG_TRIGGER_USER, buf, (count - 1), NULL);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+FWRT_DEBUGFS_WRITE_FILE_OPS(fw_dbg_collect, 16);</div><div class='add'>+</div><div class='ctx'> static int iwl_dbgfs_enabled_severities_write(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 					      char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_dbg_host_event_cfg_cmd event_cfg;</div><div class='ctx'> 	struct iwl_host_cmd hcmd = {</div><div class='del'>-		.id = iwl_cmd_id(HOST_EVENT_CFG, DEBUG_GROUP, 0),</div><div class='add'>+		.id = WIDE_ID(DEBUG_GROUP, HOST_EVENT_CFG),</div><div class='ctx'> 		.flags = CMD_ASYNC,</div><div class='ctx'> 		.data[0] = &amp;event_cfg,</div><div class='ctx'> 		.len[0] = sizeof(event_cfg),</div><div class='hunk'>@@ -163,7 +159,11 @@ static int iwl_dbgfs_enabled_severities_write(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> </div><div class='ctx'> 	event_cfg.enabled_severities = cpu_to_le32(enabled_severities);</div><div class='ctx'> </div><div class='del'>-	ret = iwl_trans_send_cmd(fwrt-&gt;trans, &amp;hcmd);</div><div class='add'>+	if (fwrt-&gt;ops &amp;&amp; fwrt-&gt;ops-&gt;send_hcmd)</div><div class='add'>+		ret = fwrt-&gt;ops-&gt;send_hcmd(fwrt-&gt;ops_ctx, &amp;hcmd);</div><div class='add'>+	else</div><div class='add'>+		ret = -EPERM;</div><div class='add'>+</div><div class='ctx'> 	IWL_INFO(fwrt,</div><div class='ctx'> 		 "sent host event cfg with enabled_severities: %u, ret: %d\n",</div><div class='ctx'> 		 enabled_severities, ret);</div><div class='hunk'>@@ -198,7 +198,7 @@ void iwl_fw_trigger_timestamp(struct iwl_fw_runtime *fwrt, u32 delay)</div><div class='ctx'> </div><div class='ctx'> 	iwl_fw_cancel_timestamp(fwrt);</div><div class='ctx'> </div><div class='del'>-	fwrt-&gt;timestamp.delay = msecs_to_jiffies(delay * 1000);</div><div class='add'>+	fwrt-&gt;timestamp.delay = secs_to_jiffies(delay);</div><div class='ctx'> </div><div class='ctx'> 	schedule_delayed_work(&amp;fwrt-&gt;timestamp.wk,</div><div class='ctx'> 			      round_jiffies_relative(fwrt-&gt;timestamp.delay));</div><div class='hunk'>@@ -248,8 +248,7 @@ static ssize_t iwl_dbgfs_send_hcmd_write(struct iwl_fw_runtime *fwrt, char *buf,</div><div class='ctx'> 		.data = { NULL, },</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (fwrt-&gt;ops &amp;&amp; fwrt-&gt;ops-&gt;fw_running &amp;&amp;</div><div class='del'>-	    !fwrt-&gt;ops-&gt;fw_running(fwrt-&gt;ops_ctx))</div><div class='add'>+	if (!iwl_trans_fw_running(fwrt-&gt;trans))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (count &lt; header_size + 1 || count &gt; 1024 * 4)</div><div class='hunk'>@@ -301,6 +300,26 @@ static ssize_t iwl_dbgfs_fw_dbg_domain_read(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> </div><div class='ctx'> FWRT_DEBUGFS_READ_FILE_OPS(fw_dbg_domain, 20);</div><div class='ctx'> </div><div class='add'>+static ssize_t iwl_dbgfs_fw_ver_read(struct iwl_fw_runtime *fwrt,</div><div class='add'>+				     size_t size, char *buf)</div><div class='add'>+{</div><div class='add'>+	char *pos = buf;</div><div class='add'>+	char *endpos = buf + size;</div><div class='add'>+</div><div class='add'>+	pos += scnprintf(pos, endpos - pos, "FW id: %s\n",</div><div class='add'>+			 fwrt-&gt;fw-&gt;fw_version);</div><div class='add'>+	pos += scnprintf(pos, endpos - pos, "FW: %s\n",</div><div class='add'>+			 fwrt-&gt;fw-&gt;human_readable);</div><div class='add'>+	pos += scnprintf(pos, endpos - pos, "Device: %s\n",</div><div class='add'>+			 fwrt-&gt;trans-&gt;info.name);</div><div class='add'>+	pos += scnprintf(pos, endpos - pos, "Bus: %s\n",</div><div class='add'>+			 fwrt-&gt;dev-&gt;bus-&gt;name);</div><div class='add'>+</div><div class='add'>+	return pos - buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FWRT_DEBUGFS_READ_FILE_OPS(fw_ver, 1024);</div><div class='add'>+</div><div class='ctx'> struct iwl_dbgfs_fw_info_priv {</div><div class='ctx'> 	struct iwl_fw_runtime *fwrt;</div><div class='ctx'> };</div><div class='hunk'>@@ -317,8 +336,10 @@ static void *iwl_dbgfs_fw_info_seq_next(struct seq_file *seq,</div><div class='ctx'> 	const struct iwl_fw *fw = priv-&gt;fwrt-&gt;fw;</div><div class='ctx'> </div><div class='ctx'> 	*pos = ++state-&gt;pos;</div><div class='del'>-	if (*pos &gt;= fw-&gt;ucode_capa.n_cmd_versions)</div><div class='add'>+	if (*pos &gt;= fw-&gt;ucode_capa.n_cmd_versions) {</div><div class='add'>+		kfree(state);</div><div class='ctx'> 		return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return state;</div><div class='ctx'> }</div><div class='hunk'>@@ -352,13 +373,34 @@ static int iwl_dbgfs_fw_info_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	const struct iwl_fw *fw = priv-&gt;fwrt-&gt;fw;</div><div class='ctx'> 	const struct iwl_fw_cmd_version *ver;</div><div class='ctx'> 	u32 cmd_id;</div><div class='del'>-</div><div class='del'>-	if (!state-&gt;pos)</div><div class='add'>+	int has_capa;</div><div class='add'>+</div><div class='add'>+	if (!state-&gt;pos) {</div><div class='add'>+		seq_puts(seq, "fw_capa:\n");</div><div class='add'>+		has_capa = fw_has_capa(&amp;fw-&gt;ucode_capa,</div><div class='add'>+				       IWL_UCODE_TLV_CAPA_PPAG_CHINA_BIOS_SUPPORT) ? 1 : 0;</div><div class='add'>+		seq_printf(seq,</div><div class='add'>+			   "    %d: %d\n",</div><div class='add'>+			   IWL_UCODE_TLV_CAPA_PPAG_CHINA_BIOS_SUPPORT,</div><div class='add'>+			   has_capa);</div><div class='add'>+		has_capa = fw_has_capa(&amp;fw-&gt;ucode_capa,</div><div class='add'>+				       IWL_UCODE_TLV_CAPA_CHINA_22_REG_SUPPORT) ? 1 : 0;</div><div class='add'>+		seq_printf(seq,</div><div class='add'>+			   "    %d: %d\n",</div><div class='add'>+			   IWL_UCODE_TLV_CAPA_CHINA_22_REG_SUPPORT,</div><div class='add'>+			   has_capa);</div><div class='add'>+		has_capa = fw_has_capa(&amp;fw-&gt;ucode_capa,</div><div class='add'>+				       IWL_UCODE_TLV_CAPA_FW_ACCEPTS_RAW_DSM_TABLE) ? 1 : 0;</div><div class='add'>+		seq_printf(seq,</div><div class='add'>+			   "    %d: %d\n",</div><div class='add'>+			   IWL_UCODE_TLV_CAPA_FW_ACCEPTS_RAW_DSM_TABLE,</div><div class='add'>+			   has_capa);</div><div class='ctx'> 		seq_puts(seq, "fw_api_ver:\n");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ver = &amp;fw-&gt;ucode_capa.cmd_versions[state-&gt;pos];</div><div class='ctx'> </div><div class='del'>-	cmd_id = iwl_cmd_id(ver-&gt;cmd, ver-&gt;group, 0);</div><div class='add'>+	cmd_id = WIDE_ID(ver-&gt;group, ver-&gt;cmd);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq, "  0x%04x:\n", cmd_id);</div><div class='ctx'> 	seq_printf(seq, "    name: %s\n",</div><div class='hunk'>@@ -405,5 +447,7 @@ void iwl_fwrt_dbgfs_register(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	FWRT_DEBUGFS_ADD_FILE(fw_info, dbgfs_dir, 0200);</div><div class='ctx'> 	FWRT_DEBUGFS_ADD_FILE(send_hcmd, dbgfs_dir, 0200);</div><div class='ctx'> 	FWRT_DEBUGFS_ADD_FILE(enabled_severities, dbgfs_dir, 0200);</div><div class='add'>+	FWRT_DEBUGFS_ADD_FILE(fw_dbg_collect, dbgfs_dir, 0200);</div><div class='ctx'> 	FWRT_DEBUGFS_ADD_FILE(fw_dbg_domain, dbgfs_dir, 0400);</div><div class='add'>+	FWRT_DEBUGFS_ADD_FILE(fw_ver, dbgfs_dir, 0400);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dhc-utils.h b/drivers/net/wireless/intel/iwlwifi/fw/dhc-utils.h<br/>new file mode 100644<br/>index 000000000000..983acee5cd7d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/dhc-utils.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/dhc-utils.h</a></div><div class='hunk'>@@ -0,0 +1,75 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2021, 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_fw_dhc_utils_h__</div><div class='add'>+#define __iwl_fw_dhc_utils_h__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include "fw/img.h"</div><div class='add'>+#include "api/commands.h"</div><div class='add'>+#include "api/dhc.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_dhc_resp_status - return status of DHC response</div><div class='add'>+ * @fw: firwmware image information</div><div class='add'>+ * @pkt: response packet, must not be %NULL</div><div class='add'>+ *</div><div class='add'>+ * Returns: the status value of the DHC command or (u32)-1 if the</div><div class='add'>+ *	    response was too short.</div><div class='add'>+ */</div><div class='add'>+static inline u32 iwl_dhc_resp_status(const struct iwl_fw *fw,</div><div class='add'>+				      struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	if (iwl_fw_lookup_notif_ver(fw, IWL_ALWAYS_LONG_GROUP,</div><div class='add'>+				    DEBUG_HOST_COMMAND, 1) &gt;= 2) {</div><div class='add'>+		struct iwl_dhc_cmd_resp *resp = (void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (iwl_rx_packet_payload_len(pkt) &lt; sizeof(*resp))</div><div class='add'>+			return (u32)-1;</div><div class='add'>+</div><div class='add'>+		return le32_to_cpu(resp-&gt;status);</div><div class='add'>+	} else {</div><div class='add'>+		struct iwl_dhc_cmd_resp_v1 *resp = (void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (iwl_rx_packet_payload_len(pkt) &lt; sizeof(*resp))</div><div class='add'>+			return (u32)-1;</div><div class='add'>+</div><div class='add'>+		return le32_to_cpu(resp-&gt;status);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_dhc_resp_data - return data pointer of DHC response</div><div class='add'>+ * @fw: firwmware image information</div><div class='add'>+ * @pkt: response packet, must not be %NULL</div><div class='add'>+ * @len: where to store the length</div><div class='add'>+ *</div><div class='add'>+ * Returns: The data pointer, or an ERR_PTR() if the data was</div><div class='add'>+ *	    not valid (too short).</div><div class='add'>+ */</div><div class='add'>+static inline void *iwl_dhc_resp_data(const struct iwl_fw *fw,</div><div class='add'>+				      struct iwl_rx_packet *pkt,</div><div class='add'>+				      unsigned int *len)</div><div class='add'>+{</div><div class='add'>+	if (iwl_fw_lookup_notif_ver(fw, IWL_ALWAYS_LONG_GROUP,</div><div class='add'>+				    DEBUG_HOST_COMMAND, 1) &gt;= 2) {</div><div class='add'>+		struct iwl_dhc_cmd_resp *resp = (void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (iwl_rx_packet_payload_len(pkt) &lt; sizeof(*resp))</div><div class='add'>+			return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+		*len = iwl_rx_packet_payload_len(pkt) - sizeof(*resp);</div><div class='add'>+		return (void *)&amp;resp-&gt;data;</div><div class='add'>+	} else {</div><div class='add'>+		struct iwl_dhc_cmd_resp_v1 *resp = (void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (iwl_rx_packet_payload_len(pkt) &lt; sizeof(*resp))</div><div class='add'>+			return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+		*len = iwl_rx_packet_payload_len(pkt) - sizeof(*resp);</div><div class='add'>+		return (void *)&amp;resp-&gt;data;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif  /* __iwl_fw_dhc_utils_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dump.c b/drivers/net/wireless/intel/iwlwifi/fw/dump.c<br/>new file mode 100644<br/>index 000000000000..ddd714cff2f4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/dump.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/dump.c</a></div><div class='hunk'>@@ -0,0 +1,508 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation</div><div class='add'>+ * Copyright (C) 2013-2014 Intel Mobile Communications GmbH</div><div class='add'>+ * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/devcoredump.h&gt;</div><div class='add'>+#include "iwl-drv.h"</div><div class='add'>+#include "runtime.h"</div><div class='add'>+#include "dbg.h"</div><div class='add'>+#include "debugfs.h"</div><div class='add'>+#include "iwl-io.h"</div><div class='add'>+#include "iwl-prph.h"</div><div class='add'>+#include "iwl-csr.h"</div><div class='add'>+#include "pnvm.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Note: This structure is read from the device with IO accesses,</div><div class='add'>+ * and the reading already does the endian conversion. As it is</div><div class='add'>+ * read with u32-sized accesses, any members with a different size</div><div class='add'>+ * need to be ordered correctly though!</div><div class='add'>+ */</div><div class='add'>+struct iwl_error_event_table {</div><div class='add'>+	u32 valid;		/* (nonzero) valid, (0) log is empty */</div><div class='add'>+	u32 error_id;		/* type of error */</div><div class='add'>+	u32 trm_hw_status0;	/* TRM HW status */</div><div class='add'>+	u32 trm_hw_status1;	/* TRM HW status */</div><div class='add'>+	u32 blink2;		/* branch link */</div><div class='add'>+	u32 ilink1;		/* interrupt link */</div><div class='add'>+	u32 ilink2;		/* interrupt link */</div><div class='add'>+	u32 data1;		/* error-specific data */</div><div class='add'>+	u32 data2;		/* error-specific data */</div><div class='add'>+	u32 data3;		/* error-specific data */</div><div class='add'>+	u32 bcon_time;		/* beacon timer */</div><div class='add'>+	u32 tsf_low;		/* network timestamp function timer */</div><div class='add'>+	u32 tsf_hi;		/* network timestamp function timer */</div><div class='add'>+	u32 gp1;		/* GP1 timer register */</div><div class='add'>+	u32 gp2;		/* GP2 timer register */</div><div class='add'>+	u32 fw_rev_type;	/* firmware revision type */</div><div class='add'>+	u32 major;		/* uCode version major */</div><div class='add'>+	u32 minor;		/* uCode version minor */</div><div class='add'>+	u32 hw_ver;		/* HW Silicon version */</div><div class='add'>+	u32 brd_ver;		/* HW board version */</div><div class='add'>+	u32 log_pc;		/* log program counter */</div><div class='add'>+	u32 frame_ptr;		/* frame pointer */</div><div class='add'>+	u32 stack_ptr;		/* stack pointer */</div><div class='add'>+	u32 hcmd;		/* last host command header */</div><div class='add'>+	u32 isr0;		/* isr status register LMPM_NIC_ISR0:</div><div class='add'>+				 * rxtx_flag */</div><div class='add'>+	u32 isr1;		/* isr status register LMPM_NIC_ISR1:</div><div class='add'>+				 * host_flag */</div><div class='add'>+	u32 isr2;		/* isr status register LMPM_NIC_ISR2:</div><div class='add'>+				 * enc_flag */</div><div class='add'>+	u32 isr3;		/* isr status register LMPM_NIC_ISR3:</div><div class='add'>+				 * time_flag */</div><div class='add'>+	u32 isr4;		/* isr status register LMPM_NIC_ISR4:</div><div class='add'>+				 * wico interrupt */</div><div class='add'>+	u32 last_cmd_id;	/* last HCMD id handled by the firmware */</div><div class='add'>+	u32 wait_event;		/* wait event() caller address */</div><div class='add'>+	u32 l2p_control;	/* L2pControlField */</div><div class='add'>+	u32 l2p_duration;	/* L2pDurationField */</div><div class='add'>+	u32 l2p_mhvalid;	/* L2pMhValidBits */</div><div class='add'>+	u32 l2p_addr_match;	/* L2pAddrMatchStat */</div><div class='add'>+	u32 lmpm_pmg_sel;	/* indicate which clocks are turned on</div><div class='add'>+				 * (LMPM_PMG_SEL) */</div><div class='add'>+	u32 u_timestamp;	/* indicate when the date and time of the</div><div class='add'>+				 * compilation */</div><div class='add'>+	u32 flow_handler;	/* FH read/write pointers, RX credit */</div><div class='add'>+} __packed /* LOG_ERROR_TABLE_API_S_VER_3 */;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * UMAC error struct - relevant starting from family 8000 chip.</div><div class='add'>+ * Note: This structure is read from the device with IO accesses,</div><div class='add'>+ * and the reading already does the endian conversion. As it is</div><div class='add'>+ * read with u32-sized accesses, any members with a different size</div><div class='add'>+ * need to be ordered correctly though!</div><div class='add'>+ */</div><div class='add'>+struct iwl_umac_error_event_table {</div><div class='add'>+	u32 valid;		/* (nonzero) valid, (0) log is empty */</div><div class='add'>+	u32 error_id;		/* type of error */</div><div class='add'>+	u32 blink1;		/* branch link */</div><div class='add'>+	u32 blink2;		/* branch link */</div><div class='add'>+	u32 ilink1;		/* interrupt link */</div><div class='add'>+	u32 ilink2;		/* interrupt link */</div><div class='add'>+	u32 data1;		/* error-specific data */</div><div class='add'>+	u32 data2;		/* error-specific data */</div><div class='add'>+	u32 data3;		/* error-specific data */</div><div class='add'>+	u32 umac_major;</div><div class='add'>+	u32 umac_minor;</div><div class='add'>+	u32 frame_pointer;	/* core register 27*/</div><div class='add'>+	u32 stack_pointer;	/* core register 28 */</div><div class='add'>+	u32 cmd_header;		/* latest host cmd sent to UMAC */</div><div class='add'>+	u32 nic_isr_pref;	/* ISR status register */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ERROR_START_OFFSET  (1 * sizeof(u32))</div><div class='add'>+#define ERROR_ELEM_SIZE     (7 * sizeof(u32))</div><div class='add'>+</div><div class='add'>+static void iwl_fwrt_dump_umac_error_log(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans *trans = fwrt-&gt;trans;</div><div class='add'>+	struct iwl_umac_error_event_table table = {};</div><div class='add'>+	u32 base = fwrt-&gt;trans-&gt;dbg.umac_error_event_table;</div><div class='add'>+	char pnvm_name[MAX_PNVM_NAME];</div><div class='add'>+</div><div class='add'>+	if (!base &amp;&amp;</div><div class='add'>+	    !(fwrt-&gt;trans-&gt;dbg.error_event_table_tlv_status &amp;</div><div class='add'>+	      IWL_ERROR_EVENT_TABLE_UMAC))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_trans_read_mem_bytes(trans, base, &amp;table, sizeof(table));</div><div class='add'>+</div><div class='add'>+	if (table.valid)</div><div class='add'>+		fwrt-&gt;dump.umac_err_id = table.error_id;</div><div class='add'>+</div><div class='add'>+	if (ERROR_START_OFFSET &lt;= table.valid * ERROR_ELEM_SIZE) {</div><div class='add'>+		IWL_ERR(trans, "Start IWL Error Log Dump:\n");</div><div class='add'>+		IWL_ERR(trans, "Transport status: 0x%08lX, valid: %d\n",</div><div class='add'>+			fwrt-&gt;trans-&gt;status, table.valid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((table.error_id &amp; ~FW_SYSASSERT_CPU_MASK) ==</div><div class='add'>+	    FW_SYSASSERT_PNVM_MISSING) {</div><div class='add'>+		iwl_pnvm_get_fs_name(trans, pnvm_name, sizeof(pnvm_name));</div><div class='add'>+		IWL_ERR(fwrt, "PNVM data is missing, please install %s\n",</div><div class='add'>+			pnvm_name);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | %s\n", table.error_id,</div><div class='add'>+		iwl_fw_lookup_assert_desc(table.error_id));</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | umac branchlink1\n", table.blink1);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | umac branchlink2\n", table.blink2);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | umac interruptlink1\n", table.ilink1);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | umac interruptlink2\n", table.ilink2);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | umac data1\n", table.data1);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | umac data2\n", table.data2);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | umac data3\n", table.data3);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | umac major\n", table.umac_major);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | umac minor\n", table.umac_minor);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | frame pointer\n", table.frame_pointer);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | stack pointer\n", table.stack_pointer);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | last host cmd\n", table.cmd_header);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | isr status reg\n", table.nic_isr_pref);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_fwrt_dump_lmac_error_log(struct iwl_fw_runtime *fwrt, u8 lmac_num)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans *trans = fwrt-&gt;trans;</div><div class='add'>+	struct iwl_error_event_table table = {};</div><div class='add'>+	u32 val, base = fwrt-&gt;trans-&gt;dbg.lmac_error_event_table[lmac_num];</div><div class='add'>+</div><div class='add'>+	if (fwrt-&gt;cur_fw_img == IWL_UCODE_INIT) {</div><div class='add'>+		if (!base)</div><div class='add'>+			base = fwrt-&gt;fw-&gt;init_errlog_ptr;</div><div class='add'>+	} else {</div><div class='add'>+		if (!base)</div><div class='add'>+			base = fwrt-&gt;fw-&gt;inst_errlog_ptr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!base) {</div><div class='add'>+		IWL_ERR(fwrt,</div><div class='add'>+			"Not valid error log pointer 0x%08X for %s uCode\n",</div><div class='add'>+			base,</div><div class='add'>+			(fwrt-&gt;cur_fw_img == IWL_UCODE_INIT)</div><div class='add'>+			? "Init" : "RT");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check if there is a HW error */</div><div class='add'>+	val = iwl_trans_read_mem32(trans, base);</div><div class='add'>+	if (iwl_trans_is_hw_error_value(val)) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		IWL_ERR(trans, "HW error, resetting before reading\n");</div><div class='add'>+</div><div class='add'>+		/* reset the device */</div><div class='add'>+		err = iwl_trans_sw_reset(trans);</div><div class='add'>+		if (err)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		err = iwl_trans_activate_nic(trans);</div><div class='add'>+		if (err)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_trans_read_mem_bytes(trans, base, &amp;table, sizeof(table));</div><div class='add'>+</div><div class='add'>+	if (table.valid)</div><div class='add'>+		fwrt-&gt;dump.lmac_err_id[lmac_num] = table.error_id;</div><div class='add'>+</div><div class='add'>+	if (ERROR_START_OFFSET &lt;= table.valid * ERROR_ELEM_SIZE) {</div><div class='add'>+		IWL_ERR(trans, "Start IWL Error Log Dump:\n");</div><div class='add'>+		IWL_ERR(trans, "Transport status: 0x%08lX, valid: %d\n",</div><div class='add'>+			fwrt-&gt;trans-&gt;status, table.valid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Do not change this output - scripts rely on it */</div><div class='add'>+</div><div class='add'>+	IWL_ERR(fwrt, "Loaded firmware version: %s\n", fwrt-&gt;fw-&gt;fw_version);</div><div class='add'>+</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | %-28s\n", table.error_id,</div><div class='add'>+		iwl_fw_lookup_assert_desc(table.error_id));</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | trm_hw_status0\n", table.trm_hw_status0);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | trm_hw_status1\n", table.trm_hw_status1);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | branchlink2\n", table.blink2);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | interruptlink1\n", table.ilink1);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | interruptlink2\n", table.ilink2);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | data1\n", table.data1);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | data2\n", table.data2);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | data3\n", table.data3);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | beacon time\n", table.bcon_time);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | tsf low\n", table.tsf_low);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | tsf hi\n", table.tsf_hi);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | time gp1\n", table.gp1);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | time gp2\n", table.gp2);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | uCode revision type\n", table.fw_rev_type);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | uCode version major\n", table.major);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | uCode version minor\n", table.minor);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | hw version\n", table.hw_ver);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | board version\n", table.brd_ver);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | hcmd\n", table.hcmd);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | isr0\n", table.isr0);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | isr1\n", table.isr1);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | isr2\n", table.isr2);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | isr3\n", table.isr3);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | isr4\n", table.isr4);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | last cmd Id\n", table.last_cmd_id);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | wait_event\n", table.wait_event);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | l2p_control\n", table.l2p_control);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | l2p_duration\n", table.l2p_duration);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | l2p_mhvalid\n", table.l2p_mhvalid);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | l2p_addr_match\n", table.l2p_addr_match);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | lmpm_pmg_sel\n", table.lmpm_pmg_sel);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | timestamp\n", table.u_timestamp);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | flow_handler\n", table.flow_handler);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TCM error struct.</div><div class='add'>+ * Note: This structure is read from the device with IO accesses,</div><div class='add'>+ * and the reading already does the endian conversion. As it is</div><div class='add'>+ * read with u32-sized accesses, any members with a different size</div><div class='add'>+ * need to be ordered correctly though!</div><div class='add'>+ */</div><div class='add'>+struct iwl_tcm_error_event_table {</div><div class='add'>+	u32 valid;</div><div class='add'>+	u32 error_id;</div><div class='add'>+	u32 blink2;</div><div class='add'>+	u32 ilink1;</div><div class='add'>+	u32 ilink2;</div><div class='add'>+	u32 data1, data2, data3;</div><div class='add'>+	u32 logpc;</div><div class='add'>+	u32 frame_pointer;</div><div class='add'>+	u32 stack_pointer;</div><div class='add'>+	u32 msgid;</div><div class='add'>+	u32 isr;</div><div class='add'>+	u32 hw_status[5];</div><div class='add'>+	u32 sw_status[1];</div><div class='add'>+	u32 reserved[4];</div><div class='add'>+} __packed; /* TCM_LOG_ERROR_TABLE_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+static void iwl_fwrt_dump_tcm_error_log(struct iwl_fw_runtime *fwrt, int idx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans *trans = fwrt-&gt;trans;</div><div class='add'>+	struct iwl_tcm_error_event_table table = {};</div><div class='add'>+	u32 base = fwrt-&gt;trans-&gt;dbg.tcm_error_event_table[idx];</div><div class='add'>+	int i;</div><div class='add'>+	u32 flag = idx ? IWL_ERROR_EVENT_TABLE_TCM2 :</div><div class='add'>+			 IWL_ERROR_EVENT_TABLE_TCM1;</div><div class='add'>+</div><div class='add'>+	if (!base || !(fwrt-&gt;trans-&gt;dbg.error_event_table_tlv_status &amp; flag))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_trans_read_mem_bytes(trans, base, &amp;table, sizeof(table));</div><div class='add'>+</div><div class='add'>+	IWL_ERR(fwrt, "TCM%d status:\n", idx + 1);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | error ID\n", table.error_id);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | tcm branchlink2\n", table.blink2);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | tcm interruptlink1\n", table.ilink1);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | tcm interruptlink2\n", table.ilink2);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | tcm data1\n", table.data1);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | tcm data2\n", table.data2);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | tcm data3\n", table.data3);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | tcm log PC\n", table.logpc);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | tcm frame pointer\n", table.frame_pointer);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | tcm stack pointer\n", table.stack_pointer);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | tcm msg ID\n", table.msgid);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | tcm ISR status\n", table.isr);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(table.hw_status); i++)</div><div class='add'>+		IWL_ERR(fwrt, "0x%08X | tcm HW status[%d]\n",</div><div class='add'>+			table.hw_status[i], i);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(table.sw_status); i++)</div><div class='add'>+		IWL_ERR(fwrt, "0x%08X | tcm SW status[%d]\n",</div><div class='add'>+			table.sw_status[i], i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * RCM error struct.</div><div class='add'>+ * Note: This structure is read from the device with IO accesses,</div><div class='add'>+ * and the reading already does the endian conversion. As it is</div><div class='add'>+ * read with u32-sized accesses, any members with a different size</div><div class='add'>+ * need to be ordered correctly though!</div><div class='add'>+ */</div><div class='add'>+struct iwl_rcm_error_event_table {</div><div class='add'>+	u32 valid;</div><div class='add'>+	u32 error_id;</div><div class='add'>+	u32 blink2;</div><div class='add'>+	u32 ilink1;</div><div class='add'>+	u32 ilink2;</div><div class='add'>+	u32 data1, data2, data3;</div><div class='add'>+	u32 logpc;</div><div class='add'>+	u32 frame_pointer;</div><div class='add'>+	u32 stack_pointer;</div><div class='add'>+	u32 msgid;</div><div class='add'>+	u32 isr;</div><div class='add'>+	u32 frame_hw_status;</div><div class='add'>+	u32 mbx_lmac_to_rcm_req;</div><div class='add'>+	u32 mbx_rcm_to_lmac_req;</div><div class='add'>+	u32 mh_ctl;</div><div class='add'>+	u32 mh_addr1_lo;</div><div class='add'>+	u32 mh_info;</div><div class='add'>+	u32 mh_err;</div><div class='add'>+	u32 reserved[3];</div><div class='add'>+} __packed; /* RCM_LOG_ERROR_TABLE_API_S_VER_1 */</div><div class='add'>+</div><div class='add'>+static void iwl_fwrt_dump_rcm_error_log(struct iwl_fw_runtime *fwrt, int idx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans *trans = fwrt-&gt;trans;</div><div class='add'>+	struct iwl_rcm_error_event_table table = {};</div><div class='add'>+	u32 base = fwrt-&gt;trans-&gt;dbg.rcm_error_event_table[idx];</div><div class='add'>+	u32 flag = idx ? IWL_ERROR_EVENT_TABLE_RCM2 :</div><div class='add'>+			 IWL_ERROR_EVENT_TABLE_RCM1;</div><div class='add'>+</div><div class='add'>+	if (!base || !(fwrt-&gt;trans-&gt;dbg.error_event_table_tlv_status &amp; flag))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_trans_read_mem_bytes(trans, base, &amp;table, sizeof(table));</div><div class='add'>+</div><div class='add'>+	IWL_ERR(fwrt, "RCM%d status:\n", idx + 1);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | error ID\n", table.error_id);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | rcm branchlink2\n", table.blink2);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | rcm interruptlink1\n", table.ilink1);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | rcm interruptlink2\n", table.ilink2);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | rcm data1\n", table.data1);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | rcm data2\n", table.data2);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | rcm data3\n", table.data3);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | rcm log PC\n", table.logpc);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | rcm frame pointer\n", table.frame_pointer);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | rcm stack pointer\n", table.stack_pointer);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | rcm msg ID\n", table.msgid);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | rcm ISR status\n", table.isr);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | frame HW status\n", table.frame_hw_status);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | LMAC-to-RCM request mbox\n",</div><div class='add'>+		table.mbx_lmac_to_rcm_req);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | RCM-to-LMAC request mbox\n",</div><div class='add'>+		table.mbx_rcm_to_lmac_req);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | MAC header control\n", table.mh_ctl);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | MAC header addr1 low\n", table.mh_addr1_lo);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | MAC header info\n", table.mh_info);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | MAC header error\n", table.mh_err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_fwrt_dump_iml_error_log(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans *trans = fwrt-&gt;trans;</div><div class='add'>+	u32 error, data1;</div><div class='add'>+</div><div class='add'>+	if (fwrt-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_22000) {</div><div class='add'>+		error = UMAG_SB_CPU_2_STATUS;</div><div class='add'>+		data1 = UMAG_SB_CPU_1_STATUS;</div><div class='add'>+	} else if (fwrt-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;=</div><div class='add'>+		   IWL_DEVICE_FAMILY_8000) {</div><div class='add'>+		error = SB_CPU_2_STATUS;</div><div class='add'>+		data1 = SB_CPU_1_STATUS;</div><div class='add'>+	} else {</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	error = iwl_read_umac_prph(trans, error);</div><div class='add'>+</div><div class='add'>+	IWL_ERR(trans, "IML/ROM dump:\n");</div><div class='add'>+</div><div class='add'>+	if (error &amp; 0xFFFF0000)</div><div class='add'>+		IWL_ERR(trans, "0x%04X | IML/ROM SYSASSERT\n", error &gt;&gt; 16);</div><div class='add'>+</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | IML/ROM error/state\n", error);</div><div class='add'>+	IWL_ERR(fwrt, "0x%08X | IML/ROM data1\n",</div><div class='add'>+		iwl_read_umac_prph(trans, data1));</div><div class='add'>+</div><div class='add'>+	if (fwrt-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_22000)</div><div class='add'>+		IWL_ERR(fwrt, "0x%08X | IML/ROM WFPM_AUTH_KEY_0\n",</div><div class='add'>+			iwl_read_umac_prph(trans, SB_MODIFY_CFG_FLAG));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define FSEQ_REG(x) { .addr = (x), .str = #x, }</div><div class='add'>+</div><div class='add'>+static void iwl_fwrt_dump_fseq_regs(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans *trans = fwrt-&gt;trans;</div><div class='add'>+	int i;</div><div class='add'>+	struct {</div><div class='add'>+		u32 addr;</div><div class='add'>+		const char *str;</div><div class='add'>+	} fseq_regs[] = {</div><div class='add'>+		FSEQ_REG(FSEQ_ERROR_CODE),</div><div class='add'>+		FSEQ_REG(FSEQ_TOP_INIT_VERSION),</div><div class='add'>+		FSEQ_REG(FSEQ_CNVIO_INIT_VERSION),</div><div class='add'>+		FSEQ_REG(FSEQ_OTP_VERSION),</div><div class='add'>+		FSEQ_REG(FSEQ_TOP_CONTENT_VERSION),</div><div class='add'>+		FSEQ_REG(FSEQ_ALIVE_TOKEN),</div><div class='add'>+		FSEQ_REG(FSEQ_CNVI_ID),</div><div class='add'>+		FSEQ_REG(FSEQ_CNVR_ID),</div><div class='add'>+		FSEQ_REG(CNVI_AUX_MISC_CHIP),</div><div class='add'>+		FSEQ_REG(CNVR_AUX_MISC_CHIP),</div><div class='add'>+		FSEQ_REG(CNVR_SCU_SD_REGS_SD_REG_DIG_DCDC_VTRIM),</div><div class='add'>+		FSEQ_REG(CNVR_SCU_SD_REGS_SD_REG_ACTIVE_VDIG_MIRROR),</div><div class='add'>+		FSEQ_REG(FSEQ_PREV_CNVIO_INIT_VERSION),</div><div class='add'>+		FSEQ_REG(FSEQ_WIFI_FSEQ_VERSION),</div><div class='add'>+		FSEQ_REG(FSEQ_BT_FSEQ_VERSION),</div><div class='add'>+		FSEQ_REG(FSEQ_CLASS_TP_VERSION),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!iwl_trans_grab_nic_access(trans))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	IWL_ERR(fwrt, "Fseq Registers:\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(fseq_regs); i++)</div><div class='add'>+		IWL_ERR(fwrt, "0x%08X | %s\n",</div><div class='add'>+			iwl_read_prph_no_grab(trans, fseq_regs[i].addr),</div><div class='add'>+			fseq_regs[i].str);</div><div class='add'>+</div><div class='add'>+	iwl_trans_release_nic_access(trans);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_fwrt_dump_error_logs(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_pc_data *pc_data;</div><div class='add'>+	u8 count;</div><div class='add'>+</div><div class='add'>+	if (!iwl_trans_device_enabled(fwrt-&gt;trans)) {</div><div class='add'>+		IWL_ERR(fwrt,</div><div class='add'>+			"DEVICE_ENABLED bit is not set. Aborting dump.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_fwrt_dump_lmac_error_log(fwrt, 0);</div><div class='add'>+	if (fwrt-&gt;trans-&gt;dbg.lmac_error_event_table[1])</div><div class='add'>+		iwl_fwrt_dump_lmac_error_log(fwrt, 1);</div><div class='add'>+	iwl_fwrt_dump_umac_error_log(fwrt);</div><div class='add'>+	iwl_fwrt_dump_tcm_error_log(fwrt, 0);</div><div class='add'>+	iwl_fwrt_dump_rcm_error_log(fwrt, 0);</div><div class='add'>+	if (fwrt-&gt;trans-&gt;dbg.tcm_error_event_table[1])</div><div class='add'>+		iwl_fwrt_dump_tcm_error_log(fwrt, 1);</div><div class='add'>+	if (fwrt-&gt;trans-&gt;dbg.rcm_error_event_table[1])</div><div class='add'>+		iwl_fwrt_dump_rcm_error_log(fwrt, 1);</div><div class='add'>+	iwl_fwrt_dump_iml_error_log(fwrt);</div><div class='add'>+	iwl_fwrt_dump_fseq_regs(fwrt);</div><div class='add'>+	if (fwrt-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_22000) {</div><div class='add'>+		pc_data = fwrt-&gt;trans-&gt;dbg.pc_data;</div><div class='add'>+</div><div class='add'>+		if (!iwl_trans_grab_nic_access(fwrt-&gt;trans))</div><div class='add'>+			return;</div><div class='add'>+		for (count = 0; count &lt; fwrt-&gt;trans-&gt;dbg.num_pc;</div><div class='add'>+		     count++, pc_data++)</div><div class='add'>+			IWL_ERR(fwrt, "%s: 0x%x\n",</div><div class='add'>+				pc_data-&gt;pc_name,</div><div class='add'>+				iwl_read_prph_no_grab(fwrt-&gt;trans,</div><div class='add'>+						      pc_data-&gt;pc_address));</div><div class='add'>+		iwl_trans_release_nic_access(fwrt-&gt;trans);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fwrt-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ) {</div><div class='add'>+		u32 scratch = iwl_read32(fwrt-&gt;trans, CSR_FUNC_SCRATCH);</div><div class='add'>+</div><div class='add'>+		IWL_ERR(fwrt, "Function Scratch status:\n");</div><div class='add'>+		IWL_ERR(fwrt, "0x%08X | Func Scratch\n", scratch);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_fwrt_dump_error_logs);</div><div class='add'>+</div><div class='add'>+bool iwl_fwrt_read_err_table(struct iwl_trans *trans, u32 base, u32 *err_id)</div><div class='add'>+{</div><div class='add'>+	struct error_table_start {</div><div class='add'>+		/* cf. struct iwl_error_event_table */</div><div class='add'>+		u32 valid;</div><div class='add'>+		__le32 err_id;</div><div class='add'>+	} err_info = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (err_id)</div><div class='add'>+		*err_id = 0;</div><div class='add'>+</div><div class='add'>+	if (!base)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	ret = iwl_trans_read_mem_bytes(trans, base,</div><div class='add'>+				       &amp;err_info, sizeof(err_info));</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (err_info.valid &amp;&amp; err_id)</div><div class='add'>+		*err_id = le32_to_cpu(err_info.err_id);</div><div class='add'>+</div><div class='add'>+	return !!err_info.valid;</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_fwrt_read_err_table);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h b/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h<br/>index 9fffac903b93..525a82030daa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/error-dump.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/error-dump.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2014-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_fw_error_dump_type - types of data in the dump file</div><div class='ctx'>  * @IWL_FW_ERROR_DUMP_CSR: Control Status Registers - from offset 0</div><div class='del'>- * @IWL_FW_ERROR_DUMP_RXF:</div><div class='add'>+ * @IWL_FW_ERROR_DUMP_RXF: RX FIFO contents</div><div class='ctx'>  * @IWL_FW_ERROR_DUMP_TXCMD: last TX command data, structured as</div><div class='ctx'>  *	&amp;struct iwl_fw_error_dump_txcmd packets</div><div class='ctx'>  * @IWL_FW_ERROR_DUMP_DEV_FW_INFO:  struct %iwl_fw_error_dump_info</div><div class='hunk'>@@ -24,21 +24,24 @@</div><div class='ctx'>  * @IWL_FW_ERROR_DUMP_FW_MONITOR: firmware monitor</div><div class='ctx'>  * @IWL_FW_ERROR_DUMP_PRPH: range of periphery registers - there can be several</div><div class='ctx'>  *	sections like this in a single file.</div><div class='add'>+ * @IWL_FW_ERROR_DUMP_TXF: TX FIFO contents</div><div class='ctx'>  * @IWL_FW_ERROR_DUMP_FH_REGS: range of FH registers</div><div class='ctx'>  * @IWL_FW_ERROR_DUMP_MEM: chunk of memory</div><div class='ctx'>  * @IWL_FW_ERROR_DUMP_ERROR_INFO: description of what triggered this dump.</div><div class='ctx'>  *	Structured as &amp;struct iwl_fw_error_dump_trigger_desc.</div><div class='ctx'>  * @IWL_FW_ERROR_DUMP_RB: the content of an RB structured as</div><div class='ctx'>  *	&amp;struct iwl_fw_error_dump_rb</div><div class='del'>- * @IWL_FW_ERROR_PAGING: UMAC's image memory segments which were</div><div class='add'>+ * @IWL_FW_ERROR_DUMP_PAGING: UMAC's image memory segments which were</div><div class='ctx'>  *	paged to the DRAM.</div><div class='ctx'>  * @IWL_FW_ERROR_DUMP_RADIO_REG: Dump the radio registers.</div><div class='add'>+ * @IWL_FW_ERROR_DUMP_INTERNAL_TXF: internal TX FIFO data</div><div class='ctx'>  * @IWL_FW_ERROR_DUMP_EXTERNAL: used only by external code utilities, and</div><div class='ctx'>  *	for that reason is not in use in any other place in the Linux Wi-Fi</div><div class='ctx'>  *	stack.</div><div class='ctx'>  * @IWL_FW_ERROR_DUMP_MEM_CFG: the addresses and sizes of fifos in the smem,</div><div class='ctx'>  *	which we get from the fw after ALIVE. The content is structured as</div><div class='ctx'>  *	&amp;struct iwl_fw_error_dump_smem_cfg.</div><div class='add'>+ * @IWL_FW_ERROR_DUMP_D3_DEBUG_DATA: D3 debug data</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_fw_error_dump_type {</div><div class='ctx'> 	/* 0 is deprecated */</div><div class='hunk'>@@ -59,8 +62,6 @@ enum iwl_fw_error_dump_type {</div><div class='ctx'> 	IWL_FW_ERROR_DUMP_EXTERNAL = 15, /* Do not move */</div><div class='ctx'> 	IWL_FW_ERROR_DUMP_MEM_CFG = 16,</div><div class='ctx'> 	IWL_FW_ERROR_DUMP_D3_DEBUG_DATA = 17,</div><div class='del'>-</div><div class='del'>-	IWL_FW_ERROR_DUMP_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -76,6 +77,18 @@ struct iwl_fw_error_dump_data {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct iwl_dump_file_name_info - data for dump file name addition</div><div class='add'>+ * @type: region type with reserved bits</div><div class='add'>+ * @len: the length of file name string to be added to dump file</div><div class='add'>+ * @data: the string need to be added to dump file</div><div class='add'>+ */</div><div class='add'>+struct iwl_dump_file_name_info {</div><div class='add'>+	__le32 type;</div><div class='add'>+	__le32 len;</div><div class='add'>+	__u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_fw_error_dump_file - the layout of the header of the file</div><div class='ctx'>  * @barker: must be %IWL_FW_ERROR_DUMP_BARKER</div><div class='ctx'>  * @file_len: the length of all the file starting from %barker</div><div class='hunk'>@@ -84,7 +97,7 @@ struct iwl_fw_error_dump_data {</div><div class='ctx'> struct iwl_fw_error_dump_file {</div><div class='ctx'> 	__le32 barker;</div><div class='ctx'> 	__le32 file_len;</div><div class='del'>-	u8 data[0];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -156,7 +169,7 @@ struct iwl_fw_error_dump_info {</div><div class='ctx'>  * @fw_mon_wr_ptr: the position of the write pointer in the cyclic buffer</div><div class='ctx'>  * @fw_mon_base_ptr: base pointer of the data</div><div class='ctx'>  * @fw_mon_cycle_cnt: number of wraparounds</div><div class='del'>- * @fw_mon_base_high_ptr: used in AX210 devices, the base adderss is 64 bit</div><div class='add'>+ * @fw_mon_base_high_ptr: used in AX210 devices, the base address is 64 bit</div><div class='ctx'>  *	so fw_mon_base_ptr holds LSB 32 bits and fw_mon_base_high_ptr hold</div><div class='ctx'>  *	MSB 32 bits</div><div class='ctx'>  * @reserved: for future use</div><div class='hunk'>@@ -231,8 +244,29 @@ struct iwl_fw_error_dump_mem {</div><div class='ctx'> /* Use bit 31 as dump info type to avoid colliding with region types */</div><div class='ctx'> #define IWL_INI_DUMP_INFO_TYPE BIT(31)</div><div class='ctx'> </div><div class='add'>+/* Use bit 31 and bit 24 as dump name type to avoid colliding with region types */</div><div class='add'>+#define IWL_INI_DUMP_NAME_TYPE (BIT(31) | BIT(24))</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * struct iwl_fw_ini_dump_entry</div><div class='add'>+ * struct iwl_fw_ini_error_dump_data - data for one type</div><div class='add'>+ * @type: &amp;enum iwl_fw_ini_region_type</div><div class='add'>+ * @sub_type: sub type id</div><div class='add'>+ * @sub_type_ver: sub type version</div><div class='add'>+ * @reserved: not in use</div><div class='add'>+ * @len: the length starting from %data</div><div class='add'>+ * @data: the data itself</div><div class='add'>+ */</div><div class='add'>+struct iwl_fw_ini_error_dump_data {</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 sub_type;</div><div class='add'>+	u8 sub_type_ver;</div><div class='add'>+	u8 reserved;</div><div class='add'>+	__le32 len;</div><div class='add'>+	__u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_fw_ini_dump_entry - dump entry descriptor</div><div class='ctx'>  * @list: list of dump entries</div><div class='ctx'>  * @size: size of the data</div><div class='ctx'>  * @data: entry data</div><div class='hunk'>@@ -244,7 +278,7 @@ struct iwl_fw_ini_dump_entry {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_fw_error_dump_file - header of dump file</div><div class='add'>+ * struct iwl_fw_ini_dump_file_hdr - header of dump file</div><div class='ctx'>  * @barker: must be %IWL_FW_INI_ERROR_DUMP_BARKER</div><div class='ctx'>  * @file_len: the length of all the file including the header</div><div class='ctx'>  */</div><div class='hunk'>@@ -271,15 +305,15 @@ struct iwl_fw_ini_fifo_hdr {</div><div class='ctx'>  * @dram_base_addr: base address of dram monitor range</div><div class='ctx'>  * @page_num: page number of memory range</div><div class='ctx'>  * @fifo_hdr: fifo header of memory range</div><div class='del'>- * @fw_pkt: FW packet header of memory range</div><div class='add'>+ * @fw_pkt_hdr: FW packet header of memory range</div><div class='ctx'>  * @data: the actual memory</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_ini_error_dump_range {</div><div class='ctx'> 	__le32 range_data_size;</div><div class='ctx'> 	union {</div><div class='del'>-		__le32 internal_base_addr;</div><div class='del'>-		__le64 dram_base_addr;</div><div class='del'>-		__le32 page_num;</div><div class='add'>+		__le32 internal_base_addr __packed;</div><div class='add'>+		__le64 dram_base_addr __packed;</div><div class='add'>+		__le32 page_num __packed;</div><div class='ctx'> 		struct iwl_fw_ini_fifo_hdr fifo_hdr;</div><div class='ctx'> 		struct iwl_cmd_header fw_pkt_hdr;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -305,11 +339,12 @@ struct iwl_fw_ini_error_dump_header {</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_fw_ini_error_dump - ini region dump</div><div class='ctx'>  * @header: the header of this region</div><div class='del'>- * @ranges: the memory ranges of this region</div><div class='add'>+ * @data: data of memory ranges in this region,</div><div class='add'>+ *	see &amp;struct iwl_fw_ini_error_dump_range</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_ini_error_dump {</div><div class='ctx'> 	struct iwl_fw_ini_error_dump_header header;</div><div class='del'>-	struct iwl_fw_ini_error_dump_range ranges[];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* This bit is used to differentiate between lmac and umac rxf */</div><div class='hunk'>@@ -337,14 +372,8 @@ struct iwl_fw_ini_dump_cfg_name {</div><div class='ctx'> 	u8 cfg_name[IWL_FW_INI_MAX_CFG_NAME];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/* AX210's HW type */</div><div class='del'>-#define IWL_AX210_HW_TYPE 0x42</div><div class='del'>-/* How many bits to roll when adding to the HW type of AX210 HW */</div><div class='del'>-#define IWL_AX210_HW_TYPE_ADDITION_SHIFT 12</div><div class='del'>-/* This prph is used to tell apart HW_TYPE == 0x42 NICs */</div><div class='del'>-#define WFPM_OTP_CFG1_ADDR 0xd03098</div><div class='del'>-#define WFPM_OTP_CFG1_IS_JACKET_BIT BIT(4)</div><div class='del'>-#define WFPM_OTP_CFG1_IS_CDB_BIT BIT(5)</div><div class='add'>+#define IWL_CDB_MASK(val) val &lt;&lt; 13</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* struct iwl_fw_ini_dump_info - ini dump information</div><div class='ctx'>  * @version: dump version</div><div class='hunk'>@@ -399,19 +428,20 @@ struct iwl_fw_ini_dump_info {</div><div class='ctx'>  * struct iwl_fw_ini_err_table_dump - ini error table dump</div><div class='ctx'>  * @header: header of the region</div><div class='ctx'>  * @version: error table version</div><div class='del'>- * @ranges: the memory ranges of this this region</div><div class='add'>+ * @data: data of memory ranges in this region,</div><div class='add'>+ *	see &amp;struct iwl_fw_ini_error_dump_range</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_ini_err_table_dump {</div><div class='ctx'> 	struct iwl_fw_ini_error_dump_header header;</div><div class='ctx'> 	__le32 version;</div><div class='del'>-	struct iwl_fw_ini_error_dump_range ranges[];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_fw_error_dump_rb - content of an Receive Buffer</div><div class='ctx'>  * @index: the index of the Receive Buffer in the Rx queue</div><div class='ctx'>  * @rxq: the RB's Rx queue</div><div class='del'>- * @reserved:</div><div class='add'>+ * @reserved: reserved</div><div class='ctx'>  * @data: the content of the Receive Buffer</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_error_dump_rb {</div><div class='hunk'>@@ -427,14 +457,15 @@ struct iwl_fw_error_dump_rb {</div><div class='ctx'>  * @write_ptr: write pointer position in the buffer</div><div class='ctx'>  * @cycle_cnt: cycles count</div><div class='ctx'>  * @cur_frag: current fragment in use</div><div class='del'>- * @ranges: the memory ranges of this this region</div><div class='add'>+ * @data: data of memory ranges in this region,</div><div class='add'>+ *	see &amp;struct iwl_fw_ini_error_dump_range</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_ini_monitor_dump {</div><div class='ctx'> 	struct iwl_fw_ini_error_dump_header header;</div><div class='ctx'> 	__le32 write_ptr;</div><div class='ctx'> 	__le32 cycle_cnt;</div><div class='ctx'> 	__le32 cur_frag;</div><div class='del'>-	struct iwl_fw_ini_error_dump_range ranges[];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -442,20 +473,21 @@ struct iwl_fw_ini_monitor_dump {</div><div class='ctx'>  * @header: header of the region</div><div class='ctx'>  * @type: type of special memory</div><div class='ctx'>  * @version: struct special memory version</div><div class='del'>- * @ranges: the memory ranges of this this region</div><div class='add'>+ * @data: data of memory ranges in this region,</div><div class='add'>+ *	see &amp;struct iwl_fw_ini_error_dump_range</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_ini_special_device_memory {</div><div class='ctx'> 	struct iwl_fw_ini_error_dump_header header;</div><div class='ctx'> 	__le16 type;</div><div class='ctx'> 	__le16 version;</div><div class='del'>-	struct iwl_fw_ini_error_dump_range ranges[];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_fw_error_dump_paging - content of the UMAC's image page</div><div class='ctx'>  *	block on DRAM</div><div class='ctx'>  * @index: the index of the page block</div><div class='del'>- * @reserved:</div><div class='add'>+ * @reserved: reserved</div><div class='ctx'>  * @data: the content of the page block</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_error_dump_paging {</div><div class='hunk'>@@ -478,6 +510,7 @@ iwl_fw_error_next_data(struct iwl_fw_error_dump_data *data)</div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_fw_dbg_trigger - triggers available</div><div class='ctx'>  *</div><div class='add'>+ * @FW_DBG_TRIGGER_INVALID: invalid trigger value</div><div class='ctx'>  * @FW_DBG_TRIGGER_USER: trigger log collection by user</div><div class='ctx'>  *	This should not be defined as a trigger to the driver, but a value the</div><div class='ctx'>  *	driver should set to indicate that the trigger was initiated by the</div><div class='hunk'>@@ -497,14 +530,15 @@ iwl_fw_error_next_data(struct iwl_fw_error_dump_data *data)</div><div class='ctx'>  * @FW_DBG_TRIGGER_TIME_EVENT: trigger log collection upon time events related</div><div class='ctx'>  *	events.</div><div class='ctx'>  * @FW_DBG_TRIGGER_BA: trigger log collection upon BlockAck related events.</div><div class='del'>- * @FW_DBG_TX_LATENCY: trigger log collection when the tx latency goes above a</div><div class='del'>- *	threshold.</div><div class='del'>- * @FW_DBG_TDLS: trigger log collection upon TDLS related events.</div><div class='add'>+ * @FW_DBG_TRIGGER_TX_LATENCY: trigger log collection when the tx latency</div><div class='add'>+ *	goes above a threshold.</div><div class='add'>+ * @FW_DBG_TRIGGER_TDLS: trigger log collection upon TDLS related events.</div><div class='ctx'>  * @FW_DBG_TRIGGER_TX_STATUS: trigger log collection upon tx status when</div><div class='ctx'>  *  the firmware sends a tx reply.</div><div class='ctx'>  * @FW_DBG_TRIGGER_ALIVE_TIMEOUT: trigger log collection if alive flow timeouts</div><div class='ctx'>  * @FW_DBG_TRIGGER_DRIVER: trigger log collection upon a flow failure</div><div class='ctx'>  *	in the driver.</div><div class='add'>+ * @FW_DBG_TRIGGER_MAX: beyond triggers, number for sizing arrays etc.</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_fw_dbg_trigger {</div><div class='ctx'> 	FW_DBG_TRIGGER_INVALID = 0,</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/file.h b/drivers/net/wireless/intel/iwlwifi/fw/file.h<br/>index f9c5cf538ad1..b9e0b69c6680 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/file.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/file.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/file.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/file.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2008-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2008-2014, 2018-2024 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -20,7 +20,7 @@ struct iwl_ucode_header {</div><div class='ctx'> 			__le32 init_size;	/* bytes of init code */</div><div class='ctx'> 			__le32 init_data_size;	/* bytes of init data */</div><div class='ctx'> 			__le32 boot_size;	/* bytes of bootstrap code */</div><div class='del'>-			u8 data[0];		/* in same order as sizes */</div><div class='add'>+			u8 data[];		/* in same order as sizes */</div><div class='ctx'> 		} v1;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			__le32 build;		/* build number */</div><div class='hunk'>@@ -29,7 +29,7 @@ struct iwl_ucode_header {</div><div class='ctx'> 			__le32 init_size;	/* bytes of init code */</div><div class='ctx'> 			__le32 init_data_size;	/* bytes of init data */</div><div class='ctx'> 			__le32 boot_size;	/* bytes of bootstrap code */</div><div class='del'>-			u8 data[0];		/* in same order as sizes */</div><div class='add'>+			u8 data[];		/* in same order as sizes */</div><div class='ctx'> 		} v2;</div><div class='ctx'> 	} u;</div><div class='ctx'> };</div><div class='hunk'>@@ -52,7 +52,8 @@ enum iwl_ucode_tlv_type {</div><div class='ctx'> 	IWL_UCODE_TLV_INIT_DATA		= 4,</div><div class='ctx'> 	IWL_UCODE_TLV_BOOT		= 5,</div><div class='ctx'> 	IWL_UCODE_TLV_PROBE_MAX_LEN	= 6, /* a u32 value */</div><div class='del'>-	IWL_UCODE_TLV_PAN		= 7,</div><div class='add'>+	IWL_UCODE_TLV_PAN		= 7, /* deprecated -- only used in DVM */</div><div class='add'>+	IWL_UCODE_TLV_MEM_DESC		= 7, /* replaces PAN in non-DVM */</div><div class='ctx'> 	IWL_UCODE_TLV_RUNT_EVTLOG_PTR	= 8,</div><div class='ctx'> 	IWL_UCODE_TLV_RUNT_EVTLOG_SIZE	= 9,</div><div class='ctx'> 	IWL_UCODE_TLV_RUNT_ERRLOG_PTR	= 10,</div><div class='hunk'>@@ -98,13 +99,24 @@ enum iwl_ucode_tlv_type {</div><div class='ctx'> 	IWL_UCODE_TLV_PNVM_VERSION		= 62,</div><div class='ctx'> 	IWL_UCODE_TLV_PNVM_SKU			= 64,</div><div class='ctx'> </div><div class='add'>+	IWL_UCODE_TLV_SEC_TABLE_ADDR		= 66,</div><div class='add'>+	IWL_UCODE_TLV_D3_KEK_KCK_ADDR		= 67,</div><div class='add'>+	IWL_UCODE_TLV_CURRENT_PC		= 68,</div><div class='add'>+	IWL_UCODE_TLV_FSEQ_BIN_VERSION		= 72,</div><div class='add'>+</div><div class='add'>+	/* contains sub-sections like PNVM file does (did) */</div><div class='add'>+	IWL_UCODE_TLV_PNVM_DATA			= 74,</div><div class='add'>+</div><div class='ctx'> 	IWL_UCODE_TLV_FW_NUM_STATIONS		= IWL_UCODE_TLV_CONST_BASE + 0,</div><div class='add'>+	IWL_UCODE_TLV_FW_NUM_LINKS		= IWL_UCODE_TLV_CONST_BASE + 1,</div><div class='add'>+	IWL_UCODE_TLV_FW_NUM_BEACONS		= IWL_UCODE_TLV_CONST_BASE + 2,</div><div class='ctx'> </div><div class='ctx'> 	IWL_UCODE_TLV_TYPE_DEBUG_INFO		= IWL_UCODE_TLV_DEBUG_BASE + 0,</div><div class='ctx'> 	IWL_UCODE_TLV_TYPE_BUFFER_ALLOCATION	= IWL_UCODE_TLV_DEBUG_BASE + 1,</div><div class='ctx'> 	IWL_UCODE_TLV_TYPE_HCMD			= IWL_UCODE_TLV_DEBUG_BASE + 2,</div><div class='ctx'> 	IWL_UCODE_TLV_TYPE_REGIONS		= IWL_UCODE_TLV_DEBUG_BASE + 3,</div><div class='ctx'> 	IWL_UCODE_TLV_TYPE_TRIGGERS		= IWL_UCODE_TLV_DEBUG_BASE + 4,</div><div class='add'>+	IWL_UCODE_TLV_TYPE_CONF_SET		= IWL_UCODE_TLV_DEBUG_BASE + 5,</div><div class='ctx'> 	IWL_UCODE_TLV_DEBUG_MAX = IWL_UCODE_TLV_TYPE_TRIGGERS,</div><div class='ctx'> </div><div class='ctx'> 	/* TLVs 0x1000-0x2000 are for internal driver usage */</div><div class='hunk'>@@ -114,7 +126,7 @@ enum iwl_ucode_tlv_type {</div><div class='ctx'> struct iwl_ucode_tlv {</div><div class='ctx'> 	__le32 type;		/* see above */</div><div class='ctx'> 	__le32 length;		/* not including type/length fields */</div><div class='del'>-	u8 data[0];</div><div class='add'>+	u8 data[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IWL_TLV_UCODE_MAGIC		0x0a4c5749</div><div class='hunk'>@@ -140,7 +152,7 @@ struct iwl_tlv_ucode_header {</div><div class='ctx'> 	 * Note that each TLV is padded to a length</div><div class='ctx'> 	 * that is a multiple of 4 for alignment.</div><div class='ctx'> 	 */</div><div class='del'>-	u8 data[0];</div><div class='add'>+	u8 data[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -176,7 +188,6 @@ struct iwl_ucode_capa {</div><div class='ctx'>  * @IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_LARGE: new NS offload (large version)</div><div class='ctx'>  * @IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT: General support for uAPSD</div><div class='ctx'>  * @IWL_UCODE_TLV_FLAGS_P2P_PS_UAPSD: P2P client supports uAPSD power save</div><div class='del'>- * @IWL_UCODE_TLV_FLAGS_BCAST_FILTERING: uCode supports broadcast filtering.</div><div class='ctx'>  * @IWL_UCODE_TLV_FLAGS_EBS_SUPPORT: this uCode image supports EBS.</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_ucode_tlv_flag {</div><div class='hunk'>@@ -191,7 +202,6 @@ enum iwl_ucode_tlv_flag {</div><div class='ctx'> 	IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT	= BIT(24),</div><div class='ctx'> 	IWL_UCODE_TLV_FLAGS_EBS_SUPPORT		= BIT(25),</div><div class='ctx'> 	IWL_UCODE_TLV_FLAGS_P2P_PS_UAPSD	= BIT(26),</div><div class='del'>-	IWL_UCODE_TLV_FLAGS_BCAST_FILTERING	= BIT(29),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> typedef unsigned int __bitwise iwl_ucode_tlv_api_t;</div><div class='hunk'>@@ -211,7 +221,11 @@ typedef unsigned int __bitwise iwl_ucode_tlv_api_t;</div><div class='ctx'>  *	ADD_MODIFY_STA_KEY_API_S_VER_2.</div><div class='ctx'>  * @IWL_UCODE_TLV_API_STA_TYPE: This ucode supports station type assignement.</div><div class='ctx'>  * @IWL_UCODE_TLV_API_NAN2_VER2: This ucode supports NAN API version 2</div><div class='add'>+ * @IWL_UCODE_TLV_API_ADAPTIVE_DWELL: support for adaptive dwell in scanning</div><div class='add'>+ * @IWL_UCODE_TLV_API_OCE: support for OCE</div><div class='add'>+ * @IWL_UCODE_TLV_API_NEW_BEACON_TEMPLATE: new beacon template</div><div class='ctx'>  * @IWL_UCODE_TLV_API_NEW_RX_STATS: should new RX STATISTICS API be used</div><div class='add'>+ * @IWL_UCODE_TLV_API_WOWLAN_KEY_MATERIAL: WoWLAN key material support</div><div class='ctx'>  * @IWL_UCODE_TLV_API_QUOTA_LOW_LATENCY: Quota command includes a field</div><div class='ctx'>  *	indicating low latency direction.</div><div class='ctx'>  * @IWL_UCODE_TLV_API_DEPRECATE_TTAK: RX status flag TTAK ok (bit 7) is</div><div class='hunk'>@@ -234,10 +248,23 @@ typedef unsigned int __bitwise iwl_ucode_tlv_api_t;</div><div class='ctx'>  *	SCAN_OFFLOAD_PROFILES_QUERY_RSP_S.</div><div class='ctx'>  * @IWL_UCODE_TLV_API_MBSSID_HE: This ucode supports v2 of</div><div class='ctx'>  *	STA_CONTEXT_DOT11AX_API_S</div><div class='add'>+ * @IWL_UCODE_TLV_API_WOWLAN_TCP_SYN_WAKE: WoWLAN TCP-SYN wake support</div><div class='add'>+ * @IWL_UCODE_TLV_API_FTM_RTT_ACCURACY: version 7 of the range response API</div><div class='add'>+ *	is supported by FW, this indicates the RTT confidence value</div><div class='ctx'>  * @IWL_UCODE_TLV_API_SAR_TABLE_VER: This ucode supports different sar</div><div class='ctx'>  *	version tables.</div><div class='ctx'>  * @IWL_UCODE_TLV_API_REDUCED_SCAN_CONFIG: This ucode supports v3 of</div><div class='del'>- *  SCAN_CONFIG_DB_CMD_API_S.</div><div class='add'>+ *	SCAN_CONFIG_DB_CMD_API_S.</div><div class='add'>+ * @IWL_UCODE_TLV_API_ADWELL_HB_DEF_N_AP: support for setting adaptive dwell</div><div class='add'>+ *	number of APs in the 5 GHz band</div><div class='add'>+ * @IWL_UCODE_TLV_API_SCAN_EXT_CHAN_VER: extended channel config in scan</div><div class='add'>+ * @IWL_UCODE_TLV_API_BAND_IN_RX_DATA: FW reports band number in RX notification</div><div class='add'>+ * @IWL_UCODE_TLV_API_NO_HOST_DISABLE_TX: Firmware offloaded the station disable tx</div><div class='add'>+ *	logic.</div><div class='add'>+ * @IWL_UCODE_TLV_API_INT_DBG_BUF_CLEAR: Firmware supports clearing the debug</div><div class='add'>+ *	internal buffer</div><div class='add'>+ * @IWL_UCODE_TLV_API_SMART_FIFO_OFFLOAD: Firmware doesn't need the host to</div><div class='add'>+ *	configure the smart fifo</div><div class='ctx'>  *</div><div class='ctx'>  * @NUM_IWL_UCODE_TLV_API: number of bits used</div><div class='ctx'>  */</div><div class='hunk'>@@ -275,12 +302,21 @@ enum iwl_ucode_tlv_api {</div><div class='ctx'> 	IWL_UCODE_TLV_API_ADWELL_HB_DEF_N_AP	= (__force iwl_ucode_tlv_api_t)57,</div><div class='ctx'> 	IWL_UCODE_TLV_API_SCAN_EXT_CHAN_VER	= (__force iwl_ucode_tlv_api_t)58,</div><div class='ctx'> 	IWL_UCODE_TLV_API_BAND_IN_RX_DATA	= (__force iwl_ucode_tlv_api_t)59,</div><div class='del'>-</div><div class='add'>+	/* API Set 2 */</div><div class='add'>+	IWL_UCODE_TLV_API_NO_HOST_DISABLE_TX	= (__force iwl_ucode_tlv_api_t)66,</div><div class='add'>+	IWL_UCODE_TLV_API_INT_DBG_BUF_CLEAR     = (__force iwl_ucode_tlv_api_t)67,</div><div class='add'>+	IWL_UCODE_TLV_API_SMART_FIFO_OFFLOAD    = (__force iwl_ucode_tlv_api_t)68,</div><div class='ctx'> </div><div class='ctx'> 	NUM_IWL_UCODE_TLV_API</div><div class='add'>+/*</div><div class='add'>+ * This construction make both sparse (which cannot increment the previous</div><div class='add'>+ * member due to its bitwise type) and kernel-doc (which doesn't understand</div><div class='add'>+ * the ifdef/else properly) work.</div><div class='add'>+ */</div><div class='ctx'> #ifdef __CHECKER__</div><div class='del'>-		/* sparse says it cannot increment the previous enum member */</div><div class='del'>-		= 128</div><div class='add'>+#define __CHECKER_NUM_IWL_UCODE_TLV_API	128</div><div class='add'>+		= (__force iwl_ucode_tlv_api_t)__CHECKER_NUM_IWL_UCODE_TLV_API,</div><div class='add'>+#define NUM_IWL_UCODE_TLV_API __CHECKER_NUM_IWL_UCODE_TLV_API</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -306,7 +342,6 @@ typedef unsigned int __bitwise iwl_ucode_tlv_capa_t;</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_TDLS_CHANNEL_SWITCH: supports TDLS channel switching</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_CNSLDTD_D3_D0_IMG: Consolidated D3-D0 image</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT: supports Hot Spot Command</div><div class='del'>- * @IWL_UCODE_TLV_CAPA_DC2DC_SUPPORT: supports DC2DC Command</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_CSUM_SUPPORT: supports TCP Checksum Offload</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS: support radio and beacon statistics</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_P2P_SCM_UAPSD: supports U-APSD on p2p interface when it</div><div class='hunk'>@@ -318,19 +353,28 @@ typedef unsigned int __bitwise iwl_ucode_tlv_capa_t;</div><div class='ctx'>  *	is supported.</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_BT_COEX_RRC: supports BT Coex RRC</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_GSCAN_SUPPORT: supports gscan (no longer used)</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_FRAGMENTED_PNVM_IMG: supports fragmented PNVM image</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_SOC_LATENCY_SUPPORT: the firmware supports setting</div><div class='ctx'>  *	stabilization latency for SoCs.</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_STA_PM_NOTIF: firmware will send STA PM notification</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_BINDING_CDB_SUPPORT: binding CDB support</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_CDB_SUPPORT: CDB support</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_D0I3_END_FIRST: D0I3 end command comes first</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_TLC_OFFLOAD: firmware implements rate scaling algorithm</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_DYNAMIC_QUOTA: firmware implements quota related</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_COEX_SCHEMA_2: firmware implements Coex Schema 2</div><div class='del'>- * IWL_UCODE_TLV_CAPA_CHANNEL_SWITCH_CMD: firmware supports CSA command</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_CHANNEL_SWITCH_CMD: firmware supports CSA command</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_ULTRA_HB_CHANNELS: firmware supports ultra high band</div><div class='ctx'>  *	(6 GHz).</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_CS_MODIFY: firmware supports modify action CSA command</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_SET_LTR_GEN2: LTR gen2 support</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_TAS_CFG: TAS configuration support</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_SESSION_PROT_CMD: session protection command</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_SET_PPAG: PPAG support</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_EXTENDED_DTS_MEASURE: extended DTS measurement</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_SHORT_PM_TIMEOUTS: supports short PM timeouts</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_BT_MPLUT_SUPPORT: supports bt-coex Multi-priority LUT</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_MULTI_QUEUE_RX_SUPPORT: MQ RX support</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_CSA_AND_TBTT_OFFLOAD: the firmware supports CSA</div><div class='ctx'>  *	countdown offloading. Beacon notifications are not sent to the host.</div><div class='ctx'>  *	The fw also offloads TBTT alignment.</div><div class='hunk'>@@ -352,18 +396,57 @@ typedef unsigned int __bitwise iwl_ucode_tlv_capa_t;</div><div class='ctx'>  *	command size (command version 4) that supports toggling ACK TX</div><div class='ctx'>  *	power reduction.</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_D3_DEBUG: supports debug recording during D3</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_LED_CMD_SUPPORT: LED command support</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_MCC_UPDATE_11AX_SUPPORT: MCC response support 11ax</div><div class='ctx'>  *	capability.</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_CSI_REPORTING: firmware is capable of being configured</div><div class='ctx'>  *	to report the CSI information with (certain) RX frames</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_DBG_SUSPEND_RESUME_CMD_SUPP: suspend/resume command</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_DBG_BUF_ALLOC_CMD_SUPP: support for DBGC</div><div class='add'>+ *	buffer allocation command</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_FTM_CALIBRATED: has FTM calibrated and thus supports both</div><div class='ctx'>  *	initiator and responder</div><div class='del'>- * @IWL_UCODE_TLV_CAPA_MLME_OFFLOAD: supports MLME offload</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_BIOS_OVERRIDE_UNII4_US_CA: supports (de)activating UNII-4</div><div class='add'>+ *	for US/CA/WW from BIOS</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_PSC_CHAN_SUPPORT: supports PSC channels</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_BIGTK_SUPPORT: BIGTK support</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_PROTECTED_TWT: Supports protection of TWT action frames</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_FW_RESET_HANDSHAKE: Supports the firmware handshake in</div><div class='ctx'>  *	reset flow</div><div class='ctx'>  * @IWL_UCODE_TLV_CAPA_PASSIVE_6GHZ_SCAN: Support for passive scan on 6GHz PSC</div><div class='ctx'>  *      channels even when these are not enabled.</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_HIDDEN_6GHZ_SCAN: hidden SSID 6 GHz scan support</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_BROADCAST_TWT: broadcast TWT support</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_COEX_HIGH_PRIO: support for BT-coex high</div><div class='add'>+ *	priority for 802.1X/4-way-HS</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_BAID_ML_SUPPORT: multi-link BAID support</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_SYNCED_TIME: synced time command support</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_TIME_SYNC_BOTH_FTM_TM: time sync support</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_BIGTK_TX_SUPPORT: BIGTK TX support</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_MLD_API_SUPPORT: MLD API support</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_SCAN_DONT_TOGGLE_ANT: fixed antenna scan support</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_PPAG_CHINA_BIOS_SUPPORT: PPAG China BIOS support</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_OFFLOAD_BTM_SUPPORT: BTM protocol offload support</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_STA_EXP_MFP_SUPPORT: STA command MFP support</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_SNIFF_VALIDATE_SUPPORT: sniffer validate bits support</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_CHINA_22_REG_SUPPORT: China 2022 regulator support</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_DUMP_COMPLETE_SUPPORT: Support for indicating dump collection</div><div class='add'>+ *	complete to FW.</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_SPP_AMSDU_SUPPORT: Support SPP (signaling and payload</div><div class='add'>+ *	protected) A-MSDU.</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_DRAM_FRAG_SUPPORT: support for DBGC fragmented</div><div class='add'>+ *	DRAM buffers</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_SECURE_LTF_SUPPORT: Support secure LTF measurement.</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_MONITOR_PASSIVE_CHANS: Support monitor mode on otherwise</div><div class='add'>+ *	passive channels</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_BIOS_OVERRIDE_5G9_FOR_CA: supports (de)activating 5G9</div><div class='add'>+ *	for CA from BIOS.</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_UHB_CANADA_TAS_SUPPORT: supports %TAS_UHB_ALLOWED_CANADA</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_EXT_FSEQ_IMAGE_SUPPORT: external FSEQ image support</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_RESET_DURING_ASSERT: FW reset handshake is needed</div><div class='add'>+ *	during assert handling even if the dump isn't split</div><div class='add'>+ * @IWL_UCODE_TLV_CAPA_FW_ACCEPTS_RAW_DSM_TABLE: Firmware has capability of</div><div class='add'>+ *	handling raw DSM table data.</div><div class='ctx'>  *</div><div class='ctx'>  * @NUM_IWL_UCODE_TLV_CAPA: number of bits used</div><div class='ctx'>  */</div><div class='hunk'>@@ -382,7 +465,6 @@ enum iwl_ucode_tlv_capa {</div><div class='ctx'> 	IWL_UCODE_TLV_CAPA_TDLS_CHANNEL_SWITCH		= (__force iwl_ucode_tlv_capa_t)13,</div><div class='ctx'> 	IWL_UCODE_TLV_CAPA_CNSLDTD_D3_D0_IMG		= (__force iwl_ucode_tlv_capa_t)17,</div><div class='ctx'> 	IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT		= (__force iwl_ucode_tlv_capa_t)18,</div><div class='del'>-	IWL_UCODE_TLV_CAPA_DC2DC_CONFIG_SUPPORT		= (__force iwl_ucode_tlv_capa_t)19,</div><div class='ctx'> 	IWL_UCODE_TLV_CAPA_CSUM_SUPPORT			= (__force iwl_ucode_tlv_capa_t)21,</div><div class='ctx'> 	IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS		= (__force iwl_ucode_tlv_capa_t)22,</div><div class='ctx'> 	IWL_UCODE_TLV_CAPA_P2P_SCM_UAPSD		= (__force iwl_ucode_tlv_capa_t)26,</div><div class='hunk'>@@ -392,6 +474,7 @@ enum iwl_ucode_tlv_capa {</div><div class='ctx'> 	IWL_UCODE_TLV_CAPA_GSCAN_SUPPORT		= (__force iwl_ucode_tlv_capa_t)31,</div><div class='ctx'> </div><div class='ctx'> 	/* set 1 */</div><div class='add'>+	IWL_UCODE_TLV_CAPA_FRAGMENTED_PNVM_IMG		= (__force iwl_ucode_tlv_capa_t)32,</div><div class='ctx'> 	IWL_UCODE_TLV_CAPA_SOC_LATENCY_SUPPORT		= (__force iwl_ucode_tlv_capa_t)37,</div><div class='ctx'> 	IWL_UCODE_TLV_CAPA_STA_PM_NOTIF			= (__force iwl_ucode_tlv_capa_t)38,</div><div class='ctx'> 	IWL_UCODE_TLV_CAPA_BINDING_CDB_SUPPORT		= (__force iwl_ucode_tlv_capa_t)39,</div><div class='hunk'>@@ -411,6 +494,11 @@ enum iwl_ucode_tlv_capa {</div><div class='ctx'> 	IWL_UCODE_TLV_CAPA_PROTECTED_TWT		= (__force iwl_ucode_tlv_capa_t)56,</div><div class='ctx'> 	IWL_UCODE_TLV_CAPA_FW_RESET_HANDSHAKE		= (__force iwl_ucode_tlv_capa_t)57,</div><div class='ctx'> 	IWL_UCODE_TLV_CAPA_PASSIVE_6GHZ_SCAN		= (__force iwl_ucode_tlv_capa_t)58,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_HIDDEN_6GHZ_SCAN		= (__force iwl_ucode_tlv_capa_t)59,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_BROADCAST_TWT		= (__force iwl_ucode_tlv_capa_t)60,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_COEX_HIGH_PRIO		= (__force iwl_ucode_tlv_capa_t)61,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_RFIM_SUPPORT			= (__force iwl_ucode_tlv_capa_t)62,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_BAID_ML_SUPPORT		= (__force iwl_ucode_tlv_capa_t)63,</div><div class='ctx'> </div><div class='ctx'> 	/* set 2 */</div><div class='ctx'> 	IWL_UCODE_TLV_CAPA_EXTENDED_DTS_MEASURE		= (__force iwl_ucode_tlv_capa_t)64,</div><div class='hunk'>@@ -436,20 +524,42 @@ enum iwl_ucode_tlv_capa {</div><div class='ctx'> 	IWL_UCODE_TLV_CAPA_DBG_BUF_ALLOC_CMD_SUPP	= (__force iwl_ucode_tlv_capa_t)93,</div><div class='ctx'> </div><div class='ctx'> 	/* set 3 */</div><div class='del'>-	IWL_UCODE_TLV_CAPA_MLME_OFFLOAD			= (__force iwl_ucode_tlv_capa_t)96,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * @IWL_UCODE_TLV_CAPA_PSC_CHAN_SUPPORT: supports PSC channels</div><div class='del'>-	 */</div><div class='add'>+	IWL_UCODE_TLV_CAPA_BIOS_OVERRIDE_UNII4_US_CA	= (__force iwl_ucode_tlv_capa_t)96,</div><div class='ctx'> 	IWL_UCODE_TLV_CAPA_PSC_CHAN_SUPPORT		= (__force iwl_ucode_tlv_capa_t)98,</div><div class='del'>-</div><div class='ctx'> 	IWL_UCODE_TLV_CAPA_BIGTK_SUPPORT		= (__force iwl_ucode_tlv_capa_t)100,</div><div class='del'>-	IWL_UCODE_TLV_CAPA_RFIM_SUPPORT			= (__force iwl_ucode_tlv_capa_t)102,</div><div class='del'>-</div><div class='add'>+	IWL_UCODE_TLV_CAPA_SPP_AMSDU_SUPPORT		= (__force iwl_ucode_tlv_capa_t)103,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_DRAM_FRAG_SUPPORT		= (__force iwl_ucode_tlv_capa_t)104,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_DUMP_COMPLETE_SUPPORT	= (__force iwl_ucode_tlv_capa_t)105,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_SYNCED_TIME			= (__force iwl_ucode_tlv_capa_t)106,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_TIME_SYNC_BOTH_FTM_TM        = (__force iwl_ucode_tlv_capa_t)108,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_BIGTK_TX_SUPPORT		= (__force iwl_ucode_tlv_capa_t)109,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_MLD_API_SUPPORT		= (__force iwl_ucode_tlv_capa_t)110,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_SCAN_DONT_TOGGLE_ANT         = (__force iwl_ucode_tlv_capa_t)111,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_PPAG_CHINA_BIOS_SUPPORT	= (__force iwl_ucode_tlv_capa_t)112,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_OFFLOAD_BTM_SUPPORT		= (__force iwl_ucode_tlv_capa_t)113,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_STA_EXP_MFP_SUPPORT		= (__force iwl_ucode_tlv_capa_t)114,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_SNIFF_VALIDATE_SUPPORT	= (__force iwl_ucode_tlv_capa_t)116,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_CHINA_22_REG_SUPPORT		= (__force iwl_ucode_tlv_capa_t)117,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_SECURE_LTF_SUPPORT		= (__force iwl_ucode_tlv_capa_t)121,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_MONITOR_PASSIVE_CHANS	= (__force iwl_ucode_tlv_capa_t)122,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_BIOS_OVERRIDE_5G9_FOR_CA	= (__force iwl_ucode_tlv_capa_t)123,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_UHB_CANADA_TAS_SUPPORT	= (__force iwl_ucode_tlv_capa_t)124,</div><div class='add'>+	IWL_UCODE_TLV_CAPA_EXT_FSEQ_IMAGE_SUPPORT	= (__force iwl_ucode_tlv_capa_t)125,</div><div class='add'>+</div><div class='add'>+	/* set 4 */</div><div class='add'>+</div><div class='add'>+	IWL_UCODE_TLV_CAPA_RESET_DURING_ASSERT		= (__force iwl_ucode_tlv_capa_t)(4 * 32 + 0),</div><div class='add'>+	IWL_UCODE_TLV_CAPA_FW_ACCEPTS_RAW_DSM_TABLE 	= (__force iwl_ucode_tlv_capa_t)(4 * 32 + 1),</div><div class='ctx'> 	NUM_IWL_UCODE_TLV_CAPA</div><div class='add'>+/*</div><div class='add'>+ * This construction make both sparse (which cannot increment the previous</div><div class='add'>+ * member due to its bitwise type) and kernel-doc (which doesn't understand</div><div class='add'>+ * the ifdef/else properly) work.</div><div class='add'>+ */</div><div class='ctx'> #ifdef __CHECKER__</div><div class='del'>-		/* sparse says it cannot increment the previous enum member */</div><div class='del'>-		= 128</div><div class='add'>+#define __CHECKER_NUM_IWL_UCODE_TLV_CAPA	128</div><div class='add'>+		= (__force iwl_ucode_tlv_capa_t)__CHECKER_NUM_IWL_UCODE_TLV_CAPA,</div><div class='add'>+#define NUM_IWL_UCODE_TLV_CAPA __CHECKER_NUM_IWL_UCODE_TLV_CAPA</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -505,34 +615,6 @@ enum iwl_fw_phy_cfg {</div><div class='ctx'> 	FW_PHY_CFG_SHARED_CLK = BIT(31),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define IWL_UCODE_MAX_CS		1</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iwl_fw_cipher_scheme - a cipher scheme supported by FW.</div><div class='del'>- * @cipher: a cipher suite selector</div><div class='del'>- * @flags: cipher scheme flags (currently reserved for a future use)</div><div class='del'>- * @hdr_len: a size of MPDU security header</div><div class='del'>- * @pn_len: a size of PN</div><div class='del'>- * @pn_off: an offset of pn from the beginning of the security header</div><div class='del'>- * @key_idx_off: an offset of key index byte in the security header</div><div class='del'>- * @key_idx_mask: a bit mask of key_idx bits</div><div class='del'>- * @key_idx_shift: bit shift needed to get key_idx</div><div class='del'>- * @mic_len: mic length in bytes</div><div class='del'>- * @hw_cipher: a HW cipher index used in host commands</div><div class='del'>- */</div><div class='del'>-struct iwl_fw_cipher_scheme {</div><div class='del'>-	__le32 cipher;</div><div class='del'>-	u8 flags;</div><div class='del'>-	u8 hdr_len;</div><div class='del'>-	u8 pn_len;</div><div class='del'>-	u8 pn_off;</div><div class='del'>-	u8 key_idx_off;</div><div class='del'>-	u8 key_idx_mask;</div><div class='del'>-	u8 key_idx_shift;</div><div class='del'>-	u8 mic_len;</div><div class='del'>-	u8 hw_cipher;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='ctx'> enum iwl_fw_dbg_reg_operator {</div><div class='ctx'> 	CSR_ASSIGN,</div><div class='ctx'> 	CSR_SETBIT,</div><div class='hunk'>@@ -553,6 +635,7 @@ enum iwl_fw_dbg_reg_operator {</div><div class='ctx'>  * struct iwl_fw_dbg_reg_op - an operation on a register</div><div class='ctx'>  *</div><div class='ctx'>  * @op: &amp;enum iwl_fw_dbg_reg_operator</div><div class='add'>+ * @reserved: reserved</div><div class='ctx'>  * @addr: offset of the register</div><div class='ctx'>  * @val: value</div><div class='ctx'>  */</div><div class='hunk'>@@ -599,6 +682,7 @@ struct iwl_fw_dbg_mem_seg_tlv {</div><div class='ctx'>  * @version: version of the TLV - currently 0</div><div class='ctx'>  * @monitor_mode: &amp;enum iwl_fw_dbg_monitor_mode</div><div class='ctx'>  * @size_power: buffer size will be 2^(size_power + 11)</div><div class='add'>+ * @reserved: reserved</div><div class='ctx'>  * @base_reg: addr of the base addr register (PRPH)</div><div class='ctx'>  * @end_reg:  addr of the end addr register (PRPH)</div><div class='ctx'>  * @write_ptr_reg: the addr of the reg of the write pointer</div><div class='hunk'>@@ -620,7 +704,7 @@ struct iwl_fw_dbg_dest_tlv_v1 {</div><div class='ctx'> 	__le32 wrap_count;</div><div class='ctx'> 	u8 base_shift;</div><div class='ctx'> 	u8 end_shift;</div><div class='del'>-	struct iwl_fw_dbg_reg_op reg_ops[0];</div><div class='add'>+	struct iwl_fw_dbg_reg_op reg_ops[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* Mask of the register for defining the LDBG MAC2SMEM buffer SMEM size */</div><div class='hunk'>@@ -640,14 +724,14 @@ struct iwl_fw_dbg_dest_tlv {</div><div class='ctx'> 	__le32 wrap_count;</div><div class='ctx'> 	u8 base_shift;</div><div class='ctx'> 	u8 size_shift;</div><div class='del'>-	struct iwl_fw_dbg_reg_op reg_ops[0];</div><div class='add'>+	struct iwl_fw_dbg_reg_op reg_ops[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct iwl_fw_dbg_conf_hcmd {</div><div class='ctx'> 	u8 id;</div><div class='ctx'> 	u8 reserved;</div><div class='ctx'> 	__le16 len;</div><div class='del'>-	u8 data[0];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -709,6 +793,8 @@ enum iwl_fw_dbg_trigger_vif_type {</div><div class='ctx'>  * @trig_dis_ms: the time, in milliseconds, after an occurrence of this</div><div class='ctx'>  *	trigger in which another occurrence should be ignored.</div><div class='ctx'>  * @flags: &amp;enum iwl_fw_dbg_trigger_flags</div><div class='add'>+ * @reserved: reserved (for alignment)</div><div class='add'>+ * @data: trigger data</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_dbg_trigger_tlv {</div><div class='ctx'> 	__le32 id;</div><div class='hunk'>@@ -722,7 +808,7 @@ struct iwl_fw_dbg_trigger_tlv {</div><div class='ctx'> 	u8 flags;</div><div class='ctx'> 	u8 reserved[5];</div><div class='ctx'> </div><div class='del'>-	u8 data[0];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define FW_DBG_START_FROM_ALIVE	0</div><div class='hunk'>@@ -749,7 +835,7 @@ struct iwl_fw_dbg_trigger_missed_bcon {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_fw_dbg_trigger_cmd - configures trigger for messages from FW.</div><div class='del'>- * cmds: the list of commands to trigger the collection on</div><div class='add'>+ * @cmds: the list of commands to trigger the collection on</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_dbg_trigger_cmd {</div><div class='ctx'> 	struct cmd {</div><div class='hunk'>@@ -759,7 +845,7 @@ struct iwl_fw_dbg_trigger_cmd {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * iwl_fw_dbg_trigger_stats - configures trigger for statistics</div><div class='add'>+ * struct iwl_fw_dbg_trigger_stats - configures trigger for statistics</div><div class='ctx'>  * @stop_offset: the offset of the value to be monitored</div><div class='ctx'>  * @stop_threshold: the threshold above which to collect</div><div class='ctx'>  * @start_offset: the offset of the value to be monitored</div><div class='hunk'>@@ -796,6 +882,8 @@ struct iwl_fw_dbg_trigger_low_rssi {</div><div class='ctx'>  * @start_assoc_denied: number of denied association to start recording</div><div class='ctx'>  * @start_assoc_timeout: number of association timeout to start recording</div><div class='ctx'>  * @start_connection_loss: number of connection loss to start recording</div><div class='add'>+ * @reserved: reserved</div><div class='add'>+ * @reserved2: reserved</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_dbg_trigger_mlme {</div><div class='ctx'> 	u8 stop_auth_denied;</div><div class='hunk'>@@ -829,6 +917,7 @@ struct iwl_fw_dbg_trigger_mlme {</div><div class='ctx'>  * @p2p_device: timeout for the queues of a P2P device in ms</div><div class='ctx'>  * @ibss: timeout for the queues of an IBSS in ms</div><div class='ctx'>  * @tdls: timeout for the queues of a TDLS station in ms</div><div class='add'>+ * @reserved: reserved</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_dbg_trigger_txq_timer {</div><div class='ctx'> 	__le32 command_queue;</div><div class='hunk'>@@ -844,7 +933,7 @@ struct iwl_fw_dbg_trigger_txq_timer {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_fw_dbg_trigger_time_event - configures a time event trigger</div><div class='del'>- * time_Events: a list of tuples &lt;id, action_bitmap&gt;. The driver will issue a</div><div class='add'>+ * @time_events: a list of tuples &lt;id, action_bitmap&gt;. The driver will issue a</div><div class='ctx'>  *	trigger each time a time event notification that relates to time event</div><div class='ctx'>  *	id with one of the actions in the bitmap is received and</div><div class='ctx'>  *	BIT(notif-&gt;status) is set in status_bitmap.</div><div class='hunk'>@@ -860,19 +949,19 @@ struct iwl_fw_dbg_trigger_time_event {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_fw_dbg_trigger_ba - configures BlockAck related trigger</div><div class='del'>- * rx_ba_start: tid bitmap to configure on what tid the trigger should occur</div><div class='add'>+ * @rx_ba_start: tid bitmap to configure on what tid the trigger should occur</div><div class='ctx'>  *	when an Rx BlockAck session is started.</div><div class='del'>- * rx_ba_stop: tid bitmap to configure on what tid the trigger should occur</div><div class='add'>+ * @rx_ba_stop: tid bitmap to configure on what tid the trigger should occur</div><div class='ctx'>  *	when an Rx BlockAck session is stopped.</div><div class='del'>- * tx_ba_start: tid bitmap to configure on what tid the trigger should occur</div><div class='add'>+ * @tx_ba_start: tid bitmap to configure on what tid the trigger should occur</div><div class='ctx'>  *	when a Tx BlockAck session is started.</div><div class='del'>- * tx_ba_stop: tid bitmap to configure on what tid the trigger should occur</div><div class='add'>+ * @tx_ba_stop: tid bitmap to configure on what tid the trigger should occur</div><div class='ctx'>  *	when a Tx BlockAck session is stopped.</div><div class='del'>- * rx_bar: tid bitmap to configure on what tid the trigger should occur</div><div class='add'>+ * @rx_bar: tid bitmap to configure on what tid the trigger should occur</div><div class='ctx'>  *	when a BAR is received (for a Tx BlockAck session).</div><div class='del'>- * tx_bar: tid bitmap to configure on what tid the trigger should occur</div><div class='add'>+ * @tx_bar: tid bitmap to configure on what tid the trigger should occur</div><div class='ctx'>  *	when a BAR is send (for an Rx BlocAck session).</div><div class='del'>- * frame_timeout: tid bitmap to configure on what tid the trigger should occur</div><div class='add'>+ * @frame_timeout: tid bitmap to configure on what tid the trigger should occur</div><div class='ctx'>  *	when a frame times out in the reordering buffer.</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_dbg_trigger_ba {</div><div class='hunk'>@@ -890,6 +979,7 @@ struct iwl_fw_dbg_trigger_ba {</div><div class='ctx'>  * @action_bitmap: the TDLS action to trigger the collection upon</div><div class='ctx'>  * @peer_mode: trigger on specific peer or all</div><div class='ctx'>  * @peer: the TDLS peer to trigger the collection on</div><div class='add'>+ * @reserved: reserved</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_dbg_trigger_tdls {</div><div class='ctx'> 	u8 action_bitmap;</div><div class='hunk'>@@ -902,6 +992,7 @@ struct iwl_fw_dbg_trigger_tdls {</div><div class='ctx'>  * struct iwl_fw_dbg_trigger_tx_status - configures trigger for tx response</div><div class='ctx'>  *  status.</div><div class='ctx'>  * @statuses: the list of statuses to trigger the collection on</div><div class='add'>+ * @reserved: reserved</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_dbg_trigger_tx_status {</div><div class='ctx'> 	struct tx_status {</div><div class='hunk'>@@ -915,6 +1006,7 @@ struct iwl_fw_dbg_trigger_tx_status {</div><div class='ctx'>  * struct iwl_fw_dbg_conf_tlv - a TLV that describes a debug configuration.</div><div class='ctx'>  * @id: conf id</div><div class='ctx'>  * @usniffer: should the uSniffer image be used</div><div class='add'>+ * @reserved: reserved</div><div class='ctx'>  * @num_of_hcmds: how many HCMDs to send are present here</div><div class='ctx'>  * @hcmd: a variable length host command to be sent to apply the configuration.</div><div class='ctx'>  *	If there is more than one HCMD to send, they will appear one after the</div><div class='hunk'>@@ -946,6 +1038,18 @@ struct iwl_fw_cmd_version {</div><div class='ctx'> 	u8 notif_ver;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct iwl_fw_tcm_error_addr {</div><div class='add'>+	__le32 addr;</div><div class='add'>+}; /* FW_TLV_TCM_ERROR_INFO_ADDRS_S */</div><div class='add'>+</div><div class='add'>+struct iwl_fw_dump_exclude {</div><div class='add'>+	__le32 addr, size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_fw_fseq_bin_version {</div><div class='add'>+	__le32 major, minor;</div><div class='add'>+}; /* FW_TLV_FSEQ_BIN_VERSION_S */</div><div class='add'>+</div><div class='ctx'> static inline size_t _iwl_tlv_array_len(const struct iwl_ucode_tlv *tlv,</div><div class='ctx'> 					size_t fixed_size, size_t var_size)</div><div class='ctx'> {</div><div class='hunk'>@@ -961,4 +1065,20 @@ static inline size_t _iwl_tlv_array_len(const struct iwl_ucode_tlv *tlv,</div><div class='ctx'> 	_iwl_tlv_array_len((_tlv_ptr), sizeof(*(_struct_ptr)),		\</div><div class='ctx'> 			   sizeof(_struct_ptr-&gt;_memb[0]))</div><div class='ctx'> </div><div class='add'>+#define iwl_tlv_array_len_with_size(_tlv_ptr, _struct_ptr, _size)	\</div><div class='add'>+	_iwl_tlv_array_len((_tlv_ptr), sizeof(*(_struct_ptr)), _size)</div><div class='add'>+</div><div class='add'>+/* external FSEQ file */</div><div class='add'>+#define IWL_FSEQ_FILE	"intel/fseq-%04x-%04x"</div><div class='add'>+#define IWL_FSEQ_MAGIC	"INTEL-CNV-FSEQ\n\0"</div><div class='add'>+</div><div class='add'>+struct iwl_fseq_file {</div><div class='add'>+	char magic[16];</div><div class='add'>+	char version[16];</div><div class='add'>+	__le32 bt_len;</div><div class='add'>+	__le32 wifi_len;</div><div class='add'>+	u8 reserved[8];</div><div class='add'>+	u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> #endif  /* __iwl_fw_file_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/img.c b/drivers/net/wireless/intel/iwlwifi/fw/img.c<br/>index c2a4e60518bc..c2f4fc83a22c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/img.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/img.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/img.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/img.c</a></div><div class='hunk'>@@ -1,66 +1,18 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * This file is provided under a dual BSD/GPLv2 license.  When using or</div><div class='del'>- * redistributing this file, you may do so under either license.</div><div class='del'>- *</div><div class='del'>- * GPL LICENSE SUMMARY</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2019 - 2020 Intel Corporation</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of version 2 of the GNU General Public License as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * The full GNU General Public License is included in this distribution</div><div class='del'>- * in the file called COPYING.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- * BSD LICENSE</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2019 - 2020 Intel Corporation</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions</div><div class='del'>- * are met:</div><div class='del'>- *</div><div class='del'>- *  * Redistributions of source code must retain the above copyright</div><div class='del'>- *    notice, this list of conditions and the following disclaimer.</div><div class='del'>- *  * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *    notice, this list of conditions and the following disclaimer in</div><div class='del'>- *    the documentation and/or other materials provided with the</div><div class='del'>- *    distribution.</div><div class='del'>- *  * Neither the name Intel Corporation nor the names of its</div><div class='del'>- *    contributors may be used to endorse or promote products derived</div><div class='del'>- *    from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS</div><div class='del'>- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT</div><div class='del'>- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR</div><div class='del'>- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT</div><div class='del'>- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='del'>- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='del'>- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,</div><div class='del'>- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY</div><div class='del'>- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE</div><div class='del'>- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright(c) 2019 - 2021 Intel Corporation</div><div class='add'>+ * Copyright(c) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;fw/api/commands.h&gt;</div><div class='ctx'> #include "img.h"</div><div class='ctx'> </div><div class='del'>-u8 iwl_fw_lookup_cmd_ver(const struct iwl_fw *fw, u8 grp, u8 cmd, u8 def)</div><div class='add'>+u8 iwl_fw_lookup_cmd_ver(const struct iwl_fw *fw, u32 cmd_id, u8 def)</div><div class='ctx'> {</div><div class='ctx'> 	const struct iwl_fw_cmd_version *entry;</div><div class='ctx'> 	unsigned int i;</div><div class='add'>+	/* prior to LONG_GROUP, we never used this CMD version API */</div><div class='add'>+	u8 grp = iwl_cmd_groupid(cmd_id) ?: LONG_GROUP;</div><div class='add'>+	u8 cmd = iwl_cmd_opcode(cmd_id);</div><div class='ctx'> </div><div class='ctx'> 	if (!fw-&gt;ucode_capa.cmd_versions ||</div><div class='ctx'> 	    !fw-&gt;ucode_capa.n_cmd_versions)</div><div class='hunk'>@@ -101,10 +53,9 @@ u8 iwl_fw_lookup_notif_ver(const struct iwl_fw *fw, u8 grp, u8 cmd, u8 def)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iwl_fw_lookup_notif_ver);</div><div class='ctx'> </div><div class='del'>-#define FW_SYSASSERT_CPU_MASK 0xf0000000</div><div class='ctx'> static const struct {</div><div class='ctx'> 	const char *name;</div><div class='del'>-	u8 num;</div><div class='add'>+	u32 num;</div><div class='ctx'> } advanced_lookup[] = {</div><div class='ctx'> 	{ "NMI_INTERRUPT_WDG", 0x34 },</div><div class='ctx'> 	{ "SYSASSERT", 0x35 },</div><div class='hunk'>@@ -125,6 +76,8 @@ static const struct {</div><div class='ctx'> 	{ "NMI_INTERRUPT_ACTION_PT", 0x7C },</div><div class='ctx'> 	{ "NMI_INTERRUPT_UNKNOWN", 0x84 },</div><div class='ctx'> 	{ "NMI_INTERRUPT_INST_ACTION_PT", 0x86 },</div><div class='add'>+	{ "NMI_INTERRUPT_PREG", 0x88 },</div><div class='add'>+	{ "PNVM_MISSING", FW_SYSASSERT_PNVM_MISSING },</div><div class='ctx'> 	{ "ADVANCED_SYSASSERT", 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/img.h b/drivers/net/wireless/intel/iwlwifi/fw/img.h<br/>index 153a3529e77a..045a3e009429 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/img.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/img.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/img.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/img.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2014, 2018-2021 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2014, 2018-2024 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -14,14 +14,13 @@</div><div class='ctx'> #include "error-dump.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum iwl_ucode_type</div><div class='del'>- *</div><div class='del'>- * The type of ucode.</div><div class='add'>+ * enum iwl_ucode_type - type of ucode</div><div class='ctx'>  *</div><div class='ctx'>  * @IWL_UCODE_REGULAR: Normal runtime ucode</div><div class='ctx'>  * @IWL_UCODE_INIT: Initial ucode</div><div class='ctx'>  * @IWL_UCODE_WOWLAN: Wake on Wireless enabled ucode</div><div class='ctx'>  * @IWL_UCODE_REGULAR_USNIFFER: Normal runtime ucode when using usniffer image</div><div class='add'>+ * @IWL_UCODE_TYPE_MAX: (internal value)</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_ucode_type {</div><div class='ctx'> 	IWL_UCODE_REGULAR,</div><div class='hunk'>@@ -51,8 +50,10 @@ struct iwl_ucode_capabilities {</div><div class='ctx'> 	u32 error_log_addr;</div><div class='ctx'> 	u32 error_log_size;</div><div class='ctx'> 	u32 num_stations;</div><div class='del'>-	unsigned long _api[BITS_TO_LONGS(NUM_IWL_UCODE_TLV_API)];</div><div class='del'>-	unsigned long _capa[BITS_TO_LONGS(NUM_IWL_UCODE_TLV_CAPA)];</div><div class='add'>+	u32 num_links;</div><div class='add'>+	u32 num_beacons;</div><div class='add'>+	DECLARE_BITMAP(_api, NUM_IWL_UCODE_TLV_API);</div><div class='add'>+	DECLARE_BITMAP(_capa, NUM_IWL_UCODE_TLV_CAPA);</div><div class='ctx'> </div><div class='ctx'> 	const struct iwl_fw_cmd_version *cmd_versions;</div><div class='ctx'> 	u32 n_cmd_versions;</div><div class='hunk'>@@ -120,28 +121,20 @@ struct fw_img {</div><div class='ctx'> #define FW_ADDR_CACHE_CONTROL 0xC0000000UL</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_fw_paging</div><div class='add'>+ * struct iwl_fw_paging - FW paging descriptor</div><div class='ctx'>  * @fw_paging_phys: page phy pointer</div><div class='ctx'>  * @fw_paging_block: pointer to the allocated block</div><div class='ctx'>  * @fw_paging_size: page size</div><div class='add'>+ * @fw_offs: offset in the device</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_paging {</div><div class='ctx'> 	dma_addr_t fw_paging_phys;</div><div class='ctx'> 	struct page *fw_paging_block;</div><div class='ctx'> 	u32 fw_paging_size;</div><div class='add'>+	u32 fw_offs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_fw_cscheme_list - a cipher scheme list</div><div class='del'>- * @size: a number of entries</div><div class='del'>- * @cs: cipher scheme entries</div><div class='del'>- */</div><div class='del'>-struct iwl_fw_cscheme_list {</div><div class='del'>-	u8 size;</div><div class='del'>-	struct iwl_fw_cipher_scheme cs[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * enum iwl_fw_type - iwlwifi firmware type</div><div class='ctx'>  * @IWL_FW_DVM: DVM firmware</div><div class='ctx'>  * @IWL_FW_MVM: MVM firmware</div><div class='hunk'>@@ -174,6 +167,10 @@ struct iwl_fw_dbg {</div><div class='ctx'> 	u32 dump_mask;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct iwl_dump_exclude {</div><div class='add'>+	u32 addr, size;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_fw - variables associated with the firmware</div><div class='ctx'>  *</div><div class='hunk'>@@ -186,19 +183,29 @@ struct iwl_fw_dbg {</div><div class='ctx'>  * @enhance_sensitivity_table: device can do enhanced sensitivity.</div><div class='ctx'>  * @init_evtlog_ptr: event log offset for init ucode.</div><div class='ctx'>  * @init_evtlog_size: event log size for init ucode.</div><div class='del'>- * @init_errlog_ptr: error log offfset for init ucode.</div><div class='add'>+ * @init_errlog_ptr: error log offset for init ucode.</div><div class='ctx'>  * @inst_evtlog_ptr: event log offset for runtime ucode.</div><div class='ctx'>  * @inst_evtlog_size: event log size for runtime ucode.</div><div class='del'>- * @inst_errlog_ptr: error log offfset for runtime ucode.</div><div class='add'>+ * @inst_errlog_ptr: error log offset for runtime ucode.</div><div class='ctx'>  * @type: firmware type (&amp;enum iwl_fw_type)</div><div class='del'>- * @cipher_scheme: optional external cipher scheme.</div><div class='ctx'>  * @human_readable: human readable version</div><div class='ctx'>  *	we get the ALIVE from the uCode</div><div class='add'>+ * @phy_integration_ver: PHY integration version string</div><div class='add'>+ * @phy_integration_ver_len: length of @phy_integration_ver</div><div class='add'>+ * @dump_excl: image dump exclusion areas for RT image</div><div class='add'>+ * @dump_excl_wowlan: image dump exclusion areas for WoWLAN image</div><div class='add'>+ * @pnvm_data: PNVM data embedded in the .ucode file, if any</div><div class='add'>+ * @pnvm_size: size of the embedded PNVM data</div><div class='add'>+ * @dbg: debug data, see &amp;struct iwl_fw_dbg</div><div class='add'>+ * @default_calib: default calibration data</div><div class='add'>+ * @phy_config: PHY configuration flags</div><div class='add'>+ * @valid_rx_ant: valid RX antenna bitmap</div><div class='add'>+ * @valid_tx_ant: valid TX antenna bitmap</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw {</div><div class='ctx'> 	u32 ucode_ver;</div><div class='ctx'> </div><div class='del'>-	char fw_version[64];</div><div class='add'>+	char fw_version[128];</div><div class='ctx'> </div><div class='ctx'> 	/* ucode images */</div><div class='ctx'> 	struct fw_img img[IWL_UCODE_TYPE_MAX];</div><div class='hunk'>@@ -218,13 +225,17 @@ struct iwl_fw {</div><div class='ctx'> </div><div class='ctx'> 	enum iwl_fw_type type;</div><div class='ctx'> </div><div class='del'>-	struct iwl_fw_cipher_scheme cs[IWL_UCODE_MAX_CS];</div><div class='ctx'> 	u8 human_readable[FW_VER_HUMAN_READABLE_SZ];</div><div class='ctx'> </div><div class='ctx'> 	struct iwl_fw_dbg dbg;</div><div class='ctx'> </div><div class='ctx'> 	u8 *phy_integration_ver;</div><div class='ctx'> 	u32 phy_integration_ver_len;</div><div class='add'>+</div><div class='add'>+	struct iwl_dump_exclude dump_excl[2], dump_excl_wowlan[2];</div><div class='add'>+</div><div class='add'>+	const void *pnvm_data;</div><div class='add'>+	u32 pnvm_size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline const char *get_fw_dbg_mode_string(int mode)</div><div class='hunk'>@@ -263,8 +274,12 @@ iwl_get_ucode_image(const struct iwl_fw *fw, enum iwl_ucode_type ucode_type)</div><div class='ctx'> 	return &amp;fw-&gt;img[ucode_type];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u8 iwl_fw_lookup_cmd_ver(const struct iwl_fw *fw, u8 grp, u8 cmd, u8 def);</div><div class='add'>+u8 iwl_fw_lookup_cmd_ver(const struct iwl_fw *fw, u32 cmd_id, u8 def);</div><div class='ctx'> </div><div class='ctx'> u8 iwl_fw_lookup_notif_ver(const struct iwl_fw *fw, u8 grp, u8 cmd, u8 def);</div><div class='ctx'> const char *iwl_fw_lookup_assert_desc(u32 num);</div><div class='add'>+</div><div class='add'>+#define FW_SYSASSERT_CPU_MASK		0xf0000000</div><div class='add'>+#define FW_SYSASSERT_PNVM_MISSING	0x0010070d</div><div class='add'>+</div><div class='ctx'> #endif  /* __iwl_fw_img_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/init.c b/drivers/net/wireless/intel/iwlwifi/fw/init.c<br/>index 2ecec00db9da..d1d8058ad29f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/init.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/init.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/init.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/init.c</a></div><div class='hunk'>@@ -1,14 +1,14 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2019-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2019-2021, 2024-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #include "iwl-drv.h"</div><div class='ctx'> #include "runtime.h"</div><div class='ctx'> #include "dbg.h"</div><div class='ctx'> #include "debugfs.h"</div><div class='ctx'> </div><div class='del'>-#include "fw/api/soc.h"</div><div class='add'>+#include "fw/api/system.h"</div><div class='ctx'> #include "fw/api/commands.h"</div><div class='ctx'> #include "fw/api/rx.h"</div><div class='ctx'> #include "fw/api/datapath.h"</div><div class='hunk'>@@ -16,6 +16,8 @@</div><div class='ctx'> void iwl_fw_runtime_init(struct iwl_fw_runtime *fwrt, struct iwl_trans *trans,</div><div class='ctx'> 			const struct iwl_fw *fw,</div><div class='ctx'> 			const struct iwl_fw_runtime_ops *ops, void *ops_ctx,</div><div class='add'>+			const struct iwl_dump_sanitize_ops *sanitize_ops,</div><div class='add'>+			void *sanitize_ctx,</div><div class='ctx'> 			struct dentry *dbgfs_dir)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -26,6 +28,8 @@ void iwl_fw_runtime_init(struct iwl_fw_runtime *fwrt, struct iwl_trans *trans,</div><div class='ctx'> 	fwrt-&gt;dev = trans-&gt;dev;</div><div class='ctx'> 	fwrt-&gt;dump.conf = FW_DBG_INVALID;</div><div class='ctx'> 	fwrt-&gt;ops = ops;</div><div class='add'>+	fwrt-&gt;sanitize_ops = sanitize_ops;</div><div class='add'>+	fwrt-&gt;sanitize_ctx = sanitize_ctx;</div><div class='ctx'> 	fwrt-&gt;ops_ctx = ops_ctx;</div><div class='ctx'> 	for (i = 0; i &lt; IWL_FW_RUNTIME_DUMP_WK_NUM; i++) {</div><div class='ctx'> 		fwrt-&gt;dump.wks[i].idx = i;</div><div class='hunk'>@@ -35,10 +39,12 @@ void iwl_fw_runtime_init(struct iwl_fw_runtime *fwrt, struct iwl_trans *trans,</div><div class='ctx'> }</div><div class='ctx'> IWL_EXPORT_SYMBOL(iwl_fw_runtime_init);</div><div class='ctx'> </div><div class='add'>+/* Assumes the appropriate lock is held by the caller */</div><div class='ctx'> void iwl_fw_runtime_suspend(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='ctx'> 	iwl_fw_suspend_timestamp(fwrt);</div><div class='del'>-	iwl_dbg_tlv_time_point(fwrt, IWL_FW_INI_TIME_POINT_HOST_D3_START, NULL);</div><div class='add'>+	iwl_dbg_tlv_time_point_sync(fwrt, IWL_FW_INI_TIME_POINT_HOST_D3_START,</div><div class='add'>+				    NULL);</div><div class='ctx'> }</div><div class='ctx'> IWL_EXPORT_SYMBOL(iwl_fw_runtime_suspend);</div><div class='ctx'> </div><div class='hunk'>@@ -54,7 +60,7 @@ int iwl_set_soc_latency(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_soc_configuration_cmd cmd = {};</div><div class='ctx'> 	struct iwl_host_cmd hcmd = {</div><div class='del'>-		.id = iwl_cmd_id(SOC_CONFIGURATION_CMD, SYSTEM_GROUP, 0),</div><div class='add'>+		.id = WIDE_ID(SYSTEM_GROUP, SOC_CONFIGURATION_CMD),</div><div class='ctx'> 		.data[0] = &amp;cmd,</div><div class='ctx'> 		.len[0] = sizeof(cmd),</div><div class='ctx'> 	};</div><div class='hunk'>@@ -66,7 +72,7 @@ int iwl_set_soc_latency(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> 	 * values in VER_1, this is backwards-compatible with VER_2,</div><div class='ctx'> 	 * as long as we don't set any other bits.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!fwrt-&gt;trans-&gt;trans_cfg-&gt;integrated)</div><div class='add'>+	if (!fwrt-&gt;trans-&gt;mac_cfg-&gt;integrated)</div><div class='ctx'> 		cmd.flags = cpu_to_le32(SOC_CONFIG_CMD_FLAGS_DISCRETE);</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(IWL_CFG_TRANS_LTR_DELAY_NONE !=</div><div class='hunk'>@@ -78,18 +84,17 @@ int iwl_set_soc_latency(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> 	BUILD_BUG_ON(IWL_CFG_TRANS_LTR_DELAY_1820US !=</div><div class='ctx'> 		     SOC_FLAGS_LTR_APPLY_DELAY_1820);</div><div class='ctx'> </div><div class='del'>-	if (fwrt-&gt;trans-&gt;trans_cfg-&gt;ltr_delay != IWL_CFG_TRANS_LTR_DELAY_NONE &amp;&amp;</div><div class='del'>-	    !WARN_ON(!fwrt-&gt;trans-&gt;trans_cfg-&gt;integrated))</div><div class='del'>-		cmd.flags |= le32_encode_bits(fwrt-&gt;trans-&gt;trans_cfg-&gt;ltr_delay,</div><div class='add'>+	if (fwrt-&gt;trans-&gt;mac_cfg-&gt;ltr_delay != IWL_CFG_TRANS_LTR_DELAY_NONE &amp;&amp;</div><div class='add'>+	    !WARN_ON(!fwrt-&gt;trans-&gt;mac_cfg-&gt;integrated))</div><div class='add'>+		cmd.flags |= le32_encode_bits(fwrt-&gt;trans-&gt;mac_cfg-&gt;ltr_delay,</div><div class='ctx'> 					      SOC_FLAGS_LTR_APPLY_DELAY_MASK);</div><div class='ctx'> </div><div class='del'>-	if (iwl_fw_lookup_cmd_ver(fwrt-&gt;fw, IWL_ALWAYS_LONG_GROUP,</div><div class='del'>-				  SCAN_REQ_UMAC,</div><div class='add'>+	if (iwl_fw_lookup_cmd_ver(fwrt-&gt;fw, SCAN_REQ_UMAC,</div><div class='ctx'> 				  IWL_FW_CMD_VER_UNKNOWN) &gt;= 2 &amp;&amp;</div><div class='del'>-	    fwrt-&gt;trans-&gt;trans_cfg-&gt;low_latency_xtal)</div><div class='add'>+	    fwrt-&gt;trans-&gt;mac_cfg-&gt;low_latency_xtal)</div><div class='ctx'> 		cmd.flags |= cpu_to_le32(SOC_CONFIG_CMD_FLAGS_LOW_LATENCY);</div><div class='ctx'> </div><div class='del'>-	cmd.latency = cpu_to_le32(fwrt-&gt;trans-&gt;trans_cfg-&gt;xtal_latency);</div><div class='add'>+	cmd.latency = cpu_to_le32(fwrt-&gt;trans-&gt;mac_cfg-&gt;xtal_latency);</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_trans_send_cmd(fwrt-&gt;trans, &amp;hcmd);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -111,14 +116,14 @@ int iwl_configure_rxq(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> 	 * The default queue is configured via context info, so if we</div><div class='ctx'> 	 * have a single queue, there's nothing to do here.</div><div class='ctx'> 	 */</div><div class='del'>-	if (fwrt-&gt;trans-&gt;num_rx_queues == 1)</div><div class='add'>+	if (fwrt-&gt;trans-&gt;info.num_rxqs == 1)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (fwrt-&gt;trans-&gt;trans_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_22000)</div><div class='add'>+	if (fwrt-&gt;trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_22000)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* skip the default queue */</div><div class='del'>-	num_queues = fwrt-&gt;trans-&gt;num_rx_queues - 1;</div><div class='add'>+	num_queues = fwrt-&gt;trans-&gt;info.num_rxqs - 1;</div><div class='ctx'> </div><div class='ctx'> 	size = struct_size(cmd, data, num_queues);</div><div class='ctx'> </div><div class='hunk'>@@ -132,7 +137,9 @@ int iwl_configure_rxq(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> 		struct iwl_trans_rxq_dma_data data;</div><div class='ctx'> </div><div class='ctx'> 		cmd-&gt;data[i].q_num = i + 1;</div><div class='del'>-		iwl_trans_get_rxq_dma_data(fwrt-&gt;trans, i + 1, &amp;data);</div><div class='add'>+		ret = iwl_trans_get_rxq_dma_data(fwrt-&gt;trans, i + 1, &amp;data);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='ctx'> </div><div class='ctx'> 		cmd-&gt;data[i].fr_bd_cb = cpu_to_le64(data.fr_bd_cb);</div><div class='ctx'> 		cmd-&gt;data[i].urbd_stts_wrptr =</div><div class='hunk'>@@ -146,6 +153,7 @@ int iwl_configure_rxq(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_trans_send_cmd(fwrt-&gt;trans, &amp;hcmd);</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	kfree(cmd);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/notif-wait.h b/drivers/net/wireless/intel/iwlwifi/fw/notif-wait.h<br/>index 49e8ba11b6a8..0e49794911c1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/notif-wait.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/notif-wait.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/notif-wait.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/notif-wait.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2014 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2014, 2023 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_notif_wait_h__</div><div class='hunk'>@@ -25,6 +25,7 @@ struct iwl_notif_wait_data {</div><div class='ctx'>  *	returns true, the wait is over, if it returns false then</div><div class='ctx'>  *	the waiter stays blocked. If no function is given, any</div><div class='ctx'>  *	of the listed commands will unblock the waiter.</div><div class='add'>+ * @fn_data: pointer to pass to the @fn's data argument</div><div class='ctx'>  * @cmds: command IDs</div><div class='ctx'>  * @n_cmds: number of command IDs</div><div class='ctx'>  * @triggered: waiter should be woken up</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/paging.c b/drivers/net/wireless/intel/iwlwifi/fw/paging.c<br/>index 4a8fe9641a32..826409f6f710 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/paging.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/paging.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/paging.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/paging.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2019 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2019, 2021, 2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -152,6 +152,7 @@ static int iwl_fill_paging_mem(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	memcpy(page_address(fwrt-&gt;fw_paging_db[0].fw_paging_block),</div><div class='ctx'> 	       image-&gt;sec[sec_idx].data,</div><div class='ctx'> 	       image-&gt;sec[sec_idx].len);</div><div class='add'>+	fwrt-&gt;fw_paging_db[0].fw_offs = image-&gt;sec[sec_idx].offset;</div><div class='ctx'> 	dma_sync_single_for_device(fwrt-&gt;trans-&gt;dev,</div><div class='ctx'> 				   fwrt-&gt;fw_paging_db[0].fw_paging_phys,</div><div class='ctx'> 				   fwrt-&gt;fw_paging_db[0].fw_paging_size,</div><div class='hunk'>@@ -196,7 +197,8 @@ static int iwl_fill_paging_mem(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		memcpy(page_address(block-&gt;fw_paging_block),</div><div class='del'>-		       image-&gt;sec[sec_idx].data + offset, len);</div><div class='add'>+		       (const u8 *)image-&gt;sec[sec_idx].data + offset, len);</div><div class='add'>+		block-&gt;fw_offs = image-&gt;sec[sec_idx].offset + offset;</div><div class='ctx'> 		dma_sync_single_for_device(fwrt-&gt;trans-&gt;dev,</div><div class='ctx'> 					   block-&gt;fw_paging_phys,</div><div class='ctx'> 					   block-&gt;fw_paging_size,</div><div class='hunk'>@@ -241,13 +243,13 @@ static int iwl_send_paging_cmd(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		.block_num = cpu_to_le32(fwrt-&gt;num_of_paging_blk),</div><div class='ctx'> 	};</div><div class='ctx'> 	struct iwl_host_cmd hcmd = {</div><div class='del'>-		.id = iwl_cmd_id(FW_PAGING_BLOCK_CMD, IWL_ALWAYS_LONG_GROUP, 0),</div><div class='add'>+		.id = WIDE_ID(IWL_ALWAYS_LONG_GROUP, FW_PAGING_BLOCK_CMD),</div><div class='ctx'> 		.len = { sizeof(paging_cmd), },</div><div class='ctx'> 		.data = { &amp;paging_cmd, },</div><div class='ctx'> 	};</div><div class='ctx'> 	int blk_idx;</div><div class='ctx'> </div><div class='del'>-	/* loop for for all paging blocks + CSS block */</div><div class='add'>+	/* loop for all paging blocks + CSS block */</div><div class='ctx'> 	for (blk_idx = 0; blk_idx &lt; fwrt-&gt;num_of_paging_blk + 1; blk_idx++) {</div><div class='ctx'> 		dma_addr_t addr = fwrt-&gt;fw_paging_db[blk_idx].fw_paging_phys;</div><div class='ctx'> 		__le32 phy_addr;</div><div class='hunk'>@@ -265,7 +267,7 @@ int iwl_init_paging(struct iwl_fw_runtime *fwrt, enum iwl_ucode_type type)</div><div class='ctx'> 	const struct fw_img *fw = &amp;fwrt-&gt;fw-&gt;img[type];</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (fwrt-&gt;trans-&gt;trans_cfg-&gt;gen2)</div><div class='add'>+	if (fwrt-&gt;trans-&gt;mac_cfg-&gt;gen2)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/pnvm.c b/drivers/net/wireless/intel/iwlwifi/fw/pnvm.c<br/>index 40f2109a097f..f297e82d63d2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/pnvm.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/pnvm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/pnvm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/pnvm.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright(c) 2020-2021 Intel Corporation</div><div class='add'>+ * Copyright(c) 2020-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "iwl-drv.h"</div><div class='hunk'>@@ -10,7 +10,10 @@</div><div class='ctx'> #include "fw/api/commands.h"</div><div class='ctx'> #include "fw/api/nvm-reg.h"</div><div class='ctx'> #include "fw/api/alive.h"</div><div class='del'>-#include &lt;linux/efi.h&gt;</div><div class='add'>+#include "fw/uefi.h"</div><div class='add'>+#include "fw/img.h"</div><div class='add'>+</div><div class='add'>+#define IWL_PNVM_REDUCED_CAP_BIT BIT(25)</div><div class='ctx'> </div><div class='ctx'> struct iwl_pnvm_section {</div><div class='ctx'> 	__le32 offset;</div><div class='hunk'>@@ -24,29 +27,30 @@ static bool iwl_pnvm_complete_fn(struct iwl_notif_wait_data *notif_wait,</div><div class='ctx'> 	struct iwl_pnvm_init_complete_ntfy *pnvm_ntf = (void *)pkt-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_FW(trans,</div><div class='del'>-		     "PNVM complete notification received with status %d\n",</div><div class='add'>+		     "PNVM complete notification received with status 0x%0x\n",</div><div class='ctx'> 		     le32_to_cpu(pnvm_ntf-&gt;status));</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_pnvm_handle_section(struct iwl_trans *trans, const u8 *data,</div><div class='del'>-				   size_t len)</div><div class='add'>+				   size_t len,</div><div class='add'>+				   struct iwl_pnvm_image *pnvm_data)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_ucode_tlv *tlv;</div><div class='add'>+	const struct iwl_ucode_tlv *tlv;</div><div class='ctx'> 	u32 sha1 = 0;</div><div class='ctx'> 	u16 mac_type = 0, rf_id = 0;</div><div class='del'>-	u8 *pnvm_data = NULL, *tmp;</div><div class='del'>-	u32 size = 0;</div><div class='del'>-	int ret;</div><div class='add'>+	bool hw_match = false;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_FW(trans, "Handling PNVM section\n");</div><div class='ctx'> </div><div class='add'>+	memset(pnvm_data, 0, sizeof(*pnvm_data));</div><div class='add'>+</div><div class='ctx'> 	while (len &gt;= sizeof(*tlv)) {</div><div class='ctx'> 		u32 tlv_len, tlv_type;</div><div class='ctx'> </div><div class='ctx'> 		len -= sizeof(*tlv);</div><div class='del'>-		tlv = (void *)data;</div><div class='add'>+		tlv = (const void *)data;</div><div class='ctx'> </div><div class='ctx'> 		tlv_len = le32_to_cpu(tlv-&gt;length);</div><div class='ctx'> 		tlv_type = le32_to_cpu(tlv-&gt;type);</div><div class='hunk'>@@ -54,8 +58,7 @@ static int iwl_pnvm_handle_section(struct iwl_trans *trans, const u8 *data,</div><div class='ctx'> 		if (len &lt; tlv_len) {</div><div class='ctx'> 			IWL_ERR(trans, "invalid TLV len: %zd/%u\n",</div><div class='ctx'> 				len, tlv_len);</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto out;</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		data += sizeof(*tlv);</div><div class='hunk'>@@ -69,11 +72,12 @@ static int iwl_pnvm_handle_section(struct iwl_trans *trans, const u8 *data,</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			sha1 = le32_to_cpup((__le32 *)data);</div><div class='add'>+			sha1 = le32_to_cpup((const __le32 *)data);</div><div class='ctx'> </div><div class='ctx'> 			IWL_DEBUG_FW(trans,</div><div class='ctx'> 				     "Got IWL_UCODE_TLV_PNVM_VERSION %0x\n",</div><div class='ctx'> 				     sha1);</div><div class='add'>+			pnvm_data-&gt;version = sha1;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_HW_TYPE:</div><div class='ctx'> 			if (tlv_len &lt; 2 * sizeof(__le16)) {</div><div class='hunk'>@@ -83,25 +87,22 @@ static int iwl_pnvm_handle_section(struct iwl_trans *trans, const u8 *data,</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			mac_type = le16_to_cpup((__le16 *)data);</div><div class='del'>-			rf_id = le16_to_cpup((__le16 *)(data + sizeof(__le16)));</div><div class='add'>+			if (hw_match)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			mac_type = le16_to_cpup((const __le16 *)data);</div><div class='add'>+			rf_id = le16_to_cpup((const __le16 *)(data + sizeof(__le16)));</div><div class='ctx'> </div><div class='ctx'> 			IWL_DEBUG_FW(trans,</div><div class='ctx'> 				     "Got IWL_UCODE_TLV_HW_TYPE mac_type 0x%0x rf_id 0x%0x\n",</div><div class='ctx'> 				     mac_type, rf_id);</div><div class='ctx'> </div><div class='del'>-			if (mac_type != CSR_HW_REV_TYPE(trans-&gt;hw_rev) ||</div><div class='del'>-			    rf_id != CSR_HW_RFID_TYPE(trans-&gt;hw_rf_id)) {</div><div class='del'>-				IWL_DEBUG_FW(trans,</div><div class='del'>-					     "HW mismatch, skipping PNVM section, mac_type 0x%0x, rf_id 0x%0x.\n",</div><div class='del'>-					     CSR_HW_REV_TYPE(trans-&gt;hw_rev), trans-&gt;hw_rf_id);</div><div class='del'>-				ret = -ENOENT;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-</div><div class='add'>+			if (mac_type == CSR_HW_REV_TYPE(trans-&gt;info.hw_rev) &amp;&amp;</div><div class='add'>+			    rf_id == CSR_HW_RFID_TYPE(trans-&gt;info.hw_rf_id))</div><div class='add'>+				hw_match = true;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_SEC_RT: {</div><div class='del'>-			struct iwl_pnvm_section *section = (void *)data;</div><div class='add'>+			const struct iwl_pnvm_section *section = (const void *)data;</div><div class='ctx'> 			u32 data_len = tlv_len - sizeof(*section);</div><div class='ctx'> </div><div class='ctx'> 			IWL_DEBUG_FW(trans,</div><div class='hunk'>@@ -109,31 +110,31 @@ static int iwl_pnvm_handle_section(struct iwl_trans *trans, const u8 *data,</div><div class='ctx'> 				     tlv_len);</div><div class='ctx'> </div><div class='ctx'> 			/* TODO: remove, this is a deprecated separator */</div><div class='del'>-			if (le32_to_cpup((__le32 *)data) == 0xddddeeee) {</div><div class='add'>+			if (le32_to_cpup((const __le32 *)data) == 0xddddeeee) {</div><div class='ctx'> 				IWL_DEBUG_FW(trans, "Ignoring separator.\n");</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			IWL_DEBUG_FW(trans, "Adding data (size %d)\n",</div><div class='del'>-				     data_len);</div><div class='del'>-</div><div class='del'>-			tmp = krealloc(pnvm_data, size + data_len, GFP_KERNEL);</div><div class='del'>-			if (!tmp) {</div><div class='add'>+			if (pnvm_data-&gt;n_chunks == IPC_DRAM_MAP_ENTRY_NUM_MAX) {</div><div class='ctx'> 				IWL_DEBUG_FW(trans,</div><div class='del'>-					     "Couldn't allocate (more) pnvm_data\n");</div><div class='del'>-</div><div class='del'>-				ret = -ENOMEM;</div><div class='del'>-				goto out;</div><div class='add'>+					     "too many payloads to allocate in DRAM.\n");</div><div class='add'>+				return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			pnvm_data = tmp;</div><div class='del'>-</div><div class='del'>-			memcpy(pnvm_data + size, section-&gt;data, data_len);</div><div class='add'>+			IWL_DEBUG_FW(trans, "Adding data (size %d)\n",</div><div class='add'>+				     data_len);</div><div class='ctx'> </div><div class='del'>-			size += data_len;</div><div class='add'>+			pnvm_data-&gt;chunks[pnvm_data-&gt;n_chunks].data = section-&gt;data;</div><div class='add'>+			pnvm_data-&gt;chunks[pnvm_data-&gt;n_chunks].len = data_len;</div><div class='add'>+			pnvm_data-&gt;n_chunks++;</div><div class='ctx'> </div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		case IWL_UCODE_TLV_MEM_DESC:</div><div class='add'>+			if (iwl_uefi_handle_tlv_mem_desc(trans, data, tlv_len,</div><div class='add'>+							 pnvm_data))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_PNVM_SKU:</div><div class='ctx'> 			IWL_DEBUG_FW(trans,</div><div class='ctx'> 				     "New PNVM section started, stop parsing.\n");</div><div class='hunk'>@@ -149,32 +150,37 @@ static int iwl_pnvm_handle_section(struct iwl_trans *trans, const u8 *data,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='del'>-	if (!size) {</div><div class='del'>-		IWL_DEBUG_FW(trans, "Empty PNVM, skipping.\n");</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='add'>+	if (!hw_match) {</div><div class='add'>+		IWL_DEBUG_FW(trans,</div><div class='add'>+			     "HW mismatch, skipping PNVM section (need mac_type 0x%x rf_id 0x%x)\n",</div><div class='add'>+			     CSR_HW_REV_TYPE(trans-&gt;info.hw_rev),</div><div class='add'>+			     CSR_HW_RFID_TYPE(trans-&gt;info.hw_rf_id));</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	IWL_INFO(trans, "loaded PNVM version 0x%0x\n", sha1);</div><div class='add'>+	if (!pnvm_data-&gt;n_chunks) {</div><div class='add'>+		IWL_DEBUG_FW(trans, "Empty PNVM, skipping.\n");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ret = iwl_trans_set_pnvm(trans, pnvm_data, size);</div><div class='del'>-out:</div><div class='del'>-	kfree(pnvm_data);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_pnvm_parse(struct iwl_trans *trans, const u8 *data,</div><div class='del'>-			  size_t len)</div><div class='add'>+			  size_t len,</div><div class='add'>+			  struct iwl_pnvm_image *pnvm_data,</div><div class='add'>+			  __le32 sku_id[3])</div><div class='ctx'> {</div><div class='del'>-	struct iwl_ucode_tlv *tlv;</div><div class='add'>+	const struct iwl_ucode_tlv *tlv;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_FW(trans, "Parsing PNVM file\n");</div><div class='ctx'> </div><div class='ctx'> 	while (len &gt;= sizeof(*tlv)) {</div><div class='ctx'> 		u32 tlv_len, tlv_type;</div><div class='add'>+		u32 rf_type;</div><div class='ctx'> </div><div class='ctx'> 		len -= sizeof(*tlv);</div><div class='del'>-		tlv = (void *)data;</div><div class='add'>+		tlv = (const void *)data;</div><div class='ctx'> </div><div class='ctx'> 		tlv_len = le32_to_cpu(tlv-&gt;length);</div><div class='ctx'> 		tlv_type = le32_to_cpu(tlv-&gt;type);</div><div class='hunk'>@@ -186,26 +192,37 @@ static int iwl_pnvm_parse(struct iwl_trans *trans, const u8 *data,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (tlv_type == IWL_UCODE_TLV_PNVM_SKU) {</div><div class='del'>-			struct iwl_sku_id *sku_id =</div><div class='del'>-				(void *)(data + sizeof(*tlv));</div><div class='add'>+			const struct iwl_sku_id *tlv_sku_id =</div><div class='add'>+				(const void *)(data + sizeof(*tlv));</div><div class='ctx'> </div><div class='ctx'> 			IWL_DEBUG_FW(trans,</div><div class='ctx'> 				     "Got IWL_UCODE_TLV_PNVM_SKU len %d\n",</div><div class='ctx'> 				     tlv_len);</div><div class='ctx'> 			IWL_DEBUG_FW(trans, "sku_id 0x%0x 0x%0x 0x%0x\n",</div><div class='del'>-				     le32_to_cpu(sku_id-&gt;data[0]),</div><div class='del'>-				     le32_to_cpu(sku_id-&gt;data[1]),</div><div class='del'>-				     le32_to_cpu(sku_id-&gt;data[2]));</div><div class='add'>+				     le32_to_cpu(tlv_sku_id-&gt;data[0]),</div><div class='add'>+				     le32_to_cpu(tlv_sku_id-&gt;data[1]),</div><div class='add'>+				     le32_to_cpu(tlv_sku_id-&gt;data[2]));</div><div class='ctx'> </div><div class='ctx'> 			data += sizeof(*tlv) + ALIGN(tlv_len, 4);</div><div class='ctx'> 			len -= ALIGN(tlv_len, 4);</div><div class='ctx'> </div><div class='del'>-			if (trans-&gt;sku_id[0] == le32_to_cpu(sku_id-&gt;data[0]) &amp;&amp;</div><div class='del'>-			    trans-&gt;sku_id[1] == le32_to_cpu(sku_id-&gt;data[1]) &amp;&amp;</div><div class='del'>-			    trans-&gt;sku_id[2] == le32_to_cpu(sku_id-&gt;data[2])) {</div><div class='add'>+			trans-&gt;reduced_cap_sku = false;</div><div class='add'>+			rf_type = CSR_HW_RFID_TYPE(trans-&gt;info.hw_rf_id);</div><div class='add'>+			if ((sku_id[0] &amp; cpu_to_le32(IWL_PNVM_REDUCED_CAP_BIT)) &amp;&amp;</div><div class='add'>+			    rf_type == IWL_CFG_RF_TYPE_FM)</div><div class='add'>+				trans-&gt;reduced_cap_sku = true;</div><div class='add'>+</div><div class='add'>+			IWL_DEBUG_FW(trans,</div><div class='add'>+				     "Reduced SKU device %d\n",</div><div class='add'>+				     trans-&gt;reduced_cap_sku);</div><div class='add'>+</div><div class='add'>+			if (sku_id[0] == tlv_sku_id-&gt;data[0] &amp;&amp;</div><div class='add'>+			    sku_id[1] == tlv_sku_id-&gt;data[1] &amp;&amp;</div><div class='add'>+			    sku_id[2] == tlv_sku_id-&gt;data[2]) {</div><div class='ctx'> 				int ret;</div><div class='ctx'> </div><div class='del'>-				ret = iwl_pnvm_handle_section(trans, data, len);</div><div class='add'>+				ret = iwl_pnvm_handle_section(trans, data, len,</div><div class='add'>+							      pnvm_data);</div><div class='ctx'> 				if (!ret)</div><div class='ctx'> 					return 0;</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -220,165 +237,236 @@ static int iwl_pnvm_parse(struct iwl_trans *trans, const u8 *data,</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_EFI)</div><div class='add'>+static u8 *iwl_pnvm_get_from_fs(struct iwl_trans *trans, size_t *len)</div><div class='add'>+{</div><div class='add'>+	const struct firmware *pnvm;</div><div class='add'>+	char pnvm_name[MAX_PNVM_NAME];</div><div class='add'>+	size_t new_len;</div><div class='add'>+	u8 *data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	iwl_pnvm_get_fs_name(trans, pnvm_name, sizeof(pnvm_name));</div><div class='add'>+</div><div class='add'>+	ret = firmware_request_nowarn(&amp;pnvm, pnvm_name, trans-&gt;dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_DEBUG_FW(trans, "PNVM file %s not found %d\n",</div><div class='add'>+			     pnvm_name, ret);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	new_len = pnvm-&gt;size;</div><div class='add'>+	data = kvmemdup(pnvm-&gt;data, pnvm-&gt;size, GFP_KERNEL);</div><div class='add'>+	release_firmware(pnvm);</div><div class='ctx'> </div><div class='del'>-#define IWL_EFI_VAR_GUID EFI_GUID(0x92daaf2f, 0xc02b, 0x455b,	\</div><div class='del'>-				  0xb2, 0xec, 0xf5, 0xa3,	\</div><div class='del'>-				  0x59, 0x4f, 0x4a, 0xea)</div><div class='add'>+	if (!data)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-#define IWL_UEFI_OEM_PNVM_NAME	L"UefiCnvWlanOemSignedPnvm"</div><div class='add'>+	*len = new_len;</div><div class='ctx'> </div><div class='del'>-#define IWL_HARDCODED_PNVM_SIZE 4096</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-struct pnvm_sku_package {</div><div class='del'>-	u8 rev;</div><div class='del'>-	u8 reserved1[3];</div><div class='del'>-	u32 total_size;</div><div class='del'>-	u8 n_skus;</div><div class='del'>-	u8 reserved2[11];</div><div class='del'>-	u8 data[];</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_pnvm_source - different PNVM possible sources</div><div class='add'>+ *</div><div class='add'>+ * @IWL_PNVM_SOURCE_NONE: No PNVM.</div><div class='add'>+ * @IWL_PNVM_SOURCE_BIOS: PNVM should be read from BIOS.</div><div class='add'>+ * @IWL_PNVM_SOURCE_EXTERNAL: read .pnvm external file</div><div class='add'>+ * @IWL_PNVM_SOURCE_EMBEDDED: PNVM is embedded in the .ucode file.</div><div class='add'>+ */</div><div class='add'>+enum iwl_pnvm_source {</div><div class='add'>+	IWL_PNVM_SOURCE_NONE,</div><div class='add'>+	IWL_PNVM_SOURCE_BIOS,</div><div class='add'>+	IWL_PNVM_SOURCE_EXTERNAL,</div><div class='add'>+	IWL_PNVM_SOURCE_EMBEDDED</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int iwl_pnvm_get_from_efi(struct iwl_trans *trans,</div><div class='del'>-				 u8 **data, size_t *len)</div><div class='add'>+static enum iwl_pnvm_source iwl_select_pnvm_source(struct iwl_trans *trans,</div><div class='add'>+						   bool intel_sku)</div><div class='ctx'> {</div><div class='del'>-	struct efivar_entry *pnvm_efivar;</div><div class='del'>-	struct pnvm_sku_package *package;</div><div class='del'>-	unsigned long package_size;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	pnvm_efivar = kzalloc(sizeof(*pnvm_efivar), GFP_KERNEL);</div><div class='del'>-	if (!pnvm_efivar)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;pnvm_efivar-&gt;var.VariableName, IWL_UEFI_OEM_PNVM_NAME,</div><div class='del'>-	       sizeof(IWL_UEFI_OEM_PNVM_NAME));</div><div class='del'>-	pnvm_efivar-&gt;var.VendorGuid = IWL_EFI_VAR_GUID;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * TODO: we hardcode a maximum length here, because reading</div><div class='del'>-	 * from the UEFI is not working.  To implement this properly,</div><div class='del'>-	 * we have to call efivar_entry_size().</div><div class='del'>-	 */</div><div class='del'>-	package_size = IWL_HARDCODED_PNVM_SIZE;</div><div class='del'>-</div><div class='del'>-	package = kmalloc(package_size, GFP_KERNEL);</div><div class='del'>-	if (!package) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	err = efivar_entry_get(pnvm_efivar, NULL, &amp;package_size, package);</div><div class='del'>-	if (err) {</div><div class='del'>-		IWL_DEBUG_FW(trans,</div><div class='del'>-			     "PNVM UEFI variable not found %d (len %lu)\n",</div><div class='del'>-			     err, package_size);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	/* Get PNVM from BIOS for non-Intel SKU */</div><div class='add'>+	if (!intel_sku)</div><div class='add'>+		return IWL_PNVM_SOURCE_BIOS;</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_FW(trans, "Read PNVM fro UEFI with size %lu\n", package_size);</div><div class='add'>+	/* Before those devices, PNVM didn't exist at all */</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		return IWL_PNVM_SOURCE_NONE;</div><div class='ctx'> </div><div class='del'>-	*data = kmemdup(package-&gt;data, *len, GFP_KERNEL);</div><div class='del'>-	if (!*data)</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-	*len = package_size - sizeof(*package);</div><div class='add'>+	/* After those devices, we moved to embedded PNVM */</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt; IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		return IWL_PNVM_SOURCE_EMBEDDED;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	kfree(package);</div><div class='del'>-	kfree(pnvm_efivar);</div><div class='add'>+	/* For IWL_DEVICE_FAMILY_AX210, depends on the CRF */</div><div class='add'>+	if (CSR_HW_RFID_TYPE(trans-&gt;info.hw_rf_id) == IWL_CFG_RF_TYPE_GF)</div><div class='add'>+		return IWL_PNVM_SOURCE_EXTERNAL;</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return IWL_PNVM_SOURCE_NONE;</div><div class='ctx'> }</div><div class='del'>-#else /* CONFIG_EFI */</div><div class='del'>-static inline int iwl_pnvm_get_from_efi(struct iwl_trans *trans,</div><div class='del'>-					u8 **data, size_t *len)</div><div class='add'>+</div><div class='add'>+static const u8 *iwl_get_pnvm_image(struct iwl_trans *trans_p, size_t *len,</div><div class='add'>+				    __le32 sku_id[3], const struct iwl_fw *fw)</div><div class='ctx'> {</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='add'>+	struct pnvm_sku_package *package;</div><div class='add'>+	enum iwl_pnvm_source pnvm_src =</div><div class='add'>+		iwl_select_pnvm_source(trans_p, sku_id[2] == 0);</div><div class='add'>+	u8 *image = NULL;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_FW(trans_p, "PNVM source %d\n", pnvm_src);</div><div class='add'>+</div><div class='add'>+	if (pnvm_src == IWL_PNVM_SOURCE_NONE)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (pnvm_src == IWL_PNVM_SOURCE_BIOS) {</div><div class='add'>+		package = iwl_uefi_get_pnvm(trans_p, len);</div><div class='add'>+		if (!IS_ERR_OR_NULL(package)) {</div><div class='add'>+			if (*len &gt;= sizeof(*package)) {</div><div class='add'>+				/* we need only the data */</div><div class='add'>+				*len -= sizeof(*package);</div><div class='add'>+				image = kvmemdup(package-&gt;data,</div><div class='add'>+						 *len, GFP_KERNEL);</div><div class='add'>+			}</div><div class='add'>+			/*</div><div class='add'>+			 * free package regardless of whether kmemdup</div><div class='add'>+			 * succeeded</div><div class='add'>+			 */</div><div class='add'>+			kfree(package);</div><div class='add'>+			if (image)</div><div class='add'>+				return image;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* PNVM doesn't exist in BIOS. Find the fallback source */</div><div class='add'>+		pnvm_src = iwl_select_pnvm_source(trans_p, true);</div><div class='add'>+		IWL_DEBUG_FW(trans_p, "PNVM in BIOS doesn't exist, try %d\n",</div><div class='add'>+			     pnvm_src);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pnvm_src == IWL_PNVM_SOURCE_EXTERNAL) {</div><div class='add'>+		image = iwl_pnvm_get_from_fs(trans_p, len);</div><div class='add'>+		if (image)</div><div class='add'>+			return image;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pnvm_src == IWL_PNVM_SOURCE_EMBEDDED &amp;&amp; fw-&gt;pnvm_data) {</div><div class='add'>+		*len = fw-&gt;pnvm_size;</div><div class='add'>+		return fw-&gt;pnvm_data;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_ERR(trans_p, "Couldn't get PNVM from required source: %d\n", pnvm_src);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_EFI */</div><div class='ctx'> </div><div class='del'>-static int iwl_pnvm_get_from_fs(struct iwl_trans *trans, u8 **data, size_t *len)</div><div class='add'>+static void</div><div class='add'>+iwl_pnvm_load_pnvm_to_trans(struct iwl_trans *trans,</div><div class='add'>+			    const struct iwl_fw *fw,</div><div class='add'>+			    __le32 sku_id[3])</div><div class='ctx'> {</div><div class='del'>-	const struct firmware *pnvm;</div><div class='del'>-	char pnvm_name[64];</div><div class='add'>+	struct iwl_pnvm_image *pnvm_data = NULL;</div><div class='add'>+	const u8 *data = NULL;</div><div class='add'>+	size_t length;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * The prefix unfortunately includes a hyphen at the end, so</div><div class='del'>-	 * don't add the dot here...</div><div class='del'>-	 */</div><div class='del'>-	snprintf(pnvm_name, sizeof(pnvm_name), "%spnvm",</div><div class='del'>-		 trans-&gt;cfg-&gt;fw_name_pre);</div><div class='add'>+	/* failed to get/parse the image in the past, no use trying again */</div><div class='add'>+	if (trans-&gt;fail_to_parse_pnvm_image)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	/* ...but replace the hyphen with the dot here. */</div><div class='del'>-	if (strlen(trans-&gt;cfg-&gt;fw_name_pre) &lt; sizeof(pnvm_name))</div><div class='del'>-		pnvm_name[strlen(trans-&gt;cfg-&gt;fw_name_pre) - 1] = '.';</div><div class='add'>+	if (trans-&gt;pnvm_loaded)</div><div class='add'>+		goto set;</div><div class='ctx'> </div><div class='del'>-	ret = firmware_request_nowarn(&amp;pnvm, pnvm_name, trans-&gt;dev);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_DEBUG_FW(trans, "PNVM file %s not found %d\n",</div><div class='del'>-			     pnvm_name, ret);</div><div class='del'>-		return ret;</div><div class='add'>+	data = iwl_get_pnvm_image(trans, &amp;length, sku_id, fw);</div><div class='add'>+	if (!data) {</div><div class='add'>+		trans-&gt;fail_to_parse_pnvm_image = true;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*data = kmemdup(pnvm-&gt;data, pnvm-&gt;size, GFP_KERNEL);</div><div class='del'>-	if (!*data)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	pnvm_data = kzalloc(sizeof(*pnvm_data), GFP_KERNEL);</div><div class='add'>+	if (!pnvm_data)</div><div class='add'>+		goto free;</div><div class='ctx'> </div><div class='del'>-	*len = pnvm-&gt;size;</div><div class='add'>+	ret = iwl_pnvm_parse(trans, data, length, pnvm_data, sku_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		trans-&gt;fail_to_parse_pnvm_image = true;</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	ret = iwl_trans_load_pnvm(trans, pnvm_data, &amp;fw-&gt;ucode_capa);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free;</div><div class='add'>+	IWL_DEBUG_INFO(trans, "loaded PNVM version %08x\n", pnvm_data-&gt;version);</div><div class='add'>+</div><div class='add'>+set:</div><div class='add'>+	iwl_trans_set_pnvm(trans, &amp;fw-&gt;ucode_capa);</div><div class='add'>+free:</div><div class='add'>+	/* free only if it was allocated, i.e. not just embedded PNVM data */</div><div class='add'>+	if (data != fw-&gt;pnvm_data)</div><div class='add'>+		kvfree(data);</div><div class='add'>+	kfree(pnvm_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwl_pnvm_load(struct iwl_trans *trans,</div><div class='del'>-		  struct iwl_notif_wait_data *notif_wait)</div><div class='add'>+static void</div><div class='add'>+iwl_pnvm_load_reduce_power_to_trans(struct iwl_trans *trans,</div><div class='add'>+				    const struct iwl_ucode_capabilities *capa,</div><div class='add'>+				    __le32 sku_id[3])</div><div class='ctx'> {</div><div class='del'>-	u8 *data;</div><div class='del'>-	size_t len;</div><div class='del'>-	struct iwl_notification_wait pnvm_wait;</div><div class='del'>-	static const u16 ntf_cmds[] = { WIDE_ID(REGULATORY_AND_NVM_GROUP,</div><div class='del'>-						PNVM_INIT_COMPLETE_NTFY) };</div><div class='add'>+	struct iwl_pnvm_image *pnvm_data = NULL;</div><div class='add'>+	u8 *data = NULL;</div><div class='add'>+	size_t length;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* if the SKU_ID is empty, there's nothing to do */</div><div class='del'>-	if (!trans-&gt;sku_id[0] &amp;&amp; !trans-&gt;sku_id[1] &amp;&amp; !trans-&gt;sku_id[2])</div><div class='del'>-		return 0;</div><div class='add'>+	if (trans-&gt;failed_to_load_reduce_power_image)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;reduce_power_loaded)</div><div class='add'>+		goto set;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If we already loaded (or tried to load) it before, we just</div><div class='del'>-	 * need to set it again.</div><div class='del'>-	 */</div><div class='del'>-	if (trans-&gt;pnvm_loaded) {</div><div class='del'>-		ret = iwl_trans_set_pnvm(trans, NULL, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-		goto skip_parse;</div><div class='add'>+	data = iwl_uefi_get_reduced_power(trans, &amp;length);</div><div class='add'>+	if (IS_ERR(data)) {</div><div class='add'>+		trans-&gt;failed_to_load_reduce_power_image = true;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* First attempt to get the PNVM from BIOS */</div><div class='del'>-	ret = iwl_pnvm_get_from_efi(trans, &amp;data, &amp;len);</div><div class='del'>-	if (!ret)</div><div class='del'>-		goto parse;</div><div class='add'>+	pnvm_data = kzalloc(sizeof(*pnvm_data), GFP_KERNEL);</div><div class='add'>+	if (!pnvm_data)</div><div class='add'>+		goto free;</div><div class='ctx'> </div><div class='del'>-	/* If it's not available, try from the filesystem */</div><div class='del'>-	ret = iwl_pnvm_get_from_fs(trans, &amp;data, &amp;len);</div><div class='add'>+	ret = iwl_uefi_reduce_power_parse(trans, data, length, pnvm_data,</div><div class='add'>+					  sku_id);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		/*</div><div class='del'>-		 * Pretend we've loaded it - at least we've tried and</div><div class='del'>-		 * couldn't load it at all, so there's no point in</div><div class='del'>-		 * trying again over and over.</div><div class='del'>-		 */</div><div class='del'>-		trans-&gt;pnvm_loaded = true;</div><div class='del'>-</div><div class='del'>-		goto skip_parse;</div><div class='add'>+		trans-&gt;failed_to_load_reduce_power_image = true;</div><div class='add'>+		goto free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-parse:</div><div class='del'>-	iwl_pnvm_parse(trans, data, len);</div><div class='add'>+	ret = iwl_trans_load_reduce_power(trans, pnvm_data, capa);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_DEBUG_FW(trans,</div><div class='add'>+			     "Failed to load reduce power table %d\n",</div><div class='add'>+			     ret);</div><div class='add'>+		trans-&gt;failed_to_load_reduce_power_image = true;</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+set:</div><div class='add'>+	iwl_trans_set_reduce_power(trans, capa);</div><div class='add'>+free:</div><div class='ctx'> 	kfree(data);</div><div class='add'>+	kfree(pnvm_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_pnvm_load(struct iwl_trans *trans,</div><div class='add'>+		  struct iwl_notif_wait_data *notif_wait,</div><div class='add'>+		  const struct iwl_fw *fw, __le32 sku_id[3])</div><div class='add'>+{</div><div class='add'>+	struct iwl_notification_wait pnvm_wait;</div><div class='add'>+	static const u16 ntf_cmds[] = { WIDE_ID(REGULATORY_AND_NVM_GROUP,</div><div class='add'>+						PNVM_INIT_COMPLETE_NTFY) };</div><div class='add'>+</div><div class='add'>+	/* if the SKU_ID is empty, there's nothing to do */</div><div class='add'>+	if (!sku_id[0] &amp;&amp; !sku_id[1] &amp;&amp; !sku_id[2])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	iwl_pnvm_load_pnvm_to_trans(trans, fw, sku_id);</div><div class='add'>+	iwl_pnvm_load_reduce_power_to_trans(trans, &amp;fw-&gt;ucode_capa, sku_id);</div><div class='ctx'> </div><div class='del'>-skip_parse:</div><div class='ctx'> 	iwl_init_notification_wait(notif_wait, &amp;pnvm_wait,</div><div class='ctx'> 				   ntf_cmds, ARRAY_SIZE(ntf_cmds),</div><div class='ctx'> 				   iwl_pnvm_complete_fn, trans);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/pnvm.h b/drivers/net/wireless/intel/iwlwifi/fw/pnvm.h<br/>index e4f91bce222d..ad3b7e2423ac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/pnvm.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/pnvm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/pnvm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/pnvm.h</a></div><div class='hunk'>@@ -1,18 +1,30 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2020 Intel Corporation</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='add'>+/*</div><div class='add'>+ * Copyright(c) 2020-2023, 2025 Intel Corporation</div><div class='add'>+ */</div><div class='ctx'> #ifndef __IWL_PNVM_H__</div><div class='ctx'> #define __IWL_PNVM_H__</div><div class='ctx'> </div><div class='add'>+#include "iwl-drv.h"</div><div class='ctx'> #include "fw/notif-wait.h"</div><div class='add'>+#include "fw/img.h"</div><div class='add'>+</div><div class='add'>+#define MVM_UCODE_PNVM_TIMEOUT	(HZ / 4)</div><div class='ctx'> </div><div class='del'>-#define MVM_UCODE_PNVM_TIMEOUT	(HZ / 10)</div><div class='add'>+#define MAX_PNVM_NAME  64</div><div class='ctx'> </div><div class='ctx'> int iwl_pnvm_load(struct iwl_trans *trans,</div><div class='del'>-		  struct iwl_notif_wait_data *notif_wait);</div><div class='add'>+		  struct iwl_notif_wait_data *notif_wait,</div><div class='add'>+		  const struct iwl_fw *fw, __le32 sku_id[3]);</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void iwl_pnvm_get_fs_name(struct iwl_trans *trans,</div><div class='add'>+			  u8 *pnvm_name, size_t max_len)</div><div class='add'>+{</div><div class='add'>+	char _fw_name_pre[FW_NAME_PRE_BUFSIZE];</div><div class='add'>+</div><div class='add'>+	snprintf(pnvm_name, max_len, "%s.pnvm",</div><div class='add'>+		 iwl_drv_get_fwname_pre(trans, _fw_name_pre));</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #endif /* __IWL_PNVM_H__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c b/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c<br/>new file mode 100644<br/>index 000000000000..d2ad169ae880<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/regulatory.c</a></div><div class='hunk'>@@ -0,0 +1,743 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2023, 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/dmi.h&gt;</div><div class='add'>+#include "iwl-drv.h"</div><div class='add'>+#include "iwl-debug.h"</div><div class='add'>+#include "regulatory.h"</div><div class='add'>+#include "fw/runtime.h"</div><div class='add'>+#include "fw/uefi.h"</div><div class='add'>+</div><div class='add'>+#define GET_BIOS_TABLE(__name, ...)					\</div><div class='add'>+do {									\</div><div class='add'>+	int ret = -ENOENT;						\</div><div class='add'>+	if (fwrt-&gt;uefi_tables_lock_status &gt; UEFI_WIFI_GUID_UNLOCKED)	\</div><div class='add'>+		ret = iwl_uefi_get_ ## __name(__VA_ARGS__);		\</div><div class='add'>+	if (ret &lt; 0)							\</div><div class='add'>+		ret = iwl_acpi_get_ ## __name(__VA_ARGS__);		\</div><div class='add'>+	return ret;							\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define IWL_BIOS_TABLE_LOADER(__name)					\</div><div class='add'>+int iwl_bios_get_ ## __name(struct iwl_fw_runtime *fwrt)		\</div><div class='add'>+{GET_BIOS_TABLE(__name, fwrt); }					\</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_bios_get_ ## __name)</div><div class='add'>+</div><div class='add'>+#define IWL_BIOS_TABLE_LOADER_DATA(__name, data_type)			\</div><div class='add'>+int iwl_bios_get_ ## __name(struct iwl_fw_runtime *fwrt,		\</div><div class='add'>+			    data_type * data)				\</div><div class='add'>+{GET_BIOS_TABLE(__name, fwrt, data); }					\</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_bios_get_ ## __name)</div><div class='add'>+</div><div class='add'>+IWL_BIOS_TABLE_LOADER(wrds_table);</div><div class='add'>+IWL_BIOS_TABLE_LOADER(ewrd_table);</div><div class='add'>+IWL_BIOS_TABLE_LOADER(wgds_table);</div><div class='add'>+IWL_BIOS_TABLE_LOADER(ppag_table);</div><div class='add'>+IWL_BIOS_TABLE_LOADER(phy_filters);</div><div class='add'>+IWL_BIOS_TABLE_LOADER_DATA(tas_table, struct iwl_tas_data);</div><div class='add'>+IWL_BIOS_TABLE_LOADER_DATA(pwr_limit, u64);</div><div class='add'>+IWL_BIOS_TABLE_LOADER_DATA(mcc, char);</div><div class='add'>+IWL_BIOS_TABLE_LOADER_DATA(eckv, u32);</div><div class='add'>+IWL_BIOS_TABLE_LOADER_DATA(wbem, u32);</div><div class='add'>+IWL_BIOS_TABLE_LOADER_DATA(dsbr, u32);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const struct dmi_system_id dmi_ppag_approved_list[] = {</div><div class='add'>+	{ .ident = "HP",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "HP"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ .ident = "SAMSUNG",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ .ident = "MSFT",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ .ident = "ASUSTEK",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ .ident = "ASUS",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "ASUS"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ .ident = "GOOGLE-HP",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Google"),</div><div class='add'>+			DMI_MATCH(DMI_BOARD_VENDOR, "HP"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ .ident = "GOOGLE-ASUS",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Google"),</div><div class='add'>+			DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTek COMPUTER INC."),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ .ident = "GOOGLE-SAMSUNG",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Google"),</div><div class='add'>+			DMI_MATCH(DMI_BOARD_VENDOR, "SAMSUNG ELECTRONICS CO., LTD"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ .ident = "DELL",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ .ident = "DELL",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ .ident = "RAZER",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Razer"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ .ident = "Honor",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "HONOR"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ .ident = "WIKO",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "WIKO"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dmi_system_id dmi_tas_approved_list[] = {</div><div class='add'>+	{ .ident = "HP",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "HP"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ .ident = "SAMSUNG",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+		{ .ident = "LENOVO",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ .ident = "DELL",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ .ident = "MSFT",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ .ident = "Acer",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ .ident = "ASUSTEK",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ .ident = "ASUS",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "ASUS"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ .ident = "GOOGLE-HP",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Google"),</div><div class='add'>+			DMI_MATCH(DMI_BOARD_VENDOR, "HP"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ .ident = "MSI",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International Co., Ltd."),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ .ident = "Honor",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "HONOR"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	/* keep last */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+bool iwl_sar_geo_support(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * The PER_CHAIN_LIMIT_OFFSET_CMD command is not supported on</div><div class='add'>+	 * earlier firmware versions.  Unfortunately, we don't have a</div><div class='add'>+	 * TLV API flag to rely on, so rely on the major version which</div><div class='add'>+	 * is in the first byte of ucode_ver.  This was implemented</div><div class='add'>+	 * initially on version 38 and then backported to 17.  It was</div><div class='add'>+	 * also backported to 29, but only for 7265D devices.  The</div><div class='add'>+	 * intention was to have it in 36 as well, but not all 8000</div><div class='add'>+	 * family got this feature enabled.  The 8000 family is the</div><div class='add'>+	 * only one using version 36, so skip this version entirely.</div><div class='add'>+	 */</div><div class='add'>+	return IWL_UCODE_SERIAL(fwrt-&gt;fw-&gt;ucode_ver) &gt;= 38 ||</div><div class='add'>+		(IWL_UCODE_SERIAL(fwrt-&gt;fw-&gt;ucode_ver) == 17 &amp;&amp;</div><div class='add'>+		 fwrt-&gt;trans-&gt;info.hw_rev != CSR_HW_REV_TYPE_3160) ||</div><div class='add'>+		(IWL_UCODE_SERIAL(fwrt-&gt;fw-&gt;ucode_ver) == 29 &amp;&amp;</div><div class='add'>+		 ((fwrt-&gt;trans-&gt;info.hw_rev &amp; CSR_HW_REV_TYPE_MSK) ==</div><div class='add'>+		  CSR_HW_REV_TYPE_7265D));</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_sar_geo_support);</div><div class='add'>+</div><div class='add'>+int iwl_sar_geo_fill_table(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			   struct iwl_per_chain_offset *table,</div><div class='add'>+			   u32 n_bands, u32 n_profiles)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	if (!fwrt-&gt;geo_enabled)</div><div class='add'>+		return -ENODATA;</div><div class='add'>+</div><div class='add'>+	if (!iwl_sar_geo_support(fwrt))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n_profiles; i++) {</div><div class='add'>+		for (j = 0; j &lt; n_bands; j++) {</div><div class='add'>+			struct iwl_per_chain_offset *chain =</div><div class='add'>+				&amp;table[i * n_bands + j];</div><div class='add'>+</div><div class='add'>+			chain-&gt;max_tx_power =</div><div class='add'>+				cpu_to_le16(fwrt-&gt;geo_profiles[i].bands[j].max);</div><div class='add'>+			chain-&gt;chain_a =</div><div class='add'>+				fwrt-&gt;geo_profiles[i].bands[j].chains[0];</div><div class='add'>+			chain-&gt;chain_b =</div><div class='add'>+				fwrt-&gt;geo_profiles[i].bands[j].chains[1];</div><div class='add'>+			IWL_DEBUG_RADIO(fwrt,</div><div class='add'>+					"SAR geographic profile[%d] Band[%d]: chain A = %d chain B = %d max_tx_power = %d\n",</div><div class='add'>+					i, j,</div><div class='add'>+					fwrt-&gt;geo_profiles[i].bands[j].chains[0],</div><div class='add'>+					fwrt-&gt;geo_profiles[i].bands[j].chains[1],</div><div class='add'>+					fwrt-&gt;geo_profiles[i].bands[j].max);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_sar_geo_fill_table);</div><div class='add'>+</div><div class='add'>+static int iwl_sar_fill_table(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			      __le16 *per_chain, u32 n_subbands,</div><div class='add'>+			      int prof_a, int prof_b)</div><div class='add'>+{</div><div class='add'>+	int profs[BIOS_SAR_NUM_CHAINS] = { prof_a, prof_b };</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BIOS_SAR_NUM_CHAINS; i++) {</div><div class='add'>+		struct iwl_sar_profile *prof;</div><div class='add'>+</div><div class='add'>+		/* don't allow SAR to be disabled (profile 0 means disable) */</div><div class='add'>+		if (profs[i] == 0)</div><div class='add'>+			return -EPERM;</div><div class='add'>+</div><div class='add'>+		/* we are off by one, so allow up to BIOS_SAR_MAX_PROFILE_NUM */</div><div class='add'>+		if (profs[i] &gt; BIOS_SAR_MAX_PROFILE_NUM)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/* profiles go from 1 to 4, so decrement to access the array */</div><div class='add'>+		prof = &amp;fwrt-&gt;sar_profiles[profs[i] - 1];</div><div class='add'>+</div><div class='add'>+		/* if the profile is disabled, do nothing */</div><div class='add'>+		if (!prof-&gt;enabled) {</div><div class='add'>+			IWL_DEBUG_RADIO(fwrt, "SAR profile %d is disabled.\n",</div><div class='add'>+					profs[i]);</div><div class='add'>+			/*</div><div class='add'>+			 * if one of the profiles is disabled, we</div><div class='add'>+			 * ignore all of them and return 1 to</div><div class='add'>+			 * differentiate disabled from other failures.</div><div class='add'>+			 */</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		IWL_DEBUG_INFO(fwrt,</div><div class='add'>+			       "SAR EWRD: chain %d profile index %d\n",</div><div class='add'>+			       i, profs[i]);</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "  Chain[%d]:\n", i);</div><div class='add'>+		for (j = 0; j &lt; n_subbands; j++) {</div><div class='add'>+			per_chain[i * n_subbands + j] =</div><div class='add'>+				cpu_to_le16(prof-&gt;chains[i].subbands[j]);</div><div class='add'>+			IWL_DEBUG_RADIO(fwrt, "    Band[%d] = %d * .125dBm\n",</div><div class='add'>+					j, prof-&gt;chains[i].subbands[j]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_sar_fill_profile(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			 __le16 *per_chain, u32 n_tables, u32 n_subbands,</div><div class='add'>+			 int prof_a, int prof_b)</div><div class='add'>+{</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n_tables; i++) {</div><div class='add'>+		ret = iwl_sar_fill_table(fwrt,</div><div class='add'>+			&amp;per_chain[i * n_subbands * BIOS_SAR_NUM_CHAINS],</div><div class='add'>+			n_subbands, prof_a, prof_b);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_sar_fill_profile);</div><div class='add'>+</div><div class='add'>+static bool iwl_ppag_value_valid(struct iwl_fw_runtime *fwrt, int chain,</div><div class='add'>+				 int subband)</div><div class='add'>+{</div><div class='add'>+	s8 ppag_val = fwrt-&gt;ppag_chains[chain].subbands[subband];</div><div class='add'>+</div><div class='add'>+	if ((subband == 0 &amp;&amp;</div><div class='add'>+	     (ppag_val &gt; IWL_PPAG_MAX_LB || ppag_val &lt; IWL_PPAG_MIN_LB)) ||</div><div class='add'>+	    (subband != 0 &amp;&amp;</div><div class='add'>+	     (ppag_val &gt; IWL_PPAG_MAX_HB || ppag_val &lt; IWL_PPAG_MIN_HB))) {</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "Invalid PPAG value: %d\n", ppag_val);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Utility function for iwlmvm and iwlxvt */</div><div class='add'>+int iwl_fill_ppag_table(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			union iwl_ppag_table_cmd *cmd, int *cmd_size)</div><div class='add'>+{</div><div class='add'>+	u8 cmd_ver;</div><div class='add'>+	int i, j, num_sub_bands;</div><div class='add'>+	s8 *gain;</div><div class='add'>+	bool send_ppag_always;</div><div class='add'>+</div><div class='add'>+	/* many firmware images for JF lie about this */</div><div class='add'>+	if (CSR_HW_RFID_TYPE(fwrt-&gt;trans-&gt;info.hw_rf_id) ==</div><div class='add'>+	    CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_JF))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!fw_has_capa(&amp;fwrt-&gt;fw-&gt;ucode_capa, IWL_UCODE_TLV_CAPA_SET_PPAG)) {</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt,</div><div class='add'>+				"PPAG capability not supported by FW, command not sent.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd_ver = iwl_fw_lookup_cmd_ver(fwrt-&gt;fw,</div><div class='add'>+					WIDE_ID(PHY_OPS_GROUP,</div><div class='add'>+						PER_PLATFORM_ANT_GAIN_CMD), 1);</div><div class='add'>+	/*</div><div class='add'>+	 * Starting from ver 4, driver needs to send the PPAG CMD regardless</div><div class='add'>+	 * if PPAG is enabled/disabled or valid/invalid.</div><div class='add'>+	 */</div><div class='add'>+	send_ppag_always = cmd_ver &gt; 3;</div><div class='add'>+</div><div class='add'>+	/* Don't send PPAG if it is disabled */</div><div class='add'>+	if (!send_ppag_always &amp;&amp; !fwrt-&gt;ppag_flags) {</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "PPAG not enabled, command not sent.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_RADIO(fwrt, "PPAG cmd ver is %d\n", cmd_ver);</div><div class='add'>+	if (cmd_ver == 1) {</div><div class='add'>+		num_sub_bands = IWL_NUM_SUB_BANDS_V1;</div><div class='add'>+		gain = cmd-&gt;v1.gain[0];</div><div class='add'>+		*cmd_size = sizeof(cmd-&gt;v1);</div><div class='add'>+		cmd-&gt;v1.flags = cpu_to_le32(fwrt-&gt;ppag_flags &amp; IWL_PPAG_CMD_V1_MASK);</div><div class='add'>+		if (fwrt-&gt;ppag_bios_rev &gt;= 1) {</div><div class='add'>+			/* in this case FW supports revision 0 */</div><div class='add'>+			IWL_DEBUG_RADIO(fwrt,</div><div class='add'>+					"PPAG table rev is %d, send truncated table\n",</div><div class='add'>+					fwrt-&gt;ppag_bios_rev);</div><div class='add'>+		}</div><div class='add'>+	} else if (cmd_ver == 5) {</div><div class='add'>+		num_sub_bands = IWL_NUM_SUB_BANDS_V2;</div><div class='add'>+		gain = cmd-&gt;v5.gain[0];</div><div class='add'>+		*cmd_size = sizeof(cmd-&gt;v5);</div><div class='add'>+		cmd-&gt;v5.flags = cpu_to_le32(fwrt-&gt;ppag_flags &amp; IWL_PPAG_CMD_V5_MASK);</div><div class='add'>+		if (fwrt-&gt;ppag_bios_rev == 0) {</div><div class='add'>+			/* in this case FW supports revisions 1,2 or 3 */</div><div class='add'>+			IWL_DEBUG_RADIO(fwrt,</div><div class='add'>+					"PPAG table rev is 0, send padded table\n");</div><div class='add'>+		}</div><div class='add'>+	} else if (cmd_ver == 7) {</div><div class='add'>+		num_sub_bands = IWL_NUM_SUB_BANDS_V2;</div><div class='add'>+		gain = cmd-&gt;v7.gain[0];</div><div class='add'>+		*cmd_size = sizeof(cmd-&gt;v7);</div><div class='add'>+		cmd-&gt;v7.ppag_config_info.table_source = fwrt-&gt;ppag_bios_source;</div><div class='add'>+		cmd-&gt;v7.ppag_config_info.table_revision = fwrt-&gt;ppag_bios_rev;</div><div class='add'>+		cmd-&gt;v7.ppag_config_info.value = cpu_to_le32(fwrt-&gt;ppag_flags);</div><div class='add'>+	} else {</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "Unsupported PPAG command version\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ppag mode */</div><div class='add'>+	IWL_DEBUG_RADIO(fwrt,</div><div class='add'>+			"PPAG MODE bits were read from bios: %d\n",</div><div class='add'>+			fwrt-&gt;ppag_flags);</div><div class='add'>+</div><div class='add'>+	if (cmd_ver == 1 &amp;&amp;</div><div class='add'>+	    !fw_has_capa(&amp;fwrt-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			 IWL_UCODE_TLV_CAPA_PPAG_CHINA_BIOS_SUPPORT)) {</div><div class='add'>+		cmd-&gt;v1.flags &amp;= cpu_to_le32(IWL_PPAG_ETSI_MASK);</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "masking ppag China bit\n");</div><div class='add'>+	} else {</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "isn't masking ppag China bit\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The 'flags' field is the same in v1 and v5 so we can just</div><div class='add'>+	 * use v1 to access it.</div><div class='add'>+	 */</div><div class='add'>+	IWL_DEBUG_RADIO(fwrt,</div><div class='add'>+			"PPAG MODE bits going to be sent: %d\n",</div><div class='add'>+			(cmd_ver &lt; 7) ? le32_to_cpu(cmd-&gt;v1.flags) :</div><div class='add'>+					le32_to_cpu(cmd-&gt;v7.ppag_config_info.value));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IWL_NUM_CHAIN_LIMITS; i++) {</div><div class='add'>+		for (j = 0; j &lt; num_sub_bands; j++) {</div><div class='add'>+			if (!send_ppag_always &amp;&amp;</div><div class='add'>+			    !iwl_ppag_value_valid(fwrt, i, j))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			gain[i * num_sub_bands + j] =</div><div class='add'>+				fwrt-&gt;ppag_chains[i].subbands[j];</div><div class='add'>+			IWL_DEBUG_RADIO(fwrt,</div><div class='add'>+					"PPAG table: chain[%d] band[%d]: gain = %d\n",</div><div class='add'>+					i, j, gain[i * num_sub_bands + j]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_fill_ppag_table);</div><div class='add'>+</div><div class='add'>+bool iwl_is_ppag_approved(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	if (!dmi_check_system(dmi_ppag_approved_list)) {</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt,</div><div class='add'>+				"System vendor '%s' is not in the approved list, disabling PPAG.\n",</div><div class='add'>+				dmi_get_system_info(DMI_SYS_VENDOR) ?: "&lt;unknown&gt;");</div><div class='add'>+		fwrt-&gt;ppag_flags = 0;</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_is_ppag_approved);</div><div class='add'>+</div><div class='add'>+bool iwl_is_tas_approved(void)</div><div class='add'>+{</div><div class='add'>+	return dmi_check_system(dmi_tas_approved_list);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_is_tas_approved);</div><div class='add'>+</div><div class='add'>+struct iwl_tas_selection_data</div><div class='add'>+iwl_parse_tas_selection(const u32 tas_selection_in, const u8 tbl_rev)</div><div class='add'>+{</div><div class='add'>+	struct iwl_tas_selection_data tas_selection_out = {};</div><div class='add'>+	u8 override_iec = u32_get_bits(tas_selection_in,</div><div class='add'>+				       IWL_WTAS_OVERRIDE_IEC_MSK);</div><div class='add'>+	u8 canada_tas_uhb = u32_get_bits(tas_selection_in,</div><div class='add'>+					 IWL_WTAS_CANADA_UHB_MSK);</div><div class='add'>+	u8 enabled_iec = u32_get_bits(tas_selection_in,</div><div class='add'>+				      IWL_WTAS_ENABLE_IEC_MSK);</div><div class='add'>+	u8 usa_tas_uhb = u32_get_bits(tas_selection_in,</div><div class='add'>+				      IWL_WTAS_USA_UHB_MSK);</div><div class='add'>+</div><div class='add'>+	if (tbl_rev &gt; 0) {</div><div class='add'>+		tas_selection_out.usa_tas_uhb_allowed = usa_tas_uhb;</div><div class='add'>+		tas_selection_out.override_tas_iec = override_iec;</div><div class='add'>+		tas_selection_out.enable_tas_iec = enabled_iec;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tbl_rev &gt; 1)</div><div class='add'>+		tas_selection_out.canada_tas_uhb_allowed = canada_tas_uhb;</div><div class='add'>+</div><div class='add'>+	return tas_selection_out;</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_parse_tas_selection);</div><div class='add'>+</div><div class='add'>+bool iwl_add_mcc_to_tas_block_list(u16 *list, u8 *size, u16 mcc)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; *size; i++) {</div><div class='add'>+		if (list[i] == mcc)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Verify that there is room for another country</div><div class='add'>+	 * If *size == IWL_WTAS_BLACK_LIST_MAX, then the table is full.</div><div class='add'>+	 */</div><div class='add'>+	if (*size &gt;= IWL_WTAS_BLACK_LIST_MAX)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	list[*size++] = mcc;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_add_mcc_to_tas_block_list);</div><div class='add'>+</div><div class='add'>+__le32 iwl_get_lari_config_bitmap(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 val;</div><div class='add'>+	__le32 config_bitmap = 0;</div><div class='add'>+</div><div class='add'>+	switch (CSR_HW_RFID_TYPE(fwrt-&gt;trans-&gt;info.hw_rf_id)) {</div><div class='add'>+	case IWL_CFG_RF_TYPE_HR1:</div><div class='add'>+	case IWL_CFG_RF_TYPE_HR2:</div><div class='add'>+	case IWL_CFG_RF_TYPE_JF1:</div><div class='add'>+	case IWL_CFG_RF_TYPE_JF2:</div><div class='add'>+		ret = iwl_bios_get_dsm(fwrt, DSM_FUNC_ENABLE_INDONESIA_5G2,</div><div class='add'>+				       &amp;val);</div><div class='add'>+</div><div class='add'>+		if (!ret &amp;&amp; val == DSM_VALUE_INDONESIA_ENABLE)</div><div class='add'>+			config_bitmap |=</div><div class='add'>+			    cpu_to_le32(LARI_CONFIG_ENABLE_5G2_IN_INDONESIA_MSK);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_bios_get_dsm(fwrt, DSM_FUNC_DISABLE_SRD, &amp;val);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (val == DSM_VALUE_SRD_PASSIVE)</div><div class='add'>+			config_bitmap |=</div><div class='add'>+				cpu_to_le32(LARI_CONFIG_CHANGE_ETSI_TO_PASSIVE_MSK);</div><div class='add'>+		else if (val == DSM_VALUE_SRD_DISABLE)</div><div class='add'>+			config_bitmap |=</div><div class='add'>+				cpu_to_le32(LARI_CONFIG_CHANGE_ETSI_TO_DISABLED_MSK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fw_has_capa(&amp;fwrt-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			IWL_UCODE_TLV_CAPA_CHINA_22_REG_SUPPORT)) {</div><div class='add'>+		ret = iwl_bios_get_dsm(fwrt, DSM_FUNC_REGULATORY_CONFIG,</div><div class='add'>+				       &amp;val);</div><div class='add'>+		/*</div><div class='add'>+		 * China 2022 enable if the BIOS object does not exist or</div><div class='add'>+		 * if it is enabled in BIOS.</div><div class='add'>+		 */</div><div class='add'>+		if (ret &lt; 0 || val &amp; DSM_MASK_CHINA_22_REG)</div><div class='add'>+			config_bitmap |=</div><div class='add'>+				cpu_to_le32(LARI_CONFIG_ENABLE_CHINA_22_REG_SUPPORT_MSK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return config_bitmap;</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_get_lari_config_bitmap);</div><div class='add'>+</div><div class='add'>+static size_t iwl_get_lari_config_cmd_size(u8 cmd_ver)</div><div class='add'>+{</div><div class='add'>+	size_t cmd_size;</div><div class='add'>+</div><div class='add'>+	switch (cmd_ver) {</div><div class='add'>+	case 12:</div><div class='add'>+		cmd_size = sizeof(struct iwl_lari_config_change_cmd);</div><div class='add'>+		break;</div><div class='add'>+	case 8:</div><div class='add'>+		cmd_size = sizeof(struct iwl_lari_config_change_cmd_v8);</div><div class='add'>+		break;</div><div class='add'>+	case 6:</div><div class='add'>+		cmd_size = sizeof(struct iwl_lari_config_change_cmd_v6);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		cmd_size = sizeof(struct iwl_lari_config_change_cmd_v1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return cmd_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_fill_lari_config(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			 struct iwl_lari_config_change_cmd *cmd,</div><div class='add'>+			 size_t *cmd_size)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 value;</div><div class='add'>+	bool has_raw_dsm_capa = fw_has_capa(&amp;fwrt-&gt;fw-&gt;ucode_capa,</div><div class='add'>+					    IWL_UCODE_TLV_CAPA_FW_ACCEPTS_RAW_DSM_TABLE);</div><div class='add'>+	u8 cmd_ver = iwl_fw_lookup_cmd_ver(fwrt-&gt;fw,</div><div class='add'>+					   WIDE_ID(REGULATORY_AND_NVM_GROUP,</div><div class='add'>+						   LARI_CONFIG_CHANGE), 1);</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(cmd_ver &gt; 12,</div><div class='add'>+		      "Don't add newer versions to this function\n"))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(cmd, 0, sizeof(*cmd));</div><div class='add'>+	*cmd_size = iwl_get_lari_config_cmd_size(cmd_ver);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;config_bitmap = iwl_get_lari_config_bitmap(fwrt);</div><div class='add'>+</div><div class='add'>+	ret = iwl_bios_get_dsm(fwrt, DSM_FUNC_11AX_ENABLEMENT, &amp;value);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (!has_raw_dsm_capa)</div><div class='add'>+			value &amp;= DSM_11AX_ALLOW_BITMAP;</div><div class='add'>+		cmd-&gt;oem_11ax_allow_bitmap = cpu_to_le32(value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_bios_get_dsm(fwrt, DSM_FUNC_ENABLE_UNII4_CHAN, &amp;value);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (!has_raw_dsm_capa)</div><div class='add'>+			value &amp;= DSM_UNII4_ALLOW_BITMAP;</div><div class='add'>+</div><div class='add'>+		/* Since version 12, bits 4 and 5 are supported</div><div class='add'>+		 * regardless of this capability, By pass this masking</div><div class='add'>+		 * if firmware has capability of accepting raw DSM table.</div><div class='add'>+		 */</div><div class='add'>+		if (!has_raw_dsm_capa &amp;&amp; cmd_ver &lt; 12 &amp;&amp;</div><div class='add'>+		    !fw_has_capa(&amp;fwrt-&gt;fw-&gt;ucode_capa,</div><div class='add'>+				 IWL_UCODE_TLV_CAPA_BIOS_OVERRIDE_5G9_FOR_CA))</div><div class='add'>+			value &amp;= ~(DSM_VALUE_UNII4_CANADA_OVERRIDE_MSK |</div><div class='add'>+				   DSM_VALUE_UNII4_CANADA_EN_MSK);</div><div class='add'>+</div><div class='add'>+		cmd-&gt;oem_unii4_allow_bitmap = cpu_to_le32(value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_bios_get_dsm(fwrt, DSM_FUNC_ACTIVATE_CHANNEL, &amp;value);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (!has_raw_dsm_capa)</div><div class='add'>+			value &amp;= CHAN_STATE_ACTIVE_BITMAP_CMD_V12;</div><div class='add'>+</div><div class='add'>+		if (!has_raw_dsm_capa &amp;&amp; cmd_ver &lt; 8)</div><div class='add'>+			value &amp;= ~ACTIVATE_5G2_IN_WW_MASK;</div><div class='add'>+</div><div class='add'>+		/* Since version 12, bits 5 and 6 are supported</div><div class='add'>+		 * regardless of this capability, By pass this masking</div><div class='add'>+		 * if firmware has capability of accepting raw DSM table.</div><div class='add'>+		 */</div><div class='add'>+		if (!has_raw_dsm_capa &amp;&amp; cmd_ver &lt; 12 &amp;&amp;</div><div class='add'>+		    !fw_has_capa(&amp;fwrt-&gt;fw-&gt;ucode_capa,</div><div class='add'>+				 IWL_UCODE_TLV_CAPA_BIOS_OVERRIDE_UNII4_US_CA))</div><div class='add'>+			value &amp;= CHAN_STATE_ACTIVE_BITMAP_CMD_V8;</div><div class='add'>+</div><div class='add'>+		cmd-&gt;chan_state_active_bitmap = cpu_to_le32(value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_bios_get_dsm(fwrt, DSM_FUNC_ENABLE_6E, &amp;value);</div><div class='add'>+	if (!ret)</div><div class='add'>+		cmd-&gt;oem_uhb_allow_bitmap = cpu_to_le32(value);</div><div class='add'>+</div><div class='add'>+	ret = iwl_bios_get_dsm(fwrt, DSM_FUNC_FORCE_DISABLE_CHANNELS, &amp;value);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (!has_raw_dsm_capa)</div><div class='add'>+			value &amp;= DSM_FORCE_DISABLE_CHANNELS_ALLOWED_BITMAP;</div><div class='add'>+		cmd-&gt;force_disable_channels_bitmap = cpu_to_le32(value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_bios_get_dsm(fwrt, DSM_FUNC_ENERGY_DETECTION_THRESHOLD,</div><div class='add'>+			       &amp;value);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (!has_raw_dsm_capa)</div><div class='add'>+			value &amp;= DSM_EDT_ALLOWED_BITMAP;</div><div class='add'>+		cmd-&gt;edt_bitmap = cpu_to_le32(value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_bios_get_wbem(fwrt, &amp;value);</div><div class='add'>+	if (!ret)</div><div class='add'>+		cmd-&gt;oem_320mhz_allow_bitmap = cpu_to_le32(value);</div><div class='add'>+</div><div class='add'>+	ret = iwl_bios_get_dsm(fwrt, DSM_FUNC_ENABLE_11BE, &amp;value);</div><div class='add'>+	if (!ret)</div><div class='add'>+		cmd-&gt;oem_11be_allow_bitmap = cpu_to_le32(value);</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;config_bitmap ||</div><div class='add'>+	    cmd-&gt;oem_uhb_allow_bitmap ||</div><div class='add'>+	    cmd-&gt;oem_11ax_allow_bitmap ||</div><div class='add'>+	    cmd-&gt;oem_unii4_allow_bitmap ||</div><div class='add'>+	    cmd-&gt;chan_state_active_bitmap ||</div><div class='add'>+	    cmd-&gt;force_disable_channels_bitmap ||</div><div class='add'>+	    cmd-&gt;edt_bitmap ||</div><div class='add'>+	    cmd-&gt;oem_320mhz_allow_bitmap ||</div><div class='add'>+	    cmd-&gt;oem_11be_allow_bitmap) {</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt,</div><div class='add'>+				"sending LARI_CONFIG_CHANGE, config_bitmap=0x%x, oem_11ax_allow_bitmap=0x%x\n",</div><div class='add'>+				le32_to_cpu(cmd-&gt;config_bitmap),</div><div class='add'>+				le32_to_cpu(cmd-&gt;oem_11ax_allow_bitmap));</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt,</div><div class='add'>+				"sending LARI_CONFIG_CHANGE, oem_unii4_allow_bitmap=0x%x, chan_state_active_bitmap=0x%x, cmd_ver=%d\n",</div><div class='add'>+				le32_to_cpu(cmd-&gt;oem_unii4_allow_bitmap),</div><div class='add'>+				le32_to_cpu(cmd-&gt;chan_state_active_bitmap),</div><div class='add'>+				cmd_ver);</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt,</div><div class='add'>+				"sending LARI_CONFIG_CHANGE, oem_uhb_allow_bitmap=0x%x, force_disable_channels_bitmap=0x%x\n",</div><div class='add'>+				le32_to_cpu(cmd-&gt;oem_uhb_allow_bitmap),</div><div class='add'>+				le32_to_cpu(cmd-&gt;force_disable_channels_bitmap));</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt,</div><div class='add'>+				"sending LARI_CONFIG_CHANGE, edt_bitmap=0x%x, oem_320mhz_allow_bitmap=0x%x\n",</div><div class='add'>+				le32_to_cpu(cmd-&gt;edt_bitmap),</div><div class='add'>+				le32_to_cpu(cmd-&gt;oem_320mhz_allow_bitmap));</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt,</div><div class='add'>+				"sending LARI_CONFIG_CHANGE, oem_11be_allow_bitmap=0x%x\n",</div><div class='add'>+				le32_to_cpu(cmd-&gt;oem_11be_allow_bitmap));</div><div class='add'>+	} else {</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_fill_lari_config);</div><div class='add'>+</div><div class='add'>+int iwl_bios_get_dsm(struct iwl_fw_runtime *fwrt, enum iwl_dsm_funcs func,</div><div class='add'>+		     u32 *value)</div><div class='add'>+{</div><div class='add'>+	GET_BIOS_TABLE(dsm, fwrt, func, value);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_bios_get_dsm);</div><div class='add'>+</div><div class='add'>+bool iwl_puncturing_is_allowed_in_bios(u32 puncturing, u16 mcc)</div><div class='add'>+{</div><div class='add'>+	/* Some kind of regulatory mess means we need to currently disallow</div><div class='add'>+	 * puncturing in the US and Canada unless enabled in BIOS.</div><div class='add'>+	 */</div><div class='add'>+	switch (mcc) {</div><div class='add'>+	case IWL_MCC_US:</div><div class='add'>+		return puncturing &amp; IWL_UEFI_CNV_PUNCTURING_USA_EN_MSK;</div><div class='add'>+	case IWL_MCC_CANADA:</div><div class='add'>+		return puncturing &amp; IWL_UEFI_CNV_PUNCTURING_CANADA_EN_MSK;</div><div class='add'>+	default:</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_puncturing_is_allowed_in_bios);</div><div class='add'>+</div><div class='add'>+bool iwl_rfi_is_enabled_in_bios(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	/* default behaviour is disabled */</div><div class='add'>+	u32 value = 0;</div><div class='add'>+	int ret = iwl_bios_get_dsm(fwrt, DSM_FUNC_RFI_CONFIG, &amp;value);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "Failed to get DSM RFI, ret=%d\n", ret);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	value &amp;= DSM_VALUE_RFI_DISABLE;</div><div class='add'>+	/* RFI BIOS CONFIG value can be 0 or 3 only.</div><div class='add'>+	 * i.e 0 means DDR and DLVR enabled. 3 means DDR and DLVR disabled.</div><div class='add'>+	 * 1 and 2 are invalid BIOS configurations, So, it's not possible to</div><div class='add'>+	 * disable ddr/dlvr separately.</div><div class='add'>+	 */</div><div class='add'>+	if (!value) {</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "DSM RFI is evaluated to enable\n");</div><div class='add'>+		return true;</div><div class='add'>+	} else if (value == DSM_VALUE_RFI_DISABLE) {</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "DSM RFI is evaluated to disable\n");</div><div class='add'>+	} else {</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt,</div><div class='add'>+				"DSM RFI got invalid value, value=%d\n", value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_rfi_is_enabled_in_bios);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/regulatory.h b/drivers/net/wireless/intel/iwlwifi/fw/regulatory.h<br/>new file mode 100644<br/>index 000000000000..735482e7adf5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/regulatory.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/regulatory.h</a></div><div class='hunk'>@@ -0,0 +1,267 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2023-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __fw_regulatory_h__</div><div class='add'>+#define __fw_regulatory_h__</div><div class='add'>+</div><div class='add'>+#include "fw/img.h"</div><div class='add'>+#include "fw/api/commands.h"</div><div class='add'>+#include "fw/api/power.h"</div><div class='add'>+#include "fw/api/phy.h"</div><div class='add'>+#include "fw/api/config.h"</div><div class='add'>+#include "fw/api/nvm-reg.h"</div><div class='add'>+#include "iwl-trans.h"</div><div class='add'>+</div><div class='add'>+#define BIOS_SAR_MAX_PROFILE_NUM	4</div><div class='add'>+/*</div><div class='add'>+ * Each SAR profile has (up to, depends on the table revision) 4 chains:</div><div class='add'>+ * chain A, chain B, chain A when in CDB, chain B when in CDB</div><div class='add'>+ */</div><div class='add'>+#define BIOS_SAR_MAX_CHAINS_PER_PROFILE 4</div><div class='add'>+#define BIOS_SAR_NUM_CHAINS             2</div><div class='add'>+#define BIOS_SAR_MAX_SUB_BANDS_NUM      11</div><div class='add'>+</div><div class='add'>+#define BIOS_GEO_NUM_CHAINS		2</div><div class='add'>+#define BIOS_GEO_MAX_NUM_BANDS		3</div><div class='add'>+#define BIOS_GEO_MAX_PROFILE_NUM	8</div><div class='add'>+#define BIOS_GEO_MIN_PROFILE_NUM	3</div><div class='add'>+</div><div class='add'>+#define IWL_SAR_ENABLE_MSK		BIT(0)</div><div class='add'>+</div><div class='add'>+/* PPAG gain value bounds in 1/8 dBm */</div><div class='add'>+#define IWL_PPAG_MIN_LB	-16</div><div class='add'>+#define IWL_PPAG_MAX_LB 24</div><div class='add'>+#define IWL_PPAG_MIN_HB -16</div><div class='add'>+#define IWL_PPAG_MAX_HB 40</div><div class='add'>+</div><div class='add'>+#define IWL_PPAG_ETSI_CHINA_MASK	3</div><div class='add'>+#define IWL_PPAG_REV3_MASK		0x7FF</div><div class='add'>+</div><div class='add'>+#define IWL_WTAS_ENABLED_MSK		BIT(0)</div><div class='add'>+#define IWL_WTAS_OVERRIDE_IEC_MSK	BIT(1)</div><div class='add'>+#define IWL_WTAS_ENABLE_IEC_MSK		BIT(2)</div><div class='add'>+#define IWL_WTAS_CANADA_UHB_MSK		BIT(15)</div><div class='add'>+#define IWL_WTAS_USA_UHB_MSK		BIT(16)</div><div class='add'>+</div><div class='add'>+struct iwl_tas_selection_data {</div><div class='add'>+	u8 override_tas_iec:1,</div><div class='add'>+	   enable_tas_iec:1,</div><div class='add'>+	   usa_tas_uhb_allowed:1,</div><div class='add'>+	   canada_tas_uhb_allowed:1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BIOS_MCC_CHINA 0x434e</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The profile for revision 2 is a superset of revision 1, which is in</div><div class='add'>+ * turn a superset of revision 0.  So we can store all revisions</div><div class='add'>+ * inside revision 2, which is what we represent here.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct iwl_sar_profile_chain - per-chain values of a SAR profile</div><div class='add'>+ * @subbands: the SAR value for each subband</div><div class='add'>+ */</div><div class='add'>+struct iwl_sar_profile_chain {</div><div class='add'>+	u8 subbands[BIOS_SAR_MAX_SUB_BANDS_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct iwl_sar_profile - SAR profile from SAR tables</div><div class='add'>+ * @enabled: whether the profile is enabled or not</div><div class='add'>+ * @chains: per-chain SAR values</div><div class='add'>+ */</div><div class='add'>+struct iwl_sar_profile {</div><div class='add'>+	bool enabled;</div><div class='add'>+	struct iwl_sar_profile_chain chains[BIOS_SAR_MAX_CHAINS_PER_PROFILE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Same thing as with SAR, all revisions fit in revision 2 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct iwl_geo_profile_band - per-band geo SAR offsets</div><div class='add'>+ * @max: the max tx power allowed for the band</div><div class='add'>+ * @chains: SAR offsets values for each chain</div><div class='add'>+ */</div><div class='add'>+struct iwl_geo_profile_band {</div><div class='add'>+	u8 max;</div><div class='add'>+	u8 chains[BIOS_GEO_NUM_CHAINS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct iwl_geo_profile - geo profile</div><div class='add'>+ * @bands: per-band table of the SAR offsets</div><div class='add'>+ */</div><div class='add'>+struct iwl_geo_profile {</div><div class='add'>+	struct iwl_geo_profile_band bands[BIOS_GEO_MAX_NUM_BANDS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Same thing as with SAR, all revisions fit in revision 2 */</div><div class='add'>+struct iwl_ppag_chain {</div><div class='add'>+	s8 subbands[BIOS_SAR_MAX_SUB_BANDS_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_tas_data {</div><div class='add'>+	u8 block_list_size;</div><div class='add'>+	u16 block_list_array[IWL_WTAS_BLACK_LIST_MAX];</div><div class='add'>+	u8 table_source;</div><div class='add'>+	u8 table_revision;</div><div class='add'>+	u32 tas_selection;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* For DSM revision 0 and 4 */</div><div class='add'>+enum iwl_dsm_funcs {</div><div class='add'>+	DSM_FUNC_QUERY = 0,</div><div class='add'>+	DSM_FUNC_DISABLE_SRD = 1,</div><div class='add'>+	DSM_FUNC_ENABLE_INDONESIA_5G2 = 2,</div><div class='add'>+	DSM_FUNC_ENABLE_6E = 3,</div><div class='add'>+	DSM_FUNC_REGULATORY_CONFIG = 4,</div><div class='add'>+	DSM_FUNC_11AX_ENABLEMENT = 6,</div><div class='add'>+	DSM_FUNC_ENABLE_UNII4_CHAN = 7,</div><div class='add'>+	DSM_FUNC_ACTIVATE_CHANNEL = 8,</div><div class='add'>+	DSM_FUNC_FORCE_DISABLE_CHANNELS = 9,</div><div class='add'>+	DSM_FUNC_ENERGY_DETECTION_THRESHOLD = 10,</div><div class='add'>+	DSM_FUNC_RFI_CONFIG = 11,</div><div class='add'>+	DSM_FUNC_ENABLE_11BE = 12,</div><div class='add'>+	DSM_FUNC_NUM_FUNCS = 13,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum iwl_dsm_values_srd {</div><div class='add'>+	DSM_VALUE_SRD_ACTIVE,</div><div class='add'>+	DSM_VALUE_SRD_PASSIVE,</div><div class='add'>+	DSM_VALUE_SRD_DISABLE,</div><div class='add'>+	DSM_VALUE_SRD_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum iwl_dsm_values_indonesia {</div><div class='add'>+	DSM_VALUE_INDONESIA_DISABLE,</div><div class='add'>+	DSM_VALUE_INDONESIA_ENABLE,</div><div class='add'>+	DSM_VALUE_INDONESIA_RESERVED,</div><div class='add'>+	DSM_VALUE_INDONESIA_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum iwl_dsm_unii4_bitmap {</div><div class='add'>+	DSM_VALUE_UNII4_US_OVERRIDE_MSK		= BIT(0),</div><div class='add'>+	DSM_VALUE_UNII4_US_EN_MSK		= BIT(1),</div><div class='add'>+	DSM_VALUE_UNII4_ETSI_OVERRIDE_MSK	= BIT(2),</div><div class='add'>+	DSM_VALUE_UNII4_ETSI_EN_MSK		= BIT(3),</div><div class='add'>+	DSM_VALUE_UNII4_CANADA_OVERRIDE_MSK	= BIT(4),</div><div class='add'>+	DSM_VALUE_UNII4_CANADA_EN_MSK		= BIT(5),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DSM_UNII4_ALLOW_BITMAP (DSM_VALUE_UNII4_US_OVERRIDE_MSK		|\</div><div class='add'>+				DSM_VALUE_UNII4_US_EN_MSK		|\</div><div class='add'>+				DSM_VALUE_UNII4_ETSI_OVERRIDE_MSK	|\</div><div class='add'>+				DSM_VALUE_UNII4_ETSI_EN_MSK		|\</div><div class='add'>+				DSM_VALUE_UNII4_CANADA_OVERRIDE_MSK	|\</div><div class='add'>+				DSM_VALUE_UNII4_CANADA_EN_MSK)</div><div class='add'>+</div><div class='add'>+#define DSM_11AX_ALLOW_BITMAP				0xF</div><div class='add'>+#define DSM_EDT_ALLOWED_BITMAP				0x7ffff0</div><div class='add'>+#define DSM_FORCE_DISABLE_CHANNELS_ALLOWED_BITMAP	0x7FF</div><div class='add'>+</div><div class='add'>+enum iwl_dsm_values_rfi {</div><div class='add'>+	DSM_VALUE_RFI_DLVR_DISABLE	= BIT(0),</div><div class='add'>+	DSM_VALUE_RFI_DDR_DISABLE	= BIT(1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DSM_VALUE_RFI_DISABLE	(DSM_VALUE_RFI_DLVR_DISABLE |\</div><div class='add'>+				 DSM_VALUE_RFI_DDR_DISABLE)</div><div class='add'>+</div><div class='add'>+bool iwl_rfi_is_enabled_in_bios(struct iwl_fw_runtime *fwrt);</div><div class='add'>+</div><div class='add'>+enum iwl_dsm_masks_reg {</div><div class='add'>+	DSM_MASK_CHINA_22_REG = BIT(2)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_fw_runtime;</div><div class='add'>+</div><div class='add'>+bool iwl_sar_geo_support(struct iwl_fw_runtime *fwrt);</div><div class='add'>+</div><div class='add'>+int iwl_sar_geo_fill_table(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			   struct iwl_per_chain_offset *table,</div><div class='add'>+			   u32 n_bands, u32 n_profiles);</div><div class='add'>+</div><div class='add'>+int iwl_sar_fill_profile(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			 __le16 *per_chain, u32 n_tables, u32 n_subbands,</div><div class='add'>+			 int prof_a, int prof_b);</div><div class='add'>+</div><div class='add'>+int iwl_fill_ppag_table(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			union iwl_ppag_table_cmd *cmd,</div><div class='add'>+			int *cmd_size);</div><div class='add'>+</div><div class='add'>+bool iwl_is_ppag_approved(struct iwl_fw_runtime *fwrt);</div><div class='add'>+</div><div class='add'>+bool iwl_is_tas_approved(void);</div><div class='add'>+bool iwl_add_mcc_to_tas_block_list(u16 *list, u8 *size, u16 mcc);</div><div class='add'>+</div><div class='add'>+struct iwl_tas_selection_data</div><div class='add'>+iwl_parse_tas_selection(const u32 tas_selection, const u8 tbl_rev);</div><div class='add'>+</div><div class='add'>+int iwl_bios_get_wrds_table(struct iwl_fw_runtime *fwrt);</div><div class='add'>+</div><div class='add'>+int iwl_bios_get_ewrd_table(struct iwl_fw_runtime *fwrt);</div><div class='add'>+</div><div class='add'>+int iwl_bios_get_wgds_table(struct iwl_fw_runtime *fwrt);</div><div class='add'>+</div><div class='add'>+int iwl_bios_get_ppag_table(struct iwl_fw_runtime *fwrt);</div><div class='add'>+</div><div class='add'>+int iwl_bios_get_tas_table(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			   struct iwl_tas_data *data);</div><div class='add'>+</div><div class='add'>+int iwl_bios_get_pwr_limit(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			   u64 *dflt_pwr_limit);</div><div class='add'>+</div><div class='add'>+int iwl_bios_get_mcc(struct iwl_fw_runtime *fwrt, char *mcc);</div><div class='add'>+int iwl_bios_get_eckv(struct iwl_fw_runtime *fwrt, u32 *ext_clk);</div><div class='add'>+int iwl_bios_get_wbem(struct iwl_fw_runtime *fwrt, u32 *value);</div><div class='add'>+</div><div class='add'>+__le32 iwl_get_lari_config_bitmap(struct iwl_fw_runtime *fwrt);</div><div class='add'>+int iwl_fill_lari_config(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			 struct iwl_lari_config_change_cmd *cmd,</div><div class='add'>+			 size_t *cmd_size);</div><div class='add'>+</div><div class='add'>+int iwl_bios_get_dsm(struct iwl_fw_runtime *fwrt, enum iwl_dsm_funcs func,</div><div class='add'>+		     u32 *value);</div><div class='add'>+</div><div class='add'>+static inline u32 iwl_bios_get_ppag_flags(const u32 ppag_modes,</div><div class='add'>+					  const u8 ppag_bios_rev)</div><div class='add'>+{</div><div class='add'>+	/* For revision 4 and above driver is pipe */</div><div class='add'>+	if (ppag_bios_rev &gt;= 4)</div><div class='add'>+		return ppag_modes;</div><div class='add'>+</div><div class='add'>+	return ppag_modes &amp; (ppag_bios_rev &lt; 3 ? IWL_PPAG_ETSI_CHINA_MASK :</div><div class='add'>+						 IWL_PPAG_REV3_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool iwl_puncturing_is_allowed_in_bios(u32 puncturing, u16 mcc);</div><div class='add'>+</div><div class='add'>+#define IWL_DSBR_FW_MODIFIED_URM_MASK	BIT(8)</div><div class='add'>+#define IWL_DSBR_PERMANENT_URM_MASK	BIT(9)</div><div class='add'>+</div><div class='add'>+int iwl_bios_get_dsbr(struct iwl_fw_runtime *fwrt, u32 *value);</div><div class='add'>+int iwl_bios_get_phy_filters(struct iwl_fw_runtime *fwrt);</div><div class='add'>+</div><div class='add'>+static inline void iwl_bios_setup_step(struct iwl_trans *trans,</div><div class='add'>+				       struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	u32 dsbr;</div><div class='add'>+</div><div class='add'>+	if (!trans-&gt;mac_cfg-&gt;integrated)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_BZ)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (iwl_bios_get_dsbr(fwrt, &amp;dsbr))</div><div class='add'>+		dsbr = 0;</div><div class='add'>+</div><div class='add'>+	trans-&gt;conf.dsbr_urm_fw_dependent =</div><div class='add'>+		!!(dsbr &amp; IWL_DSBR_FW_MODIFIED_URM_MASK);</div><div class='add'>+	trans-&gt;conf.dsbr_urm_permanent =</div><div class='add'>+		!!(dsbr &amp; IWL_DSBR_PERMANENT_URM_MASK);</div><div class='add'>+}</div><div class='add'>+#endif /* __fw_regulatory_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/rs.c b/drivers/net/wireless/intel/iwlwifi/fw/rs.c<br/>new file mode 100644<br/>index 000000000000..746f2acffb8f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/rs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/rs.c</a></div><div class='hunk'>@@ -0,0 +1,161 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2021-2022, 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+#include "fw/api/rs.h"</div><div class='add'>+#include "iwl-drv.h"</div><div class='add'>+#include "iwl-config.h"</div><div class='add'>+</div><div class='add'>+#define IWL_DECLARE_RATE_INFO(r) \</div><div class='add'>+	[IWL_RATE_##r##M_INDEX] = IWL_RATE_##r##M_PLCP</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Translate from fw_rate_index (IWL_RATE_XXM_INDEX) to PLCP</div><div class='add'>+ * */</div><div class='add'>+static const u8 fw_rate_idx_to_plcp[IWL_RATE_COUNT] = {</div><div class='add'>+	IWL_DECLARE_RATE_INFO(1),</div><div class='add'>+	IWL_DECLARE_RATE_INFO(2),</div><div class='add'>+	IWL_DECLARE_RATE_INFO(5),</div><div class='add'>+	IWL_DECLARE_RATE_INFO(11),</div><div class='add'>+	IWL_DECLARE_RATE_INFO(6),</div><div class='add'>+	IWL_DECLARE_RATE_INFO(9),</div><div class='add'>+	IWL_DECLARE_RATE_INFO(12),</div><div class='add'>+	IWL_DECLARE_RATE_INFO(18),</div><div class='add'>+	IWL_DECLARE_RATE_INFO(24),</div><div class='add'>+	IWL_DECLARE_RATE_INFO(36),</div><div class='add'>+	IWL_DECLARE_RATE_INFO(48),</div><div class='add'>+	IWL_DECLARE_RATE_INFO(54),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* mbps, mcs */</div><div class='add'>+static const struct iwl_rate_mcs_info rate_mcs[IWL_RATE_COUNT] = {</div><div class='add'>+	{  "1", "BPSK DSSS"},</div><div class='add'>+	{  "2", "QPSK DSSS"},</div><div class='add'>+	{"5.5", "BPSK CCK"},</div><div class='add'>+	{ "11", "QPSK CCK"},</div><div class='add'>+	{  "6", "BPSK 1/2"},</div><div class='add'>+	{  "9", "BPSK 1/2"},</div><div class='add'>+	{ "12", "QPSK 1/2"},</div><div class='add'>+	{ "18", "QPSK 3/4"},</div><div class='add'>+	{ "24", "16QAM 1/2"},</div><div class='add'>+	{ "36", "16QAM 3/4"},</div><div class='add'>+	{ "48", "64QAM 2/3"},</div><div class='add'>+	{ "54", "64QAM 3/4"},</div><div class='add'>+	{ "60", "64QAM 5/6"},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const ant_name[] = {</div><div class='add'>+	[ANT_NONE] = "None",</div><div class='add'>+	[ANT_A]    = "A",</div><div class='add'>+	[ANT_B]    = "B",</div><div class='add'>+	[ANT_AB]   = "AB",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const pretty_bw[] = {</div><div class='add'>+	"20Mhz",</div><div class='add'>+	"40Mhz",</div><div class='add'>+	"80Mhz",</div><div class='add'>+	"160 Mhz",</div><div class='add'>+	"320Mhz",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u8 iwl_fw_rate_idx_to_plcp(int idx)</div><div class='add'>+{</div><div class='add'>+	return fw_rate_idx_to_plcp[idx];</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_fw_rate_idx_to_plcp);</div><div class='add'>+</div><div class='add'>+const struct iwl_rate_mcs_info *iwl_rate_mcs(int idx)</div><div class='add'>+{</div><div class='add'>+	return &amp;rate_mcs[idx];</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_rate_mcs);</div><div class='add'>+</div><div class='add'>+const char *iwl_rs_pretty_ant(u8 ant)</div><div class='add'>+{</div><div class='add'>+	if (ant &gt;= ARRAY_SIZE(ant_name))</div><div class='add'>+		return "UNKNOWN";</div><div class='add'>+</div><div class='add'>+	return ant_name[ant];</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_rs_pretty_ant);</div><div class='add'>+</div><div class='add'>+const char *iwl_rs_pretty_bw(int bw)</div><div class='add'>+{</div><div class='add'>+	if (bw &gt;= ARRAY_SIZE(pretty_bw))</div><div class='add'>+		return "unknown bw";</div><div class='add'>+</div><div class='add'>+	return pretty_bw[bw];</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_rs_pretty_bw);</div><div class='add'>+</div><div class='add'>+int rs_pretty_print_rate(char *buf, int bufsz, const u32 rate)</div><div class='add'>+{</div><div class='add'>+	char *type;</div><div class='add'>+	u8 mcs = 0, nss = 0;</div><div class='add'>+	u8 ant = (rate &amp; RATE_MCS_ANT_AB_MSK) &gt;&gt; RATE_MCS_ANT_POS;</div><div class='add'>+	u32 bw = (rate &amp; RATE_MCS_CHAN_WIDTH_MSK) &gt;&gt;</div><div class='add'>+		RATE_MCS_CHAN_WIDTH_POS;</div><div class='add'>+	u32 format = rate &amp; RATE_MCS_MOD_TYPE_MSK;</div><div class='add'>+	int index = 0;</div><div class='add'>+	bool sgi;</div><div class='add'>+</div><div class='add'>+	switch (format) {</div><div class='add'>+	case RATE_MCS_MOD_TYPE_LEGACY_OFDM:</div><div class='add'>+		index = IWL_FIRST_OFDM_RATE;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_CCK:</div><div class='add'>+		index += rate &amp; RATE_LEGACY_RATE_MSK;</div><div class='add'>+</div><div class='add'>+		return scnprintf(buf, bufsz, "Legacy | ANT: %s Rate: %s Mbps",</div><div class='add'>+				 iwl_rs_pretty_ant(ant),</div><div class='add'>+				 iwl_rate_mcs(index)-&gt;mbps);</div><div class='add'>+	case RATE_MCS_MOD_TYPE_VHT:</div><div class='add'>+		type = "VHT";</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_HT:</div><div class='add'>+		type = "HT";</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_HE:</div><div class='add'>+		type = "HE";</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_EHT:</div><div class='add'>+		type = "EHT";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		type = "Unknown"; /* shouldn't happen */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mcs = format == RATE_MCS_MOD_TYPE_HT ?</div><div class='add'>+		RATE_HT_MCS_INDEX(rate) :</div><div class='add'>+		rate &amp; RATE_MCS_CODE_MSK;</div><div class='add'>+	nss = u32_get_bits(rate, RATE_MCS_NSS_MSK);</div><div class='add'>+	sgi = format == RATE_MCS_MOD_TYPE_HE ?</div><div class='add'>+		iwl_he_is_sgi(rate) :</div><div class='add'>+		rate &amp; RATE_MCS_SGI_MSK;</div><div class='add'>+</div><div class='add'>+	return scnprintf(buf, bufsz,</div><div class='add'>+			 "0x%x: %s | ANT: %s BW: %s MCS: %d NSS: %d %s%s%s%s%s",</div><div class='add'>+			 rate, type, iwl_rs_pretty_ant(ant), iwl_rs_pretty_bw(bw), mcs, nss,</div><div class='add'>+			 (sgi) ? "SGI " : "NGI ",</div><div class='add'>+			 (rate &amp; RATE_MCS_STBC_MSK) ? "STBC " : "",</div><div class='add'>+			 (rate &amp; RATE_MCS_LDPC_MSK) ? "LDPC " : "",</div><div class='add'>+			 (rate &amp; RATE_HE_DUAL_CARRIER_MODE_MSK) ? "DCM " : "",</div><div class='add'>+			 (rate &amp; RATE_MCS_BF_MSK) ? "BF " : "");</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(rs_pretty_print_rate);</div><div class='add'>+</div><div class='add'>+bool iwl_he_is_sgi(u32 rate_n_flags)</div><div class='add'>+{</div><div class='add'>+	u32 type = rate_n_flags &amp; RATE_MCS_HE_TYPE_MSK;</div><div class='add'>+	u32 ltf_gi = rate_n_flags &amp; RATE_MCS_HE_GI_LTF_MSK;</div><div class='add'>+</div><div class='add'>+	if (type == RATE_MCS_HE_TYPE_SU ||</div><div class='add'>+	    type == RATE_MCS_HE_TYPE_EXT_SU)</div><div class='add'>+		return ltf_gi == RATE_MCS_HE_SU_4_LTF_08_GI;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_he_is_sgi);</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/runtime.h b/drivers/net/wireless/intel/iwlwifi/fw/runtime.h<br/>index 35af85a5430b..57570ff15622 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/runtime.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/runtime.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/runtime.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/runtime.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2018-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_fw_runtime_h__</div><div class='ctx'> #define __iwl_fw_runtime_h__</div><div class='hunk'>@@ -12,18 +12,20 @@</div><div class='ctx'> #include "fw/api/debug.h"</div><div class='ctx'> #include "fw/api/paging.h"</div><div class='ctx'> #include "fw/api/power.h"</div><div class='del'>-#include "iwl-eeprom-parse.h"</div><div class='add'>+#include "iwl-nvm-utils.h"</div><div class='ctx'> #include "fw/acpi.h"</div><div class='add'>+#include "fw/regulatory.h"</div><div class='ctx'> </div><div class='ctx'> struct iwl_fw_runtime_ops {</div><div class='del'>-	int (*dump_start)(void *ctx);</div><div class='add'>+	void (*dump_start)(void *ctx);</div><div class='ctx'> 	void (*dump_end)(void *ctx);</div><div class='del'>-	bool (*fw_running)(void *ctx);</div><div class='ctx'> 	int (*send_hcmd)(void *ctx, struct iwl_host_cmd *host_cmd);</div><div class='ctx'> 	bool (*d3_debug_enable)(void *ctx);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define MAX_NUM_LMAC 2</div><div class='add'>+#define MAX_NUM_TCM 2</div><div class='add'>+#define MAX_NUM_RCM 2</div><div class='ctx'> struct iwl_fwrt_shared_mem_cfg {</div><div class='ctx'> 	int num_lmacs;</div><div class='ctx'> 	int num_txfifo_entries;</div><div class='hunk'>@@ -43,6 +45,12 @@ struct iwl_fwrt_shared_mem_cfg {</div><div class='ctx'>  * struct iwl_fwrt_dump_data - dump data</div><div class='ctx'>  * @trig: trigger the worker was scheduled upon</div><div class='ctx'>  * @fw_pkt: packet received from FW</div><div class='add'>+ * @desc: dump descriptor</div><div class='add'>+ * @monitor_only: only dump for monitor</div><div class='add'>+ *</div><div class='add'>+ * Note that the decision which part of the union is used</div><div class='add'>+ * is based on iwl_trans_dbg_ini_valid(): the 'trig' part</div><div class='add'>+ * is used if it is %true, the 'desc' part otherwise.</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fwrt_dump_data {</div><div class='ctx'> 	union {</div><div class='hunk'>@@ -51,6 +59,7 @@ struct iwl_fwrt_dump_data {</div><div class='ctx'> 			struct iwl_rx_packet *fw_pkt;</div><div class='ctx'> 		};</div><div class='ctx'> 		struct {</div><div class='add'>+			/* must be first to be same as 'trig' */</div><div class='ctx'> 			const struct iwl_fw_dump_desc *desc;</div><div class='ctx'> 			bool monitor_only;</div><div class='ctx'> 		};</div><div class='hunk'>@@ -61,6 +70,7 @@ struct iwl_fwrt_dump_data {</div><div class='ctx'>  * struct iwl_fwrt_wk_data - dump worker data struct</div><div class='ctx'>  * @idx: index of the worker</div><div class='ctx'>  * @wk: worker</div><div class='add'>+ * @dump_data: dump data</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fwrt_wk_data  {</div><div class='ctx'> 	u8 idx;</div><div class='hunk'>@@ -84,8 +94,8 @@ struct iwl_txf_iter_data {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_fw_runtime - runtime data for firmware</div><div class='add'>+ * @trans: transport pointer</div><div class='ctx'>  * @fw: firmware image</div><div class='del'>- * @cfg: NIC configuration</div><div class='ctx'>  * @dev: device pointer</div><div class='ctx'>  * @ops: user ops</div><div class='ctx'>  * @ops_ctx: user ops context</div><div class='hunk'>@@ -96,6 +106,37 @@ struct iwl_txf_iter_data {</div><div class='ctx'>  * @cur_fw_img: current firmware image, must be maintained by</div><div class='ctx'>  *	the driver by calling &amp;iwl_fw_set_current_image()</div><div class='ctx'>  * @dump: debug dump data</div><div class='add'>+ * @uats_table: AP type table</div><div class='add'>+ * @uats_valid: is AP type table valid</div><div class='add'>+ * @uefi_tables_lock_status: The status of the WIFI GUID UEFI variables lock:</div><div class='add'>+ *	0: Unlocked, 1 and 2: Locked.</div><div class='add'>+ *	Only read the UEFI variables if locked.</div><div class='add'>+ * @sar_profiles: sar profiles as read from WRDS/EWRD BIOS tables</div><div class='add'>+ * @geo_profiles: geographic profiles as read from WGDS BIOS table</div><div class='add'>+ * @phy_filters: specific phy filters as read from WPFC BIOS table</div><div class='add'>+ * @ppag_bios_rev: PPAG BIOS revision</div><div class='add'>+ * @ppag_bios_source: see &amp;enum bios_source</div><div class='add'>+ * @acpi_dsm_funcs_valid: bitmap indicating which DSM values are valid,</div><div class='add'>+ *	zero (default initialization) means it hasn't been read yet,</div><div class='add'>+ *	and BIT(0) is set when it has since function 0 also has this</div><div class='add'>+ *	bitmap and is always supported</div><div class='add'>+ * @geo_enabled: WGDS table is present</div><div class='add'>+ * @geo_num_profiles: number of geo profiles</div><div class='add'>+ * @geo_rev: geo profiles table revision</div><div class='add'>+ * @ppag_chains: PPAG table data</div><div class='add'>+ * @ppag_flags: PPAG flags</div><div class='add'>+ * @reduced_power_flags: reduced power flags</div><div class='add'>+ * @sanitize_ctx: context for dump sanitizer</div><div class='add'>+ * @sanitize_ops: dump sanitizer ops</div><div class='add'>+ * @sar_chain_a_profile: SAR chain A profile</div><div class='add'>+ * @sar_chain_b_profile: SAR chain B profile</div><div class='add'>+ * @sgom_enabled: SGOM enabled</div><div class='add'>+ * @sgom_table: SGOM table</div><div class='add'>+ * @timestamp: timestamp marker data</div><div class='add'>+ * @timestamp.wk: timestamp marking worker</div><div class='add'>+ * @timestamp.seq: timestamp marking sequence</div><div class='add'>+ * @timestamp.delay: timestamp marking worker delay</div><div class='add'>+ * @tpc_enabled: TPC enabled</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_fw_runtime {</div><div class='ctx'> 	struct iwl_trans *trans;</div><div class='hunk'>@@ -105,6 +146,9 @@ struct iwl_fw_runtime {</div><div class='ctx'> 	const struct iwl_fw_runtime_ops *ops;</div><div class='ctx'> 	void *ops_ctx;</div><div class='ctx'> </div><div class='add'>+	const struct iwl_dump_sanitize_ops *sanitize_ops;</div><div class='add'>+	void *sanitize_ctx;</div><div class='add'>+</div><div class='ctx'> 	/* Paging */</div><div class='ctx'> 	struct iwl_fw_paging fw_paging_db[NUM_OF_FW_PAGING_BLOCKS];</div><div class='ctx'> 	u16 num_of_paging_blk;</div><div class='hunk'>@@ -139,28 +183,45 @@ struct iwl_fw_runtime {</div><div class='ctx'> 			u32 umac_minor;</div><div class='ctx'> 		} fw_ver;</div><div class='ctx'> 	} dump;</div><div class='del'>-#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> 	struct {</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> 		struct delayed_work wk;</div><div class='ctx'> 		u32 delay;</div><div class='add'>+#endif</div><div class='ctx'> 		u64 seq;</div><div class='ctx'> 	} timestamp;</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> 	bool tpc_enabled;</div><div class='ctx'> #endif /* CONFIG_IWLWIFI_DEBUGFS */</div><div class='del'>-#ifdef CONFIG_ACPI</div><div class='del'>-	struct iwl_sar_profile sar_profiles[ACPI_SAR_PROFILE_NUM];</div><div class='add'>+	struct iwl_sar_profile sar_profiles[BIOS_SAR_MAX_PROFILE_NUM];</div><div class='ctx'> 	u8 sar_chain_a_profile;</div><div class='ctx'> 	u8 sar_chain_b_profile;</div><div class='del'>-	struct iwl_geo_profile geo_profiles[ACPI_NUM_GEO_PROFILES];</div><div class='add'>+	u8 reduced_power_flags;</div><div class='add'>+	struct iwl_geo_profile geo_profiles[BIOS_GEO_MAX_PROFILE_NUM];</div><div class='ctx'> 	u32 geo_rev;</div><div class='del'>-	union iwl_ppag_table_cmd ppag_table;</div><div class='del'>-	u32 ppag_ver;</div><div class='add'>+	u32 geo_num_profiles;</div><div class='add'>+	bool geo_enabled;</div><div class='add'>+	struct iwl_ppag_chain ppag_chains[IWL_NUM_CHAIN_LIMITS];</div><div class='add'>+	u32 ppag_flags;</div><div class='add'>+	u8 ppag_bios_rev;</div><div class='add'>+	u8 ppag_bios_source;</div><div class='add'>+	struct iwl_sar_offset_mapping_cmd sgom_table;</div><div class='add'>+	bool sgom_enabled;</div><div class='add'>+	struct iwl_mcc_allowed_ap_type_cmd uats_table;</div><div class='add'>+	bool uats_valid;</div><div class='add'>+	u8 uefi_tables_lock_status;</div><div class='add'>+	struct iwl_phy_specific_cfg phy_filters;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ACPI</div><div class='add'>+	u32 acpi_dsm_funcs_valid;</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void iwl_fw_runtime_init(struct iwl_fw_runtime *fwrt, struct iwl_trans *trans,</div><div class='ctx'> 			const struct iwl_fw *fw,</div><div class='ctx'> 			const struct iwl_fw_runtime_ops *ops, void *ops_ctx,</div><div class='add'>+			const struct iwl_dump_sanitize_ops *sanitize_ops,</div><div class='add'>+			void *sanitize_ctx,</div><div class='ctx'> 			struct dentry *dbgfs_dir);</div><div class='ctx'> </div><div class='ctx'> static inline void iwl_fw_runtime_free(struct iwl_fw_runtime *fwrt)</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/smem.c b/drivers/net/wireless/intel/iwlwifi/fw/smem.c<br/>index f2f1789f470d..90fd69b4860c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/smem.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/fw/smem.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/smem.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/smem.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2021, 2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -89,7 +89,7 @@ void iwl_get_shared_mem_conf(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> </div><div class='ctx'> 	if (fw_has_capa(&amp;fwrt-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 			IWL_UCODE_TLV_CAPA_EXTEND_SHARED_MEM_CFG))</div><div class='del'>-		cmd.id = iwl_cmd_id(SHARED_MEM_CFG_CMD, SYSTEM_GROUP, 0);</div><div class='add'>+		cmd.id = WIDE_ID(SYSTEM_GROUP, SHARED_MEM_CFG_CMD);</div><div class='ctx'> 	else</div><div class='ctx'> 		cmd.id = SHARED_MEM_CFG;</div><div class='ctx'> </div><div class='hunk'>@@ -102,7 +102,7 @@ void iwl_get_shared_mem_conf(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pkt = cmd.resp_pkt;</div><div class='del'>-	if (fwrt-&gt;trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_22000)</div><div class='add'>+	if (fwrt-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_22000)</div><div class='ctx'> 		iwl_parse_shared_mem_22000(fwrt, pkt);</div><div class='ctx'> 	else</div><div class='ctx'> 		iwl_parse_shared_mem(fwrt, pkt);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/uefi.c b/drivers/net/wireless/intel/iwlwifi/fw/uefi.c<br/>new file mode 100644<br/>index 000000000000..4ae4d215e633<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/uefi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/uefi.c</a></div><div class='hunk'>@@ -0,0 +1,845 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright(c) 2021-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "iwl-drv.h"</div><div class='add'>+#include "pnvm.h"</div><div class='add'>+#include "iwl-prph.h"</div><div class='add'>+#include "iwl-io.h"</div><div class='add'>+</div><div class='add'>+#include "fw/uefi.h"</div><div class='add'>+#include "fw/api/alive.h"</div><div class='add'>+#include &lt;linux/efi.h&gt;</div><div class='add'>+#include "fw/runtime.h"</div><div class='add'>+</div><div class='add'>+#define IWL_EFI_WIFI_GUID	EFI_GUID(0x92daaf2f, 0xc02b, 0x455b,	\</div><div class='add'>+					 0xb2, 0xec, 0xf5, 0xa3,	\</div><div class='add'>+					 0x59, 0x4f, 0x4a, 0xea)</div><div class='add'>+#define IWL_EFI_WIFI_BT_GUID	EFI_GUID(0xe65d8884, 0xd4af, 0x4b20,	\</div><div class='add'>+					 0x8d, 0x03, 0x77, 0x2e,	\</div><div class='add'>+					 0xcc, 0x3d, 0xa5, 0x31)</div><div class='add'>+</div><div class='add'>+struct iwl_uefi_pnvm_mem_desc {</div><div class='add'>+	__le32 addr;</div><div class='add'>+	__le32 size;</div><div class='add'>+	const u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+static void *iwl_uefi_get_variable(efi_char16_t *name, efi_guid_t *guid,</div><div class='add'>+				   unsigned long *data_size)</div><div class='add'>+{</div><div class='add'>+	efi_status_t status;</div><div class='add'>+	void *data;</div><div class='add'>+</div><div class='add'>+	if (!data_size)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	if (!efi_rt_services_supported(EFI_RT_SUPPORTED_GET_VARIABLE))</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='add'>+</div><div class='add'>+	/* first call with NULL data to get the exact entry size */</div><div class='add'>+	*data_size = 0;</div><div class='add'>+	status = efi.get_variable(name, guid, NULL, data_size, NULL);</div><div class='add'>+	if (status != EFI_BUFFER_TOO_SMALL || !*data_size)</div><div class='add'>+		return ERR_PTR(-EIO);</div><div class='add'>+</div><div class='add'>+	data = kmalloc(*data_size, GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	status = efi.get_variable(name, guid, NULL, data_size, data);</div><div class='add'>+	if (status != EFI_SUCCESS) {</div><div class='add'>+		kfree(data);</div><div class='add'>+		return ERR_PTR(-ENOENT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *iwl_uefi_get_pnvm(struct iwl_trans *trans, size_t *len)</div><div class='add'>+{</div><div class='add'>+	unsigned long package_size;</div><div class='add'>+	void *data;</div><div class='add'>+</div><div class='add'>+	*len = 0;</div><div class='add'>+</div><div class='add'>+	data = iwl_uefi_get_variable(IWL_UEFI_OEM_PNVM_NAME, &amp;IWL_EFI_WIFI_GUID,</div><div class='add'>+				     &amp;package_size);</div><div class='add'>+	if (IS_ERR(data)) {</div><div class='add'>+		IWL_DEBUG_FW(trans,</div><div class='add'>+			     "PNVM UEFI variable not found 0x%lx (len %lu)\n",</div><div class='add'>+			     PTR_ERR(data), package_size);</div><div class='add'>+		return data;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_FW(trans, "Read PNVM from UEFI with size %lu\n", package_size);</div><div class='add'>+	*len = package_size;</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *</div><div class='add'>+iwl_uefi_get_verified_variable_guid(struct iwl_trans *trans,</div><div class='add'>+				    efi_guid_t *guid,</div><div class='add'>+				    efi_char16_t *uefi_var_name,</div><div class='add'>+				    char *var_name,</div><div class='add'>+				    unsigned int expected_size,</div><div class='add'>+				    unsigned long *size)</div><div class='add'>+{</div><div class='add'>+	void *var;</div><div class='add'>+	unsigned long var_size;</div><div class='add'>+</div><div class='add'>+	var = iwl_uefi_get_variable(uefi_var_name, guid, &amp;var_size);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(var)) {</div><div class='add'>+		IWL_DEBUG_RADIO(trans,</div><div class='add'>+				"%s UEFI variable not found 0x%lx\n", var_name,</div><div class='add'>+				PTR_ERR(var));</div><div class='add'>+		return var;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (var_size &lt; expected_size) {</div><div class='add'>+		IWL_DEBUG_RADIO(trans,</div><div class='add'>+				"Invalid %s UEFI variable len (%lu)\n",</div><div class='add'>+				var_name, var_size);</div><div class='add'>+		kfree(var);</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_RADIO(trans, "%s from UEFI with size %lu\n", var_name,</div><div class='add'>+			var_size);</div><div class='add'>+</div><div class='add'>+	if (size)</div><div class='add'>+		*size = var_size;</div><div class='add'>+	return var;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *</div><div class='add'>+iwl_uefi_get_verified_variable(struct iwl_trans *trans,</div><div class='add'>+			       efi_char16_t *uefi_var_name,</div><div class='add'>+			       char *var_name,</div><div class='add'>+			       unsigned int expected_size,</div><div class='add'>+			       unsigned long *size)</div><div class='add'>+{</div><div class='add'>+	return iwl_uefi_get_verified_variable_guid(trans, &amp;IWL_EFI_WIFI_GUID,</div><div class='add'>+						   uefi_var_name, var_name,</div><div class='add'>+						   expected_size, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_uefi_handle_tlv_mem_desc(struct iwl_trans *trans, const u8 *data,</div><div class='add'>+				 u32 tlv_len, struct iwl_pnvm_image *pnvm_data)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_uefi_pnvm_mem_desc *desc = (const void *)data;</div><div class='add'>+	u32 data_len;</div><div class='add'>+</div><div class='add'>+	if (tlv_len &lt; sizeof(*desc)) {</div><div class='add'>+		IWL_DEBUG_FW(trans, "TLV len (%d) is too small\n", tlv_len);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data_len = tlv_len - sizeof(*desc);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_FW(trans,</div><div class='add'>+		     "Handle IWL_UCODE_TLV_MEM_DESC, len %d data_len %d\n",</div><div class='add'>+		     tlv_len, data_len);</div><div class='add'>+</div><div class='add'>+	if (le32_to_cpu(desc-&gt;size) != data_len) {</div><div class='add'>+		IWL_DEBUG_FW(trans, "invalid mem desc size %d\n", desc-&gt;size);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pnvm_data-&gt;n_chunks == IPC_DRAM_MAP_ENTRY_NUM_MAX) {</div><div class='add'>+		IWL_DEBUG_FW(trans, "too many payloads to allocate in DRAM.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_FW(trans, "Adding data (size %d)\n", data_len);</div><div class='add'>+</div><div class='add'>+	pnvm_data-&gt;chunks[pnvm_data-&gt;n_chunks].data = desc-&gt;data;</div><div class='add'>+	pnvm_data-&gt;chunks[pnvm_data-&gt;n_chunks].len = data_len;</div><div class='add'>+	pnvm_data-&gt;n_chunks++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_uefi_reduce_power_section(struct iwl_trans *trans,</div><div class='add'>+					 const u8 *data, size_t len,</div><div class='add'>+					 struct iwl_pnvm_image *pnvm_data)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_ucode_tlv *tlv;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_FW(trans, "Handling REDUCE_POWER section\n");</div><div class='add'>+	memset(pnvm_data, 0, sizeof(*pnvm_data));</div><div class='add'>+</div><div class='add'>+	while (len &gt;= sizeof(*tlv)) {</div><div class='add'>+		u32 tlv_len, tlv_type;</div><div class='add'>+</div><div class='add'>+		len -= sizeof(*tlv);</div><div class='add'>+		tlv = (const void *)data;</div><div class='add'>+</div><div class='add'>+		tlv_len = le32_to_cpu(tlv-&gt;length);</div><div class='add'>+		tlv_type = le32_to_cpu(tlv-&gt;type);</div><div class='add'>+</div><div class='add'>+		if (len &lt; tlv_len) {</div><div class='add'>+			IWL_ERR(trans, "invalid TLV len: %zd/%u\n",</div><div class='add'>+				len, tlv_len);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		data += sizeof(*tlv);</div><div class='add'>+</div><div class='add'>+		switch (tlv_type) {</div><div class='add'>+		case IWL_UCODE_TLV_MEM_DESC:</div><div class='add'>+			if (iwl_uefi_handle_tlv_mem_desc(trans, data, tlv_len,</div><div class='add'>+							 pnvm_data))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_UCODE_TLV_PNVM_SKU:</div><div class='add'>+			IWL_DEBUG_FW(trans,</div><div class='add'>+				     "New REDUCE_POWER section started, stop parsing.\n");</div><div class='add'>+			goto done;</div><div class='add'>+		default:</div><div class='add'>+			IWL_DEBUG_FW(trans, "Found TLV 0x%0x, len %d\n",</div><div class='add'>+				     tlv_type, tlv_len);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		len -= ALIGN(tlv_len, 4);</div><div class='add'>+		data += ALIGN(tlv_len, 4);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	if (!pnvm_data-&gt;n_chunks) {</div><div class='add'>+		IWL_DEBUG_FW(trans, "Empty REDUCE_POWER, skipping.\n");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_uefi_reduce_power_parse(struct iwl_trans *trans,</div><div class='add'>+				const u8 *data, size_t len,</div><div class='add'>+				struct iwl_pnvm_image *pnvm_data,</div><div class='add'>+				__le32 sku_id[3])</div><div class='add'>+{</div><div class='add'>+	const struct iwl_ucode_tlv *tlv;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_FW(trans, "Parsing REDUCE_POWER data\n");</div><div class='add'>+</div><div class='add'>+	while (len &gt;= sizeof(*tlv)) {</div><div class='add'>+		u32 tlv_len, tlv_type;</div><div class='add'>+</div><div class='add'>+		len -= sizeof(*tlv);</div><div class='add'>+		tlv = (const void *)data;</div><div class='add'>+</div><div class='add'>+		tlv_len = le32_to_cpu(tlv-&gt;length);</div><div class='add'>+		tlv_type = le32_to_cpu(tlv-&gt;type);</div><div class='add'>+</div><div class='add'>+		if (len &lt; tlv_len) {</div><div class='add'>+			IWL_ERR(trans, "invalid TLV len: %zd/%u\n",</div><div class='add'>+				len, tlv_len);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (tlv_type == IWL_UCODE_TLV_PNVM_SKU) {</div><div class='add'>+			const struct iwl_sku_id *tlv_sku_id =</div><div class='add'>+				(const void *)(data + sizeof(*tlv));</div><div class='add'>+</div><div class='add'>+			IWL_DEBUG_FW(trans,</div><div class='add'>+				     "Got IWL_UCODE_TLV_PNVM_SKU len %d\n",</div><div class='add'>+				     tlv_len);</div><div class='add'>+			IWL_DEBUG_FW(trans, "sku_id 0x%0x 0x%0x 0x%0x\n",</div><div class='add'>+				     le32_to_cpu(tlv_sku_id-&gt;data[0]),</div><div class='add'>+				     le32_to_cpu(tlv_sku_id-&gt;data[1]),</div><div class='add'>+				     le32_to_cpu(tlv_sku_id-&gt;data[2]));</div><div class='add'>+</div><div class='add'>+			data += sizeof(*tlv) + ALIGN(tlv_len, 4);</div><div class='add'>+			len -= ALIGN(tlv_len, 4);</div><div class='add'>+</div><div class='add'>+			if (sku_id[0] == tlv_sku_id-&gt;data[0] &amp;&amp;</div><div class='add'>+			    sku_id[1] == tlv_sku_id-&gt;data[1] &amp;&amp;</div><div class='add'>+			    sku_id[2] == tlv_sku_id-&gt;data[2]) {</div><div class='add'>+				int ret = iwl_uefi_reduce_power_section(trans,</div><div class='add'>+								    data, len,</div><div class='add'>+								    pnvm_data);</div><div class='add'>+				if (!ret)</div><div class='add'>+					return 0;</div><div class='add'>+			} else {</div><div class='add'>+				IWL_DEBUG_FW(trans, "SKU ID didn't match!\n");</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			data += sizeof(*tlv) + ALIGN(tlv_len, 4);</div><div class='add'>+			len -= ALIGN(tlv_len, 4);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 *iwl_uefi_get_reduced_power(struct iwl_trans *trans, size_t *len)</div><div class='add'>+{</div><div class='add'>+	struct pnvm_sku_package *package;</div><div class='add'>+	unsigned long package_size;</div><div class='add'>+	u8 *data;</div><div class='add'>+</div><div class='add'>+	package = iwl_uefi_get_verified_variable(trans,</div><div class='add'>+						 IWL_UEFI_REDUCED_POWER_NAME,</div><div class='add'>+						 "Reduced Power",</div><div class='add'>+						 sizeof(*package),</div><div class='add'>+						 &amp;package_size);</div><div class='add'>+	if (IS_ERR(package))</div><div class='add'>+		return ERR_CAST(package);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_FW(trans, "rev %d, total_size %d, n_skus %d\n",</div><div class='add'>+		     package-&gt;rev, package-&gt;total_size, package-&gt;n_skus);</div><div class='add'>+</div><div class='add'>+	*len = package_size - sizeof(*package);</div><div class='add'>+	data = kmemdup(package-&gt;data, *len, GFP_KERNEL);</div><div class='add'>+	if (!data) {</div><div class='add'>+		kfree(package);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(package);</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_uefi_step_parse(struct uefi_cnv_common_step_data *common_step_data,</div><div class='add'>+			       struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	if (common_step_data-&gt;revision != 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	trans-&gt;conf.mbx_addr_0_step =</div><div class='add'>+		(u32)common_step_data-&gt;revision |</div><div class='add'>+		(u32)common_step_data-&gt;cnvi_eq_channel &lt;&lt; 8 |</div><div class='add'>+		(u32)common_step_data-&gt;cnvr_eq_channel &lt;&lt; 16 |</div><div class='add'>+		(u32)common_step_data-&gt;radio1 &lt;&lt; 24;</div><div class='add'>+	trans-&gt;conf.mbx_addr_1_step = (u32)common_step_data-&gt;radio2;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_uefi_get_step_table(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct uefi_cnv_common_step_data *data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	data = iwl_uefi_get_verified_variable_guid(trans, &amp;IWL_EFI_WIFI_BT_GUID,</div><div class='add'>+						   IWL_UEFI_STEP_NAME,</div><div class='add'>+						   "STEP", sizeof(*data), NULL);</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = iwl_uefi_step_parse(data, trans);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		IWL_DEBUG_FW(trans, "Cannot read STEP tables. rev is invalid\n");</div><div class='add'>+</div><div class='add'>+	kfree(data);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_uefi_get_step_table);</div><div class='add'>+</div><div class='add'>+static int iwl_uefi_sgom_parse(struct uefi_cnv_wlan_sgom_data *sgom_data,</div><div class='add'>+			       struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	if (sgom_data-&gt;revision != 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memcpy(fwrt-&gt;sgom_table.offset_map, sgom_data-&gt;offset_map,</div><div class='add'>+	       sizeof(fwrt-&gt;sgom_table.offset_map));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MCC_TO_SAR_OFFSET_TABLE_ROW_SIZE; i++) {</div><div class='add'>+		for (j = 0; j &lt; MCC_TO_SAR_OFFSET_TABLE_COL_SIZE; j++) {</div><div class='add'>+			/* since each byte is composed of to values, */</div><div class='add'>+			/* one for each letter, */</div><div class='add'>+			/* extract and check each of them separately */</div><div class='add'>+			u8 value = fwrt-&gt;sgom_table.offset_map[i][j];</div><div class='add'>+			u8 low = value &amp; 0xF;</div><div class='add'>+			u8 high = (value &amp; 0xF0) &gt;&gt; 4;</div><div class='add'>+</div><div class='add'>+			if (high &gt; fwrt-&gt;geo_num_profiles)</div><div class='add'>+				high = 0;</div><div class='add'>+			if (low &gt; fwrt-&gt;geo_num_profiles)</div><div class='add'>+				low = 0;</div><div class='add'>+			fwrt-&gt;sgom_table.offset_map[i][j] = (high &lt;&lt; 4) | low;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fwrt-&gt;sgom_enabled = true;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_uefi_get_sgom_table(struct iwl_trans *trans,</div><div class='add'>+			     struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	struct uefi_cnv_wlan_sgom_data *data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!fwrt-&gt;geo_enabled)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	data = iwl_uefi_get_verified_variable(trans, IWL_UEFI_SGOM_NAME,</div><div class='add'>+					      "SGOM", sizeof(*data), NULL);</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = iwl_uefi_sgom_parse(data, fwrt);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		IWL_DEBUG_FW(trans, "Cannot read SGOM tables. rev is invalid\n");</div><div class='add'>+</div><div class='add'>+	kfree(data);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_uefi_get_sgom_table);</div><div class='add'>+</div><div class='add'>+static int iwl_uefi_uats_parse(struct uefi_cnv_wlan_uats_data *uats_data,</div><div class='add'>+			       struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	if (uats_data-&gt;revision != 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memcpy(fwrt-&gt;uats_table.offset_map, uats_data-&gt;offset_map,</div><div class='add'>+	       sizeof(fwrt-&gt;uats_table.offset_map));</div><div class='add'>+</div><div class='add'>+	fwrt-&gt;uats_valid = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_uefi_get_uats_table(struct iwl_trans *trans,</div><div class='add'>+			     struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	struct uefi_cnv_wlan_uats_data *data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	data = iwl_uefi_get_verified_variable(trans, IWL_UEFI_UATS_NAME,</div><div class='add'>+					      "UATS", sizeof(*data), NULL);</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = iwl_uefi_uats_parse(data, fwrt);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		IWL_DEBUG_FW(trans, "Cannot read UATS table. rev is invalid\n");</div><div class='add'>+	kfree(data);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_uefi_get_uats_table);</div><div class='add'>+</div><div class='add'>+static void iwl_uefi_set_sar_profile(struct iwl_fw_runtime *fwrt,</div><div class='add'>+				     struct uefi_sar_profile *uefi_sar_prof,</div><div class='add'>+				     u8 prof_index, bool enabled)</div><div class='add'>+{</div><div class='add'>+	memcpy(&amp;fwrt-&gt;sar_profiles[prof_index].chains, uefi_sar_prof,</div><div class='add'>+	       sizeof(struct uefi_sar_profile));</div><div class='add'>+</div><div class='add'>+	fwrt-&gt;sar_profiles[prof_index].enabled = enabled &amp; IWL_SAR_ENABLE_MSK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_uefi_get_wrds_table(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	struct uefi_cnv_var_wrds *data;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	data = iwl_uefi_get_verified_variable(fwrt-&gt;trans, IWL_UEFI_WRDS_NAME,</div><div class='add'>+					      "WRDS", sizeof(*data), NULL);</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;revision != IWL_UEFI_WRDS_REVISION) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "Unsupported UEFI WRDS revision:%d\n",</div><div class='add'>+				data-&gt;revision);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The profile from WRDS is officially profile 1, but goes</div><div class='add'>+	 * into sar_profiles[0] (because we don't have a profile 0).</div><div class='add'>+	 */</div><div class='add'>+	iwl_uefi_set_sar_profile(fwrt, &amp;data-&gt;sar_profile, 0, data-&gt;mode);</div><div class='add'>+out:</div><div class='add'>+	kfree(data);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_uefi_get_ewrd_table(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	struct uefi_cnv_var_ewrd *data;</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+</div><div class='add'>+	data = iwl_uefi_get_verified_variable(fwrt-&gt;trans, IWL_UEFI_EWRD_NAME,</div><div class='add'>+					      "EWRD", sizeof(*data), NULL);</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;revision != IWL_UEFI_EWRD_REVISION) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "Unsupported UEFI EWRD revision:%d\n",</div><div class='add'>+				data-&gt;revision);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;num_profiles &gt;= BIOS_SAR_MAX_PROFILE_NUM) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; data-&gt;num_profiles; i++)</div><div class='add'>+		/* The EWRD profiles officially go from 2 to 4, but we</div><div class='add'>+		 * save them in sar_profiles[1-3] (because we don't</div><div class='add'>+		 * have profile 0).  So in the array we start from 1.</div><div class='add'>+		 */</div><div class='add'>+		iwl_uefi_set_sar_profile(fwrt, &amp;data-&gt;sar_profiles[i], i + 1,</div><div class='add'>+					 data-&gt;mode);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(data);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_uefi_get_wgds_table(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	struct uefi_cnv_var_wgds *data;</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+</div><div class='add'>+	data = iwl_uefi_get_verified_variable(fwrt-&gt;trans, IWL_UEFI_WGDS_NAME,</div><div class='add'>+					      "WGDS", sizeof(*data), NULL);</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;revision != IWL_UEFI_WGDS_REVISION) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "Unsupported UEFI WGDS revision:%d\n",</div><div class='add'>+				data-&gt;revision);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;num_profiles &lt; BIOS_GEO_MIN_PROFILE_NUM ||</div><div class='add'>+	    data-&gt;num_profiles &gt; BIOS_GEO_MAX_PROFILE_NUM) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "Invalid number of profiles in WGDS: %d\n",</div><div class='add'>+				data-&gt;num_profiles);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fwrt-&gt;geo_rev = data-&gt;revision;</div><div class='add'>+	for (i = 0; i &lt; data-&gt;num_profiles; i++)</div><div class='add'>+		memcpy(&amp;fwrt-&gt;geo_profiles[i], &amp;data-&gt;geo_profiles[i],</div><div class='add'>+		       sizeof(struct iwl_geo_profile));</div><div class='add'>+</div><div class='add'>+	fwrt-&gt;geo_num_profiles = data-&gt;num_profiles;</div><div class='add'>+	fwrt-&gt;geo_enabled = true;</div><div class='add'>+out:</div><div class='add'>+	kfree(data);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_uefi_get_ppag_table(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	struct uefi_cnv_var_ppag *data;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	data = iwl_uefi_get_verified_variable(fwrt-&gt;trans, IWL_UEFI_PPAG_NAME,</div><div class='add'>+					      "PPAG", sizeof(*data), NULL);</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;revision &lt; IWL_UEFI_MIN_PPAG_REV ||</div><div class='add'>+	    data-&gt;revision &gt; IWL_UEFI_MAX_PPAG_REV) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "Unsupported UEFI PPAG revision:%d\n",</div><div class='add'>+				data-&gt;revision);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fwrt-&gt;ppag_bios_rev = data-&gt;revision;</div><div class='add'>+	fwrt-&gt;ppag_flags = iwl_bios_get_ppag_flags(data-&gt;ppag_modes,</div><div class='add'>+						   fwrt-&gt;ppag_bios_rev);</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(fwrt-&gt;ppag_chains) != sizeof(data-&gt;ppag_chains));</div><div class='add'>+	memcpy(&amp;fwrt-&gt;ppag_chains, &amp;data-&gt;ppag_chains,</div><div class='add'>+	       sizeof(data-&gt;ppag_chains));</div><div class='add'>+	fwrt-&gt;ppag_bios_source = BIOS_SOURCE_UEFI;</div><div class='add'>+out:</div><div class='add'>+	kfree(data);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_uefi_get_tas_table(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			   struct iwl_tas_data *tas_data)</div><div class='add'>+{</div><div class='add'>+	struct uefi_cnv_var_wtas *uefi_tas;</div><div class='add'>+	int ret, enabled;</div><div class='add'>+</div><div class='add'>+	uefi_tas = iwl_uefi_get_verified_variable(fwrt-&gt;trans, IWL_UEFI_WTAS_NAME,</div><div class='add'>+						  "WTAS", sizeof(*uefi_tas), NULL);</div><div class='add'>+	if (IS_ERR(uefi_tas))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (uefi_tas-&gt;revision &lt; IWL_UEFI_MIN_WTAS_REVISION ||</div><div class='add'>+	    uefi_tas-&gt;revision &gt; IWL_UEFI_MAX_WTAS_REVISION) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "Unsupported UEFI WTAS revision:%d\n",</div><div class='add'>+				uefi_tas-&gt;revision);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_RADIO(fwrt, "TAS selection as read from BIOS: 0x%x\n",</div><div class='add'>+			uefi_tas-&gt;tas_selection);</div><div class='add'>+</div><div class='add'>+	enabled = uefi_tas-&gt;tas_selection &amp; IWL_WTAS_ENABLED_MSK;</div><div class='add'>+	tas_data-&gt;table_source = BIOS_SOURCE_UEFI;</div><div class='add'>+	tas_data-&gt;table_revision = uefi_tas-&gt;revision;</div><div class='add'>+	tas_data-&gt;tas_selection = uefi_tas-&gt;tas_selection;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_RADIO(fwrt, "TAS %s enabled\n",</div><div class='add'>+			enabled ? "is" : "not");</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_RADIO(fwrt, "Reading TAS table revision %d\n",</div><div class='add'>+			uefi_tas-&gt;revision);</div><div class='add'>+	if (uefi_tas-&gt;black_list_size &gt; IWL_WTAS_BLACK_LIST_MAX) {</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "TAS invalid array size %d\n",</div><div class='add'>+				uefi_tas-&gt;black_list_size);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tas_data-&gt;block_list_size = uefi_tas-&gt;black_list_size;</div><div class='add'>+	IWL_DEBUG_RADIO(fwrt, "TAS array size %u\n", uefi_tas-&gt;black_list_size);</div><div class='add'>+</div><div class='add'>+	for (u8 i = 0; i &lt; uefi_tas-&gt;black_list_size; i++) {</div><div class='add'>+		tas_data-&gt;block_list_array[i] = uefi_tas-&gt;black_list[i];</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "TAS block list country %d\n",</div><div class='add'>+				uefi_tas-&gt;black_list[i]);</div><div class='add'>+	}</div><div class='add'>+	ret = enabled;</div><div class='add'>+out:</div><div class='add'>+	kfree(uefi_tas);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_uefi_get_pwr_limit(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			   u64 *dflt_pwr_limit)</div><div class='add'>+{</div><div class='add'>+	struct uefi_cnv_var_splc *data;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	data = iwl_uefi_get_verified_variable(fwrt-&gt;trans, IWL_UEFI_SPLC_NAME,</div><div class='add'>+					      "SPLC", sizeof(*data), NULL);</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;revision != IWL_UEFI_SPLC_REVISION) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "Unsupported UEFI SPLC revision:%d\n",</div><div class='add'>+				data-&gt;revision);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	*dflt_pwr_limit = data-&gt;default_pwr_limit;</div><div class='add'>+out:</div><div class='add'>+	kfree(data);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_uefi_get_mcc(struct iwl_fw_runtime *fwrt, char *mcc)</div><div class='add'>+{</div><div class='add'>+	struct uefi_cnv_var_wrdd *data;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	data = iwl_uefi_get_verified_variable(fwrt-&gt;trans, IWL_UEFI_WRDD_NAME,</div><div class='add'>+					      "WRDD", sizeof(*data), NULL);</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;revision != IWL_UEFI_WRDD_REVISION) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "Unsupported UEFI WRDD revision:%d\n",</div><div class='add'>+				data-&gt;revision);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;mcc != BIOS_MCC_CHINA) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "UEFI WRDD is supported only for CN\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mcc[0] = (data-&gt;mcc &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	mcc[1] = data-&gt;mcc &amp; 0xff;</div><div class='add'>+	mcc[2] = '\0';</div><div class='add'>+out:</div><div class='add'>+	kfree(data);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_uefi_get_eckv(struct iwl_fw_runtime *fwrt, u32 *extl_clk)</div><div class='add'>+{</div><div class='add'>+	struct uefi_cnv_var_eckv *data;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	data = iwl_uefi_get_verified_variable_guid(fwrt-&gt;trans,</div><div class='add'>+						   &amp;IWL_EFI_WIFI_BT_GUID,</div><div class='add'>+						   IWL_UEFI_ECKV_NAME,</div><div class='add'>+						   "ECKV", sizeof(*data), NULL);</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;revision != IWL_UEFI_ECKV_REVISION) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "Unsupported UEFI ECKV revision:%d\n",</div><div class='add'>+				data-&gt;revision);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	*extl_clk = data-&gt;ext_clock_valid;</div><div class='add'>+out:</div><div class='add'>+	kfree(data);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_uefi_get_wbem(struct iwl_fw_runtime *fwrt, u32 *value)</div><div class='add'>+{</div><div class='add'>+	struct uefi_cnv_wlan_wbem_data *data;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	data = iwl_uefi_get_verified_variable(fwrt-&gt;trans, IWL_UEFI_WBEM_NAME,</div><div class='add'>+					      "WBEM", sizeof(*data), NULL);</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;revision != IWL_UEFI_WBEM_REVISION) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "Unsupported UEFI WBEM revision:%d\n",</div><div class='add'>+				data-&gt;revision);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	*value = data-&gt;wbem_320mhz_per_mcc &amp; IWL_UEFI_WBEM_REV0_MASK;</div><div class='add'>+	IWL_DEBUG_RADIO(fwrt, "Loaded WBEM config from UEFI\n");</div><div class='add'>+out:</div><div class='add'>+	kfree(data);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_uefi_get_dsm(struct iwl_fw_runtime *fwrt, enum iwl_dsm_funcs func,</div><div class='add'>+		     u32 *value)</div><div class='add'>+{</div><div class='add'>+	struct uefi_cnv_var_general_cfg *data;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(data-&gt;functions) &lt; DSM_FUNC_NUM_FUNCS);</div><div class='add'>+</div><div class='add'>+	/* Not supported function index */</div><div class='add'>+	if (func &gt;= DSM_FUNC_NUM_FUNCS || func == 5)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	data = iwl_uefi_get_verified_variable(fwrt-&gt;trans, IWL_UEFI_DSM_NAME,</div><div class='add'>+					      "DSM", sizeof(*data), NULL);</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;revision != IWL_UEFI_DSM_REVISION) {</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "Unsupported UEFI DSM revision:%d\n",</div><div class='add'>+				data-&gt;revision);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(data-&gt;functions[DSM_FUNC_QUERY] &amp; BIT(func))) {</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "DSM func %d not in 0x%x\n",</div><div class='add'>+				func, data-&gt;functions[DSM_FUNC_QUERY]);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*value = data-&gt;functions[func];</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_RADIO(fwrt,</div><div class='add'>+			"UEFI: DSM func=%d: value=%d\n", func, *value);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+out:</div><div class='add'>+	kfree(data);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_uefi_get_puncturing(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	struct uefi_cnv_var_puncturing_data *data;</div><div class='add'>+	/* default value is not enabled if there is any issue in reading</div><div class='add'>+	 * uefi variable or revision is not supported</div><div class='add'>+	 */</div><div class='add'>+	int puncturing = 0;</div><div class='add'>+</div><div class='add'>+	data = iwl_uefi_get_verified_variable(fwrt-&gt;trans,</div><div class='add'>+					      IWL_UEFI_PUNCTURING_NAME,</div><div class='add'>+					      "UefiCnvWlanPuncturing",</div><div class='add'>+					      sizeof(*data), NULL);</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return puncturing;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;revision != IWL_UEFI_PUNCTURING_REVISION) {</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "Unsupported UEFI PUNCTURING rev:%d\n",</div><div class='add'>+				data-&gt;revision);</div><div class='add'>+	} else {</div><div class='add'>+		puncturing = data-&gt;puncturing &amp; IWL_UEFI_PUNCTURING_REV0_MASK;</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "Loaded puncturing bits from UEFI: %d\n",</div><div class='add'>+				puncturing);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(data);</div><div class='add'>+	return puncturing;</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_uefi_get_puncturing);</div><div class='add'>+</div><div class='add'>+int iwl_uefi_get_dsbr(struct iwl_fw_runtime *fwrt, u32 *value)</div><div class='add'>+{</div><div class='add'>+	struct uefi_cnv_wlan_dsbr_data *data;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	data = iwl_uefi_get_verified_variable_guid(fwrt-&gt;trans,</div><div class='add'>+						   &amp;IWL_EFI_WIFI_BT_GUID,</div><div class='add'>+						   IWL_UEFI_DSBR_NAME, "DSBR",</div><div class='add'>+						   sizeof(*data), NULL);</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;revision != IWL_UEFI_DSBR_REVISION) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "Unsupported UEFI DSBR revision:%d\n",</div><div class='add'>+				data-&gt;revision);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	*value = data-&gt;config;</div><div class='add'>+	IWL_DEBUG_RADIO(fwrt, "Loaded DSBR config from UEFI value: 0x%x\n",</div><div class='add'>+			*value);</div><div class='add'>+out:</div><div class='add'>+	kfree(data);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_uefi_get_phy_filters(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	struct uefi_cnv_wpfc_data *data __free(kfree);</div><div class='add'>+	struct iwl_phy_specific_cfg *filters = &amp;fwrt-&gt;phy_filters;</div><div class='add'>+</div><div class='add'>+	data = iwl_uefi_get_verified_variable(fwrt-&gt;trans, IWL_UEFI_WPFC_NAME,</div><div class='add'>+					      "WPFC", sizeof(*data), NULL);</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;revision != 0) {</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "Unsupported UEFI WPFC revision:%d\n",</div><div class='add'>+			data-&gt;revision);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(filters-&gt;filter_cfg_chains) !=</div><div class='add'>+		     ARRAY_SIZE(data-&gt;chains));</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(filters-&gt;filter_cfg_chains); i++) {</div><div class='add'>+		filters-&gt;filter_cfg_chains[i] = cpu_to_le32(data-&gt;chains[i]);</div><div class='add'>+		IWL_DEBUG_RADIO(fwrt, "WPFC: chain %d: %u\n", i, data-&gt;chains[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_RADIO(fwrt, "Loaded WPFC config from UEFI\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/fw/uefi.h b/drivers/net/wireless/intel/iwlwifi/fw/uefi.h<br/>new file mode 100644<br/>index 000000000000..5a4c557e47c7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/fw/uefi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/fw/uefi.h</a></div><div class='hunk'>@@ -0,0 +1,393 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright(c) 2021-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_fw_uefi__</div><div class='add'>+#define __iwl_fw_uefi__</div><div class='add'>+</div><div class='add'>+#include "fw/regulatory.h"</div><div class='add'>+</div><div class='add'>+#define IWL_UEFI_OEM_PNVM_NAME		L"UefiCnvWlanOemSignedPnvm"</div><div class='add'>+#define IWL_UEFI_REDUCED_POWER_NAME	L"UefiCnvWlanReducedPower"</div><div class='add'>+#define IWL_UEFI_SGOM_NAME		L"UefiCnvWlanSarGeoOffsetMapping"</div><div class='add'>+#define IWL_UEFI_STEP_NAME		L"UefiCnvCommonSTEP"</div><div class='add'>+#define IWL_UEFI_UATS_NAME		L"CnvUefiWlanUATS"</div><div class='add'>+#define IWL_UEFI_WRDS_NAME		L"UefiCnvWlanWRDS"</div><div class='add'>+#define IWL_UEFI_EWRD_NAME		L"UefiCnvWlanEWRD"</div><div class='add'>+#define IWL_UEFI_WGDS_NAME		L"UefiCnvWlanWGDS"</div><div class='add'>+#define IWL_UEFI_PPAG_NAME		L"UefiCnvWlanPPAG"</div><div class='add'>+#define IWL_UEFI_WTAS_NAME		L"UefiCnvWlanWTAS"</div><div class='add'>+#define IWL_UEFI_SPLC_NAME		L"UefiCnvWlanSPLC"</div><div class='add'>+#define IWL_UEFI_WRDD_NAME		L"UefiCnvWlanWRDD"</div><div class='add'>+#define IWL_UEFI_ECKV_NAME		L"UefiCnvCommonECKV"</div><div class='add'>+#define IWL_UEFI_DSM_NAME		L"UefiCnvWlanGeneralCfg"</div><div class='add'>+#define IWL_UEFI_WBEM_NAME		L"UefiCnvWlanWBEM"</div><div class='add'>+#define IWL_UEFI_PUNCTURING_NAME	L"UefiCnvWlanPuncturing"</div><div class='add'>+#define IWL_UEFI_DSBR_NAME		L"UefiCnvCommonDSBR"</div><div class='add'>+#define IWL_UEFI_WPFC_NAME		L"WPFC"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define IWL_SGOM_MAP_SIZE		339</div><div class='add'>+#define IWL_UATS_MAP_SIZE		339</div><div class='add'>+</div><div class='add'>+#define IWL_UEFI_WRDS_REVISION		2</div><div class='add'>+#define IWL_UEFI_EWRD_REVISION		2</div><div class='add'>+#define IWL_UEFI_WGDS_REVISION		3</div><div class='add'>+#define IWL_UEFI_MIN_PPAG_REV		1</div><div class='add'>+#define IWL_UEFI_MAX_PPAG_REV		4</div><div class='add'>+#define IWL_UEFI_MIN_WTAS_REVISION	1</div><div class='add'>+#define IWL_UEFI_MAX_WTAS_REVISION	2</div><div class='add'>+#define IWL_UEFI_SPLC_REVISION		0</div><div class='add'>+#define IWL_UEFI_WRDD_REVISION		0</div><div class='add'>+#define IWL_UEFI_ECKV_REVISION		0</div><div class='add'>+#define IWL_UEFI_WBEM_REVISION		0</div><div class='add'>+#define IWL_UEFI_DSM_REVISION		4</div><div class='add'>+#define IWL_UEFI_PUNCTURING_REVISION	0</div><div class='add'>+#define IWL_UEFI_DSBR_REVISION		1</div><div class='add'>+</div><div class='add'>+struct pnvm_sku_package {</div><div class='add'>+	u8 rev;</div><div class='add'>+	u32 total_size;</div><div class='add'>+	u8 n_skus;</div><div class='add'>+	u32 reserved[2];</div><div class='add'>+	u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct uefi_cnv_wlan_sgom_data {</div><div class='add'>+	u8 revision;</div><div class='add'>+	u8 offset_map[IWL_SGOM_MAP_SIZE - 1];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct uefi_cnv_wlan_uats_data {</div><div class='add'>+	u8 revision;</div><div class='add'>+	u8 offset_map[IWL_UATS_MAP_SIZE - 1];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct uefi_cnv_common_step_data {</div><div class='add'>+	u8 revision;</div><div class='add'>+	u8 step_mode;</div><div class='add'>+	u8 cnvi_eq_channel;</div><div class='add'>+	u8 cnvr_eq_channel;</div><div class='add'>+	u8 radio1;</div><div class='add'>+	u8 radio2;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct uefi_sar_profile - a SAR profile as defined in UEFI</div><div class='add'>+ *</div><div class='add'>+ * @chains: a per-chain table of SAR values</div><div class='add'>+ */</div><div class='add'>+struct uefi_sar_profile {</div><div class='add'>+	struct iwl_sar_profile_chain chains[BIOS_SAR_MAX_CHAINS_PER_PROFILE];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct uefi_cnv_var_wrds - WRDS table as defined in UEFI</div><div class='add'>+ *</div><div class='add'>+ * @revision: the revision of the table</div><div class='add'>+ * @mode: is WRDS enbaled/disabled</div><div class='add'>+ * @sar_profile: sar profile #1</div><div class='add'>+ */</div><div class='add'>+struct uefi_cnv_var_wrds {</div><div class='add'>+	u8 revision;</div><div class='add'>+	u32 mode;</div><div class='add'>+	struct uefi_sar_profile sar_profile;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct uefi_cnv_var_ewrd - EWRD table as defined in UEFI</div><div class='add'>+ * @revision: the revision of the table</div><div class='add'>+ * @mode: is WRDS enbaled/disabled</div><div class='add'>+ * @num_profiles: how many additional profiles we have in this table (0-3)</div><div class='add'>+ * @sar_profiles: the additional SAR profiles (#2-#4)</div><div class='add'>+ */</div><div class='add'>+struct uefi_cnv_var_ewrd {</div><div class='add'>+	u8 revision;</div><div class='add'>+	u32 mode;</div><div class='add'>+	u32 num_profiles;</div><div class='add'>+	struct uefi_sar_profile sar_profiles[BIOS_SAR_MAX_PROFILE_NUM - 1];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct uefi_cnv_var_wgds - WGDS table as defined in UEFI</div><div class='add'>+ * @revision: the revision of the table</div><div class='add'>+ * @num_profiles: the number of geo profiles we have in the table.</div><div class='add'>+ *	The first 3 are mandatory, and can have up to 8.</div><div class='add'>+ * @geo_profiles: a per-profile table of the offsets to add to SAR values.</div><div class='add'>+ */</div><div class='add'>+struct uefi_cnv_var_wgds {</div><div class='add'>+	u8 revision;</div><div class='add'>+	u8 num_profiles;</div><div class='add'>+	struct iwl_geo_profile geo_profiles[BIOS_GEO_MAX_PROFILE_NUM];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct uefi_cnv_var_ppag - PPAG table as defined in UEFI</div><div class='add'>+ * @revision: the revision of the table</div><div class='add'>+ * @ppag_modes: values from &amp;enum iwl_ppag_flags</div><div class='add'>+ * @ppag_chains: the PPAG values per chain and band</div><div class='add'>+ */</div><div class='add'>+struct uefi_cnv_var_ppag {</div><div class='add'>+	u8 revision;</div><div class='add'>+	u32 ppag_modes;</div><div class='add'>+	struct iwl_ppag_chain ppag_chains[IWL_NUM_CHAIN_LIMITS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* struct uefi_cnv_var_wtas - WTAS tabled as defined in UEFI</div><div class='add'>+ * @revision: the revision of the table</div><div class='add'>+ * @tas_selection: different options of TAS enablement.</div><div class='add'>+ * @black_list_size: the number of defined entried in the black list</div><div class='add'>+ * @black_list: a list of countries that are not allowed to use the TAS feature</div><div class='add'>+ */</div><div class='add'>+struct uefi_cnv_var_wtas {</div><div class='add'>+	u8 revision;</div><div class='add'>+	u32 tas_selection;</div><div class='add'>+	u8 black_list_size;</div><div class='add'>+	u16 black_list[IWL_WTAS_BLACK_LIST_MAX];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* struct uefi_cnv_var_splc - SPLC tabled as defined in UEFI</div><div class='add'>+ * @revision: the revision of the table</div><div class='add'>+ * @default_pwr_limit: The default maximum power per device</div><div class='add'>+ */</div><div class='add'>+struct uefi_cnv_var_splc {</div><div class='add'>+	u8 revision;</div><div class='add'>+	u32 default_pwr_limit;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* struct uefi_cnv_var_wrdd - WRDD table as defined in UEFI</div><div class='add'>+ * @revision: the revision of the table</div><div class='add'>+ * @mcc: country identifier as defined in ISO/IEC 3166-1 Alpha 2 code</div><div class='add'>+ */</div><div class='add'>+struct uefi_cnv_var_wrdd {</div><div class='add'>+	u8 revision;</div><div class='add'>+	u32 mcc;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* struct uefi_cnv_var_eckv - ECKV table as defined in UEFI</div><div class='add'>+ * @revision: the revision of the table</div><div class='add'>+ * @ext_clock_valid: indicates if external 32KHz clock is valid</div><div class='add'>+ */</div><div class='add'>+struct uefi_cnv_var_eckv {</div><div class='add'>+	u8 revision;</div><div class='add'>+	u32 ext_clock_valid;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define UEFI_MAX_DSM_FUNCS 32</div><div class='add'>+</div><div class='add'>+/* struct uefi_cnv_var_general_cfg - DSM-like table as defined in UEFI</div><div class='add'>+ * @revision: the revision of the table</div><div class='add'>+ * @functions: payload of the different DSM functions</div><div class='add'>+ */</div><div class='add'>+struct uefi_cnv_var_general_cfg {</div><div class='add'>+	u8 revision;</div><div class='add'>+	u32 functions[UEFI_MAX_DSM_FUNCS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define IWL_UEFI_WBEM_REV0_MASK (BIT(0) | BIT(1))</div><div class='add'>+/* struct uefi_cnv_wlan_wbem_data - Bandwidth enablement per MCC as defined</div><div class='add'>+ *	in UEFI</div><div class='add'>+ * @revision: the revision of the table</div><div class='add'>+ * @wbem_320mhz_per_mcc: enablement of 320MHz bandwidth per MCC</div><div class='add'>+ *	bit 0 - if set, 320MHz is enabled for Japan</div><div class='add'>+ *	bit 1 - if set, 320MHz is enabled for South Korea</div><div class='add'>+ *	bit 2- 31, Reserved</div><div class='add'>+ */</div><div class='add'>+struct uefi_cnv_wlan_wbem_data {</div><div class='add'>+	u8 revision;</div><div class='add'>+	u32 wbem_320mhz_per_mcc;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum iwl_uefi_cnv_puncturing_flags {</div><div class='add'>+	IWL_UEFI_CNV_PUNCTURING_USA_EN_MSK	= BIT(0),</div><div class='add'>+	IWL_UEFI_CNV_PUNCTURING_CANADA_EN_MSK	= BIT(1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IWL_UEFI_PUNCTURING_REV0_MASK (IWL_UEFI_CNV_PUNCTURING_USA_EN_MSK | \</div><div class='add'>+				       IWL_UEFI_CNV_PUNCTURING_CANADA_EN_MSK)</div><div class='add'>+/**</div><div class='add'>+ * struct uefi_cnv_var_puncturing_data - controlling channel</div><div class='add'>+ *	puncturing for few countries.</div><div class='add'>+ * @revision: the revision of the table</div><div class='add'>+ * @puncturing: enablement of channel puncturing per mcc</div><div class='add'>+ *	see &amp;enum iwl_uefi_cnv_puncturing_flags.</div><div class='add'>+ */</div><div class='add'>+struct uefi_cnv_var_puncturing_data {</div><div class='add'>+	u8 revision;</div><div class='add'>+	u32 puncturing;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct uefi_cnv_wlan_dsbr_data - BIOS STEP configuration information</div><div class='add'>+ * @revision: the revision of the table</div><div class='add'>+ * @config: STEP configuration flags:</div><div class='add'>+ *	bit 8, switch to URM depending on FW setting</div><div class='add'>+ *	bit 9, switch to URM</div><div class='add'>+ *</div><div class='add'>+ * Platform information for STEP configuration/workarounds.</div><div class='add'>+ */</div><div class='add'>+struct uefi_cnv_wlan_dsbr_data {</div><div class='add'>+	u8 revision;</div><div class='add'>+	u32 config;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct uefi_cnv_wpfc_data - BIOS Wi-Fi PHY filter Configuration</div><div class='add'>+ * @revision: the revision of the table</div><div class='add'>+ * @chains: configuration of each of the chains (a-d)</div><div class='add'>+ *</div><div class='add'>+ * specific PHY filter configuration</div><div class='add'>+ */</div><div class='add'>+struct uefi_cnv_wpfc_data {</div><div class='add'>+	u8 revision;</div><div class='add'>+	u32 chains[4];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is known to be broken on v4.19 and to work on v5.4.  Until we</div><div class='add'>+ * figure out why this is the case and how to make it work, simply</div><div class='add'>+ * disable the feature in old kernels.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_EFI</div><div class='add'>+void *iwl_uefi_get_pnvm(struct iwl_trans *trans, size_t *len);</div><div class='add'>+u8 *iwl_uefi_get_reduced_power(struct iwl_trans *trans, size_t *len);</div><div class='add'>+int iwl_uefi_reduce_power_parse(struct iwl_trans *trans,</div><div class='add'>+				const u8 *data, size_t len,</div><div class='add'>+				struct iwl_pnvm_image *pnvm_data,</div><div class='add'>+				__le32 sku_id[3]);</div><div class='add'>+void iwl_uefi_get_step_table(struct iwl_trans *trans);</div><div class='add'>+int iwl_uefi_handle_tlv_mem_desc(struct iwl_trans *trans, const u8 *data,</div><div class='add'>+				 u32 tlv_len, struct iwl_pnvm_image *pnvm_data);</div><div class='add'>+int iwl_uefi_get_wrds_table(struct iwl_fw_runtime *fwrt);</div><div class='add'>+int iwl_uefi_get_ewrd_table(struct iwl_fw_runtime *fwrt);</div><div class='add'>+int iwl_uefi_get_wgds_table(struct iwl_fw_runtime *fwrt);</div><div class='add'>+int iwl_uefi_get_ppag_table(struct iwl_fw_runtime *fwrt);</div><div class='add'>+int iwl_uefi_get_tas_table(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			   struct iwl_tas_data *data);</div><div class='add'>+int iwl_uefi_get_pwr_limit(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			   u64 *dflt_pwr_limit);</div><div class='add'>+int iwl_uefi_get_mcc(struct iwl_fw_runtime *fwrt, char *mcc);</div><div class='add'>+int iwl_uefi_get_eckv(struct iwl_fw_runtime *fwrt, u32 *extl_clk);</div><div class='add'>+int iwl_uefi_get_wbem(struct iwl_fw_runtime *fwrt, u32 *value);</div><div class='add'>+int iwl_uefi_get_dsm(struct iwl_fw_runtime *fwrt, enum iwl_dsm_funcs func,</div><div class='add'>+		     u32 *value);</div><div class='add'>+void iwl_uefi_get_sgom_table(struct iwl_trans *trans, struct iwl_fw_runtime *fwrt);</div><div class='add'>+void iwl_uefi_get_uats_table(struct iwl_trans *trans,</div><div class='add'>+			     struct iwl_fw_runtime *fwrt);</div><div class='add'>+int iwl_uefi_get_puncturing(struct iwl_fw_runtime *fwrt);</div><div class='add'>+int iwl_uefi_get_dsbr(struct iwl_fw_runtime *fwrt, u32 *value);</div><div class='add'>+int iwl_uefi_get_phy_filters(struct iwl_fw_runtime *fwrt);</div><div class='add'>+#else /* CONFIG_EFI */</div><div class='add'>+static inline void *iwl_uefi_get_pnvm(struct iwl_trans *trans, size_t *len)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+iwl_uefi_reduce_power_parse(struct iwl_trans *trans,</div><div class='add'>+			    const u8 *data, size_t len,</div><div class='add'>+			    struct iwl_pnvm_image *pnvm_data,</div><div class='add'>+			    __le32 sku_id[3])</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 *</div><div class='add'>+iwl_uefi_get_reduced_power(struct iwl_trans *trans, size_t *len)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void iwl_uefi_get_step_table(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+iwl_uefi_handle_tlv_mem_desc(struct iwl_trans *trans, const u8 *data,</div><div class='add'>+			     u32 tlv_len, struct iwl_pnvm_image *pnvm_data)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int iwl_uefi_get_wrds_table(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int iwl_uefi_get_ewrd_table(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int iwl_uefi_get_wgds_table(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int iwl_uefi_get_ppag_table(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int iwl_uefi_get_tas_table(struct iwl_fw_runtime *fwrt,</div><div class='add'>+					 struct iwl_tas_data *data)</div><div class='add'>+{</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int iwl_uefi_get_pwr_limit(struct iwl_fw_runtime *fwrt,</div><div class='add'>+					 u64 *dflt_pwr_limit)</div><div class='add'>+{</div><div class='add'>+	*dflt_pwr_limit = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int iwl_uefi_get_mcc(struct iwl_fw_runtime *fwrt, char *mcc)</div><div class='add'>+{</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int iwl_uefi_get_eckv(struct iwl_fw_runtime *fwrt, u32 *extl_clk)</div><div class='add'>+{</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int iwl_uefi_get_wbem(struct iwl_fw_runtime *fwrt, u32 *value)</div><div class='add'>+{</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int iwl_uefi_get_dsm(struct iwl_fw_runtime *fwrt,</div><div class='add'>+				   enum iwl_dsm_funcs func, u32 *value)</div><div class='add'>+{</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void iwl_uefi_get_sgom_table(struct iwl_trans *trans, struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+iwl_uefi_get_uats_table(struct iwl_trans *trans, struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+int iwl_uefi_get_puncturing(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+int iwl_uefi_get_dsbr(struct iwl_fw_runtime *fwrt, u32 *value)</div><div class='add'>+{</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int iwl_uefi_get_phy_filters(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_EFI */</div><div class='add'>+#endif /* __iwl_fw_uefi__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h<br/>index b35ffdfdf14b..076810ee5d34 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-config.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-config.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-config.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-config.h</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2005-2014, 2018-2021 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='add'>+ * Copyright (C) 2018-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __IWL_CONFIG_H__</div><div class='ctx'> #define __IWL_CONFIG_H__</div><div class='hunk'>@@ -10,7 +11,10 @@</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/ieee80211.h&gt;</div><div class='ctx'> #include &lt;linux/nl80211.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='ctx'> #include "iwl-csr.h"</div><div class='add'>+#include "iwl-drv.h"</div><div class='ctx'> </div><div class='ctx'> enum iwl_device_family {</div><div class='ctx'> 	IWL_DEVICE_FAMILY_UNDEFINED,</div><div class='hunk'>@@ -33,6 +37,9 @@ enum iwl_device_family {</div><div class='ctx'> 	IWL_DEVICE_FAMILY_9000,</div><div class='ctx'> 	IWL_DEVICE_FAMILY_22000,</div><div class='ctx'> 	IWL_DEVICE_FAMILY_AX210,</div><div class='add'>+	IWL_DEVICE_FAMILY_BZ,</div><div class='add'>+	IWL_DEVICE_FAMILY_SC,</div><div class='add'>+	IWL_DEVICE_FAMILY_DR,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -83,6 +90,7 @@ enum iwl_nvm_type {</div><div class='ctx'> #define IWL_DEFAULT_MAX_TX_POWER 22</div><div class='ctx'> #define IWL_TX_CSUM_NETIF_FLAGS (NETIF_F_IPV6_CSUM | NETIF_F_IP_CSUM |\</div><div class='ctx'> 				 NETIF_F_TSO | NETIF_F_TSO6)</div><div class='add'>+#define IWL_CSUM_NETIF_FLAGS_MASK (IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM)</div><div class='ctx'> </div><div class='ctx'> /* Antenna presence definitions */</div><div class='ctx'> #define	ANT_NONE	0x0</div><div class='hunk'>@@ -94,9 +102,15 @@ enum iwl_nvm_type {</div><div class='ctx'> #define	ANT_AC		(ANT_A | ANT_C)</div><div class='ctx'> #define ANT_BC		(ANT_B | ANT_C)</div><div class='ctx'> #define ANT_ABC		(ANT_A | ANT_B | ANT_C)</div><div class='del'>-#define MAX_ANT_NUM 3</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+#define IWL_FW_AND_PNVM(pfx, api)				\</div><div class='add'>+	MODULE_FIRMWARE(pfx "-" __stringify(api) ".ucode");	\</div><div class='add'>+	MODULE_FIRMWARE(pfx ".pnvm")</div><div class='add'>+</div><div class='add'>+#define IWL_CORE_FW(pfx, core)					\</div><div class='add'>+	MODULE_FIRMWARE(pfx "-c" __stringify(core) ".ucode")</div><div class='add'>+</div><div class='ctx'> static inline u8 num_of_ant(u8 mask)</div><div class='ctx'> {</div><div class='ctx'> 	return  !!((mask) &amp; ANT_A) +</div><div class='hunk'>@@ -105,7 +119,29 @@ static inline u8 num_of_ant(u8 mask)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_base_params - params not likely to change within a device family</div><div class='add'>+ * struct iwl_fw_mon_reg - FW monitor register info</div><div class='add'>+ * @addr: register address</div><div class='add'>+ * @mask: register mask</div><div class='add'>+ */</div><div class='add'>+struct iwl_fw_mon_reg {</div><div class='add'>+	u32 addr;</div><div class='add'>+	u32 mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_fw_mon_regs - FW monitor registers</div><div class='add'>+ * @write_ptr: write pointer register</div><div class='add'>+ * @cycle_cnt: cycle count register</div><div class='add'>+ * @cur_frag: current fragment in use</div><div class='add'>+ */</div><div class='add'>+struct iwl_fw_mon_regs {</div><div class='add'>+	struct iwl_fw_mon_reg write_ptr;</div><div class='add'>+	struct iwl_fw_mon_reg cycle_cnt;</div><div class='add'>+	struct iwl_fw_mon_reg cur_frag;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_family_base_params - base parameters for an entire family</div><div class='ctx'>  * @max_ll_items: max number of OTP blocks</div><div class='ctx'>  * @shadow_ram_support: shadow support for OTP memory</div><div class='ctx'>  * @led_compensation: compensate on the led on/off time per HW according</div><div class='hunk'>@@ -114,12 +150,33 @@ static inline u8 num_of_ant(u8 mask)</div><div class='ctx'>  * @wd_timeout: TX queues watchdog timeout</div><div class='ctx'>  * @max_event_log_size: size of event log buffer size for ucode event logging</div><div class='ctx'>  * @shadow_reg_enable: HW shadow register support</div><div class='add'>+ * @apmg_not_supported: there's no APMG</div><div class='ctx'>  * @apmg_wake_up_wa: should the MAC access REQ be asserted when a command</div><div class='ctx'>  *	is in flight. This is due to a HW bug in 7260, 3160 and 7265.</div><div class='ctx'>  * @scd_chain_ext_wa: should the chain extension feature in SCD be disabled.</div><div class='ctx'>  * @max_tfd_queue_size: max number of entries in tfd queue.</div><div class='add'>+ * @eeprom_size: EEPROM size</div><div class='add'>+ * @num_of_queues: number of HW TX queues supported</div><div class='add'>+ * @pcie_l1_allowed: PCIe L1 state is allowed</div><div class='add'>+ * @pll_cfg: PLL configuration needed</div><div class='add'>+ * @nvm_hw_section_num: the ID of the HW NVM section</div><div class='add'>+ * @features: hw features, any combination of feature_passlist</div><div class='add'>+ * @smem_offset: offset from which the SMEM begins</div><div class='add'>+ * @smem_len: the length of SMEM</div><div class='add'>+ * @mac_addr_from_csr: read HW address from CSR registers at this offset</div><div class='add'>+ * @d3_debug_data_base_addr: base address where D3 debug data is stored</div><div class='add'>+ * @d3_debug_data_length: length of the D3 debug data</div><div class='add'>+ * @min_ba_txq_size: minimum number of slots required in a TX queue used</div><div class='add'>+ *	for aggregation</div><div class='add'>+ * @min_txq_size: minimum number of slots required in a TX queue</div><div class='add'>+ * @gp2_reg_addr: GP2 (timer) register address</div><div class='add'>+ * @mon_dbgi_regs: monitor DBGI registers</div><div class='add'>+ * @mon_dram_regs: monitor DRAM registers</div><div class='add'>+ * @mon_smem_regs: monitor SMEM registers</div><div class='add'>+ * @ucode_api_max: Highest version of uCode API supported by driver.</div><div class='add'>+ * @ucode_api_min: Lowest version of uCode API supported by driver.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_base_params {</div><div class='add'>+struct iwl_family_base_params {</div><div class='ctx'> 	unsigned int wd_timeout;</div><div class='ctx'> </div><div class='ctx'> 	u16 eeprom_size;</div><div class='hunk'>@@ -130,6 +187,7 @@ struct iwl_base_params {</div><div class='ctx'> 	   shadow_reg_enable:1,</div><div class='ctx'> 	   pcie_l1_allowed:1,</div><div class='ctx'> 	   apmg_wake_up_wa:1,</div><div class='add'>+	   apmg_not_supported:1,</div><div class='ctx'> 	   scd_chain_ext_wa:1;</div><div class='ctx'> </div><div class='ctx'> 	u16 num_of_queues;	/* def: HW dependent */</div><div class='hunk'>@@ -137,9 +195,52 @@ struct iwl_base_params {</div><div class='ctx'> </div><div class='ctx'> 	u8 max_ll_items;</div><div class='ctx'> 	u8 led_compensation;</div><div class='add'>+	u16 ucode_api_max;</div><div class='add'>+	u16 ucode_api_min;</div><div class='add'>+	u32 mac_addr_from_csr:10;</div><div class='add'>+	u8 nvm_hw_section_num;</div><div class='add'>+	netdev_features_t features;</div><div class='add'>+	u32 smem_offset;</div><div class='add'>+	u32 smem_len;</div><div class='add'>+	u32 d3_debug_data_base_addr;</div><div class='add'>+	u32 d3_debug_data_length;</div><div class='add'>+	u32 min_txq_size;</div><div class='add'>+	u32 gp2_reg_addr;</div><div class='add'>+	u32 min_ba_txq_size;</div><div class='add'>+	const struct iwl_fw_mon_regs mon_dram_regs;</div><div class='add'>+	const struct iwl_fw_mon_regs mon_smem_regs;</div><div class='add'>+	const struct iwl_fw_mon_regs mon_dbgi_regs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * FW is released as "core N release", and we used to have a</div><div class='add'>+ * gap of 3 between the API version and core number. Now the</div><div class='add'>+ * reported API version will be 1000 + core and we encode it</div><div class='add'>+ * in the filename as "c&lt;core&gt;".</div><div class='add'>+ */</div><div class='add'>+#define API_IS_CORE_START		1000</div><div class='add'>+#define API_TO_CORE_OFFS		3</div><div class='add'>+#define ENCODE_CORE_AS_API(core)	(API_IS_CORE_START + (core))</div><div class='add'>+</div><div class='add'>+static inline bool iwl_api_is_core_number(int api)</div><div class='add'>+{</div><div class='add'>+	return api &gt;= API_IS_CORE_START;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int iwl_api_to_core(int api)</div><div class='add'>+{</div><div class='add'>+	if (iwl_api_is_core_number(api))</div><div class='add'>+		return api - API_IS_CORE_START;</div><div class='add'>+</div><div class='add'>+	return api - API_TO_CORE_OFFS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define FW_API_FMT			"%s%d"</div><div class='add'>+#define FW_API_ARG(n)						\</div><div class='add'>+	iwl_api_is_core_number(n) ? "c" : "",			\</div><div class='add'>+	iwl_api_is_core_number(n) ? (n) - API_IS_CORE_START : (n)</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * @stbc: support Tx STBC and 1*SS Rx STBC</div><div class='ctx'>  * @ldpc: support Tx/Rx with LDPC</div><div class='ctx'>  * @use_rts_for_aggregation: use rts/cts protection for HT traffic</div><div class='hunk'>@@ -228,7 +329,7 @@ struct iwl_pwr_tx_backoff {</div><div class='ctx'> 	u32 backoff;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum iwl_cfg_trans_ltr_delay {</div><div class='add'>+enum iwl_mac_cfg_ltr_delay {</div><div class='ctx'> 	IWL_CFG_TRANS_LTR_DELAY_NONE	= 0,</div><div class='ctx'> 	IWL_CFG_TRANS_LTR_DELAY_200US	= 1,</div><div class='ctx'> 	IWL_CFG_TRANS_LTR_DELAY_2500US	= 2,</div><div class='hunk'>@@ -236,72 +337,57 @@ enum iwl_cfg_trans_ltr_delay {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_cfg_trans - information needed to start the trans</div><div class='add'>+ * struct iwl_mac_cfg - information about the MAC-specific device part</div><div class='ctx'>  *</div><div class='ctx'>  * These values are specific to the device ID and do not change when</div><div class='ctx'>  * multiple configs are used for a single device ID.  They values are</div><div class='ctx'>  * used, among other things, to boot the NIC so that the HW REV or</div><div class='ctx'>  * RFID can be read before deciding the remaining parameters to use.</div><div class='ctx'>  *</div><div class='del'>- * @base_params: pointer to basic parameters</div><div class='del'>- * @csr: csr flags and addresses that are different across devices</div><div class='add'>+ * @base: pointer to basic parameters</div><div class='ctx'>  * @device_family: the device family</div><div class='ctx'>  * @umac_prph_offset: offset to add to UMAC periphery address</div><div class='ctx'>  * @xtal_latency: power up latency to get the xtal stabilized</div><div class='ctx'>  * @extra_phy_cfg_flags: extra configuration flags to pass to the PHY</div><div class='del'>- * @rf_id: need to read rf_id to determine the firmware image</div><div class='del'>- * @use_tfh: use TFH</div><div class='ctx'>  * @gen2: 22000 and on transport operation</div><div class='ctx'>  * @mq_rx_supported: multi-queue rx support</div><div class='ctx'>  * @integrated: discrete or integrated</div><div class='ctx'>  * @low_latency_xtal: use the low latency xtal if supported</div><div class='del'>- * @ltr_delay: LTR delay parameter, &amp;enum iwl_cfg_trans_ltr_delay.</div><div class='add'>+ * @bisr_workaround: BISR hardware workaround (for 22260 series devices)</div><div class='add'>+ * @ltr_delay: LTR delay parameter, &amp;enum iwl_mac_cfg_ltr_delay.</div><div class='add'>+ * @imr_enabled: use the IMR if supported.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_cfg_trans_params {</div><div class='del'>-	const struct iwl_base_params *base_params;</div><div class='add'>+struct iwl_mac_cfg {</div><div class='add'>+	const struct iwl_family_base_params *base;</div><div class='ctx'> 	enum iwl_device_family device_family;</div><div class='ctx'> 	u32 umac_prph_offset;</div><div class='ctx'> 	u32 xtal_latency;</div><div class='ctx'> 	u32 extra_phy_cfg_flags;</div><div class='del'>-	u32 rf_id:1,</div><div class='del'>-	    use_tfh:1,</div><div class='del'>-	    gen2:1,</div><div class='add'>+	u32 gen2:1,</div><div class='ctx'> 	    mq_rx_supported:1,</div><div class='ctx'> 	    integrated:1,</div><div class='ctx'> 	    low_latency_xtal:1,</div><div class='ctx'> 	    bisr_workaround:1,</div><div class='del'>-	    ltr_delay:2;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iwl_fw_mon_reg - FW monitor register info</div><div class='del'>- * @addr: register address</div><div class='del'>- * @mask: register mask</div><div class='del'>- */</div><div class='del'>-struct iwl_fw_mon_reg {</div><div class='del'>-	u32 addr;</div><div class='del'>-	u32 mask;</div><div class='add'>+	    ltr_delay:2,</div><div class='add'>+	    imr_enabled:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct iwl_fw_mon_regs - FW monitor registers</div><div class='del'>- * @write_ptr: write pointer register</div><div class='del'>- * @cycle_cnt: cycle count register</div><div class='del'>- * @cur_frag: current fragment in use</div><div class='add'>+/*</div><div class='add'>+ * These sizes were picked according to 8 MSDUs inside 64/256/612 A-MSDUs</div><div class='add'>+ * in an A-MPDU, with additional overhead to account for processing time.</div><div class='add'>+ * They will be doubled for MACs starting from So/Ty that don't support</div><div class='add'>+ * putting multiple frames into a single buffer.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_fw_mon_regs {</div><div class='del'>-	struct iwl_fw_mon_reg write_ptr;</div><div class='del'>-	struct iwl_fw_mon_reg cycle_cnt;</div><div class='del'>-	struct iwl_fw_mon_reg cur_frag;</div><div class='del'>-};</div><div class='add'>+#define IWL_NUM_RBDS_NON_HE		(64 * 8)</div><div class='add'>+#define IWL_NUM_RBDS_HE			(256 * 8)</div><div class='add'>+#define IWL_NUM_RBDS_EHT		(512 * 8)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_cfg</div><div class='del'>- * @trans: the trans-specific configuration part</div><div class='del'>- * @name: Official name of the device</div><div class='add'>+ * struct iwl_rf_cfg - RF/CRF configuration data</div><div class='ctx'>  * @fw_name_pre: Firmware filename prefix. The api version and extension</div><div class='ctx'>  *	(.ucode) will be added to filename before loading from disk. The</div><div class='del'>- *	filename is constructed as fw_name_pre&lt;api&gt;.ucode.</div><div class='add'>+ *	filename is constructed as &lt;fw_name_pre&gt;-&lt;api&gt;.ucode.</div><div class='add'>+ *	name will be generated dynamically</div><div class='ctx'>  * @ucode_api_max: Highest version of uCode API supported by driver.</div><div class='ctx'>  * @ucode_api_min: Lowest version of uCode API supported by driver.</div><div class='ctx'>  * @max_inst_size: The maximal length of the fw inst section (only DVM)</div><div class='hunk'>@@ -311,36 +397,26 @@ struct iwl_fw_mon_regs {</div><div class='ctx'>  * @non_shared_ant: the antenna that is for WiFi only</div><div class='ctx'>  * @nvm_ver: NVM version</div><div class='ctx'>  * @nvm_calib_ver: NVM calibration version</div><div class='del'>- * @lib: pointer to the lib ops</div><div class='add'>+ * @bw_limit: bandwidth limit for this device, if non-zero</div><div class='ctx'>  * @ht_params: point to ht parameters</div><div class='add'>+ * @eeprom_params: EEPROM parameters (old devices)</div><div class='add'>+ * @thermal_params: Thermal throttling parameters</div><div class='add'>+ * @lp_xtal_workaround: low-power crystal workaround needed</div><div class='ctx'>  * @led_mode: 0=blinking, 1=On(RF On)/Off(RF Off)</div><div class='ctx'>  * @rx_with_siso_diversity: 1x1 device with rx antenna diversity</div><div class='ctx'>  * @tx_with_siso_diversity: 1x1 device with tx antenna diversity</div><div class='ctx'>  * @internal_wimax_coex: internal wifi/wimax combo device</div><div class='del'>- * @high_temp: Is this NIC is designated to be in high temperature.</div><div class='ctx'>  * @host_interrupt_operation_mode: device needs host interrupt operation</div><div class='ctx'>  *	mode set</div><div class='del'>- * @nvm_hw_section_num: the ID of the HW NVM section</div><div class='del'>- * @mac_addr_from_csr: read HW address from CSR registers</div><div class='del'>- * @features: hw features, any combination of feature_passlist</div><div class='ctx'>  * @pwr_tx_backoffs: translation table between power limits and backoffs</div><div class='del'>- * @max_tx_agg_size: max TX aggregation size of the ADDBA request/response</div><div class='ctx'>  * @dccm_offset: offset from which DCCM begins</div><div class='ctx'>  * @dccm_len: length of DCCM (including runtime stack CCM)</div><div class='ctx'>  * @dccm2_offset: offset from which the second DCCM begins</div><div class='ctx'>  * @dccm2_len: length of the second DCCM</div><div class='del'>- * @smem_offset: offset from which the SMEM begins</div><div class='del'>- * @smem_len: the length of SMEM</div><div class='ctx'>  * @vht_mu_mimo_supported: VHT MU-MIMO support</div><div class='del'>- * @cdb: CDB support</div><div class='ctx'>  * @nvm_type: see &amp;enum iwl_nvm_type</div><div class='del'>- * @d3_debug_data_base_addr: base address where D3 debug data is stored</div><div class='del'>- * @d3_debug_data_length: length of the D3 debug data</div><div class='del'>- * @bisr_workaround: BISR hardware workaround (for 22260 series devices)</div><div class='del'>- * @min_txq_size: minimum number of slots required in a TX queue</div><div class='ctx'>  * @uhb_supported: ultra high band channels supported</div><div class='del'>- * @min_256_ba_txq_size: minimum number of slots required in a TX queue which</div><div class='del'>- *	supports 256 BA aggregation</div><div class='add'>+ * @eht_supported: EHT supported</div><div class='ctx'>  * @num_rbds: number of receive buffer descriptors to use</div><div class='ctx'>  *	(only used for multi-queue capable devices)</div><div class='ctx'>  *</div><div class='hunk'>@@ -348,84 +424,69 @@ struct iwl_fw_mon_regs {</div><div class='ctx'>  * API differences in uCode shouldn't be handled here but through TLVs</div><div class='ctx'>  * and/or the uCode API version instead.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_cfg {</div><div class='del'>-	struct iwl_cfg_trans_params trans;</div><div class='add'>+struct iwl_rf_cfg {</div><div class='ctx'> 	/* params specific to an individual device within a device family */</div><div class='del'>-	const char *name;</div><div class='ctx'> 	const char *fw_name_pre;</div><div class='ctx'> 	/* params likely to change within a device family */</div><div class='del'>-	const struct iwl_ht_params *ht_params;</div><div class='add'>+	const struct iwl_ht_params ht_params;</div><div class='ctx'> 	const struct iwl_eeprom_params *eeprom_params;</div><div class='ctx'> 	const struct iwl_pwr_tx_backoff *pwr_tx_backoffs;</div><div class='del'>-	const char *default_nvm_file_C_step;</div><div class='ctx'> 	const struct iwl_tt_params *thermal_params;</div><div class='ctx'> 	enum iwl_led_mode led_mode;</div><div class='ctx'> 	enum iwl_nvm_type nvm_type;</div><div class='ctx'> 	u32 max_data_size;</div><div class='ctx'> 	u32 max_inst_size;</div><div class='del'>-	netdev_features_t features;</div><div class='ctx'> 	u32 dccm_offset;</div><div class='ctx'> 	u32 dccm_len;</div><div class='ctx'> 	u32 dccm2_offset;</div><div class='ctx'> 	u32 dccm2_len;</div><div class='del'>-	u32 smem_offset;</div><div class='del'>-	u32 smem_len;</div><div class='ctx'> 	u16 nvm_ver;</div><div class='ctx'> 	u16 nvm_calib_ver;</div><div class='add'>+	u16 bw_limit;</div><div class='ctx'> 	u32 rx_with_siso_diversity:1,</div><div class='ctx'> 	    tx_with_siso_diversity:1,</div><div class='del'>-	    bt_shared_single_ant:1,</div><div class='ctx'> 	    internal_wimax_coex:1,</div><div class='ctx'> 	    host_interrupt_operation_mode:1,</div><div class='del'>-	    high_temp:1,</div><div class='del'>-	    mac_addr_from_csr:1,</div><div class='ctx'> 	    lp_xtal_workaround:1,</div><div class='del'>-	    disable_dummy_notification:1,</div><div class='del'>-	    apmg_not_supported:1,</div><div class='ctx'> 	    vht_mu_mimo_supported:1,</div><div class='del'>-	    cdb:1,</div><div class='del'>-	    dbgc_supported:1,</div><div class='del'>-	    uhb_supported:1;</div><div class='add'>+	    uhb_supported:1,</div><div class='add'>+	    eht_supported:1;</div><div class='ctx'> 	u8 valid_tx_ant;</div><div class='ctx'> 	u8 valid_rx_ant;</div><div class='ctx'> 	u8 non_shared_ant;</div><div class='del'>-	u8 nvm_hw_section_num;</div><div class='del'>-	u8 max_tx_agg_size;</div><div class='del'>-	u8 ucode_api_max;</div><div class='del'>-	u8 ucode_api_min;</div><div class='add'>+	u16 ucode_api_max;</div><div class='add'>+	u16 ucode_api_min;</div><div class='ctx'> 	u16 num_rbds;</div><div class='del'>-	u32 min_umac_error_event_table;</div><div class='del'>-	u32 d3_debug_data_base_addr;</div><div class='del'>-	u32 d3_debug_data_length;</div><div class='del'>-	u32 min_txq_size;</div><div class='del'>-	u32 gp2_reg_addr;</div><div class='del'>-	u32 min_256_ba_txq_size;</div><div class='del'>-	const struct iwl_fw_mon_regs mon_dram_regs;</div><div class='del'>-	const struct iwl_fw_mon_regs mon_smem_regs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IWL_CFG_ANY (~0)</div><div class='ctx'> </div><div class='ctx'> #define IWL_CFG_MAC_TYPE_PU		0x31</div><div class='del'>-#define IWL_CFG_MAC_TYPE_PNJ		0x32</div><div class='ctx'> #define IWL_CFG_MAC_TYPE_TH		0x32</div><div class='ctx'> #define IWL_CFG_MAC_TYPE_QU		0x33</div><div class='add'>+#define IWL_CFG_MAC_TYPE_CC		0x34</div><div class='ctx'> #define IWL_CFG_MAC_TYPE_QUZ		0x35</div><div class='del'>-#define IWL_CFG_MAC_TYPE_QNJ		0x36</div><div class='ctx'> #define IWL_CFG_MAC_TYPE_SO		0x37</div><div class='del'>-#define IWL_CFG_MAC_TYPE_SNJ		0x42</div><div class='add'>+#define IWL_CFG_MAC_TYPE_TY		0x42</div><div class='ctx'> #define IWL_CFG_MAC_TYPE_SOF		0x43</div><div class='ctx'> #define IWL_CFG_MAC_TYPE_MA		0x44</div><div class='ctx'> #define IWL_CFG_MAC_TYPE_BZ		0x46</div><div class='add'>+#define IWL_CFG_MAC_TYPE_GL		0x47</div><div class='add'>+#define IWL_CFG_MAC_TYPE_SC		0x48</div><div class='add'>+#define IWL_CFG_MAC_TYPE_SC2		0x49</div><div class='add'>+#define IWL_CFG_MAC_TYPE_SC2F		0x4A</div><div class='add'>+#define IWL_CFG_MAC_TYPE_BZ_W		0x4B</div><div class='add'>+#define IWL_CFG_MAC_TYPE_BR		0x4C</div><div class='add'>+#define IWL_CFG_MAC_TYPE_DR		0x4D</div><div class='ctx'> </div><div class='del'>-#define IWL_CFG_RF_TYPE_TH		0x105</div><div class='del'>-#define IWL_CFG_RF_TYPE_TH1		0x108</div><div class='ctx'> #define IWL_CFG_RF_TYPE_JF2		0x105</div><div class='ctx'> #define IWL_CFG_RF_TYPE_JF1		0x108</div><div class='ctx'> #define IWL_CFG_RF_TYPE_HR2		0x10A</div><div class='ctx'> #define IWL_CFG_RF_TYPE_HR1		0x10C</div><div class='ctx'> #define IWL_CFG_RF_TYPE_GF		0x10D</div><div class='del'>-#define IWL_CFG_RF_TYPE_MR		0x110</div><div class='add'>+#define IWL_CFG_RF_TYPE_FM		0x112</div><div class='add'>+#define IWL_CFG_RF_TYPE_WH		0x113</div><div class='add'>+#define IWL_CFG_RF_TYPE_PE		0x114</div><div class='ctx'> </div><div class='ctx'> #define IWL_CFG_RF_ID_TH		0x1</div><div class='ctx'> #define IWL_CFG_RF_ID_TH1		0x1</div><div class='hunk'>@@ -435,50 +496,144 @@ struct iwl_cfg {</div><div class='ctx'> #define IWL_CFG_RF_ID_HR		0x7</div><div class='ctx'> #define IWL_CFG_RF_ID_HR1		0x4</div><div class='ctx'> </div><div class='del'>-#define IWL_CFG_NO_160			0x1</div><div class='del'>-#define IWL_CFG_160			0x0</div><div class='del'>-</div><div class='ctx'> #define IWL_CFG_CORES_BT		0x0</div><div class='ctx'> #define IWL_CFG_CORES_BT_GNSS		0x5</div><div class='ctx'> </div><div class='ctx'> #define IWL_CFG_NO_CDB			0x0</div><div class='ctx'> #define IWL_CFG_CDB			0x1</div><div class='ctx'> </div><div class='add'>+#define IWL_CFG_NO_JACKET		0x0</div><div class='add'>+#define IWL_CFG_IS_JACKET		0x1</div><div class='add'>+</div><div class='ctx'> #define IWL_SUBDEVICE_RF_ID(subdevice)	((u16)((subdevice) &amp; 0x00F0) &gt;&gt; 4)</div><div class='del'>-#define IWL_SUBDEVICE_NO_160(subdevice)	((u16)((subdevice) &amp; 0x0200) &gt;&gt; 9)</div><div class='add'>+#define IWL_SUBDEVICE_BW_LIM(subdevice)	((u16)((subdevice) &amp; 0x0200) &gt;&gt; 9)</div><div class='ctx'> #define IWL_SUBDEVICE_CORES(subdevice)	((u16)((subdevice) &amp; 0x1C00) &gt;&gt; 10)</div><div class='ctx'> </div><div class='ctx'> struct iwl_dev_info {</div><div class='add'>+	const struct iwl_rf_cfg *cfg;</div><div class='add'>+	const char *name;</div><div class='ctx'> 	u16 device;</div><div class='ctx'> 	u16 subdevice;</div><div class='del'>-	u16 mac_type;</div><div class='del'>-	u16 rf_type;</div><div class='del'>-	u8 mac_step;</div><div class='del'>-	u8 rf_id;</div><div class='del'>-	u8 no_160;</div><div class='del'>-	u8 cores;</div><div class='del'>-	u8 cdb;</div><div class='del'>-	const struct iwl_cfg *cfg;</div><div class='del'>-	const char *name;</div><div class='add'>+	u32 subdevice_m_l:4,</div><div class='add'>+	    subdevice_m_h:4,</div><div class='add'>+	    match_rf_type:1,</div><div class='add'>+	    rf_type:9,</div><div class='add'>+	    match_bw_limit:1,</div><div class='add'>+	    bw_limit:1,</div><div class='add'>+	    match_discrete:1,</div><div class='add'>+	    discrete:1,</div><div class='add'>+	    match_rf_id:1,</div><div class='add'>+	    rf_id:4,</div><div class='add'>+	    match_cdb:1,</div><div class='add'>+	    cdb:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_IWLWIFI_KUNIT_TESTS)</div><div class='add'>+extern const struct iwl_dev_info iwl_dev_info_table[];</div><div class='add'>+extern const unsigned int iwl_dev_info_table_size;</div><div class='add'>+extern const struct pci_device_id iwl_hw_card_ids[];</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+const struct iwl_dev_info *</div><div class='add'>+iwl_pci_find_dev_info(u16 device, u16 subsystem_device, u16 rf_type, u8 cdb,</div><div class='add'>+		      u8 rf_id, u8 bw_limit, bool discrete);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This list declares the config structures for all devices.</div><div class='ctx'>  */</div><div class='del'>-extern const struct iwl_cfg_trans_params iwl9000_trans_cfg;</div><div class='del'>-extern const struct iwl_cfg_trans_params iwl9560_trans_cfg;</div><div class='del'>-extern const struct iwl_cfg_trans_params iwl9560_long_latency_trans_cfg;</div><div class='del'>-extern const struct iwl_cfg_trans_params iwl9560_shared_clk_trans_cfg;</div><div class='del'>-extern const struct iwl_cfg_trans_params iwl_qnj_trans_cfg;</div><div class='del'>-extern const struct iwl_cfg_trans_params iwl_qu_trans_cfg;</div><div class='del'>-extern const struct iwl_cfg_trans_params iwl_qu_medium_latency_trans_cfg;</div><div class='del'>-extern const struct iwl_cfg_trans_params iwl_qu_long_latency_trans_cfg;</div><div class='del'>-extern const struct iwl_cfg_trans_params iwl_ax200_trans_cfg;</div><div class='del'>-extern const struct iwl_cfg_trans_params iwl_snj_trans_cfg;</div><div class='del'>-extern const struct iwl_cfg_trans_params iwl_so_trans_cfg;</div><div class='del'>-extern const struct iwl_cfg_trans_params iwl_so_long_latency_trans_cfg;</div><div class='del'>-extern const struct iwl_cfg_trans_params iwl_ma_trans_cfg;</div><div class='del'>-extern const struct iwl_cfg_trans_params iwl_bz_trans_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl1000_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl5000_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl2000_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl2030_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl105_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl135_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl5150_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl6005_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl6030_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl6000i_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl6050_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl6150_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl6000_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl7000_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl8000_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl9000_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl9560_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl9560_long_latency_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl9560_shared_clk_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl_qu_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl_qu_medium_latency_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl_qu_long_latency_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl_ax200_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl_ty_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl_so_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl_so_long_latency_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl_so_long_latency_imr_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl_ma_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl_bz_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl_gl_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl_sc_mac_cfg;</div><div class='add'>+extern const struct iwl_mac_cfg iwl_dr_mac_cfg;</div><div class='add'>+</div><div class='add'>+extern const char iwl1000_bgn_name[];</div><div class='add'>+extern const char iwl1000_bg_name[];</div><div class='add'>+extern const char iwl100_bgn_name[];</div><div class='add'>+extern const char iwl100_bg_name[];</div><div class='add'>+extern const char iwl2000_2bgn_name[];</div><div class='add'>+extern const char iwl2000_2bgn_d_name[];</div><div class='add'>+extern const char iwl2030_2bgn_name[];</div><div class='add'>+extern const char iwl105_bgn_name[];</div><div class='add'>+extern const char iwl105_bgn_d_name[];</div><div class='add'>+extern const char iwl135_bgn_name[];</div><div class='add'>+extern const char iwl5300_agn_name[];</div><div class='add'>+extern const char iwl5100_bgn_name[];</div><div class='add'>+extern const char iwl5100_abg_name[];</div><div class='add'>+extern const char iwl5100_agn_name[];</div><div class='add'>+extern const char iwl5350_agn_name[];</div><div class='add'>+extern const char iwl5150_agn_name[];</div><div class='add'>+extern const char iwl5150_abg_name[];</div><div class='add'>+extern const char iwl6005_2agn_name[];</div><div class='add'>+extern const char iwl6005_2abg_name[];</div><div class='add'>+extern const char iwl6005_2bg_name[];</div><div class='add'>+extern const char iwl6005_2agn_sff_name[];</div><div class='add'>+extern const char iwl6005_2agn_d_name[];</div><div class='add'>+extern const char iwl6005_2agn_mow1_name[];</div><div class='add'>+extern const char iwl6005_2agn_mow2_name[];</div><div class='add'>+extern const char iwl6030_2agn_name[];</div><div class='add'>+extern const char iwl6030_2abg_name[];</div><div class='add'>+extern const char iwl6030_2bgn_name[];</div><div class='add'>+extern const char iwl6030_2bg_name[];</div><div class='add'>+extern const char iwl6035_2agn_name[];</div><div class='add'>+extern const char iwl6035_2agn_sff_name[];</div><div class='add'>+extern const char iwl1030_bgn_name[];</div><div class='add'>+extern const char iwl1030_bg_name[];</div><div class='add'>+extern const char iwl130_bgn_name[];</div><div class='add'>+extern const char iwl130_bg_name[];</div><div class='add'>+extern const char iwl6000i_2agn_name[];</div><div class='add'>+extern const char iwl6000i_2abg_name[];</div><div class='add'>+extern const char iwl6000i_2bg_name[];</div><div class='add'>+extern const char iwl6050_2agn_name[];</div><div class='add'>+extern const char iwl6050_2abg_name[];</div><div class='add'>+extern const char iwl6150_bgn_name[];</div><div class='add'>+extern const char iwl6150_bg_name[];</div><div class='add'>+extern const char iwl6000_3agn_name[];</div><div class='add'>+extern const char iwl7260_2ac_name[];</div><div class='add'>+extern const char iwl7260_2n_name[];</div><div class='add'>+extern const char iwl7260_n_name[];</div><div class='add'>+extern const char iwl3160_2ac_name[];</div><div class='add'>+extern const char iwl3160_2n_name[];</div><div class='add'>+extern const char iwl3160_n_name[];</div><div class='add'>+extern const char iwl3165_2ac_name[];</div><div class='add'>+extern const char iwl3168_2ac_name[];</div><div class='add'>+extern const char iwl7265_2ac_name[];</div><div class='add'>+extern const char iwl7265_2n_name[];</div><div class='add'>+extern const char iwl7265_n_name[];</div><div class='add'>+extern const char iwl8260_2n_name[];</div><div class='add'>+extern const char iwl8260_2ac_name[];</div><div class='add'>+extern const char iwl8265_2ac_name[];</div><div class='add'>+extern const char iwl8275_2ac_name[];</div><div class='add'>+extern const char iwl4165_2ac_name[];</div><div class='add'>+extern const char iwl_killer_1435i_name[];</div><div class='add'>+extern const char iwl_killer_1434_kix_name[];</div><div class='ctx'> extern const char iwl9162_name[];</div><div class='ctx'> extern const char iwl9260_name[];</div><div class='ctx'> extern const char iwl9260_1_name[];</div><div class='hunk'>@@ -505,121 +660,93 @@ extern const char iwl_ax201_killer_1650s_name[];</div><div class='ctx'> extern const char iwl_ax201_killer_1650i_name[];</div><div class='ctx'> extern const char iwl_ax210_killer_1675w_name[];</div><div class='ctx'> extern const char iwl_ax210_killer_1675x_name[];</div><div class='add'>+extern const char iwl9560_killer_1550i_160_name[];</div><div class='add'>+extern const char iwl9560_killer_1550s_160_name[];</div><div class='add'>+extern const char iwl_ax211_killer_1675s_name[];</div><div class='add'>+extern const char iwl_ax211_killer_1675i_name[];</div><div class='add'>+extern const char iwl_ax411_killer_1690s_name[];</div><div class='add'>+extern const char iwl_ax411_killer_1690i_name[];</div><div class='add'>+extern const char iwl_ax210_name[];</div><div class='ctx'> extern const char iwl_ax211_name[];</div><div class='del'>-extern const char iwl_ax221_name[];</div><div class='ctx'> extern const char iwl_ax411_name[];</div><div class='add'>+extern const char iwl_killer_be1750s_name[];</div><div class='add'>+extern const char iwl_killer_be1750i_name[];</div><div class='add'>+extern const char iwl_killer_be1750w_name[];</div><div class='add'>+extern const char iwl_killer_be1750x_name[];</div><div class='add'>+extern const char iwl_killer_be1790s_name[];</div><div class='add'>+extern const char iwl_killer_be1790i_name[];</div><div class='add'>+extern const char iwl_be201_name[];</div><div class='add'>+extern const char iwl_be200_name[];</div><div class='add'>+extern const char iwl_be202_name[];</div><div class='add'>+extern const char iwl_be401_name[];</div><div class='add'>+extern const char iwl_be213_name[];</div><div class='add'>+extern const char iwl_killer_be1775s_name[];</div><div class='add'>+extern const char iwl_killer_be1775i_name[];</div><div class='add'>+extern const char iwl_be211_name[];</div><div class='add'>+extern const char iwl_killer_bn1850w2_name[];</div><div class='add'>+extern const char iwl_killer_bn1850i_name[];</div><div class='add'>+extern const char iwl_bn201_name[];</div><div class='add'>+extern const char iwl_bn203_name[];</div><div class='add'>+extern const char iwl_be221_name[];</div><div class='add'>+extern const char iwl_be223_name[];</div><div class='add'>+extern const char iwl_ax221_name[];</div><div class='ctx'> #if IS_ENABLED(CONFIG_IWLDVM)</div><div class='del'>-extern const struct iwl_cfg iwl5300_agn_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl5100_agn_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl5350_agn_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl5100_bgn_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl5100_abg_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl5150_agn_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl5150_abg_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl6005_2agn_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl6005_2abg_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl6005_2bg_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl6005_2agn_sff_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl6005_2agn_d_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl6005_2agn_mow1_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl6005_2agn_mow2_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl1030_bgn_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl1030_bg_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl6030_2agn_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl6030_2abg_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl6030_2bgn_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl6030_2bg_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl6000i_2agn_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl6000i_2abg_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl6000i_2bg_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl6000_3agn_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl6050_2agn_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl6050_2abg_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl6150_bgn_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl6150_bg_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl1000_bgn_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl1000_bg_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl100_bgn_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl100_bg_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl130_bgn_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl130_bg_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl2000_2bgn_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl2000_2bgn_d_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl2030_2bgn_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl6035_2agn_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl6035_2agn_sff_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl105_bgn_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl105_bgn_d_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl135_bgn_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl5300_agn_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl5350_agn_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl5100_n_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl5100_abg_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl5150_agn_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl5150_abg_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl6005_non_n_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl6005_n_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl6030_n_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl6030_non_n_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl6000i_2agn_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl6000i_non_n_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl6000i_non_n_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl6000_3agn_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl6050_2agn_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl6050_2abg_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl6150_bgn_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl6150_bg_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl1000_bgn_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl1000_bg_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl100_bgn_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl100_bg_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl130_bgn_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl130_bg_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl2000_2bgn_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl2030_2bgn_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl6035_2agn_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl105_bgn_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl135_bgn_cfg;</div><div class='ctx'> #endif /* CONFIG_IWLDVM */</div><div class='ctx'> #if IS_ENABLED(CONFIG_IWLMVM)</div><div class='del'>-extern const struct iwl_cfg iwl7260_2ac_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl7260_2ac_cfg_high_temp;</div><div class='del'>-extern const struct iwl_cfg iwl7260_2n_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl7260_n_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl3160_2ac_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl3160_2n_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl3160_n_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl3165_2ac_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl3168_2ac_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl7265_2ac_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl7265_2n_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl7265_n_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl7265d_2ac_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl7265d_2n_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl7265d_n_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl8260_2n_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl8260_2ac_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl8265_2ac_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl8275_2ac_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl4165_2ac_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl9260_2ac_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl9560_qu_b0_jf_b0_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl9560_qu_c0_jf_b0_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl9560_quz_a0_jf_b0_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl9560_qnj_b0_jf_b0_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl9560_2ac_cfg_soc;</div><div class='del'>-extern const struct iwl_cfg iwl_qu_b0_hr1_b0;</div><div class='del'>-extern const struct iwl_cfg iwl_qu_c0_hr1_b0;</div><div class='del'>-extern const struct iwl_cfg iwl_quz_a0_hr1_b0;</div><div class='del'>-extern const struct iwl_cfg iwl_qu_b0_hr_b0;</div><div class='del'>-extern const struct iwl_cfg iwl_qu_c0_hr_b0;</div><div class='del'>-extern const struct iwl_cfg iwl_ax200_cfg_cc;</div><div class='del'>-extern const struct iwl_cfg iwl_ax201_cfg_qu_hr;</div><div class='del'>-extern const struct iwl_cfg iwl_ax201_cfg_qu_hr;</div><div class='del'>-extern const struct iwl_cfg iwl_ax201_cfg_qu_c0_hr_b0;</div><div class='del'>-extern const struct iwl_cfg iwl_ax201_cfg_quz_hr;</div><div class='del'>-extern const struct iwl_cfg iwl_ax1650i_cfg_quz_hr;</div><div class='del'>-extern const struct iwl_cfg iwl_ax1650s_cfg_quz_hr;</div><div class='del'>-extern const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0;</div><div class='del'>-extern const struct iwl_cfg killer1650i_2ax_cfg_qu_b0_hr_b0;</div><div class='del'>-extern const struct iwl_cfg killer1650s_2ax_cfg_qu_c0_hr_b0;</div><div class='del'>-extern const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0;</div><div class='del'>-extern const struct iwl_cfg killer1650x_2ax_cfg;</div><div class='del'>-extern const struct iwl_cfg killer1650w_2ax_cfg;</div><div class='del'>-extern const struct iwl_cfg iwl_qnj_b0_hr_b0_cfg;</div><div class='del'>-extern const struct iwl_cfg iwlax210_2ax_cfg_so_jf_b0;</div><div class='del'>-extern const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0;</div><div class='del'>-extern const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0;</div><div class='del'>-extern const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0_long;</div><div class='del'>-extern const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0;</div><div class='del'>-extern const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0;</div><div class='del'>-extern const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0_long;</div><div class='del'>-extern const struct iwl_cfg iwlax411_2ax_cfg_sosnj_gf4_a0;</div><div class='del'>-extern const struct iwl_cfg iwlax211_cfg_snj_gf_a0;</div><div class='del'>-extern const struct iwl_cfg iwl_cfg_snj_hr_b0;</div><div class='del'>-extern const struct iwl_cfg iwl_cfg_snj_a0_jf_b0;</div><div class='del'>-extern const struct iwl_cfg iwl_cfg_ma_a0_hr_b0;</div><div class='del'>-extern const struct iwl_cfg iwl_cfg_ma_a0_gf_a0;</div><div class='del'>-extern const struct iwl_cfg iwl_cfg_ma_a0_gf4_a0;</div><div class='del'>-extern const struct iwl_cfg iwl_cfg_ma_a0_mr_a0;</div><div class='del'>-extern const struct iwl_cfg iwl_cfg_snj_a0_mr_a0;</div><div class='del'>-extern const struct iwl_cfg iwl_cfg_so_a0_hr_a0;</div><div class='del'>-extern const struct iwl_cfg iwl_cfg_quz_a0_hr_b0;</div><div class='del'>-extern const struct iwl_cfg iwl_cfg_bz_a0_hr_b0;</div><div class='del'>-extern const struct iwl_cfg iwl_cfg_bz_a0_gf_a0;</div><div class='del'>-extern const struct iwl_cfg iwl_cfg_bz_a0_gf4_a0;</div><div class='del'>-extern const struct iwl_cfg iwl_cfg_bz_a0_mr_a0;</div><div class='add'>+extern const struct iwl_rf_cfg iwl7260_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl7260_high_temp_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl3160_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl3165_2ac_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl3168_2ac_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl7265_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl7265d_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl8260_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl8265_cfg;</div><div class='add'>+extern const struct iwl_rf_cfg iwl_rf_jf;</div><div class='add'>+extern const struct iwl_rf_cfg iwl_rf_jf_80mhz;</div><div class='add'>+extern const struct iwl_rf_cfg iwl_rf_hr1;</div><div class='add'>+extern const struct iwl_rf_cfg iwl_rf_hr;</div><div class='add'>+extern const struct iwl_rf_cfg iwl_rf_hr_80mhz;</div><div class='add'>+</div><div class='add'>+extern const struct iwl_rf_cfg iwl_rf_gf;</div><div class='ctx'> #endif /* CONFIG_IWLMVM */</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_IWLMLD)</div><div class='add'>+extern const struct iwl_rf_cfg iwl_rf_fm;</div><div class='add'>+extern const struct iwl_rf_cfg iwl_rf_fm_160mhz;</div><div class='add'>+#define iwl_rf_wh iwl_rf_fm</div><div class='add'>+#define iwl_rf_wh_160mhz iwl_rf_fm_160mhz</div><div class='add'>+extern const struct iwl_rf_cfg iwl_rf_wh_non_eht;</div><div class='add'>+#define iwl_rf_pe iwl_rf_fm</div><div class='add'>+#endif /* CONFIG_IWLMLD */</div><div class='add'>+</div><div class='ctx'> #endif /* __IWL_CONFIG_H__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h<br/>index db312abd2e09..f3fa37fee2e4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-csr.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-csr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-csr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-csr.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> #define CSR_GPIO_IN             (CSR_BASE+0x018) /* read external chip pins */</div><div class='ctx'> #define CSR_RESET               (CSR_BASE+0x020) /* busmaster enable, NMI, etc*/</div><div class='ctx'> #define CSR_GP_CNTRL            (CSR_BASE+0x024)</div><div class='add'>+#define CSR_FUNC_SCRATCH        (CSR_BASE+0x02c) /* Scratch register - used for FW dbg */</div><div class='ctx'> </div><div class='ctx'> /* 2nd byte of CSR_INT_COALESCING, not accessible via iwl_write32()! */</div><div class='ctx'> #define CSR_INT_PERIODIC_REG	(CSR_BASE+0x005)</div><div class='hunk'>@@ -101,9 +102,28 @@</div><div class='ctx'> #define CSR_LTR_LONG_VAL_AD_SNOOP_VAL		0x000003ff</div><div class='ctx'> #define CSR_LTR_LONG_VAL_AD_SCALE_USEC		2</div><div class='ctx'> </div><div class='add'>+#define CSR_LTR_LAST_MSG			(CSR_BASE + 0x0DC)</div><div class='add'>+</div><div class='ctx'> /* GIO Chicken Bits (PCI Express bus link power management) */</div><div class='ctx'> #define CSR_GIO_CHICKEN_BITS    (CSR_BASE+0x100)</div><div class='ctx'> </div><div class='add'>+#define CSR_IPC_STATE		(CSR_BASE + 0x110)</div><div class='add'>+#define CSR_IPC_STATE_RESET	0x00000030</div><div class='add'>+#define CSR_IPC_STATE_RESET_NONE		0</div><div class='add'>+#define CSR_IPC_STATE_RESET_SW_READY		1</div><div class='add'>+#define CSR_IPC_STATE_RESET_TOP_READY		2</div><div class='add'>+#define CSR_IPC_STATE_RESET_TOP_FOLLOWER	3</div><div class='add'>+#define CSR_IPC_STATE_TOP_RESET_REQ		BIT(6)</div><div class='add'>+</div><div class='add'>+#define CSR_IPC_SLEEP_CONTROL	(CSR_BASE + 0x114)</div><div class='add'>+#define CSR_IPC_SLEEP_CONTROL_SUSPEND	0x3</div><div class='add'>+#define CSR_IPC_SLEEP_CONTROL_RESUME	0</div><div class='add'>+</div><div class='add'>+/* Doorbell - since Bz</div><div class='add'>+ * connected to UREG_DOORBELL_TO_ISR6 (lower 16 bits only)</div><div class='add'>+ */</div><div class='add'>+#define CSR_DOORBELL_VECTOR	(CSR_BASE + 0x130)</div><div class='add'>+</div><div class='ctx'> /* host chicken bits */</div><div class='ctx'> #define CSR_HOST_CHICKEN	(CSR_BASE + 0x204)</div><div class='ctx'> #define CSR_HOST_CHICKEN_PM_IDLE_SRC_DIS_SB_PME	BIT(19)</div><div class='hunk'>@@ -131,9 +151,15 @@</div><div class='ctx'> #define CSR_DBG_HPET_MEM_REG		(CSR_BASE+0x240)</div><div class='ctx'> #define CSR_DBG_LINK_PWR_MGMT_REG	(CSR_BASE+0x250)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Scratch register initial configuration - this is set on init, and read</div><div class='add'>+ * during a error FW error.</div><div class='add'>+ */</div><div class='add'>+#define CSR_FUNC_SCRATCH_INIT_VALUE		(0x01010101)</div><div class='add'>+#define CSR_FUNC_SCRATCH_POWER_OFF_MASK		0xFFFF</div><div class='add'>+</div><div class='ctx'> /* Bits for CSR_HW_IF_CONFIG_REG */</div><div class='del'>-#define CSR_HW_IF_CONFIG_REG_MSK_MAC_DASH	(0x00000003)</div><div class='del'>-#define CSR_HW_IF_CONFIG_REG_MSK_MAC_STEP	(0x0000000C)</div><div class='add'>+#define CSR_HW_IF_CONFIG_REG_MSK_MAC_STEP_DASH	(0x0000000F)</div><div class='ctx'> #define CSR_HW_IF_CONFIG_REG_BIT_MONITOR_SRAM	(0x00000080)</div><div class='ctx'> #define CSR_HW_IF_CONFIG_REG_MSK_BOARD_VER	(0x000000C0)</div><div class='ctx'> #define CSR_HW_IF_CONFIG_REG_BIT_MAC_SI		(0x00000100)</div><div class='hunk'>@@ -150,13 +176,15 @@</div><div class='ctx'> #define CSR_HW_IF_CONFIG_REG_POS_PHY_DASH	(12)</div><div class='ctx'> #define CSR_HW_IF_CONFIG_REG_POS_PHY_STEP	(14)</div><div class='ctx'> </div><div class='del'>-#define CSR_HW_IF_CONFIG_REG_BIT_HAP_WAKE_L1A	(0x00080000)</div><div class='del'>-#define CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM	(0x00200000)</div><div class='del'>-#define CSR_HW_IF_CONFIG_REG_BIT_NIC_READY	(0x00400000) /* PCI_OWN_SEM */</div><div class='del'>-#define CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE (0x02000000) /* ME_OWN */</div><div class='del'>-#define CSR_HW_IF_CONFIG_REG_PREPARE		  (0x08000000) /* WAKE_ME */</div><div class='del'>-#define CSR_HW_IF_CONFIG_REG_ENABLE_PME		  (0x10000000)</div><div class='del'>-#define CSR_HW_IF_CONFIG_REG_PERSIST_MODE	  (0x40000000) /* PERSISTENCE */</div><div class='add'>+#define CSR_HW_IF_CONFIG_REG_HAP_WAKE			0x00080000</div><div class='add'>+/* NOTE: EEPROM_OWN_SEM is no longer defined for new HW */</div><div class='add'>+#define CSR_HW_IF_CONFIG_REG_EEPROM_OWN_SEM		0x00200000</div><div class='add'>+#define CSR_HW_IF_CONFIG_REG_PCI_OWN_SET		0x00400000</div><div class='add'>+#define CSR_HW_IF_CONFIG_REG_IAMT_UP			0x01000000</div><div class='add'>+#define CSR_HW_IF_CONFIG_REG_ME_OWN			0x02000000</div><div class='add'>+#define CSR_HW_IF_CONFIG_REG_WAKE_ME			0x08000000</div><div class='add'>+#define CSR_HW_IF_CONFIG_REG_WAKE_ME_PCIE_OWNER_EN	0x10000000</div><div class='add'>+#define CSR_HW_IF_CONFIG_REG_PERSISTENCE		0x40000000</div><div class='ctx'> </div><div class='ctx'> #define CSR_MBOX_SET_REG_OS_ALIVE		BIT(5)</div><div class='ctx'> </div><div class='hunk'>@@ -174,17 +202,19 @@</div><div class='ctx'> #define CSR_INT_BIT_RF_KILL      (1 &lt;&lt; 7)  /* HW RFKILL switch GP_CNTRL[27] toggled */</div><div class='ctx'> #define CSR_INT_BIT_CT_KILL      (1 &lt;&lt; 6)  /* Critical temp (chip too hot) rfkill */</div><div class='ctx'> #define CSR_INT_BIT_SW_RX        (1 &lt;&lt; 3)  /* Rx, command responses */</div><div class='add'>+#define CSR_INT_BIT_RESET_DONE   (1 &lt;&lt; 2)  /* reset handshake with firmware is done */</div><div class='ctx'> #define CSR_INT_BIT_WAKEUP       (1 &lt;&lt; 1)  /* NIC controller waking up (pwr mgmt) */</div><div class='ctx'> #define CSR_INT_BIT_ALIVE        (1 &lt;&lt; 0)  /* uCode interrupts once it initializes */</div><div class='ctx'> </div><div class='del'>-#define CSR_INI_SET_MASK	(CSR_INT_BIT_FH_RX   | \</div><div class='del'>-				 CSR_INT_BIT_HW_ERR  | \</div><div class='del'>-				 CSR_INT_BIT_FH_TX   | \</div><div class='del'>-				 CSR_INT_BIT_SW_ERR  | \</div><div class='del'>-				 CSR_INT_BIT_RF_KILL | \</div><div class='del'>-				 CSR_INT_BIT_SW_RX   | \</div><div class='del'>-				 CSR_INT_BIT_WAKEUP  | \</div><div class='del'>-				 CSR_INT_BIT_ALIVE   | \</div><div class='add'>+#define CSR_INI_SET_MASK	(CSR_INT_BIT_FH_RX	| \</div><div class='add'>+				 CSR_INT_BIT_HW_ERR	| \</div><div class='add'>+				 CSR_INT_BIT_FH_TX	| \</div><div class='add'>+				 CSR_INT_BIT_SW_ERR	| \</div><div class='add'>+				 CSR_INT_BIT_RF_KILL	| \</div><div class='add'>+				 CSR_INT_BIT_SW_RX	| \</div><div class='add'>+				 CSR_INT_BIT_WAKEUP	| \</div><div class='add'>+				 CSR_INT_BIT_RESET_DONE	| \</div><div class='add'>+				 CSR_INT_BIT_ALIVE	| \</div><div class='ctx'> 				 CSR_INT_BIT_RX_PERIODIC)</div><div class='ctx'> </div><div class='ctx'> /* interrupt flags in FH (flow handler) (PCI busmaster DMA) */</div><div class='hunk'>@@ -266,10 +296,17 @@</div><div class='ctx'> #define CSR_GP_CNTRL_REG_FLAG_RFKILL_WAKE_L1A_EN     (0x04000000)</div><div class='ctx'> #define CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW          (0x08000000)</div><div class='ctx'> </div><div class='add'>+/* From Bz we use these instead during init/reset flow */</div><div class='add'>+#define CSR_GP_CNTRL_REG_FLAG_MAC_INIT			BIT(6)</div><div class='add'>+#define CSR_GP_CNTRL_REG_FLAG_ROM_START			BIT(7)</div><div class='add'>+#define CSR_GP_CNTRL_REG_FLAG_MAC_STATUS		BIT(20)</div><div class='add'>+#define CSR_GP_CNTRL_REG_FLAG_BZ_MAC_ACCESS_REQ		BIT(21)</div><div class='add'>+#define CSR_GP_CNTRL_REG_FLAG_BUS_MASTER_DISABLE_STATUS	BIT(28)</div><div class='add'>+#define CSR_GP_CNTRL_REG_FLAG_BUS_MASTER_DISABLE_REQ	BIT(29)</div><div class='add'>+#define CSR_GP_CNTRL_REG_FLAG_SW_RESET			BIT(31)</div><div class='ctx'> </div><div class='ctx'> /* HW REV */</div><div class='del'>-#define CSR_HW_REV_DASH(_val)          (((_val) &amp; 0x0000003) &gt;&gt; 0)</div><div class='del'>-#define CSR_HW_REV_STEP(_val)          (((_val) &amp; 0x000000C) &gt;&gt; 2)</div><div class='add'>+#define CSR_HW_REV_STEP_DASH(_val)     ((_val) &amp; CSR_HW_IF_CONFIG_REG_MSK_MAC_STEP_DASH)</div><div class='ctx'> #define CSR_HW_REV_TYPE(_val)          (((_val) &amp; 0x000FFF0) &gt;&gt; 4)</div><div class='ctx'> </div><div class='ctx'> /* HW RFID */</div><div class='hunk'>@@ -280,13 +317,15 @@</div><div class='ctx'> #define CSR_HW_RFID_IS_CDB(_val)       (((_val) &amp; 0x10000000) &gt;&gt; 28)</div><div class='ctx'> #define CSR_HW_RFID_IS_JACKET(_val)    (((_val) &amp; 0x20000000) &gt;&gt; 29)</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *  hw_rev values</div><div class='del'>- */</div><div class='add'>+/* hw_rev values */</div><div class='ctx'> enum {</div><div class='ctx'> 	SILICON_A_STEP = 0,</div><div class='ctx'> 	SILICON_B_STEP,</div><div class='ctx'> 	SILICON_C_STEP,</div><div class='add'>+	SILICON_D_STEP,</div><div class='add'>+	SILICON_E_STEP,</div><div class='add'>+	SILICON_TC_STEP = 0xe,</div><div class='add'>+	SILICON_Z_STEP = 0xf,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -306,13 +345,14 @@ enum {</div><div class='ctx'> #define CSR_HW_REV_TYPE_2x00		(0x0000100)</div><div class='ctx'> #define CSR_HW_REV_TYPE_105		(0x0000110)</div><div class='ctx'> #define CSR_HW_REV_TYPE_135		(0x0000120)</div><div class='add'>+#define CSR_HW_REV_TYPE_3160		(0x0000164)</div><div class='ctx'> #define CSR_HW_REV_TYPE_7265D		(0x0000210)</div><div class='ctx'> #define CSR_HW_REV_TYPE_NONE		(0x00001F0)</div><div class='ctx'> #define CSR_HW_REV_TYPE_QNJ		(0x0000360)</div><div class='del'>-#define CSR_HW_REV_TYPE_QNJ_B0		(0x0000364)</div><div class='del'>-#define CSR_HW_REV_TYPE_QU_B0		(0x0000334)</div><div class='del'>-#define CSR_HW_REV_TYPE_QU_C0		(0x0000338)</div><div class='del'>-#define CSR_HW_REV_TYPE_QUZ		(0x0000354)</div><div class='add'>+#define CSR_HW_REV_TYPE_QNJ_B0		(0x0000361)</div><div class='add'>+#define CSR_HW_REV_TYPE_QU_B0		(0x0000331)</div><div class='add'>+#define CSR_HW_REV_TYPE_QU_C0		(0x0000332)</div><div class='add'>+#define CSR_HW_REV_TYPE_QUZ		(0x0000351)</div><div class='ctx'> #define CSR_HW_REV_TYPE_HR_CDB		(0x0000340)</div><div class='ctx'> #define CSR_HW_REV_TYPE_SO		(0x0000370)</div><div class='ctx'> #define CSR_HW_REV_TYPE_TY		(0x0000420)</div><div class='hunk'>@@ -324,9 +364,8 @@ enum {</div><div class='ctx'> #define CSR_HW_RF_ID_TYPE_HRCDB		(0x00109F00)</div><div class='ctx'> #define CSR_HW_RF_ID_TYPE_GF		(0x0010D000)</div><div class='ctx'> #define CSR_HW_RF_ID_TYPE_GF4		(0x0010E000)</div><div class='del'>-</div><div class='del'>-/* HW_RF CHIP ID  */</div><div class='del'>-#define CSR_HW_RF_ID_TYPE_CHIP_ID(_val) (((_val) &gt;&gt; 12) &amp; 0xFFF)</div><div class='add'>+#define CSR_HW_RF_ID_TYPE_FM		(0x00112000)</div><div class='add'>+#define CSR_HW_RF_ID_TYPE_WP		(0x00113000)</div><div class='ctx'> </div><div class='ctx'> /* HW_RF CHIP STEP  */</div><div class='ctx'> #define CSR_HW_RF_STEP(_val) (((_val) &gt;&gt; 8) &amp; 0xF)</div><div class='hunk'>@@ -513,6 +552,9 @@ enum {</div><div class='ctx'>  * 11-8:  queue selector</div><div class='ctx'>  */</div><div class='ctx'> #define HBUS_TARG_WRPTR         (HBUS_BASE+0x060)</div><div class='add'>+/* This register is common for Tx and Rx, Rx queues start from 512 */</div><div class='add'>+#define HBUS_TARG_WRPTR_Q_SHIFT (16)</div><div class='add'>+#define HBUS_TARG_WRPTR_RX_Q(q) (((q) + 512) &lt;&lt; HBUS_TARG_WRPTR_Q_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /**********************************************************</div><div class='ctx'>  * CSR values</div><div class='hunk'>@@ -589,6 +631,8 @@ enum msix_hw_int_causes {</div><div class='ctx'> 	MSIX_HW_INT_CAUSES_REG_WAKEUP		= BIT(1),</div><div class='ctx'> 	MSIX_HW_INT_CAUSES_REG_IML              = BIT(1),</div><div class='ctx'> 	MSIX_HW_INT_CAUSES_REG_RESET_DONE	= BIT(2),</div><div class='add'>+	MSIX_HW_INT_CAUSES_REG_TOP_FATAL_ERR	= BIT(3),</div><div class='add'>+	MSIX_HW_INT_CAUSES_REG_SW_ERR_BZ	= BIT(5),</div><div class='ctx'> 	MSIX_HW_INT_CAUSES_REG_CT_KILL		= BIT(6),</div><div class='ctx'> 	MSIX_HW_INT_CAUSES_REG_RF_KILL		= BIT(7),</div><div class='ctx'> 	MSIX_HW_INT_CAUSES_REG_PERIODIC		= BIT(8),</div><div class='hunk'>@@ -607,10 +651,10 @@ enum msix_hw_int_causes {</div><div class='ctx'>  *                     HW address related registers                          *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#define CSR_ADDR_BASE			(0x380)</div><div class='del'>-#define CSR_MAC_ADDR0_OTP		(CSR_ADDR_BASE)</div><div class='del'>-#define CSR_MAC_ADDR1_OTP		(CSR_ADDR_BASE + 4)</div><div class='del'>-#define CSR_MAC_ADDR0_STRAP		(CSR_ADDR_BASE + 8)</div><div class='del'>-#define CSR_MAC_ADDR1_STRAP		(CSR_ADDR_BASE + 0xC)</div><div class='add'>+#define CSR_ADDR_BASE(trans)			((trans)-&gt;mac_cfg-&gt;base-&gt;mac_addr_from_csr)</div><div class='add'>+#define CSR_MAC_ADDR0_OTP(trans)		(CSR_ADDR_BASE(trans) + 0x00)</div><div class='add'>+#define CSR_MAC_ADDR1_OTP(trans)		(CSR_ADDR_BASE(trans) + 0x04)</div><div class='add'>+#define CSR_MAC_ADDR0_STRAP(trans)		(CSR_ADDR_BASE(trans) + 0x08)</div><div class='add'>+#define CSR_MAC_ADDR1_STRAP(trans)		(CSR_ADDR_BASE(trans) + 0x0c)</div><div class='ctx'> </div><div class='ctx'> #endif /* !__iwl_csr_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c<br/>index 4cd8c39cc3e9..5240dacf1360 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2018-2021 Intel Corporation</div><div class='add'>+ * Copyright (C) 2018-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include "iwl-drv.h"</div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'>  * @IWL_DBG_TLV_TYPE_HCMD: host command TLV</div><div class='ctx'>  * @IWL_DBG_TLV_TYPE_REGION: region TLV</div><div class='ctx'>  * @IWL_DBG_TLV_TYPE_TRIGGER: trigger TLV</div><div class='add'>+ * @IWL_DBG_TLV_TYPE_CONF_SET: conf set TLV</div><div class='ctx'>  * @IWL_DBG_TLV_TYPE_NUM: number of debug TLVs</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_dbg_tlv_type {</div><div class='hunk'>@@ -25,6 +26,7 @@ enum iwl_dbg_tlv_type {</div><div class='ctx'> 	IWL_DBG_TLV_TYPE_HCMD,</div><div class='ctx'> 	IWL_DBG_TLV_TYPE_REGION,</div><div class='ctx'> 	IWL_DBG_TLV_TYPE_TRIGGER,</div><div class='add'>+	IWL_DBG_TLV_TYPE_CONF_SET,</div><div class='ctx'> 	IWL_DBG_TLV_TYPE_NUM,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -57,24 +59,27 @@ dbg_ver_table[IWL_DBG_TLV_TYPE_NUM] = {</div><div class='ctx'> 	[IWL_DBG_TLV_TYPE_DEBUG_INFO]	= {.min_ver = 1, .max_ver = 1,},</div><div class='ctx'> 	[IWL_DBG_TLV_TYPE_BUF_ALLOC]	= {.min_ver = 1, .max_ver = 1,},</div><div class='ctx'> 	[IWL_DBG_TLV_TYPE_HCMD]		= {.min_ver = 1, .max_ver = 1,},</div><div class='del'>-	[IWL_DBG_TLV_TYPE_REGION]	= {.min_ver = 1, .max_ver = 1,},</div><div class='add'>+	[IWL_DBG_TLV_TYPE_REGION]	= {.min_ver = 1, .max_ver = 3,},</div><div class='ctx'> 	[IWL_DBG_TLV_TYPE_TRIGGER]	= {.min_ver = 1, .max_ver = 1,},</div><div class='add'>+	[IWL_DBG_TLV_TYPE_CONF_SET]	= {.min_ver = 1, .max_ver = 1,},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int iwl_dbg_tlv_add(const struct iwl_ucode_tlv *tlv,</div><div class='del'>-			   struct list_head *list)</div><div class='add'>+/* add a new TLV node, returning it so it can be modified */</div><div class='add'>+static struct iwl_ucode_tlv *iwl_dbg_tlv_add(const struct iwl_ucode_tlv *tlv,</div><div class='add'>+					     struct list_head *list)</div><div class='ctx'> {</div><div class='ctx'> 	u32 len = le32_to_cpu(tlv-&gt;length);</div><div class='ctx'> 	struct iwl_dbg_tlv_node *node;</div><div class='ctx'> </div><div class='del'>-	node = kzalloc(sizeof(*node) + len, GFP_KERNEL);</div><div class='add'>+	node = kzalloc(struct_size(node, tlv.data, len), GFP_KERNEL);</div><div class='ctx'> 	if (!node)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;node-&gt;tlv, tlv, sizeof(node-&gt;tlv) + len);</div><div class='add'>+	memcpy(&amp;node-&gt;tlv, tlv, sizeof(node-&gt;tlv));</div><div class='add'>+	memcpy(node-&gt;tlv.data, tlv-&gt;data, len);</div><div class='ctx'> 	list_add_tail(&amp;node-&gt;list, list);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return &amp;node-&gt;tlv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool iwl_dbg_tlv_ver_support(const struct iwl_ucode_tlv *tlv)</div><div class='hunk'>@@ -99,10 +104,18 @@ static int iwl_dbg_tlv_alloc_debug_info(struct iwl_trans *trans,</div><div class='ctx'> 	if (le32_to_cpu(tlv-&gt;length) != sizeof(*debug_info))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* we use this as a string, ensure input was NUL terminated */</div><div class='add'>+	if (strnlen(debug_info-&gt;debug_cfg_name,</div><div class='add'>+		    sizeof(debug_info-&gt;debug_cfg_name)) ==</div><div class='add'>+			sizeof(debug_info-&gt;debug_cfg_name))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	IWL_DEBUG_FW(trans, "WRT: Loading debug cfg: %s\n",</div><div class='ctx'> 		     debug_info-&gt;debug_cfg_name);</div><div class='ctx'> </div><div class='del'>-	return iwl_dbg_tlv_add(tlv, &amp;trans-&gt;dbg.debug_info_tlv_list);</div><div class='add'>+	if (!iwl_dbg_tlv_add(tlv, &amp;trans-&gt;dbg.debug_info_tlv_list))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_dbg_tlv_alloc_buf_alloc(struct iwl_trans *trans,</div><div class='hunk'>@@ -131,10 +144,15 @@ static int iwl_dbg_tlv_alloc_buf_alloc(struct iwl_trans *trans,</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	if (buf_location == IWL_FW_INI_LOCATION_SRAM_PATH &amp;&amp;</div><div class='del'>-	    alloc_id != IWL_FW_INI_ALLOCATION_ID_DBGC1 &amp;&amp;</div><div class='del'>-	    alloc_id != IWL_FW_INI_ALLOCATION_ID_INTERNAL)</div><div class='add'>+	    alloc_id != IWL_FW_INI_ALLOCATION_ID_DBGC1)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='add'>+	if (buf_location == IWL_FW_INI_LOCATION_DRAM_PATH &amp;&amp;</div><div class='add'>+	    alloc-&gt;req_size == 0) {</div><div class='add'>+		IWL_ERR(trans, "WRT: Invalid DRAM buffer allocation requested size (0)\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	trans-&gt;dbg.fw_mon_cfg[alloc_id] = *alloc;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -166,7 +184,9 @@ static int iwl_dbg_tlv_alloc_hcmd(struct iwl_trans *trans,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return iwl_dbg_tlv_add(tlv, &amp;trans-&gt;dbg.time_point[tp].hcmd_list);</div><div class='add'>+	if (!iwl_dbg_tlv_add(tlv, &amp;trans-&gt;dbg.time_point[tp].hcmd_list))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_dbg_tlv_alloc_region(struct iwl_trans *trans,</div><div class='hunk'>@@ -175,12 +195,23 @@ static int iwl_dbg_tlv_alloc_region(struct iwl_trans *trans,</div><div class='ctx'> 	const struct iwl_fw_ini_region_tlv *reg = (const void *)tlv-&gt;data;</div><div class='ctx'> 	struct iwl_ucode_tlv **active_reg;</div><div class='ctx'> 	u32 id = le32_to_cpu(reg-&gt;id);</div><div class='del'>-	u32 type = le32_to_cpu(reg-&gt;type);</div><div class='add'>+	u8 type = reg-&gt;type;</div><div class='ctx'> 	u32 tlv_len = sizeof(*tlv) + le32_to_cpu(tlv-&gt;length);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * The higher part of the ID from version 2 is debug policy.</div><div class='add'>+	 * The id will be only lsb 16 bits, so mask it out.</div><div class='add'>+	 */</div><div class='add'>+	if (le32_to_cpu(reg-&gt;hdr.version) &gt;= 2)</div><div class='add'>+		id &amp;= IWL_FW_INI_REGION_ID_MASK;</div><div class='add'>+</div><div class='ctx'> 	if (le32_to_cpu(tlv-&gt;length) &lt; sizeof(*reg))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* for safe use of a string from FW, limit it to IWL_FW_INI_MAX_NAME */</div><div class='add'>+	IWL_DEBUG_FW(trans, "WRT: parsing region: %.*s\n",</div><div class='add'>+		     IWL_FW_INI_MAX_NAME, reg-&gt;name);</div><div class='add'>+</div><div class='ctx'> 	if (id &gt;= IWL_FW_INI_MAX_REGION_ID) {</div><div class='ctx'> 		IWL_ERR(trans, "WRT: Invalid region id %u\n", id);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -192,12 +223,14 @@ static int iwl_dbg_tlv_alloc_region(struct iwl_trans *trans,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (type == IWL_FW_INI_REGION_PCI_IOSF_CONFIG &amp;&amp;</div><div class='del'>-	    !trans-&gt;ops-&gt;read_config32) {</div><div class='del'>-		IWL_ERR(trans, "WRT: Unsupported region type %u\n", type);</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+	if (type == IWL_FW_INI_REGION_INTERNAL_BUFFER) {</div><div class='add'>+		trans-&gt;dbg.imr_data.sram_addr =</div><div class='add'>+			le32_to_cpu(reg-&gt;internal_buffer.base_addr);</div><div class='add'>+		trans-&gt;dbg.imr_data.sram_size =</div><div class='add'>+			le32_to_cpu(reg-&gt;internal_buffer.size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> 	active_reg = &amp;trans-&gt;dbg.active_regions[id];</div><div class='ctx'> 	if (*active_reg) {</div><div class='ctx'> 		IWL_WARN(trans, "WRT: Overriding region id %u\n", id);</div><div class='hunk'>@@ -218,10 +251,9 @@ static int iwl_dbg_tlv_alloc_trigger(struct iwl_trans *trans,</div><div class='ctx'> 				     const struct iwl_ucode_tlv *tlv)</div><div class='ctx'> {</div><div class='ctx'> 	const struct iwl_fw_ini_trigger_tlv *trig = (const void *)tlv-&gt;data;</div><div class='del'>-	struct iwl_fw_ini_trigger_tlv *dup_trig;</div><div class='ctx'> 	u32 tp = le32_to_cpu(trig-&gt;time_point);</div><div class='del'>-	struct iwl_ucode_tlv *dup = NULL;</div><div class='del'>-	int ret;</div><div class='add'>+	u32 rf = le32_to_cpu(trig-&gt;reset_fw);</div><div class='add'>+	struct iwl_ucode_tlv *new_tlv;</div><div class='ctx'> </div><div class='ctx'> 	if (le32_to_cpu(tlv-&gt;length) &lt; sizeof(*trig))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -234,20 +266,48 @@ static int iwl_dbg_tlv_alloc_trigger(struct iwl_trans *trans,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	IWL_DEBUG_FW(trans,</div><div class='add'>+		     "WRT: time point %u for trigger TLV with reset_fw %u\n",</div><div class='add'>+		     tp, rf);</div><div class='add'>+	trans-&gt;dbg.last_tp_resetfw = 0xFF;</div><div class='add'>+</div><div class='add'>+	new_tlv = iwl_dbg_tlv_add(tlv, &amp;trans-&gt;dbg.time_point[tp].trig_list);</div><div class='add'>+	if (!new_tlv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	if (!le32_to_cpu(trig-&gt;occurrences)) {</div><div class='del'>-		dup = kmemdup(tlv, sizeof(*tlv) + le32_to_cpu(tlv-&gt;length),</div><div class='del'>-				GFP_KERNEL);</div><div class='del'>-		if (!dup)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		dup_trig = (void *)dup-&gt;data;</div><div class='del'>-		dup_trig-&gt;occurrences = cpu_to_le32(-1);</div><div class='del'>-		tlv = dup;</div><div class='add'>+		struct iwl_fw_ini_trigger_tlv *new_trig = (void *)new_tlv-&gt;data;</div><div class='add'>+</div><div class='add'>+		new_trig-&gt;occurrences = cpu_to_le32(-1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_dbg_tlv_config_set(struct iwl_trans *trans,</div><div class='add'>+				  const struct iwl_ucode_tlv *tlv)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_fw_ini_conf_set_tlv *conf_set = (const void *)tlv-&gt;data;</div><div class='add'>+	u32 tp = le32_to_cpu(conf_set-&gt;time_point);</div><div class='add'>+	u32 type = le32_to_cpu(conf_set-&gt;set_type);</div><div class='add'>+</div><div class='add'>+	if (tp &lt;= IWL_FW_INI_TIME_POINT_INVALID ||</div><div class='add'>+	    tp &gt;= IWL_FW_INI_TIME_POINT_NUM) {</div><div class='add'>+		IWL_DEBUG_FW(trans,</div><div class='add'>+			     "WRT: Invalid time point %u for config set TLV\n", tp);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = iwl_dbg_tlv_add(tlv, &amp;trans-&gt;dbg.time_point[tp].trig_list);</div><div class='del'>-	kfree(dup);</div><div class='add'>+	if (type &lt;= IWL_FW_INI_CONFIG_SET_TYPE_INVALID ||</div><div class='add'>+	    type &gt;= IWL_FW_INI_CONFIG_SET_TYPE_MAX_NUM) {</div><div class='add'>+		IWL_DEBUG_FW(trans,</div><div class='add'>+			     "WRT: Invalid config set type %u for config set TLV\n", type);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	if (!iwl_dbg_tlv_add(tlv, &amp;trans-&gt;dbg.time_point[tp].config_list))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int (*dbg_tlv_alloc[])(struct iwl_trans *trans,</div><div class='hunk'>@@ -257,19 +317,27 @@ static int (*dbg_tlv_alloc[])(struct iwl_trans *trans,</div><div class='ctx'> 	[IWL_DBG_TLV_TYPE_HCMD]		= iwl_dbg_tlv_alloc_hcmd,</div><div class='ctx'> 	[IWL_DBG_TLV_TYPE_REGION]	= iwl_dbg_tlv_alloc_region,</div><div class='ctx'> 	[IWL_DBG_TLV_TYPE_TRIGGER]	= iwl_dbg_tlv_alloc_trigger,</div><div class='add'>+	[IWL_DBG_TLV_TYPE_CONF_SET]	= iwl_dbg_tlv_config_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void iwl_dbg_tlv_alloc(struct iwl_trans *trans, const struct iwl_ucode_tlv *tlv,</div><div class='ctx'> 		       bool ext)</div><div class='ctx'> {</div><div class='del'>-	const struct iwl_fw_ini_header *hdr = (const void *)&amp;tlv-&gt;data[0];</div><div class='del'>-	u32 type = le32_to_cpu(tlv-&gt;type);</div><div class='del'>-	u32 tlv_idx = type - IWL_UCODE_TLV_DEBUG_BASE;</div><div class='del'>-	u32 domain = le32_to_cpu(hdr-&gt;domain);</div><div class='ctx'> 	enum iwl_ini_cfg_state *cfg_state = ext ?</div><div class='ctx'> 		&amp;trans-&gt;dbg.external_ini_cfg : &amp;trans-&gt;dbg.internal_ini_cfg;</div><div class='add'>+	const struct iwl_fw_ini_header *hdr = (const void *)&amp;tlv-&gt;data[0];</div><div class='add'>+	u32 type;</div><div class='add'>+	u32 tlv_idx;</div><div class='add'>+	u32 domain;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (le32_to_cpu(tlv-&gt;length) &lt; sizeof(*hdr))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	type = le32_to_cpu(tlv-&gt;type);</div><div class='add'>+	tlv_idx = type - IWL_UCODE_TLV_DEBUG_BASE;</div><div class='add'>+	domain = le32_to_cpu(hdr-&gt;domain);</div><div class='add'>+</div><div class='ctx'> 	if (domain != IWL_FW_INI_DOMAIN_ALWAYS_ON &amp;&amp;</div><div class='ctx'> 	    !(domain &amp; trans-&gt;dbg.domains_bitmap)) {</div><div class='ctx'> 		IWL_DEBUG_FW(trans,</div><div class='hunk'>@@ -291,9 +359,9 @@ void iwl_dbg_tlv_alloc(struct iwl_trans *trans, const struct iwl_ucode_tlv *tlv,</div><div class='ctx'> </div><div class='ctx'> 	ret = dbg_tlv_alloc[tlv_idx](trans, tlv);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		IWL_ERR(trans,</div><div class='del'>-			"WRT: Failed to allocate TLV 0x%x, ret %d, (ext=%d)\n",</div><div class='del'>-			type, ret, ext);</div><div class='add'>+		IWL_WARN(trans,</div><div class='add'>+			 "WRT: Failed to allocate TLV 0x%x, ret %d, (ext=%d)\n",</div><div class='add'>+			 type, ret, ext);</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -312,7 +380,7 @@ void iwl_dbg_tlv_del_timers(struct iwl_trans *trans)</div><div class='ctx'> 	struct iwl_dbg_tlv_timer_node *node, *tmp;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(node, tmp, timer_list, list) {</div><div class='del'>-		del_timer(&amp;node-&gt;timer);</div><div class='add'>+		timer_shutdown_sync(&amp;node-&gt;timer);</div><div class='ctx'> 		list_del(&amp;node-&gt;list);</div><div class='ctx'> 		kfree(node);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -389,6 +457,13 @@ void iwl_dbg_tlv_free(struct iwl_trans *trans)</div><div class='ctx'> 			list_del(&amp;tlv_node-&gt;list);</div><div class='ctx'> 			kfree(tlv_node);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		list_for_each_entry_safe(tlv_node, tlv_node_tmp,</div><div class='add'>+					 &amp;tp-&gt;config_list, list) {</div><div class='add'>+			list_del(&amp;tlv_node-&gt;list);</div><div class='add'>+			kfree(tlv_node);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(trans-&gt;dbg.fw_mon_ini); i++)</div><div class='hunk'>@@ -403,7 +478,7 @@ static int iwl_dbg_tlv_parse_bin(struct iwl_trans *trans, const u8 *data,</div><div class='ctx'> </div><div class='ctx'> 	while (len &gt;= sizeof(*tlv)) {</div><div class='ctx'> 		len -= sizeof(*tlv);</div><div class='del'>-		tlv = (void *)data;</div><div class='add'>+		tlv = (const void *)data;</div><div class='ctx'> </div><div class='ctx'> 		tlv_len = le32_to_cpu(tlv-&gt;length);</div><div class='ctx'> </div><div class='hunk'>@@ -424,16 +499,21 @@ static int iwl_dbg_tlv_parse_bin(struct iwl_trans *trans, const u8 *data,</div><div class='ctx'> void iwl_dbg_tlv_load_bin(struct device *dev, struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	const struct firmware *fw;</div><div class='add'>+	const char *yoyo_bin = "iwl-debug-yoyo.bin";</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='ctx'> 	if (!iwlwifi_mod_params.enable_ini ||</div><div class='del'>-	    trans-&gt;trans_cfg-&gt;device_family &lt;= IWL_DEVICE_FAMILY_9000)</div><div class='add'>+	    trans-&gt;mac_cfg-&gt;device_family &lt;= IWL_DEVICE_FAMILY_8000)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	res = firmware_request_nowarn(&amp;fw, "iwl-debug-yoyo.bin", dev);</div><div class='add'>+	res = firmware_request_nowarn(&amp;fw, yoyo_bin, dev);</div><div class='add'>+	IWL_DEBUG_FW(trans, "%s %s\n", res ? "didn't load" : "loaded", yoyo_bin);</div><div class='add'>+</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	trans-&gt;dbg.yoyo_bin_loaded = true;</div><div class='add'>+</div><div class='ctx'> 	iwl_dbg_tlv_parse_bin(trans, fw-&gt;data, fw-&gt;size);</div><div class='ctx'> </div><div class='ctx'> 	release_firmware(fw);</div><div class='hunk'>@@ -453,6 +533,7 @@ void iwl_dbg_tlv_init(struct iwl_trans *trans)</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;tp-&gt;trig_list);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;tp-&gt;hcmd_list);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;tp-&gt;active_trig_list);</div><div class='add'>+		INIT_LIST_HEAD(&amp;tp-&gt;config_list);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -510,17 +591,25 @@ static int iwl_dbg_tlv_alloc_fragments(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	fw_mon_cfg = &amp;fwrt-&gt;trans-&gt;dbg.fw_mon_cfg[alloc_id];</div><div class='ctx'> 	fw_mon = &amp;fwrt-&gt;trans-&gt;dbg.fw_mon_ini[alloc_id];</div><div class='ctx'> </div><div class='del'>-	if (fw_mon-&gt;num_frags ||</div><div class='del'>-	    fw_mon_cfg-&gt;buf_location !=</div><div class='add'>+	if (fw_mon-&gt;num_frags) {</div><div class='add'>+		for (i = 0; i &lt; fw_mon-&gt;num_frags; i++)</div><div class='add'>+			memset(fw_mon-&gt;frags[i].block, 0,</div><div class='add'>+			       fw_mon-&gt;frags[i].size);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fw_mon_cfg-&gt;buf_location !=</div><div class='ctx'> 	    cpu_to_le32(IWL_FW_INI_LOCATION_DRAM_PATH))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	num_frags = le32_to_cpu(fw_mon_cfg-&gt;max_frags_num);</div><div class='del'>-	if (!fw_has_capa(&amp;fwrt-&gt;fw-&gt;ucode_capa,</div><div class='del'>-			 IWL_UCODE_TLV_CAPA_DBG_BUF_ALLOC_CMD_SUPP)) {</div><div class='add'>+	if (fwrt-&gt;trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210) {</div><div class='ctx'> 		if (alloc_id != IWL_FW_INI_ALLOCATION_ID_DBGC1)</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		num_frags = 1;</div><div class='add'>+	} else if (fwrt-&gt;trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_BZ &amp;&amp;</div><div class='add'>+			   alloc_id &gt; IWL_FW_INI_ALLOCATION_ID_DBGC3) {</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	remain_pages = DIV_ROUND_UP(le32_to_cpu(fw_mon_cfg-&gt;req_size),</div><div class='hunk'>@@ -610,6 +699,7 @@ static int iwl_dbg_tlv_apply_buffer(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			.id = WIDE_ID(DEBUG_GROUP, BUFFER_ALLOCATION),</div><div class='ctx'> 			.data[0] = &amp;data,</div><div class='ctx'> 			.len[0] = sizeof(data),</div><div class='add'>+			.flags = CMD_SEND_IN_RFKILL,</div><div class='ctx'> 		};</div><div class='ctx'> 		int ret, j;</div><div class='ctx'> </div><div class='hunk'>@@ -635,6 +725,10 @@ static void iwl_dbg_tlv_apply_buffers(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> </div><div class='add'>+	if (fw_has_capa(&amp;fwrt-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			IWL_UCODE_TLV_CAPA_DRAM_FRAG_SUPPORT))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; IWL_FW_INI_ALLOCATION_NUM; i++) {</div><div class='ctx'> 		ret = iwl_dbg_tlv_apply_buffer(fwrt, i);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -644,6 +738,97 @@ static void iwl_dbg_tlv_apply_buffers(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int iwl_dbg_tlv_update_dram(struct iwl_fw_runtime *fwrt,</div><div class='add'>+				   enum iwl_fw_ini_allocation_id alloc_id,</div><div class='add'>+				   struct iwl_dram_info *dram_info)</div><div class='add'>+{</div><div class='add'>+	struct iwl_fw_mon *fw_mon;</div><div class='add'>+	u32 remain_frags, num_frags;</div><div class='add'>+	int j, fw_mon_idx = 0;</div><div class='add'>+	struct iwl_buf_alloc_cmd *data;</div><div class='add'>+</div><div class='add'>+	if (le32_to_cpu(fwrt-&gt;trans-&gt;dbg.fw_mon_cfg[alloc_id].buf_location) !=</div><div class='add'>+			IWL_FW_INI_LOCATION_DRAM_PATH) {</div><div class='add'>+		IWL_DEBUG_FW(fwrt, "WRT: alloc_id %u location is not in DRAM_PATH\n",</div><div class='add'>+			     alloc_id);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fw_mon = &amp;fwrt-&gt;trans-&gt;dbg.fw_mon_ini[alloc_id];</div><div class='add'>+</div><div class='add'>+	/* the first fragment of DBGC1 is given to the FW via register</div><div class='add'>+	 * or context info</div><div class='add'>+	 */</div><div class='add'>+	if (alloc_id == IWL_FW_INI_ALLOCATION_ID_DBGC1)</div><div class='add'>+		fw_mon_idx++;</div><div class='add'>+</div><div class='add'>+	remain_frags = fw_mon-&gt;num_frags - fw_mon_idx;</div><div class='add'>+	if (!remain_frags)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	num_frags = min_t(u32, remain_frags, BUF_ALLOC_MAX_NUM_FRAGS);</div><div class='add'>+	data = &amp;dram_info-&gt;dram_frags[alloc_id - 1];</div><div class='add'>+	data-&gt;alloc_id = cpu_to_le32(alloc_id);</div><div class='add'>+	data-&gt;num_frags = cpu_to_le32(num_frags);</div><div class='add'>+	data-&gt;buf_location = cpu_to_le32(IWL_FW_INI_LOCATION_DRAM_PATH);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_FW(fwrt, "WRT: DRAM buffer details alloc_id=%u, num_frags=%u\n",</div><div class='add'>+		     cpu_to_le32(alloc_id), cpu_to_le32(num_frags));</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; num_frags; j++) {</div><div class='add'>+		struct iwl_buf_alloc_frag *frag = &amp;data-&gt;frags[j];</div><div class='add'>+		struct iwl_dram_data *fw_mon_frag = &amp;fw_mon-&gt;frags[fw_mon_idx++];</div><div class='add'>+</div><div class='add'>+		frag-&gt;addr = cpu_to_le64(fw_mon_frag-&gt;physical);</div><div class='add'>+		frag-&gt;size = cpu_to_le32(fw_mon_frag-&gt;size);</div><div class='add'>+		IWL_DEBUG_FW(fwrt, "WRT: DRAM fragment details\n");</div><div class='add'>+		IWL_DEBUG_FW(fwrt, "frag=%u, addr=0x%016llx, size=0x%x)\n",</div><div class='add'>+			     j, cpu_to_le64(fw_mon_frag-&gt;physical),</div><div class='add'>+			     cpu_to_le32(fw_mon_frag-&gt;size));</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_dbg_tlv_update_drams(struct iwl_fw_runtime *fwrt)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+	bool dram_alloc = false;</div><div class='add'>+	struct iwl_dram_data *frags =</div><div class='add'>+		&amp;fwrt-&gt;trans-&gt;dbg.fw_mon_ini[IWL_FW_INI_ALLOCATION_ID_DBGC1].frags[0];</div><div class='add'>+	struct iwl_dram_info *dram_info;</div><div class='add'>+</div><div class='add'>+	if (!frags || !frags-&gt;block)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dram_info = frags-&gt;block;</div><div class='add'>+</div><div class='add'>+	if (!fw_has_capa(&amp;fwrt-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			 IWL_UCODE_TLV_CAPA_DRAM_FRAG_SUPPORT))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memset(dram_info, 0, sizeof(*dram_info));</div><div class='add'>+</div><div class='add'>+	for (i = IWL_FW_INI_ALLOCATION_ID_DBGC1;</div><div class='add'>+	     i &lt; IWL_FW_INI_ALLOCATION_NUM; i++) {</div><div class='add'>+		if (fwrt-&gt;trans-&gt;dbg.fw_mon_cfg[i].buf_location ==</div><div class='add'>+				IWL_FW_INI_LOCATION_INVALID)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = iwl_dbg_tlv_update_dram(fwrt, i, dram_info);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dram_alloc = true;</div><div class='add'>+		else</div><div class='add'>+			IWL_INFO(fwrt,</div><div class='add'>+				 "WRT: Failed to set DRAM buffer for alloc id %d, ret=%d\n",</div><div class='add'>+				 i, ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dram_alloc) {</div><div class='add'>+		dram_info-&gt;first_word = cpu_to_le32(DRAM_INFO_FIRST_MAGIC_WORD);</div><div class='add'>+		dram_info-&gt;second_word = cpu_to_le32(DRAM_INFO_SECOND_MAGIC_WORD);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void iwl_dbg_tlv_send_hcmds(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 				   struct list_head *hcmd_list)</div><div class='ctx'> {</div><div class='hunk'>@@ -663,16 +848,114 @@ static void iwl_dbg_tlv_send_hcmds(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void iwl_dbg_tlv_apply_config(struct iwl_fw_runtime *fwrt,</div><div class='add'>+				     struct list_head *conf_list)</div><div class='add'>+{</div><div class='add'>+	struct iwl_dbg_tlv_node *node;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(node, conf_list, list) {</div><div class='add'>+		struct iwl_fw_ini_conf_set_tlv *config_list = (void *)node-&gt;tlv.data;</div><div class='add'>+		u32 count, address, value;</div><div class='add'>+		u32 len = (le32_to_cpu(node-&gt;tlv.length) - sizeof(*config_list)) / 8;</div><div class='add'>+		u32 type = le32_to_cpu(config_list-&gt;set_type);</div><div class='add'>+		u32 offset = le32_to_cpu(config_list-&gt;addr_offset);</div><div class='add'>+</div><div class='add'>+		switch (type) {</div><div class='add'>+		case IWL_FW_INI_CONFIG_SET_TYPE_DEVICE_PERIPHERY_MAC: {</div><div class='add'>+			if (!iwl_trans_grab_nic_access(fwrt-&gt;trans)) {</div><div class='add'>+				IWL_DEBUG_FW(fwrt, "WRT: failed to get nic access\n");</div><div class='add'>+				IWL_DEBUG_FW(fwrt, "WRT: skipping MAC PERIPHERY config\n");</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			IWL_DEBUG_FW(fwrt, "WRT:  MAC PERIPHERY config len: len %u\n", len);</div><div class='add'>+			for (count = 0; count &lt; len; count++) {</div><div class='add'>+				address = le32_to_cpu(config_list-&gt;addr_val[count].address);</div><div class='add'>+				value = le32_to_cpu(config_list-&gt;addr_val[count].value);</div><div class='add'>+				iwl_trans_write_prph(fwrt-&gt;trans, address + offset, value);</div><div class='add'>+			}</div><div class='add'>+			iwl_trans_release_nic_access(fwrt-&gt;trans);</div><div class='add'>+		break;</div><div class='add'>+		}</div><div class='add'>+		case IWL_FW_INI_CONFIG_SET_TYPE_DEVICE_MEMORY: {</div><div class='add'>+			for (count = 0; count &lt; len; count++) {</div><div class='add'>+				address = le32_to_cpu(config_list-&gt;addr_val[count].address);</div><div class='add'>+				value = le32_to_cpu(config_list-&gt;addr_val[count].value);</div><div class='add'>+				iwl_trans_write_mem32(fwrt-&gt;trans, address + offset, value);</div><div class='add'>+				IWL_DEBUG_FW(fwrt, "WRT: DEV_MEM: count %u, add: %u val: %u\n",</div><div class='add'>+					     count, address, value);</div><div class='add'>+			}</div><div class='add'>+		break;</div><div class='add'>+		}</div><div class='add'>+		case IWL_FW_INI_CONFIG_SET_TYPE_CSR: {</div><div class='add'>+			for (count = 0; count &lt; len; count++) {</div><div class='add'>+				address = le32_to_cpu(config_list-&gt;addr_val[count].address);</div><div class='add'>+				value = le32_to_cpu(config_list-&gt;addr_val[count].value);</div><div class='add'>+				iwl_write32(fwrt-&gt;trans, address + offset, value);</div><div class='add'>+				IWL_DEBUG_FW(fwrt, "WRT: CSR: count %u, add: %u val: %u\n",</div><div class='add'>+					     count, address, value);</div><div class='add'>+			}</div><div class='add'>+		break;</div><div class='add'>+		}</div><div class='add'>+		case IWL_FW_INI_CONFIG_SET_TYPE_DBGC_DRAM_ADDR: {</div><div class='add'>+			struct iwl_dbgc1_info dram_info = {};</div><div class='add'>+			struct iwl_dram_data *frags = &amp;fwrt-&gt;trans-&gt;dbg.fw_mon_ini[1].frags[0];</div><div class='add'>+			__le64 dram_base_addr;</div><div class='add'>+			__le32 dram_size;</div><div class='add'>+			u64 dram_addr;</div><div class='add'>+			u32 ret;</div><div class='add'>+</div><div class='add'>+			if (!frags)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			dram_base_addr = cpu_to_le64(frags-&gt;physical);</div><div class='add'>+			dram_size = cpu_to_le32(frags-&gt;size);</div><div class='add'>+			dram_addr = le64_to_cpu(dram_base_addr);</div><div class='add'>+</div><div class='add'>+			IWL_DEBUG_FW(fwrt, "WRT: dram_base_addr 0x%016llx, dram_size 0x%x\n",</div><div class='add'>+				     dram_base_addr, dram_size);</div><div class='add'>+			IWL_DEBUG_FW(fwrt, "WRT: config_list-&gt;addr_offset: %u\n",</div><div class='add'>+				     le32_to_cpu(config_list-&gt;addr_offset));</div><div class='add'>+			for (count = 0; count &lt; len; count++) {</div><div class='add'>+				address = le32_to_cpu(config_list-&gt;addr_val[count].address);</div><div class='add'>+				dram_info.dbgc1_add_lsb =</div><div class='add'>+					cpu_to_le32((dram_addr &amp; 0x00000000FFFFFFFFULL) + 0x400);</div><div class='add'>+				dram_info.dbgc1_add_msb =</div><div class='add'>+					cpu_to_le32((dram_addr &amp; 0xFFFFFFFF00000000ULL) &gt;&gt; 32);</div><div class='add'>+				dram_info.dbgc1_size = cpu_to_le32(le32_to_cpu(dram_size) - 0x400);</div><div class='add'>+				ret = iwl_trans_write_mem(fwrt-&gt;trans,</div><div class='add'>+							  address + offset, &amp;dram_info, 4);</div><div class='add'>+				if (ret) {</div><div class='add'>+					IWL_ERR(fwrt, "Failed to write dram_info to HW_SMEM\n");</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		case IWL_FW_INI_CONFIG_SET_TYPE_PERIPH_SCRATCH_HWM: {</div><div class='add'>+			u32 debug_token_config =</div><div class='add'>+				le32_to_cpu(config_list-&gt;addr_val[0].value);</div><div class='add'>+</div><div class='add'>+			IWL_DEBUG_FW(fwrt, "WRT: Setting HWM debug token config: %u\n",</div><div class='add'>+				     debug_token_config);</div><div class='add'>+			fwrt-&gt;trans-&gt;dbg.ucode_preset = debug_token_config;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void iwl_dbg_tlv_periodic_trig_handler(struct timer_list *t)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_dbg_tlv_timer_node *timer_node =</div><div class='del'>-		from_timer(timer_node, t, timer);</div><div class='add'>+		timer_container_of(timer_node, t, timer);</div><div class='ctx'> 	struct iwl_fwrt_dump_data dump_data = {</div><div class='ctx'> 		.trig = (void *)timer_node-&gt;tlv-&gt;data,</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = iwl_fw_dbg_ini_collect(timer_node-&gt;fwrt, &amp;dump_data);</div><div class='add'>+	ret = iwl_fw_dbg_ini_collect(timer_node-&gt;fwrt, &amp;dump_data, false);</div><div class='ctx'> 	if (!ret || ret == -EBUSY) {</div><div class='ctx'> 		u32 occur = le32_to_cpu(dump_data.trig-&gt;occurrences);</div><div class='ctx'> 		u32 collect_interval = le32_to_cpu(dump_data.trig-&gt;data[0]);</div><div class='hunk'>@@ -816,7 +1099,7 @@ static int iwl_dbg_tlv_override_trig_node(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		node_trig = (void *)node_tlv-&gt;data;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(node_trig-&gt;data + offset, trig-&gt;data, trig_data_len);</div><div class='add'>+	memcpy((u8 *)node_trig-&gt;data + offset, trig-&gt;data, trig_data_len);</div><div class='ctx'> 	node_tlv-&gt;length = cpu_to_le32(size);</div><div class='ctx'> </div><div class='ctx'> 	if (policy &amp; IWL_FW_INI_APPLY_POLICY_OVERRIDE_CFG) {</div><div class='hunk'>@@ -868,7 +1151,9 @@ iwl_dbg_tlv_add_active_trigger(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	if (!match) {</div><div class='ctx'> 		IWL_DEBUG_FW(fwrt, "WRT: Enabling trigger (time point %u)\n",</div><div class='ctx'> 			     le32_to_cpu(trig-&gt;time_point));</div><div class='del'>-		return iwl_dbg_tlv_add(trig_tlv, trig_list);</div><div class='add'>+		if (!iwl_dbg_tlv_add(trig_tlv, trig_list))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return iwl_dbg_tlv_override_trig_node(fwrt, trig_tlv, match);</div><div class='hunk'>@@ -916,7 +1201,7 @@ static bool iwl_dbg_tlv_check_fw_pkt(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-iwl_dbg_tlv_tp_trigger(struct iwl_fw_runtime *fwrt,</div><div class='add'>+iwl_dbg_tlv_tp_trigger(struct iwl_fw_runtime *fwrt, bool sync,</div><div class='ctx'> 		       struct list_head *active_trig_list,</div><div class='ctx'> 		       union iwl_dbg_tlv_tp_data *tp_data,</div><div class='ctx'> 		       bool (*data_check)(struct iwl_fw_runtime *fwrt,</div><div class='hunk'>@@ -933,9 +1218,11 @@ iwl_dbg_tlv_tp_trigger(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 		u32 num_data = iwl_tlv_array_len(&amp;node-&gt;tlv, dump_data.trig,</div><div class='ctx'> 						 data);</div><div class='ctx'> 		int ret, i;</div><div class='add'>+		u32 tp = le32_to_cpu(dump_data.trig-&gt;time_point);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 		if (!num_data) {</div><div class='del'>-			ret = iwl_fw_dbg_ini_collect(fwrt, &amp;dump_data);</div><div class='add'>+			ret = iwl_fw_dbg_ini_collect(fwrt, &amp;dump_data, sync);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				return ret;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -944,36 +1231,66 @@ iwl_dbg_tlv_tp_trigger(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 			if (!data_check ||</div><div class='ctx'> 			    data_check(fwrt, &amp;dump_data, tp_data,</div><div class='ctx'> 				       le32_to_cpu(dump_data.trig-&gt;data[i]))) {</div><div class='del'>-				ret = iwl_fw_dbg_ini_collect(fwrt, &amp;dump_data);</div><div class='add'>+				ret = iwl_fw_dbg_ini_collect(fwrt, &amp;dump_data, sync);</div><div class='ctx'> 				if (ret)</div><div class='ctx'> 					return ret;</div><div class='ctx'> </div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+		fwrt-&gt;trans-&gt;dbg.restart_required = false;</div><div class='add'>+</div><div class='add'>+		if (fwrt-&gt;trans-&gt;mac_cfg-&gt;device_family ==</div><div class='add'>+		    IWL_DEVICE_FAMILY_9000) {</div><div class='add'>+			fwrt-&gt;trans-&gt;dbg.restart_required = true;</div><div class='add'>+		} else if (tp == IWL_FW_INI_TIME_POINT_FW_ASSERT &amp;&amp;</div><div class='add'>+			   fwrt-&gt;trans-&gt;dbg.last_tp_resetfw ==</div><div class='add'>+			   IWL_FW_INI_RESET_FW_MODE_STOP_FW_ONLY) {</div><div class='add'>+			fwrt-&gt;trans-&gt;dbg.restart_required = false;</div><div class='add'>+			fwrt-&gt;trans-&gt;dbg.last_tp_resetfw = 0xFF;</div><div class='add'>+		} else if (le32_to_cpu(dump_data.trig-&gt;reset_fw) ==</div><div class='add'>+			   IWL_FW_INI_RESET_FW_MODE_STOP_AND_RELOAD_FW) {</div><div class='add'>+			fwrt-&gt;trans-&gt;dbg.restart_required = true;</div><div class='add'>+		} else if (le32_to_cpu(dump_data.trig-&gt;reset_fw) ==</div><div class='add'>+			   IWL_FW_INI_RESET_FW_MODE_STOP_FW_ONLY) {</div><div class='add'>+			fwrt-&gt;trans-&gt;dbg.restart_required = false;</div><div class='add'>+			fwrt-&gt;trans-&gt;dbg.last_tp_resetfw =</div><div class='add'>+				le32_to_cpu(dump_data.trig-&gt;reset_fw);</div><div class='add'>+		} else if (le32_to_cpu(dump_data.trig-&gt;reset_fw) ==</div><div class='add'>+			   IWL_FW_INI_RESET_FW_MODE_NOTHING) {</div><div class='add'>+			/* nothing */</div><div class='add'>+		} else {</div><div class='add'>+			IWL_ERR(fwrt, "WRT: wrong resetfw %d\n",</div><div class='add'>+				le32_to_cpu(dump_data.trig-&gt;reset_fw));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_dbg_tlv_init_cfg(struct iwl_fw_runtime *fwrt)</div><div class='add'>+void iwl_dbg_tlv_init_cfg(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> {</div><div class='ctx'> 	enum iwl_fw_ini_buffer_location *ini_dest = &amp;fwrt-&gt;trans-&gt;dbg.ini_dest;</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> 	u32 failed_alloc = 0;</div><div class='ctx'> </div><div class='del'>-	if (*ini_dest != IWL_FW_INI_LOCATION_INVALID)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_FW(fwrt,</div><div class='del'>-		     "WRT: Generating active triggers list, domain 0x%x\n",</div><div class='del'>-		     fwrt-&gt;trans-&gt;dbg.domains_bitmap);</div><div class='add'>+	if (*ini_dest == IWL_FW_INI_LOCATION_INVALID) {</div><div class='add'>+		IWL_DEBUG_FW(fwrt,</div><div class='add'>+			     "WRT: Generating active triggers list, domain 0x%x\n",</div><div class='add'>+			     fwrt-&gt;trans-&gt;dbg.domains_bitmap);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(fwrt-&gt;trans-&gt;dbg.time_point); i++) {</div><div class='del'>-		struct iwl_dbg_tlv_time_point_data *tp =</div><div class='del'>-			&amp;fwrt-&gt;trans-&gt;dbg.time_point[i];</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(fwrt-&gt;trans-&gt;dbg.time_point); i++) {</div><div class='add'>+			struct iwl_dbg_tlv_time_point_data *tp =</div><div class='add'>+				&amp;fwrt-&gt;trans-&gt;dbg.time_point[i];</div><div class='ctx'> </div><div class='del'>-		iwl_dbg_tlv_gen_active_trig_list(fwrt, tp);</div><div class='add'>+			iwl_dbg_tlv_gen_active_trig_list(fwrt, tp);</div><div class='add'>+		}</div><div class='add'>+	} else if (*ini_dest != IWL_FW_INI_LOCATION_DRAM_PATH) {</div><div class='add'>+		/* For DRAM, go through the loop below to clear all the buffers</div><div class='add'>+		 * properly on restart, otherwise garbage may be left there and</div><div class='add'>+		 * leak into new debug dumps.</div><div class='add'>+		 */</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*ini_dest = IWL_FW_INI_LOCATION_INVALID;</div><div class='hunk'>@@ -982,8 +1299,10 @@ static void iwl_dbg_tlv_init_cfg(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> 			&amp;fwrt-&gt;trans-&gt;dbg.fw_mon_cfg[i];</div><div class='ctx'> 		u32 dest = le32_to_cpu(fw_mon_cfg-&gt;buf_location);</div><div class='ctx'> </div><div class='del'>-		if (dest == IWL_FW_INI_LOCATION_INVALID)</div><div class='add'>+		if (dest == IWL_FW_INI_LOCATION_INVALID) {</div><div class='add'>+			failed_alloc |= BIT(i);</div><div class='ctx'> 			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (*ini_dest == IWL_FW_INI_LOCATION_INVALID)</div><div class='ctx'> 			*ini_dest = dest;</div><div class='hunk'>@@ -1010,11 +1329,13 @@ static void iwl_dbg_tlv_init_cfg(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> 			&amp;fwrt-&gt;trans-&gt;dbg.active_regions[i];</div><div class='ctx'> 		u32 reg_type;</div><div class='ctx'> </div><div class='del'>-		if (!*active_reg)</div><div class='add'>+		if (!*active_reg) {</div><div class='add'>+			fwrt-&gt;trans-&gt;dbg.unsupported_region_msk |= BIT(i);</div><div class='ctx'> 			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		reg = (void *)(*active_reg)-&gt;data;</div><div class='del'>-		reg_type = le32_to_cpu(reg-&gt;type);</div><div class='add'>+		reg_type = reg-&gt;type;</div><div class='ctx'> </div><div class='ctx'> 		if (reg_type != IWL_FW_INI_REGION_DRAM_BUFFER ||</div><div class='ctx'> 		    !(BIT(le32_to_cpu(reg-&gt;dram_alloc_id)) &amp; failed_alloc))</div><div class='hunk'>@@ -1024,7 +1345,7 @@ static void iwl_dbg_tlv_init_cfg(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> 			     "WRT: removing allocation id %d from region id %d\n",</div><div class='ctx'> 			     le32_to_cpu(reg-&gt;dram_alloc_id), i);</div><div class='ctx'> </div><div class='del'>-		failed_alloc &amp;= ~le32_to_cpu(reg-&gt;dram_alloc_id);</div><div class='add'>+		failed_alloc &amp;= ~BIT(le32_to_cpu(reg-&gt;dram_alloc_id));</div><div class='ctx'> 		fwrt-&gt;trans-&gt;dbg.unsupported_region_msk |= BIT(i);</div><div class='ctx'> </div><div class='ctx'> 		kfree(*active_reg);</div><div class='hunk'>@@ -1032,11 +1353,12 @@ static void iwl_dbg_tlv_init_cfg(struct iwl_fw_runtime *fwrt)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_dbg_tlv_time_point(struct iwl_fw_runtime *fwrt,</div><div class='del'>-			    enum iwl_fw_ini_time_point tp_id,</div><div class='del'>-			    union iwl_dbg_tlv_tp_data *tp_data)</div><div class='add'>+void _iwl_dbg_tlv_time_point(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			     enum iwl_fw_ini_time_point tp_id,</div><div class='add'>+			     union iwl_dbg_tlv_tp_data *tp_data,</div><div class='add'>+			     bool sync)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *hcmd_list, *trig_list;</div><div class='add'>+	struct list_head *hcmd_list, *trig_list, *conf_list;</div><div class='ctx'> </div><div class='ctx'> 	if (!iwl_trans_dbg_ini_valid(fwrt-&gt;trans) ||</div><div class='ctx'> 	    tp_id == IWL_FW_INI_TIME_POINT_INVALID ||</div><div class='hunk'>@@ -1045,16 +1367,20 @@ void iwl_dbg_tlv_time_point(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> </div><div class='ctx'> 	hcmd_list = &amp;fwrt-&gt;trans-&gt;dbg.time_point[tp_id].hcmd_list;</div><div class='ctx'> 	trig_list = &amp;fwrt-&gt;trans-&gt;dbg.time_point[tp_id].active_trig_list;</div><div class='add'>+	conf_list = &amp;fwrt-&gt;trans-&gt;dbg.time_point[tp_id].config_list;</div><div class='ctx'> </div><div class='ctx'> 	switch (tp_id) {</div><div class='ctx'> 	case IWL_FW_INI_TIME_POINT_EARLY:</div><div class='ctx'> 		iwl_dbg_tlv_init_cfg(fwrt);</div><div class='del'>-		iwl_dbg_tlv_tp_trigger(fwrt, trig_list, tp_data, NULL);</div><div class='add'>+		iwl_dbg_tlv_update_drams(fwrt);</div><div class='add'>+		iwl_dbg_tlv_tp_trigger(fwrt, sync, trig_list, tp_data, NULL);</div><div class='add'>+		iwl_dbg_tlv_apply_config(fwrt, conf_list);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IWL_FW_INI_TIME_POINT_AFTER_ALIVE:</div><div class='ctx'> 		iwl_dbg_tlv_apply_buffers(fwrt);</div><div class='ctx'> 		iwl_dbg_tlv_send_hcmds(fwrt, hcmd_list);</div><div class='del'>-		iwl_dbg_tlv_tp_trigger(fwrt, trig_list, tp_data, NULL);</div><div class='add'>+		iwl_dbg_tlv_tp_trigger(fwrt, sync, trig_list, tp_data, NULL);</div><div class='add'>+		iwl_dbg_tlv_apply_config(fwrt, conf_list);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IWL_FW_INI_TIME_POINT_PERIODIC:</div><div class='ctx'> 		iwl_dbg_tlv_set_periodic_trigs(fwrt);</div><div class='hunk'>@@ -1064,13 +1390,15 @@ void iwl_dbg_tlv_time_point(struct iwl_fw_runtime *fwrt,</div><div class='ctx'> 	case IWL_FW_INI_TIME_POINT_MISSED_BEACONS:</div><div class='ctx'> 	case IWL_FW_INI_TIME_POINT_FW_DHC_NOTIFICATION:</div><div class='ctx'> 		iwl_dbg_tlv_send_hcmds(fwrt, hcmd_list);</div><div class='del'>-		iwl_dbg_tlv_tp_trigger(fwrt, trig_list, tp_data,</div><div class='add'>+		iwl_dbg_tlv_tp_trigger(fwrt, sync, trig_list, tp_data,</div><div class='ctx'> 				       iwl_dbg_tlv_check_fw_pkt);</div><div class='add'>+		iwl_dbg_tlv_apply_config(fwrt, conf_list);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		iwl_dbg_tlv_send_hcmds(fwrt, hcmd_list);</div><div class='del'>-		iwl_dbg_tlv_tp_trigger(fwrt, trig_list, tp_data, NULL);</div><div class='add'>+		iwl_dbg_tlv_tp_trigger(fwrt, sync, trig_list, tp_data, NULL);</div><div class='add'>+		iwl_dbg_tlv_apply_config(fwrt, conf_list);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_dbg_tlv_time_point);</div><div class='add'>+IWL_EXPORT_SYMBOL(_iwl_dbg_tlv_time_point);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.h b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.h<br/>index 92c720527946..fe4e46a0edbd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2018-2023, 2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_dbg_tlv_h__</div><div class='ctx'> #define __iwl_dbg_tlv_h__</div><div class='hunk'>@@ -10,6 +10,9 @@</div><div class='ctx'> #include &lt;fw/file.h&gt;</div><div class='ctx'> #include &lt;fw/api/dbg-tlv.h&gt;</div><div class='ctx'> </div><div class='add'>+#define IWL_DBG_TLV_MAX_PRESET	15</div><div class='add'>+#define ENABLE_INI		(IWL_DBG_TLV_MAX_PRESET + 1)</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_dbg_tlv_node - debug TLV node</div><div class='ctx'>  * @list: list of &amp;struct iwl_dbg_tlv_node</div><div class='hunk'>@@ -29,15 +32,17 @@ union iwl_dbg_tlv_tp_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_dbg_tlv_time_point_data</div><div class='add'>+ * struct iwl_dbg_tlv_time_point_data - debug time point data</div><div class='ctx'>  * @trig_list: list of triggers</div><div class='ctx'>  * @active_trig_list: list of active triggers</div><div class='ctx'>  * @hcmd_list: list of host commands</div><div class='add'>+ * @config_list: list of configuration</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_dbg_tlv_time_point_data {</div><div class='ctx'> 	struct list_head trig_list;</div><div class='ctx'> 	struct list_head active_trig_list;</div><div class='ctx'> 	struct list_head hcmd_list;</div><div class='add'>+	struct list_head config_list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct iwl_trans;</div><div class='hunk'>@@ -48,9 +53,26 @@ void iwl_dbg_tlv_free(struct iwl_trans *trans);</div><div class='ctx'> void iwl_dbg_tlv_alloc(struct iwl_trans *trans, const struct iwl_ucode_tlv *tlv,</div><div class='ctx'> 		       bool ext);</div><div class='ctx'> void iwl_dbg_tlv_init(struct iwl_trans *trans);</div><div class='del'>-void iwl_dbg_tlv_time_point(struct iwl_fw_runtime *fwrt,</div><div class='del'>-			    enum iwl_fw_ini_time_point tp_id,</div><div class='del'>-			    union iwl_dbg_tlv_tp_data *tp_data);</div><div class='add'>+void _iwl_dbg_tlv_time_point(struct iwl_fw_runtime *fwrt,</div><div class='add'>+			     enum iwl_fw_ini_time_point tp_id,</div><div class='add'>+			     union iwl_dbg_tlv_tp_data *tp_data,</div><div class='add'>+			     bool sync);</div><div class='add'>+void iwl_dbg_tlv_init_cfg(struct iwl_fw_runtime *fwrt);</div><div class='add'>+</div><div class='add'>+static inline void iwl_dbg_tlv_time_point(struct iwl_fw_runtime *fwrt,</div><div class='add'>+					  enum iwl_fw_ini_time_point tp_id,</div><div class='add'>+					  union iwl_dbg_tlv_tp_data *tp_data)</div><div class='add'>+{</div><div class='add'>+	_iwl_dbg_tlv_time_point(fwrt, tp_id, tp_data, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void iwl_dbg_tlv_time_point_sync(struct iwl_fw_runtime *fwrt,</div><div class='add'>+					       enum iwl_fw_ini_time_point tp_id,</div><div class='add'>+					       union iwl_dbg_tlv_tp_data *tp_data)</div><div class='add'>+{</div><div class='add'>+	_iwl_dbg_tlv_time_point(fwrt, tp_id, tp_data, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void iwl_dbg_tlv_del_timers(struct iwl_trans *trans);</div><div class='ctx'> </div><div class='ctx'> #endif /* __iwl_dbg_tlv_h__*/</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-debug.c b/drivers/net/wireless/intel/iwlwifi/iwl-debug.c<br/>index f6ca2fc37c40..3a3c13a41fc6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-debug.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-debug.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-debug.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-debug.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2011 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2011, 2021-2022 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -31,22 +31,33 @@ IWL_EXPORT_SYMBOL(__iwl_info);</div><div class='ctx'> __iwl_fn(crit)</div><div class='ctx'> IWL_EXPORT_SYMBOL(__iwl_crit);</div><div class='ctx'> </div><div class='del'>-void __iwl_err(struct device *dev, bool rfkill_prefix, bool trace_only,</div><div class='del'>-		const char *fmt, ...)</div><div class='add'>+void __iwl_err(struct device *dev, enum iwl_err_mode mode, const char *fmt, ...)</div><div class='ctx'> {</div><div class='ctx'> 	struct va_format vaf = {</div><div class='ctx'> 		.fmt = fmt,</div><div class='ctx'> 	};</div><div class='del'>-	va_list args;</div><div class='add'>+	va_list args, args2;</div><div class='ctx'> </div><div class='ctx'> 	va_start(args, fmt);</div><div class='del'>-	vaf.va = &amp;args;</div><div class='del'>-	if (!trace_only) {</div><div class='del'>-		if (rfkill_prefix)</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case IWL_ERR_MODE_RATELIMIT:</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			break;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case IWL_ERR_MODE_REGULAR:</div><div class='add'>+	case IWL_ERR_MODE_RFKILL:</div><div class='add'>+		va_copy(args2, args);</div><div class='add'>+		vaf.va = &amp;args2;</div><div class='add'>+		if (mode == IWL_ERR_MODE_RFKILL)</div><div class='ctx'> 			dev_err(dev, "(RFKILL) %pV", &amp;vaf);</div><div class='ctx'> 		else</div><div class='ctx'> 			dev_err(dev, "%pV", &amp;vaf);</div><div class='add'>+		va_end(args2);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='add'>+	vaf.va = &amp;args;</div><div class='ctx'> 	trace_iwlwifi_err(&amp;vaf);</div><div class='ctx'> 	va_end(args);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-debug.h b/drivers/net/wireless/intel/iwlwifi/iwl-debug.h<br/>index 528eba441926..ea32dc88584f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-debug.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-debug.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-debug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-debug.h</a></div><div class='hunk'>@@ -2,14 +2,9 @@</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.</div><div class='del'>- * Copyright(c) 2018 - 2020 Intel Corporation</div><div class='add'>+ * Copyright(c) 2018 - 2021, 2024-2025 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * Portions of this file are derived from the ipw3945 project.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #ifndef __iwl_debug_h__</div><div class='hunk'>@@ -27,9 +22,16 @@ static inline bool iwl_have_debug_level(u32 level)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+enum iwl_err_mode {</div><div class='add'>+	IWL_ERR_MODE_REGULAR,</div><div class='add'>+	IWL_ERR_MODE_RFKILL,</div><div class='add'>+	IWL_ERR_MODE_TRACE_ONLY,</div><div class='add'>+	IWL_ERR_MODE_RATELIMIT,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct device;</div><div class='del'>-void __iwl_err(struct device *dev, bool rfkill_prefix, bool only_trace,</div><div class='del'>-		const char *fmt, ...) __printf(4, 5);</div><div class='add'>+void __iwl_err(struct device *dev, enum iwl_err_mode mode, const char *fmt, ...)</div><div class='add'>+	__printf(3, 4);</div><div class='ctx'> void __iwl_warn(struct device *dev, const char *fmt, ...) __printf(2, 3);</div><div class='ctx'> void __iwl_info(struct device *dev, const char *fmt, ...) __printf(2, 3);</div><div class='ctx'> void __iwl_crit(struct device *dev, const char *fmt, ...) __printf(2, 3);</div><div class='hunk'>@@ -38,13 +40,17 @@ void __iwl_crit(struct device *dev, const char *fmt, ...) __printf(2, 3);</div><div class='ctx'> #define CHECK_FOR_NEWLINE(f) BUILD_BUG_ON(f[sizeof(f) - 2] != '\n')</div><div class='ctx'> </div><div class='ctx'> /* No matter what is m (priv, bus, trans), this will work */</div><div class='del'>-#define IWL_ERR_DEV(d, f, a...)						\</div><div class='add'>+#define __IWL_ERR_DEV(d, mode, f, a...)					\</div><div class='ctx'> 	do {								\</div><div class='ctx'> 		CHECK_FOR_NEWLINE(f);					\</div><div class='del'>-		__iwl_err((d), false, false, f, ## a);			\</div><div class='add'>+		__iwl_err((d), mode, f, ## a);				\</div><div class='ctx'> 	} while (0)</div><div class='add'>+#define IWL_ERR_DEV(d, f, a...)						\</div><div class='add'>+	__IWL_ERR_DEV(d, IWL_ERR_MODE_REGULAR, f, ## a)</div><div class='ctx'> #define IWL_ERR(m, f, a...)						\</div><div class='ctx'> 	IWL_ERR_DEV((m)-&gt;dev, f, ## a)</div><div class='add'>+#define IWL_ERR_LIMIT(m, f, a...)					\</div><div class='add'>+	__IWL_ERR_DEV((m)-&gt;dev, IWL_ERR_MODE_RATELIMIT, f, ## a)</div><div class='ctx'> #define IWL_WARN(m, f, a...)						\</div><div class='ctx'> 	do {								\</div><div class='ctx'> 		CHECK_FOR_NEWLINE(f);					\</div><div class='hunk'>@@ -150,6 +156,7 @@ do {                                            			\</div><div class='ctx'> #define IWL_DL_FW		0x00010000</div><div class='ctx'> #define IWL_DL_RF_KILL		0x00020000</div><div class='ctx'> #define IWL_DL_TPT		0x00040000</div><div class='add'>+#define IWL_DL_PTP		0x00080000</div><div class='ctx'> /* 0x00F00000 - 0x00100000 */</div><div class='ctx'> #define IWL_DL_RATE		0x00100000</div><div class='ctx'> #define IWL_DL_CALIB		0x00200000</div><div class='hunk'>@@ -159,7 +166,7 @@ do {                                            			\</div><div class='ctx'> #define IWL_DL_RX		0x01000000</div><div class='ctx'> #define IWL_DL_ISR		0x02000000</div><div class='ctx'> #define IWL_DL_HT		0x04000000</div><div class='del'>-#define IWL_DL_EXTERNAL		0x08000000</div><div class='add'>+#define IWL_DL_EHT		0x08000000</div><div class='ctx'> /* 0xF0000000 - 0x10000000 */</div><div class='ctx'> #define IWL_DL_11H		0x10000000</div><div class='ctx'> #define IWL_DL_STATS		0x20000000</div><div class='hunk'>@@ -169,7 +176,6 @@ do {                                            			\</div><div class='ctx'> #define IWL_DEBUG_INFO(p, f, a...)	IWL_DEBUG(p, IWL_DL_INFO, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_TDLS(p, f, a...)	IWL_DEBUG(p, IWL_DL_TDLS, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_MAC80211(p, f, a...)	IWL_DEBUG(p, IWL_DL_MAC80211, f, ## a)</div><div class='del'>-#define IWL_DEBUG_EXTERNAL(p, f, a...)	IWL_DEBUG(p, IWL_DL_EXTERNAL, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_TEMP(p, f, a...)	IWL_DEBUG(p, IWL_DL_TEMP, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_SCAN(p, f, a...)	IWL_DEBUG(p, IWL_DL_SCAN, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_RX(p, f, a...)	IWL_DEBUG(p, IWL_DL_RX, f, ## a)</div><div class='hunk'>@@ -203,11 +209,13 @@ do {                                            			\</div><div class='ctx'> #define IWL_DEBUG_RADIO(p, f, a...)	IWL_DEBUG(p, IWL_DL_RADIO, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_DEV_RADIO(p, f, a...)	IWL_DEBUG_DEV(p, IWL_DL_RADIO, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_POWER(p, f, a...)	IWL_DEBUG(p, IWL_DL_POWER, f, ## a)</div><div class='add'>+#define IWL_DEBUG_DEV_POWER(p, f, a...)	IWL_DEBUG_DEV(p, IWL_DL_POWER, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_11H(p, f, a...)	IWL_DEBUG(p, IWL_DL_11H, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_TPT(p, f, a...)	IWL_DEBUG(p, IWL_DL_TPT, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_WOWLAN(p, f, a...)	IWL_DEBUG(p, IWL_DL_WOWLAN, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_LAR(p, f, a...)	IWL_DEBUG(p, IWL_DL_LAR, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_FW_INFO(p, f, a...)		\</div><div class='ctx'> 		IWL_DEBUG(p, IWL_DL_INFO | IWL_DL_FW, f, ## a)</div><div class='del'>-</div><div class='add'>+#define IWL_DEBUG_PTP(p, f, a...)	IWL_DEBUG(p, IWL_DL_PTP, f, ## a)</div><div class='add'>+#define IWL_DEBUG_EHT(p, f, a...)	IWL_DEBUG(p, IWL_DL_EHT, f, ## a)</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h<br/>index 1bc6ecc32140..0d4a0896a2c5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h</a></div><div class='hunk'>@@ -3,12 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2015        Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='add'>+ * Copyright(c) 2018 - 2019, 2023-2024 Intel Corporation</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #if !defined(__IWLWIFI_DEVICE_TRACE_DATA) || defined(TRACE_HEADER_MULTI_READ)</div><div class='hunk'>@@ -33,7 +28,7 @@ TRACE_EVENT(iwlwifi_dev_tx_tb,</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		DEV_ASSIGN;</div><div class='ctx'> 		__entry-&gt;phys = phys;</div><div class='del'>-		if (iwl_trace_data(skb))</div><div class='add'>+		if (__get_dynamic_array_len(data))</div><div class='ctx'> 			memcpy(__get_dynamic_array(data), data_src, data_len);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("[%s] TX frame data", __get_str(dev))</div><div class='hunk'>@@ -41,20 +36,17 @@ TRACE_EVENT(iwlwifi_dev_tx_tb,</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(iwlwifi_dev_rx_data,</div><div class='ctx'> 	TP_PROTO(const struct device *dev,</div><div class='del'>-		 const struct iwl_trans *trans,</div><div class='del'>-		 void *rxbuf, size_t len),</div><div class='del'>-	TP_ARGS(dev, trans, rxbuf, len),</div><div class='add'>+		 void *rxbuf, size_t len, size_t start),</div><div class='add'>+	TP_ARGS(dev, rxbuf, len, start),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		DEV_ENTRY</div><div class='del'>-		__dynamic_array(u8, data,</div><div class='del'>-				len - iwl_rx_trace_len(trans, rxbuf, len, NULL))</div><div class='add'>+		__dynamic_array(u8, data, len - start)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		size_t offs = iwl_rx_trace_len(trans, rxbuf, len, NULL);</div><div class='ctx'> 		DEV_ASSIGN;</div><div class='del'>-		if (offs &lt; len)</div><div class='add'>+		if (start &lt; len)</div><div class='ctx'> 			memcpy(__get_dynamic_array(data),</div><div class='del'>-			       ((u8 *)rxbuf) + offs, len - offs);</div><div class='add'>+			       ((u8 *)rxbuf) + start, len - start);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("[%s] RX frame data", __get_str(dev))</div><div class='ctx'> );</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-io.h b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-io.h<br/>index a57019241a78..0af9d8362c5b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-io.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace-io.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-io.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace-io.h</a></div><div class='hunk'>@@ -3,11 +3,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2016-2017 Intel Deutschland GmbH</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #if !defined(__IWLWIFI_DEVICE_TRACE_IO) || defined(TRACE_HEADER_MULTI_READ)</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h<br/>index 72ca882daed5..ead72c3d33bd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h</a></div><div class='hunk'>@@ -4,12 +4,7 @@</div><div class='ctx'>  * Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018        Intel Corporation</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='add'>+ * Copyright(c) 2018, 2023-2024  Intel Corporation</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #if !defined(__IWLWIFI_DEVICE_TRACE_IWLWIFI) || defined(TRACE_HEADER_MULTI_READ)</div><div class='hunk'>@@ -55,23 +50,20 @@ TRACE_EVENT(iwlwifi_dev_hcmd,</div><div class='ctx'> );</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(iwlwifi_dev_rx,</div><div class='del'>-	TP_PROTO(const struct device *dev, const struct iwl_trans *trans,</div><div class='del'>-		 struct iwl_rx_packet *pkt, size_t len),</div><div class='del'>-	TP_ARGS(dev, trans, pkt, len),</div><div class='add'>+	TP_PROTO(const struct device *dev,</div><div class='add'>+		 struct iwl_rx_packet *pkt, size_t len, size_t trace_len,</div><div class='add'>+		 size_t hdr_offset),</div><div class='add'>+	TP_ARGS(dev, pkt, len, trace_len, hdr_offset),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		DEV_ENTRY</div><div class='ctx'> 		__field(u16, cmd)</div><div class='ctx'> 		__field(u8, hdr_offset)</div><div class='del'>-		__dynamic_array(u8, rxbuf,</div><div class='del'>-				iwl_rx_trace_len(trans, pkt, len, NULL))</div><div class='add'>+		__dynamic_array(u8, rxbuf, trace_len)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		size_t hdr_offset = 0;</div><div class='del'>-</div><div class='ctx'> 		DEV_ASSIGN;</div><div class='ctx'> 		__entry-&gt;cmd = WIDE_ID(pkt-&gt;hdr.group_id, pkt-&gt;hdr.cmd);</div><div class='del'>-		memcpy(__get_dynamic_array(rxbuf), pkt,</div><div class='del'>-		       iwl_rx_trace_len(trans, pkt, len, &amp;hdr_offset));</div><div class='add'>+		memcpy(__get_dynamic_array(rxbuf), pkt, trace_len);</div><div class='ctx'> 		__entry-&gt;hdr_offset = hdr_offset;</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("[%s] RX cmd %#.2x",</div><div class='hunk'>@@ -96,8 +88,8 @@ TRACE_EVENT(iwlwifi_dev_tx,</div><div class='ctx'> 		 * for the possible padding).</div><div class='ctx'> 		 */</div><div class='ctx'> 		__dynamic_array(u8, buf0, buf0_len)</div><div class='del'>-		__dynamic_array(u8, buf1, hdr_len &gt; 0 &amp;&amp; iwl_trace_data(skb) ?</div><div class='del'>-						0 : skb-&gt;len - hdr_len)</div><div class='add'>+		__dynamic_array(u8, buf1, hdr_len &gt; 0 &amp;&amp; !iwl_trace_data(skb) ?</div><div class='add'>+						skb-&gt;len - hdr_len : 0)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		DEV_ASSIGN;</div><div class='hunk'>@@ -107,7 +99,7 @@ TRACE_EVENT(iwlwifi_dev_tx,</div><div class='ctx'> 			__entry-&gt;framelen += skb-&gt;len - hdr_len;</div><div class='ctx'> 		memcpy(__get_dynamic_array(tfd), tfd, tfdlen);</div><div class='ctx'> 		memcpy(__get_dynamic_array(buf0), buf0, buf0_len);</div><div class='del'>-		if (hdr_len &gt; 0 &amp;&amp; !iwl_trace_data(skb))</div><div class='add'>+		if (__get_dynamic_array_len(buf1))</div><div class='ctx'> 			skb_copy_bits(skb, hdr_len,</div><div class='ctx'> 				      __get_dynamic_array(buf1),</div><div class='ctx'> 				      skb-&gt;len - hdr_len);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h<br/>index d0467da5af03..0db1fa5477af 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h</a></div><div class='hunk'>@@ -2,11 +2,6 @@</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #if !defined(__IWLWIFI_DEVICE_TRACE_MSG) || defined(TRACE_HEADER_MULTI_READ)</div><div class='hunk'>@@ -23,12 +18,10 @@ DECLARE_EVENT_CLASS(iwlwifi_msg_event,</div><div class='ctx'> 	TP_PROTO(struct va_format *vaf),</div><div class='ctx'> 	TP_ARGS(vaf),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='del'>-		__dynamic_array(char, msg, MAX_MSG_LEN)</div><div class='add'>+		__vstring(msg, vaf-&gt;fmt, vaf-&gt;va)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),</div><div class='del'>-				       MAX_MSG_LEN, vaf-&gt;fmt,</div><div class='del'>-				       *vaf-&gt;va) &gt;= MAX_MSG_LEN);</div><div class='add'>+		__assign_vstr(msg, vaf-&gt;fmt, vaf-&gt;va);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%s", __get_str(msg))</div><div class='ctx'> );</div><div class='hunk'>@@ -60,14 +53,12 @@ TRACE_EVENT(iwlwifi_dbg,</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		__field(u32, level)</div><div class='ctx'> 		__string(function, function)</div><div class='del'>-		__dynamic_array(char, msg, MAX_MSG_LEN)</div><div class='add'>+		__vstring(msg, vaf-&gt;fmt, vaf-&gt;va)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;level = level;</div><div class='del'>-		__assign_str(function, function);</div><div class='del'>-		WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),</div><div class='del'>-				       MAX_MSG_LEN, vaf-&gt;fmt,</div><div class='del'>-				       *vaf-&gt;va) &gt;= MAX_MSG_LEN);</div><div class='add'>+		__assign_str(function);</div><div class='add'>+		__assign_vstr(msg, vaf-&gt;fmt, vaf-&gt;va);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%s", __get_str(msg))</div><div class='ctx'> );</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-ucode.h b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-ucode.h<br/>index 2228faefffbc..3ec0205ac9f9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-ucode.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace-ucode.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-ucode.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace-ucode.h</a></div><div class='hunk'>@@ -2,11 +2,6 @@</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #if !defined(__IWLWIFI_DEVICE_TRACE_UCODE) || defined(TRACE_HEADER_MULTI_READ)</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c<br/>index b5037db0c381..7e686297963d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c</a></div><div class='hunk'>@@ -2,12 +2,7 @@</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved.</div><div class='del'>- * Copyright (C) 2018 Intel Corporation</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='add'>+ * Copyright (C) 2018, 2023 Intel Corporation</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -17,9 +12,25 @@</div><div class='ctx'> #include "iwl-trans.h"</div><div class='ctx'> </div><div class='ctx'> #define CREATE_TRACE_POINTS</div><div class='add'>+#ifdef CONFIG_CC_IS_GCC</div><div class='add'>+#pragma GCC diagnostic ignored "-Wsuggest-attribute=format"</div><div class='add'>+#endif</div><div class='ctx'> #include "iwl-devtrace.h"</div><div class='ctx'> </div><div class='ctx'> EXPORT_TRACEPOINT_SYMBOL(iwlwifi_dev_ucode_event);</div><div class='ctx'> EXPORT_TRACEPOINT_SYMBOL(iwlwifi_dev_ucode_cont_event);</div><div class='ctx'> EXPORT_TRACEPOINT_SYMBOL(iwlwifi_dev_ucode_wrap_event);</div><div class='del'>-#endif</div><div class='add'>+#else</div><div class='add'>+#include "iwl-devtrace.h"</div><div class='add'>+#endif /* __CHECKER__ */</div><div class='add'>+</div><div class='add'>+void __trace_iwlwifi_dev_rx(struct iwl_trans *trans, void *pkt, size_t len)</div><div class='add'>+{</div><div class='add'>+	size_t hdr_offset = 0, trace_len;</div><div class='add'>+</div><div class='add'>+	trace_len = iwl_rx_trace_len(trans, pkt, len, &amp;hdr_offset);</div><div class='add'>+	trace_iwlwifi_dev_rx(trans-&gt;dev, pkt, len, trace_len, hdr_offset);</div><div class='add'>+</div><div class='add'>+	if (trace_len &lt; len)</div><div class='add'>+		trace_iwlwifi_dev_rx_data(trans-&gt;dev, pkt, len, trace_len);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h<br/>index fc8bc212ee84..99789c7cef3b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h</a></div><div class='hunk'>@@ -3,22 +3,19 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(C) 2016        Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018        Intel Corporation</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='add'>+ * Copyright(c) 2018, 2023, 2025 Intel Corporation</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #ifndef __IWLWIFI_DEVICE_TRACE</div><div class='add'>+#define __IWLWIFI_DEVICE_TRACE</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/ieee80211.h&gt;</div><div class='ctx'> #include &lt;net/cfg80211.h&gt;</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='ctx'> #include "iwl-trans.h"</div><div class='del'>-#if !defined(__IWLWIFI_DEVICE_TRACE)</div><div class='ctx'> static inline bool iwl_trace_data(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='ctx'> 	struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='ctx'> 	__le16 fc = hdr-&gt;frame_control;</div><div class='ctx'> 	int offs = 24; /* start with normal header length */</div><div class='hunk'>@@ -26,6 +23,10 @@ static inline bool iwl_trace_data(struct sk_buff *skb)</div><div class='ctx'> 	if (!ieee80211_is_data(fc))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='add'>+	/* If upper layers wanted TX status it's an important frame */</div><div class='add'>+	if (info-&gt;flags &amp; IEEE80211_TX_CTL_REQ_TX_STATUS)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	/* Try to determine if the frame is EAPOL. This might have false</div><div class='ctx'> 	 * positives (if there's no RFC 1042 header and we compare to some</div><div class='ctx'> 	 * payload instead) but since we're only doing tracing that's not</div><div class='hunk'>@@ -53,11 +54,11 @@ static inline size_t iwl_rx_trace_len(const struct iwl_trans *trans,</div><div class='ctx'> 	struct ieee80211_hdr *hdr = NULL;</div><div class='ctx'> 	size_t hdr_offset;</div><div class='ctx'> </div><div class='del'>-	if (cmd-&gt;cmd != trans-&gt;rx_mpdu_cmd)</div><div class='add'>+	if (cmd-&gt;cmd != trans-&gt;conf.rx_mpdu_cmd)</div><div class='ctx'> 		return len;</div><div class='ctx'> </div><div class='ctx'> 	hdr_offset = sizeof(struct iwl_cmd_header) +</div><div class='del'>-		     trans-&gt;rx_mpdu_cmd_hdr_size;</div><div class='add'>+		     trans-&gt;conf.rx_mpdu_cmd_hdr_size;</div><div class='ctx'> </div><div class='ctx'> 	if (out_hdr_offset)</div><div class='ctx'> 		*out_hdr_offset = hdr_offset;</div><div class='hunk'>@@ -66,12 +67,10 @@ static inline size_t iwl_rx_trace_len(const struct iwl_trans *trans,</div><div class='ctx'> 	if (!ieee80211_is_data(hdr-&gt;frame_control))</div><div class='ctx'> 		return len;</div><div class='ctx'> 	/* maybe try to identify EAPOL frames? */</div><div class='del'>-	return sizeof(__le32) + sizeof(*cmd) + trans-&gt;rx_mpdu_cmd_hdr_size +</div><div class='add'>+	return sizeof(__le32) + sizeof(*cmd) +</div><div class='add'>+		trans-&gt;conf.rx_mpdu_cmd_hdr_size +</div><div class='ctx'> 		ieee80211_hdrlen(hdr-&gt;frame_control);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define __IWLWIFI_DEVICE_TRACE</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/tracepoint.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='hunk'>@@ -89,7 +88,7 @@ static inline void trace_ ## name(proto) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define DEV_ENTRY	__string(dev, dev_name(dev))</div><div class='del'>-#define DEV_ASSIGN	__assign_str(dev, dev_name(dev))</div><div class='add'>+#define DEV_ASSIGN	__assign_str(dev)</div><div class='ctx'> </div><div class='ctx'> #include "iwl-devtrace-io.h"</div><div class='ctx'> #include "iwl-devtrace-ucode.h"</div><div class='hunk'>@@ -97,4 +96,20 @@ static inline void trace_ ## name(proto) {}</div><div class='ctx'> #include "iwl-devtrace-data.h"</div><div class='ctx'> #include "iwl-devtrace-iwlwifi.h"</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEVICE_TRACING</div><div class='add'>+DECLARE_TRACEPOINT(iwlwifi_dev_rx);</div><div class='add'>+DECLARE_TRACEPOINT(iwlwifi_dev_rx_data);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void __trace_iwlwifi_dev_rx(struct iwl_trans *trans, void *pkt, size_t len);</div><div class='add'>+</div><div class='add'>+static inline void maybe_trace_iwlwifi_dev_rx(struct iwl_trans *trans,</div><div class='add'>+					      void *pkt, size_t len)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEVICE_TRACING</div><div class='add'>+	if (tracepoint_enabled(iwlwifi_dev_rx) ||</div><div class='add'>+	    tracepoint_enabled(iwlwifi_dev_rx_data))</div><div class='add'>+		__trace_iwlwifi_dev_rx(trans, pkt, len);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='ctx'> #endif /* __IWLWIFI_DEVICE_TRACE */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c<br/>index 884750bf7840..3391f07b01de 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-drv.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-drv.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-drv.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-drv.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2014, 2018-2021 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include "iwl-modparams.h"</div><div class='ctx'> #include "fw/api/alive.h"</div><div class='ctx'> #include "fw/api/mac.h"</div><div class='add'>+#include "fw/api/mac-cfg.h"</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -31,7 +32,6 @@</div><div class='ctx'> </div><div class='ctx'> #define DRV_DESCRIPTION	"Intel(R) Wireless WiFi driver for Linux"</div><div class='ctx'> MODULE_DESCRIPTION(DRV_DESCRIPTION);</div><div class='del'>-MODULE_AUTHOR(DRV_AUTHOR);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='hunk'>@@ -75,10 +75,13 @@ struct iwl_drv {</div><div class='ctx'> enum {</div><div class='ctx'> 	DVM_OP_MODE,</div><div class='ctx'> 	MVM_OP_MODE,</div><div class='add'>+#if IS_ENABLED(CONFIG_IWLMLD)</div><div class='add'>+	MLD_OP_MODE,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Protects the table contents, i.e. the ops pointer &amp; drv list */</div><div class='del'>-static struct mutex iwlwifi_opmode_table_mtx;</div><div class='add'>+static DEFINE_MUTEX(iwlwifi_opmode_table_mtx);</div><div class='ctx'> static struct iwlwifi_opmode_table {</div><div class='ctx'> 	const char *name;			/* name: iwldvm, iwlmvm, etc */</div><div class='ctx'> 	const struct iwl_op_mode_ops *ops;	/* pointer to op_mode ops */</div><div class='hunk'>@@ -86,6 +89,9 @@ static struct iwlwifi_opmode_table {</div><div class='ctx'> } iwlwifi_opmode_table[] = {		/* ops set when driver is initialized */</div><div class='ctx'> 	[DVM_OP_MODE] = { .name = "iwldvm", .ops = NULL },</div><div class='ctx'> 	[MVM_OP_MODE] = { .name = "iwlmvm", .ops = NULL },</div><div class='add'>+#if IS_ENABLED(CONFIG_IWLMLD)</div><div class='add'>+	[MLD_OP_MODE] = { .name = "iwlmld", .ops = NULL },</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IWL_DEFAULT_SCAN_CHANNELS 40</div><div class='hunk'>@@ -128,13 +134,20 @@ static void iwl_dealloc_ucode(struct iwl_drv *drv)</div><div class='ctx'> 	kfree(drv-&gt;fw.iml);</div><div class='ctx'> 	kfree(drv-&gt;fw.ucode_capa.cmd_versions);</div><div class='ctx'> 	kfree(drv-&gt;fw.phy_integration_ver);</div><div class='add'>+	kfree(drv-&gt;trans-&gt;dbg.pc_data);</div><div class='add'>+	drv-&gt;trans-&gt;dbg.pc_data = NULL;</div><div class='add'>+	kvfree(drv-&gt;fw.pnvm_data);</div><div class='add'>+	drv-&gt;fw.pnvm_data = NULL;</div><div class='add'>+	drv-&gt;fw.pnvm_size = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; IWL_UCODE_TYPE_MAX; i++)</div><div class='ctx'> 		iwl_free_fw_img(drv, drv-&gt;fw.img + i);</div><div class='add'>+</div><div class='add'>+	/* clear the data for the aborted load case */</div><div class='add'>+	memset(&amp;drv-&gt;fw, 0, sizeof(drv-&gt;fw));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_alloc_fw_desc(struct iwl_drv *drv, struct fw_desc *desc,</div><div class='del'>-			     struct fw_sec *sec)</div><div class='add'>+static int iwl_alloc_fw_desc(struct fw_desc *desc, struct fw_sec *sec)</div><div class='ctx'> {</div><div class='ctx'> 	void *data;</div><div class='ctx'> </div><div class='hunk'>@@ -155,42 +168,204 @@ static int iwl_alloc_fw_desc(struct iwl_drv *drv, struct fw_desc *desc,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline char iwl_drv_get_step(int step)</div><div class='add'>+{</div><div class='add'>+	if (step == SILICON_Z_STEP)</div><div class='add'>+		return 'z';</div><div class='add'>+	if (step == SILICON_TC_STEP)</div><div class='add'>+		return 'a';</div><div class='add'>+	return 'a' + step;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool iwl_drv_is_wifi7_supported(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	return trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ &amp;&amp;</div><div class='add'>+	       CSR_HW_RFID_TYPE(trans-&gt;info.hw_rf_id) &gt;= IWL_CFG_RF_TYPE_FM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const char *iwl_drv_get_fwname_pre(struct iwl_trans *trans, char *buf)</div><div class='add'>+{</div><div class='add'>+	char mac_step, rf_step;</div><div class='add'>+	const char *mac, *rf, *cdb;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;cfg-&gt;fw_name_pre)</div><div class='add'>+		return trans-&gt;cfg-&gt;fw_name_pre;</div><div class='add'>+</div><div class='add'>+	mac_step = iwl_drv_get_step(trans-&gt;info.hw_rev_step);</div><div class='add'>+</div><div class='add'>+	switch (CSR_HW_REV_TYPE(trans-&gt;info.hw_rev)) {</div><div class='add'>+	case IWL_CFG_MAC_TYPE_PU:</div><div class='add'>+		mac = "9000-pu";</div><div class='add'>+		mac_step = 'b';</div><div class='add'>+		break;</div><div class='add'>+	case IWL_CFG_MAC_TYPE_TH:</div><div class='add'>+		mac = "9260-th";</div><div class='add'>+		mac_step = 'b';</div><div class='add'>+		break;</div><div class='add'>+	case IWL_CFG_MAC_TYPE_QU:</div><div class='add'>+		mac = "Qu";</div><div class='add'>+		break;</div><div class='add'>+	case IWL_CFG_MAC_TYPE_CC:</div><div class='add'>+		/* special case - no RF since it's fixed (discrete) */</div><div class='add'>+		scnprintf(buf, FW_NAME_PRE_BUFSIZE, "iwlwifi-cc-a0");</div><div class='add'>+		return buf;</div><div class='add'>+	case IWL_CFG_MAC_TYPE_QUZ:</div><div class='add'>+		mac = "QuZ";</div><div class='add'>+		/* all QuZ use A0 firmware */</div><div class='add'>+		mac_step = 'a';</div><div class='add'>+		break;</div><div class='add'>+	case IWL_CFG_MAC_TYPE_SO:</div><div class='add'>+	case IWL_CFG_MAC_TYPE_SOF:</div><div class='add'>+		mac = "so";</div><div class='add'>+		mac_step = 'a';</div><div class='add'>+		break;</div><div class='add'>+	case IWL_CFG_MAC_TYPE_TY:</div><div class='add'>+		mac = "ty";</div><div class='add'>+		mac_step = 'a';</div><div class='add'>+		break;</div><div class='add'>+	case IWL_CFG_MAC_TYPE_MA:</div><div class='add'>+		mac = "ma";</div><div class='add'>+		break;</div><div class='add'>+	case IWL_CFG_MAC_TYPE_BZ:</div><div class='add'>+	case IWL_CFG_MAC_TYPE_BZ_W:</div><div class='add'>+		mac = "bz";</div><div class='add'>+		break;</div><div class='add'>+	case IWL_CFG_MAC_TYPE_GL:</div><div class='add'>+		mac = "gl";</div><div class='add'>+		break;</div><div class='add'>+	case IWL_CFG_MAC_TYPE_SC:</div><div class='add'>+		mac = "sc";</div><div class='add'>+		break;</div><div class='add'>+	case IWL_CFG_MAC_TYPE_SC2:</div><div class='add'>+	/* Uses the same firmware as SC2 */</div><div class='add'>+	case IWL_CFG_MAC_TYPE_SC2F:</div><div class='add'>+		mac = "sc2";</div><div class='add'>+		break;</div><div class='add'>+	case IWL_CFG_MAC_TYPE_BR:</div><div class='add'>+		mac = "br";</div><div class='add'>+		break;</div><div class='add'>+	case IWL_CFG_MAC_TYPE_DR:</div><div class='add'>+		mac = "dr";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return "unknown-mac";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rf_step = iwl_drv_get_step(CSR_HW_RFID_STEP(trans-&gt;info.hw_rf_id));</div><div class='add'>+</div><div class='add'>+	switch (CSR_HW_RFID_TYPE(trans-&gt;info.hw_rf_id)) {</div><div class='add'>+	case IWL_CFG_RF_TYPE_JF1:</div><div class='add'>+	case IWL_CFG_RF_TYPE_JF2:</div><div class='add'>+		rf = "jf";</div><div class='add'>+		rf_step = 'b';</div><div class='add'>+		break;</div><div class='add'>+	case IWL_CFG_RF_TYPE_HR1:</div><div class='add'>+	case IWL_CFG_RF_TYPE_HR2:</div><div class='add'>+		rf = "hr";</div><div class='add'>+		rf_step = 'b';</div><div class='add'>+		break;</div><div class='add'>+	case IWL_CFG_RF_TYPE_GF:</div><div class='add'>+		rf = "gf";</div><div class='add'>+		rf_step = 'a';</div><div class='add'>+		break;</div><div class='add'>+	case IWL_CFG_RF_TYPE_FM:</div><div class='add'>+		rf = "fm";</div><div class='add'>+		break;</div><div class='add'>+	case IWL_CFG_RF_TYPE_WH:</div><div class='add'>+		rf = "wh";</div><div class='add'>+		break;</div><div class='add'>+	case IWL_CFG_RF_TYPE_PE:</div><div class='add'>+		rf = "pe";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return "unknown-rf";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cdb = CSR_HW_RFID_IS_CDB(trans-&gt;info.hw_rf_id) ? "4" : "";</div><div class='add'>+</div><div class='add'>+	scnprintf(buf, FW_NAME_PRE_BUFSIZE,</div><div class='add'>+		  "iwlwifi-%s-%c0-%s%s-%c0",</div><div class='add'>+		  mac, mac_step, rf, cdb, rf_step);</div><div class='add'>+</div><div class='add'>+	return buf;</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_drv_get_fwname_pre);</div><div class='add'>+</div><div class='ctx'> static void iwl_req_fw_callback(const struct firmware *ucode_raw,</div><div class='ctx'> 				void *context);</div><div class='ctx'> </div><div class='add'>+static void iwl_get_ucode_api_versions(struct iwl_trans *trans,</div><div class='add'>+				       unsigned int *api_min,</div><div class='add'>+				       unsigned int *api_max)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_family_base_params *base = trans-&gt;mac_cfg-&gt;base;</div><div class='add'>+	const struct iwl_rf_cfg *cfg = trans-&gt;cfg;</div><div class='add'>+</div><div class='add'>+	/* if the MAC doesn't have range or if its range it higher than the RF's */</div><div class='add'>+	if (!base-&gt;ucode_api_max ||</div><div class='add'>+	    (cfg-&gt;ucode_api_max &amp;&amp; base-&gt;ucode_api_min &gt; cfg-&gt;ucode_api_max)) {</div><div class='add'>+		*api_min = cfg-&gt;ucode_api_min;</div><div class='add'>+		*api_max = cfg-&gt;ucode_api_max;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if the RF doesn't have range or if its range it higher than the MAC's */</div><div class='add'>+	if (!cfg-&gt;ucode_api_max ||</div><div class='add'>+	    (base-&gt;ucode_api_max &amp;&amp; cfg-&gt;ucode_api_min &gt; base-&gt;ucode_api_max)) {</div><div class='add'>+		*api_min = base-&gt;ucode_api_min;</div><div class='add'>+		*api_max = base-&gt;ucode_api_max;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*api_min = max(cfg-&gt;ucode_api_min, base-&gt;ucode_api_min);</div><div class='add'>+	*api_max = min(cfg-&gt;ucode_api_max, base-&gt;ucode_api_max);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int iwl_request_firmware(struct iwl_drv *drv, bool first)</div><div class='ctx'> {</div><div class='del'>-	const struct iwl_cfg *cfg = drv-&gt;trans-&gt;cfg;</div><div class='del'>-	char tag[8];</div><div class='add'>+	char _fw_name_pre[FW_NAME_PRE_BUFSIZE];</div><div class='add'>+	unsigned int ucode_api_max, ucode_api_min;</div><div class='add'>+	const char *fw_name_pre;</div><div class='add'>+</div><div class='add'>+	iwl_get_ucode_api_versions(drv-&gt;trans, &amp;ucode_api_min, &amp;ucode_api_max);</div><div class='ctx'> </div><div class='del'>-	if (drv-&gt;trans-&gt;trans_cfg-&gt;device_family == IWL_DEVICE_FAMILY_9000 &amp;&amp;</div><div class='del'>-	    (CSR_HW_REV_STEP(drv-&gt;trans-&gt;hw_rev) != SILICON_B_STEP &amp;&amp;</div><div class='del'>-	     CSR_HW_REV_STEP(drv-&gt;trans-&gt;hw_rev) != SILICON_C_STEP)) {</div><div class='add'>+	if (drv-&gt;trans-&gt;mac_cfg-&gt;device_family == IWL_DEVICE_FAMILY_9000 &amp;&amp;</div><div class='add'>+	    (drv-&gt;trans-&gt;info.hw_rev_step != SILICON_B_STEP &amp;&amp;</div><div class='add'>+	     drv-&gt;trans-&gt;info.hw_rev_step != SILICON_C_STEP)) {</div><div class='ctx'> 		IWL_ERR(drv,</div><div class='ctx'> 			"Only HW steps B and C are currently supported (0x%0x)\n",</div><div class='del'>-			drv-&gt;trans-&gt;hw_rev);</div><div class='add'>+			drv-&gt;trans-&gt;info.hw_rev);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (first) {</div><div class='del'>-		drv-&gt;fw_index = cfg-&gt;ucode_api_max;</div><div class='del'>-		sprintf(tag, "%d", drv-&gt;fw_index);</div><div class='del'>-	} else {</div><div class='del'>-		drv-&gt;fw_index--;</div><div class='del'>-		sprintf(tag, "%d", drv-&gt;fw_index);</div><div class='add'>+	if (CSR_HW_RFID_TYPE(drv-&gt;trans-&gt;info.hw_rf_id) == IWL_CFG_RF_TYPE_WH &amp;&amp;</div><div class='add'>+	    CSR_HW_RFID_STEP(drv-&gt;trans-&gt;info.hw_rf_id) == SILICON_A_STEP) {</div><div class='add'>+		IWL_ERR(drv, "WH A step is not supported\n");</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (drv-&gt;fw_index &lt; cfg-&gt;ucode_api_min) {</div><div class='add'>+	fw_name_pre = iwl_drv_get_fwname_pre(drv-&gt;trans, _fw_name_pre);</div><div class='add'>+</div><div class='add'>+	if (first)</div><div class='add'>+		drv-&gt;fw_index = ucode_api_max;</div><div class='add'>+	else if (drv-&gt;fw_index == ENCODE_CORE_AS_API(100))</div><div class='add'>+		drv-&gt;fw_index = 102; /* last API-scheme number below core 100 */</div><div class='add'>+	else</div><div class='add'>+		drv-&gt;fw_index--;</div><div class='add'>+</div><div class='add'>+	if (drv-&gt;fw_index &lt; ucode_api_min) {</div><div class='ctx'> 		IWL_ERR(drv, "no suitable firmware found!\n");</div><div class='ctx'> </div><div class='del'>-		if (cfg-&gt;ucode_api_min == cfg-&gt;ucode_api_max) {</div><div class='del'>-			IWL_ERR(drv, "%s%d is required\n", cfg-&gt;fw_name_pre,</div><div class='del'>-				cfg-&gt;ucode_api_max);</div><div class='add'>+		if (ucode_api_min == ucode_api_max) {</div><div class='add'>+			IWL_ERR(drv, "%s-" FW_API_FMT " is required\n",</div><div class='add'>+				fw_name_pre, FW_API_ARG(ucode_api_max));</div><div class='ctx'> 		} else {</div><div class='del'>-			IWL_ERR(drv, "minimum version required: %s%d\n",</div><div class='del'>-				cfg-&gt;fw_name_pre, cfg-&gt;ucode_api_min);</div><div class='del'>-			IWL_ERR(drv, "maximum version supported: %s%d\n",</div><div class='del'>-				cfg-&gt;fw_name_pre, cfg-&gt;ucode_api_max);</div><div class='add'>+			IWL_ERR(drv,</div><div class='add'>+				"minimum version required: %s-" FW_API_FMT "\n",</div><div class='add'>+				fw_name_pre, FW_API_ARG(ucode_api_min));</div><div class='add'>+			IWL_ERR(drv,</div><div class='add'>+				"maximum version supported: %s-" FW_API_FMT "\n",</div><div class='add'>+				fw_name_pre, FW_API_ARG(ucode_api_max));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		IWL_ERR(drv,</div><div class='hunk'>@@ -198,8 +373,9 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snprintf(drv-&gt;firmware_name, sizeof(drv-&gt;firmware_name), "%s%s.ucode",</div><div class='del'>-		 cfg-&gt;fw_name_pre, tag);</div><div class='add'>+	snprintf(drv-&gt;firmware_name, sizeof(drv-&gt;firmware_name),</div><div class='add'>+		 "%s-" FW_API_FMT ".ucode",</div><div class='add'>+		 fw_name_pre, FW_API_ARG(drv-&gt;fw_index));</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_FW_INFO(drv, "attempting to load firmware '%s'\n",</div><div class='ctx'> 			  drv-&gt;firmware_name);</div><div class='hunk'>@@ -241,30 +417,19 @@ struct iwl_firmware_pieces {</div><div class='ctx'> </div><div class='ctx'> 	/* FW debug data parsed for driver usage */</div><div class='ctx'> 	bool dbg_dest_tlv_init;</div><div class='del'>-	u8 *dbg_dest_ver;</div><div class='add'>+	const u8 *dbg_dest_ver;</div><div class='ctx'> 	union {</div><div class='del'>-		struct iwl_fw_dbg_dest_tlv *dbg_dest_tlv;</div><div class='del'>-		struct iwl_fw_dbg_dest_tlv_v1 *dbg_dest_tlv_v1;</div><div class='add'>+		const struct iwl_fw_dbg_dest_tlv *dbg_dest_tlv;</div><div class='add'>+		const struct iwl_fw_dbg_dest_tlv_v1 *dbg_dest_tlv_v1;</div><div class='ctx'> 	};</div><div class='del'>-	struct iwl_fw_dbg_conf_tlv *dbg_conf_tlv[FW_DBG_CONF_MAX];</div><div class='add'>+	const struct iwl_fw_dbg_conf_tlv *dbg_conf_tlv[FW_DBG_CONF_MAX];</div><div class='ctx'> 	size_t dbg_conf_tlv_len[FW_DBG_CONF_MAX];</div><div class='del'>-	struct iwl_fw_dbg_trigger_tlv *dbg_trigger_tlv[FW_DBG_TRIGGER_MAX];</div><div class='add'>+	const struct iwl_fw_dbg_trigger_tlv *dbg_trigger_tlv[FW_DBG_TRIGGER_MAX];</div><div class='ctx'> 	size_t dbg_trigger_tlv_len[FW_DBG_TRIGGER_MAX];</div><div class='ctx'> 	struct iwl_fw_dbg_mem_seg_tlv *dbg_mem_tlv;</div><div class='ctx'> 	size_t n_mem_tlv;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * These functions are just to extract uCode section data from the pieces</div><div class='del'>- * structure.</div><div class='del'>- */</div><div class='del'>-static struct fw_sec *get_sec(struct iwl_firmware_pieces *pieces,</div><div class='del'>-			      enum iwl_ucode_type type,</div><div class='del'>-			      int  sec)</div><div class='del'>-{</div><div class='del'>-	return &amp;pieces-&gt;img[type].sec[sec];</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void alloc_sec_data(struct iwl_firmware_pieces *pieces,</div><div class='ctx'> 			   enum iwl_ucode_type type,</div><div class='ctx'> 			   int sec)</div><div class='hunk'>@@ -322,47 +487,20 @@ static void set_sec_offset(struct iwl_firmware_pieces *pieces,</div><div class='ctx'> 	pieces-&gt;img[type].sec[sec].offset = offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_store_cscheme(struct iwl_fw *fw, const u8 *data, const u32 len)</div><div class='del'>-{</div><div class='del'>-	int i, j;</div><div class='del'>-	struct iwl_fw_cscheme_list *l = (struct iwl_fw_cscheme_list *)data;</div><div class='del'>-	struct iwl_fw_cipher_scheme *fwcs;</div><div class='del'>-</div><div class='del'>-	if (len &lt; sizeof(*l) ||</div><div class='del'>-	    len &lt; sizeof(l-&gt;size) + l-&gt;size * sizeof(l-&gt;cs[0]))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	for (i = 0, j = 0; i &lt; IWL_UCODE_MAX_CS &amp;&amp; i &lt; l-&gt;size; i++) {</div><div class='del'>-		fwcs = &amp;l-&gt;cs[j];</div><div class='del'>-</div><div class='del'>-		/* we skip schemes with zero cipher suite selector */</div><div class='del'>-		if (!fwcs-&gt;cipher)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		fw-&gt;cs[j++] = *fwcs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Gets uCode section from tlv.</div><div class='ctx'>  */</div><div class='del'>-static int iwl_store_ucode_sec(struct iwl_firmware_pieces *pieces,</div><div class='del'>-			       const void *data, enum iwl_ucode_type type,</div><div class='del'>-			       int size)</div><div class='add'>+static int iwl_store_ucode_sec(struct fw_img_parsing *img,</div><div class='add'>+			       const void *data, int size)</div><div class='ctx'> {</div><div class='del'>-	struct fw_img_parsing *img;</div><div class='ctx'> 	struct fw_sec *sec;</div><div class='del'>-	struct fw_sec_parsing *sec_parse;</div><div class='add'>+	const struct fw_sec_parsing *sec_parse;</div><div class='ctx'> 	size_t alloc_size;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(!pieces || !data || type &gt;= IWL_UCODE_TYPE_MAX))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	sec_parse = (struct fw_sec_parsing *)data;</div><div class='add'>+	if (WARN_ON(!img || !data))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	img = &amp;pieces-&gt;img[type];</div><div class='add'>+	sec_parse = (const struct fw_sec_parsing *)data;</div><div class='ctx'> </div><div class='ctx'> 	alloc_size = sizeof(*img-&gt;sec) * (img-&gt;sec_counter + 1);</div><div class='ctx'> 	sec = krealloc(img-&gt;sec, alloc_size, GFP_KERNEL);</div><div class='hunk'>@@ -383,8 +521,8 @@ static int iwl_store_ucode_sec(struct iwl_firmware_pieces *pieces,</div><div class='ctx'> </div><div class='ctx'> static int iwl_set_default_calib(struct iwl_drv *drv, const u8 *data)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_tlv_calib_data *def_calib =</div><div class='del'>-					(struct iwl_tlv_calib_data *)data;</div><div class='add'>+	const struct iwl_tlv_calib_data *def_calib =</div><div class='add'>+					(const struct iwl_tlv_calib_data *)data;</div><div class='ctx'> 	u32 ucode_type = le32_to_cpu(def_calib-&gt;ucode_type);</div><div class='ctx'> 	if (ucode_type &gt;= IWL_UCODE_TYPE_MAX) {</div><div class='ctx'> 		IWL_ERR(drv, "Wrong ucode_type %u for default calibration.\n",</div><div class='hunk'>@@ -402,7 +540,7 @@ static int iwl_set_default_calib(struct iwl_drv *drv, const u8 *data)</div><div class='ctx'> static void iwl_set_ucode_api_flags(struct iwl_drv *drv, const u8 *data,</div><div class='ctx'> 				    struct iwl_ucode_capabilities *capa)</div><div class='ctx'> {</div><div class='del'>-	const struct iwl_ucode_api *ucode_api = (void *)data;</div><div class='add'>+	const struct iwl_ucode_api *ucode_api = (const void *)data;</div><div class='ctx'> 	u32 api_index = le32_to_cpu(ucode_api-&gt;api_index);</div><div class='ctx'> 	u32 api_flags = le32_to_cpu(ucode_api-&gt;api_flags);</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -423,7 +561,7 @@ static void iwl_set_ucode_api_flags(struct iwl_drv *drv, const u8 *data,</div><div class='ctx'> static void iwl_set_ucode_capabilities(struct iwl_drv *drv, const u8 *data,</div><div class='ctx'> 				       struct iwl_ucode_capabilities *capa)</div><div class='ctx'> {</div><div class='del'>-	const struct iwl_ucode_capa *ucode_capa = (void *)data;</div><div class='add'>+	const struct iwl_ucode_capa *ucode_capa = (const void *)data;</div><div class='ctx'> 	u32 api_index = le32_to_cpu(ucode_capa-&gt;api_index);</div><div class='ctx'> 	u32 api_flags = le32_to_cpu(ucode_capa-&gt;api_capa);</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -455,7 +593,7 @@ static int iwl_parse_v1_v2_firmware(struct iwl_drv *drv,</div><div class='ctx'> 				    const struct firmware *ucode_raw,</div><div class='ctx'> 				    struct iwl_firmware_pieces *pieces)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_ucode_header *ucode = (void *)ucode_raw-&gt;data;</div><div class='add'>+	const struct iwl_ucode_header *ucode = (const void *)ucode_raw-&gt;data;</div><div class='ctx'> 	u32 api_ver, hdr_size, build;</div><div class='ctx'> 	char buildstr[25];</div><div class='ctx'> 	const u8 *src;</div><div class='hunk'>@@ -550,13 +688,110 @@ static int iwl_parse_v1_v2_firmware(struct iwl_drv *drv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void iwl_drv_set_dump_exclude(struct iwl_drv *drv,</div><div class='add'>+				     enum iwl_ucode_tlv_type tlv_type,</div><div class='add'>+				     const void *tlv_data, u32 tlv_len)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_fw_dump_exclude *fw = tlv_data;</div><div class='add'>+	struct iwl_dump_exclude *excl;</div><div class='add'>+</div><div class='add'>+	if (tlv_len &lt; sizeof(*fw))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (tlv_type == IWL_UCODE_TLV_SEC_TABLE_ADDR) {</div><div class='add'>+		excl = &amp;drv-&gt;fw.dump_excl[0];</div><div class='add'>+</div><div class='add'>+		/* second time we find this, it's for WoWLAN */</div><div class='add'>+		if (excl-&gt;addr)</div><div class='add'>+			excl = &amp;drv-&gt;fw.dump_excl_wowlan[0];</div><div class='add'>+	} else if (fw_has_capa(&amp;drv-&gt;fw.ucode_capa,</div><div class='add'>+			       IWL_UCODE_TLV_CAPA_CNSLDTD_D3_D0_IMG)) {</div><div class='add'>+		/* IWL_UCODE_TLV_D3_KEK_KCK_ADDR is regular image */</div><div class='add'>+		excl = &amp;drv-&gt;fw.dump_excl[0];</div><div class='add'>+	} else {</div><div class='add'>+		/* IWL_UCODE_TLV_D3_KEK_KCK_ADDR is WoWLAN image */</div><div class='add'>+		excl = &amp;drv-&gt;fw.dump_excl_wowlan[0];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (excl-&gt;addr)</div><div class='add'>+		excl++;</div><div class='add'>+</div><div class='add'>+	if (excl-&gt;addr) {</div><div class='add'>+		IWL_DEBUG_FW_INFO(drv, "found too many excludes in fw file\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	excl-&gt;addr = le32_to_cpu(fw-&gt;addr) &amp; ~FW_ADDR_CACHE_CONTROL;</div><div class='add'>+	excl-&gt;size = le32_to_cpu(fw-&gt;size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_parse_dbg_tlv_assert_tables(struct iwl_drv *drv,</div><div class='add'>+					    const struct iwl_ucode_tlv *tlv)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_fw_ini_region_tlv *region;</div><div class='add'>+	u32 length = le32_to_cpu(tlv-&gt;length);</div><div class='add'>+	u32 addr;</div><div class='add'>+</div><div class='add'>+	if (length &lt; offsetof(typeof(*region), special_mem) +</div><div class='add'>+		     sizeof(region-&gt;special_mem))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	region = (const void *)tlv-&gt;data;</div><div class='add'>+	addr = le32_to_cpu(region-&gt;special_mem.base_addr);</div><div class='add'>+	addr += le32_to_cpu(region-&gt;special_mem.offset);</div><div class='add'>+	addr &amp;= ~FW_ADDR_CACHE_CONTROL;</div><div class='add'>+</div><div class='add'>+	if (region-&gt;type != IWL_FW_INI_REGION_SPECIAL_DEVICE_MEMORY)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (region-&gt;sub_type) {</div><div class='add'>+	case IWL_FW_INI_REGION_DEVICE_MEMORY_SUBTYPE_UMAC_ERROR_TABLE:</div><div class='add'>+		drv-&gt;trans-&gt;dbg.umac_error_event_table = addr;</div><div class='add'>+		drv-&gt;trans-&gt;dbg.error_event_table_tlv_status |=</div><div class='add'>+			IWL_ERROR_EVENT_TABLE_UMAC;</div><div class='add'>+		break;</div><div class='add'>+	case IWL_FW_INI_REGION_DEVICE_MEMORY_SUBTYPE_LMAC_1_ERROR_TABLE:</div><div class='add'>+		drv-&gt;trans-&gt;dbg.lmac_error_event_table[0] = addr;</div><div class='add'>+		drv-&gt;trans-&gt;dbg.error_event_table_tlv_status |=</div><div class='add'>+			IWL_ERROR_EVENT_TABLE_LMAC1;</div><div class='add'>+		break;</div><div class='add'>+	case IWL_FW_INI_REGION_DEVICE_MEMORY_SUBTYPE_LMAC_2_ERROR_TABLE:</div><div class='add'>+		drv-&gt;trans-&gt;dbg.lmac_error_event_table[1] = addr;</div><div class='add'>+		drv-&gt;trans-&gt;dbg.error_event_table_tlv_status |=</div><div class='add'>+			IWL_ERROR_EVENT_TABLE_LMAC2;</div><div class='add'>+		break;</div><div class='add'>+	case IWL_FW_INI_REGION_DEVICE_MEMORY_SUBTYPE_TCM_1_ERROR_TABLE:</div><div class='add'>+		drv-&gt;trans-&gt;dbg.tcm_error_event_table[0] = addr;</div><div class='add'>+		drv-&gt;trans-&gt;dbg.error_event_table_tlv_status |=</div><div class='add'>+			IWL_ERROR_EVENT_TABLE_TCM1;</div><div class='add'>+		break;</div><div class='add'>+	case IWL_FW_INI_REGION_DEVICE_MEMORY_SUBTYPE_TCM_2_ERROR_TABLE:</div><div class='add'>+		drv-&gt;trans-&gt;dbg.tcm_error_event_table[1] = addr;</div><div class='add'>+		drv-&gt;trans-&gt;dbg.error_event_table_tlv_status |=</div><div class='add'>+			IWL_ERROR_EVENT_TABLE_TCM2;</div><div class='add'>+		break;</div><div class='add'>+	case IWL_FW_INI_REGION_DEVICE_MEMORY_SUBTYPE_RCM_1_ERROR_TABLE:</div><div class='add'>+		drv-&gt;trans-&gt;dbg.rcm_error_event_table[0] = addr;</div><div class='add'>+		drv-&gt;trans-&gt;dbg.error_event_table_tlv_status |=</div><div class='add'>+			IWL_ERROR_EVENT_TABLE_RCM1;</div><div class='add'>+		break;</div><div class='add'>+	case IWL_FW_INI_REGION_DEVICE_MEMORY_SUBTYPE_RCM_2_ERROR_TABLE:</div><div class='add'>+		drv-&gt;trans-&gt;dbg.rcm_error_event_table[1] = addr;</div><div class='add'>+		drv-&gt;trans-&gt;dbg.error_event_table_tlv_status |=</div><div class='add'>+			IWL_ERROR_EVENT_TABLE_RCM2;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int iwl_parse_tlv_firmware(struct iwl_drv *drv,</div><div class='ctx'> 				const struct firmware *ucode_raw,</div><div class='ctx'> 				struct iwl_firmware_pieces *pieces,</div><div class='ctx'> 				struct iwl_ucode_capabilities *capa,</div><div class='ctx'> 				bool *usniffer_images)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_tlv_ucode_header *ucode = (void *)ucode_raw-&gt;data;</div><div class='add'>+	const struct iwl_tlv_ucode_header *ucode = (const void *)ucode_raw-&gt;data;</div><div class='ctx'> 	const struct iwl_ucode_tlv *tlv;</div><div class='ctx'> 	size_t len = ucode_raw-&gt;size;</div><div class='ctx'> 	const u8 *data;</div><div class='hunk'>@@ -605,8 +840,8 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,</div><div class='ctx'> </div><div class='ctx'> 	while (len &gt;= sizeof(*tlv)) {</div><div class='ctx'> 		len -= sizeof(*tlv);</div><div class='del'>-		tlv = (void *)data;</div><div class='ctx'> </div><div class='add'>+		tlv = (const void *)data;</div><div class='ctx'> 		tlv_len = le32_to_cpu(tlv-&gt;length);</div><div class='ctx'> 		tlv_type = le32_to_cpu(tlv-&gt;type);</div><div class='ctx'> 		tlv_data = tlv-&gt;data;</div><div class='hunk'>@@ -663,7 +898,7 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,</div><div class='ctx'> 			if (tlv_len != sizeof(u32))</div><div class='ctx'> 				goto invalid_tlv_len;</div><div class='ctx'> 			capa-&gt;max_probe_length =</div><div class='del'>-					le32_to_cpup((__le32 *)tlv_data);</div><div class='add'>+					le32_to_cpup((const __le32 *)tlv_data);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_PAN:</div><div class='ctx'> 			if (tlv_len)</div><div class='hunk'>@@ -684,7 +919,7 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,</div><div class='ctx'> 			 * will not work with the new firmware, or</div><div class='ctx'> 			 * it'll not take advantage of new features.</div><div class='ctx'> 			 */</div><div class='del'>-			capa-&gt;flags = le32_to_cpup((__le32 *)tlv_data);</div><div class='add'>+			capa-&gt;flags = le32_to_cpup((const __le32 *)tlv_data);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_API_CHANGES_SET:</div><div class='ctx'> 			if (tlv_len != sizeof(struct iwl_ucode_api))</div><div class='hunk'>@@ -700,37 +935,37 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,</div><div class='ctx'> 			if (tlv_len != sizeof(u32))</div><div class='ctx'> 				goto invalid_tlv_len;</div><div class='ctx'> 			pieces-&gt;init_evtlog_ptr =</div><div class='del'>-					le32_to_cpup((__le32 *)tlv_data);</div><div class='add'>+					le32_to_cpup((const __le32 *)tlv_data);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_INIT_EVTLOG_SIZE:</div><div class='ctx'> 			if (tlv_len != sizeof(u32))</div><div class='ctx'> 				goto invalid_tlv_len;</div><div class='ctx'> 			pieces-&gt;init_evtlog_size =</div><div class='del'>-					le32_to_cpup((__le32 *)tlv_data);</div><div class='add'>+					le32_to_cpup((const __le32 *)tlv_data);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_INIT_ERRLOG_PTR:</div><div class='ctx'> 			if (tlv_len != sizeof(u32))</div><div class='ctx'> 				goto invalid_tlv_len;</div><div class='ctx'> 			pieces-&gt;init_errlog_ptr =</div><div class='del'>-					le32_to_cpup((__le32 *)tlv_data);</div><div class='add'>+					le32_to_cpup((const __le32 *)tlv_data);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_RUNT_EVTLOG_PTR:</div><div class='ctx'> 			if (tlv_len != sizeof(u32))</div><div class='ctx'> 				goto invalid_tlv_len;</div><div class='ctx'> 			pieces-&gt;inst_evtlog_ptr =</div><div class='del'>-					le32_to_cpup((__le32 *)tlv_data);</div><div class='add'>+					le32_to_cpup((const __le32 *)tlv_data);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_RUNT_EVTLOG_SIZE:</div><div class='ctx'> 			if (tlv_len != sizeof(u32))</div><div class='ctx'> 				goto invalid_tlv_len;</div><div class='ctx'> 			pieces-&gt;inst_evtlog_size =</div><div class='del'>-					le32_to_cpup((__le32 *)tlv_data);</div><div class='add'>+					le32_to_cpup((const __le32 *)tlv_data);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_RUNT_ERRLOG_PTR:</div><div class='ctx'> 			if (tlv_len != sizeof(u32))</div><div class='ctx'> 				goto invalid_tlv_len;</div><div class='ctx'> 			pieces-&gt;inst_errlog_ptr =</div><div class='del'>-					le32_to_cpup((__le32 *)tlv_data);</div><div class='add'>+					le32_to_cpup((const __le32 *)tlv_data);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_ENHANCE_SENS_TBL:</div><div class='ctx'> 			if (tlv_len)</div><div class='hunk'>@@ -759,21 +994,21 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,</div><div class='ctx'> 			if (tlv_len != sizeof(u32))</div><div class='ctx'> 				goto invalid_tlv_len;</div><div class='ctx'> 			capa-&gt;standard_phy_calibration_size =</div><div class='del'>-					le32_to_cpup((__le32 *)tlv_data);</div><div class='add'>+					le32_to_cpup((const __le32 *)tlv_data);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_SEC_RT:</div><div class='del'>-			iwl_store_ucode_sec(pieces, tlv_data, IWL_UCODE_REGULAR,</div><div class='del'>-					    tlv_len);</div><div class='add'>+			iwl_store_ucode_sec(&amp;pieces-&gt;img[IWL_UCODE_REGULAR],</div><div class='add'>+					    tlv_data, tlv_len);</div><div class='ctx'> 			drv-&gt;fw.type = IWL_FW_MVM;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_SEC_INIT:</div><div class='del'>-			iwl_store_ucode_sec(pieces, tlv_data, IWL_UCODE_INIT,</div><div class='del'>-					    tlv_len);</div><div class='add'>+			iwl_store_ucode_sec(&amp;pieces-&gt;img[IWL_UCODE_INIT],</div><div class='add'>+					    tlv_data, tlv_len);</div><div class='ctx'> 			drv-&gt;fw.type = IWL_FW_MVM;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_SEC_WOWLAN:</div><div class='del'>-			iwl_store_ucode_sec(pieces, tlv_data, IWL_UCODE_WOWLAN,</div><div class='del'>-					    tlv_len);</div><div class='add'>+			iwl_store_ucode_sec(&amp;pieces-&gt;img[IWL_UCODE_WOWLAN],</div><div class='add'>+					    tlv_data, tlv_len);</div><div class='ctx'> 			drv-&gt;fw.type = IWL_FW_MVM;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_DEF_CALIB:</div><div class='hunk'>@@ -785,7 +1020,7 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,</div><div class='ctx'> 		case IWL_UCODE_TLV_PHY_SKU:</div><div class='ctx'> 			if (tlv_len != sizeof(u32))</div><div class='ctx'> 				goto invalid_tlv_len;</div><div class='del'>-			drv-&gt;fw.phy_config = le32_to_cpup((__le32 *)tlv_data);</div><div class='add'>+			drv-&gt;fw.phy_config = le32_to_cpup((const __le32 *)tlv_data);</div><div class='ctx'> 			drv-&gt;fw.valid_tx_ant = (drv-&gt;fw.phy_config &amp;</div><div class='ctx'> 						FW_PHY_CFG_TX_CHAIN) &gt;&gt;</div><div class='ctx'> 						FW_PHY_CFG_TX_CHAIN_POS;</div><div class='hunk'>@@ -794,25 +1029,25 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,</div><div class='ctx'> 						FW_PHY_CFG_RX_CHAIN_POS;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_SECURE_SEC_RT:</div><div class='del'>-			iwl_store_ucode_sec(pieces, tlv_data, IWL_UCODE_REGULAR,</div><div class='del'>-					    tlv_len);</div><div class='add'>+			iwl_store_ucode_sec(&amp;pieces-&gt;img[IWL_UCODE_REGULAR],</div><div class='add'>+					    tlv_data, tlv_len);</div><div class='ctx'> 			drv-&gt;fw.type = IWL_FW_MVM;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_SECURE_SEC_INIT:</div><div class='del'>-			iwl_store_ucode_sec(pieces, tlv_data, IWL_UCODE_INIT,</div><div class='del'>-					    tlv_len);</div><div class='add'>+			iwl_store_ucode_sec(&amp;pieces-&gt;img[IWL_UCODE_INIT],</div><div class='add'>+					    tlv_data, tlv_len);</div><div class='ctx'> 			drv-&gt;fw.type = IWL_FW_MVM;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_SECURE_SEC_WOWLAN:</div><div class='del'>-			iwl_store_ucode_sec(pieces, tlv_data, IWL_UCODE_WOWLAN,</div><div class='del'>-					    tlv_len);</div><div class='add'>+			iwl_store_ucode_sec(&amp;pieces-&gt;img[IWL_UCODE_WOWLAN],</div><div class='add'>+					    tlv_data, tlv_len);</div><div class='ctx'> 			drv-&gt;fw.type = IWL_FW_MVM;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_NUM_OF_CPU:</div><div class='ctx'> 			if (tlv_len != sizeof(u32))</div><div class='ctx'> 				goto invalid_tlv_len;</div><div class='ctx'> 			num_of_cpus =</div><div class='del'>-				le32_to_cpup((__le32 *)tlv_data);</div><div class='add'>+				le32_to_cpup((const __le32 *)tlv_data);</div><div class='ctx'> </div><div class='ctx'> 			if (num_of_cpus == 2) {</div><div class='ctx'> 				drv-&gt;fw.img[IWL_UCODE_REGULAR].is_dual_cpus =</div><div class='hunk'>@@ -822,22 +1057,18 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,</div><div class='ctx'> 				drv-&gt;fw.img[IWL_UCODE_WOWLAN].is_dual_cpus =</div><div class='ctx'> 					true;</div><div class='ctx'> 			} else if ((num_of_cpus &gt; 2) || (num_of_cpus &lt; 1)) {</div><div class='del'>-				IWL_ERR(drv, "Driver support upto 2 CPUs\n");</div><div class='add'>+				IWL_ERR(drv, "Driver support up to 2 CPUs\n");</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='del'>-		case IWL_UCODE_TLV_CSCHEME:</div><div class='del'>-			if (iwl_store_cscheme(&amp;drv-&gt;fw, tlv_data, tlv_len))</div><div class='del'>-				goto invalid_tlv_len;</div><div class='del'>-			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_N_SCAN_CHANNELS:</div><div class='ctx'> 			if (tlv_len != sizeof(u32))</div><div class='ctx'> 				goto invalid_tlv_len;</div><div class='ctx'> 			capa-&gt;n_scan_channels =</div><div class='del'>-				le32_to_cpup((__le32 *)tlv_data);</div><div class='add'>+				le32_to_cpup((const __le32 *)tlv_data);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_FW_VERSION: {</div><div class='del'>-			__le32 *ptr = (void *)tlv_data;</div><div class='add'>+			const __le32 *ptr = (const void *)tlv_data;</div><div class='ctx'> 			u32 major, minor;</div><div class='ctx'> 			u8 local_comp;</div><div class='ctx'> </div><div class='hunk'>@@ -848,28 +1079,22 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,</div><div class='ctx'> 			minor = le32_to_cpup(ptr++);</div><div class='ctx'> 			local_comp = le32_to_cpup(ptr);</div><div class='ctx'> </div><div class='del'>-			if (major &gt;= 35)</div><div class='del'>-				snprintf(drv-&gt;fw.fw_version,</div><div class='del'>-					 sizeof(drv-&gt;fw.fw_version),</div><div class='del'>-					"%u.%08x.%u %s", major, minor,</div><div class='del'>-					local_comp, iwl_reduced_fw_name(drv));</div><div class='del'>-			else</div><div class='del'>-				snprintf(drv-&gt;fw.fw_version,</div><div class='del'>-					 sizeof(drv-&gt;fw.fw_version),</div><div class='del'>-					"%u.%u.%u %s", major, minor,</div><div class='del'>-					local_comp, iwl_reduced_fw_name(drv));</div><div class='add'>+			snprintf(drv-&gt;fw.fw_version,</div><div class='add'>+				 sizeof(drv-&gt;fw.fw_version),</div><div class='add'>+				 "%u.%08x.%u %s", major, minor,</div><div class='add'>+				 local_comp, iwl_reduced_fw_name(drv));</div><div class='ctx'> 			break;</div><div class='ctx'> 			}</div><div class='ctx'> 		case IWL_UCODE_TLV_FW_DBG_DEST: {</div><div class='del'>-			struct iwl_fw_dbg_dest_tlv *dest = NULL;</div><div class='del'>-			struct iwl_fw_dbg_dest_tlv_v1 *dest_v1 = NULL;</div><div class='add'>+			const struct iwl_fw_dbg_dest_tlv *dest = NULL;</div><div class='add'>+			const struct iwl_fw_dbg_dest_tlv_v1 *dest_v1 = NULL;</div><div class='ctx'> 			u8 mon_mode;</div><div class='ctx'> </div><div class='del'>-			pieces-&gt;dbg_dest_ver = (u8 *)tlv_data;</div><div class='add'>+			pieces-&gt;dbg_dest_ver = (const u8 *)tlv_data;</div><div class='ctx'> 			if (*pieces-&gt;dbg_dest_ver == 1) {</div><div class='del'>-				dest = (void *)tlv_data;</div><div class='add'>+				dest = (const void *)tlv_data;</div><div class='ctx'> 			} else if (*pieces-&gt;dbg_dest_ver == 0) {</div><div class='del'>-				dest_v1 = (void *)tlv_data;</div><div class='add'>+				dest_v1 = (const void *)tlv_data;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				IWL_ERR(drv,</div><div class='ctx'> 					"The version is %d, and it is invalid\n",</div><div class='hunk'>@@ -910,7 +1135,8 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,</div><div class='ctx'> 			break;</div><div class='ctx'> 			}</div><div class='ctx'> 		case IWL_UCODE_TLV_FW_DBG_CONF: {</div><div class='del'>-			struct iwl_fw_dbg_conf_tlv *conf = (void *)tlv_data;</div><div class='add'>+			const struct iwl_fw_dbg_conf_tlv *conf =</div><div class='add'>+				(const void *)tlv_data;</div><div class='ctx'> </div><div class='ctx'> 			if (!pieces-&gt;dbg_dest_tlv_init) {</div><div class='ctx'> 				IWL_ERR(drv,</div><div class='hunk'>@@ -944,8 +1170,8 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,</div><div class='ctx'> 			break;</div><div class='ctx'> 			}</div><div class='ctx'> 		case IWL_UCODE_TLV_FW_DBG_TRIGGER: {</div><div class='del'>-			struct iwl_fw_dbg_trigger_tlv *trigger =</div><div class='del'>-				(void *)tlv_data;</div><div class='add'>+			const struct iwl_fw_dbg_trigger_tlv *trigger =</div><div class='add'>+				(const void *)tlv_data;</div><div class='ctx'> 			u32 trigger_id = le32_to_cpu(trigger-&gt;id);</div><div class='ctx'> </div><div class='ctx'> 			if (trigger_id &gt;= ARRAY_SIZE(drv-&gt;fw.dbg.trigger_tlv)) {</div><div class='hunk'>@@ -976,19 +1202,18 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			drv-&gt;fw.dbg.dump_mask =</div><div class='del'>-				le32_to_cpup((__le32 *)tlv_data);</div><div class='add'>+				le32_to_cpup((const __le32 *)tlv_data);</div><div class='ctx'> 			break;</div><div class='ctx'> 			}</div><div class='ctx'> 		case IWL_UCODE_TLV_SEC_RT_USNIFFER:</div><div class='ctx'> 			*usniffer_images = true;</div><div class='del'>-			iwl_store_ucode_sec(pieces, tlv_data,</div><div class='del'>-					    IWL_UCODE_REGULAR_USNIFFER,</div><div class='del'>-					    tlv_len);</div><div class='add'>+			iwl_store_ucode_sec(&amp;pieces-&gt;img[IWL_UCODE_REGULAR_USNIFFER],</div><div class='add'>+					    tlv_data, tlv_len);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_PAGING:</div><div class='ctx'> 			if (tlv_len != sizeof(u32))</div><div class='ctx'> 				goto invalid_tlv_len;</div><div class='del'>-			paging_mem_size = le32_to_cpup((__le32 *)tlv_data);</div><div class='add'>+			paging_mem_size = le32_to_cpup((const __le32 *)tlv_data);</div><div class='ctx'> </div><div class='ctx'> 			IWL_DEBUG_FW(drv,</div><div class='ctx'> 				     "Paging: paging enabled (size = %u bytes)\n",</div><div class='hunk'>@@ -1018,8 +1243,8 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,</div><div class='ctx'> 			/* ignored */</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_FW_MEM_SEG: {</div><div class='del'>-			struct iwl_fw_dbg_mem_seg_tlv *dbg_mem =</div><div class='del'>-				(void *)tlv_data;</div><div class='add'>+			const struct iwl_fw_dbg_mem_seg_tlv *dbg_mem =</div><div class='add'>+				(const void *)tlv_data;</div><div class='ctx'> 			size_t size;</div><div class='ctx'> 			struct iwl_fw_dbg_mem_seg_tlv *n;</div><div class='ctx'> </div><div class='hunk'>@@ -1047,10 +1272,10 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,</div><div class='ctx'> 			break;</div><div class='ctx'> 			}</div><div class='ctx'> 		case IWL_UCODE_TLV_FW_RECOVERY_INFO: {</div><div class='del'>-			struct {</div><div class='add'>+			const struct {</div><div class='ctx'> 				__le32 buf_addr;</div><div class='ctx'> 				__le32 buf_size;</div><div class='del'>-			} *recov_info = (void *)tlv_data;</div><div class='add'>+			} *recov_info = (const void *)tlv_data;</div><div class='ctx'> </div><div class='ctx'> 			if (tlv_len != sizeof(*recov_info))</div><div class='ctx'> 				goto invalid_tlv_len;</div><div class='hunk'>@@ -1061,37 +1286,56 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_FW_FSEQ_VERSION: {</div><div class='del'>-			struct {</div><div class='add'>+			const struct {</div><div class='ctx'> 				u8 version[32];</div><div class='ctx'> 				u8 sha1[20];</div><div class='del'>-			} *fseq_ver = (void *)tlv_data;</div><div class='add'>+			} *fseq_ver = (const void *)tlv_data;</div><div class='ctx'> </div><div class='ctx'> 			if (tlv_len != sizeof(*fseq_ver))</div><div class='ctx'> 				goto invalid_tlv_len;</div><div class='del'>-			IWL_INFO(drv, "TLV_FW_FSEQ_VERSION: %s\n",</div><div class='del'>-				 fseq_ver-&gt;version);</div><div class='add'>+			IWL_DEBUG_INFO(drv, "TLV_FW_FSEQ_VERSION: %.32s\n",</div><div class='add'>+				       fseq_ver-&gt;version);</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_FW_NUM_STATIONS:</div><div class='ctx'> 			if (tlv_len != sizeof(u32))</div><div class='ctx'> 				goto invalid_tlv_len;</div><div class='del'>-			if (le32_to_cpup((__le32 *)tlv_data) &gt;</div><div class='del'>-			    IWL_MVM_STATION_COUNT_MAX) {</div><div class='add'>+			if (le32_to_cpup((const __le32 *)tlv_data) &gt;</div><div class='add'>+			    IWL_STATION_COUNT_MAX) {</div><div class='ctx'> 				IWL_ERR(drv,</div><div class='ctx'> 					"%d is an invalid number of station\n",</div><div class='del'>-					le32_to_cpup((__le32 *)tlv_data));</div><div class='add'>+					le32_to_cpup((const __le32 *)tlv_data));</div><div class='ctx'> 				goto tlv_error;</div><div class='ctx'> 			}</div><div class='ctx'> 			capa-&gt;num_stations =</div><div class='del'>-				le32_to_cpup((__le32 *)tlv_data);</div><div class='add'>+				le32_to_cpup((const __le32 *)tlv_data);</div><div class='add'>+			break;</div><div class='add'>+		case IWL_UCODE_TLV_FW_NUM_LINKS:</div><div class='add'>+			if (tlv_len != sizeof(u32))</div><div class='add'>+				goto invalid_tlv_len;</div><div class='add'>+			if (le32_to_cpup((const __le32 *)tlv_data) &gt;</div><div class='add'>+			    IWL_FW_MAX_LINK_ID + 1) {</div><div class='add'>+				IWL_ERR(drv,</div><div class='add'>+					"%d is an invalid number of links\n",</div><div class='add'>+					le32_to_cpup((const __le32 *)tlv_data));</div><div class='add'>+				goto tlv_error;</div><div class='add'>+			}</div><div class='add'>+			capa-&gt;num_links =</div><div class='add'>+				le32_to_cpup((const __le32 *)tlv_data);</div><div class='add'>+			break;</div><div class='add'>+		case IWL_UCODE_TLV_FW_NUM_BEACONS:</div><div class='add'>+			if (tlv_len != sizeof(u32))</div><div class='add'>+				goto invalid_tlv_len;</div><div class='add'>+			capa-&gt;num_beacons =</div><div class='add'>+				le32_to_cpup((const __le32 *)tlv_data);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IWL_UCODE_TLV_UMAC_DEBUG_ADDRS: {</div><div class='del'>-			struct iwl_umac_debug_addrs *dbg_ptrs =</div><div class='del'>-				(void *)tlv_data;</div><div class='add'>+			const struct iwl_umac_debug_addrs *dbg_ptrs =</div><div class='add'>+				(const void *)tlv_data;</div><div class='ctx'> </div><div class='ctx'> 			if (tlv_len != sizeof(*dbg_ptrs))</div><div class='ctx'> 				goto invalid_tlv_len;</div><div class='del'>-			if (drv-&gt;trans-&gt;trans_cfg-&gt;device_family &lt;</div><div class='add'>+			if (drv-&gt;trans-&gt;mac_cfg-&gt;device_family &lt;</div><div class='ctx'> 			    IWL_DEVICE_FAMILY_22000)</div><div class='ctx'> 				break;</div><div class='ctx'> 			drv-&gt;trans-&gt;dbg.umac_error_event_table =</div><div class='hunk'>@@ -1102,12 +1346,12 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,</div><div class='ctx'> 			break;</div><div class='ctx'> 			}</div><div class='ctx'> 		case IWL_UCODE_TLV_LMAC_DEBUG_ADDRS: {</div><div class='del'>-			struct iwl_lmac_debug_addrs *dbg_ptrs =</div><div class='del'>-				(void *)tlv_data;</div><div class='add'>+			const struct iwl_lmac_debug_addrs *dbg_ptrs =</div><div class='add'>+				(const void *)tlv_data;</div><div class='ctx'> </div><div class='ctx'> 			if (tlv_len != sizeof(*dbg_ptrs))</div><div class='ctx'> 				goto invalid_tlv_len;</div><div class='del'>-			if (drv-&gt;trans-&gt;trans_cfg-&gt;device_family &lt;</div><div class='add'>+			if (drv-&gt;trans-&gt;mac_cfg-&gt;device_family &lt;</div><div class='ctx'> 			    IWL_DEVICE_FAMILY_22000)</div><div class='ctx'> 				break;</div><div class='ctx'> 			drv-&gt;trans-&gt;dbg.lmac_error_event_table[0] =</div><div class='hunk'>@@ -1117,11 +1361,14 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,</div><div class='ctx'> 				IWL_ERROR_EVENT_TABLE_LMAC1;</div><div class='ctx'> 			break;</div><div class='ctx'> 			}</div><div class='add'>+		case IWL_UCODE_TLV_TYPE_REGIONS:</div><div class='add'>+			iwl_parse_dbg_tlv_assert_tables(drv, tlv);</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case IWL_UCODE_TLV_TYPE_DEBUG_INFO:</div><div class='ctx'> 		case IWL_UCODE_TLV_TYPE_BUFFER_ALLOCATION:</div><div class='ctx'> 		case IWL_UCODE_TLV_TYPE_HCMD:</div><div class='del'>-		case IWL_UCODE_TLV_TYPE_REGIONS:</div><div class='ctx'> 		case IWL_UCODE_TLV_TYPE_TRIGGERS:</div><div class='add'>+		case IWL_UCODE_TLV_TYPE_CONF_SET:</div><div class='ctx'> 			if (iwlwifi_mod_params.enable_ini)</div><div class='ctx'> 				iwl_dbg_tlv_alloc(drv-&gt;trans, tlv, false);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1155,6 +1402,30 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,</div><div class='ctx'> 				return -ENOMEM;</div><div class='ctx'> 			drv-&gt;fw.phy_integration_ver_len = tlv_len;</div><div class='ctx'> 			break;</div><div class='add'>+		case IWL_UCODE_TLV_SEC_TABLE_ADDR:</div><div class='add'>+		case IWL_UCODE_TLV_D3_KEK_KCK_ADDR:</div><div class='add'>+			iwl_drv_set_dump_exclude(drv, tlv_type,</div><div class='add'>+						 tlv_data, tlv_len);</div><div class='add'>+			break;</div><div class='add'>+		case IWL_UCODE_TLV_CURRENT_PC:</div><div class='add'>+			if (tlv_len &lt; sizeof(struct iwl_pc_data))</div><div class='add'>+				goto invalid_tlv_len;</div><div class='add'>+			drv-&gt;trans-&gt;dbg.pc_data =</div><div class='add'>+				kmemdup(tlv_data, tlv_len, GFP_KERNEL);</div><div class='add'>+			if (!drv-&gt;trans-&gt;dbg.pc_data)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			drv-&gt;trans-&gt;dbg.num_pc =</div><div class='add'>+				tlv_len / sizeof(struct iwl_pc_data);</div><div class='add'>+			break;</div><div class='add'>+		case IWL_UCODE_TLV_PNVM_DATA:</div><div class='add'>+			if (drv-&gt;fw.pnvm_data)</div><div class='add'>+				break;</div><div class='add'>+			drv-&gt;fw.pnvm_data =</div><div class='add'>+				kvmemdup(tlv_data, tlv_len, GFP_KERNEL);</div><div class='add'>+			if (!drv-&gt;fw.pnvm_data)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			drv-&gt;fw.pnvm_size = tlv_len;</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			IWL_DEBUG_INFO(drv, "unknown TLV: %d\n", tlv_type);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1170,7 +1441,7 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,</div><div class='ctx'> </div><div class='ctx'> 	if (len) {</div><div class='ctx'> 		IWL_ERR(drv, "invalid TLV after parsing: %zd\n", len);</div><div class='del'>-		iwl_print_hex_dump(drv, IWL_DL_FW, (u8 *)data, len);</div><div class='add'>+		iwl_print_hex_dump(drv, IWL_DL_FW, data, len);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1184,29 +1455,34 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_alloc_ucode(struct iwl_drv *drv,</div><div class='del'>-			   struct iwl_firmware_pieces *pieces,</div><div class='del'>-			   enum iwl_ucode_type type)</div><div class='add'>+static int iwl_alloc_ucode_mem(struct fw_img *out, struct fw_img_parsing *img)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='ctx'> 	struct fw_desc *sec;</div><div class='ctx'> </div><div class='del'>-	sec = kcalloc(pieces-&gt;img[type].sec_counter, sizeof(*sec), GFP_KERNEL);</div><div class='add'>+	sec = kcalloc(img-&gt;sec_counter, sizeof(*sec), GFP_KERNEL);</div><div class='ctx'> 	if (!sec)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	drv-&gt;fw.img[type].sec = sec;</div><div class='del'>-	drv-&gt;fw.img[type].num_sec = pieces-&gt;img[type].sec_counter;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; pieces-&gt;img[type].sec_counter; i++)</div><div class='del'>-		if (iwl_alloc_fw_desc(drv, &amp;sec[i], get_sec(pieces, type, i)))</div><div class='add'>+	out-&gt;sec = sec;</div><div class='add'>+	out-&gt;num_sec = img-&gt;sec_counter;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; out-&gt;num_sec; i++)</div><div class='add'>+		if (iwl_alloc_fw_desc(&amp;sec[i], &amp;img-&gt;sec[i]))</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int iwl_alloc_ucode(struct iwl_drv *drv,</div><div class='add'>+			   struct iwl_firmware_pieces *pieces,</div><div class='add'>+			   enum iwl_ucode_type type)</div><div class='add'>+{</div><div class='add'>+	return iwl_alloc_ucode_mem(&amp;drv-&gt;fw.img[type], &amp;pieces-&gt;img[type]);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int validate_sec_sizes(struct iwl_drv *drv,</div><div class='ctx'> 			      struct iwl_firmware_pieces *pieces,</div><div class='del'>-			      const struct iwl_cfg *cfg)</div><div class='add'>+			      const struct iwl_rf_cfg *cfg)</div><div class='ctx'> {</div><div class='ctx'> 	IWL_DEBUG_INFO(drv, "f/w package hdr runtime inst size = %zd\n",</div><div class='ctx'> 		get_sec_size(pieces, IWL_UCODE_REGULAR,</div><div class='hunk'>@@ -1260,27 +1536,47 @@ _iwl_op_mode_start(struct iwl_drv *drv, struct iwlwifi_opmode_table *op)</div><div class='ctx'> 	const struct iwl_op_mode_ops *ops = op-&gt;ops;</div><div class='ctx'> 	struct dentry *dbgfs_dir = NULL;</div><div class='ctx'> 	struct iwl_op_mode *op_mode = NULL;</div><div class='add'>+	int retry, max_retry = !!iwlwifi_mod_params.fw_restart * IWL_MAX_INIT_RETRY;</div><div class='add'>+</div><div class='add'>+	/* also protects start/stop from racing against each other */</div><div class='add'>+	lockdep_assert_held(&amp;iwlwifi_opmode_table_mtx);</div><div class='add'>+</div><div class='add'>+	for (retry = 0; retry &lt;= max_retry; retry++) {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='del'>-	drv-&gt;dbgfs_op_mode = debugfs_create_dir(op-&gt;name,</div><div class='del'>-						drv-&gt;dbgfs_drv);</div><div class='del'>-	dbgfs_dir = drv-&gt;dbgfs_op_mode;</div><div class='add'>+		drv-&gt;dbgfs_op_mode = debugfs_create_dir(op-&gt;name,</div><div class='add'>+							drv-&gt;dbgfs_drv);</div><div class='add'>+		dbgfs_dir = drv-&gt;dbgfs_op_mode;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	op_mode = ops-&gt;start(drv-&gt;trans, drv-&gt;trans-&gt;cfg, &amp;drv-&gt;fw, dbgfs_dir);</div><div class='add'>+		op_mode = ops-&gt;start(drv-&gt;trans, drv-&gt;trans-&gt;cfg,</div><div class='add'>+				     &amp;drv-&gt;fw, dbgfs_dir);</div><div class='add'>+</div><div class='add'>+		if (!IS_ERR(op_mode))</div><div class='add'>+			return op_mode;</div><div class='add'>+</div><div class='add'>+		if (iwl_trans_is_dead(drv-&gt;trans))</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='del'>-	if (!op_mode) {</div><div class='ctx'> 		debugfs_remove_recursive(drv-&gt;dbgfs_op_mode);</div><div class='ctx'> 		drv-&gt;dbgfs_op_mode = NULL;</div><div class='del'>-	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return op_mode;</div><div class='add'>+		if (PTR_ERR(op_mode) != -ETIMEDOUT)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		IWL_ERR(drv, "retry init count %d\n", retry);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void _iwl_op_mode_stop(struct iwl_drv *drv)</div><div class='ctx'> {</div><div class='add'>+	/* also protects start/stop from racing against each other */</div><div class='add'>+	lockdep_assert_held(&amp;iwlwifi_opmode_table_mtx);</div><div class='add'>+</div><div class='ctx'> 	/* op_mode can be NULL if its start failed */</div><div class='ctx'> 	if (drv-&gt;op_mode) {</div><div class='ctx'> 		iwl_op_mode_stop(drv-&gt;op_mode);</div><div class='hunk'>@@ -1301,25 +1597,28 @@ static void _iwl_op_mode_stop(struct iwl_drv *drv)</div><div class='ctx'>  */</div><div class='ctx'> static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)</div><div class='ctx'> {</div><div class='add'>+	unsigned int min_core, max_core, loaded_core;</div><div class='ctx'> 	struct iwl_drv *drv = context;</div><div class='ctx'> 	struct iwl_fw *fw = &amp;drv-&gt;fw;</div><div class='del'>-	struct iwl_ucode_header *ucode;</div><div class='add'>+	const struct iwl_ucode_header *ucode;</div><div class='ctx'> 	struct iwlwifi_opmode_table *op;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct iwl_firmware_pieces *pieces;</div><div class='del'>-	const unsigned int api_max = drv-&gt;trans-&gt;cfg-&gt;ucode_api_max;</div><div class='del'>-	const unsigned int api_min = drv-&gt;trans-&gt;cfg-&gt;ucode_api_min;</div><div class='add'>+	unsigned int api_min, api_max;</div><div class='ctx'> 	size_t trigger_tlv_sz[FW_DBG_TRIGGER_MAX];</div><div class='ctx'> 	u32 api_ver;</div><div class='ctx'> 	int i;</div><div class='del'>-	bool load_module = false;</div><div class='ctx'> 	bool usniffer_images = false;</div><div class='add'>+	bool failure = true;</div><div class='add'>+</div><div class='add'>+	iwl_get_ucode_api_versions(drv-&gt;trans, &amp;api_min, &amp;api_max);</div><div class='ctx'> </div><div class='ctx'> 	fw-&gt;ucode_capa.max_probe_length = IWL_DEFAULT_MAX_PROBE_LENGTH;</div><div class='ctx'> 	fw-&gt;ucode_capa.standard_phy_calibration_size =</div><div class='ctx'> 			IWL_DEFAULT_STANDARD_PHY_CALIBRATE_TBL_SIZE;</div><div class='ctx'> 	fw-&gt;ucode_capa.n_scan_channels = IWL_DEFAULT_SCAN_CHANNELS;</div><div class='del'>-	fw-&gt;ucode_capa.num_stations = IWL_MVM_STATION_COUNT_MAX;</div><div class='add'>+	fw-&gt;ucode_capa.num_stations = IWL_STATION_COUNT_MAX;</div><div class='add'>+	fw-&gt;ucode_capa.num_beacons = 1;</div><div class='ctx'> 	/* dump all fw memory areas by default */</div><div class='ctx'> 	fw-&gt;dbg.dump_mask = 0xffffffff;</div><div class='ctx'> </div><div class='hunk'>@@ -1340,7 +1639,7 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Data from ucode file:  header followed by uCode images */</div><div class='del'>-	ucode = (struct iwl_ucode_header *)ucode_raw-&gt;data;</div><div class='add'>+	ucode = (const struct iwl_ucode_header *)ucode_raw-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	if (ucode-&gt;ver)</div><div class='ctx'> 		err = iwl_parse_v1_v2_firmware(drv, ucode_raw, pieces);</div><div class='hunk'>@@ -1361,11 +1660,24 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)</div><div class='ctx'> 	 * firmware filename ... but we don't check for that and only rely</div><div class='ctx'> 	 * on the API version read from firmware header from here on forward</div><div class='ctx'> 	 */</div><div class='del'>-	if (api_ver &lt; api_min || api_ver &gt; api_max) {</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * if -cN.ucode file was loaded, core version == file version,</div><div class='add'>+	 * otherwise core version == file version (API version) - 3</div><div class='add'>+	 */</div><div class='add'>+	if (iwl_api_is_core_number(drv-&gt;fw_index))</div><div class='add'>+		loaded_core = api_ver;</div><div class='add'>+	else</div><div class='add'>+		loaded_core = api_ver - API_TO_CORE_OFFS;</div><div class='add'>+</div><div class='add'>+	min_core = iwl_api_to_core(api_min);</div><div class='add'>+	max_core = iwl_api_to_core(api_max);</div><div class='add'>+</div><div class='add'>+	if (loaded_core &lt; min_core || loaded_core &gt; max_core) {</div><div class='ctx'> 		IWL_ERR(drv,</div><div class='ctx'> 			"Driver unable to support your firmware API. "</div><div class='del'>-			"Driver supports v%u, firmware is v%u.\n",</div><div class='del'>-			api_max, api_ver);</div><div class='add'>+			"Driver supports FW core %u..%u, firmware is %u.\n",</div><div class='add'>+			min_core, max_core, loaded_core);</div><div class='ctx'> 		goto try_again;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1507,14 +1819,14 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)</div><div class='ctx'> 		fw-&gt;init_evtlog_size = (pieces-&gt;init_evtlog_size - 16)/12;</div><div class='ctx'> 	else</div><div class='ctx'> 		fw-&gt;init_evtlog_size =</div><div class='del'>-			drv-&gt;trans-&gt;trans_cfg-&gt;base_params-&gt;max_event_log_size;</div><div class='add'>+			drv-&gt;trans-&gt;mac_cfg-&gt;base-&gt;max_event_log_size;</div><div class='ctx'> 	fw-&gt;init_errlog_ptr = pieces-&gt;init_errlog_ptr;</div><div class='ctx'> 	fw-&gt;inst_evtlog_ptr = pieces-&gt;inst_evtlog_ptr;</div><div class='ctx'> 	if (pieces-&gt;inst_evtlog_size)</div><div class='ctx'> 		fw-&gt;inst_evtlog_size = (pieces-&gt;inst_evtlog_size - 16)/12;</div><div class='ctx'> 	else</div><div class='ctx'> 		fw-&gt;inst_evtlog_size =</div><div class='del'>-			drv-&gt;trans-&gt;trans_cfg-&gt;base_params-&gt;max_event_log_size;</div><div class='add'>+			drv-&gt;trans-&gt;mac_cfg-&gt;base-&gt;max_event_log_size;</div><div class='ctx'> 	fw-&gt;inst_errlog_ptr = pieces-&gt;inst_errlog_ptr;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1529,6 +1841,8 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)</div><div class='ctx'> 	/* We have our copies now, allow OS release its copies */</div><div class='ctx'> 	release_firmware(ucode_raw);</div><div class='ctx'> </div><div class='add'>+	iwl_dbg_tlv_load_bin(drv-&gt;trans-&gt;dev, drv-&gt;trans);</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;iwlwifi_opmode_table_mtx);</div><div class='ctx'> 	switch (fw-&gt;type) {</div><div class='ctx'> 	case IWL_FW_DVM:</div><div class='hunk'>@@ -1542,11 +1856,14 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_IWLMLD)</div><div class='add'>+	if (iwl_drv_is_wifi7_supported(drv-&gt;trans))</div><div class='add'>+		op = &amp;iwlwifi_opmode_table[MLD_OP_MODE];</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	IWL_INFO(drv, "loaded firmware version %s op_mode %s\n",</div><div class='ctx'> 		 drv-&gt;fw.fw_version, op-&gt;name);</div><div class='ctx'> </div><div class='del'>-	iwl_dbg_tlv_load_bin(drv-&gt;trans-&gt;dev, drv-&gt;trans);</div><div class='del'>-</div><div class='ctx'> 	/* add this device to the list of devices using this op_mode */</div><div class='ctx'> 	list_add_tail(&amp;drv-&gt;list, &amp;op-&gt;drv);</div><div class='ctx'> </div><div class='hunk'>@@ -1558,31 +1875,13 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)</div><div class='ctx'> 			goto out_unbind;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		load_module = true;</div><div class='add'>+		request_module_nowait("%s", op-&gt;name);</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;iwlwifi_opmode_table_mtx);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Complete the firmware request last so that</div><div class='del'>-	 * a driver unbind (stop) doesn't run while we</div><div class='del'>-	 * are doing the start() above.</div><div class='del'>-	 */</div><div class='ctx'> 	complete(&amp;drv-&gt;request_firmware_complete);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Load the module last so we don't block anything</div><div class='del'>-	 * else from proceeding if the module fails to load</div><div class='del'>-	 * or hangs loading.</div><div class='del'>-	 */</div><div class='del'>-	if (load_module) {</div><div class='del'>-		request_module("%s", op-&gt;name);</div><div class='del'>-#ifdef CONFIG_IWLWIFI_OPMODE_MODULAR</div><div class='del'>-		if (err)</div><div class='del'>-			IWL_ERR(drv,</div><div class='del'>-				"failed to load module %s (error %d), is dynamic loading enabled?\n",</div><div class='del'>-				op-&gt;name, err);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='add'>+	failure = false;</div><div class='ctx'> 	goto free;</div><div class='ctx'> </div><div class='ctx'>  try_again:</div><div class='hunk'>@@ -1597,7 +1896,12 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)</div><div class='ctx'>  out_unbind:</div><div class='ctx'> 	complete(&amp;drv-&gt;request_firmware_complete);</div><div class='ctx'> 	device_release_driver(drv-&gt;trans-&gt;dev);</div><div class='add'>+	/* drv has just been freed by the release */</div><div class='add'>+	failure = false;</div><div class='ctx'>  free:</div><div class='add'>+	if (failure)</div><div class='add'>+		iwl_dealloc_ucode(drv);</div><div class='add'>+</div><div class='ctx'> 	if (pieces) {</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(pieces-&gt;img); i++)</div><div class='ctx'> 			kfree(pieces-&gt;img[i].sec);</div><div class='hunk'>@@ -1633,6 +1937,22 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	drv-&gt;trans-&gt;dbg.domains_bitmap = IWL_TRANS_FW_DBG_DOMAIN(drv-&gt;trans);</div><div class='add'>+	if (iwlwifi_mod_params.enable_ini != ENABLE_INI) {</div><div class='add'>+		/* We have a non-default value in the module parameter,</div><div class='add'>+		 * take its value</div><div class='add'>+		 */</div><div class='add'>+		drv-&gt;trans-&gt;dbg.domains_bitmap &amp;= 0xffff;</div><div class='add'>+		if (iwlwifi_mod_params.enable_ini != IWL_FW_INI_PRESET_DISABLE) {</div><div class='add'>+			if (iwlwifi_mod_params.enable_ini &gt; ENABLE_INI) {</div><div class='add'>+				IWL_ERR(trans,</div><div class='add'>+					"invalid enable_ini module parameter value: max = %d, using 0 instead\n",</div><div class='add'>+					ENABLE_INI);</div><div class='add'>+				iwlwifi_mod_params.enable_ini = 0;</div><div class='add'>+			}</div><div class='add'>+			drv-&gt;trans-&gt;dbg.domains_bitmap =</div><div class='add'>+				BIT(IWL_FW_DBG_DOMAIN_POS + iwlwifi_mod_params.enable_ini);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_request_firmware(drv, true);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -1645,8 +1965,8 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans)</div><div class='ctx'> err_fw:</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> 	debugfs_remove_recursive(drv-&gt;dbgfs_drv);</div><div class='del'>-	iwl_dbg_tlv_free(drv-&gt;trans);</div><div class='ctx'> #endif</div><div class='add'>+	iwl_dbg_tlv_free(drv-&gt;trans);</div><div class='ctx'> 	kfree(drv);</div><div class='ctx'> err:</div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='hunk'>@@ -1656,11 +1976,12 @@ void iwl_drv_stop(struct iwl_drv *drv)</div><div class='ctx'> {</div><div class='ctx'> 	wait_for_completion(&amp;drv-&gt;request_firmware_complete);</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;iwlwifi_opmode_table_mtx);</div><div class='add'>+</div><div class='ctx'> 	_iwl_op_mode_stop(drv);</div><div class='ctx'> </div><div class='ctx'> 	iwl_dealloc_ucode(drv);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;iwlwifi_opmode_table_mtx);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * List is empty (this item wasn't added)</div><div class='ctx'> 	 * when firmware loading failed -- in that</div><div class='hunk'>@@ -1671,7 +1992,7 @@ void iwl_drv_stop(struct iwl_drv *drv)</div><div class='ctx'> 	mutex_unlock(&amp;iwlwifi_opmode_table_mtx);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='del'>-	drv-&gt;trans-&gt;ops-&gt;debugfs_cleanup(drv-&gt;trans);</div><div class='add'>+	iwl_trans_debugfs_cleanup(drv-&gt;trans);</div><div class='ctx'> </div><div class='ctx'> 	debugfs_remove_recursive(drv-&gt;dbgfs_drv);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1681,14 +2002,13 @@ void iwl_drv_stop(struct iwl_drv *drv)</div><div class='ctx'> 	kfree(drv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* shared module parameters */</div><div class='ctx'> struct iwl_mod_params iwlwifi_mod_params = {</div><div class='ctx'> 	.fw_restart = true,</div><div class='ctx'> 	.bt_coex_active = true,</div><div class='ctx'> 	.power_level = IWL_POWER_INDEX_1,</div><div class='ctx'> 	.uapsd_disable = IWL_DISABLE_UAPSD_BSS | IWL_DISABLE_UAPSD_P2P_CLIENT,</div><div class='del'>-	.enable_ini = true,</div><div class='add'>+	.enable_ini = ENABLE_INI,</div><div class='ctx'> 	/* the rest are 0 by default */</div><div class='ctx'> };</div><div class='ctx'> IWL_EXPORT_SYMBOL(iwlwifi_mod_params);</div><div class='hunk'>@@ -1743,13 +2063,9 @@ static int __init iwl_drv_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i, err;</div><div class='ctx'> </div><div class='del'>-	mutex_init(&amp;iwlwifi_opmode_table_mtx);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(iwlwifi_opmode_table); i++)</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;iwlwifi_opmode_table[i].drv);</div><div class='ctx'> </div><div class='del'>-	pr_info(DRV_DESCRIPTION "\n");</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> 	/* Create the root of iwlwifi debugfs subsystem. */</div><div class='ctx'> 	iwl_dbgfs_root = debugfs_create_dir(DRV_NAME, NULL);</div><div class='hunk'>@@ -1772,6 +2088,7 @@ module_init(iwl_drv_init);</div><div class='ctx'> static void __exit iwl_drv_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	iwl_pci_unregister_driver();</div><div class='add'>+	iwl_trans_free_restart_list();</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> 	debugfs_remove_recursive(iwl_dbgfs_root);</div><div class='hunk'>@@ -1802,10 +2119,11 @@ MODULE_PARM_DESC(nvm_file, "NVM file name");</div><div class='ctx'> module_param_named(uapsd_disable, iwlwifi_mod_params.uapsd_disable, uint, 0644);</div><div class='ctx'> MODULE_PARM_DESC(uapsd_disable,</div><div class='ctx'> 		 "disable U-APSD functionality bitmap 1: BSS 2: P2P Client (default: 3)");</div><div class='del'>-module_param_named(enable_ini, iwlwifi_mod_params.enable_ini,</div><div class='del'>-		   bool, S_IRUGO | S_IWUSR);</div><div class='add'>+</div><div class='add'>+module_param_named(enable_ini, iwlwifi_mod_params.enable_ini, uint, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable_ini,</div><div class='del'>-		 "Enable debug INI TLV FW debug infrastructure (default: true");</div><div class='add'>+		 "0:disable, 1-15:FW_DBG_PRESET Values, 16:enabled without preset value defined,"</div><div class='add'>+		 "Debug INI TLV FW debug infrastructure (default: 16)");</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * set bt_coex_active to true, uCode will do kill/defer</div><div class='hunk'>@@ -1851,3 +2169,6 @@ MODULE_PARM_DESC(remove_when_gone,</div><div class='ctx'> module_param_named(disable_11ax, iwlwifi_mod_params.disable_11ax, bool,</div><div class='ctx'> 		   S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(disable_11ax, "Disable HE capabilities (default: false)");</div><div class='add'>+</div><div class='add'>+module_param_named(disable_11be, iwlwifi_mod_params.disable_11be, bool, 0444);</div><div class='add'>+MODULE_PARM_DESC(disable_11be, "Disable EHT capabilities (default: false)");</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.h b/drivers/net/wireless/intel/iwlwifi/iwl-drv.h<br/>index b6442df0c643..6e60953de2ec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-drv.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-drv.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-drv.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-drv.h</a></div><div class='hunk'>@@ -1,15 +1,15 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2014, 2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2014, 2020-2021, 2023, 2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2014 Intel Mobile Communications GmbH</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_drv_h__</div><div class='ctx'> #define __iwl_drv_h__</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;kunit/visibility.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* for all modules */</div><div class='ctx'> #define DRV_NAME        "iwlwifi"</div><div class='del'>-#define DRV_AUTHOR	"Intel Corporation &lt;linuxwifi@intel.com&gt;"</div><div class='ctx'> </div><div class='ctx'> /* radio config bits (actual values from NVM definition) */</div><div class='ctx'> #define NVM_RF_CFG_DASH_MSK(x)   (x &amp; 0x3)         /* bits 0-1   */</div><div class='hunk'>@@ -53,16 +53,17 @@</div><div class='ctx'> </div><div class='ctx'> struct iwl_drv;</div><div class='ctx'> struct iwl_trans;</div><div class='del'>-struct iwl_cfg;</div><div class='add'>+struct iwl_rf_cfg;</div><div class='ctx'> /**</div><div class='ctx'>  * iwl_drv_start - start the drv</div><div class='ctx'>  *</div><div class='del'>- * @trans_ops: the ops of the transport</div><div class='add'>+ * @trans: the transport</div><div class='ctx'>  *</div><div class='ctx'>  * starts the driver: fetches the firmware. This should be called by bus</div><div class='ctx'>  * specific system flows implementations. For example, the bus specific probe</div><div class='ctx'>  * function should do bus related operations only, and then call to this</div><div class='del'>- * function. It returns the driver object or %NULL if an error occurred.</div><div class='add'>+ * function.</div><div class='add'>+ * Return: the driver object or %NULL if an error occurred.</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_drv *iwl_drv_start(struct iwl_trans *trans);</div><div class='ctx'> </div><div class='hunk'>@@ -78,6 +79,12 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans);</div><div class='ctx'> void iwl_drv_stop(struct iwl_drv *drv);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * iwl_drv_is_wifi7_supported - returns if wifi7 is supported</div><div class='add'>+ * If yes, iwlmld needs to be used to drive the device.</div><div class='add'>+ */</div><div class='add'>+bool iwl_drv_is_wifi7_supported(struct iwl_trans *trans);</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * exported symbol management</div><div class='ctx'>  *</div><div class='ctx'>  * The driver can be split into multiple modules, in which case some symbols</div><div class='hunk'>@@ -85,9 +92,24 @@ void iwl_drv_stop(struct iwl_drv *drv);</div><div class='ctx'>  * everything is built-in, then we can avoid that.</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_OPMODE_MODULAR</div><div class='del'>-#define IWL_EXPORT_SYMBOL(sym)	EXPORT_SYMBOL_GPL(sym)</div><div class='add'>+#define IWL_EXPORT_SYMBOL(sym)	EXPORT_SYMBOL_NS_GPL(sym, "IWLWIFI")</div><div class='ctx'> #else</div><div class='ctx'> #define IWL_EXPORT_SYMBOL(sym)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_IWLWIFI_KUNIT_TESTS)</div><div class='add'>+#define EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(sym)	EXPORT_SYMBOL_IF_KUNIT(sym)</div><div class='add'>+#define VISIBLE_IF_IWLWIFI_KUNIT</div><div class='add'>+#else</div><div class='add'>+#define EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(sym)</div><div class='add'>+#define VISIBLE_IF_IWLWIFI_KUNIT static</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* max retry for init flow */</div><div class='add'>+#define IWL_MAX_INIT_RETRY 2</div><div class='add'>+</div><div class='add'>+#define FW_NAME_PRE_BUFSIZE	64</div><div class='add'>+struct iwl_trans;</div><div class='add'>+const char *iwl_drv_get_fwname_pre(struct iwl_trans *trans, char *buf);</div><div class='add'>+</div><div class='ctx'> #endif /* __iwl_drv_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c<br/>deleted file mode 100644<br/>index dbab2f10d750..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,398 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2005-2014, 2018-2019 Intel Corporation</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-drv.h"</div><div class='del'>-#include "iwl-debug.h"</div><div class='del'>-#include "iwl-eeprom-read.h"</div><div class='del'>-#include "iwl-io.h"</div><div class='del'>-#include "iwl-prph.h"</div><div class='del'>-#include "iwl-csr.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EEPROM access time values:</div><div class='del'>- *</div><div class='del'>- * Driver initiates EEPROM read by writing byte address &lt;&lt; 1 to CSR_EEPROM_REG.</div><div class='del'>- * Driver then polls CSR_EEPROM_REG for CSR_EEPROM_REG_READ_VALID_MSK (0x1).</div><div class='del'>- * When polling, wait 10 uSec between polling loops, up to a maximum 5000 uSec.</div><div class='del'>- * Driver reads 16-bit value from bits 31-16 of CSR_EEPROM_REG.</div><div class='del'>- */</div><div class='del'>-#define IWL_EEPROM_ACCESS_TIMEOUT	5000 /* uSec */</div><div class='del'>-</div><div class='del'>-#define IWL_EEPROM_SEM_TIMEOUT		10   /* microseconds */</div><div class='del'>-#define IWL_EEPROM_SEM_RETRY_LIMIT	1000 /* number of attempts (not time) */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The device's EEPROM semaphore prevents conflicts between driver and uCode</div><div class='del'>- * when accessing the EEPROM; each access is a series of pulses to/from the</div><div class='del'>- * EEPROM chip, not a single event, so even reads could conflict if they</div><div class='del'>- * weren't arbitrated by the semaphore.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define	EEPROM_SEM_TIMEOUT 10		/* milliseconds */</div><div class='del'>-#define EEPROM_SEM_RETRY_LIMIT 1000	/* number of attempts (not time) */</div><div class='del'>-</div><div class='del'>-static int iwl_eeprom_acquire_semaphore(struct iwl_trans *trans)</div><div class='del'>-{</div><div class='del'>-	u16 count;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	for (count = 0; count &lt; EEPROM_SEM_RETRY_LIMIT; count++) {</div><div class='del'>-		/* Request semaphore */</div><div class='del'>-		iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-			    CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);</div><div class='del'>-</div><div class='del'>-		/* See if we got it */</div><div class='del'>-		ret = iwl_poll_bit(trans, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-				CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,</div><div class='del'>-				CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,</div><div class='del'>-				EEPROM_SEM_TIMEOUT);</div><div class='del'>-		if (ret &gt;= 0) {</div><div class='del'>-			IWL_DEBUG_EEPROM(trans-&gt;dev,</div><div class='del'>-					 "Acquired semaphore after %d tries.\n",</div><div class='del'>-					 count+1);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl_eeprom_release_semaphore(struct iwl_trans *trans)</div><div class='del'>-{</div><div class='del'>-	iwl_clear_bit(trans, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-		      CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl_eeprom_verify_signature(struct iwl_trans *trans, bool nvm_is_otp)</div><div class='del'>-{</div><div class='del'>-	u32 gp = iwl_read32(trans, CSR_EEPROM_GP) &amp; CSR_EEPROM_GP_VALID_MSK;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_EEPROM(trans-&gt;dev, "EEPROM signature=0x%08x\n", gp);</div><div class='del'>-</div><div class='del'>-	switch (gp) {</div><div class='del'>-	case CSR_EEPROM_GP_BAD_SIG_EEP_GOOD_SIG_OTP:</div><div class='del'>-		if (!nvm_is_otp) {</div><div class='del'>-			IWL_ERR(trans, "EEPROM with bad signature: 0x%08x\n",</div><div class='del'>-				gp);</div><div class='del'>-			return -ENOENT;</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-	case CSR_EEPROM_GP_GOOD_SIG_EEP_LESS_THAN_4K:</div><div class='del'>-	case CSR_EEPROM_GP_GOOD_SIG_EEP_MORE_THAN_4K:</div><div class='del'>-		if (nvm_is_otp) {</div><div class='del'>-			IWL_ERR(trans, "OTP with bad signature: 0x%08x\n", gp);</div><div class='del'>-			return -ENOENT;</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-	case CSR_EEPROM_GP_BAD_SIGNATURE_BOTH_EEP_AND_OTP:</div><div class='del'>-	default:</div><div class='del'>-		IWL_ERR(trans,</div><div class='del'>-			"bad EEPROM/OTP signature, type=%s, EEPROM_GP=0x%08x\n",</div><div class='del'>-			nvm_is_otp ? "OTP" : "EEPROM", gp);</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * OTP related functions</div><div class='del'>- *</div><div class='del'>-******************************************************************************/</div><div class='del'>-</div><div class='del'>-static void iwl_set_otp_access_absolute(struct iwl_trans *trans)</div><div class='del'>-{</div><div class='del'>-	iwl_read32(trans, CSR_OTP_GP_REG);</div><div class='del'>-</div><div class='del'>-	iwl_clear_bit(trans, CSR_OTP_GP_REG,</div><div class='del'>-		      CSR_OTP_GP_REG_OTP_ACCESS_MODE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl_nvm_is_otp(struct iwl_trans *trans)</div><div class='del'>-{</div><div class='del'>-	u32 otpgp;</div><div class='del'>-</div><div class='del'>-	/* OTP only valid for CP/PP and after */</div><div class='del'>-	switch (trans-&gt;hw_rev &amp; CSR_HW_REV_TYPE_MSK) {</div><div class='del'>-	case CSR_HW_REV_TYPE_NONE:</div><div class='del'>-		IWL_ERR(trans, "Unknown hardware type\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	case CSR_HW_REV_TYPE_5300:</div><div class='del'>-	case CSR_HW_REV_TYPE_5350:</div><div class='del'>-	case CSR_HW_REV_TYPE_5100:</div><div class='del'>-	case CSR_HW_REV_TYPE_5150:</div><div class='del'>-		return 0;</div><div class='del'>-	default:</div><div class='del'>-		otpgp = iwl_read32(trans, CSR_OTP_GP_REG);</div><div class='del'>-		if (otpgp &amp; CSR_OTP_GP_REG_DEVICE_SELECT)</div><div class='del'>-			return 1;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl_init_otp_access(struct iwl_trans *trans)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = iwl_finish_nic_init(trans, trans-&gt;trans_cfg);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	iwl_set_bits_prph(trans, APMG_PS_CTRL_REG,</div><div class='del'>-			  APMG_PS_CTRL_VAL_RESET_REQ);</div><div class='del'>-	udelay(5);</div><div class='del'>-	iwl_clear_bits_prph(trans, APMG_PS_CTRL_REG,</div><div class='del'>-			    APMG_PS_CTRL_VAL_RESET_REQ);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * CSR auto clock gate disable bit -</div><div class='del'>-	 * this is only applicable for HW with OTP shadow RAM</div><div class='del'>-	 */</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;base_params-&gt;shadow_ram_support)</div><div class='del'>-		iwl_set_bit(trans, CSR_DBG_LINK_PWR_MGMT_REG,</div><div class='del'>-			    CSR_RESET_LINK_PWR_MGMT_DISABLED);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl_read_otp_word(struct iwl_trans *trans, u16 addr,</div><div class='del'>-			     __le16 *eeprom_data)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u32 r;</div><div class='del'>-	u32 otpgp;</div><div class='del'>-</div><div class='del'>-	iwl_write32(trans, CSR_EEPROM_REG,</div><div class='del'>-		    CSR_EEPROM_REG_MSK_ADDR &amp; (addr &lt;&lt; 1));</div><div class='del'>-	ret = iwl_poll_bit(trans, CSR_EEPROM_REG,</div><div class='del'>-				 CSR_EEPROM_REG_READ_VALID_MSK,</div><div class='del'>-				 CSR_EEPROM_REG_READ_VALID_MSK,</div><div class='del'>-				 IWL_EEPROM_ACCESS_TIMEOUT);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		IWL_ERR(trans, "Time out reading OTP[%d]\n", addr);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	r = iwl_read32(trans, CSR_EEPROM_REG);</div><div class='del'>-	/* check for ECC errors: */</div><div class='del'>-	otpgp = iwl_read32(trans, CSR_OTP_GP_REG);</div><div class='del'>-	if (otpgp &amp; CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK) {</div><div class='del'>-		/* stop in this case */</div><div class='del'>-		/* set the uncorrectable OTP ECC bit for acknowledgment */</div><div class='del'>-		iwl_set_bit(trans, CSR_OTP_GP_REG,</div><div class='del'>-			    CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK);</div><div class='del'>-		IWL_ERR(trans, "Uncorrectable OTP ECC error, abort OTP read\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (otpgp &amp; CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK) {</div><div class='del'>-		/* continue in this case */</div><div class='del'>-		/* set the correctable OTP ECC bit for acknowledgment */</div><div class='del'>-		iwl_set_bit(trans, CSR_OTP_GP_REG,</div><div class='del'>-			    CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK);</div><div class='del'>-		IWL_ERR(trans, "Correctable OTP ECC error, continue read\n");</div><div class='del'>-	}</div><div class='del'>-	*eeprom_data = cpu_to_le16(r &gt;&gt; 16);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * iwl_is_otp_empty: check for empty OTP</div><div class='del'>- */</div><div class='del'>-static bool iwl_is_otp_empty(struct iwl_trans *trans)</div><div class='del'>-{</div><div class='del'>-	u16 next_link_addr = 0;</div><div class='del'>-	__le16 link_value;</div><div class='del'>-	bool is_empty = false;</div><div class='del'>-</div><div class='del'>-	/* locate the beginning of OTP link list */</div><div class='del'>-	if (!iwl_read_otp_word(trans, next_link_addr, &amp;link_value)) {</div><div class='del'>-		if (!link_value) {</div><div class='del'>-			IWL_ERR(trans, "OTP is empty\n");</div><div class='del'>-			is_empty = true;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		IWL_ERR(trans, "Unable to read first block of OTP list.\n");</div><div class='del'>-		is_empty = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return is_empty;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * iwl_find_otp_image: find EEPROM image in OTP</div><div class='del'>- *   finding the OTP block that contains the EEPROM image.</div><div class='del'>- *   the last valid block on the link list (the block _before_ the last block)</div><div class='del'>- *   is the block we should read and used to configure the device.</div><div class='del'>- *   If all the available OTP blocks are full, the last block will be the block</div><div class='del'>- *   we should read and used to configure the device.</div><div class='del'>- *   only perform this operation if shadow RAM is disabled</div><div class='del'>- */</div><div class='del'>-static int iwl_find_otp_image(struct iwl_trans *trans,</div><div class='del'>-					u16 *validblockaddr)</div><div class='del'>-{</div><div class='del'>-	u16 next_link_addr = 0, valid_addr;</div><div class='del'>-	__le16 link_value = 0;</div><div class='del'>-	int usedblocks = 0;</div><div class='del'>-</div><div class='del'>-	/* set addressing mode to absolute to traverse the link list */</div><div class='del'>-	iwl_set_otp_access_absolute(trans);</div><div class='del'>-</div><div class='del'>-	/* checking for empty OTP or error */</div><div class='del'>-	if (iwl_is_otp_empty(trans))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * start traverse link list</div><div class='del'>-	 * until reach the max number of OTP blocks</div><div class='del'>-	 * different devices have different number of OTP blocks</div><div class='del'>-	 */</div><div class='del'>-	do {</div><div class='del'>-		/* save current valid block address</div><div class='del'>-		 * check for more block on the link list</div><div class='del'>-		 */</div><div class='del'>-		valid_addr = next_link_addr;</div><div class='del'>-		next_link_addr = le16_to_cpu(link_value) * sizeof(u16);</div><div class='del'>-		IWL_DEBUG_EEPROM(trans-&gt;dev, "OTP blocks %d addr 0x%x\n",</div><div class='del'>-				 usedblocks, next_link_addr);</div><div class='del'>-		if (iwl_read_otp_word(trans, next_link_addr, &amp;link_value))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (!link_value) {</div><div class='del'>-			/*</div><div class='del'>-			 * reach the end of link list, return success and</div><div class='del'>-			 * set address point to the starting address</div><div class='del'>-			 * of the image</div><div class='del'>-			 */</div><div class='del'>-			*validblockaddr = valid_addr;</div><div class='del'>-			/* skip first 2 bytes (link list pointer) */</div><div class='del'>-			*validblockaddr += 2;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		/* more in the link list, continue */</div><div class='del'>-		usedblocks++;</div><div class='del'>-	} while (usedblocks &lt;= trans-&gt;trans_cfg-&gt;base_params-&gt;max_ll_items);</div><div class='del'>-</div><div class='del'>-	/* OTP has no valid blocks */</div><div class='del'>-	IWL_DEBUG_EEPROM(trans-&gt;dev, "OTP has no valid blocks\n");</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * iwl_read_eeprom - read EEPROM contents</div><div class='del'>- *</div><div class='del'>- * Load the EEPROM contents from adapter and return it</div><div class='del'>- * and its size.</div><div class='del'>- *</div><div class='del'>- * NOTE:  This routine uses the non-debug IO access functions.</div><div class='del'>- */</div><div class='del'>-int iwl_read_eeprom(struct iwl_trans *trans, u8 **eeprom, size_t *eeprom_size)</div><div class='del'>-{</div><div class='del'>-	__le16 *e;</div><div class='del'>-	u32 gp = iwl_read32(trans, CSR_EEPROM_GP);</div><div class='del'>-	int sz;</div><div class='del'>-	int ret;</div><div class='del'>-	u16 addr;</div><div class='del'>-	u16 validblockaddr = 0;</div><div class='del'>-	u16 cache_addr = 0;</div><div class='del'>-	int nvm_is_otp;</div><div class='del'>-</div><div class='del'>-	if (!eeprom || !eeprom_size)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	nvm_is_otp = iwl_nvm_is_otp(trans);</div><div class='del'>-	if (nvm_is_otp &lt; 0)</div><div class='del'>-		return nvm_is_otp;</div><div class='del'>-</div><div class='del'>-	sz = trans-&gt;trans_cfg-&gt;base_params-&gt;eeprom_size;</div><div class='del'>-	IWL_DEBUG_EEPROM(trans-&gt;dev, "NVM size = %d\n", sz);</div><div class='del'>-</div><div class='del'>-	e = kmalloc(sz, GFP_KERNEL);</div><div class='del'>-	if (!e)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	ret = iwl_eeprom_verify_signature(trans, nvm_is_otp);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		IWL_ERR(trans, "EEPROM not found, EEPROM_GP=0x%08x\n", gp);</div><div class='del'>-		goto err_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Make sure driver (instead of uCode) is allowed to read EEPROM */</div><div class='del'>-	ret = iwl_eeprom_acquire_semaphore(trans);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		IWL_ERR(trans, "Failed to acquire EEPROM semaphore.\n");</div><div class='del'>-		goto err_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (nvm_is_otp) {</div><div class='del'>-		ret = iwl_init_otp_access(trans);</div><div class='del'>-		if (ret) {</div><div class='del'>-			IWL_ERR(trans, "Failed to initialize OTP access.\n");</div><div class='del'>-			goto err_unlock;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		iwl_write32(trans, CSR_EEPROM_GP,</div><div class='del'>-			    iwl_read32(trans, CSR_EEPROM_GP) &amp;</div><div class='del'>-			    ~CSR_EEPROM_GP_IF_OWNER_MSK);</div><div class='del'>-</div><div class='del'>-		iwl_set_bit(trans, CSR_OTP_GP_REG,</div><div class='del'>-			    CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK |</div><div class='del'>-			    CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK);</div><div class='del'>-		/* traversing the linked list if no shadow ram supported */</div><div class='del'>-		if (!trans-&gt;trans_cfg-&gt;base_params-&gt;shadow_ram_support) {</div><div class='del'>-			ret = iwl_find_otp_image(trans, &amp;validblockaddr);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err_unlock;</div><div class='del'>-		}</div><div class='del'>-		for (addr = validblockaddr; addr &lt; validblockaddr + sz;</div><div class='del'>-		     addr += sizeof(u16)) {</div><div class='del'>-			__le16 eeprom_data;</div><div class='del'>-</div><div class='del'>-			ret = iwl_read_otp_word(trans, addr, &amp;eeprom_data);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err_unlock;</div><div class='del'>-			e[cache_addr / 2] = eeprom_data;</div><div class='del'>-			cache_addr += sizeof(u16);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* eeprom is an array of 16bit values */</div><div class='del'>-		for (addr = 0; addr &lt; sz; addr += sizeof(u16)) {</div><div class='del'>-			u32 r;</div><div class='del'>-</div><div class='del'>-			iwl_write32(trans, CSR_EEPROM_REG,</div><div class='del'>-				    CSR_EEPROM_REG_MSK_ADDR &amp; (addr &lt;&lt; 1));</div><div class='del'>-</div><div class='del'>-			ret = iwl_poll_bit(trans, CSR_EEPROM_REG,</div><div class='del'>-					   CSR_EEPROM_REG_READ_VALID_MSK,</div><div class='del'>-					   CSR_EEPROM_REG_READ_VALID_MSK,</div><div class='del'>-					   IWL_EEPROM_ACCESS_TIMEOUT);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='del'>-				IWL_ERR(trans,</div><div class='del'>-					"Time out reading EEPROM[%d]\n", addr);</div><div class='del'>-				goto err_unlock;</div><div class='del'>-			}</div><div class='del'>-			r = iwl_read32(trans, CSR_EEPROM_REG);</div><div class='del'>-			e[addr / 2] = cpu_to_le16(r &gt;&gt; 16);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_EEPROM(trans-&gt;dev, "NVM Type: %s\n",</div><div class='del'>-			 nvm_is_otp ? "OTP" : "EEPROM");</div><div class='del'>-</div><div class='del'>-	iwl_eeprom_release_semaphore(trans);</div><div class='del'>-</div><div class='del'>-	*eeprom_size = sz;</div><div class='del'>-	*eeprom = (u8 *)e;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- err_unlock:</div><div class='del'>-	iwl_eeprom_release_semaphore(trans);</div><div class='del'>- err_free:</div><div class='del'>-	kfree(e);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_read_eeprom);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.h b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.h<br/>deleted file mode 100644<br/>index 63b8e6c6659b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2005-2014 Intel Corporation</div><div class='del'>- */</div><div class='del'>-#ifndef __iwl_eeprom_h__</div><div class='del'>-#define __iwl_eeprom_h__</div><div class='del'>-</div><div class='del'>-#include "iwl-trans.h"</div><div class='del'>-</div><div class='del'>-int iwl_read_eeprom(struct iwl_trans *trans, u8 **eeprom, size_t *eeprom_size);</div><div class='del'>-</div><div class='del'>-#endif  /* __iwl_eeprom_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-fh.h b/drivers/net/wireless/intel/iwlwifi/iwl-fh.h<br/>index aaa3b65be4e6..0f6de08b7473 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-fh.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-fh.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-fh.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-fh.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2014, 2018-2021, 2023-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_fh_h__</div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> /* Flow Handler Definitions */</div><div class='ctx'> /****************************/</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * This I/O area is directly read/writable by driver (e.g. Linux uses writel())</div><div class='ctx'>  * Addresses are offsets from device's PCI hardware base address.</div><div class='ctx'>  */</div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #define FH_MEM_LOWER_BOUND_GEN2              (0xa06000)</div><div class='ctx'> #define FH_MEM_UPPER_BOUND_GEN2              (0xa08000)</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Keep-Warm (KW) buffer base address.</div><div class='ctx'>  *</div><div class='ctx'>  * Driver must allocate a 4KByte buffer that is for keeping the</div><div class='hunk'>@@ -44,7 +44,7 @@</div><div class='ctx'> #define FH_KW_MEM_ADDR_REG		     (FH_MEM_LOWER_BOUND + 0x97C)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * TFD Circular Buffers Base (CBBC) addresses</div><div class='ctx'>  *</div><div class='ctx'>  * Device has 16 base pointer registers, one for each of 16 host-DRAM-resident</div><div class='hunk'>@@ -71,7 +71,7 @@</div><div class='ctx'> static inline unsigned int FH_MEM_CBBC_QUEUE(struct iwl_trans *trans,</div><div class='ctx'> 					     unsigned int chnl)</div><div class='ctx'> {</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;use_tfh) {</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;gen2) {</div><div class='ctx'> 		WARN_ON_ONCE(chnl &gt;= 64);</div><div class='ctx'> 		return TFH_TFDQ_CBB_TABLE + 8 * chnl;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -143,7 +143,7 @@ static inline unsigned int FH_MEM_CBBC_QUEUE(struct iwl_trans *trans,</div><div class='ctx'>  */</div><div class='ctx'> #define TFH_SRV_DMA_CHNL0_BC	(0x1F70)</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Rx SRAM Control and Status Registers (RSCSR)</div><div class='ctx'>  *</div><div class='ctx'>  * These registers provide handshake between driver and device for the Rx queue</div><div class='hunk'>@@ -216,21 +216,21 @@ static inline unsigned int FH_MEM_CBBC_QUEUE(struct iwl_trans *trans,</div><div class='ctx'> #define FH_MEM_RSCSR_UPPER_BOUND	(FH_MEM_LOWER_BOUND + 0xC00)</div><div class='ctx'> #define FH_MEM_RSCSR_CHNL0		(FH_MEM_RSCSR_LOWER_BOUND)</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Physical base address of 8-byte Rx Status buffer.</div><div class='ctx'>  * Bit fields:</div><div class='ctx'>  *  31-0: Rx status buffer physical base address [35:4], must 16-byte aligned.</div><div class='ctx'>  */</div><div class='ctx'> #define FH_RSCSR_CHNL0_STTS_WPTR_REG	(FH_MEM_RSCSR_CHNL0)</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Physical base address of Rx Buffer Descriptor Circular Buffer.</div><div class='ctx'>  * Bit fields:</div><div class='ctx'>  *  27-0:  RBD CD physical base address [35:8], must be 256-byte aligned.</div><div class='ctx'>  */</div><div class='ctx'> #define FH_RSCSR_CHNL0_RBDCB_BASE_REG	(FH_MEM_RSCSR_CHNL0 + 0x004)</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Rx write pointer (index, really!).</div><div class='ctx'>  * Bit fields:</div><div class='ctx'>  *  11-0:  Index of driver's most recent prepared-to-be-filled RBD, + 1.</div><div class='hunk'>@@ -242,7 +242,7 @@ static inline unsigned int FH_MEM_CBBC_QUEUE(struct iwl_trans *trans,</div><div class='ctx'> #define FW_RSCSR_CHNL0_RXDCB_RDPTR_REG	(FH_MEM_RSCSR_CHNL0 + 0x00c)</div><div class='ctx'> #define FH_RSCSR_CHNL0_RDPTR		FW_RSCSR_CHNL0_RXDCB_RDPTR_REG</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Rx Config/Status Registers (RCSR)</div><div class='ctx'>  * Rx Config Reg for channel 0 (only channel used)</div><div class='ctx'>  *</div><div class='hunk'>@@ -300,7 +300,7 @@ static inline unsigned int FH_MEM_CBBC_QUEUE(struct iwl_trans *trans,</div><div class='ctx'> #define FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_NO_INT_VAL    (0x00000000)</div><div class='ctx'> #define FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL  (0x00001000)</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Rx Shared Status Registers (RSSR)</div><div class='ctx'>  *</div><div class='ctx'>  * After stopping Rx DMA channel (writing 0 to</div><div class='hunk'>@@ -356,7 +356,7 @@ static inline unsigned int FH_MEM_CBBC_QUEUE(struct iwl_trans *trans,</div><div class='ctx'> #define RFH_RBDBUF_RBD0_LSB 0xA08300</div><div class='ctx'> #define RFH_RBDBUF_RBD_LSB(q) (RFH_RBDBUF_RBD0_LSB + (q) * 8)</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * RFH Status Register</div><div class='ctx'>  *</div><div class='ctx'>  * Bit fields:</div><div class='hunk'>@@ -378,14 +378,14 @@ static inline unsigned int FH_MEM_CBBC_QUEUE(struct iwl_trans *trans,</div><div class='ctx'>  * Once the RXF-to-DRAM DMA is active, this flag is immediately turned off.</div><div class='ctx'>  */</div><div class='ctx'> #define RFH_GEN_STATUS		0xA09808</div><div class='del'>-#define RFH_GEN_STATUS_GEN3	0xA07824</div><div class='add'>+#define RFH_GEN_STATUS_AX210	0xA07824</div><div class='ctx'> #define RBD_FETCH_IDLE	BIT(29)</div><div class='ctx'> #define SRAM_DMA_IDLE	BIT(30)</div><div class='ctx'> #define RXF_DMA_IDLE	BIT(31)</div><div class='ctx'> </div><div class='ctx'> /* DMA configuration */</div><div class='ctx'> #define RFH_RXF_DMA_CFG		0xA09820</div><div class='del'>-#define RFH_RXF_DMA_CFG_GEN3	0xA07880</div><div class='add'>+#define RFH_RXF_DMA_CFG_AX210	0xA07880</div><div class='ctx'> /* RB size */</div><div class='ctx'> #define RFH_RXF_DMA_RB_SIZE_MASK (0x000F0000) /* bits 16-19 */</div><div class='ctx'> #define RFH_RXF_DMA_RB_SIZE_POS 16</div><div class='hunk'>@@ -440,7 +440,7 @@ static inline unsigned int FH_MEM_CBBC_QUEUE(struct iwl_trans *trans,</div><div class='ctx'> #define FH_TFDIB_CTRL0_REG(_chnl)  (FH_TFDIB_LOWER_BOUND + 0x8 * (_chnl))</div><div class='ctx'> #define FH_TFDIB_CTRL1_REG(_chnl)  (FH_TFDIB_LOWER_BOUND + 0x8 * (_chnl) + 0x4)</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Transmit DMA Channel Control/Status Registers (TCSR)</div><div class='ctx'>  *</div><div class='ctx'>  * Device has one configuration register for each of 8 Tx DMA/FIFO channels</div><div class='hunk'>@@ -501,7 +501,7 @@ static inline unsigned int FH_MEM_CBBC_QUEUE(struct iwl_trans *trans,</div><div class='ctx'> #define FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_NUM		(20)</div><div class='ctx'> #define FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_IDX		(12)</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Tx Shared Status Registers (TSSR)</div><div class='ctx'>  *</div><div class='ctx'>  * After stopping Tx DMA channel (writing 0 to</div><div class='hunk'>@@ -518,7 +518,7 @@ static inline unsigned int FH_MEM_CBBC_QUEUE(struct iwl_trans *trans,</div><div class='ctx'> </div><div class='ctx'> #define FH_TSSR_TX_STATUS_REG		(FH_TSSR_LOWER_BOUND + 0x010)</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Bit fields for TSSR(Tx Shared Status &amp; Control) error status register:</div><div class='ctx'>  * 31:  Indicates an address error when accessed to internal memory</div><div class='ctx'>  *	uCode/driver must write "1" in order to clear this flag</div><div class='hunk'>@@ -565,36 +565,58 @@ static inline unsigned int FH_MEM_CBBC_QUEUE(struct iwl_trans *trans,</div><div class='ctx'> #define RX_QUEUE_MASK                         255</div><div class='ctx'> #define RX_QUEUE_SIZE_LOG                     8</div><div class='ctx'> </div><div class='add'>+#define IWL_DEFAULT_RX_QUEUE			0</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_rb_status - reserve buffer status</div><div class='ctx'>  * 	host memory mapped FH registers</div><div class='del'>- * @closed_rb_num [0:11] - Indicates the index of the RB which was closed</div><div class='del'>- * @closed_fr_num [0:11] - Indicates the index of the RX Frame which was closed</div><div class='del'>- * @finished_rb_num [0:11] - Indicates the index of the current RB</div><div class='add'>+ * @closed_rb_num: [0:11] Indicates the index of the RB which was closed</div><div class='add'>+ * @closed_fr_num: [0:11] Indicates the index of the RX Frame which was closed</div><div class='add'>+ * @finished_rb_num: [0:11] Indicates the index of the current RB</div><div class='ctx'>  * 	in which the last frame was written to</div><div class='del'>- * @finished_fr_num [0:11] - Indicates the index of the RX Frame</div><div class='add'>+ * @finished_fr_num: [0:11] Indicates the index of the RX Frame</div><div class='ctx'>  * 	which was transferred</div><div class='add'>+ * @__spare: reserved</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_rb_status {</div><div class='ctx'> 	__le16 closed_rb_num;</div><div class='ctx'> 	__le16 closed_fr_num;</div><div class='ctx'> 	__le16 finished_rb_num;</div><div class='del'>-	__le16 finished_fr_nam;</div><div class='del'>-	__le32 __unused;</div><div class='add'>+	__le16 finished_fr_num;</div><div class='add'>+	__le32 __spare;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define TFD_QUEUE_SIZE_MAX      (256)</div><div class='del'>-#define TFD_QUEUE_SIZE_MAX_GEN3 (65536)</div><div class='ctx'> /* cb size is the exponent - 3 */</div><div class='ctx'> #define TFD_QUEUE_CB_SIZE(x)	(ilog2(x) - 3)</div><div class='ctx'> #define TFD_QUEUE_SIZE_BC_DUP	(64)</div><div class='ctx'> #define TFD_QUEUE_BC_SIZE	(TFD_QUEUE_SIZE_MAX + TFD_QUEUE_SIZE_BC_DUP)</div><div class='del'>-#define TFD_QUEUE_BC_SIZE_GEN3	1024</div><div class='add'>+#define TFD_QUEUE_BC_SIZE_AX210	1024</div><div class='add'>+#define TFD_QUEUE_BC_SIZE_BZ	(1024 * 4)</div><div class='ctx'> #define IWL_TX_DMA_MASK        DMA_BIT_MASK(36)</div><div class='ctx'> #define IWL_NUM_OF_TBS		20</div><div class='ctx'> #define IWL_TFH_NUM_TBS		25</div><div class='ctx'> </div><div class='add'>+/* IMR DMA registers */</div><div class='add'>+#define IMR_TFH_SRV_DMA_CHNL0_CTRL           0x00a0a51c</div><div class='add'>+#define IMR_TFH_SRV_DMA_CHNL0_SRAM_ADDR      0x00a0a520</div><div class='add'>+#define IMR_TFH_SRV_DMA_CHNL0_DRAM_ADDR_LSB  0x00a0a524</div><div class='add'>+#define IMR_TFH_SRV_DMA_CHNL0_DRAM_ADDR_MSB  0x00a0a528</div><div class='add'>+#define IMR_TFH_SRV_DMA_CHNL0_BC             0x00a0a52c</div><div class='add'>+#define TFH_SRV_DMA_CHNL0_LEFT_BC	     0x00a0a530</div><div class='add'>+</div><div class='add'>+/* RFH S2D DMA registers */</div><div class='add'>+#define IMR_RFH_GEN_CFG_SERVICE_DMA_RS_MSK	0x0000000c</div><div class='add'>+#define IMR_RFH_GEN_CFG_SERVICE_DMA_SNOOP_MSK	0x00000002</div><div class='add'>+</div><div class='add'>+/* TFH D2S DMA registers */</div><div class='add'>+#define IMR_UREG_CHICK_HALT_UMAC_PERMANENTLY_MSK	0x80000000</div><div class='add'>+#define IMR_UREG_CHICK					0x00d05c00</div><div class='add'>+#define IMR_TFH_SRV_DMA_CHNL0_CTRL_D2S_IRQ_TARGET_POS	0x00800000</div><div class='add'>+#define IMR_TFH_SRV_DMA_CHNL0_CTRL_D2S_RS_MSK		0x00000030</div><div class='add'>+#define IMR_TFH_SRV_DMA_CHNL0_CTRL_D2S_DMA_EN_POS	0x80000000</div><div class='add'>+</div><div class='ctx'> static inline u8 iwl_get_dma_hi_addr(dma_addr_t addr)</div><div class='ctx'> {</div><div class='ctx'> 	return (sizeof(addr) &gt; sizeof(u32) ? upper_32_bits(addr) : 0) &amp; 0xF;</div><div class='hunk'>@@ -611,7 +633,7 @@ enum iwl_tfd_tb_hi_n_len {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_tfd_tb transmit buffer descriptor within transmit frame descriptor</div><div class='add'>+ * struct iwl_tfd_tb - transmit buffer descriptor within transmit frame descriptor</div><div class='ctx'>  *</div><div class='ctx'>  * This structure contains dma address and length of transmission address</div><div class='ctx'>  *</div><div class='hunk'>@@ -625,19 +647,19 @@ struct iwl_tfd_tb {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_tfh_tb transmit buffer descriptor within transmit frame descriptor</div><div class='add'>+ * struct iwl_tfh_tb - transmit buffer descriptor within transmit frame descriptor</div><div class='ctx'>  *</div><div class='ctx'>  * This structure contains dma address and length of transmission address</div><div class='ctx'>  *</div><div class='del'>- * @tb_len length of the tx buffer</div><div class='del'>- * @addr 64 bits dma address</div><div class='add'>+ * @tb_len: length of the tx buffer</div><div class='add'>+ * @addr: 64 bits dma address</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_tfh_tb {</div><div class='ctx'> 	__le16 tb_len;</div><div class='ctx'> 	__le64 addr;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Each Tx queue uses a circular buffer of 256 TFDs stored in host DRAM.</div><div class='ctx'>  * Both driver and device share these circular buffers, each of which must be</div><div class='ctx'>  * contiguous 256 TFDs.</div><div class='hunk'>@@ -659,12 +681,13 @@ struct iwl_tfh_tb {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_tfd - Transmit Frame Descriptor (TFD)</div><div class='del'>- * @ __reserved1[3] reserved</div><div class='del'>- * @ num_tbs 0-4 number of active tbs</div><div class='del'>- *	     5   reserved</div><div class='del'>- *	     6-7 padding (not used)</div><div class='del'>- * @ tbs[20]	transmit frame buffer descriptors</div><div class='del'>- * @ __pad	padding</div><div class='add'>+ * @__reserved1: reserved</div><div class='add'>+ * @num_tbs:</div><div class='add'>+ *  0-4 number of active tbs</div><div class='add'>+ *  5   reserved</div><div class='add'>+ *  6-7 padding (not used)</div><div class='add'>+ * @tbs: transmit frame buffer descriptors</div><div class='add'>+ * @__pad: padding</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_tfd {</div><div class='ctx'> 	u8 __reserved1[3];</div><div class='hunk'>@@ -675,10 +698,11 @@ struct iwl_tfd {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_tfh_tfd - Transmit Frame Descriptor (TFD)</div><div class='del'>- * @ num_tbs 0-4 number of active tbs</div><div class='del'>- *	     5 -15   reserved</div><div class='del'>- * @ tbs[25]	transmit frame buffer descriptors</div><div class='del'>- * @ __pad	padding</div><div class='add'>+ * @num_tbs:</div><div class='add'>+ *	0-4 number of active tbs</div><div class='add'>+ *	5-15   reserved</div><div class='add'>+ * @tbs:	transmit frame buffer descriptors</div><div class='add'>+ * @__pad:	padding</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_tfh_tfd {</div><div class='ctx'> 	__le16 num_tbs;</div><div class='hunk'>@@ -692,29 +716,20 @@ struct iwl_tfh_tfd {</div><div class='ctx'> /* Fixed (non-configurable) rx data from phy */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwlagn_schedq_bc_tbl scheduler byte count table</div><div class='add'>+ * struct iwl_bc_tbl_entry - scheduler byte count table entry</div><div class='ctx'>  *	base physical address provided by SCD_DRAM_BASE_ADDR</div><div class='ctx'>  * For devices up to 22000:</div><div class='del'>- * @tfd_offset  0-12 - tx command byte count</div><div class='add'>+ * @tfd_offset:</div><div class='add'>+ *	For devices up to 22000:</div><div class='add'>+ *		 0-12 - tx command byte count</div><div class='ctx'>  *		12-16 - station index</div><div class='del'>- * For 22000:</div><div class='del'>- * @tfd_offset  0-12 - tx command byte count</div><div class='del'>- *		12-13 - number of 64 byte chunks</div><div class='del'>- *		14-16 - reserved</div><div class='del'>- */</div><div class='del'>-struct iwlagn_scd_bc_tbl {</div><div class='del'>-	__le16 tfd_offset[TFD_QUEUE_BC_SIZE];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iwl_gen3_bc_tbl scheduler byte count table gen3</div><div class='del'>- * For AX210 and on:</div><div class='del'>- * @tfd_offset: 0-12 - tx command byte count</div><div class='add'>+ *	For 22000 and on:</div><div class='add'>+ *		 0-12 - tx command byte count</div><div class='ctx'>  *		12-13 - number of 64 byte chunks</div><div class='ctx'>  *		14-16 - reserved</div><div class='ctx'>  */</div><div class='del'>-struct iwl_gen3_bc_tbl {</div><div class='del'>-	__le16 tfd_offset[TFD_QUEUE_BC_SIZE_GEN3];</div><div class='add'>+struct iwl_bc_tbl_entry {</div><div class='add'>+	__le16 tfd_offset;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #endif /* !__iwl_fh_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.c b/drivers/net/wireless/intel/iwlwifi/iwl-io.c<br/>index 33d42e08d5b8..b1944584c693 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-io.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-io.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-io.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-io.c</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2003-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2003-2014, 2018-2022, 2024-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2015-2016 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -13,6 +12,7 @@</div><div class='ctx'> #include "iwl-debug.h"</div><div class='ctx'> #include "iwl-prph.h"</div><div class='ctx'> #include "iwl-fh.h"</div><div class='add'>+#include "pcie/gen1_2/internal.h"</div><div class='ctx'> </div><div class='ctx'> void iwl_write8(struct iwl_trans *trans, u32 ofs, u8 val)</div><div class='ctx'> {</div><div class='hunk'>@@ -47,34 +47,34 @@ IWL_EXPORT_SYMBOL(iwl_read32);</div><div class='ctx'> </div><div class='ctx'> #define IWL_POLL_INTERVAL 10	/* microseconds */</div><div class='ctx'> </div><div class='del'>-int iwl_poll_bit(struct iwl_trans *trans, u32 addr,</div><div class='del'>-		 u32 bits, u32 mask, int timeout)</div><div class='add'>+int iwl_poll_bits_mask(struct iwl_trans *trans, u32 addr,</div><div class='add'>+		       u32 bits, u32 mask, int timeout)</div><div class='ctx'> {</div><div class='ctx'> 	int t = 0;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		if ((iwl_read32(trans, addr) &amp; mask) == (bits &amp; mask))</div><div class='del'>-			return t;</div><div class='add'>+			return 0;</div><div class='ctx'> 		udelay(IWL_POLL_INTERVAL);</div><div class='ctx'> 		t += IWL_POLL_INTERVAL;</div><div class='ctx'> 	} while (t &lt; timeout);</div><div class='ctx'> </div><div class='ctx'> 	return -ETIMEDOUT;</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_poll_bit);</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_poll_bits_mask);</div><div class='ctx'> </div><div class='ctx'> u32 iwl_read_direct32(struct iwl_trans *trans, u32 reg)</div><div class='ctx'> {</div><div class='del'>-	u32 value = 0x5a5a5a5a;</div><div class='del'>-</div><div class='ctx'> 	if (iwl_trans_grab_nic_access(trans)) {</div><div class='del'>-		value = iwl_read32(trans, reg);</div><div class='add'>+		u32 value = iwl_read32(trans, reg);</div><div class='add'>+</div><div class='ctx'> 		iwl_trans_release_nic_access(trans);</div><div class='add'>+		return value;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return value;</div><div class='add'>+	/* return as if we have a HW timeout/failure */</div><div class='add'>+	return 0x5a5a5a5a;</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_read_direct32);</div><div class='ctx'> </div><div class='ctx'> void iwl_write_direct32(struct iwl_trans *trans, u32 reg, u32 value)</div><div class='ctx'> {</div><div class='hunk'>@@ -92,7 +92,6 @@ void iwl_write_direct64(struct iwl_trans *trans, u64 reg, u64 value)</div><div class='ctx'> 		iwl_trans_release_nic_access(trans);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_write_direct64);</div><div class='ctx'> </div><div class='ctx'> int iwl_poll_direct_bit(struct iwl_trans *trans, u32 addr, u32 mask,</div><div class='ctx'> 			int timeout)</div><div class='hunk'>@@ -108,7 +107,6 @@ int iwl_poll_direct_bit(struct iwl_trans *trans, u32 addr, u32 mask,</div><div class='ctx'> </div><div class='ctx'> 	return -ETIMEDOUT;</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_poll_direct_bit);</div><div class='ctx'> </div><div class='ctx'> u32 iwl_read_prph_no_grab(struct iwl_trans *trans, u32 ofs)</div><div class='ctx'> {</div><div class='hunk'>@@ -116,14 +114,12 @@ u32 iwl_read_prph_no_grab(struct iwl_trans *trans, u32 ofs)</div><div class='ctx'> 	trace_iwlwifi_dev_ioread_prph32(trans-&gt;dev, ofs, val);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_read_prph_no_grab);</div><div class='ctx'> </div><div class='ctx'> void iwl_write_prph_no_grab(struct iwl_trans *trans, u32 ofs, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	trace_iwlwifi_dev_iowrite_prph32(trans-&gt;dev, ofs, val);</div><div class='ctx'> 	iwl_trans_write_prph(trans, ofs, val);</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_write_prph_no_grab);</div><div class='ctx'> </div><div class='ctx'> void iwl_write_prph64_no_grab(struct iwl_trans *trans, u64 ofs, u64 val)</div><div class='ctx'> {</div><div class='hunk'>@@ -131,17 +127,19 @@ void iwl_write_prph64_no_grab(struct iwl_trans *trans, u64 ofs, u64 val)</div><div class='ctx'> 	iwl_write_prph_no_grab(trans, ofs, val &amp; 0xffffffff);</div><div class='ctx'> 	iwl_write_prph_no_grab(trans, ofs + 4, val &gt;&gt; 32);</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_write_prph64_no_grab);</div><div class='ctx'> </div><div class='ctx'> u32 iwl_read_prph(struct iwl_trans *trans, u32 ofs)</div><div class='ctx'> {</div><div class='del'>-	u32 val = 0x5a5a5a5a;</div><div class='del'>-</div><div class='ctx'> 	if (iwl_trans_grab_nic_access(trans)) {</div><div class='del'>-		val = iwl_read_prph_no_grab(trans, ofs);</div><div class='add'>+		u32 val = iwl_read_prph_no_grab(trans, ofs);</div><div class='add'>+</div><div class='ctx'> 		iwl_trans_release_nic_access(trans);</div><div class='add'>+</div><div class='add'>+		return val;</div><div class='ctx'> 	}</div><div class='del'>-	return val;</div><div class='add'>+</div><div class='add'>+	/* return as if we have a HW timeout/failure */</div><div class='add'>+	return 0x5a5a5a5a;</div><div class='ctx'> }</div><div class='ctx'> IWL_EXPORT_SYMBOL(iwl_read_prph);</div><div class='ctx'> </div><div class='hunk'>@@ -162,7 +160,7 @@ int iwl_poll_prph_bit(struct iwl_trans *trans, u32 addr,</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		if ((iwl_read_prph(trans, addr) &amp; mask) == (bits &amp; mask))</div><div class='del'>-			return t;</div><div class='add'>+			return 0;</div><div class='ctx'> 		udelay(IWL_POLL_INTERVAL);</div><div class='ctx'> 		t += IWL_POLL_INTERVAL;</div><div class='ctx'> 	} while (t &lt; timeout);</div><div class='hunk'>@@ -207,15 +205,18 @@ IWL_EXPORT_SYMBOL(iwl_clear_bits_prph);</div><div class='ctx'> </div><div class='ctx'> void iwl_force_nmi(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_9000)</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_9000)</div><div class='ctx'> 		iwl_write_prph_delay(trans, DEVICE_SET_NMI_REG,</div><div class='ctx'> 				     DEVICE_SET_NMI_VAL_DRV, 1);</div><div class='del'>-	else if (trans-&gt;trans_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+	else if (trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210)</div><div class='ctx'> 		iwl_write_umac_prph(trans, UREG_NIC_SET_NMI_DRIVER,</div><div class='ctx'> 				UREG_NIC_SET_NMI_DRIVER_NMI_FROM_DRIVER);</div><div class='del'>-	else</div><div class='add'>+	else if (trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_BZ)</div><div class='ctx'> 		iwl_write_umac_prph(trans, UREG_DOORBELL_TO_ISR6,</div><div class='ctx'> 				    UREG_DOORBELL_TO_ISR6_NMI_BIT);</div><div class='add'>+	else</div><div class='add'>+		iwl_write32(trans, CSR_DOORBELL_VECTOR,</div><div class='add'>+			    UREG_DOORBELL_TO_ISR6_NMI_BIT);</div><div class='ctx'> }</div><div class='ctx'> IWL_EXPORT_SYMBOL(iwl_force_nmi);</div><div class='ctx'> </div><div class='hunk'>@@ -253,7 +254,7 @@ struct reg {</div><div class='ctx'> static int iwl_dump_rfh(struct iwl_trans *trans, char **buf)</div><div class='ctx'> {</div><div class='ctx'> 	int i, q;</div><div class='del'>-	int num_q = trans-&gt;num_rx_queues;</div><div class='add'>+	int num_q = trans-&gt;info.num_rxqs;</div><div class='ctx'> 	static const u32 rfh_tbl[] = {</div><div class='ctx'> 		RFH_RXF_DMA_CFG,</div><div class='ctx'> 		RFH_GEN_CFG,</div><div class='hunk'>@@ -361,7 +362,7 @@ int iwl_dump_fh(struct iwl_trans *trans, char **buf)</div><div class='ctx'> 		FH_TSSR_TX_ERROR_REG</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;mq_rx_supported)</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;mq_rx_supported)</div><div class='ctx'> 		return iwl_dump_rfh(trans, buf);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='hunk'>@@ -395,45 +396,11 @@ int iwl_dump_fh(struct iwl_trans *trans, char **buf)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwl_finish_nic_init(struct iwl_trans *trans,</div><div class='del'>-			const struct iwl_cfg_trans_params *cfg_trans)</div><div class='add'>+int iwl_trans_activate_nic(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (cfg_trans-&gt;bisr_workaround) {</div><div class='del'>-		/* ensure the TOP FSM isn't still in previous reset */</div><div class='del'>-		mdelay(2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set "initialization complete" bit to move adapter from</div><div class='del'>-	 * D0U* --&gt; D0A* (powered-up active) state.</div><div class='del'>-	 */</div><div class='del'>-	iwl_set_bit(trans, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);</div><div class='del'>-</div><div class='del'>-	if (cfg_trans-&gt;device_family == IWL_DEVICE_FAMILY_8000)</div><div class='del'>-		udelay(2);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Wait for clock stabilization; once stabilized, access to</div><div class='del'>-	 * device-internal resources is supported, e.g. iwl_write_prph()</div><div class='del'>-	 * and accesses to uCode SRAM.</div><div class='del'>-	 */</div><div class='del'>-	err = iwl_poll_bit(trans, CSR_GP_CNTRL,</div><div class='del'>-			   CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,</div><div class='del'>-			   CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,</div><div class='del'>-			   25000);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		IWL_DEBUG_INFO(trans, "Failed to wake NIC\n");</div><div class='del'>-</div><div class='del'>-	if (cfg_trans-&gt;bisr_workaround) {</div><div class='del'>-		/* ensure BISR shift has finished */</div><div class='del'>-		udelay(200);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err &lt; 0 ? err : 0;</div><div class='add'>+	return iwl_pcie_gen1_2_activate_nic(trans);</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_finish_nic_init);</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_activate_nic);</div><div class='ctx'> </div><div class='ctx'> void iwl_trans_sync_nmi_with_addr(struct iwl_trans *trans, u32 inta_addr,</div><div class='ctx'> 				  u32 sw_err_bit)</div><div class='hunk'>@@ -468,5 +435,5 @@ void iwl_trans_sync_nmi_with_addr(struct iwl_trans *trans, u32 inta_addr,</div><div class='ctx'> 	if (interrupts_enabled)</div><div class='ctx'> 		iwl_trans_interrupts(trans, true);</div><div class='ctx'> </div><div class='del'>-	iwl_trans_fw_error(trans);</div><div class='add'>+	iwl_trans_fw_error(trans, IWL_ERR_TYPE_NMI_FORCED);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.h b/drivers/net/wireless/intel/iwlwifi/iwl-io.h<br/>index 3c21c0e081f8..5bcec239ffc4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-io.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-io.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-io.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-io.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2018-2021, 2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_io_h__</div><div class='ctx'> #define __iwl_io_h__</div><div class='hunk'>@@ -23,8 +23,13 @@ static inline void iwl_clear_bit(struct iwl_trans *trans, u32 reg, u32 mask)</div><div class='ctx'> 	iwl_trans_set_bits_mask(trans, reg, mask, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwl_poll_bit(struct iwl_trans *trans, u32 addr,</div><div class='del'>-		 u32 bits, u32 mask, int timeout);</div><div class='add'>+int iwl_poll_bits_mask(struct iwl_trans *trans, u32 addr,</div><div class='add'>+		       u32 bits, u32 mask, int timeout);</div><div class='add'>+static inline int iwl_poll_bits(struct iwl_trans *trans, u32 addr, u32 bits,</div><div class='add'>+				int timeout)</div><div class='add'>+{</div><div class='add'>+	return iwl_poll_bits_mask(trans, addr, bits, bits, timeout);</div><div class='add'>+}</div><div class='ctx'> int iwl_poll_direct_bit(struct iwl_trans *trans, u32 addr, u32 mask,</div><div class='ctx'> 			int timeout);</div><div class='ctx'> </div><div class='hunk'>@@ -52,8 +57,7 @@ void iwl_set_bits_mask_prph(struct iwl_trans *trans, u32 ofs,</div><div class='ctx'> void iwl_clear_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask);</div><div class='ctx'> void iwl_force_nmi(struct iwl_trans *trans);</div><div class='ctx'> </div><div class='del'>-int iwl_finish_nic_init(struct iwl_trans *trans,</div><div class='del'>-			const struct iwl_cfg_trans_params *cfg_trans);</div><div class='add'>+int iwl_trans_activate_nic(struct iwl_trans *trans);</div><div class='ctx'> </div><div class='ctx'> /* Error handling */</div><div class='ctx'> int iwl_dump_fh(struct iwl_trans *trans, char **buf);</div><div class='hunk'>@@ -65,38 +69,38 @@ int iwl_dump_fh(struct iwl_trans *trans, char **buf);</div><div class='ctx'>  */</div><div class='ctx'> static inline u32 iwl_umac_prph(struct iwl_trans *trans, u32 ofs)</div><div class='ctx'> {</div><div class='del'>-	return ofs + trans-&gt;trans_cfg-&gt;umac_prph_offset;</div><div class='add'>+	return ofs + trans-&gt;mac_cfg-&gt;umac_prph_offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u32 iwl_read_umac_prph_no_grab(struct iwl_trans *trans, u32 ofs)</div><div class='ctx'> {</div><div class='ctx'> 	return iwl_read_prph_no_grab(trans, ofs +</div><div class='del'>-				     trans-&gt;trans_cfg-&gt;umac_prph_offset);</div><div class='add'>+				     trans-&gt;mac_cfg-&gt;umac_prph_offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u32 iwl_read_umac_prph(struct iwl_trans *trans, u32 ofs)</div><div class='ctx'> {</div><div class='del'>-	return iwl_read_prph(trans, ofs + trans-&gt;trans_cfg-&gt;umac_prph_offset);</div><div class='add'>+	return iwl_read_prph(trans, ofs + trans-&gt;mac_cfg-&gt;umac_prph_offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void iwl_write_umac_prph_no_grab(struct iwl_trans *trans, u32 ofs,</div><div class='ctx'> 					       u32 val)</div><div class='ctx'> {</div><div class='del'>-	iwl_write_prph_no_grab(trans,  ofs + trans-&gt;trans_cfg-&gt;umac_prph_offset,</div><div class='add'>+	iwl_write_prph_no_grab(trans,  ofs + trans-&gt;mac_cfg-&gt;umac_prph_offset,</div><div class='ctx'> 			       val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void iwl_write_umac_prph(struct iwl_trans *trans, u32 ofs,</div><div class='ctx'> 				       u32 val)</div><div class='ctx'> {</div><div class='del'>-	iwl_write_prph(trans,  ofs + trans-&gt;trans_cfg-&gt;umac_prph_offset, val);</div><div class='add'>+	iwl_write_prph(trans,  ofs + trans-&gt;mac_cfg-&gt;umac_prph_offset, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int iwl_poll_umac_prph_bit(struct iwl_trans *trans, u32 addr,</div><div class='ctx'> 					 u32 bits, u32 mask, int timeout)</div><div class='ctx'> {</div><div class='ctx'> 	return iwl_poll_prph_bit(trans, addr +</div><div class='del'>-				 trans-&gt;trans_cfg-&gt;umac_prph_offset,</div><div class='add'>+				 trans-&gt;mac_cfg-&gt;umac_prph_offset,</div><div class='ctx'> 				 bits, mask, timeout);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h b/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h<br/>index 004ebdac4535..0476df7b7f17 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-modparams.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-modparams.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2014, 2018-2022, 2024-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_modparams_h__</div><div class='ctx'> #define __iwl_modparams_h__</div><div class='hunk'>@@ -42,7 +42,7 @@ enum iwl_uapsd_disable {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_mod_params</div><div class='add'>+ * struct iwl_mod_params - module parameters for iwlwifi</div><div class='ctx'>  *</div><div class='ctx'>  * Holds the module parameters</div><div class='ctx'>  *</div><div class='hunk'>@@ -62,6 +62,7 @@ enum iwl_uapsd_disable {</div><div class='ctx'>  * @disable_11ac: disable VHT capabilities, default = false.</div><div class='ctx'>  * @remove_when_gone: remove an inaccessible device from the PCIe bus.</div><div class='ctx'>  * @enable_ini: enable new FW debug infratructure (INI TLVs)</div><div class='add'>+ * @disable_11be: disable EHT capabilities, default = false.</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_mod_params {</div><div class='ctx'> 	int swcrypto;</div><div class='hunk'>@@ -83,7 +84,8 @@ struct iwl_mod_params {</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool disable_11ax;</div><div class='ctx'> 	bool remove_when_gone;</div><div class='del'>-	bool enable_ini;</div><div class='add'>+	u32 enable_ini;</div><div class='add'>+	bool disable_11be;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline bool iwl_enable_rx_ampdu(void)</div><div class='hunk'>@@ -104,4 +106,23 @@ static inline bool iwl_enable_tx_ampdu(void)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Verify amsdu_size module parameter and convert it to a rxb size */</div><div class='add'>+static inline enum iwl_amsdu_size</div><div class='add'>+iwl_amsdu_size_to_rxb_size(void)</div><div class='add'>+{</div><div class='add'>+	switch (iwlwifi_mod_params.amsdu_size) {</div><div class='add'>+	case IWL_AMSDU_8K:</div><div class='add'>+		return IWL_AMSDU_8K;</div><div class='add'>+	case IWL_AMSDU_12K:</div><div class='add'>+		return IWL_AMSDU_12K;</div><div class='add'>+	default:</div><div class='add'>+		pr_err("%s: Unsupported amsdu_size: %d\n", KBUILD_MODNAME,</div><div class='add'>+		       iwlwifi_mod_params.amsdu_size);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case IWL_AMSDU_DEF:</div><div class='add'>+	case IWL_AMSDU_4K:</div><div class='add'>+		return IWL_AMSDU_4K;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* #__iwl_modparams_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c<br/>index fc75d049046d..e021fc57d85d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2014, 2018-2023, 2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/fips.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='hunk'>@@ -22,6 +23,7 @@</div><div class='ctx'> #include "fw/api/commands.h"</div><div class='ctx'> #include "fw/api/cmdhdr.h"</div><div class='ctx'> #include "fw/img.h"</div><div class='add'>+#include "mei/iwl-mei.h"</div><div class='ctx'> </div><div class='ctx'> /* NVM offsets (in words) definitions */</div><div class='ctx'> enum nvm_offsets {</div><div class='hunk'>@@ -37,16 +39,13 @@ enum nvm_offsets {</div><div class='ctx'> 	N_HW_ADDRS = 3,</div><div class='ctx'> 	NVM_CHANNELS = 0x1E0 - NVM_SW_SECTION,</div><div class='ctx'> </div><div class='del'>-	/* NVM calibration section offset (in words) definitions */</div><div class='del'>-	NVM_CALIB_SECTION = 0x2B8,</div><div class='del'>-	XTAL_CALIB = 0x316 - NVM_CALIB_SECTION,</div><div class='del'>-</div><div class='ctx'> 	/* NVM REGULATORY -Section offset (in words) definitions */</div><div class='ctx'> 	NVM_CHANNELS_SDP = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ext_nvm_offsets {</div><div class='ctx'> 	/* NVM HW-Section offset (in words) definitions */</div><div class='add'>+</div><div class='ctx'> 	MAC_ADDRESS_OVERRIDE_EXT_NVM = 1,</div><div class='ctx'> </div><div class='ctx'> 	/* NVM SW-Section offset (in words) definitions */</div><div class='hunk'>@@ -80,7 +79,7 @@ static const u16 iwl_nvm_channels[] = {</div><div class='ctx'> 	/* 2.4 GHz */</div><div class='ctx'> 	1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,</div><div class='ctx'> 	/* 5 GHz */</div><div class='del'>-	36, 40, 44 , 48, 52, 56, 60, 64,</div><div class='add'>+	36, 40, 44, 48, 52, 56, 60, 64,</div><div class='ctx'> 	100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 144,</div><div class='ctx'> 	149, 153, 157, 161, 165</div><div class='ctx'> };</div><div class='hunk'>@@ -141,65 +140,34 @@ static struct ieee80211_rate iwl_cfg80211_rates[] = {</div><div class='ctx'> #define N_RATES_52	(N_RATES_24 - RATES_52_OFFS)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum iwl_nvm_channel_flags - channel flags in NVM</div><div class='del'>- * @NVM_CHANNEL_VALID: channel is usable for this SKU/geo</div><div class='del'>- * @NVM_CHANNEL_IBSS: usable as an IBSS channel</div><div class='del'>- * @NVM_CHANNEL_ACTIVE: active scanning allowed</div><div class='del'>- * @NVM_CHANNEL_RADAR: radar detection required</div><div class='del'>- * @NVM_CHANNEL_INDOOR_ONLY: only indoor use is allowed</div><div class='del'>- * @NVM_CHANNEL_GO_CONCURRENT: GO operation is allowed when connected to BSS</div><div class='del'>- *	on same channel on 2.4 or same UNII band on 5.2</div><div class='del'>- * @NVM_CHANNEL_UNIFORM: uniform spreading required</div><div class='del'>- * @NVM_CHANNEL_20MHZ: 20 MHz channel okay</div><div class='del'>- * @NVM_CHANNEL_40MHZ: 40 MHz channel okay</div><div class='del'>- * @NVM_CHANNEL_80MHZ: 80 MHz channel okay</div><div class='del'>- * @NVM_CHANNEL_160MHZ: 160 MHz channel okay</div><div class='del'>- * @NVM_CHANNEL_DC_HIGH: DC HIGH required/allowed (?)</div><div class='del'>- */</div><div class='del'>-enum iwl_nvm_channel_flags {</div><div class='del'>-	NVM_CHANNEL_VALID		= BIT(0),</div><div class='del'>-	NVM_CHANNEL_IBSS		= BIT(1),</div><div class='del'>-	NVM_CHANNEL_ACTIVE		= BIT(3),</div><div class='del'>-	NVM_CHANNEL_RADAR		= BIT(4),</div><div class='del'>-	NVM_CHANNEL_INDOOR_ONLY		= BIT(5),</div><div class='del'>-	NVM_CHANNEL_GO_CONCURRENT	= BIT(6),</div><div class='del'>-	NVM_CHANNEL_UNIFORM		= BIT(7),</div><div class='del'>-	NVM_CHANNEL_20MHZ		= BIT(8),</div><div class='del'>-	NVM_CHANNEL_40MHZ		= BIT(9),</div><div class='del'>-	NVM_CHANNEL_80MHZ		= BIT(10),</div><div class='del'>-	NVM_CHANNEL_160MHZ		= BIT(11),</div><div class='del'>-	NVM_CHANNEL_DC_HIGH		= BIT(12),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * enum iwl_reg_capa_flags - global flags applied for the whole regulatory</div><div class='add'>+ * enum iwl_reg_capa_flags_v1 - global flags applied for the whole regulatory</div><div class='ctx'>  * domain.</div><div class='del'>- * @REG_CAPA_BF_CCD_LOW_BAND: Beam-forming or Cyclic Delay Diversity in the</div><div class='add'>+ * @REG_CAPA_V1_BF_CCD_LOW_BAND: Beam-forming or Cyclic Delay Diversity in the</div><div class='ctx'>  *	2.4Ghz band is allowed.</div><div class='del'>- * @REG_CAPA_BF_CCD_HIGH_BAND: Beam-forming or Cyclic Delay Diversity in the</div><div class='add'>+ * @REG_CAPA_V1_BF_CCD_HIGH_BAND: Beam-forming or Cyclic Delay Diversity in the</div><div class='ctx'>  *	5Ghz band is allowed.</div><div class='del'>- * @REG_CAPA_160MHZ_ALLOWED: 11ac channel with a width of 160Mhz is allowed</div><div class='add'>+ * @REG_CAPA_V1_160MHZ_ALLOWED: 11ac channel with a width of 160Mhz is allowed</div><div class='ctx'>  *	for this regulatory domain (valid only in 5Ghz).</div><div class='del'>- * @REG_CAPA_80MHZ_ALLOWED: 11ac channel with a width of 80Mhz is allowed</div><div class='add'>+ * @REG_CAPA_V1_80MHZ_ALLOWED: 11ac channel with a width of 80Mhz is allowed</div><div class='ctx'>  *	for this regulatory domain (valid only in 5Ghz).</div><div class='del'>- * @REG_CAPA_MCS_8_ALLOWED: 11ac with MCS 8 is allowed.</div><div class='del'>- * @REG_CAPA_MCS_9_ALLOWED: 11ac with MCS 9 is allowed.</div><div class='del'>- * @REG_CAPA_40MHZ_FORBIDDEN: 11n channel with a width of 40Mhz is forbidden</div><div class='add'>+ * @REG_CAPA_V1_MCS_8_ALLOWED: 11ac with MCS 8 is allowed.</div><div class='add'>+ * @REG_CAPA_V1_MCS_9_ALLOWED: 11ac with MCS 9 is allowed.</div><div class='add'>+ * @REG_CAPA_V1_40MHZ_FORBIDDEN: 11n channel with a width of 40Mhz is forbidden</div><div class='ctx'>  *	for this regulatory domain (valid only in 5Ghz).</div><div class='del'>- * @REG_CAPA_DC_HIGH_ENABLED: DC HIGH allowed.</div><div class='del'>- * @REG_CAPA_11AX_DISABLED: 11ax is forbidden for this regulatory domain.</div><div class='add'>+ * @REG_CAPA_V1_DC_HIGH_ENABLED: DC HIGH allowed.</div><div class='add'>+ * @REG_CAPA_V1_11AX_DISABLED: 11ax is forbidden for this regulatory domain.</div><div class='ctx'>  */</div><div class='del'>-enum iwl_reg_capa_flags {</div><div class='del'>-	REG_CAPA_BF_CCD_LOW_BAND	= BIT(0),</div><div class='del'>-	REG_CAPA_BF_CCD_HIGH_BAND	= BIT(1),</div><div class='del'>-	REG_CAPA_160MHZ_ALLOWED		= BIT(2),</div><div class='del'>-	REG_CAPA_80MHZ_ALLOWED		= BIT(3),</div><div class='del'>-	REG_CAPA_MCS_8_ALLOWED		= BIT(4),</div><div class='del'>-	REG_CAPA_MCS_9_ALLOWED		= BIT(5),</div><div class='del'>-	REG_CAPA_40MHZ_FORBIDDEN	= BIT(7),</div><div class='del'>-	REG_CAPA_DC_HIGH_ENABLED	= BIT(9),</div><div class='del'>-	REG_CAPA_11AX_DISABLED		= BIT(10),</div><div class='del'>-};</div><div class='add'>+enum iwl_reg_capa_flags_v1 {</div><div class='add'>+	REG_CAPA_V1_BF_CCD_LOW_BAND	= BIT(0),</div><div class='add'>+	REG_CAPA_V1_BF_CCD_HIGH_BAND	= BIT(1),</div><div class='add'>+	REG_CAPA_V1_160MHZ_ALLOWED	= BIT(2),</div><div class='add'>+	REG_CAPA_V1_80MHZ_ALLOWED	= BIT(3),</div><div class='add'>+	REG_CAPA_V1_MCS_8_ALLOWED	= BIT(4),</div><div class='add'>+	REG_CAPA_V1_MCS_9_ALLOWED	= BIT(5),</div><div class='add'>+	REG_CAPA_V1_40MHZ_FORBIDDEN	= BIT(7),</div><div class='add'>+	REG_CAPA_V1_DC_HIGH_ENABLED	= BIT(9),</div><div class='add'>+	REG_CAPA_V1_11AX_DISABLED	= BIT(10),</div><div class='add'>+}; /* GEO_CHANNEL_CAPABILITIES_API_S_VER_1 */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_reg_capa_flags_v2 - global flags applied for the whole regulatory</div><div class='hunk'>@@ -233,7 +201,31 @@ enum iwl_reg_capa_flags_v2 {</div><div class='ctx'> 	REG_CAPA_V2_WEATHER_DISABLED	= BIT(7),</div><div class='ctx'> 	REG_CAPA_V2_40MHZ_ALLOWED	= BIT(8),</div><div class='ctx'> 	REG_CAPA_V2_11AX_DISABLED	= BIT(10),</div><div class='del'>-};</div><div class='add'>+}; /* GEO_CHANNEL_CAPABILITIES_API_S_VER_2 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_reg_capa_flags_v4 - global flags applied for the whole regulatory</div><div class='add'>+ * domain.</div><div class='add'>+ * @REG_CAPA_V4_160MHZ_ALLOWED: 11ac channel with a width of 160Mhz is allowed</div><div class='add'>+ *	for this regulatory domain (valid only in 5Ghz).</div><div class='add'>+ * @REG_CAPA_V4_80MHZ_ALLOWED: 11ac channel with a width of 80Mhz is allowed</div><div class='add'>+ *	for this regulatory domain (valid only in 5Ghz).</div><div class='add'>+ * @REG_CAPA_V4_MCS_12_ALLOWED: 11ac with MCS 12 is allowed.</div><div class='add'>+ * @REG_CAPA_V4_MCS_13_ALLOWED: 11ac with MCS 13 is allowed.</div><div class='add'>+ * @REG_CAPA_V4_11BE_DISABLED: 11be is forbidden for this regulatory domain.</div><div class='add'>+ * @REG_CAPA_V4_11AX_DISABLED: 11ax is forbidden for this regulatory domain.</div><div class='add'>+ * @REG_CAPA_V4_320MHZ_ALLOWED: 11be channel with a width of 320Mhz is allowed</div><div class='add'>+ *	for this regulatory domain (valid only in 5GHz).</div><div class='add'>+ */</div><div class='add'>+enum iwl_reg_capa_flags_v4 {</div><div class='add'>+	REG_CAPA_V4_160MHZ_ALLOWED		= BIT(3),</div><div class='add'>+	REG_CAPA_V4_80MHZ_ALLOWED		= BIT(4),</div><div class='add'>+	REG_CAPA_V4_MCS_12_ALLOWED		= BIT(5),</div><div class='add'>+	REG_CAPA_V4_MCS_13_ALLOWED		= BIT(6),</div><div class='add'>+	REG_CAPA_V4_11BE_DISABLED		= BIT(8),</div><div class='add'>+	REG_CAPA_V4_11AX_DISABLED		= BIT(13),</div><div class='add'>+	REG_CAPA_V4_320MHZ_ALLOWED		= BIT(16),</div><div class='add'>+}; /* GEO_CHANNEL_CAPABILITIES_API_S_VER_4 */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'> * API v2 for reg_capa_flags is relevant from version 6 and onwards of the</div><div class='hunk'>@@ -241,24 +233,10 @@ enum iwl_reg_capa_flags_v2 {</div><div class='ctx'> */</div><div class='ctx'> #define REG_CAPA_V2_RESP_VER	6</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct iwl_reg_capa - struct for global regulatory capabilities, Used for</div><div class='del'>- * handling the different APIs of reg_capa_flags.</div><div class='del'>- *</div><div class='del'>- * @allow_40mhz: 11n channel with a width of 40Mhz is allowed</div><div class='del'>- *	for this regulatory domain (valid only in 5Ghz).</div><div class='del'>- * @allow_80mhz: 11ac channel with a width of 80Mhz is allowed</div><div class='del'>- *	for this regulatory domain (valid only in 5Ghz).</div><div class='del'>- * @allow_160mhz: 11ac channel with a width of 160Mhz is allowed</div><div class='del'>- *	for this regulatory domain (valid only in 5Ghz).</div><div class='del'>- * @disable_11ax: 11ax is forbidden for this regulatory domain.</div><div class='add'>+/* API v4 for reg_capa_flags is relevant from version 8 and onwards of the</div><div class='add'>+ * MCC update command response.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_reg_capa {</div><div class='del'>-	u16 allow_40mhz;</div><div class='del'>-	u16 allow_80mhz;</div><div class='del'>-	u16 allow_160mhz;</div><div class='del'>-	u16 disable_11ax;</div><div class='del'>-};</div><div class='add'>+#define REG_CAPA_V4_RESP_VER	8</div><div class='ctx'> </div><div class='ctx'> static inline void iwl_nvm_print_channel_flags(struct device *dev, u32 level,</div><div class='ctx'> 					       int chan, u32 flags)</div><div class='hunk'>@@ -274,7 +252,7 @@ static inline void iwl_nvm_print_channel_flags(struct device *dev, u32 level,</div><div class='ctx'> </div><div class='ctx'> 	/* Note: already can print up to 101 characters, 110 is the limit! */</div><div class='ctx'> 	IWL_DEBUG_DEV(dev, level,</div><div class='del'>-		      "Ch. %d: 0x%x:%s%s%s%s%s%s%s%s%s%s%s%s\n",</div><div class='add'>+		      "Ch. %d: 0x%x:%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",</div><div class='ctx'> 		      chan, flags,</div><div class='ctx'> 		      CHECK_AND_PRINT_I(VALID),</div><div class='ctx'> 		      CHECK_AND_PRINT_I(IBSS),</div><div class='hunk'>@@ -287,12 +265,14 @@ static inline void iwl_nvm_print_channel_flags(struct device *dev, u32 level,</div><div class='ctx'> 		      CHECK_AND_PRINT_I(40MHZ),</div><div class='ctx'> 		      CHECK_AND_PRINT_I(80MHZ),</div><div class='ctx'> 		      CHECK_AND_PRINT_I(160MHZ),</div><div class='del'>-		      CHECK_AND_PRINT_I(DC_HIGH));</div><div class='add'>+		      CHECK_AND_PRINT_I(DC_HIGH),</div><div class='add'>+		      CHECK_AND_PRINT_I(VLP),</div><div class='add'>+		      CHECK_AND_PRINT_I(AFC));</div><div class='ctx'> #undef CHECK_AND_PRINT_I</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 iwl_get_channel_flags(u8 ch_num, int ch_idx, enum nl80211_band band,</div><div class='del'>-				 u32 nvm_flags, const struct iwl_cfg *cfg)</div><div class='add'>+				 u32 nvm_flags, const struct iwl_rf_cfg *cfg)</div><div class='ctx'> {</div><div class='ctx'> 	u32 flags = IEEE80211_CHAN_NO_HT40;</div><div class='ctx'> </div><div class='hunk'>@@ -331,6 +311,14 @@ static u32 iwl_get_channel_flags(u8 ch_num, int ch_idx, enum nl80211_band band,</div><div class='ctx'> 	    (flags &amp; IEEE80211_CHAN_NO_IR))</div><div class='ctx'> 		flags |= IEEE80211_CHAN_IR_CONCURRENT;</div><div class='ctx'> </div><div class='add'>+	/* Set the AP type for the UHB case. */</div><div class='add'>+	if (nvm_flags &amp; NVM_CHANNEL_VLP)</div><div class='add'>+		flags |= IEEE80211_CHAN_ALLOW_6GHZ_VLP_AP;</div><div class='add'>+	else</div><div class='add'>+		flags |= IEEE80211_CHAN_NO_6GHZ_VLP_CLIENT;</div><div class='add'>+	if (!(nvm_flags &amp; NVM_CHANNEL_AFC))</div><div class='add'>+		flags |= IEEE80211_CHAN_NO_6GHZ_AFC_CLIENT;</div><div class='add'>+</div><div class='ctx'> 	return flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -345,11 +333,14 @@ static enum nl80211_band iwl_nl80211_band_from_channel_idx(int ch_idx)</div><div class='ctx'> 	return NL80211_BAND_2GHZ;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,</div><div class='add'>+static int iwl_init_channel_map(struct iwl_trans *trans,</div><div class='add'>+				const struct iwl_fw *fw,</div><div class='ctx'> 				struct iwl_nvm_data *data,</div><div class='ctx'> 				const void * const nvm_ch_flags,</div><div class='ctx'> 				u32 sbands_flags, bool v4)</div><div class='ctx'> {</div><div class='add'>+	const struct iwl_rf_cfg *cfg = trans-&gt;cfg;</div><div class='add'>+	struct device *dev = trans-&gt;dev;</div><div class='ctx'> 	int ch_idx;</div><div class='ctx'> 	int n_channels = 0;</div><div class='ctx'> 	struct ieee80211_channel *channel;</div><div class='hunk'>@@ -374,10 +365,10 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,</div><div class='ctx'> </div><div class='ctx'> 		if (v4)</div><div class='ctx'> 			ch_flags =</div><div class='del'>-				__le32_to_cpup((__le32 *)nvm_ch_flags + ch_idx);</div><div class='add'>+				__le32_to_cpup((const __le32 *)nvm_ch_flags + ch_idx);</div><div class='ctx'> 		else</div><div class='ctx'> 			ch_flags =</div><div class='del'>-				__le16_to_cpup((__le16 *)nvm_ch_flags + ch_idx);</div><div class='add'>+				__le16_to_cpup((const __le16 *)nvm_ch_flags + ch_idx);</div><div class='ctx'> </div><div class='ctx'> 		if (band == NL80211_BAND_5GHZ &amp;&amp;</div><div class='ctx'> 		    !data-&gt;sku_cap_band_52ghz_enable)</div><div class='hunk'>@@ -431,11 +422,10 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,</div><div class='ctx'> 		else</div><div class='ctx'> 			channel-&gt;flags = 0;</div><div class='ctx'> </div><div class='del'>-		/* TODO: Don't put limitations on UHB devices as we still don't</div><div class='del'>-		 * have NVM for them</div><div class='del'>-		 */</div><div class='del'>-		if (cfg-&gt;uhb_supported)</div><div class='del'>-			channel-&gt;flags = 0;</div><div class='add'>+		if (fw_has_capa(&amp;fw-&gt;ucode_capa,</div><div class='add'>+				IWL_UCODE_TLV_CAPA_MONITOR_PASSIVE_CHANS))</div><div class='add'>+			channel-&gt;flags |= IEEE80211_CHAN_CAN_MONITOR;</div><div class='add'>+</div><div class='ctx'> 		iwl_nvm_print_channel_flags(dev, IWL_DL_EEPROM,</div><div class='ctx'> 					    channel-&gt;hw_value, ch_flags);</div><div class='ctx'> 		IWL_DEBUG_EEPROM(dev, "Ch. %d: %ddBm\n",</div><div class='hunk'>@@ -450,7 +440,7 @@ static void iwl_init_vht_hw_capab(struct iwl_trans *trans,</div><div class='ctx'> 				  struct ieee80211_sta_vht_cap *vht_cap,</div><div class='ctx'> 				  u8 tx_chains, u8 rx_chains)</div><div class='ctx'> {</div><div class='del'>-	const struct iwl_cfg *cfg = trans-&gt;cfg;</div><div class='add'>+	const struct iwl_rf_cfg *cfg = trans-&gt;cfg;</div><div class='ctx'> 	int num_rx_ants = num_of_ant(rx_chains);</div><div class='ctx'> 	int num_tx_ants = num_of_ant(tx_chains);</div><div class='ctx'> </div><div class='hunk'>@@ -463,6 +453,9 @@ static void iwl_init_vht_hw_capab(struct iwl_trans *trans,</div><div class='ctx'> 		       IEEE80211_VHT_MAX_AMPDU_1024K &lt;&lt;</div><div class='ctx'> 		       IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT;</div><div class='ctx'> </div><div class='add'>+	if (!trans-&gt;cfg-&gt;ht_params.stbc)</div><div class='add'>+		vht_cap-&gt;cap &amp;= ~IEEE80211_VHT_CAP_RXSTBC_MASK;</div><div class='add'>+</div><div class='ctx'> 	if (data-&gt;vht160_supported)</div><div class='ctx'> 		vht_cap-&gt;cap |= IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ |</div><div class='ctx'> 				IEEE80211_VHT_CAP_SHORT_GI_160;</div><div class='hunk'>@@ -470,7 +463,7 @@ static void iwl_init_vht_hw_capab(struct iwl_trans *trans,</div><div class='ctx'> 	if (cfg-&gt;vht_mu_mimo_supported)</div><div class='ctx'> 		vht_cap-&gt;cap |= IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE;</div><div class='ctx'> </div><div class='del'>-	if (cfg-&gt;ht_params-&gt;ldpc)</div><div class='add'>+	if (cfg-&gt;ht_params.ldpc)</div><div class='ctx'> 		vht_cap-&gt;cap |= IEEE80211_VHT_CAP_RXLDPC;</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;sku_cap_mimo_disabled) {</div><div class='hunk'>@@ -478,21 +471,27 @@ static void iwl_init_vht_hw_capab(struct iwl_trans *trans,</div><div class='ctx'> 		num_tx_ants = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (num_tx_ants &gt; 1)</div><div class='add'>+	if (trans-&gt;cfg-&gt;ht_params.stbc &amp;&amp; num_tx_ants &gt; 1)</div><div class='ctx'> 		vht_cap-&gt;cap |= IEEE80211_VHT_CAP_TXSTBC;</div><div class='ctx'> 	else</div><div class='ctx'> 		vht_cap-&gt;cap |= IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * With fips_enabled crypto is done by software, so the HW cannot</div><div class='add'>+	 * split up A-MSDUs and the real limit that was set applies.</div><div class='add'>+	 * Note that EHT doesn't honour this (HE copies the VHT value),</div><div class='add'>+	 * but EHT is also entirely disabled for fips_enabled.</div><div class='add'>+	 */</div><div class='ctx'> 	switch (iwlwifi_mod_params.amsdu_size) {</div><div class='ctx'> 	case IWL_AMSDU_DEF:</div><div class='del'>-		if (trans-&gt;trans_cfg-&gt;mq_rx_supported)</div><div class='add'>+		if (trans-&gt;mac_cfg-&gt;mq_rx_supported &amp;&amp; !fips_enabled)</div><div class='ctx'> 			vht_cap-&gt;cap |=</div><div class='ctx'> 				IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454;</div><div class='ctx'> 		else</div><div class='ctx'> 			vht_cap-&gt;cap |= IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IWL_AMSDU_2K:</div><div class='del'>-		if (trans-&gt;trans_cfg-&gt;mq_rx_supported)</div><div class='add'>+		if (trans-&gt;mac_cfg-&gt;mq_rx_supported &amp;&amp; !fips_enabled)</div><div class='ctx'> 			vht_cap-&gt;cap |=</div><div class='ctx'> 				IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -534,15 +533,26 @@ static void iwl_init_vht_hw_capab(struct iwl_trans *trans,</div><div class='ctx'> 		cpu_to_le16(IEEE80211_VHT_EXT_NSS_BW_CAPABLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct ieee80211_sband_iftype_data iwl_he_capa[] = {</div><div class='add'>+static const u8 iwl_vendor_caps[] = {</div><div class='add'>+	0xdd,			/* vendor element */</div><div class='add'>+	0x06,			/* length */</div><div class='add'>+	0x00, 0x17, 0x35,	/* Intel OUI */</div><div class='add'>+	0x08,			/* type (Intel Capabilities) */</div><div class='add'>+	/* followed by 16 bits of capabilities */</div><div class='add'>+#define IWL_VENDOR_CAP_IMPROVED_BF_FDBK_HE	BIT(0)</div><div class='add'>+	IWL_VENDOR_CAP_IMPROVED_BF_FDBK_HE,</div><div class='add'>+	0x00</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_sband_iftype_data iwl_he_eht_capa[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.types_mask = BIT(NL80211_IFTYPE_STATION),</div><div class='add'>+		.types_mask = BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+			      BIT(NL80211_IFTYPE_P2P_CLIENT),</div><div class='ctx'> 		.he_cap = {</div><div class='ctx'> 			.has_he = true,</div><div class='ctx'> 			.he_cap_elem = {</div><div class='ctx'> 				.mac_cap_info[0] =</div><div class='del'>-					IEEE80211_HE_MAC_CAP0_HTC_HE |</div><div class='del'>-					IEEE80211_HE_MAC_CAP0_TWT_REQ,</div><div class='add'>+					IEEE80211_HE_MAC_CAP0_HTC_HE,</div><div class='ctx'> 				.mac_cap_info[1] =</div><div class='ctx'> 					IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US |</div><div class='ctx'> 					IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_8,</div><div class='hunk'>@@ -550,7 +560,7 @@ static const struct ieee80211_sband_iftype_data iwl_he_capa[] = {</div><div class='ctx'> 					IEEE80211_HE_MAC_CAP2_32BIT_BA_BITMAP,</div><div class='ctx'> 				.mac_cap_info[3] =</div><div class='ctx'> 					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |</div><div class='del'>-					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_2,</div><div class='add'>+					IEEE80211_HE_MAC_CAP3_RX_CTRL_FRAME_TO_MULTIBSS,</div><div class='ctx'> 				.mac_cap_info[4] =</div><div class='ctx'> 					IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU |</div><div class='ctx'> 					IEEE80211_HE_MAC_CAP4_MULTI_TID_AGG_TX_QOS_B39,</div><div class='hunk'>@@ -560,47 +570,44 @@ static const struct ieee80211_sband_iftype_data iwl_he_capa[] = {</div><div class='ctx'> 					IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU |</div><div class='ctx'> 					IEEE80211_HE_MAC_CAP5_HE_DYNAMIC_SM_PS |</div><div class='ctx'> 					IEEE80211_HE_MAC_CAP5_HT_VHT_TRIG_FRAME_RX,</div><div class='del'>-				.phy_cap_info[0] =</div><div class='del'>-					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G |</div><div class='del'>-					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |</div><div class='del'>-					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G,</div><div class='ctx'> 				.phy_cap_info[1] =</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK |</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A |</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD,</div><div class='ctx'> 				.phy_cap_info[2] =</div><div class='del'>-					IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US,</div><div class='add'>+					IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US |</div><div class='add'>+					IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ,</div><div class='ctx'> 				.phy_cap_info[3] =</div><div class='del'>-					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_NO_DCM |</div><div class='add'>+					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_BPSK |</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP3_DCM_MAX_TX_NSS_1 |</div><div class='del'>-					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_NO_DCM |</div><div class='add'>+					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_BPSK |</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP3_DCM_MAX_RX_NSS_1,</div><div class='ctx'> 				.phy_cap_info[4] =</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE |</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_8 |</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_8,</div><div class='del'>-				.phy_cap_info[5] =</div><div class='del'>-					IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_2 |</div><div class='del'>-					IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2,</div><div class='ctx'> 				.phy_cap_info[6] =</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB |</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB |</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT,</div><div class='ctx'> 				.phy_cap_info[7] =</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP |</div><div class='del'>-					IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI |</div><div class='del'>-					IEEE80211_HE_PHY_CAP7_MAX_NC_1,</div><div class='add'>+					IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI,</div><div class='ctx'> 				.phy_cap_info[8] =</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP8_HE_ER_SU_PPDU_4XLTF_AND_08_US_GI |</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G |</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU |</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU |</div><div class='del'>-					IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_2x996,</div><div class='add'>+					IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_242,</div><div class='ctx'> 				.phy_cap_info[9] =</div><div class='del'>-					IEEE80211_HE_PHY_CAP9_NON_TRIGGERED_CQI_FEEDBACK |</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB |</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB |</div><div class='del'>-					IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED,</div><div class='add'>+					IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU |</div><div class='add'>+					IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU |</div><div class='add'>+					(IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_RESERVED &lt;&lt;</div><div class='add'>+					IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_POS),</div><div class='add'>+				.phy_cap_info[10] =</div><div class='add'>+					IEEE80211_HE_PHY_CAP10_HE_MU_M1RU_MAX_LTF,</div><div class='ctx'> 			},</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Set default Tx/Rx HE MCS NSS Support field.</div><div class='hunk'>@@ -621,61 +628,100 @@ static const struct ieee80211_sband_iftype_data iwl_he_capa[] = {</div><div class='ctx'> 			 */</div><div class='ctx'> 			.ppe_thres = {0x61, 0x1c, 0xc7, 0x71},</div><div class='ctx'> 		},</div><div class='add'>+		.eht_cap = {</div><div class='add'>+			.has_eht = true,</div><div class='add'>+			.eht_cap_elem = {</div><div class='add'>+				.mac_cap_info[0] =</div><div class='add'>+					IEEE80211_EHT_MAC_CAP0_OM_CONTROL,</div><div class='add'>+				.phy_cap_info[0] =</div><div class='add'>+					IEEE80211_EHT_PHY_CAP0_242_TONE_RU_GT20MHZ |</div><div class='add'>+					IEEE80211_EHT_PHY_CAP0_NDP_4_EHT_LFT_32_GI |</div><div class='add'>+					IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMEE |</div><div class='add'>+					IEEE80211_EHT_PHY_CAP0_BEAMFORMEE_SS_80MHZ_MASK,</div><div class='add'>+				.phy_cap_info[1] =</div><div class='add'>+					IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_80MHZ_MASK  |</div><div class='add'>+					IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_160MHZ_MASK,</div><div class='add'>+				.phy_cap_info[3] =</div><div class='add'>+					IEEE80211_EHT_PHY_CAP3_TRIG_SU_BF_FDBK,</div><div class='add'>+</div><div class='add'>+				.phy_cap_info[4] =</div><div class='add'>+					IEEE80211_EHT_PHY_CAP4_EHT_MU_PPDU_4_EHT_LTF_08_GI,</div><div class='add'>+				.phy_cap_info[5] =</div><div class='add'>+					FIELD_PREP_CONST(IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_MASK,</div><div class='add'>+							 IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_16US) |</div><div class='add'>+					IEEE80211_EHT_PHY_CAP5_TX_LESS_242_TONE_RU_SUPP |</div><div class='add'>+					IEEE80211_EHT_PHY_CAP5_RX_LESS_242_TONE_RU_SUPP |</div><div class='add'>+					IEEE80211_EHT_PHY_CAP5_SUPP_EXTRA_EHT_LTF,</div><div class='add'>+				.phy_cap_info[8] =</div><div class='add'>+					IEEE80211_EHT_PHY_CAP8_RX_1024QAM_WIDER_BW_DL_OFDMA |</div><div class='add'>+					IEEE80211_EHT_PHY_CAP8_RX_4096QAM_WIDER_BW_DL_OFDMA,</div><div class='add'>+			},</div><div class='add'>+</div><div class='add'>+			/* For all MCS and bandwidth, set 2 NSS for both Tx and</div><div class='add'>+			 * Rx - note we don't set the only_20mhz, but due to this</div><div class='add'>+			 * being a union, it gets set correctly anyway.</div><div class='add'>+			 */</div><div class='add'>+			.eht_mcs_nss_supp = {</div><div class='add'>+				.bw._80 = {</div><div class='add'>+					.rx_tx_mcs9_max_nss = 0x22,</div><div class='add'>+					.rx_tx_mcs11_max_nss = 0x22,</div><div class='add'>+					.rx_tx_mcs13_max_nss = 0x22,</div><div class='add'>+				},</div><div class='add'>+				.bw._160 = {</div><div class='add'>+					.rx_tx_mcs9_max_nss = 0x22,</div><div class='add'>+					.rx_tx_mcs11_max_nss = 0x22,</div><div class='add'>+					.rx_tx_mcs13_max_nss = 0x22,</div><div class='add'>+				},</div><div class='add'>+				.bw._320 = {</div><div class='add'>+					.rx_tx_mcs9_max_nss = 0x22,</div><div class='add'>+					.rx_tx_mcs11_max_nss = 0x22,</div><div class='add'>+					.rx_tx_mcs13_max_nss = 0x22,</div><div class='add'>+				},</div><div class='add'>+			},</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * PPE thresholds for NSS = 2, and RU index bitmap set</div><div class='add'>+			 * to 0xc.</div><div class='add'>+			 * Note: just for stating what we want, not present in</div><div class='add'>+			 * the transmitted data due to not including</div><div class='add'>+			 * IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT.</div><div class='add'>+			 */</div><div class='add'>+			.eht_ppe_thres = {0xc1, 0x0e, 0xe0 }</div><div class='add'>+		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.types_mask = BIT(NL80211_IFTYPE_AP),</div><div class='add'>+		.types_mask = BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+			      BIT(NL80211_IFTYPE_P2P_GO),</div><div class='ctx'> 		.he_cap = {</div><div class='ctx'> 			.has_he = true,</div><div class='ctx'> 			.he_cap_elem = {</div><div class='ctx'> 				.mac_cap_info[0] =</div><div class='ctx'> 					IEEE80211_HE_MAC_CAP0_HTC_HE,</div><div class='ctx'> 				.mac_cap_info[1] =</div><div class='del'>-					IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US |</div><div class='ctx'> 					IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_8,</div><div class='del'>-				.mac_cap_info[2] =</div><div class='del'>-					IEEE80211_HE_MAC_CAP2_BSR,</div><div class='ctx'> 				.mac_cap_info[3] =</div><div class='del'>-					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |</div><div class='del'>-					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_2,</div><div class='del'>-				.mac_cap_info[4] =</div><div class='del'>-					IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,</div><div class='del'>-				.mac_cap_info[5] =</div><div class='del'>-					IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU,</div><div class='del'>-				.phy_cap_info[0] =</div><div class='del'>-					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G |</div><div class='del'>-					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |</div><div class='del'>-					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G,</div><div class='add'>+					IEEE80211_HE_MAC_CAP3_OMI_CONTROL,</div><div class='ctx'> 				.phy_cap_info[1] =</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD,</div><div class='ctx'> 				.phy_cap_info[2] =</div><div class='add'>+					IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ |</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US,</div><div class='ctx'> 				.phy_cap_info[3] =</div><div class='del'>-					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_NO_DCM |</div><div class='add'>+					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_BPSK |</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP3_DCM_MAX_TX_NSS_1 |</div><div class='del'>-					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_NO_DCM |</div><div class='add'>+					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_BPSK |</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP3_DCM_MAX_RX_NSS_1,</div><div class='del'>-				.phy_cap_info[4] =</div><div class='del'>-					IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE |</div><div class='del'>-					IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_8 |</div><div class='del'>-					IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_8,</div><div class='del'>-				.phy_cap_info[5] =</div><div class='del'>-					IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_2 |</div><div class='del'>-					IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2,</div><div class='ctx'> 				.phy_cap_info[6] =</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT,</div><div class='ctx'> 				.phy_cap_info[7] =</div><div class='del'>-					IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI |</div><div class='del'>-					IEEE80211_HE_PHY_CAP7_MAX_NC_1,</div><div class='add'>+					IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI,</div><div class='ctx'> 				.phy_cap_info[8] =</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP8_HE_ER_SU_PPDU_4XLTF_AND_08_US_GI |</div><div class='del'>-					IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G |</div><div class='del'>-					IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU |</div><div class='del'>-					IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU |</div><div class='del'>-					IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_2x996,</div><div class='add'>+					IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_242,</div><div class='ctx'> 				.phy_cap_info[9] =</div><div class='del'>-					IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB |</div><div class='del'>-					IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB |</div><div class='del'>-					IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED,</div><div class='add'>+					IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU |</div><div class='add'>+					IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_RESERVED</div><div class='add'>+					&lt;&lt; IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_POS,</div><div class='ctx'> 			},</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Set default Tx/Rx HE MCS NSS Support field.</div><div class='hunk'>@@ -696,6 +742,50 @@ static const struct ieee80211_sband_iftype_data iwl_he_capa[] = {</div><div class='ctx'> 			 */</div><div class='ctx'> 			.ppe_thres = {0x61, 0x1c, 0xc7, 0x71},</div><div class='ctx'> 		},</div><div class='add'>+		.eht_cap = {</div><div class='add'>+			.has_eht = true,</div><div class='add'>+			.eht_cap_elem = {</div><div class='add'>+				.mac_cap_info[0] =</div><div class='add'>+					IEEE80211_EHT_MAC_CAP0_OM_CONTROL,</div><div class='add'>+				.phy_cap_info[0] =</div><div class='add'>+					IEEE80211_EHT_PHY_CAP0_242_TONE_RU_GT20MHZ |</div><div class='add'>+					IEEE80211_EHT_PHY_CAP0_NDP_4_EHT_LFT_32_GI,</div><div class='add'>+				.phy_cap_info[5] =</div><div class='add'>+					FIELD_PREP_CONST(IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_MASK,</div><div class='add'>+							 IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_16US),</div><div class='add'>+			},</div><div class='add'>+</div><div class='add'>+			/* For all MCS and bandwidth, set 2 NSS for both Tx and</div><div class='add'>+			 * Rx - note we don't set the only_20mhz, but due to this</div><div class='add'>+			 * being a union, it gets set correctly anyway.</div><div class='add'>+			 */</div><div class='add'>+			.eht_mcs_nss_supp = {</div><div class='add'>+				.bw._80 = {</div><div class='add'>+					.rx_tx_mcs9_max_nss = 0x22,</div><div class='add'>+					.rx_tx_mcs11_max_nss = 0x22,</div><div class='add'>+					.rx_tx_mcs13_max_nss = 0x22,</div><div class='add'>+				},</div><div class='add'>+				.bw._160 = {</div><div class='add'>+					.rx_tx_mcs9_max_nss = 0x22,</div><div class='add'>+					.rx_tx_mcs11_max_nss = 0x22,</div><div class='add'>+					.rx_tx_mcs13_max_nss = 0x22,</div><div class='add'>+				},</div><div class='add'>+				.bw._320 = {</div><div class='add'>+					.rx_tx_mcs9_max_nss = 0x22,</div><div class='add'>+					.rx_tx_mcs11_max_nss = 0x22,</div><div class='add'>+					.rx_tx_mcs13_max_nss = 0x22,</div><div class='add'>+				},</div><div class='add'>+			},</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * PPE thresholds for NSS = 2, and RU index bitmap set</div><div class='add'>+			 * to 0xc.</div><div class='add'>+			 * Note: just for stating what we want, not present in</div><div class='add'>+			 * the transmitted data due to not including</div><div class='add'>+			 * IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT.</div><div class='add'>+			 */</div><div class='add'>+			.eht_ppe_thres = {0xc1, 0x0e, 0xe0 }</div><div class='add'>+		},</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -740,71 +830,271 @@ static void iwl_init_he_6ghz_capa(struct iwl_trans *trans,</div><div class='ctx'> 	IWL_DEBUG_EEPROM(trans-&gt;dev, "he_6ghz_capa=0x%x\n", he_6ghz_capa);</div><div class='ctx'> </div><div class='ctx'> 	/* we know it's writable - we set it before ourselves */</div><div class='del'>-	iftype_data = (void *)sband-&gt;iftype_data;</div><div class='add'>+	iftype_data = (void *)(uintptr_t)sband-&gt;iftype_data;</div><div class='ctx'> 	for (i = 0; i &lt; sband-&gt;n_iftype_data; i++)</div><div class='ctx'> 		iftype_data[i].he_6ghz_capa.capa = cpu_to_le16(he_6ghz_capa);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+iwl_nvm_fixup_sband_iftd(struct iwl_trans *trans,</div><div class='add'>+			 struct iwl_nvm_data *data,</div><div class='add'>+			 struct ieee80211_supported_band *sband,</div><div class='add'>+			 struct ieee80211_sband_iftype_data *iftype_data,</div><div class='add'>+			 u8 tx_chains, u8 rx_chains,</div><div class='add'>+			 const struct iwl_fw *fw)</div><div class='add'>+{</div><div class='add'>+	bool is_ap = iftype_data-&gt;types_mask &amp; (BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+						BIT(NL80211_IFTYPE_P2P_GO));</div><div class='add'>+	bool slow_pcie = (!trans-&gt;mac_cfg-&gt;integrated &amp;&amp;</div><div class='add'>+			  trans-&gt;info.pcie_link_speed &lt; PCI_EXP_LNKSTA_CLS_8_0GB);</div><div class='add'>+</div><div class='add'>+	/* EHT needs WPA3/MFP so cannot do it for fips_enabled */</div><div class='add'>+	if (!data-&gt;sku_cap_11be_enable || iwlwifi_mod_params.disable_11be ||</div><div class='add'>+	    fips_enabled)</div><div class='add'>+		iftype_data-&gt;eht_cap.has_eht = false;</div><div class='add'>+</div><div class='add'>+	/* Advertise an A-MPDU exponent extension based on</div><div class='add'>+	 * operating band</div><div class='add'>+	 */</div><div class='add'>+	if (sband-&gt;band == NL80211_BAND_6GHZ &amp;&amp; iftype_data-&gt;eht_cap.has_eht)</div><div class='add'>+		iftype_data-&gt;he_cap.he_cap_elem.mac_cap_info[3] |=</div><div class='add'>+			IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_2;</div><div class='add'>+	else if (sband-&gt;band != NL80211_BAND_2GHZ)</div><div class='add'>+		iftype_data-&gt;he_cap.he_cap_elem.mac_cap_info[3] |=</div><div class='add'>+			IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_1;</div><div class='add'>+	else</div><div class='add'>+		iftype_data-&gt;he_cap.he_cap_elem.mac_cap_info[3] |=</div><div class='add'>+			IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3;</div><div class='add'>+</div><div class='add'>+	switch (sband-&gt;band) {</div><div class='add'>+	case NL80211_BAND_2GHZ:</div><div class='add'>+		iftype_data-&gt;he_cap.he_cap_elem.phy_cap_info[0] |=</div><div class='add'>+			IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G;</div><div class='add'>+		iftype_data-&gt;eht_cap.eht_cap_elem.mac_cap_info[0] |=</div><div class='add'>+			u8_encode_bits(IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_11454,</div><div class='add'>+				       IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_MASK);</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_BAND_6GHZ:</div><div class='add'>+		if (!trans-&gt;reduced_cap_sku &amp;&amp;</div><div class='add'>+		    (!trans-&gt;cfg-&gt;bw_limit || trans-&gt;cfg-&gt;bw_limit &gt;= 320)) {</div><div class='add'>+			iftype_data-&gt;eht_cap.eht_cap_elem.phy_cap_info[0] |=</div><div class='add'>+				IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ;</div><div class='add'>+			iftype_data-&gt;eht_cap.eht_cap_elem.phy_cap_info[1] |=</div><div class='add'>+				IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_320MHZ_MASK;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='add'>+	case NL80211_BAND_5GHZ:</div><div class='add'>+		iftype_data-&gt;he_cap.he_cap_elem.phy_cap_info[0] |=</div><div class='add'>+			IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |</div><div class='add'>+			IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((tx_chains &amp; rx_chains) == ANT_AB) {</div><div class='add'>+		iftype_data-&gt;he_cap.he_cap_elem.phy_cap_info[2] |=</div><div class='add'>+			IEEE80211_HE_PHY_CAP2_STBC_TX_UNDER_80MHZ;</div><div class='add'>+		iftype_data-&gt;he_cap.he_cap_elem.phy_cap_info[5] |=</div><div class='add'>+			IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_2 |</div><div class='add'>+			IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2;</div><div class='add'>+		if (!is_ap) {</div><div class='add'>+			iftype_data-&gt;he_cap.he_cap_elem.phy_cap_info[7] |=</div><div class='add'>+				IEEE80211_HE_PHY_CAP7_MAX_NC_2;</div><div class='add'>+</div><div class='add'>+			if (iftype_data-&gt;eht_cap.has_eht) {</div><div class='add'>+				/*</div><div class='add'>+				 * Set the number of sounding dimensions for each</div><div class='add'>+				 * bandwidth to 1 to indicate the maximal supported</div><div class='add'>+				 * value of TXVECTOR parameter NUM_STS of 2</div><div class='add'>+				 */</div><div class='add'>+				iftype_data-&gt;eht_cap.eht_cap_elem.phy_cap_info[2] |= 0x49;</div><div class='add'>+</div><div class='add'>+				/*</div><div class='add'>+				 * Set the MAX NC to 1 to indicate sounding feedback of</div><div class='add'>+				 * 2 supported by the beamfomee.</div><div class='add'>+				 */</div><div class='add'>+				iftype_data-&gt;eht_cap.eht_cap_elem.phy_cap_info[4] |= 0x10;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (slow_pcie) {</div><div class='add'>+			struct ieee80211_eht_mcs_nss_supp *mcs_nss =</div><div class='add'>+				&amp;iftype_data-&gt;eht_cap.eht_mcs_nss_supp;</div><div class='add'>+</div><div class='add'>+			mcs_nss-&gt;bw._320.rx_tx_mcs11_max_nss = 0;</div><div class='add'>+			mcs_nss-&gt;bw._320.rx_tx_mcs13_max_nss = 0;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		struct ieee80211_he_mcs_nss_supp *he_mcs_nss_supp =</div><div class='add'>+			&amp;iftype_data-&gt;he_cap.he_mcs_nss_supp;</div><div class='add'>+</div><div class='add'>+		if (iftype_data-&gt;eht_cap.has_eht) {</div><div class='add'>+			struct ieee80211_eht_mcs_nss_supp *mcs_nss =</div><div class='add'>+				&amp;iftype_data-&gt;eht_cap.eht_mcs_nss_supp;</div><div class='add'>+</div><div class='add'>+			memset(mcs_nss, 0x11, sizeof(*mcs_nss));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!is_ap) {</div><div class='add'>+			/* If not 2x2, we need to indicate 1x1 in the</div><div class='add'>+			 * Midamble RX Max NSTS - but not for AP mode</div><div class='add'>+			 */</div><div class='add'>+			iftype_data-&gt;he_cap.he_cap_elem.phy_cap_info[1] &amp;=</div><div class='add'>+				~IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_TX_MAX_NSTS;</div><div class='add'>+			iftype_data-&gt;he_cap.he_cap_elem.phy_cap_info[2] &amp;=</div><div class='add'>+				~IEEE80211_HE_PHY_CAP2_MIDAMBLE_RX_TX_MAX_NSTS;</div><div class='add'>+			iftype_data-&gt;he_cap.he_cap_elem.phy_cap_info[7] |=</div><div class='add'>+				IEEE80211_HE_PHY_CAP7_MAX_NC_1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		he_mcs_nss_supp-&gt;rx_mcs_80 |=</div><div class='add'>+			cpu_to_le16(IEEE80211_HE_MCS_NOT_SUPPORTED &lt;&lt; 2);</div><div class='add'>+		he_mcs_nss_supp-&gt;tx_mcs_80 |=</div><div class='add'>+			cpu_to_le16(IEEE80211_HE_MCS_NOT_SUPPORTED &lt;&lt; 2);</div><div class='add'>+		he_mcs_nss_supp-&gt;rx_mcs_160 |=</div><div class='add'>+			cpu_to_le16(IEEE80211_HE_MCS_NOT_SUPPORTED &lt;&lt; 2);</div><div class='add'>+		he_mcs_nss_supp-&gt;tx_mcs_160 |=</div><div class='add'>+			cpu_to_le16(IEEE80211_HE_MCS_NOT_SUPPORTED &lt;&lt; 2);</div><div class='add'>+		he_mcs_nss_supp-&gt;rx_mcs_80p80 |=</div><div class='add'>+			cpu_to_le16(IEEE80211_HE_MCS_NOT_SUPPORTED &lt;&lt; 2);</div><div class='add'>+		he_mcs_nss_supp-&gt;tx_mcs_80p80 |=</div><div class='add'>+			cpu_to_le16(IEEE80211_HE_MCS_NOT_SUPPORTED &lt;&lt; 2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* prior RFs don't have HE, HR RF doesn't have this, later have it */</div><div class='add'>+	if (CSR_HW_RFID_TYPE(trans-&gt;info.hw_rf_id) == IWL_CFG_RF_TYPE_HR1 ||</div><div class='add'>+	    CSR_HW_RFID_TYPE(trans-&gt;info.hw_rf_id) == IWL_CFG_RF_TYPE_HR2)</div><div class='add'>+		iftype_data-&gt;he_cap.he_cap_elem.phy_cap_info[9] &amp;=</div><div class='add'>+			~(IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU |</div><div class='add'>+			  IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU);</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210 &amp;&amp; !is_ap)</div><div class='add'>+		iftype_data-&gt;he_cap.he_cap_elem.phy_cap_info[2] |=</div><div class='add'>+			IEEE80211_HE_PHY_CAP2_UL_MU_FULL_MU_MIMO;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family == IWL_DEVICE_FAMILY_22000 &amp;&amp;</div><div class='add'>+	    !is_ap) {</div><div class='add'>+		iftype_data-&gt;vendor_elems.data = iwl_vendor_caps;</div><div class='add'>+		iftype_data-&gt;vendor_elems.len = ARRAY_SIZE(iwl_vendor_caps);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!trans-&gt;cfg-&gt;ht_params.stbc) {</div><div class='add'>+		iftype_data-&gt;he_cap.he_cap_elem.phy_cap_info[2] &amp;=</div><div class='add'>+			~IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ;</div><div class='add'>+		iftype_data-&gt;he_cap.he_cap_elem.phy_cap_info[7] &amp;=</div><div class='add'>+			~IEEE80211_HE_PHY_CAP7_STBC_RX_ABOVE_80MHZ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;step_urm) {</div><div class='add'>+		iftype_data-&gt;eht_cap.eht_mcs_nss_supp.bw._320.rx_tx_mcs11_max_nss = 0;</div><div class='add'>+		iftype_data-&gt;eht_cap.eht_mcs_nss_supp.bw._320.rx_tx_mcs13_max_nss = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;cfg-&gt;bw_limit &amp;&amp; trans-&gt;cfg-&gt;bw_limit &lt; 160)</div><div class='add'>+		iftype_data-&gt;he_cap.he_cap_elem.phy_cap_info[0] &amp;=</div><div class='add'>+			~IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G;</div><div class='add'>+</div><div class='add'>+	if ((trans-&gt;cfg-&gt;bw_limit &amp;&amp; trans-&gt;cfg-&gt;bw_limit &lt; 320) ||</div><div class='add'>+	    trans-&gt;reduced_cap_sku) {</div><div class='add'>+		memset(&amp;iftype_data-&gt;eht_cap.eht_mcs_nss_supp.bw._320, 0,</div><div class='add'>+		       sizeof(iftype_data-&gt;eht_cap.eht_mcs_nss_supp.bw._320));</div><div class='add'>+		iftype_data-&gt;eht_cap.eht_cap_elem.phy_cap_info[2] &amp;=</div><div class='add'>+			~IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_320MHZ_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;reduced_cap_sku) {</div><div class='add'>+		iftype_data-&gt;eht_cap.eht_mcs_nss_supp.bw._80.rx_tx_mcs13_max_nss = 0;</div><div class='add'>+		iftype_data-&gt;eht_cap.eht_mcs_nss_supp.bw._160.rx_tx_mcs13_max_nss = 0;</div><div class='add'>+		iftype_data-&gt;eht_cap.eht_cap_elem.phy_cap_info[8] &amp;=</div><div class='add'>+			~IEEE80211_EHT_PHY_CAP8_RX_4096QAM_WIDER_BW_DL_OFDMA;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void iwl_init_he_hw_capab(struct iwl_trans *trans,</div><div class='ctx'> 				 struct iwl_nvm_data *data,</div><div class='ctx'> 				 struct ieee80211_supported_band *sband,</div><div class='del'>-				 u8 tx_chains, u8 rx_chains)</div><div class='add'>+				 u8 tx_chains, u8 rx_chains,</div><div class='add'>+				 const struct iwl_fw *fw)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sband_iftype_data *iftype_data;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	/* should only initialize once */</div><div class='del'>-	if (WARN_ON(sband-&gt;iftype_data))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	BUILD_BUG_ON(sizeof(data-&gt;iftd.low) != sizeof(iwl_he_capa));</div><div class='del'>-	BUILD_BUG_ON(sizeof(data-&gt;iftd.high) != sizeof(iwl_he_capa));</div><div class='add'>+	BUILD_BUG_ON(sizeof(data-&gt;iftd.low) != sizeof(iwl_he_eht_capa));</div><div class='add'>+	BUILD_BUG_ON(sizeof(data-&gt;iftd.high) != sizeof(iwl_he_eht_capa));</div><div class='add'>+	BUILD_BUG_ON(sizeof(data-&gt;iftd.uhb) != sizeof(iwl_he_eht_capa));</div><div class='ctx'> </div><div class='ctx'> 	switch (sband-&gt;band) {</div><div class='ctx'> 	case NL80211_BAND_2GHZ:</div><div class='ctx'> 		iftype_data = data-&gt;iftd.low;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_BAND_5GHZ:</div><div class='del'>-	case NL80211_BAND_6GHZ:</div><div class='ctx'> 		iftype_data = data-&gt;iftd.high;</div><div class='ctx'> 		break;</div><div class='add'>+	case NL80211_BAND_6GHZ:</div><div class='add'>+		iftype_data = data-&gt;iftd.uhb;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(iftype_data, iwl_he_capa, sizeof(iwl_he_capa));</div><div class='add'>+	memcpy(iftype_data, iwl_he_eht_capa, sizeof(iwl_he_eht_capa));</div><div class='ctx'> </div><div class='del'>-	sband-&gt;iftype_data = iftype_data;</div><div class='del'>-	sband-&gt;n_iftype_data = ARRAY_SIZE(iwl_he_capa);</div><div class='add'>+	_ieee80211_set_sband_iftype_data(sband, iftype_data,</div><div class='add'>+					 ARRAY_SIZE(iwl_he_eht_capa));</div><div class='ctx'> </div><div class='del'>-	/* If not 2x2, we need to indicate 1x1 in the Midamble RX Max NSTS */</div><div class='del'>-	if ((tx_chains &amp; rx_chains) != ANT_AB) {</div><div class='del'>-		int i;</div><div class='add'>+	for (i = 0; i &lt; sband-&gt;n_iftype_data; i++)</div><div class='add'>+		iwl_nvm_fixup_sband_iftd(trans, data, sband, &amp;iftype_data[i],</div><div class='add'>+					 tx_chains, rx_chains, fw);</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; sband-&gt;n_iftype_data; i++) {</div><div class='del'>-			iftype_data[i].he_cap.he_cap_elem.phy_cap_info[1] &amp;=</div><div class='del'>-				~IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_TX_MAX_NSTS;</div><div class='del'>-			iftype_data[i].he_cap.he_cap_elem.phy_cap_info[2] &amp;=</div><div class='del'>-				~IEEE80211_HE_PHY_CAP2_MIDAMBLE_RX_TX_MAX_NSTS;</div><div class='del'>-			iftype_data[i].he_cap.he_cap_elem.phy_cap_info[7] &amp;=</div><div class='del'>-				~IEEE80211_HE_PHY_CAP7_MAX_NC_MASK;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> 	iwl_init_he_6ghz_capa(trans, data, sband, tx_chains, rx_chains);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void iwl_reinit_cab(struct iwl_trans *trans, struct iwl_nvm_data *data,</div><div class='add'>+		    u8 tx_chains, u8 rx_chains, const struct iwl_fw *fw)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+</div><div class='add'>+	sband = &amp;data-&gt;bands[NL80211_BAND_2GHZ];</div><div class='add'>+	iwl_init_ht_hw_capab(trans, data, &amp;sband-&gt;ht_cap, NL80211_BAND_2GHZ,</div><div class='add'>+			     tx_chains, rx_chains);</div><div class='add'>+</div><div class='add'>+	if (data-&gt;sku_cap_11ax_enable &amp;&amp; !iwlwifi_mod_params.disable_11ax)</div><div class='add'>+		iwl_init_he_hw_capab(trans, data, sband, tx_chains, rx_chains,</div><div class='add'>+				     fw);</div><div class='add'>+</div><div class='add'>+	sband = &amp;data-&gt;bands[NL80211_BAND_5GHZ];</div><div class='add'>+	iwl_init_ht_hw_capab(trans, data, &amp;sband-&gt;ht_cap, NL80211_BAND_5GHZ,</div><div class='add'>+			     tx_chains, rx_chains);</div><div class='add'>+	if (data-&gt;sku_cap_11ac_enable &amp;&amp; !iwlwifi_mod_params.disable_11ac)</div><div class='add'>+		iwl_init_vht_hw_capab(trans, data, &amp;sband-&gt;vht_cap,</div><div class='add'>+				      tx_chains, rx_chains);</div><div class='add'>+</div><div class='add'>+	if (data-&gt;sku_cap_11ax_enable &amp;&amp; !iwlwifi_mod_params.disable_11ax)</div><div class='add'>+		iwl_init_he_hw_capab(trans, data, sband, tx_chains, rx_chains,</div><div class='add'>+				     fw);</div><div class='add'>+</div><div class='add'>+	sband = &amp;data-&gt;bands[NL80211_BAND_6GHZ];</div><div class='add'>+	if (data-&gt;sku_cap_11ax_enable &amp;&amp; !iwlwifi_mod_params.disable_11ax)</div><div class='add'>+		iwl_init_he_hw_capab(trans, data, sband, tx_chains, rx_chains,</div><div class='add'>+				     fw);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_reinit_cab);</div><div class='add'>+</div><div class='ctx'> static void iwl_init_sbands(struct iwl_trans *trans,</div><div class='ctx'> 			    struct iwl_nvm_data *data,</div><div class='ctx'> 			    const void *nvm_ch_flags, u8 tx_chains,</div><div class='del'>-			    u8 rx_chains, u32 sbands_flags, bool v4)</div><div class='add'>+			    u8 rx_chains, u32 sbands_flags, bool v4,</div><div class='add'>+			    const struct iwl_fw *fw)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = trans-&gt;dev;</div><div class='del'>-	const struct iwl_cfg *cfg = trans-&gt;cfg;</div><div class='ctx'> 	int n_channels;</div><div class='ctx'> 	int n_used = 0;</div><div class='ctx'> 	struct ieee80211_supported_band *sband;</div><div class='ctx'> </div><div class='del'>-	n_channels = iwl_init_channel_map(dev, cfg, data, nvm_ch_flags,</div><div class='add'>+	n_channels = iwl_init_channel_map(trans, fw, data, nvm_ch_flags,</div><div class='ctx'> 					  sbands_flags, v4);</div><div class='ctx'> 	sband = &amp;data-&gt;bands[NL80211_BAND_2GHZ];</div><div class='ctx'> 	sband-&gt;band = NL80211_BAND_2GHZ;</div><div class='hunk'>@@ -816,7 +1106,8 @@ static void iwl_init_sbands(struct iwl_trans *trans,</div><div class='ctx'> 			     tx_chains, rx_chains);</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;sku_cap_11ax_enable &amp;&amp; !iwlwifi_mod_params.disable_11ax)</div><div class='del'>-		iwl_init_he_hw_capab(trans, data, sband, tx_chains, rx_chains);</div><div class='add'>+		iwl_init_he_hw_capab(trans, data, sband, tx_chains, rx_chains,</div><div class='add'>+				     fw);</div><div class='ctx'> </div><div class='ctx'> 	sband = &amp;data-&gt;bands[NL80211_BAND_5GHZ];</div><div class='ctx'> 	sband-&gt;band = NL80211_BAND_5GHZ;</div><div class='hunk'>@@ -831,7 +1122,8 @@ static void iwl_init_sbands(struct iwl_trans *trans,</div><div class='ctx'> 				      tx_chains, rx_chains);</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;sku_cap_11ax_enable &amp;&amp; !iwlwifi_mod_params.disable_11ax)</div><div class='del'>-		iwl_init_he_hw_capab(trans, data, sband, tx_chains, rx_chains);</div><div class='add'>+		iwl_init_he_hw_capab(trans, data, sband, tx_chains, rx_chains,</div><div class='add'>+				     fw);</div><div class='ctx'> </div><div class='ctx'> 	/* 6GHz band. */</div><div class='ctx'> 	sband = &amp;data-&gt;bands[NL80211_BAND_6GHZ];</div><div class='hunk'>@@ -842,56 +1134,65 @@ static void iwl_init_sbands(struct iwl_trans *trans,</div><div class='ctx'> 	n_used += iwl_init_sband_channels(data, sband, n_channels,</div><div class='ctx'> 					  NL80211_BAND_6GHZ);</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;sku_cap_11ax_enable &amp;&amp; !iwlwifi_mod_params.disable_11ax)</div><div class='del'>-		iwl_init_he_hw_capab(trans, data, sband, tx_chains, rx_chains);</div><div class='add'>+	/*</div><div class='add'>+	 * 6 GHz requires WPA3 which requires MFP, which FW cannot do</div><div class='add'>+	 * when fips_enabled, so don't advertise any 6 GHz channels to</div><div class='add'>+	 * avoid spending time on scanning those channels and perhaps</div><div class='add'>+	 * even finding APs there that cannot be used.</div><div class='add'>+	 */</div><div class='add'>+	if (!fips_enabled &amp;&amp; data-&gt;sku_cap_11ax_enable &amp;&amp;</div><div class='add'>+	    !iwlwifi_mod_params.disable_11ax)</div><div class='add'>+		iwl_init_he_hw_capab(trans, data, sband, tx_chains, rx_chains,</div><div class='add'>+				     fw);</div><div class='ctx'> 	else</div><div class='ctx'> 		sband-&gt;n_channels = 0;</div><div class='add'>+</div><div class='ctx'> 	if (n_channels != n_used)</div><div class='ctx'> 		IWL_ERR_DEV(dev, "NVM: used only %d of %d channels\n",</div><div class='ctx'> 			    n_used, n_channels);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_get_sku(const struct iwl_cfg *cfg, const __le16 *nvm_sw,</div><div class='add'>+static int iwl_get_sku(const struct iwl_rf_cfg *cfg, const __le16 *nvm_sw,</div><div class='ctx'> 		       const __le16 *phy_sku)</div><div class='ctx'> {</div><div class='ctx'> 	if (cfg-&gt;nvm_type != IWL_NVM_EXT)</div><div class='ctx'> 		return le16_to_cpup(nvm_sw + SKU);</div><div class='ctx'> </div><div class='del'>-	return le32_to_cpup((__le32 *)(phy_sku + SKU_FAMILY_8000));</div><div class='add'>+	return le32_to_cpup((const __le32 *)(phy_sku + SKU_FAMILY_8000));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_get_nvm_version(const struct iwl_cfg *cfg, const __le16 *nvm_sw)</div><div class='add'>+static int iwl_get_nvm_version(const struct iwl_rf_cfg *cfg, const __le16 *nvm_sw)</div><div class='ctx'> {</div><div class='ctx'> 	if (cfg-&gt;nvm_type != IWL_NVM_EXT)</div><div class='ctx'> 		return le16_to_cpup(nvm_sw + NVM_VERSION);</div><div class='ctx'> 	else</div><div class='del'>-		return le32_to_cpup((__le32 *)(nvm_sw +</div><div class='del'>-					       NVM_VERSION_EXT_NVM));</div><div class='add'>+		return le32_to_cpup((const __le32 *)(nvm_sw +</div><div class='add'>+						     NVM_VERSION_EXT_NVM));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_get_radio_cfg(const struct iwl_cfg *cfg, const __le16 *nvm_sw,</div><div class='add'>+static int iwl_get_radio_cfg(const struct iwl_rf_cfg *cfg, const __le16 *nvm_sw,</div><div class='ctx'> 			     const __le16 *phy_sku)</div><div class='ctx'> {</div><div class='ctx'> 	if (cfg-&gt;nvm_type != IWL_NVM_EXT)</div><div class='ctx'> 		return le16_to_cpup(nvm_sw + RADIO_CFG);</div><div class='ctx'> </div><div class='del'>-	return le32_to_cpup((__le32 *)(phy_sku + RADIO_CFG_FAMILY_EXT_NVM));</div><div class='add'>+	return le32_to_cpup((const __le32 *)(phy_sku + RADIO_CFG_FAMILY_EXT_NVM));</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_get_n_hw_addrs(const struct iwl_cfg *cfg, const __le16 *nvm_sw)</div><div class='add'>+static int iwl_get_n_hw_addrs(const struct iwl_rf_cfg *cfg, const __le16 *nvm_sw)</div><div class='ctx'> {</div><div class='ctx'> 	int n_hw_addr;</div><div class='ctx'> </div><div class='ctx'> 	if (cfg-&gt;nvm_type != IWL_NVM_EXT)</div><div class='ctx'> 		return le16_to_cpup(nvm_sw + N_HW_ADDRS);</div><div class='ctx'> </div><div class='del'>-	n_hw_addr = le32_to_cpup((__le32 *)(nvm_sw + N_HW_ADDRS_FAMILY_8000));</div><div class='add'>+	n_hw_addr = le32_to_cpup((const __le32 *)(nvm_sw + N_HW_ADDRS_FAMILY_8000));</div><div class='ctx'> </div><div class='ctx'> 	return n_hw_addr &amp; N_HW_ADDR_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_set_radio_cfg(const struct iwl_cfg *cfg,</div><div class='add'>+static void iwl_set_radio_cfg(const struct iwl_rf_cfg *cfg,</div><div class='ctx'> 			      struct iwl_nvm_data *data,</div><div class='ctx'> 			      u32 radio_cfg)</div><div class='ctx'> {</div><div class='hunk'>@@ -930,8 +1231,10 @@ static void iwl_flip_hw_address(__le32 mac_addr0, __le32 mac_addr1, u8 *dest)</div><div class='ctx'> static void iwl_set_hw_address_from_csr(struct iwl_trans *trans,</div><div class='ctx'> 					struct iwl_nvm_data *data)</div><div class='ctx'> {</div><div class='del'>-	__le32 mac_addr0 = cpu_to_le32(iwl_read32(trans, CSR_MAC_ADDR0_STRAP));</div><div class='del'>-	__le32 mac_addr1 = cpu_to_le32(iwl_read32(trans, CSR_MAC_ADDR1_STRAP));</div><div class='add'>+	__le32 mac_addr0 = cpu_to_le32(iwl_read32(trans,</div><div class='add'>+						  CSR_MAC_ADDR0_STRAP(trans)));</div><div class='add'>+	__le32 mac_addr1 = cpu_to_le32(iwl_read32(trans,</div><div class='add'>+						  CSR_MAC_ADDR1_STRAP(trans)));</div><div class='ctx'> </div><div class='ctx'> 	iwl_flip_hw_address(mac_addr0, mac_addr1, data-&gt;hw_addr);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -941,14 +1244,14 @@ static void iwl_set_hw_address_from_csr(struct iwl_trans *trans,</div><div class='ctx'> 	if (is_valid_ether_addr(data-&gt;hw_addr))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mac_addr0 = cpu_to_le32(iwl_read32(trans, CSR_MAC_ADDR0_OTP));</div><div class='del'>-	mac_addr1 = cpu_to_le32(iwl_read32(trans, CSR_MAC_ADDR1_OTP));</div><div class='add'>+	mac_addr0 = cpu_to_le32(iwl_read32(trans, CSR_MAC_ADDR0_OTP(trans)));</div><div class='add'>+	mac_addr1 = cpu_to_le32(iwl_read32(trans, CSR_MAC_ADDR1_OTP(trans)));</div><div class='ctx'> </div><div class='ctx'> 	iwl_flip_hw_address(mac_addr0, mac_addr1, data-&gt;hw_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_set_hw_address_family_8000(struct iwl_trans *trans,</div><div class='del'>-					   const struct iwl_cfg *cfg,</div><div class='add'>+					   const struct iwl_rf_cfg *cfg,</div><div class='ctx'> 					   struct iwl_nvm_data *data,</div><div class='ctx'> 					   const __le16 *mac_override,</div><div class='ctx'> 					   const __be16 *nvm_hw)</div><div class='hunk'>@@ -997,11 +1300,12 @@ static void iwl_set_hw_address_family_8000(struct iwl_trans *trans,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_set_hw_address(struct iwl_trans *trans,</div><div class='del'>-			      const struct iwl_cfg *cfg,</div><div class='add'>+			      const struct iwl_rf_cfg *cfg,</div><div class='ctx'> 			      struct iwl_nvm_data *data, const __be16 *nvm_hw,</div><div class='ctx'> 			      const __le16 *mac_override)</div><div class='ctx'> {</div><div class='del'>-	if (cfg-&gt;mac_addr_from_csr) {</div><div class='add'>+	const struct iwl_mac_cfg *mac_cfg = trans-&gt;mac_cfg;</div><div class='add'>+	if (mac_cfg-&gt;base-&gt;mac_addr_from_csr) {</div><div class='ctx'> 		iwl_set_hw_address_from_csr(trans, data);</div><div class='ctx'> 	} else if (cfg-&gt;nvm_type != IWL_NVM_EXT) {</div><div class='ctx'> 		const u8 *hw_addr = (const u8 *)(nvm_hw + HW_ADDR);</div><div class='hunk'>@@ -1023,13 +1327,15 @@ static int iwl_set_hw_address(struct iwl_trans *trans,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	IWL_INFO(trans, "base HW address: %pM\n", data-&gt;hw_addr);</div><div class='add'>+	if (!trans-&gt;csme_own)</div><div class='add'>+		IWL_INFO(trans, "base HW address: %pM, OTP minor version: 0x%x\n",</div><div class='add'>+			 data-&gt;hw_addr, iwl_read_prph(trans, REG_OTP_MINOR));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='del'>-iwl_nvm_no_wide_in_5ghz(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='add'>+iwl_nvm_no_wide_in_5ghz(struct iwl_trans *trans, const struct iwl_rf_cfg *cfg,</div><div class='ctx'> 			const __be16 *nvm_hw)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1041,7 +1347,7 @@ iwl_nvm_no_wide_in_5ghz(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='ctx'> 	 * in 5GHz otherwise the FW will throw a sysassert when we try</div><div class='ctx'> 	 * to use them.</div><div class='ctx'> 	 */</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family == IWL_DEVICE_FAMILY_7000) {</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family == IWL_DEVICE_FAMILY_7000) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Unlike the other sections in the NVM, the hw</div><div class='ctx'> 		 * section uses big-endian.</div><div class='hunk'>@@ -1061,7 +1367,71 @@ iwl_nvm_no_wide_in_5ghz(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct iwl_nvm_data *</div><div class='del'>-iwl_parse_nvm_data(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='add'>+iwl_parse_mei_nvm_data(struct iwl_trans *trans, const struct iwl_rf_cfg *cfg,</div><div class='add'>+		       const struct iwl_mei_nvm *mei_nvm,</div><div class='add'>+		       const struct iwl_fw *fw, u8 tx_ant, u8 rx_ant)</div><div class='add'>+{</div><div class='add'>+	struct iwl_nvm_data *data;</div><div class='add'>+	u32 sbands_flags = 0;</div><div class='add'>+	u8 rx_chains = fw-&gt;valid_rx_ant;</div><div class='add'>+	u8 tx_chains = fw-&gt;valid_rx_ant;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;uhb_supported)</div><div class='add'>+		data = kzalloc(struct_size(data, channels,</div><div class='add'>+					   IWL_NVM_NUM_CHANNELS_UHB),</div><div class='add'>+					   GFP_KERNEL);</div><div class='add'>+	else</div><div class='add'>+		data = kzalloc(struct_size(data, channels,</div><div class='add'>+					   IWL_NVM_NUM_CHANNELS_EXT),</div><div class='add'>+					   GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(mei_nvm-&gt;channels) !=</div><div class='add'>+		     IWL_NVM_NUM_CHANNELS_UHB);</div><div class='add'>+	data-&gt;nvm_version = mei_nvm-&gt;nvm_version;</div><div class='add'>+</div><div class='add'>+	iwl_set_radio_cfg(cfg, data, mei_nvm-&gt;radio_cfg);</div><div class='add'>+	if (data-&gt;valid_tx_ant)</div><div class='add'>+		tx_chains &amp;= data-&gt;valid_tx_ant;</div><div class='add'>+	if (data-&gt;valid_rx_ant)</div><div class='add'>+		rx_chains &amp;= data-&gt;valid_rx_ant;</div><div class='add'>+	if (tx_ant)</div><div class='add'>+		tx_chains &amp;= tx_ant;</div><div class='add'>+	if (rx_ant)</div><div class='add'>+		rx_chains &amp;= rx_ant;</div><div class='add'>+</div><div class='add'>+	data-&gt;sku_cap_mimo_disabled = false;</div><div class='add'>+	data-&gt;sku_cap_band_24ghz_enable = true;</div><div class='add'>+	data-&gt;sku_cap_band_52ghz_enable = true;</div><div class='add'>+	data-&gt;sku_cap_11n_enable =</div><div class='add'>+		!(iwlwifi_mod_params.disable_11n &amp; IWL_DISABLE_HT_ALL);</div><div class='add'>+	data-&gt;sku_cap_11ac_enable = true;</div><div class='add'>+	data-&gt;sku_cap_11ax_enable =</div><div class='add'>+		mei_nvm-&gt;caps &amp; MEI_NVM_CAPS_11AX_SUPPORT;</div><div class='add'>+</div><div class='add'>+	data-&gt;lar_enabled = mei_nvm-&gt;caps &amp; MEI_NVM_CAPS_LARI_SUPPORT;</div><div class='add'>+</div><div class='add'>+	data-&gt;n_hw_addrs = mei_nvm-&gt;n_hw_addrs;</div><div class='add'>+	/* If no valid mac address was found - bail out */</div><div class='add'>+	if (iwl_set_hw_address(trans, cfg, data, NULL, NULL)) {</div><div class='add'>+		kfree(data);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;lar_enabled &amp;&amp;</div><div class='add'>+	    fw_has_capa(&amp;fw-&gt;ucode_capa, IWL_UCODE_TLV_CAPA_LAR_SUPPORT))</div><div class='add'>+		sbands_flags |= IWL_NVM_SBANDS_FLAGS_LAR;</div><div class='add'>+</div><div class='add'>+	iwl_init_sbands(trans, data, mei_nvm-&gt;channels, tx_chains, rx_chains,</div><div class='add'>+			sbands_flags, true, fw);</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_parse_mei_nvm_data);</div><div class='add'>+</div><div class='add'>+struct iwl_nvm_data *</div><div class='add'>+iwl_parse_nvm_data(struct iwl_trans *trans, const struct iwl_rf_cfg *cfg,</div><div class='ctx'> 		   const struct iwl_fw *fw,</div><div class='ctx'> 		   const __be16 *nvm_hw, const __le16 *nvm_sw,</div><div class='ctx'> 		   const __le16 *nvm_calib, const __le16 *regulatory,</div><div class='hunk'>@@ -1124,9 +1494,6 @@ iwl_parse_nvm_data(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='ctx'> 			     &amp;regulatory[NVM_CHANNELS_SDP] :</div><div class='ctx'> 			     &amp;nvm_sw[NVM_CHANNELS];</div><div class='ctx'> </div><div class='del'>-		/* in family 8000 Xtal calibration values moved to OTP */</div><div class='del'>-		data-&gt;xtal_calib[0] = *(nvm_calib + XTAL_CALIB);</div><div class='del'>-		data-&gt;xtal_calib[1] = *(nvm_calib + XTAL_CALIB + 1);</div><div class='ctx'> 		lar_enabled = true;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		u16 lar_offset = data-&gt;nvm_version &lt; 0xE39 ?</div><div class='hunk'>@@ -1154,17 +1521,17 @@ iwl_parse_nvm_data(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='ctx'> 		sbands_flags |= IWL_NVM_SBANDS_FLAGS_NO_WIDE_IN_5GHZ;</div><div class='ctx'> </div><div class='ctx'> 	iwl_init_sbands(trans, data, ch_section, tx_chains, rx_chains,</div><div class='del'>-			sbands_flags, false);</div><div class='add'>+			sbands_flags, false, fw);</div><div class='ctx'> 	data-&gt;calib_version = 255;</div><div class='ctx'> </div><div class='ctx'> 	return data;</div><div class='ctx'> }</div><div class='ctx'> IWL_EXPORT_SYMBOL(iwl_parse_nvm_data);</div><div class='ctx'> </div><div class='del'>-static u32 iwl_nvm_get_regdom_bw_flags(const u16 *nvm_chan,</div><div class='del'>-				       int ch_idx, u16 nvm_flags,</div><div class='del'>-				       struct iwl_reg_capa reg_capa,</div><div class='del'>-				       const struct iwl_cfg *cfg)</div><div class='add'>+VISIBLE_IF_IWLWIFI_KUNIT</div><div class='add'>+u32 iwl_nvm_get_regdom_bw_flags(const u16 *nvm_chan,</div><div class='add'>+				int ch_idx, u16 nvm_flags,</div><div class='add'>+				struct iwl_reg_capa reg_capa)</div><div class='ctx'> {</div><div class='ctx'> 	u32 flags = NL80211_RRF_NO_HT40;</div><div class='ctx'> </div><div class='hunk'>@@ -1174,11 +1541,15 @@ static u32 iwl_nvm_get_regdom_bw_flags(const u16 *nvm_chan,</div><div class='ctx'> 			flags &amp;= ~NL80211_RRF_NO_HT40PLUS;</div><div class='ctx'> 		if (nvm_chan[ch_idx] &gt;= FIRST_2GHZ_HT_MINUS)</div><div class='ctx'> 			flags &amp;= ~NL80211_RRF_NO_HT40MINUS;</div><div class='del'>-	} else if (nvm_flags &amp; NVM_CHANNEL_40MHZ) {</div><div class='add'>+	} else if (ch_idx &lt; NUM_2GHZ_CHANNELS + NUM_5GHZ_CHANNELS &amp;&amp;</div><div class='add'>+		   nvm_flags &amp; NVM_CHANNEL_40MHZ) {</div><div class='ctx'> 		if ((ch_idx - NUM_2GHZ_CHANNELS) % 2 == 0)</div><div class='ctx'> 			flags &amp;= ~NL80211_RRF_NO_HT40PLUS;</div><div class='ctx'> 		else</div><div class='ctx'> 			flags &amp;= ~NL80211_RRF_NO_HT40MINUS;</div><div class='add'>+	} else if (nvm_flags &amp; NVM_CHANNEL_40MHZ) {</div><div class='add'>+		flags &amp;= ~NL80211_RRF_NO_HT40PLUS;</div><div class='add'>+		flags &amp;= ~NL80211_RRF_NO_HT40MINUS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(nvm_flags &amp; NVM_CHANNEL_80MHZ))</div><div class='hunk'>@@ -1195,12 +1566,35 @@ static u32 iwl_nvm_get_regdom_bw_flags(const u16 *nvm_chan,</div><div class='ctx'> 	if (nvm_flags &amp; NVM_CHANNEL_INDOOR_ONLY)</div><div class='ctx'> 		flags |= NL80211_RRF_NO_OUTDOOR;</div><div class='ctx'> </div><div class='add'>+	if (nvm_flags &amp; NVM_CHANNEL_ALLOW_20MHZ_ACTIVITY &amp;&amp;</div><div class='add'>+	    flags &amp; NL80211_RRF_NO_IR)</div><div class='add'>+		flags |= NL80211_RRF_ALLOW_20MHZ_ACTIVITY;</div><div class='add'>+</div><div class='ctx'> 	/* Set the GO concurrent flag only in case that NO_IR is set.</div><div class='ctx'> 	 * Otherwise it is meaningless</div><div class='ctx'> 	 */</div><div class='del'>-	if ((nvm_flags &amp; NVM_CHANNEL_GO_CONCURRENT) &amp;&amp;</div><div class='del'>-	    (flags &amp; NL80211_RRF_NO_IR))</div><div class='del'>-		flags |= NL80211_RRF_GO_CONCURRENT;</div><div class='add'>+	if ((nvm_flags &amp; NVM_CHANNEL_GO_CONCURRENT)) {</div><div class='add'>+		if (flags &amp; NL80211_RRF_NO_IR)</div><div class='add'>+			flags |= NL80211_RRF_GO_CONCURRENT;</div><div class='add'>+		if (flags &amp; NL80211_RRF_DFS) {</div><div class='add'>+			flags |= NL80211_RRF_DFS_CONCURRENT;</div><div class='add'>+			/* Our device doesn't set active bit for DFS channels</div><div class='add'>+			 * however, once marked as DFS no-ir is not needed.</div><div class='add'>+			 */</div><div class='add'>+			flags &amp;= ~NL80211_RRF_NO_IR;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set the AP type for the UHB case. */</div><div class='add'>+	if (nvm_flags &amp; NVM_CHANNEL_VLP) {</div><div class='add'>+		if (!(nvm_flags &amp; NVM_CHANNEL_VLP_AP_NOT_ALLOWED))</div><div class='add'>+			flags |= NL80211_RRF_ALLOW_6GHZ_VLP_AP;</div><div class='add'>+	} else {</div><div class='add'>+		flags |= NL80211_RRF_NO_6GHZ_VLP_CLIENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(nvm_flags &amp; NVM_CHANNEL_AFC))</div><div class='add'>+		flags |= NL80211_RRF_NO_6GHZ_AFC_CLIENT;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * reg_capa is per regulatory domain so apply it for every channel</div><div class='hunk'>@@ -1214,43 +1608,59 @@ static u32 iwl_nvm_get_regdom_bw_flags(const u16 *nvm_chan,</div><div class='ctx'> </div><div class='ctx'> 		if (!reg_capa.allow_160mhz)</div><div class='ctx'> 			flags |= NL80211_RRF_NO_160MHZ;</div><div class='add'>+</div><div class='add'>+		if (!reg_capa.allow_320mhz)</div><div class='add'>+			flags |= NL80211_RRF_NO_320MHZ;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	if (reg_capa.disable_11ax)</div><div class='ctx'> 		flags |= NL80211_RRF_NO_HE;</div><div class='ctx'> </div><div class='add'>+	if (reg_capa.disable_11be)</div><div class='add'>+		flags |= NL80211_RRF_NO_EHT;</div><div class='add'>+</div><div class='ctx'> 	return flags;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_nvm_get_regdom_bw_flags);</div><div class='ctx'> </div><div class='del'>-static struct iwl_reg_capa iwl_get_reg_capa(u16 flags, u8 resp_ver)</div><div class='add'>+static struct iwl_reg_capa iwl_get_reg_capa(u32 flags, u8 resp_ver)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_reg_capa reg_capa;</div><div class='del'>-</div><div class='del'>-	if (resp_ver &gt;= REG_CAPA_V2_RESP_VER) {</div><div class='add'>+	struct iwl_reg_capa reg_capa = {};</div><div class='add'>+</div><div class='add'>+	if (resp_ver &gt;= REG_CAPA_V4_RESP_VER) {</div><div class='add'>+		reg_capa.allow_40mhz = true;</div><div class='add'>+		reg_capa.allow_80mhz = flags &amp; REG_CAPA_V4_80MHZ_ALLOWED;</div><div class='add'>+		reg_capa.allow_160mhz = flags &amp; REG_CAPA_V4_160MHZ_ALLOWED;</div><div class='add'>+		reg_capa.allow_320mhz = flags &amp; REG_CAPA_V4_320MHZ_ALLOWED;</div><div class='add'>+		reg_capa.disable_11ax = flags &amp; REG_CAPA_V4_11AX_DISABLED;</div><div class='add'>+		reg_capa.disable_11be = flags &amp; REG_CAPA_V4_11BE_DISABLED;</div><div class='add'>+	} else if (resp_ver &gt;= REG_CAPA_V2_RESP_VER) {</div><div class='ctx'> 		reg_capa.allow_40mhz = flags &amp; REG_CAPA_V2_40MHZ_ALLOWED;</div><div class='ctx'> 		reg_capa.allow_80mhz = flags &amp; REG_CAPA_V2_80MHZ_ALLOWED;</div><div class='ctx'> 		reg_capa.allow_160mhz = flags &amp; REG_CAPA_V2_160MHZ_ALLOWED;</div><div class='ctx'> 		reg_capa.disable_11ax = flags &amp; REG_CAPA_V2_11AX_DISABLED;</div><div class='ctx'> 	} else {</div><div class='del'>-		reg_capa.allow_40mhz = !(flags &amp; REG_CAPA_40MHZ_FORBIDDEN);</div><div class='del'>-		reg_capa.allow_80mhz = flags &amp; REG_CAPA_80MHZ_ALLOWED;</div><div class='del'>-		reg_capa.allow_160mhz = flags &amp; REG_CAPA_160MHZ_ALLOWED;</div><div class='del'>-		reg_capa.disable_11ax = flags &amp; REG_CAPA_11AX_DISABLED;</div><div class='add'>+		reg_capa.allow_40mhz = !(flags &amp; REG_CAPA_V1_40MHZ_FORBIDDEN);</div><div class='add'>+		reg_capa.allow_80mhz = flags &amp; REG_CAPA_V1_80MHZ_ALLOWED;</div><div class='add'>+		reg_capa.allow_160mhz = flags &amp; REG_CAPA_V1_160MHZ_ALLOWED;</div><div class='add'>+		reg_capa.disable_11ax = flags &amp; REG_CAPA_V1_11AX_DISABLED;</div><div class='ctx'> 	}</div><div class='ctx'> 	return reg_capa;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct ieee80211_regdomain *</div><div class='del'>-iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,</div><div class='add'>+iwl_parse_nvm_mcc_info(struct iwl_trans *trans,</div><div class='ctx'> 		       int num_of_ch, __le32 *channels, u16 fw_mcc,</div><div class='del'>-		       u16 geo_info, u16 cap, u8 resp_ver)</div><div class='add'>+		       u16 geo_info, u32 cap, u8 resp_ver)</div><div class='ctx'> {</div><div class='add'>+	const struct iwl_rf_cfg *cfg = trans-&gt;cfg;</div><div class='add'>+	struct device *dev = trans-&gt;dev;</div><div class='ctx'> 	int ch_idx;</div><div class='ctx'> 	u16 ch_flags;</div><div class='ctx'> 	u32 reg_rule_flags, prev_reg_rule_flags = 0;</div><div class='ctx'> 	const u16 *nvm_chan;</div><div class='ctx'> 	struct ieee80211_regdomain *regd, *copy_rd;</div><div class='ctx'> 	struct ieee80211_reg_rule *rule;</div><div class='del'>-	enum nl80211_band band;</div><div class='ctx'> 	int center_freq, prev_center_freq = 0;</div><div class='ctx'> 	int valid_rules = 0;</div><div class='ctx'> 	bool new_rule;</div><div class='hunk'>@@ -1268,8 +1678,12 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,</div><div class='ctx'> 		nvm_chan = iwl_nvm_channels;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(num_of_ch &gt; max_num_ch))</div><div class='add'>+	if (num_of_ch &gt; max_num_ch) {</div><div class='add'>+		IWL_DEBUG_DEV(dev, IWL_DL_LAR,</div><div class='add'>+			      "Num of channels (%d) is greater than expected. Truncating to %d\n",</div><div class='add'>+			      num_of_ch, max_num_ch);</div><div class='ctx'> 		num_of_ch = max_num_ch;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON_ONCE(num_of_ch &gt; NL80211_MAX_SUPP_REG_RULES))</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='hunk'>@@ -1290,8 +1704,10 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,</div><div class='ctx'> 	reg_capa = iwl_get_reg_capa(cap, resp_ver);</div><div class='ctx'> </div><div class='ctx'> 	for (ch_idx = 0; ch_idx &lt; num_of_ch; ch_idx++) {</div><div class='add'>+		enum nl80211_band band =</div><div class='add'>+			iwl_nl80211_band_from_channel_idx(ch_idx);</div><div class='add'>+</div><div class='ctx'> 		ch_flags = (u16)__le32_to_cpup(channels + ch_idx);</div><div class='del'>-		band = iwl_nl80211_band_from_channel_idx(ch_idx);</div><div class='ctx'> 		center_freq = ieee80211_channel_to_frequency(nvm_chan[ch_idx],</div><div class='ctx'> 							     band);</div><div class='ctx'> 		new_rule = false;</div><div class='hunk'>@@ -1303,8 +1719,8 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		reg_rule_flags = iwl_nvm_get_regdom_bw_flags(nvm_chan, ch_idx,</div><div class='del'>-							     ch_flags, reg_capa,</div><div class='del'>-							     cfg);</div><div class='add'>+							     ch_flags,</div><div class='add'>+							     reg_capa);</div><div class='ctx'> </div><div class='ctx'> 		/* we can't continue the same rule */</div><div class='ctx'> 		if (ch_idx == 0 || prev_reg_rule_flags != reg_rule_flags ||</div><div class='hunk'>@@ -1345,6 +1761,25 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,</div><div class='ctx'> 		reg_query_regdb_wmm(regd-&gt;alpha2, center_freq, rule);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Certain firmware versions might report no valid channels</div><div class='add'>+	 * if booted in RF-kill, i.e. not all calibrations etc. are</div><div class='add'>+	 * running. We'll get out of this situation later when the</div><div class='add'>+	 * rfkill is removed and we update the regdomain again, but</div><div class='add'>+	 * since cfg80211 doesn't accept an empty regdomain, add a</div><div class='add'>+	 * dummy (unusable) rule here in this case so we can init.</div><div class='add'>+	 */</div><div class='add'>+	if (!valid_rules) {</div><div class='add'>+		valid_rules = 1;</div><div class='add'>+		rule = &amp;regd-&gt;reg_rules[valid_rules - 1];</div><div class='add'>+		rule-&gt;freq_range.start_freq_khz = MHZ_TO_KHZ(2412);</div><div class='add'>+		rule-&gt;freq_range.end_freq_khz = MHZ_TO_KHZ(2413);</div><div class='add'>+		rule-&gt;freq_range.max_bandwidth_khz = MHZ_TO_KHZ(1);</div><div class='add'>+		rule-&gt;power_rule.max_antenna_gain = DBI_TO_MBI(6);</div><div class='add'>+		rule-&gt;power_rule.max_eirp =</div><div class='add'>+			DBM_TO_MBM(IWL_DEFAULT_MAX_TX_POWER);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	regd-&gt;n_reg_rules = valid_rules;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1456,7 +1891,7 @@ int iwl_read_external_nvm(struct iwl_trans *trans,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	eof = fw_entry-&gt;data + fw_entry-&gt;size;</div><div class='del'>-	dword_buff = (__le32 *)fw_entry-&gt;data;</div><div class='add'>+	dword_buff = (const __le32 *)fw_entry-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	/* some NVM file will contain a header.</div><div class='ctx'> 	 * The header is identified by 2 dwords header as follow:</div><div class='hunk'>@@ -1468,20 +1903,20 @@ int iwl_read_external_nvm(struct iwl_trans *trans,</div><div class='ctx'> 	if (fw_entry-&gt;size &gt; NVM_HEADER_SIZE &amp;&amp;</div><div class='ctx'> 	    dword_buff[0] == cpu_to_le32(NVM_HEADER_0) &amp;&amp;</div><div class='ctx'> 	    dword_buff[1] == cpu_to_le32(NVM_HEADER_1)) {</div><div class='del'>-		file_sec = (void *)(fw_entry-&gt;data + NVM_HEADER_SIZE);</div><div class='add'>+		file_sec = (const void *)(fw_entry-&gt;data + NVM_HEADER_SIZE);</div><div class='ctx'> 		IWL_INFO(trans, "NVM Version %08X\n", le32_to_cpu(dword_buff[2]));</div><div class='ctx'> 		IWL_INFO(trans, "NVM Manufacturing date %08X\n",</div><div class='ctx'> 			 le32_to_cpu(dword_buff[3]));</div><div class='ctx'> </div><div class='ctx'> 		/* nvm file validation, dword_buff[2] holds the file version */</div><div class='del'>-		if (trans-&gt;trans_cfg-&gt;device_family == IWL_DEVICE_FAMILY_8000 &amp;&amp;</div><div class='del'>-		    CSR_HW_REV_STEP(trans-&gt;hw_rev) == SILICON_C_STEP &amp;&amp;</div><div class='add'>+		if (trans-&gt;mac_cfg-&gt;device_family == IWL_DEVICE_FAMILY_8000 &amp;&amp;</div><div class='add'>+		    trans-&gt;info.hw_rev_step == SILICON_C_STEP &amp;&amp;</div><div class='ctx'> 		    le32_to_cpu(dword_buff[2]) &lt; 0xE4A) {</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		file_sec = (void *)fw_entry-&gt;data;</div><div class='add'>+		file_sec = (const void *)fw_entry-&gt;data;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (true) {</div><div class='hunk'>@@ -1542,14 +1977,14 @@ int iwl_read_external_nvm(struct iwl_trans *trans,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		iwl_nvm_fixups(trans-&gt;hw_id, section_id, temp, section_size);</div><div class='add'>+		iwl_nvm_fixups(trans-&gt;info.hw_id, section_id, temp, section_size);</div><div class='ctx'> </div><div class='ctx'> 		kfree(nvm_sections[section_id].data);</div><div class='ctx'> 		nvm_sections[section_id].data = temp;</div><div class='ctx'> 		nvm_sections[section_id].length = section_size;</div><div class='ctx'> </div><div class='ctx'> 		/* advance to the next section */</div><div class='del'>-		file_sec = (void *)(file_sec-&gt;data + section_size);</div><div class='add'>+		file_sec = (const void *)(file_sec-&gt;data + section_size);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	release_firmware(fw_entry);</div><div class='hunk'>@@ -1558,7 +1993,8 @@ out:</div><div class='ctx'> IWL_EXPORT_SYMBOL(iwl_read_external_nvm);</div><div class='ctx'> </div><div class='ctx'> struct iwl_nvm_data *iwl_get_nvm(struct iwl_trans *trans,</div><div class='del'>-				 const struct iwl_fw *fw)</div><div class='add'>+				 const struct iwl_fw *fw,</div><div class='add'>+				 u8 set_tx_ant, u8 set_rx_ant)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_nvm_get_info cmd = {};</div><div class='ctx'> 	struct iwl_nvm_data *nvm;</div><div class='hunk'>@@ -1572,6 +2008,9 @@ struct iwl_nvm_data *iwl_get_nvm(struct iwl_trans *trans,</div><div class='ctx'> 	bool empty_otp;</div><div class='ctx'> 	u32 mac_flags;</div><div class='ctx'> 	u32 sbands_flags = 0;</div><div class='add'>+	u8 tx_ant;</div><div class='add'>+	u8 rx_ant;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * All the values in iwl_nvm_get_info_rsp v4 are the same as</div><div class='ctx'> 	 * in v3, except for the channel profile part of the</div><div class='hunk'>@@ -1641,6 +2080,8 @@ struct iwl_nvm_data *iwl_get_nvm(struct iwl_trans *trans,</div><div class='ctx'> 		!!(mac_flags &amp; NVM_MAC_SKU_FLAGS_BAND_5_2_ENABLED);</div><div class='ctx'> 	nvm-&gt;sku_cap_mimo_disabled =</div><div class='ctx'> 		!!(mac_flags &amp; NVM_MAC_SKU_FLAGS_MIMO_DISABLED);</div><div class='add'>+	if (trans-&gt;cfg-&gt;eht_supported)</div><div class='add'>+		nvm-&gt;sku_cap_11be_enable = true;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize PHY sku data */</div><div class='ctx'> 	nvm-&gt;valid_tx_ant = (u8)le32_to_cpu(rsp-&gt;phy_sku.tx_chains);</div><div class='hunk'>@@ -1657,11 +2098,16 @@ struct iwl_nvm_data *iwl_get_nvm(struct iwl_trans *trans,</div><div class='ctx'> 	channel_profile = v4 ? (void *)rsp-&gt;regulatory.channel_profile :</div><div class='ctx'> 			  (void *)rsp_v3-&gt;regulatory.channel_profile;</div><div class='ctx'> </div><div class='del'>-	iwl_init_sbands(trans, nvm,</div><div class='del'>-			channel_profile,</div><div class='del'>-			nvm-&gt;valid_tx_ant &amp; fw-&gt;valid_tx_ant,</div><div class='del'>-			nvm-&gt;valid_rx_ant &amp; fw-&gt;valid_rx_ant,</div><div class='del'>-			sbands_flags, v4);</div><div class='add'>+	tx_ant = nvm-&gt;valid_tx_ant &amp; fw-&gt;valid_tx_ant;</div><div class='add'>+	rx_ant = nvm-&gt;valid_rx_ant &amp; fw-&gt;valid_rx_ant;</div><div class='add'>+</div><div class='add'>+	if (set_tx_ant)</div><div class='add'>+		tx_ant &amp;= set_tx_ant;</div><div class='add'>+	if (set_rx_ant)</div><div class='add'>+		rx_ant &amp;= set_rx_ant;</div><div class='add'>+</div><div class='add'>+	iwl_init_sbands(trans, nvm, channel_profile, tx_ant, rx_ant,</div><div class='add'>+			sbands_flags, v4, fw);</div><div class='ctx'> </div><div class='ctx'> 	iwl_free_resp(&amp;hcmd);</div><div class='ctx'> 	return nvm;</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h<br/>index e1f5a9741850..12f28bb0e859 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h</a></div><div class='hunk'>@@ -1,13 +1,14 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2015, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2015, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_nvm_parse_h__</div><div class='ctx'> #define __iwl_nvm_parse_h__</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/cfg80211.h&gt;</div><div class='del'>-#include "iwl-eeprom-parse.h"</div><div class='add'>+#include "iwl-nvm-utils.h"</div><div class='add'>+#include "mei/iwl-mei.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_nvm_sbands_flags - modification flags for the channel profiles</div><div class='hunk'>@@ -21,6 +22,80 @@ enum iwl_nvm_sbands_flags {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct iwl_reg_capa - struct for global regulatory capabilities, Used for</div><div class='add'>+ * handling the different APIs of reg_capa_flags.</div><div class='add'>+ *</div><div class='add'>+ * @allow_40mhz: 11n channel with a width of 40Mhz is allowed</div><div class='add'>+ *	for this regulatory domain.</div><div class='add'>+ * @allow_80mhz: 11ac channel with a width of 80Mhz is allowed</div><div class='add'>+ *	for this regulatory domain (valid only in 5 and 6 Ghz).</div><div class='add'>+ * @allow_160mhz: 11ac channel with a width of 160Mhz is allowed</div><div class='add'>+ *	for this regulatory domain (valid only in 5 and 6 Ghz).</div><div class='add'>+ * @allow_320mhz: 11be channel with a width of 320Mhz is allowed</div><div class='add'>+ *	for this regulatory domain (valid only in 6 Ghz).</div><div class='add'>+ * @disable_11ax: 11ax is forbidden for this regulatory domain.</div><div class='add'>+ * @disable_11be: 11be is forbidden for this regulatory domain.</div><div class='add'>+ */</div><div class='add'>+struct iwl_reg_capa {</div><div class='add'>+	bool allow_40mhz;</div><div class='add'>+	bool allow_80mhz;</div><div class='add'>+	bool allow_160mhz;</div><div class='add'>+	bool allow_320mhz;</div><div class='add'>+	bool disable_11ax;</div><div class='add'>+	bool disable_11be;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_nvm_channel_flags - channel flags in NVM</div><div class='add'>+ * @NVM_CHANNEL_VALID: channel is usable for this SKU/geo</div><div class='add'>+ * @NVM_CHANNEL_IBSS: usable as an IBSS channel and deprecated</div><div class='add'>+ *	when %IWL_NVM_SBANDS_FLAGS_LAR enabled.</div><div class='add'>+ * @NVM_CHANNEL_ALLOW_20MHZ_ACTIVITY: active scanning allowed and</div><div class='add'>+ *	AP allowed only in 20 MHz. Valid only</div><div class='add'>+ *	when %IWL_NVM_SBANDS_FLAGS_LAR enabled.</div><div class='add'>+ * @NVM_CHANNEL_ACTIVE: active scanning allowed and allows IBSS</div><div class='add'>+ *	when %IWL_NVM_SBANDS_FLAGS_LAR enabled.</div><div class='add'>+ * @NVM_CHANNEL_RADAR: radar detection required</div><div class='add'>+ * @NVM_CHANNEL_INDOOR_ONLY: only indoor use is allowed</div><div class='add'>+ * @NVM_CHANNEL_GO_CONCURRENT: GO operation is allowed when connected to BSS</div><div class='add'>+ *	on same channel on 2.4 or same UNII band on 5.2</div><div class='add'>+ * @NVM_CHANNEL_UNIFORM: uniform spreading required</div><div class='add'>+ * @NVM_CHANNEL_20MHZ: 20 MHz channel okay</div><div class='add'>+ * @NVM_CHANNEL_40MHZ: 40 MHz channel okay</div><div class='add'>+ * @NVM_CHANNEL_80MHZ: 80 MHz channel okay</div><div class='add'>+ * @NVM_CHANNEL_160MHZ: 160 MHz channel okay</div><div class='add'>+ * @NVM_CHANNEL_DC_HIGH: DC HIGH required/allowed (?)</div><div class='add'>+ * @NVM_CHANNEL_VLP: client support connection to UHB VLP AP</div><div class='add'>+ * @NVM_CHANNEL_AFC: client support connection to UHB AFC AP</div><div class='add'>+ * @NVM_CHANNEL_VLP_AP_NOT_ALLOWED: UHB VLP AP not allowed,</div><div class='add'>+ *	Valid only when %NVM_CHANNEL_VLP is enabled.</div><div class='add'>+ */</div><div class='add'>+enum iwl_nvm_channel_flags {</div><div class='add'>+	NVM_CHANNEL_VALID			= BIT(0),</div><div class='add'>+	NVM_CHANNEL_IBSS			= BIT(1),</div><div class='add'>+	NVM_CHANNEL_ALLOW_20MHZ_ACTIVITY	= BIT(2),</div><div class='add'>+	NVM_CHANNEL_ACTIVE			= BIT(3),</div><div class='add'>+	NVM_CHANNEL_RADAR			= BIT(4),</div><div class='add'>+	NVM_CHANNEL_INDOOR_ONLY			= BIT(5),</div><div class='add'>+	NVM_CHANNEL_GO_CONCURRENT		= BIT(6),</div><div class='add'>+	NVM_CHANNEL_UNIFORM			= BIT(7),</div><div class='add'>+	NVM_CHANNEL_20MHZ			= BIT(8),</div><div class='add'>+	NVM_CHANNEL_40MHZ			= BIT(9),</div><div class='add'>+	NVM_CHANNEL_80MHZ			= BIT(10),</div><div class='add'>+	NVM_CHANNEL_160MHZ			= BIT(11),</div><div class='add'>+	NVM_CHANNEL_DC_HIGH			= BIT(12),</div><div class='add'>+	NVM_CHANNEL_VLP				= BIT(13),</div><div class='add'>+	NVM_CHANNEL_AFC				= BIT(14),</div><div class='add'>+	NVM_CHANNEL_VLP_AP_NOT_ALLOWED		= BIT(15),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IWLWIFI_KUNIT_TESTS)</div><div class='add'>+u32 iwl_nvm_get_regdom_bw_flags(const u16 *nvm_chan,</div><div class='add'>+				int ch_idx, u16 nvm_flags,</div><div class='add'>+				struct iwl_reg_capa reg_capa);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * iwl_parse_nvm_data - parse NVM data and return values</div><div class='ctx'>  *</div><div class='ctx'>  * This function parses all NVM values we need and then</div><div class='hunk'>@@ -29,7 +104,7 @@ enum iwl_nvm_sbands_flags {</div><div class='ctx'>  * later with iwl_free_nvm_data().</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_nvm_data *</div><div class='del'>-iwl_parse_nvm_data(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='add'>+iwl_parse_nvm_data(struct iwl_trans *trans, const struct iwl_rf_cfg *cfg,</div><div class='ctx'> 		   const struct iwl_fw *fw,</div><div class='ctx'> 		   const __be16 *nvm_hw, const __le16 *nvm_sw,</div><div class='ctx'> 		   const __le16 *nvm_calib, const __le16 *regulatory,</div><div class='hunk'>@@ -37,19 +112,28 @@ iwl_parse_nvm_data(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='ctx'> 		   u8 tx_chains, u8 rx_chains);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * iwl_parse_mcc_info - parse MCC (mobile country code) info coming from FW</div><div class='add'>+ * iwl_parse_nvm_mcc_info - parse MCC (mobile country code) info coming from FW</div><div class='ctx'>  *</div><div class='ctx'>  * This function parses the regulatory channel data received as a</div><div class='del'>- * MCC_UPDATE_CMD command. It returns a newly allocation regulatory domain,</div><div class='del'>- * to be fed into the regulatory core. In case the geo_info is set handle</div><div class='del'>- * accordingly. An ERR_PTR is returned on error.</div><div class='del'>- * If not given to the regulatory core, the user is responsible for freeing</div><div class='del'>- * the regdomain returned here with kfree.</div><div class='add'>+ * MCC_UPDATE_CMD command.</div><div class='add'>+ *</div><div class='add'>+ * Return: a newly allocation regulatory domain, to be given to the regulatory</div><div class='add'>+ *	core. In case the geo_info is set handle accordingly. An ERR_PTR is</div><div class='add'>+ *	returned on error. If not given to the regulatory core, the user is</div><div class='add'>+ *	responsible for freeing the regdomain returned here with kfree().</div><div class='add'>+ *</div><div class='add'>+ * @trans: the transport</div><div class='add'>+ * @num_of_ch: the number of channels</div><div class='add'>+ * @channels: channel map</div><div class='add'>+ * @fw_mcc: firmware country code</div><div class='add'>+ * @geo_info: geo info value</div><div class='add'>+ * @cap: capability</div><div class='add'>+ * @resp_ver: FW response version</div><div class='ctx'>  */</div><div class='ctx'> struct ieee80211_regdomain *</div><div class='del'>-iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,</div><div class='add'>+iwl_parse_nvm_mcc_info(struct iwl_trans *trans,</div><div class='ctx'> 		       int num_of_ch, __le32 *channels, u16 fw_mcc,</div><div class='del'>-		       u16 geo_info, u16 cap, u8 resp_ver);</div><div class='add'>+		       u16 geo_info, u32 cap, u8 resp_ver);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_nvm_section - describes an NVM section in memory.</div><div class='hunk'>@@ -57,6 +141,8 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,</div><div class='ctx'>  * This struct holds an NVM section read from the NIC using NVM_ACCESS_CMD,</div><div class='ctx'>  * and saved for later use by the driver. Not all NVM sections are saved</div><div class='ctx'>  * this way, only the needed ones.</div><div class='add'>+ * @length: length of the section</div><div class='add'>+ * @data: section data</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_nvm_section {</div><div class='ctx'> 	u16 length;</div><div class='hunk'>@@ -65,6 +151,10 @@ struct iwl_nvm_section {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * iwl_read_external_nvm - Reads external NVM from a file into nvm_sections</div><div class='add'>+ * @trans: the transport</div><div class='add'>+ * @nvm_file_name: the filename to request</div><div class='add'>+ * @nvm_sections: sections data to fill</div><div class='add'>+ * Return: 0 on success or an error code</div><div class='ctx'>  */</div><div class='ctx'> int iwl_read_external_nvm(struct iwl_trans *trans,</div><div class='ctx'> 			  const char *nvm_file_name,</div><div class='hunk'>@@ -72,13 +162,28 @@ int iwl_read_external_nvm(struct iwl_trans *trans,</div><div class='ctx'> void iwl_nvm_fixups(u32 hw_id, unsigned int section, u8 *data,</div><div class='ctx'> 		    unsigned int len);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * iwl_get_nvm - retrieve NVM data from firmware</div><div class='ctx'>  *</div><div class='ctx'>  * Allocates a new iwl_nvm_data structure, fills it with</div><div class='ctx'>  * NVM data, and returns it to caller.</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_nvm_data *iwl_get_nvm(struct iwl_trans *trans,</div><div class='del'>-				 const struct iwl_fw *fw);</div><div class='add'>+				 const struct iwl_fw *fw,</div><div class='add'>+				 u8 set_tx_ant, u8 set_rx_ant);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * iwl_parse_mei_nvm_data - parse the mei_nvm_data and get an iwl_nvm_data</div><div class='add'>+ */</div><div class='add'>+struct iwl_nvm_data *</div><div class='add'>+iwl_parse_mei_nvm_data(struct iwl_trans *trans, const struct iwl_rf_cfg *cfg,</div><div class='add'>+		       const struct iwl_mei_nvm *mei_nvm,</div><div class='add'>+		       const struct iwl_fw *fw, u8 set_tx_ant, u8 set_rx_ant);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * iwl_reinit_cab - to be called when the tx_chains or rx_chains are modified</div><div class='add'>+ */</div><div class='add'>+void iwl_reinit_cab(struct iwl_trans *trans, struct iwl_nvm_data *data,</div><div class='add'>+		    u8 tx_chains, u8 rx_chains, const struct iwl_fw *fw);</div><div class='ctx'> </div><div class='ctx'> #endif /* __iwl_nvm_parse_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-utils.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-utils.c<br/>new file mode 100644<br/>index 000000000000..ec312c90ff85<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-nvm-utils.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-nvm-utils.c</a></div><div class='hunk'>@@ -0,0 +1,119 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2005-2014, 2018-2021, 2023, 2025 Intel Corporation</div><div class='add'>+ * Copyright (C) 2015 Intel Mobile Communications GmbH</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include "iwl-drv.h"</div><div class='add'>+#include "iwl-modparams.h"</div><div class='add'>+#include "iwl-nvm-utils.h"</div><div class='add'>+</div><div class='add'>+int iwl_init_sband_channels(struct iwl_nvm_data *data,</div><div class='add'>+			    struct ieee80211_supported_band *sband,</div><div class='add'>+			    int n_channels, enum nl80211_band band)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_channel *chan = &amp;data-&gt;channels[0];</div><div class='add'>+	int n = 0, idx = 0;</div><div class='add'>+</div><div class='add'>+	while (idx &lt; n_channels &amp;&amp; chan-&gt;band != band)</div><div class='add'>+		chan = &amp;data-&gt;channels[++idx];</div><div class='add'>+</div><div class='add'>+	sband-&gt;channels = &amp;data-&gt;channels[idx];</div><div class='add'>+</div><div class='add'>+	while (idx &lt; n_channels &amp;&amp; chan-&gt;band == band) {</div><div class='add'>+		chan = &amp;data-&gt;channels[++idx];</div><div class='add'>+		n++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sband-&gt;n_channels = n;</div><div class='add'>+</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_init_sband_channels);</div><div class='add'>+</div><div class='add'>+#define MAX_BIT_RATE_40_MHZ	150 /* Mbps */</div><div class='add'>+#define MAX_BIT_RATE_20_MHZ	72 /* Mbps */</div><div class='add'>+</div><div class='add'>+void iwl_init_ht_hw_capab(struct iwl_trans *trans,</div><div class='add'>+			  struct iwl_nvm_data *data,</div><div class='add'>+			  struct ieee80211_sta_ht_cap *ht_info,</div><div class='add'>+			  enum nl80211_band band,</div><div class='add'>+			  u8 tx_chains, u8 rx_chains)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_rf_cfg *cfg = trans-&gt;cfg;</div><div class='add'>+	int max_bit_rate = 0;</div><div class='add'>+</div><div class='add'>+	tx_chains = hweight8(tx_chains);</div><div class='add'>+	if (cfg-&gt;rx_with_siso_diversity)</div><div class='add'>+		rx_chains = 1;</div><div class='add'>+	else</div><div class='add'>+		rx_chains = hweight8(rx_chains);</div><div class='add'>+</div><div class='add'>+	if (!(data-&gt;sku_cap_11n_enable) ||</div><div class='add'>+	    (iwlwifi_mod_params.disable_11n &amp; IWL_DISABLE_HT_ALL) ||</div><div class='add'>+	    /* there are no devices with HT but without HT40 entirely */</div><div class='add'>+	    !cfg-&gt;ht_params.ht40_bands) {</div><div class='add'>+		ht_info-&gt;ht_supported = false;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;sku_cap_mimo_disabled)</div><div class='add'>+		rx_chains = 1;</div><div class='add'>+</div><div class='add'>+	ht_info-&gt;ht_supported = true;</div><div class='add'>+	ht_info-&gt;cap = IEEE80211_HT_CAP_DSSSCCK40;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;ht_params.stbc) {</div><div class='add'>+		ht_info-&gt;cap |= (1 &lt;&lt; IEEE80211_HT_CAP_RX_STBC_SHIFT);</div><div class='add'>+</div><div class='add'>+		if (tx_chains &gt; 1)</div><div class='add'>+			ht_info-&gt;cap |= IEEE80211_HT_CAP_TX_STBC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;ht_params.ldpc)</div><div class='add'>+		ht_info-&gt;cap |= IEEE80211_HT_CAP_LDPC_CODING;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;mq_rx_supported ||</div><div class='add'>+	    iwlwifi_mod_params.amsdu_size &gt;= IWL_AMSDU_8K)</div><div class='add'>+		ht_info-&gt;cap |= IEEE80211_HT_CAP_MAX_AMSDU;</div><div class='add'>+</div><div class='add'>+	ht_info-&gt;ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;</div><div class='add'>+	ht_info-&gt;ampdu_density = IEEE80211_HT_MPDU_DENSITY_4;</div><div class='add'>+</div><div class='add'>+	ht_info-&gt;mcs.rx_mask[0] = 0xFF;</div><div class='add'>+	ht_info-&gt;mcs.rx_mask[1] = 0x00;</div><div class='add'>+	ht_info-&gt;mcs.rx_mask[2] = 0x00;</div><div class='add'>+</div><div class='add'>+	if (rx_chains &gt;= 2)</div><div class='add'>+		ht_info-&gt;mcs.rx_mask[1] = 0xFF;</div><div class='add'>+	if (rx_chains &gt;= 3)</div><div class='add'>+		ht_info-&gt;mcs.rx_mask[2] = 0xFF;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;ht_params.ht_greenfield_support)</div><div class='add'>+		ht_info-&gt;cap |= IEEE80211_HT_CAP_GRN_FLD;</div><div class='add'>+	ht_info-&gt;cap |= IEEE80211_HT_CAP_SGI_20;</div><div class='add'>+</div><div class='add'>+	max_bit_rate = MAX_BIT_RATE_20_MHZ;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;ht_params.ht40_bands &amp; BIT(band)) {</div><div class='add'>+		ht_info-&gt;cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;</div><div class='add'>+		ht_info-&gt;cap |= IEEE80211_HT_CAP_SGI_40;</div><div class='add'>+		max_bit_rate = MAX_BIT_RATE_40_MHZ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Highest supported Rx data rate */</div><div class='add'>+	max_bit_rate *= rx_chains;</div><div class='add'>+	WARN_ON(max_bit_rate &amp; ~IEEE80211_HT_MCS_RX_HIGHEST_MASK);</div><div class='add'>+	ht_info-&gt;mcs.rx_highest = cpu_to_le16(max_bit_rate);</div><div class='add'>+</div><div class='add'>+	/* Tx MCS capabilities */</div><div class='add'>+	ht_info-&gt;mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;</div><div class='add'>+	if (tx_chains != rx_chains) {</div><div class='add'>+		ht_info-&gt;mcs.tx_params |= IEEE80211_HT_MCS_TX_RX_DIFF;</div><div class='add'>+		ht_info-&gt;mcs.tx_params |= ((tx_chains - 1) &lt;&lt;</div><div class='add'>+				IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_init_ht_hw_capab);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.h b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-utils.h<br/>index 0efffb6eeb1e..ac0a29a1c31f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-nvm-utils.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-nvm-utils.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2014, 2018 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2014, 2018, 2020-2023 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_eeprom_parse_h__</div><div class='hunk'>@@ -31,6 +31,7 @@ struct iwl_nvm_data {</div><div class='ctx'> 	bool sku_cap_amt_enable;</div><div class='ctx'> 	bool sku_cap_ipan_enable;</div><div class='ctx'> 	bool sku_cap_mimo_disabled;</div><div class='add'>+	bool sku_cap_11be_enable;</div><div class='ctx'> </div><div class='ctx'> 	u16 radio_cfg_type;</div><div class='ctx'> 	u8 radio_cfg_step;</div><div class='hunk'>@@ -46,35 +47,17 @@ struct iwl_nvm_data {</div><div class='ctx'> 	struct ieee80211_supported_band bands[NUM_NL80211_BANDS];</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * iftype data for low (2.4 GHz) and high (5 and 6 GHz) bands,</div><div class='del'>-	 * we can use the same for 5 and 6 GHz bands because they have</div><div class='del'>-	 * the same data</div><div class='add'>+	 * iftype data for low (2.4 GHz) high (5 GHz) and uhb (6 GHz) bands</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct ieee80211_sband_iftype_data low[2];</div><div class='ctx'> 		struct ieee80211_sband_iftype_data high[2];</div><div class='add'>+		struct ieee80211_sband_iftype_data uhb[2];</div><div class='ctx'> 	} iftd;</div><div class='ctx'> </div><div class='ctx'> 	struct ieee80211_channel channels[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * iwl_parse_eeprom_data - parse EEPROM data and return values</div><div class='del'>- *</div><div class='del'>- * @dev: device pointer we're parsing for, for debug only</div><div class='del'>- * @cfg: device configuration for parsing and overrides</div><div class='del'>- * @eeprom: the EEPROM data</div><div class='del'>- * @eeprom_size: length of the EEPROM data</div><div class='del'>- *</div><div class='del'>- * This function parses all EEPROM values we need and then</div><div class='del'>- * returns a (newly allocated) struct containing all the</div><div class='del'>- * relevant values for driver use. The struct must be freed</div><div class='del'>- * later with iwl_free_nvm_data().</div><div class='del'>- */</div><div class='del'>-struct iwl_nvm_data *</div><div class='del'>-iwl_parse_eeprom_data(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='del'>-		      const u8 *eeprom, size_t eeprom_size);</div><div class='del'>-</div><div class='ctx'> int iwl_init_sband_channels(struct iwl_nvm_data *data,</div><div class='ctx'> 			    struct ieee80211_supported_band *sband,</div><div class='ctx'> 			    int n_channels, enum nl80211_band band);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h b/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h<br/>index cf9c64090014..df6341dfc4a1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2014, 2018-2021 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2014, 2018-2021, 2024-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2015 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -17,7 +17,7 @@ struct sk_buff;</div><div class='ctx'> struct iwl_device_cmd;</div><div class='ctx'> struct iwl_rx_cmd_buffer;</div><div class='ctx'> struct iwl_fw;</div><div class='del'>-struct iwl_cfg;</div><div class='add'>+struct iwl_rf_cfg;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * DOC: Operational mode - what is it ?</div><div class='hunk'>@@ -45,6 +45,63 @@ struct iwl_cfg;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * enum iwl_fw_error_type - FW error types/sources</div><div class='add'>+ * @IWL_ERR_TYPE_IRQ: "normal" FW error through an IRQ</div><div class='add'>+ * @IWL_ERR_TYPE_NMI_FORCED: NMI was forced by driver</div><div class='add'>+ * @IWL_ERR_TYPE_RESET_HS_TIMEOUT: reset handshake timed out,</div><div class='add'>+ *	any debug collection must happen synchronously as</div><div class='add'>+ *	the device will be shut down</div><div class='add'>+ * @IWL_ERR_TYPE_CMD_QUEUE_FULL: command queue was full</div><div class='add'>+ * @IWL_ERR_TYPE_TOP_RESET_BY_BT: TOP reset initiated by BT</div><div class='add'>+ * @IWL_ERR_TYPE_TOP_FATAL_ERROR: TOP fatal error</div><div class='add'>+ * @IWL_ERR_TYPE_TOP_RESET_FAILED: TOP reset failed</div><div class='add'>+ * @IWL_ERR_TYPE_DEBUGFS: error/reset indication from debugfs</div><div class='add'>+ */</div><div class='add'>+enum iwl_fw_error_type {</div><div class='add'>+	IWL_ERR_TYPE_IRQ,</div><div class='add'>+	IWL_ERR_TYPE_NMI_FORCED,</div><div class='add'>+	IWL_ERR_TYPE_RESET_HS_TIMEOUT,</div><div class='add'>+	IWL_ERR_TYPE_CMD_QUEUE_FULL,</div><div class='add'>+	IWL_ERR_TYPE_TOP_RESET_BY_BT,</div><div class='add'>+	IWL_ERR_TYPE_TOP_FATAL_ERROR,</div><div class='add'>+	IWL_ERR_TYPE_TOP_RESET_FAILED,</div><div class='add'>+	IWL_ERR_TYPE_DEBUGFS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_fw_error_context - error dump context</div><div class='add'>+ * @IWL_ERR_CONTEXT_WORKER: regular from worker context,</div><div class='add'>+ *	opmode must acquire locks and must also check</div><div class='add'>+ *	for @IWL_ERR_CONTEXT_ABORT after acquiring locks</div><div class='add'>+ * @IWL_ERR_CONTEXT_FROM_OPMODE: context is in a call</div><div class='add'>+ *	originating from the opmode, e.g. while resetting</div><div class='add'>+ *	or stopping the device, so opmode must not acquire</div><div class='add'>+ *	any locks</div><div class='add'>+ * @IWL_ERR_CONTEXT_ABORT: after lock acquisition, indicates</div><div class='add'>+ *	that the dump already happened via another callback</div><div class='add'>+ *	(currently only while stopping the device) via the</div><div class='add'>+ *	@IWL_ERR_CONTEXT_FROM_OPMODE context, and this call</div><div class='add'>+ *	must be aborted</div><div class='add'>+ */</div><div class='add'>+enum iwl_fw_error_context {</div><div class='add'>+	IWL_ERR_CONTEXT_WORKER,</div><div class='add'>+	IWL_ERR_CONTEXT_FROM_OPMODE,</div><div class='add'>+	IWL_ERR_CONTEXT_ABORT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_fw_error_dump_mode - error dump mode for callback</div><div class='add'>+ * @type: The reason for the dump, per &amp;enum iwl_fw_error_type.</div><div class='add'>+ * @context: The context for the dump, may also indicate this</div><div class='add'>+ *	call needs to be skipped. This MUST be checked before</div><div class='add'>+ *	and after acquiring any locks in the op-mode!</div><div class='add'>+ */</div><div class='add'>+struct iwl_fw_error_dump_mode {</div><div class='add'>+	enum iwl_fw_error_type type;</div><div class='add'>+	enum iwl_fw_error_context context;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_op_mode_ops - op_mode specific operations</div><div class='ctx'>  *</div><div class='ctx'>  * The op_mode exports its ops so that external components can start it and</div><div class='hunk'>@@ -64,31 +121,38 @@ struct iwl_cfg;</div><div class='ctx'>  *	received on the RSS queue(s). The queue parameter indicates which of the</div><div class='ctx'>  *	RSS queues received this frame; it will always be non-zero.</div><div class='ctx'>  *	This method must not sleep.</div><div class='del'>- * @async_cb: called when an ASYNC command with CMD_WANT_ASYNC_CALLBACK set</div><div class='del'>- *	completes. Must be atomic.</div><div class='ctx'>  * @queue_full: notifies that a HW queue is full.</div><div class='ctx'>  *	Must be atomic and called with BH disabled.</div><div class='ctx'>  * @queue_not_full: notifies that a HW queue is not full any more.</div><div class='ctx'>  *	Must be atomic and called with BH disabled.</div><div class='del'>- * @hw_rf_kill:notifies of a change in the HW rf kill switch. True means that</div><div class='add'>+ * @hw_rf_kill: notifies of a change in the HW rf kill switch. True means that</div><div class='ctx'>  *	the radio is killed. Return %true if the device should be stopped by</div><div class='ctx'>  *	the transport immediately after the call. May sleep.</div><div class='add'>+ *	Note that this must not return %true for newer devices using gen2 PCIe</div><div class='add'>+ *	transport.</div><div class='ctx'>  * @free_skb: allows the transport layer to free skbs that haven't been</div><div class='ctx'>  *	reclaimed by the op_mode. This can happen when the driver is freed and</div><div class='ctx'>  *	there are Tx packets pending in the transport layer.</div><div class='ctx'>  *	Must be atomic</div><div class='del'>- * @nic_error: error notification. Must be atomic and must be called with BH</div><div class='del'>- *	disabled.</div><div class='del'>- * @cmd_queue_full: Called when the command queue gets full. Must be atomic and</div><div class='del'>- *	called with BH disabled.</div><div class='add'>+ * @nic_error: error notification. Must be atomic, the op mode should handle</div><div class='add'>+ *	the error (e.g. abort notification waiters) and print the error if</div><div class='add'>+ *	applicable</div><div class='add'>+ * @dump_error: NIC error dump collection (can sleep, synchronous)</div><div class='add'>+ * @sw_reset: (maybe) initiate a software reset, return %true if started</div><div class='ctx'>  * @nic_config: configure NIC, called before firmware is started.</div><div class='ctx'>  *	May sleep</div><div class='ctx'>  * @wimax_active: invoked when WiMax becomes active. May sleep</div><div class='ctx'>  * @time_point: called when transport layer wants to collect debug data</div><div class='add'>+ * @device_powered_off: called upon resume from hibernation but not only.</div><div class='add'>+ *	Op_mode needs to reset its internal state because the device did not</div><div class='add'>+ *	survive the system state transition. The firmware is no longer running,</div><div class='add'>+ *	etc...</div><div class='add'>+ * @dump: Op_mode needs to collect the firmware dump upon this handler</div><div class='add'>+ *	being called.</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_op_mode_ops {</div><div class='ctx'> 	struct iwl_op_mode *(*start)(struct iwl_trans *trans,</div><div class='del'>-				     const struct iwl_cfg *cfg,</div><div class='add'>+				     const struct iwl_rf_cfg *cfg,</div><div class='ctx'> 				     const struct iwl_fw *fw,</div><div class='ctx'> 				     struct dentry *dbgfs_dir);</div><div class='ctx'> 	void (*stop)(struct iwl_op_mode *op_mode);</div><div class='hunk'>@@ -96,19 +160,23 @@ struct iwl_op_mode_ops {</div><div class='ctx'> 		   struct iwl_rx_cmd_buffer *rxb);</div><div class='ctx'> 	void (*rx_rss)(struct iwl_op_mode *op_mode, struct napi_struct *napi,</div><div class='ctx'> 		       struct iwl_rx_cmd_buffer *rxb, unsigned int queue);</div><div class='del'>-	void (*async_cb)(struct iwl_op_mode *op_mode,</div><div class='del'>-			 const struct iwl_device_cmd *cmd);</div><div class='ctx'> 	void (*queue_full)(struct iwl_op_mode *op_mode, int queue);</div><div class='ctx'> 	void (*queue_not_full)(struct iwl_op_mode *op_mode, int queue);</div><div class='ctx'> 	bool (*hw_rf_kill)(struct iwl_op_mode *op_mode, bool state);</div><div class='ctx'> 	void (*free_skb)(struct iwl_op_mode *op_mode, struct sk_buff *skb);</div><div class='del'>-	void (*nic_error)(struct iwl_op_mode *op_mode);</div><div class='del'>-	void (*cmd_queue_full)(struct iwl_op_mode *op_mode);</div><div class='add'>+	void (*nic_error)(struct iwl_op_mode *op_mode,</div><div class='add'>+			  enum iwl_fw_error_type type);</div><div class='add'>+	void (*dump_error)(struct iwl_op_mode *op_mode,</div><div class='add'>+			   struct iwl_fw_error_dump_mode *mode);</div><div class='add'>+	bool (*sw_reset)(struct iwl_op_mode *op_mode,</div><div class='add'>+			 enum iwl_fw_error_type type);</div><div class='ctx'> 	void (*nic_config)(struct iwl_op_mode *op_mode);</div><div class='ctx'> 	void (*wimax_active)(struct iwl_op_mode *op_mode);</div><div class='ctx'> 	void (*time_point)(struct iwl_op_mode *op_mode,</div><div class='ctx'> 			   enum iwl_fw_ini_time_point tp_id,</div><div class='ctx'> 			   union iwl_dbg_tlv_tp_data *tp_data);</div><div class='add'>+	void (*device_powered_off)(struct iwl_op_mode *op_mode);</div><div class='add'>+	void (*dump)(struct iwl_op_mode *op_mode);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int iwl_opmode_register(const char *name, const struct iwl_op_mode_ops *ops);</div><div class='hunk'>@@ -117,6 +185,7 @@ void iwl_opmode_deregister(const char *name);</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_op_mode - operational mode</div><div class='ctx'>  * @ops: pointer to its own ops</div><div class='add'>+ * @op_mode_specific: per-opmode data</div><div class='ctx'>  *</div><div class='ctx'>  * This holds an implementation of the mac80211 / fw API.</div><div class='ctx'>  */</div><div class='hunk'>@@ -147,13 +216,6 @@ static inline void iwl_op_mode_rx_rss(struct iwl_op_mode *op_mode,</div><div class='ctx'> 	op_mode-&gt;ops-&gt;rx_rss(op_mode, napi, rxb, queue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void iwl_op_mode_async_cb(struct iwl_op_mode *op_mode,</div><div class='del'>-					const struct iwl_device_cmd *cmd)</div><div class='del'>-{</div><div class='del'>-	if (op_mode-&gt;ops-&gt;async_cb)</div><div class='del'>-		op_mode-&gt;ops-&gt;async_cb(op_mode, cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void iwl_op_mode_queue_full(struct iwl_op_mode *op_mode,</div><div class='ctx'> 					  int queue)</div><div class='ctx'> {</div><div class='hunk'>@@ -181,20 +243,29 @@ static inline void iwl_op_mode_free_skb(struct iwl_op_mode *op_mode,</div><div class='ctx'> 	op_mode-&gt;ops-&gt;free_skb(op_mode, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void iwl_op_mode_nic_error(struct iwl_op_mode *op_mode)</div><div class='add'>+static inline void iwl_op_mode_nic_error(struct iwl_op_mode *op_mode,</div><div class='add'>+					 enum iwl_fw_error_type type)</div><div class='ctx'> {</div><div class='del'>-	op_mode-&gt;ops-&gt;nic_error(op_mode);</div><div class='add'>+	op_mode-&gt;ops-&gt;nic_error(op_mode, type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void iwl_op_mode_cmd_queue_full(struct iwl_op_mode *op_mode)</div><div class='add'>+static inline void iwl_op_mode_dump_error(struct iwl_op_mode *op_mode,</div><div class='add'>+					  struct iwl_fw_error_dump_mode *mode)</div><div class='ctx'> {</div><div class='del'>-	op_mode-&gt;ops-&gt;cmd_queue_full(op_mode);</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(mode-&gt;type == IWL_ERR_TYPE_TOP_RESET_BY_BT))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (op_mode-&gt;ops-&gt;dump_error)</div><div class='add'>+		op_mode-&gt;ops-&gt;dump_error(op_mode, mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void iwl_op_mode_nic_config(struct iwl_op_mode *op_mode)</div><div class='ctx'> {</div><div class='ctx'> 	might_sleep();</div><div class='del'>-	op_mode-&gt;ops-&gt;nic_config(op_mode);</div><div class='add'>+	if (op_mode-&gt;ops-&gt;nic_config)</div><div class='add'>+		op_mode-&gt;ops-&gt;nic_config(op_mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void iwl_op_mode_wimax_active(struct iwl_op_mode *op_mode)</div><div class='hunk'>@@ -212,4 +283,18 @@ static inline void iwl_op_mode_time_point(struct iwl_op_mode *op_mode,</div><div class='ctx'> 	op_mode-&gt;ops-&gt;time_point(op_mode, tp_id, tp_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void iwl_op_mode_device_powered_off(struct iwl_op_mode *op_mode)</div><div class='add'>+{</div><div class='add'>+	if (!op_mode || !op_mode-&gt;ops || !op_mode-&gt;ops-&gt;device_powered_off)</div><div class='add'>+		return;</div><div class='add'>+	op_mode-&gt;ops-&gt;device_powered_off(op_mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void iwl_op_mode_dump(struct iwl_op_mode *op_mode)</div><div class='add'>+{</div><div class='add'>+	if (!op_mode || !op_mode-&gt;ops || !op_mode-&gt;ops-&gt;dump)</div><div class='add'>+		return;</div><div class='add'>+	op_mode-&gt;ops-&gt;dump(op_mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* __iwl_op_mode_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c b/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c<br/>index 5378315d0179..0a93ac769f66 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2014, 2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2014, 2020-2021 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2016 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -13,8 +13,6 @@</div><div class='ctx'> #include "iwl-op-mode.h"</div><div class='ctx'> #include "iwl-trans.h"</div><div class='ctx'> </div><div class='del'>-#define CHANNEL_NUM_SIZE	4	/* num of channels in calib_ch size */</div><div class='del'>-</div><div class='ctx'> struct iwl_phy_db_entry {</div><div class='ctx'> 	u16	size;</div><div class='ctx'> 	u8	*data;</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-prph.h b/drivers/net/wireless/intel/iwlwifi/iwl-prph.h<br/>index 3ce77e4eb7e3..a7214ddcfaf5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-prph.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-prph.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-prph.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-prph.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -96,7 +96,7 @@</div><div class='ctx'> #define DTSC_PTAT_AVG		(0x00a10650)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Tx Scheduler</div><div class='ctx'>  *</div><div class='ctx'>  * The Tx Scheduler selects the next frame to be transmitted, choosing TFDs</div><div class='hunk'>@@ -169,7 +169,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #define SCD_MEM_LOWER_BOUND		(0x0000)</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Max Tx window size is the max number of contiguous TFDs that the scheduler</div><div class='ctx'>  * can keep track of at one time when creating block-ack chains of frames.</div><div class='ctx'>  * Note that "64" matches the number of ack bits in a block-ack packet.</div><div class='hunk'>@@ -347,16 +347,46 @@</div><div class='ctx'> #define RADIO_REG_SYS_MANUAL_DFT_0	0xAD4078</div><div class='ctx'> #define RFIC_REG_RD			0xAD0470</div><div class='ctx'> #define WFPM_CTRL_REG			0xA03030</div><div class='add'>+#define WFPM_OTP_CFG1_ADDR		0x00a03098</div><div class='add'>+#define WFPM_OTP_CFG1_IS_JACKET_BIT	BIT(5)</div><div class='add'>+#define WFPM_OTP_CFG1_IS_CDB_BIT	BIT(4)</div><div class='add'>+#define WFPM_OTP_BZ_BNJ_JACKET_BIT	5</div><div class='add'>+#define WFPM_OTP_BZ_BNJ_CDB_BIT		4</div><div class='add'>+#define WFPM_OTP_CFG1_IS_JACKET(_val)   (((_val) &amp; 0x00000020) &gt;&gt; WFPM_OTP_BZ_BNJ_JACKET_BIT)</div><div class='add'>+#define WFPM_OTP_CFG1_IS_CDB(_val)      (((_val) &amp; 0x00000010) &gt;&gt; WFPM_OTP_BZ_BNJ_CDB_BIT)</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #define WFPM_GP2			0xA030B4</div><div class='add'>+</div><div class='add'>+/* DBGI SRAM Register details */</div><div class='add'>+#define DBGI_SRAM_TARGET_ACCESS_RDATA_LSB		0x00A2E154</div><div class='add'>+#define DBGI_SRAM_TARGET_ACCESS_RDATA_MSB		0x00A2E158</div><div class='add'>+#define DBGI_SRAM_FIFO_POINTERS				0x00A2E148</div><div class='add'>+#define DBGI_SRAM_FIFO_POINTERS_WR_PTR_MSK		0x00000FFF</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='del'>-	ENABLE_WFPM = BIT(31),</div><div class='ctx'> 	WFPM_AUX_CTL_AUX_IF_MAC_OWNER_MSK	= 0x80000000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define CNVI_AUX_MISC_CHIP				0xA200B0</div><div class='add'>+#define CNVI_AUX_MISC_CHIP			0xA200B0</div><div class='add'>+#define CNVI_AUX_MISC_CHIP_MAC_STEP(_val)	(((_val) &amp; 0xf000000) &gt;&gt; 24)</div><div class='add'>+#define CNVI_AUX_MISC_CHIP_PROD_TYPE(_val)	((_val) &amp; 0xfff)</div><div class='add'>+#define CNVI_AUX_MISC_CHIP_PROD_TYPE_GL		0x910</div><div class='add'>+#define CNVI_AUX_MISC_CHIP_PROD_TYPE_BZ_U	0x930</div><div class='add'>+#define CNVI_AUX_MISC_CHIP_PROD_TYPE_BZ_I	0x900</div><div class='add'>+#define CNVI_AUX_MISC_CHIP_PROD_TYPE_BZ_W	0x901</div><div class='add'>+</div><div class='ctx'> #define CNVR_AUX_MISC_CHIP				0xA2B800</div><div class='ctx'> #define CNVR_SCU_SD_REGS_SD_REG_DIG_DCDC_VTRIM		0xA29890</div><div class='ctx'> #define CNVR_SCU_SD_REGS_SD_REG_ACTIVE_VDIG_MIRROR	0xA29938</div><div class='add'>+#define CNVI_SCU_SEQ_DATA_DW9				0xA27488</div><div class='add'>+</div><div class='add'>+#define CNVI_SCU_REG_FOR_ECO_1				0xA26EF8</div><div class='add'>+#define   CNVI_SCU_REG_FOR_ECO_1_WIAMT_KNOWN		BIT(4)</div><div class='add'>+#define   CNVI_SCU_REG_FOR_ECO_1_WIAMT_PRESENT		BIT(5)</div><div class='add'>+</div><div class='add'>+#define CNVI_PMU_STEP_FLOW				0xA2D588</div><div class='add'>+#define CNVI_PMU_STEP_FLOW_FORCE_URM			BIT(2)</div><div class='ctx'> </div><div class='ctx'> #define PREG_AUX_BUS_WPROT_0		0xA04CC0</div><div class='ctx'> </div><div class='hunk'>@@ -366,6 +396,7 @@ enum {</div><div class='ctx'> #define PREG_PRPH_WPROT_22000		0xA04D00</div><div class='ctx'> </div><div class='ctx'> #define SB_MODIFY_CFG_FLAG		0xA03088</div><div class='add'>+#define SB_CFG_RESIDES_IN_ROM		0x80</div><div class='ctx'> #define SB_CPU_1_STATUS			0xA01E30</div><div class='ctx'> #define SB_CPU_2_STATUS			0xA01E34</div><div class='ctx'> #define UMAG_SB_CPU_1_STATUS		0xA038C0</div><div class='hunk'>@@ -375,6 +406,13 @@ enum {</div><div class='ctx'> #define UREG_LMAC1_CURRENT_PC		0xa05c1c</div><div class='ctx'> #define UREG_LMAC2_CURRENT_PC		0xa05c20</div><div class='ctx'> </div><div class='add'>+#define WFPM_LMAC1_PD_NOTIFICATION      0xa0338c</div><div class='add'>+#define WFPM_ARC1_PD_NOTIFICATION       0xa03044</div><div class='add'>+#define HPM_SECONDARY_DEVICE_STATE      0xa03404</div><div class='add'>+#define WFPM_MAC_OTP_CFG7_ADDR		0xa03338</div><div class='add'>+#define WFPM_MAC_OTP_CFG7_DATA		0xa0333c</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /* For UMAG_GEN_HW_STATUS reg check */</div><div class='ctx'> enum {</div><div class='ctx'> 	UMAG_GEN_HW_IS_FPGA = BIT(1),</div><div class='hunk'>@@ -392,10 +430,40 @@ enum {</div><div class='ctx'> 	LMPM_PAGE_PASS_NOTIF_POS = BIT(20),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * CRF ID register</div><div class='add'>+ *</div><div class='add'>+ * type: bits 0-11</div><div class='add'>+ * reserved: bits 12-18</div><div class='add'>+ * slave_exist: bit 19</div><div class='add'>+ * dash: bits 20-23</div><div class='add'>+ * step: bits 24-27</div><div class='add'>+ * flavor: bits 28-31</div><div class='add'>+ */</div><div class='add'>+#define REG_CRF_ID_TYPE(val)		(((val) &amp; 0x00000FFF) &gt;&gt; 0)</div><div class='add'>+#define REG_CRF_ID_SLAVE(val)		(((val) &amp; 0x00080000) &gt;&gt; 19)</div><div class='add'>+#define REG_CRF_ID_DASH(val)		(((val) &amp; 0x00F00000) &gt;&gt; 20)</div><div class='add'>+#define REG_CRF_ID_STEP(val)		(((val) &amp; 0x0F000000) &gt;&gt; 24)</div><div class='add'>+#define REG_CRF_ID_FLAVOR(val)		(((val) &amp; 0xF0000000) &gt;&gt; 28)</div><div class='add'>+</div><div class='ctx'> #define UREG_CHICK		(0xA05C00)</div><div class='ctx'> #define UREG_CHICK_MSI_ENABLE	BIT(24)</div><div class='ctx'> #define UREG_CHICK_MSIX_ENABLE	BIT(25)</div><div class='ctx'> </div><div class='add'>+#define SD_REG_VER		0xa29600</div><div class='add'>+#define SD_REG_VER_GEN2		0x00a2b800</div><div class='add'>+</div><div class='add'>+#define REG_CRF_ID_TYPE_JF_1			0x201</div><div class='add'>+#define REG_CRF_ID_TYPE_JF_2			0x202</div><div class='add'>+#define REG_CRF_ID_TYPE_HR_CDB			0x503</div><div class='add'>+#define REG_CRF_ID_TYPE_HR_NONE_CDB		0x504</div><div class='add'>+#define REG_CRF_ID_TYPE_HR_NONE_CDB_1X1	0x501</div><div class='add'>+#define REG_CRF_ID_TYPE_HR_NONE_CDB_CCP	0x532</div><div class='add'>+#define REG_CRF_ID_TYPE_GF			0x410</div><div class='add'>+#define REG_CRF_ID_TYPE_FM			0x910</div><div class='add'>+#define REG_CRF_ID_TYPE_WHP			0xA10</div><div class='add'>+#define REG_CRF_ID_TYPE_PE			0xA30</div><div class='add'>+</div><div class='ctx'> #define HPM_DEBUG			0xA03440</div><div class='ctx'> #define PERSISTENCE_BIT			BIT(12)</div><div class='ctx'> #define PREG_WFPM_ACCESS		BIT(12)</div><div class='hunk'>@@ -412,6 +480,15 @@ enum {</div><div class='ctx'> #define UREG_DOORBELL_TO_ISR6_RESUME	BIT(19)</div><div class='ctx'> #define UREG_DOORBELL_TO_ISR6_PNVM	BIT(20)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * From BZ family driver triggers this bit for suspend and resume</div><div class='add'>+ * The driver should update CSR_IPC_SLEEP_CONTROL before triggering</div><div class='add'>+ * this interrupt with suspend/resume value</div><div class='add'>+ */</div><div class='add'>+#define UREG_DOORBELL_TO_ISR6_SLEEP_CTRL	BIT(31)</div><div class='add'>+</div><div class='add'>+#define CNVI_MBOX_C			0xA3400C</div><div class='add'>+</div><div class='ctx'> #define FSEQ_ERROR_CODE			0xA340C8</div><div class='ctx'> #define FSEQ_TOP_INIT_VERSION		0xA34038</div><div class='ctx'> #define FSEQ_CNVIO_INIT_VERSION		0xA3403C</div><div class='hunk'>@@ -420,6 +497,10 @@ enum {</div><div class='ctx'> #define FSEQ_ALIVE_TOKEN		0xA340F0</div><div class='ctx'> #define FSEQ_CNVI_ID			0xA3408C</div><div class='ctx'> #define FSEQ_CNVR_ID			0xA34090</div><div class='add'>+#define FSEQ_PREV_CNVIO_INIT_VERSION	0xA34084</div><div class='add'>+#define FSEQ_WIFI_FSEQ_VERSION		0xA34040</div><div class='add'>+#define FSEQ_BT_FSEQ_VERSION		0xA34044</div><div class='add'>+#define FSEQ_CLASS_TP_VERSION		0xA34078</div><div class='ctx'> </div><div class='ctx'> #define IWL_D3_SLEEP_STATUS_SUSPEND	0xD3</div><div class='ctx'> #define IWL_D3_SLEEP_STATUS_RESUME	0xD0</div><div class='hunk'>@@ -433,6 +514,14 @@ enum {</div><div class='ctx'> #define WMAL_INDRCT_CMD(addr) \</div><div class='ctx'> 	((WMAL_CMD_READ_BURST_ACCESS &lt;&lt; WMAL_INDRCT_RD_CMD1_OPMOD_POS) | \</div><div class='ctx'> 	 ((addr) &amp; WMAL_INDRCT_RD_CMD1_BYTE_ADDRESS_MSK))</div><div class='add'>+#define WMAL_MRSPF_STTS 0xADFC24</div><div class='add'>+#define WMAL_MRSPF_STTS_FIFO1_NOT_EMPTY_POS 15</div><div class='add'>+#define WMAL_MRSPF_STTS_FIFO1_NOT_EMPTY_MSK 0x8000</div><div class='add'>+#define WMAL_TIMEOUT_VAL 0xA5A5A5A2</div><div class='add'>+#define WMAL_MRSPF_STTS_IS_FIFO1_NOT_EMPTY(val) \</div><div class='add'>+	(((val) &gt;&gt; (WMAL_MRSPF_STTS_FIFO1_NOT_EMPTY_POS)) &amp; \</div><div class='add'>+	 ((WMAL_MRSPF_STTS_FIFO1_NOT_EMPTY_MSK) &gt;&gt; \</div><div class='add'>+	  (WMAL_MRSPF_STTS_FIFO1_NOT_EMPTY_POS)))</div><div class='ctx'> </div><div class='ctx'> #define WFPM_LMAC1_PS_CTL_RW 0xA03380</div><div class='ctx'> #define WFPM_LMAC2_PS_CTL_RW 0xA033C0</div><div class='hunk'>@@ -441,4 +530,13 @@ enum {</div><div class='ctx'> #define HBUS_TIMEOUT 0xA5A5A5A1</div><div class='ctx'> #define WFPM_DPHY_OFF 0xDF10FF</div><div class='ctx'> </div><div class='add'>+#define REG_OTP_MINOR 0xA0333C</div><div class='add'>+</div><div class='add'>+#define WFPM_LMAC2_PD_NOTIFICATION 0xA033CC</div><div class='add'>+#define WFPM_LMAC2_PD_RE_READ BIT(31)</div><div class='add'>+</div><div class='add'>+#define DPHYIP_INDIRECT			0xA2D800</div><div class='add'>+#define DPHYIP_INDIRECT_RD_MSK		0xFF000000</div><div class='add'>+#define DPHYIP_INDIRECT_RD_SHIFT	24</div><div class='add'>+</div><div class='ctx'> #endif				/* __iwl_prph_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.c b/drivers/net/wireless/intel/iwlwifi/iwl-trans.c<br/>index 9236f9106826..cc8a84018f70 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-trans.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-trans.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-trans.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-trans.c</a></div><div class='hunk'>@@ -2,141 +2,300 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2019-2021 Intel Corporation</div><div class='add'>+ * Copyright (C) 2019-2021, 2023-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/bsearch.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "fw/api/tx.h"</div><div class='ctx'> #include "iwl-trans.h"</div><div class='ctx'> #include "iwl-drv.h"</div><div class='ctx'> #include "iwl-fh.h"</div><div class='del'>-#include "queue/tx.h"</div><div class='ctx'> #include &lt;linux/dmapool.h&gt;</div><div class='ctx'> #include "fw/api/commands.h"</div><div class='del'>-</div><div class='del'>-struct iwl_trans *iwl_trans_alloc(unsigned int priv_size,</div><div class='del'>-				  struct device *dev,</div><div class='del'>-				  const struct iwl_trans_ops *ops,</div><div class='del'>-				  const struct iwl_cfg_trans_params *cfg_trans)</div><div class='add'>+#include "pcie/gen1_2/internal.h"</div><div class='add'>+#include "pcie/iwl-context-info-v2.h"</div><div class='add'>+</div><div class='add'>+struct iwl_trans_dev_restart_data {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	unsigned int restart_count;</div><div class='add'>+	time64_t last_error;</div><div class='add'>+	bool backoff;</div><div class='add'>+	char name[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static LIST_HEAD(restart_data_list);</div><div class='add'>+static DEFINE_SPINLOCK(restart_data_lock);</div><div class='add'>+</div><div class='add'>+static struct iwl_trans_dev_restart_data *</div><div class='add'>+iwl_trans_get_restart_data(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_trans *trans;</div><div class='del'>-#ifdef CONFIG_LOCKDEP</div><div class='del'>-	static struct lock_class_key __key;</div><div class='del'>-#endif</div><div class='add'>+	struct iwl_trans_dev_restart_data *tmp, *data = NULL;</div><div class='add'>+	const char *name = dev_name(dev);</div><div class='ctx'> </div><div class='del'>-	trans = devm_kzalloc(dev, sizeof(*trans) + priv_size, GFP_KERNEL);</div><div class='del'>-	if (!trans)</div><div class='del'>-		return NULL;</div><div class='add'>+	spin_lock(&amp;restart_data_lock);</div><div class='add'>+	list_for_each_entry(tmp, &amp;restart_data_list, list) {</div><div class='add'>+		if (strcmp(tmp-&gt;name, name))</div><div class='add'>+			continue;</div><div class='add'>+		data = tmp;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;restart_data_lock);</div><div class='ctx'> </div><div class='del'>-	trans-&gt;trans_cfg = cfg_trans;</div><div class='add'>+	if (data)</div><div class='add'>+		return data;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_LOCKDEP</div><div class='del'>-	lockdep_init_map(&amp;trans-&gt;sync_cmd_lockdep_map, "sync_cmd_lockdep_map",</div><div class='del'>-			 &amp;__key, 0);</div><div class='del'>-#endif</div><div class='add'>+	data = kzalloc(struct_size(data, name, strlen(name) + 1), GFP_ATOMIC);</div><div class='add'>+	if (!data)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	trans-&gt;dev = dev;</div><div class='del'>-	trans-&gt;ops = ops;</div><div class='del'>-	trans-&gt;num_rx_queues = 1;</div><div class='add'>+	strcpy(data-&gt;name, name);</div><div class='add'>+	spin_lock(&amp;restart_data_lock);</div><div class='add'>+	list_add_tail(&amp;data-&gt;list, &amp;restart_data_list);</div><div class='add'>+	spin_unlock(&amp;restart_data_lock);</div><div class='ctx'> </div><div class='del'>-	WARN_ON(!ops-&gt;wait_txq_empty &amp;&amp; !ops-&gt;wait_tx_queues_empty);</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;use_tfh) {</div><div class='del'>-		trans-&gt;txqs.tfd.addr_size = 64;</div><div class='del'>-		trans-&gt;txqs.tfd.max_tbs = IWL_TFH_NUM_TBS;</div><div class='del'>-		trans-&gt;txqs.tfd.size = sizeof(struct iwl_tfh_tfd);</div><div class='del'>-	} else {</div><div class='del'>-		trans-&gt;txqs.tfd.addr_size = 36;</div><div class='del'>-		trans-&gt;txqs.tfd.max_tbs = IWL_NUM_OF_TBS;</div><div class='del'>-		trans-&gt;txqs.tfd.size = sizeof(struct iwl_tfd);</div><div class='del'>-	}</div><div class='del'>-	trans-&gt;max_skb_frags = IWL_TRANS_MAX_FRAGS(trans);</div><div class='add'>+static void iwl_trans_inc_restart_count(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_dev_restart_data *data;</div><div class='ctx'> </div><div class='del'>-	return trans;</div><div class='add'>+	data = iwl_trans_get_restart_data(dev);</div><div class='add'>+	if (data) {</div><div class='add'>+		data-&gt;last_error = ktime_get_boottime_seconds();</div><div class='add'>+		data-&gt;restart_count++;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwl_trans_init(struct iwl_trans *trans)</div><div class='add'>+void iwl_trans_free_restart_list(void)</div><div class='ctx'> {</div><div class='del'>-	int txcmd_size, txcmd_align;</div><div class='add'>+	struct iwl_trans_dev_restart_data *tmp;</div><div class='ctx'> </div><div class='del'>-	if (!trans-&gt;trans_cfg-&gt;gen2) {</div><div class='del'>-		txcmd_size = sizeof(struct iwl_tx_cmd);</div><div class='del'>-		txcmd_align = sizeof(void *);</div><div class='del'>-	} else if (trans-&gt;trans_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210) {</div><div class='del'>-		txcmd_size = sizeof(struct iwl_tx_cmd_gen2);</div><div class='del'>-		txcmd_align = 64;</div><div class='del'>-	} else {</div><div class='del'>-		txcmd_size = sizeof(struct iwl_tx_cmd_gen3);</div><div class='del'>-		txcmd_align = 128;</div><div class='add'>+	while ((tmp = list_first_entry_or_null(&amp;restart_data_list,</div><div class='add'>+					       typeof(*tmp), list))) {</div><div class='add'>+		list_del(&amp;tmp-&gt;list);</div><div class='add'>+		kfree(tmp);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	txcmd_size += sizeof(struct iwl_cmd_header);</div><div class='del'>-	txcmd_size += 36; /* biggest possible 802.11 header */</div><div class='add'>+struct iwl_trans_reprobe {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct delayed_work work;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	/* Ensure device TX cmd cannot reach/cross a page boundary in gen2 */</div><div class='del'>-	if (WARN_ON(trans-&gt;trans_cfg-&gt;gen2 &amp;&amp; txcmd_size &gt;= txcmd_align))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+static void iwl_trans_reprobe_wk(struct work_struct *wk)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_reprobe *reprobe;</div><div class='add'>+</div><div class='add'>+	reprobe = container_of(wk, typeof(*reprobe), work.work);</div><div class='add'>+</div><div class='add'>+	if (device_reprobe(reprobe-&gt;dev))</div><div class='add'>+		dev_err(reprobe-&gt;dev, "reprobe failed!\n");</div><div class='add'>+	put_device(reprobe-&gt;dev);</div><div class='add'>+	kfree(reprobe);</div><div class='add'>+	module_put(THIS_MODULE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_trans_schedule_reprobe(struct iwl_trans *trans,</div><div class='add'>+				       unsigned int delay_ms)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_reprobe *reprobe;</div><div class='ctx'> </div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='del'>-		trans-&gt;txqs.bc_tbl_size = sizeof(struct iwl_gen3_bc_tbl);</div><div class='del'>-	else</div><div class='del'>-		trans-&gt;txqs.bc_tbl_size = sizeof(struct iwlagn_scd_bc_tbl);</div><div class='ctx'> 	/*</div><div class='del'>-	 * For gen2 devices, we use a single allocation for each byte-count</div><div class='del'>-	 * table, but they're pretty small (1k) so use a DMA pool that we</div><div class='del'>-	 * allocate here.</div><div class='add'>+	 * get a module reference to avoid doing this while unloading</div><div class='add'>+	 * anyway and to avoid scheduling a work with code that's</div><div class='add'>+	 * being removed.</div><div class='ctx'> 	 */</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;gen2) {</div><div class='del'>-		trans-&gt;txqs.bc_pool = dmam_pool_create("iwlwifi:bc", trans-&gt;dev,</div><div class='del'>-						       trans-&gt;txqs.bc_tbl_size,</div><div class='del'>-						       256, 0);</div><div class='del'>-		if (!trans-&gt;txqs.bc_pool)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+	if (!try_module_get(THIS_MODULE)) {</div><div class='add'>+		IWL_ERR(trans, "Module is being unloaded - abort\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reprobe = kzalloc(sizeof(*reprobe), GFP_KERNEL);</div><div class='add'>+	if (!reprobe) {</div><div class='add'>+		module_put(THIS_MODULE);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	reprobe-&gt;dev = get_device(trans-&gt;dev);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;reprobe-&gt;work, iwl_trans_reprobe_wk);</div><div class='add'>+	schedule_delayed_work(&amp;reprobe-&gt;work, msecs_to_jiffies(delay_ms));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define IWL_TRANS_RESET_OK_TIME	7 /* seconds */</div><div class='add'>+</div><div class='add'>+static enum iwl_reset_mode</div><div class='add'>+iwl_trans_determine_restart_mode(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_dev_restart_data *data;</div><div class='add'>+	enum iwl_reset_mode min_mode = 0;</div><div class='add'>+	unsigned int index;</div><div class='add'>+	static const enum iwl_reset_mode escalation_list_old[] = {</div><div class='add'>+		IWL_RESET_MODE_SW_RESET,</div><div class='add'>+		IWL_RESET_MODE_REPROBE,</div><div class='add'>+		IWL_RESET_MODE_REPROBE,</div><div class='add'>+		IWL_RESET_MODE_FUNC_RESET,</div><div class='add'>+		IWL_RESET_MODE_PROD_RESET,</div><div class='add'>+	};</div><div class='add'>+	static const enum iwl_reset_mode escalation_list_sc[] = {</div><div class='add'>+		IWL_RESET_MODE_SW_RESET,</div><div class='add'>+		IWL_RESET_MODE_REPROBE,</div><div class='add'>+		IWL_RESET_MODE_REPROBE,</div><div class='add'>+		IWL_RESET_MODE_FUNC_RESET,</div><div class='add'>+		IWL_RESET_MODE_TOP_RESET,</div><div class='add'>+		IWL_RESET_MODE_PROD_RESET,</div><div class='add'>+		IWL_RESET_MODE_TOP_RESET,</div><div class='add'>+		IWL_RESET_MODE_PROD_RESET,</div><div class='add'>+		IWL_RESET_MODE_TOP_RESET,</div><div class='add'>+		IWL_RESET_MODE_PROD_RESET,</div><div class='add'>+	};</div><div class='add'>+	const enum iwl_reset_mode *escalation_list;</div><div class='add'>+	size_t escalation_list_size;</div><div class='add'>+</div><div class='add'>+	/* used by TOP fatal error/TOP reset */</div><div class='add'>+	if (trans-&gt;restart.mode.type == IWL_ERR_TYPE_TOP_RESET_FAILED)</div><div class='add'>+		return IWL_RESET_MODE_PROD_RESET;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;request_top_reset) {</div><div class='add'>+		trans-&gt;request_top_reset = 0;</div><div class='add'>+		if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_SC)</div><div class='add'>+			return IWL_RESET_MODE_TOP_RESET;</div><div class='add'>+		return IWL_RESET_MODE_PROD_RESET;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Some things must not change even if the config does */</div><div class='del'>-	WARN_ON(trans-&gt;txqs.tfd.addr_size !=</div><div class='del'>-		(trans-&gt;trans_cfg-&gt;use_tfh ? 64 : 36));</div><div class='del'>-</div><div class='del'>-	snprintf(trans-&gt;dev_cmd_pool_name, sizeof(trans-&gt;dev_cmd_pool_name),</div><div class='del'>-		 "iwl_cmd_pool:%s", dev_name(trans-&gt;dev));</div><div class='del'>-	trans-&gt;dev_cmd_pool =</div><div class='del'>-		kmem_cache_create(trans-&gt;dev_cmd_pool_name,</div><div class='del'>-				  txcmd_size, txcmd_align,</div><div class='del'>-				  SLAB_HWCACHE_ALIGN, NULL);</div><div class='del'>-	if (!trans-&gt;dev_cmd_pool)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	trans-&gt;txqs.tso_hdr_page = alloc_percpu(struct iwl_tso_hdr_page);</div><div class='del'>-	if (!trans-&gt;txqs.tso_hdr_page) {</div><div class='del'>-		kmem_cache_destroy(trans-&gt;dev_cmd_pool);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_SC) {</div><div class='add'>+		escalation_list = escalation_list_sc;</div><div class='add'>+		escalation_list_size = ARRAY_SIZE(escalation_list_sc);</div><div class='add'>+	} else {</div><div class='add'>+		escalation_list = escalation_list_old;</div><div class='add'>+		escalation_list_size = ARRAY_SIZE(escalation_list_old);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Initialize the wait queue for commands */</div><div class='del'>-	init_waitqueue_head(&amp;trans-&gt;wait_command_queue);</div><div class='add'>+	if (trans-&gt;restart.during_reset)</div><div class='add'>+		min_mode = IWL_RESET_MODE_REPROBE;</div><div class='add'>+</div><div class='add'>+	data = iwl_trans_get_restart_data(trans-&gt;dev);</div><div class='add'>+	if (!data)</div><div class='add'>+		return min_mode;</div><div class='add'>+</div><div class='add'>+	if (!data-&gt;backoff &amp;&amp;</div><div class='add'>+	    ktime_get_boottime_seconds() - data-&gt;last_error &gt;=</div><div class='add'>+			IWL_TRANS_RESET_OK_TIME)</div><div class='add'>+		data-&gt;restart_count = 0;</div><div class='add'>+</div><div class='add'>+	index = data-&gt;restart_count;</div><div class='add'>+	if (index &gt;= escalation_list_size) {</div><div class='add'>+		index = escalation_list_size - 1;</div><div class='add'>+		if (!data-&gt;backoff) {</div><div class='add'>+			data-&gt;backoff = true;</div><div class='add'>+			return IWL_RESET_MODE_BACKOFF;</div><div class='add'>+		}</div><div class='add'>+		data-&gt;backoff = false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return max(min_mode, escalation_list[index]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_trans_free(struct iwl_trans *trans)</div><div class='add'>+#define IWL_TRANS_TOP_FOLLOWER_WAIT	180 /* ms */</div><div class='add'>+</div><div class='add'>+#define IWL_TRANS_RESET_DELAY	(HZ * 60)</div><div class='add'>+</div><div class='add'>+static void iwl_trans_restart_wk(struct work_struct *wk)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	struct iwl_trans *trans = container_of(wk, typeof(*trans),</div><div class='add'>+					       restart.wk.work);</div><div class='add'>+	enum iwl_reset_mode mode;</div><div class='ctx'> </div><div class='del'>-	if (trans-&gt;txqs.tso_hdr_page) {</div><div class='del'>-		for_each_possible_cpu(i) {</div><div class='del'>-			struct iwl_tso_hdr_page *p =</div><div class='del'>-				per_cpu_ptr(trans-&gt;txqs.tso_hdr_page, i);</div><div class='add'>+	if (trans-&gt;restart.mode.type == IWL_ERR_TYPE_TOP_RESET_BY_BT) {</div><div class='add'>+		iwl_trans_schedule_reprobe(trans, IWL_TRANS_TOP_FOLLOWER_WAIT);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			if (p &amp;&amp; p-&gt;page)</div><div class='del'>-				__free_page(p-&gt;page);</div><div class='del'>-		}</div><div class='add'>+	if (!trans-&gt;op_mode)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		free_percpu(trans-&gt;txqs.tso_hdr_page);</div><div class='add'>+	/* might have been scheduled before marked as dead, re-check */</div><div class='add'>+	if (test_bit(STATUS_TRANS_DEAD, &amp;trans-&gt;status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_op_mode_dump_error(trans-&gt;op_mode, &amp;trans-&gt;restart.mode);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the opmode stopped the device while we were trying to dump and</div><div class='add'>+	 * reset, then we'll have done the dump already (synchronized by the</div><div class='add'>+	 * opmode lock that it will acquire in iwl_op_mode_dump_error()) and</div><div class='add'>+	 * managed that via trans-&gt;restart.mode.</div><div class='add'>+	 * Additionally, make sure that in such a case we won't attempt to do</div><div class='add'>+	 * any resets now, since it's no longer requested.</div><div class='add'>+	 */</div><div class='add'>+	if (!test_and_clear_bit(STATUS_RESET_PENDING, &amp;trans-&gt;status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!iwlwifi_mod_params.fw_restart)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mode = iwl_trans_determine_restart_mode(trans);</div><div class='add'>+	if (mode == IWL_RESET_MODE_BACKOFF) {</div><div class='add'>+		IWL_ERR(trans, "Too many device errors - delay next reset\n");</div><div class='add'>+		queue_delayed_work(system_unbound_wq, &amp;trans-&gt;restart.wk,</div><div class='add'>+				   IWL_TRANS_RESET_DELAY);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kmem_cache_destroy(trans-&gt;dev_cmd_pool);</div><div class='add'>+	iwl_trans_inc_restart_count(trans-&gt;dev);</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case IWL_RESET_MODE_TOP_RESET:</div><div class='add'>+		trans-&gt;do_top_reset = 1;</div><div class='add'>+		IWL_ERR(trans, "Device error - TOP reset\n");</div><div class='add'>+		fallthrough;</div><div class='add'>+	case IWL_RESET_MODE_SW_RESET:</div><div class='add'>+		if (mode == IWL_RESET_MODE_SW_RESET)</div><div class='add'>+			IWL_ERR(trans, "Device error - SW reset\n");</div><div class='add'>+		iwl_trans_opmode_sw_reset(trans, trans-&gt;restart.mode.type);</div><div class='add'>+		break;</div><div class='add'>+	case IWL_RESET_MODE_REPROBE:</div><div class='add'>+		IWL_ERR(trans, "Device error - reprobe!\n");</div><div class='add'>+</div><div class='add'>+		iwl_trans_schedule_reprobe(trans, 0);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		iwl_trans_pcie_reset(trans, mode);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct iwl_trans *iwl_trans_alloc(unsigned int priv_size,</div><div class='add'>+				  struct device *dev,</div><div class='add'>+				  const struct iwl_mac_cfg *mac_cfg)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans *trans;</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+	static struct lock_class_key __sync_cmd_key;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	trans = devm_kzalloc(dev, sizeof(*trans) + priv_size, GFP_KERNEL);</div><div class='add'>+	if (!trans)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	trans-&gt;mac_cfg = mac_cfg;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+	lockdep_init_map(&amp;trans-&gt;sync_cmd_lockdep_map, "sync_cmd_lockdep_map",</div><div class='add'>+			 &amp;__sync_cmd_key, 0);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	trans-&gt;dev = dev;</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;trans-&gt;restart.wk, iwl_trans_restart_wk);</div><div class='add'>+</div><div class='add'>+	return trans;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_trans_free(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	cancel_delayed_work_sync(&amp;trans-&gt;restart.wk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iwl_trans_send_cmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)</div><div class='hunk'>@@ -147,40 +306,22 @@ int iwl_trans_send_cmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)</div><div class='ctx'> 		     test_bit(STATUS_RFKILL_OPMODE, &amp;trans-&gt;status)))</div><div class='ctx'> 		return -ERFKILL;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We can't test IWL_MVM_STATUS_IN_D3 in mvm-&gt;status because this</div><div class='del'>-	 * bit is set early in the D3 flow, before we send all the commands</div><div class='del'>-	 * that configure the firmware for D3 operation (power, patterns, ...)</div><div class='del'>-	 * and we don't want to flag all those with CMD_SEND_IN_D3.</div><div class='del'>-	 * So use the system_pm_mode instead. The only command sent after</div><div class='del'>-	 * we set system_pm_mode is D3_CONFIG_CMD, which we now flag with</div><div class='del'>-	 * CMD_SEND_IN_D3.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(trans-&gt;system_pm_mode == IWL_PLAT_PM_MODE_D3 &amp;&amp;</div><div class='del'>-		     !(cmd-&gt;flags &amp; CMD_SEND_IN_D3)))</div><div class='del'>-		return -EHOSTDOWN;</div><div class='del'>-</div><div class='ctx'> 	if (unlikely(test_bit(STATUS_FW_ERROR, &amp;trans-&gt;status)))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(trans-&gt;state != IWL_TRANS_FW_ALIVE)) {</div><div class='del'>-		IWL_ERR(trans, "%s bad state = %d\n", __func__, trans-&gt;state);</div><div class='add'>+	if (WARN_ONCE(trans-&gt;state != IWL_TRANS_FW_ALIVE,</div><div class='add'>+		      "bad state = %d\n", trans-&gt;state))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (WARN_ON((cmd-&gt;flags &amp; CMD_WANT_ASYNC_CALLBACK) &amp;&amp;</div><div class='del'>-		    !(cmd-&gt;flags &amp; CMD_ASYNC)))</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!(cmd-&gt;flags &amp; CMD_ASYNC))</div><div class='ctx'> 		lock_map_acquire_read(&amp;trans-&gt;sync_cmd_lockdep_map);</div><div class='ctx'> </div><div class='del'>-	if (trans-&gt;wide_cmd_header &amp;&amp; !iwl_cmd_groupid(cmd-&gt;id)) {</div><div class='add'>+	if (trans-&gt;conf.wide_cmd_header &amp;&amp; !iwl_cmd_groupid(cmd-&gt;id)) {</div><div class='ctx'> 		if (cmd-&gt;id != REPLY_ERROR)</div><div class='ctx'> 			cmd-&gt;id = DEF_ID(cmd-&gt;id);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = iwl_trans_txq_send_hcmd(trans, cmd);</div><div class='add'>+	ret = iwl_trans_pcie_send_hcmd(trans, cmd);</div><div class='ctx'> </div><div class='ctx'> 	if (!(cmd-&gt;flags &amp; CMD_ASYNC))</div><div class='ctx'> 		lock_map_release(&amp;trans-&gt;sync_cmd_lockdep_map);</div><div class='hunk'>@@ -192,6 +333,19 @@ int iwl_trans_send_cmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)</div><div class='ctx'> }</div><div class='ctx'> IWL_EXPORT_SYMBOL(iwl_trans_send_cmd);</div><div class='ctx'> </div><div class='add'>+struct iwl_device_tx_cmd *iwl_trans_alloc_tx_cmd(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	return iwl_pcie_gen1_2_alloc_tx_cmd(trans);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_alloc_tx_cmd);</div><div class='add'>+</div><div class='add'>+void iwl_trans_free_tx_cmd(struct iwl_trans *trans,</div><div class='add'>+			   struct iwl_device_tx_cmd *dev_cmd)</div><div class='add'>+{</div><div class='add'>+	iwl_pcie_gen1_2_free_tx_cmd(trans, dev_cmd);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_free_tx_cmd);</div><div class='add'>+</div><div class='ctx'> /* Comparator for struct iwl_hcmd_names.</div><div class='ctx'>  * Used in the binary search over a list of host commands.</div><div class='ctx'>  *</div><div class='hunk'>@@ -203,10 +357,10 @@ IWL_EXPORT_SYMBOL(iwl_trans_send_cmd);</div><div class='ctx'> static int iwl_hcmd_names_cmp(const void *key, const void *elt)</div><div class='ctx'> {</div><div class='ctx'> 	const struct iwl_hcmd_names *name = elt;</div><div class='del'>-	u8 cmd1 = *(u8 *)key;</div><div class='add'>+	const u8 *cmd1 = key;</div><div class='ctx'> 	u8 cmd2 = name-&gt;cmd_id;</div><div class='ctx'> </div><div class='del'>-	return (cmd1 - cmd2);</div><div class='add'>+	return (*cmd1 - cmd2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const char *iwl_get_cmd_string(struct iwl_trans *trans, u32 id)</div><div class='hunk'>@@ -219,11 +373,12 @@ const char *iwl_get_cmd_string(struct iwl_trans *trans, u32 id)</div><div class='ctx'> 	grp = iwl_cmd_groupid(id);</div><div class='ctx'> 	cmd = iwl_cmd_opcode(id);</div><div class='ctx'> </div><div class='del'>-	if (!trans-&gt;command_groups || grp &gt;= trans-&gt;command_groups_size ||</div><div class='del'>-	    !trans-&gt;command_groups[grp].arr)</div><div class='add'>+	if (!trans-&gt;conf.command_groups ||</div><div class='add'>+	    grp &gt;= trans-&gt;conf.command_groups_size ||</div><div class='add'>+	    !trans-&gt;conf.command_groups[grp].arr)</div><div class='ctx'> 		return "UNKNOWN";</div><div class='ctx'> </div><div class='del'>-	arr = &amp;trans-&gt;command_groups[grp];</div><div class='add'>+	arr = &amp;trans-&gt;conf.command_groups[grp];</div><div class='ctx'> 	ret = bsearch(&amp;cmd, arr-&gt;arr, arr-&gt;size, size, iwl_hcmd_names_cmp);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		return "UNKNOWN";</div><div class='hunk'>@@ -231,19 +386,439 @@ const char *iwl_get_cmd_string(struct iwl_trans *trans, u32 id)</div><div class='ctx'> }</div><div class='ctx'> IWL_EXPORT_SYMBOL(iwl_get_cmd_string);</div><div class='ctx'> </div><div class='del'>-int iwl_cmd_groups_verify_sorted(const struct iwl_trans_config *trans)</div><div class='add'>+void iwl_trans_op_mode_enter(struct iwl_trans *trans,</div><div class='add'>+			     struct iwl_op_mode *op_mode)</div><div class='ctx'> {</div><div class='del'>-	int i, j;</div><div class='del'>-	const struct iwl_hcmd_arr *arr;</div><div class='add'>+	trans-&gt;op_mode = op_mode;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; trans-&gt;command_groups_size; i++) {</div><div class='del'>-		arr = &amp;trans-&gt;command_groups[i];</div><div class='del'>-		if (!arr-&gt;arr)</div><div class='del'>-			continue;</div><div class='del'>-		for (j = 0; j &lt; arr-&gt;size - 1; j++)</div><div class='del'>-			if (arr-&gt;arr[j].cmd_id &gt; arr-&gt;arr[j + 1].cmd_id)</div><div class='del'>-				return -1;</div><div class='add'>+	if (WARN_ON(trans-&gt;conf.n_no_reclaim_cmds &gt; MAX_NO_RECLAIM_CMDS))</div><div class='add'>+		trans-&gt;conf.n_no_reclaim_cmds =</div><div class='add'>+			ARRAY_SIZE(trans-&gt;conf.no_reclaim_cmds);</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!trans-&gt;conf.rx_mpdu_cmd);</div><div class='add'>+</div><div class='add'>+	iwl_pcie_gen1_2_op_mode_enter(trans);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_op_mode_enter);</div><div class='add'>+</div><div class='add'>+int iwl_trans_start_hw(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	clear_bit(STATUS_TRANS_RESET_IN_PROGRESS, &amp;trans-&gt;status);</div><div class='add'>+</div><div class='add'>+	return iwl_trans_pcie_start_hw(trans);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_start_hw);</div><div class='add'>+</div><div class='add'>+void iwl_trans_op_mode_leave(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;gen2)</div><div class='add'>+		iwl_trans_pcie_gen2_op_mode_leave(trans);</div><div class='add'>+	else</div><div class='add'>+		iwl_trans_pcie_op_mode_leave(trans);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;trans-&gt;restart.wk);</div><div class='add'>+</div><div class='add'>+	trans-&gt;op_mode = NULL;</div><div class='add'>+	memset(&amp;trans-&gt;conf, 0, sizeof(trans-&gt;conf));</div><div class='add'>+</div><div class='add'>+	trans-&gt;state = IWL_TRANS_NO_FW;</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_op_mode_leave);</div><div class='add'>+</div><div class='add'>+void iwl_trans_write8(struct iwl_trans *trans, u32 ofs, u8 val)</div><div class='add'>+{</div><div class='add'>+	iwl_trans_pcie_write8(trans, ofs, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_trans_write32(struct iwl_trans *trans, u32 ofs, u32 val)</div><div class='add'>+{</div><div class='add'>+	iwl_trans_pcie_write32(trans, ofs, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 iwl_trans_read32(struct iwl_trans *trans, u32 ofs)</div><div class='add'>+{</div><div class='add'>+	return iwl_trans_pcie_read32(trans, ofs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 iwl_trans_read_prph(struct iwl_trans *trans, u32 ofs)</div><div class='add'>+{</div><div class='add'>+	return iwl_trans_pcie_read_prph(trans, ofs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_trans_write_prph(struct iwl_trans *trans, u32 ofs, u32 val)</div><div class='add'>+{</div><div class='add'>+	return iwl_trans_pcie_write_prph(trans, ofs, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_trans_read_mem(struct iwl_trans *trans, u32 addr,</div><div class='add'>+		       void *buf, int dwords)</div><div class='add'>+{</div><div class='add'>+	return iwl_trans_pcie_read_mem(trans, addr, buf, dwords);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_read_mem);</div><div class='add'>+</div><div class='add'>+int iwl_trans_write_mem(struct iwl_trans *trans, u32 addr,</div><div class='add'>+			const void *buf, int dwords)</div><div class='add'>+{</div><div class='add'>+	int offs, ret = 0;</div><div class='add'>+	const u32 *vals = buf;</div><div class='add'>+</div><div class='add'>+	if (iwl_trans_grab_nic_access(trans)) {</div><div class='add'>+		iwl_write32(trans, HBUS_TARG_MEM_WADDR, addr);</div><div class='add'>+		for (offs = 0; offs &lt; dwords; offs++)</div><div class='add'>+			iwl_write32(trans, HBUS_TARG_MEM_WDAT,</div><div class='add'>+				    vals ? vals[offs] : 0);</div><div class='add'>+		iwl_trans_release_nic_access(trans);</div><div class='add'>+	} else {</div><div class='add'>+		ret = -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_write_mem);</div><div class='add'>+</div><div class='add'>+void iwl_trans_set_pmi(struct iwl_trans *trans, bool state)</div><div class='add'>+{</div><div class='add'>+	if (state)</div><div class='add'>+		set_bit(STATUS_TPOWER_PMI, &amp;trans-&gt;status);</div><div class='add'>+	else</div><div class='add'>+		clear_bit(STATUS_TPOWER_PMI, &amp;trans-&gt;status);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_set_pmi);</div><div class='add'>+</div><div class='add'>+int iwl_trans_sw_reset(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	return iwl_trans_pcie_sw_reset(trans, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct iwl_trans_dump_data *</div><div class='add'>+iwl_trans_dump_data(struct iwl_trans *trans, u32 dump_mask,</div><div class='add'>+		    const struct iwl_dump_sanitize_ops *sanitize_ops,</div><div class='add'>+		    void *sanitize_ctx)</div><div class='add'>+{</div><div class='add'>+	return iwl_trans_pcie_dump_data(trans, dump_mask,</div><div class='add'>+					sanitize_ops, sanitize_ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_trans_d3_suspend(struct iwl_trans *trans, bool reset)</div><div class='add'>+{</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	return iwl_trans_pcie_d3_suspend(trans, reset);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_d3_suspend);</div><div class='add'>+</div><div class='add'>+int iwl_trans_d3_resume(struct iwl_trans *trans, bool reset)</div><div class='add'>+{</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	return iwl_trans_pcie_d3_resume(trans, reset);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_d3_resume);</div><div class='add'>+</div><div class='add'>+void iwl_trans_interrupts(struct iwl_trans *trans, bool enable)</div><div class='add'>+{</div><div class='add'>+	iwl_trans_pci_interrupts(trans, enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_trans_sync_nmi(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	iwl_trans_pcie_sync_nmi(trans);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_trans_write_imr_mem(struct iwl_trans *trans, u32 dst_addr,</div><div class='add'>+			    u64 src_addr, u32 byte_cnt)</div><div class='add'>+{</div><div class='add'>+	return iwl_trans_pcie_copy_imr(trans, dst_addr, src_addr, byte_cnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_trans_set_bits_mask(struct iwl_trans *trans, u32 reg,</div><div class='add'>+			     u32 mask, u32 value)</div><div class='add'>+{</div><div class='add'>+	iwl_trans_pcie_set_bits_mask(trans, reg, mask, value);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_set_bits_mask);</div><div class='add'>+</div><div class='add'>+int iwl_trans_read_config32(struct iwl_trans *trans, u32 ofs,</div><div class='add'>+			    u32 *val)</div><div class='add'>+{</div><div class='add'>+	return iwl_trans_pcie_read_config32(trans, ofs, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool _iwl_trans_grab_nic_access(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	return iwl_trans_pcie_grab_nic_access(trans);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(_iwl_trans_grab_nic_access);</div><div class='add'>+</div><div class='add'>+void __releases(nic_access)</div><div class='add'>+iwl_trans_release_nic_access(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	iwl_trans_pcie_release_nic_access(trans);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_release_nic_access);</div><div class='add'>+</div><div class='add'>+void iwl_trans_fw_alive(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	trans-&gt;state = IWL_TRANS_FW_ALIVE;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;gen2)</div><div class='add'>+		iwl_trans_pcie_gen2_fw_alive(trans);</div><div class='add'>+	else</div><div class='add'>+		iwl_trans_pcie_fw_alive(trans);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_fw_alive);</div><div class='add'>+</div><div class='add'>+int iwl_trans_start_fw(struct iwl_trans *trans, const struct iwl_fw *fw,</div><div class='add'>+		       enum iwl_ucode_type ucode_type, bool run_in_rfkill)</div><div class='add'>+{</div><div class='add'>+	const struct fw_img *img;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	img = iwl_get_ucode_image(fw, ucode_type);</div><div class='add'>+	if (!img)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	clear_bit(STATUS_FW_ERROR, &amp;trans-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;gen2)</div><div class='add'>+		ret = iwl_trans_pcie_gen2_start_fw(trans, fw, img,</div><div class='add'>+						   run_in_rfkill);</div><div class='add'>+	else</div><div class='add'>+		ret = iwl_trans_pcie_start_fw(trans, fw, img,</div><div class='add'>+					      run_in_rfkill);</div><div class='add'>+</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		trans-&gt;state = IWL_TRANS_FW_STARTED;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_start_fw);</div><div class='add'>+</div><div class='add'>+void iwl_trans_stop_device(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * See also the comment in iwl_trans_restart_wk().</div><div class='add'>+	 *</div><div class='add'>+	 * When the opmode stops the device while a reset is pending, the</div><div class='add'>+	 * worker (iwl_trans_restart_wk) might not have run yet or, more</div><div class='add'>+	 * likely, will be blocked on the opmode lock. Due to the locking,</div><div class='add'>+	 * we can't just flush the worker.</div><div class='add'>+	 *</div><div class='add'>+	 * If this is the case, then the test_and_clear_bit() ensures that</div><div class='add'>+	 * the worker won't attempt to do anything after the stop.</div><div class='add'>+	 *</div><div class='add'>+	 * The trans-&gt;restart.mode is a handshake with the opmode, we set</div><div class='add'>+	 * the context there to ABORT so that when the worker can finally</div><div class='add'>+	 * acquire the lock in the opmode, the code there won't attempt to</div><div class='add'>+	 * do any dumps. Since we'd really like to have the dump though,</div><div class='add'>+	 * also do it inline here (with the opmode locks already held),</div><div class='add'>+	 * but use a separate mode struct to avoid races.</div><div class='add'>+	 */</div><div class='add'>+	if (test_and_clear_bit(STATUS_RESET_PENDING, &amp;trans-&gt;status)) {</div><div class='add'>+		struct iwl_fw_error_dump_mode mode;</div><div class='add'>+</div><div class='add'>+		mode = trans-&gt;restart.mode;</div><div class='add'>+		mode.context = IWL_ERR_CONTEXT_FROM_OPMODE;</div><div class='add'>+		trans-&gt;restart.mode.context = IWL_ERR_CONTEXT_ABORT;</div><div class='add'>+</div><div class='add'>+		iwl_op_mode_dump_error(trans-&gt;op_mode, &amp;mode);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;gen2)</div><div class='add'>+		iwl_trans_pcie_gen2_stop_device(trans);</div><div class='add'>+	else</div><div class='add'>+		iwl_trans_pcie_stop_device(trans);</div><div class='add'>+</div><div class='add'>+	trans-&gt;state = IWL_TRANS_NO_FW;</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_stop_device);</div><div class='add'>+</div><div class='add'>+int iwl_trans_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='add'>+		 struct iwl_device_tx_cmd *dev_cmd, int queue)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(test_bit(STATUS_FW_ERROR, &amp;trans-&gt;status)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(trans-&gt;state != IWL_TRANS_FW_ALIVE,</div><div class='add'>+		      "bad state = %d\n", trans-&gt;state))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;gen2)</div><div class='add'>+		return iwl_txq_gen2_tx(trans, skb, dev_cmd, queue);</div><div class='add'>+</div><div class='add'>+	return iwl_trans_pcie_tx(trans, skb, dev_cmd, queue);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_tx);</div><div class='add'>+</div><div class='add'>+void iwl_trans_reclaim(struct iwl_trans *trans, int queue, int ssn,</div><div class='add'>+		       struct sk_buff_head *skbs, bool is_flush)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(test_bit(STATUS_FW_ERROR, &amp;trans-&gt;status)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(trans-&gt;state != IWL_TRANS_FW_ALIVE,</div><div class='add'>+		      "bad state = %d\n", trans-&gt;state))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_pcie_reclaim(trans, queue, ssn, skbs, is_flush);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_reclaim);</div><div class='add'>+</div><div class='add'>+void iwl_trans_txq_disable(struct iwl_trans *trans, int queue,</div><div class='add'>+			   bool configure_scd)</div><div class='add'>+{</div><div class='add'>+	iwl_trans_pcie_txq_disable(trans, queue, configure_scd);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_txq_disable);</div><div class='add'>+</div><div class='add'>+bool iwl_trans_txq_enable_cfg(struct iwl_trans *trans, int queue, u16 ssn,</div><div class='add'>+			      const struct iwl_trans_txq_scd_cfg *cfg,</div><div class='add'>+			      unsigned int queue_wdg_timeout)</div><div class='add'>+{</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(trans-&gt;state != IWL_TRANS_FW_ALIVE,</div><div class='add'>+		      "bad state = %d\n", trans-&gt;state))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return iwl_trans_pcie_txq_enable(trans, queue, ssn,</div><div class='add'>+					 cfg, queue_wdg_timeout);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_txq_enable_cfg);</div><div class='add'>+</div><div class='add'>+int iwl_trans_wait_txq_empty(struct iwl_trans *trans, int queue)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(test_bit(STATUS_FW_ERROR, &amp;trans-&gt;status)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(trans-&gt;state != IWL_TRANS_FW_ALIVE,</div><div class='add'>+		      "bad state = %d\n", trans-&gt;state))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return iwl_trans_pcie_wait_txq_empty(trans, queue);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_wait_txq_empty);</div><div class='add'>+</div><div class='add'>+int iwl_trans_wait_tx_queues_empty(struct iwl_trans *trans, u32 txqs)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ONCE(trans-&gt;state != IWL_TRANS_FW_ALIVE,</div><div class='add'>+		      "bad state = %d\n", trans-&gt;state))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return iwl_trans_pcie_wait_txqs_empty(trans, txqs);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_wait_tx_queues_empty);</div><div class='add'>+</div><div class='add'>+void iwl_trans_freeze_txq_timer(struct iwl_trans *trans,</div><div class='add'>+				unsigned long txqs, bool freeze)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ONCE(trans-&gt;state != IWL_TRANS_FW_ALIVE,</div><div class='add'>+		      "bad state = %d\n", trans-&gt;state))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_pcie_freeze_txq_timer(trans, txqs, freeze);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_freeze_txq_timer);</div><div class='add'>+</div><div class='add'>+void iwl_trans_txq_set_shared_mode(struct iwl_trans *trans,</div><div class='add'>+				   int txq_id, bool shared_mode)</div><div class='add'>+{</div><div class='add'>+	iwl_trans_pcie_txq_set_shared_mode(trans, txq_id, shared_mode);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_txq_set_shared_mode);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='add'>+void iwl_trans_debugfs_cleanup(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	iwl_trans_pcie_debugfs_cleanup(trans);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void iwl_trans_set_q_ptrs(struct iwl_trans *trans, int queue, int ptr)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ONCE(trans-&gt;state != IWL_TRANS_FW_ALIVE,</div><div class='add'>+		      "bad state = %d\n", trans-&gt;state))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_pcie_set_q_ptrs(trans, queue, ptr);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_set_q_ptrs);</div><div class='add'>+</div><div class='add'>+int iwl_trans_txq_alloc(struct iwl_trans *trans, u32 flags, u32 sta_mask,</div><div class='add'>+			u8 tid, int size, unsigned int wdg_timeout)</div><div class='add'>+{</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(trans-&gt;state != IWL_TRANS_FW_ALIVE,</div><div class='add'>+		      "bad state = %d\n", trans-&gt;state))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return iwl_txq_dyn_alloc(trans, flags, sta_mask, tid,</div><div class='add'>+				 size, wdg_timeout);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_txq_alloc);</div><div class='add'>+</div><div class='add'>+void iwl_trans_txq_free(struct iwl_trans *trans, int queue)</div><div class='add'>+{</div><div class='add'>+	iwl_txq_dyn_free(trans, queue);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_txq_free);</div><div class='add'>+</div><div class='add'>+int iwl_trans_get_rxq_dma_data(struct iwl_trans *trans, int queue,</div><div class='add'>+			       struct iwl_trans_rxq_dma_data *data)</div><div class='add'>+{</div><div class='add'>+	return iwl_trans_pcie_rxq_dma_data(trans, queue, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_trans_load_pnvm(struct iwl_trans *trans,</div><div class='add'>+			const struct iwl_pnvm_image *pnvm_data,</div><div class='add'>+			const struct iwl_ucode_capabilities *capa)</div><div class='add'>+{</div><div class='add'>+	return iwl_trans_pcie_ctx_info_v2_load_pnvm(trans, pnvm_data, capa);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_load_pnvm);</div><div class='add'>+</div><div class='add'>+void iwl_trans_set_pnvm(struct iwl_trans *trans,</div><div class='add'>+			const struct iwl_ucode_capabilities *capa)</div><div class='add'>+{</div><div class='add'>+	iwl_trans_pcie_ctx_info_v2_set_pnvm(trans, capa);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_trans_load_reduce_power(struct iwl_trans *trans,</div><div class='add'>+				const struct iwl_pnvm_image *payloads,</div><div class='add'>+				const struct iwl_ucode_capabilities *capa)</div><div class='add'>+{</div><div class='add'>+	return iwl_trans_pcie_ctx_info_v2_load_reduce_power(trans, payloads,</div><div class='add'>+							      capa);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_trans_set_reduce_power(struct iwl_trans *trans,</div><div class='add'>+				const struct iwl_ucode_capabilities *capa)</div><div class='add'>+{</div><div class='add'>+	iwl_trans_pcie_ctx_info_v2_set_reduce_power(trans, capa);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool iwl_trans_is_pm_supported(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(trans-&gt;mac_cfg-&gt;gen2))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return iwl_pcie_gen1_is_pm_supported(trans);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_is_pm_supported);</div><div class='add'>+</div><div class='add'>+bool iwl_trans_is_ltr_enabled(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	return iwl_pcie_gen1_2_is_ltr_enabled(trans);</div><div class='ctx'> }</div><div class='del'>-IWL_EXPORT_SYMBOL(iwl_cmd_groups_verify_sorted);</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_trans_is_ltr_enabled);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h<br/>index bf569f856ad8..a552669db6e2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-trans.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-trans.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-trans.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-trans.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2014, 2018-2021 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -26,11 +26,9 @@</div><div class='ctx'>  * DOC: Transport layer - what is it ?</div><div class='ctx'>  *</div><div class='ctx'>  * The transport layer is the layer that deals with the HW directly. It provides</div><div class='del'>- * an abstraction of the underlying HW to the upper layer. The transport layer</div><div class='del'>- * doesn't provide any policy, algorithm or anything of this kind, but only</div><div class='del'>- * mechanisms to make the HW do something. It is not completely stateless but</div><div class='del'>- * close to it.</div><div class='del'>- * We will have an implementation for each different supported bus.</div><div class='add'>+ * the PCIe access to the underlying hardwarwe. The transport layer doesn't</div><div class='add'>+ * provide any policy, algorithm or anything of this kind, but only mechanisms</div><div class='add'>+ * to make the HW do something. It is not completely stateless but close to it.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -56,6 +54,10 @@</div><div class='ctx'>  *	6) Eventually, the free function will be called.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+/* default preset 0 (start from bit 16)*/</div><div class='add'>+#define IWL_FW_DBG_DOMAIN_POS	16</div><div class='add'>+#define IWL_FW_DBG_DOMAIN	BIT(IWL_FW_DBG_DOMAIN_POS)</div><div class='add'>+</div><div class='ctx'> #define IWL_TRANS_FW_DBG_DOMAIN(trans)	IWL_FW_INI_DOMAIN_ALWAYS_ON</div><div class='ctx'> </div><div class='ctx'> #define FH_RSCSR_FRAME_SIZE_MSK		0x00003FFF	/* bits 0-13 */</div><div class='hunk'>@@ -105,28 +107,30 @@ static inline u32 iwl_rx_packet_payload_len(const struct iwl_rx_packet *pkt)</div><div class='ctx'>  * @CMD_ASYNC: Return right away and don't wait for the response</div><div class='ctx'>  * @CMD_WANT_SKB: Not valid with CMD_ASYNC. The caller needs the buffer of</div><div class='ctx'>  *	the response. The caller needs to call iwl_free_resp when done.</div><div class='del'>- * @CMD_WANT_ASYNC_CALLBACK: the op_mode's async callback function must be</div><div class='del'>- *	called after this command completes. Valid only with CMD_ASYNC.</div><div class='del'>- * @CMD_SEND_IN_D3: Allow the command to be sent in D3 mode, relevant to</div><div class='del'>- *	SUSPEND and RESUME commands. We are in D3 mode when we set</div><div class='del'>- *	trans-&gt;system_pm_mode to IWL_PLAT_PM_MODE_D3.</div><div class='add'>+ * @CMD_SEND_IN_RFKILL: Send the command even if the NIC is in RF-kill.</div><div class='add'>+ * @CMD_BLOCK_TXQS: Block TXQs while the comment is executing.</div><div class='ctx'>  */</div><div class='ctx'> enum CMD_MODE {</div><div class='ctx'> 	CMD_ASYNC		= BIT(0),</div><div class='ctx'> 	CMD_WANT_SKB		= BIT(1),</div><div class='ctx'> 	CMD_SEND_IN_RFKILL	= BIT(2),</div><div class='del'>-	CMD_WANT_ASYNC_CALLBACK	= BIT(3),</div><div class='del'>-	CMD_SEND_IN_D3          = BIT(4),</div><div class='add'>+	CMD_BLOCK_TXQS		= BIT(3),</div><div class='ctx'> };</div><div class='add'>+#define CMD_MODE_BITS 5</div><div class='ctx'> </div><div class='ctx'> #define DEF_CMD_PAYLOAD_SIZE 320</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_device_cmd</div><div class='add'>+ * struct iwl_device_cmd - device command structure</div><div class='ctx'>  *</div><div class='ctx'>  * For allocation of the command and tx queues, this establishes the overall</div><div class='ctx'>  * size of the largest command we send to uCode, except for commands that</div><div class='ctx'>  * aren't fully copied and use other TFD space.</div><div class='add'>+ *</div><div class='add'>+ * @hdr: command header</div><div class='add'>+ * @payload: payload for the command</div><div class='add'>+ * @hdr_wide: wide command header</div><div class='add'>+ * @payload_wide: payload for the wide command</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_device_cmd {</div><div class='ctx'> 	union {</div><div class='hunk'>@@ -163,12 +167,6 @@ struct iwl_device_tx_cmd {</div><div class='ctx'>  */</div><div class='ctx'> #define IWL_MAX_CMD_TBS_PER_TFD	2</div><div class='ctx'> </div><div class='del'>-/* We need 2 entries for the TX command and header, and another one might</div><div class='del'>- * be needed for potential data in the SKB's head. The remaining ones can</div><div class='del'>- * be used for frags.</div><div class='del'>- */</div><div class='del'>-#define IWL_TRANS_MAX_FRAGS(trans) ((trans)-&gt;txqs.tfd.max_tbs - 3)</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_hcmd_dataflag - flag for each one of the chunks of the command</div><div class='ctx'>  *</div><div class='hunk'>@@ -193,6 +191,10 @@ enum iwl_error_event_table_status {</div><div class='ctx'> 	IWL_ERROR_EVENT_TABLE_LMAC1 = BIT(0),</div><div class='ctx'> 	IWL_ERROR_EVENT_TABLE_LMAC2 = BIT(1),</div><div class='ctx'> 	IWL_ERROR_EVENT_TABLE_UMAC = BIT(2),</div><div class='add'>+	IWL_ERROR_EVENT_TABLE_TCM1 = BIT(3),</div><div class='add'>+	IWL_ERROR_EVENT_TABLE_TCM2 = BIT(4),</div><div class='add'>+	IWL_ERROR_EVENT_TABLE_RCM1 = BIT(5),</div><div class='add'>+	IWL_ERROR_EVENT_TABLE_RCM2 = BIT(6),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -270,17 +272,7 @@ static inline void iwl_free_rxb(struct iwl_rx_cmd_buffer *r)</div><div class='ctx'> #define IWL_MGMT_TID		15</div><div class='ctx'> #define IWL_FRAME_LIMIT	64</div><div class='ctx'> #define IWL_MAX_RX_HW_QUEUES	16</div><div class='del'>-#define IWL_9000_MAX_RX_HW_QUEUES	6</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * enum iwl_wowlan_status - WoWLAN image/device status</div><div class='del'>- * @IWL_D3_STATUS_ALIVE: firmware is still running after resume</div><div class='del'>- * @IWL_D3_STATUS_RESET: device was reset while suspended</div><div class='del'>- */</div><div class='del'>-enum iwl_d3_status {</div><div class='del'>-	IWL_D3_STATUS_ALIVE,</div><div class='del'>-	IWL_D3_STATUS_RESET,</div><div class='del'>-};</div><div class='add'>+#define IWL_9000_MAX_RX_HW_QUEUES	1</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_trans_status: transport status flags</div><div class='hunk'>@@ -291,10 +283,13 @@ enum iwl_d3_status {</div><div class='ctx'>  * @STATUS_RFKILL_HW: the actual HW state of the RF-kill switch</div><div class='ctx'>  * @STATUS_RFKILL_OPMODE: RF-kill state reported to opmode</div><div class='ctx'>  * @STATUS_FW_ERROR: the fw is in error state</div><div class='del'>- * @STATUS_TRANS_GOING_IDLE: shutting down the trans, only special commands</div><div class='del'>- *	are sent</div><div class='del'>- * @STATUS_TRANS_IDLE: the trans is idle - general commands are not to be sent</div><div class='ctx'>  * @STATUS_TRANS_DEAD: trans is dead - avoid any read/write operation</div><div class='add'>+ * @STATUS_IN_SW_RESET: device is undergoing reset, cleared by opmode</div><div class='add'>+ *	via iwl_trans_finish_sw_reset()</div><div class='add'>+ * @STATUS_RESET_PENDING: reset worker was scheduled, but didn't dump</div><div class='add'>+ *	the firmware state yet</div><div class='add'>+ * @STATUS_TRANS_RESET_IN_PROGRESS: reset is still in progress, don't</div><div class='add'>+ *	attempt another reset yet</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_trans_status {</div><div class='ctx'> 	STATUS_SYNC_HCMD_ACTIVE,</div><div class='hunk'>@@ -304,9 +299,10 @@ enum iwl_trans_status {</div><div class='ctx'> 	STATUS_RFKILL_HW,</div><div class='ctx'> 	STATUS_RFKILL_OPMODE,</div><div class='ctx'> 	STATUS_FW_ERROR,</div><div class='del'>-	STATUS_TRANS_GOING_IDLE,</div><div class='del'>-	STATUS_TRANS_IDLE,</div><div class='ctx'> 	STATUS_TRANS_DEAD,</div><div class='add'>+	STATUS_IN_SW_RESET,</div><div class='add'>+	STATUS_RESET_PENDING,</div><div class='add'>+	STATUS_TRANS_RESET_IN_PROGRESS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='hunk'>@@ -362,13 +358,27 @@ struct iwl_hcmd_arr {</div><div class='ctx'> 	{ .arr = x, .size = ARRAY_SIZE(x) }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct iwl_dump_sanitize_ops - dump sanitization operations</div><div class='add'>+ * @frob_txf: Scrub the TX FIFO data</div><div class='add'>+ * @frob_hcmd: Scrub a host command, the %hcmd pointer is to the header</div><div class='add'>+ *	but that might be short or long (&amp;struct iwl_cmd_header or</div><div class='add'>+ *	&amp;struct iwl_cmd_header_wide)</div><div class='add'>+ * @frob_mem: Scrub memory data</div><div class='add'>+ */</div><div class='add'>+struct iwl_dump_sanitize_ops {</div><div class='add'>+	void (*frob_txf)(void *ctx, void *buf, size_t buflen);</div><div class='add'>+	void (*frob_hcmd)(void *ctx, void *hcmd, size_t buflen);</div><div class='add'>+	void (*frob_mem)(void *ctx, u32 mem_addr, void *mem, size_t buflen);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_trans_config - transport configuration</div><div class='ctx'>  *</div><div class='del'>- * @op_mode: pointer to the upper layer.</div><div class='add'>+ * These values should be set before iwl_trans_op_mode_enter().</div><div class='add'>+ *</div><div class='ctx'>  * @cmd_queue: the index of the command queue.</div><div class='ctx'>  *	Must be set before start_fw.</div><div class='ctx'>  * @cmd_fifo: the fifo for host commands</div><div class='del'>- * @cmd_q_wdg_timeout: the timeout of the watchdog timer for the command queue.</div><div class='ctx'>  * @no_reclaim_cmds: Some devices erroneously don't set the</div><div class='ctx'>  *	SEQ_RX_FRAME bit on some notifications, this is the</div><div class='ctx'>  *	list of such notifications to filter. Max length is</div><div class='hunk'>@@ -376,8 +386,6 @@ struct iwl_hcmd_arr {</div><div class='ctx'>  * @n_no_reclaim_cmds: # of commands in list</div><div class='ctx'>  * @rx_buf_size: RX buffer size needed for A-MSDUs</div><div class='ctx'>  *	if unset 4k will be the RX buffer size</div><div class='del'>- * @bc_table_dword: set to true if the BC table expects the byte count to be</div><div class='del'>- *	in DWORD (as opposed to bytes)</div><div class='ctx'>  * @scd_set_active: should the transport configure the SCD for HCMD queue</div><div class='ctx'>  * @command_groups: array of command groups, each member is an array of the</div><div class='ctx'>  *	commands in the group; for debugging only</div><div class='hunk'>@@ -385,24 +393,44 @@ struct iwl_hcmd_arr {</div><div class='ctx'>  * @cb_data_offs: offset inside skb-&gt;cb to store transport data at, must have</div><div class='ctx'>  *	space for at least two pointers</div><div class='ctx'>  * @fw_reset_handshake: firmware supports reset flow handshake</div><div class='add'>+ * @queue_alloc_cmd_ver: queue allocation command version, set to 0</div><div class='add'>+ *	for using the older SCD_QUEUE_CFG, set to the version of</div><div class='add'>+ *	SCD_QUEUE_CONFIG_CMD otherwise.</div><div class='add'>+ * @wide_cmd_header: true when ucode supports wide command header format</div><div class='add'>+ * @rx_mpdu_cmd: MPDU RX command ID, must be assigned by opmode before</div><div class='add'>+ *	starting the firmware, used for tracing</div><div class='add'>+ * @rx_mpdu_cmd_hdr_size: used for tracing, amount of data before the</div><div class='add'>+ *	start of the 802.11 header in the @rx_mpdu_cmd</div><div class='add'>+ * @dsbr_urm_fw_dependent: switch to URM based on fw settings</div><div class='add'>+ * @dsbr_urm_permanent: switch to URM permanently</div><div class='add'>+ * @mbx_addr_0_step: step address data 0</div><div class='add'>+ * @mbx_addr_1_step: step address data 1</div><div class='add'>+ * @ext_32khz_clock_valid: if true, the external 32 KHz clock can be used</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_trans_config {</div><div class='del'>-	struct iwl_op_mode *op_mode;</div><div class='del'>-</div><div class='ctx'> 	u8 cmd_queue;</div><div class='ctx'> 	u8 cmd_fifo;</div><div class='del'>-	unsigned int cmd_q_wdg_timeout;</div><div class='del'>-	const u8 *no_reclaim_cmds;</div><div class='del'>-	unsigned int n_no_reclaim_cmds;</div><div class='add'>+	u8 n_no_reclaim_cmds;</div><div class='add'>+	u8 no_reclaim_cmds[MAX_NO_RECLAIM_CMDS];</div><div class='ctx'> </div><div class='ctx'> 	enum iwl_amsdu_size rx_buf_size;</div><div class='del'>-	bool bc_table_dword;</div><div class='ctx'> 	bool scd_set_active;</div><div class='ctx'> 	const struct iwl_hcmd_arr *command_groups;</div><div class='ctx'> 	int command_groups_size;</div><div class='ctx'> </div><div class='ctx'> 	u8 cb_data_offs;</div><div class='ctx'> 	bool fw_reset_handshake;</div><div class='add'>+	u8 queue_alloc_cmd_ver;</div><div class='add'>+</div><div class='add'>+	bool wide_cmd_header;</div><div class='add'>+	u8 rx_mpdu_cmd, rx_mpdu_cmd_hdr_size;</div><div class='add'>+</div><div class='add'>+	u8 dsbr_urm_fw_dependent:1,</div><div class='add'>+	   dsbr_urm_permanent:1,</div><div class='add'>+	   ext_32khz_clock_valid:1;</div><div class='add'>+</div><div class='add'>+	u32 mbx_addr_0_step;</div><div class='add'>+	u32 mbx_addr_1_step;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct iwl_trans_dump_data {</div><div class='hunk'>@@ -434,162 +462,22 @@ struct iwl_trans_rxq_dma_data {</div><div class='ctx'> 	u64 ur_bd_cb;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* maximal number of DRAM MAP entries supported by FW */</div><div class='add'>+#define IPC_DRAM_MAP_ENTRY_NUM_MAX 64</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * struct iwl_trans_ops - transport specific operations</div><div class='del'>- *</div><div class='del'>- * All the handlers MUST be implemented</div><div class='del'>- *</div><div class='del'>- * @start_hw: starts the HW. From that point on, the HW can send interrupts.</div><div class='del'>- *	May sleep.</div><div class='del'>- * @op_mode_leave: Turn off the HW RF kill indication if on</div><div class='del'>- *	May sleep</div><div class='del'>- * @start_fw: allocates and inits all the resources for the transport</div><div class='del'>- *	layer. Also kick a fw image.</div><div class='del'>- *	May sleep</div><div class='del'>- * @fw_alive: called when the fw sends alive notification. If the fw provides</div><div class='del'>- *	the SCD base address in SRAM, then provide it here, or 0 otherwise.</div><div class='del'>- *	May sleep</div><div class='del'>- * @stop_device: stops the whole device (embedded CPU put to reset) and stops</div><div class='del'>- *	the HW. From that point on, the HW will be stopped but will still issue</div><div class='del'>- *	an interrupt if the HW RF kill switch is triggered.</div><div class='del'>- *	This callback must do the right thing and not crash even if %start_hw()</div><div class='del'>- *	was called but not &amp;start_fw(). May sleep.</div><div class='del'>- * @d3_suspend: put the device into the correct mode for WoWLAN during</div><div class='del'>- *	suspend. This is optional, if not implemented WoWLAN will not be</div><div class='del'>- *	supported. This callback may sleep.</div><div class='del'>- * @d3_resume: resume the device after WoWLAN, enabling the opmode to</div><div class='del'>- *	talk to the WoWLAN image to get its status. This is optional, if not</div><div class='del'>- *	implemented WoWLAN will not be supported. This callback may sleep.</div><div class='del'>- * @send_cmd:send a host command. Must return -ERFKILL if RFkill is asserted.</div><div class='del'>- *	If RFkill is asserted in the middle of a SYNC host command, it must</div><div class='del'>- *	return -ERFKILL straight away.</div><div class='del'>- *	May sleep only if CMD_ASYNC is not set</div><div class='del'>- * @tx: send an skb. The transport relies on the op_mode to zero the</div><div class='del'>- *	the ieee80211_tx_info-&gt;driver_data. If the MPDU is an A-MSDU, all</div><div class='del'>- *	the CSUM will be taken care of (TCP CSUM and IP header in case of</div><div class='del'>- *	IPv4). If the MPDU is a single MSDU, the op_mode must compute the IP</div><div class='del'>- *	header if it is IPv4.</div><div class='del'>- *	Must be atomic</div><div class='del'>- * @reclaim: free packet until ssn. Returns a list of freed packets.</div><div class='del'>- *	Must be atomic</div><div class='del'>- * @txq_enable: setup a queue. To setup an AC queue, use the</div><div class='del'>- *	iwl_trans_ac_txq_enable wrapper. fw_alive must have been called before</div><div class='del'>- *	this one. The op_mode must not configure the HCMD queue. The scheduler</div><div class='del'>- *	configuration may be %NULL, in which case the hardware will not be</div><div class='del'>- *	configured. If true is returned, the operation mode needs to increment</div><div class='del'>- *	the sequence number of the packets routed to this queue because of a</div><div class='del'>- *	hardware scheduler bug. May sleep.</div><div class='del'>- * @txq_disable: de-configure a Tx queue to send AMPDUs</div><div class='del'>- *	Must be atomic</div><div class='del'>- * @txq_set_shared_mode: change Tx queue shared/unshared marking</div><div class='del'>- * @wait_tx_queues_empty: wait until tx queues are empty. May sleep.</div><div class='del'>- * @wait_txq_empty: wait until specific tx queue is empty. May sleep.</div><div class='del'>- * @freeze_txq_timer: prevents the timer of the queue from firing until the</div><div class='del'>- *	queue is set to awake. Must be atomic.</div><div class='del'>- * @block_txq_ptrs: stop updating the write pointers of the Tx queues. Note</div><div class='del'>- *	that the transport needs to refcount the calls since this function</div><div class='del'>- *	will be called several times with block = true, and then the queues</div><div class='del'>- *	need to be unblocked only after the same number of calls with</div><div class='del'>- *	block = false.</div><div class='del'>- * @write8: write a u8 to a register at offset ofs from the BAR</div><div class='del'>- * @write32: write a u32 to a register at offset ofs from the BAR</div><div class='del'>- * @read32: read a u32 register at offset ofs from the BAR</div><div class='del'>- * @read_prph: read a DWORD from a periphery register</div><div class='del'>- * @write_prph: write a DWORD to a periphery register</div><div class='del'>- * @read_mem: read device's SRAM in DWORD</div><div class='del'>- * @write_mem: write device's SRAM in DWORD. If %buf is %NULL, then the memory</div><div class='del'>- *	will be zeroed.</div><div class='del'>- * @read_config32: read a u32 value from the device's config space at</div><div class='del'>- *	the given offset.</div><div class='del'>- * @configure: configure parameters required by the transport layer from</div><div class='del'>- *	the op_mode. May be called several times before start_fw, can't be</div><div class='del'>- *	called after that.</div><div class='del'>- * @set_pmi: set the power pmi state</div><div class='del'>- * @grab_nic_access: wake the NIC to be able to access non-HBUS regs.</div><div class='del'>- *	Sleeping is not allowed between grab_nic_access and</div><div class='del'>- *	release_nic_access.</div><div class='del'>- * @release_nic_access: let the NIC go to sleep. The "flags" parameter</div><div class='del'>- *	must be the same one that was sent before to the grab_nic_access.</div><div class='del'>- * @set_bits_mask - set SRAM register according to value and mask.</div><div class='del'>- * @dump_data: return a vmalloc'ed buffer with debug data, maybe containing last</div><div class='del'>- *	TX'ed commands and similar. The buffer will be vfree'd by the caller.</div><div class='del'>- *	Note that the transport must fill in the proper file headers.</div><div class='del'>- * @debugfs_cleanup: used in the driver unload flow to make a proper cleanup</div><div class='del'>- *	of the trans debugfs</div><div class='del'>- * @set_pnvm: set the pnvm data in the prph scratch buffer, inside the</div><div class='del'>- *	context info.</div><div class='del'>- * @interrupts: disable/enable interrupts to transport</div><div class='add'>+ * struct iwl_pnvm_image - contains info about the parsed pnvm image</div><div class='add'>+ * @chunks: array of pointers to pnvm payloads and their sizes</div><div class='add'>+ * @n_chunks: the number of the pnvm payloads.</div><div class='add'>+ * @version: the version of the loaded PNVM image</div><div class='ctx'>  */</div><div class='del'>-struct iwl_trans_ops {</div><div class='del'>-</div><div class='del'>-	int (*start_hw)(struct iwl_trans *iwl_trans);</div><div class='del'>-	void (*op_mode_leave)(struct iwl_trans *iwl_trans);</div><div class='del'>-	int (*start_fw)(struct iwl_trans *trans, const struct fw_img *fw,</div><div class='del'>-			bool run_in_rfkill);</div><div class='del'>-	void (*fw_alive)(struct iwl_trans *trans, u32 scd_addr);</div><div class='del'>-	void (*stop_device)(struct iwl_trans *trans);</div><div class='del'>-</div><div class='del'>-	int (*d3_suspend)(struct iwl_trans *trans, bool test, bool reset);</div><div class='del'>-	int (*d3_resume)(struct iwl_trans *trans, enum iwl_d3_status *status,</div><div class='del'>-			 bool test, bool reset);</div><div class='del'>-</div><div class='del'>-	int (*send_cmd)(struct iwl_trans *trans, struct iwl_host_cmd *cmd);</div><div class='del'>-</div><div class='del'>-	int (*tx)(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='del'>-		  struct iwl_device_tx_cmd *dev_cmd, int queue);</div><div class='del'>-	void (*reclaim)(struct iwl_trans *trans, int queue, int ssn,</div><div class='del'>-			struct sk_buff_head *skbs);</div><div class='del'>-</div><div class='del'>-	void (*set_q_ptrs)(struct iwl_trans *trans, int queue, int ptr);</div><div class='del'>-</div><div class='del'>-	bool (*txq_enable)(struct iwl_trans *trans, int queue, u16 ssn,</div><div class='del'>-			   const struct iwl_trans_txq_scd_cfg *cfg,</div><div class='del'>-			   unsigned int queue_wdg_timeout);</div><div class='del'>-	void (*txq_disable)(struct iwl_trans *trans, int queue,</div><div class='del'>-			    bool configure_scd);</div><div class='del'>-	/* 22000 functions */</div><div class='del'>-	int (*txq_alloc)(struct iwl_trans *trans,</div><div class='del'>-			 __le16 flags, u8 sta_id, u8 tid,</div><div class='del'>-			 int cmd_id, int size,</div><div class='del'>-			 unsigned int queue_wdg_timeout);</div><div class='del'>-	void (*txq_free)(struct iwl_trans *trans, int queue);</div><div class='del'>-	int (*rxq_dma_data)(struct iwl_trans *trans, int queue,</div><div class='del'>-			    struct iwl_trans_rxq_dma_data *data);</div><div class='del'>-</div><div class='del'>-	void (*txq_set_shared_mode)(struct iwl_trans *trans, u32 txq_id,</div><div class='del'>-				    bool shared);</div><div class='del'>-</div><div class='del'>-	int (*wait_tx_queues_empty)(struct iwl_trans *trans, u32 txq_bm);</div><div class='del'>-	int (*wait_txq_empty)(struct iwl_trans *trans, int queue);</div><div class='del'>-	void (*freeze_txq_timer)(struct iwl_trans *trans, unsigned long txqs,</div><div class='del'>-				 bool freeze);</div><div class='del'>-	void (*block_txq_ptrs)(struct iwl_trans *trans, bool block);</div><div class='del'>-</div><div class='del'>-	void (*write8)(struct iwl_trans *trans, u32 ofs, u8 val);</div><div class='del'>-	void (*write32)(struct iwl_trans *trans, u32 ofs, u32 val);</div><div class='del'>-	u32 (*read32)(struct iwl_trans *trans, u32 ofs);</div><div class='del'>-	u32 (*read_prph)(struct iwl_trans *trans, u32 ofs);</div><div class='del'>-	void (*write_prph)(struct iwl_trans *trans, u32 ofs, u32 val);</div><div class='del'>-	int (*read_mem)(struct iwl_trans *trans, u32 addr,</div><div class='del'>-			void *buf, int dwords);</div><div class='del'>-	int (*write_mem)(struct iwl_trans *trans, u32 addr,</div><div class='del'>-			 const void *buf, int dwords);</div><div class='del'>-	int (*read_config32)(struct iwl_trans *trans, u32 ofs, u32 *val);</div><div class='del'>-	void (*configure)(struct iwl_trans *trans,</div><div class='del'>-			  const struct iwl_trans_config *trans_cfg);</div><div class='del'>-	void (*set_pmi)(struct iwl_trans *trans, bool state);</div><div class='del'>-	void (*sw_reset)(struct iwl_trans *trans);</div><div class='del'>-	bool (*grab_nic_access)(struct iwl_trans *trans);</div><div class='del'>-	void (*release_nic_access)(struct iwl_trans *trans);</div><div class='del'>-	void (*set_bits_mask)(struct iwl_trans *trans, u32 reg, u32 mask,</div><div class='del'>-			      u32 value);</div><div class='del'>-</div><div class='del'>-	struct iwl_trans_dump_data *(*dump_data)(struct iwl_trans *trans,</div><div class='del'>-						 u32 dump_mask);</div><div class='del'>-	void (*debugfs_cleanup)(struct iwl_trans *trans);</div><div class='del'>-	void (*sync_nmi)(struct iwl_trans *trans);</div><div class='del'>-	int (*set_pnvm)(struct iwl_trans *trans, const void *data, u32 len);</div><div class='del'>-	void (*interrupts)(struct iwl_trans *trans, bool enable);</div><div class='add'>+struct iwl_pnvm_image {</div><div class='add'>+	struct {</div><div class='add'>+		const void *data;</div><div class='add'>+		u32 len;</div><div class='add'>+	} chunks[IPC_DRAM_MAP_ENTRY_NUM_MAX];</div><div class='add'>+	u32 n_chunks;</div><div class='add'>+	u32 version;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -628,24 +516,7 @@ enum iwl_trans_state {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum iwl_plat_pm_mode - platform power management mode</div><div class='del'>- *</div><div class='del'>- * This enumeration describes the device's platform power management</div><div class='del'>- * behavior when in system-wide suspend (i.e WoWLAN).</div><div class='del'>- *</div><div class='del'>- * @IWL_PLAT_PM_MODE_DISABLED: power management is disabled for this</div><div class='del'>- *	device.  In system-wide suspend mode, it means that the all</div><div class='del'>- *	connections will be closed automatically by mac80211 before</div><div class='del'>- *	the platform is suspended.</div><div class='del'>- * @IWL_PLAT_PM_MODE_D3: the device goes into D3 mode (i.e. WoWLAN).</div><div class='del'>- */</div><div class='del'>-enum iwl_plat_pm_mode {</div><div class='del'>-	IWL_PLAT_PM_MODE_DISABLED,</div><div class='del'>-	IWL_PLAT_PM_MODE_D3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * enum iwl_ini_cfg_state</div><div class='add'>+ * enum iwl_ini_cfg_state - debug config state</div><div class='ctx'>  * @IWL_INI_CFG_STATE_NOT_LOADED: no debug cfg was given</div><div class='ctx'>  * @IWL_INI_CFG_STATE_LOADED: debug cfg was found and loaded</div><div class='ctx'>  * @IWL_INI_CFG_STATE_CORRUPTED: debug cfg was found and some of the TLVs</div><div class='hunk'>@@ -661,7 +532,7 @@ enum iwl_ini_cfg_state {</div><div class='ctx'> #define IWL_TRANS_NMI_TIMEOUT (HZ / 4)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_dram_data</div><div class='add'>+ * struct iwl_dram_data - DRAM data descriptor</div><div class='ctx'>  * @physical: page phy pointer</div><div class='ctx'>  * @block: pointer to the allocated block/page</div><div class='ctx'>  * @size: size of the block/page</div><div class='hunk'>@@ -673,6 +544,20 @@ struct iwl_dram_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct iwl_dram_regions - DRAM regions container structure</div><div class='add'>+ * @drams: array of several DRAM areas that contains the pnvm and power</div><div class='add'>+ *	reduction table payloads.</div><div class='add'>+ * @n_regions: number of DRAM regions that were allocated</div><div class='add'>+ * @prph_scratch_mem_desc: points to a structure allocated in dram,</div><div class='add'>+ *	designed to show FW where all the payloads are.</div><div class='add'>+ */</div><div class='add'>+struct iwl_dram_regions {</div><div class='add'>+	struct iwl_dram_data drams[IPC_DRAM_MAP_ENTRY_NUM_MAX];</div><div class='add'>+	struct iwl_dram_data prph_scratch_mem_desc;</div><div class='add'>+	u8 n_regions;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_fw_mon - fw monitor per allocation id</div><div class='ctx'>  * @num_frags: number of fragments</div><div class='ctx'>  * @frags: an array of DRAM buffer fragments</div><div class='hunk'>@@ -697,15 +582,47 @@ struct iwl_self_init_dram {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct iwl_imr_data - imr dram data used during debug process</div><div class='add'>+ * @imr_enable: imr enable status received from fw</div><div class='add'>+ * @imr_size: imr dram size received from fw</div><div class='add'>+ * @sram_addr: sram address from debug tlv</div><div class='add'>+ * @sram_size: sram size from debug tlv</div><div class='add'>+ * @imr2sram_remainbyte: size remained after each dma transfer</div><div class='add'>+ * @imr_curr_addr: current dst address used during dma transfer</div><div class='add'>+ * @imr_base_addr: imr address received from fw</div><div class='add'>+ */</div><div class='add'>+struct iwl_imr_data {</div><div class='add'>+	u32 imr_enable;</div><div class='add'>+	u32 imr_size;</div><div class='add'>+	u32 sram_addr;</div><div class='add'>+	u32 sram_size;</div><div class='add'>+	u32 imr2sram_remainbyte;</div><div class='add'>+	u64 imr_curr_addr;</div><div class='add'>+	__le64 imr_base_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IWL_TRANS_CURRENT_PC_NAME_MAX_BYTES      32</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_pc_data - program counter details</div><div class='add'>+ * @pc_name: cpu name</div><div class='add'>+ * @pc_address: cpu program counter</div><div class='add'>+ */</div><div class='add'>+struct iwl_pc_data {</div><div class='add'>+	u8  pc_name[IWL_TRANS_CURRENT_PC_NAME_MAX_BYTES];</div><div class='add'>+	u32 pc_address;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_trans_debug - transport debug related data</div><div class='ctx'>  *</div><div class='ctx'>  * @n_dest_reg: num of reg_ops in %dbg_dest_tlv</div><div class='ctx'>  * @rec_on: true iff there is a fw debug recording currently active</div><div class='ctx'>  * @dest_tlv: points to the destination TLV for debug</div><div class='del'>- * @conf_tlv: array of pointers to configuration TLVs for debug</div><div class='del'>- * @trigger_tlv: array of pointers to triggers TLVs for debug</div><div class='ctx'>  * @lmac_error_event_table: addrs of lmacs error tables</div><div class='ctx'>  * @umac_error_event_table: addr of umac error table</div><div class='add'>+ * @tcm_error_event_table: address(es) of TCM error table(s)</div><div class='add'>+ * @rcm_error_event_table: address(es) of RCM error table(s)</div><div class='ctx'>  * @error_event_table_tlv_status: bitmap that indicates what error table</div><div class='ctx'>  *	pointers was recevied via TLV. uses enum &amp;iwl_error_event_table_status</div><div class='ctx'>  * @internal_ini_cfg: internal debug cfg state. Uses &amp;enum iwl_ini_cfg_state</div><div class='hunk'>@@ -715,23 +632,30 @@ struct iwl_self_init_dram {</div><div class='ctx'>  * @fw_mon: DRAM buffer for firmware monitor</div><div class='ctx'>  * @hw_error: equals true if hw error interrupt was received from the FW</div><div class='ctx'>  * @ini_dest: debug monitor destination uses &amp;enum iwl_fw_ini_buffer_location</div><div class='add'>+ * @unsupported_region_msk: unsupported regions out of active_regions</div><div class='ctx'>  * @active_regions: active regions</div><div class='ctx'>  * @debug_info_tlv_list: list of debug info TLVs</div><div class='ctx'>  * @time_point: array of debug time points</div><div class='ctx'>  * @periodic_trig_list: periodic triggers list</div><div class='del'>- * @domains_bitmap: bitmap of active domains other than</div><div class='del'>- *	&amp;IWL_FW_INI_DOMAIN_ALWAYS_ON</div><div class='add'>+ * @domains_bitmap: bitmap of active domains other than &amp;IWL_FW_INI_DOMAIN_ALWAYS_ON</div><div class='add'>+ * @ucode_preset: preset based on ucode</div><div class='add'>+ * @restart_required: indicates debug restart is required</div><div class='add'>+ * @last_tp_resetfw: last handling of reset during debug timepoint</div><div class='add'>+ * @imr_data: IMR debug data allocation</div><div class='add'>+ * @num_pc: number of program counter for cpu</div><div class='add'>+ * @pc_data: details of the program counter</div><div class='add'>+ * @yoyo_bin_loaded: tells if a yoyo debug file has been loaded</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_trans_debug {</div><div class='ctx'> 	u8 n_dest_reg;</div><div class='ctx'> 	bool rec_on;</div><div class='ctx'> </div><div class='ctx'> 	const struct iwl_fw_dbg_dest_tlv_v1 *dest_tlv;</div><div class='del'>-	const struct iwl_fw_dbg_conf_tlv *conf_tlv[FW_DBG_CONF_MAX];</div><div class='del'>-	struct iwl_fw_dbg_trigger_tlv * const *trigger_tlv;</div><div class='ctx'> </div><div class='ctx'> 	u32 lmac_error_event_table[2];</div><div class='ctx'> 	u32 umac_error_event_table;</div><div class='add'>+	u32 tcm_error_event_table[2];</div><div class='add'>+	u32 rcm_error_event_table[2];</div><div class='ctx'> 	unsigned int error_event_table_tlv_status;</div><div class='ctx'> </div><div class='ctx'> 	enum iwl_ini_cfg_state internal_ini_cfg;</div><div class='hunk'>@@ -748,11 +672,17 @@ struct iwl_trans_debug {</div><div class='ctx'> 	u64 unsupported_region_msk;</div><div class='ctx'> 	struct iwl_ucode_tlv *active_regions[IWL_FW_INI_MAX_REGION_ID];</div><div class='ctx'> 	struct list_head debug_info_tlv_list;</div><div class='del'>-	struct iwl_dbg_tlv_time_point_data</div><div class='del'>-		time_point[IWL_FW_INI_TIME_POINT_NUM];</div><div class='add'>+	struct iwl_dbg_tlv_time_point_data time_point[IWL_FW_INI_TIME_POINT_NUM];</div><div class='ctx'> 	struct list_head periodic_trig_list;</div><div class='ctx'> </div><div class='ctx'> 	u32 domains_bitmap;</div><div class='add'>+	u32 ucode_preset;</div><div class='add'>+	bool restart_required;</div><div class='add'>+	u32 last_tp_resetfw;</div><div class='add'>+	struct iwl_imr_data imr_data;</div><div class='add'>+	u32 num_pc;</div><div class='add'>+	struct iwl_pc_data *pc_data;</div><div class='add'>+	bool yoyo_bin_loaded;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct iwl_dma_ptr {</div><div class='hunk'>@@ -764,7 +694,9 @@ struct iwl_dma_ptr {</div><div class='ctx'> struct iwl_cmd_meta {</div><div class='ctx'> 	/* only for SYNC commands, iff the reply skb is wanted */</div><div class='ctx'> 	struct iwl_host_cmd *source;</div><div class='del'>-	u32 flags;</div><div class='add'>+	u32 flags: CMD_MODE_BITS;</div><div class='add'>+	/* sg_offset is valid if it is non-zero */</div><div class='add'>+	u32 sg_offset: PAGE_SHIFT;</div><div class='ctx'> 	u32 tbs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -794,7 +726,6 @@ struct iwl_pcie_first_tb_buf {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_txq - Tx Queue for DMA</div><div class='del'>- * @q: generic Rx/Tx queue descriptor</div><div class='ctx'>  * @tfds: transmit frame descriptors (DMA memory)</div><div class='ctx'>  * @first_tb_bufs: start of command headers, including scratch buffers, for</div><div class='ctx'>  *	the writeback -- this is DMA memory and an array holding one buffer</div><div class='hunk'>@@ -802,6 +733,7 @@ struct iwl_pcie_first_tb_buf {</div><div class='ctx'>  * @first_tb_dma: DMA address for the first_tb_bufs start</div><div class='ctx'>  * @entries: transmit entries (driver state)</div><div class='ctx'>  * @lock: queue lock</div><div class='add'>+ * @reclaim_lock: reclaim lock</div><div class='ctx'>  * @stuck_timer: timer that fires if queue gets stuck</div><div class='ctx'>  * @trans: pointer back to transport (for timer)</div><div class='ctx'>  * @need_update: indicates need to update read/write index</div><div class='hunk'>@@ -809,6 +741,7 @@ struct iwl_pcie_first_tb_buf {</div><div class='ctx'>  * @wd_timeout: queue watchdog timeout (jiffies) - per queue</div><div class='ctx'>  * @frozen: tx stuck queue timer is frozen</div><div class='ctx'>  * @frozen_expiry_remainder: remember how long until the timer fires</div><div class='add'>+ * @block: queue is blocked</div><div class='ctx'>  * @bc_tbl: byte count table of the queue (relevant only for gen2 transport)</div><div class='ctx'>  * @write_ptr: 1-st empty entry (index) host_w</div><div class='ctx'>  * @read_ptr: last used entry (index) host_r</div><div class='hunk'>@@ -817,6 +750,8 @@ struct iwl_pcie_first_tb_buf {</div><div class='ctx'>  * @id: queue id</div><div class='ctx'>  * @low_mark: low watermark, resume queue if free space more than this</div><div class='ctx'>  * @high_mark: high watermark, stop queue if free space less than this</div><div class='add'>+ * @overflow_q: overflow queue for handling frames that didn't fit on HW queue</div><div class='add'>+ * @overflow_tx: need to transmit from overflow</div><div class='ctx'>  *</div><div class='ctx'>  * A Tx queue consists of circular buffer of BDs (a.k.a. TFDs, transmit frame</div><div class='ctx'>  * descriptors) and required locking structures.</div><div class='hunk'>@@ -841,6 +776,8 @@ struct iwl_txq {</div><div class='ctx'> 	struct iwl_pcie_txq_entry *entries;</div><div class='ctx'> 	/* lock for syncing changes on the queue */</div><div class='ctx'> 	spinlock_t lock;</div><div class='add'>+	/* lock to prevent concurrent reclaim */</div><div class='add'>+	spinlock_t reclaim_lock;</div><div class='ctx'> 	unsigned long frozen_expiry_remainder;</div><div class='ctx'> 	struct timer_list stuck_timer;</div><div class='ctx'> 	struct iwl_trans *trans;</div><div class='hunk'>@@ -864,113 +801,91 @@ struct iwl_txq {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_trans_txqs - transport tx queues data</div><div class='del'>- *</div><div class='del'>- * @bc_table_dword: true if the BC table expects DWORD (as opposed to bytes)</div><div class='del'>- * @page_offs: offset from skb-&gt;cb to mac header page pointer</div><div class='del'>- * @dev_cmd_offs: offset from skb-&gt;cb to iwl_device_tx_cmd pointer</div><div class='del'>- * @queue_used - bit mask of used queues</div><div class='del'>- * @queue_stopped - bit mask of stopped queues</div><div class='del'>- * @scd_bc_tbls: gen1 pointer to the byte count table of the scheduler</div><div class='add'>+ * struct iwl_trans_info - transport info for outside use</div><div class='add'>+ * @name: the device name</div><div class='add'>+ * @max_skb_frags: maximum number of fragments an SKB can have when transmitted.</div><div class='add'>+ *	0 indicates that frag SKBs (NETIF_F_SG) aren't supported.</div><div class='add'>+ * @hw_rev: the revision data of the HW</div><div class='add'>+ * @hw_rev_step: The mac step of the HW</div><div class='add'>+ * @hw_rf_id: the device RF ID</div><div class='add'>+ * @hw_cnv_id: the device CNV ID</div><div class='add'>+ * @hw_crf_id: the device CRF ID</div><div class='add'>+ * @hw_id: the ID of the device / sub-device</div><div class='add'>+ *	Bits 0:15 represent the sub-device ID</div><div class='add'>+ *	Bits 16:31 represent the device ID.</div><div class='add'>+ * @pcie_link_speed: current PCIe link speed (%PCI_EXP_LNKSTA_CLS_*),</div><div class='add'>+ *	only valid for discrete (not integrated) NICs</div><div class='add'>+ * @num_rxqs: number of RX queues allocated by the transport</div><div class='ctx'>  */</div><div class='del'>-struct iwl_trans_txqs {</div><div class='del'>-	unsigned long queue_used[BITS_TO_LONGS(IWL_MAX_TVQM_QUEUES)];</div><div class='del'>-	unsigned long queue_stopped[BITS_TO_LONGS(IWL_MAX_TVQM_QUEUES)];</div><div class='del'>-	struct iwl_txq *txq[IWL_MAX_TVQM_QUEUES];</div><div class='del'>-	struct dma_pool *bc_pool;</div><div class='del'>-	size_t bc_tbl_size;</div><div class='del'>-	bool bc_table_dword;</div><div class='del'>-	u8 page_offs;</div><div class='del'>-	u8 dev_cmd_offs;</div><div class='del'>-	struct __percpu iwl_tso_hdr_page * tso_hdr_page;</div><div class='del'>-</div><div class='del'>-	struct {</div><div class='del'>-		u8 fifo;</div><div class='del'>-		u8 q_id;</div><div class='del'>-		unsigned int wdg_timeout;</div><div class='del'>-	} cmd;</div><div class='del'>-</div><div class='del'>-	struct {</div><div class='del'>-		u8 max_tbs;</div><div class='del'>-		u16 size;</div><div class='del'>-		u8 addr_size;</div><div class='del'>-	} tfd;</div><div class='del'>-</div><div class='del'>-	struct iwl_dma_ptr scd_bc_tbls;</div><div class='add'>+struct iwl_trans_info {</div><div class='add'>+	const char *name;</div><div class='add'>+	u32 max_skb_frags;</div><div class='add'>+	u32 hw_rev;</div><div class='add'>+	u32 hw_rev_step;</div><div class='add'>+	u32 hw_rf_id;</div><div class='add'>+	u32 hw_crf_id;</div><div class='add'>+	u32 hw_cnv_id;</div><div class='add'>+	u32 hw_id;</div><div class='add'>+	u8 pcie_link_speed;</div><div class='add'>+	u8 num_rxqs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_trans - transport common data</div><div class='ctx'>  *</div><div class='del'>- * @ops - pointer to iwl_trans_ops</div><div class='del'>- * @op_mode - pointer to the op_mode</div><div class='del'>- * @trans_cfg: the trans-specific configuration part</div><div class='del'>- * @cfg - pointer to the configuration</div><div class='del'>- * @drv - pointer to iwl_drv</div><div class='add'>+ * @csme_own: true if we couldn't get ownership on the device</div><div class='add'>+ * @op_mode: pointer to the op_mode</div><div class='add'>+ * @mac_cfg: the trans-specific configuration part</div><div class='add'>+ * @cfg: pointer to the configuration</div><div class='add'>+ * @drv: pointer to iwl_drv</div><div class='add'>+ * @conf: configuration set by the opmode before enter</div><div class='add'>+ * @state: current device state</div><div class='ctx'>  * @status: a bit-mask of transport status flags</div><div class='del'>- * @dev - pointer to struct device * that represents the device</div><div class='del'>- * @max_skb_frags: maximum number of fragments an SKB can have when transmitted.</div><div class='del'>- *	0 indicates that frag SKBs (NETIF_F_SG) aren't supported.</div><div class='del'>- * @hw_rf_id a u32 with the device RF ID</div><div class='del'>- * @hw_id: a u32 with the ID of the device / sub-device.</div><div class='del'>- *	Set during transport allocation.</div><div class='del'>- * @hw_id_str: a string with info about HW ID. Set during transport allocation.</div><div class='del'>- * @pm_support: set to true in start_hw if link pm is supported</div><div class='del'>- * @ltr_enabled: set to true if the LTR is enabled</div><div class='del'>- * @wide_cmd_header: true when ucode supports wide command header format</div><div class='del'>- * @wait_command_queue: wait queue for sync commands</div><div class='del'>- * @num_rx_queues: number of RX queues allocated by the transport;</div><div class='del'>- *	the transport must set this before calling iwl_drv_start()</div><div class='del'>- * @iml_len: the length of the image loader</div><div class='del'>- * @iml: a pointer to the image loader itself</div><div class='del'>- * @dev_cmd_pool: pool for Tx cmd allocation - for internal use only.</div><div class='del'>- *	The user should use iwl_trans_{alloc,free}_tx_cmd.</div><div class='del'>- * @rx_mpdu_cmd: MPDU RX command ID, must be assigned by opmode before</div><div class='del'>- *	starting the firmware, used for tracing</div><div class='del'>- * @rx_mpdu_cmd_hdr_size: used for tracing, amount of data before the</div><div class='del'>- *	start of the 802.11 header in the @rx_mpdu_cmd</div><div class='del'>- * @dflt_pwr_limit: default power limit fetched from the platform (ACPI)</div><div class='del'>- * @system_pm_mode: the system-wide power management mode in use.</div><div class='del'>- *	This mode is set dynamically, depending on the WoWLAN values</div><div class='del'>- *	configured from the userspace at runtime.</div><div class='del'>- * @iwl_trans_txqs: transport tx queues data.</div><div class='add'>+ * @dev: pointer to struct device * that represents the device</div><div class='add'>+ * @info: device information for use by other layers</div><div class='add'>+ * @pnvm_loaded: indicates PNVM was loaded</div><div class='add'>+ * @suppress_cmd_error_once: suppress "FW error in SYNC CMD" once,</div><div class='add'>+ *	e.g. for testing</div><div class='add'>+ * @fail_to_parse_pnvm_image: set to true if pnvm parsing failed</div><div class='add'>+ * @reduce_power_loaded: indicates reduced power section was loaded</div><div class='add'>+ * @failed_to_load_reduce_power_image: set to true if pnvm loading failed</div><div class='add'>+ * @dbgfs_dir: iwlwifi debugfs base dir for this device</div><div class='add'>+ * @sync_cmd_lockdep_map: lockdep map for checking sync commands</div><div class='add'>+ * @dbg: additional debug data, see &amp;struct iwl_trans_debug</div><div class='add'>+ * @init_dram: FW initialization DMA data</div><div class='add'>+ * @reduced_cap_sku: reduced capability supported SKU</div><div class='add'>+ * @step_urm: STEP is in URM, no support for MCS&gt;9 in 320 MHz</div><div class='add'>+ * @restart: restart worker data</div><div class='add'>+ * @restart.wk: restart worker</div><div class='add'>+ * @restart.mode: reset/restart error mode information</div><div class='add'>+ * @restart.during_reset: error occurred during previous software reset</div><div class='add'>+ * @trans_specific: data for the specific transport this is allocated for/with</div><div class='add'>+ * @request_top_reset: TOP reset was requested, used by the reset</div><div class='add'>+ *	worker that should be scheduled (with appropriate reason)</div><div class='add'>+ * @do_top_reset: indication to the (PCIe) transport/context-info</div><div class='add'>+ *	to do the TOP reset</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_trans {</div><div class='del'>-	const struct iwl_trans_ops *ops;</div><div class='add'>+	bool csme_own;</div><div class='ctx'> 	struct iwl_op_mode *op_mode;</div><div class='del'>-	const struct iwl_cfg_trans_params *trans_cfg;</div><div class='del'>-	const struct iwl_cfg *cfg;</div><div class='add'>+	const struct iwl_mac_cfg *mac_cfg;</div><div class='add'>+	const struct iwl_rf_cfg *cfg;</div><div class='ctx'> 	struct iwl_drv *drv;</div><div class='add'>+	struct iwl_trans_config conf;</div><div class='ctx'> 	enum iwl_trans_state state;</div><div class='ctx'> 	unsigned long status;</div><div class='ctx'> </div><div class='ctx'> 	struct device *dev;</div><div class='del'>-	u32 max_skb_frags;</div><div class='del'>-	u32 hw_rev;</div><div class='del'>-	u32 hw_rf_id;</div><div class='del'>-	u32 hw_id;</div><div class='del'>-	char hw_id_str[52];</div><div class='del'>-	u32 sku_id[3];</div><div class='ctx'> </div><div class='del'>-	u8 rx_mpdu_cmd, rx_mpdu_cmd_hdr_size;</div><div class='add'>+	const struct iwl_trans_info info;</div><div class='add'>+	bool reduced_cap_sku;</div><div class='add'>+	bool step_urm;</div><div class='add'>+	bool suppress_cmd_error_once;</div><div class='ctx'> </div><div class='del'>-	bool pm_support;</div><div class='del'>-	bool ltr_enabled;</div><div class='ctx'> 	u8 pnvm_loaded:1;</div><div class='del'>-</div><div class='del'>-	const struct iwl_hcmd_arr *command_groups;</div><div class='del'>-	int command_groups_size;</div><div class='del'>-	bool wide_cmd_header;</div><div class='del'>-</div><div class='del'>-	wait_queue_head_t wait_command_queue;</div><div class='del'>-	u8 num_rx_queues;</div><div class='del'>-</div><div class='del'>-	size_t iml_len;</div><div class='del'>-	u8 *iml;</div><div class='del'>-</div><div class='del'>-	/* The following fields are internal only */</div><div class='del'>-	struct kmem_cache *dev_cmd_pool;</div><div class='del'>-	char dev_cmd_pool_name[50];</div><div class='add'>+	u8 fail_to_parse_pnvm_image:1;</div><div class='add'>+	u8 reduce_power_loaded:1;</div><div class='add'>+	u8 failed_to_load_reduce_power_image:1;</div><div class='ctx'> </div><div class='ctx'> 	struct dentry *dbgfs_dir;</div><div class='ctx'> </div><div class='hunk'>@@ -981,10 +896,14 @@ struct iwl_trans {</div><div class='ctx'> 	struct iwl_trans_debug dbg;</div><div class='ctx'> 	struct iwl_self_init_dram init_dram;</div><div class='ctx'> </div><div class='del'>-	enum iwl_plat_pm_mode system_pm_mode;</div><div class='add'>+	struct {</div><div class='add'>+		struct delayed_work wk;</div><div class='add'>+		struct iwl_fw_error_dump_mode mode;</div><div class='add'>+		bool during_reset;</div><div class='add'>+	} restart;</div><div class='ctx'> </div><div class='del'>-	const char *name;</div><div class='del'>-	struct iwl_trans_txqs txqs;</div><div class='add'>+	u8 request_top_reset:1,</div><div class='add'>+	   do_top_reset:1;</div><div class='ctx'> </div><div class='ctx'> 	/* pointer to trans specific struct */</div><div class='ctx'> 	/*Ensure that this pointer will always be aligned to sizeof pointer */</div><div class='hunk'>@@ -992,218 +911,62 @@ struct iwl_trans {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const char *iwl_get_cmd_string(struct iwl_trans *trans, u32 id);</div><div class='del'>-int iwl_cmd_groups_verify_sorted(const struct iwl_trans_config *trans);</div><div class='del'>-</div><div class='del'>-static inline void iwl_trans_configure(struct iwl_trans *trans,</div><div class='del'>-				       const struct iwl_trans_config *trans_cfg)</div><div class='del'>-{</div><div class='del'>-	trans-&gt;op_mode = trans_cfg-&gt;op_mode;</div><div class='del'>-</div><div class='del'>-	trans-&gt;ops-&gt;configure(trans, trans_cfg);</div><div class='del'>-	WARN_ON(iwl_cmd_groups_verify_sorted(trans_cfg));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int iwl_trans_start_hw(struct iwl_trans *trans)</div><div class='del'>-{</div><div class='del'>-	might_sleep();</div><div class='del'>-</div><div class='del'>-	return trans-&gt;ops-&gt;start_hw(trans);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void iwl_trans_op_mode_leave(struct iwl_trans *trans)</div><div class='del'>-{</div><div class='del'>-	might_sleep();</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;ops-&gt;op_mode_leave)</div><div class='del'>-		trans-&gt;ops-&gt;op_mode_leave(trans);</div><div class='del'>-</div><div class='del'>-	trans-&gt;op_mode = NULL;</div><div class='del'>-</div><div class='del'>-	trans-&gt;state = IWL_TRANS_NO_FW;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void iwl_trans_fw_alive(struct iwl_trans *trans, u32 scd_addr)</div><div class='del'>-{</div><div class='del'>-	might_sleep();</div><div class='ctx'> </div><div class='del'>-	trans-&gt;state = IWL_TRANS_FW_ALIVE;</div><div class='add'>+void iwl_trans_op_mode_enter(struct iwl_trans *trans,</div><div class='add'>+			     struct iwl_op_mode *op_mode);</div><div class='ctx'> </div><div class='del'>-	trans-&gt;ops-&gt;fw_alive(trans, scd_addr);</div><div class='del'>-}</div><div class='add'>+int iwl_trans_start_hw(struct iwl_trans *trans);</div><div class='ctx'> </div><div class='del'>-static inline int iwl_trans_start_fw(struct iwl_trans *trans,</div><div class='del'>-				     const struct fw_img *fw,</div><div class='del'>-				     bool run_in_rfkill)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='add'>+void iwl_trans_op_mode_leave(struct iwl_trans *trans);</div><div class='ctx'> </div><div class='del'>-	might_sleep();</div><div class='add'>+void iwl_trans_fw_alive(struct iwl_trans *trans);</div><div class='ctx'> </div><div class='del'>-	WARN_ON_ONCE(!trans-&gt;rx_mpdu_cmd);</div><div class='add'>+int iwl_trans_start_fw(struct iwl_trans *trans, const struct iwl_fw *fw,</div><div class='add'>+		       enum iwl_ucode_type ucode_type, bool run_in_rfkill);</div><div class='ctx'> </div><div class='del'>-	clear_bit(STATUS_FW_ERROR, &amp;trans-&gt;status);</div><div class='del'>-	ret = trans-&gt;ops-&gt;start_fw(trans, fw, run_in_rfkill);</div><div class='del'>-	if (ret == 0)</div><div class='del'>-		trans-&gt;state = IWL_TRANS_FW_STARTED;</div><div class='add'>+void iwl_trans_stop_device(struct iwl_trans *trans);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='add'>+int iwl_trans_d3_suspend(struct iwl_trans *trans, bool reset);</div><div class='ctx'> </div><div class='del'>-static inline void iwl_trans_stop_device(struct iwl_trans *trans)</div><div class='del'>-{</div><div class='del'>-	might_sleep();</div><div class='add'>+int iwl_trans_d3_resume(struct iwl_trans *trans, bool reset);</div><div class='ctx'> </div><div class='del'>-	trans-&gt;ops-&gt;stop_device(trans);</div><div class='add'>+struct iwl_trans_dump_data *</div><div class='add'>+iwl_trans_dump_data(struct iwl_trans *trans, u32 dump_mask,</div><div class='add'>+		    const struct iwl_dump_sanitize_ops *sanitize_ops,</div><div class='add'>+		    void *sanitize_ctx);</div><div class='ctx'> </div><div class='del'>-	trans-&gt;state = IWL_TRANS_NO_FW;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int iwl_trans_d3_suspend(struct iwl_trans *trans, bool test,</div><div class='del'>-				       bool reset)</div><div class='del'>-{</div><div class='del'>-	might_sleep();</div><div class='del'>-	if (!trans-&gt;ops-&gt;d3_suspend)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return trans-&gt;ops-&gt;d3_suspend(trans, test, reset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int iwl_trans_d3_resume(struct iwl_trans *trans,</div><div class='del'>-				      enum iwl_d3_status *status,</div><div class='del'>-				      bool test, bool reset)</div><div class='del'>-{</div><div class='del'>-	might_sleep();</div><div class='del'>-	if (!trans-&gt;ops-&gt;d3_resume)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return trans-&gt;ops-&gt;d3_resume(trans, status, test, reset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct iwl_trans_dump_data *</div><div class='del'>-iwl_trans_dump_data(struct iwl_trans *trans, u32 dump_mask)</div><div class='del'>-{</div><div class='del'>-	if (!trans-&gt;ops-&gt;dump_data)</div><div class='del'>-		return NULL;</div><div class='del'>-	return trans-&gt;ops-&gt;dump_data(trans, dump_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct iwl_device_tx_cmd *</div><div class='del'>-iwl_trans_alloc_tx_cmd(struct iwl_trans *trans)</div><div class='del'>-{</div><div class='del'>-	return kmem_cache_zalloc(trans-&gt;dev_cmd_pool, GFP_ATOMIC);</div><div class='del'>-}</div><div class='add'>+struct iwl_device_tx_cmd *iwl_trans_alloc_tx_cmd(struct iwl_trans *trans);</div><div class='ctx'> </div><div class='ctx'> int iwl_trans_send_cmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd);</div><div class='ctx'> </div><div class='del'>-static inline void iwl_trans_free_tx_cmd(struct iwl_trans *trans,</div><div class='del'>-					 struct iwl_device_tx_cmd *dev_cmd)</div><div class='del'>-{</div><div class='del'>-	kmem_cache_free(trans-&gt;dev_cmd_pool, dev_cmd);</div><div class='del'>-}</div><div class='add'>+void iwl_trans_free_tx_cmd(struct iwl_trans *trans,</div><div class='add'>+			   struct iwl_device_tx_cmd *dev_cmd);</div><div class='ctx'> </div><div class='del'>-static inline int iwl_trans_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='del'>-			       struct iwl_device_tx_cmd *dev_cmd, int queue)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(test_bit(STATUS_FW_ERROR, &amp;trans-&gt;status)))</div><div class='del'>-		return -EIO;</div><div class='add'>+int iwl_trans_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='add'>+		 struct iwl_device_tx_cmd *dev_cmd, int queue);</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(trans-&gt;state != IWL_TRANS_FW_ALIVE)) {</div><div class='del'>-		IWL_ERR(trans, "%s bad state = %d\n", __func__, trans-&gt;state);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='add'>+void iwl_trans_reclaim(struct iwl_trans *trans, int queue, int ssn,</div><div class='add'>+		       struct sk_buff_head *skbs, bool is_flush);</div><div class='ctx'> </div><div class='del'>-	return trans-&gt;ops-&gt;tx(trans, skb, dev_cmd, queue);</div><div class='del'>-}</div><div class='add'>+void iwl_trans_set_q_ptrs(struct iwl_trans *trans, int queue, int ptr);</div><div class='ctx'> </div><div class='del'>-static inline void iwl_trans_reclaim(struct iwl_trans *trans, int queue,</div><div class='del'>-				     int ssn, struct sk_buff_head *skbs)</div><div class='del'>-{</div><div class='del'>-	if (WARN_ON_ONCE(trans-&gt;state != IWL_TRANS_FW_ALIVE)) {</div><div class='del'>-		IWL_ERR(trans, "%s bad state = %d\n", __func__, trans-&gt;state);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+void iwl_trans_txq_disable(struct iwl_trans *trans, int queue,</div><div class='add'>+			   bool configure_scd);</div><div class='ctx'> </div><div class='del'>-	trans-&gt;ops-&gt;reclaim(trans, queue, ssn, skbs);</div><div class='del'>-}</div><div class='add'>+bool iwl_trans_txq_enable_cfg(struct iwl_trans *trans, int queue, u16 ssn,</div><div class='add'>+			      const struct iwl_trans_txq_scd_cfg *cfg,</div><div class='add'>+			      unsigned int queue_wdg_timeout);</div><div class='ctx'> </div><div class='del'>-static inline void iwl_trans_set_q_ptrs(struct iwl_trans *trans, int queue,</div><div class='del'>-					int ptr)</div><div class='del'>-{</div><div class='del'>-	if (WARN_ON_ONCE(trans-&gt;state != IWL_TRANS_FW_ALIVE)) {</div><div class='del'>-		IWL_ERR(trans, "%s bad state = %d\n", __func__, trans-&gt;state);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+int iwl_trans_get_rxq_dma_data(struct iwl_trans *trans, int queue,</div><div class='add'>+			       struct iwl_trans_rxq_dma_data *data);</div><div class='ctx'> </div><div class='del'>-	trans-&gt;ops-&gt;set_q_ptrs(trans, queue, ptr);</div><div class='del'>-}</div><div class='add'>+void iwl_trans_txq_free(struct iwl_trans *trans, int queue);</div><div class='ctx'> </div><div class='del'>-static inline void iwl_trans_txq_disable(struct iwl_trans *trans, int queue,</div><div class='del'>-					 bool configure_scd)</div><div class='del'>-{</div><div class='del'>-	trans-&gt;ops-&gt;txq_disable(trans, queue, configure_scd);</div><div class='del'>-}</div><div class='add'>+int iwl_trans_txq_alloc(struct iwl_trans *trans, u32 flags, u32 sta_mask,</div><div class='add'>+			u8 tid, int size, unsigned int wdg_timeout);</div><div class='ctx'> </div><div class='del'>-static inline bool</div><div class='del'>-iwl_trans_txq_enable_cfg(struct iwl_trans *trans, int queue, u16 ssn,</div><div class='del'>-			 const struct iwl_trans_txq_scd_cfg *cfg,</div><div class='del'>-			 unsigned int queue_wdg_timeout)</div><div class='del'>-{</div><div class='del'>-	might_sleep();</div><div class='del'>-</div><div class='del'>-	if (WARN_ON_ONCE(trans-&gt;state != IWL_TRANS_FW_ALIVE)) {</div><div class='del'>-		IWL_ERR(trans, "%s bad state = %d\n", __func__, trans-&gt;state);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return trans-&gt;ops-&gt;txq_enable(trans, queue, ssn,</div><div class='del'>-				      cfg, queue_wdg_timeout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-iwl_trans_get_rxq_dma_data(struct iwl_trans *trans, int queue,</div><div class='del'>-			   struct iwl_trans_rxq_dma_data *data)</div><div class='del'>-{</div><div class='del'>-	if (WARN_ON_ONCE(!trans-&gt;ops-&gt;rxq_dma_data))</div><div class='del'>-		return -ENOTSUPP;</div><div class='del'>-</div><div class='del'>-	return trans-&gt;ops-&gt;rxq_dma_data(trans, queue, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-iwl_trans_txq_free(struct iwl_trans *trans, int queue)</div><div class='del'>-{</div><div class='del'>-	if (WARN_ON_ONCE(!trans-&gt;ops-&gt;txq_free))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	trans-&gt;ops-&gt;txq_free(trans, queue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-iwl_trans_txq_alloc(struct iwl_trans *trans,</div><div class='del'>-		    __le16 flags, u8 sta_id, u8 tid,</div><div class='del'>-		    int cmd_id, int size,</div><div class='del'>-		    unsigned int wdg_timeout)</div><div class='del'>-{</div><div class='del'>-	might_sleep();</div><div class='del'>-</div><div class='del'>-	if (WARN_ON_ONCE(!trans-&gt;ops-&gt;txq_alloc))</div><div class='del'>-		return -ENOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON_ONCE(trans-&gt;state != IWL_TRANS_FW_ALIVE)) {</div><div class='del'>-		IWL_ERR(trans, "%s bad state = %d\n", __func__, trans-&gt;state);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return trans-&gt;ops-&gt;txq_alloc(trans, flags, sta_id, tid,</div><div class='del'>-				     cmd_id, size, wdg_timeout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void iwl_trans_txq_set_shared_mode(struct iwl_trans *trans,</div><div class='del'>-						 int queue, bool shared_mode)</div><div class='del'>-{</div><div class='del'>-	if (trans-&gt;ops-&gt;txq_set_shared_mode)</div><div class='del'>-		trans-&gt;ops-&gt;txq_set_shared_mode(trans, queue, shared_mode);</div><div class='del'>-}</div><div class='add'>+void iwl_trans_txq_set_shared_mode(struct iwl_trans *trans,</div><div class='add'>+				   int txq_id, bool shared_mode);</div><div class='ctx'> </div><div class='ctx'> static inline void iwl_trans_txq_enable(struct iwl_trans *trans, int queue,</div><div class='ctx'> 					int fifo, int sta_id, int tid,</div><div class='hunk'>@@ -1236,113 +999,56 @@ void iwl_trans_ac_txq_enable(struct iwl_trans *trans, int queue, int fifo,</div><div class='ctx'> 	iwl_trans_txq_enable_cfg(trans, queue, 0, &amp;cfg, queue_wdg_timeout);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void iwl_trans_freeze_txq_timer(struct iwl_trans *trans,</div><div class='del'>-					      unsigned long txqs,</div><div class='del'>-					      bool freeze)</div><div class='del'>-{</div><div class='del'>-	if (WARN_ON_ONCE(trans-&gt;state != IWL_TRANS_FW_ALIVE)) {</div><div class='del'>-		IWL_ERR(trans, "%s bad state = %d\n", __func__, trans-&gt;state);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;ops-&gt;freeze_txq_timer)</div><div class='del'>-		trans-&gt;ops-&gt;freeze_txq_timer(trans, txqs, freeze);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void iwl_trans_block_txq_ptrs(struct iwl_trans *trans,</div><div class='del'>-					    bool block)</div><div class='del'>-{</div><div class='del'>-	if (WARN_ON_ONCE(trans-&gt;state != IWL_TRANS_FW_ALIVE)) {</div><div class='del'>-		IWL_ERR(trans, "%s bad state = %d\n", __func__, trans-&gt;state);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+void iwl_trans_freeze_txq_timer(struct iwl_trans *trans,</div><div class='add'>+				unsigned long txqs, bool freeze);</div><div class='ctx'> </div><div class='del'>-	if (trans-&gt;ops-&gt;block_txq_ptrs)</div><div class='del'>-		trans-&gt;ops-&gt;block_txq_ptrs(trans, block);</div><div class='del'>-}</div><div class='add'>+int iwl_trans_wait_tx_queues_empty(struct iwl_trans *trans, u32 txqs);</div><div class='ctx'> </div><div class='del'>-static inline int iwl_trans_wait_tx_queues_empty(struct iwl_trans *trans,</div><div class='del'>-						 u32 txqs)</div><div class='del'>-{</div><div class='del'>-	if (WARN_ON_ONCE(!trans-&gt;ops-&gt;wait_tx_queues_empty))</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+int iwl_trans_wait_txq_empty(struct iwl_trans *trans, int queue);</div><div class='ctx'> </div><div class='del'>-	/* No need to wait if the firmware is not alive */</div><div class='del'>-	if (trans-&gt;state != IWL_TRANS_FW_ALIVE) {</div><div class='del'>-		IWL_ERR(trans, "%s bad state = %d\n", __func__, trans-&gt;state);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='add'>+void iwl_trans_write8(struct iwl_trans *trans, u32 ofs, u8 val);</div><div class='ctx'> </div><div class='del'>-	return trans-&gt;ops-&gt;wait_tx_queues_empty(trans, txqs);</div><div class='del'>-}</div><div class='add'>+void iwl_trans_write32(struct iwl_trans *trans, u32 ofs, u32 val);</div><div class='ctx'> </div><div class='del'>-static inline int iwl_trans_wait_txq_empty(struct iwl_trans *trans, int queue)</div><div class='del'>-{</div><div class='del'>-	if (WARN_ON_ONCE(!trans-&gt;ops-&gt;wait_txq_empty))</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+u32 iwl_trans_read32(struct iwl_trans *trans, u32 ofs);</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(trans-&gt;state != IWL_TRANS_FW_ALIVE)) {</div><div class='del'>-		IWL_ERR(trans, "%s bad state = %d\n", __func__, trans-&gt;state);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='add'>+u32 iwl_trans_read_prph(struct iwl_trans *trans, u32 ofs);</div><div class='ctx'> </div><div class='del'>-	return trans-&gt;ops-&gt;wait_txq_empty(trans, queue);</div><div class='del'>-}</div><div class='add'>+void iwl_trans_write_prph(struct iwl_trans *trans, u32 ofs, u32 val);</div><div class='ctx'> </div><div class='del'>-static inline void iwl_trans_write8(struct iwl_trans *trans, u32 ofs, u8 val)</div><div class='del'>-{</div><div class='del'>-	trans-&gt;ops-&gt;write8(trans, ofs, val);</div><div class='del'>-}</div><div class='add'>+int iwl_trans_read_mem(struct iwl_trans *trans, u32 addr,</div><div class='add'>+		       void *buf, int dwords);</div><div class='ctx'> </div><div class='del'>-static inline void iwl_trans_write32(struct iwl_trans *trans, u32 ofs, u32 val)</div><div class='del'>-{</div><div class='del'>-	trans-&gt;ops-&gt;write32(trans, ofs, val);</div><div class='del'>-}</div><div class='add'>+int iwl_trans_read_config32(struct iwl_trans *trans, u32 ofs,</div><div class='add'>+			    u32 *val);</div><div class='ctx'> </div><div class='del'>-static inline u32 iwl_trans_read32(struct iwl_trans *trans, u32 ofs)</div><div class='del'>-{</div><div class='del'>-	return trans-&gt;ops-&gt;read32(trans, ofs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 iwl_trans_read_prph(struct iwl_trans *trans, u32 ofs)</div><div class='del'>-{</div><div class='del'>-	return trans-&gt;ops-&gt;read_prph(trans, ofs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void iwl_trans_write_prph(struct iwl_trans *trans, u32 ofs,</div><div class='del'>-					u32 val)</div><div class='del'>-{</div><div class='del'>-	return trans-&gt;ops-&gt;write_prph(trans, ofs, val);</div><div class='del'>-}</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='add'>+void iwl_trans_debugfs_cleanup(struct iwl_trans *trans);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-static inline int iwl_trans_read_mem(struct iwl_trans *trans, u32 addr,</div><div class='del'>-				     void *buf, int dwords)</div><div class='del'>-{</div><div class='del'>-	return trans-&gt;ops-&gt;read_mem(trans, addr, buf, dwords);</div><div class='del'>-}</div><div class='add'>+#define iwl_trans_read_mem_bytes(trans, addr, buf, bufsize)	\</div><div class='add'>+	({							\</div><div class='add'>+		if (__builtin_constant_p(bufsize))		\</div><div class='add'>+			BUILD_BUG_ON((bufsize) % sizeof(u32));	\</div><div class='add'>+		iwl_trans_read_mem(trans, addr, buf,		\</div><div class='add'>+				   (bufsize) / sizeof(u32));	\</div><div class='add'>+	})</div><div class='ctx'> </div><div class='del'>-#define iwl_trans_read_mem_bytes(trans, addr, buf, bufsize)		      \</div><div class='del'>-	do {								      \</div><div class='del'>-		if (__builtin_constant_p(bufsize))			      \</div><div class='del'>-			BUILD_BUG_ON((bufsize) % sizeof(u32));		      \</div><div class='del'>-		iwl_trans_read_mem(trans, addr, buf, (bufsize) / sizeof(u32));\</div><div class='del'>-	} while (0)</div><div class='add'>+int iwl_trans_write_imr_mem(struct iwl_trans *trans, u32 dst_addr,</div><div class='add'>+			    u64 src_addr, u32 byte_cnt);</div><div class='ctx'> </div><div class='ctx'> static inline u32 iwl_trans_read_mem32(struct iwl_trans *trans, u32 addr)</div><div class='ctx'> {</div><div class='ctx'> 	u32 value;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(iwl_trans_read_mem(trans, addr, &amp;value, 1)))</div><div class='add'>+	if (iwl_trans_read_mem(trans, addr, &amp;value, 1))</div><div class='ctx'> 		return 0xa5a5a5a5;</div><div class='ctx'> </div><div class='ctx'> 	return value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int iwl_trans_write_mem(struct iwl_trans *trans, u32 addr,</div><div class='del'>-				      const void *buf, int dwords)</div><div class='del'>-{</div><div class='del'>-	return trans-&gt;ops-&gt;write_mem(trans, addr, buf, dwords);</div><div class='del'>-}</div><div class='add'>+int iwl_trans_write_mem(struct iwl_trans *trans, u32 addr,</div><div class='add'>+			const void *buf, int dwords);</div><div class='ctx'> </div><div class='ctx'> static inline u32 iwl_trans_write_mem32(struct iwl_trans *trans, u32 addr,</div><div class='ctx'> 					u32 val)</div><div class='hunk'>@@ -1350,75 +1056,98 @@ static inline u32 iwl_trans_write_mem32(struct iwl_trans *trans, u32 addr,</div><div class='ctx'> 	return iwl_trans_write_mem(trans, addr, &amp;val, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void iwl_trans_set_pmi(struct iwl_trans *trans, bool state)</div><div class='del'>-{</div><div class='del'>-	if (trans-&gt;ops-&gt;set_pmi)</div><div class='del'>-		trans-&gt;ops-&gt;set_pmi(trans, state);</div><div class='del'>-}</div><div class='add'>+void iwl_trans_set_pmi(struct iwl_trans *trans, bool state);</div><div class='ctx'> </div><div class='del'>-static inline void iwl_trans_sw_reset(struct iwl_trans *trans)</div><div class='del'>-{</div><div class='del'>-	if (trans-&gt;ops-&gt;sw_reset)</div><div class='del'>-		trans-&gt;ops-&gt;sw_reset(trans);</div><div class='del'>-}</div><div class='add'>+int iwl_trans_sw_reset(struct iwl_trans *trans);</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-iwl_trans_set_bits_mask(struct iwl_trans *trans, u32 reg, u32 mask, u32 value)</div><div class='del'>-{</div><div class='del'>-	trans-&gt;ops-&gt;set_bits_mask(trans, reg, mask, value);</div><div class='del'>-}</div><div class='add'>+void iwl_trans_set_bits_mask(struct iwl_trans *trans, u32 reg,</div><div class='add'>+			     u32 mask, u32 value);</div><div class='add'>+</div><div class='add'>+bool _iwl_trans_grab_nic_access(struct iwl_trans *trans);</div><div class='ctx'> </div><div class='ctx'> #define iwl_trans_grab_nic_access(trans)		\</div><div class='ctx'> 	__cond_lock(nic_access,				\</div><div class='del'>-		    likely((trans)-&gt;ops-&gt;grab_nic_access(trans)))</div><div class='add'>+		    likely(_iwl_trans_grab_nic_access(trans)))</div><div class='ctx'> </div><div class='del'>-static inline void __releases(nic_access)</div><div class='del'>-iwl_trans_release_nic_access(struct iwl_trans *trans)</div><div class='add'>+void __releases(nic_access)</div><div class='add'>+iwl_trans_release_nic_access(struct iwl_trans *trans);</div><div class='add'>+</div><div class='add'>+static inline void iwl_trans_schedule_reset(struct iwl_trans *trans,</div><div class='add'>+					    enum iwl_fw_error_type type)</div><div class='ctx'> {</div><div class='del'>-	trans-&gt;ops-&gt;release_nic_access(trans);</div><div class='del'>-	__release(nic_access);</div><div class='add'>+	if (test_bit(STATUS_TRANS_DEAD, &amp;trans-&gt;status))</div><div class='add'>+		return;</div><div class='add'>+	/* clear this on device init, not cleared on any unbind/reprobe */</div><div class='add'>+	if (test_and_set_bit(STATUS_TRANS_RESET_IN_PROGRESS, &amp;trans-&gt;status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	trans-&gt;restart.mode.type = type;</div><div class='add'>+	trans-&gt;restart.mode.context = IWL_ERR_CONTEXT_WORKER;</div><div class='add'>+</div><div class='add'>+	set_bit(STATUS_RESET_PENDING, &amp;trans-&gt;status);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * keep track of whether or not this happened while resetting,</div><div class='add'>+	 * by the timer the worker runs it might have finished</div><div class='add'>+	 */</div><div class='add'>+	trans-&gt;restart.during_reset = test_bit(STATUS_IN_SW_RESET,</div><div class='add'>+					       &amp;trans-&gt;status);</div><div class='add'>+	queue_delayed_work(system_unbound_wq, &amp;trans-&gt;restart.wk, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void iwl_trans_fw_error(struct iwl_trans *trans)</div><div class='add'>+static inline void iwl_trans_fw_error(struct iwl_trans *trans,</div><div class='add'>+				      enum iwl_fw_error_type type)</div><div class='ctx'> {</div><div class='ctx'> 	if (WARN_ON_ONCE(!trans-&gt;op_mode))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* prevent double restarts due to the same erroneous FW */</div><div class='ctx'> 	if (!test_and_set_bit(STATUS_FW_ERROR, &amp;trans-&gt;status)) {</div><div class='del'>-		iwl_op_mode_nic_error(trans-&gt;op_mode);</div><div class='ctx'> 		trans-&gt;state = IWL_TRANS_NO_FW;</div><div class='add'>+		iwl_op_mode_nic_error(trans-&gt;op_mode, type);</div><div class='add'>+		iwl_trans_schedule_reset(trans, type);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool iwl_trans_fw_running(struct iwl_trans *trans)</div><div class='add'>+static inline void iwl_trans_opmode_sw_reset(struct iwl_trans *trans,</div><div class='add'>+					     enum iwl_fw_error_type type)</div><div class='ctx'> {</div><div class='del'>-	return trans-&gt;state == IWL_TRANS_FW_ALIVE;</div><div class='add'>+	if (WARN_ON_ONCE(!trans-&gt;op_mode))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	set_bit(STATUS_IN_SW_RESET, &amp;trans-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(type == IWL_ERR_TYPE_TOP_RESET_BY_BT))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!trans-&gt;op_mode-&gt;ops-&gt;sw_reset ||</div><div class='add'>+	    !trans-&gt;op_mode-&gt;ops-&gt;sw_reset(trans-&gt;op_mode, type))</div><div class='add'>+		clear_bit(STATUS_IN_SW_RESET, &amp;trans-&gt;status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void iwl_trans_sync_nmi(struct iwl_trans *trans)</div><div class='add'>+static inline bool iwl_trans_fw_running(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='del'>-	if (trans-&gt;ops-&gt;sync_nmi)</div><div class='del'>-		trans-&gt;ops-&gt;sync_nmi(trans);</div><div class='add'>+	return trans-&gt;state == IWL_TRANS_FW_ALIVE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void iwl_trans_sync_nmi(struct iwl_trans *trans);</div><div class='add'>+</div><div class='ctx'> void iwl_trans_sync_nmi_with_addr(struct iwl_trans *trans, u32 inta_addr,</div><div class='ctx'> 				  u32 sw_err_bit);</div><div class='ctx'> </div><div class='del'>-static inline int iwl_trans_set_pnvm(struct iwl_trans *trans,</div><div class='del'>-				     const void *data, u32 len)</div><div class='del'>-{</div><div class='del'>-	if (trans-&gt;ops-&gt;set_pnvm) {</div><div class='del'>-		int ret = trans-&gt;ops-&gt;set_pnvm(trans, data, len);</div><div class='add'>+int iwl_trans_load_pnvm(struct iwl_trans *trans,</div><div class='add'>+			const struct iwl_pnvm_image *pnvm_data,</div><div class='add'>+			const struct iwl_ucode_capabilities *capa);</div><div class='ctx'> </div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='add'>+void iwl_trans_set_pnvm(struct iwl_trans *trans,</div><div class='add'>+			const struct iwl_ucode_capabilities *capa);</div><div class='ctx'> </div><div class='del'>-	trans-&gt;pnvm_loaded = true;</div><div class='add'>+int iwl_trans_load_reduce_power(struct iwl_trans *trans,</div><div class='add'>+				const struct iwl_pnvm_image *payloads,</div><div class='add'>+				const struct iwl_ucode_capabilities *capa);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+void iwl_trans_set_reduce_power(struct iwl_trans *trans,</div><div class='add'>+				const struct iwl_ucode_capabilities *capa);</div><div class='ctx'> </div><div class='ctx'> static inline bool iwl_trans_dbg_ini_valid(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='hunk'>@@ -1426,26 +1155,111 @@ static inline bool iwl_trans_dbg_ini_valid(struct iwl_trans *trans)</div><div class='ctx'> 		trans-&gt;dbg.external_ini_cfg != IWL_INI_CFG_STATE_NOT_LOADED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void iwl_trans_interrupts(struct iwl_trans *trans, bool enable)</div><div class='add'>+void iwl_trans_interrupts(struct iwl_trans *trans, bool enable);</div><div class='add'>+</div><div class='add'>+static inline void iwl_trans_finish_sw_reset(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='del'>-	if (trans-&gt;ops-&gt;interrupts)</div><div class='del'>-		trans-&gt;ops-&gt;interrupts(trans, enable);</div><div class='add'>+	clear_bit(STATUS_IN_SW_RESET, &amp;trans-&gt;status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************</div><div class='ctx'>  * transport helper functions</div><div class='ctx'>  *****************************************************/</div><div class='ctx'> struct iwl_trans *iwl_trans_alloc(unsigned int priv_size,</div><div class='del'>-			  struct device *dev,</div><div class='del'>-			  const struct iwl_trans_ops *ops,</div><div class='del'>-			  const struct iwl_cfg_trans_params *cfg_trans);</div><div class='del'>-int iwl_trans_init(struct iwl_trans *trans);</div><div class='add'>+				  struct device *dev,</div><div class='add'>+				  const struct iwl_mac_cfg *mac_cfg);</div><div class='ctx'> void iwl_trans_free(struct iwl_trans *trans);</div><div class='ctx'> </div><div class='add'>+static inline bool iwl_trans_is_hw_error_value(u32 val)</div><div class='add'>+{</div><div class='add'>+	return ((val &amp; ~0xf) == 0xa5a5a5a0) || ((val &amp; ~0xf) == 0x5a5a5a50);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_trans_free_restart_list(void);</div><div class='add'>+</div><div class='add'>+static inline u16 iwl_trans_get_num_rbds(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	u16 result = trans-&gt;cfg-&gt;num_rbds;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Since AX210 family (So/Ty) the device cannot put mutliple</div><div class='add'>+	 * frames into the same buffer, so double the value for them.</div><div class='add'>+	 */</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		return 2 * result;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool iwl_trans_device_enabled(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	return test_bit(STATUS_DEVICE_ENABLED, &amp;trans-&gt;status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool iwl_trans_is_dead(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	return test_bit(STATUS_TRANS_DEAD, &amp;trans-&gt;status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool iwl_trans_is_fw_error(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	return test_bit(STATUS_FW_ERROR, &amp;trans-&gt;status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function notifies the transport layer of firmware error, the recovery</div><div class='add'>+ * will be handled by the op mode</div><div class='add'>+ */</div><div class='add'>+static inline void iwl_trans_notify_fw_error(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	trans-&gt;state = IWL_TRANS_NO_FW;</div><div class='add'>+	set_bit(STATUS_FW_ERROR, &amp;trans-&gt;status);</div><div class='add'>+}</div><div class='ctx'> /*****************************************************</div><div class='del'>-* driver (transport) register/unregister functions</div><div class='del'>-******************************************************/</div><div class='add'>+ * PCIe handling</div><div class='add'>+ *****************************************************/</div><div class='ctx'> int __must_check iwl_pci_register_driver(void);</div><div class='ctx'> void iwl_pci_unregister_driver(void);</div><div class='ctx'> </div><div class='add'>+/* Note: order matters */</div><div class='add'>+enum iwl_reset_mode {</div><div class='add'>+	/* upper level modes: */</div><div class='add'>+	IWL_RESET_MODE_SW_RESET,</div><div class='add'>+	IWL_RESET_MODE_REPROBE,</div><div class='add'>+	/* TOP reset doesn't require PCIe remove */</div><div class='add'>+	IWL_RESET_MODE_TOP_RESET,</div><div class='add'>+	/* PCIE level modes: */</div><div class='add'>+	IWL_RESET_MODE_REMOVE_ONLY,</div><div class='add'>+	IWL_RESET_MODE_RESCAN,</div><div class='add'>+	IWL_RESET_MODE_FUNC_RESET,</div><div class='add'>+	IWL_RESET_MODE_PROD_RESET,</div><div class='add'>+</div><div class='add'>+	/* keep last - special backoff value */</div><div class='add'>+	IWL_RESET_MODE_BACKOFF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void iwl_trans_pcie_reset(struct iwl_trans *trans, enum iwl_reset_mode mode);</div><div class='add'>+void iwl_trans_pcie_fw_reset_handshake(struct iwl_trans *trans);</div><div class='add'>+</div><div class='add'>+int iwl_trans_pcie_send_hcmd(struct iwl_trans *trans,</div><div class='add'>+			     struct iwl_host_cmd *cmd);</div><div class='add'>+</div><div class='add'>+/* Internal helper */</div><div class='add'>+static inline void iwl_trans_set_info(struct iwl_trans *trans,</div><div class='add'>+				      struct iwl_trans_info *info)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_info *write;</div><div class='add'>+</div><div class='add'>+	write = (void *)(uintptr_t)&amp;trans-&gt;info;</div><div class='add'>+	*write = *info;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 iwl_trans_get_device_id(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	return u32_get_bits(trans-&gt;info.hw_id, GENMASK(31, 16));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool iwl_trans_is_pm_supported(struct iwl_trans *trans);</div><div class='add'>+</div><div class='add'>+bool iwl_trans_is_ltr_enabled(struct iwl_trans *trans);</div><div class='add'>+</div><div class='ctx'> #endif /* __iwl_trans_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-utils.c b/drivers/net/wireless/intel/iwlwifi/iwl-utils.c<br/>new file mode 100644<br/>index 000000000000..d503544fda40<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-utils.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-utils.c</a></div><div class='hunk'>@@ -0,0 +1,195 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;net/gso.h&gt;</div><div class='add'>+#include &lt;linux/ieee80211.h&gt;</div><div class='add'>+#include &lt;net/ip.h&gt;</div><div class='add'>+</div><div class='add'>+#include "iwl-drv.h"</div><div class='add'>+#include "iwl-utils.h"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_INET</div><div class='add'>+int iwl_tx_tso_segment(struct sk_buff *skb, unsigned int num_subframes,</div><div class='add'>+		       netdev_features_t netdev_flags,</div><div class='add'>+		       struct sk_buff_head *mpdus_skbs)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *tmp, *next;</div><div class='add'>+	struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='add'>+	char cb[sizeof(skb-&gt;cb)];</div><div class='add'>+	u16 i = 0;</div><div class='add'>+	unsigned int tcp_payload_len;</div><div class='add'>+	unsigned int mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='add'>+	bool ipv4 = (skb-&gt;protocol == htons(ETH_P_IP));</div><div class='add'>+	bool qos = ieee80211_is_data_qos(hdr-&gt;frame_control);</div><div class='add'>+	u16 ip_base_id = ipv4 ? ntohs(ip_hdr(skb)-&gt;id) : 0;</div><div class='add'>+</div><div class='add'>+	skb_shinfo(skb)-&gt;gso_size = num_subframes * mss;</div><div class='add'>+	memcpy(cb, skb-&gt;cb, sizeof(cb));</div><div class='add'>+</div><div class='add'>+	next = skb_gso_segment(skb, netdev_flags);</div><div class='add'>+	skb_shinfo(skb)-&gt;gso_size = mss;</div><div class='add'>+	skb_shinfo(skb)-&gt;gso_type = ipv4 ? SKB_GSO_TCPV4 : SKB_GSO_TCPV6;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(next) &amp;&amp; PTR_ERR(next) == -ENOMEM)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(IS_ERR(next),</div><div class='add'>+		      "skb_gso_segment error: %d\n", (int)PTR_ERR(next)))</div><div class='add'>+		return PTR_ERR(next);</div><div class='add'>+</div><div class='add'>+	if (next)</div><div class='add'>+		consume_skb(skb);</div><div class='add'>+</div><div class='add'>+	skb_list_walk_safe(next, tmp, next) {</div><div class='add'>+		memcpy(tmp-&gt;cb, cb, sizeof(tmp-&gt;cb));</div><div class='add'>+		/*</div><div class='add'>+		 * Compute the length of all the data added for the A-MSDU.</div><div class='add'>+		 * This will be used to compute the length to write in the TX</div><div class='add'>+		 * command. We have: SNAP + IP + TCP for n -1 subframes and</div><div class='add'>+		 * ETH header for n subframes.</div><div class='add'>+		 */</div><div class='add'>+		tcp_payload_len = skb_tail_pointer(tmp) -</div><div class='add'>+			skb_transport_header(tmp) -</div><div class='add'>+			tcp_hdrlen(tmp) + tmp-&gt;data_len;</div><div class='add'>+</div><div class='add'>+		if (ipv4)</div><div class='add'>+			ip_hdr(tmp)-&gt;id = htons(ip_base_id + i * num_subframes);</div><div class='add'>+</div><div class='add'>+		if (tcp_payload_len &gt; mss) {</div><div class='add'>+			skb_shinfo(tmp)-&gt;gso_size = mss;</div><div class='add'>+			skb_shinfo(tmp)-&gt;gso_type = ipv4 ? SKB_GSO_TCPV4 :</div><div class='add'>+							   SKB_GSO_TCPV6;</div><div class='add'>+		} else {</div><div class='add'>+			if (qos) {</div><div class='add'>+				u8 *qc;</div><div class='add'>+</div><div class='add'>+				if (ipv4)</div><div class='add'>+					ip_send_check(ip_hdr(tmp));</div><div class='add'>+</div><div class='add'>+				qc = ieee80211_get_qos_ctl((void *)tmp-&gt;data);</div><div class='add'>+				*qc &amp;= ~IEEE80211_QOS_CTL_A_MSDU_PRESENT;</div><div class='add'>+			}</div><div class='add'>+			skb_shinfo(tmp)-&gt;gso_size = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb_mark_not_on_list(tmp);</div><div class='add'>+		__skb_queue_tail(mpdus_skbs, tmp);</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_tx_tso_segment);</div><div class='add'>+#endif /* CONFIG_INET */</div><div class='add'>+</div><div class='add'>+static u32 iwl_div_by_db(u32 value, u8 db)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * 2^32 * 10**(i / 10) for i = [1, 10], skipping 0 and simply stopping</div><div class='add'>+	 * at 10 dB and looping instead of using a much larger table.</div><div class='add'>+	 *</div><div class='add'>+	 * Using 64 bit math is overkill, but means the helper does not require</div><div class='add'>+	 * a limit on the input range.</div><div class='add'>+	 */</div><div class='add'>+	static const u32 db_to_val[] = {</div><div class='add'>+		0xcb59185e, 0xa1866ba8, 0x804dce7a, 0x65ea59fe, 0x50f44d89,</div><div class='add'>+		0x404de61f, 0x331426af, 0x2892c18b, 0x203a7e5b, 0x1999999a,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	while (value &amp;&amp; db &gt; 0) {</div><div class='add'>+		u8 change = min_t(u8, db, ARRAY_SIZE(db_to_val));</div><div class='add'>+</div><div class='add'>+		value = (((u64)value) * db_to_val[change - 1]) &gt;&gt; 32;</div><div class='add'>+</div><div class='add'>+		db -= change;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+s8 iwl_average_neg_dbm(const u8 *neg_dbm_values, u8 len)</div><div class='add'>+{</div><div class='add'>+	int average_magnitude;</div><div class='add'>+	u32 average_factor;</div><div class='add'>+	int sum_magnitude = -128;</div><div class='add'>+	u32 sum_factor = 0;</div><div class='add'>+	int i, count = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * To properly average the decibel values (signal values given in dBm)</div><div class='add'>+	 * we need to do the math in linear space.  Doing a linear average of</div><div class='add'>+	 * dB (dBm) values is a bit annoying though due to the large range of</div><div class='add'>+	 * at least -10 to -110 dBm that will not fit into a 32 bit integer.</div><div class='add'>+	 *</div><div class='add'>+	 * A 64 bit integer should be sufficient, but then we still have the</div><div class='add'>+	 * problem that there are no directly usable utility functions</div><div class='add'>+	 * available.</div><div class='add'>+	 *</div><div class='add'>+	 * So, lets not deal with that and instead do much of the calculation</div><div class='add'>+	 * with a 16.16 fixed point integer along with a base in dBm. 16.16 bit</div><div class='add'>+	 * gives us plenty of head-room for adding up a few values and even</div><div class='add'>+	 * doing some math on it. And the tail should be accurate enough too</div><div class='add'>+	 * (1/2^16 is somewhere around -48 dB, so effectively zero).</div><div class='add'>+	 *</div><div class='add'>+	 * i.e. the real value of sum is:</div><div class='add'>+	 *      sum = sum_factor / 2^16 * 10^(sum_magnitude / 10) mW</div><div class='add'>+	 *</div><div class='add'>+	 * However, that does mean we need to be able to bring two values to</div><div class='add'>+	 * a common base, so we need a helper for that.</div><div class='add'>+	 *</div><div class='add'>+	 * Note that this function takes an input with unsigned negative dBm</div><div class='add'>+	 * values but returns a signed dBm (i.e. a negative value).</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		int val_magnitude;</div><div class='add'>+		u32 val_factor;</div><div class='add'>+</div><div class='add'>+		/* Assume invalid */</div><div class='add'>+		if (neg_dbm_values[i] == 0xff)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		val_factor = 0x10000;</div><div class='add'>+		val_magnitude = -neg_dbm_values[i];</div><div class='add'>+</div><div class='add'>+		if (val_magnitude &lt;= sum_magnitude) {</div><div class='add'>+			u8 div_db = sum_magnitude - val_magnitude;</div><div class='add'>+</div><div class='add'>+			val_factor = iwl_div_by_db(val_factor, div_db);</div><div class='add'>+			val_magnitude = sum_magnitude;</div><div class='add'>+		} else {</div><div class='add'>+			u8 div_db = val_magnitude - sum_magnitude;</div><div class='add'>+</div><div class='add'>+			sum_factor = iwl_div_by_db(sum_factor, div_db);</div><div class='add'>+			sum_magnitude = val_magnitude;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sum_factor += val_factor;</div><div class='add'>+		count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* No valid noise measurement, return a very high noise level */</div><div class='add'>+	if (count == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	average_magnitude = sum_magnitude;</div><div class='add'>+	average_factor = sum_factor / count;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * average_factor will be a number smaller than 1.0 (0x10000) at this</div><div class='add'>+	 * point. What we need to do now is to adjust average_magnitude so that</div><div class='add'>+	 * average_factor is between -0.5 dB and 0.5 dB.</div><div class='add'>+	 *</div><div class='add'>+	 * Just do -1 dB steps and find the point where</div><div class='add'>+	 *   -0.5 dB * -i dB = 0x10000 * 10^(-0.5/10) / i dB</div><div class='add'>+	 *                   = div_by_db(0xe429, i)</div><div class='add'>+	 * is smaller than average_factor.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; average_factor &lt; iwl_div_by_db(0xe429, i); i++) {</div><div class='add'>+		/* nothing */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return clamp(average_magnitude - i, -128, 0);</div><div class='add'>+}</div><div class='add'>+IWL_EXPORT_SYMBOL(iwl_average_neg_dbm);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-utils.h b/drivers/net/wireless/intel/iwlwifi/iwl-utils.h<br/>new file mode 100644<br/>index 000000000000..5172035e4d26<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-utils.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/iwl-utils.h</a></div><div class='hunk'>@@ -0,0 +1,58 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_utils_h__</div><div class='add'>+#define __iwl_utils_h__</div><div class='add'>+</div><div class='add'>+#include &lt;net/cfg80211.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_INET</div><div class='add'>+/**</div><div class='add'>+ * iwl_tx_tso_segment - Segments a TSO packet into subframes for A-MSDU.</div><div class='add'>+ * @skb: buffer to segment.</div><div class='add'>+ * @num_subframes: number of subframes to create.</div><div class='add'>+ * @netdev_flags: netdev feature flags.</div><div class='add'>+ * @mpdus_skbs: list to hold the segmented subframes.</div><div class='add'>+ *</div><div class='add'>+ * This function segments a large TCP packet into subframes.</div><div class='add'>+ * subframes are added to the mpdus_skbs list</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success and negative value on failure.</div><div class='add'>+ */</div><div class='add'>+int iwl_tx_tso_segment(struct sk_buff *skb, unsigned int num_subframes,</div><div class='add'>+		       netdev_features_t netdev_flags,</div><div class='add'>+		       struct sk_buff_head *mpdus_skbs);</div><div class='add'>+#else</div><div class='add'>+static inline</div><div class='add'>+int iwl_tx_tso_segment(struct sk_buff *skb, unsigned int num_subframes,</div><div class='add'>+		       netdev_features_t netdev_flags,</div><div class='add'>+		       struct sk_buff_head *mpdus_skbs)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(1);</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_INET */</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+u32 iwl_find_ie_offset(u8 *beacon, u8 eid, u32 frame_size)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_mgmt *mgmt = (void *)beacon;</div><div class='add'>+	const u8 *ie;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(frame_size &lt;= (mgmt-&gt;u.beacon.variable - beacon)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	frame_size -= mgmt-&gt;u.beacon.variable - beacon;</div><div class='add'>+</div><div class='add'>+	ie = cfg80211_find_ie(eid, mgmt-&gt;u.beacon.variable, frame_size);</div><div class='add'>+	if (!ie)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ie - beacon;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+s8 iwl_average_neg_dbm(const u8 *neg_dbm_values, u8 len);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_utils_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mei/Makefile b/drivers/net/wireless/intel/iwlwifi/mei/Makefile<br/>new file mode 100644<br/>index 000000000000..e05f9421be4a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mei/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mei/Makefile</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+obj-$(CONFIG_IWLMEI)	+= iwlmei.o</div><div class='add'>+iwlmei-y += main.o</div><div class='add'>+iwlmei-y += net.o</div><div class='add'>+iwlmei-$(CONFIG_IWLWIFI_DEVICE_TRACING) += trace.o</div><div class='add'>+CFLAGS_trace.o := -I$(src)</div><div class='add'>+</div><div class='add'>+ccflags-y += -I $(src)/../</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mei/internal.h b/drivers/net/wireless/intel/iwlwifi/mei/internal.h<br/>new file mode 100644<br/>index 000000000000..92fea7dd71e2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mei/internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mei/internal.h</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2021 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __IWLMEI_INTERNAL_H_</div><div class='add'>+#define __IWLMEI_INTERNAL_H_</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/if_ether.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+</div><div class='add'>+#include "sap.h"</div><div class='add'>+</div><div class='add'>+rx_handler_result_t iwl_mei_rx_filter(struct sk_buff *skb,</div><div class='add'>+				      const struct iwl_sap_oob_filters *filters,</div><div class='add'>+				      bool *pass_to_csme);</div><div class='add'>+</div><div class='add'>+void iwl_mei_add_data_to_ring(struct sk_buff *skb, bool cb_tx);</div><div class='add'>+</div><div class='add'>+#endif /* __IWLMEI_INTERNAL_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mei/iwl-mei.h b/drivers/net/wireless/intel/iwlwifi/mei/iwl-mei.h<br/>new file mode 100644<br/>index 000000000000..2081775e0ec9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mei/iwl-mei.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mei/iwl-mei.h</a></div><div class='hunk'>@@ -0,0 +1,542 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2021-2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __iwl_mei_h__</div><div class='add'>+#define __iwl_mei_h__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/ieee80211.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Introduction</div><div class='add'>+ *</div><div class='add'>+ * iwlmei is the kernel module that is in charge of the communication between</div><div class='add'>+ * the iwlwifi driver and the CSME firmware's WLAN driver. This communication</div><div class='add'>+ * uses the SAP protocol defined in another file.</div><div class='add'>+ * iwlwifi can request or release ownership on the WiFi device through iwlmei.</div><div class='add'>+ * iwlmei may notify iwlwifi about certain events: what filter iwlwifi should</div><div class='add'>+ * use to passthrough inbound packets to the CSME firmware for example. iwlmei</div><div class='add'>+ * may also use iwlwifi to send traffic. This means that we need communication</div><div class='add'>+ * from iwlmei to iwlwifi and the other way around.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Life cycle</div><div class='add'>+ *</div><div class='add'>+ * iwlmei exports symbols that are needed by iwlwifi so that iwlmei will always</div><div class='add'>+ * be loaded when iwlwifi is alive. iwlwifi registers itself to iwlmei and</div><div class='add'>+ * provides the pointers to the functions that iwlmei calls whenever needed.</div><div class='add'>+ * iwlwifi calls iwlmei through direct and context-free function calls.</div><div class='add'>+ * It is assumed that only one device is accessible to the CSME firmware and</div><div class='add'>+ * under the scope of iwlmei so that it is valid not to have any context passed</div><div class='add'>+ * to iwlmei's functions.</div><div class='add'>+ *</div><div class='add'>+ * There are cases in which iwlmei can't access the CSME firmware, because the</div><div class='add'>+ * CSME firmware is undergoing a reset, or the mei bus decided to unbind the</div><div class='add'>+ * device. In those cases, iwlmei will need not to send requests over the mei</div><div class='add'>+ * bus. Instead, it needs to cache the requests from iwlwifi and fulfill them</div><div class='add'>+ * when the mei bus is available again.</div><div class='add'>+ *</div><div class='add'>+ * iwlmei can call iwlwifi as long as iwlwifi is registered to iwlmei. When</div><div class='add'>+ * iwlwifi goes down (the PCI device is unbound, or the iwlwifi is unloaded)</div><div class='add'>+ * iwlwifi needs to unregister from iwlmei.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Memory layout</div><div class='add'>+ *</div><div class='add'>+ * Since iwlwifi calls iwlmei without any context, iwlmei needs to hold a</div><div class='add'>+ * global pointer to its data (which is in the mei client device's private</div><div class='add'>+ * data area). If there was no bind on the mei bus, this pointer is NULL and</div><div class='add'>+ * iwlmei knows not access to the CSME firmware upon requests from iwlwifi.</div><div class='add'>+ *</div><div class='add'>+ * iwlmei needs to cache requests from iwlwifi when there is no mei client</div><div class='add'>+ * device available (when iwlmei has been removed from the mei bus). In this</div><div class='add'>+ * case, all iwlmei's data that resides in the mei client device's private data</div><div class='add'>+ * area is unavailable. For this specific case, a separate caching area is</div><div class='add'>+ * needed.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Concurrency</div><div class='add'>+ *</div><div class='add'>+ * iwlwifi can call iwlmei at any time. iwlmei will take care to synchronize</div><div class='add'>+ * the calls from iwlwifi with its internal flows. iwlwifi must not call iwlmei</div><div class='add'>+ * in flows that cannot sleep. Moreover, iwlwifi must not call iwlmei in flows</div><div class='add'>+ * that originated from iwlmei.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Probe and remove from mei bus driver</div><div class='add'>+ *</div><div class='add'>+ * When the mei bus driver enumerates its devices, it calls the iwlmei's probe</div><div class='add'>+ * function which will send the %SAP_ME_MSG_START message. The probe completes</div><div class='add'>+ * before the response (%SAP_ME_MSG_START_OK) is received. This response will</div><div class='add'>+ * be handle by the Rx path. Once it arrives, the connection to the CSME</div><div class='add'>+ * firmware is considered established and iwlwifi's requests can be treated</div><div class='add'>+ * against the CSME firmware.</div><div class='add'>+ *</div><div class='add'>+ * When the mei bus driver removes the device, iwlmei loses all the data that</div><div class='add'>+ * was attached to the mei client device. It clears the global pointer to the</div><div class='add'>+ * mei client device since it is not available anymore. This will cause all the</div><div class='add'>+ * requests coming from iwlwifi to be cached. This flow takes the global mutex</div><div class='add'>+ * to be synchronized with all the requests coming from iwlwifi.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Driver load when CSME owns the device</div><div class='add'>+ *</div><div class='add'>+ * When the driver (iwlwifi) is loaded while CSME owns the device,</div><div class='add'>+ * it'll ask CSME to release the device through HW registers. CSME</div><div class='add'>+ * will release the device only in the case that there is no connection</div><div class='add'>+ * through the mei bus. If there is a mei bus connection, CSME will refuse</div><div class='add'>+ * to release the ownership on the device through the HW registers. In that</div><div class='add'>+ * case, iwlwifi must first request ownership using the SAP protocol.</div><div class='add'>+ *</div><div class='add'>+ * Once iwlwifi will request ownership through the SAP protocol, CSME will</div><div class='add'>+ * grant the ownership on the device through the HW registers as well.</div><div class='add'>+ * In order to request ownership over SAP, we first need to have an interface</div><div class='add'>+ * which means that we need to register to mac80211.</div><div class='add'>+ * This can't happen before we get the NVM that contains all the capabilities</div><div class='add'>+ * of the device. Reading the NVM usually requires the load the firmware, but</div><div class='add'>+ * this is impossible as long as we don't have ownership on the device.</div><div class='add'>+ * In order to solve this chicken and egg problem, the host driver can get</div><div class='add'>+ * the NVM through CSME which owns the device. It can send</div><div class='add'>+ * %SAP_MSG_NOTIF_GET_NVM, which will be replied by %SAP_MSG_NOTIF_NVM with</div><div class='add'>+ * the NVM's content that the host driver needs.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: CSME behavior regarding the ownership requests</div><div class='add'>+ *</div><div class='add'>+ * The ownership requests from the host can come in two different ways:</div><div class='add'>+ *  - the HW registers in iwl_pcie_set_hw_ready</div><div class='add'>+ *  - using the Software Arbitration Protocol (SAP)</div><div class='add'>+ *</div><div class='add'>+ * The host can ask CSME who owns the device with %SAP_MSG_NOTIF_WHO_OWNS_NIC,</div><div class='add'>+ * and it can request ownership with %SAP_MSG_NOTIF_HOST_ASKS_FOR_NIC_OWNERSHIP.</div><div class='add'>+ * The host will first use %SAP_MSG_NOTIF_WHO_OWNS_NIC to know what state</div><div class='add'>+ * CSME is in. In case CSME thinks it owns the device, the host can ask for</div><div class='add'>+ * ownership with %SAP_MSG_NOTIF_HOST_ASKS_FOR_NIC_OWNERSHIP.</div><div class='add'>+ *</div><div class='add'>+ * Here the table that describes CSME's behavior upon ownership request:</div><div class='add'>+ *</div><div class='add'>+ * +-------------------+------------+--------------+-----------------------------+------------+</div><div class='add'>+ * | State             | HW reg bit | Reply for    | Event                       | HW reg bit |</div><div class='add'>+ * |                   | before     | WHO_OWNS_NIC |                             | after      |</div><div class='add'>+ * +===================+============+==============+=============================+============+</div><div class='add'>+ * | WiAMT not         | 0          | Host         | HW register or              | 0          |</div><div class='add'>+ * | operational       | Host owner |              | HOST_ASKS_FOR_NIC_OWNERSHIP | Host owner |</div><div class='add'>+ * +-------------------+------------+--------------+-----------------------------+------------+</div><div class='add'>+ * | Operational &amp;     | 1          | N/A          | HW register                 | 0          |</div><div class='add'>+ * | SAP down &amp;        | CSME owner |              |                             | Host owner |</div><div class='add'>+ * | no session active |            |              |                             |            |</div><div class='add'>+ * +-------------------+------------+--------------+-----------------------------+------------+</div><div class='add'>+ * | Operational &amp;     | 1          | CSME         | HW register                 | 1          |</div><div class='add'>+ * | SAP up            | CSME owner |              |                             | CSME owner |</div><div class='add'>+ * +-------------------+------------+--------------+-----------------------------+------------+</div><div class='add'>+ * | Operational &amp;     | 1          | CSME         | HOST_ASKS_FOR_NIC_OWNERSHIP | 0          |</div><div class='add'>+ * | SAP up            | CSME owner |              |                             | Host owner |</div><div class='add'>+ * +-------------------+------------+--------------+-----------------------------+------------+</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Driver load when CSME is associated and a session is active</div><div class='add'>+ *</div><div class='add'>+ * A "session" is active when CSME is associated to an access point and the</div><div class='add'>+ * link is used to attach a remote driver or to control the system remotely.</div><div class='add'>+ * When a session is active, we want to make sure it won't disconnect when we</div><div class='add'>+ * take ownership on the device.</div><div class='add'>+ * In this case, the driver can get the device, but it'll need to make</div><div class='add'>+ * sure that it'll connect to the exact same AP (same BSSID).</div><div class='add'>+ * In order to do so, CSME will send the connection parameters through</div><div class='add'>+ * SAP and then the host can check if it can connect to this same AP.</div><div class='add'>+ * If yes, it can request ownership through SAP and connect quickly without</div><div class='add'>+ * scanning all the channels, but just probing the AP on the channel that</div><div class='add'>+ * CSME was connected to.</div><div class='add'>+ * In order to signal this specific scenario to iwlwifi, iwlmei will</div><div class='add'>+ * immediately require iwlwifi to report RF-Kill to the network stack. This</div><div class='add'>+ * RF-Kill will prevent the stack from getting the device, and it has a reason</div><div class='add'>+ * that tells the userspace that the device is in RF-Kill because it is not</div><div class='add'>+ * owned by the host. Once the userspace has configured the right profile,</div><div class='add'>+ * it'll be able to let iwlmei know that it can request ownership over SAP</div><div class='add'>+ * which will remove the RF-Kill, and finally allow the host to connect.</div><div class='add'>+ * The host has then 3 seconds to connect (including DHCP). Had the host</div><div class='add'>+ * failed to connect within those 3 seconds, CSME will take the device back.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Datapath</div><div class='add'>+ *</div><div class='add'>+ * CSME can transmit packets, through the netdev that it gets from the wifi</div><div class='add'>+ * driver. It'll send packet in the 802.3 format and simply call</div><div class='add'>+ * dev_queue_xmit.</div><div class='add'>+ *</div><div class='add'>+ * For Rx, iwlmei registers a Rx handler that it attaches to the netdev. iwlmei</div><div class='add'>+ * may catch packets and send them to CSME, it can then either drop them so</div><div class='add'>+ * that they are invisible to user space, or let them go the user space.</div><div class='add'>+ *</div><div class='add'>+ * Packets transmitted by the user space do not need to be forwarded to CSME</div><div class='add'>+ * with the exception of the DHCP request. In order to know what IP is used</div><div class='add'>+ * by the user space, CSME needs to get the DHCP request. See</div><div class='add'>+ * iwl_mei_tx_copy_to_csme().</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_mei_nvm_caps - capabilities for MEI NVM</div><div class='add'>+ * @MEI_NVM_CAPS_LARI_SUPPORT: Lari is supported</div><div class='add'>+ * @MEI_NVM_CAPS_11AX_SUPPORT: 11AX is supported</div><div class='add'>+ */</div><div class='add'>+enum iwl_mei_nvm_caps {</div><div class='add'>+	MEI_NVM_CAPS_LARI_SUPPORT	= BIT(0),</div><div class='add'>+	MEI_NVM_CAPS_11AX_SUPPORT	= BIT(1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mei_nvm - used to pass the NVM from CSME</div><div class='add'>+ * @hw_addr: The MAC address</div><div class='add'>+ * @n_hw_addrs: The number of MAC addresses</div><div class='add'>+ * @reserved: For alignment.</div><div class='add'>+ * @radio_cfg: The radio configuration.</div><div class='add'>+ * @caps: See &amp;enum iwl_mei_nvm_caps.</div><div class='add'>+ * @nvm_version: The version of the NVM.</div><div class='add'>+ * @channels: The data for each channel.</div><div class='add'>+ *</div><div class='add'>+ * If a field is added, it must correspond to the SAP structure.</div><div class='add'>+ */</div><div class='add'>+struct iwl_mei_nvm {</div><div class='add'>+	u8 hw_addr[ETH_ALEN];</div><div class='add'>+	u8 n_hw_addrs;</div><div class='add'>+	u8 reserved;</div><div class='add'>+	u32 radio_cfg;</div><div class='add'>+	u32 caps;</div><div class='add'>+	u32 nvm_version;</div><div class='add'>+	u32 channels[110];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_mei_pairwise_cipher - cipher for UCAST key</div><div class='add'>+ * @IWL_MEI_CIPHER_NONE: none</div><div class='add'>+ * @IWL_MEI_CIPHER_TKIP: tkip</div><div class='add'>+ * @IWL_MEI_CIPHER_CCMP: ccmp</div><div class='add'>+ * @IWL_MEI_CIPHER_GCMP: gcmp</div><div class='add'>+ * @IWL_MEI_CIPHER_GCMP_256: gcmp 256</div><div class='add'>+ *</div><div class='add'>+ * Note that those values are dictated by the CSME firmware API (see sap.h)</div><div class='add'>+ */</div><div class='add'>+enum iwl_mei_pairwise_cipher {</div><div class='add'>+	IWL_MEI_CIPHER_NONE	= 0,</div><div class='add'>+	IWL_MEI_CIPHER_TKIP	= 2,</div><div class='add'>+	IWL_MEI_CIPHER_CCMP	= 4,</div><div class='add'>+	IWL_MEI_CIPHER_GCMP	= 8,</div><div class='add'>+	IWL_MEI_CIPHER_GCMP_256 = 9,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_mei_akm_auth - a combination of AKM and AUTH method</div><div class='add'>+ * @IWL_MEI_AKM_AUTH_OPEN: No encryption</div><div class='add'>+ * @IWL_MEI_AKM_AUTH_RSNA: 1X profile</div><div class='add'>+ * @IWL_MEI_AKM_AUTH_RSNA_PSK: PSK profile</div><div class='add'>+ * @IWL_MEI_AKM_AUTH_SAE: SAE profile</div><div class='add'>+ *</div><div class='add'>+ * Note that those values are dictated by the CSME firmware API (see sap.h)</div><div class='add'>+ */</div><div class='add'>+enum iwl_mei_akm_auth {</div><div class='add'>+	IWL_MEI_AKM_AUTH_OPEN		= 0,</div><div class='add'>+	IWL_MEI_AKM_AUTH_RSNA		= 6,</div><div class='add'>+	IWL_MEI_AKM_AUTH_RSNA_PSK	= 7,</div><div class='add'>+	IWL_MEI_AKM_AUTH_SAE		= 9,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mei_conn_info - connection info</div><div class='add'>+ * @lp_state: link protection state</div><div class='add'>+ * @auth_mode: authentication mode</div><div class='add'>+ * @ssid_len: the length of SSID</div><div class='add'>+ * @ssid: the SSID</div><div class='add'>+ * @pairwise_cipher: the cipher used for unicast packets</div><div class='add'>+ * @channel: the associated channel</div><div class='add'>+ * @band: the associated band</div><div class='add'>+ * @bssid: the BSSID</div><div class='add'>+ */</div><div class='add'>+struct iwl_mei_conn_info {</div><div class='add'>+	u8 lp_state;</div><div class='add'>+	u8 auth_mode;</div><div class='add'>+	u8 ssid_len;</div><div class='add'>+	u8 channel;</div><div class='add'>+	u8 band;</div><div class='add'>+	u8 pairwise_cipher;</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	u8 ssid[IEEE80211_MAX_SSID_LEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mei_colloc_info - collocated AP info</div><div class='add'>+ * @channel: the channel of the collocated AP</div><div class='add'>+ * @bssid: the BSSID of the collocated AP</div><div class='add'>+ */</div><div class='add'>+struct iwl_mei_colloc_info {</div><div class='add'>+	u8 channel;</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_mei_sap_version - SAP version</div><div class='add'>+ * @IWL_MEI_SAP_VERSION_3: SAP version 3</div><div class='add'>+ * @IWL_MEI_SAP_VERSION_4: SAP version 4</div><div class='add'>+ */</div><div class='add'>+enum iwl_mei_sap_version {</div><div class='add'>+	IWL_MEI_SAP_VERSION_3 = 3,</div><div class='add'>+	IWL_MEI_SAP_VERSION_4 = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct iwl_mei_ops - driver's operations called by iwlmei</div><div class='add'>+ * Operations will not be called more than once concurrently.</div><div class='add'>+ * It's not allowed to call iwlmei functions from this context.</div><div class='add'>+ *</div><div class='add'>+ * @me_conn_status: provide information about CSME's current connection.</div><div class='add'>+ * @rfkill: called when the wifi driver should report a change in the rfkill</div><div class='add'>+ *	status.</div><div class='add'>+ * @roaming_forbidden: indicates whether roaming is forbidden.</div><div class='add'>+ * @sap_connected: indicate that SAP is now connected. Will be called in case</div><div class='add'>+ *	the wifi driver registered to iwlmei before SAP connection succeeded or</div><div class='add'>+ *	when the SAP connection is re-established.</div><div class='add'>+ * @nic_stolen: this means that device is no longer available. The device can</div><div class='add'>+ *	still be used until the callback returns.</div><div class='add'>+ */</div><div class='add'>+struct iwl_mei_ops {</div><div class='add'>+	void (*me_conn_status)(void *priv,</div><div class='add'>+			       const struct iwl_mei_conn_info *conn_info);</div><div class='add'>+	void (*rfkill)(void *priv, bool blocked, bool csme_taking_ownership);</div><div class='add'>+	void (*roaming_forbidden)(void *priv, bool forbidden);</div><div class='add'>+	void (*sap_connected)(void *priv);</div><div class='add'>+	void (*nic_stolen)(void *priv);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IWLMEI)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_mei_is_connected() - is the connection to the CSME firmware established?</div><div class='add'>+ *</div><div class='add'>+ * Return: true if we have a SAP connection</div><div class='add'>+ */</div><div class='add'>+bool iwl_mei_is_connected(void);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_mei_get_nvm() - returns the NVM for the device</div><div class='add'>+ *</div><div class='add'>+ * It is the caller's responsibility to free the memory returned</div><div class='add'>+ * by this function.</div><div class='add'>+ * This function blocks (sleeps) until the NVM is ready.</div><div class='add'>+ *</div><div class='add'>+ * Return: the NVM as received from CSME</div><div class='add'>+ */</div><div class='add'>+struct iwl_mei_nvm *iwl_mei_get_nvm(void);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_mei_get_ownership() - request ownership</div><div class='add'>+ *</div><div class='add'>+ * This function blocks until ownership is granted or timeout expired.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 in case we could get ownership on the device</div><div class='add'>+ */</div><div class='add'>+int iwl_mei_get_ownership(void);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_mei_set_rfkill_state() - set SW and HW RF kill states</div><div class='add'>+ * @hw_rfkill: HW RF kill state.</div><div class='add'>+ * @sw_rfkill: SW RF kill state.</div><div class='add'>+ *</div><div class='add'>+ * This function must be called when SW RF kill is issued by the user.</div><div class='add'>+ */</div><div class='add'>+void iwl_mei_set_rfkill_state(bool hw_rfkill, bool sw_rfkill);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_mei_set_nic_info() - set mac address</div><div class='add'>+ * @mac_address: mac address to set</div><div class='add'>+ * @nvm_address: NVM mac address to set</div><div class='add'>+ *</div><div class='add'>+ * This function must be called upon mac address change.</div><div class='add'>+ */</div><div class='add'>+void iwl_mei_set_nic_info(const u8 *mac_address, const u8 *nvm_address);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_mei_set_country_code() - set new country code</div><div class='add'>+ * @mcc: the new applied MCC</div><div class='add'>+ *</div><div class='add'>+ * This function must be called upon country code update</div><div class='add'>+ */</div><div class='add'>+void iwl_mei_set_country_code(u16 mcc);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_mei_set_power_limit() - set TX power limit</div><div class='add'>+ * @power_limit: pointer to an array of 10 elements (le16) represents the power</div><div class='add'>+ * restrictions per chain.</div><div class='add'>+ *</div><div class='add'>+ * This function must be called upon power restrictions change</div><div class='add'>+ */</div><div class='add'>+void iwl_mei_set_power_limit(const __le16 *power_limit);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_mei_register() - register the wifi driver to iwlmei</div><div class='add'>+ * @priv: a pointer to the wifi driver's context. Cannot be NULL.</div><div class='add'>+ * @ops: the ops structure.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 unless something went wrong. It is illegal to call any</div><div class='add'>+ * other API function before this function is called and succeeds.</div><div class='add'>+ *</div><div class='add'>+ * Only one wifi driver instance (wifi device instance really)</div><div class='add'>+ * can register at a time.</div><div class='add'>+ */</div><div class='add'>+int iwl_mei_register(void *priv, const struct iwl_mei_ops *ops);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_mei_start_unregister() - unregister the wifi driver from iwlmei</div><div class='add'>+ *</div><div class='add'>+ * From this point on, iwlmei will not used the callbacks provided by</div><div class='add'>+ * the driver, but the device is still usable.</div><div class='add'>+ */</div><div class='add'>+void iwl_mei_start_unregister(void);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_mei_unregister_complete() - complete the unregistration</div><div class='add'>+ *</div><div class='add'>+ * Must be called after iwl_mei_start_unregister. When this function returns,</div><div class='add'>+ * the device is owned by CSME.</div><div class='add'>+ */</div><div class='add'>+void iwl_mei_unregister_complete(void);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_mei_set_netdev() - sets the netdev for Tx / Rx.</div><div class='add'>+ * @netdev: the net_device</div><div class='add'>+ *</div><div class='add'>+ * The caller should set the netdev to a non-NULL value when the</div><div class='add'>+ * interface is added. Packets might be sent to the driver immediately</div><div class='add'>+ * afterwards.</div><div class='add'>+ * The caller should set the netdev to NULL when the interface is removed.</div><div class='add'>+ * This function will call synchronize_net() after setting the netdev to NULL.</div><div class='add'>+ * Only when this function returns, can the caller assume that iwlmei will</div><div class='add'>+ * no longer inject packets into the netdev's Tx path.</div><div class='add'>+ *</div><div class='add'>+ * Context: This function can sleep and assumes rtnl_lock is taken.</div><div class='add'>+ * The netdev must be set to NULL before iwl_mei_start_unregister() is called.</div><div class='add'>+ */</div><div class='add'>+void iwl_mei_set_netdev(struct net_device *netdev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_mei_tx_copy_to_csme() - must be called for each packet sent by</div><div class='add'>+ * the wifi driver.</div><div class='add'>+ * @skb: the skb sent</div><div class='add'>+ * @ivlen: the size of the IV that needs to be skipped after the MAC and</div><div class='add'>+ *	before the SNAP header.</div><div class='add'>+ *</div><div class='add'>+ * This function doesn't take any lock, it simply tries to catch DHCP</div><div class='add'>+ * packets sent by the wifi driver. If the packet is a DHCP packet, it</div><div class='add'>+ * will send it to CSME. This function must not be called for virtual</div><div class='add'>+ * interfaces that are not monitored by CSME, meaning it must be called</div><div class='add'>+ * only for packets transmitted by the netdevice that was registered</div><div class='add'>+ * with iwl_mei_set_netdev().</div><div class='add'>+ */</div><div class='add'>+void iwl_mei_tx_copy_to_csme(struct sk_buff *skb, unsigned int ivlen);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_mei_host_associated() - must be called when iwlwifi associated.</div><div class='add'>+ * @conn_info: pointer to the connection info structure.</div><div class='add'>+ * @colloc_info: pointer to the collocated AP info. This is relevant only in</div><div class='add'>+ *	case of UHB associated AP, otherwise set to NULL.</div><div class='add'>+ */</div><div class='add'>+void iwl_mei_host_associated(const struct iwl_mei_conn_info *conn_info,</div><div class='add'>+			     const struct iwl_mei_colloc_info *colloc_info);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_mei_host_disassociated() - must be called when iwlwifi disassociated.</div><div class='add'>+ */</div><div class='add'>+void iwl_mei_host_disassociated(void);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_mei_device_state() - must be called when the device changes up/down state</div><div class='add'>+ * @up: true if the device is up, false otherwise.</div><div class='add'>+ */</div><div class='add'>+void iwl_mei_device_state(bool up);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_mei_pldr_req() - must be called before loading the fw</div><div class='add'>+ *</div><div class='add'>+ * Requests from the ME that it releases its potential bus access to</div><div class='add'>+ * the WiFi NIC so that the device can safely undergo product reset.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if the request was successful and the device can be</div><div class='add'>+ *	reset, a negative error value otherwise</div><div class='add'>+ */</div><div class='add'>+int iwl_mei_pldr_req(void);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_mei_alive_notif() - must be called when alive notificaiton is received</div><div class='add'>+ * @success: true if received alive notification, false if waiting for the</div><div class='add'>+ *	notificaiton timed out.</div><div class='add'>+ */</div><div class='add'>+void iwl_mei_alive_notif(bool success);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline bool iwl_mei_is_connected(void)</div><div class='add'>+{ return false; }</div><div class='add'>+</div><div class='add'>+static inline struct iwl_mei_nvm *iwl_mei_get_nvm(void)</div><div class='add'>+{ return NULL; }</div><div class='add'>+</div><div class='add'>+static inline int iwl_mei_get_ownership(void)</div><div class='add'>+{ return 0; }</div><div class='add'>+</div><div class='add'>+static inline void iwl_mei_set_rfkill_state(bool hw_rfkill, bool sw_rfkill)</div><div class='add'>+{}</div><div class='add'>+</div><div class='add'>+static inline void iwl_mei_set_nic_info(const u8 *mac_address, const u8 *nvm_address)</div><div class='add'>+{}</div><div class='add'>+</div><div class='add'>+static inline void iwl_mei_set_country_code(u16 mcc)</div><div class='add'>+{}</div><div class='add'>+</div><div class='add'>+static inline void iwl_mei_set_power_limit(const __le16 *power_limit)</div><div class='add'>+{}</div><div class='add'>+</div><div class='add'>+static inline int iwl_mei_register(void *priv,</div><div class='add'>+				   const struct iwl_mei_ops *ops)</div><div class='add'>+{ return -EOPNOTSUPP; }</div><div class='add'>+</div><div class='add'>+static inline void iwl_mei_start_unregister(void)</div><div class='add'>+{}</div><div class='add'>+</div><div class='add'>+static inline void iwl_mei_unregister_complete(void)</div><div class='add'>+{}</div><div class='add'>+</div><div class='add'>+static inline void iwl_mei_set_netdev(struct net_device *netdev)</div><div class='add'>+{}</div><div class='add'>+</div><div class='add'>+static inline void iwl_mei_tx_copy_to_csme(struct sk_buff *skb,</div><div class='add'>+					   unsigned int ivlen)</div><div class='add'>+{}</div><div class='add'>+</div><div class='add'>+static inline void iwl_mei_host_associated(const struct iwl_mei_conn_info *conn_info,</div><div class='add'>+					   const struct iwl_mei_colloc_info *colloc_info)</div><div class='add'>+{}</div><div class='add'>+</div><div class='add'>+static inline void iwl_mei_host_disassociated(void)</div><div class='add'>+{}</div><div class='add'>+</div><div class='add'>+static inline void iwl_mei_device_state(bool up)</div><div class='add'>+{}</div><div class='add'>+</div><div class='add'>+static inline int iwl_mei_pldr_req(void)</div><div class='add'>+{ return 0; }</div><div class='add'>+</div><div class='add'>+static inline void iwl_mei_alive_notif(bool success)</div><div class='add'>+{}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_IWLMEI */</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mei_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mei/main.c b/drivers/net/wireless/intel/iwlwifi/mei/main.c<br/>new file mode 100644<br/>index 000000000000..dce0b7cf7b26<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mei/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mei/main.c</a></div><div class='hunk'>@@ -0,0 +1,2216 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2021-2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/ieee80211.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/mei_cl_bus.h&gt;</div><div class='add'>+#include &lt;linux/rcupdate.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/cfg80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "internal.h"</div><div class='add'>+#include "iwl-mei.h"</div><div class='add'>+#include "trace.h"</div><div class='add'>+#include "trace-data.h"</div><div class='add'>+#include "sap.h"</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("The Intel(R) wireless / CSME firmware interface");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+#define MEI_WLAN_UUID UUID_LE(0x13280904, 0x7792, 0x4fcb, \</div><div class='add'>+			      0xa1, 0xaa, 0x5e, 0x70, 0xcb, 0xb1, 0xe8, 0x65)</div><div class='add'>+</div><div class='add'>+/* After CSME takes ownership, it won't release it for 60 seconds to avoid</div><div class='add'>+ * frequent ownership transitions.</div><div class='add'>+ */</div><div class='add'>+#define MEI_OWNERSHIP_RETAKE_TIMEOUT_MS	msecs_to_jiffies(60000)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Since iwlwifi calls iwlmei without any context, hold a pointer to the</div><div class='add'>+ * mei_cl_device structure here.</div><div class='add'>+ * Define a mutex that will synchronize all the flows between iwlwifi and</div><div class='add'>+ * iwlmei.</div><div class='add'>+ * Note that iwlmei can't have several instances, so it ok to have static</div><div class='add'>+ * variables here.</div><div class='add'>+ */</div><div class='add'>+static struct mei_cl_device *iwl_mei_global_cldev;</div><div class='add'>+static DEFINE_MUTEX(iwl_mei_mutex);</div><div class='add'>+static unsigned long iwl_mei_status;</div><div class='add'>+</div><div class='add'>+enum iwl_mei_status_bits {</div><div class='add'>+	IWL_MEI_STATUS_SAP_CONNECTED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+bool iwl_mei_is_connected(void)</div><div class='add'>+{</div><div class='add'>+	return test_bit(IWL_MEI_STATUS_SAP_CONNECTED, &amp;iwl_mei_status);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iwl_mei_is_connected);</div><div class='add'>+</div><div class='add'>+#define SAP_CONTROL_BLOCK_ID 0x21504153 /* SAP! in ASCII */</div><div class='add'>+</div><div class='add'>+struct iwl_sap_q_ctrl_blk {</div><div class='add'>+	__le32 wr_ptr;</div><div class='add'>+	__le32 rd_ptr;</div><div class='add'>+	__le32 size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum iwl_sap_q_idx {</div><div class='add'>+	SAP_QUEUE_IDX_NOTIF = 0,</div><div class='add'>+	SAP_QUEUE_IDX_DATA,</div><div class='add'>+	SAP_QUEUE_IDX_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_sap_dir {</div><div class='add'>+	__le32 reserved;</div><div class='add'>+	struct iwl_sap_q_ctrl_blk q_ctrl_blk[SAP_QUEUE_IDX_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum iwl_sap_dir_idx {</div><div class='add'>+	SAP_DIRECTION_HOST_TO_ME = 0,</div><div class='add'>+	SAP_DIRECTION_ME_TO_HOST,</div><div class='add'>+	SAP_DIRECTION_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_sap_shared_mem_ctrl_blk {</div><div class='add'>+	__le32 sap_id;</div><div class='add'>+	__le32 size;</div><div class='add'>+	struct iwl_sap_dir dir[SAP_DIRECTION_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The shared area has the following layout:</div><div class='add'>+ *</div><div class='add'>+ * +-----------------------------------+</div><div class='add'>+ * |struct iwl_sap_shared_mem_ctrl_blk |</div><div class='add'>+ * +-----------------------------------+</div><div class='add'>+ * |Host -&gt; ME data queue              |</div><div class='add'>+ * +-----------------------------------+</div><div class='add'>+ * |Host -&gt; ME notif queue             |</div><div class='add'>+ * +-----------------------------------+</div><div class='add'>+ * |ME -&gt; Host data queue              |</div><div class='add'>+ * +-----------------------------------+</div><div class='add'>+ * |ME -&gt; host notif queue             |</div><div class='add'>+ * +-----------------------------------+</div><div class='add'>+ * |SAP control block id (SAP!)        |</div><div class='add'>+ * +-----------------------------------+</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define SAP_H2M_DATA_Q_SZ	48256</div><div class='add'>+#define SAP_M2H_DATA_Q_SZ	24128</div><div class='add'>+#define SAP_H2M_NOTIF_Q_SZ_VER3	2240</div><div class='add'>+#define SAP_H2M_NOTIF_Q_SZ_VER4	32768</div><div class='add'>+#define SAP_M2H_NOTIF_Q_SZ	62720</div><div class='add'>+</div><div class='add'>+#define _IWL_MEI_SAP_SHARED_MEM_SZ_VER3 \</div><div class='add'>+	(sizeof(struct iwl_sap_shared_mem_ctrl_blk) + \</div><div class='add'>+	 SAP_H2M_DATA_Q_SZ + SAP_H2M_NOTIF_Q_SZ_VER3 + \</div><div class='add'>+	 SAP_M2H_DATA_Q_SZ + SAP_M2H_NOTIF_Q_SZ + 4)</div><div class='add'>+</div><div class='add'>+#define _IWL_MEI_SAP_SHARED_MEM_SZ_VER4 \</div><div class='add'>+	(sizeof(struct iwl_sap_shared_mem_ctrl_blk) + \</div><div class='add'>+	 SAP_H2M_DATA_Q_SZ + SAP_H2M_NOTIF_Q_SZ_VER4 + \</div><div class='add'>+	 SAP_M2H_DATA_Q_SZ + SAP_M2H_NOTIF_Q_SZ + 4)</div><div class='add'>+</div><div class='add'>+struct iwl_mei_shared_mem_ptrs {</div><div class='add'>+	struct iwl_sap_shared_mem_ctrl_blk *ctrl;</div><div class='add'>+	void *q_head[SAP_DIRECTION_MAX][SAP_QUEUE_IDX_MAX];</div><div class='add'>+	size_t q_size[SAP_DIRECTION_MAX][SAP_QUEUE_IDX_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_mei_filters {</div><div class='add'>+	struct rcu_head rcu_head;</div><div class='add'>+	struct iwl_sap_oob_filters filters;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mei - holds the private date for iwl_mei</div><div class='add'>+ *</div><div class='add'>+ * @get_nvm_wq: the wait queue for the get_nvm flow</div><div class='add'>+ * @send_csa_msg_wk: used to defer the transmission of the CHECK_SHARED_AREA</div><div class='add'>+ *	message. Used so that we can send CHECK_SHARED_AREA from atomic</div><div class='add'>+ *	contexts.</div><div class='add'>+ * @get_ownership_wq: the wait queue for the get_ownership_flow</div><div class='add'>+ * @shared_mem: the memory that is shared between CSME and the host</div><div class='add'>+ * @cldev: the pointer to the MEI client device</div><div class='add'>+ * @nvm: the data returned by the CSME for the NVM</div><div class='add'>+ * @filters: the filters sent by CSME</div><div class='add'>+ * @got_ownership: true if we own the device</div><div class='add'>+ * @amt_enabled: true if CSME has wireless enabled</div><div class='add'>+ * @csa_throttled: when true, we can't send CHECK_SHARED_AREA over the MEI</div><div class='add'>+ *	bus, but rather need to wait until send_csa_msg_wk runs</div><div class='add'>+ * @csme_taking_ownership: true when CSME is taking ownership. Used to remember</div><div class='add'>+ *	to send CSME_OWNERSHIP_CONFIRMED when the driver completes its down</div><div class='add'>+ *	flow.</div><div class='add'>+ * @link_prot_state: true when we are in link protection PASSIVE</div><div class='add'>+ * @device_down: true if the device is down. Used to remember to send</div><div class='add'>+ *	CSME_OWNERSHIP_CONFIRMED when the driver is already down.</div><div class='add'>+ * @csa_throttle_end_wk: used when &amp;csa_throttled is true</div><div class='add'>+ * @pldr_wq: the wait queue for PLDR flow</div><div class='add'>+ * @pldr_active: PLDR flow is in progress</div><div class='add'>+ * @data_q_lock: protects the access to the data queues which are</div><div class='add'>+ *	accessed without the mutex.</div><div class='add'>+ * @netdev_work: used to defer registering and unregistering of the netdev to</div><div class='add'>+ *	avoid taking the rtnl lock in the SAP messages handlers.</div><div class='add'>+ * @ownership_dwork: used to re-ask for NIC ownership after ownership was taken</div><div class='add'>+ *	by CSME or when a previous ownership request failed.</div><div class='add'>+ * @sap_seq_no: the sequence number for the SAP messages</div><div class='add'>+ * @seq_no: the sequence number for the SAP messages</div><div class='add'>+ * @dbgfs_dir: the debugfs dir entry</div><div class='add'>+ */</div><div class='add'>+struct iwl_mei {</div><div class='add'>+	wait_queue_head_t get_nvm_wq;</div><div class='add'>+	struct work_struct send_csa_msg_wk;</div><div class='add'>+	wait_queue_head_t get_ownership_wq;</div><div class='add'>+	struct iwl_mei_shared_mem_ptrs shared_mem;</div><div class='add'>+	struct mei_cl_device *cldev;</div><div class='add'>+	struct iwl_mei_nvm *nvm;</div><div class='add'>+	struct iwl_mei_filters __rcu *filters;</div><div class='add'>+	bool got_ownership;</div><div class='add'>+	bool amt_enabled;</div><div class='add'>+	bool csa_throttled;</div><div class='add'>+	bool csme_taking_ownership;</div><div class='add'>+	bool link_prot_state;</div><div class='add'>+	bool device_down;</div><div class='add'>+	struct delayed_work csa_throttle_end_wk;</div><div class='add'>+	wait_queue_head_t pldr_wq;</div><div class='add'>+	bool pldr_active;</div><div class='add'>+	spinlock_t data_q_lock;</div><div class='add'>+	struct work_struct netdev_work;</div><div class='add'>+	struct delayed_work ownership_dwork;</div><div class='add'>+</div><div class='add'>+	atomic_t sap_seq_no;</div><div class='add'>+	atomic_t seq_no;</div><div class='add'>+</div><div class='add'>+	struct dentry *dbgfs_dir;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mei_cache - cache for the parameters from iwlwifi</div><div class='add'>+ * @ops: Callbacks to iwlwifi.</div><div class='add'>+ * @netdev: The netdev that will be used to transmit / receive packets.</div><div class='add'>+ * @conn_info: The connection info message triggered by iwlwifi's association.</div><div class='add'>+ * @power_limit: pointer to an array of 10 elements (le16) represents the power</div><div class='add'>+ *	restrictions per chain.</div><div class='add'>+ * @rf_kill: rf kill state.</div><div class='add'>+ * @mcc: MCC info</div><div class='add'>+ * @mac_address: interface MAC address.</div><div class='add'>+ * @nvm_address: NVM MAC address.</div><div class='add'>+ * @priv: A pointer to iwlwifi.</div><div class='add'>+ * @sap_version: The SAP version to use. enum iwl_mei_sap_version.</div><div class='add'>+ *</div><div class='add'>+ * This used to cache the configurations coming from iwlwifi's way. The data</div><div class='add'>+ * is cached here so that we can buffer the configuration even if we don't have</div><div class='add'>+ * a bind from the mei bus and hence, on iwl_mei structure.</div><div class='add'>+ */</div><div class='add'>+struct iwl_mei_cache {</div><div class='add'>+	const struct iwl_mei_ops *ops;</div><div class='add'>+	struct net_device __rcu *netdev;</div><div class='add'>+	const struct iwl_sap_notif_connection_info *conn_info;</div><div class='add'>+	const __le16 *power_limit;</div><div class='add'>+	u32 rf_kill;</div><div class='add'>+	u16 mcc;</div><div class='add'>+	u8 mac_address[6];</div><div class='add'>+	u8 nvm_address[6];</div><div class='add'>+	enum iwl_mei_sap_version sap_version;</div><div class='add'>+	void *priv;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct iwl_mei_cache iwl_mei_cache = {</div><div class='add'>+	.rf_kill = SAP_HW_RFKILL_DEASSERTED | SAP_SW_RFKILL_DEASSERTED</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void iwl_mei_free_shared_mem(struct mei_cl_device *cldev)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei = mei_cldev_get_drvdata(cldev);</div><div class='add'>+</div><div class='add'>+	if (mei_cldev_dma_unmap(cldev))</div><div class='add'>+		dev_err(&amp;cldev-&gt;dev, "Couldn't unmap the shared mem properly\n");</div><div class='add'>+	memset(&amp;mei-&gt;shared_mem, 0, sizeof(mei-&gt;shared_mem));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define HBM_DMA_BUF_ID_WLAN 1</div><div class='add'>+</div><div class='add'>+static int iwl_mei_alloc_mem_for_version(struct mei_cl_device *cldev,</div><div class='add'>+					 enum iwl_mei_sap_version version)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei = mei_cldev_get_drvdata(cldev);</div><div class='add'>+	struct iwl_mei_shared_mem_ptrs *mem = &amp;mei-&gt;shared_mem;</div><div class='add'>+	u32 mem_size = roundup(version == IWL_MEI_SAP_VERSION_4 ?</div><div class='add'>+			       _IWL_MEI_SAP_SHARED_MEM_SZ_VER4 :</div><div class='add'>+			       _IWL_MEI_SAP_SHARED_MEM_SZ_VER3, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	iwl_mei_cache.sap_version = version;</div><div class='add'>+	mem-&gt;ctrl = mei_cldev_dma_map(cldev, HBM_DMA_BUF_ID_WLAN, mem_size);</div><div class='add'>+	if (IS_ERR(mem-&gt;ctrl)) {</div><div class='add'>+		int ret = PTR_ERR(mem-&gt;ctrl);</div><div class='add'>+</div><div class='add'>+		mem-&gt;ctrl = NULL;</div><div class='add'>+</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(mem-&gt;ctrl, 0, mem_size);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mei_alloc_shared_mem(struct mei_cl_device *cldev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * SAP version 4 uses a larger Host to MEI notif queue.</div><div class='add'>+	 * Since it is unknown at this stage which SAP version is used by the</div><div class='add'>+	 * CSME firmware on this platform, try to allocate the version 4 first.</div><div class='add'>+	 * If the CSME firmware uses version 3, this allocation is expected to</div><div class='add'>+	 * fail because the CSME firmware allocated less memory for our driver.</div><div class='add'>+	 */</div><div class='add'>+	ret = iwl_mei_alloc_mem_for_version(cldev, IWL_MEI_SAP_VERSION_4);</div><div class='add'>+	if (ret)</div><div class='add'>+		ret = iwl_mei_alloc_mem_for_version(cldev,</div><div class='add'>+						    IWL_MEI_SAP_VERSION_3);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mei_init_shared_mem(struct iwl_mei *mei)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei_shared_mem_ptrs *mem = &amp;mei-&gt;shared_mem;</div><div class='add'>+	struct iwl_sap_dir *h2m;</div><div class='add'>+	struct iwl_sap_dir *m2h;</div><div class='add'>+	int dir, queue;</div><div class='add'>+	u8 *q_head;</div><div class='add'>+</div><div class='add'>+	mem-&gt;ctrl-&gt;sap_id = cpu_to_le32(SAP_CONTROL_BLOCK_ID);</div><div class='add'>+</div><div class='add'>+	mem-&gt;ctrl-&gt;size = cpu_to_le32(sizeof(*mem-&gt;ctrl));</div><div class='add'>+</div><div class='add'>+	h2m = &amp;mem-&gt;ctrl-&gt;dir[SAP_DIRECTION_HOST_TO_ME];</div><div class='add'>+	m2h = &amp;mem-&gt;ctrl-&gt;dir[SAP_DIRECTION_ME_TO_HOST];</div><div class='add'>+</div><div class='add'>+	h2m-&gt;q_ctrl_blk[SAP_QUEUE_IDX_DATA].size =</div><div class='add'>+		cpu_to_le32(SAP_H2M_DATA_Q_SZ);</div><div class='add'>+	h2m-&gt;q_ctrl_blk[SAP_QUEUE_IDX_NOTIF].size =</div><div class='add'>+		iwl_mei_cache.sap_version == IWL_MEI_SAP_VERSION_3 ?</div><div class='add'>+		cpu_to_le32(SAP_H2M_NOTIF_Q_SZ_VER3) :</div><div class='add'>+		cpu_to_le32(SAP_H2M_NOTIF_Q_SZ_VER4);</div><div class='add'>+	m2h-&gt;q_ctrl_blk[SAP_QUEUE_IDX_DATA].size =</div><div class='add'>+		cpu_to_le32(SAP_M2H_DATA_Q_SZ);</div><div class='add'>+	m2h-&gt;q_ctrl_blk[SAP_QUEUE_IDX_NOTIF].size =</div><div class='add'>+		cpu_to_le32(SAP_M2H_NOTIF_Q_SZ);</div><div class='add'>+</div><div class='add'>+	/* q_head points to the start of the first queue */</div><div class='add'>+	q_head = (void *)(mem-&gt;ctrl + 1);</div><div class='add'>+</div><div class='add'>+	/* Initialize the queue heads */</div><div class='add'>+	for (dir = 0; dir &lt; SAP_DIRECTION_MAX; dir++) {</div><div class='add'>+		for (queue = 0; queue &lt; SAP_QUEUE_IDX_MAX; queue++) {</div><div class='add'>+			mem-&gt;q_head[dir][queue] = q_head;</div><div class='add'>+			q_head +=</div><div class='add'>+				le32_to_cpu(mem-&gt;ctrl-&gt;dir[dir].q_ctrl_blk[queue].size);</div><div class='add'>+			mem-&gt;q_size[dir][queue] =</div><div class='add'>+				le32_to_cpu(mem-&gt;ctrl-&gt;dir[dir].q_ctrl_blk[queue].size);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*(__le32 *)q_head = cpu_to_le32(SAP_CONTROL_BLOCK_ID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t iwl_mei_write_cyclic_buf(struct mei_cl_device *cldev,</div><div class='add'>+					struct iwl_sap_q_ctrl_blk *notif_q,</div><div class='add'>+					u8 *q_head,</div><div class='add'>+					const struct iwl_sap_hdr *hdr,</div><div class='add'>+					u32 q_sz)</div><div class='add'>+{</div><div class='add'>+	u32 rd = le32_to_cpu(READ_ONCE(notif_q-&gt;rd_ptr));</div><div class='add'>+	u32 wr = le32_to_cpu(READ_ONCE(notif_q-&gt;wr_ptr));</div><div class='add'>+	size_t room_in_buf;</div><div class='add'>+	size_t tx_sz = sizeof(*hdr) + le16_to_cpu(hdr-&gt;len);</div><div class='add'>+</div><div class='add'>+	if (rd &gt; q_sz || wr &gt; q_sz) {</div><div class='add'>+		dev_err(&amp;cldev-&gt;dev,</div><div class='add'>+			"Pointers are past the end of the buffer\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	room_in_buf = wr &gt;= rd ? q_sz - wr + rd : rd - wr;</div><div class='add'>+</div><div class='add'>+	/* we don't have enough room for the data to write */</div><div class='add'>+	if (room_in_buf &lt; tx_sz) {</div><div class='add'>+		dev_err(&amp;cldev-&gt;dev,</div><div class='add'>+			"Not enough room in the buffer\n");</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wr + tx_sz &lt;= q_sz) {</div><div class='add'>+		memcpy(q_head + wr, hdr, tx_sz);</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(q_head + wr, hdr, q_sz - wr);</div><div class='add'>+		memcpy(q_head, (const u8 *)hdr + q_sz - wr, tx_sz - (q_sz - wr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(notif_q-&gt;wr_ptr, cpu_to_le32((wr + tx_sz) % q_sz));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mei_host_to_me_data_pending(const struct iwl_mei *mei)</div><div class='add'>+{</div><div class='add'>+	struct iwl_sap_q_ctrl_blk *notif_q;</div><div class='add'>+	struct iwl_sap_dir *dir;</div><div class='add'>+</div><div class='add'>+	dir = &amp;mei-&gt;shared_mem.ctrl-&gt;dir[SAP_DIRECTION_HOST_TO_ME];</div><div class='add'>+	notif_q = &amp;dir-&gt;q_ctrl_blk[SAP_QUEUE_IDX_DATA];</div><div class='add'>+</div><div class='add'>+	if (READ_ONCE(notif_q-&gt;wr_ptr) != READ_ONCE(notif_q-&gt;rd_ptr))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	notif_q = &amp;dir-&gt;q_ctrl_blk[SAP_QUEUE_IDX_NOTIF];</div><div class='add'>+	return READ_ONCE(notif_q-&gt;wr_ptr) != READ_ONCE(notif_q-&gt;rd_ptr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mei_send_check_shared_area(struct mei_cl_device *cldev)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei = mei_cldev_get_drvdata(cldev);</div><div class='add'>+	struct iwl_sap_me_msg_start msg = {</div><div class='add'>+		.hdr.type = cpu_to_le32(SAP_ME_MSG_CHECK_SHARED_AREA),</div><div class='add'>+		.hdr.seq_num = cpu_to_le32(atomic_inc_return(&amp;mei-&gt;seq_no)),</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	if (mei-&gt;csa_throttled)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	trace_iwlmei_me_msg(&amp;msg.hdr, true);</div><div class='add'>+	ret = mei_cldev_send(cldev, (void *)&amp;msg, sizeof(msg));</div><div class='add'>+	if (ret != sizeof(msg)) {</div><div class='add'>+		dev_err(&amp;cldev-&gt;dev,</div><div class='add'>+			"failed to send the SAP_ME_MSG_CHECK_SHARED_AREA message %d\n",</div><div class='add'>+			ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mei-&gt;csa_throttled = true;</div><div class='add'>+</div><div class='add'>+	schedule_delayed_work(&amp;mei-&gt;csa_throttle_end_wk,</div><div class='add'>+			      msecs_to_jiffies(100));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mei_csa_throttle_end_wk(struct work_struct *wk)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei =</div><div class='add'>+		container_of(wk, struct iwl_mei, csa_throttle_end_wk.work);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	mei-&gt;csa_throttled = false;</div><div class='add'>+</div><div class='add'>+	if (iwl_mei_host_to_me_data_pending(mei))</div><div class='add'>+		iwl_mei_send_check_shared_area(mei-&gt;cldev);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mei_send_sap_msg_payload(struct mei_cl_device *cldev,</div><div class='add'>+					struct iwl_sap_hdr *hdr)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei = mei_cldev_get_drvdata(cldev);</div><div class='add'>+	struct iwl_sap_q_ctrl_blk *notif_q;</div><div class='add'>+	struct iwl_sap_dir *dir;</div><div class='add'>+	void *q_head;</div><div class='add'>+	u32 q_sz;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	if (!mei-&gt;shared_mem.ctrl) {</div><div class='add'>+		dev_err(&amp;cldev-&gt;dev,</div><div class='add'>+			"No shared memory, can't send any SAP message\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!iwl_mei_is_connected()) {</div><div class='add'>+		dev_err(&amp;cldev-&gt;dev,</div><div class='add'>+			"Can't send a SAP message if we're not connected\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr-&gt;seq_num = cpu_to_le32(atomic_inc_return(&amp;mei-&gt;sap_seq_no));</div><div class='add'>+	dev_dbg(&amp;cldev-&gt;dev, "Sending %d\n", hdr-&gt;type);</div><div class='add'>+</div><div class='add'>+	dir = &amp;mei-&gt;shared_mem.ctrl-&gt;dir[SAP_DIRECTION_HOST_TO_ME];</div><div class='add'>+	notif_q = &amp;dir-&gt;q_ctrl_blk[SAP_QUEUE_IDX_NOTIF];</div><div class='add'>+	q_head = mei-&gt;shared_mem.q_head[SAP_DIRECTION_HOST_TO_ME][SAP_QUEUE_IDX_NOTIF];</div><div class='add'>+	q_sz = mei-&gt;shared_mem.q_size[SAP_DIRECTION_HOST_TO_ME][SAP_QUEUE_IDX_NOTIF];</div><div class='add'>+	ret = iwl_mei_write_cyclic_buf(q_head, notif_q, q_head, hdr, q_sz);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	trace_iwlmei_sap_cmd(hdr, true);</div><div class='add'>+</div><div class='add'>+	return iwl_mei_send_check_shared_area(cldev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mei_add_data_to_ring(struct sk_buff *skb, bool cb_tx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_sap_q_ctrl_blk *notif_q;</div><div class='add'>+	struct iwl_sap_dir *dir;</div><div class='add'>+	struct iwl_mei *mei;</div><div class='add'>+	size_t room_in_buf;</div><div class='add'>+	size_t tx_sz;</div><div class='add'>+	size_t hdr_sz;</div><div class='add'>+	u32 q_sz;</div><div class='add'>+	u32 rd;</div><div class='add'>+	u32 wr;</div><div class='add'>+	u8 *q_head;</div><div class='add'>+</div><div class='add'>+	if (!iwl_mei_global_cldev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mei = mei_cldev_get_drvdata(iwl_mei_global_cldev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We access this path for Rx packets (the more common case)</div><div class='add'>+	 * and from Tx path when we send DHCP packets, the latter is</div><div class='add'>+	 * very unlikely.</div><div class='add'>+	 * Take the lock already here to make sure we see that remove()</div><div class='add'>+	 * might have cleared the IWL_MEI_STATUS_SAP_CONNECTED bit.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_bh(&amp;mei-&gt;data_q_lock);</div><div class='add'>+</div><div class='add'>+	if (!iwl_mei_is_connected()) {</div><div class='add'>+		spin_unlock_bh(&amp;mei-&gt;data_q_lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We are in a RCU critical section and the remove from the CSME bus</div><div class='add'>+	 * which would free this memory waits for the readers to complete (this</div><div class='add'>+	 * is done in netdev_rx_handler_unregister).</div><div class='add'>+	 */</div><div class='add'>+	dir = &amp;mei-&gt;shared_mem.ctrl-&gt;dir[SAP_DIRECTION_HOST_TO_ME];</div><div class='add'>+	notif_q = &amp;dir-&gt;q_ctrl_blk[SAP_QUEUE_IDX_DATA];</div><div class='add'>+	q_head = mei-&gt;shared_mem.q_head[SAP_DIRECTION_HOST_TO_ME][SAP_QUEUE_IDX_DATA];</div><div class='add'>+	q_sz = mei-&gt;shared_mem.q_size[SAP_DIRECTION_HOST_TO_ME][SAP_QUEUE_IDX_DATA];</div><div class='add'>+</div><div class='add'>+	rd = le32_to_cpu(READ_ONCE(notif_q-&gt;rd_ptr));</div><div class='add'>+	wr = le32_to_cpu(READ_ONCE(notif_q-&gt;wr_ptr));</div><div class='add'>+	hdr_sz = cb_tx ? sizeof(struct iwl_sap_cb_data) :</div><div class='add'>+			 sizeof(struct iwl_sap_hdr);</div><div class='add'>+	tx_sz = skb-&gt;len + hdr_sz;</div><div class='add'>+</div><div class='add'>+	if (rd &gt; q_sz || wr &gt; q_sz) {</div><div class='add'>+		dev_err(&amp;mei-&gt;cldev-&gt;dev,</div><div class='add'>+			"can't write the data: pointers are past the end of the buffer\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	room_in_buf = wr &gt;= rd ? q_sz - wr + rd : rd - wr;</div><div class='add'>+</div><div class='add'>+	/* we don't have enough room for the data to write */</div><div class='add'>+	if (room_in_buf &lt; tx_sz) {</div><div class='add'>+		dev_err(&amp;mei-&gt;cldev-&gt;dev,</div><div class='add'>+			"Not enough room in the buffer for this data\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb_headroom(skb) &lt; hdr_sz) {</div><div class='add'>+		dev_err(&amp;mei-&gt;cldev-&gt;dev,</div><div class='add'>+			"Not enough headroom in the skb to write the SAP header\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cb_tx) {</div><div class='add'>+		struct iwl_sap_cb_data *cb_hdr = skb_push(skb, sizeof(*cb_hdr));</div><div class='add'>+</div><div class='add'>+		memset(cb_hdr, 0, sizeof(*cb_hdr));</div><div class='add'>+		cb_hdr-&gt;hdr.type = cpu_to_le16(SAP_MSG_CB_DATA_PACKET);</div><div class='add'>+		cb_hdr-&gt;hdr.len = cpu_to_le16(skb-&gt;len - sizeof(cb_hdr-&gt;hdr));</div><div class='add'>+		cb_hdr-&gt;hdr.seq_num = cpu_to_le32(atomic_inc_return(&amp;mei-&gt;sap_seq_no));</div><div class='add'>+		cb_hdr-&gt;to_me_filt_status = cpu_to_le32(BIT(CB_TX_DHCP_FILT_IDX));</div><div class='add'>+		cb_hdr-&gt;data_len = cpu_to_le32(skb-&gt;len - sizeof(*cb_hdr));</div><div class='add'>+		trace_iwlmei_sap_data(skb, IWL_SAP_TX_DHCP);</div><div class='add'>+	} else {</div><div class='add'>+		struct iwl_sap_hdr *hdr = skb_push(skb, sizeof(*hdr));</div><div class='add'>+</div><div class='add'>+		hdr-&gt;type = cpu_to_le16(SAP_MSG_DATA_PACKET);</div><div class='add'>+		hdr-&gt;len = cpu_to_le16(skb-&gt;len - sizeof(*hdr));</div><div class='add'>+		hdr-&gt;seq_num = cpu_to_le32(atomic_inc_return(&amp;mei-&gt;sap_seq_no));</div><div class='add'>+		trace_iwlmei_sap_data(skb, IWL_SAP_TX_DATA_FROM_AIR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wr + tx_sz &lt;= q_sz) {</div><div class='add'>+		skb_copy_bits(skb, 0, q_head + wr, tx_sz);</div><div class='add'>+	} else {</div><div class='add'>+		skb_copy_bits(skb, 0, q_head + wr, q_sz - wr);</div><div class='add'>+		skb_copy_bits(skb, q_sz - wr, q_head, tx_sz - (q_sz - wr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(notif_q-&gt;wr_ptr, cpu_to_le32((wr + tx_sz) % q_sz));</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_bh(&amp;mei-&gt;data_q_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mei_send_sap_msg(struct mei_cl_device *cldev, u16 type)</div><div class='add'>+{</div><div class='add'>+	struct iwl_sap_hdr msg = {</div><div class='add'>+		.type = cpu_to_le16(type),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return iwl_mei_send_sap_msg_payload(cldev, &amp;msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mei_send_csa_msg_wk(struct work_struct *wk)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei =</div><div class='add'>+		container_of(wk, struct iwl_mei, send_csa_msg_wk);</div><div class='add'>+</div><div class='add'>+	if (!iwl_mei_is_connected())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	iwl_mei_send_check_shared_area(mei-&gt;cldev);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Called in a RCU read critical section from netif_receive_skb */</div><div class='add'>+static rx_handler_result_t iwl_mei_rx_handler(struct sk_buff **pskb)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb = *pskb;</div><div class='add'>+	struct iwl_mei *mei =</div><div class='add'>+		rcu_dereference(skb-&gt;dev-&gt;rx_handler_data);</div><div class='add'>+	struct iwl_mei_filters *filters = rcu_dereference(mei-&gt;filters);</div><div class='add'>+	bool rx_for_csme = false;</div><div class='add'>+	rx_handler_result_t res;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * remove() unregisters this handler and synchronize_net, so this</div><div class='add'>+	 * should never happen.</div><div class='add'>+	 */</div><div class='add'>+	if (!iwl_mei_is_connected()) {</div><div class='add'>+		dev_err(&amp;mei-&gt;cldev-&gt;dev,</div><div class='add'>+			"Got an Rx packet, but we're not connected to SAP?\n");</div><div class='add'>+		return RX_HANDLER_PASS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (filters)</div><div class='add'>+		res = iwl_mei_rx_filter(skb, &amp;filters-&gt;filters, &amp;rx_for_csme);</div><div class='add'>+	else</div><div class='add'>+		res = RX_HANDLER_PASS;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The data is already on the ring of the shared area, all we</div><div class='add'>+	 * need to do is to tell the CSME firmware to check what we have</div><div class='add'>+	 * there.</div><div class='add'>+	 */</div><div class='add'>+	if (rx_for_csme)</div><div class='add'>+		schedule_work(&amp;mei-&gt;send_csa_msg_wk);</div><div class='add'>+</div><div class='add'>+	if (res != RX_HANDLER_PASS) {</div><div class='add'>+		trace_iwlmei_sap_data(skb, IWL_SAP_RX_DATA_DROPPED_FROM_AIR);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mei_netdev_work(struct work_struct *wk)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei =</div><div class='add'>+		container_of(wk, struct iwl_mei, netdev_work);</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * First take rtnl and only then the mutex to avoid an ABBA</div><div class='add'>+	 * with iwl_mei_set_netdev()</div><div class='add'>+	 */</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	netdev = rcu_dereference_protected(iwl_mei_cache.netdev,</div><div class='add'>+					   lockdep_is_held(&amp;iwl_mei_mutex));</div><div class='add'>+	if (netdev) {</div><div class='add'>+		if (mei-&gt;amt_enabled)</div><div class='add'>+			netdev_rx_handler_register(netdev, iwl_mei_rx_handler,</div><div class='add'>+						   mei);</div><div class='add'>+		else</div><div class='add'>+			netdev_rx_handler_unregister(netdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mei_handle_rx_start_ok(struct mei_cl_device *cldev,</div><div class='add'>+			   const struct iwl_sap_me_msg_start_ok *rsp,</div><div class='add'>+			   ssize_t len)</div><div class='add'>+{</div><div class='add'>+	if (len != sizeof(*rsp)) {</div><div class='add'>+		dev_err(&amp;cldev-&gt;dev,</div><div class='add'>+			"got invalid SAP_ME_MSG_START_OK from CSME firmware\n");</div><div class='add'>+		dev_err(&amp;cldev-&gt;dev,</div><div class='add'>+			"size is incorrect: %zd instead of %zu\n",</div><div class='add'>+			len, sizeof(*rsp));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rsp-&gt;supported_version != iwl_mei_cache.sap_version) {</div><div class='add'>+		dev_err(&amp;cldev-&gt;dev,</div><div class='add'>+			"didn't get the expected version: got %d\n",</div><div class='add'>+			rsp-&gt;supported_version);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+	set_bit(IWL_MEI_STATUS_SAP_CONNECTED, &amp;iwl_mei_status);</div><div class='add'>+	/*</div><div class='add'>+	 * We'll receive AMT_STATE SAP message in a bit and</div><div class='add'>+	 * that will continue the flow</div><div class='add'>+	 */</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mei_handle_csme_filters(struct mei_cl_device *cldev,</div><div class='add'>+					const struct iwl_sap_csme_filters *filters)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei = mei_cldev_get_drvdata(iwl_mei_global_cldev);</div><div class='add'>+	struct iwl_mei_filters *new_filters;</div><div class='add'>+	struct iwl_mei_filters *old_filters;</div><div class='add'>+</div><div class='add'>+	old_filters =</div><div class='add'>+		rcu_dereference_protected(mei-&gt;filters,</div><div class='add'>+					  lockdep_is_held(&amp;iwl_mei_mutex));</div><div class='add'>+</div><div class='add'>+	new_filters = kzalloc(sizeof(*new_filters), GFP_KERNEL);</div><div class='add'>+	if (!new_filters)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Copy the OOB filters */</div><div class='add'>+	new_filters-&gt;filters = filters-&gt;filters;</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(mei-&gt;filters, new_filters);</div><div class='add'>+</div><div class='add'>+	if (old_filters)</div><div class='add'>+		kfree_rcu(old_filters, rcu_head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mei_handle_conn_status(struct mei_cl_device *cldev,</div><div class='add'>+			   const struct iwl_sap_notif_conn_status *status)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei = mei_cldev_get_drvdata(cldev);</div><div class='add'>+	struct iwl_mei_conn_info conn_info = {</div><div class='add'>+		.lp_state = le32_to_cpu(status-&gt;link_prot_state),</div><div class='add'>+		.ssid_len = le32_to_cpu(status-&gt;conn_info.ssid_len),</div><div class='add'>+		.channel = status-&gt;conn_info.channel,</div><div class='add'>+		.band = status-&gt;conn_info.band,</div><div class='add'>+		.auth_mode = le32_to_cpu(status-&gt;conn_info.auth_mode),</div><div class='add'>+		.pairwise_cipher = le32_to_cpu(status-&gt;conn_info.pairwise_cipher),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!iwl_mei_cache.ops ||</div><div class='add'>+	    conn_info.ssid_len &gt; ARRAY_SIZE(conn_info.ssid))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memcpy(conn_info.ssid, status-&gt;conn_info.ssid, conn_info.ssid_len);</div><div class='add'>+	ether_addr_copy(conn_info.bssid, status-&gt;conn_info.bssid);</div><div class='add'>+</div><div class='add'>+	iwl_mei_cache.ops-&gt;me_conn_status(iwl_mei_cache.priv, &amp;conn_info);</div><div class='add'>+</div><div class='add'>+	mei-&gt;link_prot_state = status-&gt;link_prot_state;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Update the Rfkill state in case the host does not own the device:</div><div class='add'>+	 * if we are in Link Protection, ask to not touch the device, else,</div><div class='add'>+	 * unblock rfkill.</div><div class='add'>+	 * If the host owns the device, inform the user space whether it can</div><div class='add'>+	 * roam.</div><div class='add'>+	 */</div><div class='add'>+	if (mei-&gt;got_ownership)</div><div class='add'>+		iwl_mei_cache.ops-&gt;roaming_forbidden(iwl_mei_cache.priv,</div><div class='add'>+						     status-&gt;link_prot_state);</div><div class='add'>+	else</div><div class='add'>+		iwl_mei_cache.ops-&gt;rfkill(iwl_mei_cache.priv,</div><div class='add'>+					  status-&gt;link_prot_state, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mei_set_init_conf(struct iwl_mei *mei)</div><div class='add'>+{</div><div class='add'>+	struct iwl_sap_notif_host_link_up link_msg = {</div><div class='add'>+		.hdr.type = cpu_to_le16(SAP_MSG_NOTIF_HOST_LINK_UP),</div><div class='add'>+		.hdr.len = cpu_to_le16(sizeof(link_msg) - sizeof(link_msg.hdr)),</div><div class='add'>+	};</div><div class='add'>+	struct iwl_sap_notif_country_code mcc_msg = {</div><div class='add'>+		.hdr.type = cpu_to_le16(SAP_MSG_NOTIF_COUNTRY_CODE),</div><div class='add'>+		.hdr.len = cpu_to_le16(sizeof(mcc_msg) - sizeof(mcc_msg.hdr)),</div><div class='add'>+		.mcc = cpu_to_le16(iwl_mei_cache.mcc),</div><div class='add'>+	};</div><div class='add'>+	struct iwl_sap_notif_sar_limits sar_msg = {</div><div class='add'>+		.hdr.type = cpu_to_le16(SAP_MSG_NOTIF_SAR_LIMITS),</div><div class='add'>+		.hdr.len = cpu_to_le16(sizeof(sar_msg) - sizeof(sar_msg.hdr)),</div><div class='add'>+	};</div><div class='add'>+	struct iwl_sap_notif_host_nic_info nic_info_msg = {</div><div class='add'>+		.hdr.type = cpu_to_le16(SAP_MSG_NOTIF_NIC_INFO),</div><div class='add'>+		.hdr.len = cpu_to_le16(sizeof(nic_info_msg) - sizeof(nic_info_msg.hdr)),</div><div class='add'>+	};</div><div class='add'>+	struct iwl_sap_msg_dw rfkill_msg = {</div><div class='add'>+		.hdr.type = cpu_to_le16(SAP_MSG_NOTIF_RADIO_STATE),</div><div class='add'>+		.hdr.len = cpu_to_le16(sizeof(rfkill_msg) - sizeof(rfkill_msg.hdr)),</div><div class='add'>+		.val = cpu_to_le32(iwl_mei_cache.rf_kill),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* wifi driver has registered already */</div><div class='add'>+	if (iwl_mei_cache.ops) {</div><div class='add'>+		iwl_mei_send_sap_msg(mei-&gt;cldev,</div><div class='add'>+				     SAP_MSG_NOTIF_WIFIDR_UP);</div><div class='add'>+		iwl_mei_cache.ops-&gt;sap_connected(iwl_mei_cache.priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mei_send_sap_msg(mei-&gt;cldev, SAP_MSG_NOTIF_WHO_OWNS_NIC);</div><div class='add'>+</div><div class='add'>+	if (iwl_mei_cache.conn_info) {</div><div class='add'>+		link_msg.conn_info = *iwl_mei_cache.conn_info;</div><div class='add'>+		iwl_mei_send_sap_msg_payload(mei-&gt;cldev, &amp;link_msg.hdr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mei_send_sap_msg_payload(mei-&gt;cldev, &amp;mcc_msg.hdr);</div><div class='add'>+</div><div class='add'>+	if (iwl_mei_cache.power_limit) {</div><div class='add'>+		memcpy(sar_msg.sar_chain_info_table, iwl_mei_cache.power_limit,</div><div class='add'>+		       sizeof(sar_msg.sar_chain_info_table));</div><div class='add'>+		iwl_mei_send_sap_msg_payload(mei-&gt;cldev, &amp;sar_msg.hdr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_valid_ether_addr(iwl_mei_cache.mac_address)) {</div><div class='add'>+		ether_addr_copy(nic_info_msg.mac_address,</div><div class='add'>+				iwl_mei_cache.mac_address);</div><div class='add'>+		ether_addr_copy(nic_info_msg.nvm_address,</div><div class='add'>+				iwl_mei_cache.nvm_address);</div><div class='add'>+		iwl_mei_send_sap_msg_payload(mei-&gt;cldev, &amp;nic_info_msg.hdr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mei_send_sap_msg_payload(mei-&gt;cldev, &amp;rfkill_msg.hdr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mei_handle_amt_state(struct mei_cl_device *cldev,</div><div class='add'>+				     const struct iwl_sap_msg_dw *dw)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei = mei_cldev_get_drvdata(cldev);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	if (mei-&gt;amt_enabled == !!le32_to_cpu(dw-&gt;val))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mei-&gt;amt_enabled = dw-&gt;val;</div><div class='add'>+</div><div class='add'>+	if (mei-&gt;amt_enabled)</div><div class='add'>+		iwl_mei_set_init_conf(mei);</div><div class='add'>+	else if (iwl_mei_cache.ops)</div><div class='add'>+		iwl_mei_cache.ops-&gt;rfkill(iwl_mei_cache.priv, false, false);</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;mei-&gt;netdev_work);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mei_handle_nic_owner(struct mei_cl_device *cldev,</div><div class='add'>+				     const struct iwl_sap_msg_dw *dw)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei = mei_cldev_get_drvdata(cldev);</div><div class='add'>+</div><div class='add'>+	mei-&gt;got_ownership = dw-&gt;val != cpu_to_le32(SAP_NIC_OWNER_ME);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mei_handle_can_release_ownership(struct mei_cl_device *cldev,</div><div class='add'>+						 const void *payload)</div><div class='add'>+{</div><div class='add'>+	/* We can get ownership and driver is registered, go ahead */</div><div class='add'>+	if (iwl_mei_cache.ops)</div><div class='add'>+		iwl_mei_send_sap_msg(cldev,</div><div class='add'>+				     SAP_MSG_NOTIF_HOST_ASKS_FOR_NIC_OWNERSHIP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mei_handle_csme_taking_ownership(struct mei_cl_device *cldev,</div><div class='add'>+						 const void *payload)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei = mei_cldev_get_drvdata(cldev);</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;cldev-&gt;dev, "CSME takes ownership\n");</div><div class='add'>+</div><div class='add'>+	mei-&gt;got_ownership = false;</div><div class='add'>+</div><div class='add'>+	if (iwl_mei_cache.ops &amp;&amp; !mei-&gt;device_down) {</div><div class='add'>+		/*</div><div class='add'>+		 * Remember to send CSME_OWNERSHIP_CONFIRMED when the wifi</div><div class='add'>+		 * driver is finished taking the device down.</div><div class='add'>+		 */</div><div class='add'>+		mei-&gt;csme_taking_ownership = true;</div><div class='add'>+</div><div class='add'>+		iwl_mei_cache.ops-&gt;rfkill(iwl_mei_cache.priv, true, true);</div><div class='add'>+	} else {</div><div class='add'>+		iwl_mei_send_sap_msg(cldev,</div><div class='add'>+				     SAP_MSG_NOTIF_CSME_OWNERSHIP_CONFIRMED);</div><div class='add'>+		schedule_delayed_work(&amp;mei-&gt;ownership_dwork,</div><div class='add'>+				      MEI_OWNERSHIP_RETAKE_TIMEOUT_MS);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mei_handle_nvm(struct mei_cl_device *cldev,</div><div class='add'>+			       const struct iwl_sap_nvm *sap_nvm)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei = mei_cldev_get_drvdata(cldev);</div><div class='add'>+	const struct iwl_mei_nvm *mei_nvm = (const void *)sap_nvm;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	kfree(mei-&gt;nvm);</div><div class='add'>+	mei-&gt;nvm = kzalloc(sizeof(*mei_nvm), GFP_KERNEL);</div><div class='add'>+	if (!mei-&gt;nvm)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(mei-&gt;nvm-&gt;hw_addr, sap_nvm-&gt;hw_addr);</div><div class='add'>+	mei-&gt;nvm-&gt;n_hw_addrs = sap_nvm-&gt;n_hw_addrs;</div><div class='add'>+	mei-&gt;nvm-&gt;radio_cfg = le32_to_cpu(sap_nvm-&gt;radio_cfg);</div><div class='add'>+	mei-&gt;nvm-&gt;caps = le32_to_cpu(sap_nvm-&gt;caps);</div><div class='add'>+	mei-&gt;nvm-&gt;nvm_version = le32_to_cpu(sap_nvm-&gt;nvm_version);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mei-&gt;nvm-&gt;channels); i++)</div><div class='add'>+		mei-&gt;nvm-&gt;channels[i] = le32_to_cpu(sap_nvm-&gt;channels[i]);</div><div class='add'>+</div><div class='add'>+	wake_up_all(&amp;mei-&gt;get_nvm_wq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mei_handle_rx_host_own_req(struct mei_cl_device *cldev,</div><div class='add'>+					   const struct iwl_sap_msg_dw *dw)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei = mei_cldev_get_drvdata(cldev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This means that we can't use the wifi device right now, CSME is not</div><div class='add'>+	 * ready to let us use it.</div><div class='add'>+	 */</div><div class='add'>+	if (!dw-&gt;val) {</div><div class='add'>+		dev_info(&amp;cldev-&gt;dev, "Ownership req denied\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mei-&gt;got_ownership = true;</div><div class='add'>+	wake_up_all(&amp;mei-&gt;get_ownership_wq);</div><div class='add'>+</div><div class='add'>+	iwl_mei_send_sap_msg(cldev,</div><div class='add'>+			     SAP_MSG_NOTIF_HOST_OWNERSHIP_CONFIRMED);</div><div class='add'>+</div><div class='add'>+	/* We can now start the connection, unblock rfkill */</div><div class='add'>+	if (iwl_mei_cache.ops)</div><div class='add'>+		iwl_mei_cache.ops-&gt;rfkill(iwl_mei_cache.priv, false, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mei_handle_pldr_ack(struct mei_cl_device *cldev,</div><div class='add'>+				    const struct iwl_sap_pldr_ack_data *ack)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei = mei_cldev_get_drvdata(cldev);</div><div class='add'>+</div><div class='add'>+	mei-&gt;pldr_active = le32_to_cpu(ack-&gt;status) == SAP_PLDR_STATUS_SUCCESS;</div><div class='add'>+	wake_up_all(&amp;mei-&gt;pldr_wq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mei_handle_ping(struct mei_cl_device *cldev,</div><div class='add'>+				const struct iwl_sap_hdr *hdr)</div><div class='add'>+{</div><div class='add'>+	iwl_mei_send_sap_msg(cldev, SAP_MSG_NOTIF_PONG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mei_handle_sap_msg(struct mei_cl_device *cldev,</div><div class='add'>+				   const struct iwl_sap_hdr *hdr)</div><div class='add'>+{</div><div class='add'>+	u16 len = le16_to_cpu(hdr-&gt;len) + sizeof(*hdr);</div><div class='add'>+	u16 type = le16_to_cpu(hdr-&gt;type);</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;cldev-&gt;dev,</div><div class='add'>+		"Got a new SAP message: type %d, len %d, seq %d\n",</div><div class='add'>+		le16_to_cpu(hdr-&gt;type), len,</div><div class='add'>+		le32_to_cpu(hdr-&gt;seq_num));</div><div class='add'>+</div><div class='add'>+#define SAP_MSG_HANDLER(_cmd, _handler, _sz)				\</div><div class='add'>+	case SAP_MSG_NOTIF_ ## _cmd:					\</div><div class='add'>+		if (len &lt; _sz) {					\</div><div class='add'>+			dev_err(&amp;cldev-&gt;dev,				\</div><div class='add'>+				"Bad size for %d: %u &lt; %u\n",		\</div><div class='add'>+				le16_to_cpu(hdr-&gt;type),			\</div><div class='add'>+				(unsigned int)len,			\</div><div class='add'>+				(unsigned int)_sz);			\</div><div class='add'>+			break;						\</div><div class='add'>+		}							\</div><div class='add'>+		mutex_lock(&amp;iwl_mei_mutex);				\</div><div class='add'>+		_handler(cldev, (const void *)hdr);			\</div><div class='add'>+		mutex_unlock(&amp;iwl_mei_mutex);				\</div><div class='add'>+		break</div><div class='add'>+</div><div class='add'>+#define SAP_MSG_HANDLER_NO_LOCK(_cmd, _handler, _sz)			\</div><div class='add'>+	case SAP_MSG_NOTIF_ ## _cmd:					\</div><div class='add'>+		if (len &lt; _sz) {					\</div><div class='add'>+			dev_err(&amp;cldev-&gt;dev,				\</div><div class='add'>+				"Bad size for %d: %u &lt; %u\n",		\</div><div class='add'>+				le16_to_cpu(hdr-&gt;type),			\</div><div class='add'>+				(unsigned int)len,			\</div><div class='add'>+				(unsigned int)_sz);			\</div><div class='add'>+			break;						\</div><div class='add'>+		}							\</div><div class='add'>+		_handler(cldev, (const void *)hdr);			\</div><div class='add'>+		break</div><div class='add'>+</div><div class='add'>+#define SAP_MSG_HANDLER_NO_HANDLER(_cmd, _sz)				\</div><div class='add'>+	case SAP_MSG_NOTIF_ ## _cmd:					\</div><div class='add'>+		if (len &lt; _sz) {					\</div><div class='add'>+			dev_err(&amp;cldev-&gt;dev,				\</div><div class='add'>+				"Bad size for %d: %u &lt; %u\n",		\</div><div class='add'>+				le16_to_cpu(hdr-&gt;type),			\</div><div class='add'>+				(unsigned int)len,			\</div><div class='add'>+				(unsigned int)_sz);			\</div><div class='add'>+			break;						\</div><div class='add'>+		}							\</div><div class='add'>+		break</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	SAP_MSG_HANDLER(PING, iwl_mei_handle_ping, 0);</div><div class='add'>+	SAP_MSG_HANDLER(CSME_FILTERS,</div><div class='add'>+			iwl_mei_handle_csme_filters,</div><div class='add'>+			sizeof(struct iwl_sap_csme_filters));</div><div class='add'>+	SAP_MSG_HANDLER(CSME_CONN_STATUS,</div><div class='add'>+			iwl_mei_handle_conn_status,</div><div class='add'>+			sizeof(struct iwl_sap_notif_conn_status));</div><div class='add'>+	SAP_MSG_HANDLER_NO_LOCK(AMT_STATE,</div><div class='add'>+				iwl_mei_handle_amt_state,</div><div class='add'>+				sizeof(struct iwl_sap_msg_dw));</div><div class='add'>+	SAP_MSG_HANDLER_NO_HANDLER(PONG, 0);</div><div class='add'>+	SAP_MSG_HANDLER(NVM, iwl_mei_handle_nvm,</div><div class='add'>+			sizeof(struct iwl_sap_nvm));</div><div class='add'>+	SAP_MSG_HANDLER(CSME_REPLY_TO_HOST_OWNERSHIP_REQ,</div><div class='add'>+			iwl_mei_handle_rx_host_own_req,</div><div class='add'>+			sizeof(struct iwl_sap_msg_dw));</div><div class='add'>+	SAP_MSG_HANDLER(NIC_OWNER, iwl_mei_handle_nic_owner,</div><div class='add'>+			sizeof(struct iwl_sap_msg_dw));</div><div class='add'>+	SAP_MSG_HANDLER(CSME_CAN_RELEASE_OWNERSHIP,</div><div class='add'>+			iwl_mei_handle_can_release_ownership, 0);</div><div class='add'>+	SAP_MSG_HANDLER(CSME_TAKING_OWNERSHIP,</div><div class='add'>+			iwl_mei_handle_csme_taking_ownership, 0);</div><div class='add'>+	SAP_MSG_HANDLER(PLDR_ACK, iwl_mei_handle_pldr_ack,</div><div class='add'>+			sizeof(struct iwl_sap_pldr_ack_data));</div><div class='add'>+	default:</div><div class='add'>+	/*</div><div class='add'>+	 * This is not really an error, there are message that we decided</div><div class='add'>+	 * to ignore, yet, it is useful to be able to leave a note if debug</div><div class='add'>+	 * is enabled.</div><div class='add'>+	 */</div><div class='add'>+	dev_dbg(&amp;cldev-&gt;dev, "Unsupported message: type %d, len %d\n",</div><div class='add'>+		le16_to_cpu(hdr-&gt;type), len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#undef SAP_MSG_HANDLER</div><div class='add'>+#undef SAP_MSG_HANDLER_NO_LOCK</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mei_read_from_q(const u8 *q_head, u32 q_sz,</div><div class='add'>+				u32 *_rd, u32 wr,</div><div class='add'>+				void *_buf, u32 len)</div><div class='add'>+{</div><div class='add'>+	u8 *buf = _buf;</div><div class='add'>+	u32 rd = *_rd;</div><div class='add'>+</div><div class='add'>+	if (rd + len &lt;= q_sz) {</div><div class='add'>+		memcpy(buf, q_head + rd, len);</div><div class='add'>+		rd += len;</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(buf, q_head + rd, q_sz - rd);</div><div class='add'>+		memcpy(buf + q_sz - rd, q_head, len - (q_sz - rd));</div><div class='add'>+		rd = len - (q_sz - rd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*_rd = rd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define QOS_HDR_IV_SNAP_LEN (sizeof(struct ieee80211_qos_hdr) +      \</div><div class='add'>+			     IEEE80211_TKIP_IV_LEN +                 \</div><div class='add'>+			     sizeof(rfc1042_header) + ETH_TLEN)</div><div class='add'>+</div><div class='add'>+static void iwl_mei_handle_sap_data(struct mei_cl_device *cldev,</div><div class='add'>+				    const u8 *q_head, u32 q_sz,</div><div class='add'>+				    u32 rd, u32 wr, ssize_t valid_rx_sz,</div><div class='add'>+				    struct sk_buff_head *tx_skbs)</div><div class='add'>+{</div><div class='add'>+	struct iwl_sap_hdr hdr;</div><div class='add'>+	struct net_device *netdev =</div><div class='add'>+		rcu_dereference_protected(iwl_mei_cache.netdev,</div><div class='add'>+					  lockdep_is_held(&amp;iwl_mei_mutex));</div><div class='add'>+</div><div class='add'>+	if (!netdev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	while (valid_rx_sz &gt;= sizeof(hdr)) {</div><div class='add'>+		struct ethhdr *ethhdr;</div><div class='add'>+		unsigned char *data;</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+		u16 len;</div><div class='add'>+</div><div class='add'>+		iwl_mei_read_from_q(q_head, q_sz, &amp;rd, wr, &amp;hdr, sizeof(hdr));</div><div class='add'>+		valid_rx_sz -= sizeof(hdr);</div><div class='add'>+		len = le16_to_cpu(hdr.len);</div><div class='add'>+</div><div class='add'>+		if (valid_rx_sz &lt; len) {</div><div class='add'>+			dev_err(&amp;cldev-&gt;dev,</div><div class='add'>+				"Data queue is corrupted: valid data len %zd, len %d\n",</div><div class='add'>+				valid_rx_sz, len);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (len &lt; sizeof(*ethhdr)) {</div><div class='add'>+			dev_err(&amp;cldev-&gt;dev,</div><div class='add'>+				"Data len is smaller than an ethernet header? len = %d\n",</div><div class='add'>+				len);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		valid_rx_sz -= len;</div><div class='add'>+</div><div class='add'>+		if (le16_to_cpu(hdr.type) != SAP_MSG_DATA_PACKET) {</div><div class='add'>+			dev_err(&amp;cldev-&gt;dev, "Unsupported Rx data: type %d, len %d\n",</div><div class='add'>+				le16_to_cpu(hdr.type), len);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* We need enough room for the WiFi header + SNAP + IV */</div><div class='add'>+		skb = netdev_alloc_skb(netdev, len + QOS_HDR_IV_SNAP_LEN);</div><div class='add'>+		if (!skb)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		skb_reserve(skb, QOS_HDR_IV_SNAP_LEN);</div><div class='add'>+		ethhdr = skb_push(skb, sizeof(*ethhdr));</div><div class='add'>+</div><div class='add'>+		iwl_mei_read_from_q(q_head, q_sz, &amp;rd, wr,</div><div class='add'>+				    ethhdr, sizeof(*ethhdr));</div><div class='add'>+		len -= sizeof(*ethhdr);</div><div class='add'>+</div><div class='add'>+		skb_reset_mac_header(skb);</div><div class='add'>+		skb_reset_network_header(skb);</div><div class='add'>+		skb-&gt;protocol = ethhdr-&gt;h_proto;</div><div class='add'>+</div><div class='add'>+		data = skb_put(skb, len);</div><div class='add'>+		iwl_mei_read_from_q(q_head, q_sz, &amp;rd, wr, data, len);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Enqueue the skb here so that it can be sent later when we</div><div class='add'>+		 * do not hold the mutex. TX'ing a packet with a mutex held is</div><div class='add'>+		 * possible, but it wouldn't be nice to forbid the TX path to</div><div class='add'>+		 * call any of iwlmei's functions, since every API from iwlmei</div><div class='add'>+		 * needs the mutex.</div><div class='add'>+		 */</div><div class='add'>+		__skb_queue_tail(tx_skbs, skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mei_handle_sap_rx_cmd(struct mei_cl_device *cldev,</div><div class='add'>+				      const u8 *q_head, u32 q_sz,</div><div class='add'>+				      u32 rd, u32 wr, ssize_t valid_rx_sz)</div><div class='add'>+{</div><div class='add'>+	struct page *p = alloc_page(GFP_KERNEL);</div><div class='add'>+	struct iwl_sap_hdr *hdr;</div><div class='add'>+</div><div class='add'>+	if (!p)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hdr = page_address(p);</div><div class='add'>+</div><div class='add'>+	while (valid_rx_sz &gt;= sizeof(*hdr)) {</div><div class='add'>+		u16 len;</div><div class='add'>+</div><div class='add'>+		iwl_mei_read_from_q(q_head, q_sz, &amp;rd, wr, hdr, sizeof(*hdr));</div><div class='add'>+		valid_rx_sz -= sizeof(*hdr);</div><div class='add'>+		len = le16_to_cpu(hdr-&gt;len);</div><div class='add'>+</div><div class='add'>+		if (valid_rx_sz &lt; len)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		iwl_mei_read_from_q(q_head, q_sz, &amp;rd, wr, hdr + 1, len);</div><div class='add'>+</div><div class='add'>+		trace_iwlmei_sap_cmd(hdr, false);</div><div class='add'>+		iwl_mei_handle_sap_msg(cldev, hdr);</div><div class='add'>+		valid_rx_sz -= len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* valid_rx_sz must be 0 now... */</div><div class='add'>+	if (valid_rx_sz)</div><div class='add'>+		dev_err(&amp;cldev-&gt;dev,</div><div class='add'>+			"More data in the buffer although we read it all\n");</div><div class='add'>+</div><div class='add'>+	__free_page(p);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mei_handle_sap_rx(struct mei_cl_device *cldev,</div><div class='add'>+				  struct iwl_sap_q_ctrl_blk *notif_q,</div><div class='add'>+				  const u8 *q_head,</div><div class='add'>+				  struct sk_buff_head *skbs,</div><div class='add'>+				  u32 q_sz)</div><div class='add'>+{</div><div class='add'>+	u32 rd = le32_to_cpu(READ_ONCE(notif_q-&gt;rd_ptr));</div><div class='add'>+	u32 wr = le32_to_cpu(READ_ONCE(notif_q-&gt;wr_ptr));</div><div class='add'>+	ssize_t valid_rx_sz;</div><div class='add'>+</div><div class='add'>+	if (rd &gt; q_sz || wr &gt; q_sz) {</div><div class='add'>+		dev_err(&amp;cldev-&gt;dev,</div><div class='add'>+			"Pointers are past the buffer limit\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rd == wr)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	valid_rx_sz = wr &gt; rd ? wr - rd : q_sz - rd + wr;</div><div class='add'>+</div><div class='add'>+	if (skbs)</div><div class='add'>+		iwl_mei_handle_sap_data(cldev, q_head, q_sz, rd, wr,</div><div class='add'>+					valid_rx_sz, skbs);</div><div class='add'>+	else</div><div class='add'>+		iwl_mei_handle_sap_rx_cmd(cldev, q_head, q_sz, rd, wr,</div><div class='add'>+					  valid_rx_sz);</div><div class='add'>+</div><div class='add'>+	/* Increment the read pointer to point to the write pointer */</div><div class='add'>+	WRITE_ONCE(notif_q-&gt;rd_ptr, cpu_to_le32(wr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mei_handle_check_shared_area(struct mei_cl_device *cldev)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei = mei_cldev_get_drvdata(cldev);</div><div class='add'>+	struct iwl_sap_q_ctrl_blk *notif_q;</div><div class='add'>+	struct sk_buff_head tx_skbs;</div><div class='add'>+	struct iwl_sap_dir *dir;</div><div class='add'>+	void *q_head;</div><div class='add'>+	u32 q_sz;</div><div class='add'>+</div><div class='add'>+	if (!mei-&gt;shared_mem.ctrl)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dir = &amp;mei-&gt;shared_mem.ctrl-&gt;dir[SAP_DIRECTION_ME_TO_HOST];</div><div class='add'>+	notif_q = &amp;dir-&gt;q_ctrl_blk[SAP_QUEUE_IDX_NOTIF];</div><div class='add'>+	q_head = mei-&gt;shared_mem.q_head[SAP_DIRECTION_ME_TO_HOST][SAP_QUEUE_IDX_NOTIF];</div><div class='add'>+	q_sz = mei-&gt;shared_mem.q_size[SAP_DIRECTION_ME_TO_HOST][SAP_QUEUE_IDX_NOTIF];</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Do not hold the mutex here, but rather each and every message</div><div class='add'>+	 * handler takes it.</div><div class='add'>+	 * This allows message handlers to take it at a certain time.</div><div class='add'>+	 */</div><div class='add'>+	iwl_mei_handle_sap_rx(cldev, notif_q, q_head, NULL, q_sz);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+	dir = &amp;mei-&gt;shared_mem.ctrl-&gt;dir[SAP_DIRECTION_ME_TO_HOST];</div><div class='add'>+	notif_q = &amp;dir-&gt;q_ctrl_blk[SAP_QUEUE_IDX_DATA];</div><div class='add'>+	q_head = mei-&gt;shared_mem.q_head[SAP_DIRECTION_ME_TO_HOST][SAP_QUEUE_IDX_DATA];</div><div class='add'>+	q_sz = mei-&gt;shared_mem.q_size[SAP_DIRECTION_ME_TO_HOST][SAP_QUEUE_IDX_DATA];</div><div class='add'>+</div><div class='add'>+	__skb_queue_head_init(&amp;tx_skbs);</div><div class='add'>+</div><div class='add'>+	iwl_mei_handle_sap_rx(cldev, notif_q, q_head, &amp;tx_skbs, q_sz);</div><div class='add'>+</div><div class='add'>+	if (skb_queue_empty(&amp;tx_skbs)) {</div><div class='add'>+		mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Take the RCU read lock before we unlock the mutex to make sure that</div><div class='add'>+	 * even if the netdev is replaced by another non-NULL netdev right after</div><div class='add'>+	 * we unlock the mutex, the old netdev will still be valid when we</div><div class='add'>+	 * transmit the frames. We can't allow to replace the netdev here because</div><div class='add'>+	 * the skbs hold a pointer to the netdev.</div><div class='add'>+	 */</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	if (!rcu_access_pointer(iwl_mei_cache.netdev)) {</div><div class='add'>+		dev_err(&amp;cldev-&gt;dev, "Can't Tx without a netdev\n");</div><div class='add'>+		skb_queue_purge(&amp;tx_skbs);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (!skb_queue_empty(&amp;tx_skbs)) {</div><div class='add'>+		struct sk_buff *skb = __skb_dequeue(&amp;tx_skbs);</div><div class='add'>+</div><div class='add'>+		trace_iwlmei_sap_data(skb, IWL_SAP_RX_DATA_TO_AIR);</div><div class='add'>+		dev_queue_xmit(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mei_rx(struct mei_cl_device *cldev)</div><div class='add'>+{</div><div class='add'>+	struct iwl_sap_me_msg_hdr *hdr;</div><div class='add'>+	u8 msg[100];</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	ret = mei_cldev_recv(cldev, (u8 *)&amp;msg, sizeof(msg));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;cldev-&gt;dev, "failed to receive data: %zd\n", ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		dev_err(&amp;cldev-&gt;dev, "got an empty response\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr = (void *)msg;</div><div class='add'>+	trace_iwlmei_me_msg(hdr, false);</div><div class='add'>+</div><div class='add'>+	switch (le32_to_cpu(hdr-&gt;type)) {</div><div class='add'>+	case SAP_ME_MSG_START_OK:</div><div class='add'>+		BUILD_BUG_ON(sizeof(struct iwl_sap_me_msg_start_ok) &gt;</div><div class='add'>+			     sizeof(msg));</div><div class='add'>+</div><div class='add'>+		iwl_mei_handle_rx_start_ok(cldev, (void *)msg, ret);</div><div class='add'>+		break;</div><div class='add'>+	case SAP_ME_MSG_CHECK_SHARED_AREA:</div><div class='add'>+		iwl_mei_handle_check_shared_area(cldev);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(&amp;cldev-&gt;dev, "got a RX notification: %d\n",</div><div class='add'>+			le32_to_cpu(hdr-&gt;type));</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mei_send_start(struct mei_cl_device *cldev)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei = mei_cldev_get_drvdata(cldev);</div><div class='add'>+	struct iwl_sap_me_msg_start msg = {</div><div class='add'>+		.hdr.type = cpu_to_le32(SAP_ME_MSG_START),</div><div class='add'>+		.hdr.seq_num = cpu_to_le32(atomic_inc_return(&amp;mei-&gt;seq_no)),</div><div class='add'>+		.hdr.len = cpu_to_le32(sizeof(msg)),</div><div class='add'>+		.supported_versions[0] = iwl_mei_cache.sap_version,</div><div class='add'>+		.init_data_seq_num = cpu_to_le16(0x100),</div><div class='add'>+		.init_notif_seq_num = cpu_to_le16(0x800),</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	trace_iwlmei_me_msg(&amp;msg.hdr, true);</div><div class='add'>+	ret = mei_cldev_send(cldev, (void *)&amp;msg, sizeof(msg));</div><div class='add'>+	if (ret != sizeof(msg)) {</div><div class='add'>+		dev_err(&amp;cldev-&gt;dev,</div><div class='add'>+			"failed to send the SAP_ME_MSG_START message %d\n",</div><div class='add'>+			ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mei_enable(struct mei_cl_device *cldev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mei_cldev_enable(cldev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;cldev-&gt;dev, "failed to enable the device: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mei_cldev_register_rx_cb(cldev, iwl_mei_rx);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;cldev-&gt;dev,</div><div class='add'>+			"failed to register to the rx cb: %d\n", ret);</div><div class='add'>+		mei_cldev_disable(cldev);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct iwl_mei_nvm *iwl_mei_get_nvm(void)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei_nvm *nvm = NULL;</div><div class='add'>+	struct iwl_mei *mei;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	if (!iwl_mei_is_connected())</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mei = mei_cldev_get_drvdata(iwl_mei_global_cldev);</div><div class='add'>+</div><div class='add'>+	if (!mei)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mei_send_sap_msg(iwl_mei_global_cldev,</div><div class='add'>+				   SAP_MSG_NOTIF_GET_NVM);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	ret = wait_event_timeout(mei-&gt;get_nvm_wq, mei-&gt;nvm, 2 * HZ);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	if (!iwl_mei_is_connected())</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mei = mei_cldev_get_drvdata(iwl_mei_global_cldev);</div><div class='add'>+</div><div class='add'>+	if (!mei)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (mei-&gt;nvm)</div><div class='add'>+		nvm = kmemdup(mei-&gt;nvm, sizeof(*mei-&gt;nvm), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+	return nvm;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iwl_mei_get_nvm);</div><div class='add'>+</div><div class='add'>+#define IWL_MEI_PLDR_NUM_RETRIES	3</div><div class='add'>+</div><div class='add'>+int iwl_mei_pldr_req(void)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei;</div><div class='add'>+	int ret;</div><div class='add'>+	struct iwl_sap_pldr_data msg = {</div><div class='add'>+		.hdr.type = cpu_to_le16(SAP_MSG_NOTIF_PLDR),</div><div class='add'>+		.hdr.len = cpu_to_le16(sizeof(msg) - sizeof(msg.hdr)),</div><div class='add'>+	};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	/* In case we didn't have a bind */</div><div class='add'>+	if (!iwl_mei_is_connected()) {</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mei = mei_cldev_get_drvdata(iwl_mei_global_cldev);</div><div class='add'>+</div><div class='add'>+	if (!mei) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mei-&gt;amt_enabled) {</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IWL_MEI_PLDR_NUM_RETRIES; i++) {</div><div class='add'>+		ret = iwl_mei_send_sap_msg_payload(mei-&gt;cldev, &amp;msg.hdr);</div><div class='add'>+		mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = wait_event_timeout(mei-&gt;pldr_wq, mei-&gt;pldr_active, HZ / 2);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* Take the mutex for the next iteration */</div><div class='add'>+		mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = -ETIMEDOUT;</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iwl_mei_pldr_req);</div><div class='add'>+</div><div class='add'>+int iwl_mei_get_ownership(void)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	/* In case we didn't have a bind */</div><div class='add'>+	if (!iwl_mei_is_connected()) {</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mei = mei_cldev_get_drvdata(iwl_mei_global_cldev);</div><div class='add'>+</div><div class='add'>+	if (!mei) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mei-&gt;amt_enabled) {</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mei-&gt;got_ownership) {</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mei_send_sap_msg(mei-&gt;cldev,</div><div class='add'>+				   SAP_MSG_NOTIF_HOST_ASKS_FOR_NIC_OWNERSHIP);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	ret = wait_event_timeout(mei-&gt;get_ownership_wq,</div><div class='add'>+				 mei-&gt;got_ownership, HZ / 2);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		schedule_delayed_work(&amp;mei-&gt;ownership_dwork,</div><div class='add'>+				      MEI_OWNERSHIP_RETAKE_TIMEOUT_MS);</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iwl_mei_get_ownership);</div><div class='add'>+</div><div class='add'>+void iwl_mei_alive_notif(bool success)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei;</div><div class='add'>+	struct iwl_sap_pldr_end_data msg = {</div><div class='add'>+		.hdr.type = cpu_to_le16(SAP_MSG_NOTIF_PLDR_END),</div><div class='add'>+		.hdr.len = cpu_to_le16(sizeof(msg) - sizeof(msg.hdr)),</div><div class='add'>+		.status = success ? cpu_to_le32(SAP_PLDR_STATUS_SUCCESS) :</div><div class='add'>+			cpu_to_le32(SAP_PLDR_STATUS_FAILURE),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	if (!iwl_mei_is_connected())</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mei = mei_cldev_get_drvdata(iwl_mei_global_cldev);</div><div class='add'>+	if (!mei || !mei-&gt;pldr_active)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mei-&gt;pldr_active = false;</div><div class='add'>+</div><div class='add'>+	iwl_mei_send_sap_msg_payload(mei-&gt;cldev, &amp;msg.hdr);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iwl_mei_alive_notif);</div><div class='add'>+</div><div class='add'>+void iwl_mei_host_associated(const struct iwl_mei_conn_info *conn_info,</div><div class='add'>+			     const struct iwl_mei_colloc_info *colloc_info)</div><div class='add'>+{</div><div class='add'>+	struct iwl_sap_notif_host_link_up msg = {</div><div class='add'>+		.hdr.type = cpu_to_le16(SAP_MSG_NOTIF_HOST_LINK_UP),</div><div class='add'>+		.hdr.len = cpu_to_le16(sizeof(msg) - sizeof(msg.hdr)),</div><div class='add'>+		.conn_info = {</div><div class='add'>+			.ssid_len = cpu_to_le32(conn_info-&gt;ssid_len),</div><div class='add'>+			.channel = conn_info-&gt;channel,</div><div class='add'>+			.band = conn_info-&gt;band,</div><div class='add'>+			.pairwise_cipher = cpu_to_le32(conn_info-&gt;pairwise_cipher),</div><div class='add'>+			.auth_mode = cpu_to_le32(conn_info-&gt;auth_mode),</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	struct iwl_mei *mei;</div><div class='add'>+</div><div class='add'>+	if (conn_info-&gt;ssid_len &gt; ARRAY_SIZE(msg.conn_info.ssid))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memcpy(msg.conn_info.ssid, conn_info-&gt;ssid, conn_info-&gt;ssid_len);</div><div class='add'>+	memcpy(msg.conn_info.bssid, conn_info-&gt;bssid, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	if (colloc_info) {</div><div class='add'>+		msg.colloc_channel = colloc_info-&gt;channel;</div><div class='add'>+		msg.colloc_band = colloc_info-&gt;channel &lt;= 14 ? 0 : 1;</div><div class='add'>+		memcpy(msg.colloc_bssid, colloc_info-&gt;bssid, ETH_ALEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	if (!iwl_mei_is_connected())</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mei = mei_cldev_get_drvdata(iwl_mei_global_cldev);</div><div class='add'>+</div><div class='add'>+	if (!mei || !mei-&gt;amt_enabled)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	iwl_mei_send_sap_msg_payload(mei-&gt;cldev, &amp;msg.hdr);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(iwl_mei_cache.conn_info);</div><div class='add'>+	iwl_mei_cache.conn_info =</div><div class='add'>+		kmemdup(&amp;msg.conn_info, sizeof(msg.conn_info), GFP_KERNEL);</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iwl_mei_host_associated);</div><div class='add'>+</div><div class='add'>+void iwl_mei_host_disassociated(void)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei;</div><div class='add'>+	struct iwl_sap_notif_host_link_down msg = {</div><div class='add'>+		.hdr.type = cpu_to_le16(SAP_MSG_NOTIF_HOST_LINK_DOWN),</div><div class='add'>+		.hdr.len = cpu_to_le16(sizeof(msg) - sizeof(msg.hdr)),</div><div class='add'>+		.type = HOST_LINK_DOWN_TYPE_TEMPORARY,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	if (!iwl_mei_is_connected())</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mei = mei_cldev_get_drvdata(iwl_mei_global_cldev);</div><div class='add'>+</div><div class='add'>+	if (!mei || !mei-&gt;amt_enabled)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	iwl_mei_send_sap_msg_payload(mei-&gt;cldev, &amp;msg.hdr);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(iwl_mei_cache.conn_info);</div><div class='add'>+	iwl_mei_cache.conn_info = NULL;</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iwl_mei_host_disassociated);</div><div class='add'>+</div><div class='add'>+void iwl_mei_set_rfkill_state(bool hw_rfkill, bool sw_rfkill)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei;</div><div class='add'>+	u32 rfkill_state = 0;</div><div class='add'>+	struct iwl_sap_msg_dw msg = {</div><div class='add'>+		.hdr.type = cpu_to_le16(SAP_MSG_NOTIF_RADIO_STATE),</div><div class='add'>+		.hdr.len = cpu_to_le16(sizeof(msg) - sizeof(msg.hdr)),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!sw_rfkill)</div><div class='add'>+		rfkill_state |= SAP_SW_RFKILL_DEASSERTED;</div><div class='add'>+</div><div class='add'>+	if (!hw_rfkill)</div><div class='add'>+		rfkill_state |= SAP_HW_RFKILL_DEASSERTED;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	if (!iwl_mei_is_connected())</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	msg.val = cpu_to_le32(rfkill_state);</div><div class='add'>+</div><div class='add'>+	mei = mei_cldev_get_drvdata(iwl_mei_global_cldev);</div><div class='add'>+</div><div class='add'>+	if (!mei || !mei-&gt;amt_enabled)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	iwl_mei_send_sap_msg_payload(mei-&gt;cldev, &amp;msg.hdr);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	iwl_mei_cache.rf_kill = rfkill_state;</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iwl_mei_set_rfkill_state);</div><div class='add'>+</div><div class='add'>+void iwl_mei_set_nic_info(const u8 *mac_address, const u8 *nvm_address)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei;</div><div class='add'>+	struct iwl_sap_notif_host_nic_info msg = {</div><div class='add'>+		.hdr.type = cpu_to_le16(SAP_MSG_NOTIF_NIC_INFO),</div><div class='add'>+		.hdr.len = cpu_to_le16(sizeof(msg) - sizeof(msg.hdr)),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	if (!iwl_mei_is_connected())</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(msg.mac_address, mac_address);</div><div class='add'>+	ether_addr_copy(msg.nvm_address, nvm_address);</div><div class='add'>+</div><div class='add'>+	mei = mei_cldev_get_drvdata(iwl_mei_global_cldev);</div><div class='add'>+</div><div class='add'>+	if (!mei || !mei-&gt;amt_enabled)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	iwl_mei_send_sap_msg_payload(mei-&gt;cldev, &amp;msg.hdr);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	ether_addr_copy(iwl_mei_cache.mac_address, mac_address);</div><div class='add'>+	ether_addr_copy(iwl_mei_cache.nvm_address, nvm_address);</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iwl_mei_set_nic_info);</div><div class='add'>+</div><div class='add'>+void iwl_mei_set_country_code(u16 mcc)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei;</div><div class='add'>+	struct iwl_sap_notif_country_code msg = {</div><div class='add'>+		.hdr.type = cpu_to_le16(SAP_MSG_NOTIF_COUNTRY_CODE),</div><div class='add'>+		.hdr.len = cpu_to_le16(sizeof(msg) - sizeof(msg.hdr)),</div><div class='add'>+		.mcc = cpu_to_le16(mcc),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	if (!iwl_mei_is_connected())</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mei = mei_cldev_get_drvdata(iwl_mei_global_cldev);</div><div class='add'>+</div><div class='add'>+	if (!mei || !mei-&gt;amt_enabled)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	iwl_mei_send_sap_msg_payload(mei-&gt;cldev, &amp;msg.hdr);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	iwl_mei_cache.mcc = mcc;</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iwl_mei_set_country_code);</div><div class='add'>+</div><div class='add'>+void iwl_mei_set_power_limit(const __le16 *power_limit)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei;</div><div class='add'>+	struct iwl_sap_notif_sar_limits msg = {</div><div class='add'>+		.hdr.type = cpu_to_le16(SAP_MSG_NOTIF_SAR_LIMITS),</div><div class='add'>+		.hdr.len = cpu_to_le16(sizeof(msg) - sizeof(msg.hdr)),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	if (!iwl_mei_is_connected())</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mei = mei_cldev_get_drvdata(iwl_mei_global_cldev);</div><div class='add'>+</div><div class='add'>+	if (!mei || !mei-&gt;amt_enabled)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	memcpy(msg.sar_chain_info_table, power_limit, sizeof(msg.sar_chain_info_table));</div><div class='add'>+</div><div class='add'>+	iwl_mei_send_sap_msg_payload(mei-&gt;cldev, &amp;msg.hdr);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(iwl_mei_cache.power_limit);</div><div class='add'>+	iwl_mei_cache.power_limit = kmemdup(power_limit,</div><div class='add'>+					    sizeof(msg.sar_chain_info_table), GFP_KERNEL);</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iwl_mei_set_power_limit);</div><div class='add'>+</div><div class='add'>+void iwl_mei_set_netdev(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	if (!iwl_mei_is_connected()) {</div><div class='add'>+		rcu_assign_pointer(iwl_mei_cache.netdev, netdev);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mei = mei_cldev_get_drvdata(iwl_mei_global_cldev);</div><div class='add'>+</div><div class='add'>+	if (!mei)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!netdev) {</div><div class='add'>+		struct net_device *dev =</div><div class='add'>+			rcu_dereference_protected(iwl_mei_cache.netdev,</div><div class='add'>+						  lockdep_is_held(&amp;iwl_mei_mutex));</div><div class='add'>+</div><div class='add'>+		if (!dev)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		netdev_rx_handler_unregister(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(iwl_mei_cache.netdev, netdev);</div><div class='add'>+</div><div class='add'>+	if (netdev &amp;&amp; mei-&gt;amt_enabled)</div><div class='add'>+		netdev_rx_handler_register(netdev, iwl_mei_rx_handler, mei);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iwl_mei_set_netdev);</div><div class='add'>+</div><div class='add'>+void iwl_mei_device_state(bool up)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	if (!iwl_mei_is_connected())</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mei = mei_cldev_get_drvdata(iwl_mei_global_cldev);</div><div class='add'>+</div><div class='add'>+	if (!mei)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mei-&gt;device_down = !up;</div><div class='add'>+</div><div class='add'>+	if (up || !mei-&gt;csme_taking_ownership)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	iwl_mei_send_sap_msg(mei-&gt;cldev,</div><div class='add'>+			     SAP_MSG_NOTIF_CSME_OWNERSHIP_CONFIRMED);</div><div class='add'>+	mei-&gt;csme_taking_ownership = false;</div><div class='add'>+	schedule_delayed_work(&amp;mei-&gt;ownership_dwork,</div><div class='add'>+			      MEI_OWNERSHIP_RETAKE_TIMEOUT_MS);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iwl_mei_device_state);</div><div class='add'>+</div><div class='add'>+int iwl_mei_register(void *priv, const struct iwl_mei_ops *ops)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We must have a non-NULL priv pointer to not crash when there are</div><div class='add'>+	 * multiple WiFi devices.</div><div class='add'>+	 */</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	/* do not allow registration if someone else already registered */</div><div class='add'>+	if (iwl_mei_cache.priv || iwl_mei_cache.ops) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mei_cache.priv = priv;</div><div class='add'>+	iwl_mei_cache.ops = ops;</div><div class='add'>+</div><div class='add'>+	if (iwl_mei_global_cldev) {</div><div class='add'>+		struct iwl_mei *mei =</div><div class='add'>+			mei_cldev_get_drvdata(iwl_mei_global_cldev);</div><div class='add'>+</div><div class='add'>+		/* we have already a SAP connection */</div><div class='add'>+		if (iwl_mei_is_connected()) {</div><div class='add'>+			if (mei-&gt;amt_enabled)</div><div class='add'>+				iwl_mei_send_sap_msg(mei-&gt;cldev,</div><div class='add'>+						     SAP_MSG_NOTIF_WIFIDR_UP);</div><div class='add'>+			ops-&gt;rfkill(priv, mei-&gt;link_prot_state, false);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iwl_mei_register);</div><div class='add'>+</div><div class='add'>+void iwl_mei_start_unregister(void)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	/* At this point, the wifi driver should have removed the netdev */</div><div class='add'>+	if (rcu_access_pointer(iwl_mei_cache.netdev))</div><div class='add'>+		pr_err("Still had a netdev pointer set upon unregister\n");</div><div class='add'>+</div><div class='add'>+	kfree(iwl_mei_cache.conn_info);</div><div class='add'>+	iwl_mei_cache.conn_info = NULL;</div><div class='add'>+	kfree(iwl_mei_cache.power_limit);</div><div class='add'>+	iwl_mei_cache.power_limit = NULL;</div><div class='add'>+	iwl_mei_cache.ops = NULL;</div><div class='add'>+	/* leave iwl_mei_cache.priv non-NULL to prevent any new registration */</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iwl_mei_start_unregister);</div><div class='add'>+</div><div class='add'>+void iwl_mei_unregister_complete(void)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	iwl_mei_cache.priv = NULL;</div><div class='add'>+</div><div class='add'>+	if (iwl_mei_global_cldev) {</div><div class='add'>+		struct iwl_mei *mei =</div><div class='add'>+			mei_cldev_get_drvdata(iwl_mei_global_cldev);</div><div class='add'>+</div><div class='add'>+		if (mei-&gt;amt_enabled)</div><div class='add'>+			iwl_mei_send_sap_msg(mei-&gt;cldev,</div><div class='add'>+					     SAP_MSG_NOTIF_WIFIDR_DOWN);</div><div class='add'>+		mei-&gt;got_ownership = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iwl_mei_unregister_complete);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_DEBUG_FS)</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+iwl_mei_dbgfs_send_start_message_write(struct file *file,</div><div class='add'>+				       const char __user *user_buf,</div><div class='add'>+				       size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	if (!iwl_mei_global_cldev) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mei_send_start(iwl_mei_global_cldev);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+	return ret ?: count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations iwl_mei_dbgfs_send_start_message_ops = {</div><div class='add'>+	.write = iwl_mei_dbgfs_send_start_message_write,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t iwl_mei_dbgfs_req_ownership_write(struct file *file,</div><div class='add'>+						 const char __user *user_buf,</div><div class='add'>+						 size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	iwl_mei_get_ownership();</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations iwl_mei_dbgfs_req_ownership_ops = {</div><div class='add'>+	.write = iwl_mei_dbgfs_req_ownership_write,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void iwl_mei_dbgfs_register(struct iwl_mei *mei)</div><div class='add'>+{</div><div class='add'>+	mei-&gt;dbgfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);</div><div class='add'>+</div><div class='add'>+	if (!mei-&gt;dbgfs_dir)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	debugfs_create_ulong("status", S_IRUSR,</div><div class='add'>+			     mei-&gt;dbgfs_dir, &amp;iwl_mei_status);</div><div class='add'>+	debugfs_create_file("send_start_message", S_IWUSR, mei-&gt;dbgfs_dir,</div><div class='add'>+			    mei, &amp;iwl_mei_dbgfs_send_start_message_ops);</div><div class='add'>+	debugfs_create_file("req_ownership", S_IWUSR, mei-&gt;dbgfs_dir,</div><div class='add'>+			    mei, &amp;iwl_mei_dbgfs_req_ownership_ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mei_dbgfs_unregister(struct iwl_mei *mei)</div><div class='add'>+{</div><div class='add'>+	debugfs_remove_recursive(mei-&gt;dbgfs_dir);</div><div class='add'>+	mei-&gt;dbgfs_dir = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static void iwl_mei_dbgfs_register(struct iwl_mei *mei) {}</div><div class='add'>+static void iwl_mei_dbgfs_unregister(struct iwl_mei *mei) {}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_DEBUG_FS */</div><div class='add'>+</div><div class='add'>+static void iwl_mei_ownership_dwork(struct work_struct *wk)</div><div class='add'>+{</div><div class='add'>+	iwl_mei_get_ownership();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ALLOC_SHARED_MEM_RETRY_MAX_NUM	3</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * iwl_mei_probe - the probe function called by the mei bus enumeration</div><div class='add'>+ *</div><div class='add'>+ * This allocates the data needed by iwlmei and sets a pointer to this data</div><div class='add'>+ * into the mei_cl_device's drvdata.</div><div class='add'>+ * It starts the SAP protocol by sending the SAP_ME_MSG_START without</div><div class='add'>+ * waiting for the answer. The answer will be caught later by the Rx callback.</div><div class='add'>+ */</div><div class='add'>+static int iwl_mei_probe(struct mei_cl_device *cldev,</div><div class='add'>+			 const struct mei_cl_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int alloc_retry = ALLOC_SHARED_MEM_RETRY_MAX_NUM;</div><div class='add'>+	struct iwl_mei *mei;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mei = devm_kzalloc(&amp;cldev-&gt;dev, sizeof(*mei), GFP_KERNEL);</div><div class='add'>+	if (!mei)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;mei-&gt;get_nvm_wq);</div><div class='add'>+	INIT_WORK(&amp;mei-&gt;send_csa_msg_wk, iwl_mei_send_csa_msg_wk);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;mei-&gt;csa_throttle_end_wk,</div><div class='add'>+			  iwl_mei_csa_throttle_end_wk);</div><div class='add'>+	init_waitqueue_head(&amp;mei-&gt;get_ownership_wq);</div><div class='add'>+	init_waitqueue_head(&amp;mei-&gt;pldr_wq);</div><div class='add'>+	spin_lock_init(&amp;mei-&gt;data_q_lock);</div><div class='add'>+	INIT_WORK(&amp;mei-&gt;netdev_work, iwl_mei_netdev_work);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;mei-&gt;ownership_dwork, iwl_mei_ownership_dwork);</div><div class='add'>+</div><div class='add'>+	mei_cldev_set_drvdata(cldev, mei);</div><div class='add'>+	mei-&gt;cldev = cldev;</div><div class='add'>+	mei-&gt;device_down = true;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		ret = iwl_mei_alloc_shared_mem(cldev);</div><div class='add'>+		if (!ret)</div><div class='add'>+			break;</div><div class='add'>+		/*</div><div class='add'>+		 * The CSME firmware needs to boot the internal WLAN client.</div><div class='add'>+		 * This can take time in certain configurations (usually</div><div class='add'>+		 * upon resume and when the whole CSME firmware is shut down</div><div class='add'>+		 * during suspend).</div><div class='add'>+		 *</div><div class='add'>+		 * Wait a bit before retrying and hope we'll succeed next time.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		dev_dbg(&amp;cldev-&gt;dev,</div><div class='add'>+			"Couldn't allocate the shared memory: %d, attempt %d / %d\n",</div><div class='add'>+			ret, alloc_retry, ALLOC_SHARED_MEM_RETRY_MAX_NUM);</div><div class='add'>+		msleep(100);</div><div class='add'>+		alloc_retry--;</div><div class='add'>+	} while (alloc_retry);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;cldev-&gt;dev, "Couldn't allocate the shared memory: %d\n",</div><div class='add'>+			ret);</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mei_init_shared_mem(mei);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mei_enable(cldev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free_shared_mem;</div><div class='add'>+</div><div class='add'>+	iwl_mei_dbgfs_register(mei);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We now have a Rx function in place, start the SAP protocol</div><div class='add'>+	 * we expect to get the SAP_ME_MSG_START_OK response later on.</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+	ret = iwl_mei_send_start(cldev);</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto debugfs_unregister;</div><div class='add'>+</div><div class='add'>+	/* must be last */</div><div class='add'>+	iwl_mei_global_cldev = cldev;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+debugfs_unregister:</div><div class='add'>+	iwl_mei_dbgfs_unregister(mei);</div><div class='add'>+	mei_cldev_disable(cldev);</div><div class='add'>+free_shared_mem:</div><div class='add'>+	iwl_mei_free_shared_mem(cldev);</div><div class='add'>+free:</div><div class='add'>+	mei_cldev_set_drvdata(cldev, NULL);</div><div class='add'>+	devm_kfree(&amp;cldev-&gt;dev, mei);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SEND_SAP_MAX_WAIT_ITERATION 10</div><div class='add'>+#define IWLMEI_DEVICE_DOWN_WAIT_ITERATION 50</div><div class='add'>+</div><div class='add'>+static void iwl_mei_remove(struct mei_cl_device *cldev)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei *mei = mei_cldev_get_drvdata(cldev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We are being removed while the bus is active, it means we are</div><div class='add'>+	 * going to suspend/ shutdown, so the NIC will disappear.</div><div class='add'>+	 */</div><div class='add'>+	if (mei_cldev_enabled(cldev) &amp;&amp; iwl_mei_cache.ops) {</div><div class='add'>+		unsigned int iter = IWLMEI_DEVICE_DOWN_WAIT_ITERATION;</div><div class='add'>+		bool down = false;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * In case of suspend, wait for the mac to stop and don't remove</div><div class='add'>+		 * the interface. This will allow the interface to come back</div><div class='add'>+		 * on resume.</div><div class='add'>+		 */</div><div class='add'>+		while (!down &amp;&amp; iter--) {</div><div class='add'>+			mdelay(1);</div><div class='add'>+</div><div class='add'>+			mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+			down = mei-&gt;device_down;</div><div class='add'>+			mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!down)</div><div class='add'>+			iwl_mei_cache.ops-&gt;nic_stolen(iwl_mei_cache.priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rcu_access_pointer(iwl_mei_cache.netdev)) {</div><div class='add'>+		struct net_device *dev;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * First take rtnl and only then the mutex to avoid an ABBA</div><div class='add'>+		 * with iwl_mei_set_netdev()</div><div class='add'>+		 */</div><div class='add'>+		rtnl_lock();</div><div class='add'>+		mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If we are suspending and the wifi driver hasn't removed it's netdev</div><div class='add'>+		 * yet, do it now. In any case, don't change the cache.netdev pointer.</div><div class='add'>+		 */</div><div class='add'>+		dev = rcu_dereference_protected(iwl_mei_cache.netdev,</div><div class='add'>+						lockdep_is_held(&amp;iwl_mei_mutex));</div><div class='add'>+</div><div class='add'>+		netdev_rx_handler_unregister(dev);</div><div class='add'>+		mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	/* Tell CSME that we are going down so that it won't access the</div><div class='add'>+	 * memory anymore, make sure this message goes through immediately.</div><div class='add'>+	 */</div><div class='add'>+	mei-&gt;csa_throttled = false;</div><div class='add'>+	iwl_mei_send_sap_msg(mei-&gt;cldev,</div><div class='add'>+			     SAP_MSG_NOTIF_HOST_GOES_DOWN);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SEND_SAP_MAX_WAIT_ITERATION; i++) {</div><div class='add'>+		if (!iwl_mei_host_to_me_data_pending(mei))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		msleep(20);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If we couldn't make sure that CSME saw the HOST_GOES_DOWN</div><div class='add'>+	 * message, it means that it will probably keep reading memory</div><div class='add'>+	 * that we are going to unmap and free, expect IOMMU error</div><div class='add'>+	 * messages.</div><div class='add'>+	 */</div><div class='add'>+	if (i == SEND_SAP_MAX_WAIT_ITERATION)</div><div class='add'>+		dev_err(&amp;mei-&gt;cldev-&gt;dev,</div><div class='add'>+			"Couldn't get ACK from CSME on HOST_GOES_DOWN message\n");</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This looks strange, but this lock is taken here to make sure that</div><div class='add'>+	 * iwl_mei_add_data_to_ring called from the Tx path sees that we</div><div class='add'>+	 * clear the IWL_MEI_STATUS_SAP_CONNECTED bit.</div><div class='add'>+	 * Rx isn't a problem because the rx_handler can't be called after</div><div class='add'>+	 * having been unregistered.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_bh(&amp;mei-&gt;data_q_lock);</div><div class='add'>+	clear_bit(IWL_MEI_STATUS_SAP_CONNECTED, &amp;iwl_mei_status);</div><div class='add'>+	spin_unlock_bh(&amp;mei-&gt;data_q_lock);</div><div class='add'>+</div><div class='add'>+	if (iwl_mei_cache.ops)</div><div class='add'>+		iwl_mei_cache.ops-&gt;rfkill(iwl_mei_cache.priv, false, false);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * mei_cldev_disable will return only after all the MEI Rx is done.</div><div class='add'>+	 * It must be called when iwl_mei_mutex is *not* held, since it waits</div><div class='add'>+	 * for our Rx handler to complete.</div><div class='add'>+	 * After it returns, no new Rx will start.</div><div class='add'>+	 */</div><div class='add'>+	mei_cldev_disable(cldev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Since the netdev was already removed and the netdev's removal</div><div class='add'>+	 * includes a call to synchronize_net() so that we know there won't be</div><div class='add'>+	 * any new Rx that will trigger the following workers.</div><div class='add'>+	 */</div><div class='add'>+	cancel_work_sync(&amp;mei-&gt;send_csa_msg_wk);</div><div class='add'>+	cancel_delayed_work_sync(&amp;mei-&gt;csa_throttle_end_wk);</div><div class='add'>+	cancel_work_sync(&amp;mei-&gt;netdev_work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;mei-&gt;ownership_dwork);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If someone waits for the ownership, let him know that we are going</div><div class='add'>+	 * down and that we are not connected anymore. He'll be able to take</div><div class='add'>+	 * the device.</div><div class='add'>+	 */</div><div class='add'>+	wake_up_all(&amp;mei-&gt;get_ownership_wq);</div><div class='add'>+	wake_up_all(&amp;mei-&gt;pldr_wq);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;iwl_mei_mutex);</div><div class='add'>+</div><div class='add'>+	iwl_mei_global_cldev = NULL;</div><div class='add'>+</div><div class='add'>+	wake_up_all(&amp;mei-&gt;get_nvm_wq);</div><div class='add'>+</div><div class='add'>+	iwl_mei_free_shared_mem(cldev);</div><div class='add'>+</div><div class='add'>+	iwl_mei_dbgfs_unregister(mei);</div><div class='add'>+</div><div class='add'>+	mei_cldev_set_drvdata(cldev, NULL);</div><div class='add'>+</div><div class='add'>+	kfree(mei-&gt;nvm);</div><div class='add'>+</div><div class='add'>+	kfree(rcu_access_pointer(mei-&gt;filters));</div><div class='add'>+</div><div class='add'>+	devm_kfree(&amp;cldev-&gt;dev, mei);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;iwl_mei_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct mei_cl_device_id iwl_mei_tbl[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = KBUILD_MODNAME,</div><div class='add'>+		.uuid = MEI_WLAN_UUID,</div><div class='add'>+		.version = MEI_CL_VERSION_ANY,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	/* required last entry */</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Do not export the device table because this module is loaded by</div><div class='add'>+ * iwlwifi's dependency.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct mei_cl_driver iwl_mei_cl_driver = {</div><div class='add'>+	.id_table = iwl_mei_tbl,</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='add'>+	.probe = iwl_mei_probe,</div><div class='add'>+	.remove = iwl_mei_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_mei_cl_driver(iwl_mei_cl_driver);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mei/net.c b/drivers/net/wireless/intel/iwlwifi/mei/net.c<br/>new file mode 100644<br/>index 000000000000..eac46d1a397a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mei/net.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mei/net.c</a></div><div class='hunk'>@@ -0,0 +1,412 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2021-2022 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/if_ether.h&gt;</div><div class='add'>+#include &lt;uapi/linux/if_arp.h&gt;</div><div class='add'>+#include &lt;uapi/linux/icmp.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/ieee80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/cfg80211.h&gt;</div><div class='add'>+#include &lt;net/ip.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/icmp.h&gt;</div><div class='add'>+#include &lt;linux/udp.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+</div><div class='add'>+#include "internal.h"</div><div class='add'>+#include "sap.h"</div><div class='add'>+#include "iwl-mei.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns true if further filtering should be stopped. Only in that case</div><div class='add'>+ * pass_to_csme and rx_handler_res are set. Otherwise, next level of filters</div><div class='add'>+ * should be checked.</div><div class='add'>+ */</div><div class='add'>+static bool iwl_mei_rx_filter_eth(const struct ethhdr *ethhdr,</div><div class='add'>+				  const struct iwl_sap_oob_filters *filters,</div><div class='add'>+				  bool *pass_to_csme,</div><div class='add'>+				  rx_handler_result_t *rx_handler_res)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_sap_eth_filter *filt;</div><div class='add'>+</div><div class='add'>+	/* This filter is not relevant for UCAST packet */</div><div class='add'>+	if (!is_multicast_ether_addr(ethhdr-&gt;h_dest) ||</div><div class='add'>+	    is_broadcast_ether_addr(ethhdr-&gt;h_dest))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	for (filt = &amp;filters-&gt;eth_filters[0];</div><div class='add'>+	     filt &lt; &amp;filters-&gt;eth_filters[0] + ARRAY_SIZE(filters-&gt;eth_filters);</div><div class='add'>+	     filt++) {</div><div class='add'>+		/* Assume there are no enabled filter after a disabled one */</div><div class='add'>+		if (!(filt-&gt;flags &amp; SAP_ETH_FILTER_ENABLED))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (compare_ether_header(filt-&gt;mac_address, ethhdr-&gt;h_dest))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Packet needs to reach the host's stack */</div><div class='add'>+		if (filt-&gt;flags &amp; SAP_ETH_FILTER_COPY)</div><div class='add'>+			*rx_handler_res = RX_HANDLER_PASS;</div><div class='add'>+		else</div><div class='add'>+			*rx_handler_res = RX_HANDLER_CONSUMED;</div><div class='add'>+</div><div class='add'>+		/* We have an authoritative answer, stop filtering */</div><div class='add'>+		if (filt-&gt;flags &amp; SAP_ETH_FILTER_STOP) {</div><div class='add'>+			*pass_to_csme = true;</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	 /* MCAST frames that don't match layer 2 filters are not sent to ME */</div><div class='add'>+	*pass_to_csme  = false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns true iff the frame should be passed to CSME in which case</div><div class='add'>+ * rx_handler_res is set.</div><div class='add'>+ */</div><div class='add'>+static bool iwl_mei_rx_filter_arp(struct sk_buff *skb,</div><div class='add'>+				  const struct iwl_sap_oob_filters *filters,</div><div class='add'>+				  rx_handler_result_t *rx_handler_res)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_sap_ipv4_filter *filt = &amp;filters-&gt;ipv4_filter;</div><div class='add'>+	const struct arphdr *arp;</div><div class='add'>+	const __be32 *target_ip;</div><div class='add'>+	u32 flags = le32_to_cpu(filt-&gt;flags);</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(skb, arp_hdr_len(skb-&gt;dev)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	arp = arp_hdr(skb);</div><div class='add'>+</div><div class='add'>+	/* Handle only IPv4 over ethernet ARP frames */</div><div class='add'>+	if (arp-&gt;ar_hrd != htons(ARPHRD_ETHER) ||</div><div class='add'>+	    arp-&gt;ar_pro != htons(ETH_P_IP))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * After the ARP header, we have:</div><div class='add'>+	 * src MAC address   - 6 bytes</div><div class='add'>+	 * src IP address    - 4 bytes</div><div class='add'>+	 * target MAC addess - 6 bytes</div><div class='add'>+	 */</div><div class='add'>+	target_ip = (const void *)((const u8 *)(arp + 1) +</div><div class='add'>+				   ETH_ALEN + sizeof(__be32) + ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ARP request is forwarded to ME only if IP address match in the</div><div class='add'>+	 * ARP request's target ip field.</div><div class='add'>+	 */</div><div class='add'>+	if (arp-&gt;ar_op == htons(ARPOP_REQUEST) &amp;&amp;</div><div class='add'>+	    (filt-&gt;flags &amp; cpu_to_le32(SAP_IPV4_FILTER_ARP_REQ_PASS)) &amp;&amp;</div><div class='add'>+	    (filt-&gt;ipv4_addr == 0 || filt-&gt;ipv4_addr == *target_ip)) {</div><div class='add'>+		if (flags &amp; SAP_IPV4_FILTER_ARP_REQ_COPY)</div><div class='add'>+			*rx_handler_res = RX_HANDLER_PASS;</div><div class='add'>+		else</div><div class='add'>+			*rx_handler_res = RX_HANDLER_CONSUMED;</div><div class='add'>+</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ARP reply is always forwarded to ME regardless of the IP */</div><div class='add'>+	if (flags &amp; SAP_IPV4_FILTER_ARP_RESP_PASS &amp;&amp;</div><div class='add'>+	    arp-&gt;ar_op == htons(ARPOP_REPLY)) {</div><div class='add'>+		if (flags &amp; SAP_IPV4_FILTER_ARP_RESP_COPY)</div><div class='add'>+			*rx_handler_res = RX_HANDLER_PASS;</div><div class='add'>+		else</div><div class='add'>+			*rx_handler_res = RX_HANDLER_CONSUMED;</div><div class='add'>+</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+iwl_mei_rx_filter_tcp_udp(struct sk_buff *skb, bool  ip_match,</div><div class='add'>+			  const struct iwl_sap_oob_filters *filters,</div><div class='add'>+			  rx_handler_result_t *rx_handler_res)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_sap_flex_filter *filt;</div><div class='add'>+</div><div class='add'>+	for (filt = &amp;filters-&gt;flex_filters[0];</div><div class='add'>+	     filt &lt; &amp;filters-&gt;flex_filters[0] + ARRAY_SIZE(filters-&gt;flex_filters);</div><div class='add'>+	     filt++) {</div><div class='add'>+		if (!(filt-&gt;flags &amp; SAP_FLEX_FILTER_ENABLED))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We are required to have a match on the IP level and we didn't</div><div class='add'>+		 * have such match.</div><div class='add'>+		 */</div><div class='add'>+		if ((filt-&gt;flags &amp;</div><div class='add'>+		     (SAP_FLEX_FILTER_IPV4 | SAP_FLEX_FILTER_IPV6)) &amp;&amp;</div><div class='add'>+		    !ip_match)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if ((filt-&gt;flags &amp; SAP_FLEX_FILTER_UDP) &amp;&amp;</div><div class='add'>+		    ip_hdr(skb)-&gt;protocol != IPPROTO_UDP)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if ((filt-&gt;flags &amp; SAP_FLEX_FILTER_TCP) &amp;&amp;</div><div class='add'>+		    ip_hdr(skb)-&gt;protocol != IPPROTO_TCP)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We must have either a TCP header or a UDP header, both</div><div class='add'>+		 * starts with a source port and then a destination port.</div><div class='add'>+		 * Both are big endian words.</div><div class='add'>+		 * Use a UDP header and that will work for TCP as well.</div><div class='add'>+		 */</div><div class='add'>+		if ((filt-&gt;src_port &amp;&amp; filt-&gt;src_port != udp_hdr(skb)-&gt;source) ||</div><div class='add'>+		    (filt-&gt;dst_port &amp;&amp; filt-&gt;dst_port != udp_hdr(skb)-&gt;dest))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (filt-&gt;flags &amp; SAP_FLEX_FILTER_COPY)</div><div class='add'>+			*rx_handler_res = RX_HANDLER_PASS;</div><div class='add'>+		else</div><div class='add'>+			*rx_handler_res = RX_HANDLER_CONSUMED;</div><div class='add'>+</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mei_rx_filter_ipv4(struct sk_buff *skb,</div><div class='add'>+				   const struct iwl_sap_oob_filters *filters,</div><div class='add'>+				   rx_handler_result_t *rx_handler_res)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_sap_ipv4_filter *filt = &amp;filters-&gt;ipv4_filter;</div><div class='add'>+	const struct iphdr *iphdr;</div><div class='add'>+	unsigned int iphdrlen;</div><div class='add'>+	bool match;</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(skb, skb_network_offset(skb) + sizeof(*iphdr)) ||</div><div class='add'>+	    !pskb_may_pull(skb, skb_network_offset(skb) + ip_hdrlen(skb)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	iphdrlen = ip_hdrlen(skb);</div><div class='add'>+	iphdr = ip_hdr(skb);</div><div class='add'>+	match = !filters-&gt;ipv4_filter.ipv4_addr ||</div><div class='add'>+		filters-&gt;ipv4_filter.ipv4_addr == iphdr-&gt;daddr;</div><div class='add'>+</div><div class='add'>+	skb_set_transport_header(skb, skb_network_offset(skb) + iphdrlen);</div><div class='add'>+</div><div class='add'>+	switch (ip_hdr(skb)-&gt;protocol) {</div><div class='add'>+	case IPPROTO_UDP:</div><div class='add'>+	case IPPROTO_TCP:</div><div class='add'>+		/*</div><div class='add'>+		 * UDP header is shorter than TCP header and we look at the first bytes</div><div class='add'>+		 * of the header anyway (see below).</div><div class='add'>+		 * If we have a truncated TCP packet, let CSME handle this.</div><div class='add'>+		 */</div><div class='add'>+		if (!pskb_may_pull(skb, skb_transport_offset(skb) +</div><div class='add'>+				   sizeof(struct udphdr)))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		return iwl_mei_rx_filter_tcp_udp(skb, match,</div><div class='add'>+						 filters, rx_handler_res);</div><div class='add'>+</div><div class='add'>+	case IPPROTO_ICMP: {</div><div class='add'>+		struct icmphdr *icmp;</div><div class='add'>+</div><div class='add'>+		if (!pskb_may_pull(skb, skb_transport_offset(skb) + sizeof(*icmp)))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		icmp = icmp_hdr(skb);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Don't pass echo requests to ME even if it wants it as we</div><div class='add'>+		 * want the host to answer.</div><div class='add'>+		 */</div><div class='add'>+		if ((filt-&gt;flags &amp; cpu_to_le32(SAP_IPV4_FILTER_ICMP_PASS)) &amp;&amp;</div><div class='add'>+		    match &amp;&amp; (icmp-&gt;type != ICMP_ECHO || icmp-&gt;code != 0)) {</div><div class='add'>+			if (filt-&gt;flags &amp; cpu_to_le32(SAP_IPV4_FILTER_ICMP_COPY))</div><div class='add'>+				*rx_handler_res = RX_HANDLER_PASS;</div><div class='add'>+			else</div><div class='add'>+				*rx_handler_res = RX_HANDLER_CONSUMED;</div><div class='add'>+</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+		}</div><div class='add'>+	case IPPROTO_ICMPV6:</div><div class='add'>+		/* TODO: Should we have the same ICMP request logic here too? */</div><div class='add'>+		if ((filters-&gt;icmpv6_flags &amp; cpu_to_le32(SAP_ICMPV6_FILTER_ENABLED) &amp;&amp;</div><div class='add'>+		     match)) {</div><div class='add'>+			if (filters-&gt;icmpv6_flags &amp;</div><div class='add'>+			    cpu_to_le32(SAP_ICMPV6_FILTER_COPY))</div><div class='add'>+				*rx_handler_res = RX_HANDLER_PASS;</div><div class='add'>+			else</div><div class='add'>+				*rx_handler_res = RX_HANDLER_CONSUMED;</div><div class='add'>+</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mei_rx_filter_ipv6(struct sk_buff *skb,</div><div class='add'>+				   const struct iwl_sap_oob_filters *filters,</div><div class='add'>+				   rx_handler_result_t *rx_handler_res)</div><div class='add'>+{</div><div class='add'>+	*rx_handler_res = RX_HANDLER_PASS;</div><div class='add'>+</div><div class='add'>+	/* TODO */</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static rx_handler_result_t</div><div class='add'>+iwl_mei_rx_pass_to_csme(struct sk_buff *skb,</div><div class='add'>+			const struct iwl_sap_oob_filters *filters,</div><div class='add'>+			bool *pass_to_csme)</div><div class='add'>+{</div><div class='add'>+	const struct ethhdr *ethhdr = (void *)skb_mac_header(skb);</div><div class='add'>+	rx_handler_result_t rx_handler_res = RX_HANDLER_PASS;</div><div class='add'>+	bool (*filt_handler)(struct sk_buff *skb,</div><div class='add'>+			     const struct iwl_sap_oob_filters *filters,</div><div class='add'>+			     rx_handler_result_t *rx_handler_res);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * skb-&gt;data points the IP header / ARP header and the ETH header</div><div class='add'>+	 * is in the headroom.</div><div class='add'>+	 */</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * MCAST IP packets sent by us are received again here without</div><div class='add'>+	 * an ETH header. Drop them here.</div><div class='add'>+	 */</div><div class='add'>+	if (!skb_mac_offset(skb))</div><div class='add'>+		return RX_HANDLER_PASS;</div><div class='add'>+</div><div class='add'>+	if (skb_headroom(skb) &lt; sizeof(*ethhdr))</div><div class='add'>+		return RX_HANDLER_PASS;</div><div class='add'>+</div><div class='add'>+	if (iwl_mei_rx_filter_eth(ethhdr, filters,</div><div class='add'>+				  pass_to_csme, &amp;rx_handler_res))</div><div class='add'>+		return rx_handler_res;</div><div class='add'>+</div><div class='add'>+	switch (skb-&gt;protocol) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		filt_handler = iwl_mei_rx_filter_ipv4;</div><div class='add'>+		break;</div><div class='add'>+	case htons(ETH_P_ARP):</div><div class='add'>+		filt_handler = iwl_mei_rx_filter_arp;</div><div class='add'>+		break;</div><div class='add'>+	case htons(ETH_P_IPV6):</div><div class='add'>+		filt_handler = iwl_mei_rx_filter_ipv6;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		*pass_to_csme = false;</div><div class='add'>+		return rx_handler_res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*pass_to_csme = filt_handler(skb, filters, &amp;rx_handler_res);</div><div class='add'>+</div><div class='add'>+	return rx_handler_res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+rx_handler_result_t iwl_mei_rx_filter(struct sk_buff *orig_skb,</div><div class='add'>+				      const struct iwl_sap_oob_filters *filters,</div><div class='add'>+				      bool *pass_to_csme)</div><div class='add'>+{</div><div class='add'>+	rx_handler_result_t ret;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mei_rx_pass_to_csme(orig_skb, filters, pass_to_csme);</div><div class='add'>+</div><div class='add'>+	if (!*pass_to_csme)</div><div class='add'>+		return RX_HANDLER_PASS;</div><div class='add'>+</div><div class='add'>+	if (ret == RX_HANDLER_PASS) {</div><div class='add'>+		skb = skb_copy(orig_skb, GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+		if (!skb)</div><div class='add'>+			return RX_HANDLER_PASS;</div><div class='add'>+	} else {</div><div class='add'>+		skb = orig_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* CSME wants the MAC header as well, push it back */</div><div class='add'>+	skb_push(skb, skb-&gt;data - skb_mac_header(skb));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Add the packet that CSME wants to get to the ring. Don't send the</div><div class='add'>+	 * Check Shared Area HECI message since this is not possible from the</div><div class='add'>+	 * Rx context. The caller will schedule a worker to do just that.</div><div class='add'>+	 */</div><div class='add'>+	iwl_mei_add_data_to_ring(skb, false);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In case we drop the packet, don't free it, the caller will do that</div><div class='add'>+	 * for us</div><div class='add'>+	 */</div><div class='add'>+	if (ret == RX_HANDLER_PASS)</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define DHCP_SERVER_PORT 67</div><div class='add'>+#define DHCP_CLIENT_PORT 68</div><div class='add'>+void iwl_mei_tx_copy_to_csme(struct sk_buff *origskb, unsigned int ivlen)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct ethhdr ethhdr;</div><div class='add'>+	struct ethhdr *eth;</div><div class='add'>+</div><div class='add'>+	/* Catch DHCP packets */</div><div class='add'>+	if (origskb-&gt;protocol != htons(ETH_P_IP) ||</div><div class='add'>+	    ip_hdr(origskb)-&gt;protocol != IPPROTO_UDP ||</div><div class='add'>+	    udp_hdr(origskb)-&gt;source != htons(DHCP_CLIENT_PORT) ||</div><div class='add'>+	    udp_hdr(origskb)-&gt;dest != htons(DHCP_SERVER_PORT))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We could be a bit less aggressive here and not copy everything, but</div><div class='add'>+	 * this is very rare anyway, do don't bother much.</div><div class='add'>+	 */</div><div class='add'>+	skb = skb_copy(origskb, GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb-&gt;protocol = origskb-&gt;protocol;</div><div class='add'>+</div><div class='add'>+	hdr = (void *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	memcpy(ethhdr.h_dest, ieee80211_get_DA(hdr), ETH_ALEN);</div><div class='add'>+	memcpy(ethhdr.h_source, ieee80211_get_SA(hdr), ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Remove the ieee80211 header + IV + SNAP but leave the ethertype</div><div class='add'>+	 * We still have enough headroom for the sap header.</div><div class='add'>+	 */</div><div class='add'>+	pskb_pull(skb, ieee80211_hdrlen(hdr-&gt;frame_control) + ivlen + 6);</div><div class='add'>+	eth = skb_push(skb, sizeof(ethhdr.h_dest) + sizeof(ethhdr.h_source));</div><div class='add'>+	memcpy(eth, &amp;ethhdr, sizeof(ethhdr.h_dest) + sizeof(ethhdr.h_source));</div><div class='add'>+</div><div class='add'>+	iwl_mei_add_data_to_ring(skb, true);</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iwl_mei_tx_copy_to_csme);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mei/sap.h b/drivers/net/wireless/intel/iwlwifi/mei/sap.h<br/>new file mode 100644<br/>index 000000000000..f985ab90d41c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mei/sap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mei/sap.h</a></div><div class='hunk'>@@ -0,0 +1,784 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2021 - 2022, 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __sap_h__</div><div class='add'>+#define __sap_h__</div><div class='add'>+</div><div class='add'>+#include "mei/iwl-mei.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Introduction</div><div class='add'>+ *</div><div class='add'>+ * SAP is the protocol used by the Intel Wireless driver (iwlwifi)</div><div class='add'>+ * and the wireless driver implemented in the CSME firmware.</div><div class='add'>+ * It allows to do several things:</div><div class='add'>+ * 1) Decide who is the owner of the device: CSME or the host</div><div class='add'>+ * 2) When the host is the owner of the device, CSME can still</div><div class='add'>+ * send and receive packets through iwlwifi.</div><div class='add'>+ *</div><div class='add'>+ * The protocol uses the ME interface (mei driver) to send</div><div class='add'>+ * messages to the CSME firmware. Those messages have a header</div><div class='add'>+ * &amp;struct iwl_sap_me_msg_hdr and this header is followed</div><div class='add'>+ * by a payload.</div><div class='add'>+ *</div><div class='add'>+ * Since this messaging system cannot support high amounts of</div><div class='add'>+ * traffic, iwlwifi and the CSME firmware's WLAN driver have an</div><div class='add'>+ * additional communication pipe to exchange information. The body</div><div class='add'>+ * of the message is copied to a shared area and the message that</div><div class='add'>+ * goes over the ME interface just signals the other side</div><div class='add'>+ * that a new message is waiting in the shared area. The ME</div><div class='add'>+ * interface is used only for signaling and not to transfer</div><div class='add'>+ * the payload.</div><div class='add'>+ *</div><div class='add'>+ * This shared area of memory is DMA'able mapped to be</div><div class='add'>+ * writable by both the CSME firmware and iwlwifi. It is</div><div class='add'>+ * mapped to address space of the device that controls the ME</div><div class='add'>+ * interface's DMA engine. Any data that iwlwifi needs to</div><div class='add'>+ * send to the CSME firmware needs to be copied to there.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Initial Handshake</div><div class='add'>+ *</div><div class='add'>+ * Once we get a link to the CMSE's WLAN driver we start the handshake</div><div class='add'>+ * to establish the shared memory that will allow the communication between</div><div class='add'>+ * the CSME's WLAN driver and the host.</div><div class='add'>+ *</div><div class='add'>+ * 1) Host sends %SAP_ME_MSG_START message with the physical address</div><div class='add'>+ * of the shared area.</div><div class='add'>+ * 2) CSME replies with %SAP_ME_MSG_START_OK which includes the versions</div><div class='add'>+ * protocol versions supported by CSME.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Host and driver state messages</div><div class='add'>+ *</div><div class='add'>+ * In order to let CSME know about the host state and the host driver state,</div><div class='add'>+ * the host sends messages that let CSME know about the host's state.</div><div class='add'>+ * When the host driver is loaded, the host sends %SAP_MSG_NOTIF_WIFIDR_UP.</div><div class='add'>+ * When the host driver is unloaded, the host sends %SAP_MSG_NOTIF_WIFIDR_DOWN.</div><div class='add'>+ * When the iwlmei is unloaded, %SAP_MSG_NOTIF_HOST_GOES_DOWN is sent to let</div><div class='add'>+ * CSME know not to access the shared memory anymore since it'll be freed.</div><div class='add'>+ *</div><div class='add'>+ * CSME will reply to SAP_MSG_NOTIF_WIFIDR_UP by</div><div class='add'>+ * %SAP_MSG_NOTIF_AMT_STATE to let the host driver whether CSME can use the</div><div class='add'>+ * WiFi device or not followed by %SAP_MSG_NOTIF_CSME_CONN_STATUS to inform</div><div class='add'>+ * the host driver on the connection state of CSME.</div><div class='add'>+ *</div><div class='add'>+ * When host is associated to an AP, it must send %SAP_MSG_NOTIF_HOST_LINK_UP</div><div class='add'>+ * and when it disconnect from the AP, it must send</div><div class='add'>+ * %SAP_MSG_NOTIF_HOST_LINK_DOWN.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Ownership</div><div class='add'>+ *</div><div class='add'>+ * The device can be controlled either by the CSME firmware or</div><div class='add'>+ * by the host driver: iwlwifi. There is a negotiation between</div><div class='add'>+ * those two entities to determine who controls (or owns) the</div><div class='add'>+ * device. Since the CSME can control the device even when the</div><div class='add'>+ * OS is not working or even missing, the CSME can request the</div><div class='add'>+ * device if it comes to the conclusion that the OS's host driver</div><div class='add'>+ * is not operational. This is why the host driver needs to</div><div class='add'>+ * signal CSME that it is up and running. If the driver is</div><div class='add'>+ * unloaded, it'll signal CSME that it is going down so that</div><div class='add'>+ * CSME can take ownership.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Ownership transfer</div><div class='add'>+ *</div><div class='add'>+ * When the host driver needs the device, it'll send the</div><div class='add'>+ * %SAP_MSG_NOTIF_HOST_ASKS_FOR_NIC_OWNERSHIP that will be replied by</div><div class='add'>+ * %SAP_MSG_NOTIF_CSME_REPLY_TO_HOST_OWNERSHIP_REQ which will let the</div><div class='add'>+ * host know whether the ownership is granted or no. If the ownership is</div><div class='add'>+ * granted, the hosts sends %SAP_MSG_NOTIF_HOST_OWNERSHIP_CONFIRMED.</div><div class='add'>+ *</div><div class='add'>+ * When CSME requests ownership, it'll send the</div><div class='add'>+ * %SAP_MSG_NOTIF_CSME_TAKING_OWNERSHIP and give some time to host to stop</div><div class='add'>+ * accessing the device. The host needs to send</div><div class='add'>+ * %SAP_MSG_NOTIF_CSME_OWNERSHIP_CONFIRMED to confirm that it won't access</div><div class='add'>+ * the device anymore. If the host failed to send this message fast enough,</div><div class='add'>+ * CSME will take ownership on the device anyway.</div><div class='add'>+ * When CSME is willing to release the ownership, it'll send</div><div class='add'>+ * %SAP_MSG_NOTIF_CSME_CAN_RELEASE_OWNERSHIP.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Data messages</div><div class='add'>+ *</div><div class='add'>+ * Data messages must be sent and receives on a separate queue in the shared</div><div class='add'>+ * memory. Almost all the data messages use the %SAP_MSG_DATA_PACKET for both</div><div class='add'>+ * packets sent by CSME to the host to be sent to the AP or for packets</div><div class='add'>+ * received from the AP and sent by the host to CSME.</div><div class='add'>+ * CSME sends filters to the host to let the host what inbound packets it must</div><div class='add'>+ * send to CSME. Those filters are received by the host as a</div><div class='add'>+ * %SAP_MSG_NOTIF_CSME_FILTERS command.</div><div class='add'>+ * The only outbound packets that must be sent to CSME are the DHCP packets.</div><div class='add'>+ * Those packets must use the %SAP_MSG_CB_DATA_PACKET message.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_sap_me_msg_id - the ID of the ME message</div><div class='add'>+ * @SAP_ME_MSG_START: See &amp;struct iwl_sap_me_msg_start.</div><div class='add'>+ * @SAP_ME_MSG_START_OK: See &amp;struct iwl_sap_me_msg_start_ok.</div><div class='add'>+ * @SAP_ME_MSG_CHECK_SHARED_AREA: This message has no payload.</div><div class='add'>+ */</div><div class='add'>+enum iwl_sap_me_msg_id {</div><div class='add'>+	SAP_ME_MSG_START	= 1,</div><div class='add'>+	SAP_ME_MSG_START_OK,</div><div class='add'>+	SAP_ME_MSG_CHECK_SHARED_AREA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sap_me_msg_hdr - the header of the ME message</div><div class='add'>+ * @type: the type of the message, see &amp;enum iwl_sap_me_msg_id.</div><div class='add'>+ * @seq_num: a sequence number used for debug only.</div><div class='add'>+ * @len: the length of the message.</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_me_msg_hdr {</div><div class='add'>+	__le32 type;</div><div class='add'>+	__le32 seq_num;</div><div class='add'>+	__le32 len;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sap_me_msg_start - used for the %SAP_ME_MSG_START message</div><div class='add'>+ * @hdr: See &amp;struct iwl_sap_me_msg_hdr.</div><div class='add'>+ * @shared_mem: physical address of SAP shared memory area.</div><div class='add'>+ * @init_data_seq_num: seq_num of the first data packet HOST -&gt; CSME.</div><div class='add'>+ * @init_notif_seq_num: seq_num of the first notification HOST -&gt; CSME.</div><div class='add'>+ * @supported_versions: The host sends to the CSME a zero-terminated array</div><div class='add'>+ * of versions its supports.</div><div class='add'>+ *</div><div class='add'>+ * This message is sent by the host to CSME and will responded by the</div><div class='add'>+ * %SAP_ME_MSG_START_OK message.</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_me_msg_start {</div><div class='add'>+	struct iwl_sap_me_msg_hdr hdr;</div><div class='add'>+	__le64 shared_mem;</div><div class='add'>+	__le16 init_data_seq_num;</div><div class='add'>+	__le16 init_notif_seq_num;</div><div class='add'>+	u8 supported_versions[64];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sap_me_msg_start_ok - used for the %SAP_ME_MSG_START_OK</div><div class='add'>+ * @hdr: See &amp;struct iwl_sap_me_msg_hdr</div><div class='add'>+ * @init_data_seq_num: Not used.</div><div class='add'>+ * @init_notif_seq_num: Not used</div><div class='add'>+ * @supported_version: The version that will be used.</div><div class='add'>+ * @reserved: For alignment.</div><div class='add'>+ *</div><div class='add'>+ * This message is sent by CSME to the host in response to the</div><div class='add'>+ * %SAP_ME_MSG_START message.</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_me_msg_start_ok {</div><div class='add'>+	struct iwl_sap_me_msg_hdr hdr;</div><div class='add'>+	__le16 init_data_seq_num;</div><div class='add'>+	__le16 init_notif_seq_num;</div><div class='add'>+	u8 supported_version;</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_sap_msg - SAP messages</div><div class='add'>+ * @SAP_MSG_NOTIF_BOTH_WAYS_MIN: Not used.</div><div class='add'>+ * @SAP_MSG_NOTIF_PING: No payload. Solicitate a response message (check-alive).</div><div class='add'>+ * @SAP_MSG_NOTIF_PONG: No payload. The response message.</div><div class='add'>+ * @SAP_MSG_NOTIF_BOTH_WAYS_MAX: Not used.</div><div class='add'>+ *</div><div class='add'>+ * @SAP_MSG_NOTIF_FROM_CSME_MIN: Not used.</div><div class='add'>+ * @SAP_MSG_NOTIF_CSME_FILTERS: TODO</div><div class='add'>+ * @SAP_MSG_NOTIF_AMT_STATE: Payload is a DW. Any non-zero value means</div><div class='add'>+ *	that CSME is enabled.</div><div class='add'>+ * @SAP_MSG_NOTIF_CSME_REPLY_TO_HOST_OWNERSHIP_REQ: Payload is a DW. 0 means</div><div class='add'>+ *	the host will not get ownership. Any other value means the host is</div><div class='add'>+ *	the owner.</div><div class='add'>+ * @SAP_MSG_NOTIF_CSME_TAKING_OWNERSHIP: No payload.</div><div class='add'>+ * @SAP_MSG_NOTIF_TRIGGER_IP_REFRESH: No payload.</div><div class='add'>+ * @SAP_MSG_NOTIF_CSME_CAN_RELEASE_OWNERSHIP: No payload.</div><div class='add'>+ * @SAP_MSG_NOTIF_NIC_OWNER: Payload is a DW. See &amp;enum iwl_sap_nic_owner.</div><div class='add'>+ * @SAP_MSG_NOTIF_CSME_CONN_STATUS: See &amp;struct iwl_sap_notif_conn_status.</div><div class='add'>+ * @SAP_MSG_NOTIF_NVM: See &amp;struct iwl_sap_nvm.</div><div class='add'>+ * @SAP_MSG_NOTIF_PLDR_ACK: See &amp;struct iwl_sap_pldr_ack_data.</div><div class='add'>+ * @SAP_MSG_NOTIF_FROM_CSME_MAX: Not used.</div><div class='add'>+ *</div><div class='add'>+ * @SAP_MSG_NOTIF_FROM_HOST_MIN: Not used.</div><div class='add'>+ * @SAP_MSG_NOTIF_BAND_SELECTION: TODO</div><div class='add'>+ * @SAP_MSG_NOTIF_RADIO_STATE: Payload is a DW.</div><div class='add'>+ *	See &amp;enum iwl_sap_radio_state_bitmap.</div><div class='add'>+ * @SAP_MSG_NOTIF_NIC_INFO: See &amp;struct iwl_sap_notif_host_nic_info.</div><div class='add'>+ * @SAP_MSG_NOTIF_HOST_ASKS_FOR_NIC_OWNERSHIP: No payload.</div><div class='add'>+ * @SAP_MSG_NOTIF_HOST_SUSPENDS: Payload is a DW. Bitmap described in</div><div class='add'>+ *	&amp;enum iwl_sap_notif_host_suspends_bitmap.</div><div class='add'>+ * @SAP_MSG_NOTIF_HOST_RESUMES: Payload is a DW. 0 or 1. 1 says that</div><div class='add'>+ *	the CSME should re-initialize the init control block.</div><div class='add'>+ * @SAP_MSG_NOTIF_HOST_GOES_DOWN: No payload.</div><div class='add'>+ * @SAP_MSG_NOTIF_CSME_OWNERSHIP_CONFIRMED: No payload.</div><div class='add'>+ * @SAP_MSG_NOTIF_COUNTRY_CODE: See &amp;struct iwl_sap_notif_country_code.</div><div class='add'>+ * @SAP_MSG_NOTIF_HOST_LINK_UP: See &amp;struct iwl_sap_notif_host_link_up.</div><div class='add'>+ * @SAP_MSG_NOTIF_HOST_LINK_DOWN: See &amp;struct iwl_sap_notif_host_link_down.</div><div class='add'>+ * @SAP_MSG_NOTIF_WHO_OWNS_NIC: No payload.</div><div class='add'>+ * @SAP_MSG_NOTIF_WIFIDR_DOWN: No payload.</div><div class='add'>+ * @SAP_MSG_NOTIF_WIFIDR_UP: No payload.</div><div class='add'>+ * @SAP_MSG_NOTIF_HOST_OWNERSHIP_CONFIRMED: No payload.</div><div class='add'>+ * @SAP_MSG_NOTIF_SAR_LIMITS: See &amp;struct iwl_sap_notif_sar_limits.</div><div class='add'>+ * @SAP_MSG_NOTIF_GET_NVM: No payload. Triggers %SAP_MSG_NOTIF_NVM.</div><div class='add'>+ * @SAP_MSG_NOTIF_PLDR: See &amp;struct iwl_sap_pldr_data.</div><div class='add'>+ * @SAP_MSG_NOTIF_PLDR_END: See &amp;struct iwl_sap_pldr_end_data.</div><div class='add'>+ * @SAP_MSG_NOTIF_FROM_HOST_MAX: Not used.</div><div class='add'>+ *</div><div class='add'>+ * @SAP_MSG_DATA_MIN: Not used.</div><div class='add'>+ * @SAP_MSG_DATA_PACKET: Packets that passed the filters defined by</div><div class='add'>+ *	%SAP_MSG_NOTIF_CSME_FILTERS. The payload is &amp;struct iwl_sap_hdr with</div><div class='add'>+ *	the payload of the packet immediately afterwards.</div><div class='add'>+ * @SAP_MSG_CB_DATA_PACKET: Indicates to CSME that we transmitted a specific</div><div class='add'>+ *	packet. Used only for DHCP transmitted packets. See</div><div class='add'>+ *	&amp;struct iwl_sap_cb_data.</div><div class='add'>+ * @SAP_MSG_DATA_MAX: Not used.</div><div class='add'>+ */</div><div class='add'>+enum iwl_sap_msg {</div><div class='add'>+	SAP_MSG_NOTIF_BOTH_WAYS_MIN			= 0,</div><div class='add'>+	SAP_MSG_NOTIF_PING				= 1,</div><div class='add'>+	SAP_MSG_NOTIF_PONG				= 2,</div><div class='add'>+	SAP_MSG_NOTIF_BOTH_WAYS_MAX,</div><div class='add'>+</div><div class='add'>+	SAP_MSG_NOTIF_FROM_CSME_MIN			= 500,</div><div class='add'>+	SAP_MSG_NOTIF_CSME_FILTERS			= SAP_MSG_NOTIF_FROM_CSME_MIN,</div><div class='add'>+	/* 501 is deprecated */</div><div class='add'>+	SAP_MSG_NOTIF_AMT_STATE				= 502,</div><div class='add'>+	SAP_MSG_NOTIF_CSME_REPLY_TO_HOST_OWNERSHIP_REQ	= 503,</div><div class='add'>+	SAP_MSG_NOTIF_CSME_TAKING_OWNERSHIP		= 504,</div><div class='add'>+	SAP_MSG_NOTIF_TRIGGER_IP_REFRESH		= 505,</div><div class='add'>+	SAP_MSG_NOTIF_CSME_CAN_RELEASE_OWNERSHIP	= 506,</div><div class='add'>+	/* 507 is deprecated */</div><div class='add'>+	/* 508 is deprecated */</div><div class='add'>+	/* 509 is deprecated */</div><div class='add'>+	/* 510 is deprecated */</div><div class='add'>+	SAP_MSG_NOTIF_NIC_OWNER				= 511,</div><div class='add'>+	SAP_MSG_NOTIF_CSME_CONN_STATUS			= 512,</div><div class='add'>+	SAP_MSG_NOTIF_NVM				= 513,</div><div class='add'>+	/* 514 - 517 not supported */</div><div class='add'>+	SAP_MSG_NOTIF_PLDR_ACK				= 518,</div><div class='add'>+	SAP_MSG_NOTIF_FROM_CSME_MAX,</div><div class='add'>+</div><div class='add'>+	SAP_MSG_NOTIF_FROM_HOST_MIN			= 1000,</div><div class='add'>+	SAP_MSG_NOTIF_BAND_SELECTION			= SAP_MSG_NOTIF_FROM_HOST_MIN,</div><div class='add'>+	SAP_MSG_NOTIF_RADIO_STATE			= 1001,</div><div class='add'>+	SAP_MSG_NOTIF_NIC_INFO				= 1002,</div><div class='add'>+	SAP_MSG_NOTIF_HOST_ASKS_FOR_NIC_OWNERSHIP	= 1003,</div><div class='add'>+	SAP_MSG_NOTIF_HOST_SUSPENDS			= 1004,</div><div class='add'>+	SAP_MSG_NOTIF_HOST_RESUMES			= 1005,</div><div class='add'>+	SAP_MSG_NOTIF_HOST_GOES_DOWN			= 1006,</div><div class='add'>+	SAP_MSG_NOTIF_CSME_OWNERSHIP_CONFIRMED		= 1007,</div><div class='add'>+	SAP_MSG_NOTIF_COUNTRY_CODE			= 1008,</div><div class='add'>+	SAP_MSG_NOTIF_HOST_LINK_UP			= 1009,</div><div class='add'>+	SAP_MSG_NOTIF_HOST_LINK_DOWN			= 1010,</div><div class='add'>+	SAP_MSG_NOTIF_WHO_OWNS_NIC			= 1011,</div><div class='add'>+	SAP_MSG_NOTIF_WIFIDR_DOWN			= 1012,</div><div class='add'>+	SAP_MSG_NOTIF_WIFIDR_UP				= 1013,</div><div class='add'>+	/* 1014 is deprecated */</div><div class='add'>+	SAP_MSG_NOTIF_HOST_OWNERSHIP_CONFIRMED		= 1015,</div><div class='add'>+	SAP_MSG_NOTIF_SAR_LIMITS			= 1016,</div><div class='add'>+	SAP_MSG_NOTIF_GET_NVM				= 1017,</div><div class='add'>+	/* 1018 - 1023 not supported */</div><div class='add'>+	SAP_MSG_NOTIF_PLDR				= 1024,</div><div class='add'>+	SAP_MSG_NOTIF_PLDR_END				= 1025,</div><div class='add'>+	SAP_MSG_NOTIF_FROM_HOST_MAX,</div><div class='add'>+</div><div class='add'>+	SAP_MSG_DATA_MIN				= 2000,</div><div class='add'>+	SAP_MSG_DATA_PACKET				= SAP_MSG_DATA_MIN,</div><div class='add'>+	SAP_MSG_CB_DATA_PACKET				= 2001,</div><div class='add'>+	SAP_MSG_DATA_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sap_hdr - prefixes any SAP message</div><div class='add'>+ * @type: See &amp;enum iwl_sap_msg.</div><div class='add'>+ * @len: The length of the message (header not included).</div><div class='add'>+ * @seq_num: For debug.</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_hdr {</div><div class='add'>+	__le16 type;</div><div class='add'>+	__le16 len;</div><div class='add'>+	__le32 seq_num;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sap_msg_dw - suits any DW long SAP message</div><div class='add'>+ * @hdr: The SAP header</div><div class='add'>+ * @val: The value of the DW.</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_msg_dw {</div><div class='add'>+	struct iwl_sap_hdr hdr;</div><div class='add'>+	__le32 val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_sap_nic_owner - used by %SAP_MSG_NOTIF_NIC_OWNER</div><div class='add'>+ * @SAP_NIC_OWNER_UNKNOWN: Not used.</div><div class='add'>+ * @SAP_NIC_OWNER_HOST: The host owns the NIC.</div><div class='add'>+ * @SAP_NIC_OWNER_ME: CSME owns the NIC.</div><div class='add'>+ */</div><div class='add'>+enum iwl_sap_nic_owner {</div><div class='add'>+	SAP_NIC_OWNER_UNKNOWN,</div><div class='add'>+	SAP_NIC_OWNER_HOST,</div><div class='add'>+	SAP_NIC_OWNER_ME,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum iwl_sap_wifi_auth_type {</div><div class='add'>+	SAP_WIFI_AUTH_TYPE_OPEN		= IWL_MEI_AKM_AUTH_OPEN,</div><div class='add'>+	SAP_WIFI_AUTH_TYPE_RSNA		= IWL_MEI_AKM_AUTH_RSNA,</div><div class='add'>+	SAP_WIFI_AUTH_TYPE_RSNA_PSK	= IWL_MEI_AKM_AUTH_RSNA_PSK,</div><div class='add'>+	SAP_WIFI_AUTH_TYPE_SAE		= IWL_MEI_AKM_AUTH_SAE,</div><div class='add'>+	SAP_WIFI_AUTH_TYPE_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_sap_wifi_cipher_alg - MEI WiFi cipher algorithm IDs</div><div class='add'>+ * @SAP_WIFI_CIPHER_ALG_NONE: No encryption</div><div class='add'>+ * @SAP_WIFI_CIPHER_ALG_TKIP: TKIPO</div><div class='add'>+ * @SAP_WIFI_CIPHER_ALG_CCMP: CCMP</div><div class='add'>+ * @SAP_WIFI_CIPHER_ALG_GCMP: GCMP-128</div><div class='add'>+ * @SAP_WIFI_CIPHER_ALG_GCMP_256: GCMP-256</div><div class='add'>+ */</div><div class='add'>+enum iwl_sap_wifi_cipher_alg {</div><div class='add'>+	SAP_WIFI_CIPHER_ALG_NONE	= IWL_MEI_CIPHER_NONE,</div><div class='add'>+	SAP_WIFI_CIPHER_ALG_TKIP	= IWL_MEI_CIPHER_TKIP,</div><div class='add'>+	SAP_WIFI_CIPHER_ALG_CCMP	= IWL_MEI_CIPHER_CCMP,</div><div class='add'>+	SAP_WIFI_CIPHER_ALG_GCMP	= IWL_MEI_CIPHER_GCMP,</div><div class='add'>+	SAP_WIFI_CIPHER_ALG_GCMP_256	= IWL_MEI_CIPHER_GCMP_256,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sap_notif_connection_info - nested in other structures</div><div class='add'>+ * @ssid_len: The length of the SSID.</div><div class='add'>+ * @ssid: The SSID.</div><div class='add'>+ * @auth_mode: The authentication mode. See &amp;enum iwl_sap_wifi_auth_type.</div><div class='add'>+ * @pairwise_cipher: The cipher used for unicast packets.</div><div class='add'>+ *	See &amp;enum iwl_sap_wifi_cipher_alg.</div><div class='add'>+ * @channel: The channel on which we are associated.</div><div class='add'>+ * @band: The band on which we are associated.</div><div class='add'>+ * @reserved: For alignment.</div><div class='add'>+ * @bssid: The BSSID.</div><div class='add'>+ * @reserved1: For alignment.</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_notif_connection_info {</div><div class='add'>+	__le32 ssid_len;</div><div class='add'>+	u8 ssid[32];</div><div class='add'>+	__le32 auth_mode;</div><div class='add'>+	__le32 pairwise_cipher;</div><div class='add'>+	u8 channel;</div><div class='add'>+	u8 band;</div><div class='add'>+	__le16 reserved;</div><div class='add'>+	u8 bssid[6];</div><div class='add'>+	__le16 reserved1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_sap_scan_request - for the scan_request field</div><div class='add'>+ * @SCAN_REQUEST_FILTERING: Filtering is requested.</div><div class='add'>+ * @SCAN_REQUEST_FAST: Fast scan is requested.</div><div class='add'>+ */</div><div class='add'>+enum iwl_sap_scan_request {</div><div class='add'>+	SCAN_REQUEST_FILTERING	= 1 &lt;&lt; 0,</div><div class='add'>+	SCAN_REQUEST_FAST	= 1 &lt;&lt; 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sap_notif_conn_status - payload of %SAP_MSG_NOTIF_CSME_CONN_STATUS</div><div class='add'>+ * @hdr: The SAP header</div><div class='add'>+ * @link_prot_state: Non-zero if link protection is active.</div><div class='add'>+ * @scan_request: See &amp;enum iwl_sap_scan_request.</div><div class='add'>+ * @conn_info: Information about the connection.</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_notif_conn_status {</div><div class='add'>+	struct iwl_sap_hdr hdr;</div><div class='add'>+	__le32 link_prot_state;</div><div class='add'>+	__le32 scan_request;</div><div class='add'>+	struct iwl_sap_notif_connection_info conn_info;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_sap_radio_state_bitmap - used for %SAP_MSG_NOTIF_RADIO_STATE</div><div class='add'>+ * @SAP_SW_RFKILL_DEASSERTED: If set, SW RfKill is de-asserted</div><div class='add'>+ * @SAP_HW_RFKILL_DEASSERTED: If set, HW RfKill is de-asserted</div><div class='add'>+ *</div><div class='add'>+ * If both bits are set, then the radio is on.</div><div class='add'>+ */</div><div class='add'>+enum iwl_sap_radio_state_bitmap {</div><div class='add'>+	SAP_SW_RFKILL_DEASSERTED	= 1 &lt;&lt; 0,</div><div class='add'>+	SAP_HW_RFKILL_DEASSERTED	= 1 &lt;&lt; 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_sap_notif_host_suspends_bitmap - used for %SAP_MSG_NOTIF_HOST_SUSPENDS</div><div class='add'>+ * @SAP_OFFER_NIC: TBD</div><div class='add'>+ * @SAP_FILTER_CONFIGURED: TBD</div><div class='add'>+ * @SAP_NLO_CONFIGURED: TBD</div><div class='add'>+ * @SAP_HOST_OWNS_NIC: TBD</div><div class='add'>+ * @SAP_LINK_PROTECTED: TBD</div><div class='add'>+ */</div><div class='add'>+enum iwl_sap_notif_host_suspends_bitmap {</div><div class='add'>+	SAP_OFFER_NIC		= 1 &lt;&lt; 0,</div><div class='add'>+	SAP_FILTER_CONFIGURED	= 1 &lt;&lt; 1,</div><div class='add'>+	SAP_NLO_CONFIGURED	= 1 &lt;&lt; 2,</div><div class='add'>+	SAP_HOST_OWNS_NIC	= 1 &lt;&lt; 3,</div><div class='add'>+	SAP_LINK_PROTECTED	= 1 &lt;&lt; 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sap_notif_country_code - payload of %SAP_MSG_NOTIF_COUNTRY_CODE</div><div class='add'>+ * @hdr: The SAP header</div><div class='add'>+ * @mcc: The country code.</div><div class='add'>+ * @source_id: TBD</div><div class='add'>+ * @reserved: For alignment.</div><div class='add'>+ * @diff_time: TBD</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_notif_country_code {</div><div class='add'>+	struct iwl_sap_hdr hdr;</div><div class='add'>+	__le16 mcc;</div><div class='add'>+	u8 source_id;</div><div class='add'>+	u8 reserved;</div><div class='add'>+	__le32 diff_time;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sap_notif_host_link_up - payload of %SAP_MSG_NOTIF_HOST_LINK_UP</div><div class='add'>+ * @hdr: The SAP header</div><div class='add'>+ * @conn_info: Information about the connection.</div><div class='add'>+ * @colloc_channel: The collocated channel</div><div class='add'>+ * @colloc_band: The band of the collocated channel.</div><div class='add'>+ * @reserved: For alignment.</div><div class='add'>+ * @colloc_bssid: The collocated BSSID.</div><div class='add'>+ * @reserved1: For alignment.</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_notif_host_link_up {</div><div class='add'>+	struct iwl_sap_hdr hdr;</div><div class='add'>+	struct iwl_sap_notif_connection_info conn_info;</div><div class='add'>+	u8 colloc_channel;</div><div class='add'>+	u8 colloc_band;</div><div class='add'>+	__le16 reserved;</div><div class='add'>+	u8 colloc_bssid[6];</div><div class='add'>+	__le16 reserved1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_sap_notif_link_down_type - used in &amp;struct iwl_sap_notif_host_link_down</div><div class='add'>+ * @HOST_LINK_DOWN_TYPE_NONE: TBD</div><div class='add'>+ * @HOST_LINK_DOWN_TYPE_TEMPORARY: TBD</div><div class='add'>+ * @HOST_LINK_DOWN_TYPE_LONG: TBD</div><div class='add'>+ */</div><div class='add'>+enum iwl_sap_notif_link_down_type {</div><div class='add'>+	HOST_LINK_DOWN_TYPE_NONE,</div><div class='add'>+	HOST_LINK_DOWN_TYPE_TEMPORARY,</div><div class='add'>+	HOST_LINK_DOWN_TYPE_LONG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sap_notif_host_link_down - payload for %SAP_MSG_NOTIF_HOST_LINK_DOWN</div><div class='add'>+ * @hdr: The SAP header</div><div class='add'>+ * @type: See &amp;enum iwl_sap_notif_link_down_type.</div><div class='add'>+ * @reserved: For alignment.</div><div class='add'>+ * @reason_valid: If 0, ignore the next field.</div><div class='add'>+ * @reason: The reason of the disconnection.</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_notif_host_link_down {</div><div class='add'>+	struct iwl_sap_hdr hdr;</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 reserved[2];</div><div class='add'>+	u8 reason_valid;</div><div class='add'>+	__le32 reason;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sap_notif_host_nic_info - payload for %SAP_MSG_NOTIF_NIC_INFO</div><div class='add'>+ * @hdr: The SAP header</div><div class='add'>+ * @mac_address: The MAC address as configured to the interface.</div><div class='add'>+ * @nvm_address: The MAC address as configured in the NVM.</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_notif_host_nic_info {</div><div class='add'>+	struct iwl_sap_hdr hdr;</div><div class='add'>+	u8 mac_address[6];</div><div class='add'>+	u8 nvm_address[6];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sap_notif_dw - payload is a dw</div><div class='add'>+ * @hdr: The SAP header.</div><div class='add'>+ * @dw: The payload.</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_notif_dw {</div><div class='add'>+	struct iwl_sap_hdr hdr;</div><div class='add'>+	__le32 dw;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sap_notif_sar_limits - payload for %SAP_MSG_NOTIF_SAR_LIMITS</div><div class='add'>+ * @hdr: The SAP header</div><div class='add'>+ * @sar_chain_info_table: Tx power limits.</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_notif_sar_limits {</div><div class='add'>+	struct iwl_sap_hdr hdr;</div><div class='add'>+	__le16 sar_chain_info_table[2][5];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_sap_nvm_caps - capabilities for NVM SAP</div><div class='add'>+ * @SAP_NVM_CAPS_LARI_SUPPORT: Lari is supported</div><div class='add'>+ * @SAP_NVM_CAPS_11AX_SUPPORT: 11AX is supported</div><div class='add'>+ */</div><div class='add'>+enum iwl_sap_nvm_caps {</div><div class='add'>+	SAP_NVM_CAPS_LARI_SUPPORT	= BIT(0),</div><div class='add'>+	SAP_NVM_CAPS_11AX_SUPPORT	= BIT(1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sap_nvm - payload for %SAP_MSG_NOTIF_NVM</div><div class='add'>+ * @hdr: The SAP header.</div><div class='add'>+ * @hw_addr: The MAC address</div><div class='add'>+ * @n_hw_addrs: The number of MAC addresses</div><div class='add'>+ * @reserved: For alignment.</div><div class='add'>+ * @radio_cfg: The radio configuration.</div><div class='add'>+ * @caps: See &amp;enum iwl_sap_nvm_caps.</div><div class='add'>+ * @nvm_version: The version of the NVM.</div><div class='add'>+ * @channels: The data for each channel.</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_nvm {</div><div class='add'>+	struct iwl_sap_hdr hdr;</div><div class='add'>+	u8 hw_addr[6];</div><div class='add'>+	u8 n_hw_addrs;</div><div class='add'>+	u8 reserved;</div><div class='add'>+	__le32 radio_cfg;</div><div class='add'>+	__le32 caps;</div><div class='add'>+	__le32 nvm_version;</div><div class='add'>+	__le32 channels[110];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_sap_eth_filter_flags - used in &amp;struct iwl_sap_eth_filter</div><div class='add'>+ * @SAP_ETH_FILTER_STOP: Do not process further filters.</div><div class='add'>+ * @SAP_ETH_FILTER_COPY: Copy the packet to the CSME.</div><div class='add'>+ * @SAP_ETH_FILTER_ENABLED: If false, the filter should be ignored.</div><div class='add'>+ */</div><div class='add'>+enum iwl_sap_eth_filter_flags {</div><div class='add'>+	SAP_ETH_FILTER_STOP    = BIT(0),</div><div class='add'>+	SAP_ETH_FILTER_COPY    = BIT(1),</div><div class='add'>+	SAP_ETH_FILTER_ENABLED = BIT(2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sap_eth_filter - a L2 filter</div><div class='add'>+ * @mac_address: Address to filter.</div><div class='add'>+ * @flags: See &amp;enum iwl_sap_eth_filter_flags.</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_eth_filter {</div><div class='add'>+	u8 mac_address[6];</div><div class='add'>+	u8 flags;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_sap_flex_filter_flags - used in &amp;struct iwl_sap_flex_filter</div><div class='add'>+ * @SAP_FLEX_FILTER_COPY: Pass UDP / TCP packets to CSME.</div><div class='add'>+ * @SAP_FLEX_FILTER_ENABLED: If false, the filter should be ignored.</div><div class='add'>+ * @SAP_FLEX_FILTER_IPV4: Filter requires match on the IP address as well.</div><div class='add'>+ * @SAP_FLEX_FILTER_IPV6: Filter requires match on the IP address as well.</div><div class='add'>+ * @SAP_FLEX_FILTER_TCP: Filter should be applied on TCP packets.</div><div class='add'>+ * @SAP_FLEX_FILTER_UDP: Filter should be applied on UDP packets.</div><div class='add'>+ */</div><div class='add'>+enum iwl_sap_flex_filter_flags {</div><div class='add'>+	SAP_FLEX_FILTER_COPY		= BIT(0),</div><div class='add'>+	SAP_FLEX_FILTER_ENABLED		= BIT(1),</div><div class='add'>+	SAP_FLEX_FILTER_IPV6		= BIT(2),</div><div class='add'>+	SAP_FLEX_FILTER_IPV4		= BIT(3),</div><div class='add'>+	SAP_FLEX_FILTER_TCP		= BIT(4),</div><div class='add'>+	SAP_FLEX_FILTER_UDP		= BIT(5),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sap_flex_filter - filter configuration</div><div class='add'>+ * @src_port: Source port in network format.</div><div class='add'>+ * @dst_port: Destination port in network format.</div><div class='add'>+ * @flags: Flags and protocol, see &amp;enum iwl_sap_flex_filter_flags.</div><div class='add'>+ * @reserved: For alignment.</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_flex_filter {</div><div class='add'>+	__be16 src_port;</div><div class='add'>+	__be16 dst_port;</div><div class='add'>+	u8 flags;</div><div class='add'>+	u8 reserved;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_sap_ipv4_filter_flags - used in &amp;struct iwl_sap_ipv4_filter</div><div class='add'>+ * @SAP_IPV4_FILTER_ICMP_PASS: Pass ICMP packets to CSME.</div><div class='add'>+ * @SAP_IPV4_FILTER_ICMP_COPY: Pass ICMP packets to host.</div><div class='add'>+ * @SAP_IPV4_FILTER_ARP_REQ_PASS: Pass ARP requests to CSME.</div><div class='add'>+ * @SAP_IPV4_FILTER_ARP_REQ_COPY: Pass ARP requests to host.</div><div class='add'>+ * @SAP_IPV4_FILTER_ARP_RESP_PASS: Pass ARP responses to CSME.</div><div class='add'>+ * @SAP_IPV4_FILTER_ARP_RESP_COPY: Pass ARP responses to host.</div><div class='add'>+ */</div><div class='add'>+enum iwl_sap_ipv4_filter_flags {</div><div class='add'>+	SAP_IPV4_FILTER_ICMP_PASS	= BIT(0),</div><div class='add'>+	SAP_IPV4_FILTER_ICMP_COPY	= BIT(1),</div><div class='add'>+	SAP_IPV4_FILTER_ARP_REQ_PASS	= BIT(2),</div><div class='add'>+	SAP_IPV4_FILTER_ARP_REQ_COPY	= BIT(3),</div><div class='add'>+	SAP_IPV4_FILTER_ARP_RESP_PASS	= BIT(4),</div><div class='add'>+	SAP_IPV4_FILTER_ARP_RESP_COPY	= BIT(5),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sap_ipv4_filter - IPv4 filter configuration</div><div class='add'>+ * @ipv4_addr: The IP address to filer.</div><div class='add'>+ * @flags: See &amp;enum iwl_sap_ipv4_filter_flags.</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_ipv4_filter {</div><div class='add'>+	__be32 ipv4_addr;</div><div class='add'>+	__le32 flags;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_sap_ipv6_filter_flags - IPv6 filter flags</div><div class='add'>+ * @SAP_IPV6_ADDR_FILTER_COPY: Pass packets to the host.</div><div class='add'>+ * @SAP_IPV6_ADDR_FILTER_ENABLED: If false, the filter should be ignored.</div><div class='add'>+ */</div><div class='add'>+enum iwl_sap_ipv6_filter_flags {</div><div class='add'>+	SAP_IPV6_ADDR_FILTER_COPY	= BIT(0),</div><div class='add'>+	SAP_IPV6_ADDR_FILTER_ENABLED	= BIT(1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sap_ipv6_filter - IPv6 filter configuration</div><div class='add'>+ * @addr_lo24: Lowest 24 bits of the IPv6 address.</div><div class='add'>+ * @flags: See &amp;enum iwl_sap_ipv6_filter_flags.</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_ipv6_filter {</div><div class='add'>+	u8 addr_lo24[3];</div><div class='add'>+	u8 flags;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_sap_icmpv6_filter_flags - ICMPv6 filter flags</div><div class='add'>+ * @SAP_ICMPV6_FILTER_ENABLED: If false, the filter should be ignored.</div><div class='add'>+ * @SAP_ICMPV6_FILTER_COPY: Pass packets to the host.</div><div class='add'>+ */</div><div class='add'>+enum iwl_sap_icmpv6_filter_flags {</div><div class='add'>+	SAP_ICMPV6_FILTER_ENABLED	= BIT(0),</div><div class='add'>+	SAP_ICMPV6_FILTER_COPY		= BIT(1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_sap_vlan_filter_flags - VLAN filter flags</div><div class='add'>+ * @SAP_VLAN_FILTER_VLAN_ID_MSK: VLAN ID</div><div class='add'>+ * @SAP_VLAN_FILTER_ENABLED: If false, the filter should be ignored.</div><div class='add'>+ */</div><div class='add'>+enum iwl_sap_vlan_filter_flags {</div><div class='add'>+	SAP_VLAN_FILTER_VLAN_ID_MSK	= 0x0FFF,</div><div class='add'>+	SAP_VLAN_FILTER_ENABLED		= BIT(15),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sap_oob_filters - Out of band filters (for RX only)</div><div class='add'>+ * @flex_filters: Array of &amp;struct iwl_sap_flex_filter.</div><div class='add'>+ * @icmpv6_flags: See &amp;enum iwl_sap_icmpv6_filter_flags.</div><div class='add'>+ * @ipv6_filters: Array of &amp;struct iwl_sap_ipv6_filter.</div><div class='add'>+ * @eth_filters: Array of &amp;struct iwl_sap_eth_filter.</div><div class='add'>+ * @reserved: For alignment.</div><div class='add'>+ * @ipv4_filter: &amp;struct iwl_sap_ipv4_filter.</div><div class='add'>+ * @vlan: See &amp;enum iwl_sap_vlan_filter_flags.</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_oob_filters {</div><div class='add'>+	struct iwl_sap_flex_filter flex_filters[14];</div><div class='add'>+	__le32 icmpv6_flags;</div><div class='add'>+	struct iwl_sap_ipv6_filter ipv6_filters[4];</div><div class='add'>+	struct iwl_sap_eth_filter eth_filters[5];</div><div class='add'>+	u8 reserved;</div><div class='add'>+	struct iwl_sap_ipv4_filter ipv4_filter;</div><div class='add'>+	__le16 vlan[4];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sap_csme_filters - payload of %SAP_MSG_NOTIF_CSME_FILTERS</div><div class='add'>+ * @hdr: The SAP header.</div><div class='add'>+ * @mode: Not used.</div><div class='add'>+ * @mac_address: Not used.</div><div class='add'>+ * @reserved: For alignment.</div><div class='add'>+ * @cbfilters: Not used.</div><div class='add'>+ * @filters: Out of band filters.</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_csme_filters {</div><div class='add'>+	struct iwl_sap_hdr hdr;</div><div class='add'>+	__le32 mode;</div><div class='add'>+	u8 mac_address[6];</div><div class='add'>+	__le16 reserved;</div><div class='add'>+	u8 cbfilters[1728];</div><div class='add'>+	struct iwl_sap_oob_filters filters;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define CB_TX_DHCP_FILT_IDX 30</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sap_cb_data - header to be added for transmitted packets.</div><div class='add'>+ * @hdr: The SAP header.</div><div class='add'>+ * @reserved: Not used.</div><div class='add'>+ * @to_me_filt_status: The filter that matches. Bit %CB_TX_DHCP_FILT_IDX should</div><div class='add'>+ *	be set for DHCP (the only packet that uses this header).</div><div class='add'>+ * @reserved2: Not used.</div><div class='add'>+ * @data_len: The length of the payload.</div><div class='add'>+ * @payload: The payload of the transmitted packet.</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_cb_data {</div><div class='add'>+	struct iwl_sap_hdr hdr;</div><div class='add'>+	__le32 reserved[7];</div><div class='add'>+	__le32 to_me_filt_status;</div><div class='add'>+	__le32 reserved2;</div><div class='add'>+	__le32 data_len;</div><div class='add'>+	u8 payload[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_sap_pldr_data - payload of %SAP_MSG_NOTIF_PLDR</div><div class='add'>+ * @hdr: The SAP header.</div><div class='add'>+ * @version: SAP message version</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_pldr_data {</div><div class='add'>+	struct iwl_sap_hdr hdr;</div><div class='add'>+	__le32 version;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_sap_pldr_status - product reset status</div><div class='add'>+ * @SAP_PLDR_STATUS_SUCCESS: PLDR started/ended successfully</div><div class='add'>+ * @SAP_PLDR_STATUS_FAILURE: PLDR failed to start/end</div><div class='add'>+ */</div><div class='add'>+enum iwl_sap_pldr_status {</div><div class='add'>+	SAP_PLDR_STATUS_SUCCESS	= 0,</div><div class='add'>+	SAP_PLDR_STATUS_FAILURE	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct iwl_sap_pldr_end_data - payload of %SAP_MSG_NOTIF_PLDR_END</div><div class='add'>+ * @hdr: The SAP header.</div><div class='add'>+ * @version: SAP message version</div><div class='add'>+ * @status: PLDR end status</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_pldr_end_data {</div><div class='add'>+	struct iwl_sap_hdr hdr;</div><div class='add'>+	__le32 version;</div><div class='add'>+	__le32 status;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct iwl_sap_pldr_ack_data - payload of %SAP_MSG_NOTIF_PLDR_ACK</div><div class='add'>+ * @version: SAP message version</div><div class='add'>+ * @status: CSME accept/refuse to the PLDR request</div><div class='add'>+ */</div><div class='add'>+struct iwl_sap_pldr_ack_data {</div><div class='add'>+	struct iwl_sap_hdr hdr;</div><div class='add'>+	__le32 version;</div><div class='add'>+	__le32 status;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#endif /* __sap_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mei/trace-data.h b/drivers/net/wireless/intel/iwlwifi/mei/trace-data.h<br/>new file mode 100644<br/>index 000000000000..15cb0bb4e9dc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mei/trace-data.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mei/trace-data.h</a></div><div class='hunk'>@@ -0,0 +1,82 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright(c) 2021        Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#if !defined(CONFIG_IWLWIFI_DEVICE_TRACING)</div><div class='add'>+</div><div class='add'>+#define trace_iwlmei_sap_data(...)</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#if !defined(__IWLWIFI_DEVICE_TRACE_IWLWIFI_SAP_DATA) || defined(TRACE_HEADER_MULTI_READ)</div><div class='add'>+</div><div class='add'>+#ifndef __IWLWIFI_DEVICE_TRACE_IWLWIFI_SAP_DATA</div><div class='add'>+enum iwl_sap_data_trace_type {</div><div class='add'>+	IWL_SAP_RX_DATA_TO_AIR,</div><div class='add'>+	IWL_SAP_TX_DATA_FROM_AIR,</div><div class='add'>+	IWL_SAP_RX_DATA_DROPPED_FROM_AIR,</div><div class='add'>+	IWL_SAP_TX_DHCP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline size_t</div><div class='add'>+iwlmei_sap_data_offset(enum iwl_sap_data_trace_type trace_type)</div><div class='add'>+{</div><div class='add'>+	switch (trace_type) {</div><div class='add'>+	case IWL_SAP_RX_DATA_TO_AIR:</div><div class='add'>+		return 0;</div><div class='add'>+	case IWL_SAP_TX_DATA_FROM_AIR:</div><div class='add'>+	case IWL_SAP_RX_DATA_DROPPED_FROM_AIR:</div><div class='add'>+		return sizeof(struct iwl_sap_hdr);</div><div class='add'>+	case IWL_SAP_TX_DHCP:</div><div class='add'>+		return sizeof(struct iwl_sap_cb_data);</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define __IWLWIFI_DEVICE_TRACE_IWLWIFI_SAP_DATA</div><div class='add'>+</div><div class='add'>+#include &lt;linux/tracepoint.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include "sap.h"</div><div class='add'>+</div><div class='add'>+#undef TRACE_SYSTEM</div><div class='add'>+#define TRACE_SYSTEM iwlmei_sap_data</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(iwlmei_sap_data,</div><div class='add'>+	TP_PROTO(const struct sk_buff *skb,</div><div class='add'>+		 enum iwl_sap_data_trace_type trace_type),</div><div class='add'>+	TP_ARGS(skb, trace_type),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__dynamic_array(u8, data,</div><div class='add'>+				skb-&gt;len - iwlmei_sap_data_offset(trace_type))</div><div class='add'>+		__field(u32, trace_type)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		size_t offset = iwlmei_sap_data_offset(trace_type);</div><div class='add'>+		__entry-&gt;trace_type = trace_type;</div><div class='add'>+		skb_copy_bits(skb, offset, __get_dynamic_array(data),</div><div class='add'>+			      skb-&gt;len - offset);</div><div class='add'>+	),</div><div class='add'>+	TP_printk("sap_data:trace_type %d len %d",</div><div class='add'>+		  __entry-&gt;trace_type, __get_dynamic_array_len(data))</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If you add something here, add a stub in case</div><div class='add'>+ * !defined(CONFIG_IWLWIFI_DEVICE_TRACING)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#endif /* __IWLWIFI_DEVICE_TRACE_IWLWIFI_SAP_DATA */</div><div class='add'>+</div><div class='add'>+#undef TRACE_INCLUDE_PATH</div><div class='add'>+#define TRACE_INCLUDE_PATH .</div><div class='add'>+#undef TRACE_INCLUDE_FILE</div><div class='add'>+#define TRACE_INCLUDE_FILE trace-data</div><div class='add'>+#include &lt;trace/define_trace.h&gt;</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_IWLWIFI_DEVICE_TRACING */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mei/trace.c b/drivers/net/wireless/intel/iwlwifi/mei/trace.c<br/>new file mode 100644<br/>index 000000000000..47ac32ef9f69<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mei/trace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mei/trace.c</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2021 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+/* sparse doesn't like tracepoint macros */</div><div class='add'>+#ifndef __CHECKER__</div><div class='add'>+</div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include "trace.h"</div><div class='add'>+#include "trace-data.h"</div><div class='add'>+</div><div class='add'>+#endif /* __CHECKER__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mei/trace.h b/drivers/net/wireless/intel/iwlwifi/mei/trace.h<br/>new file mode 100644<br/>index 000000000000..20ff836733bb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mei/trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mei/trace.h</a></div><div class='hunk'>@@ -0,0 +1,76 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright(c) 2021        Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#if !defined(CONFIG_IWLWIFI_DEVICE_TRACING)</div><div class='add'>+</div><div class='add'>+#define trace_iwlmei_sap_cmd(...)</div><div class='add'>+#define trace_iwlmei_me_msg(...)</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#if !defined(__IWLWIFI_DEVICE_TRACE_IWLWIFI_SAP_CMD) || defined(TRACE_HEADER_MULTI_READ)</div><div class='add'>+#define __IWLWIFI_DEVICE_TRACE_IWLWIFI_SAP_CMD</div><div class='add'>+</div><div class='add'>+#include &lt;linux/tracepoint.h&gt;</div><div class='add'>+</div><div class='add'>+#undef TRACE_SYSTEM</div><div class='add'>+#define TRACE_SYSTEM iwlmei_sap_cmd</div><div class='add'>+</div><div class='add'>+#include "mei/sap.h"</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(iwlmei_sap_cmd,</div><div class='add'>+	TP_PROTO(const struct iwl_sap_hdr *sap_cmd, bool tx),</div><div class='add'>+	TP_ARGS(sap_cmd, tx),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__dynamic_array(u8, cmd,</div><div class='add'>+				le16_to_cpu(sap_cmd-&gt;len) + sizeof(*sap_cmd))</div><div class='add'>+		__field(u8, tx)</div><div class='add'>+		__field(u16, type)</div><div class='add'>+		__field(u16, len)</div><div class='add'>+		__field(u32, seq)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		memcpy(__get_dynamic_array(cmd), sap_cmd,</div><div class='add'>+		       le16_to_cpu(sap_cmd-&gt;len) + sizeof(*sap_cmd));</div><div class='add'>+		__entry-&gt;tx = tx;</div><div class='add'>+		__entry-&gt;type = le16_to_cpu(sap_cmd-&gt;type);</div><div class='add'>+		__entry-&gt;len = le16_to_cpu(sap_cmd-&gt;len);</div><div class='add'>+		__entry-&gt;seq = le32_to_cpu(sap_cmd-&gt;seq_num);</div><div class='add'>+	),</div><div class='add'>+	TP_printk("sap_cmd %s: type %d len %d seq %d", __entry-&gt;tx ? "Tx" : "Rx",</div><div class='add'>+		  __entry-&gt;type, __entry-&gt;len, __entry-&gt;seq)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(iwlmei_me_msg,</div><div class='add'>+	TP_PROTO(const struct iwl_sap_me_msg_hdr *hdr, bool tx),</div><div class='add'>+	TP_ARGS(hdr, tx),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(u8, type)</div><div class='add'>+		__field(u8, tx)</div><div class='add'>+		__field(u32, seq_num)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;type = le32_to_cpu(hdr-&gt;type);</div><div class='add'>+		__entry-&gt;seq_num = le32_to_cpu(hdr-&gt;seq_num);</div><div class='add'>+		__entry-&gt;tx = tx;</div><div class='add'>+	),</div><div class='add'>+	TP_printk("ME message: %s: type %d seq %d", __entry-&gt;tx ? "Tx" : "Rx",</div><div class='add'>+		  __entry-&gt;type, __entry-&gt;seq_num)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If you add something here, add a stub in case</div><div class='add'>+ * !defined(CONFIG_IWLWIFI_DEVICE_TRACING)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#endif /* __IWLWIFI_DEVICE_TRACE_IWLWIFI_SAP_CMD */</div><div class='add'>+</div><div class='add'>+#undef TRACE_INCLUDE_PATH</div><div class='add'>+#define TRACE_INCLUDE_PATH .</div><div class='add'>+#undef TRACE_INCLUDE_FILE</div><div class='add'>+#define TRACE_INCLUDE_FILE trace</div><div class='add'>+#include &lt;trace/define_trace.h&gt;</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_IWLWIFI_DEVICE_TRACING */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/Makefile b/drivers/net/wireless/intel/iwlwifi/mld/Makefile<br/>new file mode 100644<br/>index 000000000000..c966e573f430<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/Makefile</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+obj-$(CONFIG_IWLMLD)   += iwlmld.o</div><div class='add'>+obj-$(CONFIG_IWLWIFI_KUNIT_TESTS) += tests/</div><div class='add'>+</div><div class='add'>+iwlmld-y += mld.o notif.o mac80211.o fw.o power.o iface.o link.o rx.o mcc.o session-protect.o phy.o</div><div class='add'>+iwlmld-y += scan.o sta.o tx.o coex.o tlc.o agg.o key.o regulatory.o ap.o thermal.o roc.o stats.o</div><div class='add'>+iwlmld-y += low_latency.o mlo.o ptp.o time_sync.o ftm-initiator.o</div><div class='add'>+iwlmld-$(CONFIG_IWLWIFI_DEBUGFS) += debugfs.o</div><div class='add'>+iwlmld-$(CONFIG_IWLWIFI_LEDS) += led.o</div><div class='add'>+iwlmld-$(CONFIG_PM_SLEEP) += d3.o</div><div class='add'>+</div><div class='add'>+subdir-ccflags-y += -I$(src)/../</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/agg.c b/drivers/net/wireless/intel/iwlwifi/mld/agg.c<br/>new file mode 100644<br/>index 000000000000..3bf36f8f6874<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/agg.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/agg.c</a></div><div class='hunk'>@@ -0,0 +1,677 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include "agg.h"</div><div class='add'>+#include "sta.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_reorder_release_frames(struct iwl_mld *mld, struct ieee80211_sta *sta,</div><div class='add'>+			       struct napi_struct *napi,</div><div class='add'>+			       struct iwl_mld_baid_data *baid_data,</div><div class='add'>+			       struct iwl_mld_reorder_buffer *reorder_buf,</div><div class='add'>+			       u16 nssn)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_reorder_buf_entry *entries =</div><div class='add'>+		&amp;baid_data-&gt;entries[reorder_buf-&gt;queue *</div><div class='add'>+				    baid_data-&gt;entries_per_queue];</div><div class='add'>+	u16 ssn = reorder_buf-&gt;head_sn;</div><div class='add'>+</div><div class='add'>+	while (ieee80211_sn_less(ssn, nssn)) {</div><div class='add'>+		int index = ssn % baid_data-&gt;buf_size;</div><div class='add'>+		struct sk_buff_head *skb_list = &amp;entries[index].frames;</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+		ssn = ieee80211_sn_inc(ssn);</div><div class='add'>+</div><div class='add'>+		/* Empty the list. Will have more than one frame for A-MSDU.</div><div class='add'>+		 * Empty list is valid as well since nssn indicates frames were</div><div class='add'>+		 * received.</div><div class='add'>+		 */</div><div class='add'>+		while ((skb = __skb_dequeue(skb_list))) {</div><div class='add'>+			iwl_mld_pass_packet_to_mac80211(mld, napi, skb,</div><div class='add'>+							reorder_buf-&gt;queue,</div><div class='add'>+							sta);</div><div class='add'>+			reorder_buf-&gt;num_stored--;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	reorder_buf-&gt;head_sn = nssn;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_release_frames_from_notif(struct iwl_mld *mld,</div><div class='add'>+					      struct napi_struct *napi,</div><div class='add'>+					      u8 baid, u16 nssn, int queue)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_reorder_buffer *reorder_buf;</div><div class='add'>+	struct iwl_mld_baid_data *ba_data;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	u32 sta_id;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_HT(mld, "Frame release notification for BAID %u, NSSN %d\n",</div><div class='add'>+		     baid, nssn);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(baid == IWL_RX_REORDER_DATA_INVALID_BAID ||</div><div class='add'>+			 baid &gt;= ARRAY_SIZE(mld-&gt;fw_id_to_ba)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	ba_data = rcu_dereference(mld-&gt;fw_id_to_ba[baid]);</div><div class='add'>+	if (!ba_data) {</div><div class='add'>+		IWL_DEBUG_HT(mld, "BAID %d not found in map\n", baid);</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* pick any STA ID to find the pointer */</div><div class='add'>+	sta_id = ffs(ba_data-&gt;sta_mask) - 1;</div><div class='add'>+	link_sta = rcu_dereference(mld-&gt;fw_id_to_link_sta[sta_id]);</div><div class='add'>+	if (WARN_ON_ONCE(IS_ERR_OR_NULL(link_sta) || !link_sta-&gt;sta))</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	reorder_buf = &amp;ba_data-&gt;reorder_buf[queue];</div><div class='add'>+</div><div class='add'>+	iwl_mld_reorder_release_frames(mld, link_sta-&gt;sta, napi, ba_data,</div><div class='add'>+				       reorder_buf, nssn);</div><div class='add'>+out_unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_frame_release_notif(struct iwl_mld *mld,</div><div class='add'>+					struct napi_struct *napi,</div><div class='add'>+					struct iwl_rx_packet *pkt, int queue)</div><div class='add'>+{</div><div class='add'>+	struct iwl_frame_release *release = (void *)pkt-&gt;data;</div><div class='add'>+	u32 pkt_len = iwl_rx_packet_payload_len(pkt);</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, pkt_len &lt; sizeof(*release),</div><div class='add'>+			 "Unexpected frame release notif size %u (expected %zu)\n",</div><div class='add'>+			 pkt_len, sizeof(*release)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mld_release_frames_from_notif(mld, napi, release-&gt;baid,</div><div class='add'>+					  le16_to_cpu(release-&gt;nssn),</div><div class='add'>+					  queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_bar_frame_release_notif(struct iwl_mld *mld,</div><div class='add'>+					    struct napi_struct *napi,</div><div class='add'>+					    struct iwl_rx_packet *pkt,</div><div class='add'>+					    int queue)</div><div class='add'>+{</div><div class='add'>+	struct iwl_bar_frame_release *release = (void *)pkt-&gt;data;</div><div class='add'>+	struct iwl_mld_baid_data *baid_data;</div><div class='add'>+	unsigned int baid, nssn, sta_id, tid;</div><div class='add'>+	u32 pkt_len = iwl_rx_packet_payload_len(pkt);</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, pkt_len &lt; sizeof(*release),</div><div class='add'>+			 "Unexpected frame release notif size %u (expected %zu)\n",</div><div class='add'>+			 pkt_len, sizeof(*release)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	baid = le32_get_bits(release-&gt;ba_info,</div><div class='add'>+			     IWL_BAR_FRAME_RELEASE_BAID_MASK);</div><div class='add'>+	nssn = le32_get_bits(release-&gt;ba_info,</div><div class='add'>+			     IWL_BAR_FRAME_RELEASE_NSSN_MASK);</div><div class='add'>+	sta_id = le32_get_bits(release-&gt;sta_tid,</div><div class='add'>+			       IWL_BAR_FRAME_RELEASE_STA_MASK);</div><div class='add'>+	tid = le32_get_bits(release-&gt;sta_tid,</div><div class='add'>+			    IWL_BAR_FRAME_RELEASE_TID_MASK);</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, baid &gt;= ARRAY_SIZE(mld-&gt;fw_id_to_ba),</div><div class='add'>+			 "BAR release: invalid BAID (%x)\n", baid))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	baid_data = rcu_dereference(mld-&gt;fw_id_to_ba[baid]);</div><div class='add'>+	if (!baid_data) {</div><div class='add'>+		IWL_DEBUG_HT(mld,</div><div class='add'>+			     "Got valid BAID %d but not allocated\n",</div><div class='add'>+			     baid);</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, tid != baid_data-&gt;tid ||</div><div class='add'>+			 sta_id &gt; mld-&gt;fw-&gt;ucode_capa.num_stations ||</div><div class='add'>+			 !(baid_data-&gt;sta_mask &amp; BIT(sta_id)),</div><div class='add'>+			 "BAID 0x%x is mapped to sta_mask:0x%x tid:%d, but BAR release received for sta:%d tid:%d\n",</div><div class='add'>+			 baid, baid_data-&gt;sta_mask, baid_data-&gt;tid, sta_id,</div><div class='add'>+			 tid))</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_DROP(mld, "Received a BAR, expect packet loss: nssn %d\n",</div><div class='add'>+		       nssn);</div><div class='add'>+</div><div class='add'>+	iwl_mld_release_frames_from_notif(mld, napi, baid, nssn, queue);</div><div class='add'>+out_unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_del_ba(struct iwl_mld *mld, int queue,</div><div class='add'>+		    struct iwl_mld_delba_data *data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_baid_data *ba_data;</div><div class='add'>+	struct iwl_mld_reorder_buffer *reorder_buf;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	u8 baid = data-&gt;baid;</div><div class='add'>+	u32 sta_id;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(baid &gt;= IWL_MAX_BAID, "invalid BAID: %x\n", baid))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	ba_data = rcu_dereference(mld-&gt;fw_id_to_ba[baid]);</div><div class='add'>+	if (WARN_ON_ONCE(!ba_data))</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	/* pick any STA ID to find the pointer */</div><div class='add'>+	sta_id = ffs(ba_data-&gt;sta_mask) - 1;</div><div class='add'>+	link_sta = rcu_dereference(mld-&gt;fw_id_to_link_sta[sta_id]);</div><div class='add'>+	if (WARN_ON_ONCE(IS_ERR_OR_NULL(link_sta) || !link_sta-&gt;sta))</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	reorder_buf = &amp;ba_data-&gt;reorder_buf[queue];</div><div class='add'>+</div><div class='add'>+	/* release all frames that are in the reorder buffer to the stack */</div><div class='add'>+	iwl_mld_reorder_release_frames(mld, link_sta-&gt;sta, NULL,</div><div class='add'>+				       ba_data, reorder_buf,</div><div class='add'>+				       ieee80211_sn_add(reorder_buf-&gt;head_sn,</div><div class='add'>+							ba_data-&gt;buf_size));</div><div class='add'>+out_unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Returns true if the MPDU was buffered\dropped, false if it should be passed</div><div class='add'>+ * to upper layer.</div><div class='add'>+ */</div><div class='add'>+enum iwl_mld_reorder_result</div><div class='add'>+iwl_mld_reorder(struct iwl_mld *mld, struct napi_struct *napi,</div><div class='add'>+		int queue, struct ieee80211_sta *sta,</div><div class='add'>+		struct sk_buff *skb, struct iwl_rx_mpdu_desc *desc)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr = (void *)skb_mac_header(skb);</div><div class='add'>+	struct iwl_mld_baid_data *baid_data;</div><div class='add'>+	struct iwl_mld_reorder_buffer *buffer;</div><div class='add'>+	struct iwl_mld_reorder_buf_entry *entries;</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+	struct iwl_mld_link_sta *mld_link_sta;</div><div class='add'>+	u32 reorder = le32_to_cpu(desc-&gt;reorder_data);</div><div class='add'>+	bool amsdu, last_subframe, is_old_sn, is_dup;</div><div class='add'>+	u8 tid = ieee80211_get_tid(hdr);</div><div class='add'>+	u8 baid;</div><div class='add'>+	u16 nssn, sn;</div><div class='add'>+	u32 sta_mask = 0;</div><div class='add'>+	int index;</div><div class='add'>+	u8 link_id;</div><div class='add'>+</div><div class='add'>+	baid = u32_get_bits(reorder, IWL_RX_MPDU_REORDER_BAID_MASK);</div><div class='add'>+</div><div class='add'>+	/* This also covers the case of receiving a Block Ack Request</div><div class='add'>+	 * outside a BA session; we'll pass it to mac80211 and that</div><div class='add'>+	 * then sends a delBA action frame.</div><div class='add'>+	 * This also covers pure monitor mode, in which case we won't</div><div class='add'>+	 * have any BA sessions.</div><div class='add'>+	 */</div><div class='add'>+	if (baid == IWL_RX_REORDER_DATA_INVALID_BAID)</div><div class='add'>+		return IWL_MLD_PASS_SKB;</div><div class='add'>+</div><div class='add'>+	/* no sta yet */</div><div class='add'>+	if (WARN_ONCE(!sta,</div><div class='add'>+		      "Got valid BAID without a valid station assigned\n"))</div><div class='add'>+		return IWL_MLD_PASS_SKB;</div><div class='add'>+</div><div class='add'>+	/* not a data packet */</div><div class='add'>+	if (!ieee80211_is_data_qos(hdr-&gt;frame_control) ||</div><div class='add'>+	    is_multicast_ether_addr(hdr-&gt;addr1))</div><div class='add'>+		return IWL_MLD_PASS_SKB;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!ieee80211_is_data_present(hdr-&gt;frame_control)))</div><div class='add'>+		return IWL_MLD_PASS_SKB;</div><div class='add'>+</div><div class='add'>+	baid_data = rcu_dereference(mld-&gt;fw_id_to_ba[baid]);</div><div class='add'>+	if (!baid_data) {</div><div class='add'>+		IWL_DEBUG_HT(mld,</div><div class='add'>+			     "Got valid BAID but no baid allocated, bypass re-ordering (BAID=%d reorder=0x%x)\n",</div><div class='add'>+			     baid, reorder);</div><div class='add'>+		return IWL_MLD_PASS_SKB;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_mld_link_sta(mld_sta, mld_link_sta, link_id)</div><div class='add'>+		sta_mask |= BIT(mld_link_sta-&gt;fw_id);</div><div class='add'>+</div><div class='add'>+	/* verify the BAID is correctly mapped to the sta and tid */</div><div class='add'>+	if (IWL_FW_CHECK(mld,</div><div class='add'>+			 tid != baid_data-&gt;tid ||</div><div class='add'>+			 !(sta_mask &amp; baid_data-&gt;sta_mask),</div><div class='add'>+			 "BAID 0x%x is mapped to sta_mask:0x%x tid:%d, but was received for sta_mask:0x%x tid:%d\n",</div><div class='add'>+			 baid, baid_data-&gt;sta_mask, baid_data-&gt;tid,</div><div class='add'>+			 sta_mask, tid))</div><div class='add'>+		return IWL_MLD_PASS_SKB;</div><div class='add'>+</div><div class='add'>+	buffer = &amp;baid_data-&gt;reorder_buf[queue];</div><div class='add'>+	entries = &amp;baid_data-&gt;entries[queue * baid_data-&gt;entries_per_queue];</div><div class='add'>+</div><div class='add'>+	is_old_sn = !!(reorder &amp; IWL_RX_MPDU_REORDER_BA_OLD_SN);</div><div class='add'>+</div><div class='add'>+	if (!buffer-&gt;valid &amp;&amp; is_old_sn)</div><div class='add'>+		return IWL_MLD_PASS_SKB;</div><div class='add'>+</div><div class='add'>+	buffer-&gt;valid = true;</div><div class='add'>+</div><div class='add'>+	is_dup = !!(desc-&gt;status &amp; cpu_to_le32(IWL_RX_MPDU_STATUS_DUPLICATE));</div><div class='add'>+</div><div class='add'>+	/* drop any duplicated or outdated packets */</div><div class='add'>+	if (is_dup || is_old_sn)</div><div class='add'>+		return IWL_MLD_DROP_SKB;</div><div class='add'>+</div><div class='add'>+	sn = u32_get_bits(reorder, IWL_RX_MPDU_REORDER_SN_MASK);</div><div class='add'>+	nssn = u32_get_bits(reorder, IWL_RX_MPDU_REORDER_NSSN_MASK);</div><div class='add'>+	amsdu = desc-&gt;mac_flags2 &amp; IWL_RX_MPDU_MFLG2_AMSDU;</div><div class='add'>+	last_subframe = desc-&gt;amsdu_info &amp; IWL_RX_MPDU_AMSDU_LAST_SUBFRAME;</div><div class='add'>+</div><div class='add'>+	/* release immediately if allowed by nssn and no stored frames */</div><div class='add'>+	if (!buffer-&gt;num_stored &amp;&amp; ieee80211_sn_less(sn, nssn)) {</div><div class='add'>+		if (!amsdu || last_subframe)</div><div class='add'>+			buffer-&gt;head_sn = nssn;</div><div class='add'>+		return IWL_MLD_PASS_SKB;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* release immediately if there are no stored frames, and the sn is</div><div class='add'>+	 * equal to the head.</div><div class='add'>+	 * This can happen due to reorder timer, where NSSN is behind head_sn.</div><div class='add'>+	 * When we released everything, and we got the next frame in the</div><div class='add'>+	 * sequence, according to the NSSN we can't release immediately,</div><div class='add'>+	 * while technically there is no hole and we can move forward.</div><div class='add'>+	 */</div><div class='add'>+	if (!buffer-&gt;num_stored &amp;&amp; sn == buffer-&gt;head_sn) {</div><div class='add'>+		if (!amsdu || last_subframe)</div><div class='add'>+			buffer-&gt;head_sn = ieee80211_sn_inc(buffer-&gt;head_sn);</div><div class='add'>+		return IWL_MLD_PASS_SKB;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* put in reorder buffer */</div><div class='add'>+	index = sn % baid_data-&gt;buf_size;</div><div class='add'>+	__skb_queue_tail(&amp;entries[index].frames, skb);</div><div class='add'>+	buffer-&gt;num_stored++;</div><div class='add'>+</div><div class='add'>+	/* We cannot trust NSSN for AMSDU sub-frames that are not the last. The</div><div class='add'>+	 * reason is that NSSN advances on the first sub-frame, and may cause</div><div class='add'>+	 * the reorder buffer to advance before all the sub-frames arrive.</div><div class='add'>+	 *</div><div class='add'>+	 * Example: reorder buffer contains SN 0 &amp; 2, and we receive AMSDU with</div><div class='add'>+	 * SN 1. NSSN for first sub frame will be 3 with the result of driver</div><div class='add'>+	 * releasing SN 0,1, 2. When sub-frame 1 arrives - reorder buffer is</div><div class='add'>+	 * already ahead and it will be dropped.</div><div class='add'>+	 * If the last sub-frame is not on this queue - we will get frame</div><div class='add'>+	 * release notification with up to date NSSN.</div><div class='add'>+	 * If this is the first frame that is stored in the buffer, the head_sn</div><div class='add'>+	 * may be outdated. Update it based on the last NSSN to make sure it</div><div class='add'>+	 * will be released when the frame release notification arrives.</div><div class='add'>+	 */</div><div class='add'>+	if (!amsdu || last_subframe)</div><div class='add'>+		iwl_mld_reorder_release_frames(mld, sta, napi, baid_data,</div><div class='add'>+					       buffer, nssn);</div><div class='add'>+	else if (buffer-&gt;num_stored == 1)</div><div class='add'>+		buffer-&gt;head_sn = nssn;</div><div class='add'>+</div><div class='add'>+	return IWL_MLD_BUFFERED_SKB;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_mld_reorder);</div><div class='add'>+</div><div class='add'>+static void iwl_mld_rx_agg_session_expired(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_baid_data *data =</div><div class='add'>+		timer_container_of(data, t, session_timer);</div><div class='add'>+	struct iwl_mld_baid_data __rcu **rcu_ptr = data-&gt;rcu_ptr;</div><div class='add'>+	struct iwl_mld_baid_data *ba_data;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	struct iwl_mld_sta *mld_sta;</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+	unsigned int sta_id;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	ba_data = rcu_dereference(*rcu_ptr);</div><div class='add'>+	if (WARN_ON(!ba_data))</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!ba_data-&gt;timeout))</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	timeout = ba_data-&gt;last_rx_timestamp +</div><div class='add'>+		  TU_TO_JIFFIES(ba_data-&gt;timeout * 2);</div><div class='add'>+	if (time_is_after_jiffies(timeout)) {</div><div class='add'>+		mod_timer(&amp;ba_data-&gt;session_timer, timeout);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* timer expired, pick any STA ID to find the pointer */</div><div class='add'>+	sta_id = ffs(ba_data-&gt;sta_mask) - 1;</div><div class='add'>+	link_sta = rcu_dereference(ba_data-&gt;mld-&gt;fw_id_to_link_sta[sta_id]);</div><div class='add'>+</div><div class='add'>+	/* sta should be valid unless the following happens:</div><div class='add'>+	 * The firmware asserts which triggers a reconfig flow, but</div><div class='add'>+	 * the reconfig fails before we set the pointer to sta into</div><div class='add'>+	 * the fw_id_to_link_sta pointer table. mac80211 can't stop</div><div class='add'>+	 * A-MPDU and hence the timer continues to run. Then, the</div><div class='add'>+	 * timer expires and sta is NULL.</div><div class='add'>+	 */</div><div class='add'>+	if (IS_ERR_OR_NULL(link_sta) || WARN_ON(!link_sta-&gt;sta))</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	mld_sta = iwl_mld_sta_from_mac80211(link_sta-&gt;sta);</div><div class='add'>+	ieee80211_rx_ba_timer_expired(mld_sta-&gt;vif, link_sta-&gt;sta-&gt;addr,</div><div class='add'>+				      ba_data-&gt;tid);</div><div class='add'>+unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_stop_ba_in_fw(struct iwl_mld *mld, struct ieee80211_sta *sta, int tid)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rx_baid_cfg_cmd cmd = {</div><div class='add'>+		.action = cpu_to_le32(IWL_RX_BAID_ACTION_REMOVE),</div><div class='add'>+		.remove.sta_id_mask =</div><div class='add'>+			cpu_to_le32(iwl_mld_fw_sta_id_mask(mld, sta)),</div><div class='add'>+		.remove.tid = cpu_to_le32(tid),</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd_pdu(mld,</div><div class='add'>+				   WIDE_ID(DATA_PATH_GROUP,</div><div class='add'>+					   RX_BAID_ALLOCATION_CONFIG_CMD),</div><div class='add'>+				   &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_HT(mld, "RX BA Session stopped in fw\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_start_ba_in_fw(struct iwl_mld *mld, struct ieee80211_sta *sta,</div><div class='add'>+		       int tid, u16 ssn, u16 buf_size)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rx_baid_cfg_cmd cmd = {</div><div class='add'>+		.action = cpu_to_le32(IWL_RX_BAID_ACTION_ADD),</div><div class='add'>+		.alloc.sta_id_mask =</div><div class='add'>+			cpu_to_le32(iwl_mld_fw_sta_id_mask(mld, sta)),</div><div class='add'>+		.alloc.tid = tid,</div><div class='add'>+		.alloc.ssn = cpu_to_le16(ssn),</div><div class='add'>+		.alloc.win_size = cpu_to_le16(buf_size),</div><div class='add'>+	};</div><div class='add'>+	struct iwl_host_cmd hcmd = {</div><div class='add'>+		.id = WIDE_ID(DATA_PATH_GROUP, RX_BAID_ALLOCATION_CONFIG_CMD),</div><div class='add'>+		.flags = CMD_WANT_SKB,</div><div class='add'>+		.len[0] = sizeof(cmd),</div><div class='add'>+		.data[0] = &amp;cmd,</div><div class='add'>+	};</div><div class='add'>+	struct iwl_rx_baid_cfg_resp *resp;</div><div class='add'>+	struct iwl_rx_packet *pkt;</div><div class='add'>+	u32 resp_len;</div><div class='add'>+	int ret, baid;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(*resp) != sizeof(baid));</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd(mld, &amp;hcmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	pkt = hcmd.resp_pkt;</div><div class='add'>+</div><div class='add'>+	resp_len = iwl_rx_packet_payload_len(pkt);</div><div class='add'>+	if (IWL_FW_CHECK(mld, resp_len != sizeof(*resp),</div><div class='add'>+			 "BAID_ALLOC_CMD: unexpected response length %d\n",</div><div class='add'>+			 resp_len)) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_HT(mld, "RX BA Session started in fw\n");</div><div class='add'>+</div><div class='add'>+	resp = (void *)pkt-&gt;data;</div><div class='add'>+	baid = le32_to_cpu(resp-&gt;baid);</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, baid &lt; 0 || baid &gt;= ARRAY_SIZE(mld-&gt;fw_id_to_ba),</div><div class='add'>+			 "BAID_ALLOC_CMD: invalid BAID response %d\n", baid)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = baid;</div><div class='add'>+out:</div><div class='add'>+	iwl_free_resp(&amp;hcmd);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_init_reorder_buffer(struct iwl_mld *mld,</div><div class='add'>+					struct iwl_mld_baid_data *data,</div><div class='add'>+					u16 ssn)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; mld-&gt;trans-&gt;info.num_rxqs; i++) {</div><div class='add'>+		struct iwl_mld_reorder_buffer *reorder_buf =</div><div class='add'>+			&amp;data-&gt;reorder_buf[i];</div><div class='add'>+		struct iwl_mld_reorder_buf_entry *entries =</div><div class='add'>+			&amp;data-&gt;entries[i * data-&gt;entries_per_queue];</div><div class='add'>+</div><div class='add'>+		reorder_buf-&gt;head_sn = ssn;</div><div class='add'>+		reorder_buf-&gt;queue = i;</div><div class='add'>+</div><div class='add'>+		for (int j = 0; j &lt; data-&gt;buf_size; j++)</div><div class='add'>+			__skb_queue_head_init(&amp;entries[j].frames);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_free_reorder_buffer(struct iwl_mld *mld,</div><div class='add'>+					struct iwl_mld_baid_data *data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_delba_data delba_data = {</div><div class='add'>+		.baid = data-&gt;baid,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	iwl_mld_sync_rx_queues(mld, IWL_MLD_RXQ_NOTIF_DEL_BA,</div><div class='add'>+			       &amp;delba_data, sizeof(delba_data));</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; mld-&gt;trans-&gt;info.num_rxqs; i++) {</div><div class='add'>+		struct iwl_mld_reorder_buffer *reorder_buf =</div><div class='add'>+			&amp;data-&gt;reorder_buf[i];</div><div class='add'>+		struct iwl_mld_reorder_buf_entry *entries =</div><div class='add'>+			&amp;data-&gt;entries[i * data-&gt;entries_per_queue];</div><div class='add'>+</div><div class='add'>+		if (likely(!reorder_buf-&gt;num_stored))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* This shouldn't happen in regular DELBA since the RX queues</div><div class='add'>+		 * sync internal DELBA notification should trigger a release</div><div class='add'>+		 * of all frames in the reorder buffer.</div><div class='add'>+		 */</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+</div><div class='add'>+		for (int j = 0; j &lt; data-&gt;buf_size; j++)</div><div class='add'>+			__skb_queue_purge(&amp;entries[j].frames);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_ampdu_rx_start(struct iwl_mld *mld, struct ieee80211_sta *sta,</div><div class='add'>+			   int tid, u16 ssn, u16 buf_size, u16 timeout)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+	struct iwl_mld_baid_data *baid_data = NULL;</div><div class='add'>+	u32 reorder_buf_size = buf_size * sizeof(baid_data-&gt;entries[0]);</div><div class='add'>+	int ret, baid;</div><div class='add'>+	u32 sta_mask;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (mld-&gt;num_rx_ba_sessions &gt;= IWL_MAX_BAID) {</div><div class='add'>+		IWL_DEBUG_HT(mld,</div><div class='add'>+			     "Max num of RX BA sessions reached; blocking new session\n");</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sta_mask = iwl_mld_fw_sta_id_mask(mld, sta);</div><div class='add'>+	if (WARN_ON(!sta_mask))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* sparse doesn't like the __align() so don't check */</div><div class='add'>+#ifndef __CHECKER__</div><div class='add'>+	/* The division below will be OK if either the cache line size</div><div class='add'>+	 * can be divided by the entry size (ALIGN will round up) or if</div><div class='add'>+	 * the entry size can be divided by the cache line size, in which</div><div class='add'>+	 * case the ALIGN() will do nothing.</div><div class='add'>+	 */</div><div class='add'>+	BUILD_BUG_ON(SMP_CACHE_BYTES % sizeof(baid_data-&gt;entries[0]) &amp;&amp;</div><div class='add'>+		     sizeof(baid_data-&gt;entries[0]) % SMP_CACHE_BYTES);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Upward align the reorder buffer size to fill an entire cache</div><div class='add'>+	 * line for each queue, to avoid sharing cache lines between</div><div class='add'>+	 * different queues.</div><div class='add'>+	 */</div><div class='add'>+	reorder_buf_size = ALIGN(reorder_buf_size, SMP_CACHE_BYTES);</div><div class='add'>+</div><div class='add'>+	/* Allocate here so if allocation fails we can bail out early</div><div class='add'>+	 * before starting the BA session in the firmware</div><div class='add'>+	 */</div><div class='add'>+	baid_data = kzalloc(sizeof(*baid_data) +</div><div class='add'>+			    mld-&gt;trans-&gt;info.num_rxqs * reorder_buf_size,</div><div class='add'>+			    GFP_KERNEL);</div><div class='add'>+	if (!baid_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* This division is why we need the above BUILD_BUG_ON(),</div><div class='add'>+	 * if that doesn't hold then this will not be right.</div><div class='add'>+	 */</div><div class='add'>+	baid_data-&gt;entries_per_queue =</div><div class='add'>+		reorder_buf_size / sizeof(baid_data-&gt;entries[0]);</div><div class='add'>+</div><div class='add'>+	baid = iwl_mld_start_ba_in_fw(mld, sta, tid, ssn, buf_size);</div><div class='add'>+	if (baid &lt; 0) {</div><div class='add'>+		ret = baid;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mld-&gt;num_rx_ba_sessions++;</div><div class='add'>+	mld_sta-&gt;tid_to_baid[tid] = baid;</div><div class='add'>+</div><div class='add'>+	baid_data-&gt;baid = baid;</div><div class='add'>+	baid_data-&gt;mld = mld;</div><div class='add'>+	baid_data-&gt;tid = tid;</div><div class='add'>+	baid_data-&gt;buf_size = buf_size;</div><div class='add'>+	baid_data-&gt;sta_mask = sta_mask;</div><div class='add'>+	baid_data-&gt;timeout = timeout;</div><div class='add'>+	baid_data-&gt;last_rx_timestamp = jiffies;</div><div class='add'>+	baid_data-&gt;rcu_ptr = &amp;mld-&gt;fw_id_to_ba[baid];</div><div class='add'>+</div><div class='add'>+	iwl_mld_init_reorder_buffer(mld, baid_data, ssn);</div><div class='add'>+</div><div class='add'>+	timer_setup(&amp;baid_data-&gt;session_timer, iwl_mld_rx_agg_session_expired,</div><div class='add'>+		    0);</div><div class='add'>+	if (timeout)</div><div class='add'>+		mod_timer(&amp;baid_data-&gt;session_timer,</div><div class='add'>+			  TU_TO_EXP_TIME(timeout * 2));</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_HT(mld, "STA mask=0x%x (tid=%d) is assigned to BAID %d\n",</div><div class='add'>+		     baid_data-&gt;sta_mask, tid, baid);</div><div class='add'>+</div><div class='add'>+	/* protect the BA data with RCU to cover a case where our</div><div class='add'>+	 * internal RX sync mechanism will timeout (not that it's</div><div class='add'>+	 * supposed to happen) and we will free the session data while</div><div class='add'>+	 * RX is being processed in parallel</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON(rcu_access_pointer(mld-&gt;fw_id_to_ba[baid]));</div><div class='add'>+	rcu_assign_pointer(mld-&gt;fw_id_to_ba[baid], baid_data);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree(baid_data);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_ampdu_rx_stop(struct iwl_mld *mld, struct ieee80211_sta *sta,</div><div class='add'>+			  int tid)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+	int baid = mld_sta-&gt;tid_to_baid[tid];</div><div class='add'>+	struct iwl_mld_baid_data *baid_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* during firmware restart, do not send the command as the firmware no</div><div class='add'>+	 * longer recognizes the session. instead, only clear the driver BA</div><div class='add'>+	 * session data.</div><div class='add'>+	 */</div><div class='add'>+	if (!mld-&gt;fw_status.in_hw_restart) {</div><div class='add'>+		ret = iwl_mld_stop_ba_in_fw(mld, sta, tid);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!WARN_ON(mld-&gt;num_rx_ba_sessions == 0))</div><div class='add'>+		mld-&gt;num_rx_ba_sessions--;</div><div class='add'>+</div><div class='add'>+	baid_data = wiphy_dereference(mld-&gt;wiphy, mld-&gt;fw_id_to_ba[baid]);</div><div class='add'>+	if (WARN_ON(!baid_data))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (timer_pending(&amp;baid_data-&gt;session_timer))</div><div class='add'>+		timer_shutdown_sync(&amp;baid_data-&gt;session_timer);</div><div class='add'>+</div><div class='add'>+	iwl_mld_free_reorder_buffer(mld, baid_data);</div><div class='add'>+</div><div class='add'>+	RCU_INIT_POINTER(mld-&gt;fw_id_to_ba[baid], NULL);</div><div class='add'>+	kfree_rcu(baid_data, rcu_head);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_HT(mld, "BAID %d is free\n", baid);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_update_sta_baids(struct iwl_mld *mld,</div><div class='add'>+			     u32 old_sta_mask,</div><div class='add'>+			     u32 new_sta_mask)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rx_baid_cfg_cmd cmd = {</div><div class='add'>+		.action = cpu_to_le32(IWL_RX_BAID_ACTION_MODIFY),</div><div class='add'>+		.modify.old_sta_id_mask = cpu_to_le32(old_sta_mask),</div><div class='add'>+		.modify.new_sta_id_mask = cpu_to_le32(new_sta_mask),</div><div class='add'>+	};</div><div class='add'>+	u32 cmd_id = WIDE_ID(DATA_PATH_GROUP, RX_BAID_ALLOCATION_CONFIG_CMD);</div><div class='add'>+	int baid;</div><div class='add'>+</div><div class='add'>+	/* mac80211 will remove sessions later, but we ignore all that */</div><div class='add'>+	if (mld-&gt;fw_status.in_hw_restart)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct iwl_rx_baid_cfg_resp) != sizeof(baid));</div><div class='add'>+</div><div class='add'>+	for (baid = 0; baid &lt; ARRAY_SIZE(mld-&gt;fw_id_to_ba); baid++) {</div><div class='add'>+		struct iwl_mld_baid_data *data;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		data = wiphy_dereference(mld-&gt;wiphy, mld-&gt;fw_id_to_ba[baid]);</div><div class='add'>+		if (!data)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!(data-&gt;sta_mask &amp; old_sta_mask))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		WARN_ONCE(data-&gt;sta_mask != old_sta_mask,</div><div class='add'>+			  "BAID data for %d corrupted - expected 0x%x found 0x%x\n",</div><div class='add'>+			  baid, old_sta_mask, data-&gt;sta_mask);</div><div class='add'>+</div><div class='add'>+		cmd.modify.tid = cpu_to_le32(data-&gt;tid);</div><div class='add'>+</div><div class='add'>+		ret = iwl_mld_send_cmd_pdu(mld, cmd_id, &amp;cmd);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		data-&gt;sta_mask = new_sta_mask;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/agg.h b/drivers/net/wireless/intel/iwlwifi/mld/agg.h<br/>new file mode 100644<br/>index 000000000000..651c80d1c7cd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/agg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/agg.h</a></div><div class='hunk'>@@ -0,0 +1,127 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_agg_h__</div><div class='add'>+#define __iwl_agg_h__</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "fw/api/rx.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_reorder_buffer - per ra/tid/queue reorder buffer</div><div class='add'>+ * @head_sn: reorder window head sequence number</div><div class='add'>+ * @num_stored: number of MPDUs stored in the buffer</div><div class='add'>+ * @queue: queue of this reorder buffer</div><div class='add'>+ * @valid: true if reordering is valid for this queue</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_reorder_buffer {</div><div class='add'>+	u16 head_sn;</div><div class='add'>+	u16 num_stored;</div><div class='add'>+	int queue;</div><div class='add'>+	bool valid;</div><div class='add'>+} ____cacheline_aligned_in_smp;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_reorder_buf_entry - reorder buffer entry per-queue/per-seqno</div><div class='add'>+ * @frames: list of skbs stored. a list is necessary because in an A-MSDU,</div><div class='add'>+ *	all sub-frames share the same sequence number, so they are stored</div><div class='add'>+ *	together in the same list.</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_reorder_buf_entry {</div><div class='add'>+	struct sk_buff_head frames;</div><div class='add'>+}</div><div class='add'>+#ifndef __CHECKER__</div><div class='add'>+/* sparse doesn't like this construct: "bad integer constant expression" */</div><div class='add'>+__aligned(roundup_pow_of_two(sizeof(struct sk_buff_head)))</div><div class='add'>+#endif</div><div class='add'>+;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_baid_data - Block Ack session data</div><div class='add'>+ * @rcu_head: RCU head for freeing this data</div><div class='add'>+ * @sta_mask: station mask for the BAID</div><div class='add'>+ * @tid: tid of the session</div><div class='add'>+ * @baid: baid of the session</div><div class='add'>+ * @buf_size: the reorder buffer size as set by the last ADDBA request</div><div class='add'>+ * @entries_per_queue: number of buffers per queue, this actually gets</div><div class='add'>+ *	aligned up to avoid cache line sharing between queues</div><div class='add'>+ * @timeout: the timeout value specified in the ADDBA request.</div><div class='add'>+ * @last_rx_timestamp: timestamp of the last received packet (in jiffies). This</div><div class='add'>+ *	value is updated only when the configured @timeout has passed since</div><div class='add'>+ *	the last update to minimize cache bouncing between RX queues.</div><div class='add'>+ * @session_timer: timer is set to expire after 2 * @timeout (since we want</div><div class='add'>+ *	to minimize the cache bouncing by updating @last_rx_timestamp only once</div><div class='add'>+ *	after @timeout has passed). If no packets are received within this</div><div class='add'>+ *	period, it informs mac80211 to initiate delBA flow, terminating the</div><div class='add'>+ *	BA session.</div><div class='add'>+ * @rcu_ptr: BA data RCU protected access</div><div class='add'>+ * @mld: mld pointer, needed for timer context</div><div class='add'>+ * @reorder_buf: reorder buffer, allocated per queue</div><div class='add'>+ * @entries: data</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_baid_data {</div><div class='add'>+	struct rcu_head rcu_head;</div><div class='add'>+	u32 sta_mask;</div><div class='add'>+	u8 tid;</div><div class='add'>+	u8 baid;</div><div class='add'>+	u16 buf_size;</div><div class='add'>+	u16 entries_per_queue;</div><div class='add'>+	u16 timeout;</div><div class='add'>+	struct timer_list session_timer;</div><div class='add'>+	unsigned long last_rx_timestamp;</div><div class='add'>+	struct iwl_mld_baid_data __rcu **rcu_ptr;</div><div class='add'>+	struct iwl_mld *mld;</div><div class='add'>+	struct iwl_mld_reorder_buffer reorder_buf[IWL_MAX_RX_HW_QUEUES];</div><div class='add'>+	struct iwl_mld_reorder_buf_entry entries[] ____cacheline_aligned_in_smp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_delba_data - RX queue sync data for %IWL_MLD_RXQ_NOTIF_DEL_BA</div><div class='add'>+ *</div><div class='add'>+ * @baid: Block Ack id, used to identify the BA session to be removed</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_delba_data {</div><div class='add'>+	u32 baid;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_mld_reorder_result - Possible return values for iwl_mld_reorder()</div><div class='add'>+ * indicating how the caller should handle the skb based on the result.</div><div class='add'>+ *</div><div class='add'>+ * @IWL_MLD_PASS_SKB: skb should be passed to upper layer.</div><div class='add'>+ * @IWL_MLD_BUFFERED_SKB: skb has been buffered, don't pass it to upper layer.</div><div class='add'>+ * @IWL_MLD_DROP_SKB: skb should be dropped and freed by the caller.</div><div class='add'>+ */</div><div class='add'>+enum iwl_mld_reorder_result {</div><div class='add'>+	IWL_MLD_PASS_SKB,</div><div class='add'>+	IWL_MLD_BUFFERED_SKB,</div><div class='add'>+	IWL_MLD_DROP_SKB</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int iwl_mld_ampdu_rx_start(struct iwl_mld *mld, struct ieee80211_sta *sta,</div><div class='add'>+			   int tid, u16 ssn, u16 buf_size, u16 timeout);</div><div class='add'>+int iwl_mld_ampdu_rx_stop(struct iwl_mld *mld, struct ieee80211_sta *sta,</div><div class='add'>+			  int tid);</div><div class='add'>+</div><div class='add'>+enum iwl_mld_reorder_result</div><div class='add'>+iwl_mld_reorder(struct iwl_mld *mld, struct napi_struct *napi,</div><div class='add'>+		int queue, struct ieee80211_sta *sta,</div><div class='add'>+		struct sk_buff *skb, struct iwl_rx_mpdu_desc *desc);</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_frame_release_notif(struct iwl_mld *mld,</div><div class='add'>+					struct napi_struct *napi,</div><div class='add'>+					struct iwl_rx_packet *pkt, int queue);</div><div class='add'>+void iwl_mld_handle_bar_frame_release_notif(struct iwl_mld *mld,</div><div class='add'>+					    struct napi_struct *napi,</div><div class='add'>+					    struct iwl_rx_packet *pkt,</div><div class='add'>+					    int queue);</div><div class='add'>+</div><div class='add'>+void iwl_mld_del_ba(struct iwl_mld *mld, int queue,</div><div class='add'>+		    struct iwl_mld_delba_data *data);</div><div class='add'>+</div><div class='add'>+int iwl_mld_update_sta_baids(struct iwl_mld *mld,</div><div class='add'>+			     u32 old_sta_mask,</div><div class='add'>+			     u32 new_sta_mask);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_agg_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/ap.c b/drivers/net/wireless/intel/iwlwifi/mld/ap.c<br/>new file mode 100644<br/>index 000000000000..5c59acc8c4c5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/ap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/ap.c</a></div><div class='hunk'>@@ -0,0 +1,363 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ap.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+#include "tx.h"</div><div class='add'>+#include "power.h"</div><div class='add'>+#include "key.h"</div><div class='add'>+#include "phy.h"</div><div class='add'>+#include "iwl-utils.h"</div><div class='add'>+</div><div class='add'>+#include "fw/api/sta.h"</div><div class='add'>+</div><div class='add'>+void iwl_mld_set_tim_idx(struct iwl_mld *mld, __le32 *tim_index,</div><div class='add'>+			 u8 *beacon, u32 frame_size)</div><div class='add'>+{</div><div class='add'>+	u32 tim_idx;</div><div class='add'>+	struct ieee80211_mgmt *mgmt = (void *)beacon;</div><div class='add'>+</div><div class='add'>+	/* The index is relative to frame start but we start looking at the</div><div class='add'>+	 * variable-length part of the beacon.</div><div class='add'>+	 */</div><div class='add'>+	tim_idx = mgmt-&gt;u.beacon.variable - beacon;</div><div class='add'>+</div><div class='add'>+	/* Parse variable-length elements of beacon to find WLAN_EID_TIM */</div><div class='add'>+	while ((tim_idx &lt; (frame_size - 2)) &amp;&amp;</div><div class='add'>+	       (beacon[tim_idx] != WLAN_EID_TIM))</div><div class='add'>+		tim_idx += beacon[tim_idx + 1] + 2;</div><div class='add'>+</div><div class='add'>+	/* If TIM field was found, set variables */</div><div class='add'>+	if ((tim_idx &lt; (frame_size - 1)) &amp;&amp; beacon[tim_idx] == WLAN_EID_TIM)</div><div class='add'>+		*tim_index = cpu_to_le32(tim_idx);</div><div class='add'>+	else</div><div class='add'>+		IWL_WARN(mld, "Unable to find TIM Element in beacon\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 iwl_mld_get_rate_flags(struct iwl_mld *mld,</div><div class='add'>+			  struct ieee80211_tx_info *info,</div><div class='add'>+			  struct ieee80211_vif *vif,</div><div class='add'>+			  struct ieee80211_bss_conf *link,</div><div class='add'>+			  enum nl80211_band band)</div><div class='add'>+{</div><div class='add'>+	u32 legacy = link-&gt;beacon_tx_rate.control[band].legacy;</div><div class='add'>+	u32 rate_idx, rate_flags = 0, fw_rate;</div><div class='add'>+</div><div class='add'>+	/* if beacon rate was configured try using it */</div><div class='add'>+	if (hweight32(legacy) == 1) {</div><div class='add'>+		u32 rate = ffs(legacy) - 1;</div><div class='add'>+		struct ieee80211_supported_band *sband =</div><div class='add'>+			mld-&gt;hw-&gt;wiphy-&gt;bands[band];</div><div class='add'>+</div><div class='add'>+		rate_idx = sband-&gt;bitrates[rate].hw_value;</div><div class='add'>+	} else {</div><div class='add'>+		rate_idx = iwl_mld_get_lowest_rate(mld, info, vif);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rate_idx &lt;= IWL_LAST_CCK_RATE)</div><div class='add'>+		rate_flags = IWL_MAC_BEACON_CCK;</div><div class='add'>+</div><div class='add'>+	/* Legacy rates are indexed as follows:</div><div class='add'>+	 * 0 - 3 for CCK and 0 - 7 for OFDM.</div><div class='add'>+	 */</div><div class='add'>+	fw_rate = (rate_idx &gt;= IWL_FIRST_OFDM_RATE ?</div><div class='add'>+		     rate_idx - IWL_FIRST_OFDM_RATE : rate_idx);</div><div class='add'>+</div><div class='add'>+	return fw_rate | rate_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_send_beacon_template_cmd(struct iwl_mld *mld,</div><div class='add'>+				     struct sk_buff *beacon,</div><div class='add'>+				     struct iwl_mac_beacon_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct iwl_host_cmd hcmd = {</div><div class='add'>+		.id = BEACON_TEMPLATE_CMD,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hcmd.len[0] = sizeof(*cmd);</div><div class='add'>+	hcmd.data[0] = cmd;</div><div class='add'>+</div><div class='add'>+	hcmd.len[1] = beacon-&gt;len;</div><div class='add'>+	hcmd.data[1] = beacon-&gt;data;</div><div class='add'>+	hcmd.dataflags[1] = IWL_HCMD_DFL_DUP;</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_cmd(mld, &amp;hcmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_fill_beacon_template_cmd(struct iwl_mld *mld,</div><div class='add'>+					    struct ieee80211_vif *vif,</div><div class='add'>+					    struct sk_buff *beacon,</div><div class='add'>+					    struct iwl_mac_beacon_cmd *cmd,</div><div class='add'>+					    struct ieee80211_bss_conf *link)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_link *mld_link = iwl_mld_link_from_mac80211(link);</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(beacon);</div><div class='add'>+	struct ieee80211_chanctx_conf *ctx;</div><div class='add'>+	bool enable_fils;</div><div class='add'>+	u16 flags = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mld_link))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;link_id = cpu_to_le32(mld_link-&gt;fw_id);</div><div class='add'>+</div><div class='add'>+	ctx = wiphy_dereference(mld-&gt;wiphy, link-&gt;chanctx_conf);</div><div class='add'>+	if (WARN_ON(!ctx || !ctx-&gt;def.chan))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	enable_fils = cfg80211_channel_is_psc(ctx-&gt;def.chan) ||</div><div class='add'>+		(ctx-&gt;def.chan-&gt;band == NL80211_BAND_6GHZ &amp;&amp;</div><div class='add'>+		 ctx-&gt;def.width &gt;= NL80211_CHAN_WIDTH_80);</div><div class='add'>+</div><div class='add'>+	if (enable_fils) {</div><div class='add'>+		flags |= IWL_MAC_BEACON_FILS;</div><div class='add'>+		cmd-&gt;short_ssid = cpu_to_le32(~crc32_le(~0, vif-&gt;cfg.ssid,</div><div class='add'>+							vif-&gt;cfg.ssid_len));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd-&gt;byte_cnt = cpu_to_le16((u16)beacon-&gt;len);</div><div class='add'>+</div><div class='add'>+	flags |= iwl_mld_get_rate_flags(mld, info, vif, link,</div><div class='add'>+					ctx-&gt;def.chan-&gt;band);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;flags = cpu_to_le16(flags);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP) {</div><div class='add'>+		iwl_mld_set_tim_idx(mld, &amp;cmd-&gt;tim_idx,</div><div class='add'>+				    beacon-&gt;data, beacon-&gt;len);</div><div class='add'>+</div><div class='add'>+		cmd-&gt;btwt_offset =</div><div class='add'>+			cpu_to_le32(iwl_find_ie_offset(beacon-&gt;data,</div><div class='add'>+						       WLAN_EID_S1G_TWT,</div><div class='add'>+						       beacon-&gt;len));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd-&gt;csa_offset =</div><div class='add'>+		cpu_to_le32(iwl_find_ie_offset(beacon-&gt;data,</div><div class='add'>+					       WLAN_EID_CHANNEL_SWITCH,</div><div class='add'>+					       beacon-&gt;len));</div><div class='add'>+	cmd-&gt;ecsa_offset =</div><div class='add'>+		cpu_to_le32(iwl_find_ie_offset(beacon-&gt;data,</div><div class='add'>+					       WLAN_EID_EXT_CHANSWITCH_ANN,</div><div class='add'>+					       beacon-&gt;len));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The beacon template for the AP/GO/IBSS has changed and needs update */</div><div class='add'>+int iwl_mld_update_beacon_template(struct iwl_mld *mld,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mac_beacon_cmd cmd = {};</div><div class='add'>+	struct sk_buff *beacon;</div><div class='add'>+	int ret;</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	WARN_ON(vif-&gt;type != NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+		vif-&gt;type != NL80211_IFTYPE_ADHOC);</div><div class='add'>+</div><div class='add'>+	if (IWL_MLD_NON_TRANSMITTING_AP)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='add'>+	if (mld_vif-&gt;beacon_inject_active) {</div><div class='add'>+		IWL_DEBUG_INFO(mld,</div><div class='add'>+			       "Can't update template, beacon injection's active\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+	beacon = ieee80211_beacon_get_template(mld-&gt;hw, vif, NULL,</div><div class='add'>+					       link_conf-&gt;link_id);</div><div class='add'>+	if (!beacon)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_fill_beacon_template_cmd(mld, vif, beacon, &amp;cmd,</div><div class='add'>+					       link_conf);</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = iwl_mld_send_beacon_template_cmd(mld, beacon, &amp;cmd);</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb(beacon);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_free_ap_early_key(struct iwl_mld *mld,</div><div class='add'>+			       struct ieee80211_key_conf *key,</div><div class='add'>+			       struct iwl_mld_vif *mld_vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_link *link;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(key-&gt;link_id &lt; 0))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	link = iwl_mld_link_dereference_check(mld_vif, key-&gt;link_id);</div><div class='add'>+	if (WARN_ON(!link))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(link-&gt;ap_early_keys); i++) {</div><div class='add'>+		if (link-&gt;ap_early_keys[i] != key)</div><div class='add'>+			continue;</div><div class='add'>+		/* Those weren't sent to FW, so should be marked as INVALID */</div><div class='add'>+		if (WARN_ON(key-&gt;hw_key_idx != STA_KEY_IDX_INVALID))</div><div class='add'>+			key-&gt;hw_key_idx = STA_KEY_IDX_INVALID;</div><div class='add'>+		link-&gt;ap_early_keys[i] = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_store_ap_early_key(struct iwl_mld *mld,</div><div class='add'>+			       struct ieee80211_key_conf *key,</div><div class='add'>+			       struct iwl_mld_vif *mld_vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_link *link;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(key-&gt;link_id &lt; 0))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	link = iwl_mld_link_dereference_check(mld_vif, key-&gt;link_id);</div><div class='add'>+	if (WARN_ON(!link))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(link-&gt;ap_early_keys); i++) {</div><div class='add'>+		if (!link-&gt;ap_early_keys[i]) {</div><div class='add'>+			link-&gt;ap_early_keys[i] = key;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOSPC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_send_ap_early_keys(struct iwl_mld *mld,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      struct ieee80211_bss_conf *link)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_link *mld_link = iwl_mld_link_from_mac80211(link);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!link))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(mld_link-&gt;ap_early_keys); i++) {</div><div class='add'>+		struct ieee80211_key_conf *key = mld_link-&gt;ap_early_keys[i];</div><div class='add'>+</div><div class='add'>+		if (!key)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mld_link-&gt;ap_early_keys[i] = NULL;</div><div class='add'>+</div><div class='add'>+		ret = iwl_mld_add_key(mld, vif, NULL, key);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_start_ap_ibss(struct ieee80211_hw *hw,</div><div class='add'>+			  struct ieee80211_vif *vif,</div><div class='add'>+			  struct ieee80211_bss_conf *link)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct ieee80211_chanctx_conf *ctx;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP)</div><div class='add'>+		iwl_mld_send_ap_tx_power_constraint_cmd(mld, vif, link);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_update_beacon_template(mld, vif, link);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* the link should be already activated when assigning chan context,</div><div class='add'>+	 * and LINK_CONTEXT_MODIFY_EHT_PARAMS is deprecated</div><div class='add'>+	 */</div><div class='add'>+	ret = iwl_mld_change_link_in_fw(mld, link,</div><div class='add'>+					LINK_CONTEXT_MODIFY_ALL &amp;</div><div class='add'>+					~(LINK_CONTEXT_MODIFY_ACTIVE |</div><div class='add'>+					  LINK_CONTEXT_MODIFY_EHT_PARAMS));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_add_mcast_sta(mld, vif, link);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mld_vif-&gt;ap_ibss_active = true;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;p2p &amp;&amp; mld-&gt;p2p_device_vif) {</div><div class='add'>+		ret = iwl_mld_mac_fw_action(mld, mld-&gt;p2p_device_vif,</div><div class='add'>+					    FW_CTXT_ACTION_MODIFY);</div><div class='add'>+		if (ret) {</div><div class='add'>+			mld_vif-&gt;ap_ibss_active = false;</div><div class='add'>+			goto rm_mcast;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_add_bcast_sta(mld, vif, link);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto update_p2p_dev;</div><div class='add'>+</div><div class='add'>+	/* Those keys were configured by the upper layers before starting the</div><div class='add'>+	 * AP. Now that it is started and the bcast and mcast sta were added to</div><div class='add'>+	 * the FW, we can add the keys too.</div><div class='add'>+	 */</div><div class='add'>+	ret = iwl_mld_send_ap_early_keys(mld, vif, link);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto rm_bcast;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_type_p2p(vif) == NL80211_IFTYPE_AP)</div><div class='add'>+		iwl_mld_vif_update_low_latency(mld, vif, true,</div><div class='add'>+					       LOW_LATENCY_VIF_TYPE);</div><div class='add'>+</div><div class='add'>+	/* When the channel context was added, the link is not yet active, so</div><div class='add'>+	 * min_def is always used. Update the PHY again here in case def should</div><div class='add'>+	 * actually be used.</div><div class='add'>+	 */</div><div class='add'>+	ctx = wiphy_dereference(mld-&gt;wiphy, link-&gt;chanctx_conf);</div><div class='add'>+	iwl_mld_update_phy_chandef(mld, ctx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+rm_bcast:</div><div class='add'>+	iwl_mld_remove_bcast_sta(mld, vif, link);</div><div class='add'>+update_p2p_dev:</div><div class='add'>+	mld_vif-&gt;ap_ibss_active = false;</div><div class='add'>+	if (vif-&gt;p2p &amp;&amp; mld-&gt;p2p_device_vif)</div><div class='add'>+		iwl_mld_mac_fw_action(mld, mld-&gt;p2p_device_vif,</div><div class='add'>+				      FW_CTXT_ACTION_MODIFY);</div><div class='add'>+rm_mcast:</div><div class='add'>+	iwl_mld_remove_mcast_sta(mld, vif, link);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_stop_ap_ibss(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			  struct ieee80211_bss_conf *link)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	mld_vif-&gt;ap_ibss_active = false;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;p2p &amp;&amp; mld-&gt;p2p_device_vif)</div><div class='add'>+		iwl_mld_mac_fw_action(mld, mld-&gt;p2p_device_vif,</div><div class='add'>+				      FW_CTXT_ACTION_MODIFY);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_type_p2p(vif) == NL80211_IFTYPE_AP)</div><div class='add'>+		iwl_mld_vif_update_low_latency(mld, vif, false,</div><div class='add'>+					       LOW_LATENCY_VIF_TYPE);</div><div class='add'>+</div><div class='add'>+	iwl_mld_remove_bcast_sta(mld, vif, link);</div><div class='add'>+</div><div class='add'>+	iwl_mld_remove_mcast_sta(mld, vif, link);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/ap.h b/drivers/net/wireless/intel/iwlwifi/mld/ap.h<br/>new file mode 100644<br/>index 000000000000..4a6f52b9552d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/ap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/ap.h</a></div><div class='hunk'>@@ -0,0 +1,45 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_ap_h__</div><div class='add'>+#define __iwl_ap_h__</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "iface.h"</div><div class='add'>+</div><div class='add'>+#include "fw/api/tx.h"</div><div class='add'>+</div><div class='add'>+int iwl_mld_update_beacon_template(struct iwl_mld *mld,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_bss_conf *link_conf);</div><div class='add'>+</div><div class='add'>+int iwl_mld_start_ap_ibss(struct ieee80211_hw *hw,</div><div class='add'>+			  struct ieee80211_vif *vif,</div><div class='add'>+			  struct ieee80211_bss_conf *link);</div><div class='add'>+</div><div class='add'>+void iwl_mld_stop_ap_ibss(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			  struct ieee80211_bss_conf *link);</div><div class='add'>+</div><div class='add'>+int iwl_mld_store_ap_early_key(struct iwl_mld *mld,</div><div class='add'>+			       struct ieee80211_key_conf *key,</div><div class='add'>+			       struct iwl_mld_vif *mld_vif);</div><div class='add'>+</div><div class='add'>+void iwl_mld_free_ap_early_key(struct iwl_mld *mld,</div><div class='add'>+			       struct ieee80211_key_conf *key,</div><div class='add'>+			       struct iwl_mld_vif *mld_vif);</div><div class='add'>+</div><div class='add'>+u8 iwl_mld_get_rate_flags(struct iwl_mld *mld,</div><div class='add'>+			  struct ieee80211_tx_info *info,</div><div class='add'>+			  struct ieee80211_vif *vif,</div><div class='add'>+			  struct ieee80211_bss_conf *link,</div><div class='add'>+			  enum nl80211_band band);</div><div class='add'>+</div><div class='add'>+void iwl_mld_set_tim_idx(struct iwl_mld *mld, __le32 *tim_index,</div><div class='add'>+			 u8 *beacon, u32 frame_size);</div><div class='add'>+</div><div class='add'>+int iwl_mld_send_beacon_template_cmd(struct iwl_mld *mld,</div><div class='add'>+				     struct sk_buff *beacon,</div><div class='add'>+				     struct iwl_mac_beacon_cmd *cmd);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_ap_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/coex.c b/drivers/net/wireless/intel/iwlwifi/mld/coex.c<br/>new file mode 100644<br/>index 000000000000..5f262bd43f21<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/coex.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/coex.c</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "fw/api/coex.h"</div><div class='add'>+</div><div class='add'>+#include "coex.h"</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+#include "mlo.h"</div><div class='add'>+</div><div class='add'>+int iwl_mld_send_bt_init_conf(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct iwl_bt_coex_cmd cmd = {</div><div class='add'>+		.mode = cpu_to_le32(BT_COEX_NW),</div><div class='add'>+		.enabled_modules = cpu_to_le32(BT_COEX_MPLUT_ENABLED |</div><div class='add'>+					       BT_COEX_HIGH_BAND_RET),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_cmd_pdu(mld, BT_CONFIG, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_bt_coex_notif(struct iwl_mld *mld,</div><div class='add'>+				  struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_bt_coex_profile_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+	const struct iwl_bt_coex_profile_notif zero_notif = {};</div><div class='add'>+	/* zeroed structure means that BT is OFF */</div><div class='add'>+	bool bt_is_active = memcmp(notif, &amp;zero_notif, sizeof(*notif));</div><div class='add'>+</div><div class='add'>+	if (bt_is_active == mld-&gt;bt_is_active)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(mld, "BT was turned %s\n", bt_is_active ? "ON" : "OFF");</div><div class='add'>+</div><div class='add'>+	mld-&gt;bt_is_active = bt_is_active;</div><div class='add'>+</div><div class='add'>+	iwl_mld_emlsr_check_bt(mld);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/coex.h b/drivers/net/wireless/intel/iwlwifi/mld/coex.h<br/>new file mode 100644<br/>index 000000000000..a77c5dc9613c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/coex.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/coex.h</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_coex_h__</div><div class='add'>+#define __iwl_mld_coex_h__</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+</div><div class='add'>+int iwl_mld_send_bt_init_conf(struct iwl_mld *mld);</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_bt_coex_notif(struct iwl_mld *mld,</div><div class='add'>+				  struct iwl_rx_packet *pkt);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_coex_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/constants.h b/drivers/net/wireless/intel/iwlwifi/mld/constants.h<br/>new file mode 100644<br/>index 000000000000..5d23a618ae3c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/constants.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/constants.h</a></div><div class='hunk'>@@ -0,0 +1,81 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_constants_h__</div><div class='add'>+#define __iwl_mld_constants_h__</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_MISSED_BEACONS_SINCE_RX_THOLD			4</div><div class='add'>+#define IWL_MLD_MISSED_BEACONS_THRESHOLD			8</div><div class='add'>+#define IWL_MLD_MISSED_BEACONS_THRESHOLD_LONG			19</div><div class='add'>+#define IWL_MLD_BCN_LOSS_EXIT_ESR_THRESH_2_LINKS		5</div><div class='add'>+#define IWL_MLD_BCN_LOSS_EXIT_ESR_THRESH			15</div><div class='add'>+#define IWL_MLD_BCN_LOSS_EXIT_ESR_THRESH_BSS_PARAM_CHANGED	11</div><div class='add'>+#define IWL_MLD_LOW_RSSI_MLO_SCAN_THRESH			-72</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_DEFAULT_PS_TX_DATA_TIMEOUT	(100 * USEC_PER_MSEC)</div><div class='add'>+#define IWL_MLD_DEFAULT_PS_RX_DATA_TIMEOUT	(100 * USEC_PER_MSEC)</div><div class='add'>+#define IWL_MLD_WOWLAN_PS_TX_DATA_TIMEOUT	(10 * USEC_PER_MSEC)</div><div class='add'>+#define IWL_MLD_WOWLAN_PS_RX_DATA_TIMEOUT	(10 * USEC_PER_MSEC)</div><div class='add'>+#define IWL_MLD_SHORT_PS_TX_DATA_TIMEOUT	(2 * 1024) /* defined in TU */</div><div class='add'>+#define IWL_MLD_SHORT_PS_RX_DATA_TIMEOUT	(40 * 1024) /* defined in TU */</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_UAPSD_RX_DATA_TIMEOUT		(50 * USEC_PER_MSEC)</div><div class='add'>+#define IWL_MLD_UAPSD_TX_DATA_TIMEOUT		(50 * USEC_PER_MSEC)</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_PS_SNOOZE_INTERVAL		25</div><div class='add'>+#define IWL_MLD_PS_SNOOZE_INTERVAL		25</div><div class='add'>+#define IWL_MLD_PS_SNOOZE_WINDOW		50</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_PS_SNOOZE_HEAVY_TX_THLD_PACKETS	30</div><div class='add'>+#define IWL_MLD_PS_SNOOZE_HEAVY_RX_THLD_PACKETS	20</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_PS_HEAVY_TX_THLD_PERCENT	50</div><div class='add'>+#define IWL_MLD_PS_HEAVY_RX_THLD_PERCENT	50</div><div class='add'>+#define IWL_MLD_PS_HEAVY_TX_THLD_PACKETS	20</div><div class='add'>+#define IWL_MLD_PS_HEAVY_RX_THLD_PACKETS	8</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_TRIGGER_LINK_SEL_TIME_SEC	30</div><div class='add'>+#define IWL_MLD_SCAN_EXPIRE_TIME_SEC		20</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_TPT_COUNT_WINDOW (5 * HZ)</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_DIS_RANDOM_FW_ID                false</div><div class='add'>+#define IWL_MLD_D3_DEBUG                        false</div><div class='add'>+#define IWL_MLD_NON_TRANSMITTING_AP	        false</div><div class='add'>+#define IWL_MLD_6GHZ_PASSIVE_SCAN_TIMEOUT       3000 /* in seconds */</div><div class='add'>+#define IWL_MLD_6GHZ_PASSIVE_SCAN_ASSOC_TIMEOUT 60   /* in seconds */</div><div class='add'>+#define IWL_MLD_CONN_LISTEN_INTERVAL		10</div><div class='add'>+#define IWL_MLD_ADAPTIVE_DWELL_NUM_APS_OVERRIDE 0</div><div class='add'>+#define IWL_MLD_AUTO_EML_ENABLE			true</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_HIGH_RSSI_THRESH_20MHZ		-67</div><div class='add'>+#define IWL_MLD_LOW_RSSI_THRESH_20MHZ		-72</div><div class='add'>+#define IWL_MLD_HIGH_RSSI_THRESH_40MHZ		-64</div><div class='add'>+#define IWL_MLD_LOW_RSSI_THRESH_40MHZ		-72</div><div class='add'>+#define IWL_MLD_HIGH_RSSI_THRESH_80MHZ		-61</div><div class='add'>+#define IWL_MLD_LOW_RSSI_THRESH_80MHZ		-72</div><div class='add'>+#define IWL_MLD_HIGH_RSSI_THRESH_160MHZ		-58</div><div class='add'>+#define IWL_MLD_LOW_RSSI_THRESH_160MHZ		-72</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_ENTER_EMLSR_TPT_THRESH		400</div><div class='add'>+#define IWL_MLD_EXIT_EMLSR_CHAN_LOAD		2 /* in percentage */</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_FTM_INITIATOR_ALGO		IWL_TOF_ALGO_TYPE_MAX_LIKE</div><div class='add'>+#define IWL_MLD_FTM_INITIATOR_DYNACK		true</div><div class='add'>+#define IWL_MLD_FTM_LMR_FEEDBACK_TERMINATE	false</div><div class='add'>+#define IWL_MLD_FTM_TEST_INCORRECT_SAC		false</div><div class='add'>+#define IWL_MLD_FTM_R2I_MAX_REP			7</div><div class='add'>+#define IWL_MLD_FTM_I2R_MAX_REP			7</div><div class='add'>+#define IWL_MLD_FTM_R2I_MAX_STS			1</div><div class='add'>+#define IWL_MLD_FTM_I2R_MAX_STS			1</div><div class='add'>+#define IWL_MLD_FTM_R2I_MAX_TOTAL_LTF		3</div><div class='add'>+#define IWL_MLD_FTM_I2R_MAX_TOTAL_LTF		3</div><div class='add'>+#define IWL_MLD_FTM_RESP_NDP_SUPPORT		true</div><div class='add'>+#define IWL_MLD_FTM_RESP_LMR_FEEDBACK_SUPPORT	true</div><div class='add'>+#define IWL_MLD_FTM_NON_TB_MIN_TIME_BETWEEN_MSR	7</div><div class='add'>+#define IWL_MLD_FTM_NON_TB_MAX_TIME_BETWEEN_MSR	1000</div><div class='add'>+#define IWL_MLD_STA_EXT_CAPA_SIZE		9</div><div class='add'>+#define IWL_MLD_EXT_CAPA_NUM_IFTYPES		1</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_constants_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/d3.c b/drivers/net/wireless/intel/iwlwifi/mld/d3.c<br/>new file mode 100644<br/>index 000000000000..dd85be94433c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/d3.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/d3.c</a></div><div class='hunk'>@@ -0,0 +1,2065 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include "mld.h"</div><div class='add'>+</div><div class='add'>+#include "d3.h"</div><div class='add'>+#include "power.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+#include "iface.h"</div><div class='add'>+#include "mcc.h"</div><div class='add'>+#include "sta.h"</div><div class='add'>+#include "mlo.h"</div><div class='add'>+#include "key.h"</div><div class='add'>+</div><div class='add'>+#include "fw/api/d3.h"</div><div class='add'>+#include "fw/api/offload.h"</div><div class='add'>+#include "fw/api/sta.h"</div><div class='add'>+#include "fw/dbg.h"</div><div class='add'>+</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='add'>+#include &lt;net/addrconf.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_mld_d3_notif - d3 notifications</div><div class='add'>+ * @IWL_D3_NOTIF_WOWLAN_INFO: WOWLAN_INFO_NOTIF is expected/was received</div><div class='add'>+ * @IWL_D3_NOTIF_WOWLAN_WAKE_PKT: WOWLAN_WAKE_PKT_NOTIF is expected/was received</div><div class='add'>+ * @IWL_D3_NOTIF_PROT_OFFLOAD: PROT_OFFLOAD_NOTIF is expected/was received</div><div class='add'>+ * @IWL_D3_ND_MATCH_INFO: OFFLOAD_MATCH_INFO_NOTIF is expected/was received</div><div class='add'>+ * @IWL_D3_NOTIF_D3_END_NOTIF: D3_END_NOTIF is expected/was received</div><div class='add'>+ */</div><div class='add'>+enum iwl_mld_d3_notif {</div><div class='add'>+	IWL_D3_NOTIF_WOWLAN_INFO =	BIT(0),</div><div class='add'>+	IWL_D3_NOTIF_WOWLAN_WAKE_PKT =	BIT(1),</div><div class='add'>+	IWL_D3_NOTIF_PROT_OFFLOAD =	BIT(2),</div><div class='add'>+	IWL_D3_ND_MATCH_INFO      =     BIT(3),</div><div class='add'>+	IWL_D3_NOTIF_D3_END_NOTIF =	BIT(4)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_mld_resume_key_iter_data {</div><div class='add'>+	struct iwl_mld *mld;</div><div class='add'>+	struct iwl_mld_wowlan_status *wowlan_status;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_mld_suspend_key_iter_data {</div><div class='add'>+	struct iwl_wowlan_rsc_tsc_params_cmd *rsc;</div><div class='add'>+	bool have_rsc;</div><div class='add'>+	int gtks;</div><div class='add'>+	int found_gtk_idx[4];</div><div class='add'>+	__le32 gtk_cipher;</div><div class='add'>+	__le32 igtk_cipher;</div><div class='add'>+	__le32 bigtk_cipher;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_mld_mcast_key_data {</div><div class='add'>+	u8 key[WOWLAN_KEY_MAX_SIZE];</div><div class='add'>+	u8 len;</div><div class='add'>+	u8 flags;</div><div class='add'>+	u8 id;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			struct ieee80211_key_seq aes_seq[IWL_MAX_TID_COUNT];</div><div class='add'>+			struct ieee80211_key_seq tkip_seq[IWL_MAX_TID_COUNT];</div><div class='add'>+		} gtk;</div><div class='add'>+		struct {</div><div class='add'>+			struct ieee80211_key_seq cmac_gmac_seq;</div><div class='add'>+		} igtk_bigtk;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_mld_wowlan_mlo_key {</div><div class='add'>+	u8 key[WOWLAN_KEY_MAX_SIZE];</div><div class='add'>+	u8 idx, type, link_id;</div><div class='add'>+	u8 pn[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_wowlan_status - contains wowlan status data from</div><div class='add'>+ * all wowlan notifications</div><div class='add'>+ * @wakeup_reasons: wakeup reasons, see &amp;enum iwl_wowlan_wakeup_reason</div><div class='add'>+ * @replay_ctr: GTK rekey replay counter</div><div class='add'>+ * @pattern_number: number of the matched patterns on packets</div><div class='add'>+ * @last_qos_seq: QoS sequence counter of offloaded tid</div><div class='add'>+ * @num_of_gtk_rekeys: number of GTK rekeys during D3</div><div class='add'>+ * @tid_offloaded_tx: tid used by the firmware to transmit data packets</div><div class='add'>+ *	while in wowlan</div><div class='add'>+ * @wake_packet: wakeup packet received</div><div class='add'>+ * @wake_packet_length: wake packet length</div><div class='add'>+ * @wake_packet_bufsize: wake packet bufsize</div><div class='add'>+ * @gtk: data of the last two used gtk's by the FW upon resume</div><div class='add'>+ * @igtk: data of the last used igtk by the FW upon resume</div><div class='add'>+ * @bigtk: data of the last two used gtk's by the FW upon resume</div><div class='add'>+ * @ptk: last seq numbers per tid passed by the FW,</div><div class='add'>+ *	holds both in tkip and aes formats</div><div class='add'>+ * @num_mlo_keys: number of &amp;struct iwl_mld_wowlan_mlo_key structs</div><div class='add'>+ * @mlo_keys: array of MLO keys</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_wowlan_status {</div><div class='add'>+	u32 wakeup_reasons;</div><div class='add'>+	u64 replay_ctr;</div><div class='add'>+	u16 pattern_number;</div><div class='add'>+	u16 last_qos_seq;</div><div class='add'>+	u32 num_of_gtk_rekeys;</div><div class='add'>+	u8 tid_offloaded_tx;</div><div class='add'>+	u8 *wake_packet;</div><div class='add'>+	u32 wake_packet_length;</div><div class='add'>+	u32 wake_packet_bufsize;</div><div class='add'>+	struct iwl_mld_mcast_key_data gtk[WOWLAN_GTK_KEYS_NUM];</div><div class='add'>+	struct iwl_mld_mcast_key_data igtk;</div><div class='add'>+	struct iwl_mld_mcast_key_data bigtk[WOWLAN_BIGTK_KEYS_NUM];</div><div class='add'>+	struct {</div><div class='add'>+		struct ieee80211_key_seq aes_seq[IWL_MAX_TID_COUNT];</div><div class='add'>+		struct ieee80211_key_seq tkip_seq[IWL_MAX_TID_COUNT];</div><div class='add'>+</div><div class='add'>+	} ptk;</div><div class='add'>+</div><div class='add'>+	int num_mlo_keys;</div><div class='add'>+	struct iwl_mld_wowlan_mlo_key mlo_keys[WOWLAN_MAX_MLO_KEYS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NETDETECT_QUERY_BUF_LEN \</div><div class='add'>+	(sizeof(struct iwl_scan_offload_profile_match) * \</div><div class='add'>+	 IWL_SCAN_MAX_PROFILES_V2)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_netdetect_res - contains netdetect results from</div><div class='add'>+ * match_info_notif</div><div class='add'>+ * @matched_profiles: bitmap of matched profiles, referencing the</div><div class='add'>+ *	matches passed in the scan offload request</div><div class='add'>+ * @matches: array of match information, one for each match</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_netdetect_res {</div><div class='add'>+	u32 matched_profiles;</div><div class='add'>+	u8 matches[NETDETECT_QUERY_BUF_LEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_resume_data - d3 resume flow data</div><div class='add'>+ * @notifs_expected: bitmap of expected notifications from fw,</div><div class='add'>+ *	see &amp;enum iwl_mld_d3_notif</div><div class='add'>+ * @notifs_received: bitmap of received notifications from fw,</div><div class='add'>+ *	see &amp;enum iwl_mld_d3_notif</div><div class='add'>+ * @d3_end_flags: bitmap of flags from d3_end_notif</div><div class='add'>+ * @notif_handling_err: error handling one of the resume notifications</div><div class='add'>+ * @wowlan_status: wowlan status data from all wowlan notifications</div><div class='add'>+ * @netdetect_res: contains netdetect results from match_info_notif</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_resume_data {</div><div class='add'>+	u32 notifs_expected;</div><div class='add'>+	u32 notifs_received;</div><div class='add'>+	u32 d3_end_flags;</div><div class='add'>+	bool notif_handling_err;</div><div class='add'>+	struct iwl_mld_wowlan_status *wowlan_status;</div><div class='add'>+	struct iwl_mld_netdetect_res *netdetect_res;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IWL_WOWLAN_WAKEUP_REASON_HAS_WAKEUP_PKT \</div><div class='add'>+	(IWL_WOWLAN_WAKEUP_BY_MAGIC_PACKET | \</div><div class='add'>+	IWL_WOWLAN_WAKEUP_BY_PATTERN | \</div><div class='add'>+	IWL_WAKEUP_BY_PATTERN_IPV4_TCP_SYN |\</div><div class='add'>+	IWL_WAKEUP_BY_PATTERN_IPV4_TCP_SYN_WILDCARD |\</div><div class='add'>+	IWL_WAKEUP_BY_PATTERN_IPV6_TCP_SYN |\</div><div class='add'>+	IWL_WAKEUP_BY_PATTERN_IPV6_TCP_SYN_WILDCARD)</div><div class='add'>+</div><div class='add'>+#define IWL_WOWLAN_OFFLOAD_TID 0</div><div class='add'>+</div><div class='add'>+void iwl_mld_set_rekey_data(struct ieee80211_hw *hw,</div><div class='add'>+			    struct ieee80211_vif *vif,</div><div class='add'>+			    struct cfg80211_gtk_rekey_data *data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld_wowlan_data *wowlan_data = &amp;mld_vif-&gt;wowlan_data;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	wowlan_data-&gt;rekey_data.kek_len = data-&gt;kek_len;</div><div class='add'>+	wowlan_data-&gt;rekey_data.kck_len = data-&gt;kck_len;</div><div class='add'>+	memcpy(wowlan_data-&gt;rekey_data.kek, data-&gt;kek, data-&gt;kek_len);</div><div class='add'>+	memcpy(wowlan_data-&gt;rekey_data.kck, data-&gt;kck, data-&gt;kck_len);</div><div class='add'>+	wowlan_data-&gt;rekey_data.akm = data-&gt;akm &amp; 0xFF;</div><div class='add'>+	wowlan_data-&gt;rekey_data.replay_ctr =</div><div class='add'>+		cpu_to_le64(be64_to_cpup((const __be64 *)data-&gt;replay_ctr));</div><div class='add'>+	wowlan_data-&gt;rekey_data.valid = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+void iwl_mld_ipv6_addr_change(struct ieee80211_hw *hw,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      struct inet6_dev *idev)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld_wowlan_data *wowlan_data = &amp;mld_vif-&gt;wowlan_data;</div><div class='add'>+	struct inet6_ifaddr *ifa;</div><div class='add'>+	int idx = 0;</div><div class='add'>+</div><div class='add'>+	memset(wowlan_data-&gt;tentative_addrs, 0,</div><div class='add'>+	       sizeof(wowlan_data-&gt;tentative_addrs));</div><div class='add'>+</div><div class='add'>+	read_lock_bh(&amp;idev-&gt;lock);</div><div class='add'>+	list_for_each_entry(ifa, &amp;idev-&gt;addr_list, if_list) {</div><div class='add'>+		wowlan_data-&gt;target_ipv6_addrs[idx] = ifa-&gt;addr;</div><div class='add'>+		if (ifa-&gt;flags &amp; IFA_F_TENTATIVE)</div><div class='add'>+			__set_bit(idx, wowlan_data-&gt;tentative_addrs);</div><div class='add'>+		idx++;</div><div class='add'>+		if (idx &gt;= IWL_PROTO_OFFLOAD_NUM_IPV6_ADDRS_MAX)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	wowlan_data-&gt;num_target_ipv6_addrs = idx;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_netdetect_config(struct iwl_mld *mld,</div><div class='add'>+			 struct ieee80211_vif *vif,</div><div class='add'>+			 const struct cfg80211_wowlan *wowlan)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct cfg80211_sched_scan_request *netdetect_cfg =</div><div class='add'>+		wowlan-&gt;nd_config;</div><div class='add'>+	struct ieee80211_scan_ies ies = {};</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_scan_stop(mld, IWL_MLD_SCAN_SCHED, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_sched_scan_start(mld, vif, netdetect_cfg, &amp;ies,</div><div class='add'>+				       IWL_MLD_SCAN_NETDETECT);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_le64_to_tkip_seq(__le64 le_pn, struct ieee80211_key_seq *seq)</div><div class='add'>+{</div><div class='add'>+	u64 pn = le64_to_cpu(le_pn);</div><div class='add'>+</div><div class='add'>+	seq-&gt;tkip.iv16 = (u16)pn;</div><div class='add'>+	seq-&gt;tkip.iv32 = (u32)(pn &gt;&gt; 16);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_le64_to_aes_seq(__le64 le_pn, struct ieee80211_key_seq *seq)</div><div class='add'>+{</div><div class='add'>+	u64 pn = le64_to_cpu(le_pn);</div><div class='add'>+</div><div class='add'>+	seq-&gt;ccmp.pn[0] = pn &gt;&gt; 40;</div><div class='add'>+	seq-&gt;ccmp.pn[1] = pn &gt;&gt; 32;</div><div class='add'>+	seq-&gt;ccmp.pn[2] = pn &gt;&gt; 24;</div><div class='add'>+	seq-&gt;ccmp.pn[3] = pn &gt;&gt; 16;</div><div class='add'>+	seq-&gt;ccmp.pn[4] = pn &gt;&gt; 8;</div><div class='add'>+	seq-&gt;ccmp.pn[5] = pn;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_convert_gtk_resume_seq(struct iwl_mld_mcast_key_data *gtk_data,</div><div class='add'>+			       const struct iwl_wowlan_all_rsc_tsc_v5 *sc,</div><div class='add'>+			       int rsc_idx)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_key_seq *aes_seq = gtk_data-&gt;gtk.aes_seq;</div><div class='add'>+	struct ieee80211_key_seq *tkip_seq = gtk_data-&gt;gtk.tkip_seq;</div><div class='add'>+</div><div class='add'>+	if (rsc_idx &gt;= ARRAY_SIZE(sc-&gt;mcast_rsc))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* We store both the TKIP and AES representations coming from the</div><div class='add'>+	 * FW because we decode the data from there before we iterate</div><div class='add'>+	 * the keys and know which type is used.</div><div class='add'>+	 */</div><div class='add'>+	for (int tid = 0; tid &lt; IWL_MAX_TID_COUNT; tid++) {</div><div class='add'>+		iwl_mld_le64_to_tkip_seq(sc-&gt;mcast_rsc[rsc_idx][tid],</div><div class='add'>+					 &amp;tkip_seq[tid]);</div><div class='add'>+		iwl_mld_le64_to_aes_seq(sc-&gt;mcast_rsc[rsc_idx][tid],</div><div class='add'>+					&amp;aes_seq[tid]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_convert_gtk_resume_data(struct iwl_mld *mld,</div><div class='add'>+				struct iwl_mld_wowlan_status *wowlan_status,</div><div class='add'>+				const struct iwl_wowlan_gtk_status *gtk_data,</div><div class='add'>+				const struct iwl_wowlan_all_rsc_tsc_v5 *sc)</div><div class='add'>+{</div><div class='add'>+	int status_idx = 0;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(wowlan_status-&gt;gtk[0].key) &lt;</div><div class='add'>+		     sizeof(gtk_data[0].key));</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(wowlan_status-&gt;gtk) &lt; WOWLAN_GTK_KEYS_NUM);</div><div class='add'>+</div><div class='add'>+	for (int notif_idx = 0; notif_idx &lt; ARRAY_SIZE(wowlan_status-&gt;gtk);</div><div class='add'>+	     notif_idx++) {</div><div class='add'>+		int rsc_idx;</div><div class='add'>+		u8 key_status = gtk_data[notif_idx].key_status;</div><div class='add'>+</div><div class='add'>+		if (!key_status)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		wowlan_status-&gt;gtk[status_idx].len =</div><div class='add'>+			gtk_data[notif_idx].key_len;</div><div class='add'>+		wowlan_status-&gt;gtk[status_idx].flags =</div><div class='add'>+			gtk_data[notif_idx].key_flags;</div><div class='add'>+		wowlan_status-&gt;gtk[status_idx].id =</div><div class='add'>+			wowlan_status-&gt;gtk[status_idx].flags &amp;</div><div class='add'>+			IWL_WOWLAN_GTK_IDX_MASK;</div><div class='add'>+		/* The rsc for both gtk keys are stored in gtk[0]-&gt;sc-&gt;mcast_rsc</div><div class='add'>+		 * The gtk ids can be any two numbers between 0 and 3,</div><div class='add'>+		 * the id_map maps between the key id and the index in sc-&gt;mcast</div><div class='add'>+		 */</div><div class='add'>+		rsc_idx =</div><div class='add'>+			sc-&gt;mcast_key_id_map[wowlan_status-&gt;gtk[status_idx].id];</div><div class='add'>+		iwl_mld_convert_gtk_resume_seq(&amp;wowlan_status-&gt;gtk[status_idx],</div><div class='add'>+					       sc, rsc_idx);</div><div class='add'>+</div><div class='add'>+		if (key_status == IWL_WOWLAN_STATUS_NEW_KEY) {</div><div class='add'>+			memcpy(wowlan_status-&gt;gtk[status_idx].key,</div><div class='add'>+			       gtk_data[notif_idx].key,</div><div class='add'>+			       sizeof(gtk_data[notif_idx].key));</div><div class='add'>+</div><div class='add'>+			/* if it's as long as the TKIP encryption key,</div><div class='add'>+			 * copy MIC key</div><div class='add'>+			 */</div><div class='add'>+			if (wowlan_status-&gt;gtk[status_idx].len ==</div><div class='add'>+			    NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY)</div><div class='add'>+				memcpy(wowlan_status-&gt;gtk[status_idx].key +</div><div class='add'>+				       NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY,</div><div class='add'>+				       gtk_data[notif_idx].tkip_mic_key,</div><div class='add'>+				       sizeof(gtk_data[notif_idx].tkip_mic_key));</div><div class='add'>+		} else {</div><div class='add'>+			/* If the key status is WOWLAN_STATUS_OLD_KEY, it</div><div class='add'>+			 * indicates that no key material is present, Set the</div><div class='add'>+			 * key length to 0 as an indication</div><div class='add'>+			 */</div><div class='add'>+			wowlan_status-&gt;gtk[status_idx].len = 0;</div><div class='add'>+		}</div><div class='add'>+		status_idx++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_convert_ptk_resume_seq(struct iwl_mld *mld,</div><div class='add'>+			       struct iwl_mld_wowlan_status *wowlan_status,</div><div class='add'>+			       const struct iwl_wowlan_all_rsc_tsc_v5 *sc)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_key_seq *aes_seq = wowlan_status-&gt;ptk.aes_seq;</div><div class='add'>+	struct ieee80211_key_seq *tkip_seq = wowlan_status-&gt;ptk.tkip_seq;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(sc-&gt;ucast_rsc) != IWL_MAX_TID_COUNT);</div><div class='add'>+</div><div class='add'>+	for (int tid = 0; tid &lt; IWL_MAX_TID_COUNT; tid++) {</div><div class='add'>+		iwl_mld_le64_to_aes_seq(sc-&gt;ucast_rsc[tid], &amp;aes_seq[tid]);</div><div class='add'>+		iwl_mld_le64_to_tkip_seq(sc-&gt;ucast_rsc[tid], &amp;tkip_seq[tid]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_convert_mcast_ipn(struct iwl_mld_mcast_key_data *key_status,</div><div class='add'>+			  const struct iwl_wowlan_igtk_status *key)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_key_seq *seq =</div><div class='add'>+		&amp;key_status-&gt;igtk_bigtk.cmac_gmac_seq;</div><div class='add'>+	u8 ipn_len = ARRAY_SIZE(key-&gt;ipn);</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ipn_len != ARRAY_SIZE(seq-&gt;aes_gmac.pn));</div><div class='add'>+	BUILD_BUG_ON(ipn_len != ARRAY_SIZE(seq-&gt;aes_cmac.pn));</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct ieee80211_key_seq, aes_gmac) !=</div><div class='add'>+		     offsetof(struct ieee80211_key_seq, aes_cmac));</div><div class='add'>+</div><div class='add'>+	/* mac80211 expects big endian for memcmp() to work, convert.</div><div class='add'>+	 * We don't have the key cipher yet so copy to both to cmac and gmac</div><div class='add'>+	 */</div><div class='add'>+	for (int i = 0; i &lt; ipn_len; i++) {</div><div class='add'>+		seq-&gt;aes_gmac.pn[i] = key-&gt;ipn[ipn_len - i - 1];</div><div class='add'>+		seq-&gt;aes_cmac.pn[i] = key-&gt;ipn[ipn_len - i - 1];</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_convert_igtk_resume_data(struct iwl_mld_wowlan_status *wowlan_status,</div><div class='add'>+				 const struct iwl_wowlan_igtk_status *igtk)</div><div class='add'>+{</div><div class='add'>+	if (!igtk-&gt;key_status)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(wowlan_status-&gt;igtk.key) &lt; sizeof(igtk-&gt;key));</div><div class='add'>+</div><div class='add'>+	wowlan_status-&gt;igtk.len = igtk-&gt;key_len;</div><div class='add'>+	wowlan_status-&gt;igtk.flags = igtk-&gt;key_flags;</div><div class='add'>+	wowlan_status-&gt;igtk.id =</div><div class='add'>+		u32_get_bits(igtk-&gt;key_flags,</div><div class='add'>+			     IWL_WOWLAN_IGTK_BIGTK_IDX_MASK) +</div><div class='add'>+		WOWLAN_IGTK_MIN_INDEX;</div><div class='add'>+</div><div class='add'>+	if (igtk-&gt;key_status == IWL_WOWLAN_STATUS_NEW_KEY)</div><div class='add'>+		memcpy(wowlan_status-&gt;igtk.key, igtk-&gt;key, sizeof(igtk-&gt;key));</div><div class='add'>+	else</div><div class='add'>+		/* If the key status is WOWLAN_STATUS_OLD_KEY, it indicates</div><div class='add'>+		 * that no key material is present. Set the key length to 0</div><div class='add'>+		 * as an indication.</div><div class='add'>+		 */</div><div class='add'>+		wowlan_status-&gt;igtk.len = 0;</div><div class='add'>+</div><div class='add'>+	iwl_mld_convert_mcast_ipn(&amp;wowlan_status-&gt;igtk, igtk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_convert_bigtk_resume_data(struct iwl_mld_wowlan_status *wowlan_status,</div><div class='add'>+				  const struct iwl_wowlan_igtk_status *bigtk)</div><div class='add'>+{</div><div class='add'>+	int status_idx = 0;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(wowlan_status-&gt;bigtk) &lt; WOWLAN_BIGTK_KEYS_NUM);</div><div class='add'>+</div><div class='add'>+	for (int notif_idx = 0; notif_idx &lt; WOWLAN_BIGTK_KEYS_NUM;</div><div class='add'>+	     notif_idx++) {</div><div class='add'>+		if (!bigtk[notif_idx].key_status)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		wowlan_status-&gt;bigtk[status_idx].len = bigtk[notif_idx].key_len;</div><div class='add'>+		wowlan_status-&gt;bigtk[status_idx].flags =</div><div class='add'>+			bigtk[notif_idx].key_flags;</div><div class='add'>+		wowlan_status-&gt;bigtk[status_idx].id =</div><div class='add'>+			u32_get_bits(bigtk[notif_idx].key_flags,</div><div class='add'>+				     IWL_WOWLAN_IGTK_BIGTK_IDX_MASK)</div><div class='add'>+			+ WOWLAN_BIGTK_MIN_INDEX;</div><div class='add'>+</div><div class='add'>+		BUILD_BUG_ON(sizeof(wowlan_status-&gt;bigtk[status_idx].key) &lt;</div><div class='add'>+			     sizeof(bigtk[notif_idx].key));</div><div class='add'>+		if (bigtk[notif_idx].key_status == IWL_WOWLAN_STATUS_NEW_KEY)</div><div class='add'>+			memcpy(wowlan_status-&gt;bigtk[status_idx].key,</div><div class='add'>+			       bigtk[notif_idx].key,</div><div class='add'>+			       sizeof(bigtk[notif_idx].key));</div><div class='add'>+		else</div><div class='add'>+			/* If the key status is WOWLAN_STATUS_OLD_KEY, it</div><div class='add'>+			 * indicates that no key material is present. Set the</div><div class='add'>+			 * key length to 0 as an indication.</div><div class='add'>+			 */</div><div class='add'>+			wowlan_status-&gt;bigtk[status_idx].len = 0;</div><div class='add'>+</div><div class='add'>+		iwl_mld_convert_mcast_ipn(&amp;wowlan_status-&gt;bigtk[status_idx],</div><div class='add'>+					  &amp;bigtk[notif_idx]);</div><div class='add'>+		status_idx++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_convert_mlo_keys(struct iwl_mld *mld,</div><div class='add'>+			 const struct iwl_wowlan_info_notif *notif,</div><div class='add'>+			 struct iwl_mld_wowlan_status *wowlan_status)</div><div class='add'>+{</div><div class='add'>+	if (!notif-&gt;num_mlo_link_keys)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	wowlan_status-&gt;num_mlo_keys = notif-&gt;num_mlo_link_keys;</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, wowlan_status-&gt;num_mlo_keys &gt; WOWLAN_MAX_MLO_KEYS,</div><div class='add'>+			 "Too many MLO keys: %d, max %d\n",</div><div class='add'>+			 wowlan_status-&gt;num_mlo_keys, WOWLAN_MAX_MLO_KEYS))</div><div class='add'>+		wowlan_status-&gt;num_mlo_keys = WOWLAN_MAX_MLO_KEYS;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; wowlan_status-&gt;num_mlo_keys; i++) {</div><div class='add'>+		const struct iwl_wowlan_mlo_gtk *fw_mlo_key = &amp;notif-&gt;mlo_gtks[i];</div><div class='add'>+		struct iwl_mld_wowlan_mlo_key *driver_mlo_key =</div><div class='add'>+			&amp;wowlan_status-&gt;mlo_keys[i];</div><div class='add'>+		u16 flags = le16_to_cpu(fw_mlo_key-&gt;flags);</div><div class='add'>+</div><div class='add'>+		driver_mlo_key-&gt;link_id =</div><div class='add'>+			u16_get_bits(flags, WOWLAN_MLO_GTK_FLAG_LINK_ID_MSK);</div><div class='add'>+		driver_mlo_key-&gt;type =</div><div class='add'>+			u16_get_bits(flags, WOWLAN_MLO_GTK_FLAG_KEY_TYPE_MSK);</div><div class='add'>+		driver_mlo_key-&gt;idx =</div><div class='add'>+			u16_get_bits(flags, WOWLAN_MLO_GTK_FLAG_KEY_ID_MSK);</div><div class='add'>+</div><div class='add'>+		BUILD_BUG_ON(sizeof(driver_mlo_key-&gt;key) != sizeof(fw_mlo_key-&gt;key));</div><div class='add'>+		BUILD_BUG_ON(sizeof(driver_mlo_key-&gt;pn) != sizeof(fw_mlo_key-&gt;pn));</div><div class='add'>+</div><div class='add'>+		memcpy(driver_mlo_key-&gt;key, fw_mlo_key-&gt;key, sizeof(fw_mlo_key-&gt;key));</div><div class='add'>+		memcpy(driver_mlo_key-&gt;pn, fw_mlo_key-&gt;pn, sizeof(fw_mlo_key-&gt;pn));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_convert_wowlan_notif_v5(const struct iwl_wowlan_info_notif_v5 *notif_v5,</div><div class='add'>+				struct iwl_wowlan_info_notif *notif)</div><div class='add'>+{</div><div class='add'>+	/* Convert GTK from v3 to the new format */</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(notif-&gt;gtk) != ARRAY_SIZE(notif_v5-&gt;gtk));</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(notif_v5-&gt;gtk); i++) {</div><div class='add'>+		const struct iwl_wowlan_gtk_status_v3 *gtk_v3 = &amp;notif_v5-&gt;gtk[i];</div><div class='add'>+		struct iwl_wowlan_gtk_status *gtk = &amp;notif-&gt;gtk[i];</div><div class='add'>+</div><div class='add'>+		/* Copy key material and metadata */</div><div class='add'>+		BUILD_BUG_ON(sizeof(gtk-&gt;key) != sizeof(gtk_v3-&gt;key));</div><div class='add'>+		BUILD_BUG_ON(sizeof(gtk-&gt;tkip_mic_key) != sizeof(gtk_v3-&gt;tkip_mic_key));</div><div class='add'>+</div><div class='add'>+		memcpy(gtk-&gt;key, gtk_v3-&gt;key, sizeof(gtk_v3-&gt;key));</div><div class='add'>+</div><div class='add'>+		gtk-&gt;key_len = gtk_v3-&gt;key_len;</div><div class='add'>+		gtk-&gt;key_flags = gtk_v3-&gt;key_flags;</div><div class='add'>+</div><div class='add'>+		memcpy(gtk-&gt;tkip_mic_key, gtk_v3-&gt;tkip_mic_key,</div><div class='add'>+		       sizeof(gtk_v3-&gt;tkip_mic_key));</div><div class='add'>+		gtk-&gt;sc = gtk_v3-&gt;sc;</div><div class='add'>+</div><div class='add'>+		/* Set key_status based on whether key material is present.</div><div class='add'>+		 * in v5, a key is either invalid (should be skipped) or has</div><div class='add'>+		 * both meta data and the key itself.</div><div class='add'>+		 */</div><div class='add'>+		if (gtk_v3-&gt;key_len)</div><div class='add'>+			gtk-&gt;key_status = IWL_WOWLAN_STATUS_NEW_KEY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Convert IGTK from v1 to the new format, only one IGTK is passed by FW */</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct iwl_wowlan_igtk_status, key_status) !=</div><div class='add'>+		     sizeof(struct iwl_wowlan_igtk_status_v1));</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;notif-&gt;igtk[0], &amp;notif_v5-&gt;igtk[0],</div><div class='add'>+	       offsetof(struct iwl_wowlan_igtk_status, key_status));</div><div class='add'>+</div><div class='add'>+	/* Set key_status based on whether key material is present.</div><div class='add'>+	 * in v5, a key is either invalid (should be skipped) or has</div><div class='add'>+	 * both meta data and the key itself.</div><div class='add'>+	 */</div><div class='add'>+	if (notif_v5-&gt;igtk[0].key_len)</div><div class='add'>+		notif-&gt;igtk[0].key_status = IWL_WOWLAN_STATUS_NEW_KEY;</div><div class='add'>+</div><div class='add'>+	/* Convert BIGTK from v1 to the new format */</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(notif-&gt;bigtk) != ARRAY_SIZE(notif_v5-&gt;bigtk));</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(notif_v5-&gt;bigtk); i++) {</div><div class='add'>+		/* Copy everything until key_status */</div><div class='add'>+		memcpy(&amp;notif-&gt;bigtk[i], &amp;notif_v5-&gt;bigtk[i],</div><div class='add'>+		       offsetof(struct iwl_wowlan_igtk_status, key_status));</div><div class='add'>+</div><div class='add'>+		/* Set key_status based on whether key material is present.</div><div class='add'>+		 * in v5, a key is either invalid (should be skipped) or has</div><div class='add'>+		 * both meta data and the key itself.</div><div class='add'>+		 */</div><div class='add'>+		if (notif_v5-&gt;bigtk[i].key_len)</div><div class='add'>+			notif-&gt;bigtk[i].key_status = IWL_WOWLAN_STATUS_NEW_KEY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	notif-&gt;replay_ctr = notif_v5-&gt;replay_ctr;</div><div class='add'>+	notif-&gt;pattern_number = notif_v5-&gt;pattern_number;</div><div class='add'>+	notif-&gt;qos_seq_ctr = notif_v5-&gt;qos_seq_ctr;</div><div class='add'>+	notif-&gt;wakeup_reasons = notif_v5-&gt;wakeup_reasons;</div><div class='add'>+	notif-&gt;num_of_gtk_rekeys = notif_v5-&gt;num_of_gtk_rekeys;</div><div class='add'>+	notif-&gt;transmitted_ndps = notif_v5-&gt;transmitted_ndps;</div><div class='add'>+	notif-&gt;received_beacons = notif_v5-&gt;received_beacons;</div><div class='add'>+	notif-&gt;tid_tear_down = notif_v5-&gt;tid_tear_down;</div><div class='add'>+	notif-&gt;station_id = notif_v5-&gt;station_id;</div><div class='add'>+	notif-&gt;num_mlo_link_keys = notif_v5-&gt;num_mlo_link_keys;</div><div class='add'>+	notif-&gt;tid_offloaded_tx = notif_v5-&gt;tid_offloaded_tx;</div><div class='add'>+</div><div class='add'>+	/* Copy MLO GTK keys */</div><div class='add'>+	if (notif_v5-&gt;num_mlo_link_keys) {</div><div class='add'>+		memcpy(notif-&gt;mlo_gtks, notif_v5-&gt;mlo_gtks,</div><div class='add'>+		       notif_v5-&gt;num_mlo_link_keys * sizeof(struct iwl_wowlan_mlo_gtk));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_validate_wowlan_notif_size(struct iwl_mld *mld,</div><div class='add'>+					       u32 len,</div><div class='add'>+					       u32 expected_len,</div><div class='add'>+					       u8 num_mlo_keys,</div><div class='add'>+					       int version)</div><div class='add'>+{</div><div class='add'>+	u32 len_with_mlo_keys;</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, len &lt; expected_len,</div><div class='add'>+			 "Invalid wowlan_info_notif v%d (expected=%u got=%u)\n",</div><div class='add'>+			 version, expected_len, len))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	len_with_mlo_keys = expected_len +</div><div class='add'>+		(num_mlo_keys * sizeof(struct iwl_wowlan_mlo_gtk));</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, len &lt; len_with_mlo_keys,</div><div class='add'>+			 "Invalid wowlan_info_notif v%d with MLO keys (expected=%u got=%u)\n",</div><div class='add'>+			 version, len_with_mlo_keys, len))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+iwl_mld_handle_wowlan_info_notif(struct iwl_mld *mld,</div><div class='add'>+				 struct iwl_mld_wowlan_status *wowlan_status,</div><div class='add'>+				 struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_wowlan_info_notif *notif;</div><div class='add'>+	struct iwl_wowlan_info_notif *converted_notif __free(kfree) = NULL;</div><div class='add'>+	u32 len = iwl_rx_packet_payload_len(pkt);</div><div class='add'>+	int wowlan_info_ver = iwl_fw_lookup_notif_ver(mld-&gt;fw,</div><div class='add'>+						      PROT_OFFLOAD_GROUP,</div><div class='add'>+						      WOWLAN_INFO_NOTIFICATION,</div><div class='add'>+						      IWL_FW_CMD_VER_UNKNOWN);</div><div class='add'>+</div><div class='add'>+	if (wowlan_info_ver == 5) {</div><div class='add'>+		/* v5 format - validate before conversion */</div><div class='add'>+		const struct iwl_wowlan_info_notif_v5 *notif_v5 = (void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (!iwl_mld_validate_wowlan_notif_size(mld, len,</div><div class='add'>+							sizeof(*notif_v5),</div><div class='add'>+							notif_v5-&gt;num_mlo_link_keys,</div><div class='add'>+							5))</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+		converted_notif = kzalloc(struct_size(converted_notif,</div><div class='add'>+						      mlo_gtks,</div><div class='add'>+						      notif_v5-&gt;num_mlo_link_keys),</div><div class='add'>+					  GFP_ATOMIC);</div><div class='add'>+		if (!converted_notif) {</div><div class='add'>+			IWL_ERR(mld,</div><div class='add'>+				"Failed to allocate memory for converted wowlan_info_notif\n");</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		iwl_mld_convert_wowlan_notif_v5(notif_v5,</div><div class='add'>+						converted_notif);</div><div class='add'>+		notif = converted_notif;</div><div class='add'>+	} else if (wowlan_info_ver == 6) {</div><div class='add'>+		notif = (void *)pkt-&gt;data;</div><div class='add'>+		if (!iwl_mld_validate_wowlan_notif_size(mld, len,</div><div class='add'>+							sizeof(*notif),</div><div class='add'>+							notif-&gt;num_mlo_link_keys,</div><div class='add'>+							6))</div><div class='add'>+			return true;</div><div class='add'>+	} else {</div><div class='add'>+		/* smaller versions are not supported */</div><div class='add'>+		IWL_WARN(mld,</div><div class='add'>+			 "Unsupported wowlan_info_notif version %d\n",</div><div class='add'>+			 wowlan_info_ver);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, notif-&gt;tid_offloaded_tx != IWL_WOWLAN_OFFLOAD_TID,</div><div class='add'>+			 "Invalid tid_offloaded_tx %d\n",</div><div class='add'>+			 notif-&gt;tid_offloaded_tx))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	iwl_mld_convert_gtk_resume_data(mld, wowlan_status, notif-&gt;gtk,</div><div class='add'>+					&amp;notif-&gt;gtk[0].sc);</div><div class='add'>+	iwl_mld_convert_ptk_resume_seq(mld, wowlan_status, &amp;notif-&gt;gtk[0].sc);</div><div class='add'>+	/* only one igtk is passed by FW */</div><div class='add'>+	iwl_mld_convert_igtk_resume_data(wowlan_status, &amp;notif-&gt;igtk[0]);</div><div class='add'>+	iwl_mld_convert_bigtk_resume_data(wowlan_status, notif-&gt;bigtk);</div><div class='add'>+</div><div class='add'>+	wowlan_status-&gt;replay_ctr = le64_to_cpu(notif-&gt;replay_ctr);</div><div class='add'>+	wowlan_status-&gt;pattern_number = le16_to_cpu(notif-&gt;pattern_number);</div><div class='add'>+</div><div class='add'>+	wowlan_status-&gt;tid_offloaded_tx = notif-&gt;tid_offloaded_tx;</div><div class='add'>+	wowlan_status-&gt;last_qos_seq = le16_to_cpu(notif-&gt;qos_seq_ctr);</div><div class='add'>+	wowlan_status-&gt;num_of_gtk_rekeys =</div><div class='add'>+		le32_to_cpu(notif-&gt;num_of_gtk_rekeys);</div><div class='add'>+	wowlan_status-&gt;wakeup_reasons = le32_to_cpu(notif-&gt;wakeup_reasons);</div><div class='add'>+</div><div class='add'>+	iwl_mld_convert_mlo_keys(mld, notif, wowlan_status);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+iwl_mld_handle_wake_pkt_notif(struct iwl_mld *mld,</div><div class='add'>+			      struct iwl_mld_wowlan_status *wowlan_status,</div><div class='add'>+			      struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_wowlan_wake_pkt_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+	u32 actual_size, len = iwl_rx_packet_payload_len(pkt);</div><div class='add'>+	u32 expected_size = le32_to_cpu(notif-&gt;wake_packet_length);</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, len &lt; sizeof(*notif),</div><div class='add'>+			 "Invalid WoWLAN wake packet notification (expected size=%zu got=%u)\n",</div><div class='add'>+			 sizeof(*notif), len))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, !(wowlan_status-&gt;wakeup_reasons &amp;</div><div class='add'>+				IWL_WOWLAN_WAKEUP_REASON_HAS_WAKEUP_PKT),</div><div class='add'>+			 "Got wake packet but wakeup reason is %x\n",</div><div class='add'>+			 wowlan_status-&gt;wakeup_reasons))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	actual_size = len - offsetof(struct iwl_wowlan_wake_pkt_notif,</div><div class='add'>+				     wake_packet);</div><div class='add'>+</div><div class='add'>+	/* actual_size got the padding from the notification, remove it. */</div><div class='add'>+	if (expected_size &lt; actual_size)</div><div class='add'>+		actual_size = expected_size;</div><div class='add'>+	wowlan_status-&gt;wake_packet = kmemdup(notif-&gt;wake_packet, actual_size,</div><div class='add'>+					     GFP_ATOMIC);</div><div class='add'>+	if (!wowlan_status-&gt;wake_packet)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	wowlan_status-&gt;wake_packet_length = expected_size;</div><div class='add'>+	wowlan_status-&gt;wake_packet_bufsize = actual_size;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_set_wake_packet(struct iwl_mld *mld,</div><div class='add'>+			struct ieee80211_vif *vif,</div><div class='add'>+			const struct iwl_mld_wowlan_status *wowlan_status,</div><div class='add'>+			struct cfg80211_wowlan_wakeup *wakeup,</div><div class='add'>+			struct sk_buff **_pkt)</div><div class='add'>+{</div><div class='add'>+	int pkt_bufsize = wowlan_status-&gt;wake_packet_bufsize;</div><div class='add'>+	int expected_pktlen = wowlan_status-&gt;wake_packet_length;</div><div class='add'>+	const u8 *pktdata = wowlan_status-&gt;wake_packet;</div><div class='add'>+	const struct ieee80211_hdr *hdr = (const void *)pktdata;</div><div class='add'>+	int truncated = expected_pktlen - pkt_bufsize;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_data(hdr-&gt;frame_control)) {</div><div class='add'>+		int hdrlen = ieee80211_hdrlen(hdr-&gt;frame_control);</div><div class='add'>+		int ivlen = 0, icvlen = 4; /* also FCS */</div><div class='add'>+</div><div class='add'>+		struct sk_buff *pkt = alloc_skb(pkt_bufsize, GFP_KERNEL);</div><div class='add'>+		*_pkt = pkt;</div><div class='add'>+		if (!pkt)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		skb_put_data(pkt, pktdata, hdrlen);</div><div class='add'>+		pktdata += hdrlen;</div><div class='add'>+		pkt_bufsize -= hdrlen;</div><div class='add'>+</div><div class='add'>+		/* if truncated, FCS/ICV is (partially) gone */</div><div class='add'>+		if (truncated &gt;= icvlen) {</div><div class='add'>+			truncated -= icvlen;</div><div class='add'>+			icvlen = 0;</div><div class='add'>+		} else {</div><div class='add'>+			icvlen -= truncated;</div><div class='add'>+			truncated = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pkt_bufsize -= ivlen + icvlen;</div><div class='add'>+		pktdata += ivlen;</div><div class='add'>+</div><div class='add'>+		skb_put_data(pkt, pktdata, pkt_bufsize);</div><div class='add'>+</div><div class='add'>+		if (ieee80211_data_to_8023(pkt, vif-&gt;addr, vif-&gt;type))</div><div class='add'>+			return;</div><div class='add'>+		wakeup-&gt;packet = pkt-&gt;data;</div><div class='add'>+		wakeup-&gt;packet_present_len = pkt-&gt;len;</div><div class='add'>+		wakeup-&gt;packet_len = pkt-&gt;len - truncated;</div><div class='add'>+		wakeup-&gt;packet_80211 = false;</div><div class='add'>+	} else {</div><div class='add'>+		int fcslen = 4;</div><div class='add'>+</div><div class='add'>+		if (truncated &gt;= 4) {</div><div class='add'>+			truncated -= 4;</div><div class='add'>+			fcslen = 0;</div><div class='add'>+		} else {</div><div class='add'>+			fcslen -= truncated;</div><div class='add'>+			truncated = 0;</div><div class='add'>+		}</div><div class='add'>+		pkt_bufsize -= fcslen;</div><div class='add'>+		wakeup-&gt;packet = wowlan_status-&gt;wake_packet;</div><div class='add'>+		wakeup-&gt;packet_present_len = pkt_bufsize;</div><div class='add'>+		wakeup-&gt;packet_len = expected_pktlen - truncated;</div><div class='add'>+		wakeup-&gt;packet_80211 = true;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_report_wowlan_wakeup(struct iwl_mld *mld,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     struct iwl_mld_wowlan_status *wowlan_status)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *pkt = NULL;</div><div class='add'>+	struct cfg80211_wowlan_wakeup wakeup = {</div><div class='add'>+		.pattern_idx = -1,</div><div class='add'>+	};</div><div class='add'>+	u32 reasons = wowlan_status-&gt;wakeup_reasons;</div><div class='add'>+</div><div class='add'>+	if (reasons == IWL_WOWLAN_WAKEUP_BY_NON_WIRELESS) {</div><div class='add'>+		ieee80211_report_wowlan_wakeup(vif, NULL, GFP_KERNEL);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pm_wakeup_event(mld-&gt;dev, 0);</div><div class='add'>+</div><div class='add'>+	if (reasons &amp; IWL_WOWLAN_WAKEUP_BY_MAGIC_PACKET)</div><div class='add'>+		wakeup.magic_pkt = true;</div><div class='add'>+</div><div class='add'>+	if (reasons &amp; IWL_WOWLAN_WAKEUP_BY_PATTERN)</div><div class='add'>+		wakeup.pattern_idx =</div><div class='add'>+			wowlan_status-&gt;pattern_number;</div><div class='add'>+</div><div class='add'>+	if (reasons &amp; (IWL_WOWLAN_WAKEUP_BY_DISCONNECTION_ON_MISSED_BEACON |</div><div class='add'>+		       IWL_WOWLAN_WAKEUP_BY_DISCONNECTION_ON_DEAUTH |</div><div class='add'>+		       IWL_WOWLAN_WAKEUP_BY_GTK_REKEY_FAILURE))</div><div class='add'>+		wakeup.disconnect = true;</div><div class='add'>+</div><div class='add'>+	if (reasons &amp; IWL_WOWLAN_WAKEUP_BY_GTK_REKEY_FAILURE)</div><div class='add'>+		wakeup.gtk_rekey_failure = true;</div><div class='add'>+</div><div class='add'>+	if (reasons &amp; IWL_WOWLAN_WAKEUP_BY_RFKILL_DEASSERTED)</div><div class='add'>+		wakeup.rfkill_release = true;</div><div class='add'>+</div><div class='add'>+	if (reasons &amp; IWL_WOWLAN_WAKEUP_BY_EAPOL_REQUEST)</div><div class='add'>+		wakeup.eap_identity_req = true;</div><div class='add'>+</div><div class='add'>+	if (reasons &amp; IWL_WOWLAN_WAKEUP_BY_FOUR_WAY_HANDSHAKE)</div><div class='add'>+		wakeup.four_way_handshake = true;</div><div class='add'>+</div><div class='add'>+	if (reasons &amp; IWL_WOWLAN_WAKEUP_BY_REM_WAKE_LINK_LOSS)</div><div class='add'>+		wakeup.tcp_connlost = true;</div><div class='add'>+</div><div class='add'>+	if (reasons &amp; IWL_WOWLAN_WAKEUP_BY_REM_WAKE_SIGNATURE_TABLE)</div><div class='add'>+		wakeup.tcp_nomoretokens = true;</div><div class='add'>+</div><div class='add'>+	if (reasons &amp; IWL_WOWLAN_WAKEUP_BY_REM_WAKE_WAKEUP_PACKET)</div><div class='add'>+		wakeup.tcp_match = true;</div><div class='add'>+</div><div class='add'>+	if (reasons &amp; IWL_WAKEUP_BY_11W_UNPROTECTED_DEAUTH_OR_DISASSOC)</div><div class='add'>+		wakeup.unprot_deauth_disassoc = true;</div><div class='add'>+</div><div class='add'>+	if (wowlan_status-&gt;wake_packet)</div><div class='add'>+		iwl_mld_set_wake_packet(mld, vif, wowlan_status, &amp;wakeup, &amp;pkt);</div><div class='add'>+</div><div class='add'>+	ieee80211_report_wowlan_wakeup(vif, &amp;wakeup, GFP_KERNEL);</div><div class='add'>+	kfree_skb(pkt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_set_key_rx_seq_tids(struct ieee80211_key_conf *key,</div><div class='add'>+			    struct ieee80211_key_seq *seq)</div><div class='add'>+{</div><div class='add'>+	int tid;</div><div class='add'>+</div><div class='add'>+	for (tid = 0; tid &lt; IWL_MAX_TID_COUNT; tid++)</div><div class='add'>+		ieee80211_set_key_rx_seq(key, tid, &amp;seq[tid]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_update_mcast_rx_seq(struct ieee80211_key_conf *key,</div><div class='add'>+			    struct iwl_mld_mcast_key_data *key_data)</div><div class='add'>+{</div><div class='add'>+	switch (key-&gt;cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='add'>+		iwl_mld_set_key_rx_seq_tids(key,</div><div class='add'>+					    key_data-&gt;gtk.aes_seq);</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		iwl_mld_set_key_rx_seq_tids(key,</div><div class='add'>+					    key_data-&gt;gtk.tkip_seq);</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_GMAC_128:</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_GMAC_256:</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_CMAC_256:</div><div class='add'>+	case WLAN_CIPHER_SUITE_AES_CMAC:</div><div class='add'>+		/* igtk/bigtk ciphers*/</div><div class='add'>+		ieee80211_set_key_rx_seq(key, 0,</div><div class='add'>+					 &amp;key_data-&gt;igtk_bigtk.cmac_gmac_seq);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_update_ptk_rx_seq(struct iwl_mld *mld,</div><div class='add'>+			  struct iwl_mld_wowlan_status *wowlan_status,</div><div class='add'>+			  struct ieee80211_sta *sta,</div><div class='add'>+			  struct ieee80211_key_conf *key,</div><div class='add'>+			  bool is_tkip)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sta *mld_sta =</div><div class='add'>+		iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+	struct iwl_mld_ptk_pn *mld_ptk_pn =</div><div class='add'>+		wiphy_dereference(mld-&gt;wiphy,</div><div class='add'>+				  mld_sta-&gt;ptk_pn[key-&gt;keyidx]);</div><div class='add'>+</div><div class='add'>+	iwl_mld_set_key_rx_seq_tids(key, is_tkip ?</div><div class='add'>+				    wowlan_status-&gt;ptk.tkip_seq :</div><div class='add'>+				    wowlan_status-&gt;ptk.aes_seq);</div><div class='add'>+	if (is_tkip)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mld_ptk_pn))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (int tid = 0; tid &lt; IWL_MAX_TID_COUNT; tid++) {</div><div class='add'>+		for (int i = 1; i &lt; mld-&gt;trans-&gt;info.num_rxqs; i++)</div><div class='add'>+			memcpy(mld_ptk_pn-&gt;q[i].pn[tid],</div><div class='add'>+			       wowlan_status-&gt;ptk.aes_seq[tid].ccmp.pn,</div><div class='add'>+			       IEEE80211_CCMP_PN_LEN);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_resume_keys_iter(struct ieee80211_hw *hw,</div><div class='add'>+			 struct ieee80211_vif *vif,</div><div class='add'>+			 struct ieee80211_sta *sta,</div><div class='add'>+			 struct ieee80211_key_conf *key,</div><div class='add'>+			 void *_data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_resume_key_iter_data *data = _data;</div><div class='add'>+	struct iwl_mld_wowlan_status *wowlan_status = data-&gt;wowlan_status;</div><div class='add'>+	u8 status_idx;</div><div class='add'>+</div><div class='add'>+	if (key-&gt;keyidx &gt;= 0 &amp;&amp; key-&gt;keyidx &lt;= 3) {</div><div class='add'>+		/* PTK */</div><div class='add'>+		if (sta) {</div><div class='add'>+			iwl_mld_update_ptk_rx_seq(data-&gt;mld, wowlan_status,</div><div class='add'>+						  sta, key,</div><div class='add'>+						  key-&gt;cipher ==</div><div class='add'>+						  WLAN_CIPHER_SUITE_TKIP);</div><div class='add'>+		/* GTK */</div><div class='add'>+		} else {</div><div class='add'>+			status_idx = key-&gt;keyidx == wowlan_status-&gt;gtk[1].id;</div><div class='add'>+			iwl_mld_update_mcast_rx_seq(key,</div><div class='add'>+						    &amp;wowlan_status-&gt;gtk[status_idx]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* IGTK */</div><div class='add'>+	if (key-&gt;keyidx == 4 || key-&gt;keyidx == 5) {</div><div class='add'>+		if (key-&gt;keyidx == wowlan_status-&gt;igtk.id)</div><div class='add'>+			iwl_mld_update_mcast_rx_seq(key, &amp;wowlan_status-&gt;igtk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* BIGTK */</div><div class='add'>+	if (key-&gt;keyidx == 6 || key-&gt;keyidx == 7) {</div><div class='add'>+		status_idx = key-&gt;keyidx == wowlan_status-&gt;bigtk[1].id;</div><div class='add'>+		iwl_mld_update_mcast_rx_seq(key,</div><div class='add'>+					    &amp;wowlan_status-&gt;bigtk[status_idx]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_add_mcast_rekey(struct ieee80211_vif *vif,</div><div class='add'>+			struct iwl_mld *mld,</div><div class='add'>+			struct iwl_mld_mcast_key_data *key_data,</div><div class='add'>+			struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_key_conf *key_config;</div><div class='add'>+	int link_id = vif-&gt;active_links ? __ffs(vif-&gt;active_links) : -1;</div><div class='add'>+</div><div class='add'>+	if (!key_data-&gt;len)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	key_config = ieee80211_gtk_rekey_add(vif, key_data-&gt;id, key_data-&gt;key,</div><div class='add'>+					     sizeof(key_data-&gt;key), link_id);</div><div class='add'>+	if (IS_ERR(key_config))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mld_update_mcast_rx_seq(key_config, key_data);</div><div class='add'>+</div><div class='add'>+	/* The FW holds only one igtk so we keep track of the valid one */</div><div class='add'>+	if (key_config-&gt;keyidx == 4 || key_config-&gt;keyidx == 5) {</div><div class='add'>+		struct iwl_mld_link *mld_link =</div><div class='add'>+			iwl_mld_link_from_mac80211(link_conf);</div><div class='add'>+</div><div class='add'>+		/* If we had more than one rekey, mac80211 will tell us to</div><div class='add'>+		 * remove the old and add the new so we will update the IGTK in</div><div class='add'>+		 * drv_set_key</div><div class='add'>+		 */</div><div class='add'>+		if (mld_link-&gt;igtk &amp;&amp; mld_link-&gt;igtk != key_config) {</div><div class='add'>+			/* mark the old IGTK as not in FW */</div><div class='add'>+			mld_link-&gt;igtk-&gt;hw_key_idx = STA_KEY_IDX_INVALID;</div><div class='add'>+			mld_link-&gt;igtk = key_config;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Also keep track of the new BIGTK */</div><div class='add'>+	if (key_config-&gt;keyidx == 6 || key_config-&gt;keyidx == 7)</div><div class='add'>+		iwl_mld_track_bigtk(mld, vif, key_config, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_add_all_rekeys(struct iwl_mld *mld,</div><div class='add'>+		       struct ieee80211_vif *vif,</div><div class='add'>+		       struct iwl_mld_wowlan_status *wowlan_status,</div><div class='add'>+		       struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(wowlan_status-&gt;gtk); i++)</div><div class='add'>+		iwl_mld_add_mcast_rekey(vif, mld, &amp;wowlan_status-&gt;gtk[i],</div><div class='add'>+					link_conf);</div><div class='add'>+</div><div class='add'>+	iwl_mld_add_mcast_rekey(vif, mld, &amp;wowlan_status-&gt;igtk, link_conf);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(wowlan_status-&gt;bigtk); i++)</div><div class='add'>+		iwl_mld_add_mcast_rekey(vif, mld, &amp;wowlan_status-&gt;bigtk[i],</div><div class='add'>+					link_conf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_mlo_rekey(struct iwl_mld *mld,</div><div class='add'>+			      struct iwl_mld_wowlan_status *wowlan_status,</div><div class='add'>+			      struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_old_mlo_keys *old_keys __free(kfree) = NULL;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_WOWLAN(mld, "Num of MLO Keys: %d\n", wowlan_status-&gt;num_mlo_keys);</div><div class='add'>+</div><div class='add'>+	if (!wowlan_status-&gt;num_mlo_keys)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; wowlan_status-&gt;num_mlo_keys; i++) {</div><div class='add'>+		struct iwl_mld_wowlan_mlo_key *mlo_key = &amp;wowlan_status-&gt;mlo_keys[i];</div><div class='add'>+		struct ieee80211_key_conf *key;</div><div class='add'>+		struct ieee80211_key_seq seq;</div><div class='add'>+		u8 link_id = mlo_key-&gt;link_id;</div><div class='add'>+</div><div class='add'>+		if (IWL_FW_CHECK(mld, mlo_key-&gt;link_id &gt;= IEEE80211_MLD_MAX_NUM_LINKS ||</div><div class='add'>+				      mlo_key-&gt;idx &gt;= 8 ||</div><div class='add'>+				      mlo_key-&gt;type &gt;= WOWLAN_MLO_GTK_KEY_NUM_TYPES,</div><div class='add'>+				      "Invalid MLO key link_id %d, idx %d, type %d\n",</div><div class='add'>+				      mlo_key-&gt;link_id, mlo_key-&gt;idx, mlo_key-&gt;type))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!(vif-&gt;valid_links &amp; BIT(link_id)) ||</div><div class='add'>+		    (vif-&gt;active_links &amp; BIT(link_id)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		IWL_DEBUG_WOWLAN(mld, "Add MLO key id %d, link id %d\n",</div><div class='add'>+				 mlo_key-&gt;idx, link_id);</div><div class='add'>+</div><div class='add'>+		key = ieee80211_gtk_rekey_add(vif, mlo_key-&gt;idx, mlo_key-&gt;key,</div><div class='add'>+					      sizeof(mlo_key-&gt;key), link_id);</div><div class='add'>+</div><div class='add'>+		if (IS_ERR(key))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * mac80211 expects the PN in big-endian</div><div class='add'>+		 * also note that seq is a union of all cipher types</div><div class='add'>+		 * (ccmp, gcmp, cmac, gmac), and they all have the same</div><div class='add'>+		 * pn field (of length 6) so just copy it to ccmp.pn.</div><div class='add'>+		 */</div><div class='add'>+		for (int j = 5; j &gt;= 0; j--)</div><div class='add'>+			seq.ccmp.pn[5 - j] = mlo_key-&gt;pn[j];</div><div class='add'>+</div><div class='add'>+		/* group keys are non-QoS and use TID 0 */</div><div class='add'>+		ieee80211_set_key_rx_seq(key, 0, &amp;seq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+iwl_mld_update_sec_keys(struct iwl_mld *mld,</div><div class='add'>+			struct ieee80211_vif *vif,</div><div class='add'>+			struct iwl_mld_wowlan_status *wowlan_status)</div><div class='add'>+{</div><div class='add'>+	int link_id = vif-&gt;active_links ? __ffs(vif-&gt;active_links) : 0;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf =</div><div class='add'>+		link_conf_dereference_protected(vif, link_id);</div><div class='add'>+	__be64 replay_ctr = cpu_to_be64(wowlan_status-&gt;replay_ctr);</div><div class='add'>+	struct iwl_mld_resume_key_iter_data key_iter_data = {</div><div class='add'>+		.mld = mld,</div><div class='add'>+		.wowlan_status = wowlan_status,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!link_conf))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	ieee80211_iter_keys(mld-&gt;hw, vif, iwl_mld_resume_keys_iter,</div><div class='add'>+			    &amp;key_iter_data);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_WOWLAN(mld, "Number of rekeys: %d\n",</div><div class='add'>+			 wowlan_status-&gt;num_of_gtk_rekeys);</div><div class='add'>+</div><div class='add'>+	if (!wowlan_status-&gt;num_of_gtk_rekeys)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	iwl_mld_add_all_rekeys(mld, vif, wowlan_status,</div><div class='add'>+			       link_conf);</div><div class='add'>+</div><div class='add'>+	iwl_mld_mlo_rekey(mld, wowlan_status, vif);</div><div class='add'>+</div><div class='add'>+	ieee80211_gtk_rekey_notify(vif, link_conf-&gt;bssid,</div><div class='add'>+				   (void *)&amp;replay_ctr, GFP_KERNEL);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+iwl_mld_process_wowlan_status(struct iwl_mld *mld,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      struct iwl_mld_wowlan_status *wowlan_status)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct ieee80211_sta *ap_sta = mld_vif-&gt;ap_sta;</div><div class='add'>+	struct iwl_mld_txq *mld_txq;</div><div class='add'>+</div><div class='add'>+	iwl_mld_report_wowlan_wakeup(mld, vif, wowlan_status);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!ap_sta))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	mld_txq =</div><div class='add'>+		iwl_mld_txq_from_mac80211(ap_sta-&gt;txq[wowlan_status-&gt;tid_offloaded_tx]);</div><div class='add'>+</div><div class='add'>+	/* Update the pointers of the Tx queue that may have moved during</div><div class='add'>+	 * suspend if the firmware sent frames.</div><div class='add'>+	 * The firmware stores last-used value, we store next value.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON(!mld_txq-&gt;status.allocated);</div><div class='add'>+	iwl_trans_set_q_ptrs(mld-&gt;trans, mld_txq-&gt;fw_id,</div><div class='add'>+			     (wowlan_status-&gt;last_qos_seq +</div><div class='add'>+			     0x10) &gt;&gt; 4);</div><div class='add'>+</div><div class='add'>+	if (!iwl_mld_update_sec_keys(mld, vif, wowlan_status))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (wowlan_status-&gt;wakeup_reasons &amp;</div><div class='add'>+	    (IWL_WOWLAN_WAKEUP_BY_DISCONNECTION_ON_MISSED_BEACON |</div><div class='add'>+	     IWL_WOWLAN_WAKEUP_BY_DISCONNECTION_ON_DEAUTH |</div><div class='add'>+	     IWL_WOWLAN_WAKEUP_BY_GTK_REKEY_FAILURE))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+iwl_mld_netdetect_match_info_handler(struct iwl_mld *mld,</div><div class='add'>+				     struct iwl_mld_resume_data *resume_data,</div><div class='add'>+				     struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_netdetect_res *results = resume_data-&gt;netdetect_res;</div><div class='add'>+	const struct iwl_scan_offload_match_info *notif = (void *)pkt-&gt;data;</div><div class='add'>+	u32 len = iwl_rx_packet_payload_len(pkt);</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, !mld-&gt;netdetect,</div><div class='add'>+			 "Got scan match info notif when mld-&gt;netdetect==%d\n",</div><div class='add'>+			 mld-&gt;netdetect))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, len &lt; sizeof(*notif),</div><div class='add'>+			 "Invalid scan offload match notif of length: %d\n",</div><div class='add'>+			 len))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, resume_data-&gt;wowlan_status-&gt;wakeup_reasons !=</div><div class='add'>+			 IWL_WOWLAN_WAKEUP_BY_NON_WIRELESS,</div><div class='add'>+			 "Ignore scan match info: unexpected wakeup reason (expected=0x%x got=0x%x)\n",</div><div class='add'>+			 IWL_WOWLAN_WAKEUP_BY_NON_WIRELESS,</div><div class='add'>+			 resume_data-&gt;wowlan_status-&gt;wakeup_reasons))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	results-&gt;matched_profiles = le32_to_cpu(notif-&gt;matched_profiles);</div><div class='add'>+	IWL_DEBUG_WOWLAN(mld, "number of matched profiles=%u\n",</div><div class='add'>+			 results-&gt;matched_profiles);</div><div class='add'>+</div><div class='add'>+	if (results-&gt;matched_profiles)</div><div class='add'>+		memcpy(results-&gt;matches, notif-&gt;matches,</div><div class='add'>+		       NETDETECT_QUERY_BUF_LEN);</div><div class='add'>+</div><div class='add'>+	/* No scan should be active at this point */</div><div class='add'>+	mld-&gt;scan.status = 0;</div><div class='add'>+	memset(mld-&gt;scan.uid_status, 0, sizeof(mld-&gt;scan.uid_status));</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_set_netdetect_info(struct iwl_mld *mld,</div><div class='add'>+			   const struct cfg80211_sched_scan_request *netdetect_cfg,</div><div class='add'>+			   struct cfg80211_wowlan_nd_info *netdetect_info,</div><div class='add'>+			   struct iwl_mld_netdetect_res *netdetect_res,</div><div class='add'>+			   unsigned long matched_profiles)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(i, &amp;matched_profiles, netdetect_cfg-&gt;n_match_sets) {</div><div class='add'>+		struct cfg80211_wowlan_nd_match *match;</div><div class='add'>+		int idx, j, n_channels = 0;</div><div class='add'>+		struct iwl_scan_offload_profile_match *matches =</div><div class='add'>+			(void *)netdetect_res-&gt;matches;</div><div class='add'>+</div><div class='add'>+		for (int k = 0; k &lt; SCAN_OFFLOAD_MATCHING_CHANNELS_LEN; k++)</div><div class='add'>+			n_channels +=</div><div class='add'>+				hweight8(matches[i].matching_channels[k]);</div><div class='add'>+		match = kzalloc(struct_size(match, channels, n_channels),</div><div class='add'>+				GFP_KERNEL);</div><div class='add'>+		if (!match)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		netdetect_info-&gt;matches[netdetect_info-&gt;n_matches] = match;</div><div class='add'>+		netdetect_info-&gt;n_matches++;</div><div class='add'>+</div><div class='add'>+		/* We inverted the order of the SSIDs in the scan</div><div class='add'>+		 * request, so invert the index here.</div><div class='add'>+		 */</div><div class='add'>+		idx = netdetect_cfg-&gt;n_match_sets - i - 1;</div><div class='add'>+		match-&gt;ssid.ssid_len =</div><div class='add'>+			netdetect_cfg-&gt;match_sets[idx].ssid.ssid_len;</div><div class='add'>+		memcpy(match-&gt;ssid.ssid,</div><div class='add'>+		       netdetect_cfg-&gt;match_sets[idx].ssid.ssid,</div><div class='add'>+		       match-&gt;ssid.ssid_len);</div><div class='add'>+</div><div class='add'>+		if (netdetect_cfg-&gt;n_channels &lt; n_channels)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for_each_set_bit(j,</div><div class='add'>+				 (unsigned long *)&amp;matches[i].matching_channels[0],</div><div class='add'>+				 sizeof(matches[i].matching_channels)) {</div><div class='add'>+			match-&gt;channels[match-&gt;n_channels] =</div><div class='add'>+				netdetect_cfg-&gt;channels[j]-&gt;center_freq;</div><div class='add'>+			match-&gt;n_channels++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_process_netdetect_res(struct iwl_mld *mld,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      struct iwl_mld_resume_data *resume_data)</div><div class='add'>+{</div><div class='add'>+	struct cfg80211_wowlan_nd_info *netdetect_info = NULL;</div><div class='add'>+	const struct cfg80211_sched_scan_request *netdetect_cfg;</div><div class='add'>+	struct cfg80211_wowlan_wakeup wakeup = {</div><div class='add'>+		.pattern_idx = -1,</div><div class='add'>+	};</div><div class='add'>+	struct cfg80211_wowlan_wakeup *wakeup_report = &amp;wakeup;</div><div class='add'>+	unsigned long matched_profiles;</div><div class='add'>+	u32 wakeup_reasons;</div><div class='add'>+	int n_matches;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mld-&gt;wiphy-&gt;wowlan_config ||</div><div class='add'>+		    !mld-&gt;wiphy-&gt;wowlan_config-&gt;nd_config)) {</div><div class='add'>+		IWL_DEBUG_WOWLAN(mld,</div><div class='add'>+				 "Netdetect isn't configured on resume flow\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdetect_cfg = mld-&gt;wiphy-&gt;wowlan_config-&gt;nd_config;</div><div class='add'>+	wakeup_reasons = resume_data-&gt;wowlan_status-&gt;wakeup_reasons;</div><div class='add'>+</div><div class='add'>+	if (wakeup_reasons &amp; IWL_WOWLAN_WAKEUP_BY_RFKILL_DEASSERTED)</div><div class='add'>+		wakeup.rfkill_release = true;</div><div class='add'>+</div><div class='add'>+	if (wakeup_reasons != IWL_WOWLAN_WAKEUP_BY_NON_WIRELESS)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!resume_data-&gt;netdetect_res-&gt;matched_profiles) {</div><div class='add'>+		IWL_DEBUG_WOWLAN(mld,</div><div class='add'>+				 "Netdetect results aren't valid\n");</div><div class='add'>+		wakeup_report = NULL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	matched_profiles = resume_data-&gt;netdetect_res-&gt;matched_profiles;</div><div class='add'>+	if (!netdetect_cfg-&gt;n_match_sets) {</div><div class='add'>+		IWL_DEBUG_WOWLAN(mld,</div><div class='add'>+				 "No netdetect match sets are configured\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	n_matches = hweight_long(matched_profiles);</div><div class='add'>+	netdetect_info = kzalloc(struct_size(netdetect_info, matches,</div><div class='add'>+					     n_matches), GFP_KERNEL);</div><div class='add'>+	if (netdetect_info)</div><div class='add'>+		iwl_mld_set_netdetect_info(mld, netdetect_cfg, netdetect_info,</div><div class='add'>+					   resume_data-&gt;netdetect_res,</div><div class='add'>+					   matched_profiles);</div><div class='add'>+</div><div class='add'>+	wakeup.net_detect = netdetect_info;</div><div class='add'>+ out:</div><div class='add'>+	ieee80211_report_wowlan_wakeup(vif, wakeup_report, GFP_KERNEL);</div><div class='add'>+	if (netdetect_info) {</div><div class='add'>+		for (int i = 0; i &lt; netdetect_info-&gt;n_matches; i++)</div><div class='add'>+			kfree(netdetect_info-&gt;matches[i]);</div><div class='add'>+		kfree(netdetect_info);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_handle_d3_notif(struct iwl_notif_wait_data *notif_wait,</div><div class='add'>+				    struct iwl_rx_packet *pkt, void *data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_resume_data *resume_data = data;</div><div class='add'>+	struct iwl_mld *mld =</div><div class='add'>+		container_of(notif_wait, struct iwl_mld, notif_wait);</div><div class='add'>+</div><div class='add'>+	switch (WIDE_ID(pkt-&gt;hdr.group_id, pkt-&gt;hdr.cmd)) {</div><div class='add'>+	case WIDE_ID(PROT_OFFLOAD_GROUP, WOWLAN_INFO_NOTIFICATION): {</div><div class='add'>+		if (resume_data-&gt;notifs_received &amp; IWL_D3_NOTIF_WOWLAN_INFO) {</div><div class='add'>+			IWL_DEBUG_WOWLAN(mld,</div><div class='add'>+					 "got additional wowlan_info notif\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		resume_data-&gt;notif_handling_err =</div><div class='add'>+			iwl_mld_handle_wowlan_info_notif(mld,</div><div class='add'>+							 resume_data-&gt;wowlan_status,</div><div class='add'>+							 pkt);</div><div class='add'>+		resume_data-&gt;notifs_received |= IWL_D3_NOTIF_WOWLAN_INFO;</div><div class='add'>+</div><div class='add'>+		if (resume_data-&gt;wowlan_status-&gt;wakeup_reasons &amp;</div><div class='add'>+		    IWL_WOWLAN_WAKEUP_REASON_HAS_WAKEUP_PKT)</div><div class='add'>+			resume_data-&gt;notifs_expected |=</div><div class='add'>+				IWL_D3_NOTIF_WOWLAN_WAKE_PKT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case WIDE_ID(PROT_OFFLOAD_GROUP, WOWLAN_WAKE_PKT_NOTIFICATION): {</div><div class='add'>+		if (resume_data-&gt;notifs_received &amp;</div><div class='add'>+		    IWL_D3_NOTIF_WOWLAN_WAKE_PKT) {</div><div class='add'>+			/* We shouldn't get two wake packet notifications */</div><div class='add'>+			IWL_DEBUG_WOWLAN(mld,</div><div class='add'>+					 "Got additional wowlan wake packet notification\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		resume_data-&gt;notif_handling_err =</div><div class='add'>+			iwl_mld_handle_wake_pkt_notif(mld,</div><div class='add'>+						      resume_data-&gt;wowlan_status,</div><div class='add'>+						      pkt);</div><div class='add'>+		resume_data-&gt;notifs_received |= IWL_D3_NOTIF_WOWLAN_WAKE_PKT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case WIDE_ID(SCAN_GROUP, OFFLOAD_MATCH_INFO_NOTIF): {</div><div class='add'>+		if (resume_data-&gt;notifs_received &amp; IWL_D3_ND_MATCH_INFO) {</div><div class='add'>+			IWL_ERR(mld,</div><div class='add'>+				"Got additional netdetect match info\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		resume_data-&gt;notif_handling_err =</div><div class='add'>+			iwl_mld_netdetect_match_info_handler(mld, resume_data,</div><div class='add'>+							     pkt);</div><div class='add'>+		resume_data-&gt;notifs_received |= IWL_D3_ND_MATCH_INFO;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case WIDE_ID(PROT_OFFLOAD_GROUP, D3_END_NOTIFICATION): {</div><div class='add'>+		struct iwl_d3_end_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+		resume_data-&gt;d3_end_flags = le32_to_cpu(notif-&gt;flags);</div><div class='add'>+		resume_data-&gt;notifs_received |= IWL_D3_NOTIF_D3_END_NOTIF;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return resume_data-&gt;notifs_received == resume_data-&gt;notifs_expected;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_D3_NOTIF_TIMEOUT (HZ / 3)</div><div class='add'>+</div><div class='add'>+static int iwl_mld_wait_d3_notif(struct iwl_mld *mld,</div><div class='add'>+				 struct iwl_mld_resume_data *resume_data,</div><div class='add'>+				 bool with_wowlan)</div><div class='add'>+{</div><div class='add'>+	static const u16 wowlan_resume_notif[] = {</div><div class='add'>+		WIDE_ID(PROT_OFFLOAD_GROUP, WOWLAN_INFO_NOTIFICATION),</div><div class='add'>+		WIDE_ID(PROT_OFFLOAD_GROUP, WOWLAN_WAKE_PKT_NOTIFICATION),</div><div class='add'>+		WIDE_ID(SCAN_GROUP, OFFLOAD_MATCH_INFO_NOTIF),</div><div class='add'>+		WIDE_ID(PROT_OFFLOAD_GROUP, D3_END_NOTIFICATION)</div><div class='add'>+	};</div><div class='add'>+	static const u16 d3_resume_notif[] = {</div><div class='add'>+		WIDE_ID(PROT_OFFLOAD_GROUP, D3_END_NOTIFICATION)</div><div class='add'>+	};</div><div class='add'>+	struct iwl_notification_wait wait_d3_notif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (with_wowlan)</div><div class='add'>+		iwl_init_notification_wait(&amp;mld-&gt;notif_wait, &amp;wait_d3_notif,</div><div class='add'>+					   wowlan_resume_notif,</div><div class='add'>+					   ARRAY_SIZE(wowlan_resume_notif),</div><div class='add'>+					   iwl_mld_handle_d3_notif,</div><div class='add'>+					   resume_data);</div><div class='add'>+	else</div><div class='add'>+		iwl_init_notification_wait(&amp;mld-&gt;notif_wait, &amp;wait_d3_notif,</div><div class='add'>+					   d3_resume_notif,</div><div class='add'>+					   ARRAY_SIZE(d3_resume_notif),</div><div class='add'>+					   iwl_mld_handle_d3_notif,</div><div class='add'>+					   resume_data);</div><div class='add'>+</div><div class='add'>+	ret = iwl_trans_d3_resume(mld-&gt;trans, false);</div><div class='add'>+	if (ret) {</div><div class='add'>+		/* Avoid sending commands if the FW is dead */</div><div class='add'>+		iwl_trans_notify_fw_error(mld-&gt;trans);</div><div class='add'>+		iwl_remove_notification(&amp;mld-&gt;notif_wait, &amp;wait_d3_notif);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_wait_notification(&amp;mld-&gt;notif_wait, &amp;wait_d3_notif,</div><div class='add'>+				    IWL_MLD_D3_NOTIF_TIMEOUT);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mld, "Couldn't get the d3 notif %d\n", ret);</div><div class='add'>+</div><div class='add'>+	if (resume_data-&gt;notif_handling_err)</div><div class='add'>+		ret = -EIO;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_no_wowlan_suspend(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct iwl_d3_manager_config d3_cfg_cmd_data = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (mld-&gt;debug_max_sleep) {</div><div class='add'>+		d3_cfg_cmd_data.wakeup_host_timer =</div><div class='add'>+			cpu_to_le32(mld-&gt;debug_max_sleep);</div><div class='add'>+		d3_cfg_cmd_data.wakeup_flags =</div><div class='add'>+			cpu_to_le32(IWL_WAKEUP_D3_HOST_TIMER);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_WOWLAN(mld, "Starting the no wowlan suspend flow\n");</div><div class='add'>+</div><div class='add'>+	iwl_mld_low_latency_stop(mld);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_update_device_power(mld, true);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mld,</div><div class='add'>+			"d3 suspend: couldn't send power_device %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd_pdu(mld, D3_CONFIG_CMD,</div><div class='add'>+				   &amp;d3_cfg_cmd_data);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mld,</div><div class='add'>+			"d3 suspend: couldn't send D3_CONFIG_CMD %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_trans_d3_suspend(mld-&gt;trans, false);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mld, "d3 suspend: trans_d3_suspend failed %d\n", ret);</div><div class='add'>+		/* We are going to stop the FW. Avoid sending commands in that flow */</div><div class='add'>+		iwl_trans_notify_fw_error(mld-&gt;trans);</div><div class='add'>+	} else {</div><div class='add'>+		/* Async notification might send hcmds, which is not allowed in suspend */</div><div class='add'>+		iwl_mld_cancel_async_notifications(mld);</div><div class='add'>+		mld-&gt;fw_status.in_d3 = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_no_wowlan_resume(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_resume_data resume_data = {</div><div class='add'>+		.notifs_expected =</div><div class='add'>+			IWL_D3_NOTIF_D3_END_NOTIF,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_WOWLAN(mld, "Starting the no wowlan resume flow\n");</div><div class='add'>+</div><div class='add'>+	mld-&gt;fw_status.in_d3 = false;</div><div class='add'>+	iwl_fw_dbg_read_d3_debug_data(&amp;mld-&gt;fwrt);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_wait_d3_notif(mld, &amp;resume_data, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!ret &amp;&amp; (resume_data.d3_end_flags &amp; IWL_D0I3_RESET_REQUIRE))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	iwl_mld_low_latency_restart(mld);</div><div class='add'>+</div><div class='add'>+	return iwl_mld_update_device_power(mld, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_aes_seq_to_le64_pn(struct ieee80211_key_conf *key,</div><div class='add'>+			   __le64 *key_rsc)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; IWL_MAX_TID_COUNT; i++) {</div><div class='add'>+		struct ieee80211_key_seq seq;</div><div class='add'>+		u8 *pn = key-&gt;cipher == WLAN_CIPHER_SUITE_CCMP ? seq.ccmp.pn :</div><div class='add'>+			seq.gcmp.pn;</div><div class='add'>+</div><div class='add'>+		ieee80211_get_key_rx_seq(key, i, &amp;seq);</div><div class='add'>+		key_rsc[i] = cpu_to_le64((u64)pn[5] |</div><div class='add'>+					 ((u64)pn[4] &lt;&lt; 8) |</div><div class='add'>+					 ((u64)pn[3] &lt;&lt; 16) |</div><div class='add'>+					 ((u64)pn[2] &lt;&lt; 24) |</div><div class='add'>+					 ((u64)pn[1] &lt;&lt; 32) |</div><div class='add'>+					 ((u64)pn[0] &lt;&lt; 40));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_suspend_set_ucast_pn(struct iwl_mld *mld, struct ieee80211_sta *sta,</div><div class='add'>+			     struct ieee80211_key_conf *key, __le64 *key_rsc)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sta *mld_sta =</div><div class='add'>+		iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+	struct iwl_mld_ptk_pn *mld_ptk_pn;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(key-&gt;keyidx &gt;= ARRAY_SIZE(mld_sta-&gt;ptk_pn)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mld_ptk_pn = wiphy_dereference(mld-&gt;wiphy,</div><div class='add'>+				       mld_sta-&gt;ptk_pn[key-&gt;keyidx]);</div><div class='add'>+	if (WARN_ON(!mld_ptk_pn))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (int tid = 0; tid &lt; IWL_MAX_TID_COUNT; tid++) {</div><div class='add'>+		struct ieee80211_key_seq seq;</div><div class='add'>+		u8 *max_pn = seq.ccmp.pn;</div><div class='add'>+</div><div class='add'>+		/* get the PN from mac80211, used on the default queue */</div><div class='add'>+		ieee80211_get_key_rx_seq(key, tid, &amp;seq);</div><div class='add'>+</div><div class='add'>+		/* and use the internal data for all queues */</div><div class='add'>+		for (int que = 1; que &lt; mld-&gt;trans-&gt;info.num_rxqs; que++) {</div><div class='add'>+			u8 *cur_pn = mld_ptk_pn-&gt;q[que].pn[tid];</div><div class='add'>+</div><div class='add'>+			if (memcmp(max_pn, cur_pn, IEEE80211_CCMP_PN_LEN) &lt; 0)</div><div class='add'>+				max_pn = cur_pn;</div><div class='add'>+		}</div><div class='add'>+		key_rsc[tid] = cpu_to_le64((u64)max_pn[5] |</div><div class='add'>+					   ((u64)max_pn[4] &lt;&lt; 8) |</div><div class='add'>+					   ((u64)max_pn[3] &lt;&lt; 16) |</div><div class='add'>+					   ((u64)max_pn[2] &lt;&lt; 24) |</div><div class='add'>+					   ((u64)max_pn[1] &lt;&lt; 32) |</div><div class='add'>+					   ((u64)max_pn[0] &lt;&lt; 40));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_suspend_convert_tkip_ipn(struct ieee80211_key_conf *key,</div><div class='add'>+				 __le64 *rsc)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_key_seq seq;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; IWL_MAX_TID_COUNT; i++) {</div><div class='add'>+		ieee80211_get_key_rx_seq(key, i, &amp;seq);</div><div class='add'>+		rsc[i] =</div><div class='add'>+			cpu_to_le64(((u64)seq.tkip.iv32 &lt;&lt; 16) |</div><div class='add'>+				    seq.tkip.iv16);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_suspend_key_data_iter(struct ieee80211_hw *hw,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      struct ieee80211_sta *sta,</div><div class='add'>+			      struct ieee80211_key_conf *key,</div><div class='add'>+			      void *_data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct iwl_mld_suspend_key_iter_data *data = _data;</div><div class='add'>+	__le64 *key_rsc;</div><div class='add'>+	__le32 cipher = 0;</div><div class='add'>+</div><div class='add'>+	switch (key-&gt;cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+		cipher = cpu_to_le32(STA_KEY_FLG_CCM);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='add'>+		if (!cipher)</div><div class='add'>+			cipher = cpu_to_le32(STA_KEY_FLG_GCMP);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		if (!cipher)</div><div class='add'>+			cipher = cpu_to_le32(STA_KEY_FLG_TKIP);</div><div class='add'>+		if (sta) {</div><div class='add'>+			key_rsc = data-&gt;rsc-&gt;ucast_rsc;</div><div class='add'>+			if (key-&gt;cipher == WLAN_CIPHER_SUITE_TKIP)</div><div class='add'>+				iwl_mld_suspend_convert_tkip_ipn(key, key_rsc);</div><div class='add'>+			else</div><div class='add'>+				iwl_mld_suspend_set_ucast_pn(mld, sta, key,</div><div class='add'>+							     key_rsc);</div><div class='add'>+</div><div class='add'>+			data-&gt;have_rsc = true;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		/* We're iterating from old to new, there're 4 possible</div><div class='add'>+		 * gtk ids, and only the last two keys matter</div><div class='add'>+		 */</div><div class='add'>+		if (WARN_ON(data-&gt;gtks &gt;=</div><div class='add'>+				ARRAY_SIZE(data-&gt;found_gtk_idx)))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(key-&gt;keyidx &gt;=</div><div class='add'>+				ARRAY_SIZE(data-&gt;rsc-&gt;mcast_key_id_map)))</div><div class='add'>+			return;</div><div class='add'>+		data-&gt;gtk_cipher = cipher;</div><div class='add'>+		data-&gt;found_gtk_idx[data-&gt;gtks] = key-&gt;keyidx;</div><div class='add'>+		key_rsc = data-&gt;rsc-&gt;mcast_rsc[data-&gt;gtks % 2];</div><div class='add'>+		data-&gt;rsc-&gt;mcast_key_id_map[key-&gt;keyidx] =</div><div class='add'>+			data-&gt;gtks % 2;</div><div class='add'>+</div><div class='add'>+		if (data-&gt;gtks &gt;= 2) {</div><div class='add'>+			int prev = data-&gt;gtks % 2;</div><div class='add'>+			int prev_idx = data-&gt;found_gtk_idx[prev];</div><div class='add'>+</div><div class='add'>+			data-&gt;rsc-&gt;mcast_key_id_map[prev_idx] =</div><div class='add'>+				IWL_MCAST_KEY_MAP_INVALID;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (key-&gt;cipher == WLAN_CIPHER_SUITE_TKIP)</div><div class='add'>+			iwl_mld_suspend_convert_tkip_ipn(key, key_rsc);</div><div class='add'>+		else</div><div class='add'>+			iwl_mld_aes_seq_to_le64_pn(key, key_rsc);</div><div class='add'>+</div><div class='add'>+		data-&gt;gtks++;</div><div class='add'>+		data-&gt;have_rsc = true;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_GMAC_128:</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_GMAC_256:</div><div class='add'>+		cipher = cpu_to_le32(STA_KEY_FLG_GCMP);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_CMAC_256:</div><div class='add'>+	case WLAN_CIPHER_SUITE_AES_CMAC:</div><div class='add'>+		if (!cipher)</div><div class='add'>+			cipher = cpu_to_le32(STA_KEY_FLG_CCM);</div><div class='add'>+		if (key-&gt;keyidx == 4 || key-&gt;keyidx == 5)</div><div class='add'>+			data-&gt;igtk_cipher = cipher;</div><div class='add'>+</div><div class='add'>+		if (key-&gt;keyidx == 6 || key-&gt;keyidx == 7)</div><div class='add'>+			data-&gt;bigtk_cipher = cipher;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_send_kek_kck_cmd(struct iwl_mld *mld,</div><div class='add'>+			 struct iwl_mld_vif *mld_vif,</div><div class='add'>+			 struct iwl_mld_suspend_key_iter_data data,</div><div class='add'>+			 int ap_sta_id)</div><div class='add'>+{</div><div class='add'>+	struct iwl_wowlan_kek_kck_material_cmd_v4 kek_kck_cmd = {};</div><div class='add'>+	struct iwl_mld_rekey_data *rekey_data =</div><div class='add'>+		&amp;mld_vif-&gt;wowlan_data.rekey_data;</div><div class='add'>+</div><div class='add'>+	memcpy(kek_kck_cmd.kck, rekey_data-&gt;kck,</div><div class='add'>+	       rekey_data-&gt;kck_len);</div><div class='add'>+	kek_kck_cmd.kck_len = cpu_to_le16(rekey_data-&gt;kck_len);</div><div class='add'>+	memcpy(kek_kck_cmd.kek, rekey_data-&gt;kek,</div><div class='add'>+	       rekey_data-&gt;kek_len);</div><div class='add'>+	kek_kck_cmd.kek_len = cpu_to_le16(rekey_data-&gt;kek_len);</div><div class='add'>+	kek_kck_cmd.replay_ctr = rekey_data-&gt;replay_ctr;</div><div class='add'>+	kek_kck_cmd.akm = cpu_to_le32(rekey_data-&gt;akm);</div><div class='add'>+	kek_kck_cmd.sta_id = cpu_to_le32(ap_sta_id);</div><div class='add'>+	kek_kck_cmd.gtk_cipher = data.gtk_cipher;</div><div class='add'>+	kek_kck_cmd.igtk_cipher = data.igtk_cipher;</div><div class='add'>+	kek_kck_cmd.bigtk_cipher = data.bigtk_cipher;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_WOWLAN(mld, "setting akm %d\n",</div><div class='add'>+			 rekey_data-&gt;akm);</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_cmd_pdu(mld, WOWLAN_KEK_KCK_MATERIAL,</div><div class='add'>+				    &amp;kek_kck_cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_suspend_send_security_cmds(struct iwl_mld *mld,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct iwl_mld_vif *mld_vif,</div><div class='add'>+				   int ap_sta_id)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_suspend_key_iter_data data = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	data.rsc = kzalloc(sizeof(*data.rsc), GFP_KERNEL);</div><div class='add'>+	if (!data.rsc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memset(data.rsc-&gt;mcast_key_id_map, IWL_MCAST_KEY_MAP_INVALID,</div><div class='add'>+	       ARRAY_SIZE(data.rsc-&gt;mcast_key_id_map));</div><div class='add'>+</div><div class='add'>+	data.rsc-&gt;sta_id = cpu_to_le32(ap_sta_id);</div><div class='add'>+	ieee80211_iter_keys(mld-&gt;hw, vif,</div><div class='add'>+			    iwl_mld_suspend_key_data_iter,</div><div class='add'>+			    &amp;data);</div><div class='add'>+</div><div class='add'>+	if (data.have_rsc)</div><div class='add'>+		ret = iwl_mld_send_cmd_pdu(mld, WOWLAN_TSC_RSC_PARAM,</div><div class='add'>+					   data.rsc);</div><div class='add'>+	else</div><div class='add'>+		ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!ret &amp;&amp; mld_vif-&gt;wowlan_data.rekey_data.valid)</div><div class='add'>+		ret = iwl_mld_send_kek_kck_cmd(mld, mld_vif, data, ap_sta_id);</div><div class='add'>+</div><div class='add'>+	kfree(data.rsc);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_set_wowlan_config_cmd(struct iwl_mld *mld,</div><div class='add'>+			      struct cfg80211_wowlan *wowlan,</div><div class='add'>+			      struct iwl_wowlan_config_cmd *wowlan_config_cmd,</div><div class='add'>+			      struct ieee80211_sta *ap_sta,</div><div class='add'>+			      struct ieee80211_bss_conf *link)</div><div class='add'>+{</div><div class='add'>+	wowlan_config_cmd-&gt;is_11n_connection =</div><div class='add'>+					ap_sta-&gt;deflink.ht_cap.ht_supported;</div><div class='add'>+	wowlan_config_cmd-&gt;flags = ENABLE_L3_FILTERING |</div><div class='add'>+		ENABLE_NBNS_FILTERING | ENABLE_DHCP_FILTERING;</div><div class='add'>+</div><div class='add'>+	if (ap_sta-&gt;mfp)</div><div class='add'>+		wowlan_config_cmd-&gt;flags |= IS_11W_ASSOC;</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_beacon_protection_enabled(mld, link))</div><div class='add'>+		wowlan_config_cmd-&gt;flags |= HAS_BEACON_PROTECTION;</div><div class='add'>+</div><div class='add'>+	if (wowlan-&gt;disconnect)</div><div class='add'>+		wowlan_config_cmd-&gt;wakeup_filter |=</div><div class='add'>+			cpu_to_le32(IWL_WOWLAN_WAKEUP_BEACON_MISS |</div><div class='add'>+				    IWL_WOWLAN_WAKEUP_LINK_CHANGE);</div><div class='add'>+	if (wowlan-&gt;magic_pkt)</div><div class='add'>+		wowlan_config_cmd-&gt;wakeup_filter |=</div><div class='add'>+			cpu_to_le32(IWL_WOWLAN_WAKEUP_MAGIC_PACKET);</div><div class='add'>+	if (wowlan-&gt;gtk_rekey_failure)</div><div class='add'>+		wowlan_config_cmd-&gt;wakeup_filter |=</div><div class='add'>+			cpu_to_le32(IWL_WOWLAN_WAKEUP_GTK_REKEY_FAIL);</div><div class='add'>+	if (wowlan-&gt;eap_identity_req)</div><div class='add'>+		wowlan_config_cmd-&gt;wakeup_filter |=</div><div class='add'>+			cpu_to_le32(IWL_WOWLAN_WAKEUP_EAP_IDENT_REQ);</div><div class='add'>+	if (wowlan-&gt;four_way_handshake)</div><div class='add'>+		wowlan_config_cmd-&gt;wakeup_filter |=</div><div class='add'>+			cpu_to_le32(IWL_WOWLAN_WAKEUP_4WAY_HANDSHAKE);</div><div class='add'>+	if (wowlan-&gt;n_patterns)</div><div class='add'>+		wowlan_config_cmd-&gt;wakeup_filter |=</div><div class='add'>+			cpu_to_le32(IWL_WOWLAN_WAKEUP_PATTERN_MATCH);</div><div class='add'>+</div><div class='add'>+	if (wowlan-&gt;rfkill_release)</div><div class='add'>+		wowlan_config_cmd-&gt;wakeup_filter |=</div><div class='add'>+			cpu_to_le32(IWL_WOWLAN_WAKEUP_RF_KILL_DEASSERT);</div><div class='add'>+</div><div class='add'>+	if (wowlan-&gt;any) {</div><div class='add'>+		wowlan_config_cmd-&gt;wakeup_filter |=</div><div class='add'>+			cpu_to_le32(IWL_WOWLAN_WAKEUP_BEACON_MISS |</div><div class='add'>+				    IWL_WOWLAN_WAKEUP_LINK_CHANGE |</div><div class='add'>+				    IWL_WOWLAN_WAKEUP_RX_FRAME |</div><div class='add'>+				    IWL_WOWLAN_WAKEUP_BCN_FILTERING);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_send_patterns(struct iwl_mld *mld,</div><div class='add'>+				 struct cfg80211_wowlan *wowlan,</div><div class='add'>+				 int ap_sta_id)</div><div class='add'>+{</div><div class='add'>+	struct iwl_wowlan_patterns_cmd *pattern_cmd;</div><div class='add'>+	struct iwl_host_cmd cmd = {</div><div class='add'>+		.id = WOWLAN_PATTERNS,</div><div class='add'>+		.dataflags[0] = IWL_HCMD_DFL_NOCOPY,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!wowlan-&gt;n_patterns)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cmd.len[0] = struct_size(pattern_cmd, patterns, wowlan-&gt;n_patterns);</div><div class='add'>+</div><div class='add'>+	pattern_cmd = kzalloc(cmd.len[0], GFP_KERNEL);</div><div class='add'>+	if (!pattern_cmd)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pattern_cmd-&gt;n_patterns = wowlan-&gt;n_patterns;</div><div class='add'>+	pattern_cmd-&gt;sta_id = ap_sta_id;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; wowlan-&gt;n_patterns; i++) {</div><div class='add'>+		int mask_len = DIV_ROUND_UP(wowlan-&gt;patterns[i].pattern_len, 8);</div><div class='add'>+</div><div class='add'>+		pattern_cmd-&gt;patterns[i].pattern_type =</div><div class='add'>+			WOWLAN_PATTERN_TYPE_BITMASK;</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;pattern_cmd-&gt;patterns[i].u.bitmask.mask,</div><div class='add'>+		       wowlan-&gt;patterns[i].mask, mask_len);</div><div class='add'>+		memcpy(&amp;pattern_cmd-&gt;patterns[i].u.bitmask.pattern,</div><div class='add'>+		       wowlan-&gt;patterns[i].pattern,</div><div class='add'>+		       wowlan-&gt;patterns[i].pattern_len);</div><div class='add'>+		pattern_cmd-&gt;patterns[i].u.bitmask.mask_size = mask_len;</div><div class='add'>+		pattern_cmd-&gt;patterns[i].u.bitmask.pattern_size =</div><div class='add'>+			wowlan-&gt;patterns[i].pattern_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd.data[0] = pattern_cmd;</div><div class='add'>+	ret = iwl_mld_send_cmd(mld, &amp;cmd);</div><div class='add'>+	kfree(pattern_cmd);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_send_proto_offload(struct iwl_mld *mld,</div><div class='add'>+			   struct ieee80211_vif *vif,</div><div class='add'>+			   u8 ap_sta_id)</div><div class='add'>+{</div><div class='add'>+	struct iwl_proto_offload_cmd_v4 *cmd __free(kfree);</div><div class='add'>+	struct iwl_host_cmd hcmd = {</div><div class='add'>+		.id = PROT_OFFLOAD_CONFIG_CMD,</div><div class='add'>+		.dataflags[0] = IWL_HCMD_DFL_NOCOPY,</div><div class='add'>+		.len[0] = sizeof(*cmd),</div><div class='add'>+	};</div><div class='add'>+	u32 enabled = 0;</div><div class='add'>+</div><div class='add'>+	cmd = kzalloc(hcmd.len[0], GFP_KERNEL);</div><div class='add'>+	if (!cmd) {</div><div class='add'>+		IWL_DEBUG_WOWLAN(mld, "Failed to allocate proto offload cmd\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld_wowlan_data *wowlan_data = &amp;mld_vif-&gt;wowlan_data;</div><div class='add'>+	struct iwl_ns_config *nsc;</div><div class='add'>+	struct iwl_targ_addr *addrs;</div><div class='add'>+	int n_nsc, n_addrs;</div><div class='add'>+	int i, c;</div><div class='add'>+	int num_skipped = 0;</div><div class='add'>+</div><div class='add'>+	nsc = cmd-&gt;ns_config;</div><div class='add'>+	n_nsc = IWL_PROTO_OFFLOAD_NUM_NS_CONFIG_V3L;</div><div class='add'>+	addrs = cmd-&gt;targ_addrs;</div><div class='add'>+	n_addrs = IWL_PROTO_OFFLOAD_NUM_IPV6_ADDRS_V3L;</div><div class='add'>+</div><div class='add'>+	/* For each address we have (and that will fit) fill a target</div><div class='add'>+	 * address struct and combine for NS offload structs with the</div><div class='add'>+	 * solicited node addresses.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0, c = 0;</div><div class='add'>+		i &lt; wowlan_data-&gt;num_target_ipv6_addrs &amp;&amp;</div><div class='add'>+		i &lt; n_addrs &amp;&amp; c &lt; n_nsc; i++) {</div><div class='add'>+		int j;</div><div class='add'>+		struct in6_addr solicited_addr;</div><div class='add'>+</div><div class='add'>+		/* Because ns is offloaded skip tentative address to avoid</div><div class='add'>+		 * violating RFC4862.</div><div class='add'>+		 */</div><div class='add'>+		if (test_bit(i, wowlan_data-&gt;tentative_addrs)) {</div><div class='add'>+			num_skipped++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		addrconf_addr_solict_mult(&amp;wowlan_data-&gt;target_ipv6_addrs[i],</div><div class='add'>+					  &amp;solicited_addr);</div><div class='add'>+		for (j = 0; j &lt; n_nsc &amp;&amp; j &lt; c; j++)</div><div class='add'>+			if (ipv6_addr_cmp(&amp;nsc[j].dest_ipv6_addr,</div><div class='add'>+					  &amp;solicited_addr) == 0)</div><div class='add'>+				break;</div><div class='add'>+		if (j == c)</div><div class='add'>+			c++;</div><div class='add'>+		addrs[i].addr = wowlan_data-&gt;target_ipv6_addrs[i];</div><div class='add'>+		addrs[i].config_num = cpu_to_le32(j);</div><div class='add'>+		nsc[j].dest_ipv6_addr = solicited_addr;</div><div class='add'>+		memcpy(nsc[j].target_mac_addr, vif-&gt;addr, ETH_ALEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wowlan_data-&gt;num_target_ipv6_addrs - num_skipped)</div><div class='add'>+		enabled |= IWL_D3_PROTO_IPV6_VALID;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;num_valid_ipv6_addrs = cpu_to_le32(i - num_skipped);</div><div class='add'>+	if (enabled &amp; IWL_D3_PROTO_IPV6_VALID)</div><div class='add'>+		enabled |= IWL_D3_PROTO_OFFLOAD_NS;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;cfg.arp_addr_cnt) {</div><div class='add'>+		enabled |= IWL_D3_PROTO_OFFLOAD_ARP | IWL_D3_PROTO_IPV4_VALID;</div><div class='add'>+		cmd-&gt;common.host_ipv4_addr = vif-&gt;cfg.arp_addr_list[0];</div><div class='add'>+		ether_addr_copy(cmd-&gt;common.arp_mac_addr, vif-&gt;addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	enabled |= IWL_D3_PROTO_OFFLOAD_BTM;</div><div class='add'>+	cmd-&gt;common.enabled = cpu_to_le32(enabled);</div><div class='add'>+	cmd-&gt;sta_id = cpu_to_le32(ap_sta_id);</div><div class='add'>+	hcmd.data[0] = cmd;</div><div class='add'>+	return iwl_mld_send_cmd(mld, &amp;hcmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_wowlan_config(struct iwl_mld *mld, struct ieee80211_vif *bss_vif,</div><div class='add'>+		      struct cfg80211_wowlan *wowlan)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(bss_vif);</div><div class='add'>+	struct ieee80211_sta *ap_sta = mld_vif-&gt;ap_sta;</div><div class='add'>+	struct iwl_wowlan_config_cmd wowlan_config_cmd = {</div><div class='add'>+			.offloading_tid = IWL_WOWLAN_OFFLOAD_TID,</div><div class='add'>+	};</div><div class='add'>+	u32 sta_id_mask;</div><div class='add'>+	int ap_sta_id, ret;</div><div class='add'>+	int link_id = iwl_mld_get_primary_link(bss_vif);</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_block_emlsr_sync(mld, bss_vif,</div><div class='add'>+				       IWL_MLD_EMLSR_BLOCKED_WOWLAN, link_id);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	link_conf = link_conf_dereference_protected(bss_vif, link_id);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!ap_sta || !link_conf))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	sta_id_mask = iwl_mld_fw_sta_id_mask(mld, ap_sta);</div><div class='add'>+	if (WARN_ON(hweight32(sta_id_mask) != 1))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ap_sta_id = __ffs(sta_id_mask);</div><div class='add'>+	wowlan_config_cmd.sta_id = ap_sta_id;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_ensure_queue(mld,</div><div class='add'>+				   ap_sta-&gt;txq[wowlan_config_cmd.offloading_tid]);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	iwl_mld_set_wowlan_config_cmd(mld, wowlan,</div><div class='add'>+				      &amp;wowlan_config_cmd, ap_sta, link_conf);</div><div class='add'>+	ret = iwl_mld_send_cmd_pdu(mld, WOWLAN_CONFIGURATION,</div><div class='add'>+				   &amp;wowlan_config_cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_suspend_send_security_cmds(mld, bss_vif, mld_vif,</div><div class='add'>+						 ap_sta_id);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_patterns(mld, wowlan, ap_sta_id);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_proto_offload(mld, bss_vif, ap_sta_id);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	iwl_mld_enable_beacon_filter(mld, link_conf, true);</div><div class='add'>+	return iwl_mld_update_mac_power(mld, bss_vif, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_wowlan_suspend(struct iwl_mld *mld, struct cfg80211_wowlan *wowlan)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *bss_vif;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!wowlan))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_WOWLAN(mld, "Starting the wowlan suspend flow\n");</div><div class='add'>+</div><div class='add'>+	bss_vif = iwl_mld_get_bss_vif(mld);</div><div class='add'>+	if (WARN_ON(!bss_vif))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (!bss_vif-&gt;cfg.assoc) {</div><div class='add'>+		int ret;</div><div class='add'>+		/* If we're not associated, this must be netdetect */</div><div class='add'>+		if (WARN_ON(!wowlan-&gt;nd_config))</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+		ret = iwl_mld_netdetect_config(mld, bss_vif, wowlan);</div><div class='add'>+		if (!ret)</div><div class='add'>+			mld-&gt;netdetect = true;</div><div class='add'>+</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return iwl_mld_wowlan_config(mld, bss_vif, wowlan);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Returns 0 on success, 1 if an error occurred in firmware during d3,</div><div class='add'>+ * A negative value is expected only in unrecovreable cases.</div><div class='add'>+ */</div><div class='add'>+int iwl_mld_wowlan_resume(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *bss_vif;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct iwl_mld_netdetect_res netdetect_res;</div><div class='add'>+	struct iwl_mld_resume_data resume_data = {</div><div class='add'>+		.notifs_expected =</div><div class='add'>+			IWL_D3_NOTIF_WOWLAN_INFO |</div><div class='add'>+			IWL_D3_NOTIF_D3_END_NOTIF,</div><div class='add'>+		.netdetect_res = &amp;netdetect_res,</div><div class='add'>+	};</div><div class='add'>+	int link_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_WOWLAN(mld, "Starting the wowlan resume flow\n");</div><div class='add'>+</div><div class='add'>+	if (!mld-&gt;fw_status.in_d3) {</div><div class='add'>+		IWL_DEBUG_WOWLAN(mld,</div><div class='add'>+				 "Device_powered_off() was called during wowlan\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mld-&gt;fw_status.resuming = true;</div><div class='add'>+	mld-&gt;fw_status.in_d3 = false;</div><div class='add'>+	mld-&gt;scan.last_start_time_jiffies = jiffies;</div><div class='add'>+</div><div class='add'>+	bss_vif = iwl_mld_get_bss_vif(mld);</div><div class='add'>+	if (WARN_ON(!bss_vif))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* We can't have several links upon wowlan entry,</div><div class='add'>+	 * this is enforced in the suspend flow.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON(hweight16(bss_vif-&gt;active_links) &gt; 1);</div><div class='add'>+	link_id = bss_vif-&gt;active_links ? __ffs(bss_vif-&gt;active_links) : 0;</div><div class='add'>+	link_conf = link_conf_dereference_protected(bss_vif, link_id);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!link_conf))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	iwl_fw_dbg_read_d3_debug_data(&amp;mld-&gt;fwrt);</div><div class='add'>+</div><div class='add'>+	resume_data.wowlan_status = kzalloc(sizeof(*resume_data.wowlan_status),</div><div class='add'>+					    GFP_KERNEL);</div><div class='add'>+	if (!resume_data.wowlan_status)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (mld-&gt;netdetect)</div><div class='add'>+		resume_data.notifs_expected |= IWL_D3_ND_MATCH_INFO;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_wait_d3_notif(mld, &amp;resume_data, true);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mld, "Couldn't get the d3 notifs %d\n", ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resume_data.d3_end_flags &amp; IWL_D0I3_RESET_REQUIRE) {</div><div class='add'>+		mld-&gt;fw_status.in_hw_restart = true;</div><div class='add'>+		goto process_wakeup_results;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mld_update_changed_regdomain(mld);</div><div class='add'>+	iwl_mld_update_mac_power(mld, bss_vif, false);</div><div class='add'>+	iwl_mld_enable_beacon_filter(mld, link_conf, false);</div><div class='add'>+	iwl_mld_update_device_power(mld, false);</div><div class='add'>+</div><div class='add'>+	if (mld-&gt;netdetect)</div><div class='add'>+		ret = iwl_mld_scan_stop(mld, IWL_MLD_SCAN_NETDETECT, false);</div><div class='add'>+</div><div class='add'>+ process_wakeup_results:</div><div class='add'>+	if (mld-&gt;netdetect) {</div><div class='add'>+		iwl_mld_process_netdetect_res(mld, bss_vif, &amp;resume_data);</div><div class='add'>+		mld-&gt;netdetect = false;</div><div class='add'>+	} else {</div><div class='add'>+		bool keep_connection =</div><div class='add'>+			iwl_mld_process_wowlan_status(mld, bss_vif,</div><div class='add'>+						      resume_data.wowlan_status);</div><div class='add'>+</div><div class='add'>+		/* EMLSR state will be cleared if the connection is not kept */</div><div class='add'>+		if (keep_connection)</div><div class='add'>+			iwl_mld_unblock_emlsr(mld, bss_vif,</div><div class='add'>+					      IWL_MLD_EMLSR_BLOCKED_WOWLAN);</div><div class='add'>+		else</div><div class='add'>+			ieee80211_resume_disconnect(bss_vif);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+ err:</div><div class='add'>+	mld-&gt;fw_status.in_hw_restart = true;</div><div class='add'>+	ret = 1;</div><div class='add'>+ out:</div><div class='add'>+	mld-&gt;fw_status.resuming = false;</div><div class='add'>+</div><div class='add'>+	if (resume_data.wowlan_status) {</div><div class='add'>+		kfree(resume_data.wowlan_status-&gt;wake_packet);</div><div class='add'>+		kfree(resume_data.wowlan_status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/d3.h b/drivers/net/wireless/intel/iwlwifi/mld/d3.h<br/>new file mode 100644<br/>index 000000000000..618d6fb3c796<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/d3.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/d3.h</a></div><div class='hunk'>@@ -0,0 +1,51 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_d3_h__</div><div class='add'>+#define __iwl_mld_d3_h__</div><div class='add'>+</div><div class='add'>+#include "fw/api/d3.h"</div><div class='add'>+</div><div class='add'>+struct iwl_mld_rekey_data {</div><div class='add'>+	bool valid;</div><div class='add'>+	u8 kck[NL80211_KCK_EXT_LEN];</div><div class='add'>+	u8 kek[NL80211_KEK_EXT_LEN];</div><div class='add'>+	size_t kck_len;</div><div class='add'>+	size_t kek_len;</div><div class='add'>+	__le64 replay_ctr;</div><div class='add'>+	u32 akm;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_wowlan_data - data used by the wowlan suspend flow</div><div class='add'>+ *</div><div class='add'>+ * @target_ipv6_addrs: IPv6 addresses on this interface for offload</div><div class='add'>+ * @tentative_addrs: bitmap of tentative IPv6 addresses in @target_ipv6_addrs</div><div class='add'>+ * @num_target_ipv6_addrs: number of @target_ipv6_addrs</div><div class='add'>+ * @rekey_data: security key data used for rekeying during D3</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_wowlan_data {</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	struct in6_addr target_ipv6_addrs[IWL_PROTO_OFFLOAD_NUM_IPV6_ADDRS_MAX];</div><div class='add'>+	unsigned long tentative_addrs[BITS_TO_LONGS(IWL_PROTO_OFFLOAD_NUM_IPV6_ADDRS_MAX)];</div><div class='add'>+	int num_target_ipv6_addrs;</div><div class='add'>+#endif</div><div class='add'>+	struct iwl_mld_rekey_data rekey_data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int iwl_mld_no_wowlan_resume(struct iwl_mld *mld);</div><div class='add'>+int iwl_mld_no_wowlan_suspend(struct iwl_mld *mld);</div><div class='add'>+int iwl_mld_wowlan_suspend(struct iwl_mld *mld,</div><div class='add'>+			   struct cfg80211_wowlan *wowlan);</div><div class='add'>+int iwl_mld_wowlan_resume(struct iwl_mld *mld);</div><div class='add'>+void iwl_mld_set_rekey_data(struct ieee80211_hw *hw,</div><div class='add'>+			    struct ieee80211_vif *vif,</div><div class='add'>+			    struct cfg80211_gtk_rekey_data *data);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+void iwl_mld_ipv6_addr_change(struct ieee80211_hw *hw,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      struct inet6_dev *idev);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_d3_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/debugfs.c b/drivers/net/wireless/intel/iwlwifi/mld/debugfs.c<br/>new file mode 100644<br/>index 000000000000..b9c9cd3f44e4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/debugfs.c</a></div><div class='hunk'>@@ -0,0 +1,1113 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "debugfs.h"</div><div class='add'>+#include "iwl-io.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+#include "iface.h"</div><div class='add'>+#include "sta.h"</div><div class='add'>+#include "tlc.h"</div><div class='add'>+#include "power.h"</div><div class='add'>+#include "notif.h"</div><div class='add'>+#include "ap.h"</div><div class='add'>+#include "iwl-utils.h"</div><div class='add'>+#include "scan.h"</div><div class='add'>+#ifdef CONFIG_THERMAL</div><div class='add'>+#include "thermal.h"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include "fw/api/rs.h"</div><div class='add'>+#include "fw/api/dhc.h"</div><div class='add'>+#include "fw/api/rfi.h"</div><div class='add'>+#include "fw/dhc-utils.h"</div><div class='add'>+#include &lt;linux/dmi.h&gt;</div><div class='add'>+</div><div class='add'>+#define MLD_DEBUGFS_READ_FILE_OPS(name, bufsz)				\</div><div class='add'>+	_MLD_DEBUGFS_READ_FILE_OPS(name, bufsz, struct iwl_mld)</div><div class='add'>+</div><div class='add'>+#define MLD_DEBUGFS_ADD_FILE_ALIAS(alias, name, parent, mode)		\</div><div class='add'>+	debugfs_create_file(alias, mode, parent, mld,			\</div><div class='add'>+			    &amp;iwl_dbgfs_##name##_ops)</div><div class='add'>+#define MLD_DEBUGFS_ADD_FILE(name, parent, mode)			\</div><div class='add'>+	MLD_DEBUGFS_ADD_FILE_ALIAS(#name, name, parent, mode)</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_dbgfs_fw_cmd_disabled(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	return !mld-&gt;fw_status.running || mld-&gt;fw_status.in_d3;</div><div class='add'>+#else</div><div class='add'>+	return !mld-&gt;fw_status.running;</div><div class='add'>+#endif /* CONFIG_PM_SLEEP */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t iwl_dbgfs_fw_dbg_clear_write(struct iwl_mld *mld,</div><div class='add'>+					    char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	/* If the firmware is not running, silently succeed since there is</div><div class='add'>+	 * no data to clear.</div><div class='add'>+	 */</div><div class='add'>+	if (iwl_mld_dbgfs_fw_cmd_disabled(mld))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	iwl_fw_dbg_clear_monitor_buf(&amp;mld-&gt;fwrt);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t iwl_dbgfs_fw_nmi_write(struct iwl_mld *mld, char *buf,</div><div class='add'>+				      size_t count)</div><div class='add'>+{</div><div class='add'>+	if (iwl_mld_dbgfs_fw_cmd_disabled(mld))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	IWL_ERR(mld, "Triggering an NMI from debugfs\n");</div><div class='add'>+</div><div class='add'>+	if (count == 6 &amp;&amp; !strcmp(buf, "nolog\n"))</div><div class='add'>+		mld-&gt;fw_status.do_not_dump_once = true;</div><div class='add'>+</div><div class='add'>+	iwl_force_nmi(mld-&gt;trans);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t iwl_dbgfs_fw_restart_write(struct iwl_mld *mld, char *buf,</div><div class='add'>+					  size_t count)</div><div class='add'>+{</div><div class='add'>+	int __maybe_unused ret;</div><div class='add'>+</div><div class='add'>+	if (!iwlwifi_mod_params.fw_restart)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_dbgfs_fw_cmd_disabled(mld))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (count == 6 &amp;&amp; !strcmp(buf, "nolog\n")) {</div><div class='add'>+		mld-&gt;fw_status.do_not_dump_once = true;</div><div class='add'>+		mld-&gt;trans-&gt;suppress_cmd_error_once = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* take the return value to make compiler happy - it will</div><div class='add'>+	 * fail anyway</div><div class='add'>+	 */</div><div class='add'>+	ret = iwl_mld_send_cmd_empty(mld, WIDE_ID(LONG_GROUP, REPLY_ERROR));</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t iwl_dbgfs_send_echo_cmd_write(struct iwl_mld *mld, char *buf,</div><div class='add'>+					     size_t count)</div><div class='add'>+{</div><div class='add'>+	if (iwl_mld_dbgfs_fw_cmd_disabled(mld))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_cmd_empty(mld, ECHO_CMD) ?: count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct iwl_mld_sniffer_apply {</div><div class='add'>+	struct iwl_mld *mld;</div><div class='add'>+	const u8 *bssid;</div><div class='add'>+	u16 aid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_sniffer_apply(struct iwl_notif_wait_data *notif_data,</div><div class='add'>+				  struct iwl_rx_packet *pkt, void *data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sniffer_apply *apply = data;</div><div class='add'>+</div><div class='add'>+	apply-&gt;mld-&gt;monitor.cur_aid = cpu_to_le16(apply-&gt;aid);</div><div class='add'>+	memcpy(apply-&gt;mld-&gt;monitor.cur_bssid, apply-&gt;bssid,</div><div class='add'>+	       sizeof(apply-&gt;mld-&gt;monitor.cur_bssid));</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+iwl_dbgfs_he_sniffer_params_write(struct iwl_mld *mld, char *buf,</div><div class='add'>+				  size_t count)</div><div class='add'>+{</div><div class='add'>+	struct iwl_notification_wait wait;</div><div class='add'>+	struct iwl_he_monitor_cmd he_mon_cmd = {};</div><div class='add'>+	struct iwl_mld_sniffer_apply apply = {</div><div class='add'>+		.mld = mld,</div><div class='add'>+	};</div><div class='add'>+	u16 wait_cmds[] = {</div><div class='add'>+		WIDE_ID(DATA_PATH_GROUP, HE_AIR_SNIFFER_CONFIG_CMD),</div><div class='add'>+	};</div><div class='add'>+	u32 aid;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_dbgfs_fw_cmd_disabled(mld))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (!mld-&gt;monitor.on)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	ret = sscanf(buf, "%x %2hhx:%2hhx:%2hhx:%2hhx:%2hhx:%2hhx", &amp;aid,</div><div class='add'>+		     &amp;he_mon_cmd.bssid[0], &amp;he_mon_cmd.bssid[1],</div><div class='add'>+		     &amp;he_mon_cmd.bssid[2], &amp;he_mon_cmd.bssid[3],</div><div class='add'>+		     &amp;he_mon_cmd.bssid[4], &amp;he_mon_cmd.bssid[5]);</div><div class='add'>+	if (ret != 7)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	he_mon_cmd.aid = cpu_to_le16(aid);</div><div class='add'>+</div><div class='add'>+	apply.aid = aid;</div><div class='add'>+	apply.bssid = (void *)he_mon_cmd.bssid;</div><div class='add'>+</div><div class='add'>+	/* Use the notification waiter to get our function triggered</div><div class='add'>+	 * in sequence with other RX. This ensures that frames we get</div><div class='add'>+	 * on the RX queue _before_ the new configuration is applied</div><div class='add'>+	 * still have mld-&gt;cur_aid pointing to the old AID, and that</div><div class='add'>+	 * frames on the RX queue _after_ the firmware processed the</div><div class='add'>+	 * new configuration (and sent the response, synchronously)</div><div class='add'>+	 * get mld-&gt;cur_aid correctly set to the new AID.</div><div class='add'>+	 */</div><div class='add'>+	iwl_init_notification_wait(&amp;mld-&gt;notif_wait, &amp;wait,</div><div class='add'>+				   wait_cmds, ARRAY_SIZE(wait_cmds),</div><div class='add'>+				   iwl_mld_sniffer_apply, &amp;apply);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd_pdu(mld,</div><div class='add'>+				   WIDE_ID(DATA_PATH_GROUP,</div><div class='add'>+					   HE_AIR_SNIFFER_CONFIG_CMD),</div><div class='add'>+				   &amp;he_mon_cmd);</div><div class='add'>+</div><div class='add'>+	/* no need to really wait, we already did anyway */</div><div class='add'>+	iwl_remove_notification(&amp;mld-&gt;notif_wait, &amp;wait);</div><div class='add'>+</div><div class='add'>+	return ret ?: count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+iwl_dbgfs_he_sniffer_params_read(struct iwl_mld *mld, char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	return scnprintf(buf, count,</div><div class='add'>+			 "%d %02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx\n",</div><div class='add'>+			 le16_to_cpu(mld-&gt;monitor.cur_aid),</div><div class='add'>+			 mld-&gt;monitor.cur_bssid[0], mld-&gt;monitor.cur_bssid[1],</div><div class='add'>+			 mld-&gt;monitor.cur_bssid[2], mld-&gt;monitor.cur_bssid[3],</div><div class='add'>+			 mld-&gt;monitor.cur_bssid[4], mld-&gt;monitor.cur_bssid[5]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The size computation is as follows:</div><div class='add'>+ * each number needs at most 3 characters, number of rows is the size of</div><div class='add'>+ * the table; So, need 5 chars for the "freq: " part and each tuple afterwards</div><div class='add'>+ * needs 6 characters for numbers and 5 for the punctuation around. 32 bytes</div><div class='add'>+ * for feature support message.</div><div class='add'>+ */</div><div class='add'>+#define IWL_RFI_DDR_BUF_SIZE (IWL_RFI_DDR_LUT_INSTALLED_SIZE *\</div><div class='add'>+				(5 + IWL_RFI_DDR_LUT_ENTRY_CHANNELS_NUM *\</div><div class='add'>+					(6 + 5)) + 32)</div><div class='add'>+#define IWL_RFI_DLVR_BUF_SIZE (IWL_RFI_DLVR_LUT_INSTALLED_SIZE *\</div><div class='add'>+				(5 + IWL_RFI_DLVR_LUT_ENTRY_CHANNELS_NUM *\</div><div class='add'>+					(6 + 5)) + 32)</div><div class='add'>+#define IWL_RFI_DESENSE_BUF_SIZE IWL_RFI_DDR_BUF_SIZE</div><div class='add'>+</div><div class='add'>+/* Extra 32 for "DDR and DLVR table" message */</div><div class='add'>+#define IWL_RFI_BUF_SIZE (IWL_RFI_DDR_BUF_SIZE + IWL_RFI_DLVR_BUF_SIZE +\</div><div class='add'>+				IWL_RFI_DESENSE_BUF_SIZE + 32)</div><div class='add'>+</div><div class='add'>+static size_t iwl_mld_dump_tas_resp(struct iwl_dhc_tas_status_resp *resp,</div><div class='add'>+				    size_t count, u8 *buf)</div><div class='add'>+{</div><div class='add'>+	const char * const tas_dis_reason[TAS_DISABLED_REASON_MAX] = {</div><div class='add'>+		[TAS_DISABLED_DUE_TO_BIOS] =</div><div class='add'>+			"Due To BIOS",</div><div class='add'>+		[TAS_DISABLED_DUE_TO_SAR_6DBM] =</div><div class='add'>+			"Due To SAR Limit Less Than 6 dBm",</div><div class='add'>+		[TAS_DISABLED_REASON_INVALID] =</div><div class='add'>+			"N/A",</div><div class='add'>+		[TAS_DISABLED_DUE_TO_TABLE_SOURCE_INVALID] =</div><div class='add'>+			"Due to table source invalid"</div><div class='add'>+	};</div><div class='add'>+	const char * const tas_current_status[TAS_DYNA_STATUS_MAX] = {</div><div class='add'>+		[TAS_DYNA_INACTIVE] = "INACTIVE",</div><div class='add'>+		[TAS_DYNA_INACTIVE_MVM_MODE] =</div><div class='add'>+			"inactive due to mvm mode",</div><div class='add'>+		[TAS_DYNA_INACTIVE_TRIGGER_MODE] =</div><div class='add'>+			"inactive due to trigger mode",</div><div class='add'>+		[TAS_DYNA_INACTIVE_BLOCK_LISTED] =</div><div class='add'>+			"inactive due to block listed",</div><div class='add'>+		[TAS_DYNA_INACTIVE_UHB_NON_US] =</div><div class='add'>+			"inactive due to uhb non US",</div><div class='add'>+		[TAS_DYNA_ACTIVE] = "ACTIVE",</div><div class='add'>+	};</div><div class='add'>+	ssize_t pos = 0;</div><div class='add'>+</div><div class='add'>+	if (resp-&gt;header.version != 1) {</div><div class='add'>+		pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+				 "Unsupported TAS response version:%d",</div><div class='add'>+				 resp-&gt;header.version);</div><div class='add'>+		return pos;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos += scnprintf(buf + pos, count - pos, "TAS Report\n");</div><div class='add'>+	switch (resp-&gt;tas_config_info.table_source) {</div><div class='add'>+	case BIOS_SOURCE_NONE:</div><div class='add'>+		pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+				 "BIOS SOURCE NONE ");</div><div class='add'>+		break;</div><div class='add'>+	case BIOS_SOURCE_ACPI:</div><div class='add'>+		pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+				 "BIOS SOURCE ACPI ");</div><div class='add'>+		break;</div><div class='add'>+	case BIOS_SOURCE_UEFI:</div><div class='add'>+		pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+				 "BIOS SOURCE UEFI ");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+				 "BIOS SOURCE UNKNOWN (%d) ",</div><div class='add'>+				 resp-&gt;tas_config_info.table_source);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+			 "revision is: %d data is: 0x%08x\n",</div><div class='add'>+			 resp-&gt;tas_config_info.table_revision,</div><div class='add'>+			 resp-&gt;tas_config_info.value);</div><div class='add'>+	pos += scnprintf(buf + pos, count - pos, "Current MCC: 0x%x\n",</div><div class='add'>+			 le16_to_cpu(resp-&gt;curr_mcc));</div><div class='add'>+</div><div class='add'>+	pos += scnprintf(buf + pos, count - pos, "Block list entries:");</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(resp-&gt;mcc_block_list); i++)</div><div class='add'>+		pos += scnprintf(buf + pos, count - pos, " 0x%x",</div><div class='add'>+				 le16_to_cpu(resp-&gt;mcc_block_list[i]));</div><div class='add'>+</div><div class='add'>+	pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+			 "\nDo TAS Support Dual Radio?: %s\n",</div><div class='add'>+			 hweight8(resp-&gt;valid_radio_mask) &gt; 1 ?</div><div class='add'>+			 "TRUE" : "FALSE");</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(resp-&gt;tas_status_radio); i++) {</div><div class='add'>+		int tmp;</div><div class='add'>+		unsigned long dynamic_status;</div><div class='add'>+</div><div class='add'>+		if (!(resp-&gt;valid_radio_mask &amp; BIT(i)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+				 "TAS report for radio:%d\n", i + 1);</div><div class='add'>+		pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+				 "Static status: %sabled\n",</div><div class='add'>+				 resp-&gt;tas_status_radio[i].static_status ?</div><div class='add'>+				 "En" : "Dis");</div><div class='add'>+		if (!resp-&gt;tas_status_radio[i].static_status) {</div><div class='add'>+			u8 static_disable_reason =</div><div class='add'>+				resp-&gt;tas_status_radio[i].static_disable_reason;</div><div class='add'>+</div><div class='add'>+			pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+					 "\tStatic Disabled Reason: ");</div><div class='add'>+			if (static_disable_reason &gt;= TAS_DISABLED_REASON_MAX) {</div><div class='add'>+				pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+						 "unsupported value (%d)\n",</div><div class='add'>+						 static_disable_reason);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+					 "%s (%d)\n",</div><div class='add'>+					 tas_dis_reason[static_disable_reason],</div><div class='add'>+					 static_disable_reason);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pos += scnprintf(buf + pos, count - pos, "\tANT A %s and ",</div><div class='add'>+				 (resp-&gt;tas_status_radio[i].dynamic_status_ant_a</div><div class='add'>+				  &amp; BIT(TAS_DYNA_ACTIVE)) ? "ON" : "OFF");</div><div class='add'>+</div><div class='add'>+		pos += scnprintf(buf + pos, count - pos, "ANT B %s for ",</div><div class='add'>+				 (resp-&gt;tas_status_radio[i].dynamic_status_ant_b</div><div class='add'>+				  &amp; BIT(TAS_DYNA_ACTIVE)) ? "ON" : "OFF");</div><div class='add'>+</div><div class='add'>+		switch (resp-&gt;tas_status_radio[i].band) {</div><div class='add'>+		case PHY_BAND_5:</div><div class='add'>+			pos += scnprintf(buf + pos, count - pos, "HB\n");</div><div class='add'>+			break;</div><div class='add'>+		case PHY_BAND_24:</div><div class='add'>+			pos += scnprintf(buf + pos, count - pos, "LB\n");</div><div class='add'>+			break;</div><div class='add'>+		case PHY_BAND_6:</div><div class='add'>+			pos += scnprintf(buf + pos, count - pos, "UHB\n");</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+					 "Unsupported band (%d)\n",</div><div class='add'>+					 resp-&gt;tas_status_radio[i].band);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+				 "Is near disconnection?: %s\n",</div><div class='add'>+				 resp-&gt;tas_status_radio[i].near_disconnection ?</div><div class='add'>+				 "True" : "False");</div><div class='add'>+</div><div class='add'>+		pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+				 "Dynamic status antenna A:\n");</div><div class='add'>+		dynamic_status = resp-&gt;tas_status_radio[i].dynamic_status_ant_a;</div><div class='add'>+		for_each_set_bit(tmp, &amp;dynamic_status, TAS_DYNA_STATUS_MAX) {</div><div class='add'>+			pos += scnprintf(buf + pos, count - pos, "\t%s (%d)\n",</div><div class='add'>+					 tas_current_status[tmp], tmp);</div><div class='add'>+		}</div><div class='add'>+		pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+				 "\nDynamic status antenna B:\n");</div><div class='add'>+		dynamic_status = resp-&gt;tas_status_radio[i].dynamic_status_ant_b;</div><div class='add'>+		for_each_set_bit(tmp, &amp;dynamic_status, TAS_DYNA_STATUS_MAX) {</div><div class='add'>+			pos += scnprintf(buf + pos, count - pos, "\t%s (%d)\n",</div><div class='add'>+					 tas_current_status[tmp], tmp);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tmp = le16_to_cpu(resp-&gt;tas_status_radio[i].max_reg_pwr_limit_ant_a);</div><div class='add'>+		pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+				 "Max antenna A regulatory pwr limit (dBm): %d.%03d\n",</div><div class='add'>+				 tmp / 8, 125 * (tmp % 8));</div><div class='add'>+		tmp = le16_to_cpu(resp-&gt;tas_status_radio[i].max_reg_pwr_limit_ant_b);</div><div class='add'>+		pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+				 "Max antenna B regulatory pwr limit (dBm): %d.%03d\n",</div><div class='add'>+				 tmp / 8, 125 * (tmp % 8));</div><div class='add'>+</div><div class='add'>+		tmp = le16_to_cpu(resp-&gt;tas_status_radio[i].sar_limit_ant_a);</div><div class='add'>+		pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+				 "Antenna A SAR limit (dBm): %d.%03d\n",</div><div class='add'>+				 tmp / 8, 125 * (tmp % 8));</div><div class='add'>+		tmp = le16_to_cpu(resp-&gt;tas_status_radio[i].sar_limit_ant_b);</div><div class='add'>+		pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+				 "Antenna B SAR limit (dBm): %d.%03d\n",</div><div class='add'>+				 tmp / 8, 125 * (tmp % 8));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t iwl_dbgfs_tas_get_status_read(struct iwl_mld *mld, char *buf,</div><div class='add'>+					     size_t count)</div><div class='add'>+{</div><div class='add'>+	struct iwl_dhc_cmd cmd = {</div><div class='add'>+		.index_and_mask = cpu_to_le32(DHC_TABLE_TOOLS |</div><div class='add'>+					      DHC_TARGET_UMAC |</div><div class='add'>+					      DHC_TOOLS_UMAC_GET_TAS_STATUS),</div><div class='add'>+	};</div><div class='add'>+	struct iwl_host_cmd hcmd = {</div><div class='add'>+		.id = WIDE_ID(LEGACY_GROUP, DEBUG_HOST_COMMAND),</div><div class='add'>+		.flags = CMD_WANT_SKB,</div><div class='add'>+		.len[0] = sizeof(cmd),</div><div class='add'>+		.data[0] = &amp;cmd,</div><div class='add'>+	};</div><div class='add'>+	struct iwl_dhc_tas_status_resp *resp = NULL;</div><div class='add'>+	u32 resp_len = 0;</div><div class='add'>+	ssize_t pos = 0;</div><div class='add'>+	u32 status;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_dbgfs_fw_cmd_disabled(mld))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd(mld, &amp;hcmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	pos += scnprintf(buf + pos, count - pos, "\nOEM name: %s\n",</div><div class='add'>+			 dmi_get_system_info(DMI_SYS_VENDOR) ?: "&lt;unknown&gt;");</div><div class='add'>+	pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+			 "\tVendor In Approved List: %s\n",</div><div class='add'>+			 iwl_is_tas_approved() ? "YES" : "NO");</div><div class='add'>+</div><div class='add'>+	status = iwl_dhc_resp_status(mld-&gt;fwrt.fw, hcmd.resp_pkt);</div><div class='add'>+	if (status != 1) {</div><div class='add'>+		pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+				 "response status is not success: %d\n",</div><div class='add'>+				 status);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	resp = iwl_dhc_resp_data(mld-&gt;fwrt.fw, hcmd.resp_pkt, &amp;resp_len);</div><div class='add'>+	if (IS_ERR(resp) || resp_len != sizeof(*resp)) {</div><div class='add'>+		pos += scnprintf(buf + pos, count - pos,</div><div class='add'>+			"Invalid size for TAS response (%u instead of %zd)\n",</div><div class='add'>+			resp_len, sizeof(*resp));</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos += iwl_mld_dump_tas_resp(resp, count - pos, buf + pos);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	iwl_free_resp(&amp;hcmd);</div><div class='add'>+	return pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+WIPHY_DEBUGFS_WRITE_FILE_OPS_MLD(fw_nmi, 10);</div><div class='add'>+WIPHY_DEBUGFS_WRITE_FILE_OPS_MLD(fw_restart, 10);</div><div class='add'>+WIPHY_DEBUGFS_READ_WRITE_FILE_OPS_MLD(he_sniffer_params, 32);</div><div class='add'>+WIPHY_DEBUGFS_WRITE_FILE_OPS_MLD(fw_dbg_clear, 10);</div><div class='add'>+WIPHY_DEBUGFS_WRITE_FILE_OPS_MLD(send_echo_cmd, 8);</div><div class='add'>+WIPHY_DEBUGFS_READ_FILE_OPS_MLD(tas_get_status, 2048);</div><div class='add'>+</div><div class='add'>+static ssize_t iwl_dbgfs_wifi_6e_enable_read(struct iwl_mld *mld,</div><div class='add'>+					     size_t count, u8 *buf)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	err = iwl_bios_get_dsm(&amp;mld-&gt;fwrt, DSM_FUNC_ENABLE_6E, &amp;value);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return scnprintf(buf, count, "0x%08x\n", value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MLD_DEBUGFS_READ_FILE_OPS(wifi_6e_enable, 64);</div><div class='add'>+</div><div class='add'>+static ssize_t iwl_dbgfs_inject_packet_write(struct iwl_mld *mld,</div><div class='add'>+					     char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct iwl_op_mode *opmode = container_of((void *)mld,</div><div class='add'>+						  struct iwl_op_mode,</div><div class='add'>+						  op_mode_specific);</div><div class='add'>+	struct iwl_rx_cmd_buffer rxb = {};</div><div class='add'>+	struct iwl_rx_packet *pkt;</div><div class='add'>+	int n_bytes = count / 2;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_dbgfs_fw_cmd_disabled(mld))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	rxb._page = alloc_pages(GFP_KERNEL, 0);</div><div class='add'>+	if (!rxb._page)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	pkt = rxb_addr(&amp;rxb);</div><div class='add'>+</div><div class='add'>+	ret = hex2bin(page_address(rxb._page), buf, n_bytes);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* avoid invalid memory access and malformed packet */</div><div class='add'>+	if (n_bytes &lt; sizeof(*pkt) ||</div><div class='add'>+	    n_bytes != sizeof(*pkt) + iwl_rx_packet_payload_len(pkt))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	iwl_mld_rx(opmode, NULL, &amp;rxb);</div><div class='add'>+	local_bh_enable();</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	iwl_free_rxb(&amp;rxb);</div><div class='add'>+</div><div class='add'>+	return ret ?: count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+WIPHY_DEBUGFS_WRITE_FILE_OPS_MLD(inject_packet, 512);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_THERMAL</div><div class='add'>+</div><div class='add'>+static ssize_t iwl_dbgfs_stop_ctdp_write(struct iwl_mld *mld,</div><div class='add'>+					 char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	if (iwl_mld_dbgfs_fw_cmd_disabled(mld))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return iwl_mld_config_ctdp(mld, mld-&gt;cooling_dev.cur_state,</div><div class='add'>+				   CTDP_CMD_OPERATION_STOP) ? : count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+WIPHY_DEBUGFS_WRITE_FILE_OPS_MLD(stop_ctdp, 8);</div><div class='add'>+</div><div class='add'>+static ssize_t iwl_dbgfs_start_ctdp_write(struct iwl_mld *mld,</div><div class='add'>+					  char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	if (iwl_mld_dbgfs_fw_cmd_disabled(mld))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return iwl_mld_config_ctdp(mld, mld-&gt;cooling_dev.cur_state,</div><div class='add'>+				   CTDP_CMD_OPERATION_START) ? : count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+WIPHY_DEBUGFS_WRITE_FILE_OPS_MLD(start_ctdp, 8);</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_THERMAL */</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+iwl_mld_add_debugfs_files(struct iwl_mld *mld, struct dentry *debugfs_dir)</div><div class='add'>+{</div><div class='add'>+	/* Add debugfs files here */</div><div class='add'>+</div><div class='add'>+	MLD_DEBUGFS_ADD_FILE(fw_nmi, debugfs_dir, 0200);</div><div class='add'>+	MLD_DEBUGFS_ADD_FILE(fw_restart, debugfs_dir, 0200);</div><div class='add'>+	MLD_DEBUGFS_ADD_FILE(wifi_6e_enable, debugfs_dir, 0400);</div><div class='add'>+	MLD_DEBUGFS_ADD_FILE(he_sniffer_params, debugfs_dir, 0600);</div><div class='add'>+	MLD_DEBUGFS_ADD_FILE(fw_dbg_clear, debugfs_dir, 0200);</div><div class='add'>+	MLD_DEBUGFS_ADD_FILE(send_echo_cmd, debugfs_dir, 0200);</div><div class='add'>+	MLD_DEBUGFS_ADD_FILE(tas_get_status, debugfs_dir, 0400);</div><div class='add'>+#ifdef CONFIG_THERMAL</div><div class='add'>+	MLD_DEBUGFS_ADD_FILE(start_ctdp, debugfs_dir, 0200);</div><div class='add'>+	MLD_DEBUGFS_ADD_FILE(stop_ctdp, debugfs_dir, 0200);</div><div class='add'>+#endif</div><div class='add'>+	MLD_DEBUGFS_ADD_FILE(inject_packet, debugfs_dir, 0200);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	debugfs_create_u32("max_sleep", 0600, debugfs_dir,</div><div class='add'>+			   &amp;mld-&gt;debug_max_sleep);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	debugfs_create_bool("rx_ts_ptp", 0600, debugfs_dir,</div><div class='add'>+			    &amp;mld-&gt;monitor.ptp_time);</div><div class='add'>+</div><div class='add'>+	/* Create a symlink with mac80211. It will be removed when mac80211</div><div class='add'>+	 * exits (before the opmode exits which removes the target.)</div><div class='add'>+	 */</div><div class='add'>+	if (!IS_ERR(debugfs_dir)) {</div><div class='add'>+		char buf[100];</div><div class='add'>+</div><div class='add'>+		snprintf(buf, 100, "../../%pd2", debugfs_dir-&gt;d_parent);</div><div class='add'>+		debugfs_create_symlink("iwlwifi", mld-&gt;wiphy-&gt;debugfsdir,</div><div class='add'>+				       buf);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define VIF_DEBUGFS_WRITE_FILE_OPS(name, bufsz)			\</div><div class='add'>+	WIPHY_DEBUGFS_WRITE_FILE_OPS(vif_##name, bufsz, vif)</div><div class='add'>+</div><div class='add'>+#define VIF_DEBUGFS_READ_WRITE_FILE_OPS(name, bufsz)			    \</div><div class='add'>+	IEEE80211_WIPHY_DEBUGFS_READ_WRITE_FILE_OPS(vif_##name, bufsz, vif) \</div><div class='add'>+</div><div class='add'>+#define VIF_DEBUGFS_ADD_FILE_ALIAS(alias, name, parent, mode)	\</div><div class='add'>+	debugfs_create_file(alias, mode, parent, vif,		\</div><div class='add'>+			    &amp;iwl_dbgfs_vif_##name##_ops)</div><div class='add'>+#define VIF_DEBUGFS_ADD_FILE(name, parent, mode)		\</div><div class='add'>+	VIF_DEBUGFS_ADD_FILE_ALIAS(#name, name, parent, mode)</div><div class='add'>+</div><div class='add'>+static ssize_t iwl_dbgfs_vif_bf_params_write(struct iwl_mld *mld, char *buf,</div><div class='add'>+					     size_t count, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = data;</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	int link_id = vif-&gt;active_links ? __ffs(vif-&gt;active_links) : 0;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	if (!strncmp("bf_enable_beacon_filter=", buf, 24)) {</div><div class='add'>+		if (sscanf(buf + 24, "%d", &amp;val) != 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (val != 0 &amp;&amp; val != 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	link_conf = link_conf_dereference_protected(vif, link_id);</div><div class='add'>+	if (WARN_ON(!link_conf))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_dbgfs_fw_cmd_disabled(mld))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	mld_vif-&gt;disable_bf = !val;</div><div class='add'>+</div><div class='add'>+	if (val)</div><div class='add'>+		return iwl_mld_enable_beacon_filter(mld, link_conf,</div><div class='add'>+						    false) ?: count;</div><div class='add'>+	else</div><div class='add'>+		return iwl_mld_disable_beacon_filter(mld, vif) ?: count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t iwl_dbgfs_vif_pm_params_write(struct iwl_mld *mld,</div><div class='add'>+					     char *buf,</div><div class='add'>+					     size_t count, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = data;</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	if (!strncmp("use_ps_poll=", buf, 12)) {</div><div class='add'>+		if (sscanf(buf + 12, "%d", &amp;val) != 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_dbgfs_fw_cmd_disabled(mld))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	mld_vif-&gt;use_ps_poll = val;</div><div class='add'>+</div><div class='add'>+	return iwl_mld_update_mac_power(mld, vif, false) ?: count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t iwl_dbgfs_vif_low_latency_write(struct iwl_mld *mld,</div><div class='add'>+					       char *buf, size_t count,</div><div class='add'>+					       void *data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = data;</div><div class='add'>+	u8 value;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtou8(buf, 0, &amp;value);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (value &gt; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	iwl_mld_vif_update_low_latency(mld, vif, value, LOW_LATENCY_DEBUGFS);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t iwl_dbgfs_vif_low_latency_read(struct ieee80211_vif *vif,</div><div class='add'>+					      size_t count, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	char format[] = "traffic=%d\ndbgfs=%d\nvif_type=%d\nactual=%d\n";</div><div class='add'>+	u8 ll_causes;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(count &lt; sizeof(format)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ll_causes = READ_ONCE(mld_vif-&gt;low_latency_causes);</div><div class='add'>+</div><div class='add'>+	/* all values in format are boolean so the size of format is enough</div><div class='add'>+	 * for holding the result string</div><div class='add'>+	 */</div><div class='add'>+	return scnprintf(buf, count, format,</div><div class='add'>+			 !!(ll_causes &amp; LOW_LATENCY_TRAFFIC),</div><div class='add'>+			 !!(ll_causes &amp; LOW_LATENCY_DEBUGFS),</div><div class='add'>+			 !!(ll_causes &amp; LOW_LATENCY_VIF_TYPE),</div><div class='add'>+			 !!(ll_causes));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+VIF_DEBUGFS_WRITE_FILE_OPS(pm_params, 32);</div><div class='add'>+VIF_DEBUGFS_WRITE_FILE_OPS(bf_params, 32);</div><div class='add'>+VIF_DEBUGFS_READ_WRITE_FILE_OPS(low_latency, 45);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+_iwl_dbgfs_inject_beacon_ie(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			    char *bin, ssize_t len,</div><div class='add'>+			    bool restore)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif;</div><div class='add'>+	struct iwl_mld_link *mld_link;</div><div class='add'>+	struct iwl_mac_beacon_cmd beacon_cmd = {};</div><div class='add'>+	int n_bytes = len / 2;</div><div class='add'>+</div><div class='add'>+	/* Element len should be represented by u8 */</div><div class='add'>+	if (n_bytes &gt;= U8_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_dbgfs_fw_cmd_disabled(mld))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (!vif)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	mld_vif-&gt;beacon_inject_active = true;</div><div class='add'>+	mld-&gt;hw-&gt;extra_beacon_tailroom = n_bytes;</div><div class='add'>+</div><div class='add'>+	for_each_mld_vif_valid_link(mld_vif, mld_link) {</div><div class='add'>+		u32 offset;</div><div class='add'>+		struct ieee80211_tx_info *info;</div><div class='add'>+		struct ieee80211_bss_conf *link_conf =</div><div class='add'>+			link_conf_dereference_protected(vif, link_id);</div><div class='add'>+		struct ieee80211_chanctx_conf *ctx =</div><div class='add'>+			wiphy_dereference(mld-&gt;wiphy, link_conf-&gt;chanctx_conf);</div><div class='add'>+		struct sk_buff *beacon =</div><div class='add'>+			ieee80211_beacon_get_template(mld-&gt;hw, vif,</div><div class='add'>+						      NULL, link_id);</div><div class='add'>+</div><div class='add'>+		if (!beacon)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (!restore &amp;&amp; (WARN_ON(!n_bytes || !bin) ||</div><div class='add'>+				 hex2bin(skb_put_zero(beacon, n_bytes),</div><div class='add'>+					 bin, n_bytes))) {</div><div class='add'>+			dev_kfree_skb(beacon);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		info = IEEE80211_SKB_CB(beacon);</div><div class='add'>+</div><div class='add'>+		beacon_cmd.flags =</div><div class='add'>+			cpu_to_le16(iwl_mld_get_rate_flags(mld, info, vif,</div><div class='add'>+							   link_conf,</div><div class='add'>+							   ctx-&gt;def.chan-&gt;band));</div><div class='add'>+		beacon_cmd.byte_cnt = cpu_to_le16((u16)beacon-&gt;len);</div><div class='add'>+		beacon_cmd.link_id =</div><div class='add'>+			cpu_to_le32(mld_link-&gt;fw_id);</div><div class='add'>+</div><div class='add'>+		iwl_mld_set_tim_idx(mld, &amp;beacon_cmd.tim_idx,</div><div class='add'>+				    beacon-&gt;data, beacon-&gt;len);</div><div class='add'>+</div><div class='add'>+		offset = iwl_find_ie_offset(beacon-&gt;data,</div><div class='add'>+					    WLAN_EID_S1G_TWT,</div><div class='add'>+					    beacon-&gt;len);</div><div class='add'>+</div><div class='add'>+		beacon_cmd.btwt_offset = cpu_to_le32(offset);</div><div class='add'>+</div><div class='add'>+		iwl_mld_send_beacon_template_cmd(mld, beacon, &amp;beacon_cmd);</div><div class='add'>+		dev_kfree_skb(beacon);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (restore)</div><div class='add'>+		mld_vif-&gt;beacon_inject_active = false;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+iwl_dbgfs_vif_inject_beacon_ie_write(struct iwl_mld *mld,</div><div class='add'>+				     char *buf, size_t count,</div><div class='add'>+				     void *data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = data;</div><div class='add'>+	int ret = _iwl_dbgfs_inject_beacon_ie(mld, vif, buf,</div><div class='add'>+					      count, false);</div><div class='add'>+</div><div class='add'>+	mld-&gt;hw-&gt;extra_beacon_tailroom = 0;</div><div class='add'>+	return ret ?: count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+VIF_DEBUGFS_WRITE_FILE_OPS(inject_beacon_ie, 512);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+iwl_dbgfs_vif_inject_beacon_ie_restore_write(struct iwl_mld *mld,</div><div class='add'>+					     char *buf,</div><div class='add'>+					     size_t count,</div><div class='add'>+					     void *data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = data;</div><div class='add'>+	int ret = _iwl_dbgfs_inject_beacon_ie(mld, vif, NULL,</div><div class='add'>+					      0, true);</div><div class='add'>+</div><div class='add'>+	mld-&gt;hw-&gt;extra_beacon_tailroom = 0;</div><div class='add'>+	return ret ?: count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+VIF_DEBUGFS_WRITE_FILE_OPS(inject_beacon_ie_restore, 512);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+iwl_dbgfs_vif_twt_setup_write(struct iwl_mld *mld, char *buf, size_t count,</div><div class='add'>+			      void *data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_host_cmd hcmd = {</div><div class='add'>+		.id = WIDE_ID(IWL_ALWAYS_LONG_GROUP, DEBUG_HOST_COMMAND),</div><div class='add'>+	};</div><div class='add'>+	struct ieee80211_vif *vif = data;</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_dhc_cmd *cmd __free(kfree) = NULL;</div><div class='add'>+	struct iwl_dhc_twt_operation *dhc_twt_cmd;</div><div class='add'>+	u64 target_wake_time;</div><div class='add'>+	u32 twt_operation, interval_exp, interval_mantissa, min_wake_duration;</div><div class='add'>+	u8 trigger, flow_type, flow_id, protection, tenth_param;</div><div class='add'>+	u8 twt_request = 1, broadcast = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_dbgfs_fw_cmd_disabled(mld))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	ret = sscanf(buf, "%u %llu %u %u %u %hhu %hhu %hhu %hhu %hhu",</div><div class='add'>+		     &amp;twt_operation, &amp;target_wake_time, &amp;interval_exp,</div><div class='add'>+		     &amp;interval_mantissa, &amp;min_wake_duration, &amp;trigger,</div><div class='add'>+		     &amp;flow_type, &amp;flow_id, &amp;protection, &amp;tenth_param);</div><div class='add'>+</div><div class='add'>+	/* the new twt_request parameter is optional for station */</div><div class='add'>+	if ((ret != 9 &amp;&amp; ret != 10) ||</div><div class='add'>+	    (ret == 10 &amp;&amp; vif-&gt;type != NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+	     tenth_param == 1))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* The 10th parameter:</div><div class='add'>+	 * In STA mode - the TWT type (broadcast or individual)</div><div class='add'>+	 * In AP mode - the role (0 responder, 2 unsolicited)</div><div class='add'>+	 */</div><div class='add'>+	if (ret == 10) {</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+			broadcast = tenth_param;</div><div class='add'>+		else</div><div class='add'>+			twt_request = tenth_param;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd = kzalloc(sizeof(*cmd) + sizeof(*dhc_twt_cmd), GFP_KERNEL);</div><div class='add'>+	if (!cmd)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dhc_twt_cmd = (void *)cmd-&gt;data;</div><div class='add'>+	dhc_twt_cmd-&gt;mac_id = cpu_to_le32(mld_vif-&gt;fw_id);</div><div class='add'>+	dhc_twt_cmd-&gt;twt_operation = cpu_to_le32(twt_operation);</div><div class='add'>+	dhc_twt_cmd-&gt;target_wake_time = cpu_to_le64(target_wake_time);</div><div class='add'>+	dhc_twt_cmd-&gt;interval_exp = cpu_to_le32(interval_exp);</div><div class='add'>+	dhc_twt_cmd-&gt;interval_mantissa = cpu_to_le32(interval_mantissa);</div><div class='add'>+	dhc_twt_cmd-&gt;min_wake_duration = cpu_to_le32(min_wake_duration);</div><div class='add'>+	dhc_twt_cmd-&gt;trigger = trigger;</div><div class='add'>+	dhc_twt_cmd-&gt;flow_type = flow_type;</div><div class='add'>+	dhc_twt_cmd-&gt;flow_id = flow_id;</div><div class='add'>+	dhc_twt_cmd-&gt;protection = protection;</div><div class='add'>+	dhc_twt_cmd-&gt;twt_request = twt_request;</div><div class='add'>+	dhc_twt_cmd-&gt;negotiation_type = broadcast ? 3 : 0;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;length = cpu_to_le32(sizeof(*dhc_twt_cmd) &gt;&gt; 2);</div><div class='add'>+	cmd-&gt;index_and_mask =</div><div class='add'>+		cpu_to_le32(DHC_TABLE_INTEGRATION | DHC_TARGET_UMAC |</div><div class='add'>+			    DHC_INT_UMAC_TWT_OPERATION);</div><div class='add'>+</div><div class='add'>+	hcmd.len[0] = sizeof(*cmd) + sizeof(*dhc_twt_cmd);</div><div class='add'>+	hcmd.data[0] = cmd;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd(mld, &amp;hcmd);</div><div class='add'>+</div><div class='add'>+	return ret ?: count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+VIF_DEBUGFS_WRITE_FILE_OPS(twt_setup, 256);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+iwl_dbgfs_vif_twt_operation_write(struct iwl_mld *mld, char *buf, size_t count,</div><div class='add'>+				  void *data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = data;</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_twt_operation_cmd twt_cmd = {};</div><div class='add'>+	int link_id = vif-&gt;active_links ? __ffs(vif-&gt;active_links) : 0;</div><div class='add'>+	struct iwl_mld_link *mld_link = iwl_mld_link_dereference_check(mld_vif,</div><div class='add'>+								       link_id);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mld_link))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_dbgfs_fw_cmd_disabled(mld))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (hweight16(vif-&gt;active_links) &gt; 1)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ret = sscanf(buf,</div><div class='add'>+		     "%u %llu %u %u %u %hhu %hhu %hhu %hhu %hhu %hhu %hhu %hhu %hhu %hhu %hhu %hhu %hhu %hhu %hhu %hhu",</div><div class='add'>+		     &amp;twt_cmd.twt_operation, &amp;twt_cmd.target_wake_time,</div><div class='add'>+		     &amp;twt_cmd.interval_exponent, &amp;twt_cmd.interval_mantissa,</div><div class='add'>+		     &amp;twt_cmd.minimum_wake_duration, &amp;twt_cmd.trigger,</div><div class='add'>+		     &amp;twt_cmd.flow_type, &amp;twt_cmd.flow_id,</div><div class='add'>+		     &amp;twt_cmd.twt_protection, &amp;twt_cmd.ndp_paging_indicator,</div><div class='add'>+		     &amp;twt_cmd.responder_pm_mode, &amp;twt_cmd.negotiation_type,</div><div class='add'>+		     &amp;twt_cmd.twt_request, &amp;twt_cmd.implicit,</div><div class='add'>+		     &amp;twt_cmd.twt_group_assignment, &amp;twt_cmd.twt_channel,</div><div class='add'>+		     &amp;twt_cmd.restricted_info_present, &amp;twt_cmd.dl_bitmap_valid,</div><div class='add'>+		     &amp;twt_cmd.ul_bitmap_valid, &amp;twt_cmd.dl_tid_bitmap,</div><div class='add'>+		     &amp;twt_cmd.ul_tid_bitmap);</div><div class='add'>+</div><div class='add'>+	if (ret != 21)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	twt_cmd.link_id = cpu_to_le32(mld_link-&gt;fw_id);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd_pdu(mld,</div><div class='add'>+				   WIDE_ID(MAC_CONF_GROUP, TWT_OPERATION_CMD),</div><div class='add'>+				   &amp;twt_cmd);</div><div class='add'>+	return ret ?: count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+VIF_DEBUGFS_WRITE_FILE_OPS(twt_operation, 256);</div><div class='add'>+</div><div class='add'>+static ssize_t iwl_dbgfs_vif_int_mlo_scan_write(struct iwl_mld *mld, char *buf,</div><div class='add'>+						size_t count, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = data;</div><div class='add'>+	u32 action;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!vif-&gt;cfg.assoc || !ieee80211_vif_is_mld(vif))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (kstrtou32(buf, 0, &amp;action))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (action == 0) {</div><div class='add'>+		ret = iwl_mld_scan_stop(mld, IWL_MLD_SCAN_INT_MLO, false);</div><div class='add'>+	} else if (action == 1) {</div><div class='add'>+		iwl_mld_int_mlo_scan(mld, vif);</div><div class='add'>+		ret = 0;</div><div class='add'>+	} else {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret ?: count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+VIF_DEBUGFS_WRITE_FILE_OPS(int_mlo_scan, 32);</div><div class='add'>+</div><div class='add'>+void iwl_mld_add_vif_debugfs(struct ieee80211_hw *hw,</div><div class='add'>+			     struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct dentry *mld_vif_dbgfs =</div><div class='add'>+		debugfs_create_dir("iwlmld", vif-&gt;debugfs_dir);</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	char target[3 * 3 + 11 + (NL80211_WIPHY_NAME_MAXLEN + 1) +</div><div class='add'>+		    (7 + IFNAMSIZ + 1) + 6 + 1];</div><div class='add'>+	char name[7 + IFNAMSIZ + 1];</div><div class='add'>+</div><div class='add'>+	/* Create symlink for convenience pointing to interface specific</div><div class='add'>+	 * debugfs entries for the driver. For example, under</div><div class='add'>+	 * /sys/kernel/debug/iwlwifi/0000\:02\:00.0/iwlmld/</div><div class='add'>+	 * find</div><div class='add'>+	 * netdev:wlan0 -&gt; ../../../ieee80211/phy0/netdev:wlan0/iwlmld/</div><div class='add'>+	 */</div><div class='add'>+	snprintf(name, sizeof(name), "%pd", vif-&gt;debugfs_dir);</div><div class='add'>+	snprintf(target, sizeof(target), "../../../%pd3/iwlmld",</div><div class='add'>+		 vif-&gt;debugfs_dir);</div><div class='add'>+	if (!mld_vif-&gt;dbgfs_slink)</div><div class='add'>+		mld_vif-&gt;dbgfs_slink =</div><div class='add'>+			debugfs_create_symlink(name, mld-&gt;debugfs_dir, target);</div><div class='add'>+</div><div class='add'>+	if (iwlmld_mod_params.power_scheme != IWL_POWER_SCHEME_CAM &amp;&amp;</div><div class='add'>+	    vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='add'>+		VIF_DEBUGFS_ADD_FILE(pm_params, mld_vif_dbgfs, 0200);</div><div class='add'>+		VIF_DEBUGFS_ADD_FILE(bf_params, mld_vif_dbgfs, 0200);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP) {</div><div class='add'>+		VIF_DEBUGFS_ADD_FILE(inject_beacon_ie, mld_vif_dbgfs, 0200);</div><div class='add'>+		VIF_DEBUGFS_ADD_FILE(inject_beacon_ie_restore,</div><div class='add'>+				     mld_vif_dbgfs, 0200);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	VIF_DEBUGFS_ADD_FILE(low_latency, mld_vif_dbgfs, 0600);</div><div class='add'>+	VIF_DEBUGFS_ADD_FILE(twt_setup, mld_vif_dbgfs, 0200);</div><div class='add'>+	VIF_DEBUGFS_ADD_FILE(twt_operation, mld_vif_dbgfs, 0200);</div><div class='add'>+	VIF_DEBUGFS_ADD_FILE(int_mlo_scan, mld_vif_dbgfs, 0200);</div><div class='add'>+}</div><div class='add'>+#define LINK_DEBUGFS_WRITE_FILE_OPS(name, bufsz)			\</div><div class='add'>+	WIPHY_DEBUGFS_WRITE_FILE_OPS(link_##name, bufsz, bss_conf)</div><div class='add'>+</div><div class='add'>+#define LINK_DEBUGFS_ADD_FILE_ALIAS(alias, name, parent, mode)		\</div><div class='add'>+	debugfs_create_file(alias, mode, parent, link_conf,		\</div><div class='add'>+			    &amp;iwl_dbgfs_link_##name##_ops)</div><div class='add'>+#define LINK_DEBUGFS_ADD_FILE(name, parent, mode)			\</div><div class='add'>+	LINK_DEBUGFS_ADD_FILE_ALIAS(#name, name, parent, mode)</div><div class='add'>+</div><div class='add'>+void iwl_mld_add_link_debugfs(struct ieee80211_hw *hw,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			      struct dentry *dir)</div><div class='add'>+{</div><div class='add'>+	struct dentry *mld_link_dir;</div><div class='add'>+</div><div class='add'>+	mld_link_dir = debugfs_lookup("iwlmld", dir);</div><div class='add'>+</div><div class='add'>+	/* For non-MLO vifs, the dir of deflink is the same as the vif's one.</div><div class='add'>+	 * so if iwlmld dir already exists, this means that this is deflink.</div><div class='add'>+	 * If not, this is a per-link dir of a MLO vif, add in it the iwlmld</div><div class='add'>+	 * dir.</div><div class='add'>+	 */</div><div class='add'>+	if (!mld_link_dir) {</div><div class='add'>+		mld_link_dir = debugfs_create_dir("iwlmld", dir);</div><div class='add'>+	} else {</div><div class='add'>+		/* Release the reference from debugfs_lookup */</div><div class='add'>+		dput(mld_link_dir);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t _iwl_dbgfs_fixed_rate_write(struct iwl_mld *mld, char *buf,</div><div class='add'>+					   size_t count, void *data, bool v3)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_link_sta *link_sta = data;</div><div class='add'>+	struct iwl_mld_link_sta *mld_link_sta;</div><div class='add'>+	u32 rate;</div><div class='add'>+	u32 partial = false;</div><div class='add'>+	char pretty_rate[100];</div><div class='add'>+	int ret;</div><div class='add'>+	u8 fw_sta_id;</div><div class='add'>+</div><div class='add'>+	mld_link_sta = iwl_mld_link_sta_from_mac80211(link_sta);</div><div class='add'>+	if (WARN_ON(!mld_link_sta))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	fw_sta_id = mld_link_sta-&gt;fw_id;</div><div class='add'>+</div><div class='add'>+	if (sscanf(buf, "%i %i", &amp;rate, &amp;partial) == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_dbgfs_fw_cmd_disabled(mld))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	/* input is in FW format (v2 or v3) so convert to v3 */</div><div class='add'>+	rate = iwl_v3_rate_from_v2_v3(cpu_to_le32(rate), v3);</div><div class='add'>+	rate = le32_to_cpu(iwl_v3_rate_to_v2_v3(rate, mld-&gt;fw_rates_ver_3));</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_tlc_dhc(mld, fw_sta_id,</div><div class='add'>+				   partial ? IWL_TLC_DEBUG_PARTIAL_FIXED_RATE :</div><div class='add'>+					     IWL_TLC_DEBUG_FIXED_RATE,</div><div class='add'>+				   rate);</div><div class='add'>+</div><div class='add'>+	rs_pretty_print_rate(pretty_rate, sizeof(pretty_rate), rate);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_RATE(mld, "sta_id %d rate %s partial: %d, ret:%d\n",</div><div class='add'>+		       fw_sta_id, pretty_rate, partial, ret);</div><div class='add'>+</div><div class='add'>+	return ret ? : count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t iwl_dbgfs_fixed_rate_write(struct iwl_mld *mld, char *buf,</div><div class='add'>+					  size_t count, void *data)</div><div class='add'>+{</div><div class='add'>+	return _iwl_dbgfs_fixed_rate_write(mld, buf, count, data, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t iwl_dbgfs_fixed_rate_v3_write(struct iwl_mld *mld, char *buf,</div><div class='add'>+					     size_t count, void *data)</div><div class='add'>+{</div><div class='add'>+	return _iwl_dbgfs_fixed_rate_write(mld, buf, count, data, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t iwl_dbgfs_tlc_dhc_write(struct iwl_mld *mld, char *buf,</div><div class='add'>+				       size_t count, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_link_sta *link_sta = data;</div><div class='add'>+	struct iwl_mld_link_sta *mld_link_sta;</div><div class='add'>+	u32 type, value;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 fw_sta_id;</div><div class='add'>+</div><div class='add'>+	mld_link_sta = iwl_mld_link_sta_from_mac80211(link_sta);</div><div class='add'>+	if (WARN_ON(!mld_link_sta))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	fw_sta_id = mld_link_sta-&gt;fw_id;</div><div class='add'>+</div><div class='add'>+	if (sscanf(buf, "%i %i", &amp;type, &amp;value) != 2) {</div><div class='add'>+		IWL_DEBUG_RATE(mld, "usage &lt;type&gt; &lt;value&gt;\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_dbgfs_fw_cmd_disabled(mld))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_tlc_dhc(mld, fw_sta_id, type, value);</div><div class='add'>+</div><div class='add'>+	return ret ? : count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define LINK_STA_DEBUGFS_ADD_FILE_ALIAS(alias, name, parent, mode)	\</div><div class='add'>+	debugfs_create_file(alias, mode, parent, link_sta,		\</div><div class='add'>+			    &amp;iwl_dbgfs_##name##_ops)</div><div class='add'>+#define LINK_STA_DEBUGFS_ADD_FILE(name, parent, mode)			\</div><div class='add'>+	LINK_STA_DEBUGFS_ADD_FILE_ALIAS(#name, name, parent, mode)</div><div class='add'>+</div><div class='add'>+#define LINK_STA_WIPHY_DEBUGFS_WRITE_OPS(name, bufsz)			\</div><div class='add'>+	WIPHY_DEBUGFS_WRITE_FILE_OPS(name, bufsz, link_sta)</div><div class='add'>+</div><div class='add'>+LINK_STA_WIPHY_DEBUGFS_WRITE_OPS(tlc_dhc, 64);</div><div class='add'>+LINK_STA_WIPHY_DEBUGFS_WRITE_OPS(fixed_rate, 64);</div><div class='add'>+LINK_STA_WIPHY_DEBUGFS_WRITE_OPS(fixed_rate_v3, 64);</div><div class='add'>+</div><div class='add'>+void iwl_mld_add_link_sta_debugfs(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  struct ieee80211_link_sta *link_sta,</div><div class='add'>+				  struct dentry *dir)</div><div class='add'>+{</div><div class='add'>+	LINK_STA_DEBUGFS_ADD_FILE(fixed_rate, dir, 0200);</div><div class='add'>+	LINK_STA_DEBUGFS_ADD_FILE(fixed_rate_v3, dir, 0200);</div><div class='add'>+	LINK_STA_DEBUGFS_ADD_FILE(tlc_dhc, dir, 0200);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/debugfs.h b/drivers/net/wireless/intel/iwlwifi/mld/debugfs.h<br/>new file mode 100644<br/>index 000000000000..eeba35342ba1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/debugfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/debugfs.h</a></div><div class='hunk'>@@ -0,0 +1,244 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include "iface.h"</div><div class='add'>+#include "sta.h"</div><div class='add'>+</div><div class='add'>+#define MLD_DEBUGFS_OPEN_WRAPPER(name, buflen, argtype)			\</div><div class='add'>+struct dbgfs_##name##_data {						\</div><div class='add'>+	argtype *arg;							\</div><div class='add'>+	bool read_done;							\</div><div class='add'>+	ssize_t rlen;							\</div><div class='add'>+	char buf[buflen];						\</div><div class='add'>+};									\</div><div class='add'>+static int _iwl_dbgfs_##name##_open(struct inode *inode,		\</div><div class='add'>+				    struct file *file)			\</div><div class='add'>+{									\</div><div class='add'>+	struct dbgfs_##name##_data *data;				\</div><div class='add'>+									\</div><div class='add'>+	if ((file-&gt;f_flags &amp; O_ACCMODE) == O_RDWR)			\</div><div class='add'>+		return -EOPNOTSUPP;					\</div><div class='add'>+									\</div><div class='add'>+	data = kzalloc(sizeof(*data), GFP_KERNEL);			\</div><div class='add'>+	if (!data)							\</div><div class='add'>+		return -ENOMEM;						\</div><div class='add'>+									\</div><div class='add'>+	data-&gt;read_done = false;					\</div><div class='add'>+	data-&gt;arg = inode-&gt;i_private;					\</div><div class='add'>+	file-&gt;private_data = data;					\</div><div class='add'>+									\</div><div class='add'>+	return 0;							\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MLD_DEBUGFS_READ_WRAPPER(name)					\</div><div class='add'>+static ssize_t _iwl_dbgfs_##name##_read(struct file *file,		\</div><div class='add'>+					char __user *user_buf,		\</div><div class='add'>+					size_t count, loff_t *ppos)	\</div><div class='add'>+{									\</div><div class='add'>+	struct dbgfs_##name##_data *data = file-&gt;private_data;		\</div><div class='add'>+									\</div><div class='add'>+	if (!data-&gt;read_done) {						\</div><div class='add'>+		data-&gt;read_done = true;					\</div><div class='add'>+		data-&gt;rlen = iwl_dbgfs_##name##_read(data-&gt;arg,		\</div><div class='add'>+						     sizeof(data-&gt;buf),\</div><div class='add'>+						     data-&gt;buf);	\</div><div class='add'>+	}								\</div><div class='add'>+									\</div><div class='add'>+	if (data-&gt;rlen &lt; 0)						\</div><div class='add'>+		return data-&gt;rlen;					\</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos,		\</div><div class='add'>+				       data-&gt;buf, data-&gt;rlen);		\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int _iwl_dbgfs_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	kfree(file-&gt;private_data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define _MLD_DEBUGFS_READ_FILE_OPS(name, buflen, argtype)		\</div><div class='add'>+MLD_DEBUGFS_OPEN_WRAPPER(name, buflen, argtype)				\</div><div class='add'>+MLD_DEBUGFS_READ_WRAPPER(name)						\</div><div class='add'>+static const struct file_operations iwl_dbgfs_##name##_ops = {		\</div><div class='add'>+	.read = _iwl_dbgfs_##name##_read,				\</div><div class='add'>+	.open = _iwl_dbgfs_##name##_open,				\</div><div class='add'>+	.llseek = generic_file_llseek,					\</div><div class='add'>+	.release = _iwl_dbgfs_release,					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define WIPHY_DEBUGFS_WRITE_HANDLER_WRAPPER(name)			\</div><div class='add'>+static ssize_t iwl_dbgfs_##name##_write_handler(struct wiphy *wiphy,	\</div><div class='add'>+				       struct file *file, char *buf,	\</div><div class='add'>+				       size_t count, void *data)	\</div><div class='add'>+{									\</div><div class='add'>+	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);		\</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);			\</div><div class='add'>+	return iwl_dbgfs_##name##_write(mld, buf, count, data);		\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct iwl_mld *</div><div class='add'>+iwl_mld_from_link_sta(struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif =</div><div class='add'>+		iwl_mld_sta_from_mac80211(link_sta-&gt;sta)-&gt;vif;</div><div class='add'>+	return iwl_mld_vif_from_mac80211(vif)-&gt;mld;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct iwl_mld *</div><div class='add'>+iwl_mld_from_bss_conf(struct ieee80211_bss_conf *link)</div><div class='add'>+{</div><div class='add'>+	return iwl_mld_vif_from_mac80211(link-&gt;vif)-&gt;mld;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct iwl_mld *iwl_mld_from_vif(struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	return iwl_mld_vif_from_mac80211(vif)-&gt;mld;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define WIPHY_DEBUGFS_WRITE_WRAPPER(name, bufsz, objtype)		\</div><div class='add'>+WIPHY_DEBUGFS_WRITE_HANDLER_WRAPPER(name)				\</div><div class='add'>+static ssize_t __iwl_dbgfs_##name##_write(struct file *file,		\</div><div class='add'>+					  const char __user *user_buf,	\</div><div class='add'>+					  size_t count, loff_t *ppos)	\</div><div class='add'>+{									\</div><div class='add'>+	struct ieee80211_##objtype *arg = file-&gt;private_data;		\</div><div class='add'>+	struct iwl_mld *mld = iwl_mld_from_##objtype(arg);		\</div><div class='add'>+	char buf[bufsz] = {};						\</div><div class='add'>+									\</div><div class='add'>+	return wiphy_locked_debugfs_write(mld-&gt;wiphy, file,		\</div><div class='add'>+				buf, sizeof(buf),			\</div><div class='add'>+				user_buf, count,			\</div><div class='add'>+				iwl_dbgfs_##name##_write_handler,	\</div><div class='add'>+				arg);					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define WIPHY_DEBUGFS_WRITE_FILE_OPS(name, bufsz, objtype)		\</div><div class='add'>+	WIPHY_DEBUGFS_WRITE_WRAPPER(name, bufsz, objtype)		\</div><div class='add'>+	static const struct file_operations iwl_dbgfs_##name##_ops = {	\</div><div class='add'>+		.write = __iwl_dbgfs_##name##_write,			\</div><div class='add'>+		.open = simple_open,					\</div><div class='add'>+		.llseek = generic_file_llseek,				\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define WIPHY_DEBUGFS_READ_HANDLER_WRAPPER_MLD(name)			\</div><div class='add'>+static ssize_t iwl_dbgfs_##name##_read_handler(struct wiphy *wiphy,	\</div><div class='add'>+				       struct file *file, char *buf,	\</div><div class='add'>+				       size_t count, void *data)	\</div><div class='add'>+{									\</div><div class='add'>+	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);		\</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);			\</div><div class='add'>+	return iwl_dbgfs_##name##_read(mld, buf, count);		\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define WIPHY_DEBUGFS_WRITE_HANDLER_WRAPPER_MLD(name)			\</div><div class='add'>+static ssize_t iwl_dbgfs_##name##_write_handler(struct wiphy *wiphy,	\</div><div class='add'>+				       struct file *file, char *buf,	\</div><div class='add'>+				       size_t count, void *data)	\</div><div class='add'>+{									\</div><div class='add'>+	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);		\</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);			\</div><div class='add'>+	return iwl_dbgfs_##name##_write(mld, buf, count);		\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define WIPHY_DEBUGFS_WRITE_WRAPPER_MLD(name)				\</div><div class='add'>+WIPHY_DEBUGFS_WRITE_HANDLER_WRAPPER_MLD(name)				\</div><div class='add'>+static ssize_t __iwl_dbgfs_##name##_write(struct file *file,		\</div><div class='add'>+					  const char __user *user_buf,	\</div><div class='add'>+					  size_t count, loff_t *ppos)	\</div><div class='add'>+{									\</div><div class='add'>+	struct dbgfs_##name##_data *data = file-&gt;private_data;		\</div><div class='add'>+	struct iwl_mld *mld = data-&gt;arg;				\</div><div class='add'>+									\</div><div class='add'>+	return wiphy_locked_debugfs_write(mld-&gt;wiphy, file,		\</div><div class='add'>+				data-&gt;buf, sizeof(data-&gt;buf),		\</div><div class='add'>+				user_buf, count,			\</div><div class='add'>+				iwl_dbgfs_##name##_write_handler,	\</div><div class='add'>+				NULL);					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define WIPHY_DEBUGFS_READ_WRAPPER_MLD(name)				\</div><div class='add'>+WIPHY_DEBUGFS_READ_HANDLER_WRAPPER_MLD(name)				\</div><div class='add'>+static ssize_t __iwl_dbgfs_##name##_read(struct file *file,		\</div><div class='add'>+					char __user *user_buf,		\</div><div class='add'>+					size_t count, loff_t *ppos)	\</div><div class='add'>+{									\</div><div class='add'>+	struct dbgfs_##name##_data *data = file-&gt;private_data;		\</div><div class='add'>+	struct iwl_mld *mld = data-&gt;arg;				\</div><div class='add'>+									\</div><div class='add'>+	if (!data-&gt;read_done) {						\</div><div class='add'>+		data-&gt;read_done = true;					\</div><div class='add'>+		data-&gt;rlen = wiphy_locked_debugfs_read(mld-&gt;wiphy,	\</div><div class='add'>+				file, data-&gt;buf, sizeof(data-&gt;buf),	\</div><div class='add'>+				user_buf, count, ppos,			\</div><div class='add'>+				iwl_dbgfs_##name##_read_handler, NULL);	\</div><div class='add'>+		return data-&gt;rlen;					\</div><div class='add'>+	}								\</div><div class='add'>+									\</div><div class='add'>+	if (data-&gt;rlen &lt; 0)						\</div><div class='add'>+		return data-&gt;rlen;					\</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos,		\</div><div class='add'>+				       data-&gt;buf, data-&gt;rlen);		\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define WIPHY_DEBUGFS_READ_FILE_OPS_MLD(name, bufsz)			\</div><div class='add'>+	MLD_DEBUGFS_OPEN_WRAPPER(name, bufsz, struct iwl_mld)		\</div><div class='add'>+	WIPHY_DEBUGFS_READ_WRAPPER_MLD(name)				\</div><div class='add'>+	static const struct file_operations iwl_dbgfs_##name##_ops = {	\</div><div class='add'>+		.read = __iwl_dbgfs_##name##_read,			\</div><div class='add'>+		.open = _iwl_dbgfs_##name##_open,			\</div><div class='add'>+		.llseek = generic_file_llseek,				\</div><div class='add'>+		.release = _iwl_dbgfs_release,				\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define WIPHY_DEBUGFS_WRITE_FILE_OPS_MLD(name, bufsz)			\</div><div class='add'>+	MLD_DEBUGFS_OPEN_WRAPPER(name, bufsz, struct iwl_mld)		\</div><div class='add'>+	WIPHY_DEBUGFS_WRITE_WRAPPER_MLD(name)				\</div><div class='add'>+	static const struct file_operations iwl_dbgfs_##name##_ops = {	\</div><div class='add'>+		.write = __iwl_dbgfs_##name##_write,			\</div><div class='add'>+		.open = _iwl_dbgfs_##name##_open,			\</div><div class='add'>+		.llseek = generic_file_llseek,				\</div><div class='add'>+		.release = _iwl_dbgfs_release,				\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define WIPHY_DEBUGFS_READ_WRITE_FILE_OPS_MLD(name, bufsz)		\</div><div class='add'>+	MLD_DEBUGFS_OPEN_WRAPPER(name, bufsz, struct iwl_mld)		\</div><div class='add'>+	WIPHY_DEBUGFS_WRITE_WRAPPER_MLD(name)				\</div><div class='add'>+	WIPHY_DEBUGFS_READ_WRAPPER_MLD(name)				\</div><div class='add'>+	static const struct file_operations iwl_dbgfs_##name##_ops = {	\</div><div class='add'>+		.write = __iwl_dbgfs_##name##_write,			\</div><div class='add'>+		.read = __iwl_dbgfs_##name##_read,			\</div><div class='add'>+		.open = _iwl_dbgfs_##name##_open,			\</div><div class='add'>+		.llseek = generic_file_llseek,				\</div><div class='add'>+		.release = _iwl_dbgfs_release,				\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define WIPHY_DEBUGFS_WRITE_WRAPPER_IEEE80211(name, bufsz, objtype)	\</div><div class='add'>+WIPHY_DEBUGFS_WRITE_HANDLER_WRAPPER(name)				\</div><div class='add'>+static ssize_t _iwl_dbgfs_##name##_write(struct file *file,		\</div><div class='add'>+					  const char __user *user_buf,	\</div><div class='add'>+					  size_t count, loff_t *ppos)	\</div><div class='add'>+{									\</div><div class='add'>+	struct dbgfs_##name##_data *data = file-&gt;private_data;		\</div><div class='add'>+	struct ieee80211_##objtype *arg = data-&gt;arg;			\</div><div class='add'>+	struct iwl_mld *mld = iwl_mld_from_##objtype(arg);		\</div><div class='add'>+	char buf[bufsz] = {};						\</div><div class='add'>+									\</div><div class='add'>+	return wiphy_locked_debugfs_write(mld-&gt;wiphy, file,		\</div><div class='add'>+				buf, sizeof(buf),			\</div><div class='add'>+				user_buf, count,			\</div><div class='add'>+				iwl_dbgfs_##name##_write_handler,	\</div><div class='add'>+				arg);					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define IEEE80211_WIPHY_DEBUGFS_READ_WRITE_FILE_OPS(name, bufsz, objtype) \</div><div class='add'>+	MLD_DEBUGFS_OPEN_WRAPPER(name, bufsz, struct ieee80211_##objtype) \</div><div class='add'>+	WIPHY_DEBUGFS_WRITE_WRAPPER_IEEE80211(name, bufsz, objtype)	  \</div><div class='add'>+	MLD_DEBUGFS_READ_WRAPPER(name)					  \</div><div class='add'>+	static const struct file_operations iwl_dbgfs_##name##_ops = {	  \</div><div class='add'>+		.write = _iwl_dbgfs_##name##_write,			  \</div><div class='add'>+		.read = _iwl_dbgfs_##name##_read,			  \</div><div class='add'>+		.open = _iwl_dbgfs_##name##_open,			  \</div><div class='add'>+		.llseek = generic_file_llseek,				  \</div><div class='add'>+		.release = _iwl_dbgfs_release,				  \</div><div class='add'>+	}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/ftm-initiator.c b/drivers/net/wireless/intel/iwlwifi/mld/ftm-initiator.c<br/>new file mode 100644<br/>index 000000000000..3464b3268712<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/ftm-initiator.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/ftm-initiator.c</a></div><div class='hunk'>@@ -0,0 +1,451 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/math64.h&gt;</div><div class='add'>+#include &lt;net/cfg80211.h&gt;</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "iface.h"</div><div class='add'>+#include "phy.h"</div><div class='add'>+#include "iwl-io.h"</div><div class='add'>+#include "iwl-prph.h"</div><div class='add'>+#include "constants.h"</div><div class='add'>+#include "fw/api/location.h"</div><div class='add'>+#include "ftm-initiator.h"</div><div class='add'>+</div><div class='add'>+static void iwl_mld_ftm_cmd_common(struct iwl_mld *mld,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct iwl_tof_range_req_cmd *cmd,</div><div class='add'>+				   struct cfg80211_pmsr_request *req)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;initiator_flags =</div><div class='add'>+		cpu_to_le32(IWL_TOF_INITIATOR_FLAGS_MACADDR_RANDOM |</div><div class='add'>+			    IWL_TOF_INITIATOR_FLAGS_NON_ASAP_SUPPORT);</div><div class='add'>+	cmd-&gt;request_id = req-&gt;cookie;</div><div class='add'>+	cmd-&gt;num_of_ap = req-&gt;n_peers;</div><div class='add'>+</div><div class='add'>+	/* Use a large value for "no timeout". Don't use the maximum value</div><div class='add'>+	 * because of fw limitations.</div><div class='add'>+	 */</div><div class='add'>+	if (req-&gt;timeout)</div><div class='add'>+		cmd-&gt;req_timeout_ms = cpu_to_le32(min(req-&gt;timeout, 0xfffff));</div><div class='add'>+	else</div><div class='add'>+		cmd-&gt;req_timeout_ms = cpu_to_le32(0xfffff);</div><div class='add'>+</div><div class='add'>+	memcpy(cmd-&gt;macaddr_template, req-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='add'>+		cmd-&gt;macaddr_mask[i] = ~req-&gt;mac_addr_mask[i];</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;cfg.assoc) {</div><div class='add'>+		memcpy(cmd-&gt;range_req_bssid, vif-&gt;bss_conf.bssid, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+		/* AP's TSF is only relevant if associated */</div><div class='add'>+		for (i = 0; i &lt; req-&gt;n_peers; i++) {</div><div class='add'>+			if (req-&gt;peers[i].report_ap_tsf) {</div><div class='add'>+				struct iwl_mld_vif *mld_vif =</div><div class='add'>+					iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+				cmd-&gt;tsf_mac_id = cpu_to_le32(mld_vif-&gt;fw_id);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		eth_broadcast_addr(cmd-&gt;range_req_bssid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Don't report AP's TSF */</div><div class='add'>+	cmd-&gt;tsf_mac_id = cpu_to_le32(0xff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_ftm_set_target_chandef(struct iwl_mld *mld,</div><div class='add'>+			       struct cfg80211_pmsr_request_peer *peer,</div><div class='add'>+			       struct iwl_tof_range_req_ap_entry *target)</div><div class='add'>+{</div><div class='add'>+	u32 freq = peer-&gt;chandef.chan-&gt;center_freq;</div><div class='add'>+</div><div class='add'>+	target-&gt;channel_num = ieee80211_frequency_to_channel(freq);</div><div class='add'>+</div><div class='add'>+	switch (peer-&gt;chandef.width) {</div><div class='add'>+	case NL80211_CHAN_WIDTH_20_NOHT:</div><div class='add'>+		target-&gt;format_bw = IWL_LOCATION_FRAME_FORMAT_LEGACY;</div><div class='add'>+		target-&gt;format_bw |= IWL_LOCATION_BW_20MHZ &lt;&lt; LOCATION_BW_POS;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_20:</div><div class='add'>+		target-&gt;format_bw = IWL_LOCATION_FRAME_FORMAT_HT;</div><div class='add'>+		target-&gt;format_bw |= IWL_LOCATION_BW_20MHZ &lt;&lt; LOCATION_BW_POS;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_40:</div><div class='add'>+		target-&gt;format_bw = IWL_LOCATION_FRAME_FORMAT_HT;</div><div class='add'>+		target-&gt;format_bw |= IWL_LOCATION_BW_40MHZ &lt;&lt; LOCATION_BW_POS;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_80:</div><div class='add'>+		target-&gt;format_bw = IWL_LOCATION_FRAME_FORMAT_VHT;</div><div class='add'>+		target-&gt;format_bw |= IWL_LOCATION_BW_80MHZ &lt;&lt; LOCATION_BW_POS;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_160:</div><div class='add'>+		target-&gt;format_bw = IWL_LOCATION_FRAME_FORMAT_HE;</div><div class='add'>+		target-&gt;format_bw |= IWL_LOCATION_BW_160MHZ &lt;&lt; LOCATION_BW_POS;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		IWL_ERR(mld, "Unsupported BW in FTM request (%d)\n",</div><div class='add'>+			peer-&gt;chandef.width);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* non EDCA based measurement must use HE preamble */</div><div class='add'>+	if (peer-&gt;ftm.trigger_based || peer-&gt;ftm.non_trigger_based)</div><div class='add'>+		target-&gt;format_bw |= IWL_LOCATION_FRAME_FORMAT_HE;</div><div class='add'>+</div><div class='add'>+	target-&gt;ctrl_ch_position =</div><div class='add'>+		(peer-&gt;chandef.width &gt; NL80211_CHAN_WIDTH_20) ?</div><div class='add'>+		iwl_mld_get_fw_ctrl_pos(&amp;peer-&gt;chandef) : 0;</div><div class='add'>+</div><div class='add'>+	target-&gt;band = iwl_mld_nl80211_band_to_fw(peer-&gt;chandef.chan-&gt;band);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define FTM_SET_FLAG(flag) (target-&gt;initiator_ap_flags |= \</div><div class='add'>+			    cpu_to_le32(IWL_INITIATOR_AP_FLAGS_##flag))</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_ftm_set_target_flags(struct iwl_mld *mld,</div><div class='add'>+			     struct cfg80211_pmsr_request_peer *peer,</div><div class='add'>+			     struct iwl_tof_range_req_ap_entry *target)</div><div class='add'>+{</div><div class='add'>+	target-&gt;initiator_ap_flags = cpu_to_le32(0);</div><div class='add'>+</div><div class='add'>+	if (peer-&gt;ftm.asap)</div><div class='add'>+		FTM_SET_FLAG(ASAP);</div><div class='add'>+</div><div class='add'>+	if (peer-&gt;ftm.request_lci)</div><div class='add'>+		FTM_SET_FLAG(LCI_REQUEST);</div><div class='add'>+</div><div class='add'>+	if (peer-&gt;ftm.request_civicloc)</div><div class='add'>+		FTM_SET_FLAG(CIVIC_REQUEST);</div><div class='add'>+</div><div class='add'>+	if (IWL_MLD_FTM_INITIATOR_DYNACK)</div><div class='add'>+		FTM_SET_FLAG(DYN_ACK);</div><div class='add'>+</div><div class='add'>+	if (IWL_MLD_FTM_INITIATOR_ALGO == IWL_TOF_ALGO_TYPE_LINEAR_REG)</div><div class='add'>+		FTM_SET_FLAG(ALGO_LR);</div><div class='add'>+	else if (IWL_MLD_FTM_INITIATOR_ALGO == IWL_TOF_ALGO_TYPE_FFT)</div><div class='add'>+		FTM_SET_FLAG(ALGO_FFT);</div><div class='add'>+</div><div class='add'>+	if (peer-&gt;ftm.trigger_based)</div><div class='add'>+		FTM_SET_FLAG(TB);</div><div class='add'>+	else if (peer-&gt;ftm.non_trigger_based)</div><div class='add'>+		FTM_SET_FLAG(NON_TB);</div><div class='add'>+</div><div class='add'>+	if ((peer-&gt;ftm.trigger_based || peer-&gt;ftm.non_trigger_based) &amp;&amp;</div><div class='add'>+	    peer-&gt;ftm.lmr_feedback)</div><div class='add'>+		FTM_SET_FLAG(LMR_FEEDBACK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_ftm_set_sta(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+				struct cfg80211_pmsr_request_peer *peer,</div><div class='add'>+				struct iwl_tof_range_req_ap_entry *target)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	u32 sta_id_mask;</div><div class='add'>+</div><div class='add'>+	target-&gt;sta_id = IWL_INVALID_STA;</div><div class='add'>+</div><div class='add'>+	/* TODO: add ftm_unprotected debugfs support */</div><div class='add'>+</div><div class='add'>+	if (!vif-&gt;cfg.assoc || !mld_vif-&gt;ap_sta)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sta_id_mask = iwl_mld_fw_sta_id_mask(mld, mld_vif-&gt;ap_sta);</div><div class='add'>+	if (WARN_ON(hweight32(sta_id_mask) != 1))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	target-&gt;sta_id = __ffs(sta_id_mask);</div><div class='add'>+</div><div class='add'>+	if (mld_vif-&gt;ap_sta-&gt;mfp &amp;&amp;</div><div class='add'>+	    (peer-&gt;ftm.trigger_based || peer-&gt;ftm.non_trigger_based))</div><div class='add'>+		FTM_SET_FLAG(PMF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_ftm_set_target(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+		       struct cfg80211_pmsr_request_peer *peer,</div><div class='add'>+		       struct iwl_tof_range_req_ap_entry *target)</div><div class='add'>+{</div><div class='add'>+	u32 i2r_max_sts;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_ftm_set_target_chandef(mld, peer, target);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	memcpy(target-&gt;bssid, peer-&gt;addr, ETH_ALEN);</div><div class='add'>+	target-&gt;burst_period = cpu_to_le16(peer-&gt;ftm.burst_period);</div><div class='add'>+	target-&gt;samples_per_burst = peer-&gt;ftm.ftms_per_burst;</div><div class='add'>+	target-&gt;num_of_bursts = peer-&gt;ftm.num_bursts_exp;</div><div class='add'>+	iwl_mld_ftm_set_target_flags(mld, peer, target);</div><div class='add'>+	iwl_mld_ftm_set_sta(mld, vif, peer, target);</div><div class='add'>+</div><div class='add'>+	/* TODO: add secured ranging support */</div><div class='add'>+</div><div class='add'>+	i2r_max_sts = IWL_MLD_FTM_I2R_MAX_STS &gt; 1 ? 1 :</div><div class='add'>+		IWL_MLD_FTM_I2R_MAX_STS;</div><div class='add'>+</div><div class='add'>+	target-&gt;r2i_ndp_params = IWL_MLD_FTM_R2I_MAX_REP |</div><div class='add'>+		(IWL_MLD_FTM_R2I_MAX_STS &lt;&lt; IWL_LOCATION_MAX_STS_POS) |</div><div class='add'>+		(IWL_MLD_FTM_R2I_MAX_TOTAL_LTF &lt;&lt; IWL_LOCATION_TOTAL_LTF_POS);</div><div class='add'>+	target-&gt;i2r_ndp_params = IWL_MLD_FTM_I2R_MAX_REP |</div><div class='add'>+		(i2r_max_sts &lt;&lt; IWL_LOCATION_MAX_STS_POS) |</div><div class='add'>+		(IWL_MLD_FTM_I2R_MAX_TOTAL_LTF &lt;&lt; IWL_LOCATION_TOTAL_LTF_POS);</div><div class='add'>+</div><div class='add'>+	if (peer-&gt;ftm.non_trigger_based) {</div><div class='add'>+		target-&gt;min_time_between_msr =</div><div class='add'>+			cpu_to_le16(IWL_MLD_FTM_NON_TB_MIN_TIME_BETWEEN_MSR);</div><div class='add'>+		target-&gt;burst_period =</div><div class='add'>+			cpu_to_le16(IWL_MLD_FTM_NON_TB_MAX_TIME_BETWEEN_MSR);</div><div class='add'>+	} else {</div><div class='add'>+		target-&gt;min_time_between_msr = cpu_to_le16(0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TODO: Beacon interval is currently unknown, so use the common value</div><div class='add'>+	 * of 100 TUs.</div><div class='add'>+	 */</div><div class='add'>+	target-&gt;beacon_interval = cpu_to_le16(100);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_ftm_start(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+		      struct cfg80211_pmsr_request *req)</div><div class='add'>+{</div><div class='add'>+	struct iwl_tof_range_req_cmd cmd;</div><div class='add'>+	struct iwl_host_cmd hcmd = {</div><div class='add'>+		.id = WIDE_ID(LOCATION_GROUP, TOF_RANGE_REQ_CMD),</div><div class='add'>+		.dataflags[0] = IWL_HCMD_DFL_DUP,</div><div class='add'>+		.data[0] = &amp;cmd,</div><div class='add'>+		.len[0] = sizeof(cmd),</div><div class='add'>+	};</div><div class='add'>+	u8 i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (mld-&gt;ftm_initiator.req)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;n_peers &gt; ARRAY_SIZE(cmd.ap))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='add'>+</div><div class='add'>+	iwl_mld_ftm_cmd_common(mld, vif, (void *)&amp;cmd, req);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cmd.num_of_ap; i++) {</div><div class='add'>+		struct cfg80211_pmsr_request_peer *peer = &amp;req-&gt;peers[i];</div><div class='add'>+		struct iwl_tof_range_req_ap_entry *target = &amp;cmd.ap[i];</div><div class='add'>+</div><div class='add'>+		ret = iwl_mld_ftm_set_target(mld, vif, peer, target);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TODO: get the status from the response*/</div><div class='add'>+	ret = iwl_mld_send_cmd(mld, &amp;hcmd);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		mld-&gt;ftm_initiator.req = req;</div><div class='add'>+		mld-&gt;ftm_initiator.req_wdev = ieee80211_vif_to_wdev(vif);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_ftm_reset(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	mld-&gt;ftm_initiator.req = NULL;</div><div class='add'>+	mld-&gt;ftm_initiator.req_wdev = NULL;</div><div class='add'>+	memset(mld-&gt;ftm_initiator.responses, 0,</div><div class='add'>+	       sizeof(mld-&gt;ftm_initiator.responses));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_ftm_range_resp_valid(struct iwl_mld *mld, u8 request_id,</div><div class='add'>+					u8 num_of_aps)</div><div class='add'>+{</div><div class='add'>+	if (IWL_FW_CHECK(mld, request_id != (u8)mld-&gt;ftm_initiator.req-&gt;cookie,</div><div class='add'>+			 "Request ID mismatch, got %u, active %u\n",</div><div class='add'>+			 request_id, (u8)mld-&gt;ftm_initiator.req-&gt;cookie))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, num_of_aps &gt; mld-&gt;ftm_initiator.req-&gt;n_peers ||</div><div class='add'>+			 num_of_aps &gt; IWL_TOF_MAX_APS,</div><div class='add'>+			 "FTM range response: invalid num of APs (%u)\n",</div><div class='add'>+			 num_of_aps))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_ftm_find_peer(struct cfg80211_pmsr_request *req,</div><div class='add'>+				 const u8 *addr)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; req-&gt;n_peers; i++) {</div><div class='add'>+		struct cfg80211_pmsr_request_peer *peer = &amp;req-&gt;peers[i];</div><div class='add'>+</div><div class='add'>+		if (ether_addr_equal_unaligned(peer-&gt;addr, addr))</div><div class='add'>+			return i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_debug_range_resp(struct iwl_mld *mld, u8 index,</div><div class='add'>+				     struct cfg80211_pmsr_result *res)</div><div class='add'>+{</div><div class='add'>+	s64 rtt_avg = div_s64(res-&gt;ftm.rtt_avg * 100, 6666);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(mld, "entry %d\n", index);</div><div class='add'>+	IWL_DEBUG_INFO(mld, "\tstatus: %d\n", res-&gt;status);</div><div class='add'>+	IWL_DEBUG_INFO(mld, "\tBSSID: %pM\n", res-&gt;addr);</div><div class='add'>+	IWL_DEBUG_INFO(mld, "\thost time: %llu\n", res-&gt;host_time);</div><div class='add'>+	IWL_DEBUG_INFO(mld, "\tburst index: %d\n", res-&gt;ftm.burst_index);</div><div class='add'>+	IWL_DEBUG_INFO(mld, "\tsuccess num: %u\n", res-&gt;ftm.num_ftmr_successes);</div><div class='add'>+	IWL_DEBUG_INFO(mld, "\trssi: %d\n", res-&gt;ftm.rssi_avg);</div><div class='add'>+	IWL_DEBUG_INFO(mld, "\trssi spread: %d\n", res-&gt;ftm.rssi_spread);</div><div class='add'>+	IWL_DEBUG_INFO(mld, "\trtt: %lld\n", res-&gt;ftm.rtt_avg);</div><div class='add'>+	IWL_DEBUG_INFO(mld, "\trtt var: %llu\n", res-&gt;ftm.rtt_variance);</div><div class='add'>+	IWL_DEBUG_INFO(mld, "\trtt spread: %llu\n", res-&gt;ftm.rtt_spread);</div><div class='add'>+	IWL_DEBUG_INFO(mld, "\tdistance: %lld\n", rtt_avg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_ftm_resp_notif(struct iwl_mld *mld,</div><div class='add'>+				   struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_tof_range_rsp_ntfy *fw_resp = (void *)pkt-&gt;data;</div><div class='add'>+	u8 num_of_aps, last_in_batch;</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, !mld-&gt;ftm_initiator.req,</div><div class='add'>+			 "FTM response without a pending request\n"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_ftm_range_resp_valid(mld, fw_resp-&gt;request_id,</div><div class='add'>+					 fw_resp-&gt;num_of_aps))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	num_of_aps = fw_resp-&gt;num_of_aps;</div><div class='add'>+	last_in_batch = fw_resp-&gt;last_report;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(mld, "Range response received\n");</div><div class='add'>+	IWL_DEBUG_INFO(mld, "request id: %llu, num of entries: %u\n",</div><div class='add'>+		       mld-&gt;ftm_initiator.req-&gt;cookie, num_of_aps);</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; num_of_aps; i++) {</div><div class='add'>+		struct cfg80211_pmsr_result result = {};</div><div class='add'>+		struct iwl_tof_range_rsp_ap_entry_ntfy *fw_ap;</div><div class='add'>+		int peer_idx;</div><div class='add'>+</div><div class='add'>+		fw_ap = &amp;fw_resp-&gt;ap[i];</div><div class='add'>+		result.final = fw_ap-&gt;last_burst;</div><div class='add'>+		result.ap_tsf = le32_to_cpu(fw_ap-&gt;start_tsf);</div><div class='add'>+		result.ap_tsf_valid = 1;</div><div class='add'>+</div><div class='add'>+		peer_idx = iwl_mld_ftm_find_peer(mld-&gt;ftm_initiator.req,</div><div class='add'>+						 fw_ap-&gt;bssid);</div><div class='add'>+		if (peer_idx &lt; 0) {</div><div class='add'>+			IWL_WARN(mld,</div><div class='add'>+				 "Unknown address (%pM, target #%d) in FTM response\n",</div><div class='add'>+				 fw_ap-&gt;bssid, i);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (fw_ap-&gt;measure_status) {</div><div class='add'>+		case IWL_TOF_ENTRY_SUCCESS:</div><div class='add'>+			result.status = NL80211_PMSR_STATUS_SUCCESS;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_TOF_ENTRY_TIMING_MEASURE_TIMEOUT:</div><div class='add'>+			result.status = NL80211_PMSR_STATUS_TIMEOUT;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_TOF_ENTRY_NO_RESPONSE:</div><div class='add'>+			result.status = NL80211_PMSR_STATUS_FAILURE;</div><div class='add'>+			result.ftm.failure_reason =</div><div class='add'>+				NL80211_PMSR_FTM_FAILURE_NO_RESPONSE;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_TOF_ENTRY_REQUEST_REJECTED:</div><div class='add'>+			result.status = NL80211_PMSR_STATUS_FAILURE;</div><div class='add'>+			result.ftm.failure_reason =</div><div class='add'>+				NL80211_PMSR_FTM_FAILURE_PEER_BUSY;</div><div class='add'>+			result.ftm.busy_retry_time = fw_ap-&gt;refusal_period;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			result.status = NL80211_PMSR_STATUS_FAILURE;</div><div class='add'>+			result.ftm.failure_reason =</div><div class='add'>+				NL80211_PMSR_FTM_FAILURE_UNSPECIFIED;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		memcpy(result.addr, fw_ap-&gt;bssid, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+		/* TODO: convert the timestamp from the result to systime */</div><div class='add'>+		result.host_time = ktime_get_boottime_ns();</div><div class='add'>+</div><div class='add'>+		result.type = NL80211_PMSR_TYPE_FTM;</div><div class='add'>+		result.ftm.burst_index = mld-&gt;ftm_initiator.responses[peer_idx];</div><div class='add'>+		mld-&gt;ftm_initiator.responses[peer_idx]++;</div><div class='add'>+		result.ftm.rssi_avg = fw_ap-&gt;rssi;</div><div class='add'>+		result.ftm.rssi_avg_valid = 1;</div><div class='add'>+		result.ftm.rssi_spread = fw_ap-&gt;rssi_spread;</div><div class='add'>+		result.ftm.rssi_spread_valid = 1;</div><div class='add'>+		result.ftm.rtt_avg = (s32)le32_to_cpu(fw_ap-&gt;rtt);</div><div class='add'>+		result.ftm.rtt_avg_valid = 1;</div><div class='add'>+		result.ftm.rtt_variance = le32_to_cpu(fw_ap-&gt;rtt_variance);</div><div class='add'>+		result.ftm.rtt_variance_valid = 1;</div><div class='add'>+		result.ftm.rtt_spread = le32_to_cpu(fw_ap-&gt;rtt_spread);</div><div class='add'>+		result.ftm.rtt_spread_valid = 1;</div><div class='add'>+</div><div class='add'>+		cfg80211_pmsr_report(mld-&gt;ftm_initiator.req_wdev,</div><div class='add'>+				     mld-&gt;ftm_initiator.req,</div><div class='add'>+				     &amp;result, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+		if (fw_has_api(&amp;mld-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			       IWL_UCODE_TLV_API_FTM_RTT_ACCURACY))</div><div class='add'>+			IWL_DEBUG_INFO(mld, "RTT confidence: %u\n",</div><div class='add'>+				       fw_ap-&gt;rttConfidence);</div><div class='add'>+</div><div class='add'>+		iwl_mld_debug_range_resp(mld, i, &amp;result);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (last_in_batch) {</div><div class='add'>+		cfg80211_pmsr_complete(mld-&gt;ftm_initiator.req_wdev,</div><div class='add'>+				       mld-&gt;ftm_initiator.req,</div><div class='add'>+				       GFP_KERNEL);</div><div class='add'>+		iwl_mld_ftm_reset(mld);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_ftm_restart_cleanup(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct cfg80211_pmsr_result result = {</div><div class='add'>+		.status = NL80211_PMSR_STATUS_FAILURE,</div><div class='add'>+		.final = 1,</div><div class='add'>+		.host_time = ktime_get_boottime_ns(),</div><div class='add'>+		.type = NL80211_PMSR_TYPE_FTM,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!mld-&gt;ftm_initiator.req)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; mld-&gt;ftm_initiator.req-&gt;n_peers; i++) {</div><div class='add'>+		memcpy(result.addr, mld-&gt;ftm_initiator.req-&gt;peers[i].addr,</div><div class='add'>+		       ETH_ALEN);</div><div class='add'>+</div><div class='add'>+		cfg80211_pmsr_report(mld-&gt;ftm_initiator.req_wdev,</div><div class='add'>+				     mld-&gt;ftm_initiator.req,</div><div class='add'>+				     &amp;result, GFP_KERNEL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cfg80211_pmsr_complete(mld-&gt;ftm_initiator.req_wdev,</div><div class='add'>+			       mld-&gt;ftm_initiator.req, GFP_KERNEL);</div><div class='add'>+	iwl_mld_ftm_reset(mld);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/ftm-initiator.h b/drivers/net/wireless/intel/iwlwifi/mld/ftm-initiator.h<br/>new file mode 100644<br/>index 000000000000..3fab25a52508<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/ftm-initiator.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/ftm-initiator.h</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_ftm_initiator_h__</div><div class='add'>+#define __iwl_mld_ftm_initiator_h__</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ftm_initiator_data - FTM initiator data</div><div class='add'>+ *</div><div class='add'>+ * @req: a pointer to cfg80211 FTM request</div><div class='add'>+ * @req_wdev: a pointer to the wdev that requested the current FTM request</div><div class='add'>+ * @responses: the number of responses received for the current FTM session.</div><div class='add'>+ *	Used for tracking the burst index in a periodic request.</div><div class='add'>+ */</div><div class='add'>+struct ftm_initiator_data {</div><div class='add'>+		struct cfg80211_pmsr_request *req;</div><div class='add'>+		struct wireless_dev *req_wdev;</div><div class='add'>+		int responses[IWL_TOF_MAX_APS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int iwl_mld_ftm_start(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+		      struct cfg80211_pmsr_request *req);</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_ftm_resp_notif(struct iwl_mld *mld,</div><div class='add'>+				   struct iwl_rx_packet *pkt);</div><div class='add'>+void iwl_mld_ftm_restart_cleanup(struct iwl_mld *mld);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_ftm_initiator_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/fw.c b/drivers/net/wireless/intel/iwlwifi/mld/fw.c<br/>new file mode 100644<br/>index 000000000000..19da521a4bab<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/fw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/fw.c</a></div><div class='hunk'>@@ -0,0 +1,548 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+</div><div class='add'>+#include "fw/api/alive.h"</div><div class='add'>+#include "fw/api/scan.h"</div><div class='add'>+#include "fw/api/rx.h"</div><div class='add'>+#include "phy.h"</div><div class='add'>+#include "fw/dbg.h"</div><div class='add'>+#include "fw/pnvm.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+#include "power.h"</div><div class='add'>+#include "mcc.h"</div><div class='add'>+#include "led.h"</div><div class='add'>+#include "coex.h"</div><div class='add'>+#include "regulatory.h"</div><div class='add'>+#include "thermal.h"</div><div class='add'>+</div><div class='add'>+static int iwl_mld_send_tx_ant_cfg(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct iwl_tx_ant_cfg_cmd cmd;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	cmd.valid = cpu_to_le32(iwl_mld_get_valid_tx_ant(mld));</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_FW(mld, "select valid tx ant: %u\n", cmd.valid);</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_cmd_pdu(mld, TX_ANT_CONFIGURATION_CMD, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_send_rss_cfg_cmd(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rss_config_cmd cmd = {</div><div class='add'>+		.flags = cpu_to_le32(IWL_RSS_ENABLE),</div><div class='add'>+		.hash_mask = BIT(IWL_RSS_HASH_TYPE_IPV4_TCP) |</div><div class='add'>+			     BIT(IWL_RSS_HASH_TYPE_IPV4_UDP) |</div><div class='add'>+			     BIT(IWL_RSS_HASH_TYPE_IPV4_PAYLOAD) |</div><div class='add'>+			     BIT(IWL_RSS_HASH_TYPE_IPV6_TCP) |</div><div class='add'>+			     BIT(IWL_RSS_HASH_TYPE_IPV6_UDP) |</div><div class='add'>+			     BIT(IWL_RSS_HASH_TYPE_IPV6_PAYLOAD),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* Do not direct RSS traffic to Q 0 which is our fallback queue */</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(cmd.indirection_table); i++)</div><div class='add'>+		cmd.indirection_table[i] =</div><div class='add'>+			1 + (i % (mld-&gt;trans-&gt;info.num_rxqs - 1));</div><div class='add'>+	netdev_rss_key_fill(cmd.secret_key, sizeof(cmd.secret_key));</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_cmd_pdu(mld, RSS_CONFIG_CMD, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_config_scan(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct iwl_scan_config cmd = {</div><div class='add'>+		.tx_chains = cpu_to_le32(iwl_mld_get_valid_tx_ant(mld)),</div><div class='add'>+		.rx_chains = cpu_to_le32(iwl_mld_get_valid_rx_ant(mld))</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_cmd_pdu(mld, WIDE_ID(LONG_GROUP, SCAN_CFG_CMD),</div><div class='add'>+				    &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_alive_imr_data(struct iwl_trans *trans,</div><div class='add'>+				   const struct iwl_imr_alive_info *imr_info)</div><div class='add'>+{</div><div class='add'>+	struct iwl_imr_data *imr_data = &amp;trans-&gt;dbg.imr_data;</div><div class='add'>+</div><div class='add'>+	imr_data-&gt;imr_enable = le32_to_cpu(imr_info-&gt;enabled);</div><div class='add'>+	imr_data-&gt;imr_size = le32_to_cpu(imr_info-&gt;size);</div><div class='add'>+	imr_data-&gt;imr2sram_remainbyte = imr_data-&gt;imr_size;</div><div class='add'>+	imr_data-&gt;imr_base_addr = imr_info-&gt;base_addr;</div><div class='add'>+	imr_data-&gt;imr_curr_addr = le64_to_cpu(imr_data-&gt;imr_base_addr);</div><div class='add'>+</div><div class='add'>+	if (imr_data-&gt;imr_enable)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(trans-&gt;dbg.active_regions); i++) {</div><div class='add'>+		struct iwl_fw_ini_region_tlv *reg;</div><div class='add'>+</div><div class='add'>+		if (!trans-&gt;dbg.active_regions[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		reg = (void *)trans-&gt;dbg.active_regions[i]-&gt;data;</div><div class='add'>+</div><div class='add'>+		/* We have only one DRAM IMR region, so we</div><div class='add'>+		 * can break as soon as we find the first</div><div class='add'>+		 * one.</div><div class='add'>+		 */</div><div class='add'>+		if (reg-&gt;type == IWL_FW_INI_REGION_DRAM_IMR) {</div><div class='add'>+			trans-&gt;dbg.unsupported_region_msk |= BIT(i);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct iwl_mld_alive_data {</div><div class='add'>+	__le32 sku_id[3];</div><div class='add'>+	bool valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,</div><div class='add'>+			 struct iwl_rx_packet *pkt, void *data)</div><div class='add'>+{</div><div class='add'>+	unsigned int pkt_len = iwl_rx_packet_payload_len(pkt);</div><div class='add'>+	unsigned int expected_sz;</div><div class='add'>+	struct iwl_mld *mld =</div><div class='add'>+		container_of(notif_wait, struct iwl_mld, notif_wait);</div><div class='add'>+	struct iwl_trans *trans = mld-&gt;trans;</div><div class='add'>+	u32 version = iwl_fw_lookup_notif_ver(mld-&gt;fw, LEGACY_GROUP,</div><div class='add'>+					      UCODE_ALIVE_NTFY, 0);</div><div class='add'>+	struct iwl_mld_alive_data *alive_data = data;</div><div class='add'>+	struct iwl_alive_ntf *palive;</div><div class='add'>+	struct iwl_umac_alive *umac;</div><div class='add'>+	struct iwl_lmac_alive *lmac1;</div><div class='add'>+	struct iwl_lmac_alive *lmac2 = NULL;</div><div class='add'>+	u32 lmac_error_event_table;</div><div class='add'>+	u32 umac_error_table;</div><div class='add'>+	u16 status;</div><div class='add'>+</div><div class='add'>+	switch (version) {</div><div class='add'>+	case 7:</div><div class='add'>+		expected_sz = sizeof(struct iwl_alive_ntf_v7);</div><div class='add'>+		break;</div><div class='add'>+	case 8:</div><div class='add'>+		expected_sz = sizeof(struct iwl_alive_ntf);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pkt_len != expected_sz)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	palive = (void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+	iwl_mld_alive_imr_data(trans, &amp;palive-&gt;imr);</div><div class='add'>+</div><div class='add'>+	umac = &amp;palive-&gt;umac_data;</div><div class='add'>+	lmac1 = &amp;palive-&gt;lmac_data[0];</div><div class='add'>+	lmac2 = &amp;palive-&gt;lmac_data[1];</div><div class='add'>+	status = le16_to_cpu(palive-&gt;status);</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(alive_data-&gt;sku_id) !=</div><div class='add'>+		     sizeof(palive-&gt;sku_id.data));</div><div class='add'>+	memcpy(alive_data-&gt;sku_id, palive-&gt;sku_id.data,</div><div class='add'>+	       sizeof(palive-&gt;sku_id.data));</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_FW(mld, "Got sku_id: 0x0%x 0x0%x 0x0%x\n",</div><div class='add'>+		     le32_to_cpu(alive_data-&gt;sku_id[0]),</div><div class='add'>+		     le32_to_cpu(alive_data-&gt;sku_id[1]),</div><div class='add'>+		     le32_to_cpu(alive_data-&gt;sku_id[2]));</div><div class='add'>+</div><div class='add'>+	lmac_error_event_table =</div><div class='add'>+		le32_to_cpu(lmac1-&gt;dbg_ptrs.error_event_table_ptr);</div><div class='add'>+	iwl_fw_lmac1_set_alive_err_table(trans, lmac_error_event_table);</div><div class='add'>+</div><div class='add'>+	if (lmac2)</div><div class='add'>+		trans-&gt;dbg.lmac_error_event_table[1] =</div><div class='add'>+			le32_to_cpu(lmac2-&gt;dbg_ptrs.error_event_table_ptr);</div><div class='add'>+</div><div class='add'>+	umac_error_table = le32_to_cpu(umac-&gt;dbg_ptrs.error_info_addr) &amp;</div><div class='add'>+		~FW_ADDR_CACHE_CONTROL;</div><div class='add'>+</div><div class='add'>+	iwl_fw_umac_set_alive_err_table(trans, umac_error_table);</div><div class='add'>+</div><div class='add'>+	alive_data-&gt;valid = status == IWL_ALIVE_STATUS_OK;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_FW(mld,</div><div class='add'>+		     "Alive ucode status 0x%04x revision 0x%01X 0x%01X\n",</div><div class='add'>+		     status, lmac1-&gt;ver_type, lmac1-&gt;ver_subtype);</div><div class='add'>+</div><div class='add'>+	if (lmac2)</div><div class='add'>+		IWL_DEBUG_FW(mld, "Alive ucode CDB\n");</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_FW(mld,</div><div class='add'>+		     "UMAC version: Major - 0x%x, Minor - 0x%x\n",</div><div class='add'>+		     le32_to_cpu(umac-&gt;umac_major),</div><div class='add'>+		     le32_to_cpu(umac-&gt;umac_minor));</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_FW(mld, "FW alive flags 0x%x\n",</div><div class='add'>+		     le16_to_cpu(palive-&gt;flags));</div><div class='add'>+</div><div class='add'>+	if (version &gt;= 8)</div><div class='add'>+		IWL_DEBUG_FW(mld, "platform_id 0x%llx\n",</div><div class='add'>+			     le64_to_cpu(palive-&gt;platform_id));</div><div class='add'>+</div><div class='add'>+	iwl_fwrt_update_fw_versions(&amp;mld-&gt;fwrt, lmac1, umac);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MLD_ALIVE_TIMEOUT		(2 * HZ)</div><div class='add'>+#define MLD_INIT_COMPLETE_TIMEOUT	(2 * HZ)</div><div class='add'>+</div><div class='add'>+static void iwl_mld_print_alive_notif_timeout(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans *trans = mld-&gt;trans;</div><div class='add'>+	struct iwl_pc_data *pc_data;</div><div class='add'>+	u8 count;</div><div class='add'>+</div><div class='add'>+	IWL_ERR(mld,</div><div class='add'>+		"SecBoot CPU1 Status: 0x%x, CPU2 Status: 0x%x\n",</div><div class='add'>+		iwl_read_umac_prph(trans, UMAG_SB_CPU_1_STATUS),</div><div class='add'>+		iwl_read_umac_prph(trans,</div><div class='add'>+				   UMAG_SB_CPU_2_STATUS));</div><div class='add'>+#define IWL_FW_PRINT_REG_INFO(reg_name) \</div><div class='add'>+	IWL_ERR(mld, #reg_name ": 0x%x\n", iwl_read_umac_prph(trans, reg_name))</div><div class='add'>+</div><div class='add'>+	IWL_FW_PRINT_REG_INFO(WFPM_LMAC1_PD_NOTIFICATION);</div><div class='add'>+</div><div class='add'>+	IWL_FW_PRINT_REG_INFO(HPM_SECONDARY_DEVICE_STATE);</div><div class='add'>+</div><div class='add'>+	/* print OTP info */</div><div class='add'>+	IWL_FW_PRINT_REG_INFO(WFPM_MAC_OTP_CFG7_ADDR);</div><div class='add'>+	IWL_FW_PRINT_REG_INFO(WFPM_MAC_OTP_CFG7_DATA);</div><div class='add'>+#undef IWL_FW_PRINT_REG_INFO</div><div class='add'>+</div><div class='add'>+	pc_data = trans-&gt;dbg.pc_data;</div><div class='add'>+	for (count = 0; count &lt; trans-&gt;dbg.num_pc; count++, pc_data++)</div><div class='add'>+		IWL_ERR(mld, "%s: 0x%x\n", pc_data-&gt;pc_name,</div><div class='add'>+			pc_data-&gt;pc_address);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_load_fw_wait_alive(struct iwl_mld *mld,</div><div class='add'>+				      struct iwl_mld_alive_data *alive_data)</div><div class='add'>+{</div><div class='add'>+	static const u16 alive_cmd[] = { UCODE_ALIVE_NTFY };</div><div class='add'>+	struct iwl_notification_wait alive_wait;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	iwl_init_notification_wait(&amp;mld-&gt;notif_wait, &amp;alive_wait,</div><div class='add'>+				   alive_cmd, ARRAY_SIZE(alive_cmd),</div><div class='add'>+				   iwl_alive_fn, alive_data);</div><div class='add'>+</div><div class='add'>+	iwl_dbg_tlv_time_point(&amp;mld-&gt;fwrt, IWL_FW_INI_TIME_POINT_EARLY, NULL);</div><div class='add'>+</div><div class='add'>+	ret = iwl_trans_start_fw(mld-&gt;trans, mld-&gt;fw, IWL_UCODE_REGULAR, true);</div><div class='add'>+	if (ret) {</div><div class='add'>+		iwl_remove_notification(&amp;mld-&gt;notif_wait, &amp;alive_wait);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_wait_notification(&amp;mld-&gt;notif_wait, &amp;alive_wait,</div><div class='add'>+				    MLD_ALIVE_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (ret == -ETIMEDOUT)</div><div class='add'>+			iwl_fw_dbg_error_collect(&amp;mld-&gt;fwrt,</div><div class='add'>+						 FW_DBG_TRIGGER_ALIVE_TIMEOUT);</div><div class='add'>+		iwl_mld_print_alive_notif_timeout(mld);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!alive_data-&gt;valid) {</div><div class='add'>+		IWL_ERR(mld, "Loaded firmware is not valid!\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_trans_fw_alive(mld-&gt;trans);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_run_fw_init_sequence(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct iwl_notification_wait init_wait;</div><div class='add'>+	struct iwl_init_extended_cfg_cmd init_cfg = {</div><div class='add'>+		.init_flags = cpu_to_le32(BIT(IWL_INIT_PHY)),</div><div class='add'>+	};</div><div class='add'>+	struct iwl_mld_alive_data alive_data = {};</div><div class='add'>+	static const u16 init_complete[] = {</div><div class='add'>+		INIT_COMPLETE_NOTIF,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_load_fw_wait_alive(mld, &amp;alive_data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_pnvm_load(mld-&gt;trans, &amp;mld-&gt;notif_wait,</div><div class='add'>+			    mld-&gt;fw, alive_data.sku_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mld, "Timeout waiting for PNVM load %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_dbg_tlv_time_point(&amp;mld-&gt;fwrt, IWL_FW_INI_TIME_POINT_AFTER_ALIVE,</div><div class='add'>+			       NULL);</div><div class='add'>+</div><div class='add'>+	iwl_init_notification_wait(&amp;mld-&gt;notif_wait,</div><div class='add'>+				   &amp;init_wait,</div><div class='add'>+				   init_complete,</div><div class='add'>+				   ARRAY_SIZE(init_complete),</div><div class='add'>+				   NULL, NULL);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd_pdu(mld,</div><div class='add'>+				   WIDE_ID(SYSTEM_GROUP, INIT_EXTENDED_CFG_CMD),</div><div class='add'>+				   &amp;init_cfg);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mld, "Failed to send init config command: %d\n", ret);</div><div class='add'>+		iwl_remove_notification(&amp;mld-&gt;notif_wait, &amp;init_wait);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_phy_cfg_cmd(mld);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mld, "Failed to send PHY config command: %d\n", ret);</div><div class='add'>+		iwl_remove_notification(&amp;mld-&gt;notif_wait, &amp;init_wait);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_wait_notification(&amp;mld-&gt;notif_wait, &amp;init_wait,</div><div class='add'>+				    MLD_INIT_COMPLETE_TIMEOUT);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mld, "Failed to get INIT_COMPLETE %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_load_fw(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ret = iwl_trans_start_hw(mld-&gt;trans);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_run_fw_init_sequence(mld);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	mld-&gt;fw_status.running = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	iwl_mld_stop_fw(mld);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_stop_fw(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	iwl_abort_notification_waits(&amp;mld-&gt;notif_wait);</div><div class='add'>+</div><div class='add'>+	iwl_fw_dbg_stop_sync(&amp;mld-&gt;fwrt);</div><div class='add'>+</div><div class='add'>+	iwl_trans_stop_device(mld-&gt;trans);</div><div class='add'>+</div><div class='add'>+	/* HW is stopped, no more coming RX. Cancel all notifications in</div><div class='add'>+	 * case they were sent just before stopping the HW.</div><div class='add'>+	 */</div><div class='add'>+	iwl_mld_cancel_async_notifications(mld);</div><div class='add'>+</div><div class='add'>+	mld-&gt;fw_status.running = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_restart_disconnect_iter(void *data, u8 *mac,</div><div class='add'>+					    struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+		ieee80211_hw_restart_disconnect(vif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_send_recovery_cmd(struct iwl_mld *mld, u32 flags)</div><div class='add'>+{</div><div class='add'>+	u32 error_log_size = mld-&gt;fw-&gt;ucode_capa.error_log_size;</div><div class='add'>+	struct iwl_fw_error_recovery_cmd recovery_cmd = {</div><div class='add'>+		.flags = cpu_to_le32(flags),</div><div class='add'>+	};</div><div class='add'>+	struct iwl_host_cmd cmd = {</div><div class='add'>+		.id = WIDE_ID(SYSTEM_GROUP, FW_ERROR_RECOVERY_CMD),</div><div class='add'>+		.flags = CMD_WANT_SKB,</div><div class='add'>+		.data = {&amp;recovery_cmd, },</div><div class='add'>+		.len = {sizeof(recovery_cmd), },</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* no error log was defined in TLV */</div><div class='add'>+	if (!error_log_size)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; ERROR_RECOVERY_UPDATE_DB) {</div><div class='add'>+		/* no buf was allocated upon NIC error */</div><div class='add'>+		if (!mld-&gt;error_recovery_buf)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		cmd.data[1] = mld-&gt;error_recovery_buf;</div><div class='add'>+		cmd.len[1] =  error_log_size;</div><div class='add'>+		cmd.dataflags[1] = IWL_HCMD_DFL_NOCOPY;</div><div class='add'>+		recovery_cmd.buf_size = cpu_to_le32(error_log_size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd(mld, &amp;cmd);</div><div class='add'>+</div><div class='add'>+	/* we no longer need the recovery buffer */</div><div class='add'>+	kfree(mld-&gt;error_recovery_buf);</div><div class='add'>+	mld-&gt;error_recovery_buf = NULL;</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mld, "Failed to send recovery cmd %d\n", ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags &amp; ERROR_RECOVERY_UPDATE_DB) {</div><div class='add'>+		struct iwl_rx_packet *pkt = cmd.resp_pkt;</div><div class='add'>+		u32 pkt_len = iwl_rx_packet_payload_len(pkt);</div><div class='add'>+		u32 resp;</div><div class='add'>+</div><div class='add'>+		if (IWL_FW_CHECK(mld, pkt_len != sizeof(resp),</div><div class='add'>+				 "Unexpected recovery cmd response size %u (expected %zu)\n",</div><div class='add'>+				 pkt_len, sizeof(resp)))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		resp = le32_to_cpup((__le32 *)cmd.resp_pkt-&gt;data);</div><div class='add'>+		if (!resp)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		IWL_ERR(mld,</div><div class='add'>+			"Failed to send recovery cmd blob was invalid %d\n",</div><div class='add'>+			resp);</div><div class='add'>+</div><div class='add'>+		ieee80211_iterate_interfaces(mld-&gt;hw, 0,</div><div class='add'>+					     iwl_mld_restart_disconnect_iter,</div><div class='add'>+					     NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	iwl_free_resp(&amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_config_fw(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	iwl_fw_disable_dbg_asserts(&amp;mld-&gt;fwrt);</div><div class='add'>+	iwl_get_shared_mem_conf(&amp;mld-&gt;fwrt);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_tx_ant_cfg(mld);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_bt_init_conf(mld);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_set_soc_latency(&amp;mld-&gt;fwrt);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	iwl_mld_configure_lari(mld);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_config_temp_report_ths(mld);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_THERMAL</div><div class='add'>+	ret = iwl_mld_config_ctdp(mld, mld-&gt;cooling_dev.cur_state,</div><div class='add'>+				  CTDP_CMD_OPERATION_START);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	ret = iwl_configure_rxq(&amp;mld-&gt;fwrt);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_rss_cfg_cmd(mld);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_config_scan(mld);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_update_device_power(mld, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (mld-&gt;fw_status.in_hw_restart) {</div><div class='add'>+		iwl_mld_send_recovery_cmd(mld, ERROR_RECOVERY_UPDATE_DB);</div><div class='add'>+		iwl_mld_time_sync_fw_config(mld);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mld_led_config_fw(mld);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_init_ppag(mld);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_init_sar(mld);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_init_sgom(mld);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	iwl_mld_init_tas(mld);</div><div class='add'>+	iwl_mld_init_uats(mld);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_start_fw(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_load_fw(mld);</div><div class='add'>+	if (IWL_FW_CHECK(mld, ret, "Failed to start firmware %d\n", ret)) {</div><div class='add'>+		iwl_fw_dbg_error_collect(&amp;mld-&gt;fwrt, FW_DBG_TRIGGER_DRIVER);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(mld, "uCode started.\n");</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_config_fw(mld);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_init_mcc(mld);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	iwl_mld_stop_fw(mld);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/hcmd.h b/drivers/net/wireless/intel/iwlwifi/mld/hcmd.h<br/>new file mode 100644<br/>index 000000000000..64a8d4248324<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/hcmd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/hcmd.h</a></div><div class='hunk'>@@ -0,0 +1,56 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_hcmd_h__</div><div class='add'>+#define __iwl_mld_hcmd_h__</div><div class='add'>+</div><div class='add'>+static inline int iwl_mld_send_cmd(struct iwl_mld *mld, struct iwl_host_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	/* No commands, including the d3 related commands, should be sent</div><div class='add'>+	 * after entering d3</div><div class='add'>+	 */</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	if (WARN_ON(mld-&gt;fw_status.in_d3))</div><div class='add'>+		return -EIO;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (!(cmd-&gt;flags &amp; CMD_ASYNC))</div><div class='add'>+		lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* Devices that need to shutdown immediately on rfkill are not</div><div class='add'>+	 * supported, so we can send all the cmds in rfkill</div><div class='add'>+	 */</div><div class='add'>+	cmd-&gt;flags |= CMD_SEND_IN_RFKILL;</div><div class='add'>+</div><div class='add'>+	return iwl_trans_send_cmd(mld-&gt;trans, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+__iwl_mld_send_cmd_with_flags_pdu(struct iwl_mld *mld, u32 id,</div><div class='add'>+				  u32 flags, const void *data, u16 len)</div><div class='add'>+{</div><div class='add'>+	struct iwl_host_cmd cmd = {</div><div class='add'>+		.id = id,</div><div class='add'>+		.len = { data ? len : 0, },</div><div class='add'>+		.data = { data, },</div><div class='add'>+		.flags = flags,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_cmd(mld, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define _iwl_mld_send_cmd_with_flags_pdu(mld, id, flags, data, len,	\</div><div class='add'>+					 ignored...)			\</div><div class='add'>+	__iwl_mld_send_cmd_with_flags_pdu(mld, id, flags, data, len)</div><div class='add'>+#define iwl_mld_send_cmd_with_flags_pdu(mld, id, flags, data, len...)	\</div><div class='add'>+	_iwl_mld_send_cmd_with_flags_pdu(mld, id, flags, data, ##len,	\</div><div class='add'>+					 sizeof(*(data)))</div><div class='add'>+</div><div class='add'>+#define iwl_mld_send_cmd_pdu(mld, id, ...)				\</div><div class='add'>+	iwl_mld_send_cmd_with_flags_pdu(mld, id, 0, __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define iwl_mld_send_cmd_empty(mld, id)					\</div><div class='add'>+	iwl_mld_send_cmd_with_flags_pdu(mld, id, 0, NULL, 0)</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_hcmd_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/iface.c b/drivers/net/wireless/intel/iwlwifi/mld/iface.c<br/>new file mode 100644<br/>index 000000000000..a5ececfc13e4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/iface.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/iface.c</a></div><div class='hunk'>@@ -0,0 +1,703 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;net/cfg80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "iface.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+#include "key.h"</div><div class='add'>+#include "mlo.h"</div><div class='add'>+#include "mac80211.h"</div><div class='add'>+</div><div class='add'>+#include "fw/api/context.h"</div><div class='add'>+#include "fw/api/mac.h"</div><div class='add'>+#include "fw/api/time-event.h"</div><div class='add'>+#include "fw/api/datapath.h"</div><div class='add'>+</div><div class='add'>+/* Cleanup function for struct iwl_mld_vif, will be called in restart */</div><div class='add'>+void iwl_mld_cleanup_vif(void *data, u8 *mac, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld *mld = mld_vif-&gt;mld;</div><div class='add'>+	struct iwl_mld_link *link;</div><div class='add'>+</div><div class='add'>+	mld_vif-&gt;emlsr.blocked_reasons &amp;= ~IWL_MLD_EMLSR_BLOCKED_ROC;</div><div class='add'>+</div><div class='add'>+	if (mld_vif-&gt;aux_sta.sta_id != IWL_INVALID_STA)</div><div class='add'>+		iwl_mld_free_internal_sta(mld, &amp;mld_vif-&gt;aux_sta);</div><div class='add'>+</div><div class='add'>+	/* EMLSR is turned back on during recovery */</div><div class='add'>+	vif-&gt;driver_flags &amp;= ~IEEE80211_VIF_EML_ACTIVE;</div><div class='add'>+</div><div class='add'>+	if (mld_vif-&gt;roc_activity != ROC_NUM_ACTIVITIES)</div><div class='add'>+		ieee80211_remain_on_channel_expired(mld-&gt;hw);</div><div class='add'>+</div><div class='add'>+	mld_vif-&gt;roc_activity = ROC_NUM_ACTIVITIES;</div><div class='add'>+</div><div class='add'>+	for_each_mld_vif_valid_link(mld_vif, link) {</div><div class='add'>+		iwl_mld_cleanup_link(mld_vif-&gt;mld, link);</div><div class='add'>+</div><div class='add'>+		/* Correctly allocated primary link in non-MLO mode */</div><div class='add'>+		if (!ieee80211_vif_is_mld(vif) &amp;&amp;</div><div class='add'>+		    link_id == 0 &amp;&amp; link == &amp;mld_vif-&gt;deflink)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;active_links &amp; BIT(link_id))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Should not happen as link removal should always succeed */</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		if (link != &amp;mld_vif-&gt;deflink)</div><div class='add'>+			kfree_rcu(link, rcu_head);</div><div class='add'>+		RCU_INIT_POINTER(mld_vif-&gt;link[link_id], NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ieee80211_iter_keys(mld-&gt;hw, vif, iwl_mld_cleanup_keys_iter, NULL);</div><div class='add'>+</div><div class='add'>+	wiphy_delayed_work_cancel(mld-&gt;wiphy, &amp;mld_vif-&gt;mlo_scan_start_wk);</div><div class='add'>+</div><div class='add'>+	CLEANUP_STRUCT(mld_vif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_send_mac_cmd(struct iwl_mld *mld,</div><div class='add'>+				struct iwl_mac_config_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd_pdu(mld,</div><div class='add'>+				   WIDE_ID(MAC_CONF_GROUP, MAC_CONFIG_CMD),</div><div class='add'>+				   cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mld, "Failed to send MAC_CONFIG_CMD ret = %d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_mac80211_iftype_to_fw(const struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	switch (vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		return vif-&gt;p2p ? FW_MAC_TYPE_P2P_STA : FW_MAC_TYPE_BSS_STA;</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		return FW_MAC_TYPE_GO;</div><div class='add'>+	case NL80211_IFTYPE_MONITOR:</div><div class='add'>+		return FW_MAC_TYPE_LISTENER;</div><div class='add'>+	case NL80211_IFTYPE_P2P_DEVICE:</div><div class='add'>+		return FW_MAC_TYPE_P2P_DEVICE;</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		return FW_MAC_TYPE_IBSS;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+	}</div><div class='add'>+	return FW_MAC_TYPE_BSS_STA;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_is_nic_ack_enabled(struct iwl_mld *mld,</div><div class='add'>+				       struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_supported_band *sband;</div><div class='add'>+	const struct ieee80211_sta_he_cap *own_he_cap;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* This capability is the same for all bands,</div><div class='add'>+	 * so take it from one of them.</div><div class='add'>+	 */</div><div class='add'>+	sband = mld-&gt;hw-&gt;wiphy-&gt;bands[NL80211_BAND_2GHZ];</div><div class='add'>+	own_he_cap = ieee80211_get_he_iftype_cap_vif(sband, vif);</div><div class='add'>+</div><div class='add'>+	return own_he_cap &amp;&amp; (own_he_cap-&gt;he_cap_elem.mac_cap_info[2] &amp;</div><div class='add'>+			       IEEE80211_HE_MAC_CAP2_ACK_EN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_set_he_support(struct iwl_mld *mld,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct iwl_mac_config_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP)</div><div class='add'>+		cmd-&gt;wifi_gen.he_ap_support = 1;</div><div class='add'>+	else</div><div class='add'>+		cmd-&gt;wifi_gen.he_support = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* fill the common part for all interface types */</div><div class='add'>+static void iwl_mld_mac_cmd_fill_common(struct iwl_mld *mld,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					struct iwl_mac_config_cmd *cmd,</div><div class='add'>+					u32 action)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;id_and_color = cpu_to_le32(mld_vif-&gt;fw_id);</div><div class='add'>+	cmd-&gt;action = cpu_to_le32(action);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;mac_type =</div><div class='add'>+		cpu_to_le32(iwl_mld_mac80211_iftype_to_fw(vif));</div><div class='add'>+</div><div class='add'>+	memcpy(cmd-&gt;local_mld_addr, vif-&gt;addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	if (iwlwifi_mod_params.disable_11ax)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;nic_not_ack_enabled =</div><div class='add'>+		cpu_to_le32(!iwl_mld_is_nic_ack_enabled(mld, vif));</div><div class='add'>+</div><div class='add'>+	/* If we have MLO enabled, then the firmware needs to enable</div><div class='add'>+	 * address translation for the station(s) we add. That depends</div><div class='add'>+	 * on having EHT enabled in firmware, which in turn depends on</div><div class='add'>+	 * mac80211 in the code below.</div><div class='add'>+	 * However, mac80211 doesn't enable HE/EHT until it has parsed</div><div class='add'>+	 * the association response successfully, so just skip all that</div><div class='add'>+	 * and enable both when we have MLO.</div><div class='add'>+	 */</div><div class='add'>+	if (ieee80211_vif_is_mld(vif)) {</div><div class='add'>+		iwl_mld_set_he_support(mld, vif, cmd);</div><div class='add'>+		cmd-&gt;wifi_gen.eht_support = 1;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_vif_active_link(vif, link_conf, link_id) {</div><div class='add'>+		if (!link_conf-&gt;he_support)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		iwl_mld_set_he_support(mld, vif, cmd);</div><div class='add'>+</div><div class='add'>+		/* EHT, if supported, was already set above */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_fill_mac_cmd_sta(struct iwl_mld *mld,</div><div class='add'>+				     struct ieee80211_vif *vif, u32 action,</div><div class='add'>+				     struct iwl_mac_config_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_bss_conf *link;</div><div class='add'>+	u32 twt_policy = 0;</div><div class='add'>+	int link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	WARN_ON(vif-&gt;type != NL80211_IFTYPE_STATION);</div><div class='add'>+</div><div class='add'>+	/* We always want to hear MCAST frames, if we're not authorized yet,</div><div class='add'>+	 * we'll drop them.</div><div class='add'>+	 */</div><div class='add'>+	cmd-&gt;filter_flags |= cpu_to_le32(MAC_CFG_FILTER_ACCEPT_GRP);</div><div class='add'>+</div><div class='add'>+	/* Adding a MAC ctxt with is_assoc set is not allowed in fw</div><div class='add'>+	 * (and shouldn't happen)</div><div class='add'>+	 */</div><div class='add'>+	if (vif-&gt;cfg.assoc &amp;&amp; action != FW_CTXT_ACTION_ADD) {</div><div class='add'>+		cmd-&gt;client.is_assoc = 1;</div><div class='add'>+</div><div class='add'>+		if (!iwl_mld_vif_from_mac80211(vif)-&gt;authorized)</div><div class='add'>+			cmd-&gt;client.data_policy |=</div><div class='add'>+				cpu_to_le16(COEX_HIGH_PRIORITY_ENABLE);</div><div class='add'>+	} else {</div><div class='add'>+		/* Allow beacons to pass through as long as we are not</div><div class='add'>+		 * associated</div><div class='add'>+		 */</div><div class='add'>+		cmd-&gt;filter_flags |= cpu_to_le32(MAC_CFG_FILTER_ACCEPT_BEACON);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd-&gt;client.assoc_id = cpu_to_le16(vif-&gt;cfg.aid);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_is_mld(vif)) {</div><div class='add'>+		u16 esr_transition_timeout =</div><div class='add'>+			u16_get_bits(vif-&gt;cfg.eml_cap,</div><div class='add'>+				     IEEE80211_EML_CAP_TRANSITION_TIMEOUT);</div><div class='add'>+</div><div class='add'>+		cmd-&gt;client.esr_transition_timeout =</div><div class='add'>+			min_t(u16, IEEE80211_EML_CAP_TRANSITION_TIMEOUT_128TU,</div><div class='add'>+			      esr_transition_timeout);</div><div class='add'>+		cmd-&gt;client.medium_sync_delay =</div><div class='add'>+			cpu_to_le16(vif-&gt;cfg.eml_med_sync_delay);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_vif_active_link(vif, link, link_id) {</div><div class='add'>+		if (!link-&gt;he_support)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (link-&gt;twt_requester)</div><div class='add'>+			twt_policy |= TWT_SUPPORTED;</div><div class='add'>+		if (link-&gt;twt_protected)</div><div class='add'>+			twt_policy |= PROTECTED_TWT_SUPPORTED;</div><div class='add'>+		if (link-&gt;twt_broadcast)</div><div class='add'>+			twt_policy |= BROADCAST_TWT_SUPPORTED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!iwlwifi_mod_params.disable_11ax)</div><div class='add'>+		cmd-&gt;client.data_policy |= cpu_to_le16(twt_policy);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;probe_req_reg &amp;&amp; vif-&gt;cfg.assoc &amp;&amp; vif-&gt;p2p)</div><div class='add'>+		cmd-&gt;filter_flags |=</div><div class='add'>+			cpu_to_le32(MAC_CFG_FILTER_ACCEPT_PROBE_REQ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_fill_mac_cmd_ap(struct iwl_mld *mld,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct iwl_mac_config_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	WARN_ON(vif-&gt;type != NL80211_IFTYPE_AP);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;filter_flags |= cpu_to_le32(MAC_CFG_FILTER_ACCEPT_PROBE_REQ);</div><div class='add'>+</div><div class='add'>+	/* in AP mode, pass beacons from other APs (needed for ht protection).</div><div class='add'>+	 * When there're no any associated station, which means that we are not</div><div class='add'>+	 * TXing anyway, don't ask FW to pass beacons to prevent unnecessary</div><div class='add'>+	 * wake-ups.</div><div class='add'>+	 */</div><div class='add'>+	if (mld_vif-&gt;num_associated_stas)</div><div class='add'>+		cmd-&gt;filter_flags |= cpu_to_le32(MAC_CFG_FILTER_ACCEPT_BEACON);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_go_iterator(void *_data, u8 *mac, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	bool *go_active = _data;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_type_p2p(vif) == NL80211_IFTYPE_P2P_GO &amp;&amp;</div><div class='add'>+	    iwl_mld_vif_from_mac80211(vif)-&gt;ap_ibss_active)</div><div class='add'>+		*go_active = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_p2p_dev_has_extended_disc(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	bool go_active = false;</div><div class='add'>+</div><div class='add'>+	/* This flag should be set to true when the P2P Device is</div><div class='add'>+	 * discoverable and there is at least a P2P GO. Setting</div><div class='add'>+	 * this flag will allow the P2P Device to be discoverable on other</div><div class='add'>+	 * channels in addition to its listen channel.</div><div class='add'>+	 * Note that this flag should not be set in other cases as it opens the</div><div class='add'>+	 * Rx filters on all MAC and increases the number of interrupts.</div><div class='add'>+	 */</div><div class='add'>+	ieee80211_iterate_active_interfaces(mld-&gt;hw,</div><div class='add'>+					    IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='add'>+					    iwl_mld_go_iterator, &amp;go_active);</div><div class='add'>+</div><div class='add'>+	return go_active;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_fill_mac_cmd_p2p_dev(struct iwl_mld *mld,</div><div class='add'>+					 struct ieee80211_vif *vif,</div><div class='add'>+					 struct iwl_mac_config_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	bool ext_disc = iwl_mld_p2p_dev_has_extended_disc(mld);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* Override the filter flags to accept all management frames. This is</div><div class='add'>+	 * needed to support both P2P device discovery using probe requests and</div><div class='add'>+	 * P2P service discovery using action frames</div><div class='add'>+	 */</div><div class='add'>+	cmd-&gt;filter_flags = cpu_to_le32(MAC_CFG_FILTER_ACCEPT_CONTROL_AND_MGMT);</div><div class='add'>+</div><div class='add'>+	if (ext_disc)</div><div class='add'>+		cmd-&gt;p2p_dev.is_disc_extended = cpu_to_le32(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_fill_mac_cmd_ibss(struct iwl_mld *mld,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      struct iwl_mac_config_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	WARN_ON(vif-&gt;type != NL80211_IFTYPE_ADHOC);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;filter_flags |= cpu_to_le32(MAC_CFG_FILTER_ACCEPT_BEACON |</div><div class='add'>+					 MAC_CFG_FILTER_ACCEPT_PROBE_REQ |</div><div class='add'>+					 MAC_CFG_FILTER_ACCEPT_GRP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_rm_mac_from_fw(struct iwl_mld *mld, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mac_config_cmd cmd = {</div><div class='add'>+		.action = cpu_to_le32(FW_CTXT_ACTION_REMOVE),</div><div class='add'>+		.id_and_color = cpu_to_le32(mld_vif-&gt;fw_id),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_mac_cmd(mld, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_mac_fw_action(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			  u32 action)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mac_config_cmd cmd = {};</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (action == FW_CTXT_ACTION_REMOVE)</div><div class='add'>+		return iwl_mld_rm_mac_from_fw(mld, vif);</div><div class='add'>+</div><div class='add'>+	iwl_mld_mac_cmd_fill_common(mld, vif, &amp;cmd, action);</div><div class='add'>+</div><div class='add'>+	switch (vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		iwl_mld_fill_mac_cmd_sta(mld, vif, action, &amp;cmd);</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		iwl_mld_fill_mac_cmd_ap(mld, vif, &amp;cmd);</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_MONITOR:</div><div class='add'>+		cmd.filter_flags =</div><div class='add'>+			cpu_to_le32(MAC_CFG_FILTER_PROMISC |</div><div class='add'>+				    MAC_CFG_FILTER_ACCEPT_CONTROL_AND_MGMT |</div><div class='add'>+				    MAC_CFG_FILTER_ACCEPT_BEACON |</div><div class='add'>+				    MAC_CFG_FILTER_ACCEPT_PROBE_REQ |</div><div class='add'>+				    MAC_CFG_FILTER_ACCEPT_GRP);</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_P2P_DEVICE:</div><div class='add'>+		iwl_mld_fill_mac_cmd_p2p_dev(mld, vif, &amp;cmd);</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		iwl_mld_fill_mac_cmd_ibss(mld, vif, &amp;cmd);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN(1, "not supported yet\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_mac_cmd(mld, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_mlo_scan_start_wk(struct wiphy *wiphy,</div><div class='add'>+				      struct wiphy_work *wk)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = container_of(wk, struct iwl_mld_vif,</div><div class='add'>+						   mlo_scan_start_wk.work);</div><div class='add'>+	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+</div><div class='add'>+	iwl_mld_int_mlo_scan(mld, iwl_mld_vif_to_mac80211(mld_vif));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+IWL_MLD_ALLOC_FN(vif, vif)</div><div class='add'>+</div><div class='add'>+/* Constructor function for struct iwl_mld_vif */</div><div class='add'>+static int</div><div class='add'>+iwl_mld_init_vif(struct iwl_mld *mld, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	mld_vif-&gt;mld = mld;</div><div class='add'>+	mld_vif-&gt;roc_activity = ROC_NUM_ACTIVITIES;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_allocate_vif_fw_id(mld, &amp;mld_vif-&gt;fw_id, vif);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!mld-&gt;fw_status.in_hw_restart) {</div><div class='add'>+		wiphy_work_init(&amp;mld_vif-&gt;emlsr.unblock_tpt_wk,</div><div class='add'>+				iwl_mld_emlsr_unblock_tpt_wk);</div><div class='add'>+		wiphy_delayed_work_init(&amp;mld_vif-&gt;emlsr.check_tpt_wk,</div><div class='add'>+					iwl_mld_emlsr_check_tpt);</div><div class='add'>+		wiphy_delayed_work_init(&amp;mld_vif-&gt;emlsr.prevent_done_wk,</div><div class='add'>+					iwl_mld_emlsr_prevent_done_wk);</div><div class='add'>+		wiphy_delayed_work_init(&amp;mld_vif-&gt;emlsr.tmp_non_bss_done_wk,</div><div class='add'>+					iwl_mld_emlsr_tmp_non_bss_done_wk);</div><div class='add'>+		wiphy_delayed_work_init(&amp;mld_vif-&gt;mlo_scan_start_wk,</div><div class='add'>+					iwl_mld_mlo_scan_start_wk);</div><div class='add'>+	}</div><div class='add'>+	iwl_mld_init_internal_sta(&amp;mld_vif-&gt;aux_sta);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_add_vif(struct iwl_mld *mld, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_init_vif(mld, vif);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_mac_fw_action(mld, vif, FW_CTXT_ACTION_ADD);</div><div class='add'>+	if (ret)</div><div class='add'>+		RCU_INIT_POINTER(mld-&gt;fw_id_to_vif[mld_vif-&gt;fw_id], NULL);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_rm_vif(struct iwl_mld *mld, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	iwl_mld_mac_fw_action(mld, vif, FW_CTXT_ACTION_REMOVE);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(mld_vif-&gt;fw_id &gt;= ARRAY_SIZE(mld-&gt;fw_id_to_vif)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	RCU_INIT_POINTER(mld-&gt;fw_id_to_vif[mld_vif-&gt;fw_id], NULL);</div><div class='add'>+</div><div class='add'>+	iwl_mld_cancel_notifications_of_object(mld, IWL_MLD_OBJECT_TYPE_VIF,</div><div class='add'>+					       mld_vif-&gt;fw_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_set_vif_associated(struct iwl_mld *mld,</div><div class='add'>+				struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_bss_conf *link;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+</div><div class='add'>+	for_each_vif_active_link(vif, link, link_id) {</div><div class='add'>+		if (iwl_mld_link_set_associated(mld, vif, link))</div><div class='add'>+			IWL_ERR(mld, "failed to update link %d\n", link_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mld_recalc_multicast_filter(mld);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_get_fw_id_bss_bitmap_iter(void *_data, u8 *mac,</div><div class='add'>+					      struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	u8 *fw_id_bitmap = _data;</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_type_p2p(vif) != NL80211_IFTYPE_STATION)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	*fw_id_bitmap |= BIT(mld_vif-&gt;fw_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 iwl_mld_get_fw_bss_vifs_ids(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	u8 fw_id_bitmap = 0;</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_mtx(mld-&gt;hw,</div><div class='add'>+						IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER,</div><div class='add'>+						iwl_mld_get_fw_id_bss_bitmap_iter,</div><div class='add'>+						&amp;fw_id_bitmap);</div><div class='add'>+</div><div class='add'>+	return fw_id_bitmap;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_probe_resp_data_notif(struct iwl_mld *mld,</div><div class='add'>+					  struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_probe_resp_data_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+	struct iwl_probe_resp_data *old_data, *new_data;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct iwl_mld_link *mld_link;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(mld, "Probe response data notif: noa %d, csa %d\n",</div><div class='add'>+		       notif-&gt;noa_active, notif-&gt;csa_counter);</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, le32_to_cpu(notif-&gt;mac_id) &gt;=</div><div class='add'>+			 ARRAY_SIZE(mld-&gt;fw_id_to_vif),</div><div class='add'>+			 "mac id is invalid: %d\n",</div><div class='add'>+			 le32_to_cpu(notif-&gt;mac_id)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vif = wiphy_dereference(mld-&gt;wiphy,</div><div class='add'>+				mld-&gt;fw_id_to_vif[le32_to_cpu(notif-&gt;mac_id)]);</div><div class='add'>+</div><div class='add'>+	/* the firmware gives us the mac_id (and not the link_id), mac80211</div><div class='add'>+	 * gets a vif and not a link, bottom line, this flow is not MLD ready</div><div class='add'>+	 * yet.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON(!vif) || ieee80211_vif_is_mld(vif))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (notif-&gt;csa_counter != IWL_PROBE_RESP_DATA_NO_CSA &amp;&amp;</div><div class='add'>+	    notif-&gt;csa_counter &gt;= 1)</div><div class='add'>+		ieee80211_beacon_set_cntdwn(vif, notif-&gt;csa_counter);</div><div class='add'>+</div><div class='add'>+	if (!vif-&gt;p2p)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mld_link = &amp;iwl_mld_vif_from_mac80211(vif)-&gt;deflink;</div><div class='add'>+</div><div class='add'>+	/* len_low should be 2 + n*13 (where n is the number of descriptors.</div><div class='add'>+	 * 13 is the size of a NoA descriptor). We can have either one or two</div><div class='add'>+	 * descriptors.</div><div class='add'>+	 */</div><div class='add'>+	if (IWL_FW_CHECK(mld, notif-&gt;noa_active &amp;&amp;</div><div class='add'>+			 notif-&gt;noa_attr.len_low != 2 +</div><div class='add'>+			 sizeof(struct ieee80211_p2p_noa_desc) &amp;&amp;</div><div class='add'>+			 notif-&gt;noa_attr.len_low != 2 +</div><div class='add'>+			 sizeof(struct ieee80211_p2p_noa_desc) * 2,</div><div class='add'>+			 "Invalid noa_attr.len_low (%d)\n",</div><div class='add'>+			 notif-&gt;noa_attr.len_low))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	new_data = kzalloc(sizeof(*new_data), GFP_KERNEL);</div><div class='add'>+	if (!new_data)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;new_data-&gt;notif, notif, sizeof(new_data-&gt;notif));</div><div class='add'>+</div><div class='add'>+	/* noa_attr contains 1 reserved byte, need to substruct it */</div><div class='add'>+	new_data-&gt;noa_len = sizeof(struct ieee80211_vendor_ie) +</div><div class='add'>+			    sizeof(new_data-&gt;notif.noa_attr) - 1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If it's a one time NoA, only one descriptor is needed,</div><div class='add'>+	 * adjust the length according to len_low.</div><div class='add'>+	 */</div><div class='add'>+	if (new_data-&gt;notif.noa_attr.len_low ==</div><div class='add'>+	    sizeof(struct ieee80211_p2p_noa_desc) + 2)</div><div class='add'>+		new_data-&gt;noa_len -= sizeof(struct ieee80211_p2p_noa_desc);</div><div class='add'>+</div><div class='add'>+	old_data = wiphy_dereference(mld-&gt;wiphy, mld_link-&gt;probe_resp_data);</div><div class='add'>+	rcu_assign_pointer(mld_link-&gt;probe_resp_data, new_data);</div><div class='add'>+</div><div class='add'>+	if (old_data)</div><div class='add'>+		kfree_rcu(old_data, rcu_head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_uapsd_misbehaving_ap_notif(struct iwl_mld *mld,</div><div class='add'>+					       struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_uapsd_misbehaving_ap_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, notif-&gt;mac_id &gt;= ARRAY_SIZE(mld-&gt;fw_id_to_vif),</div><div class='add'>+			 "mac id is invalid: %d\n", notif-&gt;mac_id))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vif = wiphy_dereference(mld-&gt;wiphy, mld-&gt;fw_id_to_vif[notif-&gt;mac_id]);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!vif) || ieee80211_vif_is_mld(vif))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	IWL_WARN(mld, "uapsd misbehaving AP: %pM\n", vif-&gt;bss_conf.bssid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_datapath_monitor_notif(struct iwl_mld *mld,</div><div class='add'>+					   struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_datapath_monitor_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+	struct ieee80211_bss_conf *link;</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	const struct ieee80211_sta_he_cap *he_cap;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct iwl_mld_vif *mld_vif;</div><div class='add'>+</div><div class='add'>+	if (notif-&gt;type != cpu_to_le32(IWL_DP_MON_NOTIF_TYPE_EXT_CCA))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	link = iwl_mld_fw_id_to_link_conf(mld, notif-&gt;link_id);</div><div class='add'>+	if (WARN_ON(!link))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vif = link-&gt;vif;</div><div class='add'>+	if (WARN_ON(!vif) || vif-&gt;type != NL80211_IFTYPE_STATION ||</div><div class='add'>+	    !vif-&gt;cfg.assoc)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!link-&gt;chanreq.oper.chan ||</div><div class='add'>+	    link-&gt;chanreq.oper.chan-&gt;band != NL80211_BAND_2GHZ ||</div><div class='add'>+	    link-&gt;chanreq.oper.width &lt; NL80211_CHAN_WIDTH_40)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	/* this shouldn't happen *again*, ignore it */</div><div class='add'>+	if (mld_vif-&gt;cca_40mhz_workaround != CCA_40_MHZ_WA_NONE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mld_vif-&gt;cca_40mhz_workaround = CCA_40_MHZ_WA_RECONNECT;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This capability manipulation isn't really ideal, but it's the</div><div class='add'>+	 * easiest choice - otherwise we'd have to do some major changes</div><div class='add'>+	 * in mac80211 to support this, which isn't worth it. This does</div><div class='add'>+	 * mean that userspace may have outdated information, but that's</div><div class='add'>+	 * actually not an issue at all.</div><div class='add'>+	 */</div><div class='add'>+	sband = mld-&gt;wiphy-&gt;bands[NL80211_BAND_2GHZ];</div><div class='add'>+</div><div class='add'>+	WARN_ON(!sband-&gt;ht_cap.ht_supported);</div><div class='add'>+	WARN_ON(!(sband-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SUP_WIDTH_20_40));</div><div class='add'>+	sband-&gt;ht_cap.cap &amp;= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;</div><div class='add'>+</div><div class='add'>+	he_cap = ieee80211_get_he_iftype_cap_vif(sband, vif);</div><div class='add'>+</div><div class='add'>+	if (he_cap) {</div><div class='add'>+		/* we know that ours is writable */</div><div class='add'>+		struct ieee80211_sta_he_cap *he = (void *)(uintptr_t)he_cap;</div><div class='add'>+</div><div class='add'>+		WARN_ON(!he-&gt;has_he);</div><div class='add'>+		WARN_ON(!(he-&gt;he_cap_elem.phy_cap_info[0] &amp;</div><div class='add'>+			  IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G));</div><div class='add'>+		he-&gt;he_cap_elem.phy_cap_info[0] &amp;=</div><div class='add'>+			~IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ieee80211_disconnect(vif, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_reset_cca_40mhz_workaround(struct iwl_mld *mld,</div><div class='add'>+					struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	const struct ieee80211_sta_he_cap *he_cap;</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (mld_vif-&gt;cca_40mhz_workaround == CCA_40_MHZ_WA_NONE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Now we are just reconnecting with the new capabilities,</div><div class='add'>+	 * but remember to reset the capabilities when we disconnect for real</div><div class='add'>+	 */</div><div class='add'>+	if (mld_vif-&gt;cca_40mhz_workaround == CCA_40_MHZ_WA_RECONNECT) {</div><div class='add'>+		mld_vif-&gt;cca_40mhz_workaround = CCA_40_MHZ_WA_RESET;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now cca_40mhz_workaround == CCA_40_MHZ_WA_RESET */</div><div class='add'>+</div><div class='add'>+	sband = mld-&gt;wiphy-&gt;bands[NL80211_BAND_2GHZ];</div><div class='add'>+</div><div class='add'>+	sband-&gt;ht_cap.cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;</div><div class='add'>+</div><div class='add'>+	he_cap = ieee80211_get_he_iftype_cap_vif(sband, vif);</div><div class='add'>+</div><div class='add'>+	if (he_cap) {</div><div class='add'>+		/* we know that ours is writable */</div><div class='add'>+		struct ieee80211_sta_he_cap *he = (void *)(uintptr_t)he_cap;</div><div class='add'>+</div><div class='add'>+		he-&gt;he_cap_elem.phy_cap_info[0] |=</div><div class='add'>+			IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mld_vif-&gt;cca_40mhz_workaround = CCA_40_MHZ_WA_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ieee80211_vif *iwl_mld_get_bss_vif(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	unsigned long fw_id_bitmap = iwl_mld_get_fw_bss_vifs_ids(mld);</div><div class='add'>+	int fw_id;</div><div class='add'>+</div><div class='add'>+	if (hweight8(fw_id_bitmap) != 1)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	fw_id = __ffs(fw_id_bitmap);</div><div class='add'>+</div><div class='add'>+	return wiphy_dereference(mld-&gt;wiphy,</div><div class='add'>+				 mld-&gt;fw_id_to_vif[fw_id]);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/iface.h b/drivers/net/wireless/intel/iwlwifi/mld/iface.h<br/>new file mode 100644<br/>index 000000000000..a3573d20f214<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/iface.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/iface.h</a></div><div class='hunk'>@@ -0,0 +1,250 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_iface_h__</div><div class='add'>+#define __iwl_mld_iface_h__</div><div class='add'>+</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "link.h"</div><div class='add'>+#include "session-protect.h"</div><div class='add'>+#include "d3.h"</div><div class='add'>+#include "fw/api/time-event.h"</div><div class='add'>+</div><div class='add'>+enum iwl_mld_cca_40mhz_wa_status {</div><div class='add'>+	CCA_40_MHZ_WA_NONE,</div><div class='add'>+	CCA_40_MHZ_WA_RESET,</div><div class='add'>+	CCA_40_MHZ_WA_RECONNECT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_mld_emlsr_blocked - defines reasons for which EMLSR is blocked</div><div class='add'>+ *</div><div class='add'>+ * These blocks are applied/stored per-VIF.</div><div class='add'>+ *</div><div class='add'>+ * @IWL_MLD_EMLSR_BLOCKED_PREVENTION: Prevent repeated EMLSR enter/exit</div><div class='add'>+ * @IWL_MLD_EMLSR_BLOCKED_WOWLAN: WOWLAN is preventing EMLSR</div><div class='add'>+ * @IWL_MLD_EMLSR_BLOCKED_ROC: remain-on-channel is preventing EMLSR</div><div class='add'>+ * @IWL_MLD_EMLSR_BLOCKED_NON_BSS: An active non-BSS interface's link is</div><div class='add'>+ *      preventing EMLSR</div><div class='add'>+ * @IWL_MLD_EMLSR_BLOCKED_TMP_NON_BSS: An expected active non-BSS interface's</div><div class='add'>+ *      link is preventing EMLSR. This is a temporary blocking that is set when</div><div class='add'>+ *      there is an indication that a non-BSS interface is to be added.</div><div class='add'>+ * @IWL_MLD_EMLSR_BLOCKED_TPT: throughput is too low to make EMLSR worthwhile</div><div class='add'>+ */</div><div class='add'>+enum iwl_mld_emlsr_blocked {</div><div class='add'>+	IWL_MLD_EMLSR_BLOCKED_PREVENTION	= 0x1,</div><div class='add'>+	IWL_MLD_EMLSR_BLOCKED_WOWLAN		= 0x2,</div><div class='add'>+	IWL_MLD_EMLSR_BLOCKED_ROC		= 0x4,</div><div class='add'>+	IWL_MLD_EMLSR_BLOCKED_NON_BSS		= 0x8,</div><div class='add'>+	IWL_MLD_EMLSR_BLOCKED_TMP_NON_BSS	= 0x10,</div><div class='add'>+	IWL_MLD_EMLSR_BLOCKED_TPT		= 0x20,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_mld_emlsr_exit - defines reasons for exiting EMLSR</div><div class='add'>+ *</div><div class='add'>+ * Reasons to exit EMLSR may be either link specific or even specific to a</div><div class='add'>+ * combination of links.</div><div class='add'>+ *</div><div class='add'>+ * @IWL_MLD_EMLSR_EXIT_BLOCK: Exit due to a block reason being set</div><div class='add'>+ * @IWL_MLD_EMLSR_EXIT_MISSED_BEACON: Exit due to missed beacons</div><div class='add'>+ * @IWL_MLD_EMLSR_EXIT_FAIL_ENTRY: FW failed to enter EMLSR</div><div class='add'>+ * @IWL_MLD_EMLSR_EXIT_CSA: EMLSR prevented due to channel switch on link</div><div class='add'>+ * @IWL_MLD_EMLSR_EXIT_EQUAL_BAND: EMLSR prevented as both links share the band</div><div class='add'>+ * @IWL_MLD_EMLSR_EXIT_LOW_RSSI: Link RSSI is unsuitable for EMLSR</div><div class='add'>+ * @IWL_MLD_EMLSR_EXIT_LINK_USAGE: Exit EMLSR due to low TPT on secondary link</div><div class='add'>+ * @IWL_MLD_EMLSR_EXIT_BT_COEX: Exit EMLSR due to BT coexistence</div><div class='add'>+ * @IWL_MLD_EMLSR_EXIT_CHAN_LOAD: Exit EMLSR because the primary channel is not</div><div class='add'>+ *	loaded enough to justify EMLSR.</div><div class='add'>+ * @IWL_MLD_EMLSR_EXIT_RFI: Exit EMLSR due to RFI</div><div class='add'>+ * @IWL_MLD_EMLSR_EXIT_FW_REQUEST: Exit EMLSR because the FW requested it</div><div class='add'>+ * @IWL_MLD_EMLSR_EXIT_INVALID: internal exit reason due to invalid data</div><div class='add'>+ */</div><div class='add'>+enum iwl_mld_emlsr_exit {</div><div class='add'>+	IWL_MLD_EMLSR_EXIT_BLOCK		= 0x1,</div><div class='add'>+	IWL_MLD_EMLSR_EXIT_MISSED_BEACON	= 0x2,</div><div class='add'>+	IWL_MLD_EMLSR_EXIT_FAIL_ENTRY		= 0x4,</div><div class='add'>+	IWL_MLD_EMLSR_EXIT_CSA			= 0x8,</div><div class='add'>+	IWL_MLD_EMLSR_EXIT_EQUAL_BAND		= 0x10,</div><div class='add'>+	IWL_MLD_EMLSR_EXIT_LOW_RSSI		= 0x20,</div><div class='add'>+	IWL_MLD_EMLSR_EXIT_LINK_USAGE		= 0x40,</div><div class='add'>+	IWL_MLD_EMLSR_EXIT_BT_COEX		= 0x80,</div><div class='add'>+	IWL_MLD_EMLSR_EXIT_CHAN_LOAD		= 0x100,</div><div class='add'>+	IWL_MLD_EMLSR_EXIT_RFI			= 0x200,</div><div class='add'>+	IWL_MLD_EMLSR_EXIT_FW_REQUEST		= 0x400,</div><div class='add'>+	IWL_MLD_EMLSR_EXIT_INVALID		= 0x800,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_emlsr - per-VIF data about EMLSR operation</div><div class='add'>+ *</div><div class='add'>+ * @primary: The current primary link</div><div class='add'>+ * @selected_primary: Primary link as selected during the last link selection</div><div class='add'>+ * @selected_links: Links as selected during the last link selection</div><div class='add'>+ * @blocked_reasons: Reasons preventing EMLSR from being enabled</div><div class='add'>+ * @last_exit_reason: Reason for the last EMLSR exit</div><div class='add'>+ * @last_exit_ts: Time of the last EMLSR exit (if @last_exit_reason is non-zero)</div><div class='add'>+ * @exit_repeat_count: Number of times EMLSR was exited for the same reason</div><div class='add'>+ * @last_entry_ts: the time of the last EMLSR entry (if iwl_mld_emlsr_active()</div><div class='add'>+ *	is true)</div><div class='add'>+ * @unblock_tpt_wk: Unblock EMLSR because the throughput limit was reached</div><div class='add'>+ * @check_tpt_wk: a worker to check if IWL_MLD_EMLSR_BLOCKED_TPT should be</div><div class='add'>+ *	added, for example if there is no longer enough traffic.</div><div class='add'>+ * @prevent_done_wk: Worker to remove %IWL_MLD_EMLSR_BLOCKED_PREVENTION</div><div class='add'>+ * @tmp_non_bss_done_wk: Worker to remove %IWL_MLD_EMLSR_BLOCKED_TMP_NON_BSS</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_emlsr {</div><div class='add'>+	struct_group(zeroed_on_not_authorized,</div><div class='add'>+		u8 primary;</div><div class='add'>+</div><div class='add'>+		u8 selected_primary;</div><div class='add'>+		u16 selected_links;</div><div class='add'>+</div><div class='add'>+		enum iwl_mld_emlsr_blocked blocked_reasons;</div><div class='add'>+</div><div class='add'>+		enum iwl_mld_emlsr_exit last_exit_reason;</div><div class='add'>+		unsigned long last_exit_ts;</div><div class='add'>+		u8 exit_repeat_count;</div><div class='add'>+		unsigned long last_entry_ts;</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	struct wiphy_work unblock_tpt_wk;</div><div class='add'>+	struct wiphy_delayed_work check_tpt_wk;</div><div class='add'>+</div><div class='add'>+	struct wiphy_delayed_work prevent_done_wk;</div><div class='add'>+	struct wiphy_delayed_work tmp_non_bss_done_wk;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_vif - virtual interface (MAC context) configuration parameters</div><div class='add'>+ *</div><div class='add'>+ * @fw_id: fw id of the mac context.</div><div class='add'>+ * @session_protect: session protection parameters</div><div class='add'>+ * @ap_sta: pointer to AP sta, for easier access to it.</div><div class='add'>+ *	Relevant only for STA vifs.</div><div class='add'>+ * @authorized: indicates the AP station was set to authorized</div><div class='add'>+ * @num_associated_stas: number of associated STAs. Relevant only for AP mode.</div><div class='add'>+ * @ap_ibss_active: whether the AP/IBSS was started</div><div class='add'>+ * @cca_40mhz_workaround: When we are connected in 2.4 GHz and 40 MHz, and the</div><div class='add'>+ *	environment is too loaded, we work around this by reconnecting to the</div><div class='add'>+ *	same AP with 20 MHz. This manages the status of the workaround.</div><div class='add'>+ * @beacon_inject_active: indicates an active debugfs beacon ie injection</div><div class='add'>+ * @low_latency_causes: bit flags, indicating the causes for low-latency,</div><div class='add'>+ *	see @iwl_mld_low_latency_cause.</div><div class='add'>+ * @ps_disabled: indicates that PS is disabled for this interface</div><div class='add'>+ * @last_link_activation_time: last time a link was activated, for</div><div class='add'>+ *	deferring MLO scans (to make them more reliable)</div><div class='add'>+ * @mld: pointer to the mld structure.</div><div class='add'>+ * @deflink: default link data, for use in non-MLO,</div><div class='add'>+ * @link: reference to link data for each valid link, for use in MLO.</div><div class='add'>+ * @emlsr: information related to EMLSR</div><div class='add'>+ * @wowlan_data: data used by the wowlan suspend flow</div><div class='add'>+ * @use_ps_poll: use ps_poll frames</div><div class='add'>+ * @disable_bf: disable beacon filter</div><div class='add'>+ * @dbgfs_slink: debugfs symlink for this interface</div><div class='add'>+ * @roc_activity: the id of the roc_activity running. Relevant for STA and</div><div class='add'>+ *	p2p device only. Set to %ROC_NUM_ACTIVITIES when not in use.</div><div class='add'>+ * @aux_sta: station used for remain on channel. Used in P2P device.</div><div class='add'>+ * @mlo_scan_start_wk: worker to start a deferred MLO scan</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_vif {</div><div class='add'>+	/* Add here fields that need clean up on restart */</div><div class='add'>+	struct_group(zeroed_on_hw_restart,</div><div class='add'>+		u8 fw_id;</div><div class='add'>+		struct iwl_mld_session_protect session_protect;</div><div class='add'>+		struct ieee80211_sta *ap_sta;</div><div class='add'>+		bool authorized;</div><div class='add'>+		u8 num_associated_stas;</div><div class='add'>+		bool ap_ibss_active;</div><div class='add'>+		enum iwl_mld_cca_40mhz_wa_status cca_40mhz_workaround;</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='add'>+		bool beacon_inject_active;</div><div class='add'>+#endif</div><div class='add'>+		u8 low_latency_causes;</div><div class='add'>+		bool ps_disabled;</div><div class='add'>+		time64_t last_link_activation_time;</div><div class='add'>+	);</div><div class='add'>+	/* And here fields that survive a fw restart */</div><div class='add'>+	struct iwl_mld *mld;</div><div class='add'>+	struct iwl_mld_link deflink;</div><div class='add'>+	struct iwl_mld_link __rcu *link[IEEE80211_MLD_MAX_NUM_LINKS];</div><div class='add'>+</div><div class='add'>+	struct iwl_mld_emlsr emlsr;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	struct iwl_mld_wowlan_data wowlan_data;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='add'>+	bool use_ps_poll;</div><div class='add'>+	bool disable_bf;</div><div class='add'>+	struct dentry *dbgfs_slink;</div><div class='add'>+#endif</div><div class='add'>+	enum iwl_roc_activity roc_activity;</div><div class='add'>+	struct iwl_mld_int_sta aux_sta;</div><div class='add'>+</div><div class='add'>+	struct wiphy_delayed_work mlo_scan_start_wk;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct iwl_mld_vif *</div><div class='add'>+iwl_mld_vif_from_mac80211(struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	return (void *)vif-&gt;drv_priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct ieee80211_vif *</div><div class='add'>+iwl_mld_vif_to_mac80211(struct iwl_mld_vif *mld_vif)</div><div class='add'>+{</div><div class='add'>+	return container_of((void *)mld_vif, struct ieee80211_vif, drv_priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define iwl_mld_link_dereference_check(mld_vif, link_id)		\</div><div class='add'>+	rcu_dereference_check((mld_vif)-&gt;link[link_id],			\</div><div class='add'>+			      lockdep_is_held(&amp;mld_vif-&gt;mld-&gt;wiphy-&gt;mtx))</div><div class='add'>+</div><div class='add'>+#define for_each_mld_vif_valid_link(mld_vif, mld_link)			\</div><div class='add'>+	for (int link_id = 0; link_id &lt; ARRAY_SIZE((mld_vif)-&gt;link);	\</div><div class='add'>+	     link_id++)							\</div><div class='add'>+		if ((mld_link = iwl_mld_link_dereference_check(mld_vif, link_id)))</div><div class='add'>+</div><div class='add'>+/* Retrieve pointer to mld link from mac80211 structures */</div><div class='add'>+static inline struct iwl_mld_link *</div><div class='add'>+iwl_mld_link_from_mac80211(struct ieee80211_bss_conf *bss_conf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(bss_conf-&gt;vif);</div><div class='add'>+</div><div class='add'>+	return iwl_mld_link_dereference_check(mld_vif, bss_conf-&gt;link_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_mac80211_iftype_to_fw(const struct ieee80211_vif *vif);</div><div class='add'>+</div><div class='add'>+/* Cleanup function for struct iwl_mld_vif, will be called in restart */</div><div class='add'>+void iwl_mld_cleanup_vif(void *data, u8 *mac, struct ieee80211_vif *vif);</div><div class='add'>+int iwl_mld_mac_fw_action(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			  u32 action);</div><div class='add'>+int iwl_mld_add_vif(struct iwl_mld *mld, struct ieee80211_vif *vif);</div><div class='add'>+void iwl_mld_rm_vif(struct iwl_mld *mld, struct ieee80211_vif *vif);</div><div class='add'>+void iwl_mld_set_vif_associated(struct iwl_mld *mld,</div><div class='add'>+				struct ieee80211_vif *vif);</div><div class='add'>+u8 iwl_mld_get_fw_bss_vifs_ids(struct iwl_mld *mld);</div><div class='add'>+void iwl_mld_handle_probe_resp_data_notif(struct iwl_mld *mld,</div><div class='add'>+					  struct iwl_rx_packet *pkt);</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_datapath_monitor_notif(struct iwl_mld *mld,</div><div class='add'>+					   struct iwl_rx_packet *pkt);</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_uapsd_misbehaving_ap_notif(struct iwl_mld *mld,</div><div class='add'>+					       struct iwl_rx_packet *pkt);</div><div class='add'>+</div><div class='add'>+void iwl_mld_reset_cca_40mhz_workaround(struct iwl_mld *mld,</div><div class='add'>+					struct ieee80211_vif *vif);</div><div class='add'>+</div><div class='add'>+static inline bool iwl_mld_vif_low_latency(const struct iwl_mld_vif *mld_vif)</div><div class='add'>+{</div><div class='add'>+	return !!mld_vif-&gt;low_latency_causes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ieee80211_vif *iwl_mld_get_bss_vif(struct iwl_mld *mld);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_iface_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/key.c b/drivers/net/wireless/intel/iwlwifi/mld/key.c<br/>new file mode 100644<br/>index 000000000000..04192c5f07ff<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/key.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/key.c</a></div><div class='hunk'>@@ -0,0 +1,408 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include "key.h"</div><div class='add'>+#include "iface.h"</div><div class='add'>+#include "sta.h"</div><div class='add'>+#include "fw/api/datapath.h"</div><div class='add'>+</div><div class='add'>+static u32 iwl_mld_get_key_flags(struct iwl_mld *mld,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_sta *sta,</div><div class='add'>+				 struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	bool pairwise = key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE;</div><div class='add'>+	bool igtk = key-&gt;keyidx == 4 || key-&gt;keyidx == 5;</div><div class='add'>+	u32 flags = 0;</div><div class='add'>+</div><div class='add'>+	if (!pairwise)</div><div class='add'>+		flags |= IWL_SEC_KEY_FLAG_MCAST_KEY;</div><div class='add'>+</div><div class='add'>+	switch (key-&gt;cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		flags |= IWL_SEC_KEY_FLAG_CIPHER_TKIP;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_AES_CMAC:</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+		flags |= IWL_SEC_KEY_FLAG_CIPHER_CCMP;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_GMAC_256:</div><div class='add'>+		flags |= IWL_SEC_KEY_FLAG_KEY_SIZE;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_GMAC_128:</div><div class='add'>+		flags |= IWL_SEC_KEY_FLAG_CIPHER_GCMP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!sta &amp;&amp; vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+		sta = mld_vif-&gt;ap_sta;</div><div class='add'>+</div><div class='add'>+	/* If we are installing an iGTK (in AP or STA mode), we need to tell</div><div class='add'>+	 * the firmware this key will en/decrypt MGMT frames.</div><div class='add'>+	 * Same goes if we are installing a pairwise key for an MFP station.</div><div class='add'>+	 * In case we're installing a groupwise key (which is not an iGTK),</div><div class='add'>+	 * then, we will not use this key for MGMT frames.</div><div class='add'>+	 */</div><div class='add'>+	if ((sta &amp;&amp; sta-&gt;mfp &amp;&amp; pairwise) || igtk)</div><div class='add'>+		flags |= IWL_SEC_KEY_FLAG_MFP;</div><div class='add'>+</div><div class='add'>+	if (key-&gt;flags &amp; IEEE80211_KEY_FLAG_SPP_AMSDU)</div><div class='add'>+		flags |= IWL_SEC_KEY_FLAG_SPP_AMSDU;</div><div class='add'>+</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 iwl_mld_get_key_sta_mask(struct iwl_mld *mld,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct ieee80211_sta *sta,</div><div class='add'>+				    struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	int sta_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* AP group keys are per link and should be on the mcast/bcast STA */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+	    !(key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE)) {</div><div class='add'>+		struct iwl_mld_link *link = NULL;</div><div class='add'>+</div><div class='add'>+		if (key-&gt;link_id &gt;= 0)</div><div class='add'>+			link = iwl_mld_link_dereference_check(mld_vif,</div><div class='add'>+							      key-&gt;link_id);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!link))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		/* In this stage we should have both the bcast and mcast STAs */</div><div class='add'>+		if (WARN_ON(link-&gt;bcast_sta.sta_id == IWL_INVALID_STA ||</div><div class='add'>+			    link-&gt;mcast_sta.sta_id == IWL_INVALID_STA))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		/* IGTK/BIGTK to bcast STA */</div><div class='add'>+		if (key-&gt;keyidx &gt;= 4)</div><div class='add'>+			return BIT(link-&gt;bcast_sta.sta_id);</div><div class='add'>+</div><div class='add'>+		/* GTK for data to mcast STA */</div><div class='add'>+		return BIT(link-&gt;mcast_sta.sta_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* for client mode use the AP STA also for group keys */</div><div class='add'>+	if (!sta &amp;&amp; vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+		sta = mld_vif-&gt;ap_sta;</div><div class='add'>+</div><div class='add'>+	/* STA should be non-NULL now */</div><div class='add'>+	if (WARN_ON(!sta))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Key is not per-link, get the full sta mask */</div><div class='add'>+	if (key-&gt;link_id &lt; 0)</div><div class='add'>+		return iwl_mld_fw_sta_id_mask(mld, sta);</div><div class='add'>+</div><div class='add'>+	/* The link_sta shouldn't be NULL now, but this is checked in</div><div class='add'>+	 * iwl_mld_fw_sta_id_mask</div><div class='add'>+	 */</div><div class='add'>+	link_sta = link_sta_dereference_check(sta, key-&gt;link_id);</div><div class='add'>+</div><div class='add'>+	sta_id = iwl_mld_fw_sta_id_from_link_sta(mld, link_sta);</div><div class='add'>+	if (sta_id &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return BIT(sta_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_add_key_to_fw(struct iwl_mld *mld, u32 sta_mask,</div><div class='add'>+				 u32 key_flags, struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct iwl_sec_key_cmd cmd = {</div><div class='add'>+		.action = cpu_to_le32(FW_CTXT_ACTION_ADD),</div><div class='add'>+		.u.add.sta_mask = cpu_to_le32(sta_mask),</div><div class='add'>+		.u.add.key_id = cpu_to_le32(key-&gt;keyidx),</div><div class='add'>+		.u.add.key_flags = cpu_to_le32(key_flags),</div><div class='add'>+		.u.add.tx_seq = cpu_to_le64(atomic64_read(&amp;key-&gt;tx_pn)),</div><div class='add'>+	};</div><div class='add'>+	bool tkip = key-&gt;cipher == WLAN_CIPHER_SUITE_TKIP;</div><div class='add'>+	int max_key_len = sizeof(cmd.u.add.key);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	/* If there was a rekey in wowlan, FW already has the key */</div><div class='add'>+	if (mld-&gt;fw_status.resuming)</div><div class='add'>+		return 0;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!sta_mask))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(key-&gt;keylen &gt; max_key_len))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memcpy(cmd.u.add.key, key-&gt;key, key-&gt;keylen);</div><div class='add'>+</div><div class='add'>+	if (tkip) {</div><div class='add'>+		memcpy(cmd.u.add.tkip_mic_rx_key,</div><div class='add'>+		       key-&gt;key + NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY,</div><div class='add'>+		       8);</div><div class='add'>+		memcpy(cmd.u.add.tkip_mic_tx_key,</div><div class='add'>+		       key-&gt;key + NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY,</div><div class='add'>+		       8);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_cmd_pdu(mld, WIDE_ID(DATA_PATH_GROUP, SEC_KEY_CMD),</div><div class='add'>+				    &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_remove_key_from_fw(struct iwl_mld *mld, u32 sta_mask,</div><div class='add'>+				       u32 key_flags, u32 keyidx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_sec_key_cmd cmd = {</div><div class='add'>+		.action = cpu_to_le32(FW_CTXT_ACTION_REMOVE),</div><div class='add'>+		.u.remove.sta_mask = cpu_to_le32(sta_mask),</div><div class='add'>+		.u.remove.key_id = cpu_to_le32(keyidx),</div><div class='add'>+		.u.remove.key_flags = cpu_to_le32(key_flags),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	/* If there was a rekey in wowlan, FW already removed the key */</div><div class='add'>+	if (mld-&gt;fw_status.resuming)</div><div class='add'>+		return;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!sta_mask))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mld_send_cmd_pdu(mld, WIDE_ID(DATA_PATH_GROUP, SEC_KEY_CMD), &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_remove_key(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_sta *sta,</div><div class='add'>+			struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	u32 sta_mask = iwl_mld_get_key_sta_mask(mld, vif, sta, key);</div><div class='add'>+	u32 key_flags = iwl_mld_get_key_flags(mld, vif, sta, key);</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!sta_mask)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (key-&gt;keyidx == 4 || key-&gt;keyidx == 5) {</div><div class='add'>+		struct iwl_mld_link *mld_link;</div><div class='add'>+		unsigned int link_id = 0;</div><div class='add'>+</div><div class='add'>+		/* set to -1 for non-MLO right now */</div><div class='add'>+		if (key-&gt;link_id &gt;= 0)</div><div class='add'>+			link_id = key-&gt;link_id;</div><div class='add'>+</div><div class='add'>+		mld_link = iwl_mld_link_dereference_check(mld_vif, link_id);</div><div class='add'>+		if (WARN_ON(!mld_link))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		if (mld_link-&gt;igtk == key)</div><div class='add'>+			mld_link-&gt;igtk = NULL;</div><div class='add'>+</div><div class='add'>+		mld-&gt;num_igtks--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mld_remove_key_from_fw(mld, sta_mask, key_flags, key-&gt;keyidx);</div><div class='add'>+</div><div class='add'>+	/* no longer in HW */</div><div class='add'>+	key-&gt;hw_key_idx = STA_KEY_IDX_INVALID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_add_key(struct iwl_mld *mld,</div><div class='add'>+		    struct ieee80211_vif *vif,</div><div class='add'>+		    struct ieee80211_sta *sta,</div><div class='add'>+		    struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	u32 sta_mask = iwl_mld_get_key_sta_mask(mld, vif, sta, key);</div><div class='add'>+	u32 key_flags = iwl_mld_get_key_flags(mld, vif, sta, key);</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld_link *mld_link = NULL;</div><div class='add'>+	bool igtk = key-&gt;keyidx == 4 || key-&gt;keyidx == 5;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!sta_mask)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (igtk) {</div><div class='add'>+		if (mld-&gt;num_igtks == IWL_MAX_NUM_IGTKS)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		u8 link_id = 0;</div><div class='add'>+</div><div class='add'>+		/* set to -1 for non-MLO right now */</div><div class='add'>+		if (key-&gt;link_id &gt;= 0)</div><div class='add'>+			link_id = key-&gt;link_id;</div><div class='add'>+</div><div class='add'>+		mld_link = iwl_mld_link_dereference_check(mld_vif, link_id);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!mld_link))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (mld_link-&gt;igtk) {</div><div class='add'>+			IWL_DEBUG_MAC80211(mld, "remove old IGTK %d\n",</div><div class='add'>+					   mld_link-&gt;igtk-&gt;keyidx);</div><div class='add'>+			iwl_mld_remove_key(mld, vif, sta, mld_link-&gt;igtk);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		WARN_ON(mld_link-&gt;igtk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_add_key_to_fw(mld, sta_mask, key_flags, key);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (mld_link) {</div><div class='add'>+		mld_link-&gt;igtk = key;</div><div class='add'>+		mld-&gt;num_igtks++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We don't really need this, but need it to be not invalid,</div><div class='add'>+	 * so we will know if the key is in fw.</div><div class='add'>+	 */</div><div class='add'>+	key-&gt;hw_key_idx = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct remove_ap_keys_iter_data {</div><div class='add'>+	u8 link_id;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void iwl_mld_remove_ap_keys_iter(struct ieee80211_hw *hw,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					struct ieee80211_sta *sta,</div><div class='add'>+					struct ieee80211_key_conf *key,</div><div class='add'>+					void *_data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct remove_ap_keys_iter_data *data = _data;</div><div class='add'>+</div><div class='add'>+	if (key-&gt;hw_key_idx == STA_KEY_IDX_INVALID)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* All the pairwise keys should have been removed by now */</div><div class='add'>+	if (WARN_ON(sta))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (key-&gt;link_id &gt;= 0 &amp;&amp; key-&gt;link_id != data-&gt;link_id)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mld_remove_key(mld, vif, data-&gt;sta, key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_remove_ap_keys(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			    struct ieee80211_sta *sta, unsigned int link_id)</div><div class='add'>+{</div><div class='add'>+	struct remove_ap_keys_iter_data iter_data = {</div><div class='add'>+		.link_id = link_id,</div><div class='add'>+		.sta = sta,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(vif-&gt;type != NL80211_IFTYPE_STATION))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ieee80211_iter_keys(mld-&gt;hw, vif,</div><div class='add'>+			    iwl_mld_remove_ap_keys_iter,</div><div class='add'>+			    &amp;iter_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct iwl_mvm_sta_key_update_data {</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	u32 old_sta_mask;</div><div class='add'>+	u32 new_sta_mask;</div><div class='add'>+	int err;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void iwl_mld_update_sta_key_iter(struct ieee80211_hw *hw,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					struct ieee80211_sta *sta,</div><div class='add'>+					struct ieee80211_key_conf *key,</div><div class='add'>+					void *_data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_sta_key_update_data *data = _data;</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct iwl_sec_key_cmd cmd = {</div><div class='add'>+		.action = cpu_to_le32(FW_CTXT_ACTION_MODIFY),</div><div class='add'>+		.u.modify.old_sta_mask = cpu_to_le32(data-&gt;old_sta_mask),</div><div class='add'>+		.u.modify.new_sta_mask = cpu_to_le32(data-&gt;new_sta_mask),</div><div class='add'>+		.u.modify.key_id = cpu_to_le32(key-&gt;keyidx),</div><div class='add'>+		.u.modify.key_flags =</div><div class='add'>+			cpu_to_le32(iwl_mld_get_key_flags(mld, vif, sta, key)),</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* only need to do this for pairwise keys (link_id == -1) */</div><div class='add'>+	if (sta != data-&gt;sta || key-&gt;link_id &gt;= 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = iwl_mld_send_cmd_pdu(mld, WIDE_ID(DATA_PATH_GROUP, SEC_KEY_CMD),</div><div class='add'>+				   &amp;cmd);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		data-&gt;err = err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_update_sta_keys(struct iwl_mld *mld,</div><div class='add'>+			    struct ieee80211_vif *vif,</div><div class='add'>+			    struct ieee80211_sta *sta,</div><div class='add'>+			    u32 old_sta_mask,</div><div class='add'>+			    u32 new_sta_mask)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_sta_key_update_data data = {</div><div class='add'>+		.sta = sta,</div><div class='add'>+		.old_sta_mask = old_sta_mask,</div><div class='add'>+		.new_sta_mask = new_sta_mask,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ieee80211_iter_keys(mld-&gt;hw, vif, iwl_mld_update_sta_key_iter,</div><div class='add'>+			    &amp;data);</div><div class='add'>+	return data.err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_track_bigtk(struct iwl_mld *mld,</div><div class='add'>+			 struct ieee80211_vif *vif,</div><div class='add'>+			 struct ieee80211_key_conf *key, bool add)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld_link *link;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(key-&gt;keyidx &lt; 6 || key-&gt;keyidx &gt; 7))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(key-&gt;link_id &lt; 0))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	link = iwl_mld_link_dereference_check(mld_vif, key-&gt;link_id);</div><div class='add'>+	if (WARN_ON(!link))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (add)</div><div class='add'>+		rcu_assign_pointer(link-&gt;bigtks[key-&gt;keyidx - 6], key);</div><div class='add'>+	else</div><div class='add'>+		RCU_INIT_POINTER(link-&gt;bigtks[key-&gt;keyidx - 6], NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool iwl_mld_beacon_protection_enabled(struct iwl_mld *mld,</div><div class='add'>+				       struct ieee80211_bss_conf *link)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_link *mld_link = iwl_mld_link_from_mac80211(link);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mld_link))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return rcu_access_pointer(mld_link-&gt;bigtks[0]) ||</div><div class='add'>+		rcu_access_pointer(mld_link-&gt;bigtks[1]);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/key.h b/drivers/net/wireless/intel/iwlwifi/mld/key.h<br/>new file mode 100644<br/>index 000000000000..5a9efdaa3b03<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/key.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/key.h</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_key_h__</div><div class='add'>+#define __iwl_mld_key_h__</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+#include "fw/api/sta.h"</div><div class='add'>+</div><div class='add'>+void iwl_mld_remove_key(struct iwl_mld *mld,</div><div class='add'>+			struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_sta *sta,</div><div class='add'>+			struct ieee80211_key_conf *key);</div><div class='add'>+int iwl_mld_add_key(struct iwl_mld *mld,</div><div class='add'>+		    struct ieee80211_vif *vif,</div><div class='add'>+		    struct ieee80211_sta *sta,</div><div class='add'>+		    struct ieee80211_key_conf *key);</div><div class='add'>+void iwl_mld_remove_ap_keys(struct iwl_mld *mld,</div><div class='add'>+			    struct ieee80211_vif *vif,</div><div class='add'>+			    struct ieee80211_sta *sta,</div><div class='add'>+			    unsigned int link_id);</div><div class='add'>+</div><div class='add'>+int iwl_mld_update_sta_keys(struct iwl_mld *mld,</div><div class='add'>+			    struct ieee80211_vif *vif,</div><div class='add'>+			    struct ieee80211_sta *sta,</div><div class='add'>+			    u32 old_sta_mask,</div><div class='add'>+			    u32 new_sta_mask);</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+iwl_mld_cleanup_keys_iter(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			  struct ieee80211_sta *sta,</div><div class='add'>+			  struct ieee80211_key_conf *key, void *data)</div><div class='add'>+{</div><div class='add'>+	key-&gt;hw_key_idx = STA_KEY_IDX_INVALID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_track_bigtk(struct iwl_mld *mld,</div><div class='add'>+			 struct ieee80211_vif *vif,</div><div class='add'>+			 struct ieee80211_key_conf *key, bool add);</div><div class='add'>+</div><div class='add'>+bool iwl_mld_beacon_protection_enabled(struct iwl_mld *mld,</div><div class='add'>+				       struct ieee80211_bss_conf *link);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_key_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/led.c b/drivers/net/wireless/intel/iwlwifi/mld/led.c<br/>new file mode 100644<br/>index 000000000000..a37b32cbc6e6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/led.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/led.c</a></div><div class='hunk'>@@ -0,0 +1,100 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "fw/api/led.h"</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "led.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+</div><div class='add'>+static void iwl_mld_send_led_fw_cmd(struct iwl_mld *mld, bool on)</div><div class='add'>+{</div><div class='add'>+	struct iwl_led_cmd led_cmd = {</div><div class='add'>+		.status = cpu_to_le32(on),</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mld-&gt;fw_status.running))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = iwl_mld_send_cmd_with_flags_pdu(mld, WIDE_ID(LONG_GROUP,</div><div class='add'>+							   LEDS_CMD),</div><div class='add'>+					      CMD_ASYNC, &amp;led_cmd);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		IWL_WARN(mld, "LED command failed: %d\n", err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_led_brightness_set(struct led_classdev *led_cdev,</div><div class='add'>+				   enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = container_of(led_cdev, struct iwl_mld, led);</div><div class='add'>+</div><div class='add'>+	if (!mld-&gt;fw_status.running)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mld_send_led_fw_cmd(mld, brightness &gt; 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_leds_init(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	int mode = iwlwifi_mod_params.led_mode;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case IWL_LED_BLINK:</div><div class='add'>+		IWL_ERR(mld, "Blink led mode not supported, used default\n");</div><div class='add'>+		fallthrough;</div><div class='add'>+	case IWL_LED_DEFAULT:</div><div class='add'>+	case IWL_LED_RF_STATE:</div><div class='add'>+		mode = IWL_LED_RF_STATE;</div><div class='add'>+		break;</div><div class='add'>+	case IWL_LED_DISABLE:</div><div class='add'>+		IWL_INFO(mld, "Led disabled\n");</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mld-&gt;led.name = kasprintf(GFP_KERNEL, "%s-led",</div><div class='add'>+				  wiphy_name(mld-&gt;hw-&gt;wiphy));</div><div class='add'>+	if (!mld-&gt;led.name)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mld-&gt;led.brightness_set = iwl_led_brightness_set;</div><div class='add'>+	mld-&gt;led.max_brightness = 1;</div><div class='add'>+</div><div class='add'>+	if (mode == IWL_LED_RF_STATE)</div><div class='add'>+		mld-&gt;led.default_trigger =</div><div class='add'>+			ieee80211_get_radio_led_name(mld-&gt;hw);</div><div class='add'>+</div><div class='add'>+	ret = led_classdev_register(mld-&gt;trans-&gt;dev, &amp;mld-&gt;led);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(mld-&gt;led.name);</div><div class='add'>+		mld-&gt;led.name = NULL;</div><div class='add'>+		IWL_INFO(mld, "Failed to enable led\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_led_config_fw(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	if (!mld-&gt;led.name)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mld_send_led_fw_cmd(mld, mld-&gt;led.brightness &gt; 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_leds_exit(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	if (!mld-&gt;led.name)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	led_classdev_unregister(&amp;mld-&gt;led);</div><div class='add'>+	kfree(mld-&gt;led.name);</div><div class='add'>+	mld-&gt;led.name = NULL;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/led.h b/drivers/net/wireless/intel/iwlwifi/mld/led.h<br/>new file mode 100644<br/>index 000000000000..0954e214e73d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/led.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/led.h</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_led_h__</div><div class='add'>+#define __iwl_mld_led_h__</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLWIFI_LEDS</div><div class='add'>+int iwl_mld_leds_init(struct iwl_mld *mld);</div><div class='add'>+void iwl_mld_leds_exit(struct iwl_mld *mld);</div><div class='add'>+void iwl_mld_led_config_fw(struct iwl_mld *mld);</div><div class='add'>+#else</div><div class='add'>+static inline int iwl_mld_leds_init(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void iwl_mld_leds_exit(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void iwl_mld_led_config_fw(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_led_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/link.c b/drivers/net/wireless/intel/iwlwifi/mld/link.c<br/>new file mode 100644<br/>index 000000000000..d89840a1152b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/link.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/link.c</a></div><div class='hunk'>@@ -0,0 +1,909 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "constants.h"</div><div class='add'>+#include "link.h"</div><div class='add'>+#include "iface.h"</div><div class='add'>+#include "mlo.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+#include "phy.h"</div><div class='add'>+#include "fw/api/rs.h"</div><div class='add'>+#include "fw/api/txq.h"</div><div class='add'>+#include "fw/api/mac.h"</div><div class='add'>+</div><div class='add'>+#include "fw/api/context.h"</div><div class='add'>+#include "fw/dbg.h"</div><div class='add'>+</div><div class='add'>+static int iwl_mld_send_link_cmd(struct iwl_mld *mld,</div><div class='add'>+				 struct iwl_link_config_cmd *cmd,</div><div class='add'>+				 enum iwl_ctxt_action action)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;action = cpu_to_le32(action);</div><div class='add'>+	ret = iwl_mld_send_cmd_pdu(mld,</div><div class='add'>+				   WIDE_ID(MAC_CONF_GROUP, LINK_CONFIG_CMD),</div><div class='add'>+				   cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mld, "Failed to send LINK_CONFIG_CMD (action:%d): %d\n",</div><div class='add'>+			action, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_add_link_to_fw(struct iwl_mld *mld,</div><div class='add'>+				  struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = link_conf-&gt;vif;</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld_link *link = iwl_mld_link_from_mac80211(link_conf);</div><div class='add'>+	struct iwl_link_config_cmd cmd = {};</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!link))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cmd.link_id = cpu_to_le32(link-&gt;fw_id);</div><div class='add'>+	cmd.mac_id = cpu_to_le32(mld_vif-&gt;fw_id);</div><div class='add'>+	cmd.spec_link_id = link_conf-&gt;link_id;</div><div class='add'>+	cmd.phy_id = cpu_to_le32(FW_CTXT_ID_INVALID);</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(cmd.local_link_addr, link_conf-&gt;addr);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_ADHOC &amp;&amp; link_conf-&gt;bssid)</div><div class='add'>+		ether_addr_copy(cmd.ibss_bssid_addr, link_conf-&gt;bssid);</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_link_cmd(mld, &amp;cmd, FW_CTXT_ACTION_ADD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Get the basic rates of the used band and add the mandatory ones */</div><div class='add'>+static void iwl_mld_fill_rates(struct iwl_mld *mld,</div><div class='add'>+			       struct ieee80211_bss_conf *link,</div><div class='add'>+			       struct ieee80211_chanctx_conf *chan_ctx,</div><div class='add'>+			       __le32 *cck_rates, __le32 *ofdm_rates)</div><div class='add'>+{</div><div class='add'>+	struct cfg80211_chan_def *chandef =</div><div class='add'>+		iwl_mld_get_chandef_from_chanctx(mld, chan_ctx);</div><div class='add'>+	struct ieee80211_supported_band *sband =</div><div class='add'>+		mld-&gt;hw-&gt;wiphy-&gt;bands[chandef-&gt;chan-&gt;band];</div><div class='add'>+	unsigned long basic = link-&gt;basic_rates;</div><div class='add'>+	int lowest_present_ofdm = 100;</div><div class='add'>+	int lowest_present_cck = 100;</div><div class='add'>+	u32 cck = 0;</div><div class='add'>+	u32 ofdm = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(i, &amp;basic, BITS_PER_LONG) {</div><div class='add'>+		int hw = sband-&gt;bitrates[i].hw_value;</div><div class='add'>+</div><div class='add'>+		if (hw &gt;= IWL_FIRST_OFDM_RATE) {</div><div class='add'>+			ofdm |= BIT(hw - IWL_FIRST_OFDM_RATE);</div><div class='add'>+			if (lowest_present_ofdm &gt; hw)</div><div class='add'>+				lowest_present_ofdm = hw;</div><div class='add'>+		} else {</div><div class='add'>+			BUILD_BUG_ON(IWL_FIRST_CCK_RATE != 0);</div><div class='add'>+</div><div class='add'>+			cck |= BIT(hw);</div><div class='add'>+			if (lowest_present_cck &gt; hw)</div><div class='add'>+				lowest_present_cck = hw;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now we've got the basic rates as bitmaps in the ofdm and cck</div><div class='add'>+	 * variables. This isn't sufficient though, as there might not</div><div class='add'>+	 * be all the right rates in the bitmap. E.g. if the only basic</div><div class='add'>+	 * rates are 5.5 Mbps and 11 Mbps, we still need to add 1 Mbps</div><div class='add'>+	 * and 6 Mbps because the 802.11-2007 standard says in 9.6:</div><div class='add'>+	 *</div><div class='add'>+	 *    [...] a STA responding to a received frame shall transmit</div><div class='add'>+	 *    its Control Response frame [...] at the highest rate in the</div><div class='add'>+	 *    BSSBasicRateSet parameter that is less than or equal to the</div><div class='add'>+	 *    rate of the immediately previous frame in the frame exchange</div><div class='add'>+	 *    sequence ([...]) and that is of the same modulation class</div><div class='add'>+	 *    ([...]) as the received frame. If no rate contained in the</div><div class='add'>+	 *    BSSBasicRateSet parameter meets these conditions, then the</div><div class='add'>+	 *    control frame sent in response to a received frame shall be</div><div class='add'>+	 *    transmitted at the highest mandatory rate of the PHY that is</div><div class='add'>+	 *    less than or equal to the rate of the received frame, and</div><div class='add'>+	 *    that is of the same modulation class as the received frame.</div><div class='add'>+	 *</div><div class='add'>+	 * As a consequence, we need to add all mandatory rates that are</div><div class='add'>+	 * lower than all of the basic rates to these bitmaps.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (lowest_present_ofdm &gt; IWL_RATE_24M_INDEX)</div><div class='add'>+		ofdm |= IWL_RATE_BIT_MSK(24) &gt;&gt; IWL_FIRST_OFDM_RATE;</div><div class='add'>+	if (lowest_present_ofdm &gt; IWL_RATE_12M_INDEX)</div><div class='add'>+		ofdm |= IWL_RATE_BIT_MSK(12) &gt;&gt; IWL_FIRST_OFDM_RATE;</div><div class='add'>+	/* 6M already there or needed so always add */</div><div class='add'>+	ofdm |= IWL_RATE_BIT_MSK(6) &gt;&gt; IWL_FIRST_OFDM_RATE;</div><div class='add'>+</div><div class='add'>+	/* CCK is a bit more complex with DSSS vs. HR/DSSS vs. ERP.</div><div class='add'>+	 * Note, however:</div><div class='add'>+	 *  - if no CCK rates are basic, it must be ERP since there must</div><div class='add'>+	 *    be some basic rates at all, so they're OFDM =&gt; ERP PHY</div><div class='add'>+	 *    (or we're in 5 GHz, and the cck bitmap will never be used)</div><div class='add'>+	 *  - if 11M is a basic rate, it must be ERP as well, so add 5.5M</div><div class='add'>+	 *  - if 5.5M is basic, 1M and 2M are mandatory</div><div class='add'>+	 *  - if 2M is basic, 1M is mandatory</div><div class='add'>+	 *  - if 1M is basic, that's the only valid ACK rate.</div><div class='add'>+	 * As a consequence, it's not as complicated as it sounds, just add</div><div class='add'>+	 * any lower rates to the ACK rate bitmap.</div><div class='add'>+	 */</div><div class='add'>+	if (lowest_present_cck &gt; IWL_RATE_11M_INDEX)</div><div class='add'>+		cck |= IWL_RATE_BIT_MSK(11) &gt;&gt; IWL_FIRST_CCK_RATE;</div><div class='add'>+	if (lowest_present_cck &gt; IWL_RATE_5M_INDEX)</div><div class='add'>+		cck |= IWL_RATE_BIT_MSK(5) &gt;&gt; IWL_FIRST_CCK_RATE;</div><div class='add'>+	if (lowest_present_cck &gt; IWL_RATE_2M_INDEX)</div><div class='add'>+		cck |= IWL_RATE_BIT_MSK(2) &gt;&gt; IWL_FIRST_CCK_RATE;</div><div class='add'>+	/* 1M already there or needed so always add */</div><div class='add'>+	cck |= IWL_RATE_BIT_MSK(1) &gt;&gt; IWL_FIRST_CCK_RATE;</div><div class='add'>+</div><div class='add'>+	*cck_rates = cpu_to_le32((u32)cck);</div><div class='add'>+	*ofdm_rates = cpu_to_le32((u32)ofdm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_fill_protection_flags(struct iwl_mld *mld,</div><div class='add'>+					  struct ieee80211_bss_conf *link,</div><div class='add'>+					  __le32 *protection_flags)</div><div class='add'>+{</div><div class='add'>+	u8 protection_mode = link-&gt;ht_operation_mode &amp;</div><div class='add'>+				IEEE80211_HT_OP_MODE_PROTECTION;</div><div class='add'>+	u8 ht_flag = LINK_PROT_FLG_HT_PROT | LINK_PROT_FLG_FAT_PROT;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_RATE(mld, "HT protection mode: %d\n", protection_mode);</div><div class='add'>+</div><div class='add'>+	if (link-&gt;use_cts_prot)</div><div class='add'>+		*protection_flags |= cpu_to_le32(LINK_PROT_FLG_TGG_PROTECT);</div><div class='add'>+</div><div class='add'>+	/* See section 9.23.3.1 of IEEE 80211-2012.</div><div class='add'>+	 * Nongreenfield HT STAs Present is not supported.</div><div class='add'>+	 */</div><div class='add'>+	switch (protection_mode) {</div><div class='add'>+	case IEEE80211_HT_OP_MODE_PROTECTION_NONE:</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_HT_OP_MODE_PROTECTION_NONMEMBER:</div><div class='add'>+	case IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED:</div><div class='add'>+		*protection_flags |= cpu_to_le32(ht_flag);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_HT_OP_MODE_PROTECTION_20MHZ:</div><div class='add'>+		/* Protect when channel wider than 20MHz */</div><div class='add'>+		if (link-&gt;chanreq.oper.width &gt; NL80211_CHAN_WIDTH_20)</div><div class='add'>+			*protection_flags |= cpu_to_le32(ht_flag);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 iwl_mld_mac80211_ac_to_fw_ac(enum ieee80211_ac_numbers ac)</div><div class='add'>+{</div><div class='add'>+	static const u8 mac80211_ac_to_fw[] = {</div><div class='add'>+		AC_VO,</div><div class='add'>+		AC_VI,</div><div class='add'>+		AC_BE,</div><div class='add'>+		AC_BK</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mac80211_ac_to_fw[ac];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_fill_qos_params(struct ieee80211_bss_conf *link,</div><div class='add'>+				    struct iwl_ac_qos *ac, __le32 *qos_flags)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_link *mld_link = iwl_mld_link_from_mac80211(link);</div><div class='add'>+</div><div class='add'>+	/* no need to check mld_link since it is done in the caller */</div><div class='add'>+</div><div class='add'>+	for (int mac_ac = 0; mac_ac &lt; IEEE80211_NUM_ACS; mac_ac++) {</div><div class='add'>+		u8 txf = iwl_mld_mac80211_ac_to_fw_tx_fifo(mac_ac);</div><div class='add'>+		u8 fw_ac = iwl_mld_mac80211_ac_to_fw_ac(mac_ac);</div><div class='add'>+</div><div class='add'>+		ac[fw_ac].cw_min =</div><div class='add'>+			cpu_to_le16(mld_link-&gt;queue_params[mac_ac].cw_min);</div><div class='add'>+		ac[fw_ac].cw_max =</div><div class='add'>+			cpu_to_le16(mld_link-&gt;queue_params[mac_ac].cw_max);</div><div class='add'>+		ac[fw_ac].edca_txop =</div><div class='add'>+			cpu_to_le16(mld_link-&gt;queue_params[mac_ac].txop * 32);</div><div class='add'>+		ac[fw_ac].aifsn = mld_link-&gt;queue_params[mac_ac].aifs;</div><div class='add'>+		ac[fw_ac].fifos_mask = BIT(txf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link-&gt;qos)</div><div class='add'>+		*qos_flags |= cpu_to_le32(MAC_QOS_FLG_UPDATE_EDCA);</div><div class='add'>+</div><div class='add'>+	if (link-&gt;chanreq.oper.width != NL80211_CHAN_WIDTH_20_NOHT)</div><div class='add'>+		*qos_flags |= cpu_to_le32(MAC_QOS_FLG_TGN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_fill_mu_edca(struct iwl_mld *mld,</div><div class='add'>+				 const struct iwl_mld_link *mld_link,</div><div class='add'>+				 struct iwl_he_backoff_conf *trig_based_txf)</div><div class='add'>+{</div><div class='add'>+	for (int mac_ac = 0; mac_ac &lt; IEEE80211_NUM_ACS; mac_ac++) {</div><div class='add'>+		const struct ieee80211_he_mu_edca_param_ac_rec *mu_edca =</div><div class='add'>+			&amp;mld_link-&gt;queue_params[mac_ac].mu_edca_param_rec;</div><div class='add'>+		u8 fw_ac = iwl_mld_mac80211_ac_to_fw_ac(mac_ac);</div><div class='add'>+</div><div class='add'>+		if (!mld_link-&gt;queue_params[mac_ac].mu_edca)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		trig_based_txf[fw_ac].cwmin =</div><div class='add'>+			cpu_to_le16(mu_edca-&gt;ecw_min_max &amp; 0xf);</div><div class='add'>+		trig_based_txf[fw_ac].cwmax =</div><div class='add'>+			cpu_to_le16((mu_edca-&gt;ecw_min_max &amp; 0xf0) &gt;&gt; 4);</div><div class='add'>+		trig_based_txf[fw_ac].aifsn =</div><div class='add'>+			cpu_to_le16(mu_edca-&gt;aifsn &amp; 0xf);</div><div class='add'>+		trig_based_txf[fw_ac].mu_time =</div><div class='add'>+			cpu_to_le16(mu_edca-&gt;mu_edca_timer);</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+iwl_mld_change_link_in_fw(struct iwl_mld *mld, struct ieee80211_bss_conf *link,</div><div class='add'>+			  u32 changes)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_link *mld_link = iwl_mld_link_from_mac80211(link);</div><div class='add'>+	struct ieee80211_vif *vif = link-&gt;vif;</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct ieee80211_chanctx_conf *chan_ctx;</div><div class='add'>+	struct iwl_link_config_cmd cmd = {};</div><div class='add'>+	u32 flags = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mld_link))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cmd.link_id = cpu_to_le32(mld_link-&gt;fw_id);</div><div class='add'>+	cmd.spec_link_id = link-&gt;link_id;</div><div class='add'>+	cmd.mac_id = cpu_to_le32(mld_vif-&gt;fw_id);</div><div class='add'>+</div><div class='add'>+	chan_ctx = wiphy_dereference(mld-&gt;wiphy, mld_link-&gt;chan_ctx);</div><div class='add'>+</div><div class='add'>+	cmd.phy_id = cpu_to_le32(chan_ctx ?</div><div class='add'>+		iwl_mld_phy_from_mac80211(chan_ctx)-&gt;fw_id :</div><div class='add'>+		FW_CTXT_ID_INVALID);</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(cmd.local_link_addr, link-&gt;addr);</div><div class='add'>+</div><div class='add'>+	cmd.active = cpu_to_le32(mld_link-&gt;active);</div><div class='add'>+</div><div class='add'>+	if ((changes &amp; LINK_CONTEXT_MODIFY_ACTIVE) &amp;&amp; !mld_link-&gt;active &amp;&amp;</div><div class='add'>+	    mld_link-&gt;silent_deactivation) {</div><div class='add'>+		/* We are de-activating a link that is having CSA with</div><div class='add'>+		 * immediate quiet in EMLSR. Tell the firmware not to send any</div><div class='add'>+		 * frame.</div><div class='add'>+		 */</div><div class='add'>+		cmd.block_tx = 1;</div><div class='add'>+		mld_link-&gt;silent_deactivation = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_ADHOC &amp;&amp; link-&gt;bssid)</div><div class='add'>+		ether_addr_copy(cmd.ibss_bssid_addr, link-&gt;bssid);</div><div class='add'>+</div><div class='add'>+	/* Channel context is needed to get the rates */</div><div class='add'>+	if (chan_ctx)</div><div class='add'>+		iwl_mld_fill_rates(mld, link, chan_ctx, &amp;cmd.cck_rates,</div><div class='add'>+				   &amp;cmd.ofdm_rates);</div><div class='add'>+</div><div class='add'>+	cmd.cck_short_preamble = cpu_to_le32(link-&gt;use_short_preamble);</div><div class='add'>+	cmd.short_slot = cpu_to_le32(link-&gt;use_short_slot);</div><div class='add'>+</div><div class='add'>+	iwl_mld_fill_protection_flags(mld, link, &amp;cmd.protection_flags);</div><div class='add'>+</div><div class='add'>+	iwl_mld_fill_qos_params(link, cmd.ac, &amp;cmd.qos_flags);</div><div class='add'>+</div><div class='add'>+	cmd.bi = cpu_to_le32(link-&gt;beacon_int);</div><div class='add'>+	cmd.dtim_interval = cpu_to_le32(link-&gt;beacon_int * link-&gt;dtim_period);</div><div class='add'>+</div><div class='add'>+	/* Configure HE parameters only if HE is supported, and only after</div><div class='add'>+	 * the parameters are set in mac80211 (meaning after assoc)</div><div class='add'>+	 */</div><div class='add'>+	if (!link-&gt;he_support || iwlwifi_mod_params.disable_11ax ||</div><div class='add'>+	    (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; !vif-&gt;cfg.assoc)) {</div><div class='add'>+		changes &amp;= ~LINK_CONTEXT_MODIFY_HE_PARAMS;</div><div class='add'>+		goto send_cmd;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ap_sta may be NULL if we're disconnecting */</div><div class='add'>+	if (mld_vif-&gt;ap_sta) {</div><div class='add'>+		struct ieee80211_link_sta *link_sta =</div><div class='add'>+			link_sta_dereference_check(mld_vif-&gt;ap_sta,</div><div class='add'>+						   link-&gt;link_id);</div><div class='add'>+</div><div class='add'>+		if (!WARN_ON(!link_sta) &amp;&amp; link_sta-&gt;he_cap.has_he &amp;&amp;</div><div class='add'>+		    link_sta-&gt;he_cap.he_cap_elem.mac_cap_info[5] &amp;</div><div class='add'>+		    IEEE80211_HE_MAC_CAP5_OM_CTRL_UL_MU_DATA_DIS_RX)</div><div class='add'>+			cmd.ul_mu_data_disable = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd.htc_trig_based_pkt_ext = link-&gt;htc_trig_based_pkt_ext;</div><div class='add'>+</div><div class='add'>+	if (link-&gt;uora_exists) {</div><div class='add'>+		cmd.rand_alloc_ecwmin = link-&gt;uora_ocw_range &amp; 0x7;</div><div class='add'>+		cmd.rand_alloc_ecwmax = (link-&gt;uora_ocw_range &gt;&gt; 3) &amp; 0x7;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_fill_mu_edca(mld, mld_link, cmd.trig_based_txf))</div><div class='add'>+		flags |= LINK_FLG_MU_EDCA_CW;</div><div class='add'>+</div><div class='add'>+	cmd.bss_color = link-&gt;he_bss_color.color;</div><div class='add'>+</div><div class='add'>+	if (!link-&gt;he_bss_color.enabled)</div><div class='add'>+		flags |= LINK_FLG_BSS_COLOR_DIS;</div><div class='add'>+</div><div class='add'>+	cmd.frame_time_rts_th = cpu_to_le16(link-&gt;frame_time_rts_th);</div><div class='add'>+</div><div class='add'>+	/* Block 26-tone RU OFDMA transmissions */</div><div class='add'>+	if (mld_link-&gt;he_ru_2mhz_block)</div><div class='add'>+		flags |= LINK_FLG_RU_2MHZ_BLOCK;</div><div class='add'>+</div><div class='add'>+	if (link-&gt;nontransmitted) {</div><div class='add'>+		ether_addr_copy(cmd.ref_bssid_addr, link-&gt;transmitter_bssid);</div><div class='add'>+		cmd.bssid_index = link-&gt;bssid_index;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The only EHT parameter is puncturing, and starting from PHY cmd</div><div class='add'>+	 * version 6 - it is sent there. For older versions of the PHY cmd,</div><div class='add'>+	 * puncturing is not needed at all.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON(changes &amp; LINK_CONTEXT_MODIFY_EHT_PARAMS))</div><div class='add'>+		changes &amp;= ~LINK_CONTEXT_MODIFY_EHT_PARAMS;</div><div class='add'>+</div><div class='add'>+send_cmd:</div><div class='add'>+	cmd.modify_mask = cpu_to_le32(changes);</div><div class='add'>+	cmd.flags = cpu_to_le32(flags);</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_link_cmd(mld, &amp;cmd, FW_CTXT_ACTION_MODIFY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_activate_link(struct iwl_mld *mld,</div><div class='add'>+			  struct ieee80211_bss_conf *link)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_link *mld_link = iwl_mld_link_from_mac80211(link);</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(link-&gt;vif);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mld_link || mld_link-&gt;active))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mld_link-&gt;active = true;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_change_link_in_fw(mld, link,</div><div class='add'>+					LINK_CONTEXT_MODIFY_ACTIVE);</div><div class='add'>+	if (ret)</div><div class='add'>+		mld_link-&gt;active = false;</div><div class='add'>+	else</div><div class='add'>+		mld_vif-&gt;last_link_activation_time =</div><div class='add'>+			ktime_get_boottime_seconds();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_deactivate_link(struct iwl_mld *mld,</div><div class='add'>+			     struct ieee80211_bss_conf *link)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_link *mld_link = iwl_mld_link_from_mac80211(link);</div><div class='add'>+	struct iwl_probe_resp_data *probe_data;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mld_link || !mld_link-&gt;active))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mld_cancel_session_protection(mld, link-&gt;vif, link-&gt;link_id);</div><div class='add'>+</div><div class='add'>+	/* If we deactivate the link, we will probably remove it, or switch</div><div class='add'>+	 * channel. In both cases, the CSA or Notice of Absence information is</div><div class='add'>+	 * now irrelevant. Remove the data here.</div><div class='add'>+	 */</div><div class='add'>+	probe_data = wiphy_dereference(mld-&gt;wiphy, mld_link-&gt;probe_resp_data);</div><div class='add'>+	RCU_INIT_POINTER(mld_link-&gt;probe_resp_data, NULL);</div><div class='add'>+	if (probe_data)</div><div class='add'>+		kfree_rcu(probe_data, rcu_head);</div><div class='add'>+</div><div class='add'>+	mld_link-&gt;active = false;</div><div class='add'>+</div><div class='add'>+	iwl_mld_change_link_in_fw(mld, link, LINK_CONTEXT_MODIFY_ACTIVE);</div><div class='add'>+</div><div class='add'>+	/* Now that the link is not active in FW, we don't expect any new</div><div class='add'>+	 * notifications for it. Cancel the ones that are already pending</div><div class='add'>+	 */</div><div class='add'>+	iwl_mld_cancel_notifications_of_object(mld, IWL_MLD_OBJECT_TYPE_LINK,</div><div class='add'>+					       mld_link-&gt;fw_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_rm_link_from_fw(struct iwl_mld *mld, struct ieee80211_bss_conf *link)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_link *mld_link = iwl_mld_link_from_mac80211(link);</div><div class='add'>+	struct iwl_link_config_cmd cmd = {};</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mld_link))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cmd.link_id = cpu_to_le32(mld_link-&gt;fw_id);</div><div class='add'>+	cmd.spec_link_id = link-&gt;link_id;</div><div class='add'>+	cmd.phy_id = cpu_to_le32(FW_CTXT_ID_INVALID);</div><div class='add'>+</div><div class='add'>+	iwl_mld_send_link_cmd(mld, &amp;cmd, FW_CTXT_ACTION_REMOVE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+IWL_MLD_ALLOC_FN(link, bss_conf)</div><div class='add'>+</div><div class='add'>+/* Constructor function for struct iwl_mld_link */</div><div class='add'>+static int</div><div class='add'>+iwl_mld_init_link(struct iwl_mld *mld, struct ieee80211_bss_conf *link,</div><div class='add'>+		  struct iwl_mld_link *mld_link)</div><div class='add'>+{</div><div class='add'>+	mld_link-&gt;average_beacon_energy = 0;</div><div class='add'>+</div><div class='add'>+	iwl_mld_init_internal_sta(&amp;mld_link-&gt;bcast_sta);</div><div class='add'>+	iwl_mld_init_internal_sta(&amp;mld_link-&gt;mcast_sta);</div><div class='add'>+	iwl_mld_init_internal_sta(&amp;mld_link-&gt;mon_sta);</div><div class='add'>+</div><div class='add'>+	return iwl_mld_allocate_link_fw_id(mld, &amp;mld_link-&gt;fw_id, link);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Initializes the link structure, maps fw id to the ieee80211_bss_conf, and</div><div class='add'>+ * adds a link to the fw</div><div class='add'>+ */</div><div class='add'>+int iwl_mld_add_link(struct iwl_mld *mld,</div><div class='add'>+		     struct ieee80211_bss_conf *bss_conf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(bss_conf-&gt;vif);</div><div class='add'>+	struct iwl_mld_link *link = iwl_mld_link_from_mac80211(bss_conf);</div><div class='add'>+	bool is_deflink = bss_conf == &amp;bss_conf-&gt;vif-&gt;bss_conf;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!link) {</div><div class='add'>+		if (is_deflink) {</div><div class='add'>+			link = &amp;mld_vif-&gt;deflink;</div><div class='add'>+		} else {</div><div class='add'>+			link = kzalloc(sizeof(*link), GFP_KERNEL);</div><div class='add'>+			if (!link)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		WARN_ON(!mld-&gt;fw_status.in_hw_restart);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_init_link(mld, bss_conf, link);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free;</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(mld_vif-&gt;link[bss_conf-&gt;link_id], link);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_add_link_to_fw(mld, bss_conf);</div><div class='add'>+	if (ret) {</div><div class='add'>+		RCU_INIT_POINTER(mld-&gt;fw_id_to_bss_conf[link-&gt;fw_id], NULL);</div><div class='add'>+		RCU_INIT_POINTER(mld_vif-&gt;link[bss_conf-&gt;link_id], NULL);</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+free:</div><div class='add'>+	if (!is_deflink)</div><div class='add'>+		kfree(link);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Remove link from fw, unmap the bss_conf, and destroy the link structure */</div><div class='add'>+void iwl_mld_remove_link(struct iwl_mld *mld,</div><div class='add'>+			 struct ieee80211_bss_conf *bss_conf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(bss_conf-&gt;vif);</div><div class='add'>+	struct iwl_mld_link *link = iwl_mld_link_from_mac80211(bss_conf);</div><div class='add'>+	bool is_deflink = link == &amp;mld_vif-&gt;deflink;</div><div class='add'>+	u8 fw_id = link-&gt;fw_id;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!link || link-&gt;active))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mld_rm_link_from_fw(mld, bss_conf);</div><div class='add'>+	/* Continue cleanup on failure */</div><div class='add'>+</div><div class='add'>+	if (!is_deflink)</div><div class='add'>+		kfree_rcu(link, rcu_head);</div><div class='add'>+</div><div class='add'>+	RCU_INIT_POINTER(mld_vif-&gt;link[bss_conf-&gt;link_id], NULL);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(fw_id &gt;= mld-&gt;fw-&gt;ucode_capa.num_links))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	RCU_INIT_POINTER(mld-&gt;fw_id_to_bss_conf[fw_id], NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_missed_beacon_notif(struct iwl_mld *mld,</div><div class='add'>+					struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_missed_beacons_notif *notif = (const void *)pkt-&gt;data;</div><div class='add'>+	union iwl_dbg_tlv_tp_data tp_data = { .fw_pkt = pkt };</div><div class='add'>+	u32 fw_link_id = le32_to_cpu(notif-&gt;link_id);</div><div class='add'>+	u32 missed_bcon = le32_to_cpu(notif-&gt;consec_missed_beacons);</div><div class='add'>+	u32 missed_bcon_since_rx =</div><div class='add'>+		le32_to_cpu(notif-&gt;consec_missed_beacons_since_last_rx);</div><div class='add'>+	u32 scnd_lnk_bcn_lost =</div><div class='add'>+		le32_to_cpu(notif-&gt;consec_missed_beacons_other_link);</div><div class='add'>+	struct ieee80211_bss_conf *link_conf =</div><div class='add'>+		iwl_mld_fw_id_to_link_conf(mld, fw_link_id);</div><div class='add'>+	struct ieee80211_bss_conf *other_link;</div><div class='add'>+	u32 bss_param_ch_cnt_link_id, other_link_fw_id;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	u8 link_id;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!link_conf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vif = link_conf-&gt;vif;</div><div class='add'>+	link_id = link_conf-&gt;link_id;</div><div class='add'>+	bss_param_ch_cnt_link_id = link_conf-&gt;bss_param_ch_cnt_link_id;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(mld,</div><div class='add'>+		       "missed bcn link_id=%u, %u consecutive=%u\n",</div><div class='add'>+		       link_id, missed_bcon, missed_bcon_since_rx);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!vif))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_dbg_tlv_time_point(&amp;mld-&gt;fwrt,</div><div class='add'>+			       IWL_FW_INI_TIME_POINT_MISSED_BEACONS, &amp;tp_data);</div><div class='add'>+</div><div class='add'>+	if (missed_bcon &gt;= IWL_MLD_MISSED_BEACONS_THRESHOLD_LONG) {</div><div class='add'>+		if (missed_bcon_since_rx &gt;=</div><div class='add'>+		    IWL_MLD_MISSED_BEACONS_SINCE_RX_THOLD) {</div><div class='add'>+			ieee80211_connection_loss(vif);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		IWL_WARN(mld,</div><div class='add'>+			 "missed beacons exceeds threshold, but receiving data. Stay connected, Expect bugs.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (missed_bcon_since_rx &gt; IWL_MLD_MISSED_BEACONS_THRESHOLD) {</div><div class='add'>+		ieee80211_cqm_beacon_loss_notify(vif, GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+		/* Not in EMLSR and we can't hear the link.</div><div class='add'>+		 * Try to switch to a better link. EMLSR case is handled below.</div><div class='add'>+		 */</div><div class='add'>+		if (!iwl_mld_emlsr_active(vif)) {</div><div class='add'>+			IWL_DEBUG_EHT(mld,</div><div class='add'>+				      "missed beacons exceeds threshold. link_id=%u. Try to switch to a better link.\n",</div><div class='add'>+				      link_id);</div><div class='add'>+			iwl_mld_int_mlo_scan(mld, vif);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* no more logic if we're not in EMLSR */</div><div class='add'>+	if (hweight16(vif-&gt;active_links) &lt;= 1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* We are processing a notification before link activation */</div><div class='add'>+	if (le32_to_cpu(notif-&gt;other_link_id) == FW_CTXT_ID_INVALID)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	other_link_fw_id = le32_to_cpu(notif-&gt;other_link_id);</div><div class='add'>+	other_link = iwl_mld_fw_id_to_link_conf(mld, other_link_fw_id);</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, !other_link, "link doesn't exist for: %d\n",</div><div class='add'>+			 other_link_fw_id))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_EHT(mld,</div><div class='add'>+		      "missed bcn link_id=%u: %u consecutive=%u, other link_id=%u: %u\n",</div><div class='add'>+		      link_id, missed_bcon, missed_bcon_since_rx,</div><div class='add'>+		      other_link-&gt;link_id, scnd_lnk_bcn_lost);</div><div class='add'>+</div><div class='add'>+	/* Exit EMLSR if we lost more than</div><div class='add'>+	 * IWL_MLD_MISSED_BEACONS_EXIT_ESR_THRESH beacons on boths links</div><div class='add'>+	 * OR more than IWL_MLD_BCN_LOSS_EXIT_ESR_THRESH on current link.</div><div class='add'>+	 * OR more than IWL_MLD_BCN_LOSS_EXIT_ESR_THRESH_BSS_PARAM_CHANGED</div><div class='add'>+	 * on current link and the link's bss_param_ch_count has changed on</div><div class='add'>+	 * the other link's beacon.</div><div class='add'>+	 */</div><div class='add'>+	if ((missed_bcon &gt;= IWL_MLD_BCN_LOSS_EXIT_ESR_THRESH_2_LINKS &amp;&amp;</div><div class='add'>+	     scnd_lnk_bcn_lost &gt;= IWL_MLD_BCN_LOSS_EXIT_ESR_THRESH_2_LINKS) ||</div><div class='add'>+	    missed_bcon &gt;= IWL_MLD_BCN_LOSS_EXIT_ESR_THRESH ||</div><div class='add'>+	    (bss_param_ch_cnt_link_id != link_id &amp;&amp;</div><div class='add'>+	     missed_bcon &gt;=</div><div class='add'>+	     IWL_MLD_BCN_LOSS_EXIT_ESR_THRESH_BSS_PARAM_CHANGED)) {</div><div class='add'>+		iwl_mld_exit_emlsr(mld, vif, IWL_MLD_EMLSR_EXIT_MISSED_BEACON,</div><div class='add'>+				   iwl_mld_get_primary_link(vif));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_mld_handle_missed_beacon_notif);</div><div class='add'>+</div><div class='add'>+bool iwl_mld_cancel_missed_beacon_notif(struct iwl_mld *mld,</div><div class='add'>+					struct iwl_rx_packet *pkt,</div><div class='add'>+					u32 removed_link_id)</div><div class='add'>+{</div><div class='add'>+	struct iwl_missed_beacons_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (le32_to_cpu(notif-&gt;other_link_id) == removed_link_id) {</div><div class='add'>+		/* Second link is being removed. Don't cancel the notification,</div><div class='add'>+		 * but mark second link as invalid.</div><div class='add'>+		 */</div><div class='add'>+		notif-&gt;other_link_id = cpu_to_le32(FW_CTXT_ID_INVALID);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If the primary link is removed, cancel the notification */</div><div class='add'>+	return le32_to_cpu(notif-&gt;link_id) == removed_link_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_link_set_associated(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_bss_conf *link)</div><div class='add'>+{</div><div class='add'>+	return iwl_mld_change_link_in_fw(mld, link, LINK_CONTEXT_MODIFY_ALL &amp;</div><div class='add'>+					 ~(LINK_CONTEXT_MODIFY_ACTIVE |</div><div class='add'>+					   LINK_CONTEXT_MODIFY_EHT_PARAMS));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct iwl_mld_rssi_to_grade {</div><div class='add'>+	s8 rssi[2];</div><div class='add'>+	u16 grade;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RSSI_TO_GRADE_LINE(_lb, _hb_uhb, _grade) \</div><div class='add'>+	{ \</div><div class='add'>+		.rssi = {_lb, _hb_uhb}, \</div><div class='add'>+		.grade = _grade \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This array must be sorted by increasing RSSI for proper functionality.</div><div class='add'>+ * The grades are actually estimated throughput, represented as fixed-point</div><div class='add'>+ * with a scale factor of 1/10.</div><div class='add'>+ */</div><div class='add'>+static const struct iwl_mld_rssi_to_grade rssi_to_grade_map[] = {</div><div class='add'>+	RSSI_TO_GRADE_LINE(-85, -89, 172),</div><div class='add'>+	RSSI_TO_GRADE_LINE(-83, -86, 344),</div><div class='add'>+	RSSI_TO_GRADE_LINE(-82, -85, 516),</div><div class='add'>+	RSSI_TO_GRADE_LINE(-80, -83, 688),</div><div class='add'>+	RSSI_TO_GRADE_LINE(-77, -79, 1032),</div><div class='add'>+	RSSI_TO_GRADE_LINE(-73, -76, 1376),</div><div class='add'>+	RSSI_TO_GRADE_LINE(-70, -74, 1548),</div><div class='add'>+	RSSI_TO_GRADE_LINE(-69, -72, 1720),</div><div class='add'>+	RSSI_TO_GRADE_LINE(-65, -68, 2064),</div><div class='add'>+	RSSI_TO_GRADE_LINE(-61, -66, 2294),</div><div class='add'>+	RSSI_TO_GRADE_LINE(-58, -61, 2580),</div><div class='add'>+	RSSI_TO_GRADE_LINE(-55, -58, 2868),</div><div class='add'>+	RSSI_TO_GRADE_LINE(-46, -55, 3098),</div><div class='add'>+	RSSI_TO_GRADE_LINE(-43, -54, 3442)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MAX_GRADE (rssi_to_grade_map[ARRAY_SIZE(rssi_to_grade_map) - 1].grade)</div><div class='add'>+</div><div class='add'>+#define DEFAULT_CHAN_LOAD_2GHZ	30</div><div class='add'>+#define DEFAULT_CHAN_LOAD_5GHZ	15</div><div class='add'>+#define DEFAULT_CHAN_LOAD_6GHZ	0</div><div class='add'>+</div><div class='add'>+/* Factors calculation is done with fixed-point with a scaling factor of 1/256 */</div><div class='add'>+#define SCALE_FACTOR 256</div><div class='add'>+#define MAX_CHAN_LOAD 256</div><div class='add'>+</div><div class='add'>+static unsigned int</div><div class='add'>+iwl_mld_get_n_subchannels(const struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	enum nl80211_chan_width chan_width =</div><div class='add'>+		link_conf-&gt;chanreq.oper.width;</div><div class='add'>+	int mhz = nl80211_chan_width_to_mhz(chan_width);</div><div class='add'>+	unsigned int n_subchannels;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(mhz &lt; 20 || mhz &gt; 320,</div><div class='add'>+		      "Invalid channel width : (%d)\n", mhz))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* total number of subchannels */</div><div class='add'>+	n_subchannels = mhz / 20;</div><div class='add'>+</div><div class='add'>+	/* No puncturing if less than 80 MHz */</div><div class='add'>+	if (mhz &gt;= 80)</div><div class='add'>+		n_subchannels -= hweight16(link_conf-&gt;chanreq.oper.punctured);</div><div class='add'>+</div><div class='add'>+	return n_subchannels;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_get_chan_load_from_element(struct iwl_mld *mld,</div><div class='add'>+				   struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	const struct cfg80211_bss_ies *ies;</div><div class='add'>+	const struct element *bss_load_elem = NULL;</div><div class='add'>+	const struct ieee80211_bss_load_elem *bss_load;</div><div class='add'>+</div><div class='add'>+	guard(rcu)();</div><div class='add'>+</div><div class='add'>+	ies = rcu_dereference(link_conf-&gt;bss-&gt;beacon_ies);</div><div class='add'>+	if (ies)</div><div class='add'>+		bss_load_elem = cfg80211_find_elem(WLAN_EID_QBSS_LOAD,</div><div class='add'>+						   ies-&gt;data, ies-&gt;len);</div><div class='add'>+</div><div class='add'>+	if (!bss_load_elem ||</div><div class='add'>+	    bss_load_elem-&gt;datalen != sizeof(*bss_load))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	bss_load = (const void *)bss_load_elem-&gt;data;</div><div class='add'>+</div><div class='add'>+	return bss_load-&gt;channel_util;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int</div><div class='add'>+iwl_mld_get_chan_load_by_us(struct iwl_mld *mld,</div><div class='add'>+			    struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			    bool expect_active_link)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_link *mld_link = iwl_mld_link_from_mac80211(link_conf);</div><div class='add'>+	struct ieee80211_chanctx_conf *chan_ctx;</div><div class='add'>+	struct iwl_mld_phy *phy;</div><div class='add'>+</div><div class='add'>+	if (!mld_link || !mld_link-&gt;active) {</div><div class='add'>+		WARN_ON(expect_active_link);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(!rcu_access_pointer(mld_link-&gt;chan_ctx),</div><div class='add'>+		      "Active link (%u) without channel ctxt assigned!\n",</div><div class='add'>+		      link_conf-&gt;link_id))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	chan_ctx = wiphy_dereference(mld-&gt;wiphy, mld_link-&gt;chan_ctx);</div><div class='add'>+	phy = iwl_mld_phy_from_mac80211(chan_ctx);</div><div class='add'>+</div><div class='add'>+	return phy-&gt;channel_load_by_us;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Returns error if the channel utilization element is invalid/unavailable */</div><div class='add'>+int iwl_mld_get_chan_load_by_others(struct iwl_mld *mld,</div><div class='add'>+				    struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				    bool expect_active_link)</div><div class='add'>+{</div><div class='add'>+	int chan_load;</div><div class='add'>+	unsigned int chan_load_by_us;</div><div class='add'>+</div><div class='add'>+	/* get overall load */</div><div class='add'>+	chan_load = iwl_mld_get_chan_load_from_element(mld, link_conf);</div><div class='add'>+	if (chan_load &lt; 0)</div><div class='add'>+		return chan_load;</div><div class='add'>+</div><div class='add'>+	chan_load_by_us = iwl_mld_get_chan_load_by_us(mld, link_conf,</div><div class='add'>+						      expect_active_link);</div><div class='add'>+</div><div class='add'>+	/* channel load by us is given in percentage */</div><div class='add'>+	chan_load_by_us =</div><div class='add'>+		NORMALIZE_PERCENT_TO_255(chan_load_by_us);</div><div class='add'>+</div><div class='add'>+	/* Use only values that firmware sends that can possibly be valid */</div><div class='add'>+	if (chan_load_by_us &lt;= chan_load)</div><div class='add'>+		chan_load -= chan_load_by_us;</div><div class='add'>+</div><div class='add'>+	return chan_load;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int</div><div class='add'>+iwl_mld_get_default_chan_load(struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	enum nl80211_band band = link_conf-&gt;chanreq.oper.chan-&gt;band;</div><div class='add'>+</div><div class='add'>+	switch (band) {</div><div class='add'>+	case NL80211_BAND_2GHZ:</div><div class='add'>+		return DEFAULT_CHAN_LOAD_2GHZ;</div><div class='add'>+	case NL80211_BAND_5GHZ:</div><div class='add'>+		return DEFAULT_CHAN_LOAD_5GHZ;</div><div class='add'>+	case NL80211_BAND_6GHZ:</div><div class='add'>+		return DEFAULT_CHAN_LOAD_6GHZ;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int iwl_mld_get_chan_load(struct iwl_mld *mld,</div><div class='add'>+				   struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	int chan_load;</div><div class='add'>+</div><div class='add'>+	chan_load = iwl_mld_get_chan_load_by_others(mld, link_conf, false);</div><div class='add'>+	if (chan_load &gt;= 0)</div><div class='add'>+		return chan_load;</div><div class='add'>+</div><div class='add'>+	/* No information from the element, take the defaults */</div><div class='add'>+	chan_load = iwl_mld_get_default_chan_load(link_conf);</div><div class='add'>+</div><div class='add'>+	/* The defaults are given in percentage */</div><div class='add'>+	return NORMALIZE_PERCENT_TO_255(chan_load);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int</div><div class='add'>+iwl_mld_get_avail_chan_load(struct iwl_mld *mld,</div><div class='add'>+			    struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	return MAX_CHAN_LOAD - iwl_mld_get_chan_load(mld, link_conf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function calculates the grade of a link. Returns 0 in error case */</div><div class='add'>+unsigned int iwl_mld_get_link_grade(struct iwl_mld *mld,</div><div class='add'>+				    struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	int rssi_idx;</div><div class='add'>+	s32 link_rssi;</div><div class='add'>+	unsigned int grade = MAX_GRADE;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!link_conf))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	band = link_conf-&gt;chanreq.oper.chan-&gt;band;</div><div class='add'>+	if (WARN_ONCE(band != NL80211_BAND_2GHZ &amp;&amp;</div><div class='add'>+		      band != NL80211_BAND_5GHZ &amp;&amp;</div><div class='add'>+		      band != NL80211_BAND_6GHZ,</div><div class='add'>+		      "Invalid band (%u)\n", band))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	link_rssi = MBM_TO_DBM(link_conf-&gt;bss-&gt;signal);</div><div class='add'>+	/*</div><div class='add'>+	 * For 6 GHz the RSSI of the beacons is lower than</div><div class='add'>+	 * the RSSI of the data.</div><div class='add'>+	 */</div><div class='add'>+	if (band == NL80211_BAND_6GHZ &amp;&amp; link_rssi)</div><div class='add'>+		link_rssi += 4;</div><div class='add'>+</div><div class='add'>+	rssi_idx = band == NL80211_BAND_2GHZ ? 0 : 1;</div><div class='add'>+</div><div class='add'>+	/* No valid RSSI - take the lowest grade */</div><div class='add'>+	if (!link_rssi)</div><div class='add'>+		link_rssi = rssi_to_grade_map[0].rssi[rssi_idx];</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_EHT(mld,</div><div class='add'>+		      "Calculating grade of link %d: band = %d, bandwidth = %d, punctured subchannels =0x%x RSSI = %d\n",</div><div class='add'>+		      link_conf-&gt;link_id, band,</div><div class='add'>+		      link_conf-&gt;chanreq.oper.width,</div><div class='add'>+		      link_conf-&gt;chanreq.oper.punctured, link_rssi);</div><div class='add'>+</div><div class='add'>+	/* Get grade based on RSSI */</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(rssi_to_grade_map); i++) {</div><div class='add'>+		const struct iwl_mld_rssi_to_grade *line =</div><div class='add'>+			&amp;rssi_to_grade_map[i];</div><div class='add'>+</div><div class='add'>+		if (link_rssi &gt; line-&gt;rssi[rssi_idx])</div><div class='add'>+			continue;</div><div class='add'>+		grade = line-&gt;grade;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Apply the channel load and puncturing factors */</div><div class='add'>+	grade = grade * iwl_mld_get_avail_chan_load(mld, link_conf) / SCALE_FACTOR;</div><div class='add'>+	grade = grade * iwl_mld_get_n_subchannels(link_conf);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_EHT(mld, "Link %d's grade: %d\n", link_conf-&gt;link_id, grade);</div><div class='add'>+</div><div class='add'>+	return grade;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_mld_get_link_grade);</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_beacon_filter_notif(struct iwl_mld *mld,</div><div class='add'>+					struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_beacon_filter_notif *notif = (const void *)pkt-&gt;data;</div><div class='add'>+	u32 link_id = le32_to_cpu(notif-&gt;link_id);</div><div class='add'>+	struct ieee80211_bss_conf *link_conf =</div><div class='add'>+		iwl_mld_fw_id_to_link_conf(mld, link_id);</div><div class='add'>+	struct iwl_mld_link *mld_link;</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, !link_conf, "invalid link ID %d\n", link_id))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mld_link = iwl_mld_link_from_mac80211(link_conf);</div><div class='add'>+	if (WARN_ON_ONCE(!mld_link))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mld_link-&gt;average_beacon_energy = le32_to_cpu(notif-&gt;average_energy);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/link.h b/drivers/net/wireless/intel/iwlwifi/mld/link.h<br/>new file mode 100644<br/>index 000000000000..9e4da8e4de93<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/link.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/link.h</a></div><div class='hunk'>@@ -0,0 +1,131 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_link_h__</div><div class='add'>+#define __iwl_mld_link_h__</div><div class='add'>+</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "sta.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_probe_resp_data - data for NoA/CSA updates</div><div class='add'>+ * @rcu_head: used for freeing the data on update</div><div class='add'>+ * @notif: notification data</div><div class='add'>+ * @noa_len: length of NoA attribute, calculated from the notification</div><div class='add'>+ */</div><div class='add'>+struct iwl_probe_resp_data {</div><div class='add'>+	struct rcu_head rcu_head;</div><div class='add'>+	struct iwl_probe_resp_data_notif notif;</div><div class='add'>+	int noa_len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_link - link configuration parameters</div><div class='add'>+ *</div><div class='add'>+ * @rcu_head: RCU head for freeing this data.</div><div class='add'>+ * @fw_id: the fw id of the link.</div><div class='add'>+ * @active: if the link is active or not.</div><div class='add'>+ * @queue_params: QoS data from mac80211. This is updated with a call to</div><div class='add'>+ *	drv_conf_tx per each AC, and then notified once with BSS_CHANGED_QOS.</div><div class='add'>+ *	So we store it here and then send one link cmd for all the ACs.</div><div class='add'>+ * @chan_ctx: pointer to the channel context assigned to the link. If a link</div><div class='add'>+ *	has an assigned channel context it means that it is active.</div><div class='add'>+ * @he_ru_2mhz_block: 26-tone RU OFDMA transmissions should be blocked.</div><div class='add'>+ * @igtk: fw can only have one IGTK at a time, whereas mac80211 can have two.</div><div class='add'>+ *	This tracks the one IGTK that currently exists in FW.</div><div class='add'>+ * @bigtks: BIGTKs of the AP. Only valid for STA mode.</div><div class='add'>+ * @bcast_sta: station used for broadcast packets. Used in AP, GO and IBSS.</div><div class='add'>+ * @mcast_sta: station used for multicast packets. Used in AP, GO and IBSS.</div><div class='add'>+ * @mon_sta: station used for TX injection in monitor interface.</div><div class='add'>+ * @average_beacon_energy: average beacon energy for beacons received during</div><div class='add'>+ *	client connections</div><div class='add'>+ * @ap_early_keys: The firmware cannot install keys before bcast/mcast STAs,</div><div class='add'>+ *	but higher layers work differently, so we store the keys here for</div><div class='add'>+ *	later installation.</div><div class='add'>+ * @silent_deactivation: next deactivation needs to be silent.</div><div class='add'>+ * @probe_resp_data: data from FW notification to store NOA related data to be</div><div class='add'>+ *	inserted into probe response.</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_link {</div><div class='add'>+	struct rcu_head rcu_head;</div><div class='add'>+</div><div class='add'>+	/* Add here fields that need clean up on restart */</div><div class='add'>+	struct_group(zeroed_on_hw_restart,</div><div class='add'>+		u8 fw_id;</div><div class='add'>+		bool active;</div><div class='add'>+		struct ieee80211_tx_queue_params queue_params[IEEE80211_NUM_ACS];</div><div class='add'>+		struct ieee80211_chanctx_conf __rcu *chan_ctx;</div><div class='add'>+		bool he_ru_2mhz_block;</div><div class='add'>+		struct ieee80211_key_conf *igtk;</div><div class='add'>+		struct ieee80211_key_conf __rcu *bigtks[2];</div><div class='add'>+	);</div><div class='add'>+	/* And here fields that survive a fw restart */</div><div class='add'>+	struct iwl_mld_int_sta bcast_sta;</div><div class='add'>+	struct iwl_mld_int_sta mcast_sta;</div><div class='add'>+	struct iwl_mld_int_sta mon_sta;</div><div class='add'>+</div><div class='add'>+	/* we can only have 2 GTK + 2 IGTK + 2 BIGTK active at a time */</div><div class='add'>+	struct ieee80211_key_conf *ap_early_keys[6];</div><div class='add'>+	u32 average_beacon_energy;</div><div class='add'>+	bool silent_deactivation;</div><div class='add'>+	struct iwl_probe_resp_data __rcu *probe_resp_data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Cleanup function for struct iwl_mld_link, will be called in restart */</div><div class='add'>+static inline void</div><div class='add'>+iwl_mld_cleanup_link(struct iwl_mld *mld, struct iwl_mld_link *link)</div><div class='add'>+{</div><div class='add'>+	struct iwl_probe_resp_data *probe_data;</div><div class='add'>+</div><div class='add'>+	probe_data = wiphy_dereference(mld-&gt;wiphy, link-&gt;probe_resp_data);</div><div class='add'>+	RCU_INIT_POINTER(link-&gt;probe_resp_data, NULL);</div><div class='add'>+	if (probe_data)</div><div class='add'>+		kfree_rcu(probe_data, rcu_head);</div><div class='add'>+</div><div class='add'>+	CLEANUP_STRUCT(link);</div><div class='add'>+	if (link-&gt;bcast_sta.sta_id != IWL_INVALID_STA)</div><div class='add'>+		iwl_mld_free_internal_sta(mld, &amp;link-&gt;bcast_sta);</div><div class='add'>+	if (link-&gt;mcast_sta.sta_id != IWL_INVALID_STA)</div><div class='add'>+		iwl_mld_free_internal_sta(mld, &amp;link-&gt;mcast_sta);</div><div class='add'>+	if (link-&gt;mon_sta.sta_id != IWL_INVALID_STA)</div><div class='add'>+		iwl_mld_free_internal_sta(mld, &amp;link-&gt;mon_sta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Convert a percentage from [0,100] to [0,255] */</div><div class='add'>+#define NORMALIZE_PERCENT_TO_255(percentage) ((percentage) * 256 / 100)</div><div class='add'>+</div><div class='add'>+int iwl_mld_add_link(struct iwl_mld *mld,</div><div class='add'>+		     struct ieee80211_bss_conf *bss_conf);</div><div class='add'>+void iwl_mld_remove_link(struct iwl_mld *mld,</div><div class='add'>+			 struct ieee80211_bss_conf *bss_conf);</div><div class='add'>+int iwl_mld_activate_link(struct iwl_mld *mld,</div><div class='add'>+			  struct ieee80211_bss_conf *link);</div><div class='add'>+void iwl_mld_deactivate_link(struct iwl_mld *mld,</div><div class='add'>+			     struct ieee80211_bss_conf *link);</div><div class='add'>+int iwl_mld_change_link_in_fw(struct iwl_mld *mld,</div><div class='add'>+			      struct ieee80211_bss_conf *link, u32 changes);</div><div class='add'>+void iwl_mld_handle_missed_beacon_notif(struct iwl_mld *mld,</div><div class='add'>+					struct iwl_rx_packet *pkt);</div><div class='add'>+bool iwl_mld_cancel_missed_beacon_notif(struct iwl_mld *mld,</div><div class='add'>+					struct iwl_rx_packet *pkt,</div><div class='add'>+					u32 removed_link_id);</div><div class='add'>+int iwl_mld_link_set_associated(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_bss_conf *link);</div><div class='add'>+</div><div class='add'>+unsigned int iwl_mld_get_link_grade(struct iwl_mld *mld,</div><div class='add'>+				    struct ieee80211_bss_conf *link_conf);</div><div class='add'>+</div><div class='add'>+unsigned int iwl_mld_get_chan_load(struct iwl_mld *mld,</div><div class='add'>+				   struct ieee80211_bss_conf *link_conf);</div><div class='add'>+</div><div class='add'>+int iwl_mld_get_chan_load_by_others(struct iwl_mld *mld,</div><div class='add'>+				    struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				    bool expect_active_link);</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_beacon_filter_notif(struct iwl_mld *mld,</div><div class='add'>+					struct iwl_rx_packet *pkt);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_link_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/low_latency.c b/drivers/net/wireless/intel/iwlwifi/mld/low_latency.c<br/>new file mode 100644<br/>index 000000000000..23362867b400<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/low_latency.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/low_latency.c</a></div><div class='hunk'>@@ -0,0 +1,336 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "iface.h"</div><div class='add'>+#include "low_latency.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+#include "power.h"</div><div class='add'>+#include "mlo.h"</div><div class='add'>+</div><div class='add'>+#define MLD_LL_WK_INTERVAL_MSEC 500</div><div class='add'>+#define MLD_LL_PERIOD (HZ * MLD_LL_WK_INTERVAL_MSEC / 1000)</div><div class='add'>+#define MLD_LL_ACTIVE_WK_PERIOD (HZ * 10)</div><div class='add'>+</div><div class='add'>+/* packets/MLD_LL_WK_PERIOD seconds */</div><div class='add'>+#define MLD_LL_ENABLE_THRESH 100</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_calc_low_latency(struct iwl_mld *mld,</div><div class='add'>+				     unsigned long timestamp)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_low_latency *ll = &amp;mld-&gt;low_latency;</div><div class='add'>+	bool global_low_latency = false;</div><div class='add'>+	u8 num_rx_q = mld-&gt;trans-&gt;info.num_rxqs;</div><div class='add'>+</div><div class='add'>+	for (int mac_id = 0; mac_id &lt; NUM_MAC_INDEX_DRIVER; mac_id++) {</div><div class='add'>+		u32 total_vo_vi_pkts = 0;</div><div class='add'>+		bool ll_period_expired;</div><div class='add'>+</div><div class='add'>+		/* If it's not initialized yet, it means we have not yet</div><div class='add'>+		 * received/transmitted any vo/vi packet on this MAC.</div><div class='add'>+		 */</div><div class='add'>+		if (!ll-&gt;window_start[mac_id])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ll_period_expired =</div><div class='add'>+			time_after(timestamp, ll-&gt;window_start[mac_id] +</div><div class='add'>+				   MLD_LL_ACTIVE_WK_PERIOD);</div><div class='add'>+</div><div class='add'>+		if (ll_period_expired)</div><div class='add'>+			ll-&gt;window_start[mac_id] = timestamp;</div><div class='add'>+</div><div class='add'>+		for (int q = 0; q &lt; num_rx_q; q++) {</div><div class='add'>+			struct iwl_mld_low_latency_packets_counters *counters =</div><div class='add'>+				&amp;mld-&gt;low_latency.pkts_counters[q];</div><div class='add'>+</div><div class='add'>+			spin_lock_bh(&amp;counters-&gt;lock);</div><div class='add'>+</div><div class='add'>+			total_vo_vi_pkts += counters-&gt;vo_vi[mac_id];</div><div class='add'>+</div><div class='add'>+			if (ll_period_expired)</div><div class='add'>+				counters-&gt;vo_vi[mac_id] = 0;</div><div class='add'>+</div><div class='add'>+			spin_unlock_bh(&amp;counters-&gt;lock);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* enable immediately with enough packets but defer</div><div class='add'>+		 * disabling only if the low-latency period expired and</div><div class='add'>+		 * below threshold.</div><div class='add'>+		 */</div><div class='add'>+		if (total_vo_vi_pkts &gt; MLD_LL_ENABLE_THRESH)</div><div class='add'>+			mld-&gt;low_latency.result[mac_id] = true;</div><div class='add'>+		else if (ll_period_expired)</div><div class='add'>+			mld-&gt;low_latency.result[mac_id] = false;</div><div class='add'>+</div><div class='add'>+		global_low_latency |= mld-&gt;low_latency.result[mac_id];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return global_low_latency;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_low_latency_iter(void *_data, u8 *mac,</div><div class='add'>+				     struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = _data;</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	bool prev = mld_vif-&gt;low_latency_causes &amp; LOW_LATENCY_TRAFFIC;</div><div class='add'>+	bool low_latency;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(mld_vif-&gt;fw_id &gt;= ARRAY_SIZE(mld-&gt;low_latency.result)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	low_latency = mld-&gt;low_latency.result[mld_vif-&gt;fw_id];</div><div class='add'>+</div><div class='add'>+	if (prev != low_latency)</div><div class='add'>+		iwl_mld_vif_update_low_latency(mld, vif, low_latency,</div><div class='add'>+					       LOW_LATENCY_TRAFFIC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_low_latency_wk(struct wiphy *wiphy, struct wiphy_work *wk)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = container_of(wk, struct iwl_mld,</div><div class='add'>+					   low_latency.work.work);</div><div class='add'>+	unsigned long timestamp = jiffies;</div><div class='add'>+	bool low_latency_active;</div><div class='add'>+</div><div class='add'>+	if (mld-&gt;fw_status.in_hw_restart)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* It is assumed that the work was scheduled only after checking</div><div class='add'>+	 * at least MLD_LL_PERIOD has passed since the last update.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	low_latency_active = iwl_mld_calc_low_latency(mld, timestamp);</div><div class='add'>+</div><div class='add'>+	/* Update the timestamp now after the low-latency calculation */</div><div class='add'>+	mld-&gt;low_latency.timestamp = timestamp;</div><div class='add'>+</div><div class='add'>+	/* If low-latency is active we need to force re-evaluation after</div><div class='add'>+	 * 10 seconds, so that we can disable low-latency when</div><div class='add'>+	 * the low-latency traffic ends.</div><div class='add'>+	 *</div><div class='add'>+	 * Otherwise, we don't need to run the work because there is nothing to</div><div class='add'>+	 * disable.</div><div class='add'>+	 *</div><div class='add'>+	 * Note that this has no impact on the regular scheduling of the</div><div class='add'>+	 * updates triggered by traffic - those happen whenever the</div><div class='add'>+	 * MLD_LL_PERIOD timeout expire.</div><div class='add'>+	 */</div><div class='add'>+	if (low_latency_active)</div><div class='add'>+		wiphy_delayed_work_queue(mld-&gt;wiphy, &amp;mld-&gt;low_latency.work,</div><div class='add'>+					 MLD_LL_ACTIVE_WK_PERIOD);</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_mtx(mld-&gt;hw,</div><div class='add'>+						IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						iwl_mld_low_latency_iter, mld);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_low_latency_init(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_low_latency *ll = &amp;mld-&gt;low_latency;</div><div class='add'>+	unsigned long ts = jiffies;</div><div class='add'>+</div><div class='add'>+	ll-&gt;pkts_counters = kcalloc(mld-&gt;trans-&gt;info.num_rxqs,</div><div class='add'>+				    sizeof(*ll-&gt;pkts_counters), GFP_KERNEL);</div><div class='add'>+	if (!ll-&gt;pkts_counters)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (int q = 0; q &lt; mld-&gt;trans-&gt;info.num_rxqs; q++)</div><div class='add'>+		spin_lock_init(&amp;ll-&gt;pkts_counters[q].lock);</div><div class='add'>+</div><div class='add'>+	wiphy_delayed_work_init(&amp;ll-&gt;work, iwl_mld_low_latency_wk);</div><div class='add'>+</div><div class='add'>+	ll-&gt;timestamp = ts;</div><div class='add'>+</div><div class='add'>+	/* The low-latency window_start will be initialized per-MAC on</div><div class='add'>+	 * the first vo/vi packet received/transmitted.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_low_latency_free(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_low_latency *ll = &amp;mld-&gt;low_latency;</div><div class='add'>+</div><div class='add'>+	kfree(ll-&gt;pkts_counters);</div><div class='add'>+	ll-&gt;pkts_counters = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_low_latency_restart_cleanup(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_low_latency *ll = &amp;mld-&gt;low_latency;</div><div class='add'>+</div><div class='add'>+	ll-&gt;timestamp = jiffies;</div><div class='add'>+</div><div class='add'>+	memset(ll-&gt;window_start, 0, sizeof(ll-&gt;window_start));</div><div class='add'>+	memset(ll-&gt;result, 0, sizeof(ll-&gt;result));</div><div class='add'>+</div><div class='add'>+	for (int q = 0; q &lt; mld-&gt;trans-&gt;info.num_rxqs; q++)</div><div class='add'>+		memset(ll-&gt;pkts_counters[q].vo_vi, 0,</div><div class='add'>+		       sizeof(ll-&gt;pkts_counters[q].vo_vi));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_send_low_latency_cmd(struct iwl_mld *mld, bool low_latency,</div><div class='add'>+					u16 mac_id)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mac_low_latency_cmd cmd = {</div><div class='add'>+		.mac_id = cpu_to_le32(mac_id)</div><div class='add'>+	};</div><div class='add'>+	u16 cmd_id = WIDE_ID(MAC_CONF_GROUP, LOW_LATENCY_CMD);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (low_latency) {</div><div class='add'>+		/* Currently we don't care about the direction */</div><div class='add'>+		cmd.low_latency_rx = 1;</div><div class='add'>+		cmd.low_latency_tx = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd_pdu(mld, cmd_id, &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mld, "Failed to send low latency command\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_vif_set_low_latency(struct iwl_mld_vif *mld_vif, bool set,</div><div class='add'>+					enum iwl_mld_low_latency_cause cause)</div><div class='add'>+{</div><div class='add'>+	if (set)</div><div class='add'>+		mld_vif-&gt;low_latency_causes |= cause;</div><div class='add'>+	else</div><div class='add'>+		mld_vif-&gt;low_latency_causes &amp;= ~cause;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_vif_update_low_latency(struct iwl_mld *mld,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    bool low_latency,</div><div class='add'>+				    enum iwl_mld_low_latency_cause cause)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	bool prev;</div><div class='add'>+</div><div class='add'>+	prev = iwl_mld_vif_low_latency(mld_vif);</div><div class='add'>+	iwl_mld_vif_set_low_latency(mld_vif, low_latency, cause);</div><div class='add'>+</div><div class='add'>+	low_latency = iwl_mld_vif_low_latency(mld_vif);</div><div class='add'>+	if (low_latency == prev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_send_low_latency_cmd(mld, low_latency, mld_vif-&gt;fw_id)) {</div><div class='add'>+		/* revert to previous low-latency state */</div><div class='add'>+		iwl_mld_vif_set_low_latency(mld_vif, prev, cause);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_type_p2p(vif) != NL80211_IFTYPE_P2P_CLIENT)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mld_update_mac_power(mld, vif, false);</div><div class='add'>+</div><div class='add'>+	if (low_latency)</div><div class='add'>+		iwl_mld_retry_emlsr(mld, vif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_is_vo_vi_pkt(struct ieee80211_hdr *hdr)</div><div class='add'>+{</div><div class='add'>+	u8 tid;</div><div class='add'>+	static const u8 tid_to_mac80211_ac[] = {</div><div class='add'>+		IEEE80211_AC_BE,</div><div class='add'>+		IEEE80211_AC_BK,</div><div class='add'>+		IEEE80211_AC_BK,</div><div class='add'>+		IEEE80211_AC_BE,</div><div class='add'>+		IEEE80211_AC_VI,</div><div class='add'>+		IEEE80211_AC_VI,</div><div class='add'>+		IEEE80211_AC_VO,</div><div class='add'>+		IEEE80211_AC_VO,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!hdr || !ieee80211_is_data_qos(hdr-&gt;frame_control))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	tid = ieee80211_get_tid(hdr);</div><div class='add'>+	if (tid &gt;= IWL_MAX_TID_COUNT)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return tid_to_mac80211_ac[tid] &lt; IEEE80211_AC_VI;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_low_latency_update_counters(struct iwl_mld *mld,</div><div class='add'>+					 struct ieee80211_hdr *hdr,</div><div class='add'>+					 struct ieee80211_sta *sta,</div><div class='add'>+					 u8 queue)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(mld_sta-&gt;vif);</div><div class='add'>+	struct iwl_mld_low_latency_packets_counters *counters;</div><div class='add'>+	unsigned long ts = jiffies ? jiffies : 1;</div><div class='add'>+	u8 fw_id = mld_vif-&gt;fw_id;</div><div class='add'>+</div><div class='add'>+	/* we should have failed op mode init if NULL */</div><div class='add'>+	if (WARN_ON_ONCE(!mld-&gt;low_latency.pkts_counters))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(fw_id &gt;= ARRAY_SIZE(counters-&gt;vo_vi) ||</div><div class='add'>+			 queue &gt;= mld-&gt;trans-&gt;info.num_rxqs))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (mld-&gt;low_latency.stopped)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!iwl_mld_is_vo_vi_pkt(hdr))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	counters = &amp;mld-&gt;low_latency.pkts_counters[queue];</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;counters-&gt;lock);</div><div class='add'>+	counters-&gt;vo_vi[fw_id]++;</div><div class='add'>+	spin_unlock_bh(&amp;counters-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* Initialize the window_start on the first vo/vi packet */</div><div class='add'>+	if (!mld-&gt;low_latency.window_start[fw_id])</div><div class='add'>+		mld-&gt;low_latency.window_start[fw_id] = ts;</div><div class='add'>+</div><div class='add'>+	if (time_is_before_jiffies(mld-&gt;low_latency.timestamp + MLD_LL_PERIOD))</div><div class='add'>+		wiphy_delayed_work_queue(mld-&gt;wiphy, &amp;mld-&gt;low_latency.work,</div><div class='add'>+					 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_low_latency_stop(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	mld-&gt;low_latency.stopped = true;</div><div class='add'>+</div><div class='add'>+	wiphy_delayed_work_cancel(mld-&gt;wiphy, &amp;mld-&gt;low_latency.work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_low_latency_restart(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_low_latency *ll = &amp;mld-&gt;low_latency;</div><div class='add'>+	bool low_latency = false;</div><div class='add'>+	unsigned long ts = jiffies;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ll-&gt;timestamp = ts;</div><div class='add'>+	mld-&gt;low_latency.stopped = false;</div><div class='add'>+</div><div class='add'>+	for (int mac = 0; mac &lt; NUM_MAC_INDEX_DRIVER; mac++) {</div><div class='add'>+		ll-&gt;window_start[mac] = 0;</div><div class='add'>+		low_latency |= ll-&gt;result[mac];</div><div class='add'>+</div><div class='add'>+		for (int q = 0; q &lt; mld-&gt;trans-&gt;info.num_rxqs; q++) {</div><div class='add'>+			spin_lock_bh(&amp;ll-&gt;pkts_counters[q].lock);</div><div class='add'>+			ll-&gt;pkts_counters[q].vo_vi[mac] = 0;</div><div class='add'>+			spin_unlock_bh(&amp;ll-&gt;pkts_counters[q].lock);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if low latency is active, force re-evaluation to cover the case of</div><div class='add'>+	 * no traffic.</div><div class='add'>+	 */</div><div class='add'>+	if (low_latency)</div><div class='add'>+		wiphy_delayed_work_queue(mld-&gt;wiphy, &amp;ll-&gt;work, MLD_LL_PERIOD);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/low_latency.h b/drivers/net/wireless/intel/iwlwifi/mld/low_latency.h<br/>new file mode 100644<br/>index 000000000000..f59684d235af<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/low_latency.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/low_latency.h</a></div><div class='hunk'>@@ -0,0 +1,68 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_low_latency_h__</div><div class='add'>+#define __iwl_mld_low_latency_h__</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_low_latency_packets_counters - Packets counters</div><div class='add'>+ * @lock: synchronize the counting in data path against the worker</div><div class='add'>+ * @vo_vi: per-mac, counts the number of TX and RX voice and video packets</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_low_latency_packets_counters {</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	u32 vo_vi[NUM_MAC_INDEX_DRIVER];</div><div class='add'>+} ____cacheline_aligned_in_smp;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_mld_low_latency_cause - low-latency set causes</div><div class='add'>+ *</div><div class='add'>+ * @LOW_LATENCY_TRAFFIC: indicates low-latency traffic was detected</div><div class='add'>+ * @LOW_LATENCY_DEBUGFS: low-latency mode set from debugfs</div><div class='add'>+ * @LOW_LATENCY_VIF_TYPE: low-latency mode set because of vif type (AP)</div><div class='add'>+ */</div><div class='add'>+enum iwl_mld_low_latency_cause {</div><div class='add'>+	LOW_LATENCY_TRAFFIC	= BIT(0),</div><div class='add'>+	LOW_LATENCY_DEBUGFS	= BIT(1),</div><div class='add'>+	LOW_LATENCY_VIF_TYPE	= BIT(2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_low_latency - Manage low-latency detection and activation.</div><div class='add'>+ * @work: this work is used to detect low-latency by monitoring the number of</div><div class='add'>+ *	voice and video packets transmitted in a period of time. If the</div><div class='add'>+ *	threshold is reached, low-latency is activated. When active,</div><div class='add'>+ *	it is deactivated if the threshold is not reached within a</div><div class='add'>+ *	10-second period.</div><div class='add'>+ * @timestamp: timestamp of the last update.</div><div class='add'>+ * @window_start: per-mac, timestamp of the start of the current window. when</div><div class='add'>+ *	the window is over, the counters are reset.</div><div class='add'>+ * @pkts_counters: per-queue array voice/video packet counters</div><div class='add'>+ * @result: per-mac latest low-latency result</div><div class='add'>+ * @stopped: if true, ignore the requests to update the counters</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_low_latency {</div><div class='add'>+	struct wiphy_delayed_work work;</div><div class='add'>+	unsigned long timestamp;</div><div class='add'>+	unsigned long window_start[NUM_MAC_INDEX_DRIVER];</div><div class='add'>+	struct iwl_mld_low_latency_packets_counters *pkts_counters;</div><div class='add'>+	bool result[NUM_MAC_INDEX_DRIVER];</div><div class='add'>+	bool stopped;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int iwl_mld_low_latency_init(struct iwl_mld *mld);</div><div class='add'>+void iwl_mld_low_latency_free(struct iwl_mld *mld);</div><div class='add'>+void iwl_mld_low_latency_restart_cleanup(struct iwl_mld *mld);</div><div class='add'>+void iwl_mld_vif_update_low_latency(struct iwl_mld *mld,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    bool low_latency,</div><div class='add'>+				    enum iwl_mld_low_latency_cause cause);</div><div class='add'>+void iwl_mld_low_latency_update_counters(struct iwl_mld *mld,</div><div class='add'>+					 struct ieee80211_hdr *hdr,</div><div class='add'>+					 struct ieee80211_sta *sta,</div><div class='add'>+					 u8 queue);</div><div class='add'>+void iwl_mld_low_latency_stop(struct iwl_mld *mld);</div><div class='add'>+void iwl_mld_low_latency_restart(struct iwl_mld *mld);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_low_latency_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c<br/>new file mode 100644<br/>index 000000000000..55b484c16280<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/mac80211.c</a></div><div class='hunk'>@@ -0,0 +1,2702 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+#include &lt;linux/fips.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "mac80211.h"</div><div class='add'>+#include "phy.h"</div><div class='add'>+#include "iface.h"</div><div class='add'>+#include "power.h"</div><div class='add'>+#include "sta.h"</div><div class='add'>+#include "agg.h"</div><div class='add'>+#include "scan.h"</div><div class='add'>+#include "d3.h"</div><div class='add'>+#include "tlc.h"</div><div class='add'>+#include "key.h"</div><div class='add'>+#include "ap.h"</div><div class='add'>+#include "tx.h"</div><div class='add'>+#include "roc.h"</div><div class='add'>+#include "mlo.h"</div><div class='add'>+#include "stats.h"</div><div class='add'>+#include "iwl-nvm-parse.h"</div><div class='add'>+#include "ftm-initiator.h"</div><div class='add'>+#include "low_latency.h"</div><div class='add'>+#include "fw/api/scan.h"</div><div class='add'>+#include "fw/api/context.h"</div><div class='add'>+#include "fw/api/filter.h"</div><div class='add'>+#include "fw/api/sta.h"</div><div class='add'>+#include "fw/api/tdls.h"</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+#include "fw/api/d3.h"</div><div class='add'>+#endif /* CONFIG_PM_SLEEP */</div><div class='add'>+#include "iwl-trans.h"</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_LIMITS(ap)					\</div><div class='add'>+	{							\</div><div class='add'>+		.max = 2,					\</div><div class='add'>+		.types = BIT(NL80211_IFTYPE_STATION),		\</div><div class='add'>+	},							\</div><div class='add'>+	{							\</div><div class='add'>+		.max = 1,					\</div><div class='add'>+		.types = ap |					\</div><div class='add'>+			 BIT(NL80211_IFTYPE_P2P_CLIENT) |	\</div><div class='add'>+			 BIT(NL80211_IFTYPE_P2P_GO),		\</div><div class='add'>+	},							\</div><div class='add'>+	{							\</div><div class='add'>+		.max = 1,					\</div><div class='add'>+		.types = BIT(NL80211_IFTYPE_P2P_DEVICE),	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_iface_limit iwl_mld_limits[] = {</div><div class='add'>+	IWL_MLD_LIMITS(0)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_iface_limit iwl_mld_limits_ap[] = {</div><div class='add'>+	IWL_MLD_LIMITS(BIT(NL80211_IFTYPE_AP))</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_iface_combination</div><div class='add'>+iwl_mld_iface_combinations[] = {</div><div class='add'>+	{</div><div class='add'>+		.num_different_channels = 2,</div><div class='add'>+		.max_interfaces = 4,</div><div class='add'>+		.limits = iwl_mld_limits,</div><div class='add'>+		.n_limits = ARRAY_SIZE(iwl_mld_limits),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.num_different_channels = 1,</div><div class='add'>+		.max_interfaces = 4,</div><div class='add'>+		.limits = iwl_mld_limits_ap,</div><div class='add'>+		.n_limits = ARRAY_SIZE(iwl_mld_limits_ap),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 ext_capa_base[IWL_MLD_STA_EXT_CAPA_SIZE] = {</div><div class='add'>+	[0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING,</div><div class='add'>+	[2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT,</div><div class='add'>+	[7] = WLAN_EXT_CAPA8_OPMODE_NOTIF |</div><div class='add'>+	      WLAN_EXT_CAPA8_MAX_MSDU_IN_AMSDU_LSB,</div><div class='add'>+	[8] = WLAN_EXT_CAPA9_MAX_MSDU_IN_AMSDU_MSB,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_EMLSR_CAPA	(IEEE80211_EML_CAP_EMLSR_SUPP | \</div><div class='add'>+				 IEEE80211_EML_CAP_EMLSR_PADDING_DELAY_32US &lt;&lt; \</div><div class='add'>+					__bf_shf(IEEE80211_EML_CAP_EMLSR_PADDING_DELAY) | \</div><div class='add'>+				 IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY_64US &lt;&lt; \</div><div class='add'>+					__bf_shf(IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY))</div><div class='add'>+#define IWL_MLD_CAPA_OPS (FIELD_PREP_CONST( \</div><div class='add'>+			IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_SUPP, \</div><div class='add'>+			IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_SUPP_SAME) | \</div><div class='add'>+			IEEE80211_MLD_CAP_OP_LINK_RECONF_SUPPORT)</div><div class='add'>+</div><div class='add'>+static void iwl_mld_hw_set_addresses(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct wiphy *wiphy = mld-&gt;wiphy;</div><div class='add'>+	int num_addrs = 1;</div><div class='add'>+</div><div class='add'>+	/* Extract MAC address */</div><div class='add'>+	memcpy(mld-&gt;addresses[0].addr, mld-&gt;nvm_data-&gt;hw_addr, ETH_ALEN);</div><div class='add'>+	wiphy-&gt;addresses = mld-&gt;addresses;</div><div class='add'>+	wiphy-&gt;n_addresses = 1;</div><div class='add'>+</div><div class='add'>+	/* Extract additional MAC addresses if available */</div><div class='add'>+	if (mld-&gt;nvm_data-&gt;n_hw_addrs &gt; 1)</div><div class='add'>+		num_addrs = min(mld-&gt;nvm_data-&gt;n_hw_addrs,</div><div class='add'>+				IWL_MLD_MAX_ADDRESSES);</div><div class='add'>+</div><div class='add'>+	for (int i = 1; i &lt; num_addrs; i++) {</div><div class='add'>+		memcpy(mld-&gt;addresses[i].addr,</div><div class='add'>+		       mld-&gt;addresses[i - 1].addr,</div><div class='add'>+		       ETH_ALEN);</div><div class='add'>+		mld-&gt;addresses[i].addr[ETH_ALEN - 1]++;</div><div class='add'>+		wiphy-&gt;n_addresses++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_hw_set_channels(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct wiphy *wiphy = mld-&gt;wiphy;</div><div class='add'>+	struct ieee80211_supported_band *bands = mld-&gt;nvm_data-&gt;bands;</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;bands[NL80211_BAND_2GHZ] = &amp;bands[NL80211_BAND_2GHZ];</div><div class='add'>+	wiphy-&gt;bands[NL80211_BAND_5GHZ] = &amp;bands[NL80211_BAND_5GHZ];</div><div class='add'>+</div><div class='add'>+	if (bands[NL80211_BAND_6GHZ].n_channels)</div><div class='add'>+		wiphy-&gt;bands[NL80211_BAND_6GHZ] = &amp;bands[NL80211_BAND_6GHZ];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_hw_set_security(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = mld-&gt;hw;</div><div class='add'>+	static const u32 mld_ciphers[] = {</div><div class='add'>+		WLAN_CIPHER_SUITE_WEP40,</div><div class='add'>+		WLAN_CIPHER_SUITE_WEP104,</div><div class='add'>+		WLAN_CIPHER_SUITE_TKIP,</div><div class='add'>+		WLAN_CIPHER_SUITE_CCMP,</div><div class='add'>+		WLAN_CIPHER_SUITE_GCMP,</div><div class='add'>+		WLAN_CIPHER_SUITE_GCMP_256,</div><div class='add'>+		WLAN_CIPHER_SUITE_AES_CMAC,</div><div class='add'>+		WLAN_CIPHER_SUITE_BIP_GMAC_128,</div><div class='add'>+		WLAN_CIPHER_SUITE_BIP_GMAC_256</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (fips_enabled)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hw-&gt;wiphy-&gt;n_cipher_suites = ARRAY_SIZE(mld_ciphers);</div><div class='add'>+	hw-&gt;wiphy-&gt;cipher_suites = mld_ciphers;</div><div class='add'>+</div><div class='add'>+	ieee80211_hw_set(hw, MFP_CAPABLE);</div><div class='add'>+	wiphy_ext_feature_set(hw-&gt;wiphy,</div><div class='add'>+			      NL80211_EXT_FEATURE_BEACON_PROTECTION);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_hw_set_antennas(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct wiphy *wiphy = mld-&gt;wiphy;</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;available_antennas_tx = iwl_mld_get_valid_tx_ant(mld);</div><div class='add'>+	wiphy-&gt;available_antennas_rx = iwl_mld_get_valid_rx_ant(mld);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_hw_set_pm(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	struct wiphy *wiphy = mld-&gt;wiphy;</div><div class='add'>+</div><div class='add'>+	if (!device_can_wakeup(mld-&gt;trans-&gt;dev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (fips_enabled)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mld-&gt;wowlan.flags |= WIPHY_WOWLAN_MAGIC_PKT |</div><div class='add'>+			     WIPHY_WOWLAN_DISCONNECT |</div><div class='add'>+			     WIPHY_WOWLAN_EAP_IDENTITY_REQ |</div><div class='add'>+			     WIPHY_WOWLAN_RFKILL_RELEASE |</div><div class='add'>+			     WIPHY_WOWLAN_NET_DETECT |</div><div class='add'>+			     WIPHY_WOWLAN_SUPPORTS_GTK_REKEY |</div><div class='add'>+			     WIPHY_WOWLAN_GTK_REKEY_FAILURE |</div><div class='add'>+			     WIPHY_WOWLAN_4WAY_HANDSHAKE;</div><div class='add'>+</div><div class='add'>+	mld-&gt;wowlan.n_patterns = IWL_WOWLAN_MAX_PATTERNS;</div><div class='add'>+	mld-&gt;wowlan.pattern_min_len = IWL_WOWLAN_MIN_PATTERN_LEN;</div><div class='add'>+	mld-&gt;wowlan.pattern_max_len = IWL_WOWLAN_MAX_PATTERN_LEN;</div><div class='add'>+	mld-&gt;wowlan.max_nd_match_sets = IWL_SCAN_MAX_PROFILES_V2;</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;wowlan = &amp;mld-&gt;wowlan;</div><div class='add'>+#endif /* CONFIG_PM_SLEEP */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mac_hw_set_radiotap(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = mld-&gt;hw;</div><div class='add'>+</div><div class='add'>+	hw-&gt;radiotap_mcs_details |= IEEE80211_RADIOTAP_MCS_HAVE_FEC |</div><div class='add'>+				    IEEE80211_RADIOTAP_MCS_HAVE_STBC;</div><div class='add'>+</div><div class='add'>+	hw-&gt;radiotap_vht_details |= IEEE80211_RADIOTAP_VHT_KNOWN_STBC |</div><div class='add'>+				    IEEE80211_RADIOTAP_VHT_KNOWN_BEAMFORMED;</div><div class='add'>+</div><div class='add'>+	hw-&gt;radiotap_timestamp.units_pos =</div><div class='add'>+		IEEE80211_RADIOTAP_TIMESTAMP_UNIT_US |</div><div class='add'>+		IEEE80211_RADIOTAP_TIMESTAMP_SPOS_PLCP_SIG_ACQ;</div><div class='add'>+</div><div class='add'>+	/* this is the case for CCK frames, it's better (only 8) for OFDM */</div><div class='add'>+	hw-&gt;radiotap_timestamp.accuracy = 22;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mac_hw_set_flags(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = mld-&gt;hw;</div><div class='add'>+</div><div class='add'>+	ieee80211_hw_set(hw, USES_RSS);</div><div class='add'>+	ieee80211_hw_set(hw, HANDLES_QUIET_CSA);</div><div class='add'>+	ieee80211_hw_set(hw, AP_LINK_PS);</div><div class='add'>+	ieee80211_hw_set(hw, SIGNAL_DBM);</div><div class='add'>+	ieee80211_hw_set(hw, SPECTRUM_MGMT);</div><div class='add'>+	ieee80211_hw_set(hw, REPORTS_TX_ACK_STATUS);</div><div class='add'>+	ieee80211_hw_set(hw, WANT_MONITOR_VIF);</div><div class='add'>+	ieee80211_hw_set(hw, SUPPORTS_PS);</div><div class='add'>+	ieee80211_hw_set(hw, SUPPORTS_DYNAMIC_PS);</div><div class='add'>+	ieee80211_hw_set(hw, AMPDU_AGGREGATION);</div><div class='add'>+	ieee80211_hw_set(hw, CONNECTION_MONITOR);</div><div class='add'>+	ieee80211_hw_set(hw, CHANCTX_STA_CSA);</div><div class='add'>+	ieee80211_hw_set(hw, SUPPORT_FAST_XMIT);</div><div class='add'>+	ieee80211_hw_set(hw, SUPPORTS_CLONED_SKBS);</div><div class='add'>+	ieee80211_hw_set(hw, NEEDS_UNIQUE_STA_ADDR);</div><div class='add'>+	ieee80211_hw_set(hw, SUPPORTS_VHT_EXT_NSS_BW);</div><div class='add'>+	ieee80211_hw_set(hw, BUFF_MMPDU_TXQ);</div><div class='add'>+	ieee80211_hw_set(hw, STA_MMPDU_TXQ);</div><div class='add'>+	ieee80211_hw_set(hw, TX_AMSDU);</div><div class='add'>+	ieee80211_hw_set(hw, TX_FRAG_LIST);</div><div class='add'>+	ieee80211_hw_set(hw, TX_AMPDU_SETUP_IN_HW);</div><div class='add'>+	ieee80211_hw_set(hw, HAS_RATE_CONTROL);</div><div class='add'>+	ieee80211_hw_set(hw, SUPPORTS_REORDERING_BUFFER);</div><div class='add'>+	ieee80211_hw_set(hw, SINGLE_SCAN_ON_ALL_BANDS);</div><div class='add'>+	ieee80211_hw_set(hw, SUPPORTS_AMSDU_IN_AMPDU);</div><div class='add'>+	ieee80211_hw_set(hw, TDLS_WIDER_BW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mac_hw_set_wiphy(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = mld-&gt;hw;</div><div class='add'>+	struct wiphy *wiphy = hw-&gt;wiphy;</div><div class='add'>+	const struct iwl_ucode_capabilities *ucode_capa = &amp;mld-&gt;fw-&gt;ucode_capa;</div><div class='add'>+</div><div class='add'>+	snprintf(wiphy-&gt;fw_version,</div><div class='add'>+		 sizeof(wiphy-&gt;fw_version),</div><div class='add'>+		 "%.31s", mld-&gt;fw-&gt;fw_version);</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;interface_modes = BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+				 BIT(NL80211_IFTYPE_P2P_CLIENT) |</div><div class='add'>+				 BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+				 BIT(NL80211_IFTYPE_P2P_GO) |</div><div class='add'>+				 BIT(NL80211_IFTYPE_P2P_DEVICE) |</div><div class='add'>+				 BIT(NL80211_IFTYPE_ADHOC);</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;features |= NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR |</div><div class='add'>+			   NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR |</div><div class='add'>+			   NL80211_FEATURE_ND_RANDOM_MAC_ADDR |</div><div class='add'>+			   NL80211_FEATURE_HT_IBSS |</div><div class='add'>+			   NL80211_FEATURE_P2P_GO_CTWIN |</div><div class='add'>+			   NL80211_FEATURE_LOW_PRIORITY_SCAN |</div><div class='add'>+			   NL80211_FEATURE_P2P_GO_OPPPS |</div><div class='add'>+			   NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE |</div><div class='add'>+			   NL80211_FEATURE_SUPPORTS_WMM_ADMISSION |</div><div class='add'>+			   NL80211_FEATURE_TX_POWER_INSERTION |</div><div class='add'>+			   NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES;</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;flags |= WIPHY_FLAG_IBSS_RSN |</div><div class='add'>+			WIPHY_FLAG_AP_UAPSD |</div><div class='add'>+			WIPHY_FLAG_HAS_CHANNEL_SWITCH |</div><div class='add'>+			WIPHY_FLAG_SPLIT_SCAN_6GHZ |</div><div class='add'>+			WIPHY_FLAG_SUPPORTS_TDLS |</div><div class='add'>+			WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK;</div><div class='add'>+</div><div class='add'>+	/* For fips_enabled, don't support WiFi7 due to WPA3/MFP requirements */</div><div class='add'>+	if (mld-&gt;nvm_data-&gt;sku_cap_11be_enable &amp;&amp;</div><div class='add'>+	    !iwlwifi_mod_params.disable_11ax &amp;&amp;</div><div class='add'>+	    !iwlwifi_mod_params.disable_11be &amp;&amp;</div><div class='add'>+	    !fips_enabled)</div><div class='add'>+		wiphy-&gt;flags |= WIPHY_FLAG_SUPPORTS_MLO;</div><div class='add'>+</div><div class='add'>+	/* the firmware uses u8 for num of iterations, but 0xff is saved for</div><div class='add'>+	 * infinite loop, so the maximum number of iterations is actually 254.</div><div class='add'>+	 */</div><div class='add'>+	wiphy-&gt;max_sched_scan_plan_iterations = 254;</div><div class='add'>+	wiphy-&gt;max_sched_scan_ie_len = iwl_mld_scan_max_template_size();</div><div class='add'>+	wiphy-&gt;max_scan_ie_len = iwl_mld_scan_max_template_size();</div><div class='add'>+	wiphy-&gt;max_sched_scan_ssids = PROBE_OPTION_MAX;</div><div class='add'>+	wiphy-&gt;max_scan_ssids = PROBE_OPTION_MAX;</div><div class='add'>+	wiphy-&gt;max_sched_scan_plans = IWL_MAX_SCHED_SCAN_PLANS;</div><div class='add'>+	wiphy-&gt;max_sched_scan_reqs = 1;</div><div class='add'>+	wiphy-&gt;max_sched_scan_plan_interval = U16_MAX;</div><div class='add'>+	wiphy-&gt;max_match_sets = IWL_SCAN_MAX_PROFILES_V2;</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;max_remain_on_channel_duration = 10000;</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;hw_version = mld-&gt;trans-&gt;info.hw_id;</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;hw_timestamp_max_peers = 1;</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;iface_combinations = iwl_mld_iface_combinations;</div><div class='add'>+	wiphy-&gt;n_iface_combinations = ARRAY_SIZE(iwl_mld_iface_combinations);</div><div class='add'>+</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_VHT_IBSS);</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_DFS_CONCURRENT);</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_BEACON_RATE_LEGACY);</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_SCAN_START_TIME);</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_BSS_PARENT_TSF);</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT);</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_ACCEPT_BCAST_PROBE_RESP);</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_FILS_MAX_CHANNEL_TIME);</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_OCE_PROBE_REQ_HIGH_TX_RATE);</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_MU_MIMO_AIR_SNIFFER);</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_SPP_AMSDU_SUPPORT);</div><div class='add'>+</div><div class='add'>+	if (fw_has_capa(ucode_capa, IWL_UCODE_TLV_CAPA_PROTECTED_TWT))</div><div class='add'>+		wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_PROTECTED_TWT);</div><div class='add'>+</div><div class='add'>+	if (iwlmld_mod_params.power_scheme != IWL_POWER_SCHEME_CAM)</div><div class='add'>+		wiphy-&gt;flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT;</div><div class='add'>+	else</div><div class='add'>+		wiphy-&gt;flags &amp;= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;</div><div class='add'>+</div><div class='add'>+	/* We are done for non-HE */</div><div class='add'>+	if (iwlwifi_mod_params.disable_11ax)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ieee80211_hw_set(hw, SUPPORTS_MULTI_BSSID);</div><div class='add'>+	ieee80211_hw_set(hw, SUPPORTS_ONLY_HE_MULTI_BSSID);</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;iftype_ext_capab = mld-&gt;ext_capab;</div><div class='add'>+	wiphy-&gt;num_iftype_ext_capab = ARRAY_SIZE(mld-&gt;ext_capab);</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(mld-&gt;sta_ext_capab) &lt; sizeof(ext_capa_base));</div><div class='add'>+</div><div class='add'>+	memcpy(mld-&gt;sta_ext_capab, ext_capa_base, sizeof(ext_capa_base));</div><div class='add'>+</div><div class='add'>+	mld-&gt;ext_capab[0].iftype = NL80211_IFTYPE_STATION;</div><div class='add'>+	mld-&gt;ext_capab[0].extended_capabilities = mld-&gt;sta_ext_capab;</div><div class='add'>+	mld-&gt;ext_capab[0].extended_capabilities_mask = mld-&gt;sta_ext_capab;</div><div class='add'>+	mld-&gt;ext_capab[0].extended_capabilities_len = sizeof(mld-&gt;sta_ext_capab);</div><div class='add'>+</div><div class='add'>+	if (!mld-&gt;nvm_data-&gt;sku_cap_11be_enable ||</div><div class='add'>+	    iwlwifi_mod_params.disable_11be)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mld-&gt;ext_capab[0].eml_capabilities = IWL_MLD_EMLSR_CAPA;</div><div class='add'>+	mld-&gt;ext_capab[0].mld_capa_and_ops = IWL_MLD_CAPA_OPS;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mac_hw_set_misc(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = mld-&gt;hw;</div><div class='add'>+</div><div class='add'>+	hw-&gt;queues = IEEE80211_NUM_ACS;</div><div class='add'>+</div><div class='add'>+	hw-&gt;netdev_features = NETIF_F_HIGHDMA | NETIF_F_SG;</div><div class='add'>+	hw-&gt;netdev_features |= mld-&gt;trans-&gt;mac_cfg-&gt;base-&gt;features;</div><div class='add'>+</div><div class='add'>+	hw-&gt;max_tx_fragments = mld-&gt;trans-&gt;info.max_skb_frags;</div><div class='add'>+	hw-&gt;max_listen_interval = IWL_MLD_CONN_LISTEN_INTERVAL;</div><div class='add'>+</div><div class='add'>+	hw-&gt;uapsd_max_sp_len = IEEE80211_WMM_IE_STA_QOSINFO_SP_ALL;</div><div class='add'>+	hw-&gt;uapsd_queues = IEEE80211_WMM_IE_STA_QOSINFO_AC_VO |</div><div class='add'>+			   IEEE80211_WMM_IE_STA_QOSINFO_AC_VI |</div><div class='add'>+			   IEEE80211_WMM_IE_STA_QOSINFO_AC_BK |</div><div class='add'>+			   IEEE80211_WMM_IE_STA_QOSINFO_AC_BE;</div><div class='add'>+</div><div class='add'>+	hw-&gt;chanctx_data_size = sizeof(struct iwl_mld_phy);</div><div class='add'>+	hw-&gt;vif_data_size = sizeof(struct iwl_mld_vif);</div><div class='add'>+	hw-&gt;sta_data_size = sizeof(struct iwl_mld_sta);</div><div class='add'>+	hw-&gt;txq_data_size = sizeof(struct iwl_mld_txq);</div><div class='add'>+</div><div class='add'>+	/* TODO: Remove this division when IEEE80211_MAX_AMPDU_BUF_EHT size</div><div class='add'>+	 * is supported.</div><div class='add'>+	 * Note: ensure that IWL_DEFAULT_QUEUE_SIZE_EHT is updated accordingly.</div><div class='add'>+	 */</div><div class='add'>+	hw-&gt;max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF_EHT / 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_hw_verify_preconditions(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	int ratecheck;</div><div class='add'>+</div><div class='add'>+	/* check for rates version 3 */</div><div class='add'>+	ratecheck =</div><div class='add'>+		(iwl_fw_lookup_cmd_ver(mld-&gt;fw, TX_CMD, 0) &gt;= 11) +</div><div class='add'>+		(iwl_fw_lookup_notif_ver(mld-&gt;fw, DATA_PATH_GROUP,</div><div class='add'>+					 TLC_MNG_UPDATE_NOTIF, 0) &gt;= 4) +</div><div class='add'>+		(iwl_fw_lookup_notif_ver(mld-&gt;fw, LEGACY_GROUP,</div><div class='add'>+					 REPLY_RX_MPDU_CMD, 0) &gt;= 6) +</div><div class='add'>+		(iwl_fw_lookup_notif_ver(mld-&gt;fw, LONG_GROUP, TX_CMD, 0) &gt;= 9);</div><div class='add'>+</div><div class='add'>+	if (ratecheck != 0 &amp;&amp; ratecheck != 4) {</div><div class='add'>+		IWL_ERR(mld, "Firmware has inconsistent rates\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 11ax is expected to be enabled for all supported devices */</div><div class='add'>+	if (WARN_ON(!mld-&gt;nvm_data-&gt;sku_cap_11ax_enable))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* LAR is expected to be enabled for all supported devices */</div><div class='add'>+	if (WARN_ON(!mld-&gt;nvm_data-&gt;lar_enabled))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* All supported devices are currently using version 3 of the cmd.</div><div class='add'>+	 * Since version 3, IWL_SCAN_MAX_PROFILES_V2 shall be used where</div><div class='add'>+	 * necessary.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON(iwl_fw_lookup_cmd_ver(mld-&gt;fw,</div><div class='add'>+					  SCAN_OFFLOAD_UPDATE_PROFILES_CMD,</div><div class='add'>+					  IWL_FW_CMD_VER_UNKNOWN) != 3))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_register_hw(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	/* verify once essential preconditions required for setting</div><div class='add'>+	 * the hw capabilities</div><div class='add'>+	 */</div><div class='add'>+	if (iwl_mld_hw_verify_preconditions(mld))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	iwl_mld_hw_set_addresses(mld);</div><div class='add'>+	iwl_mld_hw_set_channels(mld);</div><div class='add'>+	iwl_mld_hw_set_security(mld);</div><div class='add'>+	iwl_mld_hw_set_pm(mld);</div><div class='add'>+	iwl_mld_hw_set_antennas(mld);</div><div class='add'>+	iwl_mac_hw_set_radiotap(mld);</div><div class='add'>+	iwl_mac_hw_set_flags(mld);</div><div class='add'>+	iwl_mac_hw_set_wiphy(mld);</div><div class='add'>+	iwl_mac_hw_set_misc(mld);</div><div class='add'>+</div><div class='add'>+	SET_IEEE80211_DEV(mld-&gt;hw, mld-&gt;trans-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return ieee80211_register_hw(mld-&gt;hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_mac80211_tx(struct ieee80211_hw *hw,</div><div class='add'>+		    struct ieee80211_tx_control *control, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct ieee80211_sta *sta = control-&gt;sta;</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='add'>+	u32 link_id = u32_get_bits(info-&gt;control.flags,</div><div class='add'>+				   IEEE80211_TX_CTRL_MLO_LINK);</div><div class='add'>+</div><div class='add'>+	/* In AP mode, mgmt frames are sent on the bcast station,</div><div class='add'>+	 * so the FW can't translate the MLD addr to the link addr. Do it here</div><div class='add'>+	 */</div><div class='add'>+	if (ieee80211_is_mgmt(hdr-&gt;frame_control) &amp;&amp; sta &amp;&amp;</div><div class='add'>+	    link_id != IEEE80211_LINK_UNSPECIFIED &amp;&amp;</div><div class='add'>+	    !ieee80211_is_probe_resp(hdr-&gt;frame_control)) {</div><div class='add'>+		/* translate MLD addresses to LINK addresses */</div><div class='add'>+		struct ieee80211_link_sta *link_sta =</div><div class='add'>+			rcu_dereference(sta-&gt;link[link_id]);</div><div class='add'>+		struct ieee80211_bss_conf *link_conf =</div><div class='add'>+			rcu_dereference(info-&gt;control.vif-&gt;link_conf[link_id]);</div><div class='add'>+		struct ieee80211_mgmt *mgmt;</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!link_sta || !link_conf)) {</div><div class='add'>+			ieee80211_free_txskb(hw, skb);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mgmt = (void *)hdr;</div><div class='add'>+		memcpy(mgmt-&gt;da, link_sta-&gt;addr, ETH_ALEN);</div><div class='add'>+		memcpy(mgmt-&gt;sa, link_conf-&gt;addr, ETH_ALEN);</div><div class='add'>+		memcpy(mgmt-&gt;bssid, link_conf-&gt;bssid, ETH_ALEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mld_tx_skb(mld, skb, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_restart_cleanup(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	iwl_cleanup_mld(mld);</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_interfaces(mld-&gt;hw, IEEE80211_IFACE_ITER_ACTIVE,</div><div class='add'>+				     iwl_mld_cleanup_vif, NULL);</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_stations_atomic(mld-&gt;hw,</div><div class='add'>+					  iwl_mld_cleanup_sta, NULL);</div><div class='add'>+</div><div class='add'>+	iwl_mld_ftm_restart_cleanup(mld);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+int iwl_mld_mac80211_start(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	bool in_d3 = false;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	/* Unless the host goes into hibernate the FW always stays on and</div><div class='add'>+	 * the d3_resume flow is used. When wowlan is configured, mac80211</div><div class='add'>+	 * would call it's resume callback and the wowlan_resume flow</div><div class='add'>+	 * would be used.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	in_d3 = mld-&gt;fw_status.in_d3;</div><div class='add'>+	if (in_d3) {</div><div class='add'>+		/* mac80211 already cleaned up the state, no need for cleanup */</div><div class='add'>+		ret = iwl_mld_no_wowlan_resume(mld);</div><div class='add'>+		if (ret) {</div><div class='add'>+			iwl_mld_stop_fw(mld);</div><div class='add'>+			/* We're not really restarting in the sense of</div><div class='add'>+			 * in_hw_restart even if we got an error during</div><div class='add'>+			 * this. We'll just start again below and have</div><div class='add'>+			 * nothing to recover, mac80211 will do anyway.</div><div class='add'>+			 */</div><div class='add'>+			mld-&gt;fw_status.in_hw_restart = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_PM_SLEEP */</div><div class='add'>+</div><div class='add'>+	if (mld-&gt;fw_status.in_hw_restart) {</div><div class='add'>+		iwl_mld_stop_fw(mld);</div><div class='add'>+		iwl_mld_restart_cleanup(mld);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!in_d3 || ret) {</div><div class='add'>+		ret = iwl_mld_start_fw(mld);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mld-&gt;scan.last_start_time_jiffies = jiffies;</div><div class='add'>+</div><div class='add'>+	iwl_dbg_tlv_time_point(&amp;mld-&gt;fwrt, IWL_FW_INI_TIME_POINT_POST_INIT,</div><div class='add'>+			       NULL);</div><div class='add'>+	iwl_dbg_tlv_time_point(&amp;mld-&gt;fwrt, IWL_FW_INI_TIME_POINT_PERIODIC,</div><div class='add'>+			       NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	/* If we failed to restart the hw, there is nothing useful</div><div class='add'>+	 * we can do but indicate we are no longer in restart.</div><div class='add'>+	 */</div><div class='add'>+	mld-&gt;fw_status.in_hw_restart = false;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void iwl_mld_mac80211_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	wiphy_work_cancel(mld-&gt;wiphy, &amp;mld-&gt;add_txqs_wk);</div><div class='add'>+</div><div class='add'>+	/* if the suspend flow fails the fw is in error. Stop it here, and it</div><div class='add'>+	 * will be started upon wakeup</div><div class='add'>+	 */</div><div class='add'>+	if (!suspend ||</div><div class='add'>+	    (IS_ENABLED(CONFIG_PM_SLEEP) &amp;&amp; iwl_mld_no_wowlan_suspend(mld)))</div><div class='add'>+		iwl_mld_stop_fw(mld);</div><div class='add'>+</div><div class='add'>+	/* Clear in_hw_restart flag when stopping the hw, as mac80211 won't</div><div class='add'>+	 * execute the restart.</div><div class='add'>+	 */</div><div class='add'>+	mld-&gt;fw_status.in_hw_restart = false;</div><div class='add'>+</div><div class='add'>+	/* We shouldn't have any UIDs still set. Loop over all the UIDs to</div><div class='add'>+	 * make sure there's nothing left there and warn if any is found.</div><div class='add'>+	 */</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(mld-&gt;scan.uid_status); i++)</div><div class='add'>+		if (WARN_ONCE(mld-&gt;scan.uid_status[i],</div><div class='add'>+			      "UMAC scan UID %d status was not cleaned (0x%x 0x%x)\n",</div><div class='add'>+			      i, mld-&gt;scan.uid_status[i], mld-&gt;scan.status))</div><div class='add'>+			mld-&gt;scan.uid_status[i] = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+int iwl_mld_mac80211_config(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+			    u32 changed)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+int iwl_mld_mac80211_add_interface(struct ieee80211_hw *hw,</div><div class='add'>+				   struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* Construct mld_vif, add it to fw, and map its ID to ieee80211_vif */</div><div class='add'>+	ret = iwl_mld_add_vif(mld, vif);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Add the default link, but not if this is an MLD vif as that implies</div><div class='add'>+	 * the HW is restarting and it will be configured by change_vif_links.</div><div class='add'>+	 */</div><div class='add'>+	if (!ieee80211_vif_is_mld(vif))</div><div class='add'>+		ret = iwl_mld_add_link(mld, &amp;vif-&gt;bss_conf);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='add'>+		vif-&gt;driver_flags |= IEEE80211_VIF_REMOVE_AP_AFTER_DISASSOC;</div><div class='add'>+		if (!vif-&gt;p2p)</div><div class='add'>+			vif-&gt;driver_flags |= IEEE80211_VIF_BEACON_FILTER |</div><div class='add'>+					     IEEE80211_VIF_SUPPORTS_CQM_RSSI;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;p2p)</div><div class='add'>+		vif-&gt;driver_flags |= IEEE80211_VIF_IGNORE_OFDMA_WIDER_BW;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For an MLD vif (in restart) we may not have a link; delay the call</div><div class='add'>+	 * the initial change_vif_links.</div><div class='add'>+	 */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+	    !ieee80211_vif_is_mld(vif))</div><div class='add'>+		iwl_mld_update_mac_power(mld, vif, false);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_MONITOR) {</div><div class='add'>+		mld-&gt;monitor.on = true;</div><div class='add'>+		ieee80211_hw_set(mld-&gt;hw, RX_INCLUDES_FCS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE)</div><div class='add'>+		mld-&gt;p2p_device_vif = vif;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	iwl_mld_rm_vif(mld, vif);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void iwl_mld_mac80211_remove_interface(struct ieee80211_hw *hw,</div><div class='add'>+				       struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_type_p2p(vif) == NL80211_IFTYPE_STATION)</div><div class='add'>+		vif-&gt;driver_flags &amp;= ~(IEEE80211_VIF_BEACON_FILTER |</div><div class='add'>+				       IEEE80211_VIF_SUPPORTS_CQM_RSSI);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_MONITOR) {</div><div class='add'>+		__clear_bit(IEEE80211_HW_RX_INCLUDES_FCS, mld-&gt;hw-&gt;flags);</div><div class='add'>+		mld-&gt;monitor.on = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE)</div><div class='add'>+		mld-&gt;p2p_device_vif = NULL;</div><div class='add'>+</div><div class='add'>+	iwl_mld_remove_link(mld, &amp;vif-&gt;bss_conf);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='add'>+	debugfs_remove(iwl_mld_vif_from_mac80211(vif)-&gt;dbgfs_slink);</div><div class='add'>+	iwl_mld_vif_from_mac80211(vif)-&gt;dbgfs_slink = NULL;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	iwl_mld_rm_vif(mld, vif);</div><div class='add'>+</div><div class='add'>+	mld-&gt;monitor.phy.valid = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct iwl_mld_mc_iter_data {</div><div class='add'>+	struct iwl_mld *mld;</div><div class='add'>+	int port_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void iwl_mld_mc_iface_iterator(void *data, u8 *mac,</div><div class='add'>+				      struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_mc_iter_data *mc_data = data;</div><div class='add'>+	struct iwl_mld *mld = mc_data-&gt;mld;</div><div class='add'>+	struct iwl_mcast_filter_cmd *cmd = mld-&gt;mcast_filter_cmd;</div><div class='add'>+	struct iwl_host_cmd hcmd = {</div><div class='add'>+		.id = MCAST_FILTER_CMD,</div><div class='add'>+		.dataflags[0] = IWL_HCMD_DFL_NOCOPY,</div><div class='add'>+	};</div><div class='add'>+	int ret, len;</div><div class='add'>+</div><div class='add'>+	/* If we don't have free ports, mcast frames will be dropped */</div><div class='add'>+	if (WARN_ON_ONCE(mc_data-&gt;port_id &gt;= MAX_PORT_ID_NUM))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION || !vif-&gt;cfg.assoc)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;port_id = mc_data-&gt;port_id++;</div><div class='add'>+	ether_addr_copy(cmd-&gt;bssid, vif-&gt;bss_conf.bssid);</div><div class='add'>+	len = roundup(sizeof(*cmd) + cmd-&gt;count * ETH_ALEN, 4);</div><div class='add'>+</div><div class='add'>+	hcmd.len[0] = len;</div><div class='add'>+	hcmd.data[0] = cmd;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd(mld, &amp;hcmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mld, "mcast filter cmd error. ret=%d\n", ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_recalc_multicast_filter(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_mc_iter_data iter_data = {</div><div class='add'>+		.mld = mld,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!mld-&gt;mcast_filter_cmd))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces(mld-&gt;hw,</div><div class='add'>+					    IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+					    iwl_mld_mc_iface_iterator,</div><div class='add'>+					    &amp;iter_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64</div><div class='add'>+iwl_mld_mac80211_prepare_multicast(struct ieee80211_hw *hw,</div><div class='add'>+				   struct netdev_hw_addr_list *mc_list)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct iwl_mcast_filter_cmd *cmd;</div><div class='add'>+	struct netdev_hw_addr *addr;</div><div class='add'>+	int addr_count = netdev_hw_addr_list_count(mc_list);</div><div class='add'>+	bool pass_all = addr_count &gt; MAX_MCAST_FILTERING_ADDRESSES;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	if (pass_all)</div><div class='add'>+		addr_count = 0;</div><div class='add'>+</div><div class='add'>+	/* len must be a multiple of 4 */</div><div class='add'>+	len = roundup(sizeof(*cmd) + addr_count * ETH_ALEN, 4);</div><div class='add'>+	cmd = kzalloc(len, GFP_ATOMIC);</div><div class='add'>+	if (!cmd)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (pass_all) {</div><div class='add'>+		cmd-&gt;pass_all = 1;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_hw_addr_list_for_each(addr, mc_list) {</div><div class='add'>+		IWL_DEBUG_MAC80211(mld, "mcast addr (%d): %pM\n",</div><div class='add'>+				   cmd-&gt;count, addr-&gt;addr);</div><div class='add'>+		ether_addr_copy(&amp;cmd-&gt;addr_list[cmd-&gt;count * ETH_ALEN],</div><div class='add'>+				addr-&gt;addr);</div><div class='add'>+		cmd-&gt;count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return (u64)(unsigned long)cmd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void iwl_mld_mac80211_configure_filter(struct ieee80211_hw *hw,</div><div class='add'>+				       unsigned int changed_flags,</div><div class='add'>+				       unsigned int *total_flags,</div><div class='add'>+				       u64 multicast)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct iwl_mcast_filter_cmd *cmd = (void *)(unsigned long)multicast;</div><div class='add'>+</div><div class='add'>+	/* Replace previous configuration */</div><div class='add'>+	kfree(mld-&gt;mcast_filter_cmd);</div><div class='add'>+	mld-&gt;mcast_filter_cmd = cmd;</div><div class='add'>+</div><div class='add'>+	if (!cmd)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (changed_flags &amp; FIF_ALLMULTI)</div><div class='add'>+		cmd-&gt;pass_all = !!(*total_flags &amp; FIF_ALLMULTI);</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;pass_all)</div><div class='add'>+		cmd-&gt;count = 0;</div><div class='add'>+</div><div class='add'>+	iwl_mld_recalc_multicast_filter(mld);</div><div class='add'>+out:</div><div class='add'>+	*total_flags = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void iwl_mld_mac80211_wake_tx_queue(struct ieee80211_hw *hw,</div><div class='add'>+				    struct ieee80211_txq *txq)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct iwl_mld_txq *mld_txq = iwl_mld_txq_from_mac80211(txq);</div><div class='add'>+</div><div class='add'>+	if (likely(mld_txq-&gt;status.allocated) || !txq-&gt;sta) {</div><div class='add'>+		iwl_mld_tx_from_txq(mld, txq);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We don't support TSPEC tids. %IEEE80211_NUM_TIDS is for mgmt */</div><div class='add'>+	if (txq-&gt;tid != IEEE80211_NUM_TIDS &amp;&amp; txq-&gt;tid &gt;= IWL_MAX_TID_COUNT) {</div><div class='add'>+		IWL_DEBUG_MAC80211(mld, "TID %d is not supported\n", txq-&gt;tid);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The worker will handle any packets we leave on the txq now */</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;mld-&gt;add_txqs_lock);</div><div class='add'>+	/* The list is being deleted only after the queue is fully allocated. */</div><div class='add'>+	if (list_empty(&amp;mld_txq-&gt;list) &amp;&amp;</div><div class='add'>+	    /* recheck under lock, otherwise it can be added twice */</div><div class='add'>+	    !mld_txq-&gt;status.allocated) {</div><div class='add'>+		list_add_tail(&amp;mld_txq-&gt;list, &amp;mld-&gt;txqs_to_add);</div><div class='add'>+		wiphy_work_queue(mld-&gt;wiphy, &amp;mld-&gt;add_txqs_wk);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;mld-&gt;add_txqs_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_teardown_tdls_peers(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; mld-&gt;fw-&gt;ucode_capa.num_stations; i++) {</div><div class='add'>+		struct ieee80211_link_sta *link_sta;</div><div class='add'>+		struct iwl_mld_sta *mld_sta;</div><div class='add'>+</div><div class='add'>+		link_sta = wiphy_dereference(mld-&gt;wiphy,</div><div class='add'>+					     mld-&gt;fw_id_to_link_sta[i]);</div><div class='add'>+		if (IS_ERR_OR_NULL(link_sta))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!link_sta-&gt;sta-&gt;tdls)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mld_sta = iwl_mld_sta_from_mac80211(link_sta-&gt;sta);</div><div class='add'>+</div><div class='add'>+		ieee80211_tdls_oper_request(mld_sta-&gt;vif, link_sta-&gt;addr,</div><div class='add'>+					    NL80211_TDLS_TEARDOWN,</div><div class='add'>+					    WLAN_REASON_TDLS_TEARDOWN_UNSPECIFIED,</div><div class='add'>+					    GFP_KERNEL);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+int iwl_mld_add_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+			struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct iwl_mld_phy *phy = iwl_mld_phy_from_mac80211(ctx);</div><div class='add'>+	int fw_id = iwl_mld_allocate_fw_phy_id(mld);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (fw_id &lt; 0)</div><div class='add'>+		return fw_id;</div><div class='add'>+</div><div class='add'>+	phy-&gt;mld = mld;</div><div class='add'>+	phy-&gt;fw_id = fw_id;</div><div class='add'>+	phy-&gt;chandef = *iwl_mld_get_chandef_from_chanctx(mld, ctx);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_phy_fw_action(mld, ctx, FW_CTXT_ACTION_ADD);</div><div class='add'>+	if (ret) {</div><div class='add'>+		mld-&gt;used_phy_ids &amp;= ~BIT(phy-&gt;fw_id);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hweight8(mld-&gt;used_phy_ids) &gt; 1)</div><div class='add'>+		iwl_mld_teardown_tdls_peers(mld);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void iwl_mld_remove_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+			    struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct iwl_mld_phy *phy = iwl_mld_phy_from_mac80211(ctx);</div><div class='add'>+</div><div class='add'>+	iwl_mld_phy_fw_action(mld, ctx, FW_CTXT_ACTION_REMOVE);</div><div class='add'>+	mld-&gt;used_phy_ids &amp;= ~BIT(phy-&gt;fw_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void iwl_mld_change_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+			    struct ieee80211_chanctx_conf *ctx, u32 changed)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct iwl_mld_phy *phy = iwl_mld_phy_from_mac80211(ctx);</div><div class='add'>+	struct cfg80211_chan_def *chandef =</div><div class='add'>+		iwl_mld_get_chandef_from_chanctx(mld, ctx);</div><div class='add'>+</div><div class='add'>+	/* We don't care about these */</div><div class='add'>+	if (!(changed &amp; ~(IEEE80211_CHANCTX_CHANGE_RX_CHAINS |</div><div class='add'>+			  IEEE80211_CHANCTX_CHANGE_RADAR |</div><div class='add'>+			  IEEE80211_CHANCTX_CHANGE_CHANNEL)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Check if a FW update is required */</div><div class='add'>+</div><div class='add'>+	if (changed &amp; IEEE80211_CHANCTX_CHANGE_AP)</div><div class='add'>+		goto update;</div><div class='add'>+</div><div class='add'>+	if (chandef-&gt;chan == phy-&gt;chandef.chan &amp;&amp;</div><div class='add'>+	    chandef-&gt;center_freq1 == phy-&gt;chandef.center_freq1 &amp;&amp;</div><div class='add'>+	    chandef-&gt;punctured == phy-&gt;chandef.punctured) {</div><div class='add'>+		/* Check if we are toggling between HT and non-HT, no-op */</div><div class='add'>+		if (phy-&gt;chandef.width == chandef-&gt;width ||</div><div class='add'>+		    (phy-&gt;chandef.width &lt;= NL80211_CHAN_WIDTH_20 &amp;&amp;</div><div class='add'>+		     chandef-&gt;width &lt;= NL80211_CHAN_WIDTH_20))</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+update:</div><div class='add'>+</div><div class='add'>+	iwl_mld_update_phy_chandef(mld, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8</div><div class='add'>+iwl_mld_chandef_get_primary_80(struct cfg80211_chan_def *chandef)</div><div class='add'>+{</div><div class='add'>+	int data_start;</div><div class='add'>+	int control_start;</div><div class='add'>+	int bw;</div><div class='add'>+</div><div class='add'>+	if (chandef-&gt;width == NL80211_CHAN_WIDTH_320)</div><div class='add'>+		bw = 320;</div><div class='add'>+	else if (chandef-&gt;width == NL80211_CHAN_WIDTH_160)</div><div class='add'>+		bw = 160;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* data is bw wide so the start is half the width */</div><div class='add'>+	data_start = chandef-&gt;center_freq1 - bw / 2;</div><div class='add'>+	/* control is 20Mhz width */</div><div class='add'>+	control_start = chandef-&gt;chan-&gt;center_freq - 10;</div><div class='add'>+</div><div class='add'>+	return (control_start - data_start) / 80;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_can_activate_link(struct iwl_mld *mld,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      struct ieee80211_bss_conf *link)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld_sta *mld_sta;</div><div class='add'>+	struct iwl_mld_link_sta *link_sta;</div><div class='add'>+</div><div class='add'>+	/* In association, we activate the assoc link before adding the STA. */</div><div class='add'>+	if (!mld_vif-&gt;ap_sta || !vif-&gt;cfg.assoc)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	mld_sta = iwl_mld_sta_from_mac80211(mld_vif-&gt;ap_sta);</div><div class='add'>+</div><div class='add'>+	/* When switching links, we need to wait with the activation until the</div><div class='add'>+	 * STA was added to the FW. It'll be activated in</div><div class='add'>+	 * iwl_mld_update_link_stas</div><div class='add'>+	 */</div><div class='add'>+	link_sta = wiphy_dereference(mld-&gt;wiphy, mld_sta-&gt;link[link-&gt;link_id]);</div><div class='add'>+</div><div class='add'>+	/* In restart we can have a link_sta that doesn't exist in FW yet */</div><div class='add'>+	return link_sta &amp;&amp; link_sta-&gt;in_fw;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+int iwl_mld_assign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+			       struct ieee80211_vif *vif,</div><div class='add'>+			       struct ieee80211_bss_conf *link,</div><div class='add'>+			       struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct iwl_mld_link *mld_link = iwl_mld_link_from_mac80211(link);</div><div class='add'>+	unsigned int n_active = iwl_mld_count_active_links(mld, vif);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mld_link))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* if the assigned one was not counted yet, count it now */</div><div class='add'>+	if (!rcu_access_pointer(mld_link-&gt;chan_ctx)) {</div><div class='add'>+		n_active++;</div><div class='add'>+</div><div class='add'>+		/* Track addition of non-BSS link */</div><div class='add'>+		if (ieee80211_vif_type_p2p(vif) != NL80211_IFTYPE_STATION) {</div><div class='add'>+			ret = iwl_mld_emlsr_check_non_bss_block(mld, 1);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* for AP, mac parameters such as HE support are updated at this stage. */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP) {</div><div class='add'>+		ret = iwl_mld_mac_fw_action(mld, vif, FW_CTXT_ACTION_MODIFY);</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			IWL_ERR(mld, "failed to update MAC %pM\n", vif-&gt;addr);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(mld_link-&gt;chan_ctx, ctx);</div><div class='add'>+</div><div class='add'>+	if (n_active &gt; 1) {</div><div class='add'>+		struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+		/* Indicate to mac80211 that EML is enabled */</div><div class='add'>+		vif-&gt;driver_flags |= IEEE80211_VIF_EML_ACTIVE;</div><div class='add'>+		mld_vif-&gt;emlsr.last_entry_ts = jiffies;</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;active_links &amp; BIT(mld_vif-&gt;emlsr.selected_links))</div><div class='add'>+			mld_vif-&gt;emlsr.primary = mld_vif-&gt;emlsr.selected_primary;</div><div class='add'>+		else</div><div class='add'>+			mld_vif-&gt;emlsr.primary = __ffs(vif-&gt;active_links);</div><div class='add'>+</div><div class='add'>+		iwl_dbg_tlv_time_point(&amp;mld-&gt;fwrt, IWL_FW_INI_TIME_ESR_LINK_UP,</div><div class='add'>+				       NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* First send the link command with the phy context ID.</div><div class='add'>+	 * Now that we have the phy, we know the band so also the rates</div><div class='add'>+	 */</div><div class='add'>+	ret = iwl_mld_change_link_in_fw(mld, link,</div><div class='add'>+					LINK_CONTEXT_MODIFY_RATES_INFO);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* TODO: Initialize rate control for the AP station, since we might be</div><div class='add'>+	 * doing a link switch here - we cannot initialize it before since</div><div class='add'>+	 * this needs the phy context assigned (and in FW?), and we cannot</div><div class='add'>+	 * do it later because it needs to be initialized as soon as we're</div><div class='add'>+	 * able to TX on the link, i.e. when active. (task=link-switch)</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Now activate the link */</div><div class='add'>+	if (iwl_mld_can_activate_link(mld, vif, link)) {</div><div class='add'>+		ret = iwl_mld_activate_link(mld, link);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+		iwl_mld_send_ap_tx_power_constraint_cmd(mld, vif, link);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_MONITOR) {</div><div class='add'>+		ret = iwl_mld_add_mon_sta(mld, vif, link);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto deactivate_link;</div><div class='add'>+</div><div class='add'>+		mld-&gt;monitor.p80 =</div><div class='add'>+			iwl_mld_chandef_get_primary_80(&amp;vif-&gt;bss_conf.chanreq.oper);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+deactivate_link:</div><div class='add'>+	if (mld_link-&gt;active)</div><div class='add'>+		iwl_mld_deactivate_link(mld, link);</div><div class='add'>+err:</div><div class='add'>+	RCU_INIT_POINTER(mld_link-&gt;chan_ctx, NULL);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void iwl_mld_unassign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  struct ieee80211_bss_conf *link,</div><div class='add'>+				  struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld_link *mld_link = iwl_mld_link_from_mac80211(link);</div><div class='add'>+	unsigned int n_active = iwl_mld_count_active_links(mld, vif);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mld_link))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Track removal of non-BSS link */</div><div class='add'>+	if (ieee80211_vif_type_p2p(vif) != NL80211_IFTYPE_STATION)</div><div class='add'>+		iwl_mld_emlsr_check_non_bss_block(mld, -1);</div><div class='add'>+</div><div class='add'>+	iwl_mld_deactivate_link(mld, link);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_MONITOR)</div><div class='add'>+		iwl_mld_remove_mon_sta(mld, vif, link);</div><div class='add'>+</div><div class='add'>+	if (n_active &gt; 1) {</div><div class='add'>+		/* Indicate to mac80211 that EML is disabled */</div><div class='add'>+		vif-&gt;driver_flags &amp;= ~IEEE80211_VIF_EML_ACTIVE;</div><div class='add'>+</div><div class='add'>+		iwl_dbg_tlv_time_point(&amp;mld-&gt;fwrt,</div><div class='add'>+				       IWL_FW_INI_TIME_ESR_LINK_DOWN,</div><div class='add'>+				       NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	RCU_INIT_POINTER(mld_link-&gt;chan_ctx, NULL);</div><div class='add'>+</div><div class='add'>+	/* in the non-MLO case, remove/re-add the link to clean up FW state.</div><div class='add'>+	 * In MLO, it'll be done in drv_change_vif_link</div><div class='add'>+	 */</div><div class='add'>+	if (!ieee80211_vif_is_mld(vif) &amp;&amp; !mld_vif-&gt;ap_sta &amp;&amp;</div><div class='add'>+	    !WARN_ON_ONCE(vif-&gt;cfg.assoc) &amp;&amp;</div><div class='add'>+	    vif-&gt;type != NL80211_IFTYPE_AP &amp;&amp; !mld-&gt;fw_status.in_hw_restart) {</div><div class='add'>+		iwl_mld_remove_link(mld, link);</div><div class='add'>+		iwl_mld_add_link(mld, link);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+int iwl_mld_mac80211_set_rts_threshold(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+				       u32 value)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_link_info_changed_ap_ibss(struct iwl_mld *mld,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  struct ieee80211_bss_conf *link,</div><div class='add'>+				  u64 changes)</div><div class='add'>+{</div><div class='add'>+	u32 link_changes = 0;</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_ERP_SLOT)</div><div class='add'>+		link_changes |= LINK_CONTEXT_MODIFY_RATES_INFO;</div><div class='add'>+</div><div class='add'>+	if (changes &amp; (BSS_CHANGED_ERP_CTS_PROT | BSS_CHANGED_HT))</div><div class='add'>+		link_changes |= LINK_CONTEXT_MODIFY_PROTECT_FLAGS;</div><div class='add'>+</div><div class='add'>+	if (changes &amp; (BSS_CHANGED_QOS | BSS_CHANGED_BANDWIDTH))</div><div class='add'>+		link_changes |= LINK_CONTEXT_MODIFY_QOS_PARAMS;</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_HE_BSS_COLOR)</div><div class='add'>+		link_changes |= LINK_CONTEXT_MODIFY_HE_PARAMS;</div><div class='add'>+</div><div class='add'>+	if (link_changes)</div><div class='add'>+		iwl_mld_change_link_in_fw(mld, link, link_changes);</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_BEACON)</div><div class='add'>+		iwl_mld_update_beacon_template(mld, vif, link);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+u32 iwl_mld_link_changed_mapping(struct iwl_mld *mld,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				 u64 changes)</div><div class='add'>+{</div><div class='add'>+	u32 link_changes = 0;</div><div class='add'>+	bool has_he, has_eht;</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_QOS &amp;&amp; vif-&gt;cfg.assoc &amp;&amp; link_conf-&gt;qos)</div><div class='add'>+		link_changes |= LINK_CONTEXT_MODIFY_QOS_PARAMS;</div><div class='add'>+</div><div class='add'>+	if (changes &amp; (BSS_CHANGED_ERP_PREAMBLE | BSS_CHANGED_BASIC_RATES |</div><div class='add'>+		       BSS_CHANGED_ERP_SLOT))</div><div class='add'>+		link_changes |= LINK_CONTEXT_MODIFY_RATES_INFO;</div><div class='add'>+</div><div class='add'>+	if (changes &amp; (BSS_CHANGED_HT | BSS_CHANGED_ERP_CTS_PROT))</div><div class='add'>+		link_changes |= LINK_CONTEXT_MODIFY_PROTECT_FLAGS;</div><div class='add'>+</div><div class='add'>+	/* TODO: task=MLO check mac80211's HE flags and if command is needed</div><div class='add'>+	 * every time there's a link change. Currently used flags are</div><div class='add'>+	 * BSS_CHANGED_HE_OBSS_PD and BSS_CHANGED_HE_BSS_COLOR.</div><div class='add'>+	 */</div><div class='add'>+	has_he = link_conf-&gt;he_support &amp;&amp; !iwlwifi_mod_params.disable_11ax;</div><div class='add'>+	has_eht = link_conf-&gt;eht_support &amp;&amp; !iwlwifi_mod_params.disable_11be;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;cfg.assoc &amp;&amp; (has_he || has_eht)) {</div><div class='add'>+		IWL_DEBUG_MAC80211(mld, "Associated in HE mode\n");</div><div class='add'>+		link_changes |= LINK_CONTEXT_MODIFY_HE_PARAMS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return link_changes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_mac80211_link_info_changed_sta(struct iwl_mld *mld,</div><div class='add'>+				       struct ieee80211_vif *vif,</div><div class='add'>+				       struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				       u64 changes)</div><div class='add'>+{</div><div class='add'>+	u32 link_changes = iwl_mld_link_changed_mapping(mld, vif, link_conf,</div><div class='add'>+							changes);</div><div class='add'>+</div><div class='add'>+	if (link_changes)</div><div class='add'>+		iwl_mld_change_link_in_fw(mld, link_conf, link_changes);</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_TPE)</div><div class='add'>+		iwl_mld_send_ap_tx_power_constraint_cmd(mld, vif, link_conf);</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_BEACON_INFO)</div><div class='add'>+		iwl_mld_update_mac_power(mld, vif, false);</div><div class='add'>+</div><div class='add'>+	/* The firmware will wait quite a while after association before it</div><div class='add'>+	 * starts filtering the beacons. We can safely enable beacon filtering</div><div class='add'>+	 * upon CQM configuration, even if we didn't get a beacon yet.</div><div class='add'>+	 */</div><div class='add'>+	if (changes &amp; (BSS_CHANGED_CQM | BSS_CHANGED_BEACON_INFO))</div><div class='add'>+		iwl_mld_enable_beacon_filter(mld, link_conf, false);</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_BANDWIDTH)</div><div class='add'>+		iwl_mld_retry_emlsr(mld, vif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_update_mu_groups(struct iwl_mld *mld,</div><div class='add'>+				    struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mu_group_mgmt_cmd cmd = {};</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(cmd.membership_status) !=</div><div class='add'>+		     sizeof(link_conf-&gt;mu_group.membership));</div><div class='add'>+	BUILD_BUG_ON(sizeof(cmd.user_position) !=</div><div class='add'>+		     sizeof(link_conf-&gt;mu_group.position));</div><div class='add'>+</div><div class='add'>+	memcpy(cmd.membership_status, link_conf-&gt;mu_group.membership,</div><div class='add'>+	       WLAN_MEMBERSHIP_LEN);</div><div class='add'>+	memcpy(cmd.user_position, link_conf-&gt;mu_group.position,</div><div class='add'>+	       WLAN_USER_POSITION_LEN);</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_cmd_pdu(mld,</div><div class='add'>+				    WIDE_ID(DATA_PATH_GROUP,</div><div class='add'>+					    UPDATE_MU_GROUPS_CMD),</div><div class='add'>+				    &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_mac80211_link_info_changed(struct ieee80211_hw *hw,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				   u64 changes)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+</div><div class='add'>+	switch (vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		iwl_mld_mac80211_link_info_changed_sta(mld, vif, link_conf,</div><div class='add'>+						       changes);</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		iwl_mld_link_info_changed_ap_ibss(mld, vif, link_conf,</div><div class='add'>+						  changes);</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_MONITOR:</div><div class='add'>+		/* The firmware tracks this on its own in STATION mode, but</div><div class='add'>+		 * obviously not in sniffer mode.</div><div class='add'>+		 */</div><div class='add'>+		if (changes &amp; BSS_CHANGED_MU_GROUPS)</div><div class='add'>+			iwl_mld_update_mu_groups(mld, link_conf);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* shouldn't happen */</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We now know our BSSID, we can configure the MAC context with</div><div class='add'>+	 * eht_support if needed.</div><div class='add'>+	 */</div><div class='add'>+	if (changes &amp; BSS_CHANGED_BSSID)</div><div class='add'>+		iwl_mld_mac_fw_action(mld, vif, FW_CTXT_ACTION_MODIFY);</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_TXPOWER)</div><div class='add'>+		iwl_mld_set_tx_power(mld, link_conf, link_conf-&gt;txpower);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_smps_workaround(struct iwl_mld *mld, struct ieee80211_vif *vif, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	bool workaround_required =</div><div class='add'>+		iwl_fw_lookup_cmd_ver(mld-&gt;fw, MAC_PM_POWER_TABLE, 0) &lt; 2;</div><div class='add'>+</div><div class='add'>+	if (!workaround_required)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Send the device-level power commands since the</div><div class='add'>+	 * firmware checks the POWER_TABLE_CMD's POWER_SAVE_EN bit to</div><div class='add'>+	 * determine SMPS mode.</div><div class='add'>+	 */</div><div class='add'>+	if (mld_vif-&gt;ps_disabled == !enable)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mld_vif-&gt;ps_disabled = !enable;</div><div class='add'>+</div><div class='add'>+	iwl_mld_update_device_power(mld, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void iwl_mld_mac80211_vif_cfg_changed(struct ieee80211_hw *hw,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      u64 changes)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_ASSOC) {</div><div class='add'>+		ret = iwl_mld_mac_fw_action(mld, vif, FW_CTXT_ACTION_MODIFY);</div><div class='add'>+		if (ret)</div><div class='add'>+			IWL_ERR(mld, "failed to update context\n");</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;cfg.assoc) {</div><div class='add'>+			/* Clear statistics to get clean beacon counter, and</div><div class='add'>+			 * ask for periodic statistics, as they are needed for</div><div class='add'>+			 * link selection and RX OMI decisions.</div><div class='add'>+			 */</div><div class='add'>+			iwl_mld_clear_stats_in_fw(mld);</div><div class='add'>+			iwl_mld_request_periodic_fw_stats(mld, true);</div><div class='add'>+</div><div class='add'>+			iwl_mld_set_vif_associated(mld, vif);</div><div class='add'>+		} else {</div><div class='add'>+			iwl_mld_request_periodic_fw_stats(mld, false);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_PS) {</div><div class='add'>+		iwl_mld_smps_workaround(mld, vif, vif-&gt;cfg.ps);</div><div class='add'>+		iwl_mld_update_mac_power(mld, vif, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TODO: task=MLO BSS_CHANGED_MLD_VALID_LINKS/CHANGED_MLD_TTLM */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_mac80211_hw_scan(struct ieee80211_hw *hw,</div><div class='add'>+			 struct ieee80211_vif *vif,</div><div class='add'>+			 struct ieee80211_scan_request *hw_req)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!hw_req-&gt;req.n_channels ||</div><div class='add'>+		    hw_req-&gt;req.n_channels &gt;</div><div class='add'>+		    mld-&gt;fw-&gt;ucode_capa.n_scan_channels))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_regular_scan_start(mld, vif, &amp;hw_req-&gt;req, &amp;hw_req-&gt;ies);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		/* We will be busy with scanning, so the counters may not reflect the</div><div class='add'>+		 * reality. Stop checking the counters until the scan ends</div><div class='add'>+		 */</div><div class='add'>+		iwl_mld_start_ignoring_tpt_updates(mld);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_mac80211_cancel_hw_scan(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+</div><div class='add'>+	/* Due to a race condition, it's possible that mac80211 asks</div><div class='add'>+	 * us to stop a hw_scan when it's already stopped. This can</div><div class='add'>+	 * happen, for instance, if we stopped the scan ourselves,</div><div class='add'>+	 * called ieee80211_scan_completed() and the userspace called</div><div class='add'>+	 * cancel scan before ieee80211_scan_work() could run.</div><div class='add'>+	 * To handle that, simply return if the scan is not running.</div><div class='add'>+	 */</div><div class='add'>+	if (mld-&gt;scan.status &amp; IWL_MLD_SCAN_REGULAR) {</div><div class='add'>+		iwl_mld_scan_stop(mld, IWL_MLD_SCAN_REGULAR, true);</div><div class='add'>+		/* Scan is over, we can check again the tpt counters */</div><div class='add'>+		iwl_mld_stop_ignoring_tpt_updates(mld);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_mac80211_sched_scan_start(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  struct cfg80211_sched_scan_request *req,</div><div class='add'>+				  struct ieee80211_scan_ies *ies)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+</div><div class='add'>+	return iwl_mld_sched_scan_start(mld, vif, req, ies, IWL_MLD_SCAN_SCHED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_mac80211_sched_scan_stop(struct ieee80211_hw *hw,</div><div class='add'>+				 struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+</div><div class='add'>+	/* Due to a race condition, it's possible that mac80211 asks</div><div class='add'>+	 * us to stop a sched_scan when it's already stopped. This</div><div class='add'>+	 * can happen, for instance, if we stopped the scan ourselves,</div><div class='add'>+	 * called ieee80211_sched_scan_stopped() and the userspace called</div><div class='add'>+	 * stop sched scan before ieee80211_sched_scan_stopped_work()</div><div class='add'>+	 * could run. To handle this, simply return if the scan is</div><div class='add'>+	 * not running.</div><div class='add'>+	 */</div><div class='add'>+	if (!(mld-&gt;scan.status &amp; IWL_MLD_SCAN_SCHED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return iwl_mld_scan_stop(mld, IWL_MLD_SCAN_SCHED, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_mac80211_reconfig_complete(struct ieee80211_hw *hw,</div><div class='add'>+				   enum ieee80211_reconfig_type reconfig_type)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+</div><div class='add'>+	switch (reconfig_type) {</div><div class='add'>+	case IEEE80211_RECONFIG_TYPE_RESTART:</div><div class='add'>+		mld-&gt;fw_status.in_hw_restart = false;</div><div class='add'>+		iwl_mld_send_recovery_cmd(mld, ERROR_RECOVERY_END_OF_RECOVERY);</div><div class='add'>+		iwl_trans_finish_sw_reset(mld-&gt;trans);</div><div class='add'>+		/* no need to lock, adding in parallel would schedule too */</div><div class='add'>+		if (!list_empty(&amp;mld-&gt;txqs_to_add))</div><div class='add'>+			wiphy_work_queue(mld-&gt;wiphy, &amp;mld-&gt;add_txqs_wk);</div><div class='add'>+</div><div class='add'>+		IWL_INFO(mld, "restart completed\n");</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_RECONFIG_TYPE_SUSPEND:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void iwl_mld_mac80211_mgd_prepare_tx(struct ieee80211_hw *hw,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     struct ieee80211_prep_tx_info *info)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	u32 duration = IWL_MLD_SESSION_PROTECTION_ASSOC_TIME_MS;</div><div class='add'>+</div><div class='add'>+	/* After a successful association the connection is established</div><div class='add'>+	 * and we can rely on the quota to send the disassociation frame.</div><div class='add'>+	 */</div><div class='add'>+	if (info-&gt;was_assoc)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;duration &gt; duration)</div><div class='add'>+		duration = info-&gt;duration;</div><div class='add'>+</div><div class='add'>+	iwl_mld_schedule_session_protection(mld, vif, duration,</div><div class='add'>+					    IWL_MLD_SESSION_PROTECTION_MIN_TIME_MS,</div><div class='add'>+					    info-&gt;link_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void iwl_mld_mac_mgd_complete_tx(struct ieee80211_hw *hw,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_prep_tx_info *info)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+</div><div class='add'>+	/* Successful authentication is the only case that requires to let</div><div class='add'>+	 * the session protection go. We'll need it for the upcoming</div><div class='add'>+	 * association. For all the other cases, we need to cancel the session</div><div class='add'>+	 * protection.</div><div class='add'>+	 * After successful association the connection is established and</div><div class='add'>+	 * further mgd tx can rely on the quota.</div><div class='add'>+	 */</div><div class='add'>+	if (info-&gt;success &amp;&amp; info-&gt;subtype == IEEE80211_STYPE_AUTH)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* The firmware will be on medium after we configure the vif as</div><div class='add'>+	 * associated. Removing the session protection allows the firmware</div><div class='add'>+	 * to stop being on medium. In order to ensure the continuity of our</div><div class='add'>+	 * presence on medium, we need first to configure the vif as associated</div><div class='add'>+	 * and only then, remove the session protection.</div><div class='add'>+	 * Currently, mac80211 calls vif_cfg_changed() first and then,</div><div class='add'>+	 * drv_mgd_complete_tx(). Ensure that this assumption stays true by</div><div class='add'>+	 * a warning.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON(info-&gt;success &amp;&amp;</div><div class='add'>+		(info-&gt;subtype == IEEE80211_STYPE_ASSOC_REQ ||</div><div class='add'>+		 info-&gt;subtype == IEEE80211_STYPE_REASSOC_REQ) &amp;&amp;</div><div class='add'>+		!vif-&gt;cfg.assoc);</div><div class='add'>+</div><div class='add'>+	iwl_mld_cancel_session_protection(mld, vif, info-&gt;link_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_mac80211_conf_tx(struct ieee80211_hw *hw,</div><div class='add'>+			 struct ieee80211_vif *vif,</div><div class='add'>+			 unsigned int link_id, u16 ac,</div><div class='add'>+			 const struct ieee80211_tx_queue_params *params)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld_link *link;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	link = iwl_mld_link_dereference_check(mld_vif, link_id);</div><div class='add'>+	if (!link)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	link-&gt;queue_params[ac] = *params;</div><div class='add'>+</div><div class='add'>+	/* No need to update right away, we'll get BSS_CHANGED_QOS</div><div class='add'>+	 * The exception is P2P_DEVICE interface which needs immediate update.</div><div class='add'>+	 */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE)</div><div class='add'>+		iwl_mld_change_link_in_fw(mld, &amp;vif-&gt;bss_conf,</div><div class='add'>+					  LINK_CONTEXT_MODIFY_QOS_PARAMS);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_set_uapsd(struct iwl_mld *mld, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	vif-&gt;driver_flags &amp;= ~IEEE80211_VIF_SUPPORTS_UAPSD;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;p2p &amp;&amp;</div><div class='add'>+	    !(iwlwifi_mod_params.uapsd_disable &amp; IWL_DISABLE_UAPSD_P2P_CLIENT))</div><div class='add'>+		vif-&gt;driver_flags |= IEEE80211_VIF_SUPPORTS_UAPSD;</div><div class='add'>+</div><div class='add'>+	if (!vif-&gt;p2p &amp;&amp;</div><div class='add'>+	    !(iwlwifi_mod_params.uapsd_disable &amp; IWL_DISABLE_UAPSD_BSS))</div><div class='add'>+		vif-&gt;driver_flags |= IEEE80211_VIF_SUPPORTS_UAPSD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_tdls_sta_count(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	int count = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; mld-&gt;fw-&gt;ucode_capa.num_stations; i++) {</div><div class='add'>+		struct ieee80211_link_sta *link_sta;</div><div class='add'>+</div><div class='add'>+		link_sta = wiphy_dereference(mld-&gt;wiphy,</div><div class='add'>+					     mld-&gt;fw_id_to_link_sta[i]);</div><div class='add'>+		if (IS_ERR_OR_NULL(link_sta))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!link_sta-&gt;sta-&gt;tdls)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_check_he_obss_narrow_bw_ru_iter(struct wiphy *wiphy,</div><div class='add'>+						    struct cfg80211_bss *bss,</div><div class='add'>+						    void *_data)</div><div class='add'>+{</div><div class='add'>+	bool *tolerated = _data;</div><div class='add'>+	const struct cfg80211_bss_ies *ies;</div><div class='add'>+	const struct element *elem;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ies = rcu_dereference(bss-&gt;ies);</div><div class='add'>+	elem = cfg80211_find_elem(WLAN_EID_EXT_CAPABILITY, ies-&gt;data,</div><div class='add'>+				  ies-&gt;len);</div><div class='add'>+</div><div class='add'>+	if (!elem || elem-&gt;datalen &lt; 10 ||</div><div class='add'>+	    !(elem-&gt;data[10] &amp;</div><div class='add'>+	      WLAN_EXT_CAPA10_OBSS_NARROW_BW_RU_TOLERANCE_SUPPORT)) {</div><div class='add'>+		*tolerated = false;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_check_he_obss_narrow_bw_ru(struct iwl_mld *mld,</div><div class='add'>+				   struct iwl_mld_link *mld_link,</div><div class='add'>+				   struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	bool tolerated = true;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!link_conf-&gt;chanreq.oper.chan))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!(link_conf-&gt;chanreq.oper.chan-&gt;flags &amp; IEEE80211_CHAN_RADAR)) {</div><div class='add'>+		mld_link-&gt;he_ru_2mhz_block = false;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cfg80211_bss_iter(mld-&gt;wiphy, &amp;link_conf-&gt;chanreq.oper,</div><div class='add'>+			  iwl_mld_check_he_obss_narrow_bw_ru_iter, &amp;tolerated);</div><div class='add'>+</div><div class='add'>+	/* If there is at least one AP on radar channel that cannot</div><div class='add'>+	 * tolerate 26-tone RU UL OFDMA transmissions using HE TB PPDU.</div><div class='add'>+	 */</div><div class='add'>+	mld_link-&gt;he_ru_2mhz_block = !tolerated;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_link_set_2mhz_block(struct iwl_mld *mld,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+</div><div class='add'>+	for_each_sta_active_link(vif, sta, link_sta, link_id) {</div><div class='add'>+		struct ieee80211_bss_conf *link_conf =</div><div class='add'>+			link_conf_dereference_protected(vif, link_id);</div><div class='add'>+		struct iwl_mld_link *mld_link =</div><div class='add'>+			iwl_mld_link_from_mac80211(link_conf);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!link_conf || !mld_link))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (link_sta-&gt;he_cap.has_he)</div><div class='add'>+			iwl_mld_check_he_obss_narrow_bw_ru(mld, mld_link,</div><div class='add'>+							   link_conf);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_move_sta_state_up(struct iwl_mld *mld,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     struct ieee80211_sta *sta,</div><div class='add'>+				     enum ieee80211_sta_state old_state,</div><div class='add'>+				     enum ieee80211_sta_state new_state)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	int tdls_count = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (old_state == IEEE80211_STA_NOTEXIST &amp;&amp;</div><div class='add'>+	    new_state == IEEE80211_STA_NONE) {</div><div class='add'>+		if (sta-&gt;tdls) {</div><div class='add'>+			if (vif-&gt;p2p || hweight8(mld-&gt;used_phy_ids) != 1)</div><div class='add'>+				return -EBUSY;</div><div class='add'>+</div><div class='add'>+			tdls_count = iwl_mld_tdls_sta_count(mld);</div><div class='add'>+			if (tdls_count &gt;= IWL_TDLS_STA_COUNT)</div><div class='add'>+				return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = iwl_mld_add_sta(mld, sta, vif, STATION_TYPE_PEER);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* just added first TDLS STA, so disable PM */</div><div class='add'>+		if (sta-&gt;tdls &amp;&amp; tdls_count == 0)</div><div class='add'>+			iwl_mld_update_mac_power(mld, vif, false);</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; !sta-&gt;tdls)</div><div class='add'>+			mld_vif-&gt;ap_sta = sta;</div><div class='add'>+</div><div class='add'>+		/* Initialize TLC here already - this really tells</div><div class='add'>+		 * the firmware only what the supported legacy rates are</div><div class='add'>+		 * (may be) since it's initialized already from what the</div><div class='add'>+		 * AP advertised in the beacon/probe response. This will</div><div class='add'>+		 * allow the firmware to send auth/assoc frames with one</div><div class='add'>+		 * of the supported rates already, rather than having to</div><div class='add'>+		 * use a mandatory rate.</div><div class='add'>+		 * If we're the AP, we'll just assume mandatory rates at</div><div class='add'>+		 * this point, but we know nothing about the STA anyway.</div><div class='add'>+		 */</div><div class='add'>+		iwl_mld_config_tlc(mld, vif, sta);</div><div class='add'>+</div><div class='add'>+		return ret;</div><div class='add'>+	} else if (old_state == IEEE80211_STA_NONE &amp;&amp;</div><div class='add'>+		   new_state == IEEE80211_STA_AUTH) {</div><div class='add'>+		iwl_mld_set_uapsd(mld, vif);</div><div class='add'>+		return 0;</div><div class='add'>+	} else if (old_state == IEEE80211_STA_AUTH &amp;&amp;</div><div class='add'>+		   new_state == IEEE80211_STA_ASSOC) {</div><div class='add'>+		ret = iwl_mld_update_all_link_stations(mld, sta);</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+			iwl_mld_link_set_2mhz_block(mld, vif, sta);</div><div class='add'>+		/* Now the link_sta's capabilities are set, update the FW */</div><div class='add'>+		iwl_mld_config_tlc(mld, vif, sta);</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_AP) {</div><div class='add'>+			/* Update MAC_CFG_FILTER_ACCEPT_BEACON if at least</div><div class='add'>+			 * one sta is associated</div><div class='add'>+			 */</div><div class='add'>+			if (++mld_vif-&gt;num_associated_stas == 1)</div><div class='add'>+				ret = iwl_mld_mac_fw_action(mld, vif,</div><div class='add'>+							    FW_CTXT_ACTION_MODIFY);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return ret;</div><div class='add'>+	} else if (old_state == IEEE80211_STA_ASSOC &amp;&amp;</div><div class='add'>+		   new_state == IEEE80211_STA_AUTHORIZED) {</div><div class='add'>+		ret = 0;</div><div class='add'>+</div><div class='add'>+		if (!sta-&gt;tdls) {</div><div class='add'>+			mld_vif-&gt;authorized = true;</div><div class='add'>+</div><div class='add'>+			/* Ensure any block due to a non-BSS link is synced */</div><div class='add'>+			iwl_mld_emlsr_check_non_bss_block(mld, 0);</div><div class='add'>+</div><div class='add'>+			/* Block EMLSR until a certain throughput it reached */</div><div class='add'>+			if (!mld-&gt;fw_status.in_hw_restart &amp;&amp;</div><div class='add'>+			    IWL_MLD_ENTER_EMLSR_TPT_THRESH &gt; 0)</div><div class='add'>+				iwl_mld_block_emlsr(mld_vif-&gt;mld, vif,</div><div class='add'>+						    IWL_MLD_EMLSR_BLOCKED_TPT,</div><div class='add'>+						    0);</div><div class='add'>+</div><div class='add'>+			/* clear COEX_HIGH_PRIORITY_ENABLE */</div><div class='add'>+			ret = iwl_mld_mac_fw_action(mld, vif,</div><div class='add'>+						    FW_CTXT_ACTION_MODIFY);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+			iwl_mld_smps_workaround(mld, vif, vif-&gt;cfg.ps);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* MFP is set by default before the station is authorized.</div><div class='add'>+		 * Clear it here in case it's not used.</div><div class='add'>+		 */</div><div class='add'>+		if (!sta-&gt;mfp)</div><div class='add'>+			ret = iwl_mld_update_all_link_stations(mld, sta);</div><div class='add'>+</div><div class='add'>+		/* We can use wide bandwidth now, not only 20 MHz */</div><div class='add'>+		iwl_mld_config_tlc(mld, vif, sta);</div><div class='add'>+</div><div class='add'>+		return ret;</div><div class='add'>+	} else {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_move_sta_state_down(struct iwl_mld *mld,</div><div class='add'>+				       struct ieee80211_vif *vif,</div><div class='add'>+				       struct ieee80211_sta *sta,</div><div class='add'>+				       enum ieee80211_sta_state old_state,</div><div class='add'>+				       enum ieee80211_sta_state new_state)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	if (old_state == IEEE80211_STA_AUTHORIZED &amp;&amp;</div><div class='add'>+	    new_state == IEEE80211_STA_ASSOC) {</div><div class='add'>+		if (!sta-&gt;tdls) {</div><div class='add'>+			mld_vif-&gt;authorized = false;</div><div class='add'>+</div><div class='add'>+			memset(&amp;mld_vif-&gt;emlsr.zeroed_on_not_authorized, 0,</div><div class='add'>+			       sizeof(mld_vif-&gt;emlsr.zeroed_on_not_authorized));</div><div class='add'>+</div><div class='add'>+			wiphy_delayed_work_cancel(mld-&gt;wiphy,</div><div class='add'>+						  &amp;mld_vif-&gt;emlsr.prevent_done_wk);</div><div class='add'>+			wiphy_delayed_work_cancel(mld-&gt;wiphy,</div><div class='add'>+						  &amp;mld_vif-&gt;emlsr.tmp_non_bss_done_wk);</div><div class='add'>+			wiphy_work_cancel(mld-&gt;wiphy, &amp;mld_vif-&gt;emlsr.unblock_tpt_wk);</div><div class='add'>+			wiphy_delayed_work_cancel(mld-&gt;wiphy,</div><div class='add'>+						  &amp;mld_vif-&gt;emlsr.check_tpt_wk);</div><div class='add'>+</div><div class='add'>+			iwl_mld_reset_cca_40mhz_workaround(mld, vif);</div><div class='add'>+			iwl_mld_smps_workaround(mld, vif, true);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* once we move into assoc state, need to update the FW to</div><div class='add'>+		 * stop using wide bandwidth</div><div class='add'>+		 */</div><div class='add'>+		iwl_mld_config_tlc(mld, vif, sta);</div><div class='add'>+	} else if (old_state == IEEE80211_STA_ASSOC &amp;&amp;</div><div class='add'>+		   new_state == IEEE80211_STA_AUTH) {</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+		    !WARN_ON(!mld_vif-&gt;num_associated_stas)) {</div><div class='add'>+			/* Update MAC_CFG_FILTER_ACCEPT_BEACON if the last sta</div><div class='add'>+			 * is disassociating</div><div class='add'>+			 */</div><div class='add'>+			if (--mld_vif-&gt;num_associated_stas == 0)</div><div class='add'>+				iwl_mld_mac_fw_action(mld, vif,</div><div class='add'>+						      FW_CTXT_ACTION_MODIFY);</div><div class='add'>+		}</div><div class='add'>+	} else if (old_state == IEEE80211_STA_AUTH &amp;&amp;</div><div class='add'>+		   new_state == IEEE80211_STA_NONE) {</div><div class='add'>+		/* nothing */</div><div class='add'>+	} else if (old_state == IEEE80211_STA_NONE &amp;&amp;</div><div class='add'>+		   new_state == IEEE80211_STA_NOTEXIST) {</div><div class='add'>+		iwl_mld_remove_sta(mld, sta);</div><div class='add'>+</div><div class='add'>+		if (sta-&gt;tdls &amp;&amp; iwl_mld_tdls_sta_count(mld) == 0) {</div><div class='add'>+			/* just removed last TDLS STA, so enable PM */</div><div class='add'>+			iwl_mld_update_mac_power(mld, vif, false);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_mac80211_sta_state(struct ieee80211_hw *hw,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      struct ieee80211_sta *sta,</div><div class='add'>+				      enum ieee80211_sta_state old_state,</div><div class='add'>+				      enum ieee80211_sta_state new_state)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(mld, "station %pM state change %d-&gt;%d\n",</div><div class='add'>+			   sta-&gt;addr, old_state, new_state);</div><div class='add'>+</div><div class='add'>+	mld_sta-&gt;sta_state = new_state;</div><div class='add'>+</div><div class='add'>+	if (old_state &lt; new_state)</div><div class='add'>+		return iwl_mld_move_sta_state_up(mld, vif, sta, old_state,</div><div class='add'>+						 new_state);</div><div class='add'>+	else</div><div class='add'>+		return iwl_mld_move_sta_state_down(mld, vif, sta, old_state,</div><div class='add'>+						   new_state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_mac80211_flush(struct ieee80211_hw *hw,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   u32 queues, bool drop)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+</div><div class='add'>+	/* Make sure we're done with the deferred traffic before flushing */</div><div class='add'>+	iwl_mld_add_txq_list(mld);</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; mld-&gt;fw-&gt;ucode_capa.num_stations; i++) {</div><div class='add'>+		struct ieee80211_link_sta *link_sta =</div><div class='add'>+			wiphy_dereference(mld-&gt;wiphy,</div><div class='add'>+					  mld-&gt;fw_id_to_link_sta[i]);</div><div class='add'>+</div><div class='add'>+		if (IS_ERR_OR_NULL(link_sta))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Check that the sta belongs to the given vif */</div><div class='add'>+		if (vif &amp;&amp; vif != iwl_mld_sta_from_mac80211(link_sta-&gt;sta)-&gt;vif)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (drop)</div><div class='add'>+			iwl_mld_flush_sta_txqs(mld, link_sta-&gt;sta);</div><div class='add'>+		else</div><div class='add'>+			iwl_mld_wait_sta_txqs_empty(mld, link_sta-&gt;sta);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_mac80211_flush_sta(struct ieee80211_hw *hw,</div><div class='add'>+				       struct ieee80211_vif *vif,</div><div class='add'>+				       struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+</div><div class='add'>+	iwl_mld_flush_sta_txqs(mld, sta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_mac80211_ampdu_action(struct ieee80211_hw *hw,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      struct ieee80211_ampdu_params *params)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct ieee80211_sta *sta = params-&gt;sta;</div><div class='add'>+	enum ieee80211_ampdu_mlme_action action = params-&gt;action;</div><div class='add'>+	u16 tid = params-&gt;tid;</div><div class='add'>+	u16 ssn = params-&gt;ssn;</div><div class='add'>+	u16 buf_size = params-&gt;buf_size;</div><div class='add'>+	u16 timeout = params-&gt;timeout;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_HT(mld, "A-MPDU action on addr %pM tid: %d action: %d\n",</div><div class='add'>+		     sta-&gt;addr, tid, action);</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case IEEE80211_AMPDU_RX_START:</div><div class='add'>+		if (!iwl_enable_rx_ampdu()) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ret = iwl_mld_ampdu_rx_start(mld, sta, tid, ssn, buf_size,</div><div class='add'>+					     timeout);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_RX_STOP:</div><div class='add'>+		ret = iwl_mld_ampdu_rx_stop(mld, sta, tid);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* The mac80211 TX_AMPDU_SETUP_IN_HW flag is set for all</div><div class='add'>+		 * devices, since all support TX A-MPDU offload in hardware.</div><div class='add'>+		 * Therefore, no TX action should be requested here.</div><div class='add'>+		 */</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_can_hw_csum(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	u8 protocol = ip_hdr(skb)-&gt;protocol;</div><div class='add'>+</div><div class='add'>+	return protocol == IPPROTO_TCP || protocol == IPPROTO_UDP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_mac80211_can_aggregate(struct ieee80211_hw *hw,</div><div class='add'>+					   struct sk_buff *head,</div><div class='add'>+					   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ENABLED(CONFIG_INET))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* For now don't aggregate IPv6 in AMSDU */</div><div class='add'>+	if (skb-&gt;protocol != htons(ETH_P_IP))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Allow aggregation only if both frames have the same HW csum offload</div><div class='add'>+	 * capability, ensuring consistent HW or SW csum handling in A-MSDU.</div><div class='add'>+	 */</div><div class='add'>+	return iwl_mld_can_hw_csum(skb) == iwl_mld_can_hw_csum(head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_mac80211_sync_rx_queues(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+</div><div class='add'>+	iwl_mld_sync_rx_queues(mld, IWL_MLD_RXQ_EMPTY, NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_sta_rc_update(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  struct ieee80211_link_sta *link_sta,</div><div class='add'>+				  u32 changed)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+</div><div class='add'>+	if (changed &amp; (IEEE80211_RC_BW_CHANGED |</div><div class='add'>+		       IEEE80211_RC_SUPP_RATES_CHANGED |</div><div class='add'>+		       IEEE80211_RC_NSS_CHANGED)) {</div><div class='add'>+		struct ieee80211_bss_conf *link =</div><div class='add'>+			link_conf_dereference_check(vif, link_sta-&gt;link_id);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!link))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		iwl_mld_config_tlc_link(mld, vif, link, link_sta);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static void iwl_mld_set_wakeup(struct ieee80211_hw *hw, bool enabled)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+</div><div class='add'>+	device_set_wakeup_enable(mld-&gt;trans-&gt;dev, enabled);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Returns 0 on success. 1 if failed to suspend with wowlan:</div><div class='add'>+ * If the circumstances didn't satisfy the conditions for suspension</div><div class='add'>+ * with wowlan, mac80211 would use the no_wowlan flow.</div><div class='add'>+ * If an error had occurred we update the trans status and state here</div><div class='add'>+ * and the result will be stopping the FW.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+iwl_mld_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	iwl_fw_runtime_suspend(&amp;mld-&gt;fwrt);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_wowlan_suspend(mld, wowlan);</div><div class='add'>+	if (ret)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_no_wowlan_suspend(mld))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_resume(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_wowlan_resume(mld);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	iwl_fw_runtime_resume(&amp;mld-&gt;fwrt);</div><div class='add'>+</div><div class='add'>+	iwl_mld_low_latency_restart(mld);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int iwl_mld_alloc_ptk_pn(struct iwl_mld *mld,</div><div class='add'>+				struct iwl_mld_sta *mld_sta,</div><div class='add'>+				struct ieee80211_key_conf *key,</div><div class='add'>+				struct iwl_mld_ptk_pn **ptk_pn)</div><div class='add'>+{</div><div class='add'>+	u8 num_rx_queues = mld-&gt;trans-&gt;info.num_rxqs;</div><div class='add'>+	int keyidx = key-&gt;keyidx;</div><div class='add'>+	struct ieee80211_key_seq seq;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(keyidx &gt;= ARRAY_SIZE(mld_sta-&gt;ptk_pn)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	WARN_ON(rcu_access_pointer(mld_sta-&gt;ptk_pn[keyidx]));</div><div class='add'>+	*ptk_pn = kzalloc(struct_size(*ptk_pn, q, num_rx_queues),</div><div class='add'>+			  GFP_KERNEL);</div><div class='add'>+	if (!*ptk_pn)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (u8 tid = 0; tid &lt; IWL_MAX_TID_COUNT; tid++) {</div><div class='add'>+		ieee80211_get_key_rx_seq(key, tid, &amp;seq);</div><div class='add'>+		for (u8 q = 0; q &lt; num_rx_queues; q++)</div><div class='add'>+			memcpy((*ptk_pn)-&gt;q[q].pn[tid], seq.ccmp.pn,</div><div class='add'>+			       IEEE80211_CCMP_PN_LEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(mld_sta-&gt;ptk_pn[keyidx], *ptk_pn);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_set_key_add(struct iwl_mld *mld,</div><div class='add'>+			       struct ieee80211_vif *vif,</div><div class='add'>+			       struct ieee80211_sta *sta,</div><div class='add'>+			       struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld_sta *mld_sta =</div><div class='add'>+		sta ? iwl_mld_sta_from_mac80211(sta) : NULL;</div><div class='add'>+	struct iwl_mld_ptk_pn *ptk_pn = NULL;</div><div class='add'>+	int keyidx = key-&gt;keyidx;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Will be set to 0 if added successfully */</div><div class='add'>+	key-&gt;hw_key_idx = STA_KEY_IDX_INVALID;</div><div class='add'>+</div><div class='add'>+	switch (key-&gt;cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP40:</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP104:</div><div class='add'>+		IWL_DEBUG_MAC80211(mld, "Use SW encryption for WEP\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='add'>+			key-&gt;flags |= IEEE80211_KEY_FLAG_PUT_MIC_SPACE;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		IWL_DEBUG_MAC80211(mld, "Use SW encryption for TKIP\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='add'>+	case WLAN_CIPHER_SUITE_AES_CMAC:</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_GMAC_128:</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_GMAC_256:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (keyidx == 6 || keyidx == 7)</div><div class='add'>+		iwl_mld_track_bigtk(mld, vif, key, true);</div><div class='add'>+</div><div class='add'>+	/* After exiting from RFKILL, hostapd configures GTK/ITGK before the</div><div class='add'>+	 * AP is started, but those keys can't be sent to the FW before the</div><div class='add'>+	 * MCAST/BCAST STAs are added to it (which happens upon AP start).</div><div class='add'>+	 * Store it here to be sent later when the AP is started.</div><div class='add'>+	 */</div><div class='add'>+	if ((vif-&gt;type == NL80211_IFTYPE_ADHOC ||</div><div class='add'>+	     vif-&gt;type == NL80211_IFTYPE_AP) &amp;&amp; !sta &amp;&amp;</div><div class='add'>+	     !mld_vif-&gt;ap_ibss_active)</div><div class='add'>+		return iwl_mld_store_ap_early_key(mld, key, mld_vif);</div><div class='add'>+</div><div class='add'>+	if (!mld-&gt;fw_status.in_hw_restart &amp;&amp; mld_sta &amp;&amp;</div><div class='add'>+	    key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE &amp;&amp;</div><div class='add'>+	    (key-&gt;cipher == WLAN_CIPHER_SUITE_CCMP ||</div><div class='add'>+	     key-&gt;cipher == WLAN_CIPHER_SUITE_GCMP ||</div><div class='add'>+	     key-&gt;cipher == WLAN_CIPHER_SUITE_GCMP_256)) {</div><div class='add'>+		ret = iwl_mld_alloc_ptk_pn(mld, mld_sta, key, &amp;ptk_pn);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(mld, "set hwcrypto key (sta:%pM, id:%d)\n",</div><div class='add'>+			   sta ? sta-&gt;addr : NULL, keyidx);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_add_key(mld, vif, sta, key);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_WARN(mld, "set key failed (%d)\n", ret);</div><div class='add'>+		if (ptk_pn) {</div><div class='add'>+			RCU_INIT_POINTER(mld_sta-&gt;ptk_pn[keyidx], NULL);</div><div class='add'>+			kfree(ptk_pn);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_set_key_remove(struct iwl_mld *mld,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_sta *sta,</div><div class='add'>+				   struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld_sta *mld_sta =</div><div class='add'>+		sta ? iwl_mld_sta_from_mac80211(sta) : NULL;</div><div class='add'>+	int keyidx = key-&gt;keyidx;</div><div class='add'>+</div><div class='add'>+	if (keyidx == 6 || keyidx == 7)</div><div class='add'>+		iwl_mld_track_bigtk(mld, vif, key, false);</div><div class='add'>+</div><div class='add'>+	if (mld_sta &amp;&amp; key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE &amp;&amp;</div><div class='add'>+	    (key-&gt;cipher == WLAN_CIPHER_SUITE_CCMP ||</div><div class='add'>+	     key-&gt;cipher == WLAN_CIPHER_SUITE_GCMP ||</div><div class='add'>+	     key-&gt;cipher == WLAN_CIPHER_SUITE_GCMP_256)) {</div><div class='add'>+		struct iwl_mld_ptk_pn *ptk_pn;</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(keyidx &gt;= ARRAY_SIZE(mld_sta-&gt;ptk_pn)))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		ptk_pn = wiphy_dereference(mld-&gt;wiphy,</div><div class='add'>+					   mld_sta-&gt;ptk_pn[keyidx]);</div><div class='add'>+		RCU_INIT_POINTER(mld_sta-&gt;ptk_pn[keyidx], NULL);</div><div class='add'>+		if (!WARN_ON(!ptk_pn))</div><div class='add'>+			kfree_rcu(ptk_pn, rcu_head);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if this key was stored to be added later to the FW - free it here */</div><div class='add'>+	if (!(key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE))</div><div class='add'>+		iwl_mld_free_ap_early_key(mld, key, mld_vif);</div><div class='add'>+</div><div class='add'>+	/* We already removed it */</div><div class='add'>+	if (key-&gt;hw_key_idx == STA_KEY_IDX_INVALID)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(mld, "disable hwcrypto key\n");</div><div class='add'>+</div><div class='add'>+	iwl_mld_remove_key(mld, vif, sta, key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_mac80211_set_key(struct ieee80211_hw *hw,</div><div class='add'>+				    enum set_key_cmd cmd,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct ieee80211_sta *sta,</div><div class='add'>+				    struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SET_KEY:</div><div class='add'>+		ret = iwl_mld_set_key_add(mld, vif, sta, key);</div><div class='add'>+		if (ret)</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	case DISABLE_KEY:</div><div class='add'>+		iwl_mld_set_key_remove(mld, vif, sta, key);</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_pre_channel_switch(struct ieee80211_hw *hw,</div><div class='add'>+			   struct ieee80211_vif *vif,</div><div class='add'>+			   struct ieee80211_channel_switch *chsw)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld_link *mld_link =</div><div class='add'>+		iwl_mld_link_dereference_check(mld_vif, chsw-&gt;link_id);</div><div class='add'>+	u8 primary;</div><div class='add'>+	int selected;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mld_link))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(mld, "pre CSA to freq %d\n",</div><div class='add'>+			   chsw-&gt;chandef.center_freq1);</div><div class='add'>+</div><div class='add'>+	if (!iwl_mld_emlsr_active(vif))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	primary = iwl_mld_get_primary_link(vif);</div><div class='add'>+</div><div class='add'>+	/* stay on the primary link unless it is undergoing a CSA with quiet */</div><div class='add'>+	if (chsw-&gt;link_id == primary &amp;&amp; chsw-&gt;block_tx)</div><div class='add'>+		selected = iwl_mld_get_other_link(vif, primary);</div><div class='add'>+	else</div><div class='add'>+		selected = primary;</div><div class='add'>+</div><div class='add'>+	/* Remember to tell the firmware that this link can't tx</div><div class='add'>+	 * Note that this logic seems to be unrelated to emlsr, but it</div><div class='add'>+	 * really is needed only when emlsr is active. When we have a</div><div class='add'>+	 * single link, the firmware will handle all this on its own.</div><div class='add'>+	 * In multi-link scenarios, we can learn about the CSA from</div><div class='add'>+	 * another link and this logic is too complex for the firmware</div><div class='add'>+	 * to track.</div><div class='add'>+	 * Since we want to de-activate the link that got a CSA with mode=1,</div><div class='add'>+	 * we need to tell the firmware not to send any frame on that link</div><div class='add'>+	 * as the firmware may not be aware that link is under a CSA</div><div class='add'>+	 * with mode=1 (no Tx allowed).</div><div class='add'>+	 */</div><div class='add'>+	mld_link-&gt;silent_deactivation = chsw-&gt;block_tx;</div><div class='add'>+	iwl_mld_exit_emlsr(mld, vif, IWL_MLD_EMLSR_EXIT_CSA, selected);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_channel_switch(struct ieee80211_hw *hw,</div><div class='add'>+		       struct ieee80211_vif *vif,</div><div class='add'>+		       struct ieee80211_channel_switch *chsw)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+</div><div class='add'>+	/* By implementing this operation, we prevent mac80211 from</div><div class='add'>+	 * starting its own channel switch timer, so that we can call</div><div class='add'>+	 * ieee80211_chswitch_done() ourselves at the right time</div><div class='add'>+	 * (Upon receiving the channel_switch_start notification from the fw)</div><div class='add'>+	 */</div><div class='add'>+	IWL_DEBUG_MAC80211(mld,</div><div class='add'>+			   "dummy channel switch op\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_post_channel_switch(struct ieee80211_hw *hw,</div><div class='add'>+			    struct ieee80211_vif *vif,</div><div class='add'>+			    struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct iwl_mld_link *mld_link = iwl_mld_link_from_mac80211(link_conf);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	WARN_ON(mld_link-&gt;silent_deactivation);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_abort_channel_switch(struct ieee80211_hw *hw,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct iwl_mld_link *mld_link = iwl_mld_link_from_mac80211(link_conf);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(mld,</div><div class='add'>+			   "abort channel switch op\n");</div><div class='add'>+	mld_link-&gt;silent_deactivation = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_switch_vif_chanctx_swap(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif_chanctx_switch *vifs)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	iwl_mld_unassign_vif_chanctx(hw, vifs[0].vif, vifs[0].link_conf,</div><div class='add'>+				     vifs[0].old_ctx);</div><div class='add'>+	iwl_mld_remove_chanctx(hw, vifs[0].old_ctx);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_add_chanctx(hw, vifs[0].new_ctx);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mld, "failed to add new_ctx during channel switch\n");</div><div class='add'>+		goto out_reassign;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_assign_vif_chanctx(hw, vifs[0].vif, vifs[0].link_conf,</div><div class='add'>+					 vifs[0].new_ctx);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mld,</div><div class='add'>+			"failed to assign new_ctx during channel switch\n");</div><div class='add'>+		goto out_remove;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ out_remove:</div><div class='add'>+	iwl_mld_remove_chanctx(hw, vifs[0].new_ctx);</div><div class='add'>+ out_reassign:</div><div class='add'>+	if (iwl_mld_add_chanctx(hw, vifs[0].old_ctx)) {</div><div class='add'>+		IWL_ERR(mld, "failed to add old_ctx after failure\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_assign_vif_chanctx(hw, vifs[0].vif, vifs[0].link_conf,</div><div class='add'>+				       vifs[0].old_ctx))</div><div class='add'>+		IWL_ERR(mld, "failed to reassign old_ctx after failure\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_switch_vif_chanctx_reassign(struct ieee80211_hw *hw,</div><div class='add'>+				    struct ieee80211_vif_chanctx_switch *vifs)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	iwl_mld_unassign_vif_chanctx(hw, vifs[0].vif, vifs[0].link_conf,</div><div class='add'>+				     vifs[0].old_ctx);</div><div class='add'>+	ret = iwl_mld_assign_vif_chanctx(hw, vifs[0].vif, vifs[0].link_conf,</div><div class='add'>+					 vifs[0].new_ctx);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mld,</div><div class='add'>+			"failed to assign new_ctx during channel switch\n");</div><div class='add'>+		goto out_reassign;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_reassign:</div><div class='add'>+	if (iwl_mld_assign_vif_chanctx(hw, vifs[0].vif, vifs[0].link_conf,</div><div class='add'>+				       vifs[0].old_ctx))</div><div class='add'>+		IWL_ERR(mld, "failed to reassign old_ctx after failure\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_switch_vif_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+			   struct ieee80211_vif_chanctx_switch *vifs,</div><div class='add'>+			   int n_vifs,</div><div class='add'>+			   enum ieee80211_chanctx_switch_mode mode)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* we only support a single-vif right now */</div><div class='add'>+	if (n_vifs &gt; 1)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case CHANCTX_SWMODE_SWAP_CONTEXTS:</div><div class='add'>+		ret = iwl_mld_switch_vif_chanctx_swap(hw, vifs);</div><div class='add'>+		break;</div><div class='add'>+	case CHANCTX_SWMODE_REASSIGN_VIF:</div><div class='add'>+		ret = iwl_mld_switch_vif_chanctx_reassign(hw, vifs);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_sta_pre_rcu_remove(struct ieee80211_hw *hw,</div><div class='add'>+				       struct ieee80211_vif *vif,</div><div class='add'>+				       struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld_link_sta *mld_link_sta;</div><div class='add'>+	u8 link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* This is called before mac80211 does RCU synchronisation,</div><div class='add'>+	 * so here we already invalidate our internal RCU-protected</div><div class='add'>+	 * station pointer. The rest of the code will thus no longer</div><div class='add'>+	 * be able to find the station this way, and we don't rely</div><div class='add'>+	 * on further RCU synchronisation after the sta_state()</div><div class='add'>+	 * callback deleted the station.</div><div class='add'>+	 */</div><div class='add'>+	for_each_mld_link_sta(mld_sta, mld_link_sta, link_id)</div><div class='add'>+		RCU_INIT_POINTER(mld-&gt;fw_id_to_link_sta[mld_link_sta-&gt;fw_id],</div><div class='add'>+				 NULL);</div><div class='add'>+</div><div class='add'>+	if (sta == mld_vif-&gt;ap_sta)</div><div class='add'>+		mld_vif-&gt;ap_sta = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_mac80211_mgd_protect_tdls_discover(struct ieee80211_hw *hw,</div><div class='add'>+					   struct ieee80211_vif *vif,</div><div class='add'>+					   unsigned int link_id)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	u32 duration;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	link_conf = wiphy_dereference(hw-&gt;wiphy, vif-&gt;link_conf[link_id]);</div><div class='add'>+	if (WARN_ON_ONCE(!link_conf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Protect the session to hear the TDLS setup response on the channel */</div><div class='add'>+</div><div class='add'>+	duration = 2 * link_conf-&gt;dtim_period * link_conf-&gt;beacon_int;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_start_session_protection(mld, vif, duration, duration,</div><div class='add'>+					       link_id, HZ / 5);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mld,</div><div class='add'>+			"Failed to start session protection for TDLS: %d\n",</div><div class='add'>+			ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_can_activate_links(struct ieee80211_hw *hw,</div><div class='add'>+				       struct ieee80211_vif *vif,</div><div class='add'>+				       u16 desired_links)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	int n_links = hweight16(desired_links);</div><div class='add'>+</div><div class='add'>+	/* Check if HW supports the wanted number of links */</div><div class='add'>+	return n_links &lt;= iwl_mld_max_active_links(mld, vif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_change_vif_links(struct ieee80211_hw *hw,</div><div class='add'>+			 struct ieee80211_vif *vif,</div><div class='add'>+			 u16 old_links, u16 new_links,</div><div class='add'>+			 struct ieee80211_bss_conf *old[IEEE80211_MLD_MAX_NUM_LINKS])</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	u16 removed = old_links &amp; ~new_links;</div><div class='add'>+	u16 added = new_links &amp; ~old_links;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * No bits designate non-MLO mode. We can handle MLO exit/enter by</div><div class='add'>+	 * simply mapping that to link ID zero internally.</div><div class='add'>+	 * Note that mac80211 does such a non-MLO to MLO switch during restart</div><div class='add'>+	 * if it was in MLO before. In that case, we do not have a link to</div><div class='add'>+	 * remove.</div><div class='add'>+	 */</div><div class='add'>+	if (old_links == 0 &amp;&amp; !mld-&gt;fw_status.in_hw_restart)</div><div class='add'>+		removed |= BIT(0);</div><div class='add'>+</div><div class='add'>+	if (new_links == 0)</div><div class='add'>+		added |= BIT(0);</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; IEEE80211_MLD_MAX_NUM_LINKS; i++) {</div><div class='add'>+		if (removed &amp; BIT(i) &amp;&amp; !WARN_ON(!old[i]))</div><div class='add'>+			iwl_mld_remove_link(mld, old[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; IEEE80211_MLD_MAX_NUM_LINKS; i++) {</div><div class='add'>+		if (added &amp; BIT(i)) {</div><div class='add'>+			link_conf = link_conf_dereference_protected(vif, i);</div><div class='add'>+			if (!link_conf) {</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto remove_added_links;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			err = iwl_mld_add_link(mld, link_conf);</div><div class='add'>+			if (err)</div><div class='add'>+				goto remove_added_links;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ensure we always have a valid primary_link. When using multiple</div><div class='add'>+	 * links the proper value is set in assign_vif_chanctx.</div><div class='add'>+	 */</div><div class='add'>+	mld_vif-&gt;emlsr.primary = new_links ? __ffs(new_links) : 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Special MLO restart case. We did not have a link when the interface</div><div class='add'>+	 * was added, so do the power configuration now.</div><div class='add'>+	 */</div><div class='add'>+	if (old_links == 0 &amp;&amp; mld-&gt;fw_status.in_hw_restart)</div><div class='add'>+		iwl_mld_update_mac_power(mld, vif, false);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+remove_added_links:</div><div class='add'>+	for (int i = 0; i &lt; IEEE80211_MLD_MAX_NUM_LINKS; i++) {</div><div class='add'>+		if (!(added &amp; BIT(i)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		link_conf = link_conf_dereference_protected(vif, i);</div><div class='add'>+		if (!link_conf || !iwl_mld_link_from_mac80211(link_conf))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		iwl_mld_remove_link(mld, link_conf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!iwl_mld_error_before_recovery(mld)))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* reconfig will fix us anyway */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_change_sta_links(struct ieee80211_hw *hw,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct ieee80211_sta *sta,</div><div class='add'>+				    u16 old_links, u16 new_links)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+</div><div class='add'>+	return iwl_mld_update_link_stas(mld, vif, sta, old_links, new_links);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_mac80211_join_ibss(struct ieee80211_hw *hw,</div><div class='add'>+				      struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	return iwl_mld_start_ap_ibss(hw, vif, &amp;vif-&gt;bss_conf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_mac80211_leave_ibss(struct ieee80211_hw *hw,</div><div class='add'>+					struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	return iwl_mld_stop_ap_ibss(hw, vif, &amp;vif-&gt;bss_conf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_mac80211_tx_last_beacon(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+</div><div class='add'>+	return mld-&gt;ibss_manager;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_prep_add_interface(struct ieee80211_hw *hw,</div><div class='add'>+				       enum nl80211_iftype type)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(mld, "prep_add_interface: type=%u\n", type);</div><div class='add'>+</div><div class='add'>+	if (!(type == NL80211_IFTYPE_AP ||</div><div class='add'>+	      type == NL80211_IFTYPE_P2P_GO ||</div><div class='add'>+	      type == NL80211_IFTYPE_P2P_CLIENT))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mld_emlsr_block_tmp_non_bss(mld);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_set_hw_timestamp(struct ieee80211_hw *hw,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct cfg80211_set_hw_timestamp *hwts)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	u32 protocols = 0;</div><div class='add'>+</div><div class='add'>+	/* HW timestamping is only supported for a specific station */</div><div class='add'>+	if (!hwts-&gt;macaddr)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (hwts-&gt;enable)</div><div class='add'>+		protocols =</div><div class='add'>+			IWL_TIME_SYNC_PROTOCOL_TM | IWL_TIME_SYNC_PROTOCOL_FTM;</div><div class='add'>+</div><div class='add'>+	return iwl_mld_time_sync_config(mld, hwts-&gt;macaddr, protocols);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_start_pmsr(struct ieee80211_hw *hw,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      struct cfg80211_pmsr_request *request)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+</div><div class='add'>+	return iwl_mld_ftm_start(mld, vif, request);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum ieee80211_neg_ttlm_res</div><div class='add'>+iwl_mld_can_neg_ttlm(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		     struct ieee80211_neg_ttlm *neg_ttlm)</div><div class='add'>+{</div><div class='add'>+	u16 map;</div><div class='add'>+</div><div class='add'>+	/* Verify all TIDs are mapped to the same links set */</div><div class='add'>+	map = neg_ttlm-&gt;downlink[0];</div><div class='add'>+	for (int i = 0; i &lt; IEEE80211_TTLM_NUM_TIDS; i++) {</div><div class='add'>+		if (neg_ttlm-&gt;downlink[i] != neg_ttlm-&gt;uplink[i] ||</div><div class='add'>+		    neg_ttlm-&gt;uplink[i] != map)</div><div class='add'>+			return NEG_TTLM_RES_REJECT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NEG_TTLM_RES_ACCEPT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_get_antenna(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+			       u32 *tx_ant, u32 *rx_ant)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+</div><div class='add'>+	*tx_ant = iwl_mld_get_valid_tx_ant(mld);</div><div class='add'>+	*rx_ant = iwl_mld_get_valid_rx_ant(mld);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_set_antenna(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+			       u32 tx_ant, u32 rx_ant)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mld-&gt;nvm_data))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/* mac80211 ensures the device is not started,</div><div class='add'>+	 * so the firmware cannot be running</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	mld-&gt;set_tx_ant = tx_ant;</div><div class='add'>+	mld-&gt;set_rx_ant = rx_ant;</div><div class='add'>+</div><div class='add'>+	iwl_reinit_cab(mld-&gt;trans, mld-&gt;nvm_data, tx_ant, rx_ant, mld-&gt;fw);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ieee80211_ops iwl_mld_hw_ops = {</div><div class='add'>+	.tx = iwl_mld_mac80211_tx,</div><div class='add'>+	.start = iwl_mld_mac80211_start,</div><div class='add'>+	.stop = iwl_mld_mac80211_stop,</div><div class='add'>+	.config = iwl_mld_mac80211_config,</div><div class='add'>+	.get_antenna = iwl_mld_get_antenna,</div><div class='add'>+	.set_antenna = iwl_mld_set_antenna,</div><div class='add'>+	.add_interface = iwl_mld_mac80211_add_interface,</div><div class='add'>+	.remove_interface = iwl_mld_mac80211_remove_interface,</div><div class='add'>+	.conf_tx = iwl_mld_mac80211_conf_tx,</div><div class='add'>+	.prepare_multicast = iwl_mld_mac80211_prepare_multicast,</div><div class='add'>+	.configure_filter = iwl_mld_mac80211_configure_filter,</div><div class='add'>+	.reconfig_complete = iwl_mld_mac80211_reconfig_complete,</div><div class='add'>+	.wake_tx_queue = iwl_mld_mac80211_wake_tx_queue,</div><div class='add'>+	.add_chanctx = iwl_mld_add_chanctx,</div><div class='add'>+	.remove_chanctx = iwl_mld_remove_chanctx,</div><div class='add'>+	.change_chanctx = iwl_mld_change_chanctx,</div><div class='add'>+	.assign_vif_chanctx = iwl_mld_assign_vif_chanctx,</div><div class='add'>+	.unassign_vif_chanctx = iwl_mld_unassign_vif_chanctx,</div><div class='add'>+	.set_rts_threshold = iwl_mld_mac80211_set_rts_threshold,</div><div class='add'>+	.link_info_changed = iwl_mld_mac80211_link_info_changed,</div><div class='add'>+	.vif_cfg_changed = iwl_mld_mac80211_vif_cfg_changed,</div><div class='add'>+	.set_key = iwl_mld_mac80211_set_key,</div><div class='add'>+	.hw_scan = iwl_mld_mac80211_hw_scan,</div><div class='add'>+	.cancel_hw_scan = iwl_mld_mac80211_cancel_hw_scan,</div><div class='add'>+	.sched_scan_start = iwl_mld_mac80211_sched_scan_start,</div><div class='add'>+	.sched_scan_stop = iwl_mld_mac80211_sched_scan_stop,</div><div class='add'>+	.mgd_prepare_tx = iwl_mld_mac80211_mgd_prepare_tx,</div><div class='add'>+	.mgd_complete_tx = iwl_mld_mac_mgd_complete_tx,</div><div class='add'>+	.sta_state = iwl_mld_mac80211_sta_state,</div><div class='add'>+	.sta_statistics = iwl_mld_mac80211_sta_statistics,</div><div class='add'>+	.get_survey = iwl_mld_mac80211_get_survey,</div><div class='add'>+	.flush = iwl_mld_mac80211_flush,</div><div class='add'>+	.flush_sta = iwl_mld_mac80211_flush_sta,</div><div class='add'>+	.ampdu_action = iwl_mld_mac80211_ampdu_action,</div><div class='add'>+	.can_aggregate_in_amsdu = iwl_mld_mac80211_can_aggregate,</div><div class='add'>+	.sync_rx_queues = iwl_mld_mac80211_sync_rx_queues,</div><div class='add'>+	.link_sta_rc_update = iwl_mld_sta_rc_update,</div><div class='add'>+	.start_ap = iwl_mld_start_ap_ibss,</div><div class='add'>+	.stop_ap = iwl_mld_stop_ap_ibss,</div><div class='add'>+	.pre_channel_switch = iwl_mld_pre_channel_switch,</div><div class='add'>+	.channel_switch = iwl_mld_channel_switch,</div><div class='add'>+	.post_channel_switch = iwl_mld_post_channel_switch,</div><div class='add'>+	.abort_channel_switch = iwl_mld_abort_channel_switch,</div><div class='add'>+	.switch_vif_chanctx = iwl_mld_switch_vif_chanctx,</div><div class='add'>+	.sta_pre_rcu_remove = iwl_mld_sta_pre_rcu_remove,</div><div class='add'>+	.remain_on_channel = iwl_mld_start_roc,</div><div class='add'>+	.cancel_remain_on_channel = iwl_mld_cancel_roc,</div><div class='add'>+	.can_activate_links = iwl_mld_can_activate_links,</div><div class='add'>+	.change_vif_links = iwl_mld_change_vif_links,</div><div class='add'>+	.change_sta_links = iwl_mld_change_sta_links,</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	.suspend = iwl_mld_suspend,</div><div class='add'>+	.resume = iwl_mld_resume,</div><div class='add'>+	.set_wakeup = iwl_mld_set_wakeup,</div><div class='add'>+	.set_rekey_data = iwl_mld_set_rekey_data,</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	.ipv6_addr_change = iwl_mld_ipv6_addr_change,</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_IPV6) */</div><div class='add'>+#endif /* CONFIG_PM_SLEEP */</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='add'>+	.vif_add_debugfs = iwl_mld_add_vif_debugfs,</div><div class='add'>+	.link_add_debugfs = iwl_mld_add_link_debugfs,</div><div class='add'>+	.link_sta_add_debugfs = iwl_mld_add_link_sta_debugfs,</div><div class='add'>+#endif</div><div class='add'>+	.mgd_protect_tdls_discover = iwl_mld_mac80211_mgd_protect_tdls_discover,</div><div class='add'>+	.join_ibss = iwl_mld_mac80211_join_ibss,</div><div class='add'>+	.leave_ibss = iwl_mld_mac80211_leave_ibss,</div><div class='add'>+	.tx_last_beacon = iwl_mld_mac80211_tx_last_beacon,</div><div class='add'>+	.prep_add_interface = iwl_mld_prep_add_interface,</div><div class='add'>+	.set_hw_timestamp = iwl_mld_set_hw_timestamp,</div><div class='add'>+	.start_pmsr = iwl_mld_start_pmsr,</div><div class='add'>+	.can_neg_ttlm = iwl_mld_can_neg_ttlm,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/mac80211.h b/drivers/net/wireless/intel/iwlwifi/mld/mac80211.h<br/>new file mode 100644<br/>index 000000000000..aad04d7b2617<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/mac80211.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/mac80211.h</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_mac80211_h__</div><div class='add'>+#define __iwl_mld_mac80211_h__</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+</div><div class='add'>+int iwl_mld_register_hw(struct iwl_mld *mld);</div><div class='add'>+void iwl_mld_recalc_multicast_filter(struct iwl_mld *mld);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_mac80211_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/mcc.c b/drivers/net/wireless/intel/iwlwifi/mld/mcc.c<br/>new file mode 100644<br/>index 000000000000..16bb1b4904f9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/mcc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/mcc.c</a></div><div class='hunk'>@@ -0,0 +1,285 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;net/cfg80211.h&gt;</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;fw/dbg.h&gt;</div><div class='add'>+#include &lt;iwl-nvm-parse.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+#include "mcc.h"</div><div class='add'>+</div><div class='add'>+/* It is the caller's responsibility to free the pointer returned here */</div><div class='add'>+static struct iwl_mcc_update_resp_v8 *</div><div class='add'>+iwl_mld_copy_mcc_resp(const struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_mcc_update_resp_v8 *mcc_resp_v8 = (const void *)pkt-&gt;data;</div><div class='add'>+	int n_channels = __le32_to_cpu(mcc_resp_v8-&gt;n_channels);</div><div class='add'>+	struct iwl_mcc_update_resp_v8 *resp_cp;</div><div class='add'>+	int notif_len = struct_size(resp_cp, channels, n_channels);</div><div class='add'>+</div><div class='add'>+	if (iwl_rx_packet_payload_len(pkt) != notif_len)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	resp_cp = kmemdup(mcc_resp_v8, notif_len, GFP_KERNEL);</div><div class='add'>+	if (!resp_cp)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	return resp_cp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* It is the caller's responsibility to free the pointer returned here */</div><div class='add'>+static struct iwl_mcc_update_resp_v8 *</div><div class='add'>+iwl_mld_update_mcc(struct iwl_mld *mld, const char *alpha2,</div><div class='add'>+		   enum iwl_mcc_source src_id)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mcc_update_cmd mcc_update_cmd = {</div><div class='add'>+		.mcc = cpu_to_le16(alpha2[0] &lt;&lt; 8 | alpha2[1]),</div><div class='add'>+		.source_id = (u8)src_id,</div><div class='add'>+	};</div><div class='add'>+	struct iwl_mcc_update_resp_v8 *resp_cp;</div><div class='add'>+	struct iwl_rx_packet *pkt;</div><div class='add'>+	struct iwl_host_cmd cmd = {</div><div class='add'>+		.id = MCC_UPDATE_CMD,</div><div class='add'>+		.flags = CMD_WANT_SKB,</div><div class='add'>+		.data = { &amp;mcc_update_cmd },</div><div class='add'>+		.len[0] = sizeof(mcc_update_cmd),</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+	u16 mcc;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_LAR(mld, "send MCC update to FW with '%c%c' src = %d\n",</div><div class='add'>+		      alpha2[0], alpha2[1], src_id);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd(mld, &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+	pkt = cmd.resp_pkt;</div><div class='add'>+</div><div class='add'>+	resp_cp = iwl_mld_copy_mcc_resp(pkt);</div><div class='add'>+	if (IS_ERR(resp_cp))</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	mcc = le16_to_cpu(resp_cp-&gt;mcc);</div><div class='add'>+</div><div class='add'>+	IWL_FW_CHECK(mld, !mcc, "mcc can't be 0: %d\n", mcc);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_LAR(mld,</div><div class='add'>+		      "MCC response status: 0x%x. new MCC: 0x%x ('%c%c')\n",</div><div class='add'>+		      le32_to_cpu(resp_cp-&gt;status), mcc, mcc &gt;&gt; 8, mcc &amp; 0xff);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	iwl_free_resp(&amp;cmd);</div><div class='add'>+	return resp_cp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* It is the caller's responsibility to free the pointer returned here */</div><div class='add'>+struct ieee80211_regdomain *</div><div class='add'>+iwl_mld_get_regdomain(struct iwl_mld *mld,</div><div class='add'>+		      const char *alpha2,</div><div class='add'>+		      enum iwl_mcc_source src_id,</div><div class='add'>+		      bool *changed)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_regdomain *regd = NULL;</div><div class='add'>+	struct iwl_mcc_update_resp_v8 *resp;</div><div class='add'>+	u8 resp_ver = iwl_fw_lookup_notif_ver(mld-&gt;fw, IWL_ALWAYS_LONG_GROUP,</div><div class='add'>+					      MCC_UPDATE_CMD, 0);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_LAR(mld, "Getting regdomain data for %s from FW\n", alpha2);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	resp = iwl_mld_update_mcc(mld, alpha2, src_id);</div><div class='add'>+	if (IS_ERR(resp)) {</div><div class='add'>+		IWL_DEBUG_LAR(mld, "Could not get update from FW %ld\n",</div><div class='add'>+			      PTR_ERR(resp));</div><div class='add'>+		resp = NULL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed) {</div><div class='add'>+		u32 status = le32_to_cpu(resp-&gt;status);</div><div class='add'>+</div><div class='add'>+		*changed = (status == MCC_RESP_NEW_CHAN_PROFILE ||</div><div class='add'>+			    status == MCC_RESP_ILLEGAL);</div><div class='add'>+	}</div><div class='add'>+	IWL_DEBUG_LAR(mld, "MCC update response version: %d\n", resp_ver);</div><div class='add'>+</div><div class='add'>+	regd = iwl_parse_nvm_mcc_info(mld-&gt;trans,</div><div class='add'>+				      __le32_to_cpu(resp-&gt;n_channels),</div><div class='add'>+				      resp-&gt;channels,</div><div class='add'>+				      __le16_to_cpu(resp-&gt;mcc),</div><div class='add'>+				      __le16_to_cpu(resp-&gt;geo_info),</div><div class='add'>+				      le32_to_cpu(resp-&gt;cap), resp_ver);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(regd)) {</div><div class='add'>+		IWL_DEBUG_LAR(mld, "Could not get parse update from FW %ld\n",</div><div class='add'>+			      PTR_ERR(regd));</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_LAR(mld, "setting alpha2 from FW to %s (0x%x, 0x%x) src=%d\n",</div><div class='add'>+		      regd-&gt;alpha2, regd-&gt;alpha2[0],</div><div class='add'>+		      regd-&gt;alpha2[1], resp-&gt;source_id);</div><div class='add'>+</div><div class='add'>+	mld-&gt;mcc_src = resp-&gt;source_id;</div><div class='add'>+</div><div class='add'>+	/* FM is the earliest supported and later always do puncturing */</div><div class='add'>+	if (CSR_HW_RFID_TYPE(mld-&gt;trans-&gt;info.hw_rf_id) == IWL_CFG_RF_TYPE_FM) {</div><div class='add'>+		if (!iwl_puncturing_is_allowed_in_bios(mld-&gt;bios_enable_puncturing,</div><div class='add'>+						       le16_to_cpu(resp-&gt;mcc)))</div><div class='add'>+			ieee80211_hw_set(mld-&gt;hw, DISALLOW_PUNCTURING);</div><div class='add'>+		else</div><div class='add'>+			__clear_bit(IEEE80211_HW_DISALLOW_PUNCTURING,</div><div class='add'>+				    mld-&gt;hw-&gt;flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(resp);</div><div class='add'>+	return regd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* It is the caller's responsibility to free the pointer returned here */</div><div class='add'>+static struct ieee80211_regdomain *</div><div class='add'>+iwl_mld_get_current_regdomain(struct iwl_mld *mld,</div><div class='add'>+			      bool *changed)</div><div class='add'>+{</div><div class='add'>+	return iwl_mld_get_regdomain(mld, "ZZ",</div><div class='add'>+				     MCC_SOURCE_GET_CURRENT, changed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_update_changed_regdomain(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_regdomain *regd;</div><div class='add'>+	bool changed;</div><div class='add'>+</div><div class='add'>+	regd = iwl_mld_get_current_regdomain(mld, &amp;changed);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR_OR_NULL(regd))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (changed)</div><div class='add'>+		regulatory_set_wiphy_regd(mld-&gt;wiphy, regd);</div><div class='add'>+	kfree(regd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_apply_last_mcc(struct iwl_mld *mld,</div><div class='add'>+				  const char *alpha2)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_regdomain *regd;</div><div class='add'>+	u32 used_src;</div><div class='add'>+	bool changed;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* save the last source in case we overwrite it below */</div><div class='add'>+	used_src = mld-&gt;mcc_src;</div><div class='add'>+</div><div class='add'>+	/* Notify the firmware we support wifi location updates */</div><div class='add'>+	regd = iwl_mld_get_current_regdomain(mld, NULL);</div><div class='add'>+	if (!IS_ERR_OR_NULL(regd))</div><div class='add'>+		kfree(regd);</div><div class='add'>+</div><div class='add'>+	/* Now set our last stored MCC and source */</div><div class='add'>+	regd = iwl_mld_get_regdomain(mld, alpha2, used_src,</div><div class='add'>+				     &amp;changed);</div><div class='add'>+	if (IS_ERR_OR_NULL(regd))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	/* update cfg80211 if the regdomain was changed */</div><div class='add'>+	if (changed)</div><div class='add'>+		ret = regulatory_set_wiphy_regd_sync(mld-&gt;wiphy, regd);</div><div class='add'>+	else</div><div class='add'>+		ret = 0;</div><div class='add'>+</div><div class='add'>+	kfree(regd);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_init_mcc(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_regdomain *r;</div><div class='add'>+	struct ieee80211_regdomain *regd;</div><div class='add'>+	char mcc[3];</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	/* try to replay the last set MCC to FW */</div><div class='add'>+	r = wiphy_dereference(mld-&gt;wiphy, mld-&gt;wiphy-&gt;regd);</div><div class='add'>+</div><div class='add'>+	if (r)</div><div class='add'>+		return iwl_mld_apply_last_mcc(mld, r-&gt;alpha2);</div><div class='add'>+</div><div class='add'>+	regd = iwl_mld_get_current_regdomain(mld, NULL);</div><div class='add'>+	if (IS_ERR_OR_NULL(regd))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (!iwl_bios_get_mcc(&amp;mld-&gt;fwrt, mcc)) {</div><div class='add'>+		kfree(regd);</div><div class='add'>+		regd = iwl_mld_get_regdomain(mld, mcc, MCC_SOURCE_BIOS, NULL);</div><div class='add'>+		if (IS_ERR_OR_NULL(regd))</div><div class='add'>+			return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = regulatory_set_wiphy_regd_sync(mld-&gt;wiphy, regd);</div><div class='add'>+</div><div class='add'>+	kfree(regd);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_find_assoc_vif_iterator(void *data, u8 *mac,</div><div class='add'>+					    struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	bool *assoc = data;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+	    vif-&gt;cfg.assoc)</div><div class='add'>+		*assoc = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_is_a_vif_assoc(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	bool assoc = false;</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_atomic(mld-&gt;hw,</div><div class='add'>+						   IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						   iwl_mld_find_assoc_vif_iterator,</div><div class='add'>+						   &amp;assoc);</div><div class='add'>+	return assoc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_update_mcc(struct iwl_mld *mld, struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mcc_chub_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+	enum iwl_mcc_source src;</div><div class='add'>+	char mcc[3];</div><div class='add'>+	struct ieee80211_regdomain *regd;</div><div class='add'>+	bool changed;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_is_a_vif_assoc(mld) &amp;&amp;</div><div class='add'>+	    notif-&gt;source_id == MCC_SOURCE_WIFI) {</div><div class='add'>+		IWL_DEBUG_LAR(mld, "Ignore mcc update while associated\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mcc[0] = le16_to_cpu(notif-&gt;mcc) &gt;&gt; 8;</div><div class='add'>+	mcc[1] = le16_to_cpu(notif-&gt;mcc) &amp; 0xff;</div><div class='add'>+	mcc[2] = '\0';</div><div class='add'>+	src = notif-&gt;source_id;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_LAR(mld,</div><div class='add'>+		      "RX: received chub update mcc cmd (mcc '%s' src %d)\n",</div><div class='add'>+		      mcc, src);</div><div class='add'>+	regd = iwl_mld_get_regdomain(mld, mcc, src, &amp;changed);</div><div class='add'>+	if (IS_ERR_OR_NULL(regd))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (changed)</div><div class='add'>+		regulatory_set_wiphy_regd(mld-&gt;hw-&gt;wiphy, regd);</div><div class='add'>+	kfree(regd);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/mcc.h b/drivers/net/wireless/intel/iwlwifi/mld/mcc.h<br/>new file mode 100644<br/>index 000000000000..2b31e5b5e2ed<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/mcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/mcc.h</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_mcc_h__</div><div class='add'>+#define __iwl_mld_mcc_h__</div><div class='add'>+</div><div class='add'>+int iwl_mld_init_mcc(struct iwl_mld *mld);</div><div class='add'>+void iwl_mld_handle_update_mcc(struct iwl_mld *mld, struct iwl_rx_packet *pkt);</div><div class='add'>+void iwl_mld_update_changed_regdomain(struct iwl_mld *mld);</div><div class='add'>+struct ieee80211_regdomain *</div><div class='add'>+iwl_mld_get_regdomain(struct iwl_mld *mld,</div><div class='add'>+		      const char *alpha2,</div><div class='add'>+		      enum iwl_mcc_source src_id,</div><div class='add'>+		      bool *changed);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_mcc_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/mld.c b/drivers/net/wireless/intel/iwlwifi/mld/mld.c<br/>new file mode 100644<br/>index 000000000000..8a4c96385640<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/mld.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/mld.c</a></div><div class='hunk'>@@ -0,0 +1,776 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "fw/api/rx.h"</div><div class='add'>+#include "fw/api/datapath.h"</div><div class='add'>+#include "fw/api/commands.h"</div><div class='add'>+#include "fw/api/offload.h"</div><div class='add'>+#include "fw/api/coex.h"</div><div class='add'>+#include "fw/dbg.h"</div><div class='add'>+#include "fw/uefi.h"</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "mlo.h"</div><div class='add'>+#include "mac80211.h"</div><div class='add'>+#include "led.h"</div><div class='add'>+#include "scan.h"</div><div class='add'>+#include "tx.h"</div><div class='add'>+#include "sta.h"</div><div class='add'>+#include "regulatory.h"</div><div class='add'>+#include "thermal.h"</div><div class='add'>+#include "low_latency.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+#include "fw/api/location.h"</div><div class='add'>+</div><div class='add'>+#include "iwl-nvm-parse.h"</div><div class='add'>+</div><div class='add'>+#define DRV_DESCRIPTION "Intel(R) MLD wireless driver for Linux"</div><div class='add'>+MODULE_DESCRIPTION(DRV_DESCRIPTION);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_IMPORT_NS("IWLWIFI");</div><div class='add'>+</div><div class='add'>+static const struct iwl_op_mode_ops iwl_mld_ops;</div><div class='add'>+</div><div class='add'>+static int __init iwl_mld_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret = iwl_opmode_register("iwlmld", &amp;iwl_mld_ops);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_err("Unable to register MLD op_mode: %d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+module_init(iwl_mld_init);</div><div class='add'>+</div><div class='add'>+static void __exit iwl_mld_exit(void)</div><div class='add'>+{</div><div class='add'>+	iwl_opmode_deregister("iwlmld");</div><div class='add'>+}</div><div class='add'>+module_exit(iwl_mld_exit);</div><div class='add'>+</div><div class='add'>+static void iwl_mld_hw_set_regulatory(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct wiphy *wiphy = mld-&gt;wiphy;</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;regulatory_flags |= REGULATORY_WIPHY_SELF_MANAGED;</div><div class='add'>+	wiphy-&gt;regulatory_flags |= REGULATORY_ENABLE_RELAX_NO_IR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+VISIBLE_IF_IWLWIFI_KUNIT</div><div class='add'>+void iwl_construct_mld(struct iwl_mld *mld, struct iwl_trans *trans,</div><div class='add'>+		       const struct iwl_rf_cfg *cfg, const struct iwl_fw *fw,</div><div class='add'>+		       struct ieee80211_hw *hw, struct dentry *dbgfs_dir)</div><div class='add'>+{</div><div class='add'>+	mld-&gt;dev = trans-&gt;dev;</div><div class='add'>+	mld-&gt;trans = trans;</div><div class='add'>+	mld-&gt;cfg = cfg;</div><div class='add'>+	mld-&gt;fw = fw;</div><div class='add'>+	mld-&gt;hw = hw;</div><div class='add'>+	mld-&gt;wiphy = hw-&gt;wiphy;</div><div class='add'>+	mld-&gt;debugfs_dir = dbgfs_dir;</div><div class='add'>+</div><div class='add'>+	iwl_notification_wait_init(&amp;mld-&gt;notif_wait);</div><div class='add'>+</div><div class='add'>+	/* Setup async RX handling */</div><div class='add'>+	spin_lock_init(&amp;mld-&gt;async_handlers_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;mld-&gt;async_handlers_list);</div><div class='add'>+	wiphy_work_init(&amp;mld-&gt;async_handlers_wk,</div><div class='add'>+			iwl_mld_async_handlers_wk);</div><div class='add'>+</div><div class='add'>+	/* Dynamic Queue Allocation */</div><div class='add'>+	spin_lock_init(&amp;mld-&gt;add_txqs_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;mld-&gt;txqs_to_add);</div><div class='add'>+	wiphy_work_init(&amp;mld-&gt;add_txqs_wk, iwl_mld_add_txqs_wk);</div><div class='add'>+</div><div class='add'>+	/* Setup RX queues sync wait queue */</div><div class='add'>+	init_waitqueue_head(&amp;mld-&gt;rxq_sync.waitq);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_construct_mld);</div><div class='add'>+</div><div class='add'>+static void __acquires(&amp;mld-&gt;wiphy-&gt;mtx)</div><div class='add'>+iwl_mld_fwrt_dump_start(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = ctx;</div><div class='add'>+</div><div class='add'>+	wiphy_lock(mld-&gt;wiphy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __releases(&amp;mld-&gt;wiphy-&gt;mtx)</div><div class='add'>+iwl_mld_fwrt_dump_end(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = ctx;</div><div class='add'>+</div><div class='add'>+	wiphy_unlock(mld-&gt;wiphy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_d3_debug_enable(void *ctx)</div><div class='add'>+{</div><div class='add'>+	return IWL_MLD_D3_DEBUG;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_fwrt_send_hcmd(void *ctx, struct iwl_host_cmd *host_cmd)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = (struct iwl_mld *)ctx;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	wiphy_lock(mld-&gt;wiphy);</div><div class='add'>+	ret = iwl_mld_send_cmd(mld, host_cmd);</div><div class='add'>+	wiphy_unlock(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iwl_fw_runtime_ops iwl_mld_fwrt_ops = {</div><div class='add'>+	.dump_start = iwl_mld_fwrt_dump_start,</div><div class='add'>+	.dump_end = iwl_mld_fwrt_dump_end,</div><div class='add'>+	.send_hcmd = iwl_mld_fwrt_send_hcmd,</div><div class='add'>+	.d3_debug_enable = iwl_mld_d3_debug_enable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_construct_fw_runtime(struct iwl_mld *mld, struct iwl_trans *trans,</div><div class='add'>+			     const struct iwl_fw *fw,</div><div class='add'>+			     struct dentry *debugfs_dir)</div><div class='add'>+{</div><div class='add'>+	iwl_fw_runtime_init(&amp;mld-&gt;fwrt, trans, fw, &amp;iwl_mld_fwrt_ops, mld,</div><div class='add'>+			    NULL, NULL, debugfs_dir);</div><div class='add'>+</div><div class='add'>+	iwl_fw_set_current_image(&amp;mld-&gt;fwrt, IWL_UCODE_REGULAR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Please keep this array *SORTED* by hex value.</div><div class='add'>+ * Access is done through binary search</div><div class='add'>+ */</div><div class='add'>+static const struct iwl_hcmd_names iwl_mld_legacy_names[] = {</div><div class='add'>+	HCMD_NAME(UCODE_ALIVE_NTFY),</div><div class='add'>+	HCMD_NAME(REPLY_ERROR),</div><div class='add'>+	HCMD_NAME(INIT_COMPLETE_NOTIF),</div><div class='add'>+	HCMD_NAME(PHY_CONTEXT_CMD),</div><div class='add'>+	HCMD_NAME(SCAN_CFG_CMD),</div><div class='add'>+	HCMD_NAME(SCAN_REQ_UMAC),</div><div class='add'>+	HCMD_NAME(SCAN_ABORT_UMAC),</div><div class='add'>+	HCMD_NAME(SCAN_COMPLETE_UMAC),</div><div class='add'>+	HCMD_NAME(TX_CMD),</div><div class='add'>+	HCMD_NAME(TXPATH_FLUSH),</div><div class='add'>+	HCMD_NAME(LEDS_CMD),</div><div class='add'>+	HCMD_NAME(WNM_80211V_TIMING_MEASUREMENT_NOTIFICATION),</div><div class='add'>+	HCMD_NAME(WNM_80211V_TIMING_MEASUREMENT_CONFIRM_NOTIFICATION),</div><div class='add'>+	HCMD_NAME(PHY_CONFIGURATION_CMD),</div><div class='add'>+	HCMD_NAME(SCAN_OFFLOAD_UPDATE_PROFILES_CMD),</div><div class='add'>+	HCMD_NAME(POWER_TABLE_CMD),</div><div class='add'>+	HCMD_NAME(PSM_UAPSD_AP_MISBEHAVING_NOTIFICATION),</div><div class='add'>+	HCMD_NAME(BEACON_NOTIFICATION),</div><div class='add'>+	HCMD_NAME(BEACON_TEMPLATE_CMD),</div><div class='add'>+	HCMD_NAME(TX_ANT_CONFIGURATION_CMD),</div><div class='add'>+	HCMD_NAME(BT_CONFIG),</div><div class='add'>+	HCMD_NAME(REDUCE_TX_POWER_CMD),</div><div class='add'>+	HCMD_NAME(MISSED_BEACONS_NOTIFICATION),</div><div class='add'>+	HCMD_NAME(MAC_PM_POWER_TABLE),</div><div class='add'>+	HCMD_NAME(MFUART_LOAD_NOTIFICATION),</div><div class='add'>+	HCMD_NAME(RSS_CONFIG_CMD),</div><div class='add'>+	HCMD_NAME(SCAN_ITERATION_COMPLETE_UMAC),</div><div class='add'>+	HCMD_NAME(REPLY_RX_MPDU_CMD),</div><div class='add'>+	HCMD_NAME(BA_NOTIF),</div><div class='add'>+	HCMD_NAME(MCC_UPDATE_CMD),</div><div class='add'>+	HCMD_NAME(MCC_CHUB_UPDATE_CMD),</div><div class='add'>+	HCMD_NAME(MCAST_FILTER_CMD),</div><div class='add'>+	HCMD_NAME(REPLY_BEACON_FILTERING_CMD),</div><div class='add'>+	HCMD_NAME(PROT_OFFLOAD_CONFIG_CMD),</div><div class='add'>+	HCMD_NAME(MATCH_FOUND_NOTIFICATION),</div><div class='add'>+	HCMD_NAME(WOWLAN_PATTERNS),</div><div class='add'>+	HCMD_NAME(WOWLAN_CONFIGURATION),</div><div class='add'>+	HCMD_NAME(WOWLAN_TSC_RSC_PARAM),</div><div class='add'>+	HCMD_NAME(WOWLAN_KEK_KCK_MATERIAL),</div><div class='add'>+	HCMD_NAME(DEBUG_HOST_COMMAND),</div><div class='add'>+	HCMD_NAME(LDBG_CONFIG_CMD),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Please keep this array *SORTED* by hex value.</div><div class='add'>+ * Access is done through binary search</div><div class='add'>+ */</div><div class='add'>+static const struct iwl_hcmd_names iwl_mld_system_names[] = {</div><div class='add'>+	HCMD_NAME(SHARED_MEM_CFG_CMD),</div><div class='add'>+	HCMD_NAME(SOC_CONFIGURATION_CMD),</div><div class='add'>+	HCMD_NAME(INIT_EXTENDED_CFG_CMD),</div><div class='add'>+	HCMD_NAME(FW_ERROR_RECOVERY_CMD),</div><div class='add'>+	HCMD_NAME(RFI_CONFIG_CMD),</div><div class='add'>+	HCMD_NAME(RFI_GET_FREQ_TABLE_CMD),</div><div class='add'>+	HCMD_NAME(SYSTEM_STATISTICS_CMD),</div><div class='add'>+	HCMD_NAME(SYSTEM_STATISTICS_END_NOTIF),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Please keep this array *SORTED* by hex value.</div><div class='add'>+ * Access is done through binary search</div><div class='add'>+ */</div><div class='add'>+static const struct iwl_hcmd_names iwl_mld_reg_and_nvm_names[] = {</div><div class='add'>+	HCMD_NAME(LARI_CONFIG_CHANGE),</div><div class='add'>+	HCMD_NAME(NVM_GET_INFO),</div><div class='add'>+	HCMD_NAME(TAS_CONFIG),</div><div class='add'>+	HCMD_NAME(SAR_OFFSET_MAPPING_TABLE_CMD),</div><div class='add'>+	HCMD_NAME(MCC_ALLOWED_AP_TYPE_CMD),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Please keep this array *SORTED* by hex value.</div><div class='add'>+ * Access is done through binary search</div><div class='add'>+ */</div><div class='add'>+static const struct iwl_hcmd_names iwl_mld_debug_names[] = {</div><div class='add'>+	HCMD_NAME(HOST_EVENT_CFG),</div><div class='add'>+	HCMD_NAME(DBGC_SUSPEND_RESUME),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Please keep this array *SORTED* by hex value.</div><div class='add'>+ * Access is done through binary search</div><div class='add'>+ */</div><div class='add'>+static const struct iwl_hcmd_names iwl_mld_mac_conf_names[] = {</div><div class='add'>+	HCMD_NAME(LOW_LATENCY_CMD),</div><div class='add'>+	HCMD_NAME(SESSION_PROTECTION_CMD),</div><div class='add'>+	HCMD_NAME(MAC_CONFIG_CMD),</div><div class='add'>+	HCMD_NAME(LINK_CONFIG_CMD),</div><div class='add'>+	HCMD_NAME(STA_CONFIG_CMD),</div><div class='add'>+	HCMD_NAME(AUX_STA_CMD),</div><div class='add'>+	HCMD_NAME(STA_REMOVE_CMD),</div><div class='add'>+	HCMD_NAME(ROC_CMD),</div><div class='add'>+	HCMD_NAME(MISSED_BEACONS_NOTIF),</div><div class='add'>+	HCMD_NAME(EMLSR_TRANS_FAIL_NOTIF),</div><div class='add'>+	HCMD_NAME(ROC_NOTIF),</div><div class='add'>+	HCMD_NAME(CHANNEL_SWITCH_ERROR_NOTIF),</div><div class='add'>+	HCMD_NAME(SESSION_PROTECTION_NOTIF),</div><div class='add'>+	HCMD_NAME(PROBE_RESPONSE_DATA_NOTIF),</div><div class='add'>+	HCMD_NAME(CHANNEL_SWITCH_START_NOTIF),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Please keep this array *SORTED* by hex value.</div><div class='add'>+ * Access is done through binary search</div><div class='add'>+ */</div><div class='add'>+static const struct iwl_hcmd_names iwl_mld_data_path_names[] = {</div><div class='add'>+	HCMD_NAME(TRIGGER_RX_QUEUES_NOTIF_CMD),</div><div class='add'>+	HCMD_NAME(WNM_PLATFORM_PTM_REQUEST_CMD),</div><div class='add'>+	HCMD_NAME(WNM_80211V_TIMING_MEASUREMENT_CONFIG_CMD),</div><div class='add'>+	HCMD_NAME(RFH_QUEUE_CONFIG_CMD),</div><div class='add'>+	HCMD_NAME(TLC_MNG_CONFIG_CMD),</div><div class='add'>+	HCMD_NAME(RX_BAID_ALLOCATION_CONFIG_CMD),</div><div class='add'>+	HCMD_NAME(SCD_QUEUE_CONFIG_CMD),</div><div class='add'>+	HCMD_NAME(SEC_KEY_CMD),</div><div class='add'>+	HCMD_NAME(ESR_MODE_NOTIF),</div><div class='add'>+	HCMD_NAME(MONITOR_NOTIF),</div><div class='add'>+	HCMD_NAME(TLC_MNG_UPDATE_NOTIF),</div><div class='add'>+	HCMD_NAME(BEACON_FILTER_IN_NOTIF),</div><div class='add'>+	HCMD_NAME(PHY_AIR_SNIFFER_NOTIF),</div><div class='add'>+	HCMD_NAME(MU_GROUP_MGMT_NOTIF),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Please keep this array *SORTED* by hex value.</div><div class='add'>+ * Access is done through binary search</div><div class='add'>+ */</div><div class='add'>+static const struct iwl_hcmd_names iwl_mld_scan_names[] = {</div><div class='add'>+	HCMD_NAME(CHANNEL_SURVEY_NOTIF),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Please keep this array *SORTED* by hex value.</div><div class='add'>+ * Access is done through binary search</div><div class='add'>+ */</div><div class='add'>+static const struct iwl_hcmd_names iwl_mld_location_names[] = {</div><div class='add'>+	HCMD_NAME(TOF_RANGE_REQ_CMD),</div><div class='add'>+	HCMD_NAME(TOF_RANGE_RESPONSE_NOTIF),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Please keep this array *SORTED* by hex value.</div><div class='add'>+ * Access is done through binary search</div><div class='add'>+ */</div><div class='add'>+static const struct iwl_hcmd_names iwl_mld_phy_names[] = {</div><div class='add'>+	HCMD_NAME(CMD_DTS_MEASUREMENT_TRIGGER_WIDE),</div><div class='add'>+	HCMD_NAME(CTDP_CONFIG_CMD),</div><div class='add'>+	HCMD_NAME(TEMP_REPORTING_THRESHOLDS_CMD),</div><div class='add'>+	HCMD_NAME(PER_CHAIN_LIMIT_OFFSET_CMD),</div><div class='add'>+	HCMD_NAME(CT_KILL_NOTIFICATION),</div><div class='add'>+	HCMD_NAME(DTS_MEASUREMENT_NOTIF_WIDE),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Please keep this array *SORTED* by hex value.</div><div class='add'>+ * Access is done through binary search</div><div class='add'>+ */</div><div class='add'>+static const struct iwl_hcmd_names iwl_mld_statistics_names[] = {</div><div class='add'>+	HCMD_NAME(STATISTICS_OPER_NOTIF),</div><div class='add'>+	HCMD_NAME(STATISTICS_OPER_PART1_NOTIF),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Please keep this array *SORTED* by hex value.</div><div class='add'>+ * Access is done through binary search</div><div class='add'>+ */</div><div class='add'>+static const struct iwl_hcmd_names iwl_mld_prot_offload_names[] = {</div><div class='add'>+	HCMD_NAME(WOWLAN_WAKE_PKT_NOTIFICATION),</div><div class='add'>+	HCMD_NAME(WOWLAN_INFO_NOTIFICATION),</div><div class='add'>+	HCMD_NAME(D3_END_NOTIFICATION),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Please keep this array *SORTED* by hex value.</div><div class='add'>+ * Access is done through binary search</div><div class='add'>+ */</div><div class='add'>+static const struct iwl_hcmd_names iwl_mld_coex_names[] = {</div><div class='add'>+	HCMD_NAME(PROFILE_NOTIF),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+VISIBLE_IF_IWLWIFI_KUNIT</div><div class='add'>+const struct iwl_hcmd_arr iwl_mld_groups[] = {</div><div class='add'>+	[LEGACY_GROUP] = HCMD_ARR(iwl_mld_legacy_names),</div><div class='add'>+	[LONG_GROUP] = HCMD_ARR(iwl_mld_legacy_names),</div><div class='add'>+	[SYSTEM_GROUP] = HCMD_ARR(iwl_mld_system_names),</div><div class='add'>+	[MAC_CONF_GROUP] = HCMD_ARR(iwl_mld_mac_conf_names),</div><div class='add'>+	[DATA_PATH_GROUP] = HCMD_ARR(iwl_mld_data_path_names),</div><div class='add'>+	[SCAN_GROUP] = HCMD_ARR(iwl_mld_scan_names),</div><div class='add'>+	[LOCATION_GROUP] = HCMD_ARR(iwl_mld_location_names),</div><div class='add'>+	[REGULATORY_AND_NVM_GROUP] = HCMD_ARR(iwl_mld_reg_and_nvm_names),</div><div class='add'>+	[DEBUG_GROUP] = HCMD_ARR(iwl_mld_debug_names),</div><div class='add'>+	[PHY_OPS_GROUP] = HCMD_ARR(iwl_mld_phy_names),</div><div class='add'>+	[STATISTICS_GROUP] = HCMD_ARR(iwl_mld_statistics_names),</div><div class='add'>+	[PROT_OFFLOAD_GROUP] = HCMD_ARR(iwl_mld_prot_offload_names),</div><div class='add'>+	[BT_COEX_GROUP] = HCMD_ARR(iwl_mld_coex_names),</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_mld_groups);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IWLWIFI_KUNIT_TESTS)</div><div class='add'>+const unsigned int global_iwl_mld_goups_size = ARRAY_SIZE(iwl_mld_groups);</div><div class='add'>+EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(global_iwl_mld_goups_size);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_configure_trans(struct iwl_op_mode *op_mode)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_OP_MODE_GET_MLD(op_mode);</div><div class='add'>+	static const u8 no_reclaim_cmds[] = {TX_CMD};</div><div class='add'>+	struct iwl_trans *trans = mld-&gt;trans;</div><div class='add'>+	u32 eckv_value;</div><div class='add'>+</div><div class='add'>+	iwl_bios_setup_step(trans, &amp;mld-&gt;fwrt);</div><div class='add'>+	iwl_uefi_get_step_table(trans);</div><div class='add'>+</div><div class='add'>+	if (iwl_bios_get_eckv(&amp;mld-&gt;fwrt, &amp;eckv_value))</div><div class='add'>+		IWL_DEBUG_RADIO(mld, "ECKV table doesn't exist in BIOS\n");</div><div class='add'>+	else</div><div class='add'>+		trans-&gt;conf.ext_32khz_clock_valid = !!eckv_value;</div><div class='add'>+</div><div class='add'>+	trans-&gt;conf.rx_buf_size = iwl_amsdu_size_to_rxb_size();</div><div class='add'>+	trans-&gt;conf.command_groups = iwl_mld_groups;</div><div class='add'>+	trans-&gt;conf.command_groups_size = ARRAY_SIZE(iwl_mld_groups);</div><div class='add'>+	trans-&gt;conf.fw_reset_handshake = true;</div><div class='add'>+	trans-&gt;conf.queue_alloc_cmd_ver =</div><div class='add'>+		iwl_fw_lookup_cmd_ver(mld-&gt;fw, WIDE_ID(DATA_PATH_GROUP,</div><div class='add'>+						       SCD_QUEUE_CONFIG_CMD),</div><div class='add'>+				      0);</div><div class='add'>+	trans-&gt;conf.cb_data_offs = offsetof(struct ieee80211_tx_info,</div><div class='add'>+					    driver_data[2]);</div><div class='add'>+	BUILD_BUG_ON(sizeof(no_reclaim_cmds) &gt;</div><div class='add'>+		     sizeof(trans-&gt;conf.no_reclaim_cmds));</div><div class='add'>+	memcpy(trans-&gt;conf.no_reclaim_cmds, no_reclaim_cmds,</div><div class='add'>+	       sizeof(no_reclaim_cmds));</div><div class='add'>+	trans-&gt;conf.n_no_reclaim_cmds = ARRAY_SIZE(no_reclaim_cmds);</div><div class='add'>+</div><div class='add'>+	trans-&gt;conf.rx_mpdu_cmd = REPLY_RX_MPDU_CMD;</div><div class='add'>+	trans-&gt;conf.rx_mpdu_cmd_hdr_size = sizeof(struct iwl_rx_mpdu_desc);</div><div class='add'>+	trans-&gt;conf.wide_cmd_header = true;</div><div class='add'>+</div><div class='add'>+	iwl_trans_op_mode_enter(trans, op_mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *****************************************************</div><div class='add'>+ * op mode ops functions</div><div class='add'>+ *****************************************************</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define NUM_FW_LOAD_RETRIES	3</div><div class='add'>+static struct iwl_op_mode *</div><div class='add'>+iwl_op_mode_mld_start(struct iwl_trans *trans, const struct iwl_rf_cfg *cfg,</div><div class='add'>+		      const struct iwl_fw *fw, struct dentry *dbgfs_dir)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw;</div><div class='add'>+	struct iwl_op_mode *op_mode;</div><div class='add'>+	struct iwl_mld *mld;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Allocate and initialize a new hardware device */</div><div class='add'>+	hw = ieee80211_alloc_hw(sizeof(struct iwl_op_mode) +</div><div class='add'>+				sizeof(struct iwl_mld),</div><div class='add'>+				&amp;iwl_mld_hw_ops);</div><div class='add'>+	if (!hw)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	op_mode = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	op_mode-&gt;ops = &amp;iwl_mld_ops;</div><div class='add'>+</div><div class='add'>+	mld = IWL_OP_MODE_GET_MLD(op_mode);</div><div class='add'>+</div><div class='add'>+	iwl_construct_mld(mld, trans, cfg, fw, hw, dbgfs_dir);</div><div class='add'>+</div><div class='add'>+	/* we'll verify later it matches between commands */</div><div class='add'>+	mld-&gt;fw_rates_ver_3 = iwl_fw_lookup_cmd_ver(mld-&gt;fw, TX_CMD, 0) &gt;= 11;</div><div class='add'>+</div><div class='add'>+	iwl_mld_construct_fw_runtime(mld, trans, fw, dbgfs_dir);</div><div class='add'>+</div><div class='add'>+	iwl_mld_get_bios_tables(mld);</div><div class='add'>+	iwl_uefi_get_sgom_table(trans, &amp;mld-&gt;fwrt);</div><div class='add'>+	mld-&gt;bios_enable_puncturing = iwl_uefi_get_puncturing(&amp;mld-&gt;fwrt);</div><div class='add'>+</div><div class='add'>+	iwl_mld_hw_set_regulatory(mld);</div><div class='add'>+</div><div class='add'>+	/* Configure transport layer with the opmode specific params */</div><div class='add'>+	iwl_mld_configure_trans(op_mode);</div><div class='add'>+</div><div class='add'>+	/* needed for regulatory init */</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	/* Needed for sending commands */</div><div class='add'>+	wiphy_lock(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; NUM_FW_LOAD_RETRIES; i++) {</div><div class='add'>+		ret = iwl_mld_load_fw(mld);</div><div class='add'>+		if (!ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ret) {</div><div class='add'>+		mld-&gt;nvm_data = iwl_get_nvm(mld-&gt;trans, mld-&gt;fw, 0, 0);</div><div class='add'>+		if (IS_ERR(mld-&gt;nvm_data)) {</div><div class='add'>+			IWL_ERR(mld, "Failed to read NVM: %d\n", ret);</div><div class='add'>+			ret = PTR_ERR(mld-&gt;nvm_data);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		wiphy_unlock(mld-&gt;wiphy);</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We are about to stop the FW. Notifications may require an</div><div class='add'>+	 * operational FW, so handle them all here before we stop.</div><div class='add'>+	 */</div><div class='add'>+	wiphy_work_flush(mld-&gt;wiphy, &amp;mld-&gt;async_handlers_wk);</div><div class='add'>+</div><div class='add'>+	iwl_mld_stop_fw(mld);</div><div class='add'>+</div><div class='add'>+	wiphy_unlock(mld-&gt;wiphy);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_leds_init(mld);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free_nvm;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_alloc_scan_cmd(mld);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto leds_exit;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_low_latency_init(mld);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free_scan_cmd;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_register_hw(mld);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto low_latency_free;</div><div class='add'>+</div><div class='add'>+	iwl_mld_toggle_tx_ant(mld, &amp;mld-&gt;mgmt_tx_ant);</div><div class='add'>+</div><div class='add'>+	iwl_mld_add_debugfs_files(mld, dbgfs_dir);</div><div class='add'>+	iwl_mld_thermal_initialize(mld);</div><div class='add'>+</div><div class='add'>+	iwl_mld_ptp_init(mld);</div><div class='add'>+</div><div class='add'>+	return op_mode;</div><div class='add'>+</div><div class='add'>+low_latency_free:</div><div class='add'>+	iwl_mld_low_latency_free(mld);</div><div class='add'>+free_scan_cmd:</div><div class='add'>+	kfree(mld-&gt;scan.cmd);</div><div class='add'>+leds_exit:</div><div class='add'>+	iwl_mld_leds_exit(mld);</div><div class='add'>+free_nvm:</div><div class='add'>+	kfree(mld-&gt;nvm_data);</div><div class='add'>+err:</div><div class='add'>+	iwl_trans_op_mode_leave(mld-&gt;trans);</div><div class='add'>+	ieee80211_free_hw(mld-&gt;hw);</div><div class='add'>+	return ERR_PTR(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_op_mode_mld_stop(struct iwl_op_mode *op_mode)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_OP_MODE_GET_MLD(op_mode);</div><div class='add'>+</div><div class='add'>+	iwl_mld_ptp_remove(mld);</div><div class='add'>+	iwl_mld_leds_exit(mld);</div><div class='add'>+</div><div class='add'>+	iwl_mld_thermal_exit(mld);</div><div class='add'>+</div><div class='add'>+	wiphy_lock(mld-&gt;wiphy);</div><div class='add'>+	iwl_mld_low_latency_stop(mld);</div><div class='add'>+	iwl_mld_deinit_time_sync(mld);</div><div class='add'>+	wiphy_unlock(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ieee80211_unregister_hw(mld-&gt;hw);</div><div class='add'>+</div><div class='add'>+	iwl_fw_runtime_free(&amp;mld-&gt;fwrt);</div><div class='add'>+	iwl_mld_low_latency_free(mld);</div><div class='add'>+</div><div class='add'>+	iwl_trans_op_mode_leave(mld-&gt;trans);</div><div class='add'>+</div><div class='add'>+	kfree(mld-&gt;nvm_data);</div><div class='add'>+	kfree(mld-&gt;scan.cmd);</div><div class='add'>+	kfree(mld-&gt;channel_survey);</div><div class='add'>+	kfree(mld-&gt;error_recovery_buf);</div><div class='add'>+	kfree(mld-&gt;mcast_filter_cmd);</div><div class='add'>+</div><div class='add'>+	ieee80211_free_hw(mld-&gt;hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_queue_state_change(struct iwl_op_mode *op_mode,</div><div class='add'>+				       int hw_queue, bool queue_full)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_OP_MODE_GET_MLD(op_mode);</div><div class='add'>+	struct ieee80211_txq *txq;</div><div class='add'>+	struct iwl_mld_sta *mld_sta;</div><div class='add'>+	struct iwl_mld_txq *mld_txq;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	txq = rcu_dereference(mld-&gt;fw_id_to_txq[hw_queue]);</div><div class='add'>+	if (!txq) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		if (queue_full) {</div><div class='add'>+			/* An internal queue is not expected to become full */</div><div class='add'>+			IWL_WARN(mld,</div><div class='add'>+				 "Internal hw_queue %d is full! stopping all queues\n",</div><div class='add'>+				 hw_queue);</div><div class='add'>+			/* Stop all queues, as an internal queue is not</div><div class='add'>+			 * mapped to a mac80211 one</div><div class='add'>+			 */</div><div class='add'>+			ieee80211_stop_queues(mld-&gt;hw);</div><div class='add'>+		} else {</div><div class='add'>+			ieee80211_wake_queues(mld-&gt;hw);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mld_txq = iwl_mld_txq_from_mac80211(txq);</div><div class='add'>+	mld_sta = txq-&gt;sta ? iwl_mld_sta_from_mac80211(txq-&gt;sta) : NULL;</div><div class='add'>+</div><div class='add'>+	mld_txq-&gt;status.stop_full = queue_full;</div><div class='add'>+</div><div class='add'>+	if (!queue_full &amp;&amp; mld_sta &amp;&amp;</div><div class='add'>+	    mld_sta-&gt;sta_state != IEEE80211_STA_NOTEXIST) {</div><div class='add'>+		local_bh_disable();</div><div class='add'>+		iwl_mld_tx_from_txq(mld, txq);</div><div class='add'>+		local_bh_enable();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_queue_full(struct iwl_op_mode *op_mode, int hw_queue)</div><div class='add'>+{</div><div class='add'>+	iwl_mld_queue_state_change(op_mode, hw_queue, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_queue_not_full(struct iwl_op_mode *op_mode, int hw_queue)</div><div class='add'>+{</div><div class='add'>+	iwl_mld_queue_state_change(op_mode, hw_queue, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+iwl_mld_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_OP_MODE_GET_MLD(op_mode);</div><div class='add'>+</div><div class='add'>+	iwl_mld_set_hwkill(mld, state);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_free_skb(struct iwl_op_mode *op_mode, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_OP_MODE_GET_MLD(op_mode);</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+</div><div class='add'>+	iwl_trans_free_tx_cmd(mld-&gt;trans, info-&gt;driver_data[1]);</div><div class='add'>+	ieee80211_free_txskb(mld-&gt;hw, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_read_error_recovery_buffer(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	u32 src_size = mld-&gt;fw-&gt;ucode_capa.error_log_size;</div><div class='add'>+	u32 src_addr = mld-&gt;fw-&gt;ucode_capa.error_log_addr;</div><div class='add'>+	u8 *recovery_buf;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* no recovery buffer size defined in a TLV */</div><div class='add'>+	if (!src_size)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	recovery_buf = kzalloc(src_size, GFP_ATOMIC);</div><div class='add'>+	if (!recovery_buf)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = iwl_trans_read_mem_bytes(mld-&gt;trans, src_addr,</div><div class='add'>+				       recovery_buf, src_size);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mld, "Failed to read error recovery buffer (%d)\n",</div><div class='add'>+			ret);</div><div class='add'>+		kfree(recovery_buf);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mld-&gt;error_recovery_buf = recovery_buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_restart_nic(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	iwl_mld_read_error_recovery_buffer(mld);</div><div class='add'>+</div><div class='add'>+	mld-&gt;fwrt.trans-&gt;dbg.restart_required = false;</div><div class='add'>+</div><div class='add'>+	ieee80211_restart_hw(mld-&gt;hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_nic_error(struct iwl_op_mode *op_mode,</div><div class='add'>+		  enum iwl_fw_error_type type)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_OP_MODE_GET_MLD(op_mode);</div><div class='add'>+	bool trans_dead = iwl_trans_is_dead(mld-&gt;trans);</div><div class='add'>+</div><div class='add'>+	if (type == IWL_ERR_TYPE_CMD_QUEUE_FULL)</div><div class='add'>+		IWL_ERR(mld, "Command queue full!\n");</div><div class='add'>+	else if (!trans_dead &amp;&amp; !mld-&gt;fw_status.do_not_dump_once)</div><div class='add'>+		iwl_fwrt_dump_error_logs(&amp;mld-&gt;fwrt);</div><div class='add'>+</div><div class='add'>+	mld-&gt;fw_status.do_not_dump_once = false;</div><div class='add'>+</div><div class='add'>+	/* It is necessary to abort any os scan here because mac80211 requires</div><div class='add'>+	 * having the scan cleared before restarting.</div><div class='add'>+	 * We'll reset the scan_status to NONE in restart cleanup in</div><div class='add'>+	 * the next drv_start() call from mac80211. If ieee80211_hw_restart</div><div class='add'>+	 * isn't called scan status will stay busy.</div><div class='add'>+	 */</div><div class='add'>+	iwl_mld_report_scan_aborted(mld);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This should be first thing before trying to collect any</div><div class='add'>+	 * data to avoid endless loops if any HW error happens while</div><div class='add'>+	 * collecting debug data.</div><div class='add'>+	 * It might not actually be true that we'll restart, but the</div><div class='add'>+	 * setting doesn't matter if we're going to be unbound either.</div><div class='add'>+	 */</div><div class='add'>+	if (type != IWL_ERR_TYPE_RESET_HS_TIMEOUT &amp;&amp;</div><div class='add'>+	    mld-&gt;fw_status.running)</div><div class='add'>+		mld-&gt;fw_status.in_hw_restart = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_dump_error(struct iwl_op_mode *op_mode,</div><div class='add'>+			       struct iwl_fw_error_dump_mode *mode)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_OP_MODE_GET_MLD(op_mode);</div><div class='add'>+</div><div class='add'>+	/* if we come in from opmode we have the mutex held */</div><div class='add'>+	if (mode-&gt;context == IWL_ERR_CONTEXT_FROM_OPMODE) {</div><div class='add'>+		lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+		iwl_fw_error_collect(&amp;mld-&gt;fwrt);</div><div class='add'>+	} else {</div><div class='add'>+		wiphy_lock(mld-&gt;wiphy);</div><div class='add'>+		if (mode-&gt;context != IWL_ERR_CONTEXT_ABORT)</div><div class='add'>+			iwl_fw_error_collect(&amp;mld-&gt;fwrt);</div><div class='add'>+		wiphy_unlock(mld-&gt;wiphy);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_sw_reset(struct iwl_op_mode *op_mode,</div><div class='add'>+			     enum iwl_fw_error_type type)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_OP_MODE_GET_MLD(op_mode);</div><div class='add'>+</div><div class='add'>+	/* SW reset can happen for TOP error w/o NIC error, so</div><div class='add'>+	 * also abort scan here and set in_hw_restart, when we</div><div class='add'>+	 * had a NIC error both were already done.</div><div class='add'>+	 */</div><div class='add'>+	iwl_mld_report_scan_aborted(mld);</div><div class='add'>+	mld-&gt;fw_status.in_hw_restart = true;</div><div class='add'>+</div><div class='add'>+	/* Do restart only in the following conditions are met:</div><div class='add'>+	 * - we consider the FW as running</div><div class='add'>+	 * - The trigger that brought us here is defined as one that requires</div><div class='add'>+	 *   a restart (in the debug TLVs)</div><div class='add'>+	 */</div><div class='add'>+	if (!mld-&gt;fw_status.running || !mld-&gt;fwrt.trans-&gt;dbg.restart_required)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	iwl_mld_restart_nic(mld);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_time_point(struct iwl_op_mode *op_mode,</div><div class='add'>+		   enum iwl_fw_ini_time_point tp_id,</div><div class='add'>+		   union iwl_dbg_tlv_tp_data *tp_data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_OP_MODE_GET_MLD(op_mode);</div><div class='add'>+</div><div class='add'>+	iwl_dbg_tlv_time_point(&amp;mld-&gt;fwrt, tp_id, tp_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static void iwl_mld_device_powered_off(struct iwl_op_mode *op_mode)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_OP_MODE_GET_MLD(op_mode);</div><div class='add'>+</div><div class='add'>+	wiphy_lock(mld-&gt;wiphy);</div><div class='add'>+	iwl_mld_stop_fw(mld);</div><div class='add'>+	mld-&gt;fw_status.in_d3 = false;</div><div class='add'>+	wiphy_unlock(mld-&gt;wiphy);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void iwl_mld_device_powered_off(struct iwl_op_mode *op_mode)</div><div class='add'>+{}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void iwl_mld_dump(struct iwl_op_mode *op_mode)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_OP_MODE_GET_MLD(op_mode);</div><div class='add'>+	struct iwl_fw_runtime *fwrt = &amp;mld-&gt;fwrt;</div><div class='add'>+</div><div class='add'>+	if (!iwl_trans_fw_running(fwrt-&gt;trans))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_dbg_tlv_time_point(fwrt, IWL_FW_INI_TIME_POINT_USER_TRIGGER, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iwl_op_mode_ops iwl_mld_ops = {</div><div class='add'>+	.start = iwl_op_mode_mld_start,</div><div class='add'>+	.stop = iwl_op_mode_mld_stop,</div><div class='add'>+	.rx = iwl_mld_rx,</div><div class='add'>+	.rx_rss = iwl_mld_rx_rss,</div><div class='add'>+	.queue_full = iwl_mld_queue_full,</div><div class='add'>+	.queue_not_full = iwl_mld_queue_not_full,</div><div class='add'>+	.hw_rf_kill = iwl_mld_set_hw_rfkill_state,</div><div class='add'>+	.free_skb = iwl_mld_free_skb,</div><div class='add'>+	.nic_error = iwl_mld_nic_error,</div><div class='add'>+	.dump_error = iwl_mld_dump_error,</div><div class='add'>+	.sw_reset = iwl_mld_sw_reset,</div><div class='add'>+	.time_point = iwl_mld_time_point,</div><div class='add'>+	.device_powered_off = pm_sleep_ptr(iwl_mld_device_powered_off),</div><div class='add'>+	.dump = iwl_mld_dump,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_mld_mod_params iwlmld_mod_params = {</div><div class='add'>+	.power_scheme = IWL_POWER_SCHEME_BPS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_param_named(power_scheme, iwlmld_mod_params.power_scheme, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(power_scheme,</div><div class='add'>+		 "power management scheme: 1-active, 2-balanced, default: 2");</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/mld.h b/drivers/net/wireless/intel/iwlwifi/mld/mld.h<br/>new file mode 100644<br/>index 000000000000..22efe8e10f53<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/mld.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/mld.h</a></div><div class='hunk'>@@ -0,0 +1,615 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_h__</div><div class='add'>+#define __iwl_mld_h__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "iwl-trans.h"</div><div class='add'>+#include "iwl-op-mode.h"</div><div class='add'>+#include "fw/runtime.h"</div><div class='add'>+#include "fw/notif-wait.h"</div><div class='add'>+#include "fw/api/commands.h"</div><div class='add'>+#include "fw/api/scan.h"</div><div class='add'>+#include "fw/api/mac-cfg.h"</div><div class='add'>+#include "fw/api/mac.h"</div><div class='add'>+#include "fw/api/phy-ctxt.h"</div><div class='add'>+#include "fw/api/datapath.h"</div><div class='add'>+#include "fw/api/rx.h"</div><div class='add'>+#include "fw/api/rs.h"</div><div class='add'>+#include "fw/api/context.h"</div><div class='add'>+#include "fw/api/coex.h"</div><div class='add'>+#include "fw/api/location.h"</div><div class='add'>+</div><div class='add'>+#include "fw/dbg.h"</div><div class='add'>+</div><div class='add'>+#include "notif.h"</div><div class='add'>+#include "scan.h"</div><div class='add'>+#include "rx.h"</div><div class='add'>+#include "thermal.h"</div><div class='add'>+#include "low_latency.h"</div><div class='add'>+#include "constants.h"</div><div class='add'>+#include "ptp.h"</div><div class='add'>+#include "time_sync.h"</div><div class='add'>+#include "ftm-initiator.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Introduction</div><div class='add'>+ *</div><div class='add'>+ * iwlmld is an operation mode (a.k.a. op_mode) for Intel wireless devices.</div><div class='add'>+ * It is used for devices that ship after 2024 which typically support</div><div class='add'>+ * the WiFi-7 features. MLD stands for multi-link device. Note that there are</div><div class='add'>+ * devices that do not support WiFi-7 or even WiFi 6E and yet use iwlmld, but</div><div class='add'>+ * the firmware APIs used in this driver are WiFi-7 compatible.</div><div class='add'>+ *</div><div class='add'>+ * In the architecture of iwlwifi, an op_mode is a layer that translates</div><div class='add'>+ * mac80211's APIs into commands for the firmware and, of course, notifications</div><div class='add'>+ * from the firmware to mac80211's APIs. An op_mode must implement the</div><div class='add'>+ * interface defined in iwl-op-mode.h to interact with the transport layer</div><div class='add'>+ * which allows to send and receive data to the device, start the hardware,</div><div class='add'>+ * etc...</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Locking policy</div><div class='add'>+ *</div><div class='add'>+ * iwlmld has a very simple locking policy: it doesn't have any mutexes. It</div><div class='add'>+ * relies on cfg80211's wiphy-&gt;mtx and takes the lock when needed. All the</div><div class='add'>+ * control flows originating from mac80211 already acquired the lock, so that</div><div class='add'>+ * part is trivial, but also notifications that are received from the firmware</div><div class='add'>+ * and handled asynchronously are handled only after having taken the lock.</div><div class='add'>+ * This is described in notif.c.</div><div class='add'>+ * There are spin_locks needed to synchronize with the data path, around the</div><div class='add'>+ * allocation of the queues, for example.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Debugfs</div><div class='add'>+ *</div><div class='add'>+ * iwlmld adds its share of debugfs hooks and its handlers are synchronized</div><div class='add'>+ * with the wiphy_lock using wiphy_locked_debugfs. This avoids races against</div><div class='add'>+ * resources deletion while the debugfs hook is being used.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Main resources</div><div class='add'>+ *</div><div class='add'>+ * iwlmld is designed with the life cycle of the resource in mind. The</div><div class='add'>+ * resources are:</div><div class='add'>+ *</div><div class='add'>+ *  - struct iwl_mld (matches mac80211's struct ieee80211_hw)</div><div class='add'>+ *</div><div class='add'>+ *  - struct iwl_mld_vif (matches macu80211's struct ieee80211_vif)</div><div class='add'>+ *    iwl_mld_vif contains an array of pointers to struct iwl_mld_link</div><div class='add'>+ *    which describe the links for this vif.</div><div class='add'>+ *</div><div class='add'>+ *  - struct iwl_mld_sta (matches mac80211's struct ieee80211_sta)</div><div class='add'>+ *    iwl_mld_sta contains an array of points to struct iwl_mld_link_sta</div><div class='add'>+ *    which describes the link stations for this station</div><div class='add'>+ *</div><div class='add'>+ * Each object has properties that can survive a firmware reset or not.</div><div class='add'>+ * Asynchronous firmware notifications can declare themselves as dependent on a</div><div class='add'>+ * certain instance of those resources and that means that the notifications</div><div class='add'>+ * will be cancelled once the instance is destroyed.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_MAX_ADDRESSES		5</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld - MLD op mode</div><div class='add'>+ *</div><div class='add'>+ * @fw_id_to_bss_conf: maps a fw id of a link to the corresponding</div><div class='add'>+ *	ieee80211_bss_conf.</div><div class='add'>+ * @fw_id_to_vif: maps a fw id of a MAC context to the corresponding</div><div class='add'>+ *	ieee80211_vif. Mapping is valid only when the MAC exists in the fw.</div><div class='add'>+ * @fw_id_to_txq: maps a fw id of a txq to the corresponding</div><div class='add'>+ *	ieee80211_txq.</div><div class='add'>+ * @used_phy_ids: a bitmap of the phy IDs used. If a bit is set, it means</div><div class='add'>+ *	that the index of this bit is already used as a PHY id.</div><div class='add'>+ * @num_igtks: the number if iGTKs that were sent to the FW.</div><div class='add'>+ * @monitor: monitor related data</div><div class='add'>+ * @monitor.on: does a monitor vif exist (singleton hence bool)</div><div class='add'>+ * @monitor.ampdu_ref: the id of the A-MPDU for sniffer</div><div class='add'>+ * @monitor.ampdu_toggle: the state of the previous packet to track A-MPDU</div><div class='add'>+ * @monitor.cur_aid: current association id tracked by the sniffer</div><div class='add'>+ * @monitor.cur_bssid: current bssid tracked by the sniffer</div><div class='add'>+ * @monitor.ptp_time: set the Rx mactime using the device's PTP clock time</div><div class='add'>+ * @monitor.p80: primary channel position relative to he whole bandwidth, in</div><div class='add'>+ *	steps of 80 MHz</div><div class='add'>+ * @monitor.phy: PHY data information</div><div class='add'>+ * @monitor.phy.data: PHY data (&amp;struct iwl_rx_phy_air_sniffer_ntfy) received</div><div class='add'>+ * @monitor.phy.valid: PHY data is valid (was received)</div><div class='add'>+ * @monitor.phy.used: PHY data was used by an RX</div><div class='add'>+ * @fw_id_to_link_sta: maps a fw id of a sta to the corresponding</div><div class='add'>+ *	ieee80211_link_sta. This is not cleaned up on restart since we want to</div><div class='add'>+ *	preserve the fw sta ids during a restart (for SN/PN restoring).</div><div class='add'>+ *	FW ids of internal stations will be mapped to ERR_PTR, and will be</div><div class='add'>+ *	re-allocated during a restart, so make sure to free it in restart</div><div class='add'>+ *	cleanup using iwl_mld_free_internal_sta</div><div class='add'>+ * @netdetect: indicates the FW is in suspend mode with netdetect configured</div><div class='add'>+ * @p2p_device_vif: points to the p2p device vif if exists</div><div class='add'>+ * @bt_is_active: indicates that BT is active</div><div class='add'>+ * @dev: pointer to device struct. For printing purposes</div><div class='add'>+ * @trans: pointer to the transport layer</div><div class='add'>+ * @cfg: pointer to the device configuration</div><div class='add'>+ * @fw: a pointer to the fw object</div><div class='add'>+ * @hw: pointer to the hw object.</div><div class='add'>+ * @wiphy: a pointer to the wiphy struct, for easier access to it.</div><div class='add'>+ * @ext_capab: extended capabilities that will be set to wiphy on registration.</div><div class='add'>+ * @sta_ext_capab: extended capabilities for the station interface.</div><div class='add'>+ * @nvm_data: pointer to the nvm_data that includes all our capabilities</div><div class='add'>+ * @fwrt: fw runtime data</div><div class='add'>+ * @debugfs_dir: debugfs directory</div><div class='add'>+ * @notif_wait: notification wait related data.</div><div class='add'>+ * @async_handlers_list: a list of all async RX handlers. When a notifciation</div><div class='add'>+ *	with an async handler is received, it is added to this list.</div><div class='add'>+ *	When &amp;async_handlers_wk runs - it runs these handlers one by one.</div><div class='add'>+ * @async_handlers_lock: a lock for &amp;async_handlers_list. Sync</div><div class='add'>+ *	&amp;async_handlers_wk and RX notifcation path.</div><div class='add'>+ * @async_handlers_wk: A work to run all async RX handlers from</div><div class='add'>+ *	&amp;async_handlers_list.</div><div class='add'>+ * @ct_kill_exit_wk: worker to exit thermal kill</div><div class='add'>+ * @fw_status: bitmap of fw status bits</div><div class='add'>+ * @running: true if the firmware is running</div><div class='add'>+ * @do_not_dump_once: true if firmware dump must be prevented once</div><div class='add'>+ * @in_d3: indicates FW is in suspend mode and should be resumed</div><div class='add'>+ * @resuming: indicates the driver is resuming from wowlan</div><div class='add'>+ * @in_hw_restart: indicates that we are currently in restart flow.</div><div class='add'>+ *	rather than restarted. Should be unset upon restart.</div><div class='add'>+ * @radio_kill: bitmap of radio kill status</div><div class='add'>+ * @radio_kill.hw: radio is killed by hw switch</div><div class='add'>+ * @radio_kill.ct: radio is killed because the device it too hot</div><div class='add'>+ * @power_budget_mw: maximum cTDP power budget as defined for this system and</div><div class='add'>+ *	device</div><div class='add'>+ * @addresses: device MAC addresses.</div><div class='add'>+ * @scan: instance of the scan object</div><div class='add'>+ * @channel_survey: channel survey information collected during scan</div><div class='add'>+ * @wowlan: WoWLAN support data.</div><div class='add'>+ * @debug_max_sleep: maximum sleep time in D3 (for debug purposes)</div><div class='add'>+ * @led: the led device</div><div class='add'>+ * @mcc_src: the source id of the MCC, comes from the firmware</div><div class='add'>+ * @bios_enable_puncturing: is puncturing enabled by bios</div><div class='add'>+ * @fw_id_to_ba: maps a fw (BA) id to a corresponding Block Ack session data.</div><div class='add'>+ * @num_rx_ba_sessions: tracks the number of active Rx Block Ack (BA) sessions.</div><div class='add'>+ *	the driver ensures that new BA sessions are blocked once the maximum</div><div class='add'>+ *	supported by the firmware is reached, preventing firmware asserts.</div><div class='add'>+ * @rxq_sync: manages RX queue sync state</div><div class='add'>+ * @txqs_to_add: a list of &amp;ieee80211_txq's to allocate in &amp;add_txqs_wk</div><div class='add'>+ * @add_txqs_wk: a worker to allocate txqs.</div><div class='add'>+ * @add_txqs_lock: to lock the &amp;txqs_to_add list.</div><div class='add'>+ * @error_recovery_buf: pointer to the recovery buffer that will be read</div><div class='add'>+ *	from firmware upon fw/hw error and sent back to the firmware in</div><div class='add'>+ *	reconfig flow (after NIC reset).</div><div class='add'>+ * @mcast_filter_cmd: pointer to the multicast filter command.</div><div class='add'>+ * @mgmt_tx_ant: stores the last TX antenna index; used for setting</div><div class='add'>+ *	TX rate_n_flags for non-STA mgmt frames (toggles on every TX failure).</div><div class='add'>+ * @set_tx_ant: stores the last TX antenna bitmask set by user space (if any)</div><div class='add'>+ * @set_rx_ant: stores the last RX antenna bitmask set by user space (if any)</div><div class='add'>+ * @fw_rates_ver_3: FW rates are in version 3</div><div class='add'>+ * @low_latency: low-latency manager.</div><div class='add'>+ * @tzone: thermal zone device's data</div><div class='add'>+ * @cooling_dev: cooling device's related data</div><div class='add'>+ * @ibss_manager: in IBSS mode (only one vif can be active), indicates what</div><div class='add'>+ *	firmware indicated about having transmitted the last beacon, i.e.</div><div class='add'>+ *	being IBSS manager for that time and needing to respond to probe</div><div class='add'>+ *	requests</div><div class='add'>+ * @ptp_data: data of the PTP clock</div><div class='add'>+ * @time_sync: time sync data.</div><div class='add'>+ * @ftm_initiator: FTM initiator data</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld {</div><div class='add'>+	/* Add here fields that need clean up on restart */</div><div class='add'>+	struct_group(zeroed_on_hw_restart,</div><div class='add'>+		struct ieee80211_bss_conf __rcu *fw_id_to_bss_conf[IWL_FW_MAX_LINK_ID + 1];</div><div class='add'>+		struct ieee80211_vif __rcu *fw_id_to_vif[NUM_MAC_INDEX_DRIVER];</div><div class='add'>+		struct ieee80211_txq __rcu *fw_id_to_txq[IWL_MAX_TVQM_QUEUES];</div><div class='add'>+		u8 used_phy_ids: NUM_PHY_CTX;</div><div class='add'>+		u8 num_igtks;</div><div class='add'>+		struct {</div><div class='add'>+			bool on;</div><div class='add'>+			u32 ampdu_ref;</div><div class='add'>+			bool ampdu_toggle;</div><div class='add'>+			u8 p80;</div><div class='add'>+			struct {</div><div class='add'>+				struct iwl_rx_phy_air_sniffer_ntfy data;</div><div class='add'>+				u8 valid:1, used:1;</div><div class='add'>+			} phy;</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='add'>+			__le16 cur_aid;</div><div class='add'>+			u8 cur_bssid[ETH_ALEN];</div><div class='add'>+			bool ptp_time;</div><div class='add'>+#endif</div><div class='add'>+		} monitor;</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+		bool netdetect;</div><div class='add'>+#endif /* CONFIG_PM_SLEEP */</div><div class='add'>+		struct ieee80211_vif *p2p_device_vif;</div><div class='add'>+		bool bt_is_active;</div><div class='add'>+	);</div><div class='add'>+	struct ieee80211_link_sta __rcu *fw_id_to_link_sta[IWL_STATION_COUNT_MAX];</div><div class='add'>+	/* And here fields that survive a fw restart */</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct iwl_trans *trans;</div><div class='add'>+	const struct iwl_rf_cfg *cfg;</div><div class='add'>+	const struct iwl_fw *fw;</div><div class='add'>+	struct ieee80211_hw *hw;</div><div class='add'>+	struct wiphy *wiphy;</div><div class='add'>+	struct wiphy_iftype_ext_capab ext_capab[IWL_MLD_EXT_CAPA_NUM_IFTYPES];</div><div class='add'>+	u8 sta_ext_capab[IWL_MLD_STA_EXT_CAPA_SIZE];</div><div class='add'>+	struct iwl_nvm_data *nvm_data;</div><div class='add'>+	struct iwl_fw_runtime fwrt;</div><div class='add'>+	struct dentry *debugfs_dir;</div><div class='add'>+	struct iwl_notif_wait_data notif_wait;</div><div class='add'>+	struct list_head async_handlers_list;</div><div class='add'>+	spinlock_t async_handlers_lock;</div><div class='add'>+	struct wiphy_work async_handlers_wk;</div><div class='add'>+	struct wiphy_delayed_work ct_kill_exit_wk;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u32 running:1,</div><div class='add'>+		    do_not_dump_once:1,</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+		    in_d3:1,</div><div class='add'>+		    resuming:1,</div><div class='add'>+#endif</div><div class='add'>+		    in_hw_restart:1;</div><div class='add'>+</div><div class='add'>+	} fw_status;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u32 hw:1,</div><div class='add'>+		    ct:1;</div><div class='add'>+	} radio_kill;</div><div class='add'>+</div><div class='add'>+	u32 power_budget_mw;</div><div class='add'>+</div><div class='add'>+	struct mac_address addresses[IWL_MLD_MAX_ADDRESSES];</div><div class='add'>+	struct iwl_mld_scan scan;</div><div class='add'>+	struct iwl_mld_survey *channel_survey;</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	struct wiphy_wowlan_support wowlan;</div><div class='add'>+	u32 debug_max_sleep;</div><div class='add'>+#endif /* CONFIG_PM_SLEEP */</div><div class='add'>+#ifdef CONFIG_IWLWIFI_LEDS</div><div class='add'>+	struct led_classdev led;</div><div class='add'>+#endif</div><div class='add'>+	enum iwl_mcc_source mcc_src;</div><div class='add'>+	bool bios_enable_puncturing;</div><div class='add'>+</div><div class='add'>+	struct iwl_mld_baid_data __rcu *fw_id_to_ba[IWL_MAX_BAID];</div><div class='add'>+	u8 num_rx_ba_sessions;</div><div class='add'>+</div><div class='add'>+	struct iwl_mld_rx_queues_sync rxq_sync;</div><div class='add'>+</div><div class='add'>+	struct list_head txqs_to_add;</div><div class='add'>+	struct wiphy_work add_txqs_wk;</div><div class='add'>+	spinlock_t add_txqs_lock;</div><div class='add'>+</div><div class='add'>+	u8 *error_recovery_buf;</div><div class='add'>+	struct iwl_mcast_filter_cmd *mcast_filter_cmd;</div><div class='add'>+</div><div class='add'>+	u8 mgmt_tx_ant;</div><div class='add'>+</div><div class='add'>+	u8 set_tx_ant;</div><div class='add'>+	u8 set_rx_ant;</div><div class='add'>+</div><div class='add'>+	bool fw_rates_ver_3;</div><div class='add'>+</div><div class='add'>+	struct iwl_mld_low_latency low_latency;</div><div class='add'>+</div><div class='add'>+	bool ibss_manager;</div><div class='add'>+#ifdef CONFIG_THERMAL</div><div class='add'>+	struct thermal_zone_device *tzone;</div><div class='add'>+	struct iwl_mld_cooling_device cooling_dev;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	struct ptp_data ptp_data;</div><div class='add'>+</div><div class='add'>+	struct iwl_mld_time_sync_data __rcu *time_sync;</div><div class='add'>+</div><div class='add'>+	struct ftm_initiator_data ftm_initiator;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* memset the part of the struct that requires cleanup on restart */</div><div class='add'>+#define CLEANUP_STRUCT(_ptr)                             \</div><div class='add'>+	memset((void *)&amp;(_ptr)-&gt;zeroed_on_hw_restart, 0, \</div><div class='add'>+	       sizeof((_ptr)-&gt;zeroed_on_hw_restart))</div><div class='add'>+</div><div class='add'>+/* Cleanup function for struct iwl_mld, will be called in restart */</div><div class='add'>+static inline void</div><div class='add'>+iwl_cleanup_mld(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	CLEANUP_STRUCT(mld);</div><div class='add'>+	CLEANUP_STRUCT(&amp;mld-&gt;scan);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	mld-&gt;fw_status.in_d3 = false;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	iwl_mld_low_latency_restart_cleanup(mld);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum iwl_power_scheme {</div><div class='add'>+	IWL_POWER_SCHEME_CAM = 1,</div><div class='add'>+	IWL_POWER_SCHEME_BPS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_mod_params - module parameters for iwlmld</div><div class='add'>+ * @power_scheme: one of enum iwl_power_scheme</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_mod_params {</div><div class='add'>+	int power_scheme;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct iwl_mld_mod_params iwlmld_mod_params;</div><div class='add'>+</div><div class='add'>+/* Extract MLD priv from op_mode */</div><div class='add'>+#define IWL_OP_MODE_GET_MLD(_iwl_op_mode)		\</div><div class='add'>+	((struct iwl_mld *)(_iwl_op_mode)-&gt;op_mode_specific)</div><div class='add'>+</div><div class='add'>+#define IWL_MAC80211_GET_MLD(_hw)			\</div><div class='add'>+	IWL_OP_MODE_GET_MLD((struct iwl_op_mode *)((_hw)-&gt;priv))</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='add'>+void</div><div class='add'>+iwl_mld_add_debugfs_files(struct iwl_mld *mld, struct dentry *debugfs_dir);</div><div class='add'>+#else</div><div class='add'>+static inline void</div><div class='add'>+iwl_mld_add_debugfs_files(struct iwl_mld *mld, struct dentry *debugfs_dir)</div><div class='add'>+{}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int iwl_mld_load_fw(struct iwl_mld *mld);</div><div class='add'>+void iwl_mld_stop_fw(struct iwl_mld *mld);</div><div class='add'>+int iwl_mld_start_fw(struct iwl_mld *mld);</div><div class='add'>+void iwl_mld_send_recovery_cmd(struct iwl_mld *mld, u32 flags);</div><div class='add'>+</div><div class='add'>+static inline void iwl_mld_set_ctkill(struct iwl_mld *mld, bool state)</div><div class='add'>+{</div><div class='add'>+	mld-&gt;radio_kill.ct = state;</div><div class='add'>+</div><div class='add'>+	wiphy_rfkill_set_hw_state(mld-&gt;wiphy,</div><div class='add'>+				  mld-&gt;radio_kill.hw || mld-&gt;radio_kill.ct);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void iwl_mld_set_hwkill(struct iwl_mld *mld, bool state)</div><div class='add'>+{</div><div class='add'>+	mld-&gt;radio_kill.hw = state;</div><div class='add'>+</div><div class='add'>+	wiphy_rfkill_set_hw_state(mld-&gt;wiphy,</div><div class='add'>+				  mld-&gt;radio_kill.hw || mld-&gt;radio_kill.ct);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 iwl_mld_get_valid_tx_ant(const struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	u8 tx_ant = mld-&gt;fw-&gt;valid_tx_ant;</div><div class='add'>+</div><div class='add'>+	if (mld-&gt;nvm_data &amp;&amp; mld-&gt;nvm_data-&gt;valid_tx_ant)</div><div class='add'>+		tx_ant &amp;= mld-&gt;nvm_data-&gt;valid_tx_ant;</div><div class='add'>+</div><div class='add'>+	if (mld-&gt;set_tx_ant)</div><div class='add'>+		tx_ant &amp;= mld-&gt;set_tx_ant;</div><div class='add'>+</div><div class='add'>+	return tx_ant;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 iwl_mld_get_valid_rx_ant(const struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	u8 rx_ant = mld-&gt;fw-&gt;valid_rx_ant;</div><div class='add'>+</div><div class='add'>+	if (mld-&gt;nvm_data &amp;&amp; mld-&gt;nvm_data-&gt;valid_rx_ant)</div><div class='add'>+		rx_ant &amp;= mld-&gt;nvm_data-&gt;valid_rx_ant;</div><div class='add'>+</div><div class='add'>+	if (mld-&gt;set_rx_ant)</div><div class='add'>+		rx_ant &amp;= mld-&gt;set_rx_ant;</div><div class='add'>+</div><div class='add'>+	return rx_ant;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 iwl_mld_nl80211_band_to_fw(enum nl80211_band band)</div><div class='add'>+{</div><div class='add'>+	switch (band) {</div><div class='add'>+	case NL80211_BAND_2GHZ:</div><div class='add'>+		return PHY_BAND_24;</div><div class='add'>+	case NL80211_BAND_5GHZ:</div><div class='add'>+		return PHY_BAND_5;</div><div class='add'>+	case NL80211_BAND_6GHZ:</div><div class='add'>+		return PHY_BAND_6;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ONCE(1, "Unsupported band (%u)\n", band);</div><div class='add'>+		return PHY_BAND_5;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 iwl_mld_phy_band_to_nl80211(u8 phy_band)</div><div class='add'>+{</div><div class='add'>+	switch (phy_band) {</div><div class='add'>+	case PHY_BAND_24:</div><div class='add'>+		return NL80211_BAND_2GHZ;</div><div class='add'>+	case PHY_BAND_5:</div><div class='add'>+		return NL80211_BAND_5GHZ;</div><div class='add'>+	case PHY_BAND_6:</div><div class='add'>+		return NL80211_BAND_6GHZ;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ONCE(1, "Unsupported phy band (%u)\n", phy_band);</div><div class='add'>+		return NL80211_BAND_5GHZ;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+iwl_mld_legacy_hw_idx_to_mac80211_idx(u32 rate_n_flags,</div><div class='add'>+				      enum nl80211_band band)</div><div class='add'>+{</div><div class='add'>+	int format = rate_n_flags &amp; RATE_MCS_MOD_TYPE_MSK;</div><div class='add'>+	int rate = rate_n_flags &amp; RATE_LEGACY_RATE_MSK;</div><div class='add'>+	bool is_lb = band == NL80211_BAND_2GHZ;</div><div class='add'>+</div><div class='add'>+	if (format == RATE_MCS_MOD_TYPE_LEGACY_OFDM)</div><div class='add'>+		return is_lb ? rate + IWL_FIRST_OFDM_RATE : rate;</div><div class='add'>+</div><div class='add'>+	/* CCK is not allowed in 5 GHz */</div><div class='add'>+	return is_lb ? rate : -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern const struct ieee80211_ops iwl_mld_hw_ops;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_rx_handler_context: context for Rx handler</div><div class='add'>+ * @RX_HANDLER_SYNC: this means that it will be called in the Rx path</div><div class='add'>+ *	which can't acquire the wiphy-&gt;mutex.</div><div class='add'>+ * @RX_HANDLER_ASYNC: If the handler needs to hold wiphy-&gt;mutex</div><div class='add'>+ *	(and only in this case!), it should be set as ASYNC. In that case,</div><div class='add'>+ *	it will be called from a worker with wiphy-&gt;mutex held.</div><div class='add'>+ */</div><div class='add'>+enum iwl_rx_handler_context {</div><div class='add'>+	RX_HANDLER_SYNC,</div><div class='add'>+	RX_HANDLER_ASYNC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_rx_handler: handler for FW notification</div><div class='add'>+ * @val_fn: input validation function.</div><div class='add'>+ * @sizes: an array that mapps a version to the expected size.</div><div class='add'>+ * @fn: the function is called when notification is handled</div><div class='add'>+ * @cmd_id: command id</div><div class='add'>+ * @n_sizes: number of elements in &amp;sizes.</div><div class='add'>+ * @context: see &amp;iwl_rx_handler_context</div><div class='add'>+ * @obj_type: the type of the object that this handler is related to.</div><div class='add'>+ *	See &amp;iwl_mld_object_type. Use IWL_MLD_OBJECT_TYPE_NONE if not related.</div><div class='add'>+ * @cancel: function to cancel the notification. valid only if obj_type is not</div><div class='add'>+ *	IWL_MLD_OBJECT_TYPE_NONE.</div><div class='add'>+ */</div><div class='add'>+struct iwl_rx_handler {</div><div class='add'>+	union {</div><div class='add'>+		bool (*val_fn)(struct iwl_mld *mld, struct iwl_rx_packet *pkt);</div><div class='add'>+		const struct iwl_notif_struct_size *sizes;</div><div class='add'>+	};</div><div class='add'>+	void (*fn)(struct iwl_mld *mld, struct iwl_rx_packet *pkt);</div><div class='add'>+	u16 cmd_id;</div><div class='add'>+	u8 n_sizes;</div><div class='add'>+	u8 context;</div><div class='add'>+	enum iwl_mld_object_type obj_type;</div><div class='add'>+	bool (*cancel)(struct iwl_mld *mld, struct iwl_rx_packet *pkt,</div><div class='add'>+		       u32 obj_id);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_notif_struct_size: map a notif ver to the expected size</div><div class='add'>+ *</div><div class='add'>+ * @size: the size to expect</div><div class='add'>+ * @ver: the version of the notification</div><div class='add'>+ */</div><div class='add'>+struct iwl_notif_struct_size {</div><div class='add'>+	u32 size:24, ver:8;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IWLWIFI_KUNIT_TESTS)</div><div class='add'>+extern const struct iwl_hcmd_arr iwl_mld_groups[];</div><div class='add'>+extern const unsigned int global_iwl_mld_goups_size;</div><div class='add'>+extern const struct iwl_rx_handler iwl_mld_rx_handlers[];</div><div class='add'>+extern const unsigned int iwl_mld_rx_handlers_num;</div><div class='add'>+</div><div class='add'>+bool</div><div class='add'>+iwl_mld_is_dup(struct iwl_mld *mld, struct ieee80211_sta *sta,</div><div class='add'>+	       struct ieee80211_hdr *hdr,</div><div class='add'>+	       const struct iwl_rx_mpdu_desc *mpdu_desc,</div><div class='add'>+	       struct ieee80211_rx_status *rx_status, int queue);</div><div class='add'>+</div><div class='add'>+void iwl_construct_mld(struct iwl_mld *mld, struct iwl_trans *trans,</div><div class='add'>+		       const struct iwl_rf_cfg *cfg, const struct iwl_fw *fw,</div><div class='add'>+		       struct ieee80211_hw *hw, struct dentry *dbgfs_dir);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_INVALID_FW_ID 0xff</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_ALLOC_FN(_type, _mac80211_type)						\</div><div class='add'>+static int										\</div><div class='add'>+iwl_mld_allocate_##_type##_fw_id(struct iwl_mld *mld,					\</div><div class='add'>+				 u8 *fw_id,				\</div><div class='add'>+				 struct ieee80211_##_mac80211_type *mac80211_ptr)	\</div><div class='add'>+{											\</div><div class='add'>+	u8 rand = IWL_MLD_DIS_RANDOM_FW_ID ? 0 : get_random_u8();			\</div><div class='add'>+	u8 arr_sz = ARRAY_SIZE(mld-&gt;fw_id_to_##_mac80211_type);				\</div><div class='add'>+	if (__builtin_types_compatible_p(typeof(*mac80211_ptr),				\</div><div class='add'>+					 struct ieee80211_link_sta))			\</div><div class='add'>+		arr_sz = mld-&gt;fw-&gt;ucode_capa.num_stations;				\</div><div class='add'>+	if (__builtin_types_compatible_p(typeof(*mac80211_ptr),				\</div><div class='add'>+					 struct ieee80211_bss_conf))			\</div><div class='add'>+		arr_sz = mld-&gt;fw-&gt;ucode_capa.num_links;					\</div><div class='add'>+	for (int i = 0; i &lt; arr_sz; i++) {						\</div><div class='add'>+		u8 idx = (i + rand) % arr_sz;						\</div><div class='add'>+		if (rcu_access_pointer(mld-&gt;fw_id_to_##_mac80211_type[idx]))		\</div><div class='add'>+			continue;							\</div><div class='add'>+		IWL_DEBUG_INFO(mld, "Allocated at index %d / %d\n", idx, arr_sz);	\</div><div class='add'>+		*fw_id = idx;								\</div><div class='add'>+		rcu_assign_pointer(mld-&gt;fw_id_to_##_mac80211_type[idx], mac80211_ptr);	\</div><div class='add'>+		return 0;								\</div><div class='add'>+	}										\</div><div class='add'>+	return -ENOSPC;									\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct ieee80211_bss_conf *</div><div class='add'>+iwl_mld_fw_id_to_link_conf(struct iwl_mld *mld, u8 fw_link_id)</div><div class='add'>+{</div><div class='add'>+	if (IWL_FW_CHECK(mld, fw_link_id &gt;= mld-&gt;fw-&gt;ucode_capa.num_links,</div><div class='add'>+			 "Invalid fw_link_id: %d\n", fw_link_id))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return wiphy_dereference(mld-&gt;wiphy,</div><div class='add'>+				 mld-&gt;fw_id_to_bss_conf[fw_link_id]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MSEC_TO_TU(_msec)	((_msec) * 1000 / 1024)</div><div class='add'>+</div><div class='add'>+void iwl_mld_add_vif_debugfs(struct ieee80211_hw *hw,</div><div class='add'>+			     struct ieee80211_vif *vif);</div><div class='add'>+void iwl_mld_add_link_debugfs(struct ieee80211_hw *hw,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			      struct dentry *dir);</div><div class='add'>+void iwl_mld_add_link_sta_debugfs(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  struct ieee80211_link_sta *link_sta,</div><div class='add'>+				  struct dentry *dir);</div><div class='add'>+</div><div class='add'>+/* Utilities */</div><div class='add'>+</div><div class='add'>+static inline u8 iwl_mld_mac80211_ac_to_fw_tx_fifo(enum ieee80211_ac_numbers ac)</div><div class='add'>+{</div><div class='add'>+	static const u8 mac80211_ac_to_fw_tx_fifo[] = {</div><div class='add'>+		IWL_BZ_EDCA_TX_FIFO_VO,</div><div class='add'>+		IWL_BZ_EDCA_TX_FIFO_VI,</div><div class='add'>+		IWL_BZ_EDCA_TX_FIFO_BE,</div><div class='add'>+		IWL_BZ_EDCA_TX_FIFO_BK,</div><div class='add'>+		IWL_BZ_TRIG_TX_FIFO_VO,</div><div class='add'>+		IWL_BZ_TRIG_TX_FIFO_VI,</div><div class='add'>+		IWL_BZ_TRIG_TX_FIFO_BE,</div><div class='add'>+		IWL_BZ_TRIG_TX_FIFO_BK,</div><div class='add'>+	};</div><div class='add'>+	return mac80211_ac_to_fw_tx_fifo[ac];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+iwl_mld_get_lmac_id(struct iwl_mld *mld, enum nl80211_band band)</div><div class='add'>+{</div><div class='add'>+	if (!fw_has_capa(&amp;mld-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			 IWL_UCODE_TLV_CAPA_CDB_SUPPORT) ||</div><div class='add'>+	    band == NL80211_BAND_2GHZ)</div><div class='add'>+		return IWL_LMAC_24G_INDEX;</div><div class='add'>+	return IWL_LMAC_5G_INDEX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Check if we had an error, but reconfig flow didn't start yet */</div><div class='add'>+static inline bool iwl_mld_error_before_recovery(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	return mld-&gt;fw_status.in_hw_restart &amp;&amp;</div><div class='add'>+		!iwl_trans_fw_running(mld-&gt;trans);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_tdls_sta_count(struct iwl_mld *mld);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/mlo.c b/drivers/net/wireless/intel/iwlwifi/mld/mlo.c<br/>new file mode 100644<br/>index 000000000000..c6b151f26921<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/mlo.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/mlo.c</a></div><div class='hunk'>@@ -0,0 +1,1199 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include "mlo.h"</div><div class='add'>+#include "phy.h"</div><div class='add'>+</div><div class='add'>+/* Block reasons helper */</div><div class='add'>+#define HANDLE_EMLSR_BLOCKED_REASONS(HOW)	\</div><div class='add'>+	HOW(PREVENTION)			\</div><div class='add'>+	HOW(WOWLAN)			\</div><div class='add'>+	HOW(ROC)			\</div><div class='add'>+	HOW(NON_BSS)			\</div><div class='add'>+	HOW(TMP_NON_BSS)		\</div><div class='add'>+	HOW(TPT)</div><div class='add'>+</div><div class='add'>+static const char *</div><div class='add'>+iwl_mld_get_emlsr_blocked_string(enum iwl_mld_emlsr_blocked blocked)</div><div class='add'>+{</div><div class='add'>+	/* Using switch without "default" will warn about missing entries  */</div><div class='add'>+	switch (blocked) {</div><div class='add'>+#define REASON_CASE(x) case IWL_MLD_EMLSR_BLOCKED_##x: return #x;</div><div class='add'>+	HANDLE_EMLSR_BLOCKED_REASONS(REASON_CASE)</div><div class='add'>+#undef REASON_CASE</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "ERROR";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_print_emlsr_blocked(struct iwl_mld *mld, u32 mask)</div><div class='add'>+{</div><div class='add'>+#define NAME_FMT(x) "%s"</div><div class='add'>+#define NAME_PR(x) (mask &amp; IWL_MLD_EMLSR_BLOCKED_##x) ? "[" #x "]" : "",</div><div class='add'>+	IWL_DEBUG_EHT(mld,</div><div class='add'>+		      "EMLSR blocked = " HANDLE_EMLSR_BLOCKED_REASONS(NAME_FMT)</div><div class='add'>+		      " (0x%x)\n", HANDLE_EMLSR_BLOCKED_REASONS(NAME_PR) mask);</div><div class='add'>+#undef NAME_FMT</div><div class='add'>+#undef NAME_PR</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Exit reasons helper */</div><div class='add'>+#define HANDLE_EMLSR_EXIT_REASONS(HOW)	\</div><div class='add'>+	HOW(BLOCK)			\</div><div class='add'>+	HOW(MISSED_BEACON)		\</div><div class='add'>+	HOW(FAIL_ENTRY)			\</div><div class='add'>+	HOW(CSA)			\</div><div class='add'>+	HOW(EQUAL_BAND)			\</div><div class='add'>+	HOW(LOW_RSSI)			\</div><div class='add'>+	HOW(LINK_USAGE)			\</div><div class='add'>+	HOW(BT_COEX)			\</div><div class='add'>+	HOW(CHAN_LOAD)			\</div><div class='add'>+	HOW(RFI)			\</div><div class='add'>+	HOW(FW_REQUEST)			\</div><div class='add'>+	HOW(INVALID)</div><div class='add'>+</div><div class='add'>+static const char *</div><div class='add'>+iwl_mld_get_emlsr_exit_string(enum iwl_mld_emlsr_exit exit)</div><div class='add'>+{</div><div class='add'>+	/* Using switch without "default" will warn about missing entries  */</div><div class='add'>+	switch (exit) {</div><div class='add'>+#define REASON_CASE(x) case IWL_MLD_EMLSR_EXIT_##x: return #x;</div><div class='add'>+	HANDLE_EMLSR_EXIT_REASONS(REASON_CASE)</div><div class='add'>+#undef REASON_CASE</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "ERROR";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_print_emlsr_exit(struct iwl_mld *mld, u32 mask)</div><div class='add'>+{</div><div class='add'>+#define NAME_FMT(x) "%s"</div><div class='add'>+#define NAME_PR(x) (mask &amp; IWL_MLD_EMLSR_EXIT_##x) ? "[" #x "]" : "",</div><div class='add'>+	IWL_DEBUG_EHT(mld,</div><div class='add'>+		      "EMLSR exit = " HANDLE_EMLSR_EXIT_REASONS(NAME_FMT)</div><div class='add'>+		      " (0x%x)\n", HANDLE_EMLSR_EXIT_REASONS(NAME_PR) mask);</div><div class='add'>+#undef NAME_FMT</div><div class='add'>+#undef NAME_PR</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_emlsr_prevent_done_wk(struct wiphy *wiphy, struct wiphy_work *wk)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = container_of(wk, struct iwl_mld_vif,</div><div class='add'>+						   emlsr.prevent_done_wk.work);</div><div class='add'>+	struct ieee80211_vif *vif =</div><div class='add'>+		container_of((void *)mld_vif, struct ieee80211_vif, drv_priv);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!(mld_vif-&gt;emlsr.blocked_reasons &amp;</div><div class='add'>+		      IWL_MLD_EMLSR_BLOCKED_PREVENTION)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mld_unblock_emlsr(mld_vif-&gt;mld, vif,</div><div class='add'>+			      IWL_MLD_EMLSR_BLOCKED_PREVENTION);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_emlsr_tmp_non_bss_done_wk(struct wiphy *wiphy,</div><div class='add'>+				       struct wiphy_work *wk)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = container_of(wk, struct iwl_mld_vif,</div><div class='add'>+						   emlsr.tmp_non_bss_done_wk.work);</div><div class='add'>+	struct ieee80211_vif *vif =</div><div class='add'>+		container_of((void *)mld_vif, struct ieee80211_vif, drv_priv);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!(mld_vif-&gt;emlsr.blocked_reasons &amp;</div><div class='add'>+		      IWL_MLD_EMLSR_BLOCKED_TMP_NON_BSS)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mld_unblock_emlsr(mld_vif-&gt;mld, vif,</div><div class='add'>+			      IWL_MLD_EMLSR_BLOCKED_TMP_NON_BSS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_TRIGGER_LINK_SEL_TIME	(HZ * IWL_MLD_TRIGGER_LINK_SEL_TIME_SEC)</div><div class='add'>+#define IWL_MLD_SCAN_EXPIRE_TIME	(HZ * IWL_MLD_SCAN_EXPIRE_TIME_SEC)</div><div class='add'>+</div><div class='add'>+/* Exit reasons that can cause longer EMLSR prevention */</div><div class='add'>+#define IWL_MLD_PREVENT_EMLSR_REASONS	(IWL_MLD_EMLSR_EXIT_MISSED_BEACON	| \</div><div class='add'>+					 IWL_MLD_EMLSR_EXIT_LINK_USAGE		| \</div><div class='add'>+					 IWL_MLD_EMLSR_EXIT_FW_REQUEST)</div><div class='add'>+#define IWL_MLD_PREVENT_EMLSR_TIMEOUT	(HZ * 400)</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_EMLSR_PREVENT_SHORT	(HZ * 300)</div><div class='add'>+#define IWL_MLD_EMLSR_PREVENT_LONG	(HZ * 600)</div><div class='add'>+</div><div class='add'>+static void iwl_mld_check_emlsr_prevention(struct iwl_mld *mld,</div><div class='add'>+					   struct iwl_mld_vif *mld_vif,</div><div class='add'>+					   enum iwl_mld_emlsr_exit reason)</div><div class='add'>+{</div><div class='add'>+	unsigned long delay;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Reset the counter if more than 400 seconds have passed between one</div><div class='add'>+	 * exit and the other, or if we exited due to a different reason.</div><div class='add'>+	 * Will also reset the counter after the long prevention is done.</div><div class='add'>+	 */</div><div class='add'>+	if (time_after(jiffies, mld_vif-&gt;emlsr.last_exit_ts +</div><div class='add'>+				IWL_MLD_PREVENT_EMLSR_TIMEOUT) ||</div><div class='add'>+	    mld_vif-&gt;emlsr.last_exit_reason != reason)</div><div class='add'>+		mld_vif-&gt;emlsr.exit_repeat_count = 0;</div><div class='add'>+</div><div class='add'>+	mld_vif-&gt;emlsr.last_exit_reason = reason;</div><div class='add'>+	mld_vif-&gt;emlsr.last_exit_ts = jiffies;</div><div class='add'>+	mld_vif-&gt;emlsr.exit_repeat_count++;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Do not add a prevention when the reason was a block. For a block,</div><div class='add'>+	 * EMLSR will be enabled again on unblock.</div><div class='add'>+	 */</div><div class='add'>+	if (reason == IWL_MLD_EMLSR_EXIT_BLOCK)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Set prevention for a minimum of 30 seconds */</div><div class='add'>+	mld_vif-&gt;emlsr.blocked_reasons |= IWL_MLD_EMLSR_BLOCKED_PREVENTION;</div><div class='add'>+	delay = IWL_MLD_TRIGGER_LINK_SEL_TIME;</div><div class='add'>+</div><div class='add'>+	/* Handle repeats for reasons that can cause long prevention */</div><div class='add'>+	if (mld_vif-&gt;emlsr.exit_repeat_count &gt; 1 &amp;&amp;</div><div class='add'>+	    reason &amp; IWL_MLD_PREVENT_EMLSR_REASONS) {</div><div class='add'>+		if (mld_vif-&gt;emlsr.exit_repeat_count == 2)</div><div class='add'>+			delay = IWL_MLD_EMLSR_PREVENT_SHORT;</div><div class='add'>+		else</div><div class='add'>+			delay = IWL_MLD_EMLSR_PREVENT_LONG;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The timeouts are chosen so that this will not happen, i.e.</div><div class='add'>+		 * IWL_MLD_EMLSR_PREVENT_LONG &gt; IWL_MLD_PREVENT_EMLSR_TIMEOUT</div><div class='add'>+		 */</div><div class='add'>+		WARN_ON(mld_vif-&gt;emlsr.exit_repeat_count &gt; 3);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_EHT(mld,</div><div class='add'>+		      "Preventing EMLSR for %ld seconds due to %u exits with the reason = %s (0x%x)\n",</div><div class='add'>+		      delay / HZ, mld_vif-&gt;emlsr.exit_repeat_count,</div><div class='add'>+		      iwl_mld_get_emlsr_exit_string(reason), reason);</div><div class='add'>+</div><div class='add'>+	wiphy_delayed_work_queue(mld-&gt;wiphy,</div><div class='add'>+				 &amp;mld_vif-&gt;emlsr.prevent_done_wk, delay);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_clear_avg_chan_load_iter(struct ieee80211_hw *hw,</div><div class='add'>+					     struct ieee80211_chanctx_conf *ctx,</div><div class='add'>+					     void *dat)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_phy *phy = iwl_mld_phy_from_mac80211(ctx);</div><div class='add'>+</div><div class='add'>+	/* It is ok to do it for all chanctx (and not only for the ones that</div><div class='add'>+	 * belong to the EMLSR vif) since EMLSR is not allowed if there is</div><div class='add'>+	 * another vif.</div><div class='add'>+	 */</div><div class='add'>+	phy-&gt;avg_channel_load_not_by_us = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int _iwl_mld_exit_emlsr(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			       enum iwl_mld_emlsr_exit exit, u8 link_to_keep,</div><div class='add'>+			       bool sync)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	u16 new_active_links;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* On entry failure need to exit anyway, even if entered from debugfs */</div><div class='add'>+	if (exit != IWL_MLD_EMLSR_EXIT_FAIL_ENTRY &amp;&amp; !IWL_MLD_AUTO_EML_ENABLE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Ignore exit request if EMLSR is not active */</div><div class='add'>+	if (!iwl_mld_emlsr_active(vif))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!ieee80211_vif_is_mld(vif) || !mld_vif-&gt;authorized))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!(vif-&gt;active_links &amp; BIT(link_to_keep))))</div><div class='add'>+		link_to_keep = __ffs(vif-&gt;active_links);</div><div class='add'>+</div><div class='add'>+	new_active_links = BIT(link_to_keep);</div><div class='add'>+	IWL_DEBUG_EHT(mld,</div><div class='add'>+		      "Exiting EMLSR. reason = %s (0x%x). Current active links=0x%x, new active links = 0x%x\n",</div><div class='add'>+		      iwl_mld_get_emlsr_exit_string(exit), exit,</div><div class='add'>+		      vif-&gt;active_links, new_active_links);</div><div class='add'>+</div><div class='add'>+	if (sync)</div><div class='add'>+		ret = ieee80211_set_active_links(vif, new_active_links);</div><div class='add'>+	else</div><div class='add'>+		ieee80211_set_active_links_async(vif, new_active_links);</div><div class='add'>+</div><div class='add'>+	/* Update latest exit reason and check EMLSR prevention */</div><div class='add'>+	iwl_mld_check_emlsr_prevention(mld, mld_vif, exit);</div><div class='add'>+</div><div class='add'>+	/* channel_load_not_by_us is invalid when in EMLSR.</div><div class='add'>+	 * Clear it so wrong values won't be used.</div><div class='add'>+	 */</div><div class='add'>+	ieee80211_iter_chan_contexts_atomic(mld-&gt;hw,</div><div class='add'>+					    iwl_mld_clear_avg_chan_load_iter,</div><div class='add'>+					    NULL);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_exit_emlsr(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			enum iwl_mld_emlsr_exit exit, u8 link_to_keep)</div><div class='add'>+{</div><div class='add'>+	_iwl_mld_exit_emlsr(mld, vif, exit, link_to_keep, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int _iwl_mld_emlsr_block(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+				enum iwl_mld_emlsr_blocked reason,</div><div class='add'>+				u8 link_to_keep, bool sync)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!IWL_MLD_AUTO_EML_ENABLE || !iwl_mld_vif_has_emlsr_cap(vif))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (mld_vif-&gt;emlsr.blocked_reasons &amp; reason)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mld_vif-&gt;emlsr.blocked_reasons |= reason;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_EHT(mld, "Blocking EMLSR mode. reason = %s (0x%x)\n",</div><div class='add'>+		      iwl_mld_get_emlsr_blocked_string(reason), reason);</div><div class='add'>+	iwl_mld_print_emlsr_blocked(mld, mld_vif-&gt;emlsr.blocked_reasons);</div><div class='add'>+</div><div class='add'>+	if (reason == IWL_MLD_EMLSR_BLOCKED_TPT)</div><div class='add'>+		wiphy_delayed_work_cancel(mld_vif-&gt;mld-&gt;wiphy,</div><div class='add'>+					  &amp;mld_vif-&gt;emlsr.check_tpt_wk);</div><div class='add'>+</div><div class='add'>+	return _iwl_mld_exit_emlsr(mld, vif, IWL_MLD_EMLSR_EXIT_BLOCK,</div><div class='add'>+				   link_to_keep, sync);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_block_emlsr(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			 enum iwl_mld_emlsr_blocked reason, u8 link_to_keep)</div><div class='add'>+{</div><div class='add'>+	_iwl_mld_emlsr_block(mld, vif, reason, link_to_keep, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_block_emlsr_sync(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			     enum iwl_mld_emlsr_blocked reason, u8 link_to_keep)</div><div class='add'>+{</div><div class='add'>+	return _iwl_mld_emlsr_block(mld, vif, reason, link_to_keep, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_EMLSR_BLOCKED_TMP_NON_BSS_TIMEOUT (10 * HZ)</div><div class='add'>+</div><div class='add'>+static void iwl_mld_vif_iter_emlsr_block_tmp_non_bss(void *_data, u8 *mac,</div><div class='add'>+						     struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!iwl_mld_vif_has_emlsr_cap(vif))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_block_emlsr_sync(mld_vif-&gt;mld, vif,</div><div class='add'>+				       IWL_MLD_EMLSR_BLOCKED_TMP_NON_BSS,</div><div class='add'>+				       iwl_mld_get_primary_link(vif));</div><div class='add'>+	if (ret)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	wiphy_delayed_work_queue(mld_vif-&gt;mld-&gt;wiphy,</div><div class='add'>+				 &amp;mld_vif-&gt;emlsr.tmp_non_bss_done_wk,</div><div class='add'>+				 IWL_MLD_EMLSR_BLOCKED_TMP_NON_BSS_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_emlsr_block_tmp_non_bss(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	ieee80211_iterate_active_interfaces_mtx(mld-&gt;hw,</div><div class='add'>+						IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						iwl_mld_vif_iter_emlsr_block_tmp_non_bss,</div><div class='add'>+						NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void _iwl_mld_select_links(struct iwl_mld *mld,</div><div class='add'>+				  struct ieee80211_vif *vif);</div><div class='add'>+</div><div class='add'>+void iwl_mld_unblock_emlsr(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			   enum iwl_mld_emlsr_blocked reason)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!IWL_MLD_AUTO_EML_ENABLE || !iwl_mld_vif_has_emlsr_cap(vif))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!(mld_vif-&gt;emlsr.blocked_reasons &amp; reason))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mld_vif-&gt;emlsr.blocked_reasons &amp;= ~reason;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_EHT(mld, "Unblocking EMLSR mode. reason = %s (0x%x)\n",</div><div class='add'>+		      iwl_mld_get_emlsr_blocked_string(reason), reason);</div><div class='add'>+	iwl_mld_print_emlsr_blocked(mld, mld_vif-&gt;emlsr.blocked_reasons);</div><div class='add'>+</div><div class='add'>+	if (reason == IWL_MLD_EMLSR_BLOCKED_TPT)</div><div class='add'>+		wiphy_delayed_work_queue(mld_vif-&gt;mld-&gt;wiphy,</div><div class='add'>+					 &amp;mld_vif-&gt;emlsr.check_tpt_wk,</div><div class='add'>+					 round_jiffies_relative(IWL_MLD_TPT_COUNT_WINDOW));</div><div class='add'>+</div><div class='add'>+	if (mld_vif-&gt;emlsr.blocked_reasons)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_EHT(mld, "EMLSR is unblocked\n");</div><div class='add'>+	iwl_mld_int_mlo_scan(mld, vif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_vif_iter_emlsr_mode_notif(void *data, u8 *mac,</div><div class='add'>+				  struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	const struct iwl_esr_mode_notif *notif = (void *)data;</div><div class='add'>+	enum iwl_mvm_fw_esr_recommendation action = le32_to_cpu(notif-&gt;action);</div><div class='add'>+</div><div class='add'>+	if (!iwl_mld_vif_has_emlsr_cap(vif))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case ESR_RECOMMEND_LEAVE:</div><div class='add'>+		IWL_DEBUG_EHT(mld_vif-&gt;mld,</div><div class='add'>+			      "FW recommend leave reason = 0x%x\n",</div><div class='add'>+			      le32_to_cpu(notif-&gt;leave_reason_mask));</div><div class='add'>+</div><div class='add'>+		iwl_mld_exit_emlsr(mld_vif-&gt;mld, vif,</div><div class='add'>+				   IWL_MLD_EMLSR_EXIT_FW_REQUEST,</div><div class='add'>+				   iwl_mld_get_primary_link(vif));</div><div class='add'>+		break;</div><div class='add'>+	case ESR_FORCE_LEAVE:</div><div class='add'>+		IWL_DEBUG_EHT(mld_vif-&gt;mld, "FW force leave reason = 0x%x\n",</div><div class='add'>+			      le32_to_cpu(notif-&gt;leave_reason_mask));</div><div class='add'>+		fallthrough;</div><div class='add'>+	case ESR_RECOMMEND_ENTER:</div><div class='add'>+	default:</div><div class='add'>+		IWL_WARN(mld_vif-&gt;mld, "Unexpected EMLSR notification: %d\n",</div><div class='add'>+			 action);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_emlsr_mode_notif(struct iwl_mld *mld,</div><div class='add'>+				     struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	ieee80211_iterate_active_interfaces_mtx(mld-&gt;hw,</div><div class='add'>+						IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						iwl_mld_vif_iter_emlsr_mode_notif,</div><div class='add'>+						pkt-&gt;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_vif_iter_disconnect_emlsr(void *data, u8 *mac,</div><div class='add'>+				  struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	if (!iwl_mld_vif_has_emlsr_cap(vif))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ieee80211_connection_loss(vif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_emlsr_trans_fail_notif(struct iwl_mld *mld,</div><div class='add'>+					   struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_esr_trans_fail_notif *notif = (const void *)pkt-&gt;data;</div><div class='add'>+	u32 fw_link_id = le32_to_cpu(notif-&gt;link_id);</div><div class='add'>+	struct ieee80211_bss_conf *bss_conf =</div><div class='add'>+		iwl_mld_fw_id_to_link_conf(mld, fw_link_id);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_EHT(mld,</div><div class='add'>+		      "Failed to %s EMLSR on link %d (FW: %d), reason %d\n",</div><div class='add'>+		      le32_to_cpu(notif-&gt;activation) ? "enter" : "exit",</div><div class='add'>+		      bss_conf ? bss_conf-&gt;link_id : -1,</div><div class='add'>+		      le32_to_cpu(notif-&gt;link_id),</div><div class='add'>+		      le32_to_cpu(notif-&gt;err_code));</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, !bss_conf,</div><div class='add'>+			 "FW reported failure to %sactivate EMLSR on a non-existing link: %d\n",</div><div class='add'>+			 le32_to_cpu(notif-&gt;activation) ? "" : "de",</div><div class='add'>+			 fw_link_id)) {</div><div class='add'>+		ieee80211_iterate_active_interfaces_mtx(</div><div class='add'>+			mld-&gt;hw, IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+			iwl_mld_vif_iter_disconnect_emlsr, NULL);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disconnect if we failed to deactivate a link */</div><div class='add'>+	if (!le32_to_cpu(notif-&gt;activation)) {</div><div class='add'>+		ieee80211_connection_loss(bss_conf-&gt;vif);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We failed to activate the second link, go back to the link specified</div><div class='add'>+	 * by the firmware as that is the one that is still valid now.</div><div class='add'>+	 */</div><div class='add'>+	iwl_mld_exit_emlsr(mld, bss_conf-&gt;vif, IWL_MLD_EMLSR_EXIT_FAIL_ENTRY,</div><div class='add'>+			   bss_conf-&gt;link_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Active non-station link tracking */</div><div class='add'>+static void iwl_mld_count_non_bss_links(void *_data, u8 *mac,</div><div class='add'>+					struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	int *count = _data;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_type_p2p(vif) == NL80211_IFTYPE_STATION)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	*count += iwl_mld_count_active_links(mld_vif-&gt;mld, vif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct iwl_mld_update_emlsr_block_data {</div><div class='add'>+	bool block;</div><div class='add'>+	int result;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_vif_iter_update_emlsr_non_bss_block(void *_data, u8 *mac,</div><div class='add'>+					    struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_update_emlsr_block_data *data = _data;</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;block) {</div><div class='add'>+		ret = iwl_mld_block_emlsr_sync(mld_vif-&gt;mld, vif,</div><div class='add'>+					       IWL_MLD_EMLSR_BLOCKED_NON_BSS,</div><div class='add'>+					       iwl_mld_get_primary_link(vif));</div><div class='add'>+		if (ret)</div><div class='add'>+			data-&gt;result = ret;</div><div class='add'>+	} else {</div><div class='add'>+		iwl_mld_unblock_emlsr(mld_vif-&gt;mld, vif,</div><div class='add'>+				      IWL_MLD_EMLSR_BLOCKED_NON_BSS);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_emlsr_check_non_bss_block(struct iwl_mld *mld,</div><div class='add'>+				      int pending_link_changes)</div><div class='add'>+{</div><div class='add'>+	/* An active link of a non-station vif blocks EMLSR. Upon activation</div><div class='add'>+	 * block EMLSR on the bss vif. Upon deactivation, check if this link</div><div class='add'>+	 * was the last non-station link active, and if so unblock the bss vif</div><div class='add'>+	 */</div><div class='add'>+	struct iwl_mld_update_emlsr_block_data block_data = {};</div><div class='add'>+	int count = pending_link_changes;</div><div class='add'>+</div><div class='add'>+	/* No need to count if we are activating a non-BSS link */</div><div class='add'>+	if (count &lt;= 0)</div><div class='add'>+		ieee80211_iterate_active_interfaces_mtx(mld-&gt;hw,</div><div class='add'>+							IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+							iwl_mld_count_non_bss_links,</div><div class='add'>+							&amp;count);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We could skip updating it if the block change did not change (and</div><div class='add'>+	 * pending_link_changes is non-zero).</div><div class='add'>+	 */</div><div class='add'>+	block_data.block = !!count;</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_mtx(mld-&gt;hw,</div><div class='add'>+						IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						iwl_mld_vif_iter_update_emlsr_non_bss_block,</div><div class='add'>+						&amp;block_data);</div><div class='add'>+</div><div class='add'>+	return block_data.result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define EMLSR_SEC_LINK_MIN_PERC 10</div><div class='add'>+#define EMLSR_MIN_TX 3000</div><div class='add'>+#define EMLSR_MIN_RX 400</div><div class='add'>+</div><div class='add'>+void iwl_mld_emlsr_check_tpt(struct wiphy *wiphy, struct wiphy_work *wk)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = container_of(wk, struct iwl_mld_vif,</div><div class='add'>+						   emlsr.check_tpt_wk.work);</div><div class='add'>+	struct ieee80211_vif *vif =</div><div class='add'>+		container_of((void *)mld_vif, struct ieee80211_vif, drv_priv);</div><div class='add'>+	struct iwl_mld *mld = mld_vif-&gt;mld;</div><div class='add'>+	struct iwl_mld_sta *mld_sta;</div><div class='add'>+	struct iwl_mld_link *sec_link;</div><div class='add'>+	unsigned long total_tx = 0, total_rx = 0;</div><div class='add'>+	unsigned long sec_link_tx = 0, sec_link_rx = 0;</div><div class='add'>+	u8 sec_link_tx_perc, sec_link_rx_perc;</div><div class='add'>+	s8 sec_link_id;</div><div class='add'>+</div><div class='add'>+	if (!iwl_mld_vif_has_emlsr_cap(vif) || !mld_vif-&gt;ap_sta)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mld_sta = iwl_mld_sta_from_mac80211(mld_vif-&gt;ap_sta);</div><div class='add'>+</div><div class='add'>+	/* We only count for the AP sta in a MLO connection */</div><div class='add'>+	if (!mld_sta-&gt;mpdu_counters)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* This wk should only run when the TPT blocker isn't set.</div><div class='add'>+	 * When the blocker is set, the decision to remove it, as well as</div><div class='add'>+	 * clearing the counters is done in DP (to avoid having a wk every</div><div class='add'>+	 * 5 seconds when idle. When the blocker is unset, we are not idle anyway)</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON(mld_vif-&gt;emlsr.blocked_reasons &amp; IWL_MLD_EMLSR_BLOCKED_TPT))</div><div class='add'>+		return;</div><div class='add'>+	/*</div><div class='add'>+	 * TPT is unblocked, need to check if the TPT criteria is still met.</div><div class='add'>+	 *</div><div class='add'>+	 * If EMLSR is active for at least 5 seconds, then we also</div><div class='add'>+	 * need to check the secondary link requirements.</div><div class='add'>+	 */</div><div class='add'>+	if (iwl_mld_emlsr_active(vif) &amp;&amp;</div><div class='add'>+	    time_is_before_jiffies(mld_vif-&gt;emlsr.last_entry_ts +</div><div class='add'>+				   IWL_MLD_TPT_COUNT_WINDOW)) {</div><div class='add'>+		sec_link_id = iwl_mld_get_other_link(vif, iwl_mld_get_primary_link(vif));</div><div class='add'>+		sec_link = iwl_mld_link_dereference_check(mld_vif, sec_link_id);</div><div class='add'>+		if (WARN_ON_ONCE(!sec_link))</div><div class='add'>+			return;</div><div class='add'>+		/* We need the FW ID here */</div><div class='add'>+		sec_link_id = sec_link-&gt;fw_id;</div><div class='add'>+	} else {</div><div class='add'>+		sec_link_id = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Sum up RX and TX MPDUs from the different queues/links */</div><div class='add'>+	for (int q = 0; q &lt; mld-&gt;trans-&gt;info.num_rxqs; q++) {</div><div class='add'>+		struct iwl_mld_per_q_mpdu_counter *queue_counter =</div><div class='add'>+			&amp;mld_sta-&gt;mpdu_counters[q];</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;queue_counter-&gt;lock);</div><div class='add'>+</div><div class='add'>+		/* The link IDs that doesn't exist will contain 0 */</div><div class='add'>+		for (int link = 0;</div><div class='add'>+		     link &lt; ARRAY_SIZE(queue_counter-&gt;per_link);</div><div class='add'>+		     link++) {</div><div class='add'>+			total_tx += queue_counter-&gt;per_link[link].tx;</div><div class='add'>+			total_rx += queue_counter-&gt;per_link[link].rx;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (sec_link_id != -1) {</div><div class='add'>+			sec_link_tx += queue_counter-&gt;per_link[sec_link_id].tx;</div><div class='add'>+			sec_link_rx += queue_counter-&gt;per_link[sec_link_id].rx;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memset(queue_counter-&gt;per_link, 0,</div><div class='add'>+		       sizeof(queue_counter-&gt;per_link));</div><div class='add'>+</div><div class='add'>+		spin_unlock_bh(&amp;queue_counter-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_EHT(mld, "total Tx MPDUs: %ld. total Rx MPDUs: %ld\n",</div><div class='add'>+		      total_tx, total_rx);</div><div class='add'>+</div><div class='add'>+	/* If we don't have enough MPDUs - exit EMLSR */</div><div class='add'>+	if (total_tx &lt; IWL_MLD_ENTER_EMLSR_TPT_THRESH &amp;&amp;</div><div class='add'>+	    total_rx &lt; IWL_MLD_ENTER_EMLSR_TPT_THRESH) {</div><div class='add'>+		iwl_mld_block_emlsr(mld, vif, IWL_MLD_EMLSR_BLOCKED_TPT,</div><div class='add'>+				    iwl_mld_get_primary_link(vif));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* EMLSR is not active */</div><div class='add'>+	if (sec_link_id == -1)</div><div class='add'>+		goto schedule;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_EHT(mld, "Secondary Link %d: Tx MPDUs: %ld. Rx MPDUs: %ld\n",</div><div class='add'>+		      sec_link_id, sec_link_tx, sec_link_rx);</div><div class='add'>+</div><div class='add'>+	/* Calculate the percentage of the secondary link TX/RX */</div><div class='add'>+	sec_link_tx_perc = total_tx ? sec_link_tx * 100 / total_tx : 0;</div><div class='add'>+	sec_link_rx_perc = total_rx ? sec_link_rx * 100 / total_rx : 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The TX/RX percentage is checked only if it exceeds the required</div><div class='add'>+	 * minimum. In addition, RX is checked only if the TX check failed.</div><div class='add'>+	 */</div><div class='add'>+	if ((total_tx &gt; EMLSR_MIN_TX &amp;&amp;</div><div class='add'>+	     sec_link_tx_perc &lt; EMLSR_SEC_LINK_MIN_PERC) ||</div><div class='add'>+	    (total_rx &gt; EMLSR_MIN_RX &amp;&amp;</div><div class='add'>+	     sec_link_rx_perc &lt; EMLSR_SEC_LINK_MIN_PERC)) {</div><div class='add'>+		iwl_mld_exit_emlsr(mld, vif, IWL_MLD_EMLSR_EXIT_LINK_USAGE,</div><div class='add'>+				   iwl_mld_get_primary_link(vif));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+schedule:</div><div class='add'>+	/* Check again when the next window ends  */</div><div class='add'>+	wiphy_delayed_work_queue(mld_vif-&gt;mld-&gt;wiphy,</div><div class='add'>+				 &amp;mld_vif-&gt;emlsr.check_tpt_wk,</div><div class='add'>+				 round_jiffies_relative(IWL_MLD_TPT_COUNT_WINDOW));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_emlsr_unblock_tpt_wk(struct wiphy *wiphy, struct wiphy_work *wk)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = container_of(wk, struct iwl_mld_vif,</div><div class='add'>+						   emlsr.unblock_tpt_wk);</div><div class='add'>+	struct ieee80211_vif *vif =</div><div class='add'>+		container_of((void *)mld_vif, struct ieee80211_vif, drv_priv);</div><div class='add'>+</div><div class='add'>+	iwl_mld_unblock_emlsr(mld_vif-&gt;mld, vif, IWL_MLD_EMLSR_BLOCKED_TPT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Link selection</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+s8 iwl_mld_get_emlsr_rssi_thresh(struct iwl_mld *mld,</div><div class='add'>+				 const struct cfg80211_chan_def *chandef,</div><div class='add'>+				 bool low)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(chandef-&gt;chan-&gt;band != NL80211_BAND_2GHZ &amp;&amp;</div><div class='add'>+		    chandef-&gt;chan-&gt;band != NL80211_BAND_5GHZ &amp;&amp;</div><div class='add'>+		    chandef-&gt;chan-&gt;band != NL80211_BAND_6GHZ))</div><div class='add'>+		return S8_MAX;</div><div class='add'>+</div><div class='add'>+#define RSSI_THRESHOLD(_low, _bw)			\</div><div class='add'>+	(_low) ? IWL_MLD_LOW_RSSI_THRESH_##_bw##MHZ	\</div><div class='add'>+	       : IWL_MLD_HIGH_RSSI_THRESH_##_bw##MHZ</div><div class='add'>+</div><div class='add'>+	switch (chandef-&gt;width) {</div><div class='add'>+	case NL80211_CHAN_WIDTH_20_NOHT:</div><div class='add'>+	case NL80211_CHAN_WIDTH_20:</div><div class='add'>+	/* 320 MHz has the same thresholds as 20 MHz */</div><div class='add'>+	case NL80211_CHAN_WIDTH_320:</div><div class='add'>+		return RSSI_THRESHOLD(low, 20);</div><div class='add'>+	case NL80211_CHAN_WIDTH_40:</div><div class='add'>+		return RSSI_THRESHOLD(low, 40);</div><div class='add'>+	case NL80211_CHAN_WIDTH_80:</div><div class='add'>+		return RSSI_THRESHOLD(low, 80);</div><div class='add'>+	case NL80211_CHAN_WIDTH_160:</div><div class='add'>+		return RSSI_THRESHOLD(low, 160);</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return S8_MAX;</div><div class='add'>+	}</div><div class='add'>+#undef RSSI_THRESHOLD</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+iwl_mld_emlsr_disallowed_with_link(struct iwl_mld *mld,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct iwl_mld_link_sel_data *link,</div><div class='add'>+				   bool primary)</div><div class='add'>+{</div><div class='add'>+	struct wiphy *wiphy = mld-&gt;wiphy;</div><div class='add'>+	struct ieee80211_bss_conf *conf;</div><div class='add'>+	u32 ret = 0;</div><div class='add'>+</div><div class='add'>+	conf = wiphy_dereference(wiphy, vif-&gt;link_conf[link-&gt;link_id]);</div><div class='add'>+	if (WARN_ON_ONCE(!conf))</div><div class='add'>+		return IWL_MLD_EMLSR_EXIT_INVALID;</div><div class='add'>+</div><div class='add'>+	if (link-&gt;chandef-&gt;chan-&gt;band == NL80211_BAND_2GHZ &amp;&amp; mld-&gt;bt_is_active)</div><div class='add'>+		ret |= IWL_MLD_EMLSR_EXIT_BT_COEX;</div><div class='add'>+</div><div class='add'>+	if (link-&gt;signal &lt;</div><div class='add'>+	    iwl_mld_get_emlsr_rssi_thresh(mld, link-&gt;chandef, false))</div><div class='add'>+		ret |= IWL_MLD_EMLSR_EXIT_LOW_RSSI;</div><div class='add'>+</div><div class='add'>+	if (conf-&gt;csa_active)</div><div class='add'>+		ret |= IWL_MLD_EMLSR_EXIT_CSA;</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_DEBUG_EHT(mld, "Link %d is not allowed for EMLSR as %s\n",</div><div class='add'>+			      link-&gt;link_id, primary ? "primary" : "secondary");</div><div class='add'>+		iwl_mld_print_emlsr_exit(mld, ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8</div><div class='add'>+iwl_mld_set_link_sel_data(struct iwl_mld *mld,</div><div class='add'>+			  struct ieee80211_vif *vif,</div><div class='add'>+			  struct iwl_mld_link_sel_data *data,</div><div class='add'>+			  unsigned long usable_links,</div><div class='add'>+			  u8 *best_link_idx)</div><div class='add'>+{</div><div class='add'>+	u8 n_data = 0;</div><div class='add'>+	u16 max_grade = 0;</div><div class='add'>+	unsigned long link_id;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(link_id, &amp;usable_links, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		struct ieee80211_bss_conf *link_conf =</div><div class='add'>+			link_conf_dereference_protected(vif, link_id);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON_ONCE(!link_conf))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Ignore any BSS that was not seen in the last MLO scan */</div><div class='add'>+		if (ktime_before(link_conf-&gt;bss-&gt;ts_boottime,</div><div class='add'>+				 mld-&gt;scan.last_mlo_scan_time))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		data[n_data].link_id = link_id;</div><div class='add'>+		data[n_data].chandef = &amp;link_conf-&gt;chanreq.oper;</div><div class='add'>+		data[n_data].signal = MBM_TO_DBM(link_conf-&gt;bss-&gt;signal);</div><div class='add'>+		data[n_data].grade = iwl_mld_get_link_grade(mld, link_conf);</div><div class='add'>+</div><div class='add'>+		if (n_data == 0 || data[n_data].grade &gt; max_grade) {</div><div class='add'>+			max_grade = data[n_data].grade;</div><div class='add'>+			*best_link_idx = n_data;</div><div class='add'>+		}</div><div class='add'>+		n_data++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return n_data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+iwl_mld_get_min_chan_load_thresh(struct ieee80211_chanctx_conf *chanctx)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_mld_phy *phy = iwl_mld_phy_from_mac80211(chanctx);</div><div class='add'>+</div><div class='add'>+	switch (phy-&gt;chandef.width) {</div><div class='add'>+	case NL80211_CHAN_WIDTH_320:</div><div class='add'>+	case NL80211_CHAN_WIDTH_160:</div><div class='add'>+		return 5;</div><div class='add'>+	case NL80211_CHAN_WIDTH_80:</div><div class='add'>+		return 7;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 10;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+iwl_mld_channel_load_allows_emlsr(struct iwl_mld *mld,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  const struct iwl_mld_link_sel_data *a,</div><div class='add'>+				  const struct iwl_mld_link_sel_data *b)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld_link *link_a =</div><div class='add'>+		iwl_mld_link_dereference_check(mld_vif, a-&gt;link_id);</div><div class='add'>+	struct ieee80211_chanctx_conf *chanctx_a = NULL;</div><div class='add'>+	u32 bw_a, bw_b, ratio;</div><div class='add'>+	u32 primary_load_perc;</div><div class='add'>+</div><div class='add'>+	if (!link_a || !link_a-&gt;active) {</div><div class='add'>+		IWL_DEBUG_EHT(mld, "Primary link is not active. Can't enter EMLSR\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chanctx_a = wiphy_dereference(mld-&gt;wiphy, link_a-&gt;chan_ctx);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!chanctx_a))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	primary_load_perc =</div><div class='add'>+		iwl_mld_phy_from_mac80211(chanctx_a)-&gt;avg_channel_load_not_by_us;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_EHT(mld, "Average channel load not by us: %u\n", primary_load_perc);</div><div class='add'>+</div><div class='add'>+	if (primary_load_perc &lt; iwl_mld_get_min_chan_load_thresh(chanctx_a)) {</div><div class='add'>+		IWL_DEBUG_EHT(mld, "Channel load is below the minimum threshold\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_vif_low_latency(mld_vif)) {</div><div class='add'>+		IWL_DEBUG_EHT(mld, "Low latency vif, EMLSR is allowed\n");</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (a-&gt;chandef-&gt;width &lt;= b-&gt;chandef-&gt;width)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	bw_a = cfg80211_chandef_get_width(a-&gt;chandef);</div><div class='add'>+	bw_b = cfg80211_chandef_get_width(b-&gt;chandef);</div><div class='add'>+	ratio = bw_a / bw_b;</div><div class='add'>+</div><div class='add'>+	switch (ratio) {</div><div class='add'>+	case 2:</div><div class='add'>+		return primary_load_perc &gt; 25;</div><div class='add'>+	case 4:</div><div class='add'>+		return primary_load_perc &gt; 40;</div><div class='add'>+	case 8:</div><div class='add'>+	case 16:</div><div class='add'>+		return primary_load_perc &gt; 50;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+VISIBLE_IF_IWLWIFI_KUNIT u32</div><div class='add'>+iwl_mld_emlsr_pair_state(struct ieee80211_vif *vif,</div><div class='add'>+			 struct iwl_mld_link_sel_data *a,</div><div class='add'>+			 struct iwl_mld_link_sel_data *b)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld *mld = mld_vif-&gt;mld;</div><div class='add'>+	u32 reason_mask = 0;</div><div class='add'>+</div><div class='add'>+	/* Per-link considerations */</div><div class='add'>+	reason_mask = iwl_mld_emlsr_disallowed_with_link(mld, vif, a, true);</div><div class='add'>+	if (reason_mask)</div><div class='add'>+		return reason_mask;</div><div class='add'>+</div><div class='add'>+	reason_mask = iwl_mld_emlsr_disallowed_with_link(mld, vif, b, false);</div><div class='add'>+	if (reason_mask)</div><div class='add'>+		return reason_mask;</div><div class='add'>+</div><div class='add'>+	if (a-&gt;chandef-&gt;chan-&gt;band == b-&gt;chandef-&gt;chan-&gt;band) {</div><div class='add'>+		const struct cfg80211_chan_def *c_low = a-&gt;chandef;</div><div class='add'>+		const struct cfg80211_chan_def *c_high = b-&gt;chandef;</div><div class='add'>+		u32 c_low_upper_edge, c_high_lower_edge;</div><div class='add'>+</div><div class='add'>+		if (c_low-&gt;chan-&gt;center_freq &gt; c_high-&gt;chan-&gt;center_freq)</div><div class='add'>+			swap(c_low, c_high);</div><div class='add'>+</div><div class='add'>+		c_low_upper_edge = c_low-&gt;chan-&gt;center_freq +</div><div class='add'>+				   cfg80211_chandef_get_width(c_low) / 2;</div><div class='add'>+		c_high_lower_edge = c_high-&gt;chan-&gt;center_freq -</div><div class='add'>+				    cfg80211_chandef_get_width(c_high) / 2;</div><div class='add'>+</div><div class='add'>+		if (a-&gt;chandef-&gt;chan-&gt;band == NL80211_BAND_5GHZ &amp;&amp;</div><div class='add'>+		    c_low_upper_edge &lt;= 5330 &amp;&amp; c_high_lower_edge &gt;= 5490) {</div><div class='add'>+			/* This case is fine - HW/FW can deal with it, there's</div><div class='add'>+			 * enough separation between the two channels.</div><div class='add'>+			 */</div><div class='add'>+		} else {</div><div class='add'>+			reason_mask |= IWL_MLD_EMLSR_EXIT_EQUAL_BAND;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (!iwl_mld_channel_load_allows_emlsr(mld, vif, a, b))</div><div class='add'>+		reason_mask |= IWL_MLD_EMLSR_EXIT_CHAN_LOAD;</div><div class='add'>+</div><div class='add'>+	if (reason_mask) {</div><div class='add'>+		IWL_DEBUG_EHT(mld,</div><div class='add'>+			      "Links %d and %d are not a valid pair for EMLSR\n",</div><div class='add'>+			      a-&gt;link_id, b-&gt;link_id);</div><div class='add'>+		IWL_DEBUG_EHT(mld, "Links bandwidth are: %d and %d\n",</div><div class='add'>+			      nl80211_chan_width_to_mhz(a-&gt;chandef-&gt;width),</div><div class='add'>+			      nl80211_chan_width_to_mhz(b-&gt;chandef-&gt;width));</div><div class='add'>+		iwl_mld_print_emlsr_exit(mld, reason_mask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return reason_mask;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_mld_emlsr_pair_state);</div><div class='add'>+</div><div class='add'>+/* Calculation is done with fixed-point with a scaling factor of 1/256 */</div><div class='add'>+#define SCALE_FACTOR 256</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns the combined grade of two given links.</div><div class='add'>+ * Returns 0 if EMLSR is not allowed with these 2 links.</div><div class='add'>+ */</div><div class='add'>+static</div><div class='add'>+unsigned int iwl_mld_get_emlsr_grade(struct iwl_mld *mld,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     struct iwl_mld_link_sel_data *a,</div><div class='add'>+				     struct iwl_mld_link_sel_data *b,</div><div class='add'>+				     u8 *primary_id)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_bss_conf *primary_conf;</div><div class='add'>+	struct wiphy *wiphy = ieee80211_vif_to_wdev(vif)-&gt;wiphy;</div><div class='add'>+	unsigned int primary_load;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(wiphy);</div><div class='add'>+</div><div class='add'>+	/* a is always primary, b is always secondary */</div><div class='add'>+	if (b-&gt;grade &gt; a-&gt;grade)</div><div class='add'>+		swap(a, b);</div><div class='add'>+</div><div class='add'>+	*primary_id = a-&gt;link_id;</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_emlsr_pair_state(vif, a, b))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	primary_conf = wiphy_dereference(wiphy, vif-&gt;link_conf[*primary_id]);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!primary_conf))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	primary_load = iwl_mld_get_chan_load(mld, primary_conf);</div><div class='add'>+</div><div class='add'>+	/* The more the primary link is loaded, the more worthwhile EMLSR becomes */</div><div class='add'>+	return a-&gt;grade + ((b-&gt;grade * primary_load) / SCALE_FACTOR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void _iwl_mld_select_links(struct iwl_mld *mld,</div><div class='add'>+				  struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_link_sel_data data[IEEE80211_MLD_MAX_NUM_LINKS];</div><div class='add'>+	struct iwl_mld_link_sel_data *best_link;</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	int max_active_links = iwl_mld_max_active_links(mld, vif);</div><div class='add'>+	u16 new_active, usable_links = ieee80211_vif_usable_links(vif);</div><div class='add'>+	u8 best_idx, new_primary, n_data;</div><div class='add'>+	u16 max_grade;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!mld_vif-&gt;authorized || hweight16(usable_links) &lt;= 1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (WARN(ktime_before(mld-&gt;scan.last_mlo_scan_time,</div><div class='add'>+			      ktime_sub_ns(ktime_get_boottime_ns(),</div><div class='add'>+					   5ULL * NSEC_PER_SEC)),</div><div class='add'>+		"Last MLO scan was too long ago, can't select links\n"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* The logic below is simple and not suited for more than 2 links */</div><div class='add'>+	WARN_ON_ONCE(max_active_links &gt; 2);</div><div class='add'>+</div><div class='add'>+	n_data = iwl_mld_set_link_sel_data(mld, vif, data, usable_links,</div><div class='add'>+					   &amp;best_idx);</div><div class='add'>+</div><div class='add'>+	if (!n_data) {</div><div class='add'>+		IWL_DEBUG_EHT(mld,</div><div class='add'>+			      "Couldn't find a valid grade for any link!\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Default to selecting the single best link */</div><div class='add'>+	best_link = &amp;data[best_idx];</div><div class='add'>+	new_primary = best_link-&gt;link_id;</div><div class='add'>+	new_active = BIT(best_link-&gt;link_id);</div><div class='add'>+	max_grade = best_link-&gt;grade;</div><div class='add'>+</div><div class='add'>+	/* If EMLSR is not possible, activate the best link */</div><div class='add'>+	if (max_active_links == 1 || n_data == 1 ||</div><div class='add'>+	    !iwl_mld_vif_has_emlsr_cap(vif) || !IWL_MLD_AUTO_EML_ENABLE ||</div><div class='add'>+	    mld_vif-&gt;emlsr.blocked_reasons)</div><div class='add'>+		goto set_active;</div><div class='add'>+</div><div class='add'>+	/* Try to find the best link combination */</div><div class='add'>+	for (u8 a = 0; a &lt; n_data; a++) {</div><div class='add'>+		for (u8 b = a + 1; b &lt; n_data; b++) {</div><div class='add'>+			u8 best_in_pair;</div><div class='add'>+			u16 emlsr_grade =</div><div class='add'>+				iwl_mld_get_emlsr_grade(mld, vif,</div><div class='add'>+							&amp;data[a], &amp;data[b],</div><div class='add'>+							&amp;best_in_pair);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Prefer (new) EMLSR combination to prefer EMLSR over</div><div class='add'>+			 * a single link.</div><div class='add'>+			 */</div><div class='add'>+			if (emlsr_grade &lt; max_grade)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			max_grade = emlsr_grade;</div><div class='add'>+			new_primary = best_in_pair;</div><div class='add'>+			new_active = BIT(data[a].link_id) |</div><div class='add'>+				     BIT(data[b].link_id);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+set_active:</div><div class='add'>+	IWL_DEBUG_EHT(mld, "Link selection result: 0x%x. Primary = %d\n",</div><div class='add'>+		      new_active, new_primary);</div><div class='add'>+</div><div class='add'>+	mld_vif-&gt;emlsr.selected_primary = new_primary;</div><div class='add'>+	mld_vif-&gt;emlsr.selected_links = new_active;</div><div class='add'>+</div><div class='add'>+	ieee80211_set_active_links_async(vif, new_active);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_vif_iter_select_links(void *_data, u8 *mac,</div><div class='add'>+					  struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld *mld = mld_vif-&gt;mld;</div><div class='add'>+</div><div class='add'>+	_iwl_mld_select_links(mld, vif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_select_links(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	ieee80211_iterate_active_interfaces_mtx(mld-&gt;hw,</div><div class='add'>+						IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						iwl_mld_vif_iter_select_links,</div><div class='add'>+						NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_emlsr_check_bt_iter(void *_data, u8 *mac,</div><div class='add'>+					struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld *mld = mld_vif-&gt;mld;</div><div class='add'>+	struct ieee80211_bss_conf *link;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+</div><div class='add'>+	if (!iwl_mld_vif_has_emlsr_cap(vif))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!mld-&gt;bt_is_active) {</div><div class='add'>+		iwl_mld_retry_emlsr(mld, vif);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* BT is turned ON but we are not in EMLSR, nothing to do */</div><div class='add'>+	if (!iwl_mld_emlsr_active(vif))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* In EMLSR and BT is turned ON */</div><div class='add'>+</div><div class='add'>+	for_each_vif_active_link(vif, link, link_id) {</div><div class='add'>+		if (WARN_ON(!link-&gt;chanreq.oper.chan))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (link-&gt;chanreq.oper.chan-&gt;band == NL80211_BAND_2GHZ) {</div><div class='add'>+			iwl_mld_exit_emlsr(mld, vif, IWL_MLD_EMLSR_EXIT_BT_COEX,</div><div class='add'>+					   iwl_mld_get_primary_link(vif));</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_emlsr_check_bt(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	ieee80211_iterate_active_interfaces_mtx(mld-&gt;hw,</div><div class='add'>+						IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						iwl_mld_emlsr_check_bt_iter,</div><div class='add'>+						NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct iwl_mld_chan_load_data {</div><div class='add'>+	struct iwl_mld_phy *phy;</div><div class='add'>+	u32 prev_chan_load_not_by_us;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void iwl_mld_chan_load_update_iter(void *_data, u8 *mac,</div><div class='add'>+					  struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_chan_load_data *data = _data;</div><div class='add'>+	const struct iwl_mld_phy *phy = data-&gt;phy;</div><div class='add'>+	struct ieee80211_chanctx_conf *chanctx =</div><div class='add'>+		container_of((const void *)phy, struct ieee80211_chanctx_conf,</div><div class='add'>+			     drv_priv);</div><div class='add'>+	struct iwl_mld *mld = iwl_mld_vif_from_mac80211(vif)-&gt;mld;</div><div class='add'>+	struct ieee80211_bss_conf *prim_link;</div><div class='add'>+	unsigned int prim_link_id;</div><div class='add'>+</div><div class='add'>+	prim_link_id = iwl_mld_get_primary_link(vif);</div><div class='add'>+	prim_link = link_conf_dereference_protected(vif, prim_link_id);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!prim_link))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (chanctx != rcu_access_pointer(prim_link-&gt;chanctx_conf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_emlsr_active(vif)) {</div><div class='add'>+		int chan_load = iwl_mld_get_chan_load_by_others(mld, prim_link,</div><div class='add'>+								true);</div><div class='add'>+</div><div class='add'>+		if (chan_load &lt; 0)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		/* chan_load is in range [0,255] */</div><div class='add'>+		if (chan_load &lt; NORMALIZE_PERCENT_TO_255(IWL_MLD_EXIT_EMLSR_CHAN_LOAD))</div><div class='add'>+			iwl_mld_exit_emlsr(mld, vif,</div><div class='add'>+					   IWL_MLD_EMLSR_EXIT_CHAN_LOAD,</div><div class='add'>+					   prim_link_id);</div><div class='add'>+	} else {</div><div class='add'>+		u32 old_chan_load = data-&gt;prev_chan_load_not_by_us;</div><div class='add'>+		u32 new_chan_load = phy-&gt;avg_channel_load_not_by_us;</div><div class='add'>+		u32 min_thresh = iwl_mld_get_min_chan_load_thresh(chanctx);</div><div class='add'>+</div><div class='add'>+#define THRESHOLD_CROSSED(threshold) \</div><div class='add'>+	(old_chan_load &lt;= (threshold) &amp;&amp; new_chan_load &gt; (threshold))</div><div class='add'>+</div><div class='add'>+		if (THRESHOLD_CROSSED(min_thresh) || THRESHOLD_CROSSED(25) ||</div><div class='add'>+		    THRESHOLD_CROSSED(40) || THRESHOLD_CROSSED(50))</div><div class='add'>+			iwl_mld_retry_emlsr(mld, vif);</div><div class='add'>+#undef THRESHOLD_CROSSED</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_emlsr_check_chan_load(struct ieee80211_hw *hw,</div><div class='add'>+				   struct iwl_mld_phy *phy,</div><div class='add'>+				   u32 prev_chan_load_not_by_us)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_chan_load_data data = {</div><div class='add'>+		.phy = phy,</div><div class='add'>+		.prev_chan_load_not_by_us = prev_chan_load_not_by_us,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_mtx(hw,</div><div class='add'>+						IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						iwl_mld_chan_load_update_iter,</div><div class='add'>+						&amp;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_retry_emlsr(struct iwl_mld *mld, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	if (!IWL_MLD_AUTO_EML_ENABLE || !iwl_mld_vif_has_emlsr_cap(vif) ||</div><div class='add'>+	    iwl_mld_emlsr_active(vif) || mld_vif-&gt;emlsr.blocked_reasons)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mld_int_mlo_scan(mld, vif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_ignore_tpt_iter(void *data, u8 *mac,</div><div class='add'>+				    struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld *mld = mld_vif-&gt;mld;</div><div class='add'>+	struct iwl_mld_sta *mld_sta;</div><div class='add'>+	bool *start = (void *)data;</div><div class='add'>+</div><div class='add'>+	/* check_tpt_wk is only used when TPT block isn't set */</div><div class='add'>+	if (mld_vif-&gt;emlsr.blocked_reasons &amp; IWL_MLD_EMLSR_BLOCKED_TPT ||</div><div class='add'>+	    !IWL_MLD_AUTO_EML_ENABLE || !mld_vif-&gt;ap_sta)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mld_sta = iwl_mld_sta_from_mac80211(mld_vif-&gt;ap_sta);</div><div class='add'>+</div><div class='add'>+	/* We only count for the AP sta in a MLO connection */</div><div class='add'>+	if (!mld_sta-&gt;mpdu_counters)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (*start) {</div><div class='add'>+		wiphy_delayed_work_cancel(mld_vif-&gt;mld-&gt;wiphy,</div><div class='add'>+					  &amp;mld_vif-&gt;emlsr.check_tpt_wk);</div><div class='add'>+		IWL_DEBUG_EHT(mld, "TPT check disabled\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear the counters so we start from the beginning */</div><div class='add'>+	for (int q = 0; q &lt; mld-&gt;trans-&gt;info.num_rxqs; q++) {</div><div class='add'>+		struct iwl_mld_per_q_mpdu_counter *queue_counter =</div><div class='add'>+			&amp;mld_sta-&gt;mpdu_counters[q];</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;queue_counter-&gt;lock);</div><div class='add'>+</div><div class='add'>+		memset(queue_counter-&gt;per_link, 0,</div><div class='add'>+		       sizeof(queue_counter-&gt;per_link));</div><div class='add'>+</div><div class='add'>+		spin_unlock_bh(&amp;queue_counter-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Schedule the check in 5 seconds */</div><div class='add'>+	wiphy_delayed_work_queue(mld_vif-&gt;mld-&gt;wiphy,</div><div class='add'>+				 &amp;mld_vif-&gt;emlsr.check_tpt_wk,</div><div class='add'>+				 round_jiffies_relative(IWL_MLD_TPT_COUNT_WINDOW));</div><div class='add'>+	IWL_DEBUG_EHT(mld, "TPT check enabled\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_start_ignoring_tpt_updates(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	bool start = true;</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_mtx(mld-&gt;hw,</div><div class='add'>+						IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						iwl_mld_ignore_tpt_iter,</div><div class='add'>+						&amp;start);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_stop_ignoring_tpt_updates(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	bool start = false;</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_mtx(mld-&gt;hw,</div><div class='add'>+						IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						iwl_mld_ignore_tpt_iter,</div><div class='add'>+						&amp;start);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/mlo.h b/drivers/net/wireless/intel/iwlwifi/mld/mlo.h<br/>new file mode 100644<br/>index 000000000000..d936589fe39d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/mlo.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/mlo.h</a></div><div class='hunk'>@@ -0,0 +1,171 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_mlo_h__</div><div class='add'>+#define __iwl_mld_mlo_h__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ieee80211.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+#include "iwl-config.h"</div><div class='add'>+#include "iwl-trans.h"</div><div class='add'>+#include "iface.h"</div><div class='add'>+#include "phy.h"</div><div class='add'>+</div><div class='add'>+struct iwl_mld;</div><div class='add'>+</div><div class='add'>+void iwl_mld_emlsr_prevent_done_wk(struct wiphy *wiphy, struct wiphy_work *wk);</div><div class='add'>+void iwl_mld_emlsr_tmp_non_bss_done_wk(struct wiphy *wiphy,</div><div class='add'>+				       struct wiphy_work *wk);</div><div class='add'>+</div><div class='add'>+static inline bool iwl_mld_emlsr_active(struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	/* Set on phy context activation, so should be a good proxy */</div><div class='add'>+	return !!(vif-&gt;driver_flags &amp; IEEE80211_VIF_EML_ACTIVE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool iwl_mld_vif_has_emlsr_cap(struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	/* We only track/permit EMLSR state once authorized */</div><div class='add'>+	if (!mld_vif-&gt;authorized)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* No EMLSR on dual radio devices */</div><div class='add'>+	return ieee80211_vif_type_p2p(vif) == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+	       ieee80211_vif_is_mld(vif) &amp;&amp;</div><div class='add'>+	       vif-&gt;cfg.eml_cap &amp; IEEE80211_EML_CAP_EMLSR_SUPP &amp;&amp;</div><div class='add'>+	       !CSR_HW_RFID_IS_CDB(mld_vif-&gt;mld-&gt;trans-&gt;info.hw_rf_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+iwl_mld_max_active_links(struct iwl_mld *mld, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP)</div><div class='add'>+		return mld-&gt;fw-&gt;ucode_capa.num_beacons;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_type_p2p(vif) == NL80211_IFTYPE_STATION)</div><div class='add'>+		return IWL_FW_MAX_ACTIVE_LINKS_NUM;</div><div class='add'>+</div><div class='add'>+	/* For now, do not accept more links on other interface types */</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+iwl_mld_count_active_links(struct iwl_mld *mld, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld_link *mld_link;</div><div class='add'>+	int n_active = 0;</div><div class='add'>+</div><div class='add'>+	for_each_mld_vif_valid_link(mld_vif, mld_link) {</div><div class='add'>+		if (rcu_access_pointer(mld_link-&gt;chan_ctx))</div><div class='add'>+			n_active++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return n_active;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 iwl_mld_get_primary_link(struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld_vif-&gt;mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_vif_is_mld(vif) || WARN_ON(!vif-&gt;active_links))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* In AP mode, there is no primary link */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP)</div><div class='add'>+		return __ffs(vif-&gt;active_links);</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_emlsr_active(vif) &amp;&amp;</div><div class='add'>+	    !WARN_ON(!(BIT(mld_vif-&gt;emlsr.primary) &amp; vif-&gt;active_links)))</div><div class='add'>+		return mld_vif-&gt;emlsr.primary;</div><div class='add'>+</div><div class='add'>+	return __ffs(vif-&gt;active_links);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For non-MLO/single link, this will return the deflink/single active link,</div><div class='add'>+ * respectively</div><div class='add'>+ */</div><div class='add'>+static inline u8 iwl_mld_get_other_link(struct ieee80211_vif *vif, u8 link_id)</div><div class='add'>+{</div><div class='add'>+	switch (hweight16(vif-&gt;active_links)) {</div><div class='add'>+	case 0:</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case 1:</div><div class='add'>+		return __ffs(vif-&gt;active_links);</div><div class='add'>+	case 2:</div><div class='add'>+		return __ffs(vif-&gt;active_links &amp; ~BIT(link_id));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+s8 iwl_mld_get_emlsr_rssi_thresh(struct iwl_mld *mld,</div><div class='add'>+				 const struct cfg80211_chan_def *chandef,</div><div class='add'>+				 bool low);</div><div class='add'>+</div><div class='add'>+/* EMLSR block/unblock and exit */</div><div class='add'>+void iwl_mld_block_emlsr(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			 enum iwl_mld_emlsr_blocked reason, u8 link_to_keep);</div><div class='add'>+int iwl_mld_block_emlsr_sync(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			     enum iwl_mld_emlsr_blocked reason, u8 link_to_keep);</div><div class='add'>+void iwl_mld_unblock_emlsr(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			   enum iwl_mld_emlsr_blocked reason);</div><div class='add'>+void iwl_mld_exit_emlsr(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			enum iwl_mld_emlsr_exit exit, u8 link_to_keep);</div><div class='add'>+</div><div class='add'>+int iwl_mld_emlsr_check_non_bss_block(struct iwl_mld *mld,</div><div class='add'>+				      int pending_link_changes);</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_emlsr_mode_notif(struct iwl_mld *mld,</div><div class='add'>+				     struct iwl_rx_packet *pkt);</div><div class='add'>+void iwl_mld_handle_emlsr_trans_fail_notif(struct iwl_mld *mld,</div><div class='add'>+					   struct iwl_rx_packet *pkt);</div><div class='add'>+</div><div class='add'>+void iwl_mld_emlsr_check_tpt(struct wiphy *wiphy, struct wiphy_work *wk);</div><div class='add'>+void iwl_mld_emlsr_unblock_tpt_wk(struct wiphy *wiphy, struct wiphy_work *wk);</div><div class='add'>+</div><div class='add'>+void iwl_mld_select_links(struct iwl_mld *mld);</div><div class='add'>+</div><div class='add'>+void iwl_mld_emlsr_check_bt(struct iwl_mld *mld);</div><div class='add'>+</div><div class='add'>+void iwl_mld_emlsr_check_chan_load(struct ieee80211_hw *hw,</div><div class='add'>+				   struct iwl_mld_phy *phy,</div><div class='add'>+				   u32 prev_chan_load_not_by_us);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_mld_retry_emlsr - Retry entering EMLSR</div><div class='add'>+ * @mld: MLD context</div><div class='add'>+ * @vif: VIF to retry EMLSR on</div><div class='add'>+ *</div><div class='add'>+ * Retry entering EMLSR on the given VIF.</div><div class='add'>+ * Use this if one of the parameters that can prevent EMLSR has changed.</div><div class='add'>+ */</div><div class='add'>+void iwl_mld_retry_emlsr(struct iwl_mld *mld, struct ieee80211_vif *vif);</div><div class='add'>+</div><div class='add'>+struct iwl_mld_link_sel_data {</div><div class='add'>+	u8 link_id;</div><div class='add'>+	const struct cfg80211_chan_def *chandef;</div><div class='add'>+	s32 signal;</div><div class='add'>+	u16 grade;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void iwl_mld_emlsr_block_tmp_non_bss(struct iwl_mld *mld);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IWLWIFI_KUNIT_TESTS)</div><div class='add'>+u32 iwl_mld_emlsr_pair_state(struct ieee80211_vif *vif,</div><div class='add'>+			     struct iwl_mld_link_sel_data *a,</div><div class='add'>+			     struct iwl_mld_link_sel_data *b);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void iwl_mld_start_ignoring_tpt_updates(struct iwl_mld *mld);</div><div class='add'>+void iwl_mld_stop_ignoring_tpt_updates(struct iwl_mld *mld);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_mlo_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/notif.c b/drivers/net/wireless/intel/iwlwifi/mld/notif.c<br/>new file mode 100644<br/>index 000000000000..4cf3920b005f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/notif.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/notif.c</a></div><div class='hunk'>@@ -0,0 +1,719 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "notif.h"</div><div class='add'>+#include "scan.h"</div><div class='add'>+#include "iface.h"</div><div class='add'>+#include "mlo.h"</div><div class='add'>+#include "iwl-trans.h"</div><div class='add'>+#include "fw/file.h"</div><div class='add'>+#include "fw/dbg.h"</div><div class='add'>+#include "fw/api/cmdhdr.h"</div><div class='add'>+#include "fw/api/mac-cfg.h"</div><div class='add'>+#include "session-protect.h"</div><div class='add'>+#include "fw/api/time-event.h"</div><div class='add'>+#include "fw/api/tx.h"</div><div class='add'>+#include "fw/api/rs.h"</div><div class='add'>+#include "fw/api/offload.h"</div><div class='add'>+#include "fw/api/stats.h"</div><div class='add'>+#include "fw/api/rfi.h"</div><div class='add'>+#include "fw/api/coex.h"</div><div class='add'>+</div><div class='add'>+#include "mcc.h"</div><div class='add'>+#include "link.h"</div><div class='add'>+#include "tx.h"</div><div class='add'>+#include "rx.h"</div><div class='add'>+#include "tlc.h"</div><div class='add'>+#include "agg.h"</div><div class='add'>+#include "mac80211.h"</div><div class='add'>+#include "thermal.h"</div><div class='add'>+#include "roc.h"</div><div class='add'>+#include "stats.h"</div><div class='add'>+#include "coex.h"</div><div class='add'>+#include "time_sync.h"</div><div class='add'>+#include "ftm-initiator.h"</div><div class='add'>+</div><div class='add'>+/* Please use this in an increasing order of the versions */</div><div class='add'>+#define CMD_VER_ENTRY(_ver, _struct)			\</div><div class='add'>+	{ .size = sizeof(struct _struct), .ver = _ver },</div><div class='add'>+#define CMD_VERSIONS(name, ...)				\</div><div class='add'>+	static const struct iwl_notif_struct_size	\</div><div class='add'>+	iwl_notif_struct_sizes_##name[] = { __VA_ARGS__ };</div><div class='add'>+</div><div class='add'>+#define RX_HANDLER_NO_OBJECT(_grp, _cmd, _name, _context)		\</div><div class='add'>+	{.cmd_id = WIDE_ID(_grp, _cmd),					\</div><div class='add'>+	 .context = _context,						\</div><div class='add'>+	 .fn = iwl_mld_handle_##_name,					\</div><div class='add'>+	 .sizes = iwl_notif_struct_sizes_##_name,			\</div><div class='add'>+	 .n_sizes = ARRAY_SIZE(iwl_notif_struct_sizes_##_name),		\</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+/* Use this for Rx handlers that do not need notification validation */</div><div class='add'>+#define RX_HANDLER_NO_VAL(_grp, _cmd, _name, _context)			\</div><div class='add'>+	{.cmd_id = WIDE_ID(_grp, _cmd),					\</div><div class='add'>+	 .context = _context,						\</div><div class='add'>+	 .fn = iwl_mld_handle_##_name,					\</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+#define RX_HANDLER_VAL_FN(_grp, _cmd, _name, _context)			\</div><div class='add'>+	{ .cmd_id = WIDE_ID(_grp, _cmd),				\</div><div class='add'>+	  .context = _context,						\</div><div class='add'>+	  .fn = iwl_mld_handle_##_name,					\</div><div class='add'>+	  .val_fn = iwl_mld_validate_##_name,				\</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+#define DEFINE_SIMPLE_CANCELLATION(name, notif_struct, id_member)		\</div><div class='add'>+static bool iwl_mld_cancel_##name##_notif(struct iwl_mld *mld,			\</div><div class='add'>+					  struct iwl_rx_packet *pkt,		\</div><div class='add'>+					  u32 obj_id)				\</div><div class='add'>+{										\</div><div class='add'>+	const struct notif_struct *notif = (const void *)pkt-&gt;data;		\</div><div class='add'>+										\</div><div class='add'>+	return obj_id == _Generic((notif)-&gt;id_member,				\</div><div class='add'>+				  __le32: le32_to_cpu((notif)-&gt;id_member),	\</div><div class='add'>+				  __le16: le16_to_cpu((notif)-&gt;id_member),	\</div><div class='add'>+				  u8: (notif)-&gt;id_member);			\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Currently only defined for the RX_HANDLER_SIZES options. Use this for</div><div class='add'>+ * notifications that belong to a specific object, and that should be</div><div class='add'>+ * canceled when the object is removed</div><div class='add'>+ */</div><div class='add'>+#define RX_HANDLER_OF_OBJ(_grp, _cmd, _name, _obj_type)			\</div><div class='add'>+	{.cmd_id = WIDE_ID(_grp, _cmd),					\</div><div class='add'>+	/* Only async handlers can be canceled */			\</div><div class='add'>+	 .context = RX_HANDLER_ASYNC,					\</div><div class='add'>+	 .fn = iwl_mld_handle_##_name,					\</div><div class='add'>+	 .sizes = iwl_notif_struct_sizes_##_name,			\</div><div class='add'>+	 .n_sizes = ARRAY_SIZE(iwl_notif_struct_sizes_##_name),		\</div><div class='add'>+	 .obj_type = IWL_MLD_OBJECT_TYPE_##_obj_type,			\</div><div class='add'>+	 .cancel = iwl_mld_cancel_##_name,				\</div><div class='add'>+	 },</div><div class='add'>+</div><div class='add'>+#define RX_HANDLER_OF_LINK(_grp, _cmd, _name)				\</div><div class='add'>+	RX_HANDLER_OF_OBJ(_grp, _cmd, _name, LINK)			\</div><div class='add'>+</div><div class='add'>+#define RX_HANDLER_OF_VIF(_grp, _cmd, _name)				\</div><div class='add'>+	RX_HANDLER_OF_OBJ(_grp, _cmd, _name, VIF)			\</div><div class='add'>+</div><div class='add'>+#define RX_HANDLER_OF_STA(_grp, _cmd, _name)				\</div><div class='add'>+	RX_HANDLER_OF_OBJ(_grp, _cmd, _name, STA)			\</div><div class='add'>+</div><div class='add'>+#define RX_HANDLER_OF_ROC(_grp, _cmd, _name)				\</div><div class='add'>+	RX_HANDLER_OF_OBJ(_grp, _cmd, _name, ROC)</div><div class='add'>+</div><div class='add'>+#define RX_HANDLER_OF_SCAN(_grp, _cmd, _name)				\</div><div class='add'>+	RX_HANDLER_OF_OBJ(_grp, _cmd, _name, SCAN)</div><div class='add'>+</div><div class='add'>+#define RX_HANDLER_OF_FTM_REQ(_grp, _cmd, _name)				\</div><div class='add'>+	RX_HANDLER_OF_OBJ(_grp, _cmd, _name, FTM_REQ)</div><div class='add'>+</div><div class='add'>+static void iwl_mld_handle_mfuart_notif(struct iwl_mld *mld,</div><div class='add'>+					struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mfuart_load_notif *mfuart_notif = (void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(mld,</div><div class='add'>+		       "MFUART: installed ver: 0x%08x, external ver: 0x%08x\n",</div><div class='add'>+		       le32_to_cpu(mfuart_notif-&gt;installed_ver),</div><div class='add'>+		       le32_to_cpu(mfuart_notif-&gt;external_ver));</div><div class='add'>+	IWL_DEBUG_INFO(mld,</div><div class='add'>+		       "MFUART: status: 0x%08x, duration: 0x%08x image size: 0x%08x\n",</div><div class='add'>+		       le32_to_cpu(mfuart_notif-&gt;status),</div><div class='add'>+		       le32_to_cpu(mfuart_notif-&gt;duration),</div><div class='add'>+		       le32_to_cpu(mfuart_notif-&gt;image_size));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_mu_mimo_iface_iterator(void *_data, u8 *mac,</div><div class='add'>+					   struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_bss_conf *bss_conf = &amp;vif-&gt;bss_conf;</div><div class='add'>+	unsigned int link_id = 0;</div><div class='add'>+</div><div class='add'>+	if (WARN(hweight16(vif-&gt;active_links) &gt; 1,</div><div class='add'>+		 "no support for this notif while in EMLSR 0x%x\n",</div><div class='add'>+		 vif-&gt;active_links))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_is_mld(vif)) {</div><div class='add'>+		link_id = __ffs(vif-&gt;active_links);</div><div class='add'>+		bss_conf = link_conf_dereference_check(vif, link_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!WARN_ON(!bss_conf) &amp;&amp; bss_conf-&gt;mu_mimo_owner) {</div><div class='add'>+		const struct iwl_mu_group_mgmt_notif *notif = _data;</div><div class='add'>+</div><div class='add'>+		BUILD_BUG_ON(sizeof(notif-&gt;membership_status) !=</div><div class='add'>+			     WLAN_MEMBERSHIP_LEN);</div><div class='add'>+		BUILD_BUG_ON(sizeof(notif-&gt;user_position) !=</div><div class='add'>+			     WLAN_USER_POSITION_LEN);</div><div class='add'>+</div><div class='add'>+		/* MU-MIMO Group Id action frame is little endian. We treat</div><div class='add'>+		 * the data received from firmware as if it came from the</div><div class='add'>+		 * action frame, so no conversion is needed.</div><div class='add'>+		 */</div><div class='add'>+		ieee80211_update_mu_groups(vif, link_id,</div><div class='add'>+					   (u8 *)&amp;notif-&gt;membership_status,</div><div class='add'>+					   (u8 *)&amp;notif-&gt;user_position);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This handler is called in SYNC mode because it needs to be serialized with</div><div class='add'>+ * Rx as specified in ieee80211_update_mu_groups()'s documentation.</div><div class='add'>+ */</div><div class='add'>+static void iwl_mld_handle_mu_mimo_grp_notif(struct iwl_mld *mld,</div><div class='add'>+					     struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mu_group_mgmt_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_atomic(mld-&gt;hw,</div><div class='add'>+						   IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						   iwl_mld_mu_mimo_iface_iterator,</div><div class='add'>+						   notif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_handle_channel_switch_start_notif(struct iwl_mld *mld,</div><div class='add'>+					  struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_channel_switch_start_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+	u32 link_id = le32_to_cpu(notif-&gt;link_id);</div><div class='add'>+	struct ieee80211_bss_conf *link_conf =</div><div class='add'>+		iwl_mld_fw_id_to_link_conf(mld, link_id);</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!link_conf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vif = link_conf-&gt;vif;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(mld,</div><div class='add'>+		       "CSA Start Notification with vif type: %d, link_id: %d\n",</div><div class='add'>+		       vif-&gt;type,</div><div class='add'>+		       link_conf-&gt;link_id);</div><div class='add'>+</div><div class='add'>+	switch (vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		/* We don't support canceling a CSA as it was advertised</div><div class='add'>+		 * by the AP itself</div><div class='add'>+		 */</div><div class='add'>+		if (!link_conf-&gt;csa_active)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		ieee80211_csa_finish(vif, link_conf-&gt;link_id);</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		if (!link_conf-&gt;csa_active) {</div><div class='add'>+			/* Either unexpected cs notif or mac80211 chose to</div><div class='add'>+			 * ignore, for example in channel switch to same channel</div><div class='add'>+			 */</div><div class='add'>+			struct iwl_cancel_channel_switch_cmd cmd = {</div><div class='add'>+				.id = cpu_to_le32(link_id),</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			if (iwl_mld_send_cmd_pdu(mld,</div><div class='add'>+						 WIDE_ID(MAC_CONF_GROUP,</div><div class='add'>+							 CANCEL_CHANNEL_SWITCH_CMD),</div><div class='add'>+						 &amp;cmd))</div><div class='add'>+				IWL_ERR(mld,</div><div class='add'>+					"Failed to cancel the channel switch\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ieee80211_chswitch_done(vif, true, link_conf-&gt;link_id);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		WARN(1, "CSA on invalid vif type: %d", vif-&gt;type);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_handle_channel_switch_error_notif(struct iwl_mld *mld,</div><div class='add'>+					  struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_channel_switch_error_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	u32 link_id = le32_to_cpu(notif-&gt;link_id);</div><div class='add'>+	u32 csa_err_mask = le32_to_cpu(notif-&gt;csa_err_mask);</div><div class='add'>+</div><div class='add'>+	link_conf = iwl_mld_fw_id_to_link_conf(mld, link_id);</div><div class='add'>+	if (WARN_ON(!link_conf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vif = link_conf-&gt;vif;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(mld, "FW reports CSA error: id=%u, csa_err_mask=%u\n",</div><div class='add'>+		       link_id, csa_err_mask);</div><div class='add'>+</div><div class='add'>+	if (csa_err_mask &amp; (CS_ERR_COUNT_ERROR |</div><div class='add'>+			    CS_ERR_LONG_DELAY_AFTER_CS |</div><div class='add'>+			    CS_ERR_TX_BLOCK_TIMER_EXPIRED))</div><div class='add'>+		ieee80211_channel_switch_disconnect(vif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_handle_beacon_notification(struct iwl_mld *mld,</div><div class='add'>+					       struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_extended_beacon_notif *beacon = (void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+	mld-&gt;ibss_manager = !!beacon-&gt;ibss_mgr_status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Notification versioning</div><div class='add'>+ *</div><div class='add'>+ * The firmware's notifications change from time to time. In order to</div><div class='add'>+ * differentiate between different versions of the same notification, the</div><div class='add'>+ * firmware advertises the version of each notification.</div><div class='add'>+ * Here are listed all the notifications that are supported. Several versions</div><div class='add'>+ * of the same notification can be allowed at the same time:</div><div class='add'>+ *</div><div class='add'>+ * CMD_VERSION(my_multi_version_notif,</div><div class='add'>+ *	       CMD_VER_ENTRY(1, iwl_my_multi_version_notif_ver1)</div><div class='add'>+ *	       CMD_VER_ENTRY(2, iwl_my_multi_version_notif_ver2)</div><div class='add'>+ *</div><div class='add'>+ * etc...</div><div class='add'>+ *</div><div class='add'>+ * The driver will enforce that the notification coming from the firmware</div><div class='add'>+ * has its version listed here and it'll also enforce that the firmware sent</div><div class='add'>+ * at least enough bytes to cover the structure listed in the CMD_VER_ENTRY.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+CMD_VERSIONS(scan_complete_notif,</div><div class='add'>+	     CMD_VER_ENTRY(1, iwl_umac_scan_complete))</div><div class='add'>+CMD_VERSIONS(scan_iter_complete_notif,</div><div class='add'>+	     CMD_VER_ENTRY(2, iwl_umac_scan_iter_complete_notif))</div><div class='add'>+CMD_VERSIONS(channel_survey_notif,</div><div class='add'>+	     CMD_VER_ENTRY(1, iwl_umac_scan_channel_survey_notif))</div><div class='add'>+CMD_VERSIONS(mfuart_notif,</div><div class='add'>+	     CMD_VER_ENTRY(2, iwl_mfuart_load_notif))</div><div class='add'>+CMD_VERSIONS(update_mcc,</div><div class='add'>+	     CMD_VER_ENTRY(1, iwl_mcc_chub_notif))</div><div class='add'>+CMD_VERSIONS(session_prot_notif,</div><div class='add'>+	     CMD_VER_ENTRY(3, iwl_session_prot_notif))</div><div class='add'>+CMD_VERSIONS(missed_beacon_notif,</div><div class='add'>+	     CMD_VER_ENTRY(5, iwl_missed_beacons_notif))</div><div class='add'>+CMD_VERSIONS(tx_resp_notif,</div><div class='add'>+	     CMD_VER_ENTRY(8, iwl_tx_resp)</div><div class='add'>+	     CMD_VER_ENTRY(9, iwl_tx_resp))</div><div class='add'>+CMD_VERSIONS(compressed_ba_notif,</div><div class='add'>+	     CMD_VER_ENTRY(5, iwl_compressed_ba_notif)</div><div class='add'>+	     CMD_VER_ENTRY(6, iwl_compressed_ba_notif)</div><div class='add'>+	     CMD_VER_ENTRY(7, iwl_compressed_ba_notif))</div><div class='add'>+CMD_VERSIONS(tlc_notif,</div><div class='add'>+	     CMD_VER_ENTRY(3, iwl_tlc_update_notif)</div><div class='add'>+	     CMD_VER_ENTRY(4, iwl_tlc_update_notif))</div><div class='add'>+CMD_VERSIONS(mu_mimo_grp_notif,</div><div class='add'>+	     CMD_VER_ENTRY(1, iwl_mu_group_mgmt_notif))</div><div class='add'>+CMD_VERSIONS(channel_switch_start_notif,</div><div class='add'>+	     CMD_VER_ENTRY(3, iwl_channel_switch_start_notif))</div><div class='add'>+CMD_VERSIONS(channel_switch_error_notif,</div><div class='add'>+	     CMD_VER_ENTRY(2, iwl_channel_switch_error_notif))</div><div class='add'>+CMD_VERSIONS(ct_kill_notif,</div><div class='add'>+	     CMD_VER_ENTRY(2, ct_kill_notif))</div><div class='add'>+CMD_VERSIONS(temp_notif,</div><div class='add'>+	     CMD_VER_ENTRY(2, iwl_dts_measurement_notif))</div><div class='add'>+CMD_VERSIONS(roc_notif,</div><div class='add'>+	     CMD_VER_ENTRY(1, iwl_roc_notif))</div><div class='add'>+CMD_VERSIONS(probe_resp_data_notif,</div><div class='add'>+	     CMD_VER_ENTRY(1, iwl_probe_resp_data_notif))</div><div class='add'>+CMD_VERSIONS(datapath_monitor_notif,</div><div class='add'>+	     CMD_VER_ENTRY(1, iwl_datapath_monitor_notif))</div><div class='add'>+CMD_VERSIONS(stats_oper_notif,</div><div class='add'>+	     CMD_VER_ENTRY(3, iwl_system_statistics_notif_oper))</div><div class='add'>+CMD_VERSIONS(stats_oper_part1_notif,</div><div class='add'>+	     CMD_VER_ENTRY(4, iwl_system_statistics_part1_notif_oper))</div><div class='add'>+CMD_VERSIONS(bt_coex_notif,</div><div class='add'>+	     CMD_VER_ENTRY(1, iwl_bt_coex_profile_notif))</div><div class='add'>+CMD_VERSIONS(beacon_notification,</div><div class='add'>+	     CMD_VER_ENTRY(6, iwl_extended_beacon_notif))</div><div class='add'>+CMD_VERSIONS(emlsr_mode_notif,</div><div class='add'>+	     CMD_VER_ENTRY(2, iwl_esr_mode_notif))</div><div class='add'>+CMD_VERSIONS(emlsr_trans_fail_notif,</div><div class='add'>+	     CMD_VER_ENTRY(1, iwl_esr_trans_fail_notif))</div><div class='add'>+CMD_VERSIONS(uapsd_misbehaving_ap_notif,</div><div class='add'>+	     CMD_VER_ENTRY(1, iwl_uapsd_misbehaving_ap_notif))</div><div class='add'>+CMD_VERSIONS(time_msmt_notif,</div><div class='add'>+	     CMD_VER_ENTRY(1, iwl_time_msmt_notify))</div><div class='add'>+CMD_VERSIONS(time_sync_confirm_notif,</div><div class='add'>+	     CMD_VER_ENTRY(1, iwl_time_msmt_cfm_notify))</div><div class='add'>+CMD_VERSIONS(ftm_resp_notif, CMD_VER_ENTRY(10, iwl_tof_range_rsp_ntfy))</div><div class='add'>+CMD_VERSIONS(beacon_filter_notif, CMD_VER_ENTRY(2, iwl_beacon_filter_notif))</div><div class='add'>+</div><div class='add'>+DEFINE_SIMPLE_CANCELLATION(session_prot, iwl_session_prot_notif, mac_link_id)</div><div class='add'>+DEFINE_SIMPLE_CANCELLATION(tlc, iwl_tlc_update_notif, sta_id)</div><div class='add'>+DEFINE_SIMPLE_CANCELLATION(channel_switch_start,</div><div class='add'>+			   iwl_channel_switch_start_notif, link_id)</div><div class='add'>+DEFINE_SIMPLE_CANCELLATION(channel_switch_error,</div><div class='add'>+			   iwl_channel_switch_error_notif, link_id)</div><div class='add'>+DEFINE_SIMPLE_CANCELLATION(datapath_monitor, iwl_datapath_monitor_notif,</div><div class='add'>+			   link_id)</div><div class='add'>+DEFINE_SIMPLE_CANCELLATION(roc, iwl_roc_notif, activity)</div><div class='add'>+DEFINE_SIMPLE_CANCELLATION(scan_complete, iwl_umac_scan_complete, uid)</div><div class='add'>+DEFINE_SIMPLE_CANCELLATION(probe_resp_data, iwl_probe_resp_data_notif,</div><div class='add'>+			   mac_id)</div><div class='add'>+DEFINE_SIMPLE_CANCELLATION(uapsd_misbehaving_ap, iwl_uapsd_misbehaving_ap_notif,</div><div class='add'>+			   mac_id)</div><div class='add'>+DEFINE_SIMPLE_CANCELLATION(ftm_resp, iwl_tof_range_rsp_ntfy, request_id)</div><div class='add'>+DEFINE_SIMPLE_CANCELLATION(beacon_filter, iwl_beacon_filter_notif, link_id)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Handlers for fw notifications</div><div class='add'>+ *</div><div class='add'>+ * Here are listed the notifications IDs (including the group ID), the handler</div><div class='add'>+ * of the notification and how it should be called:</div><div class='add'>+ *</div><div class='add'>+ *  - RX_HANDLER_SYNC: will be called as part of the Rx path</div><div class='add'>+ *  - RX_HANDLER_ASYNC: will be handled in a working with the wiphy_lock held</div><div class='add'>+ *</div><div class='add'>+ * This means that if the firmware sends two notifications A and B in that</div><div class='add'>+ * order and notification A is RX_HANDLER_ASYNC and notification is</div><div class='add'>+ * RX_HANDLER_SYNC, the handler of B will likely be called before the handler</div><div class='add'>+ * of A.</div><div class='add'>+ *</div><div class='add'>+ * This list should be in order of frequency for performance purposes.</div><div class='add'>+ * The handler can be one from two contexts, see &amp;iwl_rx_handler_context</div><div class='add'>+ *</div><div class='add'>+ * A handler can declare that it relies on a specific object in which case it</div><div class='add'>+ * can be cancelled in case the object is deleted. In order to use this</div><div class='add'>+ * mechanism, a cancellation function is needed. The cancellation function must</div><div class='add'>+ * receive an object id (the index of that object in the firmware) and a</div><div class='add'>+ * notification payload. It'll return true if that specific notification should</div><div class='add'>+ * be cancelled upon the obliteration of the specific instance of the object.</div><div class='add'>+ *</div><div class='add'>+ * DEFINE_SIMPLE_CANCELLATION allows to easily create a cancellation function</div><div class='add'>+ * that wills simply return true if a given object id matches the object id in</div><div class='add'>+ * the firmware notification.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+VISIBLE_IF_IWLWIFI_KUNIT</div><div class='add'>+const struct iwl_rx_handler iwl_mld_rx_handlers[] = {</div><div class='add'>+	RX_HANDLER_NO_OBJECT(LEGACY_GROUP, TX_CMD, tx_resp_notif,</div><div class='add'>+			     RX_HANDLER_SYNC)</div><div class='add'>+	RX_HANDLER_NO_OBJECT(LEGACY_GROUP, BA_NOTIF, compressed_ba_notif,</div><div class='add'>+			     RX_HANDLER_SYNC)</div><div class='add'>+	RX_HANDLER_OF_SCAN(LEGACY_GROUP, SCAN_COMPLETE_UMAC,</div><div class='add'>+			   scan_complete_notif)</div><div class='add'>+	RX_HANDLER_NO_OBJECT(LEGACY_GROUP, SCAN_ITERATION_COMPLETE_UMAC,</div><div class='add'>+			     scan_iter_complete_notif,</div><div class='add'>+			     RX_HANDLER_SYNC)</div><div class='add'>+	RX_HANDLER_NO_VAL(LEGACY_GROUP, MATCH_FOUND_NOTIFICATION,</div><div class='add'>+			  match_found_notif, RX_HANDLER_SYNC)</div><div class='add'>+</div><div class='add'>+	RX_HANDLER_NO_OBJECT(SCAN_GROUP, CHANNEL_SURVEY_NOTIF,</div><div class='add'>+			     channel_survey_notif,</div><div class='add'>+			     RX_HANDLER_ASYNC)</div><div class='add'>+</div><div class='add'>+	RX_HANDLER_NO_OBJECT(STATISTICS_GROUP, STATISTICS_OPER_NOTIF,</div><div class='add'>+			     stats_oper_notif, RX_HANDLER_ASYNC)</div><div class='add'>+	RX_HANDLER_NO_OBJECT(STATISTICS_GROUP, STATISTICS_OPER_PART1_NOTIF,</div><div class='add'>+			     stats_oper_part1_notif, RX_HANDLER_ASYNC)</div><div class='add'>+</div><div class='add'>+	RX_HANDLER_NO_OBJECT(LEGACY_GROUP, MFUART_LOAD_NOTIFICATION,</div><div class='add'>+			     mfuart_notif, RX_HANDLER_SYNC)</div><div class='add'>+</div><div class='add'>+	RX_HANDLER_NO_OBJECT(PHY_OPS_GROUP, DTS_MEASUREMENT_NOTIF_WIDE,</div><div class='add'>+			     temp_notif, RX_HANDLER_ASYNC)</div><div class='add'>+	RX_HANDLER_OF_LINK(MAC_CONF_GROUP, SESSION_PROTECTION_NOTIF,</div><div class='add'>+			   session_prot_notif)</div><div class='add'>+	RX_HANDLER_OF_LINK(MAC_CONF_GROUP, MISSED_BEACONS_NOTIF,</div><div class='add'>+			   missed_beacon_notif)</div><div class='add'>+	RX_HANDLER_OF_STA(DATA_PATH_GROUP, TLC_MNG_UPDATE_NOTIF, tlc_notif)</div><div class='add'>+	RX_HANDLER_OF_LINK(MAC_CONF_GROUP, CHANNEL_SWITCH_START_NOTIF,</div><div class='add'>+			   channel_switch_start_notif)</div><div class='add'>+	RX_HANDLER_OF_LINK(MAC_CONF_GROUP, CHANNEL_SWITCH_ERROR_NOTIF,</div><div class='add'>+			   channel_switch_error_notif)</div><div class='add'>+	RX_HANDLER_OF_ROC(MAC_CONF_GROUP, ROC_NOTIF, roc_notif)</div><div class='add'>+	RX_HANDLER_NO_OBJECT(DATA_PATH_GROUP, MU_GROUP_MGMT_NOTIF,</div><div class='add'>+			     mu_mimo_grp_notif, RX_HANDLER_SYNC)</div><div class='add'>+	RX_HANDLER_OF_VIF(MAC_CONF_GROUP, PROBE_RESPONSE_DATA_NOTIF,</div><div class='add'>+			  probe_resp_data_notif)</div><div class='add'>+	RX_HANDLER_NO_OBJECT(PHY_OPS_GROUP, CT_KILL_NOTIFICATION,</div><div class='add'>+			     ct_kill_notif, RX_HANDLER_ASYNC)</div><div class='add'>+	RX_HANDLER_OF_LINK(DATA_PATH_GROUP, MONITOR_NOTIF,</div><div class='add'>+			   datapath_monitor_notif)</div><div class='add'>+	RX_HANDLER_NO_OBJECT(LEGACY_GROUP, MCC_CHUB_UPDATE_CMD, update_mcc,</div><div class='add'>+			     RX_HANDLER_ASYNC)</div><div class='add'>+	RX_HANDLER_NO_OBJECT(BT_COEX_GROUP, PROFILE_NOTIF,</div><div class='add'>+			     bt_coex_notif, RX_HANDLER_ASYNC)</div><div class='add'>+	RX_HANDLER_NO_OBJECT(LEGACY_GROUP, BEACON_NOTIFICATION,</div><div class='add'>+			     beacon_notification, RX_HANDLER_ASYNC)</div><div class='add'>+	RX_HANDLER_NO_OBJECT(DATA_PATH_GROUP, ESR_MODE_NOTIF,</div><div class='add'>+			     emlsr_mode_notif, RX_HANDLER_ASYNC)</div><div class='add'>+	RX_HANDLER_NO_OBJECT(MAC_CONF_GROUP, EMLSR_TRANS_FAIL_NOTIF,</div><div class='add'>+			     emlsr_trans_fail_notif, RX_HANDLER_ASYNC)</div><div class='add'>+	RX_HANDLER_OF_VIF(LEGACY_GROUP, PSM_UAPSD_AP_MISBEHAVING_NOTIFICATION,</div><div class='add'>+			  uapsd_misbehaving_ap_notif)</div><div class='add'>+	RX_HANDLER_NO_OBJECT(LEGACY_GROUP,</div><div class='add'>+			     WNM_80211V_TIMING_MEASUREMENT_NOTIFICATION,</div><div class='add'>+			     time_msmt_notif, RX_HANDLER_SYNC)</div><div class='add'>+	RX_HANDLER_NO_OBJECT(LEGACY_GROUP,</div><div class='add'>+			     WNM_80211V_TIMING_MEASUREMENT_CONFIRM_NOTIFICATION,</div><div class='add'>+			     time_sync_confirm_notif, RX_HANDLER_ASYNC)</div><div class='add'>+	RX_HANDLER_OF_LINK(DATA_PATH_GROUP, BEACON_FILTER_IN_NOTIF,</div><div class='add'>+			   beacon_filter_notif)</div><div class='add'>+	RX_HANDLER_OF_FTM_REQ(LOCATION_GROUP, TOF_RANGE_RESPONSE_NOTIF,</div><div class='add'>+			      ftm_resp_notif)</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_mld_rx_handlers);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IWLWIFI_KUNIT_TESTS)</div><div class='add'>+const unsigned int iwl_mld_rx_handlers_num = ARRAY_SIZE(iwl_mld_rx_handlers);</div><div class='add'>+EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_mld_rx_handlers_num);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+iwl_mld_notif_is_valid(struct iwl_mld *mld, struct iwl_rx_packet *pkt,</div><div class='add'>+		       const struct iwl_rx_handler *handler)</div><div class='add'>+{</div><div class='add'>+	unsigned int size = iwl_rx_packet_payload_len(pkt);</div><div class='add'>+	size_t notif_ver;</div><div class='add'>+</div><div class='add'>+	/* If n_sizes == 0, it indicates that a validation function may be used</div><div class='add'>+	 * or that no validation is required.</div><div class='add'>+	 */</div><div class='add'>+	if (!handler-&gt;n_sizes) {</div><div class='add'>+		if (handler-&gt;val_fn)</div><div class='add'>+			return handler-&gt;val_fn(mld, pkt);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	notif_ver = iwl_fw_lookup_notif_ver(mld-&gt;fw,</div><div class='add'>+					    iwl_cmd_groupid(handler-&gt;cmd_id),</div><div class='add'>+					    iwl_cmd_opcode(handler-&gt;cmd_id),</div><div class='add'>+					    IWL_FW_CMD_VER_UNKNOWN);</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; handler-&gt;n_sizes; i++) {</div><div class='add'>+		if (handler-&gt;sizes[i].ver != notif_ver)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (IWL_FW_CHECK(mld, size &lt; handler-&gt;sizes[i].size,</div><div class='add'>+				 "unexpected notification 0x%04x size %d, need %d\n",</div><div class='add'>+				 handler-&gt;cmd_id, size, handler-&gt;sizes[i].size))</div><div class='add'>+			return false;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_FW_CHECK_FAILED(mld,</div><div class='add'>+			    "notif 0x%04x ver %zu missing expected size, use version %u size\n",</div><div class='add'>+			    handler-&gt;cmd_id, notif_ver,</div><div class='add'>+			    handler-&gt;sizes[handler-&gt;n_sizes - 1].ver);</div><div class='add'>+</div><div class='add'>+	return size &lt; handler-&gt;sizes[handler-&gt;n_sizes - 1].size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct iwl_async_handler_entry {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct iwl_rx_cmd_buffer rxb;</div><div class='add'>+	const struct iwl_rx_handler *rx_h;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_log_async_handler_op(struct iwl_mld *mld, const char *op,</div><div class='add'>+			     struct iwl_rx_cmd_buffer *rxb)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_HC(mld,</div><div class='add'>+		     "%s async handler for notif %s (%.2x.%2x, seq 0x%x)\n",</div><div class='add'>+		     op, iwl_get_cmd_string(mld-&gt;trans,</div><div class='add'>+		     WIDE_ID(pkt-&gt;hdr.group_id, pkt-&gt;hdr.cmd)),</div><div class='add'>+		     pkt-&gt;hdr.group_id, pkt-&gt;hdr.cmd,</div><div class='add'>+		     le16_to_cpu(pkt-&gt;hdr.sequence));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_rx_notif(struct iwl_mld *mld,</div><div class='add'>+			     struct iwl_rx_cmd_buffer *rxb,</div><div class='add'>+			     struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(iwl_mld_rx_handlers); i++) {</div><div class='add'>+		const struct iwl_rx_handler *rx_h = &amp;iwl_mld_rx_handlers[i];</div><div class='add'>+		struct iwl_async_handler_entry *entry;</div><div class='add'>+</div><div class='add'>+		if (rx_h-&gt;cmd_id != WIDE_ID(pkt-&gt;hdr.group_id, pkt-&gt;hdr.cmd))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!iwl_mld_notif_is_valid(mld, pkt, rx_h))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		if (rx_h-&gt;context == RX_HANDLER_SYNC) {</div><div class='add'>+			rx_h-&gt;fn(mld, pkt);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		entry = kzalloc(sizeof(*entry), GFP_ATOMIC);</div><div class='add'>+		/* we can't do much... */</div><div class='add'>+		if (!entry)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		/* Set the async handler entry */</div><div class='add'>+		entry-&gt;rxb._page = rxb_steal_page(rxb);</div><div class='add'>+		entry-&gt;rxb._offset = rxb-&gt;_offset;</div><div class='add'>+		entry-&gt;rxb._rx_page_order = rxb-&gt;_rx_page_order;</div><div class='add'>+</div><div class='add'>+		entry-&gt;rx_h = rx_h;</div><div class='add'>+</div><div class='add'>+		/* Add it to the list and queue the work */</div><div class='add'>+		spin_lock(&amp;mld-&gt;async_handlers_lock);</div><div class='add'>+		list_add_tail(&amp;entry-&gt;list, &amp;mld-&gt;async_handlers_list);</div><div class='add'>+		spin_unlock(&amp;mld-&gt;async_handlers_lock);</div><div class='add'>+</div><div class='add'>+		wiphy_work_queue(mld-&gt;hw-&gt;wiphy,</div><div class='add'>+				 &amp;mld-&gt;async_handlers_wk);</div><div class='add'>+</div><div class='add'>+		iwl_mld_log_async_handler_op(mld, "Queued", rxb);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_notification_wait_notify(&amp;mld-&gt;notif_wait, pkt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_rx(struct iwl_op_mode *op_mode, struct napi_struct *napi,</div><div class='add'>+		struct iwl_rx_cmd_buffer *rxb)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='add'>+	struct iwl_mld *mld = IWL_OP_MODE_GET_MLD(op_mode);</div><div class='add'>+	u16 cmd_id = WIDE_ID(pkt-&gt;hdr.group_id, pkt-&gt;hdr.cmd);</div><div class='add'>+</div><div class='add'>+	if (likely(cmd_id == WIDE_ID(LEGACY_GROUP, REPLY_RX_MPDU_CMD)))</div><div class='add'>+		iwl_mld_rx_mpdu(mld, napi, rxb, 0);</div><div class='add'>+	else if (cmd_id == WIDE_ID(LEGACY_GROUP, FRAME_RELEASE))</div><div class='add'>+		iwl_mld_handle_frame_release_notif(mld, napi, pkt, 0);</div><div class='add'>+	else if (cmd_id == WIDE_ID(LEGACY_GROUP, BAR_FRAME_RELEASE))</div><div class='add'>+		iwl_mld_handle_bar_frame_release_notif(mld, napi, pkt, 0);</div><div class='add'>+	else if (unlikely(cmd_id == WIDE_ID(DATA_PATH_GROUP,</div><div class='add'>+					    RX_QUEUES_NOTIFICATION)))</div><div class='add'>+		iwl_mld_handle_rx_queues_sync_notif(mld, napi, pkt, 0);</div><div class='add'>+	else if (cmd_id == WIDE_ID(DATA_PATH_GROUP, PHY_AIR_SNIFFER_NOTIF))</div><div class='add'>+		iwl_mld_handle_phy_air_sniffer_notif(mld, napi, pkt);</div><div class='add'>+	else</div><div class='add'>+		iwl_mld_rx_notif(mld, rxb, pkt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_rx_rss(struct iwl_op_mode *op_mode, struct napi_struct *napi,</div><div class='add'>+		    struct iwl_rx_cmd_buffer *rxb, unsigned int queue)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='add'>+	struct iwl_mld *mld = IWL_OP_MODE_GET_MLD(op_mode);</div><div class='add'>+	u16 cmd_id = WIDE_ID(pkt-&gt;hdr.group_id, pkt-&gt;hdr.cmd);</div><div class='add'>+</div><div class='add'>+	if (unlikely(queue &gt;= mld-&gt;trans-&gt;info.num_rxqs))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (likely(cmd_id == WIDE_ID(LEGACY_GROUP, REPLY_RX_MPDU_CMD)))</div><div class='add'>+		iwl_mld_rx_mpdu(mld, napi, rxb, queue);</div><div class='add'>+	else if (unlikely(cmd_id == WIDE_ID(DATA_PATH_GROUP,</div><div class='add'>+					    RX_QUEUES_NOTIFICATION)))</div><div class='add'>+		iwl_mld_handle_rx_queues_sync_notif(mld, napi, pkt, queue);</div><div class='add'>+	else if (unlikely(cmd_id == WIDE_ID(LEGACY_GROUP, FRAME_RELEASE)))</div><div class='add'>+		iwl_mld_handle_frame_release_notif(mld, napi, pkt, queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_delete_handlers(struct iwl_mld *mld, const u16 *cmds, int n_cmds)</div><div class='add'>+{</div><div class='add'>+	struct iwl_async_handler_entry *entry, *tmp;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;mld-&gt;async_handlers_lock);</div><div class='add'>+	list_for_each_entry_safe(entry, tmp, &amp;mld-&gt;async_handlers_list, list) {</div><div class='add'>+		bool match = false;</div><div class='add'>+</div><div class='add'>+		for (int i = 0; i &lt; n_cmds; i++) {</div><div class='add'>+			if (entry-&gt;rx_h-&gt;cmd_id == cmds[i]) {</div><div class='add'>+				match = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!match)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		iwl_mld_log_async_handler_op(mld, "Delete", &amp;entry-&gt;rxb);</div><div class='add'>+		iwl_free_rxb(&amp;entry-&gt;rxb);</div><div class='add'>+		list_del(&amp;entry-&gt;list);</div><div class='add'>+		kfree(entry);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;mld-&gt;async_handlers_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_async_handlers_wk(struct wiphy *wiphy, struct wiphy_work *wk)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld =</div><div class='add'>+		container_of(wk, struct iwl_mld, async_handlers_wk);</div><div class='add'>+	struct iwl_async_handler_entry *entry, *tmp;</div><div class='add'>+	LIST_HEAD(local_list);</div><div class='add'>+</div><div class='add'>+	/* Sync with Rx path with a lock. Remove all the entries from this</div><div class='add'>+	 * list, add them to a local one (lock free), and then handle them.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_bh(&amp;mld-&gt;async_handlers_lock);</div><div class='add'>+	list_splice_init(&amp;mld-&gt;async_handlers_list, &amp;local_list);</div><div class='add'>+	spin_unlock_bh(&amp;mld-&gt;async_handlers_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(entry, tmp, &amp;local_list, list) {</div><div class='add'>+		iwl_mld_log_async_handler_op(mld, "Handle", &amp;entry-&gt;rxb);</div><div class='add'>+		entry-&gt;rx_h-&gt;fn(mld, rxb_addr(&amp;entry-&gt;rxb));</div><div class='add'>+		iwl_free_rxb(&amp;entry-&gt;rxb);</div><div class='add'>+		list_del(&amp;entry-&gt;list);</div><div class='add'>+		kfree(entry);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_cancel_async_notifications(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct iwl_async_handler_entry *entry, *tmp;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	wiphy_work_cancel(mld-&gt;wiphy, &amp;mld-&gt;async_handlers_wk);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;mld-&gt;async_handlers_lock);</div><div class='add'>+	list_for_each_entry_safe(entry, tmp, &amp;mld-&gt;async_handlers_list, list) {</div><div class='add'>+		iwl_mld_log_async_handler_op(mld, "Purged", &amp;entry-&gt;rxb);</div><div class='add'>+		iwl_free_rxb(&amp;entry-&gt;rxb);</div><div class='add'>+		list_del(&amp;entry-&gt;list);</div><div class='add'>+		kfree(entry);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;mld-&gt;async_handlers_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_cancel_notifications_of_object(struct iwl_mld *mld,</div><div class='add'>+					    enum iwl_mld_object_type obj_type,</div><div class='add'>+					    u32 obj_id)</div><div class='add'>+{</div><div class='add'>+	struct iwl_async_handler_entry *entry, *tmp;</div><div class='add'>+	LIST_HEAD(cancel_list);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(obj_type == IWL_MLD_OBJECT_TYPE_NONE))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Sync with RX path and remove matching entries from the async list */</div><div class='add'>+	spin_lock_bh(&amp;mld-&gt;async_handlers_lock);</div><div class='add'>+	list_for_each_entry_safe(entry, tmp, &amp;mld-&gt;async_handlers_list, list) {</div><div class='add'>+		const struct iwl_rx_handler *rx_h = entry-&gt;rx_h;</div><div class='add'>+</div><div class='add'>+		if (rx_h-&gt;obj_type != obj_type || WARN_ON(!rx_h-&gt;cancel))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (rx_h-&gt;cancel(mld, rxb_addr(&amp;entry-&gt;rxb), obj_id)) {</div><div class='add'>+			iwl_mld_log_async_handler_op(mld, "Cancel", &amp;entry-&gt;rxb);</div><div class='add'>+			list_del(&amp;entry-&gt;list);</div><div class='add'>+			list_add_tail(&amp;entry-&gt;list, &amp;cancel_list);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;mld-&gt;async_handlers_lock);</div><div class='add'>+</div><div class='add'>+	/* Free the matching entries outside of the spinlock */</div><div class='add'>+	list_for_each_entry_safe(entry, tmp, &amp;cancel_list, list) {</div><div class='add'>+		iwl_free_rxb(&amp;entry-&gt;rxb);</div><div class='add'>+		list_del(&amp;entry-&gt;list);</div><div class='add'>+		kfree(entry);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/notif.h b/drivers/net/wireless/intel/iwlwifi/mld/notif.h<br/>new file mode 100644<br/>index 000000000000..adcdd9dec192<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/notif.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/notif.h</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_notif_h__</div><div class='add'>+#define __iwl_mld_notif_h__</div><div class='add'>+</div><div class='add'>+struct iwl_mld;</div><div class='add'>+</div><div class='add'>+void iwl_mld_rx(struct iwl_op_mode *op_mode, struct napi_struct *napi,</div><div class='add'>+		struct iwl_rx_cmd_buffer *rxb);</div><div class='add'>+</div><div class='add'>+void iwl_mld_rx_rss(struct iwl_op_mode *op_mode, struct napi_struct *napi,</div><div class='add'>+		    struct iwl_rx_cmd_buffer *rxb, unsigned int queue);</div><div class='add'>+</div><div class='add'>+void iwl_mld_async_handlers_wk(struct wiphy *wiphy, struct wiphy_work *wk);</div><div class='add'>+</div><div class='add'>+void iwl_mld_cancel_async_notifications(struct iwl_mld *mld);</div><div class='add'>+</div><div class='add'>+enum iwl_mld_object_type {</div><div class='add'>+	IWL_MLD_OBJECT_TYPE_NONE,</div><div class='add'>+	IWL_MLD_OBJECT_TYPE_LINK,</div><div class='add'>+	IWL_MLD_OBJECT_TYPE_STA,</div><div class='add'>+	IWL_MLD_OBJECT_TYPE_VIF,</div><div class='add'>+	IWL_MLD_OBJECT_TYPE_ROC,</div><div class='add'>+	IWL_MLD_OBJECT_TYPE_SCAN,</div><div class='add'>+	IWL_MLD_OBJECT_TYPE_FTM_REQ,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void iwl_mld_cancel_notifications_of_object(struct iwl_mld *mld,</div><div class='add'>+					    enum iwl_mld_object_type obj_type,</div><div class='add'>+					    u32 obj_id);</div><div class='add'>+void iwl_mld_delete_handlers(struct iwl_mld *mld, const u16 *cmds, int n_cmds);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_notif_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/phy.c b/drivers/net/wireless/intel/iwlwifi/mld/phy.c<br/>new file mode 100644<br/>index 000000000000..1d93fb9e4dbf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/phy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/phy.c</a></div><div class='hunk'>@@ -0,0 +1,198 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "phy.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+#include "fw/api/phy-ctxt.h"</div><div class='add'>+</div><div class='add'>+int iwl_mld_allocate_fw_phy_id(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	int id;</div><div class='add'>+	unsigned long used = mld-&gt;used_phy_ids;</div><div class='add'>+</div><div class='add'>+	for_each_clear_bit(id, &amp;used, NUM_PHY_CTX) {</div><div class='add'>+		mld-&gt;used_phy_ids |= BIT(id);</div><div class='add'>+		return id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOSPC;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_mld_allocate_fw_phy_id);</div><div class='add'>+</div><div class='add'>+struct iwl_mld_chanctx_usage_data {</div><div class='add'>+	struct iwl_mld *mld;</div><div class='add'>+	struct ieee80211_chanctx_conf *ctx;</div><div class='add'>+	bool use_def;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_chanctx_fils_enabled(struct ieee80211_vif *vif,</div><div class='add'>+					 struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_AP)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return cfg80211_channel_is_psc(ctx-&gt;def.chan) ||</div><div class='add'>+		(ctx-&gt;def.chan-&gt;band == NL80211_BAND_6GHZ &amp;&amp;</div><div class='add'>+		 ctx-&gt;def.width &gt;= NL80211_CHAN_WIDTH_80);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_chanctx_usage_iter(void *_data, u8 *mac,</div><div class='add'>+				       struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_chanctx_usage_data *data = _data;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	int link_id;</div><div class='add'>+</div><div class='add'>+	for_each_vif_active_link(vif, link_conf, link_id) {</div><div class='add'>+		if (rcu_access_pointer(link_conf-&gt;chanctx_conf) != data-&gt;ctx)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp; link_conf-&gt;ftm_responder)</div><div class='add'>+			data-&gt;use_def = true;</div><div class='add'>+</div><div class='add'>+		if (iwl_mld_chanctx_fils_enabled(vif, data-&gt;ctx))</div><div class='add'>+			data-&gt;use_def = true;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct cfg80211_chan_def *</div><div class='add'>+iwl_mld_get_chandef_from_chanctx(struct iwl_mld *mld,</div><div class='add'>+				 struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_chanctx_usage_data data = {</div><div class='add'>+		.mld = mld,</div><div class='add'>+		.ctx = ctx,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_mtx(mld-&gt;hw,</div><div class='add'>+						IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						iwl_mld_chanctx_usage_iter,</div><div class='add'>+						&amp;data);</div><div class='add'>+</div><div class='add'>+	return data.use_def ? &amp;ctx-&gt;def : &amp;ctx-&gt;min_def;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8</div><div class='add'>+iwl_mld_nl80211_width_to_fw(enum nl80211_chan_width width)</div><div class='add'>+{</div><div class='add'>+	switch (width) {</div><div class='add'>+	case NL80211_CHAN_WIDTH_20_NOHT:</div><div class='add'>+	case NL80211_CHAN_WIDTH_20:</div><div class='add'>+		return IWL_PHY_CHANNEL_MODE20;</div><div class='add'>+	case NL80211_CHAN_WIDTH_40:</div><div class='add'>+		return IWL_PHY_CHANNEL_MODE40;</div><div class='add'>+	case NL80211_CHAN_WIDTH_80:</div><div class='add'>+		return IWL_PHY_CHANNEL_MODE80;</div><div class='add'>+	case NL80211_CHAN_WIDTH_160:</div><div class='add'>+		return IWL_PHY_CHANNEL_MODE160;</div><div class='add'>+	case NL80211_CHAN_WIDTH_320:</div><div class='add'>+		return IWL_PHY_CHANNEL_MODE320;</div><div class='add'>+	default:</div><div class='add'>+		WARN(1, "Invalid channel width=%u", width);</div><div class='add'>+		return IWL_PHY_CHANNEL_MODE20;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Maps the driver specific control channel position (relative to the center</div><div class='add'>+ * freq) definitions to the fw values</div><div class='add'>+ */</div><div class='add'>+u8 iwl_mld_get_fw_ctrl_pos(const struct cfg80211_chan_def *chandef)</div><div class='add'>+{</div><div class='add'>+	int offs = chandef-&gt;chan-&gt;center_freq - chandef-&gt;center_freq1;</div><div class='add'>+	int abs_offs = abs(offs);</div><div class='add'>+	u8 ret;</div><div class='add'>+</div><div class='add'>+	if (offs == 0) {</div><div class='add'>+		/* The FW is expected to check the control channel position only</div><div class='add'>+		 * when in HT/VHT and the channel width is not 20MHz. Return</div><div class='add'>+		 * this value as the default one.</div><div class='add'>+		 */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* this results in a value 0-7, i.e. fitting into 0b0111 */</div><div class='add'>+	ret = (abs_offs - 10) / 20;</div><div class='add'>+	/* But we need the value to be in 0b1011 because 0b0100 is</div><div class='add'>+	 * IWL_PHY_CTRL_POS_ABOVE, so shift bit 2 up to land in</div><div class='add'>+	 * IWL_PHY_CTRL_POS_OFFS_EXT (0b1000)</div><div class='add'>+	 */</div><div class='add'>+	ret = (ret &amp; IWL_PHY_CTRL_POS_OFFS_MSK) |</div><div class='add'>+	      ((ret &amp; BIT(2)) &lt;&lt; 1);</div><div class='add'>+	/* and add the above bit */</div><div class='add'>+	ret |= (offs &gt; 0) * IWL_PHY_CTRL_POS_ABOVE;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_phy_fw_action(struct iwl_mld *mld,</div><div class='add'>+			  struct ieee80211_chanctx_conf *ctx, u32 action)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_phy *phy = iwl_mld_phy_from_mac80211(ctx);</div><div class='add'>+	struct cfg80211_chan_def *chandef = &amp;phy-&gt;chandef;</div><div class='add'>+	struct iwl_phy_context_cmd cmd = {</div><div class='add'>+		.id_and_color = cpu_to_le32(phy-&gt;fw_id),</div><div class='add'>+		.action = cpu_to_le32(action),</div><div class='add'>+		.puncture_mask = cpu_to_le16(chandef-&gt;punctured),</div><div class='add'>+		/* Channel info */</div><div class='add'>+		.ci.channel = cpu_to_le32(chandef-&gt;chan-&gt;hw_value),</div><div class='add'>+		.ci.band = iwl_mld_nl80211_band_to_fw(chandef-&gt;chan-&gt;band),</div><div class='add'>+		.ci.width = iwl_mld_nl80211_width_to_fw(chandef-&gt;width),</div><div class='add'>+		.ci.ctrl_pos = iwl_mld_get_fw_ctrl_pos(chandef),</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;ap.chan) {</div><div class='add'>+		cmd.sbb_bandwidth =</div><div class='add'>+			iwl_mld_nl80211_width_to_fw(ctx-&gt;ap.width);</div><div class='add'>+		cmd.sbb_ctrl_channel_loc = iwl_mld_get_fw_ctrl_pos(&amp;ctx-&gt;ap);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd_pdu(mld, PHY_CONTEXT_CMD, &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mld, "Failed to send PHY_CONTEXT_CMD ret = %d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 iwl_mld_get_phy_config(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	u32 phy_config = ~(FW_PHY_CFG_TX_CHAIN |</div><div class='add'>+			   FW_PHY_CFG_RX_CHAIN);</div><div class='add'>+	u32 valid_rx_ant = iwl_mld_get_valid_rx_ant(mld);</div><div class='add'>+	u32 valid_tx_ant = iwl_mld_get_valid_tx_ant(mld);</div><div class='add'>+</div><div class='add'>+	phy_config |= valid_tx_ant &lt;&lt; FW_PHY_CFG_TX_CHAIN_POS |</div><div class='add'>+		      valid_rx_ant &lt;&lt; FW_PHY_CFG_RX_CHAIN_POS;</div><div class='add'>+</div><div class='add'>+	return mld-&gt;fw-&gt;phy_config &amp; phy_config;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_send_phy_cfg_cmd(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_tlv_calib_ctrl *default_calib =</div><div class='add'>+		&amp;mld-&gt;fw-&gt;default_calib[IWL_UCODE_REGULAR];</div><div class='add'>+	struct iwl_phy_cfg_cmd_v3 cmd = {</div><div class='add'>+		.phy_cfg = cpu_to_le32(iwl_mld_get_phy_config(mld)),</div><div class='add'>+		.calib_control.event_trigger = default_calib-&gt;event_trigger,</div><div class='add'>+		.calib_control.flow_trigger = default_calib-&gt;flow_trigger,</div><div class='add'>+		.phy_specific_cfg = mld-&gt;fwrt.phy_filters,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(mld, "Sending Phy CFG command: 0x%x\n", cmd.phy_cfg);</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_cmd_pdu(mld, PHY_CONFIGURATION_CMD, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_update_phy_chandef(struct iwl_mld *mld,</div><div class='add'>+				struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_phy *phy = iwl_mld_phy_from_mac80211(ctx);</div><div class='add'>+	struct cfg80211_chan_def *chandef =</div><div class='add'>+		iwl_mld_get_chandef_from_chanctx(mld, ctx);</div><div class='add'>+</div><div class='add'>+	phy-&gt;chandef = *chandef;</div><div class='add'>+	iwl_mld_phy_fw_action(mld, ctx, FW_CTXT_ACTION_MODIFY);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/phy.h b/drivers/net/wireless/intel/iwlwifi/mld/phy.h<br/>new file mode 100644<br/>index 000000000000..0deaf179f07c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/phy.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/phy.h</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_phy_h__</div><div class='add'>+#define __iwl_mld_phy_h__</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_phy - PHY configuration parameters</div><div class='add'>+ *</div><div class='add'>+ * @fw_id: fw id of the phy.</div><div class='add'>+ * @chandef: the last chandef that mac80211 configured the driver</div><div class='add'>+ *	with. Used to detect a no-op when the chanctx changes.</div><div class='add'>+ * @channel_load_by_us: channel load on this channel caused by</div><div class='add'>+ *	the NIC itself, as indicated by firmware</div><div class='add'>+ * @avg_channel_load_not_by_us: averaged channel load on this channel caused by</div><div class='add'>+ *	others. This value is invalid when in EMLSR (due to FW limitations)</div><div class='add'>+ * @mld: pointer to the MLD context</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_phy {</div><div class='add'>+	/* Add here fields that need clean up on hw restart */</div><div class='add'>+	struct_group(zeroed_on_hw_restart,</div><div class='add'>+		u8 fw_id;</div><div class='add'>+		struct cfg80211_chan_def chandef;</div><div class='add'>+	);</div><div class='add'>+	/* And here fields that survive a hw restart */</div><div class='add'>+	u32 channel_load_by_us;</div><div class='add'>+	u32 avg_channel_load_not_by_us;</div><div class='add'>+	struct iwl_mld *mld;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct iwl_mld_phy *</div><div class='add'>+iwl_mld_phy_from_mac80211(struct ieee80211_chanctx_conf *channel)</div><div class='add'>+{</div><div class='add'>+	return (void *)channel-&gt;drv_priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Cleanup function for struct iwl_mld_phy, will be called in restart */</div><div class='add'>+static inline void</div><div class='add'>+iwl_mld_cleanup_phy(struct iwl_mld *mld, struct iwl_mld_phy *phy)</div><div class='add'>+{</div><div class='add'>+	CLEANUP_STRUCT(phy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_allocate_fw_phy_id(struct iwl_mld *mld);</div><div class='add'>+int iwl_mld_phy_fw_action(struct iwl_mld *mld,</div><div class='add'>+			  struct ieee80211_chanctx_conf *ctx, u32 action);</div><div class='add'>+struct cfg80211_chan_def *</div><div class='add'>+iwl_mld_get_chandef_from_chanctx(struct iwl_mld *mld,</div><div class='add'>+				 struct ieee80211_chanctx_conf *ctx);</div><div class='add'>+u8 iwl_mld_get_fw_ctrl_pos(const struct cfg80211_chan_def *chandef);</div><div class='add'>+</div><div class='add'>+int iwl_mld_send_phy_cfg_cmd(struct iwl_mld *mld);</div><div class='add'>+</div><div class='add'>+void iwl_mld_update_phy_chandef(struct iwl_mld *mld,</div><div class='add'>+				struct ieee80211_chanctx_conf *ctx);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_phy_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/power.c b/drivers/net/wireless/intel/iwlwifi/mld/power.c<br/>new file mode 100644<br/>index 000000000000..f664b277adf7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/power.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/power.c</a></div><div class='hunk'>@@ -0,0 +1,391 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+#include "power.h"</div><div class='add'>+#include "iface.h"</div><div class='add'>+#include "link.h"</div><div class='add'>+#include "constants.h"</div><div class='add'>+</div><div class='add'>+static void iwl_mld_vif_ps_iterator(void *data, u8 *mac,</div><div class='add'>+				    struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	bool *ps_enable = (bool *)data;</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	*ps_enable &amp;= !mld_vif-&gt;ps_disabled;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_update_device_power(struct iwl_mld *mld, bool d3)</div><div class='add'>+{</div><div class='add'>+	struct iwl_device_power_cmd cmd = {};</div><div class='add'>+	bool enable_ps = false;</div><div class='add'>+</div><div class='add'>+	if (iwlmld_mod_params.power_scheme != IWL_POWER_SCHEME_CAM) {</div><div class='add'>+		enable_ps = true;</div><div class='add'>+</div><div class='add'>+		/* Disable power save if any STA interface has</div><div class='add'>+		 * power save turned off</div><div class='add'>+		 */</div><div class='add'>+		ieee80211_iterate_active_interfaces_mtx(mld-&gt;hw,</div><div class='add'>+							IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+							iwl_mld_vif_ps_iterator,</div><div class='add'>+							&amp;enable_ps);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enable_ps)</div><div class='add'>+		cmd.flags |=</div><div class='add'>+			cpu_to_le16(DEVICE_POWER_FLAGS_POWER_SAVE_ENA_MSK);</div><div class='add'>+</div><div class='add'>+	if (d3)</div><div class='add'>+		cmd.flags |=</div><div class='add'>+			cpu_to_le16(DEVICE_POWER_FLAGS_NO_SLEEP_TILL_D3_MSK);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_POWER(mld,</div><div class='add'>+			"Sending device power command with flags = 0x%X\n",</div><div class='add'>+			cmd.flags);</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_cmd_pdu(mld, POWER_TABLE_CMD, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_enable_beacon_filter(struct iwl_mld *mld,</div><div class='add'>+				 const struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				 bool d3)</div><div class='add'>+{</div><div class='add'>+	struct iwl_beacon_filter_cmd cmd = {</div><div class='add'>+		IWL_BF_CMD_CONFIG_DEFAULTS,</div><div class='add'>+		.bf_enable_beacon_filter = cpu_to_le32(1),</div><div class='add'>+		.ba_enable_beacon_abort = cpu_to_le32(1),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_type_p2p(link_conf-&gt;vif) != NL80211_IFTYPE_STATION)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='add'>+	if (iwl_mld_vif_from_mac80211(link_conf-&gt;vif)-&gt;disable_bf)</div><div class='add'>+		return 0;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (link_conf-&gt;cqm_rssi_thold) {</div><div class='add'>+		cmd.bf_energy_delta =</div><div class='add'>+			cpu_to_le32(link_conf-&gt;cqm_rssi_hyst);</div><div class='add'>+		/* fw uses an absolute value for this */</div><div class='add'>+		cmd.bf_roaming_state =</div><div class='add'>+			cpu_to_le32(-link_conf-&gt;cqm_rssi_thold);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (d3)</div><div class='add'>+		cmd.ba_escape_timer = cpu_to_le32(IWL_BA_ESCAPE_TIMER_D3);</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_cmd_pdu(mld, REPLY_BEACON_FILTERING_CMD,</div><div class='add'>+				    &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_disable_beacon_filter(struct iwl_mld *mld,</div><div class='add'>+				  struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_beacon_filter_cmd cmd = {};</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_type_p2p(vif) != NL80211_IFTYPE_STATION)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_cmd_pdu(mld, REPLY_BEACON_FILTERING_CMD,</div><div class='add'>+				    &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_power_is_radar(struct iwl_mld *mld,</div><div class='add'>+				   const struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_chanctx_conf *chanctx_conf;</div><div class='add'>+</div><div class='add'>+	chanctx_conf = wiphy_dereference(mld-&gt;wiphy, link_conf-&gt;chanctx_conf);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!chanctx_conf))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return chanctx_conf-&gt;def.chan-&gt;flags &amp; IEEE80211_CHAN_RADAR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_power_configure_uapsd(struct iwl_mld *mld,</div><div class='add'>+					  struct iwl_mld_link *link,</div><div class='add'>+					  struct iwl_mac_power_cmd *cmd,</div><div class='add'>+					  bool ps_poll)</div><div class='add'>+{</div><div class='add'>+	bool tid_found = false;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;rx_data_timeout_uapsd =</div><div class='add'>+		cpu_to_le32(IWL_MLD_UAPSD_RX_DATA_TIMEOUT);</div><div class='add'>+	cmd-&gt;tx_data_timeout_uapsd =</div><div class='add'>+		cpu_to_le32(IWL_MLD_UAPSD_TX_DATA_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	 /* set advanced pm flag with no uapsd ACs to enable ps-poll */</div><div class='add'>+	if (ps_poll) {</div><div class='add'>+		cmd-&gt;flags |= cpu_to_le16(POWER_FLAGS_ADVANCE_PM_ENA_MSK);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (enum ieee80211_ac_numbers ac = IEEE80211_AC_VO;</div><div class='add'>+	     ac &lt;= IEEE80211_AC_BK;</div><div class='add'>+	     ac++) {</div><div class='add'>+		if (!link-&gt;queue_params[ac].uapsd)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		cmd-&gt;flags |=</div><div class='add'>+			cpu_to_le16(POWER_FLAGS_ADVANCE_PM_ENA_MSK |</div><div class='add'>+				    POWER_FLAGS_UAPSD_MISBEHAVING_ENA_MSK);</div><div class='add'>+</div><div class='add'>+		cmd-&gt;uapsd_ac_flags |= BIT(ac);</div><div class='add'>+</div><div class='add'>+		/* QNDP TID - the highest TID with no admission control */</div><div class='add'>+		if (!tid_found &amp;&amp; !link-&gt;queue_params[ac].acm) {</div><div class='add'>+			tid_found = true;</div><div class='add'>+			switch (ac) {</div><div class='add'>+			case IEEE80211_AC_VO:</div><div class='add'>+				cmd-&gt;qndp_tid = 6;</div><div class='add'>+				break;</div><div class='add'>+			case IEEE80211_AC_VI:</div><div class='add'>+				cmd-&gt;qndp_tid = 5;</div><div class='add'>+				break;</div><div class='add'>+			case IEEE80211_AC_BE:</div><div class='add'>+				cmd-&gt;qndp_tid = 0;</div><div class='add'>+				break;</div><div class='add'>+			case IEEE80211_AC_BK:</div><div class='add'>+				cmd-&gt;qndp_tid = 1;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;uapsd_ac_flags == (BIT(IEEE80211_AC_VO) |</div><div class='add'>+				    BIT(IEEE80211_AC_VI) |</div><div class='add'>+				    BIT(IEEE80211_AC_BE) |</div><div class='add'>+				    BIT(IEEE80211_AC_BK))) {</div><div class='add'>+		cmd-&gt;flags |= cpu_to_le16(POWER_FLAGS_SNOOZE_ENA_MSK);</div><div class='add'>+		cmd-&gt;snooze_interval = cpu_to_le16(IWL_MLD_PS_SNOOZE_INTERVAL);</div><div class='add'>+		cmd-&gt;snooze_window = cpu_to_le16(IWL_MLD_PS_SNOOZE_WINDOW);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd-&gt;uapsd_max_sp = mld-&gt;hw-&gt;uapsd_max_sp_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_power_config_skip_dtim(struct iwl_mld *mld,</div><div class='add'>+			       const struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			       struct iwl_mac_power_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	unsigned int dtimper_tu;</div><div class='add'>+	unsigned int dtimper;</div><div class='add'>+	unsigned int skip;</div><div class='add'>+</div><div class='add'>+	dtimper = link_conf-&gt;dtim_period ?: 1;</div><div class='add'>+	dtimper_tu = dtimper * link_conf-&gt;beacon_int;</div><div class='add'>+</div><div class='add'>+	if (dtimper &gt;= 10 || iwl_mld_power_is_radar(mld, link_conf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!dtimper_tu))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* configure skip over dtim up to 900 TU DTIM interval */</div><div class='add'>+	skip = max_t(int, 1, 900 / dtimper_tu);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;skip_dtim_periods = skip;</div><div class='add'>+	cmd-&gt;flags |= cpu_to_le16(POWER_FLAGS_SKIP_OVER_DTIM_MSK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define POWER_KEEP_ALIVE_PERIOD_SEC    25</div><div class='add'>+static void iwl_mld_power_build_cmd(struct iwl_mld *mld,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct iwl_mac_power_cmd *cmd,</div><div class='add'>+				    bool d3)</div><div class='add'>+{</div><div class='add'>+	int dtimper, bi;</div><div class='add'>+	int keep_alive;</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct ieee80211_bss_conf *link_conf = &amp;vif-&gt;bss_conf;</div><div class='add'>+	struct iwl_mld_link *link = &amp;mld_vif-&gt;deflink;</div><div class='add'>+	bool ps_poll = false;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;id_and_color = cpu_to_le32(mld_vif-&gt;fw_id);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_is_mld(vif)) {</div><div class='add'>+		int link_id;</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!vif-&gt;active_links))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		/* The firmware consumes one single configuration for the vif</div><div class='add'>+		 * and can't differentiate between links, just pick the lowest</div><div class='add'>+		 * link_id's configuration and use that.</div><div class='add'>+		 */</div><div class='add'>+		link_id = __ffs(vif-&gt;active_links);</div><div class='add'>+		link_conf = link_conf_dereference_check(vif, link_id);</div><div class='add'>+		link = iwl_mld_link_dereference_check(mld_vif, link_id);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!link_conf || !link))</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+	dtimper = link_conf-&gt;dtim_period;</div><div class='add'>+	bi = link_conf-&gt;beacon_int;</div><div class='add'>+</div><div class='add'>+	/* Regardless of power management state the driver must set</div><div class='add'>+	 * keep alive period. FW will use it for sending keep alive NDPs</div><div class='add'>+	 * immediately after association. Check that keep alive period</div><div class='add'>+	 * is at least 3 * DTIM</div><div class='add'>+	 */</div><div class='add'>+	keep_alive = DIV_ROUND_UP(ieee80211_tu_to_usec(3 * dtimper * bi),</div><div class='add'>+				  USEC_PER_SEC);</div><div class='add'>+	keep_alive = max(keep_alive, POWER_KEEP_ALIVE_PERIOD_SEC);</div><div class='add'>+	cmd-&gt;keep_alive_seconds = cpu_to_le16(keep_alive);</div><div class='add'>+</div><div class='add'>+	if (iwlmld_mod_params.power_scheme != IWL_POWER_SCHEME_CAM)</div><div class='add'>+		cmd-&gt;flags |= cpu_to_le16(POWER_FLAGS_POWER_SAVE_ENA_MSK);</div><div class='add'>+</div><div class='add'>+	if (!vif-&gt;cfg.ps || iwl_mld_tdls_sta_count(mld) &gt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;flags |= cpu_to_le16(POWER_FLAGS_POWER_MANAGEMENT_ENA_MSK);</div><div class='add'>+</div><div class='add'>+	if (iwl_fw_lookup_cmd_ver(mld-&gt;fw, MAC_PM_POWER_TABLE, 0) &gt;= 2)</div><div class='add'>+		cmd-&gt;flags |= cpu_to_le16(POWER_FLAGS_ENABLE_SMPS_MSK);</div><div class='add'>+</div><div class='add'>+	/* firmware supports LPRX for beacons at rate 1 Mbps or 6 Mbps only */</div><div class='add'>+	if (link_conf-&gt;beacon_rate &amp;&amp;</div><div class='add'>+	    (link_conf-&gt;beacon_rate-&gt;bitrate == 10 ||</div><div class='add'>+	     link_conf-&gt;beacon_rate-&gt;bitrate == 60)) {</div><div class='add'>+		cmd-&gt;flags |= cpu_to_le16(POWER_FLAGS_LPRX_ENA_MSK);</div><div class='add'>+		cmd-&gt;lprx_rssi_threshold = POWER_LPRX_RSSI_THRESHOLD;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (d3) {</div><div class='add'>+		iwl_mld_power_config_skip_dtim(mld, link_conf, cmd);</div><div class='add'>+		cmd-&gt;rx_data_timeout =</div><div class='add'>+			cpu_to_le32(IWL_MLD_WOWLAN_PS_RX_DATA_TIMEOUT);</div><div class='add'>+		cmd-&gt;tx_data_timeout =</div><div class='add'>+			cpu_to_le32(IWL_MLD_WOWLAN_PS_TX_DATA_TIMEOUT);</div><div class='add'>+	} else if (iwl_mld_vif_low_latency(mld_vif) &amp;&amp; vif-&gt;p2p) {</div><div class='add'>+		cmd-&gt;tx_data_timeout =</div><div class='add'>+			cpu_to_le32(IWL_MLD_SHORT_PS_TX_DATA_TIMEOUT);</div><div class='add'>+		cmd-&gt;rx_data_timeout =</div><div class='add'>+			cpu_to_le32(IWL_MLD_SHORT_PS_RX_DATA_TIMEOUT);</div><div class='add'>+	} else {</div><div class='add'>+		cmd-&gt;rx_data_timeout =</div><div class='add'>+			cpu_to_le32(IWL_MLD_DEFAULT_PS_RX_DATA_TIMEOUT);</div><div class='add'>+		cmd-&gt;tx_data_timeout =</div><div class='add'>+			cpu_to_le32(IWL_MLD_DEFAULT_PS_TX_DATA_TIMEOUT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* uAPSD is only enabled for specific certifications. For those cases,</div><div class='add'>+	 * mac80211 will allow uAPSD. Always call iwl_mld_power_configure_uapsd</div><div class='add'>+	 * which will look at what mac80211 is saying.</div><div class='add'>+	 */</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='add'>+	ps_poll = mld_vif-&gt;use_ps_poll;</div><div class='add'>+#endif</div><div class='add'>+	iwl_mld_power_configure_uapsd(mld, link, cmd, ps_poll);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_update_mac_power(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			     bool d3)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mac_power_cmd cmd = {};</div><div class='add'>+</div><div class='add'>+	iwl_mld_power_build_cmd(mld, vif, &amp;cmd, d3);</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_cmd_pdu(mld, MAC_PM_POWER_TABLE, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_tpe_sta_cmd_data(struct iwl_txpower_constraints_cmd *cmd,</div><div class='add'>+			 const struct ieee80211_bss_conf *link)</div><div class='add'>+{</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	/* NOTE: the 0 here is IEEE80211_TPE_CAT_6GHZ_DEFAULT,</div><div class='add'>+	 * we fully ignore IEEE80211_TPE_CAT_6GHZ_SUBORDINATE</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(cmd-&gt;psd_pwr) !=</div><div class='add'>+		     ARRAY_SIZE(link-&gt;tpe.psd_local[0].power));</div><div class='add'>+</div><div class='add'>+	/* if not valid, mac80211 puts default (max value) */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(cmd-&gt;psd_pwr); i++)</div><div class='add'>+		cmd-&gt;psd_pwr[i] = min(link-&gt;tpe.psd_local[0].power[i],</div><div class='add'>+				      link-&gt;tpe.psd_reg_client[0].power[i]);</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(cmd-&gt;eirp_pwr) !=</div><div class='add'>+		     ARRAY_SIZE(link-&gt;tpe.max_local[0].power));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(cmd-&gt;eirp_pwr); i++)</div><div class='add'>+		cmd-&gt;eirp_pwr[i] = min(link-&gt;tpe.max_local[0].power[i],</div><div class='add'>+				       link-&gt;tpe.max_reg_client[0].power[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+iwl_mld_send_ap_tx_power_constraint_cmd(struct iwl_mld *mld,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					struct ieee80211_bss_conf *link)</div><div class='add'>+{</div><div class='add'>+	struct iwl_txpower_constraints_cmd cmd = {};</div><div class='add'>+	struct iwl_mld_link *mld_link = iwl_mld_link_from_mac80211(link);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!mld_link-&gt;active)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (link-&gt;chanreq.oper.chan-&gt;band != NL80211_BAND_6GHZ)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cmd.link_id = cpu_to_le16(mld_link-&gt;fw_id);</div><div class='add'>+	memset(cmd.psd_pwr, DEFAULT_TPE_TX_POWER, sizeof(cmd.psd_pwr));</div><div class='add'>+	memset(cmd.eirp_pwr, DEFAULT_TPE_TX_POWER, sizeof(cmd.eirp_pwr));</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP) {</div><div class='add'>+		cmd.ap_type = cpu_to_le16(IWL_6GHZ_AP_TYPE_VLP);</div><div class='add'>+	} else if (link-&gt;power_type == IEEE80211_REG_UNSET_AP) {</div><div class='add'>+		return;</div><div class='add'>+	} else {</div><div class='add'>+		cmd.ap_type = cpu_to_le16(link-&gt;power_type - 1);</div><div class='add'>+		iwl_mld_tpe_sta_cmd_data(&amp;cmd, link);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd_pdu(mld,</div><div class='add'>+				   WIDE_ID(PHY_OPS_GROUP,</div><div class='add'>+					   AP_TX_POWER_CONSTRAINTS_CMD),</div><div class='add'>+				   &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mld,</div><div class='add'>+			"failed to send AP_TX_POWER_CONSTRAINTS_CMD (%d)\n",</div><div class='add'>+			ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_set_tx_power(struct iwl_mld *mld,</div><div class='add'>+			 struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			 s16 tx_power)</div><div class='add'>+{</div><div class='add'>+	u32 cmd_id = REDUCE_TX_POWER_CMD;</div><div class='add'>+	struct iwl_mld_link *mld_link = iwl_mld_link_from_mac80211(link_conf);</div><div class='add'>+	u16 u_tx_power = tx_power == IWL_DEFAULT_MAX_TX_POWER ?</div><div class='add'>+		IWL_DEV_MAX_TX_POWER : 8 * tx_power;</div><div class='add'>+	struct iwl_dev_tx_power_cmd cmd = {</div><div class='add'>+		.common.set_mode = cpu_to_le32(IWL_TX_POWER_MODE_SET_LINK),</div><div class='add'>+		.common.pwr_restriction = cpu_to_le16(u_tx_power),</div><div class='add'>+	};</div><div class='add'>+	int len = sizeof(cmd.common) + sizeof(cmd.v10);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mld_link))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	cmd.common.link_id = cpu_to_le32(mld_link-&gt;fw_id);</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_cmd_pdu(mld, cmd_id, &amp;cmd, len);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/power.h b/drivers/net/wireless/intel/iwlwifi/mld/power.h<br/>new file mode 100644<br/>index 000000000000..05ce27bef106<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/power.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/power.h</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_power_h__</div><div class='add'>+#define __iwl_mld_power_h__</div><div class='add'>+</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+</div><div class='add'>+int iwl_mld_update_device_power(struct iwl_mld *mld, bool d3);</div><div class='add'>+</div><div class='add'>+int iwl_mld_enable_beacon_filter(struct iwl_mld *mld,</div><div class='add'>+				 const struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				 bool d3);</div><div class='add'>+</div><div class='add'>+int iwl_mld_disable_beacon_filter(struct iwl_mld *mld,</div><div class='add'>+				  struct ieee80211_vif *vif);</div><div class='add'>+</div><div class='add'>+int iwl_mld_update_mac_power(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			     bool d3);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+iwl_mld_send_ap_tx_power_constraint_cmd(struct iwl_mld *mld,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					struct ieee80211_bss_conf *link);</div><div class='add'>+</div><div class='add'>+int iwl_mld_set_tx_power(struct iwl_mld *mld,</div><div class='add'>+			 struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			 s16 tx_power);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_power_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/ptp.c b/drivers/net/wireless/intel/iwlwifi/mld/ptp.c<br/>new file mode 100644<br/>index 000000000000..ffeb37a7f830<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/ptp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/ptp.c</a></div><div class='hunk'>@@ -0,0 +1,321 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "iwl-debug.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+#include "ptp.h"</div><div class='add'>+#include &lt;linux/timekeeping.h&gt;</div><div class='add'>+</div><div class='add'>+/* The scaled_ppm parameter is ppm (parts per million) with a 16-bit fractional</div><div class='add'>+ * part, which means that a value of 1 in one of those fields actually means</div><div class='add'>+ * 2^-16 ppm, and 2^16=65536 is 1 ppm.</div><div class='add'>+ */</div><div class='add'>+#define PTP_SCALE_FACTOR	65536000000ULL</div><div class='add'>+</div><div class='add'>+#define IWL_PTP_GP2_WRAP	0x100000000ULL</div><div class='add'>+#define IWL_PTP_WRAP_TIME	(3600 * HZ)</div><div class='add'>+#define IWL_PTP_WRAP_THRESHOLD_USEC	(5000)</div><div class='add'>+</div><div class='add'>+static int iwl_mld_get_systime(struct iwl_mld *mld, u32 *gp2)</div><div class='add'>+{</div><div class='add'>+	*gp2 = iwl_read_prph(mld-&gt;trans, mld-&gt;trans-&gt;mac_cfg-&gt;base-&gt;gp2_reg_addr);</div><div class='add'>+</div><div class='add'>+	if (*gp2 == 0x5a5a5a5a)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_ptp_update_new_read(struct iwl_mld *mld, u32 gp2)</div><div class='add'>+{</div><div class='add'>+	IWL_DEBUG_PTP(mld, "PTP: last_gp2=%u, new gp2 read=%u\n",</div><div class='add'>+		      mld-&gt;ptp_data.last_gp2, gp2);</div><div class='add'>+</div><div class='add'>+	/* If the difference is above the threshold, assume it's a wraparound.</div><div class='add'>+	 * Otherwise assume it's an old read and ignore it.</div><div class='add'>+	 */</div><div class='add'>+	if (gp2 &lt; mld-&gt;ptp_data.last_gp2) {</div><div class='add'>+		if (mld-&gt;ptp_data.last_gp2 - gp2 &lt;</div><div class='add'>+		    IWL_PTP_WRAP_THRESHOLD_USEC) {</div><div class='add'>+			IWL_DEBUG_PTP(mld,</div><div class='add'>+				      "PTP: ignore old read (gp2=%u, last_gp2=%u)\n",</div><div class='add'>+				      gp2, mld-&gt;ptp_data.last_gp2);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mld-&gt;ptp_data.wrap_counter++;</div><div class='add'>+		IWL_DEBUG_PTP(mld,</div><div class='add'>+			      "PTP: wraparound detected (new counter=%u)\n",</div><div class='add'>+			      mld-&gt;ptp_data.wrap_counter);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mld-&gt;ptp_data.last_gp2 = gp2;</div><div class='add'>+	schedule_delayed_work(&amp;mld-&gt;ptp_data.dwork, IWL_PTP_WRAP_TIME);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u64 iwl_mld_ptp_get_adj_time(struct iwl_mld *mld, u64 base_time_ns)</div><div class='add'>+{</div><div class='add'>+	struct ptp_data *data = &amp;mld-&gt;ptp_data;</div><div class='add'>+	u64 scale_time_gp2_ns = mld-&gt;ptp_data.scale_update_gp2 * NSEC_PER_USEC;</div><div class='add'>+	u64 res;</div><div class='add'>+	u64 diff;</div><div class='add'>+	s64 scaled_diff;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	iwl_mld_ptp_update_new_read(mld,</div><div class='add'>+				    div64_u64(base_time_ns, NSEC_PER_USEC));</div><div class='add'>+</div><div class='add'>+	base_time_ns = base_time_ns +</div><div class='add'>+		(data-&gt;wrap_counter * IWL_PTP_GP2_WRAP * NSEC_PER_USEC);</div><div class='add'>+</div><div class='add'>+	/* It is possible that a GP2 timestamp was received from fw before the</div><div class='add'>+	 * last scale update.</div><div class='add'>+	 */</div><div class='add'>+	if (base_time_ns &lt; scale_time_gp2_ns) {</div><div class='add'>+		diff = scale_time_gp2_ns - base_time_ns;</div><div class='add'>+		scaled_diff = -mul_u64_u64_div_u64(diff,</div><div class='add'>+						   data-&gt;scaled_freq,</div><div class='add'>+						   PTP_SCALE_FACTOR);</div><div class='add'>+	} else {</div><div class='add'>+		diff = base_time_ns - scale_time_gp2_ns;</div><div class='add'>+		scaled_diff = mul_u64_u64_div_u64(diff,</div><div class='add'>+						  data-&gt;scaled_freq,</div><div class='add'>+						  PTP_SCALE_FACTOR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_PTP(mld, "base_time=%llu diff ns=%llu scaled_diff_ns=%lld\n",</div><div class='add'>+		      (unsigned long long)base_time_ns,</div><div class='add'>+		      (unsigned long long)diff, (long long)scaled_diff);</div><div class='add'>+</div><div class='add'>+	res = data-&gt;scale_update_adj_time_ns + data-&gt;delta + scaled_diff;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_PTP(mld, "scale_update_ns=%llu delta=%lld adj=%llu\n",</div><div class='add'>+		      (unsigned long long)data-&gt;scale_update_adj_time_ns,</div><div class='add'>+		      (long long)data-&gt;delta, (unsigned long long)res);</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_ptp_gettime(struct ptp_clock_info *ptp,</div><div class='add'>+			       struct timespec64 *ts)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = container_of(ptp, struct iwl_mld,</div><div class='add'>+					   ptp_data.ptp_clock_info);</div><div class='add'>+	struct ptp_data *data = &amp;mld-&gt;ptp_data;</div><div class='add'>+	u32 gp2;</div><div class='add'>+	u64 ns;</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_get_systime(mld, &amp;gp2)) {</div><div class='add'>+		IWL_DEBUG_PTP(mld, "PTP: gettime: failed to read systime\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;data-&gt;lock);</div><div class='add'>+	ns = iwl_mld_ptp_get_adj_time(mld, (u64)gp2 * NSEC_PER_USEC);</div><div class='add'>+	spin_unlock_bh(&amp;data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	*ts = ns_to_timespec64(ns);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = container_of(ptp, struct iwl_mld,</div><div class='add'>+					   ptp_data.ptp_clock_info);</div><div class='add'>+	struct ptp_data *data = &amp;mld-&gt;ptp_data;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;data-&gt;lock);</div><div class='add'>+	data-&gt;delta += delta;</div><div class='add'>+	IWL_DEBUG_PTP(mld, "delta=%lld, new delta=%lld\n", (long long)delta,</div><div class='add'>+		      (long long)data-&gt;delta);</div><div class='add'>+	spin_unlock_bh(&amp;data-&gt;lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = container_of(ptp, struct iwl_mld,</div><div class='add'>+					   ptp_data.ptp_clock_info);</div><div class='add'>+	struct ptp_data *data = &amp;mld-&gt;ptp_data;</div><div class='add'>+	u32 gp2;</div><div class='add'>+</div><div class='add'>+	/* Must call iwl_mld_ptp_get_adj_time() before updating</div><div class='add'>+	 * data-&gt;scale_update_gp2 or data-&gt;scaled_freq since</div><div class='add'>+	 * scale_update_adj_time_ns should reflect the previous scaled_freq.</div><div class='add'>+	 */</div><div class='add'>+	if (iwl_mld_get_systime(mld, &amp;gp2)) {</div><div class='add'>+		IWL_DEBUG_PTP(mld, "adjfine: failed to read systime\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;data-&gt;lock);</div><div class='add'>+	data-&gt;scale_update_adj_time_ns =</div><div class='add'>+		iwl_mld_ptp_get_adj_time(mld, gp2 * NSEC_PER_USEC);</div><div class='add'>+	data-&gt;scale_update_gp2 = gp2;</div><div class='add'>+</div><div class='add'>+	/* scale_update_adj_time_ns now relects the configured delta, the</div><div class='add'>+	 * wrap_counter and the previous scaled frequency. Thus delta and</div><div class='add'>+	 * wrap_counter should be reset, and the scale frequency is updated</div><div class='add'>+	 * to the new frequency.</div><div class='add'>+	 */</div><div class='add'>+	data-&gt;delta = 0;</div><div class='add'>+	data-&gt;wrap_counter = 0;</div><div class='add'>+	data-&gt;scaled_freq = PTP_SCALE_FACTOR + scaled_ppm;</div><div class='add'>+	IWL_DEBUG_PTP(mld, "adjfine: scaled_ppm=%ld new=%llu\n",</div><div class='add'>+		      scaled_ppm, (unsigned long long)data-&gt;scaled_freq);</div><div class='add'>+	spin_unlock_bh(&amp;data-&gt;lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_ptp_work(struct work_struct *wk)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = container_of(wk, struct iwl_mld,</div><div class='add'>+					   ptp_data.dwork.work);</div><div class='add'>+	struct ptp_data *data = &amp;mld-&gt;ptp_data;</div><div class='add'>+	u32 gp2;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;data-&gt;lock);</div><div class='add'>+	if (!iwl_mld_get_systime(mld, &amp;gp2))</div><div class='add'>+		iwl_mld_ptp_update_new_read(mld, gp2);</div><div class='add'>+	else</div><div class='add'>+		IWL_DEBUG_PTP(mld, "PTP work: failed to read GP2\n");</div><div class='add'>+	spin_unlock_bh(&amp;data-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_get_crosstimestamp_fw(struct iwl_mld *mld, u32 *gp2, u64 *sys_time)</div><div class='add'>+{</div><div class='add'>+	struct iwl_synced_time_cmd synced_time_cmd = {</div><div class='add'>+		.operation = cpu_to_le32(IWL_SYNCED_TIME_OPERATION_READ_BOTH)</div><div class='add'>+	};</div><div class='add'>+	struct iwl_host_cmd cmd = {</div><div class='add'>+		.id = WIDE_ID(DATA_PATH_GROUP, WNM_PLATFORM_PTM_REQUEST_CMD),</div><div class='add'>+		.flags = CMD_WANT_SKB,</div><div class='add'>+		.data[0] = &amp;synced_time_cmd,</div><div class='add'>+		.len[0] = sizeof(synced_time_cmd),</div><div class='add'>+	};</div><div class='add'>+	struct iwl_synced_time_rsp *resp;</div><div class='add'>+	struct iwl_rx_packet *pkt;</div><div class='add'>+	int ret;</div><div class='add'>+	u64 gp2_10ns;</div><div class='add'>+</div><div class='add'>+	wiphy_lock(mld-&gt;wiphy);</div><div class='add'>+	ret = iwl_mld_send_cmd(mld, &amp;cmd);</div><div class='add'>+	wiphy_unlock(mld-&gt;wiphy);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	pkt = cmd.resp_pkt;</div><div class='add'>+</div><div class='add'>+	if (iwl_rx_packet_payload_len(pkt) != sizeof(*resp)) {</div><div class='add'>+		IWL_DEBUG_PTP(mld, "PTP: Invalid PTM command response\n");</div><div class='add'>+		iwl_free_resp(&amp;cmd);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	resp = (void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+	gp2_10ns = (u64)le32_to_cpu(resp-&gt;gp2_timestamp_hi) &lt;&lt; 32 |</div><div class='add'>+		le32_to_cpu(resp-&gt;gp2_timestamp_lo);</div><div class='add'>+	*gp2 = div_u64(gp2_10ns, 100);</div><div class='add'>+</div><div class='add'>+	*sys_time = (u64)le32_to_cpu(resp-&gt;platform_timestamp_hi) &lt;&lt; 32 |</div><div class='add'>+		le32_to_cpu(resp-&gt;platform_timestamp_lo);</div><div class='add'>+</div><div class='add'>+	iwl_free_resp(&amp;cmd);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_phc_get_crosstimestamp(struct ptp_clock_info *ptp,</div><div class='add'>+			       struct system_device_crosststamp *xtstamp)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = container_of(ptp, struct iwl_mld,</div><div class='add'>+					   ptp_data.ptp_clock_info);</div><div class='add'>+	struct ptp_data *data = &amp;mld-&gt;ptp_data;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	/* Raw value read from GP2 register in usec */</div><div class='add'>+	u32 gp2;</div><div class='add'>+	/* GP2 value in ns*/</div><div class='add'>+	s64 gp2_ns;</div><div class='add'>+	/* System (wall) time */</div><div class='add'>+	ktime_t sys_time;</div><div class='add'>+</div><div class='add'>+	memset(xtstamp, 0, sizeof(struct system_device_crosststamp));</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_get_crosstimestamp_fw(mld, &amp;gp2, &amp;sys_time);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_DEBUG_PTP(mld,</div><div class='add'>+			      "PTP: fw get_crosstimestamp failed (ret=%d)\n",</div><div class='add'>+			      ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;data-&gt;lock);</div><div class='add'>+	gp2_ns = iwl_mld_ptp_get_adj_time(mld, (u64)gp2 * NSEC_PER_USEC);</div><div class='add'>+	spin_unlock_bh(&amp;data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_PTP(mld,</div><div class='add'>+		      "Got Sync Time: GP2:%u, last_GP2: %u, GP2_ns: %lld, sys_time: %lld\n",</div><div class='add'>+		      gp2, mld-&gt;ptp_data.last_gp2, gp2_ns, (s64)sys_time);</div><div class='add'>+</div><div class='add'>+	/* System monotonic raw time is not used */</div><div class='add'>+	xtstamp-&gt;device = ns_to_ktime(gp2_ns);</div><div class='add'>+	xtstamp-&gt;sys_realtime = sys_time;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_ptp_init(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(mld-&gt;ptp_data.ptp_clock))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;mld-&gt;ptp_data.lock);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;mld-&gt;ptp_data.dwork, iwl_mld_ptp_work);</div><div class='add'>+</div><div class='add'>+	mld-&gt;ptp_data.ptp_clock_info.owner = THIS_MODULE;</div><div class='add'>+	mld-&gt;ptp_data.ptp_clock_info.gettime64 = iwl_mld_ptp_gettime;</div><div class='add'>+	mld-&gt;ptp_data.ptp_clock_info.max_adj = 0x7fffffff;</div><div class='add'>+	mld-&gt;ptp_data.ptp_clock_info.adjtime = iwl_mld_ptp_adjtime;</div><div class='add'>+	mld-&gt;ptp_data.ptp_clock_info.adjfine = iwl_mld_ptp_adjfine;</div><div class='add'>+	mld-&gt;ptp_data.scaled_freq = PTP_SCALE_FACTOR;</div><div class='add'>+	mld-&gt;ptp_data.ptp_clock_info.getcrosststamp =</div><div class='add'>+					iwl_mld_phc_get_crosstimestamp;</div><div class='add'>+</div><div class='add'>+	/* Give a short 'friendly name' to identify the PHC clock */</div><div class='add'>+	snprintf(mld-&gt;ptp_data.ptp_clock_info.name,</div><div class='add'>+		 sizeof(mld-&gt;ptp_data.ptp_clock_info.name),</div><div class='add'>+		 "%s", "iwlwifi-PTP");</div><div class='add'>+</div><div class='add'>+	mld-&gt;ptp_data.ptp_clock =</div><div class='add'>+		ptp_clock_register(&amp;mld-&gt;ptp_data.ptp_clock_info, mld-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR_OR_NULL(mld-&gt;ptp_data.ptp_clock)) {</div><div class='add'>+		IWL_ERR(mld, "Failed to register PHC clock (%ld)\n",</div><div class='add'>+			PTR_ERR(mld-&gt;ptp_data.ptp_clock));</div><div class='add'>+		mld-&gt;ptp_data.ptp_clock = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		IWL_DEBUG_INFO(mld, "Registered PHC clock: %s, with index: %d\n",</div><div class='add'>+			       mld-&gt;ptp_data.ptp_clock_info.name,</div><div class='add'>+			       ptp_clock_index(mld-&gt;ptp_data.ptp_clock));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_ptp_remove(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	if (mld-&gt;ptp_data.ptp_clock) {</div><div class='add'>+		IWL_DEBUG_INFO(mld, "Unregistering PHC clock: %s, with index: %d\n",</div><div class='add'>+			       mld-&gt;ptp_data.ptp_clock_info.name,</div><div class='add'>+			       ptp_clock_index(mld-&gt;ptp_data.ptp_clock));</div><div class='add'>+</div><div class='add'>+		ptp_clock_unregister(mld-&gt;ptp_data.ptp_clock);</div><div class='add'>+		mld-&gt;ptp_data.ptp_clock = NULL;</div><div class='add'>+		mld-&gt;ptp_data.last_gp2 = 0;</div><div class='add'>+		mld-&gt;ptp_data.wrap_counter = 0;</div><div class='add'>+		cancel_delayed_work_sync(&amp;mld-&gt;ptp_data.dwork);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/ptp.h b/drivers/net/wireless/intel/iwlwifi/mld/ptp.h<br/>new file mode 100644<br/>index 000000000000..f3d18dd304e5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/ptp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/ptp.h</a></div><div class='hunk'>@@ -0,0 +1,45 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_ptp_h__</div><div class='add'>+#define __iwl_mld_ptp_h__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ptp_data - PTP hardware clock data</div><div class='add'>+ *</div><div class='add'>+ * @ptp_clock: struct ptp_clock pointer returned by the ptp_clock_register()</div><div class='add'>+ *	function.</div><div class='add'>+ * @ptp_clock_info: struct ptp_clock_info that describes a PTP hardware clock</div><div class='add'>+ * @lock: protects the time adjustments data</div><div class='add'>+ * @delta: delta between hardware clock and ptp clock in nanoseconds</div><div class='add'>+ * @scale_update_gp2: GP2 time when the scale was last updated</div><div class='add'>+ * @scale_update_adj_time_ns: adjusted time when the scale was last updated,</div><div class='add'>+ *	in nanoseconds</div><div class='add'>+ * @scaled_freq: clock frequency offset, scaled to 65536000000</div><div class='add'>+ * @last_gp2: the last GP2 reading from the hardware, used for tracking GP2</div><div class='add'>+ *	wraparounds</div><div class='add'>+ * @wrap_counter: number of wraparounds since scale_update_adj_time_ns</div><div class='add'>+ * @dwork: worker scheduled every 1 hour to detect workarounds</div><div class='add'>+ */</div><div class='add'>+struct ptp_data {</div><div class='add'>+	struct ptp_clock *ptp_clock;</div><div class='add'>+	struct ptp_clock_info ptp_clock_info;</div><div class='add'>+</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	s64 delta;</div><div class='add'>+	u32 scale_update_gp2;</div><div class='add'>+	u64 scale_update_adj_time_ns;</div><div class='add'>+	u64 scaled_freq;</div><div class='add'>+	u32 last_gp2;</div><div class='add'>+	u32 wrap_counter;</div><div class='add'>+	struct delayed_work dwork;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void iwl_mld_ptp_init(struct iwl_mld *mld);</div><div class='add'>+void iwl_mld_ptp_remove(struct iwl_mld *mld);</div><div class='add'>+u64 iwl_mld_ptp_get_adj_time(struct iwl_mld *mld, u64 base_time_ns);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_ptp_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/regulatory.c b/drivers/net/wireless/intel/iwlwifi/mld/regulatory.c<br/>new file mode 100644<br/>index 000000000000..40571125b3ab<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/regulatory.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/regulatory.c</a></div><div class='hunk'>@@ -0,0 +1,383 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dmi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "fw/regulatory.h"</div><div class='add'>+#include "fw/acpi.h"</div><div class='add'>+#include "fw/uefi.h"</div><div class='add'>+</div><div class='add'>+#include "regulatory.h"</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+</div><div class='add'>+void iwl_mld_get_bios_tables(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	iwl_acpi_get_guid_lock_status(&amp;mld-&gt;fwrt);</div><div class='add'>+</div><div class='add'>+	ret = iwl_bios_get_ppag_table(&amp;mld-&gt;fwrt);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		IWL_DEBUG_RADIO(mld,</div><div class='add'>+				"PPAG BIOS table invalid or unavailable. (%d)\n",</div><div class='add'>+				ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_bios_get_wrds_table(&amp;mld-&gt;fwrt);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		IWL_DEBUG_RADIO(mld,</div><div class='add'>+				"WRDS SAR BIOS table invalid or unavailable. (%d)\n",</div><div class='add'>+				ret);</div><div class='add'>+</div><div class='add'>+		/* If not available, don't fail and don't bother with EWRD and</div><div class='add'>+		 * WGDS</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		if (!iwl_bios_get_wgds_table(&amp;mld-&gt;fwrt)) {</div><div class='add'>+			/* If basic SAR is not available, we check for WGDS,</div><div class='add'>+			 * which should *not* be available either. If it is</div><div class='add'>+			 * available, issue an error, because we can't use SAR</div><div class='add'>+			 * Geo without basic SAR.</div><div class='add'>+			 */</div><div class='add'>+			IWL_ERR(mld, "BIOS contains WGDS but no WRDS\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		ret = iwl_bios_get_ewrd_table(&amp;mld-&gt;fwrt);</div><div class='add'>+		/* If EWRD is not available, we can still use</div><div class='add'>+		 * WRDS, so don't fail.</div><div class='add'>+		 */</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			IWL_DEBUG_RADIO(mld,</div><div class='add'>+					"EWRD SAR BIOS table invalid or unavailable. (%d)\n",</div><div class='add'>+					ret);</div><div class='add'>+</div><div class='add'>+		ret = iwl_bios_get_wgds_table(&amp;mld-&gt;fwrt);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			IWL_DEBUG_RADIO(mld,</div><div class='add'>+					"Geo SAR BIOS table invalid or unavailable. (%d)\n",</div><div class='add'>+					ret);</div><div class='add'>+		/* we don't fail if the table is not available */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_uefi_get_uats_table(mld-&gt;trans, &amp;mld-&gt;fwrt);</div><div class='add'>+</div><div class='add'>+	iwl_bios_get_phy_filters(&amp;mld-&gt;fwrt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_geo_sar_init(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	u32 cmd_id = WIDE_ID(PHY_OPS_GROUP, PER_CHAIN_LIMIT_OFFSET_CMD);</div><div class='add'>+	/* Only set to South Korea if the table revision is 1 */</div><div class='add'>+	__le32 sk = cpu_to_le32(mld-&gt;fwrt.geo_rev == 1 ? 1 : 0);</div><div class='add'>+	union iwl_geo_tx_power_profiles_cmd cmd = {</div><div class='add'>+		.v5.ops = cpu_to_le32(IWL_PER_CHAIN_OFFSET_SET_TABLES),</div><div class='add'>+		.v5.table_revision = sk,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_sar_geo_fill_table(&amp;mld-&gt;fwrt, &amp;cmd.v5.table[0][0],</div><div class='add'>+				     ARRAY_SIZE(cmd.v5.table[0]),</div><div class='add'>+				     BIOS_GEO_MAX_PROFILE_NUM);</div><div class='add'>+</div><div class='add'>+	/* It is a valid scenario to not support SAR, or miss wgds table,</div><div class='add'>+	 * but in that case there is no need to send the command.</div><div class='add'>+	 */</div><div class='add'>+	if (ret)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_cmd_pdu(mld, cmd_id, &amp;cmd, sizeof(cmd.v5));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_config_sar_profile(struct iwl_mld *mld, int prof_a, int prof_b)</div><div class='add'>+{</div><div class='add'>+	u32 cmd_id = REDUCE_TX_POWER_CMD;</div><div class='add'>+	struct iwl_dev_tx_power_cmd cmd = {</div><div class='add'>+		.common.set_mode = cpu_to_le32(IWL_TX_POWER_MODE_SET_CHAINS),</div><div class='add'>+		.v10.flags = cpu_to_le32(mld-&gt;fwrt.reduced_power_flags),</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* TODO: CDB - support IWL_NUM_CHAIN_TABLES_V2 */</div><div class='add'>+	ret = iwl_sar_fill_profile(&amp;mld-&gt;fwrt, &amp;cmd.v10.per_chain[0][0][0],</div><div class='add'>+				   IWL_NUM_CHAIN_TABLES, IWL_NUM_SUB_BANDS_V2,</div><div class='add'>+				   prof_a, prof_b);</div><div class='add'>+	/* return on error or if the profile is disabled (positive number) */</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_cmd_pdu(mld, cmd_id, &amp;cmd,</div><div class='add'>+				    sizeof(cmd.common) + sizeof(cmd.v10));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_init_sar(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	int chain_a_prof = 1;</div><div class='add'>+	int chain_b_prof = 1;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* If no profile was chosen by the user yet, choose profile 1 (WRDS) as</div><div class='add'>+	 * default for both chains</div><div class='add'>+	 */</div><div class='add'>+	if (mld-&gt;fwrt.sar_chain_a_profile &amp;&amp; mld-&gt;fwrt.sar_chain_b_profile) {</div><div class='add'>+		chain_a_prof = mld-&gt;fwrt.sar_chain_a_profile;</div><div class='add'>+		chain_b_prof = mld-&gt;fwrt.sar_chain_b_profile;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_config_sar_profile(mld, chain_a_prof, chain_b_prof);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return iwl_mld_geo_sar_init(mld);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_init_sgom(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct iwl_host_cmd cmd = {</div><div class='add'>+		.id = WIDE_ID(REGULATORY_AND_NVM_GROUP,</div><div class='add'>+			      SAR_OFFSET_MAPPING_TABLE_CMD),</div><div class='add'>+		.data[0] = &amp;mld-&gt;fwrt.sgom_table,</div><div class='add'>+		.len[0] =  sizeof(mld-&gt;fwrt.sgom_table),</div><div class='add'>+		.dataflags[0] = IWL_HCMD_DFL_NOCOPY,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!mld-&gt;fwrt.sgom_enabled) {</div><div class='add'>+		IWL_DEBUG_RADIO(mld, "SGOM table is disabled\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd(mld, &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mld,</div><div class='add'>+			"failed to send SAR_OFFSET_MAPPING_CMD (%d)\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_ppag_send_cmd(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct iwl_fw_runtime *fwrt = &amp;mld-&gt;fwrt;</div><div class='add'>+	union iwl_ppag_table_cmd cmd = {</div><div class='add'>+		.v7.ppag_config_info.table_source = fwrt-&gt;ppag_bios_source,</div><div class='add'>+		.v7.ppag_config_info.table_revision = fwrt-&gt;ppag_bios_rev,</div><div class='add'>+		.v7.ppag_config_info.value = cpu_to_le32(fwrt-&gt;ppag_flags),</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_RADIO(fwrt,</div><div class='add'>+			"PPAG MODE bits going to be sent: %d\n",</div><div class='add'>+			fwrt-&gt;ppag_flags);</div><div class='add'>+</div><div class='add'>+	for (int chain = 0; chain &lt; IWL_NUM_CHAIN_LIMITS; chain++) {</div><div class='add'>+		for (int subband = 0; subband &lt; IWL_NUM_SUB_BANDS_V2; subband++) {</div><div class='add'>+			cmd.v7.gain[chain][subband] =</div><div class='add'>+				fwrt-&gt;ppag_chains[chain].subbands[subband];</div><div class='add'>+			IWL_DEBUG_RADIO(fwrt,</div><div class='add'>+					"PPAG table: chain[%d] band[%d]: gain = %d\n",</div><div class='add'>+					chain, subband, cmd.v7.gain[chain][subband]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_RADIO(mld, "Sending PER_PLATFORM_ANT_GAIN_CMD\n");</div><div class='add'>+	ret = iwl_mld_send_cmd_pdu(mld, WIDE_ID(PHY_OPS_GROUP,</div><div class='add'>+						PER_PLATFORM_ANT_GAIN_CMD),</div><div class='add'>+				   &amp;cmd, sizeof(cmd.v7));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		IWL_ERR(mld, "failed to send PER_PLATFORM_ANT_GAIN_CMD (%d)\n",</div><div class='add'>+			ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_init_ppag(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	/* no need to read the table, done in INIT stage */</div><div class='add'>+</div><div class='add'>+	if (!(iwl_is_ppag_approved(&amp;mld-&gt;fwrt)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return iwl_mld_ppag_send_cmd(mld);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_configure_lari(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct iwl_fw_runtime *fwrt = &amp;mld-&gt;fwrt;</div><div class='add'>+	struct iwl_lari_config_change_cmd cmd = {</div><div class='add'>+		.config_bitmap = iwl_get_lari_config_bitmap(fwrt),</div><div class='add'>+	};</div><div class='add'>+	bool has_raw_dsm_capa = fw_has_capa(&amp;fwrt-&gt;fw-&gt;ucode_capa,</div><div class='add'>+					    IWL_UCODE_TLV_CAPA_FW_ACCEPTS_RAW_DSM_TABLE);</div><div class='add'>+	int ret;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	ret = iwl_bios_get_dsm(fwrt, DSM_FUNC_11AX_ENABLEMENT, &amp;value);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (!has_raw_dsm_capa)</div><div class='add'>+			value &amp;= DSM_11AX_ALLOW_BITMAP;</div><div class='add'>+		cmd.oem_11ax_allow_bitmap = cpu_to_le32(value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_bios_get_dsm(fwrt, DSM_FUNC_ENABLE_UNII4_CHAN, &amp;value);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (!has_raw_dsm_capa)</div><div class='add'>+			value &amp;= DSM_UNII4_ALLOW_BITMAP;</div><div class='add'>+		cmd.oem_unii4_allow_bitmap = cpu_to_le32(value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_bios_get_dsm(fwrt, DSM_FUNC_ACTIVATE_CHANNEL, &amp;value);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (!has_raw_dsm_capa)</div><div class='add'>+			value &amp;= CHAN_STATE_ACTIVE_BITMAP_CMD_V12;</div><div class='add'>+		cmd.chan_state_active_bitmap = cpu_to_le32(value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_bios_get_dsm(fwrt, DSM_FUNC_ENABLE_6E, &amp;value);</div><div class='add'>+	if (!ret)</div><div class='add'>+		cmd.oem_uhb_allow_bitmap = cpu_to_le32(value);</div><div class='add'>+</div><div class='add'>+	ret = iwl_bios_get_dsm(fwrt, DSM_FUNC_FORCE_DISABLE_CHANNELS, &amp;value);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (!has_raw_dsm_capa)</div><div class='add'>+			value &amp;= DSM_FORCE_DISABLE_CHANNELS_ALLOWED_BITMAP;</div><div class='add'>+		cmd.force_disable_channels_bitmap = cpu_to_le32(value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_bios_get_dsm(fwrt, DSM_FUNC_ENERGY_DETECTION_THRESHOLD,</div><div class='add'>+			       &amp;value);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (!has_raw_dsm_capa)</div><div class='add'>+			value &amp;= DSM_EDT_ALLOWED_BITMAP;</div><div class='add'>+		cmd.edt_bitmap = cpu_to_le32(value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_bios_get_wbem(fwrt, &amp;value);</div><div class='add'>+	if (!ret)</div><div class='add'>+		cmd.oem_320mhz_allow_bitmap = cpu_to_le32(value);</div><div class='add'>+</div><div class='add'>+	ret = iwl_bios_get_dsm(fwrt, DSM_FUNC_ENABLE_11BE, &amp;value);</div><div class='add'>+	if (!ret)</div><div class='add'>+		cmd.oem_11be_allow_bitmap = cpu_to_le32(value);</div><div class='add'>+</div><div class='add'>+	if (!cmd.config_bitmap &amp;&amp;</div><div class='add'>+	    !cmd.oem_uhb_allow_bitmap &amp;&amp;</div><div class='add'>+	    !cmd.oem_11ax_allow_bitmap &amp;&amp;</div><div class='add'>+	    !cmd.oem_unii4_allow_bitmap &amp;&amp;</div><div class='add'>+	    !cmd.chan_state_active_bitmap &amp;&amp;</div><div class='add'>+	    !cmd.force_disable_channels_bitmap &amp;&amp;</div><div class='add'>+	    !cmd.edt_bitmap &amp;&amp;</div><div class='add'>+	    !cmd.oem_320mhz_allow_bitmap &amp;&amp;</div><div class='add'>+	    !cmd.oem_11be_allow_bitmap)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_RADIO(mld,</div><div class='add'>+			"sending LARI_CONFIG_CHANGE, config_bitmap=0x%x, oem_11ax_allow_bitmap=0x%x\n",</div><div class='add'>+			le32_to_cpu(cmd.config_bitmap),</div><div class='add'>+			le32_to_cpu(cmd.oem_11ax_allow_bitmap));</div><div class='add'>+	IWL_DEBUG_RADIO(mld,</div><div class='add'>+			"sending LARI_CONFIG_CHANGE, oem_unii4_allow_bitmap=0x%x, chan_state_active_bitmap=0x%x\n",</div><div class='add'>+			le32_to_cpu(cmd.oem_unii4_allow_bitmap),</div><div class='add'>+			le32_to_cpu(cmd.chan_state_active_bitmap));</div><div class='add'>+	IWL_DEBUG_RADIO(mld,</div><div class='add'>+			"sending LARI_CONFIG_CHANGE, oem_uhb_allow_bitmap=0x%x, force_disable_channels_bitmap=0x%x\n",</div><div class='add'>+			le32_to_cpu(cmd.oem_uhb_allow_bitmap),</div><div class='add'>+			le32_to_cpu(cmd.force_disable_channels_bitmap));</div><div class='add'>+	IWL_DEBUG_RADIO(mld,</div><div class='add'>+			"sending LARI_CONFIG_CHANGE, edt_bitmap=0x%x, oem_320mhz_allow_bitmap=0x%x\n",</div><div class='add'>+			le32_to_cpu(cmd.edt_bitmap),</div><div class='add'>+			le32_to_cpu(cmd.oem_320mhz_allow_bitmap));</div><div class='add'>+	IWL_DEBUG_RADIO(mld,</div><div class='add'>+			"sending LARI_CONFIG_CHANGE, oem_11be_allow_bitmap=0x%x\n",</div><div class='add'>+			le32_to_cpu(cmd.oem_11be_allow_bitmap));</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd_pdu(mld, WIDE_ID(REGULATORY_AND_NVM_GROUP,</div><div class='add'>+						LARI_CONFIG_CHANGE), &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_DEBUG_RADIO(mld,</div><div class='add'>+				"Failed to send LARI_CONFIG_CHANGE (%d)\n",</div><div class='add'>+				ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_init_uats(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct iwl_host_cmd cmd = {</div><div class='add'>+		.id = WIDE_ID(REGULATORY_AND_NVM_GROUP,</div><div class='add'>+			      MCC_ALLOWED_AP_TYPE_CMD),</div><div class='add'>+		.data[0] = &amp;mld-&gt;fwrt.uats_table,</div><div class='add'>+		.len[0] =  sizeof(mld-&gt;fwrt.uats_table),</div><div class='add'>+		.dataflags[0] = IWL_HCMD_DFL_NOCOPY,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!mld-&gt;fwrt.uats_valid)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd(mld, &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mld, "failed to send MCC_ALLOWED_AP_TYPE_CMD (%d)\n",</div><div class='add'>+			ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_init_tas(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct iwl_tas_data data = {};</div><div class='add'>+	struct iwl_tas_config_cmd cmd = {};</div><div class='add'>+	u32 cmd_id = WIDE_ID(REGULATORY_AND_NVM_GROUP, TAS_CONFIG);</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(data.block_list_array) !=</div><div class='add'>+		     IWL_WTAS_BLACK_LIST_MAX);</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(cmd.block_list_array) !=</div><div class='add'>+		     IWL_WTAS_BLACK_LIST_MAX);</div><div class='add'>+</div><div class='add'>+	if (!fw_has_capa(&amp;mld-&gt;fw-&gt;ucode_capa, IWL_UCODE_TLV_CAPA_TAS_CFG)) {</div><div class='add'>+		IWL_DEBUG_RADIO(mld, "TAS not enabled in FW\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_bios_get_tas_table(&amp;mld-&gt;fwrt, &amp;data);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		IWL_DEBUG_RADIO(mld,</div><div class='add'>+				"TAS table invalid or unavailable. (%d)\n",</div><div class='add'>+				ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!iwl_is_tas_approved()) {</div><div class='add'>+		IWL_DEBUG_RADIO(mld,</div><div class='add'>+				"System vendor '%s' is not in the approved list, disabling TAS in US and Canada.\n",</div><div class='add'>+				dmi_get_system_info(DMI_SYS_VENDOR) ?: "&lt;unknown&gt;");</div><div class='add'>+		if ((!iwl_add_mcc_to_tas_block_list(data.block_list_array,</div><div class='add'>+						    &amp;data.block_list_size,</div><div class='add'>+						    IWL_MCC_US)) ||</div><div class='add'>+		    (!iwl_add_mcc_to_tas_block_list(data.block_list_array,</div><div class='add'>+						    &amp;data.block_list_size,</div><div class='add'>+						    IWL_MCC_CANADA))) {</div><div class='add'>+			IWL_DEBUG_RADIO(mld,</div><div class='add'>+					"Unable to add US/Canada to TAS block list, disabling TAS\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		IWL_DEBUG_RADIO(mld,</div><div class='add'>+				"System vendor '%s' is in the approved list.\n",</div><div class='add'>+				dmi_get_system_info(DMI_SYS_VENDOR) ?: "&lt;unknown&gt;");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd.block_list_size = cpu_to_le16(data.block_list_size);</div><div class='add'>+	for (u8 i = 0; i &lt; data.block_list_size; i++)</div><div class='add'>+		cmd.block_list_array[i] =</div><div class='add'>+			cpu_to_le16(data.block_list_array[i]);</div><div class='add'>+	cmd.tas_config_info.table_source = data.table_source;</div><div class='add'>+	cmd.tas_config_info.table_revision = data.table_revision;</div><div class='add'>+	cmd.tas_config_info.value = cpu_to_le32(data.tas_selection);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd_pdu(mld, cmd_id, &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_DEBUG_RADIO(mld, "failed to send TAS_CONFIG (%d)\n", ret);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/regulatory.h b/drivers/net/wireless/intel/iwlwifi/mld/regulatory.h<br/>new file mode 100644<br/>index 000000000000..3b01c645adda<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/regulatory.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/regulatory.h</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_regulatory_h__</div><div class='add'>+#define __iwl_mld_regulatory_h__</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+</div><div class='add'>+void iwl_mld_get_bios_tables(struct iwl_mld *mld);</div><div class='add'>+void iwl_mld_configure_lari(struct iwl_mld *mld);</div><div class='add'>+void iwl_mld_init_uats(struct iwl_mld *mld);</div><div class='add'>+void iwl_mld_init_tas(struct iwl_mld *mld);</div><div class='add'>+</div><div class='add'>+int iwl_mld_init_ppag(struct iwl_mld *mld);</div><div class='add'>+</div><div class='add'>+int iwl_mld_init_sgom(struct iwl_mld *mld);</div><div class='add'>+</div><div class='add'>+int iwl_mld_init_sar(struct iwl_mld *mld);</div><div class='add'>+</div><div class='add'>+int iwl_mld_config_sar_profile(struct iwl_mld *mld, int prof_a, int prof_b);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_regulatory_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/roc.c b/drivers/net/wireless/intel/iwlwifi/mld/roc.c<br/>new file mode 100644<br/>index 000000000000..4e37a288471e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/roc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/roc.c</a></div><div class='hunk'>@@ -0,0 +1,261 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 - 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;net/cfg80211.h&gt;</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "roc.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+#include "iface.h"</div><div class='add'>+#include "sta.h"</div><div class='add'>+#include "mlo.h"</div><div class='add'>+</div><div class='add'>+#include "fw/api/context.h"</div><div class='add'>+#include "fw/api/time-event.h"</div><div class='add'>+</div><div class='add'>+#define AUX_ROC_MAX_DELAY MSEC_TO_TU(200)</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_vif_iter_emlsr_block_roc(void *data, u8 *mac, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	int *result = data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_block_emlsr_sync(mld_vif-&gt;mld, vif,</div><div class='add'>+				       IWL_MLD_EMLSR_BLOCKED_ROC,</div><div class='add'>+				       iwl_mld_get_primary_link(vif));</div><div class='add'>+	if (ret)</div><div class='add'>+		*result = ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct iwl_mld_roc_iter_data {</div><div class='add'>+	enum iwl_roc_activity activity;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	bool found;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void iwl_mld_find_roc_vif_iter(void *data, u8 *mac,</div><div class='add'>+				      struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld_roc_iter_data *roc_data = data;</div><div class='add'>+</div><div class='add'>+	if (mld_vif-&gt;roc_activity != roc_data-&gt;activity)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* The FW supports one ROC of each type simultaneously */</div><div class='add'>+	if (WARN_ON(roc_data-&gt;found)) {</div><div class='add'>+		roc_data-&gt;vif = NULL;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	roc_data-&gt;found = true;</div><div class='add'>+	roc_data-&gt;vif = vif;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ieee80211_vif *</div><div class='add'>+iwl_mld_find_roc_vif(struct iwl_mld *mld, enum iwl_roc_activity activity)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_roc_iter_data roc_data = {</div><div class='add'>+		.activity = activity,</div><div class='add'>+		.found = false,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_mtx(mld-&gt;hw,</div><div class='add'>+						IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						iwl_mld_find_roc_vif_iter,</div><div class='add'>+						&amp;roc_data);</div><div class='add'>+</div><div class='add'>+	return roc_data.vif;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_start_roc(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		      struct ieee80211_channel *channel, int duration,</div><div class='add'>+		      enum ieee80211_roc_type type)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld_int_sta *aux_sta = &amp;mld_vif-&gt;aux_sta;</div><div class='add'>+	struct iwl_roc_req cmd = {</div><div class='add'>+		.action = cpu_to_le32(FW_CTXT_ACTION_ADD),</div><div class='add'>+	};</div><div class='add'>+	enum iwl_roc_activity activity;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_P2P_DEVICE &amp;&amp;</div><div class='add'>+	    vif-&gt;type != NL80211_IFTYPE_STATION) {</div><div class='add'>+		IWL_ERR(mld, "NOT SUPPORTED: ROC on vif-&gt;type %d\n",</div><div class='add'>+			vif-&gt;type);</div><div class='add'>+</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE) {</div><div class='add'>+		switch (type) {</div><div class='add'>+		case IEEE80211_ROC_TYPE_NORMAL:</div><div class='add'>+			activity = ROC_ACTIVITY_P2P_DISC;</div><div class='add'>+			break;</div><div class='add'>+		case IEEE80211_ROC_TYPE_MGMT_TX:</div><div class='add'>+			activity = ROC_ACTIVITY_P2P_NEG;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			WARN_ONCE(1, "Got an invalid P2P ROC type\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		activity = ROC_ACTIVITY_HOTSPOT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The FW supports one ROC of each type simultaneously */</div><div class='add'>+	if (WARN_ON(iwl_mld_find_roc_vif(mld, activity)))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_mtx(mld-&gt;hw,</div><div class='add'>+						IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						iwl_mld_vif_iter_emlsr_block_roc,</div><div class='add'>+						&amp;ret);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_add_aux_sta(mld, aux_sta);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	cmd.activity = cpu_to_le32(activity);</div><div class='add'>+	cmd.sta_id = cpu_to_le32(aux_sta-&gt;sta_id);</div><div class='add'>+	cmd.channel_info.channel = cpu_to_le32(channel-&gt;hw_value);</div><div class='add'>+	cmd.channel_info.band = iwl_mld_nl80211_band_to_fw(channel-&gt;band);</div><div class='add'>+	cmd.channel_info.width = IWL_PHY_CHANNEL_MODE20;</div><div class='add'>+	cmd.max_delay = cpu_to_le32(AUX_ROC_MAX_DELAY);</div><div class='add'>+	cmd.duration = cpu_to_le32(MSEC_TO_TU(duration));</div><div class='add'>+</div><div class='add'>+	memcpy(cmd.node_addr, vif-&gt;addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd_pdu(mld, WIDE_ID(MAC_CONF_GROUP, ROC_CMD),</div><div class='add'>+				   &amp;cmd);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mld, "Couldn't send the ROC_CMD\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mld_vif-&gt;roc_activity = activity;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_vif_iter_emlsr_unblock_roc(void *data, u8 *mac,</div><div class='add'>+				   struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	iwl_mld_unblock_emlsr(mld_vif-&gt;mld, vif, IWL_MLD_EMLSR_BLOCKED_ROC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_destroy_roc(struct iwl_mld *mld,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct iwl_mld_vif *mld_vif)</div><div class='add'>+{</div><div class='add'>+	mld_vif-&gt;roc_activity = ROC_NUM_ACTIVITIES;</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_mtx(mld-&gt;hw,</div><div class='add'>+						IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						iwl_mld_vif_iter_emlsr_unblock_roc,</div><div class='add'>+						NULL);</div><div class='add'>+</div><div class='add'>+	/* wait until every tx has seen that roc_activity has been reset */</div><div class='add'>+	synchronize_net();</div><div class='add'>+	/* from here, no new tx will be added</div><div class='add'>+	 * we can flush the Tx on the queues</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	iwl_mld_flush_link_sta_txqs(mld, mld_vif-&gt;aux_sta.sta_id);</div><div class='add'>+</div><div class='add'>+	iwl_mld_remove_aux_sta(mld, vif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_cancel_roc(struct ieee80211_hw *hw,</div><div class='add'>+		       struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_roc_req cmd = {</div><div class='add'>+		.action = cpu_to_le32(FW_CTXT_ACTION_REMOVE),</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(vif-&gt;type != NL80211_IFTYPE_P2P_DEVICE &amp;&amp;</div><div class='add'>+		    vif-&gt;type != NL80211_IFTYPE_STATION))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* No roc activity running it's probably already done */</div><div class='add'>+	if (mld_vif-&gt;roc_activity == ROC_NUM_ACTIVITIES)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cmd.activity = cpu_to_le32(mld_vif-&gt;roc_activity);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd_pdu(mld, WIDE_ID(MAC_CONF_GROUP, ROC_CMD),</div><div class='add'>+				   &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mld, "Couldn't send the command to cancel the ROC\n");</div><div class='add'>+</div><div class='add'>+	/* We may have raced with the firmware expiring the ROC instance at</div><div class='add'>+	 * this very moment. In that case, we can have a notification in the</div><div class='add'>+	 * async processing queue. However, none can arrive _after_ this as</div><div class='add'>+	 * ROC_CMD was sent synchronously, i.e. we waited for a response and</div><div class='add'>+	 * the firmware cannot refer to this ROC after the response. Thus,</div><div class='add'>+	 * if we just cancel the notification (if there's one) we'll be at a</div><div class='add'>+	 * clean state for any possible next ROC.</div><div class='add'>+	 */</div><div class='add'>+	iwl_mld_cancel_notifications_of_object(mld, IWL_MLD_OBJECT_TYPE_ROC,</div><div class='add'>+					       mld_vif-&gt;roc_activity);</div><div class='add'>+</div><div class='add'>+	iwl_mld_destroy_roc(mld, vif, mld_vif);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_roc_notif(struct iwl_mld *mld,</div><div class='add'>+			      struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_roc_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+	u32 activity = le32_to_cpu(notif-&gt;activity);</div><div class='add'>+	struct iwl_mld_vif *mld_vif;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+</div><div class='add'>+	vif = iwl_mld_find_roc_vif(mld, activity);</div><div class='add'>+	if (IWL_FW_CHECK(mld, !vif,</div><div class='add'>+			 "unexpected ROC notif from FW for activity %d\n",</div><div class='add'>+			 activity))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	/* It is possible that the ROC was canceled</div><div class='add'>+	 * but the notification was already fired.</div><div class='add'>+	 */</div><div class='add'>+	if (mld_vif-&gt;roc_activity != activity)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (le32_to_cpu(notif-&gt;success) &amp;&amp;</div><div class='add'>+	    le32_to_cpu(notif-&gt;started)) {</div><div class='add'>+		/* We had a successful start */</div><div class='add'>+		ieee80211_ready_on_channel(mld-&gt;hw);</div><div class='add'>+	} else {</div><div class='add'>+		/* ROC was not successful, tell the firmware to remove it */</div><div class='add'>+		if (le32_to_cpu(notif-&gt;started))</div><div class='add'>+			iwl_mld_cancel_roc(mld-&gt;hw, vif);</div><div class='add'>+		else</div><div class='add'>+			iwl_mld_destroy_roc(mld, vif, mld_vif);</div><div class='add'>+		/* we need to let know mac80211 about end OR</div><div class='add'>+		 * an unsuccessful start</div><div class='add'>+		 */</div><div class='add'>+		ieee80211_remain_on_channel_expired(mld-&gt;hw);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/roc.h b/drivers/net/wireless/intel/iwlwifi/mld/roc.h<br/>new file mode 100644<br/>index 000000000000..985d7f20a3d7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/roc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/roc.h</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_roc_h__</div><div class='add'>+#define __iwl_mld_roc_h__</div><div class='add'>+</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+int iwl_mld_start_roc(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		      struct ieee80211_channel *channel, int duration,</div><div class='add'>+		      enum ieee80211_roc_type type);</div><div class='add'>+</div><div class='add'>+int iwl_mld_cancel_roc(struct ieee80211_hw *hw,</div><div class='add'>+		       struct ieee80211_vif *vif);</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_roc_notif(struct iwl_mld *mld,</div><div class='add'>+			      struct iwl_rx_packet *pkt);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_roc_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/rx.c b/drivers/net/wireless/intel/iwlwifi/mld/rx.c<br/>new file mode 100644<br/>index 000000000000..6a76e3fcb581<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/rx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/rx.c</a></div><div class='hunk'>@@ -0,0 +1,2264 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+#include &lt;kunit/static_stub.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "sta.h"</div><div class='add'>+#include "agg.h"</div><div class='add'>+#include "rx.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+#include "iface.h"</div><div class='add'>+#include "time_sync.h"</div><div class='add'>+#include "fw/dbg.h"</div><div class='add'>+#include "fw/api/rx.h"</div><div class='add'>+</div><div class='add'>+/* stores relevant PHY data fields extracted from iwl_rx_mpdu_desc */</div><div class='add'>+struct iwl_mld_rx_phy_data {</div><div class='add'>+	struct iwl_rx_phy_air_sniffer_ntfy *ntfy;</div><div class='add'>+	bool first_subframe;</div><div class='add'>+	bool with_data;</div><div class='add'>+	u32 rate_n_flags;</div><div class='add'>+	u32 gp2_on_air_rise;</div><div class='add'>+	/* phy_info is only valid when we have a frame, i.e. with_data=true */</div><div class='add'>+	u16 phy_info;</div><div class='add'>+	u8 energy_a, energy_b;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_fill_phy_data_from_mpdu(struct iwl_mld *mld,</div><div class='add'>+				struct iwl_rx_mpdu_desc *desc,</div><div class='add'>+				struct iwl_mld_rx_phy_data *phy_data)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(mld-&gt;monitor.phy.valid)) {</div><div class='add'>+		mld-&gt;monitor.phy.used = true;</div><div class='add'>+		phy_data-&gt;ntfy = &amp;mld-&gt;monitor.phy.data;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	phy_data-&gt;phy_info = le16_to_cpu(desc-&gt;phy_info);</div><div class='add'>+	phy_data-&gt;rate_n_flags = iwl_v3_rate_from_v2_v3(desc-&gt;v3.rate_n_flags,</div><div class='add'>+							mld-&gt;fw_rates_ver_3);</div><div class='add'>+	phy_data-&gt;gp2_on_air_rise = le32_to_cpu(desc-&gt;v3.gp2_on_air_rise);</div><div class='add'>+	phy_data-&gt;energy_a = desc-&gt;v3.energy_a;</div><div class='add'>+	phy_data-&gt;energy_b = desc-&gt;v3.energy_b;</div><div class='add'>+	phy_data-&gt;with_data = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int iwl_mld_check_pn(struct iwl_mld *mld, struct sk_buff *skb,</div><div class='add'>+				   int queue, struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr = (void *)skb_mac_header(skb);</div><div class='add'>+	struct ieee80211_rx_status *stats = IEEE80211_SKB_RXCB(skb);</div><div class='add'>+	struct iwl_mld_sta *mld_sta;</div><div class='add'>+	struct iwl_mld_ptk_pn *ptk_pn;</div><div class='add'>+	int res;</div><div class='add'>+	u8 tid, keyidx;</div><div class='add'>+	u8 pn[IEEE80211_CCMP_PN_LEN];</div><div class='add'>+	u8 *extiv;</div><div class='add'>+</div><div class='add'>+	/* multicast and non-data only arrives on default queue; avoid checking</div><div class='add'>+	 * for default queue - we don't want to replicate all the logic that's</div><div class='add'>+	 * necessary for checking the PN on fragmented frames, leave that</div><div class='add'>+	 * to mac80211</div><div class='add'>+	 */</div><div class='add'>+	if (queue == 0 || !ieee80211_is_data(hdr-&gt;frame_control) ||</div><div class='add'>+	    is_multicast_ether_addr(hdr-&gt;addr1))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!(stats-&gt;flag &amp; RX_FLAG_DECRYPTED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* if we are here - this for sure is either CCMP or GCMP */</div><div class='add'>+	if (!sta) {</div><div class='add'>+		IWL_DEBUG_DROP(mld,</div><div class='add'>+			       "expected hw-decrypted unicast frame for station\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+</div><div class='add'>+	extiv = (u8 *)hdr + ieee80211_hdrlen(hdr-&gt;frame_control);</div><div class='add'>+	keyidx = extiv[3] &gt;&gt; 6;</div><div class='add'>+</div><div class='add'>+	ptk_pn = rcu_dereference(mld_sta-&gt;ptk_pn[keyidx]);</div><div class='add'>+	if (!ptk_pn)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_data_qos(hdr-&gt;frame_control))</div><div class='add'>+		tid = ieee80211_get_tid(hdr);</div><div class='add'>+	else</div><div class='add'>+		tid = 0;</div><div class='add'>+</div><div class='add'>+	/* we don't use HCCA/802.11 QoS TSPECs, so drop such frames */</div><div class='add'>+	if (tid &gt;= IWL_MAX_TID_COUNT)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/* load pn */</div><div class='add'>+	pn[0] = extiv[7];</div><div class='add'>+	pn[1] = extiv[6];</div><div class='add'>+	pn[2] = extiv[5];</div><div class='add'>+	pn[3] = extiv[4];</div><div class='add'>+	pn[4] = extiv[1];</div><div class='add'>+	pn[5] = extiv[0];</div><div class='add'>+</div><div class='add'>+	res = memcmp(pn, ptk_pn-&gt;q[queue].pn[tid], IEEE80211_CCMP_PN_LEN);</div><div class='add'>+	if (res &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+	if (!res &amp;&amp; !(stats-&gt;flag &amp; RX_FLAG_ALLOW_SAME_PN))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	memcpy(ptk_pn-&gt;q[queue].pn[tid], pn, IEEE80211_CCMP_PN_LEN);</div><div class='add'>+	stats-&gt;flag |= RX_FLAG_PN_VALIDATED;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* iwl_mld_pass_packet_to_mac80211 - passes the packet for mac80211 */</div><div class='add'>+void iwl_mld_pass_packet_to_mac80211(struct iwl_mld *mld,</div><div class='add'>+				     struct napi_struct *napi,</div><div class='add'>+				     struct sk_buff *skb, int queue,</div><div class='add'>+				     struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	KUNIT_STATIC_STUB_REDIRECT(iwl_mld_pass_packet_to_mac80211,</div><div class='add'>+				   mld, napi, skb, queue, sta);</div><div class='add'>+</div><div class='add'>+	if (unlikely(iwl_mld_check_pn(mld, skb, queue, sta))) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ieee80211_rx_napi(mld-&gt;hw, sta, skb, napi);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_mld_pass_packet_to_mac80211);</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_used_average_energy(struct iwl_mld *mld, int link_id,</div><div class='add'>+					struct ieee80211_hdr *hdr,</div><div class='add'>+					struct ieee80211_rx_status *rx_status)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct iwl_mld_link *mld_link;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!hdr || link_id &lt; 0))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (likely(!ieee80211_is_beacon(hdr-&gt;frame_control)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * if link ID is &gt;= valid ones then that means the RX</div><div class='add'>+	 * was on the AUX link and no correction is needed</div><div class='add'>+	 */</div><div class='add'>+	if (link_id &gt;= mld-&gt;fw-&gt;ucode_capa.num_links)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* for the link conf lookup */</div><div class='add'>+	guard(rcu)();</div><div class='add'>+</div><div class='add'>+	link_conf = rcu_dereference(mld-&gt;fw_id_to_bss_conf[link_id]);</div><div class='add'>+	if (!link_conf)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	mld_link = iwl_mld_link_from_mac80211(link_conf);</div><div class='add'>+	if (!mld_link)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we know the link by link ID then the frame was</div><div class='add'>+	 * received for the link, so by filtering it means it</div><div class='add'>+	 * was from the AP the link is connected to.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* skip also in case we don't have it (yet) */</div><div class='add'>+	if (!mld_link-&gt;average_beacon_energy)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_STATS(mld, "energy override by average %d\n",</div><div class='add'>+			mld_link-&gt;average_beacon_energy);</div><div class='add'>+	rx_status-&gt;signal = -mld_link-&gt;average_beacon_energy;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_fill_signal(struct iwl_mld *mld, int link_id,</div><div class='add'>+				struct ieee80211_hdr *hdr,</div><div class='add'>+				struct ieee80211_rx_status *rx_status,</div><div class='add'>+				struct iwl_mld_rx_phy_data *phy_data)</div><div class='add'>+{</div><div class='add'>+	u32 rate_n_flags = phy_data-&gt;rate_n_flags;</div><div class='add'>+	int energy_a = phy_data-&gt;energy_a;</div><div class='add'>+	int energy_b = phy_data-&gt;energy_b;</div><div class='add'>+	int max_energy;</div><div class='add'>+</div><div class='add'>+	energy_a = energy_a ? -energy_a : S8_MIN;</div><div class='add'>+	energy_b = energy_b ? -energy_b : S8_MIN;</div><div class='add'>+	max_energy = max(energy_a, energy_b);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_STATS(mld, "energy in A %d B %d, and max %d\n",</div><div class='add'>+			energy_a, energy_b, max_energy);</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_used_average_energy(mld, link_id, hdr, rx_status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rx_status-&gt;signal = max_energy;</div><div class='add'>+	rx_status-&gt;chains = u32_get_bits(rate_n_flags, RATE_MCS_ANT_AB_MSK);</div><div class='add'>+	rx_status-&gt;chain_signal[0] = energy_a;</div><div class='add'>+	rx_status-&gt;chain_signal[1] = energy_b;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_he_set_ru_alloc(struct ieee80211_rx_status *rx_status,</div><div class='add'>+			struct ieee80211_radiotap_he *he,</div><div class='add'>+			u8 ru_with_p80)</div><div class='add'>+{</div><div class='add'>+	u8 ru = ru_with_p80 &gt;&gt; 1;</div><div class='add'>+	u8 p80 = ru_with_p80 &amp; 1;</div><div class='add'>+	u8 offs = 0;</div><div class='add'>+</div><div class='add'>+	rx_status-&gt;bw = RATE_INFO_BW_HE_RU;</div><div class='add'>+</div><div class='add'>+	he-&gt;data1 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_BW_RU_ALLOC_KNOWN);</div><div class='add'>+	he-&gt;data2 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA2_PRISEC_80_KNOWN |</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA2_RU_OFFSET_KNOWN);</div><div class='add'>+</div><div class='add'>+	switch (ru) {</div><div class='add'>+	case 0 ... 36:</div><div class='add'>+		rx_status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_26;</div><div class='add'>+		offs = ru;</div><div class='add'>+		break;</div><div class='add'>+	case 37 ... 52:</div><div class='add'>+		rx_status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_52;</div><div class='add'>+		offs = ru - 37;</div><div class='add'>+		break;</div><div class='add'>+	case 53 ... 60:</div><div class='add'>+		rx_status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_106;</div><div class='add'>+		offs = ru - 53;</div><div class='add'>+		break;</div><div class='add'>+	case 61 ... 64:</div><div class='add'>+		rx_status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_242;</div><div class='add'>+		offs = ru - 61;</div><div class='add'>+		break;</div><div class='add'>+	case 65 ... 66:</div><div class='add'>+		rx_status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_484;</div><div class='add'>+		offs = ru - 65;</div><div class='add'>+		break;</div><div class='add'>+	case 67:</div><div class='add'>+		rx_status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_996;</div><div class='add'>+		break;</div><div class='add'>+	case 68:</div><div class='add'>+		rx_status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_2x996;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	he-&gt;data2 |= le16_encode_bits(offs,</div><div class='add'>+				      IEEE80211_RADIOTAP_HE_DATA2_RU_OFFSET);</div><div class='add'>+</div><div class='add'>+	he-&gt;data2 |= le16_encode_bits(p80, IEEE80211_RADIOTAP_HE_DATA2_PRISEC_80_SEC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define RTAP_ENC_HE(src, src_msk, dst_msk)			\</div><div class='add'>+	le16_encode_bits(le32_get_bits(src, src_msk), dst_msk)</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_decode_he_mu(struct iwl_mld_rx_phy_data *phy_data,</div><div class='add'>+		     struct ieee80211_radiotap_he *he,</div><div class='add'>+		     struct ieee80211_radiotap_he_mu *he_mu,</div><div class='add'>+		     struct ieee80211_rx_status *rx_status)</div><div class='add'>+{</div><div class='add'>+	u32 rate_n_flags = phy_data-&gt;rate_n_flags;</div><div class='add'>+</div><div class='add'>+	he_mu-&gt;flags1 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he.b,</div><div class='add'>+				     OFDM_RX_FRAME_HE_SIGB_DCM,</div><div class='add'>+				     IEEE80211_RADIOTAP_HE_MU_FLAGS1_SIG_B_DCM);</div><div class='add'>+	he_mu-&gt;flags1 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he.b,</div><div class='add'>+				     OFDM_RX_FRAME_HE_SIGB_MCS,</div><div class='add'>+				     IEEE80211_RADIOTAP_HE_MU_FLAGS1_SIG_B_MCS);</div><div class='add'>+	he_mu-&gt;flags2 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he.a1,</div><div class='add'>+				     OFDM_RX_FRAME_HE_PRMBL_PUNC_TYPE,</div><div class='add'>+				     IEEE80211_RADIOTAP_HE_MU_FLAGS2_PUNC_FROM_SIG_A_BW);</div><div class='add'>+	he_mu-&gt;flags2 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he.a2,</div><div class='add'>+				     OFDM_RX_FRAME_HE_MU_NUM_OF_SIGB_SYM_OR_USER_NUM,</div><div class='add'>+				     IEEE80211_RADIOTAP_HE_MU_FLAGS2_SIG_B_SYMS_USERS);</div><div class='add'>+	he_mu-&gt;flags2 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he.b,</div><div class='add'>+				     OFDM_RX_FRAME_HE_MU_SIGB_COMP,</div><div class='add'>+				     IEEE80211_RADIOTAP_HE_MU_FLAGS2_SIG_B_COMP);</div><div class='add'>+</div><div class='add'>+	if (phy_data-&gt;ntfy-&gt;flags &amp; IWL_SNIF_FLAG_VALID_RU &amp;&amp;</div><div class='add'>+	    le32_get_bits(phy_data-&gt;ntfy-&gt;sigs.he.cmn[2],</div><div class='add'>+			  OFDM_RX_FRAME_HE_COMMON_CC1_CRC_OK)) {</div><div class='add'>+		he_mu-&gt;flags1 |=</div><div class='add'>+			cpu_to_le16(IEEE80211_RADIOTAP_HE_MU_FLAGS1_CH1_RU_KNOWN |</div><div class='add'>+				    IEEE80211_RADIOTAP_HE_MU_FLAGS1_CH1_CTR_26T_RU_KNOWN);</div><div class='add'>+</div><div class='add'>+		he_mu-&gt;flags1 |=</div><div class='add'>+			RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he.cmn[2],</div><div class='add'>+				    OFDM_RX_FRAME_HE_CENTER_RU_CC1,</div><div class='add'>+				    IEEE80211_RADIOTAP_HE_MU_FLAGS1_CH1_CTR_26T_RU);</div><div class='add'>+</div><div class='add'>+		he_mu-&gt;ru_ch1[0] = le32_get_bits(phy_data-&gt;ntfy-&gt;sigs.he.cmn[0],</div><div class='add'>+						 OFDM_RX_FRAME_HE_RU_ALLOC_0_A1);</div><div class='add'>+		he_mu-&gt;ru_ch1[1] = le32_get_bits(phy_data-&gt;ntfy-&gt;sigs.he.cmn[1],</div><div class='add'>+						 OFDM_RX_FRAME_HE_RU_ALLOC_1_C1);</div><div class='add'>+		he_mu-&gt;ru_ch1[2] = le32_get_bits(phy_data-&gt;ntfy-&gt;sigs.he.cmn[0],</div><div class='add'>+						 OFDM_RX_FRAME_HE_RU_ALLOC_0_A2);</div><div class='add'>+		he_mu-&gt;ru_ch1[3] = le32_get_bits(phy_data-&gt;ntfy-&gt;sigs.he.cmn[1],</div><div class='add'>+						 OFDM_RX_FRAME_HE_RU_ALLOC_1_C2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (phy_data-&gt;ntfy-&gt;flags &amp; IWL_SNIF_FLAG_VALID_RU &amp;&amp;</div><div class='add'>+	    le32_get_bits(phy_data-&gt;ntfy-&gt;sigs.he.cmn[2],</div><div class='add'>+			  OFDM_RX_FRAME_HE_COMMON_CC2_CRC_OK) &amp;&amp;</div><div class='add'>+	    (rate_n_flags &amp; RATE_MCS_CHAN_WIDTH_MSK) != RATE_MCS_CHAN_WIDTH_20) {</div><div class='add'>+		he_mu-&gt;flags1 |=</div><div class='add'>+			cpu_to_le16(IEEE80211_RADIOTAP_HE_MU_FLAGS1_CH2_RU_KNOWN |</div><div class='add'>+				    IEEE80211_RADIOTAP_HE_MU_FLAGS1_CH2_CTR_26T_RU_KNOWN);</div><div class='add'>+</div><div class='add'>+		he_mu-&gt;flags2 |=</div><div class='add'>+			RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he.cmn[2],</div><div class='add'>+				    OFDM_RX_FRAME_HE_CENTER_RU_CC2,</div><div class='add'>+				    IEEE80211_RADIOTAP_HE_MU_FLAGS2_CH2_CTR_26T_RU);</div><div class='add'>+</div><div class='add'>+		he_mu-&gt;ru_ch2[0] = le32_get_bits(phy_data-&gt;ntfy-&gt;sigs.he.cmn[0],</div><div class='add'>+						 OFDM_RX_FRAME_HE_RU_ALLOC_0_B1);</div><div class='add'>+		he_mu-&gt;ru_ch2[1] = le32_get_bits(phy_data-&gt;ntfy-&gt;sigs.he.cmn[1],</div><div class='add'>+						 OFDM_RX_FRAME_HE_RU_ALLOC_1_D1);</div><div class='add'>+		he_mu-&gt;ru_ch2[2] = le32_get_bits(phy_data-&gt;ntfy-&gt;sigs.he.cmn[0],</div><div class='add'>+						 OFDM_RX_FRAME_HE_RU_ALLOC_0_B2);</div><div class='add'>+		he_mu-&gt;ru_ch2[3] = le32_get_bits(phy_data-&gt;ntfy-&gt;sigs.he.cmn[1],</div><div class='add'>+						 OFDM_RX_FRAME_HE_RU_ALLOC_1_D2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define CHECK_BW(bw) \</div><div class='add'>+	BUILD_BUG_ON(IEEE80211_RADIOTAP_HE_MU_FLAGS2_BW_FROM_SIG_A_BW_ ## bw ## MHZ != \</div><div class='add'>+		     RATE_MCS_CHAN_WIDTH_##bw &gt;&gt; RATE_MCS_CHAN_WIDTH_POS)</div><div class='add'>+	CHECK_BW(20);</div><div class='add'>+	CHECK_BW(40);</div><div class='add'>+	CHECK_BW(80);</div><div class='add'>+	CHECK_BW(160);</div><div class='add'>+#undef CHECK_BW</div><div class='add'>+</div><div class='add'>+	he_mu-&gt;flags2 |=</div><div class='add'>+		le16_encode_bits(u32_get_bits(rate_n_flags, RATE_MCS_CHAN_WIDTH_MSK),</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_MU_FLAGS2_BW_FROM_SIG_A_BW);</div><div class='add'>+</div><div class='add'>+	iwl_mld_he_set_ru_alloc(rx_status, he,</div><div class='add'>+				le32_get_bits(phy_data-&gt;ntfy-&gt;sigs.he.b,</div><div class='add'>+					      OFDM_RX_FRAME_HE_SIGB_STA_RU));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_decode_he_tb_phy_data(struct iwl_mld_rx_phy_data *phy_data,</div><div class='add'>+			      struct ieee80211_radiotap_he *he,</div><div class='add'>+			      struct ieee80211_rx_status *rx_status)</div><div class='add'>+{</div><div class='add'>+	u32 rate_n_flags = phy_data-&gt;rate_n_flags;</div><div class='add'>+	u32 nsts;</div><div class='add'>+</div><div class='add'>+	he-&gt;data1 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_BSS_COLOR_KNOWN |</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA1_SPTL_REUSE_KNOWN |</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA1_SPTL_REUSE2_KNOWN |</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA1_SPTL_REUSE3_KNOWN |</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA1_SPTL_REUSE4_KNOWN);</div><div class='add'>+</div><div class='add'>+	he-&gt;data4 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he_tb.a1,</div><div class='add'>+				 OFDM_RX_HE_TRIG_SPATIAL_REUSE_1,</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA4_TB_SPTL_REUSE1);</div><div class='add'>+	he-&gt;data4 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he_tb.a1,</div><div class='add'>+				 OFDM_RX_HE_TRIG_SPATIAL_REUSE_2,</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA4_TB_SPTL_REUSE2);</div><div class='add'>+	he-&gt;data4 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he_tb.a1,</div><div class='add'>+				 OFDM_RX_HE_TRIG_SPATIAL_REUSE_3,</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA4_TB_SPTL_REUSE3);</div><div class='add'>+	he-&gt;data4 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he_tb.a1,</div><div class='add'>+				 OFDM_RX_HE_TRIG_SPATIAL_REUSE_4,</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA4_TB_SPTL_REUSE4);</div><div class='add'>+	he-&gt;data3 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he_tb.a1,</div><div class='add'>+				 OFDM_RX_HE_TRIG_BSS_COLOR,</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA3_BSS_COLOR);</div><div class='add'>+</div><div class='add'>+#define CHECK_BW(bw) \</div><div class='add'>+	BUILD_BUG_ON(IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_ ## bw ## MHZ != \</div><div class='add'>+		     RATE_MCS_CHAN_WIDTH_##bw &gt;&gt; RATE_MCS_CHAN_WIDTH_POS)</div><div class='add'>+	CHECK_BW(20);</div><div class='add'>+	CHECK_BW(40);</div><div class='add'>+	CHECK_BW(80);</div><div class='add'>+	CHECK_BW(160);</div><div class='add'>+#undef CHECK_BW</div><div class='add'>+</div><div class='add'>+	he-&gt;data6 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_KNOWN) |</div><div class='add'>+		     le16_encode_bits(u32_get_bits(rate_n_flags, RATE_MCS_CHAN_WIDTH_MSK),</div><div class='add'>+				      IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW);</div><div class='add'>+</div><div class='add'>+	if (!(phy_data-&gt;ntfy-&gt;flags &amp; IWL_SNIF_FLAG_VALID_TB_RX))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	he-&gt;data1 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_LDPC_XSYMSEG_KNOWN |</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA1_DOPPLER_KNOWN);</div><div class='add'>+	he-&gt;data2 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA2_PRE_FEC_PAD_KNOWN |</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA2_PE_DISAMBIG_KNOWN |</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA2_TXOP_KNOWN |</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA2_NUM_LTF_SYMS_KNOWN);</div><div class='add'>+</div><div class='add'>+	he-&gt;data3 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he_tb.tb_rx1,</div><div class='add'>+				 OFDM_UCODE_TRIG_BASE_RX_CODING_EXTRA_SYM,</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA3_LDPC_XSYMSEG);</div><div class='add'>+	he-&gt;data6 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he_tb.tb_rx1,</div><div class='add'>+				 OFDM_UCODE_TRIG_BASE_RX_DOPPLER,</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA6_DOPPLER);</div><div class='add'>+	he-&gt;data5 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he_tb.tb_rx1,</div><div class='add'>+				 OFDM_UCODE_TRIG_BASE_RX_PRE_FEC_PAD_FACTOR,</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA5_PRE_FEC_PAD);</div><div class='add'>+	he-&gt;data5 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he_tb.tb_rx1,</div><div class='add'>+				 OFDM_UCODE_TRIG_BASE_RX_PE_DISAMBIG,</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA5_PE_DISAMBIG);</div><div class='add'>+	he-&gt;data5 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he_tb.tb_rx1,</div><div class='add'>+				 OFDM_UCODE_TRIG_BASE_RX_NUM_OF_LTF_SYM,</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA5_NUM_LTF_SYMS);</div><div class='add'>+	he-&gt;data6 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he_tb.a2,</div><div class='add'>+				 OFDM_RX_HE_TRIG_TXOP_DURATION,</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA6_TXOP);</div><div class='add'>+</div><div class='add'>+	iwl_mld_he_set_ru_alloc(rx_status, he,</div><div class='add'>+				le32_get_bits(phy_data-&gt;ntfy-&gt;sigs.he_tb.tb_rx1,</div><div class='add'>+					      OFDM_UCODE_TRIG_BASE_RX_RU));</div><div class='add'>+</div><div class='add'>+	nsts = le32_get_bits(phy_data-&gt;ntfy-&gt;sigs.he_tb.tb_rx1,</div><div class='add'>+			     OFDM_UCODE_TRIG_BASE_RX_NSTS) + 1;</div><div class='add'>+	rx_status-&gt;nss = nsts &gt;&gt; !!(rate_n_flags &amp; RATE_MCS_STBC_MSK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_decode_he_phy_data(struct iwl_mld_rx_phy_data *phy_data,</div><div class='add'>+			   struct ieee80211_radiotap_he *he,</div><div class='add'>+			   struct ieee80211_radiotap_he_mu *he_mu,</div><div class='add'>+			   struct ieee80211_rx_status *rx_status)</div><div class='add'>+{</div><div class='add'>+	u32 rate_n_flags = phy_data-&gt;rate_n_flags;</div><div class='add'>+	u32 he_type = rate_n_flags &amp; RATE_MCS_HE_TYPE_MSK;</div><div class='add'>+	u32 nsts;</div><div class='add'>+</div><div class='add'>+	switch (he_type) {</div><div class='add'>+	case RATE_MCS_HE_TYPE_TRIG:</div><div class='add'>+		iwl_mld_decode_he_tb_phy_data(phy_data, he, rx_status);</div><div class='add'>+		/* that's it, below is only for SU/MU */</div><div class='add'>+		return;</div><div class='add'>+	case RATE_MCS_HE_TYPE_MU:</div><div class='add'>+		iwl_mld_decode_he_mu(phy_data, he, he_mu, rx_status);</div><div class='add'>+</div><div class='add'>+		nsts = le32_get_bits(phy_data-&gt;ntfy-&gt;sigs.he.b,</div><div class='add'>+				     OFDM_RX_FRAME_HE_SIGB_NSTS) + 1;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_HE_TYPE_SU:</div><div class='add'>+	case RATE_MCS_HE_TYPE_EXT_SU:</div><div class='add'>+		he-&gt;data1 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_BEAM_CHANGE_KNOWN);</div><div class='add'>+		he-&gt;data3 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he.a1,</div><div class='add'>+					 OFDM_RX_FRAME_HE_BEAM_CHANGE,</div><div class='add'>+					 IEEE80211_RADIOTAP_HE_DATA3_BEAM_CHANGE);</div><div class='add'>+</div><div class='add'>+		nsts = le32_get_bits(phy_data-&gt;ntfy-&gt;sigs.he.a1,</div><div class='add'>+				     OFDM_RX_FRAME_HE_NSTS) + 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_status-&gt;nss = nsts &gt;&gt; !!(rate_n_flags &amp; RATE_MCS_STBC_MSK);</div><div class='add'>+</div><div class='add'>+	he-&gt;data1 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_LDPC_XSYMSEG_KNOWN |</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA1_DOPPLER_KNOWN);</div><div class='add'>+	he-&gt;data2 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA2_PRE_FEC_PAD_KNOWN |</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA2_PE_DISAMBIG_KNOWN |</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA2_TXOP_KNOWN |</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA2_NUM_LTF_SYMS_KNOWN);</div><div class='add'>+</div><div class='add'>+	he-&gt;data3 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he.a2,</div><div class='add'>+				 OFDM_RX_FRAME_HE_CODING_EXTRA_SYM,</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA3_LDPC_XSYMSEG);</div><div class='add'>+	he-&gt;data5 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he.a2,</div><div class='add'>+				 OFDM_RX_FRAME_HE_PRE_FEC_PAD_FACTOR,</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA5_PRE_FEC_PAD);</div><div class='add'>+	he-&gt;data5 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he.a2,</div><div class='add'>+				 OFDM_RX_FRAME_HE_PE_DISAMBIG,</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA5_PE_DISAMBIG);</div><div class='add'>+	he-&gt;data5 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he.a2,</div><div class='add'>+				 OFDM_RX_FRAME_HE_MU_NUM_OF_LTF_SYM,</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA5_NUM_LTF_SYMS);</div><div class='add'>+	he-&gt;data6 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he.a2,</div><div class='add'>+				 OFDM_RX_FRAME_HE_TXOP_DURATION,</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA6_TXOP);</div><div class='add'>+	he-&gt;data6 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he.a2,</div><div class='add'>+				 OFDM_RX_FRAME_HE_DOPPLER,</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA6_DOPPLER);</div><div class='add'>+</div><div class='add'>+	he-&gt;data1 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_UL_DL_KNOWN |</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA1_BSS_COLOR_KNOWN |</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA1_SPTL_REUSE_KNOWN);</div><div class='add'>+</div><div class='add'>+	he-&gt;data3 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he.a1,</div><div class='add'>+				 OFDM_RX_FRAME_HE_BSS_COLOR,</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA3_BSS_COLOR);</div><div class='add'>+	he-&gt;data3 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he.a1,</div><div class='add'>+				 OFDM_RX_FRAME_HE_UL_FLAG,</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA3_UL_DL);</div><div class='add'>+	he-&gt;data4 |= RTAP_ENC_HE(phy_data-&gt;ntfy-&gt;sigs.he.a1,</div><div class='add'>+				 OFDM_RX_FRAME_HE_SPATIAL_REUSE,</div><div class='add'>+				 IEEE80211_RADIOTAP_HE_DATA4_SU_MU_SPTL_REUSE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_rx_he(struct sk_buff *skb,</div><div class='add'>+			  struct iwl_mld_rx_phy_data *phy_data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);</div><div class='add'>+	struct ieee80211_radiotap_he *he = NULL;</div><div class='add'>+	struct ieee80211_radiotap_he_mu *he_mu = NULL;</div><div class='add'>+	u32 rate_n_flags = phy_data-&gt;rate_n_flags;</div><div class='add'>+	u32 he_type = rate_n_flags &amp; RATE_MCS_HE_TYPE_MSK;</div><div class='add'>+	u8 ltf;</div><div class='add'>+	static const struct ieee80211_radiotap_he known = {</div><div class='add'>+		.data1 = cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_DATA_MCS_KNOWN |</div><div class='add'>+				     IEEE80211_RADIOTAP_HE_DATA1_DATA_DCM_KNOWN |</div><div class='add'>+				     IEEE80211_RADIOTAP_HE_DATA1_STBC_KNOWN	|</div><div class='add'>+				     IEEE80211_RADIOTAP_HE_DATA1_CODING_KNOWN),</div><div class='add'>+		.data2 = cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA2_GI_KNOWN |</div><div class='add'>+				     IEEE80211_RADIOTAP_HE_DATA2_TXBF_KNOWN),</div><div class='add'>+	};</div><div class='add'>+	static const struct ieee80211_radiotap_he_mu mu_known = {</div><div class='add'>+		.flags1 = cpu_to_le16(IEEE80211_RADIOTAP_HE_MU_FLAGS1_SIG_B_MCS_KNOWN |</div><div class='add'>+				      IEEE80211_RADIOTAP_HE_MU_FLAGS1_SIG_B_DCM_KNOWN |</div><div class='add'>+				      IEEE80211_RADIOTAP_HE_MU_FLAGS1_SIG_B_SYMS_USERS_KNOWN |</div><div class='add'>+				      IEEE80211_RADIOTAP_HE_MU_FLAGS1_SIG_B_COMP_KNOWN),</div><div class='add'>+		.flags2 = cpu_to_le16(IEEE80211_RADIOTAP_HE_MU_FLAGS2_PUNC_FROM_SIG_A_BW_KNOWN |</div><div class='add'>+				      IEEE80211_RADIOTAP_HE_MU_FLAGS2_BW_FROM_SIG_A_BW_KNOWN),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	he = skb_put_data(skb, &amp;known, sizeof(known));</div><div class='add'>+	rx_status-&gt;flag |= RX_FLAG_RADIOTAP_HE;</div><div class='add'>+</div><div class='add'>+	switch (he_type) {</div><div class='add'>+	case RATE_MCS_HE_TYPE_EXT_SU:</div><div class='add'>+		/*</div><div class='add'>+		 * Except for this special case we won't have</div><div class='add'>+		 * HE RU allocation info outside of monitor mode</div><div class='add'>+		 * since we don't get the PHY notif.</div><div class='add'>+		 */</div><div class='add'>+		if (rate_n_flags &amp; RATE_MCS_HE_106T_MSK) {</div><div class='add'>+			rx_status-&gt;bw = RATE_INFO_BW_HE_RU;</div><div class='add'>+			rx_status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_106;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='add'>+	case RATE_MCS_HE_TYPE_SU:</div><div class='add'>+		/* actual data is filled in mac80211 */</div><div class='add'>+		he-&gt;data1 |=</div><div class='add'>+			cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_BW_RU_ALLOC_KNOWN);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define CHECK_TYPE(F)							\</div><div class='add'>+	BUILD_BUG_ON(IEEE80211_RADIOTAP_HE_DATA1_FORMAT_ ## F !=	\</div><div class='add'>+		     (RATE_MCS_HE_TYPE_ ## F &gt;&gt; RATE_MCS_HE_TYPE_POS))</div><div class='add'>+</div><div class='add'>+	CHECK_TYPE(SU);</div><div class='add'>+	CHECK_TYPE(EXT_SU);</div><div class='add'>+	CHECK_TYPE(MU);</div><div class='add'>+	CHECK_TYPE(TRIG);</div><div class='add'>+</div><div class='add'>+	he-&gt;data1 |= cpu_to_le16(he_type &gt;&gt; RATE_MCS_HE_TYPE_POS);</div><div class='add'>+</div><div class='add'>+	if (rate_n_flags &amp; RATE_MCS_BF_MSK)</div><div class='add'>+		he-&gt;data5 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA5_TXBF);</div><div class='add'>+</div><div class='add'>+	switch (u32_get_bits(rate_n_flags, RATE_MCS_HE_GI_LTF_MSK)) {</div><div class='add'>+	case 0:</div><div class='add'>+		if (he_type == RATE_MCS_HE_TYPE_TRIG)</div><div class='add'>+			rx_status-&gt;he_gi = NL80211_RATE_INFO_HE_GI_1_6;</div><div class='add'>+		else</div><div class='add'>+			rx_status-&gt;he_gi = NL80211_RATE_INFO_HE_GI_0_8;</div><div class='add'>+		if (he_type == RATE_MCS_HE_TYPE_MU)</div><div class='add'>+			ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_4X;</div><div class='add'>+		else</div><div class='add'>+			ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_1X;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		if (he_type == RATE_MCS_HE_TYPE_TRIG)</div><div class='add'>+			rx_status-&gt;he_gi = NL80211_RATE_INFO_HE_GI_1_6;</div><div class='add'>+		else</div><div class='add'>+			rx_status-&gt;he_gi = NL80211_RATE_INFO_HE_GI_0_8;</div><div class='add'>+		ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_2X;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		if (he_type == RATE_MCS_HE_TYPE_TRIG) {</div><div class='add'>+			rx_status-&gt;he_gi = NL80211_RATE_INFO_HE_GI_3_2;</div><div class='add'>+			ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_4X;</div><div class='add'>+		} else {</div><div class='add'>+			rx_status-&gt;he_gi = NL80211_RATE_INFO_HE_GI_1_6;</div><div class='add'>+			ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_2X;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		rx_status-&gt;he_gi = NL80211_RATE_INFO_HE_GI_3_2;</div><div class='add'>+		ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_4X;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		rx_status-&gt;he_gi = NL80211_RATE_INFO_HE_GI_0_8;</div><div class='add'>+		ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_4X;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_UNKNOWN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	he-&gt;data5 |= le16_encode_bits(ltf,</div><div class='add'>+				      IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE);</div><div class='add'>+</div><div class='add'>+	if (likely(!phy_data-&gt;ntfy))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (he_type == RATE_MCS_HE_TYPE_MU) {</div><div class='add'>+		he_mu = skb_put_data(skb, &amp;mu_known, sizeof(mu_known));</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_RADIOTAP_HE_MU;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mld_decode_he_phy_data(phy_data, he, he_mu, rx_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_decode_lsig(struct sk_buff *skb,</div><div class='add'>+				struct iwl_mld_rx_phy_data *phy_data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);</div><div class='add'>+	u32 format = phy_data-&gt;rate_n_flags &amp; RATE_MCS_MOD_TYPE_MSK;</div><div class='add'>+	struct ieee80211_radiotap_lsig *lsig;</div><div class='add'>+	u32 lsig_len, rate;</div><div class='add'>+</div><div class='add'>+	if (likely(!phy_data-&gt;ntfy))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Technically legacy CCK/OFDM frames don't have an L-SIG</div><div class='add'>+	 * since that's the compat format for HT (non-greenfield)</div><div class='add'>+	 * and up. However, it's meant to be compatible with the</div><div class='add'>+	 * LENGTH and RATE fields in Clause 17 and 18 OFDM frames</div><div class='add'>+	 * so include the field for any non-CCK frame. For CCK it</div><div class='add'>+	 * cannot work, since the LENGTH field for them is 16-bit</div><div class='add'>+	 * and the radiotap field only has 12 bits.</div><div class='add'>+	 */</div><div class='add'>+	if (format == RATE_MCS_MOD_TYPE_CCK)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	lsig_len = le32_get_bits(phy_data-&gt;ntfy-&gt;legacy_sig.ofdm,</div><div class='add'>+				 OFDM_RX_LEGACY_LENGTH);</div><div class='add'>+	rate = le32_get_bits(phy_data-&gt;ntfy-&gt;legacy_sig.ofdm, OFDM_RX_RATE);</div><div class='add'>+</div><div class='add'>+	lsig = skb_put(skb, sizeof(*lsig));</div><div class='add'>+	lsig-&gt;data1 = cpu_to_le16(IEEE80211_RADIOTAP_LSIG_DATA1_LENGTH_KNOWN) |</div><div class='add'>+		      cpu_to_le16(IEEE80211_RADIOTAP_LSIG_DATA1_RATE_KNOWN);</div><div class='add'>+	lsig-&gt;data2 = le16_encode_bits(lsig_len,</div><div class='add'>+				       IEEE80211_RADIOTAP_LSIG_DATA2_LENGTH) |</div><div class='add'>+		      le16_encode_bits(rate, IEEE80211_RADIOTAP_LSIG_DATA2_RATE);</div><div class='add'>+	rx_status-&gt;flag |= RX_FLAG_RADIOTAP_LSIG;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Put a TLV on the skb and return data pointer</div><div class='add'>+ *</div><div class='add'>+ * Also pad the len to 4 and zero out all data part</div><div class='add'>+ */</div><div class='add'>+static void *</div><div class='add'>+iwl_mld_radiotap_put_tlv(struct sk_buff *skb, u16 type, u16 len)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_radiotap_tlv *tlv;</div><div class='add'>+</div><div class='add'>+	tlv = skb_put(skb, sizeof(*tlv));</div><div class='add'>+	tlv-&gt;type = cpu_to_le16(type);</div><div class='add'>+	tlv-&gt;len = cpu_to_le16(len);</div><div class='add'>+	return skb_put_zero(skb, ALIGN(len, 4));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define LE32_DEC_ENC(value, dec_bits, enc_bits) \</div><div class='add'>+	le32_encode_bits(le32_get_bits(value, dec_bits), enc_bits)</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_ENC_USIG_VALUE_MASK(usig, in_value, dec_bits, enc_bits) do { \</div><div class='add'>+	typeof(enc_bits) _enc_bits = enc_bits; \</div><div class='add'>+	typeof(usig) _usig = usig; \</div><div class='add'>+	(_usig)-&gt;mask |= cpu_to_le32(_enc_bits); \</div><div class='add'>+	(_usig)-&gt;value |= LE32_DEC_ENC(in_value, dec_bits, _enc_bits); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+static void iwl_mld_decode_eht_usig_tb(struct iwl_mld_rx_phy_data *phy_data,</div><div class='add'>+				       struct ieee80211_radiotap_eht_usig *usig)</div><div class='add'>+{</div><div class='add'>+	__le32 usig_a1 = phy_data-&gt;ntfy-&gt;sigs.eht_tb.usig_a1;</div><div class='add'>+	__le32 usig_a2 = phy_data-&gt;ntfy-&gt;sigs.eht_tb.usig_a2_eht;</div><div class='add'>+</div><div class='add'>+	IWL_MLD_ENC_USIG_VALUE_MASK(usig, usig_a1,</div><div class='add'>+				    OFDM_RX_FRAME_EHT_USIG1_DISREGARD,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USIG1_TB_B20_B25_DISREGARD);</div><div class='add'>+	IWL_MLD_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+				    OFDM_RX_FRAME_EHT_PPDU_TYPE,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USIG2_TB_B0_B1_PPDU_TYPE);</div><div class='add'>+	IWL_MLD_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+				    OFDM_RX_FRAME_EHT_USIG2_VALIDATE_B2,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USIG2_TB_B2_VALIDATE);</div><div class='add'>+	IWL_MLD_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+				    OFDM_RX_FRAME_EHT_TRIG_SPATIAL_REUSE_1,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USIG2_TB_B3_B6_SPATIAL_REUSE_1);</div><div class='add'>+	IWL_MLD_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+				    OFDM_RX_FRAME_EHT_TRIG_SPATIAL_REUSE_2,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USIG2_TB_B7_B10_SPATIAL_REUSE_2);</div><div class='add'>+	IWL_MLD_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+				    OFDM_RX_FRAME_EHT_TRIG_USIG2_DISREGARD,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USIG2_TB_B11_B15_DISREGARD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_decode_eht_usig_non_tb(struct iwl_mld_rx_phy_data *phy_data,</div><div class='add'>+					   struct ieee80211_radiotap_eht_usig *usig)</div><div class='add'>+{</div><div class='add'>+	__le32 usig_a1 = phy_data-&gt;ntfy-&gt;sigs.eht.usig_a1;</div><div class='add'>+	__le32 usig_a2 = phy_data-&gt;ntfy-&gt;sigs.eht.usig_a2_eht;</div><div class='add'>+</div><div class='add'>+	IWL_MLD_ENC_USIG_VALUE_MASK(usig, usig_a1,</div><div class='add'>+				    OFDM_RX_FRAME_EHT_USIG1_DISREGARD,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USIG1_MU_B20_B24_DISREGARD);</div><div class='add'>+	IWL_MLD_ENC_USIG_VALUE_MASK(usig, usig_a1,</div><div class='add'>+				    OFDM_RX_FRAME_EHT_USIG1_VALIDATE,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USIG1_MU_B25_VALIDATE);</div><div class='add'>+	IWL_MLD_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+				    OFDM_RX_FRAME_EHT_PPDU_TYPE,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USIG2_MU_B0_B1_PPDU_TYPE);</div><div class='add'>+	IWL_MLD_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+				    OFDM_RX_FRAME_EHT_USIG2_VALIDATE_B2,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USIG2_MU_B2_VALIDATE);</div><div class='add'>+	IWL_MLD_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+				    OFDM_RX_FRAME_EHT_PUNC_CHANNEL,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USIG2_MU_B3_B7_PUNCTURED_INFO);</div><div class='add'>+	IWL_MLD_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+				    OFDM_RX_FRAME_EHT_USIG2_VALIDATE_B8,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USIG2_MU_B8_VALIDATE);</div><div class='add'>+	IWL_MLD_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+				    OFDM_RX_FRAME_EHT_SIG_MCS,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USIG2_MU_B9_B10_SIG_MCS);</div><div class='add'>+	IWL_MLD_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+				    OFDM_RX_FRAME_EHT_SIG_SYM_NUM,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USIG2_MU_B11_B15_EHT_SIG_SYMBOLS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_decode_eht_usig(struct iwl_mld_rx_phy_data *phy_data,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	u32 he_type = phy_data-&gt;rate_n_flags &amp; RATE_MCS_HE_TYPE_MSK;</div><div class='add'>+	__le32 usig_a1 = phy_data-&gt;ntfy-&gt;sigs.eht.usig_a1;</div><div class='add'>+	__le32 usig_a2 = phy_data-&gt;ntfy-&gt;sigs.eht.usig_a2_eht;</div><div class='add'>+	struct ieee80211_radiotap_eht_usig *usig;</div><div class='add'>+	u32 bw;</div><div class='add'>+</div><div class='add'>+	usig = iwl_mld_radiotap_put_tlv(skb, IEEE80211_RADIOTAP_EHT_USIG,</div><div class='add'>+					sizeof(*usig));</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(offsetof(union iwl_sigs, eht.usig_a1) !=</div><div class='add'>+		     offsetof(union iwl_sigs, eht_tb.usig_a1));</div><div class='add'>+	BUILD_BUG_ON(offsetof(union iwl_sigs, eht.usig_a2_eht) !=</div><div class='add'>+		     offsetof(union iwl_sigs, eht_tb.usig_a2_eht));</div><div class='add'>+</div><div class='add'>+	usig-&gt;common |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_USIG_COMMON_UL_DL_KNOWN |</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USIG_COMMON_BSS_COLOR_KNOWN |</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USIG_COMMON_VALIDATE_BITS_CHECKED |</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_KNOWN |</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USIG_COMMON_TXOP_KNOWN);</div><div class='add'>+</div><div class='add'>+#define CHECK_BW(bw) \</div><div class='add'>+	BUILD_BUG_ON(IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_ ## bw ## MHZ != \</div><div class='add'>+		     RATE_MCS_CHAN_WIDTH_ ## bw ## _VAL)</div><div class='add'>+	CHECK_BW(20);</div><div class='add'>+	CHECK_BW(40);</div><div class='add'>+	CHECK_BW(80);</div><div class='add'>+	CHECK_BW(160);</div><div class='add'>+#undef CHECK_BW</div><div class='add'>+	BUILD_BUG_ON(IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_320MHZ_1 !=</div><div class='add'>+		     RATE_MCS_CHAN_WIDTH_320_VAL);</div><div class='add'>+	bw = u32_get_bits(phy_data-&gt;rate_n_flags, RATE_MCS_CHAN_WIDTH_MSK);</div><div class='add'>+	/* specific handling for 320MHz-1/320MHz-2 */</div><div class='add'>+	if (bw == RATE_MCS_CHAN_WIDTH_320_VAL)</div><div class='add'>+		bw += le32_get_bits(usig_a1, OFDM_RX_FRAME_EHT_BW320_SLOT);</div><div class='add'>+	usig-&gt;common |= le32_encode_bits(bw,</div><div class='add'>+					 IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW);</div><div class='add'>+</div><div class='add'>+	usig-&gt;common |= LE32_DEC_ENC(usig_a1, OFDM_RX_FRAME_ENHANCED_WIFI_UL_FLAG,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_USIG_COMMON_UL_DL);</div><div class='add'>+	usig-&gt;common |= LE32_DEC_ENC(usig_a1, OFDM_RX_FRAME_ENHANCED_WIFI_BSS_COLOR,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_USIG_COMMON_BSS_COLOR);</div><div class='add'>+</div><div class='add'>+	if (le32_get_bits(usig_a1, OFDM_RX_FRAME_EHT_USIG1_VALIDATE) &amp;&amp;</div><div class='add'>+	    le32_get_bits(usig_a2, OFDM_RX_FRAME_EHT_USIG2_VALIDATE_B2) &amp;&amp;</div><div class='add'>+	    le32_get_bits(usig_a2, OFDM_RX_FRAME_EHT_USIG2_VALIDATE_B8))</div><div class='add'>+		usig-&gt;common |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_USIG_COMMON_VALIDATE_BITS_OK);</div><div class='add'>+</div><div class='add'>+	usig-&gt;common |= LE32_DEC_ENC(usig_a1,</div><div class='add'>+				     OFDM_RX_FRAME_ENHANCED_WIFI_TXOP_DURATION,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_USIG_COMMON_TXOP);</div><div class='add'>+</div><div class='add'>+	if (!le32_get_bits(usig_a2, OFDM_RX_USIG_CRC_OK))</div><div class='add'>+		usig-&gt;common |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_USIG_COMMON_BAD_USIG_CRC);</div><div class='add'>+</div><div class='add'>+	usig-&gt;common |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_USIG_COMMON_PHY_VER_KNOWN);</div><div class='add'>+	usig-&gt;common |= LE32_DEC_ENC(usig_a1,</div><div class='add'>+				     OFDM_RX_FRAME_ENHANCED_WIFI_VER_ID,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_USIG_COMMON_PHY_VER);</div><div class='add'>+</div><div class='add'>+	if (he_type == RATE_MCS_HE_TYPE_TRIG)</div><div class='add'>+		iwl_mld_decode_eht_usig_tb(phy_data, usig);</div><div class='add'>+	else</div><div class='add'>+		iwl_mld_decode_eht_usig_non_tb(phy_data, usig);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_eht_set_ru_alloc(struct ieee80211_rx_status *rx_status,</div><div class='add'>+			 u32 ru_with_p80)</div><div class='add'>+{</div><div class='add'>+	enum nl80211_eht_ru_alloc nl_ru;</div><div class='add'>+	u32 ru = ru_with_p80 &gt;&gt; 1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * HW always uses trigger frame format:</div><div class='add'>+	 *</div><div class='add'>+	 * Draft PIEEE802.11be D7.0 Table 9-46l - Encoding of the PS160 and</div><div class='add'>+	 * RU Allocation subfields in an EHT variant User Info field</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	switch (ru) {</div><div class='add'>+	case 0 ... 36:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_26;</div><div class='add'>+		break;</div><div class='add'>+	case 37 ... 52:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_52;</div><div class='add'>+		break;</div><div class='add'>+	case 53 ... 60:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_106;</div><div class='add'>+		break;</div><div class='add'>+	case 61 ... 64:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_242;</div><div class='add'>+		break;</div><div class='add'>+	case 65 ... 66:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_484;</div><div class='add'>+		break;</div><div class='add'>+	case 67:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_996;</div><div class='add'>+		break;</div><div class='add'>+	case 68:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_2x996;</div><div class='add'>+		break;</div><div class='add'>+	case 69:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_4x996;</div><div class='add'>+		break;</div><div class='add'>+	case 70 ... 81:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_52P26;</div><div class='add'>+		break;</div><div class='add'>+	case 82 ... 89:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_106P26;</div><div class='add'>+		break;</div><div class='add'>+	case 90 ... 93:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_484P242;</div><div class='add'>+		break;</div><div class='add'>+	case 94 ... 95:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_996P484;</div><div class='add'>+		break;</div><div class='add'>+	case 96 ... 99:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_996P484P242;</div><div class='add'>+		break;</div><div class='add'>+	case 100 ... 103:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_2x996P484;</div><div class='add'>+		break;</div><div class='add'>+	case 104:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_3x996;</div><div class='add'>+		break;</div><div class='add'>+	case 105 ... 106:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_3x996P484;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_status-&gt;bw = RATE_INFO_BW_EHT_RU;</div><div class='add'>+	rx_status-&gt;eht.ru = nl_ru;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_decode_eht_tb(struct iwl_mld_rx_phy_data *phy_data,</div><div class='add'>+				  struct ieee80211_rx_status *rx_status,</div><div class='add'>+				  struct ieee80211_radiotap_eht *eht)</div><div class='add'>+{</div><div class='add'>+	if (!(phy_data-&gt;ntfy-&gt;flags &amp; IWL_SNIF_FLAG_VALID_TB_RX))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	eht-&gt;known |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_KNOWN_RU_ALLOC_TB_FMT |</div><div class='add'>+				  IEEE80211_RADIOTAP_EHT_KNOWN_LDPC_EXTRA_SYM_OM |</div><div class='add'>+				  IEEE80211_RADIOTAP_EHT_KNOWN_PRE_PADD_FACOR_OM |</div><div class='add'>+				  IEEE80211_RADIOTAP_EHT_KNOWN_PE_DISAMBIGUITY_OM |</div><div class='add'>+				  IEEE80211_RADIOTAP_EHT_KNOWN_EHT_LTF |</div><div class='add'>+				  IEEE80211_RADIOTAP_EHT_KNOWN_PRIMARY_80);</div><div class='add'>+</div><div class='add'>+	eht-&gt;data[8] |= LE32_DEC_ENC(phy_data-&gt;ntfy-&gt;sigs.eht_tb.tb_rx0,</div><div class='add'>+				     OFDM_UCODE_TRIG_BASE_PS160,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_PS_160);</div><div class='add'>+	eht-&gt;data[8] |= LE32_DEC_ENC(phy_data-&gt;ntfy-&gt;sigs.eht_tb.tb_rx1,</div><div class='add'>+				     OFDM_UCODE_TRIG_BASE_RX_RU,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_B0 |</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_B7_B1);</div><div class='add'>+	eht-&gt;data[0] |= LE32_DEC_ENC(phy_data-&gt;ntfy-&gt;sigs.eht_tb.tb_rx1,</div><div class='add'>+				     OFDM_UCODE_TRIG_BASE_RX_CODING_EXTRA_SYM,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA0_LDPC_EXTRA_SYM_OM);</div><div class='add'>+	eht-&gt;data[0] |= LE32_DEC_ENC(phy_data-&gt;ntfy-&gt;sigs.eht_tb.tb_rx1,</div><div class='add'>+				     OFDM_UCODE_TRIG_BASE_RX_PRE_FEC_PAD_FACTOR,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA0_PRE_PADD_FACOR_OM);</div><div class='add'>+	eht-&gt;data[0] |= LE32_DEC_ENC(phy_data-&gt;ntfy-&gt;sigs.eht_tb.tb_rx1,</div><div class='add'>+				     OFDM_UCODE_TRIG_BASE_RX_PE_DISAMBIG,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA0_PE_DISAMBIGUITY_OM);</div><div class='add'>+	eht-&gt;data[0] |= LE32_DEC_ENC(phy_data-&gt;ntfy-&gt;sigs.eht_tb.tb_rx1,</div><div class='add'>+				     OFDM_UCODE_TRIG_BASE_RX_NUM_OF_LTF_SYM,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA0_EHT_LTF);</div><div class='add'>+	eht-&gt;data[1] |= LE32_DEC_ENC(phy_data-&gt;ntfy-&gt;sigs.eht_tb.tb_rx0,</div><div class='add'>+				     OFDM_UCODE_TRIG_BASE_RX_RU_P80,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA1_PRIMARY_80);</div><div class='add'>+</div><div class='add'>+	iwl_mld_eht_set_ru_alloc(rx_status,</div><div class='add'>+				 le32_get_bits(phy_data-&gt;ntfy-&gt;sigs.eht_tb.tb_rx1,</div><div class='add'>+					       OFDM_UCODE_TRIG_BASE_RX_RU));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_eht_decode_user_ru(struct iwl_mld_rx_phy_data *phy_data,</div><div class='add'>+				       struct ieee80211_radiotap_eht *eht)</div><div class='add'>+{</div><div class='add'>+	u32 phy_bw = phy_data-&gt;rate_n_flags &amp; RATE_MCS_CHAN_WIDTH_MSK;</div><div class='add'>+</div><div class='add'>+	if (!(phy_data-&gt;ntfy-&gt;flags &amp; IWL_SNIF_FLAG_VALID_RU))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+#define __IWL_MLD_ENC_EHT_RU(rt_data, rt_ru, fw_data, fw_ru) \</div><div class='add'>+	eht-&gt;data[(rt_data)] |= \</div><div class='add'>+		(cpu_to_le32(IEEE80211_RADIOTAP_EHT_DATA ## rt_data ## _RU_ALLOC_CC_ ## rt_ru ## _KNOWN) | \</div><div class='add'>+		 LE32_DEC_ENC(phy_data-&gt;ntfy-&gt;sigs.eht.cmn[fw_data], \</div><div class='add'>+			      OFDM_RX_FRAME_EHT_RU_ALLOC_ ## fw_data ## _ ## fw_ru, \</div><div class='add'>+			      IEEE80211_RADIOTAP_EHT_DATA ## rt_data ## _RU_ALLOC_CC_ ## rt_ru))</div><div class='add'>+</div><div class='add'>+#define _IWL_MLD_ENC_EHT_RU(rt_data, rt_ru, fw_data, fw_ru)	\</div><div class='add'>+	__IWL_MLD_ENC_EHT_RU(rt_data, rt_ru, fw_data, fw_ru)</div><div class='add'>+</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_1_1_1	1</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_2_1_1	2</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_1_1_2	2</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_2_1_2	2</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_1_2_1	3</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_2_2_1	3</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_1_2_2	3</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_2_2_2	4</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_1_2_3	4</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_2_2_3	4</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_1_2_4	5</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_2_2_4	5</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_1_2_5	5</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_2_2_5	6</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_1_2_6	6</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_2_2_6	6</div><div class='add'>+</div><div class='add'>+#define IWL_RX_RU_DATA_A1			0</div><div class='add'>+#define IWL_RX_RU_DATA_A2			0</div><div class='add'>+#define IWL_RX_RU_DATA_A3			0</div><div class='add'>+#define IWL_RX_RU_DATA_A4			4</div><div class='add'>+#define IWL_RX_RU_DATA_B1			1</div><div class='add'>+#define IWL_RX_RU_DATA_B2			1</div><div class='add'>+#define IWL_RX_RU_DATA_B3			1</div><div class='add'>+#define IWL_RX_RU_DATA_B4			4</div><div class='add'>+#define IWL_RX_RU_DATA_C1			2</div><div class='add'>+#define IWL_RX_RU_DATA_C2			2</div><div class='add'>+#define IWL_RX_RU_DATA_C3			2</div><div class='add'>+#define IWL_RX_RU_DATA_C4			5</div><div class='add'>+#define IWL_RX_RU_DATA_D1			3</div><div class='add'>+#define IWL_RX_RU_DATA_D2			3</div><div class='add'>+#define IWL_RX_RU_DATA_D3			3</div><div class='add'>+#define IWL_RX_RU_DATA_D4			5</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_ENC_EHT_RU(rt_ru, fw_ru)				\</div><div class='add'>+	_IWL_MLD_ENC_EHT_RU(IEEE80211_RADIOTAP_RU_DATA_ ## rt_ru,	\</div><div class='add'>+			    rt_ru,					\</div><div class='add'>+			    IWL_RX_RU_DATA_ ## fw_ru,			\</div><div class='add'>+			    fw_ru)</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Hardware labels the content channels/RU allocation values</div><div class='add'>+	 * as follows:</div><div class='add'>+	 *</div><div class='add'>+	 *           Content Channel 1		Content Channel 2</div><div class='add'>+	 *   20 MHz: A1</div><div class='add'>+	 *   40 MHz: A1				B1</div><div class='add'>+	 *   80 MHz: A1 C1			B1 D1</div><div class='add'>+	 *  160 MHz: A1 C1 A2 C2		B1 D1 B2 D2</div><div class='add'>+	 *  320 MHz: A1 C1 A2 C2 A3 C3 A4 C4	B1 D1 B2 D2 B3 D3 B4 D4</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	switch (phy_bw) {</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_320:</div><div class='add'>+		/* content channel 1 */</div><div class='add'>+		IWL_MLD_ENC_EHT_RU(1_2_3, A3);</div><div class='add'>+		IWL_MLD_ENC_EHT_RU(1_2_4, C3);</div><div class='add'>+		IWL_MLD_ENC_EHT_RU(1_2_5, A4);</div><div class='add'>+		IWL_MLD_ENC_EHT_RU(1_2_6, C4);</div><div class='add'>+		/* content channel 2 */</div><div class='add'>+		IWL_MLD_ENC_EHT_RU(2_2_3, B3);</div><div class='add'>+		IWL_MLD_ENC_EHT_RU(2_2_4, D3);</div><div class='add'>+		IWL_MLD_ENC_EHT_RU(2_2_5, B4);</div><div class='add'>+		IWL_MLD_ENC_EHT_RU(2_2_6, D4);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_160:</div><div class='add'>+		/* content channel 1 */</div><div class='add'>+		IWL_MLD_ENC_EHT_RU(1_2_1, A2);</div><div class='add'>+		IWL_MLD_ENC_EHT_RU(1_2_2, C2);</div><div class='add'>+		/* content channel 2 */</div><div class='add'>+		IWL_MLD_ENC_EHT_RU(2_2_1, B2);</div><div class='add'>+		IWL_MLD_ENC_EHT_RU(2_2_2, D2);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_80:</div><div class='add'>+		/* content channel 1 */</div><div class='add'>+		IWL_MLD_ENC_EHT_RU(1_1_2, C1);</div><div class='add'>+		/* content channel 2 */</div><div class='add'>+		IWL_MLD_ENC_EHT_RU(2_1_2, D1);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_40:</div><div class='add'>+		/* content channel 2 */</div><div class='add'>+		IWL_MLD_ENC_EHT_RU(2_1_1, B1);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_20:</div><div class='add'>+		/* content channel 1 */</div><div class='add'>+		IWL_MLD_ENC_EHT_RU(1_1_1, A1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_decode_eht_non_tb(struct iwl_mld_rx_phy_data *phy_data,</div><div class='add'>+				      struct ieee80211_rx_status *rx_status,</div><div class='add'>+				      struct ieee80211_radiotap_eht *eht)</div><div class='add'>+{</div><div class='add'>+	eht-&gt;known |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_KNOWN_SPATIAL_REUSE |</div><div class='add'>+				  /* All RU allocating size/index is in TB format */</div><div class='add'>+				  IEEE80211_RADIOTAP_EHT_KNOWN_RU_ALLOC_TB_FMT |</div><div class='add'>+				  IEEE80211_RADIOTAP_EHT_KNOWN_LDPC_EXTRA_SYM_OM |</div><div class='add'>+				  IEEE80211_RADIOTAP_EHT_KNOWN_PRE_PADD_FACOR_OM |</div><div class='add'>+				  IEEE80211_RADIOTAP_EHT_KNOWN_PE_DISAMBIGUITY_OM |</div><div class='add'>+				  IEEE80211_RADIOTAP_EHT_KNOWN_EHT_LTF |</div><div class='add'>+				  IEEE80211_RADIOTAP_EHT_KNOWN_PRIMARY_80 |</div><div class='add'>+				  IEEE80211_RADIOTAP_EHT_KNOWN_NR_NON_OFDMA_USERS_M);</div><div class='add'>+</div><div class='add'>+	eht-&gt;data[0] |= LE32_DEC_ENC(phy_data-&gt;ntfy-&gt;sigs.eht.b1,</div><div class='add'>+				     OFDM_RX_FRAME_EHT_SPATIAL_REUSE,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA0_SPATIAL_REUSE);</div><div class='add'>+	eht-&gt;data[8] |= LE32_DEC_ENC(phy_data-&gt;ntfy-&gt;sigs.eht.b2,</div><div class='add'>+				     OFDM_RX_FRAME_EHT_STA_RU_PS160,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_PS_160);</div><div class='add'>+	eht-&gt;data[8] |= LE32_DEC_ENC(phy_data-&gt;ntfy-&gt;sigs.eht.b2,</div><div class='add'>+				     OFDM_RX_FRAME_EHT_STA_RU,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_B0 |</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_B7_B1);</div><div class='add'>+	eht-&gt;data[0] |= LE32_DEC_ENC(phy_data-&gt;ntfy-&gt;sigs.eht.b1,</div><div class='add'>+				     OFDM_RX_FRAME_EHT_CODING_EXTRA_SYM,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA0_LDPC_EXTRA_SYM_OM);</div><div class='add'>+	eht-&gt;data[0] |= LE32_DEC_ENC(phy_data-&gt;ntfy-&gt;sigs.eht.b1,</div><div class='add'>+				     OFDM_RX_FRAME_EHT_PRE_FEC_PAD_FACTOR,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA0_PRE_PADD_FACOR_OM);</div><div class='add'>+	eht-&gt;data[0] |= LE32_DEC_ENC(phy_data-&gt;ntfy-&gt;sigs.eht.b1,</div><div class='add'>+				     OFDM_RX_FRAME_EHT_PE_DISAMBIG,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA0_PE_DISAMBIGUITY_OM);</div><div class='add'>+	eht-&gt;data[0] |= LE32_DEC_ENC(phy_data-&gt;ntfy-&gt;sigs.eht.b1,</div><div class='add'>+				     OFDM_RX_FRAME_EHT_NUM_OF_LTF_SYM,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA0_EHT_LTF);</div><div class='add'>+	eht-&gt;data[1] |= LE32_DEC_ENC(phy_data-&gt;ntfy-&gt;sigs.eht.b2,</div><div class='add'>+				     OFDM_RX_FRAME_EHT_STA_RU_P80,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA1_PRIMARY_80);</div><div class='add'>+	eht-&gt;data[7] |= LE32_DEC_ENC(phy_data-&gt;ntfy-&gt;sigs.eht.b1,</div><div class='add'>+				     OFDM_RX_FRAME_EHT_NUM_OF_USERS,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA7_NUM_OF_NON_OFDMA_USERS);</div><div class='add'>+</div><div class='add'>+	iwl_mld_eht_decode_user_ru(phy_data, eht);</div><div class='add'>+</div><div class='add'>+	iwl_mld_eht_set_ru_alloc(rx_status,</div><div class='add'>+				 le32_get_bits(phy_data-&gt;ntfy-&gt;sigs.eht.b2,</div><div class='add'>+					       OFDM_RX_FRAME_EHT_STA_RU));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_decode_eht_phy_data(struct iwl_mld_rx_phy_data *phy_data,</div><div class='add'>+					struct ieee80211_rx_status *rx_status,</div><div class='add'>+					struct ieee80211_radiotap_eht *eht)</div><div class='add'>+{</div><div class='add'>+	u32 he_type = phy_data-&gt;rate_n_flags &amp; RATE_MCS_HE_TYPE_MSK;</div><div class='add'>+</div><div class='add'>+	if (he_type == RATE_MCS_HE_TYPE_TRIG)</div><div class='add'>+		iwl_mld_decode_eht_tb(phy_data, rx_status, eht);</div><div class='add'>+	else</div><div class='add'>+		iwl_mld_decode_eht_non_tb(phy_data, rx_status, eht);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_rx_eht(struct iwl_mld *mld, struct sk_buff *skb,</div><div class='add'>+			   struct iwl_mld_rx_phy_data *phy_data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);</div><div class='add'>+	struct ieee80211_radiotap_eht *eht;</div><div class='add'>+	size_t eht_len = sizeof(*eht);</div><div class='add'>+	u32 rate_n_flags = phy_data-&gt;rate_n_flags;</div><div class='add'>+	u32 he_type = rate_n_flags &amp; RATE_MCS_HE_TYPE_MSK;</div><div class='add'>+	/* EHT and HE have the same values for LTF */</div><div class='add'>+	u8 ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_UNKNOWN;</div><div class='add'>+</div><div class='add'>+	/* u32 for 1 user_info */</div><div class='add'>+	if (phy_data-&gt;with_data)</div><div class='add'>+		eht_len += sizeof(u32);</div><div class='add'>+</div><div class='add'>+	eht = iwl_mld_radiotap_put_tlv(skb, IEEE80211_RADIOTAP_EHT, eht_len);</div><div class='add'>+</div><div class='add'>+	rx_status-&gt;flag |= RX_FLAG_RADIOTAP_TLV_AT_END;</div><div class='add'>+</div><div class='add'>+	switch (u32_get_bits(rate_n_flags, RATE_MCS_HE_GI_LTF_MSK)) {</div><div class='add'>+	case 0:</div><div class='add'>+		if (he_type == RATE_MCS_HE_TYPE_TRIG) {</div><div class='add'>+			rx_status-&gt;eht.gi = NL80211_RATE_INFO_EHT_GI_1_6;</div><div class='add'>+			ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_1X;</div><div class='add'>+		} else {</div><div class='add'>+			rx_status-&gt;eht.gi = NL80211_RATE_INFO_EHT_GI_0_8;</div><div class='add'>+			ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_2X;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		rx_status-&gt;eht.gi = NL80211_RATE_INFO_EHT_GI_1_6;</div><div class='add'>+		ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_2X;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_4X;</div><div class='add'>+		if (he_type == RATE_MCS_HE_TYPE_TRIG)</div><div class='add'>+			rx_status-&gt;eht.gi = NL80211_RATE_INFO_EHT_GI_3_2;</div><div class='add'>+		else</div><div class='add'>+			rx_status-&gt;eht.gi = NL80211_RATE_INFO_EHT_GI_0_8;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		if (he_type != RATE_MCS_HE_TYPE_TRIG) {</div><div class='add'>+			ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_4X;</div><div class='add'>+			rx_status-&gt;eht.gi = NL80211_RATE_INFO_EHT_GI_3_2;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* nothing here */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ltf != IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_UNKNOWN) {</div><div class='add'>+		eht-&gt;known |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_KNOWN_GI);</div><div class='add'>+		eht-&gt;data[0] |= le32_encode_bits(ltf,</div><div class='add'>+						 IEEE80211_RADIOTAP_EHT_DATA0_LTF) |</div><div class='add'>+				le32_encode_bits(rx_status-&gt;eht.gi,</div><div class='add'>+						 IEEE80211_RADIOTAP_EHT_DATA0_GI);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!phy_data-&gt;with_data) {</div><div class='add'>+		eht-&gt;known |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_KNOWN_NSS_S |</div><div class='add'>+					  IEEE80211_RADIOTAP_EHT_KNOWN_BEAMFORMED_S);</div><div class='add'>+		eht-&gt;data[7] |= LE32_DEC_ENC(phy_data-&gt;ntfy-&gt;sigs.eht.b1,</div><div class='add'>+					     OFDM_RX_FRAME_EHT_NSTS,</div><div class='add'>+					     IEEE80211_RADIOTAP_EHT_DATA7_NSS_S);</div><div class='add'>+		if (rate_n_flags &amp; RATE_MCS_BF_MSK)</div><div class='add'>+			eht-&gt;data[7] |=</div><div class='add'>+				cpu_to_le32(IEEE80211_RADIOTAP_EHT_DATA7_BEAMFORMED_S);</div><div class='add'>+	} else {</div><div class='add'>+		eht-&gt;user_info[0] |=</div><div class='add'>+			cpu_to_le32(IEEE80211_RADIOTAP_EHT_USER_INFO_MCS_KNOWN |</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USER_INFO_CODING_KNOWN |</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_KNOWN_O |</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USER_INFO_BEAMFORMING_KNOWN_O |</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USER_INFO_DATA_FOR_USER);</div><div class='add'>+</div><div class='add'>+		if (rate_n_flags &amp; RATE_MCS_BF_MSK)</div><div class='add'>+			eht-&gt;user_info[0] |=</div><div class='add'>+				cpu_to_le32(IEEE80211_RADIOTAP_EHT_USER_INFO_BEAMFORMING_O);</div><div class='add'>+</div><div class='add'>+		if (rate_n_flags &amp; RATE_MCS_LDPC_MSK)</div><div class='add'>+			eht-&gt;user_info[0] |=</div><div class='add'>+				cpu_to_le32(IEEE80211_RADIOTAP_EHT_USER_INFO_CODING);</div><div class='add'>+</div><div class='add'>+		eht-&gt;user_info[0] |=</div><div class='add'>+			le32_encode_bits(u32_get_bits(rate_n_flags,</div><div class='add'>+						      RATE_VHT_MCS_RATE_CODE_MSK),</div><div class='add'>+					 IEEE80211_RADIOTAP_EHT_USER_INFO_MCS) |</div><div class='add'>+			le32_encode_bits(u32_get_bits(rate_n_flags,</div><div class='add'>+						      RATE_MCS_NSS_MSK),</div><div class='add'>+					 IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_O);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (likely(!phy_data-&gt;ntfy))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (phy_data-&gt;with_data) {</div><div class='add'>+		eht-&gt;user_info[0] |=</div><div class='add'>+			cpu_to_le32(IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID_KNOWN) |</div><div class='add'>+			LE32_DEC_ENC(phy_data-&gt;ntfy-&gt;sigs.eht.user_id,</div><div class='add'>+				     OFDM_RX_FRAME_EHT_USER_FIELD_ID,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mld_decode_eht_usig(phy_data, skb);</div><div class='add'>+	iwl_mld_decode_eht_phy_data(phy_data, rx_status, eht);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='add'>+static void iwl_mld_add_rtap_sniffer_config(struct iwl_mld *mld,</div><div class='add'>+					    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);</div><div class='add'>+	struct ieee80211_radiotap_vendor_content *radiotap;</div><div class='add'>+	const u16 vendor_data_len = sizeof(mld-&gt;monitor.cur_aid);</div><div class='add'>+</div><div class='add'>+	if (!mld-&gt;monitor.cur_aid)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	radiotap =</div><div class='add'>+		iwl_mld_radiotap_put_tlv(skb,</div><div class='add'>+					 IEEE80211_RADIOTAP_VENDOR_NAMESPACE,</div><div class='add'>+					 sizeof(*radiotap) + vendor_data_len);</div><div class='add'>+</div><div class='add'>+	/* Intel OUI */</div><div class='add'>+	radiotap-&gt;oui[0] = 0xf6;</div><div class='add'>+	radiotap-&gt;oui[1] = 0x54;</div><div class='add'>+	radiotap-&gt;oui[2] = 0x25;</div><div class='add'>+	/* Intel OUI default radiotap subtype */</div><div class='add'>+	radiotap-&gt;oui_subtype = 1;</div><div class='add'>+	/* Sniffer config element type */</div><div class='add'>+	radiotap-&gt;vendor_type = 0;</div><div class='add'>+</div><div class='add'>+	/* fill the data now */</div><div class='add'>+	memcpy(radiotap-&gt;data, &amp;mld-&gt;monitor.cur_aid,</div><div class='add'>+	       sizeof(mld-&gt;monitor.cur_aid));</div><div class='add'>+</div><div class='add'>+	rx_status-&gt;flag |= RX_FLAG_RADIOTAP_TLV_AT_END;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void iwl_mld_add_rtap_sniffer_phy_data(struct iwl_mld *mld,</div><div class='add'>+					      struct sk_buff *skb,</div><div class='add'>+					      struct iwl_rx_phy_air_sniffer_ntfy *ntfy)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);</div><div class='add'>+	struct ieee80211_radiotap_vendor_content *radiotap;</div><div class='add'>+	const u16 vendor_data_len = sizeof(*ntfy);</div><div class='add'>+</div><div class='add'>+	radiotap =</div><div class='add'>+		iwl_mld_radiotap_put_tlv(skb,</div><div class='add'>+					 IEEE80211_RADIOTAP_VENDOR_NAMESPACE,</div><div class='add'>+					 sizeof(*radiotap) + vendor_data_len);</div><div class='add'>+</div><div class='add'>+	/* Intel OUI */</div><div class='add'>+	radiotap-&gt;oui[0] = 0xf6;</div><div class='add'>+	radiotap-&gt;oui[1] = 0x54;</div><div class='add'>+	radiotap-&gt;oui[2] = 0x25;</div><div class='add'>+	/* Intel OUI default radiotap subtype */</div><div class='add'>+	radiotap-&gt;oui_subtype = 1;</div><div class='add'>+	/* PHY data element type */</div><div class='add'>+	radiotap-&gt;vendor_type = cpu_to_le16(1);</div><div class='add'>+</div><div class='add'>+	/* fill the data now */</div><div class='add'>+	memcpy(radiotap-&gt;data, ntfy, vendor_data_len);</div><div class='add'>+</div><div class='add'>+	rx_status-&gt;flag |= RX_FLAG_RADIOTAP_TLV_AT_END;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_set_rx_nonlegacy_rate_info(u32 rate_n_flags,</div><div class='add'>+				   struct ieee80211_rx_status *rx_status)</div><div class='add'>+{</div><div class='add'>+	u8 stbc = u32_get_bits(rate_n_flags, RATE_MCS_STBC_MSK);</div><div class='add'>+</div><div class='add'>+	/* NSS may be overridden by PHY ntfy with full value */</div><div class='add'>+	rx_status-&gt;nss = u32_get_bits(rate_n_flags, RATE_MCS_NSS_MSK) + 1;</div><div class='add'>+	rx_status-&gt;rate_idx = rate_n_flags &amp; RATE_MCS_CODE_MSK;</div><div class='add'>+	rx_status-&gt;enc_flags |= stbc &lt;&lt; RX_ENC_FLAG_STBC_SHIFT;</div><div class='add'>+	if (rate_n_flags &amp; RATE_MCS_LDPC_MSK)</div><div class='add'>+		rx_status-&gt;enc_flags |= RX_ENC_FLAG_LDPC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_set_rx_rate(struct iwl_mld *mld,</div><div class='add'>+				struct iwl_mld_rx_phy_data *phy_data,</div><div class='add'>+				struct ieee80211_rx_status *rx_status)</div><div class='add'>+{</div><div class='add'>+	u32 rate_n_flags = phy_data-&gt;rate_n_flags;</div><div class='add'>+	u8 stbc = u32_get_bits(rate_n_flags, RATE_MCS_STBC_MSK);</div><div class='add'>+	u32 format = rate_n_flags &amp; RATE_MCS_MOD_TYPE_MSK;</div><div class='add'>+	bool is_sgi = rate_n_flags &amp; RATE_MCS_SGI_MSK;</div><div class='add'>+</div><div class='add'>+	/* bandwidth may be overridden to RU by PHY ntfy */</div><div class='add'>+	switch (rate_n_flags &amp; RATE_MCS_CHAN_WIDTH_MSK) {</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_20:</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_40:</div><div class='add'>+		rx_status-&gt;bw = RATE_INFO_BW_40;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_80:</div><div class='add'>+		rx_status-&gt;bw = RATE_INFO_BW_80;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_160:</div><div class='add'>+		rx_status-&gt;bw = RATE_INFO_BW_160;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_320:</div><div class='add'>+		rx_status-&gt;bw = RATE_INFO_BW_320;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (format) {</div><div class='add'>+	case RATE_MCS_MOD_TYPE_CCK:</div><div class='add'>+		if (phy_data-&gt;phy_info &amp; IWL_RX_MPDU_PHY_SHORT_PREAMBLE)</div><div class='add'>+			rx_status-&gt;enc_flags |= RX_ENC_FLAG_SHORTPRE;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_LEGACY_OFDM: {</div><div class='add'>+		int rate =</div><div class='add'>+		    iwl_mld_legacy_hw_idx_to_mac80211_idx(rate_n_flags,</div><div class='add'>+							  rx_status-&gt;band);</div><div class='add'>+</div><div class='add'>+		/* override BW - it could be DUP and indicate the wrong BW */</div><div class='add'>+		rx_status-&gt;bw = RATE_INFO_BW_20;</div><div class='add'>+</div><div class='add'>+		/* valid rate */</div><div class='add'>+		if (rate &gt;= 0 &amp;&amp; rate &lt;= 0xFF) {</div><div class='add'>+			rx_status-&gt;rate_idx = rate;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* invalid rate */</div><div class='add'>+		rx_status-&gt;rate_idx = 0;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * In monitor mode we can see CCK frames on 5 or 6 GHz, usually</div><div class='add'>+		 * just the (possibly malformed) PHY header by accident, since</div><div class='add'>+		 * the decoder doesn't seem to turn off CCK. We cannot correctly</div><div class='add'>+		 * encode the rate to mac80211 (and therefore not in radiotap)</div><div class='add'>+		 * since we give the per-band index which doesn't cover those</div><div class='add'>+		 * rates.</div><div class='add'>+		 */</div><div class='add'>+		if (!mld-&gt;monitor.on &amp;&amp; net_ratelimit())</div><div class='add'>+			IWL_ERR(mld, "invalid rate_n_flags=0x%x, band=%d\n",</div><div class='add'>+				rate_n_flags, rx_status-&gt;band);</div><div class='add'>+		break;</div><div class='add'>+		}</div><div class='add'>+	case RATE_MCS_MOD_TYPE_HT:</div><div class='add'>+		rx_status-&gt;encoding = RX_ENC_HT;</div><div class='add'>+		rx_status-&gt;rate_idx = RATE_HT_MCS_INDEX(rate_n_flags);</div><div class='add'>+		rx_status-&gt;enc_flags |= stbc &lt;&lt; RX_ENC_FLAG_STBC_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_VHT:</div><div class='add'>+		rx_status-&gt;encoding = RX_ENC_VHT;</div><div class='add'>+		iwl_mld_set_rx_nonlegacy_rate_info(rate_n_flags, rx_status);</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_HE:</div><div class='add'>+		rx_status-&gt;encoding = RX_ENC_HE;</div><div class='add'>+		rx_status-&gt;he_dcm =</div><div class='add'>+			!!(rate_n_flags &amp; RATE_HE_DUAL_CARRIER_MODE_MSK);</div><div class='add'>+		iwl_mld_set_rx_nonlegacy_rate_info(rate_n_flags, rx_status);</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_EHT:</div><div class='add'>+		rx_status-&gt;encoding = RX_ENC_EHT;</div><div class='add'>+		iwl_mld_set_rx_nonlegacy_rate_info(rate_n_flags, rx_status);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (format != RATE_MCS_MOD_TYPE_CCK &amp;&amp; is_sgi)</div><div class='add'>+		rx_status-&gt;enc_flags |= RX_ENC_FLAG_SHORT_GI;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Note: hdr can be NULL */</div><div class='add'>+static void iwl_mld_rx_fill_status(struct iwl_mld *mld, int link_id,</div><div class='add'>+				   struct ieee80211_hdr *hdr,</div><div class='add'>+				   struct sk_buff *skb,</div><div class='add'>+				   struct iwl_mld_rx_phy_data *phy_data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);</div><div class='add'>+	u32 rate_n_flags = phy_data-&gt;rate_n_flags;</div><div class='add'>+	u32 format = rate_n_flags &amp; RATE_MCS_MOD_TYPE_MSK;</div><div class='add'>+</div><div class='add'>+	iwl_mld_fill_signal(mld, link_id, hdr, rx_status, phy_data);</div><div class='add'>+</div><div class='add'>+	rx_status-&gt;device_timestamp = phy_data-&gt;gp2_on_air_rise;</div><div class='add'>+</div><div class='add'>+	iwl_mld_set_rx_rate(mld, phy_data, rx_status);</div><div class='add'>+</div><div class='add'>+	/* must be before L-SIG data (radiotap field order) */</div><div class='add'>+	if (format == RATE_MCS_MOD_TYPE_HE)</div><div class='add'>+		iwl_mld_rx_he(skb, phy_data);</div><div class='add'>+</div><div class='add'>+	iwl_mld_decode_lsig(skb, phy_data);</div><div class='add'>+</div><div class='add'>+	/* TLVs - must be after radiotap fixed fields */</div><div class='add'>+	if (format == RATE_MCS_MOD_TYPE_EHT)</div><div class='add'>+		iwl_mld_rx_eht(mld, skb, phy_data);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='add'>+	if (unlikely(mld-&gt;monitor.on)) {</div><div class='add'>+		iwl_mld_add_rtap_sniffer_config(mld, skb);</div><div class='add'>+</div><div class='add'>+		if (mld-&gt;monitor.ptp_time) {</div><div class='add'>+			u64 adj_time =</div><div class='add'>+				iwl_mld_ptp_get_adj_time(mld,</div><div class='add'>+							 phy_data-&gt;gp2_on_air_rise *</div><div class='add'>+							 NSEC_PER_USEC);</div><div class='add'>+</div><div class='add'>+			rx_status-&gt;mactime = div64_u64(adj_time, NSEC_PER_USEC);</div><div class='add'>+			rx_status-&gt;flag |= RX_FLAG_MACTIME_IS_RTAP_TS64;</div><div class='add'>+			rx_status-&gt;flag &amp;= ~RX_FLAG_MACTIME;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (phy_data-&gt;ntfy)</div><div class='add'>+		iwl_mld_add_rtap_sniffer_phy_data(mld, skb, phy_data-&gt;ntfy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* iwl_mld_create_skb adds the rxb to a new skb */</div><div class='add'>+static int iwl_mld_build_rx_skb(struct iwl_mld *mld, struct sk_buff *skb,</div><div class='add'>+				struct ieee80211_hdr *hdr, u16 len,</div><div class='add'>+				u8 crypt_len, struct iwl_rx_cmd_buffer *rxb)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='add'>+	struct iwl_rx_mpdu_desc *desc = (void *)pkt-&gt;data;</div><div class='add'>+	unsigned int headlen, fraglen, pad_len = 0;</div><div class='add'>+	unsigned int hdrlen = ieee80211_hdrlen(hdr-&gt;frame_control);</div><div class='add'>+	u8 mic_crc_len = u8_get_bits(desc-&gt;mac_flags1,</div><div class='add'>+				     IWL_RX_MPDU_MFLG1_MIC_CRC_LEN_MASK) &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	if (desc-&gt;mac_flags2 &amp; IWL_RX_MPDU_MFLG2_PAD) {</div><div class='add'>+		len -= 2;</div><div class='add'>+		pad_len = 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* For non monitor interface strip the bytes the RADA might not have</div><div class='add'>+	 * removed (it might be disabled, e.g. for mgmt frames). As a monitor</div><div class='add'>+	 * interface cannot exist with other interfaces, this removal is safe</div><div class='add'>+	 * and sufficient, in monitor mode there's no decryption being done.</div><div class='add'>+	 */</div><div class='add'>+	if (len &gt; mic_crc_len &amp;&amp; !ieee80211_hw_check(mld-&gt;hw, RX_INCLUDES_FCS))</div><div class='add'>+		len -= mic_crc_len;</div><div class='add'>+</div><div class='add'>+	/* If frame is small enough to fit in skb-&gt;head, pull it completely.</div><div class='add'>+	 * If not, only pull ieee80211_hdr (including crypto if present, and</div><div class='add'>+	 * an additional 8 bytes for SNAP/ethertype, see below) so that</div><div class='add'>+	 * splice() or TCP coalesce are more efficient.</div><div class='add'>+	 *</div><div class='add'>+	 * Since, in addition, ieee80211_data_to_8023() always pull in at</div><div class='add'>+	 * least 8 bytes (possibly more for mesh) we can do the same here</div><div class='add'>+	 * to save the cost of doing it later. That still doesn't pull in</div><div class='add'>+	 * the actual IP header since the typical case has a SNAP header.</div><div class='add'>+	 * If the latter changes (there are efforts in the standards group</div><div class='add'>+	 * to do so) we should revisit this and ieee80211_data_to_8023().</div><div class='add'>+	 */</div><div class='add'>+	headlen = (len &lt;= skb_tailroom(skb)) ? len : hdrlen + crypt_len + 8;</div><div class='add'>+</div><div class='add'>+	/* The firmware may align the packet to DWORD.</div><div class='add'>+	 * The padding is inserted after the IV.</div><div class='add'>+	 * After copying the header + IV skip the padding if</div><div class='add'>+	 * present before copying packet data.</div><div class='add'>+	 */</div><div class='add'>+	hdrlen += crypt_len;</div><div class='add'>+</div><div class='add'>+	if (unlikely(headlen &lt; hdrlen))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Since data doesn't move data while putting data on skb and that is</div><div class='add'>+	 * the only way we use, data + len is the next place that hdr would</div><div class='add'>+	 * be put</div><div class='add'>+	 */</div><div class='add'>+	skb_set_mac_header(skb, skb-&gt;len);</div><div class='add'>+	skb_put_data(skb, hdr, hdrlen);</div><div class='add'>+	skb_put_data(skb, (u8 *)hdr + hdrlen + pad_len, headlen - hdrlen);</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_COMPLETE) {</div><div class='add'>+		struct {</div><div class='add'>+			u8 hdr[6];</div><div class='add'>+			__be16 type;</div><div class='add'>+		} __packed *shdr = (void *)((u8 *)hdr + hdrlen + pad_len);</div><div class='add'>+</div><div class='add'>+		if (unlikely(headlen - hdrlen &lt; sizeof(*shdr) ||</div><div class='add'>+			     !ether_addr_equal(shdr-&gt;hdr, rfc1042_header) ||</div><div class='add'>+			     (shdr-&gt;type != htons(ETH_P_IP) &amp;&amp;</div><div class='add'>+			      shdr-&gt;type != htons(ETH_P_ARP) &amp;&amp;</div><div class='add'>+			      shdr-&gt;type != htons(ETH_P_IPV6) &amp;&amp;</div><div class='add'>+			      shdr-&gt;type != htons(ETH_P_8021Q) &amp;&amp;</div><div class='add'>+			      shdr-&gt;type != htons(ETH_P_PAE) &amp;&amp;</div><div class='add'>+			      shdr-&gt;type != htons(ETH_P_TDLS))))</div><div class='add'>+			skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fraglen = len - headlen;</div><div class='add'>+</div><div class='add'>+	if (fraglen) {</div><div class='add'>+		int offset = (u8 *)hdr + headlen + pad_len -</div><div class='add'>+			     (u8 *)rxb_addr(rxb) + rxb_offset(rxb);</div><div class='add'>+</div><div class='add'>+		skb_add_rx_frag(skb, 0, rxb_steal_page(rxb), offset,</div><div class='add'>+				fraglen, rxb-&gt;truesize);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* returns true if a packet is a duplicate or invalid tid and</div><div class='add'>+ * should be dropped. Updates AMSDU PN tracking info</div><div class='add'>+ */</div><div class='add'>+VISIBLE_IF_IWLWIFI_KUNIT</div><div class='add'>+bool</div><div class='add'>+iwl_mld_is_dup(struct iwl_mld *mld, struct ieee80211_sta *sta,</div><div class='add'>+	       struct ieee80211_hdr *hdr,</div><div class='add'>+	       const struct iwl_rx_mpdu_desc *mpdu_desc,</div><div class='add'>+	       struct ieee80211_rx_status *rx_status, int queue)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sta *mld_sta;</div><div class='add'>+	struct iwl_mld_rxq_dup_data *dup_data;</div><div class='add'>+	u8 tid, sub_frame_idx;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!sta))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!mld_sta-&gt;dup_data))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	dup_data = &amp;mld_sta-&gt;dup_data[queue];</div><div class='add'>+</div><div class='add'>+	/* Drop duplicate 802.11 retransmissions</div><div class='add'>+	 * (IEEE 802.11-2020: 10.3.2.14 "Duplicate detection and recovery")</div><div class='add'>+	 */</div><div class='add'>+	if (ieee80211_is_ctl(hdr-&gt;frame_control) ||</div><div class='add'>+	    ieee80211_is_any_nullfunc(hdr-&gt;frame_control) ||</div><div class='add'>+	    is_multicast_ether_addr(hdr-&gt;addr1))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_data_qos(hdr-&gt;frame_control)) {</div><div class='add'>+		/* frame has qos control */</div><div class='add'>+		tid = ieee80211_get_tid(hdr);</div><div class='add'>+		if (tid &gt;= IWL_MAX_TID_COUNT)</div><div class='add'>+			return true;</div><div class='add'>+	} else {</div><div class='add'>+		tid = IWL_MAX_TID_COUNT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If this wasn't a part of an A-MSDU the sub-frame index will be 0 */</div><div class='add'>+	sub_frame_idx = mpdu_desc-&gt;amsdu_info &amp;</div><div class='add'>+		IWL_RX_MPDU_AMSDU_SUBFRAME_IDX_MASK;</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld,</div><div class='add'>+			 sub_frame_idx &gt; 0 &amp;&amp;</div><div class='add'>+			 !(mpdu_desc-&gt;mac_flags2 &amp; IWL_RX_MPDU_MFLG2_AMSDU),</div><div class='add'>+			 "got sub_frame_idx=%d but A-MSDU flag is not set\n",</div><div class='add'>+			 sub_frame_idx))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (unlikely(ieee80211_has_retry(hdr-&gt;frame_control) &amp;&amp;</div><div class='add'>+		     dup_data-&gt;last_seq[tid] == hdr-&gt;seq_ctrl &amp;&amp;</div><div class='add'>+		     dup_data-&gt;last_sub_frame_idx[tid] &gt;= sub_frame_idx))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* Allow same PN as the first subframe for following sub frames */</div><div class='add'>+	if (dup_data-&gt;last_seq[tid] == hdr-&gt;seq_ctrl &amp;&amp;</div><div class='add'>+	    sub_frame_idx &gt; dup_data-&gt;last_sub_frame_idx[tid])</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_ALLOW_SAME_PN;</div><div class='add'>+</div><div class='add'>+	dup_data-&gt;last_seq[tid] = hdr-&gt;seq_ctrl;</div><div class='add'>+	dup_data-&gt;last_sub_frame_idx[tid] = sub_frame_idx;</div><div class='add'>+</div><div class='add'>+	rx_status-&gt;flag |= RX_FLAG_DUP_VALIDATED;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_mld_is_dup);</div><div class='add'>+</div><div class='add'>+static void iwl_mld_update_last_rx_timestamp(struct iwl_mld *mld, u8 baid)</div><div class='add'>+{</div><div class='add'>+	unsigned long now = jiffies;</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+	struct iwl_mld_baid_data *ba_data;</div><div class='add'>+</div><div class='add'>+	ba_data = rcu_dereference(mld-&gt;fw_id_to_ba[baid]);</div><div class='add'>+	if (!ba_data) {</div><div class='add'>+		IWL_DEBUG_HT(mld, "BAID %d not found in map\n", baid);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ba_data-&gt;timeout)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* To minimize cache bouncing between RX queues, avoid frequent updates</div><div class='add'>+	 * to last_rx_timestamp. update it only when the timeout period has</div><div class='add'>+	 * passed. The worst-case scenario is the session expiring after</div><div class='add'>+	 * approximately 2 * timeout, which is negligible (the update is</div><div class='add'>+	 * atomic).</div><div class='add'>+	 */</div><div class='add'>+	timeout = TU_TO_JIFFIES(ba_data-&gt;timeout);</div><div class='add'>+	if (time_is_before_jiffies(ba_data-&gt;last_rx_timestamp + timeout))</div><div class='add'>+		ba_data-&gt;last_rx_timestamp = now;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Processes received packets for a station.</div><div class='add'>+ * Sets *drop to true if the packet should be dropped.</div><div class='add'>+ * Returns the station if found, or NULL otherwise.</div><div class='add'>+ */</div><div class='add'>+static struct ieee80211_sta *</div><div class='add'>+iwl_mld_rx_with_sta(struct iwl_mld *mld, struct ieee80211_hdr *hdr,</div><div class='add'>+		    struct sk_buff *skb,</div><div class='add'>+		    const struct iwl_rx_mpdu_desc *mpdu_desc,</div><div class='add'>+		    const struct iwl_rx_packet *pkt, int queue, bool *drop)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = NULL;</div><div class='add'>+	struct ieee80211_link_sta *link_sta = NULL;</div><div class='add'>+	struct ieee80211_rx_status *rx_status;</div><div class='add'>+	u8 baid;</div><div class='add'>+</div><div class='add'>+	if (mpdu_desc-&gt;status &amp; cpu_to_le32(IWL_RX_MPDU_STATUS_SRC_STA_FOUND)) {</div><div class='add'>+		u8 sta_id = le32_get_bits(mpdu_desc-&gt;status,</div><div class='add'>+					  IWL_RX_MPDU_STATUS_STA_ID);</div><div class='add'>+</div><div class='add'>+		if (IWL_FW_CHECK(mld,</div><div class='add'>+				 sta_id &gt;= mld-&gt;fw-&gt;ucode_capa.num_stations,</div><div class='add'>+				 "rx_mpdu: invalid sta_id %d\n", sta_id))</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		link_sta = rcu_dereference(mld-&gt;fw_id_to_link_sta[sta_id]);</div><div class='add'>+		if (!IS_ERR_OR_NULL(link_sta))</div><div class='add'>+			sta = link_sta-&gt;sta;</div><div class='add'>+	} else if (!is_multicast_ether_addr(hdr-&gt;addr2)) {</div><div class='add'>+		/* Passing NULL is fine since we prevent two stations with the</div><div class='add'>+		 * same address from being added.</div><div class='add'>+		 */</div><div class='add'>+		sta = ieee80211_find_sta_by_ifaddr(mld-&gt;hw, hdr-&gt;addr2, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* we may not have any station yet */</div><div class='add'>+	if (!sta)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	rx_status = IEEE80211_SKB_RXCB(skb);</div><div class='add'>+</div><div class='add'>+	if (link_sta &amp;&amp; sta-&gt;valid_links) {</div><div class='add'>+		rx_status-&gt;link_valid = true;</div><div class='add'>+		rx_status-&gt;link_id = link_sta-&gt;link_id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* fill checksum */</div><div class='add'>+	if (ieee80211_is_data(hdr-&gt;frame_control) &amp;&amp;</div><div class='add'>+	    pkt-&gt;len_n_flags &amp; cpu_to_le32(FH_RSCSR_RPA_EN)) {</div><div class='add'>+		u16 hwsum = be16_to_cpu(mpdu_desc-&gt;v3.raw_xsum);</div><div class='add'>+</div><div class='add'>+		skb-&gt;ip_summed = CHECKSUM_COMPLETE;</div><div class='add'>+		skb-&gt;csum = csum_unfold(~(__force __sum16)hwsum);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_is_dup(mld, sta, hdr, mpdu_desc, rx_status, queue)) {</div><div class='add'>+		IWL_DEBUG_DROP(mld, "Dropping duplicate packet 0x%x\n",</div><div class='add'>+			       le16_to_cpu(hdr-&gt;seq_ctrl));</div><div class='add'>+		*drop = true;</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	baid = le32_get_bits(mpdu_desc-&gt;reorder_data,</div><div class='add'>+			     IWL_RX_MPDU_REORDER_BAID_MASK);</div><div class='add'>+	if (baid != IWL_RX_REORDER_DATA_INVALID_BAID)</div><div class='add'>+		iwl_mld_update_last_rx_timestamp(mld, baid);</div><div class='add'>+</div><div class='add'>+	if (link_sta &amp;&amp; ieee80211_is_data(hdr-&gt;frame_control)) {</div><div class='add'>+		u8 sub_frame_idx = mpdu_desc-&gt;amsdu_info &amp;</div><div class='add'>+			IWL_RX_MPDU_AMSDU_SUBFRAME_IDX_MASK;</div><div class='add'>+</div><div class='add'>+		/* 0 means not an A-MSDU, and 1 means a new A-MSDU */</div><div class='add'>+		if (!sub_frame_idx || sub_frame_idx == 1)</div><div class='add'>+			iwl_mld_count_mpdu_rx(link_sta, queue, 1);</div><div class='add'>+</div><div class='add'>+		if (!is_multicast_ether_addr(hdr-&gt;addr1))</div><div class='add'>+			iwl_mld_low_latency_update_counters(mld, hdr, sta,</div><div class='add'>+							    queue);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sta;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_rx_mgmt_prot(struct ieee80211_sta *sta,</div><div class='add'>+				struct ieee80211_hdr *hdr,</div><div class='add'>+				struct ieee80211_rx_status *rx_status,</div><div class='add'>+				u32 mpdu_status,</div><div class='add'>+				u32 mpdu_len)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_link *link;</div><div class='add'>+	struct wireless_dev *wdev;</div><div class='add'>+	struct iwl_mld_sta *mld_sta;</div><div class='add'>+	struct iwl_mld_vif *mld_vif;</div><div class='add'>+	u8 keyidx;</div><div class='add'>+	struct ieee80211_key_conf *key;</div><div class='add'>+	const u8 *frame = (void *)hdr;</div><div class='add'>+	const u8 *mmie;</div><div class='add'>+	u8 link_id;</div><div class='add'>+</div><div class='add'>+	if ((mpdu_status &amp; IWL_RX_MPDU_STATUS_SEC_MASK) ==</div><div class='add'>+	     IWL_RX_MPDU_STATUS_SEC_NONE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* For non-beacon, we don't really care. But beacons may</div><div class='add'>+	 * be filtered out, and we thus need the firmware's replay</div><div class='add'>+	 * detection, otherwise beacons the firmware previously</div><div class='add'>+	 * filtered could be replayed, or something like that, and</div><div class='add'>+	 * it can filter a lot - though usually only if nothing has</div><div class='add'>+	 * changed.</div><div class='add'>+	 */</div><div class='add'>+	if (!ieee80211_is_beacon(hdr-&gt;frame_control))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!sta)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+	mld_vif = iwl_mld_vif_from_mac80211(mld_sta-&gt;vif);</div><div class='add'>+</div><div class='add'>+	/* key mismatch - will also report !MIC_OK but we shouldn't count it */</div><div class='add'>+	if (!(mpdu_status &amp; IWL_RX_MPDU_STATUS_KEY_VALID))</div><div class='add'>+		goto report;</div><div class='add'>+</div><div class='add'>+	/* good cases */</div><div class='add'>+	if (likely(mpdu_status &amp; IWL_RX_MPDU_STATUS_MIC_OK &amp;&amp;</div><div class='add'>+		   !(mpdu_status &amp; IWL_RX_MPDU_STATUS_REPLAY_ERROR))) {</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_DECRYPTED;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	link_id = rx_status-&gt;link_valid ? rx_status-&gt;link_id : 0;</div><div class='add'>+	link = rcu_dereference(mld_vif-&gt;link[link_id]);</div><div class='add'>+	if (WARN_ON_ONCE(!link))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/* both keys will have the same cipher and MIC length, use</div><div class='add'>+	 * whichever one is available</div><div class='add'>+	 */</div><div class='add'>+	key = rcu_dereference(link-&gt;bigtks[0]);</div><div class='add'>+	if (!key) {</div><div class='add'>+		key = rcu_dereference(link-&gt;bigtks[1]);</div><div class='add'>+		if (!key)</div><div class='add'>+			goto report;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get the real key ID */</div><div class='add'>+	if (mpdu_len &lt; key-&gt;icv_len)</div><div class='add'>+		goto report;</div><div class='add'>+</div><div class='add'>+	mmie = frame + (mpdu_len - key-&gt;icv_len);</div><div class='add'>+</div><div class='add'>+	/* the position of the key_id in ieee80211_mmie_16 is the same */</div><div class='add'>+	keyidx = le16_to_cpu(((const struct ieee80211_mmie *) mmie)-&gt;key_id);</div><div class='add'>+</div><div class='add'>+	/* and if that's the other key, look it up */</div><div class='add'>+	if (keyidx != key-&gt;keyidx) {</div><div class='add'>+		/* shouldn't happen since firmware checked, but be safe</div><div class='add'>+		 * in case the MIC length is wrong too, for example</div><div class='add'>+		 */</div><div class='add'>+		if (keyidx != 6 &amp;&amp; keyidx != 7)</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		key = rcu_dereference(link-&gt;bigtks[keyidx - 6]);</div><div class='add'>+		if (!key)</div><div class='add'>+			goto report;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Report status to mac80211 */</div><div class='add'>+	if (!(mpdu_status &amp; IWL_RX_MPDU_STATUS_MIC_OK))</div><div class='add'>+		ieee80211_key_mic_failure(key);</div><div class='add'>+	else if (mpdu_status &amp; IWL_RX_MPDU_STATUS_REPLAY_ERROR)</div><div class='add'>+		ieee80211_key_replay(key);</div><div class='add'>+report:</div><div class='add'>+	wdev = ieee80211_vif_to_wdev(mld_sta-&gt;vif);</div><div class='add'>+	if (wdev-&gt;netdev)</div><div class='add'>+		cfg80211_rx_unprot_mlme_mgmt(wdev-&gt;netdev, (void *)hdr,</div><div class='add'>+					     mpdu_len);</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_rx_crypto(struct iwl_mld *mld,</div><div class='add'>+			     struct ieee80211_sta *sta,</div><div class='add'>+			     struct ieee80211_hdr *hdr,</div><div class='add'>+			     struct ieee80211_rx_status *rx_status,</div><div class='add'>+			     struct iwl_rx_mpdu_desc *desc, int queue,</div><div class='add'>+			     u32 pkt_flags, u8 *crypto_len)</div><div class='add'>+{</div><div class='add'>+	u32 status = le32_to_cpu(desc-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (unlikely(ieee80211_is_mgmt(hdr-&gt;frame_control) &amp;&amp;</div><div class='add'>+		     !ieee80211_has_protected(hdr-&gt;frame_control)))</div><div class='add'>+		return iwl_mld_rx_mgmt_prot(sta, hdr, rx_status, status,</div><div class='add'>+					    le16_to_cpu(desc-&gt;mpdu_len));</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_has_protected(hdr-&gt;frame_control) ||</div><div class='add'>+	    (status &amp; IWL_RX_MPDU_STATUS_SEC_MASK) ==</div><div class='add'>+	    IWL_RX_MPDU_STATUS_SEC_NONE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (status &amp; IWL_RX_MPDU_STATUS_SEC_MASK) {</div><div class='add'>+	case IWL_RX_MPDU_STATUS_SEC_CCM:</div><div class='add'>+	case IWL_RX_MPDU_STATUS_SEC_GCM:</div><div class='add'>+		BUILD_BUG_ON(IEEE80211_CCMP_PN_LEN != IEEE80211_GCMP_PN_LEN);</div><div class='add'>+		if (!(status &amp; IWL_RX_MPDU_STATUS_MIC_OK)) {</div><div class='add'>+			IWL_DEBUG_DROP(mld,</div><div class='add'>+				       "Dropping packet, bad MIC (CCM/GCM)\n");</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_DECRYPTED | RX_FLAG_MIC_STRIPPED;</div><div class='add'>+		*crypto_len = IEEE80211_CCMP_HDR_LEN;</div><div class='add'>+		return 0;</div><div class='add'>+	case IWL_RX_MPDU_STATUS_SEC_TKIP:</div><div class='add'>+		if (!(status &amp; IWL_RX_MPDU_STATUS_ICV_OK))</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		if (!(status &amp; RX_MPDU_RES_STATUS_MIC_OK))</div><div class='add'>+			rx_status-&gt;flag |= RX_FLAG_MMIC_ERROR;</div><div class='add'>+</div><div class='add'>+		if (pkt_flags &amp; FH_RSCSR_RADA_EN) {</div><div class='add'>+			rx_status-&gt;flag |= RX_FLAG_ICV_STRIPPED;</div><div class='add'>+			rx_status-&gt;flag |= RX_FLAG_MMIC_STRIPPED;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		*crypto_len = IEEE80211_TKIP_IV_LEN;</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_DECRYPTED;</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_rx_update_ampdu_data(struct iwl_mld *mld,</div><div class='add'>+					 struct iwl_mld_rx_phy_data *phy_data,</div><div class='add'>+					 struct ieee80211_rx_status *rx_status)</div><div class='add'>+{</div><div class='add'>+	u32 format = phy_data-&gt;rate_n_flags &amp; RATE_MCS_MOD_TYPE_MSK;</div><div class='add'>+	bool toggle_bit =</div><div class='add'>+		phy_data-&gt;phy_info &amp; IWL_RX_MPDU_PHY_AMPDU_TOGGLE;</div><div class='add'>+</div><div class='add'>+	switch (format) {</div><div class='add'>+	case RATE_MCS_MOD_TYPE_CCK:</div><div class='add'>+	case RATE_MCS_MOD_TYPE_LEGACY_OFDM:</div><div class='add'>+		/* no aggregation possible */</div><div class='add'>+		return;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_HT:</div><div class='add'>+	case RATE_MCS_MOD_TYPE_VHT:</div><div class='add'>+		/* single frames are not A-MPDU format */</div><div class='add'>+		if (!(phy_data-&gt;phy_info &amp; IWL_RX_MPDU_PHY_AMPDU))</div><div class='add'>+			return;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* HE/EHT/UHR have A-MPDU format for single frames */</div><div class='add'>+		if (!(phy_data-&gt;phy_info &amp; IWL_RX_MPDU_PHY_AMPDU)) {</div><div class='add'>+			rx_status-&gt;flag |= RX_FLAG_AMPDU_DETAILS;</div><div class='add'>+			rx_status-&gt;flag |= RX_FLAG_AMPDU_EOF_BIT_KNOWN;</div><div class='add'>+			if (phy_data-&gt;phy_info &amp; IWL_RX_MPDU_PHY_EOF_INDICATION)</div><div class='add'>+				rx_status-&gt;flag |= RX_FLAG_AMPDU_EOF_BIT;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_status-&gt;flag |= RX_FLAG_AMPDU_DETAILS;</div><div class='add'>+	/* Toggle is switched whenever new aggregation starts. Make</div><div class='add'>+	 * sure ampdu_reference is never 0 so we can later use it to</div><div class='add'>+	 * see if the frame was really part of an A-MPDU or not.</div><div class='add'>+	 */</div><div class='add'>+	if (toggle_bit != mld-&gt;monitor.ampdu_toggle) {</div><div class='add'>+		mld-&gt;monitor.ampdu_ref++;</div><div class='add'>+		if (mld-&gt;monitor.ampdu_ref == 0)</div><div class='add'>+			mld-&gt;monitor.ampdu_ref++;</div><div class='add'>+		mld-&gt;monitor.ampdu_toggle = toggle_bit;</div><div class='add'>+		phy_data-&gt;first_subframe = true;</div><div class='add'>+</div><div class='add'>+		/* report EOF bit on the first subframe */</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_AMPDU_EOF_BIT_KNOWN;</div><div class='add'>+		if (phy_data-&gt;phy_info &amp; IWL_RX_MPDU_PHY_EOF_INDICATION)</div><div class='add'>+			rx_status-&gt;flag |= RX_FLAG_AMPDU_EOF_BIT;</div><div class='add'>+	}</div><div class='add'>+	rx_status-&gt;ampdu_reference = mld-&gt;monitor.ampdu_ref;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_fill_rx_status_band_freq(struct ieee80211_rx_status *rx_status,</div><div class='add'>+				 u8 band, u8 channel)</div><div class='add'>+{</div><div class='add'>+	rx_status-&gt;band = iwl_mld_phy_band_to_nl80211(band);</div><div class='add'>+	rx_status-&gt;freq = ieee80211_channel_to_frequency(channel,</div><div class='add'>+							 rx_status-&gt;band);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_rx_mpdu(struct iwl_mld *mld, struct napi_struct *napi,</div><div class='add'>+		     struct iwl_rx_cmd_buffer *rxb, int queue)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='add'>+	struct iwl_mld_rx_phy_data phy_data = {};</div><div class='add'>+	struct iwl_rx_mpdu_desc *mpdu_desc = (void *)pkt-&gt;data;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	size_t mpdu_desc_size = sizeof(*mpdu_desc);</div><div class='add'>+	bool drop = false;</div><div class='add'>+	u8 crypto_len = 0, band, link_id;</div><div class='add'>+	u32 pkt_len = iwl_rx_packet_payload_len(pkt);</div><div class='add'>+	u32 mpdu_len;</div><div class='add'>+	enum iwl_mld_reorder_result reorder_res;</div><div class='add'>+	struct ieee80211_rx_status *rx_status;</div><div class='add'>+	unsigned int alloc_size = 128;</div><div class='add'>+</div><div class='add'>+	if (unlikely(mld-&gt;fw_status.in_hw_restart))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, pkt_len &lt; mpdu_desc_size,</div><div class='add'>+			 "Bad REPLY_RX_MPDU_CMD size (%d)\n", pkt_len))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mpdu_len = le16_to_cpu(mpdu_desc-&gt;mpdu_len);</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, mpdu_len + mpdu_desc_size &gt; pkt_len,</div><div class='add'>+			 "FW lied about packet len (%d)\n", pkt_len))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mld_fill_phy_data_from_mpdu(mld, mpdu_desc, &amp;phy_data);</div><div class='add'>+</div><div class='add'>+	/* Don't use dev_alloc_skb(), we'll have enough headroom once</div><div class='add'>+	 * ieee80211_hdr pulled.</div><div class='add'>+	 *</div><div class='add'>+	 * For monitor mode we need more space to include the full PHY</div><div class='add'>+	 * notification data.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(mld-&gt;monitor.on) &amp;&amp; phy_data.ntfy)</div><div class='add'>+		alloc_size += sizeof(struct iwl_rx_phy_air_sniffer_ntfy);</div><div class='add'>+	skb = alloc_skb(alloc_size, GFP_ATOMIC);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		IWL_ERR(mld, "alloc_skb failed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr = (void *)(pkt-&gt;data + mpdu_desc_size);</div><div class='add'>+</div><div class='add'>+	if (mpdu_desc-&gt;mac_flags2 &amp; IWL_RX_MPDU_MFLG2_PAD) {</div><div class='add'>+		/* If the device inserted padding it means that (it thought)</div><div class='add'>+		 * the 802.11 header wasn't a multiple of 4 bytes long. In</div><div class='add'>+		 * this case, reserve two bytes at the start of the SKB to</div><div class='add'>+		 * align the payload properly in case we end up copying it.</div><div class='add'>+		 */</div><div class='add'>+		skb_reserve(skb, 2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_status = IEEE80211_SKB_RXCB(skb);</div><div class='add'>+</div><div class='add'>+	/* this is needed early */</div><div class='add'>+	band = u8_get_bits(mpdu_desc-&gt;mac_phy_band,</div><div class='add'>+			   IWL_RX_MPDU_MAC_PHY_BAND_BAND_MASK);</div><div class='add'>+	iwl_mld_fill_rx_status_band_freq(rx_status, band,</div><div class='add'>+					 mpdu_desc-&gt;v3.channel);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	sta = iwl_mld_rx_with_sta(mld, hdr, skb, mpdu_desc, pkt, queue, &amp;drop);</div><div class='add'>+	if (drop)</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	if (unlikely(mld-&gt;monitor.on))</div><div class='add'>+		iwl_mld_rx_update_ampdu_data(mld, &amp;phy_data, rx_status);</div><div class='add'>+</div><div class='add'>+	/* Keep packets with CRC errors (and with overrun) for monitor mode</div><div class='add'>+	 * (otherwise the firmware discards them) but mark them as bad.</div><div class='add'>+	 */</div><div class='add'>+	if (!(mpdu_desc-&gt;status &amp; cpu_to_le32(IWL_RX_MPDU_STATUS_CRC_OK)) ||</div><div class='add'>+	    !(mpdu_desc-&gt;status &amp; cpu_to_le32(IWL_RX_MPDU_STATUS_OVERRUN_OK))) {</div><div class='add'>+		IWL_DEBUG_RX(mld, "Bad CRC or FIFO: 0x%08X.\n",</div><div class='add'>+			     le32_to_cpu(mpdu_desc-&gt;status));</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_FAILED_FCS_CRC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (likely(!(phy_data.phy_info &amp; IWL_RX_MPDU_PHY_TSF_OVERLOAD))) {</div><div class='add'>+		rx_status-&gt;mactime =</div><div class='add'>+			le64_to_cpu(mpdu_desc-&gt;v3.tsf_on_air_rise);</div><div class='add'>+</div><div class='add'>+		/* TSF as indicated by the firmware is at INA time */</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_MACTIME_PLCP_START;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* management stuff on default queue */</div><div class='add'>+	if (!queue &amp;&amp; unlikely(ieee80211_is_beacon(hdr-&gt;frame_control) ||</div><div class='add'>+			       ieee80211_is_probe_resp(hdr-&gt;frame_control))) {</div><div class='add'>+		rx_status-&gt;boottime_ns = ktime_get_boottime_ns();</div><div class='add'>+</div><div class='add'>+		if (mld-&gt;scan.pass_all_sched_res ==</div><div class='add'>+				SCHED_SCAN_PASS_ALL_STATE_ENABLED)</div><div class='add'>+			mld-&gt;scan.pass_all_sched_res =</div><div class='add'>+				SCHED_SCAN_PASS_ALL_STATE_FOUND;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	link_id = u8_get_bits(mpdu_desc-&gt;mac_phy_band,</div><div class='add'>+			      IWL_RX_MPDU_MAC_PHY_BAND_LINK_MASK);</div><div class='add'>+</div><div class='add'>+	iwl_mld_rx_fill_status(mld, link_id, hdr, skb, &amp;phy_data);</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_rx_crypto(mld, sta, hdr, rx_status, mpdu_desc, queue,</div><div class='add'>+			      le32_to_cpu(pkt-&gt;len_n_flags), &amp;crypto_len))</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_build_rx_skb(mld, skb, hdr, mpdu_len, crypto_len, rxb))</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	/* time sync frame is saved and will be released later when the</div><div class='add'>+	 * notification with the timestamps arrives.</div><div class='add'>+	 */</div><div class='add'>+	if (iwl_mld_time_sync_frame(mld, skb, hdr-&gt;addr2))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	reorder_res = iwl_mld_reorder(mld, napi, queue, sta, skb, mpdu_desc);</div><div class='add'>+	switch (reorder_res) {</div><div class='add'>+	case IWL_MLD_PASS_SKB:</div><div class='add'>+		break;</div><div class='add'>+	case IWL_MLD_DROP_SKB:</div><div class='add'>+		goto drop;</div><div class='add'>+	case IWL_MLD_BUFFERED_SKB:</div><div class='add'>+		goto out;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mld_pass_packet_to_mac80211(mld, napi, skb, queue, sta);</div><div class='add'>+</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+drop:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SYNC_RX_QUEUE_TIMEOUT (HZ)</div><div class='add'>+void iwl_mld_sync_rx_queues(struct iwl_mld *mld,</div><div class='add'>+			    enum iwl_mld_internal_rxq_notif_type type,</div><div class='add'>+			    const void *notif_payload, u32 notif_payload_size)</div><div class='add'>+{</div><div class='add'>+	u8 num_rx_queues = mld-&gt;trans-&gt;info.num_rxqs;</div><div class='add'>+	struct {</div><div class='add'>+		struct iwl_rxq_sync_cmd sync_cmd;</div><div class='add'>+		struct iwl_mld_internal_rxq_notif notif;</div><div class='add'>+	} __packed cmd = {</div><div class='add'>+		.sync_cmd.rxq_mask = cpu_to_le32(BIT(num_rx_queues) - 1),</div><div class='add'>+		.sync_cmd.count =</div><div class='add'>+			cpu_to_le32(sizeof(struct iwl_mld_internal_rxq_notif) +</div><div class='add'>+				    notif_payload_size),</div><div class='add'>+		.notif.type = type,</div><div class='add'>+		.notif.cookie = mld-&gt;rxq_sync.cookie,</div><div class='add'>+	};</div><div class='add'>+	struct iwl_host_cmd hcmd = {</div><div class='add'>+		.id = WIDE_ID(DATA_PATH_GROUP, TRIGGER_RX_QUEUES_NOTIF_CMD),</div><div class='add'>+		.data[0] = &amp;cmd,</div><div class='add'>+		.len[0] = sizeof(cmd),</div><div class='add'>+		.data[1] = notif_payload,</div><div class='add'>+		.len[1] = notif_payload_size,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* size must be a multiple of DWORD */</div><div class='add'>+	if (WARN_ON(cmd.sync_cmd.count &amp; cpu_to_le32(3)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mld-&gt;rxq_sync.state = (1 &lt;&lt; num_rx_queues) - 1;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd(mld, &amp;hcmd);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mld, "Failed to trigger RX queues sync (%d)\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = wait_event_timeout(mld-&gt;rxq_sync.waitq,</div><div class='add'>+				 READ_ONCE(mld-&gt;rxq_sync.state) == 0,</div><div class='add'>+				 SYNC_RX_QUEUE_TIMEOUT);</div><div class='add'>+	WARN_ONCE(!ret, "RXQ sync failed: state=0x%lx, cookie=%d\n",</div><div class='add'>+		  mld-&gt;rxq_sync.state, mld-&gt;rxq_sync.cookie);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mld-&gt;rxq_sync.state = 0;</div><div class='add'>+	mld-&gt;rxq_sync.cookie++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_rx_queues_sync_notif(struct iwl_mld *mld,</div><div class='add'>+					 struct napi_struct *napi,</div><div class='add'>+					 struct iwl_rx_packet *pkt, int queue)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rxq_sync_notification *notif;</div><div class='add'>+	struct iwl_mld_internal_rxq_notif *internal_notif;</div><div class='add'>+	u32 len = iwl_rx_packet_payload_len(pkt);</div><div class='add'>+	size_t combined_notif_len = sizeof(*notif) + sizeof(*internal_notif);</div><div class='add'>+</div><div class='add'>+	notif = (void *)pkt-&gt;data;</div><div class='add'>+	internal_notif = (void *)notif-&gt;payload;</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, len &lt; combined_notif_len,</div><div class='add'>+			 "invalid notification size %u (%zu)\n",</div><div class='add'>+			 len, combined_notif_len))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len -= combined_notif_len;</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, mld-&gt;rxq_sync.cookie != internal_notif-&gt;cookie,</div><div class='add'>+			 "received expired RX queue sync message (cookie=%d expected=%d q[%d])\n",</div><div class='add'>+			 internal_notif-&gt;cookie, mld-&gt;rxq_sync.cookie, queue))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (internal_notif-&gt;type) {</div><div class='add'>+	case IWL_MLD_RXQ_EMPTY:</div><div class='add'>+		IWL_FW_CHECK(mld, len,</div><div class='add'>+			     "invalid empty notification size %d\n", len);</div><div class='add'>+		break;</div><div class='add'>+	case IWL_MLD_RXQ_NOTIF_DEL_BA:</div><div class='add'>+		if (IWL_FW_CHECK(mld, len != sizeof(struct iwl_mld_delba_data),</div><div class='add'>+				 "invalid delba notification size %u (%zu)\n",</div><div class='add'>+				 len, sizeof(struct iwl_mld_delba_data)))</div><div class='add'>+			break;</div><div class='add'>+		iwl_mld_del_ba(mld, queue, (void *)internal_notif-&gt;payload);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_FW_CHECK(mld, !test_and_clear_bit(queue, &amp;mld-&gt;rxq_sync.state),</div><div class='add'>+		     "RXQ sync: queue %d responded a second time!\n", queue);</div><div class='add'>+</div><div class='add'>+	if (READ_ONCE(mld-&gt;rxq_sync.state) == 0)</div><div class='add'>+		wake_up(&amp;mld-&gt;rxq_sync.waitq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_no_data_rx(struct iwl_mld *mld,</div><div class='add'>+			       struct napi_struct *napi,</div><div class='add'>+			       struct iwl_rx_phy_air_sniffer_ntfy *ntfy)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_rx_status *rx_status;</div><div class='add'>+	struct iwl_mld_rx_phy_data phy_data = {</div><div class='add'>+		.ntfy = ntfy,</div><div class='add'>+		.phy_info = 0, /* short preamble set below */</div><div class='add'>+		.rate_n_flags = le32_to_cpu(ntfy-&gt;rate),</div><div class='add'>+		.gp2_on_air_rise = le32_to_cpu(ntfy-&gt;on_air_rise_time),</div><div class='add'>+		.energy_a = ntfy-&gt;rssi_a,</div><div class='add'>+		.energy_b = ntfy-&gt;rssi_b,</div><div class='add'>+	};</div><div class='add'>+	u32 format = phy_data.rate_n_flags &amp; RATE_MCS_MOD_TYPE_MSK;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(128 + sizeof(struct iwl_rx_phy_air_sniffer_ntfy),</div><div class='add'>+			GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rx_status = IEEE80211_SKB_RXCB(skb);</div><div class='add'>+</div><div class='add'>+	/* 0-length PSDU */</div><div class='add'>+	rx_status-&gt;flag |= RX_FLAG_NO_PSDU;</div><div class='add'>+</div><div class='add'>+	switch (ntfy-&gt;status) {</div><div class='add'>+	case IWL_SNIF_STAT_PLCP_RX_OK:</div><div class='add'>+		/* we only get here with sounding PPDUs */</div><div class='add'>+		rx_status-&gt;zero_length_psdu_type =</div><div class='add'>+			IEEE80211_RADIOTAP_ZERO_LEN_PSDU_SOUNDING;</div><div class='add'>+		break;</div><div class='add'>+	case IWL_SNIF_STAT_AID_NOT_FOR_US:</div><div class='add'>+		rx_status-&gt;zero_length_psdu_type =</div><div class='add'>+			IEEE80211_RADIOTAP_ZERO_LEN_PSDU_NOT_CAPTURED;</div><div class='add'>+		break;</div><div class='add'>+	case IWL_SNIF_STAT_PLCP_RX_LSIG_ERR:</div><div class='add'>+	case IWL_SNIF_STAT_PLCP_RX_SIGA_ERR:</div><div class='add'>+	case IWL_SNIF_STAT_PLCP_RX_SIGB_ERR:</div><div class='add'>+	case IWL_SNIF_STAT_UNKNOWN_ERROR:</div><div class='add'>+	default:</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_FAILED_PLCP_CRC;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case IWL_SNIF_STAT_UNEXPECTED_TB:</div><div class='add'>+	case IWL_SNIF_STAT_UNSUPPORTED_RATE:</div><div class='add'>+		rx_status-&gt;zero_length_psdu_type =</div><div class='add'>+			IEEE80211_RADIOTAP_ZERO_LEN_PSDU_VENDOR;</div><div class='add'>+		/* we could include the real reason in a vendor TLV */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (format == RATE_MCS_MOD_TYPE_CCK &amp;&amp;</div><div class='add'>+	    ntfy-&gt;legacy_sig.cck &amp; cpu_to_le32(CCK_CRFR_SHORT_PREAMBLE))</div><div class='add'>+		phy_data.phy_info |= IWL_RX_MPDU_PHY_SHORT_PREAMBLE;</div><div class='add'>+</div><div class='add'>+	iwl_mld_fill_rx_status_band_freq(IEEE80211_SKB_RXCB(skb),</div><div class='add'>+					 ntfy-&gt;band, ntfy-&gt;channel);</div><div class='add'>+</div><div class='add'>+	/* link ID is ignored for NULL header */</div><div class='add'>+	iwl_mld_rx_fill_status(mld, -1, NULL, skb, &amp;phy_data);</div><div class='add'>+</div><div class='add'>+	/* No more radiotap info should be added after this point.</div><div class='add'>+	 * Mark it as mac header for upper layers to know where</div><div class='add'>+	 * the radiotap header ends.</div><div class='add'>+	 */</div><div class='add'>+	skb_set_mac_header(skb, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	/* pass the packet to mac80211 */</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ieee80211_rx_napi(mld-&gt;hw, NULL, skb, napi);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_phy_air_sniffer_notif(struct iwl_mld *mld,</div><div class='add'>+					  struct napi_struct *napi,</div><div class='add'>+					  struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rx_phy_air_sniffer_ntfy *ntfy = (void *)pkt-&gt;data;</div><div class='add'>+	bool is_ndp = false;</div><div class='add'>+	u32 he_type;</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, iwl_rx_packet_payload_len(pkt) &lt; sizeof(*ntfy),</div><div class='add'>+			 "invalid air sniffer notification size\n"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* check if there's an old one to release as errored */</div><div class='add'>+	if (mld-&gt;monitor.phy.valid &amp;&amp; !mld-&gt;monitor.phy.used) {</div><div class='add'>+		/* didn't capture data, so override status */</div><div class='add'>+		mld-&gt;monitor.phy.data.status = IWL_SNIF_STAT_AID_NOT_FOR_US;</div><div class='add'>+		iwl_mld_no_data_rx(mld, napi, &amp;mld-&gt;monitor.phy.data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* old data is no longer valid now */</div><div class='add'>+	mld-&gt;monitor.phy.valid = false;</div><div class='add'>+</div><div class='add'>+	he_type = le32_to_cpu(ntfy-&gt;rate) &amp; RATE_MCS_HE_TYPE_MSK;</div><div class='add'>+</div><div class='add'>+	switch (le32_to_cpu(ntfy-&gt;rate) &amp; RATE_MCS_MOD_TYPE_MSK) {</div><div class='add'>+	case RATE_MCS_MOD_TYPE_HT:</div><div class='add'>+		is_ndp = !le32_get_bits(ntfy-&gt;sigs.ht.a1,</div><div class='add'>+					OFDM_RX_FRAME_HT_LENGTH);</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_VHT:</div><div class='add'>+		is_ndp = le32_get_bits(ntfy-&gt;sigs.vht.a0,</div><div class='add'>+				       OFDM_RX_FRAME_VHT_NUM_OF_DATA_SYM_VALID) &amp;&amp;</div><div class='add'>+			 !le32_get_bits(ntfy-&gt;sigs.vht.a0,</div><div class='add'>+					OFDM_RX_FRAME_VHT_NUM_OF_DATA_SYM);</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_HE:</div><div class='add'>+		if (he_type == RATE_MCS_HE_TYPE_TRIG)</div><div class='add'>+			break;</div><div class='add'>+		is_ndp = le32_get_bits(ntfy-&gt;sigs.he.a3,</div><div class='add'>+				       OFDM_RX_FRAME_HE_NUM_OF_DATA_SYM_VALID) &amp;&amp;</div><div class='add'>+			 !le32_get_bits(ntfy-&gt;sigs.he.a3,</div><div class='add'>+					OFDM_RX_FRAME_HE_NUM_OF_DATA_SYM);</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_EHT:</div><div class='add'>+		if (he_type == RATE_MCS_HE_TYPE_TRIG)</div><div class='add'>+			break;</div><div class='add'>+		is_ndp = le32_get_bits(ntfy-&gt;sigs.eht.sig2,</div><div class='add'>+				       OFDM_RX_FRAME_EHT_NUM_OF_DATA_SYM_VALID) &amp;&amp;</div><div class='add'>+			 !le32_get_bits(ntfy-&gt;sigs.eht.sig2,</div><div class='add'>+					OFDM_RX_FRAME_EHT_NUM_OF_DATA_SYM);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ntfy-&gt;status != IWL_SNIF_STAT_PLCP_RX_OK || is_ndp) {</div><div class='add'>+		iwl_mld_no_data_rx(mld, napi, ntfy);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* hang on to it for the RX_MPDU data packet(s) */</div><div class='add'>+	mld-&gt;monitor.phy.data = *ntfy;</div><div class='add'>+	mld-&gt;monitor.phy.valid = true;</div><div class='add'>+	mld-&gt;monitor.phy.used = false;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/rx.h b/drivers/net/wireless/intel/iwlwifi/mld/rx.h<br/>new file mode 100644<br/>index 000000000000..09dddbd40f55<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/rx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/rx.h</a></div><div class='hunk'>@@ -0,0 +1,73 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_rx_h__</div><div class='add'>+#define __iwl_mld_rx_h__</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_mld_internal_rxq_notif_type - RX queue sync notif types</div><div class='add'>+ *</div><div class='add'>+ * @IWL_MLD_RXQ_EMPTY: empty sync notification</div><div class='add'>+ * @IWL_MLD_RXQ_NOTIF_DEL_BA: notify RSS queues of delBA</div><div class='add'>+ */</div><div class='add'>+enum iwl_mld_internal_rxq_notif_type {</div><div class='add'>+	IWL_MLD_RXQ_EMPTY,</div><div class='add'>+	IWL_MLD_RXQ_NOTIF_DEL_BA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_internal_rxq_notif - @iwl_rxq_sync_cmd internal data.</div><div class='add'>+ * This data is echoed by the firmware to all RSS queues and should be DWORD</div><div class='add'>+ * aligned. FW is agnostic to the data, so there are no endianness requirements</div><div class='add'>+ *</div><div class='add'>+ * @type: one of &amp;iwl_mld_internal_rxq_notif_type</div><div class='add'>+ * @cookie: unique internal cookie to identify old notifications</div><div class='add'>+ * @reserved: reserved for alignment</div><div class='add'>+ * @payload: data to send to RX queues based on the type (may be empty)</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_internal_rxq_notif {</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+	u32 cookie;</div><div class='add'>+	u8 payload[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_rx_queues_sync - RX queues sync data</div><div class='add'>+ *</div><div class='add'>+ * @waitq: wait queue for RX queues sync completion</div><div class='add'>+ * @cookie: unique id to correlate sync requests with responses</div><div class='add'>+ * @state: bitmask representing the sync state of RX queues</div><div class='add'>+ *	all RX queues bits are set before sending the command, and the</div><div class='add'>+ *	corresponding queue bit cleared upon handling the notification</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_rx_queues_sync {</div><div class='add'>+	wait_queue_head_t waitq;</div><div class='add'>+	u32 cookie;</div><div class='add'>+	unsigned long state;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void iwl_mld_rx_mpdu(struct iwl_mld *mld, struct napi_struct *napi,</div><div class='add'>+		     struct iwl_rx_cmd_buffer *rxb, int queue);</div><div class='add'>+</div><div class='add'>+void iwl_mld_sync_rx_queues(struct iwl_mld *mld,</div><div class='add'>+			    enum iwl_mld_internal_rxq_notif_type type,</div><div class='add'>+			    const void *notif_payload, u32 notif_payload_size);</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_rx_queues_sync_notif(struct iwl_mld *mld,</div><div class='add'>+					 struct napi_struct *napi,</div><div class='add'>+					 struct iwl_rx_packet *pkt, int queue);</div><div class='add'>+</div><div class='add'>+void iwl_mld_pass_packet_to_mac80211(struct iwl_mld *mld,</div><div class='add'>+				     struct napi_struct *napi,</div><div class='add'>+				     struct sk_buff *skb, int queue,</div><div class='add'>+				     struct ieee80211_sta *sta);</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_phy_air_sniffer_notif(struct iwl_mld *mld,</div><div class='add'>+					  struct napi_struct *napi,</div><div class='add'>+					  struct iwl_rx_packet *pkt);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_agg_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/scan.c b/drivers/net/wireless/intel/iwlwifi/mld/scan.c<br/>new file mode 100644<br/>index 000000000000..fd1022ddc912<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/scan.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/scan.c</a></div><div class='hunk'>@@ -0,0 +1,2179 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+</div><div class='add'>+#include "iwl-utils.h"</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "scan.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+#include "iface.h"</div><div class='add'>+#include "phy.h"</div><div class='add'>+#include "mlo.h"</div><div class='add'>+</div><div class='add'>+#include "fw/api/scan.h"</div><div class='add'>+#include "fw/dbg.h"</div><div class='add'>+</div><div class='add'>+#define IWL_SCAN_DWELL_ACTIVE 10</div><div class='add'>+#define IWL_SCAN_DWELL_PASSIVE 110</div><div class='add'>+#define IWL_SCAN_NUM_OF_FRAGS 3</div><div class='add'>+</div><div class='add'>+/* adaptive dwell max budget time [TU] for full scan */</div><div class='add'>+#define IWL_SCAN_ADWELL_MAX_BUDGET_FULL_SCAN 300</div><div class='add'>+</div><div class='add'>+/* adaptive dwell max budget time [TU] for directed scan */</div><div class='add'>+#define IWL_SCAN_ADWELL_MAX_BUDGET_DIRECTED_SCAN 100</div><div class='add'>+</div><div class='add'>+/* adaptive dwell default high band APs number */</div><div class='add'>+#define IWL_SCAN_ADWELL_DEFAULT_HB_N_APS 8</div><div class='add'>+</div><div class='add'>+/* adaptive dwell default low band APs number */</div><div class='add'>+#define IWL_SCAN_ADWELL_DEFAULT_LB_N_APS 2</div><div class='add'>+</div><div class='add'>+/* adaptive dwell default APs number for P2P social channels (1, 6, 11) */</div><div class='add'>+#define IWL_SCAN_ADWELL_DEFAULT_N_APS_SOCIAL 10</div><div class='add'>+</div><div class='add'>+/* adaptive dwell number of APs override for P2P friendly GO channels */</div><div class='add'>+#define IWL_SCAN_ADWELL_N_APS_GO_FRIENDLY 10</div><div class='add'>+</div><div class='add'>+/* adaptive dwell number of APs override for P2P social channels */</div><div class='add'>+#define IWL_SCAN_ADWELL_N_APS_SOCIAL_CHS 2</div><div class='add'>+</div><div class='add'>+/* adaptive dwell number of APs override mask for p2p friendly GO */</div><div class='add'>+#define IWL_SCAN_ADWELL_N_APS_GO_FRIENDLY_BIT BIT(20)</div><div class='add'>+</div><div class='add'>+/* adaptive dwell number of APs override mask for social channels */</div><div class='add'>+#define IWL_SCAN_ADWELL_N_APS_SOCIAL_CHS_BIT BIT(21)</div><div class='add'>+</div><div class='add'>+#define SCAN_TIMEOUT_MSEC (30000 * HZ)</div><div class='add'>+</div><div class='add'>+/* minimal number of 2GHz and 5GHz channels in the regular scan request */</div><div class='add'>+#define IWL_MLD_6GHZ_PASSIVE_SCAN_MIN_CHANS 4</div><div class='add'>+</div><div class='add'>+enum iwl_mld_scan_type {</div><div class='add'>+	IWL_SCAN_TYPE_NOT_SET,</div><div class='add'>+	IWL_SCAN_TYPE_UNASSOC,</div><div class='add'>+	IWL_SCAN_TYPE_WILD,</div><div class='add'>+	IWL_SCAN_TYPE_MILD,</div><div class='add'>+	IWL_SCAN_TYPE_FRAGMENTED,</div><div class='add'>+	IWL_SCAN_TYPE_FAST_BALANCE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_mld_scan_timing_params {</div><div class='add'>+	u32 suspend_time;</div><div class='add'>+	u32 max_out_time;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct iwl_mld_scan_timing_params scan_timing[] = {</div><div class='add'>+	[IWL_SCAN_TYPE_UNASSOC] = {</div><div class='add'>+		.suspend_time = 0,</div><div class='add'>+		.max_out_time = 0,</div><div class='add'>+	},</div><div class='add'>+	[IWL_SCAN_TYPE_WILD] = {</div><div class='add'>+		.suspend_time = 30,</div><div class='add'>+		.max_out_time = 120,</div><div class='add'>+	},</div><div class='add'>+	[IWL_SCAN_TYPE_MILD] = {</div><div class='add'>+		.suspend_time = 120,</div><div class='add'>+		.max_out_time = 120,</div><div class='add'>+	},</div><div class='add'>+	[IWL_SCAN_TYPE_FRAGMENTED] = {</div><div class='add'>+		.suspend_time = 95,</div><div class='add'>+		.max_out_time = 44,</div><div class='add'>+	},</div><div class='add'>+	[IWL_SCAN_TYPE_FAST_BALANCE] = {</div><div class='add'>+		.suspend_time = 30,</div><div class='add'>+		.max_out_time = 37,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_mld_scan_params {</div><div class='add'>+	enum iwl_mld_scan_type type;</div><div class='add'>+	u32 n_channels;</div><div class='add'>+	u16 delay;</div><div class='add'>+	int n_ssids;</div><div class='add'>+	struct cfg80211_ssid *ssids;</div><div class='add'>+	struct ieee80211_channel **channels;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u8 *mac_addr;</div><div class='add'>+	u8 *mac_addr_mask;</div><div class='add'>+	bool no_cck;</div><div class='add'>+	bool pass_all;</div><div class='add'>+	int n_match_sets;</div><div class='add'>+	struct iwl_scan_probe_req preq;</div><div class='add'>+	struct cfg80211_match_set *match_sets;</div><div class='add'>+	int n_scan_plans;</div><div class='add'>+	struct cfg80211_sched_scan_plan *scan_plans;</div><div class='add'>+	bool iter_notif;</div><div class='add'>+	bool respect_p2p_go;</div><div class='add'>+	u8 fw_link_id;</div><div class='add'>+	struct cfg80211_scan_6ghz_params *scan_6ghz_params;</div><div class='add'>+	u32 n_6ghz_params;</div><div class='add'>+	bool scan_6ghz;</div><div class='add'>+	bool enable_6ghz_passive;</div><div class='add'>+	u8 bssid[ETH_ALEN] __aligned(2);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_mld_scan_respect_p2p_go_iter_data {</div><div class='add'>+	struct ieee80211_vif *current_vif;</div><div class='add'>+	bool p2p_go;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void iwl_mld_scan_respect_p2p_go_iter(void *_data, u8 *mac,</div><div class='add'>+					     struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_scan_respect_p2p_go_iter_data *data = _data;</div><div class='add'>+</div><div class='add'>+	/* exclude the given vif */</div><div class='add'>+	if (vif == data-&gt;current_vif)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* TODO: CDB check the band of the GO */</div><div class='add'>+	if (ieee80211_vif_type_p2p(vif) == NL80211_IFTYPE_P2P_GO &amp;&amp;</div><div class='add'>+	    iwl_mld_vif_from_mac80211(vif)-&gt;ap_ibss_active)</div><div class='add'>+		data-&gt;p2p_go = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_get_respect_p2p_go(struct iwl_mld *mld,</div><div class='add'>+				       struct ieee80211_vif *vif,</div><div class='add'>+				       bool low_latency)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_scan_respect_p2p_go_iter_data data = {</div><div class='add'>+		.current_vif = vif,</div><div class='add'>+		.p2p_go = false,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!low_latency)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_mtx(mld-&gt;hw,</div><div class='add'>+						IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						iwl_mld_scan_respect_p2p_go_iter,</div><div class='add'>+						&amp;data);</div><div class='add'>+</div><div class='add'>+	return data.p2p_go;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct iwl_mld_scan_iter_data {</div><div class='add'>+	struct ieee80211_vif *current_vif;</div><div class='add'>+	bool active_vif;</div><div class='add'>+	bool is_dcm_with_p2p_go;</div><div class='add'>+	bool global_low_latency;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void iwl_mld_scan_iterator(void *_data, u8 *mac,</div><div class='add'>+				  struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_scan_iter_data *data = _data;</div><div class='add'>+	struct ieee80211_vif *curr_vif = data-&gt;current_vif;</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld_vif *curr_mld_vif;</div><div class='add'>+	unsigned long curr_vif_active_links;</div><div class='add'>+	u16 link_id;</div><div class='add'>+</div><div class='add'>+	data-&gt;global_low_latency |= iwl_mld_vif_low_latency(mld_vif);</div><div class='add'>+</div><div class='add'>+	if ((ieee80211_vif_is_mld(vif) &amp;&amp; vif-&gt;active_links) ||</div><div class='add'>+	    (vif-&gt;type != NL80211_IFTYPE_P2P_DEVICE &amp;&amp;</div><div class='add'>+	     mld_vif-&gt;deflink.active))</div><div class='add'>+		data-&gt;active_vif = true;</div><div class='add'>+</div><div class='add'>+	if (vif == curr_vif)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_type_p2p(vif) != NL80211_IFTYPE_P2P_GO)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Currently P2P GO can't be AP MLD so the logic below assumes that */</div><div class='add'>+	WARN_ON_ONCE(ieee80211_vif_is_mld(vif));</div><div class='add'>+</div><div class='add'>+	curr_vif_active_links =</div><div class='add'>+		ieee80211_vif_is_mld(curr_vif) ? curr_vif-&gt;active_links : 1;</div><div class='add'>+</div><div class='add'>+	curr_mld_vif = iwl_mld_vif_from_mac80211(curr_vif);</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(link_id, &amp;curr_vif_active_links,</div><div class='add'>+			 IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		struct iwl_mld_link *curr_mld_link =</div><div class='add'>+			iwl_mld_link_dereference_check(curr_mld_vif, link_id);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!curr_mld_link))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		if (rcu_access_pointer(curr_mld_link-&gt;chan_ctx) &amp;&amp;</div><div class='add'>+		    rcu_access_pointer(mld_vif-&gt;deflink.chan_ctx) !=</div><div class='add'>+		    rcu_access_pointer(curr_mld_link-&gt;chan_ctx)) {</div><div class='add'>+			data-&gt;is_dcm_with_p2p_go = true;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum</div><div class='add'>+iwl_mld_scan_type iwl_mld_get_scan_type(struct iwl_mld *mld,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					struct iwl_mld_scan_iter_data *data)</div><div class='add'>+{</div><div class='add'>+	enum iwl_mld_traffic_load load = mld-&gt;scan.traffic_load.status;</div><div class='add'>+</div><div class='add'>+	/* A scanning AP interface probably wants to generate a survey to do</div><div class='add'>+	 * ACS (automatic channel selection).</div><div class='add'>+	 * Force a non-fragmented scan in that case.</div><div class='add'>+	 */</div><div class='add'>+	if (ieee80211_vif_type_p2p(vif) == NL80211_IFTYPE_AP)</div><div class='add'>+		return IWL_SCAN_TYPE_WILD;</div><div class='add'>+</div><div class='add'>+	if (!data-&gt;active_vif)</div><div class='add'>+		return IWL_SCAN_TYPE_UNASSOC;</div><div class='add'>+</div><div class='add'>+	if ((load == IWL_MLD_TRAFFIC_HIGH || data-&gt;global_low_latency) &amp;&amp;</div><div class='add'>+	    vif-&gt;type != NL80211_IFTYPE_P2P_DEVICE)</div><div class='add'>+		return IWL_SCAN_TYPE_FRAGMENTED;</div><div class='add'>+</div><div class='add'>+	/* In case of DCM with P2P GO set all scan requests as</div><div class='add'>+	 * fast-balance scan</div><div class='add'>+	 */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+	    data-&gt;is_dcm_with_p2p_go)</div><div class='add'>+		return IWL_SCAN_TYPE_FAST_BALANCE;</div><div class='add'>+</div><div class='add'>+	if (load &gt;= IWL_MLD_TRAFFIC_MEDIUM || data-&gt;global_low_latency)</div><div class='add'>+		return IWL_SCAN_TYPE_MILD;</div><div class='add'>+</div><div class='add'>+	return IWL_SCAN_TYPE_WILD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *</div><div class='add'>+iwl_mld_scan_add_2ghz_elems(struct iwl_mld *mld, const u8 *ies,</div><div class='add'>+			    size_t len, u8 *const pos)</div><div class='add'>+{</div><div class='add'>+	static const u8 before_ds_params[] = {</div><div class='add'>+	    WLAN_EID_SSID,</div><div class='add'>+	    WLAN_EID_SUPP_RATES,</div><div class='add'>+	    WLAN_EID_REQUEST,</div><div class='add'>+	    WLAN_EID_EXT_SUPP_RATES,</div><div class='add'>+	};</div><div class='add'>+	size_t offs;</div><div class='add'>+	u8 *newpos = pos;</div><div class='add'>+</div><div class='add'>+	offs = ieee80211_ie_split(ies, len,</div><div class='add'>+				  before_ds_params,</div><div class='add'>+				  ARRAY_SIZE(before_ds_params),</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+	memcpy(newpos, ies, offs);</div><div class='add'>+	newpos += offs;</div><div class='add'>+</div><div class='add'>+	/* Add a placeholder for DS Parameter Set element */</div><div class='add'>+	*newpos++ = WLAN_EID_DS_PARAMS;</div><div class='add'>+	*newpos++ = 1;</div><div class='add'>+	*newpos++ = 0;</div><div class='add'>+</div><div class='add'>+	memcpy(newpos, ies + offs, len - offs);</div><div class='add'>+	newpos += len - offs;</div><div class='add'>+</div><div class='add'>+	return newpos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_scan_add_tpc_report_elem(u8 *pos)</div><div class='add'>+{</div><div class='add'>+	pos[0] = WLAN_EID_VENDOR_SPECIFIC;</div><div class='add'>+	pos[1] = WFA_TPC_IE_LEN - 2;</div><div class='add'>+	pos[2] = (WLAN_OUI_MICROSOFT &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	pos[3] = (WLAN_OUI_MICROSOFT &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	pos[4] = WLAN_OUI_MICROSOFT &amp; 0xff;</div><div class='add'>+	pos[5] = WLAN_OUI_TYPE_MICROSOFT_TPC;</div><div class='add'>+	pos[6] = 0;</div><div class='add'>+	/* pos[7] - tx power will be inserted by the FW */</div><div class='add'>+	pos[7] = 0;</div><div class='add'>+	pos[8] = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+iwl_mld_scan_ooc_priority(enum iwl_mld_scan_status scan_status)</div><div class='add'>+{</div><div class='add'>+	if (scan_status == IWL_MLD_SCAN_REGULAR)</div><div class='add'>+		return IWL_SCAN_PRIORITY_EXT_6;</div><div class='add'>+	if (scan_status == IWL_MLD_SCAN_INT_MLO)</div><div class='add'>+		return IWL_SCAN_PRIORITY_EXT_4;</div><div class='add'>+</div><div class='add'>+	return IWL_SCAN_PRIORITY_EXT_2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+iwl_mld_scan_is_regular(struct iwl_mld_scan_params *params)</div><div class='add'>+{</div><div class='add'>+	return params-&gt;n_scan_plans == 1 &amp;&amp;</div><div class='add'>+		params-&gt;scan_plans[0].iterations == 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+iwl_mld_scan_is_fragmented(enum iwl_mld_scan_type type)</div><div class='add'>+{</div><div class='add'>+	return (type == IWL_SCAN_TYPE_FRAGMENTED ||</div><div class='add'>+		type == IWL_SCAN_TYPE_FAST_BALANCE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_scan_uid_by_status(struct iwl_mld *mld, int status)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(mld-&gt;scan.uid_status); i++)</div><div class='add'>+		if (mld-&gt;scan.uid_status[i] == status)</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *</div><div class='add'>+iwl_mld_scan_ebs_status_str(enum iwl_scan_ebs_status status)</div><div class='add'>+{</div><div class='add'>+	switch (status) {</div><div class='add'>+	case IWL_SCAN_EBS_SUCCESS:</div><div class='add'>+		return "successful";</div><div class='add'>+	case IWL_SCAN_EBS_INACTIVE:</div><div class='add'>+		return "inactive";</div><div class='add'>+	case IWL_SCAN_EBS_FAILED:</div><div class='add'>+	case IWL_SCAN_EBS_CHAN_NOT_FOUND:</div><div class='add'>+	default:</div><div class='add'>+		return "failed";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_scan_ssid_exist(u8 *ssid, u8 ssid_len, struct iwl_ssid_ie *ssid_list)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; PROBE_OPTION_MAX; i++) {</div><div class='add'>+		if (!ssid_list[i].len)</div><div class='add'>+			return -1;</div><div class='add'>+		if (ssid_list[i].len == ssid_len &amp;&amp;</div><div class='add'>+		    !memcmp(ssid_list[i].ssid, ssid, ssid_len))</div><div class='add'>+			return i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+iwl_mld_scan_fits(struct iwl_mld *mld, int n_ssids,</div><div class='add'>+		  struct ieee80211_scan_ies *ies, int n_channels)</div><div class='add'>+{</div><div class='add'>+	return ((n_ssids &lt;= PROBE_OPTION_MAX) &amp;&amp;</div><div class='add'>+		(n_channels &lt;= mld-&gt;fw-&gt;ucode_capa.n_scan_channels) &amp;&amp;</div><div class='add'>+		(ies-&gt;common_ie_len + ies-&gt;len[NL80211_BAND_2GHZ] +</div><div class='add'>+		 ies-&gt;len[NL80211_BAND_5GHZ] + ies-&gt;len[NL80211_BAND_6GHZ] &lt;=</div><div class='add'>+		 iwl_mld_scan_max_template_size()));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_scan_build_probe_req(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_scan_ies *ies,</div><div class='add'>+			     struct iwl_mld_scan_params *params)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_mgmt *frame = (void *)params-&gt;preq.buf;</div><div class='add'>+	u8 *pos, *newpos;</div><div class='add'>+	const u8 *mac_addr = params-&gt;flags &amp; NL80211_SCAN_FLAG_RANDOM_ADDR ?</div><div class='add'>+		params-&gt;mac_addr : NULL;</div><div class='add'>+</div><div class='add'>+	if (mac_addr)</div><div class='add'>+		get_random_mask_addr(frame-&gt;sa, mac_addr,</div><div class='add'>+				     params-&gt;mac_addr_mask);</div><div class='add'>+	else</div><div class='add'>+		memcpy(frame-&gt;sa, vif-&gt;addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	frame-&gt;frame_control = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ);</div><div class='add'>+	eth_broadcast_addr(frame-&gt;da);</div><div class='add'>+	ether_addr_copy(frame-&gt;bssid, params-&gt;bssid);</div><div class='add'>+	frame-&gt;seq_ctrl = 0;</div><div class='add'>+</div><div class='add'>+	pos = frame-&gt;u.probe_req.variable;</div><div class='add'>+	*pos++ = WLAN_EID_SSID;</div><div class='add'>+	*pos++ = 0;</div><div class='add'>+</div><div class='add'>+	params-&gt;preq.mac_header.offset = 0;</div><div class='add'>+	params-&gt;preq.mac_header.len = cpu_to_le16(24 + 2);</div><div class='add'>+</div><div class='add'>+	/* Insert DS parameter set element on 2.4 GHz band */</div><div class='add'>+	newpos = iwl_mld_scan_add_2ghz_elems(mld,</div><div class='add'>+					     ies-&gt;ies[NL80211_BAND_2GHZ],</div><div class='add'>+					     ies-&gt;len[NL80211_BAND_2GHZ],</div><div class='add'>+					     pos);</div><div class='add'>+	params-&gt;preq.band_data[0].offset = cpu_to_le16(pos - params-&gt;preq.buf);</div><div class='add'>+	params-&gt;preq.band_data[0].len = cpu_to_le16(newpos - pos);</div><div class='add'>+	pos = newpos;</div><div class='add'>+</div><div class='add'>+	memcpy(pos, ies-&gt;ies[NL80211_BAND_5GHZ],</div><div class='add'>+	       ies-&gt;len[NL80211_BAND_5GHZ]);</div><div class='add'>+	params-&gt;preq.band_data[1].offset = cpu_to_le16(pos - params-&gt;preq.buf);</div><div class='add'>+	params-&gt;preq.band_data[1].len =</div><div class='add'>+	    cpu_to_le16(ies-&gt;len[NL80211_BAND_5GHZ]);</div><div class='add'>+	pos += ies-&gt;len[NL80211_BAND_5GHZ];</div><div class='add'>+</div><div class='add'>+	memcpy(pos, ies-&gt;ies[NL80211_BAND_6GHZ],</div><div class='add'>+	       ies-&gt;len[NL80211_BAND_6GHZ]);</div><div class='add'>+	params-&gt;preq.band_data[2].offset = cpu_to_le16(pos - params-&gt;preq.buf);</div><div class='add'>+	params-&gt;preq.band_data[2].len =</div><div class='add'>+		cpu_to_le16(ies-&gt;len[NL80211_BAND_6GHZ]);</div><div class='add'>+	pos += ies-&gt;len[NL80211_BAND_6GHZ];</div><div class='add'>+</div><div class='add'>+	memcpy(pos, ies-&gt;common_ies, ies-&gt;common_ie_len);</div><div class='add'>+	params-&gt;preq.common_data.offset = cpu_to_le16(pos - params-&gt;preq.buf);</div><div class='add'>+</div><div class='add'>+	iwl_mld_scan_add_tpc_report_elem(pos + ies-&gt;common_ie_len);</div><div class='add'>+	params-&gt;preq.common_data.len = cpu_to_le16(ies-&gt;common_ie_len +</div><div class='add'>+						   WFA_TPC_IE_LEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16</div><div class='add'>+iwl_mld_scan_get_cmd_gen_flags(struct iwl_mld *mld,</div><div class='add'>+			       struct iwl_mld_scan_params *params,</div><div class='add'>+			       struct ieee80211_vif *vif,</div><div class='add'>+			       enum iwl_mld_scan_status scan_status)</div><div class='add'>+{</div><div class='add'>+	u16 flags = 0;</div><div class='add'>+</div><div class='add'>+	/* If no direct SSIDs are provided perform a passive scan. Otherwise,</div><div class='add'>+	 * if there is a single SSID which is not the broadcast SSID, assume</div><div class='add'>+	 * that the scan is intended for roaming purposes and thus enable Rx on</div><div class='add'>+	 * all chains to improve chances of hearing the beacons/probe responses.</div><div class='add'>+	 */</div><div class='add'>+	if (params-&gt;n_ssids == 0)</div><div class='add'>+		flags |= IWL_UMAC_SCAN_GEN_FLAGS_V2_FORCE_PASSIVE;</div><div class='add'>+	else if (params-&gt;n_ssids == 1 &amp;&amp; params-&gt;ssids[0].ssid_len)</div><div class='add'>+		flags |= IWL_UMAC_SCAN_GEN_FLAGS_V2_USE_ALL_RX_CHAINS;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;pass_all)</div><div class='add'>+		flags |= IWL_UMAC_SCAN_GEN_FLAGS_V2_PASS_ALL;</div><div class='add'>+	else</div><div class='add'>+		flags |= IWL_UMAC_SCAN_GEN_FLAGS_V2_MATCH;</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_scan_is_fragmented(params-&gt;type))</div><div class='add'>+		flags |= IWL_UMAC_SCAN_GEN_FLAGS_V2_FRAGMENTED_LMAC1;</div><div class='add'>+</div><div class='add'>+	if (!iwl_mld_scan_is_regular(params))</div><div class='add'>+		flags |= IWL_UMAC_SCAN_GEN_FLAGS_V2_PERIODIC;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;iter_notif ||</div><div class='add'>+	    mld-&gt;scan.pass_all_sched_res == SCHED_SCAN_PASS_ALL_STATE_ENABLED)</div><div class='add'>+		flags |= IWL_UMAC_SCAN_GEN_FLAGS_V2_NTFY_ITER_COMPLETE;</div><div class='add'>+</div><div class='add'>+	if (scan_status == IWL_MLD_SCAN_SCHED ||</div><div class='add'>+	    scan_status == IWL_MLD_SCAN_NETDETECT)</div><div class='add'>+		flags |= IWL_UMAC_SCAN_GEN_FLAGS_V2_PREEMPTIVE;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;flags &amp; (NL80211_SCAN_FLAG_ACCEPT_BCAST_PROBE_RESP |</div><div class='add'>+			     NL80211_SCAN_FLAG_OCE_PROBE_REQ_HIGH_TX_RATE |</div><div class='add'>+			     NL80211_SCAN_FLAG_FILS_MAX_CHANNEL_TIME))</div><div class='add'>+		flags |= IWL_UMAC_SCAN_GEN_FLAGS_V2_OCE;</div><div class='add'>+</div><div class='add'>+	if ((scan_status == IWL_MLD_SCAN_SCHED ||</div><div class='add'>+	     scan_status == IWL_MLD_SCAN_NETDETECT) &amp;&amp;</div><div class='add'>+	    params-&gt;flags &amp; NL80211_SCAN_FLAG_COLOCATED_6GHZ)</div><div class='add'>+		flags |= IWL_UMAC_SCAN_GEN_FLAGS_V2_TRIGGER_UHB_SCAN;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;enable_6ghz_passive)</div><div class='add'>+		flags |= IWL_UMAC_SCAN_GEN_FLAGS_V2_6GHZ_PASSIVE_SCAN;</div><div class='add'>+</div><div class='add'>+	flags |= IWL_UMAC_SCAN_GEN_FLAGS_V2_ADAPTIVE_DWELL;</div><div class='add'>+</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8</div><div class='add'>+iwl_mld_scan_get_cmd_gen_flags2(struct iwl_mld *mld,</div><div class='add'>+				struct iwl_mld_scan_params *params,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				enum iwl_mld_scan_status scan_status,</div><div class='add'>+				u16 gen_flags)</div><div class='add'>+{</div><div class='add'>+	u8 flags = 0;</div><div class='add'>+</div><div class='add'>+	/* TODO: CDB */</div><div class='add'>+	if (params-&gt;respect_p2p_go)</div><div class='add'>+		flags |= IWL_UMAC_SCAN_GEN_PARAMS_FLAGS2_RESPECT_P2P_GO_LB |</div><div class='add'>+			IWL_UMAC_SCAN_GEN_PARAMS_FLAGS2_RESPECT_P2P_GO_HB;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;scan_6ghz)</div><div class='add'>+		flags |= IWL_UMAC_SCAN_GEN_PARAMS_FLAGS2_DONT_TOGGLE_ANT;</div><div class='add'>+</div><div class='add'>+	/* For AP interfaces, request survey data for regular scans and if</div><div class='add'>+	 * it is supported. For non-AP interfaces, EBS will be enabled and</div><div class='add'>+	 * the results may be missing information for some channels.</div><div class='add'>+	 */</div><div class='add'>+	if (scan_status == IWL_MLD_SCAN_REGULAR &amp;&amp;</div><div class='add'>+	    ieee80211_vif_type_p2p(vif) == NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+	    gen_flags &amp; IWL_UMAC_SCAN_GEN_FLAGS_V2_FORCE_PASSIVE)</div><div class='add'>+		flags |= IWL_UMAC_SCAN_GEN_FLAGS2_COLLECT_CHANNEL_STATS;</div><div class='add'>+</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_scan_cmd_set_dwell(struct iwl_mld *mld,</div><div class='add'>+			   struct iwl_scan_general_params_v11 *gp,</div><div class='add'>+			   struct iwl_mld_scan_params *params)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_mld_scan_timing_params *timing =</div><div class='add'>+		&amp;scan_timing[params-&gt;type];</div><div class='add'>+</div><div class='add'>+	gp-&gt;adwell_default_social_chn =</div><div class='add'>+	    IWL_SCAN_ADWELL_DEFAULT_N_APS_SOCIAL;</div><div class='add'>+	gp-&gt;adwell_default_2g = IWL_SCAN_ADWELL_DEFAULT_LB_N_APS;</div><div class='add'>+	gp-&gt;adwell_default_5g = IWL_SCAN_ADWELL_DEFAULT_HB_N_APS;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;n_ssids &amp;&amp; params-&gt;ssids[0].ssid_len)</div><div class='add'>+		gp-&gt;adwell_max_budget =</div><div class='add'>+			cpu_to_le16(IWL_SCAN_ADWELL_MAX_BUDGET_DIRECTED_SCAN);</div><div class='add'>+	else</div><div class='add'>+		gp-&gt;adwell_max_budget =</div><div class='add'>+			cpu_to_le16(IWL_SCAN_ADWELL_MAX_BUDGET_FULL_SCAN);</div><div class='add'>+</div><div class='add'>+	gp-&gt;scan_priority = cpu_to_le32(IWL_SCAN_PRIORITY_EXT_6);</div><div class='add'>+</div><div class='add'>+	gp-&gt;max_out_of_time[SCAN_LB_LMAC_IDX] = cpu_to_le32(timing-&gt;max_out_time);</div><div class='add'>+	gp-&gt;suspend_time[SCAN_LB_LMAC_IDX] = cpu_to_le32(timing-&gt;suspend_time);</div><div class='add'>+</div><div class='add'>+	gp-&gt;active_dwell[SCAN_LB_LMAC_IDX] = IWL_SCAN_DWELL_ACTIVE;</div><div class='add'>+	gp-&gt;passive_dwell[SCAN_LB_LMAC_IDX] = IWL_SCAN_DWELL_PASSIVE;</div><div class='add'>+	gp-&gt;active_dwell[SCAN_HB_LMAC_IDX] = IWL_SCAN_DWELL_ACTIVE;</div><div class='add'>+	gp-&gt;passive_dwell[SCAN_HB_LMAC_IDX] = IWL_SCAN_DWELL_PASSIVE;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mld,</div><div class='add'>+		       "Scan: adwell_max_budget=%d max_out_of_time=%d suspend_time=%d\n",</div><div class='add'>+		       gp-&gt;adwell_max_budget,</div><div class='add'>+		       gp-&gt;max_out_of_time[SCAN_LB_LMAC_IDX],</div><div class='add'>+		       gp-&gt;suspend_time[SCAN_LB_LMAC_IDX]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_scan_cmd_set_gen_params(struct iwl_mld *mld,</div><div class='add'>+				struct iwl_mld_scan_params *params,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct iwl_scan_general_params_v11 *gp,</div><div class='add'>+				enum iwl_mld_scan_status scan_status)</div><div class='add'>+{</div><div class='add'>+	u16 gen_flags = iwl_mld_scan_get_cmd_gen_flags(mld, params, vif,</div><div class='add'>+						       scan_status);</div><div class='add'>+	u8 gen_flags2 = iwl_mld_scan_get_cmd_gen_flags2(mld, params, vif,</div><div class='add'>+							scan_status,</div><div class='add'>+							gen_flags);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mld, "General: flags=0x%x, flags2=0x%x\n",</div><div class='add'>+		       gen_flags, gen_flags2);</div><div class='add'>+</div><div class='add'>+	gp-&gt;flags = cpu_to_le16(gen_flags);</div><div class='add'>+	gp-&gt;flags2 = gen_flags2;</div><div class='add'>+</div><div class='add'>+	iwl_mld_scan_cmd_set_dwell(mld, gp, params);</div><div class='add'>+</div><div class='add'>+	if (gen_flags &amp; IWL_UMAC_SCAN_GEN_FLAGS_V2_FRAGMENTED_LMAC1)</div><div class='add'>+		gp-&gt;num_of_fragments[SCAN_LB_LMAC_IDX] = IWL_SCAN_NUM_OF_FRAGS;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;fw_link_id != IWL_MLD_INVALID_FW_ID)</div><div class='add'>+		gp-&gt;scan_start_mac_or_link_id = params-&gt;fw_link_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_scan_cmd_set_sched_params(struct iwl_mld_scan_params *params,</div><div class='add'>+				  struct iwl_scan_umac_schedule *schedule,</div><div class='add'>+				  __le16 *delay)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(!params-&gt;n_scan_plans ||</div><div class='add'>+		    params-&gt;n_scan_plans &gt; IWL_MAX_SCHED_SCAN_PLANS))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; params-&gt;n_scan_plans; i++) {</div><div class='add'>+		struct cfg80211_sched_scan_plan *scan_plan =</div><div class='add'>+		    &amp;params-&gt;scan_plans[i];</div><div class='add'>+</div><div class='add'>+		schedule[i].iter_count = scan_plan-&gt;iterations;</div><div class='add'>+		schedule[i].interval =</div><div class='add'>+		    cpu_to_le16(scan_plan-&gt;interval);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If the number of iterations of the last scan plan is set to zero,</div><div class='add'>+	 * it should run infinitely. However, this is not always the case.</div><div class='add'>+	 * For example, when regular scan is requested the driver sets one scan</div><div class='add'>+	 * plan with one iteration.</div><div class='add'>+	 */</div><div class='add'>+	if (!schedule[params-&gt;n_scan_plans - 1].iter_count)</div><div class='add'>+		schedule[params-&gt;n_scan_plans - 1].iter_count = 0xff;</div><div class='add'>+</div><div class='add'>+	*delay = cpu_to_le16(params-&gt;delay);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* We insert the SSIDs in an inverted order, because the FW will</div><div class='add'>+ * invert it back.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+iwl_mld_scan_cmd_build_ssids(struct iwl_mld_scan_params *params,</div><div class='add'>+			     struct iwl_ssid_ie *ssids, u32 *ssid_bitmap)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+	int index;</div><div class='add'>+	u32 tmp_bitmap = 0;</div><div class='add'>+</div><div class='add'>+	/* copy SSIDs from match list. iwl_config_sched_scan_profiles()</div><div class='add'>+	 * uses the order of these ssids to config match list.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0, j = params-&gt;n_match_sets - 1;</div><div class='add'>+	     j &gt;= 0 &amp;&amp; i &lt; PROBE_OPTION_MAX;</div><div class='add'>+	     i++, j--) {</div><div class='add'>+		/* skip empty SSID match_sets */</div><div class='add'>+		if (!params-&gt;match_sets[j].ssid.ssid_len)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ssids[i].id = WLAN_EID_SSID;</div><div class='add'>+		ssids[i].len = params-&gt;match_sets[j].ssid.ssid_len;</div><div class='add'>+		memcpy(ssids[i].ssid, params-&gt;match_sets[j].ssid.ssid,</div><div class='add'>+		       ssids[i].len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* add SSIDs from scan SSID list */</div><div class='add'>+	for (j = params-&gt;n_ssids - 1;</div><div class='add'>+	     j &gt;= 0 &amp;&amp; i &lt; PROBE_OPTION_MAX;</div><div class='add'>+	     i++, j--) {</div><div class='add'>+		index = iwl_mld_scan_ssid_exist(params-&gt;ssids[j].ssid,</div><div class='add'>+						params-&gt;ssids[j].ssid_len,</div><div class='add'>+						ssids);</div><div class='add'>+		if (index &lt; 0) {</div><div class='add'>+			ssids[i].id = WLAN_EID_SSID;</div><div class='add'>+			ssids[i].len = params-&gt;ssids[j].ssid_len;</div><div class='add'>+			memcpy(ssids[i].ssid, params-&gt;ssids[j].ssid,</div><div class='add'>+			       ssids[i].len);</div><div class='add'>+			tmp_bitmap |= BIT(i);</div><div class='add'>+		} else {</div><div class='add'>+			tmp_bitmap |= BIT(index);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ssid_bitmap)</div><div class='add'>+		*ssid_bitmap = tmp_bitmap;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_scan_fill_6g_chan_list(struct iwl_mld_scan_params *params,</div><div class='add'>+			       struct iwl_scan_probe_params_v4 *pp)</div><div class='add'>+{</div><div class='add'>+	int j, idex_s = 0, idex_b = 0;</div><div class='add'>+	struct cfg80211_scan_6ghz_params *scan_6ghz_params =</div><div class='add'>+		params-&gt;scan_6ghz_params;</div><div class='add'>+</div><div class='add'>+	for (j = 0;</div><div class='add'>+	     j &lt; params-&gt;n_ssids &amp;&amp; idex_s &lt; SCAN_SHORT_SSID_MAX_SIZE;</div><div class='add'>+	     j++) {</div><div class='add'>+		if (!params-&gt;ssids[j].ssid_len)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		pp-&gt;short_ssid[idex_s] =</div><div class='add'>+			cpu_to_le32(~crc32_le(~0, params-&gt;ssids[j].ssid,</div><div class='add'>+					      params-&gt;ssids[j].ssid_len));</div><div class='add'>+</div><div class='add'>+		/* hidden 6ghz scan */</div><div class='add'>+		pp-&gt;direct_scan[idex_s].id = WLAN_EID_SSID;</div><div class='add'>+		pp-&gt;direct_scan[idex_s].len = params-&gt;ssids[j].ssid_len;</div><div class='add'>+		memcpy(pp-&gt;direct_scan[idex_s].ssid, params-&gt;ssids[j].ssid,</div><div class='add'>+		       params-&gt;ssids[j].ssid_len);</div><div class='add'>+		idex_s++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Populate the arrays of the short SSIDs and the BSSIDs using the 6GHz</div><div class='add'>+	 * collocated parameters. This might not be optimal, as this processing</div><div class='add'>+	 * does not (yet) correspond to the actual channels, so it is possible</div><div class='add'>+	 * that some entries would be left out.</div><div class='add'>+	 */</div><div class='add'>+	for (j = 0; j &lt; params-&gt;n_6ghz_params; j++) {</div><div class='add'>+		int k;</div><div class='add'>+</div><div class='add'>+		/* First, try to place the short SSID */</div><div class='add'>+		if (scan_6ghz_params[j].short_ssid_valid) {</div><div class='add'>+			for (k = 0; k &lt; idex_s; k++) {</div><div class='add'>+				if (pp-&gt;short_ssid[k] ==</div><div class='add'>+				    cpu_to_le32(scan_6ghz_params[j].short_ssid))</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (k == idex_s &amp;&amp; idex_s &lt; SCAN_SHORT_SSID_MAX_SIZE) {</div><div class='add'>+				pp-&gt;short_ssid[idex_s++] =</div><div class='add'>+					cpu_to_le32(scan_6ghz_params[j].short_ssid);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* try to place BSSID for the same entry */</div><div class='add'>+		for (k = 0; k &lt; idex_b; k++) {</div><div class='add'>+			if (!memcmp(&amp;pp-&gt;bssid_array[k],</div><div class='add'>+				    scan_6ghz_params[j].bssid, ETH_ALEN))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (k == idex_b &amp;&amp; idex_b &lt; SCAN_BSSID_MAX_SIZE &amp;&amp;</div><div class='add'>+		    !WARN_ONCE(!is_valid_ether_addr(scan_6ghz_params[j].bssid),</div><div class='add'>+			       "scan: invalid BSSID at index %u, index_b=%u\n",</div><div class='add'>+			       j, idex_b)) {</div><div class='add'>+			memcpy(&amp;pp-&gt;bssid_array[idex_b++],</div><div class='add'>+			       scan_6ghz_params[j].bssid, ETH_ALEN);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pp-&gt;short_ssid_num = idex_s;</div><div class='add'>+	pp-&gt;bssid_num = idex_b;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_scan_cmd_set_probe_params(struct iwl_mld_scan_params *params,</div><div class='add'>+				  struct iwl_scan_probe_params_v4 *pp,</div><div class='add'>+				  u32 *bitmap_ssid)</div><div class='add'>+{</div><div class='add'>+	pp-&gt;preq = params-&gt;preq;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;scan_6ghz) {</div><div class='add'>+		iwl_mld_scan_fill_6g_chan_list(params, pp);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* relevant only for 2.4 GHz /5 GHz scan */</div><div class='add'>+	iwl_mld_scan_cmd_build_ssids(params, pp-&gt;direct_scan, bitmap_ssid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+iwl_mld_scan_use_ebs(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+		     bool low_latency)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_ucode_capabilities *capa = &amp;mld-&gt;fw-&gt;ucode_capa;</div><div class='add'>+</div><div class='add'>+	/* We can only use EBS if:</div><div class='add'>+	 *	1. the feature is supported.</div><div class='add'>+	 *	2. the last EBS was successful.</div><div class='add'>+	 *	3. it's not a p2p find operation.</div><div class='add'>+	 *	4. we are not in low latency mode,</div><div class='add'>+	 *	   or if fragmented ebs is supported by the FW</div><div class='add'>+	 *	5. the VIF is not an AP interface (scan wants survey results)</div><div class='add'>+	 */</div><div class='add'>+	return ((capa-&gt;flags &amp; IWL_UCODE_TLV_FLAGS_EBS_SUPPORT) &amp;&amp;</div><div class='add'>+		!mld-&gt;scan.last_ebs_failed &amp;&amp;</div><div class='add'>+		vif-&gt;type != NL80211_IFTYPE_P2P_DEVICE &amp;&amp;</div><div class='add'>+		(!low_latency || fw_has_api(capa, IWL_UCODE_TLV_API_FRAG_EBS)) &amp;&amp;</div><div class='add'>+		ieee80211_vif_type_p2p(vif) != NL80211_IFTYPE_AP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8</div><div class='add'>+iwl_mld_scan_cmd_set_chan_flags(struct iwl_mld *mld,</div><div class='add'>+				struct iwl_mld_scan_params *params,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				bool low_latency)</div><div class='add'>+{</div><div class='add'>+	u8 flags = 0;</div><div class='add'>+</div><div class='add'>+	flags |= IWL_SCAN_CHANNEL_FLAG_ENABLE_CHAN_ORDER;</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_scan_use_ebs(mld, vif, low_latency))</div><div class='add'>+		flags |= IWL_SCAN_CHANNEL_FLAG_EBS |</div><div class='add'>+			 IWL_SCAN_CHANNEL_FLAG_EBS_ACCURATE |</div><div class='add'>+			 IWL_SCAN_CHANNEL_FLAG_CACHE_ADD;</div><div class='add'>+</div><div class='add'>+	/* set fragmented ebs for fragmented scan */</div><div class='add'>+	if (iwl_mld_scan_is_fragmented(params-&gt;type))</div><div class='add'>+		flags |= IWL_SCAN_CHANNEL_FLAG_EBS_FRAG;</div><div class='add'>+</div><div class='add'>+	/* Force EBS in case the scan is a fragmented and there is a need</div><div class='add'>+	 * to take P2P GO operation into consideration during scan operation.</div><div class='add'>+	 */</div><div class='add'>+	/* TODO: CDB */</div><div class='add'>+	if (iwl_mld_scan_is_fragmented(params-&gt;type) &amp;&amp;</div><div class='add'>+	    params-&gt;respect_p2p_go) {</div><div class='add'>+		IWL_DEBUG_SCAN(mld, "Respect P2P GO. Force EBS\n");</div><div class='add'>+		flags |= IWL_SCAN_CHANNEL_FLAG_FORCE_EBS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const u8 p2p_go_friendly_chs[] = {</div><div class='add'>+	36, 40, 44, 48, 149, 153, 157, 161, 165,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 social_chs[] = {</div><div class='add'>+	1, 6, 11</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 iwl_mld_scan_ch_n_aps_flag(enum nl80211_iftype vif_type, u8 ch_id)</div><div class='add'>+{</div><div class='add'>+	if (vif_type != NL80211_IFTYPE_P2P_DEVICE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(p2p_go_friendly_chs); i++) {</div><div class='add'>+		if (ch_id == p2p_go_friendly_chs[i])</div><div class='add'>+			return IWL_SCAN_ADWELL_N_APS_GO_FRIENDLY_BIT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(social_chs); i++) {</div><div class='add'>+		if (ch_id == social_chs[i])</div><div class='add'>+			return IWL_SCAN_ADWELL_N_APS_SOCIAL_CHS_BIT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_scan_cmd_set_channels(struct iwl_mld *mld,</div><div class='add'>+			      struct ieee80211_channel **channels,</div><div class='add'>+			      struct iwl_scan_channel_params_v7 *cp,</div><div class='add'>+			      int n_channels, u32 flags,</div><div class='add'>+			      enum nl80211_iftype vif_type)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; n_channels; i++) {</div><div class='add'>+		enum nl80211_band band = channels[i]-&gt;band;</div><div class='add'>+		struct iwl_scan_channel_cfg_umac *cfg = &amp;cp-&gt;channel_config[i];</div><div class='add'>+		u8 iwl_band = iwl_mld_nl80211_band_to_fw(band);</div><div class='add'>+		u32 n_aps_flag =</div><div class='add'>+			iwl_mld_scan_ch_n_aps_flag(vif_type,</div><div class='add'>+						   channels[i]-&gt;hw_value);</div><div class='add'>+</div><div class='add'>+		if (IWL_MLD_ADAPTIVE_DWELL_NUM_APS_OVERRIDE)</div><div class='add'>+			n_aps_flag = IWL_SCAN_ADWELL_N_APS_GO_FRIENDLY_BIT;</div><div class='add'>+</div><div class='add'>+		cfg-&gt;flags = cpu_to_le32(flags | n_aps_flag);</div><div class='add'>+		cfg-&gt;channel_num = channels[i]-&gt;hw_value;</div><div class='add'>+		if (cfg80211_channel_is_psc(channels[i]))</div><div class='add'>+			cfg-&gt;flags = 0;</div><div class='add'>+</div><div class='add'>+		if (band == NL80211_BAND_6GHZ) {</div><div class='add'>+			/* 6 GHz channels should only appear in a scan request</div><div class='add'>+			 * that has scan_6ghz set. The only exception is MLO</div><div class='add'>+			 * scan, which has to be passive.</div><div class='add'>+			 */</div><div class='add'>+			WARN_ON_ONCE(cfg-&gt;flags != 0);</div><div class='add'>+			cfg-&gt;flags =</div><div class='add'>+				cpu_to_le32(IWL_UHB_CHAN_CFG_FLAG_FORCE_PASSIVE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cfg-&gt;v2.iter_count = 1;</div><div class='add'>+		cfg-&gt;v2.iter_interval = 0;</div><div class='add'>+		cfg-&gt;flags |= cpu_to_le32(iwl_band &lt;&lt;</div><div class='add'>+					  IWL_CHAN_CFG_FLAGS_BAND_POS);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8</div><div class='add'>+iwl_mld_scan_cfg_channels_6g(struct iwl_mld *mld,</div><div class='add'>+			     struct iwl_mld_scan_params *params,</div><div class='add'>+			     u32 n_channels,</div><div class='add'>+			     struct iwl_scan_probe_params_v4 *pp,</div><div class='add'>+			     struct iwl_scan_channel_params_v7 *cp,</div><div class='add'>+			     enum nl80211_iftype vif_type)</div><div class='add'>+{</div><div class='add'>+	struct cfg80211_scan_6ghz_params *scan_6ghz_params =</div><div class='add'>+		params-&gt;scan_6ghz_params;</div><div class='add'>+	u32 i;</div><div class='add'>+	u8 ch_cnt;</div><div class='add'>+</div><div class='add'>+	for (i = 0, ch_cnt = 0; i &lt; params-&gt;n_channels; i++) {</div><div class='add'>+		struct iwl_scan_channel_cfg_umac *cfg =</div><div class='add'>+			&amp;cp-&gt;channel_config[ch_cnt];</div><div class='add'>+</div><div class='add'>+		u32 s_ssid_bitmap = 0, bssid_bitmap = 0, flags = 0;</div><div class='add'>+		u8 k, n_s_ssids = 0, n_bssids = 0;</div><div class='add'>+		u8 max_s_ssids, max_bssids;</div><div class='add'>+		bool force_passive = false, found = false, allow_passive = true,</div><div class='add'>+		     unsolicited_probe_on_chan = false, psc_no_listen = false;</div><div class='add'>+		s8 psd_20 = IEEE80211_RNR_TBTT_PARAMS_PSD_RESERVED;</div><div class='add'>+</div><div class='add'>+		/* Avoid performing passive scan on non PSC channels unless the</div><div class='add'>+		 * scan is specifically a passive scan, i.e., no SSIDs</div><div class='add'>+		 * configured in the scan command.</div><div class='add'>+		 */</div><div class='add'>+		if (!cfg80211_channel_is_psc(params-&gt;channels[i]) &amp;&amp;</div><div class='add'>+		    !params-&gt;n_6ghz_params &amp;&amp; params-&gt;n_ssids)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		cfg-&gt;channel_num = params-&gt;channels[i]-&gt;hw_value;</div><div class='add'>+		cfg-&gt;flags |=</div><div class='add'>+			cpu_to_le32(PHY_BAND_6 &lt;&lt; IWL_CHAN_CFG_FLAGS_BAND_POS);</div><div class='add'>+</div><div class='add'>+		cfg-&gt;v5.iter_count = 1;</div><div class='add'>+		cfg-&gt;v5.iter_interval = 0;</div><div class='add'>+</div><div class='add'>+		for (u32 j = 0; j &lt; params-&gt;n_6ghz_params; j++) {</div><div class='add'>+			s8 tmp_psd_20;</div><div class='add'>+</div><div class='add'>+			if (!(scan_6ghz_params[j].channel_idx == i))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			unsolicited_probe_on_chan |=</div><div class='add'>+				scan_6ghz_params[j].unsolicited_probe;</div><div class='add'>+</div><div class='add'>+			/* Use the highest PSD value allowed as advertised by</div><div class='add'>+			 * APs for this channel</div><div class='add'>+			 */</div><div class='add'>+			tmp_psd_20 = scan_6ghz_params[j].psd_20;</div><div class='add'>+			if (tmp_psd_20 !=</div><div class='add'>+			    IEEE80211_RNR_TBTT_PARAMS_PSD_RESERVED &amp;&amp;</div><div class='add'>+			    (psd_20 ==</div><div class='add'>+			     IEEE80211_RNR_TBTT_PARAMS_PSD_RESERVED ||</div><div class='add'>+			     psd_20 &lt; tmp_psd_20))</div><div class='add'>+				psd_20 = tmp_psd_20;</div><div class='add'>+</div><div class='add'>+			psc_no_listen |= scan_6ghz_params[j].psc_no_listen;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* In the following cases apply passive scan:</div><div class='add'>+		 * 1. Non fragmented scan:</div><div class='add'>+		 *	- PSC channel with NO_LISTEN_FLAG on should be treated</div><div class='add'>+		 *	  like non PSC channel</div><div class='add'>+		 *	- Non PSC channel with more than 3 short SSIDs or more</div><div class='add'>+		 *	  than 9 BSSIDs.</div><div class='add'>+		 *	- Non PSC Channel with unsolicited probe response and</div><div class='add'>+		 *	  more than 2 short SSIDs or more than 6 BSSIDs.</div><div class='add'>+		 *	- PSC channel with more than 2 short SSIDs or more than</div><div class='add'>+		 *	  6 BSSIDs.</div><div class='add'>+		 * 2. Fragmented scan:</div><div class='add'>+		 *	- PSC channel with more than 1 SSID or 3 BSSIDs.</div><div class='add'>+		 *	- Non PSC channel with more than 2 SSIDs or 6 BSSIDs.</div><div class='add'>+		 *	- Non PSC channel with unsolicited probe response and</div><div class='add'>+		 *	  more than 1 SSID or more than 3 BSSIDs.</div><div class='add'>+		 */</div><div class='add'>+		if (!iwl_mld_scan_is_fragmented(params-&gt;type)) {</div><div class='add'>+			if (!cfg80211_channel_is_psc(params-&gt;channels[i]) ||</div><div class='add'>+			    psc_no_listen) {</div><div class='add'>+				if (unsolicited_probe_on_chan) {</div><div class='add'>+					max_s_ssids = 2;</div><div class='add'>+					max_bssids = 6;</div><div class='add'>+				} else {</div><div class='add'>+					max_s_ssids = 3;</div><div class='add'>+					max_bssids = 9;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				max_s_ssids = 2;</div><div class='add'>+				max_bssids = 6;</div><div class='add'>+			}</div><div class='add'>+		} else if (cfg80211_channel_is_psc(params-&gt;channels[i])) {</div><div class='add'>+			max_s_ssids = 1;</div><div class='add'>+			max_bssids = 3;</div><div class='add'>+		} else {</div><div class='add'>+			if (unsolicited_probe_on_chan) {</div><div class='add'>+				max_s_ssids = 1;</div><div class='add'>+				max_bssids = 3;</div><div class='add'>+			} else {</div><div class='add'>+				max_s_ssids = 2;</div><div class='add'>+				max_bssids = 6;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* To optimize the scan time, i.e., reduce the scan dwell time</div><div class='add'>+		 * on each channel, the below logic tries to set 3 direct BSSID</div><div class='add'>+		 * probe requests for each broadcast probe request with a short</div><div class='add'>+		 * SSID.</div><div class='add'>+		 */</div><div class='add'>+		for (u32 j = 0; j &lt; params-&gt;n_6ghz_params; j++) {</div><div class='add'>+			if (!(scan_6ghz_params[j].channel_idx == i))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			found = false;</div><div class='add'>+</div><div class='add'>+			for (k = 0;</div><div class='add'>+			     k &lt; pp-&gt;short_ssid_num &amp;&amp; n_s_ssids &lt; max_s_ssids;</div><div class='add'>+			     k++) {</div><div class='add'>+				if (!scan_6ghz_params[j].unsolicited_probe &amp;&amp;</div><div class='add'>+				    le32_to_cpu(pp-&gt;short_ssid[k]) ==</div><div class='add'>+				    scan_6ghz_params[j].short_ssid) {</div><div class='add'>+					/* Relevant short SSID bit set */</div><div class='add'>+					if (s_ssid_bitmap &amp; BIT(k)) {</div><div class='add'>+						found = true;</div><div class='add'>+						break;</div><div class='add'>+					}</div><div class='add'>+</div><div class='add'>+					/* Prefer creating BSSID entries unless</div><div class='add'>+					 * the short SSID probe can be done in</div><div class='add'>+					 * the same channel dwell iteration.</div><div class='add'>+					 *</div><div class='add'>+					 * We also need to create a short SSID</div><div class='add'>+					 * entry for any hidden AP.</div><div class='add'>+					 */</div><div class='add'>+					if (3 * n_s_ssids &gt; n_bssids &amp;&amp;</div><div class='add'>+					    !pp-&gt;direct_scan[k].len)</div><div class='add'>+						break;</div><div class='add'>+</div><div class='add'>+					/* Hidden AP, cannot do passive scan */</div><div class='add'>+					if (pp-&gt;direct_scan[k].len)</div><div class='add'>+						allow_passive = false;</div><div class='add'>+</div><div class='add'>+					s_ssid_bitmap |= BIT(k);</div><div class='add'>+					n_s_ssids++;</div><div class='add'>+					found = true;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (found)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			for (k = 0; k &lt; pp-&gt;bssid_num; k++) {</div><div class='add'>+				if (memcmp(&amp;pp-&gt;bssid_array[k],</div><div class='add'>+					   scan_6ghz_params[j].bssid,</div><div class='add'>+					   ETH_ALEN))</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				if (bssid_bitmap &amp; BIT(k))</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				if (n_bssids &lt; max_bssids) {</div><div class='add'>+					bssid_bitmap |= BIT(k);</div><div class='add'>+					n_bssids++;</div><div class='add'>+				} else {</div><div class='add'>+					force_passive = TRUE;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (cfg80211_channel_is_psc(params-&gt;channels[i]) &amp;&amp;</div><div class='add'>+		    psc_no_listen)</div><div class='add'>+			flags |= IWL_UHB_CHAN_CFG_FLAG_PSC_CHAN_NO_LISTEN;</div><div class='add'>+</div><div class='add'>+		if (unsolicited_probe_on_chan)</div><div class='add'>+			flags |= IWL_UHB_CHAN_CFG_FLAG_UNSOLICITED_PROBE_RES;</div><div class='add'>+</div><div class='add'>+		if ((allow_passive &amp;&amp; force_passive) ||</div><div class='add'>+		    (!(bssid_bitmap | s_ssid_bitmap) &amp;&amp;</div><div class='add'>+		     !cfg80211_channel_is_psc(params-&gt;channels[i])))</div><div class='add'>+			flags |= IWL_UHB_CHAN_CFG_FLAG_FORCE_PASSIVE;</div><div class='add'>+		else</div><div class='add'>+			flags |= bssid_bitmap | (s_ssid_bitmap &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+		cfg-&gt;flags |= cpu_to_le32(flags);</div><div class='add'>+		cfg-&gt;v5.psd_20 = psd_20;</div><div class='add'>+</div><div class='add'>+		ch_cnt++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (params-&gt;n_channels &gt; ch_cnt)</div><div class='add'>+		IWL_DEBUG_SCAN(mld,</div><div class='add'>+			       "6GHz: reducing number channels: (%u-&gt;%u)\n",</div><div class='add'>+			       params-&gt;n_channels, ch_cnt);</div><div class='add'>+</div><div class='add'>+	return ch_cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_scan_cmd_set_6ghz_chan_params(struct iwl_mld *mld,</div><div class='add'>+				      struct iwl_mld_scan_params *params,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      struct iwl_scan_req_params_v17 *scan_p,</div><div class='add'>+				      enum iwl_mld_scan_status scan_status)</div><div class='add'>+{</div><div class='add'>+	struct iwl_scan_channel_params_v7 *chan_p = &amp;scan_p-&gt;channel_params;</div><div class='add'>+	struct iwl_scan_probe_params_v4 *probe_p = &amp;scan_p-&gt;probe_params;</div><div class='add'>+</div><div class='add'>+	chan_p-&gt;flags = iwl_mld_scan_get_cmd_gen_flags(mld, params, vif,</div><div class='add'>+						       scan_status);</div><div class='add'>+	chan_p-&gt;count = iwl_mld_scan_cfg_channels_6g(mld, params,</div><div class='add'>+						     params-&gt;n_channels,</div><div class='add'>+						     probe_p, chan_p,</div><div class='add'>+						     vif-&gt;type);</div><div class='add'>+	if (!chan_p-&gt;count)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!params-&gt;n_ssids ||</div><div class='add'>+	    (params-&gt;n_ssids == 1 &amp;&amp; !params-&gt;ssids[0].ssid_len))</div><div class='add'>+		chan_p-&gt;flags |= IWL_SCAN_CHANNEL_FLAG_6G_PSC_NO_FILTER;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_scan_cmd_set_chan_params(struct iwl_mld *mld,</div><div class='add'>+				 struct iwl_mld_scan_params *params,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct iwl_scan_req_params_v17 *scan_p,</div><div class='add'>+				 bool low_latency,</div><div class='add'>+				 enum iwl_mld_scan_status scan_status,</div><div class='add'>+				 u32 channel_cfg_flags)</div><div class='add'>+{</div><div class='add'>+	struct iwl_scan_channel_params_v7 *cp = &amp;scan_p-&gt;channel_params;</div><div class='add'>+	struct ieee80211_supported_band *sband =</div><div class='add'>+		&amp;mld-&gt;nvm_data-&gt;bands[NL80211_BAND_6GHZ];</div><div class='add'>+</div><div class='add'>+	cp-&gt;n_aps_override[0] = IWL_SCAN_ADWELL_N_APS_GO_FRIENDLY;</div><div class='add'>+	cp-&gt;n_aps_override[1] = IWL_SCAN_ADWELL_N_APS_SOCIAL_CHS;</div><div class='add'>+</div><div class='add'>+	if (IWL_MLD_ADAPTIVE_DWELL_NUM_APS_OVERRIDE)</div><div class='add'>+		cp-&gt;n_aps_override[0] = IWL_MLD_ADAPTIVE_DWELL_NUM_APS_OVERRIDE;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;scan_6ghz)</div><div class='add'>+		return iwl_mld_scan_cmd_set_6ghz_chan_params(mld, params,</div><div class='add'>+							     vif, scan_p,</div><div class='add'>+							     scan_status);</div><div class='add'>+</div><div class='add'>+	/* relevant only for 2.4 GHz/5 GHz scan */</div><div class='add'>+	cp-&gt;flags = iwl_mld_scan_cmd_set_chan_flags(mld, params, vif,</div><div class='add'>+						    low_latency);</div><div class='add'>+	cp-&gt;count = params-&gt;n_channels;</div><div class='add'>+</div><div class='add'>+	iwl_mld_scan_cmd_set_channels(mld, params-&gt;channels, cp,</div><div class='add'>+				      params-&gt;n_channels, channel_cfg_flags,</div><div class='add'>+				      vif-&gt;type);</div><div class='add'>+</div><div class='add'>+	if (!params-&gt;enable_6ghz_passive)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* fill 6 GHz passive scan cfg */</div><div class='add'>+	for (int i = 0; i &lt; sband-&gt;n_channels; i++) {</div><div class='add'>+		struct ieee80211_channel *channel =</div><div class='add'>+			&amp;sband-&gt;channels[i];</div><div class='add'>+		struct iwl_scan_channel_cfg_umac *cfg =</div><div class='add'>+			&amp;cp-&gt;channel_config[cp-&gt;count];</div><div class='add'>+</div><div class='add'>+		if (!cfg80211_channel_is_psc(channel))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		cfg-&gt;channel_num = channel-&gt;hw_value;</div><div class='add'>+		cfg-&gt;v5.iter_count = 1;</div><div class='add'>+		cfg-&gt;v5.iter_interval = 0;</div><div class='add'>+		cfg-&gt;v5.psd_20 =</div><div class='add'>+			IEEE80211_RNR_TBTT_PARAMS_PSD_RESERVED;</div><div class='add'>+		cfg-&gt;flags = cpu_to_le32(PHY_BAND_6 &lt;&lt;</div><div class='add'>+					 IWL_CHAN_CFG_FLAGS_BAND_POS);</div><div class='add'>+		cp-&gt;count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_scan_build_cmd(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+		       struct iwl_mld_scan_params *params,</div><div class='add'>+		       enum iwl_mld_scan_status scan_status,</div><div class='add'>+		       bool low_latency)</div><div class='add'>+{</div><div class='add'>+	struct iwl_scan_req_umac_v17 *cmd = mld-&gt;scan.cmd;</div><div class='add'>+	struct iwl_scan_req_params_v17 *scan_p = &amp;cmd-&gt;scan_params;</div><div class='add'>+	u32 bitmap_ssid = 0;</div><div class='add'>+	int uid, ret;</div><div class='add'>+</div><div class='add'>+	memset(mld-&gt;scan.cmd, 0, mld-&gt;scan.cmd_size);</div><div class='add'>+</div><div class='add'>+	/* find a free UID entry */</div><div class='add'>+	uid = iwl_mld_scan_uid_by_status(mld, IWL_MLD_SCAN_NONE);</div><div class='add'>+	if (uid &lt; 0)</div><div class='add'>+		return uid;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;uid = cpu_to_le32(uid);</div><div class='add'>+	cmd-&gt;ooc_priority =</div><div class='add'>+		cpu_to_le32(iwl_mld_scan_ooc_priority(scan_status));</div><div class='add'>+</div><div class='add'>+	iwl_mld_scan_cmd_set_gen_params(mld, params, vif,</div><div class='add'>+					&amp;scan_p-&gt;general_params, scan_status);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_scan_cmd_set_sched_params(params,</div><div class='add'>+						scan_p-&gt;periodic_params.schedule,</div><div class='add'>+						&amp;scan_p-&gt;periodic_params.delay);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	iwl_mld_scan_cmd_set_probe_params(params, &amp;scan_p-&gt;probe_params,</div><div class='add'>+					  &amp;bitmap_ssid);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_scan_cmd_set_chan_params(mld, params, vif, scan_p,</div><div class='add'>+					       low_latency, scan_status,</div><div class='add'>+					       bitmap_ssid);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return uid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+iwl_mld_scan_pass_all(struct iwl_mld *mld,</div><div class='add'>+		      struct cfg80211_sched_scan_request *req)</div><div class='add'>+{</div><div class='add'>+	if (req-&gt;n_match_sets &amp;&amp; req-&gt;match_sets[0].ssid.ssid_len) {</div><div class='add'>+		IWL_DEBUG_SCAN(mld,</div><div class='add'>+			       "Sending scheduled scan with filtering, n_match_sets %d\n",</div><div class='add'>+			       req-&gt;n_match_sets);</div><div class='add'>+		mld-&gt;scan.pass_all_sched_res = SCHED_SCAN_PASS_ALL_STATE_DISABLED;</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mld, "Sending Scheduled scan without filtering\n");</div><div class='add'>+	mld-&gt;scan.pass_all_sched_res = SCHED_SCAN_PASS_ALL_STATE_ENABLED;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_config_sched_scan_profiles(struct iwl_mld *mld,</div><div class='add'>+				   struct cfg80211_sched_scan_request *req)</div><div class='add'>+{</div><div class='add'>+	struct iwl_host_cmd hcmd = {</div><div class='add'>+		.id = SCAN_OFFLOAD_UPDATE_PROFILES_CMD,</div><div class='add'>+		.dataflags[0] = IWL_HCMD_DFL_NOCOPY,</div><div class='add'>+	};</div><div class='add'>+	struct iwl_scan_offload_profile *profile;</div><div class='add'>+	struct iwl_scan_offload_profile_cfg_data *cfg_data;</div><div class='add'>+	struct iwl_scan_offload_profile_cfg *profile_cfg;</div><div class='add'>+	struct iwl_scan_offload_blocklist *blocklist;</div><div class='add'>+	u32 blocklist_size = IWL_SCAN_MAX_BLACKLIST_LEN * sizeof(*blocklist);</div><div class='add'>+	u32 cmd_size = blocklist_size + sizeof(*profile_cfg);</div><div class='add'>+	u8 *cmd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(req-&gt;n_match_sets &gt; IWL_SCAN_MAX_PROFILES_V2))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	cmd = kzalloc(cmd_size, GFP_KERNEL);</div><div class='add'>+	if (!cmd)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hcmd.data[0] = cmd;</div><div class='add'>+	hcmd.len[0] = cmd_size;</div><div class='add'>+</div><div class='add'>+	blocklist = (struct iwl_scan_offload_blocklist *)cmd;</div><div class='add'>+	profile_cfg = (struct iwl_scan_offload_profile_cfg *)(cmd + blocklist_size);</div><div class='add'>+</div><div class='add'>+	/* No blocklist configuration */</div><div class='add'>+	cfg_data = &amp;profile_cfg-&gt;data;</div><div class='add'>+	cfg_data-&gt;num_profiles = req-&gt;n_match_sets;</div><div class='add'>+	cfg_data-&gt;active_clients = SCAN_CLIENT_SCHED_SCAN;</div><div class='add'>+	cfg_data-&gt;pass_match = SCAN_CLIENT_SCHED_SCAN;</div><div class='add'>+	cfg_data-&gt;match_notify = SCAN_CLIENT_SCHED_SCAN;</div><div class='add'>+</div><div class='add'>+	if (!req-&gt;n_match_sets || !req-&gt;match_sets[0].ssid.ssid_len)</div><div class='add'>+		cfg_data-&gt;any_beacon_notify = SCAN_CLIENT_SCHED_SCAN;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; req-&gt;n_match_sets; i++) {</div><div class='add'>+		profile = &amp;profile_cfg-&gt;profiles[i];</div><div class='add'>+</div><div class='add'>+		/* Support any cipher and auth algorithm */</div><div class='add'>+		profile-&gt;unicast_cipher = 0xff;</div><div class='add'>+		profile-&gt;auth_alg = IWL_AUTH_ALGO_UNSUPPORTED |</div><div class='add'>+			IWL_AUTH_ALGO_NONE | IWL_AUTH_ALGO_PSK |</div><div class='add'>+			IWL_AUTH_ALGO_8021X | IWL_AUTH_ALGO_SAE |</div><div class='add'>+			IWL_AUTH_ALGO_8021X_SHA384 | IWL_AUTH_ALGO_OWE;</div><div class='add'>+		profile-&gt;network_type = IWL_NETWORK_TYPE_ANY;</div><div class='add'>+		profile-&gt;band_selection = IWL_SCAN_OFFLOAD_SELECT_ANY;</div><div class='add'>+		profile-&gt;client_bitmap = SCAN_CLIENT_SCHED_SCAN;</div><div class='add'>+		profile-&gt;ssid_index = i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mld,</div><div class='add'>+		       "Sending scheduled scan profile config (n_match_sets=%u)\n",</div><div class='add'>+		       req-&gt;n_match_sets);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd(mld, &amp;hcmd);</div><div class='add'>+</div><div class='add'>+	kfree(cmd);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_sched_scan_handle_non_psc_channels(struct iwl_mld_scan_params *params,</div><div class='add'>+					   bool *non_psc_included)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	*non_psc_included = false;</div><div class='add'>+	/* for 6 GHZ band only PSC channels need to be added */</div><div class='add'>+	for (i = 0; i &lt; params-&gt;n_channels; i++) {</div><div class='add'>+		struct ieee80211_channel *channel = params-&gt;channels[i];</div><div class='add'>+</div><div class='add'>+		if (channel-&gt;band == NL80211_BAND_6GHZ &amp;&amp;</div><div class='add'>+		    !cfg80211_channel_is_psc(channel)) {</div><div class='add'>+			*non_psc_included = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!*non_psc_included)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	params-&gt;channels =</div><div class='add'>+		kmemdup(params-&gt;channels,</div><div class='add'>+			sizeof(params-&gt;channels[0]) * params-&gt;n_channels,</div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+	if (!params-&gt;channels)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = j = 0; i &lt; params-&gt;n_channels; i++) {</div><div class='add'>+		if (params-&gt;channels[i]-&gt;band == NL80211_BAND_6GHZ &amp;&amp;</div><div class='add'>+		    !cfg80211_channel_is_psc(params-&gt;channels[i]))</div><div class='add'>+			continue;</div><div class='add'>+		params-&gt;channels[j++] = params-&gt;channels[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	params-&gt;n_channels = j;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_scan_6ghz_passive_scan(struct iwl_mld *mld,</div><div class='add'>+			       struct iwl_mld_scan_params *params,</div><div class='add'>+			       struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_supported_band *sband =</div><div class='add'>+		&amp;mld-&gt;nvm_data-&gt;bands[NL80211_BAND_6GHZ];</div><div class='add'>+	u32 n_disabled, i;</div><div class='add'>+</div><div class='add'>+	params-&gt;enable_6ghz_passive = false;</div><div class='add'>+</div><div class='add'>+	/* 6 GHz passive scan may be enabled in the first 2.4 GHz/5 GHz scan</div><div class='add'>+	 * phase to discover geo location if no AP's are found. Skip it when</div><div class='add'>+	 * we're in the 6 GHz scan phase.</div><div class='add'>+	 */</div><div class='add'>+	if (params-&gt;scan_6ghz)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* 6 GHz passive scan allowed only on station interface  */</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION) {</div><div class='add'>+		IWL_DEBUG_SCAN(mld,</div><div class='add'>+			       "6GHz passive scan: not station interface\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 6 GHz passive scan is allowed in a defined time interval following</div><div class='add'>+	 * HW reset or resume flow, or while not associated and a large</div><div class='add'>+	 * interval has passed since the last 6 GHz passive scan.</div><div class='add'>+	 */</div><div class='add'>+	if ((vif-&gt;cfg.assoc ||</div><div class='add'>+	     time_after(mld-&gt;scan.last_6ghz_passive_jiffies +</div><div class='add'>+			(IWL_MLD_6GHZ_PASSIVE_SCAN_TIMEOUT * HZ), jiffies)) &amp;&amp;</div><div class='add'>+	    (time_before(mld-&gt;scan.last_start_time_jiffies +</div><div class='add'>+			 (IWL_MLD_6GHZ_PASSIVE_SCAN_ASSOC_TIMEOUT * HZ),</div><div class='add'>+			 jiffies))) {</div><div class='add'>+		IWL_DEBUG_SCAN(mld, "6GHz passive scan: %s\n",</div><div class='add'>+			       vif-&gt;cfg.assoc ? "associated" :</div><div class='add'>+			       "timeout did not expire");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* not enough channels in the regular scan request */</div><div class='add'>+	if (params-&gt;n_channels &lt; IWL_MLD_6GHZ_PASSIVE_SCAN_MIN_CHANS) {</div><div class='add'>+		IWL_DEBUG_SCAN(mld,</div><div class='add'>+			       "6GHz passive scan: not enough channels %d\n",</div><div class='add'>+			       params-&gt;n_channels);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; params-&gt;n_ssids; i++) {</div><div class='add'>+		if (!params-&gt;ssids[i].ssid_len)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* not a wildcard scan, so cannot enable passive 6 GHz scan */</div><div class='add'>+	if (i == params-&gt;n_ssids) {</div><div class='add'>+		IWL_DEBUG_SCAN(mld,</div><div class='add'>+			       "6GHz passive scan: no wildcard SSID\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!sband || !sband-&gt;n_channels) {</div><div class='add'>+		IWL_DEBUG_SCAN(mld,</div><div class='add'>+			       "6GHz passive scan: no 6GHz channels\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0, n_disabled = 0; i &lt; sband-&gt;n_channels; i++) {</div><div class='add'>+		if (sband-&gt;channels[i].flags &amp; (IEEE80211_CHAN_DISABLED))</div><div class='add'>+			n_disabled++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Not all the 6 GHz channels are disabled, so no need for 6 GHz</div><div class='add'>+	 * passive scan</div><div class='add'>+	 */</div><div class='add'>+	if (n_disabled != sband-&gt;n_channels) {</div><div class='add'>+		IWL_DEBUG_SCAN(mld,</div><div class='add'>+			       "6GHz passive scan: 6GHz channels enabled\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* all conditions to enable 6 GHz passive scan are satisfied */</div><div class='add'>+	IWL_DEBUG_SCAN(mld, "6GHz passive scan: can be enabled\n");</div><div class='add'>+	params-&gt;enable_6ghz_passive = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_scan_set_link_id(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			 struct iwl_mld_scan_params *params,</div><div class='add'>+			 s8 tsf_report_link_id,</div><div class='add'>+			 enum iwl_mld_scan_status scan_status)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld_link *link;</div><div class='add'>+</div><div class='add'>+	if (tsf_report_link_id &lt; 0) {</div><div class='add'>+		if (vif-&gt;active_links)</div><div class='add'>+			tsf_report_link_id = __ffs(vif-&gt;active_links);</div><div class='add'>+		else</div><div class='add'>+			tsf_report_link_id = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	link = iwl_mld_link_dereference_check(mld_vif, tsf_report_link_id);</div><div class='add'>+	if (!WARN_ON(!link)) {</div><div class='add'>+		params-&gt;fw_link_id = link-&gt;fw_id;</div><div class='add'>+		/* we to store fw_link_id only for regular scan,</div><div class='add'>+		 * and use it in scan complete notif</div><div class='add'>+		 */</div><div class='add'>+		if (scan_status == IWL_MLD_SCAN_REGULAR)</div><div class='add'>+			mld-&gt;scan.fw_link_id = link-&gt;fw_id;</div><div class='add'>+	} else {</div><div class='add'>+		mld-&gt;scan.fw_link_id = IWL_MLD_INVALID_FW_ID;</div><div class='add'>+		params-&gt;fw_link_id = IWL_MLD_INVALID_FW_ID;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+_iwl_mld_single_scan_start(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			   struct cfg80211_scan_request *req,</div><div class='add'>+			   struct ieee80211_scan_ies *ies,</div><div class='add'>+			   enum iwl_mld_scan_status scan_status)</div><div class='add'>+{</div><div class='add'>+	struct iwl_host_cmd hcmd = {</div><div class='add'>+		.id = WIDE_ID(LONG_GROUP, SCAN_REQ_UMAC),</div><div class='add'>+		.len = { mld-&gt;scan.cmd_size, },</div><div class='add'>+		.data = { mld-&gt;scan.cmd, },</div><div class='add'>+		.dataflags = { IWL_HCMD_DFL_NOCOPY, },</div><div class='add'>+	};</div><div class='add'>+	struct iwl_mld_scan_iter_data scan_iter_data = {</div><div class='add'>+		.current_vif = vif,</div><div class='add'>+	};</div><div class='add'>+	struct cfg80211_sched_scan_plan scan_plan = {.iterations = 1};</div><div class='add'>+	struct iwl_mld_scan_params params = {};</div><div class='add'>+	int ret, uid;</div><div class='add'>+</div><div class='add'>+	/* we should have failed registration if scan_cmd was NULL */</div><div class='add'>+	if (WARN_ON(!mld-&gt;scan.cmd))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (!iwl_mld_scan_fits(mld, req-&gt;n_ssids, ies, req-&gt;n_channels))</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_mtx(mld-&gt;hw,</div><div class='add'>+						IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						iwl_mld_scan_iterator,</div><div class='add'>+						&amp;scan_iter_data);</div><div class='add'>+</div><div class='add'>+	params.type = iwl_mld_get_scan_type(mld, vif, &amp;scan_iter_data);</div><div class='add'>+	params.n_ssids = req-&gt;n_ssids;</div><div class='add'>+	params.flags = req-&gt;flags;</div><div class='add'>+	params.n_channels = req-&gt;n_channels;</div><div class='add'>+	params.delay = 0;</div><div class='add'>+	params.ssids = req-&gt;ssids;</div><div class='add'>+	params.channels = req-&gt;channels;</div><div class='add'>+	params.mac_addr = req-&gt;mac_addr;</div><div class='add'>+	params.mac_addr_mask = req-&gt;mac_addr_mask;</div><div class='add'>+	params.no_cck = req-&gt;no_cck;</div><div class='add'>+	params.pass_all = true;</div><div class='add'>+	params.n_match_sets = 0;</div><div class='add'>+	params.match_sets = NULL;</div><div class='add'>+	params.scan_plans = &amp;scan_plan;</div><div class='add'>+	params.n_scan_plans = 1;</div><div class='add'>+</div><div class='add'>+	params.n_6ghz_params = req-&gt;n_6ghz_params;</div><div class='add'>+	params.scan_6ghz_params = req-&gt;scan_6ghz_params;</div><div class='add'>+	params.scan_6ghz = req-&gt;scan_6ghz;</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(params.bssid, req-&gt;bssid);</div><div class='add'>+	/* TODO: CDB - per-band flag */</div><div class='add'>+	params.respect_p2p_go =</div><div class='add'>+		iwl_mld_get_respect_p2p_go(mld, vif,</div><div class='add'>+					   scan_iter_data.global_low_latency);</div><div class='add'>+</div><div class='add'>+	if (req-&gt;duration)</div><div class='add'>+		params.iter_notif = true;</div><div class='add'>+</div><div class='add'>+	iwl_mld_scan_set_link_id(mld, vif, &amp;params, req-&gt;tsf_report_link_id,</div><div class='add'>+				 scan_status);</div><div class='add'>+</div><div class='add'>+	iwl_mld_scan_build_probe_req(mld, vif, ies, &amp;params);</div><div class='add'>+</div><div class='add'>+	iwl_mld_scan_6ghz_passive_scan(mld, &amp;params, vif);</div><div class='add'>+</div><div class='add'>+	uid = iwl_mld_scan_build_cmd(mld, vif, &amp;params, scan_status,</div><div class='add'>+				     scan_iter_data.global_low_latency);</div><div class='add'>+	if (uid &lt; 0)</div><div class='add'>+		return uid;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd(mld, &amp;hcmd);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mld, "Scan failed! ret %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mld, "Scan request send success: status=%u, uid=%u\n",</div><div class='add'>+		       scan_status, uid);</div><div class='add'>+</div><div class='add'>+	mld-&gt;scan.uid_status[uid] = scan_status;</div><div class='add'>+	mld-&gt;scan.status |= scan_status;</div><div class='add'>+</div><div class='add'>+	if (params.enable_6ghz_passive)</div><div class='add'>+		mld-&gt;scan.last_6ghz_passive_jiffies = jiffies;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_scan_send_abort_cmd_status(struct iwl_mld *mld, int uid, u32 *status)</div><div class='add'>+{</div><div class='add'>+	struct iwl_umac_scan_abort abort_cmd = {</div><div class='add'>+		.uid = cpu_to_le32(uid),</div><div class='add'>+	};</div><div class='add'>+	struct iwl_host_cmd cmd = {</div><div class='add'>+		.id = WIDE_ID(LONG_GROUP, SCAN_ABORT_UMAC),</div><div class='add'>+		.flags = CMD_WANT_SKB,</div><div class='add'>+		.data = { &amp;abort_cmd },</div><div class='add'>+		.len[0] = sizeof(abort_cmd),</div><div class='add'>+	};</div><div class='add'>+	struct iwl_rx_packet *pkt;</div><div class='add'>+	struct iwl_cmd_response *resp;</div><div class='add'>+	u32 resp_len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd(mld, &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	pkt = cmd.resp_pkt;</div><div class='add'>+</div><div class='add'>+	resp_len = iwl_rx_packet_payload_len(pkt);</div><div class='add'>+	if (IWL_FW_CHECK(mld, resp_len != sizeof(*resp),</div><div class='add'>+			 "Scan Abort: unexpected response length %d\n",</div><div class='add'>+			 resp_len)) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	resp = (void *)pkt-&gt;data;</div><div class='add'>+	*status = le32_to_cpu(resp-&gt;status);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	iwl_free_resp(&amp;cmd);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_scan_abort(struct iwl_mld *mld, int type, int uid, bool *wait)</div><div class='add'>+{</div><div class='add'>+	enum iwl_umac_scan_abort_status status;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	*wait = true;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mld, "Sending scan abort, uid %u\n", uid);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_scan_send_abort_cmd_status(mld, uid, &amp;status);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mld, "Scan abort: ret=%d status=%u\n", ret, status);</div><div class='add'>+</div><div class='add'>+	/* We don't need to wait to scan complete in the following cases:</div><div class='add'>+	 * 1. Driver failed to send the scan abort cmd.</div><div class='add'>+	 * 2. The FW is no longer familiar with the scan that needs to be</div><div class='add'>+	 *    stopped. It is expected that the scan complete notification was</div><div class='add'>+	 *    already received but not yet processed.</div><div class='add'>+	 *</div><div class='add'>+	 * In both cases the flow should continue similar to the case that the</div><div class='add'>+	 * scan was really aborted.</div><div class='add'>+	 */</div><div class='add'>+	if (ret || status == IWL_UMAC_SCAN_ABORT_STATUS_NOT_FOUND)</div><div class='add'>+		*wait = false;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_scan_stop_wait(struct iwl_mld *mld, int type, int uid)</div><div class='add'>+{</div><div class='add'>+	struct iwl_notification_wait wait_scan_done;</div><div class='add'>+	static const u16 scan_comp_notif[] = { SCAN_COMPLETE_UMAC };</div><div class='add'>+	bool wait = true;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	iwl_init_notification_wait(&amp;mld-&gt;notif_wait, &amp;wait_scan_done,</div><div class='add'>+				   scan_comp_notif,</div><div class='add'>+				   ARRAY_SIZE(scan_comp_notif),</div><div class='add'>+				   NULL, NULL);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mld, "Preparing to stop scan, type=%x\n", type);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_scan_abort(mld, type, uid, &amp;wait);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_DEBUG_SCAN(mld, "couldn't stop scan type=%d\n", type);</div><div class='add'>+		goto return_no_wait;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!wait) {</div><div class='add'>+		IWL_DEBUG_SCAN(mld, "no need to wait for scan type=%d\n", type);</div><div class='add'>+		goto return_no_wait;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return iwl_wait_notification(&amp;mld-&gt;notif_wait, &amp;wait_scan_done, HZ);</div><div class='add'>+</div><div class='add'>+return_no_wait:</div><div class='add'>+	iwl_remove_notification(&amp;mld-&gt;notif_wait, &amp;wait_scan_done);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_sched_scan_start(struct iwl_mld *mld,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     struct cfg80211_sched_scan_request *req,</div><div class='add'>+			     struct ieee80211_scan_ies *ies,</div><div class='add'>+			     int type)</div><div class='add'>+{</div><div class='add'>+	struct iwl_host_cmd hcmd = {</div><div class='add'>+		.id = WIDE_ID(LONG_GROUP, SCAN_REQ_UMAC),</div><div class='add'>+		.len = { mld-&gt;scan.cmd_size, },</div><div class='add'>+		.data = { mld-&gt;scan.cmd, },</div><div class='add'>+		.dataflags = { IWL_HCMD_DFL_NOCOPY, },</div><div class='add'>+	};</div><div class='add'>+	struct iwl_mld_scan_params params = {};</div><div class='add'>+	struct iwl_mld_scan_iter_data scan_iter_data = {</div><div class='add'>+		.current_vif = vif,</div><div class='add'>+	};</div><div class='add'>+	bool non_psc_included = false;</div><div class='add'>+	int ret, uid;</div><div class='add'>+</div><div class='add'>+	/* we should have failed registration if scan_cmd was NULL */</div><div class='add'>+	if (WARN_ON(!mld-&gt;scan.cmd))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* FW supports only a single periodic scan */</div><div class='add'>+	if (mld-&gt;scan.status &amp; (IWL_MLD_SCAN_SCHED | IWL_MLD_SCAN_NETDETECT))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_mtx(mld-&gt;hw,</div><div class='add'>+						IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						iwl_mld_scan_iterator,</div><div class='add'>+						&amp;scan_iter_data);</div><div class='add'>+</div><div class='add'>+	params.type = iwl_mld_get_scan_type(mld, vif, &amp;scan_iter_data);</div><div class='add'>+	params.flags = req-&gt;flags;</div><div class='add'>+	params.n_ssids = req-&gt;n_ssids;</div><div class='add'>+	params.ssids = req-&gt;ssids;</div><div class='add'>+	params.n_channels = req-&gt;n_channels;</div><div class='add'>+	params.channels = req-&gt;channels;</div><div class='add'>+	params.mac_addr = req-&gt;mac_addr;</div><div class='add'>+	params.mac_addr_mask = req-&gt;mac_addr_mask;</div><div class='add'>+	params.no_cck = false;</div><div class='add'>+	params.pass_all =  iwl_mld_scan_pass_all(mld, req);</div><div class='add'>+	params.n_match_sets = req-&gt;n_match_sets;</div><div class='add'>+	params.match_sets = req-&gt;match_sets;</div><div class='add'>+	params.n_scan_plans = req-&gt;n_scan_plans;</div><div class='add'>+	params.scan_plans = req-&gt;scan_plans;</div><div class='add'>+	/* TODO: CDB - per-band flag */</div><div class='add'>+	params.respect_p2p_go =</div><div class='add'>+		iwl_mld_get_respect_p2p_go(mld, vif,</div><div class='add'>+					   scan_iter_data.global_low_latency);</div><div class='add'>+</div><div class='add'>+	/* UMAC scan supports up to 16-bit delays, trim it down to 16-bits */</div><div class='add'>+	params.delay = req-&gt;delay &gt; U16_MAX ? U16_MAX : req-&gt;delay;</div><div class='add'>+</div><div class='add'>+	eth_broadcast_addr(params.bssid);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_config_sched_scan_profiles(mld, req);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	iwl_mld_scan_build_probe_req(mld, vif, ies, &amp;params);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_sched_scan_handle_non_psc_channels(&amp;params,</div><div class='add'>+							 &amp;non_psc_included);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!iwl_mld_scan_fits(mld, req-&gt;n_ssids, ies, params.n_channels)) {</div><div class='add'>+		ret = -ENOBUFS;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	uid = iwl_mld_scan_build_cmd(mld, vif, &amp;params, type,</div><div class='add'>+				     scan_iter_data.global_low_latency);</div><div class='add'>+	if (uid &lt; 0) {</div><div class='add'>+		ret = uid;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd(mld, &amp;hcmd);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		IWL_DEBUG_SCAN(mld,</div><div class='add'>+			       "Sched scan request send success: type=%u, uid=%u\n",</div><div class='add'>+			       type, uid);</div><div class='add'>+		mld-&gt;scan.uid_status[uid] = type;</div><div class='add'>+		mld-&gt;scan.status |= type;</div><div class='add'>+	} else {</div><div class='add'>+		IWL_ERR(mld, "Sched scan failed! ret %d\n", ret);</div><div class='add'>+		mld-&gt;scan.pass_all_sched_res = SCHED_SCAN_PASS_ALL_STATE_DISABLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (non_psc_included)</div><div class='add'>+		kfree(params.channels);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_scan_stop(struct iwl_mld *mld, int type, bool notify)</div><div class='add'>+{</div><div class='add'>+	int uid, ret;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mld,</div><div class='add'>+		       "Request to stop scan: type=0x%x, status=0x%x\n",</div><div class='add'>+		       type, mld-&gt;scan.status);</div><div class='add'>+</div><div class='add'>+	if (!(mld-&gt;scan.status &amp; type))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	uid = iwl_mld_scan_uid_by_status(mld, type);</div><div class='add'>+	/* must be valid, we just checked it's running */</div><div class='add'>+	if (WARN_ON_ONCE(uid &lt; 0))</div><div class='add'>+		return uid;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_scan_stop_wait(mld, type, uid);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_DEBUG_SCAN(mld, "Failed to stop scan\n");</div><div class='add'>+</div><div class='add'>+	/* Clear the scan status so the next scan requests will</div><div class='add'>+	 * succeed and mark the scan as stopping, so that the Rx</div><div class='add'>+	 * handler doesn't do anything, as the scan was stopped from</div><div class='add'>+	 * above. Also remove the handler to not notify mac80211</div><div class='add'>+	 * erroneously after a new scan starts, for example.</div><div class='add'>+	 */</div><div class='add'>+	mld-&gt;scan.status &amp;= ~type;</div><div class='add'>+	mld-&gt;scan.uid_status[uid] = IWL_MLD_SCAN_NONE;</div><div class='add'>+	iwl_mld_cancel_notifications_of_object(mld, IWL_MLD_OBJECT_TYPE_SCAN,</div><div class='add'>+					       uid);</div><div class='add'>+</div><div class='add'>+	if (type == IWL_MLD_SCAN_REGULAR) {</div><div class='add'>+		if (notify) {</div><div class='add'>+			struct cfg80211_scan_info info = {</div><div class='add'>+				.aborted = true,</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ieee80211_scan_completed(mld-&gt;hw, &amp;info);</div><div class='add'>+		}</div><div class='add'>+	} else if (notify) {</div><div class='add'>+		ieee80211_sched_scan_stopped(mld-&gt;hw);</div><div class='add'>+		mld-&gt;scan.pass_all_sched_res = SCHED_SCAN_PASS_ALL_STATE_DISABLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_regular_scan_start(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			       struct cfg80211_scan_request *req,</div><div class='add'>+			       struct ieee80211_scan_ies *ies)</div><div class='add'>+{</div><div class='add'>+	/* Clear survey data when starting the first part of a regular scan */</div><div class='add'>+	if (req-&gt;first_part &amp;&amp; mld-&gt;channel_survey)</div><div class='add'>+		memset(mld-&gt;channel_survey-&gt;channels, 0,</div><div class='add'>+		       sizeof(mld-&gt;channel_survey-&gt;channels[0]) *</div><div class='add'>+		       mld-&gt;channel_survey-&gt;n_channels);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE)</div><div class='add'>+		iwl_mld_emlsr_block_tmp_non_bss(mld);</div><div class='add'>+</div><div class='add'>+	return _iwl_mld_single_scan_start(mld, vif, req, ies,</div><div class='add'>+					  IWL_MLD_SCAN_REGULAR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_int_mlo_scan_start(struct iwl_mld *mld,</div><div class='add'>+				       struct ieee80211_vif *vif,</div><div class='add'>+				       struct ieee80211_channel **channels,</div><div class='add'>+				       size_t n_channels)</div><div class='add'>+{</div><div class='add'>+	struct cfg80211_scan_request *req __free(kfree) = NULL;</div><div class='add'>+	struct ieee80211_scan_ies ies = {};</div><div class='add'>+	size_t size;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mld, "Starting Internal MLO scan: n_channels=%zu\n",</div><div class='add'>+		       n_channels);</div><div class='add'>+</div><div class='add'>+	size = struct_size(req, channels, n_channels);</div><div class='add'>+	req = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	if (!req)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* set the requested channels */</div><div class='add'>+	for (int i = 0; i &lt; n_channels; i++)</div><div class='add'>+		req-&gt;channels[i] = channels[i];</div><div class='add'>+</div><div class='add'>+	req-&gt;n_channels = n_channels;</div><div class='add'>+</div><div class='add'>+	/* set the rates */</div><div class='add'>+	for (int i = 0; i &lt; NUM_NL80211_BANDS; i++)</div><div class='add'>+		if (mld-&gt;wiphy-&gt;bands[i])</div><div class='add'>+			req-&gt;rates[i] =</div><div class='add'>+				(1 &lt;&lt; mld-&gt;wiphy-&gt;bands[i]-&gt;n_bitrates) - 1;</div><div class='add'>+</div><div class='add'>+	req-&gt;wdev = ieee80211_vif_to_wdev(vif);</div><div class='add'>+	req-&gt;wiphy = mld-&gt;wiphy;</div><div class='add'>+	req-&gt;scan_start = jiffies;</div><div class='add'>+	req-&gt;tsf_report_link_id = -1;</div><div class='add'>+</div><div class='add'>+	ret = _iwl_mld_single_scan_start(mld, vif, req, &amp;ies,</div><div class='add'>+					 IWL_MLD_SCAN_INT_MLO);</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		mld-&gt;scan.last_mlo_scan_time = ktime_get_boottime_ns();</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mld, "Internal MLO scan: ret=%d\n", ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_MLO_SCAN_BLOCKOUT_TIME		5 /* seconds */</div><div class='add'>+</div><div class='add'>+void iwl_mld_int_mlo_scan(struct iwl_mld *mld, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_channel *channels[IEEE80211_MLD_MAX_NUM_LINKS];</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	unsigned long usable_links = ieee80211_vif_usable_links(vif);</div><div class='add'>+	size_t n_channels = 0;</div><div class='add'>+	u8 link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!IWL_MLD_AUTO_EML_ENABLE || !vif-&gt;cfg.assoc ||</div><div class='add'>+	    !ieee80211_vif_is_mld(vif) || hweight16(vif-&gt;valid_links) == 1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (mld-&gt;scan.status &amp; IWL_MLD_SCAN_INT_MLO) {</div><div class='add'>+		IWL_DEBUG_SCAN(mld, "Internal MLO scan is already running\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mld_vif-&gt;last_link_activation_time &gt; ktime_get_boottime_seconds() -</div><div class='add'>+						 IWL_MLD_MLO_SCAN_BLOCKOUT_TIME) {</div><div class='add'>+		/* timing doesn't matter much, so use the blockout time */</div><div class='add'>+		wiphy_delayed_work_queue(mld-&gt;wiphy,</div><div class='add'>+					 &amp;mld_vif-&gt;mlo_scan_start_wk,</div><div class='add'>+					 IWL_MLD_MLO_SCAN_BLOCKOUT_TIME);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(link_id, &amp;usable_links, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		struct ieee80211_bss_conf *link_conf =</div><div class='add'>+			link_conf_dereference_check(vif, link_id);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON_ONCE(!link_conf))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		channels[n_channels++] = link_conf-&gt;chanreq.oper.chan;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!n_channels)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mld_int_mlo_scan_start(mld, vif, channels, n_channels);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_scan_iter_complete_notif(struct iwl_mld *mld,</div><div class='add'>+					     struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_umac_scan_iter_complete_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+	u32 uid = __le32_to_cpu(notif-&gt;uid);</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, uid &gt;= ARRAY_SIZE(mld-&gt;scan.uid_status),</div><div class='add'>+			 "FW reports out-of-range scan UID %d\n", uid))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (mld-&gt;scan.uid_status[uid] == IWL_MLD_SCAN_REGULAR)</div><div class='add'>+		mld-&gt;scan.start_tsf = le64_to_cpu(notif-&gt;start_tsf);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mld,</div><div class='add'>+		       "UMAC Scan iteration complete: status=0x%x scanned_channels=%d\n",</div><div class='add'>+		       notif-&gt;status, notif-&gt;scanned_channels);</div><div class='add'>+</div><div class='add'>+	if (mld-&gt;scan.pass_all_sched_res == SCHED_SCAN_PASS_ALL_STATE_FOUND) {</div><div class='add'>+		IWL_DEBUG_SCAN(mld, "Pass all scheduled scan results found\n");</div><div class='add'>+		ieee80211_sched_scan_results(mld-&gt;hw);</div><div class='add'>+		mld-&gt;scan.pass_all_sched_res = SCHED_SCAN_PASS_ALL_STATE_ENABLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mld,</div><div class='add'>+		       "UMAC Scan iteration complete: scan started at %llu (TSF)\n",</div><div class='add'>+		       le64_to_cpu(notif-&gt;start_tsf));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_match_found_notif(struct iwl_mld *mld,</div><div class='add'>+				      struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	IWL_DEBUG_SCAN(mld, "Scheduled scan results\n");</div><div class='add'>+	ieee80211_sched_scan_results(mld-&gt;hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_scan_complete_notif(struct iwl_mld *mld,</div><div class='add'>+					struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_umac_scan_complete *notif = (void *)pkt-&gt;data;</div><div class='add'>+	bool aborted = (notif-&gt;status == IWL_SCAN_OFFLOAD_ABORTED);</div><div class='add'>+	u32 uid = __le32_to_cpu(notif-&gt;uid);</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, uid &gt;= ARRAY_SIZE(mld-&gt;scan.uid_status),</div><div class='add'>+			 "FW reports out-of-range scan UID %d\n", uid))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mld,</div><div class='add'>+		       "Scan completed: uid=%u type=%u, status=%s, EBS=%s\n",</div><div class='add'>+		       uid, mld-&gt;scan.uid_status[uid],</div><div class='add'>+		       notif-&gt;status == IWL_SCAN_OFFLOAD_COMPLETED ?</div><div class='add'>+				"completed" : "aborted",</div><div class='add'>+		       iwl_mld_scan_ebs_status_str(notif-&gt;ebs_status));</div><div class='add'>+	IWL_DEBUG_SCAN(mld, "Scan completed: scan_status=0x%x\n",</div><div class='add'>+		       mld-&gt;scan.status);</div><div class='add'>+	IWL_DEBUG_SCAN(mld,</div><div class='add'>+		       "Scan completed: line=%u, iter=%u, elapsed time=%u\n",</div><div class='add'>+		       notif-&gt;last_schedule, notif-&gt;last_iter,</div><div class='add'>+		       __le32_to_cpu(notif-&gt;time_from_last_iter));</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, !(mld-&gt;scan.uid_status[uid] &amp; mld-&gt;scan.status),</div><div class='add'>+			 "FW reports scan UID %d we didn't trigger\n", uid))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* if the scan is already stopping, we don't need to notify mac80211 */</div><div class='add'>+	if (mld-&gt;scan.uid_status[uid] == IWL_MLD_SCAN_REGULAR) {</div><div class='add'>+		struct cfg80211_scan_info info = {</div><div class='add'>+			.aborted = aborted,</div><div class='add'>+			.scan_start_tsf = mld-&gt;scan.start_tsf,</div><div class='add'>+		};</div><div class='add'>+		int fw_link_id = mld-&gt;scan.fw_link_id;</div><div class='add'>+		struct ieee80211_bss_conf *link_conf = NULL;</div><div class='add'>+</div><div class='add'>+		if (fw_link_id != IWL_MLD_INVALID_FW_ID)</div><div class='add'>+			link_conf =</div><div class='add'>+				wiphy_dereference(mld-&gt;wiphy,</div><div class='add'>+						  mld-&gt;fw_id_to_bss_conf[fw_link_id]);</div><div class='add'>+</div><div class='add'>+		/* It is possible that by the time the scan is complete the</div><div class='add'>+		 * link was already removed and is not valid.</div><div class='add'>+		 */</div><div class='add'>+		if (link_conf)</div><div class='add'>+			ether_addr_copy(info.tsf_bssid, link_conf-&gt;bssid);</div><div class='add'>+		else</div><div class='add'>+			IWL_DEBUG_SCAN(mld, "Scan link is no longer valid\n");</div><div class='add'>+</div><div class='add'>+		ieee80211_scan_completed(mld-&gt;hw, &amp;info);</div><div class='add'>+</div><div class='add'>+		/* Scan is over, we can check again the tpt counters */</div><div class='add'>+		iwl_mld_stop_ignoring_tpt_updates(mld);</div><div class='add'>+	} else if (mld-&gt;scan.uid_status[uid] == IWL_MLD_SCAN_SCHED) {</div><div class='add'>+		ieee80211_sched_scan_stopped(mld-&gt;hw);</div><div class='add'>+		mld-&gt;scan.pass_all_sched_res = SCHED_SCAN_PASS_ALL_STATE_DISABLED;</div><div class='add'>+	} else if (mld-&gt;scan.uid_status[uid] == IWL_MLD_SCAN_INT_MLO) {</div><div class='add'>+		IWL_DEBUG_SCAN(mld, "Internal MLO scan completed\n");</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We limit link selection to internal MLO scans as otherwise</div><div class='add'>+		 * we do not know whether all channels were covered.</div><div class='add'>+		 */</div><div class='add'>+		iwl_mld_select_links(mld);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mld-&gt;scan.status &amp;= ~mld-&gt;scan.uid_status[uid];</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mld, "Scan completed: after update: scan_status=0x%x\n",</div><div class='add'>+		       mld-&gt;scan.status);</div><div class='add'>+</div><div class='add'>+	mld-&gt;scan.uid_status[uid] = IWL_MLD_SCAN_NONE;</div><div class='add'>+</div><div class='add'>+	if (notif-&gt;ebs_status != IWL_SCAN_EBS_SUCCESS &amp;&amp;</div><div class='add'>+	    notif-&gt;ebs_status != IWL_SCAN_EBS_INACTIVE)</div><div class='add'>+		mld-&gt;scan.last_ebs_failed = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function is used in nic restart flow, to inform mac80211 about scans</div><div class='add'>+ * that were aborted by restart flow or by an assert.</div><div class='add'>+ */</div><div class='add'>+void iwl_mld_report_scan_aborted(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	int uid;</div><div class='add'>+</div><div class='add'>+	uid = iwl_mld_scan_uid_by_status(mld, IWL_MLD_SCAN_REGULAR);</div><div class='add'>+	if (uid &gt;= 0) {</div><div class='add'>+		struct cfg80211_scan_info info = {</div><div class='add'>+			.aborted = true,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ieee80211_scan_completed(mld-&gt;hw, &amp;info);</div><div class='add'>+		mld-&gt;scan.uid_status[uid] = IWL_MLD_SCAN_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	uid = iwl_mld_scan_uid_by_status(mld, IWL_MLD_SCAN_SCHED);</div><div class='add'>+	if (uid &gt;= 0) {</div><div class='add'>+		mld-&gt;scan.pass_all_sched_res = SCHED_SCAN_PASS_ALL_STATE_DISABLED;</div><div class='add'>+		mld-&gt;scan.uid_status[uid] = IWL_MLD_SCAN_NONE;</div><div class='add'>+</div><div class='add'>+		/* sched scan will be restarted by mac80211 in reconfig.</div><div class='add'>+		 * report to mac80211 that sched scan stopped only if we won't</div><div class='add'>+		 * restart the firmware.</div><div class='add'>+		 */</div><div class='add'>+		if (!iwlwifi_mod_params.fw_restart)</div><div class='add'>+			ieee80211_sched_scan_stopped(mld-&gt;hw);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	uid = iwl_mld_scan_uid_by_status(mld, IWL_MLD_SCAN_INT_MLO);</div><div class='add'>+	if (uid &gt;= 0) {</div><div class='add'>+		IWL_DEBUG_SCAN(mld, "Internal MLO scan aborted\n");</div><div class='add'>+		mld-&gt;scan.uid_status[uid] = IWL_MLD_SCAN_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(IWL_MLD_SCAN_NONE != 0);</div><div class='add'>+	memset(mld-&gt;scan.uid_status, 0, sizeof(mld-&gt;scan.uid_status));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_alloc_scan_cmd(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	u8 scan_cmd_ver = iwl_fw_lookup_cmd_ver(mld-&gt;fw, SCAN_REQ_UMAC,</div><div class='add'>+						IWL_FW_CMD_VER_UNKNOWN);</div><div class='add'>+	size_t scan_cmd_size;</div><div class='add'>+</div><div class='add'>+	if (scan_cmd_ver == 17) {</div><div class='add'>+		scan_cmd_size = sizeof(struct iwl_scan_req_umac_v17);</div><div class='add'>+	} else {</div><div class='add'>+		IWL_ERR(mld, "Unexpected scan cmd version %d\n", scan_cmd_ver);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mld-&gt;scan.cmd = kmalloc(scan_cmd_size, GFP_KERNEL);</div><div class='add'>+	if (!mld-&gt;scan.cmd)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mld-&gt;scan.cmd_size = scan_cmd_size;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_chanidx_from_phy(struct iwl_mld *mld,</div><div class='add'>+				    enum nl80211_band band,</div><div class='add'>+				    u16 phy_chan_num)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_supported_band *sband = mld-&gt;wiphy-&gt;bands[band];</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!sband))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (int chan_idx = 0; chan_idx &lt; sband-&gt;n_channels; chan_idx++) {</div><div class='add'>+		struct ieee80211_channel *channel = &amp;sband-&gt;channels[chan_idx];</div><div class='add'>+</div><div class='add'>+		if (channel-&gt;hw_value == phy_chan_num)</div><div class='add'>+			return chan_idx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_channel_survey_notif(struct iwl_mld *mld,</div><div class='add'>+					 struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_umac_scan_channel_survey_notif *notif =</div><div class='add'>+		(void *)pkt-&gt;data;</div><div class='add'>+	struct iwl_mld_survey_channel *info;</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	int chan_idx;</div><div class='add'>+</div><div class='add'>+	if (!mld-&gt;channel_survey) {</div><div class='add'>+		size_t n_channels = 0;</div><div class='add'>+</div><div class='add'>+		for (band = 0; band &lt; NUM_NL80211_BANDS; band++) {</div><div class='add'>+			if (!mld-&gt;wiphy-&gt;bands[band])</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			n_channels += mld-&gt;wiphy-&gt;bands[band]-&gt;n_channels;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mld-&gt;channel_survey = kzalloc(struct_size(mld-&gt;channel_survey,</div><div class='add'>+							  channels, n_channels),</div><div class='add'>+							  GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+		if (!mld-&gt;channel_survey)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		mld-&gt;channel_survey-&gt;n_channels = n_channels;</div><div class='add'>+		n_channels = 0;</div><div class='add'>+		for (band = 0; band &lt; NUM_NL80211_BANDS; band++) {</div><div class='add'>+			if (!mld-&gt;wiphy-&gt;bands[band])</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			mld-&gt;channel_survey-&gt;bands[band] =</div><div class='add'>+				&amp;mld-&gt;channel_survey-&gt;channels[n_channels];</div><div class='add'>+			n_channels += mld-&gt;wiphy-&gt;bands[band]-&gt;n_channels;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	band = iwl_mld_phy_band_to_nl80211(le32_to_cpu(notif-&gt;band));</div><div class='add'>+	chan_idx = iwl_mld_chanidx_from_phy(mld, band,</div><div class='add'>+					    le32_to_cpu(notif-&gt;channel));</div><div class='add'>+	if (WARN_ON_ONCE(chan_idx &lt; 0))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mld, "channel survey received for freq %d\n",</div><div class='add'>+		       mld-&gt;wiphy-&gt;bands[band]-&gt;channels[chan_idx].center_freq);</div><div class='add'>+</div><div class='add'>+	info = &amp;mld-&gt;channel_survey-&gt;bands[band][chan_idx];</div><div class='add'>+</div><div class='add'>+	/* Times are all in ms */</div><div class='add'>+	info-&gt;time = le32_to_cpu(notif-&gt;active_time);</div><div class='add'>+	info-&gt;time_busy = le32_to_cpu(notif-&gt;busy_time);</div><div class='add'>+	info-&gt;noise =</div><div class='add'>+		iwl_average_neg_dbm(notif-&gt;noise, ARRAY_SIZE(notif-&gt;noise));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_mac80211_get_survey(struct ieee80211_hw *hw, int idx,</div><div class='add'>+				struct survey_info *survey)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);</div><div class='add'>+	int curr_idx = 0;</div><div class='add'>+</div><div class='add'>+	if (!mld-&gt;channel_survey)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	/* Iterate bands/channels to find the requested index.</div><div class='add'>+	 * Logically this returns the entry with index "idx" from a flattened</div><div class='add'>+	 * survey result array that only contains channels with information.</div><div class='add'>+	 * The current index into this flattened array is tracked in curr_idx.</div><div class='add'>+	 */</div><div class='add'>+	for (enum nl80211_band band = 0; band &lt; NUM_NL80211_BANDS; band++) {</div><div class='add'>+		struct ieee80211_supported_band *sband =</div><div class='add'>+			mld-&gt;wiphy-&gt;bands[band];</div><div class='add'>+</div><div class='add'>+		if (!sband)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (int per_band_idx = 0;</div><div class='add'>+		     per_band_idx &lt; sband-&gt;n_channels;</div><div class='add'>+		     per_band_idx++) {</div><div class='add'>+			struct iwl_mld_survey_channel *info =</div><div class='add'>+				&amp;mld-&gt;channel_survey-&gt;bands[band][per_band_idx];</div><div class='add'>+</div><div class='add'>+			/* Skip entry entirely, it was not reported/scanned,</div><div class='add'>+			 * do not increase curr_idx for this entry.</div><div class='add'>+			 */</div><div class='add'>+			if (!info-&gt;time)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			/* Search did not reach the requested entry yet,</div><div class='add'>+			 * increment curr_idx and continue.</div><div class='add'>+			 */</div><div class='add'>+			if (idx != curr_idx) {</div><div class='add'>+				curr_idx++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Found (the next) channel to report */</div><div class='add'>+			survey-&gt;channel = &amp;sband-&gt;channels[per_band_idx];</div><div class='add'>+			survey-&gt;filled = SURVEY_INFO_TIME |</div><div class='add'>+					 SURVEY_INFO_TIME_BUSY;</div><div class='add'>+			survey-&gt;time = info-&gt;time;</div><div class='add'>+			survey-&gt;time_busy = info-&gt;time_busy;</div><div class='add'>+			survey-&gt;noise = info-&gt;noise;</div><div class='add'>+			if (survey-&gt;noise &lt; 0)</div><div class='add'>+				survey-&gt;filled |= SURVEY_INFO_NOISE_DBM;</div><div class='add'>+</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/scan.h b/drivers/net/wireless/intel/iwlwifi/mld/scan.h<br/>new file mode 100644<br/>index 000000000000..69110f0cfc8e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/scan.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/scan.h</a></div><div class='hunk'>@@ -0,0 +1,173 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_scan_h__</div><div class='add'>+#define __iwl_mld_scan_h__</div><div class='add'>+</div><div class='add'>+int iwl_mld_alloc_scan_cmd(struct iwl_mld *mld);</div><div class='add'>+</div><div class='add'>+int iwl_mld_regular_scan_start(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			       struct cfg80211_scan_request *req,</div><div class='add'>+			       struct ieee80211_scan_ies *ies);</div><div class='add'>+</div><div class='add'>+void iwl_mld_int_mlo_scan(struct iwl_mld *mld, struct ieee80211_vif *vif);</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_scan_iter_complete_notif(struct iwl_mld *mld,</div><div class='add'>+					     struct iwl_rx_packet *pkt);</div><div class='add'>+</div><div class='add'>+int iwl_mld_scan_stop(struct iwl_mld *mld, int type, bool notify);</div><div class='add'>+</div><div class='add'>+int iwl_mld_sched_scan_start(struct iwl_mld *mld,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     struct cfg80211_sched_scan_request *req,</div><div class='add'>+			     struct ieee80211_scan_ies *ies,</div><div class='add'>+			     int type);</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_match_found_notif(struct iwl_mld *mld,</div><div class='add'>+				      struct iwl_rx_packet *pkt);</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_scan_complete_notif(struct iwl_mld *mld,</div><div class='add'>+					struct iwl_rx_packet *pkt);</div><div class='add'>+</div><div class='add'>+int iwl_mld_mac80211_get_survey(struct ieee80211_hw *hw, int idx,</div><div class='add'>+				struct survey_info *survey);</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_channel_survey_notif(struct iwl_mld *mld,</div><div class='add'>+					 struct iwl_rx_packet *pkt);</div><div class='add'>+</div><div class='add'>+#define WFA_TPC_IE_LEN 9</div><div class='add'>+</div><div class='add'>+static inline int iwl_mld_scan_max_template_size(void)</div><div class='add'>+{</div><div class='add'>+#define MAC_HDR_LEN 24</div><div class='add'>+#define DS_IE_LEN 3</div><div class='add'>+#define SSID_IE_LEN 2</div><div class='add'>+</div><div class='add'>+/* driver create the 802.11 header, WFA TPC IE, DS parameter and SSID IE */</div><div class='add'>+#define DRIVER_TOTAL_IES_LEN \</div><div class='add'>+	(MAC_HDR_LEN + WFA_TPC_IE_LEN + DS_IE_LEN + SSID_IE_LEN)</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(SCAN_OFFLOAD_PROBE_REQ_SIZE &lt; DRIVER_TOTAL_IES_LEN);</div><div class='add'>+</div><div class='add'>+	return SCAN_OFFLOAD_PROBE_REQ_SIZE - DRIVER_TOTAL_IES_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_report_scan_aborted(struct iwl_mld *mld);</div><div class='add'>+</div><div class='add'>+enum iwl_mld_scan_status {</div><div class='add'>+	IWL_MLD_SCAN_NONE		= 0,</div><div class='add'>+	IWL_MLD_SCAN_REGULAR		= BIT(0),</div><div class='add'>+	IWL_MLD_SCAN_SCHED		= BIT(1),</div><div class='add'>+	IWL_MLD_SCAN_NETDETECT		= BIT(2),</div><div class='add'>+	IWL_MLD_SCAN_INT_MLO		= BIT(3),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* enum iwl_mld_pass_all_sched_results_states - Defines the states for</div><div class='add'>+ * handling/passing scheduled scan results to mac80211</div><div class='add'>+ * @SCHED_SCAN_PASS_ALL_STATE_DISABLED: Don't pass all scan results, only when</div><div class='add'>+ *	a match found.</div><div class='add'>+ * @SCHED_SCAN_PASS_ALL_STATE_ENABLED: Pass all scan results is enabled</div><div class='add'>+ *	(no filtering).</div><div class='add'>+ * @SCHED_SCAN_PASS_ALL_STATE_FOUND: A scan result is found, pass it on the</div><div class='add'>+ *	next scan iteration complete notification.</div><div class='add'>+ */</div><div class='add'>+enum iwl_mld_pass_all_sched_results_states {</div><div class='add'>+	SCHED_SCAN_PASS_ALL_STATE_DISABLED,</div><div class='add'>+	SCHED_SCAN_PASS_ALL_STATE_ENABLED,</div><div class='add'>+	SCHED_SCAN_PASS_ALL_STATE_FOUND,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_mld_traffic_load - Levels of traffic load</div><div class='add'>+ *</div><div class='add'>+ * @IWL_MLD_TRAFFIC_LOW: low traffic load</div><div class='add'>+ * @IWL_MLD_TRAFFIC_MEDIUM: medium traffic load</div><div class='add'>+ * @IWL_MLD_TRAFFIC_HIGH: high traffic load</div><div class='add'>+ */</div><div class='add'>+enum iwl_mld_traffic_load {</div><div class='add'>+	IWL_MLD_TRAFFIC_LOW,</div><div class='add'>+	IWL_MLD_TRAFFIC_MEDIUM,</div><div class='add'>+	IWL_MLD_TRAFFIC_HIGH,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_scan - Scan data</div><div class='add'>+ * @status: scan status, a combination of %enum iwl_mld_scan_status,</div><div class='add'>+ *	reflects the %scan.uid_status array.</div><div class='add'>+ * @uid_status: array to track the scan status per uid.</div><div class='add'>+ * @start_tsf: start time of last scan in TSF of the link that requested</div><div class='add'>+ *	the scan.</div><div class='add'>+ * @last_ebs_failed: true if the last EBS (Energy Based Scan) failed.</div><div class='add'>+ * @pass_all_sched_res: see %enum iwl_mld_pass_all_sched_results_states.</div><div class='add'>+ * @fw_link_id: the current (regular) scan fw link id, used by scan</div><div class='add'>+ *	complete notif.</div><div class='add'>+ * @traffic_load: traffic load related data</div><div class='add'>+ * @traffic_load.last_stats_ts_usec: The timestamp of the last statistics</div><div class='add'>+ *	notification, used to calculate the elapsed time between two</div><div class='add'>+ *	notifications and determine the traffic load</div><div class='add'>+ * @traffic_load.status: The current traffic load status, see</div><div class='add'>+ *	&amp;enum iwl_mld_traffic_load</div><div class='add'>+ * @cmd_size: size of %cmd.</div><div class='add'>+ * @cmd: pointer to scan cmd buffer (allocated once in op mode start).</div><div class='add'>+ * @last_6ghz_passive_jiffies: stores the last 6GHz passive scan time</div><div class='add'>+ *	in jiffies.</div><div class='add'>+ * @last_start_time_jiffies: stores the last start time in jiffies</div><div class='add'>+ *	(interface up/reset/resume).</div><div class='add'>+ * @last_mlo_scan_time: start time of the last MLO scan in nanoseconds since</div><div class='add'>+ *	boot.</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_scan {</div><div class='add'>+	/* Add here fields that need clean up on restart */</div><div class='add'>+	struct_group(zeroed_on_hw_restart,</div><div class='add'>+		unsigned int status;</div><div class='add'>+		u32 uid_status[IWL_MAX_UMAC_SCANS];</div><div class='add'>+		u64 start_tsf;</div><div class='add'>+		bool last_ebs_failed;</div><div class='add'>+		enum iwl_mld_pass_all_sched_results_states pass_all_sched_res;</div><div class='add'>+		u8 fw_link_id;</div><div class='add'>+		struct {</div><div class='add'>+			u32 last_stats_ts_usec;</div><div class='add'>+			enum iwl_mld_traffic_load status;</div><div class='add'>+		} traffic_load;</div><div class='add'>+	);</div><div class='add'>+	/* And here fields that survive a fw restart */</div><div class='add'>+	size_t cmd_size;</div><div class='add'>+	void *cmd;</div><div class='add'>+	unsigned long last_6ghz_passive_jiffies;</div><div class='add'>+	unsigned long last_start_time_jiffies;</div><div class='add'>+	u64 last_mlo_scan_time;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_survey_channel - per-channel survey information</div><div class='add'>+ *</div><div class='add'>+ * Driver version of &amp;struct survey_info with just the data we want to report.</div><div class='add'>+ *</div><div class='add'>+ * @time: time in ms the radio was on the channel</div><div class='add'>+ * @time_busy: time in ms the channel was sensed busy</div><div class='add'>+ * @noise: channel noise in dBm</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_survey_channel {</div><div class='add'>+	u32 time;</div><div class='add'>+	u32 time_busy;</div><div class='add'>+	s8 noise;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_survey - survey information</div><div class='add'>+ *</div><div class='add'>+ * Survey information for all available channels.</div><div class='add'>+ *</div><div class='add'>+ * @bands: per-band array for per-channel survey data, points into @channels</div><div class='add'>+ * @n_channels: Number of @channels entries that are allocated</div><div class='add'>+ * @channels: per-channel information</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_survey {</div><div class='add'>+	struct iwl_mld_survey_channel *bands[NUM_NL80211_BANDS];</div><div class='add'>+</div><div class='add'>+	int n_channels;</div><div class='add'>+	struct iwl_mld_survey_channel channels[] __counted_by(n_channels);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_scan_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/session-protect.c b/drivers/net/wireless/intel/iwlwifi/mld/session-protect.c<br/>new file mode 100644<br/>index 000000000000..dbb5615dc3f6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/session-protect.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/session-protect.c</a></div><div class='hunk'>@@ -0,0 +1,222 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include "session-protect.h"</div><div class='add'>+#include "fw/api/time-event.h"</div><div class='add'>+#include "fw/api/context.h"</div><div class='add'>+#include "iface.h"</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_session_prot_notif(struct iwl_mld *mld,</div><div class='add'>+				       struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_session_prot_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+	int fw_link_id = le32_to_cpu(notif-&gt;mac_link_id);</div><div class='add'>+	struct ieee80211_bss_conf *link_conf =</div><div class='add'>+		iwl_mld_fw_id_to_link_conf(mld, fw_link_id);</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct iwl_mld_vif *mld_vif;</div><div class='add'>+	struct iwl_mld_session_protect *session_protect;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!link_conf))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vif = link_conf-&gt;vif;</div><div class='add'>+	mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	session_protect = &amp;mld_vif-&gt;session_protect;</div><div class='add'>+</div><div class='add'>+	if (!le32_to_cpu(notif-&gt;status)) {</div><div class='add'>+		memset(session_protect, 0, sizeof(*session_protect));</div><div class='add'>+	} else if (le32_to_cpu(notif-&gt;start)) {</div><div class='add'>+		/* End_jiffies indicates an active session */</div><div class='add'>+		session_protect-&gt;session_requested = false;</div><div class='add'>+		session_protect-&gt;end_jiffies =</div><div class='add'>+			TU_TO_EXP_TIME(session_protect-&gt;duration);</div><div class='add'>+		/* !session_protect-&gt;end_jiffies means inactive session */</div><div class='add'>+		if (!session_protect-&gt;end_jiffies)</div><div class='add'>+			session_protect-&gt;end_jiffies = 1;</div><div class='add'>+	} else {</div><div class='add'>+		memset(session_protect, 0, sizeof(*session_protect));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int _iwl_mld_schedule_session_protection(struct iwl_mld *mld,</div><div class='add'>+						struct ieee80211_vif *vif,</div><div class='add'>+						u32 duration, u32 min_duration,</div><div class='add'>+						int link_id)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld_link *link =</div><div class='add'>+		iwl_mld_link_dereference_check(mld_vif, link_id);</div><div class='add'>+	struct iwl_mld_session_protect *session_protect =</div><div class='add'>+		&amp;mld_vif-&gt;session_protect;</div><div class='add'>+	struct iwl_session_prot_cmd cmd = {</div><div class='add'>+		.id_and_color = cpu_to_le32(link-&gt;fw_id),</div><div class='add'>+		.action = cpu_to_le32(FW_CTXT_ACTION_ADD),</div><div class='add'>+		.conf_id = cpu_to_le32(SESSION_PROTECT_CONF_ASSOC),</div><div class='add'>+		.duration_tu = cpu_to_le32(MSEC_TO_TU(duration)),</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	WARN(hweight16(vif-&gt;active_links) &gt; 1,</div><div class='add'>+	     "Session protection isn't allowed with more than one active link");</div><div class='add'>+</div><div class='add'>+	if (session_protect-&gt;end_jiffies &amp;&amp;</div><div class='add'>+	    time_after(session_protect-&gt;end_jiffies,</div><div class='add'>+		       TU_TO_EXP_TIME(min_duration))) {</div><div class='add'>+		IWL_DEBUG_TE(mld, "We have ample in the current session: %u\n",</div><div class='add'>+			     jiffies_to_msecs(session_protect-&gt;end_jiffies -</div><div class='add'>+					      jiffies));</div><div class='add'>+		return -EALREADY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_TE(mld, "Add a new session protection, duration %d TU\n",</div><div class='add'>+		     le32_to_cpu(cmd.duration_tu));</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd_pdu(mld, WIDE_ID(MAC_CONF_GROUP,</div><div class='add'>+						SESSION_PROTECTION_CMD), &amp;cmd);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* end_jiffies will be updated when handling session_prot_notif */</div><div class='add'>+	session_protect-&gt;end_jiffies = 0;</div><div class='add'>+	session_protect-&gt;duration = duration;</div><div class='add'>+	session_protect-&gt;session_requested = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_schedule_session_protection(struct iwl_mld *mld,</div><div class='add'>+					 struct ieee80211_vif *vif,</div><div class='add'>+					 u32 duration, u32 min_duration,</div><div class='add'>+					 int link_id)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = _iwl_mld_schedule_session_protection(mld, vif, duration,</div><div class='add'>+						   min_duration, link_id);</div><div class='add'>+	if (ret &amp;&amp; ret != -EALREADY)</div><div class='add'>+		IWL_ERR(mld,</div><div class='add'>+			"Couldn't send the SESSION_PROTECTION_CMD (%d)\n",</div><div class='add'>+			ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct iwl_mld_session_start_data {</div><div class='add'>+	struct iwl_mld *mld;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	bool success;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_session_start_fn(struct iwl_notif_wait_data *notif_wait,</div><div class='add'>+				     struct iwl_rx_packet *pkt, void *_data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_session_prot_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+	unsigned int pkt_len = iwl_rx_packet_payload_len(pkt);</div><div class='add'>+	struct iwl_mld_session_start_data *data = _data;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct iwl_mld *mld = data-&gt;mld;</div><div class='add'>+	int fw_link_id;</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, pkt_len &lt; sizeof(*notif),</div><div class='add'>+			 "short session prot notif (%d)\n",</div><div class='add'>+			 pkt_len))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	fw_link_id = le32_to_cpu(notif-&gt;mac_link_id);</div><div class='add'>+	link_conf = iwl_mld_fw_id_to_link_conf(mld, fw_link_id);</div><div class='add'>+</div><div class='add'>+	if (link_conf != data-&gt;link_conf)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!le32_to_cpu(notif-&gt;status))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (notif-&gt;start) {</div><div class='add'>+		data-&gt;success = true;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_start_session_protection(struct iwl_mld *mld,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     u32 duration, u32 min_duration,</div><div class='add'>+				     int link_id, unsigned long timeout)</div><div class='add'>+{</div><div class='add'>+	static const u16 start_notif[] = { SESSION_PROTECTION_NOTIF };</div><div class='add'>+	struct iwl_notification_wait start_wait;</div><div class='add'>+	struct iwl_mld_session_start_data data = {</div><div class='add'>+		.mld = mld,</div><div class='add'>+		.link_conf = wiphy_dereference(mld-&gt;wiphy,</div><div class='add'>+					       vif-&gt;link_conf[link_id]),</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!data.link_conf))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	iwl_init_notification_wait(&amp;mld-&gt;notif_wait, &amp;start_wait,</div><div class='add'>+				   start_notif, ARRAY_SIZE(start_notif),</div><div class='add'>+				   iwl_mld_session_start_fn, &amp;data);</div><div class='add'>+</div><div class='add'>+	ret = _iwl_mld_schedule_session_protection(mld, vif, duration,</div><div class='add'>+						   min_duration, link_id);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		iwl_remove_notification(&amp;mld-&gt;notif_wait, &amp;start_wait);</div><div class='add'>+		return ret == -EALREADY ? 0 : ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_wait_notification(&amp;mld-&gt;notif_wait, &amp;start_wait, timeout);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	return data.success ? 0 : -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_cancel_session_protection(struct iwl_mld *mld,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      int link_id)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mld_link *link =</div><div class='add'>+		iwl_mld_link_dereference_check(mld_vif, link_id);</div><div class='add'>+	struct iwl_mld_session_protect *session_protect =</div><div class='add'>+		&amp;mld_vif-&gt;session_protect;</div><div class='add'>+	struct iwl_session_prot_cmd cmd = {</div><div class='add'>+		.action = cpu_to_le32(FW_CTXT_ACTION_REMOVE),</div><div class='add'>+		.conf_id = cpu_to_le32(SESSION_PROTECT_CONF_ASSOC),</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* If there isn't an active session or a requested one for this</div><div class='add'>+	 * link do nothing</div><div class='add'>+	 */</div><div class='add'>+	if (!session_protect-&gt;session_requested &amp;&amp;</div><div class='add'>+	    !session_protect-&gt;end_jiffies)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!link))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cmd.id_and_color = cpu_to_le32(link-&gt;fw_id);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd_pdu(mld,</div><div class='add'>+				   WIDE_ID(MAC_CONF_GROUP,</div><div class='add'>+					   SESSION_PROTECTION_CMD), &amp;cmd);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mld,</div><div class='add'>+			"Couldn't send the SESSION_PROTECTION_CMD\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(session_protect, 0, sizeof(*session_protect));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/session-protect.h b/drivers/net/wireless/intel/iwlwifi/mld/session-protect.h<br/>new file mode 100644<br/>index 000000000000..642bec8451a1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/session-protect.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/session-protect.h</a></div><div class='hunk'>@@ -0,0 +1,102 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __session_protect_h__</div><div class='add'>+#define __session_protect_h__</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+#include "fw/api/mac-cfg.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: session protection</div><div class='add'>+ *</div><div class='add'>+ * Session protection is an API from the firmware that allows the driver to</div><div class='add'>+ * request time on medium. This is needed before the association when we need</div><div class='add'>+ * to be on medium for the association frame exchange. Once we configure the</div><div class='add'>+ * firmware as 'associated', the firmware will allocate time on medium without</div><div class='add'>+ * needed a session protection.</div><div class='add'>+ *</div><div class='add'>+ * TDLS discover uses this API as well even after association to ensure that</div><div class='add'>+ * other activities internal to the firmware will not interrupt our presence</div><div class='add'>+ * on medium.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_session_protect - session protection parameters</div><div class='add'>+ * @end_jiffies: expected end_jiffies of current session protection.</div><div class='add'>+ *	0 if not active</div><div class='add'>+ * @duration: the duration in tu of current session</div><div class='add'>+ * @session_requested: A session protection command was sent and wasn't yet</div><div class='add'>+ *	answered</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_session_protect {</div><div class='add'>+	unsigned long end_jiffies;</div><div class='add'>+	u32 duration;</div><div class='add'>+	bool session_requested;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_SESSION_PROTECTION_ASSOC_TIME_MS 900</div><div class='add'>+#define IWL_MLD_SESSION_PROTECTION_MIN_TIME_MS 400</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_mld_handle_session_prot_notif - handles %SESSION_PROTECTION_NOTIF</div><div class='add'>+ * @mld: the mld component</div><div class='add'>+ * @pkt: the RX packet containing the notification</div><div class='add'>+ */</div><div class='add'>+void iwl_mld_handle_session_prot_notif(struct iwl_mld *mld,</div><div class='add'>+				       struct iwl_rx_packet *pkt);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_mld_schedule_session_protection - schedule a session protection</div><div class='add'>+ * @mld: the mld component</div><div class='add'>+ * @vif: the virtual interface for which the protection issued</div><div class='add'>+ * @duration: the requested duration of the protection</div><div class='add'>+ * @min_duration: the minimum duration of the protection</div><div class='add'>+ * @link_id: The link to schedule a session protection for</div><div class='add'>+ */</div><div class='add'>+void iwl_mld_schedule_session_protection(struct iwl_mld *mld,</div><div class='add'>+					 struct ieee80211_vif *vif,</div><div class='add'>+					 u32 duration, u32 min_duration,</div><div class='add'>+					 int link_id);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_mld_start_session_protection - start a session protection</div><div class='add'>+ * @mld: the mld component</div><div class='add'>+ * @vif: the virtual interface for which the protection issued</div><div class='add'>+ * @duration: the requested duration of the protection</div><div class='add'>+ * @min_duration: the minimum duration of the protection</div><div class='add'>+ * @link_id: The link to schedule a session protection for</div><div class='add'>+ * @timeout: timeout for waiting</div><div class='add'>+ *</div><div class='add'>+ * This schedules the session protection, and waits for it to start</div><div class='add'>+ * (with timeout)</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 if successful, error code otherwise</div><div class='add'>+ */</div><div class='add'>+int iwl_mld_start_session_protection(struct iwl_mld *mld,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     u32 duration, u32 min_duration,</div><div class='add'>+				     int link_id, unsigned long timeout);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_mld_cancel_session_protection - cancel the session protection.</div><div class='add'>+ * @mld: the mld component</div><div class='add'>+ * @vif: the virtual interface for which the session is issued</div><div class='add'>+ * @link_id: cancel the session protection for given link</div><div class='add'>+ *</div><div class='add'>+ * This functions cancels the session protection which is an act of good</div><div class='add'>+ * citizenship. If it is not needed any more it should be canceled because</div><div class='add'>+ * the other mac contexts wait for the medium during that time.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 if successful, error code otherwise</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+int iwl_mld_cancel_session_protection(struct iwl_mld *mld,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      int link_id);</div><div class='add'>+</div><div class='add'>+#endif /* __session_protect_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/sta.c b/drivers/net/wireless/intel/iwlwifi/mld/sta.c<br/>new file mode 100644<br/>index 000000000000..61ecc33116cf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/sta.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/sta.c</a></div><div class='hunk'>@@ -0,0 +1,1319 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ieee80211.h&gt;</div><div class='add'>+#include &lt;kunit/static_stub.h&gt;</div><div class='add'>+</div><div class='add'>+#include "sta.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+#include "iface.h"</div><div class='add'>+#include "mlo.h"</div><div class='add'>+#include "key.h"</div><div class='add'>+#include "agg.h"</div><div class='add'>+#include "tlc.h"</div><div class='add'>+#include "fw/api/sta.h"</div><div class='add'>+#include "fw/api/mac.h"</div><div class='add'>+#include "fw/api/rx.h"</div><div class='add'>+</div><div class='add'>+int iwl_mld_fw_sta_id_from_link_sta(struct iwl_mld *mld,</div><div class='add'>+				    struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_link_sta *mld_link_sta;</div><div class='add'>+</div><div class='add'>+	/* This function should only be used with the wiphy lock held,</div><div class='add'>+	 * In other cases, it is not guaranteed that the link_sta will exist</div><div class='add'>+	 * in the driver too, and it is checked here.</div><div class='add'>+	 */</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* This is not meant to be called with a NULL pointer */</div><div class='add'>+	if (WARN_ON(!link_sta))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	mld_link_sta = iwl_mld_link_sta_from_mac80211(link_sta);</div><div class='add'>+	if (!mld_link_sta) {</div><div class='add'>+		WARN_ON(!iwl_mld_error_before_recovery(mld));</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mld_link_sta-&gt;fw_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_fill_ampdu_size_and_dens(struct ieee80211_link_sta *link_sta,</div><div class='add'>+				 struct ieee80211_bss_conf *link,</div><div class='add'>+				 __le32 *tx_ampdu_max_size,</div><div class='add'>+				 __le32 *tx_ampdu_spacing)</div><div class='add'>+{</div><div class='add'>+	u32 agg_size = 0, mpdu_dens = 0;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!link_sta || !link))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Note that we always use only legacy &amp; highest supported PPDUs, so</div><div class='add'>+	 * of Draft P802.11be D.30 Table 10-12a--Fields used for calculating</div><div class='add'>+	 * the maximum A-MPDU size of various PPDU types in different bands,</div><div class='add'>+	 * we only need to worry about the highest supported PPDU type here.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;ht_cap.ht_supported) {</div><div class='add'>+		agg_size = link_sta-&gt;ht_cap.ampdu_factor;</div><div class='add'>+		mpdu_dens = link_sta-&gt;ht_cap.ampdu_density;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link-&gt;chanreq.oper.chan-&gt;band == NL80211_BAND_6GHZ) {</div><div class='add'>+		/* overwrite HT values on 6 GHz */</div><div class='add'>+		mpdu_dens =</div><div class='add'>+			le16_get_bits(link_sta-&gt;he_6ghz_capa.capa,</div><div class='add'>+				      IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START);</div><div class='add'>+		agg_size =</div><div class='add'>+			le16_get_bits(link_sta-&gt;he_6ghz_capa.capa,</div><div class='add'>+				      IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP);</div><div class='add'>+	} else if (link_sta-&gt;vht_cap.vht_supported) {</div><div class='add'>+		/* if VHT supported overwrite HT value */</div><div class='add'>+		agg_size =</div><div class='add'>+			u32_get_bits(link_sta-&gt;vht_cap.cap,</div><div class='add'>+				     IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* D6.0 10.12.2 A-MPDU length limit rules</div><div class='add'>+	 * A STA indicates the maximum length of the A-MPDU preEOF padding</div><div class='add'>+	 * that it can receive in an HE PPDU in the Maximum A-MPDU Length</div><div class='add'>+	 * Exponent field in its HT Capabilities, VHT Capabilities,</div><div class='add'>+	 * and HE 6 GHz Band Capabilities elements (if present) and the</div><div class='add'>+	 * Maximum AMPDU Length Exponent Extension field in its HE</div><div class='add'>+	 * Capabilities element</div><div class='add'>+	 */</div><div class='add'>+	if (link_sta-&gt;he_cap.has_he)</div><div class='add'>+		agg_size +=</div><div class='add'>+			u8_get_bits(link_sta-&gt;he_cap.he_cap_elem.mac_cap_info[3],</div><div class='add'>+				    IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK);</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;eht_cap.has_eht)</div><div class='add'>+		agg_size +=</div><div class='add'>+			u8_get_bits(link_sta-&gt;eht_cap.eht_cap_elem.mac_cap_info[1],</div><div class='add'>+				    IEEE80211_EHT_MAC_CAP1_MAX_AMPDU_LEN_MASK);</div><div class='add'>+</div><div class='add'>+	/* Limit to max A-MPDU supported by FW */</div><div class='add'>+	agg_size = min_t(u32, agg_size,</div><div class='add'>+			 STA_FLG_MAX_AGG_SIZE_4M &gt;&gt; STA_FLG_MAX_AGG_SIZE_SHIFT);</div><div class='add'>+</div><div class='add'>+	*tx_ampdu_max_size = cpu_to_le32(agg_size);</div><div class='add'>+	*tx_ampdu_spacing = cpu_to_le32(mpdu_dens);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 iwl_mld_get_uapsd_acs(struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	u8 uapsd_acs = 0;</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;uapsd_queues &amp; IEEE80211_WMM_IE_STA_QOSINFO_AC_BK)</div><div class='add'>+		uapsd_acs |= BIT(AC_BK);</div><div class='add'>+	if (sta-&gt;uapsd_queues &amp; IEEE80211_WMM_IE_STA_QOSINFO_AC_BE)</div><div class='add'>+		uapsd_acs |= BIT(AC_BE);</div><div class='add'>+	if (sta-&gt;uapsd_queues &amp; IEEE80211_WMM_IE_STA_QOSINFO_AC_VI)</div><div class='add'>+		uapsd_acs |= BIT(AC_VI);</div><div class='add'>+	if (sta-&gt;uapsd_queues &amp; IEEE80211_WMM_IE_STA_QOSINFO_AC_VO)</div><div class='add'>+		uapsd_acs |= BIT(AC_VO);</div><div class='add'>+</div><div class='add'>+	return uapsd_acs | uapsd_acs &lt;&lt; 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 iwl_mld_he_get_ppe_val(u8 *ppe, u8 ppe_pos_bit)</div><div class='add'>+{</div><div class='add'>+	u8 byte_num = ppe_pos_bit / 8;</div><div class='add'>+	u8 bit_num = ppe_pos_bit % 8;</div><div class='add'>+	u8 residue_bits;</div><div class='add'>+	u8 res;</div><div class='add'>+</div><div class='add'>+	if (bit_num &lt;= 5)</div><div class='add'>+		return (ppe[byte_num] &gt;&gt; bit_num) &amp;</div><div class='add'>+		       (BIT(IEEE80211_PPE_THRES_INFO_PPET_SIZE) - 1);</div><div class='add'>+</div><div class='add'>+	/* If bit_num &gt; 5, we have to combine bits with next byte.</div><div class='add'>+	 * Calculate how many bits we need to take from current byte (called</div><div class='add'>+	 * here "residue_bits"), and add them to bits from next byte.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	residue_bits = 8 - bit_num;</div><div class='add'>+</div><div class='add'>+	res = (ppe[byte_num + 1] &amp;</div><div class='add'>+	       (BIT(IEEE80211_PPE_THRES_INFO_PPET_SIZE - residue_bits) - 1)) &lt;&lt;</div><div class='add'>+	      residue_bits;</div><div class='add'>+	res += (ppe[byte_num] &gt;&gt; bit_num) &amp; (BIT(residue_bits) - 1);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_parse_ppe(struct iwl_mld *mld,</div><div class='add'>+			      struct iwl_he_pkt_ext_v2 *pkt_ext, u8 nss,</div><div class='add'>+			      u8 ru_index_bitmap, u8 *ppe, u8 ppe_pos_bit,</div><div class='add'>+			      bool inheritance)</div><div class='add'>+{</div><div class='add'>+	/* FW currently supports only nss == MAX_HE_SUPP_NSS</div><div class='add'>+	 *</div><div class='add'>+	 * If nss &gt; MAX: we can ignore values we don't support</div><div class='add'>+	 * If nss &lt; MAX: we can set zeros in other streams</div><div class='add'>+	 */</div><div class='add'>+	if (nss &gt; MAX_HE_SUPP_NSS) {</div><div class='add'>+		IWL_DEBUG_INFO(mld, "Got NSS = %d - trimming to %d\n", nss,</div><div class='add'>+			       MAX_HE_SUPP_NSS);</div><div class='add'>+		nss = MAX_HE_SUPP_NSS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; nss; i++) {</div><div class='add'>+		u8 ru_index_tmp = ru_index_bitmap &lt;&lt; 1;</div><div class='add'>+		u8 low_th = IWL_HE_PKT_EXT_NONE, high_th = IWL_HE_PKT_EXT_NONE;</div><div class='add'>+</div><div class='add'>+		for (u8 bw = 0;</div><div class='add'>+		     bw &lt; ARRAY_SIZE(pkt_ext-&gt;pkt_ext_qam_th[i]);</div><div class='add'>+		     bw++) {</div><div class='add'>+			ru_index_tmp &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+			/* According to the 11be spec, if for a specific BW the PPE Thresholds</div><div class='add'>+			 * isn't present - it should inherit the thresholds from the last</div><div class='add'>+			 * BW for which we had PPE Thresholds. In 11ax though, we don't have</div><div class='add'>+			 * this inheritance - continue in this case</div><div class='add'>+			 */</div><div class='add'>+			if (!(ru_index_tmp &amp; 1)) {</div><div class='add'>+				if (inheritance)</div><div class='add'>+					goto set_thresholds;</div><div class='add'>+				else</div><div class='add'>+					continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			high_th = iwl_mld_he_get_ppe_val(ppe, ppe_pos_bit);</div><div class='add'>+			ppe_pos_bit += IEEE80211_PPE_THRES_INFO_PPET_SIZE;</div><div class='add'>+			low_th = iwl_mld_he_get_ppe_val(ppe, ppe_pos_bit);</div><div class='add'>+			ppe_pos_bit += IEEE80211_PPE_THRES_INFO_PPET_SIZE;</div><div class='add'>+</div><div class='add'>+set_thresholds:</div><div class='add'>+			pkt_ext-&gt;pkt_ext_qam_th[i][bw][0] = low_th;</div><div class='add'>+			pkt_ext-&gt;pkt_ext_qam_th[i][bw][1] = high_th;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_set_pkt_ext_from_he_ppe(struct iwl_mld *mld,</div><div class='add'>+					    struct ieee80211_link_sta *link_sta,</div><div class='add'>+					    struct iwl_he_pkt_ext_v2 *pkt_ext,</div><div class='add'>+					    bool inheritance)</div><div class='add'>+{</div><div class='add'>+	u8 nss = (link_sta-&gt;he_cap.ppe_thres[0] &amp;</div><div class='add'>+		  IEEE80211_PPE_THRES_NSS_MASK) + 1;</div><div class='add'>+	u8 *ppe = &amp;link_sta-&gt;he_cap.ppe_thres[0];</div><div class='add'>+	u8 ru_index_bitmap =</div><div class='add'>+		u8_get_bits(*ppe,</div><div class='add'>+			    IEEE80211_PPE_THRES_RU_INDEX_BITMASK_MASK);</div><div class='add'>+	/* Starting after PPE header */</div><div class='add'>+	u8 ppe_pos_bit = IEEE80211_HE_PPE_THRES_INFO_HEADER_SIZE;</div><div class='add'>+</div><div class='add'>+	iwl_mld_parse_ppe(mld, pkt_ext, nss, ru_index_bitmap, ppe, ppe_pos_bit,</div><div class='add'>+			  inheritance);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_set_pkt_ext_from_nominal_padding(struct iwl_he_pkt_ext_v2 *pkt_ext,</div><div class='add'>+					 u8 nominal_padding)</div><div class='add'>+{</div><div class='add'>+	int low_th = -1;</div><div class='add'>+	int high_th = -1;</div><div class='add'>+</div><div class='add'>+	/* all the macros are the same for EHT and HE */</div><div class='add'>+	switch (nominal_padding) {</div><div class='add'>+	case IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_0US:</div><div class='add'>+		low_th = IWL_HE_PKT_EXT_NONE;</div><div class='add'>+		high_th = IWL_HE_PKT_EXT_NONE;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_8US:</div><div class='add'>+		low_th = IWL_HE_PKT_EXT_BPSK;</div><div class='add'>+		high_th = IWL_HE_PKT_EXT_NONE;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_16US:</div><div class='add'>+	case IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_20US:</div><div class='add'>+		low_th = IWL_HE_PKT_EXT_NONE;</div><div class='add'>+		high_th = IWL_HE_PKT_EXT_BPSK;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (low_th &lt; 0 || high_th &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Set the PPE thresholds accordingly */</div><div class='add'>+	for (int i = 0; i &lt; MAX_HE_SUPP_NSS; i++) {</div><div class='add'>+		for (u8 bw = 0;</div><div class='add'>+			bw &lt; ARRAY_SIZE(pkt_ext-&gt;pkt_ext_qam_th[i]);</div><div class='add'>+			bw++) {</div><div class='add'>+			pkt_ext-&gt;pkt_ext_qam_th[i][bw][0] = low_th;</div><div class='add'>+			pkt_ext-&gt;pkt_ext_qam_th[i][bw][1] = high_th;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_get_optimal_ppe_info(struct iwl_he_pkt_ext_v2 *pkt_ext,</div><div class='add'>+					 u8 nominal_padding)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; MAX_HE_SUPP_NSS; i++) {</div><div class='add'>+		for (u8 bw = 0; bw &lt; ARRAY_SIZE(pkt_ext-&gt;pkt_ext_qam_th[i]);</div><div class='add'>+		     bw++) {</div><div class='add'>+			u8 *qam_th = &amp;pkt_ext-&gt;pkt_ext_qam_th[i][bw][0];</div><div class='add'>+</div><div class='add'>+			if (nominal_padding &gt;</div><div class='add'>+			    IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_8US &amp;&amp;</div><div class='add'>+			    qam_th[1] == IWL_HE_PKT_EXT_NONE)</div><div class='add'>+				qam_th[1] = IWL_HE_PKT_EXT_4096QAM;</div><div class='add'>+			else if (nominal_padding ==</div><div class='add'>+				 IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_8US &amp;&amp;</div><div class='add'>+				 qam_th[0] == IWL_HE_PKT_EXT_NONE &amp;&amp;</div><div class='add'>+				 qam_th[1] == IWL_HE_PKT_EXT_NONE)</div><div class='add'>+				qam_th[0] = IWL_HE_PKT_EXT_4096QAM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_fill_pkt_ext(struct iwl_mld *mld,</div><div class='add'>+				 struct ieee80211_link_sta *link_sta,</div><div class='add'>+				 struct iwl_he_pkt_ext_v2 *pkt_ext)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(!link_sta))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Initialize the PPE thresholds to "None" (7), as described in Table</div><div class='add'>+	 * 9-262ac of 80211.ax/D3.0.</div><div class='add'>+	 */</div><div class='add'>+	memset(pkt_ext, IWL_HE_PKT_EXT_NONE, sizeof(*pkt_ext));</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;eht_cap.has_eht) {</div><div class='add'>+		u8 nominal_padding =</div><div class='add'>+			u8_get_bits(link_sta-&gt;eht_cap.eht_cap_elem.phy_cap_info[5],</div><div class='add'>+				    IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_MASK);</div><div class='add'>+</div><div class='add'>+		/* If PPE Thresholds exists, parse them into a FW-familiar</div><div class='add'>+		 * format.</div><div class='add'>+		 */</div><div class='add'>+		if (link_sta-&gt;eht_cap.eht_cap_elem.phy_cap_info[5] &amp;</div><div class='add'>+		    IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT) {</div><div class='add'>+			u8 nss = (link_sta-&gt;eht_cap.eht_ppe_thres[0] &amp;</div><div class='add'>+				IEEE80211_EHT_PPE_THRES_NSS_MASK) + 1;</div><div class='add'>+			u8 *ppe = &amp;link_sta-&gt;eht_cap.eht_ppe_thres[0];</div><div class='add'>+			u8 ru_index_bitmap =</div><div class='add'>+				u16_get_bits(*ppe,</div><div class='add'>+					     IEEE80211_EHT_PPE_THRES_RU_INDEX_BITMASK_MASK);</div><div class='add'>+			 /* Starting after PPE header */</div><div class='add'>+			u8 ppe_pos_bit = IEEE80211_EHT_PPE_THRES_INFO_HEADER_SIZE;</div><div class='add'>+</div><div class='add'>+			iwl_mld_parse_ppe(mld, pkt_ext, nss, ru_index_bitmap,</div><div class='add'>+					  ppe, ppe_pos_bit, true);</div><div class='add'>+		/* EHT PPE Thresholds doesn't exist - set the API according to</div><div class='add'>+		 * HE PPE Tresholds</div><div class='add'>+		 */</div><div class='add'>+		} else if (link_sta-&gt;he_cap.he_cap_elem.phy_cap_info[6] &amp;</div><div class='add'>+			   IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT) {</div><div class='add'>+			/* Even though HE Capabilities IE doesn't contain PPE</div><div class='add'>+			 * Thresholds for BW 320Mhz, thresholds for this BW will</div><div class='add'>+			 * be filled in with the same values as 160Mhz, due to</div><div class='add'>+			 * the inheritance, as required.</div><div class='add'>+			 */</div><div class='add'>+			iwl_mld_set_pkt_ext_from_he_ppe(mld, link_sta, pkt_ext,</div><div class='add'>+							true);</div><div class='add'>+</div><div class='add'>+			/* According to the requirements, for MCSs 12-13 the</div><div class='add'>+			 * maximum value between HE PPE Threshold and Common</div><div class='add'>+			 * Nominal Packet Padding needs to be taken</div><div class='add'>+			 */</div><div class='add'>+			iwl_mld_get_optimal_ppe_info(pkt_ext, nominal_padding);</div><div class='add'>+</div><div class='add'>+		/* if PPE Thresholds doesn't present in both EHT IE and HE IE -</div><div class='add'>+		 * take the Thresholds from Common Nominal Packet Padding field</div><div class='add'>+		 */</div><div class='add'>+		} else {</div><div class='add'>+			iwl_mld_set_pkt_ext_from_nominal_padding(pkt_ext,</div><div class='add'>+								 nominal_padding);</div><div class='add'>+		}</div><div class='add'>+	} else if (link_sta-&gt;he_cap.has_he) {</div><div class='add'>+		/* If PPE Thresholds exist, parse them into a FW-familiar format. */</div><div class='add'>+		if (link_sta-&gt;he_cap.he_cap_elem.phy_cap_info[6] &amp;</div><div class='add'>+			IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT) {</div><div class='add'>+			iwl_mld_set_pkt_ext_from_he_ppe(mld, link_sta, pkt_ext,</div><div class='add'>+							false);</div><div class='add'>+		/* PPE Thresholds doesn't exist - set the API PPE values</div><div class='add'>+		 * according to Common Nominal Packet Padding field.</div><div class='add'>+		 */</div><div class='add'>+		} else {</div><div class='add'>+			u8 nominal_padding =</div><div class='add'>+				u8_get_bits(link_sta-&gt;he_cap.he_cap_elem.phy_cap_info[9],</div><div class='add'>+					    IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK);</div><div class='add'>+			if (nominal_padding != IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_RESERVED)</div><div class='add'>+				iwl_mld_set_pkt_ext_from_nominal_padding(pkt_ext,</div><div class='add'>+									 nominal_padding);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; MAX_HE_SUPP_NSS; i++) {</div><div class='add'>+		for (int bw = 0;</div><div class='add'>+		     bw &lt; ARRAY_SIZE(*pkt_ext-&gt;pkt_ext_qam_th[i]);</div><div class='add'>+		     bw++) {</div><div class='add'>+			u8 *qam_th =</div><div class='add'>+				&amp;pkt_ext-&gt;pkt_ext_qam_th[i][bw][0];</div><div class='add'>+</div><div class='add'>+			IWL_DEBUG_HT(mld,</div><div class='add'>+				     "PPE table: nss[%d] bw[%d] PPET8 = %d, PPET16 = %d\n",</div><div class='add'>+				     i, bw, qam_th[0], qam_th[1]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 iwl_mld_get_htc_flags(struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	u8 *mac_cap_info =</div><div class='add'>+		&amp;link_sta-&gt;he_cap.he_cap_elem.mac_cap_info[0];</div><div class='add'>+	u32 htc_flags = 0;</div><div class='add'>+</div><div class='add'>+	if (mac_cap_info[0] &amp; IEEE80211_HE_MAC_CAP0_HTC_HE)</div><div class='add'>+		htc_flags |= IWL_HE_HTC_SUPPORT;</div><div class='add'>+	if ((mac_cap_info[1] &amp; IEEE80211_HE_MAC_CAP1_LINK_ADAPTATION) ||</div><div class='add'>+	    (mac_cap_info[2] &amp; IEEE80211_HE_MAC_CAP2_LINK_ADAPTATION)) {</div><div class='add'>+		u8 link_adap =</div><div class='add'>+			((mac_cap_info[2] &amp;</div><div class='add'>+			  IEEE80211_HE_MAC_CAP2_LINK_ADAPTATION) &lt;&lt; 1) +</div><div class='add'>+			 (mac_cap_info[1] &amp;</div><div class='add'>+			  IEEE80211_HE_MAC_CAP1_LINK_ADAPTATION);</div><div class='add'>+</div><div class='add'>+		if (link_adap == 2)</div><div class='add'>+			htc_flags |=</div><div class='add'>+				IWL_HE_HTC_LINK_ADAP_UNSOLICITED;</div><div class='add'>+		else if (link_adap == 3)</div><div class='add'>+			htc_flags |= IWL_HE_HTC_LINK_ADAP_BOTH;</div><div class='add'>+	}</div><div class='add'>+	if (mac_cap_info[2] &amp; IEEE80211_HE_MAC_CAP2_BSR)</div><div class='add'>+		htc_flags |= IWL_HE_HTC_BSR_SUPP;</div><div class='add'>+	if (mac_cap_info[3] &amp; IEEE80211_HE_MAC_CAP3_OMI_CONTROL)</div><div class='add'>+		htc_flags |= IWL_HE_HTC_OMI_SUPP;</div><div class='add'>+	if (mac_cap_info[4] &amp; IEEE80211_HE_MAC_CAP4_BQR)</div><div class='add'>+		htc_flags |= IWL_HE_HTC_BQR_SUPP;</div><div class='add'>+</div><div class='add'>+	return htc_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_send_sta_cmd(struct iwl_mld *mld,</div><div class='add'>+				const struct iwl_sta_cfg_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	int ret = iwl_mld_send_cmd_pdu(mld,</div><div class='add'>+				       WIDE_ID(MAC_CONF_GROUP, STA_CONFIG_CMD),</div><div class='add'>+				       cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mld, "STA_CONFIG_CMD send failed, ret=0x%x\n", ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_add_modify_sta_cmd(struct iwl_mld *mld,</div><div class='add'>+			   struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = link_sta-&gt;sta;</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+	struct ieee80211_bss_conf *link;</div><div class='add'>+	struct iwl_mld_link *mld_link;</div><div class='add'>+	struct iwl_sta_cfg_cmd cmd = {};</div><div class='add'>+	int fw_id = iwl_mld_fw_sta_id_from_link_sta(mld, link_sta);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	link = link_conf_dereference_protected(mld_sta-&gt;vif,</div><div class='add'>+					       link_sta-&gt;link_id);</div><div class='add'>+</div><div class='add'>+	mld_link = iwl_mld_link_from_mac80211(link);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!link || !mld_link) || fw_id &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cmd.sta_id = cpu_to_le32(fw_id);</div><div class='add'>+	cmd.station_type = cpu_to_le32(mld_sta-&gt;sta_type);</div><div class='add'>+	cmd.link_id = cpu_to_le32(mld_link-&gt;fw_id);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;cmd.peer_mld_address, sta-&gt;addr, ETH_ALEN);</div><div class='add'>+	memcpy(&amp;cmd.peer_link_address, link_sta-&gt;addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	if (mld_sta-&gt;sta_state &gt;= IEEE80211_STA_ASSOC)</div><div class='add'>+		cmd.assoc_id = cpu_to_le32(sta-&gt;aid);</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;mfp || mld_sta-&gt;sta_state &lt; IEEE80211_STA_AUTHORIZED)</div><div class='add'>+		cmd.mfp = cpu_to_le32(1);</div><div class='add'>+</div><div class='add'>+	switch (link_sta-&gt;rx_nss) {</div><div class='add'>+	case 1:</div><div class='add'>+		cmd.mimo = cpu_to_le32(0);</div><div class='add'>+		break;</div><div class='add'>+	case 2 ... 8:</div><div class='add'>+		cmd.mimo = cpu_to_le32(1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (link_sta-&gt;smps_mode) {</div><div class='add'>+	case IEEE80211_SMPS_AUTOMATIC:</div><div class='add'>+	case IEEE80211_SMPS_NUM_MODES:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_SMPS_STATIC:</div><div class='add'>+		/* override NSS */</div><div class='add'>+		cmd.mimo = cpu_to_le32(0);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_SMPS_DYNAMIC:</div><div class='add'>+		cmd.mimo_protection = cpu_to_le32(1);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_SMPS_OFF:</div><div class='add'>+		/* nothing */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mld_fill_ampdu_size_and_dens(link_sta, link,</div><div class='add'>+					 &amp;cmd.tx_ampdu_max_size,</div><div class='add'>+					 &amp;cmd.tx_ampdu_spacing);</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;wme) {</div><div class='add'>+		cmd.sp_length =</div><div class='add'>+			cpu_to_le32(sta-&gt;max_sp ? sta-&gt;max_sp * 2 : 128);</div><div class='add'>+		cmd.uapsd_acs = cpu_to_le32(iwl_mld_get_uapsd_acs(sta));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;he_cap.has_he) {</div><div class='add'>+		cmd.trig_rnd_alloc =</div><div class='add'>+			cpu_to_le32(link-&gt;uora_exists ? 1 : 0);</div><div class='add'>+</div><div class='add'>+		/* PPE Thresholds */</div><div class='add'>+		iwl_mld_fill_pkt_ext(mld, link_sta, &amp;cmd.pkt_ext);</div><div class='add'>+</div><div class='add'>+		/* HTC flags */</div><div class='add'>+		cmd.htc_flags =</div><div class='add'>+			cpu_to_le32(iwl_mld_get_htc_flags(link_sta));</div><div class='add'>+</div><div class='add'>+		if (link_sta-&gt;he_cap.he_cap_elem.mac_cap_info[2] &amp;</div><div class='add'>+		    IEEE80211_HE_MAC_CAP2_ACK_EN)</div><div class='add'>+			cmd.ack_enabled = cpu_to_le32(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_sta_cmd(mld, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+IWL_MLD_ALLOC_FN(link_sta, link_sta)</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_add_link_sta(struct iwl_mld *mld, struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(link_sta-&gt;sta);</div><div class='add'>+	struct iwl_mld_link_sta *mld_link_sta;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 fw_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* We will fail to add it to the FW anyway */</div><div class='add'>+	if (iwl_mld_error_before_recovery(mld))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	mld_link_sta = iwl_mld_link_sta_from_mac80211(link_sta);</div><div class='add'>+</div><div class='add'>+	/* We need to preserve the fw sta ids during a restart, since the fw</div><div class='add'>+	 * will recover SN/PN for them, this is why the mld_link_sta exists.</div><div class='add'>+	 */</div><div class='add'>+	if (mld_link_sta) {</div><div class='add'>+		/* But if we are not restarting, this is not OK */</div><div class='add'>+		WARN_ON(!mld-&gt;fw_status.in_hw_restart);</div><div class='add'>+</div><div class='add'>+		/* Avoid adding a STA that is already in FW to avoid an assert */</div><div class='add'>+		if (WARN_ON(mld_link_sta-&gt;in_fw))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		fw_id = mld_link_sta-&gt;fw_id;</div><div class='add'>+		goto add_to_fw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate a fw id and map it to the link_sta */</div><div class='add'>+	ret = iwl_mld_allocate_link_sta_fw_id(mld, &amp;fw_id, link_sta);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (link_sta == &amp;link_sta-&gt;sta-&gt;deflink) {</div><div class='add'>+		mld_link_sta = &amp;mld_sta-&gt;deflink;</div><div class='add'>+	} else {</div><div class='add'>+		mld_link_sta = kzalloc(sizeof(*mld_link_sta), GFP_KERNEL);</div><div class='add'>+		if (!mld_link_sta)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mld_link_sta-&gt;fw_id = fw_id;</div><div class='add'>+	rcu_assign_pointer(mld_sta-&gt;link[link_sta-&gt;link_id], mld_link_sta);</div><div class='add'>+</div><div class='add'>+add_to_fw:</div><div class='add'>+	ret = iwl_mld_add_modify_sta_cmd(mld, link_sta);</div><div class='add'>+	if (ret) {</div><div class='add'>+		RCU_INIT_POINTER(mld-&gt;fw_id_to_link_sta[fw_id], NULL);</div><div class='add'>+		RCU_INIT_POINTER(mld_sta-&gt;link[link_sta-&gt;link_id], NULL);</div><div class='add'>+		if (link_sta != &amp;link_sta-&gt;sta-&gt;deflink)</div><div class='add'>+			kfree(mld_link_sta);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	mld_link_sta-&gt;in_fw = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_rm_sta_from_fw(struct iwl_mld *mld, u8 fw_sta_id)</div><div class='add'>+{</div><div class='add'>+	struct iwl_remove_sta_cmd cmd = {</div><div class='add'>+		.sta_id = cpu_to_le32(fw_sta_id),</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd_pdu(mld,</div><div class='add'>+				   WIDE_ID(MAC_CONF_GROUP, STA_REMOVE_CMD),</div><div class='add'>+				   &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mld, "Failed to remove station. Id=%d\n", fw_sta_id);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_remove_link_sta(struct iwl_mld *mld,</div><div class='add'>+			struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(link_sta-&gt;sta);</div><div class='add'>+	struct iwl_mld_link_sta *mld_link_sta =</div><div class='add'>+		iwl_mld_link_sta_from_mac80211(link_sta);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mld_link_sta))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mld_rm_sta_from_fw(mld, mld_link_sta-&gt;fw_id);</div><div class='add'>+	mld_link_sta-&gt;in_fw = false;</div><div class='add'>+</div><div class='add'>+	/* Now that the STA doesn't exist in FW, we don't expect any new</div><div class='add'>+	 * notifications for it. Cancel the ones that are already pending</div><div class='add'>+	 */</div><div class='add'>+	iwl_mld_cancel_notifications_of_object(mld, IWL_MLD_OBJECT_TYPE_STA,</div><div class='add'>+					       mld_link_sta-&gt;fw_id);</div><div class='add'>+</div><div class='add'>+	/* This will not be done upon reconfig, so do it also when</div><div class='add'>+	 * failed to remove from fw</div><div class='add'>+	 */</div><div class='add'>+	RCU_INIT_POINTER(mld-&gt;fw_id_to_link_sta[mld_link_sta-&gt;fw_id], NULL);</div><div class='add'>+	RCU_INIT_POINTER(mld_sta-&gt;link[link_sta-&gt;link_id], NULL);</div><div class='add'>+	if (mld_link_sta != &amp;mld_sta-&gt;deflink)</div><div class='add'>+		kfree_rcu(mld_link_sta, rcu_head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_set_max_amsdu_len(struct iwl_mld *mld,</div><div class='add'>+				      struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_sta_ht_cap *ht_cap = &amp;link_sta-&gt;ht_cap;</div><div class='add'>+</div><div class='add'>+	/* For EHT, HE and VHT we can use the value as it was calculated by</div><div class='add'>+	 * mac80211. For HT, mac80211 doesn't enforce to 4095, so force it</div><div class='add'>+	 * here</div><div class='add'>+	 */</div><div class='add'>+	if (link_sta-&gt;eht_cap.has_eht || link_sta-&gt;he_cap.has_he ||</div><div class='add'>+	    link_sta-&gt;vht_cap.vht_supported ||</div><div class='add'>+	    !ht_cap-&gt;ht_supported ||</div><div class='add'>+	    !(ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_MAX_AMSDU))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	link_sta-&gt;agg.max_amsdu_len = IEEE80211_MAX_MPDU_LEN_HT_BA;</div><div class='add'>+	ieee80211_sta_recalc_aggregates(link_sta-&gt;sta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_update_all_link_stations(struct iwl_mld *mld,</div><div class='add'>+				     struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	int link_id;</div><div class='add'>+</div><div class='add'>+	for_each_sta_active_link(mld_sta-&gt;vif, sta, link_sta, link_id) {</div><div class='add'>+		int ret = iwl_mld_add_modify_sta_cmd(mld, link_sta);</div><div class='add'>+</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (mld_sta-&gt;sta_state == IEEE80211_STA_ASSOC)</div><div class='add'>+			iwl_mld_set_max_amsdu_len(mld, link_sta);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_destroy_sta(struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+</div><div class='add'>+	kfree(mld_sta-&gt;dup_data);</div><div class='add'>+	kfree(mld_sta-&gt;mpdu_counters);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_alloc_dup_data(struct iwl_mld *mld, struct iwl_mld_sta *mld_sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_rxq_dup_data *dup_data;</div><div class='add'>+</div><div class='add'>+	if (mld-&gt;fw_status.in_hw_restart)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dup_data = kcalloc(mld-&gt;trans-&gt;info.num_rxqs, sizeof(*dup_data),</div><div class='add'>+			   GFP_KERNEL);</div><div class='add'>+	if (!dup_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Initialize all the last_seq values to 0xffff which can never</div><div class='add'>+	 * compare equal to the frame's seq_ctrl in the check in</div><div class='add'>+	 * iwl_mld_is_dup() since the lower 4 bits are the fragment</div><div class='add'>+	 * number and fragmented packets don't reach that function.</div><div class='add'>+	 *</div><div class='add'>+	 * This thus allows receiving a packet with seqno 0 and the</div><div class='add'>+	 * retry bit set as the very first packet on a new TID.</div><div class='add'>+	 */</div><div class='add'>+	for (int q = 0; q &lt; mld-&gt;trans-&gt;info.num_rxqs; q++)</div><div class='add'>+		memset(dup_data[q].last_seq, 0xff,</div><div class='add'>+		       sizeof(dup_data[q].last_seq));</div><div class='add'>+	mld_sta-&gt;dup_data = dup_data;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_alloc_mpdu_counters(struct iwl_mld *mld,</div><div class='add'>+					struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+	struct ieee80211_vif *vif = mld_sta-&gt;vif;</div><div class='add'>+</div><div class='add'>+	if (mld-&gt;fw_status.in_hw_restart)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* MPDUs are counted only when EMLSR is possible */</div><div class='add'>+	if (ieee80211_vif_type_p2p(vif) != NL80211_IFTYPE_STATION ||</div><div class='add'>+	    sta-&gt;tdls || !ieee80211_vif_is_mld(vif))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mld_sta-&gt;mpdu_counters = kcalloc(mld-&gt;trans-&gt;info.num_rxqs,</div><div class='add'>+					 sizeof(*mld_sta-&gt;mpdu_counters),</div><div class='add'>+					 GFP_KERNEL);</div><div class='add'>+	if (!mld_sta-&gt;mpdu_counters)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (int q = 0; q &lt; mld-&gt;trans-&gt;info.num_rxqs; q++)</div><div class='add'>+		spin_lock_init(&amp;mld_sta-&gt;mpdu_counters[q].lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_init_sta(struct iwl_mld *mld, struct ieee80211_sta *sta,</div><div class='add'>+		 struct ieee80211_vif *vif, enum iwl_fw_sta_type type)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+</div><div class='add'>+	mld_sta-&gt;vif = vif;</div><div class='add'>+	mld_sta-&gt;sta_type = type;</div><div class='add'>+	mld_sta-&gt;mld = mld;</div><div class='add'>+</div><div class='add'>+	if (!mld-&gt;fw_status.in_hw_restart)</div><div class='add'>+		for (int i = 0; i &lt; ARRAY_SIZE(sta-&gt;txq); i++)</div><div class='add'>+			iwl_mld_init_txq(iwl_mld_txq_from_mac80211(sta-&gt;txq[i]));</div><div class='add'>+</div><div class='add'>+	iwl_mld_alloc_mpdu_counters(mld, sta);</div><div class='add'>+</div><div class='add'>+	iwl_mld_toggle_tx_ant(mld, &amp;mld_sta-&gt;data_tx_ant);</div><div class='add'>+</div><div class='add'>+	return iwl_mld_alloc_dup_data(mld, mld_sta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_add_sta(struct iwl_mld *mld, struct ieee80211_sta *sta,</div><div class='add'>+		    struct ieee80211_vif *vif, enum iwl_fw_sta_type type)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	int link_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_init_sta(mld, sta, vif, type);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* We could have add only the deflink link_sta, but it will not work</div><div class='add'>+	 * in the restart case if the single link that is active during</div><div class='add'>+	 * reconfig is not the deflink one.</div><div class='add'>+	 */</div><div class='add'>+	for_each_sta_active_link(mld_sta-&gt;vif, sta, link_sta, link_id) {</div><div class='add'>+		ret = iwl_mld_add_link_sta(mld, link_sta);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto destroy_sta;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+destroy_sta:</div><div class='add'>+	iwl_mld_destroy_sta(sta);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_flush_sta_txqs(struct iwl_mld *mld, struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	int link_id;</div><div class='add'>+</div><div class='add'>+	for_each_sta_active_link(mld_sta-&gt;vif, sta, link_sta, link_id) {</div><div class='add'>+		int fw_sta_id = iwl_mld_fw_sta_id_from_link_sta(mld, link_sta);</div><div class='add'>+</div><div class='add'>+		if (fw_sta_id &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		iwl_mld_flush_link_sta_txqs(mld, fw_sta_id);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_wait_sta_txqs_empty(struct iwl_mld *mld, struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	/* Avoid a warning in iwl_trans_wait_txq_empty if are anyway on the way</div><div class='add'>+	 * to a restart.</div><div class='add'>+	 */</div><div class='add'>+	if (iwl_mld_error_before_recovery(mld))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(sta-&gt;txq); i++) {</div><div class='add'>+		struct iwl_mld_txq *mld_txq =</div><div class='add'>+			iwl_mld_txq_from_mac80211(sta-&gt;txq[i]);</div><div class='add'>+</div><div class='add'>+		if (!mld_txq-&gt;status.allocated)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		iwl_trans_wait_txq_empty(mld-&gt;trans, mld_txq-&gt;fw_id);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_remove_sta(struct iwl_mld *mld, struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+	struct ieee80211_vif *vif = mld_sta-&gt;vif;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	u8 link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* Tell the HW to flush the queues */</div><div class='add'>+	iwl_mld_flush_sta_txqs(mld, sta);</div><div class='add'>+</div><div class='add'>+	/* Wait for trans to empty its queues */</div><div class='add'>+	iwl_mld_wait_sta_txqs_empty(mld, sta);</div><div class='add'>+</div><div class='add'>+	/* Now we can remove the queues */</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(sta-&gt;txq); i++)</div><div class='add'>+		iwl_mld_remove_txq(mld, sta-&gt;txq[i]);</div><div class='add'>+</div><div class='add'>+	for_each_sta_active_link(vif, sta, link_sta, link_id) {</div><div class='add'>+		/* Mac8011 will remove the groupwise keys after the sta is</div><div class='add'>+		 * removed, but FW expects all the keys to be removed before</div><div class='add'>+		 * the STA is, so remove them all here.</div><div class='add'>+		 */</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; !sta-&gt;tdls)</div><div class='add'>+			iwl_mld_remove_ap_keys(mld, vif, sta, link_id);</div><div class='add'>+</div><div class='add'>+		/* Remove the link_sta */</div><div class='add'>+		iwl_mld_remove_link_sta(mld, link_sta);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mld_destroy_sta(sta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 iwl_mld_fw_sta_id_mask(struct iwl_mld *mld, struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = iwl_mld_sta_from_mac80211(sta)-&gt;vif;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+	u32 result = 0;</div><div class='add'>+</div><div class='add'>+	KUNIT_STATIC_STUB_REDIRECT(iwl_mld_fw_sta_id_mask, mld, sta);</div><div class='add'>+</div><div class='add'>+	/* This function should only be used with the wiphy lock held,</div><div class='add'>+	 * In other cases, it is not guaranteed that the link_sta will exist</div><div class='add'>+	 * in the driver too, and it is checked in</div><div class='add'>+	 * iwl_mld_fw_sta_id_from_link_sta.</div><div class='add'>+	 */</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	for_each_sta_active_link(vif, sta, link_sta, link_id) {</div><div class='add'>+		int fw_id = iwl_mld_fw_sta_id_from_link_sta(mld, link_sta);</div><div class='add'>+</div><div class='add'>+		if (!(fw_id &lt; 0))</div><div class='add'>+			result |= BIT(fw_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_mld_fw_sta_id_mask);</div><div class='add'>+</div><div class='add'>+static void iwl_mld_count_mpdu(struct ieee80211_link_sta *link_sta, int queue,</div><div class='add'>+			       u32 count, bool tx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_per_q_mpdu_counter *queue_counter;</div><div class='add'>+	struct iwl_mld_per_link_mpdu_counter *link_counter;</div><div class='add'>+	struct iwl_mld_vif *mld_vif;</div><div class='add'>+	struct iwl_mld_sta *mld_sta;</div><div class='add'>+	struct iwl_mld_link *mld_link;</div><div class='add'>+	struct iwl_mld *mld;</div><div class='add'>+	int total_mpdus = 0;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!link_sta))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mld_sta = iwl_mld_sta_from_mac80211(link_sta-&gt;sta);</div><div class='add'>+	if (!mld_sta-&gt;mpdu_counters)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mld_vif = iwl_mld_vif_from_mac80211(mld_sta-&gt;vif);</div><div class='add'>+	mld_link = iwl_mld_link_dereference_check(mld_vif, link_sta-&gt;link_id);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!mld_link))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	queue_counter = &amp;mld_sta-&gt;mpdu_counters[queue];</div><div class='add'>+</div><div class='add'>+	mld = mld_vif-&gt;mld;</div><div class='add'>+</div><div class='add'>+	/* If it the window is over, first clear the counters.</div><div class='add'>+	 * When we are not blocked by TPT, the window is managed by check_tpt_wk</div><div class='add'>+	 */</div><div class='add'>+	if ((mld_vif-&gt;emlsr.blocked_reasons &amp; IWL_MLD_EMLSR_BLOCKED_TPT) &amp;&amp;</div><div class='add'>+	    time_is_before_jiffies(queue_counter-&gt;window_start_time +</div><div class='add'>+					IWL_MLD_TPT_COUNT_WINDOW)) {</div><div class='add'>+		memset(queue_counter-&gt;per_link, 0,</div><div class='add'>+		       sizeof(queue_counter-&gt;per_link));</div><div class='add'>+		queue_counter-&gt;window_start_time = jiffies;</div><div class='add'>+</div><div class='add'>+		IWL_DEBUG_EHT(mld, "MPDU counters are cleared\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	link_counter = &amp;queue_counter-&gt;per_link[mld_link-&gt;fw_id];</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;queue_counter-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* Update the statistics for this TPT measurement window */</div><div class='add'>+	if (tx)</div><div class='add'>+		link_counter-&gt;tx += count;</div><div class='add'>+	else</div><div class='add'>+		link_counter-&gt;rx += count;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Next, evaluate whether we should queue an unblock,</div><div class='add'>+	 * skip this if we are not blocked due to low throughput.</div><div class='add'>+	 */</div><div class='add'>+	if (!(mld_vif-&gt;emlsr.blocked_reasons &amp; IWL_MLD_EMLSR_BLOCKED_TPT))</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt;= IWL_FW_MAX_LINK_ID; i++)</div><div class='add'>+		total_mpdus += tx ? queue_counter-&gt;per_link[i].tx :</div><div class='add'>+				    queue_counter-&gt;per_link[i].rx;</div><div class='add'>+</div><div class='add'>+	/* Unblock is already queued if the threshold was reached before */</div><div class='add'>+	if (total_mpdus - count &gt;= IWL_MLD_ENTER_EMLSR_TPT_THRESH)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	if (total_mpdus &gt;= IWL_MLD_ENTER_EMLSR_TPT_THRESH)</div><div class='add'>+		wiphy_work_queue(mld-&gt;wiphy, &amp;mld_vif-&gt;emlsr.unblock_tpt_wk);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock_bh(&amp;queue_counter-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* must be called under rcu_read_lock() */</div><div class='add'>+void iwl_mld_count_mpdu_rx(struct ieee80211_link_sta *link_sta, int queue,</div><div class='add'>+			   u32 count)</div><div class='add'>+{</div><div class='add'>+	iwl_mld_count_mpdu(link_sta, queue, count, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* must be called under rcu_read_lock() */</div><div class='add'>+void iwl_mld_count_mpdu_tx(struct ieee80211_link_sta *link_sta, u32 count)</div><div class='add'>+{</div><div class='add'>+	/* use queue 0 for all TX */</div><div class='add'>+	iwl_mld_count_mpdu(link_sta, 0, count, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_allocate_internal_txq(struct iwl_mld *mld,</div><div class='add'>+					 struct iwl_mld_int_sta *internal_sta,</div><div class='add'>+					 u8 tid)</div><div class='add'>+{</div><div class='add'>+	u32 sta_mask = BIT(internal_sta-&gt;sta_id);</div><div class='add'>+	int queue, size;</div><div class='add'>+</div><div class='add'>+	size = max_t(u32, IWL_MGMT_QUEUE_SIZE,</div><div class='add'>+		     mld-&gt;trans-&gt;mac_cfg-&gt;base-&gt;min_txq_size);</div><div class='add'>+</div><div class='add'>+	queue = iwl_trans_txq_alloc(mld-&gt;trans, 0, sta_mask, tid, size,</div><div class='add'>+				    IWL_WATCHDOG_DISABLED);</div><div class='add'>+</div><div class='add'>+	if (queue &gt;= 0)</div><div class='add'>+		IWL_DEBUG_TX_QUEUES(mld,</div><div class='add'>+				    "Enabling TXQ #%d for sta mask 0x%x tid %d\n",</div><div class='add'>+				    queue, sta_mask, tid);</div><div class='add'>+	return queue;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_send_aux_sta_cmd(struct iwl_mld *mld,</div><div class='add'>+				    const struct iwl_mld_int_sta *internal_sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_aux_sta_cmd cmd = {</div><div class='add'>+		.sta_id = cpu_to_le32(internal_sta-&gt;sta_id),</div><div class='add'>+		/* TODO: CDB - properly set the lmac_id */</div><div class='add'>+		.lmac_id = cpu_to_le32(IWL_LMAC_24G_INDEX),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_cmd_pdu(mld, WIDE_ID(MAC_CONF_GROUP, AUX_STA_CMD),</div><div class='add'>+				    &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_add_internal_sta_to_fw(struct iwl_mld *mld,</div><div class='add'>+			       const struct iwl_mld_int_sta *internal_sta,</div><div class='add'>+			       u8 fw_link_id,</div><div class='add'>+			       const u8 *addr)</div><div class='add'>+{</div><div class='add'>+	struct iwl_sta_cfg_cmd cmd = {};</div><div class='add'>+</div><div class='add'>+	if (internal_sta-&gt;sta_type == STATION_TYPE_AUX)</div><div class='add'>+		return iwl_mld_send_aux_sta_cmd(mld, internal_sta);</div><div class='add'>+</div><div class='add'>+	cmd.sta_id = cpu_to_le32((u8)internal_sta-&gt;sta_id);</div><div class='add'>+	cmd.link_id = cpu_to_le32(fw_link_id);</div><div class='add'>+	cmd.station_type = cpu_to_le32(internal_sta-&gt;sta_type);</div><div class='add'>+</div><div class='add'>+	/* FW doesn't allow to add a IGTK/BIGTK if the sta isn't marked as MFP.</div><div class='add'>+	 * On the other hand, FW will never check this flag during RX since</div><div class='add'>+	 * an AP/GO doesn't receive protected broadcast management frames.</div><div class='add'>+	 * So, we can set it unconditionally.</div><div class='add'>+	 */</div><div class='add'>+	if (internal_sta-&gt;sta_type == STATION_TYPE_BCAST_MGMT)</div><div class='add'>+		cmd.mfp = cpu_to_le32(1);</div><div class='add'>+</div><div class='add'>+	if (addr) {</div><div class='add'>+		memcpy(cmd.peer_mld_address, addr, ETH_ALEN);</div><div class='add'>+		memcpy(cmd.peer_link_address, addr, ETH_ALEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_sta_cmd(mld, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_add_internal_sta(struct iwl_mld *mld,</div><div class='add'>+				    struct iwl_mld_int_sta *internal_sta,</div><div class='add'>+				    enum iwl_fw_sta_type sta_type,</div><div class='add'>+				    u8 fw_link_id, const u8 *addr, u8 tid)</div><div class='add'>+{</div><div class='add'>+	int ret, queue_id;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_allocate_link_sta_fw_id(mld,</div><div class='add'>+					      &amp;internal_sta-&gt;sta_id,</div><div class='add'>+					      ERR_PTR(-EINVAL));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	internal_sta-&gt;sta_type = sta_type;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_add_internal_sta_to_fw(mld, internal_sta, fw_link_id,</div><div class='add'>+					     addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	queue_id = iwl_mld_allocate_internal_txq(mld, internal_sta, tid);</div><div class='add'>+	if (queue_id &lt; 0) {</div><div class='add'>+		iwl_mld_rm_sta_from_fw(mld, internal_sta-&gt;sta_id);</div><div class='add'>+		ret = queue_id;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	internal_sta-&gt;queue_id = queue_id;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	iwl_mld_free_internal_sta(mld, internal_sta);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_add_bcast_sta(struct iwl_mld *mld,</div><div class='add'>+			  struct ieee80211_vif *vif,</div><div class='add'>+			  struct ieee80211_bss_conf *link)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_link *mld_link = iwl_mld_link_from_mac80211(link);</div><div class='add'>+	const u8 bcast_addr[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};</div><div class='add'>+	const u8 *addr;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mld_link))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(vif-&gt;type != NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+		    vif-&gt;type != NL80211_IFTYPE_ADHOC))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	addr = vif-&gt;type == NL80211_IFTYPE_ADHOC ? link-&gt;bssid : bcast_addr;</div><div class='add'>+</div><div class='add'>+	return iwl_mld_add_internal_sta(mld, &amp;mld_link-&gt;bcast_sta,</div><div class='add'>+					STATION_TYPE_BCAST_MGMT,</div><div class='add'>+					mld_link-&gt;fw_id, addr,</div><div class='add'>+					IWL_MGMT_TID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_add_mcast_sta(struct iwl_mld *mld,</div><div class='add'>+			  struct ieee80211_vif *vif,</div><div class='add'>+			  struct ieee80211_bss_conf *link)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_link *mld_link = iwl_mld_link_from_mac80211(link);</div><div class='add'>+	const u8 mcast_addr[] = {0x03, 0x00, 0x00, 0x00, 0x00, 0x00};</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mld_link))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(vif-&gt;type != NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+		    vif-&gt;type != NL80211_IFTYPE_ADHOC))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return iwl_mld_add_internal_sta(mld, &amp;mld_link-&gt;mcast_sta,</div><div class='add'>+					STATION_TYPE_MCAST,</div><div class='add'>+					mld_link-&gt;fw_id, mcast_addr, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_add_aux_sta(struct iwl_mld *mld,</div><div class='add'>+			struct iwl_mld_int_sta *internal_sta)</div><div class='add'>+{</div><div class='add'>+	return iwl_mld_add_internal_sta(mld, internal_sta, STATION_TYPE_AUX,</div><div class='add'>+					0, NULL, IWL_MAX_TID_COUNT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_add_mon_sta(struct iwl_mld *mld,</div><div class='add'>+			struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_bss_conf *link)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_link *mld_link = iwl_mld_link_from_mac80211(link);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mld_link))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(vif-&gt;type != NL80211_IFTYPE_MONITOR))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return iwl_mld_add_internal_sta(mld, &amp;mld_link-&gt;mon_sta,</div><div class='add'>+					STATION_TYPE_BCAST_MGMT,</div><div class='add'>+					mld_link-&gt;fw_id, NULL,</div><div class='add'>+					IWL_MAX_TID_COUNT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_remove_internal_sta(struct iwl_mld *mld,</div><div class='add'>+					struct iwl_mld_int_sta *internal_sta,</div><div class='add'>+					bool flush, u8 tid)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON_ONCE(internal_sta-&gt;sta_id == IWL_INVALID_STA ||</div><div class='add'>+			 internal_sta-&gt;queue_id == IWL_MLD_INVALID_QUEUE))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (flush)</div><div class='add'>+		iwl_mld_flush_link_sta_txqs(mld, internal_sta-&gt;sta_id);</div><div class='add'>+</div><div class='add'>+	iwl_mld_free_txq(mld, BIT(internal_sta-&gt;sta_id),</div><div class='add'>+			 tid, internal_sta-&gt;queue_id);</div><div class='add'>+</div><div class='add'>+	iwl_mld_rm_sta_from_fw(mld, internal_sta-&gt;sta_id);</div><div class='add'>+</div><div class='add'>+	iwl_mld_free_internal_sta(mld, internal_sta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_remove_bcast_sta(struct iwl_mld *mld,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      struct ieee80211_bss_conf *link)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_link *mld_link = iwl_mld_link_from_mac80211(link);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mld_link))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(vif-&gt;type != NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+		    vif-&gt;type != NL80211_IFTYPE_ADHOC))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mld_remove_internal_sta(mld, &amp;mld_link-&gt;bcast_sta, true,</div><div class='add'>+				    IWL_MGMT_TID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_remove_mcast_sta(struct iwl_mld *mld,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      struct ieee80211_bss_conf *link)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_link *mld_link = iwl_mld_link_from_mac80211(link);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mld_link))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(vif-&gt;type != NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+		    vif-&gt;type != NL80211_IFTYPE_ADHOC))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mld_remove_internal_sta(mld, &amp;mld_link-&gt;mcast_sta, true, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_remove_aux_sta(struct iwl_mld *mld,</div><div class='add'>+			    struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(vif-&gt;type != NL80211_IFTYPE_P2P_DEVICE &amp;&amp;</div><div class='add'>+		    vif-&gt;type != NL80211_IFTYPE_STATION))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mld_remove_internal_sta(mld, &amp;mld_vif-&gt;aux_sta, false,</div><div class='add'>+				    IWL_MAX_TID_COUNT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_remove_mon_sta(struct iwl_mld *mld,</div><div class='add'>+			    struct ieee80211_vif *vif,</div><div class='add'>+			    struct ieee80211_bss_conf *link)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_link *mld_link = iwl_mld_link_from_mac80211(link);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mld_link))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(vif-&gt;type != NL80211_IFTYPE_MONITOR))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mld_remove_internal_sta(mld, &amp;mld_link-&gt;mon_sta, false,</div><div class='add'>+				    IWL_MAX_TID_COUNT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_update_sta_resources(struct iwl_mld *mld,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					struct ieee80211_sta *sta,</div><div class='add'>+					u32 old_sta_mask,</div><div class='add'>+					u32 new_sta_mask)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_update_sta_txqs(mld, sta, old_sta_mask, new_sta_mask);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_update_sta_keys(mld, vif, sta, old_sta_mask, new_sta_mask);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return iwl_mld_update_sta_baids(mld, old_sta_mask, new_sta_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_update_link_stas(struct iwl_mld *mld,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_sta *sta,</div><div class='add'>+			     u16 old_links, u16 new_links)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+	struct iwl_mld_link_sta *mld_link_sta;</div><div class='add'>+	unsigned long links_to_add = ~old_links &amp; new_links;</div><div class='add'>+	unsigned long links_to_rem = old_links &amp; ~new_links;</div><div class='add'>+	unsigned long old_links_long = old_links;</div><div class='add'>+	unsigned long sta_mask_added = 0;</div><div class='add'>+	u32 current_sta_mask = 0, sta_mask_to_rem = 0;</div><div class='add'>+	unsigned int link_id, sta_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(link_id, &amp;old_links_long,</div><div class='add'>+			 IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		mld_link_sta =</div><div class='add'>+			iwl_mld_link_sta_dereference_check(mld_sta, link_id);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!mld_link_sta))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		current_sta_mask |= BIT(mld_link_sta-&gt;fw_id);</div><div class='add'>+		if (links_to_rem &amp; BIT(link_id))</div><div class='add'>+			sta_mask_to_rem |= BIT(mld_link_sta-&gt;fw_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sta_mask_to_rem) {</div><div class='add'>+		ret = iwl_mld_update_sta_resources(mld, vif, sta,</div><div class='add'>+						   current_sta_mask,</div><div class='add'>+						   current_sta_mask &amp;</div><div class='add'>+							~sta_mask_to_rem);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		current_sta_mask &amp;= ~sta_mask_to_rem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(link_id, &amp;links_to_rem, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		struct ieee80211_link_sta *link_sta =</div><div class='add'>+			link_sta_dereference_protected(sta, link_id);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!link_sta))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		iwl_mld_remove_link_sta(mld, link_sta);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(link_id, &amp;links_to_add, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		struct ieee80211_link_sta *link_sta =</div><div class='add'>+			link_sta_dereference_protected(sta, link_id);</div><div class='add'>+		struct ieee80211_bss_conf *link;</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!link_sta))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		ret = iwl_mld_add_link_sta(mld, link_sta);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto remove_added_link_stas;</div><div class='add'>+</div><div class='add'>+		mld_link_sta =</div><div class='add'>+			iwl_mld_link_sta_dereference_check(mld_sta,</div><div class='add'>+							   link_id);</div><div class='add'>+</div><div class='add'>+		link = link_conf_dereference_protected(mld_sta-&gt;vif,</div><div class='add'>+						       link_sta-&gt;link_id);</div><div class='add'>+</div><div class='add'>+		iwl_mld_set_max_amsdu_len(mld, link_sta);</div><div class='add'>+		iwl_mld_config_tlc_link(mld, vif, link, link_sta);</div><div class='add'>+</div><div class='add'>+		sta_mask_added |= BIT(mld_link_sta-&gt;fw_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sta_mask_added) {</div><div class='add'>+		ret = iwl_mld_update_sta_resources(mld, vif, sta,</div><div class='add'>+						   current_sta_mask,</div><div class='add'>+						   current_sta_mask |</div><div class='add'>+							sta_mask_added);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto remove_added_link_stas;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We couldn't activate the links before it has a STA. Now we can */</div><div class='add'>+	for_each_set_bit(link_id, &amp;links_to_add, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		struct ieee80211_bss_conf *link =</div><div class='add'>+			link_conf_dereference_protected(mld_sta-&gt;vif, link_id);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!link))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		iwl_mld_activate_link(mld, link);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+remove_added_link_stas:</div><div class='add'>+	for_each_set_bit(sta_id, &amp;sta_mask_added, mld-&gt;fw-&gt;ucode_capa.num_stations) {</div><div class='add'>+		struct ieee80211_link_sta *link_sta =</div><div class='add'>+			wiphy_dereference(mld-&gt;wiphy,</div><div class='add'>+					  mld-&gt;fw_id_to_link_sta[sta_id]);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!link_sta))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		iwl_mld_remove_link_sta(mld, link_sta);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/sta.h b/drivers/net/wireless/intel/iwlwifi/mld/sta.h<br/>new file mode 100644<br/>index 000000000000..1897b121aae2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/sta.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/sta.h</a></div><div class='hunk'>@@ -0,0 +1,273 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __iwl_mld_sta_h__</div><div class='add'>+#define __iwl_mld_sta_h__</div><div class='add'>+</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "tx.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_rxq_dup_data - Duplication detection data, per STA &amp; Rx queue</div><div class='add'>+ * @last_seq: last sequence per tid.</div><div class='add'>+ * @last_sub_frame_idx: the index of the last subframe in an A-MSDU. This value</div><div class='add'>+ *	will be zero if the packet is not part of an A-MSDU.</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_rxq_dup_data {</div><div class='add'>+	__le16 last_seq[IWL_MAX_TID_COUNT + 1];</div><div class='add'>+	u8 last_sub_frame_idx[IWL_MAX_TID_COUNT + 1];</div><div class='add'>+} ____cacheline_aligned_in_smp;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_link_sta - link-level station</div><div class='add'>+ *</div><div class='add'>+ * This represents the link-level sta - the driver level equivalent to the</div><div class='add'>+ * ieee80211_link_sta</div><div class='add'>+ *</div><div class='add'>+ * @last_rate_n_flags: rate_n_flags from the last &amp;iwl_tlc_update_notif</div><div class='add'>+ * @signal_avg: the signal average coming from the firmware</div><div class='add'>+ * @in_fw: whether the link STA is uploaded to the FW (false during restart)</div><div class='add'>+ * @rcu_head: RCU head for freeing this object</div><div class='add'>+ * @fw_id: the FW id of this link sta.</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_link_sta {</div><div class='add'>+	/* Add here fields that need clean up on restart */</div><div class='add'>+	struct_group(zeroed_on_hw_restart,</div><div class='add'>+		u32 last_rate_n_flags;</div><div class='add'>+		bool in_fw;</div><div class='add'>+		s8 signal_avg;</div><div class='add'>+	);</div><div class='add'>+	/* And here fields that survive a fw restart */</div><div class='add'>+	struct rcu_head rcu_head;</div><div class='add'>+	u32 fw_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define iwl_mld_link_sta_dereference_check(mld_sta, link_id)		\</div><div class='add'>+	rcu_dereference_check((mld_sta)-&gt;link[link_id],			\</div><div class='add'>+			      lockdep_is_held(&amp;mld_sta-&gt;mld-&gt;wiphy-&gt;mtx))</div><div class='add'>+</div><div class='add'>+#define for_each_mld_link_sta(mld_sta, link_sta, link_id)		\</div><div class='add'>+	for (link_id = 0; link_id &lt; ARRAY_SIZE((mld_sta)-&gt;link);	\</div><div class='add'>+	     link_id++)							\</div><div class='add'>+		if ((link_sta =						\</div><div class='add'>+			iwl_mld_link_sta_dereference_check(mld_sta, link_id)))</div><div class='add'>+</div><div class='add'>+#define IWL_NUM_DEFAULT_KEYS 4</div><div class='add'>+</div><div class='add'>+/* struct iwl_mld_ptk_pn - Holds Packet Number (PN) per TID.</div><div class='add'>+ * @rcu_head: RCU head for freeing this data.</div><div class='add'>+ * @pn: Array storing PN for each TID.</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_ptk_pn {</div><div class='add'>+	struct rcu_head rcu_head;</div><div class='add'>+	struct {</div><div class='add'>+		u8 pn[IWL_MAX_TID_COUNT][IEEE80211_CCMP_PN_LEN];</div><div class='add'>+	} ____cacheline_aligned_in_smp q[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_per_link_mpdu_counter - per-link TX/RX MPDU counters</div><div class='add'>+ *</div><div class='add'>+ * @tx: Number of TX MPDUs.</div><div class='add'>+ * @rx: Number of RX MPDUs.</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_per_link_mpdu_counter {</div><div class='add'>+	u32 tx;</div><div class='add'>+	u32 rx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_per_q_mpdu_counter - per-queue MPDU counter</div><div class='add'>+ *</div><div class='add'>+ * @lock: Needed to protect the counters when modified from statistics.</div><div class='add'>+ * @per_link: per-link counters.</div><div class='add'>+ * @window_start_time: timestamp of the counting-window start</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_per_q_mpdu_counter {</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	struct iwl_mld_per_link_mpdu_counter per_link[IWL_FW_MAX_LINK_ID + 1];</div><div class='add'>+	unsigned long window_start_time;</div><div class='add'>+} ____cacheline_aligned_in_smp;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_sta - representation of a station in the driver.</div><div class='add'>+ *</div><div class='add'>+ * This represent the MLD-level sta, and will not be added to the FW.</div><div class='add'>+ * Embedded in ieee80211_sta.</div><div class='add'>+ *</div><div class='add'>+ * @vif: pointer the vif object.</div><div class='add'>+ * @sta_state: station state according to enum %ieee80211_sta_state</div><div class='add'>+ * @sta_type: type of this station. See &amp;enum iwl_fw_sta_type</div><div class='add'>+ * @mld: a pointer to the iwl_mld object</div><div class='add'>+ * @dup_data: per queue duplicate packet detection data</div><div class='add'>+ * @data_tx_ant: stores the last TX antenna index; used for setting</div><div class='add'>+ *	TX rate_n_flags for injected data frames (toggles on every TX failure).</div><div class='add'>+ * @tid_to_baid: a simple map of TID to Block-Ack fw id</div><div class='add'>+ * @deflink: This holds the default link STA information, for non MLO STA all</div><div class='add'>+ *	link specific STA information is accessed through @deflink or through</div><div class='add'>+ *	link[0] which points to address of @deflink. For MLO Link STA</div><div class='add'>+ *	the first added link STA will point to deflink.</div><div class='add'>+ * @link: reference to Link Sta entries. For Non MLO STA, except 1st link,</div><div class='add'>+ *	i.e link[0] all links would be assigned to NULL by default and</div><div class='add'>+ *	would access link information via @deflink or link[0]. For MLO</div><div class='add'>+ *	STA, first link STA being added will point its link pointer to</div><div class='add'>+ *	@deflink address and remaining would be allocated and the address</div><div class='add'>+ *	would be assigned to link[link_id] where link_id is the id assigned</div><div class='add'>+ *	by the AP.</div><div class='add'>+ * @ptk_pn: Array of pointers to PTK PN data, used to track the Packet Number</div><div class='add'>+ *	per key index and per queue (TID).</div><div class='add'>+ * @mpdu_counters: RX/TX MPDUs counters for each queue.</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_sta {</div><div class='add'>+	/* Add here fields that need clean up on restart */</div><div class='add'>+	struct_group(zeroed_on_hw_restart,</div><div class='add'>+		enum ieee80211_sta_state sta_state;</div><div class='add'>+		enum iwl_fw_sta_type sta_type;</div><div class='add'>+	);</div><div class='add'>+	/* And here fields that survive a fw restart */</div><div class='add'>+	struct iwl_mld *mld;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct iwl_mld_rxq_dup_data *dup_data;</div><div class='add'>+	u8 tid_to_baid[IWL_MAX_TID_COUNT];</div><div class='add'>+	u8 data_tx_ant;</div><div class='add'>+</div><div class='add'>+	struct iwl_mld_link_sta deflink;</div><div class='add'>+	struct iwl_mld_link_sta __rcu *link[IEEE80211_MLD_MAX_NUM_LINKS];</div><div class='add'>+	struct iwl_mld_ptk_pn __rcu *ptk_pn[IWL_NUM_DEFAULT_KEYS];</div><div class='add'>+	struct iwl_mld_per_q_mpdu_counter *mpdu_counters;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct iwl_mld_sta *</div><div class='add'>+iwl_mld_sta_from_mac80211(struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	return (void *)sta-&gt;drv_priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+iwl_mld_cleanup_sta(void *data, struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+	struct iwl_mld_link_sta *mld_link_sta;</div><div class='add'>+	u8 link_id;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(sta-&gt;txq); i++)</div><div class='add'>+		CLEANUP_STRUCT(iwl_mld_txq_from_mac80211(sta-&gt;txq[i]));</div><div class='add'>+</div><div class='add'>+	for_each_mld_link_sta(mld_sta, mld_link_sta, link_id) {</div><div class='add'>+		CLEANUP_STRUCT(mld_link_sta);</div><div class='add'>+</div><div class='add'>+		if (!ieee80211_vif_is_mld(mld_sta-&gt;vif)) {</div><div class='add'>+			/* not an MLD STA; only has the deflink with ID zero */</div><div class='add'>+			WARN_ON(link_id);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (mld_sta-&gt;vif-&gt;active_links &amp; BIT(link_id))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Should not happen as link removal should always succeed */</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		RCU_INIT_POINTER(mld_sta-&gt;link[link_id], NULL);</div><div class='add'>+		RCU_INIT_POINTER(mld_sta-&gt;mld-&gt;fw_id_to_link_sta[mld_link_sta-&gt;fw_id],</div><div class='add'>+				 NULL);</div><div class='add'>+		if (mld_link_sta != &amp;mld_sta-&gt;deflink)</div><div class='add'>+			kfree_rcu(mld_link_sta, rcu_head);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	CLEANUP_STRUCT(mld_sta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct iwl_mld_link_sta *</div><div class='add'>+iwl_mld_link_sta_from_mac80211(struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(link_sta-&gt;sta);</div><div class='add'>+</div><div class='add'>+	return iwl_mld_link_sta_dereference_check(mld_sta, link_sta-&gt;link_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_add_sta(struct iwl_mld *mld, struct ieee80211_sta *sta,</div><div class='add'>+		    struct ieee80211_vif *vif, enum iwl_fw_sta_type type);</div><div class='add'>+void iwl_mld_remove_sta(struct iwl_mld *mld, struct ieee80211_sta *sta);</div><div class='add'>+int iwl_mld_fw_sta_id_from_link_sta(struct iwl_mld *mld,</div><div class='add'>+				    struct ieee80211_link_sta *link_sta);</div><div class='add'>+u32 iwl_mld_fw_sta_id_mask(struct iwl_mld *mld, struct ieee80211_sta *sta);</div><div class='add'>+int iwl_mld_update_all_link_stations(struct iwl_mld *mld,</div><div class='add'>+				     struct ieee80211_sta *sta);</div><div class='add'>+void iwl_mld_flush_sta_txqs(struct iwl_mld *mld, struct ieee80211_sta *sta);</div><div class='add'>+void iwl_mld_wait_sta_txqs_empty(struct iwl_mld *mld,</div><div class='add'>+				 struct ieee80211_sta *sta);</div><div class='add'>+void iwl_mld_count_mpdu_rx(struct ieee80211_link_sta *link_sta, int queue,</div><div class='add'>+			   u32 count);</div><div class='add'>+void iwl_mld_count_mpdu_tx(struct ieee80211_link_sta *link_sta, u32 count);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_int_sta - representation of an internal station</div><div class='add'>+ * (a station that exist in FW and in driver, but not in mac80211)</div><div class='add'>+ *</div><div class='add'>+ * @sta_id: the index of the station in the fw</div><div class='add'>+ * @queue_id: the if of the queue used by the station</div><div class='add'>+ * @sta_type: station type. One of &amp;iwl_fw_sta_type</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_int_sta {</div><div class='add'>+	u8 sta_id;</div><div class='add'>+	u32 queue_id;</div><div class='add'>+	enum iwl_fw_sta_type sta_type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+iwl_mld_init_internal_sta(struct iwl_mld_int_sta *internal_sta)</div><div class='add'>+{</div><div class='add'>+	internal_sta-&gt;sta_id = IWL_INVALID_STA;</div><div class='add'>+	internal_sta-&gt;queue_id = IWL_MLD_INVALID_QUEUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+iwl_mld_free_internal_sta(struct iwl_mld *mld,</div><div class='add'>+			  struct iwl_mld_int_sta *internal_sta)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(internal_sta-&gt;sta_id == IWL_INVALID_STA))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	RCU_INIT_POINTER(mld-&gt;fw_id_to_link_sta[internal_sta-&gt;sta_id], NULL);</div><div class='add'>+	iwl_mld_init_internal_sta(internal_sta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_add_bcast_sta(struct iwl_mld *mld,</div><div class='add'>+			  struct ieee80211_vif *vif,</div><div class='add'>+			  struct ieee80211_bss_conf *link);</div><div class='add'>+</div><div class='add'>+int iwl_mld_add_mcast_sta(struct iwl_mld *mld,</div><div class='add'>+			  struct ieee80211_vif *vif,</div><div class='add'>+			  struct ieee80211_bss_conf *link);</div><div class='add'>+</div><div class='add'>+int iwl_mld_add_aux_sta(struct iwl_mld *mld,</div><div class='add'>+			struct iwl_mld_int_sta *internal_sta);</div><div class='add'>+</div><div class='add'>+int iwl_mld_add_mon_sta(struct iwl_mld *mld,</div><div class='add'>+			struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_bss_conf *link);</div><div class='add'>+</div><div class='add'>+void iwl_mld_remove_bcast_sta(struct iwl_mld *mld,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      struct ieee80211_bss_conf *link);</div><div class='add'>+</div><div class='add'>+void iwl_mld_remove_mcast_sta(struct iwl_mld *mld,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      struct ieee80211_bss_conf *link);</div><div class='add'>+</div><div class='add'>+void iwl_mld_remove_aux_sta(struct iwl_mld *mld,</div><div class='add'>+			    struct ieee80211_vif *vif);</div><div class='add'>+</div><div class='add'>+void iwl_mld_remove_mon_sta(struct iwl_mld *mld,</div><div class='add'>+			    struct ieee80211_vif *vif,</div><div class='add'>+			    struct ieee80211_bss_conf *link);</div><div class='add'>+</div><div class='add'>+int iwl_mld_update_link_stas(struct iwl_mld *mld,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_sta *sta,</div><div class='add'>+			     u16 old_links, u16 new_links);</div><div class='add'>+#endif /* __iwl_mld_sta_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/stats.c b/drivers/net/wireless/intel/iwlwifi/mld/stats.c<br/>new file mode 100644<br/>index 000000000000..7b8709716324<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/stats.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/stats.c</a></div><div class='hunk'>@@ -0,0 +1,521 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "stats.h"</div><div class='add'>+#include "sta.h"</div><div class='add'>+#include "mlo.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+#include "iface.h"</div><div class='add'>+#include "scan.h"</div><div class='add'>+#include "phy.h"</div><div class='add'>+#include "fw/api/stats.h"</div><div class='add'>+</div><div class='add'>+static int iwl_mld_send_fw_stats_cmd(struct iwl_mld *mld, u32 cfg_mask,</div><div class='add'>+				     u32 cfg_time, u32 type_mask)</div><div class='add'>+{</div><div class='add'>+	u32 cmd_id = WIDE_ID(SYSTEM_GROUP, SYSTEM_STATISTICS_CMD);</div><div class='add'>+	struct iwl_system_statistics_cmd stats_cmd = {</div><div class='add'>+		.cfg_mask = cpu_to_le32(cfg_mask),</div><div class='add'>+		.config_time_sec = cpu_to_le32(cfg_time),</div><div class='add'>+		.type_id_mask = cpu_to_le32(type_mask),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_cmd_pdu(mld, cmd_id, &amp;stats_cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_clear_stats_in_fw(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	u32 cfg_mask = IWL_STATS_CFG_FLG_ON_DEMAND_NTFY_MSK;</div><div class='add'>+	u32 type_mask = IWL_STATS_NTFY_TYPE_ID_OPER |</div><div class='add'>+			IWL_STATS_NTFY_TYPE_ID_OPER_PART1;</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_fw_stats_cmd(mld, cfg_mask, 0, type_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_fill_stats_from_oper_notif(struct iwl_mld *mld,</div><div class='add'>+				   struct iwl_rx_packet *pkt,</div><div class='add'>+				   u8 fw_sta_id, struct station_info *sinfo)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_system_statistics_notif_oper *notif =</div><div class='add'>+		(void *)&amp;pkt-&gt;data;</div><div class='add'>+	const struct iwl_stats_ntfy_per_sta *per_sta =</div><div class='add'>+		&amp;notif-&gt;per_sta[fw_sta_id];</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	struct iwl_mld_link_sta *mld_link_sta;</div><div class='add'>+</div><div class='add'>+	/* 0 isn't a valid value, but FW might send 0.</div><div class='add'>+	 * In that case, set the latest non-zero value we stored</div><div class='add'>+	 */</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	link_sta = rcu_dereference(mld-&gt;fw_id_to_link_sta[fw_sta_id]);</div><div class='add'>+	if (IS_ERR_OR_NULL(link_sta))</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	mld_link_sta = iwl_mld_link_sta_from_mac80211(link_sta);</div><div class='add'>+	if (WARN_ON(!mld_link_sta))</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	if (per_sta-&gt;average_energy)</div><div class='add'>+		mld_link_sta-&gt;signal_avg =</div><div class='add'>+			-(s8)le32_to_cpu(per_sta-&gt;average_energy);</div><div class='add'>+</div><div class='add'>+	sinfo-&gt;signal_avg = mld_link_sta-&gt;signal_avg;</div><div class='add'>+	sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct iwl_mld_stats_data {</div><div class='add'>+	u8 fw_sta_id;</div><div class='add'>+	struct station_info *sinfo;</div><div class='add'>+	struct iwl_mld *mld;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_wait_stats_handler(struct iwl_notif_wait_data *notif_data,</div><div class='add'>+				       struct iwl_rx_packet *pkt, void *data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_stats_data *stats_data = data;</div><div class='add'>+	u16 cmd = WIDE_ID(pkt-&gt;hdr.group_id, pkt-&gt;hdr.cmd);</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case WIDE_ID(STATISTICS_GROUP, STATISTICS_OPER_NOTIF):</div><div class='add'>+		iwl_mld_fill_stats_from_oper_notif(stats_data-&gt;mld, pkt,</div><div class='add'>+						   stats_data-&gt;fw_sta_id,</div><div class='add'>+						   stats_data-&gt;sinfo);</div><div class='add'>+		break;</div><div class='add'>+	case WIDE_ID(STATISTICS_GROUP, STATISTICS_OPER_PART1_NOTIF):</div><div class='add'>+		break;</div><div class='add'>+	case WIDE_ID(SYSTEM_GROUP, SYSTEM_STATISTICS_END_NOTIF):</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_fw_stats_to_mac80211(struct iwl_mld *mld, struct iwl_mld_sta *mld_sta,</div><div class='add'>+			     struct station_info *sinfo)</div><div class='add'>+{</div><div class='add'>+	u32 cfg_mask = IWL_STATS_CFG_FLG_ON_DEMAND_NTFY_MSK |</div><div class='add'>+		       IWL_STATS_CFG_FLG_RESET_MSK;</div><div class='add'>+	u32 type_mask = IWL_STATS_NTFY_TYPE_ID_OPER |</div><div class='add'>+			IWL_STATS_NTFY_TYPE_ID_OPER_PART1;</div><div class='add'>+	static const u16 notifications[] = {</div><div class='add'>+		WIDE_ID(STATISTICS_GROUP, STATISTICS_OPER_NOTIF),</div><div class='add'>+		WIDE_ID(STATISTICS_GROUP, STATISTICS_OPER_PART1_NOTIF),</div><div class='add'>+		WIDE_ID(SYSTEM_GROUP, SYSTEM_STATISTICS_END_NOTIF),</div><div class='add'>+	};</div><div class='add'>+	struct iwl_mld_stats_data wait_stats_data = {</div><div class='add'>+		/* We don't support drv_sta_statistics in EMLSR */</div><div class='add'>+		.fw_sta_id = mld_sta-&gt;deflink.fw_id,</div><div class='add'>+		.sinfo = sinfo,</div><div class='add'>+		.mld = mld,</div><div class='add'>+	};</div><div class='add'>+	struct iwl_notification_wait stats_wait;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	iwl_init_notification_wait(&amp;mld-&gt;notif_wait, &amp;stats_wait,</div><div class='add'>+				   notifications, ARRAY_SIZE(notifications),</div><div class='add'>+				   iwl_mld_wait_stats_handler,</div><div class='add'>+				   &amp;wait_stats_data);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_fw_stats_cmd(mld, cfg_mask, 0, type_mask);</div><div class='add'>+	if (ret) {</div><div class='add'>+		iwl_remove_notification(&amp;mld-&gt;notif_wait, &amp;stats_wait);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait 500ms for OPERATIONAL, PART1, and END notifications,</div><div class='add'>+	 * which should be sufficient for the firmware to gather data</div><div class='add'>+	 * from all LMACs and send notifications to the host.</div><div class='add'>+	 */</div><div class='add'>+	ret = iwl_wait_notification(&amp;mld-&gt;notif_wait, &amp;stats_wait, HZ / 2);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* When periodic statistics are sent, FW will clear its statistics DB.</div><div class='add'>+	 * If the statistics request here happens shortly afterwards,</div><div class='add'>+	 * the response will contain data collected over a short time</div><div class='add'>+	 * interval. The response we got here shouldn't be processed by</div><div class='add'>+	 * the general statistics processing because it's incomplete.</div><div class='add'>+	 * So, we delete it from the list so it won't be processed.</div><div class='add'>+	 */</div><div class='add'>+	iwl_mld_delete_handlers(mld, notifications, ARRAY_SIZE(notifications));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define PERIODIC_STATS_SECONDS 5</div><div class='add'>+</div><div class='add'>+int iwl_mld_request_periodic_fw_stats(struct iwl_mld *mld, bool enable)</div><div class='add'>+{</div><div class='add'>+	u32 cfg_mask = enable ? 0 : IWL_STATS_CFG_FLG_DISABLE_NTFY_MSK;</div><div class='add'>+	u32 type_mask = enable ? (IWL_STATS_NTFY_TYPE_ID_OPER |</div><div class='add'>+				  IWL_STATS_NTFY_TYPE_ID_OPER_PART1) : 0;</div><div class='add'>+	u32 cfg_time = enable ? PERIODIC_STATS_SECONDS : 0;</div><div class='add'>+</div><div class='add'>+	return iwl_mld_send_fw_stats_cmd(mld, cfg_mask, cfg_time, type_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_sta_stats_fill_txrate(struct iwl_mld_sta *mld_sta,</div><div class='add'>+					  struct station_info *sinfo)</div><div class='add'>+{</div><div class='add'>+	struct rate_info *rinfo = &amp;sinfo-&gt;txrate;</div><div class='add'>+	u32 rate_n_flags = mld_sta-&gt;deflink.last_rate_n_flags;</div><div class='add'>+	u32 format = rate_n_flags &amp; RATE_MCS_MOD_TYPE_MSK;</div><div class='add'>+	u32 gi_ltf;</div><div class='add'>+</div><div class='add'>+	sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);</div><div class='add'>+</div><div class='add'>+	switch (rate_n_flags &amp; RATE_MCS_CHAN_WIDTH_MSK) {</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_20:</div><div class='add'>+		rinfo-&gt;bw = RATE_INFO_BW_20;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_40:</div><div class='add'>+		rinfo-&gt;bw = RATE_INFO_BW_40;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_80:</div><div class='add'>+		rinfo-&gt;bw = RATE_INFO_BW_80;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_160:</div><div class='add'>+		rinfo-&gt;bw = RATE_INFO_BW_160;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_320:</div><div class='add'>+		rinfo-&gt;bw = RATE_INFO_BW_320;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (format == RATE_MCS_MOD_TYPE_CCK ||</div><div class='add'>+	    format == RATE_MCS_MOD_TYPE_LEGACY_OFDM) {</div><div class='add'>+		int rate = u32_get_bits(rate_n_flags, RATE_LEGACY_RATE_MSK);</div><div class='add'>+</div><div class='add'>+		/* add the offset needed to get to the legacy ofdm indices */</div><div class='add'>+		if (format == RATE_MCS_MOD_TYPE_LEGACY_OFDM)</div><div class='add'>+			rate += IWL_FIRST_OFDM_RATE;</div><div class='add'>+</div><div class='add'>+		switch (rate) {</div><div class='add'>+		case IWL_RATE_1M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 10;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_RATE_2M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 20;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_RATE_5M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 55;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_RATE_11M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 110;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_RATE_6M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 60;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_RATE_9M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 90;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_RATE_12M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 120;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_RATE_18M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 180;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_RATE_24M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 240;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_RATE_36M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 360;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_RATE_48M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 480;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_RATE_54M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 540;</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rinfo-&gt;nss = u32_get_bits(rate_n_flags, RATE_MCS_NSS_MSK) + 1;</div><div class='add'>+</div><div class='add'>+	if (format == RATE_MCS_MOD_TYPE_HT)</div><div class='add'>+		rinfo-&gt;mcs = RATE_HT_MCS_INDEX(rate_n_flags);</div><div class='add'>+	else</div><div class='add'>+		rinfo-&gt;mcs = u32_get_bits(rate_n_flags, RATE_MCS_CODE_MSK);</div><div class='add'>+</div><div class='add'>+	if (rate_n_flags &amp; RATE_MCS_SGI_MSK)</div><div class='add'>+		rinfo-&gt;flags |= RATE_INFO_FLAGS_SHORT_GI;</div><div class='add'>+</div><div class='add'>+	switch (format) {</div><div class='add'>+	case RATE_MCS_MOD_TYPE_EHT:</div><div class='add'>+		rinfo-&gt;flags |= RATE_INFO_FLAGS_EHT_MCS;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_HE:</div><div class='add'>+		gi_ltf = u32_get_bits(rate_n_flags, RATE_MCS_HE_GI_LTF_MSK);</div><div class='add'>+</div><div class='add'>+		rinfo-&gt;flags |= RATE_INFO_FLAGS_HE_MCS;</div><div class='add'>+</div><div class='add'>+		if (rate_n_flags &amp; RATE_MCS_HE_106T_MSK) {</div><div class='add'>+			rinfo-&gt;bw = RATE_INFO_BW_HE_RU;</div><div class='add'>+			rinfo-&gt;he_ru_alloc = NL80211_RATE_INFO_HE_RU_ALLOC_106;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (rate_n_flags &amp; RATE_MCS_HE_TYPE_MSK) {</div><div class='add'>+		case RATE_MCS_HE_TYPE_SU:</div><div class='add'>+		case RATE_MCS_HE_TYPE_EXT_SU:</div><div class='add'>+			if (gi_ltf == 0 || gi_ltf == 1)</div><div class='add'>+				rinfo-&gt;he_gi = NL80211_RATE_INFO_HE_GI_0_8;</div><div class='add'>+			else if (gi_ltf == 2)</div><div class='add'>+				rinfo-&gt;he_gi = NL80211_RATE_INFO_HE_GI_1_6;</div><div class='add'>+			else if (gi_ltf == 3)</div><div class='add'>+				rinfo-&gt;he_gi = NL80211_RATE_INFO_HE_GI_3_2;</div><div class='add'>+			else</div><div class='add'>+				rinfo-&gt;he_gi = NL80211_RATE_INFO_HE_GI_0_8;</div><div class='add'>+			break;</div><div class='add'>+		case RATE_MCS_HE_TYPE_MU:</div><div class='add'>+			if (gi_ltf == 0 || gi_ltf == 1)</div><div class='add'>+				rinfo-&gt;he_gi = NL80211_RATE_INFO_HE_GI_0_8;</div><div class='add'>+			else if (gi_ltf == 2)</div><div class='add'>+				rinfo-&gt;he_gi = NL80211_RATE_INFO_HE_GI_1_6;</div><div class='add'>+			else</div><div class='add'>+				rinfo-&gt;he_gi = NL80211_RATE_INFO_HE_GI_3_2;</div><div class='add'>+			break;</div><div class='add'>+		case RATE_MCS_HE_TYPE_TRIG:</div><div class='add'>+			if (gi_ltf == 0 || gi_ltf == 1)</div><div class='add'>+				rinfo-&gt;he_gi = NL80211_RATE_INFO_HE_GI_1_6;</div><div class='add'>+			else</div><div class='add'>+				rinfo-&gt;he_gi = NL80211_RATE_INFO_HE_GI_3_2;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (rate_n_flags &amp; RATE_HE_DUAL_CARRIER_MODE_MSK)</div><div class='add'>+			rinfo-&gt;he_dcm = 1;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_HT:</div><div class='add'>+		rinfo-&gt;flags |= RATE_INFO_FLAGS_MCS;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_VHT:</div><div class='add'>+		rinfo-&gt;flags |= RATE_INFO_FLAGS_VHT_MCS;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_mac80211_sta_statistics(struct ieee80211_hw *hw,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     struct ieee80211_sta *sta,</div><div class='add'>+				     struct station_info *sinfo)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+</div><div class='add'>+	/* This API is not EMLSR ready, so we cannot provide complete</div><div class='add'>+	 * information if EMLSR is active</div><div class='add'>+	 */</div><div class='add'>+	if (hweight16(vif-&gt;active_links) &gt; 1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (iwl_mld_fw_stats_to_mac80211(mld_sta-&gt;mld, mld_sta, sinfo))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mld_sta_stats_fill_txrate(mld_sta, sinfo);</div><div class='add'>+</div><div class='add'>+	/* TODO: NL80211_STA_INFO_BEACON_RX */</div><div class='add'>+</div><div class='add'>+	/* TODO: NL80211_STA_INFO_BEACON_SIGNAL_AVG */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_TRAFFIC_LOAD_MEDIUM_THRESH	10 /* percentage */</div><div class='add'>+#define IWL_MLD_TRAFFIC_LOAD_HIGH_THRESH	50 /* percentage */</div><div class='add'>+#define IWL_MLD_TRAFFIC_LOAD_MIN_WINDOW_USEC	(500 * 1000)</div><div class='add'>+</div><div class='add'>+static u8 iwl_mld_stats_load_percentage(u32 last_ts_usec, u32 curr_ts_usec,</div><div class='add'>+					u32 total_airtime_usec)</div><div class='add'>+{</div><div class='add'>+	u32 elapsed_usec = curr_ts_usec - last_ts_usec;</div><div class='add'>+</div><div class='add'>+	if (elapsed_usec &lt; IWL_MLD_TRAFFIC_LOAD_MIN_WINDOW_USEC)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return (100 * total_airtime_usec / elapsed_usec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_stats_recalc_traffic_load(struct iwl_mld *mld,</div><div class='add'>+					      u32 total_airtime_usec,</div><div class='add'>+					      u32 curr_ts_usec)</div><div class='add'>+{</div><div class='add'>+	u32 last_ts_usec = mld-&gt;scan.traffic_load.last_stats_ts_usec;</div><div class='add'>+	u8 load_prec;</div><div class='add'>+</div><div class='add'>+	/* Skip the calculation as this is the first notification received */</div><div class='add'>+	if (!last_ts_usec)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	load_prec = iwl_mld_stats_load_percentage(last_ts_usec, curr_ts_usec,</div><div class='add'>+						  total_airtime_usec);</div><div class='add'>+</div><div class='add'>+	if (load_prec &gt; IWL_MLD_TRAFFIC_LOAD_HIGH_THRESH)</div><div class='add'>+		mld-&gt;scan.traffic_load.status = IWL_MLD_TRAFFIC_HIGH;</div><div class='add'>+	else if (load_prec &gt; IWL_MLD_TRAFFIC_LOAD_MEDIUM_THRESH)</div><div class='add'>+		mld-&gt;scan.traffic_load.status = IWL_MLD_TRAFFIC_MEDIUM;</div><div class='add'>+	else</div><div class='add'>+		mld-&gt;scan.traffic_load.status = IWL_MLD_TRAFFIC_LOW;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mld-&gt;scan.traffic_load.last_stats_ts_usec = curr_ts_usec;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_update_link_sig(struct ieee80211_vif *vif, int sig,</div><div class='add'>+				    struct ieee80211_bss_conf *bss_conf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = iwl_mld_vif_from_mac80211(vif)-&gt;mld;</div><div class='add'>+	int exit_emlsr_thresh;</div><div class='add'>+</div><div class='add'>+	if (sig == 0) {</div><div class='add'>+		IWL_DEBUG_RX(mld, "RSSI is 0 - skip signal based decision\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TODO: task=statistics handle CQM notifications */</div><div class='add'>+</div><div class='add'>+	if (!iwl_mld_emlsr_active(vif)) {</div><div class='add'>+		/* We're not in EMLSR and our signal is bad,</div><div class='add'>+		 * try to switch link maybe. EMLSR will be handled below.</div><div class='add'>+		 */</div><div class='add'>+		if (sig &lt; IWL_MLD_LOW_RSSI_MLO_SCAN_THRESH)</div><div class='add'>+			iwl_mld_int_mlo_scan(mld, vif);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We are in EMLSR, check if we need to exit */</div><div class='add'>+	exit_emlsr_thresh =</div><div class='add'>+		iwl_mld_get_emlsr_rssi_thresh(mld, &amp;bss_conf-&gt;chanreq.oper,</div><div class='add'>+					      true);</div><div class='add'>+</div><div class='add'>+	if (sig &lt; exit_emlsr_thresh)</div><div class='add'>+		iwl_mld_exit_emlsr(mld, vif, IWL_MLD_EMLSR_EXIT_LOW_RSSI,</div><div class='add'>+				   iwl_mld_get_other_link(vif,</div><div class='add'>+							  bss_conf-&gt;link_id));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_process_per_link_stats(struct iwl_mld *mld,</div><div class='add'>+			       const struct iwl_stats_ntfy_per_link *per_link,</div><div class='add'>+			       u32 curr_ts_usec)</div><div class='add'>+{</div><div class='add'>+	u32 total_airtime_usec = 0;</div><div class='add'>+</div><div class='add'>+	for (u32 fw_id = 0;</div><div class='add'>+	     fw_id &lt; ARRAY_SIZE(mld-&gt;fw_id_to_bss_conf);</div><div class='add'>+	     fw_id++) {</div><div class='add'>+		const struct iwl_stats_ntfy_per_link *link_stats;</div><div class='add'>+		struct ieee80211_bss_conf *bss_conf;</div><div class='add'>+		int sig;</div><div class='add'>+</div><div class='add'>+		bss_conf = wiphy_dereference(mld-&gt;wiphy,</div><div class='add'>+					     mld-&gt;fw_id_to_bss_conf[fw_id]);</div><div class='add'>+		if (!bss_conf || bss_conf-&gt;vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		link_stats = &amp;per_link[fw_id];</div><div class='add'>+</div><div class='add'>+		total_airtime_usec += le32_to_cpu(link_stats-&gt;air_time);</div><div class='add'>+</div><div class='add'>+		sig = -le32_to_cpu(link_stats-&gt;beacon_filter_average_energy);</div><div class='add'>+		iwl_mld_update_link_sig(bss_conf-&gt;vif, sig, bss_conf);</div><div class='add'>+</div><div class='add'>+		/* TODO: parse more fields here (task=statistics)*/</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mld_stats_recalc_traffic_load(mld, total_airtime_usec,</div><div class='add'>+					  curr_ts_usec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_process_per_sta_stats(struct iwl_mld *mld,</div><div class='add'>+			      const struct iwl_stats_ntfy_per_sta *per_sta)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; mld-&gt;fw-&gt;ucode_capa.num_stations; i++) {</div><div class='add'>+		struct ieee80211_link_sta *link_sta =</div><div class='add'>+			wiphy_dereference(mld-&gt;wiphy,</div><div class='add'>+					  mld-&gt;fw_id_to_link_sta[i]);</div><div class='add'>+		struct iwl_mld_link_sta *mld_link_sta;</div><div class='add'>+		s8 avg_energy =</div><div class='add'>+			-(s8)le32_to_cpu(per_sta[i].average_energy);</div><div class='add'>+</div><div class='add'>+		if (IS_ERR_OR_NULL(link_sta) || !avg_energy)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mld_link_sta = iwl_mld_link_sta_from_mac80211(link_sta);</div><div class='add'>+		if (WARN_ON(!mld_link_sta))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mld_link_sta-&gt;signal_avg = avg_energy;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_fill_chanctx_stats(struct ieee80211_hw *hw,</div><div class='add'>+				       struct ieee80211_chanctx_conf *ctx,</div><div class='add'>+				       void *data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_phy *phy = iwl_mld_phy_from_mac80211(ctx);</div><div class='add'>+	const struct iwl_stats_ntfy_per_phy *per_phy = data;</div><div class='add'>+	u32 new_load, old_load;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(phy-&gt;fw_id &gt;= IWL_STATS_MAX_PHY_OPERATIONAL))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	phy-&gt;channel_load_by_us =</div><div class='add'>+		le32_to_cpu(per_phy[phy-&gt;fw_id].channel_load_by_us);</div><div class='add'>+</div><div class='add'>+	old_load = phy-&gt;avg_channel_load_not_by_us;</div><div class='add'>+	new_load = le32_to_cpu(per_phy[phy-&gt;fw_id].channel_load_not_by_us);</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(phy-&gt;mld,</div><div class='add'>+			 new_load != IWL_STATS_UNKNOWN_CHANNEL_LOAD &amp;&amp;</div><div class='add'>+				new_load &gt; 100,</div><div class='add'>+			 "Invalid channel load %u\n", new_load))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (new_load != IWL_STATS_UNKNOWN_CHANNEL_LOAD) {</div><div class='add'>+		/* update giving a weight of 0.5 for the old value */</div><div class='add'>+		phy-&gt;avg_channel_load_not_by_us = (new_load &gt;&gt; 1) +</div><div class='add'>+						  (old_load &gt;&gt; 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mld_emlsr_check_chan_load(hw, phy, old_load);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_process_per_phy_stats(struct iwl_mld *mld,</div><div class='add'>+			      const struct iwl_stats_ntfy_per_phy *per_phy)</div><div class='add'>+{</div><div class='add'>+	ieee80211_iter_chan_contexts_mtx(mld-&gt;hw,</div><div class='add'>+					 iwl_mld_fill_chanctx_stats,</div><div class='add'>+					 (void *)(uintptr_t)per_phy);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_stats_oper_notif(struct iwl_mld *mld,</div><div class='add'>+				     struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_system_statistics_notif_oper *stats =</div><div class='add'>+		(void *)&amp;pkt-&gt;data;</div><div class='add'>+	u32 curr_ts_usec = le32_to_cpu(stats-&gt;time_stamp);</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(stats-&gt;per_sta) != IWL_STATION_COUNT_MAX);</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(stats-&gt;per_link) &lt;</div><div class='add'>+		     ARRAY_SIZE(mld-&gt;fw_id_to_bss_conf));</div><div class='add'>+</div><div class='add'>+	iwl_mld_process_per_link_stats(mld, stats-&gt;per_link, curr_ts_usec);</div><div class='add'>+	iwl_mld_process_per_sta_stats(mld, stats-&gt;per_sta);</div><div class='add'>+	iwl_mld_process_per_phy_stats(mld, stats-&gt;per_phy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_stats_oper_part1_notif(struct iwl_mld *mld,</div><div class='add'>+					   struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	/* TODO */</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/stats.h b/drivers/net/wireless/intel/iwlwifi/mld/stats.h<br/>new file mode 100644<br/>index 000000000000..de434e66d555<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/stats.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/stats.h</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_stats_h__</div><div class='add'>+#define __iwl_mld_stats_h__</div><div class='add'>+</div><div class='add'>+int iwl_mld_request_periodic_fw_stats(struct iwl_mld *mld, bool enable);</div><div class='add'>+</div><div class='add'>+void iwl_mld_mac80211_sta_statistics(struct ieee80211_hw *hw,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     struct ieee80211_sta *sta,</div><div class='add'>+				     struct station_info *sinfo);</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_stats_oper_notif(struct iwl_mld *mld,</div><div class='add'>+				     struct iwl_rx_packet *pkt);</div><div class='add'>+void iwl_mld_handle_stats_oper_part1_notif(struct iwl_mld *mld,</div><div class='add'>+					   struct iwl_rx_packet *pkt);</div><div class='add'>+</div><div class='add'>+int iwl_mld_clear_stats_in_fw(struct iwl_mld *mld);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_stats_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/tests/Makefile b/drivers/net/wireless/intel/iwlwifi/mld/tests/Makefile<br/>new file mode 100644<br/>index 000000000000..36317feb923b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/tests/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/tests/Makefile</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+iwlmld-tests-y += module.o hcmd.o utils.o link.o rx.o agg.o link-selection.o</div><div class='add'>+</div><div class='add'>+ccflags-y += -I$(src)/../</div><div class='add'>+obj-$(CONFIG_IWLWIFI_KUNIT_TESTS) += iwlmld-tests.o</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/tests/agg.c b/drivers/net/wireless/intel/iwlwifi/mld/tests/agg.c<br/>new file mode 100644<br/>index 000000000000..29b0248cec3d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/tests/agg.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/tests/agg.c</a></div><div class='hunk'>@@ -0,0 +1,663 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * KUnit tests for channel helper functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;kunit/test.h&gt;</div><div class='add'>+#include &lt;kunit/static_stub.h&gt;</div><div class='add'>+#include &lt;kunit/skbuff.h&gt;</div><div class='add'>+</div><div class='add'>+#include "utils.h"</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "sta.h"</div><div class='add'>+#include "agg.h"</div><div class='add'>+#include "rx.h"</div><div class='add'>+</div><div class='add'>+#define FC_QOS_DATA (IEEE80211_FTYPE_DATA | IEEE80211_STYPE_QOS_DATA)</div><div class='add'>+#define BA_WINDOW_SIZE 64</div><div class='add'>+#define QUEUE 0</div><div class='add'>+</div><div class='add'>+static const struct reorder_buffer_case {</div><div class='add'>+	const char *desc;</div><div class='add'>+	struct {</div><div class='add'>+		/* ieee80211_hdr fields */</div><div class='add'>+		u16 fc;</div><div class='add'>+		u8 tid;</div><div class='add'>+		bool multicast;</div><div class='add'>+		/* iwl_rx_mpdu_desc fields */</div><div class='add'>+		u16 nssn;</div><div class='add'>+		/* used also for setting hdr::seq_ctrl */</div><div class='add'>+		u16 sn;</div><div class='add'>+		u8 baid;</div><div class='add'>+		bool amsdu;</div><div class='add'>+		bool last_subframe;</div><div class='add'>+		bool old_sn;</div><div class='add'>+		bool dup;</div><div class='add'>+	} rx_pkt;</div><div class='add'>+	struct {</div><div class='add'>+		bool valid;</div><div class='add'>+		u16 head_sn;</div><div class='add'>+		u8 baid;</div><div class='add'>+		u16 num_entries;</div><div class='add'>+		/* The test prepares the reorder buffer with fake skbs based</div><div class='add'>+		 * on the sequence numbers provided in @entries array.</div><div class='add'>+		 */</div><div class='add'>+		struct {</div><div class='add'>+			u16 sn;</div><div class='add'>+			/* Set add_subframes &gt; 0 to simulate an A-MSDU by</div><div class='add'>+			 * queueing additional @add_subframes skbs in the</div><div class='add'>+			 * appropriate reorder buffer entry (based on the @sn)</div><div class='add'>+			 */</div><div class='add'>+			u8 add_subframes;</div><div class='add'>+		} entries[BA_WINDOW_SIZE];</div><div class='add'>+	} reorder_buf_state;</div><div class='add'>+	struct {</div><div class='add'>+		enum iwl_mld_reorder_result reorder_res;</div><div class='add'>+		u16 head_sn;</div><div class='add'>+		u16 num_stored;</div><div class='add'>+		u16 skb_release_order[BA_WINDOW_SIZE];</div><div class='add'>+		u16 skb_release_order_count;</div><div class='add'>+	} expected;</div><div class='add'>+} reorder_buffer_cases[] = {</div><div class='add'>+	{</div><div class='add'>+		.desc = "RX packet with invalid BAID",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = FC_QOS_DATA,</div><div class='add'>+			.baid = IWL_RX_REORDER_DATA_INVALID_BAID,</div><div class='add'>+		},</div><div class='add'>+		.reorder_buf_state = {</div><div class='add'>+			.valid = true,</div><div class='add'>+		},</div><div class='add'>+		.expected = {</div><div class='add'>+			/* Invalid BAID should not be buffered. The frame is</div><div class='add'>+			 * passed to the network stack immediately.</div><div class='add'>+			 */</div><div class='add'>+			.reorder_res = IWL_MLD_PASS_SKB,</div><div class='add'>+			.num_stored = 0,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "RX Multicast packet",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = FC_QOS_DATA,</div><div class='add'>+			.multicast = true,</div><div class='add'>+		},</div><div class='add'>+		.reorder_buf_state = {</div><div class='add'>+			.valid = true,</div><div class='add'>+		},</div><div class='add'>+		.expected = {</div><div class='add'>+			/* Multicast packets are not buffered. The packet is</div><div class='add'>+			 * passed to the network stack immediately.</div><div class='add'>+			 */</div><div class='add'>+			.reorder_res = IWL_MLD_PASS_SKB,</div><div class='add'>+			.num_stored = 0,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "RX non-QoS data",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = IEEE80211_FTYPE_DATA,</div><div class='add'>+		},</div><div class='add'>+		.reorder_buf_state = {</div><div class='add'>+			.valid = true,</div><div class='add'>+		},</div><div class='add'>+		.expected = {</div><div class='add'>+			/* non-QoS data frames do not require reordering.</div><div class='add'>+			 * The packet is passed to the network stack</div><div class='add'>+			 * immediately.</div><div class='add'>+			 */</div><div class='add'>+		.reorder_res = IWL_MLD_PASS_SKB,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "RX old SN packet, reorder buffer is not yet valid",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = FC_QOS_DATA,</div><div class='add'>+			.old_sn = true,</div><div class='add'>+		},</div><div class='add'>+		.reorder_buf_state = {</div><div class='add'>+			.valid = false,</div><div class='add'>+		},</div><div class='add'>+		.expected = {</div><div class='add'>+			/* The buffer is invalid and the RX packet has an old</div><div class='add'>+			 * SN. The packet is passed to the network stack</div><div class='add'>+			 * immediately.</div><div class='add'>+			 */</div><div class='add'>+			.reorder_res = IWL_MLD_PASS_SKB,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "RX old SN packet, reorder buffer valid",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = FC_QOS_DATA,</div><div class='add'>+			.old_sn = true,</div><div class='add'>+		},</div><div class='add'>+		.reorder_buf_state = {</div><div class='add'>+			.valid = true,</div><div class='add'>+			.head_sn = 100,</div><div class='add'>+		},</div><div class='add'>+		.expected = {</div><div class='add'>+			/* The buffer is valid and the RX packet has an old SN.</div><div class='add'>+			 * The packet should be dropped.</div><div class='add'>+			 */</div><div class='add'>+			.reorder_res = IWL_MLD_DROP_SKB,</div><div class='add'>+			.num_stored = 0,</div><div class='add'>+			.head_sn = 100,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "RX duplicate packet",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = FC_QOS_DATA,</div><div class='add'>+			.dup = true,</div><div class='add'>+		},</div><div class='add'>+		.reorder_buf_state = {</div><div class='add'>+			.valid = true,</div><div class='add'>+			.head_sn = 100,</div><div class='add'>+		},</div><div class='add'>+		.expected = {</div><div class='add'>+			/* Duplicate packets should be dropped */</div><div class='add'>+			.reorder_res = IWL_MLD_DROP_SKB,</div><div class='add'>+			.num_stored = 0,</div><div class='add'>+			.head_sn = 100,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "RX In-order packet, sn &lt; nssn",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = FC_QOS_DATA,</div><div class='add'>+			.sn = 100,</div><div class='add'>+			.nssn = 101,</div><div class='add'>+		},</div><div class='add'>+		.reorder_buf_state = {</div><div class='add'>+			.valid = true,</div><div class='add'>+			.head_sn = 100,</div><div class='add'>+		},</div><div class='add'>+		.expected = {</div><div class='add'>+			/* 1. Reorder buffer is empty.</div><div class='add'>+			 * 2. RX packet SN is in order and less than NSSN.</div><div class='add'>+			 * Packet is released to the network stack immediately</div><div class='add'>+			 * and buffer-&gt;head_sn is updated to NSSN.</div><div class='add'>+			 */</div><div class='add'>+			.reorder_res = IWL_MLD_PASS_SKB,</div><div class='add'>+			.num_stored = 0,</div><div class='add'>+			.head_sn = 101,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "RX In-order packet, sn == head_sn",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = FC_QOS_DATA,</div><div class='add'>+			.sn = 101,</div><div class='add'>+			.nssn = 100,</div><div class='add'>+		},</div><div class='add'>+		.reorder_buf_state = {</div><div class='add'>+			.valid = true,</div><div class='add'>+			.head_sn = 101,</div><div class='add'>+		},</div><div class='add'>+		.expected = {</div><div class='add'>+			/* 1. Reorder buffer is empty.</div><div class='add'>+			 * 2. RX packet SN is equal to buffer-&gt;head_sn.</div><div class='add'>+			 * Packet is released to the network stack immediately</div><div class='add'>+			 * and buffer-&gt;head_sn is incremented.</div><div class='add'>+			 */</div><div class='add'>+			.reorder_res = IWL_MLD_PASS_SKB,</div><div class='add'>+			.num_stored = 0,</div><div class='add'>+			.head_sn = 102,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "RX In-order packet, IEEE80211_MAX_SN wrap around",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = FC_QOS_DATA,</div><div class='add'>+			.sn = IEEE80211_MAX_SN,</div><div class='add'>+			.nssn = IEEE80211_MAX_SN - 1,</div><div class='add'>+		},</div><div class='add'>+		.reorder_buf_state = {</div><div class='add'>+			.valid = true,</div><div class='add'>+			.head_sn = IEEE80211_MAX_SN,</div><div class='add'>+		},</div><div class='add'>+		.expected = {</div><div class='add'>+			/* 1. Reorder buffer is empty.</div><div class='add'>+			 * 2. RX SN == buffer-&gt;head_sn == IEEE80211_MAX_SN</div><div class='add'>+			 * Packet is released to the network stack immediately</div><div class='add'>+			 * and buffer-&gt;head_sn is incremented correctly (wraps</div><div class='add'>+			 * around to 0).</div><div class='add'>+			 */</div><div class='add'>+			.reorder_res = IWL_MLD_PASS_SKB,</div><div class='add'>+			.num_stored = 0,</div><div class='add'>+			.head_sn = 0,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "RX Out-of-order packet, pending packet in buffer",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = FC_QOS_DATA,</div><div class='add'>+			.sn = 100,</div><div class='add'>+			.nssn = 102,</div><div class='add'>+		},</div><div class='add'>+		.reorder_buf_state = {</div><div class='add'>+			.valid = true,</div><div class='add'>+			.head_sn = 100,</div><div class='add'>+			.num_entries = 1,</div><div class='add'>+			.entries[0].sn = 101,</div><div class='add'>+		},</div><div class='add'>+		.expected = {</div><div class='add'>+			/* 1. Reorder buffer contains one packet with SN=101.</div><div class='add'>+			 * 2. RX packet SN = buffer-&gt;head_sn.</div><div class='add'>+			 * Both packets are released (in order) to the network</div><div class='add'>+			 * stack as there are no gaps.</div><div class='add'>+			 */</div><div class='add'>+			.reorder_res = IWL_MLD_BUFFERED_SKB,</div><div class='add'>+			.num_stored = 0,</div><div class='add'>+			.head_sn = 102,</div><div class='add'>+			.skb_release_order = {100, 101},</div><div class='add'>+			.skb_release_order_count = 2,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "RX Out-of-order packet, pending packet in buffer (wrap around)",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = FC_QOS_DATA,</div><div class='add'>+			.sn = 0,</div><div class='add'>+			.nssn = 1,</div><div class='add'>+		},</div><div class='add'>+		.reorder_buf_state = {</div><div class='add'>+			.valid = true,</div><div class='add'>+			.head_sn = IEEE80211_MAX_SN - 1,</div><div class='add'>+			.num_entries = 1,</div><div class='add'>+			.entries[0].sn = IEEE80211_MAX_SN,</div><div class='add'>+		},</div><div class='add'>+		.expected = {</div><div class='add'>+			/* 1. Reorder buffer contains one packet with</div><div class='add'>+			 *    SN=IEEE80211_MAX_SN.</div><div class='add'>+			 * 2. RX Packet SN = 0 (after wrap around)</div><div class='add'>+			 * Both packets are released (in order) to the network</div><div class='add'>+			 * stack as there are no gaps.</div><div class='add'>+			 */</div><div class='add'>+			.reorder_res = IWL_MLD_BUFFERED_SKB,</div><div class='add'>+			.num_stored = 0,</div><div class='add'>+			.head_sn = 1,</div><div class='add'>+			.skb_release_order = { 4095, 0 },</div><div class='add'>+			.skb_release_order_count = 2,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "RX Out-of-order packet, filling 1/2 holes in buffer, release RX packet",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = FC_QOS_DATA,</div><div class='add'>+			.sn = 100,</div><div class='add'>+			.nssn = 101,</div><div class='add'>+		},</div><div class='add'>+		.reorder_buf_state = {</div><div class='add'>+			.valid = true,</div><div class='add'>+			.head_sn = 100,</div><div class='add'>+			.num_entries = 1,</div><div class='add'>+			.entries[0].sn = 102,</div><div class='add'>+		},</div><div class='add'>+		.expected = {</div><div class='add'>+			/* 1. Reorder buffer contains one packet with SN=102.</div><div class='add'>+			 * 2. There are 2 holes at SN={100, 101}.</div><div class='add'>+			 * Only the RX packet (SN=100) is released, there is</div><div class='add'>+			 * still a hole at 101.</div><div class='add'>+			 */</div><div class='add'>+			.reorder_res = IWL_MLD_BUFFERED_SKB,</div><div class='add'>+			.num_stored = 1,</div><div class='add'>+			.head_sn = 101,</div><div class='add'>+			.skb_release_order = {100},</div><div class='add'>+			.skb_release_order_count = 1,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "RX Out-of-order packet, filling 1/2 holes, release 2 packets",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = FC_QOS_DATA,</div><div class='add'>+			.sn = 102,</div><div class='add'>+			.nssn = 103,</div><div class='add'>+		},</div><div class='add'>+		.reorder_buf_state = {</div><div class='add'>+			.valid = true,</div><div class='add'>+			.head_sn = 100,</div><div class='add'>+			.num_entries = 3,</div><div class='add'>+			.entries[0].sn = 101,</div><div class='add'>+			.entries[1].sn = 104,</div><div class='add'>+			.entries[2].sn = 105,</div><div class='add'>+		},</div><div class='add'>+		.expected = {</div><div class='add'>+			/* 1. Reorder buffer contains three packets.</div><div class='add'>+			 * 2. RX packet fills one of two holes (at SN=102).</div><div class='add'>+			 * Two packets are released (until the next hole at</div><div class='add'>+			 * SN=103).</div><div class='add'>+			 */</div><div class='add'>+			.reorder_res = IWL_MLD_BUFFERED_SKB,</div><div class='add'>+			.num_stored = 2,</div><div class='add'>+			.head_sn = 103,</div><div class='add'>+			.skb_release_order = {101, 102},</div><div class='add'>+			.skb_release_order_count = 2,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+		{</div><div class='add'>+		.desc = "RX Out-of-order packet, filling 1/1 holes, no packets released",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = FC_QOS_DATA,</div><div class='add'>+			.sn = 102,</div><div class='add'>+			.nssn = 100,</div><div class='add'>+		},</div><div class='add'>+		.reorder_buf_state = {</div><div class='add'>+			.valid = true,</div><div class='add'>+			.head_sn = 100,</div><div class='add'>+			.num_entries = 3,</div><div class='add'>+			.entries[0].sn = 101,</div><div class='add'>+			.entries[1].sn = 103,</div><div class='add'>+			.entries[2].sn = 104,</div><div class='add'>+		},</div><div class='add'>+		.expected = {</div><div class='add'>+			/* 1. Reorder buffer contains three packets:</div><div class='add'>+			 *    SN={101, 103, 104}.</div><div class='add'>+			 * 2. RX packet fills a hole (SN=102), but NSSN is</div><div class='add'>+			 *    smaller than buffered frames.</div><div class='add'>+			 * No packets can be released yet and buffer-&gt;head_sn</div><div class='add'>+			 * is not updated.</div><div class='add'>+			 */</div><div class='add'>+			.reorder_res = IWL_MLD_BUFFERED_SKB,</div><div class='add'>+			.num_stored = 4,</div><div class='add'>+			.head_sn = 100,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "RX In-order A-MSDU, last subframe",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = FC_QOS_DATA,</div><div class='add'>+			.sn = 100,</div><div class='add'>+			.nssn = 101,</div><div class='add'>+			.amsdu = true,</div><div class='add'>+			.last_subframe = true,</div><div class='add'>+		},</div><div class='add'>+		.reorder_buf_state = {</div><div class='add'>+			.valid = true,</div><div class='add'>+			.head_sn = 100,</div><div class='add'>+			.num_entries = 1,</div><div class='add'>+			.entries[0] = {</div><div class='add'>+				.sn = 100,</div><div class='add'>+				.add_subframes = 1,</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.expected = {</div><div class='add'>+			/* 1. Reorder buffer contains a 2-sub frames A-MSDU</div><div class='add'>+			 *    at SN=100.</div><div class='add'>+			 * 2. RX packet is the last SN=100 A-MSDU subframe</div><div class='add'>+			 * All packets are released in order (3 x SN=100).</div><div class='add'>+			 */</div><div class='add'>+			.reorder_res = IWL_MLD_BUFFERED_SKB,</div><div class='add'>+			.num_stored = 0,</div><div class='add'>+			.head_sn = 101,</div><div class='add'>+			.skb_release_order = {100, 100, 100},</div><div class='add'>+			.skb_release_order_count = 3,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "RX In-order A-MSDU, not the last subframe",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = FC_QOS_DATA,</div><div class='add'>+			.sn = 100,</div><div class='add'>+			.nssn = 101,</div><div class='add'>+			.amsdu = true,</div><div class='add'>+			.last_subframe = false,</div><div class='add'>+		},</div><div class='add'>+		.reorder_buf_state = {</div><div class='add'>+			.valid = true,</div><div class='add'>+			.head_sn = 100,</div><div class='add'>+			.num_entries = 1,</div><div class='add'>+			.entries[0] = {</div><div class='add'>+				.sn = 100,</div><div class='add'>+				.add_subframes = 1,</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.expected = {</div><div class='add'>+			/* 1. Reorder buffer contains a 2-sub frames A-MSDU</div><div class='add'>+			 *    at SN=100.</div><div class='add'>+			 * 2. RX packet additional SN=100 A-MSDU subframe,</div><div class='add'>+			 *    but not the last one</div><div class='add'>+			 * No packets are released and head_sn is not updated.</div><div class='add'>+			 */</div><div class='add'>+			.reorder_res = IWL_MLD_BUFFERED_SKB,</div><div class='add'>+			.num_stored = 3,</div><div class='add'>+			.head_sn = 100,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+KUNIT_ARRAY_PARAM_DESC(test_reorder_buffer, reorder_buffer_cases, desc);</div><div class='add'>+</div><div class='add'>+static struct sk_buff_head g_released_skbs;</div><div class='add'>+static u16 g_num_released_skbs;</div><div class='add'>+</div><div class='add'>+/* Add released skbs from reorder buffer to a global list; This allows us</div><div class='add'>+ * to verify the correct release order of packets after they pass through the</div><div class='add'>+ * simulated reorder logic.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+fake_iwl_mld_pass_packet_to_mac80211(struct iwl_mld *mld,</div><div class='add'>+				     struct napi_struct *napi,</div><div class='add'>+				     struct sk_buff *skb, int queue,</div><div class='add'>+				     struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	__skb_queue_tail(&amp;g_released_skbs, skb);</div><div class='add'>+	g_num_released_skbs++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+fake_iwl_mld_fw_sta_id_mask(struct iwl_mld *mld, struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+	struct iwl_mld_link_sta *mld_link_sta;</div><div class='add'>+	u8 link_id;</div><div class='add'>+	u32 sta_mask = 0;</div><div class='add'>+</div><div class='add'>+	/* This is the expectation in the real function */</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* We can't use for_each_sta_active_link */</div><div class='add'>+	for_each_mld_link_sta(mld_sta, mld_link_sta, link_id)</div><div class='add'>+		sta_mask |= BIT(mld_link_sta-&gt;fw_id);</div><div class='add'>+	return sta_mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct iwl_rx_mpdu_desc *setup_mpdu_desc(void)</div><div class='add'>+{</div><div class='add'>+	struct kunit *test = kunit_get_current_test();</div><div class='add'>+	const struct reorder_buffer_case *param =</div><div class='add'>+		(const void *)(test-&gt;param_value);</div><div class='add'>+	struct iwl_rx_mpdu_desc *mpdu_desc;</div><div class='add'>+</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT(test, mpdu_desc);</div><div class='add'>+</div><div class='add'>+	mpdu_desc-&gt;reorder_data |=</div><div class='add'>+		le32_encode_bits(param-&gt;rx_pkt.baid,</div><div class='add'>+				 IWL_RX_MPDU_REORDER_BAID_MASK);</div><div class='add'>+	mpdu_desc-&gt;reorder_data |=</div><div class='add'>+		le32_encode_bits(param-&gt;rx_pkt.sn,</div><div class='add'>+				 IWL_RX_MPDU_REORDER_SN_MASK);</div><div class='add'>+	mpdu_desc-&gt;reorder_data |=</div><div class='add'>+		le32_encode_bits(param-&gt;rx_pkt.nssn,</div><div class='add'>+				 IWL_RX_MPDU_REORDER_NSSN_MASK);</div><div class='add'>+	if (param-&gt;rx_pkt.old_sn)</div><div class='add'>+		mpdu_desc-&gt;reorder_data |=</div><div class='add'>+			cpu_to_le32(IWL_RX_MPDU_REORDER_BA_OLD_SN);</div><div class='add'>+</div><div class='add'>+	if (param-&gt;rx_pkt.dup)</div><div class='add'>+		mpdu_desc-&gt;status |= cpu_to_le32(IWL_RX_MPDU_STATUS_DUPLICATE);</div><div class='add'>+</div><div class='add'>+	if (param-&gt;rx_pkt.amsdu) {</div><div class='add'>+		mpdu_desc-&gt;mac_flags2 |= IWL_RX_MPDU_MFLG2_AMSDU;</div><div class='add'>+		if (param-&gt;rx_pkt.last_subframe)</div><div class='add'>+			mpdu_desc-&gt;amsdu_info |=</div><div class='add'>+				IWL_RX_MPDU_AMSDU_LAST_SUBFRAME;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mpdu_desc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *alloc_and_setup_skb(u16 fc, u16 seq_ctrl, u8 tid,</div><div class='add'>+					   bool mcast)</div><div class='add'>+{</div><div class='add'>+	struct kunit *test = kunit_get_current_test();</div><div class='add'>+	struct ieee80211_hdr hdr = {</div><div class='add'>+		.frame_control = cpu_to_le16(fc),</div><div class='add'>+		.seq_ctrl = cpu_to_le16(seq_ctrl),</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = kunit_zalloc_skb(test, 128, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, skb);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_data_qos(hdr.frame_control)) {</div><div class='add'>+		u8 *qc = ieee80211_get_qos_ctl(&amp;hdr);</div><div class='add'>+</div><div class='add'>+		qc[0] = tid &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mcast)</div><div class='add'>+		hdr.addr1[0] = 0x1;</div><div class='add'>+</div><div class='add'>+	skb_set_mac_header(skb, skb-&gt;len);</div><div class='add'>+	skb_put_data(skb, &amp;hdr, ieee80211_hdrlen(hdr.frame_control));</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct iwl_mld_reorder_buffer *</div><div class='add'>+setup_reorder_buffer(struct iwl_mld_baid_data *baid_data)</div><div class='add'>+{</div><div class='add'>+	struct kunit *test = kunit_get_current_test();</div><div class='add'>+	const struct reorder_buffer_case *param =</div><div class='add'>+		(const void *)(test-&gt;param_value);</div><div class='add'>+	struct iwl_mld_reorder_buffer *buffer = baid_data-&gt;reorder_buf;</div><div class='add'>+	struct iwl_mld_reorder_buf_entry *entries = baid_data-&gt;entries;</div><div class='add'>+	struct sk_buff *fake_skb;</div><div class='add'>+</div><div class='add'>+	buffer-&gt;valid = param-&gt;reorder_buf_state.valid;</div><div class='add'>+	buffer-&gt;head_sn = param-&gt;reorder_buf_state.head_sn;</div><div class='add'>+	buffer-&gt;queue = QUEUE;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; baid_data-&gt;buf_size; i++)</div><div class='add'>+		__skb_queue_head_init(&amp;entries[i].frames);</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; param-&gt;reorder_buf_state.num_entries; i++) {</div><div class='add'>+		u16 sn = param-&gt;reorder_buf_state.entries[i].sn;</div><div class='add'>+		int index = sn % baid_data-&gt;buf_size;</div><div class='add'>+		u8 add_subframes =</div><div class='add'>+			param-&gt;reorder_buf_state.entries[i].add_subframes;</div><div class='add'>+		/* create 1 skb per entry + additional skbs per num of</div><div class='add'>+		 * requested subframes</div><div class='add'>+		 */</div><div class='add'>+		u8 num_skbs = 1 + add_subframes;</div><div class='add'>+</div><div class='add'>+		for (int j = 0; j &lt; num_skbs; j++) {</div><div class='add'>+			fake_skb = alloc_and_setup_skb(FC_QOS_DATA, sn, 0,</div><div class='add'>+						       false);</div><div class='add'>+			__skb_queue_tail(&amp;entries[index].frames, fake_skb);</div><div class='add'>+			buffer-&gt;num_stored++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return buffer;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct iwl_mld_reorder_buffer *setup_ba_data(struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct kunit *test = kunit_get_current_test();</div><div class='add'>+	struct iwl_mld *mld = test-&gt;priv;</div><div class='add'>+	const struct reorder_buffer_case *param =</div><div class='add'>+		(const void *)(test-&gt;param_value);</div><div class='add'>+	struct iwl_mld_baid_data *baid_data = NULL;</div><div class='add'>+	struct iwl_mld_reorder_buffer *buffer;</div><div class='add'>+	u32 reorder_buf_size = BA_WINDOW_SIZE * sizeof(baid_data-&gt;entries[0]);</div><div class='add'>+	u8 baid = param-&gt;reorder_buf_state.baid;</div><div class='add'>+</div><div class='add'>+	/* Assuming only 1 RXQ */</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT_SIZE(test, baid_data,</div><div class='add'>+				    sizeof(*baid_data) + reorder_buf_size);</div><div class='add'>+</div><div class='add'>+	baid_data-&gt;baid = baid;</div><div class='add'>+	baid_data-&gt;tid = param-&gt;rx_pkt.tid;</div><div class='add'>+	baid_data-&gt;buf_size = BA_WINDOW_SIZE;</div><div class='add'>+</div><div class='add'>+	wiphy_lock(mld-&gt;wiphy);</div><div class='add'>+	baid_data-&gt;sta_mask = iwl_mld_fw_sta_id_mask(mld, sta);</div><div class='add'>+	wiphy_unlock(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	baid_data-&gt;entries_per_queue = BA_WINDOW_SIZE;</div><div class='add'>+</div><div class='add'>+	buffer = setup_reorder_buffer(baid_data);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_NULL(test, rcu_access_pointer(mld-&gt;fw_id_to_ba[baid]));</div><div class='add'>+	rcu_assign_pointer(mld-&gt;fw_id_to_ba[baid], baid_data);</div><div class='add'>+</div><div class='add'>+	return buffer;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_reorder_buffer(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = test-&gt;priv;</div><div class='add'>+	const struct reorder_buffer_case *param =</div><div class='add'>+		(const void *)(test-&gt;param_value);</div><div class='add'>+	struct iwl_rx_mpdu_desc *mpdu_desc;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct iwl_mld_reorder_buffer *buffer;</div><div class='add'>+	enum iwl_mld_reorder_result reorder_res;</div><div class='add'>+	u16 skb_release_order_count = param-&gt;expected.skb_release_order_count;</div><div class='add'>+	u16 skb_idx = 0;</div><div class='add'>+</div><div class='add'>+	/* Init globals and activate stubs */</div><div class='add'>+	__skb_queue_head_init(&amp;g_released_skbs);</div><div class='add'>+	g_num_released_skbs = 0;</div><div class='add'>+	kunit_activate_static_stub(test, iwl_mld_fw_sta_id_mask,</div><div class='add'>+				   fake_iwl_mld_fw_sta_id_mask);</div><div class='add'>+	kunit_activate_static_stub(test, iwl_mld_pass_packet_to_mac80211,</div><div class='add'>+				   fake_iwl_mld_pass_packet_to_mac80211);</div><div class='add'>+</div><div class='add'>+	vif = iwlmld_kunit_add_vif(false, NL80211_IFTYPE_STATION);</div><div class='add'>+	sta = iwlmld_kunit_setup_sta(vif, IEEE80211_STA_AUTHORIZED, -1);</div><div class='add'>+</div><div class='add'>+	/* Prepare skb, mpdu_desc, BA data and the reorder buffer */</div><div class='add'>+	skb = alloc_and_setup_skb(param-&gt;rx_pkt.fc, param-&gt;rx_pkt.sn,</div><div class='add'>+				  param-&gt;rx_pkt.tid, param-&gt;rx_pkt.multicast);</div><div class='add'>+	buffer = setup_ba_data(sta);</div><div class='add'>+	mpdu_desc = setup_mpdu_desc();</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	reorder_res = iwl_mld_reorder(mld, NULL, QUEUE, sta, skb, mpdu_desc);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	KUNIT_ASSERT_EQ(test, reorder_res, param-&gt;expected.reorder_res);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, buffer-&gt;num_stored, param-&gt;expected.num_stored);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, buffer-&gt;head_sn, param-&gt;expected.head_sn);</div><div class='add'>+</div><div class='add'>+	/* Verify skbs release order */</div><div class='add'>+	KUNIT_ASSERT_EQ(test, skb_release_order_count, g_num_released_skbs);</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;g_released_skbs))) {</div><div class='add'>+		struct ieee80211_hdr *hdr = (void *)skb_mac_header(skb);</div><div class='add'>+</div><div class='add'>+		KUNIT_ASSERT_EQ(test, le16_to_cpu(hdr-&gt;seq_ctrl),</div><div class='add'>+				param-&gt;expected.skb_release_order[skb_idx]);</div><div class='add'>+		skb_idx++;</div><div class='add'>+	}</div><div class='add'>+	KUNIT_ASSERT_EQ(test, skb_idx, skb_release_order_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kunit_case reorder_buffer_test_cases[] = {</div><div class='add'>+	KUNIT_CASE_PARAM(test_reorder_buffer, test_reorder_buffer_gen_params),</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kunit_suite reorder_buffer = {</div><div class='add'>+	.name = "iwlmld-reorder-buffer",</div><div class='add'>+	.test_cases = reorder_buffer_test_cases,</div><div class='add'>+	.init = iwlmld_kunit_test_init,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+kunit_test_suite(reorder_buffer);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/tests/hcmd.c b/drivers/net/wireless/intel/iwlwifi/mld/tests/hcmd.c<br/>new file mode 100644<br/>index 000000000000..0e3b9417dd63<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/tests/hcmd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/tests/hcmd.c</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * KUnit tests for channel helper functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;kunit/test.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;iwl-trans.h&gt;</div><div class='add'>+#include "mld.h"</div><div class='add'>+</div><div class='add'>+MODULE_IMPORT_NS("EXPORTED_FOR_KUNIT_TESTING");</div><div class='add'>+</div><div class='add'>+static void test_hcmd_names_sorted(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; global_iwl_mld_goups_size; i++) {</div><div class='add'>+		const struct iwl_hcmd_arr *arr = &amp;iwl_mld_groups[i];</div><div class='add'>+		int j;</div><div class='add'>+</div><div class='add'>+		if (!arr-&gt;arr)</div><div class='add'>+			continue;</div><div class='add'>+		for (j = 0; j &lt; arr-&gt;size - 1; j++)</div><div class='add'>+			KUNIT_EXPECT_LE(test, arr-&gt;arr[j].cmd_id,</div><div class='add'>+					arr-&gt;arr[j + 1].cmd_id);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_hcmd_names_for_rx(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	static struct iwl_trans t = {</div><div class='add'>+		.conf.command_groups = iwl_mld_groups,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	t.conf.command_groups_size = global_iwl_mld_goups_size;</div><div class='add'>+</div><div class='add'>+	for (unsigned int i = 0; i &lt; iwl_mld_rx_handlers_num; i++) {</div><div class='add'>+		const struct iwl_rx_handler *rxh;</div><div class='add'>+		const char *name;</div><div class='add'>+</div><div class='add'>+		rxh = &amp;iwl_mld_rx_handlers[i];</div><div class='add'>+</div><div class='add'>+		name = iwl_get_cmd_string(&amp;t, rxh-&gt;cmd_id);</div><div class='add'>+		KUNIT_EXPECT_NOT_NULL(test, name);</div><div class='add'>+		KUNIT_EXPECT_NE_MSG(test, strcmp(name, "UNKNOWN"), 0,</div><div class='add'>+				    "ID 0x%04x is UNKNOWN", rxh-&gt;cmd_id);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kunit_case hcmd_names_cases[] = {</div><div class='add'>+	KUNIT_CASE(test_hcmd_names_sorted),</div><div class='add'>+	KUNIT_CASE(test_hcmd_names_for_rx),</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kunit_suite hcmd_names = {</div><div class='add'>+	.name = "iwlmld-hcmd-names",</div><div class='add'>+	.test_cases = hcmd_names_cases,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+kunit_test_suite(hcmd_names);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/tests/link-selection.c b/drivers/net/wireless/intel/iwlwifi/mld/tests/link-selection.c<br/>new file mode 100644<br/>index 000000000000..766c24db3613<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/tests/link-selection.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/tests/link-selection.c</a></div><div class='hunk'>@@ -0,0 +1,339 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * KUnit tests for link selection functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;kunit/static_stub.h&gt;</div><div class='add'>+</div><div class='add'>+#include "utils.h"</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "link.h"</div><div class='add'>+#include "iface.h"</div><div class='add'>+#include "phy.h"</div><div class='add'>+#include "mlo.h"</div><div class='add'>+</div><div class='add'>+static const struct link_grading_test_case {</div><div class='add'>+	const char *desc;</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 link_id;</div><div class='add'>+			const struct cfg80211_chan_def *chandef;</div><div class='add'>+			bool active;</div><div class='add'>+			s32 signal;</div><div class='add'>+			bool has_chan_util_elem;</div><div class='add'>+			u8 chan_util; /* 0-255 , used only if has_chan_util_elem is true */</div><div class='add'>+			u8 chan_load_by_us; /* 0-100, used only if active is true */;</div><div class='add'>+		} link;</div><div class='add'>+	} input;</div><div class='add'>+	unsigned int expected_grade;</div><div class='add'>+} link_grading_cases[] = {</div><div class='add'>+	{</div><div class='add'>+		.desc = "channel util of 128 (50%)",</div><div class='add'>+		.input.link = {</div><div class='add'>+			.link_id = 0,</div><div class='add'>+			.chandef = &amp;chandef_2ghz_20mhz,</div><div class='add'>+			.active = false,</div><div class='add'>+			.has_chan_util_elem = true,</div><div class='add'>+			.chan_util = 128,</div><div class='add'>+		},</div><div class='add'>+		.expected_grade = 86,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "channel util of 180 (70%)",</div><div class='add'>+		.input.link = {</div><div class='add'>+			.link_id = 0,</div><div class='add'>+			.chandef = &amp;chandef_2ghz_20mhz,</div><div class='add'>+			.active = false,</div><div class='add'>+			.has_chan_util_elem = true,</div><div class='add'>+			.chan_util = 180,</div><div class='add'>+		},</div><div class='add'>+		.expected_grade = 51,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "channel util of 180 (70%), channel load by us of 10%",</div><div class='add'>+		.input.link = {</div><div class='add'>+			.link_id = 0,</div><div class='add'>+			.chandef = &amp;chandef_2ghz_20mhz,</div><div class='add'>+			.has_chan_util_elem = true,</div><div class='add'>+			.chan_util = 180,</div><div class='add'>+			.active = true,</div><div class='add'>+			.chan_load_by_us = 10,</div><div class='add'>+		},</div><div class='add'>+		.expected_grade = 67,</div><div class='add'>+	},</div><div class='add'>+		{</div><div class='add'>+		.desc = "no channel util element",</div><div class='add'>+		.input.link = {</div><div class='add'>+			.link_id = 0,</div><div class='add'>+			.chandef = &amp;chandef_2ghz_20mhz,</div><div class='add'>+			.active = true,</div><div class='add'>+		},</div><div class='add'>+		.expected_grade = 120,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+KUNIT_ARRAY_PARAM_DESC(link_grading, link_grading_cases, desc);</div><div class='add'>+</div><div class='add'>+static void setup_link(struct ieee80211_bss_conf *link)</div><div class='add'>+{</div><div class='add'>+	struct kunit *test = kunit_get_current_test();</div><div class='add'>+	struct iwl_mld *mld = test-&gt;priv;</div><div class='add'>+	const struct link_grading_test_case *test_param =</div><div class='add'>+		(const void *)(test-&gt;param_value);</div><div class='add'>+</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT(test, link-&gt;bss);</div><div class='add'>+</div><div class='add'>+	link-&gt;bss-&gt;signal = DBM_TO_MBM(test_param-&gt;input.link.signal);</div><div class='add'>+</div><div class='add'>+	link-&gt;chanreq.oper = *test_param-&gt;input.link.chandef;</div><div class='add'>+</div><div class='add'>+	if (test_param-&gt;input.link.has_chan_util_elem) {</div><div class='add'>+		struct cfg80211_bss_ies *ies;</div><div class='add'>+		struct ieee80211_bss_load_elem bss_load = {</div><div class='add'>+			.channel_util = test_param-&gt;input.link.chan_util,</div><div class='add'>+		};</div><div class='add'>+		struct element *elem =</div><div class='add'>+			iwlmld_kunit_gen_element(WLAN_EID_QBSS_LOAD,</div><div class='add'>+						 &amp;bss_load,</div><div class='add'>+						 sizeof(bss_load));</div><div class='add'>+		unsigned int elem_len = sizeof(*elem) + sizeof(bss_load);</div><div class='add'>+</div><div class='add'>+		KUNIT_ALLOC_AND_ASSERT_SIZE(test, ies, sizeof(*ies) + elem_len);</div><div class='add'>+		memcpy(ies-&gt;data, elem, elem_len);</div><div class='add'>+		ies-&gt;len = elem_len;</div><div class='add'>+		rcu_assign_pointer(link-&gt;bss-&gt;beacon_ies, ies);</div><div class='add'>+		rcu_assign_pointer(link-&gt;bss-&gt;ies, ies);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_param-&gt;input.link.active) {</div><div class='add'>+		struct ieee80211_chanctx_conf *chan_ctx =</div><div class='add'>+			wiphy_dereference(mld-&gt;wiphy, link-&gt;chanctx_conf);</div><div class='add'>+		struct iwl_mld_phy *phy;</div><div class='add'>+</div><div class='add'>+		KUNIT_ASSERT_NOT_NULL(test, chan_ctx);</div><div class='add'>+</div><div class='add'>+		phy = iwl_mld_phy_from_mac80211(chan_ctx);</div><div class='add'>+</div><div class='add'>+		phy-&gt;channel_load_by_us = test_param-&gt;input.link.chan_load_by_us;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_link_grading(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = test-&gt;priv;</div><div class='add'>+	const struct link_grading_test_case *test_param =</div><div class='add'>+		(const void *)(test-&gt;param_value);</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct ieee80211_bss_conf *link;</div><div class='add'>+	unsigned int actual_grade;</div><div class='add'>+	/* Extract test case parameters */</div><div class='add'>+	u8 link_id = test_param-&gt;input.link.link_id;</div><div class='add'>+	bool active = test_param-&gt;input.link.active;</div><div class='add'>+	u16 valid_links;</div><div class='add'>+	struct iwl_mld_kunit_link assoc_link = {</div><div class='add'>+		.chandef = test_param-&gt;input.link.chandef,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* If the link is not active, use a different link as the assoc link */</div><div class='add'>+	if (active) {</div><div class='add'>+		assoc_link.id = link_id;</div><div class='add'>+		valid_links = BIT(link_id);</div><div class='add'>+	} else {</div><div class='add'>+		assoc_link.id = BIT(ffz(BIT(link_id)));</div><div class='add'>+		valid_links = BIT(assoc_link.id) | BIT(link_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vif = iwlmld_kunit_setup_mlo_assoc(valid_links, &amp;assoc_link);</div><div class='add'>+</div><div class='add'>+	wiphy_lock(mld-&gt;wiphy);</div><div class='add'>+	link = wiphy_dereference(mld-&gt;wiphy, vif-&gt;link_conf[link_id]);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, link);</div><div class='add'>+</div><div class='add'>+	setup_link(link);</div><div class='add'>+</div><div class='add'>+	actual_grade = iwl_mld_get_link_grade(mld, link);</div><div class='add'>+	wiphy_unlock(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* Assert that the returned grade matches the expected grade */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, actual_grade, test_param-&gt;expected_grade);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kunit_case link_selection_cases[] = {</div><div class='add'>+	KUNIT_CASE_PARAM(test_link_grading, link_grading_gen_params),</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kunit_suite link_selection = {</div><div class='add'>+	.name = "iwlmld-link-selection-tests",</div><div class='add'>+	.test_cases = link_selection_cases,</div><div class='add'>+	.init = iwlmld_kunit_test_init,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+kunit_test_suite(link_selection);</div><div class='add'>+</div><div class='add'>+static const struct link_pair_case {</div><div class='add'>+	const char *desc;</div><div class='add'>+	const struct cfg80211_chan_def *chandef_a, *chandef_b;</div><div class='add'>+	bool low_latency_vif;</div><div class='add'>+	u32 chan_load_not_by_us;</div><div class='add'>+	bool primary_link_active;</div><div class='add'>+	u32 expected_result;</div><div class='add'>+} link_pair_cases[] = {</div><div class='add'>+	{</div><div class='add'>+		.desc = "Unequal bandwidth, primary link inactive, EMLSR not allowed",</div><div class='add'>+		.low_latency_vif = false,</div><div class='add'>+		.primary_link_active = false,</div><div class='add'>+		.chandef_a = &amp;chandef_5ghz_40mhz,</div><div class='add'>+		.chandef_b = &amp;chandef_6ghz_20mhz,</div><div class='add'>+		.expected_result = IWL_MLD_EMLSR_EXIT_CHAN_LOAD,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "Equal bandwidths, sufficient channel load, EMLSR allowed",</div><div class='add'>+		.low_latency_vif = false,</div><div class='add'>+		.primary_link_active = true,</div><div class='add'>+		.chan_load_not_by_us = 11,</div><div class='add'>+		.chandef_a = &amp;chandef_5ghz_40mhz,</div><div class='add'>+		.chandef_b = &amp;chandef_6ghz_40mhz,</div><div class='add'>+		.expected_result = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "Equal bandwidths, insufficient channel load, EMLSR not allowed",</div><div class='add'>+		.low_latency_vif = false,</div><div class='add'>+		.primary_link_active = true,</div><div class='add'>+		.chan_load_not_by_us = 6,</div><div class='add'>+		.chandef_a = &amp;chandef_5ghz_80mhz,</div><div class='add'>+		.chandef_b = &amp;chandef_6ghz_80mhz,</div><div class='add'>+		.expected_result = IWL_MLD_EMLSR_EXIT_CHAN_LOAD,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "Low latency VIF, sufficient channel load, EMLSR allowed",</div><div class='add'>+		.low_latency_vif = true,</div><div class='add'>+		.primary_link_active = true,</div><div class='add'>+		.chan_load_not_by_us = 6,</div><div class='add'>+		.chandef_a = &amp;chandef_5ghz_160mhz,</div><div class='add'>+		.chandef_b = &amp;chandef_6ghz_160mhz,</div><div class='add'>+		.expected_result = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "Different bandwidths (2x ratio), primary link load permits EMLSR",</div><div class='add'>+		.low_latency_vif = false,</div><div class='add'>+		.primary_link_active = true,</div><div class='add'>+		.chan_load_not_by_us = 30,</div><div class='add'>+		.chandef_a = &amp;chandef_5ghz_40mhz,</div><div class='add'>+		.chandef_b = &amp;chandef_6ghz_20mhz,</div><div class='add'>+		.expected_result = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "Different bandwidths (4x ratio), primary link load permits EMLSR",</div><div class='add'>+		.low_latency_vif = false,</div><div class='add'>+		.primary_link_active = true,</div><div class='add'>+		.chan_load_not_by_us = 45,</div><div class='add'>+		.chandef_a = &amp;chandef_5ghz_80mhz,</div><div class='add'>+		.chandef_b = &amp;chandef_6ghz_20mhz,</div><div class='add'>+		.expected_result = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "Different bandwidths (16x ratio), primary link load insufficient",</div><div class='add'>+		.low_latency_vif = false,</div><div class='add'>+		.primary_link_active = true,</div><div class='add'>+		.chan_load_not_by_us = 45,</div><div class='add'>+		.chandef_a = &amp;chandef_6ghz_320mhz,</div><div class='add'>+		.chandef_b = &amp;chandef_5ghz_20mhz,</div><div class='add'>+		.expected_result = IWL_MLD_EMLSR_EXIT_CHAN_LOAD,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "Same band not allowed (2.4 GHz)",</div><div class='add'>+		.low_latency_vif = false,</div><div class='add'>+		.primary_link_active = true,</div><div class='add'>+		.chan_load_not_by_us = 30,</div><div class='add'>+		.chandef_a = &amp;chandef_2ghz_20mhz,</div><div class='add'>+		.chandef_b = &amp;chandef_2ghz_11_20mhz,</div><div class='add'>+		.expected_result = IWL_MLD_EMLSR_EXIT_EQUAL_BAND,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "Same band not allowed (5 GHz)",</div><div class='add'>+		.low_latency_vif = false,</div><div class='add'>+		.primary_link_active = true,</div><div class='add'>+		.chan_load_not_by_us = 30,</div><div class='add'>+		.chandef_a = &amp;chandef_5ghz_40mhz,</div><div class='add'>+		.chandef_b = &amp;chandef_5ghz_40mhz,</div><div class='add'>+		.expected_result = IWL_MLD_EMLSR_EXIT_EQUAL_BAND,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "Same band allowed (5 GHz separated)",</div><div class='add'>+		.low_latency_vif = false,</div><div class='add'>+		.primary_link_active = true,</div><div class='add'>+		.chan_load_not_by_us = 30,</div><div class='add'>+		.chandef_a = &amp;chandef_5ghz_40mhz,</div><div class='add'>+		.chandef_b = &amp;chandef_5ghz_120_40mhz,</div><div class='add'>+		.expected_result = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "Same band not allowed (6 GHz)",</div><div class='add'>+		.low_latency_vif = false,</div><div class='add'>+		.primary_link_active = true,</div><div class='add'>+		.chan_load_not_by_us = 30,</div><div class='add'>+		.chandef_a = &amp;chandef_6ghz_160mhz,</div><div class='add'>+		.chandef_b = &amp;chandef_6ghz_221_160mhz,</div><div class='add'>+		.expected_result = IWL_MLD_EMLSR_EXIT_EQUAL_BAND,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+KUNIT_ARRAY_PARAM_DESC(link_pair, link_pair_cases, desc);</div><div class='add'>+</div><div class='add'>+static void test_iwl_mld_link_pair_allows_emlsr(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	const struct link_pair_case *params = test-&gt;param_value;</div><div class='add'>+	struct iwl_mld *mld = test-&gt;priv;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	/* link A is the primary and link B is the secondary */</div><div class='add'>+	struct iwl_mld_link_sel_data a = {</div><div class='add'>+		.chandef = params-&gt;chandef_a,</div><div class='add'>+		.link_id = 4,</div><div class='add'>+	};</div><div class='add'>+	struct iwl_mld_link_sel_data b = {</div><div class='add'>+		.chandef = params-&gt;chandef_b,</div><div class='add'>+		.link_id = 5,</div><div class='add'>+	};</div><div class='add'>+	struct iwl_mld_kunit_link assoc_link = {</div><div class='add'>+		.chandef = params-&gt;primary_link_active ? a.chandef : b.chandef,</div><div class='add'>+		.id = params-&gt;primary_link_active ? a.link_id : b.link_id,</div><div class='add'>+	};</div><div class='add'>+	u32 result;</div><div class='add'>+</div><div class='add'>+	vif = iwlmld_kunit_setup_mlo_assoc(BIT(a.link_id) | BIT(b.link_id),</div><div class='add'>+					   &amp;assoc_link);</div><div class='add'>+</div><div class='add'>+	if (params-&gt;low_latency_vif)</div><div class='add'>+		iwl_mld_vif_from_mac80211(vif)-&gt;low_latency_causes = 1;</div><div class='add'>+</div><div class='add'>+	wiphy_lock(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* Simulate channel load */</div><div class='add'>+	if (params-&gt;primary_link_active) {</div><div class='add'>+		struct iwl_mld_phy *phy =</div><div class='add'>+			iwlmld_kunit_get_phy_of_link(vif, a.link_id);</div><div class='add'>+</div><div class='add'>+		phy-&gt;avg_channel_load_not_by_us = params-&gt;chan_load_not_by_us;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = iwl_mld_emlsr_pair_state(vif, &amp;a, &amp;b);</div><div class='add'>+</div><div class='add'>+	wiphy_unlock(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, result, params-&gt;expected_result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kunit_case link_pair_criteria_test_cases[] = {</div><div class='add'>+	KUNIT_CASE_PARAM(test_iwl_mld_link_pair_allows_emlsr, link_pair_gen_params),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kunit_suite link_pair_criteria_tests = {</div><div class='add'>+	.name = "iwlmld_link_pair_allows_emlsr",</div><div class='add'>+	.test_cases = link_pair_criteria_test_cases,</div><div class='add'>+	.init = iwlmld_kunit_test_init,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+kunit_test_suite(link_pair_criteria_tests);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/tests/link.c b/drivers/net/wireless/intel/iwlwifi/mld/tests/link.c<br/>new file mode 100644<br/>index 000000000000..69a0d67858bf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/tests/link.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/tests/link.c</a></div><div class='hunk'>@@ -0,0 +1,110 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * KUnit tests for channel helper functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;kunit/static_stub.h&gt;</div><div class='add'>+</div><div class='add'>+#include "utils.h"</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "link.h"</div><div class='add'>+#include "iface.h"</div><div class='add'>+#include "fw/api/mac-cfg.h"</div><div class='add'>+</div><div class='add'>+static const struct missed_beacon_test_case {</div><div class='add'>+	const char *desc;</div><div class='add'>+	struct {</div><div class='add'>+		struct iwl_missed_beacons_notif notif;</div><div class='add'>+		bool emlsr;</div><div class='add'>+	} input;</div><div class='add'>+	struct {</div><div class='add'>+		bool disconnected;</div><div class='add'>+		bool emlsr;</div><div class='add'>+	} output;</div><div class='add'>+} missed_beacon_cases[] = {</div><div class='add'>+	{</div><div class='add'>+		.desc = "no EMLSR, no disconnect",</div><div class='add'>+		.input.notif = {</div><div class='add'>+			.consec_missed_beacons = cpu_to_le32(4),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "no EMLSR, no beacon loss since Rx, no disconnect",</div><div class='add'>+		.input.notif = {</div><div class='add'>+			.consec_missed_beacons = cpu_to_le32(20),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "no EMLSR, beacon loss since Rx, disconnect",</div><div class='add'>+		.input.notif = {</div><div class='add'>+			.consec_missed_beacons = cpu_to_le32(20),</div><div class='add'>+			.consec_missed_beacons_since_last_rx =</div><div class='add'>+				cpu_to_le32(10),</div><div class='add'>+		},</div><div class='add'>+		.output.disconnected = true,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+KUNIT_ARRAY_PARAM_DESC(test_missed_beacon, missed_beacon_cases, desc);</div><div class='add'>+</div><div class='add'>+static void fake_ieee80211_connection_loss(struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	vif-&gt;cfg.assoc = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_missed_beacon(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = test-&gt;priv;</div><div class='add'>+	struct iwl_missed_beacons_notif *notif;</div><div class='add'>+	const struct missed_beacon_test_case *test_param =</div><div class='add'>+		(const void *)(test-&gt;param_value);</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct iwl_rx_packet *pkt;</div><div class='add'>+	struct iwl_mld_kunit_link link1 = {</div><div class='add'>+		.id = 0,</div><div class='add'>+		.chandef = &amp;chandef_6ghz_160mhz,</div><div class='add'>+	};</div><div class='add'>+	struct iwl_mld_kunit_link link2 = {</div><div class='add'>+		.id = 1,</div><div class='add'>+		.chandef = &amp;chandef_5ghz_80mhz,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	kunit_activate_static_stub(test, ieee80211_connection_loss,</div><div class='add'>+				   fake_ieee80211_connection_loss);</div><div class='add'>+	pkt = iwl_mld_kunit_create_pkt(test_param-&gt;input.notif);</div><div class='add'>+	notif = (void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (test_param-&gt;input.emlsr) {</div><div class='add'>+		vif = iwlmld_kunit_assoc_emlsr(&amp;link1, &amp;link2);</div><div class='add'>+	} else {</div><div class='add'>+		struct iwl_mld_vif *mld_vif;</div><div class='add'>+</div><div class='add'>+		vif = iwlmld_kunit_setup_non_mlo_assoc(&amp;link1);</div><div class='add'>+		mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+		notif-&gt;link_id = cpu_to_le32(mld_vif-&gt;deflink.fw_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wiphy_lock(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	iwl_mld_handle_missed_beacon_notif(mld, pkt);</div><div class='add'>+</div><div class='add'>+	wiphy_unlock(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	KUNIT_ASSERT_NE(test, vif-&gt;cfg.assoc, test_param-&gt;output.disconnected);</div><div class='add'>+</div><div class='add'>+	/* TODO: add test cases for esr and check */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kunit_case link_cases[] = {</div><div class='add'>+	KUNIT_CASE_PARAM(test_missed_beacon, test_missed_beacon_gen_params),</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kunit_suite link = {</div><div class='add'>+	.name = "iwlmld-link",</div><div class='add'>+	.test_cases = link_cases,</div><div class='add'>+	.init = iwlmld_kunit_test_init,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+kunit_test_suite(link);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/tests/module.c b/drivers/net/wireless/intel/iwlwifi/mld/tests/module.c<br/>new file mode 100644<br/>index 000000000000..5d9818587b23<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/tests/module.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/tests/module.c</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * This is just module boilerplate for the iwlmld kunit module.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_IMPORT_NS("IWLWIFI");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("kunit tests for iwlmld");</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/tests/rx.c b/drivers/net/wireless/intel/iwlwifi/mld/tests/rx.c<br/>new file mode 100644<br/>index 000000000000..20cb4e03ab41<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/tests/rx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/tests/rx.c</a></div><div class='hunk'>@@ -0,0 +1,353 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * KUnit tests for channel helper functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;kunit/test.h&gt;</div><div class='add'>+#include "utils.h"</div><div class='add'>+#include "iwl-trans.h"</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "sta.h"</div><div class='add'>+</div><div class='add'>+static const struct is_dup_case {</div><div class='add'>+	const char *desc;</div><div class='add'>+	struct {</div><div class='add'>+		/* ieee80211_hdr fields */</div><div class='add'>+		__le16 fc;</div><div class='add'>+		__le16 seq;</div><div class='add'>+		u8 tid;</div><div class='add'>+		bool multicast;</div><div class='add'>+		/* iwl_rx_mpdu_desc fields */</div><div class='add'>+		bool is_amsdu;</div><div class='add'>+		u8 sub_frame_idx;</div><div class='add'>+	} rx_pkt;</div><div class='add'>+	struct {</div><div class='add'>+		__le16 last_seq;</div><div class='add'>+		u8 last_sub_frame_idx;</div><div class='add'>+		u8 tid;</div><div class='add'>+	} dup_data_state;</div><div class='add'>+	struct {</div><div class='add'>+		bool is_dup;</div><div class='add'>+		u32 rx_status_flag;</div><div class='add'>+	} result;</div><div class='add'>+} is_dup_cases[] = {</div><div class='add'>+	{</div><div class='add'>+		.desc = "Control frame",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = __cpu_to_le16(IEEE80211_FTYPE_CTL),</div><div class='add'>+		},</div><div class='add'>+		.result = {</div><div class='add'>+			.is_dup = false,</div><div class='add'>+			.rx_status_flag = 0,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "Null func frame",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = __cpu_to_le16(IEEE80211_FTYPE_DATA |</div><div class='add'>+					    IEEE80211_STYPE_NULLFUNC),</div><div class='add'>+		},</div><div class='add'>+		.result = {</div><div class='add'>+			.is_dup = false,</div><div class='add'>+			.rx_status_flag = 0,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "Multicast data",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = __cpu_to_le16(IEEE80211_FTYPE_DATA),</div><div class='add'>+			.multicast = true,</div><div class='add'>+		},</div><div class='add'>+		.result = {</div><div class='add'>+			.is_dup = false,</div><div class='add'>+			.rx_status_flag = 0,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "QoS null func frame",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = __cpu_to_le16(IEEE80211_FTYPE_DATA |</div><div class='add'>+					    IEEE80211_STYPE_QOS_NULLFUNC),</div><div class='add'>+		},</div><div class='add'>+		.result = {</div><div class='add'>+			.is_dup = false,</div><div class='add'>+			.rx_status_flag = 0,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "QoS data new sequence",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = __cpu_to_le16(IEEE80211_FTYPE_DATA |</div><div class='add'>+					    IEEE80211_STYPE_QOS_DATA),</div><div class='add'>+			.seq = __cpu_to_le16(0x101),</div><div class='add'>+		},</div><div class='add'>+		.dup_data_state = {</div><div class='add'>+			.last_seq = __cpu_to_le16(0x100),</div><div class='add'>+			.last_sub_frame_idx = 0,</div><div class='add'>+		},</div><div class='add'>+		.result = {</div><div class='add'>+			.is_dup = false,</div><div class='add'>+			.rx_status_flag = RX_FLAG_DUP_VALIDATED,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "QoS data same sequence, no retry",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = __cpu_to_le16(IEEE80211_FTYPE_DATA |</div><div class='add'>+					    IEEE80211_STYPE_QOS_DATA),</div><div class='add'>+			.seq = __cpu_to_le16(0x100),</div><div class='add'>+		},</div><div class='add'>+		.dup_data_state = {</div><div class='add'>+			.last_seq = __cpu_to_le16(0x100),</div><div class='add'>+			.last_sub_frame_idx = 0,</div><div class='add'>+		},</div><div class='add'>+		.result = {</div><div class='add'>+			.is_dup = false,</div><div class='add'>+			.rx_status_flag = RX_FLAG_DUP_VALIDATED,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "QoS data same sequence, has retry",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = __cpu_to_le16(IEEE80211_FTYPE_DATA |</div><div class='add'>+					    IEEE80211_STYPE_QOS_DATA |</div><div class='add'>+					    IEEE80211_FCTL_RETRY),</div><div class='add'>+			.seq = __cpu_to_le16(0x100),</div><div class='add'>+		},</div><div class='add'>+		.dup_data_state = {</div><div class='add'>+			.last_seq = __cpu_to_le16(0x100),</div><div class='add'>+			.last_sub_frame_idx = 0,</div><div class='add'>+		},</div><div class='add'>+		.result = {</div><div class='add'>+			.is_dup = true,</div><div class='add'>+			.rx_status_flag = 0,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "QoS data invalid tid",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = __cpu_to_le16(IEEE80211_FTYPE_DATA |</div><div class='add'>+					    IEEE80211_STYPE_QOS_DATA),</div><div class='add'>+			.seq = __cpu_to_le16(0x100),</div><div class='add'>+			.tid = IWL_MAX_TID_COUNT + 1,</div><div class='add'>+		},</div><div class='add'>+		.result = {</div><div class='add'>+			.is_dup = true,</div><div class='add'>+			.rx_status_flag = 0,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "non-QoS data, same sequence, same tid, no retry",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			/* Driver will use tid = IWL_MAX_TID_COUNT */</div><div class='add'>+			.fc = __cpu_to_le16(IEEE80211_FTYPE_DATA),</div><div class='add'>+			.seq = __cpu_to_le16(0x100),</div><div class='add'>+		},</div><div class='add'>+		.dup_data_state = {</div><div class='add'>+			.tid = IWL_MAX_TID_COUNT,</div><div class='add'>+			.last_seq = __cpu_to_le16(0x100),</div><div class='add'>+			.last_sub_frame_idx = 0,</div><div class='add'>+		},</div><div class='add'>+		.result = {</div><div class='add'>+			.is_dup = false,</div><div class='add'>+			.rx_status_flag = RX_FLAG_DUP_VALIDATED,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "non-QoS data, same sequence, same tid, has retry",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			/* Driver will use tid = IWL_MAX_TID_COUNT */</div><div class='add'>+			.fc = __cpu_to_le16(IEEE80211_FTYPE_DATA |</div><div class='add'>+					    IEEE80211_FCTL_RETRY),</div><div class='add'>+			.seq = __cpu_to_le16(0x100),</div><div class='add'>+		},</div><div class='add'>+		.dup_data_state = {</div><div class='add'>+			.tid = IWL_MAX_TID_COUNT,</div><div class='add'>+			.last_seq = __cpu_to_le16(0x100),</div><div class='add'>+			.last_sub_frame_idx = 0,</div><div class='add'>+		},</div><div class='add'>+		.result = {</div><div class='add'>+			.is_dup = true,</div><div class='add'>+			.rx_status_flag = 0,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "non-QoS data, same sequence on different tid's",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			/* Driver will use tid = IWL_MAX_TID_COUNT */</div><div class='add'>+			.fc = __cpu_to_le16(IEEE80211_FTYPE_DATA),</div><div class='add'>+			.seq = __cpu_to_le16(0x100),</div><div class='add'>+		},</div><div class='add'>+		.dup_data_state = {</div><div class='add'>+			.tid = 7,</div><div class='add'>+			.last_seq = __cpu_to_le16(0x100),</div><div class='add'>+			.last_sub_frame_idx = 0,</div><div class='add'>+		},</div><div class='add'>+		.result = {</div><div class='add'>+			.is_dup = false,</div><div class='add'>+			.rx_status_flag = RX_FLAG_DUP_VALIDATED,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "A-MSDU new subframe, allow same PN",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = __cpu_to_le16(IEEE80211_FTYPE_DATA |</div><div class='add'>+					    IEEE80211_STYPE_QOS_DATA),</div><div class='add'>+			.seq = __cpu_to_le16(0x100),</div><div class='add'>+			.is_amsdu = true,</div><div class='add'>+			.sub_frame_idx = 1,</div><div class='add'>+		},</div><div class='add'>+		.dup_data_state = {</div><div class='add'>+			.last_seq = __cpu_to_le16(0x100),</div><div class='add'>+			.last_sub_frame_idx = 0,</div><div class='add'>+		},</div><div class='add'>+		.result = {</div><div class='add'>+			.is_dup = false,</div><div class='add'>+			.rx_status_flag = RX_FLAG_ALLOW_SAME_PN |</div><div class='add'>+					  RX_FLAG_DUP_VALIDATED,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "A-MSDU subframe with smaller idx, disallow same PN",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = __cpu_to_le16(IEEE80211_FTYPE_DATA |</div><div class='add'>+					    IEEE80211_STYPE_QOS_DATA),</div><div class='add'>+			.seq = __cpu_to_le16(0x100),</div><div class='add'>+			.is_amsdu = true,</div><div class='add'>+			.sub_frame_idx = 1,</div><div class='add'>+		},</div><div class='add'>+		.dup_data_state = {</div><div class='add'>+			.last_seq = __cpu_to_le16(0x100),</div><div class='add'>+			.last_sub_frame_idx = 2,</div><div class='add'>+		},</div><div class='add'>+		.result = {</div><div class='add'>+			.is_dup = false,</div><div class='add'>+			.rx_status_flag = RX_FLAG_DUP_VALIDATED,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "A-MSDU same subframe, no retry, disallow same PN",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = __cpu_to_le16(IEEE80211_FTYPE_DATA |</div><div class='add'>+					    IEEE80211_STYPE_QOS_DATA),</div><div class='add'>+			.seq = __cpu_to_le16(0x100),</div><div class='add'>+			.is_amsdu = true,</div><div class='add'>+			.sub_frame_idx = 0,</div><div class='add'>+		},</div><div class='add'>+		.dup_data_state = {</div><div class='add'>+			.last_seq = __cpu_to_le16(0x100),</div><div class='add'>+			.last_sub_frame_idx = 0,</div><div class='add'>+		},</div><div class='add'>+		.result = {</div><div class='add'>+			.is_dup = false,</div><div class='add'>+			.rx_status_flag = RX_FLAG_DUP_VALIDATED,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "A-MSDU same subframe, has retry",</div><div class='add'>+		.rx_pkt = {</div><div class='add'>+			.fc = __cpu_to_le16(IEEE80211_FTYPE_DATA |</div><div class='add'>+					    IEEE80211_STYPE_QOS_DATA |</div><div class='add'>+					    IEEE80211_FCTL_RETRY),</div><div class='add'>+			.seq = __cpu_to_le16(0x100),</div><div class='add'>+			.is_amsdu = true,</div><div class='add'>+			.sub_frame_idx = 0,</div><div class='add'>+		},</div><div class='add'>+		.dup_data_state = {</div><div class='add'>+			.last_seq = __cpu_to_le16(0x100),</div><div class='add'>+			.last_sub_frame_idx = 0,</div><div class='add'>+		},</div><div class='add'>+		.result = {</div><div class='add'>+			.is_dup = true,</div><div class='add'>+			.rx_status_flag = 0,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+KUNIT_ARRAY_PARAM_DESC(test_is_dup, is_dup_cases, desc);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+setup_dup_data_state(struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct kunit *test = kunit_get_current_test();</div><div class='add'>+	const struct is_dup_case *param = (const void *)(test-&gt;param_value);</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+	u8 tid = param-&gt;dup_data_state.tid;</div><div class='add'>+	struct iwl_mld_rxq_dup_data *dup_data;</div><div class='add'>+</div><div class='add'>+	/* Allocate dup_data only for 1 queue */</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT(test, dup_data);</div><div class='add'>+</div><div class='add'>+	/* Initialize dup data, see iwl_mld_alloc_dup_data */</div><div class='add'>+	memset(dup_data-&gt;last_seq, 0xff, sizeof(dup_data-&gt;last_seq));</div><div class='add'>+</div><div class='add'>+	dup_data-&gt;last_seq[tid] = param-&gt;dup_data_state.last_seq;</div><div class='add'>+	dup_data-&gt;last_sub_frame_idx[tid] =</div><div class='add'>+		param-&gt;dup_data_state.last_sub_frame_idx;</div><div class='add'>+</div><div class='add'>+	mld_sta-&gt;dup_data = dup_data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void setup_rx_pkt(const struct is_dup_case *param,</div><div class='add'>+			 struct ieee80211_hdr *hdr,</div><div class='add'>+			 struct iwl_rx_mpdu_desc *mpdu_desc)</div><div class='add'>+{</div><div class='add'>+	u8 tid = param-&gt;rx_pkt.tid;</div><div class='add'>+</div><div class='add'>+	/* Set "new rx packet" header */</div><div class='add'>+	hdr-&gt;frame_control = param-&gt;rx_pkt.fc;</div><div class='add'>+	hdr-&gt;seq_ctrl = param-&gt;rx_pkt.seq;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_data_qos(hdr-&gt;frame_control)) {</div><div class='add'>+		u8 *qc = ieee80211_get_qos_ctl(hdr);</div><div class='add'>+</div><div class='add'>+		qc[0] = tid &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (param-&gt;rx_pkt.multicast)</div><div class='add'>+		hdr-&gt;addr1[0] = 0x1;</div><div class='add'>+</div><div class='add'>+	/* Set mpdu_desc */</div><div class='add'>+	mpdu_desc-&gt;amsdu_info = param-&gt;rx_pkt.sub_frame_idx &amp;</div><div class='add'>+				IWL_RX_MPDU_AMSDU_SUBFRAME_IDX_MASK;</div><div class='add'>+	if (param-&gt;rx_pkt.is_amsdu)</div><div class='add'>+		mpdu_desc-&gt;mac_flags2 |= IWL_RX_MPDU_MFLG2_AMSDU;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_is_dup(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	const struct is_dup_case *param = (const void *)(test-&gt;param_value);</div><div class='add'>+	struct iwl_mld *mld = test-&gt;priv;</div><div class='add'>+	struct iwl_rx_mpdu_desc mpdu_desc = { };</div><div class='add'>+	struct ieee80211_rx_status rx_status = { };</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct ieee80211_hdr hdr;</div><div class='add'>+</div><div class='add'>+	vif = iwlmld_kunit_add_vif(false, NL80211_IFTYPE_STATION);</div><div class='add'>+	sta = iwlmld_kunit_setup_sta(vif, IEEE80211_STA_AUTHORIZED, -1);</div><div class='add'>+</div><div class='add'>+	/* Prepare test case state */</div><div class='add'>+	setup_dup_data_state(sta);</div><div class='add'>+	setup_rx_pkt(param, &amp;hdr, &amp;mpdu_desc);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test,</div><div class='add'>+			iwl_mld_is_dup(mld, sta, &amp;hdr, &amp;mpdu_desc, &amp;rx_status,</div><div class='add'>+				       0), /* assuming only 1 queue */</div><div class='add'>+			param-&gt;result.is_dup);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, rx_status.flag, param-&gt;result.rx_status_flag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kunit_case is_dup_test_cases[] = {</div><div class='add'>+	KUNIT_CASE_PARAM(test_is_dup, test_is_dup_gen_params),</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kunit_suite is_dup = {</div><div class='add'>+	.name = "iwlmld-rx-is-dup",</div><div class='add'>+	.test_cases = is_dup_test_cases,</div><div class='add'>+	.init = iwlmld_kunit_test_init,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+kunit_test_suite(is_dup);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/tests/utils.c b/drivers/net/wireless/intel/iwlwifi/mld/tests/utils.c<br/>new file mode 100644<br/>index 000000000000..26cf27be762d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/tests/utils.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/tests/utils.c</a></div><div class='hunk'>@@ -0,0 +1,503 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * KUnit tests for channel helper functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;kunit/test.h&gt;</div><div class='add'>+#include &lt;kunit/test-bug.h&gt;</div><div class='add'>+</div><div class='add'>+#include "utils.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+</div><div class='add'>+#include "fw/api/scan.h"</div><div class='add'>+#include "fw/api/mac-cfg.h"</div><div class='add'>+#include "iwl-trans.h"</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "iface.h"</div><div class='add'>+#include "link.h"</div><div class='add'>+#include "phy.h"</div><div class='add'>+#include "sta.h"</div><div class='add'>+</div><div class='add'>+int iwlmld_kunit_test_init(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld;</div><div class='add'>+	struct iwl_trans *trans;</div><div class='add'>+	const struct iwl_rf_cfg *cfg;</div><div class='add'>+	struct iwl_fw *fw;</div><div class='add'>+	struct ieee80211_hw *hw;</div><div class='add'>+</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT(test, trans);</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT(test, trans-&gt;dev);</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT(test, cfg);</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT(test, fw);</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT(test, hw);</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT(test, hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;hw-&gt;wiphy-&gt;mtx);</div><div class='add'>+</div><div class='add'>+	/* Allocate and initialize the mld structure */</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT(test, mld);</div><div class='add'>+	iwl_construct_mld(mld, trans, cfg, fw, hw, NULL);</div><div class='add'>+</div><div class='add'>+	fw-&gt;ucode_capa.num_stations = IWL_STATION_COUNT_MAX;</div><div class='add'>+	fw-&gt;ucode_capa.num_links = IWL_FW_MAX_LINK_ID + 1;</div><div class='add'>+</div><div class='add'>+	mld-&gt;fwrt.trans = trans;</div><div class='add'>+	mld-&gt;fwrt.fw = fw;</div><div class='add'>+	mld-&gt;fwrt.dev = trans-&gt;dev;</div><div class='add'>+</div><div class='add'>+	/* TODO: add priv_size to hw allocation and setup hw-&gt;priv to enable</div><div class='add'>+	 * testing mac80211 callbacks</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT(test, mld-&gt;nvm_data);</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT_SIZE(test, mld-&gt;scan.cmd,</div><div class='add'>+				    sizeof(struct iwl_scan_req_umac_v17));</div><div class='add'>+	mld-&gt;scan.cmd_size = sizeof(struct iwl_scan_req_umac_v17);</div><div class='add'>+</div><div class='add'>+	/* This is not the state at the end of the regular opmode_start,</div><div class='add'>+	 * but it is more common to need it. Explicitly undo this if needed.</div><div class='add'>+	 */</div><div class='add'>+	mld-&gt;trans-&gt;state = IWL_TRANS_FW_ALIVE;</div><div class='add'>+	mld-&gt;fw_status.running = true;</div><div class='add'>+</div><div class='add'>+	/* Avoid passing mld struct around */</div><div class='add'>+	test-&gt;priv = mld;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+IWL_MLD_ALLOC_FN(link, bss_conf)</div><div class='add'>+</div><div class='add'>+static void iwlmld_kunit_init_link(struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_bss_conf *link,</div><div class='add'>+				   struct iwl_mld_link *mld_link, int link_id)</div><div class='add'>+{</div><div class='add'>+	struct kunit *test = kunit_get_current_test();</div><div class='add'>+	struct iwl_mld *mld = test-&gt;priv;</div><div class='add'>+	struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* setup mac80211 link */</div><div class='add'>+	rcu_assign_pointer(vif-&gt;link_conf[link_id], link);</div><div class='add'>+	link-&gt;link_id = link_id;</div><div class='add'>+	link-&gt;vif = vif;</div><div class='add'>+	link-&gt;beacon_int = 100;</div><div class='add'>+	link-&gt;dtim_period = 3;</div><div class='add'>+	link-&gt;qos = true;</div><div class='add'>+</div><div class='add'>+	/* and mld_link */</div><div class='add'>+	ret = iwl_mld_allocate_link_fw_id(mld, &amp;mld_link-&gt;fw_id, link);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, ret, 0);</div><div class='add'>+	rcu_assign_pointer(mld_vif-&gt;link[link_id], mld_link);</div><div class='add'>+	rcu_assign_pointer(vif-&gt;link_conf[link_id], link);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+IWL_MLD_ALLOC_FN(vif, vif)</div><div class='add'>+</div><div class='add'>+/* Helper function to add and initialize a VIF for KUnit tests */</div><div class='add'>+struct ieee80211_vif *iwlmld_kunit_add_vif(bool mlo, enum nl80211_iftype type)</div><div class='add'>+{</div><div class='add'>+	struct kunit *test = kunit_get_current_test();</div><div class='add'>+	struct iwl_mld *mld = test-&gt;priv;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct iwl_mld_vif *mld_vif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* TODO: support more types */</div><div class='add'>+	KUNIT_ASSERT_EQ(test, type, NL80211_IFTYPE_STATION);</div><div class='add'>+</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT_SIZE(test, vif,</div><div class='add'>+				    sizeof(*vif) + sizeof(*mld_vif));</div><div class='add'>+</div><div class='add'>+	vif-&gt;type = type;</div><div class='add'>+	mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+	mld_vif-&gt;mld = mld;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_allocate_vif_fw_id(mld, &amp;mld_vif-&gt;fw_id, vif);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, ret, 0);</div><div class='add'>+</div><div class='add'>+	/* TODO: revisit (task=EHT) */</div><div class='add'>+	if (mlo)</div><div class='add'>+		return vif;</div><div class='add'>+</div><div class='add'>+	/* Initialize the default link */</div><div class='add'>+	iwlmld_kunit_init_link(vif, &amp;vif-&gt;bss_conf, &amp;mld_vif-&gt;deflink, 0);</div><div class='add'>+</div><div class='add'>+	return vif;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Use only for MLO vif */</div><div class='add'>+struct ieee80211_bss_conf *</div><div class='add'>+iwlmld_kunit_add_link(struct ieee80211_vif *vif, int link_id)</div><div class='add'>+{</div><div class='add'>+	struct kunit *test = kunit_get_current_test();</div><div class='add'>+	struct ieee80211_bss_conf *link;</div><div class='add'>+	struct iwl_mld_link *mld_link;</div><div class='add'>+</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT(test, link);</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT(test, mld_link);</div><div class='add'>+</div><div class='add'>+	iwlmld_kunit_init_link(vif, link, mld_link, link_id);</div><div class='add'>+	vif-&gt;valid_links |= BIT(link_id);</div><div class='add'>+</div><div class='add'>+	return link;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ieee80211_chanctx_conf *</div><div class='add'>+iwlmld_kunit_add_chanctx(const struct cfg80211_chan_def *def)</div><div class='add'>+{</div><div class='add'>+	struct kunit *test = kunit_get_current_test();</div><div class='add'>+	struct iwl_mld *mld = test-&gt;priv;</div><div class='add'>+	struct ieee80211_chanctx_conf *ctx;</div><div class='add'>+	struct iwl_mld_phy *phy;</div><div class='add'>+	int fw_id;</div><div class='add'>+</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT_SIZE(test, ctx, sizeof(*ctx) + sizeof(*phy));</div><div class='add'>+</div><div class='add'>+	/* Setup the chanctx conf */</div><div class='add'>+	ctx-&gt;def = *def;</div><div class='add'>+	ctx-&gt;min_def = *def;</div><div class='add'>+	ctx-&gt;ap = *def;</div><div class='add'>+</div><div class='add'>+	/* and the iwl_mld_phy */</div><div class='add'>+	phy = iwl_mld_phy_from_mac80211(ctx);</div><div class='add'>+</div><div class='add'>+	fw_id = iwl_mld_allocate_fw_phy_id(mld);</div><div class='add'>+	KUNIT_ASSERT_GE(test, fw_id, 0);</div><div class='add'>+</div><div class='add'>+	phy-&gt;fw_id = fw_id;</div><div class='add'>+	phy-&gt;mld = mld;</div><div class='add'>+	phy-&gt;chandef = *def;</div><div class='add'>+</div><div class='add'>+	return ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwlmld_kunit_assign_chanctx_to_link(struct ieee80211_vif *vif,</div><div class='add'>+					 struct ieee80211_bss_conf *link,</div><div class='add'>+					 struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct kunit *test = kunit_get_current_test();</div><div class='add'>+	struct iwl_mld *mld = test-&gt;priv;</div><div class='add'>+	struct iwl_mld_link *mld_link;</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_NULL(test, rcu_access_pointer(link-&gt;chanctx_conf));</div><div class='add'>+	rcu_assign_pointer(link-&gt;chanctx_conf, ctx);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	mld_link = iwl_mld_link_from_mac80211(link);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_NULL(test, rcu_access_pointer(mld_link-&gt;chan_ctx));</div><div class='add'>+	KUNIT_EXPECT_FALSE(test, mld_link-&gt;active);</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(mld_link-&gt;chan_ctx, ctx);</div><div class='add'>+	mld_link-&gt;active = true;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_is_mld(vif))</div><div class='add'>+		vif-&gt;active_links |= BIT(link-&gt;link_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+IWL_MLD_ALLOC_FN(link_sta, link_sta)</div><div class='add'>+</div><div class='add'>+static void iwlmld_kunit_add_link_sta(struct ieee80211_sta *sta,</div><div class='add'>+				      struct ieee80211_link_sta *link_sta,</div><div class='add'>+				      struct iwl_mld_link_sta *mld_link_sta,</div><div class='add'>+				      u8 link_id)</div><div class='add'>+{</div><div class='add'>+	struct kunit *test = kunit_get_current_test();</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+	struct iwl_mld *mld = test-&gt;priv;</div><div class='add'>+	u8 fw_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* initialize mac80211's link_sta */</div><div class='add'>+	link_sta-&gt;link_id = link_id;</div><div class='add'>+	rcu_assign_pointer(sta-&gt;link[link_id], link_sta);</div><div class='add'>+</div><div class='add'>+	link_sta-&gt;sta = sta;</div><div class='add'>+</div><div class='add'>+	/* and the iwl_mld_link_sta */</div><div class='add'>+	ret = iwl_mld_allocate_link_sta_fw_id(mld, &amp;fw_id, link_sta);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, ret, 0);</div><div class='add'>+	mld_link_sta-&gt;fw_id = fw_id;</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(mld_sta-&gt;link[link_id], mld_link_sta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ieee80211_link_sta *</div><div class='add'>+iwlmld_kunit_alloc_link_sta(struct ieee80211_sta *sta, int link_id)</div><div class='add'>+{</div><div class='add'>+	struct kunit *test = kunit_get_current_test();</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	struct iwl_mld_link_sta *mld_link_sta;</div><div class='add'>+</div><div class='add'>+	/* Only valid for MLO */</div><div class='add'>+	KUNIT_ASSERT_TRUE(test, sta-&gt;valid_links);</div><div class='add'>+</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT(test, link_sta);</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT(test, mld_link_sta);</div><div class='add'>+</div><div class='add'>+	iwlmld_kunit_add_link_sta(sta, link_sta, mld_link_sta, link_id);</div><div class='add'>+</div><div class='add'>+	sta-&gt;valid_links |= BIT(link_id);</div><div class='add'>+</div><div class='add'>+	return link_sta;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Allocate and initialize a STA with the first link_sta */</div><div class='add'>+static struct ieee80211_sta *</div><div class='add'>+iwlmld_kunit_add_sta(struct ieee80211_vif *vif, int link_id)</div><div class='add'>+{</div><div class='add'>+	struct kunit *test = kunit_get_current_test();</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct iwl_mld_sta *mld_sta;</div><div class='add'>+</div><div class='add'>+	/* Allocate memory for ieee80211_sta with embedded iwl_mld_sta */</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT_SIZE(test, sta, sizeof(*sta) + sizeof(*mld_sta));</div><div class='add'>+</div><div class='add'>+	/* TODO: allocate and initialize the TXQs ? */</div><div class='add'>+</div><div class='add'>+	mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+	mld_sta-&gt;vif = vif;</div><div class='add'>+	mld_sta-&gt;mld = test-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* TODO: adjust for internal stations */</div><div class='add'>+	mld_sta-&gt;sta_type = STATION_TYPE_PEER;</div><div class='add'>+</div><div class='add'>+	if (link_id &gt;= 0) {</div><div class='add'>+		iwlmld_kunit_add_link_sta(sta, &amp;sta-&gt;deflink,</div><div class='add'>+					  &amp;mld_sta-&gt;deflink, link_id);</div><div class='add'>+		sta-&gt;valid_links = BIT(link_id);</div><div class='add'>+	} else {</div><div class='add'>+		iwlmld_kunit_add_link_sta(sta, &amp;sta-&gt;deflink,</div><div class='add'>+					  &amp;mld_sta-&gt;deflink, 0);</div><div class='add'>+	}</div><div class='add'>+	return sta;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Move s STA to a state */</div><div class='add'>+static void iwlmld_kunit_move_sta_state(struct ieee80211_vif *vif,</div><div class='add'>+					struct ieee80211_sta *sta,</div><div class='add'>+					enum ieee80211_sta_state state)</div><div class='add'>+{</div><div class='add'>+	struct kunit *test = kunit_get_current_test();</div><div class='add'>+	struct iwl_mld_sta *mld_sta;</div><div class='add'>+	struct iwl_mld_vif *mld_vif;</div><div class='add'>+</div><div class='add'>+	/* The sta will be removed automatically at the end of the test */</div><div class='add'>+	KUNIT_ASSERT_NE(test, state, IEEE80211_STA_NOTEXIST);</div><div class='add'>+</div><div class='add'>+	mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+	mld_sta-&gt;sta_state = state;</div><div class='add'>+</div><div class='add'>+	mld_vif = iwl_mld_vif_from_mac80211(mld_sta-&gt;vif);</div><div class='add'>+	mld_vif-&gt;authorized = state == IEEE80211_STA_AUTHORIZED;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; !sta-&gt;tdls)</div><div class='add'>+		mld_vif-&gt;ap_sta = sta;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ieee80211_sta *iwlmld_kunit_setup_sta(struct ieee80211_vif *vif,</div><div class='add'>+					     enum ieee80211_sta_state state,</div><div class='add'>+					     int link_id)</div><div class='add'>+{</div><div class='add'>+	struct kunit *test = kunit_get_current_test();</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+</div><div class='add'>+	/* The sta will be removed automatically at the end of the test */</div><div class='add'>+	KUNIT_ASSERT_NE(test, state, IEEE80211_STA_NOTEXIST);</div><div class='add'>+</div><div class='add'>+	/* First - allocate and init the STA */</div><div class='add'>+	sta = iwlmld_kunit_add_sta(vif, link_id);</div><div class='add'>+</div><div class='add'>+	/* Now move it all the way to the wanted state */</div><div class='add'>+	for (enum ieee80211_sta_state _state = IEEE80211_STA_NONE;</div><div class='add'>+	     _state &lt;= state; _state++)</div><div class='add'>+		iwlmld_kunit_move_sta_state(vif, sta, state);</div><div class='add'>+</div><div class='add'>+	return sta;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwlmld_kunit_set_vif_associated(struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	/* TODO: setup chanreq */</div><div class='add'>+	/* TODO setup capabilities */</div><div class='add'>+</div><div class='add'>+	vif-&gt;cfg.assoc = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ieee80211_vif *</div><div class='add'>+iwlmld_kunit_setup_assoc(bool mlo, struct iwl_mld_kunit_link *assoc_link)</div><div class='add'>+{</div><div class='add'>+	struct kunit *test = kunit_get_current_test();</div><div class='add'>+	struct iwl_mld *mld = test-&gt;priv;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct ieee80211_bss_conf *link;</div><div class='add'>+	struct ieee80211_chanctx_conf *chan_ctx;</div><div class='add'>+</div><div class='add'>+	KUNIT_ASSERT_TRUE(test, mlo || assoc_link-&gt;id == 0);</div><div class='add'>+</div><div class='add'>+	vif = iwlmld_kunit_add_vif(mlo, NL80211_IFTYPE_STATION);</div><div class='add'>+</div><div class='add'>+	if (mlo)</div><div class='add'>+		link = iwlmld_kunit_add_link(vif, assoc_link-&gt;id);</div><div class='add'>+	else</div><div class='add'>+		link = &amp;vif-&gt;bss_conf;</div><div class='add'>+</div><div class='add'>+	chan_ctx = iwlmld_kunit_add_chanctx(assoc_link-&gt;chandef);</div><div class='add'>+</div><div class='add'>+	wiphy_lock(mld-&gt;wiphy);</div><div class='add'>+	iwlmld_kunit_assign_chanctx_to_link(vif, link, chan_ctx);</div><div class='add'>+	wiphy_unlock(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* The AP sta will now be pointer to by mld_vif-&gt;ap_sta */</div><div class='add'>+	iwlmld_kunit_setup_sta(vif, IEEE80211_STA_AUTHORIZED, assoc_link-&gt;id);</div><div class='add'>+</div><div class='add'>+	iwlmld_kunit_set_vif_associated(vif);</div><div class='add'>+</div><div class='add'>+	return vif;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ieee80211_vif *</div><div class='add'>+iwlmld_kunit_setup_mlo_assoc(u16 valid_links,</div><div class='add'>+			     struct iwl_mld_kunit_link *assoc_link)</div><div class='add'>+{</div><div class='add'>+	struct kunit *test = kunit_get_current_test();</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+</div><div class='add'>+	KUNIT_ASSERT_TRUE(test,</div><div class='add'>+			  hweight16(valid_links) == 1 ||</div><div class='add'>+			  hweight16(valid_links) == 2);</div><div class='add'>+	KUNIT_ASSERT_TRUE(test, valid_links &amp; BIT(assoc_link-&gt;id));</div><div class='add'>+</div><div class='add'>+	vif = iwlmld_kunit_setup_assoc(true, assoc_link);</div><div class='add'>+</div><div class='add'>+	/* Add the other link, if applicable */</div><div class='add'>+	if (hweight16(valid_links) &gt; 1) {</div><div class='add'>+		u8 other_link_id = ffs(valid_links &amp; ~BIT(assoc_link-&gt;id)) - 1;</div><div class='add'>+</div><div class='add'>+		iwlmld_kunit_add_link(vif, other_link_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return vif;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ieee80211_vif *</div><div class='add'>+iwlmld_kunit_setup_non_mlo_assoc(struct iwl_mld_kunit_link *assoc_link)</div><div class='add'>+{</div><div class='add'>+	return iwlmld_kunit_setup_assoc(false, assoc_link);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct iwl_rx_packet *</div><div class='add'>+_iwl_mld_kunit_create_pkt(const void *notif, size_t notif_sz)</div><div class='add'>+{</div><div class='add'>+	struct kunit *test = kunit_get_current_test();</div><div class='add'>+	struct iwl_rx_packet *pkt;</div><div class='add'>+</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT_SIZE(test, pkt, sizeof(pkt) + notif_sz);</div><div class='add'>+</div><div class='add'>+	memcpy(pkt-&gt;data, notif, notif_sz);</div><div class='add'>+	pkt-&gt;len_n_flags = cpu_to_le32(sizeof(pkt-&gt;hdr) + notif_sz);</div><div class='add'>+</div><div class='add'>+	return pkt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ieee80211_vif *iwlmld_kunit_assoc_emlsr(struct iwl_mld_kunit_link *link1,</div><div class='add'>+					       struct iwl_mld_kunit_link *link2)</div><div class='add'>+{</div><div class='add'>+	struct kunit *test = kunit_get_current_test();</div><div class='add'>+	struct iwl_mld *mld = test-&gt;priv;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct ieee80211_bss_conf *link;</div><div class='add'>+	struct ieee80211_chanctx_conf *chan_ctx;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct iwl_mld_vif *mld_vif;</div><div class='add'>+	u16 valid_links = BIT(link1-&gt;id) | BIT(link2-&gt;id);</div><div class='add'>+</div><div class='add'>+	KUNIT_ASSERT_TRUE(test, hweight16(valid_links) == 2);</div><div class='add'>+</div><div class='add'>+	vif = iwlmld_kunit_setup_mlo_assoc(valid_links, link1);</div><div class='add'>+	mld_vif = iwl_mld_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	/* Activate second link */</div><div class='add'>+	wiphy_lock(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	link = wiphy_dereference(mld-&gt;wiphy, vif-&gt;link_conf[link2-&gt;id]);</div><div class='add'>+	KUNIT_EXPECT_NOT_NULL(test, link);</div><div class='add'>+</div><div class='add'>+	chan_ctx = iwlmld_kunit_add_chanctx(link2-&gt;chandef);</div><div class='add'>+	iwlmld_kunit_assign_chanctx_to_link(vif, link, chan_ctx);</div><div class='add'>+</div><div class='add'>+	wiphy_unlock(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* And other link sta */</div><div class='add'>+	sta = mld_vif-&gt;ap_sta;</div><div class='add'>+	KUNIT_EXPECT_NOT_NULL(test, sta);</div><div class='add'>+</div><div class='add'>+	iwlmld_kunit_alloc_link_sta(sta, link2-&gt;id);</div><div class='add'>+</div><div class='add'>+	return vif;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct element *iwlmld_kunit_gen_element(u8 id, const void *data, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct kunit *test = kunit_get_current_test();</div><div class='add'>+	struct element *elem;</div><div class='add'>+</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT_SIZE(test, elem, sizeof(*elem) + len);</div><div class='add'>+</div><div class='add'>+	elem-&gt;id = id;</div><div class='add'>+	elem-&gt;datalen = len;</div><div class='add'>+	memcpy(elem-&gt;data, data, len);</div><div class='add'>+</div><div class='add'>+	return elem;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct iwl_mld_phy *iwlmld_kunit_get_phy_of_link(struct ieee80211_vif *vif,</div><div class='add'>+						 u8 link_id)</div><div class='add'>+{</div><div class='add'>+	struct kunit *test = kunit_get_current_test();</div><div class='add'>+	struct iwl_mld *mld = test-&gt;priv;</div><div class='add'>+	struct ieee80211_chanctx_conf *chanctx;</div><div class='add'>+	struct ieee80211_bss_conf *link =</div><div class='add'>+		wiphy_dereference(mld-&gt;wiphy, vif-&gt;link_conf[link_id]);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_NOT_NULL(test, link);</div><div class='add'>+</div><div class='add'>+	chanctx = wiphy_dereference(mld-&gt;wiphy, link-&gt;chanctx_conf);</div><div class='add'>+	KUNIT_EXPECT_NOT_NULL(test, chanctx);</div><div class='add'>+</div><div class='add'>+	return iwl_mld_phy_from_mac80211(chanctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct chandef_case {</div><div class='add'>+	const char *desc;</div><div class='add'>+	const struct cfg80211_chan_def *chandef;</div><div class='add'>+} chandef_cases[] = {</div><div class='add'>+#define CHANDEF(c, ...) { .desc = "chandef " #c " valid", .chandef = &amp;c, },</div><div class='add'>+	CHANDEF_LIST</div><div class='add'>+#undef CHANDEF</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+KUNIT_ARRAY_PARAM_DESC(chandef, chandef_cases, desc);</div><div class='add'>+</div><div class='add'>+static void test_iwl_mld_chandef_valid(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	const struct chandef_case *params = test-&gt;param_value;</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, true, cfg80211_chandef_valid(params-&gt;chandef));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kunit_case chandef_test_cases[] = {</div><div class='add'>+	KUNIT_CASE_PARAM(test_iwl_mld_chandef_valid, chandef_gen_params),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kunit_suite chandef_tests = {</div><div class='add'>+	.name = "iwlmld_valid_test_chandefs",</div><div class='add'>+	.test_cases = chandef_test_cases,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+kunit_test_suite(chandef_tests);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/tests/utils.h b/drivers/net/wireless/intel/iwlwifi/mld/tests/utils.h<br/>new file mode 100644<br/>index 000000000000..edf8eef4e81a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/tests/utils.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/tests/utils.h</a></div><div class='hunk'>@@ -0,0 +1,140 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __iwl_mld_kunit_utils_h__</div><div class='add'>+#define __iwl_mld_kunit_utils_h__</div><div class='add'>+</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+#include &lt;kunit/test-bug.h&gt;</div><div class='add'>+</div><div class='add'>+struct iwl_mld;</div><div class='add'>+</div><div class='add'>+int iwlmld_kunit_test_init(struct kunit *test);</div><div class='add'>+</div><div class='add'>+struct iwl_mld_kunit_link {</div><div class='add'>+	const struct cfg80211_chan_def *chandef;</div><div class='add'>+	u8 id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum nl80211_iftype;</div><div class='add'>+</div><div class='add'>+struct ieee80211_vif *iwlmld_kunit_add_vif(bool mlo, enum nl80211_iftype type);</div><div class='add'>+</div><div class='add'>+struct ieee80211_bss_conf *</div><div class='add'>+iwlmld_kunit_add_link(struct ieee80211_vif *vif, int link_id);</div><div class='add'>+</div><div class='add'>+#define KUNIT_ALLOC_AND_ASSERT_SIZE(test, ptr, size)			\</div><div class='add'>+do {									\</div><div class='add'>+	(ptr) = kunit_kzalloc((test), (size), GFP_KERNEL);		\</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL((test), (ptr));				\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define KUNIT_ALLOC_AND_ASSERT(test, ptr)				\</div><div class='add'>+	KUNIT_ALLOC_AND_ASSERT_SIZE(test, ptr, sizeof(*(ptr)))</div><div class='add'>+</div><div class='add'>+#define CHANNEL(_name, _band, _freq)				\</div><div class='add'>+static struct ieee80211_channel _name = {			\</div><div class='add'>+	.band = (_band),					\</div><div class='add'>+	.center_freq = (_freq),					\</div><div class='add'>+	.hw_value = (_freq),					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+CHANNEL(chan_2ghz, NL80211_BAND_2GHZ, 2412);</div><div class='add'>+CHANNEL(chan_2ghz_11, NL80211_BAND_2GHZ, 2462);</div><div class='add'>+CHANNEL(chan_5ghz, NL80211_BAND_5GHZ, 5200);</div><div class='add'>+CHANNEL(chan_5ghz_120, NL80211_BAND_5GHZ, 5600);</div><div class='add'>+CHANNEL(chan_6ghz, NL80211_BAND_6GHZ, 6115);</div><div class='add'>+CHANNEL(chan_6ghz_221, NL80211_BAND_6GHZ, 7055);</div><div class='add'>+/* Feel free to add more */</div><div class='add'>+#undef CHANNEL</div><div class='add'>+</div><div class='add'>+#define CHANDEF_LIST \</div><div class='add'>+	CHANDEF(chandef_2ghz_20mhz, chan_2ghz, 2412,		\</div><div class='add'>+		NL80211_CHAN_WIDTH_20)				\</div><div class='add'>+	CHANDEF(chandef_2ghz_40mhz, chan_2ghz, 2422,		\</div><div class='add'>+		NL80211_CHAN_WIDTH_40)				\</div><div class='add'>+	CHANDEF(chandef_2ghz_11_20mhz, chan_2ghz_11, 2462,	\</div><div class='add'>+		NL80211_CHAN_WIDTH_20)				\</div><div class='add'>+	CHANDEF(chandef_5ghz_20mhz, chan_5ghz, 5200,		\</div><div class='add'>+		NL80211_CHAN_WIDTH_20)				\</div><div class='add'>+	CHANDEF(chandef_5ghz_40mhz, chan_5ghz, 5210,		\</div><div class='add'>+		NL80211_CHAN_WIDTH_40)				\</div><div class='add'>+	CHANDEF(chandef_5ghz_80mhz, chan_5ghz, 5210,		\</div><div class='add'>+		NL80211_CHAN_WIDTH_80)				\</div><div class='add'>+	CHANDEF(chandef_5ghz_160mhz, chan_5ghz, 5250,		\</div><div class='add'>+		NL80211_CHAN_WIDTH_160)				\</div><div class='add'>+	CHANDEF(chandef_5ghz_120_40mhz, chan_5ghz_120, 5610,	\</div><div class='add'>+		NL80211_CHAN_WIDTH_40)				\</div><div class='add'>+	CHANDEF(chandef_6ghz_20mhz, chan_6ghz, 6115,		\</div><div class='add'>+		NL80211_CHAN_WIDTH_20)				\</div><div class='add'>+	CHANDEF(chandef_6ghz_40mhz, chan_6ghz, 6125,		\</div><div class='add'>+		NL80211_CHAN_WIDTH_40)				\</div><div class='add'>+	CHANDEF(chandef_6ghz_80mhz, chan_6ghz, 6145,		\</div><div class='add'>+		NL80211_CHAN_WIDTH_80)				\</div><div class='add'>+	CHANDEF(chandef_6ghz_160mhz, chan_6ghz, 6185,		\</div><div class='add'>+		NL80211_CHAN_WIDTH_160)				\</div><div class='add'>+	CHANDEF(chandef_6ghz_320mhz, chan_6ghz, 6105,		\</div><div class='add'>+		NL80211_CHAN_WIDTH_320)				\</div><div class='add'>+	CHANDEF(chandef_6ghz_221_160mhz, chan_6ghz_221, 6985,	\</div><div class='add'>+		NL80211_CHAN_WIDTH_160)				\</div><div class='add'>+	/* Feel free to add more */</div><div class='add'>+</div><div class='add'>+#define CHANDEF(_name, _channel, _freq1, _width)		\</div><div class='add'>+__maybe_unused static const struct cfg80211_chan_def _name = {	\</div><div class='add'>+	.chan = &amp;(_channel),					\</div><div class='add'>+	.center_freq1 = (_freq1),				\</div><div class='add'>+	.width = (_width),					\</div><div class='add'>+};</div><div class='add'>+CHANDEF_LIST</div><div class='add'>+#undef CHANDEF</div><div class='add'>+</div><div class='add'>+struct ieee80211_chanctx_conf *</div><div class='add'>+iwlmld_kunit_add_chanctx(const struct cfg80211_chan_def *def);</div><div class='add'>+</div><div class='add'>+void iwlmld_kunit_assign_chanctx_to_link(struct ieee80211_vif *vif,</div><div class='add'>+					 struct ieee80211_bss_conf *link,</div><div class='add'>+					 struct ieee80211_chanctx_conf *ctx);</div><div class='add'>+</div><div class='add'>+/* Allocate a sta, initialize it and move it to the wanted state */</div><div class='add'>+struct ieee80211_sta *iwlmld_kunit_setup_sta(struct ieee80211_vif *vif,</div><div class='add'>+					     enum ieee80211_sta_state state,</div><div class='add'>+					     int link_id);</div><div class='add'>+</div><div class='add'>+struct ieee80211_vif *</div><div class='add'>+iwlmld_kunit_setup_mlo_assoc(u16 valid_links,</div><div class='add'>+			     struct iwl_mld_kunit_link *assoc_link);</div><div class='add'>+</div><div class='add'>+struct ieee80211_vif *</div><div class='add'>+iwlmld_kunit_setup_non_mlo_assoc(struct iwl_mld_kunit_link *assoc_link);</div><div class='add'>+</div><div class='add'>+struct iwl_rx_packet *</div><div class='add'>+_iwl_mld_kunit_create_pkt(const void *notif, size_t notif_sz);</div><div class='add'>+</div><div class='add'>+#define iwl_mld_kunit_create_pkt(_notif)	\</div><div class='add'>+	_iwl_mld_kunit_create_pkt(&amp;(_notif), sizeof(_notif))</div><div class='add'>+</div><div class='add'>+struct ieee80211_vif *</div><div class='add'>+iwlmld_kunit_assoc_emlsr(struct iwl_mld_kunit_link *link1,</div><div class='add'>+			 struct iwl_mld_kunit_link *link2);</div><div class='add'>+</div><div class='add'>+struct element *iwlmld_kunit_gen_element(u8 id, const void *data, size_t len);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwlmld_kunit_get_phy_of_link - Get the phy of a link</div><div class='add'>+ *</div><div class='add'>+ * @vif: The vif to get the phy from.</div><div class='add'>+ * @link_id: The id of the link to get the phy for.</div><div class='add'>+ *</div><div class='add'>+ * given a vif and link id, return the phy pointer of that link.</div><div class='add'>+ * This assumes that the link exists, and that it had a chanctx</div><div class='add'>+ * assigned.</div><div class='add'>+ * If this is not the case, the test will fail.</div><div class='add'>+ *</div><div class='add'>+ * Return: phy pointer.</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_phy *iwlmld_kunit_get_phy_of_link(struct ieee80211_vif *vif,</div><div class='add'>+						 u8 link_id);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_kunit_utils_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/thermal.c b/drivers/net/wireless/intel/iwlwifi/mld/thermal.c<br/>new file mode 100644<br/>index 000000000000..f8a8c35066be<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/thermal.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/thermal.c</a></div><div class='hunk'>@@ -0,0 +1,467 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_THERMAL</div><div class='add'>+#include &lt;linux/sort.h&gt;</div><div class='add'>+#include &lt;linux/thermal.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include "fw/api/phy.h"</div><div class='add'>+</div><div class='add'>+#include "thermal.h"</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_NUM_CTDP_STEPS		20</div><div class='add'>+#define IWL_MLD_MIN_CTDP_BUDGET_MW	150</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_CT_KILL_DURATION (5 * HZ)</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_ct_kill_notif(struct iwl_mld *mld,</div><div class='add'>+				  struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	const struct ct_kill_notif *notif = (const void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+	IWL_ERR(mld,</div><div class='add'>+		"CT Kill notification: temp = %d, DTS = 0x%x, Scheme 0x%x - Enter CT Kill\n",</div><div class='add'>+		le16_to_cpu(notif-&gt;temperature), notif-&gt;dts,</div><div class='add'>+		notif-&gt;scheme);</div><div class='add'>+</div><div class='add'>+	iwl_mld_set_ctkill(mld, true);</div><div class='add'>+</div><div class='add'>+	wiphy_delayed_work_queue(mld-&gt;wiphy, &amp;mld-&gt;ct_kill_exit_wk,</div><div class='add'>+				 round_jiffies_relative(IWL_MLD_CT_KILL_DURATION));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_exit_ctkill(struct wiphy *wiphy, struct wiphy_work *wk)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld;</div><div class='add'>+</div><div class='add'>+	mld = container_of(wk, struct iwl_mld, ct_kill_exit_wk.work);</div><div class='add'>+</div><div class='add'>+	IWL_ERR(mld, "Exit CT Kill\n");</div><div class='add'>+	iwl_mld_set_ctkill(mld, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_temp_notif(struct iwl_mld *mld, struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_dts_measurement_notif *notif =</div><div class='add'>+		(const void *)pkt-&gt;data;</div><div class='add'>+	int temp;</div><div class='add'>+	u32 ths_crossed;</div><div class='add'>+</div><div class='add'>+	temp = le32_to_cpu(notif-&gt;temp);</div><div class='add'>+</div><div class='add'>+	/* shouldn't be negative, but since it's s32, make sure it isn't */</div><div class='add'>+	if (IWL_FW_CHECK(mld, temp &lt; 0, "negative temperature %d\n", temp))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ths_crossed = le32_to_cpu(notif-&gt;threshold_idx);</div><div class='add'>+</div><div class='add'>+	/* 0xFF in ths_crossed means the notification is not related</div><div class='add'>+	 * to a trip, so we can ignore it here.</div><div class='add'>+	 */</div><div class='add'>+	if (ths_crossed == 0xFF)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_TEMP(mld, "Temp = %d Threshold crossed = %d\n",</div><div class='add'>+		       temp, ths_crossed);</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, ths_crossed &gt;= IWL_MAX_DTS_TRIPS,</div><div class='add'>+			 "bad threshold: %d\n", ths_crossed))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_THERMAL</div><div class='add'>+	if (mld-&gt;tzone)</div><div class='add'>+		thermal_zone_device_update(mld-&gt;tzone, THERMAL_TRIP_VIOLATED);</div><div class='add'>+#endif /* CONFIG_THERMAL */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_THERMAL</div><div class='add'>+static int iwl_mld_get_temp(struct iwl_mld *mld, s32 *temp)</div><div class='add'>+{</div><div class='add'>+	struct iwl_host_cmd cmd = {</div><div class='add'>+		.id = WIDE_ID(PHY_OPS_GROUP, CMD_DTS_MEASUREMENT_TRIGGER_WIDE),</div><div class='add'>+		.flags = CMD_WANT_SKB,</div><div class='add'>+	};</div><div class='add'>+	const struct iwl_dts_measurement_resp *resp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd(mld, &amp;cmd);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mld,</div><div class='add'>+			"Failed to send the temperature measurement command (err=%d)\n",</div><div class='add'>+			ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iwl_rx_packet_payload_len(cmd.resp_pkt) &lt; sizeof(*resp)) {</div><div class='add'>+		IWL_ERR(mld,</div><div class='add'>+			"Failed to get a valid response to DTS measurement\n");</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto free_resp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	resp = (const void *)cmd.resp_pkt-&gt;data;</div><div class='add'>+	*temp = le32_to_cpu(resp-&gt;temp);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_TEMP(mld,</div><div class='add'>+		       "Got temperature measurement response: temp=%d\n",</div><div class='add'>+		       *temp);</div><div class='add'>+</div><div class='add'>+free_resp:</div><div class='add'>+	iwl_free_resp(&amp;cmd);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int compare_temps(const void *a, const void *b)</div><div class='add'>+{</div><div class='add'>+	return ((s16)le16_to_cpu(*(const __le16 *)a) -</div><div class='add'>+		(s16)le16_to_cpu(*(const __le16 *)b));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct iwl_trip_walk_data {</div><div class='add'>+	__le16 *thresholds;</div><div class='add'>+	int count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int iwl_trip_temp_iter(struct thermal_trip *trip, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trip_walk_data *twd = arg;</div><div class='add'>+</div><div class='add'>+	if (trip-&gt;temperature == THERMAL_TEMP_INVALID)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	twd-&gt;thresholds[twd-&gt;count++] =</div><div class='add'>+		cpu_to_le16((s16)(trip-&gt;temperature / 1000));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int iwl_mld_config_temp_report_ths(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct temp_report_ths_cmd cmd = {0};</div><div class='add'>+	int ret;</div><div class='add'>+#ifdef CONFIG_THERMAL</div><div class='add'>+	struct iwl_trip_walk_data twd = {</div><div class='add'>+		.thresholds = cmd.thresholds,</div><div class='add'>+		.count = 0</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!mld-&gt;tzone)</div><div class='add'>+		goto send;</div><div class='add'>+</div><div class='add'>+	/* The thermal core holds an array of temperature trips that are</div><div class='add'>+	 * unsorted and uncompressed, the FW should get it compressed and</div><div class='add'>+	 * sorted.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* compress trips to cmd array, remove uninitialized values*/</div><div class='add'>+	for_each_thermal_trip(mld-&gt;tzone, iwl_trip_temp_iter, &amp;twd);</div><div class='add'>+</div><div class='add'>+	cmd.num_temps = cpu_to_le32(twd.count);</div><div class='add'>+	if (twd.count)</div><div class='add'>+		sort(cmd.thresholds, twd.count, sizeof(s16),</div><div class='add'>+		     compare_temps, NULL);</div><div class='add'>+</div><div class='add'>+send:</div><div class='add'>+#endif</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd_pdu(mld, WIDE_ID(PHY_OPS_GROUP,</div><div class='add'>+						TEMP_REPORTING_THRESHOLDS_CMD),</div><div class='add'>+				   &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mld, "TEMP_REPORT_THS_CMD command failed (err=%d)\n",</div><div class='add'>+			ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_THERMAL</div><div class='add'>+static int iwl_mld_tzone_get_temp(struct thermal_zone_device *device,</div><div class='add'>+				  int *temperature)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = thermal_zone_device_priv(device);</div><div class='add'>+	int temp;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	wiphy_lock(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!mld-&gt;fw_status.running) {</div><div class='add'>+		/* Tell the core that there is no valid temperature value to</div><div class='add'>+		 * return, but it need not worry about this.</div><div class='add'>+		 */</div><div class='add'>+		*temperature = THERMAL_TEMP_INVALID;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_get_temp(mld, &amp;temp);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	*temperature = temp * 1000;</div><div class='add'>+unlock:</div><div class='add'>+	wiphy_unlock(mld-&gt;wiphy);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_tzone_set_trip_temp(struct thermal_zone_device *device,</div><div class='add'>+				       const struct thermal_trip *trip,</div><div class='add'>+				       int temp)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = thermal_zone_device_priv(device);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	wiphy_lock(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!mld-&gt;fw_status.running) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((temp / 1000) &gt; S16_MAX) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_config_temp_report_ths(mld);</div><div class='add'>+unlock:</div><div class='add'>+	wiphy_unlock(mld-&gt;wiphy);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static  struct thermal_zone_device_ops tzone_ops = {</div><div class='add'>+	.get_temp = iwl_mld_tzone_get_temp,</div><div class='add'>+	.set_trip_temp = iwl_mld_tzone_set_trip_temp,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void iwl_mld_thermal_zone_register(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	char name[16];</div><div class='add'>+	static atomic_t counter = ATOMIC_INIT(0);</div><div class='add'>+	struct thermal_trip trips[IWL_MAX_DTS_TRIPS] = {</div><div class='add'>+		[0 ... IWL_MAX_DTS_TRIPS - 1] = {</div><div class='add'>+			.temperature = THERMAL_TEMP_INVALID,</div><div class='add'>+			.type = THERMAL_TRIP_PASSIVE,</div><div class='add'>+			.flags = THERMAL_TRIP_FLAG_RW_TEMP,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(name) &gt;= THERMAL_NAME_LENGTH);</div><div class='add'>+</div><div class='add'>+	sprintf(name, "iwlwifi_%u", atomic_inc_return(&amp;counter) &amp; 0xFF);</div><div class='add'>+	mld-&gt;tzone =</div><div class='add'>+		thermal_zone_device_register_with_trips(name, trips,</div><div class='add'>+							IWL_MAX_DTS_TRIPS,</div><div class='add'>+							mld, &amp;tzone_ops,</div><div class='add'>+							NULL, 0, 0);</div><div class='add'>+	if (IS_ERR(mld-&gt;tzone)) {</div><div class='add'>+		IWL_DEBUG_TEMP(mld,</div><div class='add'>+			       "Failed to register to thermal zone (err = %ld)\n",</div><div class='add'>+			       PTR_ERR(mld-&gt;tzone));</div><div class='add'>+		mld-&gt;tzone = NULL;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = thermal_zone_device_enable(mld-&gt;tzone);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_DEBUG_TEMP(mld, "Failed to enable thermal zone\n");</div><div class='add'>+		thermal_zone_device_unregister(mld-&gt;tzone);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_config_ctdp(struct iwl_mld *mld, u32 state,</div><div class='add'>+			enum iwl_ctdp_cmd_operation op)</div><div class='add'>+{</div><div class='add'>+	struct iwl_ctdp_cmd cmd = {</div><div class='add'>+		.operation = cpu_to_le32(op),</div><div class='add'>+		.window_size = 0,</div><div class='add'>+	};</div><div class='add'>+	u32 budget;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* Do a linear scale from IWL_MLD_MIN_CTDP_BUDGET_MW to the configured</div><div class='add'>+	 * maximum in the predefined number of steps.</div><div class='add'>+	 */</div><div class='add'>+	budget = ((mld-&gt;power_budget_mw - IWL_MLD_MIN_CTDP_BUDGET_MW) *</div><div class='add'>+		  (IWL_MLD_NUM_CTDP_STEPS - 1 - state)) /</div><div class='add'>+		 (IWL_MLD_NUM_CTDP_STEPS - 1) +</div><div class='add'>+		 IWL_MLD_MIN_CTDP_BUDGET_MW;</div><div class='add'>+	cmd.budget = cpu_to_le32(budget);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd_pdu(mld, WIDE_ID(PHY_OPS_GROUP, CTDP_CONFIG_CMD),</div><div class='add'>+				   &amp;cmd);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mld, "cTDP command failed (err=%d)\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (op == CTDP_CMD_OPERATION_START)</div><div class='add'>+		mld-&gt;cooling_dev.cur_state = state;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_tcool_get_max_state(struct thermal_cooling_device *cdev,</div><div class='add'>+				       unsigned long *state)</div><div class='add'>+{</div><div class='add'>+	*state = IWL_MLD_NUM_CTDP_STEPS - 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_tcool_get_cur_state(struct thermal_cooling_device *cdev,</div><div class='add'>+				       unsigned long *state)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = (struct iwl_mld *)(cdev-&gt;devdata);</div><div class='add'>+</div><div class='add'>+	*state = mld-&gt;cooling_dev.cur_state;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_tcool_set_cur_state(struct thermal_cooling_device *cdev,</div><div class='add'>+				       unsigned long new_state)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = (struct iwl_mld *)(cdev-&gt;devdata);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	wiphy_lock(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (!mld-&gt;fw_status.running) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (new_state &gt;= IWL_MLD_NUM_CTDP_STEPS) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_config_ctdp(mld, new_state, CTDP_CMD_OPERATION_START);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	wiphy_unlock(mld-&gt;wiphy);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct thermal_cooling_device_ops tcooling_ops = {</div><div class='add'>+	.get_max_state = iwl_mld_tcool_get_max_state,</div><div class='add'>+	.get_cur_state = iwl_mld_tcool_get_cur_state,</div><div class='add'>+	.set_cur_state = iwl_mld_tcool_set_cur_state,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void iwl_mld_cooling_device_register(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	char name[] = "iwlwifi";</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(name) &gt;= THERMAL_NAME_LENGTH);</div><div class='add'>+</div><div class='add'>+	mld-&gt;cooling_dev.cdev =</div><div class='add'>+		thermal_cooling_device_register(name,</div><div class='add'>+						mld,</div><div class='add'>+						&amp;tcooling_ops);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(mld-&gt;cooling_dev.cdev)) {</div><div class='add'>+		IWL_DEBUG_TEMP(mld,</div><div class='add'>+			       "Failed to register to cooling device (err = %ld)\n",</div><div class='add'>+			       PTR_ERR(mld-&gt;cooling_dev.cdev));</div><div class='add'>+		mld-&gt;cooling_dev.cdev = NULL;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_thermal_zone_unregister(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	if (!mld-&gt;tzone)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_TEMP(mld, "Thermal zone device unregister\n");</div><div class='add'>+	if (mld-&gt;tzone) {</div><div class='add'>+		thermal_zone_device_unregister(mld-&gt;tzone);</div><div class='add'>+		mld-&gt;tzone = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_cooling_device_unregister(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	if (!mld-&gt;cooling_dev.cdev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_TEMP(mld, "Cooling device unregister\n");</div><div class='add'>+	if (mld-&gt;cooling_dev.cdev) {</div><div class='add'>+		thermal_cooling_device_unregister(mld-&gt;cooling_dev.cdev);</div><div class='add'>+		mld-&gt;cooling_dev.cdev = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_THERMAL */</div><div class='add'>+</div><div class='add'>+static u32 iwl_mld_ctdp_get_max_budget(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	u64 bios_power_budget = 0;</div><div class='add'>+	u32 default_power_budget;</div><div class='add'>+</div><div class='add'>+	switch (CSR_HW_RFID_TYPE(mld-&gt;trans-&gt;info.hw_rf_id)) {</div><div class='add'>+	case IWL_CFG_RF_TYPE_GF:</div><div class='add'>+		/* dual-radio devices have a higher budget */</div><div class='add'>+		if (CSR_HW_RFID_IS_CDB(mld-&gt;trans-&gt;info.hw_rf_id))</div><div class='add'>+			default_power_budget = 5200;</div><div class='add'>+		else</div><div class='add'>+			default_power_budget = 2880;</div><div class='add'>+		break;</div><div class='add'>+	case IWL_CFG_RF_TYPE_FM:</div><div class='add'>+		default_power_budget = 3450;</div><div class='add'>+		break;</div><div class='add'>+	case IWL_CFG_RF_TYPE_WH:</div><div class='add'>+	case IWL_CFG_RF_TYPE_PE:</div><div class='add'>+	default:</div><div class='add'>+		default_power_budget = 5550;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_bios_get_pwr_limit(&amp;mld-&gt;fwrt, &amp;bios_power_budget);</div><div class='add'>+</div><div class='add'>+	/* 32bit in UEFI, 16bit in ACPI; use BIOS value if it is in range */</div><div class='add'>+	if (bios_power_budget &amp;&amp;</div><div class='add'>+	    bios_power_budget != 0xffff &amp;&amp; bios_power_budget != 0xffffffff &amp;&amp;</div><div class='add'>+	    bios_power_budget &gt;= IWL_MLD_MIN_CTDP_BUDGET_MW &amp;&amp;</div><div class='add'>+	    bios_power_budget &lt;= default_power_budget)</div><div class='add'>+		return (u32)bios_power_budget;</div><div class='add'>+</div><div class='add'>+	return default_power_budget;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_thermal_initialize(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_not_held(&amp;mld-&gt;wiphy-&gt;mtx);</div><div class='add'>+</div><div class='add'>+	wiphy_delayed_work_init(&amp;mld-&gt;ct_kill_exit_wk, iwl_mld_exit_ctkill);</div><div class='add'>+</div><div class='add'>+	mld-&gt;power_budget_mw = iwl_mld_ctdp_get_max_budget(mld);</div><div class='add'>+	IWL_DEBUG_TEMP(mld, "cTDP power budget: %d mW\n", mld-&gt;power_budget_mw);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_THERMAL</div><div class='add'>+	iwl_mld_cooling_device_register(mld);</div><div class='add'>+	iwl_mld_thermal_zone_register(mld);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_thermal_exit(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	wiphy_lock(mld-&gt;wiphy);</div><div class='add'>+	wiphy_delayed_work_cancel(mld-&gt;wiphy, &amp;mld-&gt;ct_kill_exit_wk);</div><div class='add'>+	wiphy_unlock(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_THERMAL</div><div class='add'>+	iwl_mld_cooling_device_unregister(mld);</div><div class='add'>+	iwl_mld_thermal_zone_unregister(mld);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/thermal.h b/drivers/net/wireless/intel/iwlwifi/mld/thermal.h<br/>new file mode 100644<br/>index 000000000000..8c8893331b05<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/thermal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/thermal.h</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_thermal_h__</div><div class='add'>+#define __iwl_mld_thermal_h__</div><div class='add'>+</div><div class='add'>+#include "iwl-trans.h"</div><div class='add'>+</div><div class='add'>+struct iwl_mld;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_THERMAL</div><div class='add'>+#include &lt;linux/thermal.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct iwl_mld_cooling_device</div><div class='add'>+ * @cur_state: current state</div><div class='add'>+ * @cdev: struct thermal cooling device</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_cooling_device {</div><div class='add'>+	u32 cur_state;</div><div class='add'>+	struct thermal_cooling_device *cdev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int iwl_mld_config_ctdp(struct iwl_mld *mld, u32 state,</div><div class='add'>+			enum iwl_ctdp_cmd_operation op);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_temp_notif(struct iwl_mld *mld, struct iwl_rx_packet *pkt);</div><div class='add'>+void iwl_mld_handle_ct_kill_notif(struct iwl_mld *mld,</div><div class='add'>+				  struct iwl_rx_packet *pkt);</div><div class='add'>+int iwl_mld_config_temp_report_ths(struct iwl_mld *mld);</div><div class='add'>+void iwl_mld_thermal_initialize(struct iwl_mld *mld);</div><div class='add'>+void iwl_mld_thermal_exit(struct iwl_mld *mld);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_thermal_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/time_sync.c b/drivers/net/wireless/intel/iwlwifi/mld/time_sync.c<br/>new file mode 100644<br/>index 000000000000..50799f9bfccb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/time_sync.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/time_sync.c</a></div><div class='hunk'>@@ -0,0 +1,240 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+#include "ptp.h"</div><div class='add'>+#include "time_sync.h"</div><div class='add'>+#include &lt;linux/ieee80211.h&gt;</div><div class='add'>+</div><div class='add'>+static int iwl_mld_init_time_sync(struct iwl_mld *mld, u32 protocols,</div><div class='add'>+				  const u8 *addr)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_time_sync_data *time_sync = kzalloc(sizeof(*time_sync),</div><div class='add'>+							   GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!time_sync)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	time_sync-&gt;active_protocols = protocols;</div><div class='add'>+	ether_addr_copy(time_sync-&gt;peer_addr, addr);</div><div class='add'>+	skb_queue_head_init(&amp;time_sync-&gt;frame_list);</div><div class='add'>+	rcu_assign_pointer(mld-&gt;time_sync, time_sync);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_time_sync_fw_config(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct iwl_time_sync_cfg_cmd cmd = {};</div><div class='add'>+	struct iwl_mld_time_sync_data *time_sync;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	time_sync = wiphy_dereference(mld-&gt;wiphy, mld-&gt;time_sync);</div><div class='add'>+	if (!time_sync)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cmd.protocols = cpu_to_le32(time_sync-&gt;active_protocols);</div><div class='add'>+	ether_addr_copy(cmd.peer_addr, time_sync-&gt;peer_addr);</div><div class='add'>+</div><div class='add'>+	err = iwl_mld_send_cmd_pdu(mld,</div><div class='add'>+				   WIDE_ID(DATA_PATH_GROUP,</div><div class='add'>+					   WNM_80211V_TIMING_MEASUREMENT_CONFIG_CMD),</div><div class='add'>+				   &amp;cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		IWL_ERR(mld, "Failed to send time sync cfg cmd: %d\n", err);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_time_sync_config(struct iwl_mld *mld, const u8 *addr, u32 protocols)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_time_sync_data *time_sync;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	time_sync = wiphy_dereference(mld-&gt;wiphy, mld-&gt;time_sync);</div><div class='add'>+</div><div class='add'>+	/* The fw only supports one peer. We do allow reconfiguration of the</div><div class='add'>+	 * same peer for cases of fw reset etc.</div><div class='add'>+	 */</div><div class='add'>+	if (time_sync &amp;&amp; time_sync-&gt;active_protocols &amp;&amp;</div><div class='add'>+	    !ether_addr_equal(addr, time_sync-&gt;peer_addr)) {</div><div class='add'>+		IWL_DEBUG_INFO(mld, "Time sync: reject config for peer: %pM\n",</div><div class='add'>+			       addr);</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (protocols &amp; ~(IWL_TIME_SYNC_PROTOCOL_TM |</div><div class='add'>+			  IWL_TIME_SYNC_PROTOCOL_FTM))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(mld, "Time sync: set peer addr=%pM\n", addr);</div><div class='add'>+</div><div class='add'>+	iwl_mld_deinit_time_sync(mld);</div><div class='add'>+	err = iwl_mld_init_time_sync(mld, protocols, addr);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = iwl_mld_time_sync_fw_config(mld);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_deinit_time_sync(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_time_sync_data *time_sync =</div><div class='add'>+		wiphy_dereference(mld-&gt;wiphy, mld-&gt;time_sync);</div><div class='add'>+</div><div class='add'>+	if (!time_sync)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	RCU_INIT_POINTER(mld-&gt;time_sync, NULL);</div><div class='add'>+	skb_queue_purge(&amp;time_sync-&gt;frame_list);</div><div class='add'>+	kfree_rcu(time_sync, rcu_head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool iwl_mld_time_sync_frame(struct iwl_mld *mld, struct sk_buff *skb, u8 *addr)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_time_sync_data *time_sync;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	time_sync = rcu_dereference(mld-&gt;time_sync);</div><div class='add'>+	if (time_sync &amp;&amp; ether_addr_equal(time_sync-&gt;peer_addr, addr) &amp;&amp;</div><div class='add'>+	    (ieee80211_is_timing_measurement(skb) || ieee80211_is_ftm(skb))) {</div><div class='add'>+		skb_queue_tail(&amp;time_sync-&gt;frame_list, skb);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mld_is_skb_match(struct sk_buff *skb, u8 *addr, u8 dialog_token)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_mgmt *mgmt = (void *)skb-&gt;data;</div><div class='add'>+	u8 skb_dialog_token;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_timing_measurement(skb))</div><div class='add'>+		skb_dialog_token = mgmt-&gt;u.action.u.wnm_timing_msr.dialog_token;</div><div class='add'>+	else</div><div class='add'>+		skb_dialog_token = mgmt-&gt;u.action.u.ftm.dialog_token;</div><div class='add'>+</div><div class='add'>+	if ((ether_addr_equal(mgmt-&gt;sa, addr) ||</div><div class='add'>+	     ether_addr_equal(mgmt-&gt;da, addr)) &amp;&amp;</div><div class='add'>+	    skb_dialog_token == dialog_token)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *iwl_mld_time_sync_find_skb(struct iwl_mld *mld, u8 *addr,</div><div class='add'>+						  u8 dialog_token)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_time_sync_data *time_sync;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	time_sync = rcu_dereference(mld-&gt;time_sync);</div><div class='add'>+	if (IWL_FW_CHECK(mld, !time_sync,</div><div class='add'>+			 "Time sync notification but time sync is not initialized\n")) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The notifications are expected to arrive in the same order of the</div><div class='add'>+	 * frames. If the incoming notification doesn't match the first SKB</div><div class='add'>+	 * in the queue, it means there was no time sync notification for this</div><div class='add'>+	 * SKB and it can be dropped.</div><div class='add'>+	 */</div><div class='add'>+	while ((skb = skb_dequeue(&amp;time_sync-&gt;frame_list))) {</div><div class='add'>+		if (iwl_mld_is_skb_match(skb, addr, dialog_token))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		skb = NULL;</div><div class='add'>+		IWL_DEBUG_DROP(mld,</div><div class='add'>+			       "Time sync: drop SKB without matching notification\n");</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 iwl_mld_get_64_bit(__le32 high, __le32 low)</div><div class='add'>+{</div><div class='add'>+	return ((u64)le32_to_cpu(high) &lt;&lt; 32) | le32_to_cpu(low);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_time_msmt_notif(struct iwl_mld *mld,</div><div class='add'>+				    struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	struct ptp_data *data = &amp;mld-&gt;ptp_data;</div><div class='add'>+	struct iwl_time_msmt_notify *notif = (void *)pkt-&gt;data;</div><div class='add'>+	struct ieee80211_rx_status *rx_status;</div><div class='add'>+	struct skb_shared_hwtstamps *shwt;</div><div class='add'>+	u64 ts_10ns;</div><div class='add'>+	struct sk_buff *skb =</div><div class='add'>+		iwl_mld_time_sync_find_skb(mld, notif-&gt;peer_addr,</div><div class='add'>+					   le32_to_cpu(notif-&gt;dialog_token));</div><div class='add'>+	u64 adj_time;</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, !skb, "Time sync event but no pending skb\n"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;data-&gt;lock);</div><div class='add'>+	ts_10ns = iwl_mld_get_64_bit(notif-&gt;t2_hi, notif-&gt;t2_lo);</div><div class='add'>+	adj_time = iwl_mld_ptp_get_adj_time(mld, ts_10ns * 10);</div><div class='add'>+	shwt = skb_hwtstamps(skb);</div><div class='add'>+	shwt-&gt;hwtstamp = ktime_set(0, adj_time);</div><div class='add'>+</div><div class='add'>+	ts_10ns = iwl_mld_get_64_bit(notif-&gt;t3_hi, notif-&gt;t3_lo);</div><div class='add'>+	adj_time = iwl_mld_ptp_get_adj_time(mld, ts_10ns * 10);</div><div class='add'>+	rx_status = IEEE80211_SKB_RXCB(skb);</div><div class='add'>+	rx_status-&gt;ack_tx_hwtstamp = ktime_set(0, adj_time);</div><div class='add'>+	spin_unlock_bh(&amp;data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(mld,</div><div class='add'>+		       "Time sync: RX event - report frame t2=%llu t3=%llu\n",</div><div class='add'>+		       ktime_to_ns(shwt-&gt;hwtstamp),</div><div class='add'>+		       ktime_to_ns(rx_status-&gt;ack_tx_hwtstamp));</div><div class='add'>+	ieee80211_rx_napi(mld-&gt;hw, NULL, skb, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_time_sync_confirm_notif(struct iwl_mld *mld,</div><div class='add'>+					    struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	struct ptp_data *data = &amp;mld-&gt;ptp_data;</div><div class='add'>+	struct iwl_time_msmt_cfm_notify *notif = (void *)pkt-&gt;data;</div><div class='add'>+	struct ieee80211_tx_status status = {};</div><div class='add'>+	struct skb_shared_hwtstamps *shwt;</div><div class='add'>+	u64 ts_10ns, adj_time;</div><div class='add'>+</div><div class='add'>+	status.skb =</div><div class='add'>+		iwl_mld_time_sync_find_skb(mld, notif-&gt;peer_addr,</div><div class='add'>+					   le32_to_cpu(notif-&gt;dialog_token));</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, !status.skb,</div><div class='add'>+			 "Time sync confirm but no pending skb\n"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;data-&gt;lock);</div><div class='add'>+	ts_10ns = iwl_mld_get_64_bit(notif-&gt;t1_hi, notif-&gt;t1_lo);</div><div class='add'>+	adj_time = iwl_mld_ptp_get_adj_time(mld, ts_10ns * 10);</div><div class='add'>+	shwt = skb_hwtstamps(status.skb);</div><div class='add'>+	shwt-&gt;hwtstamp = ktime_set(0, adj_time);</div><div class='add'>+</div><div class='add'>+	ts_10ns = iwl_mld_get_64_bit(notif-&gt;t4_hi, notif-&gt;t4_lo);</div><div class='add'>+	adj_time = iwl_mld_ptp_get_adj_time(mld, ts_10ns * 10);</div><div class='add'>+	status.info = IEEE80211_SKB_CB(status.skb);</div><div class='add'>+	status.ack_hwtstamp = ktime_set(0, adj_time);</div><div class='add'>+	spin_unlock_bh(&amp;data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(mld,</div><div class='add'>+		       "Time sync: TX event - report frame t1=%llu t4=%llu\n",</div><div class='add'>+		       ktime_to_ns(shwt-&gt;hwtstamp),</div><div class='add'>+		       ktime_to_ns(status.ack_hwtstamp));</div><div class='add'>+	ieee80211_tx_status_ext(mld-&gt;hw, &amp;status);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/time_sync.h b/drivers/net/wireless/intel/iwlwifi/mld/time_sync.h<br/>new file mode 100644<br/>index 000000000000..2d4c5512e961<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/time_sync.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/time_sync.h</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_time_sync_h__</div><div class='add'>+#define __iwl_mld_time_sync_h__</div><div class='add'>+</div><div class='add'>+struct iwl_mld_time_sync_data {</div><div class='add'>+	struct rcu_head rcu_head;</div><div class='add'>+	u8 peer_addr[ETH_ALEN];</div><div class='add'>+	u32 active_protocols;</div><div class='add'>+	struct sk_buff_head frame_list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int iwl_mld_time_sync_config(struct iwl_mld *mld, const u8 *addr,</div><div class='add'>+			     u32 protocols);</div><div class='add'>+int iwl_mld_time_sync_fw_config(struct iwl_mld *mld);</div><div class='add'>+void iwl_mld_deinit_time_sync(struct iwl_mld *mld);</div><div class='add'>+void iwl_mld_handle_time_msmt_notif(struct iwl_mld *mld,</div><div class='add'>+				    struct iwl_rx_packet *pkt);</div><div class='add'>+bool iwl_mld_time_sync_frame(struct iwl_mld *mld, struct sk_buff *skb,</div><div class='add'>+			     u8 *addr);</div><div class='add'>+void iwl_mld_handle_time_sync_confirm_notif(struct iwl_mld *mld,</div><div class='add'>+					    struct iwl_rx_packet *pkt);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_time_sync_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/tlc.c b/drivers/net/wireless/intel/iwlwifi/mld/tlc.c<br/>new file mode 100644<br/>index 000000000000..0e172281b0c8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/tlc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/tlc.c</a></div><div class='hunk'>@@ -0,0 +1,739 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "tlc.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+#include "sta.h"</div><div class='add'>+</div><div class='add'>+#include "fw/api/rs.h"</div><div class='add'>+#include "fw/api/context.h"</div><div class='add'>+#include "fw/api/dhc.h"</div><div class='add'>+</div><div class='add'>+static u8 iwl_mld_fw_bw_from_sta_bw(const struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	switch (link_sta-&gt;bandwidth) {</div><div class='add'>+	case IEEE80211_STA_RX_BW_320:</div><div class='add'>+		return IWL_TLC_MNG_CH_WIDTH_320MHZ;</div><div class='add'>+	case IEEE80211_STA_RX_BW_160:</div><div class='add'>+		return IWL_TLC_MNG_CH_WIDTH_160MHZ;</div><div class='add'>+	case IEEE80211_STA_RX_BW_80:</div><div class='add'>+		return IWL_TLC_MNG_CH_WIDTH_80MHZ;</div><div class='add'>+	case IEEE80211_STA_RX_BW_40:</div><div class='add'>+		return IWL_TLC_MNG_CH_WIDTH_40MHZ;</div><div class='add'>+	case IEEE80211_STA_RX_BW_20:</div><div class='add'>+	default:</div><div class='add'>+		return IWL_TLC_MNG_CH_WIDTH_20MHZ;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __le16</div><div class='add'>+iwl_mld_get_tlc_cmd_flags(struct iwl_mld *mld,</div><div class='add'>+			  struct ieee80211_vif *vif,</div><div class='add'>+			  struct ieee80211_link_sta *link_sta,</div><div class='add'>+			  const struct ieee80211_sta_he_cap *own_he_cap,</div><div class='add'>+			  const struct ieee80211_sta_eht_cap *own_eht_cap)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta_ht_cap *ht_cap = &amp;link_sta-&gt;ht_cap;</div><div class='add'>+	struct ieee80211_sta_vht_cap *vht_cap = &amp;link_sta-&gt;vht_cap;</div><div class='add'>+	struct ieee80211_sta_he_cap *he_cap = &amp;link_sta-&gt;he_cap;</div><div class='add'>+	bool has_vht = vht_cap-&gt;vht_supported;</div><div class='add'>+	u16 flags = 0;</div><div class='add'>+</div><div class='add'>+	/* STBC flags */</div><div class='add'>+	if (mld-&gt;cfg-&gt;ht_params.stbc &amp;&amp;</div><div class='add'>+	    (hweight8(iwl_mld_get_valid_tx_ant(mld)) &gt; 1)) {</div><div class='add'>+		if (he_cap-&gt;has_he &amp;&amp; he_cap-&gt;he_cap_elem.phy_cap_info[2] &amp;</div><div class='add'>+				      IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ)</div><div class='add'>+			flags |= IWL_TLC_MNG_CFG_FLAGS_STBC_MSK;</div><div class='add'>+		else if (vht_cap-&gt;cap &amp; IEEE80211_VHT_CAP_RXSTBC_MASK)</div><div class='add'>+			flags |= IWL_TLC_MNG_CFG_FLAGS_STBC_MSK;</div><div class='add'>+		else if (ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_RX_STBC)</div><div class='add'>+			flags |= IWL_TLC_MNG_CFG_FLAGS_STBC_MSK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* LDPC */</div><div class='add'>+	if (mld-&gt;cfg-&gt;ht_params.ldpc &amp;&amp;</div><div class='add'>+	    ((ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_LDPC_CODING) ||</div><div class='add'>+	     (has_vht &amp;&amp; (vht_cap-&gt;cap &amp; IEEE80211_VHT_CAP_RXLDPC))))</div><div class='add'>+		flags |= IWL_TLC_MNG_CFG_FLAGS_LDPC_MSK;</div><div class='add'>+</div><div class='add'>+	if (he_cap-&gt;has_he &amp;&amp; (he_cap-&gt;he_cap_elem.phy_cap_info[1] &amp;</div><div class='add'>+	    IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD))</div><div class='add'>+		flags |= IWL_TLC_MNG_CFG_FLAGS_LDPC_MSK;</div><div class='add'>+</div><div class='add'>+	if (own_he_cap &amp;&amp;</div><div class='add'>+	    !(own_he_cap-&gt;he_cap_elem.phy_cap_info[1] &amp;</div><div class='add'>+			IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD))</div><div class='add'>+		flags &amp;= ~IWL_TLC_MNG_CFG_FLAGS_LDPC_MSK;</div><div class='add'>+</div><div class='add'>+	/* DCM */</div><div class='add'>+	if (he_cap-&gt;has_he &amp;&amp;</div><div class='add'>+	    (he_cap-&gt;he_cap_elem.phy_cap_info[3] &amp;</div><div class='add'>+	     IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_MASK &amp;&amp;</div><div class='add'>+	     own_he_cap &amp;&amp;</div><div class='add'>+	     own_he_cap-&gt;he_cap_elem.phy_cap_info[3] &amp;</div><div class='add'>+			IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_MASK))</div><div class='add'>+		flags |= IWL_TLC_MNG_CFG_FLAGS_HE_DCM_NSS_1_MSK;</div><div class='add'>+</div><div class='add'>+	/* Extra EHT LTF */</div><div class='add'>+	if (own_eht_cap &amp;&amp;</div><div class='add'>+	    own_eht_cap-&gt;eht_cap_elem.phy_cap_info[5] &amp;</div><div class='add'>+		IEEE80211_EHT_PHY_CAP5_SUPP_EXTRA_EHT_LTF &amp;&amp;</div><div class='add'>+	    link_sta-&gt;eht_cap.has_eht &amp;&amp;</div><div class='add'>+	    link_sta-&gt;eht_cap.eht_cap_elem.phy_cap_info[5] &amp;</div><div class='add'>+	    IEEE80211_EHT_PHY_CAP5_SUPP_EXTRA_EHT_LTF) {</div><div class='add'>+		flags |= IWL_TLC_MNG_CFG_FLAGS_EHT_EXTRA_LTF_MSK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return cpu_to_le16(flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 iwl_mld_get_fw_chains(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	u8 chains = iwl_mld_get_valid_tx_ant(mld);</div><div class='add'>+	u8 fw_chains = 0;</div><div class='add'>+</div><div class='add'>+	if (chains &amp; ANT_A)</div><div class='add'>+		fw_chains |= IWL_TLC_MNG_CHAIN_A_MSK;</div><div class='add'>+	if (chains &amp; ANT_B)</div><div class='add'>+		fw_chains |= IWL_TLC_MNG_CHAIN_B_MSK;</div><div class='add'>+</div><div class='add'>+	return fw_chains;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 iwl_mld_get_fw_sgi(struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta_ht_cap *ht_cap = &amp;link_sta-&gt;ht_cap;</div><div class='add'>+	struct ieee80211_sta_vht_cap *vht_cap = &amp;link_sta-&gt;vht_cap;</div><div class='add'>+	struct ieee80211_sta_he_cap *he_cap = &amp;link_sta-&gt;he_cap;</div><div class='add'>+	u8 sgi_chwidths = 0;</div><div class='add'>+</div><div class='add'>+	/* If the association supports HE, HT/VHT rates will never be used for</div><div class='add'>+	 * Tx and therefor there's no need to set the</div><div class='add'>+	 * sgi-per-channel-width-support bits</div><div class='add'>+	 */</div><div class='add'>+	if (he_cap-&gt;has_he)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_SGI_20)</div><div class='add'>+		sgi_chwidths |= BIT(IWL_TLC_MNG_CH_WIDTH_20MHZ);</div><div class='add'>+	if (ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_SGI_40)</div><div class='add'>+		sgi_chwidths |= BIT(IWL_TLC_MNG_CH_WIDTH_40MHZ);</div><div class='add'>+	if (vht_cap-&gt;cap &amp; IEEE80211_VHT_CAP_SHORT_GI_80)</div><div class='add'>+		sgi_chwidths |= BIT(IWL_TLC_MNG_CH_WIDTH_80MHZ);</div><div class='add'>+	if (vht_cap-&gt;cap &amp; IEEE80211_VHT_CAP_SHORT_GI_160)</div><div class='add'>+		sgi_chwidths |= BIT(IWL_TLC_MNG_CH_WIDTH_160MHZ);</div><div class='add'>+</div><div class='add'>+	return sgi_chwidths;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_get_highest_fw_mcs(const struct ieee80211_sta_vht_cap *vht_cap,</div><div class='add'>+			   int nss)</div><div class='add'>+{</div><div class='add'>+	u16 rx_mcs = le16_to_cpu(vht_cap-&gt;vht_mcs.rx_mcs_map) &amp;</div><div class='add'>+		(0x3 &lt;&lt; (2 * (nss - 1)));</div><div class='add'>+	rx_mcs &gt;&gt;= (2 * (nss - 1));</div><div class='add'>+</div><div class='add'>+	switch (rx_mcs) {</div><div class='add'>+	case IEEE80211_VHT_MCS_SUPPORT_0_7:</div><div class='add'>+		return IWL_TLC_MNG_HT_RATE_MCS7;</div><div class='add'>+	case IEEE80211_VHT_MCS_SUPPORT_0_8:</div><div class='add'>+		return IWL_TLC_MNG_HT_RATE_MCS8;</div><div class='add'>+	case IEEE80211_VHT_MCS_SUPPORT_0_9:</div><div class='add'>+		return IWL_TLC_MNG_HT_RATE_MCS9;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_fill_vht_rates(const struct ieee80211_link_sta *link_sta,</div><div class='add'>+		       const struct ieee80211_sta_vht_cap *vht_cap,</div><div class='add'>+		       struct iwl_tlc_config_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	u32 supp;</div><div class='add'>+	int i, highest_mcs;</div><div class='add'>+	u8 max_nss = link_sta-&gt;rx_nss;</div><div class='add'>+	struct ieee80211_vht_cap ieee_vht_cap = {</div><div class='add'>+		.vht_cap_info = cpu_to_le32(vht_cap-&gt;cap),</div><div class='add'>+		.supp_mcs = vht_cap-&gt;vht_mcs,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* the station support only a single receive chain */</div><div class='add'>+	if (link_sta-&gt;smps_mode == IEEE80211_SMPS_STATIC)</div><div class='add'>+		max_nss = 1;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; max_nss &amp;&amp; i &lt; IWL_TLC_NSS_MAX; i++) {</div><div class='add'>+		int nss = i + 1;</div><div class='add'>+</div><div class='add'>+		highest_mcs = iwl_mld_get_highest_fw_mcs(vht_cap, nss);</div><div class='add'>+		if (!highest_mcs)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		supp = BIT(highest_mcs + 1) - 1;</div><div class='add'>+		if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_20)</div><div class='add'>+			supp &amp;= ~BIT(IWL_TLC_MNG_HT_RATE_MCS9);</div><div class='add'>+</div><div class='add'>+		cmd-&gt;ht_rates[i][IWL_TLC_MCS_PER_BW_80] = cpu_to_le32(supp);</div><div class='add'>+		/* Check if VHT extended NSS indicates that the bandwidth/NSS</div><div class='add'>+		 * configuration is supported - only for MCS 0 since we already</div><div class='add'>+		 * decoded the MCS bits anyway ourselves.</div><div class='add'>+		 */</div><div class='add'>+		if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_160 &amp;&amp;</div><div class='add'>+		    ieee80211_get_vht_max_nss(&amp;ieee_vht_cap,</div><div class='add'>+					      IEEE80211_VHT_CHANWIDTH_160MHZ,</div><div class='add'>+					      0, true, nss) &gt;= nss)</div><div class='add'>+			cmd-&gt;ht_rates[i][IWL_TLC_MCS_PER_BW_160] =</div><div class='add'>+				cmd-&gt;ht_rates[i][IWL_TLC_MCS_PER_BW_80];</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 iwl_mld_he_mac80211_mcs_to_fw_mcs(u16 mcs)</div><div class='add'>+{</div><div class='add'>+	switch (mcs) {</div><div class='add'>+	case IEEE80211_HE_MCS_SUPPORT_0_7:</div><div class='add'>+		return BIT(IWL_TLC_MNG_HT_RATE_MCS7 + 1) - 1;</div><div class='add'>+	case IEEE80211_HE_MCS_SUPPORT_0_9:</div><div class='add'>+		return BIT(IWL_TLC_MNG_HT_RATE_MCS9 + 1) - 1;</div><div class='add'>+	case IEEE80211_HE_MCS_SUPPORT_0_11:</div><div class='add'>+		return BIT(IWL_TLC_MNG_HT_RATE_MCS11 + 1) - 1;</div><div class='add'>+	case IEEE80211_HE_MCS_NOT_SUPPORTED:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN(1, "invalid HE MCS %d\n", mcs);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_fill_he_rates(const struct ieee80211_link_sta *link_sta,</div><div class='add'>+		      const struct ieee80211_sta_he_cap *own_he_cap,</div><div class='add'>+		      struct iwl_tlc_config_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_sta_he_cap *he_cap = &amp;link_sta-&gt;he_cap;</div><div class='add'>+	u16 mcs_160 = le16_to_cpu(he_cap-&gt;he_mcs_nss_supp.rx_mcs_160);</div><div class='add'>+	u16 mcs_80 = le16_to_cpu(he_cap-&gt;he_mcs_nss_supp.rx_mcs_80);</div><div class='add'>+	u16 tx_mcs_80 = le16_to_cpu(own_he_cap-&gt;he_mcs_nss_supp.tx_mcs_80);</div><div class='add'>+	u16 tx_mcs_160 = le16_to_cpu(own_he_cap-&gt;he_mcs_nss_supp.tx_mcs_160);</div><div class='add'>+	int i;</div><div class='add'>+	u8 nss = link_sta-&gt;rx_nss;</div><div class='add'>+</div><div class='add'>+	/* the station support only a single receive chain */</div><div class='add'>+	if (link_sta-&gt;smps_mode == IEEE80211_SMPS_STATIC)</div><div class='add'>+		nss = 1;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nss &amp;&amp; i &lt; IWL_TLC_NSS_MAX; i++) {</div><div class='add'>+		u16 _mcs_160 = (mcs_160 &gt;&gt; (2 * i)) &amp; 0x3;</div><div class='add'>+		u16 _mcs_80 = (mcs_80 &gt;&gt; (2 * i)) &amp; 0x3;</div><div class='add'>+		u16 _tx_mcs_160 = (tx_mcs_160 &gt;&gt; (2 * i)) &amp; 0x3;</div><div class='add'>+		u16 _tx_mcs_80 = (tx_mcs_80 &gt;&gt; (2 * i)) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+		/* If one side doesn't support - mark both as not supporting */</div><div class='add'>+		if (_mcs_80 == IEEE80211_HE_MCS_NOT_SUPPORTED ||</div><div class='add'>+		    _tx_mcs_80 == IEEE80211_HE_MCS_NOT_SUPPORTED) {</div><div class='add'>+			_mcs_80 = IEEE80211_HE_MCS_NOT_SUPPORTED;</div><div class='add'>+			_tx_mcs_80 = IEEE80211_HE_MCS_NOT_SUPPORTED;</div><div class='add'>+		}</div><div class='add'>+		if (_mcs_80 &gt; _tx_mcs_80)</div><div class='add'>+			_mcs_80 = _tx_mcs_80;</div><div class='add'>+		cmd-&gt;ht_rates[i][IWL_TLC_MCS_PER_BW_80] =</div><div class='add'>+			cpu_to_le32(iwl_mld_he_mac80211_mcs_to_fw_mcs(_mcs_80));</div><div class='add'>+</div><div class='add'>+		/* If one side doesn't support - mark both as not supporting */</div><div class='add'>+		if (_mcs_160 == IEEE80211_HE_MCS_NOT_SUPPORTED ||</div><div class='add'>+		    _tx_mcs_160 == IEEE80211_HE_MCS_NOT_SUPPORTED) {</div><div class='add'>+			_mcs_160 = IEEE80211_HE_MCS_NOT_SUPPORTED;</div><div class='add'>+			_tx_mcs_160 = IEEE80211_HE_MCS_NOT_SUPPORTED;</div><div class='add'>+		}</div><div class='add'>+		if (_mcs_160 &gt; _tx_mcs_160)</div><div class='add'>+			_mcs_160 = _tx_mcs_160;</div><div class='add'>+		cmd-&gt;ht_rates[i][IWL_TLC_MCS_PER_BW_160] =</div><div class='add'>+			cpu_to_le32(iwl_mld_he_mac80211_mcs_to_fw_mcs(_mcs_160));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_set_eht_mcs(__le32 ht_rates[][3],</div><div class='add'>+				enum IWL_TLC_MCS_PER_BW bw,</div><div class='add'>+				u8 max_nss, u32 mcs_msk)</div><div class='add'>+{</div><div class='add'>+	if (max_nss &gt;= 2)</div><div class='add'>+		ht_rates[IWL_TLC_NSS_2][bw] |= cpu_to_le32(mcs_msk);</div><div class='add'>+</div><div class='add'>+	if (max_nss &gt;= 1)</div><div class='add'>+		ht_rates[IWL_TLC_NSS_1][bw] |= cpu_to_le32(mcs_msk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const</div><div class='add'>+struct ieee80211_eht_mcs_nss_supp_bw *</div><div class='add'>+iwl_mld_get_eht_mcs_of_bw(enum IWL_TLC_MCS_PER_BW bw,</div><div class='add'>+			  const struct ieee80211_eht_mcs_nss_supp *eht_mcs)</div><div class='add'>+{</div><div class='add'>+	switch (bw) {</div><div class='add'>+	case IWL_TLC_MCS_PER_BW_80:</div><div class='add'>+		return &amp;eht_mcs-&gt;bw._80;</div><div class='add'>+	case IWL_TLC_MCS_PER_BW_160:</div><div class='add'>+		return &amp;eht_mcs-&gt;bw._160;</div><div class='add'>+	case IWL_TLC_MCS_PER_BW_320:</div><div class='add'>+		return &amp;eht_mcs-&gt;bw._320;</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 iwl_mld_get_eht_max_nss(u8 rx_nss, u8 tx_nss)</div><div class='add'>+{</div><div class='add'>+	u8 tx = u8_get_bits(tx_nss, IEEE80211_EHT_MCS_NSS_TX);</div><div class='add'>+	u8 rx = u8_get_bits(rx_nss, IEEE80211_EHT_MCS_NSS_RX);</div><div class='add'>+	/* the max nss that can be used,</div><div class='add'>+	 * is the min with our tx capa and the peer rx capa.</div><div class='add'>+	 */</div><div class='add'>+	return min(tx, rx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MAX_NSS_MCS(mcs_num, rx, tx) \</div><div class='add'>+	iwl_mld_get_eht_max_nss((rx)-&gt;rx_tx_mcs ##mcs_num## _max_nss, \</div><div class='add'>+				(tx)-&gt;rx_tx_mcs ##mcs_num## _max_nss)</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_fill_eht_rates(struct ieee80211_vif *vif,</div><div class='add'>+		       const struct ieee80211_link_sta *link_sta,</div><div class='add'>+		       const struct ieee80211_sta_he_cap *own_he_cap,</div><div class='add'>+		       const struct ieee80211_sta_eht_cap *own_eht_cap,</div><div class='add'>+		       struct iwl_tlc_config_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	/* peer RX mcs capa */</div><div class='add'>+	const struct ieee80211_eht_mcs_nss_supp *eht_rx_mcs =</div><div class='add'>+		&amp;link_sta-&gt;eht_cap.eht_mcs_nss_supp;</div><div class='add'>+	/* our TX mcs capa */</div><div class='add'>+	const struct ieee80211_eht_mcs_nss_supp *eht_tx_mcs =</div><div class='add'>+		&amp;own_eht_cap-&gt;eht_mcs_nss_supp;</div><div class='add'>+</div><div class='add'>+	enum IWL_TLC_MCS_PER_BW bw;</div><div class='add'>+	struct ieee80211_eht_mcs_nss_supp_20mhz_only mcs_rx_20;</div><div class='add'>+	struct ieee80211_eht_mcs_nss_supp_20mhz_only mcs_tx_20;</div><div class='add'>+</div><div class='add'>+	/* peer is 20 MHz only */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+	    !(link_sta-&gt;he_cap.he_cap_elem.phy_cap_info[0] &amp;</div><div class='add'>+	      IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_MASK_ALL)) {</div><div class='add'>+		mcs_rx_20 = eht_rx_mcs-&gt;only_20mhz;</div><div class='add'>+	} else {</div><div class='add'>+		mcs_rx_20.rx_tx_mcs7_max_nss =</div><div class='add'>+			eht_rx_mcs-&gt;bw._80.rx_tx_mcs9_max_nss;</div><div class='add'>+		mcs_rx_20.rx_tx_mcs9_max_nss =</div><div class='add'>+			eht_rx_mcs-&gt;bw._80.rx_tx_mcs9_max_nss;</div><div class='add'>+		mcs_rx_20.rx_tx_mcs11_max_nss =</div><div class='add'>+			eht_rx_mcs-&gt;bw._80.rx_tx_mcs11_max_nss;</div><div class='add'>+		mcs_rx_20.rx_tx_mcs13_max_nss =</div><div class='add'>+			eht_rx_mcs-&gt;bw._80.rx_tx_mcs13_max_nss;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* NIC is capable of 20 MHz only */</div><div class='add'>+	if (!(own_he_cap-&gt;he_cap_elem.phy_cap_info[0] &amp;</div><div class='add'>+	      IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_MASK_ALL)) {</div><div class='add'>+		mcs_tx_20 = eht_tx_mcs-&gt;only_20mhz;</div><div class='add'>+	} else {</div><div class='add'>+		mcs_tx_20.rx_tx_mcs7_max_nss =</div><div class='add'>+			eht_tx_mcs-&gt;bw._80.rx_tx_mcs9_max_nss;</div><div class='add'>+		mcs_tx_20.rx_tx_mcs9_max_nss =</div><div class='add'>+			eht_tx_mcs-&gt;bw._80.rx_tx_mcs9_max_nss;</div><div class='add'>+		mcs_tx_20.rx_tx_mcs11_max_nss =</div><div class='add'>+			eht_tx_mcs-&gt;bw._80.rx_tx_mcs11_max_nss;</div><div class='add'>+		mcs_tx_20.rx_tx_mcs13_max_nss =</div><div class='add'>+			eht_tx_mcs-&gt;bw._80.rx_tx_mcs13_max_nss;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* rates for 20/40/80 MHz */</div><div class='add'>+	bw = IWL_TLC_MCS_PER_BW_80;</div><div class='add'>+	iwl_mld_set_eht_mcs(cmd-&gt;ht_rates, bw,</div><div class='add'>+			    MAX_NSS_MCS(7, &amp;mcs_rx_20, &amp;mcs_tx_20),</div><div class='add'>+			    GENMASK(7, 0));</div><div class='add'>+	iwl_mld_set_eht_mcs(cmd-&gt;ht_rates, bw,</div><div class='add'>+			    MAX_NSS_MCS(9, &amp;mcs_rx_20, &amp;mcs_tx_20),</div><div class='add'>+			    GENMASK(9, 8));</div><div class='add'>+	iwl_mld_set_eht_mcs(cmd-&gt;ht_rates, bw,</div><div class='add'>+			    MAX_NSS_MCS(11, &amp;mcs_rx_20, &amp;mcs_tx_20),</div><div class='add'>+			    GENMASK(11, 10));</div><div class='add'>+	iwl_mld_set_eht_mcs(cmd-&gt;ht_rates, bw,</div><div class='add'>+			    MAX_NSS_MCS(13, &amp;mcs_rx_20, &amp;mcs_tx_20),</div><div class='add'>+			    GENMASK(13, 12));</div><div class='add'>+</div><div class='add'>+	/* rates for 160/320 MHz */</div><div class='add'>+	for (bw = IWL_TLC_MCS_PER_BW_160; bw &lt;= IWL_TLC_MCS_PER_BW_320; bw++) {</div><div class='add'>+		const struct ieee80211_eht_mcs_nss_supp_bw *mcs_rx =</div><div class='add'>+			iwl_mld_get_eht_mcs_of_bw(bw, eht_rx_mcs);</div><div class='add'>+		const struct ieee80211_eht_mcs_nss_supp_bw *mcs_tx =</div><div class='add'>+			iwl_mld_get_eht_mcs_of_bw(bw, eht_tx_mcs);</div><div class='add'>+</div><div class='add'>+		/* got unsupported index for bw */</div><div class='add'>+		if (!mcs_rx || !mcs_tx)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* break out if we don't support the bandwidth */</div><div class='add'>+		if (cmd-&gt;max_ch_width &lt; (bw + IWL_TLC_MNG_CH_WIDTH_80MHZ))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		iwl_mld_set_eht_mcs(cmd-&gt;ht_rates, bw,</div><div class='add'>+				    MAX_NSS_MCS(9, mcs_rx, mcs_tx),</div><div class='add'>+				    GENMASK(9, 0));</div><div class='add'>+		iwl_mld_set_eht_mcs(cmd-&gt;ht_rates, bw,</div><div class='add'>+				    MAX_NSS_MCS(11, mcs_rx, mcs_tx),</div><div class='add'>+				    GENMASK(11, 10));</div><div class='add'>+		iwl_mld_set_eht_mcs(cmd-&gt;ht_rates, bw,</div><div class='add'>+				    MAX_NSS_MCS(13, mcs_rx, mcs_tx),</div><div class='add'>+				    GENMASK(13, 12));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* the station support only a single receive chain */</div><div class='add'>+	if (link_sta-&gt;smps_mode == IEEE80211_SMPS_STATIC ||</div><div class='add'>+	    link_sta-&gt;rx_nss &lt; 2)</div><div class='add'>+		memset(cmd-&gt;ht_rates[IWL_TLC_NSS_2], 0,</div><div class='add'>+		       sizeof(cmd-&gt;ht_rates[IWL_TLC_NSS_2]));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_fill_supp_rates(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_link_sta *link_sta,</div><div class='add'>+			struct ieee80211_supported_band *sband,</div><div class='add'>+			const struct ieee80211_sta_he_cap *own_he_cap,</div><div class='add'>+			const struct ieee80211_sta_eht_cap *own_eht_cap,</div><div class='add'>+			struct iwl_tlc_config_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u16 non_ht_rates = 0;</div><div class='add'>+	unsigned long rates_bitmap;</div><div class='add'>+	const struct ieee80211_sta_ht_cap *ht_cap = &amp;link_sta-&gt;ht_cap;</div><div class='add'>+	const struct ieee80211_sta_vht_cap *vht_cap = &amp;link_sta-&gt;vht_cap;</div><div class='add'>+	const struct ieee80211_sta_he_cap *he_cap = &amp;link_sta-&gt;he_cap;</div><div class='add'>+</div><div class='add'>+	/* non HT rates */</div><div class='add'>+	rates_bitmap = link_sta-&gt;supp_rates[sband-&gt;band];</div><div class='add'>+	for_each_set_bit(i, &amp;rates_bitmap, BITS_PER_LONG)</div><div class='add'>+		non_ht_rates |= BIT(sband-&gt;bitrates[i].hw_value);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;non_ht_rates = cpu_to_le16(non_ht_rates);</div><div class='add'>+	cmd-&gt;mode = IWL_TLC_MNG_MODE_NON_HT;</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;eht_cap.has_eht &amp;&amp; own_he_cap &amp;&amp; own_eht_cap) {</div><div class='add'>+		cmd-&gt;mode = IWL_TLC_MNG_MODE_EHT;</div><div class='add'>+		iwl_mld_fill_eht_rates(vif, link_sta, own_he_cap,</div><div class='add'>+				       own_eht_cap, cmd);</div><div class='add'>+	} else if (he_cap-&gt;has_he &amp;&amp; own_he_cap) {</div><div class='add'>+		cmd-&gt;mode = IWL_TLC_MNG_MODE_HE;</div><div class='add'>+		iwl_mld_fill_he_rates(link_sta, own_he_cap, cmd);</div><div class='add'>+	} else if (vht_cap-&gt;vht_supported) {</div><div class='add'>+		cmd-&gt;mode = IWL_TLC_MNG_MODE_VHT;</div><div class='add'>+		iwl_mld_fill_vht_rates(link_sta, vht_cap, cmd);</div><div class='add'>+	} else if (ht_cap-&gt;ht_supported) {</div><div class='add'>+		cmd-&gt;mode = IWL_TLC_MNG_MODE_HT;</div><div class='add'>+		cmd-&gt;ht_rates[IWL_TLC_NSS_1][IWL_TLC_MCS_PER_BW_80] =</div><div class='add'>+			cpu_to_le32(ht_cap-&gt;mcs.rx_mask[0]);</div><div class='add'>+</div><div class='add'>+		/* the station support only a single receive chain */</div><div class='add'>+		if (link_sta-&gt;smps_mode == IEEE80211_SMPS_STATIC)</div><div class='add'>+			cmd-&gt;ht_rates[IWL_TLC_NSS_2][IWL_TLC_MCS_PER_BW_80] =</div><div class='add'>+				0;</div><div class='add'>+		else</div><div class='add'>+			cmd-&gt;ht_rates[IWL_TLC_NSS_2][IWL_TLC_MCS_PER_BW_80] =</div><div class='add'>+				cpu_to_le32(ht_cap-&gt;mcs.rx_mask[1]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_convert_tlc_cmd_to_v4(struct iwl_tlc_config_cmd *cmd,</div><div class='add'>+					  struct iwl_tlc_config_cmd_v4 *cmd_v4)</div><div class='add'>+{</div><div class='add'>+	/* Copy everything until ht_rates */</div><div class='add'>+	memcpy(cmd_v4, cmd, offsetof(struct iwl_tlc_config_cmd, ht_rates));</div><div class='add'>+</div><div class='add'>+	/* Convert ht_rates from __le32 to __le16 */</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(cmd_v4-&gt;ht_rates) != ARRAY_SIZE(cmd-&gt;ht_rates));</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(cmd_v4-&gt;ht_rates[0]) != ARRAY_SIZE(cmd-&gt;ht_rates[0]));</div><div class='add'>+</div><div class='add'>+	for (int nss = 0; nss &lt; ARRAY_SIZE(cmd-&gt;ht_rates); nss++)</div><div class='add'>+		for (int bw = 0; bw &lt; ARRAY_SIZE(cmd-&gt;ht_rates[nss]); bw++)</div><div class='add'>+			cmd_v4-&gt;ht_rates[nss][bw] =</div><div class='add'>+				cpu_to_le16(le32_to_cpu(cmd-&gt;ht_rates[nss][bw]));</div><div class='add'>+</div><div class='add'>+	/* Copy the rest */</div><div class='add'>+	cmd_v4-&gt;max_mpdu_len = cmd-&gt;max_mpdu_len;</div><div class='add'>+	cmd_v4-&gt;max_tx_op = cmd-&gt;max_tx_op;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_send_tlc_cmd(struct iwl_mld *mld,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_link_sta *link_sta,</div><div class='add'>+				 enum nl80211_band band)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(link_sta-&gt;sta);</div><div class='add'>+	struct ieee80211_supported_band *sband = mld-&gt;hw-&gt;wiphy-&gt;bands[band];</div><div class='add'>+	const struct ieee80211_sta_he_cap *own_he_cap =</div><div class='add'>+		ieee80211_get_he_iftype_cap_vif(sband, vif);</div><div class='add'>+	const struct ieee80211_sta_eht_cap *own_eht_cap =</div><div class='add'>+		ieee80211_get_eht_iftype_cap_vif(sband, vif);</div><div class='add'>+	struct iwl_tlc_config_cmd cmd = {</div><div class='add'>+		/* For AP mode, use 20 MHz until the STA is authorized */</div><div class='add'>+		.max_ch_width = mld_sta-&gt;sta_state &gt; IEEE80211_STA_ASSOC ?</div><div class='add'>+			iwl_mld_fw_bw_from_sta_bw(link_sta) :</div><div class='add'>+			IWL_TLC_MNG_CH_WIDTH_20MHZ,</div><div class='add'>+		.flags = iwl_mld_get_tlc_cmd_flags(mld, vif, link_sta,</div><div class='add'>+						   own_he_cap, own_eht_cap),</div><div class='add'>+		.chains = iwl_mld_get_fw_chains(mld),</div><div class='add'>+		.sgi_ch_width_supp = iwl_mld_get_fw_sgi(link_sta),</div><div class='add'>+		.max_mpdu_len = cpu_to_le16(link_sta-&gt;agg.max_amsdu_len),</div><div class='add'>+	};</div><div class='add'>+	int fw_sta_id = iwl_mld_fw_sta_id_from_link_sta(mld, link_sta);</div><div class='add'>+	u32 cmd_id = WIDE_ID(DATA_PATH_GROUP, TLC_MNG_CONFIG_CMD);</div><div class='add'>+	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mld-&gt;fw, cmd_id, 0);</div><div class='add'>+	struct iwl_tlc_config_cmd_v4 cmd_v4;</div><div class='add'>+	void *cmd_ptr;</div><div class='add'>+	u8 cmd_size;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (fw_sta_id &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cmd.sta_id = fw_sta_id;</div><div class='add'>+</div><div class='add'>+	iwl_mld_fill_supp_rates(mld, vif, link_sta, sband,</div><div class='add'>+				own_he_cap, own_eht_cap,</div><div class='add'>+				&amp;cmd);</div><div class='add'>+</div><div class='add'>+	if (cmd_ver == 5) {</div><div class='add'>+		cmd_ptr = &amp;cmd;</div><div class='add'>+		cmd_size = sizeof(cmd);</div><div class='add'>+	} else if (cmd_ver == 4) {</div><div class='add'>+		iwl_mld_convert_tlc_cmd_to_v4(&amp;cmd, &amp;cmd_v4);</div><div class='add'>+		cmd_ptr = &amp;cmd_v4;</div><div class='add'>+		cmd_size = sizeof(cmd_v4);</div><div class='add'>+	} else {</div><div class='add'>+		IWL_ERR(mld, "Unsupported TLC config cmd version %d\n",</div><div class='add'>+			cmd_ver);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_RATE(mld,</div><div class='add'>+		       "TLC CONFIG CMD, sta_id=%d, max_ch_width=%d, mode=%d\n",</div><div class='add'>+		       cmd.sta_id, cmd.max_ch_width, cmd.mode);</div><div class='add'>+</div><div class='add'>+	/* Send async since this can be called within a RCU-read section */</div><div class='add'>+	ret = iwl_mld_send_cmd_with_flags_pdu(mld, cmd_id, CMD_ASYNC, cmd_ptr,</div><div class='add'>+					      cmd_size);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mld, "Failed to send TLC cmd (%d)\n", ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_send_tlc_dhc(struct iwl_mld *mld, u8 sta_id, u32 type, u32 data)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		struct iwl_dhc_cmd dhc;</div><div class='add'>+		struct iwl_dhc_tlc_cmd tlc;</div><div class='add'>+	} __packed cmd = {</div><div class='add'>+		.tlc.sta_id = sta_id,</div><div class='add'>+		.tlc.type = cpu_to_le32(type),</div><div class='add'>+		.tlc.data[0] = cpu_to_le32(data),</div><div class='add'>+		.dhc.length = cpu_to_le32(sizeof(cmd.tlc) &gt;&gt; 2),</div><div class='add'>+		.dhc.index_and_mask =</div><div class='add'>+			cpu_to_le32(DHC_TABLE_INTEGRATION | DHC_TARGET_UMAC |</div><div class='add'>+				    DHC_INTEGRATION_TLC_DEBUG_CONFIG),</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd_with_flags_pdu(mld,</div><div class='add'>+					      WIDE_ID(IWL_ALWAYS_LONG_GROUP,</div><div class='add'>+						      DEBUG_HOST_COMMAND),</div><div class='add'>+					      CMD_ASYNC, &amp;cmd);</div><div class='add'>+	IWL_DEBUG_RATE(mld, "sta_id %d, type: 0x%X, value: 0x%X, ret%d\n",</div><div class='add'>+		       sta_id, type, data, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_config_tlc_link(struct iwl_mld *mld,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			     struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(link_sta-&gt;sta);</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!link_conf-&gt;chanreq.oper.chan))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Before we have information about a station, configure the A-MSDU RC</div><div class='add'>+	 * limit such that iwlmd and mac80211 would not be allowed to build</div><div class='add'>+	 * A-MSDUs.</div><div class='add'>+	 */</div><div class='add'>+	if (mld_sta-&gt;sta_state &lt; IEEE80211_STA_ASSOC) {</div><div class='add'>+		link_sta-&gt;agg.max_rc_amsdu_len = 1;</div><div class='add'>+		ieee80211_sta_recalc_aggregates(link_sta-&gt;sta);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	band = link_conf-&gt;chanreq.oper.chan-&gt;band;</div><div class='add'>+	iwl_mld_send_tlc_cmd(mld, vif, link_sta, band);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_config_tlc(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_bss_conf *link;</div><div class='add'>+	int link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	for_each_vif_active_link(vif, link, link_id) {</div><div class='add'>+		struct ieee80211_link_sta *link_sta =</div><div class='add'>+			link_sta_dereference_check(sta, link_id);</div><div class='add'>+</div><div class='add'>+		if (!link || !link_sta)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		iwl_mld_config_tlc_link(mld, vif, link, link_sta);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16</div><div class='add'>+iwl_mld_get_amsdu_size_of_tid(struct iwl_mld *mld,</div><div class='add'>+			      struct ieee80211_link_sta *link_sta,</div><div class='add'>+			      unsigned int tid)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = link_sta-&gt;sta;</div><div class='add'>+	struct ieee80211_vif *vif = iwl_mld_sta_from_mac80211(sta)-&gt;vif;</div><div class='add'>+	const u8 tid_to_mac80211_ac[] = {</div><div class='add'>+		IEEE80211_AC_BE,</div><div class='add'>+		IEEE80211_AC_BK,</div><div class='add'>+		IEEE80211_AC_BK,</div><div class='add'>+		IEEE80211_AC_BE,</div><div class='add'>+		IEEE80211_AC_VI,</div><div class='add'>+		IEEE80211_AC_VI,</div><div class='add'>+		IEEE80211_AC_VO,</div><div class='add'>+		IEEE80211_AC_VO,</div><div class='add'>+	};</div><div class='add'>+	unsigned int result = link_sta-&gt;agg.max_rc_amsdu_len;</div><div class='add'>+	u8 ac, txf, lmac;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* Don't send an AMSDU that will be longer than the TXF.</div><div class='add'>+	 * Add a security margin of 256 for the TX command + headers.</div><div class='add'>+	 * We also want to have the start of the next packet inside the</div><div class='add'>+	 * fifo to be able to send bursts.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(tid &gt;= ARRAY_SIZE(tid_to_mac80211_ac)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ac = tid_to_mac80211_ac[tid];</div><div class='add'>+</div><div class='add'>+	/* For HE redirect to trigger based fifos */</div><div class='add'>+	if (link_sta-&gt;he_cap.has_he)</div><div class='add'>+		ac += 4;</div><div class='add'>+</div><div class='add'>+	txf = iwl_mld_mac80211_ac_to_fw_tx_fifo(ac);</div><div class='add'>+</div><div class='add'>+	/* Only one link: take the lmac according to the band */</div><div class='add'>+	if (hweight16(sta-&gt;valid_links) &lt;= 1) {</div><div class='add'>+		enum nl80211_band band;</div><div class='add'>+		struct ieee80211_bss_conf *link =</div><div class='add'>+			wiphy_dereference(mld-&gt;wiphy,</div><div class='add'>+					  vif-&gt;link_conf[link_sta-&gt;link_id]);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!link || !link-&gt;chanreq.oper.chan))</div><div class='add'>+			band = NL80211_BAND_2GHZ;</div><div class='add'>+		else</div><div class='add'>+			band = link-&gt;chanreq.oper.chan-&gt;band;</div><div class='add'>+		lmac = iwl_mld_get_lmac_id(mld, band);</div><div class='add'>+</div><div class='add'>+	/* More than one link but with 2 lmacs: take the minimum */</div><div class='add'>+	} else if (fw_has_capa(&amp;mld-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			       IWL_UCODE_TLV_CAPA_CDB_SUPPORT)) {</div><div class='add'>+		lmac = IWL_LMAC_5G_INDEX;</div><div class='add'>+		result = min_t(unsigned int, result,</div><div class='add'>+			       mld-&gt;fwrt.smem_cfg.lmac[lmac].txfifo_size[txf] - 256);</div><div class='add'>+		lmac = IWL_LMAC_24G_INDEX;</div><div class='add'>+	/* More than one link but only one lmac */</div><div class='add'>+	} else {</div><div class='add'>+		lmac = IWL_LMAC_24G_INDEX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return min_t(unsigned int, result,</div><div class='add'>+		     mld-&gt;fwrt.smem_cfg.lmac[lmac].txfifo_size[txf] - 256);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_tlc_notif(struct iwl_mld *mld,</div><div class='add'>+			      struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_tlc_update_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	u32 flags = le32_to_cpu(notif-&gt;flags);</div><div class='add'>+	u32 enabled;</div><div class='add'>+	u16 size;</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, notif-&gt;sta_id &gt;= mld-&gt;fw-&gt;ucode_capa.num_stations,</div><div class='add'>+			 "Invalid sta id (%d) in TLC notification\n",</div><div class='add'>+			 notif-&gt;sta_id))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	link_sta = wiphy_dereference(mld-&gt;wiphy,</div><div class='add'>+				     mld-&gt;fw_id_to_link_sta[notif-&gt;sta_id]);</div><div class='add'>+</div><div class='add'>+	if (WARN(IS_ERR_OR_NULL(link_sta),</div><div class='add'>+		 "link_sta of sta id (%d) doesn't exist\n", notif-&gt;sta_id))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; IWL_TLC_NOTIF_FLAG_RATE) {</div><div class='add'>+		struct iwl_mld_link_sta *mld_link_sta =</div><div class='add'>+			iwl_mld_link_sta_from_mac80211(link_sta);</div><div class='add'>+		char pretty_rate[100];</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!mld_link_sta))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		mld_link_sta-&gt;last_rate_n_flags =</div><div class='add'>+			iwl_v3_rate_from_v2_v3(notif-&gt;rate,</div><div class='add'>+					       mld-&gt;fw_rates_ver_3);</div><div class='add'>+</div><div class='add'>+		rs_pretty_print_rate(pretty_rate, sizeof(pretty_rate),</div><div class='add'>+				     mld_link_sta-&gt;last_rate_n_flags);</div><div class='add'>+		IWL_DEBUG_RATE(mld, "TLC notif: new rate = %s\n", pretty_rate);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We are done processing the notif */</div><div class='add'>+	if (!(flags &amp; IWL_TLC_NOTIF_FLAG_AMSDU))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	enabled = le32_to_cpu(notif-&gt;amsdu_enabled);</div><div class='add'>+	size = le32_to_cpu(notif-&gt;amsdu_size);</div><div class='add'>+</div><div class='add'>+	if (size &lt; 2000) {</div><div class='add'>+		size = 0;</div><div class='add'>+		enabled = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, size &gt; link_sta-&gt;agg.max_amsdu_len,</div><div class='add'>+			 "Invalid AMSDU len in TLC notif: %d (Max AMSDU len: %d)\n",</div><div class='add'>+			 size, link_sta-&gt;agg.max_amsdu_len))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	link_sta-&gt;agg.max_rc_amsdu_len = size;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; IWL_MAX_TID_COUNT; i++) {</div><div class='add'>+		if (enabled &amp; BIT(i))</div><div class='add'>+			link_sta-&gt;agg.max_tid_amsdu_len[i] =</div><div class='add'>+				iwl_mld_get_amsdu_size_of_tid(mld, link_sta, i);</div><div class='add'>+		else</div><div class='add'>+			link_sta-&gt;agg.max_tid_amsdu_len[i] = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ieee80211_sta_recalc_aggregates(link_sta-&gt;sta);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_RATE(mld,</div><div class='add'>+		       "AMSDU update. AMSDU size: %d, AMSDU selected size: %d, AMSDU TID bitmap 0x%X\n",</div><div class='add'>+		       le32_to_cpu(notif-&gt;amsdu_size), size, enabled);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/tlc.h b/drivers/net/wireless/intel/iwlwifi/mld/tlc.h<br/>new file mode 100644<br/>index 000000000000..c32f42e8840b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/tlc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/tlc.h</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_tlc_h__</div><div class='add'>+#define __iwl_mld_tlc_h__</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+</div><div class='add'>+void iwl_mld_config_tlc_link(struct iwl_mld *mld,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			     struct ieee80211_link_sta *link_sta);</div><div class='add'>+</div><div class='add'>+void iwl_mld_config_tlc(struct iwl_mld *mld, struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_sta *sta);</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_tlc_notif(struct iwl_mld *mld,</div><div class='add'>+			      struct iwl_rx_packet *pkt);</div><div class='add'>+</div><div class='add'>+int iwl_mld_send_tlc_dhc(struct iwl_mld *mld, u8 sta_id, u32 type, u32 data);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_tlc_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/tx.c b/drivers/net/wireless/intel/iwlwifi/mld/tx.c<br/>new file mode 100644<br/>index 000000000000..3b4b575aadaa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/tx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/tx.c</a></div><div class='hunk'>@@ -0,0 +1,1394 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 - 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;net/ip.h&gt;</div><div class='add'>+</div><div class='add'>+#include "tx.h"</div><div class='add'>+#include "sta.h"</div><div class='add'>+#include "hcmd.h"</div><div class='add'>+#include "iwl-utils.h"</div><div class='add'>+#include "iface.h"</div><div class='add'>+</div><div class='add'>+#include "fw/dbg.h"</div><div class='add'>+</div><div class='add'>+#include "fw/api/tx.h"</div><div class='add'>+#include "fw/api/rs.h"</div><div class='add'>+#include "fw/api/txq.h"</div><div class='add'>+#include "fw/api/datapath.h"</div><div class='add'>+#include "fw/api/time-event.h"</div><div class='add'>+</div><div class='add'>+#define MAX_ANT_NUM 2</div><div class='add'>+</div><div class='add'>+/* Toggles between TX antennas. Receives the bitmask of valid TX antennas and</div><div class='add'>+ * the *index* used for the last TX, and returns the next valid *index* to use.</div><div class='add'>+ * In order to set it in the tx_cmd, must do BIT(idx).</div><div class='add'>+ */</div><div class='add'>+static u8 iwl_mld_next_ant(u8 valid, u8 last_idx)</div><div class='add'>+{</div><div class='add'>+	u8 index = last_idx;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; MAX_ANT_NUM; i++) {</div><div class='add'>+		index = (index + 1) % MAX_ANT_NUM;</div><div class='add'>+		if (valid &amp; BIT(index))</div><div class='add'>+			return index;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ONCE(1, "Failed to toggle between antennas 0x%x", valid);</div><div class='add'>+</div><div class='add'>+	return last_idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_toggle_tx_ant(struct iwl_mld *mld, u8 *ant)</div><div class='add'>+{</div><div class='add'>+	*ant = iwl_mld_next_ant(iwl_mld_get_valid_tx_ant(mld), *ant);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_get_queue_size(struct iwl_mld *mld, struct ieee80211_txq *txq)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = txq-&gt;sta;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+	int max_size = IWL_DEFAULT_QUEUE_SIZE;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	for_each_sta_active_link(txq-&gt;vif, sta, link_sta, link_id) {</div><div class='add'>+		if (link_sta-&gt;eht_cap.has_eht) {</div><div class='add'>+			max_size = IWL_DEFAULT_QUEUE_SIZE_EHT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (link_sta-&gt;he_cap.has_he)</div><div class='add'>+			max_size = IWL_DEFAULT_QUEUE_SIZE_HE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return max_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_allocate_txq(struct iwl_mld *mld, struct ieee80211_txq *txq)</div><div class='add'>+{</div><div class='add'>+	u8 tid = txq-&gt;tid == IEEE80211_NUM_TIDS ? IWL_MGMT_TID : txq-&gt;tid;</div><div class='add'>+	u32 fw_sta_mask = iwl_mld_fw_sta_id_mask(mld, txq-&gt;sta);</div><div class='add'>+	/* We can't know when the station is asleep or awake, so we</div><div class='add'>+	 * must disable the queue hang detection.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int watchdog_timeout = txq-&gt;vif-&gt;type == NL80211_IFTYPE_AP ?</div><div class='add'>+				IWL_WATCHDOG_DISABLED :</div><div class='add'>+				mld-&gt;trans-&gt;mac_cfg-&gt;base-&gt;wd_timeout;</div><div class='add'>+	int queue, size;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (tid == IWL_MGMT_TID)</div><div class='add'>+		size = max_t(u32, IWL_MGMT_QUEUE_SIZE,</div><div class='add'>+			     mld-&gt;trans-&gt;mac_cfg-&gt;base-&gt;min_txq_size);</div><div class='add'>+	else</div><div class='add'>+		size = iwl_mld_get_queue_size(mld, txq);</div><div class='add'>+</div><div class='add'>+	queue = iwl_trans_txq_alloc(mld-&gt;trans, 0, fw_sta_mask, tid, size,</div><div class='add'>+				    watchdog_timeout);</div><div class='add'>+</div><div class='add'>+	if (queue &gt;= 0)</div><div class='add'>+		IWL_DEBUG_TX_QUEUES(mld,</div><div class='add'>+				    "Enabling TXQ #%d for sta mask 0x%x tid %d\n",</div><div class='add'>+				    queue, fw_sta_mask, tid);</div><div class='add'>+	return queue;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mld_add_txq(struct iwl_mld *mld, struct ieee80211_txq *txq)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_txq *mld_txq = iwl_mld_txq_from_mac80211(txq);</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	/* This will alse send the SCD_QUEUE_CONFIG_CMD */</div><div class='add'>+	id = iwl_mld_allocate_txq(mld, txq);</div><div class='add'>+	if (id &lt; 0)</div><div class='add'>+		return id;</div><div class='add'>+</div><div class='add'>+	mld_txq-&gt;fw_id = id;</div><div class='add'>+	mld_txq-&gt;status.allocated = true;</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(mld-&gt;fw_id_to_txq[id], txq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_add_txq_list(struct iwl_mld *mld)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;mld-&gt;txqs_to_add)) {</div><div class='add'>+		struct ieee80211_txq *txq;</div><div class='add'>+		struct iwl_mld_txq *mld_txq =</div><div class='add'>+			list_first_entry(&amp;mld-&gt;txqs_to_add, struct iwl_mld_txq,</div><div class='add'>+					 list);</div><div class='add'>+		int failed;</div><div class='add'>+</div><div class='add'>+		txq = container_of((void *)mld_txq, struct ieee80211_txq,</div><div class='add'>+				   drv_priv);</div><div class='add'>+</div><div class='add'>+		failed = iwl_mld_add_txq(mld, txq);</div><div class='add'>+</div><div class='add'>+		local_bh_disable();</div><div class='add'>+		spin_lock(&amp;mld-&gt;add_txqs_lock);</div><div class='add'>+		list_del_init(&amp;mld_txq-&gt;list);</div><div class='add'>+		spin_unlock(&amp;mld-&gt;add_txqs_lock);</div><div class='add'>+		/* If the queue allocation failed, we can't transmit. Leave the</div><div class='add'>+		 * frames on the txq, maybe the attempt to allocate the queue</div><div class='add'>+		 * will succeed.</div><div class='add'>+		 */</div><div class='add'>+		if (!failed)</div><div class='add'>+			iwl_mld_tx_from_txq(mld, txq);</div><div class='add'>+		local_bh_enable();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_add_txqs_wk(struct wiphy *wiphy, struct wiphy_work *wk)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld *mld = container_of(wk, struct iwl_mld,</div><div class='add'>+					   add_txqs_wk);</div><div class='add'>+</div><div class='add'>+	/* will reschedule to run after restart */</div><div class='add'>+	if (mld-&gt;fw_status.in_hw_restart)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mld_add_txq_list(mld);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+iwl_mld_free_txq(struct iwl_mld *mld, u32 fw_sta_mask, u32 tid, u32 queue_id)</div><div class='add'>+{</div><div class='add'>+	struct iwl_scd_queue_cfg_cmd remove_cmd = {</div><div class='add'>+		.operation = cpu_to_le32(IWL_SCD_QUEUE_REMOVE),</div><div class='add'>+		.u.remove.tid = cpu_to_le32(tid),</div><div class='add'>+		.u.remove.sta_mask = cpu_to_le32(fw_sta_mask),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	iwl_mld_send_cmd_pdu(mld,</div><div class='add'>+			     WIDE_ID(DATA_PATH_GROUP, SCD_QUEUE_CONFIG_CMD),</div><div class='add'>+			     &amp;remove_cmd);</div><div class='add'>+</div><div class='add'>+	iwl_trans_txq_free(mld-&gt;trans, queue_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_remove_txq(struct iwl_mld *mld, struct ieee80211_txq *txq)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_txq *mld_txq = iwl_mld_txq_from_mac80211(txq);</div><div class='add'>+	u32 sta_msk, tid;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;mld-&gt;add_txqs_lock);</div><div class='add'>+	if (!list_empty(&amp;mld_txq-&gt;list))</div><div class='add'>+		list_del_init(&amp;mld_txq-&gt;list);</div><div class='add'>+	spin_unlock_bh(&amp;mld-&gt;add_txqs_lock);</div><div class='add'>+</div><div class='add'>+	if (!mld_txq-&gt;status.allocated ||</div><div class='add'>+	    WARN_ON(mld_txq-&gt;fw_id &gt;= ARRAY_SIZE(mld-&gt;fw_id_to_txq)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sta_msk = iwl_mld_fw_sta_id_mask(mld, txq-&gt;sta);</div><div class='add'>+</div><div class='add'>+	tid = txq-&gt;tid == IEEE80211_NUM_TIDS ? IWL_MGMT_TID :</div><div class='add'>+					       txq-&gt;tid;</div><div class='add'>+</div><div class='add'>+	iwl_mld_free_txq(mld, sta_msk, tid, mld_txq-&gt;fw_id);</div><div class='add'>+</div><div class='add'>+	RCU_INIT_POINTER(mld-&gt;fw_id_to_txq[mld_txq-&gt;fw_id], NULL);</div><div class='add'>+	mld_txq-&gt;status.allocated = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define OPT_HDR(type, skb, off) \</div><div class='add'>+	(type *)(skb_network_header(skb) + (off))</div><div class='add'>+</div><div class='add'>+static __le32</div><div class='add'>+iwl_mld_get_offload_assist(struct sk_buff *skb, bool amsdu)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='add'>+	u16 mh_len = ieee80211_hdrlen(hdr-&gt;frame_control);</div><div class='add'>+	u16 offload_assist = 0;</div><div class='add'>+#if IS_ENABLED(CONFIG_INET)</div><div class='add'>+	u8 protocol = 0;</div><div class='add'>+</div><div class='add'>+	/* Do not compute checksum if already computed */</div><div class='add'>+	if (skb-&gt;ip_summed != CHECKSUM_PARTIAL)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* We do not expect to be requested to csum stuff we do not support */</div><div class='add'>+</div><div class='add'>+	/* TBD: do we also need to check</div><div class='add'>+	 * !(mvm-&gt;hw-&gt;netdev_features &amp; IWL_TX_CSUM_NETIF_FLAGS) now that all</div><div class='add'>+	 * the devices we support has this flags?</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ONCE(skb-&gt;protocol != htons(ETH_P_IP) &amp;&amp;</div><div class='add'>+		      skb-&gt;protocol != htons(ETH_P_IPV6),</div><div class='add'>+		      "No support for requested checksum\n")) {</div><div class='add'>+		skb_checksum_help(skb);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IP)) {</div><div class='add'>+		protocol = ip_hdr(skb)-&gt;protocol;</div><div class='add'>+	} else {</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		struct ipv6hdr *ipv6h =</div><div class='add'>+			(struct ipv6hdr *)skb_network_header(skb);</div><div class='add'>+		unsigned int off = sizeof(*ipv6h);</div><div class='add'>+</div><div class='add'>+		protocol = ipv6h-&gt;nexthdr;</div><div class='add'>+		while (protocol != NEXTHDR_NONE &amp;&amp; ipv6_ext_hdr(protocol)) {</div><div class='add'>+			struct ipv6_opt_hdr *hp;</div><div class='add'>+</div><div class='add'>+			/* only supported extension headers */</div><div class='add'>+			if (protocol != NEXTHDR_ROUTING &amp;&amp;</div><div class='add'>+			    protocol != NEXTHDR_HOP &amp;&amp;</div><div class='add'>+			    protocol != NEXTHDR_DEST) {</div><div class='add'>+				skb_checksum_help(skb);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			hp = OPT_HDR(struct ipv6_opt_hdr, skb, off);</div><div class='add'>+			protocol = hp-&gt;nexthdr;</div><div class='add'>+			off += ipv6_optlen(hp);</div><div class='add'>+		}</div><div class='add'>+		/* if we get here - protocol now should be TCP/UDP */</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (protocol != IPPROTO_TCP &amp;&amp; protocol != IPPROTO_UDP) {</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		skb_checksum_help(skb);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* enable L4 csum */</div><div class='add'>+	offload_assist |= BIT(TX_CMD_OFFLD_L4_EN);</div><div class='add'>+</div><div class='add'>+	/* Set offset to IP header (snap).</div><div class='add'>+	 * We don't support tunneling so no need to take care of inner header.</div><div class='add'>+	 * Size is in words.</div><div class='add'>+	 */</div><div class='add'>+	offload_assist |= (4 &lt;&lt; TX_CMD_OFFLD_IP_HDR);</div><div class='add'>+</div><div class='add'>+	/* Do IPv4 csum for AMSDU only (no IP csum for Ipv6) */</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IP) &amp;&amp; amsdu) {</div><div class='add'>+		ip_hdr(skb)-&gt;check = 0;</div><div class='add'>+		offload_assist |= BIT(TX_CMD_OFFLD_L3_EN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* reset UDP/TCP header csum */</div><div class='add'>+	if (protocol == IPPROTO_TCP)</div><div class='add'>+		tcp_hdr(skb)-&gt;check = 0;</div><div class='add'>+	else</div><div class='add'>+		udp_hdr(skb)-&gt;check = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+#endif</div><div class='add'>+	mh_len /= 2;</div><div class='add'>+	offload_assist |= mh_len &lt;&lt; TX_CMD_OFFLD_MH_SIZE;</div><div class='add'>+</div><div class='add'>+	if (amsdu)</div><div class='add'>+		offload_assist |= BIT(TX_CMD_OFFLD_AMSDU);</div><div class='add'>+	else if (ieee80211_hdrlen(hdr-&gt;frame_control) % 4)</div><div class='add'>+		/* padding is inserted later in transport */</div><div class='add'>+		offload_assist |= BIT(TX_CMD_OFFLD_PAD);</div><div class='add'>+</div><div class='add'>+	return cpu_to_le32(offload_assist);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_get_basic_rates_and_band(struct iwl_mld *mld,</div><div class='add'>+					     struct ieee80211_vif *vif,</div><div class='add'>+					     struct ieee80211_tx_info *info,</div><div class='add'>+					     unsigned long *basic_rates,</div><div class='add'>+					     u8 *band)</div><div class='add'>+{</div><div class='add'>+	u32 link_id = u32_get_bits(info-&gt;control.flags,</div><div class='add'>+				   IEEE80211_TX_CTRL_MLO_LINK);</div><div class='add'>+</div><div class='add'>+	*basic_rates = vif-&gt;bss_conf.basic_rates;</div><div class='add'>+	*band = info-&gt;band;</div><div class='add'>+</div><div class='add'>+	if (link_id == IEEE80211_LINK_UNSPECIFIED &amp;&amp;</div><div class='add'>+	    ieee80211_vif_is_mld(vif)) {</div><div class='add'>+		/* shouldn't do this when &gt;1 link is active */</div><div class='add'>+		WARN_ON(hweight16(vif-&gt;active_links) != 1);</div><div class='add'>+		link_id = __ffs(vif-&gt;active_links);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link_id &lt; IEEE80211_LINK_UNSPECIFIED) {</div><div class='add'>+		struct ieee80211_bss_conf *link_conf;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		link_conf = rcu_dereference(vif-&gt;link_conf[link_id]);</div><div class='add'>+		if (link_conf) {</div><div class='add'>+			*basic_rates = link_conf-&gt;basic_rates;</div><div class='add'>+			if (link_conf-&gt;chanreq.oper.chan)</div><div class='add'>+				*band = link_conf-&gt;chanreq.oper.chan-&gt;band;</div><div class='add'>+		}</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 iwl_mld_get_lowest_rate(struct iwl_mld *mld,</div><div class='add'>+			   struct ieee80211_tx_info *info,</div><div class='add'>+			   struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	u16 lowest_cck = IWL_RATE_COUNT, lowest_ofdm = IWL_RATE_COUNT;</div><div class='add'>+	unsigned long basic_rates;</div><div class='add'>+	u8 band, rate;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	iwl_mld_get_basic_rates_and_band(mld, vif, info, &amp;basic_rates, &amp;band);</div><div class='add'>+</div><div class='add'>+	sband = mld-&gt;hw-&gt;wiphy-&gt;bands[band];</div><div class='add'>+	for_each_set_bit(i, &amp;basic_rates, BITS_PER_LONG) {</div><div class='add'>+		u16 hw = sband-&gt;bitrates[i].hw_value;</div><div class='add'>+</div><div class='add'>+		if (hw &gt;= IWL_FIRST_OFDM_RATE) {</div><div class='add'>+			if (lowest_ofdm &gt; hw)</div><div class='add'>+				lowest_ofdm = hw;</div><div class='add'>+		} else if (lowest_cck &gt; hw) {</div><div class='add'>+			lowest_cck = hw;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (band == NL80211_BAND_2GHZ &amp;&amp; !vif-&gt;p2p &amp;&amp;</div><div class='add'>+	    vif-&gt;type != NL80211_IFTYPE_P2P_DEVICE &amp;&amp;</div><div class='add'>+	    !(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_CCK_RATE)) {</div><div class='add'>+		if (lowest_cck != IWL_RATE_COUNT)</div><div class='add'>+			rate = lowest_cck;</div><div class='add'>+		else if (lowest_ofdm != IWL_RATE_COUNT)</div><div class='add'>+			rate = lowest_ofdm;</div><div class='add'>+		else</div><div class='add'>+			rate = IWL_FIRST_CCK_RATE;</div><div class='add'>+	} else if (lowest_ofdm != IWL_RATE_COUNT) {</div><div class='add'>+		rate = lowest_ofdm;</div><div class='add'>+	} else {</div><div class='add'>+		rate = IWL_FIRST_OFDM_RATE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 iwl_mld_mac80211_rate_idx_to_fw(struct iwl_mld *mld,</div><div class='add'>+					   struct ieee80211_tx_info *info,</div><div class='add'>+					   int rate_idx)</div><div class='add'>+{</div><div class='add'>+	u32 rate_flags = 0;</div><div class='add'>+	u8 rate_plcp;</div><div class='add'>+</div><div class='add'>+	/* if the rate isn't a well known legacy rate, take the lowest one */</div><div class='add'>+	if (rate_idx &lt; 0 || rate_idx &gt;= IWL_RATE_COUNT_LEGACY)</div><div class='add'>+		rate_idx = iwl_mld_get_lowest_rate(mld, info,</div><div class='add'>+						   info-&gt;control.vif);</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(rate_idx &lt; 0);</div><div class='add'>+</div><div class='add'>+	/* Set CCK or OFDM flag */</div><div class='add'>+	if (rate_idx &lt;= IWL_LAST_CCK_RATE)</div><div class='add'>+		rate_flags |= RATE_MCS_MOD_TYPE_CCK;</div><div class='add'>+	else</div><div class='add'>+		rate_flags |= RATE_MCS_MOD_TYPE_LEGACY_OFDM;</div><div class='add'>+</div><div class='add'>+	/* Legacy rates are indexed:</div><div class='add'>+	 * 0 - 3 for CCK and 0 - 7 for OFDM</div><div class='add'>+	 */</div><div class='add'>+	rate_plcp = (rate_idx &gt;= IWL_FIRST_OFDM_RATE ?</div><div class='add'>+		     rate_idx - IWL_FIRST_OFDM_RATE : rate_idx);</div><div class='add'>+</div><div class='add'>+	return (u32)rate_plcp | rate_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 iwl_mld_get_tx_ant(struct iwl_mld *mld,</div><div class='add'>+			      struct ieee80211_tx_info *info,</div><div class='add'>+			      struct ieee80211_sta *sta, __le16 fc)</div><div class='add'>+{</div><div class='add'>+	if (sta &amp;&amp; ieee80211_is_data(fc)) {</div><div class='add'>+		struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(sta);</div><div class='add'>+</div><div class='add'>+		return BIT(mld_sta-&gt;data_tx_ant) &lt;&lt; RATE_MCS_ANT_POS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return BIT(mld-&gt;mgmt_tx_ant) &lt;&lt; RATE_MCS_ANT_POS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 iwl_mld_get_inject_tx_rate(struct iwl_mld *mld,</div><div class='add'>+				      struct ieee80211_tx_info *info,</div><div class='add'>+				      struct ieee80211_sta *sta,</div><div class='add'>+				      __le16 fc)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_tx_rate *rate = &amp;info-&gt;control.rates[0];</div><div class='add'>+	u32 result;</div><div class='add'>+</div><div class='add'>+	if (rate-&gt;flags &amp; IEEE80211_TX_RC_VHT_MCS) {</div><div class='add'>+		u8 mcs = ieee80211_rate_get_vht_mcs(rate);</div><div class='add'>+		u8 nss = ieee80211_rate_get_vht_nss(rate);</div><div class='add'>+</div><div class='add'>+		result = RATE_MCS_MOD_TYPE_VHT;</div><div class='add'>+		result |= u32_encode_bits(mcs, RATE_MCS_CODE_MSK);</div><div class='add'>+		result |= u32_encode_bits(nss, RATE_MCS_NSS_MSK);</div><div class='add'>+</div><div class='add'>+		if (rate-&gt;flags &amp; IEEE80211_TX_RC_SHORT_GI)</div><div class='add'>+			result |= RATE_MCS_SGI_MSK;</div><div class='add'>+</div><div class='add'>+		if (rate-&gt;flags &amp; IEEE80211_TX_RC_40_MHZ_WIDTH)</div><div class='add'>+			result |= RATE_MCS_CHAN_WIDTH_40;</div><div class='add'>+		else if (rate-&gt;flags &amp; IEEE80211_TX_RC_80_MHZ_WIDTH)</div><div class='add'>+			result |= RATE_MCS_CHAN_WIDTH_80;</div><div class='add'>+		else if (rate-&gt;flags &amp; IEEE80211_TX_RC_160_MHZ_WIDTH)</div><div class='add'>+			result |= RATE_MCS_CHAN_WIDTH_160;</div><div class='add'>+	} else if (rate-&gt;flags &amp; IEEE80211_TX_RC_MCS) {</div><div class='add'>+		/* only MCS 0-15 are supported */</div><div class='add'>+		u8 mcs = rate-&gt;idx &amp; 7;</div><div class='add'>+		u8 nss = rate-&gt;idx &gt; 7;</div><div class='add'>+</div><div class='add'>+		result = RATE_MCS_MOD_TYPE_HT;</div><div class='add'>+		result |= u32_encode_bits(mcs, RATE_MCS_CODE_MSK);</div><div class='add'>+		result |= u32_encode_bits(nss, RATE_MCS_NSS_MSK);</div><div class='add'>+</div><div class='add'>+		if (rate-&gt;flags &amp; IEEE80211_TX_RC_SHORT_GI)</div><div class='add'>+			result |= RATE_MCS_SGI_MSK;</div><div class='add'>+		if (rate-&gt;flags &amp; IEEE80211_TX_RC_40_MHZ_WIDTH)</div><div class='add'>+			result |= RATE_MCS_CHAN_WIDTH_40;</div><div class='add'>+		if (info-&gt;flags &amp; IEEE80211_TX_CTL_LDPC)</div><div class='add'>+			result |= RATE_MCS_LDPC_MSK;</div><div class='add'>+		if (u32_get_bits(info-&gt;flags, IEEE80211_TX_CTL_STBC))</div><div class='add'>+			result |= RATE_MCS_STBC_MSK;</div><div class='add'>+	} else {</div><div class='add'>+		result = iwl_mld_mac80211_rate_idx_to_fw(mld, info, rate-&gt;idx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;control.antennas)</div><div class='add'>+		result |= u32_encode_bits(info-&gt;control.antennas,</div><div class='add'>+					  RATE_MCS_ANT_AB_MSK);</div><div class='add'>+	else</div><div class='add'>+		result |= iwl_mld_get_tx_ant(mld, info, sta, fc);</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __le32 iwl_mld_get_tx_rate_n_flags(struct iwl_mld *mld,</div><div class='add'>+					  struct ieee80211_tx_info *info,</div><div class='add'>+					  struct ieee80211_sta *sta, __le16 fc)</div><div class='add'>+{</div><div class='add'>+	u32 rate;</div><div class='add'>+</div><div class='add'>+	if (unlikely(info-&gt;control.flags &amp; IEEE80211_TX_CTRL_RATE_INJECT))</div><div class='add'>+		rate = iwl_mld_get_inject_tx_rate(mld, info, sta, fc);</div><div class='add'>+	else</div><div class='add'>+		rate = iwl_mld_mac80211_rate_idx_to_fw(mld, info, -1) |</div><div class='add'>+		       iwl_mld_get_tx_ant(mld, info, sta, fc);</div><div class='add'>+</div><div class='add'>+	return iwl_v3_rate_to_v2_v3(rate, mld-&gt;fw_rates_ver_3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_fill_tx_cmd_hdr(struct iwl_tx_cmd *tx_cmd,</div><div class='add'>+			struct sk_buff *skb, bool amsdu)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+</div><div class='add'>+	/* Copy MAC header from skb into command buffer */</div><div class='add'>+	memcpy(tx_cmd-&gt;hdr, hdr, ieee80211_hdrlen(hdr-&gt;frame_control));</div><div class='add'>+</div><div class='add'>+	if (!amsdu || !skb_is_gso(skb))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* As described in IEEE sta 802.11-2020, table 9-30 (Address</div><div class='add'>+	 * field contents), A-MSDU address 3 should contain the BSSID</div><div class='add'>+	 * address.</div><div class='add'>+	 *</div><div class='add'>+	 * In TSO, the skb header address 3 contains the original address 3 to</div><div class='add'>+	 * correctly create all the A-MSDU subframes headers from it.</div><div class='add'>+	 * Override now the address 3 in the command header with the BSSID.</div><div class='add'>+	 *</div><div class='add'>+	 * Note: we fill in the MLD address, but the firmware will do the</div><div class='add'>+	 * necessary translation to link address after encryption.</div><div class='add'>+	 */</div><div class='add'>+	vif = info-&gt;control.vif;</div><div class='add'>+	switch (vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		ether_addr_copy(tx_cmd-&gt;hdr-&gt;addr3, vif-&gt;cfg.ap_addr);</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		ether_addr_copy(tx_cmd-&gt;hdr-&gt;addr3, vif-&gt;addr);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mld_fill_tx_cmd(struct iwl_mld *mld, struct sk_buff *skb,</div><div class='add'>+		    struct iwl_device_tx_cmd *dev_tx_cmd,</div><div class='add'>+		    struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='add'>+	struct iwl_mld_sta *mld_sta = sta ? iwl_mld_sta_from_mac80211(sta) :</div><div class='add'>+					    NULL;</div><div class='add'>+	struct iwl_tx_cmd *tx_cmd;</div><div class='add'>+	bool amsdu = ieee80211_is_data_qos(hdr-&gt;frame_control) &amp;&amp;</div><div class='add'>+		     (*ieee80211_get_qos_ctl(hdr) &amp;</div><div class='add'>+		      IEEE80211_QOS_CTL_A_MSDU_PRESENT);</div><div class='add'>+	__le32 rate_n_flags = 0;</div><div class='add'>+	u16 flags = 0;</div><div class='add'>+</div><div class='add'>+	dev_tx_cmd-&gt;hdr.cmd = TX_CMD;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;control.hw_key)</div><div class='add'>+		flags |= IWL_TX_FLAGS_ENCRYPT_DIS;</div><div class='add'>+</div><div class='add'>+	/* For data and mgmt packets rate info comes from the fw.</div><div class='add'>+	 * Only set rate/antenna for injected frames with fixed rate, or</div><div class='add'>+	 * when no sta is given.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(!sta ||</div><div class='add'>+		     info-&gt;control.flags &amp; IEEE80211_TX_CTRL_RATE_INJECT)) {</div><div class='add'>+		flags |= IWL_TX_FLAGS_CMD_RATE;</div><div class='add'>+		rate_n_flags = iwl_mld_get_tx_rate_n_flags(mld, info, sta,</div><div class='add'>+							   hdr-&gt;frame_control);</div><div class='add'>+	} else if (!ieee80211_is_data(hdr-&gt;frame_control) ||</div><div class='add'>+		   (mld_sta &amp;&amp;</div><div class='add'>+		    mld_sta-&gt;sta_state &lt; IEEE80211_STA_AUTHORIZED)) {</div><div class='add'>+		/* These are important frames */</div><div class='add'>+		flags |= IWL_TX_FLAGS_HIGH_PRI;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tx_cmd = (void *)dev_tx_cmd-&gt;payload;</div><div class='add'>+</div><div class='add'>+	iwl_mld_fill_tx_cmd_hdr(tx_cmd, skb, amsdu);</div><div class='add'>+</div><div class='add'>+	tx_cmd-&gt;offload_assist = iwl_mld_get_offload_assist(skb, amsdu);</div><div class='add'>+</div><div class='add'>+	/* Total # bytes to be transmitted */</div><div class='add'>+	tx_cmd-&gt;len = cpu_to_le16((u16)skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	tx_cmd-&gt;flags = cpu_to_le16(flags);</div><div class='add'>+</div><div class='add'>+	tx_cmd-&gt;rate_n_flags = rate_n_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Caller of this need to check that info-&gt;control.vif is not NULL */</div><div class='add'>+static struct iwl_mld_link *</div><div class='add'>+iwl_mld_get_link_from_tx_info(struct ieee80211_tx_info *info)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_vif *mld_vif =</div><div class='add'>+		iwl_mld_vif_from_mac80211(info-&gt;control.vif);</div><div class='add'>+	u32 link_id = u32_get_bits(info-&gt;control.flags,</div><div class='add'>+				   IEEE80211_TX_CTRL_MLO_LINK);</div><div class='add'>+</div><div class='add'>+	if (link_id == IEEE80211_LINK_UNSPECIFIED) {</div><div class='add'>+		if (info-&gt;control.vif-&gt;active_links)</div><div class='add'>+			link_id = ffs(info-&gt;control.vif-&gt;active_links) - 1;</div><div class='add'>+		else</div><div class='add'>+			link_id = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rcu_dereference(mld_vif-&gt;link[link_id]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mld_get_tx_queue_id(struct iwl_mld *mld, struct ieee80211_txq *txq,</div><div class='add'>+			struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='add'>+	__le16 fc = hdr-&gt;frame_control;</div><div class='add'>+	struct iwl_mld_vif *mld_vif;</div><div class='add'>+	struct iwl_mld_link *link;</div><div class='add'>+</div><div class='add'>+	if (txq &amp;&amp; txq-&gt;sta)</div><div class='add'>+		return iwl_mld_txq_from_mac80211(txq)-&gt;fw_id;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;control.vif)</div><div class='add'>+		return IWL_MLD_INVALID_QUEUE;</div><div class='add'>+</div><div class='add'>+	switch (info-&gt;control.vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		link = iwl_mld_get_link_from_tx_info(info);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!link))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* ucast disassociate/deauth frames without a station might</div><div class='add'>+		 * happen, especially with reason 7 ("Class 3 frame received</div><div class='add'>+		 * from nonassociated STA").</div><div class='add'>+		 */</div><div class='add'>+		if (ieee80211_is_mgmt(fc) &amp;&amp;</div><div class='add'>+		    (!ieee80211_is_bufferable_mmpdu(skb) ||</div><div class='add'>+		     ieee80211_is_deauth(fc) || ieee80211_is_disassoc(fc)))</div><div class='add'>+			return link-&gt;bcast_sta.queue_id;</div><div class='add'>+</div><div class='add'>+		if (is_multicast_ether_addr(hdr-&gt;addr1) &amp;&amp;</div><div class='add'>+		    !ieee80211_has_order(fc))</div><div class='add'>+			return link-&gt;mcast_sta.queue_id;</div><div class='add'>+</div><div class='add'>+		WARN_ONCE(info-&gt;control.vif-&gt;type != NL80211_IFTYPE_ADHOC,</div><div class='add'>+			  "Couldn't find a TXQ. fc=0x%02x", le16_to_cpu(fc));</div><div class='add'>+		return link-&gt;bcast_sta.queue_id;</div><div class='add'>+	case NL80211_IFTYPE_P2P_DEVICE:</div><div class='add'>+		mld_vif = iwl_mld_vif_from_mac80211(info-&gt;control.vif);</div><div class='add'>+</div><div class='add'>+		if (mld_vif-&gt;roc_activity != ROC_ACTIVITY_P2P_DISC &amp;&amp;</div><div class='add'>+		    mld_vif-&gt;roc_activity != ROC_ACTIVITY_P2P_NEG) {</div><div class='add'>+			IWL_DEBUG_DROP(mld,</div><div class='add'>+				       "Drop tx outside ROC with activity %d\n",</div><div class='add'>+				       mld_vif-&gt;roc_activity);</div><div class='add'>+			return IWL_MLD_INVALID_DROP_TX;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		WARN_ON(!ieee80211_is_mgmt(fc));</div><div class='add'>+</div><div class='add'>+		return mld_vif-&gt;aux_sta.queue_id;</div><div class='add'>+	case NL80211_IFTYPE_MONITOR:</div><div class='add'>+		mld_vif = iwl_mld_vif_from_mac80211(info-&gt;control.vif);</div><div class='add'>+		return mld_vif-&gt;deflink.mon_sta.queue_id;</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		mld_vif = iwl_mld_vif_from_mac80211(info-&gt;control.vif);</div><div class='add'>+</div><div class='add'>+		if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_TX_OFFCHAN)) {</div><div class='add'>+			IWL_DEBUG_DROP(mld, "Drop tx not off-channel\n");</div><div class='add'>+			return IWL_MLD_INVALID_DROP_TX;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (mld_vif-&gt;roc_activity != ROC_ACTIVITY_HOTSPOT) {</div><div class='add'>+			IWL_DEBUG_DROP(mld, "Drop tx outside ROC\n");</div><div class='add'>+			return IWL_MLD_INVALID_DROP_TX;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		WARN_ON(!ieee80211_is_mgmt(fc));</div><div class='add'>+		return mld_vif-&gt;aux_sta.queue_id;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ONCE(1, "Unsupported vif type\n");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IWL_MLD_INVALID_QUEUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_probe_resp_set_noa(struct iwl_mld *mld,</div><div class='add'>+				       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	struct iwl_mld_link *mld_link =</div><div class='add'>+		&amp;iwl_mld_vif_from_mac80211(info-&gt;control.vif)-&gt;deflink;</div><div class='add'>+	struct iwl_probe_resp_data *resp_data;</div><div class='add'>+	u8 *pos;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;control.vif-&gt;p2p)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	resp_data = rcu_dereference(mld_link-&gt;probe_resp_data);</div><div class='add'>+	if (!resp_data)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!resp_data-&gt;notif.noa_active)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (skb_tailroom(skb) &lt; resp_data-&gt;noa_len) {</div><div class='add'>+		if (pskb_expand_head(skb, 0, resp_data-&gt;noa_len, GFP_ATOMIC)) {</div><div class='add'>+			IWL_ERR(mld,</div><div class='add'>+				"Failed to reallocate probe resp\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos = skb_put(skb, resp_data-&gt;noa_len);</div><div class='add'>+</div><div class='add'>+	*pos++ = WLAN_EID_VENDOR_SPECIFIC;</div><div class='add'>+	/* Set length of IE body (not including ID and length itself) */</div><div class='add'>+	*pos++ = resp_data-&gt;noa_len - 2;</div><div class='add'>+	*pos++ = (WLAN_OUI_WFA &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	*pos++ = (WLAN_OUI_WFA &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	*pos++ = WLAN_OUI_WFA &amp; 0xff;</div><div class='add'>+	*pos++ = WLAN_OUI_TYPE_WFA_P2P;</div><div class='add'>+</div><div class='add'>+	memcpy(pos, &amp;resp_data-&gt;notif.noa_attr,</div><div class='add'>+	       resp_data-&gt;noa_len - sizeof(struct ieee80211_vendor_ie));</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function must be called with BHs disabled */</div><div class='add'>+static int iwl_mld_tx_mpdu(struct iwl_mld *mld, struct sk_buff *skb,</div><div class='add'>+			   struct ieee80211_txq *txq)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	struct ieee80211_sta *sta = txq ? txq-&gt;sta : NULL;</div><div class='add'>+	struct iwl_device_tx_cmd *dev_tx_cmd;</div><div class='add'>+	int queue = iwl_mld_get_tx_queue_id(mld, txq, skb);</div><div class='add'>+	u8 tid = IWL_MAX_TID_COUNT;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(queue == IWL_MLD_INVALID_QUEUE, "Invalid TX Queue id") ||</div><div class='add'>+	    queue == IWL_MLD_INVALID_DROP_TX)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (unlikely(ieee80211_is_any_nullfunc(hdr-&gt;frame_control)))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	dev_tx_cmd = iwl_trans_alloc_tx_cmd(mld-&gt;trans);</div><div class='add'>+	if (unlikely(!dev_tx_cmd))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (unlikely(ieee80211_is_probe_resp(hdr-&gt;frame_control))) {</div><div class='add'>+		if (IWL_MLD_NON_TRANSMITTING_AP)</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		iwl_mld_probe_resp_set_noa(mld, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mld_fill_tx_cmd(mld, skb, dev_tx_cmd, sta);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_data(hdr-&gt;frame_control)) {</div><div class='add'>+		if (ieee80211_is_data_qos(hdr-&gt;frame_control))</div><div class='add'>+			tid = ieee80211_get_tid(hdr);</div><div class='add'>+		else</div><div class='add'>+			tid = IWL_TID_NON_QOS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_TX(mld, "TX TID:%d from Q:%d len %d\n",</div><div class='add'>+		     tid, queue, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	/* From now on, we cannot access info-&gt;control */</div><div class='add'>+	memset(&amp;info-&gt;status, 0, sizeof(info-&gt;status));</div><div class='add'>+	memset(info-&gt;driver_data, 0, sizeof(info-&gt;driver_data));</div><div class='add'>+</div><div class='add'>+	info-&gt;driver_data[1] = dev_tx_cmd;</div><div class='add'>+</div><div class='add'>+	if (iwl_trans_tx(mld-&gt;trans, skb, dev_tx_cmd, queue))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* Update low-latency counter when a packet is queued instead</div><div class='add'>+	 * of after TX, it makes sense for early low-latency detection</div><div class='add'>+	 */</div><div class='add'>+	if (sta)</div><div class='add'>+		iwl_mld_low_latency_update_counters(mld, hdr, sta, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	iwl_trans_free_tx_cmd(mld-&gt;trans, dev_tx_cmd);</div><div class='add'>+	IWL_DEBUG_TX(mld, "TX from Q:%d dropped\n", queue);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_INET</div><div class='add'>+</div><div class='add'>+/* This function handles the segmentation of a large TSO packet into multiple</div><div class='add'>+ * MPDUs, ensuring that the resulting segments conform to AMSDU limits and</div><div class='add'>+ * constraints.</div><div class='add'>+ */</div><div class='add'>+static int iwl_mld_tx_tso_segment(struct iwl_mld *mld, struct sk_buff *skb,</div><div class='add'>+				  struct ieee80211_sta *sta,</div><div class='add'>+				  struct sk_buff_head *mpdus_skbs)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='add'>+	netdev_features_t netdev_flags = NETIF_F_CSUM_MASK | NETIF_F_SG;</div><div class='add'>+	unsigned int mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='add'>+	unsigned int num_subframes, tcp_payload_len, subf_len;</div><div class='add'>+	u16 snap_ip_tcp, pad, max_tid_amsdu_len;</div><div class='add'>+	u8 tid;</div><div class='add'>+</div><div class='add'>+	snap_ip_tcp = 8 + skb_network_header_len(skb) + tcp_hdrlen(skb);</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_is_data_qos(hdr-&gt;frame_control) ||</div><div class='add'>+	    !sta-&gt;cur-&gt;max_rc_amsdu_len)</div><div class='add'>+		return iwl_tx_tso_segment(skb, 1, netdev_flags, mpdus_skbs);</div><div class='add'>+</div><div class='add'>+	/* Do not build AMSDU for IPv6 with extension headers.</div><div class='add'>+	 * Ask stack to segment and checksum the generated MPDUs for us.</div><div class='add'>+	 */</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IPV6) &amp;&amp;</div><div class='add'>+	    ((struct ipv6hdr *)skb_network_header(skb))-&gt;nexthdr !=</div><div class='add'>+	    IPPROTO_TCP) {</div><div class='add'>+		netdev_flags &amp;= ~NETIF_F_CSUM_MASK;</div><div class='add'>+		return iwl_tx_tso_segment(skb, 1, netdev_flags, mpdus_skbs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tid = ieee80211_get_tid(hdr);</div><div class='add'>+	if (WARN_ON_ONCE(tid &gt;= IWL_MAX_TID_COUNT))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	max_tid_amsdu_len = sta-&gt;cur-&gt;max_tid_amsdu_len[tid];</div><div class='add'>+	if (!max_tid_amsdu_len)</div><div class='add'>+		return iwl_tx_tso_segment(skb, 1, netdev_flags, mpdus_skbs);</div><div class='add'>+</div><div class='add'>+	/* Sub frame header + SNAP + IP header + TCP header + MSS */</div><div class='add'>+	subf_len = sizeof(struct ethhdr) + snap_ip_tcp + mss;</div><div class='add'>+	pad = (4 - subf_len) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	/* If we have N subframes in the A-MSDU, then the A-MSDU's size is</div><div class='add'>+	 * N * subf_len + (N - 1) * pad.</div><div class='add'>+	 */</div><div class='add'>+	num_subframes = (max_tid_amsdu_len + pad) / (subf_len + pad);</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;max_amsdu_subframes &amp;&amp;</div><div class='add'>+	    num_subframes &gt; sta-&gt;max_amsdu_subframes)</div><div class='add'>+		num_subframes = sta-&gt;max_amsdu_subframes;</div><div class='add'>+</div><div class='add'>+	tcp_payload_len = skb_tail_pointer(skb) - skb_transport_header(skb) -</div><div class='add'>+		tcp_hdrlen(skb) + skb-&gt;data_len;</div><div class='add'>+</div><div class='add'>+	/* Make sure we have enough TBs for the A-MSDU:</div><div class='add'>+	 *	2 for each subframe</div><div class='add'>+	 *	1 more for each fragment</div><div class='add'>+	 *	1 more for the potential data in the header</div><div class='add'>+	 */</div><div class='add'>+	if ((num_subframes * 2 + skb_shinfo(skb)-&gt;nr_frags + 1) &gt;</div><div class='add'>+	    mld-&gt;trans-&gt;info.max_skb_frags)</div><div class='add'>+		num_subframes = 1;</div><div class='add'>+</div><div class='add'>+	if (num_subframes &gt; 1)</div><div class='add'>+		*ieee80211_get_qos_ctl(hdr) |= IEEE80211_QOS_CTL_A_MSDU_PRESENT;</div><div class='add'>+</div><div class='add'>+	/* This skb fits in one single A-MSDU */</div><div class='add'>+	if (tcp_payload_len &lt;= num_subframes * mss) {</div><div class='add'>+		__skb_queue_tail(mpdus_skbs, skb);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Trick the segmentation function to make it create SKBs that can fit</div><div class='add'>+	 * into one A-MSDU.</div><div class='add'>+	 */</div><div class='add'>+	return iwl_tx_tso_segment(skb, num_subframes, netdev_flags, mpdus_skbs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Manages TSO (TCP Segmentation Offload) packet transmission by segmenting</div><div class='add'>+ * large packets when necessary and transmitting each segment as MPDU.</div><div class='add'>+ */</div><div class='add'>+static int iwl_mld_tx_tso(struct iwl_mld *mld, struct sk_buff *skb,</div><div class='add'>+			  struct ieee80211_txq *txq)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	struct sk_buff *orig_skb = skb;</div><div class='add'>+	struct sk_buff_head mpdus_skbs;</div><div class='add'>+	unsigned int payload_len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!txq || !txq-&gt;sta))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	payload_len = skb_tail_pointer(skb) - skb_transport_header(skb) -</div><div class='add'>+		tcp_hdrlen(skb) + skb-&gt;data_len;</div><div class='add'>+</div><div class='add'>+	if (payload_len &lt;= skb_shinfo(skb)-&gt;gso_size)</div><div class='add'>+		return iwl_mld_tx_mpdu(mld, skb, txq);</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;control.vif)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	__skb_queue_head_init(&amp;mpdus_skbs);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_tx_tso_segment(mld, skb, txq-&gt;sta, &amp;mpdus_skbs);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	WARN_ON(skb_queue_empty(&amp;mpdus_skbs));</div><div class='add'>+</div><div class='add'>+	while (!skb_queue_empty(&amp;mpdus_skbs)) {</div><div class='add'>+		skb = __skb_dequeue(&amp;mpdus_skbs);</div><div class='add'>+</div><div class='add'>+		ret = iwl_mld_tx_mpdu(mld, skb, txq);</div><div class='add'>+		if (!ret)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Free skbs created as part of TSO logic that have not yet</div><div class='add'>+		 * been dequeued</div><div class='add'>+		 */</div><div class='add'>+		__skb_queue_purge(&amp;mpdus_skbs);</div><div class='add'>+</div><div class='add'>+		/* skb here is not necessarily same as skb that entered</div><div class='add'>+		 * this method, so free it explicitly.</div><div class='add'>+		 */</div><div class='add'>+		if (skb == orig_skb)</div><div class='add'>+			ieee80211_free_txskb(mld-&gt;hw, skb);</div><div class='add'>+		else</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+		/* there was error, but we consumed skb one way or</div><div class='add'>+		 * another, so return 0</div><div class='add'>+		 */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static int iwl_mld_tx_tso(struct iwl_mld *mld, struct sk_buff *skb,</div><div class='add'>+			  struct ieee80211_txq *txq)</div><div class='add'>+{</div><div class='add'>+	/* Impossible to get TSO without CONFIG_INET */</div><div class='add'>+	WARN_ON(1);</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_INET */</div><div class='add'>+</div><div class='add'>+void iwl_mld_tx_skb(struct iwl_mld *mld, struct sk_buff *skb,</div><div class='add'>+		    struct ieee80211_txq *txq)</div><div class='add'>+{</div><div class='add'>+	if (skb_is_gso(skb)) {</div><div class='add'>+		if (!iwl_mld_tx_tso(mld, skb, txq))</div><div class='add'>+			return;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (likely(!iwl_mld_tx_mpdu(mld, skb, txq)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	ieee80211_free_txskb(mld-&gt;hw, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_tx_from_txq(struct iwl_mld *mld, struct ieee80211_txq *txq)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_txq *mld_txq = iwl_mld_txq_from_mac80211(txq);</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	u8 zero_addr[ETH_ALEN] = {};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * No need for threads to be pending here, they can leave the first</div><div class='add'>+	 * taker all the work.</div><div class='add'>+	 *</div><div class='add'>+	 * mld_txq-&gt;tx_request logic:</div><div class='add'>+	 *</div><div class='add'>+	 * If 0, no one is currently TXing, set to 1 to indicate current thread</div><div class='add'>+	 * will now start TX and other threads should quit.</div><div class='add'>+	 *</div><div class='add'>+	 * If 1, another thread is currently TXing, set to 2 to indicate to</div><div class='add'>+	 * that thread that there was another request. Since that request may</div><div class='add'>+	 * have raced with the check whether the queue is empty, the TXing</div><div class='add'>+	 * thread should check the queue's status one more time before leaving.</div><div class='add'>+	 * This check is done in order to not leave any TX hanging in the queue</div><div class='add'>+	 * until the next TX invocation (which may not even happen).</div><div class='add'>+	 *</div><div class='add'>+	 * If 2, another thread is currently TXing, and it will already double</div><div class='add'>+	 * check the queue, so do nothing.</div><div class='add'>+	 */</div><div class='add'>+	if (atomic_fetch_add_unless(&amp;mld_txq-&gt;tx_request, 1, 2))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	do {</div><div class='add'>+		while (likely(!mld_txq-&gt;status.stop_full) &amp;&amp;</div><div class='add'>+		       (skb = ieee80211_tx_dequeue(mld-&gt;hw, txq)))</div><div class='add'>+			iwl_mld_tx_skb(mld, skb, txq);</div><div class='add'>+	} while (atomic_dec_return(&amp;mld_txq-&gt;tx_request));</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_TX(mld, "TXQ of sta %pM tid %d is now empty\n",</div><div class='add'>+		     txq-&gt;sta ? txq-&gt;sta-&gt;addr : zero_addr, txq-&gt;tid);</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_hwrate_to_tx_rate(struct iwl_mld *mld,</div><div class='add'>+				      __le32 rate_n_flags_fw,</div><div class='add'>+				      struct ieee80211_tx_info *info)</div><div class='add'>+{</div><div class='add'>+	enum nl80211_band band = info-&gt;band;</div><div class='add'>+	struct ieee80211_tx_rate *tx_rate = &amp;info-&gt;status.rates[0];</div><div class='add'>+	u32 rate_n_flags = iwl_v3_rate_from_v2_v3(rate_n_flags_fw,</div><div class='add'>+						  mld-&gt;fw_rates_ver_3);</div><div class='add'>+	u32 sgi = rate_n_flags &amp; RATE_MCS_SGI_MSK;</div><div class='add'>+	u32 chan_width = rate_n_flags &amp; RATE_MCS_CHAN_WIDTH_MSK;</div><div class='add'>+	u32 format = rate_n_flags &amp; RATE_MCS_MOD_TYPE_MSK;</div><div class='add'>+</div><div class='add'>+	if (sgi)</div><div class='add'>+		tx_rate-&gt;flags |= IEEE80211_TX_RC_SHORT_GI;</div><div class='add'>+</div><div class='add'>+	switch (chan_width) {</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_20:</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_40:</div><div class='add'>+		tx_rate-&gt;flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_80:</div><div class='add'>+		tx_rate-&gt;flags |= IEEE80211_TX_RC_80_MHZ_WIDTH;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_160:</div><div class='add'>+		tx_rate-&gt;flags |= IEEE80211_TX_RC_160_MHZ_WIDTH;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (format) {</div><div class='add'>+	case RATE_MCS_MOD_TYPE_HT:</div><div class='add'>+		tx_rate-&gt;flags |= IEEE80211_TX_RC_MCS;</div><div class='add'>+		tx_rate-&gt;idx = RATE_HT_MCS_INDEX(rate_n_flags);</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_VHT:</div><div class='add'>+		ieee80211_rate_set_vht(tx_rate,</div><div class='add'>+				       rate_n_flags &amp; RATE_MCS_CODE_MSK,</div><div class='add'>+				       u32_get_bits(rate_n_flags,</div><div class='add'>+						    RATE_MCS_NSS_MSK) + 1);</div><div class='add'>+		tx_rate-&gt;flags |= IEEE80211_TX_RC_VHT_MCS;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_HE:</div><div class='add'>+	case RATE_MCS_MOD_TYPE_EHT:</div><div class='add'>+		/* mac80211 cannot do this without ieee80211_tx_status_ext()</div><div class='add'>+		 * but it only matters for radiotap</div><div class='add'>+		 */</div><div class='add'>+		tx_rate-&gt;idx = 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		tx_rate-&gt;idx =</div><div class='add'>+			iwl_mld_legacy_hw_idx_to_mac80211_idx(rate_n_flags,</div><div class='add'>+							      band);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_tx_resp_notif(struct iwl_mld *mld,</div><div class='add'>+				  struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_tx_resp *tx_resp = (void *)pkt-&gt;data;</div><div class='add'>+	int txq_id = le16_to_cpu(tx_resp-&gt;tx_queue);</div><div class='add'>+	struct agg_tx_status *agg_status = &amp;tx_resp-&gt;status;</div><div class='add'>+	u32 status = le16_to_cpu(agg_status-&gt;status);</div><div class='add'>+	u32 pkt_len = iwl_rx_packet_payload_len(pkt);</div><div class='add'>+	size_t notif_size = sizeof(*tx_resp) + sizeof(u32);</div><div class='add'>+	int sta_id = IWL_TX_RES_GET_RA(tx_resp-&gt;ra_tid);</div><div class='add'>+	int tid = IWL_TX_RES_GET_TID(tx_resp-&gt;ra_tid);</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	struct iwl_mld_sta *mld_sta;</div><div class='add'>+	u16 ssn;</div><div class='add'>+	struct sk_buff_head skbs;</div><div class='add'>+	u8 skb_freed = 0;</div><div class='add'>+	bool mgmt = false;</div><div class='add'>+	bool tx_failure = (status &amp; TX_STATUS_MSK) != TX_STATUS_SUCCESS;</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, tx_resp-&gt;frame_count != 1,</div><div class='add'>+			 "Invalid tx_resp notif frame_count (%d)\n",</div><div class='add'>+			 tx_resp-&gt;frame_count))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* validate the size of the variable part of the notif */</div><div class='add'>+	if (IWL_FW_CHECK(mld, notif_size != pkt_len,</div><div class='add'>+			 "Invalid tx_resp notif size (expected=%zu got=%u)\n",</div><div class='add'>+			 notif_size, pkt_len))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ssn = le32_to_cpup((__le32 *)agg_status +</div><div class='add'>+			   tx_resp-&gt;frame_count) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	__skb_queue_head_init(&amp;skbs);</div><div class='add'>+</div><div class='add'>+	/* we can free until ssn % q.n_bd not inclusive */</div><div class='add'>+	iwl_trans_reclaim(mld-&gt;trans, txq_id, ssn, &amp;skbs, false);</div><div class='add'>+</div><div class='add'>+	while (!skb_queue_empty(&amp;skbs)) {</div><div class='add'>+		struct sk_buff *skb = __skb_dequeue(&amp;skbs);</div><div class='add'>+		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+		struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+		skb_freed++;</div><div class='add'>+</div><div class='add'>+		iwl_trans_free_tx_cmd(mld-&gt;trans, info-&gt;driver_data[1]);</div><div class='add'>+</div><div class='add'>+		memset(&amp;info-&gt;status, 0, sizeof(info-&gt;status));</div><div class='add'>+</div><div class='add'>+		info-&gt;flags &amp;= ~(IEEE80211_TX_STAT_ACK | IEEE80211_TX_STAT_TX_FILTERED);</div><div class='add'>+</div><div class='add'>+		/* inform mac80211 about what happened with the frame */</div><div class='add'>+		switch (status &amp; TX_STATUS_MSK) {</div><div class='add'>+		case TX_STATUS_SUCCESS:</div><div class='add'>+		case TX_STATUS_DIRECT_DONE:</div><div class='add'>+			info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* If we are freeing multiple frames, mark all the frames</div><div class='add'>+		 * but the first one as acked, since they were acknowledged</div><div class='add'>+		 * before</div><div class='add'>+		 */</div><div class='add'>+		if (skb_freed &gt; 1)</div><div class='add'>+			info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='add'>+</div><div class='add'>+		if (tx_failure) {</div><div class='add'>+			enum iwl_fw_ini_time_point tp =</div><div class='add'>+				IWL_FW_INI_TIME_POINT_TX_FAILED;</div><div class='add'>+</div><div class='add'>+			if (ieee80211_is_action(hdr-&gt;frame_control))</div><div class='add'>+				tp = IWL_FW_INI_TIME_POINT_TX_WFD_ACTION_FRAME_FAILED;</div><div class='add'>+			else if (ieee80211_is_mgmt(hdr-&gt;frame_control))</div><div class='add'>+				mgmt = true;</div><div class='add'>+</div><div class='add'>+			iwl_dbg_tlv_time_point(&amp;mld-&gt;fwrt, tp, NULL);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		iwl_mld_hwrate_to_tx_rate(mld, tx_resp-&gt;initial_rate, info);</div><div class='add'>+</div><div class='add'>+		if (likely(!iwl_mld_time_sync_frame(mld, skb, hdr-&gt;addr1)))</div><div class='add'>+			ieee80211_tx_status_skb(mld-&gt;hw, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_TX_REPLY(mld,</div><div class='add'>+			   "TXQ %d status 0x%08x ssn=%d initial_rate 0x%x retries %d\n",</div><div class='add'>+			   txq_id, status, ssn, le32_to_cpu(tx_resp-&gt;initial_rate),</div><div class='add'>+			   tx_resp-&gt;failure_frame);</div><div class='add'>+</div><div class='add'>+	if (tx_failure &amp;&amp; mgmt)</div><div class='add'>+		iwl_mld_toggle_tx_ant(mld, &amp;mld-&gt;mgmt_tx_ant);</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, sta_id &gt;= mld-&gt;fw-&gt;ucode_capa.num_stations,</div><div class='add'>+			 "Got invalid sta_id (%d)\n", sta_id))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	link_sta = rcu_dereference(mld-&gt;fw_id_to_link_sta[sta_id]);</div><div class='add'>+	if (!link_sta) {</div><div class='add'>+		/* This can happen if the TX cmd was sent before pre_rcu_remove</div><div class='add'>+		 * but the TX response was received after</div><div class='add'>+		 */</div><div class='add'>+		IWL_DEBUG_TX_REPLY(mld,</div><div class='add'>+				   "Got valid sta_id (%d) but sta is NULL\n",</div><div class='add'>+				   sta_id);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(link_sta))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mld_sta = iwl_mld_sta_from_mac80211(link_sta-&gt;sta);</div><div class='add'>+</div><div class='add'>+	if (tx_failure &amp;&amp; mld_sta-&gt;sta_state &lt; IEEE80211_STA_AUTHORIZED)</div><div class='add'>+		iwl_mld_toggle_tx_ant(mld, &amp;mld_sta-&gt;data_tx_ant);</div><div class='add'>+</div><div class='add'>+	if (tid &lt; IWL_MAX_TID_COUNT)</div><div class='add'>+		iwl_mld_count_mpdu_tx(link_sta, 1);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mld_tx_reclaim_txq(struct iwl_mld *mld, int txq, int index,</div><div class='add'>+				   bool in_flush)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff_head reclaimed_skbs;</div><div class='add'>+</div><div class='add'>+	__skb_queue_head_init(&amp;reclaimed_skbs);</div><div class='add'>+</div><div class='add'>+	iwl_trans_reclaim(mld-&gt;trans, txq, index, &amp;reclaimed_skbs, in_flush);</div><div class='add'>+</div><div class='add'>+	while (!skb_queue_empty(&amp;reclaimed_skbs)) {</div><div class='add'>+		struct sk_buff *skb = __skb_dequeue(&amp;reclaimed_skbs);</div><div class='add'>+		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+</div><div class='add'>+		iwl_trans_free_tx_cmd(mld-&gt;trans, info-&gt;driver_data[1]);</div><div class='add'>+</div><div class='add'>+		memset(&amp;info-&gt;status, 0, sizeof(info-&gt;status));</div><div class='add'>+</div><div class='add'>+		/* Packet was transmitted successfully, failures come as single</div><div class='add'>+		 * frames because before failing a frame the firmware transmits</div><div class='add'>+		 * it without aggregation at least once.</div><div class='add'>+		 */</div><div class='add'>+		if (!in_flush)</div><div class='add'>+			info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='add'>+		else</div><div class='add'>+			info-&gt;flags &amp;= ~IEEE80211_TX_STAT_ACK;</div><div class='add'>+</div><div class='add'>+		ieee80211_tx_status_skb(mld-&gt;hw, skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_flush_link_sta_txqs(struct iwl_mld *mld, u32 fw_sta_id)</div><div class='add'>+{</div><div class='add'>+	struct iwl_tx_path_flush_cmd_rsp *rsp;</div><div class='add'>+	struct iwl_tx_path_flush_cmd flush_cmd = {</div><div class='add'>+		.sta_id = cpu_to_le32(fw_sta_id),</div><div class='add'>+		.tid_mask = cpu_to_le16(0xffff),</div><div class='add'>+	};</div><div class='add'>+	struct iwl_host_cmd cmd = {</div><div class='add'>+		.id = TXPATH_FLUSH,</div><div class='add'>+		.len = { sizeof(flush_cmd), },</div><div class='add'>+		.data = { &amp;flush_cmd, },</div><div class='add'>+		.flags = CMD_WANT_SKB,</div><div class='add'>+	};</div><div class='add'>+	int ret, num_flushed_queues;</div><div class='add'>+	u32 resp_len;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_TX_QUEUES(mld, "flush for sta id %d tid mask 0x%x\n",</div><div class='add'>+			    fw_sta_id, 0xffff);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_send_cmd(mld, &amp;cmd);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mld, "Failed to send flush command (%d)\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	resp_len = iwl_rx_packet_payload_len(cmd.resp_pkt);</div><div class='add'>+	if (IWL_FW_CHECK(mld, resp_len != sizeof(*rsp),</div><div class='add'>+			 "Invalid TXPATH_FLUSH response len: %d\n",</div><div class='add'>+			 resp_len)) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto free_rsp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rsp = (void *)cmd.resp_pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, le16_to_cpu(rsp-&gt;sta_id) != fw_sta_id,</div><div class='add'>+			 "sta_id %d != rsp_sta_id %d\n", fw_sta_id,</div><div class='add'>+			 le16_to_cpu(rsp-&gt;sta_id))) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto free_rsp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	num_flushed_queues = le16_to_cpu(rsp-&gt;num_flushed_queues);</div><div class='add'>+	if (IWL_FW_CHECK(mld, num_flushed_queues &gt; IWL_TX_FLUSH_QUEUE_RSP,</div><div class='add'>+			 "num_flushed_queues %d\n", num_flushed_queues)) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto free_rsp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; num_flushed_queues; i++) {</div><div class='add'>+		struct iwl_flush_queue_info *queue_info = &amp;rsp-&gt;queues[i];</div><div class='add'>+		int read_after = le16_to_cpu(queue_info-&gt;read_after_flush);</div><div class='add'>+		int txq_id = le16_to_cpu(queue_info-&gt;queue_num);</div><div class='add'>+</div><div class='add'>+		if (IWL_FW_CHECK(mld,</div><div class='add'>+				 txq_id &gt;= ARRAY_SIZE(mld-&gt;fw_id_to_txq),</div><div class='add'>+				 "Invalid txq id %d\n", txq_id))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		IWL_DEBUG_TX_QUEUES(mld,</div><div class='add'>+				    "tid %d txq_id %d read-before %d read-after %d\n",</div><div class='add'>+				    le16_to_cpu(queue_info-&gt;tid), txq_id,</div><div class='add'>+				    le16_to_cpu(queue_info-&gt;read_before_flush),</div><div class='add'>+				    read_after);</div><div class='add'>+</div><div class='add'>+		iwl_mld_tx_reclaim_txq(mld, txq_id, read_after, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+free_rsp:</div><div class='add'>+	iwl_free_resp(&amp;cmd);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_ensure_queue(struct iwl_mld *mld, struct ieee80211_txq *txq)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mld_txq *mld_txq = iwl_mld_txq_from_mac80211(txq);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	if (likely(mld_txq-&gt;status.allocated))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mld_add_txq(mld, txq);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;mld-&gt;add_txqs_lock);</div><div class='add'>+	if (!list_empty(&amp;mld_txq-&gt;list))</div><div class='add'>+		list_del_init(&amp;mld_txq-&gt;list);</div><div class='add'>+	spin_unlock_bh(&amp;mld-&gt;add_txqs_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mld_update_sta_txqs(struct iwl_mld *mld,</div><div class='add'>+			    struct ieee80211_sta *sta,</div><div class='add'>+			    u32 old_sta_mask, u32 new_sta_mask)</div><div class='add'>+{</div><div class='add'>+	struct iwl_scd_queue_cfg_cmd cmd = {</div><div class='add'>+		.operation = cpu_to_le32(IWL_SCD_QUEUE_MODIFY),</div><div class='add'>+		.u.modify.old_sta_mask = cpu_to_le32(old_sta_mask),</div><div class='add'>+		.u.modify.new_sta_mask = cpu_to_le32(new_sta_mask),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mld-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	for (int tid = 0; tid &lt;= IWL_MAX_TID_COUNT; tid++) {</div><div class='add'>+		struct ieee80211_txq *txq =</div><div class='add'>+			sta-&gt;txq[tid != IWL_MAX_TID_COUNT ?</div><div class='add'>+					tid : IEEE80211_NUM_TIDS];</div><div class='add'>+		struct iwl_mld_txq *mld_txq =</div><div class='add'>+			iwl_mld_txq_from_mac80211(txq);</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		if (!mld_txq-&gt;status.allocated)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (tid == IWL_MAX_TID_COUNT)</div><div class='add'>+			cmd.u.modify.tid = cpu_to_le32(IWL_MGMT_TID);</div><div class='add'>+		else</div><div class='add'>+			cmd.u.modify.tid = cpu_to_le32(tid);</div><div class='add'>+</div><div class='add'>+		ret = iwl_mld_send_cmd_pdu(mld,</div><div class='add'>+					   WIDE_ID(DATA_PATH_GROUP,</div><div class='add'>+						   SCD_QUEUE_CONFIG_CMD),</div><div class='add'>+					   &amp;cmd);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_compressed_ba_notif(struct iwl_mld *mld,</div><div class='add'>+					struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_compressed_ba_notif *ba_res = (void *)pkt-&gt;data;</div><div class='add'>+	u32 pkt_len = iwl_rx_packet_payload_len(pkt);</div><div class='add'>+	u16 tfd_cnt = le16_to_cpu(ba_res-&gt;tfd_cnt);</div><div class='add'>+	u8 sta_id = ba_res-&gt;sta_id;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+</div><div class='add'>+	if (!tfd_cnt)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, struct_size(ba_res, tfd, tfd_cnt) &gt; pkt_len,</div><div class='add'>+			 "Short BA notif (tfd_cnt=%d, size:0x%x)\n",</div><div class='add'>+			 tfd_cnt, pkt_len))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_TX_REPLY(mld,</div><div class='add'>+			   "BA notif received from sta_id=%d, flags=0x%x, sent:%d, acked:%d\n",</div><div class='add'>+			   sta_id, le32_to_cpu(ba_res-&gt;flags),</div><div class='add'>+			   le16_to_cpu(ba_res-&gt;txed),</div><div class='add'>+			   le16_to_cpu(ba_res-&gt;done));</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; tfd_cnt; i++) {</div><div class='add'>+		struct iwl_compressed_ba_tfd *ba_tfd = &amp;ba_res-&gt;tfd[i];</div><div class='add'>+		int txq_id = le16_to_cpu(ba_tfd-&gt;q_num);</div><div class='add'>+		int index = le16_to_cpu(ba_tfd-&gt;tfd_index);</div><div class='add'>+</div><div class='add'>+		if (IWL_FW_CHECK(mld,</div><div class='add'>+				 txq_id &gt;= ARRAY_SIZE(mld-&gt;fw_id_to_txq),</div><div class='add'>+				 "Invalid txq id %d\n", txq_id))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		iwl_mld_tx_reclaim_txq(mld, txq_id, index, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mld, sta_id &gt;= mld-&gt;fw-&gt;ucode_capa.num_stations,</div><div class='add'>+			 "Got invalid sta_id (%d)\n", sta_id))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	link_sta = rcu_dereference(mld-&gt;fw_id_to_link_sta[sta_id]);</div><div class='add'>+	if (IWL_FW_CHECK(mld, IS_ERR_OR_NULL(link_sta),</div><div class='add'>+			 "Got valid sta_id (%d) but link_sta is NULL\n",</div><div class='add'>+			 sta_id))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	iwl_mld_count_mpdu_tx(link_sta, le16_to_cpu(ba_res-&gt;txed));</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mld/tx.h b/drivers/net/wireless/intel/iwlwifi/mld/tx.h<br/>new file mode 100644<br/>index 000000000000..520f15f9d33c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mld/tx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mld/tx.h</a></div><div class='hunk'>@@ -0,0 +1,77 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __iwl_mld_tx_h__</div><div class='add'>+#define __iwl_mld_tx_h__</div><div class='add'>+</div><div class='add'>+#include "mld.h"</div><div class='add'>+</div><div class='add'>+#define IWL_MLD_INVALID_QUEUE		0xFFFF</div><div class='add'>+#define IWL_MLD_INVALID_DROP_TX		0xFFFE</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mld_txq - TX Queue data</div><div class='add'>+ *</div><div class='add'>+ * @fw_id: the fw id of this txq. Only valid when &amp;status.allocated is true.</div><div class='add'>+ * @status: bitmap of the txq status</div><div class='add'>+ * @status.allocated: Indicates that the queue was allocated.</div><div class='add'>+ * @status.stop_full: Indicates that the queue is full and should stop TXing.</div><div class='add'>+ * @list: list pointer, for &amp;mld::txqs_to_add</div><div class='add'>+ * @tx_request: makes sure that if there are multiple threads that want to tx</div><div class='add'>+ *	from this txq, only one of them will do all the TXing.</div><div class='add'>+ *	This is needed to avoid spinning the trans txq lock, which is expensive</div><div class='add'>+ */</div><div class='add'>+struct iwl_mld_txq {</div><div class='add'>+	/* Add here fields that need clean up on restart */</div><div class='add'>+	struct_group(zeroed_on_hw_restart,</div><div class='add'>+		u16 fw_id;</div><div class='add'>+		struct {</div><div class='add'>+			u8 allocated:1;</div><div class='add'>+			u8 stop_full:1;</div><div class='add'>+		} status;</div><div class='add'>+	);</div><div class='add'>+	struct list_head list;</div><div class='add'>+	atomic_t tx_request;</div><div class='add'>+	/* And here fields that survive a fw restart */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void iwl_mld_init_txq(struct iwl_mld_txq *mld_txq)</div><div class='add'>+{</div><div class='add'>+	INIT_LIST_HEAD(&amp;mld_txq-&gt;list);</div><div class='add'>+	atomic_set(&amp;mld_txq-&gt;tx_request, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct iwl_mld_txq *</div><div class='add'>+iwl_mld_txq_from_mac80211(struct ieee80211_txq *txq)</div><div class='add'>+{</div><div class='add'>+	return (void *)txq-&gt;drv_priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mld_add_txqs_wk(struct wiphy *wiphy, struct wiphy_work *wk);</div><div class='add'>+void iwl_mld_remove_txq(struct iwl_mld *mld, struct ieee80211_txq *txq);</div><div class='add'>+void iwl_mld_add_txq_list(struct iwl_mld *mld);</div><div class='add'>+void</div><div class='add'>+iwl_mld_free_txq(struct iwl_mld *mld, u32 fw_sta_mask, u32 tid, u32 queue_id);</div><div class='add'>+void iwl_mld_tx_from_txq(struct iwl_mld *mld, struct ieee80211_txq *txq);</div><div class='add'>+void iwl_mld_handle_tx_resp_notif(struct iwl_mld *mld,</div><div class='add'>+				  struct iwl_rx_packet *pkt);</div><div class='add'>+int iwl_mld_flush_link_sta_txqs(struct iwl_mld *mld, u32 fw_sta_id);</div><div class='add'>+int iwl_mld_ensure_queue(struct iwl_mld *mld, struct ieee80211_txq *txq);</div><div class='add'>+</div><div class='add'>+int iwl_mld_update_sta_txqs(struct iwl_mld *mld,</div><div class='add'>+			    struct ieee80211_sta *sta,</div><div class='add'>+			    u32 old_sta_mask, u32 new_sta_mask);</div><div class='add'>+</div><div class='add'>+void iwl_mld_handle_compressed_ba_notif(struct iwl_mld *mld,</div><div class='add'>+					struct iwl_rx_packet *pkt);</div><div class='add'>+void iwl_mld_toggle_tx_ant(struct iwl_mld *mld, u8 *ant);</div><div class='add'>+</div><div class='add'>+u8 iwl_mld_get_lowest_rate(struct iwl_mld *mld,</div><div class='add'>+			   struct ieee80211_tx_info *info,</div><div class='add'>+			   struct ieee80211_vif *vif);</div><div class='add'>+</div><div class='add'>+void iwl_mld_tx_skb(struct iwl_mld *mld, struct sk_buff *skb,</div><div class='add'>+		    struct ieee80211_txq *txq);</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_mld_tx_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/Makefile b/drivers/net/wireless/intel/iwlwifi/mvm/Makefile<br/>index 75fc2d935e5d..59751f123571 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/Makefile</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_IWLMVM)   += iwlmvm.o</div><div class='add'>+obj-$(CONFIG_IWLWIFI_KUNIT_TESTS) += tests/</div><div class='ctx'> iwlmvm-y += fw.o mac80211.o nvm.o ops.o phy-ctxt.o mac-ctxt.o</div><div class='ctx'> iwlmvm-y += utils.o rx.o rxmq.o tx.o binding.o quota.o sta.o sf.o</div><div class='ctx'> iwlmvm-y += scan.o time-event.o rs.o rs-fw.o</div><div class='hunk'>@@ -7,8 +8,12 @@ iwlmvm-y += power.o coex.o</div><div class='ctx'> iwlmvm-y += tt.o offloading.o tdls.o</div><div class='ctx'> iwlmvm-y += ftm-responder.o ftm-initiator.o</div><div class='ctx'> iwlmvm-y += rfi.o</div><div class='add'>+iwlmvm-y += mld-key.o mld-mac.o link.o mld-sta.o mld-mac80211.o</div><div class='add'>+iwlmvm-y += ptp.o</div><div class='add'>+iwlmvm-y += time-sync.o</div><div class='ctx'> iwlmvm-$(CONFIG_IWLWIFI_DEBUGFS) += debugfs.o debugfs-vif.o</div><div class='ctx'> iwlmvm-$(CONFIG_IWLWIFI_LEDS) += led.o</div><div class='del'>-iwlmvm-$(CONFIG_PM) += d3.o</div><div class='add'>+iwlmvm-$(CONFIG_PM_SLEEP) += d3.o</div><div class='add'>+iwlmvm-$(CONFIG_IWLMEI) += vendor-cmd.o</div><div class='ctx'> </div><div class='del'>-ccflags-y += -I $(srctree)/$(src)/../</div><div class='add'>+subdir-ccflags-y += -I $(src)/../</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/binding.c b/drivers/net/wireless/intel/iwlwifi/mvm/binding.c<br/>index 0aac306304cb..58e9a940024d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/binding.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/binding.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/binding.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/binding.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2012-2014, 2020 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2016 Intel Deutschland GmbH</div><div class='add'>+ * Copyright (C) 2022, 2024 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='ctx'> #include "fw-api.h"</div><div class='hunk'>@@ -31,7 +32,7 @@ static int iwl_mvm_binding_cmd(struct iwl_mvm *mvm, u32 action,</div><div class='ctx'> 	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 			IWL_UCODE_TLV_CAPA_BINDING_CDB_SUPPORT)) {</div><div class='ctx'> 		size = sizeof(cmd);</div><div class='del'>-		cmd.lmac_id = cpu_to_le32(iwl_mvm_get_lmac_id(mvm-&gt;fw,</div><div class='add'>+		cmd.lmac_id = cpu_to_le32(iwl_mvm_get_lmac_id(mvm,</div><div class='ctx'> 							      phyctxt-&gt;channel-&gt;band));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		size = IWL_BINDING_CMD_SIZE_V1;</div><div class='hunk'>@@ -75,7 +76,7 @@ static void iwl_mvm_iface_iterator(void *_data, u8 *mac,</div><div class='ctx'> 	if (vif == data-&gt;ignore_vif)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (mvmvif-&gt;phy_ctxt != data-&gt;phyctxt)</div><div class='add'>+	if (mvmvif-&gt;deflink.phy_ctxt != data-&gt;phyctxt)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON_ONCE(data-&gt;idx &gt;= MAX_MACS_IN_BINDING))</div><div class='hunk'>@@ -132,7 +133,7 @@ int iwl_mvm_binding_add_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(!mvmvif-&gt;phy_ctxt))</div><div class='add'>+	if (WARN_ON_ONCE(!mvmvif-&gt;deflink.phy_ctxt))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -142,7 +143,8 @@ int iwl_mvm_binding_add_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 	if (iwl_mvm_sf_update(mvm, vif, false))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	return iwl_mvm_binding_update(mvm, vif, mvmvif-&gt;phy_ctxt, true);</div><div class='add'>+	return iwl_mvm_binding_update(mvm, vif, mvmvif-&gt;deflink.phy_ctxt,</div><div class='add'>+				      true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iwl_mvm_binding_remove_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='hunk'>@@ -150,14 +152,22 @@ int iwl_mvm_binding_remove_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(!mvmvif-&gt;phy_ctxt))</div><div class='add'>+	if (WARN_ON_ONCE(!mvmvif-&gt;deflink.phy_ctxt))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_binding_update(mvm, vif, mvmvif-&gt;phy_ctxt, false);</div><div class='add'>+	ret = iwl_mvm_binding_update(mvm, vif, mvmvif-&gt;deflink.phy_ctxt,</div><div class='add'>+				     false);</div><div class='ctx'> </div><div class='del'>-	if (!ret)</div><div class='del'>-		if (iwl_mvm_sf_update(mvm, vif, true))</div><div class='del'>-			IWL_ERR(mvm, "Failed to update SF state\n");</div><div class='add'>+	if (!ret &amp;&amp; iwl_mvm_sf_update(mvm, vif, true))</div><div class='add'>+		IWL_ERR(mvm, "Failed to update SF state\n");</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+u32 iwl_mvm_get_lmac_id(struct iwl_mvm *mvm, enum nl80211_band band)</div><div class='add'>+{</div><div class='add'>+	if (!fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa, IWL_UCODE_TLV_CAPA_CDB_SUPPORT) ||</div><div class='add'>+	    band == NL80211_BAND_2GHZ)</div><div class='add'>+		return IWL_LMAC_24G_INDEX;</div><div class='add'>+	return IWL_LMAC_5G_INDEX;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/coex.c b/drivers/net/wireless/intel/iwlwifi/mvm/coex.c<br/>index 9b194cb8d65e..ca63f780140f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/coex.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/coex.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/coex.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/coex.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2013-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2013-2014, 2018-2020, 2022-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/ieee80211.h&gt;</div><div class='hunk'>@@ -106,7 +106,7 @@ iwl_get_coex_type(struct iwl_mvm *mvm, const struct ieee80211_vif *vif)</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-	chanctx_conf = rcu_dereference(vif-&gt;chanctx_conf);</div><div class='add'>+	chanctx_conf = rcu_dereference(vif-&gt;bss_conf.chanctx_conf);</div><div class='ctx'> </div><div class='ctx'> 	if (!chanctx_conf ||</div><div class='ctx'> 	     chanctx_conf-&gt;def.chan-&gt;band != NL80211_BAND_2GHZ) {</div><div class='hunk'>@@ -116,11 +116,6 @@ iwl_get_coex_type(struct iwl_mvm *mvm, const struct ieee80211_vif *vif)</div><div class='ctx'> </div><div class='ctx'> 	ret = BT_COEX_TX_DIS_LUT;</div><div class='ctx'> </div><div class='del'>-	if (mvm-&gt;cfg-&gt;bt_shared_single_ant) {</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	phy_ctx_id = *((u16 *)chanctx_conf-&gt;drv_priv);</div><div class='ctx'> 	primary_ch_phy_id = le32_to_cpu(mvm-&gt;last_bt_ci_cmd.primary_ch_phy_id);</div><div class='ctx'> 	secondary_ch_phy_id =</div><div class='hunk'>@@ -186,6 +181,9 @@ static int iwl_mvm_bt_coex_reduced_txp(struct iwl_mvm *mvm, u8 sta_id,</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta;</div><div class='ctx'> 	u32 value;</div><div class='ctx'> </div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	mvmsta = iwl_mvm_sta_from_staid_protected(mvm, sta_id);</div><div class='ctx'> 	if (!mvmsta)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -194,7 +192,7 @@ static int iwl_mvm_bt_coex_reduced_txp(struct iwl_mvm *mvm, u8 sta_id,</div><div class='ctx'> 	if (mvmsta-&gt;bt_reduced_txpower == enable)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	value = mvmsta-&gt;sta_id;</div><div class='add'>+	value = mvmsta-&gt;deflink.sta_id;</div><div class='ctx'> </div><div class='ctx'> 	if (enable)</div><div class='ctx'> 		value |= BT_REDUCED_TX_POWER_BIT;</div><div class='hunk'>@@ -210,7 +208,7 @@ static int iwl_mvm_bt_coex_reduced_txp(struct iwl_mvm *mvm, u8 sta_id,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct iwl_bt_iterator_data {</div><div class='del'>-	struct iwl_bt_coex_profile_notif *notif;</div><div class='add'>+	struct iwl_bt_coex_prof_old_notif *notif;</div><div class='ctx'> 	struct iwl_mvm *mvm;</div><div class='ctx'> 	struct ieee80211_chanctx_conf *primary;</div><div class='ctx'> 	struct ieee80211_chanctx_conf *secondary;</div><div class='hunk'>@@ -221,15 +219,13 @@ struct iwl_bt_iterator_data {</div><div class='ctx'> </div><div class='ctx'> static inline</div><div class='ctx'> void iwl_mvm_bt_coex_enable_rssi_event(struct iwl_mvm *mvm,</div><div class='del'>-				       struct ieee80211_vif *vif,</div><div class='add'>+				       struct iwl_mvm_vif_link_info *link_info,</div><div class='ctx'> 				       bool enable, int rssi)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-</div><div class='del'>-	mvmvif-&gt;bf_data.last_bt_coex_event = rssi;</div><div class='del'>-	mvmvif-&gt;bf_data.bt_coex_max_thold =</div><div class='add'>+	link_info-&gt;bf_data.last_bt_coex_event = rssi;</div><div class='add'>+	link_info-&gt;bf_data.bt_coex_max_thold =</div><div class='ctx'> 		enable ? -IWL_MVM_BT_COEX_EN_RED_TXP_THRESH : 0;</div><div class='del'>-	mvmvif-&gt;bf_data.bt_coex_min_thold =</div><div class='add'>+	link_info-&gt;bf_data.bt_coex_min_thold =</div><div class='ctx'> 		enable ? -IWL_MVM_BT_COEX_DIS_RED_TXP_THRESH : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -257,33 +253,35 @@ static void iwl_mvm_bt_coex_tcm_based_ci(struct iwl_mvm *mvm,</div><div class='ctx'> 	swap(data-&gt;primary, data-&gt;secondary);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* must be called under rcu_read_lock */</div><div class='del'>-static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac,</div><div class='del'>-				      struct ieee80211_vif *vif)</div><div class='add'>+static void iwl_mvm_bt_notif_per_link(struct iwl_mvm *mvm,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      struct iwl_bt_iterator_data *data,</div><div class='add'>+				      unsigned int link_id)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-	struct iwl_bt_iterator_data *data = _data;</div><div class='del'>-	struct iwl_mvm *mvm = data-&gt;mvm;</div><div class='del'>-	struct ieee80211_chanctx_conf *chanctx_conf;</div><div class='ctx'> 	/* default smps_mode is AUTOMATIC - only used for client modes */</div><div class='ctx'> 	enum ieee80211_smps_mode smps_mode = IEEE80211_SMPS_AUTOMATIC;</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	u32 bt_activity_grading, min_ag_for_static_smps;</div><div class='add'>+	struct ieee80211_chanctx_conf *chanctx_conf;</div><div class='add'>+	struct iwl_mvm_vif_link_info *link_info;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='ctx'> 	int ave_rssi;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	switch (vif-&gt;type) {</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_AP:</div><div class='del'>-		if (!mvmvif-&gt;ap_ibss_active)</div><div class='del'>-			return;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='add'>+	link_info = mvmvif-&gt;link[link_id];</div><div class='add'>+	if (!link_info)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	chanctx_conf = rcu_dereference(vif-&gt;chanctx_conf);</div><div class='add'>+	link_conf = rcu_dereference(vif-&gt;link_conf[link_id]);</div><div class='add'>+	/* This can happen due to races: if we receive the notification</div><div class='add'>+	 * and have the mutex held, while mac80211 is stuck on our mutex</div><div class='add'>+	 * in the middle of removing the link.</div><div class='add'>+	 */</div><div class='add'>+	if (!link_conf)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	chanctx_conf = rcu_dereference(link_conf-&gt;chanctx_conf);</div><div class='ctx'> </div><div class='ctx'> 	/* If channel context is invalid or not on 2.4GHz .. */</div><div class='ctx'> 	if ((!chanctx_conf ||</div><div class='hunk'>@@ -291,10 +289,11 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac,</div><div class='ctx'> 		if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='ctx'> 			/* ... relax constraints and disable rssi events */</div><div class='ctx'> 			iwl_mvm_update_smps(mvm, vif, IWL_MVM_SMPS_REQ_BT_COEX,</div><div class='del'>-					    smps_mode);</div><div class='del'>-			iwl_mvm_bt_coex_reduced_txp(mvm, mvmvif-&gt;ap_sta_id,</div><div class='add'>+					    smps_mode, link_id);</div><div class='add'>+			iwl_mvm_bt_coex_reduced_txp(mvm, link_info-&gt;ap_sta_id,</div><div class='ctx'> 						    false);</div><div class='del'>-			iwl_mvm_bt_coex_enable_rssi_event(mvm, vif, false, 0);</div><div class='add'>+			iwl_mvm_bt_coex_enable_rssi_event(mvm, link_info, false,</div><div class='add'>+							  0);</div><div class='ctx'> 		}</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -311,20 +310,21 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac,</div><div class='ctx'> 		smps_mode = IEEE80211_SMPS_DYNAMIC;</div><div class='ctx'> </div><div class='ctx'> 	/* relax SMPS constraints for next association */</div><div class='del'>-	if (!vif-&gt;bss_conf.assoc)</div><div class='add'>+	if (!vif-&gt;cfg.assoc)</div><div class='ctx'> 		smps_mode = IEEE80211_SMPS_AUTOMATIC;</div><div class='ctx'> </div><div class='del'>-	if (mvmvif-&gt;phy_ctxt &amp;&amp;</div><div class='del'>-	    (mvm-&gt;last_bt_notif.rrc_status &amp; BIT(mvmvif-&gt;phy_ctxt-&gt;id)))</div><div class='add'>+	if (link_info-&gt;phy_ctxt &amp;&amp;</div><div class='add'>+	    (mvm-&gt;last_bt_notif.rrc_status &amp; BIT(link_info-&gt;phy_ctxt-&gt;id)))</div><div class='ctx'> 		smps_mode = IEEE80211_SMPS_AUTOMATIC;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_COEX(data-&gt;mvm,</div><div class='del'>-		       "mac %d: bt_activity_grading %d smps_req %d\n",</div><div class='del'>-		       mvmvif-&gt;id, bt_activity_grading, smps_mode);</div><div class='add'>+		       "mac %d link %d: bt_activity_grading %d smps_req %d\n",</div><div class='add'>+		       mvmvif-&gt;id, link_info-&gt;fw_link_id,</div><div class='add'>+		       bt_activity_grading, smps_mode);</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='ctx'> 		iwl_mvm_update_smps(mvm, vif, IWL_MVM_SMPS_REQ_BT_COEX,</div><div class='del'>-				    smps_mode);</div><div class='add'>+				    smps_mode, link_id);</div><div class='ctx'> </div><div class='ctx'> 	/* low latency is always primary */</div><div class='ctx'> 	if (iwl_mvm_vif_low_latency(mvmvif)) {</div><div class='hunk'>@@ -353,6 +353,7 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac,</div><div class='ctx'> 			data-&gt;secondary = chanctx_conf;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* FIXME: TCM load per interface? or need something per link? */</div><div class='ctx'> 		if (data-&gt;primary == chanctx_conf)</div><div class='ctx'> 			data-&gt;primary_load = mvm-&gt;tcm.result.load[mvmvif-&gt;id];</div><div class='ctx'> 		else if (data-&gt;secondary == chanctx_conf)</div><div class='hunk'>@@ -370,6 +371,7 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac,</div><div class='ctx'> 		/* if secondary is not NULL, it might be a GO */</div><div class='ctx'> 		data-&gt;secondary = chanctx_conf;</div><div class='ctx'> </div><div class='add'>+	/* FIXME: TCM load per interface? or need something per link? */</div><div class='ctx'> 	if (data-&gt;primary == chanctx_conf)</div><div class='ctx'> 		data-&gt;primary_load = mvm-&gt;tcm.result.load[mvmvif-&gt;id];</div><div class='ctx'> 	else if (data-&gt;secondary == chanctx_conf)</div><div class='hunk'>@@ -377,34 +379,61 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * don't reduce the Tx power if one of these is true:</div><div class='ctx'> 	 *  we are in LOOSE</div><div class='del'>-	 *  single share antenna product</div><div class='ctx'> 	 *  BT is inactive</div><div class='ctx'> 	 *  we are not associated</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (iwl_get_coex_type(mvm, vif) == BT_COEX_LOOSE_LUT ||</div><div class='del'>-	    mvm-&gt;cfg-&gt;bt_shared_single_ant || !vif-&gt;bss_conf.assoc ||</div><div class='del'>-	    le32_to_cpu(mvm-&gt;last_bt_notif.bt_activity_grading) == BT_OFF) {</div><div class='del'>-		iwl_mvm_bt_coex_reduced_txp(mvm, mvmvif-&gt;ap_sta_id, false);</div><div class='del'>-		iwl_mvm_bt_coex_enable_rssi_event(mvm, vif, false, 0);</div><div class='add'>+	    le32_to_cpu(mvm-&gt;last_bt_notif.bt_activity_grading) == BT_OFF ||</div><div class='add'>+	    !vif-&gt;cfg.assoc) {</div><div class='add'>+		iwl_mvm_bt_coex_reduced_txp(mvm, link_info-&gt;ap_sta_id, false);</div><div class='add'>+		iwl_mvm_bt_coex_enable_rssi_event(mvm, link_info, false, 0);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* try to get the avg rssi from fw */</div><div class='del'>-	ave_rssi = mvmvif-&gt;bf_data.ave_beacon_signal;</div><div class='add'>+	ave_rssi = link_info-&gt;bf_data.ave_beacon_signal;</div><div class='ctx'> </div><div class='ctx'> 	/* if the RSSI isn't valid, fake it is very low */</div><div class='ctx'> 	if (!ave_rssi)</div><div class='ctx'> 		ave_rssi = -100;</div><div class='ctx'> 	if (ave_rssi &gt; -IWL_MVM_BT_COEX_EN_RED_TXP_THRESH) {</div><div class='del'>-		if (iwl_mvm_bt_coex_reduced_txp(mvm, mvmvif-&gt;ap_sta_id, true))</div><div class='add'>+		if (iwl_mvm_bt_coex_reduced_txp(mvm, link_info-&gt;ap_sta_id,</div><div class='add'>+						true))</div><div class='ctx'> 			IWL_ERR(mvm, "Couldn't send BT_CONFIG cmd\n");</div><div class='ctx'> 	} else if (ave_rssi &lt; -IWL_MVM_BT_COEX_DIS_RED_TXP_THRESH) {</div><div class='del'>-		if (iwl_mvm_bt_coex_reduced_txp(mvm, mvmvif-&gt;ap_sta_id, false))</div><div class='add'>+		if (iwl_mvm_bt_coex_reduced_txp(mvm, link_info-&gt;ap_sta_id,</div><div class='add'>+						false))</div><div class='ctx'> 			IWL_ERR(mvm, "Couldn't send BT_CONFIG cmd\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Begin to monitor the RSSI: it may influence the reduced Tx power */</div><div class='del'>-	iwl_mvm_bt_coex_enable_rssi_event(mvm, vif, true, ave_rssi);</div><div class='add'>+	iwl_mvm_bt_coex_enable_rssi_event(mvm, link_info, true, ave_rssi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* must be called under rcu_read_lock */</div><div class='add'>+static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac,</div><div class='add'>+				      struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_bt_iterator_data *data = _data;</div><div class='add'>+	struct iwl_mvm *mvm = data-&gt;mvm;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	switch (vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		if (!mvmvif-&gt;ap_ibss_active)</div><div class='add'>+			return;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (link_id = 0; link_id &lt; IEEE80211_MLD_MAX_NUM_LINKS; link_id++)</div><div class='add'>+		iwl_mvm_bt_notif_per_link(mvm, vif, data, link_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_bt_coex_notif_handle(struct iwl_mvm *mvm)</div><div class='hunk'>@@ -425,6 +454,11 @@ static void iwl_mvm_bt_coex_notif_handle(struct iwl_mvm *mvm)</div><div class='ctx'> 					mvm-&gt;hw, IEEE80211_IFACE_ITER_NORMAL,</div><div class='ctx'> 					iwl_mvm_bt_notif_iterator, &amp;data);</div><div class='ctx'> </div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	iwl_mvm_bt_coex_tcm_based_ci(mvm, &amp;data);</div><div class='ctx'> </div><div class='ctx'> 	if (data.primary) {</div><div class='hunk'>@@ -484,11 +518,11 @@ static void iwl_mvm_bt_coex_notif_handle(struct iwl_mvm *mvm)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_mvm_rx_bt_coex_notif(struct iwl_mvm *mvm,</div><div class='del'>-			      struct iwl_rx_cmd_buffer *rxb)</div><div class='add'>+void iwl_mvm_rx_bt_coex_old_notif(struct iwl_mvm *mvm,</div><div class='add'>+				  struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl_bt_coex_profile_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+	struct iwl_bt_coex_prof_old_notif *notif = (void *)pkt-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_COEX(mvm, "BT Coex Notification received\n");</div><div class='ctx'> 	IWL_DEBUG_COEX(mvm, "\tBT ci compliance %d\n", notif-&gt;bt_ci_compliance);</div><div class='hunk'>@@ -521,7 +555,7 @@ void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	 * Rssi update while not associated - can happen since the statistics</div><div class='ctx'> 	 * are handled asynchronously</div><div class='ctx'> 	 */</div><div class='del'>-	if (mvmvif-&gt;ap_sta_id == IWL_MVM_INVALID_STA)</div><div class='add'>+	if (mvmvif-&gt;deflink.ap_sta_id == IWL_INVALID_STA)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* No BT - reports should be disabled */</div><div class='hunk'>@@ -535,12 +569,15 @@ void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	 * Check if rssi is good enough for reduced Tx power, but not in loose</div><div class='ctx'> 	 * scheme.</div><div class='ctx'> 	 */</div><div class='del'>-	if (rssi_event == RSSI_EVENT_LOW || mvm-&gt;cfg-&gt;bt_shared_single_ant ||</div><div class='add'>+	if (rssi_event == RSSI_EVENT_LOW ||</div><div class='ctx'> 	    iwl_get_coex_type(mvm, vif) == BT_COEX_LOOSE_LUT)</div><div class='del'>-		ret = iwl_mvm_bt_coex_reduced_txp(mvm, mvmvif-&gt;ap_sta_id,</div><div class='add'>+		ret = iwl_mvm_bt_coex_reduced_txp(mvm,</div><div class='add'>+						  mvmvif-&gt;deflink.ap_sta_id,</div><div class='ctx'> 						  false);</div><div class='ctx'> 	else</div><div class='del'>-		ret = iwl_mvm_bt_coex_reduced_txp(mvm, mvmvif-&gt;ap_sta_id, true);</div><div class='add'>+		ret = iwl_mvm_bt_coex_reduced_txp(mvm,</div><div class='add'>+						  mvmvif-&gt;deflink.ap_sta_id,</div><div class='add'>+						  true);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		IWL_ERR(mvm, "couldn't send BT_CONFIG HCMD upon RSSI event\n");</div><div class='hunk'>@@ -554,7 +591,7 @@ u16 iwl_mvm_coex_agg_time_limit(struct iwl_mvm *mvm,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(mvmsta-&gt;vif);</div><div class='del'>-	struct iwl_mvm_phy_ctxt *phy_ctxt = mvmvif-&gt;phy_ctxt;</div><div class='add'>+	struct iwl_mvm_phy_ctxt *phy_ctxt = mvmvif-&gt;deflink.phy_ctxt;</div><div class='ctx'> 	enum iwl_bt_coex_lut_type lut_type;</div><div class='ctx'> </div><div class='ctx'> 	if (mvm-&gt;last_bt_notif.ttc_status &amp; BIT(phy_ctxt-&gt;id))</div><div class='hunk'>@@ -578,7 +615,7 @@ bool iwl_mvm_bt_coex_is_mimo_allowed(struct iwl_mvm *mvm,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(mvmsta-&gt;vif);</div><div class='del'>-	struct iwl_mvm_phy_ctxt *phy_ctxt = mvmvif-&gt;phy_ctxt;</div><div class='add'>+	struct iwl_mvm_phy_ctxt *phy_ctxt = mvmvif-&gt;deflink.phy_ctxt;</div><div class='ctx'> 	enum iwl_bt_coex_lut_type lut_type;</div><div class='ctx'> </div><div class='ctx'> 	if (mvm-&gt;last_bt_notif.ttc_status &amp; BIT(phy_ctxt-&gt;id))</div><div class='hunk'>@@ -601,10 +638,6 @@ bool iwl_mvm_bt_coex_is_mimo_allowed(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> bool iwl_mvm_bt_coex_is_ant_avail(struct iwl_mvm *mvm, u8 ant)</div><div class='ctx'> {</div><div class='del'>-	/* there is no other antenna, shared antenna is always available */</div><div class='del'>-	if (mvm-&gt;cfg-&gt;bt_shared_single_ant)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='ctx'> 	if (ant &amp; mvm-&gt;cfg-&gt;non_shared_ant)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='hunk'>@@ -614,10 +647,6 @@ bool iwl_mvm_bt_coex_is_ant_avail(struct iwl_mvm *mvm, u8 ant)</div><div class='ctx'> </div><div class='ctx'> bool iwl_mvm_bt_coex_is_shared_ant_avail(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='del'>-	/* there is no other antenna, shared antenna is always available */</div><div class='del'>-	if (mvm-&gt;cfg-&gt;bt_shared_single_ant)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='ctx'> 	return le32_to_cpu(mvm-&gt;last_bt_notif.bt_activity_grading) &lt; BT_HIGH_TRAFFIC;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/constants.h b/drivers/net/wireless/intel/iwlwifi/mvm/constants.h<br/>index 1343f25f1090..17f94663c941 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/constants.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/constants.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/constants.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/constants.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='del'>- * Copyright (C) 2013-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2013-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2015 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __MVM_CONSTANTS_H</div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include "fw-api.h"</div><div class='ctx'> </div><div class='ctx'> #define IWL_MVM_UAPSD_NOAGG_BSSIDS_NUM		20</div><div class='add'>+#define IWL_MVM_TRIGGER_LINK_SEL_TIME_SEC	30</div><div class='ctx'> </div><div class='ctx'> #define IWL_MVM_DEFAULT_PS_TX_DATA_TIMEOUT	(100 * USEC_PER_MSEC)</div><div class='ctx'> #define IWL_MVM_DEFAULT_PS_RX_DATA_TIMEOUT	(100 * USEC_PER_MSEC)</div><div class='hunk'>@@ -18,7 +19,7 @@</div><div class='ctx'> #define IWL_MVM_WOWLAN_PS_RX_DATA_TIMEOUT	(10 * USEC_PER_MSEC)</div><div class='ctx'> #define IWL_MVM_SHORT_PS_TX_DATA_TIMEOUT	(2 * 1024) /* defined in TU */</div><div class='ctx'> #define IWL_MVM_SHORT_PS_RX_DATA_TIMEOUT	(40 * 1024) /* defined in TU */</div><div class='del'>-#define IWL_MVM_P2P_LOWLATENCY_PS_ENABLE	0</div><div class='add'>+#define IWL_MVM_P2P_LOWLATENCY_PS_ENABLE	1</div><div class='ctx'> #define IWL_MVM_UAPSD_RX_DATA_TIMEOUT		(50 * USEC_PER_MSEC)</div><div class='ctx'> #define IWL_MVM_UAPSD_TX_DATA_TIMEOUT		(50 * USEC_PER_MSEC)</div><div class='ctx'> #define IWL_MVM_UAPSD_QUEUES		(IEEE80211_WMM_IE_STA_QOSINFO_AC_VO |\</div><div class='hunk'>@@ -50,8 +51,6 @@</div><div class='ctx'> #define IWL_MVM_RS_RSSI_BASED_INIT_RATE         0</div><div class='ctx'> #define IWL_MVM_RS_80_20_FAR_RANGE_TWEAK	1</div><div class='ctx'> #define IWL_MVM_TOF_IS_RESPONDER		0</div><div class='del'>-#define IWL_MVM_HW_CSUM_DISABLE			0</div><div class='del'>-#define IWL_MVM_PARSE_NVM			0</div><div class='ctx'> #define IWL_MVM_ADWELL_ENABLE			1</div><div class='ctx'> #define IWL_MVM_ADWELL_MAX_BUDGET		0</div><div class='ctx'> #define IWL_MVM_TCM_LOAD_MEDIUM_THRESH		10 /* percentage */</div><div class='hunk'>@@ -60,6 +59,7 @@</div><div class='ctx'> #define IWL_MVM_UAPSD_NONAGG_PERIOD		5000 /* msecs */</div><div class='ctx'> #define IWL_MVM_UAPSD_NOAGG_LIST_LEN		IWL_MVM_UAPSD_NOAGG_BSSIDS_NUM</div><div class='ctx'> #define IWL_MVM_NON_TRANSMITTING_AP		0</div><div class='add'>+#define IWL_MVM_CONN_LISTEN_INTERVAL		10</div><div class='ctx'> #define IWL_MVM_RS_NUM_TRY_BEFORE_ANT_TOGGLE    1</div><div class='ctx'> #define IWL_MVM_RS_HT_VHT_RETRIES_PER_RATE      2</div><div class='ctx'> #define IWL_MVM_RS_HT_VHT_RETRIES_PER_RATE_TW   1</div><div class='hunk'>@@ -93,6 +93,8 @@</div><div class='ctx'> #define IWL_MVM_ENABLE_EBS			1</div><div class='ctx'> #define IWL_MVM_FTM_INITIATOR_ALGO		IWL_TOF_ALGO_TYPE_MAX_LIKE</div><div class='ctx'> #define IWL_MVM_FTM_INITIATOR_DYNACK		true</div><div class='add'>+#define IWL_MVM_FTM_LMR_FEEDBACK_TERMINATE	false</div><div class='add'>+#define IWL_MVM_FTM_TEST_INCORRECT_SAC	        false</div><div class='ctx'> #define IWL_MVM_FTM_R2I_MAX_REP			7</div><div class='ctx'> #define IWL_MVM_FTM_I2R_MAX_REP			7</div><div class='ctx'> #define IWL_MVM_FTM_R2I_MAX_STS			1</div><div class='hunk'>@@ -102,14 +104,11 @@</div><div class='ctx'> #define IWL_MVM_FTM_INITIATOR_SECURE_LTF	false</div><div class='ctx'> #define IWL_MVM_FTM_RESP_NDP_SUPPORT		true</div><div class='ctx'> #define IWL_MVM_FTM_RESP_LMR_FEEDBACK_SUPPORT	true</div><div class='add'>+#define IWL_MVM_FTM_NON_TB_MIN_TIME_BETWEEN_MSR	7</div><div class='add'>+#define IWL_MVM_FTM_NON_TB_MAX_TIME_BETWEEN_MSR	1000</div><div class='ctx'> #define IWL_MVM_D3_DEBUG			false</div><div class='ctx'> #define IWL_MVM_USE_TWT				true</div><div class='del'>-#define IWL_MVM_AMPDU_CONSEC_DROPS_DELBA	10</div><div class='del'>-#define IWL_MVM_USE_NSSN_SYNC			0</div><div class='del'>-#define IWL_MVM_PHY_FILTER_CHAIN_A		0</div><div class='del'>-#define IWL_MVM_PHY_FILTER_CHAIN_B		0</div><div class='del'>-#define IWL_MVM_PHY_FILTER_CHAIN_C		0</div><div class='del'>-#define IWL_MVM_PHY_FILTER_CHAIN_D		0</div><div class='add'>+#define IWL_MVM_AMPDU_CONSEC_DROPS_DELBA	20</div><div class='ctx'> #define IWL_MVM_FTM_INITIATOR_ENABLE_SMOOTH     false</div><div class='ctx'> #define IWL_MVM_FTM_INITIATOR_SMOOTH_ALPHA      40</div><div class='ctx'> /*  20016 pSec is 6 meter RTT, meaning 3 meter range */</div><div class='hunk'>@@ -119,5 +118,7 @@</div><div class='ctx'> #define IWL_MVM_DISABLE_AP_FILS			false</div><div class='ctx'> #define IWL_MVM_6GHZ_PASSIVE_SCAN_TIMEOUT       3000 /* in seconds */</div><div class='ctx'> #define IWL_MVM_6GHZ_PASSIVE_SCAN_ASSOC_TIMEOUT 60   /* in seconds */</div><div class='add'>+#define IWL_MVM_MIN_BEACON_INTERVAL_TU		16</div><div class='add'>+#define IWL_MVM_AUTO_EML_ENABLE                 true</div><div class='ctx'> </div><div class='ctx'> #endif /* __MVM_CONSTANTS_H */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c<br/>index 2e28cf299ef4..07f1a84c274e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/d3.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/d3.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/d3.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/d3.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2021 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -31,7 +31,7 @@ void iwl_mvm_set_rekey_data(struct ieee80211_hw *hw,</div><div class='ctx'> 	memcpy(mvmvif-&gt;rekey_data.kck, data-&gt;kck, data-&gt;kck_len);</div><div class='ctx'> 	mvmvif-&gt;rekey_data.akm = data-&gt;akm &amp; 0xFF;</div><div class='ctx'> 	mvmvif-&gt;rekey_data.replay_ctr =</div><div class='del'>-		cpu_to_le64(be64_to_cpup((__be64 *)data-&gt;replay_ctr));</div><div class='add'>+		cpu_to_le64(be64_to_cpup((const __be64 *)data-&gt;replay_ctr));</div><div class='ctx'> 	mvmvif-&gt;rekey_data.valid = true;</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='hunk'>@@ -101,11 +101,8 @@ static const u8 *iwl_mvm_find_max_pn(struct ieee80211_key_conf *key,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct wowlan_key_data {</div><div class='del'>-	struct iwl_wowlan_rsc_tsc_params_cmd *rsc_tsc;</div><div class='del'>-	struct iwl_wowlan_tkip_params_cmd *tkip;</div><div class='del'>-	struct iwl_wowlan_kek_kck_material_cmd_v3 *kek_kck_cmd;</div><div class='del'>-	bool error, use_rsc_tsc, use_tkip, configure_keys;</div><div class='add'>+struct wowlan_key_reprogram_data {</div><div class='add'>+	bool error;</div><div class='ctx'> 	int wep_key_idx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -117,32 +114,23 @@ static void iwl_mvm_wowlan_program_keys(struct ieee80211_hw *hw,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-	struct wowlan_key_data *data = _data;</div><div class='del'>-	struct aes_sc *aes_sc, *aes_tx_sc = NULL;</div><div class='del'>-	struct tkip_sc *tkip_sc, *tkip_tx_sc = NULL;</div><div class='del'>-	struct iwl_p1k_cache *rx_p1ks;</div><div class='del'>-	u8 *rx_mic_key;</div><div class='del'>-	struct ieee80211_key_seq seq;</div><div class='del'>-	u32 cur_rx_iv32 = 0;</div><div class='del'>-	u16 p1k[IWL_P1K_SIZE];</div><div class='del'>-	int ret, i;</div><div class='add'>+	struct wowlan_key_reprogram_data *data = _data;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	switch (key-&gt;cipher) {</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_WEP40:</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_WEP104: { /* hack it for now */</div><div class='del'>-		struct {</div><div class='del'>-			struct iwl_mvm_wep_key_cmd wep_key_cmd;</div><div class='del'>-			struct iwl_mvm_wep_key wep_key;</div><div class='del'>-		} __packed wkc = {</div><div class='del'>-			.wep_key_cmd.mac_id_n_color =</div><div class='del'>-				cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif-&gt;id,</div><div class='del'>-								mvmvif-&gt;color)),</div><div class='del'>-			.wep_key_cmd.num_keys = 1,</div><div class='del'>-			/* firmware sets STA_KEY_FLG_WEP_13BYTES */</div><div class='del'>-			.wep_key_cmd.decryption_type = STA_KEY_FLG_WEP,</div><div class='del'>-			.wep_key.key_index = key-&gt;keyidx,</div><div class='del'>-			.wep_key.key_size = key-&gt;keylen,</div><div class='del'>-		};</div><div class='add'>+		DEFINE_RAW_FLEX(struct iwl_mvm_wep_key_cmd, wkc, wep_key, 1);</div><div class='add'>+		struct iwl_mvm_wep_key *wep_key = wkc-&gt;wep_key;</div><div class='add'>+</div><div class='add'>+		wkc-&gt;mac_id_n_color =</div><div class='add'>+			cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif-&gt;id,</div><div class='add'>+							mvmvif-&gt;color));</div><div class='add'>+		wkc-&gt;num_keys = 1;</div><div class='add'>+		/* firmware sets STA_KEY_FLG_WEP_13BYTES */</div><div class='add'>+		wkc-&gt;decryption_type = STA_KEY_FLG_WEP;</div><div class='add'>+		wep_key-&gt;key_index = key-&gt;keyidx;</div><div class='add'>+		wep_key-&gt;key_size = key-&gt;keylen;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * This will fail -- the key functions don't set support</div><div class='hunk'>@@ -152,28 +140,26 @@ static void iwl_mvm_wowlan_program_keys(struct ieee80211_hw *hw,</div><div class='ctx'> 		if (key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		memcpy(&amp;wkc.wep_key.key[3], key-&gt;key, key-&gt;keylen);</div><div class='add'>+		memcpy(&amp;wep_key-&gt;key[3], key-&gt;key, key-&gt;keylen);</div><div class='ctx'> 		if (key-&gt;keyidx == mvmvif-&gt;tx_key_idx) {</div><div class='ctx'> 			/* TX key must be at offset 0 */</div><div class='del'>-			wkc.wep_key.key_offset = 0;</div><div class='add'>+			wep_key-&gt;key_offset = 0;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* others start at 1 */</div><div class='ctx'> 			data-&gt;wep_key_idx++;</div><div class='del'>-			wkc.wep_key.key_offset = data-&gt;wep_key_idx;</div><div class='add'>+			wep_key-&gt;key_offset = data-&gt;wep_key_idx;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (data-&gt;configure_keys) {</div><div class='del'>-			mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-			ret = iwl_mvm_send_cmd_pdu(mvm, WEP_KEY, 0,</div><div class='del'>-						   sizeof(wkc), &amp;wkc);</div><div class='del'>-			data-&gt;error = ret != 0;</div><div class='del'>-</div><div class='del'>-			mvm-&gt;ptk_ivlen = key-&gt;iv_len;</div><div class='del'>-			mvm-&gt;ptk_icvlen = key-&gt;icv_len;</div><div class='del'>-			mvm-&gt;gtk_ivlen = key-&gt;iv_len;</div><div class='del'>-			mvm-&gt;gtk_icvlen = key-&gt;icv_len;</div><div class='del'>-			mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-		}</div><div class='add'>+		mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+		ret = iwl_mvm_send_cmd_pdu(mvm, WEP_KEY, 0,</div><div class='add'>+					   __struct_size(wkc), wkc);</div><div class='add'>+		data-&gt;error = ret != 0;</div><div class='add'>+</div><div class='add'>+		mvm-&gt;ptk_ivlen = key-&gt;iv_len;</div><div class='add'>+		mvm-&gt;ptk_icvlen = key-&gt;icv_len;</div><div class='add'>+		mvm-&gt;gtk_ivlen = key-&gt;iv_len;</div><div class='add'>+		mvm-&gt;gtk_icvlen = key-&gt;icv_len;</div><div class='add'>+		mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 		/* don't upload key again */</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -183,10 +169,8 @@ static void iwl_mvm_wowlan_program_keys(struct ieee80211_hw *hw,</div><div class='ctx'> 		return;</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_BIP_GMAC_256:</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_BIP_GMAC_128:</div><div class='del'>-		data-&gt;kek_kck_cmd-&gt;igtk_cipher = cpu_to_le32(STA_KEY_FLG_GCMP);</div><div class='ctx'> 		return;</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_AES_CMAC:</div><div class='del'>-		data-&gt;kek_kck_cmd-&gt;igtk_cipher = cpu_to_le32(STA_KEY_FLG_CCM);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Ignore CMAC keys -- the WoWLAN firmware doesn't support them</div><div class='ctx'> 		 * but we also shouldn't abort suspend due to that. It does have</div><div class='hunk'>@@ -196,86 +180,104 @@ static void iwl_mvm_wowlan_program_keys(struct ieee80211_hw *hw,</div><div class='ctx'> 		 */</div><div class='ctx'> 		return;</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	/*</div><div class='add'>+	 * The D3 firmware hardcodes the key offset 0 as the key it</div><div class='add'>+	 * uses to transmit packets to the AP, i.e. the PTK.</div><div class='add'>+	 */</div><div class='add'>+	if (key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE) {</div><div class='add'>+		mvm-&gt;ptk_ivlen = key-&gt;iv_len;</div><div class='add'>+		mvm-&gt;ptk_icvlen = key-&gt;icv_len;</div><div class='add'>+		ret = iwl_mvm_set_sta_key(mvm, vif, sta, key, 0);</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * firmware only supports TSC/RSC for a single key,</div><div class='add'>+		 * so if there are multiple keep overwriting them</div><div class='add'>+		 * with new ones -- this relies on mac80211 doing</div><div class='add'>+		 * list_add_tail().</div><div class='add'>+		 */</div><div class='add'>+		mvm-&gt;gtk_ivlen = key-&gt;iv_len;</div><div class='add'>+		mvm-&gt;gtk_icvlen = key-&gt;icv_len;</div><div class='add'>+		ret = iwl_mvm_set_sta_key(mvm, vif, sta, key, 1);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+	data-&gt;error = ret != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct wowlan_key_rsc_tsc_data {</div><div class='add'>+	struct iwl_wowlan_rsc_tsc_params_cmd_ver_2 *rsc_tsc;</div><div class='add'>+	bool have_rsc_tsc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_wowlan_get_rsc_tsc_data(struct ieee80211_hw *hw,</div><div class='add'>+					    struct ieee80211_vif *vif,</div><div class='add'>+					    struct ieee80211_sta *sta,</div><div class='add'>+					    struct ieee80211_key_conf *key,</div><div class='add'>+					    void *_data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+	struct wowlan_key_rsc_tsc_data *data = _data;</div><div class='add'>+	struct aes_sc *aes_sc;</div><div class='add'>+	struct tkip_sc *tkip_sc, *tkip_tx_sc = NULL;</div><div class='add'>+	struct ieee80211_key_seq seq;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	switch (key-&gt;cipher) {</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='ctx'> 		if (sta) {</div><div class='ctx'> 			u64 pn64;</div><div class='ctx'> </div><div class='ctx'> 			tkip_sc =</div><div class='del'>-			   data-&gt;rsc_tsc-&gt;params.all_tsc_rsc.tkip.unicast_rsc;</div><div class='add'>+			   data-&gt;rsc_tsc-&gt;all_tsc_rsc.tkip.unicast_rsc;</div><div class='ctx'> 			tkip_tx_sc =</div><div class='del'>-				&amp;data-&gt;rsc_tsc-&gt;params.all_tsc_rsc.tkip.tsc;</div><div class='del'>-</div><div class='del'>-			rx_p1ks = data-&gt;tkip-&gt;rx_uni;</div><div class='add'>+				&amp;data-&gt;rsc_tsc-&gt;all_tsc_rsc.tkip.tsc;</div><div class='ctx'> </div><div class='ctx'> 			pn64 = atomic64_read(&amp;key-&gt;tx_pn);</div><div class='ctx'> 			tkip_tx_sc-&gt;iv16 = cpu_to_le16(TKIP_PN_TO_IV16(pn64));</div><div class='ctx'> 			tkip_tx_sc-&gt;iv32 = cpu_to_le32(TKIP_PN_TO_IV32(pn64));</div><div class='del'>-</div><div class='del'>-			ieee80211_get_tkip_p1k_iv(key, TKIP_PN_TO_IV32(pn64),</div><div class='del'>-						  p1k);</div><div class='del'>-			iwl_mvm_convert_p1k(p1k, data-&gt;tkip-&gt;tx.p1k);</div><div class='del'>-</div><div class='del'>-			memcpy(data-&gt;tkip-&gt;mic_keys.tx,</div><div class='del'>-			       &amp;key-&gt;key[NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY],</div><div class='del'>-			       IWL_MIC_KEY_SIZE);</div><div class='del'>-</div><div class='del'>-			rx_mic_key = data-&gt;tkip-&gt;mic_keys.rx_unicast;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			tkip_sc =</div><div class='del'>-			  data-&gt;rsc_tsc-&gt;params.all_tsc_rsc.tkip.multicast_rsc;</div><div class='del'>-			rx_p1ks = data-&gt;tkip-&gt;rx_multi;</div><div class='del'>-			rx_mic_key = data-&gt;tkip-&gt;mic_keys.rx_mcast;</div><div class='del'>-			data-&gt;kek_kck_cmd-&gt;gtk_cipher =</div><div class='del'>-				cpu_to_le32(STA_KEY_FLG_TKIP);</div><div class='add'>+			  data-&gt;rsc_tsc-&gt;all_tsc_rsc.tkip.multicast_rsc;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * For non-QoS this relies on the fact that both the uCode and</div><div class='del'>-		 * mac80211 use TID 0 (as they need to to avoid replay attacks)</div><div class='add'>+		 * mac80211 use TID 0 (as they need to avoid replay attacks)</div><div class='ctx'> 		 * for checking the IV in the frames.</div><div class='ctx'> 		 */</div><div class='ctx'> 		for (i = 0; i &lt; IWL_NUM_RSC; i++) {</div><div class='ctx'> 			ieee80211_get_key_rx_seq(key, i, &amp;seq);</div><div class='ctx'> 			tkip_sc[i].iv16 = cpu_to_le16(seq.tkip.iv16);</div><div class='ctx'> 			tkip_sc[i].iv32 = cpu_to_le32(seq.tkip.iv32);</div><div class='del'>-			/* wrapping isn't allowed, AP must rekey */</div><div class='del'>-			if (seq.tkip.iv32 &gt; cur_rx_iv32)</div><div class='del'>-				cur_rx_iv32 = seq.tkip.iv32;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ieee80211_get_tkip_rx_p1k(key, vif-&gt;bss_conf.bssid,</div><div class='del'>-					  cur_rx_iv32, p1k);</div><div class='del'>-		iwl_mvm_convert_p1k(p1k, rx_p1ks[0].p1k);</div><div class='del'>-		ieee80211_get_tkip_rx_p1k(key, vif-&gt;bss_conf.bssid,</div><div class='del'>-					  cur_rx_iv32 + 1, p1k);</div><div class='del'>-		iwl_mvm_convert_p1k(p1k, rx_p1ks[1].p1k);</div><div class='del'>-</div><div class='del'>-		memcpy(rx_mic_key,</div><div class='del'>-		       &amp;key-&gt;key[NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY],</div><div class='del'>-		       IWL_MIC_KEY_SIZE);</div><div class='del'>-</div><div class='del'>-		data-&gt;use_tkip = true;</div><div class='del'>-		data-&gt;use_rsc_tsc = true;</div><div class='add'>+		data-&gt;have_rsc_tsc = true;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_CCMP:</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_GCMP:</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='ctx'> 		if (sta) {</div><div class='add'>+			struct aes_sc *aes_tx_sc;</div><div class='ctx'> 			u64 pn64;</div><div class='ctx'> </div><div class='ctx'> 			aes_sc =</div><div class='del'>-			   data-&gt;rsc_tsc-&gt;params.all_tsc_rsc.aes.unicast_rsc;</div><div class='add'>+			   data-&gt;rsc_tsc-&gt;all_tsc_rsc.aes.unicast_rsc;</div><div class='ctx'> 			aes_tx_sc =</div><div class='del'>-				&amp;data-&gt;rsc_tsc-&gt;params.all_tsc_rsc.aes.tsc;</div><div class='add'>+				&amp;data-&gt;rsc_tsc-&gt;all_tsc_rsc.aes.tsc;</div><div class='ctx'> </div><div class='ctx'> 			pn64 = atomic64_read(&amp;key-&gt;tx_pn);</div><div class='ctx'> 			aes_tx_sc-&gt;pn = cpu_to_le64(pn64);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			aes_sc =</div><div class='del'>-			   data-&gt;rsc_tsc-&gt;params.all_tsc_rsc.aes.multicast_rsc;</div><div class='del'>-			data-&gt;kek_kck_cmd-&gt;gtk_cipher =</div><div class='del'>-				key-&gt;cipher == WLAN_CIPHER_SUITE_CCMP ?</div><div class='del'>-				cpu_to_le32(STA_KEY_FLG_CCM) :</div><div class='del'>-				cpu_to_le32(STA_KEY_FLG_GCMP);</div><div class='add'>+			   data-&gt;rsc_tsc-&gt;all_tsc_rsc.aes.multicast_rsc;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -297,7 +299,7 @@ static void iwl_mvm_wowlan_program_keys(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 			for (i = 0; i &lt; IWL_MAX_TID_COUNT; i++) {</div><div class='ctx'> 				pn = iwl_mvm_find_max_pn(key, ptk_pn, &amp;seq, i,</div><div class='del'>-						mvm-&gt;trans-&gt;num_rx_queues);</div><div class='add'>+						mvm-&gt;trans-&gt;info.num_rxqs);</div><div class='ctx'> 				aes_sc[i].pn = cpu_to_le64((u64)pn[5] |</div><div class='ctx'> 							   ((u64)pn[4] &lt;&lt; 8) |</div><div class='ctx'> 							   ((u64)pn[3] &lt;&lt; 16) |</div><div class='hunk'>@@ -320,35 +322,305 @@ static void iwl_mvm_wowlan_program_keys(struct ieee80211_hw *hw,</div><div class='ctx'> 							   ((u64)pn[0] &lt;&lt; 40));</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		data-&gt;use_rsc_tsc = true;</div><div class='add'>+		data-&gt;have_rsc_tsc = true;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_WOWLAN(mvm, "GTK cipher %d\n", data-&gt;kek_kck_cmd-&gt;gtk_cipher);</div><div class='add'>+struct wowlan_key_rsc_v5_data {</div><div class='add'>+	struct iwl_wowlan_rsc_tsc_params_cmd *rsc;</div><div class='add'>+	bool have_rsc;</div><div class='add'>+	int gtks;</div><div class='add'>+	int gtk_ids[4];</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;configure_keys) {</div><div class='del'>-		mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+static void iwl_mvm_wowlan_get_rsc_v5_data(struct ieee80211_hw *hw,</div><div class='add'>+					   struct ieee80211_vif *vif,</div><div class='add'>+					   struct ieee80211_sta *sta,</div><div class='add'>+					   struct ieee80211_key_conf *key,</div><div class='add'>+					   void *_data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+	struct wowlan_key_rsc_v5_data *data = _data;</div><div class='add'>+	struct ieee80211_key_seq seq;</div><div class='add'>+	__le64 *rsc;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* only for ciphers that can be PTK/GTK */</div><div class='add'>+	switch (key-&gt;cipher) {</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sta) {</div><div class='add'>+		rsc = data-&gt;rsc-&gt;ucast_rsc;</div><div class='add'>+	} else {</div><div class='add'>+		if (WARN_ON(data-&gt;gtks &gt;= ARRAY_SIZE(data-&gt;gtk_ids)))</div><div class='add'>+			return;</div><div class='add'>+		data-&gt;gtk_ids[data-&gt;gtks] = key-&gt;keyidx;</div><div class='add'>+		rsc = data-&gt;rsc-&gt;mcast_rsc[data-&gt;gtks % 2];</div><div class='add'>+		if (WARN_ON(key-&gt;keyidx &gt;=</div><div class='add'>+				ARRAY_SIZE(data-&gt;rsc-&gt;mcast_key_id_map)))</div><div class='add'>+			return;</div><div class='add'>+		data-&gt;rsc-&gt;mcast_key_id_map[key-&gt;keyidx] = data-&gt;gtks % 2;</div><div class='add'>+		if (data-&gt;gtks &gt;= 2) {</div><div class='add'>+			int prev = data-&gt;gtks - 2;</div><div class='add'>+			int prev_idx = data-&gt;gtk_ids[prev];</div><div class='add'>+</div><div class='add'>+			data-&gt;rsc-&gt;mcast_key_id_map[prev_idx] =</div><div class='add'>+				IWL_MCAST_KEY_MAP_INVALID;</div><div class='add'>+		}</div><div class='add'>+		data-&gt;gtks++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (key-&gt;cipher) {</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * For non-QoS this relies on the fact that both the uCode and</div><div class='add'>+		 * mac80211 use TID 0 (as they need to avoid replay attacks)</div><div class='add'>+		 * for checking the IV in the frames.</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; IWL_MAX_TID_COUNT; i++) {</div><div class='add'>+			ieee80211_get_key_rx_seq(key, i, &amp;seq);</div><div class='add'>+</div><div class='add'>+			rsc[i] = cpu_to_le64(((u64)seq.tkip.iv32 &lt;&lt; 16) |</div><div class='add'>+					     seq.tkip.iv16);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		data-&gt;have_rsc = true;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='ctx'> 		/*</div><div class='del'>-		 * The D3 firmware hardcodes the key offset 0 as the key it</div><div class='del'>-		 * uses to transmit packets to the AP, i.e. the PTK.</div><div class='add'>+		 * For non-QoS this relies on the fact that both the uCode and</div><div class='add'>+		 * mac80211/our RX code use TID 0 for checking the PN.</div><div class='ctx'> 		 */</div><div class='del'>-		if (key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE) {</div><div class='del'>-			mvm-&gt;ptk_ivlen = key-&gt;iv_len;</div><div class='del'>-			mvm-&gt;ptk_icvlen = key-&gt;icv_len;</div><div class='del'>-			ret = iwl_mvm_set_sta_key(mvm, vif, sta, key, 0);</div><div class='add'>+		if (sta) {</div><div class='add'>+			struct iwl_mvm_sta *mvmsta;</div><div class='add'>+			struct iwl_mvm_key_pn *ptk_pn;</div><div class='add'>+			const u8 *pn;</div><div class='add'>+</div><div class='add'>+			mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+			rcu_read_lock();</div><div class='add'>+			ptk_pn = rcu_dereference(mvmsta-&gt;ptk_pn[key-&gt;keyidx]);</div><div class='add'>+			if (WARN_ON(!ptk_pn)) {</div><div class='add'>+				rcu_read_unlock();</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; IWL_MAX_TID_COUNT; i++) {</div><div class='add'>+				pn = iwl_mvm_find_max_pn(key, ptk_pn, &amp;seq, i,</div><div class='add'>+						mvm-&gt;trans-&gt;info.num_rxqs);</div><div class='add'>+				rsc[i] = cpu_to_le64((u64)pn[5] |</div><div class='add'>+						     ((u64)pn[4] &lt;&lt; 8) |</div><div class='add'>+						     ((u64)pn[3] &lt;&lt; 16) |</div><div class='add'>+						     ((u64)pn[2] &lt;&lt; 24) |</div><div class='add'>+						     ((u64)pn[1] &lt;&lt; 32) |</div><div class='add'>+						     ((u64)pn[0] &lt;&lt; 40));</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> 		} else {</div><div class='del'>-			/*</div><div class='del'>-			 * firmware only supports TSC/RSC for a single key,</div><div class='del'>-			 * so if there are multiple keep overwriting them</div><div class='del'>-			 * with new ones -- this relies on mac80211 doing</div><div class='del'>-			 * list_add_tail().</div><div class='del'>-			 */</div><div class='del'>-			mvm-&gt;gtk_ivlen = key-&gt;iv_len;</div><div class='del'>-			mvm-&gt;gtk_icvlen = key-&gt;icv_len;</div><div class='del'>-			ret = iwl_mvm_set_sta_key(mvm, vif, sta, key, 1);</div><div class='add'>+			for (i = 0; i &lt; IWL_MAX_TID_COUNT; i++) {</div><div class='add'>+				u8 *pn = seq.ccmp.pn;</div><div class='add'>+</div><div class='add'>+				ieee80211_get_key_rx_seq(key, i, &amp;seq);</div><div class='add'>+				rsc[i] = cpu_to_le64((u64)pn[5] |</div><div class='add'>+						     ((u64)pn[4] &lt;&lt; 8) |</div><div class='add'>+						     ((u64)pn[3] &lt;&lt; 16) |</div><div class='add'>+						     ((u64)pn[2] &lt;&lt; 24) |</div><div class='add'>+						     ((u64)pn[1] &lt;&lt; 32) |</div><div class='add'>+						     ((u64)pn[0] &lt;&lt; 40));</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='del'>-		mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-		data-&gt;error = ret != 0;</div><div class='add'>+		data-&gt;have_rsc = true;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_wowlan_config_rsc_tsc(struct iwl_mvm *mvm,</div><div class='add'>+					 struct ieee80211_vif *vif,</div><div class='add'>+					 struct iwl_mvm_vif_link_info *mvm_link)</div><div class='add'>+{</div><div class='add'>+	int ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, WOWLAN_TSC_RSC_PARAM,</div><div class='add'>+					IWL_FW_CMD_VER_UNKNOWN);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ver == 5) {</div><div class='add'>+		struct wowlan_key_rsc_v5_data data = {};</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		data.rsc = kzalloc(sizeof(*data.rsc), GFP_KERNEL);</div><div class='add'>+		if (!data.rsc)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(data.rsc-&gt;mcast_key_id_map); i++)</div><div class='add'>+			data.rsc-&gt;mcast_key_id_map[i] =</div><div class='add'>+				IWL_MCAST_KEY_MAP_INVALID;</div><div class='add'>+		data.rsc-&gt;sta_id = cpu_to_le32(mvm_link-&gt;ap_sta_id);</div><div class='add'>+</div><div class='add'>+		ieee80211_iter_keys(mvm-&gt;hw, vif,</div><div class='add'>+				    iwl_mvm_wowlan_get_rsc_v5_data,</div><div class='add'>+				    &amp;data);</div><div class='add'>+</div><div class='add'>+		if (data.have_rsc)</div><div class='add'>+			ret = iwl_mvm_send_cmd_pdu(mvm, WOWLAN_TSC_RSC_PARAM,</div><div class='add'>+						   CMD_ASYNC, sizeof(*data.rsc),</div><div class='add'>+						   data.rsc);</div><div class='add'>+		else</div><div class='add'>+			ret = 0;</div><div class='add'>+		kfree(data.rsc);</div><div class='add'>+	} else if (ver == 2 || ver == IWL_FW_CMD_VER_UNKNOWN) {</div><div class='add'>+		struct wowlan_key_rsc_tsc_data data = {};</div><div class='add'>+</div><div class='add'>+		data.rsc_tsc = kzalloc(sizeof(*data.rsc_tsc), GFP_KERNEL);</div><div class='add'>+		if (!data.rsc_tsc)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		ieee80211_iter_keys(mvm-&gt;hw, vif,</div><div class='add'>+				    iwl_mvm_wowlan_get_rsc_tsc_data,</div><div class='add'>+				    &amp;data);</div><div class='add'>+</div><div class='add'>+		if (data.have_rsc_tsc)</div><div class='add'>+			ret = iwl_mvm_send_cmd_pdu(mvm, WOWLAN_TSC_RSC_PARAM,</div><div class='add'>+						   CMD_ASYNC,</div><div class='add'>+						   sizeof(*data.rsc_tsc),</div><div class='add'>+						   data.rsc_tsc);</div><div class='add'>+		else</div><div class='add'>+			ret = 0;</div><div class='add'>+		kfree(data.rsc_tsc);</div><div class='add'>+	} else {</div><div class='add'>+		ret = 0;</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct wowlan_key_tkip_data {</div><div class='add'>+	struct iwl_wowlan_tkip_params_cmd tkip;</div><div class='add'>+	bool have_tkip_keys;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_wowlan_get_tkip_data(struct ieee80211_hw *hw,</div><div class='add'>+					 struct ieee80211_vif *vif,</div><div class='add'>+					 struct ieee80211_sta *sta,</div><div class='add'>+					 struct ieee80211_key_conf *key,</div><div class='add'>+					 void *_data)</div><div class='add'>+{</div><div class='add'>+	struct wowlan_key_tkip_data *data = _data;</div><div class='add'>+	struct iwl_p1k_cache *rx_p1ks;</div><div class='add'>+	u8 *rx_mic_key;</div><div class='add'>+	struct ieee80211_key_seq seq;</div><div class='add'>+	u32 cur_rx_iv32 = 0;</div><div class='add'>+	u16 p1k[IWL_P1K_SIZE];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	switch (key-&gt;cipher) {</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		if (sta) {</div><div class='add'>+			u64 pn64;</div><div class='add'>+</div><div class='add'>+			rx_p1ks = data-&gt;tkip.rx_uni;</div><div class='add'>+</div><div class='add'>+			pn64 = atomic64_read(&amp;key-&gt;tx_pn);</div><div class='add'>+</div><div class='add'>+			ieee80211_get_tkip_p1k_iv(key, TKIP_PN_TO_IV32(pn64),</div><div class='add'>+						  p1k);</div><div class='add'>+			iwl_mvm_convert_p1k(p1k, data-&gt;tkip.tx.p1k);</div><div class='add'>+</div><div class='add'>+			memcpy(data-&gt;tkip.mic_keys.tx,</div><div class='add'>+			       &amp;key-&gt;key[NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY],</div><div class='add'>+			       IWL_MIC_KEY_SIZE);</div><div class='add'>+</div><div class='add'>+			rx_mic_key = data-&gt;tkip.mic_keys.rx_unicast;</div><div class='add'>+		} else {</div><div class='add'>+			rx_p1ks = data-&gt;tkip.rx_multi;</div><div class='add'>+			rx_mic_key = data-&gt;tkip.mic_keys.rx_mcast;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; IWL_NUM_RSC; i++) {</div><div class='add'>+			ieee80211_get_key_rx_seq(key, i, &amp;seq);</div><div class='add'>+			/* wrapping isn't allowed, AP must rekey */</div><div class='add'>+			if (seq.tkip.iv32 &gt; cur_rx_iv32)</div><div class='add'>+				cur_rx_iv32 = seq.tkip.iv32;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ieee80211_get_tkip_rx_p1k(key, vif-&gt;bss_conf.bssid,</div><div class='add'>+					  cur_rx_iv32, p1k);</div><div class='add'>+		iwl_mvm_convert_p1k(p1k, rx_p1ks[0].p1k);</div><div class='add'>+		ieee80211_get_tkip_rx_p1k(key, vif-&gt;bss_conf.bssid,</div><div class='add'>+					  cur_rx_iv32 + 1, p1k);</div><div class='add'>+		iwl_mvm_convert_p1k(p1k, rx_p1ks[1].p1k);</div><div class='add'>+</div><div class='add'>+		memcpy(rx_mic_key,</div><div class='add'>+		       &amp;key-&gt;key[NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY],</div><div class='add'>+		       IWL_MIC_KEY_SIZE);</div><div class='add'>+</div><div class='add'>+		data-&gt;have_tkip_keys = true;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct wowlan_key_gtk_type_iter {</div><div class='add'>+	struct iwl_wowlan_kek_kck_material_cmd_v4 *kek_kck_cmd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_wowlan_gtk_type_iter(struct ieee80211_hw *hw,</div><div class='add'>+					 struct ieee80211_vif *vif,</div><div class='add'>+					 struct ieee80211_sta *sta,</div><div class='add'>+					 struct ieee80211_key_conf *key,</div><div class='add'>+					 void *_data)</div><div class='add'>+{</div><div class='add'>+	struct wowlan_key_gtk_type_iter *data = _data;</div><div class='add'>+	__le32 *cipher = NULL;</div><div class='add'>+</div><div class='add'>+	if (key-&gt;keyidx == 4 || key-&gt;keyidx == 5)</div><div class='add'>+		cipher = &amp;data-&gt;kek_kck_cmd-&gt;igtk_cipher;</div><div class='add'>+	if (key-&gt;keyidx == 6 || key-&gt;keyidx == 7)</div><div class='add'>+		cipher = &amp;data-&gt;kek_kck_cmd-&gt;bigtk_cipher;</div><div class='add'>+</div><div class='add'>+	switch (key-&gt;cipher) {</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		if (!sta)</div><div class='add'>+			data-&gt;kek_kck_cmd-&gt;gtk_cipher =</div><div class='add'>+				cpu_to_le32(STA_KEY_FLG_TKIP);</div><div class='add'>+		return;</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_GMAC_256:</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_GMAC_128:</div><div class='add'>+		if (cipher)</div><div class='add'>+			*cipher = cpu_to_le32(STA_KEY_FLG_GCMP);</div><div class='add'>+		return;</div><div class='add'>+	case WLAN_CIPHER_SUITE_AES_CMAC:</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_CMAC_256:</div><div class='add'>+		if (cipher)</div><div class='add'>+			*cipher = cpu_to_le32(STA_KEY_FLG_CCM);</div><div class='add'>+		return;</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+		if (!sta)</div><div class='add'>+			data-&gt;kek_kck_cmd-&gt;gtk_cipher =</div><div class='add'>+				cpu_to_le32(STA_KEY_FLG_CCM);</div><div class='add'>+		return;</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='add'>+		if (!sta)</div><div class='add'>+			data-&gt;kek_kck_cmd-&gt;gtk_cipher =</div><div class='add'>+				cpu_to_le32(STA_KEY_FLG_GCMP);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -393,6 +665,7 @@ static int iwl_mvm_send_patterns_v1(struct iwl_mvm *mvm,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_mvm_send_patterns(struct iwl_mvm *mvm,</div><div class='add'>+				 struct iwl_mvm_vif_link_info *mvm_link,</div><div class='ctx'> 				 struct cfg80211_wowlan *wowlan)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_wowlan_patterns_cmd *pattern_cmd;</div><div class='hunk'>@@ -401,6 +674,8 @@ static int iwl_mvm_send_patterns(struct iwl_mvm *mvm,</div><div class='ctx'> 		.dataflags[0] = IWL_HCMD_DFL_NOCOPY,</div><div class='ctx'> 	};</div><div class='ctx'> 	int i, err;</div><div class='add'>+	int ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, cmd.id,</div><div class='add'>+					IWL_FW_CMD_VER_UNKNOWN);</div><div class='ctx'> </div><div class='ctx'> 	if (!wowlan-&gt;n_patterns)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -408,11 +683,13 @@ static int iwl_mvm_send_patterns(struct iwl_mvm *mvm,</div><div class='ctx'> 	cmd.len[0] = sizeof(*pattern_cmd) +</div><div class='ctx'> 		wowlan-&gt;n_patterns * sizeof(struct iwl_wowlan_pattern_v2);</div><div class='ctx'> </div><div class='del'>-	pattern_cmd = kmalloc(cmd.len[0], GFP_KERNEL);</div><div class='add'>+	pattern_cmd = kzalloc(cmd.len[0], GFP_KERNEL);</div><div class='ctx'> 	if (!pattern_cmd)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	pattern_cmd-&gt;n_patterns = cpu_to_le32(wowlan-&gt;n_patterns);</div><div class='add'>+	pattern_cmd-&gt;n_patterns = wowlan-&gt;n_patterns;</div><div class='add'>+	if (ver &gt;= 3)</div><div class='add'>+		pattern_cmd-&gt;sta_id = mvm_link-&gt;ap_sta_id;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; wowlan-&gt;n_patterns; i++) {</div><div class='ctx'> 		int mask_len = DIV_ROUND_UP(wowlan-&gt;patterns[i].pattern_len, 8);</div><div class='hunk'>@@ -442,40 +719,42 @@ static int iwl_mvm_d3_reprogram(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	struct ieee80211_chanctx_conf *ctx;</div><div class='ctx'> 	u8 chains_static, chains_dynamic;</div><div class='del'>-	struct cfg80211_chan_def chandef;</div><div class='add'>+	struct cfg80211_chan_def chandef, ap_def;</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> 	struct iwl_binding_cmd_v1 binding_cmd = {};</div><div class='ctx'> 	struct iwl_time_quota_cmd quota_cmd = {};</div><div class='ctx'> 	struct iwl_time_quota_data *quota;</div><div class='ctx'> 	u32 status;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(iwl_mvm_is_cdb_supported(mvm)))</div><div class='add'>+	if (WARN_ON_ONCE(iwl_mvm_is_cdb_supported(mvm) ||</div><div class='add'>+			 ieee80211_vif_is_mld(vif)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* add back the PHY */</div><div class='del'>-	if (WARN_ON(!mvmvif-&gt;phy_ctxt))</div><div class='add'>+	if (WARN_ON(!mvmvif-&gt;deflink.phy_ctxt))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	ctx = rcu_dereference(vif-&gt;chanctx_conf);</div><div class='add'>+	ctx = rcu_dereference(vif-&gt;bss_conf.chanctx_conf);</div><div class='ctx'> 	if (WARN_ON(!ctx)) {</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	chandef = ctx-&gt;def;</div><div class='add'>+	ap_def = ctx-&gt;ap;</div><div class='ctx'> 	chains_static = ctx-&gt;rx_chains_static;</div><div class='ctx'> 	chains_dynamic = ctx-&gt;rx_chains_dynamic;</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_phy_ctxt_add(mvm, mvmvif-&gt;phy_ctxt, &amp;chandef,</div><div class='del'>-				   chains_static, chains_dynamic);</div><div class='add'>+	ret = iwl_mvm_phy_ctxt_add(mvm, mvmvif-&gt;deflink.phy_ctxt, &amp;chandef,</div><div class='add'>+				   &amp;ap_def, chains_static, chains_dynamic);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* add back the MAC */</div><div class='ctx'> 	mvmvif-&gt;uploaded = false;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(!vif-&gt;bss_conf.assoc))</div><div class='add'>+	if (WARN_ON(!vif-&gt;cfg.assoc))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_mvm_mac_ctxt_add(mvm, vif);</div><div class='hunk'>@@ -484,12 +763,12 @@ static int iwl_mvm_d3_reprogram(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> </div><div class='ctx'> 	/* add back binding - XXX refactor? */</div><div class='ctx'> 	binding_cmd.id_and_color =</div><div class='del'>-		cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif-&gt;phy_ctxt-&gt;id,</div><div class='del'>-						mvmvif-&gt;phy_ctxt-&gt;color));</div><div class='add'>+		cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif-&gt;deflink.phy_ctxt-&gt;id,</div><div class='add'>+						mvmvif-&gt;deflink.phy_ctxt-&gt;color));</div><div class='ctx'> 	binding_cmd.action = cpu_to_le32(FW_CTXT_ACTION_ADD);</div><div class='ctx'> 	binding_cmd.phy =</div><div class='del'>-		cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif-&gt;phy_ctxt-&gt;id,</div><div class='del'>-						mvmvif-&gt;phy_ctxt-&gt;color));</div><div class='add'>+		cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif-&gt;deflink.phy_ctxt-&gt;id,</div><div class='add'>+						mvmvif-&gt;deflink.phy_ctxt-&gt;color));</div><div class='ctx'> 	binding_cmd.macs[0] = cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif-&gt;id,</div><div class='ctx'> 							      mvmvif-&gt;color));</div><div class='ctx'> 	for (i = 1; i &lt; MAX_MACS_IN_BINDING; i++)</div><div class='hunk'>@@ -512,7 +791,8 @@ static int iwl_mvm_d3_reprogram(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	ret = iwl_mvm_sta_send_to_fw(mvm, ap_sta, false, 0);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	rcu_assign_pointer(mvm-&gt;fw_id_to_mac_id[mvmvif-&gt;ap_sta_id], ap_sta);</div><div class='add'>+	rcu_assign_pointer(mvm-&gt;fw_id_to_mac_id[mvmvif-&gt;deflink.ap_sta_id],</div><div class='add'>+			   ap_sta);</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -521,8 +801,8 @@ static int iwl_mvm_d3_reprogram(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	/* and some quota */</div><div class='ctx'> 	quota = iwl_mvm_quota_cmd_get_quota(mvm, &amp;quota_cmd, 0);</div><div class='ctx'> 	quota-&gt;id_and_color =</div><div class='del'>-		cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif-&gt;phy_ctxt-&gt;id,</div><div class='del'>-						mvmvif-&gt;phy_ctxt-&gt;color));</div><div class='add'>+		cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif-&gt;deflink.phy_ctxt-&gt;id,</div><div class='add'>+						mvmvif-&gt;deflink.phy_ctxt-&gt;color));</div><div class='ctx'> 	quota-&gt;quota = cpu_to_le32(IWL_MVM_MAX_QUOTA);</div><div class='ctx'> 	quota-&gt;max_duration = cpu_to_le32(IWL_MVM_MAX_QUOTA);</div><div class='ctx'> </div><div class='hunk'>@@ -536,7 +816,7 @@ static int iwl_mvm_d3_reprogram(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		IWL_ERR(mvm, "Failed to send quota: %d\n", ret);</div><div class='ctx'> </div><div class='del'>-	if (iwl_mvm_is_lar_supported(mvm) &amp;&amp; iwl_mvm_init_fw_regd(mvm))</div><div class='add'>+	if (iwl_mvm_is_lar_supported(mvm) &amp;&amp; iwl_mvm_init_fw_regd(mvm, false))</div><div class='ctx'> 		IWL_ERR(mvm, "Failed to initialize D3 LAR information\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -632,28 +912,38 @@ static int iwl_mvm_switch_to_d3(struct iwl_mvm *mvm)</div><div class='ctx'> static int</div><div class='ctx'> iwl_mvm_get_wowlan_config(struct iwl_mvm *mvm,</div><div class='ctx'> 			  struct cfg80211_wowlan *wowlan,</div><div class='del'>-			  struct iwl_wowlan_config_cmd *wowlan_config_cmd,</div><div class='add'>+			  struct iwl_wowlan_config_cmd_v6 *wowlan_config_cmd,</div><div class='ctx'> 			  struct ieee80211_vif *vif, struct iwl_mvm_vif *mvmvif,</div><div class='ctx'> 			  struct ieee80211_sta *ap_sta)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='ctx'> 	struct iwl_mvm_sta *mvm_ap_sta = iwl_mvm_sta_from_mac80211(ap_sta);</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: wowlan_config_cmd-&gt;wowlan_ba_teardown_tids */</div><div class='ctx'> </div><div class='ctx'> 	wowlan_config_cmd-&gt;is_11n_connection =</div><div class='del'>-					ap_sta-&gt;ht_cap.ht_supported;</div><div class='add'>+					ap_sta-&gt;deflink.ht_cap.ht_supported;</div><div class='ctx'> 	wowlan_config_cmd-&gt;flags = ENABLE_L3_FILTERING |</div><div class='ctx'> 		ENABLE_NBNS_FILTERING | ENABLE_DHCP_FILTERING;</div><div class='ctx'> </div><div class='del'>-	/* Query the last used seqno and set it */</div><div class='del'>-	ret = iwl_mvm_get_last_nonqos_seq(mvm, vif);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='add'>+	if (ap_sta-&gt;mfp)</div><div class='add'>+		wowlan_config_cmd-&gt;flags |= IS_11W_ASSOC;</div><div class='add'>+</div><div class='add'>+	if (rcu_access_pointer(mvmvif-&gt;bcn_prot.keys[0]) ||</div><div class='add'>+	    rcu_access_pointer(mvmvif-&gt;bcn_prot.keys[1]))</div><div class='add'>+		wowlan_config_cmd-&gt;flags |= HAS_BEACON_PROTECTION;</div><div class='ctx'> </div><div class='del'>-	wowlan_config_cmd-&gt;non_qos_seq = cpu_to_le16(ret);</div><div class='add'>+	if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, WOWLAN_CONFIGURATION, 0) &lt; 6) {</div><div class='add'>+		/* Query the last used seqno and set it */</div><div class='add'>+		int ret = iwl_mvm_get_last_nonqos_seq(mvm, vif);</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_set_wowlan_qos_seq(mvm_ap_sta, wowlan_config_cmd);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		wowlan_config_cmd-&gt;non_qos_seq = cpu_to_le16(ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, WOWLAN_CONFIGURATION, 0) &lt; 7)</div><div class='add'>+		iwl_mvm_set_wowlan_qos_seq(mvm_ap_sta, wowlan_config_cmd);</div><div class='ctx'> </div><div class='ctx'> 	if (wowlan-&gt;disconnect)</div><div class='ctx'> 		wowlan_config_cmd-&gt;wakeup_filter |=</div><div class='hunk'>@@ -704,118 +994,89 @@ iwl_mvm_get_wowlan_config(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> static int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm,</div><div class='ctx'> 					    struct ieee80211_vif *vif,</div><div class='del'>-					    u32 cmd_flags)</div><div class='add'>+					    struct iwl_mvm_vif_link_info *mvm_link)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_wowlan_kek_kck_material_cmd_v3 kek_kck_cmd = {};</div><div class='del'>-	struct iwl_wowlan_tkip_params_cmd tkip_cmd = {};</div><div class='ctx'> 	bool unified = fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 				   IWL_UCODE_TLV_CAPA_CNSLDTD_D3_D0_IMG);</div><div class='del'>-	struct wowlan_key_data key_data = {</div><div class='del'>-		.configure_keys = !unified,</div><div class='del'>-		.use_rsc_tsc = false,</div><div class='del'>-		.tkip = &amp;tkip_cmd,</div><div class='del'>-		.use_tkip = false,</div><div class='del'>-		.kek_kck_cmd = &amp;kek_kck_cmd,</div><div class='del'>-	};</div><div class='add'>+	struct wowlan_key_reprogram_data key_data = {};</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u8 cmd_ver;</div><div class='ctx'> 	size_t cmd_size;</div><div class='ctx'> </div><div class='del'>-	key_data.rsc_tsc = kzalloc(sizeof(*key_data.rsc_tsc), GFP_KERNEL);</div><div class='del'>-	if (!key_data.rsc_tsc)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if we have to configure keys, call ieee80211_iter_keys(),</div><div class='del'>-	 * as we need non-atomic context in order to take the</div><div class='del'>-	 * required locks.</div><div class='del'>-	 */</div><div class='del'>-	/*</div><div class='del'>-	 * Note that currently we don't propagate cmd_flags</div><div class='del'>-	 * to the iterator. In case of key_data.configure_keys,</div><div class='del'>-	 * all the configured commands are SYNC, and</div><div class='del'>-	 * iwl_mvm_wowlan_program_keys() will take care of</div><div class='del'>-	 * locking/unlocking mvm-&gt;mutex.</div><div class='del'>-	 */</div><div class='del'>-	ieee80211_iter_keys(mvm-&gt;hw, vif, iwl_mvm_wowlan_program_keys,</div><div class='del'>-			    &amp;key_data);</div><div class='add'>+	if (!unified) {</div><div class='add'>+		/*</div><div class='add'>+		 * if we have to configure keys, call ieee80211_iter_keys(),</div><div class='add'>+		 * as we need non-atomic context in order to take the</div><div class='add'>+		 * required locks.</div><div class='add'>+		 */</div><div class='add'>+		/*</div><div class='add'>+		 * Note that currently we don't use CMD_ASYNC in the iterator.</div><div class='add'>+		 * In case of key_data.configure_keys, all the configured</div><div class='add'>+		 * commands are SYNC, and iwl_mvm_wowlan_program_keys() will</div><div class='add'>+		 * take care of locking/unlocking mvm-&gt;mutex.</div><div class='add'>+		 */</div><div class='add'>+		ieee80211_iter_keys(mvm-&gt;hw, vif, iwl_mvm_wowlan_program_keys,</div><div class='add'>+				    &amp;key_data);</div><div class='ctx'> </div><div class='del'>-	if (key_data.error) {</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out;</div><div class='add'>+		if (key_data.error)</div><div class='add'>+			return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (key_data.use_rsc_tsc) {</div><div class='del'>-		int ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, LONG_GROUP,</div><div class='del'>-						WOWLAN_TSC_RSC_PARAM,</div><div class='del'>-						IWL_FW_CMD_VER_UNKNOWN);</div><div class='del'>-		int size;</div><div class='del'>-</div><div class='del'>-		if (ver == 4) {</div><div class='del'>-			size = sizeof(*key_data.rsc_tsc);</div><div class='del'>-			key_data.rsc_tsc-&gt;sta_id =</div><div class='del'>-				cpu_to_le32(mvmvif-&gt;ap_sta_id);</div><div class='del'>-</div><div class='del'>-		} else if (ver == 2 || ver == IWL_FW_CMD_VER_UNKNOWN) {</div><div class='del'>-			size = sizeof(key_data.rsc_tsc-&gt;params);</div><div class='del'>-		} else {</div><div class='del'>-			ret = 0;</div><div class='del'>-			WARN_ON_ONCE(1);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = iwl_mvm_send_cmd_pdu(mvm, WOWLAN_TSC_RSC_PARAM,</div><div class='del'>-					   cmd_flags,</div><div class='del'>-					   size,</div><div class='del'>-					   key_data.rsc_tsc);</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='add'>+	ret = iwl_mvm_wowlan_config_rsc_tsc(mvm, vif, mvm_link);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (key_data.use_tkip &amp;&amp;</div><div class='del'>-	    !fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+	if (!fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 			IWL_UCODE_TLV_API_TKIP_MIC_KEYS)) {</div><div class='del'>-		int ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, LONG_GROUP,</div><div class='del'>-						WOWLAN_TKIP_PARAM,</div><div class='add'>+		int ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, WOWLAN_TKIP_PARAM,</div><div class='ctx'> 						IWL_FW_CMD_VER_UNKNOWN);</div><div class='add'>+		struct wowlan_key_tkip_data tkip_data = {};</div><div class='ctx'> 		int size;</div><div class='ctx'> </div><div class='ctx'> 		if (ver == 2) {</div><div class='del'>-			size = sizeof(tkip_cmd);</div><div class='del'>-			key_data.tkip-&gt;sta_id =</div><div class='del'>-				cpu_to_le32(mvmvif-&gt;ap_sta_id);</div><div class='add'>+			size = sizeof(tkip_data.tkip);</div><div class='add'>+			tkip_data.tkip.sta_id =</div><div class='add'>+				cpu_to_le32(mvm_link-&gt;ap_sta_id);</div><div class='ctx'> 		} else if (ver == 1 || ver == IWL_FW_CMD_VER_UNKNOWN) {</div><div class='ctx'> 			size = sizeof(struct iwl_wowlan_tkip_params_cmd_ver_1);</div><div class='ctx'> 		} else {</div><div class='del'>-			ret =  -EINVAL;</div><div class='ctx'> 			WARN_ON_ONCE(1);</div><div class='del'>-			goto out;</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* send relevant data according to CMD version */</div><div class='del'>-		ret = iwl_mvm_send_cmd_pdu(mvm,</div><div class='del'>-					   WOWLAN_TKIP_PARAM,</div><div class='del'>-					   cmd_flags, size,</div><div class='del'>-					   &amp;tkip_cmd);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+		ieee80211_iter_keys(mvm-&gt;hw, vif, iwl_mvm_wowlan_get_tkip_data,</div><div class='add'>+				    &amp;tkip_data);</div><div class='add'>+</div><div class='add'>+		if (tkip_data.have_tkip_keys) {</div><div class='add'>+			/* send relevant data according to CMD version */</div><div class='add'>+			ret = iwl_mvm_send_cmd_pdu(mvm,</div><div class='add'>+						   WOWLAN_TKIP_PARAM,</div><div class='add'>+						   CMD_ASYNC, size,</div><div class='add'>+						   &amp;tkip_data.tkip);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* configure rekey data only if offloaded rekey is supported (d3) */</div><div class='ctx'> 	if (mvmvif-&gt;rekey_data.valid) {</div><div class='add'>+		struct iwl_wowlan_kek_kck_material_cmd_v4 kek_kck_cmd = {};</div><div class='add'>+		struct iwl_wowlan_kek_kck_material_cmd_v4 *_kek_kck_cmd =</div><div class='add'>+			&amp;kek_kck_cmd;</div><div class='add'>+		struct wowlan_key_gtk_type_iter gtk_type_data = {</div><div class='add'>+			.kek_kck_cmd = _kek_kck_cmd,</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw,</div><div class='del'>-						IWL_ALWAYS_LONG_GROUP,</div><div class='ctx'> 						WOWLAN_KEK_KCK_MATERIAL,</div><div class='ctx'> 						IWL_FW_CMD_VER_UNKNOWN);</div><div class='del'>-		if (WARN_ON(cmd_ver != 2 &amp;&amp; cmd_ver != 3 &amp;&amp;</div><div class='add'>+		if (WARN_ON(cmd_ver != 2 &amp;&amp; cmd_ver != 3 &amp;&amp; cmd_ver != 4 &amp;&amp;</div><div class='ctx'> 			    cmd_ver != IWL_FW_CMD_VER_UNKNOWN))</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		if (cmd_ver == 3)</div><div class='del'>-			cmd_size = sizeof(struct iwl_wowlan_kek_kck_material_cmd_v3);</div><div class='del'>-		else</div><div class='del'>-			cmd_size = sizeof(struct iwl_wowlan_kek_kck_material_cmd_v2);</div><div class='add'>+</div><div class='add'>+		ieee80211_iter_keys(mvm-&gt;hw, vif, iwl_mvm_wowlan_gtk_type_iter,</div><div class='add'>+				    &amp;gtk_type_data);</div><div class='ctx'> </div><div class='ctx'> 		memcpy(kek_kck_cmd.kck, mvmvif-&gt;rekey_data.kck,</div><div class='ctx'> 		       mvmvif-&gt;rekey_data.kck_len);</div><div class='hunk'>@@ -825,35 +1086,47 @@ static int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm,</div><div class='ctx'> 		kek_kck_cmd.kek_len = cpu_to_le16(mvmvif-&gt;rekey_data.kek_len);</div><div class='ctx'> 		kek_kck_cmd.replay_ctr = mvmvif-&gt;rekey_data.replay_ctr;</div><div class='ctx'> 		kek_kck_cmd.akm = cpu_to_le32(mvmvif-&gt;rekey_data.akm);</div><div class='add'>+		kek_kck_cmd.sta_id = cpu_to_le32(mvm_link-&gt;ap_sta_id);</div><div class='add'>+</div><div class='add'>+		if (cmd_ver == 4) {</div><div class='add'>+			cmd_size = sizeof(struct iwl_wowlan_kek_kck_material_cmd_v4);</div><div class='add'>+		} else {</div><div class='add'>+			if (cmd_ver == 3)</div><div class='add'>+				cmd_size =</div><div class='add'>+					sizeof(struct iwl_wowlan_kek_kck_material_cmd_v3);</div><div class='add'>+			else</div><div class='add'>+				cmd_size =</div><div class='add'>+					sizeof(struct iwl_wowlan_kek_kck_material_cmd_v2);</div><div class='add'>+			/* skip the sta_id at the beginning */</div><div class='add'>+			_kek_kck_cmd = (void *)</div><div class='add'>+				((u8 *)_kek_kck_cmd + sizeof(kek_kck_cmd.sta_id));</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		IWL_DEBUG_WOWLAN(mvm, "setting akm %d\n",</div><div class='ctx'> 				 mvmvif-&gt;rekey_data.akm);</div><div class='ctx'> </div><div class='del'>-		ret = iwl_mvm_send_cmd_pdu(mvm,</div><div class='del'>-					   WOWLAN_KEK_KCK_MATERIAL, cmd_flags,</div><div class='del'>-					   cmd_size,</div><div class='del'>-					   &amp;kek_kck_cmd);</div><div class='add'>+		ret = iwl_mvm_send_cmd_pdu(mvm, WOWLAN_KEK_KCK_MATERIAL,</div><div class='add'>+					   CMD_ASYNC, cmd_size, _kek_kck_cmd);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='del'>-	ret = 0;</div><div class='del'>-out:</div><div class='del'>-	kfree(key_data.rsc_tsc);</div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> iwl_mvm_wowlan_config(struct iwl_mvm *mvm,</div><div class='ctx'> 		      struct cfg80211_wowlan *wowlan,</div><div class='del'>-		      struct iwl_wowlan_config_cmd *wowlan_config_cmd,</div><div class='add'>+		      struct iwl_wowlan_config_cmd_v6 *wowlan_config_cmd_v6,</div><div class='ctx'> 		      struct ieee80211_vif *vif, struct iwl_mvm_vif *mvmvif,</div><div class='add'>+		      struct iwl_mvm_vif_link_info *mvm_link,</div><div class='ctx'> 		      struct ieee80211_sta *ap_sta)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	bool unified_image = fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 					 IWL_UCODE_TLV_CAPA_CNSLDTD_D3_D0_IMG);</div><div class='ctx'> </div><div class='del'>-	mvm-&gt;offload_tid = wowlan_config_cmd-&gt;offloading_tid;</div><div class='add'>+	mvm-&gt;offload_tid = wowlan_config_cmd_v6-&gt;offloading_tid;</div><div class='ctx'> </div><div class='ctx'> 	if (!unified_image) {</div><div class='ctx'> 		ret = iwl_mvm_switch_to_d3(mvm);</div><div class='hunk'>@@ -865,32 +1138,43 @@ iwl_mvm_wowlan_config(struct iwl_mvm *mvm,</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * This needs to be unlocked due to lock ordering</div><div class='del'>-	 * constraints. Since we're in the suspend path</div><div class='del'>-	 * that isn't really a problem though.</div><div class='del'>-	 */</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-	ret = iwl_mvm_wowlan_config_key_params(mvm, vif, CMD_ASYNC);</div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	ret = iwl_mvm_wowlan_config_key_params(mvm, vif, mvm_link);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_send_cmd_pdu(mvm, WOWLAN_CONFIGURATION, 0,</div><div class='del'>-				   sizeof(*wowlan_config_cmd),</div><div class='del'>-				   wowlan_config_cmd);</div><div class='add'>+	if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, WOWLAN_CONFIGURATION, 0) &gt; 6) {</div><div class='add'>+		struct iwl_wowlan_config_cmd wowlan_config_cmd = {</div><div class='add'>+			.wakeup_filter = wowlan_config_cmd_v6-&gt;wakeup_filter,</div><div class='add'>+			.wowlan_ba_teardown_tids =</div><div class='add'>+				wowlan_config_cmd_v6-&gt;wowlan_ba_teardown_tids,</div><div class='add'>+			.is_11n_connection =</div><div class='add'>+				wowlan_config_cmd_v6-&gt;is_11n_connection,</div><div class='add'>+			.offloading_tid = wowlan_config_cmd_v6-&gt;offloading_tid,</div><div class='add'>+			.flags = wowlan_config_cmd_v6-&gt;flags,</div><div class='add'>+			.sta_id = wowlan_config_cmd_v6-&gt;sta_id,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ret = iwl_mvm_send_cmd_pdu(mvm, WOWLAN_CONFIGURATION, 0,</div><div class='add'>+					   sizeof(wowlan_config_cmd),</div><div class='add'>+					   &amp;wowlan_config_cmd);</div><div class='add'>+	} else {</div><div class='add'>+		ret = iwl_mvm_send_cmd_pdu(mvm, WOWLAN_CONFIGURATION, 0,</div><div class='add'>+					   sizeof(*wowlan_config_cmd_v6),</div><div class='add'>+					   wowlan_config_cmd_v6);</div><div class='add'>+	}</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 		       IWL_UCODE_TLV_API_WOWLAN_TCP_SYN_WAKE))</div><div class='del'>-		ret = iwl_mvm_send_patterns(mvm, wowlan);</div><div class='add'>+		ret = iwl_mvm_send_patterns(mvm, mvm_link, wowlan);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = iwl_mvm_send_patterns_v1(mvm, wowlan);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	return iwl_mvm_send_proto_offload(mvm, vif, false, true, 0);</div><div class='add'>+	return iwl_mvm_send_proto_offload(mvm, vif, false, true, 0,</div><div class='add'>+					  mvm_link-&gt;ap_sta_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -958,14 +1242,14 @@ static void iwl_mvm_free_nd(struct iwl_mvm *mvm)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __iwl_mvm_suspend(struct ieee80211_hw *hw,</div><div class='del'>-			     struct cfg80211_wowlan *wowlan,</div><div class='del'>-			     bool test)</div><div class='add'>+			     struct cfg80211_wowlan *wowlan)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	struct ieee80211_vif *vif = NULL;</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = NULL;</div><div class='ctx'> 	struct ieee80211_sta *ap_sta = NULL;</div><div class='del'>-	struct iwl_d3_manager_config d3_cfg_cmd_data = {</div><div class='add'>+	struct iwl_mvm_vif_link_info *mvm_link;</div><div class='add'>+	struct iwl_d3_manager_config d3_cfg_cmd = {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Program the minimum sleep time to 10 seconds, as many</div><div class='ctx'> 		 * platforms have issues processing a wakeup signal while</div><div class='hunk'>@@ -973,41 +1257,36 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw,</div><div class='ctx'> 		 */</div><div class='ctx'> 		.min_sleep_time = cpu_to_le32(10 * 1000 * 1000),</div><div class='ctx'> 	};</div><div class='del'>-	struct iwl_host_cmd d3_cfg_cmd = {</div><div class='del'>-		.id = D3_CONFIG_CMD,</div><div class='del'>-		.flags = CMD_WANT_SKB | CMD_SEND_IN_D3,</div><div class='del'>-		.data[0] = &amp;d3_cfg_cmd_data,</div><div class='del'>-		.len[0] = sizeof(d3_cfg_cmd_data),</div><div class='del'>-	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int len __maybe_unused;</div><div class='ctx'> 	bool unified_image = fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 					 IWL_UCODE_TLV_CAPA_CNSLDTD_D3_D0_IMG);</div><div class='ctx'> </div><div class='ctx'> 	if (!wowlan) {</div><div class='del'>-		/*</div><div class='del'>-		 * mac80211 shouldn't get here, but for D3 test</div><div class='del'>-		 * it doesn't warrant a warning</div><div class='del'>-		 */</div><div class='del'>-		WARN_ON(!test);</div><div class='add'>+		/* mac80211 shouldn't get here */</div><div class='add'>+		WARN_ON(1);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	vif = iwl_mvm_get_bss_vif(mvm);</div><div class='add'>+	if (IS_ERR_OR_NULL(vif))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(IWL_MVM_STATUS_IN_D3, &amp;mvm-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	synchronize_net();</div><div class='ctx'> </div><div class='del'>-	vif = iwl_mvm_get_bss_vif(mvm);</div><div class='del'>-	if (IS_ERR_OR_NULL(vif)) {</div><div class='del'>-		ret = 1;</div><div class='add'>+	mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	mvm_link = mvmvif-&gt;link[iwl_mvm_get_primary_link(vif)];</div><div class='add'>+	if (WARN_ON_ONCE(!mvm_link)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='ctx'> 		goto out_noreset;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-</div><div class='del'>-	if (mvmvif-&gt;ap_sta_id == IWL_MVM_INVALID_STA) {</div><div class='add'>+	if (mvm_link-&gt;ap_sta_id == IWL_INVALID_STA) {</div><div class='ctx'> 		/* if we're not associated, this must be netdetect */</div><div class='ctx'> 		if (!wowlan-&gt;nd_config) {</div><div class='ctx'> 			ret = 1;</div><div class='hunk'>@@ -1021,24 +1300,31 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 		mvm-&gt;net_detect = true;</div><div class='ctx'> 	} else {</div><div class='del'>-		struct iwl_wowlan_config_cmd wowlan_config_cmd = {};</div><div class='add'>+		struct iwl_wowlan_config_cmd_v6 wowlan_config_cmd = {</div><div class='add'>+			.offloading_tid = 0,</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-		wowlan_config_cmd.sta_id = mvmvif-&gt;ap_sta_id;</div><div class='add'>+		wowlan_config_cmd.sta_id = mvm_link-&gt;ap_sta_id;</div><div class='ctx'> </div><div class='ctx'> 		ap_sta = rcu_dereference_protected(</div><div class='del'>-			mvm-&gt;fw_id_to_mac_id[mvmvif-&gt;ap_sta_id],</div><div class='add'>+			mvm-&gt;fw_id_to_mac_id[mvm_link-&gt;ap_sta_id],</div><div class='ctx'> 			lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='ctx'> 		if (IS_ERR_OR_NULL(ap_sta)) {</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			goto out_noreset;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		ret = iwl_mvm_sta_ensure_queue(</div><div class='add'>+			mvm, ap_sta-&gt;txq[wowlan_config_cmd.offloading_tid]);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_noreset;</div><div class='add'>+</div><div class='ctx'> 		ret = iwl_mvm_get_wowlan_config(mvm, wowlan, &amp;wowlan_config_cmd,</div><div class='ctx'> 						vif, mvmvif, ap_sta);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out_noreset;</div><div class='ctx'> 		ret = iwl_mvm_wowlan_config(mvm, wowlan, &amp;wowlan_config_cmd,</div><div class='del'>-					    vif, mvmvif, ap_sta);</div><div class='add'>+					    vif, mvmvif, mvm_link, ap_sta);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1055,7 +1341,7 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> 	if (mvm-&gt;d3_wake_sysassert)</div><div class='del'>-		d3_cfg_cmd_data.wakeup_flags |=</div><div class='add'>+		d3_cfg_cmd.wakeup_flags |=</div><div class='ctx'> 			cpu_to_le32(IWL_WAKEUP_D3_CONFIG_FW_ERROR);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1064,38 +1350,22 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw,</div><div class='ctx'> 	 * recording before entering D3. In later devices the FW stops the</div><div class='ctx'> 	 * recording automatically.</div><div class='ctx'> 	 */</div><div class='del'>-	if (mvm-&gt;trans-&gt;trans_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_9000)</div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_9000)</div><div class='ctx'> 		iwl_fw_dbg_stop_restart_recording(&amp;mvm-&gt;fwrt, NULL, true);</div><div class='ctx'> </div><div class='del'>-	mvm-&gt;trans-&gt;system_pm_mode = IWL_PLAT_PM_MODE_D3;</div><div class='del'>-</div><div class='ctx'> 	/* must be last -- this switches firmware state */</div><div class='del'>-	ret = iwl_mvm_send_cmd(mvm, &amp;d3_cfg_cmd);</div><div class='add'>+	ret = iwl_mvm_send_cmd_pdu(mvm, D3_CONFIG_CMD, 0, sizeof(d3_cfg_cmd),</div><div class='add'>+				   &amp;d3_cfg_cmd);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='del'>-#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='del'>-	len = iwl_rx_packet_payload_len(d3_cfg_cmd.resp_pkt);</div><div class='del'>-	if (len &gt;= sizeof(u32)) {</div><div class='del'>-		mvm-&gt;d3_test_pme_ptr =</div><div class='del'>-			le32_to_cpup((__le32 *)d3_cfg_cmd.resp_pkt-&gt;data);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	iwl_free_resp(&amp;d3_cfg_cmd);</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status);</div><div class='ctx'> </div><div class='del'>-	ret = iwl_trans_d3_suspend(mvm-&gt;trans, test, !unified_image);</div><div class='add'>+	ret = iwl_trans_d3_suspend(mvm-&gt;trans, !unified_image);</div><div class='ctx'>  out:</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		iwl_mvm_free_nd(mvm);</div><div class='ctx'> </div><div class='del'>-		if (!unified_image) {</div><div class='del'>-			if (mvm-&gt;fw_restart &gt; 0) {</div><div class='del'>-				mvm-&gt;fw_restart--;</div><div class='del'>-				ieee80211_restart_hw(mvm-&gt;hw);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		clear_bit(IWL_MVM_STATUS_IN_D3, &amp;mvm-&gt;status);</div><div class='ctx'> 	}</div><div class='ctx'>  out_noreset:</div><div class='hunk'>@@ -1110,19 +1380,75 @@ int iwl_mvm_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_pause_tcm(mvm, true);</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='ctx'> 	iwl_fw_runtime_suspend(&amp;mvm-&gt;fwrt);</div><div class='add'>+	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	return __iwl_mvm_suspend(hw, wowlan, false);</div><div class='add'>+	return __iwl_mvm_suspend(hw, wowlan);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct iwl_multicast_key_data {</div><div class='add'>+	u8 key[WOWLAN_KEY_MAX_SIZE];</div><div class='add'>+	u8 len;</div><div class='add'>+	u8 flags;</div><div class='add'>+	u8 id;</div><div class='add'>+	u8 ipn[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* converted data from the different status responses */</div><div class='ctx'> struct iwl_wowlan_status_data {</div><div class='del'>-	u16 pattern_number;</div><div class='del'>-	u16 qos_seq_ctr[8];</div><div class='add'>+	u64 replay_ctr;</div><div class='add'>+	u32 num_of_gtk_rekeys;</div><div class='add'>+	u32 received_beacons;</div><div class='ctx'> 	u32 wakeup_reasons;</div><div class='ctx'> 	u32 wake_packet_length;</div><div class='ctx'> 	u32 wake_packet_bufsize;</div><div class='del'>-	const u8 *wake_packet;</div><div class='add'>+	u16 pattern_number;</div><div class='add'>+	u16 non_qos_seq_ctr;</div><div class='add'>+	u16 qos_seq_ctr[8];</div><div class='add'>+	u8 tid_tear_down;</div><div class='add'>+	u8 tid_offloaded_tx;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		/* including RX MIC key for TKIP */</div><div class='add'>+		u8 key[WOWLAN_KEY_MAX_SIZE];</div><div class='add'>+		u8 len;</div><div class='add'>+		u8 flags;</div><div class='add'>+		u8 id;</div><div class='add'>+	} gtk[WOWLAN_GTK_KEYS_NUM];</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		/*</div><div class='add'>+		 * We store both the TKIP and AES representations</div><div class='add'>+		 * coming from the firmware because we decode the</div><div class='add'>+		 * data from there before we iterate the keys and</div><div class='add'>+		 * know which one we need.</div><div class='add'>+		 */</div><div class='add'>+		struct {</div><div class='add'>+			struct ieee80211_key_seq seq[IWL_MAX_TID_COUNT];</div><div class='add'>+		} tkip, aes;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We use -1 for when we have valid data but don't know</div><div class='add'>+		 * the key ID from firmware, and thus it needs to be</div><div class='add'>+		 * installed with the last key (depending on rekeying).</div><div class='add'>+		 */</div><div class='add'>+		s8 key_id;</div><div class='add'>+		bool valid;</div><div class='add'>+	} gtk_seq[2];</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		/* Same as above */</div><div class='add'>+		struct {</div><div class='add'>+			struct ieee80211_key_seq seq[IWL_MAX_TID_COUNT];</div><div class='add'>+			u64 tx_pn;</div><div class='add'>+		} tkip, aes;</div><div class='add'>+	} ptk;</div><div class='add'>+</div><div class='add'>+	struct iwl_multicast_key_data igtk;</div><div class='add'>+	struct iwl_multicast_key_data bigtk[WOWLAN_BIGTK_KEYS_NUM];</div><div class='add'>+</div><div class='add'>+	u8 *wake_packet;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_report_wakeup_reasons(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -1151,7 +1477,8 @@ static void iwl_mvm_report_wakeup_reasons(struct iwl_mvm *mvm,</div><div class='ctx'> 			status-&gt;pattern_number;</div><div class='ctx'> </div><div class='ctx'> 	if (reasons &amp; (IWL_WOWLAN_WAKEUP_BY_DISCONNECTION_ON_MISSED_BEACON |</div><div class='del'>-		       IWL_WOWLAN_WAKEUP_BY_DISCONNECTION_ON_DEAUTH))</div><div class='add'>+		       IWL_WOWLAN_WAKEUP_BY_DISCONNECTION_ON_DEAUTH |</div><div class='add'>+		       IWL_WOWLAN_WAKEUP_BY_GTK_REKEY_FAILURE))</div><div class='ctx'> 		wakeup.disconnect = true;</div><div class='ctx'> </div><div class='ctx'> 	if (reasons &amp; IWL_WOWLAN_WAKEUP_BY_GTK_REKEY_FAILURE)</div><div class='hunk'>@@ -1175,11 +1502,14 @@ static void iwl_mvm_report_wakeup_reasons(struct iwl_mvm *mvm,</div><div class='ctx'> 	if (reasons &amp; IWL_WOWLAN_WAKEUP_BY_REM_WAKE_WAKEUP_PACKET)</div><div class='ctx'> 		wakeup.tcp_match = true;</div><div class='ctx'> </div><div class='del'>-	if (status-&gt;wake_packet_bufsize) {</div><div class='add'>+	if (reasons &amp; IWL_WAKEUP_BY_11W_UNPROTECTED_DEAUTH_OR_DISASSOC)</div><div class='add'>+		wakeup.unprot_deauth_disassoc = true;</div><div class='add'>+</div><div class='add'>+	if (status-&gt;wake_packet) {</div><div class='ctx'> 		int pktsize = status-&gt;wake_packet_bufsize;</div><div class='ctx'> 		int pktlen = status-&gt;wake_packet_length;</div><div class='ctx'> 		const u8 *pktdata = status-&gt;wake_packet;</div><div class='del'>-		struct ieee80211_hdr *hdr = (void *)pktdata;</div><div class='add'>+		const struct ieee80211_hdr *hdr = (const void *)pktdata;</div><div class='ctx'> 		int truncated = pktlen - pktsize;</div><div class='ctx'> </div><div class='ctx'> 		/* this would be a firmware bug */</div><div class='hunk'>@@ -1257,12 +1587,10 @@ static void iwl_mvm_report_wakeup_reasons(struct iwl_mvm *mvm,</div><div class='ctx'> 	kfree_skb(pkt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_aes_sc_to_seq(struct aes_sc *sc,</div><div class='del'>-				  struct ieee80211_key_seq *seq)</div><div class='add'>+static void iwl_mvm_le64_to_aes_seq(__le64 le_pn, struct ieee80211_key_seq *seq)</div><div class='ctx'> {</div><div class='del'>-	u64 pn;</div><div class='add'>+	u64 pn = le64_to_cpu(le_pn);</div><div class='ctx'> </div><div class='del'>-	pn = le64_to_cpu(sc-&gt;pn);</div><div class='ctx'> 	seq-&gt;ccmp.pn[0] = pn &gt;&gt; 40;</div><div class='ctx'> 	seq-&gt;ccmp.pn[1] = pn &gt;&gt; 32;</div><div class='ctx'> 	seq-&gt;ccmp.pn[2] = pn &gt;&gt; 24;</div><div class='hunk'>@@ -1271,6 +1599,20 @@ static void iwl_mvm_aes_sc_to_seq(struct aes_sc *sc,</div><div class='ctx'> 	seq-&gt;ccmp.pn[5] = pn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void iwl_mvm_aes_sc_to_seq(struct aes_sc *sc,</div><div class='add'>+				  struct ieee80211_key_seq *seq)</div><div class='add'>+{</div><div class='add'>+	iwl_mvm_le64_to_aes_seq(sc-&gt;pn, seq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_le64_to_tkip_seq(__le64 le_pn, struct ieee80211_key_seq *seq)</div><div class='add'>+{</div><div class='add'>+	u64 pn = le64_to_cpu(le_pn);</div><div class='add'>+</div><div class='add'>+	seq-&gt;tkip.iv16 = (u16)pn;</div><div class='add'>+	seq-&gt;tkip.iv32 = (u32)(pn &gt;&gt; 16);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void iwl_mvm_tkip_sc_to_seq(struct tkip_sc *sc,</div><div class='ctx'> 				   struct ieee80211_key_seq *seq)</div><div class='ctx'> {</div><div class='hunk'>@@ -1278,92 +1620,196 @@ static void iwl_mvm_tkip_sc_to_seq(struct tkip_sc *sc,</div><div class='ctx'> 	seq-&gt;tkip.iv16 = le16_to_cpu(sc-&gt;iv16);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_set_aes_rx_seq(struct iwl_mvm *mvm, struct aes_sc *scs,</div><div class='del'>-				   struct ieee80211_sta *sta,</div><div class='del'>-				   struct ieee80211_key_conf *key)</div><div class='add'>+static void iwl_mvm_set_key_rx_seq_tids(struct ieee80211_key_conf *key,</div><div class='add'>+					struct ieee80211_key_seq *seq)</div><div class='ctx'> {</div><div class='ctx'> 	int tid;</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON(IWL_NUM_RSC != IEEE80211_NUM_TIDS);</div><div class='add'>+	for (tid = 0; tid &lt; IWL_MAX_TID_COUNT; tid++)</div><div class='add'>+		ieee80211_set_key_rx_seq(key, tid, &amp;seq[tid]);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (sta &amp;&amp; iwl_mvm_has_new_rx_api(mvm)) {</div><div class='del'>-		struct iwl_mvm_sta *mvmsta;</div><div class='del'>-		struct iwl_mvm_key_pn *ptk_pn;</div><div class='add'>+static void iwl_mvm_set_aes_ptk_rx_seq(struct iwl_mvm *mvm,</div><div class='add'>+				       struct iwl_wowlan_status_data *status,</div><div class='add'>+				       struct ieee80211_sta *sta,</div><div class='add'>+				       struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	struct iwl_mvm_key_pn *ptk_pn;</div><div class='add'>+	int tid;</div><div class='ctx'> </div><div class='del'>-		mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	iwl_mvm_set_key_rx_seq_tids(key, status-&gt;ptk.aes.seq);</div><div class='ctx'> </div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		ptk_pn = rcu_dereference(mvmsta-&gt;ptk_pn[key-&gt;keyidx]);</div><div class='del'>-		if (WARN_ON(!ptk_pn)) {</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='add'>+	if (!iwl_mvm_has_new_rx_api(mvm))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		for (tid = 0; tid &lt; IWL_MAX_TID_COUNT; tid++) {</div><div class='del'>-			struct ieee80211_key_seq seq = {};</div><div class='del'>-			int i;</div><div class='ctx'> </div><div class='del'>-			iwl_mvm_aes_sc_to_seq(&amp;scs[tid], &amp;seq);</div><div class='del'>-			ieee80211_set_key_rx_seq(key, tid, &amp;seq);</div><div class='del'>-			for (i = 1; i &lt; mvm-&gt;trans-&gt;num_rx_queues; i++)</div><div class='del'>-				memcpy(ptk_pn-&gt;q[i].pn[tid],</div><div class='del'>-				       seq.ccmp.pn, IEEE80211_CCMP_PN_LEN);</div><div class='del'>-		}</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ptk_pn = rcu_dereference(mvmsta-&gt;ptk_pn[key-&gt;keyidx]);</div><div class='add'>+	if (WARN_ON(!ptk_pn)) {</div><div class='ctx'> 		rcu_read_unlock();</div><div class='del'>-	} else {</div><div class='del'>-		for (tid = 0; tid &lt; IWL_NUM_RSC; tid++) {</div><div class='del'>-			struct ieee80211_key_seq seq = {};</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			iwl_mvm_aes_sc_to_seq(&amp;scs[tid], &amp;seq);</div><div class='del'>-			ieee80211_set_key_rx_seq(key, tid, &amp;seq);</div><div class='del'>-		}</div><div class='add'>+	for (tid = 0; tid &lt; IWL_MAX_TID_COUNT; tid++) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = 1; i &lt; mvm-&gt;trans-&gt;info.num_rxqs; i++)</div><div class='add'>+			memcpy(ptk_pn-&gt;q[i].pn[tid],</div><div class='add'>+			       status-&gt;ptk.aes.seq[tid].ccmp.pn,</div><div class='add'>+			       IEEE80211_CCMP_PN_LEN);</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_set_tkip_rx_seq(struct tkip_sc *scs,</div><div class='del'>-				    struct ieee80211_key_conf *key)</div><div class='add'>+static void iwl_mvm_convert_key_counters(struct iwl_wowlan_status_data *status,</div><div class='add'>+					 union iwl_all_tsc_rsc *sc, u8 key_idx)</div><div class='ctx'> {</div><div class='del'>-	int tid;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(IWL_MAX_TID_COUNT &gt; IWL_MAX_TID_COUNT);</div><div class='add'>+	BUILD_BUG_ON(IWL_MAX_TID_COUNT &gt; IWL_NUM_RSC);</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON(IWL_NUM_RSC != IEEE80211_NUM_TIDS);</div><div class='add'>+	/* GTK RX counters */</div><div class='add'>+	for (i = 0; i &lt; IWL_MAX_TID_COUNT; i++) {</div><div class='add'>+		iwl_mvm_tkip_sc_to_seq(&amp;sc-&gt;tkip.multicast_rsc[i],</div><div class='add'>+				       &amp;status-&gt;gtk_seq[0].tkip.seq[i]);</div><div class='add'>+		iwl_mvm_aes_sc_to_seq(&amp;sc-&gt;aes.multicast_rsc[i],</div><div class='add'>+				      &amp;status-&gt;gtk_seq[0].aes.seq[i]);</div><div class='add'>+	}</div><div class='add'>+	status-&gt;gtk_seq[0].valid = true;</div><div class='add'>+	status-&gt;gtk_seq[0].key_id = key_idx;</div><div class='ctx'> </div><div class='del'>-	for (tid = 0; tid &lt; IWL_NUM_RSC; tid++) {</div><div class='del'>-		struct ieee80211_key_seq seq = {};</div><div class='add'>+	/* PTK TX counter */</div><div class='add'>+	status-&gt;ptk.tkip.tx_pn = (u64)le16_to_cpu(sc-&gt;tkip.tsc.iv16) |</div><div class='add'>+				 ((u64)le32_to_cpu(sc-&gt;tkip.tsc.iv32) &lt;&lt; 16);</div><div class='add'>+	status-&gt;ptk.aes.tx_pn = le64_to_cpu(sc-&gt;aes.tsc.pn);</div><div class='ctx'> </div><div class='del'>-		iwl_mvm_tkip_sc_to_seq(&amp;scs[tid], &amp;seq);</div><div class='del'>-		ieee80211_set_key_rx_seq(key, tid, &amp;seq);</div><div class='add'>+	/* PTK RX counters */</div><div class='add'>+	for (i = 0; i &lt; IWL_MAX_TID_COUNT; i++) {</div><div class='add'>+		iwl_mvm_tkip_sc_to_seq(&amp;sc-&gt;tkip.unicast_rsc[i],</div><div class='add'>+				       &amp;status-&gt;ptk.tkip.seq[i]);</div><div class='add'>+		iwl_mvm_aes_sc_to_seq(&amp;sc-&gt;aes.unicast_rsc[i],</div><div class='add'>+				      &amp;status-&gt;ptk.aes.seq[i]);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_set_key_rx_seq(struct iwl_mvm *mvm,</div><div class='del'>-				   struct ieee80211_key_conf *key,</div><div class='del'>-				   struct iwl_wowlan_status *status)</div><div class='add'>+static void</div><div class='add'>+iwl_mvm_convert_key_counters_v5_gtk_seq(struct iwl_wowlan_status_data *status,</div><div class='add'>+					struct iwl_wowlan_all_rsc_tsc_v5 *sc,</div><div class='add'>+					unsigned int idx, unsigned int key_id)</div><div class='ctx'> {</div><div class='del'>-	union iwl_all_tsc_rsc *rsc = &amp;status-&gt;gtk[0].rsc.all_tsc_rsc;</div><div class='add'>+	int tid;</div><div class='add'>+</div><div class='add'>+	for (tid = 0; tid &lt; IWL_MAX_TID_COUNT; tid++) {</div><div class='add'>+		iwl_mvm_le64_to_tkip_seq(sc-&gt;mcast_rsc[idx][tid],</div><div class='add'>+					 &amp;status-&gt;gtk_seq[idx].tkip.seq[tid]);</div><div class='add'>+		iwl_mvm_le64_to_aes_seq(sc-&gt;mcast_rsc[idx][tid],</div><div class='add'>+					&amp;status-&gt;gtk_seq[idx].aes.seq[tid]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	status-&gt;gtk_seq[idx].valid = true;</div><div class='add'>+	status-&gt;gtk_seq[idx].key_id = key_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mvm_convert_key_counters_v5(struct iwl_wowlan_status_data *status,</div><div class='add'>+				struct iwl_wowlan_all_rsc_tsc_v5 *sc)</div><div class='add'>+{</div><div class='add'>+	int i, tid;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(IWL_MAX_TID_COUNT &gt; IWL_MAX_TID_COUNT);</div><div class='add'>+	BUILD_BUG_ON(IWL_MAX_TID_COUNT &gt; IWL_NUM_RSC);</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(sc-&gt;mcast_rsc) != ARRAY_SIZE(status-&gt;gtk_seq));</div><div class='add'>+</div><div class='add'>+	/* GTK RX counters */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(sc-&gt;mcast_key_id_map); i++) {</div><div class='add'>+		u8 entry = sc-&gt;mcast_key_id_map[i];</div><div class='add'>+</div><div class='add'>+		if (entry &lt; ARRAY_SIZE(sc-&gt;mcast_rsc))</div><div class='add'>+			iwl_mvm_convert_key_counters_v5_gtk_seq(status, sc,</div><div class='add'>+								entry, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* PTK TX counters not needed, assigned in device */</div><div class='add'>+</div><div class='add'>+	/* PTK RX counters */</div><div class='add'>+	for (tid = 0; tid &lt; IWL_MAX_TID_COUNT; tid++) {</div><div class='add'>+		iwl_mvm_le64_to_tkip_seq(sc-&gt;ucast_rsc[tid],</div><div class='add'>+					 &amp;status-&gt;ptk.tkip.seq[tid]);</div><div class='add'>+		iwl_mvm_le64_to_aes_seq(sc-&gt;ucast_rsc[tid],</div><div class='add'>+					&amp;status-&gt;ptk.aes.seq[tid]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_set_key_rx_seq_idx(struct ieee80211_key_conf *key,</div><div class='add'>+				       struct iwl_wowlan_status_data *status,</div><div class='add'>+				       int idx)</div><div class='add'>+{</div><div class='ctx'> 	switch (key-&gt;cipher) {</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_CCMP:</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_GCMP:</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='del'>-		iwl_mvm_set_aes_rx_seq(mvm, rsc-&gt;aes.multicast_rsc, NULL, key);</div><div class='add'>+		iwl_mvm_set_key_rx_seq_tids(key, status-&gt;gtk_seq[idx].aes.seq);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_TKIP:</div><div class='del'>-		iwl_mvm_set_tkip_rx_seq(rsc-&gt;tkip.multicast_rsc, key);</div><div class='add'>+		iwl_mvm_set_key_rx_seq_tids(key, status-&gt;gtk_seq[idx].tkip.seq);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void iwl_mvm_set_key_rx_seq(struct ieee80211_key_conf *key,</div><div class='add'>+				   struct iwl_wowlan_status_data *status)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(status-&gt;gtk_seq); i++) {</div><div class='add'>+		if (!status-&gt;gtk_seq[i].valid)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (status-&gt;gtk_seq[i].key_id == key-&gt;keyidx)</div><div class='add'>+			iwl_mvm_set_key_rx_seq_idx(key, status, i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct iwl_mvm_d3_gtk_iter_data {</div><div class='ctx'> 	struct iwl_mvm *mvm;</div><div class='del'>-	struct iwl_wowlan_status *status;</div><div class='del'>-	void *last_gtk;</div><div class='del'>-	u32 cipher;</div><div class='del'>-	bool find_phase, unhandled_cipher;</div><div class='del'>-	int num_keys;</div><div class='add'>+	struct iwl_wowlan_status_data *status;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+iwl_mvm_d3_set_igtk_bigtk_ipn(const struct iwl_multicast_key_data *key,</div><div class='add'>+			      struct ieee80211_key_seq *seq, u32 cipher)</div><div class='add'>+{</div><div class='add'>+	switch (cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_GMAC_128:</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_GMAC_256:</div><div class='add'>+		BUILD_BUG_ON(sizeof(seq-&gt;aes_gmac.pn) != sizeof(key-&gt;ipn));</div><div class='add'>+		memcpy(seq-&gt;aes_gmac.pn, key-&gt;ipn, sizeof(seq-&gt;aes_gmac.pn));</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_CMAC_256:</div><div class='add'>+	case WLAN_CIPHER_SUITE_AES_CMAC:</div><div class='add'>+		BUILD_BUG_ON(sizeof(seq-&gt;aes_cmac.pn) != sizeof(key-&gt;ipn));</div><div class='add'>+		memcpy(seq-&gt;aes_cmac.pn, key-&gt;ipn, sizeof(seq-&gt;aes_cmac.pn));</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mvm_d3_update_igtk_bigtk(struct iwl_wowlan_status_data *status,</div><div class='add'>+			     struct ieee80211_key_conf *key,</div><div class='add'>+			     struct iwl_multicast_key_data *key_data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_key_seq seq;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_d3_set_igtk_bigtk_ipn(key_data, &amp;seq, key-&gt;cipher);</div><div class='add'>+	ieee80211_set_key_rx_seq(key, 0, &amp;seq);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void iwl_mvm_d3_update_keys(struct ieee80211_hw *hw,</div><div class='ctx'> 				   struct ieee80211_vif *vif,</div><div class='ctx'> 				   struct ieee80211_sta *sta,</div><div class='hunk'>@@ -1371,8 +1817,11 @@ static void iwl_mvm_d3_update_keys(struct ieee80211_hw *hw,</div><div class='ctx'> 				   void *_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_d3_gtk_iter_data *data = _data;</div><div class='add'>+	struct iwl_wowlan_status_data *status = data-&gt;status;</div><div class='add'>+	s8 keyidx;</div><div class='add'>+	int link_id = vif-&gt;active_links ? __ffs(vif-&gt;active_links) : -1;</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;unhandled_cipher)</div><div class='add'>+	if (link_id &gt;= 0 &amp;&amp; key-&gt;link_id &gt;= 0 &amp;&amp; link_id != key-&gt;link_id)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	switch (key-&gt;cipher) {</div><div class='hunk'>@@ -1383,219 +1832,491 @@ static void iwl_mvm_d3_update_keys(struct ieee80211_hw *hw,</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_CCMP:</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_GCMP:</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='add'>+		if (sta) {</div><div class='add'>+			atomic64_set(&amp;key-&gt;tx_pn, status-&gt;ptk.aes.tx_pn);</div><div class='add'>+			iwl_mvm_set_aes_ptk_rx_seq(data-&gt;mvm, status, sta, key);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_TKIP:</div><div class='del'>-		/* we support these */</div><div class='add'>+		if (sta) {</div><div class='add'>+			atomic64_set(&amp;key-&gt;tx_pn, status-&gt;ptk.tkip.tx_pn);</div><div class='add'>+			iwl_mvm_set_key_rx_seq_tids(key, status-&gt;ptk.tkip.seq);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		keyidx = key-&gt;keyidx;</div><div class='add'>+		/*</div><div class='add'>+		 * Update the seq even if there was a rekey. If there was a</div><div class='add'>+		 * rekey, we will update again after replacing the key</div><div class='add'>+		 */</div><div class='add'>+		if ((status-&gt;gtk[0].len &amp;&amp; keyidx == status-&gt;gtk[0].id) ||</div><div class='add'>+		    (status-&gt;gtk[1].len &amp;&amp; keyidx == status-&gt;gtk[1].id))</div><div class='add'>+			iwl_mvm_set_key_rx_seq(key, status);</div><div class='ctx'> 		break;</div><div class='del'>-	default:</div><div class='del'>-		/* everything else (even CMAC for MFP) - disconnect from AP */</div><div class='del'>-		data-&gt;unhandled_cipher = true;</div><div class='del'>-		return;</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_GMAC_128:</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_GMAC_256:</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_CMAC_256:</div><div class='add'>+	case WLAN_CIPHER_SUITE_AES_CMAC:</div><div class='add'>+		if (key-&gt;keyidx == 4 || key-&gt;keyidx == 5) {</div><div class='add'>+			iwl_mvm_d3_update_igtk_bigtk(status, key,</div><div class='add'>+						     &amp;status-&gt;igtk);</div><div class='add'>+		}</div><div class='add'>+		if (key-&gt;keyidx == 6 || key-&gt;keyidx == 7) {</div><div class='add'>+			u8 idx = key-&gt;keyidx == status-&gt;bigtk[1].id;</div><div class='add'>+</div><div class='add'>+			iwl_mvm_d3_update_igtk_bigtk(status, key,</div><div class='add'>+						     &amp;status-&gt;bigtk[idx]);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	data-&gt;num_keys++;</div><div class='add'>+static bool iwl_mvm_gtk_rekey(struct iwl_wowlan_status_data *status,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+	struct ieee80211_key_conf *key;</div><div class='add'>+	int link_id = vif-&gt;active_links ? __ffs(vif-&gt;active_links) : -1;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * pairwise key - update sequence counters only;</div><div class='del'>-	 * note that this assumes no TDLS sessions are active</div><div class='del'>-	 */</div><div class='del'>-	if (sta) {</div><div class='del'>-		struct ieee80211_key_seq seq = {};</div><div class='del'>-		union iwl_all_tsc_rsc *sc =</div><div class='del'>-			&amp;data-&gt;status-&gt;gtk[0].rsc.all_tsc_rsc;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(status-&gt;gtk); i++) {</div><div class='add'>+		if (!status-&gt;gtk[i].len)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-		if (data-&gt;find_phase)</div><div class='del'>-			return;</div><div class='add'>+		IWL_DEBUG_WOWLAN(mvm,</div><div class='add'>+				 "Received from FW GTK: key index %d\n",</div><div class='add'>+				 status-&gt;gtk[i].id);</div><div class='add'>+</div><div class='add'>+		key = ieee80211_gtk_rekey_add(vif, status-&gt;gtk[i].id,</div><div class='add'>+					      status-&gt;gtk[i].key,</div><div class='add'>+					      sizeof(status-&gt;gtk[i].key),</div><div class='add'>+					      link_id);</div><div class='add'>+		if (IS_ERR(key)) {</div><div class='add'>+			/* FW may send also the old keys */</div><div class='add'>+			if (PTR_ERR(key) == -EALREADY)</div><div class='add'>+				continue;</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		switch (key-&gt;cipher) {</div><div class='del'>-		case WLAN_CIPHER_SUITE_CCMP:</div><div class='del'>-		case WLAN_CIPHER_SUITE_GCMP:</div><div class='del'>-		case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='del'>-			iwl_mvm_set_aes_rx_seq(data-&gt;mvm, sc-&gt;aes.unicast_rsc,</div><div class='del'>-					       sta, key);</div><div class='del'>-			atomic64_set(&amp;key-&gt;tx_pn, le64_to_cpu(sc-&gt;aes.tsc.pn));</div><div class='del'>-			break;</div><div class='del'>-		case WLAN_CIPHER_SUITE_TKIP:</div><div class='del'>-			iwl_mvm_tkip_sc_to_seq(&amp;sc-&gt;tkip.tsc, &amp;seq);</div><div class='del'>-			iwl_mvm_set_tkip_rx_seq(sc-&gt;tkip.unicast_rsc, key);</div><div class='del'>-			atomic64_set(&amp;key-&gt;tx_pn,</div><div class='del'>-				     (u64)seq.tkip.iv16 |</div><div class='del'>-				     ((u64)seq.tkip.iv32 &lt;&lt; 16));</div><div class='add'>+		for (j = 0; j &lt; ARRAY_SIZE(status-&gt;gtk_seq); j++) {</div><div class='add'>+			if (!status-&gt;gtk_seq[j].valid ||</div><div class='add'>+			    status-&gt;gtk_seq[j].key_id != key-&gt;keyidx)</div><div class='add'>+				continue;</div><div class='add'>+			iwl_mvm_set_key_rx_seq_idx(key, status, j);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		WARN_ON(j == ARRAY_SIZE(status-&gt;gtk_seq));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/* that's it for this key */</div><div class='del'>-		return;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+iwl_mvm_d3_igtk_bigtk_rekey_add(struct iwl_wowlan_status_data *status,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct iwl_multicast_key_data *key_data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct ieee80211_key_conf *key_config;</div><div class='add'>+	struct ieee80211_key_seq seq;</div><div class='add'>+	int link_id = vif-&gt;active_links ? __ffs(vif-&gt;active_links) : -1;</div><div class='add'>+	s8 keyidx = key_data-&gt;id;</div><div class='add'>+</div><div class='add'>+	if (!key_data-&gt;len)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	key_config = ieee80211_gtk_rekey_add(vif, keyidx, key_data-&gt;key,</div><div class='add'>+					     sizeof(key_data-&gt;key), link_id);</div><div class='add'>+	if (IS_ERR(key_config)) {</div><div class='add'>+		/* FW may send also the old keys */</div><div class='add'>+		return PTR_ERR(key_config) == -EALREADY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;find_phase) {</div><div class='del'>-		data-&gt;last_gtk = key;</div><div class='del'>-		data-&gt;cipher = key-&gt;cipher;</div><div class='del'>-		return;</div><div class='add'>+	iwl_mvm_d3_set_igtk_bigtk_ipn(key_data, &amp;seq, key_config-&gt;cipher);</div><div class='add'>+	ieee80211_set_key_rx_seq(key_config, 0, &amp;seq);</div><div class='add'>+</div><div class='add'>+	if (keyidx == 4 || keyidx == 5) {</div><div class='add'>+		struct iwl_mvm_vif_link_info *mvm_link;</div><div class='add'>+</div><div class='add'>+		link_id = link_id &lt; 0 ? 0 : link_id;</div><div class='add'>+		mvm_link = mvmvif-&gt;link[link_id];</div><div class='add'>+		if (mvm_link-&gt;igtk)</div><div class='add'>+			mvm_link-&gt;igtk-&gt;hw_key_idx = STA_KEY_IDX_INVALID;</div><div class='add'>+		mvm_link-&gt;igtk = key_config;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;status-&gt;num_of_gtk_rekeys)</div><div class='del'>-		ieee80211_remove_key(key);</div><div class='del'>-	else if (data-&gt;last_gtk == key)</div><div class='del'>-		iwl_mvm_set_key_rx_seq(data-&gt;mvm, key, data-&gt;status);</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; (keyidx == 6 || keyidx == 7))</div><div class='add'>+		rcu_assign_pointer(mvmvif-&gt;bcn_prot.keys[keyidx - 6],</div><div class='add'>+				   key_config);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_lookup_wowlan_status_ver(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	u8 notif_ver;</div><div class='add'>+</div><div class='add'>+	if (!fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			IWL_UCODE_TLV_API_WOWLAN_KEY_MATERIAL))</div><div class='add'>+		return 6;</div><div class='add'>+</div><div class='add'>+	/* default to 7 (when we have IWL_UCODE_TLV_API_WOWLAN_KEY_MATERIAL) */</div><div class='add'>+	notif_ver = iwl_fw_lookup_notif_ver(mvm-&gt;fw, LONG_GROUP,</div><div class='add'>+					    WOWLAN_GET_STATUSES, 0);</div><div class='add'>+	if (!notif_ver)</div><div class='add'>+		notif_ver = iwl_fw_lookup_notif_ver(mvm-&gt;fw, LEGACY_GROUP,</div><div class='add'>+						    WOWLAN_GET_STATUSES, 7);</div><div class='add'>+</div><div class='add'>+	return notif_ver;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool iwl_mvm_setup_connection_keep(struct iwl_mvm *mvm,</div><div class='ctx'> 					  struct ieee80211_vif *vif,</div><div class='del'>-					  struct iwl_wowlan_status *status)</div><div class='add'>+					  struct iwl_wowlan_status_data *status)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	struct iwl_mvm_d3_gtk_iter_data gtkdata = {</div><div class='ctx'> 		.mvm = mvm,</div><div class='ctx'> 		.status = status,</div><div class='ctx'> 	};</div><div class='add'>+	int i;</div><div class='ctx'> 	u32 disconnection_reasons =</div><div class='ctx'> 		IWL_WOWLAN_WAKEUP_BY_DISCONNECTION_ON_MISSED_BEACON |</div><div class='ctx'> 		IWL_WOWLAN_WAKEUP_BY_DISCONNECTION_ON_DEAUTH;</div><div class='ctx'> </div><div class='ctx'> 	if (!status || !vif-&gt;bss_conf.bssid)</div><div class='ctx'> 		return false;</div><div class='del'>-</div><div class='del'>-	if (le32_to_cpu(status-&gt;wakeup_reasons) &amp; disconnection_reasons)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/* find last GTK that we used initially, if any */</div><div class='del'>-	gtkdata.find_phase = true;</div><div class='del'>-	ieee80211_iter_keys(mvm-&gt;hw, vif,</div><div class='del'>-			    iwl_mvm_d3_update_keys, &amp;gtkdata);</div><div class='del'>-	/* not trying to keep connections with MFP/unhandled ciphers */</div><div class='del'>-	if (gtkdata.unhandled_cipher)</div><div class='del'>-		return false;</div><div class='del'>-	if (!gtkdata.num_keys)</div><div class='del'>-		goto out;</div><div class='del'>-	if (!gtkdata.last_gtk)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * invalidate all other GTKs that might still exist and update</div><div class='ctx'> 	 * the one that we used</div><div class='ctx'> 	 */</div><div class='del'>-	gtkdata.find_phase = false;</div><div class='ctx'> 	ieee80211_iter_keys(mvm-&gt;hw, vif,</div><div class='ctx'> 			    iwl_mvm_d3_update_keys, &amp;gtkdata);</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_WOWLAN(mvm, "num of GTK rekeying %d\n",</div><div class='del'>-			 le32_to_cpu(status-&gt;num_of_gtk_rekeys));</div><div class='ctx'> 	if (status-&gt;num_of_gtk_rekeys) {</div><div class='del'>-		struct ieee80211_key_conf *key;</div><div class='del'>-		struct {</div><div class='del'>-			struct ieee80211_key_conf conf;</div><div class='del'>-			u8 key[32];</div><div class='del'>-		} conf = {</div><div class='del'>-			.conf.cipher = gtkdata.cipher,</div><div class='del'>-			.conf.keyidx =</div><div class='del'>-				iwlmvm_wowlan_gtk_idx(&amp;status-&gt;gtk[0]),</div><div class='del'>-		};</div><div class='del'>-		__be64 replay_ctr;</div><div class='add'>+		__be64 replay_ctr = cpu_to_be64(status-&gt;replay_ctr);</div><div class='ctx'> </div><div class='del'>-		IWL_DEBUG_WOWLAN(mvm,</div><div class='del'>-				 "Received from FW GTK cipher %d, key index %d\n",</div><div class='del'>-				 conf.conf.cipher, conf.conf.keyidx);</div><div class='del'>-		switch (gtkdata.cipher) {</div><div class='del'>-		case WLAN_CIPHER_SUITE_CCMP:</div><div class='del'>-		case WLAN_CIPHER_SUITE_GCMP:</div><div class='del'>-			BUILD_BUG_ON(WLAN_KEY_LEN_CCMP != WLAN_KEY_LEN_GCMP);</div><div class='del'>-			BUILD_BUG_ON(sizeof(conf.key) &lt; WLAN_KEY_LEN_CCMP);</div><div class='del'>-			conf.conf.keylen = WLAN_KEY_LEN_CCMP;</div><div class='del'>-			memcpy(conf.conf.key, status-&gt;gtk[0].key,</div><div class='del'>-			       WLAN_KEY_LEN_CCMP);</div><div class='del'>-			break;</div><div class='del'>-		case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='del'>-			BUILD_BUG_ON(sizeof(conf.key) &lt; WLAN_KEY_LEN_GCMP_256);</div><div class='del'>-			conf.conf.keylen = WLAN_KEY_LEN_GCMP_256;</div><div class='del'>-			memcpy(conf.conf.key, status-&gt;gtk[0].key,</div><div class='del'>-			       WLAN_KEY_LEN_GCMP_256);</div><div class='del'>-			break;</div><div class='del'>-		case WLAN_CIPHER_SUITE_TKIP:</div><div class='del'>-			BUILD_BUG_ON(sizeof(conf.key) &lt; WLAN_KEY_LEN_TKIP);</div><div class='del'>-			conf.conf.keylen = WLAN_KEY_LEN_TKIP;</div><div class='del'>-			memcpy(conf.conf.key, status-&gt;gtk[0].key, 16);</div><div class='del'>-			/* leave TX MIC key zeroed, we don't use it anyway */</div><div class='del'>-			memcpy(conf.conf.key +</div><div class='del'>-			       NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY,</div><div class='del'>-			       status-&gt;gtk[0].tkip_mic_key, 8);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+		IWL_DEBUG_WOWLAN(mvm, "num of GTK rekeying %d\n",</div><div class='add'>+				 status-&gt;num_of_gtk_rekeys);</div><div class='ctx'> </div><div class='del'>-		key = ieee80211_gtk_rekey_add(vif, &amp;conf.conf);</div><div class='del'>-		if (IS_ERR(key))</div><div class='add'>+		if (!iwl_mvm_gtk_rekey(status, vif, mvm))</div><div class='ctx'> 			return false;</div><div class='del'>-		iwl_mvm_set_key_rx_seq(mvm, key, status);</div><div class='ctx'> </div><div class='del'>-		replay_ctr =</div><div class='del'>-			cpu_to_be64(le64_to_cpu(status-&gt;replay_ctr));</div><div class='add'>+		if (!iwl_mvm_d3_igtk_bigtk_rekey_add(status, vif,</div><div class='add'>+						     &amp;status-&gt;igtk))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(status-&gt;bigtk); i++) {</div><div class='add'>+			if (!iwl_mvm_d3_igtk_bigtk_rekey_add(status, vif,</div><div class='add'>+							     &amp;status-&gt;bigtk[i]))</div><div class='add'>+				return false;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		ieee80211_gtk_rekey_notify(vif, vif-&gt;bss_conf.bssid,</div><div class='ctx'> 					   (void *)&amp;replay_ctr, GFP_KERNEL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	mvmvif-&gt;seqno_valid = true;</div><div class='del'>-	/* +0x10 because the set API expects next-to-use, not last-used */</div><div class='del'>-	mvmvif-&gt;seqno = le16_to_cpu(status-&gt;non_qos_seq_ctr) + 0x10;</div><div class='add'>+	if (iwl_fw_lookup_notif_ver(mvm-&gt;fw, LONG_GROUP,</div><div class='add'>+				    WOWLAN_GET_STATUSES,</div><div class='add'>+				    IWL_FW_CMD_VER_UNKNOWN) &lt; 10) {</div><div class='add'>+		mvmvif-&gt;seqno_valid = true;</div><div class='add'>+		/* +0x10 because the set API expects next-to-use, not last-used */</div><div class='add'>+		mvmvif-&gt;seqno = status-&gt;non_qos_seq_ctr + 0x10;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status-&gt;wakeup_reasons &amp; disconnection_reasons)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void iwl_mvm_convert_gtk_v2(struct iwl_wowlan_status_data *status,</div><div class='add'>+				   struct iwl_wowlan_gtk_status_v2 *data)</div><div class='add'>+{</div><div class='add'>+	BUILD_BUG_ON(sizeof(status-&gt;gtk[0].key) &lt; sizeof(data-&gt;key));</div><div class='add'>+	BUILD_BUG_ON(NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY +</div><div class='add'>+		     sizeof(data-&gt;tkip_mic_key) &gt;</div><div class='add'>+		     sizeof(status-&gt;gtk[0].key));</div><div class='add'>+</div><div class='add'>+	status-&gt;gtk[0].len = data-&gt;key_len;</div><div class='add'>+	status-&gt;gtk[0].flags = data-&gt;key_flags;</div><div class='add'>+	status-&gt;gtk[0].id = status-&gt;gtk[0].flags &amp; IWL_WOWLAN_GTK_IDX_MASK;</div><div class='add'>+</div><div class='add'>+	memcpy(status-&gt;gtk[0].key, data-&gt;key, sizeof(data-&gt;key));</div><div class='add'>+</div><div class='add'>+	/* if it's as long as the TKIP encryption key, copy MIC key */</div><div class='add'>+	if (status-&gt;gtk[0].len == NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY)</div><div class='add'>+		memcpy(status-&gt;gtk[0].key + NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY,</div><div class='add'>+		       data-&gt;tkip_mic_key, sizeof(data-&gt;tkip_mic_key));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_convert_gtk_v3(struct iwl_wowlan_status_data *status,</div><div class='add'>+				   struct iwl_wowlan_gtk_status_v3 *data)</div><div class='add'>+{</div><div class='add'>+	int data_idx, status_idx = 0;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(status-&gt;gtk[0].key) &lt; sizeof(data[0].key));</div><div class='add'>+	BUILD_BUG_ON(NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY +</div><div class='add'>+		     sizeof(data[0].tkip_mic_key) &gt;</div><div class='add'>+		     sizeof(status-&gt;gtk[0].key));</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(status-&gt;gtk) &lt; WOWLAN_GTK_KEYS_NUM);</div><div class='add'>+	for (data_idx = 0; data_idx &lt; ARRAY_SIZE(status-&gt;gtk); data_idx++) {</div><div class='add'>+		if (!(data[data_idx].key_len))</div><div class='add'>+			continue;</div><div class='add'>+		status-&gt;gtk[status_idx].len = data[data_idx].key_len;</div><div class='add'>+		status-&gt;gtk[status_idx].flags = data[data_idx].key_flags;</div><div class='add'>+		status-&gt;gtk[status_idx].id = status-&gt;gtk[status_idx].flags &amp;</div><div class='add'>+				    IWL_WOWLAN_GTK_IDX_MASK;</div><div class='add'>+</div><div class='add'>+		memcpy(status-&gt;gtk[status_idx].key, data[data_idx].key,</div><div class='add'>+		       sizeof(data[data_idx].key));</div><div class='add'>+</div><div class='add'>+		/* if it's as long as the TKIP encryption key, copy MIC key */</div><div class='add'>+		if (status-&gt;gtk[status_idx].len ==</div><div class='add'>+		    NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY)</div><div class='add'>+			memcpy(status-&gt;gtk[status_idx].key +</div><div class='add'>+			       NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY,</div><div class='add'>+			       data[data_idx].tkip_mic_key,</div><div class='add'>+			       sizeof(data[data_idx].tkip_mic_key));</div><div class='add'>+		status_idx++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_convert_igtk(struct iwl_wowlan_status_data *status,</div><div class='add'>+				 struct iwl_wowlan_igtk_status_v1 *data)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(status-&gt;igtk.key) &lt; sizeof(data-&gt;key));</div><div class='add'>+	BUILD_BUG_ON(sizeof(status-&gt;igtk.ipn) != sizeof(data-&gt;ipn));</div><div class='add'>+</div><div class='add'>+	if (!data-&gt;key_len)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	status-&gt;igtk.len = data-&gt;key_len;</div><div class='add'>+	status-&gt;igtk.flags = data-&gt;key_flags;</div><div class='add'>+	status-&gt;igtk.id = u32_get_bits(data-&gt;key_flags,</div><div class='add'>+				       IWL_WOWLAN_IGTK_BIGTK_IDX_MASK)</div><div class='add'>+		+ WOWLAN_IGTK_MIN_INDEX;</div><div class='add'>+</div><div class='add'>+	memcpy(status-&gt;igtk.key, data-&gt;key, sizeof(data-&gt;key));</div><div class='add'>+</div><div class='add'>+	/* mac80211 expects big endian for memcmp() to work, convert */</div><div class='add'>+	for (i = 0; i &lt; sizeof(data-&gt;ipn); i++)</div><div class='add'>+		status-&gt;igtk.ipn[i] = data-&gt;ipn[sizeof(data-&gt;ipn) - i - 1];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_convert_bigtk(struct iwl_wowlan_status_data *status,</div><div class='add'>+				  const struct iwl_wowlan_igtk_status_v1 *data)</div><div class='add'>+{</div><div class='add'>+	int data_idx, status_idx = 0;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(status-&gt;bigtk) &lt; WOWLAN_BIGTK_KEYS_NUM);</div><div class='add'>+</div><div class='add'>+	for (data_idx = 0; data_idx &lt; WOWLAN_BIGTK_KEYS_NUM; data_idx++) {</div><div class='add'>+		if (!data[data_idx].key_len)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		status-&gt;bigtk[status_idx].len = data[data_idx].key_len;</div><div class='add'>+		status-&gt;bigtk[status_idx].flags = data[data_idx].key_flags;</div><div class='add'>+		status-&gt;bigtk[status_idx].id =</div><div class='add'>+			u32_get_bits(data[data_idx].key_flags,</div><div class='add'>+				     IWL_WOWLAN_IGTK_BIGTK_IDX_MASK)</div><div class='add'>+			+ WOWLAN_BIGTK_MIN_INDEX;</div><div class='add'>+</div><div class='add'>+		BUILD_BUG_ON(sizeof(status-&gt;bigtk[status_idx].key) &lt;</div><div class='add'>+			     sizeof(data[data_idx].key));</div><div class='add'>+		BUILD_BUG_ON(sizeof(status-&gt;bigtk[status_idx].ipn) &lt;</div><div class='add'>+			     sizeof(data[data_idx].ipn));</div><div class='add'>+</div><div class='add'>+		memcpy(status-&gt;bigtk[status_idx].key, data[data_idx].key,</div><div class='add'>+		       sizeof(data[data_idx].key));</div><div class='add'>+		memcpy(status-&gt;bigtk[status_idx].ipn, data[data_idx].ipn,</div><div class='add'>+		       sizeof(data[data_idx].ipn));</div><div class='add'>+		status_idx++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_parse_wowlan_info_notif(struct iwl_mvm *mvm,</div><div class='add'>+					    struct iwl_wowlan_info_notif_v5 *data,</div><div class='add'>+					    struct iwl_wowlan_status_data *status,</div><div class='add'>+					    u32 len)</div><div class='add'>+{</div><div class='add'>+	if (IWL_FW_CHECK(mvm, data-&gt;num_mlo_link_keys,</div><div class='add'>+			 "MLO is not supported, shouldn't receive MLO keys\n"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (len &lt; sizeof(*data)) {</div><div class='add'>+		IWL_ERR(mvm, "Invalid WoWLAN info notification!\n");</div><div class='add'>+		status = NULL;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mvm-&gt;fast_resume)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_convert_key_counters_v5(status, &amp;data-&gt;gtk[0].sc);</div><div class='add'>+	iwl_mvm_convert_gtk_v3(status, data-&gt;gtk);</div><div class='add'>+	iwl_mvm_convert_igtk(status, &amp;data-&gt;igtk[0]);</div><div class='add'>+	iwl_mvm_convert_bigtk(status, data-&gt;bigtk);</div><div class='add'>+	status-&gt;replay_ctr = le64_to_cpu(data-&gt;replay_ctr);</div><div class='add'>+	status-&gt;pattern_number = le16_to_cpu(data-&gt;pattern_number);</div><div class='add'>+	status-&gt;tid_offloaded_tx = data-&gt;tid_offloaded_tx;</div><div class='add'>+	if (IWL_FW_CHECK(mvm,</div><div class='add'>+			 data-&gt;tid_offloaded_tx &gt;=</div><div class='add'>+			 ARRAY_SIZE(status-&gt;qos_seq_ctr),</div><div class='add'>+			 "tid_offloaded_tx is out of bound %d\n",</div><div class='add'>+			 data-&gt;tid_offloaded_tx))</div><div class='add'>+		data-&gt;tid_offloaded_tx = 0;</div><div class='add'>+	status-&gt;qos_seq_ctr[data-&gt;tid_offloaded_tx] =</div><div class='add'>+		le16_to_cpu(data-&gt;qos_seq_ctr);</div><div class='add'>+	status-&gt;wakeup_reasons = le32_to_cpu(data-&gt;wakeup_reasons);</div><div class='add'>+	status-&gt;num_of_gtk_rekeys =</div><div class='add'>+		le32_to_cpu(data-&gt;num_of_gtk_rekeys);</div><div class='add'>+	status-&gt;received_beacons = le32_to_cpu(data-&gt;received_beacons);</div><div class='add'>+	status-&gt;tid_tear_down = data-&gt;tid_tear_down;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mvm_parse_wowlan_info_notif_v3(struct iwl_mvm *mvm,</div><div class='add'>+				   struct iwl_wowlan_info_notif_v3 *data,</div><div class='add'>+				   struct iwl_wowlan_status_data *status,</div><div class='add'>+				   u32 len)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	if (len &lt; sizeof(*data)) {</div><div class='add'>+		IWL_ERR(mvm, "Invalid WoWLAN info notification!\n");</div><div class='add'>+		status = NULL;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mvm-&gt;fast_resume)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_convert_key_counters_v5(status, &amp;data-&gt;gtk[0].sc);</div><div class='add'>+	iwl_mvm_convert_gtk_v3(status, data-&gt;gtk);</div><div class='add'>+	iwl_mvm_convert_igtk(status, &amp;data-&gt;igtk[0]);</div><div class='add'>+	iwl_mvm_convert_bigtk(status, data-&gt;bigtk);</div><div class='add'>+	status-&gt;replay_ctr = le64_to_cpu(data-&gt;replay_ctr);</div><div class='add'>+	status-&gt;pattern_number = le16_to_cpu(data-&gt;pattern_number);</div><div class='add'>+	for (i = 0; i &lt; IWL_MAX_TID_COUNT; i++)</div><div class='add'>+		status-&gt;qos_seq_ctr[i] =</div><div class='add'>+			le16_to_cpu(data-&gt;qos_seq_ctr[i]);</div><div class='add'>+	status-&gt;wakeup_reasons = le32_to_cpu(data-&gt;wakeup_reasons);</div><div class='add'>+	status-&gt;num_of_gtk_rekeys =</div><div class='add'>+		le32_to_cpu(data-&gt;num_of_gtk_rekeys);</div><div class='add'>+	status-&gt;received_beacons = le32_to_cpu(data-&gt;received_beacons);</div><div class='add'>+	status-&gt;tid_tear_down = data-&gt;tid_tear_down;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mvm_parse_wowlan_info_notif_v1(struct iwl_mvm *mvm,</div><div class='add'>+				   struct iwl_wowlan_info_notif_v1 *data,</div><div class='add'>+				   struct iwl_wowlan_status_data *status,</div><div class='add'>+				   u32 len)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	if (len &lt; sizeof(*data)) {</div><div class='add'>+		IWL_ERR(mvm, "Invalid WoWLAN info notification!\n");</div><div class='add'>+		status = NULL;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mvm_convert_key_counters_v5(status, &amp;data-&gt;gtk[0].sc);</div><div class='add'>+	iwl_mvm_convert_gtk_v3(status, data-&gt;gtk);</div><div class='add'>+	iwl_mvm_convert_igtk(status, &amp;data-&gt;igtk[0]);</div><div class='add'>+	status-&gt;replay_ctr = le64_to_cpu(data-&gt;replay_ctr);</div><div class='add'>+	status-&gt;pattern_number = le16_to_cpu(data-&gt;pattern_number);</div><div class='add'>+	for (i = 0; i &lt; IWL_MAX_TID_COUNT; i++)</div><div class='add'>+		status-&gt;qos_seq_ctr[i] =</div><div class='add'>+			le16_to_cpu(data-&gt;qos_seq_ctr[i]);</div><div class='add'>+	status-&gt;wakeup_reasons = le32_to_cpu(data-&gt;wakeup_reasons);</div><div class='add'>+	status-&gt;num_of_gtk_rekeys =</div><div class='add'>+		le32_to_cpu(data-&gt;num_of_gtk_rekeys);</div><div class='add'>+	status-&gt;received_beacons = le32_to_cpu(data-&gt;received_beacons);</div><div class='add'>+	status-&gt;tid_tear_down = data-&gt;tid_tear_down;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Occasionally, templates would be nice. This is one of those times ... */</div><div class='ctx'> #define iwl_mvm_parse_wowlan_status_common(_ver)			\</div><div class='del'>-static struct iwl_wowlan_status *					\</div><div class='add'>+static struct iwl_wowlan_status_data *					\</div><div class='ctx'> iwl_mvm_parse_wowlan_status_common_ ## _ver(struct iwl_mvm *mvm,	\</div><div class='del'>-					    void *_data, int len)	\</div><div class='add'>+					    struct iwl_wowlan_status_ ##_ver *data,\</div><div class='add'>+					    int len)			\</div><div class='ctx'> {									\</div><div class='del'>-	struct iwl_wowlan_status *status;				\</div><div class='del'>-	struct iwl_wowlan_status_ ##_ver *data = _data;			\</div><div class='del'>-	int data_size;							\</div><div class='add'>+	struct iwl_wowlan_status_data *status;				\</div><div class='add'>+	int data_size, i;						\</div><div class='ctx'> 									\</div><div class='ctx'> 	if (len &lt; sizeof(*data)) {					\</div><div class='ctx'> 		IWL_ERR(mvm, "Invalid WoWLAN status response!\n");	\</div><div class='del'>-		return ERR_PTR(-EIO);					\</div><div class='add'>+		return NULL;						\</div><div class='ctx'> 	}								\</div><div class='ctx'> 									\</div><div class='ctx'> 	data_size = ALIGN(le32_to_cpu(data-&gt;wake_packet_bufsize), 4);	\</div><div class='ctx'> 	if (len != sizeof(*data) + data_size) {				\</div><div class='ctx'> 		IWL_ERR(mvm, "Invalid WoWLAN status response!\n");	\</div><div class='del'>-		return ERR_PTR(-EIO);					\</div><div class='add'>+		return NULL;						\</div><div class='ctx'> 	}								\</div><div class='ctx'> 									\</div><div class='del'>-	status = kzalloc(sizeof(*status) + data_size, GFP_KERNEL);	\</div><div class='add'>+	status = kzalloc(sizeof(*status), GFP_KERNEL);			\</div><div class='ctx'> 	if (!status)							\</div><div class='del'>-		return ERR_PTR(-ENOMEM);				\</div><div class='add'>+		return NULL;						\</div><div class='ctx'> 									\</div><div class='ctx'> 	/* copy all the common fields */				\</div><div class='del'>-	status-&gt;replay_ctr = data-&gt;replay_ctr;				\</div><div class='del'>-	status-&gt;pattern_number = data-&gt;pattern_number;			\</div><div class='del'>-	status-&gt;non_qos_seq_ctr = data-&gt;non_qos_seq_ctr;		\</div><div class='del'>-	memcpy(status-&gt;qos_seq_ctr, data-&gt;qos_seq_ctr,			\</div><div class='del'>-	       sizeof(status-&gt;qos_seq_ctr));				\</div><div class='del'>-	status-&gt;wakeup_reasons = data-&gt;wakeup_reasons;			\</div><div class='del'>-	status-&gt;num_of_gtk_rekeys = data-&gt;num_of_gtk_rekeys;		\</div><div class='del'>-	status-&gt;received_beacons = data-&gt;received_beacons;		\</div><div class='del'>-	status-&gt;wake_packet_length = data-&gt;wake_packet_length;		\</div><div class='del'>-	status-&gt;wake_packet_bufsize = data-&gt;wake_packet_bufsize;	\</div><div class='del'>-	memcpy(status-&gt;wake_packet, data-&gt;wake_packet,			\</div><div class='del'>-	       le32_to_cpu(status-&gt;wake_packet_bufsize));		\</div><div class='add'>+	status-&gt;replay_ctr = le64_to_cpu(data-&gt;replay_ctr);		\</div><div class='add'>+	status-&gt;pattern_number = le16_to_cpu(data-&gt;pattern_number);	\</div><div class='add'>+	status-&gt;non_qos_seq_ctr = le16_to_cpu(data-&gt;non_qos_seq_ctr);	\</div><div class='add'>+	for (i = 0; i &lt; 8; i++)						\</div><div class='add'>+		status-&gt;qos_seq_ctr[i] =				\</div><div class='add'>+			le16_to_cpu(data-&gt;qos_seq_ctr[i]);		\</div><div class='add'>+	status-&gt;wakeup_reasons = le32_to_cpu(data-&gt;wakeup_reasons);	\</div><div class='add'>+	status-&gt;num_of_gtk_rekeys =					\</div><div class='add'>+		le32_to_cpu(data-&gt;num_of_gtk_rekeys);			\</div><div class='add'>+	status-&gt;received_beacons = le32_to_cpu(data-&gt;received_beacons);	\</div><div class='add'>+	status-&gt;wake_packet_length =					\</div><div class='add'>+		le32_to_cpu(data-&gt;wake_packet_length);			\</div><div class='add'>+	status-&gt;wake_packet_bufsize =					\</div><div class='add'>+		le32_to_cpu(data-&gt;wake_packet_bufsize);			\</div><div class='add'>+	if (status-&gt;wake_packet_bufsize) {				\</div><div class='add'>+		status-&gt;wake_packet =					\</div><div class='add'>+			kmemdup(data-&gt;wake_packet,			\</div><div class='add'>+				status-&gt;wake_packet_bufsize,		\</div><div class='add'>+				GFP_KERNEL);				\</div><div class='add'>+		if (!status-&gt;wake_packet) {				\</div><div class='add'>+			kfree(status);					\</div><div class='add'>+			return NULL;					\</div><div class='add'>+		}							\</div><div class='add'>+	} else {							\</div><div class='add'>+		status-&gt;wake_packet = NULL;				\</div><div class='add'>+	}								\</div><div class='ctx'> 									\</div><div class='ctx'> 	return status;							\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> iwl_mvm_parse_wowlan_status_common(v6)</div><div class='ctx'> iwl_mvm_parse_wowlan_status_common(v7)</div><div class='del'>-iwl_mvm_parse_wowlan_status_common(v9)</div><div class='ctx'> </div><div class='del'>-struct iwl_wowlan_status *iwl_mvm_send_wowlan_get_status(struct iwl_mvm *mvm)</div><div class='add'>+static struct iwl_wowlan_status_data *</div><div class='add'>+iwl_mvm_send_wowlan_get_status(struct iwl_mvm *mvm, u8 sta_id)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_wowlan_status *status;</div><div class='add'>+	struct iwl_wowlan_status_data *status;</div><div class='add'>+	struct iwl_wowlan_get_status_cmd get_status_cmd = {</div><div class='add'>+		.sta_id = cpu_to_le32(sta_id),</div><div class='add'>+	};</div><div class='ctx'> 	struct iwl_host_cmd cmd = {</div><div class='ctx'> 		.id = WOWLAN_GET_STATUSES,</div><div class='ctx'> 		.flags = CMD_WANT_SKB,</div><div class='add'>+		.data = { &amp;get_status_cmd, },</div><div class='add'>+		.len = { sizeof(get_status_cmd), },</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret, len;</div><div class='ctx'> 	u8 notif_ver;</div><div class='add'>+	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, cmd.id,</div><div class='add'>+					   IWL_FW_CMD_VER_UNKNOWN);</div><div class='add'>+</div><div class='add'>+	if (cmd_ver == IWL_FW_CMD_VER_UNKNOWN)</div><div class='add'>+		cmd.len[0] = 0;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -1608,70 +2329,57 @@ struct iwl_wowlan_status *iwl_mvm_send_wowlan_get_status(struct iwl_mvm *mvm)</div><div class='ctx'> 	len = iwl_rx_packet_payload_len(cmd.resp_pkt);</div><div class='ctx'> </div><div class='ctx'> 	/* default to 7 (when we have IWL_UCODE_TLV_API_WOWLAN_KEY_MATERIAL) */</div><div class='del'>-	notif_ver = iwl_fw_lookup_notif_ver(mvm-&gt;fw, LEGACY_GROUP,</div><div class='del'>-					    WOWLAN_GET_STATUSES, 7);</div><div class='add'>+	notif_ver = iwl_mvm_lookup_wowlan_status_ver(mvm);</div><div class='ctx'> </div><div class='del'>-	if (!fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='del'>-			IWL_UCODE_TLV_API_WOWLAN_KEY_MATERIAL)) {</div><div class='add'>+	if (notif_ver &lt; 7) {</div><div class='ctx'> 		struct iwl_wowlan_status_v6 *v6 = (void *)cmd.resp_pkt-&gt;data;</div><div class='ctx'> </div><div class='del'>-		status = iwl_mvm_parse_wowlan_status_common_v6(mvm,</div><div class='del'>-							       cmd.resp_pkt-&gt;data,</div><div class='del'>-							       len);</div><div class='del'>-		if (IS_ERR(status))</div><div class='add'>+		status = iwl_mvm_parse_wowlan_status_common_v6(mvm, v6, len);</div><div class='add'>+		if (!status)</div><div class='ctx'> 			goto out_free_resp;</div><div class='ctx'> </div><div class='ctx'> 		BUILD_BUG_ON(sizeof(v6-&gt;gtk.decrypt_key) &gt;</div><div class='ctx'> 			     sizeof(status-&gt;gtk[0].key));</div><div class='del'>-		BUILD_BUG_ON(sizeof(v6-&gt;gtk.tkip_mic_key) &gt;</div><div class='del'>-			     sizeof(status-&gt;gtk[0].tkip_mic_key));</div><div class='add'>+		BUILD_BUG_ON(NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY +</div><div class='add'>+			     sizeof(v6-&gt;gtk.tkip_mic_key) &gt;</div><div class='add'>+			     sizeof(status-&gt;gtk[0].key));</div><div class='ctx'> </div><div class='ctx'> 		/* copy GTK info to the right place */</div><div class='ctx'> 		memcpy(status-&gt;gtk[0].key, v6-&gt;gtk.decrypt_key,</div><div class='ctx'> 		       sizeof(v6-&gt;gtk.decrypt_key));</div><div class='del'>-		memcpy(status-&gt;gtk[0].tkip_mic_key, v6-&gt;gtk.tkip_mic_key,</div><div class='add'>+		memcpy(status-&gt;gtk[0].key + NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY,</div><div class='add'>+		       v6-&gt;gtk.tkip_mic_key,</div><div class='ctx'> 		       sizeof(v6-&gt;gtk.tkip_mic_key));</div><div class='del'>-		memcpy(&amp;status-&gt;gtk[0].rsc, &amp;v6-&gt;gtk.rsc,</div><div class='del'>-		       sizeof(status-&gt;gtk[0].rsc));</div><div class='add'>+</div><div class='add'>+		iwl_mvm_convert_key_counters(status, &amp;v6-&gt;gtk.rsc.all_tsc_rsc,</div><div class='add'>+					     v6-&gt;gtk.key_index);</div><div class='ctx'> </div><div class='ctx'> 		/* hardcode the key length to 16 since v6 only supports 16 */</div><div class='del'>-		status-&gt;gtk[0].key_len = 16;</div><div class='add'>+		status-&gt;gtk[0].len = 16;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The key index only uses 2 bits (values 0 to 3) and</div><div class='ctx'> 		 * we always set bit 7 which means this is the</div><div class='ctx'> 		 * currently used key.</div><div class='ctx'> 		 */</div><div class='del'>-		status-&gt;gtk[0].key_flags = v6-&gt;gtk.key_index | BIT(7);</div><div class='add'>+		status-&gt;gtk[0].flags = v6-&gt;gtk.key_index | BIT(7);</div><div class='add'>+		status-&gt;gtk[0].id = v6-&gt;gtk.key_index;</div><div class='ctx'> 	} else if (notif_ver == 7) {</div><div class='ctx'> 		struct iwl_wowlan_status_v7 *v7 = (void *)cmd.resp_pkt-&gt;data;</div><div class='ctx'> </div><div class='del'>-		status = iwl_mvm_parse_wowlan_status_common_v7(mvm,</div><div class='del'>-							       cmd.resp_pkt-&gt;data,</div><div class='del'>-							       len);</div><div class='del'>-		if (IS_ERR(status))</div><div class='add'>+		status = iwl_mvm_parse_wowlan_status_common_v7(mvm, v7, len);</div><div class='add'>+		if (!status)</div><div class='ctx'> 			goto out_free_resp;</div><div class='ctx'> </div><div class='del'>-		status-&gt;gtk[0] = v7-&gt;gtk[0];</div><div class='del'>-		status-&gt;igtk[0] = v7-&gt;igtk[0];</div><div class='del'>-	} else if (notif_ver == 9) {</div><div class='del'>-		struct iwl_wowlan_status_v9 *v9 = (void *)cmd.resp_pkt-&gt;data;</div><div class='del'>-</div><div class='del'>-		status = iwl_mvm_parse_wowlan_status_common_v9(mvm,</div><div class='del'>-							       cmd.resp_pkt-&gt;data,</div><div class='del'>-							       len);</div><div class='del'>-		if (IS_ERR(status))</div><div class='del'>-			goto out_free_resp;</div><div class='del'>-</div><div class='del'>-		status-&gt;gtk[0] = v9-&gt;gtk[0];</div><div class='del'>-		status-&gt;igtk[0] = v9-&gt;igtk[0];</div><div class='del'>-</div><div class='del'>-		status-&gt;tid_tear_down = v9-&gt;tid_tear_down;</div><div class='add'>+		iwl_mvm_convert_key_counters(status, &amp;v7-&gt;gtk[0].rsc.all_tsc_rsc,</div><div class='add'>+					     v7-&gt;gtk[0].key_flags &amp; IWL_WOWLAN_GTK_IDX_MASK);</div><div class='add'>+		iwl_mvm_convert_gtk_v2(status, &amp;v7-&gt;gtk[0]);</div><div class='add'>+		iwl_mvm_convert_igtk(status, &amp;v7-&gt;igtk[0]);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		IWL_ERR(mvm,</div><div class='ctx'> 			"Firmware advertises unknown WoWLAN status response %d!\n",</div><div class='ctx'> 			notif_ver);</div><div class='del'>-		status = ERR_PTR(-EIO);</div><div class='add'>+		status = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_free_resp:</div><div class='hunk'>@@ -1679,96 +2387,73 @@ out_free_resp:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct iwl_wowlan_status *</div><div class='del'>-iwl_mvm_get_wakeup_status(struct iwl_mvm *mvm)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* only for tracing for now */</div><div class='del'>-	ret = iwl_mvm_send_cmd_pdu(mvm, OFFLOADS_QUERY_CMD, 0, 0, NULL);</div><div class='del'>-	if (ret)</div><div class='del'>-		IWL_ERR(mvm, "failed to query offload statistics (%d)\n", ret);</div><div class='del'>-</div><div class='del'>-	return iwl_mvm_send_wowlan_get_status(mvm);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* releases the MVM mutex */</div><div class='ctx'> static bool iwl_mvm_query_wakeup_reasons(struct iwl_mvm *mvm,</div><div class='del'>-					 struct ieee80211_vif *vif)</div><div class='add'>+					 struct ieee80211_vif *vif,</div><div class='add'>+					 struct iwl_wowlan_status_data *status)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_wowlan_status_data status;</div><div class='del'>-	struct iwl_wowlan_status *fw_status;</div><div class='ctx'> 	int i;</div><div class='del'>-	bool keep;</div><div class='add'>+	bool keep = false;</div><div class='ctx'> 	struct iwl_mvm_sta *mvm_ap_sta;</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	int link_id = vif-&gt;active_links ? __ffs(vif-&gt;active_links) : 0;</div><div class='add'>+	struct iwl_mvm_vif_link_info *mvm_link = mvmvif-&gt;link[link_id];</div><div class='add'>+	int wowlan_info_ver = iwl_fw_lookup_notif_ver(mvm-&gt;fw,</div><div class='add'>+						      PROT_OFFLOAD_GROUP,</div><div class='add'>+						      WOWLAN_INFO_NOTIFICATION,</div><div class='add'>+						      IWL_FW_CMD_VER_UNKNOWN);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mvm_link))</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	fw_status = iwl_mvm_get_wakeup_status(mvm);</div><div class='del'>-	if (IS_ERR_OR_NULL(fw_status))</div><div class='add'>+	if (!status)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_WOWLAN(mvm, "wakeup reason 0x%x\n",</div><div class='del'>-			 le32_to_cpu(fw_status-&gt;wakeup_reasons));</div><div class='del'>-</div><div class='del'>-	status.pattern_number = le16_to_cpu(fw_status-&gt;pattern_number);</div><div class='del'>-	for (i = 0; i &lt; 8; i++)</div><div class='del'>-		status.qos_seq_ctr[i] =</div><div class='del'>-			le16_to_cpu(fw_status-&gt;qos_seq_ctr[i]);</div><div class='del'>-	status.wakeup_reasons = le32_to_cpu(fw_status-&gt;wakeup_reasons);</div><div class='del'>-	status.wake_packet_length =</div><div class='del'>-		le32_to_cpu(fw_status-&gt;wake_packet_length);</div><div class='del'>-	status.wake_packet_bufsize =</div><div class='del'>-		le32_to_cpu(fw_status-&gt;wake_packet_bufsize);</div><div class='del'>-	status.wake_packet = fw_status-&gt;wake_packet;</div><div class='del'>-</div><div class='del'>-	/* still at hard-coded place 0 for D3 image */</div><div class='del'>-	mvm_ap_sta = iwl_mvm_sta_from_staid_protected(mvm, 0);</div><div class='add'>+			 status-&gt;wakeup_reasons);</div><div class='add'>+</div><div class='add'>+	mvm_ap_sta = iwl_mvm_sta_from_staid_protected(mvm, mvm_link-&gt;ap_sta_id);</div><div class='ctx'> 	if (!mvm_ap_sta)</div><div class='del'>-		goto out_free;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; IWL_MAX_TID_COUNT; i++) {</div><div class='del'>-		u16 seq = status.qos_seq_ctr[i];</div><div class='del'>-		/* firmware stores last-used value, we store next value */</div><div class='del'>-		seq += 0x10;</div><div class='del'>-		mvm_ap_sta-&gt;tid_data[i].seq_number = seq;</div><div class='add'>+	/* firmware stores last-used value, we store next value */</div><div class='add'>+	if (wowlan_info_ver &gt;= 5) {</div><div class='add'>+		mvm_ap_sta-&gt;tid_data[status-&gt;tid_offloaded_tx].seq_number =</div><div class='add'>+			status-&gt;qos_seq_ctr[status-&gt;tid_offloaded_tx] + 0x10;</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; IWL_MAX_TID_COUNT; i++)</div><div class='add'>+			mvm_ap_sta-&gt;tid_data[i].seq_number =</div><div class='add'>+				status-&gt;qos_seq_ctr[i] + 0x10;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mvm-&gt;trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_22000) {</div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_22000) {</div><div class='ctx'> 		i = mvm-&gt;offload_tid;</div><div class='ctx'> 		iwl_trans_set_q_ptrs(mvm-&gt;trans,</div><div class='ctx'> 				     mvm_ap_sta-&gt;tid_data[i].txq_id,</div><div class='ctx'> 				     mvm_ap_sta-&gt;tid_data[i].seq_number &gt;&gt; 4);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* now we have all the data we need, unlock to avoid mac80211 issues */</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	iwl_mvm_report_wakeup_reasons(mvm, vif, &amp;status);</div><div class='add'>+	iwl_mvm_report_wakeup_reasons(mvm, vif, status);</div><div class='ctx'> </div><div class='del'>-	keep = iwl_mvm_setup_connection_keep(mvm, vif, fw_status);</div><div class='del'>-</div><div class='del'>-	kfree(fw_status);</div><div class='del'>-	return keep;</div><div class='del'>-</div><div class='del'>-out_free:</div><div class='del'>-	kfree(fw_status);</div><div class='add'>+	keep = iwl_mvm_setup_connection_keep(mvm, vif, status);</div><div class='ctx'> out_unlock:</div><div class='ctx'> 	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-	return false;</div><div class='add'>+	return keep;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define ND_QUERY_BUF_LEN (sizeof(struct iwl_scan_offload_profile_match) * \</div><div class='ctx'> 			  IWL_SCAN_MAX_PROFILES)</div><div class='ctx'> </div><div class='del'>-struct iwl_mvm_nd_query_results {</div><div class='add'>+struct iwl_mvm_nd_results {</div><div class='ctx'> 	u32 matched_profiles;</div><div class='ctx'> 	u8 matches[ND_QUERY_BUF_LEN];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> iwl_mvm_netdetect_query_results(struct iwl_mvm *mvm,</div><div class='del'>-				struct iwl_mvm_nd_query_results *results)</div><div class='add'>+				struct iwl_mvm_nd_results *results)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_scan_offload_profiles_query *query;</div><div class='add'>+	struct iwl_scan_offload_match_info *query;</div><div class='ctx'> 	struct iwl_host_cmd cmd = {</div><div class='ctx'> 		.id = SCAN_OFFLOAD_PROFILES_QUERY_CMD,</div><div class='ctx'> 		.flags = CMD_WANT_SKB,</div><div class='hunk'>@@ -1785,7 +2470,7 @@ iwl_mvm_netdetect_query_results(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	if (fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 		       IWL_UCODE_TLV_API_SCAN_OFFLOAD_CHANS)) {</div><div class='del'>-		query_len = sizeof(struct iwl_scan_offload_profiles_query);</div><div class='add'>+		query_len = sizeof(struct iwl_scan_offload_match_info);</div><div class='ctx'> 		matches_len = sizeof(struct iwl_scan_offload_profile_match) *</div><div class='ctx'> 			max_profiles;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1816,7 +2501,7 @@ out_free_resp:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_mvm_query_num_match_chans(struct iwl_mvm *mvm,</div><div class='del'>-					 struct iwl_mvm_nd_query_results *query,</div><div class='add'>+					 struct iwl_mvm_nd_results *results,</div><div class='ctx'> 					 int idx)</div><div class='ctx'> {</div><div class='ctx'> 	int n_chans = 0, i;</div><div class='hunk'>@@ -1824,13 +2509,13 @@ static int iwl_mvm_query_num_match_chans(struct iwl_mvm *mvm,</div><div class='ctx'> 	if (fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 		       IWL_UCODE_TLV_API_SCAN_OFFLOAD_CHANS)) {</div><div class='ctx'> 		struct iwl_scan_offload_profile_match *matches =</div><div class='del'>-			(struct iwl_scan_offload_profile_match *)query-&gt;matches;</div><div class='add'>+			(void *)results-&gt;matches;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; SCAN_OFFLOAD_MATCHING_CHANNELS_LEN; i++)</div><div class='ctx'> 			n_chans += hweight8(matches[idx].matching_channels[i]);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct iwl_scan_offload_profile_match_v1 *matches =</div><div class='del'>-			(struct iwl_scan_offload_profile_match_v1 *)query-&gt;matches;</div><div class='add'>+			(void *)results-&gt;matches;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; SCAN_OFFLOAD_MATCHING_CHANNELS_LEN_V1; i++)</div><div class='ctx'> 			n_chans += hweight8(matches[idx].matching_channels[i]);</div><div class='hunk'>@@ -1840,51 +2525,78 @@ static int iwl_mvm_query_num_match_chans(struct iwl_mvm *mvm,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_query_set_freqs(struct iwl_mvm *mvm,</div><div class='del'>-				    struct iwl_mvm_nd_query_results *query,</div><div class='add'>+				    struct iwl_mvm_nd_results *results,</div><div class='ctx'> 				    struct cfg80211_wowlan_nd_match *match,</div><div class='ctx'> 				    int idx)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='add'>+	int n_channels = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 		       IWL_UCODE_TLV_API_SCAN_OFFLOAD_CHANS)) {</div><div class='ctx'> 		struct iwl_scan_offload_profile_match *matches =</div><div class='del'>-			(struct iwl_scan_offload_profile_match *)query-&gt;matches;</div><div class='add'>+			 (void *)results-&gt;matches;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; SCAN_OFFLOAD_MATCHING_CHANNELS_LEN * 8; i++)</div><div class='ctx'> 			if (matches[idx].matching_channels[i / 8] &amp; (BIT(i % 8)))</div><div class='del'>-				match-&gt;channels[match-&gt;n_channels++] =</div><div class='add'>+				match-&gt;channels[n_channels++] =</div><div class='ctx'> 					mvm-&gt;nd_channels[i]-&gt;center_freq;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct iwl_scan_offload_profile_match_v1 *matches =</div><div class='del'>-			(struct iwl_scan_offload_profile_match_v1 *)query-&gt;matches;</div><div class='add'>+			 (void *)results-&gt;matches;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; SCAN_OFFLOAD_MATCHING_CHANNELS_LEN_V1 * 8; i++)</div><div class='ctx'> 			if (matches[idx].matching_channels[i / 8] &amp; (BIT(i % 8)))</div><div class='del'>-				match-&gt;channels[match-&gt;n_channels++] =</div><div class='add'>+				match-&gt;channels[n_channels++] =</div><div class='ctx'> 					mvm-&gt;nd_channels[i]-&gt;center_freq;</div><div class='ctx'> 	}</div><div class='add'>+	/* We may have ended up with fewer channels than we allocated. */</div><div class='add'>+	match-&gt;n_channels = n_channels;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * enum iwl_d3_notif - d3 notifications</div><div class='add'>+ * @IWL_D3_NOTIF_WOWLAN_INFO: WOWLAN_INFO_NOTIF was received</div><div class='add'>+ * @IWL_D3_NOTIF_WOWLAN_WAKE_PKT: WOWLAN_WAKE_PKT_NOTIF was received</div><div class='add'>+ * @IWL_D3_NOTIF_PROT_OFFLOAD: PROT_OFFLOAD_NOTIF was received</div><div class='add'>+ * @IWL_D3_ND_MATCH_INFO: OFFLOAD_MATCH_INFO_NOTIF was received</div><div class='add'>+ * @IWL_D3_NOTIF_D3_END_NOTIF: D3_END_NOTIF was received</div><div class='add'>+ */</div><div class='add'>+enum iwl_d3_notif {</div><div class='add'>+	IWL_D3_NOTIF_WOWLAN_INFO =	BIT(0),</div><div class='add'>+	IWL_D3_NOTIF_WOWLAN_WAKE_PKT =	BIT(1),</div><div class='add'>+	IWL_D3_NOTIF_PROT_OFFLOAD =	BIT(2),</div><div class='add'>+	IWL_D3_ND_MATCH_INFO      =     BIT(3),</div><div class='add'>+	IWL_D3_NOTIF_D3_END_NOTIF =	BIT(4)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* manage d3 resume data */</div><div class='add'>+struct iwl_d3_data {</div><div class='add'>+	struct iwl_wowlan_status_data *status;</div><div class='add'>+	u32 d3_end_flags;</div><div class='add'>+	u32 notif_expected;	/* bitmap - see &amp;enum iwl_d3_notif */</div><div class='add'>+	u32 notif_received;	/* bitmap - see &amp;enum iwl_d3_notif */</div><div class='add'>+	struct iwl_mvm_nd_results *nd_results;</div><div class='add'>+	bool nd_results_valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void iwl_mvm_query_netdetect_reasons(struct iwl_mvm *mvm,</div><div class='del'>-					    struct ieee80211_vif *vif)</div><div class='add'>+					    struct ieee80211_vif *vif,</div><div class='add'>+					    struct iwl_d3_data *d3_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfg80211_wowlan_nd_info *net_detect = NULL;</div><div class='ctx'> 	struct cfg80211_wowlan_wakeup wakeup = {</div><div class='ctx'> 		.pattern_idx = -1,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct cfg80211_wowlan_wakeup *wakeup_report = &amp;wakeup;</div><div class='del'>-	struct iwl_mvm_nd_query_results query;</div><div class='del'>-	struct iwl_wowlan_status *fw_status;</div><div class='ctx'> 	unsigned long matched_profiles;</div><div class='ctx'> 	u32 reasons = 0;</div><div class='ctx'> 	int i, n_matches, ret;</div><div class='ctx'> </div><div class='del'>-	fw_status = iwl_mvm_get_wakeup_status(mvm);</div><div class='del'>-	if (!IS_ERR_OR_NULL(fw_status)) {</div><div class='del'>-		reasons = le32_to_cpu(fw_status-&gt;wakeup_reasons);</div><div class='del'>-		kfree(fw_status);</div><div class='del'>-	}</div><div class='add'>+	if (WARN_ON(!d3_data || !d3_data-&gt;status))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	reasons = d3_data-&gt;status-&gt;wakeup_reasons;</div><div class='ctx'> </div><div class='ctx'> 	if (reasons &amp; IWL_WOWLAN_WAKEUP_BY_RFKILL_DEASSERTED)</div><div class='ctx'> 		wakeup.rfkill_release = true;</div><div class='hunk'>@@ -1892,13 +2604,22 @@ static void iwl_mvm_query_netdetect_reasons(struct iwl_mvm *mvm,</div><div class='ctx'> 	if (reasons != IWL_WOWLAN_WAKEUP_BY_NON_WIRELESS)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_netdetect_query_results(mvm, &amp;query);</div><div class='del'>-	if (ret || !query.matched_profiles) {</div><div class='add'>+	if (!iwl_fw_lookup_notif_ver(mvm-&gt;fw, PROT_OFFLOAD_GROUP,</div><div class='add'>+				     WOWLAN_INFO_NOTIFICATION, 0)) {</div><div class='add'>+		IWL_INFO(mvm, "Query FW for ND results\n");</div><div class='add'>+		ret = iwl_mvm_netdetect_query_results(mvm, d3_data-&gt;nd_results);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		IWL_INFO(mvm, "Notification based ND results\n");</div><div class='add'>+		ret = d3_data-&gt;nd_results_valid ? 0 : -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret || !d3_data-&gt;nd_results-&gt;matched_profiles) {</div><div class='ctx'> 		wakeup_report = NULL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	matched_profiles = query.matched_profiles;</div><div class='add'>+	matched_profiles = d3_data-&gt;nd_results-&gt;matched_profiles;</div><div class='ctx'> 	if (mvm-&gt;n_nd_match_sets) {</div><div class='ctx'> 		n_matches = hweight_long(matched_profiles);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1910,19 +2631,24 @@ static void iwl_mvm_query_netdetect_reasons(struct iwl_mvm *mvm,</div><div class='ctx'> 			     GFP_KERNEL);</div><div class='ctx'> 	if (!net_detect || !n_matches)</div><div class='ctx'> 		goto out_report_nd;</div><div class='add'>+	net_detect-&gt;n_matches = n_matches;</div><div class='add'>+	n_matches = 0;</div><div class='ctx'> </div><div class='ctx'> 	for_each_set_bit(i, &amp;matched_profiles, mvm-&gt;n_nd_match_sets) {</div><div class='ctx'> 		struct cfg80211_wowlan_nd_match *match;</div><div class='ctx'> 		int idx, n_channels = 0;</div><div class='ctx'> </div><div class='del'>-		n_channels = iwl_mvm_query_num_match_chans(mvm, &amp;query, i);</div><div class='add'>+		n_channels = iwl_mvm_query_num_match_chans(mvm,</div><div class='add'>+							   d3_data-&gt;nd_results,</div><div class='add'>+							   i);</div><div class='ctx'> </div><div class='ctx'> 		match = kzalloc(struct_size(match, channels, n_channels),</div><div class='ctx'> 				GFP_KERNEL);</div><div class='ctx'> 		if (!match)</div><div class='ctx'> 			goto out_report_nd;</div><div class='add'>+		match-&gt;n_channels = n_channels;</div><div class='ctx'> </div><div class='del'>-		net_detect-&gt;matches[net_detect-&gt;n_matches++] = match;</div><div class='add'>+		net_detect-&gt;matches[n_matches++] = match;</div><div class='ctx'> </div><div class='ctx'> 		/* We inverted the order of the SSIDs in the scan</div><div class='ctx'> 		 * request, so invert the index here.</div><div class='hunk'>@@ -1935,8 +2661,10 @@ static void iwl_mvm_query_netdetect_reasons(struct iwl_mvm *mvm,</div><div class='ctx'> 		if (mvm-&gt;n_nd_channels &lt; n_channels)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		iwl_mvm_query_set_freqs(mvm, &amp;query, match, i);</div><div class='add'>+		iwl_mvm_query_set_freqs(mvm, d3_data-&gt;nd_results, match, i);</div><div class='ctx'> 	}</div><div class='add'>+	/* We may have fewer matches than we allocated. */</div><div class='add'>+	net_detect-&gt;n_matches = n_matches;</div><div class='ctx'> </div><div class='ctx'> out_report_nd:</div><div class='ctx'> 	wakeup.net_detect = net_detect;</div><div class='hunk'>@@ -1964,70 +2692,405 @@ static void iwl_mvm_d3_disconnect_iter(void *data, u8 *mac,</div><div class='ctx'> 		ieee80211_resume_disconnect(vif);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool iwl_mvm_rt_status(struct iwl_trans *trans, u32 base, u32 *err_id)</div><div class='add'>+enum rt_status {</div><div class='add'>+	FW_ALIVE,</div><div class='add'>+	FW_NEEDS_RESET,</div><div class='add'>+	FW_ERROR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static enum rt_status iwl_mvm_check_rt_status(struct iwl_mvm *mvm,</div><div class='add'>+					      struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct error_table_start {</div><div class='del'>-		/* cf. struct iwl_error_event_table */</div><div class='del'>-		u32 valid;</div><div class='del'>-		__le32 err_id;</div><div class='del'>-	} err_info;</div><div class='add'>+	u32 err_id;</div><div class='ctx'> </div><div class='del'>-	if (!base)</div><div class='add'>+	/* check for lmac1 error */</div><div class='add'>+	if (iwl_fwrt_read_err_table(mvm-&gt;trans,</div><div class='add'>+				    mvm-&gt;trans-&gt;dbg.lmac_error_event_table[0],</div><div class='add'>+				    &amp;err_id)) {</div><div class='add'>+		if (err_id == RF_KILL_INDICATOR_FOR_WOWLAN) {</div><div class='add'>+			IWL_WARN(mvm, "Rfkill was toggled during suspend\n");</div><div class='add'>+			if (vif) {</div><div class='add'>+				struct cfg80211_wowlan_wakeup wakeup = {</div><div class='add'>+					.rfkill_release = true,</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				ieee80211_report_wowlan_wakeup(vif, &amp;wakeup,</div><div class='add'>+							       GFP_KERNEL);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			return FW_NEEDS_RESET;</div><div class='add'>+		}</div><div class='add'>+		return FW_ERROR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check if we have lmac2 set and check for error */</div><div class='add'>+	if (iwl_fwrt_read_err_table(mvm-&gt;trans,</div><div class='add'>+				    mvm-&gt;trans-&gt;dbg.lmac_error_event_table[1],</div><div class='add'>+				    NULL))</div><div class='add'>+		return FW_ERROR;</div><div class='add'>+</div><div class='add'>+	/* check for umac error */</div><div class='add'>+	if (iwl_fwrt_read_err_table(mvm-&gt;trans,</div><div class='add'>+				    mvm-&gt;trans-&gt;dbg.umac_error_event_table,</div><div class='add'>+				    NULL))</div><div class='add'>+		return FW_ERROR;</div><div class='add'>+</div><div class='add'>+	return FW_ALIVE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function assumes:</div><div class='add'>+ *	1. The mutex is already held.</div><div class='add'>+ *	2. The callee functions unlock the mutex.</div><div class='add'>+ */</div><div class='add'>+static bool</div><div class='add'>+iwl_mvm_choose_query_wakeup_reasons(struct iwl_mvm *mvm,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct iwl_d3_data *d3_data)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* if FW uses status notification, status shouldn't be NULL here */</div><div class='add'>+	if (!d3_data-&gt;status) {</div><div class='add'>+		struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+		u8 sta_id = mvm-&gt;net_detect ? IWL_INVALID_STA :</div><div class='add'>+					      mvmvif-&gt;deflink.ap_sta_id;</div><div class='add'>+</div><div class='add'>+		/* bug - FW with MLO has status notification */</div><div class='add'>+		WARN_ON(ieee80211_vif_is_mld(vif));</div><div class='add'>+</div><div class='add'>+		d3_data-&gt;status = iwl_mvm_send_wowlan_get_status(mvm, sta_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mvm-&gt;net_detect) {</div><div class='add'>+		iwl_mvm_query_netdetect_reasons(mvm, vif, d3_data);</div><div class='ctx'> 		return false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	iwl_trans_read_mem_bytes(trans, base,</div><div class='del'>-				 &amp;err_info, sizeof(err_info));</div><div class='del'>-	if (err_info.valid &amp;&amp; err_id)</div><div class='del'>-		*err_id = le32_to_cpu(err_info.err_id);</div><div class='add'>+	return iwl_mvm_query_wakeup_reasons(mvm, vif,</div><div class='add'>+					    d3_data-&gt;status);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return !!err_info.valid;</div><div class='add'>+#define IWL_WOWLAN_WAKEUP_REASON_HAS_WAKEUP_PKT (IWL_WOWLAN_WAKEUP_BY_MAGIC_PACKET | \</div><div class='add'>+						 IWL_WOWLAN_WAKEUP_BY_PATTERN | \</div><div class='add'>+						 IWL_WAKEUP_BY_PATTERN_IPV4_TCP_SYN |\</div><div class='add'>+						 IWL_WAKEUP_BY_PATTERN_IPV4_TCP_SYN_WILDCARD |\</div><div class='add'>+						 IWL_WAKEUP_BY_PATTERN_IPV6_TCP_SYN |\</div><div class='add'>+						 IWL_WAKEUP_BY_PATTERN_IPV6_TCP_SYN_WILDCARD)</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_wowlan_store_wake_pkt(struct iwl_mvm *mvm,</div><div class='add'>+					 struct iwl_wowlan_wake_pkt_notif *notif,</div><div class='add'>+					 struct iwl_wowlan_status_data *status,</div><div class='add'>+					 u32 len)</div><div class='add'>+{</div><div class='add'>+	u32 data_size, packet_len = le32_to_cpu(notif-&gt;wake_packet_length);</div><div class='add'>+</div><div class='add'>+	if (len &lt; sizeof(*notif)) {</div><div class='add'>+		IWL_ERR(mvm, "Invalid WoWLAN wake packet notification!\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!status)) {</div><div class='add'>+		IWL_ERR(mvm, "Got wake packet notification but wowlan status data is NULL\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!(status-&gt;wakeup_reasons &amp;</div><div class='add'>+		      IWL_WOWLAN_WAKEUP_REASON_HAS_WAKEUP_PKT))) {</div><div class='add'>+		IWL_ERR(mvm, "Got wakeup packet but wakeup reason is %x\n",</div><div class='add'>+			status-&gt;wakeup_reasons);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data_size = len - offsetof(struct iwl_wowlan_wake_pkt_notif, wake_packet);</div><div class='add'>+</div><div class='add'>+	/* data_size got the padding from the notification, remove it. */</div><div class='add'>+	if (packet_len &lt; data_size)</div><div class='add'>+		data_size = packet_len;</div><div class='add'>+</div><div class='add'>+	status-&gt;wake_packet = kmemdup(notif-&gt;wake_packet, data_size,</div><div class='add'>+				      GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+	if (!status-&gt;wake_packet)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	status-&gt;wake_packet_length = packet_len;</div><div class='add'>+	status-&gt;wake_packet_bufsize = data_size;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool iwl_mvm_check_rt_status(struct iwl_mvm *mvm,</div><div class='del'>-				   struct ieee80211_vif *vif)</div><div class='add'>+static void iwl_mvm_nd_match_info_handler(struct iwl_mvm *mvm,</div><div class='add'>+					  struct iwl_d3_data *d3_data,</div><div class='add'>+					  struct iwl_scan_offload_match_info *notif,</div><div class='add'>+					  u32 len)</div><div class='ctx'> {</div><div class='del'>-	u32 err_id;</div><div class='add'>+	struct iwl_wowlan_status_data *status = d3_data-&gt;status;</div><div class='add'>+	struct ieee80211_vif *vif = iwl_mvm_get_bss_vif(mvm);</div><div class='add'>+	struct iwl_mvm_nd_results *results = d3_data-&gt;nd_results;</div><div class='add'>+	size_t i, matches_len = sizeof(struct iwl_scan_offload_profile_match) *</div><div class='add'>+		iwl_umac_scan_get_max_profiles(mvm-&gt;fw);</div><div class='ctx'> </div><div class='del'>-	/* check for lmac1 error */</div><div class='del'>-	if (iwl_mvm_rt_status(mvm-&gt;trans,</div><div class='del'>-			      mvm-&gt;trans-&gt;dbg.lmac_error_event_table[0],</div><div class='del'>-			      &amp;err_id)) {</div><div class='del'>-		if (err_id == RF_KILL_INDICATOR_FOR_WOWLAN) {</div><div class='del'>-			struct cfg80211_wowlan_wakeup wakeup = {</div><div class='del'>-				.rfkill_release = true,</div><div class='del'>-			};</div><div class='del'>-			ieee80211_report_wowlan_wakeup(vif, &amp;wakeup,</div><div class='del'>-						       GFP_KERNEL);</div><div class='add'>+	if (IS_ERR_OR_NULL(vif))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (len &lt; sizeof(struct iwl_scan_offload_match_info)) {</div><div class='add'>+		IWL_ERR(mvm, "Invalid scan match info notification\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mvm-&gt;net_detect) {</div><div class='add'>+		IWL_ERR(mvm, "Unexpected scan match info notification\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!status || status-&gt;wakeup_reasons != IWL_WOWLAN_WAKEUP_BY_NON_WIRELESS) {</div><div class='add'>+		IWL_ERR(mvm,</div><div class='add'>+			"Ignore scan match info notification: no reason\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='add'>+	mvm-&gt;last_netdetect_scans = le32_to_cpu(notif-&gt;n_scans_done);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	results-&gt;matched_profiles = le32_to_cpu(notif-&gt;matched_profiles);</div><div class='add'>+	IWL_INFO(mvm, "number of matched profiles=%u\n",</div><div class='add'>+		 results-&gt;matched_profiles);</div><div class='add'>+</div><div class='add'>+	if (results-&gt;matched_profiles) {</div><div class='add'>+		memcpy(results-&gt;matches, notif-&gt;matches, matches_len);</div><div class='add'>+		d3_data-&gt;nd_results_valid = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* no scan should be active at this point */</div><div class='add'>+	mvm-&gt;scan_status = 0;</div><div class='add'>+	for (i = 0; i &lt; mvm-&gt;max_scans; i++)</div><div class='add'>+		mvm-&gt;scan_uid_status[i] = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mvm_wait_d3_notif(struct iwl_notif_wait_data *notif_wait,</div><div class='add'>+				  struct iwl_rx_packet *pkt, void *data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm =</div><div class='add'>+		container_of(notif_wait, struct iwl_mvm, notif_wait);</div><div class='add'>+	struct iwl_d3_data *d3_data = data;</div><div class='add'>+	u32 len = iwl_rx_packet_payload_len(pkt);</div><div class='add'>+	int ret;</div><div class='add'>+	int wowlan_info_ver = iwl_fw_lookup_notif_ver(mvm-&gt;fw,</div><div class='add'>+						      PROT_OFFLOAD_GROUP,</div><div class='add'>+						      WOWLAN_INFO_NOTIFICATION,</div><div class='add'>+						      IWL_FW_CMD_VER_UNKNOWN);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	switch (WIDE_ID(pkt-&gt;hdr.group_id, pkt-&gt;hdr.cmd)) {</div><div class='add'>+	case WIDE_ID(PROT_OFFLOAD_GROUP, WOWLAN_INFO_NOTIFICATION): {</div><div class='add'>+</div><div class='add'>+		if (d3_data-&gt;notif_received &amp; IWL_D3_NOTIF_WOWLAN_INFO) {</div><div class='add'>+			/* We might get two notifications due to dual bss */</div><div class='add'>+			IWL_DEBUG_WOWLAN(mvm,</div><div class='add'>+					 "Got additional wowlan info notification\n");</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='del'>-		return true;</div><div class='add'>+</div><div class='add'>+		if (wowlan_info_ver == 1) {</div><div class='add'>+			struct iwl_wowlan_info_notif_v1 *notif_v1 =</div><div class='add'>+				(void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+			iwl_mvm_parse_wowlan_info_notif_v1(mvm, notif_v1,</div><div class='add'>+							   d3_data-&gt;status,</div><div class='add'>+							   len);</div><div class='add'>+		} else if (wowlan_info_ver == 3) {</div><div class='add'>+			struct iwl_wowlan_info_notif_v3 *notif =</div><div class='add'>+				(void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+			iwl_mvm_parse_wowlan_info_notif_v3(mvm, notif,</div><div class='add'>+							   d3_data-&gt;status, len);</div><div class='add'>+		} else if (wowlan_info_ver == 5) {</div><div class='add'>+			struct iwl_wowlan_info_notif_v5 *notif =</div><div class='add'>+				(void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+			iwl_mvm_parse_wowlan_info_notif(mvm, notif,</div><div class='add'>+							d3_data-&gt;status, len);</div><div class='add'>+		} else {</div><div class='add'>+			IWL_FW_CHECK(mvm, 1,</div><div class='add'>+				     "Firmware advertises unknown WoWLAN info notification %d!\n",</div><div class='add'>+				     wowlan_info_ver);</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		d3_data-&gt;notif_received |= IWL_D3_NOTIF_WOWLAN_INFO;</div><div class='add'>+</div><div class='add'>+		if (d3_data-&gt;status &amp;&amp;</div><div class='add'>+		    d3_data-&gt;status-&gt;wakeup_reasons &amp; IWL_WOWLAN_WAKEUP_REASON_HAS_WAKEUP_PKT)</div><div class='add'>+			/* We are supposed to get also wake packet notif */</div><div class='add'>+			d3_data-&gt;notif_expected |= IWL_D3_NOTIF_WOWLAN_WAKE_PKT;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='add'>+	case WIDE_ID(PROT_OFFLOAD_GROUP, WOWLAN_WAKE_PKT_NOTIFICATION): {</div><div class='add'>+		struct iwl_wowlan_wake_pkt_notif *notif = (void *)pkt-&gt;data;</div><div class='ctx'> </div><div class='del'>-	/* check if we have lmac2 set and check for error */</div><div class='del'>-	if (iwl_mvm_rt_status(mvm-&gt;trans,</div><div class='del'>-			      mvm-&gt;trans-&gt;dbg.lmac_error_event_table[1], NULL))</div><div class='del'>-		return true;</div><div class='add'>+		if (d3_data-&gt;notif_received &amp; IWL_D3_NOTIF_WOWLAN_WAKE_PKT) {</div><div class='add'>+			/* We shouldn't get two wake packet notifications */</div><div class='add'>+			IWL_ERR(mvm,</div><div class='add'>+				"Got additional wowlan wake packet notification\n");</div><div class='add'>+		} else {</div><div class='add'>+			d3_data-&gt;notif_received |= IWL_D3_NOTIF_WOWLAN_WAKE_PKT;</div><div class='add'>+			len =  iwl_rx_packet_payload_len(pkt);</div><div class='add'>+			ret = iwl_mvm_wowlan_store_wake_pkt(mvm, notif,</div><div class='add'>+							    d3_data-&gt;status,</div><div class='add'>+							    len);</div><div class='add'>+			if (ret)</div><div class='add'>+				IWL_ERR(mvm,</div><div class='add'>+					"Can't parse WOWLAN_WAKE_PKT_NOTIFICATION\n");</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/* check for umac error */</div><div class='del'>-	if (iwl_mvm_rt_status(mvm-&gt;trans,</div><div class='del'>-			      mvm-&gt;trans-&gt;dbg.umac_error_event_table, NULL))</div><div class='del'>-		return true;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case WIDE_ID(SCAN_GROUP, OFFLOAD_MATCH_INFO_NOTIF): {</div><div class='add'>+		struct iwl_scan_offload_match_info *notif = (void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (d3_data-&gt;notif_received &amp; IWL_D3_ND_MATCH_INFO) {</div><div class='add'>+			IWL_ERR(mvm,</div><div class='add'>+				"Got additional netdetect match info\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		d3_data-&gt;notif_received |= IWL_D3_ND_MATCH_INFO;</div><div class='add'>+</div><div class='add'>+		/* explicitly set this in the 'expected' as well */</div><div class='add'>+		d3_data-&gt;notif_expected |= IWL_D3_ND_MATCH_INFO;</div><div class='add'>+</div><div class='add'>+		len = iwl_rx_packet_payload_len(pkt);</div><div class='add'>+		iwl_mvm_nd_match_info_handler(mvm, d3_data, notif, len);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case WIDE_ID(PROT_OFFLOAD_GROUP, D3_END_NOTIFICATION): {</div><div class='add'>+		struct iwl_d3_end_notif *notif = (void *)pkt-&gt;data;</div><div class='ctx'> </div><div class='del'>-	return false;</div><div class='add'>+		d3_data-&gt;d3_end_flags = __le32_to_cpu(notif-&gt;flags);</div><div class='add'>+		d3_data-&gt;notif_received |= IWL_D3_NOTIF_D3_END_NOTIF;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return d3_data-&gt;notif_received == d3_data-&gt;notif_expected;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test)</div><div class='add'>+static int iwl_mvm_resume_firmware(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct iwl_host_cmd cmd = {</div><div class='add'>+		.id = D0I3_END_CMD,</div><div class='add'>+		.flags = CMD_WANT_SKB,</div><div class='add'>+	};</div><div class='add'>+	bool reset = fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+				 IWL_UCODE_TLV_CAPA_CNSLDTD_D3_D0_IMG);</div><div class='add'>+</div><div class='add'>+	ret = iwl_trans_d3_resume(mvm-&gt;trans, !reset);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We should trigger resume flow using command only for 22000 family</div><div class='add'>+	 * AX210 and above don't need the command since they have</div><div class='add'>+	 * the doorbell interrupt.</div><div class='add'>+	 */</div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &lt;= IWL_DEVICE_FAMILY_22000 &amp;&amp;</div><div class='add'>+	    fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa, IWL_UCODE_TLV_CAPA_D0I3_END_FIRST)) {</div><div class='add'>+		ret = iwl_mvm_send_cmd(mvm, &amp;cmd);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			IWL_ERR(mvm, "Failed to send D0I3_END_CMD first (%d)\n",</div><div class='add'>+				ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define IWL_MVM_D3_NOTIF_TIMEOUT (HZ / 3)</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_d3_notif_wait(struct iwl_mvm *mvm,</div><div class='add'>+				 struct iwl_d3_data *d3_data)</div><div class='add'>+{</div><div class='add'>+	static const u16 d3_resume_notif[] = {</div><div class='add'>+		WIDE_ID(PROT_OFFLOAD_GROUP, WOWLAN_INFO_NOTIFICATION),</div><div class='add'>+		WIDE_ID(PROT_OFFLOAD_GROUP, WOWLAN_WAKE_PKT_NOTIFICATION),</div><div class='add'>+		WIDE_ID(SCAN_GROUP, OFFLOAD_MATCH_INFO_NOTIF),</div><div class='add'>+		WIDE_ID(PROT_OFFLOAD_GROUP, D3_END_NOTIFICATION)</div><div class='add'>+	};</div><div class='add'>+	static const u16 d3_fast_resume_notif[] = {</div><div class='add'>+		WIDE_ID(PROT_OFFLOAD_GROUP, D3_END_NOTIFICATION)</div><div class='add'>+	};</div><div class='add'>+	struct iwl_notification_wait wait_d3_notif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (mvm-&gt;fast_resume)</div><div class='add'>+		iwl_init_notification_wait(&amp;mvm-&gt;notif_wait, &amp;wait_d3_notif,</div><div class='add'>+					   d3_fast_resume_notif,</div><div class='add'>+					   ARRAY_SIZE(d3_fast_resume_notif),</div><div class='add'>+					   iwl_mvm_wait_d3_notif, d3_data);</div><div class='add'>+	else</div><div class='add'>+		iwl_init_notification_wait(&amp;mvm-&gt;notif_wait, &amp;wait_d3_notif,</div><div class='add'>+					   d3_resume_notif,</div><div class='add'>+					   ARRAY_SIZE(d3_resume_notif),</div><div class='add'>+					   iwl_mvm_wait_d3_notif, d3_data);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_resume_firmware(mvm);</div><div class='add'>+	if (ret) {</div><div class='add'>+		iwl_remove_notification(&amp;mvm-&gt;notif_wait, &amp;wait_d3_notif);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return iwl_wait_notification(&amp;mvm-&gt;notif_wait, &amp;wait_d3_notif,</div><div class='add'>+				     IWL_MVM_D3_NOTIF_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool iwl_mvm_d3_resume_notif_based(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	return iwl_fw_lookup_notif_ver(mvm-&gt;fw, PROT_OFFLOAD_GROUP,</div><div class='add'>+				       WOWLAN_INFO_NOTIFICATION, 0) &amp;&amp;</div><div class='add'>+		iwl_fw_lookup_notif_ver(mvm-&gt;fw, PROT_OFFLOAD_GROUP,</div><div class='add'>+					WOWLAN_WAKE_PKT_NOTIFICATION, 0) &amp;&amp;</div><div class='add'>+		iwl_fw_lookup_notif_ver(mvm-&gt;fw, PROT_OFFLOAD_GROUP,</div><div class='add'>+					D3_END_NOTIFICATION, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __iwl_mvm_resume(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_vif *vif = NULL;</div><div class='ctx'> 	int ret = 1;</div><div class='del'>-	enum iwl_d3_status d3_status;</div><div class='del'>-	bool keep = false;</div><div class='add'>+	struct iwl_mvm_nd_results results = {};</div><div class='add'>+	struct iwl_d3_data d3_data = {</div><div class='add'>+		.notif_expected =</div><div class='add'>+			IWL_D3_NOTIF_WOWLAN_INFO |</div><div class='add'>+			IWL_D3_NOTIF_D3_END_NOTIF,</div><div class='add'>+		.nd_results_valid = false,</div><div class='add'>+		.nd_results = &amp;results,</div><div class='add'>+	};</div><div class='ctx'> 	bool unified_image = fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 					 IWL_UCODE_TLV_CAPA_CNSLDTD_D3_D0_IMG);</div><div class='ctx'> 	bool d0i3_first = fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 				      IWL_UCODE_TLV_CAPA_D0I3_END_FIRST);</div><div class='add'>+	bool resume_notif_based = iwl_mvm_d3_resume_notif_based(mvm);</div><div class='add'>+	enum rt_status rt_status;</div><div class='add'>+	bool keep = false;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='add'>+	/* Apparently, the device went away and device_powered_off() was called,</div><div class='add'>+	 * don't even try to read the rt_status, the device is currently</div><div class='add'>+	 * inaccessible.</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(IWL_MVM_STATUS_IN_D3, &amp;mvm-&gt;status)) {</div><div class='add'>+		IWL_INFO(mvm,</div><div class='add'>+			 "Can't resume, device_powered_off() was called during wowlan\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mvm-&gt;last_reset_or_resume_time_jiffies = jiffies;</div><div class='ctx'> </div><div class='ctx'> 	/* get the BSS vif pointer again */</div><div class='hunk'>@@ -2037,64 +3100,43 @@ static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test)</div><div class='ctx'> </div><div class='ctx'> 	iwl_fw_dbg_read_d3_debug_data(&amp;mvm-&gt;fwrt);</div><div class='ctx'> </div><div class='del'>-	if (iwl_mvm_check_rt_status(mvm, vif)) {</div><div class='del'>-		set_bit(STATUS_FW_ERROR, &amp;mvm-&gt;trans-&gt;status);</div><div class='del'>-		iwl_mvm_dump_nic_error_log(mvm);</div><div class='del'>-		iwl_dbg_tlv_time_point(&amp;mvm-&gt;fwrt,</div><div class='del'>-				       IWL_FW_INI_TIME_POINT_FW_ASSERT, NULL);</div><div class='del'>-		iwl_fw_dbg_collect_desc(&amp;mvm-&gt;fwrt, &amp;iwl_dump_desc_assert,</div><div class='del'>-					false, 0);</div><div class='add'>+	rt_status = iwl_mvm_check_rt_status(mvm, vif);</div><div class='add'>+	if (rt_status != FW_ALIVE) {</div><div class='add'>+		iwl_trans_notify_fw_error(mvm-&gt;trans);</div><div class='add'>+		if (rt_status == FW_ERROR) {</div><div class='add'>+			IWL_ERR(mvm, "FW Error occurred during suspend. Restarting.\n");</div><div class='add'>+			iwl_mvm_dump_nic_error_log(mvm);</div><div class='add'>+			iwl_dbg_tlv_time_point(&amp;mvm-&gt;fwrt,</div><div class='add'>+					       IWL_FW_INI_TIME_POINT_FW_ASSERT,</div><div class='add'>+					       NULL);</div><div class='add'>+			iwl_fw_dbg_collect_desc(&amp;mvm-&gt;fwrt,</div><div class='add'>+						&amp;iwl_dump_desc_assert,</div><div class='add'>+						false, 0);</div><div class='add'>+		}</div><div class='ctx'> 		ret = 1;</div><div class='del'>-		mvm-&gt;trans-&gt;system_pm_mode = IWL_PLAT_PM_MODE_DISABLED;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = iwl_trans_d3_resume(mvm-&gt;trans, &amp;d3_status, test, !unified_image);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (d3_status != IWL_D3_STATUS_ALIVE) {</div><div class='del'>-		IWL_INFO(mvm, "Device was reset during suspend\n");</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (d0i3_first) {</div><div class='del'>-		struct iwl_host_cmd cmd = {</div><div class='del'>-			.id = D0I3_END_CMD,</div><div class='del'>-			.flags = CMD_WANT_SKB | CMD_SEND_IN_D3,</div><div class='del'>-		};</div><div class='del'>-		int len;</div><div class='del'>-</div><div class='del'>-		ret = iwl_mvm_send_cmd(mvm, &amp;cmd);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			IWL_ERR(mvm, "Failed to send D0I3_END_CMD first (%d)\n",</div><div class='del'>-				ret);</div><div class='add'>+	if (resume_notif_based) {</div><div class='add'>+		d3_data.status = kzalloc(sizeof(*d3_data.status), GFP_KERNEL);</div><div class='add'>+		if (!d3_data.status) {</div><div class='add'>+			IWL_ERR(mvm, "Failed to allocate wowlan status\n");</div><div class='add'>+			ret = -ENOMEM;</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='del'>-		switch (mvm-&gt;cmd_ver.d0i3_resp) {</div><div class='del'>-		case 0:</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			len = iwl_rx_packet_payload_len(cmd.resp_pkt);</div><div class='del'>-			if (len != sizeof(u32)) {</div><div class='del'>-				IWL_ERR(mvm,</div><div class='del'>-					"Error with D0I3_END_CMD response size (%d)\n",</div><div class='del'>-					len);</div><div class='del'>-				goto err;</div><div class='del'>-			}</div><div class='del'>-			if (IWL_D0I3_RESET_REQUIRE &amp;</div><div class='del'>-			    le32_to_cpu(*(__le32 *)cmd.resp_pkt-&gt;data)) {</div><div class='del'>-				iwl_write32(mvm-&gt;trans, CSR_RESET,</div><div class='del'>-					    CSR_RESET_REG_FLAG_FORCE_NMI);</div><div class='del'>-				iwl_free_resp(&amp;cmd);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			WARN_ON(1);</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+		ret = iwl_mvm_d3_notif_wait(mvm, &amp;d3_data);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	} else {</div><div class='add'>+		ret = iwl_mvm_resume_firmware(mvm);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mvm-&gt;trans-&gt;system_pm_mode = IWL_PLAT_PM_MODE_DISABLED;</div><div class='add'>+	/* when reset is required we can't send these following commands */</div><div class='add'>+	if (d3_data.d3_end_flags &amp; IWL_D0I3_RESET_REQUIRE)</div><div class='add'>+		goto query_wakeup_reasons;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Query the current location and source from the D3 firmware so we</div><div class='hunk'>@@ -2109,41 +3151,36 @@ static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test)</div><div class='ctx'> 		/*  Re-configure default SAR profile */</div><div class='ctx'> 		iwl_mvm_sar_select_profile(mvm, 1, 1);</div><div class='ctx'> </div><div class='del'>-	if (mvm-&gt;net_detect) {</div><div class='add'>+	if (mvm-&gt;net_detect &amp;&amp; unified_image) {</div><div class='ctx'> 		/* If this is a non-unified image, we restart the FW,</div><div class='ctx'> 		 * so no need to stop the netdetect scan.  If that</div><div class='ctx'> 		 * fails, continue and try to get the wake-up reasons,</div><div class='ctx'> 		 * but trigger a HW restart by keeping a failure code</div><div class='ctx'> 		 * in ret.</div><div class='ctx'> 		 */</div><div class='del'>-		if (unified_image)</div><div class='del'>-			ret = iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_NETDETECT,</div><div class='del'>-						false);</div><div class='del'>-</div><div class='del'>-		iwl_mvm_query_netdetect_reasons(mvm, vif);</div><div class='del'>-		/* has unlocked the mutex, so skip that */</div><div class='del'>-		goto out;</div><div class='del'>-	} else {</div><div class='del'>-		keep = iwl_mvm_query_wakeup_reasons(mvm, vif);</div><div class='del'>-#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='del'>-		if (keep)</div><div class='del'>-			mvm-&gt;keep_vif = vif;</div><div class='del'>-#endif</div><div class='del'>-		/* has unlocked the mutex, so skip that */</div><div class='del'>-		goto out_iterate;</div><div class='add'>+		ret = iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_NETDETECT,</div><div class='add'>+					false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+query_wakeup_reasons:</div><div class='add'>+	keep = iwl_mvm_choose_query_wakeup_reasons(mvm, vif, &amp;d3_data);</div><div class='add'>+	/* has unlocked the mutex, so skip that */</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='ctx'> err:</div><div class='del'>-	iwl_mvm_free_nd(mvm);</div><div class='ctx'> 	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+out:</div><div class='add'>+	if (d3_data.status)</div><div class='add'>+		kfree(d3_data.status-&gt;wake_packet);</div><div class='add'>+	kfree(d3_data.status);</div><div class='add'>+	iwl_mvm_free_nd(mvm);</div><div class='ctx'> </div><div class='del'>-out_iterate:</div><div class='del'>-	if (!test)</div><div class='add'>+	if (!mvm-&gt;net_detect)</div><div class='ctx'> 		ieee80211_iterate_active_interfaces_mtx(mvm-&gt;hw,</div><div class='del'>-			IEEE80211_IFACE_ITER_NORMAL,</div><div class='del'>-			iwl_mvm_d3_disconnect_iter, keep ? vif : NULL);</div><div class='add'>+							IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+							iwl_mvm_d3_disconnect_iter,</div><div class='add'>+							keep ? vif : NULL);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='ctx'> 	clear_bit(IWL_MVM_STATUS_IN_D3, &amp;mvm-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	/* no need to reset the device in unified images, if successful */</div><div class='hunk'>@@ -2152,9 +3189,14 @@ out:</div><div class='ctx'> 		if (d0i3_first)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		ret = iwl_mvm_send_cmd_pdu(mvm, D0I3_END_CMD, 0, 0, NULL);</div><div class='del'>-		if (!ret)</div><div class='add'>+		if (!iwl_fw_lookup_notif_ver(mvm-&gt;fw, PROT_OFFLOAD_GROUP,</div><div class='add'>+					     D3_END_NOTIFICATION, 0)) {</div><div class='add'>+			ret = iwl_mvm_send_cmd_pdu(mvm, D0I3_END_CMD, 0, 0, NULL);</div><div class='add'>+			if (!ret)</div><div class='add'>+				return 0;</div><div class='add'>+		} else if (!(d3_data.d3_end_flags &amp; IWL_D0I3_RESET_REQUIRE)) {</div><div class='ctx'> 			return 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2172,7 +3214,7 @@ int iwl_mvm_resume(struct ieee80211_hw *hw)</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = __iwl_mvm_resume(mvm, false);</div><div class='add'>+	ret = __iwl_mvm_resume(mvm);</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_resume_tcm(mvm);</div><div class='ctx'> </div><div class='hunk'>@@ -2188,114 +3230,74 @@ void iwl_mvm_set_wakeup(struct ieee80211_hw *hw, bool enabled)</div><div class='ctx'> 	device_set_wakeup_enable(mvm-&gt;trans-&gt;dev, enabled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='del'>-static int iwl_mvm_d3_test_open(struct inode *inode, struct file *file)</div><div class='add'>+void iwl_mvm_fast_suspend(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm *mvm = inode-&gt;i_private;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (mvm-&gt;d3_test_active)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	file-&gt;private_data = inode-&gt;i_private;</div><div class='del'>-</div><div class='del'>-	iwl_mvm_pause_tcm(mvm, true);</div><div class='del'>-</div><div class='del'>-	iwl_fw_runtime_suspend(&amp;mvm-&gt;fwrt);</div><div class='del'>-</div><div class='del'>-	/* start pseudo D3 */</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	err = __iwl_mvm_suspend(mvm-&gt;hw, mvm-&gt;hw-&gt;wiphy-&gt;wowlan_config, true);</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-	if (err &gt; 0)</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	struct iwl_d3_manager_config d3_cfg_cmd_data = {};</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	mvm-&gt;d3_test_active = true;</div><div class='del'>-	mvm-&gt;keep_vif = NULL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-static ssize_t iwl_mvm_d3_test_read(struct file *file, char __user *user_buf,</div><div class='del'>-				    size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_mvm *mvm = file-&gt;private_data;</div><div class='del'>-	u32 pme_asserted;</div><div class='add'>+	IWL_DEBUG_WOWLAN(mvm, "Starting fast suspend flow\n");</div><div class='ctx'> </div><div class='del'>-	while (true) {</div><div class='del'>-		/* read pme_ptr if available */</div><div class='del'>-		if (mvm-&gt;d3_test_pme_ptr) {</div><div class='del'>-			pme_asserted = iwl_trans_read_mem32(mvm-&gt;trans,</div><div class='del'>-						mvm-&gt;d3_test_pme_ptr);</div><div class='del'>-			if (pme_asserted)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='add'>+	mvm-&gt;fast_resume = true;</div><div class='add'>+	set_bit(IWL_MVM_STATUS_IN_D3, &amp;mvm-&gt;status);</div><div class='ctx'> </div><div class='del'>-		if (msleep_interruptible(100))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='add'>+	WARN_ON(iwl_mvm_power_update_device(mvm));</div><div class='add'>+	ret = iwl_mvm_send_cmd_pdu(mvm, D3_CONFIG_CMD, 0,</div><div class='add'>+				   sizeof(d3_cfg_cmd_data), &amp;d3_cfg_cmd_data);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mvm,</div><div class='add'>+			"fast suspend: couldn't send D3_CONFIG_CMD %d\n", ret);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	ret = iwl_trans_d3_suspend(mvm-&gt;trans, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mvm, "fast suspend: trans_d3_suspend failed %d\n", ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_d3_test_disconn_work_iter(void *_data, u8 *mac,</div><div class='del'>-					      struct ieee80211_vif *vif)</div><div class='add'>+int iwl_mvm_fast_resume(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='del'>-	/* skip the one we keep connection on */</div><div class='del'>-	if (_data == vif)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='del'>-		ieee80211_connection_loss(vif);</div><div class='del'>-}</div><div class='add'>+	struct iwl_d3_data d3_data = {</div><div class='add'>+		.notif_expected =</div><div class='add'>+			IWL_D3_NOTIF_D3_END_NOTIF,</div><div class='add'>+	};</div><div class='add'>+	enum rt_status rt_status;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_d3_test_release(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct iwl_mvm *mvm = inode-&gt;i_private;</div><div class='del'>-	bool unified_image = fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='del'>-					 IWL_UCODE_TLV_CAPA_CNSLDTD_D3_D0_IMG);</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	mvm-&gt;d3_test_active = false;</div><div class='add'>+	IWL_DEBUG_WOWLAN(mvm, "Starting the fast resume flow\n");</div><div class='ctx'> </div><div class='add'>+	mvm-&gt;last_reset_or_resume_time_jiffies = jiffies;</div><div class='ctx'> 	iwl_fw_dbg_read_d3_debug_data(&amp;mvm-&gt;fwrt);</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='del'>-	__iwl_mvm_resume(mvm, true);</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-</div><div class='del'>-	iwl_mvm_resume_tcm(mvm);</div><div class='del'>-</div><div class='del'>-	iwl_fw_runtime_resume(&amp;mvm-&gt;fwrt);</div><div class='del'>-</div><div class='del'>-	iwl_abort_notification_waits(&amp;mvm-&gt;notif_wait);</div><div class='del'>-	if (!unified_image) {</div><div class='del'>-		int remaining_time = 10;</div><div class='del'>-</div><div class='del'>-		ieee80211_restart_hw(mvm-&gt;hw);</div><div class='del'>-</div><div class='del'>-		/* wait for restart and disconnect all interfaces */</div><div class='del'>-		while (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status) &amp;&amp;</div><div class='del'>-		       remaining_time &gt; 0) {</div><div class='del'>-			remaining_time--;</div><div class='del'>-			msleep(1000);</div><div class='add'>+	rt_status = iwl_mvm_check_rt_status(mvm, NULL);</div><div class='add'>+	if (rt_status != FW_ALIVE) {</div><div class='add'>+		iwl_trans_notify_fw_error(mvm-&gt;trans);</div><div class='add'>+		if (rt_status == FW_ERROR) {</div><div class='add'>+			IWL_ERR(mvm,</div><div class='add'>+				"iwl_mvm_check_rt_status failed, device is gone during suspend\n");</div><div class='add'>+			iwl_mvm_dump_nic_error_log(mvm);</div><div class='add'>+			iwl_dbg_tlv_time_point(&amp;mvm-&gt;fwrt,</div><div class='add'>+					       IWL_FW_INI_TIME_POINT_FW_ASSERT,</div><div class='add'>+					       NULL);</div><div class='add'>+			iwl_fw_dbg_collect_desc(&amp;mvm-&gt;fwrt,</div><div class='add'>+						&amp;iwl_dump_desc_assert,</div><div class='add'>+						false, 0);</div><div class='ctx'> 		}</div><div class='add'>+		ret = -ENODEV;</div><div class='ctx'> </div><div class='del'>-		if (remaining_time == 0)</div><div class='del'>-			IWL_ERR(mvm, "Timed out waiting for HW restart!\n");</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	ret = iwl_mvm_d3_notif_wait(mvm, &amp;d3_data);</div><div class='ctx'> </div><div class='del'>-	ieee80211_iterate_active_interfaces_atomic(</div><div class='del'>-		mvm-&gt;hw, IEEE80211_IFACE_ITER_NORMAL,</div><div class='del'>-		iwl_mvm_d3_test_disconn_work_iter, mvm-&gt;keep_vif);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mvm, "Couldn't get the d3 notif %d\n", ret);</div><div class='add'>+		mvm-&gt;trans-&gt;state = IWL_TRANS_NO_FW;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+out:</div><div class='add'>+	clear_bit(IWL_MVM_STATUS_IN_D3, &amp;mvm-&gt;status);</div><div class='add'>+	mvm-&gt;fast_resume = false;</div><div class='ctx'> </div><div class='del'>-const struct file_operations iwl_dbgfs_d3_test_ops = {</div><div class='del'>-	.llseek = no_llseek,</div><div class='del'>-	.open = iwl_mvm_d3_test_open,</div><div class='del'>-	.read = iwl_mvm_d3_test_read,</div><div class='del'>-	.release = iwl_mvm_d3_test_release,</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c<br/>index 38d0bfb649cc..a56c352a459a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2024 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -179,7 +179,7 @@ static ssize_t iwl_dbgfs_mac_params_read(struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	ap_sta_id = mvmvif-&gt;ap_sta_id;</div><div class='add'>+	ap_sta_id = mvmvif-&gt;deflink.ap_sta_id;</div><div class='ctx'> </div><div class='ctx'> 	switch (ieee80211_vif_type_p2p(vif)) {</div><div class='ctx'> 	case NL80211_IFTYPE_ADHOC:</div><div class='hunk'>@@ -211,17 +211,17 @@ static ssize_t iwl_dbgfs_mac_params_read(struct file *file,</div><div class='ctx'> 	pos += scnprintf(buf+pos, bufsz-pos, "Load: %d\n",</div><div class='ctx'> 			 mvm-&gt;tcm.result.load[mvmvif-&gt;id]);</div><div class='ctx'> 	pos += scnprintf(buf+pos, bufsz-pos, "QoS:\n");</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(mvmvif-&gt;queue_params); i++)</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mvmvif-&gt;deflink.queue_params); i++)</div><div class='ctx'> 		pos += scnprintf(buf+pos, bufsz-pos,</div><div class='ctx'> 				 "\t%d: txop:%d - cw_min:%d - cw_max = %d - aifs = %d upasd = %d\n",</div><div class='del'>-				 i, mvmvif-&gt;queue_params[i].txop,</div><div class='del'>-				 mvmvif-&gt;queue_params[i].cw_min,</div><div class='del'>-				 mvmvif-&gt;queue_params[i].cw_max,</div><div class='del'>-				 mvmvif-&gt;queue_params[i].aifs,</div><div class='del'>-				 mvmvif-&gt;queue_params[i].uapsd);</div><div class='add'>+				 i, mvmvif-&gt;deflink.queue_params[i].txop,</div><div class='add'>+				 mvmvif-&gt;deflink.queue_params[i].cw_min,</div><div class='add'>+				 mvmvif-&gt;deflink.queue_params[i].cw_max,</div><div class='add'>+				 mvmvif-&gt;deflink.queue_params[i].aifs,</div><div class='add'>+				 mvmvif-&gt;deflink.queue_params[i].uapsd);</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='del'>-	    ap_sta_id != IWL_MVM_INVALID_STA) {</div><div class='add'>+	    ap_sta_id != IWL_INVALID_STA) {</div><div class='ctx'> 		struct iwl_mvm_sta *mvm_sta;</div><div class='ctx'> </div><div class='ctx'> 		mvm_sta = iwl_mvm_sta_from_staid_protected(mvm, ap_sta_id);</div><div class='hunk'>@@ -234,7 +234,7 @@ static ssize_t iwl_dbgfs_mac_params_read(struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	chanctx_conf = rcu_dereference(vif-&gt;chanctx_conf);</div><div class='add'>+	chanctx_conf = rcu_dereference(vif-&gt;bss_conf.chanctx_conf);</div><div class='ctx'> 	if (chanctx_conf)</div><div class='ctx'> 		pos += scnprintf(buf+pos, bufsz-pos,</div><div class='ctx'> 				 "idle rx chains %d, active rx chains: %d\n",</div><div class='hunk'>@@ -381,9 +381,9 @@ static ssize_t iwl_dbgfs_bf_params_write(struct ieee80211_vif *vif, char *buf,</div><div class='ctx'> 	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='ctx'> 	iwl_dbgfs_update_bf(vif, param, value);</div><div class='ctx'> 	if (param == MVM_DEBUGFS_BF_ENABLE_BEACON_FILTER &amp;&amp; !value)</div><div class='del'>-		ret = iwl_mvm_disable_beacon_filter(mvm, vif, 0);</div><div class='add'>+		ret = iwl_mvm_disable_beacon_filter(mvm, vif);</div><div class='ctx'> 	else</div><div class='del'>-		ret = iwl_mvm_enable_beacon_filter(mvm, vif, 0);</div><div class='add'>+		ret = iwl_mvm_enable_beacon_filter(mvm, vif);</div><div class='ctx'> 	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret ?: count;</div><div class='hunk'>@@ -407,7 +407,7 @@ static ssize_t iwl_dbgfs_bf_params_read(struct file *file,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_beacon_filter_debugfs_parameters(vif, &amp;cmd);</div><div class='del'>-	if (mvmvif-&gt;bf_data.bf_enabled)</div><div class='add'>+	if (mvmvif-&gt;bf_enabled)</div><div class='ctx'> 		cmd.bf_enable_beacon_filter = cpu_to_le32(1);</div><div class='ctx'> 	else</div><div class='ctx'> 		cmd.bf_enable_beacon_filter = 0;</div><div class='hunk'>@@ -438,13 +438,6 @@ static ssize_t iwl_dbgfs_bf_params_read(struct file *file,</div><div class='ctx'> 	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline char *iwl_dbgfs_is_match(char *name, char *buf)</div><div class='del'>-{</div><div class='del'>-	int len = strlen(name);</div><div class='del'>-</div><div class='del'>-	return !strncmp(name, buf, len) ? buf + len : NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t iwl_dbgfs_os_device_timediff_read(struct file *file,</div><div class='ctx'> 						 char __user *user_buf,</div><div class='ctx'> 						 size_t count, loff_t *ppos)</div><div class='hunk'>@@ -460,7 +453,7 @@ static ssize_t iwl_dbgfs_os_device_timediff_read(struct file *file,</div><div class='ctx'> 	int pos = 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	iwl_mvm_get_sync_time(mvm, &amp;curr_gp2, &amp;curr_os);</div><div class='add'>+	iwl_mvm_get_sync_time(mvm, CLOCK_BOOTTIME, &amp;curr_gp2, &amp;curr_os, NULL);</div><div class='ctx'> 	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	do_div(curr_os, NSEC_PER_USEC);</div><div class='hunk'>@@ -470,11 +463,13 @@ static ssize_t iwl_dbgfs_os_device_timediff_read(struct file *file,</div><div class='ctx'> 	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t iwl_dbgfs_low_latency_write(struct ieee80211_vif *vif, char *buf,</div><div class='del'>-					   size_t count, loff_t *ppos)</div><div class='add'>+static ssize_t</div><div class='add'>+iwl_dbgfs_low_latency_write_handle(struct wiphy *wiphy, struct file *file,</div><div class='add'>+				   char *buf, size_t count, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-	struct iwl_mvm *mvm = mvmvif-&gt;mvm;</div><div class='add'>+	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+	struct ieee80211_vif *vif = data;</div><div class='ctx'> 	u8 value;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -491,12 +486,28 @@ static ssize_t iwl_dbgfs_low_latency_write(struct ieee80211_vif *vif, char *buf,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t</div><div class='del'>-iwl_dbgfs_low_latency_force_write(struct ieee80211_vif *vif, char *buf,</div><div class='del'>-				  size_t count, loff_t *ppos)</div><div class='add'>+static ssize_t iwl_dbgfs_low_latency_write(struct file *file,</div><div class='add'>+					   const char __user *user_buf,</div><div class='add'>+					   size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_vif *vif = file-&gt;private_data;</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	struct iwl_mvm *mvm = mvmvif-&gt;mvm;</div><div class='add'>+	char buf[10] = {};</div><div class='add'>+</div><div class='add'>+	return wiphy_locked_debugfs_write(mvm-&gt;hw-&gt;wiphy, file,</div><div class='add'>+					  buf, sizeof(buf), user_buf, count,</div><div class='add'>+					  iwl_dbgfs_low_latency_write_handle,</div><div class='add'>+					  vif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+iwl_dbgfs_low_latency_force_write_handle(struct wiphy *wiphy, struct file *file,</div><div class='add'>+					 char *buf, size_t count, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+	struct ieee80211_vif *vif = data;</div><div class='ctx'> 	u8 value;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -524,6 +535,22 @@ iwl_dbgfs_low_latency_force_write(struct ieee80211_vif *vif, char *buf,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t</div><div class='add'>+iwl_dbgfs_low_latency_force_write(struct file *file,</div><div class='add'>+				  const char __user *user_buf,</div><div class='add'>+				  size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = file-&gt;private_data;</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm *mvm = mvmvif-&gt;mvm;</div><div class='add'>+	char buf[10] = {};</div><div class='add'>+</div><div class='add'>+	return wiphy_locked_debugfs_write(mvm-&gt;hw-&gt;wiphy, file,</div><div class='add'>+					  buf, sizeof(buf), user_buf, count,</div><div class='add'>+					  iwl_dbgfs_low_latency_force_write_handle,</div><div class='add'>+					  vif);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t iwl_dbgfs_low_latency_read(struct file *file,</div><div class='ctx'> 					  char __user *user_buf,</div><div class='ctx'> 					  size_t count, loff_t *ppos)</div><div class='hunk'>@@ -561,7 +588,7 @@ static ssize_t iwl_dbgfs_uapsd_misbehaving_read(struct file *file,</div><div class='ctx'> 	char buf[20];</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='del'>-	len = sprintf(buf, "%pM\n", mvmvif-&gt;uapsd_misbehaving_bssid);</div><div class='add'>+	len = sprintf(buf, "%pM\n", mvmvif-&gt;uapsd_misbehaving_ap_addr);</div><div class='ctx'> 	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -574,7 +601,7 @@ static ssize_t iwl_dbgfs_uapsd_misbehaving_write(struct ieee80211_vif *vif,</div><div class='ctx'> 	bool ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	ret = mac_pton(buf, mvmvif-&gt;uapsd_misbehaving_bssid);</div><div class='add'>+	ret = mac_pton(buf, mvmvif-&gt;uapsd_misbehaving_ap_addr);</div><div class='ctx'> 	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret ? count : -EINVAL;</div><div class='hunk'>@@ -585,34 +612,47 @@ static ssize_t iwl_dbgfs_rx_phyinfo_write(struct ieee80211_vif *vif, char *buf,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	struct iwl_mvm *mvm = mvmvif-&gt;mvm;</div><div class='del'>-	struct ieee80211_chanctx_conf *chanctx_conf;</div><div class='del'>-	struct iwl_mvm_phy_ctxt *phy_ctxt;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='ctx'> 	u16 value;</div><div class='del'>-	int ret;</div><div class='add'>+	int link_id, ret = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ret = kstrtou16(buf, 0, &amp;value);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-	chanctx_conf = rcu_dereference(vif-&gt;chanctx_conf);</div><div class='del'>-	/* make sure the channel context is assigned */</div><div class='del'>-	if (!chanctx_conf) {</div><div class='add'>+	mvm-&gt;dbgfs_rx_phyinfo = value;</div><div class='add'>+</div><div class='add'>+	for_each_vif_active_link(vif, link_conf, link_id) {</div><div class='add'>+		struct ieee80211_chanctx_conf *chanctx_conf;</div><div class='add'>+		struct cfg80211_chan_def min_def, ap_def;</div><div class='add'>+		struct iwl_mvm_phy_ctxt *phy_ctxt;</div><div class='add'>+		u8 chains_static, chains_dynamic;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		chanctx_conf = rcu_dereference(link_conf-&gt;chanctx_conf);</div><div class='add'>+		if (!chanctx_conf) {</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		/* A command can't be sent with RCU lock held, so copy</div><div class='add'>+		 * everything here and use it after unlocking</div><div class='add'>+		 */</div><div class='add'>+		min_def = chanctx_conf-&gt;min_def;</div><div class='add'>+		ap_def = chanctx_conf-&gt;ap;</div><div class='add'>+		chains_static = chanctx_conf-&gt;rx_chains_static;</div><div class='add'>+		chains_dynamic = chanctx_conf-&gt;rx_chains_dynamic;</div><div class='ctx'> 		rcu_read_unlock();</div><div class='del'>-		mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	phy_ctxt = &amp;mvm-&gt;phy_ctxts[*(u16 *)chanctx_conf-&gt;drv_priv];</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+		phy_ctxt = mvmvif-&gt;link[link_id]-&gt;phy_ctxt;</div><div class='add'>+		if (!phy_ctxt)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	mvm-&gt;dbgfs_rx_phyinfo = value;</div><div class='add'>+		ret = iwl_mvm_phy_ctxt_changed(mvm, phy_ctxt, &amp;min_def, &amp;ap_def,</div><div class='add'>+					       chains_static, chains_dynamic);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_phy_ctxt_changed(mvm, phy_ctxt, &amp;chanctx_conf-&gt;min_def,</div><div class='del'>-				       chanctx_conf-&gt;rx_chains_static,</div><div class='del'>-				       chanctx_conf-&gt;rx_chains_dynamic);</div><div class='ctx'> 	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret ?: count;</div><div class='hunk'>@@ -686,6 +726,42 @@ static ssize_t iwl_dbgfs_quota_min_read(struct file *file,</div><div class='ctx'> 	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t iwl_dbgfs_max_tx_op_write(struct ieee80211_vif *vif, char *buf,</div><div class='add'>+					 size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm *mvm = mvmvif-&gt;mvm;</div><div class='add'>+	u16 value;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtou16(buf, 0, &amp;value);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	mvmvif-&gt;max_tx_op = value;</div><div class='add'>+	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t iwl_dbgfs_max_tx_op_read(struct file *file,</div><div class='add'>+					char __user *user_buf,</div><div class='add'>+					size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = file-&gt;private_data;</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm *mvm = mvmvif-&gt;mvm;</div><div class='add'>+	char buf[10];</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	len = scnprintf(buf, sizeof(buf), "%hu\n", mvmvif-&gt;max_tx_op);</div><div class='add'>+	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define MVM_DEBUGFS_WRITE_FILE_OPS(name, bufsz) \</div><div class='ctx'> 	_MVM_DEBUGFS_WRITE_FILE_OPS(name, bufsz, struct ieee80211_vif)</div><div class='ctx'> #define MVM_DEBUGFS_READ_WRITE_FILE_OPS(name, bufsz) \</div><div class='hunk'>@@ -699,26 +775,31 @@ MVM_DEBUGFS_READ_FILE_OPS(mac_params);</div><div class='ctx'> MVM_DEBUGFS_READ_FILE_OPS(tx_pwr_lmt);</div><div class='ctx'> MVM_DEBUGFS_READ_WRITE_FILE_OPS(pm_params, 32);</div><div class='ctx'> MVM_DEBUGFS_READ_WRITE_FILE_OPS(bf_params, 256);</div><div class='del'>-MVM_DEBUGFS_READ_WRITE_FILE_OPS(low_latency, 10);</div><div class='del'>-MVM_DEBUGFS_WRITE_FILE_OPS(low_latency_force, 10);</div><div class='add'>+</div><div class='add'>+static const struct file_operations iwl_dbgfs_low_latency_ops = {</div><div class='add'>+	.write = iwl_dbgfs_low_latency_write,</div><div class='add'>+	.read = iwl_dbgfs_low_latency_read,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.llseek = generic_file_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations iwl_dbgfs_low_latency_force_ops = {</div><div class='add'>+	.write = iwl_dbgfs_low_latency_force_write,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.llseek = generic_file_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> MVM_DEBUGFS_READ_WRITE_FILE_OPS(uapsd_misbehaving, 20);</div><div class='ctx'> MVM_DEBUGFS_READ_WRITE_FILE_OPS(rx_phyinfo, 10);</div><div class='ctx'> MVM_DEBUGFS_READ_WRITE_FILE_OPS(quota_min, 32);</div><div class='ctx'> MVM_DEBUGFS_READ_FILE_OPS(os_device_timediff);</div><div class='add'>+MVM_DEBUGFS_READ_WRITE_FILE_OPS(max_tx_op, 10);</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='add'>+void iwl_mvm_vif_add_debugfs(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	struct dentry *dbgfs_dir = vif-&gt;debugfs_dir;</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-	char buf[100];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check if debugfs directory already exist before creating it.</div><div class='del'>-	 * This may happen when, for example, resetting hw or suspend-resume</div><div class='del'>-	 */</div><div class='del'>-	if (!dbgfs_dir || mvmvif-&gt;dbgfs_dir)</div><div class='del'>-		return;</div><div class='ctx'> </div><div class='ctx'> 	mvmvif-&gt;dbgfs_dir = debugfs_create_dir("iwlmvm", dbgfs_dir);</div><div class='ctx'> 	if (IS_ERR_OR_NULL(mvmvif-&gt;dbgfs_dir)) {</div><div class='hunk'>@@ -740,10 +821,26 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE_VIF(rx_phyinfo, mvmvif-&gt;dbgfs_dir, 0600);</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE_VIF(quota_min, mvmvif-&gt;dbgfs_dir, 0600);</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE_VIF(os_device_timediff, mvmvif-&gt;dbgfs_dir, 0400);</div><div class='add'>+	MVM_DEBUGFS_ADD_FILE_VIF(max_tx_op, mvmvif-&gt;dbgfs_dir, 0600);</div><div class='add'>+	debugfs_create_bool("ftm_unprotected", 0200, mvmvif-&gt;dbgfs_dir,</div><div class='add'>+			    &amp;mvmvif-&gt;ftm_unprotected);</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; !vif-&gt;p2p &amp;&amp;</div><div class='ctx'> 	    mvmvif == mvm-&gt;bf_allowed_vif)</div><div class='ctx'> 		MVM_DEBUGFS_ADD_FILE_VIF(bf_params, mvmvif-&gt;dbgfs_dir, 0600);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_vif_dbgfs_add_link(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct dentry *dbgfs_dir = vif-&gt;debugfs_dir;</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	char buf[3 * 3 + 11 + (NL80211_WIPHY_NAME_MAXLEN + 1) +</div><div class='add'>+		 (7 + IFNAMSIZ + 1) + 6 + 1];</div><div class='add'>+	char name[7 + IFNAMSIZ + 1];</div><div class='add'>+</div><div class='add'>+	/* this will happen in monitor mode */</div><div class='add'>+	if (!dbgfs_dir)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Create symlink for convenience pointing to interface specific</div><div class='hunk'>@@ -752,21 +849,63 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 	 * find</div><div class='ctx'> 	 * netdev:wlan0 -&gt; ../../../ieee80211/phy0/netdev:wlan0/iwlmvm/</div><div class='ctx'> 	 */</div><div class='del'>-	snprintf(buf, 100, "../../../%pd3/%pd",</div><div class='del'>-		 dbgfs_dir,</div><div class='del'>-		 mvmvif-&gt;dbgfs_dir);</div><div class='add'>+	snprintf(name, sizeof(name), "%pd", dbgfs_dir);</div><div class='add'>+	snprintf(buf, sizeof(buf), "../../../%pd3/iwlmvm", dbgfs_dir);</div><div class='ctx'> </div><div class='del'>-	mvmvif-&gt;dbgfs_slink = debugfs_create_symlink(dbgfs_dir-&gt;d_name.name,</div><div class='del'>-						     mvm-&gt;debugfs_dir, buf);</div><div class='add'>+	mvmvif-&gt;dbgfs_slink =</div><div class='add'>+		debugfs_create_symlink(name, mvm-&gt;debugfs_dir, buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_mvm_vif_dbgfs_clean(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='add'>+void iwl_mvm_vif_dbgfs_rm_link(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> </div><div class='ctx'> 	debugfs_remove(mvmvif-&gt;dbgfs_slink);</div><div class='ctx'> 	mvmvif-&gt;dbgfs_slink = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MVM_DEBUGFS_WRITE_LINK_FILE_OPS(name, bufsz)			\</div><div class='add'>+	_MVM_DEBUGFS_WRITE_FILE_OPS(link_##name, bufsz,			\</div><div class='add'>+				    struct ieee80211_bss_conf)</div><div class='add'>+#define MVM_DEBUGFS_READ_WRITE_LINK_FILE_OPS(name, bufsz)		\</div><div class='add'>+	_MVM_DEBUGFS_READ_WRITE_FILE_OPS(link_##name, bufsz,		\</div><div class='add'>+					 struct ieee80211_bss_conf)</div><div class='add'>+#define MVM_DEBUGFS_ADD_LINK_FILE(name, parent, mode)			\</div><div class='add'>+	debugfs_create_file(#name, mode, parent, link_conf,		\</div><div class='add'>+			    &amp;iwl_dbgfs_link_##name##_ops)</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_debugfs_add_link_files(struct ieee80211_vif *vif,</div><div class='add'>+					   struct ieee80211_bss_conf *link_conf,</div><div class='add'>+					   struct dentry *mvm_dir)</div><div class='add'>+{</div><div class='add'>+	/* Add per-link files here*/</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_link_add_debugfs(struct ieee80211_hw *hw,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			      struct dentry *dir)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm *mvm = mvmvif-&gt;mvm;</div><div class='add'>+	unsigned int link_id = link_conf-&gt;link_id;</div><div class='add'>+	struct iwl_mvm_vif_link_info *link_info = mvmvif-&gt;link[link_id];</div><div class='add'>+	struct dentry *mvm_dir;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!link_info) || !dir)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (dir == vif-&gt;debugfs_dir) {</div><div class='add'>+		WARN_ON(!mvmvif-&gt;dbgfs_dir);</div><div class='add'>+		mvm_dir = mvmvif-&gt;dbgfs_dir;</div><div class='add'>+	} else {</div><div class='add'>+		mvm_dir = debugfs_create_dir("iwlmvm", dir);</div><div class='add'>+		if (IS_ERR_OR_NULL(mvm_dir)) {</div><div class='add'>+			IWL_ERR(mvm, "Failed to create debugfs directory under %pd\n",</div><div class='add'>+				dir);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	debugfs_remove_recursive(mvmvif-&gt;dbgfs_dir);</div><div class='del'>-	mvmvif-&gt;dbgfs_dir = NULL;</div><div class='add'>+	iwl_mvm_debugfs_add_link_files(vif, link_conf, mvm_dir);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c<br/>index 63d65018d098..683c0ba5fb39 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c</a></div><div class='hunk'>@@ -1,19 +1,24 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2021 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2023, 2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/ieee80211.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/dmi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mvm.h"</div><div class='ctx'> #include "sta.h"</div><div class='ctx'> #include "iwl-io.h"</div><div class='ctx'> #include "debugfs.h"</div><div class='ctx'> #include "iwl-modparams.h"</div><div class='add'>+#include "iwl-drv.h"</div><div class='add'>+#include "iwl-utils.h"</div><div class='ctx'> #include "fw/error-dump.h"</div><div class='add'>+#include "fw/api/phy-ctxt.h"</div><div class='ctx'> </div><div class='ctx'> static ssize_t iwl_dbgfs_ctdp_budget_read(struct file *file,</div><div class='ctx'> 					  char __user *user_buf,</div><div class='hunk'>@@ -46,8 +51,18 @@ static ssize_t iwl_dbgfs_stop_ctdp_write(struct iwl_mvm *mvm, char *buf,</div><div class='ctx'> 					 size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+	bool force;</div><div class='ctx'> </div><div class='del'>-	if (!iwl_mvm_is_ctdp_supported(mvm))</div><div class='add'>+	if (!kstrtobool(buf, &amp;force))</div><div class='add'>+		IWL_DEBUG_INFO(mvm,</div><div class='add'>+			       "force start is %d [0=disabled, 1=enabled]\n",</div><div class='add'>+			       force);</div><div class='add'>+</div><div class='add'>+	/* we allow skipping cap support check and force stop ctdp</div><div class='add'>+	 * statistics collection and with guerantee that it is</div><div class='add'>+	 * safe to use.</div><div class='add'>+	 */</div><div class='add'>+	if (!force &amp;&amp; !iwl_mvm_is_ctdp_supported(mvm))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (!iwl_mvm_firmware_running(mvm) ||</div><div class='hunk'>@@ -61,6 +76,36 @@ static ssize_t iwl_dbgfs_stop_ctdp_write(struct iwl_mvm *mvm, char *buf,</div><div class='ctx'> 	return ret ?: count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t iwl_dbgfs_start_ctdp_write(struct iwl_mvm *mvm,</div><div class='add'>+					  char *buf, size_t count,</div><div class='add'>+					  loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	bool force;</div><div class='add'>+</div><div class='add'>+	if (!kstrtobool(buf, &amp;force))</div><div class='add'>+		IWL_DEBUG_INFO(mvm,</div><div class='add'>+			       "force start is %d [0=disabled, 1=enabled]\n",</div><div class='add'>+			       force);</div><div class='add'>+</div><div class='add'>+	/* we allow skipping cap support check and force enable ctdp</div><div class='add'>+	 * for statistics collection and with guerantee that it is</div><div class='add'>+	 * safe to use.</div><div class='add'>+	 */</div><div class='add'>+	if (!force &amp;&amp; !iwl_mvm_is_ctdp_supported(mvm))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!iwl_mvm_firmware_running(mvm) ||</div><div class='add'>+	    mvm-&gt;fwrt.cur_fw_img != IWL_UCODE_REGULAR)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	ret = iwl_mvm_ctdp_command(mvm, CTDP_CMD_OPERATION_START, 0);</div><div class='add'>+	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return ret ?: count;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t iwl_dbgfs_force_ctkill_write(struct iwl_mvm *mvm, char *buf,</div><div class='ctx'> 					    size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='hunk'>@@ -107,37 +152,6 @@ static ssize_t iwl_dbgfs_tx_flush_write(struct iwl_mvm *mvm, char *buf,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t iwl_dbgfs_sta_drain_write(struct iwl_mvm *mvm, char *buf,</div><div class='del'>-					 size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_mvm_sta *mvmsta;</div><div class='del'>-	int sta_id, drain, ret;</div><div class='del'>-</div><div class='del'>-	if (!iwl_mvm_firmware_running(mvm) ||</div><div class='del'>-	    mvm-&gt;fwrt.cur_fw_img != IWL_UCODE_REGULAR)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	if (sscanf(buf, "%d %d", &amp;sta_id, &amp;drain) != 2)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (sta_id &lt; 0 || sta_id &gt;= mvm-&gt;fw-&gt;ucode_capa.num_stations)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (drain &lt; 0 || drain &gt; 1)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	mvmsta = iwl_mvm_sta_from_staid_protected(mvm, sta_id);</div><div class='del'>-</div><div class='del'>-	if (!mvmsta)</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-	else</div><div class='del'>-		ret = iwl_mvm_drain_sta(mvm, mvmsta, drain) ? : count;</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t iwl_dbgfs_sram_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 				   size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='hunk'>@@ -213,9 +227,9 @@ static ssize_t iwl_dbgfs_set_nic_temperature_read(struct file *file,</div><div class='ctx'> 	int pos;</div><div class='ctx'> </div><div class='ctx'> 	if (!mvm-&gt;temperature_test)</div><div class='del'>-		pos = scnprintf(buf , sizeof(buf), "disabled\n");</div><div class='add'>+		pos = scnprintf(buf, sizeof(buf), "disabled\n");</div><div class='ctx'> 	else</div><div class='del'>-		pos = scnprintf(buf , sizeof(buf), "%d\n", mvm-&gt;temperature);</div><div class='add'>+		pos = scnprintf(buf, sizeof(buf), "%d\n", mvm-&gt;temperature);</div><div class='ctx'> </div><div class='ctx'> 	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='ctx'> }</div><div class='hunk'>@@ -260,7 +274,7 @@ static ssize_t iwl_dbgfs_set_nic_temperature_write(struct iwl_mvm *mvm,</div><div class='ctx'> 		mvm-&gt;temperature = temperature;</div><div class='ctx'> 	}</div><div class='ctx'> 	IWL_DEBUG_TEMP(mvm, "%sabling debug set temperature (temp = %d)\n",</div><div class='del'>-		       mvm-&gt;temperature_test ? "En" : "Dis" ,</div><div class='add'>+		       mvm-&gt;temperature_test ? "En" : "Dis",</div><div class='ctx'> 		       mvm-&gt;temperature);</div><div class='ctx'> 	/* handle the temperature change */</div><div class='ctx'> 	iwl_mvm_tt_handler(mvm);</div><div class='hunk'>@@ -290,7 +304,7 @@ static ssize_t iwl_dbgfs_nic_temp_read(struct file *file,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	pos = scnprintf(buf , sizeof(buf), "%d\n", temp);</div><div class='add'>+	pos = scnprintf(buf, sizeof(buf), "%d\n", temp);</div><div class='ctx'> </div><div class='ctx'> 	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='ctx'> }</div><div class='hunk'>@@ -305,7 +319,6 @@ static ssize_t iwl_dbgfs_sar_geo_profile_read(struct file *file,</div><div class='ctx'> 	int pos = 0;</div><div class='ctx'> 	int bufsz = sizeof(buf);</div><div class='ctx'> 	int tbl_idx;</div><div class='del'>-	u8 *value;</div><div class='ctx'> </div><div class='ctx'> 	if (!iwl_mvm_firmware_running(mvm))</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -321,21 +334,41 @@ static ssize_t iwl_dbgfs_sar_geo_profile_read(struct file *file,</div><div class='ctx'> 		pos = scnprintf(buf, bufsz,</div><div class='ctx'> 				"SAR geographic profile disabled\n");</div><div class='ctx'> 	} else {</div><div class='del'>-		value = &amp;mvm-&gt;fwrt.geo_profiles[tbl_idx - 1].values[0];</div><div class='del'>-</div><div class='ctx'> 		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='ctx'> 				 "Use geographic profile %d\n", tbl_idx);</div><div class='ctx'> 		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				 "2.4GHz:\n\tChain A offset: %hhu dBm\n\tChain B offset: %hhu dBm\n\tmax tx power: %hhu dBm\n",</div><div class='del'>-				 value[1], value[2], value[0]);</div><div class='add'>+				 "2.4GHz:\n\tChain A offset: %u dBm\n\tChain B offset: %u dBm\n\tmax tx power: %u dBm\n",</div><div class='add'>+				 mvm-&gt;fwrt.geo_profiles[tbl_idx - 1].bands[0].chains[0],</div><div class='add'>+				 mvm-&gt;fwrt.geo_profiles[tbl_idx - 1].bands[0].chains[1],</div><div class='add'>+				 mvm-&gt;fwrt.geo_profiles[tbl_idx - 1].bands[0].max);</div><div class='ctx'> 		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				 "5.2GHz:\n\tChain A offset: %hhu dBm\n\tChain B offset: %hhu dBm\n\tmax tx power: %hhu dBm\n",</div><div class='del'>-				 value[4], value[5], value[3]);</div><div class='add'>+				 "5.2GHz:\n\tChain A offset: %u dBm\n\tChain B offset: %u dBm\n\tmax tx power: %u dBm\n",</div><div class='add'>+				 mvm-&gt;fwrt.geo_profiles[tbl_idx - 1].bands[1].chains[0],</div><div class='add'>+				 mvm-&gt;fwrt.geo_profiles[tbl_idx - 1].bands[1].chains[1],</div><div class='add'>+				 mvm-&gt;fwrt.geo_profiles[tbl_idx - 1].bands[1].max);</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static ssize_t iwl_dbgfs_wifi_6e_enable_read(struct file *file,</div><div class='add'>+					     char __user *user_buf,</div><div class='add'>+					     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = file-&gt;private_data;</div><div class='add'>+	int err, pos;</div><div class='add'>+	char buf[12];</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	err = iwl_bios_get_dsm(&amp;mvm-&gt;fwrt, DSM_FUNC_ENABLE_6E, &amp;value);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	pos = sprintf(buf, "0x%08x\n", value);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static ssize_t iwl_dbgfs_stations_read(struct file *file, char __user *user_buf,</div><div class='hunk'>@@ -367,13 +400,14 @@ static ssize_t iwl_dbgfs_stations_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t iwl_dbgfs_rs_data_read(struct file *file, char __user *user_buf,</div><div class='add'>+static ssize_t iwl_dbgfs_rs_data_read(struct ieee80211_link_sta *link_sta,</div><div class='add'>+				      struct iwl_mvm_sta *mvmsta,</div><div class='add'>+				      struct iwl_mvm *mvm,</div><div class='add'>+				      struct iwl_mvm_link_sta *mvm_link_sta,</div><div class='add'>+				      char __user *user_buf,</div><div class='ctx'> 				      size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sta *sta = file-&gt;private_data;</div><div class='del'>-	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='del'>-	struct iwl_lq_sta_rs_fw *lq_sta = &amp;mvmsta-&gt;lq_sta.rs_fw;</div><div class='del'>-	struct iwl_mvm *mvm = lq_sta-&gt;pers.drv;</div><div class='add'>+	struct iwl_lq_sta_rs_fw *lq_sta = &amp;mvm_link_sta-&gt;lq_sta.rs_fw;</div><div class='ctx'> 	static const size_t bufsz = 2048;</div><div class='ctx'> 	char *buff;</div><div class='ctx'> 	int desc = 0;</div><div class='hunk'>@@ -383,8 +417,6 @@ static ssize_t iwl_dbgfs_rs_data_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 	if (!buff)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='ctx'> 	desc += scnprintf(buff + desc, bufsz - desc, "sta_id %d\n",</div><div class='ctx'> 			  lq_sta-&gt;pers.sta_id);</div><div class='ctx'> 	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='hunk'>@@ -394,10 +426,9 @@ static ssize_t iwl_dbgfs_rs_data_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 			  "A-MPDU size limit %d\n",</div><div class='ctx'> 			  lq_sta-&gt;pers.dbg_agg_frame_count_lim);</div><div class='ctx'> 	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='del'>-			  "valid_tx_ant %s%s%s\n",</div><div class='add'>+			  "valid_tx_ant %s%s\n",</div><div class='ctx'> 		(iwl_mvm_get_valid_tx_ant(mvm) &amp; ANT_A) ? "ANT_A," : "",</div><div class='del'>-		(iwl_mvm_get_valid_tx_ant(mvm) &amp; ANT_B) ? "ANT_B," : "",</div><div class='del'>-		(iwl_mvm_get_valid_tx_ant(mvm) &amp; ANT_C) ? "ANT_C" : "");</div><div class='add'>+		(iwl_mvm_get_valid_tx_ant(mvm) &amp; ANT_B) ? "ANT_B," : "");</div><div class='ctx'> 	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='ctx'> 			  "last tx rate=0x%X ",</div><div class='ctx'> 			  lq_sta-&gt;last_rate_n_flags);</div><div class='hunk'>@@ -406,18 +437,19 @@ static ssize_t iwl_dbgfs_rs_data_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 				     lq_sta-&gt;last_rate_n_flags);</div><div class='ctx'> 	if (desc &lt; bufsz - 1)</div><div class='ctx'> 		buff[desc++] = '\n';</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);</div><div class='ctx'> 	kfree(buff);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t iwl_dbgfs_amsdu_len_write(struct ieee80211_sta *sta,</div><div class='add'>+static ssize_t iwl_dbgfs_amsdu_len_write(struct ieee80211_link_sta *link_sta,</div><div class='add'>+					 struct iwl_mvm_sta *mvmsta,</div><div class='add'>+					 struct iwl_mvm *mvm,</div><div class='add'>+					 struct iwl_mvm_link_sta *mvm_link_sta,</div><div class='ctx'> 					 char *buf, size_t count,</div><div class='ctx'> 					 loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u16 amsdu_len;</div><div class='ctx'> </div><div class='hunk'>@@ -425,35 +457,38 @@ static ssize_t iwl_dbgfs_amsdu_len_write(struct ieee80211_sta *sta,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* only change from debug set &lt;-&gt; debug unset */</div><div class='del'>-	if ((amsdu_len &amp;&amp; mvmsta-&gt;orig_amsdu_len) ||</div><div class='del'>-	    (!!amsdu_len &amp;&amp; mvmsta-&gt;orig_amsdu_len))</div><div class='add'>+	if (amsdu_len &amp;&amp; mvm_link_sta-&gt;orig_amsdu_len)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	if (amsdu_len) {</div><div class='del'>-		mvmsta-&gt;orig_amsdu_len = sta-&gt;max_amsdu_len;</div><div class='del'>-		sta-&gt;max_amsdu_len = amsdu_len;</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(sta-&gt;max_tid_amsdu_len); i++)</div><div class='del'>-			sta-&gt;max_tid_amsdu_len[i] = amsdu_len;</div><div class='add'>+		mvm_link_sta-&gt;orig_amsdu_len = link_sta-&gt;agg.max_amsdu_len;</div><div class='add'>+		link_sta-&gt;agg.max_amsdu_len = amsdu_len;</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(link_sta-&gt;agg.max_tid_amsdu_len); i++)</div><div class='add'>+			link_sta-&gt;agg.max_tid_amsdu_len[i] = amsdu_len;</div><div class='ctx'> 	} else {</div><div class='del'>-		sta-&gt;max_amsdu_len = mvmsta-&gt;orig_amsdu_len;</div><div class='del'>-		mvmsta-&gt;orig_amsdu_len = 0;</div><div class='add'>+		link_sta-&gt;agg.max_amsdu_len = mvm_link_sta-&gt;orig_amsdu_len;</div><div class='add'>+		mvm_link_sta-&gt;orig_amsdu_len = 0;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	ieee80211_sta_recalc_aggregates(link_sta-&gt;sta);</div><div class='add'>+</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t iwl_dbgfs_amsdu_len_read(struct file *file,</div><div class='add'>+static ssize_t iwl_dbgfs_amsdu_len_read(struct ieee80211_link_sta *link_sta,</div><div class='add'>+					struct iwl_mvm_sta *mvmsta,</div><div class='add'>+					struct iwl_mvm *mvm,</div><div class='add'>+					struct iwl_mvm_link_sta *mvm_link_sta,</div><div class='ctx'> 					char __user *user_buf,</div><div class='ctx'> 					size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sta *sta = file-&gt;private_data;</div><div class='del'>-	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='del'>-</div><div class='ctx'> 	char buf[32];</div><div class='ctx'> 	int pos;</div><div class='ctx'> </div><div class='del'>-	pos = scnprintf(buf, sizeof(buf), "current %d ", sta-&gt;max_amsdu_len);</div><div class='add'>+	pos = scnprintf(buf, sizeof(buf), "current %d ",</div><div class='add'>+			link_sta-&gt;agg.max_amsdu_len);</div><div class='ctx'> 	pos += scnprintf(buf + pos, sizeof(buf) - pos, "stored %d\n",</div><div class='del'>-			 mvmsta-&gt;orig_amsdu_len);</div><div class='add'>+			 mvm_link_sta-&gt;orig_amsdu_len);</div><div class='ctx'> </div><div class='ctx'> 	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='ctx'> }</div><div class='hunk'>@@ -502,213 +537,190 @@ static ssize_t iwl_dbgfs_disable_power_off_write(struct iwl_mvm *mvm, char *buf,</div><div class='ctx'> 	return ret ?: count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static</div><div class='del'>-int iwl_mvm_coex_dump_mbox(struct iwl_bt_coex_profile_notif *notif, char *buf,</div><div class='del'>-			   int pos, int bufsz)</div><div class='del'>-{</div><div class='del'>-	pos += scnprintf(buf+pos, bufsz-pos, "MBOX dw0:\n");</div><div class='del'>-</div><div class='del'>-	BT_MBOX_PRINT(0, LE_SLAVE_LAT, false);</div><div class='del'>-	BT_MBOX_PRINT(0, LE_PROF1, false);</div><div class='del'>-	BT_MBOX_PRINT(0, LE_PROF2, false);</div><div class='del'>-	BT_MBOX_PRINT(0, LE_PROF_OTHER, false);</div><div class='del'>-	BT_MBOX_PRINT(0, CHL_SEQ_N, false);</div><div class='del'>-	BT_MBOX_PRINT(0, INBAND_S, false);</div><div class='del'>-	BT_MBOX_PRINT(0, LE_MIN_RSSI, false);</div><div class='del'>-	BT_MBOX_PRINT(0, LE_SCAN, false);</div><div class='del'>-	BT_MBOX_PRINT(0, LE_ADV, false);</div><div class='del'>-	BT_MBOX_PRINT(0, LE_MAX_TX_POWER, false);</div><div class='del'>-	BT_MBOX_PRINT(0, OPEN_CON_1, true);</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf+pos, bufsz-pos, "MBOX dw1:\n");</div><div class='del'>-</div><div class='del'>-	BT_MBOX_PRINT(1, BR_MAX_TX_POWER, false);</div><div class='del'>-	BT_MBOX_PRINT(1, IP_SR, false);</div><div class='del'>-	BT_MBOX_PRINT(1, LE_MSTR, false);</div><div class='del'>-	BT_MBOX_PRINT(1, AGGR_TRFC_LD, false);</div><div class='del'>-	BT_MBOX_PRINT(1, MSG_TYPE, false);</div><div class='del'>-	BT_MBOX_PRINT(1, SSN, true);</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf+pos, bufsz-pos, "MBOX dw2:\n");</div><div class='del'>-</div><div class='del'>-	BT_MBOX_PRINT(2, SNIFF_ACT, false);</div><div class='del'>-	BT_MBOX_PRINT(2, PAG, false);</div><div class='del'>-	BT_MBOX_PRINT(2, INQUIRY, false);</div><div class='del'>-	BT_MBOX_PRINT(2, CONN, false);</div><div class='del'>-	BT_MBOX_PRINT(2, SNIFF_INTERVAL, false);</div><div class='del'>-	BT_MBOX_PRINT(2, DISC, false);</div><div class='del'>-	BT_MBOX_PRINT(2, SCO_TX_ACT, false);</div><div class='del'>-	BT_MBOX_PRINT(2, SCO_RX_ACT, false);</div><div class='del'>-	BT_MBOX_PRINT(2, ESCO_RE_TX, false);</div><div class='del'>-	BT_MBOX_PRINT(2, SCO_DURATION, true);</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf+pos, bufsz-pos, "MBOX dw3:\n");</div><div class='del'>-</div><div class='del'>-	BT_MBOX_PRINT(3, SCO_STATE, false);</div><div class='del'>-	BT_MBOX_PRINT(3, SNIFF_STATE, false);</div><div class='del'>-	BT_MBOX_PRINT(3, A2DP_STATE, false);</div><div class='del'>-	BT_MBOX_PRINT(3, A2DP_SRC, false);</div><div class='del'>-	BT_MBOX_PRINT(3, ACL_STATE, false);</div><div class='del'>-	BT_MBOX_PRINT(3, MSTR_STATE, false);</div><div class='del'>-	BT_MBOX_PRINT(3, OBX_STATE, false);</div><div class='del'>-	BT_MBOX_PRINT(3, OPEN_CON_2, false);</div><div class='del'>-	BT_MBOX_PRINT(3, TRAFFIC_LOAD, false);</div><div class='del'>-	BT_MBOX_PRINT(3, CHL_SEQN_LSB, false);</div><div class='del'>-	BT_MBOX_PRINT(3, INBAND_P, false);</div><div class='del'>-	BT_MBOX_PRINT(3, MSG_TYPE_2, false);</div><div class='del'>-	BT_MBOX_PRINT(3, SSN_2, false);</div><div class='del'>-	BT_MBOX_PRINT(3, UPDATE_REQUEST, true);</div><div class='del'>-</div><div class='del'>-	return pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_dbgfs_bt_notif_read(struct file *file, char __user *user_buf,</div><div class='del'>-				       size_t count, loff_t *ppos)</div><div class='add'>+static ssize_t iwl_dbgfs_tas_get_status_read(struct file *file,</div><div class='add'>+					     char __user *user_buf,</div><div class='add'>+					     size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = file-&gt;private_data;</div><div class='del'>-	struct iwl_bt_coex_profile_notif *notif = &amp;mvm-&gt;last_bt_notif;</div><div class='del'>-	char *buf;</div><div class='del'>-	int ret, pos = 0, bufsz = sizeof(char) * 1024;</div><div class='del'>-</div><div class='del'>-	buf = kmalloc(bufsz, GFP_KERNEL);</div><div class='del'>-	if (!buf)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	pos += iwl_mvm_coex_dump_mbox(notif, buf, pos, bufsz);</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "bt_ci_compliance = %d\n",</div><div class='del'>-			 notif-&gt;bt_ci_compliance);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "primary_ch_lut = %d\n",</div><div class='del'>-			 le32_to_cpu(notif-&gt;primary_ch_lut));</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "secondary_ch_lut = %d\n",</div><div class='del'>-			 le32_to_cpu(notif-&gt;secondary_ch_lut));</div><div class='del'>-	pos += scnprintf(buf + pos,</div><div class='del'>-			 bufsz - pos, "bt_activity_grading = %d\n",</div><div class='del'>-			 le32_to_cpu(notif-&gt;bt_activity_grading));</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "bt_rrc = %d\n",</div><div class='del'>-			 notif-&gt;rrc_status &amp; 0xF);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "bt_ttc = %d\n",</div><div class='del'>-			 notif-&gt;ttc_status &amp; 0xF);</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "sync_sco = %d\n",</div><div class='del'>-			 IWL_MVM_BT_COEX_SYNC2SCO);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "mplut = %d\n",</div><div class='del'>-			 IWL_MVM_BT_COEX_MPLUT);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-	kfree(buf);</div><div class='add'>+	struct iwl_tas_status_resp *rsp = NULL;</div><div class='add'>+	static const size_t bufsz = 1024;</div><div class='add'>+	char *buff, *pos, *endpos;</div><div class='add'>+	const char * const tas_dis_reason[TAS_DISABLED_REASON_MAX] = {</div><div class='add'>+		[TAS_DISABLED_DUE_TO_BIOS] =</div><div class='add'>+			"Due To BIOS",</div><div class='add'>+		[TAS_DISABLED_DUE_TO_SAR_6DBM] =</div><div class='add'>+			"Due To SAR Limit Less Than 6 dBm",</div><div class='add'>+		[TAS_DISABLED_REASON_INVALID] =</div><div class='add'>+			"N/A",</div><div class='add'>+		[TAS_DISABLED_DUE_TO_TABLE_SOURCE_INVALID] =</div><div class='add'>+			"Due to table source invalid",</div><div class='add'>+	};</div><div class='add'>+	const char * const tas_current_status[TAS_DYNA_STATUS_MAX] = {</div><div class='add'>+		[TAS_DYNA_INACTIVE] = "INACTIVE",</div><div class='add'>+		[TAS_DYNA_INACTIVE_MVM_MODE] =</div><div class='add'>+			"inactive due to mvm mode",</div><div class='add'>+		[TAS_DYNA_INACTIVE_TRIGGER_MODE] =</div><div class='add'>+			"inactive due to trigger mode",</div><div class='add'>+		[TAS_DYNA_INACTIVE_BLOCK_LISTED] =</div><div class='add'>+			"inactive due to block listed",</div><div class='add'>+		[TAS_DYNA_INACTIVE_UHB_NON_US] =</div><div class='add'>+			"inactive due to uhb non US",</div><div class='add'>+		[TAS_DYNA_ACTIVE] = "ACTIVE",</div><div class='add'>+	};</div><div class='add'>+	struct iwl_host_cmd hcmd = {</div><div class='add'>+		.id = WIDE_ID(DEBUG_GROUP, GET_TAS_STATUS),</div><div class='add'>+		.flags = CMD_WANT_SKB,</div><div class='add'>+		.len = { 0, },</div><div class='add'>+		.data = { NULL, },</div><div class='add'>+	};</div><div class='add'>+	int ret, i, tmp;</div><div class='add'>+	bool tas_enabled = false;</div><div class='add'>+	unsigned long dyn_status;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-#undef BT_MBOX_PRINT</div><div class='add'>+	if (!iwl_mvm_firmware_running(mvm))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-static ssize_t iwl_dbgfs_bt_cmd_read(struct file *file, char __user *user_buf,</div><div class='del'>-				     size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_mvm *mvm = file-&gt;private_data;</div><div class='del'>-	struct iwl_bt_coex_ci_cmd *cmd = &amp;mvm-&gt;last_bt_ci_cmd;</div><div class='del'>-	char buf[256];</div><div class='del'>-	int bufsz = sizeof(buf);</div><div class='del'>-	int pos = 0;</div><div class='add'>+	if (iwl_fw_lookup_notif_ver(mvm-&gt;fw, DEBUG_GROUP, GET_TAS_STATUS,</div><div class='add'>+				    0) != 3)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "Channel inhibition CMD\n");</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "\tPrimary Channel Bitmap 0x%016llx\n",</div><div class='del'>-			 le64_to_cpu(cmd-&gt;bt_primary_ci));</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "\tSecondary Channel Bitmap 0x%016llx\n",</div><div class='del'>-			 le64_to_cpu(cmd-&gt;bt_secondary_ci));</div><div class='del'>-</div><div class='add'>+	ret = iwl_mvm_send_cmd(mvm, &amp;hcmd);</div><div class='ctx'> 	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-iwl_dbgfs_bt_tx_prio_write(struct iwl_mvm *mvm, char *buf,</div><div class='del'>-			   size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	u32 bt_tx_prio;</div><div class='del'>-</div><div class='del'>-	if (sscanf(buf, "%u", &amp;bt_tx_prio) != 1)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (bt_tx_prio &gt; 4)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	mvm-&gt;bt_tx_prio = bt_tx_prio;</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-iwl_dbgfs_bt_force_ant_write(struct iwl_mvm *mvm, char *buf,</div><div class='del'>-			     size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	static const char * const modes_str[BT_FORCE_ANT_MAX] = {</div><div class='del'>-		[BT_FORCE_ANT_DIS] = "dis",</div><div class='del'>-		[BT_FORCE_ANT_AUTO] = "auto",</div><div class='del'>-		[BT_FORCE_ANT_BT] = "bt",</div><div class='del'>-		[BT_FORCE_ANT_WIFI] = "wifi",</div><div class='del'>-	};</div><div class='del'>-	int ret, bt_force_ant_mode;</div><div class='del'>-</div><div class='del'>-	ret = match_string(modes_str, ARRAY_SIZE(modes_str), buf);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	bt_force_ant_mode = ret;</div><div class='del'>-	ret = 0;</div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	if (mvm-&gt;bt_force_ant_mode == bt_force_ant_mode)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	mvm-&gt;bt_force_ant_mode = bt_force_ant_mode;</div><div class='del'>-	IWL_DEBUG_COEX(mvm, "Force mode: %s\n",</div><div class='del'>-		       modes_str[mvm-&gt;bt_force_ant_mode]);</div><div class='del'>-</div><div class='del'>-	if (iwl_mvm_firmware_running(mvm))</div><div class='del'>-		ret = iwl_mvm_send_bt_init_conf(mvm);</div><div class='del'>-	else</div><div class='del'>-		ret = 0;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-	return ret ?: count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_dbgfs_fw_ver_read(struct file *file, char __user *user_buf,</div><div class='del'>-				     size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_mvm *mvm = file-&gt;private_data;</div><div class='del'>-	char *buff, *pos, *endpos;</div><div class='del'>-	static const size_t bufsz = 1024;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	buff = kmalloc(bufsz, GFP_KERNEL);</div><div class='add'>+	buff = kzalloc(bufsz, GFP_KERNEL);</div><div class='ctx'> 	if (!buff)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-</div><div class='ctx'> 	pos = buff;</div><div class='ctx'> 	endpos = pos + bufsz;</div><div class='ctx'> </div><div class='del'>-	pos += scnprintf(pos, endpos - pos, "FW prefix: %s\n",</div><div class='del'>-			 mvm-&gt;trans-&gt;cfg-&gt;fw_name_pre);</div><div class='del'>-	pos += scnprintf(pos, endpos - pos, "FW: %s\n",</div><div class='del'>-			 mvm-&gt;fwrt.fw-&gt;human_readable);</div><div class='del'>-	pos += scnprintf(pos, endpos - pos, "Device: %s\n",</div><div class='del'>-			 mvm-&gt;fwrt.trans-&gt;name);</div><div class='del'>-	pos += scnprintf(pos, endpos - pos, "Bus: %s\n",</div><div class='del'>-			 mvm-&gt;fwrt.dev-&gt;bus-&gt;name);</div><div class='add'>+	rsp = (void *)hcmd.resp_pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+	pos += scnprintf(pos, endpos - pos, "TAS Conclusion:\n");</div><div class='add'>+	for (i = 0; i &lt; rsp-&gt;in_dual_radio + 1; i++) {</div><div class='add'>+		if (rsp-&gt;tas_status_mac[i].dynamic_status &amp;</div><div class='add'>+		    BIT(TAS_DYNA_ACTIVE)) {</div><div class='add'>+			pos += scnprintf(pos, endpos - pos, "\tON for ");</div><div class='add'>+			switch (rsp-&gt;tas_status_mac[i].band) {</div><div class='add'>+			case PHY_BAND_5:</div><div class='add'>+				pos += scnprintf(pos, endpos - pos, "HB\n");</div><div class='add'>+				break;</div><div class='add'>+			case PHY_BAND_24:</div><div class='add'>+				pos += scnprintf(pos, endpos - pos, "LB\n");</div><div class='add'>+				break;</div><div class='add'>+			case PHY_BAND_6:</div><div class='add'>+				pos += scnprintf(pos, endpos - pos, "UHB\n");</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				pos += scnprintf(pos, endpos - pos,</div><div class='add'>+						 "Unsupported band (%d)\n",</div><div class='add'>+						 rsp-&gt;tas_status_mac[i].band);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			tas_enabled = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (!tas_enabled)</div><div class='add'>+		pos += scnprintf(pos, endpos - pos, "\tOFF\n");</div><div class='add'>+</div><div class='add'>+	pos += scnprintf(pos, endpos - pos, "TAS Report\n");</div><div class='add'>+	pos += scnprintf(pos, endpos - pos, "TAS FW version: %d\n",</div><div class='add'>+			 rsp-&gt;tas_fw_version);</div><div class='add'>+	pos += scnprintf(pos, endpos - pos, "Is UHB enabled for USA?: %s\n",</div><div class='add'>+			 rsp-&gt;is_uhb_for_usa_enable ? "True" : "False");</div><div class='add'>+</div><div class='add'>+	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			IWL_UCODE_TLV_CAPA_UHB_CANADA_TAS_SUPPORT))</div><div class='add'>+		pos += scnprintf(pos, endpos - pos,</div><div class='add'>+				 "Is UHB enabled for CANADA?: %s\n",</div><div class='add'>+				 rsp-&gt;uhb_allowed_flags &amp;</div><div class='add'>+				 TAS_UHB_ALLOWED_CANADA ? "True" : "False");</div><div class='add'>+</div><div class='add'>+	pos += scnprintf(pos, endpos - pos, "Current MCC: 0x%x\n",</div><div class='add'>+			 le16_to_cpu(rsp-&gt;curr_mcc));</div><div class='add'>+</div><div class='add'>+	pos += scnprintf(pos, endpos - pos, "Block list entries:");</div><div class='add'>+	for (i = 0; i &lt; IWL_WTAS_BLACK_LIST_MAX; i++)</div><div class='add'>+		pos += scnprintf(pos, endpos - pos, " 0x%x",</div><div class='add'>+				 le16_to_cpu(rsp-&gt;block_list[i]));</div><div class='add'>+</div><div class='add'>+	pos += scnprintf(pos, endpos - pos, "\nOEM name: %s\n",</div><div class='add'>+			 dmi_get_system_info(DMI_SYS_VENDOR) ?: "&lt;unknown&gt;");</div><div class='add'>+	pos += scnprintf(pos, endpos - pos, "\tVendor In Approved List: %s\n",</div><div class='add'>+			 iwl_is_tas_approved() ? "YES" : "NO");</div><div class='add'>+	pos += scnprintf(pos, endpos - pos,</div><div class='add'>+			 "\tDo TAS Support Dual Radio?: %s\n",</div><div class='add'>+			 rsp-&gt;in_dual_radio ? "TRUE" : "FALSE");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rsp-&gt;in_dual_radio + 1; i++) {</div><div class='add'>+		if (rsp-&gt;tas_status_mac[i].static_status == 0) {</div><div class='add'>+			pos += scnprintf(pos, endpos - pos,</div><div class='add'>+					 "Static status: disabled\n");</div><div class='add'>+			pos += scnprintf(pos, endpos - pos,</div><div class='add'>+					 "Static disabled reason: %s (0)\n",</div><div class='add'>+					 tas_dis_reason[0]);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pos += scnprintf(pos, endpos - pos, "TAS status for ");</div><div class='add'>+		switch (rsp-&gt;tas_status_mac[i].band) {</div><div class='add'>+		case PHY_BAND_5:</div><div class='add'>+			pos += scnprintf(pos, endpos - pos, "High band\n");</div><div class='add'>+			break;</div><div class='add'>+		case PHY_BAND_24:</div><div class='add'>+			pos += scnprintf(pos, endpos - pos, "Low band\n");</div><div class='add'>+			break;</div><div class='add'>+		case PHY_BAND_6:</div><div class='add'>+			pos += scnprintf(pos, endpos - pos,</div><div class='add'>+					 "Ultra high band\n");</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			pos += scnprintf(pos, endpos - pos,</div><div class='add'>+					 "Unsupported band (%d)\n",</div><div class='add'>+					 rsp-&gt;tas_status_mac[i].band);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		pos += scnprintf(pos, endpos - pos, "Static status: %sabled\n",</div><div class='add'>+				 rsp-&gt;tas_status_mac[i].static_status ?</div><div class='add'>+				 "En" : "Dis");</div><div class='add'>+		pos += scnprintf(pos, endpos - pos,</div><div class='add'>+				 "\tStatic Disabled Reason: ");</div><div class='add'>+		if (rsp-&gt;tas_status_mac[i].static_dis_reason &lt; TAS_DISABLED_REASON_MAX)</div><div class='add'>+			pos += scnprintf(pos, endpos - pos, "%s (%d)\n",</div><div class='add'>+					 tas_dis_reason[rsp-&gt;tas_status_mac[i].static_dis_reason],</div><div class='add'>+					 rsp-&gt;tas_status_mac[i].static_dis_reason);</div><div class='add'>+		else</div><div class='add'>+			pos += scnprintf(pos, endpos - pos,</div><div class='add'>+					 "unsupported value (%d)\n",</div><div class='add'>+					 rsp-&gt;tas_status_mac[i].static_dis_reason);</div><div class='add'>+</div><div class='add'>+		pos += scnprintf(pos, endpos - pos, "Dynamic status:\n");</div><div class='add'>+		dyn_status = (rsp-&gt;tas_status_mac[i].dynamic_status);</div><div class='add'>+		for_each_set_bit(tmp, &amp;dyn_status, TAS_DYNA_STATUS_MAX) {</div><div class='add'>+			pos += scnprintf(pos, endpos - pos, "\t%s (%d)\n",</div><div class='add'>+					 tas_current_status[tmp], tmp);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pos += scnprintf(pos, endpos - pos,</div><div class='add'>+				 "Is near disconnection?: %s\n",</div><div class='add'>+				 rsp-&gt;tas_status_mac[i].near_disconnection ?</div><div class='add'>+				 "True" : "False");</div><div class='add'>+		tmp = le16_to_cpu(rsp-&gt;tas_status_mac[i].max_reg_pwr_limit);</div><div class='add'>+		pos += scnprintf(pos, endpos - pos,</div><div class='add'>+				 "Max. regulatory pwr limit (dBm): %d.%03d\n",</div><div class='add'>+				 tmp / 8, 125 * (tmp % 8));</div><div class='add'>+		tmp = le16_to_cpu(rsp-&gt;tas_status_mac[i].sar_limit);</div><div class='add'>+		pos += scnprintf(pos, endpos - pos,</div><div class='add'>+				 "SAR limit (dBm): %d.%03d\n",</div><div class='add'>+				 tmp / 8, 125 * (tmp % 8));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	ret = simple_read_from_buffer(user_buf, count, ppos, buff, pos - buff);</div><div class='ctx'> 	kfree(buff);</div><div class='del'>-</div><div class='add'>+	iwl_free_resp(&amp;hcmd);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -752,6 +764,13 @@ static ssize_t iwl_dbgfs_fw_rx_stats_read(struct file *file,</div><div class='ctx'> 	char *buf;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	size_t bufsz;</div><div class='add'>+	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw,</div><div class='add'>+					   WIDE_ID(SYSTEM_GROUP,</div><div class='add'>+						   SYSTEM_STATISTICS_CMD),</div><div class='add'>+					   IWL_FW_CMD_VER_UNKNOWN);</div><div class='add'>+</div><div class='add'>+	if (cmd_ver != IWL_FW_CMD_VER_UNKNOWN)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_mvm_has_new_rx_stats_api(mvm))</div><div class='ctx'> 		bufsz = ((sizeof(struct mvm_statistics_rx) /</div><div class='hunk'>@@ -931,6 +950,101 @@ static ssize_t iwl_dbgfs_fw_rx_stats_read(struct file *file,</div><div class='ctx'> }</div><div class='ctx'> #undef PRINT_STAT_LE32</div><div class='ctx'> </div><div class='add'>+static ssize_t iwl_dbgfs_fw_system_stats_read(struct file *file,</div><div class='add'>+					      char __user *user_buf,</div><div class='add'>+					      size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	char *buff, *pos, *endpos;</div><div class='add'>+	int ret;</div><div class='add'>+	size_t bufsz;</div><div class='add'>+	int i;</div><div class='add'>+	struct iwl_mvm_vif *mvmvif;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct iwl_mvm *mvm = file-&gt;private_data;</div><div class='add'>+	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw,</div><div class='add'>+					   WIDE_ID(SYSTEM_GROUP,</div><div class='add'>+						   SYSTEM_STATISTICS_CMD),</div><div class='add'>+					   IWL_FW_CMD_VER_UNKNOWN);</div><div class='add'>+</div><div class='add'>+	/* in case of a wrong cmd version, allocate buffer only for error msg */</div><div class='add'>+	bufsz = (cmd_ver == 1) ? 4096 : 64;</div><div class='add'>+</div><div class='add'>+	buff = kzalloc(bufsz, GFP_KERNEL);</div><div class='add'>+	if (!buff)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pos = buff;</div><div class='add'>+	endpos = pos + bufsz;</div><div class='add'>+</div><div class='add'>+	if (cmd_ver != 1) {</div><div class='add'>+		pos += scnprintf(pos, endpos - pos,</div><div class='add'>+				 "System stats not supported:%d\n", cmd_ver);</div><div class='add'>+		goto send_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	if (iwl_mvm_firmware_running(mvm))</div><div class='add'>+		iwl_mvm_request_statistics(mvm, false);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_MAC_INDEX_DRIVER; i++) {</div><div class='add'>+		vif = iwl_mvm_rcu_dereference_vif_id(mvm, i, false);</div><div class='add'>+		if (!vif)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i == NUM_MAC_INDEX_DRIVER || !vif) {</div><div class='add'>+		pos += scnprintf(pos, endpos - pos, "vif is NULL\n");</div><div class='add'>+		goto release_send_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	if (!mvmvif) {</div><div class='add'>+		pos += scnprintf(pos, endpos - pos, "mvmvif is NULL\n");</div><div class='add'>+		goto release_send_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_mvm_vif_valid_link(mvmvif, i) {</div><div class='add'>+		struct iwl_mvm_vif_link_info *link_info = mvmvif-&gt;link[i];</div><div class='add'>+</div><div class='add'>+		pos += scnprintf(pos, endpos - pos,</div><div class='add'>+				 "link_id %d", i);</div><div class='add'>+		pos += scnprintf(pos, endpos - pos,</div><div class='add'>+				 " num_beacons %d",</div><div class='add'>+				 link_info-&gt;beacon_stats.num_beacons);</div><div class='add'>+		pos += scnprintf(pos, endpos - pos,</div><div class='add'>+				 " accu_num_beacons %d",</div><div class='add'>+				 link_info-&gt;beacon_stats.accu_num_beacons);</div><div class='add'>+		pos += scnprintf(pos, endpos - pos,</div><div class='add'>+				 " avg_signal %d\n",</div><div class='add'>+				 link_info-&gt;beacon_stats.avg_signal);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos += scnprintf(pos, endpos - pos,</div><div class='add'>+			 "radio_stats.rx_time %lld\n",</div><div class='add'>+			 mvm-&gt;radio_stats.rx_time);</div><div class='add'>+	pos += scnprintf(pos, endpos - pos,</div><div class='add'>+			 "radio_stats.tx_time %lld\n",</div><div class='add'>+			 mvm-&gt;radio_stats.tx_time);</div><div class='add'>+	pos += scnprintf(pos, endpos - pos,</div><div class='add'>+			 "accu_radio_stats.rx_time %lld\n",</div><div class='add'>+			 mvm-&gt;accu_radio_stats.rx_time);</div><div class='add'>+	pos += scnprintf(pos, endpos - pos,</div><div class='add'>+			 "accu_radio_stats.tx_time %lld\n",</div><div class='add'>+			 mvm-&gt;accu_radio_stats.tx_time);</div><div class='add'>+</div><div class='add'>+release_send_out:</div><div class='add'>+	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+send_out:</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buff, pos - buff);</div><div class='add'>+	kfree(buff);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t iwl_dbgfs_frame_stats_read(struct iwl_mvm *mvm,</div><div class='ctx'> 					  char __user *user_buf, size_t count,</div><div class='ctx'> 					  loff_t *ppos,</div><div class='hunk'>@@ -985,8 +1099,8 @@ static ssize_t iwl_dbgfs_frame_stats_read(struct iwl_mvm *mvm,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		pos += scnprintf(pos, endpos - pos, "Rate[%d]: ",</div><div class='ctx'> 				 (int)(ARRAY_SIZE(stats-&gt;last_rates) - i));</div><div class='del'>-		pos += rs_pretty_print_rate(pos, endpos - pos,</div><div class='del'>-					    stats-&gt;last_rates[idx]);</div><div class='add'>+		pos += rs_pretty_print_rate_v1(pos, endpos - pos,</div><div class='add'>+					       stats-&gt;last_rates[idx]);</div><div class='ctx'> 		if (pos &lt; endpos - 1)</div><div class='ctx'> 			*pos++ = '\n';</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1018,12 +1132,15 @@ static ssize_t iwl_dbgfs_fw_restart_write(struct iwl_mvm *mvm, char *buf,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	/* allow one more restart that we're provoking here */</div><div class='del'>-	if (mvm-&gt;fw_restart &gt;= 0)</div><div class='del'>-		mvm-&gt;fw_restart++;</div><div class='add'>+	if (count == 6 &amp;&amp; !strcmp(buf, "nolog\n")) {</div><div class='add'>+		set_bit(IWL_MVM_STATUS_SUPPRESS_ERROR_LOG_ONCE, &amp;mvm-&gt;status);</div><div class='add'>+		mvm-&gt;trans-&gt;suppress_cmd_error_once = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* take the return value to make compiler happy - it will fail anyway */</div><div class='del'>-	ret = iwl_mvm_send_cmd_pdu(mvm, REPLY_ERROR, 0, 0, NULL);</div><div class='add'>+	ret = iwl_mvm_send_cmd_pdu(mvm,</div><div class='add'>+				   WIDE_ID(LONG_GROUP, REPLY_ERROR),</div><div class='add'>+				   0, 0, NULL);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -1036,6 +1153,11 @@ static ssize_t iwl_dbgfs_fw_nmi_write(struct iwl_mvm *mvm, char *buf,</div><div class='ctx'> 	if (!iwl_mvm_firmware_running(mvm))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='add'>+	IWL_ERR(mvm, "Triggering an NMI from debugfs\n");</div><div class='add'>+</div><div class='add'>+	if (count == 6 &amp;&amp; !strcmp(buf, "nolog\n"))</div><div class='add'>+		set_bit(IWL_MVM_STATUS_SUPPRESS_ERROR_LOG_ONCE, &amp;mvm-&gt;status);</div><div class='add'>+</div><div class='ctx'> 	iwl_force_nmi(mvm-&gt;trans);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -1057,9 +1179,7 @@ iwl_dbgfs_scan_ant_rxchain_read(struct file *file,</div><div class='ctx'> 		pos += scnprintf(buf + pos, bufsz - pos, "A");</div><div class='ctx'> 	if (mvm-&gt;scan_rx_ant &amp; ANT_B)</div><div class='ctx'> 		pos += scnprintf(buf + pos, bufsz - pos, "B");</div><div class='del'>-	if (mvm-&gt;scan_rx_ant &amp; ANT_C)</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos, "C");</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, " (%hhx)\n", mvm-&gt;scan_rx_ant);</div><div class='add'>+	pos += scnprintf(buf + pos, bufsz - pos, " (%x)\n", mvm-&gt;scan_rx_ant);</div><div class='ctx'> </div><div class='ctx'> 	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='ctx'> }</div><div class='hunk'>@@ -1157,8 +1277,8 @@ static ssize_t iwl_dbgfs_inject_packet_write(struct iwl_mvm *mvm,</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	/* supporting only MQ RX */</div><div class='del'>-	if (!mvm-&gt;trans-&gt;trans_cfg-&gt;mq_rx_supported)</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+	if (!mvm-&gt;trans-&gt;mac_cfg-&gt;mq_rx_supported)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	rxb._page = alloc_pages(GFP_ATOMIC, 0);</div><div class='ctx'> 	if (!rxb._page)</div><div class='hunk'>@@ -1192,8 +1312,8 @@ static int _iwl_dbgfs_inject_beacon_ie(struct iwl_mvm *mvm, char *bin, int len)</div><div class='ctx'> 	struct sk_buff *beacon;</div><div class='ctx'> 	struct ieee80211_tx_info *info;</div><div class='ctx'> 	struct iwl_mac_beacon_cmd beacon_cmd = {};</div><div class='add'>+	unsigned int link_id;</div><div class='ctx'> 	u8 rate;</div><div class='del'>-	u16 flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	len /= 2;</div><div class='hunk'>@@ -1226,7 +1346,7 @@ static int _iwl_dbgfs_inject_beacon_ie(struct iwl_mvm *mvm, char *bin, int len)</div><div class='ctx'> </div><div class='ctx'> 	mvm-&gt;hw-&gt;extra_beacon_tailroom = len;</div><div class='ctx'> </div><div class='del'>-	beacon = ieee80211_beacon_get_template(mvm-&gt;hw, vif, NULL);</div><div class='add'>+	beacon = ieee80211_beacon_get_template(mvm-&gt;hw, vif, NULL, 0);</div><div class='ctx'> 	if (!beacon)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='hunk'>@@ -1239,22 +1359,35 @@ static int _iwl_dbgfs_inject_beacon_ie(struct iwl_mvm *mvm, char *bin, int len)</div><div class='ctx'> </div><div class='ctx'> 	mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	info = IEEE80211_SKB_CB(beacon);</div><div class='del'>-	rate = iwl_mvm_mac_ctxt_get_lowest_rate(info, vif);</div><div class='del'>-	flags = iwl_mvm_mac80211_idx_to_hwrate(rate);</div><div class='add'>+	rate = iwl_mvm_mac_ctxt_get_beacon_rate(mvm, info, vif);</div><div class='add'>+</div><div class='add'>+	for_each_mvm_vif_valid_link(mvmvif, link_id) {</div><div class='add'>+		beacon_cmd.flags =</div><div class='add'>+			cpu_to_le16(iwl_mvm_mac_ctxt_get_beacon_flags(mvm-&gt;fw,</div><div class='add'>+								      rate));</div><div class='add'>+		beacon_cmd.byte_cnt = cpu_to_le16((u16)beacon-&gt;len);</div><div class='add'>+		if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, BEACON_TEMPLATE_CMD, 0) &gt; 12)</div><div class='add'>+			beacon_cmd.link_id =</div><div class='add'>+				cpu_to_le32(mvmvif-&gt;link[link_id]-&gt;fw_link_id);</div><div class='add'>+		else</div><div class='add'>+			beacon_cmd.link_id = cpu_to_le32((u32)mvmvif-&gt;id);</div><div class='ctx'> </div><div class='del'>-	if (rate == IWL_FIRST_CCK_RATE)</div><div class='del'>-		flags |= IWL_MAC_BEACON_CCK;</div><div class='add'>+		iwl_mvm_mac_ctxt_set_tim(mvm, &amp;beacon_cmd.tim_idx,</div><div class='add'>+					 &amp;beacon_cmd.tim_size,</div><div class='add'>+					 beacon-&gt;data, beacon-&gt;len);</div><div class='ctx'> </div><div class='del'>-	beacon_cmd.flags = cpu_to_le16(flags);</div><div class='del'>-	beacon_cmd.byte_cnt = cpu_to_le16((u16)beacon-&gt;len);</div><div class='del'>-	beacon_cmd.template_id = cpu_to_le32((u32)mvmvif-&gt;id);</div><div class='add'>+		if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw,</div><div class='add'>+					  BEACON_TEMPLATE_CMD, 0) &gt;= 14) {</div><div class='add'>+			u32 offset = iwl_find_ie_offset(beacon-&gt;data,</div><div class='add'>+							WLAN_EID_S1G_TWT,</div><div class='add'>+							beacon-&gt;len);</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_mac_ctxt_set_tim(mvm, &amp;beacon_cmd.tim_idx,</div><div class='del'>-				 &amp;beacon_cmd.tim_size,</div><div class='del'>-				 beacon-&gt;data, beacon-&gt;len);</div><div class='add'>+			beacon_cmd.btwt_offset = cpu_to_le32(offset);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_mac_ctxt_send_beacon_cmd(mvm, beacon, &amp;beacon_cmd,</div><div class='del'>-					 sizeof(beacon_cmd));</div><div class='add'>+		iwl_mvm_mac_ctxt_send_beacon_cmd(mvm, beacon, &amp;beacon_cmd,</div><div class='add'>+						 sizeof(beacon_cmd));</div><div class='add'>+	}</div><div class='ctx'> 	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	dev_kfree_skb(beacon);</div><div class='hunk'>@@ -1331,18 +1464,23 @@ static ssize_t iwl_dbgfs_fw_dbg_conf_write(struct iwl_mvm *mvm,</div><div class='ctx'> 	return ret ?: count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t iwl_dbgfs_fw_dbg_collect_write(struct iwl_mvm *mvm,</div><div class='del'>-					      char *buf, size_t count,</div><div class='del'>-					      loff_t *ppos)</div><div class='add'>+static ssize_t iwl_dbgfs_fw_dbg_clear_write(struct iwl_mvm *mvm,</div><div class='add'>+					    char *buf, size_t count,</div><div class='add'>+					    loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	if (count == 0)</div><div class='del'>-		return 0;</div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_9000)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	iwl_dbg_tlv_time_point(&amp;mvm-&gt;fwrt, IWL_FW_INI_TIME_POINT_USER_TRIGGER,</div><div class='del'>-			       NULL);</div><div class='add'>+	/*</div><div class='add'>+	 * If the firmware is not running, silently succeed since there is</div><div class='add'>+	 * no data to clear.</div><div class='add'>+	 */</div><div class='add'>+	if (!iwl_mvm_firmware_running(mvm))</div><div class='add'>+		return count;</div><div class='ctx'> </div><div class='del'>-	iwl_fw_dbg_collect(&amp;mvm-&gt;fwrt, FW_DBG_TRIGGER_USER, buf,</div><div class='del'>-			   (count - 1), NULL);</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	iwl_fw_dbg_clear_monitor_buf(&amp;mvm-&gt;fwrt);</div><div class='add'>+	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -1365,211 +1503,138 @@ static ssize_t iwl_dbgfs_dbg_time_point_write(struct iwl_mvm *mvm,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define ADD_TEXT(...) pos += scnprintf(buf + pos, bufsz - pos, __VA_ARGS__)</div><div class='del'>-#ifdef CONFIG_IWLWIFI_BCAST_FILTERING</div><div class='del'>-static ssize_t iwl_dbgfs_bcast_filters_read(struct file *file,</div><div class='del'>-					    char __user *user_buf,</div><div class='del'>-					    size_t count, loff_t *ppos)</div><div class='add'>+#define MVM_DEBUGFS_WRITE_FILE_OPS(name, bufsz) \</div><div class='add'>+	_MVM_DEBUGFS_WRITE_FILE_OPS(name, bufsz, struct iwl_mvm)</div><div class='add'>+#define MVM_DEBUGFS_READ_WRITE_FILE_OPS(name, bufsz) \</div><div class='add'>+	_MVM_DEBUGFS_READ_WRITE_FILE_OPS(name, bufsz, struct iwl_mvm)</div><div class='add'>+#define MVM_DEBUGFS_ADD_FILE_ALIAS(alias, name, parent, mode) do {	\</div><div class='add'>+		debugfs_create_file(alias, mode, parent, mvm,		\</div><div class='add'>+				    &amp;iwl_dbgfs_##name##_ops);		\</div><div class='add'>+	} while (0)</div><div class='add'>+#define MVM_DEBUGFS_ADD_FILE(name, parent, mode) \</div><div class='add'>+	MVM_DEBUGFS_ADD_FILE_ALIAS(#name, name, parent, mode)</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+_iwl_dbgfs_link_sta_wrap_write(ssize_t (*real)(struct ieee80211_link_sta *,</div><div class='add'>+					       struct iwl_mvm_sta *,</div><div class='add'>+					       struct iwl_mvm *,</div><div class='add'>+					       struct iwl_mvm_link_sta *,</div><div class='add'>+					       char *,</div><div class='add'>+					       size_t, loff_t *),</div><div class='add'>+			   struct file *file,</div><div class='add'>+			   char *buf, size_t buf_size, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm *mvm = file-&gt;private_data;</div><div class='del'>-	struct iwl_bcast_filter_cmd cmd;</div><div class='del'>-	const struct iwl_fw_bcast_filter *filter;</div><div class='del'>-	char *buf;</div><div class='del'>-	int bufsz = 1024;</div><div class='del'>-	int i, j, pos = 0;</div><div class='add'>+	struct ieee80211_link_sta *link_sta = file-&gt;private_data;</div><div class='add'>+	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(link_sta-&gt;sta);</div><div class='add'>+	struct iwl_mvm *mvm = iwl_mvm_vif_from_mac80211(mvmsta-&gt;vif)-&gt;mvm;</div><div class='add'>+	struct iwl_mvm_link_sta *mvm_link_sta;</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='del'>-	if (!buf)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='ctx'> 	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	if (!iwl_mvm_bcast_filter_build_cmd(mvm, &amp;cmd)) {</div><div class='del'>-		ADD_TEXT("None\n");</div><div class='del'>-		mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	for (i = 0; cmd.filters[i].attrs[0].mask; i++) {</div><div class='del'>-		filter = &amp;cmd.filters[i];</div><div class='del'>-</div><div class='del'>-		ADD_TEXT("Filter [%d]:\n", i);</div><div class='del'>-		ADD_TEXT("\tDiscard=%d\n", filter-&gt;discard);</div><div class='del'>-		ADD_TEXT("\tFrame Type: %s\n",</div><div class='del'>-			 filter-&gt;frame_type ? "IPv4" : "Generic");</div><div class='ctx'> </div><div class='del'>-		for (j = 0; j &lt; ARRAY_SIZE(filter-&gt;attrs); j++) {</div><div class='del'>-			const struct iwl_fw_bcast_filter_attr *attr;</div><div class='del'>-</div><div class='del'>-			attr = &amp;filter-&gt;attrs[j];</div><div class='del'>-			if (!attr-&gt;mask)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			ADD_TEXT("\tAttr [%d]: offset=%d (from %s), mask=0x%x, value=0x%x reserved=0x%x\n",</div><div class='del'>-				 j, attr-&gt;offset,</div><div class='del'>-				 attr-&gt;offset_type ? "IP End" :</div><div class='del'>-						     "Payload Start",</div><div class='del'>-				 be32_to_cpu(attr-&gt;mask),</div><div class='del'>-				 be32_to_cpu(attr-&gt;val),</div><div class='del'>-				 le16_to_cpu(attr-&gt;reserved1));</div><div class='del'>-		}</div><div class='add'>+	mvm_link_sta = rcu_dereference_protected(mvmsta-&gt;link[link_sta-&gt;link_id],</div><div class='add'>+						 lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+	if (WARN_ON(!mvm_link_sta)) {</div><div class='add'>+		mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-	kfree(buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_dbgfs_bcast_filters_write(struct iwl_mvm *mvm, char *buf,</div><div class='del'>-					     size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	int pos, next_pos;</div><div class='del'>-	struct iwl_fw_bcast_filter filter = {};</div><div class='del'>-	struct iwl_bcast_filter_cmd cmd;</div><div class='del'>-	u32 filter_id, attr_id, mask, value;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (sscanf(buf, "%d %hhi %hhi %n", &amp;filter_id, &amp;filter.discard,</div><div class='del'>-		   &amp;filter.frame_type, &amp;pos) != 3)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (filter_id &gt;= ARRAY_SIZE(mvm-&gt;dbgfs_bcast_filtering.cmd.filters) ||</div><div class='del'>-	    filter.frame_type &gt; BCAST_FILTER_FRAME_TYPE_IPV4)</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	for (attr_id = 0; attr_id &lt; ARRAY_SIZE(filter.attrs);</div><div class='del'>-	     attr_id++) {</div><div class='del'>-		struct iwl_fw_bcast_filter_attr *attr =</div><div class='del'>-				&amp;filter.attrs[attr_id];</div><div class='add'>+	ret = real(link_sta, mvmsta, mvm, mvm_link_sta, buf, buf_size, ppos);</div><div class='ctx'> </div><div class='del'>-		if (pos &gt;= count)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (sscanf(&amp;buf[pos], "%hhi %hhi %i %i %n",</div><div class='del'>-			   &amp;attr-&gt;offset, &amp;attr-&gt;offset_type,</div><div class='del'>-			   &amp;mask, &amp;value, &amp;next_pos) != 4)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		attr-&gt;mask = cpu_to_be32(mask);</div><div class='del'>-		attr-&gt;val = cpu_to_be32(value);</div><div class='del'>-		if (mask)</div><div class='del'>-			filter.num_attrs++;</div><div class='del'>-</div><div class='del'>-		pos += next_pos;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	memcpy(&amp;mvm-&gt;dbgfs_bcast_filtering.cmd.filters[filter_id],</div><div class='del'>-	       &amp;filter, sizeof(filter));</div><div class='del'>-</div><div class='del'>-	/* send updated bcast filtering configuration */</div><div class='del'>-	if (iwl_mvm_firmware_running(mvm) &amp;&amp;</div><div class='del'>-	    mvm-&gt;dbgfs_bcast_filtering.override &amp;&amp;</div><div class='del'>-	    iwl_mvm_bcast_filter_build_cmd(mvm, &amp;cmd))</div><div class='del'>-		err = iwl_mvm_send_cmd_pdu(mvm, BCAST_FILTER_CMD, 0,</div><div class='del'>-					   sizeof(cmd), &amp;cmd);</div><div class='ctx'> 	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	return err ?: count;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t iwl_dbgfs_bcast_filters_macs_read(struct file *file,</div><div class='del'>-						 char __user *user_buf,</div><div class='del'>-						 size_t count, loff_t *ppos)</div><div class='add'>+static ssize_t</div><div class='add'>+_iwl_dbgfs_link_sta_wrap_read(ssize_t (*real)(struct ieee80211_link_sta *,</div><div class='add'>+					      struct iwl_mvm_sta *,</div><div class='add'>+					      struct iwl_mvm *,</div><div class='add'>+					      struct iwl_mvm_link_sta *,</div><div class='add'>+					      char __user *,</div><div class='add'>+					      size_t, loff_t *),</div><div class='add'>+			   struct file *file,</div><div class='add'>+			   char __user *user_buf, size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm *mvm = file-&gt;private_data;</div><div class='del'>-	struct iwl_bcast_filter_cmd cmd;</div><div class='del'>-	char *buf;</div><div class='del'>-	int bufsz = 1024;</div><div class='del'>-	int i, pos = 0;</div><div class='add'>+	struct ieee80211_link_sta *link_sta = file-&gt;private_data;</div><div class='add'>+	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(link_sta-&gt;sta);</div><div class='add'>+	struct iwl_mvm *mvm = iwl_mvm_vif_from_mac80211(mvmsta-&gt;vif)-&gt;mvm;</div><div class='add'>+	struct iwl_mvm_link_sta *mvm_link_sta;</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='del'>-	if (!buf)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='ctx'> 	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	if (!iwl_mvm_bcast_filter_build_cmd(mvm, &amp;cmd)) {</div><div class='del'>-		ADD_TEXT("None\n");</div><div class='add'>+</div><div class='add'>+	mvm_link_sta = rcu_dereference_protected(mvmsta-&gt;link[link_sta-&gt;link_id],</div><div class='add'>+						 lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+	if (WARN_ON(!mvm_link_sta)) {</div><div class='ctx'> 		mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-		goto out;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(cmd.macs); i++) {</div><div class='del'>-		const struct iwl_fw_bcast_mac *mac = &amp;cmd.macs[i];</div><div class='add'>+	ret = real(link_sta, mvmsta, mvm, mvm_link_sta, user_buf, count, ppos);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-		ADD_TEXT("Mac [%d]: discard=%d attached_filters=0x%x\n",</div><div class='del'>-			 i, mac-&gt;default_discard, mac-&gt;attached_filters);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-	kfree(buf);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t iwl_dbgfs_bcast_filters_macs_write(struct iwl_mvm *mvm,</div><div class='del'>-						  char *buf, size_t count,</div><div class='del'>-						  loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_bcast_filter_cmd cmd;</div><div class='del'>-	struct iwl_fw_bcast_mac mac = {};</div><div class='del'>-	u32 mac_id, attached_filters;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (!mvm-&gt;bcast_filters)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='del'>-	if (sscanf(buf, "%d %hhi %i", &amp;mac_id, &amp;mac.default_discard,</div><div class='del'>-		   &amp;attached_filters) != 3)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (mac_id &gt;= ARRAY_SIZE(cmd.macs) ||</div><div class='del'>-	    mac.default_discard &gt; 1 ||</div><div class='del'>-	    attached_filters &gt;= BIT(ARRAY_SIZE(cmd.filters)))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	mac.attached_filters = cpu_to_le16(attached_filters);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	memcpy(&amp;mvm-&gt;dbgfs_bcast_filtering.cmd.macs[mac_id],</div><div class='del'>-	       &amp;mac, sizeof(mac));</div><div class='del'>-</div><div class='del'>-	/* send updated bcast filtering configuration */</div><div class='del'>-	if (iwl_mvm_firmware_running(mvm) &amp;&amp;</div><div class='del'>-	    mvm-&gt;dbgfs_bcast_filtering.override &amp;&amp;</div><div class='del'>-	    iwl_mvm_bcast_filter_build_cmd(mvm, &amp;cmd))</div><div class='del'>-		err = iwl_mvm_send_cmd_pdu(mvm, BCAST_FILTER_CMD, 0,</div><div class='del'>-					   sizeof(cmd), &amp;cmd);</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	return err ?: count;</div><div class='add'>+#define MVM_DEBUGFS_LINK_STA_WRITE_WRAPPER(name, buflen)		\</div><div class='add'>+static ssize_t _iwl_dbgfs_link_sta_##name##_write(struct file *file,	\</div><div class='add'>+					 const char __user *user_buf,	\</div><div class='add'>+					 size_t count, loff_t *ppos)	\</div><div class='add'>+{									\</div><div class='add'>+	char buf[buflen] = {};						\</div><div class='add'>+	size_t buf_size = min(count, sizeof(buf) -  1);			\</div><div class='add'>+									\</div><div class='add'>+	if (copy_from_user(buf, user_buf, buf_size))			\</div><div class='add'>+		return -EFAULT;						\</div><div class='add'>+									\</div><div class='add'>+	return _iwl_dbgfs_link_sta_wrap_write(iwl_dbgfs_##name##_write,	\</div><div class='add'>+					      file,			\</div><div class='add'>+					      buf, buf_size, ppos);	\</div><div class='add'>+}									\</div><div class='add'>+</div><div class='add'>+#define MVM_DEBUGFS_LINK_STA_READ_WRAPPER(name)		\</div><div class='add'>+static ssize_t _iwl_dbgfs_link_sta_##name##_read(struct file *file,	\</div><div class='add'>+					 char __user *user_buf,		\</div><div class='add'>+					 size_t count, loff_t *ppos)	\</div><div class='add'>+{									\</div><div class='add'>+	return _iwl_dbgfs_link_sta_wrap_read(iwl_dbgfs_##name##_read,	\</div><div class='add'>+					     file,			\</div><div class='add'>+					     user_buf, count, ppos);	\</div><div class='add'>+}									\</div><div class='add'>+</div><div class='add'>+#define MVM_DEBUGFS_WRITE_LINK_STA_FILE_OPS(name, bufsz)		\</div><div class='add'>+MVM_DEBUGFS_LINK_STA_WRITE_WRAPPER(name, bufsz)				\</div><div class='add'>+static const struct file_operations iwl_dbgfs_link_sta_##name##_ops = {	\</div><div class='add'>+	.write = _iwl_dbgfs_link_sta_##name##_write,			\</div><div class='add'>+	.open = simple_open,						\</div><div class='add'>+	.llseek = generic_file_llseek,					\</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-#define MVM_DEBUGFS_WRITE_FILE_OPS(name, bufsz) \</div><div class='del'>-	_MVM_DEBUGFS_WRITE_FILE_OPS(name, bufsz, struct iwl_mvm)</div><div class='del'>-#define MVM_DEBUGFS_READ_WRITE_FILE_OPS(name, bufsz) \</div><div class='del'>-	_MVM_DEBUGFS_READ_WRITE_FILE_OPS(name, bufsz, struct iwl_mvm)</div><div class='del'>-#define MVM_DEBUGFS_ADD_FILE_ALIAS(alias, name, parent, mode) do {	\</div><div class='del'>-		debugfs_create_file(alias, mode, parent, mvm,		\</div><div class='del'>-				    &amp;iwl_dbgfs_##name##_ops);		\</div><div class='del'>-	} while (0)</div><div class='del'>-#define MVM_DEBUGFS_ADD_FILE(name, parent, mode) \</div><div class='del'>-	MVM_DEBUGFS_ADD_FILE_ALIAS(#name, name, parent, mode)</div><div class='add'>+#define MVM_DEBUGFS_READ_LINK_STA_FILE_OPS(name)			\</div><div class='add'>+MVM_DEBUGFS_LINK_STA_READ_WRAPPER(name)					\</div><div class='add'>+static const struct file_operations iwl_dbgfs_link_sta_##name##_ops = {	\</div><div class='add'>+	.read = _iwl_dbgfs_link_sta_##name##_read,			\</div><div class='add'>+	.open = simple_open,						\</div><div class='add'>+	.llseek = generic_file_llseek,					\</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#define MVM_DEBUGFS_WRITE_STA_FILE_OPS(name, bufsz) \</div><div class='del'>-	_MVM_DEBUGFS_WRITE_FILE_OPS(name, bufsz, struct ieee80211_sta)</div><div class='del'>-#define MVM_DEBUGFS_READ_WRITE_STA_FILE_OPS(name, bufsz) \</div><div class='del'>-	_MVM_DEBUGFS_READ_WRITE_FILE_OPS(name, bufsz, struct ieee80211_sta)</div><div class='add'>+#define MVM_DEBUGFS_READ_WRITE_LINK_STA_FILE_OPS(name, bufsz)		\</div><div class='add'>+MVM_DEBUGFS_LINK_STA_READ_WRAPPER(name)					\</div><div class='add'>+MVM_DEBUGFS_LINK_STA_WRITE_WRAPPER(name, bufsz)				\</div><div class='add'>+static const struct file_operations iwl_dbgfs_link_sta_##name##_ops = {	\</div><div class='add'>+	.read = _iwl_dbgfs_link_sta_##name##_read,			\</div><div class='add'>+	.write = _iwl_dbgfs_link_sta_##name##_write,			\</div><div class='add'>+	.open = simple_open,						\</div><div class='add'>+	.llseek = generic_file_llseek,					\</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#define MVM_DEBUGFS_ADD_STA_FILE_ALIAS(alias, name, parent, mode) do {	\</div><div class='del'>-		debugfs_create_file(alias, mode, parent, sta,		\</div><div class='del'>-				    &amp;iwl_dbgfs_##name##_ops);		\</div><div class='del'>-	} while (0)</div><div class='del'>-#define MVM_DEBUGFS_ADD_STA_FILE(name, parent, mode) \</div><div class='del'>-	MVM_DEBUGFS_ADD_STA_FILE_ALIAS(#name, name, parent, mode)</div><div class='add'>+#define MVM_DEBUGFS_ADD_LINK_STA_FILE_ALIAS(alias, name, parent, mode)	\</div><div class='add'>+		debugfs_create_file(alias, mode, parent, link_sta,	\</div><div class='add'>+				    &amp;iwl_dbgfs_link_sta_##name##_ops)</div><div class='add'>+#define MVM_DEBUGFS_ADD_LINK_STA_FILE(name, parent, mode) \</div><div class='add'>+	MVM_DEBUGFS_ADD_LINK_STA_FILE_ALIAS(#name, name, parent, mode)</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> iwl_dbgfs_prph_reg_read(struct file *file,</div><div class='hunk'>@@ -1657,7 +1722,7 @@ iwl_dbgfs_he_sniffer_params_write(struct iwl_mvm *mvm, char *buf,</div><div class='ctx'> 		.mvm = mvm,</div><div class='ctx'> 	};</div><div class='ctx'> 	u16 wait_cmds[] = {</div><div class='del'>-		iwl_cmd_id(HE_AIR_SNIFFER_CONFIG_CMD, DATA_PATH_GROUP, 0),</div><div class='add'>+		WIDE_ID(DATA_PATH_GROUP, HE_AIR_SNIFFER_CONFIG_CMD),</div><div class='ctx'> 	};</div><div class='ctx'> 	u32 aid;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1692,8 +1757,9 @@ iwl_dbgfs_he_sniffer_params_write(struct iwl_mvm *mvm, char *buf,</div><div class='ctx'> 				   wait_cmds, ARRAY_SIZE(wait_cmds),</div><div class='ctx'> 				   iwl_mvm_sniffer_apply, &amp;apply);</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_send_cmd_pdu(mvm, iwl_cmd_id(HE_AIR_SNIFFER_CONFIG_CMD,</div><div class='del'>-						   DATA_PATH_GROUP, 0), 0,</div><div class='add'>+	ret = iwl_mvm_send_cmd_pdu(mvm,</div><div class='add'>+				   WIDE_ID(DATA_PATH_GROUP, HE_AIR_SNIFFER_CONFIG_CMD),</div><div class='add'>+				   0,</div><div class='ctx'> 				   sizeof(he_mon_cmd), &amp;he_mon_cmd);</div><div class='ctx'> </div><div class='ctx'> 	/* no need to really wait, we already did anyway */</div><div class='hunk'>@@ -1845,29 +1911,26 @@ MVM_DEBUGFS_READ_WRITE_FILE_OPS(prph_reg, 64);</div><div class='ctx'> /* Device wide debugfs entries */</div><div class='ctx'> MVM_DEBUGFS_READ_FILE_OPS(ctdp_budget);</div><div class='ctx'> MVM_DEBUGFS_WRITE_FILE_OPS(stop_ctdp, 8);</div><div class='add'>+MVM_DEBUGFS_WRITE_FILE_OPS(start_ctdp, 8);</div><div class='ctx'> MVM_DEBUGFS_WRITE_FILE_OPS(force_ctkill, 8);</div><div class='ctx'> MVM_DEBUGFS_WRITE_FILE_OPS(tx_flush, 16);</div><div class='del'>-MVM_DEBUGFS_WRITE_FILE_OPS(sta_drain, 8);</div><div class='ctx'> MVM_DEBUGFS_WRITE_FILE_OPS(send_echo_cmd, 8);</div><div class='ctx'> MVM_DEBUGFS_READ_WRITE_FILE_OPS(sram, 64);</div><div class='ctx'> MVM_DEBUGFS_READ_WRITE_FILE_OPS(set_nic_temperature, 64);</div><div class='ctx'> MVM_DEBUGFS_READ_FILE_OPS(nic_temp);</div><div class='ctx'> MVM_DEBUGFS_READ_FILE_OPS(stations);</div><div class='del'>-MVM_DEBUGFS_READ_FILE_OPS(rs_data);</div><div class='del'>-MVM_DEBUGFS_READ_FILE_OPS(bt_notif);</div><div class='del'>-MVM_DEBUGFS_READ_FILE_OPS(bt_cmd);</div><div class='add'>+MVM_DEBUGFS_READ_LINK_STA_FILE_OPS(rs_data);</div><div class='ctx'> MVM_DEBUGFS_READ_WRITE_FILE_OPS(disable_power_off, 64);</div><div class='ctx'> MVM_DEBUGFS_READ_FILE_OPS(fw_rx_stats);</div><div class='ctx'> MVM_DEBUGFS_READ_FILE_OPS(drv_rx_stats);</div><div class='del'>-MVM_DEBUGFS_READ_FILE_OPS(fw_ver);</div><div class='add'>+MVM_DEBUGFS_READ_FILE_OPS(fw_system_stats);</div><div class='ctx'> MVM_DEBUGFS_READ_FILE_OPS(phy_integration_ver);</div><div class='add'>+MVM_DEBUGFS_READ_FILE_OPS(tas_get_status);</div><div class='ctx'> MVM_DEBUGFS_WRITE_FILE_OPS(fw_restart, 10);</div><div class='ctx'> MVM_DEBUGFS_WRITE_FILE_OPS(fw_nmi, 10);</div><div class='del'>-MVM_DEBUGFS_WRITE_FILE_OPS(bt_tx_prio, 10);</div><div class='del'>-MVM_DEBUGFS_WRITE_FILE_OPS(bt_force_ant, 10);</div><div class='ctx'> MVM_DEBUGFS_READ_WRITE_FILE_OPS(scan_ant_rxchain, 8);</div><div class='ctx'> MVM_DEBUGFS_READ_WRITE_FILE_OPS(fw_dbg_conf, 8);</div><div class='del'>-MVM_DEBUGFS_WRITE_FILE_OPS(fw_dbg_collect, 64);</div><div class='add'>+MVM_DEBUGFS_WRITE_FILE_OPS(fw_dbg_clear, 64);</div><div class='ctx'> MVM_DEBUGFS_WRITE_FILE_OPS(dbg_time_point, 64);</div><div class='ctx'> MVM_DEBUGFS_WRITE_FILE_OPS(indirection_tbl,</div><div class='ctx'> 			   (IWL_RSS_INDIRECTION_TABLE_SIZE * 2));</div><div class='hunk'>@@ -1877,16 +1940,12 @@ MVM_DEBUGFS_WRITE_FILE_OPS(inject_beacon_ie_restore, 512);</div><div class='ctx'> </div><div class='ctx'> MVM_DEBUGFS_READ_FILE_OPS(uapsd_noagg_bssids);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IWLWIFI_BCAST_FILTERING</div><div class='del'>-MVM_DEBUGFS_READ_WRITE_FILE_OPS(bcast_filters, 256);</div><div class='del'>-MVM_DEBUGFS_READ_WRITE_FILE_OPS(bcast_filters_macs, 256);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='ctx'> MVM_DEBUGFS_READ_FILE_OPS(sar_geo_profile);</div><div class='add'>+MVM_DEBUGFS_READ_FILE_OPS(wifi_6e_enable);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-MVM_DEBUGFS_READ_WRITE_STA_FILE_OPS(amsdu_len, 16);</div><div class='add'>+MVM_DEBUGFS_READ_WRITE_LINK_STA_FILE_OPS(amsdu_len, 16);</div><div class='ctx'> </div><div class='ctx'> MVM_DEBUGFS_READ_WRITE_FILE_OPS(he_sniffer_params, 32);</div><div class='ctx'> </div><div class='hunk'>@@ -1910,8 +1969,7 @@ static ssize_t iwl_dbgfs_mem_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 	if (!iwl_mvm_firmware_running(mvm))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	hcmd.id = iwl_cmd_id(*ppos &gt;&gt; 24 ? UMAC_RD_WR : LMAC_RD_WR,</div><div class='del'>-			     DEBUG_GROUP, 0);</div><div class='add'>+	hcmd.id = WIDE_ID(DEBUG_GROUP, *ppos &gt;&gt; 24 ? UMAC_RD_WR : LMAC_RD_WR);</div><div class='ctx'> 	cmd.op = cpu_to_le32(DEBUG_MEM_OP_READ);</div><div class='ctx'> </div><div class='ctx'> 	/* Take care of alignment of both the position and the length */</div><div class='hunk'>@@ -1927,6 +1985,11 @@ static ssize_t iwl_dbgfs_mem_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	if (iwl_rx_packet_payload_len(hcmd.resp_pkt) &lt; sizeof(*rsp)) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rsp = (void *)hcmd.resp_pkt-&gt;data;</div><div class='ctx'> 	if (le32_to_cpu(rsp-&gt;status) != DEBUG_MEM_STATUS_SUCCESS) {</div><div class='ctx'> 		ret = -ENXIO;</div><div class='hunk'>@@ -1941,7 +2004,7 @@ static ssize_t iwl_dbgfs_mem_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = len - copy_to_user(user_buf, (void *)rsp-&gt;data + delta, len);</div><div class='add'>+	ret = len - copy_to_user(user_buf, (u8 *)rsp-&gt;data + delta, len);</div><div class='ctx'> 	*ppos += ret;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -1965,8 +2028,7 @@ static ssize_t iwl_dbgfs_mem_write(struct file *file,</div><div class='ctx'> 	if (!iwl_mvm_firmware_running(mvm))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	hcmd.id = iwl_cmd_id(*ppos &gt;&gt; 24 ? UMAC_RD_WR : LMAC_RD_WR,</div><div class='del'>-			     DEBUG_GROUP, 0);</div><div class='add'>+	hcmd.id = WIDE_ID(DEBUG_GROUP, *ppos &gt;&gt; 24 ? UMAC_RD_WR : LMAC_RD_WR);</div><div class='ctx'> </div><div class='ctx'> 	if (*ppos &amp; 0x3 || count &lt; 4) {</div><div class='ctx'> 		op = DEBUG_MEM_OP_WRITE_BYTES;</div><div class='hunk'>@@ -2004,6 +2066,11 @@ static ssize_t iwl_dbgfs_mem_write(struct file *file,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	if (iwl_rx_packet_payload_len(hcmd.resp_pkt) &lt; sizeof(*rsp)) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rsp = (void *)hcmd.resp_pkt-&gt;data;</div><div class='ctx'> 	if (rsp-&gt;status != DEBUG_MEM_STATUS_SUCCESS) {</div><div class='ctx'> 		ret = -ENXIO;</div><div class='hunk'>@@ -2025,49 +2092,46 @@ static const struct file_operations iwl_dbgfs_mem_ops = {</div><div class='ctx'> 	.llseek = default_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void iwl_mvm_sta_add_debugfs(struct ieee80211_hw *hw,</div><div class='del'>-			     struct ieee80211_vif *vif,</div><div class='del'>-			     struct ieee80211_sta *sta,</div><div class='del'>-			     struct dentry *dir)</div><div class='add'>+void iwl_mvm_link_sta_add_debugfs(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  struct ieee80211_link_sta *link_sta,</div><div class='add'>+				  struct dentry *dir)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_mvm_has_tlc_offload(mvm)) {</div><div class='del'>-		MVM_DEBUGFS_ADD_STA_FILE(rs_data, dir, 0400);</div><div class='add'>+		MVM_DEBUGFS_ADD_LINK_STA_FILE(rs_data, dir, 0400);</div><div class='ctx'> 	}</div><div class='del'>-	MVM_DEBUGFS_ADD_STA_FILE(amsdu_len, dir, 0600);</div><div class='add'>+</div><div class='add'>+	MVM_DEBUGFS_ADD_LINK_STA_FILE(amsdu_len, dir, 0600);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_dbgfs_register(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *bcast_dir __maybe_unused;</div><div class='del'>-	char buf[100];</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;mvm-&gt;drv_stats_lock);</div><div class='ctx'> </div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(tx_flush, mvm-&gt;debugfs_dir, 0200);</div><div class='del'>-	MVM_DEBUGFS_ADD_FILE(sta_drain, mvm-&gt;debugfs_dir, 0200);</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(sram, mvm-&gt;debugfs_dir, 0600);</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(set_nic_temperature, mvm-&gt;debugfs_dir, 0600);</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(nic_temp, mvm-&gt;debugfs_dir, 0400);</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(ctdp_budget, mvm-&gt;debugfs_dir, 0400);</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(stop_ctdp, mvm-&gt;debugfs_dir, 0200);</div><div class='add'>+	MVM_DEBUGFS_ADD_FILE(start_ctdp, mvm-&gt;debugfs_dir, 0200);</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(force_ctkill, mvm-&gt;debugfs_dir, 0200);</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(stations, mvm-&gt;debugfs_dir, 0400);</div><div class='del'>-	MVM_DEBUGFS_ADD_FILE(bt_notif, mvm-&gt;debugfs_dir, 0400);</div><div class='del'>-	MVM_DEBUGFS_ADD_FILE(bt_cmd, mvm-&gt;debugfs_dir, 0400);</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(disable_power_off, mvm-&gt;debugfs_dir, 0600);</div><div class='del'>-	MVM_DEBUGFS_ADD_FILE(fw_ver, mvm-&gt;debugfs_dir, 0400);</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(fw_rx_stats, mvm-&gt;debugfs_dir, 0400);</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(drv_rx_stats, mvm-&gt;debugfs_dir, 0400);</div><div class='add'>+	MVM_DEBUGFS_ADD_FILE(fw_system_stats, mvm-&gt;debugfs_dir, 0400);</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(fw_restart, mvm-&gt;debugfs_dir, 0200);</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(fw_nmi, mvm-&gt;debugfs_dir, 0200);</div><div class='del'>-	MVM_DEBUGFS_ADD_FILE(bt_tx_prio, mvm-&gt;debugfs_dir, 0200);</div><div class='del'>-	MVM_DEBUGFS_ADD_FILE(bt_force_ant, mvm-&gt;debugfs_dir, 0200);</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(scan_ant_rxchain, mvm-&gt;debugfs_dir, 0600);</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(prph_reg, mvm-&gt;debugfs_dir, 0600);</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(fw_dbg_conf, mvm-&gt;debugfs_dir, 0600);</div><div class='del'>-	MVM_DEBUGFS_ADD_FILE(fw_dbg_collect, mvm-&gt;debugfs_dir, 0200);</div><div class='add'>+	MVM_DEBUGFS_ADD_FILE(fw_dbg_clear, mvm-&gt;debugfs_dir, 0200);</div><div class='add'>+	MVM_DEBUGFS_ADD_FILE(dbg_time_point, mvm-&gt;debugfs_dir, 0200);</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(send_echo_cmd, mvm-&gt;debugfs_dir, 0200);</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(indirection_tbl, mvm-&gt;debugfs_dir, 0200);</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(inject_packet, mvm-&gt;debugfs_dir, 0200);</div><div class='hunk'>@@ -2077,8 +2141,10 @@ void iwl_mvm_dbgfs_register(struct iwl_mvm *mvm)</div><div class='ctx'> </div><div class='ctx'> 	if (mvm-&gt;fw-&gt;phy_integration_ver)</div><div class='ctx'> 		MVM_DEBUGFS_ADD_FILE(phy_integration_ver, mvm-&gt;debugfs_dir, 0400);</div><div class='add'>+	MVM_DEBUGFS_ADD_FILE(tas_get_status, mvm-&gt;debugfs_dir, 0400);</div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(sar_geo_profile, mvm-&gt;debugfs_dir, 0400);</div><div class='add'>+	MVM_DEBUGFS_ADD_FILE(wifi_6e_enable, mvm-&gt;debugfs_dir, 0400);</div><div class='ctx'> #endif</div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(he_sniffer_params, mvm-&gt;debugfs_dir, 0600);</div><div class='ctx'> </div><div class='hunk'>@@ -2092,23 +2158,7 @@ void iwl_mvm_dbgfs_register(struct iwl_mvm *mvm)</div><div class='ctx'> </div><div class='ctx'> 	MVM_DEBUGFS_ADD_FILE(uapsd_noagg_bssids, mvm-&gt;debugfs_dir, S_IRUSR);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IWLWIFI_BCAST_FILTERING</div><div class='del'>-	if (mvm-&gt;fw-&gt;ucode_capa.flags &amp; IWL_UCODE_TLV_FLAGS_BCAST_FILTERING) {</div><div class='del'>-		bcast_dir = debugfs_create_dir("bcast_filtering",</div><div class='del'>-					       mvm-&gt;debugfs_dir);</div><div class='del'>-</div><div class='del'>-		debugfs_create_bool("override", 0600, bcast_dir,</div><div class='del'>-				    &amp;mvm-&gt;dbgfs_bcast_filtering.override);</div><div class='del'>-</div><div class='del'>-		MVM_DEBUGFS_ADD_FILE_ALIAS("filters", bcast_filters,</div><div class='del'>-					   bcast_dir, 0600);</div><div class='del'>-		MVM_DEBUGFS_ADD_FILE_ALIAS("macs", bcast_filters_macs,</div><div class='del'>-					   bcast_dir, 0600);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='del'>-	MVM_DEBUGFS_ADD_FILE(d3_test, mvm-&gt;debugfs_dir, 0400);</div><div class='ctx'> 	debugfs_create_bool("d3_wake_sysassert", 0600, mvm-&gt;debugfs_dir,</div><div class='ctx'> 			    &amp;mvm-&gt;d3_wake_sysassert);</div><div class='ctx'> 	debugfs_create_u32("last_netdetect_scans", 0400, mvm-&gt;debugfs_dir,</div><div class='hunk'>@@ -2133,10 +2183,18 @@ void iwl_mvm_dbgfs_register(struct iwl_mvm *mvm)</div><div class='ctx'> 	debugfs_create_file("mem", 0600, mvm-&gt;debugfs_dir, mvm,</div><div class='ctx'> 			    &amp;iwl_dbgfs_mem_ops);</div><div class='ctx'> </div><div class='add'>+	debugfs_create_bool("rx_ts_ptp", 0600, mvm-&gt;debugfs_dir,</div><div class='add'>+			    &amp;mvm-&gt;rx_ts_ptp);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Create a symlink with mac80211. It will be removed when mac80211</div><div class='ctx'> 	 * exists (before the opmode exists which removes the target.)</div><div class='ctx'> 	 */</div><div class='del'>-	snprintf(buf, 100, "../../%pd2", mvm-&gt;debugfs_dir-&gt;d_parent);</div><div class='del'>-	debugfs_create_symlink("iwlwifi", mvm-&gt;hw-&gt;wiphy-&gt;debugfsdir, buf);</div><div class='add'>+	if (!IS_ERR(mvm-&gt;debugfs_dir)) {</div><div class='add'>+		char buf[100];</div><div class='add'>+</div><div class='add'>+		snprintf(buf, 100, "../../%pd2", mvm-&gt;debugfs_dir-&gt;d_parent);</div><div class='add'>+		debugfs_create_symlink("iwlwifi", mvm-&gt;hw-&gt;wiphy-&gt;debugfsdir,</div><div class='add'>+				       buf);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.h b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.h<br/>index 0711ab689c48..cc2c45b45ddc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/debugfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/debugfs.h</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (C) 2023 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2012-2014 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2014 Intel Mobile Communications GmbH</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c<br/>index a456b8a0ae58..a493ef6bedc3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2018-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/math64.h&gt;</div><div class='hunk'>@@ -25,6 +25,10 @@ struct iwl_mvm_smooth_entry {</div><div class='ctx'> 	u64 host_time;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum iwl_mvm_pasn_flags {</div><div class='add'>+	IWL_MVM_PASN_FLAG_HAS_HLTK = BIT(0),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct iwl_mvm_ftm_pasn_entry {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	u8 addr[ETH_ALEN];</div><div class='hunk'>@@ -33,87 +37,14 @@ struct iwl_mvm_ftm_pasn_entry {</div><div class='ctx'> 	u8 cipher;</div><div class='ctx'> 	u8 tx_pn[IEEE80211_CCMP_PN_LEN];</div><div class='ctx'> 	u8 rx_pn[IEEE80211_CCMP_PN_LEN];</div><div class='add'>+	u32 flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int iwl_mvm_ftm_add_pasn_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='del'>-			     u8 *addr, u32 cipher, u8 *tk, u32 tk_len,</div><div class='del'>-			     u8 *hltk, u32 hltk_len)</div><div class='del'>-{</div><div class='del'>-	struct iwl_mvm_ftm_pasn_entry *pasn = kzalloc(sizeof(*pasn),</div><div class='del'>-						      GFP_KERNEL);</div><div class='del'>-	u32 expected_tk_len;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (!pasn)</div><div class='del'>-		return -ENOBUFS;</div><div class='del'>-</div><div class='del'>-	pasn-&gt;cipher = iwl_mvm_cipher_to_location_cipher(cipher);</div><div class='del'>-</div><div class='del'>-	switch (pasn-&gt;cipher) {</div><div class='del'>-	case IWL_LOCATION_CIPHER_CCMP_128:</div><div class='del'>-	case IWL_LOCATION_CIPHER_GCMP_128:</div><div class='del'>-		expected_tk_len = WLAN_KEY_LEN_CCMP;</div><div class='del'>-		break;</div><div class='del'>-	case IWL_LOCATION_CIPHER_GCMP_256:</div><div class='del'>-		expected_tk_len = WLAN_KEY_LEN_GCMP_256;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If associated to this AP and already have security context,</div><div class='del'>-	 * the TK is already configured for this station, so it</div><div class='del'>-	 * shouldn't be set again here.</div><div class='del'>-	 */</div><div class='del'>-	if (vif-&gt;bss_conf.assoc &amp;&amp;</div><div class='del'>-	    !memcmp(addr, vif-&gt;bss_conf.bssid, ETH_ALEN)) {</div><div class='del'>-		struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-		struct ieee80211_sta *sta;</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		sta = rcu_dereference(mvm-&gt;fw_id_to_mac_id[mvmvif-&gt;ap_sta_id]);</div><div class='del'>-		if (!IS_ERR_OR_NULL(sta) &amp;&amp; sta-&gt;mfp)</div><div class='del'>-			expected_tk_len = 0;</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tk_len != expected_tk_len || hltk_len != sizeof(pasn-&gt;hltk)) {</div><div class='del'>-		IWL_ERR(mvm, "Invalid key length: tk_len=%u hltk_len=%u\n",</div><div class='del'>-			tk_len, hltk_len);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(pasn-&gt;addr, addr, sizeof(pasn-&gt;addr));</div><div class='del'>-	memcpy(pasn-&gt;hltk, hltk, sizeof(pasn-&gt;hltk));</div><div class='del'>-</div><div class='del'>-	if (tk &amp;&amp; tk_len)</div><div class='del'>-		memcpy(pasn-&gt;tk, tk, sizeof(pasn-&gt;tk));</div><div class='del'>-</div><div class='del'>-	list_add_tail(&amp;pasn-&gt;list, &amp;mvm-&gt;ftm_initiator.pasn_list);</div><div class='del'>-	return 0;</div><div class='del'>-out:</div><div class='del'>-	kfree(pasn);</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_mvm_ftm_remove_pasn_sta(struct iwl_mvm *mvm, u8 *addr)</div><div class='del'>-{</div><div class='del'>-	struct iwl_mvm_ftm_pasn_entry *entry, *prev;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(entry, prev, &amp;mvm-&gt;ftm_initiator.pasn_list,</div><div class='del'>-				 list) {</div><div class='del'>-		if (memcmp(entry-&gt;addr, addr, sizeof(entry-&gt;addr)))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		list_del(&amp;entry-&gt;list);</div><div class='del'>-		kfree(entry);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+struct iwl_mvm_ftm_iter_data {</div><div class='add'>+	u8 *cipher;</div><div class='add'>+	u8 *bssid;</div><div class='add'>+	u8 *tk;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_ftm_reset(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='hunk'>@@ -222,7 +153,7 @@ static void iwl_mvm_ftm_cmd_v5(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='ctx'> 		cmd-&gt;macaddr_mask[i] = ~req-&gt;mac_addr_mask[i];</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;bss_conf.assoc)</div><div class='add'>+	if (vif-&gt;cfg.assoc)</div><div class='ctx'> 		memcpy(cmd-&gt;range_req_bssid, vif-&gt;bss_conf.bssid, ETH_ALEN);</div><div class='ctx'> 	else</div><div class='ctx'> 		eth_broadcast_addr(cmd-&gt;range_req_bssid);</div><div class='hunk'>@@ -254,7 +185,7 @@ static void iwl_mvm_ftm_cmd_common(struct iwl_mvm *mvm,</div><div class='ctx'> 	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='ctx'> 		cmd-&gt;macaddr_mask[i] = ~req-&gt;mac_addr_mask[i];</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;bss_conf.assoc) {</div><div class='add'>+	if (vif-&gt;cfg.assoc) {</div><div class='ctx'> 		memcpy(cmd-&gt;range_req_bssid, vif-&gt;bss_conf.bssid, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 		/* AP's TSF is only relevant if associated */</div><div class='hunk'>@@ -324,6 +255,7 @@ iwl_mvm_ftm_target_chandef_v2(struct iwl_mvm *mvm,</div><div class='ctx'> 			      u8 *ctrl_ch_position)</div><div class='ctx'> {</div><div class='ctx'> 	u32 freq = peer-&gt;chandef.chan-&gt;center_freq;</div><div class='add'>+	u8 cmd_ver;</div><div class='ctx'> </div><div class='ctx'> 	*channel = ieee80211_frequency_to_channel(freq);</div><div class='ctx'> </div><div class='hunk'>@@ -344,6 +276,17 @@ iwl_mvm_ftm_target_chandef_v2(struct iwl_mvm *mvm,</div><div class='ctx'> 		*format_bw = IWL_LOCATION_FRAME_FORMAT_VHT;</div><div class='ctx'> 		*format_bw |= IWL_LOCATION_BW_80MHZ &lt;&lt; LOCATION_BW_POS;</div><div class='ctx'> 		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_160:</div><div class='add'>+		cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw,</div><div class='add'>+						WIDE_ID(LOCATION_GROUP, TOF_RANGE_REQ_CMD),</div><div class='add'>+						IWL_FW_CMD_VER_UNKNOWN);</div><div class='add'>+</div><div class='add'>+		if (cmd_ver &gt;= 13) {</div><div class='add'>+			*format_bw = IWL_LOCATION_FRAME_FORMAT_HE;</div><div class='add'>+			*format_bw |= IWL_LOCATION_BW_160MHZ &lt;&lt; LOCATION_BW_POS;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	default:</div><div class='ctx'> 		IWL_ERR(mvm, "Unsupported BW in FTM request (%d)\n",</div><div class='ctx'> 			peer-&gt;chandef.width);</div><div class='hunk'>@@ -393,43 +336,55 @@ iwl_mvm_ftm_put_target_v2(struct iwl_mvm *mvm,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define FTM_PUT_FLAG(flag)	(target-&gt;initiator_ap_flags |= \</div><div class='add'>+#define FTM_SET_FLAG(flag)	(*flags |= \</div><div class='ctx'> 				 cpu_to_le32(IWL_INITIATOR_AP_FLAGS_##flag))</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-iwl_mvm_ftm_put_target_common(struct iwl_mvm *mvm,</div><div class='del'>-			      struct cfg80211_pmsr_request_peer *peer,</div><div class='del'>-			      struct iwl_tof_range_req_ap_entry_v6 *target)</div><div class='add'>+iwl_mvm_ftm_set_target_flags(struct iwl_mvm *mvm,</div><div class='add'>+			     struct cfg80211_pmsr_request_peer *peer,</div><div class='add'>+			     __le32 *flags)</div><div class='ctx'> {</div><div class='del'>-	memcpy(target-&gt;bssid, peer-&gt;addr, ETH_ALEN);</div><div class='del'>-	target-&gt;burst_period =</div><div class='del'>-		cpu_to_le16(peer-&gt;ftm.burst_period);</div><div class='del'>-	target-&gt;samples_per_burst = peer-&gt;ftm.ftms_per_burst;</div><div class='del'>-	target-&gt;num_of_bursts = peer-&gt;ftm.num_bursts_exp;</div><div class='del'>-	target-&gt;ftmr_max_retries = peer-&gt;ftm.ftmr_retries;</div><div class='del'>-	target-&gt;initiator_ap_flags = cpu_to_le32(0);</div><div class='add'>+	*flags = cpu_to_le32(0);</div><div class='ctx'> </div><div class='ctx'> 	if (peer-&gt;ftm.asap)</div><div class='del'>-		FTM_PUT_FLAG(ASAP);</div><div class='add'>+		FTM_SET_FLAG(ASAP);</div><div class='ctx'> </div><div class='ctx'> 	if (peer-&gt;ftm.request_lci)</div><div class='del'>-		FTM_PUT_FLAG(LCI_REQUEST);</div><div class='add'>+		FTM_SET_FLAG(LCI_REQUEST);</div><div class='ctx'> </div><div class='ctx'> 	if (peer-&gt;ftm.request_civicloc)</div><div class='del'>-		FTM_PUT_FLAG(CIVIC_REQUEST);</div><div class='add'>+		FTM_SET_FLAG(CIVIC_REQUEST);</div><div class='ctx'> </div><div class='ctx'> 	if (IWL_MVM_FTM_INITIATOR_DYNACK)</div><div class='del'>-		FTM_PUT_FLAG(DYN_ACK);</div><div class='add'>+		FTM_SET_FLAG(DYN_ACK);</div><div class='ctx'> </div><div class='ctx'> 	if (IWL_MVM_FTM_INITIATOR_ALGO == IWL_TOF_ALGO_TYPE_LINEAR_REG)</div><div class='del'>-		FTM_PUT_FLAG(ALGO_LR);</div><div class='add'>+		FTM_SET_FLAG(ALGO_LR);</div><div class='ctx'> 	else if (IWL_MVM_FTM_INITIATOR_ALGO == IWL_TOF_ALGO_TYPE_FFT)</div><div class='del'>-		FTM_PUT_FLAG(ALGO_FFT);</div><div class='add'>+		FTM_SET_FLAG(ALGO_FFT);</div><div class='ctx'> </div><div class='ctx'> 	if (peer-&gt;ftm.trigger_based)</div><div class='del'>-		FTM_PUT_FLAG(TB);</div><div class='add'>+		FTM_SET_FLAG(TB);</div><div class='ctx'> 	else if (peer-&gt;ftm.non_trigger_based)</div><div class='del'>-		FTM_PUT_FLAG(NON_TB);</div><div class='add'>+		FTM_SET_FLAG(NON_TB);</div><div class='add'>+</div><div class='add'>+	if ((peer-&gt;ftm.trigger_based || peer-&gt;ftm.non_trigger_based) &amp;&amp;</div><div class='add'>+	    peer-&gt;ftm.lmr_feedback)</div><div class='add'>+		FTM_SET_FLAG(LMR_FEEDBACK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mvm_ftm_put_target_common(struct iwl_mvm *mvm,</div><div class='add'>+			      struct cfg80211_pmsr_request_peer *peer,</div><div class='add'>+			      struct iwl_tof_range_req_ap_entry_v6 *target)</div><div class='add'>+{</div><div class='add'>+	memcpy(target-&gt;bssid, peer-&gt;addr, ETH_ALEN);</div><div class='add'>+	target-&gt;burst_period =</div><div class='add'>+		cpu_to_le16(peer-&gt;ftm.burst_period);</div><div class='add'>+	target-&gt;samples_per_burst = peer-&gt;ftm.ftms_per_burst;</div><div class='add'>+	target-&gt;num_of_bursts = peer-&gt;ftm.num_bursts_exp;</div><div class='add'>+	target-&gt;ftmr_max_retries = peer-&gt;ftm.ftmr_retries;</div><div class='add'>+	iwl_mvm_ftm_set_target_flags(mvm, peer, &amp;target-&gt;initiator_ap_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -472,6 +427,48 @@ iwl_mvm_ftm_put_target_v4(struct iwl_mvm *mvm,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int iwl_mvm_ftm_set_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			       struct cfg80211_pmsr_request_peer *peer,</div><div class='add'>+			       u8 *sta_id, __le32 *flags)</div><div class='add'>+{</div><div class='add'>+	if (vif-&gt;cfg.assoc) {</div><div class='add'>+		struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+		struct ieee80211_sta *sta;</div><div class='add'>+		struct ieee80211_bss_conf *link_conf;</div><div class='add'>+		unsigned int link_id;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		for_each_vif_active_link(vif, link_conf, link_id) {</div><div class='add'>+			if (memcmp(peer-&gt;addr, link_conf-&gt;bssid, ETH_ALEN))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			*sta_id = mvmvif-&gt;link[link_id]-&gt;ap_sta_id;</div><div class='add'>+			sta = rcu_dereference(mvm-&gt;fw_id_to_mac_id[*sta_id]);</div><div class='add'>+			if (WARN_ON_ONCE(IS_ERR_OR_NULL(sta))) {</div><div class='add'>+				rcu_read_unlock();</div><div class='add'>+				return PTR_ERR_OR_ZERO(sta);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (sta-&gt;mfp &amp;&amp; (peer-&gt;ftm.trigger_based ||</div><div class='add'>+					 peer-&gt;ftm.non_trigger_based))</div><div class='add'>+				FTM_SET_FLAG(PMF);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='add'>+		if (mvmvif-&gt;ftm_unprotected) {</div><div class='add'>+			*sta_id = IWL_INVALID_STA;</div><div class='add'>+			*flags &amp;= ~cpu_to_le32(IWL_INITIATOR_AP_FLAGS_PMF);</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+	} else {</div><div class='add'>+		*sta_id = IWL_INVALID_STA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> iwl_mvm_ftm_put_target(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 		       struct cfg80211_pmsr_request_peer *peer,</div><div class='hunk'>@@ -487,23 +484,8 @@ iwl_mvm_ftm_put_target(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_ftm_put_target_common(mvm, peer, target);</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;bss_conf.assoc &amp;&amp;</div><div class='del'>-	    !memcmp(peer-&gt;addr, vif-&gt;bss_conf.bssid, ETH_ALEN)) {</div><div class='del'>-		struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-		struct ieee80211_sta *sta;</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-</div><div class='del'>-		sta = rcu_dereference(mvm-&gt;fw_id_to_mac_id[mvmvif-&gt;ap_sta_id]);</div><div class='del'>-		if (sta-&gt;mfp)</div><div class='del'>-			FTM_PUT_FLAG(PMF);</div><div class='del'>-</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-		target-&gt;sta_id = mvmvif-&gt;ap_sta_id;</div><div class='del'>-	} else {</div><div class='del'>-		target-&gt;sta_id = IWL_MVM_INVALID_STA;</div><div class='del'>-	}</div><div class='add'>+	iwl_mvm_ftm_set_sta(mvm, vif, peer, &amp;target-&gt;sta_id,</div><div class='add'>+			    &amp;target-&gt;initiator_ap_flags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * TODO: Beacon interval is currently unknown, so use the common value</div><div class='hunk'>@@ -532,7 +514,7 @@ static int iwl_mvm_ftm_start_v5(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_tof_range_req_cmd_v5 cmd_v5;</div><div class='ctx'> 	struct iwl_host_cmd hcmd = {</div><div class='del'>-		.id = iwl_cmd_id(TOF_RANGE_REQ_CMD, LOCATION_GROUP, 0),</div><div class='add'>+		.id = WIDE_ID(LOCATION_GROUP, TOF_RANGE_REQ_CMD),</div><div class='ctx'> 		.dataflags[0] = IWL_HCMD_DFL_DUP,</div><div class='ctx'> 		.data[0] = &amp;cmd_v5,</div><div class='ctx'> 		.len[0] = sizeof(cmd_v5),</div><div class='hunk'>@@ -558,7 +540,7 @@ static int iwl_mvm_ftm_start_v7(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_tof_range_req_cmd_v7 cmd_v7;</div><div class='ctx'> 	struct iwl_host_cmd hcmd = {</div><div class='del'>-		.id = iwl_cmd_id(TOF_RANGE_REQ_CMD, LOCATION_GROUP, 0),</div><div class='add'>+		.id = WIDE_ID(LOCATION_GROUP, TOF_RANGE_REQ_CMD),</div><div class='ctx'> 		.dataflags[0] = IWL_HCMD_DFL_DUP,</div><div class='ctx'> 		.data[0] = &amp;cmd_v7,</div><div class='ctx'> 		.len[0] = sizeof(cmd_v7),</div><div class='hunk'>@@ -588,7 +570,7 @@ static int iwl_mvm_ftm_start_v8(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_tof_range_req_cmd_v8 cmd;</div><div class='ctx'> 	struct iwl_host_cmd hcmd = {</div><div class='del'>-		.id = iwl_cmd_id(TOF_RANGE_REQ_CMD, LOCATION_GROUP, 0),</div><div class='add'>+		.id = WIDE_ID(LOCATION_GROUP, TOF_RANGE_REQ_CMD),</div><div class='ctx'> 		.dataflags[0] = IWL_HCMD_DFL_DUP,</div><div class='ctx'> 		.data[0] = &amp;cmd,</div><div class='ctx'> 		.len[0] = sizeof(cmd),</div><div class='hunk'>@@ -614,7 +596,7 @@ static int iwl_mvm_ftm_start_v9(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_tof_range_req_cmd_v9 cmd;</div><div class='ctx'> 	struct iwl_host_cmd hcmd = {</div><div class='del'>-		.id = iwl_cmd_id(TOF_RANGE_REQ_CMD, LOCATION_GROUP, 0),</div><div class='add'>+		.id = WIDE_ID(LOCATION_GROUP, TOF_RANGE_REQ_CMD),</div><div class='ctx'> 		.dataflags[0] = IWL_HCMD_DFL_DUP,</div><div class='ctx'> 		.data[0] = &amp;cmd,</div><div class='ctx'> 		.len[0] = sizeof(cmd),</div><div class='hunk'>@@ -642,53 +624,67 @@ static void iter(struct ieee80211_hw *hw,</div><div class='ctx'> 		 struct ieee80211_key_conf *key,</div><div class='ctx'> 		 void *data)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_tof_range_req_ap_entry_v6 *target = data;</div><div class='add'>+	struct iwl_mvm_ftm_iter_data *target = data;</div><div class='ctx'> </div><div class='ctx'> 	if (!sta || memcmp(sta-&gt;addr, target-&gt;bssid, ETH_ALEN))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(!sta-&gt;mfp);</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(key-&gt;keylen &gt; sizeof(target-&gt;tk)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	memcpy(target-&gt;tk, key-&gt;key, key-&gt;keylen);</div><div class='del'>-	target-&gt;cipher = iwl_mvm_cipher_to_location_cipher(key-&gt;cipher);</div><div class='del'>-	WARN_ON(target-&gt;cipher == IWL_LOCATION_CIPHER_INVALID);</div><div class='add'>+	target-&gt;tk = key-&gt;key;</div><div class='add'>+	*target-&gt;cipher = iwl_mvm_cipher_to_location_cipher(key-&gt;cipher);</div><div class='add'>+	WARN_ON(*target-&gt;cipher == IWL_LOCATION_CIPHER_INVALID);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> iwl_mvm_ftm_set_secured_ranging(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='del'>-				struct iwl_tof_range_req_ap_entry_v7 *target)</div><div class='add'>+				u8 *bssid, u8 *cipher, u8 *hltk, u8 *tk,</div><div class='add'>+				u8 *rx_pn, u8 *tx_pn, __le32 *flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_ftm_pasn_entry *entry;</div><div class='del'>-	u32 flags = le32_to_cpu(target-&gt;initiator_ap_flags);</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> </div><div class='del'>-	if (!(flags &amp; (IWL_INITIATOR_AP_FLAGS_NON_TB |</div><div class='add'>+	if (mvmvif-&gt;ftm_unprotected)</div><div class='add'>+		return;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (!(le32_to_cpu(*flags) &amp; (IWL_INITIATOR_AP_FLAGS_NON_TB |</div><div class='ctx'> 		       IWL_INITIATOR_AP_FLAGS_TB)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(entry, &amp;mvm-&gt;ftm_initiator.pasn_list, list) {</div><div class='del'>-		if (memcmp(entry-&gt;addr, target-&gt;bssid, sizeof(entry-&gt;addr)))</div><div class='add'>+		if (memcmp(entry-&gt;addr, bssid, sizeof(entry-&gt;addr)))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		target-&gt;cipher = entry-&gt;cipher;</div><div class='del'>-		memcpy(target-&gt;hltk, entry-&gt;hltk, sizeof(target-&gt;hltk));</div><div class='add'>+		*cipher = entry-&gt;cipher;</div><div class='ctx'> </div><div class='del'>-		if (vif-&gt;bss_conf.assoc &amp;&amp;</div><div class='del'>-		    !memcmp(vif-&gt;bss_conf.bssid, target-&gt;bssid,</div><div class='del'>-			    sizeof(target-&gt;bssid)))</div><div class='del'>-			ieee80211_iter_keys(mvm-&gt;hw, vif, iter, target);</div><div class='add'>+		if (entry-&gt;flags &amp; IWL_MVM_PASN_FLAG_HAS_HLTK)</div><div class='add'>+			memcpy(hltk, entry-&gt;hltk, sizeof(entry-&gt;hltk));</div><div class='ctx'> 		else</div><div class='del'>-			memcpy(target-&gt;tk, entry-&gt;tk, sizeof(target-&gt;tk));</div><div class='add'>+			memset(hltk, 0, sizeof(entry-&gt;hltk));</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;cfg.assoc &amp;&amp;</div><div class='add'>+		    !memcmp(vif-&gt;bss_conf.bssid, bssid, ETH_ALEN)) {</div><div class='add'>+			struct iwl_mvm_ftm_iter_data target;</div><div class='ctx'> </div><div class='del'>-		memcpy(target-&gt;rx_pn, entry-&gt;rx_pn, sizeof(target-&gt;rx_pn));</div><div class='del'>-		memcpy(target-&gt;tx_pn, entry-&gt;tx_pn, sizeof(target-&gt;tx_pn));</div><div class='add'>+			target.bssid = bssid;</div><div class='add'>+			target.cipher = cipher;</div><div class='add'>+			target.tk = NULL;</div><div class='add'>+			ieee80211_iter_keys(mvm-&gt;hw, vif, iter, &amp;target);</div><div class='ctx'> </div><div class='del'>-		target-&gt;initiator_ap_flags |=</div><div class='del'>-			cpu_to_le32(IWL_INITIATOR_AP_FLAGS_SECURED);</div><div class='add'>+			if (!WARN_ON(!target.tk))</div><div class='add'>+				memcpy(tk, target.tk, TK_11AZ_LEN);</div><div class='add'>+		} else {</div><div class='add'>+			memcpy(tk, entry-&gt;tk, sizeof(entry-&gt;tk));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memcpy(rx_pn, entry-&gt;rx_pn, sizeof(entry-&gt;rx_pn));</div><div class='add'>+		memcpy(tx_pn, entry-&gt;tx_pn, sizeof(entry-&gt;tx_pn));</div><div class='add'>+</div><div class='add'>+		FTM_SET_FLAG(SECURED);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -702,7 +698,11 @@ iwl_mvm_ftm_put_target_v7(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_ftm_set_secured_ranging(mvm, vif, target);</div><div class='add'>+	iwl_mvm_ftm_set_secured_ranging(mvm, vif, target-&gt;bssid,</div><div class='add'>+					&amp;target-&gt;cipher, target-&gt;hltk,</div><div class='add'>+					target-&gt;tk, target-&gt;rx_pn,</div><div class='add'>+					target-&gt;tx_pn,</div><div class='add'>+					&amp;target-&gt;initiator_ap_flags);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -712,7 +712,7 @@ static int iwl_mvm_ftm_start_v11(struct iwl_mvm *mvm,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_tof_range_req_cmd_v11 cmd;</div><div class='ctx'> 	struct iwl_host_cmd hcmd = {</div><div class='del'>-		.id = iwl_cmd_id(TOF_RANGE_REQ_CMD, LOCATION_GROUP, 0),</div><div class='add'>+		.id = WIDE_ID(LOCATION_GROUP, TOF_RANGE_REQ_CMD),</div><div class='ctx'> 		.dataflags[0] = IWL_HCMD_DFL_DUP,</div><div class='ctx'> 		.data[0] = &amp;cmd,</div><div class='ctx'> 		.len[0] = sizeof(cmd),</div><div class='hunk'>@@ -750,13 +750,41 @@ iwl_mvm_ftm_set_ndp_params(struct iwl_mvm *mvm,</div><div class='ctx'> 	target-&gt;i2r_max_total_ltf = IWL_MVM_FTM_I2R_MAX_TOTAL_LTF;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+iwl_mvm_ftm_put_target_v8(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			  struct cfg80211_pmsr_request_peer *peer,</div><div class='add'>+			  struct iwl_tof_range_req_ap_entry_v8 *target)</div><div class='add'>+{</div><div class='add'>+	u32 flags;</div><div class='add'>+	int ret = iwl_mvm_ftm_put_target_v7(mvm, vif, peer, (void *)target);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_ftm_set_ndp_params(mvm, target);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If secure LTF is turned off, replace the flag with PMF only</div><div class='add'>+	 */</div><div class='add'>+	flags = le32_to_cpu(target-&gt;initiator_ap_flags);</div><div class='add'>+	if (flags &amp; IWL_INITIATOR_AP_FLAGS_SECURED) {</div><div class='add'>+		if (!IWL_MVM_FTM_INITIATOR_SECURE_LTF)</div><div class='add'>+			flags &amp;= ~IWL_INITIATOR_AP_FLAGS_SECURED;</div><div class='add'>+</div><div class='add'>+		flags |= IWL_INITIATOR_AP_FLAGS_PMF;</div><div class='add'>+		target-&gt;initiator_ap_flags = cpu_to_le32(flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int iwl_mvm_ftm_start_v12(struct iwl_mvm *mvm,</div><div class='ctx'> 				 struct ieee80211_vif *vif,</div><div class='ctx'> 				 struct cfg80211_pmsr_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_tof_range_req_cmd_v12 cmd;</div><div class='ctx'> 	struct iwl_host_cmd hcmd = {</div><div class='del'>-		.id = iwl_cmd_id(TOF_RANGE_REQ_CMD, LOCATION_GROUP, 0),</div><div class='add'>+		.id = WIDE_ID(LOCATION_GROUP, TOF_RANGE_REQ_CMD),</div><div class='ctx'> 		.dataflags[0] = IWL_HCMD_DFL_DUP,</div><div class='ctx'> 		.data[0] = &amp;cmd,</div><div class='ctx'> 		.len[0] = sizeof(cmd),</div><div class='hunk'>@@ -769,24 +797,152 @@ static int iwl_mvm_ftm_start_v12(struct iwl_mvm *mvm,</div><div class='ctx'> 	for (i = 0; i &lt; cmd.num_of_ap; i++) {</div><div class='ctx'> 		struct cfg80211_pmsr_request_peer *peer = &amp;req-&gt;peers[i];</div><div class='ctx'> 		struct iwl_tof_range_req_ap_entry_v8 *target = &amp;cmd.ap[i];</div><div class='del'>-		u32 flags;</div><div class='ctx'> </div><div class='del'>-		err = iwl_mvm_ftm_put_target_v7(mvm, vif, peer, (void *)target);</div><div class='add'>+		err = iwl_mvm_ftm_put_target_v8(mvm, vif, peer, target);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		iwl_mvm_ftm_set_ndp_params(mvm, target);</div><div class='add'>+	return iwl_mvm_ftm_send_cmd(mvm, &amp;hcmd);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * If secure LTF is turned off, replace the flag with PMF only</div><div class='del'>-		 */</div><div class='del'>-		flags = le32_to_cpu(target-&gt;initiator_ap_flags);</div><div class='del'>-		if ((flags &amp; IWL_INITIATOR_AP_FLAGS_SECURED) &amp;&amp;</div><div class='del'>-		    !IWL_MVM_FTM_INITIATOR_SECURE_LTF) {</div><div class='del'>-			flags &amp;= ~IWL_INITIATOR_AP_FLAGS_SECURED;</div><div class='del'>-			flags |= IWL_INITIATOR_AP_FLAGS_PMF;</div><div class='del'>-			target-&gt;initiator_ap_flags = cpu_to_le32(flags);</div><div class='add'>+static int iwl_mvm_ftm_start_v13(struct iwl_mvm *mvm,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct cfg80211_pmsr_request *req)</div><div class='add'>+{</div><div class='add'>+	struct iwl_tof_range_req_cmd_v13 cmd;</div><div class='add'>+	struct iwl_host_cmd hcmd = {</div><div class='add'>+		.id = WIDE_ID(LOCATION_GROUP, TOF_RANGE_REQ_CMD),</div><div class='add'>+		.dataflags[0] = IWL_HCMD_DFL_DUP,</div><div class='add'>+		.data[0] = &amp;cmd,</div><div class='add'>+		.len[0] = sizeof(cmd),</div><div class='add'>+	};</div><div class='add'>+	u8 i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_ftm_cmd_common(mvm, vif, (void *)&amp;cmd, req);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cmd.num_of_ap; i++) {</div><div class='add'>+		struct cfg80211_pmsr_request_peer *peer = &amp;req-&gt;peers[i];</div><div class='add'>+		struct iwl_tof_range_req_ap_entry_v9 *target = &amp;cmd.ap[i];</div><div class='add'>+</div><div class='add'>+		err = iwl_mvm_ftm_put_target_v8(mvm, vif, peer, (void *)target);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if (peer-&gt;ftm.trigger_based || peer-&gt;ftm.non_trigger_based)</div><div class='add'>+			target-&gt;bss_color = peer-&gt;ftm.bss_color;</div><div class='add'>+</div><div class='add'>+		if (peer-&gt;ftm.non_trigger_based) {</div><div class='add'>+			target-&gt;min_time_between_msr =</div><div class='add'>+				cpu_to_le16(IWL_MVM_FTM_NON_TB_MIN_TIME_BETWEEN_MSR);</div><div class='add'>+			target-&gt;burst_period =</div><div class='add'>+				cpu_to_le16(IWL_MVM_FTM_NON_TB_MAX_TIME_BETWEEN_MSR);</div><div class='add'>+		} else {</div><div class='add'>+			target-&gt;min_time_between_msr = cpu_to_le16(0);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		target-&gt;band =</div><div class='add'>+			iwl_mvm_phy_band_from_nl80211(peer-&gt;chandef.chan-&gt;band);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_ftm_send_cmd(mvm, &amp;hcmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mvm_ftm_put_target_v10(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			   struct cfg80211_pmsr_request_peer *peer,</div><div class='add'>+			   struct iwl_tof_range_req_ap_entry *target)</div><div class='add'>+{</div><div class='add'>+	u32 i2r_max_sts, flags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_ftm_target_chandef_v2(mvm, peer, &amp;target-&gt;channel_num,</div><div class='add'>+					    &amp;target-&gt;format_bw,</div><div class='add'>+					    &amp;target-&gt;ctrl_ch_position);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	memcpy(target-&gt;bssid, peer-&gt;addr, ETH_ALEN);</div><div class='add'>+	target-&gt;burst_period =</div><div class='add'>+		cpu_to_le16(peer-&gt;ftm.burst_period);</div><div class='add'>+	target-&gt;samples_per_burst = peer-&gt;ftm.ftms_per_burst;</div><div class='add'>+	target-&gt;num_of_bursts = peer-&gt;ftm.num_bursts_exp;</div><div class='add'>+	iwl_mvm_ftm_set_target_flags(mvm, peer, &amp;target-&gt;initiator_ap_flags);</div><div class='add'>+	iwl_mvm_ftm_set_sta(mvm, vif, peer, &amp;target-&gt;sta_id,</div><div class='add'>+			    &amp;target-&gt;initiator_ap_flags);</div><div class='add'>+	iwl_mvm_ftm_set_secured_ranging(mvm, vif, target-&gt;bssid,</div><div class='add'>+					&amp;target-&gt;cipher, target-&gt;hltk,</div><div class='add'>+					target-&gt;tk, target-&gt;rx_pn,</div><div class='add'>+					target-&gt;tx_pn,</div><div class='add'>+					&amp;target-&gt;initiator_ap_flags);</div><div class='add'>+</div><div class='add'>+	i2r_max_sts = IWL_MVM_FTM_I2R_MAX_STS &gt; 1 ? 1 :</div><div class='add'>+		IWL_MVM_FTM_I2R_MAX_STS;</div><div class='add'>+</div><div class='add'>+	target-&gt;r2i_ndp_params = IWL_MVM_FTM_R2I_MAX_REP |</div><div class='add'>+		(IWL_MVM_FTM_R2I_MAX_STS &lt;&lt; IWL_LOCATION_MAX_STS_POS) |</div><div class='add'>+		(IWL_MVM_FTM_R2I_MAX_TOTAL_LTF &lt;&lt; IWL_LOCATION_TOTAL_LTF_POS);</div><div class='add'>+	target-&gt;i2r_ndp_params = IWL_MVM_FTM_I2R_MAX_REP |</div><div class='add'>+		(i2r_max_sts &lt;&lt; IWL_LOCATION_MAX_STS_POS) |</div><div class='add'>+		(IWL_MVM_FTM_I2R_MAX_TOTAL_LTF &lt;&lt; IWL_LOCATION_TOTAL_LTF_POS);</div><div class='add'>+</div><div class='add'>+	if (peer-&gt;ftm.non_trigger_based) {</div><div class='add'>+		target-&gt;min_time_between_msr =</div><div class='add'>+			cpu_to_le16(IWL_MVM_FTM_NON_TB_MIN_TIME_BETWEEN_MSR);</div><div class='add'>+		target-&gt;burst_period =</div><div class='add'>+			cpu_to_le16(IWL_MVM_FTM_NON_TB_MAX_TIME_BETWEEN_MSR);</div><div class='add'>+	} else {</div><div class='add'>+		target-&gt;min_time_between_msr = cpu_to_le16(0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	target-&gt;band =</div><div class='add'>+		iwl_mvm_phy_band_from_nl80211(peer-&gt;chandef.chan-&gt;band);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * TODO: Beacon interval is currently unknown, so use the common value</div><div class='add'>+	 * of 100 TUs.</div><div class='add'>+	 */</div><div class='add'>+	target-&gt;beacon_interval = cpu_to_le16(100);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If secure LTF is turned off, replace the flag with PMF only</div><div class='add'>+	 */</div><div class='add'>+	flags = le32_to_cpu(target-&gt;initiator_ap_flags);</div><div class='add'>+	if (flags &amp; IWL_INITIATOR_AP_FLAGS_SECURED) {</div><div class='add'>+		if (!IWL_MVM_FTM_INITIATOR_SECURE_LTF)</div><div class='add'>+			flags &amp;= ~IWL_INITIATOR_AP_FLAGS_SECURED;</div><div class='add'>+</div><div class='add'>+		flags |= IWL_INITIATOR_AP_FLAGS_PMF;</div><div class='add'>+		target-&gt;initiator_ap_flags = cpu_to_le32(flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_ftm_start_v14(struct iwl_mvm *mvm,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct cfg80211_pmsr_request *req)</div><div class='add'>+{</div><div class='add'>+	struct iwl_tof_range_req_cmd cmd;</div><div class='add'>+	struct iwl_host_cmd hcmd = {</div><div class='add'>+		.id = WIDE_ID(LOCATION_GROUP, TOF_RANGE_REQ_CMD),</div><div class='add'>+		.dataflags[0] = IWL_HCMD_DFL_DUP,</div><div class='add'>+		.data[0] = &amp;cmd,</div><div class='add'>+		.len[0] = sizeof(cmd),</div><div class='add'>+	};</div><div class='add'>+	u8 i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_ftm_cmd_common(mvm, vif, (void *)&amp;cmd, req);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cmd.num_of_ap; i++) {</div><div class='add'>+		struct cfg80211_pmsr_request_peer *peer = &amp;req-&gt;peers[i];</div><div class='add'>+		struct iwl_tof_range_req_ap_entry *target = &amp;cmd.ap[i];</div><div class='add'>+</div><div class='add'>+		err = iwl_mvm_ftm_put_target_v10(mvm, vif, peer, target);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return iwl_mvm_ftm_send_cmd(mvm, &amp;hcmd);</div><div class='hunk'>@@ -805,11 +961,19 @@ int iwl_mvm_ftm_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	if (new_api) {</div><div class='del'>-		u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, LOCATION_GROUP,</div><div class='del'>-						   TOF_RANGE_REQ_CMD,</div><div class='add'>+		u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw,</div><div class='add'>+						   WIDE_ID(LOCATION_GROUP, TOF_RANGE_REQ_CMD),</div><div class='ctx'> 						   IWL_FW_CMD_VER_UNKNOWN);</div><div class='ctx'> </div><div class='ctx'> 		switch (cmd_ver) {</div><div class='add'>+		case 15:</div><div class='add'>+			/* Version 15 has the same struct as 14 */</div><div class='add'>+		case 14:</div><div class='add'>+			err = iwl_mvm_ftm_start_v14(mvm, vif, req);</div><div class='add'>+			break;</div><div class='add'>+		case 13:</div><div class='add'>+			err = iwl_mvm_ftm_start_v13(mvm, vif, req);</div><div class='add'>+			break;</div><div class='ctx'> 		case 12:</div><div class='ctx'> 			err = iwl_mvm_ftm_start_v12(mvm, vif, req);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -852,8 +1016,7 @@ void iwl_mvm_ftm_abort(struct iwl_mvm *mvm, struct cfg80211_pmsr_request *req)</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_ftm_reset(mvm);</div><div class='ctx'> </div><div class='del'>-	if (iwl_mvm_send_cmd_pdu(mvm, iwl_cmd_id(TOF_RANGE_ABORT_CMD,</div><div class='del'>-						 LOCATION_GROUP, 0),</div><div class='add'>+	if (iwl_mvm_send_cmd_pdu(mvm, WIDE_ID(LOCATION_GROUP, TOF_RANGE_ABORT_CMD),</div><div class='ctx'> 				 0, sizeof(cmd), &amp;cmd))</div><div class='ctx'> 		IWL_ERR(mvm, "failed to abort FTM process\n");</div><div class='ctx'> }</div><div class='hunk'>@@ -879,7 +1042,8 @@ static u64 iwl_mvm_ftm_get_host_time(struct iwl_mvm *mvm, __le32 fw_gp2_ts)</div><div class='ctx'> 	u32 curr_gp2, diff;</div><div class='ctx'> 	u64 now_from_boot_ns;</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_get_sync_time(mvm, &amp;curr_gp2, &amp;now_from_boot_ns);</div><div class='add'>+	iwl_mvm_get_sync_time(mvm, CLOCK_BOOTTIME, &amp;curr_gp2,</div><div class='add'>+			      &amp;now_from_boot_ns, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (curr_gp2 &gt;= gp2_ts)</div><div class='ctx'> 		diff = curr_gp2 - gp2_ts;</div><div class='hunk'>@@ -935,11 +1099,10 @@ static int iwl_mvm_ftm_range_resp_valid(struct iwl_mvm *mvm, u8 request_id,</div><div class='ctx'> static void iwl_mvm_ftm_rtt_smoothing(struct iwl_mvm *mvm,</div><div class='ctx'> 				      struct cfg80211_pmsr_result *res)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm_smooth_entry *resp;</div><div class='add'>+	struct iwl_mvm_smooth_entry *resp = NULL, *iter;</div><div class='ctx'> 	s64 rtt_avg, rtt = res-&gt;ftm.rtt_avg;</div><div class='ctx'> 	u32 undershoot, overshoot;</div><div class='ctx'> 	u8 alpha;</div><div class='del'>-	bool found;</div><div class='ctx'> </div><div class='ctx'> 	if (!IWL_MVM_FTM_INITIATOR_ENABLE_SMOOTH)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -953,15 +1116,14 @@ static void iwl_mvm_ftm_rtt_smoothing(struct iwl_mvm *mvm,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	found = false;</div><div class='del'>-	list_for_each_entry(resp, &amp;mvm-&gt;ftm_initiator.smooth.resp, list) {</div><div class='del'>-		if (!memcmp(res-&gt;addr, resp-&gt;addr, ETH_ALEN)) {</div><div class='del'>-			found = true;</div><div class='add'>+	list_for_each_entry(iter, &amp;mvm-&gt;ftm_initiator.smooth.resp, list) {</div><div class='add'>+		if (!memcmp(res-&gt;addr, iter-&gt;addr, ETH_ALEN)) {</div><div class='add'>+			resp = iter;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!found) {</div><div class='add'>+	if (!resp) {</div><div class='ctx'> 		resp = kzalloc(sizeof(*resp), GFP_KERNEL);</div><div class='ctx'> 		if (!resp)</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -990,7 +1152,7 @@ static void iwl_mvm_ftm_rtt_smoothing(struct iwl_mvm *mvm,</div><div class='ctx'> 	overshoot = IWL_MVM_FTM_INITIATOR_SMOOTH_OVERSHOOT;</div><div class='ctx'> 	alpha = IWL_MVM_FTM_INITIATOR_SMOOTH_ALPHA;</div><div class='ctx'> </div><div class='del'>-	rtt_avg = (alpha * rtt + (100 - alpha) * resp-&gt;rtt_avg) / 100;</div><div class='add'>+	rtt_avg = div_s64(alpha * rtt + (100 - alpha) * resp-&gt;rtt_avg, 100);</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_INFO(mvm,</div><div class='ctx'> 		       "%pM: prev rtt_avg=%lld, new rtt_avg=%lld, rtt=%lld\n",</div><div class='hunk'>@@ -1030,10 +1192,10 @@ static void iwl_mvm_debug_range_resp(struct iwl_mvm *mvm, u8 index,</div><div class='ctx'> 	IWL_DEBUG_INFO(mvm, "\tstatus: %d\n", res-&gt;status);</div><div class='ctx'> 	IWL_DEBUG_INFO(mvm, "\tBSSID: %pM\n", res-&gt;addr);</div><div class='ctx'> 	IWL_DEBUG_INFO(mvm, "\thost time: %llu\n", res-&gt;host_time);</div><div class='del'>-	IWL_DEBUG_INFO(mvm, "\tburst index: %hhu\n", res-&gt;ftm.burst_index);</div><div class='add'>+	IWL_DEBUG_INFO(mvm, "\tburst index: %d\n", res-&gt;ftm.burst_index);</div><div class='ctx'> 	IWL_DEBUG_INFO(mvm, "\tsuccess num: %u\n", res-&gt;ftm.num_ftmr_successes);</div><div class='ctx'> 	IWL_DEBUG_INFO(mvm, "\trssi: %d\n", res-&gt;ftm.rssi_avg);</div><div class='del'>-	IWL_DEBUG_INFO(mvm, "\trssi spread: %hhu\n", res-&gt;ftm.rssi_spread);</div><div class='add'>+	IWL_DEBUG_INFO(mvm, "\trssi spread: %d\n", res-&gt;ftm.rssi_spread);</div><div class='ctx'> 	IWL_DEBUG_INFO(mvm, "\trtt: %lld\n", res-&gt;ftm.rtt_avg);</div><div class='ctx'> 	IWL_DEBUG_INFO(mvm, "\trtt var: %llu\n", res-&gt;ftm.rtt_variance);</div><div class='ctx'> 	IWL_DEBUG_INFO(mvm, "\trtt spread: %llu\n", res-&gt;ftm.rtt_spread);</div><div class='hunk'>@@ -1042,7 +1204,7 @@ static void iwl_mvm_debug_range_resp(struct iwl_mvm *mvm, u8 index,</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> iwl_mvm_ftm_pasn_update_pn(struct iwl_mvm *mvm,</div><div class='del'>-			   struct iwl_tof_range_rsp_ap_entry_ntfy_v6 *fw_ap)</div><div class='add'>+			   struct iwl_tof_range_rsp_ap_entry_ntfy *fw_ap)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_ftm_pasn_entry *entry;</div><div class='ctx'> </div><div class='hunk'>@@ -1078,8 +1240,9 @@ static u8 iwl_mvm_ftm_get_range_resp_ver(struct iwl_mvm *mvm)</div><div class='ctx'> static bool iwl_mvm_ftm_resp_size_validation(u8 ver, unsigned int pkt_len)</div><div class='ctx'> {</div><div class='ctx'> 	switch (ver) {</div><div class='add'>+	case 9:</div><div class='ctx'> 	case 8:</div><div class='del'>-		return pkt_len == sizeof(struct iwl_tof_range_rsp_ntfy_v8);</div><div class='add'>+		return pkt_len == sizeof(struct iwl_tof_range_rsp_ntfy);</div><div class='ctx'> 	case 7:</div><div class='ctx'> 		return pkt_len == sizeof(struct iwl_tof_range_rsp_ntfy_v7);</div><div class='ctx'> 	case 6:</div><div class='hunk'>@@ -1099,7 +1262,7 @@ void iwl_mvm_ftm_range_resp(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> 	struct iwl_tof_range_rsp_ntfy_v5 *fw_resp_v5 = (void *)pkt-&gt;data;</div><div class='ctx'> 	struct iwl_tof_range_rsp_ntfy_v6 *fw_resp_v6 = (void *)pkt-&gt;data;</div><div class='ctx'> 	struct iwl_tof_range_rsp_ntfy_v7 *fw_resp_v7 = (void *)pkt-&gt;data;</div><div class='del'>-	struct iwl_tof_range_rsp_ntfy_v8 *fw_resp_v8 = (void *)pkt-&gt;data;</div><div class='add'>+	struct iwl_tof_range_rsp_ntfy *fw_resp_v8 = (void *)pkt-&gt;data;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	bool new_api = fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 				  IWL_UCODE_TLV_API_FTM_NEW_RANGE_REQ);</div><div class='hunk'>@@ -1132,16 +1295,16 @@ void iwl_mvm_ftm_range_resp(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_INFO(mvm, "Range response received\n");</div><div class='del'>-	IWL_DEBUG_INFO(mvm, "request id: %lld, num of entries: %hhu\n",</div><div class='add'>+	IWL_DEBUG_INFO(mvm, "request id: %lld, num of entries: %u\n",</div><div class='ctx'> 		       mvm-&gt;ftm_initiator.req-&gt;cookie, num_of_aps);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; num_of_aps &amp;&amp; i &lt; IWL_MVM_TOF_MAX_APS; i++) {</div><div class='add'>+	for (i = 0; i &lt; num_of_aps &amp;&amp; i &lt; IWL_TOF_MAX_APS; i++) {</div><div class='ctx'> 		struct cfg80211_pmsr_result result = {};</div><div class='del'>-		struct iwl_tof_range_rsp_ap_entry_ntfy_v6 *fw_ap;</div><div class='add'>+		struct iwl_tof_range_rsp_ap_entry_ntfy *fw_ap;</div><div class='ctx'> 		int peer_idx;</div><div class='ctx'> </div><div class='ctx'> 		if (new_api) {</div><div class='del'>-			if (notif_ver == 8) {</div><div class='add'>+			if (notif_ver &gt;= 8) {</div><div class='ctx'> 				fw_ap = &amp;fw_resp_v8-&gt;ap[i];</div><div class='ctx'> 				iwl_mvm_ftm_pasn_update_pn(mvm, fw_ap);</div><div class='ctx'> 			} else if (notif_ver == 7) {</div><div class='hunk'>@@ -1224,7 +1387,7 @@ void iwl_mvm_ftm_range_resp(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> </div><div class='ctx'> 		if (fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 			       IWL_UCODE_TLV_API_FTM_RTT_ACCURACY))</div><div class='del'>-			IWL_DEBUG_INFO(mvm, "RTT confidence: %hhu\n",</div><div class='add'>+			IWL_DEBUG_INFO(mvm, "RTT confidence: %u\n",</div><div class='ctx'> 				       fw_ap-&gt;rttConfidence);</div><div class='ctx'> </div><div class='ctx'> 		iwl_mvm_debug_range_resp(mvm, i, &amp;result);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-responder.c b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-responder.c<br/>index 5a249ea97eb2..83f6e508a094 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/ftm-responder.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/ftm-responder.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/ftm-responder.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/ftm-responder.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2018-2024 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;net/cfg80211.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='hunk'>@@ -12,6 +12,9 @@ struct iwl_mvm_pasn_sta {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	struct iwl_mvm_int_sta int_sta;</div><div class='ctx'> 	u8 addr[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+	/* must be last as it followed by buffer holding the key */</div><div class='add'>+	struct ieee80211_key_conf keyconf;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct iwl_mvm_pasn_hltk_data {</div><div class='hunk'>@@ -39,15 +42,15 @@ static int iwl_mvm_ftm_responder_set_bw_v1(struct cfg80211_chan_def *chandef,</div><div class='ctx'> 		*ctrl_ch_position = iwl_mvm_get_ctrl_pos(chandef);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_mvm_ftm_responder_set_bw_v2(struct cfg80211_chan_def *chandef,</div><div class='del'>-					   u8 *format_bw,</div><div class='del'>-					   u8 *ctrl_ch_position)</div><div class='add'>+					   u8 *format_bw, u8 *ctrl_ch_position,</div><div class='add'>+					   u8 cmd_ver)</div><div class='ctx'> {</div><div class='ctx'> 	switch (chandef-&gt;width) {</div><div class='ctx'> 	case NL80211_CHAN_WIDTH_20_NOHT:</div><div class='hunk'>@@ -68,8 +71,16 @@ static int iwl_mvm_ftm_responder_set_bw_v2(struct cfg80211_chan_def *chandef,</div><div class='ctx'> 		*format_bw |= IWL_LOCATION_BW_80MHZ &lt;&lt; LOCATION_BW_POS;</div><div class='ctx'> 		*ctrl_ch_position = iwl_mvm_get_ctrl_pos(chandef);</div><div class='ctx'> 		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_160:</div><div class='add'>+		if (cmd_ver &gt;= 9) {</div><div class='add'>+			*format_bw = IWL_LOCATION_FRAME_FORMAT_HE;</div><div class='add'>+			*format_bw |= IWL_LOCATION_BW_160MHZ &lt;&lt; LOCATION_BW_POS;</div><div class='add'>+			*ctrl_ch_position = iwl_mvm_get_ctrl_pos(chandef);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	default:</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -77,7 +88,7 @@ static int iwl_mvm_ftm_responder_set_bw_v2(struct cfg80211_chan_def *chandef,</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> iwl_mvm_ftm_responder_set_ndp(struct iwl_mvm *mvm,</div><div class='del'>-			      struct iwl_tof_responder_config_cmd_v8 *cmd)</div><div class='add'>+			      struct iwl_tof_responder_config_cmd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	/* Up to 2 R2I STS are allowed on the responder */</div><div class='ctx'> 	u32 r2i_max_sts = IWL_MVM_FTM_R2I_MAX_STS &lt; 2 ?</div><div class='hunk'>@@ -96,34 +107,58 @@ iwl_mvm_ftm_responder_set_ndp(struct iwl_mvm *mvm,</div><div class='ctx'> static int</div><div class='ctx'> iwl_mvm_ftm_responder_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 			  struct ieee80211_vif *vif,</div><div class='del'>-			  struct cfg80211_chan_def *chandef)</div><div class='add'>+			  struct cfg80211_chan_def *chandef,</div><div class='add'>+			  struct ieee80211_bss_conf *link_conf)</div><div class='ctx'> {</div><div class='add'>+	u32 cmd_id = WIDE_ID(LOCATION_GROUP, TOF_RESPONDER_CONFIG_CMD);</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The command structure is the same for versions 6, 7 and 8 (only the</div><div class='ctx'> 	 * field interpretation is different), so the same struct can be use</div><div class='ctx'> 	 * for all cases.</div><div class='ctx'> 	 */</div><div class='del'>-	struct iwl_tof_responder_config_cmd_v8 cmd = {</div><div class='add'>+	struct iwl_tof_responder_config_cmd cmd = {</div><div class='ctx'> 		.channel_num = chandef-&gt;chan-&gt;hw_value,</div><div class='ctx'> 		.cmd_valid_fields =</div><div class='ctx'> 			cpu_to_le32(IWL_TOF_RESPONDER_CMD_VALID_CHAN_INFO |</div><div class='ctx'> 				    IWL_TOF_RESPONDER_CMD_VALID_BSSID |</div><div class='ctx'> 				    IWL_TOF_RESPONDER_CMD_VALID_STA_ID),</div><div class='del'>-		.sta_id = mvmvif-&gt;bcast_sta.sta_id,</div><div class='add'>+		.sta_id = mvmvif-&gt;link[link_conf-&gt;link_id]-&gt;bcast_sta.sta_id,</div><div class='ctx'> 	};</div><div class='del'>-	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, LOCATION_GROUP,</div><div class='del'>-					   TOF_RESPONDER_CONFIG_CMD, 6);</div><div class='add'>+	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, cmd_id, 6);</div><div class='ctx'> 	int err;</div><div class='add'>+	int cmd_size;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-if (cmd_ver == 8)</div><div class='del'>-		iwl_mvm_ftm_responder_set_ndp(mvm, &amp;cmd);</div><div class='add'>+	if (cmd_ver &gt;= 10) {</div><div class='add'>+		cmd.band =</div><div class='add'>+			iwl_mvm_phy_band_from_nl80211(chandef-&gt;chan-&gt;band);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Use a default of bss_color=1 for now */</div><div class='add'>+	if (cmd_ver &gt;= 9) {</div><div class='add'>+		cmd.cmd_valid_fields |=</div><div class='add'>+			cpu_to_le32(IWL_TOF_RESPONDER_CMD_VALID_BSS_COLOR |</div><div class='add'>+				    IWL_TOF_RESPONDER_CMD_VALID_MIN_MAX_TIME_BETWEEN_MSR);</div><div class='add'>+		cmd.bss_color = 1;</div><div class='add'>+		cmd.min_time_between_msr =</div><div class='add'>+			cpu_to_le16(IWL_MVM_FTM_NON_TB_MIN_TIME_BETWEEN_MSR);</div><div class='add'>+		cmd.max_time_between_msr =</div><div class='add'>+			cpu_to_le16(IWL_MVM_FTM_NON_TB_MAX_TIME_BETWEEN_MSR);</div><div class='add'>+		cmd_size = sizeof(struct iwl_tof_responder_config_cmd_v9);</div><div class='add'>+	} else {</div><div class='add'>+		/* All versions up to version 8 have the same size */</div><div class='add'>+		cmd_size = sizeof(struct iwl_tof_responder_config_cmd_v8);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd_ver &gt;= 8)</div><div class='add'>+		iwl_mvm_ftm_responder_set_ndp(mvm, (void *)&amp;cmd);</div><div class='ctx'> </div><div class='ctx'> 	if (cmd_ver &gt;= 7)</div><div class='ctx'> 		err = iwl_mvm_ftm_responder_set_bw_v2(chandef, &amp;cmd.format_bw,</div><div class='del'>-						      &amp;cmd.ctrl_ch_position);</div><div class='add'>+						      &amp;cmd.ctrl_ch_position,</div><div class='add'>+						      cmd_ver);</div><div class='ctx'> 	else</div><div class='ctx'> 		err = iwl_mvm_ftm_responder_set_bw_v1(chandef, &amp;cmd.format_bw,</div><div class='ctx'> 						      &amp;cmd.ctrl_ch_position);</div><div class='hunk'>@@ -135,9 +170,7 @@ if (cmd_ver == 8)</div><div class='ctx'> </div><div class='ctx'> 	memcpy(cmd.bssid, vif-&gt;addr, ETH_ALEN);</div><div class='ctx'> </div><div class='del'>-	return iwl_mvm_send_cmd_pdu(mvm, iwl_cmd_id(TOF_RESPONDER_CONFIG_CMD,</div><div class='del'>-						    LOCATION_GROUP, 0),</div><div class='del'>-				    0, sizeof(cmd), &amp;cmd);</div><div class='add'>+	return iwl_mvm_send_cmd_pdu(mvm, cmd_id, 0, cmd_size, &amp;cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -151,8 +184,7 @@ iwl_mvm_ftm_responder_dyn_cfg_v2(struct iwl_mvm *mvm,</div><div class='ctx'> 	};</div><div class='ctx'> 	u8 data[IWL_LCI_CIVIC_IE_MAX_SIZE] = {0};</div><div class='ctx'> 	struct iwl_host_cmd hcmd = {</div><div class='del'>-		.id = iwl_cmd_id(TOF_RESPONDER_DYN_CONFIG_CMD,</div><div class='del'>-				 LOCATION_GROUP, 0),</div><div class='add'>+		.id = WIDE_ID(LOCATION_GROUP, TOF_RESPONDER_DYN_CONFIG_CMD),</div><div class='ctx'> 		.data[0] = &amp;cmd,</div><div class='ctx'> 		.len[0] = sizeof(cmd),</div><div class='ctx'> 		.data[1] = &amp;data,</div><div class='hunk'>@@ -194,8 +226,7 @@ iwl_mvm_ftm_responder_dyn_cfg_v3(struct iwl_mvm *mvm,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_tof_responder_dyn_config_cmd cmd;</div><div class='ctx'> 	struct iwl_host_cmd hcmd = {</div><div class='del'>-		.id = iwl_cmd_id(TOF_RESPONDER_DYN_CONFIG_CMD,</div><div class='del'>-				 LOCATION_GROUP, 0),</div><div class='add'>+		.id = WIDE_ID(LOCATION_GROUP, TOF_RESPONDER_DYN_CONFIG_CMD),</div><div class='ctx'> 		.data[0] = &amp;cmd,</div><div class='ctx'> 		.len[0] = sizeof(cmd),</div><div class='ctx'> 		/* may not be able to DMA from stack */</div><div class='hunk'>@@ -252,8 +283,9 @@ iwl_mvm_ftm_responder_dyn_cfg_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 				  struct ieee80211_ftm_responder_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, LOCATION_GROUP,</div><div class='del'>-					   TOF_RESPONDER_DYN_CONFIG_CMD, 2);</div><div class='add'>+	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw,</div><div class='add'>+					   WIDE_ID(LOCATION_GROUP, TOF_RESPONDER_DYN_CONFIG_CMD),</div><div class='add'>+					   2);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd_ver) {</div><div class='ctx'> 	case 2:</div><div class='hunk'>@@ -267,7 +299,7 @@ iwl_mvm_ftm_responder_dyn_cfg_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 	default:</div><div class='ctx'> 		IWL_ERR(mvm, "Unsupported DYN_CONFIG_CMD version %u\n",</div><div class='ctx'> 			cmd_ver);</div><div class='del'>-		ret = -ENOTSUPP;</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -278,80 +310,22 @@ static void iwl_mvm_resp_del_pasn_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 				      struct iwl_mvm_pasn_sta *sta)</div><div class='ctx'> {</div><div class='ctx'> 	list_del(&amp;sta-&gt;list);</div><div class='del'>-	iwl_mvm_rm_sta_id(mvm, vif, sta-&gt;int_sta.sta_id);</div><div class='del'>-	iwl_mvm_dealloc_int_sta(mvm, &amp;sta-&gt;int_sta);</div><div class='del'>-	kfree(sta);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl_mvm_ftm_respoder_add_pasn_sta(struct iwl_mvm *mvm,</div><div class='del'>-				      struct ieee80211_vif *vif,</div><div class='del'>-				      u8 *addr, u32 cipher, u8 *tk, u32 tk_len,</div><div class='del'>-				      u8 *hltk, u32 hltk_len)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct iwl_mvm_pasn_sta *sta = NULL;</div><div class='del'>-	struct iwl_mvm_pasn_hltk_data hltk_data = {</div><div class='del'>-		.addr = addr,</div><div class='del'>-		.hltk = hltk,</div><div class='del'>-	};</div><div class='del'>-	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, LOCATION_GROUP,</div><div class='del'>-					   TOF_RESPONDER_DYN_CONFIG_CMD, 2);</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (cmd_ver &lt; 3) {</div><div class='del'>-		IWL_ERR(mvm, "Adding PASN station not supported by FW\n");</div><div class='del'>-		return -ENOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hltk_data.cipher = iwl_mvm_cipher_to_location_cipher(cipher);</div><div class='del'>-	if (hltk_data.cipher == IWL_LOCATION_CIPHER_INVALID) {</div><div class='del'>-		IWL_ERR(mvm, "invalid cipher: %u\n", cipher);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tk &amp;&amp; tk_len) {</div><div class='del'>-		sta = kzalloc(sizeof(*sta), GFP_KERNEL);</div><div class='del'>-		if (!sta)</div><div class='del'>-			return -ENOBUFS;</div><div class='ctx'> </div><div class='del'>-		ret = iwl_mvm_add_pasn_sta(mvm, vif, &amp;sta-&gt;int_sta, addr,</div><div class='del'>-					   cipher, tk, tk_len);</div><div class='del'>-		if (ret) {</div><div class='del'>-			kfree(sta);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memcpy(sta-&gt;addr, addr, ETH_ALEN);</div><div class='del'>-		list_add_tail(&amp;sta-&gt;list, &amp;mvm-&gt;resp_pasn_list);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = iwl_mvm_ftm_responder_dyn_cfg_v3(mvm, vif, NULL, &amp;hltk_data);</div><div class='del'>-	if (ret &amp;&amp; sta)</div><div class='del'>-		iwl_mvm_resp_del_pasn_sta(mvm, vif, sta);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='add'>+	if (sta-&gt;keyconf.keylen)</div><div class='add'>+		iwl_mvm_sec_key_del_pasn(mvm, vif, BIT(sta-&gt;int_sta.sta_id),</div><div class='add'>+					 &amp;sta-&gt;keyconf);</div><div class='ctx'> </div><div class='del'>-int iwl_mvm_ftm_resp_remove_pasn_sta(struct iwl_mvm *mvm,</div><div class='del'>-				     struct ieee80211_vif *vif, u8 *addr)</div><div class='del'>-{</div><div class='del'>-	struct iwl_mvm_pasn_sta *sta, *prev;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(sta, prev, &amp;mvm-&gt;resp_pasn_list, list) {</div><div class='del'>-		if (!memcmp(sta-&gt;addr, addr, ETH_ALEN)) {</div><div class='del'>-			iwl_mvm_resp_del_pasn_sta(mvm, vif, sta);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (iwl_mvm_has_mld_api(mvm-&gt;fw))</div><div class='add'>+		iwl_mvm_mld_rm_sta_id(mvm, sta-&gt;int_sta.sta_id);</div><div class='add'>+	else</div><div class='add'>+		iwl_mvm_rm_sta_id(mvm, vif, sta-&gt;int_sta.sta_id);</div><div class='ctx'> </div><div class='del'>-	IWL_ERR(mvm, "FTM: PASN station %pM not found\n", addr);</div><div class='del'>-	return -EINVAL;</div><div class='add'>+	iwl_mvm_dealloc_int_sta(mvm, &amp;sta-&gt;int_sta);</div><div class='add'>+	kfree(sta);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwl_mvm_ftm_start_responder(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='add'>+int iwl_mvm_ftm_start_responder(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_bss_conf *bss_conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	struct ieee80211_ftm_responder_params *params;</div><div class='hunk'>@@ -360,11 +334,11 @@ int iwl_mvm_ftm_start_responder(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 	struct iwl_mvm_phy_ctxt *phy_ctxt;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	params = vif-&gt;bss_conf.ftmr_params;</div><div class='add'>+	params = bss_conf-&gt;ftmr_params;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(!vif-&gt;bss_conf.ftm_responder))</div><div class='add'>+	if (WARN_ON_ONCE(!bss_conf-&gt;ftm_responder))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;p2p || vif-&gt;type != NL80211_IFTYPE_AP ||</div><div class='hunk'>@@ -374,7 +348,7 @@ int iwl_mvm_ftm_start_responder(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	pctx = rcu_dereference(vif-&gt;chanctx_conf);</div><div class='add'>+	pctx = rcu_dereference(bss_conf-&gt;chanctx_conf);</div><div class='ctx'> 	/* Copy the ctx to unlock the rcu and send the phy ctxt. We don't care</div><div class='ctx'> 	 * about changes in the ctx after releasing the lock because the driver</div><div class='ctx'> 	 * is still protected by the mutex. */</div><div class='hunk'>@@ -383,13 +357,13 @@ int iwl_mvm_ftm_start_responder(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	phy_ctxt = &amp;mvm-&gt;phy_ctxts[*phy_ctxt_id];</div><div class='del'>-	ret = iwl_mvm_phy_ctxt_changed(mvm, phy_ctxt, &amp;ctx.def,</div><div class='add'>+	ret = iwl_mvm_phy_ctxt_changed(mvm, phy_ctxt, &amp;ctx.def, &amp;ctx.ap,</div><div class='ctx'> 				       ctx.rx_chains_static,</div><div class='ctx'> 				       ctx.rx_chains_dynamic);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_ftm_responder_cmd(mvm, vif, &amp;ctx.def);</div><div class='add'>+	ret = iwl_mvm_ftm_responder_cmd(mvm, vif, &amp;ctx.def, bss_conf);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -411,13 +385,14 @@ void iwl_mvm_ftm_responder_clear(struct iwl_mvm *mvm,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_ftm_restart_responder(struct iwl_mvm *mvm,</div><div class='del'>-				   struct ieee80211_vif *vif)</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_bss_conf *bss_conf)</div><div class='ctx'> {</div><div class='del'>-	if (!vif-&gt;bss_conf.ftm_responder)</div><div class='add'>+	if (!bss_conf-&gt;ftm_responder)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_ftm_responder_clear(mvm, vif);</div><div class='del'>-	iwl_mvm_ftm_start_responder(mvm, vif);</div><div class='add'>+	iwl_mvm_ftm_start_responder(mvm, vif, bss_conf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_ftm_responder_stats(struct iwl_mvm *mvm,</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h<br/>index 73a82f07dc59..083f86fa5017 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include "fw/api/datapath.h"</div><div class='ctx'> #include "fw/api/phy.h"</div><div class='ctx'> #include "fw/api/config.h"</div><div class='del'>-#include "fw/api/soc.h"</div><div class='add'>+#include "fw/api/system.h"</div><div class='ctx'> #include "fw/api/alive.h"</div><div class='ctx'> #include "fw/api/binding.h"</div><div class='ctx'> #include "fw/api/cmdhdr.h"</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c<br/>index 8aa5f1a2c58c..edae13755ee6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/fw.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/fw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/fw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/fw.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2021 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -12,29 +12,25 @@</div><div class='ctx'> #include "iwl-op-mode.h"</div><div class='ctx'> #include "fw/img.h"</div><div class='ctx'> #include "iwl-debug.h"</div><div class='del'>-#include "iwl-csr.h" /* for iwl_mvm_rx_card_state_notif */</div><div class='del'>-#include "iwl-io.h" /* for iwl_mvm_rx_card_state_notif */</div><div class='ctx'> #include "iwl-prph.h"</div><div class='ctx'> #include "fw/acpi.h"</div><div class='ctx'> #include "fw/pnvm.h"</div><div class='add'>+#include "fw/uefi.h"</div><div class='add'>+#include "fw/regulatory.h"</div><div class='ctx'> </div><div class='ctx'> #include "mvm.h"</div><div class='ctx'> #include "fw/dbg.h"</div><div class='ctx'> #include "iwl-phy-db.h"</div><div class='ctx'> #include "iwl-modparams.h"</div><div class='ctx'> #include "iwl-nvm-parse.h"</div><div class='add'>+#include "time-sync.h"</div><div class='ctx'> </div><div class='del'>-#define MVM_UCODE_ALIVE_TIMEOUT	(HZ)</div><div class='add'>+#define MVM_UCODE_ALIVE_TIMEOUT	(2 * HZ)</div><div class='ctx'> #define MVM_UCODE_CALIB_TIMEOUT	(2 * HZ)</div><div class='ctx'> </div><div class='del'>-#define UCODE_VALID_OK	cpu_to_le32(0x1)</div><div class='del'>-</div><div class='del'>-#define IWL_PPAG_MASK 3</div><div class='del'>-#define IWL_PPAG_ETSI_MASK BIT(0)</div><div class='del'>-</div><div class='ctx'> struct iwl_mvm_alive_data {</div><div class='add'>+	__le32 sku_id[3];</div><div class='ctx'> 	bool valid;</div><div class='del'>-	u32 scd_base_addr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int iwl_send_tx_ant_cfg(struct iwl_mvm *mvm, u8 valid_tx_ant)</div><div class='hunk'>@@ -61,13 +57,13 @@ static int iwl_send_rss_cfg_cmd(struct iwl_mvm *mvm)</div><div class='ctx'> 			     BIT(IWL_RSS_HASH_TYPE_IPV6_PAYLOAD),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (mvm-&gt;trans-&gt;num_rx_queues == 1)</div><div class='add'>+	if (mvm-&gt;trans-&gt;info.num_rxqs == 1)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Do not direct RSS traffic to Q 0 which is our fallback queue */</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(cmd.indirection_table); i++)</div><div class='ctx'> 		cmd.indirection_table[i] =</div><div class='del'>-			1 + (i % (mvm-&gt;trans-&gt;num_rx_queues - 1));</div><div class='add'>+			1 + (i % (mvm-&gt;trans-&gt;info.num_rxqs - 1));</div><div class='ctx'> 	netdev_rss_key_fill(cmd.secret_key, sizeof(cmd.secret_key));</div><div class='ctx'> </div><div class='ctx'> 	return iwl_mvm_send_cmd_pdu(mvm, RSS_CONFIG_CMD, 0, sizeof(cmd), &amp;cmd);</div><div class='hunk'>@@ -78,7 +74,7 @@ static int iwl_mvm_send_dqa_cmd(struct iwl_mvm *mvm)</div><div class='ctx'> 	struct iwl_dqa_enable_cmd dqa_cmd = {</div><div class='ctx'> 		.cmd_queue = cpu_to_le32(IWL_MVM_DQA_CMD_QUEUE),</div><div class='ctx'> 	};</div><div class='del'>-	u32 cmd_id = iwl_cmd_id(DQA_ENABLE_CMD, DATA_PATH_GROUP, 0);</div><div class='add'>+	u32 cmd_id = WIDE_ID(DATA_PATH_GROUP, DQA_ENABLE_CMD);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_mvm_send_cmd_pdu(mvm, cmd_id, 0, sizeof(dqa_cmd), &amp;dqa_cmd);</div><div class='hunk'>@@ -95,20 +91,10 @@ void iwl_mvm_mfu_assert_dump_notif(struct iwl_mvm *mvm,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='ctx'> 	struct iwl_mfu_assert_dump_notif *mfu_dump_notif = (void *)pkt-&gt;data;</div><div class='del'>-	__le32 *dump_data = mfu_dump_notif-&gt;data;</div><div class='del'>-	int n_words = le32_to_cpu(mfu_dump_notif-&gt;data_size) / sizeof(__le32);</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (mfu_dump_notif-&gt;index_num == 0)</div><div class='ctx'> 		IWL_INFO(mvm, "MFUART assert id 0x%x occurred\n",</div><div class='ctx'> 			 le32_to_cpu(mfu_dump_notif-&gt;assert_id));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; n_words; i++)</div><div class='del'>-		IWL_DEBUG_INFO(mvm,</div><div class='del'>-			       "MFUART assert dump, dword %u: 0x%08x\n",</div><div class='del'>-			       le16_to_cpu(mfu_dump_notif-&gt;index_num) *</div><div class='del'>-			       n_words + i,</div><div class='del'>-			       le32_to_cpu(dump_data[i]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,</div><div class='hunk'>@@ -123,43 +109,81 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,</div><div class='ctx'> 	struct iwl_lmac_alive *lmac2 = NULL;</div><div class='ctx'> 	u16 status;</div><div class='ctx'> 	u32 lmac_error_event_table, umac_error_table;</div><div class='add'>+	u32 version = iwl_fw_lookup_notif_ver(mvm-&gt;fw, LEGACY_GROUP,</div><div class='add'>+					      UCODE_ALIVE_NTFY, 0);</div><div class='add'>+	u32 i;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * For v5 and above, we can check the version, for older</div><div class='del'>-	 * versions we need to check the size.</div><div class='del'>-	 */</div><div class='del'>-	if (iwl_fw_lookup_notif_ver(mvm-&gt;fw, LEGACY_GROUP,</div><div class='del'>-				    UCODE_ALIVE_NTFY, 0) == 5) {</div><div class='del'>-		struct iwl_alive_ntf_v5 *palive;</div><div class='add'>+</div><div class='add'>+	if (version &gt;= 6) {</div><div class='add'>+		struct iwl_alive_ntf_v7 *palive;</div><div class='ctx'> </div><div class='ctx'> 		if (pkt_len &lt; sizeof(*palive))</div><div class='ctx'> 			return false;</div><div class='ctx'> </div><div class='ctx'> 		palive = (void *)pkt-&gt;data;</div><div class='add'>+</div><div class='ctx'> 		umac = &amp;palive-&gt;umac_data;</div><div class='ctx'> 		lmac1 = &amp;palive-&gt;lmac_data[0];</div><div class='ctx'> 		lmac2 = &amp;palive-&gt;lmac_data[1];</div><div class='ctx'> 		status = le16_to_cpu(palive-&gt;status);</div><div class='ctx'> </div><div class='del'>-		mvm-&gt;trans-&gt;sku_id[0] = le32_to_cpu(palive-&gt;sku_id.data[0]);</div><div class='del'>-		mvm-&gt;trans-&gt;sku_id[1] = le32_to_cpu(palive-&gt;sku_id.data[1]);</div><div class='del'>-		mvm-&gt;trans-&gt;sku_id[2] = le32_to_cpu(palive-&gt;sku_id.data[2]);</div><div class='add'>+		BUILD_BUG_ON(sizeof(palive-&gt;sku_id.data) !=</div><div class='add'>+			     sizeof(alive_data-&gt;sku_id));</div><div class='add'>+		memcpy(alive_data-&gt;sku_id, palive-&gt;sku_id.data,</div><div class='add'>+		       sizeof(palive-&gt;sku_id.data));</div><div class='ctx'> </div><div class='ctx'> 		IWL_DEBUG_FW(mvm, "Got sku_id: 0x0%x 0x0%x 0x0%x\n",</div><div class='del'>-			     mvm-&gt;trans-&gt;sku_id[0],</div><div class='del'>-			     mvm-&gt;trans-&gt;sku_id[1],</div><div class='del'>-			     mvm-&gt;trans-&gt;sku_id[2]);</div><div class='del'>-	} else if (iwl_rx_packet_payload_len(pkt) == sizeof(struct iwl_alive_ntf_v4)) {</div><div class='del'>-		struct iwl_alive_ntf_v4 *palive;</div><div class='add'>+			     le32_to_cpu(alive_data-&gt;sku_id[0]),</div><div class='add'>+			     le32_to_cpu(alive_data-&gt;sku_id[1]),</div><div class='add'>+			     le32_to_cpu(alive_data-&gt;sku_id[2]));</div><div class='add'>+</div><div class='add'>+		mvm-&gt;trans-&gt;dbg.imr_data.imr_enable =</div><div class='add'>+			le32_to_cpu(palive-&gt;imr.enabled);</div><div class='add'>+		mvm-&gt;trans-&gt;dbg.imr_data.imr_size =</div><div class='add'>+			le32_to_cpu(palive-&gt;imr.size);</div><div class='add'>+		mvm-&gt;trans-&gt;dbg.imr_data.imr2sram_remainbyte =</div><div class='add'>+			mvm-&gt;trans-&gt;dbg.imr_data.imr_size;</div><div class='add'>+		mvm-&gt;trans-&gt;dbg.imr_data.imr_base_addr =</div><div class='add'>+			palive-&gt;imr.base_addr;</div><div class='add'>+		mvm-&gt;trans-&gt;dbg.imr_data.imr_curr_addr =</div><div class='add'>+			le64_to_cpu(mvm-&gt;trans-&gt;dbg.imr_data.imr_base_addr);</div><div class='add'>+		IWL_DEBUG_FW(mvm, "IMR Enabled: 0x0%x  size 0x0%x Address 0x%016llx\n",</div><div class='add'>+			     mvm-&gt;trans-&gt;dbg.imr_data.imr_enable,</div><div class='add'>+			     mvm-&gt;trans-&gt;dbg.imr_data.imr_size,</div><div class='add'>+			     le64_to_cpu(mvm-&gt;trans-&gt;dbg.imr_data.imr_base_addr));</div><div class='add'>+</div><div class='add'>+		if (!mvm-&gt;trans-&gt;dbg.imr_data.imr_enable) {</div><div class='add'>+			for (i = 0; i &lt; ARRAY_SIZE(mvm-&gt;trans-&gt;dbg.active_regions); i++) {</div><div class='add'>+				struct iwl_ucode_tlv *reg_tlv;</div><div class='add'>+				struct iwl_fw_ini_region_tlv *reg;</div><div class='add'>+</div><div class='add'>+				reg_tlv = mvm-&gt;trans-&gt;dbg.active_regions[i];</div><div class='add'>+				if (!reg_tlv)</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				reg = (void *)reg_tlv-&gt;data;</div><div class='add'>+				/*</div><div class='add'>+				 * We have only one DRAM IMR region, so we</div><div class='add'>+				 * can break as soon as we find the first</div><div class='add'>+				 * one.</div><div class='add'>+				 */</div><div class='add'>+				if (reg-&gt;type == IWL_FW_INI_REGION_DRAM_IMR) {</div><div class='add'>+					mvm-&gt;trans-&gt;dbg.unsupported_region_msk |= BIT(i);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		if (pkt_len &lt; sizeof(*palive))</div><div class='del'>-			return false;</div><div class='add'>+		if (version &gt;= 8) {</div><div class='add'>+			const struct iwl_alive_ntf *palive_v8 =</div><div class='add'>+				(void *)pkt-&gt;data;</div><div class='ctx'> </div><div class='del'>-		palive = (void *)pkt-&gt;data;</div><div class='del'>-		umac = &amp;palive-&gt;umac_data;</div><div class='del'>-		lmac1 = &amp;palive-&gt;lmac_data[0];</div><div class='del'>-		lmac2 = &amp;palive-&gt;lmac_data[1];</div><div class='del'>-		status = le16_to_cpu(palive-&gt;status);</div><div class='add'>+			if (pkt_len &lt; sizeof(*palive_v8))</div><div class='add'>+				return false;</div><div class='add'>+</div><div class='add'>+			IWL_DEBUG_FW(mvm, "platform id: 0x%llx\n",</div><div class='add'>+				     palive_v8-&gt;platform_id);</div><div class='add'>+		}</div><div class='ctx'> 	} else if (iwl_rx_packet_payload_len(pkt) ==</div><div class='ctx'> 		   sizeof(struct iwl_alive_ntf_v3)) {</div><div class='ctx'> 		struct iwl_alive_ntf_v3 *palive3;</div><div class='hunk'>@@ -190,20 +214,10 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,</div><div class='ctx'> 							~FW_ADDR_CACHE_CONTROL;</div><div class='ctx'> </div><div class='ctx'> 	if (umac_error_table) {</div><div class='del'>-		if (umac_error_table &gt;=</div><div class='del'>-		    mvm-&gt;trans-&gt;cfg-&gt;min_umac_error_event_table) {</div><div class='del'>-			iwl_fw_umac_set_alive_err_table(mvm-&gt;trans,</div><div class='del'>-							umac_error_table);</div><div class='del'>-		} else {</div><div class='del'>-			IWL_ERR(mvm,</div><div class='del'>-				"Not valid error log pointer 0x%08X for %s uCode\n",</div><div class='del'>-				umac_error_table,</div><div class='del'>-				(mvm-&gt;fwrt.cur_fw_img == IWL_UCODE_INIT) ?</div><div class='del'>-				"Init" : "RT");</div><div class='del'>-		}</div><div class='add'>+		iwl_fw_umac_set_alive_err_table(mvm-&gt;trans,</div><div class='add'>+						umac_error_table);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	alive_data-&gt;scd_base_addr = le32_to_cpu(lmac1-&gt;dbg_ptrs.scd_base_ptr);</div><div class='ctx'> 	alive_data-&gt;valid = status == IWL_ALIVE_STATUS_OK;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_FW(mvm,</div><div class='hunk'>@@ -246,27 +260,47 @@ static bool iwl_wait_phy_db_entry(struct iwl_notif_wait_data *notif_wait,</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void iwl_mvm_print_pd_notification(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+#define IWL_FW_PRINT_REG_INFO(reg_name) \</div><div class='add'>+	IWL_ERR(mvm, #reg_name ": 0x%x\n", iwl_read_umac_prph(trans, reg_name))</div><div class='add'>+</div><div class='add'>+	struct iwl_trans *trans = mvm-&gt;trans;</div><div class='add'>+	enum iwl_device_family device_family = trans-&gt;mac_cfg-&gt;device_family;</div><div class='add'>+</div><div class='add'>+	if (device_family &lt; IWL_DEVICE_FAMILY_8000)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (device_family &lt;= IWL_DEVICE_FAMILY_9000)</div><div class='add'>+		IWL_FW_PRINT_REG_INFO(WFPM_ARC1_PD_NOTIFICATION);</div><div class='add'>+	else</div><div class='add'>+		IWL_FW_PRINT_REG_INFO(WFPM_LMAC1_PD_NOTIFICATION);</div><div class='add'>+</div><div class='add'>+	IWL_FW_PRINT_REG_INFO(HPM_SECONDARY_DEVICE_STATE);</div><div class='add'>+</div><div class='add'>+	/* print OPT info */</div><div class='add'>+	IWL_FW_PRINT_REG_INFO(WFPM_MAC_OTP_CFG7_ADDR);</div><div class='add'>+	IWL_FW_PRINT_REG_INFO(WFPM_MAC_OTP_CFG7_DATA);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,</div><div class='ctx'> 					 enum iwl_ucode_type ucode_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_notification_wait alive_wait;</div><div class='ctx'> 	struct iwl_mvm_alive_data alive_data = {};</div><div class='del'>-	const struct fw_img *fw;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	enum iwl_ucode_type old_type = mvm-&gt;fwrt.cur_fw_img;</div><div class='ctx'> 	static const u16 alive_cmd[] = { UCODE_ALIVE_NTFY };</div><div class='ctx'> 	bool run_in_rfkill =</div><div class='ctx'> 		ucode_type == IWL_UCODE_INIT || iwl_mvm_has_unified_ucode(mvm);</div><div class='add'>+	u8 count;</div><div class='add'>+	struct iwl_pc_data *pc_data;</div><div class='ctx'> </div><div class='ctx'> 	if (ucode_type == IWL_UCODE_REGULAR &amp;&amp;</div><div class='ctx'> 	    iwl_fw_dbg_conf_usniffer(mvm-&gt;fw, FW_DBG_START_FROM_ALIVE) &amp;&amp;</div><div class='ctx'> 	    !(fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 			  IWL_UCODE_TLV_CAPA_USNIFFER_UNIFIED)))</div><div class='del'>-		fw = iwl_get_ucode_image(mvm-&gt;fw, IWL_UCODE_REGULAR_USNIFFER);</div><div class='del'>-	else</div><div class='del'>-		fw = iwl_get_ucode_image(mvm-&gt;fw, ucode_type);</div><div class='del'>-	if (WARN_ON(!fw))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ucode_type = IWL_UCODE_REGULAR_USNIFFER;</div><div class='ctx'> 	iwl_fw_set_current_image(&amp;mvm-&gt;fwrt, ucode_type);</div><div class='ctx'> 	clear_bit(IWL_MVM_STATUS_FIRMWARE_RUNNING, &amp;mvm-&gt;status);</div><div class='ctx'> </div><div class='hunk'>@@ -279,7 +313,8 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,</div><div class='ctx'> 	 * For the unified firmware case, the ucode_type is not</div><div class='ctx'> 	 * INIT, but we still need to run it.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = iwl_trans_start_fw(mvm-&gt;trans, fw, run_in_rfkill);</div><div class='add'>+	ret = iwl_trans_start_fw(mvm-&gt;trans, mvm-&gt;fw, ucode_type,</div><div class='add'>+				 run_in_rfkill);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		iwl_fw_set_current_image(&amp;mvm-&gt;fwrt, old_type);</div><div class='ctx'> 		iwl_remove_notification(&amp;mvm-&gt;notif_wait, &amp;alive_wait);</div><div class='hunk'>@@ -292,16 +327,52 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = iwl_wait_notification(&amp;mvm-&gt;notif_wait, &amp;alive_wait,</div><div class='ctx'> 				    MVM_UCODE_ALIVE_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family ==</div><div class='add'>+	    IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+		/* print these registers regardless of alive fail/success */</div><div class='add'>+		IWL_INFO(mvm, "WFPM_UMAC_PD_NOTIFICATION: 0x%x\n",</div><div class='add'>+			 iwl_read_umac_prph(mvm-&gt;trans, WFPM_ARC1_PD_NOTIFICATION));</div><div class='add'>+		IWL_INFO(mvm, "WFPM_LMAC2_PD_NOTIFICATION: 0x%x\n",</div><div class='add'>+			 iwl_read_umac_prph(mvm-&gt;trans, WFPM_LMAC2_PD_NOTIFICATION));</div><div class='add'>+		IWL_INFO(mvm, "WFPM_AUTH_KEY_0: 0x%x\n",</div><div class='add'>+			 iwl_read_umac_prph(mvm-&gt;trans, SB_MODIFY_CFG_FLAG));</div><div class='add'>+		IWL_INFO(mvm, "CNVI_SCU_SEQ_DATA_DW9: 0x%x\n",</div><div class='add'>+			 iwl_read_prph(mvm-&gt;trans, CNVI_SCU_SEQ_DATA_DW9));</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		struct iwl_trans *trans = mvm-&gt;trans;</div><div class='ctx'> </div><div class='del'>-		if (trans-&gt;trans_cfg-&gt;device_family &gt;=</div><div class='add'>+		/* SecBoot info */</div><div class='add'>+		if (trans-&gt;mac_cfg-&gt;device_family &gt;=</div><div class='ctx'> 					IWL_DEVICE_FAMILY_22000) {</div><div class='ctx'> 			IWL_ERR(mvm,</div><div class='ctx'> 				"SecBoot CPU1 Status: 0x%x, CPU2 Status: 0x%x\n",</div><div class='ctx'> 				iwl_read_umac_prph(trans, UMAG_SB_CPU_1_STATUS),</div><div class='ctx'> 				iwl_read_umac_prph(trans,</div><div class='ctx'> 						   UMAG_SB_CPU_2_STATUS));</div><div class='add'>+		} else if (trans-&gt;mac_cfg-&gt;device_family &gt;=</div><div class='add'>+			   IWL_DEVICE_FAMILY_8000) {</div><div class='add'>+			IWL_ERR(mvm,</div><div class='add'>+				"SecBoot CPU1 Status: 0x%x, CPU2 Status: 0x%x\n",</div><div class='add'>+				iwl_read_prph(trans, SB_CPU_1_STATUS),</div><div class='add'>+				iwl_read_prph(trans, SB_CPU_2_STATUS));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		iwl_mvm_print_pd_notification(mvm);</div><div class='add'>+</div><div class='add'>+		/* LMAC/UMAC PC info */</div><div class='add'>+		if (trans-&gt;mac_cfg-&gt;device_family &gt;=</div><div class='add'>+					IWL_DEVICE_FAMILY_22000) {</div><div class='add'>+			pc_data = trans-&gt;dbg.pc_data;</div><div class='add'>+			for (count = 0; count &lt; trans-&gt;dbg.num_pc;</div><div class='add'>+			     count++, pc_data++)</div><div class='add'>+				IWL_ERR(mvm, "%s: 0x%x\n",</div><div class='add'>+					pc_data-&gt;pc_name,</div><div class='add'>+					pc_data-&gt;pc_address);</div><div class='add'>+		} else if (trans-&gt;mac_cfg-&gt;device_family &gt;=</div><div class='add'>+					IWL_DEVICE_FAMILY_9000) {</div><div class='ctx'> 			IWL_ERR(mvm, "UMAC PC: 0x%x\n",</div><div class='ctx'> 				iwl_read_umac_prph(trans,</div><div class='ctx'> 						   UREG_UMAC_CURRENT_PC));</div><div class='hunk'>@@ -312,15 +383,9 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,</div><div class='ctx'> 				IWL_ERR(mvm, "LMAC2 PC: 0x%x\n",</div><div class='ctx'> 					iwl_read_umac_prph(trans,</div><div class='ctx'> 						UREG_LMAC2_CURRENT_PC));</div><div class='del'>-		} else if (trans-&gt;trans_cfg-&gt;device_family &gt;=</div><div class='del'>-			   IWL_DEVICE_FAMILY_8000) {</div><div class='del'>-			IWL_ERR(mvm,</div><div class='del'>-				"SecBoot CPU1 Status: 0x%x, CPU2 Status: 0x%x\n",</div><div class='del'>-				iwl_read_prph(trans, SB_CPU_1_STATUS),</div><div class='del'>-				iwl_read_prph(trans, SB_CPU_2_STATUS));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (ret == -ETIMEDOUT)</div><div class='add'>+		if (ret == -ETIMEDOUT &amp;&amp; !mvm-&gt;fw_product_reset)</div><div class='ctx'> 			iwl_fw_dbg_error_collect(&amp;mvm-&gt;fwrt,</div><div class='ctx'> 						 FW_DBG_TRIGGER_ALIVE_TIMEOUT);</div><div class='ctx'> </div><div class='hunk'>@@ -334,15 +399,19 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = iwl_pnvm_load(mvm-&gt;trans, &amp;mvm-&gt;notif_wait);</div><div class='add'>+	/* if reached this point, Alive notification was received */</div><div class='add'>+	iwl_mei_alive_notif(true);</div><div class='add'>+</div><div class='add'>+	iwl_trans_fw_alive(mvm-&gt;trans);</div><div class='add'>+</div><div class='add'>+	ret = iwl_pnvm_load(mvm-&gt;trans, &amp;mvm-&gt;notif_wait,</div><div class='add'>+			    mvm-&gt;fw, alive_data.sku_id);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		IWL_ERR(mvm, "Timeout waiting for PNVM load!\n");</div><div class='ctx'> 		iwl_fw_set_current_image(&amp;mvm-&gt;fwrt, old_type);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	iwl_trans_fw_alive(mvm-&gt;trans, alive_data.scd_base_addr);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Note: all the queues are enabled as part of the interface</div><div class='ctx'> 	 * initialization, but in firmware restart scenarios they</div><div class='hunk'>@@ -368,16 +437,145 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * For pre-MLD API (MLD API doesn't use the timestamps):</div><div class='ctx'> 	 * All the BSSes in the BSS table include the GP2 in the system</div><div class='ctx'> 	 * at the beacon Rx time, this is of course no longer relevant</div><div class='ctx'> 	 * since we are resetting the firmware.</div><div class='ctx'> 	 * Purge all the BSS table.</div><div class='ctx'> 	 */</div><div class='del'>-	cfg80211_bss_flush(mvm-&gt;hw-&gt;wiphy);</div><div class='add'>+	if (!mvm-&gt;mld_api_is_used)</div><div class='add'>+		cfg80211_bss_flush(mvm-&gt;hw-&gt;wiphy);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void iwl_mvm_phy_filter_init(struct iwl_mvm *mvm,</div><div class='add'>+				    struct iwl_phy_specific_cfg *phy_filters)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_ACPI</div><div class='add'>+	*phy_filters = mvm-&gt;fwrt.phy_filters;</div><div class='add'>+#endif /* CONFIG_ACPI */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_uats_init(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	u8 cmd_ver;</div><div class='add'>+	int ret;</div><div class='add'>+	struct iwl_host_cmd cmd = {</div><div class='add'>+		.id = WIDE_ID(REGULATORY_AND_NVM_GROUP,</div><div class='add'>+			      MCC_ALLOWED_AP_TYPE_CMD),</div><div class='add'>+		.flags = 0,</div><div class='add'>+		.data[0] = &amp;mvm-&gt;fwrt.uats_table,</div><div class='add'>+		.len[0] =  sizeof(mvm-&gt;fwrt.uats_table),</div><div class='add'>+		.dataflags[0] = IWL_HCMD_DFL_NOCOPY,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+		IWL_DEBUG_RADIO(mvm, "UATS feature is not supported\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, cmd.id,</div><div class='add'>+					IWL_FW_CMD_VER_UNKNOWN);</div><div class='add'>+	if (cmd_ver != 1) {</div><div class='add'>+		IWL_DEBUG_RADIO(mvm,</div><div class='add'>+				"MCC_ALLOWED_AP_TYPE_CMD ver %d not supported\n",</div><div class='add'>+				cmd_ver);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_uefi_get_uats_table(mvm-&gt;trans, &amp;mvm-&gt;fwrt);</div><div class='add'>+</div><div class='add'>+	if (!mvm-&gt;fwrt.uats_valid)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_send_cmd(mvm, &amp;cmd);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		IWL_ERR(mvm, "failed to send MCC_ALLOWED_AP_TYPE_CMD (%d)\n",</div><div class='add'>+			ret);</div><div class='add'>+	else</div><div class='add'>+		IWL_DEBUG_RADIO(mvm, "MCC_ALLOWED_AP_TYPE_CMD sent to FW\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_sgom_init(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	u8 cmd_ver;</div><div class='add'>+	int ret;</div><div class='add'>+	struct iwl_host_cmd cmd = {</div><div class='add'>+		.id = WIDE_ID(REGULATORY_AND_NVM_GROUP,</div><div class='add'>+			      SAR_OFFSET_MAPPING_TABLE_CMD),</div><div class='add'>+		.flags = 0,</div><div class='add'>+		.data[0] = &amp;mvm-&gt;fwrt.sgom_table,</div><div class='add'>+		.len[0] =  sizeof(mvm-&gt;fwrt.sgom_table),</div><div class='add'>+		.dataflags[0] = IWL_HCMD_DFL_NOCOPY,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!mvm-&gt;fwrt.sgom_enabled) {</div><div class='add'>+		IWL_DEBUG_RADIO(mvm, "SGOM table is disabled\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, cmd.id,</div><div class='add'>+					IWL_FW_CMD_VER_UNKNOWN);</div><div class='add'>+</div><div class='add'>+	if (cmd_ver != 2) {</div><div class='add'>+		IWL_DEBUG_RADIO(mvm, "command version is unsupported. version = %d\n",</div><div class='add'>+				cmd_ver);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_send_cmd(mvm, &amp;cmd);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		IWL_ERR(mvm, "failed to send SAR_OFFSET_MAPPING_CMD (%d)\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_send_phy_cfg_cmd(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	u32 cmd_id = PHY_CONFIGURATION_CMD;</div><div class='add'>+	struct iwl_phy_cfg_cmd_v3 phy_cfg_cmd;</div><div class='add'>+	enum iwl_ucode_type ucode_type = mvm-&gt;fwrt.cur_fw_img;</div><div class='add'>+	u8 cmd_ver;</div><div class='add'>+	size_t cmd_size;</div><div class='add'>+</div><div class='add'>+	if (iwl_mvm_has_unified_ucode(mvm) &amp;&amp;</div><div class='add'>+	    !mvm-&gt;trans-&gt;cfg-&gt;tx_with_siso_diversity)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (mvm-&gt;trans-&gt;cfg-&gt;tx_with_siso_diversity) {</div><div class='add'>+		/*</div><div class='add'>+		 * TODO: currently we don't set the antenna but letting the NIC</div><div class='add'>+		 * to decide which antenna to use. This should come from BIOS.</div><div class='add'>+		 */</div><div class='add'>+		phy_cfg_cmd.phy_cfg =</div><div class='add'>+			cpu_to_le32(FW_PHY_CFG_CHAIN_SAD_ENABLED);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set parameters */</div><div class='add'>+	phy_cfg_cmd.phy_cfg = cpu_to_le32(iwl_mvm_get_phy_config(mvm));</div><div class='add'>+</div><div class='add'>+	/* set flags extra PHY configuration flags from the device's cfg */</div><div class='add'>+	phy_cfg_cmd.phy_cfg |=</div><div class='add'>+		cpu_to_le32(mvm-&gt;trans-&gt;mac_cfg-&gt;extra_phy_cfg_flags);</div><div class='add'>+</div><div class='add'>+	phy_cfg_cmd.calib_control.event_trigger =</div><div class='add'>+		mvm-&gt;fw-&gt;default_calib[ucode_type].event_trigger;</div><div class='add'>+	phy_cfg_cmd.calib_control.flow_trigger =</div><div class='add'>+		mvm-&gt;fw-&gt;default_calib[ucode_type].flow_trigger;</div><div class='add'>+</div><div class='add'>+	cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, cmd_id,</div><div class='add'>+					IWL_FW_CMD_VER_UNKNOWN);</div><div class='add'>+	if (cmd_ver &gt;= 3)</div><div class='add'>+		iwl_mvm_phy_filter_init(mvm, &amp;phy_cfg_cmd.phy_specific_cfg);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(mvm, "Sending Phy CFG command: 0x%x\n",</div><div class='add'>+		       phy_cfg_cmd.phy_cfg);</div><div class='add'>+	cmd_size = (cmd_ver == 3) ? sizeof(struct iwl_phy_cfg_cmd_v3) :</div><div class='add'>+				    sizeof(struct iwl_phy_cfg_cmd_v1);</div><div class='add'>+	return iwl_mvm_send_cmd_pdu(mvm, cmd_id, 0, cmd_size, &amp;phy_cfg_cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_notification_wait init_wait;</div><div class='hunk'>@@ -388,6 +586,7 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm)</div><div class='ctx'> 	static const u16 init_complete[] = {</div><div class='ctx'> 		INIT_COMPLETE_NOTIF,</div><div class='ctx'> 	};</div><div class='add'>+	u32 sb_cfg;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (mvm-&gt;trans-&gt;cfg-&gt;tx_with_siso_diversity)</div><div class='hunk'>@@ -397,6 +596,14 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm)</div><div class='ctx'> </div><div class='ctx'> 	mvm-&gt;rfkill_safe_init_done = false;</div><div class='ctx'> </div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family == IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+		sb_cfg = iwl_read_umac_prph(mvm-&gt;trans, SB_MODIFY_CFG_FLAG);</div><div class='add'>+		/* if needed, we'll reset this on our way out later */</div><div class='add'>+		mvm-&gt;fw_product_reset = sb_cfg == SB_CFG_RESIDES_IN_ROM;</div><div class='add'>+		if (mvm-&gt;fw_product_reset &amp;&amp; iwl_mei_pldr_req())</div><div class='add'>+			return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	iwl_init_notification_wait(&amp;mvm-&gt;notif_wait,</div><div class='ctx'> 				   &amp;init_wait,</div><div class='ctx'> 				   init_complete,</div><div class='hunk'>@@ -410,6 +617,14 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm)</div><div class='ctx'> 	ret = iwl_mvm_load_ucode_wait_alive(mvm, IWL_UCODE_REGULAR);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		IWL_ERR(mvm, "Failed to start RT ucode: %d\n", ret);</div><div class='add'>+</div><div class='add'>+		/* if we needed reset then fail here, but notify and remove */</div><div class='add'>+		if (mvm-&gt;fw_product_reset) {</div><div class='add'>+			iwl_mei_alive_notif(false);</div><div class='add'>+			iwl_trans_pcie_reset(mvm-&gt;trans,</div><div class='add'>+					     IWL_RESET_MODE_RESCAN);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> 	iwl_dbg_tlv_time_point(&amp;mvm-&gt;fwrt, IWL_FW_INI_TIME_POINT_AFTER_ALIVE,</div><div class='hunk'>@@ -439,14 +654,6 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm)</div><div class='ctx'> 			goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (IWL_MVM_PARSE_NVM &amp;&amp; !mvm-&gt;nvm_data) {</div><div class='del'>-		ret = iwl_nvm_init(mvm);</div><div class='del'>-		if (ret) {</div><div class='del'>-			IWL_ERR(mvm, "Failed to read NVM: %d\n", ret);</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ret = iwl_mvm_send_cmd_pdu(mvm, WIDE_ID(REGULATORY_AND_NVM_GROUP,</div><div class='ctx'> 						NVM_ACCESS_COMPLETE),</div><div class='ctx'> 				   CMD_SEND_IN_RFKILL,</div><div class='hunk'>@@ -457,6 +664,13 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm)</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = iwl_send_phy_cfg_cmd(mvm);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mvm, "Failed to run PHY configuration: %d\n",</div><div class='add'>+			ret);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* We wait for the INIT complete notification */</div><div class='ctx'> 	ret = iwl_wait_notification(&amp;mvm-&gt;notif_wait, &amp;init_wait,</div><div class='ctx'> 				    MVM_UCODE_ALIVE_TIMEOUT);</div><div class='hunk'>@@ -464,8 +678,9 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Read the NVM only at driver load time, no need to do this twice */</div><div class='del'>-	if (!IWL_MVM_PARSE_NVM &amp;&amp; !mvm-&gt;nvm_data) {</div><div class='del'>-		mvm-&gt;nvm_data = iwl_get_nvm(mvm-&gt;trans, mvm-&gt;fw);</div><div class='add'>+	if (!mvm-&gt;nvm_data) {</div><div class='add'>+		mvm-&gt;nvm_data = iwl_get_nvm(mvm-&gt;trans, mvm-&gt;fw,</div><div class='add'>+					    mvm-&gt;set_tx_ant, mvm-&gt;set_rx_ant);</div><div class='ctx'> 		if (IS_ERR(mvm-&gt;nvm_data)) {</div><div class='ctx'> 			ret = PTR_ERR(mvm-&gt;nvm_data);</div><div class='ctx'> 			mvm-&gt;nvm_data = NULL;</div><div class='hunk'>@@ -483,92 +698,6 @@ error:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ACPI</div><div class='del'>-static void iwl_mvm_phy_filter_init(struct iwl_mvm *mvm,</div><div class='del'>-				    struct iwl_phy_specific_cfg *phy_filters)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * TODO: read specific phy config from BIOS</div><div class='del'>-	 * ACPI table for this feature has not been defined yet,</div><div class='del'>-	 * so for now we use hardcoded values.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (IWL_MVM_PHY_FILTER_CHAIN_A) {</div><div class='del'>-		phy_filters-&gt;filter_cfg_chain_a =</div><div class='del'>-			cpu_to_le32(IWL_MVM_PHY_FILTER_CHAIN_A);</div><div class='del'>-	}</div><div class='del'>-	if (IWL_MVM_PHY_FILTER_CHAIN_B) {</div><div class='del'>-		phy_filters-&gt;filter_cfg_chain_b =</div><div class='del'>-			cpu_to_le32(IWL_MVM_PHY_FILTER_CHAIN_B);</div><div class='del'>-	}</div><div class='del'>-	if (IWL_MVM_PHY_FILTER_CHAIN_C) {</div><div class='del'>-		phy_filters-&gt;filter_cfg_chain_c =</div><div class='del'>-			cpu_to_le32(IWL_MVM_PHY_FILTER_CHAIN_C);</div><div class='del'>-	}</div><div class='del'>-	if (IWL_MVM_PHY_FILTER_CHAIN_D) {</div><div class='del'>-		phy_filters-&gt;filter_cfg_chain_d =</div><div class='del'>-			cpu_to_le32(IWL_MVM_PHY_FILTER_CHAIN_D);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else /* CONFIG_ACPI */</div><div class='del'>-</div><div class='del'>-static void iwl_mvm_phy_filter_init(struct iwl_mvm *mvm,</div><div class='del'>-				    struct iwl_phy_specific_cfg *phy_filters)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_ACPI */</div><div class='del'>-</div><div class='del'>-static int iwl_send_phy_cfg_cmd(struct iwl_mvm *mvm)</div><div class='del'>-{</div><div class='del'>-	struct iwl_phy_cfg_cmd_v3 phy_cfg_cmd;</div><div class='del'>-	enum iwl_ucode_type ucode_type = mvm-&gt;fwrt.cur_fw_img;</div><div class='del'>-	struct iwl_phy_specific_cfg phy_filters = {};</div><div class='del'>-	u8 cmd_ver;</div><div class='del'>-	size_t cmd_size;</div><div class='del'>-</div><div class='del'>-	if (iwl_mvm_has_unified_ucode(mvm) &amp;&amp;</div><div class='del'>-	    !mvm-&gt;trans-&gt;cfg-&gt;tx_with_siso_diversity)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (mvm-&gt;trans-&gt;cfg-&gt;tx_with_siso_diversity) {</div><div class='del'>-		/*</div><div class='del'>-		 * TODO: currently we don't set the antenna but letting the NIC</div><div class='del'>-		 * to decide which antenna to use. This should come from BIOS.</div><div class='del'>-		 */</div><div class='del'>-		phy_cfg_cmd.phy_cfg =</div><div class='del'>-			cpu_to_le32(FW_PHY_CFG_CHAIN_SAD_ENABLED);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set parameters */</div><div class='del'>-	phy_cfg_cmd.phy_cfg = cpu_to_le32(iwl_mvm_get_phy_config(mvm));</div><div class='del'>-</div><div class='del'>-	/* set flags extra PHY configuration flags from the device's cfg */</div><div class='del'>-	phy_cfg_cmd.phy_cfg |=</div><div class='del'>-		cpu_to_le32(mvm-&gt;trans-&gt;trans_cfg-&gt;extra_phy_cfg_flags);</div><div class='del'>-</div><div class='del'>-	phy_cfg_cmd.calib_control.event_trigger =</div><div class='del'>-		mvm-&gt;fw-&gt;default_calib[ucode_type].event_trigger;</div><div class='del'>-	phy_cfg_cmd.calib_control.flow_trigger =</div><div class='del'>-		mvm-&gt;fw-&gt;default_calib[ucode_type].flow_trigger;</div><div class='del'>-</div><div class='del'>-	cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, IWL_ALWAYS_LONG_GROUP,</div><div class='del'>-					PHY_CONFIGURATION_CMD,</div><div class='del'>-					IWL_FW_CMD_VER_UNKNOWN);</div><div class='del'>-	if (cmd_ver == 3) {</div><div class='del'>-		iwl_mvm_phy_filter_init(mvm, &amp;phy_filters);</div><div class='del'>-		memcpy(&amp;phy_cfg_cmd.phy_specific_cfg, &amp;phy_filters,</div><div class='del'>-		       sizeof(struct iwl_phy_specific_cfg));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(mvm, "Sending Phy CFG command: 0x%x\n",</div><div class='del'>-		       phy_cfg_cmd.phy_cfg);</div><div class='del'>-	cmd_size = (cmd_ver == 3) ? sizeof(struct iwl_phy_cfg_cmd_v3) :</div><div class='del'>-				    sizeof(struct iwl_phy_cfg_cmd_v1);</div><div class='del'>-	return iwl_mvm_send_cmd_pdu(mvm, PHY_CONFIGURATION_CMD, 0,</div><div class='del'>-				    cmd_size, &amp;phy_cfg_cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_notification_wait calib_wait;</div><div class='hunk'>@@ -601,7 +730,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm)</div><div class='ctx'> 		goto remove_notif;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mvm-&gt;trans-&gt;trans_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_8000) {</div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_8000) {</div><div class='ctx'> 		ret = iwl_mvm_send_bt_init_conf(mvm);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto remove_notif;</div><div class='hunk'>@@ -674,7 +803,7 @@ remove_notif:</div><div class='ctx'> 	iwl_remove_notification(&amp;mvm-&gt;notif_wait, &amp;calib_wait);</div><div class='ctx'> out:</div><div class='ctx'> 	mvm-&gt;rfkill_safe_init_done = false;</div><div class='del'>-	if (iwlmvm_mod_params.init_dbg &amp;&amp; !mvm-&gt;nvm_data) {</div><div class='add'>+	if (!mvm-&gt;nvm_data) {</div><div class='ctx'> 		/* we want to debug INIT and we have no NVM - fake */</div><div class='ctx'> 		mvm-&gt;nvm_data = kzalloc(sizeof(struct iwl_nvm_data) +</div><div class='ctx'> 					sizeof(struct ieee80211_channel) +</div><div class='hunk'>@@ -686,7 +815,7 @@ out:</div><div class='ctx'> 		mvm-&gt;nvm_data-&gt;bands[0].n_channels = 1;</div><div class='ctx'> 		mvm-&gt;nvm_data-&gt;bands[0].n_bitrates = 1;</div><div class='ctx'> 		mvm-&gt;nvm_data-&gt;bands[0].bitrates =</div><div class='del'>-			(void *)mvm-&gt;nvm_data-&gt;channels + 1;</div><div class='add'>+			(void *)(mvm-&gt;nvm_data-&gt;channels + 1);</div><div class='ctx'> 		mvm-&gt;nvm_data-&gt;bands[0].bitrates-&gt;hw_value = 10;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -699,31 +828,44 @@ static int iwl_mvm_config_ltr(struct iwl_mvm *mvm)</div><div class='ctx'> 		.flags = cpu_to_le32(LTR_CFG_FLAG_FEATURE_ENABLE),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (!mvm-&gt;trans-&gt;ltr_enabled)</div><div class='add'>+	if (!iwl_trans_is_ltr_enabled(mvm-&gt;trans))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return iwl_mvm_send_cmd_pdu(mvm, LTR_CONFIG, 0,</div><div class='ctx'> 				    sizeof(cmd), &amp;cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ACPI</div><div class='ctx'> int iwl_mvm_sar_select_profile(struct iwl_mvm *mvm, int prof_a, int prof_b)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_dev_tx_power_cmd cmd = {</div><div class='add'>+	u32 cmd_id = REDUCE_TX_POWER_CMD;</div><div class='add'>+	struct iwl_dev_tx_power_cmd_v3_v8 cmd = {</div><div class='add'>+		.common.set_mode = cpu_to_le32(IWL_TX_POWER_MODE_SET_CHAINS),</div><div class='add'>+	};</div><div class='add'>+	struct iwl_dev_tx_power_cmd cmd_v9_v10 = {</div><div class='ctx'> 		.common.set_mode = cpu_to_le32(IWL_TX_POWER_MODE_SET_CHAINS),</div><div class='ctx'> 	};</div><div class='ctx'> 	__le16 *per_chain;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u16 len = 0;</div><div class='ctx'> 	u32 n_subbands;</div><div class='del'>-	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, LONG_GROUP,</div><div class='del'>-					   REDUCE_TX_POWER_CMD,</div><div class='del'>-					   IWL_FW_CMD_VER_UNKNOWN);</div><div class='add'>+	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, cmd_id, 3);</div><div class='add'>+	void *cmd_data = &amp;cmd;</div><div class='ctx'> </div><div class='del'>-	if (cmd_ver == 6) {</div><div class='del'>-		len = sizeof(cmd.v6);</div><div class='add'>+	if (cmd_ver == 10) {</div><div class='add'>+		len = sizeof(cmd_v9_v10.v10);</div><div class='ctx'> 		n_subbands = IWL_NUM_SUB_BANDS_V2;</div><div class='del'>-		per_chain = cmd.v6.per_chain[0][0];</div><div class='add'>+		per_chain = &amp;cmd_v9_v10.v10.per_chain[0][0][0];</div><div class='add'>+		cmd_v9_v10.v10.flags =</div><div class='add'>+			cpu_to_le32(mvm-&gt;fwrt.reduced_power_flags);</div><div class='add'>+	} else if (cmd_ver == 9) {</div><div class='add'>+		len = sizeof(cmd_v9_v10.v9);</div><div class='add'>+		n_subbands = IWL_NUM_SUB_BANDS_V1;</div><div class='add'>+		per_chain = &amp;cmd_v9_v10.v9.per_chain[0][0];</div><div class='add'>+	} else if (cmd_ver == 8) {</div><div class='add'>+		len = sizeof(cmd.v8);</div><div class='add'>+		n_subbands = IWL_NUM_SUB_BANDS_V2;</div><div class='add'>+		per_chain = cmd.v8.per_chain[0][0];</div><div class='add'>+		cmd.v8.flags = cpu_to_le32(mvm-&gt;fwrt.reduced_power_flags);</div><div class='ctx'> 	} else if (fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 			      IWL_UCODE_TLV_API_REDUCE_TX_POWER)) {</div><div class='ctx'> 		len = sizeof(cmd.v5);</div><div class='hunk'>@@ -740,18 +882,26 @@ int iwl_mvm_sar_select_profile(struct iwl_mvm *mvm, int prof_a, int prof_b)</div><div class='ctx'> 		per_chain = cmd.v3.per_chain[0][0];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* all structs have the same common part, add it */</div><div class='add'>+	/* all structs have the same common part, add its length */</div><div class='ctx'> 	len += sizeof(cmd.common);</div><div class='ctx'> </div><div class='del'>-	ret = iwl_sar_select_profile(&amp;mvm-&gt;fwrt, per_chain, ACPI_SAR_NUM_TABLES,</div><div class='del'>-				     n_subbands, prof_a, prof_b);</div><div class='add'>+	if (cmd_ver &lt; 9)</div><div class='add'>+		len += sizeof(cmd.per_band);</div><div class='add'>+	else</div><div class='add'>+		cmd_data = &amp;cmd_v9_v10;</div><div class='add'>+</div><div class='add'>+	ret = iwl_sar_fill_profile(&amp;mvm-&gt;fwrt, per_chain,</div><div class='add'>+				   IWL_NUM_CHAIN_TABLES,</div><div class='add'>+				   n_subbands, prof_a, prof_b);</div><div class='ctx'> </div><div class='ctx'> 	/* return on error or if the profile is disabled (positive number) */</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	iwl_mei_set_power_limit(per_chain);</div><div class='add'>+</div><div class='ctx'> 	IWL_DEBUG_RADIO(mvm, "Sending REDUCE_TX_POWER_CMD per chain\n");</div><div class='del'>-	return iwl_mvm_send_cmd_pdu(mvm, REDUCE_TX_POWER_CMD, 0, len, &amp;cmd);</div><div class='add'>+	return iwl_mvm_send_cmd_pdu(mvm, cmd_id, 0, len, cmd_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iwl_mvm_get_sar_geo_profile(struct iwl_mvm *mvm)</div><div class='hunk'>@@ -760,16 +910,23 @@ int iwl_mvm_get_sar_geo_profile(struct iwl_mvm *mvm)</div><div class='ctx'> 	struct iwl_geo_tx_power_profiles_resp *resp;</div><div class='ctx'> 	u16 len;</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct iwl_host_cmd cmd;</div><div class='del'>-	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, PHY_OPS_GROUP,</div><div class='del'>-					   GEO_TX_POWER_LIMIT,</div><div class='add'>+	struct iwl_host_cmd cmd = {</div><div class='add'>+		.id = WIDE_ID(PHY_OPS_GROUP, PER_CHAIN_LIMIT_OFFSET_CMD),</div><div class='add'>+		.flags = CMD_WANT_SKB,</div><div class='add'>+		.data = { &amp;geo_tx_cmd },</div><div class='add'>+	};</div><div class='add'>+	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, cmd.id,</div><div class='ctx'> 					   IWL_FW_CMD_VER_UNKNOWN);</div><div class='ctx'> </div><div class='ctx'> 	/* the ops field is at the same spot for all versions, so set in v1 */</div><div class='ctx'> 	geo_tx_cmd.v1.ops =</div><div class='ctx'> 		cpu_to_le32(IWL_PER_CHAIN_OFFSET_GET_CURRENT_TABLE);</div><div class='ctx'> </div><div class='del'>-	if (cmd_ver == 3)</div><div class='add'>+	if (cmd_ver == 5)</div><div class='add'>+		len = sizeof(geo_tx_cmd.v5);</div><div class='add'>+	else if (cmd_ver == 4)</div><div class='add'>+		len = sizeof(geo_tx_cmd.v4);</div><div class='add'>+	else if (cmd_ver == 3)</div><div class='ctx'> 		len = sizeof(geo_tx_cmd.v3);</div><div class='ctx'> 	else if (fw_has_api(&amp;mvm-&gt;fwrt.fw-&gt;ucode_capa,</div><div class='ctx'> 			    IWL_UCODE_TLV_API_SAR_TABLE_VER))</div><div class='hunk'>@@ -780,12 +937,7 @@ int iwl_mvm_get_sar_geo_profile(struct iwl_mvm *mvm)</div><div class='ctx'> 	if (!iwl_sar_geo_support(&amp;mvm-&gt;fwrt))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	cmd = (struct iwl_host_cmd){</div><div class='del'>-		.id =  WIDE_ID(PHY_OPS_GROUP, GEO_TX_POWER_LIMIT),</div><div class='del'>-		.len = { len, },</div><div class='del'>-		.flags = CMD_WANT_SKB,</div><div class='del'>-		.data = { &amp;geo_tx_cmd },</div><div class='del'>-	};</div><div class='add'>+	cmd.len[0] = len;</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_mvm_send_cmd(mvm, &amp;cmd);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -796,7 +948,7 @@ int iwl_mvm_get_sar_geo_profile(struct iwl_mvm *mvm)</div><div class='ctx'> 	resp = (void *)cmd.resp_pkt-&gt;data;</div><div class='ctx'> 	ret = le32_to_cpu(resp-&gt;profile_idx);</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(ret &gt; ACPI_NUM_GEO_PROFILES))</div><div class='add'>+	if (WARN_ON(ret &gt; BIOS_GEO_MAX_PROFILE_NUM))</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> </div><div class='ctx'> 	iwl_free_resp(&amp;cmd);</div><div class='hunk'>@@ -805,39 +957,70 @@ int iwl_mvm_get_sar_geo_profile(struct iwl_mvm *mvm)</div><div class='ctx'> </div><div class='ctx'> static int iwl_mvm_sar_geo_init(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='add'>+	u32 cmd_id = WIDE_ID(PHY_OPS_GROUP, PER_CHAIN_LIMIT_OFFSET_CMD);</div><div class='ctx'> 	union iwl_geo_tx_power_profiles_cmd cmd;</div><div class='ctx'> 	u16 len;</div><div class='ctx'> 	u32 n_bands;</div><div class='add'>+	u32 n_profiles;</div><div class='add'>+	__le32 sk = cpu_to_le32(0);</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, PHY_OPS_GROUP,</div><div class='del'>-					   GEO_TX_POWER_LIMIT,</div><div class='add'>+	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, cmd_id,</div><div class='ctx'> 					   IWL_FW_CMD_VER_UNKNOWN);</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(offsetof(struct iwl_geo_tx_power_profiles_cmd_v1, ops) !=</div><div class='ctx'> 		     offsetof(struct iwl_geo_tx_power_profiles_cmd_v2, ops) ||</div><div class='ctx'> 		     offsetof(struct iwl_geo_tx_power_profiles_cmd_v2, ops) !=</div><div class='del'>-		     offsetof(struct iwl_geo_tx_power_profiles_cmd_v3, ops));</div><div class='add'>+		     offsetof(struct iwl_geo_tx_power_profiles_cmd_v3, ops) ||</div><div class='add'>+		     offsetof(struct iwl_geo_tx_power_profiles_cmd_v3, ops) !=</div><div class='add'>+		     offsetof(struct iwl_geo_tx_power_profiles_cmd_v4, ops) ||</div><div class='add'>+		     offsetof(struct iwl_geo_tx_power_profiles_cmd_v4, ops) !=</div><div class='add'>+		     offsetof(struct iwl_geo_tx_power_profiles_cmd_v5, ops));</div><div class='add'>+</div><div class='ctx'> 	/* the ops field is at the same spot for all versions, so set in v1 */</div><div class='ctx'> 	cmd.v1.ops = cpu_to_le32(IWL_PER_CHAIN_OFFSET_SET_TABLES);</div><div class='ctx'> </div><div class='del'>-	if (cmd_ver == 3) {</div><div class='add'>+	/* Only set to South Korea if the table revision is 1 */</div><div class='add'>+	if (mvm-&gt;fwrt.geo_rev == 1)</div><div class='add'>+		sk = cpu_to_le32(1);</div><div class='add'>+</div><div class='add'>+	if (cmd_ver == 5) {</div><div class='add'>+		len = sizeof(cmd.v5);</div><div class='add'>+		n_bands = ARRAY_SIZE(cmd.v5.table[0]);</div><div class='add'>+		n_profiles = BIOS_GEO_MAX_PROFILE_NUM;</div><div class='add'>+		cmd.v5.table_revision = sk;</div><div class='add'>+	} else if (cmd_ver == 4) {</div><div class='add'>+		len = sizeof(cmd.v4);</div><div class='add'>+		n_bands = ARRAY_SIZE(cmd.v4.table[0]);</div><div class='add'>+		n_profiles = BIOS_GEO_MAX_PROFILE_NUM;</div><div class='add'>+		cmd.v4.table_revision = sk;</div><div class='add'>+	} else if (cmd_ver == 3) {</div><div class='ctx'> 		len = sizeof(cmd.v3);</div><div class='ctx'> 		n_bands = ARRAY_SIZE(cmd.v3.table[0]);</div><div class='add'>+		n_profiles = BIOS_GEO_MIN_PROFILE_NUM;</div><div class='add'>+		cmd.v3.table_revision = sk;</div><div class='ctx'> 	} else if (fw_has_api(&amp;mvm-&gt;fwrt.fw-&gt;ucode_capa,</div><div class='ctx'> 			      IWL_UCODE_TLV_API_SAR_TABLE_VER)) {</div><div class='ctx'> 		len = sizeof(cmd.v2);</div><div class='ctx'> 		n_bands = ARRAY_SIZE(cmd.v2.table[0]);</div><div class='add'>+		n_profiles = BIOS_GEO_MIN_PROFILE_NUM;</div><div class='add'>+		cmd.v2.table_revision = sk;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		len = sizeof(cmd.v1);</div><div class='ctx'> 		n_bands = ARRAY_SIZE(cmd.v1.table[0]);</div><div class='add'>+		n_profiles = BIOS_GEO_MIN_PROFILE_NUM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(offsetof(struct iwl_geo_tx_power_profiles_cmd_v1, table) !=</div><div class='ctx'> 		     offsetof(struct iwl_geo_tx_power_profiles_cmd_v2, table) ||</div><div class='ctx'> 		     offsetof(struct iwl_geo_tx_power_profiles_cmd_v2, table) !=</div><div class='del'>-		     offsetof(struct iwl_geo_tx_power_profiles_cmd_v3, table));</div><div class='add'>+		     offsetof(struct iwl_geo_tx_power_profiles_cmd_v3, table) ||</div><div class='add'>+		     offsetof(struct iwl_geo_tx_power_profiles_cmd_v3, table) !=</div><div class='add'>+		     offsetof(struct iwl_geo_tx_power_profiles_cmd_v4, table) ||</div><div class='add'>+		     offsetof(struct iwl_geo_tx_power_profiles_cmd_v4, table) !=</div><div class='add'>+		     offsetof(struct iwl_geo_tx_power_profiles_cmd_v5, table));</div><div class='ctx'> 	/* the table is at the same position for all versions, so set use v1 */</div><div class='del'>-	ret = iwl_sar_geo_init(&amp;mvm-&gt;fwrt, &amp;cmd.v1.table[0][0], n_bands);</div><div class='add'>+	ret = iwl_sar_geo_fill_table(&amp;mvm-&gt;fwrt, &amp;cmd.v1.table[0][0],</div><div class='add'>+				     n_bands, n_profiles);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * It is a valid scenario to not support SAR, or miss wgds table,</div><div class='hunk'>@@ -846,184 +1029,23 @@ static int iwl_mvm_sar_geo_init(struct iwl_mvm *mvm)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Set the revision on versions that contain it.</div><div class='del'>-	 * This must be done after calling iwl_sar_geo_init().</div><div class='del'>-	 */</div><div class='del'>-	if (cmd_ver == 3)</div><div class='del'>-		cmd.v3.table_revision = cpu_to_le32(mvm-&gt;fwrt.geo_rev);</div><div class='del'>-	else if (fw_has_api(&amp;mvm-&gt;fwrt.fw-&gt;ucode_capa,</div><div class='del'>-			    IWL_UCODE_TLV_API_SAR_TABLE_VER))</div><div class='del'>-		cmd.v2.table_revision = cpu_to_le32(mvm-&gt;fwrt.geo_rev);</div><div class='del'>-</div><div class='del'>-	return iwl_mvm_send_cmd_pdu(mvm,</div><div class='del'>-				    WIDE_ID(PHY_OPS_GROUP, GEO_TX_POWER_LIMIT),</div><div class='del'>-				    0, len, &amp;cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl_mvm_get_ppag_table(struct iwl_mvm *mvm)</div><div class='del'>-{</div><div class='del'>-	union acpi_object *wifi_pkg, *data, *flags;</div><div class='del'>-	int i, j, ret, tbl_rev, num_sub_bands;</div><div class='del'>-	int idx = 2;</div><div class='del'>-	s8 *gain;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The 'flags' field is the same in v1 and in v2 so we can just</div><div class='del'>-	 * use v1 to access it.</div><div class='del'>-	 */</div><div class='del'>-	mvm-&gt;fwrt.ppag_table.v1.flags = cpu_to_le32(0);</div><div class='del'>-</div><div class='del'>-	data = iwl_acpi_get_object(mvm-&gt;dev, ACPI_PPAG_METHOD);</div><div class='del'>-	if (IS_ERR(data))</div><div class='del'>-		return PTR_ERR(data);</div><div class='del'>-</div><div class='del'>-	/* try to read ppag table rev 2 or 1 (both have the same data size) */</div><div class='del'>-	wifi_pkg = iwl_acpi_get_wifi_pkg(mvm-&gt;dev, data,</div><div class='del'>-					 ACPI_PPAG_WIFI_DATA_SIZE_V2, &amp;tbl_rev);</div><div class='del'>-	if (!IS_ERR(wifi_pkg)) {</div><div class='del'>-		if (tbl_rev == 1 || tbl_rev == 2) {</div><div class='del'>-			num_sub_bands = IWL_NUM_SUB_BANDS_V2;</div><div class='del'>-			gain = mvm-&gt;fwrt.ppag_table.v2.gain[0];</div><div class='del'>-			mvm-&gt;fwrt.ppag_ver = tbl_rev;</div><div class='del'>-			IWL_DEBUG_RADIO(mvm,</div><div class='del'>-					"Reading PPAG table v2 (tbl_rev=%d)\n",</div><div class='del'>-					tbl_rev);</div><div class='del'>-			goto read_table;</div><div class='del'>-		} else {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto out_free;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* try to read ppag table revision 0 */</div><div class='del'>-	wifi_pkg = iwl_acpi_get_wifi_pkg(mvm-&gt;dev, data,</div><div class='del'>-					 ACPI_PPAG_WIFI_DATA_SIZE_V1, &amp;tbl_rev);</div><div class='del'>-	if (!IS_ERR(wifi_pkg)) {</div><div class='del'>-		if (tbl_rev != 0) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto out_free;</div><div class='del'>-		}</div><div class='del'>-		num_sub_bands = IWL_NUM_SUB_BANDS_V1;</div><div class='del'>-		gain = mvm-&gt;fwrt.ppag_table.v1.gain[0];</div><div class='del'>-		mvm-&gt;fwrt.ppag_ver = 0;</div><div class='del'>-		IWL_DEBUG_RADIO(mvm, "Reading PPAG table v1 (tbl_rev=0)\n");</div><div class='del'>-		goto read_table;</div><div class='del'>-	}</div><div class='del'>-	ret = PTR_ERR(wifi_pkg);</div><div class='del'>-	goto out_free;</div><div class='del'>-</div><div class='del'>-read_table:</div><div class='del'>-	flags = &amp;wifi_pkg-&gt;package.elements[1];</div><div class='del'>-</div><div class='del'>-	if (flags-&gt;type != ACPI_TYPE_INTEGER) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mvm-&gt;fwrt.ppag_table.v1.flags = cpu_to_le32(flags-&gt;integer.value &amp;</div><div class='del'>-						    IWL_PPAG_MASK);</div><div class='del'>-</div><div class='del'>-	if (!mvm-&gt;fwrt.ppag_table.v1.flags) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * read, verify gain values and save them into the PPAG table.</div><div class='del'>-	 * first sub-band (j=0) corresponds to Low-Band (2.4GHz), and the</div><div class='del'>-	 * following sub-bands to High-Band (5GHz).</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; IWL_NUM_CHAIN_LIMITS; i++) {</div><div class='del'>-		for (j = 0; j &lt; num_sub_bands; j++) {</div><div class='del'>-			union acpi_object *ent;</div><div class='del'>-</div><div class='del'>-			ent = &amp;wifi_pkg-&gt;package.elements[idx++];</div><div class='del'>-			if (ent-&gt;type != ACPI_TYPE_INTEGER) {</div><div class='del'>-				ret = -EINVAL;</div><div class='del'>-				goto out_free;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			gain[i * num_sub_bands + j] = ent-&gt;integer.value;</div><div class='del'>-</div><div class='del'>-			if ((j == 0 &amp;&amp;</div><div class='del'>-			     (gain[i * num_sub_bands + j] &gt; ACPI_PPAG_MAX_LB ||</div><div class='del'>-			      gain[i * num_sub_bands + j] &lt; ACPI_PPAG_MIN_LB)) ||</div><div class='del'>-			    (j != 0 &amp;&amp;</div><div class='del'>-			     (gain[i * num_sub_bands + j] &gt; ACPI_PPAG_MAX_HB ||</div><div class='del'>-			      gain[i * num_sub_bands + j] &lt; ACPI_PPAG_MIN_HB))) {</div><div class='del'>-				mvm-&gt;fwrt.ppag_table.v1.flags = cpu_to_le32(0);</div><div class='del'>-				ret = -EINVAL;</div><div class='del'>-				goto out_free;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-out_free:</div><div class='del'>-	kfree(data);</div><div class='del'>-	return ret;</div><div class='add'>+	return iwl_mvm_send_cmd_pdu(mvm, cmd_id, 0, len, &amp;cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iwl_mvm_ppag_send_cmd(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='del'>-	u8 cmd_ver;</div><div class='del'>-	int i, j, ret, num_sub_bands, cmd_size;</div><div class='del'>-	s8 *gain;</div><div class='del'>-</div><div class='del'>-	if (!fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa, IWL_UCODE_TLV_CAPA_SET_PPAG)) {</div><div class='del'>-		IWL_DEBUG_RADIO(mvm,</div><div class='del'>-				"PPAG capability not supported by FW, command not sent.\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (!mvm-&gt;fwrt.ppag_table.v1.flags) {</div><div class='del'>-		IWL_DEBUG_RADIO(mvm, "PPAG not enabled, command not sent.\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+	union iwl_ppag_table_cmd cmd;</div><div class='add'>+	int ret, cmd_size;</div><div class='ctx'> </div><div class='del'>-	cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, PHY_OPS_GROUP,</div><div class='del'>-					PER_PLATFORM_ANT_GAIN_CMD,</div><div class='del'>-					IWL_FW_CMD_VER_UNKNOWN);</div><div class='del'>-	if (cmd_ver == 1) {</div><div class='del'>-		num_sub_bands = IWL_NUM_SUB_BANDS_V1;</div><div class='del'>-		gain = mvm-&gt;fwrt.ppag_table.v1.gain[0];</div><div class='del'>-		cmd_size = sizeof(mvm-&gt;fwrt.ppag_table.v1);</div><div class='del'>-		if (mvm-&gt;fwrt.ppag_ver == 1 || mvm-&gt;fwrt.ppag_ver == 2) {</div><div class='del'>-			IWL_DEBUG_RADIO(mvm,</div><div class='del'>-					"PPAG table rev is %d but FW supports v1, sending truncated table\n",</div><div class='del'>-					mvm-&gt;fwrt.ppag_ver);</div><div class='del'>-			mvm-&gt;fwrt.ppag_table.v1.flags &amp;=</div><div class='del'>-				cpu_to_le32(IWL_PPAG_ETSI_MASK);</div><div class='del'>-		}</div><div class='del'>-	} else if (cmd_ver == 2 || cmd_ver == 3) {</div><div class='del'>-		num_sub_bands = IWL_NUM_SUB_BANDS_V2;</div><div class='del'>-		gain = mvm-&gt;fwrt.ppag_table.v2.gain[0];</div><div class='del'>-		cmd_size = sizeof(mvm-&gt;fwrt.ppag_table.v2);</div><div class='del'>-		if (mvm-&gt;fwrt.ppag_ver == 0) {</div><div class='del'>-			IWL_DEBUG_RADIO(mvm,</div><div class='del'>-					"PPAG table is v1 but FW supports v2, sending padded table\n");</div><div class='del'>-		} else if (cmd_ver == 2 &amp;&amp; mvm-&gt;fwrt.ppag_ver == 2) {</div><div class='del'>-			IWL_DEBUG_RADIO(mvm,</div><div class='del'>-					"PPAG table is v3 but FW supports v2, sending partial bitmap.\n");</div><div class='del'>-			mvm-&gt;fwrt.ppag_table.v1.flags &amp;=</div><div class='del'>-				cpu_to_le32(IWL_PPAG_ETSI_MASK);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		IWL_DEBUG_RADIO(mvm, "Unsupported PPAG command version\n");</div><div class='add'>+	ret = iwl_fill_ppag_table(&amp;mvm-&gt;fwrt, &amp;cmd, &amp;cmd_size);</div><div class='add'>+	/* Not supporting PPAG table is a valid scenario */</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; IWL_NUM_CHAIN_LIMITS; i++) {</div><div class='del'>-		for (j = 0; j &lt; num_sub_bands; j++) {</div><div class='del'>-			IWL_DEBUG_RADIO(mvm,</div><div class='del'>-					"PPAG table: chain[%d] band[%d]: gain = %d\n",</div><div class='del'>-					i, j, gain[i * num_sub_bands + j]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> 	IWL_DEBUG_RADIO(mvm, "Sending PER_PLATFORM_ANT_GAIN_CMD\n");</div><div class='ctx'> 	ret = iwl_mvm_send_cmd_pdu(mvm, WIDE_ID(PHY_OPS_GROUP,</div><div class='ctx'> 						PER_PLATFORM_ANT_GAIN_CMD),</div><div class='del'>-				   0, cmd_size, &amp;mvm-&gt;fwrt.ppag_table);</div><div class='add'>+				   0, cmd_size, &amp;cmd);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		IWL_ERR(mvm, "failed to send PER_PLATFORM_ANT_GAIN_CMD (%d)\n",</div><div class='ctx'> 			ret);</div><div class='hunk'>@@ -1031,68 +1053,41 @@ int iwl_mvm_ppag_send_cmd(struct iwl_mvm *mvm)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct dmi_system_id dmi_ppag_approved_list[] = {</div><div class='del'>-	{ .ident = "HP",</div><div class='del'>-	  .matches = {</div><div class='del'>-			DMI_MATCH(DMI_SYS_VENDOR, "HP"),</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-	{ .ident = "SAMSUNG",</div><div class='del'>-	  .matches = {</div><div class='del'>-			DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD"),</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-	{ .ident = "MSFT",</div><div class='del'>-	  .matches = {</div><div class='del'>-			DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-	{ .ident = "ASUS",</div><div class='del'>-	  .matches = {</div><div class='del'>-			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTek COMPUTER INC."),</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int iwl_mvm_ppag_init(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = iwl_mvm_get_ppag_table(mvm);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		IWL_DEBUG_RADIO(mvm,</div><div class='del'>-				"PPAG BIOS table invalid or unavailable. (%d)\n",</div><div class='del'>-				ret);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!dmi_check_system(dmi_ppag_approved_list)) {</div><div class='del'>-		IWL_DEBUG_RADIO(mvm,</div><div class='del'>-				"System vendor '%s' is not in the approved list, disabling PPAG.\n",</div><div class='del'>-				dmi_get_system_info(DMI_SYS_VENDOR));</div><div class='del'>-		mvm-&gt;fwrt.ppag_table.v1.flags = cpu_to_le32(0);</div><div class='add'>+	/* no need to read the table, done in INIT stage */</div><div class='add'>+	if (!(iwl_is_ppag_approved(&amp;mvm-&gt;fwrt)))</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return iwl_mvm_ppag_send_cmd(mvm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_tas_init(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='add'>+	u32 cmd_id = WIDE_ID(REGULATORY_AND_NVM_GROUP, TAS_CONFIG);</div><div class='add'>+	int fw_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, cmd_id,</div><div class='add'>+					   IWL_FW_CMD_VER_UNKNOWN);</div><div class='add'>+	struct iwl_tas_selection_data selection_data = {};</div><div class='add'>+	struct iwl_tas_config_cmd_v2_v4 cmd_v2_v4 = {};</div><div class='add'>+	struct iwl_tas_config_cmd cmd_v5 = {};</div><div class='add'>+	struct iwl_tas_data data = {};</div><div class='add'>+	void *cmd_data = &amp;cmd_v2_v4;</div><div class='add'>+	int cmd_size;</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct iwl_tas_config_cmd cmd = {};</div><div class='del'>-	int list_size;</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON(ARRAY_SIZE(cmd.block_list_array) &lt;</div><div class='del'>-		     APCI_WTAS_BLACK_LIST_MAX);</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(data.block_list_array) !=</div><div class='add'>+		     IWL_WTAS_BLACK_LIST_MAX);</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(cmd_v2_v4.common.block_list_array) !=</div><div class='add'>+		     IWL_WTAS_BLACK_LIST_MAX);</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(cmd_v5.block_list_array) !=</div><div class='add'>+		     IWL_WTAS_BLACK_LIST_MAX);</div><div class='ctx'> </div><div class='ctx'> 	if (!fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa, IWL_UCODE_TLV_CAPA_TAS_CFG)) {</div><div class='ctx'> 		IWL_DEBUG_RADIO(mvm, "TAS not enabled in FW\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = iwl_acpi_get_tas(&amp;mvm-&gt;fwrt, cmd.block_list_array, &amp;list_size);</div><div class='add'>+	ret = iwl_bios_get_tas_table(&amp;mvm-&gt;fwrt, &amp;data);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		IWL_DEBUG_RADIO(mvm,</div><div class='ctx'> 				"TAS table invalid or unavailable. (%d)\n",</div><div class='hunk'>@@ -1100,124 +1095,167 @@ static void iwl_mvm_tas_init(struct iwl_mvm *mvm)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (list_size &lt; 0)</div><div class='add'>+	if (ret == 0 &amp;&amp; fw_ver &lt; 5)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* list size if TAS enabled can only be non-negative */</div><div class='del'>-	cmd.block_list_size = cpu_to_le32((u32)list_size);</div><div class='add'>+	if (!iwl_is_tas_approved()) {</div><div class='add'>+		IWL_DEBUG_RADIO(mvm,</div><div class='add'>+				"System vendor '%s' is not in the approved list, disabling TAS in US and Canada.\n",</div><div class='add'>+				dmi_get_system_info(DMI_SYS_VENDOR) ?: "&lt;unknown&gt;");</div><div class='add'>+		if ((!iwl_add_mcc_to_tas_block_list(data.block_list_array,</div><div class='add'>+						    &amp;data.block_list_size,</div><div class='add'>+						    IWL_MCC_US)) ||</div><div class='add'>+		    (!iwl_add_mcc_to_tas_block_list(data.block_list_array,</div><div class='add'>+						    &amp;data.block_list_size,</div><div class='add'>+						    IWL_MCC_CANADA))) {</div><div class='add'>+			IWL_DEBUG_RADIO(mvm,</div><div class='add'>+					"Unable to add US/Canada to TAS block list, disabling TAS\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		IWL_DEBUG_RADIO(mvm,</div><div class='add'>+				"System vendor '%s' is in the approved list.\n",</div><div class='add'>+				dmi_get_system_info(DMI_SYS_VENDOR) ?: "&lt;unknown&gt;");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fw_ver &lt; 5) {</div><div class='add'>+		selection_data = iwl_parse_tas_selection(data.tas_selection,</div><div class='add'>+							 data.table_revision);</div><div class='add'>+		cmd_v2_v4.common.block_list_size =</div><div class='add'>+			cpu_to_le32(data.block_list_size);</div><div class='add'>+		for (u8 i = 0; i &lt; data.block_list_size; i++)</div><div class='add'>+			cmd_v2_v4.common.block_list_array[i] =</div><div class='add'>+				cpu_to_le32(data.block_list_array[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fw_ver == 5) {</div><div class='add'>+		cmd_size = sizeof(cmd_v5);</div><div class='add'>+		cmd_data = &amp;cmd_v5;</div><div class='add'>+		cmd_v5.block_list_size = cpu_to_le16(data.block_list_size);</div><div class='add'>+		for (u16 i = 0; i &lt; data.block_list_size; i++)</div><div class='add'>+			cmd_v5.block_list_array[i] =</div><div class='add'>+				cpu_to_le16(data.block_list_array[i]);</div><div class='add'>+		cmd_v5.tas_config_info.table_source = data.table_source;</div><div class='add'>+		cmd_v5.tas_config_info.table_revision = data.table_revision;</div><div class='add'>+		cmd_v5.tas_config_info.value = cpu_to_le32(data.tas_selection);</div><div class='add'>+	} else if (fw_ver == 4) {</div><div class='add'>+		cmd_size = sizeof(cmd_v2_v4.common) + sizeof(cmd_v2_v4.v4);</div><div class='add'>+		cmd_v2_v4.v4.override_tas_iec = selection_data.override_tas_iec;</div><div class='add'>+		cmd_v2_v4.v4.enable_tas_iec = selection_data.enable_tas_iec;</div><div class='add'>+		cmd_v2_v4.v4.usa_tas_uhb_allowed =</div><div class='add'>+			selection_data.usa_tas_uhb_allowed;</div><div class='add'>+		if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+				IWL_UCODE_TLV_CAPA_UHB_CANADA_TAS_SUPPORT) &amp;&amp;</div><div class='add'>+		    selection_data.canada_tas_uhb_allowed)</div><div class='add'>+			cmd_v2_v4.v4.uhb_allowed_flags = TAS_UHB_ALLOWED_CANADA;</div><div class='add'>+	} else if (fw_ver == 3) {</div><div class='add'>+		cmd_size = sizeof(cmd_v2_v4.common) + sizeof(cmd_v2_v4.v3);</div><div class='add'>+		cmd_v2_v4.v3.override_tas_iec =</div><div class='add'>+			cpu_to_le16(selection_data.override_tas_iec);</div><div class='add'>+		cmd_v2_v4.v3.enable_tas_iec =</div><div class='add'>+			cpu_to_le16(selection_data.enable_tas_iec);</div><div class='add'>+	} else if (fw_ver == 2) {</div><div class='add'>+		cmd_size = sizeof(cmd_v2_v4.common);</div><div class='add'>+	} else {</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_send_cmd_pdu(mvm, WIDE_ID(REGULATORY_AND_NVM_GROUP,</div><div class='del'>-						TAS_CONFIG),</div><div class='del'>-				   0, sizeof(cmd), &amp;cmd);</div><div class='add'>+	ret = iwl_mvm_send_cmd_pdu(mvm, cmd_id, 0, cmd_size, cmd_data);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		IWL_DEBUG_RADIO(mvm, "failed to send TAS_CONFIG (%d)\n", ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 iwl_mvm_eval_dsm_rfi(struct iwl_mvm *mvm)</div><div class='del'>-{</div><div class='del'>-	u8 value;</div><div class='del'>-	int ret = iwl_acpi_get_dsm_u8((&amp;mvm-&gt;fwrt)-&gt;dev, 0, DSM_RFI_FUNC_ENABLE,</div><div class='del'>-				      &amp;iwl_rfi_guid, &amp;value);</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		IWL_DEBUG_RADIO(mvm, "Failed to get DSM RFI, ret=%d\n", ret);</div><div class='del'>-</div><div class='del'>-	} else if (value &gt;= DSM_VALUE_RFI_MAX) {</div><div class='del'>-		IWL_DEBUG_RADIO(mvm, "DSM RFI got invalid value, ret=%d\n",</div><div class='del'>-				value);</div><div class='del'>-</div><div class='del'>-	} else if (value == DSM_VALUE_RFI_ENABLE) {</div><div class='del'>-		IWL_DEBUG_RADIO(mvm, "DSM RFI is evaluated to enable\n");</div><div class='del'>-		return DSM_VALUE_RFI_ENABLE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RADIO(mvm, "DSM RFI is disabled\n");</div><div class='del'>-</div><div class='del'>-	/* default behaviour is disabled */</div><div class='del'>-	return DSM_VALUE_RFI_DISABLE;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void iwl_mvm_lari_cfg(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='del'>-	int cmd_ret;</div><div class='del'>-	struct iwl_lari_config_change_cmd_v3 cmd = {};</div><div class='del'>-</div><div class='del'>-	cmd.config_bitmap = iwl_acpi_get_lari_config_bitmap(&amp;mvm-&gt;fwrt);</div><div class='del'>-</div><div class='del'>-	/* apply more config masks here */</div><div class='del'>-</div><div class='del'>-	if (cmd.config_bitmap) {</div><div class='del'>-		size_t cmd_size;</div><div class='del'>-		u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw,</div><div class='del'>-						   REGULATORY_AND_NVM_GROUP,</div><div class='del'>-						   LARI_CONFIG_CHANGE, 1);</div><div class='del'>-		if (cmd_ver == 3)</div><div class='del'>-			cmd_size = sizeof(struct iwl_lari_config_change_cmd_v3);</div><div class='del'>-		else if (cmd_ver == 2)</div><div class='del'>-			cmd_size = sizeof(struct iwl_lari_config_change_cmd_v2);</div><div class='del'>-		else</div><div class='del'>-			cmd_size = sizeof(struct iwl_lari_config_change_cmd_v1);</div><div class='add'>+	struct iwl_lari_config_change_cmd cmd;</div><div class='add'>+	size_t cmd_size;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-		IWL_DEBUG_RADIO(mvm,</div><div class='del'>-				"sending LARI_CONFIG_CHANGE, config_bitmap=0x%x\n",</div><div class='del'>-				le32_to_cpu(cmd.config_bitmap));</div><div class='del'>-		cmd_ret = iwl_mvm_send_cmd_pdu(mvm,</div><div class='del'>-					       WIDE_ID(REGULATORY_AND_NVM_GROUP,</div><div class='del'>-						       LARI_CONFIG_CHANGE),</div><div class='del'>-					       0, cmd_size, &amp;cmd);</div><div class='del'>-		if (cmd_ret &lt; 0)</div><div class='add'>+	ret = iwl_fill_lari_config(&amp;mvm-&gt;fwrt, &amp;cmd, &amp;cmd_size);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		ret = iwl_mvm_send_cmd_pdu(mvm,</div><div class='add'>+					   WIDE_ID(REGULATORY_AND_NVM_GROUP,</div><div class='add'>+						   LARI_CONFIG_CHANGE),</div><div class='add'>+					   0, cmd_size, &amp;cmd);</div><div class='add'>+		if (ret &lt; 0)</div><div class='ctx'> 			IWL_DEBUG_RADIO(mvm,</div><div class='ctx'> 					"Failed to send LARI_CONFIG_CHANGE (%d)\n",</div><div class='del'>-					cmd_ret);</div><div class='add'>+					ret);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-#else /* CONFIG_ACPI */</div><div class='ctx'> </div><div class='del'>-inline int iwl_mvm_sar_select_profile(struct iwl_mvm *mvm,</div><div class='del'>-				      int prof_a, int prof_b)</div><div class='add'>+void iwl_mvm_get_bios_tables(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='del'>-	return -ENOENT;</div><div class='del'>-}</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-inline int iwl_mvm_get_sar_geo_profile(struct iwl_mvm *mvm)</div><div class='del'>-{</div><div class='del'>-	return -ENOENT;</div><div class='del'>-}</div><div class='add'>+	iwl_acpi_get_guid_lock_status(&amp;mvm-&gt;fwrt);</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_sar_geo_init(struct iwl_mvm *mvm)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	/* read PPAG table */</div><div class='add'>+	ret = iwl_bios_get_ppag_table(&amp;mvm-&gt;fwrt);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		IWL_DEBUG_RADIO(mvm,</div><div class='add'>+				"PPAG BIOS table invalid or unavailable. (%d)\n",</div><div class='add'>+				ret);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-int iwl_mvm_ppag_send_cmd(struct iwl_mvm *mvm)</div><div class='del'>-{</div><div class='del'>-	return -ENOENT;</div><div class='del'>-}</div><div class='add'>+	/* read SAR tables */</div><div class='add'>+	ret = iwl_bios_get_wrds_table(&amp;mvm-&gt;fwrt);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		IWL_DEBUG_RADIO(mvm,</div><div class='add'>+				"WRDS SAR BIOS table invalid or unavailable. (%d)\n",</div><div class='add'>+				ret);</div><div class='add'>+		/*</div><div class='add'>+		 * If not available, don't fail and don't bother with EWRD and</div><div class='add'>+		 * WGDS */</div><div class='add'>+</div><div class='add'>+		if (!iwl_bios_get_wgds_table(&amp;mvm-&gt;fwrt)) {</div><div class='add'>+			/*</div><div class='add'>+			 * If basic SAR is not available, we check for WGDS,</div><div class='add'>+			 * which should *not* be available either.  If it is</div><div class='add'>+			 * available, issue an error, because we can't use SAR</div><div class='add'>+			 * Geo without basic SAR.</div><div class='add'>+			 */</div><div class='add'>+			IWL_ERR(mvm, "BIOS contains WGDS but no WRDS\n");</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_ppag_init(struct iwl_mvm *mvm)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	} else {</div><div class='add'>+		ret = iwl_bios_get_ewrd_table(&amp;mvm-&gt;fwrt);</div><div class='add'>+		/* if EWRD is not available, we can still use</div><div class='add'>+		* WRDS, so don't fail */</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			IWL_DEBUG_RADIO(mvm,</div><div class='add'>+					"EWRD SAR BIOS table invalid or unavailable. (%d)\n",</div><div class='add'>+					ret);</div><div class='add'>+</div><div class='add'>+		/* read geo SAR table */</div><div class='add'>+		if (iwl_sar_geo_support(&amp;mvm-&gt;fwrt)) {</div><div class='add'>+			ret = iwl_bios_get_wgds_table(&amp;mvm-&gt;fwrt);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				IWL_DEBUG_RADIO(mvm,</div><div class='add'>+						"Geo SAR BIOS table invalid or unavailable. (%d)\n",</div><div class='add'>+						ret);</div><div class='add'>+				/* we don't fail if the table is not available */</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_tas_init(struct iwl_mvm *mvm)</div><div class='del'>-{</div><div class='del'>-}</div><div class='add'>+	iwl_acpi_get_phy_filters(&amp;mvm-&gt;fwrt);</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_lari_cfg(struct iwl_mvm *mvm)</div><div class='del'>-{</div><div class='add'>+	if (iwl_bios_get_eckv(&amp;mvm-&gt;fwrt, &amp;mvm-&gt;ext_clock_valid))</div><div class='add'>+		IWL_DEBUG_RADIO(mvm, "ECKV table doesn't exist in BIOS\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 iwl_mvm_eval_dsm_rfi(struct iwl_mvm *mvm)</div><div class='add'>+static void iwl_mvm_disconnect_iterator(void *data, u8 *mac,</div><div class='add'>+					struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	return DSM_VALUE_RFI_DISABLE;</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+		ieee80211_hw_restart_disconnect(vif);</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_ACPI */</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_send_recovery_cmd(struct iwl_mvm *mvm, u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	u32 error_log_size = mvm-&gt;fw-&gt;ucode_capa.error_log_size;</div><div class='add'>+	u32 status = 0;</div><div class='ctx'> 	int ret;</div><div class='del'>-	u32 resp;</div><div class='ctx'> </div><div class='ctx'> 	struct iwl_fw_error_recovery_cmd recovery_cmd = {</div><div class='ctx'> 		.flags = cpu_to_le32(flags),</div><div class='hunk'>@@ -1225,7 +1263,6 @@ void iwl_mvm_send_recovery_cmd(struct iwl_mvm *mvm, u32 flags)</div><div class='ctx'> 	};</div><div class='ctx'> 	struct iwl_host_cmd host_cmd = {</div><div class='ctx'> 		.id = WIDE_ID(SYSTEM_GROUP, FW_ERROR_RECOVERY_CMD),</div><div class='del'>-		.flags = CMD_WANT_SKB,</div><div class='ctx'> 		.data = {&amp;recovery_cmd, },</div><div class='ctx'> 		.len = {sizeof(recovery_cmd), },</div><div class='ctx'> 	};</div><div class='hunk'>@@ -1245,7 +1282,7 @@ void iwl_mvm_send_recovery_cmd(struct iwl_mvm *mvm, u32 flags)</div><div class='ctx'> 		recovery_cmd.buf_size = cpu_to_le32(error_log_size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_send_cmd(mvm, &amp;host_cmd);</div><div class='add'>+	ret = iwl_mvm_send_cmd_status(mvm, &amp;host_cmd, &amp;status);</div><div class='ctx'> 	kfree(mvm-&gt;error_recovery_buf);</div><div class='ctx'> 	mvm-&gt;error_recovery_buf = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -1256,37 +1293,20 @@ void iwl_mvm_send_recovery_cmd(struct iwl_mvm *mvm, u32 flags)</div><div class='ctx'> </div><div class='ctx'> 	/* skb respond is only relevant in ERROR_RECOVERY_UPDATE_DB */</div><div class='ctx'> 	if (flags &amp; ERROR_RECOVERY_UPDATE_DB) {</div><div class='del'>-		resp = le32_to_cpu(*(__le32 *)host_cmd.resp_pkt-&gt;data);</div><div class='del'>-		if (resp)</div><div class='add'>+		if (status) {</div><div class='ctx'> 			IWL_ERR(mvm,</div><div class='ctx'> 				"Failed to send recovery cmd blob was invalid %d\n",</div><div class='del'>-				resp);</div><div class='add'>+				status);</div><div class='add'>+</div><div class='add'>+			ieee80211_iterate_interfaces(mvm-&gt;hw, 0,</div><div class='add'>+						     iwl_mvm_disconnect_iterator,</div><div class='add'>+						     mvm);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_mvm_sar_init(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = iwl_sar_get_wrds_table(&amp;mvm-&gt;fwrt);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		IWL_DEBUG_RADIO(mvm,</div><div class='del'>-				"WRDS SAR BIOS table invalid or unavailable. (%d)\n",</div><div class='del'>-				ret);</div><div class='del'>-		/*</div><div class='del'>-		 * If not available, don't fail and don't bother with EWRD.</div><div class='del'>-		 * Return 1 to tell that we can't use WGDS either.</div><div class='del'>-		 */</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = iwl_sar_get_ewrd_table(&amp;mvm-&gt;fwrt);</div><div class='del'>-	/* if EWRD is not available, we can still use WRDS, so don't fail */</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		IWL_DEBUG_RADIO(mvm,</div><div class='del'>-				"EWRD SAR BIOS table invalid or unavailable. (%d)\n",</div><div class='del'>-				ret);</div><div class='del'>-</div><div class='ctx'> 	return iwl_mvm_sar_select_profile(mvm, 1, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1297,14 +1317,10 @@ static int iwl_mvm_load_rt_fw(struct iwl_mvm *mvm)</div><div class='ctx'> 	if (iwl_mvm_has_unified_ucode(mvm))</div><div class='ctx'> 		return iwl_run_unified_mvm_ucode(mvm);</div><div class='ctx'> </div><div class='del'>-	WARN_ON(!mvm-&gt;nvm_data);</div><div class='ctx'> 	ret = iwl_run_init_mvm_ucode(mvm);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		IWL_ERR(mvm, "Failed to run INIT ucode: %d\n", ret);</div><div class='del'>-</div><div class='del'>-		if (iwlmvm_mod_params.init_dbg)</div><div class='del'>-			return 0;</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1330,10 +1346,9 @@ static int iwl_mvm_load_rt_fw(struct iwl_mvm *mvm)</div><div class='ctx'> int iwl_mvm_up(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, i;</div><div class='del'>-	struct ieee80211_channel *chan;</div><div class='del'>-	struct cfg80211_chan_def chandef;</div><div class='ctx'> 	struct ieee80211_supported_band *sband = NULL;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_wiphy(mvm-&gt;hw-&gt;wiphy);</div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_trans_start_hw(mvm-&gt;trans);</div><div class='hunk'>@@ -1343,12 +1358,16 @@ int iwl_mvm_up(struct iwl_mvm *mvm)</div><div class='ctx'> 	ret = iwl_mvm_load_rt_fw(mvm);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		IWL_ERR(mvm, "Failed to start RT ucode: %d\n", ret);</div><div class='del'>-		if (ret != -ERFKILL)</div><div class='add'>+		if (ret != -ERFKILL &amp;&amp; !mvm-&gt;fw_product_reset)</div><div class='ctx'> 			iwl_fw_dbg_error_collect(&amp;mvm-&gt;fwrt,</div><div class='ctx'> 						 FW_DBG_TRIGGER_DRIVER);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* FW loaded successfully */</div><div class='add'>+	mvm-&gt;fw_product_reset = false;</div><div class='add'>+</div><div class='add'>+	iwl_fw_disable_dbg_asserts(&amp;mvm-&gt;fwrt);</div><div class='ctx'> 	iwl_get_shared_mem_conf(&amp;mvm-&gt;fwrt);</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_mvm_sf_update(mvm, NULL, false);</div><div class='hunk'>@@ -1372,12 +1391,11 @@ int iwl_mvm_up(struct iwl_mvm *mvm)</div><div class='ctx'> 		ret = iwl_send_phy_db_data(mvm-&gt;phy_db);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto error;</div><div class='add'>+		ret = iwl_send_phy_cfg_cmd(mvm);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = iwl_send_phy_cfg_cmd(mvm);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='ctx'> 	ret = iwl_mvm_send_bt_init_conf(mvm);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -1389,6 +1407,8 @@ int iwl_mvm_up(struct iwl_mvm *mvm)</div><div class='ctx'> 			goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	iwl_mvm_lari_cfg(mvm);</div><div class='add'>+</div><div class='ctx'> 	/* Init RSS configuration */</div><div class='ctx'> 	ret = iwl_configure_rxq(&amp;mvm-&gt;fwrt);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -1404,10 +1424,12 @@ int iwl_mvm_up(struct iwl_mvm *mvm)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* init the fw &lt;-&gt; mac80211 STA mapping */</div><div class='del'>-	for (i = 0; i &lt; mvm-&gt;fw-&gt;ucode_capa.num_stations; i++)</div><div class='add'>+	for (i = 0; i &lt; mvm-&gt;fw-&gt;ucode_capa.num_stations; i++) {</div><div class='ctx'> 		RCU_INIT_POINTER(mvm-&gt;fw_id_to_mac_id[i], NULL);</div><div class='add'>+		RCU_INIT_POINTER(mvm-&gt;fw_id_to_link_sta[i], NULL);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mvm-&gt;tdls_cs.peer.sta_id = IWL_MVM_INVALID_STA;</div><div class='add'>+	mvm-&gt;tdls_cs.peer.sta_id = IWL_INVALID_STA;</div><div class='ctx'> </div><div class='ctx'> 	/* reset quota debouncing buffer - 0xff will yield invalid data */</div><div class='ctx'> 	memset(&amp;mvm-&gt;last_quota_cmd, 0xff, sizeof(mvm-&gt;last_quota_cmd));</div><div class='hunk'>@@ -1424,9 +1446,7 @@ int iwl_mvm_up(struct iwl_mvm *mvm)</div><div class='ctx'> 	 * internal aux station for all aux activities that don't</div><div class='ctx'> 	 * requires a dedicated data queue.</div><div class='ctx'> 	 */</div><div class='del'>-	if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, LONG_GROUP,</div><div class='del'>-				  ADD_STA,</div><div class='del'>-				  0) &lt; 12) {</div><div class='add'>+	if (!iwl_mvm_has_new_station_api(mvm-&gt;fw)) {</div><div class='ctx'> 		 /*</div><div class='ctx'> 		  * In old version the aux station uses mac id like other</div><div class='ctx'> 		  * station and not lmac id</div><div class='hunk'>@@ -1441,22 +1461,9 @@ int iwl_mvm_up(struct iwl_mvm *mvm)</div><div class='ctx'> 	while (!sband &amp;&amp; i &lt; NUM_NL80211_BANDS)</div><div class='ctx'> 		sband = mvm-&gt;hw-&gt;wiphy-&gt;bands[i++];</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(!sband))</div><div class='add'>+	if (WARN_ON_ONCE(!sband)) {</div><div class='add'>+		ret = -ENODEV;</div><div class='ctx'> 		goto error;</div><div class='del'>-</div><div class='del'>-	chan = &amp;sband-&gt;channels[0];</div><div class='del'>-</div><div class='del'>-	cfg80211_chandef_create(&amp;chandef, chan, NL80211_CHAN_NO_HT);</div><div class='del'>-	for (i = 0; i &lt; NUM_PHY_CTX; i++) {</div><div class='del'>-		/*</div><div class='del'>-		 * The channel used here isn't relevant as it's</div><div class='del'>-		 * going to be overwritten in the other flows.</div><div class='del'>-		 * For now use the first channel we have.</div><div class='del'>-		 */</div><div class='del'>-		ret = iwl_mvm_phy_ctxt_add(mvm, &amp;mvm-&gt;phy_ctxts[i],</div><div class='del'>-					   &amp;chandef, 1, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_mvm_is_tt_in_fw(mvm)) {</div><div class='hunk'>@@ -1492,7 +1499,6 @@ int iwl_mvm_up(struct iwl_mvm *mvm)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_lari_cfg(mvm);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * RTNL is not taken during Ct-kill, but we don't need to scan/Tx</div><div class='ctx'> 	 * anyway, so don't init MCC.</div><div class='hunk'>@@ -1511,48 +1517,47 @@ int iwl_mvm_up(struct iwl_mvm *mvm)</div><div class='ctx'> 			goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status))</div><div class='add'>+	if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status)) {</div><div class='ctx'> 		iwl_mvm_send_recovery_cmd(mvm, ERROR_RECOVERY_UPDATE_DB);</div><div class='ctx'> </div><div class='del'>-	if (iwl_acpi_get_eckv(mvm-&gt;dev, &amp;mvm-&gt;ext_clock_valid))</div><div class='del'>-		IWL_DEBUG_INFO(mvm, "ECKV table doesn't exist in BIOS\n");</div><div class='add'>+		if (mvm-&gt;time_sync.active)</div><div class='add'>+			iwl_mvm_time_sync_config(mvm, mvm-&gt;time_sync.peer_addr,</div><div class='add'>+						 IWL_TIME_SYNC_PROTOCOL_TM |</div><div class='add'>+						 IWL_TIME_SYNC_PROTOCOL_FTM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mvm-&gt;ptp_data.ptp_clock)</div><div class='add'>+		iwl_mvm_ptp_init(mvm);</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_mvm_ppag_init(mvm);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_mvm_sar_init(mvm);</div><div class='del'>-	if (ret == 0) {</div><div class='add'>+	if (ret == 0)</div><div class='ctx'> 		ret = iwl_mvm_sar_geo_init(mvm);</div><div class='del'>-	} else if (ret == -ENOENT &amp;&amp; !iwl_sar_get_wgds_table(&amp;mvm-&gt;fwrt)) {</div><div class='del'>-		/*</div><div class='del'>-		 * If basic SAR is not available, we check for WGDS,</div><div class='del'>-		 * which should *not* be available either.  If it is</div><div class='del'>-		 * available, issue an error, because we can't use SAR</div><div class='del'>-		 * Geo without basic SAR.</div><div class='del'>-		 */</div><div class='del'>-		IWL_ERR(mvm, "BIOS contains WGDS but no WRDS\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='add'>+	ret = iwl_mvm_sgom_init(mvm);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='ctx'> 	iwl_mvm_tas_init(mvm);</div><div class='ctx'> 	iwl_mvm_leds_sync(mvm);</div><div class='add'>+	iwl_mvm_uats_init(mvm);</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_ftm_initiator_smooth_config(mvm);</div><div class='del'>-</div><div class='del'>-	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='del'>-			IWL_UCODE_TLV_CAPA_RFIM_SUPPORT)) {</div><div class='del'>-		if (iwl_mvm_eval_dsm_rfi(mvm) == DSM_VALUE_RFI_ENABLE)</div><div class='add'>+	if (iwl_rfi_supported(mvm)) {</div><div class='add'>+		if (iwl_rfi_is_enabled_in_bios(&amp;mvm-&gt;fwrt))</div><div class='ctx'> 			iwl_rfi_send_config_cmd(mvm, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	iwl_mvm_mei_device_state(mvm, true);</div><div class='add'>+</div><div class='ctx'> 	IWL_DEBUG_INFO(mvm, "RT uCode started.\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'>  error:</div><div class='del'>-	if (!iwlmvm_mod_params.init_dbg || !ret)</div><div class='del'>-		iwl_mvm_stop_device(mvm);</div><div class='add'>+	iwl_mvm_stop_device(mvm);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1560,6 +1565,7 @@ int iwl_mvm_load_d3_fw(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_wiphy(mvm-&gt;hw-&gt;wiphy);</div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_trans_start_hw(mvm-&gt;trans);</div><div class='hunk'>@@ -1586,12 +1592,12 @@ int iwl_mvm_load_d3_fw(struct iwl_mvm *mvm)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* init the fw &lt;-&gt; mac80211 STA mapping */</div><div class='del'>-	for (i = 0; i &lt; mvm-&gt;fw-&gt;ucode_capa.num_stations; i++)</div><div class='add'>+	for (i = 0; i &lt; mvm-&gt;fw-&gt;ucode_capa.num_stations; i++) {</div><div class='ctx'> 		RCU_INIT_POINTER(mvm-&gt;fw_id_to_mac_id[i], NULL);</div><div class='add'>+		RCU_INIT_POINTER(mvm-&gt;fw_id_to_link_sta[i], NULL);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, LONG_GROUP,</div><div class='del'>-				  ADD_STA,</div><div class='del'>-				  0) &lt; 12) {</div><div class='add'>+	if (!iwl_mvm_has_new_station_api(mvm-&gt;fw)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Add auxiliary station for scanning.</div><div class='ctx'> 		 * Newer versions of this command implies that the fw uses</div><div class='hunk'>@@ -1611,20 +1617,6 @@ int iwl_mvm_load_d3_fw(struct iwl_mvm *mvm)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_mvm_rx_card_state_notif(struct iwl_mvm *mvm,</div><div class='del'>-				 struct iwl_rx_cmd_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl_card_state_notif *card_state_notif = (void *)pkt-&gt;data;</div><div class='del'>-	u32 flags = le32_to_cpu(card_state_notif-&gt;flags);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RF_KILL(mvm, "Card state received: HW:%s SW:%s CT:%s\n",</div><div class='del'>-			  (flags &amp; HW_CARD_DISABLED) ? "Kill" : "On",</div><div class='del'>-			  (flags &amp; SW_CARD_DISABLED) ? "Kill" : "On",</div><div class='del'>-			  (flags &amp; CT_KILL_CARD_DISABLED) ?</div><div class='del'>-			  "Reached" : "Not reached");</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void iwl_mvm_rx_mfuart_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 			     struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/led.c b/drivers/net/wireless/intel/iwlwifi/mvm/led.c<br/>index 1ea7c44250d4..c3cc1ea3ccc9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/led.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/led.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/led.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/led.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2019 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2019, 2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='hunk'>@@ -102,7 +102,7 @@ void iwl_mvm_leds_sync(struct iwl_mvm *mvm)</div><div class='ctx'> 	 * if we control through the register, we're doing it</div><div class='ctx'> 	 * even when the firmware isn't up, so no need to sync</div><div class='ctx'> 	 */</div><div class='del'>-	if (mvm-&gt;trans-&gt;trans_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_8000)</div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_8000)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_led_set(mvm, mvm-&gt;led.brightness &gt; 0);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/link.c b/drivers/net/wireless/intel/iwlwifi/mvm/link.c<br/>new file mode 100644<br/>index 000000000000..738facceb240<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/link.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/link.c</a></div><div class='hunk'>@@ -0,0 +1,319 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2022 - 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include "mvm.h"</div><div class='add'>+#include "time-event.h"</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_link_cmd_send(struct iwl_mvm *mvm,</div><div class='add'>+				 struct iwl_link_config_cmd *cmd,</div><div class='add'>+				 enum iwl_ctxt_action action)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;action = cpu_to_le32(action);</div><div class='add'>+	ret = iwl_mvm_send_cmd_pdu(mvm,</div><div class='add'>+				   WIDE_ID(MAC_CONF_GROUP, LINK_CONFIG_CMD), 0,</div><div class='add'>+				   sizeof(*cmd), cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mvm, "Failed to send LINK_CONFIG_CMD (action:%d): %d\n",</div><div class='add'>+			action, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_set_link_fw_id(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			    struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm_vif_link_info *link_info =</div><div class='add'>+		mvmvif-&gt;link[link_conf-&gt;link_id];</div><div class='add'>+</div><div class='add'>+	if (link_info-&gt;fw_link_id == IWL_MVM_FW_LINK_ID_INVALID)</div><div class='add'>+		link_info-&gt;fw_link_id = mvmvif-&gt;id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_add_link(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+		     struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	unsigned int link_id = link_conf-&gt;link_id;</div><div class='add'>+	struct iwl_mvm_vif_link_info *link_info = mvmvif-&gt;link[link_id];</div><div class='add'>+	struct iwl_link_config_cmd cmd = {};</div><div class='add'>+	unsigned int cmd_id = WIDE_ID(MAC_CONF_GROUP, LINK_CONFIG_CMD);</div><div class='add'>+	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, cmd_id, 1);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!link_info))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_set_link_fw_id(mvm, vif, link_conf);</div><div class='add'>+</div><div class='add'>+	/* Update SF - Disable if needed. if this fails, SF might still be on</div><div class='add'>+	 * while many macs are bound, which is forbidden - so fail the binding.</div><div class='add'>+	 */</div><div class='add'>+	if (iwl_mvm_sf_update(mvm, vif, false))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cmd.link_id = cpu_to_le32(link_info-&gt;fw_link_id);</div><div class='add'>+	cmd.mac_id = cpu_to_le32(mvmvif-&gt;id);</div><div class='add'>+	cmd.spec_link_id = link_conf-&gt;link_id;</div><div class='add'>+	WARN_ON_ONCE(link_info-&gt;phy_ctxt);</div><div class='add'>+	cmd.phy_id = cpu_to_le32(FW_CTXT_INVALID);</div><div class='add'>+</div><div class='add'>+	memcpy(cmd.local_link_addr, link_conf-&gt;addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_ADHOC &amp;&amp; link_conf-&gt;bssid)</div><div class='add'>+		memcpy(cmd.ibss_bssid_addr, link_conf-&gt;bssid, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	if (cmd_ver &lt; 2)</div><div class='add'>+		cmd.listen_lmac = cpu_to_le32(link_info-&gt;listen_lmac);</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_link_cmd_send(mvm, &amp;cmd, FW_CTXT_ACTION_ADD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_link_changed(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			 struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			 u32 changes, bool active)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	unsigned int link_id = link_conf-&gt;link_id;</div><div class='add'>+	struct iwl_mvm_vif_link_info *link_info = mvmvif-&gt;link[link_id];</div><div class='add'>+	struct iwl_mvm_phy_ctxt *phyctxt;</div><div class='add'>+	struct iwl_link_config_cmd cmd = {};</div><div class='add'>+	u32 ht_flag, flags = 0, flags_mask = 0;</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned int cmd_id = WIDE_ID(MAC_CONF_GROUP, LINK_CONFIG_CMD);</div><div class='add'>+	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, cmd_id, 1);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!link_info ||</div><div class='add'>+			 link_info-&gt;fw_link_id == IWL_MVM_FW_LINK_ID_INVALID))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (changes &amp; LINK_CONTEXT_MODIFY_ACTIVE) {</div><div class='add'>+		/* When activating a link, phy context should be valid;</div><div class='add'>+		 * when deactivating a link, it also should be valid since</div><div class='add'>+		 * the link was active before. So, do nothing in this case.</div><div class='add'>+		 * Since a link is added first with FW_CTXT_INVALID, then we</div><div class='add'>+		 * can get here in case it's removed before it was activated.</div><div class='add'>+		 */</div><div class='add'>+		if (!link_info-&gt;phy_ctxt)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		/* Catch early if driver tries to activate or deactivate a link</div><div class='add'>+		 * twice.</div><div class='add'>+		 */</div><div class='add'>+		WARN_ON_ONCE(active == link_info-&gt;active);</div><div class='add'>+</div><div class='add'>+		/* When deactivating a link session protection should</div><div class='add'>+		 * be stopped. Also let the firmware know if we can't Tx.</div><div class='add'>+		 */</div><div class='add'>+		if (!active &amp;&amp; vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='add'>+			iwl_mvm_stop_session_protection(mvm, vif);</div><div class='add'>+			if (link_info-&gt;csa_block_tx) {</div><div class='add'>+				cmd.block_tx = 1;</div><div class='add'>+				link_info-&gt;csa_block_tx = false;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd.link_id = cpu_to_le32(link_info-&gt;fw_link_id);</div><div class='add'>+</div><div class='add'>+	/* The phy_id, link address and listen_lmac can be modified only until</div><div class='add'>+	 * the link becomes active, otherwise they will be ignored.</div><div class='add'>+	 */</div><div class='add'>+	phyctxt = link_info-&gt;phy_ctxt;</div><div class='add'>+	if (phyctxt)</div><div class='add'>+		cmd.phy_id = cpu_to_le32(phyctxt-&gt;id);</div><div class='add'>+	else</div><div class='add'>+		cmd.phy_id = cpu_to_le32(FW_CTXT_INVALID);</div><div class='add'>+	cmd.mac_id = cpu_to_le32(mvmvif-&gt;id);</div><div class='add'>+</div><div class='add'>+	memcpy(cmd.local_link_addr, link_conf-&gt;addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	cmd.active = cpu_to_le32(active);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_ADHOC &amp;&amp; link_conf-&gt;bssid)</div><div class='add'>+		memcpy(cmd.ibss_bssid_addr, link_conf-&gt;bssid, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_set_fw_basic_rates(mvm, vif, link_info,</div><div class='add'>+				   &amp;cmd.cck_rates, &amp;cmd.ofdm_rates);</div><div class='add'>+</div><div class='add'>+	cmd.cck_short_preamble = cpu_to_le32(link_conf-&gt;use_short_preamble);</div><div class='add'>+	cmd.short_slot = cpu_to_le32(link_conf-&gt;use_short_slot);</div><div class='add'>+</div><div class='add'>+	/* The fw does not distinguish between ht and fat */</div><div class='add'>+	ht_flag = LINK_PROT_FLG_HT_PROT | LINK_PROT_FLG_FAT_PROT;</div><div class='add'>+	iwl_mvm_set_fw_protection_flags(mvm, vif, link_conf,</div><div class='add'>+					&amp;cmd.protection_flags,</div><div class='add'>+					ht_flag, LINK_PROT_FLG_TGG_PROTECT);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_set_fw_qos_params(mvm, vif, link_conf, cmd.ac,</div><div class='add'>+				  &amp;cmd.qos_flags);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	cmd.bi = cpu_to_le32(link_conf-&gt;beacon_int);</div><div class='add'>+	cmd.dtim_interval = cpu_to_le32(link_conf-&gt;beacon_int *</div><div class='add'>+					link_conf-&gt;dtim_period);</div><div class='add'>+</div><div class='add'>+	if (!link_conf-&gt;he_support || iwlwifi_mod_params.disable_11ax ||</div><div class='add'>+	    (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; !vif-&gt;cfg.assoc)) {</div><div class='add'>+		changes &amp;= ~LINK_CONTEXT_MODIFY_HE_PARAMS;</div><div class='add'>+		goto send_cmd;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd.htc_trig_based_pkt_ext = link_conf-&gt;htc_trig_based_pkt_ext;</div><div class='add'>+</div><div class='add'>+	if (link_conf-&gt;uora_exists) {</div><div class='add'>+		cmd.rand_alloc_ecwmin =</div><div class='add'>+			link_conf-&gt;uora_ocw_range &amp; 0x7;</div><div class='add'>+		cmd.rand_alloc_ecwmax =</div><div class='add'>+			(link_conf-&gt;uora_ocw_range &gt;&gt; 3) &amp; 0x7;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ap_sta may be NULL if we're disconnecting */</div><div class='add'>+	if (changes &amp; LINK_CONTEXT_MODIFY_HE_PARAMS &amp;&amp; mvmvif-&gt;ap_sta) {</div><div class='add'>+		struct ieee80211_link_sta *link_sta =</div><div class='add'>+			link_sta_dereference_check(mvmvif-&gt;ap_sta, link_id);</div><div class='add'>+</div><div class='add'>+		if (!WARN_ON(!link_sta) &amp;&amp; link_sta-&gt;he_cap.has_he &amp;&amp;</div><div class='add'>+		    link_sta-&gt;he_cap.he_cap_elem.mac_cap_info[5] &amp;</div><div class='add'>+		    IEEE80211_HE_MAC_CAP5_OM_CTRL_UL_MU_DATA_DIS_RX)</div><div class='add'>+			cmd.ul_mu_data_disable = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TODO  how to set ndp_fdbk_buff_th_exp? */</div><div class='add'>+</div><div class='add'>+	if (iwl_mvm_set_fw_mu_edca_params(mvm, mvmvif-&gt;link[link_id],</div><div class='add'>+					  &amp;cmd.trig_based_txf[0])) {</div><div class='add'>+		flags |= LINK_FLG_MU_EDCA_CW;</div><div class='add'>+		flags_mask |= LINK_FLG_MU_EDCA_CW;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changes &amp; LINK_CONTEXT_MODIFY_EHT_PARAMS) {</div><div class='add'>+		struct ieee80211_chanctx_conf *ctx;</div><div class='add'>+		struct cfg80211_chan_def *def = NULL;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		ctx = rcu_dereference(link_conf-&gt;chanctx_conf);</div><div class='add'>+		if (ctx)</div><div class='add'>+			def = iwl_mvm_chanctx_def(mvm, ctx);</div><div class='add'>+</div><div class='add'>+		if (iwlwifi_mod_params.disable_11be ||</div><div class='add'>+		    !link_conf-&gt;eht_support || !def ||</div><div class='add'>+		    iwl_fw_lookup_cmd_ver(mvm-&gt;fw, PHY_CONTEXT_CMD, 1) &gt;= 6)</div><div class='add'>+			changes &amp;= ~LINK_CONTEXT_MODIFY_EHT_PARAMS;</div><div class='add'>+		else</div><div class='add'>+			cmd.puncture_mask = cpu_to_le16(def-&gt;punctured);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd.bss_color = link_conf-&gt;he_bss_color.color;</div><div class='add'>+</div><div class='add'>+	if (!link_conf-&gt;he_bss_color.enabled) {</div><div class='add'>+		flags |= LINK_FLG_BSS_COLOR_DIS;</div><div class='add'>+		flags_mask |= LINK_FLG_BSS_COLOR_DIS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd.frame_time_rts_th = cpu_to_le16(link_conf-&gt;frame_time_rts_th);</div><div class='add'>+</div><div class='add'>+	/* Block 26-tone RU OFDMA transmissions */</div><div class='add'>+	if (link_info-&gt;he_ru_2mhz_block) {</div><div class='add'>+		flags |= LINK_FLG_RU_2MHZ_BLOCK;</div><div class='add'>+		flags_mask |= LINK_FLG_RU_2MHZ_BLOCK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link_conf-&gt;nontransmitted) {</div><div class='add'>+		ether_addr_copy(cmd.ref_bssid_addr,</div><div class='add'>+				link_conf-&gt;transmitter_bssid);</div><div class='add'>+		cmd.bssid_index = link_conf-&gt;bssid_index;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+send_cmd:</div><div class='add'>+	cmd.modify_mask = cpu_to_le32(changes);</div><div class='add'>+	cmd.flags = cpu_to_le32(flags);</div><div class='add'>+	if (cmd_ver &lt; 6)</div><div class='add'>+		cmd.flags_mask = cpu_to_le32(flags_mask);</div><div class='add'>+	cmd.spec_link_id = link_conf-&gt;link_id;</div><div class='add'>+	if (cmd_ver &lt; 2)</div><div class='add'>+		cmd.listen_lmac = cpu_to_le32(link_info-&gt;listen_lmac);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_link_cmd_send(mvm, &amp;cmd, FW_CTXT_ACTION_MODIFY);</div><div class='add'>+	if (!ret &amp;&amp; (changes &amp; LINK_CONTEXT_MODIFY_ACTIVE))</div><div class='add'>+		link_info-&gt;active = active;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_remove_link(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	unsigned int link_id = link_conf-&gt;link_id;</div><div class='add'>+	struct iwl_mvm_vif_link_info *link_info = mvmvif-&gt;link[link_id];</div><div class='add'>+	struct iwl_link_config_cmd cmd = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cmd.link_id = cpu_to_le32(link_info-&gt;fw_link_id);</div><div class='add'>+	link_info-&gt;fw_link_id = IWL_MVM_FW_LINK_ID_INVALID;</div><div class='add'>+	cmd.spec_link_id = link_conf-&gt;link_id;</div><div class='add'>+	cmd.phy_id = cpu_to_le32(FW_CTXT_INVALID);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_link_cmd_send(mvm, &amp;cmd, FW_CTXT_ACTION_REMOVE);</div><div class='add'>+</div><div class='add'>+	if (!ret &amp;&amp; iwl_mvm_sf_update(mvm, vif, true))</div><div class='add'>+		IWL_ERR(mvm, "Failed to update SF state\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* link should be deactivated before removal, so in most cases we need to</div><div class='add'>+ * perform these two operations together</div><div class='add'>+ */</div><div class='add'>+int iwl_mvm_disable_link(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			 struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_link_changed(mvm, vif, link_conf,</div><div class='add'>+				   LINK_CONTEXT_MODIFY_ACTIVE, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_remove_link(mvm, vif, link_conf);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 iwl_mvm_get_primary_link(struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	/* relevant data is written with both locks held, so read with either */</div><div class='add'>+	lockdep_assert(lockdep_is_held(&amp;mvmvif-&gt;mvm-&gt;mutex) ||</div><div class='add'>+		       lockdep_is_held(&amp;mvmvif-&gt;mvm-&gt;hw-&gt;wiphy-&gt;mtx));</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_vif_is_mld(vif))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* In AP mode, there is no primary link */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP)</div><div class='add'>+		return __ffs(vif-&gt;active_links);</div><div class='add'>+</div><div class='add'>+	if (mvmvif-&gt;esr_active &amp;&amp;</div><div class='add'>+	    !WARN_ON(!(BIT(mvmvif-&gt;primary_link) &amp; vif-&gt;active_links)))</div><div class='add'>+		return mvmvif-&gt;primary_link;</div><div class='add'>+</div><div class='add'>+	return __ffs(vif-&gt;active_links);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_init_link(struct iwl_mvm_vif_link_info *link)</div><div class='add'>+{</div><div class='add'>+	link-&gt;bcast_sta.sta_id = IWL_INVALID_STA;</div><div class='add'>+	link-&gt;mcast_sta.sta_id = IWL_INVALID_STA;</div><div class='add'>+	link-&gt;ap_sta_id = IWL_INVALID_STA;</div><div class='add'>+</div><div class='add'>+	for (int r = 0; r &lt; NUM_IWL_MVM_SMPS_REQ; r++)</div><div class='add'>+		link-&gt;smps_requests[r] =</div><div class='add'>+			IEEE80211_SMPS_AUTOMATIC;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c<br/>index fd5e08961651..867807abde66 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include "fw-api.h"</div><div class='ctx'> #include "mvm.h"</div><div class='ctx'> #include "time-event.h"</div><div class='add'>+#include "iwl-utils.h"</div><div class='ctx'> </div><div class='ctx'> const u8 iwl_mvm_ac_to_tx_fifo[] = {</div><div class='ctx'> 	IWL_MVM_TX_FIFO_VO,</div><div class='hunk'>@@ -31,6 +32,17 @@ const u8 iwl_mvm_ac_to_gen2_tx_fifo[] = {</div><div class='ctx'> 	IWL_GEN2_TRIG_TX_FIFO_BK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+const u8 iwl_mvm_ac_to_bz_tx_fifo[] = {</div><div class='add'>+	IWL_BZ_EDCA_TX_FIFO_VO,</div><div class='add'>+	IWL_BZ_EDCA_TX_FIFO_VI,</div><div class='add'>+	IWL_BZ_EDCA_TX_FIFO_BE,</div><div class='add'>+	IWL_BZ_EDCA_TX_FIFO_BK,</div><div class='add'>+	IWL_BZ_TRIG_TX_FIFO_VO,</div><div class='add'>+	IWL_BZ_TRIG_TX_FIFO_VI,</div><div class='add'>+	IWL_BZ_TRIG_TX_FIFO_BE,</div><div class='add'>+	IWL_BZ_TRIG_TX_FIFO_BK,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct iwl_mvm_mac_iface_iterator_data {</div><div class='ctx'> 	struct iwl_mvm *mvm;</div><div class='ctx'> 	struct ieee80211_vif *vif;</div><div class='hunk'>@@ -205,7 +217,7 @@ int iwl_mvm_mac_ctxt_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 		.preferred_tsf = NUM_TSF_IDS,</div><div class='ctx'> 		.found_vif = false,</div><div class='ctx'> 	};</div><div class='del'>-	int ret, i;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -225,16 +237,20 @@ int iwl_mvm_mac_ctxt_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 	 * that we should share it with another interface.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	/* Currently, MAC ID 0 should be used only for the managed/IBSS vif */</div><div class='del'>-	switch (vif-&gt;type) {</div><div class='del'>-	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-		if (!vif-&gt;p2p)</div><div class='add'>+	/* MAC ID 0 should be used only for the managed/IBSS vif with non-MLO</div><div class='add'>+	 * FW API</div><div class='add'>+	 */</div><div class='add'>+	if (!mvm-&gt;mld_api_is_used) {</div><div class='add'>+		switch (vif-&gt;type) {</div><div class='add'>+		case NL80211_IFTYPE_ADHOC:</div><div class='ctx'> 			break;</div><div class='del'>-		fallthrough;</div><div class='del'>-	default:</div><div class='del'>-		__clear_bit(0, data.available_mac_ids);</div><div class='add'>+		case NL80211_IFTYPE_STATION:</div><div class='add'>+			if (!vif-&gt;p2p)</div><div class='add'>+				break;</div><div class='add'>+			fallthrough;</div><div class='add'>+		default:</div><div class='add'>+			__clear_bit(0, data.available_mac_ids);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_iterate_active_interfaces_atomic(</div><div class='hunk'>@@ -281,8 +297,11 @@ int iwl_mvm_mac_ctxt_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;mvmvif-&gt;time_event_data.list);</div><div class='ctx'> 	mvmvif-&gt;time_event_data.id = TE_MAX;</div><div class='add'>+	mvmvif-&gt;roc_activity = ROC_NUM_ACTIVITIES;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_init_link(&amp;mvmvif-&gt;deflink);</div><div class='ctx'> </div><div class='del'>-	/* No need to allocate data queues to P2P Device MAC and NAN.*/</div><div class='add'>+	/* No need to allocate data queues to P2P Device MAC */</div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -293,16 +312,9 @@ int iwl_mvm_mac_ctxt_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 		 * For TVQM this will be overwritten later with the FW assigned</div><div class='ctx'> 		 * queue value (when queue is enabled).</div><div class='ctx'> 		 */</div><div class='del'>-		mvmvif-&gt;cab_queue = IWL_MVM_DQA_GCAST_QUEUE;</div><div class='add'>+		mvmvif-&gt;deflink.cab_queue = IWL_MVM_DQA_GCAST_QUEUE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mvmvif-&gt;bcast_sta.sta_id = IWL_MVM_INVALID_STA;</div><div class='del'>-	mvmvif-&gt;mcast_sta.sta_id = IWL_MVM_INVALID_STA;</div><div class='del'>-	mvmvif-&gt;ap_sta_id = IWL_MVM_INVALID_STA;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_IWL_MVM_SMPS_REQ; i++)</div><div class='del'>-		mvmvif-&gt;smps_requests[i] = IEEE80211_SMPS_AUTOMATIC;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> exit_fail:</div><div class='hunk'>@@ -396,15 +408,45 @@ static void iwl_mvm_ack_rates(struct iwl_mvm *mvm,</div><div class='ctx'> 	*ofdm_rates = ofdm;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_mac_ctxt_set_ht_flags(struct iwl_mvm *mvm,</div><div class='del'>-					 struct ieee80211_vif *vif,</div><div class='del'>-					 struct iwl_mac_ctx_cmd *cmd)</div><div class='add'>+void iwl_mvm_set_fw_basic_rates(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+				struct iwl_mvm_vif_link_info *link_info,</div><div class='add'>+				__le32 *cck_rates, __le32 *ofdm_rates)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_phy_ctxt *phy_ctxt;</div><div class='add'>+	u8 cck_ack_rates = 0, ofdm_ack_rates = 0;</div><div class='add'>+	enum nl80211_band band = NL80211_BAND_2GHZ;</div><div class='add'>+</div><div class='add'>+	phy_ctxt = link_info-&gt;phy_ctxt;</div><div class='add'>+	if (phy_ctxt &amp;&amp; phy_ctxt-&gt;channel)</div><div class='add'>+		band = phy_ctxt-&gt;channel-&gt;band;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_ack_rates(mvm, vif, band, &amp;cck_ack_rates, &amp;ofdm_ack_rates);</div><div class='add'>+</div><div class='add'>+	*cck_rates = cpu_to_le32((u32)cck_ack_rates);</div><div class='add'>+	*ofdm_rates = cpu_to_le32((u32)ofdm_ack_rates);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_set_fw_protection_flags(struct iwl_mvm *mvm,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				     __le32 *protection_flags, u32 ht_flag,</div><div class='add'>+				     u32 tgg_flag)</div><div class='ctx'> {</div><div class='ctx'> 	/* for both sta and ap, ht_operation_mode hold the protection_mode */</div><div class='del'>-	u8 protection_mode = vif-&gt;bss_conf.ht_operation_mode &amp;</div><div class='add'>+	u8 protection_mode = link_conf-&gt;ht_operation_mode &amp;</div><div class='ctx'> 				 IEEE80211_HT_OP_MODE_PROTECTION;</div><div class='del'>-	/* The fw does not distinguish between ht and fat */</div><div class='del'>-	u32 ht_flag = MAC_PROT_FLG_HT_PROT | MAC_PROT_FLG_FAT_PROT;</div><div class='add'>+	bool ht_enabled = !!(link_conf-&gt;ht_operation_mode &amp;</div><div class='add'>+			     IEEE80211_HT_OP_MODE_PROTECTION);</div><div class='add'>+</div><div class='add'>+	if (link_conf-&gt;use_cts_prot)</div><div class='add'>+		*protection_flags |= cpu_to_le32(tgg_flag);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_RATE(mvm, "use_cts_prot %d, ht_operation_mode %d\n",</div><div class='add'>+		       link_conf-&gt;use_cts_prot,</div><div class='add'>+		       link_conf-&gt;ht_operation_mode);</div><div class='add'>+</div><div class='add'>+	if (!ht_enabled)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_RATE(mvm, "protection mode set to %d\n", protection_mode);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -416,12 +458,12 @@ static void iwl_mvm_mac_ctxt_set_ht_flags(struct iwl_mvm *mvm,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_HT_OP_MODE_PROTECTION_NONMEMBER:</div><div class='ctx'> 	case IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED:</div><div class='del'>-		cmd-&gt;protection_flags |= cpu_to_le32(ht_flag);</div><div class='add'>+		*protection_flags |= cpu_to_le32(ht_flag);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_HT_OP_MODE_PROTECTION_20MHZ:</div><div class='ctx'> 		/* Protect when channel wider than 20MHz */</div><div class='del'>-		if (vif-&gt;bss_conf.chandef.width &gt; NL80211_CHAN_WIDTH_20)</div><div class='del'>-			cmd-&gt;protection_flags |= cpu_to_le32(ht_flag);</div><div class='add'>+		if (link_conf-&gt;chanreq.oper.width &gt; NL80211_CHAN_WIDTH_20)</div><div class='add'>+			*protection_flags |= cpu_to_le32(ht_flag);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		IWL_ERR(mvm, "Illegal protection mode %d\n",</div><div class='hunk'>@@ -430,46 +472,82 @@ static void iwl_mvm_mac_ctxt_set_ht_flags(struct iwl_mvm *mvm,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_mac_ctxt_cmd_common(struct iwl_mvm *mvm,</div><div class='del'>-					struct ieee80211_vif *vif,</div><div class='del'>-					struct iwl_mac_ctx_cmd *cmd,</div><div class='del'>-					const u8 *bssid_override,</div><div class='del'>-					u32 action)</div><div class='add'>+void iwl_mvm_set_fw_qos_params(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			       struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			       struct iwl_ac_qos *ac, __le32 *qos_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-	struct ieee80211_chanctx_conf *chanctx;</div><div class='del'>-	bool ht_enabled = !!(vif-&gt;bss_conf.ht_operation_mode &amp;</div><div class='del'>-			     IEEE80211_HT_OP_MODE_PROTECTION);</div><div class='del'>-	u8 cck_ack_rates, ofdm_ack_rates;</div><div class='del'>-	const u8 *bssid = bssid_override ?: vif-&gt;bss_conf.bssid;</div><div class='add'>+	struct iwl_mvm_vif_link_info *mvm_link =</div><div class='add'>+		mvmvif-&gt;link[link_conf-&gt;link_id];</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;id_and_color = cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif-&gt;id,</div><div class='del'>-							    mvmvif-&gt;color));</div><div class='del'>-	cmd-&gt;action = cpu_to_le32(action);</div><div class='add'>+	if (!mvm_link)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IEEE80211_NUM_ACS; i++) {</div><div class='add'>+		u8 txf = iwl_mvm_mac_ac_to_tx_fifo(mvm, i);</div><div class='add'>+		u8 ucode_ac = iwl_mvm_mac80211_ac_to_ucode_ac(i);</div><div class='add'>+</div><div class='add'>+		ac[ucode_ac].cw_min =</div><div class='add'>+			cpu_to_le16(mvm_link-&gt;queue_params[i].cw_min);</div><div class='add'>+		ac[ucode_ac].cw_max =</div><div class='add'>+			cpu_to_le16(mvm_link-&gt;queue_params[i].cw_max);</div><div class='add'>+		ac[ucode_ac].edca_txop =</div><div class='add'>+			cpu_to_le16(mvm_link-&gt;queue_params[i].txop * 32);</div><div class='add'>+		ac[ucode_ac].aifsn = mvm_link-&gt;queue_params[i].aifs;</div><div class='add'>+		ac[ucode_ac].fifos_mask = BIT(txf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link_conf-&gt;qos)</div><div class='add'>+		*qos_flags |= cpu_to_le32(MAC_QOS_FLG_UPDATE_EDCA);</div><div class='add'>+</div><div class='add'>+	if (link_conf-&gt;chanreq.oper.width != NL80211_CHAN_WIDTH_20_NOHT)</div><div class='add'>+		*qos_flags |= cpu_to_le32(MAC_QOS_FLG_TGN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_get_mac_type(struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	u32 mac_type = FW_MAC_TYPE_BSS_STA;</div><div class='ctx'> </div><div class='ctx'> 	switch (vif-&gt;type) {</div><div class='ctx'> 	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 		if (vif-&gt;p2p)</div><div class='del'>-			cmd-&gt;mac_type = cpu_to_le32(FW_MAC_TYPE_P2P_STA);</div><div class='add'>+			mac_type = FW_MAC_TYPE_P2P_STA;</div><div class='ctx'> 		else</div><div class='del'>-			cmd-&gt;mac_type = cpu_to_le32(FW_MAC_TYPE_BSS_STA);</div><div class='add'>+			mac_type = FW_MAC_TYPE_BSS_STA;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='del'>-		cmd-&gt;mac_type = cpu_to_le32(FW_MAC_TYPE_GO);</div><div class='add'>+		mac_type = FW_MAC_TYPE_GO;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_MONITOR:</div><div class='del'>-		cmd-&gt;mac_type = cpu_to_le32(FW_MAC_TYPE_LISTENER);</div><div class='add'>+		mac_type = FW_MAC_TYPE_LISTENER;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_P2P_DEVICE:</div><div class='del'>-		cmd-&gt;mac_type = cpu_to_le32(FW_MAC_TYPE_P2P_DEVICE);</div><div class='add'>+		mac_type = FW_MAC_TYPE_P2P_DEVICE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		cmd-&gt;mac_type = cpu_to_le32(FW_MAC_TYPE_IBSS);</div><div class='add'>+		mac_type = FW_MAC_TYPE_IBSS;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='ctx'> 	}</div><div class='add'>+	return mac_type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_mac_ctxt_cmd_common(struct iwl_mvm *mvm,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					struct iwl_mac_ctx_cmd *cmd,</div><div class='add'>+					const u8 *bssid_override,</div><div class='add'>+					u32 action)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	const u8 *bssid = bssid_override ?: vif-&gt;bss_conf.bssid;</div><div class='add'>+	u32 ht_flag;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;id_and_color = cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif-&gt;id,</div><div class='add'>+							    mvmvif-&gt;color));</div><div class='add'>+	cmd-&gt;action = cpu_to_le32(action);</div><div class='add'>+	cmd-&gt;mac_type = cpu_to_le32(iwl_mvm_get_mac_type(vif));</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;tsf_id = cpu_to_le32(mvmvif-&gt;tsf_id);</div><div class='ctx'> </div><div class='hunk'>@@ -480,15 +558,8 @@ static void iwl_mvm_mac_ctxt_cmd_common(struct iwl_mvm *mvm,</div><div class='ctx'> 	else</div><div class='ctx'> 		eth_broadcast_addr(cmd-&gt;bssid_addr);</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	chanctx = rcu_dereference(vif-&gt;chanctx_conf);</div><div class='del'>-	iwl_mvm_ack_rates(mvm, vif, chanctx ? chanctx-&gt;def.chan-&gt;band</div><div class='del'>-					    : NL80211_BAND_2GHZ,</div><div class='del'>-			  &amp;cck_ack_rates, &amp;ofdm_ack_rates);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	cmd-&gt;cck_rates = cpu_to_le32((u32)cck_ack_rates);</div><div class='del'>-	cmd-&gt;ofdm_rates = cpu_to_le32((u32)ofdm_ack_rates);</div><div class='add'>+	iwl_mvm_set_fw_basic_rates(mvm, vif, &amp;mvmvif-&gt;deflink, &amp;cmd-&gt;cck_rates,</div><div class='add'>+				   &amp;cmd-&gt;ofdm_rates);</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;cck_short_preamble =</div><div class='ctx'> 		cpu_to_le32(vif-&gt;bss_conf.use_short_preamble ?</div><div class='hunk'>@@ -499,33 +570,14 @@ static void iwl_mvm_mac_ctxt_cmd_common(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;filter_flags = 0;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; IEEE80211_NUM_ACS; i++) {</div><div class='del'>-		u8 txf = iwl_mvm_mac_ac_to_tx_fifo(mvm, i);</div><div class='del'>-		u8 ucode_ac = iwl_mvm_mac80211_ac_to_ucode_ac(i);</div><div class='del'>-</div><div class='del'>-		cmd-&gt;ac[ucode_ac].cw_min =</div><div class='del'>-			cpu_to_le16(mvmvif-&gt;queue_params[i].cw_min);</div><div class='del'>-		cmd-&gt;ac[ucode_ac].cw_max =</div><div class='del'>-			cpu_to_le16(mvmvif-&gt;queue_params[i].cw_max);</div><div class='del'>-		cmd-&gt;ac[ucode_ac].edca_txop =</div><div class='del'>-			cpu_to_le16(mvmvif-&gt;queue_params[i].txop * 32);</div><div class='del'>-		cmd-&gt;ac[ucode_ac].aifsn = mvmvif-&gt;queue_params[i].aifs;</div><div class='del'>-		cmd-&gt;ac[ucode_ac].fifos_mask = BIT(txf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (vif-&gt;bss_conf.qos)</div><div class='del'>-		cmd-&gt;qos_flags |= cpu_to_le32(MAC_QOS_FLG_UPDATE_EDCA);</div><div class='add'>+	iwl_mvm_set_fw_qos_params(mvm, vif, &amp;vif-&gt;bss_conf, cmd-&gt;ac,</div><div class='add'>+				  &amp;cmd-&gt;qos_flags);</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;bss_conf.use_cts_prot)</div><div class='del'>-		cmd-&gt;protection_flags |= cpu_to_le32(MAC_PROT_FLG_TGG_PROTECT);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(mvm, "use_cts_prot %d, ht_operation_mode %d\n",</div><div class='del'>-		       vif-&gt;bss_conf.use_cts_prot,</div><div class='del'>-		       vif-&gt;bss_conf.ht_operation_mode);</div><div class='del'>-	if (vif-&gt;bss_conf.chandef.width != NL80211_CHAN_WIDTH_20_NOHT)</div><div class='del'>-		cmd-&gt;qos_flags |= cpu_to_le32(MAC_QOS_FLG_TGN);</div><div class='del'>-	if (ht_enabled)</div><div class='del'>-		iwl_mvm_mac_ctxt_set_ht_flags(mvm, vif, cmd);</div><div class='add'>+	/* The fw does not distinguish between ht and fat */</div><div class='add'>+	ht_flag = MAC_PROT_FLG_HT_PROT | MAC_PROT_FLG_FAT_PROT;</div><div class='add'>+	iwl_mvm_set_fw_protection_flags(mvm, vif, &amp;vif-&gt;bss_conf,</div><div class='add'>+					&amp;cmd-&gt;protection_flags,</div><div class='add'>+					ht_flag, MAC_PROT_FLG_TGG_PROTECT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_mvm_mac_ctxt_send_cmd(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -534,11 +586,76 @@ static int iwl_mvm_mac_ctxt_send_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 	int ret = iwl_mvm_send_cmd_pdu(mvm, MAC_CONTEXT_CMD, 0,</div><div class='ctx'> 				       sizeof(*cmd), cmd);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		IWL_ERR(mvm, "Failed to send MAC context (action:%d): %d\n",</div><div class='add'>+		IWL_ERR(mvm, "Failed to send MAC_CONTEXT_CMD (action:%d): %d\n",</div><div class='ctx'> 			le32_to_cpu(cmd-&gt;action), ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void iwl_mvm_set_fw_dtim_tbtt(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			      struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			      __le64 *dtim_tsf, __le32 *dtim_time,</div><div class='add'>+			      __le32 *assoc_beacon_arrive_time)</div><div class='add'>+{</div><div class='add'>+	u32 dtim_offs;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The DTIM count counts down, so when it is N that means N</div><div class='add'>+	 * more beacon intervals happen until the DTIM TBTT. Therefore</div><div class='add'>+	 * add this to the current time. If that ends up being in the</div><div class='add'>+	 * future, the firmware will handle it.</div><div class='add'>+	 *</div><div class='add'>+	 * Also note that the system_timestamp (which we get here as</div><div class='add'>+	 * "sync_device_ts") and TSF timestamp aren't at exactly the</div><div class='add'>+	 * same offset in the frame -- the TSF is at the first symbol</div><div class='add'>+	 * of the TSF, the system timestamp is at signal acquisition</div><div class='add'>+	 * time. This means there's an offset between them of at most</div><div class='add'>+	 * a few hundred microseconds (24 * 8 bits + PLCP time gives</div><div class='add'>+	 * 384us in the longest case), this is currently not relevant</div><div class='add'>+	 * as the firmware wakes up around 2ms before the TBTT.</div><div class='add'>+	 */</div><div class='add'>+	dtim_offs = link_conf-&gt;sync_dtim_count *</div><div class='add'>+			link_conf-&gt;beacon_int;</div><div class='add'>+	/* convert TU to usecs */</div><div class='add'>+	dtim_offs *= 1024;</div><div class='add'>+</div><div class='add'>+	*dtim_tsf =</div><div class='add'>+		cpu_to_le64(link_conf-&gt;sync_tsf + dtim_offs);</div><div class='add'>+	*dtim_time =</div><div class='add'>+		cpu_to_le32(link_conf-&gt;sync_device_ts + dtim_offs);</div><div class='add'>+	*assoc_beacon_arrive_time =</div><div class='add'>+		cpu_to_le32(link_conf-&gt;sync_device_ts);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(mvm, "DTIM TBTT is 0x%llx/0x%x, offset %d\n",</div><div class='add'>+		       le64_to_cpu(*dtim_tsf),</div><div class='add'>+		       le32_to_cpu(*dtim_time),</div><div class='add'>+		       dtim_offs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__le32 iwl_mvm_mac_ctxt_cmd_p2p_sta_get_oppps_ctwin(struct iwl_mvm *mvm,</div><div class='add'>+						    struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_p2p_noa_attr *noa =</div><div class='add'>+		&amp;vif-&gt;bss_conf.p2p_noa_attr;</div><div class='add'>+</div><div class='add'>+	return cpu_to_le32(noa-&gt;oppps_ctwindow &amp;</div><div class='add'>+			IEEE80211_P2P_OPPPS_CTWINDOW_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 iwl_mvm_mac_ctxt_cmd_sta_get_twt_policy(struct iwl_mvm *mvm,</div><div class='add'>+					    struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	u32 twt_policy = 0;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;bss_conf.twt_requester &amp;&amp; IWL_MVM_USE_TWT)</div><div class='add'>+		twt_policy |= TWT_SUPPORTED;</div><div class='add'>+	if (vif-&gt;bss_conf.twt_protected)</div><div class='add'>+		twt_policy |= PROTECTED_TWT_SUPPORTED;</div><div class='add'>+	if (vif-&gt;bss_conf.twt_broadcast)</div><div class='add'>+		twt_policy |= BROADCAST_TWT_SUPPORTED;</div><div class='add'>+</div><div class='add'>+	return twt_policy;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int iwl_mvm_mac_ctxt_cmd_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 				    struct ieee80211_vif *vif,</div><div class='ctx'> 				    u32 action, bool force_assoc_off,</div><div class='hunk'>@@ -552,80 +669,38 @@ static int iwl_mvm_mac_ctxt_cmd_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 	/* Fill the common data for all mac context types */</div><div class='ctx'> 	iwl_mvm_mac_ctxt_cmd_common(mvm, vif, &amp;cmd, bssid_override, action);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * We always want to hear MCAST frames, if we're not authorized yet,</div><div class='add'>+	 * we'll drop them.</div><div class='add'>+	 */</div><div class='add'>+	cmd.filter_flags |= cpu_to_le32(MAC_FILTER_ACCEPT_GRP);</div><div class='add'>+</div><div class='ctx'> 	if (vif-&gt;p2p) {</div><div class='del'>-		struct ieee80211_p2p_noa_attr *noa =</div><div class='del'>-			&amp;vif-&gt;bss_conf.p2p_noa_attr;</div><div class='add'>+		cmd.p2p_sta.ctwin =</div><div class='add'>+			iwl_mvm_mac_ctxt_cmd_p2p_sta_get_oppps_ctwin(mvm, vif);</div><div class='ctx'> </div><div class='del'>-		cmd.p2p_sta.ctwin = cpu_to_le32(noa-&gt;oppps_ctwindow &amp;</div><div class='del'>-					IEEE80211_P2P_OPPPS_CTWINDOW_MASK);</div><div class='ctx'> 		ctxt_sta = &amp;cmd.p2p_sta.sta;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ctxt_sta = &amp;cmd.sta;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* We need the dtim_period to set the MAC as associated */</div><div class='del'>-	if (vif-&gt;bss_conf.assoc &amp;&amp; vif-&gt;bss_conf.dtim_period &amp;&amp;</div><div class='add'>+	if (vif-&gt;cfg.assoc &amp;&amp; vif-&gt;bss_conf.dtim_period &amp;&amp;</div><div class='ctx'> 	    !force_assoc_off) {</div><div class='ctx'> 		struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-		u8 ap_sta_id = mvmvif-&gt;ap_sta_id;</div><div class='del'>-		u32 dtim_offs;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * The DTIM count counts down, so when it is N that means N</div><div class='del'>-		 * more beacon intervals happen until the DTIM TBTT. Therefore</div><div class='del'>-		 * add this to the current time. If that ends up being in the</div><div class='del'>-		 * future, the firmware will handle it.</div><div class='del'>-		 *</div><div class='del'>-		 * Also note that the system_timestamp (which we get here as</div><div class='del'>-		 * "sync_device_ts") and TSF timestamp aren't at exactly the</div><div class='del'>-		 * same offset in the frame -- the TSF is at the first symbol</div><div class='del'>-		 * of the TSF, the system timestamp is at signal acquisition</div><div class='del'>-		 * time. This means there's an offset between them of at most</div><div class='del'>-		 * a few hundred microseconds (24 * 8 bits + PLCP time gives</div><div class='del'>-		 * 384us in the longest case), this is currently not relevant</div><div class='del'>-		 * as the firmware wakes up around 2ms before the TBTT.</div><div class='del'>-		 */</div><div class='del'>-		dtim_offs = vif-&gt;bss_conf.sync_dtim_count *</div><div class='del'>-				vif-&gt;bss_conf.beacon_int;</div><div class='del'>-		/* convert TU to usecs */</div><div class='del'>-		dtim_offs *= 1024;</div><div class='del'>-</div><div class='del'>-		ctxt_sta-&gt;dtim_tsf =</div><div class='del'>-			cpu_to_le64(vif-&gt;bss_conf.sync_tsf + dtim_offs);</div><div class='del'>-		ctxt_sta-&gt;dtim_time =</div><div class='del'>-			cpu_to_le32(vif-&gt;bss_conf.sync_device_ts + dtim_offs);</div><div class='del'>-		ctxt_sta-&gt;assoc_beacon_arrive_time =</div><div class='del'>-			cpu_to_le32(vif-&gt;bss_conf.sync_device_ts);</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_INFO(mvm, "DTIM TBTT is 0x%llx/0x%x, offset %d\n",</div><div class='del'>-			       le64_to_cpu(ctxt_sta-&gt;dtim_tsf),</div><div class='del'>-			       le32_to_cpu(ctxt_sta-&gt;dtim_time),</div><div class='del'>-			       dtim_offs);</div><div class='add'>+		iwl_mvm_set_fw_dtim_tbtt(mvm, vif, &amp;vif-&gt;bss_conf,</div><div class='add'>+					 &amp;ctxt_sta-&gt;dtim_tsf,</div><div class='add'>+					 &amp;ctxt_sta-&gt;dtim_time,</div><div class='add'>+					 &amp;ctxt_sta-&gt;assoc_beacon_arrive_time);</div><div class='ctx'> </div><div class='ctx'> 		ctxt_sta-&gt;is_assoc = cpu_to_le32(1);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * allow multicast data frames only as long as the station is</div><div class='del'>-		 * authorized, i.e., GTK keys are already installed (if needed)</div><div class='del'>-		 */</div><div class='del'>-		if (ap_sta_id &lt; mvm-&gt;fw-&gt;ucode_capa.num_stations) {</div><div class='del'>-			struct ieee80211_sta *sta;</div><div class='del'>-</div><div class='del'>-			rcu_read_lock();</div><div class='del'>-</div><div class='del'>-			sta = rcu_dereference(mvm-&gt;fw_id_to_mac_id[ap_sta_id]);</div><div class='del'>-			if (!IS_ERR_OR_NULL(sta)) {</div><div class='del'>-				struct iwl_mvm_sta *mvmsta =</div><div class='del'>-					iwl_mvm_sta_from_mac80211(sta);</div><div class='del'>-</div><div class='del'>-				if (mvmsta-&gt;sta_state ==</div><div class='del'>-				    IEEE80211_STA_AUTHORIZED)</div><div class='del'>-					cmd.filter_flags |=</div><div class='del'>-						cpu_to_le32(MAC_FILTER_ACCEPT_GRP);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-		}</div><div class='add'>+		if (!mvmvif-&gt;authorized &amp;&amp;</div><div class='add'>+		    fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+				IWL_UCODE_TLV_CAPA_COEX_HIGH_PRIO))</div><div class='add'>+			ctxt_sta-&gt;data_policy |=</div><div class='add'>+				cpu_to_le32(COEX_HIGH_PRIORITY_ENABLE);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ctxt_sta-&gt;is_assoc = cpu_to_le32(0);</div><div class='ctx'> </div><div class='hunk'>@@ -640,19 +715,15 @@ static int iwl_mvm_mac_ctxt_cmd_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 					      vif-&gt;bss_conf.dtim_period);</div><div class='ctx'> </div><div class='ctx'> 	ctxt_sta-&gt;listen_interval = cpu_to_le32(mvm-&gt;hw-&gt;conf.listen_interval);</div><div class='del'>-	ctxt_sta-&gt;assoc_id = cpu_to_le32(vif-&gt;bss_conf.aid);</div><div class='add'>+	ctxt_sta-&gt;assoc_id = cpu_to_le32(vif-&gt;cfg.aid);</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;probe_req_reg &amp;&amp; vif-&gt;bss_conf.assoc &amp;&amp; vif-&gt;p2p)</div><div class='add'>+	if (vif-&gt;probe_req_reg &amp;&amp; vif-&gt;cfg.assoc &amp;&amp; vif-&gt;p2p)</div><div class='ctx'> 		cmd.filter_flags |= cpu_to_le32(MAC_FILTER_IN_PROBE_REQUEST);</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;bss_conf.he_support &amp;&amp; !iwlwifi_mod_params.disable_11ax) {</div><div class='ctx'> 		cmd.filter_flags |= cpu_to_le32(MAC_FILTER_IN_11AX);</div><div class='del'>-		if (vif-&gt;bss_conf.twt_requester &amp;&amp; IWL_MVM_USE_TWT) {</div><div class='del'>-			ctxt_sta-&gt;data_policy |= cpu_to_le32(TWT_SUPPORTED);</div><div class='del'>-			if (vif-&gt;bss_conf.twt_protected)</div><div class='del'>-				ctxt_sta-&gt;data_policy |=</div><div class='del'>-					cpu_to_le32(PROTECTED_TWT_SUPPORTED);</div><div class='del'>-		}</div><div class='add'>+		ctxt_sta-&gt;data_policy |=</div><div class='add'>+			cpu_to_le32(iwl_mvm_mac_ctxt_cmd_sta_get_twt_policy(mvm, vif));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -664,7 +735,7 @@ static int iwl_mvm_mac_ctxt_cmd_listener(struct iwl_mvm *mvm,</div><div class='ctx'> 					 u32 action)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mac_ctx_cmd cmd = {};</div><div class='del'>-	u32 tfd_queue_msk = BIT(mvm-&gt;snif_queue);</div><div class='add'>+	u32 tfd_queue_msk = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(vif-&gt;type != NL80211_IFTYPE_MONITOR);</div><div class='hunk'>@@ -679,6 +750,14 @@ static int iwl_mvm_mac_ctxt_cmd_listener(struct iwl_mvm *mvm,</div><div class='ctx'> 				       MAC_FILTER_ACCEPT_GRP);</div><div class='ctx'> 	ieee80211_hw_set(mvm-&gt;hw, RX_INCLUDES_FCS);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * the queue mask is only relevant for old TX API, and</div><div class='add'>+	 * mvm-&gt;snif_queue isn't set here (it's still set to</div><div class='add'>+	 * IWL_MVM_INVALID_QUEUE so the BIT() of it is UB)</div><div class='add'>+	 */</div><div class='add'>+	if (!iwl_mvm_has_new_tx_api(mvm))</div><div class='add'>+		tfd_queue_msk = BIT(mvm-&gt;snif_queue);</div><div class='add'>+</div><div class='ctx'> 	/* Allocate sniffer station */</div><div class='ctx'> 	ret = iwl_mvm_allocate_int_sta(mvm, &amp;mvm-&gt;snif_sta, tfd_queue_msk,</div><div class='ctx'> 				       vif-&gt;type, IWL_STA_GENERAL_PURPOSE);</div><div class='hunk'>@@ -726,20 +805,11 @@ static void iwl_mvm_go_iterator(void *_data, u8 *mac, struct ieee80211_vif *vif)</div><div class='ctx'> 		data-&gt;go_active = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_mac_ctxt_cmd_p2p_device(struct iwl_mvm *mvm,</div><div class='del'>-					   struct ieee80211_vif *vif,</div><div class='del'>-					   u32 action)</div><div class='add'>+__le32 iwl_mac_ctxt_p2p_dev_has_extended_disc(struct iwl_mvm *mvm,</div><div class='add'>+					      struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mac_ctx_cmd cmd = {};</div><div class='ctx'> 	struct iwl_mvm_go_iterator_data data = {};</div><div class='ctx'> </div><div class='del'>-	WARN_ON(vif-&gt;type != NL80211_IFTYPE_P2P_DEVICE);</div><div class='del'>-</div><div class='del'>-	iwl_mvm_mac_ctxt_cmd_common(mvm, vif, &amp;cmd, NULL, action);</div><div class='del'>-</div><div class='del'>-	/* Override the filter flags to accept only probe requests */</div><div class='del'>-	cmd.filter_flags = cpu_to_le32(MAC_FILTER_IN_PROBE_REQUEST);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This flag should be set to true when the P2P Device is</div><div class='ctx'> 	 * discoverable and there is at least another active P2P GO. Settings</div><div class='hunk'>@@ -752,7 +822,25 @@ static int iwl_mvm_mac_ctxt_cmd_p2p_device(struct iwl_mvm *mvm,</div><div class='ctx'> 		mvm-&gt;hw, IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='ctx'> 		iwl_mvm_go_iterator, &amp;data);</div><div class='ctx'> </div><div class='del'>-	cmd.p2p_dev.is_disc_extended = cpu_to_le32(data.go_active ? 1 : 0);</div><div class='add'>+	return cpu_to_le32(data.go_active ? 1 : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mac_ctxt_cmd_p2p_device(struct iwl_mvm *mvm,</div><div class='add'>+					   struct ieee80211_vif *vif,</div><div class='add'>+					   u32 action)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mac_ctx_cmd cmd = {};</div><div class='add'>+</div><div class='add'>+	WARN_ON(vif-&gt;type != NL80211_IFTYPE_P2P_DEVICE);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_mac_ctxt_cmd_common(mvm, vif, &amp;cmd, NULL, action);</div><div class='add'>+</div><div class='add'>+	cmd.p2p_dev.is_disc_extended =</div><div class='add'>+		iwl_mac_ctxt_p2p_dev_has_extended_disc(mvm, vif);</div><div class='add'>+</div><div class='add'>+	/* Override the filter flags to accept only probe requests */</div><div class='add'>+	cmd.filter_flags = cpu_to_le32(MAC_FILTER_IN_PROBE_REQUEST);</div><div class='add'>+</div><div class='ctx'> 	return iwl_mvm_mac_ctxt_send_cmd(mvm, &amp;cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -781,39 +869,107 @@ void iwl_mvm_mac_ctxt_set_tim(struct iwl_mvm *mvm,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 iwl_mvm_find_ie_offset(u8 *beacon, u8 eid, u32 frame_size)</div><div class='add'>+u8 iwl_mvm_mac_ctxt_get_lowest_rate(struct iwl_mvm *mvm,</div><div class='add'>+				    struct ieee80211_tx_info *info,</div><div class='add'>+				    struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_mgmt *mgmt = (void *)beacon;</div><div class='del'>-	const u8 *ie;</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	unsigned long basic = vif-&gt;bss_conf.basic_rates;</div><div class='add'>+	u16 lowest_cck = IWL_RATE_COUNT, lowest_ofdm = IWL_RATE_COUNT;</div><div class='add'>+	u32 link_id = u32_get_bits(info-&gt;control.flags,</div><div class='add'>+				   IEEE80211_TX_CTRL_MLO_LINK);</div><div class='add'>+	u8 band = info-&gt;band;</div><div class='add'>+	u8 rate;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	if (link_id == IEEE80211_LINK_UNSPECIFIED &amp;&amp; ieee80211_vif_is_mld(vif)) {</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(mvmvif-&gt;link); i++) {</div><div class='add'>+			if (!mvmvif-&gt;link[i])</div><div class='add'>+				continue;</div><div class='add'>+			/* shouldn't do this when &gt;1 link is active */</div><div class='add'>+			WARN_ON_ONCE(link_id != IEEE80211_LINK_UNSPECIFIED);</div><div class='add'>+			link_id = i;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(frame_size &lt;= (mgmt-&gt;u.beacon.variable - beacon)))</div><div class='del'>-		return 0;</div><div class='add'>+	if (link_id &lt; IEEE80211_LINK_UNSPECIFIED) {</div><div class='add'>+		struct ieee80211_bss_conf *link_conf;</div><div class='ctx'> </div><div class='del'>-	frame_size -= mgmt-&gt;u.beacon.variable - beacon;</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		link_conf = rcu_dereference(vif-&gt;link_conf[link_id]);</div><div class='add'>+		if (link_conf) {</div><div class='add'>+			basic = link_conf-&gt;basic_rates;</div><div class='add'>+			if (link_conf-&gt;chanreq.oper.chan)</div><div class='add'>+				band = link_conf-&gt;chanreq.oper.chan-&gt;band;</div><div class='add'>+		}</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ie = cfg80211_find_ie(eid, mgmt-&gt;u.beacon.variable, frame_size);</div><div class='del'>-	if (!ie)</div><div class='del'>-		return 0;</div><div class='add'>+	sband = mvm-&gt;hw-&gt;wiphy-&gt;bands[band];</div><div class='add'>+	for_each_set_bit(i, &amp;basic, BITS_PER_LONG) {</div><div class='add'>+		u16 hw = sband-&gt;bitrates[i].hw_value;</div><div class='add'>+</div><div class='add'>+		if (hw &gt;= IWL_FIRST_OFDM_RATE) {</div><div class='add'>+			if (lowest_ofdm &gt; hw)</div><div class='add'>+				lowest_ofdm = hw;</div><div class='add'>+		} else if (lowest_cck &gt; hw) {</div><div class='add'>+			lowest_cck = hw;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (band == NL80211_BAND_2GHZ &amp;&amp; !vif-&gt;p2p &amp;&amp;</div><div class='add'>+	    vif-&gt;type != NL80211_IFTYPE_P2P_DEVICE &amp;&amp;</div><div class='add'>+	    !(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_CCK_RATE)) {</div><div class='add'>+		if (lowest_cck != IWL_RATE_COUNT)</div><div class='add'>+			rate = lowest_cck;</div><div class='add'>+		else if (lowest_ofdm != IWL_RATE_COUNT)</div><div class='add'>+			rate = lowest_ofdm;</div><div class='add'>+		else</div><div class='add'>+			rate = IWL_RATE_1M_INDEX;</div><div class='add'>+	} else if (lowest_ofdm != IWL_RATE_COUNT) {</div><div class='add'>+		rate = lowest_ofdm;</div><div class='add'>+	} else {</div><div class='add'>+		rate = IWL_RATE_6M_INDEX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 iwl_mvm_mac_ctxt_get_beacon_flags(const struct iwl_fw *fw, u8 rate_idx)</div><div class='add'>+{</div><div class='add'>+	u16 flags = iwl_mvm_mac80211_idx_to_hwrate(fw, rate_idx);</div><div class='add'>+	bool is_new_rate = iwl_fw_lookup_cmd_ver(fw, BEACON_TEMPLATE_CMD, 0) &gt; 10;</div><div class='add'>+</div><div class='add'>+	if (rate_idx &lt;= IWL_LAST_CCK_RATE)</div><div class='add'>+		flags |= is_new_rate ? IWL_MAC_BEACON_CCK</div><div class='add'>+			  : IWL_MAC_BEACON_CCK_V1;</div><div class='ctx'> </div><div class='del'>-	return ie - beacon;</div><div class='add'>+	return flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u8 iwl_mvm_mac_ctxt_get_lowest_rate(struct ieee80211_tx_info *info,</div><div class='add'>+u8 iwl_mvm_mac_ctxt_get_beacon_rate(struct iwl_mvm *mvm,</div><div class='add'>+				    struct ieee80211_tx_info *info,</div><div class='ctx'> 				    struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	u8 rate;</div><div class='del'>-	if (info-&gt;band == NL80211_BAND_2GHZ &amp;&amp; !vif-&gt;p2p)</div><div class='del'>-		rate = IWL_FIRST_CCK_RATE;</div><div class='del'>-	else</div><div class='del'>-		rate = IWL_FIRST_OFDM_RATE;</div><div class='add'>+	struct ieee80211_supported_band *sband =</div><div class='add'>+		mvm-&gt;hw-&gt;wiphy-&gt;bands[info-&gt;band];</div><div class='add'>+	u32 legacy = vif-&gt;bss_conf.beacon_tx_rate.control[info-&gt;band].legacy;</div><div class='ctx'> </div><div class='del'>-	return rate;</div><div class='add'>+	/* if beacon rate was configured try using it */</div><div class='add'>+	if (hweight32(legacy) == 1) {</div><div class='add'>+		u32 rate = ffs(legacy) - 1;</div><div class='add'>+</div><div class='add'>+		return sband-&gt;bitrates[rate].hw_value;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_mac_ctxt_get_lowest_rate(mvm, info, vif);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_mac_ctxt_set_tx(struct iwl_mvm *mvm,</div><div class='ctx'> 				    struct ieee80211_vif *vif,</div><div class='ctx'> 				    struct sk_buff *beacon,</div><div class='del'>-				    struct iwl_tx_cmd *tx)</div><div class='add'>+				    struct iwl_tx_cmd_v6_params *tx_params)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	struct ieee80211_tx_info *info;</div><div class='hunk'>@@ -823,28 +979,30 @@ static void iwl_mvm_mac_ctxt_set_tx(struct iwl_mvm *mvm,</div><div class='ctx'> 	info = IEEE80211_SKB_CB(beacon);</div><div class='ctx'> </div><div class='ctx'> 	/* Set up TX command fields */</div><div class='del'>-	tx-&gt;len = cpu_to_le16((u16)beacon-&gt;len);</div><div class='del'>-	tx-&gt;sta_id = mvmvif-&gt;bcast_sta.sta_id;</div><div class='del'>-	tx-&gt;life_time = cpu_to_le32(TX_CMD_LIFE_TIME_INFINITE);</div><div class='add'>+	tx_params-&gt;len = cpu_to_le16((u16)beacon-&gt;len);</div><div class='add'>+	tx_params-&gt;sta_id = mvmvif-&gt;deflink.bcast_sta.sta_id;</div><div class='add'>+	tx_params-&gt;life_time = cpu_to_le32(TX_CMD_LIFE_TIME_INFINITE);</div><div class='ctx'> 	tx_flags = TX_CMD_FLG_SEQ_CTL | TX_CMD_FLG_TSF;</div><div class='ctx'> 	tx_flags |=</div><div class='ctx'> 		iwl_mvm_bt_coex_tx_prio(mvm, (void *)beacon-&gt;data, info, 0) &lt;&lt;</div><div class='ctx'> 						TX_CMD_FLG_BT_PRIO_POS;</div><div class='del'>-	tx-&gt;tx_flags = cpu_to_le32(tx_flags);</div><div class='add'>+	tx_params-&gt;tx_flags = cpu_to_le32(tx_flags);</div><div class='ctx'> </div><div class='ctx'> 	if (!fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='del'>-			 IWL_UCODE_TLV_CAPA_BEACON_ANT_SELECTION))</div><div class='add'>+			 IWL_UCODE_TLV_CAPA_BEACON_ANT_SELECTION)) {</div><div class='ctx'> 		iwl_mvm_toggle_tx_ant(mvm, &amp;mvm-&gt;mgmt_last_antenna_idx);</div><div class='ctx'> </div><div class='del'>-	tx-&gt;rate_n_flags =</div><div class='del'>-		cpu_to_le32(BIT(mvm-&gt;mgmt_last_antenna_idx) &lt;&lt;</div><div class='del'>-			    RATE_MCS_ANT_POS);</div><div class='add'>+		tx_params-&gt;rate_n_flags =</div><div class='add'>+			cpu_to_le32(BIT(mvm-&gt;mgmt_last_antenna_idx) &lt;&lt;</div><div class='add'>+				    RATE_MCS_ANT_POS);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	rate = iwl_mvm_mac_ctxt_get_lowest_rate(info, vif);</div><div class='add'>+	rate = iwl_mvm_mac_ctxt_get_beacon_rate(mvm, info, vif);</div><div class='ctx'> </div><div class='del'>-	tx-&gt;rate_n_flags |= cpu_to_le32(iwl_mvm_mac80211_idx_to_hwrate(rate));</div><div class='add'>+	tx_params-&gt;rate_n_flags |=</div><div class='add'>+		cpu_to_le32(iwl_mvm_mac80211_idx_to_hwrate(mvm-&gt;fw, rate));</div><div class='ctx'> 	if (rate == IWL_FIRST_CCK_RATE)</div><div class='del'>-		tx-&gt;rate_n_flags |= cpu_to_le32(RATE_MCS_CCK_MSK);</div><div class='add'>+		tx_params-&gt;rate_n_flags |= cpu_to_le32(RATE_MCS_CCK_MSK_V1);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -904,52 +1062,73 @@ static int iwl_mvm_mac_ctxt_send_beacon_v7(struct iwl_mvm *mvm,</div><div class='ctx'> 					 beacon-&gt;data, beacon-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	beacon_cmd.csa_offset =</div><div class='del'>-		cpu_to_le32(iwl_mvm_find_ie_offset(beacon-&gt;data,</div><div class='del'>-						   WLAN_EID_CHANNEL_SWITCH,</div><div class='del'>-						   beacon-&gt;len));</div><div class='add'>+		cpu_to_le32(iwl_find_ie_offset(beacon-&gt;data,</div><div class='add'>+					       WLAN_EID_CHANNEL_SWITCH,</div><div class='add'>+					       beacon-&gt;len));</div><div class='ctx'> 	beacon_cmd.ecsa_offset =</div><div class='del'>-		cpu_to_le32(iwl_mvm_find_ie_offset(beacon-&gt;data,</div><div class='del'>-						   WLAN_EID_EXT_CHANSWITCH_ANN,</div><div class='del'>-						   beacon-&gt;len));</div><div class='add'>+		cpu_to_le32(iwl_find_ie_offset(beacon-&gt;data,</div><div class='add'>+					       WLAN_EID_EXT_CHANSWITCH_ANN,</div><div class='add'>+					       beacon-&gt;len));</div><div class='ctx'> </div><div class='ctx'> 	return iwl_mvm_mac_ctxt_send_beacon_cmd(mvm, beacon, &amp;beacon_cmd,</div><div class='ctx'> 						sizeof(beacon_cmd));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool iwl_mvm_enable_fils(struct iwl_mvm *mvm,</div><div class='add'>+			 struct ieee80211_vif *vif,</div><div class='add'>+			 struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_AP || IWL_MVM_DISABLE_AP_FILS)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (cfg80211_channel_is_psc(ctx-&gt;def.chan))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return (ctx-&gt;def.chan-&gt;band == NL80211_BAND_6GHZ &amp;&amp;</div><div class='add'>+		ctx-&gt;def.width &gt;= NL80211_CHAN_WIDTH_80);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int iwl_mvm_mac_ctxt_send_beacon_v9(struct iwl_mvm *mvm,</div><div class='ctx'> 					   struct ieee80211_vif *vif,</div><div class='del'>-					   struct sk_buff *beacon)</div><div class='add'>+					   struct sk_buff *beacon,</div><div class='add'>+					   struct ieee80211_bss_conf *link_conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(beacon);</div><div class='ctx'> 	struct iwl_mac_beacon_cmd beacon_cmd = {};</div><div class='del'>-	u8 rate = iwl_mvm_mac_ctxt_get_lowest_rate(info, vif);</div><div class='add'>+	u8 rate = iwl_mvm_mac_ctxt_get_beacon_rate(mvm, info, vif);</div><div class='ctx'> 	u16 flags;</div><div class='ctx'> 	struct ieee80211_chanctx_conf *ctx;</div><div class='ctx'> 	int channel;</div><div class='del'>-</div><div class='del'>-	flags = iwl_mvm_mac80211_idx_to_hwrate(rate);</div><div class='del'>-</div><div class='del'>-	if (rate == IWL_FIRST_CCK_RATE)</div><div class='del'>-		flags |= IWL_MAC_BEACON_CCK;</div><div class='add'>+	flags = iwl_mvm_mac_ctxt_get_beacon_flags(mvm-&gt;fw, rate);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable FILS on PSC channels only */</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	ctx = rcu_dereference(vif-&gt;chanctx_conf);</div><div class='add'>+	ctx = rcu_dereference(link_conf-&gt;chanctx_conf);</div><div class='ctx'> 	channel = ieee80211_frequency_to_channel(ctx-&gt;def.chan-&gt;center_freq);</div><div class='ctx'> 	WARN_ON(channel == 0);</div><div class='del'>-	if (cfg80211_channel_is_psc(ctx-&gt;def.chan) &amp;&amp;</div><div class='del'>-	    !IWL_MVM_DISABLE_AP_FILS) {</div><div class='del'>-		flags |= IWL_MAC_BEACON_FILS;</div><div class='add'>+	if (iwl_mvm_enable_fils(mvm, vif, ctx)) {</div><div class='add'>+		flags |= iwl_fw_lookup_cmd_ver(mvm-&gt;fw, BEACON_TEMPLATE_CMD,</div><div class='add'>+					       0) &gt; 10 ?</div><div class='add'>+			IWL_MAC_BEACON_FILS :</div><div class='add'>+			IWL_MAC_BEACON_FILS_V1;</div><div class='ctx'> 		beacon_cmd.short_ssid =</div><div class='del'>-			cpu_to_le32(~crc32_le(~0, vif-&gt;bss_conf.ssid,</div><div class='del'>-					      vif-&gt;bss_conf.ssid_len));</div><div class='add'>+			cpu_to_le32(~crc32_le(~0, vif-&gt;cfg.ssid,</div><div class='add'>+					      vif-&gt;cfg.ssid_len));</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	beacon_cmd.flags = cpu_to_le16(flags);</div><div class='ctx'> 	beacon_cmd.byte_cnt = cpu_to_le16((u16)beacon-&gt;len);</div><div class='del'>-	beacon_cmd.template_id = cpu_to_le32((u32)mvmvif-&gt;id);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!mvmvif-&gt;link[link_conf-&gt;link_id]))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, BEACON_TEMPLATE_CMD, 0) &gt; 12)</div><div class='add'>+		beacon_cmd.link_id =</div><div class='add'>+			cpu_to_le32(mvmvif-&gt;link[link_conf-&gt;link_id]-&gt;fw_link_id);</div><div class='add'>+	else</div><div class='add'>+		beacon_cmd.link_id = cpu_to_le32((u32)mvmvif-&gt;id);</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_AP)</div><div class='ctx'> 		iwl_mvm_mac_ctxt_set_tim(mvm, &amp;beacon_cmd.tim_idx,</div><div class='hunk'>@@ -957,21 +1136,29 @@ static int iwl_mvm_mac_ctxt_send_beacon_v9(struct iwl_mvm *mvm,</div><div class='ctx'> 					 beacon-&gt;data, beacon-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	beacon_cmd.csa_offset =</div><div class='del'>-		cpu_to_le32(iwl_mvm_find_ie_offset(beacon-&gt;data,</div><div class='del'>-						   WLAN_EID_CHANNEL_SWITCH,</div><div class='del'>-						   beacon-&gt;len));</div><div class='add'>+		cpu_to_le32(iwl_find_ie_offset(beacon-&gt;data,</div><div class='add'>+					       WLAN_EID_CHANNEL_SWITCH,</div><div class='add'>+					       beacon-&gt;len));</div><div class='ctx'> 	beacon_cmd.ecsa_offset =</div><div class='del'>-		cpu_to_le32(iwl_mvm_find_ie_offset(beacon-&gt;data,</div><div class='del'>-						   WLAN_EID_EXT_CHANSWITCH_ANN,</div><div class='del'>-						   beacon-&gt;len));</div><div class='add'>+		cpu_to_le32(iwl_find_ie_offset(beacon-&gt;data,</div><div class='add'>+					       WLAN_EID_EXT_CHANSWITCH_ANN,</div><div class='add'>+					       beacon-&gt;len));</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+	    iwl_fw_lookup_cmd_ver(mvm-&gt;fw, BEACON_TEMPLATE_CMD, 0) &gt;= 14)</div><div class='add'>+		beacon_cmd.btwt_offset =</div><div class='add'>+			cpu_to_le32(iwl_find_ie_offset(beacon-&gt;data,</div><div class='add'>+						       WLAN_EID_S1G_TWT,</div><div class='add'>+						       beacon-&gt;len));</div><div class='ctx'> </div><div class='ctx'> 	return iwl_mvm_mac_ctxt_send_beacon_cmd(mvm, beacon, &amp;beacon_cmd,</div><div class='ctx'> 						sizeof(beacon_cmd));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwl_mvm_mac_ctxt_send_beacon(struct iwl_mvm *mvm,</div><div class='del'>-				 struct ieee80211_vif *vif,</div><div class='del'>-				 struct sk_buff *beacon)</div><div class='add'>+static int iwl_mvm_mac_ctxt_send_beacon(struct iwl_mvm *mvm,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					struct sk_buff *beacon,</div><div class='add'>+					struct ieee80211_bss_conf *link_conf)</div><div class='ctx'> {</div><div class='ctx'> 	if (WARN_ON(!beacon))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -985,14 +1172,16 @@ int iwl_mvm_mac_ctxt_send_beacon(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	if (fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 		       IWL_UCODE_TLV_API_NEW_BEACON_TEMPLATE))</div><div class='del'>-		return iwl_mvm_mac_ctxt_send_beacon_v9(mvm, vif, beacon);</div><div class='add'>+		return iwl_mvm_mac_ctxt_send_beacon_v9(mvm, vif, beacon,</div><div class='add'>+						       link_conf);</div><div class='ctx'> </div><div class='ctx'> 	return iwl_mvm_mac_ctxt_send_beacon_v7(mvm, vif, beacon);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The beacon template for the AP/GO/IBSS has changed and needs update */</div><div class='ctx'> int iwl_mvm_mac_ctxt_beacon_changed(struct iwl_mvm *mvm,</div><div class='del'>-				    struct ieee80211_vif *vif)</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct ieee80211_bss_conf *link_conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *beacon;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1000,16 +1189,19 @@ int iwl_mvm_mac_ctxt_beacon_changed(struct iwl_mvm *mvm,</div><div class='ctx'> 	WARN_ON(vif-&gt;type != NL80211_IFTYPE_AP &amp;&amp;</div><div class='ctx'> 		vif-&gt;type != NL80211_IFTYPE_ADHOC);</div><div class='ctx'> </div><div class='del'>-	beacon = ieee80211_beacon_get_template(mvm-&gt;hw, vif, NULL);</div><div class='add'>+	beacon = ieee80211_beacon_get_template(mvm-&gt;hw, vif, NULL,</div><div class='add'>+					       link_conf-&gt;link_id);</div><div class='ctx'> 	if (!beacon)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='del'>-	if (mvm-&gt;beacon_inject_active)</div><div class='add'>+	if (mvm-&gt;beacon_inject_active) {</div><div class='add'>+		dev_kfree_skb(beacon);</div><div class='ctx'> 		return -EBUSY;</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_mac_ctxt_send_beacon(mvm, vif, beacon);</div><div class='add'>+	ret = iwl_mvm_mac_ctxt_send_beacon(mvm, vif, beacon, link_conf);</div><div class='ctx'> 	dev_kfree_skb(beacon);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1027,7 +1219,7 @@ static void iwl_mvm_mac_ap_iterator(void *_data, u8 *mac,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_mac_ap_iterator_data *data = _data;</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;type != NL80211_IFTYPE_STATION || !vif-&gt;bss_conf.assoc)</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION || !vif-&gt;cfg.assoc)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Station client has higher priority over P2P client*/</div><div class='hunk'>@@ -1039,6 +1231,30 @@ static void iwl_mvm_mac_ap_iterator(void *_data, u8 *mac,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Fill the filter flags for mac context of type AP or P2P GO.</div><div class='add'>+ */</div><div class='add'>+void iwl_mvm_mac_ctxt_cmd_ap_set_filter_flags(struct iwl_mvm *mvm,</div><div class='add'>+					      struct iwl_mvm_vif *mvmvif,</div><div class='add'>+					      __le32 *filter_flags,</div><div class='add'>+					      int accept_probe_req_flag,</div><div class='add'>+					      int accept_beacon_flag)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * in AP mode, pass probe requests and beacons from other APs</div><div class='add'>+	 * (needed for ht protection); when there're no any associated</div><div class='add'>+	 * station don't ask FW to pass beacons to prevent unnecessary</div><div class='add'>+	 * wake-ups.</div><div class='add'>+	 */</div><div class='add'>+	*filter_flags |= cpu_to_le32(accept_probe_req_flag);</div><div class='add'>+	if (mvmvif-&gt;ap_assoc_sta_count || !mvm-&gt;drop_bcn_ap_mode) {</div><div class='add'>+		*filter_flags |= cpu_to_le32(accept_beacon_flag);</div><div class='add'>+		IWL_DEBUG_HC(mvm, "Asking FW to pass beacons\n");</div><div class='add'>+	} else {</div><div class='add'>+		IWL_DEBUG_HC(mvm, "No need to receive beacons\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Fill the specific data for mac context of type AP of P2P GO</div><div class='ctx'>  */</div><div class='ctx'> static void iwl_mvm_mac_ctxt_cmd_fill_ap(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -1057,19 +1273,10 @@ static void iwl_mvm_mac_ctxt_cmd_fill_ap(struct iwl_mvm *mvm,</div><div class='ctx'> 	/* in AP mode, the MCAST FIFO takes the EDCA params from VO */</div><div class='ctx'> 	cmd-&gt;ac[IWL_MVM_TX_FIFO_VO].fifos_mask |= BIT(IWL_MVM_TX_FIFO_MCAST);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * in AP mode, pass probe requests and beacons from other APs</div><div class='del'>-	 * (needed for ht protection); when there're no any associated</div><div class='del'>-	 * station don't ask FW to pass beacons to prevent unnecessary</div><div class='del'>-	 * wake-ups.</div><div class='del'>-	 */</div><div class='del'>-	cmd-&gt;filter_flags |= cpu_to_le32(MAC_FILTER_IN_PROBE_REQUEST);</div><div class='del'>-	if (mvmvif-&gt;ap_assoc_sta_count || !mvm-&gt;drop_bcn_ap_mode) {</div><div class='del'>-		cmd-&gt;filter_flags |= cpu_to_le32(MAC_FILTER_IN_BEACON);</div><div class='del'>-		IWL_DEBUG_HC(mvm, "Asking FW to pass beacons\n");</div><div class='del'>-	} else {</div><div class='del'>-		IWL_DEBUG_HC(mvm, "No need to receive beacons\n");</div><div class='del'>-	}</div><div class='add'>+	iwl_mvm_mac_ctxt_cmd_ap_set_filter_flags(mvm, mvmvif,</div><div class='add'>+						 &amp;cmd-&gt;filter_flags,</div><div class='add'>+						 MAC_FILTER_IN_PROBE_REQUEST,</div><div class='add'>+						 MAC_FILTER_IN_BEACON);</div><div class='ctx'> </div><div class='ctx'> 	ctxt_ap-&gt;bi = cpu_to_le32(vif-&gt;bss_conf.beacon_int);</div><div class='ctx'> 	ctxt_ap-&gt;dtim_interval = cpu_to_le32(vif-&gt;bss_conf.beacon_int *</div><div class='hunk'>@@ -1077,7 +1284,7 @@ static void iwl_mvm_mac_ctxt_cmd_fill_ap(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	if (!fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 			IWL_UCODE_TLV_API_STA_TYPE))</div><div class='del'>-		ctxt_ap-&gt;mcast_qid = cpu_to_le32(mvmvif-&gt;cab_queue);</div><div class='add'>+		ctxt_ap-&gt;mcast_qid = cpu_to_le32(mvmvif-&gt;deflink.cab_queue);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Only set the beacon time when the MAC is being added, when we</div><div class='hunk'>@@ -1095,7 +1302,7 @@ static void iwl_mvm_mac_ctxt_cmd_fill_ap(struct iwl_mvm *mvm,</div><div class='ctx'> 			iwl_mvm_mac_ap_iterator, &amp;data);</div><div class='ctx'> </div><div class='ctx'> 		if (data.beacon_device_ts) {</div><div class='del'>-			u32 rand = (prandom_u32() % (64 - 36)) + 36;</div><div class='add'>+			u32 rand = get_random_u32_inclusive(36, 63);</div><div class='ctx'> 			mvmvif-&gt;ap_beacon_time = data.beacon_device_ts +</div><div class='ctx'> 				ieee80211_tu_to_usec(data.beacon_int * rand /</div><div class='ctx'> 						     100);</div><div class='hunk'>@@ -1231,12 +1438,9 @@ int iwl_mvm_mac_ctxt_remove(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 							   mvmvif-&gt;color));</div><div class='ctx'> 	cmd.action = cpu_to_le32(FW_CTXT_ACTION_REMOVE);</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_send_cmd_pdu(mvm, MAC_CONTEXT_CMD, 0,</div><div class='del'>-				   sizeof(cmd), &amp;cmd);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(mvm, "Failed to remove MAC context: %d\n", ret);</div><div class='add'>+	ret = iwl_mvm_mac_ctxt_send_cmd(mvm, &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	mvmvif-&gt;uploaded = false;</div><div class='ctx'> </div><div class='hunk'>@@ -1261,10 +1465,11 @@ static void iwl_mvm_csa_count_down(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	mvmvif-&gt;csa_countdown = true;</div><div class='ctx'> </div><div class='del'>-	if (!ieee80211_beacon_cntdwn_is_complete(csa_vif)) {</div><div class='del'>-		int c = ieee80211_beacon_update_cntdwn(csa_vif);</div><div class='add'>+	if (!ieee80211_beacon_cntdwn_is_complete(csa_vif, 0)) {</div><div class='add'>+		int c = ieee80211_beacon_update_cntdwn(csa_vif, 0);</div><div class='ctx'> </div><div class='del'>-		iwl_mvm_mac_ctxt_beacon_changed(mvm, csa_vif);</div><div class='add'>+		iwl_mvm_mac_ctxt_beacon_changed(mvm, csa_vif,</div><div class='add'>+						&amp;csa_vif-&gt;bss_conf);</div><div class='ctx'> 		if (csa_vif-&gt;p2p &amp;&amp;</div><div class='ctx'> 		    !iwl_mvm_te_scheduled(&amp;mvmvif-&gt;time_event_data) &amp;&amp; gp2 &amp;&amp;</div><div class='ctx'> 		    tx_success) {</div><div class='hunk'>@@ -1280,7 +1485,7 @@ static void iwl_mvm_csa_count_down(struct iwl_mvm *mvm,</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (!iwl_mvm_te_scheduled(&amp;mvmvif-&gt;time_event_data)) {</div><div class='ctx'> 		/* we don't have CSA NoA scheduled yet, switch now */</div><div class='del'>-		ieee80211_csa_finish(csa_vif);</div><div class='add'>+		ieee80211_csa_finish(csa_vif, 0);</div><div class='ctx'> 		RCU_INIT_POINTER(mvm-&gt;csa_vif, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1302,7 +1507,7 @@ void iwl_mvm_rx_beacon_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 	mvm-&gt;ap_last_beacon_gp2 = le32_to_cpu(beacon-&gt;gp2);</div><div class='ctx'> </div><div class='ctx'> 	if (!iwl_mvm_is_short_beacon_notif_supported(mvm)) {</div><div class='del'>-		struct iwl_mvm_tx_resp *beacon_notify_hdr =</div><div class='add'>+		struct iwl_tx_resp *beacon_notify_hdr =</div><div class='ctx'> 			&amp;beacon_v5-&gt;beacon_notify_hdr;</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(pkt_len &lt; sizeof(*beacon_v5)))</div><div class='hunk'>@@ -1331,7 +1536,7 @@ void iwl_mvm_rx_beacon_notif(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	csa_vif = rcu_dereference_protected(mvm-&gt;csa_vif,</div><div class='ctx'> 					    lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='del'>-	if (unlikely(csa_vif &amp;&amp; csa_vif-&gt;csa_active))</div><div class='add'>+	if (unlikely(csa_vif &amp;&amp; csa_vif-&gt;bss_conf.csa_active))</div><div class='ctx'> 		iwl_mvm_csa_count_down(mvm, csa_vif, mvm-&gt;ap_last_beacon_gp2,</div><div class='ctx'> 				       (status == TX_STATUS_SUCCESS));</div><div class='ctx'> </div><div class='hunk'>@@ -1360,32 +1565,52 @@ void iwl_mvm_rx_beacon_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm,</div><div class='del'>-				     struct iwl_rx_cmd_buffer *rxb)</div><div class='add'>+static void</div><div class='add'>+iwl_mvm_handle_missed_beacons_notif(struct iwl_mvm *mvm,</div><div class='add'>+				    const struct iwl_missed_beacons_notif *mb,</div><div class='add'>+				    struct iwl_rx_packet *pkt)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl_missed_beacons_notif *mb = (void *)pkt-&gt;data;</div><div class='ctx'> 	struct iwl_fw_dbg_trigger_missed_bcon *bcon_trig;</div><div class='ctx'> 	struct iwl_fw_dbg_trigger_tlv *trigger;</div><div class='ctx'> 	u32 stop_trig_missed_bcon, stop_trig_missed_bcon_since_rx;</div><div class='ctx'> 	u32 rx_missed_bcon, rx_missed_bcon_since_rx;</div><div class='ctx'> 	struct ieee80211_vif *vif;</div><div class='del'>-	u32 id = le32_to_cpu(mb-&gt;mac_id);</div><div class='add'>+	/* Id can be mac/link id depending on the notification version */</div><div class='add'>+	u32 id = le32_to_cpu(mb-&gt;link_id);</div><div class='ctx'> 	union iwl_dbg_tlv_tp_data tp_data = { .fw_pkt = pkt };</div><div class='add'>+	u32 mac_type;</div><div class='add'>+	u8 notif_ver = iwl_fw_lookup_notif_ver(mvm-&gt;fw, LEGACY_GROUP,</div><div class='add'>+					       MISSED_BEACONS_NOTIFICATION,</div><div class='add'>+					       0);</div><div class='add'>+	u8 new_notif_ver = iwl_fw_lookup_notif_ver(mvm-&gt;fw, MAC_CONF_GROUP,</div><div class='add'>+						   MISSED_BEACONS_NOTIF, 0);</div><div class='add'>+</div><div class='add'>+	/* If the firmware uses the new notification (from MAC_CONF_GROUP),</div><div class='add'>+	 * refer to that notification's version.</div><div class='add'>+	 * Note that the new notification from MAC_CONF_GROUP starts from</div><div class='add'>+	 * version 5.</div><div class='add'>+	 */</div><div class='add'>+	if (new_notif_ver)</div><div class='add'>+		notif_ver = new_notif_ver;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_INFO(mvm,</div><div class='del'>-		       "missed bcn mac_id=%u, consecutive=%u (%u, %u, %u)\n",</div><div class='del'>-		       le32_to_cpu(mb-&gt;mac_id),</div><div class='add'>+		       "missed bcn %s_id=%u, consecutive=%u (%u)\n",</div><div class='add'>+		       notif_ver &lt; 4 ? "mac" : "link",</div><div class='add'>+		       id,</div><div class='ctx'> 		       le32_to_cpu(mb-&gt;consec_missed_beacons),</div><div class='del'>-		       le32_to_cpu(mb-&gt;consec_missed_beacons_since_last_rx),</div><div class='del'>-		       le32_to_cpu(mb-&gt;num_recvd_beacons),</div><div class='del'>-		       le32_to_cpu(mb-&gt;num_expected_beacons));</div><div class='add'>+		       le32_to_cpu(mb-&gt;consec_missed_beacons_since_last_rx));</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	vif = iwl_mvm_rcu_dereference_vif_id(mvm, id, true);</div><div class='add'>+	/*</div><div class='add'>+	 * starting from version 4 the ID is link ID, but driver</div><div class='add'>+	 * uses link ID == MAC ID, so always treat as MAC ID</div><div class='add'>+	 */</div><div class='add'>+	vif = iwl_mvm_rcu_dereference_vif_id(mvm, id, false);</div><div class='ctx'> 	if (!vif)</div><div class='del'>-		goto out;</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_type = iwl_mvm_get_mac_type(vif);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(mvm, "missed beacon mac_type=%u,\n", mac_type);</div><div class='ctx'> </div><div class='ctx'> 	rx_missed_bcon = le32_to_cpu(mb-&gt;consec_missed_beacons);</div><div class='ctx'> 	rx_missed_bcon_since_rx =</div><div class='hunk'>@@ -1394,10 +1619,22 @@ void iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 	 * TODO: the threshold should be adjusted based on latency conditions,</div><div class='ctx'> 	 * and/or in case of a CS flow on one of the other AP vifs.</div><div class='ctx'> 	 */</div><div class='del'>-	if (rx_missed_bcon &gt; IWL_MVM_MISSED_BEACONS_THRESHOLD_LONG)</div><div class='del'>-		iwl_mvm_connection_loss(mvm, vif, "missed beacons");</div><div class='del'>-	else if (rx_missed_bcon_since_rx &gt; IWL_MVM_MISSED_BEACONS_THRESHOLD)</div><div class='del'>-		ieee80211_beacon_loss(vif);</div><div class='add'>+	if (rx_missed_bcon &gt;= IWL_MVM_MISSED_BEACONS_THRESHOLD_LONG) {</div><div class='add'>+		if (rx_missed_bcon_since_rx &gt;= IWL_MVM_MISSED_BEACONS_SINCE_RX_THOLD) {</div><div class='add'>+			iwl_mvm_connection_loss(mvm, vif, "missed beacons");</div><div class='add'>+		} else {</div><div class='add'>+			IWL_WARN(mvm,</div><div class='add'>+				 "missed beacons exceeds threshold, but receiving data. Stay connected, Expect bugs.\n");</div><div class='add'>+			IWL_WARN(mvm,</div><div class='add'>+				 "missed_beacons:%d, missed_beacons_since_rx:%d\n",</div><div class='add'>+				 rx_missed_bcon, rx_missed_bcon_since_rx);</div><div class='add'>+		}</div><div class='add'>+	} else if (rx_missed_bcon_since_rx &gt; IWL_MVM_MISSED_BEACONS_THRESHOLD) {</div><div class='add'>+		if (!iwl_mvm_has_new_tx_api(mvm))</div><div class='add'>+			ieee80211_beacon_loss(vif);</div><div class='add'>+		else</div><div class='add'>+			ieee80211_cqm_beacon_loss_notify(vif, GFP_ATOMIC);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	iwl_dbg_tlv_time_point(&amp;mvm-&gt;fwrt,</div><div class='ctx'> 			       IWL_FW_INI_TIME_POINT_MISSED_BEACONS, &amp;tp_data);</div><div class='hunk'>@@ -1405,7 +1642,7 @@ void iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 	trigger = iwl_fw_dbg_trigger_on(&amp;mvm-&gt;fwrt, ieee80211_vif_to_wdev(vif),</div><div class='ctx'> 					FW_DBG_TRIGGER_MISSED_BEACONS);</div><div class='ctx'> 	if (!trigger)</div><div class='del'>-		goto out;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	bcon_trig = (void *)trigger-&gt;data;</div><div class='ctx'> 	stop_trig_missed_bcon = le32_to_cpu(bcon_trig-&gt;stop_consec_missed_bcon);</div><div class='hunk'>@@ -1417,9 +1654,31 @@ void iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 	if (rx_missed_bcon_since_rx &gt;= stop_trig_missed_bcon_since_rx ||</div><div class='ctx'> 	    rx_missed_bcon &gt;= stop_trig_missed_bcon)</div><div class='ctx'> 		iwl_fw_dbg_collect_trig(&amp;mvm-&gt;fwrt, trigger, NULL);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+void iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm,</div><div class='add'>+				     struct iwl_rx_cmd_buffer *rxb)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_handle_missed_beacons_notif(mvm, (const void *)pkt-&gt;data, pkt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_rx_missed_beacons_notif_legacy(struct iwl_mvm *mvm,</div><div class='add'>+					    struct iwl_rx_cmd_buffer *rxb)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='add'>+	const struct iwl_missed_beacons_notif_v4 *mb_v4 =</div><div class='add'>+		(const void *)pkt-&gt;data;</div><div class='add'>+	struct iwl_missed_beacons_notif mb = {</div><div class='add'>+		.link_id = mb_v4-&gt;link_id,</div><div class='add'>+		.consec_missed_beacons = mb_v4-&gt;consec_missed_beacons,</div><div class='add'>+		.consec_missed_beacons_since_last_rx =</div><div class='add'>+			mb_v4-&gt;consec_missed_beacons_since_last_rx,</div><div class='add'>+		.other_link_id = cpu_to_le32(IWL_MVM_FW_LINK_ID_INVALID),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	iwl_mvm_handle_missed_beacons_notif(mvm, &amp;mb, pkt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_rx_stored_beacon_notif(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -1427,14 +1686,35 @@ void iwl_mvm_rx_stored_beacon_notif(struct iwl_mvm *mvm,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='ctx'> 	unsigned int pkt_len = iwl_rx_packet_payload_len(pkt);</div><div class='del'>-	struct iwl_stored_beacon_notif *sb = (void *)pkt-&gt;data;</div><div class='add'>+	struct iwl_stored_beacon_notif_common *sb = (void *)pkt-&gt;data;</div><div class='ctx'> 	struct ieee80211_rx_status rx_status;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	u8 *data;</div><div class='ctx'> 	u32 size = le32_to_cpu(sb-&gt;byte_count);</div><div class='add'>+	int ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw,</div><div class='add'>+					WIDE_ID(PROT_OFFLOAD_GROUP, STORED_BEACON_NTF),</div><div class='add'>+					0);</div><div class='ctx'> </div><div class='del'>-	if (size == 0 || pkt_len &lt; struct_size(sb, data, size))</div><div class='add'>+	if (size == 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	/* handle per-version differences */</div><div class='add'>+	if (ver &lt;= 2) {</div><div class='add'>+		struct iwl_stored_beacon_notif_v2 *sb_v2 = (void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (pkt_len &lt; struct_size(sb_v2, data, size))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		data = sb_v2-&gt;data;</div><div class='add'>+	} else {</div><div class='add'>+		struct iwl_stored_beacon_notif *sb_v3 = (void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (pkt_len &lt; struct_size(sb_v3, data, size))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		data = sb_v3-&gt;data;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	skb = alloc_skb(size, GFP_ATOMIC);</div><div class='ctx'> 	if (!skb) {</div><div class='ctx'> 		IWL_ERR(mvm, "alloc_skb failed\n");</div><div class='hunk'>@@ -1455,7 +1735,7 @@ void iwl_mvm_rx_stored_beacon_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 					       rx_status.band);</div><div class='ctx'> </div><div class='ctx'> 	/* copy the data */</div><div class='del'>-	skb_put_data(skb, sb-&gt;data, size);</div><div class='add'>+	skb_put_data(skb, data, size);</div><div class='ctx'> 	memcpy(IEEE80211_SKB_RXCB(skb), &amp;rx_status, sizeof(rx_status));</div><div class='ctx'> </div><div class='ctx'> 	/* pass it as regular rx to mac80211 */</div><div class='hunk'>@@ -1499,9 +1779,9 @@ void iwl_mvm_probe_resp_data_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 	    sizeof(struct ieee80211_p2p_noa_desc) + 2)</div><div class='ctx'> 		new_data-&gt;noa_len -= sizeof(struct ieee80211_p2p_noa_desc);</div><div class='ctx'> </div><div class='del'>-	old_data = rcu_dereference_protected(mvmvif-&gt;probe_resp_data,</div><div class='del'>-					lockdep_is_held(&amp;mvmvif-&gt;mvm-&gt;mutex));</div><div class='del'>-	rcu_assign_pointer(mvmvif-&gt;probe_resp_data, new_data);</div><div class='add'>+	old_data = rcu_dereference_protected(mvmvif-&gt;deflink.probe_resp_data,</div><div class='add'>+					     lockdep_is_held(&amp;mvmvif-&gt;mvm-&gt;mutex));</div><div class='add'>+	rcu_assign_pointer(mvmvif-&gt;deflink.probe_resp_data, new_data);</div><div class='ctx'> </div><div class='ctx'> 	if (old_data)</div><div class='ctx'> 		kfree_rcu(old_data, rcu_head);</div><div class='hunk'>@@ -1511,33 +1791,62 @@ void iwl_mvm_probe_resp_data_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 		ieee80211_beacon_set_cntdwn(vif, notif-&gt;csa_counter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_mvm_channel_switch_noa_notif(struct iwl_mvm *mvm,</div><div class='del'>-				      struct iwl_rx_cmd_buffer *rxb)</div><div class='add'>+void iwl_mvm_channel_switch_start_notif(struct iwl_mvm *mvm,</div><div class='add'>+					struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl_channel_switch_noa_notif *notif = (void *)pkt-&gt;data;</div><div class='ctx'> 	struct ieee80211_vif *csa_vif, *vif;</div><div class='del'>-	struct iwl_mvm_vif *mvmvif;</div><div class='del'>-	u32 id_n_color, csa_id, mac_id;</div><div class='add'>+	struct iwl_mvm_vif *mvmvif, *csa_mvmvif;</div><div class='add'>+	u32 id_n_color, csa_id;</div><div class='add'>+	/* save mac_id or link_id to use later to cancel csa if needed */</div><div class='add'>+	u32 id;</div><div class='add'>+	u32 mac_link_id = 0;</div><div class='add'>+	u8 notif_ver = iwl_fw_lookup_notif_ver(mvm-&gt;fw, MAC_CONF_GROUP,</div><div class='add'>+					       CHANNEL_SWITCH_START_NOTIF, 0);</div><div class='add'>+	bool csa_active;</div><div class='ctx'> </div><div class='del'>-	id_n_color = le32_to_cpu(notif-&gt;id_and_color);</div><div class='del'>-	mac_id = id_n_color &amp; FW_CTXT_ID_MSK;</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(mac_id &gt;= NUM_MAC_INDEX_DRIVER))</div><div class='del'>-		return;</div><div class='add'>+	if (notif_ver &lt; 3) {</div><div class='add'>+		struct iwl_channel_switch_start_notif_v1 *notif = (void *)pkt-&gt;data;</div><div class='add'>+		u32 mac_id;</div><div class='add'>+</div><div class='add'>+		id_n_color = le32_to_cpu(notif-&gt;id_and_color);</div><div class='add'>+		mac_id = id_n_color &amp; FW_CTXT_ID_MSK;</div><div class='add'>+</div><div class='add'>+		vif = iwl_mvm_rcu_dereference_vif_id(mvm, mac_id, true);</div><div class='add'>+		if (!vif)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+</div><div class='add'>+		id = mac_id;</div><div class='add'>+		csa_active = vif-&gt;bss_conf.csa_active;</div><div class='add'>+	} else {</div><div class='add'>+		struct iwl_channel_switch_start_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+		u32 link_id = le32_to_cpu(notif-&gt;link_id);</div><div class='add'>+</div><div class='add'>+		/* we use link ID == MAC ID */</div><div class='add'>+		vif = iwl_mvm_rcu_dereference_vif_id(mvm, link_id, true);</div><div class='add'>+		if (!vif)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+</div><div class='add'>+		id = link_id;</div><div class='add'>+		mac_link_id = vif-&gt;bss_conf.link_id;</div><div class='add'>+		csa_active = vif-&gt;bss_conf.csa_active;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	vif = rcu_dereference(mvm-&gt;vif_id_to_mac[mac_id]);</div><div class='ctx'> 	mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	if (notif_ver &gt;= 3)</div><div class='add'>+		id_n_color = FW_CMD_ID_AND_COLOR(mvmvif-&gt;id, mvmvif-&gt;color);</div><div class='ctx'> </div><div class='ctx'> 	switch (vif-&gt;type) {</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='ctx'> 		csa_vif = rcu_dereference(mvm-&gt;csa_vif);</div><div class='del'>-		if (WARN_ON(!csa_vif || !csa_vif-&gt;csa_active ||</div><div class='add'>+		if (WARN_ON(!csa_vif || !csa_vif-&gt;bss_conf.csa_active ||</div><div class='ctx'> 			    csa_vif != vif))</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> </div><div class='del'>-		csa_id = FW_CMD_ID_AND_COLOR(mvmvif-&gt;id, mvmvif-&gt;color);</div><div class='add'>+		csa_mvmvif = iwl_mvm_vif_from_mac80211(csa_vif);</div><div class='add'>+		csa_id = FW_CMD_ID_AND_COLOR(csa_mvmvif-&gt;id, csa_mvmvif-&gt;color);</div><div class='ctx'> 		if (WARN(csa_id != id_n_color,</div><div class='ctx'> 			 "channel switch noa notification on unexpected vif (csa_vif=%d, notif=%d)",</div><div class='ctx'> 			 csa_id, id_n_color))</div><div class='hunk'>@@ -1549,16 +1858,28 @@ void iwl_mvm_channel_switch_noa_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 				      msecs_to_jiffies(IWL_MVM_CS_UNBLOCK_TX_TIMEOUT *</div><div class='ctx'> 						       csa_vif-&gt;bss_conf.beacon_int));</div><div class='ctx'> </div><div class='del'>-		ieee80211_csa_finish(csa_vif);</div><div class='add'>+		ieee80211_csa_finish(csa_vif, 0);</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 		RCU_INIT_POINTER(mvm-&gt;csa_vif, NULL);</div><div class='ctx'> 		return;</div><div class='ctx'> 	case NL80211_IFTYPE_STATION:</div><div class='add'>+		/*</div><div class='add'>+		 * if we don't know about an ongoing channel switch,</div><div class='add'>+		 * make sure FW cancels it</div><div class='add'>+		 */</div><div class='add'>+		if (iwl_fw_lookup_notif_ver(mvm-&gt;fw, MAC_CONF_GROUP,</div><div class='add'>+					    CHANNEL_SWITCH_ERROR_NOTIF,</div><div class='add'>+					    0) &amp;&amp; !csa_active) {</div><div class='add'>+			IWL_DEBUG_INFO(mvm, "Channel Switch was canceled\n");</div><div class='add'>+			iwl_mvm_cancel_channel_switch(mvm, vif, id);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		iwl_mvm_csa_client_absent(mvm, vif);</div><div class='ctx'> 		cancel_delayed_work(&amp;mvmvif-&gt;csa_work);</div><div class='del'>-		ieee80211_chswitch_done(vif, true);</div><div class='add'>+		ieee80211_chswitch_done(vif, true, mac_link_id);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* should never happen */</div><div class='hunk'>@@ -1569,25 +1890,27 @@ out_unlock:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_mvm_rx_missed_vap_notif(struct iwl_mvm *mvm,</div><div class='del'>-				 struct iwl_rx_cmd_buffer *rxb)</div><div class='add'>+void iwl_mvm_channel_switch_error_notif(struct iwl_mvm *mvm,</div><div class='add'>+					struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl_missed_vap_notif *mb = (void *)pkt-&gt;data;</div><div class='add'>+	struct iwl_channel_switch_error_notif *notif = (void *)pkt-&gt;data;</div><div class='ctx'> 	struct ieee80211_vif *vif;</div><div class='del'>-	u32 id = le32_to_cpu(mb-&gt;mac_id);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(mvm,</div><div class='del'>-		       "missed_vap notify mac_id=%u, num_beacon_intervals_elapsed=%u, profile_periodicity=%u\n",</div><div class='del'>-		       le32_to_cpu(mb-&gt;mac_id),</div><div class='del'>-		       mb-&gt;num_beacon_intervals_elapsed,</div><div class='del'>-		       mb-&gt;profile_periodicity);</div><div class='add'>+	u32 id = le32_to_cpu(notif-&gt;link_id);</div><div class='add'>+	u32 csa_err_mask = le32_to_cpu(notif-&gt;csa_err_mask);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-</div><div class='ctx'> 	vif = iwl_mvm_rcu_dereference_vif_id(mvm, id, true);</div><div class='del'>-	if (vif)</div><div class='del'>-		iwl_mvm_connection_loss(mvm, vif, "missed vap beacon");</div><div class='add'>+	if (!vif) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	IWL_DEBUG_INFO(mvm, "FW reports CSA error: id=%u, csa_err_mask=%u\n",</div><div class='add'>+		       id, csa_err_mask);</div><div class='add'>+	if (csa_err_mask &amp; (CS_ERR_COUNT_ERROR |</div><div class='add'>+			    CS_ERR_LONG_DELAY_AFTER_CS |</div><div class='add'>+			    CS_ERR_TX_BLOCK_TIMER_EXPIRED))</div><div class='add'>+		ieee80211_channel_switch_disconnect(vif);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c<br/>index 607d5d564928..44029ceb8f77 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/fips.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='hunk'>@@ -16,33 +17,42 @@</div><div class='ctx'> #include &lt;net/ieee80211_radiotap.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "iwl-drv.h"</div><div class='ctx'> #include "iwl-op-mode.h"</div><div class='ctx'> #include "iwl-io.h"</div><div class='ctx'> #include "mvm.h"</div><div class='ctx'> #include "sta.h"</div><div class='ctx'> #include "time-event.h"</div><div class='del'>-#include "iwl-eeprom-parse.h"</div><div class='add'>+#include "iwl-nvm-utils.h"</div><div class='ctx'> #include "iwl-phy-db.h"</div><div class='ctx'> #include "testmode.h"</div><div class='ctx'> #include "fw/error-dump.h"</div><div class='ctx'> #include "iwl-prph.h"</div><div class='ctx'> #include "iwl-nvm-parse.h"</div><div class='add'>+#include "time-sync.h"</div><div class='add'>+</div><div class='add'>+#define IWL_MVM_LIMITS(ap)					\</div><div class='add'>+	{							\</div><div class='add'>+		.max = 1,					\</div><div class='add'>+		.types = BIT(NL80211_IFTYPE_STATION),		\</div><div class='add'>+	},							\</div><div class='add'>+	{							\</div><div class='add'>+		.max = 1,					\</div><div class='add'>+		.types = ap |					\</div><div class='add'>+			 BIT(NL80211_IFTYPE_P2P_CLIENT) |	\</div><div class='add'>+			 BIT(NL80211_IFTYPE_P2P_GO),		\</div><div class='add'>+	},							\</div><div class='add'>+	{							\</div><div class='add'>+		.max = 1,					\</div><div class='add'>+		.types = BIT(NL80211_IFTYPE_P2P_DEVICE),	\</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> static const struct ieee80211_iface_limit iwl_mvm_limits[] = {</div><div class='del'>-	{</div><div class='del'>-		.max = 1,</div><div class='del'>-		.types = BIT(NL80211_IFTYPE_STATION),</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.max = 1,</div><div class='del'>-		.types = BIT(NL80211_IFTYPE_AP) |</div><div class='del'>-			BIT(NL80211_IFTYPE_P2P_CLIENT) |</div><div class='del'>-			BIT(NL80211_IFTYPE_P2P_GO),</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.max = 1,</div><div class='del'>-		.types = BIT(NL80211_IFTYPE_P2P_DEVICE),</div><div class='del'>-	},</div><div class='add'>+	IWL_MVM_LIMITS(0)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_iface_limit iwl_mvm_limits_ap[] = {</div><div class='add'>+	IWL_MVM_LIMITS(BIT(NL80211_IFTYPE_AP))</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct ieee80211_iface_combination iwl_mvm_iface_combinations[] = {</div><div class='hunk'>@@ -52,83 +62,16 @@ static const struct ieee80211_iface_combination iwl_mvm_iface_combinations[] = {</div><div class='ctx'> 		.limits = iwl_mvm_limits,</div><div class='ctx'> 		.n_limits = ARRAY_SIZE(iwl_mvm_limits),</div><div class='ctx'> 	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_BCAST_FILTERING</div><div class='del'>-/*</div><div class='del'>- * Use the reserved field to indicate magic values.</div><div class='del'>- * these values will only be used internally by the driver,</div><div class='del'>- * and won't make it to the fw (reserved will be 0).</div><div class='del'>- * BC_FILTER_MAGIC_IP - configure the val of this attribute to</div><div class='del'>- *	be the vif's ip address. in case there is not a single</div><div class='del'>- *	ip address (0, or more than 1), this attribute will</div><div class='del'>- *	be skipped.</div><div class='del'>- * BC_FILTER_MAGIC_MAC - set the val of this attribute to</div><div class='del'>- *	the LSB bytes of the vif's mac address</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	BC_FILTER_MAGIC_NONE = 0,</div><div class='del'>-	BC_FILTER_MAGIC_IP,</div><div class='del'>-	BC_FILTER_MAGIC_MAC,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct iwl_fw_bcast_filter iwl_mvm_default_bcast_filters[] = {</div><div class='del'>-	{</div><div class='del'>-		/* arp */</div><div class='del'>-		.discard = 0,</div><div class='del'>-		.frame_type = BCAST_FILTER_FRAME_TYPE_ALL,</div><div class='del'>-		.attrs = {</div><div class='del'>-			{</div><div class='del'>-				/* frame type - arp, hw type - ethernet */</div><div class='del'>-				.offset_type =</div><div class='del'>-					BCAST_FILTER_OFFSET_PAYLOAD_START,</div><div class='del'>-				.offset = sizeof(rfc1042_header),</div><div class='del'>-				.val = cpu_to_be32(0x08060001),</div><div class='del'>-				.mask = cpu_to_be32(0xffffffff),</div><div class='del'>-			},</div><div class='del'>-			{</div><div class='del'>-				/* arp dest ip */</div><div class='del'>-				.offset_type =</div><div class='del'>-					BCAST_FILTER_OFFSET_PAYLOAD_START,</div><div class='del'>-				.offset = sizeof(rfc1042_header) + 2 +</div><div class='del'>-					  sizeof(struct arphdr) +</div><div class='del'>-					  ETH_ALEN + sizeof(__be32) +</div><div class='del'>-					  ETH_ALEN,</div><div class='del'>-				.mask = cpu_to_be32(0xffffffff),</div><div class='del'>-				/* mark it as special field */</div><div class='del'>-				.reserved1 = cpu_to_le16(BC_FILTER_MAGIC_IP),</div><div class='del'>-			},</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='ctx'> 	{</div><div class='del'>-		/* dhcp offer bcast */</div><div class='del'>-		.discard = 0,</div><div class='del'>-		.frame_type = BCAST_FILTER_FRAME_TYPE_IPV4,</div><div class='del'>-		.attrs = {</div><div class='del'>-			{</div><div class='del'>-				/* udp dest port - 68 (bootp client)*/</div><div class='del'>-				.offset_type = BCAST_FILTER_OFFSET_IP_END,</div><div class='del'>-				.offset = offsetof(struct udphdr, dest),</div><div class='del'>-				.val = cpu_to_be32(0x00440000),</div><div class='del'>-				.mask = cpu_to_be32(0xffff0000),</div><div class='del'>-			},</div><div class='del'>-			{</div><div class='del'>-				/* dhcp - lsb bytes of client hw address */</div><div class='del'>-				.offset_type = BCAST_FILTER_OFFSET_IP_END,</div><div class='del'>-				.offset = 38,</div><div class='del'>-				.mask = cpu_to_be32(0xffffffff),</div><div class='del'>-				/* mark it as special field */</div><div class='del'>-				.reserved1 = cpu_to_le16(BC_FILTER_MAGIC_MAC),</div><div class='del'>-			},</div><div class='del'>-		},</div><div class='add'>+		.num_different_channels = 1,</div><div class='add'>+		.max_interfaces = 3,</div><div class='add'>+		.limits = iwl_mvm_limits_ap,</div><div class='add'>+		.n_limits = ARRAY_SIZE(iwl_mvm_limits_ap),</div><div class='ctx'> 	},</div><div class='del'>-	/* last filter must be empty */</div><div class='del'>-	{},</div><div class='ctx'> };</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static const struct cfg80211_pmsr_capabilities iwl_mvm_pmsr_capa = {</div><div class='del'>-	.max_peers = IWL_MVM_TOF_MAX_APS,</div><div class='add'>+	.max_peers = IWL_TOF_MAX_APS,</div><div class='ctx'> 	.report_ap_tsf = 1,</div><div class='ctx'> 	.randomize_mac_addr = 1,</div><div class='ctx'> </div><div class='hunk'>@@ -145,7 +88,8 @@ static const struct cfg80211_pmsr_capabilities iwl_mvm_pmsr_capa = {</div><div class='ctx'> 		.bandwidths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |</div><div class='ctx'> 			      BIT(NL80211_CHAN_WIDTH_20) |</div><div class='ctx'> 			      BIT(NL80211_CHAN_WIDTH_40) |</div><div class='del'>-			      BIT(NL80211_CHAN_WIDTH_80),</div><div class='add'>+			      BIT(NL80211_CHAN_WIDTH_80) |</div><div class='add'>+			      BIT(NL80211_CHAN_WIDTH_160),</div><div class='ctx'> 		.preambles = BIT(NL80211_PREAMBLE_LEGACY) |</div><div class='ctx'> 			     BIT(NL80211_PREAMBLE_HT) |</div><div class='ctx'> 			     BIT(NL80211_PREAMBLE_VHT) |</div><div class='hunk'>@@ -178,7 +122,7 @@ struct ieee80211_regdomain *iwl_mvm_get_regdomain(struct wiphy *wiphy,</div><div class='ctx'> 	struct ieee80211_regdomain *regd = NULL;</div><div class='ctx'> 	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='del'>-	struct iwl_mcc_update_resp *resp;</div><div class='add'>+	struct iwl_mcc_update_resp_v8 *resp;</div><div class='ctx'> 	u8 resp_ver;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_LAR(mvm, "Getting regdomain data for %s from FW\n", alpha2);</div><div class='hunk'>@@ -189,6 +133,7 @@ struct ieee80211_regdomain *iwl_mvm_get_regdomain(struct wiphy *wiphy,</div><div class='ctx'> 	if (IS_ERR_OR_NULL(resp)) {</div><div class='ctx'> 		IWL_DEBUG_LAR(mvm, "Could not get update from FW %d\n",</div><div class='ctx'> 			      PTR_ERR_OR_ZERO(resp));</div><div class='add'>+		resp = NULL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -202,15 +147,14 @@ struct ieee80211_regdomain *iwl_mvm_get_regdomain(struct wiphy *wiphy,</div><div class='ctx'> 					   MCC_UPDATE_CMD, 0);</div><div class='ctx'> 	IWL_DEBUG_LAR(mvm, "MCC update response version: %d\n", resp_ver);</div><div class='ctx'> </div><div class='del'>-	regd = iwl_parse_nvm_mcc_info(mvm-&gt;trans-&gt;dev, mvm-&gt;cfg,</div><div class='add'>+	regd = iwl_parse_nvm_mcc_info(mvm-&gt;trans,</div><div class='ctx'> 				      __le32_to_cpu(resp-&gt;n_channels),</div><div class='ctx'> 				      resp-&gt;channels,</div><div class='ctx'> 				      __le16_to_cpu(resp-&gt;mcc),</div><div class='ctx'> 				      __le16_to_cpu(resp-&gt;geo_info),</div><div class='del'>-				      __le16_to_cpu(resp-&gt;cap), resp_ver);</div><div class='add'>+				      le32_to_cpu(resp-&gt;cap), resp_ver);</div><div class='ctx'> 	/* Store the return source id */</div><div class='ctx'> 	src_id = resp-&gt;source_id;</div><div class='del'>-	kfree(resp);</div><div class='ctx'> 	if (IS_ERR_OR_NULL(regd)) {</div><div class='ctx'> 		IWL_DEBUG_LAR(mvm, "Could not get parse update from FW %d\n",</div><div class='ctx'> 			      PTR_ERR_OR_ZERO(regd));</div><div class='hunk'>@@ -222,7 +166,10 @@ struct ieee80211_regdomain *iwl_mvm_get_regdomain(struct wiphy *wiphy,</div><div class='ctx'> 	mvm-&gt;lar_regdom_set = true;</div><div class='ctx'> 	mvm-&gt;mcc_src = src_id;</div><div class='ctx'> </div><div class='add'>+	iwl_mei_set_country_code(__le16_to_cpu(resp-&gt;mcc));</div><div class='add'>+</div><div class='ctx'> out:</div><div class='add'>+	kfree(resp);</div><div class='ctx'> 	return regd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -253,7 +200,7 @@ struct ieee80211_regdomain *iwl_mvm_get_current_regdomain(struct iwl_mvm *mvm,</div><div class='ctx'> 				     MCC_SOURCE_OLD_FW, changed);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwl_mvm_init_fw_regd(struct iwl_mvm *mvm)</div><div class='add'>+int iwl_mvm_init_fw_regd(struct iwl_mvm *mvm, bool force_regd_sync)</div><div class='ctx'> {</div><div class='ctx'> 	enum iwl_mcc_source used_src;</div><div class='ctx'> 	struct ieee80211_regdomain *regd;</div><div class='hunk'>@@ -280,8 +227,10 @@ int iwl_mvm_init_fw_regd(struct iwl_mvm *mvm)</div><div class='ctx'> 	if (IS_ERR_OR_NULL(regd))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	/* update cfg80211 if the regdomain was changed */</div><div class='del'>-	if (changed)</div><div class='add'>+	/* update cfg80211 if the regdomain was changed or the caller explicitly</div><div class='add'>+	 * asked to update regdomain</div><div class='add'>+	 */</div><div class='add'>+	if (changed || force_regd_sync)</div><div class='ctx'> 		ret = regulatory_set_wiphy_regd_sync(mvm-&gt;hw-&gt;wiphy, regd);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = 0;</div><div class='hunk'>@@ -290,24 +239,62 @@ int iwl_mvm_init_fw_regd(struct iwl_mvm *mvm)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Each capability added here should also be add to tm_if_types_ext_capa_sta */</div><div class='ctx'> static const u8 he_if_types_ext_capa_sta[] = {</div><div class='ctx'> 	 [0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING,</div><div class='ctx'> 	 [2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT,</div><div class='del'>-	 [7] = WLAN_EXT_CAPA8_OPMODE_NOTIF,</div><div class='add'>+	 [7] = WLAN_EXT_CAPA8_OPMODE_NOTIF |</div><div class='add'>+	       WLAN_EXT_CAPA8_MAX_MSDU_IN_AMSDU_LSB,</div><div class='add'>+	 [8] = WLAN_EXT_CAPA9_MAX_MSDU_IN_AMSDU_MSB,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 tm_if_types_ext_capa_sta[] = {</div><div class='add'>+	 [0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING,</div><div class='add'>+	 [2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT |</div><div class='add'>+	       WLAN_EXT_CAPA3_TIMING_MEASUREMENT_SUPPORT,</div><div class='add'>+	 [7] = WLAN_EXT_CAPA8_OPMODE_NOTIF |</div><div class='add'>+	       WLAN_EXT_CAPA8_MAX_MSDU_IN_AMSDU_LSB,</div><div class='add'>+	 [8] = WLAN_EXT_CAPA9_MAX_MSDU_IN_AMSDU_MSB,</div><div class='ctx'> 	 [9] = WLAN_EXT_CAPA10_TWT_REQUESTER_SUPPORT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct wiphy_iftype_ext_capab he_iftypes_ext_capa[] = {</div><div class='add'>+/* Additional interface types for which extended capabilities are</div><div class='add'>+ * specified separately</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define IWL_MVM_EMLSR_CAPA	(IEEE80211_EML_CAP_EMLSR_SUPP | \</div><div class='add'>+				 IEEE80211_EML_CAP_EMLSR_PADDING_DELAY_32US &lt;&lt; \</div><div class='add'>+					__bf_shf(IEEE80211_EML_CAP_EMLSR_PADDING_DELAY) | \</div><div class='add'>+				 IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY_64US &lt;&lt; \</div><div class='add'>+					__bf_shf(IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY))</div><div class='add'>+#define IWL_MVM_MLD_CAPA_OPS (FIELD_PREP_CONST( \</div><div class='add'>+			IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_SUPP, \</div><div class='add'>+			IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_SUPP_SAME) | \</div><div class='add'>+			IEEE80211_MLD_CAP_OP_LINK_RECONF_SUPPORT)</div><div class='add'>+</div><div class='add'>+static const struct wiphy_iftype_ext_capab add_iftypes_ext_capa[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.iftype = NL80211_IFTYPE_STATION,</div><div class='ctx'> 		.extended_capabilities = he_if_types_ext_capa_sta,</div><div class='ctx'> 		.extended_capabilities_mask = he_if_types_ext_capa_sta,</div><div class='ctx'> 		.extended_capabilities_len = sizeof(he_if_types_ext_capa_sta),</div><div class='add'>+		/* relevant only if EHT is supported */</div><div class='add'>+		.eml_capabilities = IWL_MVM_EMLSR_CAPA,</div><div class='add'>+		.mld_capa_and_ops = IWL_MVM_MLD_CAPA_OPS,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.iftype = NL80211_IFTYPE_STATION,</div><div class='add'>+		.extended_capabilities = tm_if_types_ext_capa_sta,</div><div class='add'>+		.extended_capabilities_mask = tm_if_types_ext_capa_sta,</div><div class='add'>+		.extended_capabilities_len = sizeof(tm_if_types_ext_capa_sta),</div><div class='add'>+		/* relevant only if EHT is supported */</div><div class='add'>+		.eml_capabilities = IWL_MVM_EMLSR_CAPA,</div><div class='add'>+		.mld_capa_and_ops = IWL_MVM_MLD_CAPA_OPS,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-iwl_mvm_op_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant)</div><div class='add'>+int iwl_mvm_op_get_antenna(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+			   u32 *tx_ant, u32 *rx_ant)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	*tx_ant = iwl_mvm_get_valid_tx_ant(mvm);</div><div class='hunk'>@@ -315,6 +302,32 @@ iwl_mvm_op_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int iwl_mvm_op_set_antenna(struct ieee80211_hw *hw, int radio_idx, u32 tx_ant,</div><div class='add'>+			   u32 rx_ant)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+</div><div class='add'>+	/* This has been tested on those devices only */</div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family != IWL_DEVICE_FAMILY_9000 &amp;&amp;</div><div class='add'>+	    mvm-&gt;trans-&gt;mac_cfg-&gt;device_family != IWL_DEVICE_FAMILY_22000 &amp;&amp;</div><div class='add'>+	    mvm-&gt;trans-&gt;mac_cfg-&gt;device_family != IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!mvm-&gt;nvm_data)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/* mac80211 ensures the device is not started,</div><div class='add'>+	 * so the firmware cannot be running</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	mvm-&gt;set_tx_ant = tx_ant;</div><div class='add'>+	mvm-&gt;set_rx_ant = rx_ant;</div><div class='add'>+</div><div class='add'>+	iwl_reinit_cab(mvm-&gt;trans, mvm-&gt;nvm_data, tx_ant, rx_ant, mvm-&gt;fw);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hw *hw = mvm-&gt;hw;</div><div class='hunk'>@@ -329,6 +342,8 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)</div><div class='ctx'> 	bool unified = fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 				   IWL_UCODE_TLV_CAPA_CNSLDTD_D3_D0_IMG);</div><div class='ctx'> #endif</div><div class='add'>+	u32 sec_key_id = WIDE_ID(DATA_PATH_GROUP, SEC_KEY_CMD);</div><div class='add'>+	u8 sec_key_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, sec_key_id, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Tell mac80211 our characteristics */</div><div class='ctx'> 	ieee80211_hw_set(hw, SIGNAL_DBM);</div><div class='hunk'>@@ -338,17 +353,31 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)</div><div class='ctx'> 	ieee80211_hw_set(hw, SUPPORTS_PS);</div><div class='ctx'> 	ieee80211_hw_set(hw, SUPPORTS_DYNAMIC_PS);</div><div class='ctx'> 	ieee80211_hw_set(hw, AMPDU_AGGREGATION);</div><div class='del'>-	ieee80211_hw_set(hw, TIMING_BEACON_ONLY);</div><div class='ctx'> 	ieee80211_hw_set(hw, CONNECTION_MONITOR);</div><div class='ctx'> 	ieee80211_hw_set(hw, CHANCTX_STA_CSA);</div><div class='ctx'> 	ieee80211_hw_set(hw, SUPPORT_FAST_XMIT);</div><div class='ctx'> 	ieee80211_hw_set(hw, SUPPORTS_CLONED_SKBS);</div><div class='ctx'> 	ieee80211_hw_set(hw, SUPPORTS_AMSDU_IN_AMPDU);</div><div class='ctx'> 	ieee80211_hw_set(hw, NEEDS_UNIQUE_STA_ADDR);</div><div class='del'>-	ieee80211_hw_set(hw, DEAUTH_NEED_MGD_TX_PREP);</div><div class='ctx'> 	ieee80211_hw_set(hw, SUPPORTS_VHT_EXT_NSS_BW);</div><div class='ctx'> 	ieee80211_hw_set(hw, BUFF_MMPDU_TXQ);</div><div class='ctx'> 	ieee80211_hw_set(hw, STA_MMPDU_TXQ);</div><div class='add'>+</div><div class='add'>+	/* Set this early since we need to have it for the check below */</div><div class='add'>+	if (mvm-&gt;mld_api_is_used &amp;&amp; mvm-&gt;nvm_data-&gt;sku_cap_11be_enable &amp;&amp;</div><div class='add'>+	    !iwlwifi_mod_params.disable_11ax &amp;&amp;</div><div class='add'>+	    !iwlwifi_mod_params.disable_11be) {</div><div class='add'>+		hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_SUPPORTS_MLO;</div><div class='add'>+		/* we handle this already earlier, but need it for MLO */</div><div class='add'>+		ieee80211_hw_set(hw, HANDLES_QUIET_CSA);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* With MLD FW API, it tracks timing by itself,</div><div class='add'>+	 * no need for any timing from the host</div><div class='add'>+	 */</div><div class='add'>+	if (!mvm-&gt;mld_api_is_used)</div><div class='add'>+		ieee80211_hw_set(hw, TIMING_BEACON_ONLY);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * On older devices, enabling TX A-MSDU occasionally leads to</div><div class='ctx'> 	 * something getting messed up, the command read from the FIFO</div><div class='hunk'>@@ -360,7 +389,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)</div><div class='ctx'> 	 * for older devices. We also don't see this issue on any newer</div><div class='ctx'> 	 * devices.</div><div class='ctx'> 	 */</div><div class='del'>-	if (mvm-&gt;trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_9000)</div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_9000)</div><div class='ctx'> 		ieee80211_hw_set(hw, TX_AMSDU);</div><div class='ctx'> 	ieee80211_hw_set(hw, TX_FRAG_LIST);</div><div class='ctx'> </div><div class='hunk'>@@ -369,7 +398,9 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)</div><div class='ctx'> 		ieee80211_hw_set(hw, HAS_RATE_CONTROL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (iwl_mvm_has_new_rx_api(mvm))</div><div class='add'>+	/* We want to use the mac80211's reorder buffer for 9000 */</div><div class='add'>+	if (iwl_mvm_has_new_rx_api(mvm) &amp;&amp;</div><div class='add'>+	    mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &gt; IWL_DEVICE_FAMILY_9000)</div><div class='ctx'> 		ieee80211_hw_set(hw, SUPPORTS_REORDERING_BUFFER);</div><div class='ctx'> </div><div class='ctx'> 	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='hunk'>@@ -384,13 +415,13 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mvm-&gt;trans-&gt;num_rx_queues &gt; 1)</div><div class='add'>+	if (mvm-&gt;trans-&gt;info.num_rxqs &gt; 1)</div><div class='ctx'> 		ieee80211_hw_set(hw, USES_RSS);</div><div class='ctx'> </div><div class='del'>-	if (mvm-&gt;trans-&gt;max_skb_frags)</div><div class='add'>+	if (mvm-&gt;trans-&gt;info.max_skb_frags)</div><div class='ctx'> 		hw-&gt;netdev_features = NETIF_F_HIGHDMA | NETIF_F_SG;</div><div class='ctx'> </div><div class='del'>-	hw-&gt;queues = IEEE80211_MAX_QUEUES;</div><div class='add'>+	hw-&gt;queues = IEEE80211_NUM_ACS;</div><div class='ctx'> 	hw-&gt;offchannel_tx_hw_queue = IWL_MVM_OFFCHANNEL_QUEUE;</div><div class='ctx'> 	hw-&gt;radiotap_mcs_details |= IEEE80211_RADIOTAP_MCS_HAVE_FEC |</div><div class='ctx'> 				    IEEE80211_RADIOTAP_MCS_HAVE_STBC;</div><div class='hunk'>@@ -408,7 +439,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;uapsd_queues = IWL_MVM_UAPSD_QUEUES;</div><div class='ctx'> 	hw-&gt;uapsd_max_sp_len = IWL_UAPSD_MAX_SP;</div><div class='del'>-	hw-&gt;max_tx_fragments = mvm-&gt;trans-&gt;max_skb_frags;</div><div class='add'>+	hw-&gt;max_tx_fragments = mvm-&gt;trans-&gt;info.max_skb_frags;</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(ARRAY_SIZE(mvm-&gt;ciphers) &lt; ARRAY_SIZE(mvm_ciphers) + 6);</div><div class='ctx'> 	memcpy(mvm-&gt;ciphers, mvm_ciphers, sizeof(mvm_ciphers));</div><div class='hunk'>@@ -431,7 +462,9 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)</div><div class='ctx'> 		IWL_ERR(mvm,</div><div class='ctx'> 			"iwlmvm doesn't allow to disable BT Coex, check bt_coex_active module parameter\n");</div><div class='ctx'> </div><div class='del'>-	ieee80211_hw_set(hw, MFP_CAPABLE);</div><div class='add'>+	if (!fips_enabled)</div><div class='add'>+		ieee80211_hw_set(hw, MFP_CAPABLE);</div><div class='add'>+</div><div class='ctx'> 	mvm-&gt;ciphers[hw-&gt;wiphy-&gt;n_cipher_suites] = WLAN_CIPHER_SUITE_AES_CMAC;</div><div class='ctx'> 	hw-&gt;wiphy-&gt;n_cipher_suites++;</div><div class='ctx'> 	if (iwl_mvm_has_new_rx_api(mvm)) {</div><div class='hunk'>@@ -443,27 +476,10 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)</div><div class='ctx'> 		hw-&gt;wiphy-&gt;n_cipher_suites++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* currently FW API supports only one optional cipher scheme */</div><div class='del'>-	if (mvm-&gt;fw-&gt;cs[0].cipher) {</div><div class='del'>-		const struct iwl_fw_cipher_scheme *fwcs = &amp;mvm-&gt;fw-&gt;cs[0];</div><div class='del'>-		struct ieee80211_cipher_scheme *cs = &amp;mvm-&gt;cs[0];</div><div class='del'>-</div><div class='del'>-		mvm-&gt;hw-&gt;n_cipher_schemes = 1;</div><div class='del'>-</div><div class='del'>-		cs-&gt;cipher = le32_to_cpu(fwcs-&gt;cipher);</div><div class='del'>-		cs-&gt;iftype = BIT(NL80211_IFTYPE_STATION);</div><div class='del'>-		cs-&gt;hdr_len = fwcs-&gt;hdr_len;</div><div class='del'>-		cs-&gt;pn_len = fwcs-&gt;pn_len;</div><div class='del'>-		cs-&gt;pn_off = fwcs-&gt;pn_off;</div><div class='del'>-		cs-&gt;key_idx_off = fwcs-&gt;key_idx_off;</div><div class='del'>-		cs-&gt;key_idx_mask = fwcs-&gt;key_idx_mask;</div><div class='del'>-		cs-&gt;key_idx_shift = fwcs-&gt;key_idx_shift;</div><div class='del'>-		cs-&gt;mic_len = fwcs-&gt;mic_len;</div><div class='del'>-</div><div class='del'>-		mvm-&gt;hw-&gt;cipher_schemes = mvm-&gt;cs;</div><div class='del'>-		mvm-&gt;ciphers[hw-&gt;wiphy-&gt;n_cipher_suites] = cs-&gt;cipher;</div><div class='del'>-		hw-&gt;wiphy-&gt;n_cipher_suites++;</div><div class='del'>-	}</div><div class='add'>+	wiphy_ext_feature_set(hw-&gt;wiphy,</div><div class='add'>+			      NL80211_EXT_FEATURE_BEACON_RATE_LEGACY);</div><div class='add'>+	wiphy_ext_feature_set(hw-&gt;wiphy,</div><div class='add'>+			      NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT);</div><div class='ctx'> </div><div class='ctx'> 	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 			IWL_UCODE_TLV_CAPA_FTM_CALIBRATED)) {</div><div class='hunk'>@@ -472,11 +488,30 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)</div><div class='ctx'> 		hw-&gt;wiphy-&gt;pmsr_capa = &amp;iwl_mvm_pmsr_capa;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='del'>-			IWL_UCODE_TLV_CAPA_BIGTK_SUPPORT))</div><div class='add'>+	/*</div><div class='add'>+	 * beacon protection must be handled by firmware,</div><div class='add'>+	 * so cannot be done with fips_enabled</div><div class='add'>+	 */</div><div class='add'>+	if (!fips_enabled &amp;&amp; sec_key_ver &amp;&amp;</div><div class='add'>+	    fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			IWL_UCODE_TLV_CAPA_BIGTK_TX_SUPPORT))</div><div class='add'>+		wiphy_ext_feature_set(hw-&gt;wiphy,</div><div class='add'>+				      NL80211_EXT_FEATURE_BEACON_PROTECTION);</div><div class='add'>+	else if (!fips_enabled &amp;&amp;</div><div class='add'>+		 fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			     IWL_UCODE_TLV_CAPA_BIGTK_SUPPORT))</div><div class='ctx'> 		wiphy_ext_feature_set(hw-&gt;wiphy,</div><div class='ctx'> 				      NL80211_EXT_FEATURE_BEACON_PROTECTION_CLIENT);</div><div class='ctx'> </div><div class='add'>+	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			IWL_UCODE_TLV_CAPA_TIME_SYNC_BOTH_FTM_TM))</div><div class='add'>+		hw-&gt;wiphy-&gt;hw_timestamp_max_peers = 1;</div><div class='add'>+</div><div class='add'>+	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			IWL_UCODE_TLV_CAPA_SPP_AMSDU_SUPPORT))</div><div class='add'>+		wiphy_ext_feature_set(hw-&gt;wiphy,</div><div class='add'>+				      NL80211_EXT_FEATURE_SPP_AMSDU_SUPPORT);</div><div class='add'>+</div><div class='ctx'> 	ieee80211_hw_set(hw, SINGLE_SCAN_ON_ALL_BANDS);</div><div class='ctx'> 	hw-&gt;wiphy-&gt;features |=</div><div class='ctx'> 		NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR |</div><div class='hunk'>@@ -514,6 +549,10 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)</div><div class='ctx'> 		hw-&gt;wiphy-&gt;regulatory_flags |= REGULATORY_CUSTOM_REG |</div><div class='ctx'> 					       REGULATORY_DISABLE_BEACON_HINTS;</div><div class='ctx'> </div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		wiphy_ext_feature_set(hw-&gt;wiphy,</div><div class='add'>+				      NL80211_EXT_FEATURE_DFS_CONCURRENT);</div><div class='add'>+</div><div class='ctx'> 	hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_AP_UAPSD;</div><div class='ctx'> 	hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;</div><div class='ctx'> 	hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_SPLIT_SCAN_6GHZ;</div><div class='hunk'>@@ -523,7 +562,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)</div><div class='ctx'> 		ARRAY_SIZE(iwl_mvm_iface_combinations);</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;wiphy-&gt;max_remain_on_channel_duration = 10000;</div><div class='del'>-	hw-&gt;max_listen_interval = IWL_CONN_MAX_LISTEN_INTERVAL;</div><div class='add'>+	hw-&gt;max_listen_interval = IWL_MVM_CONN_LISTEN_INTERVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Extract MAC address */</div><div class='ctx'> 	memcpy(mvm-&gt;addresses[0].addr, mvm-&gt;nvm_data-&gt;hw_addr, ETH_ALEN);</div><div class='hunk'>@@ -548,13 +587,13 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)</div><div class='ctx'> 	hw-&gt;wiphy-&gt;max_scan_ssids = PROBE_OPTION_MAX;</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(IWL_MVM_SCAN_STOPPING_MASK &amp; IWL_MVM_SCAN_MASK);</div><div class='del'>-	BUILD_BUG_ON(IWL_MVM_MAX_UMAC_SCANS &gt; HWEIGHT32(IWL_MVM_SCAN_MASK) ||</div><div class='del'>-		     IWL_MVM_MAX_LMAC_SCANS &gt; HWEIGHT32(IWL_MVM_SCAN_MASK));</div><div class='add'>+	BUILD_BUG_ON(IWL_MAX_UMAC_SCANS &gt; HWEIGHT32(IWL_MVM_SCAN_MASK) ||</div><div class='add'>+		     IWL_MAX_LMAC_SCANS &gt; HWEIGHT32(IWL_MVM_SCAN_MASK));</div><div class='ctx'> </div><div class='ctx'> 	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa, IWL_UCODE_TLV_CAPA_UMAC_SCAN))</div><div class='del'>-		mvm-&gt;max_scans = IWL_MVM_MAX_UMAC_SCANS;</div><div class='add'>+		mvm-&gt;max_scans = IWL_MAX_UMAC_SCANS;</div><div class='ctx'> 	else</div><div class='del'>-		mvm-&gt;max_scans = IWL_MVM_MAX_LMAC_SCANS;</div><div class='add'>+		mvm-&gt;max_scans = IWL_MAX_LMAC_SCANS;</div><div class='ctx'> </div><div class='ctx'> 	if (mvm-&gt;nvm_data-&gt;bands[NL80211_BAND_2GHZ].n_channels)</div><div class='ctx'> 		hw-&gt;wiphy-&gt;bands[NL80211_BAND_2GHZ] =</div><div class='hunk'>@@ -576,7 +615,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)</div><div class='ctx'> 		hw-&gt;wiphy-&gt;bands[NL80211_BAND_6GHZ] =</div><div class='ctx'> 			&amp;mvm-&gt;nvm_data-&gt;bands[NL80211_BAND_6GHZ];</div><div class='ctx'> </div><div class='del'>-	hw-&gt;wiphy-&gt;hw_version = mvm-&gt;trans-&gt;hw_id;</div><div class='add'>+	hw-&gt;wiphy-&gt;hw_version = mvm-&gt;trans-&gt;info.hw_id;</div><div class='ctx'> </div><div class='ctx'> 	if (iwlmvm_mod_params.power_scheme != IWL_POWER_SCHEME_CAM)</div><div class='ctx'> 		hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT;</div><div class='hunk'>@@ -602,10 +641,15 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)</div><div class='ctx'> 			       NL80211_FEATURE_LOW_PRIORITY_SCAN |</div><div class='ctx'> 			       NL80211_FEATURE_P2P_GO_OPPPS |</div><div class='ctx'> 			       NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE |</div><div class='del'>-			       NL80211_FEATURE_DYNAMIC_SMPS |</div><div class='del'>-			       NL80211_FEATURE_STATIC_SMPS |</div><div class='ctx'> 			       NL80211_FEATURE_SUPPORTS_WMM_ADMISSION;</div><div class='ctx'> </div><div class='add'>+	/* when firmware supports RLC/SMPS offload, do not set these</div><div class='add'>+	 * driver features, since it's no longer supported by driver.</div><div class='add'>+	 */</div><div class='add'>+	if (!iwl_mvm_has_rlc_offload(mvm))</div><div class='add'>+		hw-&gt;wiphy-&gt;features |= NL80211_FEATURE_STATIC_SMPS |</div><div class='add'>+				       NL80211_FEATURE_DYNAMIC_SMPS;</div><div class='add'>+</div><div class='ctx'> 	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 			IWL_UCODE_TLV_CAPA_TXPOWER_INSERTION_SUPPORT))</div><div class='ctx'> 		hw-&gt;wiphy-&gt;features |= NL80211_FEATURE_TX_POWER_INSERTION;</div><div class='hunk'>@@ -622,9 +666,8 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)</div><div class='ctx'> 			IWL_UCODE_TLV_CAPA_WFA_TPC_REP_IE_SUPPORT))</div><div class='ctx'> 		hw-&gt;wiphy-&gt;features |= NL80211_FEATURE_WFA_TPC_IE_IN_PROBES;</div><div class='ctx'> </div><div class='del'>-	if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, IWL_ALWAYS_LONG_GROUP,</div><div class='del'>-				  WOWLAN_KEK_KCK_MATERIAL,</div><div class='del'>-				  IWL_FW_CMD_VER_UNKNOWN) == 3)</div><div class='add'>+	if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, WOWLAN_KEK_KCK_MATERIAL,</div><div class='add'>+				  IWL_FW_CMD_VER_UNKNOWN) &gt;= 3)</div><div class='ctx'> 		hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK;</div><div class='ctx'> </div><div class='ctx'> 	if (fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='hunk'>@@ -636,33 +679,66 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_mvm_is_oce_supported(mvm)) {</div><div class='add'>+		u8 scan_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, SCAN_REQ_UMAC, 0);</div><div class='add'>+</div><div class='ctx'> 		wiphy_ext_feature_set(hw-&gt;wiphy,</div><div class='ctx'> 			NL80211_EXT_FEATURE_ACCEPT_BCAST_PROBE_RESP);</div><div class='ctx'> 		wiphy_ext_feature_set(hw-&gt;wiphy,</div><div class='ctx'> 			NL80211_EXT_FEATURE_FILS_MAX_CHANNEL_TIME);</div><div class='ctx'> 		wiphy_ext_feature_set(hw-&gt;wiphy,</div><div class='del'>-			NL80211_EXT_FEATURE_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION);</div><div class='del'>-		wiphy_ext_feature_set(hw-&gt;wiphy,</div><div class='ctx'> 			NL80211_EXT_FEATURE_OCE_PROBE_REQ_HIGH_TX_RATE);</div><div class='add'>+</div><div class='add'>+		/* Old firmware also supports probe deferral and suppression */</div><div class='add'>+		if (scan_ver &lt; 15)</div><div class='add'>+			wiphy_ext_feature_set(hw-&gt;wiphy,</div><div class='add'>+					      NL80211_EXT_FEATURE_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	hw-&gt;wiphy-&gt;iftype_ext_capab = NULL;</div><div class='add'>+	hw-&gt;wiphy-&gt;num_iftype_ext_capab = 0;</div><div class='add'>+</div><div class='ctx'> 	if (mvm-&gt;nvm_data-&gt;sku_cap_11ax_enable &amp;&amp;</div><div class='ctx'> 	    !iwlwifi_mod_params.disable_11ax) {</div><div class='del'>-		hw-&gt;wiphy-&gt;iftype_ext_capab = he_iftypes_ext_capa;</div><div class='add'>+		hw-&gt;wiphy-&gt;iftype_ext_capab = add_iftypes_ext_capa;</div><div class='ctx'> 		hw-&gt;wiphy-&gt;num_iftype_ext_capab =</div><div class='del'>-			ARRAY_SIZE(he_iftypes_ext_capa);</div><div class='add'>+			ARRAY_SIZE(add_iftypes_ext_capa) - 1;</div><div class='ctx'> </div><div class='ctx'> 		ieee80211_hw_set(hw, SUPPORTS_MULTI_BSSID);</div><div class='ctx'> 		ieee80211_hw_set(hw, SUPPORTS_ONLY_HE_MULTI_BSSID);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw,</div><div class='add'>+				  WIDE_ID(DATA_PATH_GROUP,</div><div class='add'>+					  WNM_80211V_TIMING_MEASUREMENT_CONFIG_CMD),</div><div class='add'>+				  IWL_FW_CMD_VER_UNKNOWN) &gt;= 1) {</div><div class='add'>+		IWL_DEBUG_INFO(mvm-&gt;trans, "Timing measurement supported\n");</div><div class='add'>+</div><div class='add'>+		if (!hw-&gt;wiphy-&gt;iftype_ext_capab) {</div><div class='add'>+			hw-&gt;wiphy-&gt;num_iftype_ext_capab = 1;</div><div class='add'>+			hw-&gt;wiphy-&gt;iftype_ext_capab = add_iftypes_ext_capa +</div><div class='add'>+				ARRAY_SIZE(add_iftypes_ext_capa) - 1;</div><div class='add'>+		} else {</div><div class='add'>+			hw-&gt;wiphy-&gt;iftype_ext_capab = add_iftypes_ext_capa + 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, WIDE_ID(LOCATION_GROUP,</div><div class='add'>+						   TOF_RANGE_REQ_CMD),</div><div class='add'>+				  IWL_FW_CMD_VER_UNKNOWN) &gt;= 11) {</div><div class='add'>+		wiphy_ext_feature_set(hw-&gt;wiphy,</div><div class='add'>+				      NL80211_EXT_FEATURE_PROT_RANGE_NEGO_AND_MEASURE);</div><div class='add'>+</div><div class='add'>+		if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+				IWL_UCODE_TLV_CAPA_SECURE_LTF_SUPPORT))</div><div class='add'>+			wiphy_ext_feature_set(hw-&gt;wiphy,</div><div class='add'>+					      NL80211_EXT_FEATURE_SECURE_LTF);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mvm-&gt;rts_threshold = IEEE80211_MAX_RTS_THRESHOLD;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	if ((unified || mvm-&gt;fw-&gt;img[IWL_UCODE_WOWLAN].num_sec) &amp;&amp;</div><div class='del'>-	    mvm-&gt;trans-&gt;ops-&gt;d3_suspend &amp;&amp;</div><div class='del'>-	    mvm-&gt;trans-&gt;ops-&gt;d3_resume &amp;&amp;</div><div class='del'>-	    device_can_wakeup(mvm-&gt;trans-&gt;dev)) {</div><div class='add'>+	    device_can_wakeup(mvm-&gt;trans-&gt;dev) &amp;&amp; !fips_enabled) {</div><div class='ctx'> 		mvm-&gt;wowlan.flags |= WIPHY_WOWLAN_MAGIC_PKT |</div><div class='ctx'> 				     WIPHY_WOWLAN_DISCONNECT |</div><div class='ctx'> 				     WIPHY_WOWLAN_EAP_IDENTITY_REQ |</div><div class='hunk'>@@ -681,11 +757,6 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IWLWIFI_BCAST_FILTERING</div><div class='del'>-	/* assign default bcast filtering configuration */</div><div class='del'>-	mvm-&gt;bcast_filters = iwl_mvm_default_bcast_filters;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	ret = iwl_mvm_leds_init(mvm);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -703,10 +774,9 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)</div><div class='ctx'> 		hw-&gt;wiphy-&gt;features |= NL80211_FEATURE_TDLS_CHANNEL_SWITCH;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hw-&gt;netdev_features |= mvm-&gt;cfg-&gt;features;</div><div class='add'>+	hw-&gt;netdev_features |= mvm-&gt;trans-&gt;mac_cfg-&gt;base-&gt;features;</div><div class='ctx'> 	if (!iwl_mvm_is_csum_supported(mvm))</div><div class='del'>-		hw-&gt;netdev_features &amp;= ~(IWL_TX_CSUM_NETIF_FLAGS |</div><div class='del'>-					 NETIF_F_RXCSUM);</div><div class='add'>+		hw-&gt;netdev_features &amp;= ~IWL_CSUM_NETIF_FLAGS_MASK;</div><div class='ctx'> </div><div class='ctx'> 	if (mvm-&gt;cfg-&gt;vht_mu_mimo_supported)</div><div class='ctx'> 		wiphy_ext_feature_set(hw-&gt;wiphy,</div><div class='hunk'>@@ -716,6 +786,8 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)</div><div class='ctx'> 		wiphy_ext_feature_set(hw-&gt;wiphy,</div><div class='ctx'> 				      NL80211_EXT_FEATURE_PROTECTED_TWT);</div><div class='ctx'> </div><div class='add'>+	iwl_mvm_vendor_cmds_register(mvm);</div><div class='add'>+</div><div class='ctx'> 	hw-&gt;wiphy-&gt;available_antennas_tx = iwl_mvm_get_valid_tx_ant(mvm);</div><div class='ctx'> 	hw-&gt;wiphy-&gt;available_antennas_rx = iwl_mvm_get_valid_rx_ant(mvm);</div><div class='ctx'> </div><div class='hunk'>@@ -741,9 +813,8 @@ static void iwl_mvm_tx_skb(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 	ieee80211_free_txskb(mvm-&gt;hw, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_mac_tx(struct ieee80211_hw *hw,</div><div class='del'>-			   struct ieee80211_tx_control *control,</div><div class='del'>-			   struct sk_buff *skb)</div><div class='add'>+void iwl_mvm_mac_tx(struct ieee80211_hw *hw,</div><div class='add'>+		    struct ieee80211_tx_control *control, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	struct ieee80211_sta *sta = control-&gt;sta;</div><div class='hunk'>@@ -751,6 +822,9 @@ static void iwl_mvm_mac_tx(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='ctx'> 	bool offchannel = IEEE80211_SKB_CB(skb)-&gt;flags &amp;</div><div class='ctx'> 		IEEE80211_TX_CTL_TX_OFFCHAN;</div><div class='add'>+	u32 link_id = u32_get_bits(info-&gt;control.flags,</div><div class='add'>+				   IEEE80211_TX_CTRL_MLO_LINK);</div><div class='add'>+	struct ieee80211_sta *tmp_sta = sta;</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_mvm_is_radio_killed(mvm)) {</div><div class='ctx'> 		IWL_DEBUG_DROP(mvm, "Dropping - RF/CT KILL\n");</div><div class='hunk'>@@ -758,30 +832,39 @@ static void iwl_mvm_mac_tx(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (offchannel &amp;&amp;</div><div class='del'>-	    !test_bit(IWL_MVM_STATUS_ROC_RUNNING, &amp;mvm-&gt;status) &amp;&amp;</div><div class='add'>+	    !test_bit(IWL_MVM_STATUS_ROC_P2P_RUNNING, &amp;mvm-&gt;status) &amp;&amp;</div><div class='ctx'> 	    !test_bit(IWL_MVM_STATUS_ROC_AUX_RUNNING, &amp;mvm-&gt;status))</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='del'>-	/* treat non-bufferable MMPDUs on AP interfaces as broadcast */</div><div class='del'>-	if ((info-&gt;control.vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='del'>-	     info-&gt;control.vif-&gt;type == NL80211_IFTYPE_ADHOC) &amp;&amp;</div><div class='del'>-	    ieee80211_is_mgmt(hdr-&gt;frame_control) &amp;&amp;</div><div class='del'>-	    !ieee80211_is_bufferable_mmpdu(hdr-&gt;frame_control))</div><div class='add'>+	/*</div><div class='add'>+	 * bufferable MMPDUs or MMPDUs on STA interfaces come via TXQs</div><div class='add'>+	 * so we treat the others as broadcast</div><div class='add'>+	 */</div><div class='add'>+	if (ieee80211_is_mgmt(hdr-&gt;frame_control))</div><div class='ctx'> 		sta = NULL;</div><div class='ctx'> </div><div class='del'>-	/* If there is no sta, and it's not offchannel - send through AP */</div><div class='add'>+	/* this shouldn't even happen: just drop */</div><div class='ctx'> 	if (!sta &amp;&amp; info-&gt;control.vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='del'>-	    !offchannel) {</div><div class='del'>-		struct iwl_mvm_vif *mvmvif =</div><div class='del'>-			iwl_mvm_vif_from_mac80211(info-&gt;control.vif);</div><div class='del'>-		u8 ap_sta_id = READ_ONCE(mvmvif-&gt;ap_sta_id);</div><div class='del'>-</div><div class='del'>-		if (ap_sta_id &lt; mvm-&gt;fw-&gt;ucode_capa.num_stations) {</div><div class='del'>-			/* mac80211 holds rcu read lock */</div><div class='del'>-			sta = rcu_dereference(mvm-&gt;fw_id_to_mac_id[ap_sta_id]);</div><div class='del'>-			if (IS_ERR_OR_NULL(sta))</div><div class='del'>-				goto drop;</div><div class='del'>-		}</div><div class='add'>+	    !offchannel)</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	if (tmp_sta &amp;&amp; !sta &amp;&amp; link_id != IEEE80211_LINK_UNSPECIFIED &amp;&amp;</div><div class='add'>+	    !ieee80211_is_probe_resp(hdr-&gt;frame_control)) {</div><div class='add'>+		/* translate MLD addresses to LINK addresses */</div><div class='add'>+		struct ieee80211_link_sta *link_sta =</div><div class='add'>+			rcu_dereference(tmp_sta-&gt;link[link_id]);</div><div class='add'>+		struct ieee80211_bss_conf *link_conf =</div><div class='add'>+			rcu_dereference(info-&gt;control.vif-&gt;link_conf[link_id]);</div><div class='add'>+		struct ieee80211_mgmt *mgmt;</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!link_sta || !link_conf))</div><div class='add'>+			goto drop;</div><div class='add'>+</div><div class='add'>+		/* if sta is NULL, the frame is a management frame */</div><div class='add'>+		mgmt = (void *)hdr;</div><div class='add'>+		memcpy(mgmt-&gt;da, link_sta-&gt;addr, ETH_ALEN);</div><div class='add'>+		memcpy(mgmt-&gt;sa, link_conf-&gt;addr, ETH_ALEN);</div><div class='add'>+		memcpy(mgmt-&gt;bssid, link_conf-&gt;bssid, ETH_ALEN);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_tx_skb(mvm, skb, sta);</div><div class='hunk'>@@ -820,7 +903,12 @@ void iwl_mvm_mac_itxq_xmit(struct ieee80211_hw *hw, struct ieee80211_txq *txq)</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	do {</div><div class='del'>-		while (likely(!mvmtxq-&gt;stopped &amp;&amp;</div><div class='add'>+		while (likely(!test_bit(IWL_MVM_TXQ_STATE_STOP_FULL,</div><div class='add'>+					&amp;mvmtxq-&gt;state) &amp;&amp;</div><div class='add'>+			      !test_bit(IWL_MVM_TXQ_STATE_STOP_REDIRECT,</div><div class='add'>+					&amp;mvmtxq-&gt;state) &amp;&amp;</div><div class='add'>+			      !test_bit(IWL_MVM_TXQ_STATE_STOP_AP_CSA,</div><div class='add'>+					&amp;mvmtxq-&gt;state) &amp;&amp;</div><div class='ctx'> 			      !test_bit(IWL_MVM_STATUS_IN_D3, &amp;mvm-&gt;status))) {</div><div class='ctx'> 			skb = ieee80211_tx_dequeue(hw, txq);</div><div class='ctx'> </div><div class='hunk'>@@ -839,48 +927,31 @@ void iwl_mvm_mac_itxq_xmit(struct ieee80211_hw *hw, struct ieee80211_txq *txq)</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_mac_wake_tx_queue(struct ieee80211_hw *hw,</div><div class='del'>-				      struct ieee80211_txq *txq)</div><div class='add'>+void iwl_mvm_mac_wake_tx_queue(struct ieee80211_hw *hw,</div><div class='add'>+			       struct ieee80211_txq *txq)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	struct iwl_mvm_txq *mvmtxq = iwl_mvm_txq_from_mac80211(txq);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Please note that racing is handled very carefully here:</div><div class='del'>-	 * mvmtxq-&gt;txq_id is updated during allocation, and mvmtxq-&gt;list is</div><div class='del'>-	 * deleted afterwards.</div><div class='del'>-	 * This means that if:</div><div class='del'>-	 * mvmtxq-&gt;txq_id != INVALID_QUEUE &amp;&amp; list_empty(&amp;mvmtxq-&gt;list):</div><div class='del'>-	 *	queue is allocated and we can TX.</div><div class='del'>-	 * mvmtxq-&gt;txq_id != INVALID_QUEUE &amp;&amp; !list_empty(&amp;mvmtxq-&gt;list):</div><div class='del'>-	 *	a race, should defer the frame.</div><div class='del'>-	 * mvmtxq-&gt;txq_id == INVALID_QUEUE &amp;&amp; list_empty(&amp;mvmtxq-&gt;list):</div><div class='del'>-	 *	need to allocate the queue and defer the frame.</div><div class='del'>-	 * mvmtxq-&gt;txq_id == INVALID_QUEUE &amp;&amp; !list_empty(&amp;mvmtxq-&gt;list):</div><div class='del'>-	 *	queue is already scheduled for allocation, no need to allocate,</div><div class='del'>-	 *	should defer the frame.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* If the queue is allocated TX and return. */</div><div class='del'>-	if (!txq-&gt;sta || mvmtxq-&gt;txq_id != IWL_MVM_INVALID_QUEUE) {</div><div class='del'>-		/*</div><div class='del'>-		 * Check that list is empty to avoid a race where txq_id is</div><div class='del'>-		 * already updated, but the queue allocation work wasn't</div><div class='del'>-		 * finished</div><div class='del'>-		 */</div><div class='del'>-		if (unlikely(txq-&gt;sta &amp;&amp; !list_empty(&amp;mvmtxq-&gt;list)))</div><div class='del'>-			return;</div><div class='del'>-</div><div class='add'>+	if (likely(test_bit(IWL_MVM_TXQ_STATE_READY, &amp;mvmtxq-&gt;state)) ||</div><div class='add'>+	    !txq-&gt;sta) {</div><div class='ctx'> 		iwl_mvm_mac_itxq_xmit(hw, txq);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* The list is being deleted only after the queue is fully allocated. */</div><div class='del'>-	if (!list_empty(&amp;mvmtxq-&gt;list))</div><div class='del'>-		return;</div><div class='add'>+	/* iwl_mvm_mac_itxq_xmit() will later be called by the worker</div><div class='add'>+	 * to handle any packets we leave on the txq now</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='del'>-	list_add_tail(&amp;mvmtxq-&gt;list, &amp;mvm-&gt;add_stream_txqs);</div><div class='del'>-	schedule_work(&amp;mvm-&gt;add_stream_wk);</div><div class='add'>+	spin_lock_bh(&amp;mvm-&gt;add_stream_lock);</div><div class='add'>+	/* The list is being deleted only after the queue is fully allocated. */</div><div class='add'>+	if (list_empty(&amp;mvmtxq-&gt;list) &amp;&amp;</div><div class='add'>+	    /* recheck under lock */</div><div class='add'>+	    !test_bit(IWL_MVM_TXQ_STATE_READY, &amp;mvmtxq-&gt;state)) {</div><div class='add'>+		list_add_tail(&amp;mvmtxq-&gt;list, &amp;mvm-&gt;add_stream_txqs);</div><div class='add'>+		schedule_work(&amp;mvm-&gt;add_stream_wk);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;mvm-&gt;add_stream_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define CHECK_BA_TRIGGER(_mvm, _trig, _tid_bm, _tid, _fmt...)		\</div><div class='hunk'>@@ -935,9 +1006,9 @@ iwl_mvm_ampdu_check_trigger(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_mac_ampdu_action(struct ieee80211_hw *hw,</div><div class='del'>-				    struct ieee80211_vif *vif,</div><div class='del'>-				    struct ieee80211_ampdu_params *params)</div><div class='add'>+int iwl_mvm_mac_ampdu_action(struct ieee80211_hw *hw,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_ampdu_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -959,8 +1030,8 @@ static int iwl_mvm_mac_ampdu_action(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	switch (action) {</div><div class='ctx'> 	case IEEE80211_AMPDU_RX_START:</div><div class='del'>-		if (iwl_mvm_vif_from_mac80211(vif)-&gt;ap_sta_id ==</div><div class='del'>-				iwl_mvm_sta_from_mac80211(sta)-&gt;sta_id) {</div><div class='add'>+		if (iwl_mvm_vif_from_mac80211(vif)-&gt;deflink.ap_sta_id ==</div><div class='add'>+		    iwl_mvm_sta_from_mac80211(sta)-&gt;deflink.sta_id) {</div><div class='ctx'> 			struct iwl_mvm_vif *mvmvif;</div><div class='ctx'> 			u16 macid = iwl_mvm_vif_from_mac80211(vif)-&gt;id;</div><div class='ctx'> 			struct iwl_mvm_tcm_mac *mdata = &amp;mvm-&gt;tcm.data[macid];</div><div class='hunk'>@@ -1023,17 +1094,72 @@ static void iwl_mvm_cleanup_iterator(void *data, u8 *mac,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = data;</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_probe_resp_data *probe_data;</div><div class='add'>+	unsigned int link_id;</div><div class='ctx'> </div><div class='ctx'> 	mvmvif-&gt;uploaded = false;</div><div class='del'>-	mvmvif-&gt;ap_sta_id = IWL_MVM_INVALID_STA;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;mvm-&gt;time_event_lock);</div><div class='ctx'> 	iwl_mvm_te_clear_data(mvm, &amp;mvmvif-&gt;time_event_data);</div><div class='ctx'> 	spin_unlock_bh(&amp;mvm-&gt;time_event_lock);</div><div class='ctx'> </div><div class='del'>-	mvmvif-&gt;phy_ctxt = NULL;</div><div class='del'>-	memset(&amp;mvmvif-&gt;bf_data, 0, sizeof(mvmvif-&gt;bf_data));</div><div class='del'>-	memset(&amp;mvmvif-&gt;probe_resp_data, 0, sizeof(mvmvif-&gt;probe_resp_data));</div><div class='add'>+	mvmvif-&gt;roc_activity = ROC_NUM_ACTIVITIES;</div><div class='add'>+</div><div class='add'>+	mvmvif-&gt;bf_enabled = false;</div><div class='add'>+	mvmvif-&gt;ba_enabled = false;</div><div class='add'>+	mvmvif-&gt;ap_sta = NULL;</div><div class='add'>+</div><div class='add'>+	mvmvif-&gt;esr_active = false;</div><div class='add'>+	vif-&gt;driver_flags &amp;= ~IEEE80211_VIF_EML_ACTIVE;</div><div class='add'>+</div><div class='add'>+	for_each_mvm_vif_valid_link(mvmvif, link_id) {</div><div class='add'>+		mvmvif-&gt;link[link_id]-&gt;ap_sta_id = IWL_INVALID_STA;</div><div class='add'>+		mvmvif-&gt;link[link_id]-&gt;fw_link_id = IWL_MVM_FW_LINK_ID_INVALID;</div><div class='add'>+		mvmvif-&gt;link[link_id]-&gt;phy_ctxt = NULL;</div><div class='add'>+		mvmvif-&gt;link[link_id]-&gt;active = 0;</div><div class='add'>+		mvmvif-&gt;link[link_id]-&gt;igtk = NULL;</div><div class='add'>+		memset(&amp;mvmvif-&gt;link[link_id]-&gt;bf_data, 0,</div><div class='add'>+		       sizeof(mvmvif-&gt;link[link_id]-&gt;bf_data));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	probe_data = rcu_dereference_protected(mvmvif-&gt;deflink.probe_resp_data,</div><div class='add'>+					       lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+	if (probe_data)</div><div class='add'>+		kfree_rcu(probe_data, rcu_head);</div><div class='add'>+	RCU_INIT_POINTER(mvmvif-&gt;deflink.probe_resp_data, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_cleanup_sta_iterator(void *data, struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = data;</div><div class='add'>+	struct iwl_mvm_sta *mvm_sta;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	int link_id;</div><div class='add'>+</div><div class='add'>+	mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	vif = mvm_sta-&gt;vif;</div><div class='add'>+</div><div class='add'>+	if (!sta-&gt;valid_links)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (link_id = 0; link_id &lt; ARRAY_SIZE((sta)-&gt;link); link_id++) {</div><div class='add'>+		struct iwl_mvm_link_sta *mvm_link_sta;</div><div class='add'>+</div><div class='add'>+		mvm_link_sta =</div><div class='add'>+			rcu_dereference_check(mvm_sta-&gt;link[link_id],</div><div class='add'>+					      lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+		if (mvm_link_sta &amp;&amp; !(vif-&gt;active_links &amp; BIT(link_id))) {</div><div class='add'>+			/*</div><div class='add'>+			 * We have a link STA but the link is inactive in</div><div class='add'>+			 * mac80211. This will happen if we failed to</div><div class='add'>+			 * deactivate the link but mac80211 roll back the</div><div class='add'>+			 * deactivation of the link.</div><div class='add'>+			 * Delete the stale data to avoid issues later on.</div><div class='add'>+			 */</div><div class='add'>+			iwl_mvm_mld_free_sta_link(mvm, mvm_sta, mvm_link_sta,</div><div class='add'>+						  link_id);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_restart_cleanup(struct iwl_mvm *mvm)</div><div class='hunk'>@@ -1058,6 +1184,10 @@ static void iwl_mvm_restart_cleanup(struct iwl_mvm *mvm)</div><div class='ctx'> 	 */</div><div class='ctx'> 	ieee80211_iterate_interfaces(mvm-&gt;hw, 0, iwl_mvm_cleanup_iterator, mvm);</div><div class='ctx'> </div><div class='add'>+	/* cleanup stations as links may be gone after restart */</div><div class='add'>+	ieee80211_iterate_stations_atomic(mvm-&gt;hw,</div><div class='add'>+					  iwl_mvm_cleanup_sta_iterator, mvm);</div><div class='add'>+</div><div class='ctx'> 	mvm-&gt;p2p_device_vif = NULL;</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_reset_phy_ctxts(mvm);</div><div class='hunk'>@@ -1067,10 +1197,12 @@ static void iwl_mvm_restart_cleanup(struct iwl_mvm *mvm)</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_wake_queues(mvm-&gt;hw);</div><div class='ctx'> </div><div class='del'>-	mvm-&gt;vif_count = 0;</div><div class='ctx'> 	mvm-&gt;rx_ba_sessions = 0;</div><div class='ctx'> 	mvm-&gt;fwrt.dump.conf = FW_DBG_INVALID;</div><div class='ctx'> 	mvm-&gt;monitor_on = false;</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='add'>+	mvm-&gt;beacon_inject_active = false;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* keep statistics ticking */</div><div class='ctx'> 	iwl_mvm_accu_radio_stats(mvm);</div><div class='hunk'>@@ -1078,10 +1210,57 @@ static void iwl_mvm_restart_cleanup(struct iwl_mvm *mvm)</div><div class='ctx'> </div><div class='ctx'> int __iwl_mvm_mac_start(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='add'>+	bool fast_resume = false;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='add'>+	ret = iwl_mvm_mei_get_ownership(mvm);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (mvm-&gt;mei_nvm_data) {</div><div class='add'>+		/* We got the NIC, we can now free the MEI NVM data */</div><div class='add'>+		kfree(mvm-&gt;mei_nvm_data);</div><div class='add'>+		mvm-&gt;mei_nvm_data = NULL;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We can't free the nvm_data we allocated based on the SAP</div><div class='add'>+		 * data because we registered to cfg80211 with the channels</div><div class='add'>+		 * allocated on mvm-&gt;nvm_data. Keep a pointer in temp_nvm_data</div><div class='add'>+		 * just in order to be able free it later.</div><div class='add'>+		 * NULLify nvm_data so that we will read the NVM from the</div><div class='add'>+		 * firmware this time.</div><div class='add'>+		 */</div><div class='add'>+		mvm-&gt;temp_nvm_data = mvm-&gt;nvm_data;</div><div class='add'>+		mvm-&gt;nvm_data = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	/* fast_resume will be cleared by iwl_mvm_fast_resume */</div><div class='add'>+	fast_resume = mvm-&gt;fast_resume;</div><div class='add'>+</div><div class='add'>+	if (fast_resume) {</div><div class='add'>+		iwl_mvm_mei_device_state(mvm, true);</div><div class='add'>+		ret = iwl_mvm_fast_resume(mvm);</div><div class='add'>+		if (ret) {</div><div class='add'>+			iwl_mvm_stop_device(mvm);</div><div class='add'>+			/* iwl_mvm_up() will be called further down */</div><div class='add'>+		} else {</div><div class='add'>+			/*</div><div class='add'>+			 * We clear IWL_MVM_STATUS_FIRMWARE_RUNNING upon</div><div class='add'>+			 * mac_down() so that debugfs will stop honoring</div><div class='add'>+			 * requests after we flush all the workers.</div><div class='add'>+			 * Set the IWL_MVM_STATUS_FIRMWARE_RUNNING bit again</div><div class='add'>+			 * now that we are back. This is a bit abusing the</div><div class='add'>+			 * flag since the firmware wasn't really ever stopped,</div><div class='add'>+			 * but this still serves the purpose.</div><div class='add'>+			 */</div><div class='add'>+			set_bit(IWL_MVM_STATUS_FIRMWARE_RUNNING, &amp;mvm-&gt;status);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_PM_SLEEP */</div><div class='add'>+</div><div class='ctx'> 	if (test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &amp;mvm-&gt;status)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Now convert the HW_RESTART_REQUESTED flag to IN_HW_RESTART</div><div class='hunk'>@@ -1092,7 +1271,10 @@ int __iwl_mvm_mac_start(struct iwl_mvm *mvm)</div><div class='ctx'> 		/* Clean up some internal and mac80211 state on restart */</div><div class='ctx'> 		iwl_mvm_restart_cleanup(mvm);</div><div class='ctx'> 	}</div><div class='del'>-	ret = iwl_mvm_up(mvm);</div><div class='add'>+</div><div class='add'>+	/* we also want to load the firmware if fast_resume failed */</div><div class='add'>+	if (!fast_resume || ret)</div><div class='add'>+		ret = iwl_mvm_up(mvm);</div><div class='ctx'> </div><div class='ctx'> 	iwl_dbg_tlv_time_point(&amp;mvm-&gt;fwrt, IWL_FW_INI_TIME_POINT_POST_INIT,</div><div class='ctx'> 			       NULL);</div><div class='hunk'>@@ -1112,15 +1294,31 @@ int __iwl_mvm_mac_start(struct iwl_mvm *mvm)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_mac_start(struct ieee80211_hw *hw)</div><div class='add'>+int iwl_mvm_mac_start(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	int ret;</div><div class='add'>+	int retry, max_retry = 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	ret = __iwl_mvm_mac_start(mvm);</div><div class='add'>+</div><div class='add'>+	/* we are starting the mac not in error flow, and restart is enabled */</div><div class='add'>+	if (!test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &amp;mvm-&gt;status) &amp;&amp;</div><div class='add'>+	    iwlwifi_mod_params.fw_restart)</div><div class='add'>+		max_retry = IWL_MAX_INIT_RETRY;</div><div class='add'>+</div><div class='add'>+	for (retry = 0; retry &lt;= max_retry; retry++) {</div><div class='add'>+		ret = __iwl_mvm_mac_start(mvm);</div><div class='add'>+		if (ret != -ETIMEDOUT)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		IWL_ERR(mvm, "mac start retry %d\n", retry);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='add'>+	iwl_mvm_mei_set_sw_rfkill_state(mvm);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1128,7 +1326,7 @@ static void iwl_mvm_restart_complete(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status);</div><div class='ctx'> </div><div class='hunk'>@@ -1145,12 +1343,16 @@ static void iwl_mvm_restart_complete(struct iwl_mvm *mvm)</div><div class='ctx'> 	 */</div><div class='ctx'> 	iwl_mvm_teardown_tdls_peers(mvm);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+	IWL_INFO(mvm, "restart completed\n");</div><div class='add'>+	iwl_trans_finish_sw_reset(mvm-&gt;trans);</div><div class='add'>+</div><div class='add'>+	/* no need to lock, adding in parallel would schedule too */</div><div class='add'>+	if (!list_empty(&amp;mvm-&gt;add_stream_txqs))</div><div class='add'>+		schedule_work(&amp;mvm-&gt;add_stream_wk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-iwl_mvm_mac_reconfig_complete(struct ieee80211_hw *hw,</div><div class='del'>-			      enum ieee80211_reconfig_type reconfig_type)</div><div class='add'>+void iwl_mvm_mac_reconfig_complete(struct ieee80211_hw *hw,</div><div class='add'>+				   enum ieee80211_reconfig_type reconfig_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> </div><div class='hunk'>@@ -1163,7 +1365,7 @@ iwl_mvm_mac_reconfig_complete(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __iwl_mvm_mac_stop(struct iwl_mvm *mvm)</div><div class='add'>+void __iwl_mvm_mac_stop(struct iwl_mvm *mvm, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -1176,10 +1378,17 @@ void __iwl_mvm_mac_stop(struct iwl_mvm *mvm)</div><div class='ctx'> </div><div class='ctx'> 	/* async_handlers_wk is now blocked */</div><div class='ctx'> </div><div class='del'>-	if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, LONG_GROUP, ADD_STA, 0) &lt; 12)</div><div class='add'>+	if (!iwl_mvm_has_new_station_api(mvm-&gt;fw))</div><div class='ctx'> 		iwl_mvm_rm_aux_sta(mvm);</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_stop_device(mvm);</div><div class='add'>+	if (suspend &amp;&amp;</div><div class='add'>+	    mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_22000) {</div><div class='add'>+		iwl_mvm_fast_suspend(mvm);</div><div class='add'>+		/* From this point on, we won't touch the device */</div><div class='add'>+		iwl_mvm_mei_device_state(mvm, false);</div><div class='add'>+	} else {</div><div class='add'>+		iwl_mvm_stop_device(mvm);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_async_handlers_purge(mvm);</div><div class='ctx'> 	/* async_handlers_list is empty and will stay empty: HW is stopped */</div><div class='hunk'>@@ -1212,10 +1421,11 @@ void __iwl_mvm_mac_stop(struct iwl_mvm *mvm)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_mac_stop(struct ieee80211_hw *hw)</div><div class='add'>+void iwl_mvm_mac_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> </div><div class='add'>+	wiphy_work_flush(mvm-&gt;hw-&gt;wiphy, &amp;mvm-&gt;async_handlers_wiphy_wk);</div><div class='ctx'> 	flush_work(&amp;mvm-&gt;async_handlers_wk);</div><div class='ctx'> 	flush_work(&amp;mvm-&gt;add_stream_wk);</div><div class='ctx'> </div><div class='hunk'>@@ -1238,8 +1448,10 @@ static void iwl_mvm_mac_stop(struct ieee80211_hw *hw)</div><div class='ctx'> 	 */</div><div class='ctx'> 	flush_work(&amp;mvm-&gt;roc_done_wk);</div><div class='ctx'> </div><div class='add'>+	iwl_mvm_mei_set_sw_rfkill_state(mvm);</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	__iwl_mvm_mac_stop(mvm);</div><div class='add'>+	__iwl_mvm_mac_stop(mvm, suspend);</div><div class='ctx'> 	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1247,9 +1459,10 @@ static void iwl_mvm_mac_stop(struct ieee80211_hw *hw)</div><div class='ctx'> 	 * discover that its list is now empty.</div><div class='ctx'> 	 */</div><div class='ctx'> 	cancel_work_sync(&amp;mvm-&gt;async_handlers_wk);</div><div class='add'>+	wiphy_work_cancel(hw-&gt;wiphy, &amp;mvm-&gt;async_handlers_wiphy_wk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct iwl_mvm_phy_ctxt *iwl_mvm_get_free_phy_ctxt(struct iwl_mvm *mvm)</div><div class='add'>+struct iwl_mvm_phy_ctxt *iwl_mvm_get_free_phy_ctxt(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='ctx'> 	u16 i;</div><div class='ctx'> </div><div class='hunk'>@@ -1263,25 +1476,47 @@ static struct iwl_mvm_phy_ctxt *iwl_mvm_get_free_phy_ctxt(struct iwl_mvm *mvm)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_set_tx_power(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='del'>-				s16 tx_power)</div><div class='add'>+int iwl_mvm_set_tx_power(struct iwl_mvm *mvm,</div><div class='add'>+			 struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			 s16 tx_power)</div><div class='ctx'> {</div><div class='add'>+	u32 cmd_id = REDUCE_TX_POWER_CMD;</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(link_conf-&gt;vif);</div><div class='add'>+	u32 mac_id = mvmvif-&gt;id;</div><div class='ctx'> 	int len;</div><div class='del'>-	struct iwl_dev_tx_power_cmd cmd = {</div><div class='del'>-		.common.set_mode = cpu_to_le32(IWL_TX_POWER_MODE_SET_MAC),</div><div class='del'>-		.common.mac_context_id =</div><div class='del'>-			cpu_to_le32(iwl_mvm_vif_from_mac80211(vif)-&gt;id),</div><div class='del'>-		.common.pwr_restriction = cpu_to_le16(8 * tx_power),</div><div class='add'>+	struct iwl_dev_tx_power_cmd_v3_v8 cmd = {</div><div class='add'>+		.common.set_mode = cpu_to_le32(IWL_TX_POWER_MODE_SET_LINK),</div><div class='add'>+		.common.link_id = cpu_to_le32(mac_id),</div><div class='ctx'> 	};</div><div class='del'>-	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, LONG_GROUP,</div><div class='del'>-					   REDUCE_TX_POWER_CMD,</div><div class='del'>-					   IWL_FW_CMD_VER_UNKNOWN);</div><div class='add'>+	struct iwl_dev_tx_power_cmd cmd_v9_v10;</div><div class='add'>+	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, cmd_id, 3);</div><div class='add'>+	u16 u_tx_power = tx_power == IWL_DEFAULT_MAX_TX_POWER ?</div><div class='add'>+		IWL_DEV_MAX_TX_POWER : 8 * tx_power;</div><div class='add'>+	void *cmd_data = &amp;cmd;</div><div class='add'>+</div><div class='add'>+	cmd.common.pwr_restriction = cpu_to_le16(u_tx_power);</div><div class='add'>+</div><div class='add'>+	if (cmd_ver &gt; 8) {</div><div class='add'>+		u32 link_id;</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!mvmvif-&gt;link[link_conf-&gt;link_id]))</div><div class='add'>+			return -ENODEV;</div><div class='add'>+</div><div class='add'>+		link_id = mvmvif-&gt;link[link_conf-&gt;link_id]-&gt;fw_link_id;</div><div class='ctx'> </div><div class='del'>-	if (tx_power == IWL_DEFAULT_MAX_TX_POWER)</div><div class='del'>-		cmd.common.pwr_restriction = cpu_to_le16(IWL_DEV_MAX_TX_POWER);</div><div class='add'>+		/* Those fields sit on the same place for v9 and v10 */</div><div class='add'>+		cmd_v9_v10.common.set_mode = cpu_to_le32(IWL_TX_POWER_MODE_SET_LINK);</div><div class='add'>+		cmd_v9_v10.common.link_id = cpu_to_le32(link_id);</div><div class='add'>+		cmd_v9_v10.common.pwr_restriction = cpu_to_le16(u_tx_power);</div><div class='add'>+		cmd_data = &amp;cmd_v9_v10;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (cmd_ver == 6)</div><div class='del'>-		len = sizeof(cmd.v6);</div><div class='add'>+	if (cmd_ver == 10)</div><div class='add'>+		len = sizeof(cmd_v9_v10.v10);</div><div class='add'>+	else if (cmd_ver == 9)</div><div class='add'>+		len = sizeof(cmd_v9_v10.v9);</div><div class='add'>+	else if (cmd_ver == 8)</div><div class='add'>+		len = sizeof(cmd.v8);</div><div class='ctx'> 	else if (fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 			    IWL_UCODE_TLV_API_REDUCE_TX_POWER))</div><div class='ctx'> 		len = sizeof(cmd.v5);</div><div class='hunk'>@@ -1291,14 +1526,33 @@ static int iwl_mvm_set_tx_power(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	else</div><div class='ctx'> 		len = sizeof(cmd.v3);</div><div class='ctx'> </div><div class='del'>-	/* all structs have the same common part, add it */</div><div class='add'>+	/* all structs have the same common part, add its length */</div><div class='ctx'> 	len += sizeof(cmd.common);</div><div class='ctx'> </div><div class='del'>-	return iwl_mvm_send_cmd_pdu(mvm, REDUCE_TX_POWER_CMD, 0, len, &amp;cmd);</div><div class='add'>+	if (cmd_ver &lt; 9)</div><div class='add'>+		len += sizeof(cmd.per_band);</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_send_cmd_pdu(mvm, cmd_id, 0, len, cmd_data);</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_post_channel_switch(struct ieee80211_hw *hw,</div><div class='del'>-				       struct ieee80211_vif *vif)</div><div class='add'>+static void iwl_mvm_post_csa_tx(void *data, struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = data;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(sta-&gt;txq); i++) {</div><div class='add'>+		struct iwl_mvm_txq *mvmtxq =</div><div class='add'>+			iwl_mvm_txq_from_mac80211(sta-&gt;txq[i]);</div><div class='add'>+</div><div class='add'>+		clear_bit(IWL_MVM_TXQ_STATE_STOP_AP_CSA, &amp;mvmtxq-&gt;state);</div><div class='add'>+		iwl_mvm_mac_itxq_xmit(hw, sta-&gt;txq[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_post_channel_switch(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_bss_conf *link_conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='hunk'>@@ -1308,10 +1562,12 @@ static int iwl_mvm_post_channel_switch(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='ctx'> 		struct iwl_mvm_sta *mvmsta;</div><div class='add'>+		unsigned int link_id = link_conf-&gt;link_id;</div><div class='add'>+		u8 ap_sta_id = mvmvif-&gt;link[link_id]-&gt;ap_sta_id;</div><div class='ctx'> </div><div class='ctx'> 		mvmvif-&gt;csa_bcn_pending = false;</div><div class='del'>-		mvmsta = iwl_mvm_sta_from_staid_protected(mvm,</div><div class='del'>-							  mvmvif-&gt;ap_sta_id);</div><div class='add'>+		mvmvif-&gt;csa_blocks_tx = false;</div><div class='add'>+		mvmsta = iwl_mvm_sta_from_staid_protected(mvm, ap_sta_id);</div><div class='ctx'> </div><div class='ctx'> 		if (WARN_ON(!mvmsta)) {</div><div class='ctx'> 			ret = -EIO;</div><div class='hunk'>@@ -1319,17 +1575,31 @@ static int iwl_mvm_post_channel_switch(struct ieee80211_hw *hw,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		iwl_mvm_sta_modify_disable_tx(mvm, mvmsta, false);</div><div class='del'>-</div><div class='del'>-		iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);</div><div class='add'>+		if (mvm-&gt;mld_api_is_used)</div><div class='add'>+			iwl_mvm_mld_mac_ctxt_changed(mvm, vif, false);</div><div class='add'>+		else</div><div class='add'>+			iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);</div><div class='ctx'> </div><div class='ctx'> 		if (!fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 				 IWL_UCODE_TLV_CAPA_CHANNEL_SWITCH_CMD)) {</div><div class='del'>-			ret = iwl_mvm_enable_beacon_filter(mvm, vif, 0);</div><div class='add'>+			ret = iwl_mvm_enable_beacon_filter(mvm, vif);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 			iwl_mvm_stop_session_protection(mvm, vif);</div><div class='ctx'> 		}</div><div class='add'>+	} else if (vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp; mvmvif-&gt;csa_blocks_tx) {</div><div class='add'>+		struct iwl_mvm_txq *mvmtxq =</div><div class='add'>+			iwl_mvm_txq_from_mac80211(vif-&gt;txq);</div><div class='add'>+</div><div class='add'>+		clear_bit(IWL_MVM_TXQ_STATE_STOP_AP_CSA, &amp;mvmtxq-&gt;state);</div><div class='add'>+</div><div class='add'>+		local_bh_disable();</div><div class='add'>+		iwl_mvm_mac_itxq_xmit(hw, vif-&gt;txq);</div><div class='add'>+		ieee80211_iterate_stations_atomic(hw, iwl_mvm_post_csa_tx, hw);</div><div class='add'>+		local_bh_enable();</div><div class='add'>+</div><div class='add'>+		mvmvif-&gt;csa_blocks_tx = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mvmvif-&gt;ps_disabled = false;</div><div class='hunk'>@@ -1344,8 +1614,9 @@ out_unlock:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_abort_channel_switch(struct ieee80211_hw *hw,</div><div class='del'>-					 struct ieee80211_vif *vif)</div><div class='add'>+void iwl_mvm_abort_channel_switch(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  struct ieee80211_bss_conf *link_conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='hunk'>@@ -1355,6 +1626,15 @@ static void iwl_mvm_abort_channel_switch(struct ieee80211_hw *hw,</div><div class='ctx'> 		.action = cpu_to_le32(FW_CTXT_ACTION_REMOVE),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * In the new flow since FW is in charge of the timing,</div><div class='add'>+	 * if driver has canceled the channel switch he will receive the</div><div class='add'>+	 * CHANNEL_SWITCH_START_NOTIF notification from FW and then cancel it</div><div class='add'>+	 */</div><div class='add'>+	if (iwl_fw_lookup_notif_ver(mvm-&gt;fw, MAC_CONF_GROUP,</div><div class='add'>+				    CHANNEL_SWITCH_ERROR_NOTIF, 0))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	IWL_DEBUG_MAC80211(mvm, "Abort CSA on mac %d\n", mvmvif-&gt;id);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='hunk'>@@ -1369,10 +1649,11 @@ static void iwl_mvm_abort_channel_switch(struct ieee80211_hw *hw,</div><div class='ctx'> 	mvmvif-&gt;csa_failed = true;</div><div class='ctx'> 	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_post_channel_switch(hw, vif);</div><div class='add'>+	/* If we're here, we can't support MLD */</div><div class='add'>+	iwl_mvm_post_channel_switch(hw, vif, &amp;vif-&gt;bss_conf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_channel_switch_disconnect_wk(struct work_struct *wk)</div><div class='add'>+void iwl_mvm_channel_switch_disconnect_wk(struct work_struct *wk)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif;</div><div class='ctx'> 	struct ieee80211_vif *vif;</div><div class='hunk'>@@ -1381,7 +1662,64 @@ static void iwl_mvm_channel_switch_disconnect_wk(struct work_struct *wk)</div><div class='ctx'> 	vif = container_of((void *)mvmvif, struct ieee80211_vif, drv_priv);</div><div class='ctx'> </div><div class='ctx'> 	/* Trigger disconnect (should clear the CSA state) */</div><div class='del'>-	ieee80211_chswitch_done(vif, false);</div><div class='add'>+	ieee80211_chswitch_done(vif, false, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8</div><div class='add'>+iwl_mvm_chandef_get_primary_80(struct cfg80211_chan_def *chandef)</div><div class='add'>+{</div><div class='add'>+	int data_start;</div><div class='add'>+	int control_start;</div><div class='add'>+	int bw;</div><div class='add'>+</div><div class='add'>+	if (chandef-&gt;width == NL80211_CHAN_WIDTH_320)</div><div class='add'>+		bw = 320;</div><div class='add'>+	else if (chandef-&gt;width == NL80211_CHAN_WIDTH_160)</div><div class='add'>+		bw = 160;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* data is bw wide so the start is half the width */</div><div class='add'>+	data_start = chandef-&gt;center_freq1 - bw / 2;</div><div class='add'>+	/* control is 20Mhz width */</div><div class='add'>+	control_start = chandef-&gt;chan-&gt;center_freq - 10;</div><div class='add'>+</div><div class='add'>+	return (control_start - data_start) / 80;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_alloc_bcast_mcast_sta(struct iwl_mvm *mvm,</div><div class='add'>+					 struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_alloc_bcast_sta(mvm, vif);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mvm, "Failed to allocate bcast sta\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Only queue for this station is the mcast queue,</div><div class='add'>+	 * which shouldn't be in TFD mask anyway</div><div class='add'>+	 */</div><div class='add'>+	return iwl_mvm_allocate_int_sta(mvm, &amp;mvmvif-&gt;deflink.mcast_sta, 0,</div><div class='add'>+					vif-&gt;type,</div><div class='add'>+					IWL_STA_MULTICAST);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_mac_init_mvmvif(struct iwl_mvm *mvm, struct iwl_mvm_vif *mvmvif)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mvmvif-&gt;deflink.average_beacon_energy = 0;</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;mvmvif-&gt;csa_work,</div><div class='add'>+			  iwl_mvm_channel_switch_disconnect_wk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -1390,9 +1728,22 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_mac_init_mvmvif(mvm, mvmvif);</div><div class='ctx'> </div><div class='ctx'> 	mvmvif-&gt;mvm = mvm;</div><div class='del'>-	RCU_INIT_POINTER(mvmvif-&gt;probe_resp_data, NULL);</div><div class='add'>+</div><div class='add'>+	/* the first link always points to the default one */</div><div class='add'>+	mvmvif-&gt;deflink.fw_link_id = IWL_MVM_FW_LINK_ID_INVALID;</div><div class='add'>+	mvmvif-&gt;deflink.active = 0;</div><div class='add'>+	mvmvif-&gt;link[0] = &amp;mvmvif-&gt;deflink;</div><div class='add'>+</div><div class='add'>+	vif-&gt;driver_flags = IEEE80211_VIF_REMOVE_AP_AFTER_DISASSOC;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_set_link_fw_id(mvm, vif, &amp;vif-&gt;bss_conf);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Not much to do here. The stack will not allow interface</div><div class='hunk'>@@ -1400,24 +1751,19 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	 * don't really have to check the types.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='ctx'> 	/* make sure that beacon statistics don't go backwards with FW reset */</div><div class='ctx'> 	if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status))</div><div class='del'>-		mvmvif-&gt;beacon_stats.accu_num_beacons +=</div><div class='del'>-			mvmvif-&gt;beacon_stats.num_beacons;</div><div class='add'>+		for_each_mvm_vif_valid_link(mvmvif, i)</div><div class='add'>+			mvmvif-&gt;link[i]-&gt;beacon_stats.accu_num_beacons +=</div><div class='add'>+				mvmvif-&gt;link[i]-&gt;beacon_stats.num_beacons;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate resources for the MAC context, and add it to the fw  */</div><div class='ctx'> 	ret = iwl_mvm_mac_ctxt_init(mvm, vif);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	rcu_assign_pointer(mvm-&gt;vif_id_to_mac[mvmvif-&gt;id], vif);</div><div class='ctx'> </div><div class='del'>-	/* Counting number of interfaces is needed for legacy PM */</div><div class='del'>-	if (vif-&gt;type != NL80211_IFTYPE_P2P_DEVICE)</div><div class='del'>-		mvm-&gt;vif_count++;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The AP binding flow can be done only after the beacon</div><div class='ctx'> 	 * template is configured (which happens only in the mac80211</div><div class='hunk'>@@ -1431,38 +1777,24 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='ctx'> 	    vif-&gt;type == NL80211_IFTYPE_ADHOC) {</div><div class='del'>-		ret = iwl_mvm_alloc_bcast_sta(mvm, vif);</div><div class='del'>-		if (ret) {</div><div class='del'>-			IWL_ERR(mvm, "Failed to allocate bcast sta\n");</div><div class='del'>-			goto out_release;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Only queue for this station is the mcast queue,</div><div class='del'>-		 * which shouldn't be in TFD mask anyway</div><div class='del'>-		 */</div><div class='del'>-		ret = iwl_mvm_allocate_int_sta(mvm, &amp;mvmvif-&gt;mcast_sta,</div><div class='del'>-					       0, vif-&gt;type,</div><div class='del'>-					       IWL_STA_MULTICAST);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out_release;</div><div class='del'>-</div><div class='del'>-		iwl_mvm_vif_dbgfs_register(mvm, vif);</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status))</div><div class='add'>+			iwl_mvm_vif_dbgfs_add_link(mvm, vif);</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mvmvif-&gt;features |= hw-&gt;netdev_features;</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_mvm_mac_ctxt_add(mvm, vif);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out_release;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_mvm_power_update_mac(mvm);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_remove_mac;</div><div class='ctx'> </div><div class='ctx'> 	/* beacon filtering */</div><div class='del'>-	ret = iwl_mvm_disable_beacon_filter(mvm, vif, 0);</div><div class='add'>+	ret = iwl_mvm_disable_beacon_filter(mvm, vif);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_remove_mac;</div><div class='ctx'> </div><div class='hunk'>@@ -1473,68 +1805,49 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 				     IEEE80211_VIF_SUPPORTS_CQM_RSSI;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * P2P_DEVICE interface does not have a channel context assigned to it,</div><div class='del'>-	 * so a dedicated PHY context is allocated to it and the corresponding</div><div class='del'>-	 * MAC context is bound to it at this stage.</div><div class='del'>-	 */</div><div class='del'>-	if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE) {</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE)</div><div class='add'>+		mvm-&gt;p2p_device_vif = vif;</div><div class='ctx'> </div><div class='del'>-		mvmvif-&gt;phy_ctxt = iwl_mvm_get_free_phy_ctxt(mvm);</div><div class='del'>-		if (!mvmvif-&gt;phy_ctxt) {</div><div class='del'>-			ret = -ENOSPC;</div><div class='del'>-			goto out_free_bf;</div><div class='del'>-		}</div><div class='add'>+	iwl_mvm_tcm_add_vif(mvm, vif);</div><div class='ctx'> </div><div class='del'>-		iwl_mvm_phy_ctxt_ref(mvm, mvmvif-&gt;phy_ctxt);</div><div class='del'>-		ret = iwl_mvm_binding_add_vif(mvm, vif);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out_unref_phy;</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_MONITOR) {</div><div class='add'>+		mvm-&gt;monitor_on = true;</div><div class='add'>+		mvm-&gt;monitor_p80 =</div><div class='add'>+			iwl_mvm_chandef_get_primary_80(&amp;vif-&gt;bss_conf.chanreq.oper);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		ret = iwl_mvm_add_p2p_bcast_sta(mvm, vif);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out_unbind;</div><div class='add'>+	if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status))</div><div class='add'>+		iwl_mvm_vif_dbgfs_add_link(mvm, vif);</div><div class='ctx'> </div><div class='del'>-		/* Save a pointer to p2p device vif, so it can later be used to</div><div class='del'>-		 * update the p2p device MAC when a GO is started/stopped */</div><div class='del'>-		mvm-&gt;p2p_device_vif = vif;</div><div class='add'>+	if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status) &amp;&amp;</div><div class='add'>+	    vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; !vif-&gt;p2p &amp;&amp;</div><div class='add'>+	    !mvm-&gt;csme_vif &amp;&amp; mvm-&gt;mei_registered) {</div><div class='add'>+		iwl_mei_set_nic_info(vif-&gt;addr, mvm-&gt;nvm_data-&gt;hw_addr);</div><div class='add'>+		iwl_mei_set_netdev(ieee80211_vif_to_wdev(vif)-&gt;netdev);</div><div class='add'>+		mvm-&gt;csme_vif = vif;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_tcm_add_vif(mvm, vif);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;mvmvif-&gt;csa_work,</div><div class='del'>-			  iwl_mvm_channel_switch_disconnect_wk);</div><div class='del'>-</div><div class='del'>-	if (vif-&gt;type == NL80211_IFTYPE_MONITOR)</div><div class='del'>-		mvm-&gt;monitor_on = true;</div><div class='add'>+out:</div><div class='add'>+	if (!ret &amp;&amp; (vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='add'>+		     vif-&gt;type == NL80211_IFTYPE_ADHOC))</div><div class='add'>+		ret = iwl_mvm_alloc_bcast_mcast_sta(mvm, vif);</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_vif_dbgfs_register(mvm, vif);</div><div class='ctx'> 	goto out_unlock;</div><div class='ctx'> </div><div class='del'>- out_unbind:</div><div class='del'>-	iwl_mvm_binding_remove_vif(mvm, vif);</div><div class='del'>- out_unref_phy:</div><div class='del'>-	iwl_mvm_phy_ctxt_unref(mvm, mvmvif-&gt;phy_ctxt);</div><div class='del'>- out_free_bf:</div><div class='del'>-	if (mvm-&gt;bf_allowed_vif == mvmvif) {</div><div class='del'>-		mvm-&gt;bf_allowed_vif = NULL;</div><div class='del'>-		vif-&gt;driver_flags &amp;= ~(IEEE80211_VIF_BEACON_FILTER |</div><div class='del'>-				       IEEE80211_VIF_SUPPORTS_CQM_RSSI);</div><div class='del'>-	}</div><div class='ctx'>  out_remove_mac:</div><div class='del'>-	mvmvif-&gt;phy_ctxt = NULL;</div><div class='add'>+	mvmvif-&gt;deflink.phy_ctxt = NULL;</div><div class='ctx'> 	iwl_mvm_mac_ctxt_remove(mvm, vif);</div><div class='del'>- out_release:</div><div class='del'>-	if (vif-&gt;type != NL80211_IFTYPE_P2P_DEVICE)</div><div class='del'>-		mvm-&gt;vif_count--;</div><div class='ctx'>  out_unlock:</div><div class='ctx'> 	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_prepare_mac_removal(struct iwl_mvm *mvm,</div><div class='del'>-					struct ieee80211_vif *vif)</div><div class='add'>+void iwl_mvm_prepare_mac_removal(struct iwl_mvm *mvm,</div><div class='add'>+				 struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Flush the ROC worker which will flush the OFFCHANNEL queue.</div><div class='hunk'>@@ -1543,6 +1856,8 @@ static void iwl_mvm_prepare_mac_removal(struct iwl_mvm *mvm,</div><div class='ctx'> 		 */</div><div class='ctx'> 		flush_work(&amp;mvm-&gt;roc_done_wk);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;mvmvif-&gt;csa_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_mac_remove_interface(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -1560,9 +1875,14 @@ static void iwl_mvm_mac_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	probe_data = rcu_dereference_protected(mvmvif-&gt;probe_resp_data,</div><div class='add'>+	if (vif == mvm-&gt;csme_vif) {</div><div class='add'>+		iwl_mei_set_netdev(NULL);</div><div class='add'>+		mvm-&gt;csme_vif = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	probe_data = rcu_dereference_protected(mvmvif-&gt;deflink.probe_resp_data,</div><div class='ctx'> 					       lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='del'>-	RCU_INIT_POINTER(mvmvif-&gt;probe_resp_data, NULL);</div><div class='add'>+	RCU_INIT_POINTER(mvmvif-&gt;deflink.probe_resp_data, NULL);</div><div class='ctx'> 	if (probe_data)</div><div class='ctx'> 		kfree_rcu(probe_data, rcu_head);</div><div class='ctx'> </div><div class='hunk'>@@ -1575,37 +1895,31 @@ static void iwl_mvm_mac_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (vif-&gt;bss_conf.ftm_responder)</div><div class='ctx'> 		memset(&amp;mvm-&gt;ftm_resp_stats, 0, sizeof(mvm-&gt;ftm_resp_stats));</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_vif_dbgfs_clean(mvm, vif);</div><div class='add'>+	iwl_mvm_vif_dbgfs_rm_link(mvm, vif);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For AP/GO interface, the tear down of the resources allocated to the</div><div class='ctx'> 	 * interface is be handled as part of the stop_ap flow.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='del'>-	    vif-&gt;type == NL80211_IFTYPE_ADHOC) {</div><div class='del'>-#ifdef CONFIG_NL80211_TESTMODE</div><div class='del'>-		if (vif == mvm-&gt;noa_vif) {</div><div class='del'>-			mvm-&gt;noa_vif = NULL;</div><div class='del'>-			mvm-&gt;noa_duration = 0;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-		iwl_mvm_dealloc_int_sta(mvm, &amp;mvmvif-&gt;mcast_sta);</div><div class='del'>-		iwl_mvm_dealloc_bcast_sta(mvm, vif);</div><div class='del'>-		goto out_release;</div><div class='del'>-	}</div><div class='add'>+	    vif-&gt;type == NL80211_IFTYPE_ADHOC)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_power_update_mac(mvm);</div><div class='ctx'> </div><div class='add'>+	/* Before the interface removal, mac80211 would cancel the ROC, and the</div><div class='add'>+	 * ROC worker would be scheduled if needed. The worker would be flushed</div><div class='add'>+	 * in iwl_mvm_prepare_mac_removal() and thus at this point there is no</div><div class='add'>+	 * binding etc. so nothing needs to be done here.</div><div class='add'>+	 */</div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE) {</div><div class='add'>+		if (mvmvif-&gt;deflink.phy_ctxt) {</div><div class='add'>+			iwl_mvm_phy_ctxt_unref(mvm, mvmvif-&gt;deflink.phy_ctxt);</div><div class='add'>+			mvmvif-&gt;deflink.phy_ctxt = NULL;</div><div class='add'>+		}</div><div class='ctx'> 		mvm-&gt;p2p_device_vif = NULL;</div><div class='del'>-		iwl_mvm_rm_p2p_bcast_sta(mvm, vif);</div><div class='del'>-		iwl_mvm_binding_remove_vif(mvm, vif);</div><div class='del'>-		iwl_mvm_phy_ctxt_unref(mvm, mvmvif-&gt;phy_ctxt);</div><div class='del'>-		mvmvif-&gt;phy_ctxt = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mvm-&gt;vif_count &amp;&amp; vif-&gt;type != NL80211_IFTYPE_P2P_DEVICE)</div><div class='del'>-		mvm-&gt;vif_count--;</div><div class='del'>-</div><div class='del'>-	iwl_mvm_power_update_mac(mvm);</div><div class='ctx'> 	iwl_mvm_mac_ctxt_remove(mvm, vif);</div><div class='ctx'> </div><div class='ctx'> 	RCU_INIT_POINTER(mvm-&gt;vif_id_to_mac[mvmvif-&gt;id], NULL);</div><div class='hunk'>@@ -1613,13 +1927,14 @@ static void iwl_mvm_mac_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_MONITOR)</div><div class='ctx'> 		mvm-&gt;monitor_on = false;</div><div class='ctx'> </div><div class='del'>-out_release:</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-}</div><div class='add'>+out:</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='add'>+	    vif-&gt;type == NL80211_IFTYPE_ADHOC) {</div><div class='add'>+		iwl_mvm_dealloc_int_sta(mvm, &amp;mvmvif-&gt;deflink.mcast_sta);</div><div class='add'>+		iwl_mvm_dealloc_bcast_sta(mvm, vif);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_mac_config(struct ieee80211_hw *hw, u32 changed)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='add'>+	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct iwl_mvm_mc_iter_data {</div><div class='hunk'>@@ -1645,7 +1960,7 @@ static void iwl_mvm_mc_iface_iterator(void *_data, u8 *mac,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;type != NL80211_IFTYPE_STATION ||</div><div class='del'>-	    !vif-&gt;bss_conf.assoc)</div><div class='add'>+	    !vif-&gt;cfg.assoc)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;port_id = data-&gt;port_id++;</div><div class='hunk'>@@ -1665,6 +1980,7 @@ static void iwl_mvm_recalc_multicast(struct iwl_mvm *mvm)</div><div class='ctx'> 	struct iwl_mvm_mc_iter_data iter_data = {</div><div class='ctx'> 		.mvm = mvm,</div><div class='ctx'> 	};</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -1674,10 +1990,26 @@ static void iwl_mvm_recalc_multicast(struct iwl_mvm *mvm)</div><div class='ctx'> 	ieee80211_iterate_active_interfaces_atomic(</div><div class='ctx'> 		mvm-&gt;hw, IEEE80211_IFACE_ITER_NORMAL,</div><div class='ctx'> 		iwl_mvm_mc_iface_iterator, &amp;iter_data);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Send a (synchronous) ech command so that we wait for the</div><div class='add'>+	 * multiple asynchronous MCAST_FILTER_CMD commands sent by</div><div class='add'>+	 * the interface iterator. Otherwise, we might get here over</div><div class='add'>+	 * and over again (by userspace just sending a lot of these)</div><div class='add'>+	 * and the CPU can send them faster than the firmware can</div><div class='add'>+	 * process them.</div><div class='add'>+	 * Note that the CPU is still faster - but with this we'll</div><div class='add'>+	 * actually send fewer commands overall because the CPU will</div><div class='add'>+	 * not schedule the work in mac80211 as frequently if it's</div><div class='add'>+	 * still running when rescheduled (possibly multiple times).</div><div class='add'>+	 */</div><div class='add'>+	ret = iwl_mvm_send_cmd_pdu(mvm, ECHO_CMD, 0, 0, NULL);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mvm, "Failed to synchronize multicast groups update\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u64 iwl_mvm_prepare_multicast(struct ieee80211_hw *hw,</div><div class='del'>-				     struct netdev_hw_addr_list *mc_list)</div><div class='add'>+u64 iwl_mvm_prepare_multicast(struct ieee80211_hw *hw,</div><div class='add'>+			      struct netdev_hw_addr_list *mc_list)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	struct iwl_mcast_filter_cmd *cmd;</div><div class='hunk'>@@ -1713,15 +2045,14 @@ static u64 iwl_mvm_prepare_multicast(struct ieee80211_hw *hw,</div><div class='ctx'> 	return (u64)(unsigned long)cmd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_configure_filter(struct ieee80211_hw *hw,</div><div class='del'>-				     unsigned int changed_flags,</div><div class='del'>-				     unsigned int *total_flags,</div><div class='del'>-				     u64 multicast)</div><div class='add'>+void iwl_mvm_configure_filter(struct ieee80211_hw *hw,</div><div class='add'>+			      unsigned int changed_flags,</div><div class='add'>+			      unsigned int *total_flags, u64 multicast)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	struct iwl_mcast_filter_cmd *cmd = (void *)(unsigned long)multicast;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> </div><div class='ctx'> 	/* replace previous configuration */</div><div class='ctx'> 	kfree(mvm-&gt;mcast_filter_cmd);</div><div class='hunk'>@@ -1738,7 +2069,6 @@ static void iwl_mvm_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_recalc_multicast(mvm);</div><div class='ctx'> out:</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> 	*total_flags = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1754,173 +2084,15 @@ static void iwl_mvm_config_iface_filter(struct ieee80211_hw *hw,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Supported only for p2p client interfaces */</div><div class='del'>-	if (vif-&gt;type != NL80211_IFTYPE_STATION || !vif-&gt;bss_conf.assoc ||</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION || !vif-&gt;cfg.assoc ||</div><div class='ctx'> 	    !vif-&gt;p2p)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> 	iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IWLWIFI_BCAST_FILTERING</div><div class='del'>-struct iwl_bcast_iter_data {</div><div class='del'>-	struct iwl_mvm *mvm;</div><div class='del'>-	struct iwl_bcast_filter_cmd *cmd;</div><div class='del'>-	u8 current_filter;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-iwl_mvm_set_bcast_filter(struct ieee80211_vif *vif,</div><div class='del'>-			 const struct iwl_fw_bcast_filter *in_filter,</div><div class='del'>-			 struct iwl_fw_bcast_filter *out_filter)</div><div class='del'>-{</div><div class='del'>-	struct iwl_fw_bcast_filter_attr *attr;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	memcpy(out_filter, in_filter, sizeof(*out_filter));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(out_filter-&gt;attrs); i++) {</div><div class='del'>-		attr = &amp;out_filter-&gt;attrs[i];</div><div class='del'>-</div><div class='del'>-		if (!attr-&gt;mask)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		switch (attr-&gt;reserved1) {</div><div class='del'>-		case cpu_to_le16(BC_FILTER_MAGIC_IP):</div><div class='del'>-			if (vif-&gt;bss_conf.arp_addr_cnt != 1) {</div><div class='del'>-				attr-&gt;mask = 0;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			attr-&gt;val = vif-&gt;bss_conf.arp_addr_list[0];</div><div class='del'>-			break;</div><div class='del'>-		case cpu_to_le16(BC_FILTER_MAGIC_MAC):</div><div class='del'>-			attr-&gt;val = *(__be32 *)&amp;vif-&gt;addr[2];</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		attr-&gt;reserved1 = 0;</div><div class='del'>-		out_filter-&gt;num_attrs++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl_mvm_bcast_filter_iterator(void *_data, u8 *mac,</div><div class='del'>-					  struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct iwl_bcast_iter_data *data = _data;</div><div class='del'>-	struct iwl_mvm *mvm = data-&gt;mvm;</div><div class='del'>-	struct iwl_bcast_filter_cmd *cmd = data-&gt;cmd;</div><div class='del'>-	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-	struct iwl_fw_bcast_mac *bcast_mac;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(mvmvif-&gt;id &gt;= ARRAY_SIZE(cmd-&gt;macs)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	bcast_mac = &amp;cmd-&gt;macs[mvmvif-&gt;id];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * enable filtering only for associated stations, but not for P2P</div><div class='del'>-	 * Clients</div><div class='del'>-	 */</div><div class='del'>-	if (vif-&gt;type != NL80211_IFTYPE_STATION || vif-&gt;p2p ||</div><div class='del'>-	    !vif-&gt;bss_conf.assoc)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	bcast_mac-&gt;default_discard = 1;</div><div class='del'>-</div><div class='del'>-	/* copy all configured filters */</div><div class='del'>-	for (i = 0; mvm-&gt;bcast_filters[i].attrs[0].mask; i++) {</div><div class='del'>-		/*</div><div class='del'>-		 * Make sure we don't exceed our filters limit.</div><div class='del'>-		 * if there is still a valid filter to be configured,</div><div class='del'>-		 * be on the safe side and just allow bcast for this mac.</div><div class='del'>-		 */</div><div class='del'>-		if (WARN_ON_ONCE(data-&gt;current_filter &gt;=</div><div class='del'>-				 ARRAY_SIZE(cmd-&gt;filters))) {</div><div class='del'>-			bcast_mac-&gt;default_discard = 0;</div><div class='del'>-			bcast_mac-&gt;attached_filters = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		iwl_mvm_set_bcast_filter(vif,</div><div class='del'>-					 &amp;mvm-&gt;bcast_filters[i],</div><div class='del'>-					 &amp;cmd-&gt;filters[data-&gt;current_filter]);</div><div class='del'>-</div><div class='del'>-		/* skip current filter if it contains no attributes */</div><div class='del'>-		if (!cmd-&gt;filters[data-&gt;current_filter].num_attrs)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* attach the filter to current mac */</div><div class='del'>-		bcast_mac-&gt;attached_filters |=</div><div class='del'>-				cpu_to_le16(BIT(data-&gt;current_filter));</div><div class='del'>-</div><div class='del'>-		data-&gt;current_filter++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool iwl_mvm_bcast_filter_build_cmd(struct iwl_mvm *mvm,</div><div class='del'>-				    struct iwl_bcast_filter_cmd *cmd)</div><div class='del'>-{</div><div class='del'>-	struct iwl_bcast_iter_data iter_data = {</div><div class='del'>-		.mvm = mvm,</div><div class='del'>-		.cmd = cmd,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (IWL_MVM_FW_BCAST_FILTER_PASS_ALL)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	memset(cmd, 0, sizeof(*cmd));</div><div class='del'>-	cmd-&gt;max_bcast_filters = ARRAY_SIZE(cmd-&gt;filters);</div><div class='del'>-	cmd-&gt;max_macs = ARRAY_SIZE(cmd-&gt;macs);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='del'>-	/* use debugfs filters/macs if override is configured */</div><div class='del'>-	if (mvm-&gt;dbgfs_bcast_filtering.override) {</div><div class='del'>-		memcpy(cmd-&gt;filters, &amp;mvm-&gt;dbgfs_bcast_filtering.cmd.filters,</div><div class='del'>-		       sizeof(cmd-&gt;filters));</div><div class='del'>-		memcpy(cmd-&gt;macs, &amp;mvm-&gt;dbgfs_bcast_filtering.cmd.macs,</div><div class='del'>-		       sizeof(cmd-&gt;macs));</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* if no filters are configured, do nothing */</div><div class='del'>-	if (!mvm-&gt;bcast_filters)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/* configure and attach these filters for each associated sta vif */</div><div class='del'>-	ieee80211_iterate_active_interfaces(</div><div class='del'>-		mvm-&gt;hw, IEEE80211_IFACE_ITER_NORMAL,</div><div class='del'>-		iwl_mvm_bcast_filter_iterator, &amp;iter_data);</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl_mvm_configure_bcast_filter(struct iwl_mvm *mvm)</div><div class='del'>-{</div><div class='del'>-	struct iwl_bcast_filter_cmd cmd;</div><div class='del'>-</div><div class='del'>-	if (!(mvm-&gt;fw-&gt;ucode_capa.flags &amp; IWL_UCODE_TLV_FLAGS_BCAST_FILTERING))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!iwl_mvm_bcast_filter_build_cmd(mvm, &amp;cmd))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return iwl_mvm_send_cmd_pdu(mvm, BCAST_FILTER_CMD, 0,</div><div class='del'>-				    sizeof(cmd), &amp;cmd);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline int iwl_mvm_configure_bcast_filter(struct iwl_mvm *mvm)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int iwl_mvm_update_mu_groups(struct iwl_mvm *mvm,</div><div class='del'>-				    struct ieee80211_vif *vif)</div><div class='add'>+int iwl_mvm_update_mu_groups(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mu_group_mgmt_cmd cmd = {};</div><div class='ctx'> </div><div class='hunk'>@@ -1938,7 +2110,7 @@ static int iwl_mvm_update_mu_groups(struct iwl_mvm *mvm,</div><div class='ctx'> static void iwl_mvm_mu_mimo_iface_iterator(void *_data, u8 *mac,</div><div class='ctx'> 					   struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	if (vif-&gt;mu_mimo_owner) {</div><div class='add'>+	if (vif-&gt;bss_conf.mu_mimo_owner) {</div><div class='ctx'> 		struct iwl_mu_group_mgmt_notif *notif = _data;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1946,7 +2118,7 @@ static void iwl_mvm_mu_mimo_iface_iterator(void *_data, u8 *mac,</div><div class='ctx'> 		 * the data received from firmware as if it came from the</div><div class='ctx'> 		 * action frame, so no conversion is needed.</div><div class='ctx'> 		 */</div><div class='del'>-		ieee80211_update_mu_groups(vif,</div><div class='add'>+		ieee80211_update_mu_groups(vif, 0,</div><div class='ctx'> 					   (u8 *)&amp;notif-&gt;membership_status,</div><div class='ctx'> 					   (u8 *)&amp;notif-&gt;user_position);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1990,11 +2162,334 @@ static u8 iwl_mvm_he_get_ppe_val(u8 *ppe, u8 ppe_pos_bit)</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void iwl_mvm_parse_ppe(struct iwl_mvm *mvm,</div><div class='add'>+			      struct iwl_he_pkt_ext_v2 *pkt_ext, u8 nss,</div><div class='add'>+			      u8 ru_index_bitmap, u8 *ppe, u8 ppe_pos_bit,</div><div class='add'>+			      bool inheritance)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	* FW currently supports only nss == MAX_HE_SUPP_NSS</div><div class='add'>+	*</div><div class='add'>+	* If nss &gt; MAX: we can ignore values we don't support</div><div class='add'>+	* If nss &lt; MAX: we can set zeros in other streams</div><div class='add'>+	*/</div><div class='add'>+	if (nss &gt; MAX_HE_SUPP_NSS) {</div><div class='add'>+		IWL_DEBUG_INFO(mvm, "Got NSS = %d - trimming to %d\n", nss,</div><div class='add'>+			       MAX_HE_SUPP_NSS);</div><div class='add'>+		nss = MAX_HE_SUPP_NSS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nss; i++) {</div><div class='add'>+		u8 ru_index_tmp = ru_index_bitmap &lt;&lt; 1;</div><div class='add'>+		u8 low_th = IWL_HE_PKT_EXT_NONE, high_th = IWL_HE_PKT_EXT_NONE;</div><div class='add'>+		u8 bw;</div><div class='add'>+</div><div class='add'>+		for (bw = 0;</div><div class='add'>+		     bw &lt; ARRAY_SIZE(pkt_ext-&gt;pkt_ext_qam_th[i]);</div><div class='add'>+		     bw++) {</div><div class='add'>+			ru_index_tmp &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			* According to the 11be spec, if for a specific BW the PPE Thresholds</div><div class='add'>+			* isn't present - it should inherit the thresholds from the last</div><div class='add'>+			* BW for which we had PPE Thresholds. In 11ax though, we don't have</div><div class='add'>+			* this inheritance - continue in this case</div><div class='add'>+			*/</div><div class='add'>+			if (!(ru_index_tmp &amp; 1)) {</div><div class='add'>+				if (inheritance)</div><div class='add'>+					goto set_thresholds;</div><div class='add'>+				else</div><div class='add'>+					continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			high_th = iwl_mvm_he_get_ppe_val(ppe, ppe_pos_bit);</div><div class='add'>+			ppe_pos_bit += IEEE80211_PPE_THRES_INFO_PPET_SIZE;</div><div class='add'>+			low_th = iwl_mvm_he_get_ppe_val(ppe, ppe_pos_bit);</div><div class='add'>+			ppe_pos_bit += IEEE80211_PPE_THRES_INFO_PPET_SIZE;</div><div class='add'>+</div><div class='add'>+set_thresholds:</div><div class='add'>+			pkt_ext-&gt;pkt_ext_qam_th[i][bw][0] = low_th;</div><div class='add'>+			pkt_ext-&gt;pkt_ext_qam_th[i][bw][1] = high_th;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_set_pkt_ext_from_he_ppe(struct iwl_mvm *mvm,</div><div class='add'>+					    struct ieee80211_link_sta *link_sta,</div><div class='add'>+					    struct iwl_he_pkt_ext_v2 *pkt_ext,</div><div class='add'>+					    bool inheritance)</div><div class='add'>+{</div><div class='add'>+	u8 nss = (link_sta-&gt;he_cap.ppe_thres[0] &amp;</div><div class='add'>+		  IEEE80211_PPE_THRES_NSS_MASK) + 1;</div><div class='add'>+	u8 *ppe = &amp;link_sta-&gt;he_cap.ppe_thres[0];</div><div class='add'>+	u8 ru_index_bitmap =</div><div class='add'>+		u8_get_bits(*ppe,</div><div class='add'>+			    IEEE80211_PPE_THRES_RU_INDEX_BITMASK_MASK);</div><div class='add'>+	/* Starting after PPE header */</div><div class='add'>+	u8 ppe_pos_bit = IEEE80211_HE_PPE_THRES_INFO_HEADER_SIZE;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_parse_ppe(mvm, pkt_ext, nss, ru_index_bitmap, ppe, ppe_pos_bit,</div><div class='add'>+			  inheritance);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mvm_set_pkt_ext_from_nominal_padding(struct iwl_he_pkt_ext_v2 *pkt_ext,</div><div class='add'>+					 u8 nominal_padding)</div><div class='add'>+{</div><div class='add'>+	int low_th = -1;</div><div class='add'>+	int high_th = -1;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* all the macros are the same for EHT and HE */</div><div class='add'>+	switch (nominal_padding) {</div><div class='add'>+	case IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_0US:</div><div class='add'>+		low_th = IWL_HE_PKT_EXT_NONE;</div><div class='add'>+		high_th = IWL_HE_PKT_EXT_NONE;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_8US:</div><div class='add'>+		low_th = IWL_HE_PKT_EXT_BPSK;</div><div class='add'>+		high_th = IWL_HE_PKT_EXT_NONE;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_16US:</div><div class='add'>+	case IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_20US:</div><div class='add'>+		low_th = IWL_HE_PKT_EXT_NONE;</div><div class='add'>+		high_th = IWL_HE_PKT_EXT_BPSK;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (low_th &lt; 0 || high_th &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Set the PPE thresholds accordingly */</div><div class='add'>+	for (i = 0; i &lt; MAX_HE_SUPP_NSS; i++) {</div><div class='add'>+		u8 bw;</div><div class='add'>+</div><div class='add'>+		for (bw = 0;</div><div class='add'>+			bw &lt; ARRAY_SIZE(pkt_ext-&gt;pkt_ext_qam_th[i]);</div><div class='add'>+			bw++) {</div><div class='add'>+			pkt_ext-&gt;pkt_ext_qam_th[i][bw][0] = low_th;</div><div class='add'>+			pkt_ext-&gt;pkt_ext_qam_th[i][bw][1] = high_th;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_get_optimal_ppe_info(struct iwl_he_pkt_ext_v2 *pkt_ext,</div><div class='add'>+					 u8 nominal_padding)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_HE_SUPP_NSS; i++) {</div><div class='add'>+		u8 bw;</div><div class='add'>+</div><div class='add'>+		for (bw = 0; bw &lt; ARRAY_SIZE(pkt_ext-&gt;pkt_ext_qam_th[i]);</div><div class='add'>+		     bw++) {</div><div class='add'>+			u8 *qam_th = &amp;pkt_ext-&gt;pkt_ext_qam_th[i][bw][0];</div><div class='add'>+</div><div class='add'>+			if (nominal_padding &gt;</div><div class='add'>+			    IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_8US &amp;&amp;</div><div class='add'>+			    qam_th[1] == IWL_HE_PKT_EXT_NONE)</div><div class='add'>+				qam_th[1] = IWL_HE_PKT_EXT_4096QAM;</div><div class='add'>+			else if (nominal_padding ==</div><div class='add'>+				 IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_8US &amp;&amp;</div><div class='add'>+				 qam_th[0] == IWL_HE_PKT_EXT_NONE &amp;&amp;</div><div class='add'>+				 qam_th[1] == IWL_HE_PKT_EXT_NONE)</div><div class='add'>+				qam_th[0] = IWL_HE_PKT_EXT_4096QAM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set the pkt_ext field according to PPE Thresholds element */</div><div class='add'>+int iwl_mvm_set_sta_pkt_ext(struct iwl_mvm *mvm,</div><div class='add'>+			    struct ieee80211_link_sta *link_sta,</div><div class='add'>+			    struct iwl_he_pkt_ext_v2 *pkt_ext)</div><div class='add'>+{</div><div class='add'>+	u8 nominal_padding;</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!link_sta))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Initialize the PPE thresholds to "None" (7), as described in Table</div><div class='add'>+	 * 9-262ac of 80211.ax/D3.0.</div><div class='add'>+	 */</div><div class='add'>+	memset(pkt_ext, IWL_HE_PKT_EXT_NONE,</div><div class='add'>+	       sizeof(struct iwl_he_pkt_ext_v2));</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;eht_cap.has_eht) {</div><div class='add'>+		nominal_padding =</div><div class='add'>+			u8_get_bits(link_sta-&gt;eht_cap.eht_cap_elem.phy_cap_info[5],</div><div class='add'>+				    IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_MASK);</div><div class='add'>+</div><div class='add'>+		/* If PPE Thresholds exists, parse them into a FW-familiar</div><div class='add'>+		 * format.</div><div class='add'>+		 */</div><div class='add'>+		if (link_sta-&gt;eht_cap.eht_cap_elem.phy_cap_info[5] &amp;</div><div class='add'>+		    IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT) {</div><div class='add'>+			u8 nss = (link_sta-&gt;eht_cap.eht_ppe_thres[0] &amp;</div><div class='add'>+				IEEE80211_EHT_PPE_THRES_NSS_MASK) + 1;</div><div class='add'>+			u8 *ppe = &amp;link_sta-&gt;eht_cap.eht_ppe_thres[0];</div><div class='add'>+			u8 ru_index_bitmap =</div><div class='add'>+				u16_get_bits(*ppe,</div><div class='add'>+					     IEEE80211_EHT_PPE_THRES_RU_INDEX_BITMASK_MASK);</div><div class='add'>+			 /* Starting after PPE header */</div><div class='add'>+			u8 ppe_pos_bit = IEEE80211_EHT_PPE_THRES_INFO_HEADER_SIZE;</div><div class='add'>+</div><div class='add'>+			iwl_mvm_parse_ppe(mvm, pkt_ext, nss, ru_index_bitmap,</div><div class='add'>+					  ppe, ppe_pos_bit, true);</div><div class='add'>+		/* EHT PPE Thresholds doesn't exist - set the API according to</div><div class='add'>+		 * HE PPE Tresholds</div><div class='add'>+		 */</div><div class='add'>+		} else if (link_sta-&gt;he_cap.he_cap_elem.phy_cap_info[6] &amp;</div><div class='add'>+			   IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT) {</div><div class='add'>+			/* Even though HE Capabilities IE doesn't contain PPE</div><div class='add'>+			 * Thresholds for BW 320Mhz, thresholds for this BW will</div><div class='add'>+			 * be filled in with the same values as 160Mhz, due to</div><div class='add'>+			 * the inheritance, as required.</div><div class='add'>+			 */</div><div class='add'>+			iwl_mvm_set_pkt_ext_from_he_ppe(mvm, link_sta, pkt_ext,</div><div class='add'>+							true);</div><div class='add'>+</div><div class='add'>+			/* According to the requirements, for MCSs 12-13 the</div><div class='add'>+			 * maximum value between HE PPE Threshold and Common</div><div class='add'>+			 * Nominal Packet Padding needs to be taken</div><div class='add'>+			 */</div><div class='add'>+			iwl_mvm_get_optimal_ppe_info(pkt_ext, nominal_padding);</div><div class='add'>+</div><div class='add'>+		/* if PPE Thresholds doesn't present in both EHT IE and HE IE -</div><div class='add'>+		 * take the Thresholds from Common Nominal Packet Padding field</div><div class='add'>+		 */</div><div class='add'>+		} else {</div><div class='add'>+			ret = iwl_mvm_set_pkt_ext_from_nominal_padding(pkt_ext,</div><div class='add'>+								       nominal_padding);</div><div class='add'>+		}</div><div class='add'>+	} else if (link_sta-&gt;he_cap.has_he) {</div><div class='add'>+		/* If PPE Thresholds exist, parse them into a FW-familiar format. */</div><div class='add'>+		if (link_sta-&gt;he_cap.he_cap_elem.phy_cap_info[6] &amp;</div><div class='add'>+			IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT) {</div><div class='add'>+			iwl_mvm_set_pkt_ext_from_he_ppe(mvm, link_sta, pkt_ext,</div><div class='add'>+							false);</div><div class='add'>+		/* PPE Thresholds doesn't exist - set the API PPE values</div><div class='add'>+		 * according to Common Nominal Packet Padding field.</div><div class='add'>+		 */</div><div class='add'>+		} else {</div><div class='add'>+			nominal_padding =</div><div class='add'>+				u8_get_bits(link_sta-&gt;he_cap.he_cap_elem.phy_cap_info[9],</div><div class='add'>+					    IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK);</div><div class='add'>+			if (nominal_padding != IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_RESERVED)</div><div class='add'>+				ret = iwl_mvm_set_pkt_ext_from_nominal_padding(pkt_ext,</div><div class='add'>+									       nominal_padding);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_HE_SUPP_NSS; i++) {</div><div class='add'>+		int bw;</div><div class='add'>+</div><div class='add'>+		for (bw = 0;</div><div class='add'>+		     bw &lt; ARRAY_SIZE(*pkt_ext-&gt;pkt_ext_qam_th[i]);</div><div class='add'>+		     bw++) {</div><div class='add'>+			u8 *qam_th =</div><div class='add'>+				&amp;pkt_ext-&gt;pkt_ext_qam_th[i][bw][0];</div><div class='add'>+</div><div class='add'>+			IWL_DEBUG_HT(mvm,</div><div class='add'>+				     "PPE table: nss[%d] bw[%d] PPET8 = %d, PPET16 = %d\n",</div><div class='add'>+				     i, bw, qam_th[0], qam_th[1]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function sets the MU EDCA parameters ans returns whether MU EDCA</div><div class='add'>+ * is enabled or not</div><div class='add'>+ */</div><div class='add'>+bool iwl_mvm_set_fw_mu_edca_params(struct iwl_mvm *mvm,</div><div class='add'>+				   const struct iwl_mvm_vif_link_info *link_info,</div><div class='add'>+				   struct iwl_he_backoff_conf *trig_based_txf)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	/* Mark MU EDCA as enabled, unless none detected on some AC */</div><div class='add'>+	bool mu_edca_enabled = true;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IEEE80211_NUM_ACS; i++) {</div><div class='add'>+		const struct ieee80211_he_mu_edca_param_ac_rec *mu_edca =</div><div class='add'>+			&amp;link_info-&gt;queue_params[i].mu_edca_param_rec;</div><div class='add'>+		u8 ac = iwl_mvm_mac80211_ac_to_ucode_ac(i);</div><div class='add'>+</div><div class='add'>+		if (!link_info-&gt;queue_params[i].mu_edca) {</div><div class='add'>+			mu_edca_enabled = false;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		trig_based_txf[ac].cwmin =</div><div class='add'>+			cpu_to_le16(mu_edca-&gt;ecw_min_max &amp; 0xf);</div><div class='add'>+		trig_based_txf[ac].cwmax =</div><div class='add'>+			cpu_to_le16((mu_edca-&gt;ecw_min_max &amp; 0xf0) &gt;&gt; 4);</div><div class='add'>+		trig_based_txf[ac].aifsn =</div><div class='add'>+			cpu_to_le16(mu_edca-&gt;aifsn &amp; 0xf);</div><div class='add'>+		trig_based_txf[ac].mu_time =</div><div class='add'>+			cpu_to_le16(mu_edca-&gt;mu_edca_timer);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mu_edca_enabled;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool iwl_mvm_is_nic_ack_enabled(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_supported_band *sband;</div><div class='add'>+	const struct ieee80211_sta_he_cap *own_he_cap = NULL;</div><div class='add'>+</div><div class='add'>+	/* This capability is the same for all bands,</div><div class='add'>+	 * so take it from one of them.</div><div class='add'>+	 */</div><div class='add'>+	sband = mvm-&gt;hw-&gt;wiphy-&gt;bands[NL80211_BAND_2GHZ];</div><div class='add'>+	own_he_cap = ieee80211_get_he_iftype_cap_vif(sband, vif);</div><div class='add'>+</div><div class='add'>+	return (own_he_cap &amp;&amp; (own_he_cap-&gt;he_cap_elem.mac_cap_info[2] &amp;</div><div class='add'>+			       IEEE80211_HE_MAC_CAP2_ACK_EN));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__le32 iwl_mvm_get_sta_htc_flags(struct ieee80211_sta *sta,</div><div class='add'>+				 struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	u8 *mac_cap_info =</div><div class='add'>+		&amp;link_sta-&gt;he_cap.he_cap_elem.mac_cap_info[0];</div><div class='add'>+	__le32 htc_flags = 0;</div><div class='add'>+</div><div class='add'>+	if (mac_cap_info[0] &amp; IEEE80211_HE_MAC_CAP0_HTC_HE)</div><div class='add'>+		htc_flags |= cpu_to_le32(IWL_HE_HTC_SUPPORT);</div><div class='add'>+	if ((mac_cap_info[1] &amp; IEEE80211_HE_MAC_CAP1_LINK_ADAPTATION) ||</div><div class='add'>+	    (mac_cap_info[2] &amp; IEEE80211_HE_MAC_CAP2_LINK_ADAPTATION)) {</div><div class='add'>+		u8 link_adap =</div><div class='add'>+			((mac_cap_info[2] &amp;</div><div class='add'>+			  IEEE80211_HE_MAC_CAP2_LINK_ADAPTATION) &lt;&lt; 1) +</div><div class='add'>+			 (mac_cap_info[1] &amp;</div><div class='add'>+			  IEEE80211_HE_MAC_CAP1_LINK_ADAPTATION);</div><div class='add'>+</div><div class='add'>+		if (link_adap == 2)</div><div class='add'>+			htc_flags |=</div><div class='add'>+				cpu_to_le32(IWL_HE_HTC_LINK_ADAP_UNSOLICITED);</div><div class='add'>+		else if (link_adap == 3)</div><div class='add'>+			htc_flags |= cpu_to_le32(IWL_HE_HTC_LINK_ADAP_BOTH);</div><div class='add'>+	}</div><div class='add'>+	if (mac_cap_info[2] &amp; IEEE80211_HE_MAC_CAP2_BSR)</div><div class='add'>+		htc_flags |= cpu_to_le32(IWL_HE_HTC_BSR_SUPP);</div><div class='add'>+	if (mac_cap_info[3] &amp; IEEE80211_HE_MAC_CAP3_OMI_CONTROL)</div><div class='add'>+		htc_flags |= cpu_to_le32(IWL_HE_HTC_OMI_SUPP);</div><div class='add'>+	if (mac_cap_info[4] &amp; IEEE80211_HE_MAC_CAP4_BQR)</div><div class='add'>+		htc_flags |= cpu_to_le32(IWL_HE_HTC_BQR_SUPP);</div><div class='add'>+</div><div class='add'>+	return htc_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 			       struct ieee80211_vif *vif, u8 sta_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-	struct iwl_he_sta_context_cmd sta_ctxt_cmd = {</div><div class='add'>+	struct iwl_he_sta_context_cmd_v3 sta_ctxt_cmd = {</div><div class='ctx'> 		.sta_id = sta_id,</div><div class='ctx'> 		.tid_limit = IWL_MAX_TID_COUNT,</div><div class='ctx'> 		.bss_color = vif-&gt;bss_conf.he_bss_color.color,</div><div class='hunk'>@@ -2002,27 +2497,38 @@ static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 		.frame_time_rts_th =</div><div class='ctx'> 			cpu_to_le16(vif-&gt;bss_conf.frame_time_rts_th),</div><div class='ctx'> 	};</div><div class='del'>-	int size = fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='del'>-			      IWL_UCODE_TLV_API_MBSSID_HE) ?</div><div class='del'>-		   sizeof(sta_ctxt_cmd) :</div><div class='del'>-		   sizeof(struct iwl_he_sta_context_cmd_v1);</div><div class='add'>+	struct iwl_he_sta_context_cmd_v2 sta_ctxt_cmd_v2 = {};</div><div class='add'>+	u32 cmd_id = WIDE_ID(DATA_PATH_GROUP, STA_HE_CTXT_CMD);</div><div class='add'>+	u8 ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, cmd_id, 2);</div><div class='add'>+	int size;</div><div class='ctx'> 	struct ieee80211_sta *sta;</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> 	int i;</div><div class='del'>-	const struct ieee80211_sta_he_cap *own_he_cap = NULL;</div><div class='del'>-	struct ieee80211_chanctx_conf *chanctx_conf;</div><div class='del'>-	const struct ieee80211_supported_band *sband;</div><div class='add'>+	void *cmd;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='add'>+	if (!fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa, IWL_UCODE_TLV_API_MBSSID_HE))</div><div class='add'>+		ver = 1;</div><div class='ctx'> </div><div class='del'>-	chanctx_conf = rcu_dereference(vif-&gt;chanctx_conf);</div><div class='del'>-	if (WARN_ON(!chanctx_conf)) {</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+	switch (ver) {</div><div class='add'>+	case 1:</div><div class='add'>+		/* same layout as v2 except some data at the end */</div><div class='add'>+		cmd = &amp;sta_ctxt_cmd_v2;</div><div class='add'>+		size = sizeof(struct iwl_he_sta_context_cmd_v1);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		cmd = &amp;sta_ctxt_cmd_v2;</div><div class='add'>+		size = sizeof(struct iwl_he_sta_context_cmd_v2);</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		cmd = &amp;sta_ctxt_cmd;</div><div class='add'>+		size = sizeof(struct iwl_he_sta_context_cmd_v3);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		IWL_ERR(mvm, "bad STA_HE_CTXT_CMD version %d\n", ver);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sband = mvm-&gt;hw-&gt;wiphy-&gt;bands[chanctx_conf-&gt;def.chan-&gt;band];</div><div class='del'>-	own_he_cap = ieee80211_get_he_iftype_cap(sband, vif-&gt;type);</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	sta = rcu_dereference(mvm-&gt;fw_id_to_mac_id[sta_ctxt_cmd.sta_id]);</div><div class='ctx'> 	if (IS_ERR_OR_NULL(sta)) {</div><div class='hunk'>@@ -2031,7 +2537,7 @@ static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!sta-&gt;he_cap.has_he) {</div><div class='add'>+	if (!sta-&gt;deflink.he_cap.has_he) {</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2039,167 +2545,29 @@ static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 	flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Block 26-tone RU OFDMA transmissions */</div><div class='del'>-	if (mvmvif-&gt;he_ru_2mhz_block)</div><div class='add'>+	if (mvmvif-&gt;deflink.he_ru_2mhz_block)</div><div class='ctx'> 		flags |= STA_CTXT_HE_RU_2MHZ_BLOCK;</div><div class='ctx'> </div><div class='ctx'> 	/* HTC flags */</div><div class='del'>-	if (sta-&gt;he_cap.he_cap_elem.mac_cap_info[0] &amp;</div><div class='del'>-	    IEEE80211_HE_MAC_CAP0_HTC_HE)</div><div class='del'>-		sta_ctxt_cmd.htc_flags |= cpu_to_le32(IWL_HE_HTC_SUPPORT);</div><div class='del'>-	if ((sta-&gt;he_cap.he_cap_elem.mac_cap_info[1] &amp;</div><div class='del'>-	      IEEE80211_HE_MAC_CAP1_LINK_ADAPTATION) ||</div><div class='del'>-	    (sta-&gt;he_cap.he_cap_elem.mac_cap_info[2] &amp;</div><div class='del'>-	      IEEE80211_HE_MAC_CAP2_LINK_ADAPTATION)) {</div><div class='del'>-		u8 link_adap =</div><div class='del'>-			((sta-&gt;he_cap.he_cap_elem.mac_cap_info[2] &amp;</div><div class='del'>-			  IEEE80211_HE_MAC_CAP2_LINK_ADAPTATION) &lt;&lt; 1) +</div><div class='del'>-			 (sta-&gt;he_cap.he_cap_elem.mac_cap_info[1] &amp;</div><div class='del'>-			  IEEE80211_HE_MAC_CAP1_LINK_ADAPTATION);</div><div class='del'>-</div><div class='del'>-		if (link_adap == 2)</div><div class='del'>-			sta_ctxt_cmd.htc_flags |=</div><div class='del'>-				cpu_to_le32(IWL_HE_HTC_LINK_ADAP_UNSOLICITED);</div><div class='del'>-		else if (link_adap == 3)</div><div class='del'>-			sta_ctxt_cmd.htc_flags |=</div><div class='del'>-				cpu_to_le32(IWL_HE_HTC_LINK_ADAP_BOTH);</div><div class='del'>-	}</div><div class='del'>-	if (sta-&gt;he_cap.he_cap_elem.mac_cap_info[2] &amp; IEEE80211_HE_MAC_CAP2_BSR)</div><div class='del'>-		sta_ctxt_cmd.htc_flags |= cpu_to_le32(IWL_HE_HTC_BSR_SUPP);</div><div class='del'>-	if (sta-&gt;he_cap.he_cap_elem.mac_cap_info[3] &amp;</div><div class='del'>-	    IEEE80211_HE_MAC_CAP3_OMI_CONTROL)</div><div class='del'>-		sta_ctxt_cmd.htc_flags |= cpu_to_le32(IWL_HE_HTC_OMI_SUPP);</div><div class='del'>-	if (sta-&gt;he_cap.he_cap_elem.mac_cap_info[4] &amp; IEEE80211_HE_MAC_CAP4_BQR)</div><div class='del'>-		sta_ctxt_cmd.htc_flags |= cpu_to_le32(IWL_HE_HTC_BQR_SUPP);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Initialize the PPE thresholds to "None" (7), as described in Table</div><div class='del'>-	 * 9-262ac of 80211.ax/D3.0.</div><div class='del'>-	 */</div><div class='del'>-	memset(&amp;sta_ctxt_cmd.pkt_ext, 7, sizeof(sta_ctxt_cmd.pkt_ext));</div><div class='del'>-</div><div class='del'>-	/* If PPE Thresholds exist, parse them into a FW-familiar format. */</div><div class='del'>-	if (sta-&gt;he_cap.he_cap_elem.phy_cap_info[6] &amp;</div><div class='del'>-	    IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT) {</div><div class='del'>-		u8 nss = (sta-&gt;he_cap.ppe_thres[0] &amp;</div><div class='del'>-			  IEEE80211_PPE_THRES_NSS_MASK) + 1;</div><div class='del'>-		u8 ru_index_bitmap =</div><div class='del'>-			(sta-&gt;he_cap.ppe_thres[0] &amp;</div><div class='del'>-			 IEEE80211_PPE_THRES_RU_INDEX_BITMASK_MASK) &gt;&gt;</div><div class='del'>-			IEEE80211_PPE_THRES_RU_INDEX_BITMASK_POS;</div><div class='del'>-		u8 *ppe = &amp;sta-&gt;he_cap.ppe_thres[0];</div><div class='del'>-		u8 ppe_pos_bit = 7; /* Starting after PPE header */</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * FW currently supports only nss == MAX_HE_SUPP_NSS</div><div class='del'>-		 *</div><div class='del'>-		 * If nss &gt; MAX: we can ignore values we don't support</div><div class='del'>-		 * If nss &lt; MAX: we can set zeros in other streams</div><div class='del'>-		 */</div><div class='del'>-		if (nss &gt; MAX_HE_SUPP_NSS) {</div><div class='del'>-			IWL_INFO(mvm, "Got NSS = %d - trimming to %d\n", nss,</div><div class='del'>-				 MAX_HE_SUPP_NSS);</div><div class='del'>-			nss = MAX_HE_SUPP_NSS;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; nss; i++) {</div><div class='del'>-			u8 ru_index_tmp = ru_index_bitmap &lt;&lt; 1;</div><div class='del'>-			u8 bw;</div><div class='del'>-</div><div class='del'>-			for (bw = 0; bw &lt; MAX_HE_CHANNEL_BW_INDX; bw++) {</div><div class='del'>-				ru_index_tmp &gt;&gt;= 1;</div><div class='del'>-				if (!(ru_index_tmp &amp; 1))</div><div class='del'>-					continue;</div><div class='del'>-</div><div class='del'>-				sta_ctxt_cmd.pkt_ext.pkt_ext_qam_th[i][bw][1] =</div><div class='del'>-					iwl_mvm_he_get_ppe_val(ppe,</div><div class='del'>-							       ppe_pos_bit);</div><div class='del'>-				ppe_pos_bit +=</div><div class='del'>-					IEEE80211_PPE_THRES_INFO_PPET_SIZE;</div><div class='del'>-				sta_ctxt_cmd.pkt_ext.pkt_ext_qam_th[i][bw][0] =</div><div class='del'>-					iwl_mvm_he_get_ppe_val(ppe,</div><div class='del'>-							       ppe_pos_bit);</div><div class='del'>-				ppe_pos_bit +=</div><div class='del'>-					IEEE80211_PPE_THRES_INFO_PPET_SIZE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	sta_ctxt_cmd.htc_flags = iwl_mvm_get_sta_htc_flags(sta, &amp;sta-&gt;deflink);</div><div class='ctx'> </div><div class='add'>+	/* PPE Thresholds */</div><div class='add'>+	if (!iwl_mvm_set_sta_pkt_ext(mvm, &amp;sta-&gt;deflink, &amp;sta_ctxt_cmd.pkt_ext))</div><div class='ctx'> 		flags |= STA_CTXT_HE_PACKET_EXT;</div><div class='del'>-	} else if ((sta-&gt;he_cap.he_cap_elem.phy_cap_info[9] &amp;</div><div class='del'>-		    IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_MASK) !=</div><div class='del'>-		  IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED) {</div><div class='del'>-		int low_th = -1;</div><div class='del'>-		int high_th = -1;</div><div class='del'>-</div><div class='del'>-		/* Take the PPE thresholds from the nominal padding info */</div><div class='del'>-		switch (sta-&gt;he_cap.he_cap_elem.phy_cap_info[9] &amp;</div><div class='del'>-			IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_MASK) {</div><div class='del'>-		case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_0US:</div><div class='del'>-			low_th = IWL_HE_PKT_EXT_NONE;</div><div class='del'>-			high_th = IWL_HE_PKT_EXT_NONE;</div><div class='del'>-			break;</div><div class='del'>-		case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_8US:</div><div class='del'>-			low_th = IWL_HE_PKT_EXT_BPSK;</div><div class='del'>-			high_th = IWL_HE_PKT_EXT_NONE;</div><div class='del'>-			break;</div><div class='del'>-		case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_16US:</div><div class='del'>-			low_th = IWL_HE_PKT_EXT_NONE;</div><div class='del'>-			high_th = IWL_HE_PKT_EXT_BPSK;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Set the PPE thresholds accordingly */</div><div class='del'>-		if (low_th &gt;= 0 &amp;&amp; high_th &gt;= 0) {</div><div class='del'>-			struct iwl_he_pkt_ext *pkt_ext =</div><div class='del'>-				(struct iwl_he_pkt_ext *)&amp;sta_ctxt_cmd.pkt_ext;</div><div class='del'>-</div><div class='del'>-			for (i = 0; i &lt; MAX_HE_SUPP_NSS; i++) {</div><div class='del'>-				u8 bw;</div><div class='del'>-</div><div class='del'>-				for (bw = 0; bw &lt; MAX_HE_CHANNEL_BW_INDX;</div><div class='del'>-				     bw++) {</div><div class='del'>-					pkt_ext-&gt;pkt_ext_qam_th[i][bw][0] =</div><div class='del'>-						low_th;</div><div class='del'>-					pkt_ext-&gt;pkt_ext_qam_th[i][bw][1] =</div><div class='del'>-						high_th;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			flags |= STA_CTXT_HE_PACKET_EXT;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;he_cap.he_cap_elem.mac_cap_info[2] &amp;</div><div class='add'>+	if (sta-&gt;deflink.he_cap.he_cap_elem.mac_cap_info[2] &amp;</div><div class='ctx'> 	    IEEE80211_HE_MAC_CAP2_32BIT_BA_BITMAP)</div><div class='ctx'> 		flags |= STA_CTXT_HE_32BIT_BA_BITMAP;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;he_cap.he_cap_elem.mac_cap_info[2] &amp;</div><div class='add'>+	if (sta-&gt;deflink.he_cap.he_cap_elem.mac_cap_info[2] &amp;</div><div class='ctx'> 	    IEEE80211_HE_MAC_CAP2_ACK_EN)</div><div class='ctx'> 		flags |= STA_CTXT_HE_ACK_ENABLED;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	/* Mark MU EDCA as enabled, unless none detected on some AC */</div><div class='del'>-	flags |= STA_CTXT_HE_MU_EDCA_CW;</div><div class='del'>-	for (i = 0; i &lt; IEEE80211_NUM_ACS; i++) {</div><div class='del'>-		struct ieee80211_he_mu_edca_param_ac_rec *mu_edca =</div><div class='del'>-			&amp;mvmvif-&gt;queue_params[i].mu_edca_param_rec;</div><div class='del'>-		u8 ac = iwl_mvm_mac80211_ac_to_ucode_ac(i);</div><div class='del'>-</div><div class='del'>-		if (!mvmvif-&gt;queue_params[i].mu_edca) {</div><div class='del'>-			flags &amp;= ~STA_CTXT_HE_MU_EDCA_CW;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		sta_ctxt_cmd.trig_based_txf[ac].cwmin =</div><div class='del'>-			cpu_to_le16(mu_edca-&gt;ecw_min_max &amp; 0xf);</div><div class='del'>-		sta_ctxt_cmd.trig_based_txf[ac].cwmax =</div><div class='del'>-			cpu_to_le16((mu_edca-&gt;ecw_min_max &amp; 0xf0) &gt;&gt; 4);</div><div class='del'>-		sta_ctxt_cmd.trig_based_txf[ac].aifsn =</div><div class='del'>-			cpu_to_le16(mu_edca-&gt;aifsn);</div><div class='del'>-		sta_ctxt_cmd.trig_based_txf[ac].mu_time =</div><div class='del'>-			cpu_to_le16(mu_edca-&gt;mu_edca_timer);</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	if (iwl_mvm_set_fw_mu_edca_params(mvm, &amp;mvmvif-&gt;deflink,</div><div class='add'>+					  &amp;sta_ctxt_cmd.trig_based_txf[0]))</div><div class='add'>+		flags |= STA_CTXT_HE_MU_EDCA_CW;</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;bss_conf.uora_exists) {</div><div class='ctx'> 		flags |= STA_CTXT_HE_TRIG_RND_ALLOC;</div><div class='hunk'>@@ -2210,8 +2578,7 @@ static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 			(vif-&gt;bss_conf.uora_ocw_range &gt;&gt; 3) &amp; 0x7;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (own_he_cap &amp;&amp; !(own_he_cap-&gt;he_cap_elem.mac_cap_info[2] &amp;</div><div class='del'>-			    IEEE80211_HE_MAC_CAP2_ACK_EN))</div><div class='add'>+	if (!iwl_mvm_is_nic_ack_enabled(mvm, vif))</div><div class='ctx'> 		flags |= STA_CTXT_HE_NIC_NOT_ACK_ENABLED;</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;bss_conf.nontransmitted) {</div><div class='hunk'>@@ -2228,38 +2595,198 @@ static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	sta_ctxt_cmd.flags = cpu_to_le32(flags);</div><div class='ctx'> </div><div class='del'>-	if (iwl_mvm_send_cmd_pdu(mvm, iwl_cmd_id(STA_HE_CTXT_CMD,</div><div class='del'>-						 DATA_PATH_GROUP, 0),</div><div class='del'>-				 0, size, &amp;sta_ctxt_cmd))</div><div class='add'>+	if (ver &lt; 3) {</div><div class='add'>+		/* fields before pkt_ext */</div><div class='add'>+		BUILD_BUG_ON(offsetof(typeof(sta_ctxt_cmd), pkt_ext) !=</div><div class='add'>+			     offsetof(typeof(sta_ctxt_cmd_v2), pkt_ext));</div><div class='add'>+		memcpy(&amp;sta_ctxt_cmd_v2, &amp;sta_ctxt_cmd,</div><div class='add'>+		       offsetof(typeof(sta_ctxt_cmd), pkt_ext));</div><div class='add'>+</div><div class='add'>+		/* pkt_ext */</div><div class='add'>+		for (i = 0;</div><div class='add'>+		     i &lt; ARRAY_SIZE(sta_ctxt_cmd_v2.pkt_ext.pkt_ext_qam_th);</div><div class='add'>+		     i++) {</div><div class='add'>+			u8 bw;</div><div class='add'>+</div><div class='add'>+			for (bw = 0;</div><div class='add'>+			     bw &lt; ARRAY_SIZE(sta_ctxt_cmd_v2.pkt_ext.pkt_ext_qam_th[i]);</div><div class='add'>+			     bw++) {</div><div class='add'>+				BUILD_BUG_ON(sizeof(sta_ctxt_cmd.pkt_ext.pkt_ext_qam_th[i][bw]) !=</div><div class='add'>+					     sizeof(sta_ctxt_cmd_v2.pkt_ext.pkt_ext_qam_th[i][bw]));</div><div class='add'>+</div><div class='add'>+				memcpy(&amp;sta_ctxt_cmd_v2.pkt_ext.pkt_ext_qam_th[i][bw],</div><div class='add'>+				       &amp;sta_ctxt_cmd.pkt_ext.pkt_ext_qam_th[i][bw],</div><div class='add'>+				       sizeof(sta_ctxt_cmd.pkt_ext.pkt_ext_qam_th[i][bw]));</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* fields after pkt_ext */</div><div class='add'>+		BUILD_BUG_ON(sizeof(sta_ctxt_cmd) -</div><div class='add'>+			     offsetofend(typeof(sta_ctxt_cmd), pkt_ext) !=</div><div class='add'>+			     sizeof(sta_ctxt_cmd_v2) -</div><div class='add'>+			     offsetofend(typeof(sta_ctxt_cmd_v2), pkt_ext));</div><div class='add'>+		memcpy((u8 *)&amp;sta_ctxt_cmd_v2 +</div><div class='add'>+				offsetofend(typeof(sta_ctxt_cmd_v2), pkt_ext),</div><div class='add'>+		       (u8 *)&amp;sta_ctxt_cmd +</div><div class='add'>+				offsetofend(typeof(sta_ctxt_cmd), pkt_ext),</div><div class='add'>+		       sizeof(sta_ctxt_cmd) -</div><div class='add'>+				offsetofend(typeof(sta_ctxt_cmd), pkt_ext));</div><div class='add'>+		sta_ctxt_cmd_v2.reserved3 = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iwl_mvm_send_cmd_pdu(mvm, cmd_id, 0, size, cmd))</div><div class='ctx'> 		IWL_ERR(mvm, "Failed to config FW to work HE!\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void iwl_mvm_protect_assoc(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			   u32 duration_override, unsigned int link_id)</div><div class='add'>+{</div><div class='add'>+	u32 duration = IWL_MVM_TE_SESSION_PROTECTION_MAX_TIME_MS;</div><div class='add'>+	u32 min_duration = IWL_MVM_TE_SESSION_PROTECTION_MIN_TIME_MS;</div><div class='add'>+</div><div class='add'>+	if (duration_override &gt; duration)</div><div class='add'>+		duration = duration_override;</div><div class='add'>+</div><div class='add'>+	/* Try really hard to protect the session and hear a beacon</div><div class='add'>+	 * The new session protection command allows us to protect the</div><div class='add'>+	 * session for a much longer time since the firmware will internally</div><div class='add'>+	 * create two events: a 300TU one with a very high priority that</div><div class='add'>+	 * won't be fragmented which should be enough for 99% of the cases,</div><div class='add'>+	 * and another one (which we configure here to be 900TU long) which</div><div class='add'>+	 * will have a slightly lower priority, but more importantly, can be</div><div class='add'>+	 * fragmented so that it'll allow other activities to run.</div><div class='add'>+	 */</div><div class='add'>+	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			IWL_UCODE_TLV_CAPA_SESSION_PROT_CMD))</div><div class='add'>+		iwl_mvm_schedule_session_protection(mvm, vif, 900,</div><div class='add'>+						    min_duration, false,</div><div class='add'>+						    link_id);</div><div class='add'>+	else</div><div class='add'>+		iwl_mvm_protect_session(mvm, vif, duration,</div><div class='add'>+					min_duration, 500, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Handle association common part to MLD and non-MLD modes */</div><div class='add'>+void iwl_mvm_bss_info_changed_station_assoc(struct iwl_mvm *mvm,</div><div class='add'>+					    struct ieee80211_vif *vif,</div><div class='add'>+					    u64 changes)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	int ret;</div><div class='add'>+	int link_id;</div><div class='add'>+</div><div class='add'>+	/* The firmware tracks the MU-MIMO group on its own.</div><div class='add'>+	 * However, on HW restart we should restore this data.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status) &amp;&amp;</div><div class='add'>+	    (changes &amp; BSS_CHANGED_MU_GROUPS) &amp;&amp; vif-&gt;bss_conf.mu_mimo_owner) {</div><div class='add'>+		ret = iwl_mvm_update_mu_groups(mvm, vif);</div><div class='add'>+		if (ret)</div><div class='add'>+			IWL_ERR(mvm,</div><div class='add'>+				"failed to update VHT MU_MIMO groups\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mvm_recalc_multicast(mvm);</div><div class='add'>+</div><div class='add'>+	/* reset rssi values */</div><div class='add'>+	for_each_mvm_vif_valid_link(mvmvif, link_id)</div><div class='add'>+		mvmvif-&gt;link[link_id]-&gt;bf_data.ave_beacon_signal = 0;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_bt_coex_vif_change(mvm);</div><div class='add'>+	iwl_mvm_update_smps_on_active_links(mvm, vif, IWL_MVM_SMPS_REQ_TT,</div><div class='add'>+					    IEEE80211_SMPS_AUTOMATIC);</div><div class='add'>+	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			IWL_UCODE_TLV_CAPA_UMAC_SCAN))</div><div class='add'>+		iwl_mvm_config_scan(mvm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Execute the common part for MLD and non-MLD modes */</div><div class='add'>+void</div><div class='add'>+iwl_mvm_bss_info_changed_station_common(struct iwl_mvm *mvm,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					struct ieee80211_bss_conf *link_conf,</div><div class='add'>+					u64 changes)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_BEACON_INFO) {</div><div class='add'>+		/* We received a beacon from the associated AP so</div><div class='add'>+		 * remove the session protection.</div><div class='add'>+		 */</div><div class='add'>+		iwl_mvm_stop_session_protection(mvm, vif);</div><div class='add'>+</div><div class='add'>+		iwl_mvm_sf_update(mvm, vif, false);</div><div class='add'>+		WARN_ON(iwl_mvm_enable_beacon_filter(mvm, vif));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changes &amp; (BSS_CHANGED_PS | BSS_CHANGED_P2P_PS | BSS_CHANGED_QOS |</div><div class='add'>+		       /* Send power command on every beacon change,</div><div class='add'>+			* because we may have not enabled beacon abort yet.</div><div class='add'>+			*/</div><div class='add'>+		       BSS_CHANGED_BEACON_INFO)) {</div><div class='add'>+		ret = iwl_mvm_power_update_mac(mvm);</div><div class='add'>+		if (ret)</div><div class='add'>+			IWL_ERR(mvm, "failed to update power mode\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_CQM) {</div><div class='add'>+		struct iwl_mvm_vif_link_info *link_info =</div><div class='add'>+			mvmvif-&gt;link[link_conf-&gt;link_id];</div><div class='add'>+</div><div class='add'>+		IWL_DEBUG_MAC80211(mvm, "CQM info_changed\n");</div><div class='add'>+		if (link_info)</div><div class='add'>+			link_info-&gt;bf_data.last_cqm_event = 0;</div><div class='add'>+</div><div class='add'>+		if (mvmvif-&gt;bf_enabled) {</div><div class='add'>+			/* FIXME: need to update per link when FW API will</div><div class='add'>+			 * support it</div><div class='add'>+			 */</div><div class='add'>+			ret = iwl_mvm_enable_beacon_filter(mvm, vif);</div><div class='add'>+			if (ret)</div><div class='add'>+				IWL_ERR(mvm,</div><div class='add'>+					"failed to update CQM thresholds\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_BANDWIDTH)</div><div class='add'>+		iwl_mvm_update_link_smps(vif, link_conf);</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_TPE) {</div><div class='add'>+		IWL_DEBUG_CALIB(mvm, "Changing TPE\n");</div><div class='add'>+		iwl_mvm_send_ap_tx_power_constraint_cmd(mvm, vif,</div><div class='add'>+							link_conf,</div><div class='add'>+							false);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,</div><div class='ctx'> 					     struct ieee80211_vif *vif,</div><div class='ctx'> 					     struct ieee80211_bss_conf *bss_conf,</div><div class='del'>-					     u32 changes)</div><div class='add'>+					     u64 changes)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	int ret;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Re-calculate the tsf id, as the leader-follower relations depend</div><div class='ctx'> 	 * on the beacon interval, which was not known when the station</div><div class='ctx'> 	 * interface was added.</div><div class='ctx'> 	 */</div><div class='del'>-	if (changes &amp; BSS_CHANGED_ASSOC &amp;&amp; bss_conf-&gt;assoc) {</div><div class='del'>-		if (vif-&gt;bss_conf.he_support &amp;&amp;</div><div class='del'>-		    !iwlwifi_mod_params.disable_11ax)</div><div class='del'>-			iwl_mvm_cfg_he_sta(mvm, vif, mvmvif-&gt;ap_sta_id);</div><div class='add'>+	if (changes &amp; BSS_CHANGED_ASSOC &amp;&amp; vif-&gt;cfg.assoc) {</div><div class='add'>+		if ((vif-&gt;bss_conf.he_support &amp;&amp;</div><div class='add'>+		     !iwlwifi_mod_params.disable_11ax))</div><div class='add'>+			iwl_mvm_cfg_he_sta(mvm, vif, mvmvif-&gt;deflink.ap_sta_id);</div><div class='ctx'> </div><div class='ctx'> 		iwl_mvm_mac_ctxt_recalc_tsf_id(mvm, vif);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Update MU EDCA params */</div><div class='ctx'> 	if (changes &amp; BSS_CHANGED_QOS &amp;&amp; mvmvif-&gt;associated &amp;&amp;</div><div class='del'>-	    bss_conf-&gt;assoc &amp;&amp; vif-&gt;bss_conf.he_support &amp;&amp;</div><div class='del'>-	    !iwlwifi_mod_params.disable_11ax)</div><div class='del'>-		iwl_mvm_cfg_he_sta(mvm, vif, mvmvif-&gt;ap_sta_id);</div><div class='add'>+	    vif-&gt;cfg.assoc &amp;&amp;</div><div class='add'>+	    (vif-&gt;bss_conf.he_support &amp;&amp; !iwlwifi_mod_params.disable_11ax))</div><div class='add'>+		iwl_mvm_cfg_he_sta(mvm, vif, mvmvif-&gt;deflink.ap_sta_id);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we're not associated yet, take the (new) BSSID before associating</div><div class='hunk'>@@ -2268,22 +2795,25 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,</div><div class='ctx'> 	 * branch for disassociation below.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (changes &amp; BSS_CHANGED_BSSID &amp;&amp; !mvmvif-&gt;associated)</div><div class='del'>-		memcpy(mvmvif-&gt;bssid, bss_conf-&gt;bssid, ETH_ALEN);</div><div class='add'>+		memcpy(mvmvif-&gt;deflink.bssid, bss_conf-&gt;bssid, ETH_ALEN);</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_mac_ctxt_changed(mvm, vif, false, mvmvif-&gt;bssid);</div><div class='add'>+	ret = iwl_mvm_mac_ctxt_changed(mvm, vif, false, mvmvif-&gt;deflink.bssid);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		IWL_ERR(mvm, "failed to update MAC %pM\n", vif-&gt;addr);</div><div class='ctx'> </div><div class='ctx'> 	/* after sending it once, adopt mac80211 data */</div><div class='del'>-	memcpy(mvmvif-&gt;bssid, bss_conf-&gt;bssid, ETH_ALEN);</div><div class='del'>-	mvmvif-&gt;associated = bss_conf-&gt;assoc;</div><div class='add'>+	memcpy(mvmvif-&gt;deflink.bssid, bss_conf-&gt;bssid, ETH_ALEN);</div><div class='add'>+	mvmvif-&gt;associated = vif-&gt;cfg.assoc;</div><div class='ctx'> </div><div class='ctx'> 	if (changes &amp; BSS_CHANGED_ASSOC) {</div><div class='del'>-		if (bss_conf-&gt;assoc) {</div><div class='add'>+		if (vif-&gt;cfg.assoc) {</div><div class='add'>+			mvmvif-&gt;session_prot_connection_loss = false;</div><div class='add'>+</div><div class='ctx'> 			/* clear statistics to get clean beacon counter */</div><div class='ctx'> 			iwl_mvm_request_statistics(mvm, true);</div><div class='del'>-			memset(&amp;mvmvif-&gt;beacon_stats, 0,</div><div class='del'>-			       sizeof(mvmvif-&gt;beacon_stats));</div><div class='add'>+			for_each_mvm_vif_valid_link(mvmvif, i)</div><div class='add'>+				memset(&amp;mvmvif-&gt;link[i]-&gt;beacon_stats, 0,</div><div class='add'>+				       sizeof(mvmvif-&gt;link[i]-&gt;beacon_stats));</div><div class='ctx'> </div><div class='ctx'> 			/* add quota for this interface */</div><div class='ctx'> 			ret = iwl_mvm_update_quotas(mvm, true, NULL);</div><div class='hunk'>@@ -2317,6 +2847,20 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,</div><div class='ctx'> 				u32 dur = (11 * vif-&gt;bss_conf.beacon_int) / 10;</div><div class='ctx'> 				iwl_mvm_protect_session(mvm, vif, dur, dur,</div><div class='ctx'> 							5 * dur, false);</div><div class='add'>+			} else if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART,</div><div class='add'>+					     &amp;mvm-&gt;status) &amp;&amp;</div><div class='add'>+				   !vif-&gt;bss_conf.dtim_period) {</div><div class='add'>+				/*</div><div class='add'>+				 * If we're not restarting and still haven't</div><div class='add'>+				 * heard a beacon (dtim period unknown) then</div><div class='add'>+				 * make sure we still have enough minimum time</div><div class='add'>+				 * remaining in the time event, since the auth</div><div class='add'>+				 * might actually have taken quite a while</div><div class='add'>+				 * (especially for SAE) and so the remaining</div><div class='add'>+				 * time could be small without us having heard</div><div class='add'>+				 * a beacon yet.</div><div class='add'>+				 */</div><div class='add'>+				iwl_mvm_protect_assoc(mvm, vif, 0, 0);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			iwl_mvm_sf_update(mvm, vif, false);</div><div class='hunk'>@@ -2324,9 +2868,10 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,</div><div class='ctx'> 			if (vif-&gt;p2p) {</div><div class='ctx'> 				iwl_mvm_update_smps(mvm, vif,</div><div class='ctx'> 						    IWL_MVM_SMPS_REQ_PROT,</div><div class='del'>-						    IEEE80211_SMPS_DYNAMIC);</div><div class='add'>+						    IEEE80211_SMPS_DYNAMIC, 0);</div><div class='ctx'> 			}</div><div class='del'>-		} else if (mvmvif-&gt;ap_sta_id != IWL_MVM_INVALID_STA) {</div><div class='add'>+		} else if (mvmvif-&gt;deflink.ap_sta_id != IWL_INVALID_STA) {</div><div class='add'>+			iwl_mvm_mei_host_disassociated(mvm);</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If update fails - SF might be running in associated</div><div class='ctx'> 			 * mode while disassociated - which is forbidden.</div><div class='hunk'>@@ -2337,29 +2882,6 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,</div><div class='ctx'> 					    &amp;mvm-&gt;status),</div><div class='ctx'> 				  "Failed to update SF upon disassociation\n");</div><div class='ctx'> </div><div class='del'>-			/*</div><div class='del'>-			 * If we get an assert during the connection (after the</div><div class='del'>-			 * station has been added, but before the vif is set</div><div class='del'>-			 * to associated), mac80211 will re-add the station and</div><div class='del'>-			 * then configure the vif. Since the vif is not</div><div class='del'>-			 * associated, we would remove the station here and</div><div class='del'>-			 * this would fail the recovery.</div><div class='del'>-			 */</div><div class='del'>-			if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART,</div><div class='del'>-				      &amp;mvm-&gt;status)) {</div><div class='del'>-				/*</div><div class='del'>-				 * Remove AP station now that</div><div class='del'>-				 * the MAC is unassoc</div><div class='del'>-				 */</div><div class='del'>-				ret = iwl_mvm_rm_sta_id(mvm, vif,</div><div class='del'>-							mvmvif-&gt;ap_sta_id);</div><div class='del'>-				if (ret)</div><div class='del'>-					IWL_ERR(mvm,</div><div class='del'>-						"failed to remove AP station\n");</div><div class='del'>-</div><div class='del'>-				mvmvif-&gt;ap_sta_id = IWL_MVM_INVALID_STA;</div><div class='del'>-			}</div><div class='del'>-</div><div class='ctx'> 			/* remove quota for this interface */</div><div class='ctx'> 			ret = iwl_mvm_update_quotas(mvm, false, NULL);</div><div class='ctx'> 			if (ret)</div><div class='hunk'>@@ -2373,89 +2895,64 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,</div><div class='ctx'> 					vif-&gt;addr);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * The firmware tracks the MU-MIMO group on its own.</div><div class='del'>-		 * However, on HW restart we should restore this data.</div><div class='del'>-		 */</div><div class='del'>-		if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status) &amp;&amp;</div><div class='del'>-		    (changes &amp; BSS_CHANGED_MU_GROUPS) &amp;&amp; vif-&gt;mu_mimo_owner) {</div><div class='del'>-			ret = iwl_mvm_update_mu_groups(mvm, vif);</div><div class='del'>-			if (ret)</div><div class='del'>-				IWL_ERR(mvm,</div><div class='del'>-					"failed to update VHT MU_MIMO groups\n");</div><div class='del'>-		}</div><div class='add'>+		iwl_mvm_bss_info_changed_station_assoc(mvm, vif, changes);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		iwl_mvm_recalc_multicast(mvm);</div><div class='del'>-		iwl_mvm_configure_bcast_filter(mvm);</div><div class='add'>+	iwl_mvm_bss_info_changed_station_common(mvm, vif, &amp;vif-&gt;bss_conf,</div><div class='add'>+						changes);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		/* reset rssi values */</div><div class='del'>-		mvmvif-&gt;bf_data.ave_beacon_signal = 0;</div><div class='add'>+bool iwl_mvm_start_ap_ibss_common(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  int *ret)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-		iwl_mvm_bt_coex_vif_change(mvm);</div><div class='del'>-		iwl_mvm_update_smps(mvm, vif, IWL_MVM_SMPS_REQ_TT,</div><div class='del'>-				    IEEE80211_SMPS_AUTOMATIC);</div><div class='del'>-		if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='del'>-				IWL_UCODE_TLV_CAPA_UMAC_SCAN))</div><div class='del'>-			iwl_mvm_config_scan(mvm);</div><div class='del'>-	}</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	if (changes &amp; BSS_CHANGED_BEACON_INFO) {</div><div class='del'>-		/*</div><div class='del'>-		 * We received a beacon from the associated AP so</div><div class='del'>-		 * remove the session protection.</div><div class='del'>-		 * A firmware with the new API will remove it automatically.</div><div class='del'>-		 */</div><div class='del'>-		if (!fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='del'>-				 IWL_UCODE_TLV_CAPA_SESSION_PROT_CMD))</div><div class='del'>-			iwl_mvm_stop_session_protection(mvm, vif);</div><div class='add'>+	mvmvif-&gt;ap_assoc_sta_count = 0;</div><div class='ctx'> </div><div class='del'>-		iwl_mvm_sf_update(mvm, vif, false);</div><div class='del'>-		WARN_ON(iwl_mvm_enable_beacon_filter(mvm, vif, 0));</div><div class='del'>-	}</div><div class='add'>+	/* must be set before quota calculations */</div><div class='add'>+	mvmvif-&gt;ap_ibss_active = true;</div><div class='ctx'> </div><div class='del'>-	if (changes &amp; (BSS_CHANGED_PS | BSS_CHANGED_P2P_PS | BSS_CHANGED_QOS |</div><div class='del'>-		       /*</div><div class='del'>-			* Send power command on every beacon change,</div><div class='del'>-			* because we may have not enabled beacon abort yet.</div><div class='del'>-			*/</div><div class='del'>-		       BSS_CHANGED_BEACON_INFO)) {</div><div class='del'>-		ret = iwl_mvm_power_update_mac(mvm);</div><div class='del'>-		if (ret)</div><div class='del'>-			IWL_ERR(mvm, "failed to update power mode\n");</div><div class='del'>-	}</div><div class='add'>+	/* send all the early keys to the device now */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mvmvif-&gt;ap_early_keys); i++) {</div><div class='add'>+		struct ieee80211_key_conf *key = mvmvif-&gt;ap_early_keys[i];</div><div class='ctx'> </div><div class='del'>-	if (changes &amp; BSS_CHANGED_CQM) {</div><div class='del'>-		IWL_DEBUG_MAC80211(mvm, "cqm info_changed\n");</div><div class='del'>-		/* reset cqm events tracking */</div><div class='del'>-		mvmvif-&gt;bf_data.last_cqm_event = 0;</div><div class='del'>-		if (mvmvif-&gt;bf_data.bf_enabled) {</div><div class='del'>-			ret = iwl_mvm_enable_beacon_filter(mvm, vif, 0);</div><div class='del'>-			if (ret)</div><div class='del'>-				IWL_ERR(mvm,</div><div class='del'>-					"failed to update CQM thresholds\n");</div><div class='del'>-		}</div><div class='add'>+		if (!key)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mvmvif-&gt;ap_early_keys[i] = NULL;</div><div class='add'>+</div><div class='add'>+		*ret = __iwl_mvm_mac_set_key(hw, SET_KEY, vif, NULL, key);</div><div class='add'>+		if (*ret)</div><div class='add'>+			return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (changes &amp; BSS_CHANGED_ARP_FILTER) {</div><div class='del'>-		IWL_DEBUG_MAC80211(mvm, "arp filter changed\n");</div><div class='del'>-		iwl_mvm_configure_bcast_filter(mvm);</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp; !vif-&gt;p2p) {</div><div class='add'>+		iwl_mvm_vif_set_low_latency(mvmvif, true,</div><div class='add'>+					    LOW_LATENCY_VIF_TYPE);</div><div class='add'>+		iwl_mvm_send_low_latency_cmd(mvm, true, mvmvif-&gt;id);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* power updated needs to be done before quotas */</div><div class='add'>+	iwl_mvm_power_update_mac(mvm);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_mvm_start_ap_ibss(struct ieee80211_hw *hw,</div><div class='del'>-				 struct ieee80211_vif *vif)</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_bss_conf *link_conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-	int ret, i;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	/* Send the beacon template */</div><div class='del'>-	ret = iwl_mvm_mac_ctxt_beacon_changed(mvm, vif);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_unlock;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Re-calculate the tsf id, as the leader-follower relations depend on</div><div class='ctx'> 	 * the beacon interval, which was not known when the AP interface</div><div class='hunk'>@@ -2464,12 +2961,31 @@ static int iwl_mvm_start_ap_ibss(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_AP)</div><div class='ctx'> 		iwl_mvm_mac_ctxt_recalc_tsf_id(mvm, vif);</div><div class='ctx'> </div><div class='del'>-	mvmvif-&gt;ap_assoc_sta_count = 0;</div><div class='add'>+	/* For older devices need to send beacon template before adding mac</div><div class='add'>+	 * context. For the newer, the beacon is a resource that belongs to a</div><div class='add'>+	 * MAC, so need to send beacon template after adding the mac.</div><div class='add'>+	 */</div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &gt; IWL_DEVICE_FAMILY_22000) {</div><div class='add'>+		/* Add the mac context */</div><div class='add'>+		ret = iwl_mvm_mac_ctxt_add(mvm, vif);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	/* Add the mac context */</div><div class='del'>-	ret = iwl_mvm_mac_ctxt_add(mvm, vif);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		/* Send the beacon template */</div><div class='add'>+		ret = iwl_mvm_mac_ctxt_beacon_changed(mvm, vif, link_conf);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+	} else {</div><div class='add'>+		/* Send the beacon template */</div><div class='add'>+		ret = iwl_mvm_mac_ctxt_beacon_changed(mvm, vif, link_conf);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+</div><div class='add'>+		/* Add the mac context */</div><div class='add'>+		ret = iwl_mvm_mac_ctxt_add(mvm, vif);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Perform the binding */</div><div class='ctx'> 	ret = iwl_mvm_binding_add_vif(mvm, vif);</div><div class='hunk'>@@ -2511,35 +3027,12 @@ static int iwl_mvm_start_ap_ibss(struct ieee80211_hw *hw,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* must be set before quota calculations */</div><div class='del'>-	mvmvif-&gt;ap_ibss_active = true;</div><div class='del'>-</div><div class='del'>-	/* send all the early keys to the device now */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(mvmvif-&gt;ap_early_keys); i++) {</div><div class='del'>-		struct ieee80211_key_conf *key = mvmvif-&gt;ap_early_keys[i];</div><div class='del'>-</div><div class='del'>-		if (!key)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		mvmvif-&gt;ap_early_keys[i] = NULL;</div><div class='del'>-</div><div class='del'>-		ret = __iwl_mvm_mac_set_key(hw, SET_KEY, vif, NULL, key);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out_quota_failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp; !vif-&gt;p2p) {</div><div class='del'>-		iwl_mvm_vif_set_low_latency(mvmvif, true,</div><div class='del'>-					    LOW_LATENCY_VIF_TYPE);</div><div class='del'>-		iwl_mvm_send_low_latency_cmd(mvm, true, mvmvif-&gt;id);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* power updated needs to be done before quotas */</div><div class='del'>-	iwl_mvm_power_update_mac(mvm);</div><div class='add'>+	if (iwl_mvm_start_ap_ibss_common(hw, vif, &amp;ret))</div><div class='add'>+		goto out_failed;</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_mvm_update_quotas(mvm, false, NULL);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out_quota_failed;</div><div class='add'>+		goto out_failed;</div><div class='ctx'> </div><div class='ctx'> 	/* Need to update the P2P Device MAC (only GO, IBSS is single vif) */</div><div class='ctx'> 	if (vif-&gt;p2p &amp;&amp; mvm-&gt;p2p_device_vif)</div><div class='hunk'>@@ -2551,11 +3044,11 @@ static int iwl_mvm_start_ap_ibss(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (iwl_mvm_phy_ctx_count(mvm) &gt; 1)</div><div class='ctx'> 		iwl_mvm_teardown_tdls_peers(mvm);</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_ftm_restart_responder(mvm, vif);</div><div class='add'>+	iwl_mvm_ftm_restart_responder(mvm, vif, &amp;vif-&gt;bss_conf);</div><div class='ctx'> </div><div class='ctx'> 	goto out_unlock;</div><div class='ctx'> </div><div class='del'>-out_quota_failed:</div><div class='add'>+out_failed:</div><div class='ctx'> 	iwl_mvm_power_update_mac(mvm);</div><div class='ctx'> 	mvmvif-&gt;ap_ibss_active = false;</div><div class='ctx'> 	iwl_mvm_send_rm_bcast_sta(mvm, vif);</div><div class='hunk'>@@ -2569,15 +3062,28 @@ out_unlock:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_stop_ap_ibss(struct ieee80211_hw *hw,</div><div class='add'>+static int iwl_mvm_start_ap(struct ieee80211_hw *hw,</div><div class='add'>+			    struct ieee80211_vif *vif,</div><div class='add'>+			    struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	return iwl_mvm_start_ap_ibss(hw, vif, link_conf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_start_ibss(struct ieee80211_hw *hw,</div><div class='add'>+			      struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	return iwl_mvm_start_ap_ibss(hw, vif, &amp;vif-&gt;bss_conf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Common part for MLD and non-MLD ops */</div><div class='add'>+void iwl_mvm_stop_ap_ibss_common(struct iwl_mvm *mvm,</div><div class='ctx'> 				 struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_prepare_mac_removal(mvm, vif);</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	iwl_mvm_prepare_mac_removal(mvm, vif);</div><div class='ctx'> </div><div class='ctx'> 	/* Handle AP stop while in CSA */</div><div class='ctx'> 	if (rcu_access_pointer(mvm-&gt;csa_vif) == vif) {</div><div class='hunk'>@@ -2602,6 +3108,17 @@ static void iwl_mvm_stop_ap_ibss(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_bt_coex_vif_change(mvm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_stop_ap_ibss(struct ieee80211_hw *hw,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_stop_ap_ibss_common(mvm, vif);</div><div class='ctx'> </div><div class='ctx'> 	/* Need to update the P2P Device MAC (only GO, IBSS is single vif) */</div><div class='ctx'> 	if (vif-&gt;p2p &amp;&amp; mvm-&gt;p2p_device_vif)</div><div class='hunk'>@@ -2629,15 +3146,26 @@ static void iwl_mvm_stop_ap_ibss(struct ieee80211_hw *hw,</div><div class='ctx'> 	iwl_mvm_power_update_mac(mvm);</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_mac_ctxt_remove(mvm, vif);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+static void iwl_mvm_stop_ap(struct ieee80211_hw *hw,</div><div class='add'>+			    struct ieee80211_vif *vif,</div><div class='add'>+			    struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	iwl_mvm_stop_ap_ibss(hw, vif, link_conf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_stop_ibss(struct ieee80211_hw *hw,</div><div class='add'>+			      struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	iwl_mvm_stop_ap_ibss(hw, vif, &amp;vif-&gt;bss_conf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> iwl_mvm_bss_info_changed_ap_ibss(struct iwl_mvm *mvm,</div><div class='ctx'> 				 struct ieee80211_vif *vif,</div><div class='ctx'> 				 struct ieee80211_bss_conf *bss_conf,</div><div class='del'>-				 u32 changes)</div><div class='add'>+				 u64 changes)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> </div><div class='hunk'>@@ -2652,11 +3180,11 @@ iwl_mvm_bss_info_changed_ap_ibss(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	/* Need to send a new beacon template to the FW */</div><div class='ctx'> 	if (changes &amp; BSS_CHANGED_BEACON &amp;&amp;</div><div class='del'>-	    iwl_mvm_mac_ctxt_beacon_changed(mvm, vif))</div><div class='add'>+	    iwl_mvm_mac_ctxt_beacon_changed(mvm, vif, &amp;vif-&gt;bss_conf))</div><div class='ctx'> 		IWL_WARN(mvm, "Failed updating beacon data\n");</div><div class='ctx'> </div><div class='ctx'> 	if (changes &amp; BSS_CHANGED_FTM_RESPONDER) {</div><div class='del'>-		int ret = iwl_mvm_ftm_start_responder(mvm, vif);</div><div class='add'>+		int ret = iwl_mvm_ftm_start_responder(mvm, vif, &amp;vif-&gt;bss_conf);</div><div class='ctx'> </div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			IWL_WARN(mvm, "Failed to enable FTM responder (%d)\n",</div><div class='hunk'>@@ -2668,13 +3196,13 @@ iwl_mvm_bss_info_changed_ap_ibss(struct iwl_mvm *mvm,</div><div class='ctx'> static void iwl_mvm_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 				     struct ieee80211_vif *vif,</div><div class='ctx'> 				     struct ieee80211_bss_conf *bss_conf,</div><div class='del'>-				     u32 changes)</div><div class='add'>+				     u64 changes)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> </div><div class='del'>-	if (changes &amp; BSS_CHANGED_IDLE &amp;&amp; !bss_conf-&gt;idle)</div><div class='add'>+	if (changes &amp; BSS_CHANGED_IDLE &amp;&amp; !vif-&gt;cfg.idle)</div><div class='ctx'> 		iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_SCHED, true);</div><div class='ctx'> </div><div class='ctx'> 	switch (vif-&gt;type) {</div><div class='hunk'>@@ -2697,51 +3225,42 @@ static void iwl_mvm_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (changes &amp; BSS_CHANGED_TXPOWER) {</div><div class='ctx'> 		IWL_DEBUG_CALIB(mvm, "Changing TX Power to %d dBm\n",</div><div class='ctx'> 				bss_conf-&gt;txpower);</div><div class='del'>-		iwl_mvm_set_tx_power(mvm, vif, bss_conf-&gt;txpower);</div><div class='add'>+		iwl_mvm_set_tx_power(mvm, bss_conf, bss_conf-&gt;txpower);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_mac_hw_scan(struct ieee80211_hw *hw,</div><div class='del'>-			       struct ieee80211_vif *vif,</div><div class='del'>-			       struct ieee80211_scan_request *hw_req)</div><div class='add'>+int iwl_mvm_mac_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_scan_request *hw_req)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (hw_req-&gt;req.n_channels == 0 ||</div><div class='ctx'> 	    hw_req-&gt;req.n_channels &gt; mvm-&gt;fw-&gt;ucode_capa.n_scan_channels)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	ret = iwl_mvm_reg_scan_start(mvm, vif, &amp;hw_req-&gt;req, &amp;hw_req-&gt;ies);</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+	return iwl_mvm_reg_scan_start(mvm, vif, &amp;hw_req-&gt;req, &amp;hw_req-&gt;ies);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_mac_cancel_hw_scan(struct ieee80211_hw *hw,</div><div class='del'>-				       struct ieee80211_vif *vif)</div><div class='add'>+void iwl_mvm_mac_cancel_hw_scan(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> </div><div class='ctx'> 	/* Due to a race condition, it's possible that mac80211 asks</div><div class='ctx'> 	 * us to stop a hw_scan when it's already stopped.  This can</div><div class='ctx'> 	 * happen, for instance, if we stopped the scan ourselves,</div><div class='ctx'> 	 * called ieee80211_scan_completed() and the userspace called</div><div class='del'>-	 * cancel scan scan before ieee80211_scan_work() could run.</div><div class='add'>+	 * cancel scan before ieee80211_scan_work() could run.</div><div class='ctx'> 	 * To handle that, simply return if the scan is not running.</div><div class='ctx'> 	*/</div><div class='ctx'> 	if (mvm-&gt;scan_status &amp; IWL_MVM_SCAN_REGULAR)</div><div class='ctx'> 		iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_REGULAR, true);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+void</div><div class='ctx'> iwl_mvm_mac_allow_buffered_frames(struct ieee80211_hw *hw,</div><div class='ctx'> 				  struct ieee80211_sta *sta, u16 tids,</div><div class='ctx'> 				  int num_frames,</div><div class='hunk'>@@ -2756,7 +3275,7 @@ iwl_mvm_mac_allow_buffered_frames(struct ieee80211_hw *hw,</div><div class='ctx'> 					  tids, more_data, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+void</div><div class='ctx'> iwl_mvm_mac_release_buffered_frames(struct ieee80211_hw *hw,</div><div class='ctx'> 				    struct ieee80211_sta *sta, u16 tids,</div><div class='ctx'> 				    int num_frames,</div><div class='hunk'>@@ -2817,7 +3336,7 @@ static void __iwl_mvm_mac_sta_notify(struct ieee80211_hw *hw,</div><div class='ctx'> 		 */</div><div class='ctx'> 		break;</div><div class='ctx'> 	case STA_NOTIFY_AWAKE:</div><div class='del'>-		if (WARN_ON(mvmsta-&gt;sta_id == IWL_MVM_INVALID_STA))</div><div class='add'>+		if (WARN_ON(mvmsta-&gt;deflink.sta_id == IWL_INVALID_STA))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (txqs)</div><div class='hunk'>@@ -2830,10 +3349,8 @@ static void __iwl_mvm_mac_sta_notify(struct ieee80211_hw *hw,</div><div class='ctx'> 	spin_unlock_bh(&amp;mvmsta-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_mac_sta_notify(struct ieee80211_hw *hw,</div><div class='del'>-				   struct ieee80211_vif *vif,</div><div class='del'>-				   enum sta_notify_cmd cmd,</div><div class='del'>-				   struct ieee80211_sta *sta)</div><div class='add'>+void iwl_mvm_mac_sta_notify(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			    enum sta_notify_cmd cmd, struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='ctx'> 	__iwl_mvm_mac_sta_notify(hw, cmd, sta);</div><div class='ctx'> }</div><div class='hunk'>@@ -2891,12 +3408,15 @@ void iwl_mvm_sta_pm_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_sta_pre_rcu_remove(struct ieee80211_hw *hw,</div><div class='del'>-				       struct ieee80211_vif *vif,</div><div class='del'>-				       struct ieee80211_sta *sta)</div><div class='add'>+void iwl_mvm_sta_pre_rcu_remove(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mvm-&gt;hw-&gt;wiphy);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This is called before mac80211 does RCU synchronisation,</div><div class='hunk'>@@ -2905,13 +3425,26 @@ static void iwl_mvm_sta_pre_rcu_remove(struct ieee80211_hw *hw,</div><div class='ctx'> 	 * be able to find the station this way, and we don't rely</div><div class='ctx'> 	 * on further RCU synchronisation after the sta_state()</div><div class='ctx'> 	 * callback deleted the station.</div><div class='add'>+	 * Since there's mvm-&gt;mutex here, no need to have RCU lock for</div><div class='add'>+	 * mvm_sta-&gt;link access.</div><div class='ctx'> 	 */</div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	if (sta == rcu_access_pointer(mvm-&gt;fw_id_to_mac_id[mvm_sta-&gt;sta_id]))</div><div class='del'>-		rcu_assign_pointer(mvm-&gt;fw_id_to_mac_id[mvm_sta-&gt;sta_id],</div><div class='del'>-				   ERR_PTR(-ENOENT));</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+	for (link_id = 0; link_id &lt; ARRAY_SIZE(mvm_sta-&gt;link); link_id++) {</div><div class='add'>+		struct iwl_mvm_link_sta *link_sta;</div><div class='add'>+		u32 sta_id;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+		if (!mvm_sta-&gt;link[link_id])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		link_sta = rcu_dereference_protected(mvm_sta-&gt;link[link_id],</div><div class='add'>+						     lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+		sta_id = link_sta-&gt;sta_id;</div><div class='add'>+		if (sta == rcu_access_pointer(mvm-&gt;fw_id_to_mac_id[sta_id])) {</div><div class='add'>+			RCU_INIT_POINTER(mvm-&gt;fw_id_to_mac_id[sta_id],</div><div class='add'>+					 ERR_PTR(-ENOENT));</div><div class='add'>+			RCU_INIT_POINTER(mvm-&gt;fw_id_to_link_sta[sta_id], NULL);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_check_uapsd(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='hunk'>@@ -2987,32 +3520,43 @@ static void iwl_mvm_check_he_obss_narrow_bw_ru_iter(struct wiphy *wiphy,</div><div class='ctx'> 						    void *_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_he_obss_narrow_bw_ru_data *data = _data;</div><div class='add'>+	const struct cfg80211_bss_ies *ies;</div><div class='ctx'> 	const struct element *elem;</div><div class='ctx'> </div><div class='del'>-	elem = cfg80211_find_elem(WLAN_EID_EXT_CAPABILITY, bss-&gt;ies-&gt;data,</div><div class='del'>-				  bss-&gt;ies-&gt;len);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ies = rcu_dereference(bss-&gt;ies);</div><div class='add'>+	elem = cfg80211_find_elem(WLAN_EID_EXT_CAPABILITY, ies-&gt;data,</div><div class='add'>+				  ies-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	if (!elem || elem-&gt;datalen &lt; 10 ||</div><div class='ctx'> 	    !(elem-&gt;data[10] &amp;</div><div class='ctx'> 	      WLAN_EXT_CAPA10_OBSS_NARROW_BW_RU_TOLERANCE_SUPPORT)) {</div><div class='ctx'> 		data-&gt;tolerated = false;</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_check_he_obss_narrow_bw_ru(struct ieee80211_hw *hw,</div><div class='del'>-					       struct ieee80211_vif *vif)</div><div class='add'>+static void</div><div class='add'>+iwl_mvm_check_he_obss_narrow_bw_ru(struct ieee80211_hw *hw,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   unsigned int link_id,</div><div class='add'>+				   struct ieee80211_bss_conf *link_conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	struct iwl_mvm_he_obss_narrow_bw_ru_data iter_data = {</div><div class='ctx'> 		.tolerated = true,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (!(vif-&gt;bss_conf.chandef.chan-&gt;flags &amp; IEEE80211_CHAN_RADAR)) {</div><div class='del'>-		mvmvif-&gt;he_ru_2mhz_block = false;</div><div class='add'>+	if (WARN_ON_ONCE(!link_conf-&gt;chanreq.oper.chan ||</div><div class='add'>+			 !mvmvif-&gt;link[link_id]))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!(link_conf-&gt;chanreq.oper.chan-&gt;flags &amp; IEEE80211_CHAN_RADAR)) {</div><div class='add'>+		mvmvif-&gt;link[link_id]-&gt;he_ru_2mhz_block = false;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cfg80211_bss_iter(hw-&gt;wiphy, &amp;vif-&gt;bss_conf.chandef,</div><div class='add'>+	cfg80211_bss_iter(hw-&gt;wiphy, &amp;link_conf-&gt;chanreq.oper,</div><div class='ctx'> 			  iwl_mvm_check_he_obss_narrow_bw_ru_iter,</div><div class='ctx'> 			  &amp;iter_data);</div><div class='ctx'> </div><div class='hunk'>@@ -3020,7 +3564,7 @@ static void iwl_mvm_check_he_obss_narrow_bw_ru(struct ieee80211_hw *hw,</div><div class='ctx'> 	 * If there is at least one AP on radar channel that cannot</div><div class='ctx'> 	 * tolerate 26-tone RU UL OFDMA transmissions using HE TB PPDU.</div><div class='ctx'> 	 */</div><div class='del'>-	mvmvif-&gt;he_ru_2mhz_block = !iter_data.tolerated;</div><div class='add'>+	mvmvif-&gt;link[link_id]-&gt;he_ru_2mhz_block = !iter_data.tolerated;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_reset_cca_40mhz_workaround(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -3044,36 +3588,432 @@ static void iwl_mvm_reset_cca_40mhz_workaround(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	sband-&gt;ht_cap.cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;</div><div class='ctx'> </div><div class='del'>-	he_cap = ieee80211_get_he_iftype_cap(sband,</div><div class='del'>-					     ieee80211_vif_type_p2p(vif));</div><div class='add'>+	he_cap = ieee80211_get_he_iftype_cap_vif(sband, vif);</div><div class='ctx'> </div><div class='ctx'> 	if (he_cap) {</div><div class='ctx'> 		/* we know that ours is writable */</div><div class='del'>-		struct ieee80211_sta_he_cap *he = (void *)he_cap;</div><div class='add'>+		struct ieee80211_sta_he_cap *he = (void *)(uintptr_t)he_cap;</div><div class='ctx'> </div><div class='ctx'> 		he-&gt;he_cap_elem.phy_cap_info[0] |=</div><div class='ctx'> 			IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void iwl_mvm_mei_host_associated(struct iwl_mvm *mvm,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					struct iwl_mvm_sta *mvm_sta)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_IWLMEI)</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mei_conn_info conn_info = {</div><div class='add'>+		.ssid_len = vif-&gt;cfg.ssid_len,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!mvm-&gt;mei_registered)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* FIXME: MEI needs to be updated for MLO */</div><div class='add'>+	if (!vif-&gt;bss_conf.chanreq.oper.chan)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	conn_info.channel = vif-&gt;bss_conf.chanreq.oper.chan-&gt;hw_value;</div><div class='add'>+</div><div class='add'>+	switch (mvm_sta-&gt;pairwise_cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		conn_info.pairwise_cipher = IWL_MEI_CIPHER_TKIP;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+		conn_info.pairwise_cipher = IWL_MEI_CIPHER_CCMP;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP:</div><div class='add'>+		conn_info.pairwise_cipher = IWL_MEI_CIPHER_GCMP;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='add'>+		conn_info.pairwise_cipher = IWL_MEI_CIPHER_GCMP_256;</div><div class='add'>+		break;</div><div class='add'>+	case 0:</div><div class='add'>+		/* open profile */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* cipher not supported, don't send anything to iwlmei */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (mvmvif-&gt;rekey_data.akm) {</div><div class='add'>+	case WLAN_AKM_SUITE_SAE &amp; 0xff:</div><div class='add'>+		conn_info.auth_mode = IWL_MEI_AKM_AUTH_SAE;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_AKM_SUITE_PSK &amp; 0xff:</div><div class='add'>+		conn_info.auth_mode = IWL_MEI_AKM_AUTH_RSNA_PSK;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_AKM_SUITE_8021X &amp; 0xff:</div><div class='add'>+		conn_info.auth_mode = IWL_MEI_AKM_AUTH_RSNA;</div><div class='add'>+		break;</div><div class='add'>+	case 0:</div><div class='add'>+		/* open profile */</div><div class='add'>+		conn_info.auth_mode = IWL_MEI_AKM_AUTH_OPEN;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* auth method / AKM not supported */</div><div class='add'>+		/* TODO: All the FT vesions of these? */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(conn_info.ssid, vif-&gt;cfg.ssid, vif-&gt;cfg.ssid_len);</div><div class='add'>+	memcpy(conn_info.bssid,  vif-&gt;bss_conf.bssid, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	/* TODO: add support for collocated AP data */</div><div class='add'>+	iwl_mei_host_associated(&amp;conn_info, NULL);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mac_ctxt_changed_wrapper(struct iwl_mvm *mvm,</div><div class='add'>+					    struct ieee80211_vif *vif,</div><div class='add'>+					    bool force_assoc_off)</div><div class='add'>+{</div><div class='add'>+	return iwl_mvm_mac_ctxt_changed(mvm, vif, force_assoc_off, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,</div><div class='ctx'> 				 struct ieee80211_vif *vif,</div><div class='ctx'> 				 struct ieee80211_sta *sta,</div><div class='ctx'> 				 enum ieee80211_sta_state old_state,</div><div class='ctx'> 				 enum ieee80211_sta_state new_state)</div><div class='ctx'> {</div><div class='add'>+	static const struct iwl_mvm_sta_state_ops callbacks = {</div><div class='add'>+		.add_sta = iwl_mvm_add_sta,</div><div class='add'>+		.update_sta = iwl_mvm_update_sta,</div><div class='add'>+		.rm_sta = iwl_mvm_rm_sta,</div><div class='add'>+		.mac_ctxt_changed = iwl_mvm_mac_ctxt_changed_wrapper,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_mac_sta_state_common(hw, vif, sta, old_state, new_state,</div><div class='add'>+					    &amp;callbacks);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* FIXME: temporary making two assumptions in all sta handling functions:</div><div class='add'>+ *	(1) when setting sta state, the link exists and protected</div><div class='add'>+ *	(2) if a link is valid in sta then it's valid in vif (can</div><div class='add'>+ *	use same index in the link array)</div><div class='add'>+ */</div><div class='add'>+static void iwl_mvm_rs_rate_init_all_links(struct iwl_mvm *mvm,</div><div class='add'>+					   struct ieee80211_vif *vif,</div><div class='add'>+					   struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+</div><div class='add'>+	for_each_mvm_vif_valid_link(mvmvif, link_id) {</div><div class='add'>+		struct ieee80211_bss_conf *conf =</div><div class='add'>+			link_conf_dereference_check(vif, link_id);</div><div class='add'>+		struct ieee80211_link_sta *link_sta =</div><div class='add'>+			link_sta_dereference_check(sta, link_id);</div><div class='add'>+</div><div class='add'>+		if (!conf || !link_sta || !mvmvif-&gt;link[link_id]-&gt;phy_ctxt)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		iwl_mvm_rs_rate_init(mvm, vif, sta, conf, link_sta,</div><div class='add'>+				     mvmvif-&gt;link[link_id]-&gt;phy_ctxt-&gt;channel-&gt;band);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mvm_vif_conf_from_sta(struct iwl_mvm *mvm,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+</div><div class='add'>+	/* Beacon interval check - firmware will crash if the beacon</div><div class='add'>+	 * interval is less than 16. We can't avoid connecting at all,</div><div class='add'>+	 * so refuse the station state change, this will cause mac80211</div><div class='add'>+	 * to abandon attempts to connect to this AP, and eventually</div><div class='add'>+	 * wpa_s will blocklist the AP...</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	for_each_sta_active_link(vif, sta, link_sta, link_id) {</div><div class='add'>+		struct ieee80211_bss_conf *link_conf =</div><div class='add'>+			link_conf_dereference_protected(vif, link_id);</div><div class='add'>+</div><div class='add'>+		if (!link_conf)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (link_conf-&gt;beacon_int &lt; IWL_MVM_MIN_BEACON_INTERVAL_TU) {</div><div class='add'>+			IWL_ERR(mvm,</div><div class='add'>+				"Beacon interval %d for AP %pM is too small\n",</div><div class='add'>+				link_conf-&gt;beacon_int, link_sta-&gt;addr);</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		link_conf-&gt;he_support = link_sta-&gt;he_cap.has_he;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_vif_set_he_support(struct ieee80211_hw *hw,</div><div class='add'>+				       struct ieee80211_vif *vif,</div><div class='add'>+				       struct ieee80211_sta *sta,</div><div class='add'>+				       bool is_sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+</div><div class='add'>+	for_each_sta_active_link(vif, sta, link_sta, link_id) {</div><div class='add'>+		struct ieee80211_bss_conf *link_conf =</div><div class='add'>+			link_conf_dereference_protected(vif, link_id);</div><div class='add'>+</div><div class='add'>+		if (!link_conf || !mvmvif-&gt;link[link_id])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		link_conf-&gt;he_support = link_sta-&gt;he_cap.has_he;</div><div class='add'>+</div><div class='add'>+		if (is_sta) {</div><div class='add'>+			mvmvif-&gt;link[link_id]-&gt;he_ru_2mhz_block = false;</div><div class='add'>+			if (link_sta-&gt;he_cap.has_he)</div><div class='add'>+				iwl_mvm_check_he_obss_narrow_bw_ru(hw, vif,</div><div class='add'>+								   link_id,</div><div class='add'>+								   link_conf);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mvm_sta_state_notexist_to_none(struct iwl_mvm *mvm,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_sta *sta,</div><div class='add'>+				   const struct iwl_mvm_sta_state_ops *callbacks)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+	    !iwl_mvm_vif_conf_from_sta(mvm, vif, sta))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;tdls &amp;&amp;</div><div class='add'>+	    (vif-&gt;p2p ||</div><div class='add'>+	     iwl_mvm_tdls_sta_count(mvm, NULL) == IWL_TDLS_STA_COUNT ||</div><div class='add'>+	     iwl_mvm_phy_ctx_count(mvm) &gt; 1)) {</div><div class='add'>+		IWL_DEBUG_MAC80211(mvm, "refusing TDLS sta\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = callbacks-&gt;add_sta(mvm, vif, sta);</div><div class='add'>+	if (sta-&gt;tdls &amp;&amp; ret == 0) {</div><div class='add'>+		iwl_mvm_recalc_tdls_state(mvm, vif, true);</div><div class='add'>+		iwl_mvm_tdls_check_trigger(mvm, vif, sta-&gt;addr,</div><div class='add'>+					   NL80211_TDLS_SETUP);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for_each_sta_active_link(vif, sta, link_sta, i)</div><div class='add'>+		link_sta-&gt;agg.max_rc_amsdu_len = 1;</div><div class='add'>+</div><div class='add'>+	ieee80211_sta_recalc_aggregates(sta);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; !sta-&gt;tdls)</div><div class='add'>+		mvmvif-&gt;ap_sta = sta;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Initialize the rates here already - this really tells</div><div class='add'>+	 * the firmware only what the supported legacy rates are</div><div class='add'>+	 * (may be) since it's initialized already from what the</div><div class='add'>+	 * AP advertised in the beacon/probe response. This will</div><div class='add'>+	 * allow the firmware to send auth/assoc frames with one</div><div class='add'>+	 * of the supported rates already, rather than having to</div><div class='add'>+	 * use a mandatory rate.</div><div class='add'>+	 * If we're the AP, we'll just assume mandatory rates at</div><div class='add'>+	 * this point, but we know nothing about the STA anyway.</div><div class='add'>+	 */</div><div class='add'>+	iwl_mvm_rs_rate_init_all_links(mvm, vif, sta);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mvm_sta_state_auth_to_assoc(struct ieee80211_hw *hw,</div><div class='add'>+				struct iwl_mvm *mvm,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_sta *sta,</div><div class='add'>+				const struct iwl_mvm_sta_state_ops *callbacks)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP) {</div><div class='add'>+		iwl_mvm_vif_set_he_support(hw, vif, sta, false);</div><div class='add'>+		mvmvif-&gt;ap_assoc_sta_count++;</div><div class='add'>+		callbacks-&gt;mac_ctxt_changed(mvm, vif, false);</div><div class='add'>+</div><div class='add'>+		/* since the below is not for MLD API, it's ok to use</div><div class='add'>+		 * the default bss_conf</div><div class='add'>+		 */</div><div class='add'>+		if (!mvm-&gt;mld_api_is_used &amp;&amp;</div><div class='add'>+		    (vif-&gt;bss_conf.he_support &amp;&amp;</div><div class='add'>+		     !iwlwifi_mod_params.disable_11ax))</div><div class='add'>+			iwl_mvm_cfg_he_sta(mvm, vif, mvm_sta-&gt;deflink.sta_id);</div><div class='add'>+	} else if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='add'>+		iwl_mvm_vif_set_he_support(hw, vif, sta, true);</div><div class='add'>+</div><div class='add'>+		callbacks-&gt;mac_ctxt_changed(mvm, vif, false);</div><div class='add'>+</div><div class='add'>+		if (!mvm-&gt;mld_api_is_used)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		for_each_sta_active_link(vif, sta, link_sta, link_id) {</div><div class='add'>+			struct ieee80211_bss_conf *link_conf =</div><div class='add'>+				link_conf_dereference_protected(vif, link_id);</div><div class='add'>+</div><div class='add'>+			if (WARN_ON(!link_conf))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			if (!mvmvif-&gt;link[link_id])</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			iwl_mvm_link_changed(mvm, vif, link_conf,</div><div class='add'>+					     LINK_CONTEXT_MODIFY_ALL &amp;</div><div class='add'>+					     ~LINK_CONTEXT_MODIFY_ACTIVE,</div><div class='add'>+					     true);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	iwl_mvm_rs_rate_init_all_links(mvm, vif, sta);</div><div class='add'>+</div><div class='add'>+	return callbacks-&gt;update_sta(mvm, vif, sta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mvm_sta_state_assoc_to_authorized(struct iwl_mvm *mvm,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      struct ieee80211_sta *sta,</div><div class='add'>+				      const struct iwl_mvm_sta_state_ops *callbacks)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* we don't support TDLS during DCM */</div><div class='add'>+	if (iwl_mvm_phy_ctx_count(mvm) &gt; 1)</div><div class='add'>+		iwl_mvm_teardown_tdls_peers(mvm);</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;tdls) {</div><div class='add'>+		iwl_mvm_tdls_check_trigger(mvm, vif, sta-&gt;addr,</div><div class='add'>+					   NL80211_TDLS_ENABLE_LINK);</div><div class='add'>+	} else {</div><div class='add'>+		/* enable beacon filtering */</div><div class='add'>+		WARN_ON(iwl_mvm_enable_beacon_filter(mvm, vif));</div><div class='add'>+</div><div class='add'>+		mvmvif-&gt;authorized = 1;</div><div class='add'>+</div><div class='add'>+		if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status)) {</div><div class='add'>+			mvmvif-&gt;link_selection_res = vif-&gt;active_links;</div><div class='add'>+			mvmvif-&gt;link_selection_primary =</div><div class='add'>+				vif-&gt;active_links ? __ffs(vif-&gt;active_links) : 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		callbacks-&gt;mac_ctxt_changed(mvm, vif, false);</div><div class='add'>+		iwl_mvm_mei_host_associated(mvm, vif, mvm_sta);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mvm_sta-&gt;authorized = true;</div><div class='add'>+</div><div class='add'>+	/* MFP is set by default before the station is authorized.</div><div class='add'>+	 * Clear it here in case it's not used.</div><div class='add'>+	 */</div><div class='add'>+	if (!sta-&gt;mfp) {</div><div class='add'>+		int ret = callbacks-&gt;update_sta(mvm, vif, sta);</div><div class='add'>+</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mvm_rs_rate_init_all_links(mvm, vif, sta);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mvm_sta_state_authorized_to_assoc(struct iwl_mvm *mvm,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      struct ieee80211_sta *sta,</div><div class='add'>+				      const struct iwl_mvm_sta_state_ops *callbacks)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	mvmsta-&gt;authorized = false;</div><div class='add'>+</div><div class='add'>+	/* once we move into assoc state, need to update rate scale to</div><div class='add'>+	 * disable using wide bandwidth</div><div class='add'>+	 */</div><div class='add'>+	iwl_mvm_rs_rate_init_all_links(mvm, vif, sta);</div><div class='add'>+</div><div class='add'>+	if (!sta-&gt;tdls) {</div><div class='add'>+		/* Set this but don't call iwl_mvm_mac_ctxt_changed()</div><div class='add'>+		 * yet to avoid sending high prio again for a little</div><div class='add'>+		 * time.</div><div class='add'>+		 */</div><div class='add'>+		mvmvif-&gt;authorized = 0;</div><div class='add'>+		mvmvif-&gt;link_selection_res = 0;</div><div class='add'>+</div><div class='add'>+		/* disable beacon filtering */</div><div class='add'>+		iwl_mvm_disable_beacon_filter(mvm, vif);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_smps_workaround(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			     bool update)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	if (!iwl_mvm_has_rlc_offload(mvm) ||</div><div class='add'>+	    iwl_fw_lookup_cmd_ver(mvm-&gt;fw, MAC_PM_POWER_TABLE, 0) &gt;= 2)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mvmvif-&gt;ps_disabled = !vif-&gt;cfg.ps;</div><div class='add'>+</div><div class='add'>+	if (update)</div><div class='add'>+		iwl_mvm_power_update_mac(mvm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Common part for MLD and non-MLD modes */</div><div class='add'>+int iwl_mvm_mac_sta_state_common(struct ieee80211_hw *hw,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_sta *sta,</div><div class='add'>+				 enum ieee80211_sta_state old_state,</div><div class='add'>+				 enum ieee80211_sta_state new_state,</div><div class='add'>+				 const struct iwl_mvm_sta_state_ops *callbacks)</div><div class='add'>+{</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	unsigned int link_id;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_MAC80211(mvm, "station %pM state change %d-&gt;%d\n",</div><div class='ctx'> 			   sta-&gt;addr, old_state, new_state);</div><div class='ctx'> </div><div class='del'>-	/* this would be a mac80211 bug ... but don't crash */</div><div class='del'>-	if (WARN_ON_ONCE(!mvmvif-&gt;phy_ctxt))</div><div class='del'>-		return test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &amp;mvm-&gt;status) ? 0 : -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we are in a STA removal flow and in DQA mode:</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -3101,51 +4041,36 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,</div><div class='ctx'> 		 * from the AP now.</div><div class='ctx'> 		 */</div><div class='ctx'> 		iwl_mvm_reset_cca_40mhz_workaround(mvm, vif);</div><div class='add'>+</div><div class='add'>+		/* Also free dup data just in case any assertions below fail */</div><div class='add'>+		kfree(mvm_sta-&gt;dup_data);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* this would be a mac80211 bug ... but don't crash, unless we had a</div><div class='add'>+	 * firmware crash while we were activating a link, in which case it is</div><div class='add'>+	 * legit to have phy_ctxt = NULL. Don't bother not to WARN if we are in</div><div class='add'>+	 * recovery flow since we spit tons of error messages anyway.</div><div class='add'>+	 */</div><div class='add'>+	for_each_sta_active_link(vif, sta, link_sta, link_id) {</div><div class='add'>+		if (WARN_ON_ONCE(!mvmvif-&gt;link[link_id] ||</div><div class='add'>+				 !mvmvif-&gt;link[link_id]-&gt;phy_ctxt)) {</div><div class='add'>+			mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+			return test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED,</div><div class='add'>+					&amp;mvm-&gt;status) ? 0 : -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* track whether or not the station is associated */</div><div class='ctx'> 	mvm_sta-&gt;sta_state = new_state;</div><div class='ctx'> </div><div class='ctx'> 	if (old_state == IEEE80211_STA_NOTEXIST &amp;&amp;</div><div class='ctx'> 	    new_state == IEEE80211_STA_NONE) {</div><div class='del'>-		/*</div><div class='del'>-		 * Firmware bug - it'll crash if the beacon interval is less</div><div class='del'>-		 * than 16. We can't avoid connecting at all, so refuse the</div><div class='del'>-		 * station state change, this will cause mac80211 to abandon</div><div class='del'>-		 * attempts to connect to this AP, and eventually wpa_s will</div><div class='del'>-		 * blocklist the AP...</div><div class='del'>-		 */</div><div class='del'>-		if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='del'>-		    vif-&gt;bss_conf.beacon_int &lt; 16) {</div><div class='del'>-			IWL_ERR(mvm,</div><div class='del'>-				"AP %pM beacon interval is %d, refusing due to firmware bug!\n",</div><div class='del'>-				sta-&gt;addr, vif-&gt;bss_conf.beacon_int);</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='del'>-			vif-&gt;bss_conf.he_support = sta-&gt;he_cap.has_he;</div><div class='del'>-</div><div class='del'>-		if (sta-&gt;tdls &amp;&amp;</div><div class='del'>-		    (vif-&gt;p2p ||</div><div class='del'>-		     iwl_mvm_tdls_sta_count(mvm, NULL) ==</div><div class='del'>-						IWL_MVM_TDLS_STA_COUNT ||</div><div class='del'>-		     iwl_mvm_phy_ctx_count(mvm) &gt; 1)) {</div><div class='del'>-			IWL_DEBUG_MAC80211(mvm, "refusing TDLS sta\n");</div><div class='del'>-			ret = -EBUSY;</div><div class='add'>+		ret = iwl_mvm_sta_state_notexist_to_none(mvm, vif, sta,</div><div class='add'>+							 callbacks);</div><div class='add'>+		if (ret &lt; 0)</div><div class='ctx'> 			goto out_unlock;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = iwl_mvm_add_sta(mvm, vif, sta);</div><div class='del'>-		if (sta-&gt;tdls &amp;&amp; ret == 0) {</div><div class='del'>-			iwl_mvm_recalc_tdls_state(mvm, vif, true);</div><div class='del'>-			iwl_mvm_tdls_check_trigger(mvm, vif, sta-&gt;addr,</div><div class='del'>-						   NL80211_TDLS_SETUP);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		sta-&gt;max_rc_amsdu_len = 1;</div><div class='ctx'> 	} else if (old_state == IEEE80211_STA_NONE &amp;&amp;</div><div class='ctx'> 		   new_state == IEEE80211_STA_AUTH) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -3157,74 +4082,35 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	} else if (old_state == IEEE80211_STA_AUTH &amp;&amp;</div><div class='ctx'> 		   new_state == IEEE80211_STA_ASSOC) {</div><div class='del'>-		if (vif-&gt;type == NL80211_IFTYPE_AP) {</div><div class='del'>-			vif-&gt;bss_conf.he_support = sta-&gt;he_cap.has_he;</div><div class='del'>-			mvmvif-&gt;ap_assoc_sta_count++;</div><div class='del'>-			iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);</div><div class='del'>-			if (vif-&gt;bss_conf.he_support &amp;&amp;</div><div class='del'>-			    !iwlwifi_mod_params.disable_11ax)</div><div class='del'>-				iwl_mvm_cfg_he_sta(mvm, vif, mvm_sta-&gt;sta_id);</div><div class='del'>-		} else if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='del'>-			vif-&gt;bss_conf.he_support = sta-&gt;he_cap.has_he;</div><div class='del'>-</div><div class='del'>-			mvmvif-&gt;he_ru_2mhz_block = false;</div><div class='del'>-			if (sta-&gt;he_cap.has_he)</div><div class='del'>-				iwl_mvm_check_he_obss_narrow_bw_ru(hw, vif);</div><div class='del'>-</div><div class='del'>-			iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		iwl_mvm_rs_rate_init(mvm, sta, mvmvif-&gt;phy_ctxt-&gt;channel-&gt;band,</div><div class='del'>-				     false);</div><div class='del'>-		ret = iwl_mvm_update_sta(mvm, vif, sta);</div><div class='add'>+		ret = iwl_mvm_sta_state_auth_to_assoc(hw, mvm, vif, sta,</div><div class='add'>+						      callbacks);</div><div class='ctx'> 	} else if (old_state == IEEE80211_STA_ASSOC &amp;&amp;</div><div class='ctx'> 		   new_state == IEEE80211_STA_AUTHORIZED) {</div><div class='del'>-		ret = 0;</div><div class='del'>-</div><div class='del'>-		/* we don't support TDLS during DCM */</div><div class='del'>-		if (iwl_mvm_phy_ctx_count(mvm) &gt; 1)</div><div class='del'>-			iwl_mvm_teardown_tdls_peers(mvm);</div><div class='del'>-</div><div class='del'>-		if (sta-&gt;tdls)</div><div class='del'>-			iwl_mvm_tdls_check_trigger(mvm, vif, sta-&gt;addr,</div><div class='del'>-						   NL80211_TDLS_ENABLE_LINK);</div><div class='del'>-</div><div class='del'>-		/* enable beacon filtering */</div><div class='del'>-		WARN_ON(iwl_mvm_enable_beacon_filter(mvm, vif, 0));</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Now that the station is authorized, i.e., keys were already</div><div class='del'>-		 * installed, need to indicate to the FW that</div><div class='del'>-		 * multicast data frames can be forwarded to the driver</div><div class='del'>-		 */</div><div class='del'>-		iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);</div><div class='del'>-</div><div class='del'>-		iwl_mvm_rs_rate_init(mvm, sta, mvmvif-&gt;phy_ctxt-&gt;channel-&gt;band,</div><div class='del'>-				     true);</div><div class='add'>+		ret = iwl_mvm_sta_state_assoc_to_authorized(mvm, vif, sta,</div><div class='add'>+							    callbacks);</div><div class='add'>+		iwl_mvm_smps_workaround(mvm, vif, true);</div><div class='ctx'> 	} else if (old_state == IEEE80211_STA_AUTHORIZED &amp;&amp;</div><div class='ctx'> 		   new_state == IEEE80211_STA_ASSOC) {</div><div class='del'>-		/* Multicast data frames are no longer allowed */</div><div class='del'>-		iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);</div><div class='del'>-</div><div class='del'>-		/* disable beacon filtering */</div><div class='del'>-		ret = iwl_mvm_disable_beacon_filter(mvm, vif, 0);</div><div class='del'>-		WARN_ON(ret &amp;&amp;</div><div class='del'>-			!test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED,</div><div class='del'>-				  &amp;mvm-&gt;status));</div><div class='del'>-		ret = 0;</div><div class='add'>+		ret = iwl_mvm_sta_state_authorized_to_assoc(mvm, vif, sta,</div><div class='add'>+							    callbacks);</div><div class='ctx'> 	} else if (old_state == IEEE80211_STA_ASSOC &amp;&amp;</div><div class='ctx'> 		   new_state == IEEE80211_STA_AUTH) {</div><div class='ctx'> 		if (vif-&gt;type == NL80211_IFTYPE_AP) {</div><div class='ctx'> 			mvmvif-&gt;ap_assoc_sta_count--;</div><div class='del'>-			iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);</div><div class='del'>-		}</div><div class='add'>+			callbacks-&gt;mac_ctxt_changed(mvm, vif, false);</div><div class='add'>+		} else if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; !sta-&gt;tdls)</div><div class='add'>+			iwl_mvm_stop_session_protection(mvm, vif);</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	} else if (old_state == IEEE80211_STA_AUTH &amp;&amp;</div><div class='ctx'> 		   new_state == IEEE80211_STA_NONE) {</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	} else if (old_state == IEEE80211_STA_NONE &amp;&amp;</div><div class='ctx'> 		   new_state == IEEE80211_STA_NOTEXIST) {</div><div class='del'>-		ret = iwl_mvm_rm_sta(mvm, vif, sta);</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; !sta-&gt;tdls) {</div><div class='add'>+			iwl_mvm_stop_session_protection(mvm, vif);</div><div class='add'>+			mvmvif-&gt;ap_sta = NULL;</div><div class='add'>+		}</div><div class='add'>+		ret = callbacks-&gt;rm_sta(mvm, vif, sta);</div><div class='ctx'> 		if (sta-&gt;tdls) {</div><div class='ctx'> 			iwl_mvm_recalc_tdls_state(mvm, vif, false);</div><div class='ctx'> 			iwl_mvm_tdls_check_trigger(mvm, vif, sta-&gt;addr,</div><div class='hunk'>@@ -3253,7 +4139,8 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_mac_set_rts_threshold(struct ieee80211_hw *hw, u32 value)</div><div class='add'>+int iwl_mvm_mac_set_rts_threshold(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+				  u32 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> </div><div class='hunk'>@@ -3262,18 +4149,16 @@ static int iwl_mvm_mac_set_rts_threshold(struct ieee80211_hw *hw, u32 value)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_sta_rc_update(struct ieee80211_hw *hw,</div><div class='del'>-				  struct ieee80211_vif *vif,</div><div class='del'>-				  struct ieee80211_sta *sta, u32 changed)</div><div class='add'>+void iwl_mvm_sta_rc_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			   struct ieee80211_link_sta *link_sta, u32 changed)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_sta *sta = link_sta-&gt;sta;</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='del'>-	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; (IEEE80211_RC_BW_CHANGED |</div><div class='ctx'> 		       IEEE80211_RC_SUPP_RATES_CHANGED |</div><div class='ctx'> 		       IEEE80211_RC_NSS_CHANGED))</div><div class='del'>-		iwl_mvm_rs_rate_init(mvm, sta, mvmvif-&gt;phy_ctxt-&gt;channel-&gt;band,</div><div class='del'>-				     true);</div><div class='add'>+		iwl_mvm_rs_rate_init_all_links(mvm, vif, sta);</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='ctx'> 	    changed &amp; IEEE80211_RC_NSS_CHANGED)</div><div class='hunk'>@@ -3281,85 +4166,71 @@ static void iwl_mvm_sta_rc_update(struct ieee80211_hw *hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_mvm_mac_conf_tx(struct ieee80211_hw *hw,</div><div class='del'>-			       struct ieee80211_vif *vif, u16 ac,</div><div class='add'>+			       struct ieee80211_vif *vif,</div><div class='add'>+			       unsigned int link_id, u16 ac,</div><div class='ctx'> 			       const struct ieee80211_tx_queue_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> </div><div class='del'>-	mvmvif-&gt;queue_params[ac] = *params;</div><div class='add'>+	mvmvif-&gt;deflink.queue_params[ac] = *params;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * No need to update right away, we'll get BSS_CHANGED_QOS</div><div class='ctx'> 	 * The exception is P2P_DEVICE interface which needs immediate update.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE) {</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-		ret = iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);</div><div class='del'>-		mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-		return ret;</div><div class='add'>+		guard(mvm)(mvm);</div><div class='add'>+		return iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_mac_mgd_prepare_tx(struct ieee80211_hw *hw,</div><div class='del'>-				       struct ieee80211_vif *vif,</div><div class='del'>-				       u16 req_duration)</div><div class='add'>+void iwl_mvm_mac_mgd_prepare_tx(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_prep_tx_info *info)</div><div class='ctx'> {</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='del'>-	u32 duration = IWL_MVM_TE_SESSION_PROTECTION_MAX_TIME_MS;</div><div class='del'>-	u32 min_duration = IWL_MVM_TE_SESSION_PROTECTION_MIN_TIME_MS;</div><div class='ctx'> </div><div class='del'>-	if (req_duration &gt; duration)</div><div class='del'>-		duration = req_duration;</div><div class='add'>+	if (info-&gt;was_assoc &amp;&amp; !mvmvif-&gt;session_prot_connection_loss)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	/* Try really hard to protect the session and hear a beacon</div><div class='del'>-	 * The new session protection command allows us to protect the</div><div class='del'>-	 * session for a much longer time since the firmware will internally</div><div class='del'>-	 * create two events: a 300TU one with a very high priority that</div><div class='del'>-	 * won't be fragmented which should be enough for 99% of the cases,</div><div class='del'>-	 * and another one (which we configure here to be 900TU long) which</div><div class='del'>-	 * will have a slightly lower priority, but more importantly, can be</div><div class='del'>-	 * fragmented so that it'll allow other activities to run.</div><div class='del'>-	 */</div><div class='del'>-	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='del'>-			IWL_UCODE_TLV_CAPA_SESSION_PROT_CMD))</div><div class='del'>-		iwl_mvm_schedule_session_protection(mvm, vif, 900,</div><div class='del'>-						    min_duration, false);</div><div class='del'>-	else</div><div class='del'>-		iwl_mvm_protect_session(mvm, vif, duration,</div><div class='del'>-					min_duration, 500, false);</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+	iwl_mvm_protect_assoc(mvm, vif, info-&gt;duration, info-&gt;link_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_mac_sched_scan_start(struct ieee80211_hw *hw,</div><div class='del'>-					struct ieee80211_vif *vif,</div><div class='del'>-					struct cfg80211_sched_scan_request *req,</div><div class='del'>-					struct ieee80211_scan_ies *ies)</div><div class='add'>+void iwl_mvm_mac_mgd_complete_tx(struct ieee80211_hw *hw,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_prep_tx_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> </div><div class='del'>-	int ret;</div><div class='add'>+	/* for successful cases (auth/assoc), don't cancel session protection */</div><div class='add'>+	if (info-&gt;success)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+	iwl_mvm_stop_session_protection(mvm, vif);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (!vif-&gt;bss_conf.idle) {</div><div class='del'>-		ret = -EBUSY;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+int iwl_mvm_mac_sched_scan_start(struct ieee80211_hw *hw,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct cfg80211_sched_scan_request *req,</div><div class='add'>+				 struct ieee80211_scan_ies *ies)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_sched_scan_start(mvm, vif, req, ies, IWL_MVM_SCAN_SCHED);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-	return ret;</div><div class='add'>+	if (!vif-&gt;cfg.idle)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_sched_scan_start(mvm, vif, req, ies, IWL_MVM_SCAN_SCHED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_mac_sched_scan_stop(struct ieee80211_hw *hw,</div><div class='del'>-				       struct ieee80211_vif *vif)</div><div class='add'>+int iwl_mvm_mac_sched_scan_stop(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -3370,7 +4241,7 @@ static int iwl_mvm_mac_sched_scan_stop(struct ieee80211_hw *hw,</div><div class='ctx'> 	 * us to stop a sched_scan when it's already stopped.  This</div><div class='ctx'> 	 * can happen, for instance, if we stopped the scan ourselves,</div><div class='ctx'> 	 * called ieee80211_sched_scan_stopped() and the userspace called</div><div class='del'>-	 * stop sched scan scan before ieee80211_sched_scan_stopped_work()</div><div class='add'>+	 * stop sched scan before ieee80211_sched_scan_stopped_work()</div><div class='ctx'> 	 * could run.  To handle this, simply return if the scan is</div><div class='ctx'> 	 * not running.</div><div class='ctx'> 	*/</div><div class='hunk'>@@ -3394,15 +4265,20 @@ static int __iwl_mvm_mac_set_key(struct ieee80211_hw *hw,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='del'>-	struct iwl_mvm_sta *mvmsta;</div><div class='del'>-	struct iwl_mvm_key_pn *ptk_pn;</div><div class='add'>+	struct iwl_mvm_sta *mvmsta = NULL;</div><div class='add'>+	struct iwl_mvm_key_pn *ptk_pn = NULL;</div><div class='ctx'> 	int keyidx = key-&gt;keyidx;</div><div class='add'>+	u32 sec_key_id = WIDE_ID(DATA_PATH_GROUP, SEC_KEY_CMD);</div><div class='add'>+	u8 sec_key_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, sec_key_id, 0);</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> 	u8 key_offset;</div><div class='ctx'> </div><div class='add'>+	if (sta)</div><div class='add'>+		mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+</div><div class='ctx'> 	switch (key-&gt;cipher) {</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_TKIP:</div><div class='del'>-		if (!mvm-&gt;trans-&gt;trans_cfg-&gt;gen2) {</div><div class='add'>+		if (!mvm-&gt;trans-&gt;mac_cfg-&gt;gen2) {</div><div class='ctx'> 			key-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;</div><div class='ctx'> 			key-&gt;flags |= IEEE80211_KEY_FLAG_PUT_IV_SPACE;</div><div class='ctx'> 		} else if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='hunk'>@@ -3432,17 +4308,13 @@ static int __iwl_mvm_mac_set_key(struct ieee80211_hw *hw,</div><div class='ctx'> 		/* support HW crypto on TX */</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	default:</div><div class='del'>-		/* currently FW supports only one optional cipher scheme */</div><div class='del'>-		if (hw-&gt;n_cipher_schemes &amp;&amp;</div><div class='del'>-		    hw-&gt;cipher_schemes-&gt;cipher == key-&gt;cipher)</div><div class='del'>-			key-&gt;flags |= IEEE80211_KEY_FLAG_PUT_IV_SPACE;</div><div class='del'>-		else</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SET_KEY:</div><div class='del'>-		if (keyidx == 6 || keyidx == 7)</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+		    (keyidx == 6 || keyidx == 7))</div><div class='ctx'> 			rcu_assign_pointer(mvmvif-&gt;bcn_prot.keys[keyidx - 6],</div><div class='ctx'> 					   key);</div><div class='ctx'> </div><div class='hunk'>@@ -3452,11 +4324,24 @@ static int __iwl_mvm_mac_set_key(struct ieee80211_hw *hw,</div><div class='ctx'> 			 * GTK on AP interface is a TX-only key, return 0;</div><div class='ctx'> 			 * on IBSS they're per-station and because we're lazy</div><div class='ctx'> 			 * we don't support them for RX, so do the same.</div><div class='del'>-			 * CMAC/GMAC in AP/IBSS modes must be done in software.</div><div class='add'>+			 * CMAC/GMAC in AP/IBSS modes must be done in software</div><div class='add'>+			 * on older NICs.</div><div class='add'>+			 *</div><div class='add'>+			 * Except, of course, beacon protection - it must be</div><div class='add'>+			 * offloaded since we just set a beacon template, and</div><div class='add'>+			 * then we must also offload the IGTK (not just BIGTK)</div><div class='add'>+			 * for firmware reasons.</div><div class='add'>+			 *</div><div class='add'>+			 * So just check for beacon protection - if we don't</div><div class='add'>+			 * have it we cannot get here with keyidx &gt;= 6, and</div><div class='add'>+			 * if we do have it we need to send the key to FW in</div><div class='add'>+			 * all cases (CMAC/GMAC).</div><div class='ctx'> 			 */</div><div class='del'>-			if (key-&gt;cipher == WLAN_CIPHER_SUITE_AES_CMAC ||</div><div class='del'>-			    key-&gt;cipher == WLAN_CIPHER_SUITE_BIP_GMAC_128 ||</div><div class='del'>-			    key-&gt;cipher == WLAN_CIPHER_SUITE_BIP_GMAC_256) {</div><div class='add'>+			if (!wiphy_ext_feature_isset(hw-&gt;wiphy,</div><div class='add'>+						     NL80211_EXT_FEATURE_BEACON_PROTECTION) &amp;&amp;</div><div class='add'>+			    (key-&gt;cipher == WLAN_CIPHER_SUITE_AES_CMAC ||</div><div class='add'>+			     key-&gt;cipher == WLAN_CIPHER_SUITE_BIP_GMAC_128 ||</div><div class='add'>+			     key-&gt;cipher == WLAN_CIPHER_SUITE_BIP_GMAC_256)) {</div><div class='ctx'> 				ret = -EOPNOTSUPP;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -3500,7 +4385,7 @@ static int __iwl_mvm_mac_set_key(struct ieee80211_hw *hw,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status) &amp;&amp;</div><div class='del'>-		    sta &amp;&amp; iwl_mvm_has_new_rx_api(mvm) &amp;&amp;</div><div class='add'>+		    mvmsta &amp;&amp; iwl_mvm_has_new_rx_api(mvm) &amp;&amp;</div><div class='ctx'> 		    key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE &amp;&amp;</div><div class='ctx'> 		    (key-&gt;cipher == WLAN_CIPHER_SUITE_CCMP ||</div><div class='ctx'> 		     key-&gt;cipher == WLAN_CIPHER_SUITE_GCMP ||</div><div class='hunk'>@@ -3508,10 +4393,9 @@ static int __iwl_mvm_mac_set_key(struct ieee80211_hw *hw,</div><div class='ctx'> 			struct ieee80211_key_seq seq;</div><div class='ctx'> 			int tid, q;</div><div class='ctx'> </div><div class='del'>-			mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> 			WARN_ON(rcu_access_pointer(mvmsta-&gt;ptk_pn[keyidx]));</div><div class='ctx'> 			ptk_pn = kzalloc(struct_size(ptk_pn, q,</div><div class='del'>-						     mvm-&gt;trans-&gt;num_rx_queues),</div><div class='add'>+						     mvm-&gt;trans-&gt;info.num_rxqs),</div><div class='ctx'> 					 GFP_KERNEL);</div><div class='ctx'> 			if (!ptk_pn) {</div><div class='ctx'> 				ret = -ENOMEM;</div><div class='hunk'>@@ -3520,7 +4404,7 @@ static int __iwl_mvm_mac_set_key(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 			for (tid = 0; tid &lt; IWL_MAX_TID_COUNT; tid++) {</div><div class='ctx'> 				ieee80211_get_key_rx_seq(key, tid, &amp;seq);</div><div class='del'>-				for (q = 0; q &lt; mvm-&gt;trans-&gt;num_rx_queues; q++)</div><div class='add'>+				for (q = 0; q &lt; mvm-&gt;trans-&gt;info.num_rxqs; q++)</div><div class='ctx'> 					memcpy(ptk_pn-&gt;q[q].pn[tid],</div><div class='ctx'> 					       seq.ccmp.pn,</div><div class='ctx'> 					       IEEE80211_CCMP_PN_LEN);</div><div class='hunk'>@@ -3535,11 +4419,24 @@ static int __iwl_mvm_mac_set_key(struct ieee80211_hw *hw,</div><div class='ctx'> 		else</div><div class='ctx'> 			key_offset = STA_KEY_IDX_INVALID;</div><div class='ctx'> </div><div class='del'>-		IWL_DEBUG_MAC80211(mvm, "set hwcrypto key\n");</div><div class='del'>-		ret = iwl_mvm_set_sta_key(mvm, vif, sta, key, key_offset);</div><div class='add'>+		if (mvmsta &amp;&amp; key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE)</div><div class='add'>+			mvmsta-&gt;pairwise_cipher = key-&gt;cipher;</div><div class='add'>+</div><div class='add'>+		IWL_DEBUG_MAC80211(mvm, "set hwcrypto key (sta:%pM, id:%d)\n",</div><div class='add'>+				   sta ? sta-&gt;addr : NULL, key-&gt;keyidx);</div><div class='add'>+</div><div class='add'>+		if (sec_key_ver)</div><div class='add'>+			ret = iwl_mvm_sec_key_add(mvm, vif, sta, key);</div><div class='add'>+		else</div><div class='add'>+			ret = iwl_mvm_set_sta_key(mvm, vif, sta, key, key_offset);</div><div class='add'>+</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			IWL_WARN(mvm, "set key failed\n");</div><div class='ctx'> 			key-&gt;hw_key_idx = STA_KEY_IDX_INVALID;</div><div class='add'>+			if (ptk_pn) {</div><div class='add'>+				RCU_INIT_POINTER(mvmsta-&gt;ptk_pn[keyidx], NULL);</div><div class='add'>+				kfree(ptk_pn);</div><div class='add'>+			}</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * can't add key for RX, but we don't need it</div><div class='ctx'> 			 * in the device for TX so still return 0,</div><div class='hunk'>@@ -3554,7 +4451,8 @@ static int __iwl_mvm_mac_set_key(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> 	case DISABLE_KEY:</div><div class='del'>-		if (keyidx == 6 || keyidx == 7)</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+		    (keyidx == 6 || keyidx == 7))</div><div class='ctx'> 			RCU_INIT_POINTER(mvmvif-&gt;bcn_prot.keys[keyidx - 6],</div><div class='ctx'> 					 NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -3575,12 +4473,11 @@ static int __iwl_mvm_mac_set_key(struct ieee80211_hw *hw,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (sta &amp;&amp; iwl_mvm_has_new_rx_api(mvm) &amp;&amp;</div><div class='add'>+		if (mvmsta &amp;&amp; iwl_mvm_has_new_rx_api(mvm) &amp;&amp;</div><div class='ctx'> 		    key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE &amp;&amp;</div><div class='ctx'> 		    (key-&gt;cipher == WLAN_CIPHER_SUITE_CCMP ||</div><div class='ctx'> 		     key-&gt;cipher == WLAN_CIPHER_SUITE_GCMP ||</div><div class='ctx'> 		     key-&gt;cipher == WLAN_CIPHER_SUITE_GCMP_256)) {</div><div class='del'>-			mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> 			ptk_pn = rcu_dereference_protected(</div><div class='ctx'> 						mvmsta-&gt;ptk_pn[keyidx],</div><div class='ctx'> 						lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='hunk'>@@ -3590,7 +4487,10 @@ static int __iwl_mvm_mac_set_key(struct ieee80211_hw *hw,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		IWL_DEBUG_MAC80211(mvm, "disable hwcrypto key\n");</div><div class='del'>-		ret = iwl_mvm_remove_sta_key(mvm, vif, sta, key);</div><div class='add'>+		if (sec_key_ver)</div><div class='add'>+			ret = iwl_mvm_sec_key_del(mvm, vif, sta, key);</div><div class='add'>+		else</div><div class='add'>+			ret = iwl_mvm_remove_sta_key(mvm, vif, sta, key);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -EINVAL;</div><div class='hunk'>@@ -3599,27 +4499,25 @@ static int __iwl_mvm_mac_set_key(struct ieee80211_hw *hw,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_mac_set_key(struct ieee80211_hw *hw,</div><div class='del'>-			       enum set_key_cmd cmd,</div><div class='del'>-			       struct ieee80211_vif *vif,</div><div class='del'>-			       struct ieee80211_sta *sta,</div><div class='del'>-			       struct ieee80211_key_conf *key)</div><div class='add'>+int iwl_mvm_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='add'>+			struct ieee80211_vif *vif, struct ieee80211_sta *sta,</div><div class='add'>+			struct ieee80211_key_conf *key)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	ret = __iwl_mvm_mac_set_key(hw, cmd, vif, sta, key);</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+	/* When resuming from wowlan, FW already knows about the newest keys */</div><div class='add'>+	if (test_bit(IWL_MVM_STATUS_IN_D3, &amp;mvm-&gt;status))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+	return __iwl_mvm_mac_set_key(hw, cmd, vif, sta, key);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_mac_update_tkip_key(struct ieee80211_hw *hw,</div><div class='del'>-					struct ieee80211_vif *vif,</div><div class='del'>-					struct ieee80211_key_conf *keyconf,</div><div class='del'>-					struct ieee80211_sta *sta,</div><div class='del'>-					u32 iv32, u16 *phase1key)</div><div class='add'>+void iwl_mvm_mac_update_tkip_key(struct ieee80211_hw *hw,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_key_conf *keyconf,</div><div class='add'>+				 struct ieee80211_sta *sta,</div><div class='add'>+				 u32 iv32, u16 *phase1key)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> </div><div class='hunk'>@@ -3664,11 +4562,6 @@ static bool iwl_mvm_rx_aux_roc(struct iwl_notif_wait_data *notif_wait,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define AUX_ROC_MIN_DURATION MSEC_TO_TU(100)</div><div class='del'>-#define AUX_ROC_MIN_DELAY MSEC_TO_TU(200)</div><div class='del'>-#define AUX_ROC_MAX_DELAY MSEC_TO_TU(600)</div><div class='del'>-#define AUX_ROC_SAFETY_BUFFER MSEC_TO_TU(20)</div><div class='del'>-#define AUX_ROC_MIN_SAFETY_BUFFER MSEC_TO_TU(10)</div><div class='ctx'> static int iwl_mvm_send_aux_roc_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 				    struct ieee80211_channel *channel,</div><div class='ctx'> 				    struct ieee80211_vif *vif,</div><div class='hunk'>@@ -3679,8 +4572,6 @@ static int iwl_mvm_send_aux_roc_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 	struct iwl_mvm_time_event_data *te_data = &amp;mvmvif-&gt;hs_time_event_data;</div><div class='ctx'> 	static const u16 time_event_response[] = { HOT_SPOT_CMD };</div><div class='ctx'> 	struct iwl_notification_wait wait_time_event;</div><div class='del'>-	u32 dtim_interval = vif-&gt;bss_conf.dtim_period *</div><div class='del'>-		vif-&gt;bss_conf.beacon_int;</div><div class='ctx'> 	u32 req_dur, delay;</div><div class='ctx'> 	struct iwl_hs20_roc_req aux_roc_req = {</div><div class='ctx'> 		.action = cpu_to_le32(FW_CTXT_ACTION_ADD),</div><div class='hunk'>@@ -3695,35 +4586,13 @@ static int iwl_mvm_send_aux_roc_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 	/* Set the channel info data */</div><div class='ctx'> 	iwl_mvm_set_chan_info(mvm, &amp;aux_roc_req.channel_info, channel-&gt;hw_value,</div><div class='ctx'> 			      iwl_mvm_phy_band_from_nl80211(channel-&gt;band),</div><div class='del'>-			      PHY_VHT_CHANNEL_MODE20,</div><div class='add'>+			      IWL_PHY_CHANNEL_MODE20,</div><div class='ctx'> 			      0);</div><div class='ctx'> </div><div class='ctx'> 	/* Set the time and duration */</div><div class='ctx'> 	tail-&gt;apply_time = cpu_to_le32(iwl_mvm_get_systime(mvm));</div><div class='ctx'> </div><div class='del'>-	delay = AUX_ROC_MIN_DELAY;</div><div class='del'>-	req_dur = MSEC_TO_TU(duration);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we are associated we want the delay time to be at least one</div><div class='del'>-	 * dtim interval so that the FW can wait until after the DTIM and</div><div class='del'>-	 * then start the time event, this will potentially allow us to</div><div class='del'>-	 * remain off-channel for the max duration.</div><div class='del'>-	 * Since we want to use almost a whole dtim interval we would also</div><div class='del'>-	 * like the delay to be for 2-3 dtim intervals, in case there are</div><div class='del'>-	 * other time events with higher priority.</div><div class='del'>-	 */</div><div class='del'>-	if (vif-&gt;bss_conf.assoc) {</div><div class='del'>-		delay = min_t(u32, dtim_interval * 3, AUX_ROC_MAX_DELAY);</div><div class='del'>-		/* We cannot remain off-channel longer than the DTIM interval */</div><div class='del'>-		if (dtim_interval &lt;= req_dur) {</div><div class='del'>-			req_dur = dtim_interval - AUX_ROC_SAFETY_BUFFER;</div><div class='del'>-			if (req_dur &lt;= AUX_ROC_MIN_DURATION)</div><div class='del'>-				req_dur = dtim_interval -</div><div class='del'>-					AUX_ROC_MIN_SAFETY_BUFFER;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	iwl_mvm_roc_duration_and_delay(vif, duration, &amp;req_dur, &amp;delay);</div><div class='ctx'> 	tail-&gt;duration = cpu_to_le32(req_dur);</div><div class='ctx'> 	tail-&gt;apply_time_max_delay = cpu_to_le32(delay);</div><div class='ctx'> </div><div class='hunk'>@@ -3731,8 +4600,8 @@ static int iwl_mvm_send_aux_roc_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 		     "ROC: Requesting to remain on channel %u for %ums\n",</div><div class='ctx'> 		     channel-&gt;hw_value, req_dur);</div><div class='ctx'> 	IWL_DEBUG_TE(mvm,</div><div class='del'>-		     "\t(requested = %ums, max_delay = %ums, dtim_interval = %ums)\n",</div><div class='del'>-		     duration, delay, dtim_interval);</div><div class='add'>+		     "\t(requested = %ums, max_delay = %ums)\n",</div><div class='add'>+		     duration, delay);</div><div class='ctx'> </div><div class='ctx'> 	/* Set the node address */</div><div class='ctx'> 	memcpy(tail-&gt;node_addr, vif-&gt;addr, ETH_ALEN);</div><div class='hunk'>@@ -3790,193 +4659,263 @@ static int iwl_mvm_send_aux_roc_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int iwl_mvm_add_aux_sta_for_hs20(struct iwl_mvm *mvm, u32 lmac_id)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			 IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT)) {</div><div class='add'>+		IWL_ERR(mvm, "hotspot not supported\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iwl_mvm_has_new_station_api(mvm-&gt;fw)) {</div><div class='add'>+		ret = iwl_mvm_add_aux_sta(mvm, lmac_id);</div><div class='add'>+		WARN(ret, "Failed to allocate aux station");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_roc_link(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_binding_add_vif(mvm, vif);</div><div class='add'>+	if (WARN(ret, "Failed binding P2P_DEVICE\n"))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* The station and queue allocation must be done only after the binding</div><div class='add'>+	 * is done, as otherwise the FW might incorrectly configure its state.</div><div class='add'>+	 */</div><div class='add'>+	return iwl_mvm_add_p2p_bcast_sta(mvm, vif);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int iwl_mvm_roc(struct ieee80211_hw *hw,</div><div class='ctx'> 		       struct ieee80211_vif *vif,</div><div class='ctx'> 		       struct ieee80211_channel *channel,</div><div class='ctx'> 		       int duration,</div><div class='ctx'> 		       enum ieee80211_roc_type type)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='del'>-	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-	struct cfg80211_chan_def chandef;</div><div class='del'>-	struct iwl_mvm_phy_ctxt *phy_ctxt;</div><div class='del'>-	int ret, i;</div><div class='add'>+	static const struct iwl_mvm_roc_ops ops = {</div><div class='add'>+		.add_aux_sta_for_hs20 = iwl_mvm_add_aux_sta_for_hs20,</div><div class='add'>+		.link = iwl_mvm_roc_link,</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_MAC80211(mvm, "enter (%d, %d, %d)\n", channel-&gt;hw_value,</div><div class='del'>-			   duration, type);</div><div class='add'>+	return iwl_mvm_roc_common(hw, vif, channel, duration, type, &amp;ops);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Flush the done work, just in case it's still pending, so that</div><div class='del'>-	 * the work it does can complete and we can accept new frames.</div><div class='del'>-	 */</div><div class='del'>-	flush_work(&amp;mvm-&gt;roc_done_wk);</div><div class='add'>+static int iwl_mvm_roc_station(struct iwl_mvm *mvm,</div><div class='add'>+			       struct ieee80211_channel *channel,</div><div class='add'>+			       struct ieee80211_vif *vif,</div><div class='add'>+			       int duration)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 cmd_id = WIDE_ID(MAC_CONF_GROUP, ROC_CMD);</div><div class='add'>+	u8 fw_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, cmd_id,</div><div class='add'>+					  IWL_FW_CMD_VER_UNKNOWN);</div><div class='add'>+</div><div class='add'>+	if (fw_ver == IWL_FW_CMD_VER_UNKNOWN) {</div><div class='add'>+		ret = iwl_mvm_send_aux_roc_cmd(mvm, channel, vif, duration);</div><div class='add'>+	} else if (fw_ver &gt;= 3) {</div><div class='add'>+		ret = iwl_mvm_roc_add_cmd(mvm, channel, vif, duration,</div><div class='add'>+					  ROC_ACTIVITY_HOTSPOT);</div><div class='add'>+	} else {</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		IWL_ERR(mvm, "ROC command version %d mismatch!\n", fw_ver);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	switch (vif-&gt;type) {</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-		if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='del'>-				IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT)) {</div><div class='del'>-			/* Use aux roc framework (HS20) */</div><div class='del'>-			if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, LONG_GROUP,</div><div class='del'>-						  ADD_STA, 0) &gt;= 12) {</div><div class='del'>-				u32 lmac_id;</div><div class='del'>-</div><div class='del'>-				lmac_id = iwl_mvm_get_lmac_id(mvm-&gt;fw,</div><div class='del'>-							      channel-&gt;band);</div><div class='del'>-				ret = iwl_mvm_add_aux_sta(mvm, lmac_id);</div><div class='del'>-				if (WARN(ret,</div><div class='del'>-					 "Failed to allocate aux station"))</div><div class='del'>-					goto out_unlock;</div><div class='del'>-			}</div><div class='del'>-			ret = iwl_mvm_send_aux_roc_cmd(mvm, channel,</div><div class='del'>-						       vif, duration);</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		}</div><div class='del'>-		IWL_ERR(mvm, "hotspot not supported\n");</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	case NL80211_IFTYPE_P2P_DEVICE:</div><div class='del'>-		/* handle below */</div><div class='add'>+static int iwl_mvm_roc_p2p(struct iwl_mvm *mvm,</div><div class='add'>+			   struct ieee80211_channel *channel,</div><div class='add'>+			   struct ieee80211_vif *vif,</div><div class='add'>+			   int duration,</div><div class='add'>+			   enum ieee80211_roc_type type)</div><div class='add'>+{</div><div class='add'>+	enum iwl_roc_activity activity;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case IEEE80211_ROC_TYPE_NORMAL:</div><div class='add'>+		activity = ROC_ACTIVITY_P2P_DISC;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_ROC_TYPE_MGMT_TX:</div><div class='add'>+		activity = ROC_ACTIVITY_P2P_NEG;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		IWL_ERR(mvm, "vif isn't P2P_DEVICE: %d\n", vif-&gt;type);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		WARN_ONCE(1, "Got an invalid P2P ROC type\n");</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; NUM_PHY_CTX; i++) {</div><div class='del'>-		phy_ctxt = &amp;mvm-&gt;phy_ctxts[i];</div><div class='del'>-		if (phy_ctxt-&gt;ref == 0 || mvmvif-&gt;phy_ctxt == phy_ctxt)</div><div class='del'>-			continue;</div><div class='add'>+	ret = iwl_mvm_mld_add_aux_sta(mvm,</div><div class='add'>+				      iwl_mvm_get_lmac_id(mvm, channel-&gt;band));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-		if (phy_ctxt-&gt;ref &amp;&amp; channel == phy_ctxt-&gt;channel) {</div><div class='del'>-			/*</div><div class='del'>-			 * Unbind the P2P_DEVICE from the current PHY context,</div><div class='del'>-			 * and if the PHY context is not used remove it.</div><div class='del'>-			 */</div><div class='del'>-			ret = iwl_mvm_binding_remove_vif(mvm, vif);</div><div class='del'>-			if (WARN(ret, "Failed unbinding P2P_DEVICE\n"))</div><div class='del'>-				goto out_unlock;</div><div class='add'>+	return iwl_mvm_roc_add_cmd(mvm, channel, vif, duration, activity);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			iwl_mvm_phy_ctxt_unref(mvm, mvmvif-&gt;phy_ctxt);</div><div class='add'>+static int iwl_mvm_p2p_find_phy_ctxt(struct iwl_mvm *mvm,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     struct ieee80211_channel *channel)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct cfg80211_chan_def chandef;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-			/* Bind the P2P_DEVICE to the current PHY Context */</div><div class='del'>-			mvmvif-&gt;phy_ctxt = phy_ctxt;</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-			ret = iwl_mvm_binding_add_vif(mvm, vif);</div><div class='del'>-			if (WARN(ret, "Failed binding P2P_DEVICE\n"))</div><div class='del'>-				goto out_unlock;</div><div class='add'>+	if (mvmvif-&gt;deflink.phy_ctxt &amp;&amp;</div><div class='add'>+	    channel == mvmvif-&gt;deflink.phy_ctxt-&gt;channel)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Try using a PHY context that is already in use */</div><div class='add'>+	for (i = 0; i &lt; NUM_PHY_CTX; i++) {</div><div class='add'>+		struct iwl_mvm_phy_ctxt *phy_ctxt = &amp;mvm-&gt;phy_ctxts[i];</div><div class='add'>+</div><div class='add'>+		if (!phy_ctxt-&gt;ref || mvmvif-&gt;deflink.phy_ctxt == phy_ctxt)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (channel == phy_ctxt-&gt;channel) {</div><div class='add'>+			if (mvmvif-&gt;deflink.phy_ctxt)</div><div class='add'>+				iwl_mvm_phy_ctxt_unref(mvm,</div><div class='add'>+						       mvmvif-&gt;deflink.phy_ctxt);</div><div class='ctx'> </div><div class='del'>-			iwl_mvm_phy_ctxt_ref(mvm, mvmvif-&gt;phy_ctxt);</div><div class='del'>-			goto schedule_time_event;</div><div class='add'>+			mvmvif-&gt;deflink.phy_ctxt = phy_ctxt;</div><div class='add'>+			iwl_mvm_phy_ctxt_ref(mvm, mvmvif-&gt;deflink.phy_ctxt);</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Need to update the PHY context only if the ROC channel changed */</div><div class='del'>-	if (channel == mvmvif-&gt;phy_ctxt-&gt;channel)</div><div class='del'>-		goto schedule_time_event;</div><div class='add'>+	/* We already have a phy_ctxt, but it's not on the right channel */</div><div class='add'>+	if (mvmvif-&gt;deflink.phy_ctxt)</div><div class='add'>+		iwl_mvm_phy_ctxt_unref(mvm, mvmvif-&gt;deflink.phy_ctxt);</div><div class='add'>+</div><div class='add'>+	mvmvif-&gt;deflink.phy_ctxt = iwl_mvm_get_free_phy_ctxt(mvm);</div><div class='add'>+	if (!mvmvif-&gt;deflink.phy_ctxt)</div><div class='add'>+		return -ENOSPC;</div><div class='ctx'> </div><div class='ctx'> 	cfg80211_chandef_create(&amp;chandef, channel, NL80211_CHAN_NO_HT);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Change the PHY context configuration as it is currently referenced</div><div class='del'>-	 * only by the P2P Device MAC</div><div class='del'>-	 */</div><div class='del'>-	if (mvmvif-&gt;phy_ctxt-&gt;ref == 1) {</div><div class='del'>-		ret = iwl_mvm_phy_ctxt_changed(mvm, mvmvif-&gt;phy_ctxt,</div><div class='del'>-					       &amp;chandef, 1, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out_unlock;</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * The PHY context is shared with other MACs. Need to remove the</div><div class='del'>-		 * P2P Device from the binding, allocate an new PHY context and</div><div class='del'>-		 * create a new binding</div><div class='del'>-		 */</div><div class='del'>-		phy_ctxt = iwl_mvm_get_free_phy_ctxt(mvm);</div><div class='del'>-		if (!phy_ctxt) {</div><div class='del'>-			ret = -ENOSPC;</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		}</div><div class='add'>+	return iwl_mvm_phy_ctxt_add(mvm, mvmvif-&gt;deflink.phy_ctxt,</div><div class='add'>+				    &amp;chandef, NULL, 1, 1);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		ret = iwl_mvm_phy_ctxt_changed(mvm, phy_ctxt, &amp;chandef,</div><div class='del'>-					       1, 1);</div><div class='del'>-		if (ret) {</div><div class='del'>-			IWL_ERR(mvm, "Failed to change PHY context\n");</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		}</div><div class='add'>+/* Execute the common part for MLD and non-MLD modes */</div><div class='add'>+int iwl_mvm_roc_common(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		       struct ieee80211_channel *channel, int duration,</div><div class='add'>+		       enum ieee80211_roc_type type,</div><div class='add'>+		       const struct iwl_mvm_roc_ops *ops)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+	u32 lmac_id;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-		/* Unbind the P2P_DEVICE from the current PHY context */</div><div class='del'>-		ret = iwl_mvm_binding_remove_vif(mvm, vif);</div><div class='del'>-		if (WARN(ret, "Failed unbinding P2P_DEVICE\n"))</div><div class='del'>-			goto out_unlock;</div><div class='add'>+	IWL_DEBUG_MAC80211(mvm, "enter (%d, %d, %d)\n", channel-&gt;hw_value,</div><div class='add'>+			   duration, type);</div><div class='ctx'> </div><div class='del'>-		iwl_mvm_phy_ctxt_unref(mvm, mvmvif-&gt;phy_ctxt);</div><div class='add'>+	/*</div><div class='add'>+	 * Flush the done work, just in case it's still pending, so that</div><div class='add'>+	 * the work it does can complete and we can accept new frames.</div><div class='add'>+	 */</div><div class='add'>+	flush_work(&amp;mvm-&gt;roc_done_wk);</div><div class='ctx'> </div><div class='del'>-		/* Bind the P2P_DEVICE to the new allocated PHY context */</div><div class='del'>-		mvmvif-&gt;phy_ctxt = phy_ctxt;</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> </div><div class='del'>-		ret = iwl_mvm_binding_add_vif(mvm, vif);</div><div class='del'>-		if (WARN(ret, "Failed binding P2P_DEVICE\n"))</div><div class='del'>-			goto out_unlock;</div><div class='add'>+	switch (vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		lmac_id = iwl_mvm_get_lmac_id(mvm, channel-&gt;band);</div><div class='ctx'> </div><div class='del'>-		iwl_mvm_phy_ctxt_ref(mvm, mvmvif-&gt;phy_ctxt);</div><div class='add'>+		/* Use aux roc framework (HS20) */</div><div class='add'>+		ret = ops-&gt;add_aux_sta_for_hs20(mvm, lmac_id);</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = iwl_mvm_roc_station(mvm, channel, vif, duration);</div><div class='add'>+		return ret;</div><div class='add'>+	case NL80211_IFTYPE_P2P_DEVICE:</div><div class='add'>+		/* handle below */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		IWL_ERR(mvm, "ROC: Invalid vif type=%u\n", vif-&gt;type);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-schedule_time_event:</div><div class='del'>-	/* Schedule the time events */</div><div class='del'>-	ret = iwl_mvm_start_p2p_roc(mvm, vif, duration, type);</div><div class='add'>+	if (iwl_mvm_has_p2p_over_aux(mvm)) {</div><div class='add'>+		ret = iwl_mvm_roc_p2p(mvm, channel, vif, duration, type);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-out_unlock:</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_MAC80211(mvm, "leave\n");</div><div class='del'>-	return ret;</div><div class='add'>+	ret = iwl_mvm_p2p_find_phy_ctxt(mvm, vif, channel);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ops-&gt;link(mvm, vif);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_start_p2p_roc(mvm, vif, duration, type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_cancel_roc(struct ieee80211_hw *hw,</div><div class='del'>-			      struct ieee80211_vif *vif)</div><div class='add'>+int iwl_mvm_cancel_roc(struct ieee80211_hw *hw,</div><div class='add'>+		       struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_MAC80211(mvm, "enter\n");</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='ctx'> 	iwl_mvm_stop_roc(mvm, vif);</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_MAC80211(mvm, "leave\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct iwl_mvm_ftm_responder_iter_data {</div><div class='del'>-	bool responder;</div><div class='add'>+struct iwl_mvm_chanctx_usage_data {</div><div class='add'>+	struct iwl_mvm *mvm;</div><div class='ctx'> 	struct ieee80211_chanctx_conf *ctx;</div><div class='add'>+	bool use_def;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_ftm_responder_chanctx_iter(void *_data, u8 *mac,</div><div class='del'>-					       struct ieee80211_vif *vif)</div><div class='add'>+static void iwl_mvm_chanctx_usage_iter(void *_data, u8 *mac,</div><div class='add'>+				       struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm_ftm_responder_iter_data *data = _data;</div><div class='add'>+	struct iwl_mvm_chanctx_usage_data *data = _data;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	int link_id;</div><div class='ctx'> </div><div class='del'>-	if (rcu_access_pointer(vif-&gt;chanctx_conf) == data-&gt;ctx &amp;&amp;</div><div class='del'>-	    vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp; vif-&gt;bss_conf.ftmr_params)</div><div class='del'>-		data-&gt;responder = true;</div><div class='add'>+	for_each_vif_active_link(vif, link_conf, link_id) {</div><div class='add'>+		if (rcu_access_pointer(link_conf-&gt;chanctx_conf) != data-&gt;ctx)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (iwl_mvm_enable_fils(data-&gt;mvm, vif, data-&gt;ctx))</div><div class='add'>+			data-&gt;use_def = true;</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp; link_conf-&gt;ftmr_params)</div><div class='add'>+			data-&gt;use_def = true;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool iwl_mvm_is_ftm_responder_chanctx(struct iwl_mvm *mvm,</div><div class='del'>-					     struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+struct cfg80211_chan_def *</div><div class='add'>+iwl_mvm_chanctx_def(struct iwl_mvm *mvm, struct ieee80211_chanctx_conf *ctx)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm_ftm_responder_iter_data data = {</div><div class='del'>-		.responder = false,</div><div class='add'>+	struct iwl_mvm_chanctx_usage_data data = {</div><div class='add'>+		.mvm = mvm,</div><div class='ctx'> 		.ctx = ctx,</div><div class='add'>+		.use_def = false,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_iterate_active_interfaces_atomic(mvm-&gt;hw,</div><div class='del'>-					IEEE80211_IFACE_ITER_NORMAL,</div><div class='del'>-					iwl_mvm_ftm_responder_chanctx_iter,</div><div class='del'>-					&amp;data);</div><div class='del'>-	return data.responder;</div><div class='add'>+						   IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						   iwl_mvm_chanctx_usage_iter,</div><div class='add'>+						   &amp;data);</div><div class='add'>+</div><div class='add'>+	return data.use_def ? &amp;ctx-&gt;def : &amp;ctx-&gt;min_def;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __iwl_mvm_add_chanctx(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -3984,8 +4923,7 @@ static int __iwl_mvm_add_chanctx(struct iwl_mvm *mvm,</div><div class='ctx'> {</div><div class='ctx'> 	u16 *phy_ctxt_id = (u16 *)ctx-&gt;drv_priv;</div><div class='ctx'> 	struct iwl_mvm_phy_ctxt *phy_ctxt;</div><div class='del'>-	bool responder = iwl_mvm_is_ftm_responder_chanctx(mvm, ctx);</div><div class='del'>-	struct cfg80211_chan_def *def = responder ? &amp;ctx-&gt;def : &amp;ctx-&gt;min_def;</div><div class='add'>+	struct cfg80211_chan_def *def = iwl_mvm_chanctx_def(mvm, ctx);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='hunk'>@@ -3998,31 +4936,26 @@ static int __iwl_mvm_add_chanctx(struct iwl_mvm *mvm,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_phy_ctxt_changed(mvm, phy_ctxt, def,</div><div class='del'>-				       ctx-&gt;rx_chains_static,</div><div class='del'>-				       ctx-&gt;rx_chains_dynamic);</div><div class='add'>+	ret = iwl_mvm_phy_ctxt_add(mvm, phy_ctxt, def, &amp;ctx-&gt;ap,</div><div class='add'>+				   ctx-&gt;rx_chains_static,</div><div class='add'>+				   ctx-&gt;rx_chains_dynamic);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		IWL_ERR(mvm, "Failed to add PHY context\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_phy_ctxt_ref(mvm, phy_ctxt);</div><div class='ctx'> 	*phy_ctxt_id = phy_ctxt-&gt;id;</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_add_chanctx(struct ieee80211_hw *hw,</div><div class='del'>-			       struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+int iwl_mvm_add_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+			struct ieee80211_chanctx_conf *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	ret = __iwl_mvm_add_chanctx(mvm, ctx);</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+	return __iwl_mvm_add_chanctx(mvm, ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __iwl_mvm_remove_chanctx(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -4036,70 +4969,70 @@ static void __iwl_mvm_remove_chanctx(struct iwl_mvm *mvm,</div><div class='ctx'> 	iwl_mvm_phy_ctxt_unref(mvm, phy_ctxt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_remove_chanctx(struct ieee80211_hw *hw,</div><div class='del'>-				   struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+void iwl_mvm_remove_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+			    struct ieee80211_chanctx_conf *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> 	__iwl_mvm_remove_chanctx(mvm, ctx);</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_change_chanctx(struct ieee80211_hw *hw,</div><div class='del'>-				   struct ieee80211_chanctx_conf *ctx,</div><div class='del'>-				   u32 changed)</div><div class='add'>+void iwl_mvm_change_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+			    struct ieee80211_chanctx_conf *ctx, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	u16 *phy_ctxt_id = (u16 *)ctx-&gt;drv_priv;</div><div class='ctx'> 	struct iwl_mvm_phy_ctxt *phy_ctxt = &amp;mvm-&gt;phy_ctxts[*phy_ctxt_id];</div><div class='del'>-	bool responder = iwl_mvm_is_ftm_responder_chanctx(mvm, ctx);</div><div class='del'>-	struct cfg80211_chan_def *def = responder ? &amp;ctx-&gt;def : &amp;ctx-&gt;min_def;</div><div class='add'>+	struct cfg80211_chan_def *def = iwl_mvm_chanctx_def(mvm, ctx);</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ONCE((phy_ctxt-&gt;ref &gt; 1) &amp;&amp;</div><div class='ctx'> 		      (changed &amp; ~(IEEE80211_CHANCTX_CHANGE_WIDTH |</div><div class='ctx'> 				   IEEE80211_CHANCTX_CHANGE_RX_CHAINS |</div><div class='ctx'> 				   IEEE80211_CHANCTX_CHANGE_RADAR |</div><div class='del'>-				   IEEE80211_CHANCTX_CHANGE_MIN_WIDTH)),</div><div class='add'>+				   IEEE80211_CHANCTX_CHANGE_MIN_DEF)),</div><div class='ctx'> 		      "Cannot change PHY. Ref=%d, changed=0x%X\n",</div><div class='ctx'> 		      phy_ctxt-&gt;ref, changed))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> </div><div class='ctx'> 	/* we are only changing the min_width, may be a noop */</div><div class='del'>-	if (changed == IEEE80211_CHANCTX_CHANGE_MIN_WIDTH) {</div><div class='add'>+	if (changed == IEEE80211_CHANCTX_CHANGE_MIN_DEF) {</div><div class='ctx'> 		if (phy_ctxt-&gt;width == def-&gt;width)</div><div class='del'>-			goto out_unlock;</div><div class='add'>+			return;</div><div class='ctx'> </div><div class='ctx'> 		/* we are just toggling between 20_NOHT and 20 */</div><div class='ctx'> 		if (phy_ctxt-&gt;width &lt;= NL80211_CHAN_WIDTH_20 &amp;&amp;</div><div class='ctx'> 		    def-&gt;width &lt;= NL80211_CHAN_WIDTH_20)</div><div class='del'>-			goto out_unlock;</div><div class='add'>+			return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_bt_coex_vif_change(mvm);</div><div class='del'>-	iwl_mvm_phy_ctxt_changed(mvm, phy_ctxt, def,</div><div class='add'>+	iwl_mvm_phy_ctxt_changed(mvm, phy_ctxt, def, &amp;ctx-&gt;ap,</div><div class='ctx'> 				 ctx-&gt;rx_chains_static,</div><div class='ctx'> 				 ctx-&gt;rx_chains_dynamic);</div><div class='del'>-</div><div class='del'>-out_unlock:</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __iwl_mvm_assign_vif_chanctx(struct iwl_mvm *mvm,</div><div class='del'>-					struct ieee80211_vif *vif,</div><div class='del'>-					struct ieee80211_chanctx_conf *ctx,</div><div class='del'>-					bool switching_chanctx)</div><div class='add'>+/*</div><div class='add'>+ * This function executes the common part for MLD and non-MLD modes.</div><div class='add'>+ *</div><div class='add'>+ * Returns true if we're done assigning the chanctx</div><div class='add'>+ * (either on failure or success)</div><div class='add'>+ */</div><div class='add'>+static bool</div><div class='add'>+__iwl_mvm_assign_vif_chanctx_common(struct iwl_mvm *mvm,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct ieee80211_chanctx_conf *ctx,</div><div class='add'>+				    bool switching_chanctx, int *ret)</div><div class='ctx'> {</div><div class='ctx'> 	u16 *phy_ctxt_id = (u16 *)ctx-&gt;drv_priv;</div><div class='ctx'> 	struct iwl_mvm_phy_ctxt *phy_ctxt = &amp;mvm-&gt;phy_ctxts[*phy_ctxt_id];</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	mvmvif-&gt;phy_ctxt = phy_ctxt;</div><div class='add'>+	mvmvif-&gt;deflink.phy_ctxt = phy_ctxt;</div><div class='ctx'> </div><div class='ctx'> 	switch (vif-&gt;type) {</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='hunk'>@@ -4114,19 +5047,36 @@ static int __iwl_mvm_assign_vif_chanctx(struct iwl_mvm *mvm,</div><div class='ctx'> 		 * The AP binding flow is handled as part of the start_ap flow</div><div class='ctx'> 		 * (in bss_info_changed), similarly for IBSS.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out;</div><div class='add'>+		*ret = 0;</div><div class='add'>+		return true;</div><div class='ctx'> 	case NL80211_IFTYPE_STATION:</div><div class='del'>-		mvmvif-&gt;csa_bcn_pending = false;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_MONITOR:</div><div class='ctx'> 		/* always disable PS when a monitor interface is active */</div><div class='ctx'> 		mvmvif-&gt;ps_disabled = true;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='add'>+		*ret = -EINVAL;</div><div class='add'>+		return true;</div><div class='ctx'> 	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __iwl_mvm_assign_vif_chanctx(struct iwl_mvm *mvm,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					struct ieee80211_bss_conf *link_conf,</div><div class='add'>+					struct ieee80211_chanctx_conf *ctx,</div><div class='add'>+					bool switching_chanctx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!link_conf))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (__iwl_mvm_assign_vif_chanctx_common(mvm, vif, ctx,</div><div class='add'>+						switching_chanctx, &amp;ret))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_mvm_binding_add_vif(mvm, vif);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -4160,12 +5110,17 @@ static int __iwl_mvm_assign_vif_chanctx(struct iwl_mvm *mvm,</div><div class='ctx'> 		iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (switching_chanctx &amp;&amp; vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='add'>+		if (!switching_chanctx) {</div><div class='add'>+			mvmvif-&gt;csa_bcn_pending = false;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		mvmvif-&gt;csa_bcn_pending = true;</div><div class='ctx'> </div><div class='ctx'> 		if (!fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 				 IWL_UCODE_TLV_CAPA_CHANNEL_SWITCH_CMD)) {</div><div class='del'>-			u32 duration = 3 * vif-&gt;bss_conf.beacon_int;</div><div class='add'>+			u32 duration = 5 * vif-&gt;bss_conf.beacon_int;</div><div class='ctx'> </div><div class='ctx'> 			/* Protect the session to make sure we hear the first</div><div class='ctx'> 			 * beacon on the new channel.</div><div class='hunk'>@@ -4176,6 +5131,10 @@ static int __iwl_mvm_assign_vif_chanctx(struct iwl_mvm *mvm,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		iwl_mvm_update_quotas(mvm, false, NULL);</div><div class='add'>+</div><div class='add'>+		iwl_mvm_send_ap_tx_power_constraint_cmd(mvm, vif,</div><div class='add'>+							link_conf,</div><div class='add'>+							false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	goto out;</div><div class='hunk'>@@ -4185,47 +5144,48 @@ out_remove_binding:</div><div class='ctx'> 	iwl_mvm_power_update_mac(mvm);</div><div class='ctx'> out:</div><div class='ctx'> 	if (ret)</div><div class='del'>-		mvmvif-&gt;phy_ctxt = NULL;</div><div class='add'>+		mvmvif-&gt;deflink.phy_ctxt = NULL;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> static int iwl_mvm_assign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> 				      struct ieee80211_vif *vif,</div><div class='add'>+				      struct ieee80211_bss_conf *link_conf,</div><div class='ctx'> 				      struct ieee80211_chanctx_conf *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	ret = __iwl_mvm_assign_vif_chanctx(mvm, vif, ctx, false);</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+	return __iwl_mvm_assign_vif_chanctx(mvm, vif, link_conf, ctx, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __iwl_mvm_unassign_vif_chanctx(struct iwl_mvm *mvm,</div><div class='del'>-					   struct ieee80211_vif *vif,</div><div class='del'>-					   struct ieee80211_chanctx_conf *ctx,</div><div class='del'>-					   bool switching_chanctx)</div><div class='add'>+/*</div><div class='add'>+ * This function executes the common part for MLD and non-MLD modes.</div><div class='add'>+ *</div><div class='add'>+ * Returns if chanctx unassign chanctx is done</div><div class='add'>+ * (either on failure or success)</div><div class='add'>+ */</div><div class='add'>+static bool __iwl_mvm_unassign_vif_chanctx_common(struct iwl_mvm *mvm,</div><div class='add'>+						  struct ieee80211_vif *vif,</div><div class='add'>+						  bool switching_chanctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-	struct ieee80211_vif *disabled_vif = NULL;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	iwl_mvm_remove_time_event(mvm, mvmvif, &amp;mvmvif-&gt;time_event_data);</div><div class='add'>+	iwl_mvm_remove_time_event(mvm, mvmvif,</div><div class='add'>+				  &amp;mvmvif-&gt;time_event_data);</div><div class='ctx'> </div><div class='ctx'> 	switch (vif-&gt;type) {</div><div class='ctx'> 	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		goto out;</div><div class='add'>+		return true;</div><div class='ctx'> 	case NL80211_IFTYPE_MONITOR:</div><div class='ctx'> 		mvmvif-&gt;monitor_active = false;</div><div class='ctx'> 		mvmvif-&gt;ps_disabled = false;</div><div class='del'>-		iwl_mvm_rm_snif_sta(mvm, vif);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='ctx'> 		/* This part is triggered only during CSA */</div><div class='ctx'> 		if (!switching_chanctx || !mvmvif-&gt;ap_ibss_active)</div><div class='del'>-			goto out;</div><div class='add'>+			return true;</div><div class='ctx'> </div><div class='ctx'> 		mvmvif-&gt;csa_countdown = false;</div><div class='ctx'> </div><div class='hunk'>@@ -4237,18 +5197,33 @@ static void __iwl_mvm_unassign_vif_chanctx(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 		mvmvif-&gt;ap_ibss_active = false;</div><div class='ctx'> 		break;</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-		if (!switching_chanctx)</div><div class='del'>-			break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __iwl_mvm_unassign_vif_chanctx(struct iwl_mvm *mvm,</div><div class='add'>+					   struct ieee80211_vif *vif,</div><div class='add'>+					   struct ieee80211_bss_conf *link_conf,</div><div class='add'>+					   struct ieee80211_chanctx_conf *ctx,</div><div class='add'>+					   bool switching_chanctx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct ieee80211_vif *disabled_vif = NULL;</div><div class='add'>+</div><div class='add'>+	if (__iwl_mvm_unassign_vif_chanctx_common(mvm, vif, switching_chanctx))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_MONITOR)</div><div class='add'>+		iwl_mvm_rm_snif_sta(mvm, vif);</div><div class='ctx'> </div><div class='del'>-		disabled_vif = vif;</div><div class='ctx'> </div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; switching_chanctx) {</div><div class='add'>+		disabled_vif = vif;</div><div class='ctx'> 		if (!fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 				 IWL_UCODE_TLV_CAPA_CHANNEL_SWITCH_CMD))</div><div class='ctx'> 			iwl_mvm_mac_ctxt_changed(mvm, vif, true, NULL);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_update_quotas(mvm, false, disabled_vif);</div><div class='hunk'>@@ -4258,29 +5233,31 @@ out:</div><div class='ctx'> 	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa, IWL_UCODE_TLV_CAPA_CHANNEL_SWITCH_CMD) &amp;&amp;</div><div class='ctx'> 	    switching_chanctx)</div><div class='ctx'> 		return;</div><div class='del'>-	mvmvif-&gt;phy_ctxt = NULL;</div><div class='add'>+	mvmvif-&gt;deflink.phy_ctxt = NULL;</div><div class='ctx'> 	iwl_mvm_power_update_mac(mvm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_unassign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> 					 struct ieee80211_vif *vif,</div><div class='add'>+					 struct ieee80211_bss_conf *link_conf,</div><div class='ctx'> 					 struct ieee80211_chanctx_conf *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	__iwl_mvm_unassign_vif_chanctx(mvm, vif, ctx, false);</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+	__iwl_mvm_unassign_vif_chanctx(mvm, vif, link_conf, ctx, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> iwl_mvm_switch_vif_chanctx_swap(struct iwl_mvm *mvm,</div><div class='del'>-				struct ieee80211_vif_chanctx_switch *vifs)</div><div class='add'>+				struct ieee80211_vif_chanctx_switch *vifs,</div><div class='add'>+				const struct iwl_mvm_switch_vif_chanctx_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	__iwl_mvm_unassign_vif_chanctx(mvm, vifs[0].vif, vifs[0].old_ctx, true);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+	ops-&gt;__unassign_vif_chanctx(mvm, vifs[0].vif, vifs[0].link_conf,</div><div class='add'>+				    vifs[0].old_ctx, true);</div><div class='ctx'> 	__iwl_mvm_remove_chanctx(mvm, vifs[0].old_ctx);</div><div class='ctx'> </div><div class='ctx'> 	ret = __iwl_mvm_add_chanctx(mvm, vifs[0].new_ctx);</div><div class='hunk'>@@ -4289,8 +5266,8 @@ iwl_mvm_switch_vif_chanctx_swap(struct iwl_mvm *mvm,</div><div class='ctx'> 		goto out_reassign;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = __iwl_mvm_assign_vif_chanctx(mvm, vifs[0].vif, vifs[0].new_ctx,</div><div class='del'>-					   true);</div><div class='add'>+	ret = ops-&gt;__assign_vif_chanctx(mvm, vifs[0].vif, vifs[0].link_conf,</div><div class='add'>+					vifs[0].new_ctx, true);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		IWL_ERR(mvm,</div><div class='ctx'> 			"failed to assign new_ctx during channel switch\n");</div><div class='hunk'>@@ -4301,7 +5278,7 @@ iwl_mvm_switch_vif_chanctx_swap(struct iwl_mvm *mvm,</div><div class='ctx'> 	if (iwl_mvm_phy_ctx_count(mvm) &gt; 1)</div><div class='ctx'> 		iwl_mvm_teardown_tdls_peers(mvm);</div><div class='ctx'> </div><div class='del'>-	goto out;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> out_remove:</div><div class='ctx'> 	__iwl_mvm_remove_chanctx(mvm, vifs[0].new_ctx);</div><div class='hunk'>@@ -4312,66 +5289,63 @@ out_reassign:</div><div class='ctx'> 		goto out_restart;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (__iwl_mvm_assign_vif_chanctx(mvm, vifs[0].vif, vifs[0].old_ctx,</div><div class='del'>-					 true)) {</div><div class='add'>+	if (ops-&gt;__assign_vif_chanctx(mvm, vifs[0].vif, vifs[0].link_conf,</div><div class='add'>+				      vifs[0].old_ctx, true)) {</div><div class='ctx'> 		IWL_ERR(mvm, "failed to reassign old_ctx after failure.\n");</div><div class='ctx'> 		goto out_restart;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	goto out;</div><div class='add'>+	return ret;</div><div class='ctx'> </div><div class='ctx'> out_restart:</div><div class='ctx'> 	/* things keep failing, better restart the hw */</div><div class='del'>-	iwl_mvm_nic_restart(mvm, false);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='add'>+	iwl_force_nmi(mvm-&gt;trans);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> iwl_mvm_switch_vif_chanctx_reassign(struct iwl_mvm *mvm,</div><div class='del'>-				    struct ieee80211_vif_chanctx_switch *vifs)</div><div class='add'>+				    struct ieee80211_vif_chanctx_switch *vifs,</div><div class='add'>+				    const struct iwl_mvm_switch_vif_chanctx_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	__iwl_mvm_unassign_vif_chanctx(mvm, vifs[0].vif, vifs[0].old_ctx, true);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+	ops-&gt;__unassign_vif_chanctx(mvm, vifs[0].vif, vifs[0].link_conf,</div><div class='add'>+				    vifs[0].old_ctx, true);</div><div class='ctx'> </div><div class='del'>-	ret = __iwl_mvm_assign_vif_chanctx(mvm, vifs[0].vif, vifs[0].new_ctx,</div><div class='del'>-					   true);</div><div class='add'>+	ret = ops-&gt;__assign_vif_chanctx(mvm, vifs[0].vif, vifs[0].link_conf,</div><div class='add'>+					vifs[0].new_ctx, true);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		IWL_ERR(mvm,</div><div class='ctx'> 			"failed to assign new_ctx during channel switch\n");</div><div class='ctx'> 		goto out_reassign;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	goto out;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> out_reassign:</div><div class='del'>-	if (__iwl_mvm_assign_vif_chanctx(mvm, vifs[0].vif, vifs[0].old_ctx,</div><div class='del'>-					 true)) {</div><div class='add'>+	if (ops-&gt;__assign_vif_chanctx(mvm, vifs[0].vif, vifs[0].link_conf,</div><div class='add'>+				      vifs[0].old_ctx, true)) {</div><div class='ctx'> 		IWL_ERR(mvm, "failed to reassign old_ctx after failure.\n");</div><div class='ctx'> 		goto out_restart;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	goto out;</div><div class='add'>+	return ret;</div><div class='ctx'> </div><div class='ctx'> out_restart:</div><div class='ctx'> 	/* things keep failing, better restart the hw */</div><div class='del'>-	iwl_mvm_nic_restart(mvm, false);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='add'>+	iwl_force_nmi(mvm-&gt;trans);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_switch_vif_chanctx(struct ieee80211_hw *hw,</div><div class='del'>-				      struct ieee80211_vif_chanctx_switch *vifs,</div><div class='del'>-				      int n_vifs,</div><div class='del'>-				      enum ieee80211_chanctx_switch_mode mode)</div><div class='add'>+/* Execute the common part for both MLD and non-MLD modes */</div><div class='add'>+int</div><div class='add'>+iwl_mvm_switch_vif_chanctx_common(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif_chanctx_switch *vifs,</div><div class='add'>+				  int n_vifs,</div><div class='add'>+				  enum ieee80211_chanctx_switch_mode mode,</div><div class='add'>+				  const struct iwl_mvm_switch_vif_chanctx_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -4382,10 +5356,10 @@ static int iwl_mvm_switch_vif_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case CHANCTX_SWMODE_SWAP_CONTEXTS:</div><div class='del'>-		ret = iwl_mvm_switch_vif_chanctx_swap(mvm, vifs);</div><div class='add'>+		ret = iwl_mvm_switch_vif_chanctx_swap(mvm, vifs, ops);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CHANCTX_SWMODE_REASSIGN_VIF:</div><div class='del'>-		ret = iwl_mvm_switch_vif_chanctx_reassign(mvm, vifs);</div><div class='add'>+		ret = iwl_mvm_switch_vif_chanctx_reassign(mvm, vifs, ops);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -EOPNOTSUPP;</div><div class='hunk'>@@ -4395,15 +5369,27 @@ static int iwl_mvm_switch_vif_chanctx(struct ieee80211_hw *hw,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_tx_last_beacon(struct ieee80211_hw *hw)</div><div class='add'>+static int iwl_mvm_switch_vif_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+				      struct ieee80211_vif_chanctx_switch *vifs,</div><div class='add'>+				      int n_vifs,</div><div class='add'>+				      enum ieee80211_chanctx_switch_mode mode)</div><div class='add'>+{</div><div class='add'>+	static const struct iwl_mvm_switch_vif_chanctx_ops ops = {</div><div class='add'>+		.__assign_vif_chanctx = __iwl_mvm_assign_vif_chanctx,</div><div class='add'>+		.__unassign_vif_chanctx = __iwl_mvm_unassign_vif_chanctx,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_switch_vif_chanctx_common(hw, vifs, n_vifs, mode, &amp;ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_tx_last_beacon(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> </div><div class='ctx'> 	return mvm-&gt;ibss_manager;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_set_tim(struct ieee80211_hw *hw,</div><div class='del'>-			   struct ieee80211_sta *sta,</div><div class='add'>+static int iwl_mvm_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta,</div><div class='ctx'> 			   bool set)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='hunk'>@@ -4414,80 +5400,12 @@ static int iwl_mvm_set_tim(struct ieee80211_hw *hw,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return iwl_mvm_mac_ctxt_beacon_changed(mvm, mvm_sta-&gt;vif);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_NL80211_TESTMODE</div><div class='del'>-static const struct nla_policy iwl_mvm_tm_policy[IWL_MVM_TM_ATTR_MAX + 1] = {</div><div class='del'>-	[IWL_MVM_TM_ATTR_CMD] = { .type = NLA_U32 },</div><div class='del'>-	[IWL_MVM_TM_ATTR_NOA_DURATION] = { .type = NLA_U32 },</div><div class='del'>-	[IWL_MVM_TM_ATTR_BEACON_FILTER_STATE] = { .type = NLA_U32 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __iwl_mvm_mac_testmode_cmd(struct iwl_mvm *mvm,</div><div class='del'>-				      struct ieee80211_vif *vif,</div><div class='del'>-				      void *data, int len)</div><div class='del'>-{</div><div class='del'>-	struct nlattr *tb[IWL_MVM_TM_ATTR_MAX + 1];</div><div class='del'>-	int err;</div><div class='del'>-	u32 noa_duration;</div><div class='del'>-</div><div class='del'>-	err = nla_parse_deprecated(tb, IWL_MVM_TM_ATTR_MAX, data, len,</div><div class='del'>-				   iwl_mvm_tm_policy, NULL);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (!tb[IWL_MVM_TM_ATTR_CMD])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	switch (nla_get_u32(tb[IWL_MVM_TM_ATTR_CMD])) {</div><div class='del'>-	case IWL_MVM_TM_CMD_SET_NOA:</div><div class='del'>-		if (!vif || vif-&gt;type != NL80211_IFTYPE_AP || !vif-&gt;p2p ||</div><div class='del'>-		    !vif-&gt;bss_conf.enable_beacon ||</div><div class='del'>-		    !tb[IWL_MVM_TM_ATTR_NOA_DURATION])</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		noa_duration = nla_get_u32(tb[IWL_MVM_TM_ATTR_NOA_DURATION]);</div><div class='del'>-		if (noa_duration &gt;= vif-&gt;bss_conf.beacon_int)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		mvm-&gt;noa_duration = noa_duration;</div><div class='del'>-		mvm-&gt;noa_vif = vif;</div><div class='del'>-</div><div class='del'>-		return iwl_mvm_update_quotas(mvm, true, NULL);</div><div class='del'>-	case IWL_MVM_TM_CMD_SET_BEACON_FILTER:</div><div class='del'>-		/* must be associated client vif - ignore authorized */</div><div class='del'>-		if (!vif || vif-&gt;type != NL80211_IFTYPE_STATION ||</div><div class='del'>-		    !vif-&gt;bss_conf.assoc || !vif-&gt;bss_conf.dtim_period ||</div><div class='del'>-		    !tb[IWL_MVM_TM_ATTR_BEACON_FILTER_STATE])</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		if (nla_get_u32(tb[IWL_MVM_TM_ATTR_BEACON_FILTER_STATE]))</div><div class='del'>-			return iwl_mvm_enable_beacon_filter(mvm, vif, 0);</div><div class='del'>-		return iwl_mvm_disable_beacon_filter(mvm, vif, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='add'>+	return iwl_mvm_mac_ctxt_beacon_changed(mvm, mvm_sta-&gt;vif,</div><div class='add'>+					       &amp;mvm_sta-&gt;vif-&gt;bss_conf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_mac_testmode_cmd(struct ieee80211_hw *hw,</div><div class='del'>-				    struct ieee80211_vif *vif,</div><div class='del'>-				    void *data, int len)</div><div class='del'>-{</div><div class='del'>-	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	err = __iwl_mvm_mac_testmode_cmd(mvm, vif, data, len);</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void iwl_mvm_channel_switch(struct ieee80211_hw *hw,</div><div class='del'>-				   struct ieee80211_vif *vif,</div><div class='del'>-				   struct ieee80211_channel_switch *chsw)</div><div class='add'>+void iwl_mvm_channel_switch(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			    struct ieee80211_channel_switch *chsw)</div><div class='ctx'> {</div><div class='ctx'> 	/* By implementing this operation, we prevent mac80211 from</div><div class='ctx'> 	 * starting its own channel switch timer, so that we can call</div><div class='hunk'>@@ -4548,8 +5466,8 @@ static int iwl_mvm_old_pre_chan_sw_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 	if (chsw-&gt;block_tx)</div><div class='ctx'> 		iwl_mvm_csa_client_absent(mvm, vif);</div><div class='ctx'> </div><div class='del'>-	if (mvmvif-&gt;bf_data.bf_enabled) {</div><div class='del'>-		int ret = iwl_mvm_disable_beacon_filter(mvm, vif, 0);</div><div class='add'>+	if (mvmvif-&gt;bf_enabled) {</div><div class='add'>+		int ret = iwl_mvm_disable_beacon_filter(mvm, vif);</div><div class='ctx'> </div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -4561,19 +5479,32 @@ static int iwl_mvm_old_pre_chan_sw_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void iwl_mvm_csa_block_txqs(void *data, struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(sta-&gt;txq); i++) {</div><div class='add'>+		struct iwl_mvm_txq *mvmtxq =</div><div class='add'>+			iwl_mvm_txq_from_mac80211(sta-&gt;txq[i]);</div><div class='add'>+</div><div class='add'>+		set_bit(IWL_MVM_TXQ_STATE_STOP_AP_CSA, &amp;mvmtxq-&gt;state);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define IWL_MAX_CSA_BLOCK_TX 1500</div><div class='del'>-static int iwl_mvm_pre_channel_switch(struct ieee80211_hw *hw,</div><div class='add'>+static int iwl_mvm_pre_channel_switch(struct iwl_mvm *mvm,</div><div class='ctx'> 				      struct ieee80211_vif *vif,</div><div class='ctx'> 				      struct ieee80211_channel_switch *chsw)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	struct ieee80211_vif *csa_vif;</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm_txq *mvmtxq;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	mvmvif-&gt;csa_failed = false;</div><div class='add'>+	mvmvif-&gt;csa_blocks_tx = false;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_MAC80211(mvm, "pre CSA to freq %d\n",</div><div class='ctx'> 			   chsw-&gt;chandef.center_freq1);</div><div class='hunk'>@@ -4587,42 +5518,58 @@ static int iwl_mvm_pre_channel_switch(struct ieee80211_hw *hw,</div><div class='ctx'> 		csa_vif =</div><div class='ctx'> 			rcu_dereference_protected(mvm-&gt;csa_vif,</div><div class='ctx'> 						  lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='del'>-		if (WARN_ONCE(csa_vif &amp;&amp; csa_vif-&gt;csa_active,</div><div class='del'>-			      "Another CSA is already in progress")) {</div><div class='del'>-			ret = -EBUSY;</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		}</div><div class='add'>+		if (WARN_ONCE(csa_vif &amp;&amp; csa_vif-&gt;bss_conf.csa_active,</div><div class='add'>+			      "Another CSA is already in progress"))</div><div class='add'>+			return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 		/* we still didn't unblock tx. prevent new CS meanwhile */</div><div class='ctx'> 		if (rcu_dereference_protected(mvm-&gt;csa_tx_blocked_vif,</div><div class='del'>-					      lockdep_is_held(&amp;mvm-&gt;mutex))) {</div><div class='del'>-			ret = -EBUSY;</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		}</div><div class='add'>+					      lockdep_is_held(&amp;mvm-&gt;mutex)))</div><div class='add'>+			return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 		rcu_assign_pointer(mvm-&gt;csa_vif, vif);</div><div class='ctx'> </div><div class='ctx'> 		if (WARN_ONCE(mvmvif-&gt;csa_countdown,</div><div class='del'>-			      "Previous CSA countdown didn't complete")) {</div><div class='del'>-			ret = -EBUSY;</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		}</div><div class='add'>+			      "Previous CSA countdown didn't complete"))</div><div class='add'>+			return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 		mvmvif-&gt;csa_target_freq = chsw-&gt;chandef.chan-&gt;center_freq;</div><div class='ctx'> </div><div class='add'>+		if (!chsw-&gt;block_tx)</div><div class='add'>+			break;</div><div class='add'>+		/* don't need blocking in driver otherwise - mac80211 will do */</div><div class='add'>+		if (!ieee80211_hw_check(mvm-&gt;hw, HANDLES_QUIET_CSA))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		mvmvif-&gt;csa_blocks_tx = true;</div><div class='add'>+		mvmtxq = iwl_mvm_txq_from_mac80211(vif-&gt;txq);</div><div class='add'>+		set_bit(IWL_MVM_TXQ_STATE_STOP_AP_CSA, &amp;mvmtxq-&gt;state);</div><div class='add'>+		ieee80211_iterate_stations_atomic(mvm-&gt;hw,</div><div class='add'>+						  iwl_mvm_csa_block_txqs,</div><div class='add'>+						  NULL);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_STATION:</div><div class='add'>+		mvmvif-&gt;csa_blocks_tx = chsw-&gt;block_tx;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * In the new flow FW is in charge of timing the switch so there</div><div class='add'>+		 * is no need for all of this</div><div class='add'>+		 */</div><div class='add'>+		if (iwl_fw_lookup_notif_ver(mvm-&gt;fw, MAC_CONF_GROUP,</div><div class='add'>+					    CHANNEL_SWITCH_ERROR_NOTIF,</div><div class='add'>+					    0))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We haven't configured the firmware to be associated yet since</div><div class='ctx'> 		 * we don't know the dtim period. In this case, the firmware can't</div><div class='ctx'> 		 * track the beacons.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!vif-&gt;bss_conf.assoc || !vif-&gt;bss_conf.dtim_period) {</div><div class='del'>-			ret = -EBUSY;</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		}</div><div class='add'>+		if (!vif-&gt;cfg.assoc || !vif-&gt;bss_conf.dtim_period)</div><div class='add'>+			return -EBUSY;</div><div class='ctx'> </div><div class='del'>-		if (chsw-&gt;delay &gt; IWL_MAX_CSA_BLOCK_TX)</div><div class='add'>+		if (chsw-&gt;delay &gt; IWL_MAX_CSA_BLOCK_TX &amp;&amp;</div><div class='add'>+		    hweight16(vif-&gt;valid_links) &lt;= 1)</div><div class='ctx'> 			schedule_delayed_work(&amp;mvmvif-&gt;csa_work, 0);</div><div class='ctx'> </div><div class='ctx'> 		if (chsw-&gt;block_tx) {</div><div class='hunk'>@@ -4641,7 +5588,7 @@ static int iwl_mvm_pre_channel_switch(struct ieee80211_hw *hw,</div><div class='ctx'> 				 IWL_UCODE_TLV_CAPA_CHANNEL_SWITCH_CMD)) {</div><div class='ctx'> 			ret = iwl_mvm_old_pre_chan_sw_sta(mvm, vif, chsw);</div><div class='ctx'> 			if (ret)</div><div class='del'>-				goto out_unlock;</div><div class='add'>+				return ret;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			iwl_mvm_schedule_client_csa(mvm, vif, chsw);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4657,20 +5604,27 @@ static int iwl_mvm_pre_channel_switch(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_mvm_power_update_ps(mvm);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* we won't be on this channel any longer */</div><div class='ctx'> 	iwl_mvm_teardown_tdls_peers(mvm);</div><div class='ctx'> </div><div class='del'>-out_unlock:</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_channel_switch_rx_beacon(struct ieee80211_hw *hw,</div><div class='del'>-					     struct ieee80211_vif *vif,</div><div class='del'>-					     struct ieee80211_channel_switch *chsw)</div><div class='add'>+int iwl_mvm_mac_pre_channel_switch(struct ieee80211_hw *hw,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_channel_switch *chsw)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+	return iwl_mvm_pre_channel_switch(mvm, vif, chsw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_channel_switch_rx_beacon(struct ieee80211_hw *hw,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      struct ieee80211_channel_switch *chsw)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='hunk'>@@ -4683,14 +5637,33 @@ static void iwl_mvm_channel_switch_rx_beacon(struct ieee80211_hw *hw,</div><div class='ctx'> 		.cs_mode = chsw-&gt;block_tx,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * In the new flow FW is in charge of timing the switch so there is no</div><div class='add'>+	 * need for all of this</div><div class='add'>+	 */</div><div class='add'>+	if (iwl_fw_lookup_notif_ver(mvm-&gt;fw, MAC_CONF_GROUP,</div><div class='add'>+				    CHANNEL_SWITCH_ERROR_NOTIF, 0))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (!fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa, IWL_UCODE_TLV_CAPA_CS_MODIFY))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	IWL_DEBUG_MAC80211(mvm, "Modify CSA on mac %d count = %d (old %d) mode = %d\n",</div><div class='add'>+			   mvmvif-&gt;id, chsw-&gt;count, mvmvif-&gt;csa_count, chsw-&gt;block_tx);</div><div class='add'>+</div><div class='ctx'> 	if (chsw-&gt;count &gt;= mvmvif-&gt;csa_count &amp;&amp; chsw-&gt;block_tx) {</div><div class='ctx'> 		if (mvmvif-&gt;csa_misbehave) {</div><div class='add'>+			struct ieee80211_bss_conf *link_conf;</div><div class='add'>+</div><div class='ctx'> 			/* Second time, give up on this AP*/</div><div class='del'>-			iwl_mvm_abort_channel_switch(hw, vif);</div><div class='del'>-			ieee80211_chswitch_done(vif, false);</div><div class='add'>+</div><div class='add'>+			link_conf = wiphy_dereference(hw-&gt;wiphy,</div><div class='add'>+						      vif-&gt;link_conf[chsw-&gt;link_id]);</div><div class='add'>+			if (WARN_ON(!link_conf))</div><div class='add'>+				return;</div><div class='add'>+</div><div class='add'>+			iwl_mvm_abort_channel_switch(hw, vif, link_conf);</div><div class='add'>+			ieee80211_chswitch_done(vif, false, 0);</div><div class='ctx'> 			mvmvif-&gt;csa_misbehave = false;</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4698,18 +5671,14 @@ static void iwl_mvm_channel_switch_rx_beacon(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> 	mvmvif-&gt;csa_count = chsw-&gt;count;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> 	if (mvmvif-&gt;csa_failed)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_MAC80211(mvm, "Modify CSA on mac %d count = %d mode = %d\n",</div><div class='del'>-			   mvmvif-&gt;id, chsw-&gt;count, chsw-&gt;block_tx);</div><div class='ctx'> 	WARN_ON(iwl_mvm_send_cmd_pdu(mvm,</div><div class='ctx'> 				     WIDE_ID(MAC_CONF_GROUP,</div><div class='ctx'> 					     CHANNEL_SWITCH_TIME_EVENT_CMD),</div><div class='ctx'> 				     0, sizeof(cmd), &amp;cmd));</div><div class='del'>-out_unlock:</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_flush_no_vif(struct iwl_mvm *mvm, u32 queues, bool drop)</div><div class='hunk'>@@ -4717,18 +5686,21 @@ static void iwl_mvm_flush_no_vif(struct iwl_mvm *mvm, u32 queues, bool drop)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!iwl_mvm_has_new_tx_api(mvm)) {</div><div class='add'>+		/* we can't ask the firmware anything if it is dead */</div><div class='add'>+		if (test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED,</div><div class='add'>+			     &amp;mvm-&gt;status))</div><div class='add'>+			return;</div><div class='ctx'> 		if (drop) {</div><div class='del'>-			mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+			guard(mvm)(mvm);</div><div class='ctx'> 			iwl_mvm_flush_tx_path(mvm,</div><div class='ctx'> 				iwl_mvm_flushable_queues(mvm) &amp; queues);</div><div class='del'>-			mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			iwl_trans_wait_tx_queues_empty(mvm-&gt;trans, queues);</div><div class='ctx'> 		}</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> 	for (i = 0; i &lt; mvm-&gt;fw-&gt;ucode_capa.num_stations; i++) {</div><div class='ctx'> 		struct ieee80211_sta *sta;</div><div class='ctx'> </div><div class='hunk'>@@ -4743,16 +5715,16 @@ static void iwl_mvm_flush_no_vif(struct iwl_mvm *mvm, u32 queues, bool drop)</div><div class='ctx'> 			iwl_mvm_wait_sta_queues_empty(mvm,</div><div class='ctx'> 					iwl_mvm_sta_from_mac80211(sta));</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_mac_flush(struct ieee80211_hw *hw,</div><div class='del'>-			      struct ieee80211_vif *vif, u32 queues, bool drop)</div><div class='add'>+void iwl_mvm_mac_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		       u32 queues, bool drop)</div><div class='ctx'> {</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='del'>-	struct iwl_mvm_vif *mvmvif;</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta;</div><div class='ctx'> 	struct ieee80211_sta *sta;</div><div class='add'>+	bool ap_sta_done = false;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 msk = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -4761,14 +5733,22 @@ static void iwl_mvm_mac_flush(struct ieee80211_hw *hw,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='del'>-		return;</div><div class='add'>+	if (!drop &amp;&amp; hweight16(vif-&gt;active_links) &lt;= 1) {</div><div class='add'>+		int link_id = vif-&gt;active_links ? __ffs(vif-&gt;active_links) : 0;</div><div class='add'>+		struct ieee80211_bss_conf *link_conf;</div><div class='add'>+</div><div class='add'>+		link_conf = wiphy_dereference(hw-&gt;wiphy,</div><div class='add'>+					      vif-&gt;link_conf[link_id]);</div><div class='add'>+		if (WARN_ON(!link_conf))</div><div class='add'>+			return;</div><div class='add'>+		if (link_conf-&gt;csa_active &amp;&amp; mvmvif-&gt;csa_blocks_tx)</div><div class='add'>+			drop = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure we're done with the deferred traffic before flushing */</div><div class='ctx'> 	flush_work(&amp;mvm-&gt;add_stream_wk);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> </div><div class='ctx'> 	/* flush the AP-station and all TDLS peers */</div><div class='ctx'> 	for (i = 0; i &lt; mvm-&gt;fw-&gt;ucode_capa.num_stations; i++) {</div><div class='hunk'>@@ -4781,16 +5761,21 @@ static void iwl_mvm_mac_flush(struct ieee80211_hw *hw,</div><div class='ctx'> 		if (mvmsta-&gt;vif != vif)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		/* make sure only TDLS peers or the AP are flushed */</div><div class='del'>-		WARN_ON(i != mvmvif-&gt;ap_sta_id &amp;&amp; !sta-&gt;tdls);</div><div class='add'>+		if (sta == mvmvif-&gt;ap_sta) {</div><div class='add'>+			if (ap_sta_done)</div><div class='add'>+				continue;</div><div class='add'>+			ap_sta_done = true;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (drop) {</div><div class='del'>-			if (iwl_mvm_flush_sta(mvm, mvmsta, false))</div><div class='add'>+			if (iwl_mvm_flush_sta(mvm, mvmsta-&gt;deflink.sta_id,</div><div class='add'>+					      mvmsta-&gt;tfd_queue_msk))</div><div class='ctx'> 				IWL_ERR(mvm, "flush request fail\n");</div><div class='ctx'> 		} else {</div><div class='del'>-			msk |= mvmsta-&gt;tfd_queue_msk;</div><div class='ctx'> 			if (iwl_mvm_has_new_tx_api(mvm))</div><div class='ctx'> 				iwl_mvm_wait_sta_queues_empty(mvm, mvmsta);</div><div class='add'>+			else /* only used for !iwl_mvm_has_new_tx_api() below */</div><div class='add'>+				msk |= mvmsta-&gt;tfd_queue_msk;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4798,42 +5783,129 @@ static void iwl_mvm_mac_flush(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	/* this can take a while, and we may need/want other operations</div><div class='ctx'> 	 * to succeed while doing this, so do it without the mutex held</div><div class='add'>+	 * If the firmware is dead, this can't work...</div><div class='ctx'> 	 */</div><div class='del'>-	if (!drop &amp;&amp; !iwl_mvm_has_new_tx_api(mvm))</div><div class='add'>+	if (!drop &amp;&amp; !iwl_mvm_has_new_tx_api(mvm) &amp;&amp;</div><div class='add'>+	    !test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED,</div><div class='add'>+		      &amp;mvm-&gt;status))</div><div class='ctx'> 		iwl_trans_wait_tx_queues_empty(mvm-&gt;trans, msk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_mac_get_survey(struct ieee80211_hw *hw, int idx,</div><div class='del'>-				  struct survey_info *survey)</div><div class='add'>+void iwl_mvm_mac_flush_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			   struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='add'>+	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+	struct iwl_mvm_link_sta *mvm_link_sta;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	int link_id;</div><div class='add'>+</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+	for_each_sta_active_link(vif, sta, link_sta, link_id) {</div><div class='add'>+		mvm_link_sta = rcu_dereference_protected(mvmsta-&gt;link[link_id],</div><div class='add'>+							 lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+		if (!mvm_link_sta)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (iwl_mvm_flush_sta(mvm, mvm_link_sta-&gt;sta_id,</div><div class='add'>+				      mvmsta-&gt;tfd_queue_msk))</div><div class='add'>+			IWL_ERR(mvm, "flush request fail\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mac_get_acs_survey(struct iwl_mvm *mvm, int idx,</div><div class='add'>+				      struct survey_info *survey)</div><div class='add'>+{</div><div class='add'>+	int chan_idx;</div><div class='add'>+	enum nl80211_band band;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	memset(survey, 0, sizeof(*survey));</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	/* only support global statistics right now */</div><div class='del'>-	if (idx != 0)</div><div class='del'>-		return -ENOENT;</div><div class='add'>+	if (!mvm-&gt;acs_survey) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Find and return the next entry that has a non-zero active time */</div><div class='add'>+	for (band = 0; band &lt; NUM_NL80211_BANDS; band++) {</div><div class='add'>+		struct ieee80211_supported_band *sband =</div><div class='add'>+			mvm-&gt;hw-&gt;wiphy-&gt;bands[band];</div><div class='add'>+</div><div class='add'>+		if (!sband)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (chan_idx = 0; chan_idx &lt; sband-&gt;n_channels; chan_idx++) {</div><div class='add'>+			struct iwl_mvm_acs_survey_channel *info =</div><div class='add'>+				&amp;mvm-&gt;acs_survey-&gt;bands[band][chan_idx];</div><div class='add'>+</div><div class='add'>+			if (!info-&gt;time)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			/* Found (the next) channel to report */</div><div class='add'>+			survey-&gt;channel = &amp;sband-&gt;channels[chan_idx];</div><div class='add'>+			survey-&gt;filled = SURVEY_INFO_TIME |</div><div class='add'>+					 SURVEY_INFO_TIME_BUSY |</div><div class='add'>+					 SURVEY_INFO_TIME_RX |</div><div class='add'>+					 SURVEY_INFO_TIME_TX;</div><div class='add'>+			survey-&gt;time = info-&gt;time;</div><div class='add'>+			survey-&gt;time_busy = info-&gt;time_busy;</div><div class='add'>+			survey-&gt;time_rx = info-&gt;time_rx;</div><div class='add'>+			survey-&gt;time_tx = info-&gt;time_tx;</div><div class='add'>+			survey-&gt;noise = info-&gt;noise;</div><div class='add'>+			if (survey-&gt;noise &lt; 0)</div><div class='add'>+				survey-&gt;filled |= SURVEY_INFO_NOISE_DBM;</div><div class='add'>+</div><div class='add'>+			/* Clear time so that channel is only reported once */</div><div class='add'>+			info-&gt;time = 0;</div><div class='add'>+</div><div class='add'>+			ret = 0;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = -ENOENT;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_mac_get_survey(struct ieee80211_hw *hw, int idx,</div><div class='add'>+			   struct survey_info *survey)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw,</div><div class='add'>+					   WIDE_ID(SYSTEM_GROUP,</div><div class='add'>+						   SYSTEM_STATISTICS_CMD),</div><div class='add'>+					   IWL_FW_CMD_VER_UNKNOWN);</div><div class='add'>+</div><div class='add'>+	memset(survey, 0, sizeof(*survey));</div><div class='ctx'> </div><div class='ctx'> 	if (!fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 			 IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS))</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	/*</div><div class='add'>+	 * Return the beacon stats at index zero and pass on following indices</div><div class='add'>+	 * to the function returning the full survey, most likely for ACS</div><div class='add'>+	 * (Automatic Channel Selection).</div><div class='add'>+	 */</div><div class='add'>+	if (idx &gt; 0)</div><div class='add'>+		return iwl_mvm_mac_get_acs_survey(mvm, idx - 1, survey);</div><div class='add'>+</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_mvm_firmware_running(mvm)) {</div><div class='del'>-		ret = iwl_mvm_request_statistics(mvm, false);</div><div class='add'>+		int ret = iwl_mvm_request_statistics(mvm, false);</div><div class='add'>+</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	survey-&gt;filled = SURVEY_INFO_TIME |</div><div class='del'>-			 SURVEY_INFO_TIME_RX |</div><div class='del'>-			 SURVEY_INFO_TIME_TX |</div><div class='del'>-			 SURVEY_INFO_TIME_SCAN;</div><div class='del'>-	survey-&gt;time = mvm-&gt;accu_radio_stats.on_time_rf +</div><div class='del'>-		       mvm-&gt;radio_stats.on_time_rf;</div><div class='del'>-	do_div(survey-&gt;time, USEC_PER_MSEC);</div><div class='add'>+	survey-&gt;filled = SURVEY_INFO_TIME_RX |</div><div class='add'>+			 SURVEY_INFO_TIME_TX;</div><div class='ctx'> </div><div class='ctx'> 	survey-&gt;time_rx = mvm-&gt;accu_radio_stats.rx_time +</div><div class='ctx'> 			  mvm-&gt;radio_stats.rx_time;</div><div class='hunk'>@@ -4843,18 +5915,28 @@ static int iwl_mvm_mac_get_survey(struct ieee80211_hw *hw, int idx,</div><div class='ctx'> 			  mvm-&gt;radio_stats.tx_time;</div><div class='ctx'> 	do_div(survey-&gt;time_tx, USEC_PER_MSEC);</div><div class='ctx'> </div><div class='add'>+	/* the new fw api doesn't support the following fields */</div><div class='add'>+	if (cmd_ver != IWL_FW_CMD_VER_UNKNOWN)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	survey-&gt;filled |= SURVEY_INFO_TIME |</div><div class='add'>+			  SURVEY_INFO_TIME_SCAN;</div><div class='add'>+	survey-&gt;time = mvm-&gt;accu_radio_stats.on_time_rf +</div><div class='add'>+		       mvm-&gt;radio_stats.on_time_rf;</div><div class='add'>+	do_div(survey-&gt;time, USEC_PER_MSEC);</div><div class='add'>+</div><div class='ctx'> 	survey-&gt;time_scan = mvm-&gt;accu_radio_stats.on_time_scan +</div><div class='ctx'> 			    mvm-&gt;radio_stats.on_time_scan;</div><div class='ctx'> 	do_div(survey-&gt;time_scan, USEC_PER_MSEC);</div><div class='ctx'> </div><div class='del'>-	ret = 0;</div><div class='del'>- out:</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_set_sta_rate(u32 rate_n_flags, struct rate_info *rinfo)</div><div class='ctx'> {</div><div class='add'>+	u32 format = rate_n_flags &amp; RATE_MCS_MOD_TYPE_MSK;</div><div class='add'>+	u32 gi_ltf;</div><div class='add'>+</div><div class='ctx'> 	switch (rate_n_flags &amp; RATE_MCS_CHAN_WIDTH_MSK) {</div><div class='ctx'> 	case RATE_MCS_CHAN_WIDTH_20:</div><div class='ctx'> 		rinfo-&gt;bw = RATE_INFO_BW_20;</div><div class='hunk'>@@ -4868,32 +5950,77 @@ static void iwl_mvm_set_sta_rate(u32 rate_n_flags, struct rate_info *rinfo)</div><div class='ctx'> 	case RATE_MCS_CHAN_WIDTH_160:</div><div class='ctx'> 		rinfo-&gt;bw = RATE_INFO_BW_160;</div><div class='ctx'> 		break;</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_320:</div><div class='add'>+		rinfo-&gt;bw = RATE_INFO_BW_320;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_HT_MSK) {</div><div class='del'>-		rinfo-&gt;flags |= RATE_INFO_FLAGS_MCS;</div><div class='del'>-		rinfo-&gt;mcs = u32_get_bits(rate_n_flags, RATE_HT_MCS_INDEX_MSK);</div><div class='del'>-		rinfo-&gt;nss = u32_get_bits(rate_n_flags,</div><div class='del'>-					  RATE_HT_MCS_NSS_MSK) + 1;</div><div class='del'>-		if (rate_n_flags &amp; RATE_MCS_SGI_MSK)</div><div class='del'>-			rinfo-&gt;flags |= RATE_INFO_FLAGS_SHORT_GI;</div><div class='del'>-	} else if (rate_n_flags &amp; RATE_MCS_VHT_MSK) {</div><div class='del'>-		rinfo-&gt;flags |= RATE_INFO_FLAGS_VHT_MCS;</div><div class='del'>-		rinfo-&gt;mcs = u32_get_bits(rate_n_flags,</div><div class='del'>-					  RATE_VHT_MCS_RATE_CODE_MSK);</div><div class='del'>-		rinfo-&gt;nss = u32_get_bits(rate_n_flags,</div><div class='del'>-					  RATE_VHT_MCS_NSS_MSK) + 1;</div><div class='del'>-		if (rate_n_flags &amp; RATE_MCS_SGI_MSK)</div><div class='del'>-			rinfo-&gt;flags |= RATE_INFO_FLAGS_SHORT_GI;</div><div class='del'>-	} else if (rate_n_flags &amp; RATE_MCS_HE_MSK) {</div><div class='del'>-		u32 gi_ltf = u32_get_bits(rate_n_flags,</div><div class='del'>-					  RATE_MCS_HE_GI_LTF_MSK);</div><div class='add'>+	if (format == RATE_MCS_MOD_TYPE_CCK ||</div><div class='add'>+	    format == RATE_MCS_MOD_TYPE_LEGACY_OFDM) {</div><div class='add'>+		int rate = u32_get_bits(rate_n_flags, RATE_LEGACY_RATE_MSK);</div><div class='add'>+</div><div class='add'>+		/* add the offset needed to get to the legacy ofdm indices */</div><div class='add'>+		if (format == RATE_MCS_MOD_TYPE_LEGACY_OFDM)</div><div class='add'>+			rate += IWL_FIRST_OFDM_RATE;</div><div class='add'>+</div><div class='add'>+		switch (rate) {</div><div class='add'>+		case IWL_RATE_1M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 10;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_RATE_2M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 20;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_RATE_5M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 55;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_RATE_11M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 110;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_RATE_6M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 60;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_RATE_9M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 90;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_RATE_12M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 120;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_RATE_18M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 180;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_RATE_24M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 240;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_RATE_36M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 360;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_RATE_48M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 480;</div><div class='add'>+			break;</div><div class='add'>+		case IWL_RATE_54M_INDEX:</div><div class='add'>+			rinfo-&gt;legacy = 540;</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rinfo-&gt;nss = u32_get_bits(rate_n_flags,</div><div class='add'>+				  RATE_MCS_NSS_MSK) + 1;</div><div class='add'>+	rinfo-&gt;mcs = format == RATE_MCS_MOD_TYPE_HT ?</div><div class='add'>+		RATE_HT_MCS_INDEX(rate_n_flags) :</div><div class='add'>+		u32_get_bits(rate_n_flags, RATE_MCS_CODE_MSK);</div><div class='add'>+</div><div class='add'>+	if (rate_n_flags &amp; RATE_MCS_SGI_MSK)</div><div class='add'>+		rinfo-&gt;flags |= RATE_INFO_FLAGS_SHORT_GI;</div><div class='add'>+</div><div class='add'>+	switch (format) {</div><div class='add'>+	case RATE_MCS_MOD_TYPE_EHT:</div><div class='add'>+		/* TODO: GI/LTF/RU. How does the firmware encode them? */</div><div class='add'>+		rinfo-&gt;flags |= RATE_INFO_FLAGS_EHT_MCS;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_HE:</div><div class='add'>+		gi_ltf = u32_get_bits(rate_n_flags, RATE_MCS_HE_GI_LTF_MSK);</div><div class='ctx'> </div><div class='ctx'> 		rinfo-&gt;flags |= RATE_INFO_FLAGS_HE_MCS;</div><div class='del'>-		rinfo-&gt;mcs = u32_get_bits(rate_n_flags,</div><div class='del'>-					  RATE_VHT_MCS_RATE_CODE_MSK);</div><div class='del'>-		rinfo-&gt;nss = u32_get_bits(rate_n_flags,</div><div class='del'>-					  RATE_VHT_MCS_NSS_MSK) + 1;</div><div class='ctx'> </div><div class='ctx'> 		if (rate_n_flags &amp; RATE_MCS_HE_106T_MSK) {</div><div class='ctx'> 			rinfo-&gt;bw = RATE_INFO_BW_HE_RU;</div><div class='hunk'>@@ -4907,10 +6034,10 @@ static void iwl_mvm_set_sta_rate(u32 rate_n_flags, struct rate_info *rinfo)</div><div class='ctx'> 				rinfo-&gt;he_gi = NL80211_RATE_INFO_HE_GI_0_8;</div><div class='ctx'> 			else if (gi_ltf == 2)</div><div class='ctx'> 				rinfo-&gt;he_gi = NL80211_RATE_INFO_HE_GI_1_6;</div><div class='del'>-			else if (rate_n_flags &amp; RATE_MCS_SGI_MSK)</div><div class='del'>-				rinfo-&gt;he_gi = NL80211_RATE_INFO_HE_GI_0_8;</div><div class='del'>-			else</div><div class='add'>+			else if (gi_ltf == 3)</div><div class='ctx'> 				rinfo-&gt;he_gi = NL80211_RATE_INFO_HE_GI_3_2;</div><div class='add'>+			else</div><div class='add'>+				rinfo-&gt;he_gi = NL80211_RATE_INFO_HE_GI_0_8;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case RATE_MCS_HE_TYPE_MU:</div><div class='ctx'> 			if (gi_ltf == 0 || gi_ltf == 1)</div><div class='hunk'>@@ -4930,64 +6057,33 @@ static void iwl_mvm_set_sta_rate(u32 rate_n_flags, struct rate_info *rinfo)</div><div class='ctx'> </div><div class='ctx'> 		if (rate_n_flags &amp; RATE_HE_DUAL_CARRIER_MODE_MSK)</div><div class='ctx'> 			rinfo-&gt;he_dcm = 1;</div><div class='del'>-	} else {</div><div class='del'>-		switch (u32_get_bits(rate_n_flags, RATE_LEGACY_RATE_MSK)) {</div><div class='del'>-		case IWL_RATE_1M_PLCP:</div><div class='del'>-			rinfo-&gt;legacy = 10;</div><div class='del'>-			break;</div><div class='del'>-		case IWL_RATE_2M_PLCP:</div><div class='del'>-			rinfo-&gt;legacy = 20;</div><div class='del'>-			break;</div><div class='del'>-		case IWL_RATE_5M_PLCP:</div><div class='del'>-			rinfo-&gt;legacy = 55;</div><div class='del'>-			break;</div><div class='del'>-		case IWL_RATE_11M_PLCP:</div><div class='del'>-			rinfo-&gt;legacy = 110;</div><div class='del'>-			break;</div><div class='del'>-		case IWL_RATE_6M_PLCP:</div><div class='del'>-			rinfo-&gt;legacy = 60;</div><div class='del'>-			break;</div><div class='del'>-		case IWL_RATE_9M_PLCP:</div><div class='del'>-			rinfo-&gt;legacy = 90;</div><div class='del'>-			break;</div><div class='del'>-		case IWL_RATE_12M_PLCP:</div><div class='del'>-			rinfo-&gt;legacy = 120;</div><div class='del'>-			break;</div><div class='del'>-		case IWL_RATE_18M_PLCP:</div><div class='del'>-			rinfo-&gt;legacy = 180;</div><div class='del'>-			break;</div><div class='del'>-		case IWL_RATE_24M_PLCP:</div><div class='del'>-			rinfo-&gt;legacy = 240;</div><div class='del'>-			break;</div><div class='del'>-		case IWL_RATE_36M_PLCP:</div><div class='del'>-			rinfo-&gt;legacy = 360;</div><div class='del'>-			break;</div><div class='del'>-		case IWL_RATE_48M_PLCP:</div><div class='del'>-			rinfo-&gt;legacy = 480;</div><div class='del'>-			break;</div><div class='del'>-		case IWL_RATE_54M_PLCP:</div><div class='del'>-			rinfo-&gt;legacy = 540;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_HT:</div><div class='add'>+		rinfo-&gt;flags |= RATE_INFO_FLAGS_MCS;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_VHT:</div><div class='add'>+		rinfo-&gt;flags |= RATE_INFO_FLAGS_VHT_MCS;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_mac_sta_statistics(struct ieee80211_hw *hw,</div><div class='del'>-				       struct ieee80211_vif *vif,</div><div class='del'>-				       struct ieee80211_sta *sta,</div><div class='del'>-				       struct station_info *sinfo)</div><div class='add'>+void iwl_mvm_mac_sta_statistics(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_sta *sta,</div><div class='add'>+				struct station_info *sinfo)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	if (mvmsta-&gt;avg_energy) {</div><div class='del'>-		sinfo-&gt;signal_avg = -(s8)mvmsta-&gt;avg_energy;</div><div class='add'>+	if (mvmsta-&gt;deflink.avg_energy) {</div><div class='add'>+		sinfo-&gt;signal_avg = -(s8)mvmsta-&gt;deflink.avg_energy;</div><div class='ctx'> 		sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_mvm_has_tlc_offload(mvm)) {</div><div class='del'>-		struct iwl_lq_sta_rs_fw *lq_sta = &amp;mvmsta-&gt;lq_sta.rs_fw;</div><div class='add'>+		struct iwl_lq_sta_rs_fw *lq_sta = &amp;mvmsta-&gt;deflink.lq_sta.rs_fw;</div><div class='ctx'> </div><div class='ctx'> 		iwl_mvm_set_sta_rate(lq_sta-&gt;last_rate_n_flags, &amp;sinfo-&gt;txrate);</div><div class='ctx'> 		sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);</div><div class='hunk'>@@ -4997,49 +6093,43 @@ static void iwl_mvm_mac_sta_statistics(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (!(vif-&gt;driver_flags &amp; IEEE80211_VIF_BEACON_FILTER))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!vif-&gt;bss_conf.assoc)</div><div class='add'>+	if (!vif-&gt;cfg.assoc)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> </div><div class='del'>-	if (mvmvif-&gt;ap_sta_id != mvmsta-&gt;sta_id)</div><div class='del'>-		goto unlock;</div><div class='add'>+	if (sta != mvmvif-&gt;ap_sta)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_mvm_request_statistics(mvm, false))</div><div class='del'>-		goto unlock;</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sinfo-&gt;rx_beacon = 0;</div><div class='add'>+	for_each_mvm_vif_valid_link(mvmvif, i)</div><div class='add'>+		sinfo-&gt;rx_beacon += mvmvif-&gt;link[i]-&gt;beacon_stats.num_beacons +</div><div class='add'>+			mvmvif-&gt;link[i]-&gt;beacon_stats.accu_num_beacons;</div><div class='ctx'> </div><div class='del'>-	sinfo-&gt;rx_beacon = mvmvif-&gt;beacon_stats.num_beacons +</div><div class='del'>-			   mvmvif-&gt;beacon_stats.accu_num_beacons;</div><div class='ctx'> 	sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_BEACON_RX);</div><div class='del'>-	if (mvmvif-&gt;beacon_stats.avg_signal) {</div><div class='add'>+	if (mvmvif-&gt;deflink.beacon_stats.avg_signal) {</div><div class='ctx'> 		/* firmware only reports a value after RXing a few beacons */</div><div class='del'>-		sinfo-&gt;rx_beacon_signal_avg = mvmvif-&gt;beacon_stats.avg_signal;</div><div class='add'>+		sinfo-&gt;rx_beacon_signal_avg =</div><div class='add'>+			mvmvif-&gt;deflink.beacon_stats.avg_signal;</div><div class='ctx'> 		sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_BEACON_SIGNAL_AVG);</div><div class='ctx'> 	}</div><div class='del'>- unlock:</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_event_mlme_callback_ini(struct iwl_mvm *mvm,</div><div class='ctx'> 					    struct ieee80211_vif *vif,</div><div class='ctx'> 					    const  struct ieee80211_mlme_event *mlme)</div><div class='ctx'> {</div><div class='del'>-	if (mlme-&gt;data == ASSOC_EVENT &amp;&amp; (mlme-&gt;status == MLME_DENIED ||</div><div class='del'>-					  mlme-&gt;status == MLME_TIMEOUT)) {</div><div class='add'>+	if ((mlme-&gt;data == ASSOC_EVENT || mlme-&gt;data == AUTH_EVENT) &amp;&amp;</div><div class='add'>+	    (mlme-&gt;status == MLME_DENIED || mlme-&gt;status == MLME_TIMEOUT)) {</div><div class='ctx'> 		iwl_dbg_tlv_time_point(&amp;mvm-&gt;fwrt,</div><div class='ctx'> 				       IWL_FW_INI_TIME_POINT_ASSOC_FAILED,</div><div class='ctx'> 				       NULL);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mlme-&gt;data == AUTH_EVENT &amp;&amp; (mlme-&gt;status == MLME_DENIED ||</div><div class='del'>-					 mlme-&gt;status == MLME_TIMEOUT)) {</div><div class='del'>-		iwl_dbg_tlv_time_point(&amp;mvm-&gt;fwrt,</div><div class='del'>-				       IWL_FW_INI_TIME_POINT_EAPOL_FAILED,</div><div class='del'>-				       NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (mlme-&gt;data == DEAUTH_RX_EVENT || mlme-&gt;data == DEAUTH_TX_EVENT) {</div><div class='ctx'> 		iwl_dbg_tlv_time_point(&amp;mvm-&gt;fwrt,</div><div class='ctx'> 				       IWL_FW_INI_TIME_POINT_DEASSOC,</div><div class='hunk'>@@ -5123,9 +6213,9 @@ static void iwl_mvm_event_bar_rx_callback(struct iwl_mvm *mvm,</div><div class='ctx'> 				event-&gt;u.ba.ssn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_mac_event_callback(struct ieee80211_hw *hw,</div><div class='del'>-				       struct ieee80211_vif *vif,</div><div class='del'>-				       const struct ieee80211_event *event)</div><div class='add'>+void iwl_mvm_mac_event_callback(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				const struct ieee80211_event *event)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> </div><div class='hunk'>@@ -5145,42 +6235,42 @@ static void iwl_mvm_mac_event_callback(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define SYNC_RX_QUEUE_TIMEOUT (HZ)</div><div class='ctx'> void iwl_mvm_sync_rx_queues_internal(struct iwl_mvm *mvm,</div><div class='ctx'> 				     enum iwl_mvm_rxq_notif_type type,</div><div class='ctx'> 				     bool sync,</div><div class='ctx'> 				     const void *data, u32 size)</div><div class='ctx'> {</div><div class='del'>-	struct {</div><div class='del'>-		struct iwl_rxq_sync_cmd cmd;</div><div class='del'>-		struct iwl_mvm_internal_rxq_notif notif;</div><div class='del'>-	} __packed cmd = {</div><div class='del'>-		.cmd.rxq_mask = cpu_to_le32(BIT(mvm-&gt;trans-&gt;num_rx_queues) - 1),</div><div class='del'>-		.cmd.count =</div><div class='del'>-			cpu_to_le32(sizeof(struct iwl_mvm_internal_rxq_notif) +</div><div class='del'>-				    size),</div><div class='del'>-		.notif.type = type,</div><div class='del'>-		.notif.sync = sync,</div><div class='del'>-	};</div><div class='add'>+	DEFINE_RAW_FLEX(struct iwl_rxq_sync_cmd, cmd, payload,</div><div class='add'>+			sizeof(struct iwl_mvm_internal_rxq_notif));</div><div class='add'>+	struct iwl_mvm_internal_rxq_notif *notif =</div><div class='add'>+			(struct iwl_mvm_internal_rxq_notif *)cmd-&gt;payload;</div><div class='ctx'> 	struct iwl_host_cmd hcmd = {</div><div class='ctx'> 		.id = WIDE_ID(DATA_PATH_GROUP, TRIGGER_RX_QUEUES_NOTIF_CMD),</div><div class='del'>-		.data[0] = &amp;cmd,</div><div class='del'>-		.len[0] = sizeof(cmd),</div><div class='add'>+		.data[0] = cmd,</div><div class='add'>+		.len[0] = __struct_size(cmd),</div><div class='ctx'> 		.data[1] = data,</div><div class='ctx'> 		.len[1] = size,</div><div class='del'>-		.flags = sync ? 0 : CMD_ASYNC,</div><div class='add'>+		.flags = CMD_SEND_IN_RFKILL | (sync ? 0 : CMD_ASYNC),</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	cmd-&gt;rxq_mask = cpu_to_le32(BIT(mvm-&gt;trans-&gt;info.num_rxqs) - 1);</div><div class='add'>+	cmd-&gt;count = cpu_to_le32(sizeof(struct iwl_mvm_internal_rxq_notif) +</div><div class='add'>+				 size);</div><div class='add'>+	notif-&gt;type = type;</div><div class='add'>+	notif-&gt;sync = sync;</div><div class='add'>+</div><div class='ctx'> 	/* size must be a multiple of DWORD */</div><div class='del'>-	if (WARN_ON(cmd.cmd.count &amp; cpu_to_le32(3)))</div><div class='add'>+	if (WARN_ON(cmd-&gt;count &amp; cpu_to_le32(3)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!iwl_mvm_has_new_rx_api(mvm))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (sync) {</div><div class='del'>-		cmd.notif.cookie = mvm-&gt;queue_sync_cookie;</div><div class='del'>-		mvm-&gt;queue_sync_state = (1 &lt;&lt; mvm-&gt;trans-&gt;num_rx_queues) - 1;</div><div class='add'>+		notif-&gt;cookie = mvm-&gt;queue_sync_cookie;</div><div class='add'>+		mvm-&gt;queue_sync_state = (1 &lt;&lt; mvm-&gt;trans-&gt;info.num_rxqs) - 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_mvm_send_cmd(mvm, &amp;hcmd);</div><div class='hunk'>@@ -5192,12 +6282,11 @@ void iwl_mvm_sync_rx_queues_internal(struct iwl_mvm *mvm,</div><div class='ctx'> 	if (sync) {</div><div class='ctx'> 		lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> 		ret = wait_event_timeout(mvm-&gt;rx_sync_waitq,</div><div class='del'>-					 READ_ONCE(mvm-&gt;queue_sync_state) == 0 ||</div><div class='del'>-					 iwl_mvm_is_radio_killed(mvm),</div><div class='del'>-					 HZ);</div><div class='del'>-		WARN_ONCE(!ret &amp;&amp; !iwl_mvm_is_radio_killed(mvm),</div><div class='del'>-			  "queue sync: failed to sync, state is 0x%lx\n",</div><div class='del'>-			  mvm-&gt;queue_sync_state);</div><div class='add'>+					 READ_ONCE(mvm-&gt;queue_sync_state) == 0,</div><div class='add'>+					 SYNC_RX_QUEUE_TIMEOUT);</div><div class='add'>+		WARN_ONCE(!ret, "queue sync: failed to sync, state is 0x%lx, cookie %d\n",</div><div class='add'>+			  mvm-&gt;queue_sync_state,</div><div class='add'>+			  mvm-&gt;queue_sync_cookie);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -5207,16 +6296,15 @@ out:</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_sync_rx_queues(struct ieee80211_hw *hw)</div><div class='add'>+void iwl_mvm_sync_rx_queues(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> 	iwl_mvm_sync_rx_queues_internal(mvm, IWL_MVM_RXQ_EMPTY, true, NULL, 0);</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='add'>+int</div><div class='ctx'> iwl_mvm_mac_get_ftm_responder_stats(struct ieee80211_hw *hw,</div><div class='ctx'> 				    struct ieee80211_vif *vif,</div><div class='ctx'> 				    struct cfg80211_ftm_responder_stats *stats)</div><div class='hunk'>@@ -5245,29 +6333,22 @@ iwl_mvm_mac_get_ftm_responder_stats(struct ieee80211_hw *hw,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_start_pmsr(struct ieee80211_hw *hw,</div><div class='del'>-			      struct ieee80211_vif *vif,</div><div class='del'>-			      struct cfg80211_pmsr_request *request)</div><div class='add'>+int iwl_mvm_start_pmsr(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		       struct cfg80211_pmsr_request *request)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	ret = iwl_mvm_ftm_start(mvm, vif, request);</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+	return iwl_mvm_ftm_start(mvm, vif, request);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_abort_pmsr(struct ieee80211_hw *hw,</div><div class='del'>-			       struct ieee80211_vif *vif,</div><div class='del'>-			       struct cfg80211_pmsr_request *request)</div><div class='add'>+void iwl_mvm_abort_pmsr(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			struct cfg80211_pmsr_request *request)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> 	iwl_mvm_ftm_abort(mvm, request);</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool iwl_mvm_can_hw_csum(struct sk_buff *skb)</div><div class='hunk'>@@ -5296,11 +6377,31 @@ static bool iwl_mvm_mac_can_aggregate(struct ieee80211_hw *hw,</div><div class='ctx'> 	return iwl_mvm_can_hw_csum(skb) == iwl_mvm_can_hw_csum(head);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int iwl_mvm_set_hw_timestamp(struct ieee80211_hw *hw,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     struct cfg80211_set_hw_timestamp *hwts)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+	u32 protocols = 0;</div><div class='add'>+</div><div class='add'>+	/* HW timestamping is only supported for a specific station */</div><div class='add'>+	if (!hwts-&gt;macaddr)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (hwts-&gt;enable)</div><div class='add'>+		protocols =</div><div class='add'>+			IWL_TIME_SYNC_PROTOCOL_TM | IWL_TIME_SYNC_PROTOCOL_FTM;</div><div class='add'>+</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+	return iwl_mvm_time_sync_config(mvm, hwts-&gt;macaddr, protocols);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct ieee80211_ops iwl_mvm_hw_ops = {</div><div class='ctx'> 	.tx = iwl_mvm_mac_tx,</div><div class='ctx'> 	.wake_tx_queue = iwl_mvm_mac_wake_tx_queue,</div><div class='ctx'> 	.ampdu_action = iwl_mvm_mac_ampdu_action,</div><div class='ctx'> 	.get_antenna = iwl_mvm_op_get_antenna,</div><div class='add'>+	.set_antenna = iwl_mvm_op_set_antenna,</div><div class='ctx'> 	.start = iwl_mvm_mac_start,</div><div class='ctx'> 	.reconfig_complete = iwl_mvm_mac_reconfig_complete,</div><div class='ctx'> 	.stop = iwl_mvm_mac_stop,</div><div class='hunk'>@@ -5319,11 +6420,13 @@ const struct ieee80211_ops iwl_mvm_hw_ops = {</div><div class='ctx'> 	.allow_buffered_frames = iwl_mvm_mac_allow_buffered_frames,</div><div class='ctx'> 	.release_buffered_frames = iwl_mvm_mac_release_buffered_frames,</div><div class='ctx'> 	.set_rts_threshold = iwl_mvm_mac_set_rts_threshold,</div><div class='del'>-	.sta_rc_update = iwl_mvm_sta_rc_update,</div><div class='add'>+	.link_sta_rc_update = iwl_mvm_sta_rc_update,</div><div class='ctx'> 	.conf_tx = iwl_mvm_mac_conf_tx,</div><div class='ctx'> 	.mgd_prepare_tx = iwl_mvm_mac_mgd_prepare_tx,</div><div class='add'>+	.mgd_complete_tx = iwl_mvm_mac_mgd_complete_tx,</div><div class='ctx'> 	.mgd_protect_tdls_discover = iwl_mvm_mac_mgd_protect_tdls_discover,</div><div class='ctx'> 	.flush = iwl_mvm_mac_flush,</div><div class='add'>+	.flush_sta = iwl_mvm_mac_flush_sta,</div><div class='ctx'> 	.sched_scan_start = iwl_mvm_mac_sched_scan_start,</div><div class='ctx'> 	.sched_scan_stop = iwl_mvm_mac_sched_scan_stop,</div><div class='ctx'> 	.set_key = iwl_mvm_mac_set_key,</div><div class='hunk'>@@ -5337,17 +6440,17 @@ const struct ieee80211_ops iwl_mvm_hw_ops = {</div><div class='ctx'> 	.unassign_vif_chanctx = iwl_mvm_unassign_vif_chanctx,</div><div class='ctx'> 	.switch_vif_chanctx = iwl_mvm_switch_vif_chanctx,</div><div class='ctx'> </div><div class='del'>-	.start_ap = iwl_mvm_start_ap_ibss,</div><div class='del'>-	.stop_ap = iwl_mvm_stop_ap_ibss,</div><div class='del'>-	.join_ibss = iwl_mvm_start_ap_ibss,</div><div class='del'>-	.leave_ibss = iwl_mvm_stop_ap_ibss,</div><div class='add'>+	.start_ap = iwl_mvm_start_ap,</div><div class='add'>+	.stop_ap = iwl_mvm_stop_ap,</div><div class='add'>+	.join_ibss = iwl_mvm_start_ibss,</div><div class='add'>+	.leave_ibss = iwl_mvm_stop_ibss,</div><div class='ctx'> </div><div class='ctx'> 	.tx_last_beacon = iwl_mvm_tx_last_beacon,</div><div class='ctx'> </div><div class='ctx'> 	.set_tim = iwl_mvm_set_tim,</div><div class='ctx'> </div><div class='ctx'> 	.channel_switch = iwl_mvm_channel_switch,</div><div class='del'>-	.pre_channel_switch = iwl_mvm_pre_channel_switch,</div><div class='add'>+	.pre_channel_switch = iwl_mvm_mac_pre_channel_switch,</div><div class='ctx'> 	.post_channel_switch = iwl_mvm_post_channel_switch,</div><div class='ctx'> 	.abort_channel_switch = iwl_mvm_abort_channel_switch,</div><div class='ctx'> 	.channel_switch_rx_beacon = iwl_mvm_channel_switch_rx_beacon,</div><div class='hunk'>@@ -5360,8 +6463,6 @@ const struct ieee80211_ops iwl_mvm_hw_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.sync_rx_queues = iwl_mvm_sync_rx_queues,</div><div class='ctx'> </div><div class='del'>-	CFG80211_TESTMODE_CMD(iwl_mvm_mac_testmode_cmd)</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	/* look at d3.c */</div><div class='ctx'> 	.suspend = iwl_mvm_suspend,</div><div class='hunk'>@@ -5381,6 +6482,8 @@ const struct ieee80211_ops iwl_mvm_hw_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.can_aggregate_in_amsdu = iwl_mvm_mac_can_aggregate,</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='del'>-	.sta_add_debugfs = iwl_mvm_sta_add_debugfs,</div><div class='add'>+	.vif_add_debugfs = iwl_mvm_vif_add_debugfs,</div><div class='add'>+	.link_sta_add_debugfs = iwl_mvm_link_sta_add_debugfs,</div><div class='ctx'> #endif</div><div class='add'>+	.set_hw_timestamp = iwl_mvm_set_hw_timestamp,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c<br/>new file mode 100644<br/>index 000000000000..ef0be44207e1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c</a></div><div class='hunk'>@@ -0,0 +1,408 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2022 - 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+#include "mvm.h"</div><div class='add'>+#include "fw/api/context.h"</div><div class='add'>+#include "fw/api/datapath.h"</div><div class='add'>+</div><div class='add'>+static u32 iwl_mvm_get_sec_sta_mask(struct iwl_mvm *mvm,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct ieee80211_sta *sta,</div><div class='add'>+				    struct ieee80211_key_conf *keyconf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm_vif_link_info *link_info = &amp;mvmvif-&gt;deflink;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (keyconf-&gt;link_id &gt;= 0) {</div><div class='add'>+		link_info = mvmvif-&gt;link[keyconf-&gt;link_id];</div><div class='add'>+		if (!link_info)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* AP group keys are per link and should be on the mcast/bcast STA */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+	    !(keyconf-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE)) {</div><div class='add'>+		/* IGTK/BIGTK to bcast STA */</div><div class='add'>+		if (keyconf-&gt;keyidx &gt;= 4)</div><div class='add'>+			return BIT(link_info-&gt;bcast_sta.sta_id);</div><div class='add'>+		/* GTK for data to mcast STA */</div><div class='add'>+		return BIT(link_info-&gt;mcast_sta.sta_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* for client mode use the AP STA also for group keys */</div><div class='add'>+	if (!sta &amp;&amp; vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+		sta = mvmvif-&gt;ap_sta;</div><div class='add'>+</div><div class='add'>+	/* During remove the STA was removed and the group keys come later</div><div class='add'>+	 * (which sounds like a bad sequence, but remember that to mac80211 the</div><div class='add'>+	 * group keys have no sta pointer), so we don't have a STA now.</div><div class='add'>+	 * Since this happens for group keys only, just use the link_info as</div><div class='add'>+	 * the group keys are per link; make sure that is the case by checking</div><div class='add'>+	 * we do have a link_id or are not doing MLO.</div><div class='add'>+	 * Of course the same can be done during add as well, but we must do</div><div class='add'>+	 * it during remove, since we don't have the mvmvif-&gt;ap_sta pointer.</div><div class='add'>+	 */</div><div class='add'>+	if (!sta &amp;&amp; (keyconf-&gt;link_id &gt;= 0 || !ieee80211_vif_is_mld(vif)))</div><div class='add'>+		return BIT(link_info-&gt;ap_sta_id);</div><div class='add'>+</div><div class='add'>+	/* STA should be non-NULL now, but iwl_mvm_sta_fw_id_mask() checks */</div><div class='add'>+</div><div class='add'>+	/* pass link_id to filter by it if not -1 (GTK on client) */</div><div class='add'>+	return iwl_mvm_sta_fw_id_mask(mvm, sta, keyconf-&gt;link_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 iwl_mvm_get_sec_flags(struct iwl_mvm *mvm,</div><div class='add'>+			  struct ieee80211_vif *vif,</div><div class='add'>+			  struct ieee80211_sta *sta,</div><div class='add'>+			  struct ieee80211_key_conf *keyconf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	bool pairwise = keyconf-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE;</div><div class='add'>+	bool igtk = keyconf-&gt;keyidx == 4 || keyconf-&gt;keyidx == 5;</div><div class='add'>+	u32 flags = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!pairwise)</div><div class='add'>+		flags |= IWL_SEC_KEY_FLAG_MCAST_KEY;</div><div class='add'>+</div><div class='add'>+	switch (keyconf-&gt;cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP104:</div><div class='add'>+		flags |= IWL_SEC_KEY_FLAG_KEY_SIZE;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP40:</div><div class='add'>+		flags |= IWL_SEC_KEY_FLAG_CIPHER_WEP;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		flags |= IWL_SEC_KEY_FLAG_CIPHER_TKIP;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_AES_CMAC:</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+		flags |= IWL_SEC_KEY_FLAG_CIPHER_CCMP;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_GMAC_256:</div><div class='add'>+		flags |= IWL_SEC_KEY_FLAG_KEY_SIZE;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_GMAC_128:</div><div class='add'>+		flags |= IWL_SEC_KEY_FLAG_CIPHER_GCMP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!sta &amp;&amp; vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+		sta = mvmvif-&gt;ap_sta;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we are installing an iGTK (in AP or STA mode), we need to tell</div><div class='add'>+	 * the firmware this key will en/decrypt MGMT frames.</div><div class='add'>+	 * Same goes if we are installing a pairwise key for an MFP station.</div><div class='add'>+	 * In case we're installing a groupwise key (which is not an iGTK),</div><div class='add'>+	 * then, we will not use this key for MGMT frames.</div><div class='add'>+	 */</div><div class='add'>+	if ((!IS_ERR_OR_NULL(sta) &amp;&amp; sta-&gt;mfp &amp;&amp; pairwise) || igtk)</div><div class='add'>+		flags |= IWL_SEC_KEY_FLAG_MFP;</div><div class='add'>+</div><div class='add'>+	if (keyconf-&gt;flags &amp; IEEE80211_KEY_FLAG_SPP_AMSDU)</div><div class='add'>+		flags |= IWL_SEC_KEY_FLAG_SPP_AMSDU;</div><div class='add'>+</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct iwl_mvm_sta_key_update_data {</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	u32 old_sta_mask;</div><div class='add'>+	u32 new_sta_mask;</div><div class='add'>+	int err;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_mld_update_sta_key(struct ieee80211_hw *hw,</div><div class='add'>+				       struct ieee80211_vif *vif,</div><div class='add'>+				       struct ieee80211_sta *sta,</div><div class='add'>+				       struct ieee80211_key_conf *key,</div><div class='add'>+				       void *_data)</div><div class='add'>+{</div><div class='add'>+	u32 cmd_id = WIDE_ID(DATA_PATH_GROUP, SEC_KEY_CMD);</div><div class='add'>+	struct iwl_mvm_sta_key_update_data *data = _data;</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+	struct iwl_sec_key_cmd cmd = {</div><div class='add'>+		.action = cpu_to_le32(FW_CTXT_ACTION_MODIFY),</div><div class='add'>+		.u.modify.old_sta_mask = cpu_to_le32(data-&gt;old_sta_mask),</div><div class='add'>+		.u.modify.new_sta_mask = cpu_to_le32(data-&gt;new_sta_mask),</div><div class='add'>+		.u.modify.key_id = cpu_to_le32(key-&gt;keyidx),</div><div class='add'>+		.u.modify.key_flags =</div><div class='add'>+			cpu_to_le32(iwl_mvm_get_sec_flags(mvm, vif, sta, key)),</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* only need to do this for pairwise keys (link_id == -1) */</div><div class='add'>+	if (sta != data-&gt;sta || key-&gt;link_id &gt;= 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = iwl_mvm_send_cmd_pdu(mvm, cmd_id, 0, sizeof(cmd), &amp;cmd);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		data-&gt;err = err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_mld_update_sta_keys(struct iwl_mvm *mvm,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_sta *sta,</div><div class='add'>+				u32 old_sta_mask,</div><div class='add'>+				u32 new_sta_mask)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_sta_key_update_data data = {</div><div class='add'>+		.sta = sta,</div><div class='add'>+		.old_sta_mask = old_sta_mask,</div><div class='add'>+		.new_sta_mask = new_sta_mask,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ieee80211_iter_keys(mvm-&gt;hw, vif, iwl_mvm_mld_update_sta_key,</div><div class='add'>+			    &amp;data);</div><div class='add'>+	return data.err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __iwl_mvm_sec_key_del(struct iwl_mvm *mvm, u32 sta_mask,</div><div class='add'>+				 u32 key_flags, u32 keyidx, u32 flags)</div><div class='add'>+{</div><div class='add'>+	u32 cmd_id = WIDE_ID(DATA_PATH_GROUP, SEC_KEY_CMD);</div><div class='add'>+	struct iwl_sec_key_cmd cmd = {</div><div class='add'>+		.action = cpu_to_le32(FW_CTXT_ACTION_REMOVE),</div><div class='add'>+		.u.remove.sta_mask = cpu_to_le32(sta_mask),</div><div class='add'>+		.u.remove.key_id = cpu_to_le32(keyidx),</div><div class='add'>+		.u.remove.key_flags = cpu_to_le32(key_flags),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_send_cmd_pdu(mvm, cmd_id, flags, sizeof(cmd), &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_mld_send_key(struct iwl_mvm *mvm, u32 sta_mask, u32 key_flags,</div><div class='add'>+			 struct ieee80211_key_conf *keyconf)</div><div class='add'>+{</div><div class='add'>+	u32 cmd_id = WIDE_ID(DATA_PATH_GROUP, SEC_KEY_CMD);</div><div class='add'>+	struct iwl_sec_key_cmd cmd = {</div><div class='add'>+		.action = cpu_to_le32(FW_CTXT_ACTION_ADD),</div><div class='add'>+		.u.add.sta_mask = cpu_to_le32(sta_mask),</div><div class='add'>+		.u.add.key_id = cpu_to_le32(keyconf-&gt;keyidx),</div><div class='add'>+		.u.add.key_flags = cpu_to_le32(key_flags),</div><div class='add'>+		.u.add.tx_seq = cpu_to_le64(atomic64_read(&amp;keyconf-&gt;tx_pn)),</div><div class='add'>+	};</div><div class='add'>+	int max_key_len = sizeof(cmd.u.add.key);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (keyconf-&gt;cipher == WLAN_CIPHER_SUITE_WEP40 ||</div><div class='add'>+	    keyconf-&gt;cipher == WLAN_CIPHER_SUITE_WEP104)</div><div class='add'>+		max_key_len -= IWL_SEC_WEP_KEY_OFFSET;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(keyconf-&gt;keylen &gt; max_key_len))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!sta_mask))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (keyconf-&gt;cipher == WLAN_CIPHER_SUITE_WEP40 ||</div><div class='add'>+	    keyconf-&gt;cipher == WLAN_CIPHER_SUITE_WEP104)</div><div class='add'>+		memcpy(cmd.u.add.key + IWL_SEC_WEP_KEY_OFFSET, keyconf-&gt;key,</div><div class='add'>+		       keyconf-&gt;keylen);</div><div class='add'>+	else</div><div class='add'>+		memcpy(cmd.u.add.key, keyconf-&gt;key, keyconf-&gt;keylen);</div><div class='add'>+</div><div class='add'>+	if (keyconf-&gt;cipher == WLAN_CIPHER_SUITE_TKIP) {</div><div class='add'>+		memcpy(cmd.u.add.tkip_mic_rx_key,</div><div class='add'>+		       keyconf-&gt;key + NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY,</div><div class='add'>+		       8);</div><div class='add'>+		memcpy(cmd.u.add.tkip_mic_tx_key,</div><div class='add'>+		       keyconf-&gt;key + NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY,</div><div class='add'>+		       8);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_send_cmd_pdu(mvm, cmd_id, 0, sizeof(cmd), &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For WEP, the same key is used for multicast and unicast so need to</div><div class='add'>+	 * upload it again. If this fails, remove the original as well.</div><div class='add'>+	 */</div><div class='add'>+	if (keyconf-&gt;cipher == WLAN_CIPHER_SUITE_WEP40 ||</div><div class='add'>+	    keyconf-&gt;cipher == WLAN_CIPHER_SUITE_WEP104) {</div><div class='add'>+		cmd.u.add.key_flags ^= cpu_to_le32(IWL_SEC_KEY_FLAG_MCAST_KEY);</div><div class='add'>+		ret = iwl_mvm_send_cmd_pdu(mvm, cmd_id, 0, sizeof(cmd), &amp;cmd);</div><div class='add'>+		if (ret)</div><div class='add'>+			__iwl_mvm_sec_key_del(mvm, sta_mask, key_flags,</div><div class='add'>+					      keyconf-&gt;keyidx, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_sec_key_add(struct iwl_mvm *mvm,</div><div class='add'>+			struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_sta *sta,</div><div class='add'>+			struct ieee80211_key_conf *keyconf)</div><div class='add'>+{</div><div class='add'>+	u32 sta_mask = iwl_mvm_get_sec_sta_mask(mvm, vif, sta, keyconf);</div><div class='add'>+	u32 key_flags = iwl_mvm_get_sec_flags(mvm, vif, sta, keyconf);</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm_vif_link_info *mvm_link = NULL;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (keyconf-&gt;keyidx == 4 || keyconf-&gt;keyidx == 5) {</div><div class='add'>+		unsigned int link_id = 0;</div><div class='add'>+</div><div class='add'>+		/* set to -1 for non-MLO right now */</div><div class='add'>+		if (keyconf-&gt;link_id &gt;= 0)</div><div class='add'>+			link_id = keyconf-&gt;link_id;</div><div class='add'>+</div><div class='add'>+		mvm_link = mvmvif-&gt;link[link_id];</div><div class='add'>+		if (WARN_ON(!mvm_link))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (mvm_link-&gt;igtk) {</div><div class='add'>+			IWL_DEBUG_MAC80211(mvm, "remove old IGTK %d\n",</div><div class='add'>+					   mvm_link-&gt;igtk-&gt;keyidx);</div><div class='add'>+			ret = iwl_mvm_sec_key_del(mvm, vif, sta,</div><div class='add'>+						  mvm_link-&gt;igtk);</div><div class='add'>+			if (ret)</div><div class='add'>+				IWL_ERR(mvm,</div><div class='add'>+					"failed to remove old IGTK (ret=%d)\n",</div><div class='add'>+					ret);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		WARN_ON(mvm_link-&gt;igtk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_mld_send_key(mvm, sta_mask, key_flags, keyconf);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (mvm_link)</div><div class='add'>+		mvm_link-&gt;igtk = keyconf;</div><div class='add'>+</div><div class='add'>+	/* We don't really need this, but need it to be not invalid,</div><div class='add'>+	 * and if we switch links multiple times it might go to be</div><div class='add'>+	 * invalid when removed.</div><div class='add'>+	 */</div><div class='add'>+	keyconf-&gt;hw_key_idx = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int _iwl_mvm_sec_key_del(struct iwl_mvm *mvm,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_sta *sta,</div><div class='add'>+				struct ieee80211_key_conf *keyconf,</div><div class='add'>+				u32 flags)</div><div class='add'>+{</div><div class='add'>+	u32 sta_mask = iwl_mvm_get_sec_sta_mask(mvm, vif, sta, keyconf);</div><div class='add'>+	u32 key_flags = iwl_mvm_get_sec_flags(mvm, vif, sta, keyconf);</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!sta_mask))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (keyconf-&gt;keyidx == 4 || keyconf-&gt;keyidx == 5) {</div><div class='add'>+		struct iwl_mvm_vif_link_info *mvm_link;</div><div class='add'>+		unsigned int link_id = 0;</div><div class='add'>+</div><div class='add'>+		/* set to -1 for non-MLO right now */</div><div class='add'>+		if (keyconf-&gt;link_id &gt;= 0)</div><div class='add'>+			link_id = keyconf-&gt;link_id;</div><div class='add'>+</div><div class='add'>+		mvm_link = mvmvif-&gt;link[link_id];</div><div class='add'>+		if (WARN_ON(!mvm_link))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (mvm_link-&gt;igtk == keyconf) {</div><div class='add'>+			/* no longer in HW - mark for later */</div><div class='add'>+			mvm_link-&gt;igtk-&gt;hw_key_idx = STA_KEY_IDX_INVALID;</div><div class='add'>+			mvm_link-&gt;igtk = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = __iwl_mvm_sec_key_del(mvm, sta_mask, key_flags, keyconf-&gt;keyidx,</div><div class='add'>+				    flags);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* For WEP, delete the key again as unicast */</div><div class='add'>+	if (keyconf-&gt;cipher == WLAN_CIPHER_SUITE_WEP40 ||</div><div class='add'>+	    keyconf-&gt;cipher == WLAN_CIPHER_SUITE_WEP104) {</div><div class='add'>+		key_flags ^= IWL_SEC_KEY_FLAG_MCAST_KEY;</div><div class='add'>+		ret = __iwl_mvm_sec_key_del(mvm, sta_mask, key_flags,</div><div class='add'>+					    keyconf-&gt;keyidx, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_sec_key_del_pasn(struct iwl_mvm *mvm,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     u32 sta_mask,</div><div class='add'>+			     struct ieee80211_key_conf *keyconf)</div><div class='add'>+{</div><div class='add'>+	u32 key_flags = iwl_mvm_get_sec_flags(mvm, vif, NULL, keyconf) |</div><div class='add'>+		IWL_SEC_KEY_FLAG_MFP;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!sta_mask))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return  __iwl_mvm_sec_key_del(mvm, sta_mask, key_flags, keyconf-&gt;keyidx,</div><div class='add'>+				      0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_sec_key_del(struct iwl_mvm *mvm,</div><div class='add'>+			struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_sta *sta,</div><div class='add'>+			struct ieee80211_key_conf *keyconf)</div><div class='add'>+{</div><div class='add'>+	return _iwl_mvm_sec_key_del(mvm, vif, sta, keyconf, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_sec_key_remove_ap_iter(struct ieee80211_hw *hw,</div><div class='add'>+					   struct ieee80211_vif *vif,</div><div class='add'>+					   struct ieee80211_sta *sta,</div><div class='add'>+					   struct ieee80211_key_conf *key,</div><div class='add'>+					   void *data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+	unsigned int link_id = (uintptr_t)data;</div><div class='add'>+</div><div class='add'>+	if (key-&gt;hw_key_idx == STA_KEY_IDX_INVALID)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (sta)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (key-&gt;link_id &gt;= 0 &amp;&amp; key-&gt;link_id != link_id)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	_iwl_mvm_sec_key_del(mvm, vif, NULL, key, CMD_ASYNC);</div><div class='add'>+	key-&gt;hw_key_idx = STA_KEY_IDX_INVALID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_sec_key_remove_ap(struct iwl_mvm *mvm,</div><div class='add'>+			       struct ieee80211_vif *vif,</div><div class='add'>+			       struct iwl_mvm_vif_link_info *link,</div><div class='add'>+			       unsigned int link_id)</div><div class='add'>+{</div><div class='add'>+	u32 sec_key_id = WIDE_ID(DATA_PATH_GROUP, SEC_KEY_CMD);</div><div class='add'>+	u8 sec_key_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, sec_key_id, 0);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(vif-&gt;type != NL80211_IFTYPE_STATION ||</div><div class='add'>+			 link-&gt;ap_sta_id == IWL_INVALID_STA))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!sec_key_ver)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ieee80211_iter_keys(mvm-&gt;hw, vif,</div><div class='add'>+			    iwl_mvm_sec_key_remove_ap_iter,</div><div class='add'>+			    (void *)(uintptr_t)link_id);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c<br/>new file mode 100644<br/>index 000000000000..2d116a41913c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c</a></div><div class='hunk'>@@ -0,0 +1,335 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2022 - 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include "mvm.h"</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_mld_set_he_support(struct iwl_mvm *mvm,</div><div class='add'>+				       struct ieee80211_vif *vif,</div><div class='add'>+				       struct iwl_mac_config_cmd *cmd,</div><div class='add'>+				       int cmd_ver)</div><div class='add'>+{</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP) {</div><div class='add'>+		if (cmd_ver == 2)</div><div class='add'>+			cmd-&gt;wifi_gen_v2.he_ap_support = cpu_to_le16(1);</div><div class='add'>+		else</div><div class='add'>+			cmd-&gt;wifi_gen.he_ap_support = 1;</div><div class='add'>+	} else {</div><div class='add'>+		if (cmd_ver == 2)</div><div class='add'>+			cmd-&gt;wifi_gen_v2.he_support = cpu_to_le16(1);</div><div class='add'>+		else</div><div class='add'>+			cmd-&gt;wifi_gen.he_support = 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_mld_mac_ctxt_cmd_common(struct iwl_mvm *mvm,</div><div class='add'>+					    struct ieee80211_vif *vif,</div><div class='add'>+					    struct iwl_mac_config_cmd *cmd,</div><div class='add'>+					    u32 action)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+	int cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw,</div><div class='add'>+					    WIDE_ID(MAC_CONF_GROUP,</div><div class='add'>+						    MAC_CONFIG_CMD), 1);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(cmd_ver &gt; 3))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;id_and_color = cpu_to_le32(mvmvif-&gt;id);</div><div class='add'>+	cmd-&gt;action = cpu_to_le32(action);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;mac_type = cpu_to_le32(iwl_mvm_get_mac_type(vif));</div><div class='add'>+</div><div class='add'>+	memcpy(cmd-&gt;local_mld_addr, vif-&gt;addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;wifi_gen_v2.he_support = 0;</div><div class='add'>+	cmd-&gt;wifi_gen_v2.eht_support = 0;</div><div class='add'>+</div><div class='add'>+	/* should be set by specific context type handler */</div><div class='add'>+	cmd-&gt;filter_flags = 0;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;nic_not_ack_enabled =</div><div class='add'>+		cpu_to_le32(!iwl_mvm_is_nic_ack_enabled(mvm, vif));</div><div class='add'>+</div><div class='add'>+	if (iwlwifi_mod_params.disable_11ax)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* If we have MLO enabled, then the firmware needs to enable</div><div class='add'>+	 * address translation for the station(s) we add. That depends</div><div class='add'>+	 * on having EHT enabled in firmware, which in turn depends on</div><div class='add'>+	 * mac80211 in the code below.</div><div class='add'>+	 * However, mac80211 doesn't enable HE/EHT until it has parsed</div><div class='add'>+	 * the association response successfully, so just skip all that</div><div class='add'>+	 * and enable both when we have MLO.</div><div class='add'>+	 */</div><div class='add'>+	if (ieee80211_vif_is_mld(vif)) {</div><div class='add'>+		iwl_mvm_mld_set_he_support(mvm, vif, cmd, cmd_ver);</div><div class='add'>+		if (cmd_ver == 2)</div><div class='add'>+			cmd-&gt;wifi_gen_v2.eht_support = cpu_to_le32(1);</div><div class='add'>+		else</div><div class='add'>+			cmd-&gt;wifi_gen.eht_support = 1;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for (link_id = 0; link_id &lt; ARRAY_SIZE((vif)-&gt;link_conf); link_id++) {</div><div class='add'>+		link_conf = rcu_dereference(vif-&gt;link_conf[link_id]);</div><div class='add'>+		if (!link_conf)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (link_conf-&gt;he_support)</div><div class='add'>+			iwl_mvm_mld_set_he_support(mvm, vif, cmd, cmd_ver);</div><div class='add'>+</div><div class='add'>+		/* It's not reasonable to have EHT without HE and FW API doesn't</div><div class='add'>+		 * support it. Ignore EHT in this case.</div><div class='add'>+		 */</div><div class='add'>+		if (!link_conf-&gt;he_support &amp;&amp; link_conf-&gt;eht_support)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (link_conf-&gt;eht_support) {</div><div class='add'>+			if (cmd_ver == 2)</div><div class='add'>+				cmd-&gt;wifi_gen_v2.eht_support = cpu_to_le32(1);</div><div class='add'>+			else</div><div class='add'>+				cmd-&gt;wifi_gen.eht_support = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mld_mac_ctxt_send_cmd(struct iwl_mvm *mvm,</div><div class='add'>+					 struct iwl_mac_config_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	int ret = iwl_mvm_send_cmd_pdu(mvm,</div><div class='add'>+				       WIDE_ID(MAC_CONF_GROUP, MAC_CONFIG_CMD),</div><div class='add'>+				       0, sizeof(*cmd), cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mvm, "Failed to send MAC_CONFIG_CMD (action:%d): %d\n",</div><div class='add'>+			le32_to_cpu(cmd-&gt;action), ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mld_mac_ctxt_cmd_sta(struct iwl_mvm *mvm,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					u32 action, bool force_assoc_off)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mac_config_cmd cmd = {};</div><div class='add'>+	u16 esr_transition_timeout;</div><div class='add'>+</div><div class='add'>+	WARN_ON(vif-&gt;type != NL80211_IFTYPE_STATION);</div><div class='add'>+</div><div class='add'>+	/* Fill the common data for all mac context types */</div><div class='add'>+	iwl_mvm_mld_mac_ctxt_cmd_common(mvm, vif, &amp;cmd, action);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We always want to hear MCAST frames, if we're not authorized yet,</div><div class='add'>+	 * we'll drop them.</div><div class='add'>+	 */</div><div class='add'>+	cmd.filter_flags |= cpu_to_le32(MAC_CFG_FILTER_ACCEPT_GRP);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;p2p)</div><div class='add'>+		cmd.client.ctwin =</div><div class='add'>+			iwl_mvm_mac_ctxt_cmd_p2p_sta_get_oppps_ctwin(mvm, vif);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;cfg.assoc &amp;&amp; !force_assoc_off) {</div><div class='add'>+		struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+		cmd.client.is_assoc = 1;</div><div class='add'>+</div><div class='add'>+		if (!mvmvif-&gt;authorized &amp;&amp;</div><div class='add'>+		    fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+				IWL_UCODE_TLV_CAPA_COEX_HIGH_PRIO))</div><div class='add'>+			cmd.client.data_policy |=</div><div class='add'>+				cpu_to_le16(COEX_HIGH_PRIORITY_ENABLE);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		cmd.client.is_assoc = 0;</div><div class='add'>+</div><div class='add'>+		/* Allow beacons to pass through as long as we are not</div><div class='add'>+		 * associated, or we do not have dtim period information.</div><div class='add'>+		 */</div><div class='add'>+		cmd.filter_flags |= cpu_to_le32(MAC_CFG_FILTER_ACCEPT_BEACON);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd.client.assoc_id = cpu_to_le16(vif-&gt;cfg.aid);</div><div class='add'>+	if (ieee80211_vif_is_mld(vif)) {</div><div class='add'>+		esr_transition_timeout =</div><div class='add'>+			u16_get_bits(vif-&gt;cfg.eml_cap,</div><div class='add'>+				     IEEE80211_EML_CAP_TRANSITION_TIMEOUT);</div><div class='add'>+</div><div class='add'>+		cmd.client.esr_transition_timeout =</div><div class='add'>+			min_t(u16, IEEE80211_EML_CAP_TRANSITION_TIMEOUT_128TU,</div><div class='add'>+			      esr_transition_timeout);</div><div class='add'>+		cmd.client.medium_sync_delay =</div><div class='add'>+			cpu_to_le16(vif-&gt;cfg.eml_med_sync_delay);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;probe_req_reg &amp;&amp; vif-&gt;cfg.assoc &amp;&amp; vif-&gt;p2p)</div><div class='add'>+		cmd.filter_flags |= cpu_to_le32(MAC_CFG_FILTER_ACCEPT_PROBE_REQ);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;bss_conf.he_support &amp;&amp; !iwlwifi_mod_params.disable_11ax)</div><div class='add'>+		cmd.client.data_policy |=</div><div class='add'>+			cpu_to_le16(iwl_mvm_mac_ctxt_cmd_sta_get_twt_policy(mvm, vif));</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_mld_mac_ctxt_send_cmd(mvm, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mld_mac_ctxt_cmd_listener(struct iwl_mvm *mvm,</div><div class='add'>+					     struct ieee80211_vif *vif,</div><div class='add'>+					     u32 action)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mac_config_cmd cmd = {};</div><div class='add'>+</div><div class='add'>+	WARN_ON(vif-&gt;type != NL80211_IFTYPE_MONITOR);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_mld_mac_ctxt_cmd_common(mvm, vif, &amp;cmd, action);</div><div class='add'>+</div><div class='add'>+	cmd.filter_flags = cpu_to_le32(MAC_CFG_FILTER_PROMISC |</div><div class='add'>+				       MAC_CFG_FILTER_ACCEPT_CONTROL_AND_MGMT |</div><div class='add'>+				       MAC_CFG_FILTER_ACCEPT_BEACON |</div><div class='add'>+				       MAC_CFG_FILTER_ACCEPT_PROBE_REQ |</div><div class='add'>+				       MAC_CFG_FILTER_ACCEPT_GRP);</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_mld_mac_ctxt_send_cmd(mvm, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mld_mac_ctxt_cmd_ibss(struct iwl_mvm *mvm,</div><div class='add'>+					 struct ieee80211_vif *vif,</div><div class='add'>+					 u32 action)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mac_config_cmd cmd = {};</div><div class='add'>+</div><div class='add'>+	WARN_ON(vif-&gt;type != NL80211_IFTYPE_ADHOC);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_mld_mac_ctxt_cmd_common(mvm, vif, &amp;cmd, action);</div><div class='add'>+</div><div class='add'>+	cmd.filter_flags = cpu_to_le32(MAC_CFG_FILTER_ACCEPT_BEACON |</div><div class='add'>+				       MAC_CFG_FILTER_ACCEPT_PROBE_REQ |</div><div class='add'>+				       MAC_CFG_FILTER_ACCEPT_GRP);</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_mld_mac_ctxt_send_cmd(mvm, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mld_mac_ctxt_cmd_p2p_device(struct iwl_mvm *mvm,</div><div class='add'>+					       struct ieee80211_vif *vif,</div><div class='add'>+					       u32 action)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mac_config_cmd cmd = {};</div><div class='add'>+</div><div class='add'>+	WARN_ON(vif-&gt;type != NL80211_IFTYPE_P2P_DEVICE);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_mld_mac_ctxt_cmd_common(mvm, vif, &amp;cmd, action);</div><div class='add'>+</div><div class='add'>+	cmd.p2p_dev.is_disc_extended =</div><div class='add'>+		iwl_mac_ctxt_p2p_dev_has_extended_disc(mvm, vif);</div><div class='add'>+</div><div class='add'>+	/* Override the filter flags to accept all management frames. This is</div><div class='add'>+	 * needed to support both P2P device discovery using probe requests and</div><div class='add'>+	 * P2P service discovery using action frames</div><div class='add'>+	 */</div><div class='add'>+	cmd.filter_flags = cpu_to_le32(MAC_CFG_FILTER_ACCEPT_CONTROL_AND_MGMT);</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_mld_mac_ctxt_send_cmd(mvm, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mld_mac_ctxt_cmd_ap_go(struct iwl_mvm *mvm,</div><div class='add'>+					  struct ieee80211_vif *vif,</div><div class='add'>+					  u32 action)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mac_config_cmd cmd = {};</div><div class='add'>+</div><div class='add'>+	WARN_ON(vif-&gt;type != NL80211_IFTYPE_AP);</div><div class='add'>+</div><div class='add'>+	/* Fill the common data for all mac context types */</div><div class='add'>+	iwl_mvm_mld_mac_ctxt_cmd_common(mvm, vif, &amp;cmd, action);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_mac_ctxt_cmd_ap_set_filter_flags(mvm, mvmvif,</div><div class='add'>+						 &amp;cmd.filter_flags,</div><div class='add'>+						 MAC_CFG_FILTER_ACCEPT_PROBE_REQ,</div><div class='add'>+						 MAC_CFG_FILTER_ACCEPT_BEACON);</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_mld_mac_ctxt_send_cmd(mvm, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mld_mac_ctx_send(struct iwl_mvm *mvm,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    u32 action, bool force_assoc_off)</div><div class='add'>+{</div><div class='add'>+	switch (vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		return iwl_mvm_mld_mac_ctxt_cmd_sta(mvm, vif, action,</div><div class='add'>+						    force_assoc_off);</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		return iwl_mvm_mld_mac_ctxt_cmd_ap_go(mvm, vif, action);</div><div class='add'>+	case NL80211_IFTYPE_MONITOR:</div><div class='add'>+		return iwl_mvm_mld_mac_ctxt_cmd_listener(mvm, vif, action);</div><div class='add'>+	case NL80211_IFTYPE_P2P_DEVICE:</div><div class='add'>+		return iwl_mvm_mld_mac_ctxt_cmd_p2p_device(mvm, vif, action);</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		return iwl_mvm_mld_mac_ctxt_cmd_ibss(mvm, vif, action);</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_mld_mac_ctxt_add(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(mvmvif-&gt;uploaded, "Adding active MAC %pM/%d\n",</div><div class='add'>+		      vif-&gt;addr, ieee80211_vif_type_p2p(vif)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_mld_mac_ctx_send(mvm, vif, FW_CTXT_ACTION_ADD,</div><div class='add'>+				       true);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* will only do anything at resume from D3 time */</div><div class='add'>+	iwl_mvm_set_last_nonqos_seq(mvm, vif);</div><div class='add'>+</div><div class='add'>+	mvmvif-&gt;uploaded = true;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_mld_mac_ctxt_changed(struct iwl_mvm *mvm,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 bool force_assoc_off)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(!mvmvif-&gt;uploaded, "Changing inactive MAC %pM/%d\n",</div><div class='add'>+		      vif-&gt;addr, ieee80211_vif_type_p2p(vif)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_mld_mac_ctx_send(mvm, vif, FW_CTXT_ACTION_MODIFY,</div><div class='add'>+					force_assoc_off);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_mld_mac_ctxt_remove(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mac_config_cmd cmd = {</div><div class='add'>+		.action = cpu_to_le32(FW_CTXT_ACTION_REMOVE),</div><div class='add'>+		.id_and_color = cpu_to_le32(mvmvif-&gt;id),</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(!mvmvif-&gt;uploaded, "Removing inactive MAC %pM/%d\n",</div><div class='add'>+		      vif-&gt;addr, ieee80211_vif_type_p2p(vif)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_mld_mac_ctxt_send_cmd(mvm, &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mvmvif-&gt;uploaded = false;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c<br/>new file mode 100644<br/>index 000000000000..380b6f8a53fd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c</a></div><div class='hunk'>@@ -0,0 +1,1283 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2022-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include "mvm.h"</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mld_mac_add_interface(struct ieee80211_hw *hw,</div><div class='add'>+					 struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_mac_init_mvmvif(mvm, mvmvif);</div><div class='add'>+</div><div class='add'>+	mvmvif-&gt;mvm = mvm;</div><div class='add'>+</div><div class='add'>+	vif-&gt;driver_flags |= IEEE80211_VIF_REMOVE_AP_AFTER_DISASSOC;</div><div class='add'>+</div><div class='add'>+	/* Not much to do here. The stack will not allow interface</div><div class='add'>+	 * types or combinations that we didn't advertise, so we</div><div class='add'>+	 * don't really have to check the types.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* make sure that beacon statistics don't go backwards with FW reset */</div><div class='add'>+	if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status))</div><div class='add'>+		for_each_mvm_vif_valid_link(mvmvif, i)</div><div class='add'>+			mvmvif-&gt;link[i]-&gt;beacon_stats.accu_num_beacons +=</div><div class='add'>+				mvmvif-&gt;link[i]-&gt;beacon_stats.num_beacons;</div><div class='add'>+</div><div class='add'>+	/* Allocate resources for the MAC context, and add it to the fw  */</div><div class='add'>+	ret = iwl_mvm_mac_ctxt_init(mvm, vif);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(mvm-&gt;vif_id_to_mac[mvmvif-&gt;id], vif);</div><div class='add'>+</div><div class='add'>+	mvmvif-&gt;features |= hw-&gt;netdev_features;</div><div class='add'>+</div><div class='add'>+	/* reset deflink MLO parameters */</div><div class='add'>+	mvmvif-&gt;deflink.fw_link_id = IWL_MVM_FW_LINK_ID_INVALID;</div><div class='add'>+	mvmvif-&gt;deflink.active = 0;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_mld_mac_ctxt_add(mvm, vif);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* beacon filtering */</div><div class='add'>+	ret = iwl_mvm_disable_beacon_filter(mvm, vif);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_remove_mac;</div><div class='add'>+</div><div class='add'>+	if (!mvm-&gt;bf_allowed_vif &amp;&amp;</div><div class='add'>+	    vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; !vif-&gt;p2p) {</div><div class='add'>+		mvm-&gt;bf_allowed_vif = mvmvif;</div><div class='add'>+		vif-&gt;driver_flags |= IEEE80211_VIF_BEACON_FILTER |</div><div class='add'>+				     IEEE80211_VIF_SUPPORTS_CQM_RSSI;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We want link[0] to point to the default link, unless we have MLO and</div><div class='add'>+	 * in this case this will be modified later by .change_vif_links()</div><div class='add'>+	 * If we are in the restart flow with an MLD connection, we will wait</div><div class='add'>+	 * to .change_vif_links() to setup the links.</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status) ||</div><div class='add'>+	    !ieee80211_vif_is_mld(vif)) {</div><div class='add'>+		mvmvif-&gt;link[0] = &amp;mvmvif-&gt;deflink;</div><div class='add'>+</div><div class='add'>+		ret = iwl_mvm_add_link(mvm, vif, &amp;vif-&gt;bss_conf);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_free_bf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Save a pointer to p2p device vif, so it can later be used to</div><div class='add'>+	 * update the p2p device MAC when a GO is started/stopped</div><div class='add'>+	 */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE)</div><div class='add'>+		mvm-&gt;p2p_device_vif = vif;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_power_update_mac(mvm);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_free_bf;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_tcm_add_vif(mvm, vif);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_MONITOR) {</div><div class='add'>+		mvm-&gt;monitor_on = true;</div><div class='add'>+		ieee80211_hw_set(mvm-&gt;hw, RX_INCLUDES_FCS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status))</div><div class='add'>+		iwl_mvm_vif_dbgfs_add_link(mvm, vif);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status) &amp;&amp;</div><div class='add'>+	    vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; !vif-&gt;p2p &amp;&amp;</div><div class='add'>+	    !mvm-&gt;csme_vif &amp;&amp; mvm-&gt;mei_registered) {</div><div class='add'>+		iwl_mei_set_nic_info(vif-&gt;addr, mvm-&gt;nvm_data-&gt;hw_addr);</div><div class='add'>+		iwl_mei_set_netdev(ieee80211_vif_to_wdev(vif)-&gt;netdev);</div><div class='add'>+		mvm-&gt;csme_vif = vif;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ out_free_bf:</div><div class='add'>+	if (mvm-&gt;bf_allowed_vif == mvmvif) {</div><div class='add'>+		mvm-&gt;bf_allowed_vif = NULL;</div><div class='add'>+		vif-&gt;driver_flags &amp;= ~(IEEE80211_VIF_BEACON_FILTER |</div><div class='add'>+				       IEEE80211_VIF_SUPPORTS_CQM_RSSI);</div><div class='add'>+	}</div><div class='add'>+ out_remove_mac:</div><div class='add'>+	mvmvif-&gt;link[0] = NULL;</div><div class='add'>+	iwl_mvm_mld_mac_ctxt_remove(mvm, vif);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_mld_mac_remove_interface(struct ieee80211_hw *hw,</div><div class='add'>+					     struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_probe_resp_data *probe_data;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_prepare_mac_removal(mvm, vif);</div><div class='add'>+</div><div class='add'>+	if (!(vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='add'>+	      vif-&gt;type == NL80211_IFTYPE_ADHOC))</div><div class='add'>+		iwl_mvm_tcm_rm_vif(mvm, vif);</div><div class='add'>+</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+</div><div class='add'>+	if (vif == mvm-&gt;csme_vif) {</div><div class='add'>+		iwl_mei_set_netdev(NULL);</div><div class='add'>+		mvm-&gt;csme_vif = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mvm-&gt;bf_allowed_vif == mvmvif) {</div><div class='add'>+		mvm-&gt;bf_allowed_vif = NULL;</div><div class='add'>+		vif-&gt;driver_flags &amp;= ~(IEEE80211_VIF_BEACON_FILTER |</div><div class='add'>+				       IEEE80211_VIF_SUPPORTS_CQM_RSSI);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;bss_conf.ftm_responder)</div><div class='add'>+		memset(&amp;mvm-&gt;ftm_resp_stats, 0, sizeof(mvm-&gt;ftm_resp_stats));</div><div class='add'>+</div><div class='add'>+	iwl_mvm_vif_dbgfs_rm_link(mvm, vif);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_power_update_mac(mvm);</div><div class='add'>+</div><div class='add'>+	/* Before the interface removal, mac80211 would cancel the ROC, and the</div><div class='add'>+	 * ROC worker would be scheduled if needed. The worker would be flushed</div><div class='add'>+	 * in iwl_mvm_prepare_mac_removal() and thus at this point the link is</div><div class='add'>+	 * not active. So need only to remove the link.</div><div class='add'>+	 */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE) {</div><div class='add'>+		if (mvmvif-&gt;deflink.phy_ctxt) {</div><div class='add'>+			iwl_mvm_phy_ctxt_unref(mvm, mvmvif-&gt;deflink.phy_ctxt);</div><div class='add'>+			mvmvif-&gt;deflink.phy_ctxt = NULL;</div><div class='add'>+		}</div><div class='add'>+		mvm-&gt;p2p_device_vif = NULL;</div><div class='add'>+		iwl_mvm_remove_link(mvm, vif, &amp;vif-&gt;bss_conf);</div><div class='add'>+	} else {</div><div class='add'>+		iwl_mvm_disable_link(mvm, vif, &amp;vif-&gt;bss_conf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mvm_mld_mac_ctxt_remove(mvm, vif);</div><div class='add'>+</div><div class='add'>+	RCU_INIT_POINTER(mvm-&gt;vif_id_to_mac[mvmvif-&gt;id], NULL);</div><div class='add'>+</div><div class='add'>+	probe_data = rcu_dereference_protected(mvmvif-&gt;deflink.probe_resp_data,</div><div class='add'>+					       lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+	RCU_INIT_POINTER(mvmvif-&gt;deflink.probe_resp_data, NULL);</div><div class='add'>+	if (probe_data)</div><div class='add'>+		kfree_rcu(probe_data, rcu_head);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_MONITOR) {</div><div class='add'>+		mvm-&gt;monitor_on = false;</div><div class='add'>+		__clear_bit(IEEE80211_HW_RX_INCLUDES_FCS, mvm-&gt;hw-&gt;flags);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int iwl_mvm_mld_count_active_links(struct iwl_mvm_vif *mvmvif)</div><div class='add'>+{</div><div class='add'>+	unsigned int n_active = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IEEE80211_MLD_MAX_NUM_LINKS; i++) {</div><div class='add'>+		if (mvmvif-&gt;link[i] &amp;&amp; mvmvif-&gt;link[i]-&gt;phy_ctxt)</div><div class='add'>+			n_active++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return n_active;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_esr_mode_active(struct iwl_mvm *mvm,</div><div class='add'>+				   struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	int link_id, ret = 0;</div><div class='add'>+</div><div class='add'>+	mvmvif-&gt;esr_active = true;</div><div class='add'>+</div><div class='add'>+	/* Indicate to mac80211 that EML is enabled */</div><div class='add'>+	vif-&gt;driver_flags |= IEEE80211_VIF_EML_ACTIVE;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_update_smps_on_active_links(mvm, vif, IWL_MVM_SMPS_REQ_FW,</div><div class='add'>+					    IEEE80211_SMPS_OFF);</div><div class='add'>+</div><div class='add'>+	for_each_mvm_vif_valid_link(mvmvif, link_id) {</div><div class='add'>+		struct iwl_mvm_vif_link_info *link = mvmvif-&gt;link[link_id];</div><div class='add'>+</div><div class='add'>+		if (!link-&gt;phy_ctxt)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = iwl_mvm_phy_send_rlc(mvm, link-&gt;phy_ctxt, 2, 2);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		link-&gt;phy_ctxt-&gt;rlc_disabled = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;active_links == mvmvif-&gt;link_selection_res &amp;&amp;</div><div class='add'>+	    !WARN_ON(!(vif-&gt;active_links &amp; BIT(mvmvif-&gt;link_selection_primary))))</div><div class='add'>+		mvmvif-&gt;primary_link = mvmvif-&gt;link_selection_primary;</div><div class='add'>+	else</div><div class='add'>+		mvmvif-&gt;primary_link = __ffs(vif-&gt;active_links);</div><div class='add'>+</div><div class='add'>+	iwl_dbg_tlv_time_point(&amp;mvm-&gt;fwrt, IWL_FW_INI_TIME_ESR_LINK_UP,</div><div class='add'>+			       NULL);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+__iwl_mvm_mld_assign_vif_chanctx(struct iwl_mvm *mvm,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				 struct ieee80211_chanctx_conf *ctx,</div><div class='add'>+				 bool switching_chanctx)</div><div class='add'>+{</div><div class='add'>+	u16 *phy_ctxt_id = (u16 *)ctx-&gt;drv_priv;</div><div class='add'>+	struct iwl_mvm_phy_ctxt *phy_ctxt = &amp;mvm-&gt;phy_ctxts[*phy_ctxt_id];</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	unsigned int n_active = iwl_mvm_mld_count_active_links(mvmvif);</div><div class='add'>+	unsigned int link_id = link_conf-&gt;link_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!mvmvif-&gt;link[link_id]))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* if the assigned one was not counted yet, count it now */</div><div class='add'>+	if (!mvmvif-&gt;link[link_id]-&gt;phy_ctxt)</div><div class='add'>+		n_active++;</div><div class='add'>+</div><div class='add'>+	/* mac parameters such as HE support can change at this stage</div><div class='add'>+	 * For sta, need first to configure correct state from drv_sta_state</div><div class='add'>+	 * and only after that update mac config.</div><div class='add'>+	 */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP) {</div><div class='add'>+		ret = iwl_mvm_mld_mac_ctxt_changed(mvm, vif, false);</div><div class='add'>+		if (ret) {</div><div class='add'>+			IWL_ERR(mvm, "failed to update MAC %pM\n", vif-&gt;addr);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mvmvif-&gt;link[link_id]-&gt;phy_ctxt = phy_ctxt;</div><div class='add'>+</div><div class='add'>+	if (iwl_mvm_is_esr_supported(mvm-&gt;fwrt.trans) &amp;&amp; n_active &gt; 1) {</div><div class='add'>+		mvmvif-&gt;link[link_id]-&gt;listen_lmac = true;</div><div class='add'>+		ret = iwl_mvm_esr_mode_active(mvm, vif);</div><div class='add'>+		if (ret) {</div><div class='add'>+			IWL_ERR(mvm, "failed to activate ESR mode (%d)\n", ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (switching_chanctx) {</div><div class='add'>+		/* reactivate if we turned this off during channel switch */</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_AP)</div><div class='add'>+			mvmvif-&gt;ap_ibss_active = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* send it first with phy context ID */</div><div class='add'>+	ret = iwl_mvm_link_changed(mvm, vif, link_conf, 0, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * if link switching (link not active yet) we'll activate it in</div><div class='add'>+	 * firmware later on link-info change, which mac80211 guarantees</div><div class='add'>+	 * for link switch after the stations are set up</div><div class='add'>+	 */</div><div class='add'>+	if (ieee80211_vif_link_active(vif, link_conf-&gt;link_id)) {</div><div class='add'>+		ret = iwl_mvm_link_changed(mvm, vif, link_conf,</div><div class='add'>+					   LINK_CONTEXT_MODIFY_ACTIVE |</div><div class='add'>+					   LINK_CONTEXT_MODIFY_RATES_INFO,</div><div class='add'>+					   true);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+		iwl_mvm_send_ap_tx_power_constraint_cmd(mvm, vif,</div><div class='add'>+							link_conf,</div><div class='add'>+							false);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Power state must be updated before quotas,</div><div class='add'>+	 * otherwise fw will complain.</div><div class='add'>+	 */</div><div class='add'>+	iwl_mvm_power_update_mac(mvm);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_MONITOR) {</div><div class='add'>+		ret = iwl_mvm_mld_add_snif_sta(mvm, vif, link_conf);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto deactivate;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+deactivate:</div><div class='add'>+	iwl_mvm_link_changed(mvm, vif, link_conf, LINK_CONTEXT_MODIFY_ACTIVE,</div><div class='add'>+			     false);</div><div class='add'>+out:</div><div class='add'>+	mvmvif-&gt;link[link_id]-&gt;phy_ctxt = NULL;</div><div class='add'>+	iwl_mvm_power_update_mac(mvm);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mld_assign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+					  struct ieee80211_vif *vif,</div><div class='add'>+					  struct ieee80211_bss_conf *link_conf,</div><div class='add'>+					  struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+	return __iwl_mvm_mld_assign_vif_chanctx(mvm, vif, link_conf, ctx, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_esr_mode_inactive(struct iwl_mvm *mvm,</div><div class='add'>+				     struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	int link_id, ret = 0;</div><div class='add'>+</div><div class='add'>+	mvmvif-&gt;esr_active = false;</div><div class='add'>+</div><div class='add'>+	vif-&gt;driver_flags &amp;= ~IEEE80211_VIF_EML_ACTIVE;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_update_smps_on_active_links(mvm, vif, IWL_MVM_SMPS_REQ_FW,</div><div class='add'>+					    IEEE80211_SMPS_AUTOMATIC);</div><div class='add'>+</div><div class='add'>+	for_each_vif_active_link(vif, link_conf, link_id) {</div><div class='add'>+		struct ieee80211_chanctx_conf *chanctx_conf;</div><div class='add'>+		struct iwl_mvm_phy_ctxt *phy_ctxt;</div><div class='add'>+		u8 static_chains, dynamic_chains;</div><div class='add'>+</div><div class='add'>+		mvmvif-&gt;link[link_id]-&gt;listen_lmac = false;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+</div><div class='add'>+		chanctx_conf = rcu_dereference(link_conf-&gt;chanctx_conf);</div><div class='add'>+		phy_ctxt = mvmvif-&gt;link[link_id]-&gt;phy_ctxt;</div><div class='add'>+</div><div class='add'>+		if (!chanctx_conf || !phy_ctxt) {</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		phy_ctxt-&gt;rlc_disabled = false;</div><div class='add'>+		static_chains = chanctx_conf-&gt;rx_chains_static;</div><div class='add'>+		dynamic_chains = chanctx_conf-&gt;rx_chains_dynamic;</div><div class='add'>+</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		ret = iwl_mvm_phy_send_rlc(mvm, phy_ctxt, static_chains,</div><div class='add'>+					   dynamic_chains);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_dbg_tlv_time_point(&amp;mvm-&gt;fwrt, IWL_FW_INI_TIME_ESR_LINK_DOWN,</div><div class='add'>+			       NULL);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+__iwl_mvm_mld_unassign_vif_chanctx(struct iwl_mvm *mvm,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				   struct ieee80211_chanctx_conf *ctx,</div><div class='add'>+				   bool switching_chanctx)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	unsigned int n_active = iwl_mvm_mld_count_active_links(mvmvif);</div><div class='add'>+	unsigned int link_id = link_conf-&gt;link_id;</div><div class='add'>+</div><div class='add'>+	/* shouldn't happen, but verify link_id is valid before accessing */</div><div class='add'>+	if (WARN_ON_ONCE(!mvmvif-&gt;link[link_id]))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp; switching_chanctx) {</div><div class='add'>+		mvmvif-&gt;csa_countdown = false;</div><div class='add'>+</div><div class='add'>+		/* Set CS bit on all the stations */</div><div class='add'>+		iwl_mvm_modify_all_sta_disable_tx(mvm, mvmvif, true);</div><div class='add'>+</div><div class='add'>+		/* Save blocked iface, the timeout is set on the next beacon */</div><div class='add'>+		rcu_assign_pointer(mvm-&gt;csa_tx_blocked_vif, vif);</div><div class='add'>+</div><div class='add'>+		mvmvif-&gt;ap_ibss_active = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mvm_link_changed(mvm, vif, link_conf,</div><div class='add'>+			     LINK_CONTEXT_MODIFY_ACTIVE, false);</div><div class='add'>+</div><div class='add'>+	if (iwl_mvm_is_esr_supported(mvm-&gt;fwrt.trans) &amp;&amp; n_active &gt; 1) {</div><div class='add'>+		int ret = iwl_mvm_esr_mode_inactive(mvm, vif);</div><div class='add'>+</div><div class='add'>+		if (ret)</div><div class='add'>+			IWL_ERR(mvm, "failed to deactivate ESR mode (%d)\n",</div><div class='add'>+				ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_MONITOR)</div><div class='add'>+		iwl_mvm_mld_rm_snif_sta(mvm, vif);</div><div class='add'>+</div><div class='add'>+	if (switching_chanctx)</div><div class='add'>+		return;</div><div class='add'>+	mvmvif-&gt;link[link_id]-&gt;phy_ctxt = NULL;</div><div class='add'>+	iwl_mvm_power_update_mac(mvm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_mld_unassign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+					     struct ieee80211_vif *vif,</div><div class='add'>+					     struct ieee80211_bss_conf *link_conf,</div><div class='add'>+					     struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	__iwl_mvm_mld_unassign_vif_chanctx(mvm, vif, link_conf, ctx, false);</div><div class='add'>+	/* in the non-MLD case, remove/re-add the link to clean up FW state */</div><div class='add'>+	if (!ieee80211_vif_is_mld(vif) &amp;&amp; !mvmvif-&gt;ap_sta &amp;&amp;</div><div class='add'>+	    !WARN_ON_ONCE(vif-&gt;cfg.assoc)) {</div><div class='add'>+		iwl_mvm_remove_link(mvm, vif, link_conf);</div><div class='add'>+		iwl_mvm_add_link(mvm, vif, link_conf);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mvm_tpe_sta_cmd_data(struct iwl_txpower_constraints_cmd *cmd,</div><div class='add'>+			 const struct ieee80211_bss_conf *bss_info)</div><div class='add'>+{</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * NOTE: the 0 here is IEEE80211_TPE_CAT_6GHZ_DEFAULT,</div><div class='add'>+	 * we fully ignore IEEE80211_TPE_CAT_6GHZ_SUBORDINATE</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(cmd-&gt;psd_pwr) !=</div><div class='add'>+		     ARRAY_SIZE(bss_info-&gt;tpe.psd_local[0].power));</div><div class='add'>+</div><div class='add'>+	/* if not valid, mac80211 puts default (max value) */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(cmd-&gt;psd_pwr); i++)</div><div class='add'>+		cmd-&gt;psd_pwr[i] = min(bss_info-&gt;tpe.psd_local[0].power[i],</div><div class='add'>+				      bss_info-&gt;tpe.psd_reg_client[0].power[i]);</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(cmd-&gt;eirp_pwr) !=</div><div class='add'>+		     ARRAY_SIZE(bss_info-&gt;tpe.max_local[0].power));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(cmd-&gt;eirp_pwr); i++)</div><div class='add'>+		cmd-&gt;eirp_pwr[i] = min(bss_info-&gt;tpe.max_local[0].power[i],</div><div class='add'>+				       bss_info-&gt;tpe.max_reg_client[0].power[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+iwl_mvm_send_ap_tx_power_constraint_cmd(struct iwl_mvm *mvm,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					struct ieee80211_bss_conf *bss_conf,</div><div class='add'>+					bool is_ap)</div><div class='add'>+{</div><div class='add'>+	struct iwl_txpower_constraints_cmd cmd = {};</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm_vif_link_info *link_info =</div><div class='add'>+			mvmvif-&gt;link[bss_conf-&gt;link_id];</div><div class='add'>+	u32 cmd_id = WIDE_ID(PHY_OPS_GROUP, AP_TX_POWER_CONSTRAINTS_CMD);</div><div class='add'>+	u32 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, cmd_id,</div><div class='add'>+					    IWL_FW_CMD_VER_UNKNOWN);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (cmd_ver == IWL_FW_CMD_VER_UNKNOWN)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!link_info-&gt;active ||</div><div class='add'>+	    link_info-&gt;fw_link_id == IWL_MVM_FW_LINK_ID_INVALID)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (bss_conf-&gt;chanreq.oper.chan-&gt;band != NL80211_BAND_6GHZ)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cmd.link_id = cpu_to_le16(link_info-&gt;fw_link_id);</div><div class='add'>+	memset(cmd.psd_pwr, DEFAULT_TPE_TX_POWER, sizeof(cmd.psd_pwr));</div><div class='add'>+	memset(cmd.eirp_pwr, DEFAULT_TPE_TX_POWER, sizeof(cmd.eirp_pwr));</div><div class='add'>+</div><div class='add'>+	if (is_ap) {</div><div class='add'>+		cmd.ap_type = cpu_to_le16(IWL_6GHZ_AP_TYPE_VLP);</div><div class='add'>+	} else if (bss_conf-&gt;power_type == IEEE80211_REG_UNSET_AP) {</div><div class='add'>+		return;</div><div class='add'>+	} else {</div><div class='add'>+		cmd.ap_type = cpu_to_le16(bss_conf-&gt;power_type - 1);</div><div class='add'>+		iwl_mvm_tpe_sta_cmd_data(&amp;cmd, bss_conf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_send_cmd_pdu(mvm,</div><div class='add'>+				   WIDE_ID(PHY_OPS_GROUP,</div><div class='add'>+					   AP_TX_POWER_CONSTRAINTS_CMD),</div><div class='add'>+				   0, sizeof(cmd), &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mvm,</div><div class='add'>+			"failed to send AP_TX_POWER_CONSTRAINTS_CMD (%d)\n",</div><div class='add'>+			ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mld_start_ap_ibss(struct ieee80211_hw *hw,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP)</div><div class='add'>+		iwl_mvm_send_ap_tx_power_constraint_cmd(mvm, vif,</div><div class='add'>+							link_conf, true);</div><div class='add'>+</div><div class='add'>+	/* Send the beacon template */</div><div class='add'>+	ret = iwl_mvm_mac_ctxt_beacon_changed(mvm, vif, link_conf);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* the link should be already activated when assigning chan context */</div><div class='add'>+	ret = iwl_mvm_link_changed(mvm, vif, link_conf,</div><div class='add'>+				   LINK_CONTEXT_MODIFY_ALL &amp;</div><div class='add'>+				   ~LINK_CONTEXT_MODIFY_ACTIVE,</div><div class='add'>+				   true);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_mld_add_mcast_sta(mvm, vif, link_conf);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Send the bcast station. At this stage the TBTT and DTIM time</div><div class='add'>+	 * events are added and applied to the scheduler</div><div class='add'>+	 */</div><div class='add'>+	ret = iwl_mvm_mld_add_bcast_sta(mvm, vif, link_conf);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_rm_mcast;</div><div class='add'>+</div><div class='add'>+	if (iwl_mvm_start_ap_ibss_common(hw, vif, &amp;ret))</div><div class='add'>+		goto out_failed;</div><div class='add'>+</div><div class='add'>+	/* Need to update the P2P Device MAC (only GO, IBSS is single vif) */</div><div class='add'>+	if (vif-&gt;p2p &amp;&amp; mvm-&gt;p2p_device_vif)</div><div class='add'>+		iwl_mvm_mld_mac_ctxt_changed(mvm, mvm-&gt;p2p_device_vif, false);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_bt_coex_vif_change(mvm);</div><div class='add'>+</div><div class='add'>+	/* we don't support TDLS during DCM */</div><div class='add'>+	if (iwl_mvm_phy_ctx_count(mvm) &gt; 1)</div><div class='add'>+		iwl_mvm_teardown_tdls_peers(mvm);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_ftm_restart_responder(mvm, vif, link_conf);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_failed:</div><div class='add'>+	iwl_mvm_power_update_mac(mvm);</div><div class='add'>+	mvmvif-&gt;ap_ibss_active = false;</div><div class='add'>+	iwl_mvm_mld_rm_bcast_sta(mvm, vif, link_conf);</div><div class='add'>+out_rm_mcast:</div><div class='add'>+	iwl_mvm_mld_rm_mcast_sta(mvm, vif, link_conf);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mld_start_ap(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	return iwl_mvm_mld_start_ap_ibss(hw, vif, link_conf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mld_start_ibss(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	return iwl_mvm_mld_start_ap_ibss(hw, vif, &amp;vif-&gt;bss_conf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_mld_stop_ap_ibss(struct ieee80211_hw *hw,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_stop_ap_ibss_common(mvm, vif);</div><div class='add'>+</div><div class='add'>+	/* Need to update the P2P Device MAC (only GO, IBSS is single vif) */</div><div class='add'>+	if (vif-&gt;p2p &amp;&amp; mvm-&gt;p2p_device_vif)</div><div class='add'>+		iwl_mvm_mld_mac_ctxt_changed(mvm, mvm-&gt;p2p_device_vif, false);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_ftm_responder_clear(mvm, vif);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_mld_rm_bcast_sta(mvm, vif, link_conf);</div><div class='add'>+	iwl_mvm_mld_rm_mcast_sta(mvm, vif, link_conf);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_power_update_mac(mvm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_mld_stop_ap(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	iwl_mvm_mld_stop_ap_ibss(hw, vif, link_conf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_mld_stop_ibss(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	iwl_mvm_mld_stop_ap_ibss(hw, vif, &amp;vif-&gt;bss_conf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mld_mac_sta_state(struct ieee80211_hw *hw,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     struct ieee80211_sta *sta,</div><div class='add'>+				     enum ieee80211_sta_state old_state,</div><div class='add'>+				     enum ieee80211_sta_state new_state)</div><div class='add'>+{</div><div class='add'>+	static const struct iwl_mvm_sta_state_ops callbacks = {</div><div class='add'>+		.add_sta = iwl_mvm_mld_add_sta,</div><div class='add'>+		.update_sta = iwl_mvm_mld_update_sta,</div><div class='add'>+		.rm_sta = iwl_mvm_mld_rm_sta,</div><div class='add'>+		.mac_ctxt_changed = iwl_mvm_mld_mac_ctxt_changed,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_mac_sta_state_common(hw, vif, sta, old_state, new_state,</div><div class='add'>+					    &amp;callbacks);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mvm_mld_link_info_changed_station(struct iwl_mvm *mvm,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				      u64 changes)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	bool has_he, has_eht;</div><div class='add'>+	u32 link_changes = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!mvmvif-&gt;link[link_conf-&gt;link_id]))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* not yet marked active in vif means during link switch */</div><div class='add'>+	if (!ieee80211_vif_link_active(vif, link_conf-&gt;link_id) &amp;&amp;</div><div class='add'>+	    vif-&gt;cfg.assoc &amp;&amp; mvmvif-&gt;link[link_conf-&gt;link_id]-&gt;phy_ctxt)</div><div class='add'>+		link_changes |= LINK_CONTEXT_MODIFY_ACTIVE;</div><div class='add'>+</div><div class='add'>+	has_he = link_conf-&gt;he_support &amp;&amp; !iwlwifi_mod_params.disable_11ax;</div><div class='add'>+	has_eht = link_conf-&gt;eht_support &amp;&amp; !iwlwifi_mod_params.disable_11be;</div><div class='add'>+</div><div class='add'>+	/* Update EDCA params */</div><div class='add'>+	if (changes &amp; BSS_CHANGED_QOS &amp;&amp; vif-&gt;cfg.assoc &amp;&amp; link_conf-&gt;qos)</div><div class='add'>+		link_changes |= LINK_CONTEXT_MODIFY_QOS_PARAMS;</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_ERP_SLOT)</div><div class='add'>+		link_changes |= LINK_CONTEXT_MODIFY_RATES_INFO;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;cfg.assoc &amp;&amp; (has_he || has_eht)) {</div><div class='add'>+		IWL_DEBUG_MAC80211(mvm, "Associated in HE mode\n");</div><div class='add'>+		link_changes |= LINK_CONTEXT_MODIFY_HE_PARAMS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if associated, maybe puncturing changed - we'll check later */</div><div class='add'>+	if (vif-&gt;cfg.assoc)</div><div class='add'>+		link_changes |= LINK_CONTEXT_MODIFY_EHT_PARAMS;</div><div class='add'>+</div><div class='add'>+	if (link_changes) {</div><div class='add'>+		ret = iwl_mvm_link_changed(mvm, vif, link_conf, link_changes,</div><div class='add'>+					   true);</div><div class='add'>+		if (ret)</div><div class='add'>+			IWL_ERR(mvm, "failed to update link\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_mld_mac_ctxt_changed(mvm, vif, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mvm, "failed to update MAC %pM\n", vif-&gt;addr);</div><div class='add'>+</div><div class='add'>+	memcpy(mvmvif-&gt;link[link_conf-&gt;link_id]-&gt;bssid, link_conf-&gt;bssid,</div><div class='add'>+	       ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_bss_info_changed_station_common(mvm, vif, link_conf, changes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mvm_mld_vif_have_valid_ap_sta(struct iwl_mvm_vif *mvmvif)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_mvm_vif_valid_link(mvmvif, i) {</div><div class='add'>+		if (mvmvif-&gt;link[i]-&gt;ap_sta_id != IWL_INVALID_STA)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_mld_vif_cfg_changed_station(struct iwl_mvm *mvm,</div><div class='add'>+						struct ieee80211_vif *vif,</div><div class='add'>+						u64 changes)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	bool protect = false;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* This might get called without active links during the</div><div class='add'>+	 * chanctx switch, but we don't care about it anyway.</div><div class='add'>+	 */</div><div class='add'>+	if (changes == BSS_CHANGED_IDLE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_mld_mac_ctxt_changed(mvm, vif, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mvm, "failed to update MAC %pM\n", vif-&gt;addr);</div><div class='add'>+</div><div class='add'>+	mvmvif-&gt;associated = vif-&gt;cfg.assoc;</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_ASSOC) {</div><div class='add'>+		if (vif-&gt;cfg.assoc) {</div><div class='add'>+			mvmvif-&gt;session_prot_connection_loss = false;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Clear statistics to get clean beacon counter, and ask for</div><div class='add'>+			 * periodic statistics, as they are needed for link</div><div class='add'>+			 * selection and RX OMI decisions.</div><div class='add'>+			 */</div><div class='add'>+			iwl_mvm_request_statistics(mvm, true);</div><div class='add'>+			iwl_mvm_request_periodic_system_statistics(mvm, true);</div><div class='add'>+			iwl_mvm_sf_update(mvm, vif, false);</div><div class='add'>+			iwl_mvm_power_vif_assoc(mvm, vif);</div><div class='add'>+</div><div class='add'>+			for_each_mvm_vif_valid_link(mvmvif, i) {</div><div class='add'>+				memset(&amp;mvmvif-&gt;link[i]-&gt;beacon_stats, 0,</div><div class='add'>+				       sizeof(mvmvif-&gt;link[i]-&gt;beacon_stats));</div><div class='add'>+</div><div class='add'>+				if (vif-&gt;p2p) {</div><div class='add'>+					iwl_mvm_update_smps(mvm, vif,</div><div class='add'>+							    IWL_MVM_SMPS_REQ_PROT,</div><div class='add'>+							    IEEE80211_SMPS_DYNAMIC, i);</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				rcu_read_lock();</div><div class='add'>+				link_conf = rcu_dereference(vif-&gt;link_conf[i]);</div><div class='add'>+				if (link_conf &amp;&amp; !link_conf-&gt;dtim_period)</div><div class='add'>+					protect = true;</div><div class='add'>+				rcu_read_unlock();</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status) &amp;&amp;</div><div class='add'>+			    protect) {</div><div class='add'>+				/* We are in assoc so only one link is active-</div><div class='add'>+				 * The association link</div><div class='add'>+				 */</div><div class='add'>+				unsigned int link_id =</div><div class='add'>+					ffs(vif-&gt;active_links) - 1;</div><div class='add'>+</div><div class='add'>+				/* If we're not restarting and still haven't</div><div class='add'>+				 * heard a beacon (dtim period unknown) then</div><div class='add'>+				 * make sure we still have enough minimum time</div><div class='add'>+				 * remaining in the time event, since the auth</div><div class='add'>+				 * might actually have taken quite a while</div><div class='add'>+				 * (especially for SAE) and so the remaining</div><div class='add'>+				 * time could be small without us having heard</div><div class='add'>+				 * a beacon yet.</div><div class='add'>+				 */</div><div class='add'>+				iwl_mvm_protect_assoc(mvm, vif, 0, link_id);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			iwl_mvm_sf_update(mvm, vif, false);</div><div class='add'>+</div><div class='add'>+			/* FIXME: need to decide about misbehaving AP handling */</div><div class='add'>+			iwl_mvm_power_vif_assoc(mvm, vif);</div><div class='add'>+		} else if (iwl_mvm_mld_vif_have_valid_ap_sta(mvmvif)) {</div><div class='add'>+			iwl_mvm_mei_host_disassociated(mvm);</div><div class='add'>+</div><div class='add'>+			iwl_mvm_request_periodic_system_statistics(mvm, false);</div><div class='add'>+</div><div class='add'>+			/* If update fails - SF might be running in associated</div><div class='add'>+			 * mode while disassociated - which is forbidden.</div><div class='add'>+			 */</div><div class='add'>+			ret = iwl_mvm_sf_update(mvm, vif, false);</div><div class='add'>+			WARN_ONCE(ret &amp;&amp;</div><div class='add'>+				  !test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED,</div><div class='add'>+					    &amp;mvm-&gt;status),</div><div class='add'>+				  "Failed to update SF upon disassociation\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		iwl_mvm_bss_info_changed_station_assoc(mvm, vif, changes);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_PS) {</div><div class='add'>+		iwl_mvm_smps_workaround(mvm, vif, false);</div><div class='add'>+		ret = iwl_mvm_power_update_mac(mvm);</div><div class='add'>+		if (ret)</div><div class='add'>+			IWL_ERR(mvm, "failed to update power mode\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mvm_mld_link_info_changed_ap_ibss(struct iwl_mvm *mvm,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				      u64 changes)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	u32 link_changes = LINK_CONTEXT_MODIFY_PROTECT_FLAGS |</div><div class='add'>+			   LINK_CONTEXT_MODIFY_QOS_PARAMS;</div><div class='add'>+</div><div class='add'>+	/* Changes will be applied when the AP/IBSS is started */</div><div class='add'>+	if (!mvmvif-&gt;ap_ibss_active)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (link_conf-&gt;he_support)</div><div class='add'>+		link_changes |= LINK_CONTEXT_MODIFY_HE_PARAMS;</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_ERP_SLOT)</div><div class='add'>+		link_changes |= LINK_CONTEXT_MODIFY_RATES_INFO;</div><div class='add'>+</div><div class='add'>+	if (changes &amp; (BSS_CHANGED_ERP_CTS_PROT | BSS_CHANGED_ERP_SLOT |</div><div class='add'>+		       BSS_CHANGED_HT |</div><div class='add'>+		       BSS_CHANGED_BANDWIDTH | BSS_CHANGED_QOS |</div><div class='add'>+		       BSS_CHANGED_HE_BSS_COLOR) &amp;&amp;</div><div class='add'>+		       iwl_mvm_link_changed(mvm, vif, link_conf,</div><div class='add'>+					    link_changes, true))</div><div class='add'>+		IWL_ERR(mvm, "failed to update MAC %pM\n", vif-&gt;addr);</div><div class='add'>+</div><div class='add'>+	/* Need to send a new beacon template to the FW */</div><div class='add'>+	if (changes &amp; BSS_CHANGED_BEACON &amp;&amp;</div><div class='add'>+	    iwl_mvm_mac_ctxt_beacon_changed(mvm, vif, link_conf))</div><div class='add'>+		IWL_WARN(mvm, "Failed updating beacon data\n");</div><div class='add'>+</div><div class='add'>+	/* FIXME: need to decide if we need FTM responder per link */</div><div class='add'>+	if (changes &amp; BSS_CHANGED_FTM_RESPONDER) {</div><div class='add'>+		int ret = iwl_mvm_ftm_start_responder(mvm, vif, link_conf);</div><div class='add'>+</div><div class='add'>+		if (ret)</div><div class='add'>+			IWL_WARN(mvm, "Failed to enable FTM responder (%d)\n",</div><div class='add'>+				 ret);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_mld_link_info_changed(struct ieee80211_hw *hw,</div><div class='add'>+					  struct ieee80211_vif *vif,</div><div class='add'>+					  struct ieee80211_bss_conf *link_conf,</div><div class='add'>+					  u64 changes)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+</div><div class='add'>+	switch (vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		iwl_mvm_mld_link_info_changed_station(mvm, vif, link_conf,</div><div class='add'>+						      changes);</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		iwl_mvm_mld_link_info_changed_ap_ibss(mvm, vif, link_conf,</div><div class='add'>+						      changes);</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_MONITOR:</div><div class='add'>+		if (changes &amp; BSS_CHANGED_MU_GROUPS)</div><div class='add'>+			iwl_mvm_update_mu_groups(mvm, vif);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* shouldn't happen */</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_TXPOWER) {</div><div class='add'>+		IWL_DEBUG_CALIB(mvm, "Changing TX Power to %d dBm\n",</div><div class='add'>+				link_conf-&gt;txpower);</div><div class='add'>+		iwl_mvm_set_tx_power(mvm, link_conf, link_conf-&gt;txpower);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_mld_vif_cfg_changed(struct ieee80211_hw *hw,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					u64 changes)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_IDLE &amp;&amp; !vif-&gt;cfg.idle)</div><div class='add'>+		iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_SCHED, true);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+		iwl_mvm_mld_vif_cfg_changed_station(mvm, vif, changes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mvm_mld_switch_vif_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+			       struct ieee80211_vif_chanctx_switch *vifs,</div><div class='add'>+			       int n_vifs,</div><div class='add'>+			       enum ieee80211_chanctx_switch_mode mode)</div><div class='add'>+{</div><div class='add'>+	static const struct iwl_mvm_switch_vif_chanctx_ops ops = {</div><div class='add'>+		.__assign_vif_chanctx = __iwl_mvm_mld_assign_vif_chanctx,</div><div class='add'>+		.__unassign_vif_chanctx = __iwl_mvm_mld_unassign_vif_chanctx,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_switch_vif_chanctx_common(hw, vifs, n_vifs, mode, &amp;ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_mld_config_iface_filter(struct ieee80211_hw *hw,</div><div class='add'>+					    struct ieee80211_vif *vif,</div><div class='add'>+					    unsigned int filter_flags,</div><div class='add'>+					    unsigned int changed_flags)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+</div><div class='add'>+	/* We support only filter for probe requests */</div><div class='add'>+	if (!(changed_flags &amp; FIF_PROBE_REQ))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Supported only for p2p client interfaces */</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION || !vif-&gt;cfg.assoc ||</div><div class='add'>+	    !vif-&gt;p2p)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+	iwl_mvm_mld_mac_ctxt_changed(mvm, vif, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mvm_mld_mac_conf_tx(struct ieee80211_hw *hw,</div><div class='add'>+			struct ieee80211_vif *vif,</div><div class='add'>+			unsigned int link_id, u16 ac,</div><div class='add'>+			const struct ieee80211_tx_queue_params *params)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm_vif_link_info *mvm_link = mvmvif-&gt;link[link_id];</div><div class='add'>+</div><div class='add'>+	if (!mvm_link)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mvm_link-&gt;queue_params[ac] = *params;</div><div class='add'>+</div><div class='add'>+	/* No need to update right away, we'll get BSS_CHANGED_QOS</div><div class='add'>+	 * The exception is P2P_DEVICE interface which needs immediate update.</div><div class='add'>+	 */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE) {</div><div class='add'>+		guard(mvm)(mvm);</div><div class='add'>+		return iwl_mvm_link_changed(mvm, vif, &amp;vif-&gt;bss_conf,</div><div class='add'>+					    LINK_CONTEXT_MODIFY_QOS_PARAMS,</div><div class='add'>+					    true);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mld_roc_link(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* The PHY context ID might have changed so need to set it */</div><div class='add'>+	ret = iwl_mvm_link_changed(mvm, vif, &amp;vif-&gt;bss_conf, 0, false);</div><div class='add'>+	if (WARN(ret, "Failed to set PHY context ID\n"))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_link_changed(mvm, vif, &amp;vif-&gt;bss_conf,</div><div class='add'>+				   LINK_CONTEXT_MODIFY_ACTIVE |</div><div class='add'>+				   LINK_CONTEXT_MODIFY_RATES_INFO,</div><div class='add'>+				   true);</div><div class='add'>+</div><div class='add'>+	if (WARN(ret, "Failed linking P2P_DEVICE\n"))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* The station and queue allocation must be done only after the linking</div><div class='add'>+	 * is done, as otherwise the FW might incorrectly configure its state.</div><div class='add'>+	 */</div><div class='add'>+	return iwl_mvm_mld_add_bcast_sta(mvm, vif, &amp;vif-&gt;bss_conf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mld_roc(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			   struct ieee80211_channel *channel, int duration,</div><div class='add'>+			   enum ieee80211_roc_type type)</div><div class='add'>+{</div><div class='add'>+	static const struct iwl_mvm_roc_ops ops = {</div><div class='add'>+		.add_aux_sta_for_hs20 = iwl_mvm_mld_add_aux_sta,</div><div class='add'>+		.link = iwl_mvm_mld_roc_link,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_roc_common(hw, vif, channel, duration, type, &amp;ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mvm_mld_change_vif_links(struct ieee80211_hw *hw,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     u16 old_links, u16 new_links,</div><div class='add'>+			     struct ieee80211_bss_conf *old[IEEE80211_MLD_MAX_NUM_LINKS])</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif_link_info *new_link[IEEE80211_MLD_MAX_NUM_LINKS] = {};</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+	u16 removed = old_links &amp; ~new_links;</div><div class='add'>+	u16 added = new_links &amp; ~old_links;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IEEE80211_MLD_MAX_NUM_LINKS; i++) {</div><div class='add'>+		if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!(added &amp; BIT(i)))</div><div class='add'>+			continue;</div><div class='add'>+		new_link[i] = kzalloc(sizeof(*new_link[i]), GFP_KERNEL);</div><div class='add'>+		if (!new_link[i]) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto free;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		new_link[i]-&gt;fw_link_id = IWL_MVM_FW_LINK_ID_INVALID;</div><div class='add'>+		iwl_mvm_init_link(new_link[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* If we're in RESTART flow, the default link wasn't added in</div><div class='add'>+         * drv_add_interface(), and link[0] doesn't point to it.</div><div class='add'>+	 */</div><div class='add'>+	if (old_links == 0 &amp;&amp; !test_bit(IWL_MVM_STATUS_IN_HW_RESTART,</div><div class='add'>+					&amp;mvm-&gt;status)) {</div><div class='add'>+		err = iwl_mvm_disable_link(mvm, vif, &amp;vif-&gt;bss_conf);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_err;</div><div class='add'>+		mvmvif-&gt;link[0] = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IEEE80211_MLD_MAX_NUM_LINKS; i++) {</div><div class='add'>+		if (removed &amp; BIT(i)) {</div><div class='add'>+			struct ieee80211_bss_conf *link_conf = old[i];</div><div class='add'>+</div><div class='add'>+			err = iwl_mvm_disable_link(mvm, vif, link_conf);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out_err;</div><div class='add'>+			kfree(mvmvif-&gt;link[i]);</div><div class='add'>+			mvmvif-&gt;link[i] = NULL;</div><div class='add'>+		} else if (added &amp; BIT(i)) {</div><div class='add'>+			struct ieee80211_bss_conf *link_conf;</div><div class='add'>+</div><div class='add'>+			link_conf = link_conf_dereference_protected(vif, i);</div><div class='add'>+			if (WARN_ON(!link_conf))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART,</div><div class='add'>+				      &amp;mvm-&gt;status))</div><div class='add'>+				mvmvif-&gt;link[i] = new_link[i];</div><div class='add'>+			new_link[i] = NULL;</div><div class='add'>+			err = iwl_mvm_add_link(mvm, vif, link_conf);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out_err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+	if (new_links == 0) {</div><div class='add'>+		mvmvif-&gt;link[0] = &amp;mvmvif-&gt;deflink;</div><div class='add'>+		err = iwl_mvm_add_link(mvm, vif, &amp;vif-&gt;bss_conf);</div><div class='add'>+		if (err == 0)</div><div class='add'>+			mvmvif-&gt;primary_link = 0;</div><div class='add'>+	} else if (!(new_links &amp; BIT(mvmvif-&gt;primary_link))) {</div><div class='add'>+		/*</div><div class='add'>+		 * Ensure we always have a valid primary_link, the real</div><div class='add'>+		 * decision happens later when PHY is activated.</div><div class='add'>+		 */</div><div class='add'>+		mvmvif-&gt;primary_link = __ffs(new_links);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	/* we really don't have a good way to roll back here ... */</div><div class='add'>+	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+free:</div><div class='add'>+	for (i = 0; i &lt; IEEE80211_MLD_MAX_NUM_LINKS; i++)</div><div class='add'>+		kfree(new_link[i]);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mvm_mld_change_sta_links(struct ieee80211_hw *hw,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_sta *sta,</div><div class='add'>+			     u16 old_links, u16 new_links)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+	return iwl_mvm_mld_update_sta_links(mvm, vif, sta, old_links, new_links);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool iwl_mvm_vif_has_esr_cap(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	const struct wiphy_iftype_ext_capab *ext_capa;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_vif_is_mld(vif) || !vif-&gt;cfg.assoc ||</div><div class='add'>+	    hweight16(ieee80211_vif_usable_links(vif)) == 1)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!(vif-&gt;cfg.eml_cap &amp; IEEE80211_EML_CAP_EMLSR_SUPP))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	ext_capa = cfg80211_get_iftype_ext_capa(mvm-&gt;hw-&gt;wiphy,</div><div class='add'>+						ieee80211_vif_type_p2p(vif));</div><div class='add'>+	return (ext_capa &amp;&amp;</div><div class='add'>+		(ext_capa-&gt;eml_capabilities &amp; IEEE80211_EML_CAP_EMLSR_SUPP));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mvm_mld_can_activate_links(struct ieee80211_hw *hw,</div><div class='add'>+					   struct ieee80211_vif *vif,</div><div class='add'>+					   u16 desired_links)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+	int n_links = hweight16(desired_links);</div><div class='add'>+</div><div class='add'>+	if (n_links &lt;= 1)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+</div><div class='add'>+	/* Check if HW supports the wanted number of links */</div><div class='add'>+	if (n_links &gt; iwl_mvm_max_active_links(mvm, vif))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* If it is an eSR device, check that we can enter eSR */</div><div class='add'>+	return iwl_mvm_is_esr_supported(mvm-&gt;fwrt.trans) &amp;&amp;</div><div class='add'>+	       iwl_mvm_vif_has_esr_cap(mvm, vif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum ieee80211_neg_ttlm_res</div><div class='add'>+iwl_mvm_mld_can_neg_ttlm(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			 struct ieee80211_neg_ttlm *neg_ttlm)</div><div class='add'>+{</div><div class='add'>+	u16 map;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	/* Verify all TIDs are mapped to the same links set */</div><div class='add'>+	map = neg_ttlm-&gt;downlink[0];</div><div class='add'>+	for (i = 0; i &lt; IEEE80211_TTLM_NUM_TIDS; i++) {</div><div class='add'>+		if (neg_ttlm-&gt;downlink[i] != neg_ttlm-&gt;uplink[i] ||</div><div class='add'>+		    neg_ttlm-&gt;uplink[i] != map)</div><div class='add'>+			return NEG_TTLM_RES_REJECT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NEG_TTLM_RES_ACCEPT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ieee80211_ops iwl_mvm_mld_hw_ops = {</div><div class='add'>+	.tx = iwl_mvm_mac_tx,</div><div class='add'>+	.wake_tx_queue = iwl_mvm_mac_wake_tx_queue,</div><div class='add'>+	.ampdu_action = iwl_mvm_mac_ampdu_action,</div><div class='add'>+	.get_antenna = iwl_mvm_op_get_antenna,</div><div class='add'>+	.set_antenna = iwl_mvm_op_set_antenna,</div><div class='add'>+	.start = iwl_mvm_mac_start,</div><div class='add'>+	.reconfig_complete = iwl_mvm_mac_reconfig_complete,</div><div class='add'>+	.stop = iwl_mvm_mac_stop,</div><div class='add'>+	.add_interface = iwl_mvm_mld_mac_add_interface,</div><div class='add'>+	.remove_interface = iwl_mvm_mld_mac_remove_interface,</div><div class='add'>+	.config = iwl_mvm_mac_config,</div><div class='add'>+	.prepare_multicast = iwl_mvm_prepare_multicast,</div><div class='add'>+	.configure_filter = iwl_mvm_configure_filter,</div><div class='add'>+	.config_iface_filter = iwl_mvm_mld_config_iface_filter,</div><div class='add'>+	.link_info_changed = iwl_mvm_mld_link_info_changed,</div><div class='add'>+	.vif_cfg_changed = iwl_mvm_mld_vif_cfg_changed,</div><div class='add'>+	.hw_scan = iwl_mvm_mac_hw_scan,</div><div class='add'>+	.cancel_hw_scan = iwl_mvm_mac_cancel_hw_scan,</div><div class='add'>+	.sta_pre_rcu_remove = iwl_mvm_sta_pre_rcu_remove,</div><div class='add'>+	.sta_state = iwl_mvm_mld_mac_sta_state,</div><div class='add'>+	.sta_notify = iwl_mvm_mac_sta_notify,</div><div class='add'>+	.allow_buffered_frames = iwl_mvm_mac_allow_buffered_frames,</div><div class='add'>+	.release_buffered_frames = iwl_mvm_mac_release_buffered_frames,</div><div class='add'>+	.set_rts_threshold = iwl_mvm_mac_set_rts_threshold,</div><div class='add'>+	.link_sta_rc_update = iwl_mvm_sta_rc_update,</div><div class='add'>+	.conf_tx = iwl_mvm_mld_mac_conf_tx,</div><div class='add'>+	.mgd_prepare_tx = iwl_mvm_mac_mgd_prepare_tx,</div><div class='add'>+	.mgd_complete_tx = iwl_mvm_mac_mgd_complete_tx,</div><div class='add'>+	.mgd_protect_tdls_discover = iwl_mvm_mac_mgd_protect_tdls_discover,</div><div class='add'>+	.flush = iwl_mvm_mac_flush,</div><div class='add'>+	.flush_sta = iwl_mvm_mac_flush_sta,</div><div class='add'>+	.sched_scan_start = iwl_mvm_mac_sched_scan_start,</div><div class='add'>+	.sched_scan_stop = iwl_mvm_mac_sched_scan_stop,</div><div class='add'>+	.set_key = iwl_mvm_mac_set_key,</div><div class='add'>+	.update_tkip_key = iwl_mvm_mac_update_tkip_key,</div><div class='add'>+	.remain_on_channel = iwl_mvm_mld_roc,</div><div class='add'>+	.cancel_remain_on_channel = iwl_mvm_cancel_roc,</div><div class='add'>+	.add_chanctx = iwl_mvm_add_chanctx,</div><div class='add'>+	.remove_chanctx = iwl_mvm_remove_chanctx,</div><div class='add'>+	.change_chanctx = iwl_mvm_change_chanctx,</div><div class='add'>+	.assign_vif_chanctx = iwl_mvm_mld_assign_vif_chanctx,</div><div class='add'>+	.unassign_vif_chanctx = iwl_mvm_mld_unassign_vif_chanctx,</div><div class='add'>+	.switch_vif_chanctx = iwl_mvm_mld_switch_vif_chanctx,</div><div class='add'>+</div><div class='add'>+	.start_ap = iwl_mvm_mld_start_ap,</div><div class='add'>+	.stop_ap = iwl_mvm_mld_stop_ap,</div><div class='add'>+	.join_ibss = iwl_mvm_mld_start_ibss,</div><div class='add'>+	.leave_ibss = iwl_mvm_mld_stop_ibss,</div><div class='add'>+</div><div class='add'>+	.tx_last_beacon = iwl_mvm_tx_last_beacon,</div><div class='add'>+</div><div class='add'>+	.channel_switch = iwl_mvm_channel_switch,</div><div class='add'>+	.pre_channel_switch = iwl_mvm_mac_pre_channel_switch,</div><div class='add'>+	.post_channel_switch = iwl_mvm_post_channel_switch,</div><div class='add'>+	.abort_channel_switch = iwl_mvm_abort_channel_switch,</div><div class='add'>+	.channel_switch_rx_beacon = iwl_mvm_channel_switch_rx_beacon,</div><div class='add'>+</div><div class='add'>+	.tdls_channel_switch = iwl_mvm_tdls_channel_switch,</div><div class='add'>+	.tdls_cancel_channel_switch = iwl_mvm_tdls_cancel_channel_switch,</div><div class='add'>+	.tdls_recv_channel_switch = iwl_mvm_tdls_recv_channel_switch,</div><div class='add'>+</div><div class='add'>+	.event_callback = iwl_mvm_mac_event_callback,</div><div class='add'>+</div><div class='add'>+	.sync_rx_queues = iwl_mvm_sync_rx_queues,</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	/* look at d3.c */</div><div class='add'>+	.suspend = iwl_mvm_suspend,</div><div class='add'>+	.resume = iwl_mvm_resume,</div><div class='add'>+	.set_wakeup = iwl_mvm_set_wakeup,</div><div class='add'>+	.set_rekey_data = iwl_mvm_set_rekey_data,</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	.ipv6_addr_change = iwl_mvm_ipv6_addr_change,</div><div class='add'>+#endif</div><div class='add'>+	.set_default_unicast_key = iwl_mvm_set_default_unicast_key,</div><div class='add'>+#endif</div><div class='add'>+	.get_survey = iwl_mvm_mac_get_survey,</div><div class='add'>+	.sta_statistics = iwl_mvm_mac_sta_statistics,</div><div class='add'>+	.get_ftm_responder_stats = iwl_mvm_mac_get_ftm_responder_stats,</div><div class='add'>+	.start_pmsr = iwl_mvm_start_pmsr,</div><div class='add'>+	.abort_pmsr = iwl_mvm_abort_pmsr,</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='add'>+	.vif_add_debugfs = iwl_mvm_vif_add_debugfs,</div><div class='add'>+	.link_add_debugfs = iwl_mvm_link_add_debugfs,</div><div class='add'>+	.link_sta_add_debugfs = iwl_mvm_link_sta_add_debugfs,</div><div class='add'>+#endif</div><div class='add'>+	.set_hw_timestamp = iwl_mvm_set_hw_timestamp,</div><div class='add'>+</div><div class='add'>+	.change_vif_links = iwl_mvm_mld_change_vif_links,</div><div class='add'>+	.change_sta_links = iwl_mvm_mld_change_sta_links,</div><div class='add'>+	.can_activate_links = iwl_mvm_mld_can_activate_links,</div><div class='add'>+	.can_neg_ttlm = iwl_mvm_mld_can_neg_ttlm,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c<br/>new file mode 100644<br/>index 000000000000..d9a2801636cf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c</a></div><div class='hunk'>@@ -0,0 +1,1226 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2022-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include "mvm.h"</div><div class='add'>+#include "time-sync.h"</div><div class='add'>+#include "sta.h"</div><div class='add'>+</div><div class='add'>+u32 iwl_mvm_sta_fw_id_mask(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='add'>+			   int filter_link_id)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	struct iwl_mvm_sta *mvmsta;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+	u32 result = 0;</div><div class='add'>+</div><div class='add'>+	if (!sta)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	vif = mvmsta-&gt;vif;</div><div class='add'>+</div><div class='add'>+	/* it's easy when the STA is not an MLD */</div><div class='add'>+	if (!sta-&gt;valid_links)</div><div class='add'>+		return BIT(mvmsta-&gt;deflink.sta_id);</div><div class='add'>+</div><div class='add'>+	/* but if it is an MLD, get the mask of all the FW STAs it has ... */</div><div class='add'>+	for_each_sta_active_link(vif, sta, link_sta, link_id) {</div><div class='add'>+		struct iwl_mvm_link_sta *mvm_link_sta;</div><div class='add'>+</div><div class='add'>+		/* unless we have a specific link in mind */</div><div class='add'>+		if (filter_link_id &gt;= 0 &amp;&amp; link_id != filter_link_id)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mvm_link_sta =</div><div class='add'>+			rcu_dereference_check(mvmsta-&gt;link[link_id],</div><div class='add'>+					      lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+		if (!mvm_link_sta)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		result |= BIT(mvm_link_sta-&gt;sta_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mld_send_sta_cmd(struct iwl_mvm *mvm,</div><div class='add'>+				    struct iwl_sta_cfg_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	u32 cmd_id = WIDE_ID(MAC_CONF_GROUP, STA_CONFIG_CMD);</div><div class='add'>+	int cmd_len = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, cmd_id, 0) &gt; 1 ?</div><div class='add'>+		      sizeof(*cmd) :</div><div class='add'>+		      sizeof(struct iwl_sta_cfg_cmd_v1);</div><div class='add'>+	int ret = iwl_mvm_send_cmd_pdu(mvm,</div><div class='add'>+				       WIDE_ID(MAC_CONF_GROUP, STA_CONFIG_CMD),</div><div class='add'>+				       0, cmd_len, cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mvm, "STA_CONFIG_CMD send failed, ret=0x%x\n", ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Add an internal station to the FW table</div><div class='add'>+ */</div><div class='add'>+static int iwl_mvm_mld_add_int_sta_to_fw(struct iwl_mvm *mvm,</div><div class='add'>+					 struct iwl_mvm_int_sta *sta,</div><div class='add'>+					 const u8 *addr, int link_id)</div><div class='add'>+{</div><div class='add'>+	struct iwl_sta_cfg_cmd cmd;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='add'>+	cmd.sta_id = cpu_to_le32((u8)sta-&gt;sta_id);</div><div class='add'>+</div><div class='add'>+	cmd.link_id = cpu_to_le32(link_id);</div><div class='add'>+</div><div class='add'>+	cmd.station_type = cpu_to_le32(sta-&gt;type);</div><div class='add'>+</div><div class='add'>+	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			IWL_UCODE_TLV_CAPA_STA_EXP_MFP_SUPPORT) &amp;&amp;</div><div class='add'>+	    sta-&gt;type == STATION_TYPE_BCAST_MGMT)</div><div class='add'>+		cmd.mfp = cpu_to_le32(1);</div><div class='add'>+</div><div class='add'>+	if (addr) {</div><div class='add'>+		memcpy(cmd.peer_mld_address, addr, ETH_ALEN);</div><div class='add'>+		memcpy(cmd.peer_link_address, addr, ETH_ALEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_mld_send_sta_cmd(mvm, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Remove a station from the FW table. Before sending the command to remove</div><div class='add'>+ * the station validate that the station is indeed known to the driver (sanity</div><div class='add'>+ * only).</div><div class='add'>+ */</div><div class='add'>+static int iwl_mvm_mld_rm_sta_from_fw(struct iwl_mvm *mvm, u32 sta_id)</div><div class='add'>+{</div><div class='add'>+	struct iwl_remove_sta_cmd rm_sta_cmd = {</div><div class='add'>+		.sta_id = cpu_to_le32(sta_id),</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Note: internal stations are marked as error values */</div><div class='add'>+	if (!rcu_access_pointer(mvm-&gt;fw_id_to_mac_id[sta_id])) {</div><div class='add'>+		IWL_ERR(mvm, "Invalid station id %d\n", sta_id);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_send_cmd_pdu(mvm, WIDE_ID(MAC_CONF_GROUP, STA_REMOVE_CMD),</div><div class='add'>+				   0, sizeof(rm_sta_cmd), &amp;rm_sta_cmd);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(mvm, "Failed to remove station. Id=%d\n", sta_id);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_add_aux_sta_to_fw(struct iwl_mvm *mvm,</div><div class='add'>+				     struct iwl_mvm_int_sta *sta,</div><div class='add'>+				     u32 lmac_id)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	struct iwl_aux_sta_cmd cmd = {</div><div class='add'>+		.sta_id = cpu_to_le32(sta-&gt;sta_id),</div><div class='add'>+		.lmac_id = cpu_to_le32(lmac_id),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_send_cmd_pdu(mvm, WIDE_ID(MAC_CONF_GROUP, AUX_STA_CMD),</div><div class='add'>+				   0, sizeof(cmd), &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mvm, "Failed to send AUX_STA_CMD\n");</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Adds an internal sta to the FW table with its queues</div><div class='add'>+ */</div><div class='add'>+int iwl_mvm_mld_add_int_sta_with_queue(struct iwl_mvm *mvm,</div><div class='add'>+				       struct iwl_mvm_int_sta *sta,</div><div class='add'>+				       const u8 *addr, int link_id,</div><div class='add'>+				       u16 *queue, u8 tid,</div><div class='add'>+				       unsigned int *_wdg_timeout)</div><div class='add'>+{</div><div class='add'>+	int ret, txq;</div><div class='add'>+	unsigned int wdg_timeout = _wdg_timeout ? *_wdg_timeout :</div><div class='add'>+		mvm-&gt;trans-&gt;mac_cfg-&gt;base-&gt;wd_timeout;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(sta-&gt;sta_id == IWL_INVALID_STA))</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;type == STATION_TYPE_AUX)</div><div class='add'>+		ret = iwl_mvm_add_aux_sta_to_fw(mvm, sta, link_id);</div><div class='add'>+	else</div><div class='add'>+		ret = iwl_mvm_mld_add_int_sta_to_fw(mvm, sta, addr, link_id);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For 22000 firmware and on we cannot add queue to a station unknown</div><div class='add'>+	 * to firmware so enable queue here - after the station was added</div><div class='add'>+	 */</div><div class='add'>+	txq = iwl_mvm_tvqm_enable_txq(mvm, NULL, sta-&gt;sta_id, tid,</div><div class='add'>+				      wdg_timeout);</div><div class='add'>+	if (txq &lt; 0) {</div><div class='add'>+		iwl_mvm_mld_rm_sta_from_fw(mvm, sta-&gt;sta_id);</div><div class='add'>+		return txq;</div><div class='add'>+	}</div><div class='add'>+	*queue = txq;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Adds a new int sta: allocate it in the driver, add it to the FW table,</div><div class='add'>+ * and add its queues.</div><div class='add'>+ */</div><div class='add'>+static int iwl_mvm_mld_add_int_sta(struct iwl_mvm *mvm,</div><div class='add'>+				   struct iwl_mvm_int_sta *int_sta, u16 *queue,</div><div class='add'>+				   enum nl80211_iftype iftype,</div><div class='add'>+				   enum iwl_fw_sta_type sta_type,</div><div class='add'>+				   int link_id, const u8 *addr, u8 tid,</div><div class='add'>+				   unsigned int *wdg_timeout)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* qmask argument is not used in the new tx api, send a don't care */</div><div class='add'>+	ret = iwl_mvm_allocate_int_sta(mvm, int_sta, 0, iftype,</div><div class='add'>+				       sta_type);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_mld_add_int_sta_with_queue(mvm, int_sta, addr, link_id,</div><div class='add'>+						 queue, tid, wdg_timeout);</div><div class='add'>+	if (ret) {</div><div class='add'>+		iwl_mvm_dealloc_int_sta(mvm, int_sta);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Allocate a new station entry for the broadcast station to the given vif,</div><div class='add'>+ * and send it to the FW.</div><div class='add'>+ * Note that each P2P mac should have its own broadcast station.</div><div class='add'>+ */</div><div class='add'>+int iwl_mvm_mld_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			      struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm_vif_link_info *mvm_link =</div><div class='add'>+		mvmvif-&gt;link[link_conf-&gt;link_id];</div><div class='add'>+	struct iwl_mvm_int_sta *bsta = &amp;mvm_link-&gt;bcast_sta;</div><div class='add'>+	static const u8 _baddr[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};</div><div class='add'>+	const u8 *baddr = _baddr;</div><div class='add'>+	unsigned int wdg_timeout =</div><div class='add'>+		iwl_mvm_get_wd_timeout(mvm, vif);</div><div class='add'>+	u16 *queue;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_ADHOC)</div><div class='add'>+		baddr = link_conf-&gt;bssid;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='add'>+	    vif-&gt;type == NL80211_IFTYPE_ADHOC) {</div><div class='add'>+		queue = &amp;mvm_link-&gt;mgmt_queue;</div><div class='add'>+	} else if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE) {</div><div class='add'>+		queue = &amp;mvm-&gt;p2p_dev_queue;</div><div class='add'>+	} else {</div><div class='add'>+		WARN(1, "Missing required TXQ for adding bcast STA\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_mld_add_int_sta(mvm, bsta, queue,</div><div class='add'>+				       ieee80211_vif_type_p2p(vif),</div><div class='add'>+				       STATION_TYPE_BCAST_MGMT,</div><div class='add'>+				       mvm_link-&gt;fw_link_id, baddr,</div><div class='add'>+				       IWL_MAX_TID_COUNT, &amp;wdg_timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Allocate a new station entry for the multicast station to the given vif,</div><div class='add'>+ * and send it to the FW.</div><div class='add'>+ * Note that each AP/GO mac should have its own multicast station.</div><div class='add'>+ */</div><div class='add'>+int iwl_mvm_mld_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			      struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm_vif_link_info *mvm_link =</div><div class='add'>+		mvmvif-&gt;link[link_conf-&gt;link_id];</div><div class='add'>+	struct iwl_mvm_int_sta *msta = &amp;mvm_link-&gt;mcast_sta;</div><div class='add'>+	static const u8 _maddr[] = {0x03, 0x00, 0x00, 0x00, 0x00, 0x00};</div><div class='add'>+	const u8 *maddr = _maddr;</div><div class='add'>+	unsigned int timeout = iwl_mvm_get_wd_timeout(mvm, vif);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(vif-&gt;type != NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+		    vif-&gt;type != NL80211_IFTYPE_ADHOC))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* In IBSS, ieee80211_check_queues() sets the cab_queue to be</div><div class='add'>+	 * invalid, so make sure we use the queue we want.</div><div class='add'>+	 * Note that this is done here as we want to avoid making DQA</div><div class='add'>+	 * changes in mac80211 layer.</div><div class='add'>+	 */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_ADHOC)</div><div class='add'>+		mvm_link-&gt;cab_queue = IWL_MVM_DQA_GCAST_QUEUE;</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_mld_add_int_sta(mvm, msta, &amp;mvm_link-&gt;cab_queue,</div><div class='add'>+				       vif-&gt;type, STATION_TYPE_MCAST,</div><div class='add'>+				       mvm_link-&gt;fw_link_id, maddr, 0,</div><div class='add'>+				       &amp;timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Allocate a new station entry for the sniffer station to the given vif,</div><div class='add'>+ * and send it to the FW.</div><div class='add'>+ */</div><div class='add'>+int iwl_mvm_mld_add_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm_vif_link_info *mvm_link =</div><div class='add'>+		mvmvif-&gt;link[link_conf-&gt;link_id];</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_mld_add_int_sta(mvm, &amp;mvm-&gt;snif_sta, &amp;mvm-&gt;snif_queue,</div><div class='add'>+				       vif-&gt;type, STATION_TYPE_BCAST_MGMT,</div><div class='add'>+				       mvm_link-&gt;fw_link_id, NULL,</div><div class='add'>+				       IWL_MAX_TID_COUNT, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_mld_add_aux_sta(struct iwl_mvm *mvm, u32 lmac_id)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* In CDB NICs we need to specify which lmac to use for aux activity;</div><div class='add'>+	 * use the link_id argument place to send lmac_id to the function.</div><div class='add'>+	 */</div><div class='add'>+	return iwl_mvm_mld_add_int_sta(mvm, &amp;mvm-&gt;aux_sta, &amp;mvm-&gt;aux_queue,</div><div class='add'>+				       NL80211_IFTYPE_UNSPECIFIED,</div><div class='add'>+				       STATION_TYPE_AUX, lmac_id, NULL,</div><div class='add'>+				       IWL_MAX_TID_COUNT, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mld_disable_txq(struct iwl_mvm *mvm, u32 sta_mask,</div><div class='add'>+				   u16 *queueptr, u8 tid)</div><div class='add'>+{</div><div class='add'>+	int queue = *queueptr;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (tid == IWL_MAX_TID_COUNT)</div><div class='add'>+		tid = IWL_MGMT_TID;</div><div class='add'>+</div><div class='add'>+	if (mvm-&gt;sta_remove_requires_queue_remove) {</div><div class='add'>+		u32 cmd_id = WIDE_ID(DATA_PATH_GROUP,</div><div class='add'>+				     SCD_QUEUE_CONFIG_CMD);</div><div class='add'>+		struct iwl_scd_queue_cfg_cmd remove_cmd = {</div><div class='add'>+			.operation = cpu_to_le32(IWL_SCD_QUEUE_REMOVE),</div><div class='add'>+			.u.remove.tid = cpu_to_le32(tid),</div><div class='add'>+			.u.remove.sta_mask = cpu_to_le32(sta_mask),</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ret = iwl_mvm_send_cmd_pdu(mvm, cmd_id, 0,</div><div class='add'>+					   sizeof(remove_cmd),</div><div class='add'>+					   &amp;remove_cmd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_trans_txq_free(mvm-&gt;trans, queue);</div><div class='add'>+	*queueptr = IWL_MVM_INVALID_QUEUE;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Removes a sta from the FW table, disable its queues, and dealloc it</div><div class='add'>+ */</div><div class='add'>+static int iwl_mvm_mld_rm_int_sta(struct iwl_mvm *mvm,</div><div class='add'>+				  struct iwl_mvm_int_sta *int_sta,</div><div class='add'>+				  bool flush, u8 tid, u16 *queuptr)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(int_sta-&gt;sta_id == IWL_INVALID_STA))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (flush)</div><div class='add'>+		iwl_mvm_flush_sta(mvm, int_sta-&gt;sta_id, int_sta-&gt;tfd_queue_msk);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_mld_disable_txq(mvm, BIT(int_sta-&gt;sta_id), queuptr, tid);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_mld_rm_sta_from_fw(mvm, int_sta-&gt;sta_id);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_WARN(mvm, "Failed sending remove station\n");</div><div class='add'>+</div><div class='add'>+	iwl_mvm_dealloc_int_sta(mvm, int_sta);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_mld_rm_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm_vif_link_info *link = mvmvif-&gt;link[link_conf-&gt;link_id];</div><div class='add'>+	u16 *queueptr;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!link))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	switch (vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		queueptr = &amp;link-&gt;mgmt_queue;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_P2P_DEVICE:</div><div class='add'>+		queueptr = &amp;mvm-&gt;p2p_dev_queue;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN(1, "Can't free bcast queue on vif type %d\n",</div><div class='add'>+		     vif-&gt;type);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_mld_rm_int_sta(mvm, &amp;link-&gt;bcast_sta,</div><div class='add'>+				      true, IWL_MAX_TID_COUNT, queueptr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Send the FW a request to remove the station from it's internal data</div><div class='add'>+ * structures, and in addition remove it from the local data structure.</div><div class='add'>+ */</div><div class='add'>+int iwl_mvm_mld_rm_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm_vif_link_info *link = mvmvif-&gt;link[link_conf-&gt;link_id];</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!link))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_mld_rm_int_sta(mvm, &amp;link-&gt;mcast_sta, true, 0,</div><div class='add'>+				      &amp;link-&gt;cab_queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_mld_rm_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_mld_rm_int_sta(mvm, &amp;mvm-&gt;snif_sta, false,</div><div class='add'>+				      IWL_MAX_TID_COUNT, &amp;mvm-&gt;snif_queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_mld_rm_aux_sta(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_mld_rm_int_sta(mvm, &amp;mvm-&gt;aux_sta, false,</div><div class='add'>+				      IWL_MAX_TID_COUNT, &amp;mvm-&gt;aux_queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* send a cfg sta command to add/update a sta in firmware */</div><div class='add'>+static int iwl_mvm_mld_cfg_sta(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='add'>+			       struct ieee80211_vif *vif,</div><div class='add'>+			       struct ieee80211_link_sta *link_sta,</div><div class='add'>+			       struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			       struct iwl_mvm_link_sta *mvm_link_sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	struct iwl_mvm_vif *mvm_vif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm_vif_link_info *link_info =</div><div class='add'>+					mvm_vif-&gt;link[link_conf-&gt;link_id];</div><div class='add'>+	struct iwl_sta_cfg_cmd cmd = {</div><div class='add'>+		.sta_id = cpu_to_le32(mvm_link_sta-&gt;sta_id),</div><div class='add'>+		.station_type = cpu_to_le32(mvm_sta-&gt;sta_type),</div><div class='add'>+	};</div><div class='add'>+	u32 agg_size = 0, mpdu_dens = 0;</div><div class='add'>+</div><div class='add'>+	/* when adding sta, link should exist in FW */</div><div class='add'>+	if (WARN_ON(link_info-&gt;fw_link_id == IWL_MVM_FW_LINK_ID_INVALID))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cmd.link_id = cpu_to_le32(link_info-&gt;fw_link_id);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;cmd.peer_mld_address, sta-&gt;addr, ETH_ALEN);</div><div class='add'>+	memcpy(&amp;cmd.peer_link_address, link_sta-&gt;addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	if (mvm_sta-&gt;sta_state &gt;= IEEE80211_STA_ASSOC)</div><div class='add'>+		cmd.assoc_id = cpu_to_le32(sta-&gt;aid);</div><div class='add'>+</div><div class='add'>+	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			IWL_UCODE_TLV_CAPA_STA_EXP_MFP_SUPPORT) &amp;&amp;</div><div class='add'>+	    (sta-&gt;mfp || mvm_sta-&gt;sta_state &lt; IEEE80211_STA_AUTHORIZED))</div><div class='add'>+		cmd.mfp = cpu_to_le32(1);</div><div class='add'>+</div><div class='add'>+	switch (link_sta-&gt;rx_nss) {</div><div class='add'>+	case 1:</div><div class='add'>+		cmd.mimo = cpu_to_le32(0);</div><div class='add'>+		break;</div><div class='add'>+	case 2 ... 8:</div><div class='add'>+		cmd.mimo = cpu_to_le32(1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (link_sta-&gt;smps_mode) {</div><div class='add'>+	case IEEE80211_SMPS_AUTOMATIC:</div><div class='add'>+	case IEEE80211_SMPS_NUM_MODES:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_SMPS_STATIC:</div><div class='add'>+		/* override NSS */</div><div class='add'>+		cmd.mimo = cpu_to_le32(0);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_SMPS_DYNAMIC:</div><div class='add'>+		cmd.mimo_protection = cpu_to_le32(1);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_SMPS_OFF:</div><div class='add'>+		/* nothing */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mpdu_dens = iwl_mvm_get_sta_ampdu_dens(link_sta, link_conf, &amp;agg_size);</div><div class='add'>+	cmd.tx_ampdu_spacing = cpu_to_le32(mpdu_dens);</div><div class='add'>+	cmd.tx_ampdu_max_size = cpu_to_le32(agg_size);</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;wme) {</div><div class='add'>+		cmd.sp_length =</div><div class='add'>+			cpu_to_le32(sta-&gt;max_sp ? sta-&gt;max_sp * 2 : 128);</div><div class='add'>+		cmd.uapsd_acs = cpu_to_le32(iwl_mvm_get_sta_uapsd_acs(sta));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;he_cap.has_he) {</div><div class='add'>+		cmd.trig_rnd_alloc =</div><div class='add'>+			cpu_to_le32(link_conf-&gt;uora_exists ? 1 : 0);</div><div class='add'>+</div><div class='add'>+		/* PPE Thresholds */</div><div class='add'>+		iwl_mvm_set_sta_pkt_ext(mvm, link_sta, &amp;cmd.pkt_ext);</div><div class='add'>+</div><div class='add'>+		/* HTC flags */</div><div class='add'>+		cmd.htc_flags = iwl_mvm_get_sta_htc_flags(sta, link_sta);</div><div class='add'>+</div><div class='add'>+		if (link_sta-&gt;he_cap.he_cap_elem.mac_cap_info[2] &amp;</div><div class='add'>+		    IEEE80211_HE_MAC_CAP2_ACK_EN)</div><div class='add'>+			cmd.ack_enabled = cpu_to_le32(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_mld_send_sta_cmd(mvm, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_mld_free_sta_link(struct iwl_mvm *mvm,</div><div class='add'>+			       struct iwl_mvm_sta *mvm_sta,</div><div class='add'>+			       struct iwl_mvm_link_sta *mvm_sta_link,</div><div class='add'>+			       unsigned int link_id)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_wiphy(mvm-&gt;hw-&gt;wiphy);</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	RCU_INIT_POINTER(mvm-&gt;fw_id_to_mac_id[mvm_sta_link-&gt;sta_id], NULL);</div><div class='add'>+	RCU_INIT_POINTER(mvm-&gt;fw_id_to_link_sta[mvm_sta_link-&gt;sta_id], NULL);</div><div class='add'>+	RCU_INIT_POINTER(mvm_sta-&gt;link[link_id], NULL);</div><div class='add'>+</div><div class='add'>+	if (mvm_sta_link != &amp;mvm_sta-&gt;deflink)</div><div class='add'>+		kfree_rcu(mvm_sta_link, rcu_head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_mld_sta_rm_all_sta_links(struct iwl_mvm *mvm,</div><div class='add'>+					     struct iwl_mvm_sta *mvm_sta)</div><div class='add'>+{</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+</div><div class='add'>+	for (link_id = 0; link_id &lt; ARRAY_SIZE(mvm_sta-&gt;link); link_id++) {</div><div class='add'>+		struct iwl_mvm_link_sta *link =</div><div class='add'>+			rcu_dereference_protected(mvm_sta-&gt;link[link_id],</div><div class='add'>+						  lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+</div><div class='add'>+		if (!link)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		iwl_mvm_mld_free_sta_link(mvm, mvm_sta, link, link_id);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mld_alloc_sta_link(struct iwl_mvm *mvm,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      struct ieee80211_sta *sta,</div><div class='add'>+				      unsigned int link_id)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_link_sta *link_sta =</div><div class='add'>+		link_sta_dereference_protected(sta, link_id);</div><div class='add'>+	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	struct iwl_mvm_link_sta *link;</div><div class='add'>+	u32 sta_id = iwl_mvm_find_free_sta_id(mvm,</div><div class='add'>+					  ieee80211_vif_type_p2p(vif));</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mvm-&gt;hw-&gt;wiphy);</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (sta_id == IWL_INVALID_STA)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	if (rcu_access_pointer(sta-&gt;link[link_id]) == &amp;sta-&gt;deflink) {</div><div class='add'>+		link = &amp;mvm_sta-&gt;deflink;</div><div class='add'>+	} else {</div><div class='add'>+		link = kzalloc(sizeof(*link), GFP_KERNEL);</div><div class='add'>+		if (!link)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	link-&gt;sta_id = sta_id;</div><div class='add'>+	rcu_assign_pointer(mvm_sta-&gt;link[link_id], link);</div><div class='add'>+	rcu_assign_pointer(mvm-&gt;fw_id_to_mac_id[link-&gt;sta_id], sta);</div><div class='add'>+	rcu_assign_pointer(mvm-&gt;fw_id_to_link_sta[link-&gt;sta_id],</div><div class='add'>+			   link_sta);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* allocate all the links of a sta, called when the station is first added */</div><div class='add'>+static int iwl_mvm_mld_alloc_sta_links(struct iwl_mvm *mvm,</div><div class='add'>+				       struct ieee80211_vif *vif,</div><div class='add'>+				       struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	for_each_sta_active_link(vif, sta, link_sta, link_id) {</div><div class='add'>+		if (WARN_ON(mvm_sta-&gt;link[link_id]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = iwl_mvm_mld_alloc_sta_link(mvm, vif, sta, link_id);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	iwl_mvm_mld_sta_rm_all_sta_links(mvm, mvm_sta);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_mld_set_ap_sta_id(struct ieee80211_sta *sta,</div><div class='add'>+				      struct iwl_mvm_vif_link_info *vif_link,</div><div class='add'>+				      struct iwl_mvm_link_sta *sta_link)</div><div class='add'>+{</div><div class='add'>+	if (!sta-&gt;tdls) {</div><div class='add'>+		WARN_ON(vif_link-&gt;ap_sta_id != IWL_INVALID_STA);</div><div class='add'>+		vif_link-&gt;ap_sta_id = sta_link-&gt;sta_id;</div><div class='add'>+	} else {</div><div class='add'>+		WARN_ON(vif_link-&gt;ap_sta_id == IWL_INVALID_STA);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_alloc_sta_after_restart(struct iwl_mvm *mvm,</div><div class='add'>+					   struct ieee80211_vif *vif,</div><div class='add'>+					   struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+	/* no active link found */</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+	int sta_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mvm-&gt;hw-&gt;wiphy);</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* First add an empty station since allocating a queue requires</div><div class='add'>+	 * a valid station. Since we need a link_id to allocate a station,</div><div class='add'>+	 * pick up the first valid one.</div><div class='add'>+	 */</div><div class='add'>+	for_each_sta_active_link(vif, sta, link_sta, link_id) {</div><div class='add'>+		struct iwl_mvm_vif_link_info *mvm_link;</div><div class='add'>+		struct ieee80211_bss_conf *link_conf =</div><div class='add'>+			link_conf_dereference_protected(vif, link_id);</div><div class='add'>+		struct iwl_mvm_link_sta *mvm_link_sta =</div><div class='add'>+			rcu_dereference_protected(mvm_sta-&gt;link[link_id],</div><div class='add'>+						  lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+</div><div class='add'>+		if (!link_conf)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mvm_link = mvmvif-&gt;link[link_conf-&gt;link_id];</div><div class='add'>+</div><div class='add'>+		if (!mvm_link || !mvm_link_sta)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		sta_id = mvm_link_sta-&gt;sta_id;</div><div class='add'>+		ret = iwl_mvm_mld_cfg_sta(mvm, sta, vif, link_sta,</div><div class='add'>+					  link_conf, mvm_link_sta);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		rcu_assign_pointer(mvm-&gt;fw_id_to_mac_id[sta_id], sta);</div><div class='add'>+		rcu_assign_pointer(mvm-&gt;fw_id_to_link_sta[sta_id], link_sta);</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mvm_realloc_queues_after_restart(mvm, sta);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_mld_add_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvm_vif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	unsigned long link_sta_added_to_fw = 0;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status)) {</div><div class='add'>+		ret = iwl_mvm_mld_alloc_sta_links(mvm, vif, sta);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		spin_lock_init(&amp;mvm_sta-&gt;lock);</div><div class='add'>+</div><div class='add'>+		ret = iwl_mvm_sta_init(mvm, vif, sta, IWL_INVALID_STA,</div><div class='add'>+				       STATION_TYPE_PEER);</div><div class='add'>+	} else {</div><div class='add'>+		ret = iwl_mvm_alloc_sta_after_restart(mvm, vif, sta);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* at this stage sta link pointers are already allocated */</div><div class='add'>+	ret = iwl_mvm_mld_update_sta(mvm, vif, sta);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	for_each_sta_active_link(vif, sta, link_sta, link_id) {</div><div class='add'>+		struct ieee80211_bss_conf *link_conf =</div><div class='add'>+			link_conf_dereference_protected(vif, link_id);</div><div class='add'>+		struct iwl_mvm_link_sta *mvm_link_sta =</div><div class='add'>+			rcu_dereference_protected(mvm_sta-&gt;link[link_id],</div><div class='add'>+						  lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!link_conf || !mvm_link_sta)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = iwl_mvm_mld_cfg_sta(mvm, sta, vif, link_sta, link_conf,</div><div class='add'>+					  mvm_link_sta);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		link_sta_added_to_fw |= BIT(link_id);</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+			iwl_mvm_mld_set_ap_sta_id(sta, mvm_vif-&gt;link[link_id],</div><div class='add'>+						  mvm_link_sta);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	/* remove all already allocated stations in FW */</div><div class='add'>+	for_each_set_bit(link_id, &amp;link_sta_added_to_fw,</div><div class='add'>+			 IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		struct iwl_mvm_link_sta *mvm_link_sta =</div><div class='add'>+			rcu_dereference_protected(mvm_sta-&gt;link[link_id],</div><div class='add'>+						  lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+</div><div class='add'>+		iwl_mvm_mld_rm_sta_from_fw(mvm, mvm_link_sta-&gt;sta_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* free all sta resources in the driver */</div><div class='add'>+	iwl_mvm_mld_sta_rm_all_sta_links(mvm, mvm_sta);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_mld_update_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			   struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	for_each_sta_active_link(vif, sta, link_sta, link_id) {</div><div class='add'>+		struct ieee80211_bss_conf *link_conf =</div><div class='add'>+			link_conf_dereference_protected(vif, link_id);</div><div class='add'>+		struct iwl_mvm_link_sta *mvm_link_sta =</div><div class='add'>+			rcu_dereference_protected(mvm_sta-&gt;link[link_id],</div><div class='add'>+						  lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!link_conf || !mvm_link_sta))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		ret = iwl_mvm_mld_cfg_sta(mvm, sta, vif, link_sta, link_conf,</div><div class='add'>+					  mvm_link_sta);</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			IWL_ERR(mvm, "Failed to update sta link %d\n", link_id);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_mld_disable_sta_queues(struct iwl_mvm *mvm,</div><div class='add'>+					   struct ieee80211_vif *vif,</div><div class='add'>+					   struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	u32 sta_mask = iwl_mvm_sta_fw_id_mask(mvm, sta, -1);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mvm_sta-&gt;tid_data); i++) {</div><div class='add'>+		if (mvm_sta-&gt;tid_data[i].txq_id == IWL_MVM_INVALID_QUEUE)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		iwl_mvm_mld_disable_txq(mvm, sta_mask,</div><div class='add'>+					&amp;mvm_sta-&gt;tid_data[i].txq_id, i);</div><div class='add'>+		mvm_sta-&gt;tid_data[i].txq_id = IWL_MVM_INVALID_QUEUE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(sta-&gt;txq); i++) {</div><div class='add'>+		struct iwl_mvm_txq *mvmtxq =</div><div class='add'>+			iwl_mvm_txq_from_mac80211(sta-&gt;txq[i]);</div><div class='add'>+</div><div class='add'>+		mvmtxq-&gt;txq_id = IWL_MVM_INVALID_QUEUE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_mld_rm_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+		       struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* flush its queues here since we are freeing mvm_sta */</div><div class='add'>+	for_each_sta_active_link(vif, sta, link_sta, link_id) {</div><div class='add'>+		struct iwl_mvm_link_sta *mvm_link_sta =</div><div class='add'>+			rcu_dereference_protected(mvm_sta-&gt;link[link_id],</div><div class='add'>+						  lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!mvm_link_sta))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		ret = iwl_mvm_flush_sta_tids(mvm, mvm_link_sta-&gt;sta_id,</div><div class='add'>+					     0xffff);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_wait_sta_queues_empty(mvm, mvm_sta);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_mld_disable_sta_queues(mvm, vif, sta);</div><div class='add'>+</div><div class='add'>+	for_each_sta_active_link(vif, sta, link_sta, link_id) {</div><div class='add'>+		struct iwl_mvm_link_sta *mvm_link_sta =</div><div class='add'>+			rcu_dereference_protected(mvm_sta-&gt;link[link_id],</div><div class='add'>+						  lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+		iwl_mvm_sta_del(mvm, vif, sta, link_sta);</div><div class='add'>+</div><div class='add'>+		ret = iwl_mvm_mld_rm_sta_from_fw(mvm, mvm_link_sta-&gt;sta_id);</div><div class='add'>+</div><div class='add'>+		iwl_mvm_mld_free_sta_link(mvm, mvm_sta, mvm_link_sta, link_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_mld_rm_sta_id(struct iwl_mvm *mvm, u8 sta_id)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mvm-&gt;hw-&gt;wiphy);</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(sta_id == IWL_INVALID_STA))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_mld_rm_sta_from_fw(mvm, sta_id);</div><div class='add'>+</div><div class='add'>+	RCU_INIT_POINTER(mvm-&gt;fw_id_to_mac_id[sta_id], NULL);</div><div class='add'>+	RCU_INIT_POINTER(mvm-&gt;fw_id_to_link_sta[sta_id], NULL);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_mld_sta_modify_disable_tx(struct iwl_mvm *mvm,</div><div class='add'>+				       struct iwl_mvm_sta *mvmsta,</div><div class='add'>+				       bool disable)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_sta_disable_tx_cmd cmd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cmd.sta_id = cpu_to_le32(mvmsta-&gt;deflink.sta_id);</div><div class='add'>+	cmd.disable = cpu_to_le32(disable);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(iwl_mvm_has_no_host_disable_tx(mvm)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_send_cmd_pdu(mvm,</div><div class='add'>+				   WIDE_ID(MAC_CONF_GROUP, STA_DISABLE_TX_CMD),</div><div class='add'>+				   CMD_ASYNC, sizeof(cmd), &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mvm,</div><div class='add'>+			"Failed to send STA_DISABLE_TX_CMD command (%d)\n",</div><div class='add'>+			ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_mld_sta_modify_disable_tx_ap(struct iwl_mvm *mvm,</div><div class='add'>+					  struct ieee80211_sta *sta,</div><div class='add'>+					  bool disable)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;mvm_sta-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (mvm_sta-&gt;disable_tx == disable) {</div><div class='add'>+		spin_unlock_bh(&amp;mvm_sta-&gt;lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mvm_mld_sta_modify_disable_tx(mvm, mvm_sta, disable);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;mvm_sta-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_mld_modify_all_sta_disable_tx(struct iwl_mvm *mvm,</div><div class='add'>+					   struct iwl_mvm_vif *mvmvif,</div><div class='add'>+					   bool disable)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct iwl_mvm_sta *mvm_sta;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	/* Block/unblock all the stations of the given mvmvif */</div><div class='add'>+	for (i = 0; i &lt; mvm-&gt;fw-&gt;ucode_capa.num_stations; i++) {</div><div class='add'>+		sta = rcu_dereference(mvm-&gt;fw_id_to_mac_id[i]);</div><div class='add'>+		if (IS_ERR_OR_NULL(sta))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+		if (mvm_sta-&gt;mac_id_n_color !=</div><div class='add'>+		    FW_CMD_ID_AND_COLOR(mvmvif-&gt;id, mvmvif-&gt;color))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		iwl_mvm_mld_sta_modify_disable_tx(mvm, mvm_sta, disable);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mld_update_sta_queues(struct iwl_mvm *mvm,</div><div class='add'>+					 struct ieee80211_sta *sta,</div><div class='add'>+					 u32 old_sta_mask,</div><div class='add'>+					 u32 new_sta_mask)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	struct iwl_scd_queue_cfg_cmd cmd = {</div><div class='add'>+		.operation = cpu_to_le32(IWL_SCD_QUEUE_MODIFY),</div><div class='add'>+		.u.modify.old_sta_mask = cpu_to_le32(old_sta_mask),</div><div class='add'>+		.u.modify.new_sta_mask = cpu_to_le32(new_sta_mask),</div><div class='add'>+	};</div><div class='add'>+	struct iwl_host_cmd hcmd = {</div><div class='add'>+		.id = WIDE_ID(DATA_PATH_GROUP, SCD_QUEUE_CONFIG_CMD),</div><div class='add'>+		.len[0] = sizeof(cmd),</div><div class='add'>+		.data[0] = &amp;cmd</div><div class='add'>+	};</div><div class='add'>+	int tid;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	for (tid = 0; tid &lt;= IWL_MAX_TID_COUNT; tid++) {</div><div class='add'>+		struct iwl_mvm_tid_data *tid_data = &amp;mvm_sta-&gt;tid_data[tid];</div><div class='add'>+		int txq_id = tid_data-&gt;txq_id;</div><div class='add'>+</div><div class='add'>+		if (txq_id == IWL_MVM_INVALID_QUEUE)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (tid == IWL_MAX_TID_COUNT)</div><div class='add'>+			cmd.u.modify.tid = cpu_to_le32(IWL_MGMT_TID);</div><div class='add'>+		else</div><div class='add'>+			cmd.u.modify.tid = cpu_to_le32(tid);</div><div class='add'>+</div><div class='add'>+		ret = iwl_mvm_send_cmd(mvm, &amp;hcmd);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mld_update_sta_baids(struct iwl_mvm *mvm,</div><div class='add'>+					u32 old_sta_mask,</div><div class='add'>+					u32 new_sta_mask)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rx_baid_cfg_cmd cmd = {</div><div class='add'>+		.action = cpu_to_le32(IWL_RX_BAID_ACTION_MODIFY),</div><div class='add'>+		.modify.old_sta_id_mask = cpu_to_le32(old_sta_mask),</div><div class='add'>+		.modify.new_sta_id_mask = cpu_to_le32(new_sta_mask),</div><div class='add'>+	};</div><div class='add'>+	u32 cmd_id = WIDE_ID(DATA_PATH_GROUP, RX_BAID_ALLOCATION_CONFIG_CMD);</div><div class='add'>+	int baid;</div><div class='add'>+</div><div class='add'>+	/* mac80211 will remove sessions later, but we ignore all that */</div><div class='add'>+	if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct iwl_rx_baid_cfg_resp) != sizeof(baid));</div><div class='add'>+</div><div class='add'>+	for (baid = 0; baid &lt; ARRAY_SIZE(mvm-&gt;baid_map); baid++) {</div><div class='add'>+		struct iwl_mvm_baid_data *data;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		data = rcu_dereference_protected(mvm-&gt;baid_map[baid],</div><div class='add'>+						 lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+		if (!data)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!(data-&gt;sta_mask &amp; old_sta_mask))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		WARN_ONCE(data-&gt;sta_mask != old_sta_mask,</div><div class='add'>+			  "BAID data for %d corrupted - expected 0x%x found 0x%x\n",</div><div class='add'>+			  baid, old_sta_mask, data-&gt;sta_mask);</div><div class='add'>+</div><div class='add'>+		cmd.modify.tid = cpu_to_le32(data-&gt;tid);</div><div class='add'>+</div><div class='add'>+		ret = iwl_mvm_send_cmd_pdu(mvm, cmd_id, CMD_SEND_IN_RFKILL,</div><div class='add'>+					   sizeof(cmd), &amp;cmd);</div><div class='add'>+		data-&gt;sta_mask = new_sta_mask;</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_mld_update_sta_resources(struct iwl_mvm *mvm,</div><div class='add'>+					    struct ieee80211_vif *vif,</div><div class='add'>+					    struct ieee80211_sta *sta,</div><div class='add'>+					    u32 old_sta_mask,</div><div class='add'>+					    u32 new_sta_mask)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_mld_update_sta_queues(mvm, sta,</div><div class='add'>+					    old_sta_mask,</div><div class='add'>+					    new_sta_mask);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_mld_update_sta_keys(mvm, vif, sta,</div><div class='add'>+					  old_sta_mask,</div><div class='add'>+					  new_sta_mask);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_mld_update_sta_baids(mvm, old_sta_mask, new_sta_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_mld_update_sta_links(struct iwl_mvm *mvm,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_sta *sta,</div><div class='add'>+				 u16 old_links, u16 new_links)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	struct iwl_mvm_vif *mvm_vif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm_link_sta *mvm_sta_link;</div><div class='add'>+	struct iwl_mvm_vif_link_info *mvm_vif_link;</div><div class='add'>+	unsigned long links_to_add = ~old_links &amp; new_links;</div><div class='add'>+	unsigned long links_to_rem = old_links &amp; ~new_links;</div><div class='add'>+	unsigned long old_links_long = old_links;</div><div class='add'>+	u32 current_sta_mask = 0, sta_mask_added = 0, sta_mask_to_rem = 0;</div><div class='add'>+	unsigned long link_sta_added_to_fw = 0, link_sta_allocated = 0;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_wiphy(mvm-&gt;hw-&gt;wiphy);</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(link_id, &amp;old_links_long,</div><div class='add'>+			 IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		mvm_sta_link =</div><div class='add'>+			rcu_dereference_protected(mvm_sta-&gt;link[link_id],</div><div class='add'>+						  lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!mvm_sta_link)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		current_sta_mask |= BIT(mvm_sta_link-&gt;sta_id);</div><div class='add'>+		if (links_to_rem &amp; BIT(link_id))</div><div class='add'>+			sta_mask_to_rem |= BIT(mvm_sta_link-&gt;sta_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sta_mask_to_rem) {</div><div class='add'>+		ret = iwl_mvm_mld_update_sta_resources(mvm, vif, sta,</div><div class='add'>+						       current_sta_mask,</div><div class='add'>+						       current_sta_mask &amp;</div><div class='add'>+							~sta_mask_to_rem);</div><div class='add'>+		if (WARN_ON(ret))</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		current_sta_mask &amp;= ~sta_mask_to_rem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(link_id, &amp;links_to_rem, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		mvm_sta_link =</div><div class='add'>+			rcu_dereference_protected(mvm_sta-&gt;link[link_id],</div><div class='add'>+						  lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+		mvm_vif_link = mvm_vif-&gt;link[link_id];</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!mvm_sta_link || !mvm_vif_link)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = iwl_mvm_mld_rm_sta_from_fw(mvm, mvm_sta_link-&gt;sta_id);</div><div class='add'>+		if (WARN_ON(ret))</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+			mvm_vif_link-&gt;ap_sta_id = IWL_INVALID_STA;</div><div class='add'>+</div><div class='add'>+		iwl_mvm_mld_free_sta_link(mvm, mvm_sta, mvm_sta_link, link_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(link_id, &amp;links_to_add, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		struct ieee80211_bss_conf *link_conf =</div><div class='add'>+			link_conf_dereference_protected(vif, link_id);</div><div class='add'>+		struct ieee80211_link_sta *link_sta =</div><div class='add'>+			link_sta_dereference_protected(sta, link_id);</div><div class='add'>+		mvm_vif_link = mvm_vif-&gt;link[link_id];</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!mvm_vif_link || !link_conf || !link_sta)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status)) {</div><div class='add'>+			struct iwl_mvm_link_sta *mvm_link_sta =</div><div class='add'>+				rcu_dereference_protected(mvm_sta-&gt;link[link_id],</div><div class='add'>+							  lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+			u32 sta_id;</div><div class='add'>+</div><div class='add'>+			if (WARN_ON(!mvm_link_sta)) {</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto err;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			sta_id = mvm_link_sta-&gt;sta_id;</div><div class='add'>+</div><div class='add'>+			rcu_assign_pointer(mvm-&gt;fw_id_to_mac_id[sta_id], sta);</div><div class='add'>+			rcu_assign_pointer(mvm-&gt;fw_id_to_link_sta[sta_id],</div><div class='add'>+					   link_sta);</div><div class='add'>+		} else {</div><div class='add'>+			if (WARN_ON(mvm_sta-&gt;link[link_id])) {</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto err;</div><div class='add'>+			}</div><div class='add'>+			ret = iwl_mvm_mld_alloc_sta_link(mvm, vif, sta,</div><div class='add'>+							 link_id);</div><div class='add'>+			if (WARN_ON(ret))</div><div class='add'>+				goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		link_sta-&gt;agg.max_rc_amsdu_len = 1;</div><div class='add'>+		ieee80211_sta_recalc_aggregates(sta);</div><div class='add'>+</div><div class='add'>+		mvm_sta_link =</div><div class='add'>+			rcu_dereference_protected(mvm_sta-&gt;link[link_id],</div><div class='add'>+						  lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!mvm_sta_link)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+			iwl_mvm_mld_set_ap_sta_id(sta, mvm_vif_link,</div><div class='add'>+						  mvm_sta_link);</div><div class='add'>+</div><div class='add'>+		link_sta_allocated |= BIT(link_id);</div><div class='add'>+</div><div class='add'>+		sta_mask_added |= BIT(mvm_sta_link-&gt;sta_id);</div><div class='add'>+</div><div class='add'>+		ret = iwl_mvm_mld_cfg_sta(mvm, sta, vif, link_sta, link_conf,</div><div class='add'>+					  mvm_sta_link);</div><div class='add'>+		if (WARN_ON(ret))</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		link_sta_added_to_fw |= BIT(link_id);</div><div class='add'>+</div><div class='add'>+		iwl_mvm_rs_add_sta_link(mvm, mvm_sta_link);</div><div class='add'>+</div><div class='add'>+		iwl_mvm_rs_rate_init(mvm, vif, sta, link_conf, link_sta,</div><div class='add'>+				     link_conf-&gt;chanreq.oper.chan-&gt;band);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sta_mask_added) {</div><div class='add'>+		ret = iwl_mvm_mld_update_sta_resources(mvm, vif, sta,</div><div class='add'>+						       current_sta_mask,</div><div class='add'>+						       current_sta_mask |</div><div class='add'>+							sta_mask_added);</div><div class='add'>+		if (WARN_ON(ret))</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	/* remove all already allocated stations in FW */</div><div class='add'>+	for_each_set_bit(link_id, &amp;link_sta_added_to_fw,</div><div class='add'>+			 IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		mvm_sta_link =</div><div class='add'>+			rcu_dereference_protected(mvm_sta-&gt;link[link_id],</div><div class='add'>+						  lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+</div><div class='add'>+		iwl_mvm_mld_rm_sta_from_fw(mvm, mvm_sta_link-&gt;sta_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* remove all already allocated station links in driver */</div><div class='add'>+	for_each_set_bit(link_id, &amp;link_sta_allocated,</div><div class='add'>+			 IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		mvm_sta_link =</div><div class='add'>+			rcu_dereference_protected(mvm_sta-&gt;link[link_id],</div><div class='add'>+						  lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+</div><div class='add'>+		iwl_mvm_mld_free_sta_link(mvm, mvm_sta, mvm_sta_link, link_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h<br/>index 4d9d4d6892fc..301d590fe0bd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/mvm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/mvm.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -16,10 +17,14 @@</div><div class='ctx'> #include &lt;linux/thermal.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ktime.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "iwl-op-mode.h"</div><div class='ctx'> #include "iwl-trans.h"</div><div class='ctx'> #include "fw/notif-wait.h"</div><div class='del'>-#include "iwl-eeprom-parse.h"</div><div class='add'>+#include "iwl-nvm-utils.h"</div><div class='ctx'> #include "fw/file.h"</div><div class='ctx'> #include "iwl-config.h"</div><div class='ctx'> #include "sta.h"</div><div class='hunk'>@@ -28,6 +33,7 @@</div><div class='ctx'> #include "fw/runtime.h"</div><div class='ctx'> #include "fw/dbg.h"</div><div class='ctx'> #include "fw/acpi.h"</div><div class='add'>+#include "mei/iwl-mei.h"</div><div class='ctx'> #include "iwl-nvm-parse.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/average.h&gt;</div><div class='hunk'>@@ -35,8 +41,9 @@</div><div class='ctx'> #define IWL_MVM_MAX_ADDRESSES		5</div><div class='ctx'> /* RSSI offset for WkP */</div><div class='ctx'> #define IWL_RSSI_OFFSET 50</div><div class='add'>+#define IWL_MVM_MISSED_BEACONS_SINCE_RX_THOLD 4</div><div class='ctx'> #define IWL_MVM_MISSED_BEACONS_THRESHOLD 8</div><div class='del'>-#define IWL_MVM_MISSED_BEACONS_THRESHOLD_LONG 16</div><div class='add'>+#define IWL_MVM_MISSED_BEACONS_THRESHOLD_LONG 19</div><div class='ctx'> </div><div class='ctx'> /* A TimeUnit is 1024 microsecond */</div><div class='ctx'> #define MSEC_TO_TU(_msec)	(_msec*1000/1024)</div><div class='hunk'>@@ -68,18 +75,17 @@</div><div class='ctx'> /* offchannel queue towards mac80211 */</div><div class='ctx'> #define IWL_MVM_OFFCHANNEL_QUEUE 0</div><div class='ctx'> </div><div class='add'>+/* invalid value for FW link id */</div><div class='add'>+#define IWL_MVM_FW_LINK_ID_INVALID 0xff</div><div class='add'>+</div><div class='ctx'> extern const struct ieee80211_ops iwl_mvm_hw_ops;</div><div class='add'>+extern const struct ieee80211_ops iwl_mvm_mld_hw_ops;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_mvm_mod_params - module parameters for iwlmvm</div><div class='del'>- * @init_dbg: if true, then the NIC won't be stopped if the INIT fw asserted.</div><div class='del'>- *	We will register to mac80211 to have testmode working. The NIC must not</div><div class='del'>- *	be up'ed after the INIT fw asserted. This is useful to be able to use</div><div class='del'>- *	proprietary tools over testmode to debug the INIT fw.</div><div class='ctx'>  * @power_scheme: one of enum iwl_power_scheme</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_mvm_mod_params {</div><div class='del'>-	bool init_dbg;</div><div class='ctx'> 	int power_scheme;</div><div class='ctx'> };</div><div class='ctx'> extern struct iwl_mvm_mod_params iwlmvm_mod_params;</div><div class='hunk'>@@ -91,11 +97,13 @@ struct iwl_mvm_phy_ctxt {</div><div class='ctx'> </div><div class='ctx'> 	enum nl80211_chan_width width;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * TODO: This should probably be removed. Currently here only for rate</div><div class='del'>-	 * scaling algorithm</div><div class='del'>-	 */</div><div class='ctx'> 	struct ieee80211_channel *channel;</div><div class='add'>+</div><div class='add'>+	/* track for RLC config command */</div><div class='add'>+	u32 center_freq1;</div><div class='add'>+	bool rlc_disabled;</div><div class='add'>+	u32 channel_load_by_us;</div><div class='add'>+	u32 channel_load_not_by_us;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct iwl_mvm_time_event_data {</div><div class='hunk'>@@ -112,15 +120,16 @@ struct iwl_mvm_time_event_data {</div><div class='ctx'> 	 * if the te is in the time event list or not (when id == TE_MAX)</div><div class='ctx'> 	 */</div><div class='ctx'> 	u32 id;</div><div class='add'>+	s8 link_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'>  /* Power management */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum iwl_power_scheme</div><div class='del'>- * @IWL_POWER_LEVEL_CAM - Continuously Active Mode</div><div class='del'>- * @IWL_POWER_LEVEL_BPS - Balanced Power Save (default)</div><div class='del'>- * @IWL_POWER_LEVEL_LP  - Low Power</div><div class='add'>+ * enum iwl_power_scheme - iwl power schemes</div><div class='add'>+ * @IWL_POWER_SCHEME_CAM: Continuously Active Mode</div><div class='add'>+ * @IWL_POWER_SCHEME_BPS: Balanced Power Save (default)</div><div class='add'>+ * @IWL_POWER_SCHEME_LP: Low Power</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_power_scheme {</div><div class='ctx'> 	IWL_POWER_SCHEME_CAM = 1,</div><div class='hunk'>@@ -128,7 +137,6 @@ enum iwl_power_scheme {</div><div class='ctx'> 	IWL_POWER_SCHEME_LP</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define IWL_CONN_MAX_LISTEN_INTERVAL	10</div><div class='ctx'> #define IWL_UAPSD_MAX_SP		IEEE80211_WMM_IE_STA_QOSINFO_SP_ALL</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='hunk'>@@ -195,6 +203,7 @@ enum iwl_mvm_smps_type_request {</div><div class='ctx'> 	IWL_MVM_SMPS_REQ_BT_COEX,</div><div class='ctx'> 	IWL_MVM_SMPS_REQ_TT,</div><div class='ctx'> 	IWL_MVM_SMPS_REQ_PROT,</div><div class='add'>+	IWL_MVM_SMPS_REQ_FW,</div><div class='ctx'> 	NUM_IWL_MVM_SMPS_REQ,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -208,7 +217,7 @@ enum iwl_bt_force_ant_mode {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_mvm_low_latency_force - low latency force mode set by debugfs</div><div class='add'>+ * enum iwl_mvm_low_latency_force - low latency force mode set by debugfs</div><div class='ctx'>  * @LOW_LATENCY_FORCE_UNSET: unset force mode</div><div class='ctx'>  * @LOW_LATENCY_FORCE_ON: for low latency on</div><div class='ctx'>  * @LOW_LATENCY_FORCE_OFF: for low latency off</div><div class='hunk'>@@ -222,7 +231,7 @@ enum iwl_mvm_low_latency_force {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>-* struct iwl_mvm_low_latency_cause - low latency set causes</div><div class='add'>+* enum iwl_mvm_low_latency_cause - low latency set causes</div><div class='ctx'> * @LOW_LATENCY_TRAFFIC: indicates low latency traffic was detected</div><div class='ctx'> * @LOW_LATENCY_DEBUGFS: low latency mode set from debugfs</div><div class='ctx'> * @LOW_LATENCY_VCMD: low latency mode set from vendor command</div><div class='hunk'>@@ -243,18 +252,14 @@ enum iwl_mvm_low_latency_cause {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>-* struct iwl_mvm_vif_bf_data - beacon filtering related data</div><div class='del'>-* @bf_enabled: indicates if beacon filtering is enabled</div><div class='del'>-* @ba_enabled: indicated if beacon abort is enabled</div><div class='add'>+* struct iwl_mvm_link_bf_data - beacon filtering related data</div><div class='ctx'> * @ave_beacon_signal: average beacon signal</div><div class='ctx'> * @last_cqm_event: rssi of the last cqm event</div><div class='ctx'> * @bt_coex_min_thold: minimum threshold for BT coex</div><div class='ctx'> * @bt_coex_max_thold: maximum threshold for BT coex</div><div class='ctx'> * @last_bt_coex_event: rssi of the last BT coex event</div><div class='ctx'> */</div><div class='del'>-struct iwl_mvm_vif_bf_data {</div><div class='del'>-	bool bf_enabled;</div><div class='del'>-	bool ba_enabled;</div><div class='add'>+struct iwl_mvm_link_bf_data {</div><div class='ctx'> 	int ave_beacon_signal;</div><div class='ctx'> 	int last_cqm_event;</div><div class='ctx'> 	int bt_coex_min_thold;</div><div class='hunk'>@@ -275,11 +280,78 @@ struct iwl_probe_resp_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct iwl_mvm_vif_link_info - per link data in Virtual Interface</div><div class='add'>+ * @ap_sta_id: the sta_id of the AP - valid only if VIF type is STA</div><div class='add'>+ * @fw_link_id: the id of the link according to the FW API</div><div class='add'>+ * @bssid: BSSID for this (client) interface</div><div class='add'>+ * @bcast_sta: station used for broadcast packets. Used by the following</div><div class='add'>+ *	vifs: P2P_DEVICE, GO and AP.</div><div class='add'>+ * @beacon_stats: beacon statistics, containing the # of received beacons,</div><div class='add'>+ *	# of received beacons accumulated over FW restart, and the current</div><div class='add'>+ *	average signal of beacons retrieved from the firmware</div><div class='add'>+ * @smps_requests: the SMPS requests of different parts of the driver,</div><div class='add'>+ *	combined on update to yield the overall request to mac80211.</div><div class='add'>+ * @probe_resp_data: data from FW notification to store NOA and CSA related</div><div class='add'>+ *	data to be inserted into probe response.</div><div class='add'>+ * @he_ru_2mhz_block: 26-tone RU OFDMA transmissions should be blocked</div><div class='add'>+ * @queue_params: QoS params for this MAC</div><div class='add'>+ * @mgmt_queue: queue number for unbufferable management frames</div><div class='add'>+ * @igtk: the current IGTK programmed into the firmware</div><div class='add'>+ * @active: indicates the link is active in FW (for sanity checking)</div><div class='add'>+ * @cab_queue: content-after-beacon (multicast) queue</div><div class='add'>+ * @listen_lmac: indicates this link is allocated to the listen LMAC</div><div class='add'>+ * @csa_block_tx: we got CSA with mode=1</div><div class='add'>+ * @mcast_sta: multicast station</div><div class='add'>+ * @phy_ctxt: phy context allocated to this link, if any</div><div class='add'>+ * @bf_data: beacon filtering data</div><div class='add'>+ * @average_beacon_energy: average beacon energy for beacons received during</div><div class='add'>+ *	client connections</div><div class='add'>+ */</div><div class='add'>+struct iwl_mvm_vif_link_info {</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	u8 ap_sta_id;</div><div class='add'>+	u8 fw_link_id;</div><div class='add'>+</div><div class='add'>+	struct iwl_mvm_int_sta bcast_sta;</div><div class='add'>+	struct iwl_mvm_int_sta mcast_sta;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u32 num_beacons, accu_num_beacons;</div><div class='add'>+		u8 avg_signal;</div><div class='add'>+	} beacon_stats;</div><div class='add'>+</div><div class='add'>+	enum ieee80211_smps_mode smps_requests[NUM_IWL_MVM_SMPS_REQ];</div><div class='add'>+	struct iwl_probe_resp_data __rcu *probe_resp_data;</div><div class='add'>+</div><div class='add'>+	struct ieee80211_key_conf *igtk;</div><div class='add'>+</div><div class='add'>+	bool he_ru_2mhz_block;</div><div class='add'>+	bool active;</div><div class='add'>+	bool listen_lmac;</div><div class='add'>+	bool csa_block_tx;</div><div class='add'>+</div><div class='add'>+	u16 cab_queue;</div><div class='add'>+	/* Assigned while mac80211 has the link in a channel context,</div><div class='add'>+	 * or, for P2P Device, while it exists.</div><div class='add'>+	 */</div><div class='add'>+	struct iwl_mvm_phy_ctxt *phy_ctxt;</div><div class='add'>+	/* QoS data from mac80211, need to store this here</div><div class='add'>+	 * as mac80211 has a separate callback but we need</div><div class='add'>+	 * to have the data for the MAC context</div><div class='add'>+	 */</div><div class='add'>+	struct ieee80211_tx_queue_params queue_params[IEEE80211_NUM_ACS];</div><div class='add'>+</div><div class='add'>+	u16 mgmt_queue;</div><div class='add'>+</div><div class='add'>+	struct iwl_mvm_link_bf_data bf_data;</div><div class='add'>+	u32 average_beacon_energy;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_mvm_vif - data per Virtual Interface, it is a MAC context</div><div class='add'>+ * @mvm: pointer back to the mvm struct</div><div class='ctx'>  * @id: between 0 and 3</div><div class='ctx'>  * @color: to solve races upon MAC addition and removal</div><div class='del'>- * @ap_sta_id: the sta_id of the AP - valid only if VIF type is STA</div><div class='del'>- * @bssid: BSSID for this (client) interface</div><div class='ctx'>  * @associated: indicates that we're currently associated, used only for</div><div class='ctx'>  *	managing the firmware state in iwl_mvm_bss_info_changed_station()</div><div class='ctx'>  * @ap_assoc_sta_count: count of stations associated to us - valid only</div><div class='hunk'>@@ -287,77 +359,95 @@ struct iwl_probe_resp_data {</div><div class='ctx'>  * @uploaded: indicates the MAC context has been added to the device</div><div class='ctx'>  * @ap_ibss_active: indicates that AP/IBSS is configured and that the interface</div><div class='ctx'>  *	should get quota etc.</div><div class='del'>- * @pm_enabled - Indicate if MAC power management is allowed</div><div class='add'>+ * @pm_enabled - indicate if MAC power management is allowed</div><div class='ctx'>  * @monitor_active: indicates that monitor context is configured, and that the</div><div class='ctx'>  *	interface should get quota etc.</div><div class='ctx'>  * @low_latency: bit flags for low latency</div><div class='ctx'>  *	see enum &amp;iwl_mvm_low_latency_cause for causes.</div><div class='ctx'>  * @low_latency_actual: boolean, indicates low latency is set,</div><div class='ctx'>  *	as a result from low_latency bit flags and takes force into account.</div><div class='add'>+ * @authorized: indicates the AP station was set to authorized</div><div class='ctx'>  * @ps_disabled: indicates that this interface requires PS to be disabled</div><div class='del'>- * @queue_params: QoS params for this MAC</div><div class='del'>- * @bcast_sta: station used for broadcast packets. Used by the following</div><div class='del'>- *  vifs: P2P_DEVICE, GO and AP.</div><div class='del'>- * @beacon_skb: the skb used to hold the AP/GO beacon template</div><div class='del'>- * @smps_requests: the SMPS requests of different parts of the driver,</div><div class='del'>- *	combined on update to yield the overall request to mac80211.</div><div class='del'>- * @beacon_stats: beacon statistics, containing the # of received beacons,</div><div class='del'>- *	# of received beacons accumulated over FW restart, and the current</div><div class='del'>- *	average signal of beacons retrieved from the firmware</div><div class='add'>+ * @csa_countdown: indicates that CSA countdown may be started</div><div class='ctx'>  * @csa_failed: CSA failed to schedule time event, report an error later</div><div class='add'>+ * @csa_bcn_pending: indicates that we are waiting for a beacon on a new channel</div><div class='add'>+ * @csa_blocks_tx: CSA is blocking TX</div><div class='ctx'>  * @features: hw features active for this vif</div><div class='del'>- * @probe_resp_data: data from FW notification to store NOA and CSA related</div><div class='del'>- *	data to be inserted into probe response.</div><div class='add'>+ * @max_tx_op: max TXOP in usecs for all ACs, zero for no limit.</div><div class='add'>+ * @ap_beacon_time: AP beacon time for synchronisation (on older FW)</div><div class='add'>+ * @bf_enabled: indicates if beacon filtering is enabled</div><div class='add'>+ * @ba_enabled: indicated if beacon abort is enabled</div><div class='add'>+ * @bcn_prot: beacon protection data (keys; FIXME: needs to be per link)</div><div class='add'>+ * @deflink: default link data for use in non-MLO</div><div class='add'>+ * @link: link data for each link in MLO</div><div class='add'>+ * @esr_active: indicates eSR mode is active</div><div class='add'>+ * @pm_enabled: indicates powersave is enabled</div><div class='add'>+ * @link_selection_res: bitmap of active links as it was decided in the last</div><div class='add'>+ *	link selection. Valid only for a MLO vif after assoc. 0 if there wasn't</div><div class='add'>+ *	any link selection yet.</div><div class='add'>+ * @link_selection_primary: primary link selected by link selection</div><div class='add'>+ * @primary_link: primary link in eSR. Valid only for an associated MLD vif,</div><div class='add'>+ *	and in eSR mode. Valid only for a STA.</div><div class='add'>+ * @roc_activity: currently running ROC activity for this vif (or</div><div class='add'>+ *	ROC_NUM_ACTIVITIES if no activity is running).</div><div class='add'>+ * @session_prot_connection_loss: the connection was lost due to session</div><div class='add'>+ *	protection ending without receiving a beacon, so we need to now</div><div class='add'>+ *	protect the deauth separately</div><div class='add'>+ * @ap_early_keys: The firmware cannot install keys before stations etc.,</div><div class='add'>+ *	but higher layers work differently, so we store the keys here for</div><div class='add'>+ *	later installation.</div><div class='add'>+ * @ap_sta: pointer to the AP STA data structure</div><div class='add'>+ * @csa_count: CSA counter (old CSA implementation w/o firmware)</div><div class='add'>+ * @csa_misbehave: CSA AP misbehaviour flag (old implementation)</div><div class='add'>+ * @csa_target_freq: CSA target channel frequency (old implementation)</div><div class='add'>+ * @csa_work: CSA work (old implementation)</div><div class='add'>+ * @dbgfs_bf: beamforming debugfs data</div><div class='add'>+ * @dbgfs_dir: debugfs directory for this vif</div><div class='add'>+ * @dbgfs_pm: power management debugfs data</div><div class='add'>+ * @dbgfs_quota_min: debugfs value for minimal quota</div><div class='add'>+ * @dbgfs_slink: debugfs symlink for this interface</div><div class='add'>+ * @ftm_unprotected: unprotected FTM debugfs override</div><div class='add'>+ * @hs_time_event_data: hotspot/AUX ROC time event data</div><div class='add'>+ * @mac_pwr_cmd: debugfs override for MAC power command</div><div class='add'>+ * @target_ipv6_addrs: IPv6 addresses on this interface for offload</div><div class='add'>+ * @num_target_ipv6_addrs: number of @target_ipv6_addrs</div><div class='add'>+ * @tentative_addrs: bitmap of tentative IPv6 addresses in @target_ipv6_addrs</div><div class='add'>+ * @rekey_data: rekeying data for WoWLAN GTK rekey offload</div><div class='add'>+ * @seqno: storage for seqno for older firmware D0/D3 transition</div><div class='add'>+ * @seqno_valid: indicates @seqno is valid</div><div class='add'>+ * @time_event_data: session protection time event data</div><div class='add'>+ * @tsf_id: the TSF resource ID assigned in firmware (for firmware needing that)</div><div class='add'>+ * @tx_key_idx: WEP transmit key index for D3</div><div class='add'>+ * @uapsd_misbehaving_ap_addr: MLD address/BSSID of U-APSD misbehaving AP, to</div><div class='add'>+ *	not use U-APSD on reconnection</div><div class='add'>+ * @uapsd_nonagg_detected_wk: worker for handling detection of no aggregation</div><div class='add'>+ *	in U-APSD</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_mvm_vif {</div><div class='ctx'> 	struct iwl_mvm *mvm;</div><div class='ctx'> 	u16 id;</div><div class='ctx'> 	u16 color;</div><div class='del'>-	u8 ap_sta_id;</div><div class='ctx'> </div><div class='del'>-	u8 bssid[ETH_ALEN];</div><div class='ctx'> 	bool associated;</div><div class='ctx'> 	u8 ap_assoc_sta_count;</div><div class='del'>-</div><div class='del'>-	u16 cab_queue;</div><div class='del'>-</div><div class='ctx'> 	bool uploaded;</div><div class='ctx'> 	bool ap_ibss_active;</div><div class='ctx'> 	bool pm_enabled;</div><div class='ctx'> 	bool monitor_active;</div><div class='add'>+	bool esr_active;</div><div class='add'>+	bool session_prot_connection_loss;</div><div class='add'>+</div><div class='ctx'> 	u8 low_latency: 6;</div><div class='ctx'> 	u8 low_latency_actual: 1;</div><div class='del'>-	bool ps_disabled;</div><div class='del'>-	struct iwl_mvm_vif_bf_data bf_data;</div><div class='ctx'> </div><div class='del'>-	struct {</div><div class='del'>-		u32 num_beacons, accu_num_beacons;</div><div class='del'>-		u8 avg_signal;</div><div class='del'>-	} beacon_stats;</div><div class='add'>+	u8 authorized:1;</div><div class='add'>+	bool ps_disabled;</div><div class='ctx'> </div><div class='ctx'> 	u32 ap_beacon_time;</div><div class='add'>+	bool bf_enabled;</div><div class='add'>+	bool ba_enabled;</div><div class='ctx'> </div><div class='del'>-	enum iwl_tsf_id tsf_id;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * QoS data from mac80211, need to store this here</div><div class='del'>-	 * as mac80211 has a separate callback but we need</div><div class='del'>-	 * to have the data for the MAC context</div><div class='del'>-	 */</div><div class='del'>-	struct ieee80211_tx_queue_params queue_params[IEEE80211_NUM_ACS];</div><div class='del'>-	struct iwl_mvm_time_event_data time_event_data;</div><div class='del'>-	struct iwl_mvm_time_event_data hs_time_event_data;</div><div class='del'>-</div><div class='del'>-	struct iwl_mvm_int_sta bcast_sta;</div><div class='del'>-	struct iwl_mvm_int_sta mcast_sta;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Assigned while mac80211 has the interface in a channel context,</div><div class='del'>-	 * or, for P2P Device, while it exists.</div><div class='del'>-	 */</div><div class='del'>-	struct iwl_mvm_phy_ctxt *phy_ctxt;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	/* WoWLAN GTK rekey data */</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u8 kck[NL80211_KCK_EXT_LEN];</div><div class='hunk'>@@ -389,47 +479,59 @@ struct iwl_mvm_vif {</div><div class='ctx'> 	struct iwl_dbgfs_bf dbgfs_bf;</div><div class='ctx'> 	struct iwl_mac_power_cmd mac_pwr_cmd;</div><div class='ctx'> 	int dbgfs_quota_min;</div><div class='add'>+	bool ftm_unprotected;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	enum ieee80211_smps_mode smps_requests[NUM_IWL_MVM_SMPS_REQ];</div><div class='del'>-</div><div class='ctx'> 	/* FW identified misbehaving AP */</div><div class='del'>-	u8 uapsd_misbehaving_bssid[ETH_ALEN];</div><div class='del'>-</div><div class='add'>+	u8 uapsd_misbehaving_ap_addr[ETH_ALEN] __aligned(2);</div><div class='ctx'> 	struct delayed_work uapsd_nonagg_detected_wk;</div><div class='ctx'> </div><div class='del'>-	/* Indicates that CSA countdown may be started */</div><div class='ctx'> 	bool csa_countdown;</div><div class='ctx'> 	bool csa_failed;</div><div class='add'>+	bool csa_bcn_pending;</div><div class='add'>+	bool csa_blocks_tx;</div><div class='ctx'> 	u16 csa_target_freq;</div><div class='ctx'> 	u16 csa_count;</div><div class='ctx'> 	u16 csa_misbehave;</div><div class='ctx'> 	struct delayed_work csa_work;</div><div class='ctx'> </div><div class='del'>-	/* Indicates that we are waiting for a beacon on a new channel */</div><div class='del'>-	bool csa_bcn_pending;</div><div class='add'>+	enum iwl_tsf_id tsf_id;</div><div class='add'>+</div><div class='add'>+	struct iwl_mvm_time_event_data time_event_data;</div><div class='add'>+	struct iwl_mvm_time_event_data hs_time_event_data;</div><div class='add'>+	enum iwl_roc_activity roc_activity;</div><div class='ctx'> </div><div class='ctx'> 	/* TCP Checksum Offload */</div><div class='ctx'> 	netdev_features_t features;</div><div class='ctx'> </div><div class='del'>-	struct iwl_probe_resp_data __rcu *probe_resp_data;</div><div class='add'>+	struct ieee80211_sta *ap_sta;</div><div class='ctx'> </div><div class='ctx'> 	/* we can only have 2 GTK + 2 IGTK active at a time */</div><div class='ctx'> 	struct ieee80211_key_conf *ap_early_keys[4];</div><div class='ctx'> </div><div class='del'>-	/* 26-tone RU OFDMA transmissions should be blocked */</div><div class='del'>-	bool he_ru_2mhz_block;</div><div class='del'>-</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct ieee80211_key_conf __rcu *keys[2];</div><div class='ctx'> 	} bcn_prot;</div><div class='add'>+</div><div class='add'>+	u16 max_tx_op;</div><div class='add'>+</div><div class='add'>+	u16 link_selection_res;</div><div class='add'>+	u8 link_selection_primary;</div><div class='add'>+	u8 primary_link;</div><div class='add'>+</div><div class='add'>+	struct iwl_mvm_vif_link_info deflink;</div><div class='add'>+	struct iwl_mvm_vif_link_info *link[IEEE80211_MLD_MAX_NUM_LINKS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define for_each_mvm_vif_valid_link(mvm_vif, link_id)			\</div><div class='add'>+	for (link_id = 0;						\</div><div class='add'>+	     link_id &lt; ARRAY_SIZE((mvm_vif)-&gt;link);			\</div><div class='add'>+	     link_id++)							\</div><div class='add'>+		if ((mvm_vif)-&gt;link[link_id])</div><div class='add'>+</div><div class='ctx'> static inline struct iwl_mvm_vif *</div><div class='ctx'> iwl_mvm_vif_from_mac80211(struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	if (!vif)</div><div class='del'>-		return NULL;</div><div class='ctx'> 	return (void *)vif-&gt;drv_priv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -445,6 +547,7 @@ enum iwl_scan_status {</div><div class='ctx'> 	IWL_MVM_SCAN_STOPPING_REGULAR	= BIT(8),</div><div class='ctx'> 	IWL_MVM_SCAN_STOPPING_SCHED	= BIT(9),</div><div class='ctx'> 	IWL_MVM_SCAN_STOPPING_NETDETECT	= BIT(10),</div><div class='add'>+	IWL_MVM_SCAN_STOPPING_INT_MLO	= BIT(11),</div><div class='ctx'> </div><div class='ctx'> 	IWL_MVM_SCAN_REGULAR_MASK	= IWL_MVM_SCAN_REGULAR |</div><div class='ctx'> 					  IWL_MVM_SCAN_STOPPING_REGULAR,</div><div class='hunk'>@@ -473,13 +576,15 @@ enum iwl_mvm_sched_scan_pass_all_states {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_mvm_tt_mgnt - Thermal Throttling Management structure</div><div class='add'>+ * struct iwl_mvm_tt_mgmt - Thermal Throttling Management structure</div><div class='ctx'>  * @ct_kill_exit: worker to exit thermal kill</div><div class='ctx'>  * @dynamic_smps: Is thermal throttling enabled dynamic_smps?</div><div class='ctx'>  * @tx_backoff: The current thremal throttling tx backoff in uSec.</div><div class='ctx'>  * @min_backoff: The minimal tx backoff due to power restrictions</div><div class='ctx'>  * @params: Parameters to configure the thermal throttling algorithm.</div><div class='ctx'>  * @throttle: Is thermal throttling is active?</div><div class='add'>+ * @power_budget_mw: maximum cTDP power budget as defined for this system and</div><div class='add'>+ *	device</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_mvm_tt_mgmt {</div><div class='ctx'> 	struct delayed_work ct_kill_exit;</div><div class='hunk'>@@ -488,18 +593,18 @@ struct iwl_mvm_tt_mgmt {</div><div class='ctx'> 	u32 min_backoff;</div><div class='ctx'> 	struct iwl_tt_params params;</div><div class='ctx'> 	bool throttle;</div><div class='add'>+</div><div class='add'>+	u32 power_budget_mw;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_THERMAL</div><div class='ctx'> /**</div><div class='del'>- *struct iwl_mvm_thermal_device - thermal zone related data</div><div class='del'>- * @temp_trips: temperature thresholds for report</div><div class='del'>- * @fw_trips_index: keep indexes to original array - temp_trips</div><div class='add'>+ * struct iwl_mvm_thermal_device - thermal zone related data</div><div class='add'>+ * @trips: temperature thresholds for report</div><div class='ctx'>  * @tzone: thermal zone device data</div><div class='ctx'> */</div><div class='ctx'> struct iwl_mvm_thermal_device {</div><div class='del'>-	s16 temp_trips[IWL_MAX_DTS_TRIPS];</div><div class='del'>-	u8 fw_trips_index[IWL_MAX_DTS_TRIPS];</div><div class='add'>+	struct thermal_trip trips[IWL_MAX_DTS_TRIPS];</div><div class='ctx'> 	struct thermal_zone_device *tzone;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -598,87 +703,62 @@ struct iwl_mvm_tcm {</div><div class='ctx'>  * struct iwl_mvm_reorder_buffer - per ra/tid/queue reorder buffer</div><div class='ctx'>  * @head_sn: reorder window head sn</div><div class='ctx'>  * @num_stored: number of mpdus stored in the buffer</div><div class='del'>- * @buf_size: the reorder buffer size as set by the last addba request</div><div class='ctx'>  * @queue: queue of this reorder buffer</div><div class='del'>- * @last_amsdu: track last ASMDU SN for duplication detection</div><div class='del'>- * @last_sub_index: track ASMDU sub frame index for duplication detection</div><div class='del'>- * @reorder_timer: timer for frames are in the reorder buffer. For AMSDU</div><div class='del'>- *	it is the time of last received sub-frame</div><div class='del'>- * @removed: prevent timer re-arming</div><div class='ctx'>  * @valid: reordering is valid for this queue</div><div class='ctx'>  * @lock: protect reorder buffer internal state</div><div class='del'>- * @mvm: mvm pointer, needed for frame timer context</div><div class='del'>- * @consec_oldsn_drops: consecutive drops due to old SN</div><div class='del'>- * @consec_oldsn_ampdu_gp2: A-MPDU GP2 timestamp to track</div><div class='del'>- *	when to apply old SN consecutive drop workaround</div><div class='del'>- * @consec_oldsn_prev_drop: track whether or not an MPDU</div><div class='del'>- *	that was single/part of the previous A-MPDU was</div><div class='del'>- *	dropped due to old SN</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_mvm_reorder_buffer {</div><div class='ctx'> 	u16 head_sn;</div><div class='ctx'> 	u16 num_stored;</div><div class='del'>-	u16 buf_size;</div><div class='ctx'> 	int queue;</div><div class='del'>-	u16 last_amsdu;</div><div class='del'>-	u8 last_sub_index;</div><div class='del'>-	struct timer_list reorder_timer;</div><div class='del'>-	bool removed;</div><div class='ctx'> 	bool valid;</div><div class='ctx'> 	spinlock_t lock;</div><div class='del'>-	struct iwl_mvm *mvm;</div><div class='del'>-	unsigned int consec_oldsn_drops;</div><div class='del'>-	u32 consec_oldsn_ampdu_gp2;</div><div class='del'>-	unsigned int consec_oldsn_prev_drop:1;</div><div class='ctx'> } ____cacheline_aligned_in_smp;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct _iwl_mvm_reorder_buf_entry - reorder buffer entry per-queue/per-seqno</div><div class='add'>+ * struct iwl_mvm_reorder_buf_entry - reorder buffer entry per-queue/per-seqno</div><div class='ctx'>  * @frames: list of skbs stored</div><div class='del'>- * @reorder_time: time the packet was stored in the reorder buffer</div><div class='ctx'>  */</div><div class='del'>-struct _iwl_mvm_reorder_buf_entry {</div><div class='del'>-	struct sk_buff_head frames;</div><div class='del'>-	unsigned long reorder_time;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* make this indirection to get the aligned thing */</div><div class='ctx'> struct iwl_mvm_reorder_buf_entry {</div><div class='del'>-	struct _iwl_mvm_reorder_buf_entry e;</div><div class='add'>+	struct sk_buff_head frames;</div><div class='ctx'> }</div><div class='ctx'> #ifndef __CHECKER__</div><div class='ctx'> /* sparse doesn't like this construct: "bad integer constant expression" */</div><div class='del'>-__aligned(roundup_pow_of_two(sizeof(struct _iwl_mvm_reorder_buf_entry)))</div><div class='add'>+__aligned(roundup_pow_of_two(sizeof(struct sk_buff_head)))</div><div class='ctx'> #endif</div><div class='ctx'> ;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_mvm_baid_data - BA session data</div><div class='del'>- * @sta_id: station id</div><div class='add'>+ * @sta_mask: current station mask for the BAID</div><div class='ctx'>  * @tid: tid of the session</div><div class='del'>- * @baid baid of the session</div><div class='add'>+ * @baid: baid of the session</div><div class='ctx'>  * @timeout: the timeout set in the addba request</div><div class='add'>+ * @buf_size: the reorder buffer size as set by the last addba request</div><div class='ctx'>  * @entries_per_queue: # of buffers per queue, this actually gets</div><div class='ctx'>  *	aligned up to avoid cache line sharing between queues</div><div class='ctx'>  * @last_rx: last rx jiffies, updated only if timeout passed from last update</div><div class='ctx'>  * @session_timer: timer to check if BA session expired, runs at 2 * timeout</div><div class='add'>+ * @rcu_ptr: BA data RCU protected access</div><div class='add'>+ * @rcu_head: RCU head for freeing this data</div><div class='ctx'>  * @mvm: mvm pointer, needed for timer context</div><div class='ctx'>  * @reorder_buf: reorder buffer, allocated per queue</div><div class='del'>- * @reorder_buf_data: data</div><div class='add'>+ * @entries: data</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_mvm_baid_data {</div><div class='ctx'> 	struct rcu_head rcu_head;</div><div class='del'>-	u8 sta_id;</div><div class='add'>+	u32 sta_mask;</div><div class='ctx'> 	u8 tid;</div><div class='ctx'> 	u8 baid;</div><div class='ctx'> 	u16 timeout;</div><div class='add'>+	u16 buf_size;</div><div class='ctx'> 	u16 entries_per_queue;</div><div class='ctx'> 	unsigned long last_rx;</div><div class='ctx'> 	struct timer_list session_timer;</div><div class='ctx'> 	struct iwl_mvm_baid_data __rcu **rcu_ptr;</div><div class='ctx'> 	struct iwl_mvm *mvm;</div><div class='ctx'> 	struct iwl_mvm_reorder_buffer reorder_buf[IWL_MAX_RX_HW_QUEUES];</div><div class='del'>-	struct iwl_mvm_reorder_buf_entry entries[];</div><div class='add'>+	struct iwl_mvm_reorder_buf_entry entries[] ____cacheline_aligned_in_smp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct iwl_mvm_baid_data *</div><div class='hunk'>@@ -726,7 +806,11 @@ struct iwl_mvm_txq {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	u16 txq_id;</div><div class='ctx'> 	atomic_t tx_request;</div><div class='del'>-	bool stopped;</div><div class='add'>+#define IWL_MVM_TXQ_STATE_READY		0</div><div class='add'>+#define IWL_MVM_TXQ_STATE_STOP_FULL	1</div><div class='add'>+#define IWL_MVM_TXQ_STATE_STOP_REDIRECT	2</div><div class='add'>+#define IWL_MVM_TXQ_STATE_STOP_AP_CSA	3</div><div class='add'>+	unsigned long state;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct iwl_mvm_txq *</div><div class='hunk'>@@ -766,13 +850,79 @@ struct iwl_mvm_dqa_txq_info {</div><div class='ctx'> 	enum iwl_mvm_queue_status status;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct ptp_data {</div><div class='add'>+	struct ptp_clock *ptp_clock;</div><div class='add'>+	struct ptp_clock_info ptp_clock_info;</div><div class='add'>+</div><div class='add'>+	struct delayed_work dwork;</div><div class='add'>+</div><div class='add'>+	/* The last GP2 reading from the hw */</div><div class='add'>+	u32 last_gp2;</div><div class='add'>+</div><div class='add'>+	/* number of wraparounds since scale_update_adj_time_ns */</div><div class='add'>+	u32 wrap_counter;</div><div class='add'>+</div><div class='add'>+	/* GP2 time when the scale was last updated */</div><div class='add'>+	u32 scale_update_gp2;</div><div class='add'>+</div><div class='add'>+	/* Adjusted time when the scale was last updated in nanoseconds */</div><div class='add'>+	u64 scale_update_adj_time_ns;</div><div class='add'>+</div><div class='add'>+	/* clock frequency offset, scaled to 65536000000 */</div><div class='add'>+	u64 scaled_freq;</div><div class='add'>+</div><div class='add'>+	/* Delta between hardware clock and ptp clock in nanoseconds */</div><div class='add'>+	s64 delta;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_time_sync_data {</div><div class='add'>+	struct sk_buff_head frame_list;</div><div class='add'>+	u8 peer_addr[ETH_ALEN];</div><div class='add'>+	bool active;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_mei_scan_filter {</div><div class='add'>+	bool is_mei_limited_scan;</div><div class='add'>+	struct sk_buff_head scan_res;</div><div class='add'>+	struct work_struct scan_work;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mvm_acs_survey_channel - per-channel survey information</div><div class='add'>+ *</div><div class='add'>+ * Stripped down version of &amp;struct survey_info.</div><div class='add'>+ *</div><div class='add'>+ * @time: time in ms the radio was on the channel</div><div class='add'>+ * @time_busy: time in ms the channel was sensed busy</div><div class='add'>+ * @time_tx: time in ms spent transmitting data</div><div class='add'>+ * @time_rx: time in ms spent receiving data</div><div class='add'>+ * @noise: channel noise in dBm</div><div class='add'>+ */</div><div class='add'>+struct iwl_mvm_acs_survey_channel {</div><div class='add'>+	u32 time;</div><div class='add'>+	u32 time_busy;</div><div class='add'>+	u32 time_tx;</div><div class='add'>+	u32 time_rx;</div><div class='add'>+	s8 noise;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_mvm_acs_survey {</div><div class='add'>+	struct iwl_mvm_acs_survey_channel *bands[NUM_NL80211_BANDS];</div><div class='add'>+</div><div class='add'>+	/* Overall number of channels */</div><div class='add'>+	int n_channels;</div><div class='add'>+</div><div class='add'>+	/* Storage space for per-channel information follows */</div><div class='add'>+	struct iwl_mvm_acs_survey_channel channels[] __counted_by(n_channels);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct iwl_mvm {</div><div class='ctx'> 	/* for logger access */</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> </div><div class='ctx'> 	struct iwl_trans *trans;</div><div class='ctx'> 	const struct iwl_fw *fw;</div><div class='del'>-	const struct iwl_cfg *cfg;</div><div class='add'>+	const struct iwl_rf_cfg *cfg;</div><div class='ctx'> 	struct iwl_phy_db *phy_db;</div><div class='ctx'> 	struct ieee80211_hw *hw;</div><div class='ctx'> </div><div class='hunk'>@@ -782,6 +932,9 @@ struct iwl_mvm {</div><div class='ctx'> 	spinlock_t async_handlers_lock;</div><div class='ctx'> 	struct work_struct async_handlers_wk;</div><div class='ctx'> </div><div class='add'>+	/* For async rx handlers that require the wiphy lock */</div><div class='add'>+	struct wiphy_work async_handlers_wiphy_wk;</div><div class='add'>+</div><div class='ctx'> 	struct work_struct roc_done_wk;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long init_status;</div><div class='hunk'>@@ -801,6 +954,8 @@ struct iwl_mvm {</div><div class='ctx'> </div><div class='ctx'> 	u8 cca_40mhz_workaround;</div><div class='ctx'> </div><div class='add'>+	u8 fw_rates_ver;</div><div class='add'>+</div><div class='ctx'> 	u32 ampdu_ref;</div><div class='ctx'> 	bool ampdu_toggle;</div><div class='ctx'> </div><div class='hunk'>@@ -824,9 +979,22 @@ struct iwl_mvm {</div><div class='ctx'> 		struct iwl_mvm_tvqm_txq_info tvqm_info[IWL_MAX_TVQM_QUEUES];</div><div class='ctx'> 	};</div><div class='ctx'> 	struct work_struct add_stream_wk; /* To add streams to queues */</div><div class='add'>+	spinlock_t add_stream_lock;</div><div class='ctx'> </div><div class='ctx'> 	const char *nvm_file_name;</div><div class='ctx'> 	struct iwl_nvm_data *nvm_data;</div><div class='add'>+	struct iwl_mei_nvm *mei_nvm_data;</div><div class='add'>+	struct iwl_mvm_csme_conn_info __rcu *csme_conn_info;</div><div class='add'>+	bool mei_rfkill_blocked;</div><div class='add'>+	bool mei_registered;</div><div class='add'>+	struct work_struct sap_connected_wk;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * NVM built based on the SAP data but that we can't free even after</div><div class='add'>+	 * we get ownership because it contains the cfg80211's channel.</div><div class='add'>+	 */</div><div class='add'>+	struct iwl_nvm_data *temp_nvm_data;</div><div class='add'>+</div><div class='ctx'> 	/* NVM sections */</div><div class='ctx'> 	struct iwl_nvm_section nvm_sections[NVM_MAX_NUM_SECTIONS];</div><div class='ctx'> </div><div class='hunk'>@@ -837,7 +1005,9 @@ struct iwl_mvm {</div><div class='ctx'> </div><div class='ctx'> 	/* data related to data path */</div><div class='ctx'> 	struct iwl_rx_phy_info last_phy_info;</div><div class='del'>-	struct ieee80211_sta __rcu *fw_id_to_mac_id[IWL_MVM_STATION_COUNT_MAX];</div><div class='add'>+	struct ieee80211_sta __rcu *fw_id_to_mac_id[IWL_STATION_COUNT_MAX];</div><div class='add'>+	/* note: fw_id_to_link_sta must be protected by wiphy and mvm mutexes */</div><div class='add'>+	struct ieee80211_link_sta __rcu *fw_id_to_link_sta[IWL_STATION_COUNT_MAX];</div><div class='ctx'> 	u8 rx_ba_sessions;</div><div class='ctx'> </div><div class='ctx'> 	/* configured by mac80211 */</div><div class='hunk'>@@ -845,6 +1015,7 @@ struct iwl_mvm {</div><div class='ctx'> </div><div class='ctx'> 	/* Scan status, cmd (pre-allocated) and auxiliary station */</div><div class='ctx'> 	unsigned int scan_status;</div><div class='add'>+	size_t scan_cmd_size;</div><div class='ctx'> 	void *scan_cmd;</div><div class='ctx'> 	struct iwl_mcast_filter_cmd *mcast_filter_cmd;</div><div class='ctx'> 	/* For CDB this is low band scan type, for non-CDB - type. */</div><div class='hunk'>@@ -858,28 +1029,18 @@ struct iwl_mvm {</div><div class='ctx'> 	unsigned int max_scans;</div><div class='ctx'> </div><div class='ctx'> 	/* UMAC scan tracking */</div><div class='del'>-	u32 scan_uid_status[IWL_MVM_MAX_UMAC_SCANS];</div><div class='add'>+	u32 scan_uid_status[IWL_MAX_UMAC_SCANS];</div><div class='ctx'> </div><div class='ctx'> 	/* start time of last scan in TSF of the mac that requested the scan */</div><div class='ctx'> 	u64 scan_start;</div><div class='ctx'> </div><div class='ctx'> 	/* the vif that requested the current scan */</div><div class='ctx'> 	struct iwl_mvm_vif *scan_vif;</div><div class='add'>+	u8 scan_link_id;</div><div class='ctx'> </div><div class='ctx'> 	/* rx chain antennas set through debugfs for the scan command */</div><div class='ctx'> 	u8 scan_rx_ant;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IWLWIFI_BCAST_FILTERING</div><div class='del'>-	/* broadcast filters to configure for each associated station */</div><div class='del'>-	const struct iwl_fw_bcast_filter *bcast_filters;</div><div class='del'>-#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='del'>-	struct {</div><div class='del'>-		bool override;</div><div class='del'>-		struct iwl_bcast_filter_cmd cmd;</div><div class='del'>-	} dbgfs_bcast_filtering;</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/* Internal station */</div><div class='ctx'> 	struct iwl_mvm_int_sta aux_sta;</div><div class='ctx'> 	struct iwl_mvm_int_sta snif_sta;</div><div class='hunk'>@@ -889,6 +1050,9 @@ struct iwl_mvm {</div><div class='ctx'> 	u8 scan_last_antenna_idx; /* to toggle TX between antennas */</div><div class='ctx'> 	u8 mgmt_last_antenna_idx;</div><div class='ctx'> </div><div class='add'>+	u8 set_tx_ant;</div><div class='add'>+	u8 set_rx_ant;</div><div class='add'>+</div><div class='ctx'> 	/* last smart fifo state that was successfully sent to firmware */</div><div class='ctx'> 	enum iwl_sf_state sf_state;</div><div class='ctx'> </div><div class='hunk'>@@ -930,11 +1094,8 @@ struct iwl_mvm {</div><div class='ctx'> 	unsigned long fw_key_table[BITS_TO_LONGS(STA_KEY_MAX_NUM)];</div><div class='ctx'> 	u8 fw_key_deleted[STA_KEY_MAX_NUM];</div><div class='ctx'> </div><div class='del'>-	u8 vif_count;</div><div class='ctx'> 	struct ieee80211_vif __rcu *vif_id_to_mac[NUM_MAC_INDEX_DRIVER];</div><div class='ctx'> </div><div class='del'>-	/* -1 for always, 0 for never, &gt;0 for that many times */</div><div class='del'>-	s8 fw_restart;</div><div class='ctx'> 	u8 *error_recovery_buf;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IWLWIFI_LEDS</div><div class='hunk'>@@ -943,7 +1104,7 @@ struct iwl_mvm {</div><div class='ctx'> </div><div class='ctx'> 	struct ieee80211_vif *p2p_device_vif;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	struct wiphy_wowlan_support wowlan;</div><div class='ctx'> 	int gtk_ivlen, gtk_icvlen, ptk_ivlen, ptk_icvlen;</div><div class='ctx'> </div><div class='hunk'>@@ -954,20 +1115,17 @@ struct iwl_mvm {</div><div class='ctx'> 	struct ieee80211_channel **nd_channels;</div><div class='ctx'> 	int n_nd_channels;</div><div class='ctx'> 	bool net_detect;</div><div class='add'>+	bool fast_resume;</div><div class='ctx'> 	u8 offload_tid;</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> 	bool d3_wake_sysassert;</div><div class='del'>-	bool d3_test_active;</div><div class='del'>-	u32 d3_test_pme_ptr;</div><div class='del'>-	struct ieee80211_vif *keep_vif;</div><div class='ctx'> 	u32 last_netdetect_scans; /* no. of scans in the last net-detect wake */</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	wait_queue_head_t rx_sync_waitq;</div><div class='ctx'> </div><div class='del'>-	/* BT-Coex */</div><div class='del'>-	struct iwl_bt_coex_profile_notif last_bt_notif;</div><div class='add'>+	struct iwl_bt_coex_prof_old_notif last_bt_notif;</div><div class='ctx'> 	struct iwl_bt_coex_ci_cmd last_bt_ci_cmd;</div><div class='ctx'> </div><div class='ctx'> 	u8 bt_tx_prio;</div><div class='hunk'>@@ -991,6 +1149,8 @@ struct iwl_mvm {</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool temperature_test;  /* Debug test temperature is enabled */</div><div class='ctx'> </div><div class='add'>+	bool fw_static_smps_request;</div><div class='add'>+</div><div class='ctx'> 	unsigned long bt_coex_last_tcm_ts;</div><div class='ctx'> 	struct iwl_mvm_tcm tcm;</div><div class='ctx'> </div><div class='hunk'>@@ -1000,11 +1160,6 @@ struct iwl_mvm {</div><div class='ctx'> </div><div class='ctx'> 	struct iwl_time_quota_cmd last_quota_cmd;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_NL80211_TESTMODE</div><div class='del'>-	u32 noa_duration;</div><div class='del'>-	struct ieee80211_vif *noa_vif;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/* Tx queues */</div><div class='ctx'> 	u16 aux_queue;</div><div class='ctx'> 	u16 snif_queue;</div><div class='hunk'>@@ -1016,6 +1171,8 @@ struct iwl_mvm {</div><div class='ctx'> 	/* Indicate if 32Khz external clock is valid */</div><div class='ctx'> 	u32 ext_clock_valid;</div><div class='ctx'> </div><div class='add'>+	/* This vif used by CSME to send / receive traffic */</div><div class='add'>+	struct ieee80211_vif *csme_vif;</div><div class='ctx'> 	struct ieee80211_vif __rcu *csa_vif;</div><div class='ctx'> 	struct ieee80211_vif __rcu *csa_tx_blocked_vif;</div><div class='ctx'> 	u8 csa_tx_block_bcn_timeout;</div><div class='hunk'>@@ -1056,14 +1213,13 @@ struct iwl_mvm {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	u32 ciphers[IWL_MVM_NUM_CIPHERS];</div><div class='del'>-	struct ieee80211_cipher_scheme cs[IWL_UCODE_MAX_CS];</div><div class='ctx'> </div><div class='ctx'> 	struct cfg80211_ftm_responder_stats ftm_resp_stats;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct cfg80211_pmsr_request *req;</div><div class='ctx'> 		struct wireless_dev *req_wdev;</div><div class='ctx'> 		struct list_head loc_list;</div><div class='del'>-		int responses[IWL_MVM_TOF_MAX_APS];</div><div class='add'>+		int responses[IWL_TOF_MAX_APS];</div><div class='ctx'> 		struct {</div><div class='ctx'> 			struct list_head resp;</div><div class='ctx'> 		} smooth;</div><div class='hunk'>@@ -1072,13 +1228,12 @@ struct iwl_mvm {</div><div class='ctx'> </div><div class='ctx'> 	struct list_head resp_pasn_list;</div><div class='ctx'> </div><div class='add'>+	struct ptp_data ptp_data;</div><div class='add'>+</div><div class='ctx'> 	struct {</div><div class='del'>-		u8 d0i3_resp;</div><div class='ctx'> 		u8 range_resp;</div><div class='ctx'> 	} cmd_ver;</div><div class='ctx'> </div><div class='del'>-	struct ieee80211_vif *nan_vif;</div><div class='del'>-#define IWL_MAX_BAID	32</div><div class='ctx'> 	struct iwl_mvm_baid_data __rcu *baid_map[IWL_MAX_BAID];</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1091,13 +1246,39 @@ struct iwl_mvm {</div><div class='ctx'> </div><div class='ctx'> 	/* does a monitor vif exist (only one can exist hence bool) */</div><div class='ctx'> 	bool monitor_on;</div><div class='add'>+	/*</div><div class='add'>+	 * primary channel position relative to he whole bandwidth,</div><div class='add'>+	 * in steps of 80 MHz</div><div class='add'>+	 */</div><div class='add'>+	u8 monitor_p80;</div><div class='ctx'> </div><div class='ctx'> 	/* sniffer data to include in radiotap */</div><div class='ctx'> 	__le16 cur_aid;</div><div class='ctx'> 	u8 cur_bssid[ETH_ALEN];</div><div class='ctx'> </div><div class='add'>+	/* report rx timestamp in ptp clock time */</div><div class='add'>+	bool rx_ts_ptp;</div><div class='add'>+</div><div class='ctx'> 	unsigned long last_6ghz_passive_scan_jiffies;</div><div class='ctx'> 	unsigned long last_reset_or_resume_time_jiffies;</div><div class='add'>+</div><div class='add'>+	bool sta_remove_requires_queue_remove;</div><div class='add'>+	bool mld_api_is_used;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Indicates that firmware will do a product reset (and then</div><div class='add'>+	 * therefore fail to load) when we start it (due to OTP burn),</div><div class='add'>+	 * if so don't dump errors etc. since this is expected.</div><div class='add'>+	 */</div><div class='add'>+	bool fw_product_reset;</div><div class='add'>+</div><div class='add'>+	struct iwl_time_sync_data time_sync;</div><div class='add'>+</div><div class='add'>+	struct iwl_mei_scan_filter mei_scan_filter;</div><div class='add'>+</div><div class='add'>+	struct iwl_mvm_acs_survey *acs_survey;</div><div class='add'>+</div><div class='add'>+	bool statistics_clear;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Extract MVM priv from op_mode and _hw */</div><div class='hunk'>@@ -1107,28 +1288,37 @@ struct iwl_mvm {</div><div class='ctx'> #define IWL_MAC80211_GET_MVM(_hw)			\</div><div class='ctx'> 	IWL_OP_MODE_GET_MVM((struct iwl_op_mode *)((_hw)-&gt;priv))</div><div class='ctx'> </div><div class='add'>+DEFINE_GUARD(mvm, struct iwl_mvm *, mutex_lock(&amp;_T-&gt;mutex), mutex_unlock(&amp;_T-&gt;mutex))</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_mvm_status - MVM status bits</div><div class='ctx'>  * @IWL_MVM_STATUS_HW_RFKILL: HW RF-kill is asserted</div><div class='ctx'>  * @IWL_MVM_STATUS_HW_CTKILL: CT-kill is active</div><div class='del'>- * @IWL_MVM_STATUS_ROC_RUNNING: remain-on-channel is running</div><div class='add'>+ * @IWL_MVM_STATUS_ROC_P2P_RUNNING: remain-on-channel on P2P is running (when</div><div class='add'>+ *	P2P is not over AUX)</div><div class='ctx'>  * @IWL_MVM_STATUS_HW_RESTART_REQUESTED: HW restart was requested</div><div class='ctx'>  * @IWL_MVM_STATUS_IN_HW_RESTART: HW restart is active</div><div class='ctx'>  * @IWL_MVM_STATUS_ROC_AUX_RUNNING: AUX remain-on-channel is running</div><div class='ctx'>  * @IWL_MVM_STATUS_FIRMWARE_RUNNING: firmware is running</div><div class='del'>- * @IWL_MVM_STATUS_NEED_FLUSH_P2P: need to flush P2P bcast STA</div><div class='ctx'>  * @IWL_MVM_STATUS_IN_D3: in D3 (or at least about to go into it)</div><div class='add'>+ * @IWL_MVM_STATUS_SUPPRESS_ERROR_LOG_ONCE: suppress one error log</div><div class='add'>+ *	if this is set, when intentionally triggered</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_mvm_status {</div><div class='ctx'> 	IWL_MVM_STATUS_HW_RFKILL,</div><div class='ctx'> 	IWL_MVM_STATUS_HW_CTKILL,</div><div class='del'>-	IWL_MVM_STATUS_ROC_RUNNING,</div><div class='add'>+	IWL_MVM_STATUS_ROC_P2P_RUNNING,</div><div class='ctx'> 	IWL_MVM_STATUS_HW_RESTART_REQUESTED,</div><div class='ctx'> 	IWL_MVM_STATUS_IN_HW_RESTART,</div><div class='ctx'> 	IWL_MVM_STATUS_ROC_AUX_RUNNING,</div><div class='ctx'> 	IWL_MVM_STATUS_FIRMWARE_RUNNING,</div><div class='del'>-	IWL_MVM_STATUS_NEED_FLUSH_P2P,</div><div class='ctx'> 	IWL_MVM_STATUS_IN_D3,</div><div class='add'>+	IWL_MVM_STATUS_SUPPRESS_ERROR_LOG_ONCE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwl_mvm_csme_conn_info {</div><div class='add'>+	struct rcu_head rcu_head;</div><div class='add'>+	struct iwl_mei_conn_info conn_info;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Keep track of completed init configuration */</div><div class='hunk'>@@ -1261,7 +1451,7 @@ static inline bool iwl_mvm_is_lar_supported(struct iwl_mvm *mvm)</div><div class='ctx'> 	 * Enable LAR only if it is supported by the FW (TLV) &amp;&amp;</div><div class='ctx'> 	 * enabled in the NVM</div><div class='ctx'> 	 */</div><div class='del'>-	if (mvm-&gt;cfg-&gt;nvm_type == IWL_NVM_EXT)</div><div class='add'>+	if (mvm-&gt;trans-&gt;cfg-&gt;nvm_type == IWL_NVM_EXT)</div><div class='ctx'> 		return nvm_lar &amp;&amp; tlv_lar;</div><div class='ctx'> 	else</div><div class='ctx'> 		return tlv_lar;</div><div class='hunk'>@@ -1285,8 +1475,7 @@ static inline bool iwl_mvm_bt_is_rrc_supported(struct iwl_mvm *mvm)</div><div class='ctx'> static inline bool iwl_mvm_is_csum_supported(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='ctx'> 	return fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='del'>-			   IWL_UCODE_TLV_CAPA_CSUM_SUPPORT) &amp;&amp;</div><div class='del'>-               !IWL_MVM_HW_CSUM_DISABLE;</div><div class='add'>+			   IWL_UCODE_TLV_CAPA_CSUM_SUPPORT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool iwl_mvm_is_mplut_supported(struct iwl_mvm *mvm)</div><div class='hunk'>@@ -1311,16 +1500,28 @@ static inline bool iwl_mvm_has_new_rx_api(struct iwl_mvm *mvm)</div><div class='ctx'> 			   IWL_UCODE_TLV_CAPA_MULTI_QUEUE_RX_SUPPORT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool iwl_mvm_has_mld_api(const struct iwl_fw *fw)</div><div class='add'>+{</div><div class='add'>+	return fw_has_capa(&amp;fw-&gt;ucode_capa,</div><div class='add'>+			   IWL_UCODE_TLV_CAPA_MLD_API_SUPPORT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool iwl_mvm_has_new_station_api(const struct iwl_fw *fw)</div><div class='add'>+{</div><div class='add'>+	return iwl_mvm_has_mld_api(fw) ||</div><div class='add'>+	       iwl_fw_lookup_cmd_ver(fw, ADD_STA, 0) &gt;= 12;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool iwl_mvm_has_new_tx_api(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='ctx'> 	/* TODO - replace with TLV once defined */</div><div class='del'>-	return mvm-&gt;trans-&gt;trans_cfg-&gt;use_tfh;</div><div class='add'>+	return mvm-&gt;trans-&gt;mac_cfg-&gt;gen2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool iwl_mvm_has_unified_ucode(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='ctx'> 	/* TODO - better define this */</div><div class='del'>-	return mvm-&gt;trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_22000;</div><div class='add'>+	return mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_22000;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool iwl_mvm_is_cdb_supported(struct iwl_mvm *mvm)</div><div class='hunk'>@@ -1345,7 +1546,7 @@ static inline bool iwl_mvm_cdb_scan_api(struct iwl_mvm *mvm)</div><div class='ctx'> 	 * but then there's a little bit of code in scan that won't make</div><div class='ctx'> 	 * any sense...</div><div class='ctx'> 	 */</div><div class='del'>-	return mvm-&gt;trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_22000;</div><div class='add'>+	return mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_22000;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool iwl_mvm_is_scan_ext_chan_supported(struct iwl_mvm *mvm)</div><div class='hunk'>@@ -1379,6 +1580,12 @@ static inline bool iwl_mvm_has_quota_low_latency(struct iwl_mvm *mvm)</div><div class='ctx'> 			  IWL_UCODE_TLV_API_QUOTA_LOW_LATENCY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool iwl_mvm_has_no_host_disable_tx(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	return fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			  IWL_UCODE_TLV_API_NO_HOST_DISABLE_TX);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool iwl_mvm_has_tlc_offload(const struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='ctx'> 	return fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='hunk'>@@ -1389,9 +1596,9 @@ static inline struct agg_tx_status *</div><div class='ctx'> iwl_mvm_get_agg_status(struct iwl_mvm *mvm, void *tx_resp)</div><div class='ctx'> {</div><div class='ctx'> 	if (iwl_mvm_has_new_tx_api(mvm))</div><div class='del'>-		return &amp;((struct iwl_mvm_tx_resp *)tx_resp)-&gt;status;</div><div class='add'>+		return &amp;((struct iwl_tx_resp *)tx_resp)-&gt;status;</div><div class='ctx'> 	else</div><div class='del'>-		return ((struct iwl_mvm_tx_resp_v3 *)tx_resp)-&gt;status;</div><div class='add'>+		return ((struct iwl_tx_resp_v3 *)tx_resp)-&gt;status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool iwl_mvm_is_tt_in_fw(struct iwl_mvm *mvm)</div><div class='hunk'>@@ -1412,14 +1619,59 @@ static inline bool iwl_mvm_is_ctdp_supported(struct iwl_mvm *mvm)</div><div class='ctx'> 			   IWL_UCODE_TLV_CAPA_CTDP_SUPPORT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool iwl_mvm_is_esr_supported(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	if (CSR_HW_RFID_IS_CDB(trans-&gt;info.hw_rf_id))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	switch (CSR_HW_RFID_TYPE(trans-&gt;info.hw_rf_id)) {</div><div class='add'>+	case IWL_CFG_RF_TYPE_FM:</div><div class='add'>+		/* Step A doesn't support eSR */</div><div class='add'>+		return CSR_HW_RFID_STEP(trans-&gt;info.hw_rf_id);</div><div class='add'>+	case IWL_CFG_RF_TYPE_WH:</div><div class='add'>+	case IWL_CFG_RF_TYPE_PE:</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int iwl_mvm_max_active_links(struct iwl_mvm *mvm,</div><div class='add'>+					   struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans *trans = mvm-&gt;fwrt.trans;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP)</div><div class='add'>+		return mvm-&gt;fw-&gt;ucode_capa.num_beacons;</div><div class='add'>+</div><div class='add'>+	/* Check if HW supports eSR or STR */</div><div class='add'>+	if (iwl_mvm_is_esr_supported(trans) ||</div><div class='add'>+	    (CSR_HW_RFID_TYPE(trans-&gt;info.hw_rf_id) == IWL_CFG_RF_TYPE_FM &amp;&amp;</div><div class='add'>+	     CSR_HW_RFID_IS_CDB(trans-&gt;info.hw_rf_id)))</div><div class='add'>+		return IWL_FW_MAX_ACTIVE_LINKS_NUM;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> extern const u8 iwl_mvm_ac_to_tx_fifo[];</div><div class='ctx'> extern const u8 iwl_mvm_ac_to_gen2_tx_fifo[];</div><div class='add'>+extern const u8 iwl_mvm_ac_to_bz_tx_fifo[];</div><div class='ctx'> </div><div class='ctx'> static inline u8 iwl_mvm_mac_ac_to_tx_fifo(struct iwl_mvm *mvm,</div><div class='ctx'> 					   enum ieee80211_ac_numbers ac)</div><div class='ctx'> {</div><div class='del'>-	return iwl_mvm_has_new_tx_api(mvm) ?</div><div class='del'>-		iwl_mvm_ac_to_gen2_tx_fifo[ac] : iwl_mvm_ac_to_tx_fifo[ac];</div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ)</div><div class='add'>+		return iwl_mvm_ac_to_bz_tx_fifo[ac];</div><div class='add'>+	if (iwl_mvm_has_new_tx_api(mvm))</div><div class='add'>+		return iwl_mvm_ac_to_gen2_tx_fifo[ac];</div><div class='add'>+	return iwl_mvm_ac_to_tx_fifo[ac];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool iwl_mvm_has_rlc_offload(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	return iwl_fw_lookup_cmd_ver(mvm-&gt;fw,</div><div class='add'>+				     WIDE_ID(DATA_PATH_GROUP, RLC_CONFIG_CMD),</div><div class='add'>+				     0) &gt;= 3;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct iwl_rate_info {</div><div class='hunk'>@@ -1430,7 +1682,7 @@ struct iwl_rate_info {</div><div class='ctx'> 	u8 ieee;	/* MAC header:  IWL_RATE_6M_IEEE, etc. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __iwl_mvm_mac_stop(struct iwl_mvm *mvm);</div><div class='add'>+void __iwl_mvm_mac_stop(struct iwl_mvm *mvm, bool suspend);</div><div class='ctx'> int __iwl_mvm_mac_start(struct iwl_mvm *mvm);</div><div class='ctx'> </div><div class='ctx'> /******************</div><div class='hunk'>@@ -1440,17 +1692,26 @@ int __iwl_mvm_mac_start(struct iwl_mvm *mvm);</div><div class='ctx'> int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm);</div><div class='ctx'> </div><div class='ctx'> /* Utils */</div><div class='add'>+int iwl_mvm_legacy_hw_idx_to_mac80211_idx(u32 rate_n_flags,</div><div class='add'>+					  enum nl80211_band band);</div><div class='ctx'> int iwl_mvm_legacy_rate_to_mac80211_idx(u32 rate_n_flags,</div><div class='ctx'> 					enum nl80211_band band);</div><div class='ctx'> void iwl_mvm_hwrate_to_tx_rate(u32 rate_n_flags,</div><div class='ctx'> 			       enum nl80211_band band,</div><div class='ctx'> 			       struct ieee80211_tx_rate *r);</div><div class='del'>-u8 iwl_mvm_mac80211_idx_to_hwrate(int rate_idx);</div><div class='add'>+u8 iwl_mvm_mac80211_idx_to_hwrate(const struct iwl_fw *fw, int rate_idx);</div><div class='ctx'> u8 iwl_mvm_mac80211_ac_to_ucode_ac(enum ieee80211_ac_numbers ac);</div><div class='del'>-void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm);</div><div class='add'>+bool iwl_mvm_is_nic_ack_enabled(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='add'>+</div><div class='add'>+static inline void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	iwl_fwrt_dump_error_logs(&amp;mvm-&gt;fwrt);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> u8 first_antenna(u8 mask);</div><div class='ctx'> u8 iwl_mvm_next_antenna(struct iwl_mvm *mvm, u8 valid, u8 last_idx);</div><div class='del'>-void iwl_mvm_get_sync_time(struct iwl_mvm *mvm, u32 *gp2, u64 *boottime);</div><div class='add'>+void iwl_mvm_get_sync_time(struct iwl_mvm *mvm, int clock_type, u32 *gp2,</div><div class='add'>+			   u64 *boottime, ktime_t *realtime);</div><div class='ctx'> u32 iwl_mvm_get_systime(struct iwl_mvm *mvm);</div><div class='ctx'> </div><div class='ctx'> /* Tx / Host Commands */</div><div class='hunk'>@@ -1468,11 +1729,12 @@ int iwl_mvm_tx_skb_sta(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 		       struct ieee80211_sta *sta);</div><div class='ctx'> int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb);</div><div class='ctx'> void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='del'>-			struct iwl_tx_cmd *tx_cmd,</div><div class='add'>+			struct iwl_tx_cmd_v6_params *tx_cmd_params,</div><div class='ctx'> 			struct ieee80211_tx_info *info, u8 sta_id);</div><div class='del'>-void iwl_mvm_set_tx_cmd_rate(struct iwl_mvm *mvm, struct iwl_tx_cmd *tx_cmd,</div><div class='del'>-			    struct ieee80211_tx_info *info,</div><div class='del'>-			    struct ieee80211_sta *sta, __le16 fc);</div><div class='add'>+void iwl_mvm_set_tx_cmd_rate(struct iwl_mvm *mvm,</div><div class='add'>+			     struct iwl_tx_cmd_v6_params *tx_cmd_params,</div><div class='add'>+			     struct ieee80211_tx_info *info,</div><div class='add'>+			     struct ieee80211_sta *sta, __le16 fc);</div><div class='ctx'> void iwl_mvm_mac_itxq_xmit(struct ieee80211_hw *hw, struct ieee80211_txq *txq);</div><div class='ctx'> unsigned int iwl_mvm_max_amsdu_size(struct iwl_mvm *mvm,</div><div class='ctx'> 				    struct ieee80211_sta *sta,</div><div class='hunk'>@@ -1484,18 +1746,29 @@ const char *iwl_mvm_get_tx_fail_reason(u32 status);</div><div class='ctx'> static inline const char *iwl_mvm_get_tx_fail_reason(u32 status) { return ""; }</div><div class='ctx'> #endif</div><div class='ctx'> int iwl_mvm_flush_tx_path(struct iwl_mvm *mvm, u32 tfd_msk);</div><div class='del'>-int iwl_mvm_flush_sta(struct iwl_mvm *mvm, void *sta, bool internal);</div><div class='add'>+int iwl_mvm_flush_sta(struct iwl_mvm *mvm, u32 sta_id, u32 tfd_queue_mask);</div><div class='ctx'> int iwl_mvm_flush_sta_tids(struct iwl_mvm *mvm, u32 sta_id, u16 tids);</div><div class='ctx'> </div><div class='add'>+/* Utils to extract sta related data */</div><div class='add'>+__le32 iwl_mvm_get_sta_htc_flags(struct ieee80211_sta *sta,</div><div class='add'>+				 struct ieee80211_link_sta *link_sta);</div><div class='add'>+u8 iwl_mvm_get_sta_uapsd_acs(struct ieee80211_sta *sta);</div><div class='add'>+u32 iwl_mvm_get_sta_ampdu_dens(struct ieee80211_link_sta *link_sta,</div><div class='add'>+			       struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			       u32 *_agg_size);</div><div class='add'>+int iwl_mvm_set_sta_pkt_ext(struct iwl_mvm *mvm,</div><div class='add'>+			    struct ieee80211_link_sta *link_sta,</div><div class='add'>+			    struct iwl_he_pkt_ext_v2 *pkt_ext);</div><div class='add'>+</div><div class='ctx'> void iwl_mvm_async_handlers_purge(struct iwl_mvm *mvm);</div><div class='ctx'> </div><div class='ctx'> static inline void iwl_mvm_set_tx_cmd_ccmp(struct ieee80211_tx_info *info,</div><div class='del'>-					   struct iwl_tx_cmd *tx_cmd)</div><div class='add'>+					   struct iwl_tx_cmd_v6_params *tx_cmd_params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_key_conf *keyconf = info-&gt;control.hw_key;</div><div class='ctx'> </div><div class='del'>-	tx_cmd-&gt;sec_ctl = TX_CMD_SEC_CCM;</div><div class='del'>-	memcpy(tx_cmd-&gt;key, keyconf-&gt;key, keyconf-&gt;keylen);</div><div class='add'>+	tx_cmd_params-&gt;sec_ctl = TX_CMD_SEC_CCM;</div><div class='add'>+	memcpy(tx_cmd_params-&gt;key, keyconf-&gt;key, keyconf-&gt;keylen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void iwl_mvm_wait_for_async_handlers(struct iwl_mvm *mvm)</div><div class='hunk'>@@ -1504,11 +1777,23 @@ static inline void iwl_mvm_wait_for_async_handlers(struct iwl_mvm *mvm)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Statistics */</div><div class='add'>+void iwl_mvm_handle_rx_system_oper_stats(struct iwl_mvm *mvm,</div><div class='add'>+					 struct iwl_rx_cmd_buffer *rxb);</div><div class='add'>+void iwl_mvm_handle_rx_system_oper_part1_stats(struct iwl_mvm *mvm,</div><div class='add'>+					       struct iwl_rx_cmd_buffer *rxb);</div><div class='add'>+static inline void</div><div class='add'>+iwl_mvm_handle_rx_system_end_stats_notif(struct iwl_mvm *mvm,</div><div class='add'>+					 struct iwl_rx_cmd_buffer *rxb)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void iwl_mvm_handle_rx_statistics(struct iwl_mvm *mvm,</div><div class='ctx'> 				  struct iwl_rx_packet *pkt);</div><div class='ctx'> void iwl_mvm_rx_statistics(struct iwl_mvm *mvm,</div><div class='ctx'> 			   struct iwl_rx_cmd_buffer *rxb);</div><div class='ctx'> int iwl_mvm_request_statistics(struct iwl_mvm *mvm, bool clear);</div><div class='add'>+int iwl_mvm_request_periodic_system_statistics(struct iwl_mvm *mvm,</div><div class='add'>+					       bool enable);</div><div class='ctx'> void iwl_mvm_accu_radio_stats(struct iwl_mvm *mvm);</div><div class='ctx'> </div><div class='ctx'> /* NVM */</div><div class='hunk'>@@ -1517,16 +1802,29 @@ int iwl_mvm_load_nvm_to_nic(struct iwl_mvm *mvm);</div><div class='ctx'> </div><div class='ctx'> static inline u8 iwl_mvm_get_valid_tx_ant(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='del'>-	return mvm-&gt;nvm_data &amp;&amp; mvm-&gt;nvm_data-&gt;valid_tx_ant ?</div><div class='del'>-	       mvm-&gt;fw-&gt;valid_tx_ant &amp; mvm-&gt;nvm_data-&gt;valid_tx_ant :</div><div class='del'>-	       mvm-&gt;fw-&gt;valid_tx_ant;</div><div class='add'>+	u8 tx_ant = mvm-&gt;fw-&gt;valid_tx_ant;</div><div class='add'>+</div><div class='add'>+	if (mvm-&gt;nvm_data &amp;&amp; mvm-&gt;nvm_data-&gt;valid_tx_ant)</div><div class='add'>+		tx_ant &amp;= mvm-&gt;nvm_data-&gt;valid_tx_ant;</div><div class='add'>+</div><div class='add'>+	if (mvm-&gt;set_tx_ant)</div><div class='add'>+		tx_ant &amp;= mvm-&gt;set_tx_ant;</div><div class='add'>+</div><div class='add'>+	return tx_ant;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u8 iwl_mvm_get_valid_rx_ant(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='del'>-	return mvm-&gt;nvm_data &amp;&amp; mvm-&gt;nvm_data-&gt;valid_rx_ant ?</div><div class='del'>-	       mvm-&gt;fw-&gt;valid_rx_ant &amp; mvm-&gt;nvm_data-&gt;valid_rx_ant :</div><div class='del'>-	       mvm-&gt;fw-&gt;valid_rx_ant;</div><div class='add'>+	u8 rx_ant = mvm-&gt;fw-&gt;valid_rx_ant;</div><div class='add'>+</div><div class='add'>+	if (mvm-&gt;nvm_data &amp;&amp; mvm-&gt;nvm_data-&gt;valid_rx_ant)</div><div class='add'>+		rx_ant &amp;= mvm-&gt;nvm_data-&gt;valid_rx_ant;</div><div class='add'>+</div><div class='add'>+	if (mvm-&gt;set_rx_ant)</div><div class='add'>+		rx_ant &amp;= mvm-&gt;set_rx_ant;</div><div class='add'>+</div><div class='add'>+	return rx_ant;</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void iwl_mvm_toggle_tx_ant(struct iwl_mvm *mvm, u8 *ant)</div><div class='hunk'>@@ -1551,8 +1849,8 @@ int iwl_mvm_up(struct iwl_mvm *mvm);</div><div class='ctx'> int iwl_mvm_load_d3_fw(struct iwl_mvm *mvm);</div><div class='ctx'> </div><div class='ctx'> int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm);</div><div class='del'>-bool iwl_mvm_bcast_filter_build_cmd(struct iwl_mvm *mvm,</div><div class='del'>-				    struct iwl_bcast_filter_cmd *cmd);</div><div class='add'>+</div><div class='add'>+void iwl_mvm_mac_init_mvmvif(struct iwl_mvm *mvm, struct iwl_mvm_vif *mvmvif);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * FW notifications / CMD responses handlers</div><div class='hunk'>@@ -1582,44 +1880,88 @@ void iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb);</div><div class='ctx'> void iwl_mvm_rx_ant_coupling_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 				   struct iwl_rx_cmd_buffer *rxb);</div><div class='ctx'> void iwl_mvm_rx_fw_error(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb);</div><div class='del'>-void iwl_mvm_rx_card_state_notif(struct iwl_mvm *mvm,</div><div class='del'>-				 struct iwl_rx_cmd_buffer *rxb);</div><div class='ctx'> void iwl_mvm_rx_mfuart_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 			     struct iwl_rx_cmd_buffer *rxb);</div><div class='ctx'> void iwl_mvm_rx_shared_mem_cfg_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 				     struct iwl_rx_cmd_buffer *rxb);</div><div class='ctx'> </div><div class='ctx'> /* MVM PHY */</div><div class='add'>+struct iwl_mvm_phy_ctxt *iwl_mvm_get_free_phy_ctxt(struct iwl_mvm *mvm);</div><div class='ctx'> int iwl_mvm_phy_ctxt_add(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt,</div><div class='del'>-			 struct cfg80211_chan_def *chandef,</div><div class='add'>+			 const struct cfg80211_chan_def *chandef,</div><div class='add'>+			 const struct cfg80211_chan_def *ap,</div><div class='ctx'> 			 u8 chains_static, u8 chains_dynamic);</div><div class='ctx'> int iwl_mvm_phy_ctxt_changed(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt,</div><div class='del'>-			     struct cfg80211_chan_def *chandef,</div><div class='add'>+			     const struct cfg80211_chan_def *chandef,</div><div class='add'>+			     const struct cfg80211_chan_def *ap,</div><div class='ctx'> 			     u8 chains_static, u8 chains_dynamic);</div><div class='ctx'> void iwl_mvm_phy_ctxt_ref(struct iwl_mvm *mvm,</div><div class='ctx'> 			  struct iwl_mvm_phy_ctxt *ctxt);</div><div class='ctx'> void iwl_mvm_phy_ctxt_unref(struct iwl_mvm *mvm,</div><div class='ctx'> 			    struct iwl_mvm_phy_ctxt *ctxt);</div><div class='ctx'> int iwl_mvm_phy_ctx_count(struct iwl_mvm *mvm);</div><div class='del'>-u8 iwl_mvm_get_channel_width(struct cfg80211_chan_def *chandef);</div><div class='del'>-u8 iwl_mvm_get_ctrl_pos(struct cfg80211_chan_def *chandef);</div><div class='add'>+u8 iwl_mvm_get_channel_width(const struct cfg80211_chan_def *chandef);</div><div class='add'>+u8 iwl_mvm_get_ctrl_pos(const struct cfg80211_chan_def *chandef);</div><div class='add'>+int iwl_mvm_phy_send_rlc(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt,</div><div class='add'>+			 u8 chains_static, u8 chains_dynamic);</div><div class='ctx'> </div><div class='ctx'> /* MAC (virtual interface) programming */</div><div class='add'>+</div><div class='add'>+void iwl_mvm_prepare_mac_removal(struct iwl_mvm *mvm,</div><div class='add'>+				 struct ieee80211_vif *vif);</div><div class='add'>+void iwl_mvm_set_fw_basic_rates(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+				struct iwl_mvm_vif_link_info *link_info,</div><div class='add'>+				__le32 *cck_rates, __le32 *ofdm_rates);</div><div class='add'>+void iwl_mvm_set_fw_protection_flags(struct iwl_mvm *mvm,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				     __le32 *protection_flags, u32 ht_flag,</div><div class='add'>+				     u32 tgg_flag);</div><div class='add'>+void iwl_mvm_set_fw_qos_params(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			       struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			       struct iwl_ac_qos *ac, __le32 *qos_flags);</div><div class='add'>+bool iwl_mvm_set_fw_mu_edca_params(struct iwl_mvm *mvm,</div><div class='add'>+				   const struct iwl_mvm_vif_link_info *link_info,</div><div class='add'>+				   struct iwl_he_backoff_conf *trig_based_txf);</div><div class='add'>+void iwl_mvm_set_fw_dtim_tbtt(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			      struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			      __le64 *dtim_tsf, __le32 *dtim_time,</div><div class='add'>+			      __le32 *assoc_beacon_arrive_time);</div><div class='add'>+__le32 iwl_mac_ctxt_p2p_dev_has_extended_disc(struct iwl_mvm *mvm,</div><div class='add'>+					      struct ieee80211_vif *vif);</div><div class='add'>+void iwl_mvm_mac_ctxt_cmd_ap_set_filter_flags(struct iwl_mvm *mvm,</div><div class='add'>+					      struct iwl_mvm_vif *mvmvif,</div><div class='add'>+					      __le32 *filter_flags,</div><div class='add'>+					      int accept_probe_req_flag,</div><div class='add'>+					      int accept_beacon_flag);</div><div class='add'>+int iwl_mvm_get_mac_type(struct ieee80211_vif *vif);</div><div class='add'>+__le32 iwl_mvm_mac_ctxt_cmd_p2p_sta_get_oppps_ctwin(struct iwl_mvm *mvm,</div><div class='add'>+						    struct ieee80211_vif *vif);</div><div class='add'>+u32 iwl_mvm_mac_ctxt_cmd_sta_get_twt_policy(struct iwl_mvm *mvm,</div><div class='add'>+					    struct ieee80211_vif *vif);</div><div class='add'>+int iwl_mvm_mld_mac_ctxt_add(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='add'>+int iwl_mvm_mld_mac_ctxt_changed(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+				 bool force_assoc_off);</div><div class='add'>+int iwl_mvm_mld_mac_ctxt_remove(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='ctx'> int iwl_mvm_mac_ctxt_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='ctx'> int iwl_mvm_mac_ctxt_add(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='ctx'> int iwl_mvm_mac_ctxt_changed(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 			     bool force_assoc_off, const u8 *bssid_override);</div><div class='ctx'> int iwl_mvm_mac_ctxt_remove(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='ctx'> int iwl_mvm_mac_ctxt_beacon_changed(struct iwl_mvm *mvm,</div><div class='del'>-				    struct ieee80211_vif *vif);</div><div class='del'>-int iwl_mvm_mac_ctxt_send_beacon(struct iwl_mvm *mvm,</div><div class='del'>-				 struct ieee80211_vif *vif,</div><div class='del'>-				 struct sk_buff *beacon);</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct ieee80211_bss_conf *link_conf);</div><div class='ctx'> int iwl_mvm_mac_ctxt_send_beacon_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 				     struct sk_buff *beacon,</div><div class='ctx'> 				     void *data, int len);</div><div class='del'>-u8 iwl_mvm_mac_ctxt_get_lowest_rate(struct ieee80211_tx_info *info,</div><div class='add'>+u8 iwl_mvm_mac_ctxt_get_beacon_rate(struct iwl_mvm *mvm,</div><div class='add'>+				    struct ieee80211_tx_info *info,</div><div class='add'>+				    struct ieee80211_vif *vif);</div><div class='add'>+u8 iwl_mvm_mac_ctxt_get_lowest_rate(struct iwl_mvm *mvm,</div><div class='add'>+				    struct ieee80211_tx_info *info,</div><div class='ctx'> 				    struct ieee80211_vif *vif);</div><div class='add'>+u16 iwl_mvm_mac_ctxt_get_beacon_flags(const struct iwl_fw *fw,</div><div class='add'>+				      u8 rate_idx);</div><div class='ctx'> void iwl_mvm_mac_ctxt_set_tim(struct iwl_mvm *mvm,</div><div class='ctx'> 			      __le32 *tim_index, __le32 *tim_size,</div><div class='ctx'> 			      u8 *beacon, u32 frame_size);</div><div class='hunk'>@@ -1627,6 +1969,8 @@ void iwl_mvm_rx_beacon_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 			     struct iwl_rx_cmd_buffer *rxb);</div><div class='ctx'> void iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 				     struct iwl_rx_cmd_buffer *rxb);</div><div class='add'>+void iwl_mvm_rx_missed_beacons_notif_legacy(struct iwl_mvm *mvm,</div><div class='add'>+					    struct iwl_rx_cmd_buffer *rxb);</div><div class='ctx'> void iwl_mvm_rx_stored_beacon_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 				    struct iwl_rx_cmd_buffer *rxb);</div><div class='ctx'> void iwl_mvm_mu_mimo_grp_notif(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -1638,13 +1982,89 @@ void iwl_mvm_mac_ctxt_recalc_tsf_id(struct iwl_mvm *mvm,</div><div class='ctx'> 				    struct ieee80211_vif *vif);</div><div class='ctx'> void iwl_mvm_probe_resp_data_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 				   struct iwl_rx_cmd_buffer *rxb);</div><div class='del'>-void iwl_mvm_rx_missed_vap_notif(struct iwl_mvm *mvm,</div><div class='del'>-				 struct iwl_rx_cmd_buffer *rxb);</div><div class='del'>-void iwl_mvm_channel_switch_noa_notif(struct iwl_mvm *mvm,</div><div class='del'>-				      struct iwl_rx_cmd_buffer *rxb);</div><div class='add'>+void iwl_mvm_channel_switch_start_notif(struct iwl_mvm *mvm,</div><div class='add'>+					struct iwl_rx_cmd_buffer *rxb);</div><div class='add'>+void iwl_mvm_channel_switch_error_notif(struct iwl_mvm *mvm,</div><div class='add'>+					struct iwl_rx_cmd_buffer *rxb);</div><div class='add'>+void iwl_mvm_rx_beacon_filter_notif(struct iwl_mvm *mvm,</div><div class='add'>+				    struct iwl_rx_cmd_buffer *rxb);</div><div class='add'>+</div><div class='ctx'> /* Bindings */</div><div class='ctx'> int iwl_mvm_binding_add_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='ctx'> int iwl_mvm_binding_remove_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='add'>+u32 iwl_mvm_get_lmac_id(struct iwl_mvm *mvm, enum nl80211_band band);</div><div class='add'>+</div><div class='add'>+/* Links */</div><div class='add'>+void iwl_mvm_init_link(struct iwl_mvm_vif_link_info *link);</div><div class='add'>+void iwl_mvm_set_link_fw_id(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			    struct ieee80211_bss_conf *link_conf);</div><div class='add'>+int iwl_mvm_add_link(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+		     struct ieee80211_bss_conf *link_conf);</div><div class='add'>+int iwl_mvm_link_changed(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			 struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			 u32 changes, bool active);</div><div class='add'>+int iwl_mvm_remove_link(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_bss_conf *link_conf);</div><div class='add'>+int iwl_mvm_disable_link(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			 struct ieee80211_bss_conf *link_conf);</div><div class='add'>+</div><div class='add'>+u8 iwl_mvm_get_primary_link(struct ieee80211_vif *vif);</div><div class='add'>+</div><div class='add'>+struct iwl_mvm_link_sel_data {</div><div class='add'>+	u8 link_id;</div><div class='add'>+	const struct cfg80211_chan_def *chandef;</div><div class='add'>+	s32 signal;</div><div class='add'>+	u16 grade;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IWLWIFI_KUNIT_TESTS)</div><div class='add'>+extern const struct iwl_hcmd_arr iwl_mvm_groups[];</div><div class='add'>+extern const unsigned int iwl_mvm_groups_size;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* AP and IBSS */</div><div class='add'>+bool iwl_mvm_start_ap_ibss_common(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif, int *ret);</div><div class='add'>+void iwl_mvm_stop_ap_ibss_common(struct iwl_mvm *mvm,</div><div class='add'>+				 struct ieee80211_vif *vif);</div><div class='add'>+</div><div class='add'>+/* BSS Info */</div><div class='add'>+void iwl_mvm_bss_info_changed_station_common(struct iwl_mvm *mvm,</div><div class='add'>+					     struct ieee80211_vif *vif,</div><div class='add'>+					     struct ieee80211_bss_conf *link_conf,</div><div class='add'>+					     u64 changes);</div><div class='add'>+void iwl_mvm_bss_info_changed_station_assoc(struct iwl_mvm *mvm,</div><div class='add'>+					    struct ieee80211_vif *vif,</div><div class='add'>+					    u64 changes);</div><div class='add'>+</div><div class='add'>+/* ROC */</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mvm_roc_ops - callbacks for the remain_on_channel()</div><div class='add'>+ *</div><div class='add'>+ * Since the only difference between both MLD and</div><div class='add'>+ * non-MLD versions of remain_on_channel() is these function calls,</div><div class='add'>+ * each version will send its specific function calls to</div><div class='add'>+ * %iwl_mvm_roc_common().</div><div class='add'>+ *</div><div class='add'>+ * @add_aux_sta_for_hs20: pointer to the function that adds an aux sta</div><div class='add'>+ *	for Hot Spot 2.0</div><div class='add'>+ * @link: For a P2P Device interface, pointer to a function that links the</div><div class='add'>+ *      MAC/Link to the PHY context</div><div class='add'>+ */</div><div class='add'>+struct iwl_mvm_roc_ops {</div><div class='add'>+	int (*add_aux_sta_for_hs20)(struct iwl_mvm *mvm, u32 lmac_id);</div><div class='add'>+	int (*link)(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int iwl_mvm_roc_common(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		       struct ieee80211_channel *channel, int duration,</div><div class='add'>+		       enum ieee80211_roc_type type,</div><div class='add'>+		       const struct iwl_mvm_roc_ops *ops);</div><div class='add'>+int iwl_mvm_cancel_roc(struct ieee80211_hw *hw,</div><div class='add'>+		       struct ieee80211_vif *vif);</div><div class='add'>+/*Session Protection */</div><div class='add'>+void iwl_mvm_protect_assoc(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			   u32 duration_override, unsigned int link_id);</div><div class='ctx'> </div><div class='ctx'> /* Quota management */</div><div class='ctx'> static inline size_t iwl_mvm_quota_cmd_size(struct iwl_mvm *mvm)</div><div class='hunk'>@@ -1675,11 +2095,14 @@ int iwl_mvm_update_quotas(struct iwl_mvm *mvm, bool force_upload,</div><div class='ctx'> int iwl_mvm_reg_scan_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 			   struct cfg80211_scan_request *req,</div><div class='ctx'> 			   struct ieee80211_scan_ies *ies);</div><div class='del'>-int iwl_mvm_scan_size(struct iwl_mvm *mvm);</div><div class='add'>+size_t iwl_mvm_scan_size(struct iwl_mvm *mvm);</div><div class='ctx'> int iwl_mvm_scan_stop(struct iwl_mvm *mvm, int type, bool notify);</div><div class='add'>+</div><div class='ctx'> int iwl_mvm_max_scan_ie_len(struct iwl_mvm *mvm);</div><div class='ctx'> void iwl_mvm_report_scan_aborted(struct iwl_mvm *mvm);</div><div class='ctx'> void iwl_mvm_scan_timeout_wk(struct work_struct *work);</div><div class='add'>+void iwl_mvm_rx_channel_survey_notif(struct iwl_mvm *mvm,</div><div class='add'>+				     struct iwl_rx_cmd_buffer *rxb);</div><div class='ctx'> </div><div class='ctx'> /* Scheduled scan */</div><div class='ctx'> void iwl_mvm_rx_lmac_scan_complete_notif(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -1704,18 +2127,19 @@ void iwl_mvm_rx_umac_scan_iter_complete_notif(struct iwl_mvm *mvm,</div><div class='ctx'> /* MVM debugfs */</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> void iwl_mvm_dbgfs_register(struct iwl_mvm *mvm);</div><div class='del'>-void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='del'>-void iwl_mvm_vif_dbgfs_clean(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='add'>+void iwl_mvm_vif_add_debugfs(struct ieee80211_hw *hw, struct ieee80211_vif *vif);</div><div class='add'>+void iwl_mvm_vif_dbgfs_add_link(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='add'>+void iwl_mvm_vif_dbgfs_rm_link(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='ctx'> #else</div><div class='ctx'> static inline void iwl_mvm_dbgfs_register(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> static inline void</div><div class='del'>-iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='add'>+iwl_mvm_vif_dbgfs_add_link(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> static inline void</div><div class='del'>-iwl_mvm_vif_dbgfs_clean(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='add'>+iwl_mvm_vif_dbgfs_rm_link(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_IWLWIFI_DEBUGFS */</div><div class='hunk'>@@ -1723,7 +2147,7 @@ iwl_mvm_vif_dbgfs_clean(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> /* rate scaling */</div><div class='ctx'> int iwl_mvm_send_lq_cmd(struct iwl_mvm *mvm, struct iwl_lq_cmd *lq);</div><div class='ctx'> void iwl_mvm_update_frame_stats(struct iwl_mvm *mvm, u32 rate, bool agg);</div><div class='del'>-int rs_pretty_print_rate(char *buf, int bufsz, const u32 rate);</div><div class='add'>+int rs_pretty_print_rate_v1(char *buf, int bufsz, const u32 rate);</div><div class='ctx'> void rs_update_last_rssi(struct iwl_mvm *mvm,</div><div class='ctx'> 			 struct iwl_mvm_sta *mvmsta,</div><div class='ctx'> 			 struct ieee80211_rx_status *rx_status);</div><div class='hunk'>@@ -1769,28 +2193,39 @@ void iwl_mvm_ipv6_addr_change(struct ieee80211_hw *hw,</div><div class='ctx'> void iwl_mvm_set_default_unicast_key(struct ieee80211_hw *hw,</div><div class='ctx'> 				     struct ieee80211_vif *vif, int idx);</div><div class='ctx'> extern const struct file_operations iwl_dbgfs_d3_test_ops;</div><div class='del'>-struct iwl_wowlan_status *iwl_mvm_send_wowlan_get_status(struct iwl_mvm *mvm);</div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> void iwl_mvm_set_last_nonqos_seq(struct iwl_mvm *mvm,</div><div class='ctx'> 				 struct ieee80211_vif *vif);</div><div class='add'>+void iwl_mvm_fast_suspend(struct iwl_mvm *mvm);</div><div class='add'>+int iwl_mvm_fast_resume(struct iwl_mvm *mvm);</div><div class='ctx'> #else</div><div class='ctx'> static inline void</div><div class='ctx'> iwl_mvm_set_last_nonqos_seq(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline void iwl_mvm_fast_suspend(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int iwl_mvm_fast_resume(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> void iwl_mvm_set_wowlan_qos_seq(struct iwl_mvm_sta *mvm_ap_sta,</div><div class='del'>-				struct iwl_wowlan_config_cmd *cmd);</div><div class='add'>+				struct iwl_wowlan_config_cmd_v6 *cmd);</div><div class='ctx'> int iwl_mvm_send_proto_offload(struct iwl_mvm *mvm,</div><div class='ctx'> 			       struct ieee80211_vif *vif,</div><div class='ctx'> 			       bool disable_offloading,</div><div class='ctx'> 			       bool offload_ns,</div><div class='del'>-			       u32 cmd_flags);</div><div class='add'>+			       u32 cmd_flags,</div><div class='add'>+			       u8 sta_id);</div><div class='ctx'> </div><div class='ctx'> /* BT Coex */</div><div class='ctx'> int iwl_mvm_send_bt_init_conf(struct iwl_mvm *mvm);</div><div class='del'>-void iwl_mvm_rx_bt_coex_notif(struct iwl_mvm *mvm,</div><div class='del'>-			      struct iwl_rx_cmd_buffer *rxb);</div><div class='add'>+void iwl_mvm_rx_bt_coex_old_notif(struct iwl_mvm *mvm,</div><div class='add'>+				  struct iwl_rx_cmd_buffer *rxb);</div><div class='ctx'> void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 			   enum ieee80211_rssi_event_data);</div><div class='ctx'> void iwl_mvm_bt_coex_vif_change(struct iwl_mvm *mvm);</div><div class='hunk'>@@ -1818,16 +2253,23 @@ iwl_mvm_beacon_filter_debugfs_parameters(struct ieee80211_vif *vif,</div><div class='ctx'> {}</div><div class='ctx'> #endif</div><div class='ctx'> int iwl_mvm_enable_beacon_filter(struct iwl_mvm *mvm,</div><div class='del'>-				 struct ieee80211_vif *vif,</div><div class='del'>-				 u32 flags);</div><div class='add'>+				 struct ieee80211_vif *vif);</div><div class='ctx'> int iwl_mvm_disable_beacon_filter(struct iwl_mvm *mvm,</div><div class='del'>-				  struct ieee80211_vif *vif,</div><div class='del'>-				  u32 flags);</div><div class='add'>+				  struct ieee80211_vif *vif);</div><div class='ctx'> /* SMPS */</div><div class='ctx'> void iwl_mvm_update_smps(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 				enum iwl_mvm_smps_type_request req_type,</div><div class='del'>-				enum ieee80211_smps_mode smps_request);</div><div class='del'>-bool iwl_mvm_rx_diversity_allowed(struct iwl_mvm *mvm);</div><div class='add'>+				enum ieee80211_smps_mode smps_request,</div><div class='add'>+				unsigned int link_id);</div><div class='add'>+void</div><div class='add'>+iwl_mvm_update_smps_on_active_links(struct iwl_mvm *mvm,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    enum iwl_mvm_smps_type_request req_type,</div><div class='add'>+				    enum ieee80211_smps_mode smps_request);</div><div class='add'>+bool iwl_mvm_rx_diversity_allowed(struct iwl_mvm *mvm,</div><div class='add'>+				  struct iwl_mvm_phy_ctxt *ctxt);</div><div class='add'>+void iwl_mvm_update_link_smps(struct ieee80211_vif *vif,</div><div class='add'>+			      struct ieee80211_bss_conf *link_conf);</div><div class='ctx'> </div><div class='ctx'> /* Low latency */</div><div class='ctx'> int iwl_mvm_update_low_latency(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='hunk'>@@ -1896,16 +2338,12 @@ void iwl_mvm_vif_set_low_latency(struct iwl_mvm_vif *mvmvif, bool set,</div><div class='ctx'>  */</div><div class='ctx'> static inline u32 iwl_mvm_flushable_queues(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='del'>-	return ((BIT(mvm-&gt;trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues) - 1) &amp;</div><div class='add'>+	return ((BIT(mvm-&gt;trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues) - 1) &amp;</div><div class='ctx'> 		~BIT(IWL_MVM_DQA_CMD_QUEUE));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_stop_device(struct iwl_mvm *mvm);</div><div class='ctx'> </div><div class='del'>-/* Re-configure the SCD for a queue that has already been configured */</div><div class='del'>-int iwl_mvm_reconfig_scd(struct iwl_mvm *mvm, int queue, int fifo, int sta_id,</div><div class='del'>-			 int tid, int frame_limit, u16 ssn);</div><div class='del'>-</div><div class='ctx'> /* Thermal management and CT-kill */</div><div class='ctx'> void iwl_mvm_tt_tx_backoff(struct iwl_mvm *mvm, u32 backoff);</div><div class='ctx'> void iwl_mvm_temp_notif(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -1920,8 +2358,19 @@ void iwl_mvm_enter_ctkill(struct iwl_mvm *mvm);</div><div class='ctx'> int iwl_mvm_send_temp_report_ths_cmd(struct iwl_mvm *mvm);</div><div class='ctx'> int iwl_mvm_ctdp_command(struct iwl_mvm *mvm, u32 op, u32 budget);</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_IWLMEI)</div><div class='add'>+</div><div class='add'>+/* vendor commands */</div><div class='add'>+void iwl_mvm_vendor_cmds_register(struct iwl_mvm *mvm);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline void iwl_mvm_vendor_cmds_register(struct iwl_mvm *mvm) {}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Location Aware Regulatory */</div><div class='del'>-struct iwl_mcc_update_resp *</div><div class='add'>+struct iwl_mcc_update_resp_v8 *</div><div class='ctx'> iwl_mvm_update_mcc(struct iwl_mvm *mvm, const char *alpha2,</div><div class='ctx'> 		   enum iwl_mcc_source src_id);</div><div class='ctx'> int iwl_mvm_init_mcc(struct iwl_mvm *mvm);</div><div class='hunk'>@@ -1933,7 +2382,7 @@ struct ieee80211_regdomain *iwl_mvm_get_regdomain(struct wiphy *wiphy,</div><div class='ctx'> 						  bool *changed);</div><div class='ctx'> struct ieee80211_regdomain *iwl_mvm_get_current_regdomain(struct iwl_mvm *mvm,</div><div class='ctx'> 							  bool *changed);</div><div class='del'>-int iwl_mvm_init_fw_regd(struct iwl_mvm *mvm);</div><div class='add'>+int iwl_mvm_init_fw_regd(struct iwl_mvm *mvm, bool force_regd_sync);</div><div class='ctx'> void iwl_mvm_update_changed_regdom(struct iwl_mvm *mvm);</div><div class='ctx'> </div><div class='ctx'> /* smart fifo */</div><div class='hunk'>@@ -1941,17 +2390,13 @@ int iwl_mvm_sf_update(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 		      bool added_vif);</div><div class='ctx'> </div><div class='ctx'> /* FTM responder */</div><div class='del'>-int iwl_mvm_ftm_start_responder(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='add'>+int iwl_mvm_ftm_start_responder(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_bss_conf *bss_conf);</div><div class='ctx'> void iwl_mvm_ftm_restart_responder(struct iwl_mvm *mvm,</div><div class='del'>-				   struct ieee80211_vif *vif);</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_bss_conf *bss_conf);</div><div class='ctx'> void iwl_mvm_ftm_responder_stats(struct iwl_mvm *mvm,</div><div class='ctx'> 				 struct iwl_rx_cmd_buffer *rxb);</div><div class='del'>-int iwl_mvm_ftm_resp_remove_pasn_sta(struct iwl_mvm *mvm,</div><div class='del'>-				     struct ieee80211_vif *vif, u8 *addr);</div><div class='del'>-int iwl_mvm_ftm_respoder_add_pasn_sta(struct iwl_mvm *mvm,</div><div class='del'>-				      struct ieee80211_vif *vif,</div><div class='del'>-				      u8 *addr, u32 cipher, u8 *tk, u32 tk_len,</div><div class='del'>-				      u8 *hltk, u32 hltk_len);</div><div class='ctx'> void iwl_mvm_ftm_responder_clear(struct iwl_mvm *mvm,</div><div class='ctx'> 				 struct ieee80211_vif *vif);</div><div class='ctx'> </div><div class='hunk'>@@ -1966,10 +2411,6 @@ int iwl_mvm_ftm_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> void iwl_mvm_ftm_abort(struct iwl_mvm *mvm, struct cfg80211_pmsr_request *req);</div><div class='ctx'> void iwl_mvm_ftm_initiator_smooth_config(struct iwl_mvm *mvm);</div><div class='ctx'> void iwl_mvm_ftm_initiator_smooth_stop(struct iwl_mvm *mvm);</div><div class='del'>-int iwl_mvm_ftm_add_pasn_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='del'>-			     u8 *addr, u32 cipher, u8 *tk, u32 tk_len,</div><div class='del'>-			     u8 *hltk, u32 hltk_len);</div><div class='del'>-void iwl_mvm_ftm_remove_pasn_sta(struct iwl_mvm *mvm, u8 *addr);</div><div class='ctx'> </div><div class='ctx'> /* TDLS */</div><div class='ctx'> </div><div class='hunk'>@@ -1984,7 +2425,8 @@ void iwl_mvm_teardown_tdls_peers(struct iwl_mvm *mvm);</div><div class='ctx'> void iwl_mvm_recalc_tdls_state(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 			       bool sta_added);</div><div class='ctx'> void iwl_mvm_mac_mgd_protect_tdls_discover(struct ieee80211_hw *hw,</div><div class='del'>-					   struct ieee80211_vif *vif);</div><div class='add'>+					   struct ieee80211_vif *vif,</div><div class='add'>+					   unsigned int link_id);</div><div class='ctx'> int iwl_mvm_tdls_channel_switch(struct ieee80211_hw *hw,</div><div class='ctx'> 				struct ieee80211_vif *vif,</div><div class='ctx'> 				struct ieee80211_sta *sta, u8 oper_class,</div><div class='hunk'>@@ -2003,7 +2445,6 @@ void iwl_mvm_sync_rx_queues_internal(struct iwl_mvm *mvm,</div><div class='ctx'> 				     enum iwl_mvm_rxq_notif_type type,</div><div class='ctx'> 				     bool sync,</div><div class='ctx'> 				     const void *data, u32 size);</div><div class='del'>-void iwl_mvm_reorder_timer_expired(struct timer_list *t);</div><div class='ctx'> struct ieee80211_vif *iwl_mvm_get_bss_vif(struct iwl_mvm *mvm);</div><div class='ctx'> struct ieee80211_vif *iwl_mvm_get_vif_by_macid(struct iwl_mvm *mvm, u32 macid);</div><div class='ctx'> bool iwl_mvm_is_vif_assoc(struct iwl_mvm *mvm);</div><div class='hunk'>@@ -2019,30 +2460,69 @@ void iwl_mvm_tcm_add_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='ctx'> void iwl_mvm_tcm_rm_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='ctx'> u8 iwl_mvm_tcm_load_percentage(u32 airtime, u32 elapsed);</div><div class='ctx'> </div><div class='del'>-void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error);</div><div class='ctx'> unsigned int iwl_mvm_get_wd_timeout(struct iwl_mvm *mvm,</div><div class='del'>-				    struct ieee80211_vif *vif,</div><div class='del'>-				    bool tdls, bool cmd_q);</div><div class='add'>+				    struct ieee80211_vif *vif);</div><div class='ctx'> void iwl_mvm_connection_loss(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 			     const char *errmsg);</div><div class='ctx'> void iwl_mvm_event_frame_timeout_callback(struct iwl_mvm *mvm,</div><div class='ctx'> 					  struct ieee80211_vif *vif,</div><div class='ctx'> 					  const struct ieee80211_sta *sta,</div><div class='ctx'> 					  u16 tid);</div><div class='add'>+void iwl_mvm_mei_scan_filter_init(struct iwl_mei_scan_filter *mei_scan_filter);</div><div class='ctx'> </div><div class='add'>+void iwl_mvm_ptp_init(struct iwl_mvm *mvm);</div><div class='add'>+void iwl_mvm_ptp_remove(struct iwl_mvm *mvm);</div><div class='add'>+u64 iwl_mvm_ptp_get_adj_time(struct iwl_mvm *mvm, u64 base_time);</div><div class='ctx'> int iwl_mvm_sar_select_profile(struct iwl_mvm *mvm, int prof_a, int prof_b);</div><div class='ctx'> int iwl_mvm_get_sar_geo_profile(struct iwl_mvm *mvm);</div><div class='ctx'> int iwl_mvm_ppag_send_cmd(struct iwl_mvm *mvm);</div><div class='add'>+void iwl_mvm_get_bios_tables(struct iwl_mvm *mvm);</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='del'>-void iwl_mvm_sta_add_debugfs(struct ieee80211_hw *hw,</div><div class='del'>-			     struct ieee80211_vif *vif,</div><div class='del'>-			     struct ieee80211_sta *sta,</div><div class='del'>-			     struct dentry *dir);</div><div class='add'>+void iwl_mvm_link_sta_add_debugfs(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  struct ieee80211_link_sta *link_sta,</div><div class='add'>+				  struct dentry *dir);</div><div class='add'>+void iwl_mvm_link_add_debugfs(struct ieee80211_hw *hw,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			      struct dentry *dir);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* new MLD related APIs */</div><div class='add'>+int iwl_mvm_sec_key_add(struct iwl_mvm *mvm,</div><div class='add'>+			struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_sta *sta,</div><div class='add'>+			struct ieee80211_key_conf *keyconf);</div><div class='add'>+int iwl_mvm_sec_key_del(struct iwl_mvm *mvm,</div><div class='add'>+			struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_sta *sta,</div><div class='add'>+			struct ieee80211_key_conf *keyconf);</div><div class='add'>+int iwl_mvm_sec_key_del_pasn(struct iwl_mvm *mvm,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     u32 sta_mask,</div><div class='add'>+			     struct ieee80211_key_conf *keyconf);</div><div class='add'>+void iwl_mvm_sec_key_remove_ap(struct iwl_mvm *mvm,</div><div class='add'>+			       struct ieee80211_vif *vif,</div><div class='add'>+			       struct iwl_mvm_vif_link_info *link,</div><div class='add'>+			       unsigned int link_id);</div><div class='add'>+int iwl_mvm_mld_update_sta_keys(struct iwl_mvm *mvm,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_sta *sta,</div><div class='add'>+				u32 old_sta_mask,</div><div class='add'>+				u32 new_sta_mask);</div><div class='add'>+int iwl_mvm_mld_send_key(struct iwl_mvm *mvm, u32 sta_mask, u32 key_flags,</div><div class='add'>+			 struct ieee80211_key_conf *keyconf);</div><div class='add'>+u32 iwl_mvm_get_sec_flags(struct iwl_mvm *mvm,</div><div class='add'>+			  struct ieee80211_vif *vif,</div><div class='add'>+			  struct ieee80211_sta *sta,</div><div class='add'>+			  struct ieee80211_key_conf *keyconf);</div><div class='add'>+</div><div class='add'>+bool iwl_rfi_supported(struct iwl_mvm *mvm);</div><div class='ctx'> int iwl_rfi_send_config_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 			    struct iwl_rfi_lut_entry *rfi_table);</div><div class='ctx'> struct iwl_rfi_freq_table_resp_cmd *iwl_rfi_get_freq_table(struct iwl_mvm *mvm);</div><div class='add'>+void iwl_rfi_deactivate_notif_handler(struct iwl_mvm *mvm,</div><div class='add'>+				      struct iwl_rx_cmd_buffer *rxb);</div><div class='ctx'> </div><div class='ctx'> static inline u8 iwl_mvm_phy_band_from_nl80211(enum nl80211_band band)</div><div class='ctx'> {</div><div class='hunk'>@@ -2059,6 +2539,61 @@ static inline u8 iwl_mvm_phy_band_from_nl80211(enum nl80211_band band)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u8 iwl_mvm_nl80211_band_from_phy(u8 phy_band)</div><div class='add'>+{</div><div class='add'>+	switch (phy_band) {</div><div class='add'>+	case PHY_BAND_24:</div><div class='add'>+		return NL80211_BAND_2GHZ;</div><div class='add'>+	case PHY_BAND_5:</div><div class='add'>+		return NL80211_BAND_5GHZ;</div><div class='add'>+	case PHY_BAND_6:</div><div class='add'>+		return NL80211_BAND_6GHZ;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ONCE(1, "Unsupported phy band (%u)\n", phy_band);</div><div class='add'>+		return NL80211_BAND_5GHZ;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Channel Switch */</div><div class='add'>+void iwl_mvm_channel_switch_disconnect_wk(struct work_struct *wk);</div><div class='add'>+int iwl_mvm_post_channel_switch(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_bss_conf *link);</div><div class='add'>+</div><div class='add'>+/* Channel Context */</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mvm_switch_vif_chanctx_ops - callbacks for switch_vif_chanctx()</div><div class='add'>+ *</div><div class='add'>+ * Since the only difference between both MLD and</div><div class='add'>+ * non-MLD versions of switch_vif_chanctx() is these function calls,</div><div class='add'>+ * each version will send its specific function calls to</div><div class='add'>+ * %iwl_mvm_switch_vif_chanctx_common().</div><div class='add'>+ *</div><div class='add'>+ * @__assign_vif_chanctx: pointer to the function that assigns a chanctx to</div><div class='add'>+ *	a given vif</div><div class='add'>+ * @__unassign_vif_chanctx: pointer to the function that unassigns a chanctx to</div><div class='add'>+ *	a given vif</div><div class='add'>+ */</div><div class='add'>+struct iwl_mvm_switch_vif_chanctx_ops {</div><div class='add'>+	int (*__assign_vif_chanctx)(struct iwl_mvm *mvm,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				    struct ieee80211_chanctx_conf *ctx,</div><div class='add'>+				    bool switching_chanctx);</div><div class='add'>+	void (*__unassign_vif_chanctx)(struct iwl_mvm *mvm,</div><div class='add'>+				       struct ieee80211_vif *vif,</div><div class='add'>+				       struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				       struct ieee80211_chanctx_conf *ctx,</div><div class='add'>+				       bool switching_chanctx);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+iwl_mvm_switch_vif_chanctx_common(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif_chanctx_switch *vifs,</div><div class='add'>+				  int n_vifs,</div><div class='add'>+				  enum ieee80211_chanctx_switch_mode mode,</div><div class='add'>+				  const struct iwl_mvm_switch_vif_chanctx_ops *ops);</div><div class='add'>+</div><div class='ctx'> /* Channel info utils */</div><div class='ctx'> static inline bool iwl_mvm_has_ultra_hb_channel(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='hunk'>@@ -2105,7 +2640,7 @@ static inline void iwl_mvm_set_chan_info(struct iwl_mvm *mvm,</div><div class='ctx'> static inline void</div><div class='ctx'> iwl_mvm_set_chan_info_chandef(struct iwl_mvm *mvm,</div><div class='ctx'> 			      struct iwl_fw_channel_info *ci,</div><div class='del'>-			      struct cfg80211_chan_def *chandef)</div><div class='add'>+			      const struct cfg80211_chan_def *chandef)</div><div class='ctx'> {</div><div class='ctx'> 	enum nl80211_band band = chandef-&gt;chan-&gt;band;</div><div class='ctx'> </div><div class='hunk'>@@ -2117,8 +2652,7 @@ iwl_mvm_set_chan_info_chandef(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> static inline int iwl_umac_scan_get_max_profiles(const struct iwl_fw *fw)</div><div class='ctx'> {</div><div class='del'>-	u8 ver = iwl_fw_lookup_cmd_ver(fw, IWL_ALWAYS_LONG_GROUP,</div><div class='del'>-				       SCAN_OFFLOAD_UPDATE_PROFILES_CMD,</div><div class='add'>+	u8 ver = iwl_fw_lookup_cmd_ver(fw, SCAN_OFFLOAD_UPDATE_PROFILES_CMD,</div><div class='ctx'> 				       IWL_FW_CMD_VER_UNKNOWN);</div><div class='ctx'> 	return (ver == IWL_FW_CMD_VER_UNKNOWN || ver &lt; 3) ?</div><div class='ctx'> 		IWL_SCAN_MAX_PROFILES : IWL_SCAN_MAX_PROFILES_V2;</div><div class='hunk'>@@ -2138,4 +2672,231 @@ enum iwl_location_cipher iwl_mvm_cipher_to_location_cipher(u32 cipher)</div><div class='ctx'> 		return IWL_LOCATION_CIPHER_INVALID;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+struct iwl_mvm_csme_conn_info *iwl_mvm_get_csme_conn_info(struct iwl_mvm *mvm);</div><div class='add'>+static inline int iwl_mvm_mei_get_ownership(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	if (mvm-&gt;mei_registered)</div><div class='add'>+		return iwl_mei_get_ownership();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void iwl_mvm_mei_tx_copy_to_csme(struct iwl_mvm *mvm,</div><div class='add'>+					       struct sk_buff *skb,</div><div class='add'>+					       unsigned int ivlen)</div><div class='add'>+{</div><div class='add'>+	if (mvm-&gt;mei_registered)</div><div class='add'>+		iwl_mei_tx_copy_to_csme(skb, ivlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void iwl_mvm_mei_host_disassociated(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	if (mvm-&gt;mei_registered)</div><div class='add'>+		iwl_mei_host_disassociated();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void iwl_mvm_mei_device_state(struct iwl_mvm *mvm, bool up)</div><div class='add'>+{</div><div class='add'>+	if (mvm-&gt;mei_registered)</div><div class='add'>+		iwl_mei_device_state(up);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void iwl_mvm_mei_set_sw_rfkill_state(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	bool sw_rfkill =</div><div class='add'>+		mvm-&gt;hw_registered ? rfkill_soft_blocked(mvm-&gt;hw-&gt;wiphy-&gt;rfkill) : false;</div><div class='add'>+</div><div class='add'>+	if (mvm-&gt;mei_registered)</div><div class='add'>+		iwl_mei_set_rfkill_state(iwl_mvm_is_radio_killed(mvm),</div><div class='add'>+					 sw_rfkill);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool iwl_mvm_has_p2p_over_aux(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	u32 cmd_id = WIDE_ID(MAC_CONF_GROUP, ROC_CMD);</div><div class='add'>+</div><div class='add'>+	return iwl_fw_lookup_cmd_ver(mvm-&gt;fw, cmd_id, 0) &gt;= 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool iwl_mvm_mei_filter_scan(struct iwl_mvm *mvm,</div><div class='add'>+					   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_mgmt *mgmt = (void *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (mvm-&gt;mei_scan_filter.is_mei_limited_scan &amp;&amp;</div><div class='add'>+	    (ieee80211_is_probe_resp(mgmt-&gt;frame_control) ||</div><div class='add'>+	     ieee80211_is_beacon(mgmt-&gt;frame_control))) {</div><div class='add'>+		skb_queue_tail(&amp;mvm-&gt;mei_scan_filter.scan_res, skb);</div><div class='add'>+		schedule_work(&amp;mvm-&gt;mei_scan_filter.scan_work);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_send_roaming_forbidden_event(struct iwl_mvm *mvm,</div><div class='add'>+					  struct ieee80211_vif *vif,</div><div class='add'>+					  bool forbidden);</div><div class='add'>+</div><div class='add'>+/* Callbacks for ieee80211_ops */</div><div class='add'>+void iwl_mvm_mac_tx(struct ieee80211_hw *hw,</div><div class='add'>+		    struct ieee80211_tx_control *control, struct sk_buff *skb);</div><div class='add'>+void iwl_mvm_mac_wake_tx_queue(struct ieee80211_hw *hw,</div><div class='add'>+			       struct ieee80211_txq *txq);</div><div class='add'>+</div><div class='add'>+int iwl_mvm_mac_ampdu_action(struct ieee80211_hw *hw,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_ampdu_params *params);</div><div class='add'>+int iwl_mvm_op_get_antenna(struct ieee80211_hw *hw, int radio_idx, u32 *tx_ant,</div><div class='add'>+			   u32 *rx_ant);</div><div class='add'>+int iwl_mvm_op_set_antenna(struct ieee80211_hw *hw, int radio_idx, u32 tx_ant,</div><div class='add'>+			   u32 rx_ant);</div><div class='add'>+int iwl_mvm_mac_start(struct ieee80211_hw *hw);</div><div class='add'>+void iwl_mvm_mac_reconfig_complete(struct ieee80211_hw *hw,</div><div class='add'>+				   enum ieee80211_reconfig_type reconfig_type);</div><div class='add'>+void iwl_mvm_mac_stop(struct ieee80211_hw *hw, bool suspend);</div><div class='add'>+static inline int iwl_mvm_mac_config(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+				     u32 changed)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u64 iwl_mvm_prepare_multicast(struct ieee80211_hw *hw,</div><div class='add'>+			      struct netdev_hw_addr_list *mc_list);</div><div class='add'>+</div><div class='add'>+void iwl_mvm_configure_filter(struct ieee80211_hw *hw,</div><div class='add'>+			      unsigned int changed_flags,</div><div class='add'>+			      unsigned int *total_flags, u64 multicast);</div><div class='add'>+int iwl_mvm_mac_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_scan_request *hw_req);</div><div class='add'>+void iwl_mvm_mac_cancel_hw_scan(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif);</div><div class='add'>+void iwl_mvm_sta_pre_rcu_remove(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_sta *sta);</div><div class='add'>+void iwl_mvm_mac_sta_notify(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			    enum sta_notify_cmd cmd,</div><div class='add'>+			    struct ieee80211_sta *sta);</div><div class='add'>+void</div><div class='add'>+iwl_mvm_mac_allow_buffered_frames(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_sta *sta, u16 tids,</div><div class='add'>+				  int num_frames,</div><div class='add'>+				  enum ieee80211_frame_release_type reason,</div><div class='add'>+				  bool more_data);</div><div class='add'>+void</div><div class='add'>+iwl_mvm_mac_release_buffered_frames(struct ieee80211_hw *hw,</div><div class='add'>+				    struct ieee80211_sta *sta, u16 tids,</div><div class='add'>+				    int num_frames,</div><div class='add'>+				    enum ieee80211_frame_release_type reason,</div><div class='add'>+				    bool more_data);</div><div class='add'>+int iwl_mvm_mac_set_rts_threshold(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+				  u32 value);</div><div class='add'>+void iwl_mvm_sta_rc_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			   struct ieee80211_link_sta *link_sta, u32 changed);</div><div class='add'>+void iwl_mvm_mac_mgd_prepare_tx(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_prep_tx_info *info);</div><div class='add'>+void iwl_mvm_mac_mgd_complete_tx(struct ieee80211_hw *hw,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_prep_tx_info *info);</div><div class='add'>+void iwl_mvm_mac_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		       u32 queues, bool drop);</div><div class='add'>+void iwl_mvm_mac_flush_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			   struct ieee80211_sta *sta);</div><div class='add'>+int iwl_mvm_mac_sched_scan_start(struct ieee80211_hw *hw,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct cfg80211_sched_scan_request *req,</div><div class='add'>+				 struct ieee80211_scan_ies *ies);</div><div class='add'>+int iwl_mvm_mac_sched_scan_stop(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif);</div><div class='add'>+int iwl_mvm_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='add'>+			struct ieee80211_vif *vif, struct ieee80211_sta *sta,</div><div class='add'>+			struct ieee80211_key_conf *key);</div><div class='add'>+void iwl_mvm_mac_update_tkip_key(struct ieee80211_hw *hw,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_key_conf *keyconf,</div><div class='add'>+				 struct ieee80211_sta *sta,</div><div class='add'>+				 u32 iv32, u16 *phase1key);</div><div class='add'>+int iwl_mvm_add_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+			struct ieee80211_chanctx_conf *ctx);</div><div class='add'>+void iwl_mvm_remove_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+			    struct ieee80211_chanctx_conf *ctx);</div><div class='add'>+void iwl_mvm_change_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+			    struct ieee80211_chanctx_conf *ctx, u32 changed);</div><div class='add'>+int iwl_mvm_tx_last_beacon(struct ieee80211_hw *hw);</div><div class='add'>+void iwl_mvm_channel_switch(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			    struct ieee80211_channel_switch *chsw);</div><div class='add'>+int iwl_mvm_mac_pre_channel_switch(struct ieee80211_hw *hw,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_channel_switch *chsw);</div><div class='add'>+</div><div class='add'>+void iwl_mvm_abort_channel_switch(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  struct ieee80211_bss_conf *link_conf);</div><div class='add'>+void iwl_mvm_channel_switch_rx_beacon(struct ieee80211_hw *hw,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      struct ieee80211_channel_switch *chsw);</div><div class='add'>+void iwl_mvm_mac_event_callback(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				const struct ieee80211_event *event);</div><div class='add'>+void iwl_mvm_sync_rx_queues(struct ieee80211_hw *hw);</div><div class='add'>+int iwl_mvm_mac_testmode_cmd(struct ieee80211_hw *hw,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     void *data, int len);</div><div class='add'>+int iwl_mvm_mac_get_survey(struct ieee80211_hw *hw, int idx,</div><div class='add'>+			   struct survey_info *survey);</div><div class='add'>+void iwl_mvm_mac_sta_statistics(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_sta *sta,</div><div class='add'>+				struct station_info *sinfo);</div><div class='add'>+int</div><div class='add'>+iwl_mvm_mac_get_ftm_responder_stats(struct ieee80211_hw *hw,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct cfg80211_ftm_responder_stats *stats);</div><div class='add'>+int iwl_mvm_start_pmsr(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		       struct cfg80211_pmsr_request *request);</div><div class='add'>+void iwl_mvm_abort_pmsr(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			struct cfg80211_pmsr_request *request);</div><div class='add'>+</div><div class='add'>+bool iwl_mvm_have_links_same_channel(struct iwl_mvm_vif *vif1,</div><div class='add'>+				     struct iwl_mvm_vif *vif2);</div><div class='add'>+bool iwl_mvm_vif_is_active(struct iwl_mvm_vif *mvmvif);</div><div class='add'>+int iwl_mvm_set_tx_power(struct iwl_mvm *mvm,</div><div class='add'>+			 struct ieee80211_bss_conf *bss_conf,</div><div class='add'>+			 s16 tx_power);</div><div class='add'>+int iwl_mvm_set_hw_timestamp(struct ieee80211_hw *hw,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     struct cfg80211_set_hw_timestamp *hwts);</div><div class='add'>+int iwl_mvm_update_mu_groups(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='add'>+bool iwl_mvm_enable_fils(struct iwl_mvm *mvm,</div><div class='add'>+			 struct ieee80211_vif *vif,</div><div class='add'>+			 struct ieee80211_chanctx_conf *ctx);</div><div class='add'>+</div><div class='add'>+struct cfg80211_chan_def *</div><div class='add'>+iwl_mvm_chanctx_def(struct iwl_mvm *mvm, struct ieee80211_chanctx_conf *ctx);</div><div class='add'>+</div><div class='add'>+void iwl_mvm_roc_duration_and_delay(struct ieee80211_vif *vif,</div><div class='add'>+				    u32 duration_ms,</div><div class='add'>+				    u32 *duration_tu,</div><div class='add'>+				    u32 *delay);</div><div class='add'>+int iwl_mvm_roc_add_cmd(struct iwl_mvm *mvm,</div><div class='add'>+			struct ieee80211_channel *channel,</div><div class='add'>+			struct ieee80211_vif *vif,</div><div class='add'>+			int duration, enum iwl_roc_activity activity);</div><div class='add'>+</div><div class='add'>+/* EMLSR */</div><div class='add'>+bool iwl_mvm_vif_has_esr_cap(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='add'>+void</div><div class='add'>+iwl_mvm_send_ap_tx_power_constraint_cmd(struct iwl_mvm *mvm,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					struct ieee80211_bss_conf *bss_conf,</div><div class='add'>+					bool is_ap);</div><div class='add'>+</div><div class='add'>+void iwl_mvm_smps_workaround(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			     bool update);</div><div class='add'>+</div><div class='add'>+/* rate_n_flags conversion */</div><div class='add'>+u32 iwl_mvm_v3_rate_from_fw(__le32 rate, u8 rate_ver);</div><div class='add'>+__le32 iwl_mvm_v3_rate_to_fw(u32 rate, u8 rate_ver);</div><div class='add'>+</div><div class='ctx'> #endif /* __IWL_MVM_H__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c<br/>index 7fb4e618f76e..953218f1e025 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/nvm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/nvm.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2019 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2019, 2021-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -9,8 +9,7 @@</div><div class='ctx'> #include "iwl-trans.h"</div><div class='ctx'> #include "iwl-csr.h"</div><div class='ctx'> #include "mvm.h"</div><div class='del'>-#include "iwl-eeprom-parse.h"</div><div class='del'>-#include "iwl-eeprom-read.h"</div><div class='add'>+#include "iwl-nvm-utils.h"</div><div class='ctx'> #include "iwl-nvm-parse.h"</div><div class='ctx'> #include "iwl-prph.h"</div><div class='ctx'> #include "fw/acpi.h"</div><div class='hunk'>@@ -121,7 +120,7 @@ static int iwl_nvm_read_chunk(struct iwl_mvm *mvm, u16 section,</div><div class='ctx'> 		} else {</div><div class='ctx'> 			IWL_DEBUG_EEPROM(mvm-&gt;trans-&gt;dev,</div><div class='ctx'> 					 "NVM access command failed with status %d (device: %s)\n",</div><div class='del'>-					 ret, mvm-&gt;trans-&gt;name);</div><div class='add'>+					 ret, mvm-&gt;trans-&gt;info.name);</div><div class='ctx'> 			ret = -ENODATA;</div><div class='ctx'> 		}</div><div class='ctx'> 		goto exit;</div><div class='hunk'>@@ -192,7 +191,7 @@ static int iwl_nvm_read_section(struct iwl_mvm *mvm, u16 section,</div><div class='ctx'> 	while (ret == length) {</div><div class='ctx'> 		/* Check no memory assumptions fail and cause an overflow */</div><div class='ctx'> 		if ((size_read + offset + length) &gt;</div><div class='del'>-		    mvm-&gt;trans-&gt;trans_cfg-&gt;base_params-&gt;eeprom_size) {</div><div class='add'>+		    mvm-&gt;trans-&gt;mac_cfg-&gt;base-&gt;eeprom_size) {</div><div class='ctx'> 			IWL_ERR(mvm, "EEPROM size is too small for NVM\n");</div><div class='ctx'> 			return -ENOBUFS;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -207,7 +206,7 @@ static int iwl_nvm_read_section(struct iwl_mvm *mvm, u16 section,</div><div class='ctx'> 		offset += ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	iwl_nvm_fixups(mvm-&gt;trans-&gt;hw_id, section, data, offset);</div><div class='add'>+	iwl_nvm_fixups(mvm-&gt;trans-&gt;info.hw_id, section, data, offset);</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_EEPROM(mvm-&gt;trans-&gt;dev,</div><div class='ctx'> 			 "NVM section %d read completed\n", section);</div><div class='hunk'>@@ -220,12 +219,14 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm)</div><div class='ctx'> 	struct iwl_nvm_section *sections = mvm-&gt;nvm_sections;</div><div class='ctx'> 	const __be16 *hw;</div><div class='ctx'> 	const __le16 *sw, *calib, *regulatory, *mac_override, *phy_sku;</div><div class='add'>+	u8 tx_ant = mvm-&gt;fw-&gt;valid_tx_ant;</div><div class='add'>+	u8 rx_ant = mvm-&gt;fw-&gt;valid_rx_ant;</div><div class='ctx'> 	int regulatory_type;</div><div class='ctx'> </div><div class='ctx'> 	/* Checking for required sections */</div><div class='ctx'> 	if (mvm-&gt;trans-&gt;cfg-&gt;nvm_type == IWL_NVM) {</div><div class='ctx'> 		if (!mvm-&gt;nvm_sections[NVM_SECTION_TYPE_SW].data ||</div><div class='del'>-		    !mvm-&gt;nvm_sections[mvm-&gt;cfg-&gt;nvm_hw_section_num].data) {</div><div class='add'>+		    !mvm-&gt;nvm_sections[mvm-&gt;trans-&gt;mac_cfg-&gt;base-&gt;nvm_hw_section_num].data) {</div><div class='ctx'> 			IWL_ERR(mvm, "Can't parse empty OTP/NVM sections\n");</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -243,7 +244,7 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm)</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* MAC_OVERRIDE or at least HW section must exist */</div><div class='del'>-		if (!mvm-&gt;nvm_sections[mvm-&gt;cfg-&gt;nvm_hw_section_num].data &amp;&amp;</div><div class='add'>+		if (!mvm-&gt;nvm_sections[mvm-&gt;trans-&gt;mac_cfg-&gt;base-&gt;nvm_hw_section_num].data &amp;&amp;</div><div class='ctx'> 		    !mvm-&gt;nvm_sections[NVM_SECTION_TYPE_MAC_OVERRIDE].data) {</div><div class='ctx'> 			IWL_ERR(mvm,</div><div class='ctx'> 				"Can't parse mac_address, empty sections\n");</div><div class='hunk'>@@ -259,7 +260,7 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hw = (const __be16 *)sections[mvm-&gt;cfg-&gt;nvm_hw_section_num].data;</div><div class='add'>+	hw = (const __be16 *)sections[mvm-&gt;trans-&gt;mac_cfg-&gt;base-&gt;nvm_hw_section_num].data;</div><div class='ctx'> 	sw = (const __le16 *)sections[NVM_SECTION_TYPE_SW].data;</div><div class='ctx'> 	calib = (const __le16 *)sections[NVM_SECTION_TYPE_CALIBRATION].data;</div><div class='ctx'> 	mac_override =</div><div class='hunk'>@@ -270,9 +271,15 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm)</div><div class='ctx'> 		(const __le16 *)sections[NVM_SECTION_TYPE_REGULATORY_SDP].data :</div><div class='ctx'> 		(const __le16 *)sections[NVM_SECTION_TYPE_REGULATORY].data;</div><div class='ctx'> </div><div class='add'>+	if (mvm-&gt;set_tx_ant)</div><div class='add'>+		tx_ant &amp;= mvm-&gt;set_tx_ant;</div><div class='add'>+</div><div class='add'>+	if (mvm-&gt;set_rx_ant)</div><div class='add'>+		rx_ant &amp;= mvm-&gt;set_rx_ant;</div><div class='add'>+</div><div class='ctx'> 	return iwl_parse_nvm_data(mvm-&gt;trans, mvm-&gt;cfg, mvm-&gt;fw, hw, sw, calib,</div><div class='ctx'> 				  regulatory, mac_override, phy_sku,</div><div class='del'>-				  mvm-&gt;fw-&gt;valid_tx_ant, mvm-&gt;fw-&gt;valid_rx_ant);</div><div class='add'>+				  tx_ant, rx_ant);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Loads the NVM data stored in mvm-&gt;nvm_sections into the NIC */</div><div class='hunk'>@@ -301,16 +308,15 @@ int iwl_nvm_init(struct iwl_mvm *mvm)</div><div class='ctx'> 	int ret, section;</div><div class='ctx'> 	u32 size_read = 0;</div><div class='ctx'> 	u8 *nvm_buffer, *temp;</div><div class='del'>-	const char *nvm_file_C = mvm-&gt;cfg-&gt;default_nvm_file_C_step;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(mvm-&gt;cfg-&gt;nvm_hw_section_num &gt;= NVM_MAX_NUM_SECTIONS))</div><div class='add'>+	if (WARN_ON_ONCE(mvm-&gt;trans-&gt;mac_cfg-&gt;base-&gt;nvm_hw_section_num &gt;= NVM_MAX_NUM_SECTIONS))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* load NVM values from nic */</div><div class='ctx'> 	/* Read From FW NVM */</div><div class='ctx'> 	IWL_DEBUG_EEPROM(mvm-&gt;trans-&gt;dev, "Read from NVM\n");</div><div class='ctx'> </div><div class='del'>-	nvm_buffer = kmalloc(mvm-&gt;trans-&gt;trans_cfg-&gt;base_params-&gt;eeprom_size,</div><div class='add'>+	nvm_buffer = kmalloc(mvm-&gt;trans-&gt;mac_cfg-&gt;base-&gt;eeprom_size,</div><div class='ctx'> 			     GFP_KERNEL);</div><div class='ctx'> 	if (!nvm_buffer)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -331,7 +337,7 @@ int iwl_nvm_init(struct iwl_mvm *mvm)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		iwl_nvm_fixups(mvm-&gt;trans-&gt;hw_id, section, temp, ret);</div><div class='add'>+		iwl_nvm_fixups(mvm-&gt;trans-&gt;info.hw_id, section, temp, ret);</div><div class='ctx'> </div><div class='ctx'> 		mvm-&gt;nvm_sections[section].data = temp;</div><div class='ctx'> 		mvm-&gt;nvm_sections[section].length = ret;</div><div class='hunk'>@@ -360,7 +366,7 @@ int iwl_nvm_init(struct iwl_mvm *mvm)</div><div class='ctx'> 			mvm-&gt;nvm_reg_blob.size  = ret;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			if (section == mvm-&gt;cfg-&gt;nvm_hw_section_num) {</div><div class='add'>+			if (section == mvm-&gt;trans-&gt;mac_cfg-&gt;base-&gt;nvm_hw_section_num) {</div><div class='ctx'> 				mvm-&gt;nvm_hw_blob.data = temp;</div><div class='ctx'> 				mvm-&gt;nvm_hw_blob.size = ret;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -377,21 +383,8 @@ int iwl_nvm_init(struct iwl_mvm *mvm)</div><div class='ctx'> 		/* read External NVM file from the mod param */</div><div class='ctx'> 		ret = iwl_read_external_nvm(mvm-&gt;trans, mvm-&gt;nvm_file_name,</div><div class='ctx'> 					    mvm-&gt;nvm_sections);</div><div class='del'>-		if (ret) {</div><div class='del'>-			mvm-&gt;nvm_file_name = nvm_file_C;</div><div class='del'>-</div><div class='del'>-			if ((ret == -EFAULT || ret == -ENOENT) &amp;&amp;</div><div class='del'>-			    mvm-&gt;nvm_file_name) {</div><div class='del'>-				/* in case nvm file was failed try again */</div><div class='del'>-				ret = iwl_read_external_nvm(mvm-&gt;trans,</div><div class='del'>-							    mvm-&gt;nvm_file_name,</div><div class='del'>-							    mvm-&gt;nvm_sections);</div><div class='del'>-				if (ret)</div><div class='del'>-					return ret;</div><div class='del'>-			} else {</div><div class='del'>-				return ret;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* parse the relevant nvm sections */</div><div class='hunk'>@@ -404,7 +397,7 @@ int iwl_nvm_init(struct iwl_mvm *mvm)</div><div class='ctx'> 	return ret &lt; 0 ? ret : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct iwl_mcc_update_resp *</div><div class='add'>+struct iwl_mcc_update_resp_v8 *</div><div class='ctx'> iwl_mvm_update_mcc(struct iwl_mvm *mvm, const char *alpha2,</div><div class='ctx'> 		   enum iwl_mcc_source src_id)</div><div class='ctx'> {</div><div class='hunk'>@@ -412,15 +405,15 @@ iwl_mvm_update_mcc(struct iwl_mvm *mvm, const char *alpha2,</div><div class='ctx'> 		.mcc = cpu_to_le16(alpha2[0] &lt;&lt; 8 | alpha2[1]),</div><div class='ctx'> 		.source_id = (u8)src_id,</div><div class='ctx'> 	};</div><div class='del'>-	struct iwl_mcc_update_resp *resp_cp;</div><div class='add'>+	struct iwl_mcc_update_resp_v8 *resp_cp;</div><div class='ctx'> 	struct iwl_rx_packet *pkt;</div><div class='ctx'> 	struct iwl_host_cmd cmd = {</div><div class='ctx'> 		.id = MCC_UPDATE_CMD,</div><div class='del'>-		.flags = CMD_WANT_SKB,</div><div class='add'>+		.flags = CMD_WANT_SKB | CMD_SEND_IN_RFKILL,</div><div class='ctx'> 		.data = { &amp;mcc_update_cmd },</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	int ret;</div><div class='add'>+	int ret, resp_ver;</div><div class='ctx'> 	u32 status;</div><div class='ctx'> 	int resp_len, n_channels;</div><div class='ctx'> 	u16 mcc;</div><div class='hunk'>@@ -439,25 +432,70 @@ iwl_mvm_update_mcc(struct iwl_mvm *mvm, const char *alpha2,</div><div class='ctx'> </div><div class='ctx'> 	pkt = cmd.resp_pkt;</div><div class='ctx'> </div><div class='add'>+	resp_ver = iwl_fw_lookup_notif_ver(mvm-&gt;fw, IWL_ALWAYS_LONG_GROUP,</div><div class='add'>+					   MCC_UPDATE_CMD, 0);</div><div class='add'>+</div><div class='ctx'> 	/* Extract MCC response */</div><div class='del'>-	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='del'>-			IWL_UCODE_TLV_CAPA_MCC_UPDATE_11AX_SUPPORT)) {</div><div class='del'>-		struct iwl_mcc_update_resp *mcc_resp = (void *)pkt-&gt;data;</div><div class='del'>-</div><div class='del'>-		n_channels =  __le32_to_cpu(mcc_resp-&gt;n_channels);</div><div class='del'>-		resp_len = sizeof(struct iwl_mcc_update_resp) +</div><div class='del'>-			   n_channels * sizeof(__le32);</div><div class='del'>-		resp_cp = kmemdup(mcc_resp, resp_len, GFP_KERNEL);</div><div class='add'>+	if (resp_ver &gt;= 8) {</div><div class='add'>+		struct iwl_mcc_update_resp_v8 *mcc_resp_v8 = (void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+		n_channels =  __le32_to_cpu(mcc_resp_v8-&gt;n_channels);</div><div class='add'>+		if (iwl_rx_packet_payload_len(pkt) !=</div><div class='add'>+		    struct_size(mcc_resp_v8, channels, n_channels)) {</div><div class='add'>+			resp_cp = ERR_PTR(-EINVAL);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		resp_len = struct_size(resp_cp, channels, n_channels);</div><div class='add'>+		resp_cp = kzalloc(resp_len, GFP_KERNEL);</div><div class='ctx'> 		if (!resp_cp) {</div><div class='ctx'> 			resp_cp = ERR_PTR(-ENOMEM);</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='add'>+		resp_cp-&gt;status = mcc_resp_v8-&gt;status;</div><div class='add'>+		resp_cp-&gt;mcc = mcc_resp_v8-&gt;mcc;</div><div class='add'>+		resp_cp-&gt;cap = mcc_resp_v8-&gt;cap;</div><div class='add'>+		resp_cp-&gt;source_id = mcc_resp_v8-&gt;source_id;</div><div class='add'>+		resp_cp-&gt;time = mcc_resp_v8-&gt;time;</div><div class='add'>+		resp_cp-&gt;geo_info = mcc_resp_v8-&gt;geo_info;</div><div class='add'>+		resp_cp-&gt;n_channels = mcc_resp_v8-&gt;n_channels;</div><div class='add'>+		memcpy(resp_cp-&gt;channels, mcc_resp_v8-&gt;channels,</div><div class='add'>+		       n_channels * sizeof(__le32));</div><div class='add'>+	} else if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			       IWL_UCODE_TLV_CAPA_MCC_UPDATE_11AX_SUPPORT)) {</div><div class='add'>+		struct iwl_mcc_update_resp_v4 *mcc_resp_v4 = (void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+		n_channels =  __le32_to_cpu(mcc_resp_v4-&gt;n_channels);</div><div class='add'>+		if (iwl_rx_packet_payload_len(pkt) !=</div><div class='add'>+		    struct_size(mcc_resp_v4, channels, n_channels)) {</div><div class='add'>+			resp_cp = ERR_PTR(-EINVAL);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		resp_len = struct_size(resp_cp, channels, n_channels);</div><div class='add'>+		resp_cp = kzalloc(resp_len, GFP_KERNEL);</div><div class='add'>+		if (!resp_cp) {</div><div class='add'>+			resp_cp = ERR_PTR(-ENOMEM);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		resp_cp-&gt;status = mcc_resp_v4-&gt;status;</div><div class='add'>+		resp_cp-&gt;mcc = mcc_resp_v4-&gt;mcc;</div><div class='add'>+		resp_cp-&gt;cap = cpu_to_le32(le16_to_cpu(mcc_resp_v4-&gt;cap));</div><div class='add'>+		resp_cp-&gt;source_id = mcc_resp_v4-&gt;source_id;</div><div class='add'>+		resp_cp-&gt;time = mcc_resp_v4-&gt;time;</div><div class='add'>+		resp_cp-&gt;geo_info = mcc_resp_v4-&gt;geo_info;</div><div class='add'>+		resp_cp-&gt;n_channels = mcc_resp_v4-&gt;n_channels;</div><div class='add'>+		memcpy(resp_cp-&gt;channels, mcc_resp_v4-&gt;channels,</div><div class='add'>+		       n_channels * sizeof(__le32));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct iwl_mcc_update_resp_v3 *mcc_resp_v3 = (void *)pkt-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 		n_channels =  __le32_to_cpu(mcc_resp_v3-&gt;n_channels);</div><div class='del'>-		resp_len = sizeof(struct iwl_mcc_update_resp) +</div><div class='del'>-			   n_channels * sizeof(__le32);</div><div class='add'>+		if (iwl_rx_packet_payload_len(pkt) !=</div><div class='add'>+		    struct_size(mcc_resp_v3, channels, n_channels)) {</div><div class='add'>+			resp_cp = ERR_PTR(-EINVAL);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		resp_len = struct_size(resp_cp, channels, n_channels);</div><div class='ctx'> 		resp_cp = kzalloc(resp_len, GFP_KERNEL);</div><div class='ctx'> 		if (!resp_cp) {</div><div class='ctx'> 			resp_cp = ERR_PTR(-ENOMEM);</div><div class='hunk'>@@ -466,7 +504,7 @@ iwl_mvm_update_mcc(struct iwl_mvm *mvm, const char *alpha2,</div><div class='ctx'> </div><div class='ctx'> 		resp_cp-&gt;status = mcc_resp_v3-&gt;status;</div><div class='ctx'> 		resp_cp-&gt;mcc = mcc_resp_v3-&gt;mcc;</div><div class='del'>-		resp_cp-&gt;cap = cpu_to_le16(mcc_resp_v3-&gt;cap);</div><div class='add'>+		resp_cp-&gt;cap = cpu_to_le32(mcc_resp_v3-&gt;cap);</div><div class='ctx'> 		resp_cp-&gt;source_id = mcc_resp_v3-&gt;source_id;</div><div class='ctx'> 		resp_cp-&gt;time = mcc_resp_v3-&gt;time;</div><div class='ctx'> 		resp_cp-&gt;geo_info = mcc_resp_v3-&gt;geo_info;</div><div class='hunk'>@@ -502,7 +540,7 @@ int iwl_mvm_init_mcc(struct iwl_mvm *mvm)</div><div class='ctx'> 	struct ieee80211_regdomain *regd;</div><div class='ctx'> 	char mcc[3];</div><div class='ctx'> </div><div class='del'>-	if (mvm-&gt;cfg-&gt;nvm_type == IWL_NVM_EXT) {</div><div class='add'>+	if (mvm-&gt;trans-&gt;cfg-&gt;nvm_type == IWL_NVM_EXT) {</div><div class='ctx'> 		tlv_lar = fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 				      IWL_UCODE_TLV_CAPA_LAR_SUPPORT);</div><div class='ctx'> 		nvm_lar = mvm-&gt;nvm_data-&gt;lar_enabled;</div><div class='hunk'>@@ -520,7 +558,7 @@ int iwl_mvm_init_mcc(struct iwl_mvm *mvm)</div><div class='ctx'> 	 * try to replay the last set MCC to FW. If it doesn't exist,</div><div class='ctx'> 	 * queue an update to cfg80211 to retrieve the default alpha2 from FW.</div><div class='ctx'> 	 */</div><div class='del'>-	retval = iwl_mvm_init_fw_regd(mvm);</div><div class='add'>+	retval = iwl_mvm_init_fw_regd(mvm, true);</div><div class='ctx'> 	if (retval != -ENOENT)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='hunk'>@@ -537,7 +575,7 @@ int iwl_mvm_init_mcc(struct iwl_mvm *mvm)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_mvm_is_wifi_mcc_supported(mvm) &amp;&amp;</div><div class='del'>-	    !iwl_acpi_get_mcc(mvm-&gt;dev, mcc)) {</div><div class='add'>+	    !iwl_bios_get_mcc(&amp;mvm-&gt;fwrt, mcc)) {</div><div class='ctx'> 		kfree(regd);</div><div class='ctx'> 		regd = iwl_mvm_get_regdomain(mvm-&gt;hw-&gt;wiphy, mcc,</div><div class='ctx'> 					     MCC_SOURCE_BIOS, NULL);</div><div class='hunk'>@@ -559,6 +597,7 @@ void iwl_mvm_rx_chub_update_mcc(struct iwl_mvm *mvm,</div><div class='ctx'> 	char mcc[3];</div><div class='ctx'> 	struct ieee80211_regdomain *regd;</div><div class='ctx'> 	int wgds_tbl_idx;</div><div class='add'>+	bool changed = false;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -578,18 +617,26 @@ void iwl_mvm_rx_chub_update_mcc(struct iwl_mvm *mvm,</div><div class='ctx'> 	IWL_DEBUG_LAR(mvm,</div><div class='ctx'> 		      "RX: received chub update mcc cmd (mcc '%s' src %d)\n",</div><div class='ctx'> 		      mcc, src);</div><div class='del'>-	regd = iwl_mvm_get_regdomain(mvm-&gt;hw-&gt;wiphy, mcc, src, NULL);</div><div class='add'>+	regd = iwl_mvm_get_regdomain(mvm-&gt;hw-&gt;wiphy, mcc, src, &amp;changed);</div><div class='ctx'> 	if (IS_ERR_OR_NULL(regd))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (!changed) {</div><div class='add'>+		IWL_DEBUG_LAR(mvm, "RX: No change in the regulatory data\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	wgds_tbl_idx = iwl_mvm_get_sar_geo_profile(mvm);</div><div class='del'>-	if (wgds_tbl_idx &lt; 0)</div><div class='del'>-		IWL_DEBUG_INFO(mvm, "SAR WGDS is disabled (%d)\n",</div><div class='add'>+	if (wgds_tbl_idx &lt; 1)</div><div class='add'>+		IWL_DEBUG_INFO(mvm,</div><div class='add'>+			       "SAR WGDS is disabled or error received (%d)\n",</div><div class='ctx'> 			       wgds_tbl_idx);</div><div class='ctx'> 	else</div><div class='ctx'> 		IWL_DEBUG_INFO(mvm, "SAR WGDS: geo profile %d is configured\n",</div><div class='ctx'> 			       wgds_tbl_idx);</div><div class='ctx'> </div><div class='ctx'> 	regulatory_set_wiphy_regd(mvm-&gt;hw-&gt;wiphy, regd);</div><div class='add'>+</div><div class='add'>+out:</div><div class='ctx'> 	kfree(regd);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/offloading.c b/drivers/net/wireless/intel/iwlwifi/mvm/offloading.c<br/>index 1cc90e61367b..15d4369678a2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/offloading.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/offloading.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/offloading.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/offloading.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2021-2022, 2024 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2015 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include "mvm.h"</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_set_wowlan_qos_seq(struct iwl_mvm_sta *mvm_ap_sta,</div><div class='del'>-				struct iwl_wowlan_config_cmd *cmd)</div><div class='add'>+				struct iwl_wowlan_config_cmd_v6 *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -30,13 +30,14 @@ int iwl_mvm_send_proto_offload(struct iwl_mvm *mvm,</div><div class='ctx'> 			       struct ieee80211_vif *vif,</div><div class='ctx'> 			       bool disable_offloading,</div><div class='ctx'> 			       bool offload_ns,</div><div class='del'>-			       u32 cmd_flags)</div><div class='add'>+			       u32 cmd_flags,</div><div class='add'>+			       u8 sta_id)</div><div class='ctx'> {</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct iwl_proto_offload_cmd_v1 v1;</div><div class='ctx'> 		struct iwl_proto_offload_cmd_v2 v2;</div><div class='ctx'> 		struct iwl_proto_offload_cmd_v3_small v3s;</div><div class='del'>-		struct iwl_proto_offload_cmd_v3_large v3l;</div><div class='add'>+		struct iwl_proto_offload_cmd_v4 v4;</div><div class='ctx'> 	} cmd = {};</div><div class='ctx'> 	struct iwl_host_cmd hcmd = {</div><div class='ctx'> 		.id = PROT_OFFLOAD_CONFIG_CMD,</div><div class='hunk'>@@ -47,6 +48,8 @@ int iwl_mvm_send_proto_offload(struct iwl_mvm *mvm,</div><div class='ctx'> 	struct iwl_proto_offload_cmd_common *common;</div><div class='ctx'> 	u32 enabled = 0, size;</div><div class='ctx'> 	u32 capa_flags = mvm-&gt;fw-&gt;ucode_capa.flags;</div><div class='add'>+	int ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, hcmd.id, 0);</div><div class='add'>+</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -72,9 +75,9 @@ int iwl_mvm_send_proto_offload(struct iwl_mvm *mvm,</div><div class='ctx'> 			addrs = cmd.v3s.targ_addrs;</div><div class='ctx'> 			n_addrs = IWL_PROTO_OFFLOAD_NUM_IPV6_ADDRS_V3S;</div><div class='ctx'> 		} else {</div><div class='del'>-			nsc = cmd.v3l.ns_config;</div><div class='add'>+			nsc = cmd.v4.ns_config;</div><div class='ctx'> 			n_nsc = IWL_PROTO_OFFLOAD_NUM_NS_CONFIG_V3L;</div><div class='del'>-			addrs = cmd.v3l.targ_addrs;</div><div class='add'>+			addrs = cmd.v4.targ_addrs;</div><div class='ctx'> 			n_addrs = IWL_PROTO_OFFLOAD_NUM_IPV6_ADDRS_V3L;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -116,7 +119,7 @@ int iwl_mvm_send_proto_offload(struct iwl_mvm *mvm,</div><div class='ctx'> 			cmd.v3s.num_valid_ipv6_addrs =</div><div class='ctx'> 				cpu_to_le32(i - num_skipped);</div><div class='ctx'> 		else</div><div class='del'>-			cmd.v3l.num_valid_ipv6_addrs =</div><div class='add'>+			cmd.v4.num_valid_ipv6_addrs =</div><div class='ctx'> 				cpu_to_le32(i - num_skipped);</div><div class='ctx'> 	} else if (capa_flags &amp; IWL_UCODE_TLV_FLAGS_D3_6_IPV6_ADDRS) {</div><div class='ctx'> 		bool found = false;</div><div class='hunk'>@@ -171,8 +174,17 @@ int iwl_mvm_send_proto_offload(struct iwl_mvm *mvm,</div><div class='ctx'> 		common = &amp;cmd.v3s.common;</div><div class='ctx'> 		size = sizeof(cmd.v3s);</div><div class='ctx'> 	} else if (capa_flags &amp; IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_LARGE) {</div><div class='del'>-		common = &amp;cmd.v3l.common;</div><div class='del'>-		size = sizeof(cmd.v3l);</div><div class='add'>+		common = &amp;cmd.v4.common;</div><div class='add'>+		size = sizeof(cmd.v4);</div><div class='add'>+		if (ver &lt; 4) {</div><div class='add'>+			/*</div><div class='add'>+			 * This basically uses iwl_proto_offload_cmd_v3_large</div><div class='add'>+			 * which doesn't have the sta_id parameter before the</div><div class='add'>+			 * common part.</div><div class='add'>+			 */</div><div class='add'>+			size -= sizeof(cmd.v4.sta_id);</div><div class='add'>+			hcmd.data[0] = common;</div><div class='add'>+		}</div><div class='ctx'> 	} else if (capa_flags &amp; IWL_UCODE_TLV_FLAGS_D3_6_IPV6_ADDRS) {</div><div class='ctx'> 		common = &amp;cmd.v2.common;</div><div class='ctx'> 		size = sizeof(cmd.v2);</div><div class='hunk'>@@ -181,15 +193,22 @@ int iwl_mvm_send_proto_offload(struct iwl_mvm *mvm,</div><div class='ctx'> 		size = sizeof(cmd.v1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;bss_conf.arp_addr_cnt) {</div><div class='add'>+	if (vif-&gt;cfg.arp_addr_cnt) {</div><div class='ctx'> 		enabled |= IWL_D3_PROTO_OFFLOAD_ARP | IWL_D3_PROTO_IPV4_VALID;</div><div class='del'>-		common-&gt;host_ipv4_addr = vif-&gt;bss_conf.arp_addr_list[0];</div><div class='add'>+		common-&gt;host_ipv4_addr = vif-&gt;cfg.arp_addr_list[0];</div><div class='ctx'> 		memcpy(common-&gt;arp_mac_addr, vif-&gt;addr, ETH_ALEN);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			IWL_UCODE_TLV_CAPA_OFFLOAD_BTM_SUPPORT))</div><div class='add'>+		enabled |= IWL_D3_PROTO_OFFLOAD_BTM;</div><div class='add'>+</div><div class='ctx'> 	if (!disable_offloading)</div><div class='ctx'> 		common-&gt;enabled = cpu_to_le32(enabled);</div><div class='ctx'> </div><div class='add'>+	if (ver &gt;= 4)</div><div class='add'>+		cmd.v4.sta_id = cpu_to_le32(sta_id);</div><div class='add'>+</div><div class='ctx'> 	hcmd.len[0] = size;</div><div class='ctx'> 	return iwl_mvm_send_cmd(mvm, &amp;hcmd);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c<br/>index ebed82c590e5..5ebd046371f5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/ops.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/ops.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/ops.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/ops.c</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -17,32 +18,31 @@</div><div class='ctx'> #include "iwl-modparams.h"</div><div class='ctx'> #include "mvm.h"</div><div class='ctx'> #include "iwl-phy-db.h"</div><div class='del'>-#include "iwl-eeprom-parse.h"</div><div class='add'>+#include "iwl-nvm-utils.h"</div><div class='ctx'> #include "iwl-csr.h"</div><div class='ctx'> #include "iwl-io.h"</div><div class='ctx'> #include "iwl-prph.h"</div><div class='ctx'> #include "rs.h"</div><div class='ctx'> #include "fw/api/scan.h"</div><div class='add'>+#include "fw/api/rfi.h"</div><div class='ctx'> #include "time-event.h"</div><div class='ctx'> #include "fw-api.h"</div><div class='ctx'> #include "fw/acpi.h"</div><div class='add'>+#include "fw/uefi.h"</div><div class='add'>+#include "time-sync.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_DESCRIPTION	"The new Intel(R) wireless AGN driver for Linux"</div><div class='ctx'> MODULE_DESCRIPTION(DRV_DESCRIPTION);</div><div class='del'>-MODULE_AUTHOR(DRV_AUTHOR);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_IMPORT_NS("IWLWIFI");</div><div class='ctx'> </div><div class='ctx'> static const struct iwl_op_mode_ops iwl_mvm_ops;</div><div class='ctx'> static const struct iwl_op_mode_ops iwl_mvm_ops_mq;</div><div class='ctx'> </div><div class='ctx'> struct iwl_mvm_mod_params iwlmvm_mod_params = {</div><div class='ctx'> 	.power_scheme = IWL_POWER_SCHEME_BPS,</div><div class='del'>-	/* rest of fields are 0 by default */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-module_param_named(init_dbg, iwlmvm_mod_params.init_dbg, bool, 0444);</div><div class='del'>-MODULE_PARM_DESC(init_dbg,</div><div class='del'>-		 "set to true to debug an ASSERT in INIT fw (default: false");</div><div class='ctx'> module_param_named(power_scheme, iwlmvm_mod_params.power_scheme, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(power_scheme,</div><div class='ctx'> 		 "power management scheme: 1-active, 2-balanced, 3-low power, default: 2");</div><div class='hunk'>@@ -61,8 +61,10 @@ static int __init iwl_mvm_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_opmode_register("iwlmvm", &amp;iwl_mvm_ops);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		pr_err("Unable to register MVM op_mode: %d\n", ret);</div><div class='add'>+		iwl_mvm_rate_control_unregister();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -78,9 +80,8 @@ module_exit(iwl_mvm_exit);</div><div class='ctx'> static void iwl_mvm_nic_config(struct iwl_op_mode *op_mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);</div><div class='del'>-	struct iwl_trans_debug *dbg = &amp;mvm-&gt;trans-&gt;dbg;</div><div class='ctx'> 	u8 radio_cfg_type, radio_cfg_step, radio_cfg_dash;</div><div class='del'>-	u32 reg_val = 0;</div><div class='add'>+	u32 reg_val;</div><div class='ctx'> 	u32 phy_config = iwl_mvm_get_phy_config(mvm);</div><div class='ctx'> </div><div class='ctx'> 	radio_cfg_type = (phy_config &amp; FW_PHY_CFG_RADIO_TYPE) &gt;&gt;</div><div class='hunk'>@@ -90,11 +91,14 @@ static void iwl_mvm_nic_config(struct iwl_op_mode *op_mode)</div><div class='ctx'> 	radio_cfg_dash = (phy_config &amp; FW_PHY_CFG_RADIO_DASH) &gt;&gt;</div><div class='ctx'> 			 FW_PHY_CFG_RADIO_DASH_POS;</div><div class='ctx'> </div><div class='add'>+	IWL_DEBUG_INFO(mvm, "Radio type=0x%x-0x%x-0x%x\n", radio_cfg_type,</div><div class='add'>+		       radio_cfg_step, radio_cfg_dash);</div><div class='add'>+</div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/* SKU control */</div><div class='del'>-	reg_val |= CSR_HW_REV_STEP(mvm-&gt;trans-&gt;hw_rev) &lt;&lt;</div><div class='del'>-				CSR_HW_IF_CONFIG_REG_POS_MAC_STEP;</div><div class='del'>-	reg_val |= CSR_HW_REV_DASH(mvm-&gt;trans-&gt;hw_rev) &lt;&lt;</div><div class='del'>-				CSR_HW_IF_CONFIG_REG_POS_MAC_DASH;</div><div class='add'>+	reg_val = CSR_HW_REV_STEP_DASH(mvm-&gt;trans-&gt;info.hw_rev);</div><div class='ctx'> </div><div class='ctx'> 	/* radio configuration */</div><div class='ctx'> 	reg_val |= radio_cfg_type &lt;&lt; CSR_HW_IF_CONFIG_REG_POS_PHY_TYPE;</div><div class='hunk'>@@ -112,18 +116,14 @@ static void iwl_mvm_nic_config(struct iwl_op_mode *op_mode)</div><div class='ctx'> 	 * unrelated errors. Need to further investigate this, but for now</div><div class='ctx'> 	 * we'll separate cases.</div><div class='ctx'> 	 */</div><div class='del'>-	if (mvm-&gt;trans-&gt;trans_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_8000)</div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_8000)</div><div class='ctx'> 		reg_val |= CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI;</div><div class='ctx'> </div><div class='del'>-	if (iwl_fw_dbg_is_d3_debug_enabled(&amp;mvm-&gt;fwrt) ||</div><div class='del'>-	    (iwl_trans_dbg_ini_valid(mvm-&gt;trans) &amp;&amp;</div><div class='del'>-	     dbg-&gt;fw_mon_cfg[IWL_FW_INI_ALLOCATION_ID_INTERNAL].buf_location)</div><div class='del'>-	    )</div><div class='add'>+	if (iwl_fw_dbg_is_d3_debug_enabled(&amp;mvm-&gt;fwrt))</div><div class='ctx'> 		reg_val |= CSR_HW_IF_CONFIG_REG_D3_DEBUG;</div><div class='ctx'> </div><div class='ctx'> 	iwl_trans_set_bits_mask(mvm-&gt;trans, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-				CSR_HW_IF_CONFIG_REG_MSK_MAC_DASH |</div><div class='del'>-				CSR_HW_IF_CONFIG_REG_MSK_MAC_STEP |</div><div class='add'>+				CSR_HW_IF_CONFIG_REG_MSK_MAC_STEP_DASH |</div><div class='ctx'> 				CSR_HW_IF_CONFIG_REG_MSK_PHY_TYPE |</div><div class='ctx'> 				CSR_HW_IF_CONFIG_REG_MSK_PHY_STEP |</div><div class='ctx'> 				CSR_HW_IF_CONFIG_REG_MSK_PHY_DASH |</div><div class='hunk'>@@ -132,15 +132,12 @@ static void iwl_mvm_nic_config(struct iwl_op_mode *op_mode)</div><div class='ctx'> 				CSR_HW_IF_CONFIG_REG_D3_DEBUG,</div><div class='ctx'> 				reg_val);</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_INFO(mvm, "Radio type=0x%x-0x%x-0x%x\n", radio_cfg_type,</div><div class='del'>-		       radio_cfg_step, radio_cfg_dash);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * W/A : NIC is stuck in a reset state after Early PCIe power off</div><div class='ctx'> 	 * (PCIe power is lost before PERST# is asserted), causing ME FW</div><div class='ctx'> 	 * to lose ownership and not being able to obtain it back.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!mvm-&gt;trans-&gt;cfg-&gt;apmg_not_supported)</div><div class='add'>+	if (!mvm-&gt;trans-&gt;mac_cfg-&gt;base-&gt;apmg_not_supported)</div><div class='ctx'> 		iwl_set_bits_mask_prph(mvm-&gt;trans, APMG_PS_CTRL_REG,</div><div class='ctx'> 				       APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS,</div><div class='ctx'> 				       ~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS);</div><div class='hunk'>@@ -158,16 +155,17 @@ static void iwl_mvm_rx_monitor_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 	if (notif-&gt;type != cpu_to_le32(IWL_DP_MON_NOTIF_TYPE_EXT_CCA))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	vif = iwl_mvm_get_vif_by_macid(mvm, notif-&gt;mac_id);</div><div class='add'>+	/* FIXME: should fetch the link and not the vif */</div><div class='add'>+	vif = iwl_mvm_get_vif_by_macid(mvm, notif-&gt;link_id);</div><div class='ctx'> 	if (!vif || vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!vif-&gt;bss_conf.chandef.chan ||</div><div class='del'>-	    vif-&gt;bss_conf.chandef.chan-&gt;band != NL80211_BAND_2GHZ ||</div><div class='del'>-	    vif-&gt;bss_conf.chandef.width &lt; NL80211_CHAN_WIDTH_40)</div><div class='add'>+	if (!vif-&gt;bss_conf.chanreq.oper.chan ||</div><div class='add'>+	    vif-&gt;bss_conf.chanreq.oper.chan-&gt;band != NL80211_BAND_2GHZ ||</div><div class='add'>+	    vif-&gt;bss_conf.chanreq.oper.width &lt; NL80211_CHAN_WIDTH_40)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!vif-&gt;bss_conf.assoc)</div><div class='add'>+	if (!vif-&gt;cfg.assoc)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* this shouldn't happen *again*, ignore it */</div><div class='hunk'>@@ -193,12 +191,11 @@ static void iwl_mvm_rx_monitor_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 	WARN_ON(!(sband-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SUP_WIDTH_20_40));</div><div class='ctx'> 	sband-&gt;ht_cap.cap &amp;= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;</div><div class='ctx'> </div><div class='del'>-	he_cap = ieee80211_get_he_iftype_cap(sband,</div><div class='del'>-					     ieee80211_vif_type_p2p(vif));</div><div class='add'>+	he_cap = ieee80211_get_he_iftype_cap_vif(sband, vif);</div><div class='ctx'> </div><div class='ctx'> 	if (he_cap) {</div><div class='ctx'> 		/* we know that ours is writable */</div><div class='del'>-		struct ieee80211_sta_he_cap *he = (void *)he_cap;</div><div class='add'>+		struct ieee80211_sta_he_cap *he = (void *)(uintptr_t)he_cap;</div><div class='ctx'> </div><div class='ctx'> 		WARN_ON(!he-&gt;has_he);</div><div class='ctx'> 		WARN_ON(!(he-&gt;he_cap_elem.phy_cap_info[0] &amp;</div><div class='hunk'>@@ -210,8 +207,64 @@ static void iwl_mvm_rx_monitor_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 	ieee80211_disconnect(vif, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void iwl_mvm_update_link_smps(struct ieee80211_vif *vif,</div><div class='add'>+			      struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm *mvm = mvmvif-&gt;mvm;</div><div class='add'>+	enum ieee80211_smps_mode mode = IEEE80211_SMPS_AUTOMATIC;</div><div class='add'>+</div><div class='add'>+	if (!link_conf)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (mvm-&gt;fw_static_smps_request &amp;&amp;</div><div class='add'>+	    link_conf-&gt;chanreq.oper.width == NL80211_CHAN_WIDTH_160 &amp;&amp;</div><div class='add'>+	    link_conf-&gt;he_support)</div><div class='add'>+		mode = IEEE80211_SMPS_STATIC;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_update_smps(mvm, vif, IWL_MVM_SMPS_REQ_FW, mode,</div><div class='add'>+			    link_conf-&gt;link_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_intf_dual_chain_req(void *data, u8 *mac,</div><div class='add'>+					struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	for_each_vif_active_link(vif, link_conf, link_id)</div><div class='add'>+		iwl_mvm_update_link_smps(vif, link_conf);</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_rx_thermal_dual_chain_req(struct iwl_mvm *mvm,</div><div class='add'>+					      struct iwl_rx_cmd_buffer *rxb)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='add'>+	struct iwl_thermal_dual_chain_request *req = (void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+	/* firmware is expected to handle that in RLC offload mode */</div><div class='add'>+	if (IWL_FW_CHECK(mvm, iwl_mvm_has_rlc_offload(mvm),</div><div class='add'>+			 "Got THERMAL_DUAL_CHAIN_REQUEST (0x%x) in RLC offload mode\n",</div><div class='add'>+			 req-&gt;event))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We could pass it to the iterator data, but also need to remember</div><div class='add'>+	 * it for new interfaces that are added while in this state.</div><div class='add'>+	 */</div><div class='add'>+	mvm-&gt;fw_static_smps_request =</div><div class='add'>+		req-&gt;event == cpu_to_le32(THERMAL_DUAL_CHAIN_REQ_DISABLE);</div><div class='add'>+	ieee80211_iterate_interfaces(mvm-&gt;hw,</div><div class='add'>+				     IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER,</div><div class='add'>+				     iwl_mvm_intf_dual_chain_req, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * enum iwl_rx_handler_context context for Rx handler</div><div class='add'>+ * enum iwl_rx_handler_context: context for Rx handler</div><div class='ctx'>  * @RX_HANDLER_SYNC : this means that it will be called in the Rx path</div><div class='ctx'>  *	which can't acquire mvm-&gt;mutex.</div><div class='ctx'>  * @RX_HANDLER_ASYNC_LOCKED : If the handler needs to hold mvm-&gt;mutex</div><div class='hunk'>@@ -219,16 +272,21 @@ static void iwl_mvm_rx_monitor_notif(struct iwl_mvm *mvm,</div><div class='ctx'>  *	it will be called from a worker with mvm-&gt;mutex held.</div><div class='ctx'>  * @RX_HANDLER_ASYNC_UNLOCKED : in case the handler needs to lock the</div><div class='ctx'>  *	mutex itself, it will be called from a worker without mvm-&gt;mutex held.</div><div class='add'>+ * @RX_HANDLER_ASYNC_LOCKED_WIPHY: If the handler needs to hold the wiphy lock</div><div class='add'>+ *	and mvm-&gt;mutex. Will be handled with the wiphy_work queue infra</div><div class='add'>+ *	instead of regular work queue.</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_rx_handler_context {</div><div class='ctx'> 	RX_HANDLER_SYNC,</div><div class='ctx'> 	RX_HANDLER_ASYNC_LOCKED,</div><div class='ctx'> 	RX_HANDLER_ASYNC_UNLOCKED,</div><div class='add'>+	RX_HANDLER_ASYNC_LOCKED_WIPHY,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_rx_handlers handler for FW notification</div><div class='add'>+ * struct iwl_rx_handlers: handler for FW notification</div><div class='ctx'>  * @cmd_id: command id</div><div class='add'>+ * @min_size: minimum size to expect for the notification</div><div class='ctx'>  * @context: see &amp;iwl_rx_handler_context</div><div class='ctx'>  * @fn: the function is called when notification is received</div><div class='ctx'>  */</div><div class='hunk'>@@ -258,7 +316,7 @@ struct iwl_rx_handlers {</div><div class='ctx'>  */</div><div class='ctx'> static const struct iwl_rx_handlers iwl_mvm_rx_handlers[] = {</div><div class='ctx'> 	RX_HANDLER(TX_CMD, iwl_mvm_rx_tx_cmd, RX_HANDLER_SYNC,</div><div class='del'>-		   struct iwl_mvm_tx_resp),</div><div class='add'>+		   struct iwl_tx_resp),</div><div class='ctx'> 	RX_HANDLER(BA_NOTIF, iwl_mvm_rx_ba_notif, RX_HANDLER_SYNC,</div><div class='ctx'> 		   struct iwl_mvm_ba_notif),</div><div class='ctx'> </div><div class='hunk'>@@ -266,13 +324,27 @@ static const struct iwl_rx_handlers iwl_mvm_rx_handlers[] = {</div><div class='ctx'> 		       iwl_mvm_tlc_update_notif, RX_HANDLER_SYNC,</div><div class='ctx'> 		       struct iwl_tlc_update_notif),</div><div class='ctx'> </div><div class='del'>-	RX_HANDLER(BT_PROFILE_NOTIFICATION, iwl_mvm_rx_bt_coex_notif,</div><div class='del'>-		   RX_HANDLER_ASYNC_LOCKED, struct iwl_bt_coex_profile_notif),</div><div class='add'>+	RX_HANDLER(BT_PROFILE_NOTIFICATION, iwl_mvm_rx_bt_coex_old_notif,</div><div class='add'>+		   RX_HANDLER_ASYNC_LOCKED_WIPHY,</div><div class='add'>+		   struct iwl_bt_coex_prof_old_notif),</div><div class='ctx'> 	RX_HANDLER_NO_SIZE(BEACON_NOTIFICATION, iwl_mvm_rx_beacon_notif,</div><div class='ctx'> 			   RX_HANDLER_ASYNC_LOCKED),</div><div class='ctx'> 	RX_HANDLER_NO_SIZE(STATISTICS_NOTIFICATION, iwl_mvm_rx_statistics,</div><div class='ctx'> 			   RX_HANDLER_ASYNC_LOCKED),</div><div class='ctx'> </div><div class='add'>+	RX_HANDLER_GRP(STATISTICS_GROUP, STATISTICS_OPER_NOTIF,</div><div class='add'>+		       iwl_mvm_handle_rx_system_oper_stats,</div><div class='add'>+		       RX_HANDLER_ASYNC_LOCKED_WIPHY,</div><div class='add'>+		       struct iwl_system_statistics_notif_oper),</div><div class='add'>+	RX_HANDLER_GRP(STATISTICS_GROUP, STATISTICS_OPER_PART1_NOTIF,</div><div class='add'>+		       iwl_mvm_handle_rx_system_oper_part1_stats,</div><div class='add'>+		       RX_HANDLER_ASYNC_LOCKED,</div><div class='add'>+		       struct iwl_system_statistics_part1_notif_oper),</div><div class='add'>+	RX_HANDLER_GRP(SYSTEM_GROUP, SYSTEM_STATISTICS_END_NOTIF,</div><div class='add'>+		       iwl_mvm_handle_rx_system_end_stats_notif,</div><div class='add'>+		       RX_HANDLER_ASYNC_LOCKED,</div><div class='add'>+		       struct iwl_system_statistics_end_notif),</div><div class='add'>+</div><div class='ctx'> 	RX_HANDLER(BA_WINDOW_STATUS_NOTIFICATION_ID,</div><div class='ctx'> 		   iwl_mvm_window_status_notif, RX_HANDLER_SYNC,</div><div class='ctx'> 		   struct iwl_ba_window_status_notif),</div><div class='hunk'>@@ -281,7 +353,7 @@ static const struct iwl_rx_handlers iwl_mvm_rx_handlers[] = {</div><div class='ctx'> 		   RX_HANDLER_SYNC, struct iwl_time_event_notif),</div><div class='ctx'> 	RX_HANDLER_GRP(MAC_CONF_GROUP, SESSION_PROTECTION_NOTIF,</div><div class='ctx'> 		       iwl_mvm_rx_session_protect_notif, RX_HANDLER_SYNC,</div><div class='del'>-		       struct iwl_mvm_session_prot_notif),</div><div class='add'>+		       struct iwl_session_prot_notif),</div><div class='ctx'> 	RX_HANDLER(MCC_CHUB_UPDATE_CMD, iwl_mvm_rx_chub_update_mcc,</div><div class='ctx'> 		   RX_HANDLER_ASYNC_LOCKED, struct iwl_mcc_chub_notif),</div><div class='ctx'> </div><div class='hunk'>@@ -298,17 +370,21 @@ static const struct iwl_rx_handlers iwl_mvm_rx_handlers[] = {</div><div class='ctx'> 			   iwl_mvm_rx_scan_match_found,</div><div class='ctx'> 			   RX_HANDLER_SYNC),</div><div class='ctx'> 	RX_HANDLER(SCAN_COMPLETE_UMAC, iwl_mvm_rx_umac_scan_complete_notif,</div><div class='del'>-		   RX_HANDLER_ASYNC_LOCKED, struct iwl_umac_scan_complete),</div><div class='add'>+		   RX_HANDLER_ASYNC_LOCKED,</div><div class='add'>+		   struct iwl_umac_scan_complete),</div><div class='ctx'> 	RX_HANDLER(SCAN_ITERATION_COMPLETE_UMAC,</div><div class='ctx'> 		   iwl_mvm_rx_umac_scan_iter_complete_notif, RX_HANDLER_SYNC,</div><div class='ctx'> 		   struct iwl_umac_scan_iter_complete_notif),</div><div class='ctx'> </div><div class='del'>-	RX_HANDLER(CARD_STATE_NOTIFICATION, iwl_mvm_rx_card_state_notif,</div><div class='del'>-		   RX_HANDLER_SYNC, struct iwl_card_state_notif),</div><div class='del'>-</div><div class='del'>-	RX_HANDLER(MISSED_BEACONS_NOTIFICATION, iwl_mvm_rx_missed_beacons_notif,</div><div class='del'>-		   RX_HANDLER_SYNC, struct iwl_missed_beacons_notif),</div><div class='add'>+	RX_HANDLER(MISSED_BEACONS_NOTIFICATION,</div><div class='add'>+		   iwl_mvm_rx_missed_beacons_notif_legacy,</div><div class='add'>+		   RX_HANDLER_ASYNC_LOCKED_WIPHY,</div><div class='add'>+		   struct iwl_missed_beacons_notif_v4),</div><div class='ctx'> </div><div class='add'>+	RX_HANDLER_GRP(MAC_CONF_GROUP, MISSED_BEACONS_NOTIF,</div><div class='add'>+		       iwl_mvm_rx_missed_beacons_notif,</div><div class='add'>+		       RX_HANDLER_ASYNC_LOCKED_WIPHY,</div><div class='add'>+		       struct iwl_missed_beacons_notif),</div><div class='ctx'> 	RX_HANDLER(REPLY_ERROR, iwl_mvm_rx_fw_error, RX_HANDLER_SYNC,</div><div class='ctx'> 		   struct iwl_error_resp),</div><div class='ctx'> 	RX_HANDLER(PSM_UAPSD_AP_MISBEHAVING_NOTIFICATION,</div><div class='hunk'>@@ -341,7 +417,7 @@ static const struct iwl_rx_handlers iwl_mvm_rx_handlers[] = {</div><div class='ctx'> 		       struct iwl_mfu_assert_dump_notif),</div><div class='ctx'> 	RX_HANDLER_GRP(PROT_OFFLOAD_GROUP, STORED_BEACON_NTF,</div><div class='ctx'> 		       iwl_mvm_rx_stored_beacon_notif, RX_HANDLER_SYNC,</div><div class='del'>-		       struct iwl_stored_beacon_notif),</div><div class='add'>+		       struct iwl_stored_beacon_notif_v2),</div><div class='ctx'> 	RX_HANDLER_GRP(DATA_PATH_GROUP, MU_GROUP_MGMT_NOTIF,</div><div class='ctx'> 		       iwl_mvm_mu_mimo_grp_notif, RX_HANDLER_SYNC,</div><div class='ctx'> 		       struct iwl_mu_group_mgmt_notif),</div><div class='hunk'>@@ -352,12 +428,46 @@ static const struct iwl_rx_handlers iwl_mvm_rx_handlers[] = {</div><div class='ctx'> 		       iwl_mvm_probe_resp_data_notif,</div><div class='ctx'> 		       RX_HANDLER_ASYNC_LOCKED,</div><div class='ctx'> 		       struct iwl_probe_resp_data_notif),</div><div class='del'>-	RX_HANDLER_GRP(MAC_CONF_GROUP, CHANNEL_SWITCH_NOA_NOTIF,</div><div class='del'>-		       iwl_mvm_channel_switch_noa_notif,</div><div class='del'>-		       RX_HANDLER_SYNC, struct iwl_channel_switch_noa_notif),</div><div class='add'>+	RX_HANDLER_GRP(MAC_CONF_GROUP, CHANNEL_SWITCH_START_NOTIF,</div><div class='add'>+		       iwl_mvm_channel_switch_start_notif,</div><div class='add'>+		       RX_HANDLER_SYNC, struct iwl_channel_switch_start_notif),</div><div class='add'>+	RX_HANDLER_GRP(MAC_CONF_GROUP, CHANNEL_SWITCH_ERROR_NOTIF,</div><div class='add'>+		       iwl_mvm_channel_switch_error_notif,</div><div class='add'>+		       RX_HANDLER_ASYNC_UNLOCKED,</div><div class='add'>+		       struct iwl_channel_switch_error_notif),</div><div class='add'>+</div><div class='ctx'> 	RX_HANDLER_GRP(DATA_PATH_GROUP, MONITOR_NOTIF,</div><div class='ctx'> 		       iwl_mvm_rx_monitor_notif, RX_HANDLER_ASYNC_LOCKED,</div><div class='ctx'> 		       struct iwl_datapath_monitor_notif),</div><div class='add'>+</div><div class='add'>+	RX_HANDLER_GRP(DATA_PATH_GROUP, THERMAL_DUAL_CHAIN_REQUEST,</div><div class='add'>+		       iwl_mvm_rx_thermal_dual_chain_req,</div><div class='add'>+		       RX_HANDLER_ASYNC_LOCKED,</div><div class='add'>+		       struct iwl_thermal_dual_chain_request),</div><div class='add'>+</div><div class='add'>+	RX_HANDLER_GRP(SYSTEM_GROUP, RFI_DEACTIVATE_NOTIF,</div><div class='add'>+		       iwl_rfi_deactivate_notif_handler, RX_HANDLER_ASYNC_UNLOCKED,</div><div class='add'>+		       struct iwl_rfi_deactivate_notif),</div><div class='add'>+</div><div class='add'>+	RX_HANDLER_GRP(LEGACY_GROUP,</div><div class='add'>+		       WNM_80211V_TIMING_MEASUREMENT_NOTIFICATION,</div><div class='add'>+		       iwl_mvm_time_sync_msmt_event, RX_HANDLER_SYNC,</div><div class='add'>+		       struct iwl_time_msmt_notify),</div><div class='add'>+	RX_HANDLER_GRP(LEGACY_GROUP,</div><div class='add'>+		       WNM_80211V_TIMING_MEASUREMENT_CONFIRM_NOTIFICATION,</div><div class='add'>+		       iwl_mvm_time_sync_msmt_confirm_event, RX_HANDLER_SYNC,</div><div class='add'>+		       struct iwl_time_msmt_cfm_notify),</div><div class='add'>+	RX_HANDLER_GRP(MAC_CONF_GROUP, ROC_NOTIF,</div><div class='add'>+		       iwl_mvm_rx_roc_notif, RX_HANDLER_ASYNC_LOCKED,</div><div class='add'>+		       struct iwl_roc_notif),</div><div class='add'>+	RX_HANDLER_GRP(SCAN_GROUP, CHANNEL_SURVEY_NOTIF,</div><div class='add'>+		       iwl_mvm_rx_channel_survey_notif, RX_HANDLER_ASYNC_LOCKED,</div><div class='add'>+		       struct iwl_umac_scan_channel_survey_notif),</div><div class='add'>+	RX_HANDLER_GRP(DATA_PATH_GROUP, BEACON_FILTER_IN_NOTIF,</div><div class='add'>+		       iwl_mvm_rx_beacon_filter_notif,</div><div class='add'>+		       RX_HANDLER_ASYNC_LOCKED,</div><div class='add'>+		       /* same size as v1 */</div><div class='add'>+		       struct iwl_beacon_filter_notif),</div><div class='ctx'> };</div><div class='ctx'> #undef RX_HANDLER</div><div class='ctx'> #undef RX_HANDLER_GRP</div><div class='hunk'>@@ -380,7 +490,6 @@ static const struct iwl_hcmd_names iwl_mvm_legacy_names[] = {</div><div class='ctx'> 	HCMD_NAME(ADD_STA_KEY),</div><div class='ctx'> 	HCMD_NAME(ADD_STA),</div><div class='ctx'> 	HCMD_NAME(REMOVE_STA),</div><div class='del'>-	HCMD_NAME(FW_GET_ITEM_CMD),</div><div class='ctx'> 	HCMD_NAME(TX_CMD),</div><div class='ctx'> 	HCMD_NAME(SCD_QUEUE_CFG),</div><div class='ctx'> 	HCMD_NAME(TXPATH_FLUSH),</div><div class='hunk'>@@ -403,6 +512,8 @@ static const struct iwl_hcmd_names iwl_mvm_legacy_names[] = {</div><div class='ctx'> 	HCMD_NAME(SCAN_OFFLOAD_PROFILES_QUERY_CMD),</div><div class='ctx'> 	HCMD_NAME(BT_COEX_UPDATE_REDUCED_TXP),</div><div class='ctx'> 	HCMD_NAME(BT_COEX_CI),</div><div class='add'>+	HCMD_NAME(WNM_80211V_TIMING_MEASUREMENT_NOTIFICATION),</div><div class='add'>+	HCMD_NAME(WNM_80211V_TIMING_MEASUREMENT_CONFIRM_NOTIFICATION),</div><div class='ctx'> 	HCMD_NAME(PHY_CONFIGURATION_CMD),</div><div class='ctx'> 	HCMD_NAME(CALIB_RES_NOTIF_PHY_DB),</div><div class='ctx'> 	HCMD_NAME(PHY_DB_CMD),</div><div class='hunk'>@@ -411,7 +522,6 @@ static const struct iwl_hcmd_names iwl_mvm_legacy_names[] = {</div><div class='ctx'> 	HCMD_NAME(POWER_TABLE_CMD),</div><div class='ctx'> 	HCMD_NAME(PSM_UAPSD_AP_MISBEHAVING_NOTIFICATION),</div><div class='ctx'> 	HCMD_NAME(REPLY_THERMAL_MNG_BACKOFF),</div><div class='del'>-	HCMD_NAME(DC2DC_CONFIG_CMD),</div><div class='ctx'> 	HCMD_NAME(NVM_ACCESS_CMD),</div><div class='ctx'> 	HCMD_NAME(BEACON_NOTIFICATION),</div><div class='ctx'> 	HCMD_NAME(BEACON_TEMPLATE_CMD),</div><div class='hunk'>@@ -421,7 +531,6 @@ static const struct iwl_hcmd_names iwl_mvm_legacy_names[] = {</div><div class='ctx'> 	HCMD_NAME(STATISTICS_NOTIFICATION),</div><div class='ctx'> 	HCMD_NAME(EOSP_NOTIFICATION),</div><div class='ctx'> 	HCMD_NAME(REDUCE_TX_POWER_CMD),</div><div class='del'>-	HCMD_NAME(CARD_STATE_NOTIFICATION),</div><div class='ctx'> 	HCMD_NAME(MISSED_BEACONS_NOTIFICATION),</div><div class='ctx'> 	HCMD_NAME(TDLS_CONFIG_CMD),</div><div class='ctx'> 	HCMD_NAME(MAC_PM_POWER_TABLE),</div><div class='hunk'>@@ -438,14 +547,11 @@ static const struct iwl_hcmd_names iwl_mvm_legacy_names[] = {</div><div class='ctx'> 	HCMD_NAME(MCC_CHUB_UPDATE_CMD),</div><div class='ctx'> 	HCMD_NAME(MARKER_CMD),</div><div class='ctx'> 	HCMD_NAME(BT_PROFILE_NOTIFICATION),</div><div class='del'>-	HCMD_NAME(BCAST_FILTER_CMD),</div><div class='ctx'> 	HCMD_NAME(MCAST_FILTER_CMD),</div><div class='ctx'> 	HCMD_NAME(REPLY_SF_CFG_CMD),</div><div class='ctx'> 	HCMD_NAME(REPLY_BEACON_FILTERING_CMD),</div><div class='ctx'> 	HCMD_NAME(D3_CONFIG_CMD),</div><div class='ctx'> 	HCMD_NAME(PROT_OFFLOAD_CONFIG_CMD),</div><div class='del'>-	HCMD_NAME(OFFLOADS_QUERY_CMD),</div><div class='del'>-	HCMD_NAME(REMOTE_WAKE_CONFIG_CMD),</div><div class='ctx'> 	HCMD_NAME(MATCH_FOUND_NOTIFICATION),</div><div class='ctx'> 	HCMD_NAME(DTS_MEASUREMENT_NOTIFICATION),</div><div class='ctx'> 	HCMD_NAME(WOWLAN_PATTERNS),</div><div class='hunk'>@@ -458,6 +564,7 @@ static const struct iwl_hcmd_names iwl_mvm_legacy_names[] = {</div><div class='ctx'> 	HCMD_NAME(D0I3_END_CMD),</div><div class='ctx'> 	HCMD_NAME(LTR_CONFIG),</div><div class='ctx'> 	HCMD_NAME(LDBG_CONFIG_CMD),</div><div class='add'>+	HCMD_NAME(DEBUG_LOG_MSG),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Please keep this array *SORTED* by hex value.</div><div class='hunk'>@@ -465,18 +572,38 @@ static const struct iwl_hcmd_names iwl_mvm_legacy_names[] = {</div><div class='ctx'>  */</div><div class='ctx'> static const struct iwl_hcmd_names iwl_mvm_system_names[] = {</div><div class='ctx'> 	HCMD_NAME(SHARED_MEM_CFG_CMD),</div><div class='add'>+	HCMD_NAME(SOC_CONFIGURATION_CMD),</div><div class='ctx'> 	HCMD_NAME(INIT_EXTENDED_CFG_CMD),</div><div class='ctx'> 	HCMD_NAME(FW_ERROR_RECOVERY_CMD),</div><div class='add'>+	HCMD_NAME(RFI_CONFIG_CMD),</div><div class='add'>+	HCMD_NAME(RFI_GET_FREQ_TABLE_CMD),</div><div class='add'>+	HCMD_NAME(SYSTEM_FEATURES_CONTROL_CMD),</div><div class='add'>+	HCMD_NAME(SYSTEM_STATISTICS_CMD),</div><div class='add'>+	HCMD_NAME(SYSTEM_STATISTICS_END_NOTIF),</div><div class='add'>+	HCMD_NAME(RFI_DEACTIVATE_NOTIF),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Please keep this array *SORTED* by hex value.</div><div class='ctx'>  * Access is done through binary search</div><div class='ctx'>  */</div><div class='ctx'> static const struct iwl_hcmd_names iwl_mvm_mac_conf_names[] = {</div><div class='add'>+	HCMD_NAME(LOW_LATENCY_CMD),</div><div class='ctx'> 	HCMD_NAME(CHANNEL_SWITCH_TIME_EVENT_CMD),</div><div class='ctx'> 	HCMD_NAME(SESSION_PROTECTION_CMD),</div><div class='add'>+	HCMD_NAME(CANCEL_CHANNEL_SWITCH_CMD),</div><div class='add'>+	HCMD_NAME(MAC_CONFIG_CMD),</div><div class='add'>+	HCMD_NAME(LINK_CONFIG_CMD),</div><div class='add'>+	HCMD_NAME(STA_CONFIG_CMD),</div><div class='add'>+	HCMD_NAME(AUX_STA_CMD),</div><div class='add'>+	HCMD_NAME(STA_REMOVE_CMD),</div><div class='add'>+	HCMD_NAME(STA_DISABLE_TX_CMD),</div><div class='add'>+	HCMD_NAME(ROC_CMD),</div><div class='add'>+	HCMD_NAME(ROC_NOTIF),</div><div class='add'>+	HCMD_NAME(CHANNEL_SWITCH_ERROR_NOTIF),</div><div class='add'>+	HCMD_NAME(MISSED_VAP_NOTIF),</div><div class='ctx'> 	HCMD_NAME(SESSION_PROTECTION_NOTIF),</div><div class='del'>-	HCMD_NAME(CHANNEL_SWITCH_NOA_NOTIF),</div><div class='add'>+	HCMD_NAME(PROBE_RESPONSE_DATA_NOTIF),</div><div class='add'>+	HCMD_NAME(CHANNEL_SWITCH_START_NOTIF),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Please keep this array *SORTED* by hex value.</div><div class='hunk'>@@ -486,7 +613,8 @@ static const struct iwl_hcmd_names iwl_mvm_phy_names[] = {</div><div class='ctx'> 	HCMD_NAME(CMD_DTS_MEASUREMENT_TRIGGER_WIDE),</div><div class='ctx'> 	HCMD_NAME(CTDP_CONFIG_CMD),</div><div class='ctx'> 	HCMD_NAME(TEMP_REPORTING_THRESHOLDS_CMD),</div><div class='del'>-	HCMD_NAME(GEO_TX_POWER_LIMIT),</div><div class='add'>+	HCMD_NAME(PER_CHAIN_LIMIT_OFFSET_CMD),</div><div class='add'>+	HCMD_NAME(AP_TX_POWER_CONSTRAINTS_CMD),</div><div class='ctx'> 	HCMD_NAME(CT_KILL_NOTIFICATION),</div><div class='ctx'> 	HCMD_NAME(DTS_MEASUREMENT_NOTIF_WIDE),</div><div class='ctx'> };</div><div class='hunk'>@@ -498,11 +626,18 @@ static const struct iwl_hcmd_names iwl_mvm_data_path_names[] = {</div><div class='ctx'> 	HCMD_NAME(DQA_ENABLE_CMD),</div><div class='ctx'> 	HCMD_NAME(UPDATE_MU_GROUPS_CMD),</div><div class='ctx'> 	HCMD_NAME(TRIGGER_RX_QUEUES_NOTIF_CMD),</div><div class='add'>+	HCMD_NAME(WNM_PLATFORM_PTM_REQUEST_CMD),</div><div class='add'>+	HCMD_NAME(WNM_80211V_TIMING_MEASUREMENT_CONFIG_CMD),</div><div class='ctx'> 	HCMD_NAME(STA_HE_CTXT_CMD),</div><div class='add'>+	HCMD_NAME(RLC_CONFIG_CMD),</div><div class='ctx'> 	HCMD_NAME(RFH_QUEUE_CONFIG_CMD),</div><div class='ctx'> 	HCMD_NAME(TLC_MNG_CONFIG_CMD),</div><div class='ctx'> 	HCMD_NAME(CHEST_COLLECTOR_FILTER_CONFIG_CMD),</div><div class='add'>+	HCMD_NAME(SCD_QUEUE_CONFIG_CMD),</div><div class='add'>+	HCMD_NAME(SEC_KEY_CMD),</div><div class='ctx'> 	HCMD_NAME(MONITOR_NOTIF),</div><div class='add'>+	HCMD_NAME(THERMAL_DUAL_CHAIN_REQUEST),</div><div class='add'>+	HCMD_NAME(BEACON_FILTER_IN_NOTIF),</div><div class='ctx'> 	HCMD_NAME(STA_PM_NOTIF),</div><div class='ctx'> 	HCMD_NAME(MU_GROUP_MGMT_NOTIF),</div><div class='ctx'> 	HCMD_NAME(RX_QUEUES_NOTIFICATION),</div><div class='hunk'>@@ -511,6 +646,37 @@ static const struct iwl_hcmd_names iwl_mvm_data_path_names[] = {</div><div class='ctx'> /* Please keep this array *SORTED* by hex value.</div><div class='ctx'>  * Access is done through binary search</div><div class='ctx'>  */</div><div class='add'>+static const struct iwl_hcmd_names iwl_mvm_statistics_names[] = {</div><div class='add'>+	HCMD_NAME(STATISTICS_OPER_NOTIF),</div><div class='add'>+	HCMD_NAME(STATISTICS_OPER_PART1_NOTIF),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Please keep this array *SORTED* by hex value.</div><div class='add'>+ * Access is done through binary search</div><div class='add'>+ */</div><div class='add'>+static const struct iwl_hcmd_names iwl_mvm_debug_names[] = {</div><div class='add'>+	HCMD_NAME(LMAC_RD_WR),</div><div class='add'>+	HCMD_NAME(UMAC_RD_WR),</div><div class='add'>+	HCMD_NAME(HOST_EVENT_CFG),</div><div class='add'>+	HCMD_NAME(DBGC_SUSPEND_RESUME),</div><div class='add'>+	HCMD_NAME(BUFFER_ALLOCATION),</div><div class='add'>+	HCMD_NAME(GET_TAS_STATUS),</div><div class='add'>+	HCMD_NAME(FW_DUMP_COMPLETE_CMD),</div><div class='add'>+	HCMD_NAME(FW_CLEAR_BUFFER),</div><div class='add'>+	HCMD_NAME(MFU_ASSERT_DUMP_NTF),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Please keep this array *SORTED* by hex value.</div><div class='add'>+ * Access is done through binary search</div><div class='add'>+ */</div><div class='add'>+static const struct iwl_hcmd_names iwl_mvm_scan_names[] = {</div><div class='add'>+	HCMD_NAME(CHANNEL_SURVEY_NOTIF),</div><div class='add'>+	HCMD_NAME(OFFLOAD_MATCH_INFO_NOTIF),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Please keep this array *SORTED* by hex value.</div><div class='add'>+ * Access is done through binary search</div><div class='add'>+ */</div><div class='ctx'> static const struct iwl_hcmd_names iwl_mvm_location_names[] = {</div><div class='ctx'> 	HCMD_NAME(TOF_RANGE_REQ_CMD),</div><div class='ctx'> 	HCMD_NAME(TOF_CONFIG_CMD),</div><div class='hunk'>@@ -528,6 +694,9 @@ static const struct iwl_hcmd_names iwl_mvm_location_names[] = {</div><div class='ctx'>  * Access is done through binary search</div><div class='ctx'>  */</div><div class='ctx'> static const struct iwl_hcmd_names iwl_mvm_prot_offload_names[] = {</div><div class='add'>+	HCMD_NAME(WOWLAN_WAKE_PKT_NOTIFICATION),</div><div class='add'>+	HCMD_NAME(WOWLAN_INFO_NOTIFICATION),</div><div class='add'>+	HCMD_NAME(D3_END_NOTIFICATION),</div><div class='ctx'> 	HCMD_NAME(STORED_BEACON_NTF),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -540,21 +709,40 @@ static const struct iwl_hcmd_names iwl_mvm_regulatory_and_nvm_names[] = {</div><div class='ctx'> 	HCMD_NAME(TAS_CONFIG),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct iwl_hcmd_arr iwl_mvm_groups[] = {</div><div class='add'>+/* Please keep this array *SORTED* by hex value.</div><div class='add'>+ * Access is done through binary search</div><div class='add'>+ */</div><div class='add'>+static const struct iwl_hcmd_names iwl_mvm_bt_coex_names[] = {</div><div class='add'>+	HCMD_NAME(PROFILE_NOTIF),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+VISIBLE_IF_IWLWIFI_KUNIT</div><div class='add'>+const struct iwl_hcmd_arr iwl_mvm_groups[] = {</div><div class='ctx'> 	[LEGACY_GROUP] = HCMD_ARR(iwl_mvm_legacy_names),</div><div class='ctx'> 	[LONG_GROUP] = HCMD_ARR(iwl_mvm_legacy_names),</div><div class='ctx'> 	[SYSTEM_GROUP] = HCMD_ARR(iwl_mvm_system_names),</div><div class='ctx'> 	[MAC_CONF_GROUP] = HCMD_ARR(iwl_mvm_mac_conf_names),</div><div class='ctx'> 	[PHY_OPS_GROUP] = HCMD_ARR(iwl_mvm_phy_names),</div><div class='ctx'> 	[DATA_PATH_GROUP] = HCMD_ARR(iwl_mvm_data_path_names),</div><div class='add'>+	[SCAN_GROUP] = HCMD_ARR(iwl_mvm_scan_names),</div><div class='ctx'> 	[LOCATION_GROUP] = HCMD_ARR(iwl_mvm_location_names),</div><div class='add'>+	[BT_COEX_GROUP] = HCMD_ARR(iwl_mvm_bt_coex_names),</div><div class='ctx'> 	[PROT_OFFLOAD_GROUP] = HCMD_ARR(iwl_mvm_prot_offload_names),</div><div class='ctx'> 	[REGULATORY_AND_NVM_GROUP] =</div><div class='ctx'> 		HCMD_ARR(iwl_mvm_regulatory_and_nvm_names),</div><div class='add'>+	[DEBUG_GROUP] = HCMD_ARR(iwl_mvm_debug_names),</div><div class='add'>+	[STATISTICS_GROUP] = HCMD_ARR(iwl_mvm_statistics_names),</div><div class='ctx'> };</div><div class='add'>+EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_mvm_groups);</div><div class='add'>+#if IS_ENABLED(CONFIG_IWLWIFI_KUNIT_TESTS)</div><div class='add'>+const unsigned int iwl_mvm_groups_size = ARRAY_SIZE(iwl_mvm_groups);</div><div class='add'>+EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_mvm_groups_size);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* this forward declaration can avoid to export the function */</div><div class='ctx'> static void iwl_mvm_async_handlers_wk(struct work_struct *wk);</div><div class='add'>+static void iwl_mvm_async_handlers_wiphy_wk(struct wiphy *wiphy,</div><div class='add'>+					    struct wiphy_work *work);</div><div class='ctx'> </div><div class='ctx'> static u32 iwl_mvm_min_backoff(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='hunk'>@@ -564,7 +752,7 @@ static u32 iwl_mvm_min_backoff(struct iwl_mvm *mvm)</div><div class='ctx'> 	if (!backoff)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	dflt_pwr_limit = iwl_acpi_get_pwr_limit(mvm-&gt;dev);</div><div class='add'>+	iwl_bios_get_pwr_limit(&amp;mvm-&gt;fwrt, &amp;dflt_pwr_limit);</div><div class='ctx'> </div><div class='ctx'> 	while (backoff-&gt;pwr) {</div><div class='ctx'> 		if (dflt_pwr_limit &gt;= backoff-&gt;pwr)</div><div class='hunk'>@@ -583,29 +771,25 @@ static void iwl_mvm_tx_unblock_dwork(struct work_struct *work)</div><div class='ctx'> 	struct ieee80211_vif *tx_blocked_vif;</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> </div><div class='ctx'> 	tx_blocked_vif =</div><div class='ctx'> 		rcu_dereference_protected(mvm-&gt;csa_tx_blocked_vif,</div><div class='ctx'> 					  lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='ctx'> </div><div class='ctx'> 	if (!tx_blocked_vif)</div><div class='del'>-		goto unlock;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	mvmvif = iwl_mvm_vif_from_mac80211(tx_blocked_vif);</div><div class='ctx'> 	iwl_mvm_modify_all_sta_disable_tx(mvm, mvmvif, false);</div><div class='ctx'> 	RCU_INIT_POINTER(mvm-&gt;csa_tx_blocked_vif, NULL);</div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_fwrt_dump_start(void *ctx)</div><div class='add'>+static void iwl_mvm_fwrt_dump_start(void *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = ctx;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_fwrt_dump_end(void *ctx)</div><div class='hunk'>@@ -615,21 +799,12 @@ static void iwl_mvm_fwrt_dump_end(void *ctx)</div><div class='ctx'> 	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool iwl_mvm_fwrt_fw_running(void *ctx)</div><div class='del'>-{</div><div class='del'>-	return iwl_mvm_firmware_running(ctx);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int iwl_mvm_fwrt_send_hcmd(void *ctx, struct iwl_host_cmd *host_cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = (struct iwl_mvm *)ctx;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	ret = iwl_mvm_send_cmd(mvm, host_cmd);</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+	return iwl_mvm_send_cmd(mvm, host_cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool iwl_mvm_d3_debug_enable(void *ctx)</div><div class='hunk'>@@ -640,35 +815,79 @@ static bool iwl_mvm_d3_debug_enable(void *ctx)</div><div class='ctx'> static const struct iwl_fw_runtime_ops iwl_mvm_fwrt_ops = {</div><div class='ctx'> 	.dump_start = iwl_mvm_fwrt_dump_start,</div><div class='ctx'> 	.dump_end = iwl_mvm_fwrt_dump_end,</div><div class='del'>-	.fw_running = iwl_mvm_fwrt_fw_running,</div><div class='ctx'> 	.send_hcmd = iwl_mvm_fwrt_send_hcmd,</div><div class='ctx'> 	.d3_debug_enable = iwl_mvm_d3_debug_enable,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int iwl_mvm_start_get_nvm(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='add'>+	struct iwl_trans *trans = mvm-&gt;trans;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (trans-&gt;csme_own) {</div><div class='add'>+		if (WARN(!mvm-&gt;mei_registered,</div><div class='add'>+			 "csme is owner, but we aren't registered to iwlmei\n"))</div><div class='add'>+			goto get_nvm_from_fw;</div><div class='add'>+</div><div class='add'>+		mvm-&gt;mei_nvm_data = iwl_mei_get_nvm();</div><div class='add'>+		if (mvm-&gt;mei_nvm_data) {</div><div class='add'>+			/*</div><div class='add'>+			 * mvm-&gt;mei_nvm_data is set and because of that,</div><div class='add'>+			 * we'll load the NVM from the FW when we'll get</div><div class='add'>+			 * ownership.</div><div class='add'>+			 */</div><div class='add'>+			mvm-&gt;nvm_data =</div><div class='add'>+				iwl_parse_mei_nvm_data(trans, trans-&gt;cfg,</div><div class='add'>+						       mvm-&gt;mei_nvm_data,</div><div class='add'>+						       mvm-&gt;fw,</div><div class='add'>+						       mvm-&gt;set_tx_ant,</div><div class='add'>+						       mvm-&gt;set_rx_ant);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		IWL_ERR(mvm,</div><div class='add'>+			"Got a NULL NVM from CSME, trying to get it from the device\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+get_nvm_from_fw:</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	wiphy_lock(mvm-&gt;hw-&gt;wiphy);</div><div class='ctx'> 	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	ret = iwl_run_init_mvm_ucode(mvm);</div><div class='add'>+	ret = iwl_trans_start_hw(mvm-&gt;trans);</div><div class='add'>+	if (ret) {</div><div class='add'>+		mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+		wiphy_unlock(mvm-&gt;hw-&gt;wiphy);</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	ret = iwl_run_init_mvm_ucode(mvm);</div><div class='ctx'> 	if (ret &amp;&amp; ret != -ERFKILL)</div><div class='ctx'> 		iwl_fw_dbg_error_collect(&amp;mvm-&gt;fwrt, FW_DBG_TRIGGER_DRIVER);</div><div class='add'>+	if (!ret &amp;&amp; iwl_mvm_is_lar_supported(mvm)) {</div><div class='add'>+		mvm-&gt;hw-&gt;wiphy-&gt;regulatory_flags |= REGULATORY_WIPHY_SELF_MANAGED;</div><div class='add'>+		ret = iwl_mvm_init_mcc(mvm);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!iwlmvm_mod_params.init_dbg || !ret)</div><div class='del'>-		iwl_mvm_stop_device(mvm);</div><div class='add'>+	iwl_mvm_stop_device(mvm);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+	wiphy_unlock(mvm-&gt;hw-&gt;wiphy);</div><div class='add'>+	rtnl_unlock();</div><div class='ctx'> </div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	if (ret)</div><div class='ctx'> 		IWL_ERR(mvm, "Failed to run INIT ucode: %d\n", ret);</div><div class='ctx'> </div><div class='add'>+	/* no longer need this regardless of failure or not */</div><div class='add'>+	mvm-&gt;fw_product_reset = false;</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_mvm_start_post_nvm(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='add'>+	struct iwl_mvm_csme_conn_info *csme_conn_info __maybe_unused;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_toggle_tx_ant(mvm, &amp;mvm-&gt;mgmt_last_antenna_idx);</div><div class='hunk'>@@ -676,51 +895,345 @@ static int iwl_mvm_start_post_nvm(struct iwl_mvm *mvm)</div><div class='ctx'> 	ret = iwl_mvm_mac_setup_register(mvm);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='add'>+</div><div class='ctx'> 	mvm-&gt;hw_registered = true;</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_dbgfs_register(mvm);</div><div class='ctx'> </div><div class='add'>+	wiphy_rfkill_set_hw_state_reason(mvm-&gt;hw-&gt;wiphy,</div><div class='add'>+					 mvm-&gt;mei_rfkill_blocked,</div><div class='add'>+					 RFKILL_HARD_BLOCK_NOT_OWNER);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_mei_set_sw_rfkill_state(mvm);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct iwl_mvm_frob_txf_data {</div><div class='add'>+	u8 *buf;</div><div class='add'>+	size_t buflen;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_frob_txf_key_iter(struct ieee80211_hw *hw,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      struct ieee80211_sta *sta,</div><div class='add'>+				      struct ieee80211_key_conf *key,</div><div class='add'>+				      void *data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_frob_txf_data *txf = data;</div><div class='add'>+	u8 keylen, match, matchend;</div><div class='add'>+	u8 *keydata;</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	switch (key-&gt;cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+		keydata = key-&gt;key;</div><div class='add'>+		keylen = key-&gt;keylen;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP40:</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP104:</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		/*</div><div class='add'>+		 * WEP has short keys which might show up in the payload,</div><div class='add'>+		 * and then you can deduce the key, so in this case just</div><div class='add'>+		 * remove all FIFO data.</div><div class='add'>+		 * For TKIP, we don't know the phase 2 keys here, so same.</div><div class='add'>+		 */</div><div class='add'>+		memset(txf-&gt;buf, 0xBB, txf-&gt;buflen);</div><div class='add'>+		return;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* scan for key material and clear it out */</div><div class='add'>+	match = 0;</div><div class='add'>+	for (i = 0; i &lt; txf-&gt;buflen; i++) {</div><div class='add'>+		if (txf-&gt;buf[i] != keydata[match]) {</div><div class='add'>+			match = 0;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		match++;</div><div class='add'>+		if (match == keylen) {</div><div class='add'>+			memset(txf-&gt;buf + i - keylen, 0xAA, keylen);</div><div class='add'>+			match = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* we're dealing with a FIFO, so check wrapped around data */</div><div class='add'>+	matchend = match;</div><div class='add'>+	for (i = 0; match &amp;&amp; i &lt; keylen - match; i++) {</div><div class='add'>+		if (txf-&gt;buf[i] != keydata[match])</div><div class='add'>+			break;</div><div class='add'>+		match++;</div><div class='add'>+		if (match == keylen) {</div><div class='add'>+			memset(txf-&gt;buf, 0xAA, i + 1);</div><div class='add'>+			memset(txf-&gt;buf + txf-&gt;buflen - matchend, 0xAA,</div><div class='add'>+			       matchend);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_frob_txf(void *ctx, void *buf, size_t buflen)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_frob_txf_data txf = {</div><div class='add'>+		.buf = buf,</div><div class='add'>+		.buflen = buflen,</div><div class='add'>+	};</div><div class='add'>+	struct iwl_mvm *mvm = ctx;</div><div class='add'>+</div><div class='add'>+	/* embedded key material exists only on old API */</div><div class='add'>+	if (iwl_mvm_has_new_tx_api(mvm))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ieee80211_iter_keys_rcu(mvm-&gt;hw, NULL, iwl_mvm_frob_txf_key_iter, &amp;txf);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_frob_hcmd(void *ctx, void *hcmd, size_t len)</div><div class='add'>+{</div><div class='add'>+	/* we only use wide headers for commands */</div><div class='add'>+	struct iwl_cmd_header_wide *hdr = hcmd;</div><div class='add'>+	unsigned int frob_start = sizeof(*hdr), frob_end = 0;</div><div class='add'>+</div><div class='add'>+	if (len &lt; sizeof(hdr))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* all the commands we care about are in LONG_GROUP */</div><div class='add'>+	if (hdr-&gt;group_id != LONG_GROUP)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (hdr-&gt;cmd) {</div><div class='add'>+	case WEP_KEY:</div><div class='add'>+	case WOWLAN_TKIP_PARAM:</div><div class='add'>+	case WOWLAN_KEK_KCK_MATERIAL:</div><div class='add'>+	case ADD_STA_KEY:</div><div class='add'>+		/*</div><div class='add'>+		 * blank out everything here, easier than dealing</div><div class='add'>+		 * with the various versions of the command</div><div class='add'>+		 */</div><div class='add'>+		frob_end = INT_MAX;</div><div class='add'>+		break;</div><div class='add'>+	case MGMT_MCAST_KEY:</div><div class='add'>+		frob_start = offsetof(struct iwl_mvm_mgmt_mcast_key_cmd, igtk);</div><div class='add'>+		BUILD_BUG_ON(offsetof(struct iwl_mvm_mgmt_mcast_key_cmd, igtk) !=</div><div class='add'>+			     offsetof(struct iwl_mvm_mgmt_mcast_key_cmd_v1, igtk));</div><div class='add'>+</div><div class='add'>+		frob_end = offsetofend(struct iwl_mvm_mgmt_mcast_key_cmd, igtk);</div><div class='add'>+		BUILD_BUG_ON(offsetof(struct iwl_mvm_mgmt_mcast_key_cmd, igtk) &lt;</div><div class='add'>+			     offsetof(struct iwl_mvm_mgmt_mcast_key_cmd_v1, igtk));</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (frob_start &gt;= frob_end)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (frob_end &gt; len)</div><div class='add'>+		frob_end = len;</div><div class='add'>+</div><div class='add'>+	memset((u8 *)hcmd + frob_start, 0xAA, frob_end - frob_start);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_frob_mem(void *ctx, u32 mem_addr, void *mem, size_t buflen)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_dump_exclude *excl;</div><div class='add'>+	struct iwl_mvm *mvm = ctx;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	switch (mvm-&gt;fwrt.cur_fw_img) {</div><div class='add'>+	case IWL_UCODE_INIT:</div><div class='add'>+	default:</div><div class='add'>+		/* not relevant */</div><div class='add'>+		return;</div><div class='add'>+	case IWL_UCODE_REGULAR:</div><div class='add'>+	case IWL_UCODE_REGULAR_USNIFFER:</div><div class='add'>+		excl = mvm-&gt;fw-&gt;dump_excl;</div><div class='add'>+		break;</div><div class='add'>+	case IWL_UCODE_WOWLAN:</div><div class='add'>+		excl = mvm-&gt;fw-&gt;dump_excl_wowlan;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(mvm-&gt;fw-&gt;dump_excl) !=</div><div class='add'>+		     sizeof(mvm-&gt;fw-&gt;dump_excl_wowlan));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mvm-&gt;fw-&gt;dump_excl); i++) {</div><div class='add'>+		u32 start, end;</div><div class='add'>+</div><div class='add'>+		if (!excl[i].addr || !excl[i].size)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		start = excl[i].addr;</div><div class='add'>+		end = start + excl[i].size;</div><div class='add'>+</div><div class='add'>+		if (end &lt;= mem_addr || start &gt;= mem_addr + buflen)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (start &lt; mem_addr)</div><div class='add'>+			start = mem_addr;</div><div class='add'>+</div><div class='add'>+		if (end &gt; mem_addr + buflen)</div><div class='add'>+			end = mem_addr + buflen;</div><div class='add'>+</div><div class='add'>+		memset((u8 *)mem + start - mem_addr, 0xAA, end - start);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iwl_dump_sanitize_ops iwl_mvm_sanitize_ops = {</div><div class='add'>+	.frob_txf = iwl_mvm_frob_txf,</div><div class='add'>+	.frob_hcmd = iwl_mvm_frob_hcmd,</div><div class='add'>+	.frob_mem = iwl_mvm_frob_mem,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_me_conn_status(void *priv, const struct iwl_mei_conn_info *conn_info)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = priv;</div><div class='add'>+	struct iwl_mvm_csme_conn_info *prev_conn_info, *curr_conn_info;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This is protected by the guarantee that this function will not be</div><div class='add'>+	 * called twice on two different threads</div><div class='add'>+	 */</div><div class='add'>+	prev_conn_info = rcu_dereference_protected(mvm-&gt;csme_conn_info, true);</div><div class='add'>+</div><div class='add'>+	curr_conn_info = kzalloc(sizeof(*curr_conn_info), GFP_KERNEL);</div><div class='add'>+	if (!curr_conn_info)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	curr_conn_info-&gt;conn_info = *conn_info;</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(mvm-&gt;csme_conn_info, curr_conn_info);</div><div class='add'>+</div><div class='add'>+	if (prev_conn_info)</div><div class='add'>+		kfree_rcu(prev_conn_info, rcu_head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_mei_rfkill(void *priv, bool blocked,</div><div class='add'>+			       bool csme_taking_ownership)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = priv;</div><div class='add'>+</div><div class='add'>+	if (blocked &amp;&amp; !csme_taking_ownership)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mvm-&gt;mei_rfkill_blocked = blocked;</div><div class='add'>+	if (!mvm-&gt;hw_registered)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	wiphy_rfkill_set_hw_state_reason(mvm-&gt;hw-&gt;wiphy,</div><div class='add'>+					 mvm-&gt;mei_rfkill_blocked,</div><div class='add'>+					 RFKILL_HARD_BLOCK_NOT_OWNER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_mei_roaming_forbidden(void *priv, bool forbidden)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = priv;</div><div class='add'>+</div><div class='add'>+	if (!mvm-&gt;hw_registered || !mvm-&gt;csme_vif)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_send_roaming_forbidden_event(mvm, mvm-&gt;csme_vif, forbidden);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_sap_connected_wk(struct work_struct *wk)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm =</div><div class='add'>+		container_of(wk, struct iwl_mvm, sap_connected_wk);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_start_get_nvm(mvm);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_start_post_nvm(mvm);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	IWL_ERR(mvm, "Couldn't get started...\n");</div><div class='add'>+	iwl_mei_start_unregister();</div><div class='add'>+	iwl_mei_unregister_complete();</div><div class='add'>+	iwl_fw_flush_dumps(&amp;mvm-&gt;fwrt);</div><div class='add'>+	iwl_mvm_thermal_exit(mvm);</div><div class='add'>+	iwl_fw_runtime_free(&amp;mvm-&gt;fwrt);</div><div class='add'>+	iwl_phy_db_free(mvm-&gt;phy_db);</div><div class='add'>+	kfree(mvm-&gt;scan_cmd);</div><div class='add'>+	iwl_trans_op_mode_leave(mvm-&gt;trans);</div><div class='add'>+	kfree(mvm-&gt;nvm_data);</div><div class='add'>+	kfree(mvm-&gt;mei_nvm_data);</div><div class='add'>+</div><div class='add'>+	ieee80211_free_hw(mvm-&gt;hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_mei_sap_connected(void *priv)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = priv;</div><div class='add'>+</div><div class='add'>+	if (!mvm-&gt;hw_registered)</div><div class='add'>+		schedule_work(&amp;mvm-&gt;sap_connected_wk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_mei_nic_stolen(void *priv)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = priv;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	cfg80211_shutdown_all_interfaces(mvm-&gt;hw-&gt;wiphy);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iwl_mei_ops mei_ops = {</div><div class='add'>+	.me_conn_status = iwl_mvm_me_conn_status,</div><div class='add'>+	.rfkill = iwl_mvm_mei_rfkill,</div><div class='add'>+	.roaming_forbidden = iwl_mvm_mei_roaming_forbidden,</div><div class='add'>+	.sap_connected = iwl_mvm_mei_sap_connected,</div><div class='add'>+	.nic_stolen = iwl_mvm_mei_nic_stolen,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct iwl_op_mode *</div><div class='del'>-iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='add'>+iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_rf_cfg *cfg,</div><div class='ctx'> 		      const struct iwl_fw *fw, struct dentry *dbgfs_dir)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hw *hw;</div><div class='ctx'> 	struct iwl_op_mode *op_mode;</div><div class='ctx'> 	struct iwl_mvm *mvm;</div><div class='del'>-	struct iwl_trans_config trans_cfg = {};</div><div class='ctx'> 	static const u8 no_reclaim_cmds[] = {</div><div class='ctx'> 		TX_CMD,</div><div class='ctx'> 	};</div><div class='del'>-	int err, scan_size;</div><div class='add'>+	u32 max_agg;</div><div class='add'>+	size_t scan_size;</div><div class='ctx'> 	u32 min_backoff;</div><div class='del'>-	enum iwl_amsdu_size rb_size_default;</div><div class='add'>+	struct iwl_mvm_csme_conn_info *csme_conn_info __maybe_unused;</div><div class='add'>+	int ratecheck;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * We use IWL_MVM_STATION_COUNT_MAX to check the validity of the station</div><div class='add'>+	 * We use IWL_STATION_COUNT_MAX to check the validity of the station</div><div class='ctx'> 	 * index all over the driver - check that its value corresponds to the</div><div class='ctx'> 	 * array size.</div><div class='ctx'> 	 */</div><div class='ctx'> 	BUILD_BUG_ON(ARRAY_SIZE(mvm-&gt;fw_id_to_mac_id) !=</div><div class='del'>-		     IWL_MVM_STATION_COUNT_MAX);</div><div class='add'>+		     IWL_STATION_COUNT_MAX);</div><div class='ctx'> </div><div class='ctx'> 	/********************************</div><div class='ctx'> 	 * 1. Allocating and configuring HW data</div><div class='ctx'> 	 ********************************/</div><div class='ctx'> 	hw = ieee80211_alloc_hw(sizeof(struct iwl_op_mode) +</div><div class='ctx'> 				sizeof(struct iwl_mvm),</div><div class='add'>+				iwl_mvm_has_mld_api(fw) ? &amp;iwl_mvm_mld_hw_ops :</div><div class='ctx'> 				&amp;iwl_mvm_hw_ops);</div><div class='ctx'> 	if (!hw)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	hw-&gt;max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	if (cfg-&gt;max_tx_agg_size)</div><div class='del'>-		hw-&gt;max_tx_aggregation_subframes = cfg-&gt;max_tx_agg_size;</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ)</div><div class='add'>+		max_agg = 512;</div><div class='ctx'> 	else</div><div class='del'>-		hw-&gt;max_tx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF;</div><div class='add'>+		max_agg = IEEE80211_MAX_AMPDU_BUF_HE;</div><div class='add'>+</div><div class='add'>+	hw-&gt;max_rx_aggregation_subframes = max_agg;</div><div class='ctx'> </div><div class='ctx'> 	op_mode = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -732,32 +1245,92 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='ctx'> 	mvm-&gt;hw = hw;</div><div class='ctx'> </div><div class='ctx'> 	iwl_fw_runtime_init(&amp;mvm-&gt;fwrt, trans, fw, &amp;iwl_mvm_fwrt_ops, mvm,</div><div class='del'>-			    dbgfs_dir);</div><div class='add'>+			    &amp;iwl_mvm_sanitize_ops, mvm, dbgfs_dir);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_get_bios_tables(mvm);</div><div class='add'>+	iwl_uefi_get_sgom_table(trans, &amp;mvm-&gt;fwrt);</div><div class='add'>+	iwl_uefi_get_step_table(trans);</div><div class='add'>+	iwl_bios_setup_step(trans, &amp;mvm-&gt;fwrt);</div><div class='ctx'> </div><div class='ctx'> 	mvm-&gt;init_status = 0;</div><div class='ctx'> </div><div class='add'>+	/* start with v1 rates */</div><div class='add'>+	mvm-&gt;fw_rates_ver = 1;</div><div class='add'>+</div><div class='add'>+	/* check for rates version 2 */</div><div class='add'>+	ratecheck =</div><div class='add'>+		(iwl_fw_lookup_cmd_ver(mvm-&gt;fw, TX_CMD, 0) &gt;= 8) +</div><div class='add'>+		(iwl_fw_lookup_notif_ver(mvm-&gt;fw, DATA_PATH_GROUP,</div><div class='add'>+					 TLC_MNG_UPDATE_NOTIF, 0) &gt;= 3) +</div><div class='add'>+		(iwl_fw_lookup_notif_ver(mvm-&gt;fw, LEGACY_GROUP,</div><div class='add'>+					 REPLY_RX_MPDU_CMD, 0) &gt;= 4) +</div><div class='add'>+		(iwl_fw_lookup_notif_ver(mvm-&gt;fw, LONG_GROUP, TX_CMD, 0) &gt;= 6);</div><div class='add'>+	if (ratecheck != 0 &amp;&amp; ratecheck != 4) {</div><div class='add'>+		IWL_ERR(mvm, "Firmware has inconsistent rates\n");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+	if (ratecheck == 4)</div><div class='add'>+		mvm-&gt;fw_rates_ver = 2;</div><div class='add'>+</div><div class='add'>+	/* check for rates version 3 */</div><div class='add'>+	ratecheck =</div><div class='add'>+		(iwl_fw_lookup_cmd_ver(mvm-&gt;fw, TX_CMD, 0) &gt;= 11) +</div><div class='add'>+		(iwl_fw_lookup_notif_ver(mvm-&gt;fw, DATA_PATH_GROUP,</div><div class='add'>+					 TLC_MNG_UPDATE_NOTIF, 0) &gt;= 4) +</div><div class='add'>+		(iwl_fw_lookup_notif_ver(mvm-&gt;fw, LEGACY_GROUP,</div><div class='add'>+					 REPLY_RX_MPDU_CMD, 0) &gt;= 6) +</div><div class='add'>+		(iwl_fw_lookup_notif_ver(mvm-&gt;fw, DATA_PATH_GROUP,</div><div class='add'>+					 RX_NO_DATA_NOTIF, 0) &gt;= 4) +</div><div class='add'>+		(iwl_fw_lookup_notif_ver(mvm-&gt;fw, LONG_GROUP, TX_CMD, 0) &gt;= 9);</div><div class='add'>+	if (ratecheck != 0 &amp;&amp; ratecheck != 5) {</div><div class='add'>+		IWL_ERR(mvm, "Firmware has inconsistent rates\n");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+	if (ratecheck == 5)</div><div class='add'>+		mvm-&gt;fw_rates_ver = 3;</div><div class='add'>+</div><div class='add'>+	trans-&gt;conf.rx_mpdu_cmd = REPLY_RX_MPDU_CMD;</div><div class='add'>+</div><div class='ctx'> 	if (iwl_mvm_has_new_rx_api(mvm)) {</div><div class='ctx'> 		op_mode-&gt;ops = &amp;iwl_mvm_ops_mq;</div><div class='del'>-		trans-&gt;rx_mpdu_cmd_hdr_size =</div><div class='del'>-			(trans-&gt;trans_cfg-&gt;device_family &gt;=</div><div class='add'>+		trans-&gt;conf.rx_mpdu_cmd_hdr_size =</div><div class='add'>+			(trans-&gt;mac_cfg-&gt;device_family &gt;=</div><div class='ctx'> 			 IWL_DEVICE_FAMILY_AX210) ?</div><div class='ctx'> 			sizeof(struct iwl_rx_mpdu_desc) :</div><div class='ctx'> 			IWL_RX_DESC_SIZE_V1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		op_mode-&gt;ops = &amp;iwl_mvm_ops;</div><div class='del'>-		trans-&gt;rx_mpdu_cmd_hdr_size =</div><div class='add'>+		trans-&gt;conf.rx_mpdu_cmd_hdr_size =</div><div class='ctx'> 			sizeof(struct iwl_rx_mpdu_res_start);</div><div class='ctx'> </div><div class='del'>-		if (WARN_ON(trans-&gt;num_rx_queues &gt; 1))</div><div class='add'>+		if (WARN_ON(trans-&gt;info.num_rxqs &gt; 1)) {</div><div class='add'>+			err = -EINVAL;</div><div class='ctx'> 			goto out_free;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mvm-&gt;fw_restart = iwlwifi_mod_params.fw_restart ? -1 : 0;</div><div class='del'>-</div><div class='del'>-	mvm-&gt;aux_queue = IWL_MVM_DQA_AUX_QUEUE;</div><div class='del'>-	mvm-&gt;snif_queue = IWL_MVM_DQA_INJECT_MONITOR_QUEUE;</div><div class='del'>-	mvm-&gt;probe_queue = IWL_MVM_DQA_AP_PROBE_RESP_QUEUE;</div><div class='del'>-	mvm-&gt;p2p_dev_queue = IWL_MVM_DQA_P2P_DEVICE_QUEUE;</div><div class='add'>+	if (iwl_mvm_has_new_tx_api(mvm)) {</div><div class='add'>+		/*</div><div class='add'>+		 * If we have the new TX/queue allocation API initialize them</div><div class='add'>+		 * all to invalid numbers. We'll rewrite the ones that we need</div><div class='add'>+		 * later, but that doesn't happen for all of them all of the</div><div class='add'>+		 * time (e.g. P2P Device is optional), and if a dynamic queue</div><div class='add'>+		 * ends up getting number 2 (IWL_MVM_DQA_P2P_DEVICE_QUEUE) then</div><div class='add'>+		 * iwl_mvm_is_static_queue() erroneously returns true, and we</div><div class='add'>+		 * might have things getting stuck.</div><div class='add'>+		 */</div><div class='add'>+		mvm-&gt;aux_queue = IWL_MVM_INVALID_QUEUE;</div><div class='add'>+		mvm-&gt;snif_queue = IWL_MVM_INVALID_QUEUE;</div><div class='add'>+		mvm-&gt;probe_queue = IWL_MVM_INVALID_QUEUE;</div><div class='add'>+		mvm-&gt;p2p_dev_queue = IWL_MVM_INVALID_QUEUE;</div><div class='add'>+	} else {</div><div class='add'>+		mvm-&gt;aux_queue = IWL_MVM_DQA_AUX_QUEUE;</div><div class='add'>+		mvm-&gt;snif_queue = IWL_MVM_DQA_INJECT_MONITOR_QUEUE;</div><div class='add'>+		mvm-&gt;probe_queue = IWL_MVM_DQA_AP_PROBE_RESP_QUEUE;</div><div class='add'>+		mvm-&gt;p2p_dev_queue = IWL_MVM_DQA_P2P_DEVICE_QUEUE;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mvm-&gt;sf_state = SF_UNINIT;</div><div class='ctx'> 	if (iwl_mvm_has_unified_ucode(mvm))</div><div class='hunk'>@@ -778,10 +1351,15 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='ctx'> </div><div class='ctx'> 	INIT_WORK(&amp;mvm-&gt;async_handlers_wk, iwl_mvm_async_handlers_wk);</div><div class='ctx'> 	INIT_WORK(&amp;mvm-&gt;roc_done_wk, iwl_mvm_roc_done_wk);</div><div class='add'>+	INIT_WORK(&amp;mvm-&gt;sap_connected_wk, iwl_mvm_sap_connected_wk);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;mvm-&gt;tdls_cs.dwork, iwl_mvm_tdls_ch_switch_work);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;mvm-&gt;scan_timeout_dwork, iwl_mvm_scan_timeout_wk);</div><div class='ctx'> 	INIT_WORK(&amp;mvm-&gt;add_stream_wk, iwl_mvm_add_new_dqa_stream_wk);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;mvm-&gt;add_stream_txqs);</div><div class='add'>+	spin_lock_init(&amp;mvm-&gt;add_stream_lock);</div><div class='add'>+</div><div class='add'>+	wiphy_work_init(&amp;mvm-&gt;async_handlers_wiphy_wk,</div><div class='add'>+			iwl_mvm_async_handlers_wiphy_wk);</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_head(&amp;mvm-&gt;rx_sync_waitq);</div><div class='ctx'> </div><div class='hunk'>@@ -797,89 +1375,62 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='ctx'> </div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;mvm-&gt;cs_tx_unblock_dwork, iwl_mvm_tx_unblock_dwork);</div><div class='ctx'> </div><div class='del'>-	mvm-&gt;cmd_ver.d0i3_resp =</div><div class='del'>-		iwl_fw_lookup_notif_ver(mvm-&gt;fw, LEGACY_GROUP, D0I3_END_CMD,</div><div class='del'>-					0);</div><div class='del'>-	/* we only support version 1 */</div><div class='del'>-	if (WARN_ON_ONCE(mvm-&gt;cmd_ver.d0i3_resp &gt; 1))</div><div class='del'>-		goto out_free;</div><div class='del'>-</div><div class='ctx'> 	mvm-&gt;cmd_ver.range_resp =</div><div class='ctx'> 		iwl_fw_lookup_notif_ver(mvm-&gt;fw, LOCATION_GROUP,</div><div class='ctx'> 					TOF_RANGE_RESPONSE_NOTIF, 5);</div><div class='del'>-	/* we only support up to version 8 */</div><div class='del'>-	if (WARN_ON_ONCE(mvm-&gt;cmd_ver.range_resp &gt; 8))</div><div class='add'>+	/* we only support up to version 9 */</div><div class='add'>+	if (WARN_ON_ONCE(mvm-&gt;cmd_ver.range_resp &gt; 9)) {</div><div class='add'>+		err = -EINVAL;</div><div class='ctx'> 		goto out_free;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Populate the state variables that the transport layer needs</div><div class='ctx'> 	 * to know about.</div><div class='ctx'> 	 */</div><div class='del'>-	trans_cfg.op_mode = op_mode;</div><div class='del'>-	trans_cfg.no_reclaim_cmds = no_reclaim_cmds;</div><div class='del'>-	trans_cfg.n_no_reclaim_cmds = ARRAY_SIZE(no_reclaim_cmds);</div><div class='del'>-</div><div class='del'>-	if (mvm-&gt;trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='del'>-		rb_size_default = IWL_AMSDU_2K;</div><div class='del'>-	else</div><div class='del'>-		rb_size_default = IWL_AMSDU_4K;</div><div class='del'>-</div><div class='del'>-	switch (iwlwifi_mod_params.amsdu_size) {</div><div class='del'>-	case IWL_AMSDU_DEF:</div><div class='del'>-		trans_cfg.rx_buf_size = rb_size_default;</div><div class='del'>-		break;</div><div class='del'>-	case IWL_AMSDU_4K:</div><div class='del'>-		trans_cfg.rx_buf_size = IWL_AMSDU_4K;</div><div class='del'>-		break;</div><div class='del'>-	case IWL_AMSDU_8K:</div><div class='del'>-		trans_cfg.rx_buf_size = IWL_AMSDU_8K;</div><div class='del'>-		break;</div><div class='del'>-	case IWL_AMSDU_12K:</div><div class='del'>-		trans_cfg.rx_buf_size = IWL_AMSDU_12K;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("%s: Unsupported amsdu_size: %d\n", KBUILD_MODNAME,</div><div class='del'>-		       iwlwifi_mod_params.amsdu_size);</div><div class='del'>-		trans_cfg.rx_buf_size = rb_size_default;</div><div class='del'>-	}</div><div class='add'>+	BUILD_BUG_ON(sizeof(no_reclaim_cmds) &gt;</div><div class='add'>+		     sizeof(trans-&gt;conf.no_reclaim_cmds));</div><div class='add'>+	memcpy(trans-&gt;conf.no_reclaim_cmds, no_reclaim_cmds,</div><div class='add'>+	       sizeof(no_reclaim_cmds));</div><div class='add'>+	trans-&gt;conf.n_no_reclaim_cmds = ARRAY_SIZE(no_reclaim_cmds);</div><div class='ctx'> </div><div class='del'>-	trans-&gt;wide_cmd_header = true;</div><div class='del'>-	trans_cfg.bc_table_dword =</div><div class='del'>-		mvm-&gt;trans-&gt;trans_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210;</div><div class='add'>+	trans-&gt;conf.rx_buf_size = iwl_amsdu_size_to_rxb_size();</div><div class='ctx'> </div><div class='del'>-	trans_cfg.command_groups = iwl_mvm_groups;</div><div class='del'>-	trans_cfg.command_groups_size = ARRAY_SIZE(iwl_mvm_groups);</div><div class='add'>+	trans-&gt;conf.wide_cmd_header = true;</div><div class='ctx'> </div><div class='del'>-	trans_cfg.cmd_queue = IWL_MVM_DQA_CMD_QUEUE;</div><div class='del'>-	trans_cfg.cmd_fifo = IWL_MVM_TX_FIFO_CMD;</div><div class='del'>-	trans_cfg.scd_set_active = true;</div><div class='add'>+	trans-&gt;conf.command_groups = iwl_mvm_groups;</div><div class='add'>+	trans-&gt;conf.command_groups_size = ARRAY_SIZE(iwl_mvm_groups);</div><div class='ctx'> </div><div class='del'>-	trans_cfg.cb_data_offs = offsetof(struct ieee80211_tx_info,</div><div class='del'>-					  driver_data[2]);</div><div class='add'>+	trans-&gt;conf.cmd_queue = IWL_MVM_DQA_CMD_QUEUE;</div><div class='add'>+	trans-&gt;conf.cmd_fifo = IWL_MVM_TX_FIFO_CMD;</div><div class='add'>+	trans-&gt;conf.scd_set_active = true;</div><div class='ctx'> </div><div class='del'>-	/* Set a short watchdog for the command queue */</div><div class='del'>-	trans_cfg.cmd_q_wdg_timeout =</div><div class='del'>-		iwl_mvm_get_wd_timeout(mvm, NULL, false, true);</div><div class='add'>+	trans-&gt;conf.cb_data_offs = offsetof(struct ieee80211_tx_info,</div><div class='add'>+					    driver_data[2]);</div><div class='ctx'> </div><div class='ctx'> 	snprintf(mvm-&gt;hw-&gt;wiphy-&gt;fw_version,</div><div class='ctx'> 		 sizeof(mvm-&gt;hw-&gt;wiphy-&gt;fw_version),</div><div class='del'>-		 "%s", fw-&gt;fw_version);</div><div class='add'>+		 "%.31s", fw-&gt;fw_version);</div><div class='add'>+</div><div class='add'>+	trans-&gt;conf.fw_reset_handshake =</div><div class='add'>+		fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			    IWL_UCODE_TLV_CAPA_FW_RESET_HANDSHAKE);</div><div class='ctx'> </div><div class='del'>-	trans_cfg.fw_reset_handshake = fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='del'>-						   IWL_UCODE_TLV_CAPA_FW_RESET_HANDSHAKE);</div><div class='add'>+	trans-&gt;conf.queue_alloc_cmd_ver =</div><div class='add'>+		iwl_fw_lookup_cmd_ver(mvm-&gt;fw,</div><div class='add'>+				      WIDE_ID(DATA_PATH_GROUP,</div><div class='add'>+					      SCD_QUEUE_CONFIG_CMD),</div><div class='add'>+				      0);</div><div class='add'>+	mvm-&gt;sta_remove_requires_queue_remove =</div><div class='add'>+		trans-&gt;conf.queue_alloc_cmd_ver &gt; 0;</div><div class='add'>+</div><div class='add'>+	mvm-&gt;mld_api_is_used = iwl_mvm_has_mld_api(mvm-&gt;fw);</div><div class='ctx'> </div><div class='ctx'> 	/* Configure transport layer */</div><div class='del'>-	iwl_trans_configure(mvm-&gt;trans, &amp;trans_cfg);</div><div class='add'>+	iwl_trans_op_mode_enter(mvm-&gt;trans, op_mode);</div><div class='ctx'> </div><div class='del'>-	trans-&gt;rx_mpdu_cmd = REPLY_RX_MPDU_CMD;</div><div class='ctx'> 	trans-&gt;dbg.dest_tlv = mvm-&gt;fw-&gt;dbg.dest_tlv;</div><div class='ctx'> 	trans-&gt;dbg.n_dest_reg = mvm-&gt;fw-&gt;dbg.n_dest_reg;</div><div class='del'>-	memcpy(trans-&gt;dbg.conf_tlv, mvm-&gt;fw-&gt;dbg.conf_tlv,</div><div class='del'>-	       sizeof(trans-&gt;dbg.conf_tlv));</div><div class='del'>-	trans-&gt;dbg.trigger_tlv = mvm-&gt;fw-&gt;dbg.trigger_tlv;</div><div class='del'>-</div><div class='del'>-	trans-&gt;iml = mvm-&gt;fw-&gt;iml;</div><div class='del'>-	trans-&gt;iml_len = mvm-&gt;fw-&gt;iml_len;</div><div class='ctx'> </div><div class='ctx'> 	/* set up notification wait support */</div><div class='ctx'> 	iwl_notification_wait_init(&amp;mvm-&gt;notif_wait);</div><div class='hunk'>@@ -888,31 +1439,28 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='ctx'> 	mvm-&gt;phy_db = iwl_phy_db_init(trans);</div><div class='ctx'> 	if (!mvm-&gt;phy_db) {</div><div class='ctx'> 		IWL_ERR(mvm, "Cannot init phy_db\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	IWL_INFO(mvm, "Detected %s, REV=0x%X\n",</div><div class='del'>-		 mvm-&gt;trans-&gt;name, mvm-&gt;trans-&gt;hw_rev);</div><div class='del'>-</div><div class='ctx'> 	if (iwlwifi_mod_params.nvm_file)</div><div class='ctx'> 		mvm-&gt;nvm_file_name = iwlwifi_mod_params.nvm_file;</div><div class='ctx'> 	else</div><div class='ctx'> 		IWL_DEBUG_EEPROM(mvm-&gt;trans-&gt;dev,</div><div class='ctx'> 				 "working without external nvm file\n");</div><div class='ctx'> </div><div class='del'>-	err = iwl_trans_start_hw(mvm-&gt;trans);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_free;</div><div class='del'>-</div><div class='ctx'> 	scan_size = iwl_mvm_scan_size(mvm);</div><div class='ctx'> </div><div class='ctx'> 	mvm-&gt;scan_cmd = kmalloc(scan_size, GFP_KERNEL);</div><div class='del'>-	if (!mvm-&gt;scan_cmd)</div><div class='add'>+	if (!mvm-&gt;scan_cmd) {</div><div class='add'>+		err = -ENOMEM;</div><div class='ctx'> 		goto out_free;</div><div class='add'>+	}</div><div class='add'>+	mvm-&gt;scan_cmd_size = scan_size;</div><div class='ctx'> </div><div class='ctx'> 	/* invalidate ids to prevent accidental removal of sta_id 0 */</div><div class='del'>-	mvm-&gt;aux_sta.sta_id = IWL_MVM_INVALID_STA;</div><div class='del'>-	mvm-&gt;snif_sta.sta_id = IWL_MVM_INVALID_STA;</div><div class='add'>+	mvm-&gt;aux_sta.sta_id = IWL_INVALID_STA;</div><div class='add'>+	mvm-&gt;snif_sta.sta_id = IWL_INVALID_STA;</div><div class='ctx'> </div><div class='ctx'> 	/* Set EBS as successful as long as not stated otherwise by the FW. */</div><div class='ctx'> 	mvm-&gt;last_ebs_successful = true;</div><div class='hunk'>@@ -926,30 +1474,52 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,</div><div class='ctx'> 	else</div><div class='ctx'> 		memset(&amp;mvm-&gt;rx_stats, 0, sizeof(struct mvm_statistics_rx));</div><div class='ctx'> </div><div class='add'>+	iwl_mvm_ftm_initiator_smooth_config(mvm);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_init_time_sync(&amp;mvm-&gt;time_sync);</div><div class='add'>+</div><div class='ctx'> 	mvm-&gt;debugfs_dir = dbgfs_dir;</div><div class='ctx'> </div><div class='del'>-	if (iwl_mvm_start_get_nvm(mvm))</div><div class='add'>+	mvm-&gt;mei_registered = !iwl_mei_register(mvm, &amp;mei_ops);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_mei_scan_filter_init(&amp;mvm-&gt;mei_scan_filter);</div><div class='add'>+</div><div class='add'>+	err = iwl_mvm_start_get_nvm(mvm);</div><div class='add'>+	if (err) {</div><div class='add'>+		/*</div><div class='add'>+		 * Getting NVM failed while CSME is the owner, but we are</div><div class='add'>+		 * registered to MEI, we'll get the NVM later when it'll be</div><div class='add'>+		 * possible to get it from CSME.</div><div class='add'>+		 */</div><div class='add'>+		if (trans-&gt;csme_own &amp;&amp; mvm-&gt;mei_registered)</div><div class='add'>+			return op_mode;</div><div class='add'>+</div><div class='ctx'> 		goto out_thermal_exit;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (iwl_mvm_start_post_nvm(mvm))</div><div class='add'>+</div><div class='add'>+	err = iwl_mvm_start_post_nvm(mvm);</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto out_thermal_exit;</div><div class='ctx'> </div><div class='ctx'> 	return op_mode;</div><div class='ctx'> </div><div class='ctx'>  out_thermal_exit:</div><div class='ctx'> 	iwl_mvm_thermal_exit(mvm);</div><div class='add'>+	if (mvm-&gt;mei_registered) {</div><div class='add'>+		iwl_mei_start_unregister();</div><div class='add'>+		iwl_mei_unregister_complete();</div><div class='add'>+	}</div><div class='ctx'>  out_free:</div><div class='ctx'> 	iwl_fw_flush_dumps(&amp;mvm-&gt;fwrt);</div><div class='ctx'> 	iwl_fw_runtime_free(&amp;mvm-&gt;fwrt);</div><div class='ctx'> </div><div class='del'>-	if (iwlmvm_mod_params.init_dbg)</div><div class='del'>-		return op_mode;</div><div class='ctx'> 	iwl_phy_db_free(mvm-&gt;phy_db);</div><div class='ctx'> 	kfree(mvm-&gt;scan_cmd);</div><div class='ctx'> 	iwl_trans_op_mode_leave(trans);</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_free_hw(mvm-&gt;hw);</div><div class='del'>-	return NULL;</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_stop_device(struct iwl_mvm *mvm)</div><div class='hunk'>@@ -960,10 +1530,13 @@ void iwl_mvm_stop_device(struct iwl_mvm *mvm)</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(IWL_MVM_STATUS_FIRMWARE_RUNNING, &amp;mvm-&gt;status);</div><div class='ctx'> </div><div class='add'>+	iwl_mvm_pause_tcm(mvm, false);</div><div class='add'>+</div><div class='ctx'> 	iwl_fw_dbg_stop_sync(&amp;mvm-&gt;fwrt);</div><div class='ctx'> 	iwl_trans_stop_device(mvm-&gt;trans);</div><div class='ctx'> 	iwl_free_fw_paging(&amp;mvm-&gt;fwrt);</div><div class='ctx'> 	iwl_fw_dump_conf_clear(&amp;mvm-&gt;fwrt);</div><div class='add'>+	iwl_mvm_mei_device_state(mvm, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_op_mode_mvm_stop(struct iwl_op_mode *op_mode)</div><div class='hunk'>@@ -971,11 +1544,33 @@ static void iwl_op_mode_mvm_stop(struct iwl_op_mode *op_mode)</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (mvm-&gt;mei_registered) {</div><div class='add'>+		rtnl_lock();</div><div class='add'>+		iwl_mei_set_netdev(NULL);</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+		iwl_mei_start_unregister();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * After we unregister from mei, the worker can't be scheduled</div><div class='add'>+	 * anymore.</div><div class='add'>+	 */</div><div class='add'>+	cancel_work_sync(&amp;mvm-&gt;sap_connected_wk);</div><div class='add'>+</div><div class='ctx'> 	iwl_mvm_leds_exit(mvm);</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_thermal_exit(mvm);</div><div class='ctx'> </div><div class='del'>-	ieee80211_unregister_hw(mvm-&gt;hw);</div><div class='add'>+	/*</div><div class='add'>+	 * If we couldn't get ownership on the device and we couldn't</div><div class='add'>+	 * get the NVM from CSME, we haven't registered to mac80211.</div><div class='add'>+	 * In that case, we didn't fail op_mode_start, because we are</div><div class='add'>+	 * waiting for CSME to allow us to get the NVM to register to</div><div class='add'>+	 * mac80211. If that didn't happen, we haven't registered to</div><div class='add'>+	 * mac80211, hence the if below.</div><div class='add'>+	 */</div><div class='add'>+	if (mvm-&gt;hw_registered)</div><div class='add'>+		ieee80211_unregister_hw(mvm-&gt;hw);</div><div class='ctx'> </div><div class='ctx'> 	kfree(mvm-&gt;scan_cmd);</div><div class='ctx'> 	kfree(mvm-&gt;mcast_filter_cmd);</div><div class='hunk'>@@ -984,20 +1579,29 @@ static void iwl_op_mode_mvm_stop(struct iwl_op_mode *op_mode)</div><div class='ctx'> 	kfree(mvm-&gt;error_recovery_buf);</div><div class='ctx'> 	mvm-&gt;error_recovery_buf = NULL;</div><div class='ctx'> </div><div class='add'>+	iwl_mvm_ptp_remove(mvm);</div><div class='add'>+</div><div class='ctx'> 	iwl_trans_op_mode_leave(mvm-&gt;trans);</div><div class='ctx'> </div><div class='ctx'> 	iwl_phy_db_free(mvm-&gt;phy_db);</div><div class='ctx'> 	mvm-&gt;phy_db = NULL;</div><div class='ctx'> </div><div class='ctx'> 	kfree(mvm-&gt;nvm_data);</div><div class='add'>+	kfree(mvm-&gt;mei_nvm_data);</div><div class='add'>+	kfree(rcu_access_pointer(mvm-&gt;csme_conn_info));</div><div class='add'>+	kfree(mvm-&gt;temp_nvm_data);</div><div class='ctx'> 	for (i = 0; i &lt; NVM_MAX_NUM_SECTIONS; i++)</div><div class='ctx'> 		kfree(mvm-&gt;nvm_sections[i].data);</div><div class='add'>+	kfree(mvm-&gt;acs_survey);</div><div class='ctx'> </div><div class='ctx'> 	cancel_delayed_work_sync(&amp;mvm-&gt;tcm.work);</div><div class='ctx'> </div><div class='ctx'> 	iwl_fw_runtime_free(&amp;mvm-&gt;fwrt);</div><div class='ctx'> 	mutex_destroy(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='add'>+	if (mvm-&gt;mei_registered)</div><div class='add'>+		iwl_mei_unregister_complete();</div><div class='add'>+</div><div class='ctx'> 	ieee80211_free_hw(mvm-&gt;hw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1021,35 +1625,62 @@ void iwl_mvm_async_handlers_purge(struct iwl_mvm *mvm)</div><div class='ctx'> 	spin_unlock_bh(&amp;mvm-&gt;async_handlers_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_async_handlers_wk(struct work_struct *wk)</div><div class='add'>+/*</div><div class='add'>+ * This function receives a bitmap of rx async handler contexts</div><div class='add'>+ * (&amp;iwl_rx_handler_context) to handle, and runs only them</div><div class='add'>+ */</div><div class='add'>+static void iwl_mvm_async_handlers_by_context(struct iwl_mvm *mvm,</div><div class='add'>+					      u8 contexts)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm *mvm =</div><div class='del'>-		container_of(wk, struct iwl_mvm, async_handlers_wk);</div><div class='ctx'> 	struct iwl_async_handler_entry *entry, *tmp;</div><div class='ctx'> 	LIST_HEAD(local_list);</div><div class='ctx'> </div><div class='del'>-	/* Ensure that we are not in stop flow (check iwl_mvm_mac_stop) */</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='del'>-	 * Sync with Rx path with a lock. Remove all the entries from this list,</div><div class='del'>-	 * add them to a local one (lock free), and then handle them.</div><div class='add'>+	 * Sync with Rx path with a lock. Remove all the entries of the</div><div class='add'>+	 * wanted contexts from this list, add them to a local one (lock free),</div><div class='add'>+	 * and then handle them.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock_bh(&amp;mvm-&gt;async_handlers_lock);</div><div class='del'>-	list_splice_init(&amp;mvm-&gt;async_handlers_list, &amp;local_list);</div><div class='add'>+	list_for_each_entry_safe(entry, tmp, &amp;mvm-&gt;async_handlers_list, list) {</div><div class='add'>+		if (!(BIT(entry-&gt;context) &amp; contexts))</div><div class='add'>+			continue;</div><div class='add'>+		list_del(&amp;entry-&gt;list);</div><div class='add'>+		list_add_tail(&amp;entry-&gt;list, &amp;local_list);</div><div class='add'>+	}</div><div class='ctx'> 	spin_unlock_bh(&amp;mvm-&gt;async_handlers_lock);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(entry, tmp, &amp;local_list, list) {</div><div class='del'>-		if (entry-&gt;context == RX_HANDLER_ASYNC_LOCKED)</div><div class='add'>+		if (entry-&gt;context != RX_HANDLER_ASYNC_UNLOCKED)</div><div class='ctx'> 			mutex_lock(&amp;mvm-&gt;mutex);</div><div class='ctx'> 		entry-&gt;fn(mvm, &amp;entry-&gt;rxb);</div><div class='ctx'> 		iwl_free_rxb(&amp;entry-&gt;rxb);</div><div class='ctx'> 		list_del(&amp;entry-&gt;list);</div><div class='del'>-		if (entry-&gt;context == RX_HANDLER_ASYNC_LOCKED)</div><div class='add'>+		if (entry-&gt;context != RX_HANDLER_ASYNC_UNLOCKED)</div><div class='ctx'> 			mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> 		kfree(entry);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void iwl_mvm_async_handlers_wiphy_wk(struct wiphy *wiphy,</div><div class='add'>+					    struct wiphy_work *wk)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm =</div><div class='add'>+		container_of(wk, struct iwl_mvm, async_handlers_wiphy_wk);</div><div class='add'>+	u8 contexts = BIT(RX_HANDLER_ASYNC_LOCKED_WIPHY);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_async_handlers_by_context(mvm, contexts);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_async_handlers_wk(struct work_struct *wk)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm =</div><div class='add'>+		container_of(wk, struct iwl_mvm, async_handlers_wk);</div><div class='add'>+	u8 contexts = BIT(RX_HANDLER_ASYNC_LOCKED) |</div><div class='add'>+		      BIT(RX_HANDLER_ASYNC_UNLOCKED);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_async_handlers_by_context(mvm, contexts);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void iwl_mvm_rx_check_trigger(struct iwl_mvm *mvm,</div><div class='ctx'> 					    struct iwl_rx_packet *pkt)</div><div class='ctx'> {</div><div class='hunk'>@@ -1106,7 +1737,9 @@ static void iwl_mvm_rx_common(struct iwl_mvm *mvm,</div><div class='ctx'> 		if (rx_h-&gt;cmd_id != WIDE_ID(pkt-&gt;hdr.group_id, pkt-&gt;hdr.cmd))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (unlikely(pkt_len &lt; rx_h-&gt;min_size))</div><div class='add'>+		if (IWL_FW_CHECK(mvm, pkt_len &lt; rx_h-&gt;min_size,</div><div class='add'>+				 "unexpected notification 0x%04x size %d, need %d\n",</div><div class='add'>+				 rx_h-&gt;cmd_id, pkt_len, rx_h-&gt;min_size))</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		if (rx_h-&gt;context == RX_HANDLER_SYNC) {</div><div class='hunk'>@@ -1127,7 +1760,11 @@ static void iwl_mvm_rx_common(struct iwl_mvm *mvm,</div><div class='ctx'> 		spin_lock(&amp;mvm-&gt;async_handlers_lock);</div><div class='ctx'> 		list_add_tail(&amp;entry-&gt;list, &amp;mvm-&gt;async_handlers_list);</div><div class='ctx'> 		spin_unlock(&amp;mvm-&gt;async_handlers_lock);</div><div class='del'>-		schedule_work(&amp;mvm-&gt;async_handlers_wk);</div><div class='add'>+		if (rx_h-&gt;context == RX_HANDLER_ASYNC_LOCKED_WIPHY)</div><div class='add'>+			wiphy_work_queue(mvm-&gt;hw-&gt;wiphy,</div><div class='add'>+					 &amp;mvm-&gt;async_handlers_wiphy_wk);</div><div class='add'>+		else</div><div class='add'>+			schedule_work(&amp;mvm-&gt;async_handlers_wk);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1171,18 +1808,6 @@ void iwl_mvm_rx_mq(struct iwl_op_mode *op_mode,</div><div class='ctx'> 		iwl_mvm_rx_common(mvm, rxb, pkt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_async_cb(struct iwl_op_mode *op_mode,</div><div class='del'>-			     const struct iwl_device_cmd *cmd)</div><div class='del'>-{</div><div class='del'>-	struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * For now, we only set the CMD_WANT_ASYNC_CALLBACK for ADD_STA</div><div class='del'>-	 * commands that need to block the Tx queues.</div><div class='del'>-	 */</div><div class='del'>-	iwl_trans_block_txq_ptrs(mvm-&gt;trans, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int iwl_mvm_is_static_queue(struct iwl_mvm *mvm, int queue)</div><div class='ctx'> {</div><div class='ctx'> 	return queue == mvm-&gt;aux_queue || queue == mvm-&gt;probe_queue ||</div><div class='hunk'>@@ -1240,10 +1865,16 @@ static void iwl_mvm_queue_state_change(struct iwl_op_mode *op_mode,</div><div class='ctx'> </div><div class='ctx'> 		txq = sta-&gt;txq[tid];</div><div class='ctx'> 		mvmtxq = iwl_mvm_txq_from_mac80211(txq);</div><div class='del'>-		mvmtxq-&gt;stopped = !start;</div><div class='add'>+		if (start)</div><div class='add'>+			clear_bit(IWL_MVM_TXQ_STATE_STOP_FULL, &amp;mvmtxq-&gt;state);</div><div class='add'>+		else</div><div class='add'>+			set_bit(IWL_MVM_TXQ_STATE_STOP_FULL, &amp;mvmtxq-&gt;state);</div><div class='ctx'> </div><div class='del'>-		if (start &amp;&amp; mvmsta-&gt;sta_state != IEEE80211_STA_NOTEXIST)</div><div class='add'>+		if (start &amp;&amp; mvmsta-&gt;sta_state != IEEE80211_STA_NOTEXIST) {</div><div class='add'>+			local_bh_disable();</div><div class='ctx'> 			iwl_mvm_mac_itxq_xmit(mvm-&gt;hw, txq);</div><div class='add'>+			local_bh_enable();</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -1262,12 +1893,8 @@ static void iwl_mvm_wake_sw_queue(struct iwl_op_mode *op_mode, int hw_queue)</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_set_rfkill_state(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='del'>-	bool state = iwl_mvm_is_radio_killed(mvm);</div><div class='del'>-</div><div class='del'>-	if (state)</div><div class='del'>-		wake_up(&amp;mvm-&gt;rx_sync_waitq);</div><div class='del'>-</div><div class='del'>-	wiphy_rfkill_set_hw_state(mvm-&gt;hw-&gt;wiphy, state);</div><div class='add'>+	wiphy_rfkill_set_hw_state(mvm-&gt;hw-&gt;wiphy,</div><div class='add'>+				  iwl_mvm_is_radio_killed(mvm));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_set_hw_ctkill_state(struct iwl_mvm *mvm, bool state)</div><div class='hunk'>@@ -1280,6 +1907,12 @@ void iwl_mvm_set_hw_ctkill_state(struct iwl_mvm *mvm, bool state)</div><div class='ctx'> 	iwl_mvm_set_rfkill_state(mvm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct iwl_mvm_csme_conn_info *iwl_mvm_get_csme_conn_info(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	return rcu_dereference_protected(mvm-&gt;csme_conn_info,</div><div class='add'>+					 lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool iwl_mvm_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);</div><div class='hunk'>@@ -1321,27 +1954,62 @@ static void iwl_mvm_free_skb(struct iwl_op_mode *op_mode, struct sk_buff *skb)</div><div class='ctx'> 	ieee80211_free_txskb(mvm-&gt;hw, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct iwl_mvm_reprobe {</div><div class='del'>-	struct device *dev;</div><div class='del'>-	struct work_struct work;</div><div class='del'>-};</div><div class='add'>+static void iwl_mvm_nic_error(struct iwl_op_mode *op_mode,</div><div class='add'>+			      enum iwl_fw_error_type type)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);</div><div class='add'>+</div><div class='add'>+	iwl_abort_notification_waits(&amp;mvm-&gt;notif_wait);</div><div class='add'>+	iwl_dbg_tlv_del_timers(mvm-&gt;trans);</div><div class='add'>+</div><div class='add'>+	if (type == IWL_ERR_TYPE_CMD_QUEUE_FULL)</div><div class='add'>+		IWL_ERR(mvm, "Command queue full!\n");</div><div class='add'>+	else if (!iwl_trans_is_dead(mvm-&gt;trans) &amp;&amp;</div><div class='add'>+		 !test_and_clear_bit(IWL_MVM_STATUS_SUPPRESS_ERROR_LOG_ONCE,</div><div class='add'>+				     &amp;mvm-&gt;status))</div><div class='add'>+		iwl_mvm_dump_nic_error_log(mvm);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This should be first thing before trying to collect any</div><div class='add'>+	 * data to avoid endless loops if any HW error happens while</div><div class='add'>+	 * collecting debug data.</div><div class='add'>+	 * It might not actually be true that we'll restart, but the</div><div class='add'>+	 * setting of the bit doesn't matter if we're going to be</div><div class='add'>+	 * unbound either.</div><div class='add'>+	 */</div><div class='add'>+	if (type != IWL_ERR_TYPE_RESET_HS_TIMEOUT)</div><div class='add'>+		set_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &amp;mvm-&gt;status);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_reprobe_wk(struct work_struct *wk)</div><div class='add'>+static void iwl_mvm_dump_error(struct iwl_op_mode *op_mode,</div><div class='add'>+			       struct iwl_fw_error_dump_mode *mode)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm_reprobe *reprobe;</div><div class='del'>-</div><div class='del'>-	reprobe = container_of(wk, struct iwl_mvm_reprobe, work);</div><div class='del'>-	if (device_reprobe(reprobe-&gt;dev))</div><div class='del'>-		dev_err(reprobe-&gt;dev, "reprobe failed!\n");</div><div class='del'>-	put_device(reprobe-&gt;dev);</div><div class='del'>-	kfree(reprobe);</div><div class='del'>-	module_put(THIS_MODULE);</div><div class='add'>+	struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);</div><div class='add'>+</div><div class='add'>+	/* if we come in from opmode we have the mutex held */</div><div class='add'>+	if (mode-&gt;context == IWL_ERR_CONTEXT_FROM_OPMODE) {</div><div class='add'>+		lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+		iwl_fw_error_collect(&amp;mvm-&gt;fwrt);</div><div class='add'>+	} else {</div><div class='add'>+		mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+		if (mode-&gt;context != IWL_ERR_CONTEXT_ABORT)</div><div class='add'>+			iwl_fw_error_collect(&amp;mvm-&gt;fwrt);</div><div class='add'>+		mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error)</div><div class='add'>+static bool iwl_mvm_sw_reset(struct iwl_op_mode *op_mode,</div><div class='add'>+			     enum iwl_fw_error_type type)</div><div class='ctx'> {</div><div class='del'>-	iwl_abort_notification_waits(&amp;mvm-&gt;notif_wait);</div><div class='del'>-	iwl_dbg_tlv_del_timers(mvm-&gt;trans);</div><div class='add'>+	struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the firmware crashes while we're already considering it</div><div class='add'>+	 * to be dead then don't ask for a restart, that cannot do</div><div class='add'>+	 * anything useful anyway.</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(IWL_MVM_STATUS_FIRMWARE_RUNNING, &amp;mvm-&gt;status))</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This is a bit racy, but worst case we tell mac80211 about</div><div class='hunk'>@@ -1356,49 +2024,11 @@ void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error)</div><div class='ctx'> 	iwl_mvm_report_scan_aborted(mvm);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If we're restarting already, don't cycle restarts.</div><div class='ctx'> 	 * If INIT fw asserted, it will likely fail again.</div><div class='ctx'> 	 * If WoWLAN fw asserted, don't restart either, mac80211</div><div class='ctx'> 	 * can't recover this since we're already half suspended.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!mvm-&gt;fw_restart &amp;&amp; fw_error) {</div><div class='del'>-		iwl_fw_error_collect(&amp;mvm-&gt;fwrt);</div><div class='del'>-	} else if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status)) {</div><div class='del'>-		struct iwl_mvm_reprobe *reprobe;</div><div class='del'>-</div><div class='del'>-		IWL_ERR(mvm,</div><div class='del'>-			"Firmware error during reconfiguration - reprobe!\n");</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * get a module reference to avoid doing this while unloading</div><div class='del'>-		 * anyway and to avoid scheduling a work with code that's</div><div class='del'>-		 * being removed.</div><div class='del'>-		 */</div><div class='del'>-		if (!try_module_get(THIS_MODULE)) {</div><div class='del'>-			IWL_ERR(mvm, "Module is being unloaded - abort\n");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		reprobe = kzalloc(sizeof(*reprobe), GFP_ATOMIC);</div><div class='del'>-		if (!reprobe) {</div><div class='del'>-			module_put(THIS_MODULE);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		reprobe-&gt;dev = get_device(mvm-&gt;trans-&gt;dev);</div><div class='del'>-		INIT_WORK(&amp;reprobe-&gt;work, iwl_mvm_reprobe_wk);</div><div class='del'>-		schedule_work(&amp;reprobe-&gt;work);</div><div class='del'>-	} else if (test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED,</div><div class='del'>-			    &amp;mvm-&gt;status)) {</div><div class='del'>-		IWL_ERR(mvm, "HW restart already requested, but not started\n");</div><div class='del'>-	} else if (mvm-&gt;fwrt.cur_fw_img == IWL_UCODE_REGULAR &amp;&amp;</div><div class='del'>-		   mvm-&gt;hw_registered &amp;&amp;</div><div class='del'>-		   !test_bit(STATUS_TRANS_DEAD, &amp;mvm-&gt;trans-&gt;status)) {</div><div class='del'>-		/* This should be first thing before trying to collect any</div><div class='del'>-		 * data to avoid endless loops if any HW error happens while</div><div class='del'>-		 * collecting debug data.</div><div class='del'>-		 */</div><div class='del'>-		set_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &amp;mvm-&gt;status);</div><div class='del'>-</div><div class='add'>+	if (mvm-&gt;fwrt.cur_fw_img == IWL_UCODE_REGULAR &amp;&amp; mvm-&gt;hw_registered) {</div><div class='ctx'> 		if (mvm-&gt;fw-&gt;ucode_capa.error_log_size) {</div><div class='ctx'> 			u32 src_size = mvm-&gt;fw-&gt;ucode_capa.error_log_size;</div><div class='ctx'> 			u32 src_addr = mvm-&gt;fw-&gt;ucode_capa.error_log_addr;</div><div class='hunk'>@@ -1413,55 +2043,71 @@ void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		iwl_fw_error_collect(&amp;mvm-&gt;fwrt);</div><div class='del'>-</div><div class='del'>-		if (fw_error &amp;&amp; mvm-&gt;fw_restart &gt; 0)</div><div class='del'>-			mvm-&gt;fw_restart--;</div><div class='del'>-		ieee80211_restart_hw(mvm-&gt;hw);</div><div class='add'>+		if (mvm-&gt;fwrt.trans-&gt;dbg.restart_required) {</div><div class='add'>+			IWL_DEBUG_INFO(mvm, "FW restart requested after debug collection\n");</div><div class='add'>+			mvm-&gt;fwrt.trans-&gt;dbg.restart_required = false;</div><div class='add'>+			ieee80211_restart_hw(mvm-&gt;hw);</div><div class='add'>+			return true;</div><div class='add'>+		} else if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &lt;= IWL_DEVICE_FAMILY_8000) {</div><div class='add'>+			ieee80211_restart_hw(mvm-&gt;hw);</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_nic_error(struct iwl_op_mode *op_mode)</div><div class='add'>+static void iwl_op_mode_mvm_time_point(struct iwl_op_mode *op_mode,</div><div class='add'>+				       enum iwl_fw_ini_time_point tp_id,</div><div class='add'>+				       union iwl_dbg_tlv_tp_data *tp_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(STATUS_TRANS_DEAD, &amp;mvm-&gt;trans-&gt;status))</div><div class='del'>-		iwl_mvm_dump_nic_error_log(mvm);</div><div class='del'>-</div><div class='del'>-	iwl_mvm_nic_restart(mvm, true);</div><div class='add'>+	iwl_dbg_tlv_time_point(&amp;mvm-&gt;fwrt, tp_id, tp_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_cmd_queue_full(struct iwl_op_mode *op_mode)</div><div class='add'>+static void iwl_mvm_dump(struct iwl_op_mode *op_mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);</div><div class='add'>+	struct iwl_fw_runtime *fwrt = &amp;mvm-&gt;fwrt;</div><div class='add'>+</div><div class='add'>+	if (!iwl_trans_fw_running(fwrt-&gt;trans))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	WARN_ON(1);</div><div class='del'>-	iwl_mvm_nic_restart(mvm, true);</div><div class='add'>+	iwl_dbg_tlv_time_point(fwrt, IWL_FW_INI_TIME_POINT_USER_TRIGGER, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_op_mode_mvm_time_point(struct iwl_op_mode *op_mode,</div><div class='del'>-				       enum iwl_fw_ini_time_point tp_id,</div><div class='del'>-				       union iwl_dbg_tlv_tp_data *tp_data)</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static void iwl_op_mode_mvm_device_powered_off(struct iwl_op_mode *op_mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);</div><div class='ctx'> </div><div class='del'>-	iwl_dbg_tlv_time_point(&amp;mvm-&gt;fwrt, tp_id, tp_data);</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	clear_bit(IWL_MVM_STATUS_IN_D3, &amp;mvm-&gt;status);</div><div class='add'>+	iwl_mvm_stop_device(mvm);</div><div class='add'>+	mvm-&gt;fast_resume = false;</div><div class='add'>+	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+static void iwl_op_mode_mvm_device_powered_off(struct iwl_op_mode *op_mode)</div><div class='add'>+{}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #define IWL_MVM_COMMON_OPS					\</div><div class='ctx'> 	/* these could be differentiated */			\</div><div class='del'>-	.async_cb = iwl_mvm_async_cb,				\</div><div class='ctx'> 	.queue_full = iwl_mvm_stop_sw_queue,			\</div><div class='ctx'> 	.queue_not_full = iwl_mvm_wake_sw_queue,		\</div><div class='ctx'> 	.hw_rf_kill = iwl_mvm_set_hw_rfkill_state,		\</div><div class='ctx'> 	.free_skb = iwl_mvm_free_skb,				\</div><div class='ctx'> 	.nic_error = iwl_mvm_nic_error,				\</div><div class='del'>-	.cmd_queue_full = iwl_mvm_cmd_queue_full,		\</div><div class='add'>+	.dump_error = iwl_mvm_dump_error,			\</div><div class='add'>+	.sw_reset = iwl_mvm_sw_reset,				\</div><div class='ctx'> 	.nic_config = iwl_mvm_nic_config,			\</div><div class='ctx'> 	/* as we only register one, these MUST be common! */	\</div><div class='ctx'> 	.start = iwl_op_mode_mvm_start,				\</div><div class='ctx'> 	.stop = iwl_op_mode_mvm_stop,				\</div><div class='del'>-	.time_point = iwl_op_mode_mvm_time_point</div><div class='add'>+	.time_point = iwl_op_mode_mvm_time_point,		\</div><div class='add'>+	.device_powered_off = iwl_op_mode_mvm_device_powered_off</div><div class='ctx'> </div><div class='ctx'> static const struct iwl_op_mode_ops iwl_mvm_ops = {</div><div class='ctx'> 	IWL_MVM_COMMON_OPS,</div><div class='hunk'>@@ -1477,6 +2123,9 @@ static void iwl_mvm_rx_mq_rss(struct iwl_op_mode *op_mode,</div><div class='ctx'> 	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='ctx'> 	u16 cmd = WIDE_ID(pkt-&gt;hdr.group_id, pkt-&gt;hdr.cmd);</div><div class='ctx'> </div><div class='add'>+	if (unlikely(queue &gt;= mvm-&gt;trans-&gt;info.num_rxqs))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(cmd == WIDE_ID(LEGACY_GROUP, FRAME_RELEASE)))</div><div class='ctx'> 		iwl_mvm_rx_frame_release(mvm, napi, rxb, queue);</div><div class='ctx'> 	else if (unlikely(cmd == WIDE_ID(DATA_PATH_GROUP,</div><div class='hunk'>@@ -1490,4 +2139,5 @@ static const struct iwl_op_mode_ops iwl_mvm_ops_mq = {</div><div class='ctx'> 	IWL_MVM_COMMON_OPS,</div><div class='ctx'> 	.rx = iwl_mvm_rx_mq,</div><div class='ctx'> 	.rx_rss = iwl_mvm_rx_mq_rss,</div><div class='add'>+	.dump = iwl_mvm_dump,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c<br/>index 0fd51f6aa206..4f4111055ddd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -9,58 +9,58 @@</div><div class='ctx'> #include "mvm.h"</div><div class='ctx'> </div><div class='ctx'> /* Maps the driver specific channel width definition to the fw values */</div><div class='del'>-u8 iwl_mvm_get_channel_width(struct cfg80211_chan_def *chandef)</div><div class='add'>+u8 iwl_mvm_get_channel_width(const struct cfg80211_chan_def *chandef)</div><div class='ctx'> {</div><div class='ctx'> 	switch (chandef-&gt;width) {</div><div class='ctx'> 	case NL80211_CHAN_WIDTH_20_NOHT:</div><div class='ctx'> 	case NL80211_CHAN_WIDTH_20:</div><div class='del'>-		return PHY_VHT_CHANNEL_MODE20;</div><div class='add'>+		return IWL_PHY_CHANNEL_MODE20;</div><div class='ctx'> 	case NL80211_CHAN_WIDTH_40:</div><div class='del'>-		return PHY_VHT_CHANNEL_MODE40;</div><div class='add'>+		return IWL_PHY_CHANNEL_MODE40;</div><div class='ctx'> 	case NL80211_CHAN_WIDTH_80:</div><div class='del'>-		return PHY_VHT_CHANNEL_MODE80;</div><div class='add'>+		return IWL_PHY_CHANNEL_MODE80;</div><div class='ctx'> 	case NL80211_CHAN_WIDTH_160:</div><div class='del'>-		return PHY_VHT_CHANNEL_MODE160;</div><div class='add'>+		return IWL_PHY_CHANNEL_MODE160;</div><div class='add'>+	case NL80211_CHAN_WIDTH_320:</div><div class='add'>+		return IWL_PHY_CHANNEL_MODE320;</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN(1, "Invalid channel width=%u", chandef-&gt;width);</div><div class='del'>-		return PHY_VHT_CHANNEL_MODE20;</div><div class='add'>+		return IWL_PHY_CHANNEL_MODE20;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Maps the driver specific control channel position (relative to the center</div><div class='del'>- * freq) definitions to the the fw values</div><div class='add'>+ * freq) definitions to the fw values</div><div class='ctx'>  */</div><div class='del'>-u8 iwl_mvm_get_ctrl_pos(struct cfg80211_chan_def *chandef)</div><div class='add'>+u8 iwl_mvm_get_ctrl_pos(const struct cfg80211_chan_def *chandef)</div><div class='ctx'> {</div><div class='del'>-	switch (chandef-&gt;chan-&gt;center_freq - chandef-&gt;center_freq1) {</div><div class='del'>-	case -70:</div><div class='del'>-		return PHY_VHT_CTRL_POS_4_BELOW;</div><div class='del'>-	case -50:</div><div class='del'>-		return PHY_VHT_CTRL_POS_3_BELOW;</div><div class='del'>-	case -30:</div><div class='del'>-		return PHY_VHT_CTRL_POS_2_BELOW;</div><div class='del'>-	case -10:</div><div class='del'>-		return PHY_VHT_CTRL_POS_1_BELOW;</div><div class='del'>-	case  10:</div><div class='del'>-		return PHY_VHT_CTRL_POS_1_ABOVE;</div><div class='del'>-	case  30:</div><div class='del'>-		return PHY_VHT_CTRL_POS_2_ABOVE;</div><div class='del'>-	case  50:</div><div class='del'>-		return PHY_VHT_CTRL_POS_3_ABOVE;</div><div class='del'>-	case  70:</div><div class='del'>-		return PHY_VHT_CTRL_POS_4_ABOVE;</div><div class='del'>-	default:</div><div class='del'>-		WARN(1, "Invalid channel definition");</div><div class='del'>-		fallthrough;</div><div class='del'>-	case 0:</div><div class='add'>+	int offs = chandef-&gt;chan-&gt;center_freq - chandef-&gt;center_freq1;</div><div class='add'>+	int abs_offs = abs(offs);</div><div class='add'>+	u8 ret;</div><div class='add'>+</div><div class='add'>+	if (offs == 0) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The FW is expected to check the control channel position only</div><div class='ctx'> 		 * when in HT/VHT and the channel width is not 20MHz. Return</div><div class='ctx'> 		 * this value as the default one.</div><div class='ctx'> 		 */</div><div class='del'>-		return PHY_VHT_CTRL_POS_1_BELOW;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* this results in a value 0-7, i.e. fitting into 0b0111 */</div><div class='add'>+	ret = (abs_offs - 10) / 20;</div><div class='add'>+	/*</div><div class='add'>+	 * But we need the value to be in 0b1011 because 0b0100 is</div><div class='add'>+	 * IWL_PHY_CTRL_POS_ABOVE, so shift bit 2 up to land in</div><div class='add'>+	 * IWL_PHY_CTRL_POS_OFFS_EXT (0b1000)</div><div class='add'>+	 */</div><div class='add'>+	ret = (ret &amp; IWL_PHY_CTRL_POS_OFFS_MSK) |</div><div class='add'>+	      ((ret &amp; BIT(2)) &lt;&lt; 1);</div><div class='add'>+	/* and add the above bit */</div><div class='add'>+	ret |= (offs &gt; 0) * IWL_PHY_CTRL_POS_ABOVE;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -76,6 +76,7 @@ static void iwl_mvm_phy_ctxt_cmd_hdr(struct iwl_mvm_phy_ctxt *ctxt,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_phy_ctxt_set_rxchain(struct iwl_mvm *mvm,</div><div class='add'>+					 struct iwl_mvm_phy_ctxt *ctxt,</div><div class='ctx'> 					 __le32 *rxchain_info,</div><div class='ctx'> 					 u8 chains_static,</div><div class='ctx'> 					 u8 chains_dynamic)</div><div class='hunk'>@@ -93,7 +94,7 @@ static void iwl_mvm_phy_ctxt_set_rxchain(struct iwl_mvm *mvm,</div><div class='ctx'> 	 * between the two antennas is sufficiently different to impact</div><div class='ctx'> 	 * performance.</div><div class='ctx'> 	 */</div><div class='del'>-	if (active_cnt == 1 &amp;&amp; iwl_mvm_rx_diversity_allowed(mvm)) {</div><div class='add'>+	if (active_cnt == 1 &amp;&amp; iwl_mvm_rx_diversity_allowed(mvm, ctxt)) {</div><div class='ctx'> 		idle_cnt = 2;</div><div class='ctx'> 		active_cnt = 2;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -113,8 +114,9 @@ static void iwl_mvm_phy_ctxt_set_rxchain(struct iwl_mvm *mvm,</div><div class='ctx'>  * Add the phy configuration to the PHY context command</div><div class='ctx'>  */</div><div class='ctx'> static void iwl_mvm_phy_ctxt_cmd_data_v1(struct iwl_mvm *mvm,</div><div class='add'>+					 struct iwl_mvm_phy_ctxt *ctxt,</div><div class='ctx'> 					 struct iwl_phy_context_cmd_v1 *cmd,</div><div class='del'>-					 struct cfg80211_chan_def *chandef,</div><div class='add'>+					 const struct cfg80211_chan_def *chandef,</div><div class='ctx'> 					 u8 chains_static, u8 chains_dynamic)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_phy_context_cmd_tail *tail =</div><div class='hunk'>@@ -123,7 +125,7 @@ static void iwl_mvm_phy_ctxt_cmd_data_v1(struct iwl_mvm *mvm,</div><div class='ctx'> 	/* Set the channel info data */</div><div class='ctx'> 	iwl_mvm_set_chan_info_chandef(mvm, &amp;cmd-&gt;ci, chandef);</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_phy_ctxt_set_rxchain(mvm, &amp;tail-&gt;rxchain_info,</div><div class='add'>+	iwl_mvm_phy_ctxt_set_rxchain(mvm, ctxt, &amp;tail-&gt;rxchain_info,</div><div class='ctx'> 				     chains_static, chains_dynamic);</div><div class='ctx'> </div><div class='ctx'> 	tail-&gt;txchain_info = cpu_to_le32(iwl_mvm_get_valid_tx_ant(mvm));</div><div class='hunk'>@@ -133,18 +135,62 @@ static void iwl_mvm_phy_ctxt_cmd_data_v1(struct iwl_mvm *mvm,</div><div class='ctx'>  * Add the phy configuration to the PHY context command</div><div class='ctx'>  */</div><div class='ctx'> static void iwl_mvm_phy_ctxt_cmd_data(struct iwl_mvm *mvm,</div><div class='add'>+				      struct iwl_mvm_phy_ctxt *ctxt,</div><div class='ctx'> 				      struct iwl_phy_context_cmd *cmd,</div><div class='del'>-				      struct cfg80211_chan_def *chandef,</div><div class='add'>+				      const struct cfg80211_chan_def *chandef,</div><div class='ctx'> 				      u8 chains_static, u8 chains_dynamic)</div><div class='ctx'> {</div><div class='del'>-	cmd-&gt;lmac_id = cpu_to_le32(iwl_mvm_get_lmac_id(mvm-&gt;fw,</div><div class='add'>+	cmd-&gt;lmac_id = cpu_to_le32(iwl_mvm_get_lmac_id(mvm,</div><div class='ctx'> 						       chandef-&gt;chan-&gt;band));</div><div class='ctx'> </div><div class='ctx'> 	/* Set the channel info data */</div><div class='ctx'> 	iwl_mvm_set_chan_info_chandef(mvm, &amp;cmd-&gt;ci, chandef);</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_phy_ctxt_set_rxchain(mvm, &amp;cmd-&gt;rxchain_info,</div><div class='add'>+	/* we only support RLC command version 2 */</div><div class='add'>+	if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, WIDE_ID(DATA_PATH_GROUP, RLC_CONFIG_CMD), 0) &lt; 2)</div><div class='add'>+		iwl_mvm_phy_ctxt_set_rxchain(mvm, ctxt, &amp;cmd-&gt;rxchain_info,</div><div class='add'>+					     chains_static, chains_dynamic);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_phy_send_rlc(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt,</div><div class='add'>+			 u8 chains_static, u8 chains_dynamic)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rlc_config_cmd cmd = {</div><div class='add'>+		.phy_id = cpu_to_le32(ctxt-&gt;id),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* From version 3, RLC is offloaded to firmware, so the driver no</div><div class='add'>+	 * longer needs to send cmd.rlc, note that we are not using any</div><div class='add'>+	 * other fields in the command - don't send it.</div><div class='add'>+	 */</div><div class='add'>+	if (iwl_mvm_has_rlc_offload(mvm) || ctxt-&gt;rlc_disabled)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, WIDE_ID(DATA_PATH_GROUP,</div><div class='add'>+						   RLC_CONFIG_CMD), 0) &lt; 2)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(IWL_RLC_CHAIN_INFO_DRIVER_FORCE !=</div><div class='add'>+		     PHY_RX_CHAIN_DRIVER_FORCE_MSK);</div><div class='add'>+	BUILD_BUG_ON(IWL_RLC_CHAIN_INFO_VALID !=</div><div class='add'>+		     PHY_RX_CHAIN_VALID_MSK);</div><div class='add'>+	BUILD_BUG_ON(IWL_RLC_CHAIN_INFO_FORCE !=</div><div class='add'>+		     PHY_RX_CHAIN_FORCE_SEL_MSK);</div><div class='add'>+	BUILD_BUG_ON(IWL_RLC_CHAIN_INFO_FORCE_MIMO !=</div><div class='add'>+		     PHY_RX_CHAIN_FORCE_MIMO_SEL_MSK);</div><div class='add'>+	BUILD_BUG_ON(IWL_RLC_CHAIN_INFO_COUNT != PHY_RX_CHAIN_CNT_MSK);</div><div class='add'>+	BUILD_BUG_ON(IWL_RLC_CHAIN_INFO_MIMO_COUNT !=</div><div class='add'>+		     PHY_RX_CHAIN_MIMO_CNT_MSK);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_phy_ctxt_set_rxchain(mvm, ctxt, &amp;cmd.rlc.rx_chain_info,</div><div class='ctx'> 				     chains_static, chains_dynamic);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_FW(mvm, "Send RLC command: phy=%d, rx_chain_info=0x%x\n",</div><div class='add'>+		     ctxt-&gt;id, cmd.rlc.rx_chain_info);</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_send_cmd_pdu(mvm, iwl_cmd_id(RLC_CONFIG_CMD,</div><div class='add'>+						    DATA_PATH_GROUP, 2),</div><div class='add'>+				    0, sizeof(cmd), &amp;cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -155,22 +201,21 @@ static void iwl_mvm_phy_ctxt_cmd_data(struct iwl_mvm *mvm,</div><div class='ctx'>  */</div><div class='ctx'> static int iwl_mvm_phy_ctxt_apply(struct iwl_mvm *mvm,</div><div class='ctx'> 				  struct iwl_mvm_phy_ctxt *ctxt,</div><div class='del'>-				  struct cfg80211_chan_def *chandef,</div><div class='add'>+				  const struct cfg80211_chan_def *chandef,</div><div class='ctx'> 				  u8 chains_static, u8 chains_dynamic,</div><div class='ctx'> 				  u32 action)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	int ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, IWL_ALWAYS_LONG_GROUP,</div><div class='del'>-					PHY_CONTEXT_CMD, 1);</div><div class='add'>+	int ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, PHY_CONTEXT_CMD, 1);</div><div class='ctx'> </div><div class='del'>-	if (ver == 3) {</div><div class='add'>+	if (ver &gt;= 3 &amp;&amp; ver &lt;= 4) {</div><div class='ctx'> 		struct iwl_phy_context_cmd cmd = {};</div><div class='ctx'> </div><div class='ctx'> 		/* Set the command header fields */</div><div class='ctx'> 		iwl_mvm_phy_ctxt_cmd_hdr(ctxt, &amp;cmd, action);</div><div class='ctx'> </div><div class='ctx'> 		/* Set the command data */</div><div class='del'>-		iwl_mvm_phy_ctxt_cmd_data(mvm, &amp;cmd, chandef,</div><div class='add'>+		iwl_mvm_phy_ctxt_cmd_data(mvm, ctxt, &amp;cmd, chandef,</div><div class='ctx'> 					  chains_static,</div><div class='ctx'> 					  chains_dynamic);</div><div class='ctx'> </div><div class='hunk'>@@ -186,7 +231,7 @@ static int iwl_mvm_phy_ctxt_apply(struct iwl_mvm *mvm,</div><div class='ctx'> 					 action);</div><div class='ctx'> </div><div class='ctx'> 		/* Set the command data */</div><div class='del'>-		iwl_mvm_phy_ctxt_cmd_data_v1(mvm, &amp;cmd, chandef,</div><div class='add'>+		iwl_mvm_phy_ctxt_cmd_data_v1(mvm, ctxt, &amp;cmd, chandef,</div><div class='ctx'> 					     chains_static,</div><div class='ctx'> 					     chains_dynamic);</div><div class='ctx'> 		ret = iwl_mvm_send_cmd_pdu(mvm, PHY_CONTEXT_CMD,</div><div class='hunk'>@@ -197,27 +242,46 @@ static int iwl_mvm_phy_ctxt_apply(struct iwl_mvm *mvm,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		IWL_ERR(mvm, "PHY ctxt cmd error. ret=%d\n", ret);</div><div class='del'>-	return ret;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (action != FW_CTXT_ACTION_REMOVE)</div><div class='add'>+		return iwl_mvm_phy_send_rlc(mvm, ctxt, chains_static,</div><div class='add'>+					    chains_dynamic);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Send a command to add a PHY context based on the current HW configuration.</div><div class='ctx'>  */</div><div class='ctx'> int iwl_mvm_phy_ctxt_add(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt,</div><div class='del'>-			 struct cfg80211_chan_def *chandef,</div><div class='add'>+			 const struct cfg80211_chan_def *chandef,</div><div class='add'>+			 const struct cfg80211_chan_def *ap,</div><div class='ctx'> 			 u8 chains_static, u8 chains_dynamic)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	WARN_ON(!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status) &amp;&amp;</div><div class='ctx'> 		ctxt-&gt;ref);</div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	ctxt-&gt;channel = chandef-&gt;chan;</div><div class='add'>+	ctxt-&gt;width = chandef-&gt;width;</div><div class='add'>+	ctxt-&gt;center_freq1 = chandef-&gt;center_freq1;</div><div class='ctx'> </div><div class='del'>-	return iwl_mvm_phy_ctxt_apply(mvm, ctxt, chandef,</div><div class='del'>-				      chains_static, chains_dynamic,</div><div class='del'>-				      FW_CTXT_ACTION_ADD);</div><div class='add'>+	ret = iwl_mvm_phy_ctxt_apply(mvm, ctxt, chandef,</div><div class='add'>+				     chains_static, chains_dynamic,</div><div class='add'>+				     FW_CTXT_ACTION_ADD);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ctxt-&gt;ref++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -227,6 +291,11 @@ int iwl_mvm_phy_ctxt_add(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt,</div><div class='ctx'> void iwl_mvm_phy_ctxt_ref(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt)</div><div class='ctx'> {</div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* If we were taking the first ref, we should have</div><div class='add'>+	 * called iwl_mvm_phy_ctxt_add.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON(!ctxt-&gt;ref);</div><div class='ctx'> 	ctxt-&gt;ref++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -236,13 +305,25 @@ void iwl_mvm_phy_ctxt_ref(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt)</div><div class='ctx'>  * changed.</div><div class='ctx'>  */</div><div class='ctx'> int iwl_mvm_phy_ctxt_changed(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt,</div><div class='del'>-			     struct cfg80211_chan_def *chandef,</div><div class='add'>+			     const struct cfg80211_chan_def *chandef,</div><div class='add'>+			     const struct cfg80211_chan_def *ap,</div><div class='ctx'> 			     u8 chains_static, u8 chains_dynamic)</div><div class='ctx'> {</div><div class='ctx'> 	enum iwl_ctxt_action action = FW_CTXT_ACTION_MODIFY;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON_ONCE(!ctxt-&gt;ref))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, WIDE_ID(DATA_PATH_GROUP,</div><div class='add'>+						   RLC_CONFIG_CMD), 0) &gt;= 2 &amp;&amp;</div><div class='add'>+	    ctxt-&gt;channel == chandef-&gt;chan &amp;&amp;</div><div class='add'>+	    ctxt-&gt;width == chandef-&gt;width &amp;&amp;</div><div class='add'>+	    ctxt-&gt;center_freq1 == chandef-&gt;center_freq1)</div><div class='add'>+		return iwl_mvm_phy_send_rlc(mvm, ctxt, chains_static,</div><div class='add'>+					    chains_dynamic);</div><div class='add'>+</div><div class='ctx'> 	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 			IWL_UCODE_TLV_CAPA_BINDING_CDB_SUPPORT) &amp;&amp;</div><div class='ctx'> 	    ctxt-&gt;channel-&gt;band != chandef-&gt;chan-&gt;band) {</div><div class='hunk'>@@ -261,6 +342,8 @@ int iwl_mvm_phy_ctxt_changed(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt,</div><div class='ctx'> </div><div class='ctx'> 	ctxt-&gt;channel = chandef-&gt;chan;</div><div class='ctx'> 	ctxt-&gt;width = chandef-&gt;width;</div><div class='add'>+	ctxt-&gt;center_freq1 = chandef-&gt;center_freq1;</div><div class='add'>+</div><div class='ctx'> 	return iwl_mvm_phy_ctxt_apply(mvm, ctxt, chandef,</div><div class='ctx'> 				      chains_static, chains_dynamic,</div><div class='ctx'> 				      action);</div><div class='hunk'>@@ -268,6 +351,7 @@ int iwl_mvm_phy_ctxt_changed(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt,</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_phy_ctxt_unref(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt)</div><div class='ctx'> {</div><div class='add'>+	struct cfg80211_chan_def chandef;</div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON_ONCE(!ctxt))</div><div class='hunk'>@@ -275,28 +359,13 @@ void iwl_mvm_phy_ctxt_unref(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt)</div><div class='ctx'> </div><div class='ctx'> 	ctxt-&gt;ref--;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Move unused phy's to a default channel. When the phy is moved the,</div><div class='del'>-	 * fw will cleanup immediate quiet bit if it was previously set,</div><div class='del'>-	 * otherwise we might not be able to reuse this phy.</div><div class='del'>-	 */</div><div class='del'>-	if (ctxt-&gt;ref == 0) {</div><div class='del'>-		struct ieee80211_channel *chan;</div><div class='del'>-		struct cfg80211_chan_def chandef;</div><div class='del'>-		struct ieee80211_supported_band *sband = NULL;</div><div class='del'>-		enum nl80211_band band = NL80211_BAND_2GHZ;</div><div class='del'>-</div><div class='del'>-		while (!sband &amp;&amp; band &lt; NUM_NL80211_BANDS)</div><div class='del'>-			sband = mvm-&gt;hw-&gt;wiphy-&gt;bands[band++];</div><div class='del'>-</div><div class='del'>-		if (WARN_ON(!sband))</div><div class='del'>-			return;</div><div class='add'>+	if (ctxt-&gt;ref)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		chan = &amp;sband-&gt;channels[0];</div><div class='add'>+	cfg80211_chandef_create(&amp;chandef, ctxt-&gt;channel, NL80211_CHAN_NO_HT);</div><div class='ctx'> </div><div class='del'>-		cfg80211_chandef_create(&amp;chandef, chan, NL80211_CHAN_NO_HT);</div><div class='del'>-		iwl_mvm_phy_ctxt_changed(mvm, ctxt, &amp;chandef, 1, 1);</div><div class='del'>-	}</div><div class='add'>+	iwl_mvm_phy_ctxt_apply(mvm, ctxt, &amp;chandef, 1, 1,</div><div class='add'>+			       FW_CTXT_ACTION_REMOVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_binding_iterator(void *_data, u8 *mac,</div><div class='hunk'>@@ -305,12 +374,12 @@ static void iwl_mvm_binding_iterator(void *_data, u8 *mac,</div><div class='ctx'> 	unsigned long *data = _data;</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> </div><div class='del'>-	if (!mvmvif-&gt;phy_ctxt)</div><div class='add'>+	if (!mvmvif-&gt;deflink.phy_ctxt)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_STATION ||</div><div class='ctx'> 	    vif-&gt;type == NL80211_IFTYPE_AP)</div><div class='del'>-		__set_bit(mvmvif-&gt;phy_ctxt-&gt;id, data);</div><div class='add'>+		__set_bit(mvmvif-&gt;deflink.phy_ctxt-&gt;id, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iwl_mvm_phy_ctx_count(struct iwl_mvm *mvm)</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/power.c b/drivers/net/wireless/intel/iwlwifi/mvm/power.c<br/>index f2b090be3898..610de29b7be0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/power.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/power.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/power.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/power.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2019 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2019, 2021-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -20,8 +20,7 @@</div><div class='ctx'> </div><div class='ctx'> static</div><div class='ctx'> int iwl_mvm_beacon_filter_send_cmd(struct iwl_mvm *mvm,</div><div class='del'>-				   struct iwl_beacon_filter_cmd *cmd,</div><div class='del'>-				   u32 flags)</div><div class='add'>+				   struct iwl_beacon_filter_cmd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	u16 len;</div><div class='ctx'> </div><div class='hunk'>@@ -62,7 +61,7 @@ int iwl_mvm_beacon_filter_send_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 		len = offsetof(struct iwl_beacon_filter_cmd,</div><div class='ctx'> 			       bf_threshold_absolute_low);</div><div class='ctx'> </div><div class='del'>-	return iwl_mvm_send_cmd_pdu(mvm, REPLY_BEACON_FILTERING_CMD, flags,</div><div class='add'>+	return iwl_mvm_send_cmd_pdu(mvm, REPLY_BEACON_FILTERING_CMD, 0,</div><div class='ctx'> 				    len, cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -80,7 +79,7 @@ void iwl_mvm_beacon_filter_set_cqm_params(struct iwl_mvm *mvm,</div><div class='ctx'> 		cmd-&gt;bf_roaming_state =</div><div class='ctx'> 			cpu_to_le32(-vif-&gt;bss_conf.cqm_rssi_thold);</div><div class='ctx'> 	}</div><div class='del'>-	cmd-&gt;ba_enable_beacon_abort = cpu_to_le32(mvmvif-&gt;bf_data.ba_enabled);</div><div class='add'>+	cmd-&gt;ba_enable_beacon_abort = cpu_to_le32(mvmvif-&gt;ba_enabled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_power_log(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -128,6 +127,19 @@ static void iwl_mvm_power_configure_uapsd(struct iwl_mvm *mvm,</div><div class='ctx'> 	enum ieee80211_ac_numbers ac;</div><div class='ctx'> 	bool tid_found = false;</div><div class='ctx'> </div><div class='add'>+	if (test_bit(IWL_MVM_STATUS_IN_D3, &amp;mvm-&gt;status) ||</div><div class='add'>+	    cmd-&gt;flags &amp; cpu_to_le16(POWER_FLAGS_SNOOZE_ENA_MSK)) {</div><div class='add'>+		cmd-&gt;rx_data_timeout_uapsd =</div><div class='add'>+			cpu_to_le32(IWL_MVM_WOWLAN_PS_RX_DATA_TIMEOUT);</div><div class='add'>+		cmd-&gt;tx_data_timeout_uapsd =</div><div class='add'>+			cpu_to_le32(IWL_MVM_WOWLAN_PS_TX_DATA_TIMEOUT);</div><div class='add'>+	} else {</div><div class='add'>+		cmd-&gt;rx_data_timeout_uapsd =</div><div class='add'>+			cpu_to_le32(IWL_MVM_UAPSD_RX_DATA_TIMEOUT);</div><div class='add'>+		cmd-&gt;tx_data_timeout_uapsd =</div><div class='add'>+			cpu_to_le32(IWL_MVM_UAPSD_TX_DATA_TIMEOUT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> 	/* set advanced pm flag with no uapsd ACs to enable ps-poll */</div><div class='ctx'> 	if (mvmvif-&gt;dbgfs_pm.use_ps_poll) {</div><div class='hunk'>@@ -137,7 +149,7 @@ static void iwl_mvm_power_configure_uapsd(struct iwl_mvm *mvm,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	for (ac = IEEE80211_AC_VO; ac &lt;= IEEE80211_AC_BK; ac++) {</div><div class='del'>-		if (!mvmvif-&gt;queue_params[ac].uapsd)</div><div class='add'>+		if (!mvmvif-&gt;deflink.queue_params[ac].uapsd)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (!test_bit(IWL_MVM_STATUS_IN_D3, &amp;mvm-&gt;status))</div><div class='hunk'>@@ -147,7 +159,7 @@ static void iwl_mvm_power_configure_uapsd(struct iwl_mvm *mvm,</div><div class='ctx'> 		cmd-&gt;uapsd_ac_flags |= BIT(ac);</div><div class='ctx'> </div><div class='ctx'> 		/* QNDP TID - the highest TID with no admission control */</div><div class='del'>-		if (!tid_found &amp;&amp; !mvmvif-&gt;queue_params[ac].acm) {</div><div class='add'>+		if (!tid_found &amp;&amp; !mvmvif-&gt;deflink.queue_params[ac].acm) {</div><div class='ctx'> 			tid_found = true;</div><div class='ctx'> 			switch (ac) {</div><div class='ctx'> 			case IEEE80211_AC_VO:</div><div class='hunk'>@@ -182,19 +194,6 @@ static void iwl_mvm_power_configure_uapsd(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;uapsd_max_sp = mvm-&gt;hw-&gt;uapsd_max_sp_len;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(IWL_MVM_STATUS_IN_D3, &amp;mvm-&gt;status) ||</div><div class='del'>-	    cmd-&gt;flags &amp; cpu_to_le16(POWER_FLAGS_SNOOZE_ENA_MSK)) {</div><div class='del'>-		cmd-&gt;rx_data_timeout_uapsd =</div><div class='del'>-			cpu_to_le32(IWL_MVM_WOWLAN_PS_RX_DATA_TIMEOUT);</div><div class='del'>-		cmd-&gt;tx_data_timeout_uapsd =</div><div class='del'>-			cpu_to_le32(IWL_MVM_WOWLAN_PS_TX_DATA_TIMEOUT);</div><div class='del'>-	} else {</div><div class='del'>-		cmd-&gt;rx_data_timeout_uapsd =</div><div class='del'>-			cpu_to_le32(IWL_MVM_UAPSD_RX_DATA_TIMEOUT);</div><div class='del'>-		cmd-&gt;tx_data_timeout_uapsd =</div><div class='del'>-			cpu_to_le32(IWL_MVM_UAPSD_TX_DATA_TIMEOUT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (cmd-&gt;flags &amp; cpu_to_le16(POWER_FLAGS_SNOOZE_ENA_MSK)) {</div><div class='ctx'> 		cmd-&gt;heavy_tx_thld_packets =</div><div class='ctx'> 			IWL_MVM_PS_SNOOZE_HEAVY_TX_THLD_PACKETS;</div><div class='hunk'>@@ -212,19 +211,36 @@ static void iwl_mvm_power_configure_uapsd(struct iwl_mvm *mvm,</div><div class='ctx'> 		IWL_MVM_PS_HEAVY_RX_THLD_PERCENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_p2p_standalone_iterator(void *_data, u8 *mac,</div><div class='del'>-					    struct ieee80211_vif *vif)</div><div class='add'>+struct iwl_allow_uapsd_iface_iterator_data {</div><div class='add'>+	struct ieee80211_vif *current_vif;</div><div class='add'>+	bool allow_uapsd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_allow_uapsd_iterator(void *_data, u8 *mac,</div><div class='add'>+					 struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	bool *is_p2p_standalone = _data;</div><div class='add'>+	struct iwl_allow_uapsd_iface_iterator_data *data = _data;</div><div class='add'>+	struct iwl_mvm_vif *other_mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm_vif *curr_mvmvif =</div><div class='add'>+		iwl_mvm_vif_from_mac80211(data-&gt;current_vif);</div><div class='ctx'> </div><div class='del'>-	switch (ieee80211_vif_type_p2p(vif)) {</div><div class='del'>-	case NL80211_IFTYPE_P2P_GO:</div><div class='add'>+	/* exclude the given vif */</div><div class='add'>+	if (vif == data-&gt;current_vif)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (vif-&gt;type) {</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='del'>-		*is_p2p_standalone = false;</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		data-&gt;allow_uapsd = false;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_STATION:</div><div class='del'>-		if (vif-&gt;bss_conf.assoc)</div><div class='del'>-			*is_p2p_standalone = false;</div><div class='add'>+		/* allow UAPSD if P2P interface and BSS station interface share</div><div class='add'>+		 * the same channel.</div><div class='add'>+		 */</div><div class='add'>+		if (vif-&gt;cfg.assoc &amp;&amp; other_mvmvif-&gt;deflink.phy_ctxt &amp;&amp;</div><div class='add'>+		    curr_mvmvif-&gt;deflink.phy_ctxt &amp;&amp;</div><div class='add'>+		    other_mvmvif-&gt;deflink.phy_ctxt-&gt;id != curr_mvmvif-&gt;deflink.phy_ctxt-&gt;id)</div><div class='add'>+			data-&gt;allow_uapsd = false;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -236,9 +252,13 @@ static bool iwl_mvm_power_allow_uapsd(struct iwl_mvm *mvm,</div><div class='ctx'> 				       struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_allow_uapsd_iface_iterator_data data = {</div><div class='add'>+		.current_vif = vif,</div><div class='add'>+		.allow_uapsd = true,</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-	if (!memcmp(mvmvif-&gt;uapsd_misbehaving_bssid, vif-&gt;bss_conf.bssid,</div><div class='del'>-		    ETH_ALEN))</div><div class='add'>+	if (ether_addr_equal(mvmvif-&gt;uapsd_misbehaving_ap_addr,</div><div class='add'>+			     vif-&gt;cfg.ap_addr))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -250,82 +270,75 @@ static bool iwl_mvm_power_allow_uapsd(struct iwl_mvm *mvm,</div><div class='ctx'> 	    IEEE80211_P2P_OPPPS_ENABLE_BIT))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Avoid using uAPSD if client is in DCM -</div><div class='del'>-	 * low latency issue in Miracast</div><div class='del'>-	 */</div><div class='del'>-	if (iwl_mvm_phy_ctx_count(mvm) &gt;= 2)</div><div class='add'>+	if (vif-&gt;p2p &amp;&amp; !iwl_mvm_is_p2p_scm_uapsd_supported(mvm))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;p2p) {</div><div class='del'>-		/* Allow U-APSD only if p2p is stand alone */</div><div class='del'>-		bool is_p2p_standalone = true;</div><div class='del'>-</div><div class='del'>-		if (!iwl_mvm_is_p2p_scm_uapsd_supported(mvm))</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='del'>-		ieee80211_iterate_active_interfaces_atomic(mvm-&gt;hw,</div><div class='del'>-					IEEE80211_IFACE_ITER_NORMAL,</div><div class='del'>-					iwl_mvm_p2p_standalone_iterator,</div><div class='del'>-					&amp;is_p2p_standalone);</div><div class='del'>-</div><div class='del'>-		if (!is_p2p_standalone)</div><div class='del'>-			return false;</div><div class='del'>-	}</div><div class='add'>+	ieee80211_iterate_active_interfaces_atomic(mvm-&gt;hw,</div><div class='add'>+				IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+				iwl_mvm_allow_uapsd_iterator,</div><div class='add'>+				&amp;data);</div><div class='ctx'> </div><div class='del'>-	return true;</div><div class='add'>+	return data.allow_uapsd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool iwl_mvm_power_is_radar(struct ieee80211_vif *vif)</div><div class='add'>+static bool iwl_mvm_power_is_radar(struct ieee80211_bss_conf *link_conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_chanctx_conf *chanctx_conf;</div><div class='del'>-	struct ieee80211_channel *chan;</div><div class='del'>-	bool radar_detect = false;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	chanctx_conf = rcu_dereference(vif-&gt;chanctx_conf);</div><div class='del'>-	WARN_ON(!chanctx_conf);</div><div class='del'>-	if (chanctx_conf) {</div><div class='del'>-		chan = chanctx_conf-&gt;def.chan;</div><div class='del'>-		radar_detect = chan-&gt;flags &amp; IEEE80211_CHAN_RADAR;</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	chanctx_conf = rcu_dereference(link_conf-&gt;chanctx_conf);</div><div class='ctx'> </div><div class='del'>-	return radar_detect;</div><div class='add'>+	/* this happens on link switching, just ignore inactive ones */</div><div class='add'>+	if (!chanctx_conf)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return chanctx_conf-&gt;def.chan-&gt;flags &amp; IEEE80211_CHAN_RADAR;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_power_config_skip_dtim(struct iwl_mvm *mvm,</div><div class='ctx'> 					   struct ieee80211_vif *vif,</div><div class='ctx'> 					   struct iwl_mac_power_cmd *cmd)</div><div class='ctx'> {</div><div class='del'>-	int dtimper = vif-&gt;bss_conf.dtim_period ?: 1;</div><div class='del'>-	int skip;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	unsigned int min_link_skip = ~0;</div><div class='add'>+	unsigned int link_id;</div><div class='ctx'> </div><div class='ctx'> 	/* disable, in case we're supposed to override */</div><div class='ctx'> 	cmd-&gt;skip_dtim_periods = 0;</div><div class='ctx'> 	cmd-&gt;flags &amp;= ~cpu_to_le16(POWER_FLAGS_SKIP_OVER_DTIM_MSK);</div><div class='ctx'> </div><div class='del'>-	if (iwl_mvm_power_is_radar(vif))</div><div class='add'>+	if (!test_bit(IWL_MVM_STATUS_IN_D3, &amp;mvm-&gt;status)) {</div><div class='add'>+		if (iwlmvm_mod_params.power_scheme != IWL_POWER_SCHEME_LP)</div><div class='add'>+			return;</div><div class='add'>+		cmd-&gt;skip_dtim_periods = 2;</div><div class='add'>+		cmd-&gt;flags |= cpu_to_le16(POWER_FLAGS_SKIP_OVER_DTIM_MSK);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (dtimper &gt;= 10)</div><div class='del'>-		return;</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for_each_vif_active_link(vif, link_conf, link_id) {</div><div class='add'>+		unsigned int dtimper = link_conf-&gt;dtim_period ?: 1;</div><div class='add'>+		unsigned int dtimper_tu = dtimper * link_conf-&gt;beacon_int;</div><div class='add'>+		unsigned int skip;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(IWL_MVM_STATUS_IN_D3, &amp;mvm-&gt;status)) {</div><div class='del'>-		if (iwlmvm_mod_params.power_scheme != IWL_POWER_SCHEME_LP)</div><div class='add'>+		if (dtimper &gt;= 10 || iwl_mvm_power_is_radar(link_conf)) {</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> 			return;</div><div class='del'>-		skip = 2;</div><div class='del'>-	} else {</div><div class='del'>-		int dtimper_tu = dtimper * vif-&gt;bss_conf.beacon_int;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (WARN_ON(!dtimper_tu))</div><div class='del'>-			return;</div><div class='del'>-		/* configure skip over dtim up to 306TU - 314 msec */</div><div class='del'>-		skip = max_t(u8, 1, 306 / dtimper_tu);</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* configure skip over dtim up to 900 TU DTIM interval */</div><div class='add'>+		skip = max_t(int, 1, 900 / dtimper_tu);</div><div class='add'>+		min_link_skip = min(min_link_skip, skip);</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	/* no WARN_ON, can only happen with WARN_ON above */</div><div class='add'>+	if (min_link_skip == ~0)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	/* the firmware really expects "look at every X DTIMs", so add 1 */</div><div class='del'>-	cmd-&gt;skip_dtim_periods = 1 + skip;</div><div class='add'>+	cmd-&gt;skip_dtim_periods = min_link_skip;</div><div class='ctx'> 	cmd-&gt;flags |= cpu_to_le16(POWER_FLAGS_SKIP_OVER_DTIM_MSK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -359,9 +372,12 @@ static void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;flags |= cpu_to_le16(POWER_FLAGS_POWER_SAVE_ENA_MSK);</div><div class='ctx'> </div><div class='del'>-	if (!vif-&gt;bss_conf.ps || !mvmvif-&gt;pm_enabled)</div><div class='add'>+	if (!vif-&gt;cfg.ps || !mvmvif-&gt;pm_enabled)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, MAC_PM_POWER_TABLE, 0) &gt;= 2)</div><div class='add'>+		cmd-&gt;flags |= cpu_to_le16(POWER_FLAGS_ENABLE_SMPS_MSK);</div><div class='add'>+</div><div class='ctx'> 	if (iwl_mvm_vif_low_latency(mvmvif) &amp;&amp; vif-&gt;p2p &amp;&amp;</div><div class='ctx'> 	    (!fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 			 IWL_UCODE_TLV_CAPA_SHORT_PM_TIMEOUTS) ||</div><div class='hunk'>@@ -483,6 +499,11 @@ int iwl_mvm_power_update_device(struct iwl_mvm *mvm)</div><div class='ctx'> 	if (mvm-&gt;ext_clock_valid)</div><div class='ctx'> 		cmd.flags |= cpu_to_le16(DEVICE_POWER_FLAGS_32K_CLK_VALID_MSK);</div><div class='ctx'> </div><div class='add'>+	if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, POWER_TABLE_CMD, 0) &gt;= 7 &amp;&amp;</div><div class='add'>+	    test_bit(IWL_MVM_STATUS_IN_D3, &amp;mvm-&gt;status))</div><div class='add'>+		cmd.flags |=</div><div class='add'>+			cpu_to_le16(DEVICE_POWER_FLAGS_NO_SLEEP_TILL_D3_MSK);</div><div class='add'>+</div><div class='ctx'> 	IWL_DEBUG_POWER(mvm,</div><div class='ctx'> 			"Sending device power command with flags = 0x%X\n",</div><div class='ctx'> 			cmd.flags);</div><div class='hunk'>@@ -495,9 +516,9 @@ void iwl_mvm_power_vif_assoc(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> </div><div class='del'>-	if (memcmp(vif-&gt;bss_conf.bssid, mvmvif-&gt;uapsd_misbehaving_bssid,</div><div class='del'>-		   ETH_ALEN))</div><div class='del'>-		eth_zero_addr(mvmvif-&gt;uapsd_misbehaving_bssid);</div><div class='add'>+	if (!ether_addr_equal(mvmvif-&gt;uapsd_misbehaving_ap_addr,</div><div class='add'>+			      vif-&gt;cfg.ap_addr))</div><div class='add'>+		eth_zero_addr(mvmvif-&gt;uapsd_misbehaving_ap_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_power_uapsd_misbehav_ap_iterator(void *_data, u8 *mac,</div><div class='hunk'>@@ -505,13 +526,23 @@ static void iwl_mvm_power_uapsd_misbehav_ap_iterator(void *_data, u8 *mac,</div><div class='ctx'> {</div><div class='ctx'> 	u8 *ap_sta_id = _data;</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	unsigned int link_id;</div><div class='ctx'> </div><div class='del'>-	/* The ap_sta_id is not expected to change during current association</div><div class='del'>-	 * so no explicit protection is needed</div><div class='del'>-	 */</div><div class='del'>-	if (mvmvif-&gt;ap_sta_id == *ap_sta_id)</div><div class='del'>-		memcpy(mvmvif-&gt;uapsd_misbehaving_bssid, vif-&gt;bss_conf.bssid,</div><div class='del'>-		       ETH_ALEN);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for_each_vif_active_link(vif, link_conf, link_id) {</div><div class='add'>+		struct iwl_mvm_vif_link_info *link_info = mvmvif-&gt;link[link_id];</div><div class='add'>+</div><div class='add'>+		/* The ap_sta_id is not expected to change during current</div><div class='add'>+		 * association so no explicit protection is needed</div><div class='add'>+		 */</div><div class='add'>+		if (link_info-&gt;ap_sta_id == *ap_sta_id) {</div><div class='add'>+			ether_addr_copy(mvmvif-&gt;uapsd_misbehaving_ap_addr,</div><div class='add'>+					vif-&gt;cfg.ap_addr);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_power_uapsd_misbehaving_ap_notif(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -538,7 +569,7 @@ struct iwl_power_vifs {</div><div class='ctx'> 	bool monitor_active;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_power_disable_pm_iterator(void *_data, u8* mac,</div><div class='add'>+static void iwl_mvm_power_disable_pm_iterator(void *_data, u8 *mac,</div><div class='ctx'> 					      struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='hunk'>@@ -546,13 +577,13 @@ static void iwl_mvm_power_disable_pm_iterator(void *_data, u8* mac,</div><div class='ctx'> 	mvmvif-&gt;pm_enabled = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_power_ps_disabled_iterator(void *_data, u8* mac,</div><div class='add'>+static void iwl_mvm_power_ps_disabled_iterator(void *_data, u8 *mac,</div><div class='ctx'> 					       struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	bool *disable_ps = _data;</div><div class='ctx'> </div><div class='del'>-	if (mvmvif-&gt;phy_ctxt &amp;&amp; mvmvif-&gt;phy_ctxt-&gt;id &lt; NUM_PHY_CTX)</div><div class='add'>+	if (iwl_mvm_vif_is_active(mvmvif))</div><div class='ctx'> 		*disable_ps |= mvmvif-&gt;ps_disabled;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -561,7 +592,12 @@ static void iwl_mvm_power_get_vifs_iterator(void *_data, u8 *mac,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	struct iwl_power_vifs *power_iterator = _data;</div><div class='del'>-	bool active = mvmvif-&gt;phy_ctxt &amp;&amp; mvmvif-&gt;phy_ctxt-&gt;id &lt; NUM_PHY_CTX;</div><div class='add'>+	bool active;</div><div class='add'>+</div><div class='add'>+	if (!mvmvif-&gt;uploaded)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	active = iwl_mvm_vif_is_active(mvmvif);</div><div class='ctx'> </div><div class='ctx'> 	switch (ieee80211_vif_type_p2p(vif)) {</div><div class='ctx'> 	case NL80211_IFTYPE_P2P_DEVICE:</div><div class='hunk'>@@ -634,29 +670,32 @@ static void iwl_mvm_power_set_pm(struct iwl_mvm *mvm,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* enable PM on bss if bss stand alone */</div><div class='del'>-	if (vifs-&gt;bss_active &amp;&amp; !vifs-&gt;p2p_active &amp;&amp; !vifs-&gt;ap_active) {</div><div class='add'>+	if (bss_mvmvif &amp;&amp; vifs-&gt;bss_active &amp;&amp; !vifs-&gt;p2p_active &amp;&amp;</div><div class='add'>+	    !vifs-&gt;ap_active) {</div><div class='ctx'> 		bss_mvmvif-&gt;pm_enabled = true;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* enable PM on p2p if p2p stand alone */</div><div class='del'>-	if (vifs-&gt;p2p_active &amp;&amp; !vifs-&gt;bss_active &amp;&amp; !vifs-&gt;ap_active) {</div><div class='add'>+	if (p2p_mvmvif &amp;&amp; vifs-&gt;p2p_active &amp;&amp; !vifs-&gt;bss_active &amp;&amp;</div><div class='add'>+	    !vifs-&gt;ap_active) {</div><div class='ctx'> 		p2p_mvmvif-&gt;pm_enabled = true;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (vifs-&gt;bss_active &amp;&amp; vifs-&gt;p2p_active)</div><div class='del'>-		client_same_channel = (bss_mvmvif-&gt;phy_ctxt-&gt;id ==</div><div class='del'>-				       p2p_mvmvif-&gt;phy_ctxt-&gt;id);</div><div class='del'>-	if (vifs-&gt;bss_active &amp;&amp; vifs-&gt;ap_active)</div><div class='del'>-		ap_same_channel = (bss_mvmvif-&gt;phy_ctxt-&gt;id ==</div><div class='del'>-				   ap_mvmvif-&gt;phy_ctxt-&gt;id);</div><div class='add'>+	if (p2p_mvmvif &amp;&amp; bss_mvmvif &amp;&amp; vifs-&gt;bss_active &amp;&amp; vifs-&gt;p2p_active)</div><div class='add'>+		client_same_channel =</div><div class='add'>+			iwl_mvm_have_links_same_channel(bss_mvmvif, p2p_mvmvif);</div><div class='add'>+</div><div class='add'>+	if (bss_mvmvif &amp;&amp; ap_mvmvif &amp;&amp; vifs-&gt;bss_active &amp;&amp; vifs-&gt;ap_active)</div><div class='add'>+		ap_same_channel =</div><div class='add'>+			iwl_mvm_have_links_same_channel(bss_mvmvif, ap_mvmvif);</div><div class='ctx'> </div><div class='ctx'> 	/* clients are not stand alone: enable PM if DCM */</div><div class='ctx'> 	if (!(client_same_channel || ap_same_channel)) {</div><div class='del'>-		if (vifs-&gt;bss_active)</div><div class='add'>+		if (bss_mvmvif &amp;&amp; vifs-&gt;bss_active)</div><div class='ctx'> 			bss_mvmvif-&gt;pm_enabled = true;</div><div class='del'>-		if (vifs-&gt;p2p_active)</div><div class='add'>+		if (p2p_mvmvif &amp;&amp; vifs-&gt;p2p_active)</div><div class='ctx'> 			p2p_mvmvif-&gt;pm_enabled = true;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -784,8 +823,7 @@ iwl_mvm_beacon_filter_debugfs_parameters(struct ieee80211_vif *vif,</div><div class='ctx'> </div><div class='ctx'> static int _iwl_mvm_enable_beacon_filter(struct iwl_mvm *mvm,</div><div class='ctx'> 					 struct ieee80211_vif *vif,</div><div class='del'>-					 struct iwl_beacon_filter_cmd *cmd,</div><div class='del'>-					 u32 cmd_flags)</div><div class='add'>+					 struct iwl_beacon_filter_cmd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -796,29 +834,27 @@ static int _iwl_mvm_enable_beacon_filter(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_beacon_filter_set_cqm_params(mvm, vif, cmd);</div><div class='ctx'> 	iwl_mvm_beacon_filter_debugfs_parameters(vif, cmd);</div><div class='del'>-	ret = iwl_mvm_beacon_filter_send_cmd(mvm, cmd, cmd_flags);</div><div class='add'>+	ret = iwl_mvm_beacon_filter_send_cmd(mvm, cmd);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret)</div><div class='del'>-		mvmvif-&gt;bf_data.bf_enabled = true;</div><div class='add'>+		mvmvif-&gt;bf_enabled = true;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iwl_mvm_enable_beacon_filter(struct iwl_mvm *mvm,</div><div class='del'>-				 struct ieee80211_vif *vif,</div><div class='del'>-				 u32 flags)</div><div class='add'>+				 struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_beacon_filter_cmd cmd = {</div><div class='ctx'> 		IWL_BF_CMD_CONFIG_DEFAULTS,</div><div class='ctx'> 		.bf_enable_beacon_filter = cpu_to_le32(1),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return _iwl_mvm_enable_beacon_filter(mvm, vif, &amp;cmd, flags);</div><div class='add'>+	return _iwl_mvm_enable_beacon_filter(mvm, vif, &amp;cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int _iwl_mvm_disable_beacon_filter(struct iwl_mvm *mvm,</div><div class='del'>-					  struct ieee80211_vif *vif,</div><div class='del'>-					  u32 flags)</div><div class='add'>+					  struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_beacon_filter_cmd cmd = {};</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='hunk'>@@ -827,19 +863,18 @@ static int _iwl_mvm_disable_beacon_filter(struct iwl_mvm *mvm,</div><div class='ctx'> 	if (vif-&gt;type != NL80211_IFTYPE_STATION || vif-&gt;p2p)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_beacon_filter_send_cmd(mvm, &amp;cmd, flags);</div><div class='add'>+	ret = iwl_mvm_beacon_filter_send_cmd(mvm, &amp;cmd);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret)</div><div class='del'>-		mvmvif-&gt;bf_data.bf_enabled = false;</div><div class='add'>+		mvmvif-&gt;bf_enabled = false;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iwl_mvm_disable_beacon_filter(struct iwl_mvm *mvm,</div><div class='del'>-				  struct ieee80211_vif *vif,</div><div class='del'>-				  u32 flags)</div><div class='add'>+				  struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	return _iwl_mvm_disable_beacon_filter(mvm, vif, flags);</div><div class='add'>+	return _iwl_mvm_disable_beacon_filter(mvm, vif);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_mvm_power_set_ps(struct iwl_mvm *mvm)</div><div class='hunk'>@@ -879,18 +914,18 @@ static int iwl_mvm_power_set_ba(struct iwl_mvm *mvm,</div><div class='ctx'> 		.bf_enable_beacon_filter = cpu_to_le32(1),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (!mvmvif-&gt;bf_data.bf_enabled)</div><div class='add'>+	if (!mvmvif-&gt;bf_enabled)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(IWL_MVM_STATUS_IN_D3, &amp;mvm-&gt;status))</div><div class='ctx'> 		cmd.ba_escape_timer = cpu_to_le32(IWL_BA_ESCAPE_TIMER_D3);</div><div class='ctx'> </div><div class='del'>-	mvmvif-&gt;bf_data.ba_enabled = !(!mvmvif-&gt;pm_enabled ||</div><div class='del'>-				       mvm-&gt;ps_disabled ||</div><div class='del'>-				       !vif-&gt;bss_conf.ps ||</div><div class='del'>-				       iwl_mvm_vif_low_latency(mvmvif));</div><div class='add'>+	mvmvif-&gt;ba_enabled = !(!mvmvif-&gt;pm_enabled ||</div><div class='add'>+			       mvm-&gt;ps_disabled ||</div><div class='add'>+			       !vif-&gt;cfg.ps ||</div><div class='add'>+			       iwl_mvm_vif_low_latency(mvmvif));</div><div class='ctx'> </div><div class='del'>-	return _iwl_mvm_enable_beacon_filter(mvm, vif, &amp;cmd, 0);</div><div class='add'>+	return _iwl_mvm_enable_beacon_filter(mvm, vif, &amp;cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iwl_mvm_power_update_ps(struct iwl_mvm *mvm)</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ptp.c b/drivers/net/wireless/intel/iwlwifi/mvm/ptp.c<br/>new file mode 100644<br/>index 000000000000..06a4c9f74797<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/ptp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/ptp.c</a></div><div class='hunk'>@@ -0,0 +1,326 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2021 - 2023, 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "mvm.h"</div><div class='add'>+#include "iwl-debug.h"</div><div class='add'>+#include &lt;linux/timekeeping.h&gt;</div><div class='add'>+#include &lt;linux/math64.h&gt;</div><div class='add'>+</div><div class='add'>+#define IWL_PTP_GP2_WRAP	0x100000000ULL</div><div class='add'>+#define IWL_PTP_WRAP_TIME	(3600 * HZ)</div><div class='add'>+</div><div class='add'>+/* The scaled_ppm parameter is ppm (parts per million) with a 16-bit fractional</div><div class='add'>+ * part, which means that a value of 1 in one of those fields actually means</div><div class='add'>+ * 2^-16 ppm, and 2^16=65536 is 1 ppm.</div><div class='add'>+ */</div><div class='add'>+#define SCALE_FACTOR	65536000000ULL</div><div class='add'>+#define IWL_PTP_WRAP_THRESHOLD_USEC	(5000)</div><div class='add'>+</div><div class='add'>+#define IWL_PTP_GET_CROSS_TS_NUM	5</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_ptp_update_new_read(struct iwl_mvm *mvm, u32 gp2)</div><div class='add'>+{</div><div class='add'>+	/* If the difference is above the threshold, assume it's a wraparound.</div><div class='add'>+	 * Otherwise assume it's an old read and ignore it.</div><div class='add'>+	 */</div><div class='add'>+	if (gp2 &lt; mvm-&gt;ptp_data.last_gp2 &amp;&amp;</div><div class='add'>+	    mvm-&gt;ptp_data.last_gp2 - gp2 &lt; IWL_PTP_WRAP_THRESHOLD_USEC) {</div><div class='add'>+		IWL_DEBUG_INFO(mvm,</div><div class='add'>+			       "PTP: ignore old read (gp2=%u, last_gp2=%u)\n",</div><div class='add'>+			       gp2, mvm-&gt;ptp_data.last_gp2);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (gp2 &lt; mvm-&gt;ptp_data.last_gp2) {</div><div class='add'>+		mvm-&gt;ptp_data.wrap_counter++;</div><div class='add'>+		IWL_DEBUG_INFO(mvm,</div><div class='add'>+			       "PTP: wraparound detected (new counter=%u)\n",</div><div class='add'>+			       mvm-&gt;ptp_data.wrap_counter);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mvm-&gt;ptp_data.last_gp2 = gp2;</div><div class='add'>+	schedule_delayed_work(&amp;mvm-&gt;ptp_data.dwork, IWL_PTP_WRAP_TIME);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u64 iwl_mvm_ptp_get_adj_time(struct iwl_mvm *mvm, u64 base_time_ns)</div><div class='add'>+{</div><div class='add'>+	struct ptp_data *data = &amp;mvm-&gt;ptp_data;</div><div class='add'>+	u64 last_gp2_ns = mvm-&gt;ptp_data.scale_update_gp2 * NSEC_PER_USEC;</div><div class='add'>+	u64 res;</div><div class='add'>+	u64 diff;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_ptp_update_new_read(mvm,</div><div class='add'>+				    div64_u64(base_time_ns, NSEC_PER_USEC));</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(mvm, "base_time_ns=%llu, wrap_counter=%u\n",</div><div class='add'>+		       (unsigned long long)base_time_ns, data-&gt;wrap_counter);</div><div class='add'>+</div><div class='add'>+	base_time_ns = base_time_ns +</div><div class='add'>+		(data-&gt;wrap_counter * IWL_PTP_GP2_WRAP * NSEC_PER_USEC);</div><div class='add'>+</div><div class='add'>+	/* It is possible that a GP2 timestamp was received from fw before the</div><div class='add'>+	 * last scale update. Since we don't know how to scale - ignore it.</div><div class='add'>+	 */</div><div class='add'>+	if (base_time_ns &lt; last_gp2_ns) {</div><div class='add'>+		IWL_DEBUG_INFO(mvm, "Time before scale update - ignore\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	diff = base_time_ns - last_gp2_ns;</div><div class='add'>+	IWL_DEBUG_INFO(mvm, "diff ns=%llu\n", (unsigned long long)diff);</div><div class='add'>+</div><div class='add'>+	diff = mul_u64_u64_div_u64(diff, data-&gt;scaled_freq,</div><div class='add'>+				   SCALE_FACTOR);</div><div class='add'>+	IWL_DEBUG_INFO(mvm, "scaled diff ns=%llu\n", (unsigned long long)diff);</div><div class='add'>+</div><div class='add'>+	res = data-&gt;scale_update_adj_time_ns + data-&gt;delta + diff;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(mvm, "base=%llu delta=%lld adj=%llu\n",</div><div class='add'>+		       (unsigned long long)base_time_ns, (long long)data-&gt;delta,</div><div class='add'>+		       (unsigned long long)res);</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mvm_get_crosstimestamp_fw(struct iwl_mvm *mvm, u32 *gp2, u64 *sys_time)</div><div class='add'>+{</div><div class='add'>+	struct iwl_synced_time_cmd synced_time_cmd = {</div><div class='add'>+		.operation = cpu_to_le32(IWL_SYNCED_TIME_OPERATION_READ_BOTH)</div><div class='add'>+	};</div><div class='add'>+	struct iwl_host_cmd cmd = {</div><div class='add'>+		.id = WIDE_ID(DATA_PATH_GROUP, WNM_PLATFORM_PTM_REQUEST_CMD),</div><div class='add'>+		.flags = CMD_WANT_SKB,</div><div class='add'>+		.data[0] = &amp;synced_time_cmd,</div><div class='add'>+		.len[0] = sizeof(synced_time_cmd),</div><div class='add'>+	};</div><div class='add'>+	struct iwl_synced_time_rsp *resp;</div><div class='add'>+	struct iwl_rx_packet *pkt;</div><div class='add'>+	int ret;</div><div class='add'>+	u64 gp2_10ns;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_send_cmd(mvm, &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	pkt = cmd.resp_pkt;</div><div class='add'>+</div><div class='add'>+	if (iwl_rx_packet_payload_len(pkt) != sizeof(*resp)) {</div><div class='add'>+		IWL_ERR(mvm, "PTP: Invalid command response\n");</div><div class='add'>+		iwl_free_resp(&amp;cmd);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	resp = (void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+	gp2_10ns = (u64)le32_to_cpu(resp-&gt;gp2_timestamp_hi) &lt;&lt; 32 |</div><div class='add'>+		le32_to_cpu(resp-&gt;gp2_timestamp_lo);</div><div class='add'>+	*gp2 = div_u64(gp2_10ns, 100);</div><div class='add'>+</div><div class='add'>+	*sys_time = (u64)le32_to_cpu(resp-&gt;platform_timestamp_hi) &lt;&lt; 32 |</div><div class='add'>+		le32_to_cpu(resp-&gt;platform_timestamp_lo);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_phc_get_crosstimestamp_loop(struct iwl_mvm *mvm,</div><div class='add'>+						ktime_t *sys_time, u32 *gp2)</div><div class='add'>+{</div><div class='add'>+	u64 diff = 0, new_diff;</div><div class='add'>+	u64 tmp_sys_time;</div><div class='add'>+	u32 tmp_gp2;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IWL_PTP_GET_CROSS_TS_NUM; i++) {</div><div class='add'>+		iwl_mvm_get_sync_time(mvm, CLOCK_REALTIME, &amp;tmp_gp2, NULL,</div><div class='add'>+				      &amp;tmp_sys_time);</div><div class='add'>+		new_diff = tmp_sys_time - ((u64)tmp_gp2 * NSEC_PER_USEC);</div><div class='add'>+		if (!diff || new_diff &lt; diff) {</div><div class='add'>+			*sys_time = tmp_sys_time;</div><div class='add'>+			*gp2 = tmp_gp2;</div><div class='add'>+			diff = new_diff;</div><div class='add'>+			IWL_DEBUG_INFO(mvm, "PTP: new times: gp2=%u sys=%lld\n",</div><div class='add'>+				       *gp2, *sys_time);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iwl_mvm_phc_get_crosstimestamp(struct ptp_clock_info *ptp,</div><div class='add'>+			       struct system_device_crosststamp *xtstamp)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = container_of(ptp, struct iwl_mvm,</div><div class='add'>+					   ptp_data.ptp_clock_info);</div><div class='add'>+	int ret = 0;</div><div class='add'>+	/* Raw value read from GP2 register in usec */</div><div class='add'>+	u32 gp2;</div><div class='add'>+	/* GP2 value in ns*/</div><div class='add'>+	s64 gp2_ns;</div><div class='add'>+	/* System (wall) time */</div><div class='add'>+	ktime_t sys_time;</div><div class='add'>+</div><div class='add'>+	memset(xtstamp, 0, sizeof(struct system_device_crosststamp));</div><div class='add'>+</div><div class='add'>+	if (!mvm-&gt;ptp_data.ptp_clock) {</div><div class='add'>+		IWL_ERR(mvm, "No PHC clock registered\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa, IWL_UCODE_TLV_CAPA_SYNCED_TIME)) {</div><div class='add'>+		ret = iwl_mvm_get_crosstimestamp_fw(mvm, &amp;gp2, &amp;sys_time);</div><div class='add'>+</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	} else {</div><div class='add'>+		iwl_mvm_phc_get_crosstimestamp_loop(mvm, &amp;sys_time, &amp;gp2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gp2_ns = iwl_mvm_ptp_get_adj_time(mvm, (u64)gp2 * NSEC_PER_USEC);</div><div class='add'>+</div><div class='add'>+	IWL_INFO(mvm, "Got Sync Time: GP2:%u, last_GP2: %u, GP2_ns: %lld, sys_time: %lld\n",</div><div class='add'>+		 gp2, mvm-&gt;ptp_data.last_gp2, gp2_ns, (s64)sys_time);</div><div class='add'>+</div><div class='add'>+	/* System monotonic raw time is not used */</div><div class='add'>+	xtstamp-&gt;device = (ktime_t)gp2_ns;</div><div class='add'>+	xtstamp-&gt;sys_realtime = sys_time;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_ptp_work(struct work_struct *wk)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = container_of(wk, struct iwl_mvm,</div><div class='add'>+					   ptp_data.dwork.work);</div><div class='add'>+	u32 gp2;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	gp2 = iwl_mvm_get_systime(mvm);</div><div class='add'>+	iwl_mvm_ptp_update_new_read(mvm, gp2);</div><div class='add'>+	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_ptp_gettime(struct ptp_clock_info *ptp,</div><div class='add'>+			       struct timespec64 *ts)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = container_of(ptp, struct iwl_mvm,</div><div class='add'>+					   ptp_data.ptp_clock_info);</div><div class='add'>+	u64 gp2;</div><div class='add'>+	u64 ns;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	gp2 = iwl_mvm_get_systime(mvm);</div><div class='add'>+	ns = iwl_mvm_ptp_get_adj_time(mvm, gp2 * NSEC_PER_USEC);</div><div class='add'>+	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	*ts = ns_to_timespec64(ns);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = container_of(ptp, struct iwl_mvm,</div><div class='add'>+					   ptp_data.ptp_clock_info);</div><div class='add'>+	struct ptp_data *data = container_of(ptp, struct ptp_data,</div><div class='add'>+					     ptp_clock_info);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	data-&gt;delta += delta;</div><div class='add'>+	IWL_DEBUG_INFO(mvm, "delta=%lld, new delta=%lld\n", (long long)delta,</div><div class='add'>+		       (long long)data-&gt;delta);</div><div class='add'>+	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = container_of(ptp, struct iwl_mvm,</div><div class='add'>+					   ptp_data.ptp_clock_info);</div><div class='add'>+	struct ptp_data *data = &amp;mvm-&gt;ptp_data;</div><div class='add'>+	u32 gp2;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* Must call _iwl_mvm_ptp_get_adj_time() before updating</div><div class='add'>+	 * data-&gt;scale_update_gp2 or data-&gt;scaled_freq since</div><div class='add'>+	 * scale_update_adj_time_ns should reflect the previous scaled_freq.</div><div class='add'>+	 */</div><div class='add'>+	gp2 = iwl_mvm_get_systime(mvm);</div><div class='add'>+	data-&gt;scale_update_adj_time_ns =</div><div class='add'>+		iwl_mvm_ptp_get_adj_time(mvm, gp2 * NSEC_PER_USEC);</div><div class='add'>+	data-&gt;scale_update_gp2 = gp2;</div><div class='add'>+	data-&gt;wrap_counter = 0;</div><div class='add'>+	data-&gt;delta = 0;</div><div class='add'>+</div><div class='add'>+	data-&gt;scaled_freq = SCALE_FACTOR + scaled_ppm;</div><div class='add'>+	IWL_DEBUG_INFO(mvm, "adjfine: scaled_ppm=%ld new=%llu\n",</div><div class='add'>+		       scaled_ppm, (unsigned long long)data-&gt;scaled_freq);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* iwl_mvm_ptp_init - initialize PTP for devices which support it.</div><div class='add'>+ * @mvm: internal mvm structure, see &amp;struct iwl_mvm.</div><div class='add'>+ *</div><div class='add'>+ * Performs the required steps for enabling PTP support.</div><div class='add'>+ */</div><div class='add'>+void iwl_mvm_ptp_init(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	/* Warn if the interface already has a ptp_clock defined */</div><div class='add'>+	if (WARN_ON(mvm-&gt;ptp_data.ptp_clock))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mvm-&gt;ptp_data.ptp_clock_info.owner = THIS_MODULE;</div><div class='add'>+	mvm-&gt;ptp_data.ptp_clock_info.max_adj = 0x7fffffff;</div><div class='add'>+	mvm-&gt;ptp_data.ptp_clock_info.getcrosststamp =</div><div class='add'>+					iwl_mvm_phc_get_crosstimestamp;</div><div class='add'>+	mvm-&gt;ptp_data.ptp_clock_info.adjfine = iwl_mvm_ptp_adjfine;</div><div class='add'>+	mvm-&gt;ptp_data.ptp_clock_info.adjtime = iwl_mvm_ptp_adjtime;</div><div class='add'>+	mvm-&gt;ptp_data.ptp_clock_info.gettime64 = iwl_mvm_ptp_gettime;</div><div class='add'>+	mvm-&gt;ptp_data.scaled_freq = SCALE_FACTOR;</div><div class='add'>+</div><div class='add'>+	/* Give a short 'friendly name' to identify the PHC clock */</div><div class='add'>+	snprintf(mvm-&gt;ptp_data.ptp_clock_info.name,</div><div class='add'>+		 sizeof(mvm-&gt;ptp_data.ptp_clock_info.name),</div><div class='add'>+		 "%s", "iwlwifi-PTP");</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;mvm-&gt;ptp_data.dwork, iwl_mvm_ptp_work);</div><div class='add'>+</div><div class='add'>+	mvm-&gt;ptp_data.ptp_clock =</div><div class='add'>+		ptp_clock_register(&amp;mvm-&gt;ptp_data.ptp_clock_info, mvm-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(mvm-&gt;ptp_data.ptp_clock)) {</div><div class='add'>+		IWL_ERR(mvm, "Failed to register PHC clock (%ld)\n",</div><div class='add'>+			PTR_ERR(mvm-&gt;ptp_data.ptp_clock));</div><div class='add'>+		mvm-&gt;ptp_data.ptp_clock = NULL;</div><div class='add'>+	} else if (mvm-&gt;ptp_data.ptp_clock) {</div><div class='add'>+		IWL_DEBUG_INFO(mvm, "Registered PHC clock: %s, with index: %d\n",</div><div class='add'>+			       mvm-&gt;ptp_data.ptp_clock_info.name,</div><div class='add'>+			       ptp_clock_index(mvm-&gt;ptp_data.ptp_clock));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* iwl_mvm_ptp_remove - disable PTP device.</div><div class='add'>+ * @mvm: internal mvm structure, see &amp;struct iwl_mvm.</div><div class='add'>+ *</div><div class='add'>+ * Disable PTP support.</div><div class='add'>+ */</div><div class='add'>+void iwl_mvm_ptp_remove(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	if (mvm-&gt;ptp_data.ptp_clock) {</div><div class='add'>+		IWL_DEBUG_INFO(mvm, "Unregistering PHC clock: %s, with index: %d\n",</div><div class='add'>+			       mvm-&gt;ptp_data.ptp_clock_info.name,</div><div class='add'>+			       ptp_clock_index(mvm-&gt;ptp_data.ptp_clock));</div><div class='add'>+</div><div class='add'>+		ptp_clock_unregister(mvm-&gt;ptp_data.ptp_clock);</div><div class='add'>+		mvm-&gt;ptp_data.ptp_clock = NULL;</div><div class='add'>+		memset(&amp;mvm-&gt;ptp_data.ptp_clock_info, 0,</div><div class='add'>+		       sizeof(mvm-&gt;ptp_data.ptp_clock_info));</div><div class='add'>+		mvm-&gt;ptp_data.last_gp2 = 0;</div><div class='add'>+		cancel_delayed_work_sync(&amp;mvm-&gt;ptp_data.dwork);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/quota.c b/drivers/net/wireless/intel/iwlwifi/mvm/quota.c<br/>index 3d0166df2002..798a7e4bea83 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/quota.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/quota.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/quota.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/quota.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018, 2021-2022, 2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -33,11 +33,11 @@ static void iwl_mvm_quota_iterator(void *_data, u8 *mac,</div><div class='ctx'> 	if (vif == data-&gt;disabled_vif)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!mvmvif-&gt;phy_ctxt)</div><div class='add'>+	if (!mvmvif-&gt;deflink.phy_ctxt)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* currently, PHY ID == binding ID */</div><div class='del'>-	id = mvmvif-&gt;phy_ctxt-&gt;id;</div><div class='add'>+	id = mvmvif-&gt;deflink.phy_ctxt-&gt;id;</div><div class='ctx'> </div><div class='ctx'> 	/* need at least one binding per PHY */</div><div class='ctx'> 	BUILD_BUG_ON(NUM_PHY_CTX &gt; MAX_BINDINGS);</div><div class='hunk'>@@ -47,7 +47,7 @@ static void iwl_mvm_quota_iterator(void *_data, u8 *mac,</div><div class='ctx'> </div><div class='ctx'> 	switch (vif-&gt;type) {</div><div class='ctx'> 	case NL80211_IFTYPE_STATION:</div><div class='del'>-		if (vif-&gt;bss_conf.assoc)</div><div class='add'>+		if (vif-&gt;cfg.assoc)</div><div class='ctx'> 			break;</div><div class='ctx'> 		return;</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='hunk'>@@ -67,9 +67,10 @@ static void iwl_mvm_quota_iterator(void *_data, u8 *mac,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;colors[id] &lt; 0)</div><div class='del'>-		data-&gt;colors[id] = mvmvif-&gt;phy_ctxt-&gt;color;</div><div class='add'>+		data-&gt;colors[id] = mvmvif-&gt;deflink.phy_ctxt-&gt;color;</div><div class='ctx'> 	else</div><div class='del'>-		WARN_ON_ONCE(data-&gt;colors[id] != mvmvif-&gt;phy_ctxt-&gt;color);</div><div class='add'>+		WARN_ON_ONCE(data-&gt;colors[id] !=</div><div class='add'>+			     mvmvif-&gt;deflink.phy_ctxt-&gt;color);</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;n_interfaces[id]++;</div><div class='ctx'> </div><div class='hunk'>@@ -85,45 +86,6 @@ static void iwl_mvm_quota_iterator(void *_data, u8 *mac,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_adjust_quota_for_noa(struct iwl_mvm *mvm,</div><div class='del'>-					 struct iwl_time_quota_cmd *cmd)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_NL80211_TESTMODE</div><div class='del'>-	struct iwl_mvm_vif *mvmvif;</div><div class='del'>-	int i, phy_id = -1, beacon_int = 0;</div><div class='del'>-</div><div class='del'>-	if (!mvm-&gt;noa_duration || !mvm-&gt;noa_vif)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mvmvif = iwl_mvm_vif_from_mac80211(mvm-&gt;noa_vif);</div><div class='del'>-	if (!mvmvif-&gt;ap_ibss_active)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	phy_id = mvmvif-&gt;phy_ctxt-&gt;id;</div><div class='del'>-	beacon_int = mvm-&gt;noa_vif-&gt;bss_conf.beacon_int;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MAX_BINDINGS; i++) {</div><div class='del'>-		struct iwl_time_quota_data *data =</div><div class='del'>-					iwl_mvm_quota_cmd_get_quota(mvm, cmd,</div><div class='del'>-								    i);</div><div class='del'>-		u32 id_n_c = le32_to_cpu(data-&gt;id_and_color);</div><div class='del'>-		u32 id = (id_n_c &amp; FW_CTXT_ID_MSK) &gt;&gt; FW_CTXT_ID_POS;</div><div class='del'>-		u32 quota = le32_to_cpu(data-&gt;quota);</div><div class='del'>-</div><div class='del'>-		if (id != phy_id)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		quota *= (beacon_int - mvm-&gt;noa_duration);</div><div class='del'>-		quota /= beacon_int;</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_QUOTA(mvm, "quota: adjust for NoA from %d to %d\n",</div><div class='del'>-				le32_to_cpu(data-&gt;quota), quota);</div><div class='del'>-</div><div class='del'>-		data-&gt;quota = cpu_to_le32(quota);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int iwl_mvm_update_quotas(struct iwl_mvm *mvm,</div><div class='ctx'> 			  bool force_update,</div><div class='ctx'> 			  struct ieee80211_vif *disabled_vif)</div><div class='hunk'>@@ -259,8 +221,6 @@ int iwl_mvm_update_quotas(struct iwl_mvm *mvm,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_adjust_quota_for_noa(mvm, &amp;cmd);</div><div class='del'>-</div><div class='ctx'> 	/* check that we have non-zero quota for all valid bindings */</div><div class='ctx'> 	for (i = 0; i &lt; MAX_BINDINGS; i++) {</div><div class='ctx'> 		qdata = iwl_mvm_quota_cmd_get_quota(mvm, &amp;cmd, i);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rfi.c b/drivers/net/wireless/intel/iwlwifi/mvm/rfi.c<br/>index 0b818067067c..045c862a8fc4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/rfi.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/rfi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/rfi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/rfi.c</a></div><div class='hunk'>@@ -1,45 +1,63 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2020 - 2021 Intel Corporation</div><div class='add'>+ * Copyright (C) 2020 - 2022 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "mvm.h"</div><div class='ctx'> #include "fw/api/commands.h"</div><div class='ctx'> #include "fw/api/phy-ctxt.h"</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * DDR needs frequency in units of 16.666MHz, so provide FW with the</div><div class='ctx'>  * frequency values in the adjusted format.</div><div class='ctx'>  */</div><div class='del'>-const static struct iwl_rfi_lut_entry iwl_rfi_table[IWL_RFI_LUT_SIZE] = {</div><div class='del'>-	/* LPDDR4 */</div><div class='add'>+static const struct iwl_rfi_lut_entry iwl_rfi_table[IWL_RFI_LUT_SIZE] = {</div><div class='add'>+	/* frequency 2667MHz */</div><div class='add'>+	{cpu_to_le16(160), {50, 58, 60, 62, 64, 52, 54, 56},</div><div class='add'>+	      {PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,</div><div class='add'>+	       PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,}},</div><div class='add'>+</div><div class='add'>+	/* frequency 2933MHz */</div><div class='add'>+	{cpu_to_le16(176), {149, 151, 153, 157, 159, 161, 165, 163, 167, 169,</div><div class='add'>+			    171, 173, 175},</div><div class='add'>+	      {PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,</div><div class='add'>+	       PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,</div><div class='add'>+	       PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,}},</div><div class='add'>+</div><div class='add'>+	/* frequency 3200MHz */</div><div class='add'>+	{cpu_to_le16(192), {79, 81, 83, 85, 87, 89, 91, 93},</div><div class='add'>+	      {PHY_BAND_6, PHY_BAND_6, PHY_BAND_6, PHY_BAND_6, PHY_BAND_6,</div><div class='add'>+	       PHY_BAND_6, PHY_BAND_6, PHY_BAND_6,}},</div><div class='ctx'> </div><div class='ctx'> 	/* frequency 3733MHz */</div><div class='del'>-	{cpu_to_le16(223), {114, 116, 118, 120, 122,},</div><div class='del'>-	      {PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,}},</div><div class='add'>+	{cpu_to_le16(223), {114, 116, 118, 120, 122, 106, 110, 124, 126},</div><div class='add'>+	      {PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,</div><div class='add'>+	       PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,}},</div><div class='add'>+</div><div class='add'>+	/* frequency 4000MHz */</div><div class='add'>+	{cpu_to_le16(240), {114, 151, 155, 157, 159, 161, 165},</div><div class='add'>+	      {PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,</div><div class='add'>+	       PHY_BAND_5, PHY_BAND_5,}},</div><div class='ctx'> </div><div class='ctx'> 	/* frequency 4267MHz */</div><div class='ctx'> 	{cpu_to_le16(256), {79, 83, 85, 87, 89, 91, 93,},</div><div class='ctx'> 	       {PHY_BAND_6, PHY_BAND_6, PHY_BAND_6, PHY_BAND_6, PHY_BAND_6,</div><div class='ctx'> 		PHY_BAND_6, PHY_BAND_6,}},</div><div class='ctx'> </div><div class='del'>-	/* DDR5ePOR */</div><div class='del'>-</div><div class='del'>-	/* frequency 4000MHz */</div><div class='del'>-	{cpu_to_le16(240), {3, 5, 7, 9, 11, 13, 15,},</div><div class='del'>-	      {PHY_BAND_6, PHY_BAND_6, PHY_BAND_6, PHY_BAND_6, PHY_BAND_6,</div><div class='del'>-	       PHY_BAND_6, PHY_BAND_6,}},</div><div class='del'>-</div><div class='ctx'> 	/* frequency 4400MHz */</div><div class='ctx'> 	{cpu_to_le16(264), {111, 119, 123, 125, 129, 131, 133, 135, 143,},</div><div class='ctx'> 	      {PHY_BAND_6, PHY_BAND_6, PHY_BAND_6, PHY_BAND_6, PHY_BAND_6,</div><div class='ctx'> 	       PHY_BAND_6, PHY_BAND_6, PHY_BAND_6, PHY_BAND_6,}},</div><div class='ctx'> </div><div class='del'>-	/* LPDDR5iPOR */</div><div class='del'>-</div><div class='ctx'> 	/* frequency 5200MHz */</div><div class='del'>-	{cpu_to_le16(312), {36, 38, 40, 42, 50,},</div><div class='del'>-	       {PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,}},</div><div class='add'>+	{cpu_to_le16(312), {36, 38, 40, 42, 44, 46, 50,},</div><div class='add'>+	       {PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,</div><div class='add'>+		PHY_BAND_5, PHY_BAND_5,}},</div><div class='add'>+</div><div class='add'>+	/* frequency 5600MHz */</div><div class='add'>+	{cpu_to_le16(336), {106, 110, 112, 114, 116, 118, 120, 122},</div><div class='add'>+	       {PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,</div><div class='add'>+		PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,}},</div><div class='ctx'> </div><div class='ctx'> 	/* frequency 6000MHz */</div><div class='ctx'> 	{cpu_to_le16(360), {3, 5, 7, 9, 11, 13, 15,},</div><div class='hunk'>@@ -52,6 +70,16 @@ const static struct iwl_rfi_lut_entry iwl_rfi_table[IWL_RFI_LUT_SIZE] = {</div><div class='ctx'> 		PHY_BAND_6, PHY_BAND_6,}},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+bool iwl_rfi_supported(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	/* The feature depends on a platform bugfix, so for now</div><div class='add'>+	 * it's always disabled.</div><div class='add'>+	 * When the platform support detection is implemented we should</div><div class='add'>+	 * check FW TLV and platform support instead.</div><div class='add'>+	 */</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int iwl_rfi_send_config_cmd(struct iwl_mvm *mvm, struct iwl_rfi_lut_entry *rfi_table)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -63,7 +91,7 @@ int iwl_rfi_send_config_cmd(struct iwl_mvm *mvm, struct iwl_rfi_lut_entry *rfi_t</div><div class='ctx'> 		.len[0] = sizeof(cmd),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (!fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa, IWL_UCODE_TLV_CAPA_RFIM_SUPPORT))</div><div class='add'>+	if (!iwl_rfi_supported(mvm))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='hunk'>@@ -95,7 +123,7 @@ struct iwl_rfi_freq_table_resp_cmd *iwl_rfi_get_freq_table(struct iwl_mvm *mvm)</div><div class='ctx'> 		.flags = CMD_WANT_SKB,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (!fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa, IWL_UCODE_TLV_CAPA_RFIM_SUPPORT))</div><div class='add'>+	if (!iwl_rfi_supported(mvm))</div><div class='ctx'> 		return ERR_PTR(-EOPNOTSUPP);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='hunk'>@@ -104,15 +132,26 @@ struct iwl_rfi_freq_table_resp_cmd *iwl_rfi_get_freq_table(struct iwl_mvm *mvm)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(iwl_rx_packet_payload_len(cmd.resp_pkt) != resp_size))</div><div class='add'>+	if (WARN_ON_ONCE(iwl_rx_packet_payload_len(cmd.resp_pkt) !=</div><div class='add'>+			 resp_size)) {</div><div class='add'>+		iwl_free_resp(&amp;cmd);</div><div class='ctx'> 		return ERR_PTR(-EIO);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	resp = kmemdup(cmd.resp_pkt-&gt;data, resp_size, GFP_KERNEL);</div><div class='add'>+	iwl_free_resp(&amp;cmd);</div><div class='ctx'> </div><div class='del'>-	resp = kzalloc(resp_size, GFP_KERNEL);</div><div class='ctx'> 	if (!resp)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	memcpy(resp, cmd.resp_pkt-&gt;data, resp_size);</div><div class='del'>-</div><div class='del'>-	iwl_free_resp(&amp;cmd);</div><div class='ctx'> 	return resp;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void iwl_rfi_deactivate_notif_handler(struct iwl_mvm *mvm,</div><div class='add'>+				      struct iwl_rx_cmd_buffer *rxb)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='add'>+	struct iwl_rfi_deactivate_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+	IWL_INFO(mvm, "RFIm is deactivated, reason = %d\n", notif-&gt;reason);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c<br/>index 2d58cb969918..89ac4c6b3e54 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2018-2021 Intel Corporation</div><div class='add'>+ * Copyright (C) 2018-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #include "rs.h"</div><div class='ctx'> #include "fw-api.h"</div><div class='hunk'>@@ -9,9 +9,11 @@</div><div class='ctx'> #include "iwl-op-mode.h"</div><div class='ctx'> #include "mvm.h"</div><div class='ctx'> </div><div class='del'>-static u8 rs_fw_bw_from_sta_bw(struct ieee80211_sta *sta)</div><div class='add'>+static u8 rs_fw_bw_from_sta_bw(const struct ieee80211_link_sta *link_sta)</div><div class='ctx'> {</div><div class='del'>-	switch (sta-&gt;bandwidth) {</div><div class='add'>+	switch (link_sta-&gt;bandwidth) {</div><div class='add'>+	case IEEE80211_STA_RX_BW_320:</div><div class='add'>+		return IWL_TLC_MNG_CH_WIDTH_320MHZ;</div><div class='ctx'> 	case IEEE80211_STA_RX_BW_160:</div><div class='ctx'> 		return IWL_TLC_MNG_CH_WIDTH_160MHZ;</div><div class='ctx'> 	case IEEE80211_STA_RX_BW_80:</div><div class='hunk'>@@ -32,19 +34,15 @@ static u8 rs_fw_set_active_chains(u8 chains)</div><div class='ctx'> 		fw_chains |= IWL_TLC_MNG_CHAIN_A_MSK;</div><div class='ctx'> 	if (chains &amp; ANT_B)</div><div class='ctx'> 		fw_chains |= IWL_TLC_MNG_CHAIN_B_MSK;</div><div class='del'>-	if (chains &amp; ANT_C)</div><div class='del'>-		WARN(false,</div><div class='del'>-		     "tlc offload doesn't support antenna C. chains: 0x%x\n",</div><div class='del'>-		     chains);</div><div class='ctx'> </div><div class='ctx'> 	return fw_chains;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 rs_fw_sgi_cw_support(struct ieee80211_sta *sta)</div><div class='add'>+static u8 rs_fw_sgi_cw_support(struct ieee80211_link_sta *link_sta)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='del'>-	struct ieee80211_sta_vht_cap *vht_cap = &amp;sta-&gt;vht_cap;</div><div class='del'>-	struct ieee80211_sta_he_cap *he_cap = &amp;sta-&gt;he_cap;</div><div class='add'>+	struct ieee80211_sta_ht_cap *ht_cap = &amp;link_sta-&gt;ht_cap;</div><div class='add'>+	struct ieee80211_sta_vht_cap *vht_cap = &amp;link_sta-&gt;vht_cap;</div><div class='add'>+	struct ieee80211_sta_he_cap *he_cap = &amp;link_sta-&gt;he_cap;</div><div class='ctx'> 	u8 supp = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (he_cap-&gt;has_he)</div><div class='hunk'>@@ -63,17 +61,18 @@ static u8 rs_fw_sgi_cw_support(struct ieee80211_sta *sta)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 rs_fw_get_config_flags(struct iwl_mvm *mvm,</div><div class='del'>-				  struct ieee80211_sta *sta,</div><div class='del'>-				  struct ieee80211_supported_band *sband)</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  struct ieee80211_link_sta *link_sta,</div><div class='add'>+				  const struct ieee80211_sta_he_cap *sband_he_cap)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='del'>-	struct ieee80211_sta_vht_cap *vht_cap = &amp;sta-&gt;vht_cap;</div><div class='del'>-	struct ieee80211_sta_he_cap *he_cap = &amp;sta-&gt;he_cap;</div><div class='add'>+	struct ieee80211_sta_ht_cap *ht_cap = &amp;link_sta-&gt;ht_cap;</div><div class='add'>+	struct ieee80211_sta_vht_cap *vht_cap = &amp;link_sta-&gt;vht_cap;</div><div class='add'>+	struct ieee80211_sta_he_cap *he_cap = &amp;link_sta-&gt;he_cap;</div><div class='ctx'> 	bool vht_ena = vht_cap-&gt;vht_supported;</div><div class='ctx'> 	u16 flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* get STBC flags */</div><div class='del'>-	if (mvm-&gt;cfg-&gt;ht_params-&gt;stbc &amp;&amp;</div><div class='add'>+	if (mvm-&gt;cfg-&gt;ht_params.stbc &amp;&amp;</div><div class='ctx'> 	    (num_of_ant(iwl_mvm_get_valid_tx_ant(mvm)) &gt; 1)) {</div><div class='ctx'> 		if (he_cap-&gt;has_he &amp;&amp; he_cap-&gt;he_cap_elem.phy_cap_info[2] &amp;</div><div class='ctx'> 				      IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ)</div><div class='hunk'>@@ -84,7 +83,7 @@ static u16 rs_fw_get_config_flags(struct iwl_mvm *mvm,</div><div class='ctx'> 			flags |= IWL_TLC_MNG_CFG_FLAGS_STBC_MSK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mvm-&gt;cfg-&gt;ht_params-&gt;ldpc &amp;&amp;</div><div class='add'>+	if (mvm-&gt;cfg-&gt;ht_params.ldpc &amp;&amp;</div><div class='ctx'> 	    ((ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_LDPC_CODING) ||</div><div class='ctx'> 	     (vht_ena &amp;&amp; (vht_cap-&gt;cap &amp; IEEE80211_VHT_CAP_RXLDPC))))</div><div class='ctx'> 		flags |= IWL_TLC_MNG_CFG_FLAGS_LDPC_MSK;</div><div class='hunk'>@@ -94,14 +93,17 @@ static u16 rs_fw_get_config_flags(struct iwl_mvm *mvm,</div><div class='ctx'> 	    IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD))</div><div class='ctx'> 		flags |= IWL_TLC_MNG_CFG_FLAGS_LDPC_MSK;</div><div class='ctx'> </div><div class='del'>-	if (sband-&gt;iftype_data &amp;&amp; sband-&gt;iftype_data-&gt;he_cap.has_he &amp;&amp;</div><div class='del'>-	    !(sband-&gt;iftype_data-&gt;he_cap.he_cap_elem.phy_cap_info[1] &amp;</div><div class='del'>-	     IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD))</div><div class='add'>+	if (sband_he_cap &amp;&amp;</div><div class='add'>+	    !(sband_he_cap-&gt;he_cap_elem.phy_cap_info[1] &amp;</div><div class='add'>+			IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD))</div><div class='ctx'> 		flags &amp;= ~IWL_TLC_MNG_CFG_FLAGS_LDPC_MSK;</div><div class='ctx'> </div><div class='ctx'> 	if (he_cap-&gt;has_he &amp;&amp;</div><div class='ctx'> 	    (he_cap-&gt;he_cap_elem.phy_cap_info[3] &amp;</div><div class='del'>-	     IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_MASK))</div><div class='add'>+	     IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_MASK &amp;&amp;</div><div class='add'>+	     sband_he_cap &amp;&amp;</div><div class='add'>+	     sband_he_cap-&gt;he_cap_elem.phy_cap_info[3] &amp;</div><div class='add'>+			IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_MASK))</div><div class='ctx'> 		flags |= IWL_TLC_MNG_CFG_FLAGS_HE_DCM_NSS_1_MSK;</div><div class='ctx'> </div><div class='ctx'> 	return flags;</div><div class='hunk'>@@ -131,20 +133,20 @@ int rs_fw_vht_highest_rx_mcs_index(const struct ieee80211_sta_vht_cap *vht_cap,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-rs_fw_vht_set_enabled_rates(const struct ieee80211_sta *sta,</div><div class='add'>+rs_fw_vht_set_enabled_rates(const struct ieee80211_link_sta *link_sta,</div><div class='ctx'> 			    const struct ieee80211_sta_vht_cap *vht_cap,</div><div class='del'>-			    struct iwl_tlc_config_cmd *cmd)</div><div class='add'>+			    struct iwl_tlc_config_cmd_v4 *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	u16 supp;</div><div class='ctx'> 	int i, highest_mcs;</div><div class='del'>-	u8 max_nss = sta-&gt;rx_nss;</div><div class='add'>+	u8 max_nss = link_sta-&gt;rx_nss;</div><div class='ctx'> 	struct ieee80211_vht_cap ieee_vht_cap = {</div><div class='ctx'> 		.vht_cap_info = cpu_to_le32(vht_cap-&gt;cap),</div><div class='ctx'> 		.supp_mcs = vht_cap-&gt;vht_mcs,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	/* the station support only a single receive chain */</div><div class='del'>-	if (sta-&gt;smps_mode == IEEE80211_SMPS_STATIC)</div><div class='add'>+	if (link_sta-&gt;smps_mode == IEEE80211_SMPS_STATIC)</div><div class='ctx'> 		max_nss = 1;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; max_nss &amp;&amp; i &lt; IWL_TLC_NSS_MAX; i++) {</div><div class='hunk'>@@ -155,21 +157,21 @@ rs_fw_vht_set_enabled_rates(const struct ieee80211_sta *sta,</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		supp = BIT(highest_mcs + 1) - 1;</div><div class='del'>-		if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_20)</div><div class='add'>+		if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_20)</div><div class='ctx'> 			supp &amp;= ~BIT(IWL_TLC_MNG_HT_RATE_MCS9);</div><div class='ctx'> </div><div class='del'>-		cmd-&gt;ht_rates[i][IWL_TLC_HT_BW_NONE_160] = cpu_to_le16(supp);</div><div class='add'>+		cmd-&gt;ht_rates[i][IWL_TLC_MCS_PER_BW_80] = cpu_to_le16(supp);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Check if VHT extended NSS indicates that the bandwidth/NSS</div><div class='ctx'> 		 * configuration is supported - only for MCS 0 since we already</div><div class='ctx'> 		 * decoded the MCS bits anyway ourselves.</div><div class='ctx'> 		 */</div><div class='del'>-		if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_160 &amp;&amp;</div><div class='add'>+		if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_160 &amp;&amp;</div><div class='ctx'> 		    ieee80211_get_vht_max_nss(&amp;ieee_vht_cap,</div><div class='ctx'> 					      IEEE80211_VHT_CHANWIDTH_160MHZ,</div><div class='ctx'> 					      0, true, nss) &gt;= nss)</div><div class='del'>-			cmd-&gt;ht_rates[i][IWL_TLC_HT_BW_160] =</div><div class='del'>-				cmd-&gt;ht_rates[i][IWL_TLC_HT_BW_NONE_160];</div><div class='add'>+			cmd-&gt;ht_rates[i][IWL_TLC_MCS_PER_BW_160] =</div><div class='add'>+				cmd-&gt;ht_rates[i][IWL_TLC_MCS_PER_BW_80];</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -191,22 +193,20 @@ static u16 rs_fw_he_ieee80211_mcs_to_rs_mcs(u16 mcs)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-rs_fw_he_set_enabled_rates(const struct ieee80211_sta *sta,</div><div class='del'>-			   struct ieee80211_supported_band *sband,</div><div class='del'>-			   struct iwl_tlc_config_cmd *cmd)</div><div class='add'>+rs_fw_he_set_enabled_rates(const struct ieee80211_link_sta *link_sta,</div><div class='add'>+			   const struct ieee80211_sta_he_cap *sband_he_cap,</div><div class='add'>+			   struct iwl_tlc_config_cmd_v4 *cmd)</div><div class='ctx'> {</div><div class='del'>-	const struct ieee80211_sta_he_cap *he_cap = &amp;sta-&gt;he_cap;</div><div class='add'>+	const struct ieee80211_sta_he_cap *he_cap = &amp;link_sta-&gt;he_cap;</div><div class='ctx'> 	u16 mcs_160 = le16_to_cpu(he_cap-&gt;he_mcs_nss_supp.rx_mcs_160);</div><div class='ctx'> 	u16 mcs_80 = le16_to_cpu(he_cap-&gt;he_mcs_nss_supp.rx_mcs_80);</div><div class='del'>-	u16 tx_mcs_80 =</div><div class='del'>-		le16_to_cpu(sband-&gt;iftype_data-&gt;he_cap.he_mcs_nss_supp.tx_mcs_80);</div><div class='del'>-	u16 tx_mcs_160 =</div><div class='del'>-		le16_to_cpu(sband-&gt;iftype_data-&gt;he_cap.he_mcs_nss_supp.tx_mcs_160);</div><div class='add'>+	u16 tx_mcs_80 = le16_to_cpu(sband_he_cap-&gt;he_mcs_nss_supp.tx_mcs_80);</div><div class='add'>+	u16 tx_mcs_160 = le16_to_cpu(sband_he_cap-&gt;he_mcs_nss_supp.tx_mcs_160);</div><div class='ctx'> 	int i;</div><div class='del'>-	u8 nss = sta-&gt;rx_nss;</div><div class='add'>+	u8 nss = link_sta-&gt;rx_nss;</div><div class='ctx'> </div><div class='ctx'> 	/* the station support only a single receive chain */</div><div class='del'>-	if (sta-&gt;smps_mode == IEEE80211_SMPS_STATIC)</div><div class='add'>+	if (link_sta-&gt;smps_mode == IEEE80211_SMPS_STATIC)</div><div class='ctx'> 		nss = 1;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nss &amp;&amp; i &lt; IWL_TLC_NSS_MAX; i++) {</div><div class='hunk'>@@ -223,7 +223,7 @@ rs_fw_he_set_enabled_rates(const struct ieee80211_sta *sta,</div><div class='ctx'> 		}</div><div class='ctx'> 		if (_mcs_80 &gt; _tx_mcs_80)</div><div class='ctx'> 			_mcs_80 = _tx_mcs_80;</div><div class='del'>-		cmd-&gt;ht_rates[i][IWL_TLC_HT_BW_NONE_160] =</div><div class='add'>+		cmd-&gt;ht_rates[i][IWL_TLC_MCS_PER_BW_80] =</div><div class='ctx'> 			cpu_to_le16(rs_fw_he_ieee80211_mcs_to_rs_mcs(_mcs_80));</div><div class='ctx'> </div><div class='ctx'> 		/* If one side doesn't support - mark both as not supporting */</div><div class='hunk'>@@ -234,24 +234,151 @@ rs_fw_he_set_enabled_rates(const struct ieee80211_sta *sta,</div><div class='ctx'> 		}</div><div class='ctx'> 		if (_mcs_160 &gt; _tx_mcs_160)</div><div class='ctx'> 			_mcs_160 = _tx_mcs_160;</div><div class='del'>-		cmd-&gt;ht_rates[i][IWL_TLC_HT_BW_160] =</div><div class='add'>+		cmd-&gt;ht_rates[i][IWL_TLC_MCS_PER_BW_160] =</div><div class='ctx'> 			cpu_to_le16(rs_fw_he_ieee80211_mcs_to_rs_mcs(_mcs_160));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rs_fw_set_supp_rates(struct ieee80211_sta *sta,</div><div class='add'>+static u8 rs_fw_eht_max_nss(u8 rx_nss, u8 tx_nss)</div><div class='add'>+{</div><div class='add'>+	u8 tx = u8_get_bits(tx_nss, IEEE80211_EHT_MCS_NSS_TX);</div><div class='add'>+	u8 rx = u8_get_bits(rx_nss, IEEE80211_EHT_MCS_NSS_RX);</div><div class='add'>+	/* the max nss that can be used,</div><div class='add'>+	 * is the min with our tx capa and the peer rx capa.</div><div class='add'>+	 */</div><div class='add'>+	return min(tx, rx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MAX_NSS_MCS(mcs_num, rx, tx) \</div><div class='add'>+	rs_fw_eht_max_nss((rx)-&gt;rx_tx_mcs ##mcs_num## _max_nss, \</div><div class='add'>+			  (tx)-&gt;rx_tx_mcs ##mcs_num## _max_nss)</div><div class='add'>+</div><div class='add'>+static void rs_fw_set_eht_mcs_nss(__le16 ht_rates[][3],</div><div class='add'>+				  enum IWL_TLC_MCS_PER_BW bw,</div><div class='add'>+				  u8 max_nss, u16 mcs_msk)</div><div class='add'>+{</div><div class='add'>+	if (max_nss &gt;= 2)</div><div class='add'>+		ht_rates[IWL_TLC_NSS_2][bw] |= cpu_to_le16(mcs_msk);</div><div class='add'>+</div><div class='add'>+	if (max_nss &gt;= 1)</div><div class='add'>+		ht_rates[IWL_TLC_NSS_1][bw] |= cpu_to_le16(mcs_msk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const</div><div class='add'>+struct ieee80211_eht_mcs_nss_supp_bw *</div><div class='add'>+rs_fw_rs_mcs2eht_mcs(enum IWL_TLC_MCS_PER_BW bw,</div><div class='add'>+		     const struct ieee80211_eht_mcs_nss_supp *eht_mcs)</div><div class='add'>+{</div><div class='add'>+	switch (bw) {</div><div class='add'>+	case IWL_TLC_MCS_PER_BW_80:</div><div class='add'>+		return &amp;eht_mcs-&gt;bw._80;</div><div class='add'>+	case IWL_TLC_MCS_PER_BW_160:</div><div class='add'>+		return &amp;eht_mcs-&gt;bw._160;</div><div class='add'>+	case IWL_TLC_MCS_PER_BW_320:</div><div class='add'>+		return &amp;eht_mcs-&gt;bw._320;</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+rs_fw_eht_set_enabled_rates(struct ieee80211_vif *vif,</div><div class='add'>+			    const struct ieee80211_link_sta *link_sta,</div><div class='add'>+			    const struct ieee80211_sta_he_cap *sband_he_cap,</div><div class='add'>+			    const struct ieee80211_sta_eht_cap *sband_eht_cap,</div><div class='add'>+			    struct iwl_tlc_config_cmd_v4 *cmd)</div><div class='add'>+{</div><div class='add'>+	/* peer RX mcs capa */</div><div class='add'>+	const struct ieee80211_eht_mcs_nss_supp *eht_rx_mcs =</div><div class='add'>+		&amp;link_sta-&gt;eht_cap.eht_mcs_nss_supp;</div><div class='add'>+	/* our TX mcs capa */</div><div class='add'>+	const struct ieee80211_eht_mcs_nss_supp *eht_tx_mcs =</div><div class='add'>+		&amp;sband_eht_cap-&gt;eht_mcs_nss_supp;</div><div class='add'>+</div><div class='add'>+	enum IWL_TLC_MCS_PER_BW bw;</div><div class='add'>+	struct ieee80211_eht_mcs_nss_supp_20mhz_only mcs_rx_20;</div><div class='add'>+	struct ieee80211_eht_mcs_nss_supp_20mhz_only mcs_tx_20;</div><div class='add'>+</div><div class='add'>+	/* peer is 20Mhz only */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+	    !(link_sta-&gt;he_cap.he_cap_elem.phy_cap_info[0] &amp;</div><div class='add'>+	      IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_MASK_ALL)) {</div><div class='add'>+		mcs_rx_20 = eht_rx_mcs-&gt;only_20mhz;</div><div class='add'>+	} else {</div><div class='add'>+		mcs_rx_20.rx_tx_mcs7_max_nss = eht_rx_mcs-&gt;bw._80.rx_tx_mcs9_max_nss;</div><div class='add'>+		mcs_rx_20.rx_tx_mcs9_max_nss = eht_rx_mcs-&gt;bw._80.rx_tx_mcs9_max_nss;</div><div class='add'>+		mcs_rx_20.rx_tx_mcs11_max_nss = eht_rx_mcs-&gt;bw._80.rx_tx_mcs11_max_nss;</div><div class='add'>+		mcs_rx_20.rx_tx_mcs13_max_nss = eht_rx_mcs-&gt;bw._80.rx_tx_mcs13_max_nss;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* nic is 20Mhz only */</div><div class='add'>+	if (!(sband_he_cap-&gt;he_cap_elem.phy_cap_info[0] &amp;</div><div class='add'>+	      IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_MASK_ALL)) {</div><div class='add'>+		mcs_tx_20 = eht_tx_mcs-&gt;only_20mhz;</div><div class='add'>+	} else {</div><div class='add'>+		mcs_tx_20.rx_tx_mcs7_max_nss = eht_tx_mcs-&gt;bw._80.rx_tx_mcs9_max_nss;</div><div class='add'>+		mcs_tx_20.rx_tx_mcs9_max_nss = eht_tx_mcs-&gt;bw._80.rx_tx_mcs9_max_nss;</div><div class='add'>+		mcs_tx_20.rx_tx_mcs11_max_nss = eht_tx_mcs-&gt;bw._80.rx_tx_mcs11_max_nss;</div><div class='add'>+		mcs_tx_20.rx_tx_mcs13_max_nss = eht_tx_mcs-&gt;bw._80.rx_tx_mcs13_max_nss;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* rates for 20/40/80 bw */</div><div class='add'>+	bw = IWL_TLC_MCS_PER_BW_80;</div><div class='add'>+	rs_fw_set_eht_mcs_nss(cmd-&gt;ht_rates, bw,</div><div class='add'>+			      MAX_NSS_MCS(7, &amp;mcs_rx_20, &amp;mcs_tx_20), GENMASK(7, 0));</div><div class='add'>+	rs_fw_set_eht_mcs_nss(cmd-&gt;ht_rates, bw,</div><div class='add'>+			      MAX_NSS_MCS(9, &amp;mcs_rx_20, &amp;mcs_tx_20), GENMASK(9, 8));</div><div class='add'>+	rs_fw_set_eht_mcs_nss(cmd-&gt;ht_rates, bw,</div><div class='add'>+			      MAX_NSS_MCS(11, &amp;mcs_rx_20, &amp;mcs_tx_20), GENMASK(11, 10));</div><div class='add'>+	rs_fw_set_eht_mcs_nss(cmd-&gt;ht_rates, bw,</div><div class='add'>+			      MAX_NSS_MCS(13, &amp;mcs_rx_20, &amp;mcs_tx_20), GENMASK(13, 12));</div><div class='add'>+</div><div class='add'>+	/* rate for 160/320 bw */</div><div class='add'>+	for (bw = IWL_TLC_MCS_PER_BW_160; bw &lt;= IWL_TLC_MCS_PER_BW_320; bw++) {</div><div class='add'>+		const struct ieee80211_eht_mcs_nss_supp_bw *mcs_rx =</div><div class='add'>+			rs_fw_rs_mcs2eht_mcs(bw, eht_rx_mcs);</div><div class='add'>+		const struct ieee80211_eht_mcs_nss_supp_bw *mcs_tx =</div><div class='add'>+			rs_fw_rs_mcs2eht_mcs(bw, eht_tx_mcs);</div><div class='add'>+</div><div class='add'>+		/* got unsupported index for bw */</div><div class='add'>+		if (!mcs_rx || !mcs_tx)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* break out if we don't support the bandwidth */</div><div class='add'>+		if (cmd-&gt;max_ch_width &lt; (bw + IWL_TLC_MNG_CH_WIDTH_80MHZ))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		rs_fw_set_eht_mcs_nss(cmd-&gt;ht_rates, bw,</div><div class='add'>+				      MAX_NSS_MCS(9, mcs_rx, mcs_tx), GENMASK(9, 0));</div><div class='add'>+		rs_fw_set_eht_mcs_nss(cmd-&gt;ht_rates, bw,</div><div class='add'>+				      MAX_NSS_MCS(11, mcs_rx, mcs_tx), GENMASK(11, 10));</div><div class='add'>+		rs_fw_set_eht_mcs_nss(cmd-&gt;ht_rates, bw,</div><div class='add'>+				      MAX_NSS_MCS(13, mcs_rx, mcs_tx), GENMASK(13, 12));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* the station support only a single receive chain */</div><div class='add'>+	if (link_sta-&gt;smps_mode == IEEE80211_SMPS_STATIC ||</div><div class='add'>+	    link_sta-&gt;rx_nss &lt; 2)</div><div class='add'>+		memset(cmd-&gt;ht_rates[IWL_TLC_NSS_2], 0,</div><div class='add'>+		       sizeof(cmd-&gt;ht_rates[IWL_TLC_NSS_2]));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rs_fw_set_supp_rates(struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_link_sta *link_sta,</div><div class='ctx'> 				 struct ieee80211_supported_band *sband,</div><div class='del'>-				 struct iwl_tlc_config_cmd *cmd)</div><div class='add'>+				 const struct ieee80211_sta_he_cap *sband_he_cap,</div><div class='add'>+				 const struct ieee80211_sta_eht_cap *sband_eht_cap,</div><div class='add'>+				 struct iwl_tlc_config_cmd_v4 *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u16 supp = 0;</div><div class='ctx'> 	unsigned long tmp; /* must be unsigned long for for_each_set_bit */</div><div class='del'>-	const struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='del'>-	const struct ieee80211_sta_vht_cap *vht_cap = &amp;sta-&gt;vht_cap;</div><div class='del'>-	const struct ieee80211_sta_he_cap *he_cap = &amp;sta-&gt;he_cap;</div><div class='add'>+	const struct ieee80211_sta_ht_cap *ht_cap = &amp;link_sta-&gt;ht_cap;</div><div class='add'>+	const struct ieee80211_sta_vht_cap *vht_cap = &amp;link_sta-&gt;vht_cap;</div><div class='add'>+	const struct ieee80211_sta_he_cap *he_cap = &amp;link_sta-&gt;he_cap;</div><div class='ctx'> </div><div class='ctx'> 	/* non HT rates */</div><div class='del'>-	tmp = sta-&gt;supp_rates[sband-&gt;band];</div><div class='add'>+	tmp = link_sta-&gt;supp_rates[sband-&gt;band];</div><div class='ctx'> 	for_each_set_bit(i, &amp;tmp, BITS_PER_LONG)</div><div class='ctx'> 		supp |= BIT(sband-&gt;bitrates[i].hw_value);</div><div class='ctx'> </div><div class='hunk'>@@ -259,23 +386,27 @@ static void rs_fw_set_supp_rates(struct ieee80211_sta *sta,</div><div class='ctx'> 	cmd-&gt;mode = IWL_TLC_MNG_MODE_NON_HT;</div><div class='ctx'> </div><div class='ctx'> 	/* HT/VHT rates */</div><div class='del'>-	if (he_cap-&gt;has_he) {</div><div class='add'>+	if (link_sta-&gt;eht_cap.has_eht &amp;&amp; sband_he_cap &amp;&amp; sband_eht_cap) {</div><div class='add'>+		cmd-&gt;mode = IWL_TLC_MNG_MODE_EHT;</div><div class='add'>+		rs_fw_eht_set_enabled_rates(vif, link_sta, sband_he_cap,</div><div class='add'>+					    sband_eht_cap, cmd);</div><div class='add'>+	} else if (he_cap-&gt;has_he &amp;&amp; sband_he_cap) {</div><div class='ctx'> 		cmd-&gt;mode = IWL_TLC_MNG_MODE_HE;</div><div class='del'>-		rs_fw_he_set_enabled_rates(sta, sband, cmd);</div><div class='add'>+		rs_fw_he_set_enabled_rates(link_sta, sband_he_cap, cmd);</div><div class='ctx'> 	} else if (vht_cap-&gt;vht_supported) {</div><div class='ctx'> 		cmd-&gt;mode = IWL_TLC_MNG_MODE_VHT;</div><div class='del'>-		rs_fw_vht_set_enabled_rates(sta, vht_cap, cmd);</div><div class='add'>+		rs_fw_vht_set_enabled_rates(link_sta, vht_cap, cmd);</div><div class='ctx'> 	} else if (ht_cap-&gt;ht_supported) {</div><div class='ctx'> 		cmd-&gt;mode = IWL_TLC_MNG_MODE_HT;</div><div class='del'>-		cmd-&gt;ht_rates[IWL_TLC_NSS_1][IWL_TLC_HT_BW_NONE_160] =</div><div class='add'>+		cmd-&gt;ht_rates[IWL_TLC_NSS_1][IWL_TLC_MCS_PER_BW_80] =</div><div class='ctx'> 			cpu_to_le16(ht_cap-&gt;mcs.rx_mask[0]);</div><div class='ctx'> </div><div class='ctx'> 		/* the station support only a single receive chain */</div><div class='del'>-		if (sta-&gt;smps_mode == IEEE80211_SMPS_STATIC)</div><div class='del'>-			cmd-&gt;ht_rates[IWL_TLC_NSS_2][IWL_TLC_HT_BW_NONE_160] =</div><div class='add'>+		if (link_sta-&gt;smps_mode == IEEE80211_SMPS_STATIC)</div><div class='add'>+			cmd-&gt;ht_rates[IWL_TLC_NSS_2][IWL_TLC_MCS_PER_BW_80] =</div><div class='ctx'> 				0;</div><div class='ctx'> 		else</div><div class='del'>-			cmd-&gt;ht_rates[IWL_TLC_NSS_2][IWL_TLC_HT_BW_NONE_160] =</div><div class='add'>+			cmd-&gt;ht_rates[IWL_TLC_NSS_2][IWL_TLC_MCS_PER_BW_80] =</div><div class='ctx'> 				cpu_to_le16(ht_cap-&gt;mcs.rx_mask[1]);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -286,70 +417,88 @@ void iwl_mvm_tlc_update_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='ctx'> 	struct iwl_tlc_update_notif *notif;</div><div class='ctx'> 	struct ieee80211_sta *sta;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta;</div><div class='add'>+	struct iwl_mvm_link_sta *mvm_link_sta;</div><div class='ctx'> 	struct iwl_lq_sta_rs_fw *lq_sta;</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	notif = (void *)pkt-&gt;data;</div><div class='add'>+	link_sta = rcu_dereference(mvm-&gt;fw_id_to_link_sta[notif-&gt;sta_id]);</div><div class='ctx'> 	sta = rcu_dereference(mvm-&gt;fw_id_to_mac_id[notif-&gt;sta_id]);</div><div class='del'>-	if (IS_ERR_OR_NULL(sta)) {</div><div class='del'>-		IWL_ERR(mvm, "Invalid sta id (%d) in FW TLC notification\n",</div><div class='del'>-			notif-&gt;sta_id);</div><div class='add'>+	if (IS_ERR_OR_NULL(sta) || !link_sta) {</div><div class='add'>+		/* can happen in remove station flow where mvm removed internally</div><div class='add'>+		 * the station before removing from FW</div><div class='add'>+		 */</div><div class='add'>+		IWL_DEBUG_RATE(mvm,</div><div class='add'>+			       "Invalid mvm RCU pointer for sta id (%d) in TLC notification\n",</div><div class='add'>+			       notif-&gt;sta_id);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> </div><div class='del'>-	if (!mvmsta) {</div><div class='del'>-		IWL_ERR(mvm, "Invalid sta id (%d) in FW TLC notification\n",</div><div class='del'>-			notif-&gt;sta_id);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	flags = le32_to_cpu(notif-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	lq_sta = &amp;mvmsta-&gt;lq_sta.rs_fw;</div><div class='add'>+	mvm_link_sta = rcu_dereference(mvmsta-&gt;link[link_sta-&gt;link_id]);</div><div class='add'>+	if (!mvm_link_sta) {</div><div class='add'>+		IWL_DEBUG_RATE(mvm,</div><div class='add'>+			       "Invalid mvmsta RCU pointer for link (%d) of  sta id (%d) in TLC notification\n",</div><div class='add'>+			       link_sta-&gt;link_id, notif-&gt;sta_id);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	lq_sta = &amp;mvm_link_sta-&gt;lq_sta.rs_fw;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; IWL_TLC_NOTIF_FLAG_RATE) {</div><div class='ctx'> 		char pretty_rate[100];</div><div class='del'>-		lq_sta-&gt;last_rate_n_flags = le32_to_cpu(notif-&gt;rate);</div><div class='add'>+</div><div class='add'>+		lq_sta-&gt;last_rate_n_flags =</div><div class='add'>+			iwl_mvm_v3_rate_from_fw(notif-&gt;rate, mvm-&gt;fw_rates_ver);</div><div class='ctx'> 		rs_pretty_print_rate(pretty_rate, sizeof(pretty_rate),</div><div class='ctx'> 				     lq_sta-&gt;last_rate_n_flags);</div><div class='del'>-		IWL_DEBUG_RATE(mvm, "new rate: %s\n", pretty_rate);</div><div class='add'>+		IWL_DEBUG_RATE(mvm, "rate: %s\n", pretty_rate);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; IWL_TLC_NOTIF_FLAG_AMSDU &amp;&amp; !mvmsta-&gt;orig_amsdu_len) {</div><div class='add'>+	if (flags &amp; IWL_TLC_NOTIF_FLAG_AMSDU &amp;&amp; !mvm_link_sta-&gt;orig_amsdu_len) {</div><div class='add'>+		u32 enabled = le32_to_cpu(notif-&gt;amsdu_enabled);</div><div class='ctx'> 		u16 size = le32_to_cpu(notif-&gt;amsdu_size);</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='del'>-		if (sta-&gt;max_amsdu_len &lt; size) {</div><div class='add'>+		if (size &lt; 2000) {</div><div class='add'>+			size = 0;</div><div class='add'>+			enabled = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (link_sta-&gt;agg.max_amsdu_len &lt; size) {</div><div class='ctx'> 			/*</div><div class='del'>-			 * In debug sta-&gt;max_amsdu_len &lt; size</div><div class='add'>+			 * In debug link_sta-&gt;agg.max_amsdu_len &lt; size</div><div class='ctx'> 			 * so also check with orig_amsdu_len which holds the</div><div class='ctx'> 			 * original data before debugfs changed the value</div><div class='ctx'> 			 */</div><div class='del'>-			WARN_ON(mvmsta-&gt;orig_amsdu_len &lt; size);</div><div class='add'>+			WARN_ON(mvm_link_sta-&gt;orig_amsdu_len &lt; size);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		mvmsta-&gt;amsdu_enabled = le32_to_cpu(notif-&gt;amsdu_enabled);</div><div class='add'>+		mvmsta-&gt;amsdu_enabled = enabled;</div><div class='ctx'> 		mvmsta-&gt;max_amsdu_len = size;</div><div class='del'>-		sta-&gt;max_rc_amsdu_len = mvmsta-&gt;max_amsdu_len;</div><div class='add'>+		link_sta-&gt;agg.max_rc_amsdu_len = mvmsta-&gt;max_amsdu_len;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; IWL_MAX_TID_COUNT; i++) {</div><div class='ctx'> 			if (mvmsta-&gt;amsdu_enabled &amp; BIT(i))</div><div class='del'>-				sta-&gt;max_tid_amsdu_len[i] =</div><div class='add'>+				link_sta-&gt;agg.max_tid_amsdu_len[i] =</div><div class='ctx'> 					iwl_mvm_max_amsdu_size(mvm, sta, i);</div><div class='ctx'> 			else</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * Not so elegant, but this will effectively</div><div class='ctx'> 				 * prevent AMSDU on this TID</div><div class='ctx'> 				 */</div><div class='del'>-				sta-&gt;max_tid_amsdu_len[i] = 1;</div><div class='add'>+				link_sta-&gt;agg.max_tid_amsdu_len[i] = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		ieee80211_sta_recalc_aggregates(sta);</div><div class='add'>+</div><div class='ctx'> 		IWL_DEBUG_RATE(mvm,</div><div class='ctx'> 			       "AMSDU update. AMSDU size: %d, AMSDU selected size: %d, AMSDU TID bitmap 0x%X\n",</div><div class='ctx'> 			       le32_to_cpu(notif-&gt;amsdu_size), size,</div><div class='hunk'>@@ -359,14 +508,19 @@ out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 rs_fw_get_max_amsdu_len(struct ieee80211_sta *sta)</div><div class='add'>+u16 rs_fw_get_max_amsdu_len(struct ieee80211_sta *sta,</div><div class='add'>+			    struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			    struct ieee80211_link_sta *link_sta)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='del'>-	const struct ieee80211_sta_vht_cap *vht_cap = &amp;sta-&gt;vht_cap;</div><div class='del'>-	const struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='add'>+	const struct ieee80211_sta_vht_cap *vht_cap = &amp;link_sta-&gt;vht_cap;</div><div class='add'>+	const struct ieee80211_sta_ht_cap *ht_cap = &amp;link_sta-&gt;ht_cap;</div><div class='add'>+	const struct ieee80211_sta_eht_cap *eht_cap = &amp;link_sta-&gt;eht_cap;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!link_conf-&gt;chanreq.oper.chan))</div><div class='add'>+		return IEEE80211_MAX_MPDU_LEN_VHT_3895;</div><div class='ctx'> </div><div class='del'>-	if (mvmsta-&gt;vif-&gt;bss_conf.chandef.chan-&gt;band == NL80211_BAND_6GHZ) {</div><div class='del'>-		switch (le16_get_bits(sta-&gt;he_6ghz_capa.capa,</div><div class='add'>+	if (link_conf-&gt;chanreq.oper.chan-&gt;band == NL80211_BAND_6GHZ) {</div><div class='add'>+		switch (le16_get_bits(link_sta-&gt;he_6ghz_capa.capa,</div><div class='ctx'> 				      IEEE80211_HE_6GHZ_CAP_MAX_MPDU_LEN)) {</div><div class='ctx'> 		case IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454:</div><div class='ctx'> 			return IEEE80211_MAX_MPDU_LEN_VHT_11454;</div><div class='hunk'>@@ -375,8 +529,18 @@ u16 rs_fw_get_max_amsdu_len(struct ieee80211_sta *sta)</div><div class='ctx'> 		default:</div><div class='ctx'> 			return IEEE80211_MAX_MPDU_LEN_VHT_3895;</div><div class='ctx'> 		}</div><div class='del'>-	} else</div><div class='del'>-	if (vht_cap-&gt;vht_supported) {</div><div class='add'>+	} else if (link_conf-&gt;chanreq.oper.chan-&gt;band == NL80211_BAND_2GHZ &amp;&amp;</div><div class='add'>+		   eht_cap-&gt;has_eht) {</div><div class='add'>+		switch (u8_get_bits(eht_cap-&gt;eht_cap_elem.mac_cap_info[0],</div><div class='add'>+				    IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_MASK)) {</div><div class='add'>+		case IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_11454:</div><div class='add'>+			return IEEE80211_MAX_MPDU_LEN_VHT_11454;</div><div class='add'>+		case IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_7991:</div><div class='add'>+			return IEEE80211_MAX_MPDU_LEN_VHT_7991;</div><div class='add'>+		default:</div><div class='add'>+			return IEEE80211_MAX_MPDU_LEN_VHT_3895;</div><div class='add'>+		}</div><div class='add'>+	} else if (vht_cap-&gt;vht_supported) {</div><div class='ctx'> 		switch (vht_cap-&gt;cap &amp; IEEE80211_VHT_CAP_MAX_MPDU_MASK) {</div><div class='ctx'> 		case IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454:</div><div class='ctx'> 			return IEEE80211_MAX_MPDU_LEN_VHT_11454;</div><div class='hunk'>@@ -401,48 +565,126 @@ u16 rs_fw_get_max_amsdu_len(struct ieee80211_sta *sta)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void rs_fw_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='del'>-		     enum nl80211_band band, bool update)</div><div class='add'>+void iwl_mvm_rs_fw_rate_init(struct iwl_mvm *mvm,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_sta *sta,</div><div class='add'>+			     struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			     struct ieee80211_link_sta *link_sta,</div><div class='add'>+			     enum nl80211_band band)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hw *hw = mvm-&gt;hw;</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='del'>-	struct iwl_lq_sta_rs_fw *lq_sta = &amp;mvmsta-&gt;lq_sta.rs_fw;</div><div class='del'>-	u32 cmd_id = iwl_cmd_id(TLC_MNG_CONFIG_CMD, DATA_PATH_GROUP, 0);</div><div class='add'>+	u32 cmd_id = WIDE_ID(DATA_PATH_GROUP, TLC_MNG_CONFIG_CMD);</div><div class='ctx'> 	struct ieee80211_supported_band *sband = hw-&gt;wiphy-&gt;bands[band];</div><div class='del'>-	u16 max_amsdu_len = rs_fw_get_max_amsdu_len(sta);</div><div class='del'>-	struct iwl_tlc_config_cmd cfg_cmd = {</div><div class='del'>-		.sta_id = mvmsta-&gt;sta_id,</div><div class='del'>-		.max_ch_width = update ?</div><div class='del'>-			rs_fw_bw_from_sta_bw(sta) : RATE_MCS_CHAN_WIDTH_20,</div><div class='del'>-		.flags = cpu_to_le16(rs_fw_get_config_flags(mvm, sta, sband)),</div><div class='add'>+	u16 max_amsdu_len = rs_fw_get_max_amsdu_len(sta, link_conf, link_sta);</div><div class='add'>+	const struct ieee80211_sta_he_cap *sband_he_cap =</div><div class='add'>+		ieee80211_get_he_iftype_cap_vif(sband, vif);</div><div class='add'>+	const struct ieee80211_sta_eht_cap *sband_eht_cap =</div><div class='add'>+		ieee80211_get_eht_iftype_cap_vif(sband, vif);</div><div class='add'>+	struct iwl_mvm_link_sta *mvm_link_sta;</div><div class='add'>+	struct iwl_lq_sta_rs_fw *lq_sta;</div><div class='add'>+	struct iwl_tlc_config_cmd_v4 cfg_cmd = {</div><div class='add'>+		.max_ch_width = mvmsta-&gt;authorized ?</div><div class='add'>+			rs_fw_bw_from_sta_bw(link_sta) : IWL_TLC_MNG_CH_WIDTH_20MHZ,</div><div class='add'>+		.flags = cpu_to_le16(rs_fw_get_config_flags(mvm, vif, link_sta,</div><div class='add'>+							    sband_he_cap)),</div><div class='ctx'> 		.chains = rs_fw_set_active_chains(iwl_mvm_get_valid_tx_ant(mvm)),</div><div class='del'>-		.sgi_ch_width_supp = rs_fw_sgi_cw_support(sta),</div><div class='del'>-		.max_mpdu_len = cpu_to_le16(max_amsdu_len),</div><div class='del'>-		.amsdu = iwl_mvm_is_csum_supported(mvm),</div><div class='add'>+		.sgi_ch_width_supp = rs_fw_sgi_cw_support(link_sta),</div><div class='add'>+		.max_mpdu_len = iwl_mvm_is_csum_supported(mvm) ?</div><div class='add'>+				cpu_to_le16(max_amsdu_len) : 0,</div><div class='ctx'> 	};</div><div class='add'>+	unsigned int link_id = link_conf-&gt;link_id;</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(mvmsta-&gt;vif);</div><div class='add'>+	int cmd_ver;</div><div class='ctx'> 	int ret;</div><div class='del'>-	u16 cmd_size = sizeof(cfg_cmd);</div><div class='ctx'> </div><div class='del'>-	/* In old versions of the API the struct is 4 bytes smaller */</div><div class='del'>-	if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, DATA_PATH_GROUP,</div><div class='del'>-				  TLC_MNG_CONFIG_CMD, 0) &lt; 3)</div><div class='del'>-		cmd_size -= 4;</div><div class='add'>+	/* Enable extra EHT LTF if there's mutual support by AP and client */</div><div class='add'>+	if (sband_eht_cap &amp;&amp;</div><div class='add'>+	    sband_eht_cap-&gt;eht_cap_elem.phy_cap_info[5] &amp;</div><div class='add'>+		IEEE80211_EHT_PHY_CAP5_SUPP_EXTRA_EHT_LTF &amp;&amp;</div><div class='add'>+	    link_sta-&gt;eht_cap.has_eht &amp;&amp;</div><div class='add'>+	    link_sta-&gt;eht_cap.eht_cap_elem.phy_cap_info[5] &amp;</div><div class='add'>+	    IEEE80211_EHT_PHY_CAP5_SUPP_EXTRA_EHT_LTF) {</div><div class='add'>+		IWL_DEBUG_RATE(mvm, "Set support for Extra EHT LTF\n");</div><div class='add'>+		cfg_cmd.flags |=</div><div class='add'>+			cpu_to_le16(IWL_TLC_MNG_CFG_FLAGS_EHT_EXTRA_LTF_MSK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	mvm_link_sta = rcu_dereference(mvmsta-&gt;link[link_id]);</div><div class='add'>+	if (WARN_ON_ONCE(!mvm_link_sta)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	cfg_cmd.sta_id = mvm_link_sta-&gt;sta_id;</div><div class='add'>+</div><div class='add'>+	lq_sta = &amp;mvm_link_sta-&gt;lq_sta.rs_fw;</div><div class='ctx'> 	memset(lq_sta, 0, offsetof(typeof(*lq_sta), pers));</div><div class='ctx'> </div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> 	iwl_mvm_reset_frame_stats(mvm);</div><div class='ctx'> #endif</div><div class='del'>-	rs_fw_set_supp_rates(sta, sband, &amp;cfg_cmd);</div><div class='add'>+	rs_fw_set_supp_rates(vif, link_sta, sband,</div><div class='add'>+			     sband_he_cap, sband_eht_cap,</div><div class='add'>+			     &amp;cfg_cmd);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * since TLC offload works with one mode we can assume</div><div class='ctx'> 	 * that only vht/ht is used and also set it as station max amsdu</div><div class='ctx'> 	 */</div><div class='del'>-	sta-&gt;max_amsdu_len = max_amsdu_len;</div><div class='add'>+	link_sta-&gt;agg.max_amsdu_len = max_amsdu_len;</div><div class='add'>+	ieee80211_sta_recalc_aggregates(sta);</div><div class='add'>+</div><div class='add'>+	cfg_cmd.max_tx_op = cpu_to_le16(mvmvif-&gt;max_tx_op);</div><div class='add'>+</div><div class='add'>+	cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, cmd_id, 0);</div><div class='add'>+	IWL_DEBUG_RATE(mvm, "TLC CONFIG CMD, sta_id=%d, max_ch_width=%d, mode=%d\n",</div><div class='add'>+		       cfg_cmd.sta_id, cfg_cmd.max_ch_width, cfg_cmd.mode);</div><div class='add'>+	IWL_DEBUG_RATE(mvm, "TLC CONFIG CMD, chains=0x%X, ch_wid_supp=%d, flags=0x%X\n",</div><div class='add'>+		       cfg_cmd.chains, cfg_cmd.sgi_ch_width_supp, cfg_cmd.flags);</div><div class='add'>+	IWL_DEBUG_RATE(mvm, "TLC CONFIG CMD, mpdu_len=%d, no_ht_rate=0x%X, tx_op=%d\n",</div><div class='add'>+		       cfg_cmd.max_mpdu_len, cfg_cmd.non_ht_rates, cfg_cmd.max_tx_op);</div><div class='add'>+	IWL_DEBUG_RATE(mvm, "TLC CONFIG CMD, ht_rate[0][0]=0x%X, ht_rate[1][0]=0x%X\n",</div><div class='add'>+		       cfg_cmd.ht_rates[0][0], cfg_cmd.ht_rates[1][0]);</div><div class='add'>+	IWL_DEBUG_RATE(mvm, "TLC CONFIG CMD, ht_rate[0][1]=0x%X, ht_rate[1][1]=0x%X\n",</div><div class='add'>+		       cfg_cmd.ht_rates[0][1], cfg_cmd.ht_rates[1][1]);</div><div class='add'>+	IWL_DEBUG_RATE(mvm, "TLC CONFIG CMD, ht_rate[0][2]=0x%X, ht_rate[1][2]=0x%X\n",</div><div class='add'>+		       cfg_cmd.ht_rates[0][2], cfg_cmd.ht_rates[1][2]);</div><div class='add'>+	if (cmd_ver == 4) {</div><div class='add'>+		ret = iwl_mvm_send_cmd_pdu(mvm, cmd_id, CMD_ASYNC,</div><div class='add'>+					   sizeof(cfg_cmd), &amp;cfg_cmd);</div><div class='add'>+	} else if (cmd_ver &lt; 4) {</div><div class='add'>+		struct iwl_tlc_config_cmd_v3 cfg_cmd_v3 = {</div><div class='add'>+			.sta_id = cfg_cmd.sta_id,</div><div class='add'>+			.max_ch_width = cfg_cmd.max_ch_width,</div><div class='add'>+			.mode = cfg_cmd.mode,</div><div class='add'>+			.chains = cfg_cmd.chains,</div><div class='add'>+			.amsdu = !!cfg_cmd.max_mpdu_len,</div><div class='add'>+			.flags = cfg_cmd.flags,</div><div class='add'>+			.non_ht_rates = cfg_cmd.non_ht_rates,</div><div class='add'>+			.ht_rates[0][0] = cfg_cmd.ht_rates[0][0],</div><div class='add'>+			.ht_rates[0][1] = cfg_cmd.ht_rates[0][1],</div><div class='add'>+			.ht_rates[1][0] = cfg_cmd.ht_rates[1][0],</div><div class='add'>+			.ht_rates[1][1] = cfg_cmd.ht_rates[1][1],</div><div class='add'>+			.sgi_ch_width_supp = cfg_cmd.sgi_ch_width_supp,</div><div class='add'>+			.max_mpdu_len = cfg_cmd.max_mpdu_len,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		u16 cmd_size = sizeof(cfg_cmd_v3);</div><div class='add'>+</div><div class='add'>+		/* In old versions of the API the struct is 4 bytes smaller */</div><div class='add'>+		if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, cmd_id, 0) &lt; 3)</div><div class='add'>+			cmd_size -= 4;</div><div class='add'>+</div><div class='add'>+		ret = iwl_mvm_send_cmd_pdu(mvm, cmd_id, CMD_ASYNC, cmd_size,</div><div class='add'>+					   &amp;cfg_cmd_v3);</div><div class='add'>+	} else {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_send_cmd_pdu(mvm, cmd_id, CMD_ASYNC, cmd_size,</div><div class='del'>-				   &amp;cfg_cmd);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		IWL_ERR(mvm, "Failed to send rate scale config (%d)\n", ret);</div><div class='ctx'> }</div><div class='hunk'>@@ -455,16 +697,18 @@ int rs_fw_tx_protection(struct iwl_mvm *mvm, struct iwl_mvm_sta *mvmsta,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_mvm_rs_add_sta(struct iwl_mvm *mvm, struct iwl_mvm_sta *mvmsta)</div><div class='add'>+void iwl_mvm_rs_add_sta_link(struct iwl_mvm *mvm,</div><div class='add'>+			     struct iwl_mvm_link_sta *link_sta)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_lq_sta_rs_fw *lq_sta = &amp;mvmsta-&gt;lq_sta.rs_fw;</div><div class='add'>+	struct iwl_lq_sta_rs_fw *lq_sta;</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_RATE(mvm, "create station rate scale window\n");</div><div class='add'>+	lq_sta = &amp;link_sta-&gt;lq_sta.rs_fw;</div><div class='ctx'> </div><div class='ctx'> 	lq_sta-&gt;pers.drv = mvm;</div><div class='del'>-	lq_sta-&gt;pers.sta_id = mvmsta-&gt;sta_id;</div><div class='add'>+	lq_sta-&gt;pers.sta_id = link_sta-&gt;sta_id;</div><div class='ctx'> 	lq_sta-&gt;pers.chains = 0;</div><div class='del'>-	memset(lq_sta-&gt;pers.chain_signal, 0, sizeof(lq_sta-&gt;pers.chain_signal));</div><div class='add'>+	memset(lq_sta-&gt;pers.chain_signal, 0,</div><div class='add'>+	       sizeof(lq_sta-&gt;pers.chain_signal));</div><div class='ctx'> 	lq_sta-&gt;pers.last_rssi = S8_MIN;</div><div class='ctx'> 	lq_sta-&gt;last_rate_n_flags = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -472,3 +716,20 @@ void iwl_mvm_rs_add_sta(struct iwl_mvm *mvm, struct iwl_mvm_sta *mvmsta)</div><div class='ctx'> 	lq_sta-&gt;pers.dbg_fixed_rate = 0;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void iwl_mvm_rs_add_sta(struct iwl_mvm *mvm, struct iwl_mvm_sta *mvmsta)</div><div class='add'>+{</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_RATE(mvm, "create station rate scale window\n");</div><div class='add'>+</div><div class='add'>+	for (link_id = 0; link_id &lt; ARRAY_SIZE(mvmsta-&gt;link); link_id++) {</div><div class='add'>+		struct iwl_mvm_link_sta *link =</div><div class='add'>+			rcu_dereference_protected(mvmsta-&gt;link[link_id],</div><div class='add'>+						  lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+		if (!link)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		iwl_mvm_rs_add_sta_link(mvm, link);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rs.c b/drivers/net/wireless/intel/iwlwifi/mvm/rs.c<br/>index b97708cb869d..d1619a229d8f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/rs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/rs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/rs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/rs.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * Copyright(c) 2005 - 2014, 2018 - 2021 Intel Corporation. All rights reserved.</div><div class='add'>+ * Copyright(c) 2005 - 2014, 2018 - 2023 Intel Corporation. All rights reserved.</div><div class='add'>+ * Copyright(c) 2025 Intel Corporation</div><div class='ctx'>  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='hunk'>@@ -140,10 +136,10 @@ static bool rs_mimo_allow(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 			  struct rs_rate *rate,</div><div class='ctx'> 			  const struct rs_tx_column *next_col)</div><div class='ctx'> {</div><div class='del'>-	if (!sta-&gt;ht_cap.ht_supported)</div><div class='add'>+	if (!sta-&gt;deflink.ht_cap.ht_supported)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;smps_mode == IEEE80211_SMPS_STATIC)</div><div class='add'>+	if (sta-&gt;deflink.smps_mode == IEEE80211_SMPS_STATIC)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (num_of_ant(iwl_mvm_get_valid_tx_ant(mvm)) &lt; 2)</div><div class='hunk'>@@ -162,7 +158,7 @@ static bool rs_siso_allow(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 			  struct rs_rate *rate,</div><div class='ctx'> 			  const struct rs_tx_column *next_col)</div><div class='ctx'> {</div><div class='del'>-	if (!sta-&gt;ht_cap.ht_supported)</div><div class='add'>+	if (!sta-&gt;deflink.ht_cap.ht_supported)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -172,8 +168,8 @@ static bool rs_sgi_allow(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 			 struct rs_rate *rate,</div><div class='ctx'> 			 const struct rs_tx_column *next_col)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='del'>-	struct ieee80211_sta_vht_cap *vht_cap = &amp;sta-&gt;vht_cap;</div><div class='add'>+	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;deflink.ht_cap;</div><div class='add'>+	struct ieee80211_sta_vht_cap *vht_cap = &amp;sta-&gt;deflink.vht_cap;</div><div class='ctx'> </div><div class='ctx'> 	if (is_ht20(rate) &amp;&amp; (ht_cap-&gt;cap &amp;</div><div class='ctx'> 			     IEEE80211_HT_CAP_SGI_20))</div><div class='hunk'>@@ -335,15 +331,15 @@ static const struct rs_tx_column rs_tx_columns[] = {</div><div class='ctx'> static inline u8 rs_extract_rate(u32 rate_n_flags)</div><div class='ctx'> {</div><div class='ctx'> 	/* also works for HT because bits 7:6 are zero there */</div><div class='del'>-	return (u8)(rate_n_flags &amp; RATE_LEGACY_RATE_MSK);</div><div class='add'>+	return (u8)(rate_n_flags &amp; RATE_LEGACY_RATE_MSK_V1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_hwrate_to_plcp_idx(u32 rate_n_flags)</div><div class='ctx'> {</div><div class='ctx'> 	int idx = 0;</div><div class='ctx'> </div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_HT_MSK) {</div><div class='del'>-		idx = rate_n_flags &amp; RATE_HT_MCS_RATE_CODE_MSK;</div><div class='add'>+	if (rate_n_flags &amp; RATE_MCS_HT_MSK_V1) {</div><div class='add'>+		idx = rate_n_flags &amp; RATE_HT_MCS_RATE_CODE_MSK_V1;</div><div class='ctx'> 		idx += IWL_RATE_MCS_0_INDEX;</div><div class='ctx'> </div><div class='ctx'> 		/* skip 9M not supported in HT*/</div><div class='hunk'>@@ -351,8 +347,8 @@ static int iwl_hwrate_to_plcp_idx(u32 rate_n_flags)</div><div class='ctx'> 			idx += 1;</div><div class='ctx'> 		if ((idx &gt;= IWL_FIRST_HT_RATE) &amp;&amp; (idx &lt;= IWL_LAST_HT_RATE))</div><div class='ctx'> 			return idx;</div><div class='del'>-	} else if (rate_n_flags &amp; RATE_MCS_VHT_MSK ||</div><div class='del'>-		   rate_n_flags &amp; RATE_MCS_HE_MSK) {</div><div class='add'>+	} else if (rate_n_flags &amp; RATE_MCS_VHT_MSK_V1 ||</div><div class='add'>+		   rate_n_flags &amp; RATE_MCS_HE_MSK_V1) {</div><div class='ctx'> 		idx = rate_n_flags &amp; RATE_VHT_MCS_RATE_CODE_MSK;</div><div class='ctx'> 		idx += IWL_RATE_MCS_0_INDEX;</div><div class='ctx'> </div><div class='hunk'>@@ -361,8 +357,8 @@ static int iwl_hwrate_to_plcp_idx(u32 rate_n_flags)</div><div class='ctx'> 			idx++;</div><div class='ctx'> 		if ((idx &gt;= IWL_FIRST_VHT_RATE) &amp;&amp; (idx &lt;= IWL_LAST_VHT_RATE))</div><div class='ctx'> 			return idx;</div><div class='del'>-		if ((rate_n_flags &amp; RATE_MCS_HE_MSK) &amp;&amp;</div><div class='del'>-		    (idx &lt;= IWL_LAST_HE_RATE))</div><div class='add'>+		if ((rate_n_flags &amp; RATE_MCS_HE_MSK_V1) &amp;&amp;</div><div class='add'>+		    idx &lt;= IWL_LAST_HE_RATE)</div><div class='ctx'> 			return idx;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* legacy rate format, search for match in table */</div><div class='hunk'>@@ -459,44 +455,6 @@ static const u16 expected_tpt_mimo2_160MHz[4][IWL_RATE_COUNT] = {</div><div class='ctx'> 	{0, 0, 0, 0, 971, 0, 1925, 2861, 3779, 5574, 7304, 8147, 8976, 10592, 11640},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* mbps, mcs */</div><div class='del'>-static const struct iwl_rate_mcs_info iwl_rate_mcs[IWL_RATE_COUNT] = {</div><div class='del'>-	{  "1", "BPSK DSSS"},</div><div class='del'>-	{  "2", "QPSK DSSS"},</div><div class='del'>-	{"5.5", "BPSK CCK"},</div><div class='del'>-	{ "11", "QPSK CCK"},</div><div class='del'>-	{  "6", "BPSK 1/2"},</div><div class='del'>-	{  "9", "BPSK 1/2"},</div><div class='del'>-	{ "12", "QPSK 1/2"},</div><div class='del'>-	{ "18", "QPSK 3/4"},</div><div class='del'>-	{ "24", "16QAM 1/2"},</div><div class='del'>-	{ "36", "16QAM 3/4"},</div><div class='del'>-	{ "48", "64QAM 2/3"},</div><div class='del'>-	{ "54", "64QAM 3/4"},</div><div class='del'>-	{ "60", "64QAM 5/6"},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define MCS_INDEX_PER_STREAM	(8)</div><div class='del'>-</div><div class='del'>-static const char *rs_pretty_ant(u8 ant)</div><div class='del'>-{</div><div class='del'>-	static const char * const ant_name[] = {</div><div class='del'>-		[ANT_NONE] = "None",</div><div class='del'>-		[ANT_A]    = "A",</div><div class='del'>-		[ANT_B]    = "B",</div><div class='del'>-		[ANT_AB]   = "AB",</div><div class='del'>-		[ANT_C]    = "C",</div><div class='del'>-		[ANT_AC]   = "AC",</div><div class='del'>-		[ANT_BC]   = "BC",</div><div class='del'>-		[ANT_ABC]  = "ABC",</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (ant &gt; ANT_ABC)</div><div class='del'>-		return "UNKNOWN";</div><div class='del'>-</div><div class='del'>-	return ant_name[ant];</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const char *rs_pretty_lq_type(enum iwl_table_type type)</div><div class='ctx'> {</div><div class='ctx'> 	static const char * const lq_types[] = {</div><div class='hunk'>@@ -555,10 +513,10 @@ static char *rs_pretty_rate(const struct rs_rate *rate)</div><div class='ctx'> 		 (rate-&gt;index &lt;= IWL_RATE_MCS_9_INDEX))</div><div class='ctx'> 		rate_str = ht_vht_rates[rate-&gt;index];</div><div class='ctx'> 	else</div><div class='del'>-		rate_str = "BAD_RATE";</div><div class='add'>+		rate_str = NULL;</div><div class='ctx'> </div><div class='ctx'> 	sprintf(buf, "(%s|%s|%s)", rs_pretty_lq_type(rate-&gt;type),</div><div class='del'>-		rs_pretty_ant(rate-&gt;ant), rate_str);</div><div class='add'>+		iwl_rs_pretty_ant(rate-&gt;ant), rate_str ?: "BAD_RATE");</div><div class='ctx'> 	return buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -654,8 +612,7 @@ static void rs_tl_turn_on_agg(struct iwl_mvm *mvm, struct iwl_mvm_sta *mvmsta,</div><div class='ctx'> static inline int get_num_of_ant_from_rate(u32 rate_n_flags)</div><div class='ctx'> {</div><div class='ctx'> 	return !!(rate_n_flags &amp; RATE_MCS_ANT_A_MSK) +</div><div class='del'>-	       !!(rate_n_flags &amp; RATE_MCS_ANT_B_MSK) +</div><div class='del'>-	       !!(rate_n_flags &amp; RATE_MCS_ANT_C_MSK);</div><div class='add'>+	       !!(rate_n_flags &amp; RATE_MCS_ANT_B_MSK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -798,7 +755,7 @@ static int rs_collect_tlc_data(struct iwl_mvm *mvm,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (tbl-&gt;column != RS_COLUMN_INVALID) {</div><div class='del'>-		struct lq_sta_pers *pers = &amp;mvmsta-&gt;lq_sta.rs_drv.pers;</div><div class='add'>+		struct lq_sta_pers *pers = &amp;mvmsta-&gt;deflink.lq_sta.rs_drv.pers;</div><div class='ctx'> </div><div class='ctx'> 		pers-&gt;tx_stats[tbl-&gt;column][scale_index].total += attempts;</div><div class='ctx'> 		pers-&gt;tx_stats[tbl-&gt;column][scale_index].success += successes;</div><div class='hunk'>@@ -820,12 +777,12 @@ static u32 ucode_rate_from_rs_rate(struct iwl_mvm *mvm,</div><div class='ctx'> 	int index = rate-&gt;index;</div><div class='ctx'> </div><div class='ctx'> 	ucode_rate |= ((rate-&gt;ant &lt;&lt; RATE_MCS_ANT_POS) &amp;</div><div class='del'>-			 RATE_MCS_ANT_ABC_MSK);</div><div class='add'>+			 RATE_MCS_ANT_AB_MSK);</div><div class='ctx'> </div><div class='ctx'> 	if (is_legacy(rate)) {</div><div class='ctx'> 		ucode_rate |= iwl_rates[index].plcp;</div><div class='ctx'> 		if (index &gt;= IWL_FIRST_CCK_RATE &amp;&amp; index &lt;= IWL_LAST_CCK_RATE)</div><div class='del'>-			ucode_rate |= RATE_MCS_CCK_MSK;</div><div class='add'>+			ucode_rate |= RATE_MCS_CCK_MSK_V1;</div><div class='ctx'> 		return ucode_rate;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -840,7 +797,7 @@ static u32 ucode_rate_from_rs_rate(struct iwl_mvm *mvm,</div><div class='ctx'> 			IWL_ERR(mvm, "Invalid HT rate index %d\n", index);</div><div class='ctx'> 			index = IWL_LAST_HT_RATE;</div><div class='ctx'> 		}</div><div class='del'>-		ucode_rate |= RATE_MCS_HT_MSK;</div><div class='add'>+		ucode_rate |= RATE_MCS_HT_MSK_V1;</div><div class='ctx'> </div><div class='ctx'> 		if (is_ht_siso(rate))</div><div class='ctx'> 			ucode_rate |= iwl_rates[index].plcp_ht_siso;</div><div class='hunk'>@@ -853,7 +810,7 @@ static u32 ucode_rate_from_rs_rate(struct iwl_mvm *mvm,</div><div class='ctx'> 			IWL_ERR(mvm, "Invalid VHT rate index %d\n", index);</div><div class='ctx'> 			index = IWL_LAST_VHT_RATE;</div><div class='ctx'> 		}</div><div class='del'>-		ucode_rate |= RATE_MCS_VHT_MSK;</div><div class='add'>+		ucode_rate |= RATE_MCS_VHT_MSK_V1;</div><div class='ctx'> 		if (is_vht_siso(rate))</div><div class='ctx'> 			ucode_rate |= iwl_rates[index].plcp_vht_siso;</div><div class='ctx'> 		else if (is_vht_mimo2(rate))</div><div class='hunk'>@@ -873,9 +830,9 @@ static u32 ucode_rate_from_rs_rate(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	ucode_rate |= rate-&gt;bw;</div><div class='ctx'> 	if (rate-&gt;sgi)</div><div class='del'>-		ucode_rate |= RATE_MCS_SGI_MSK;</div><div class='add'>+		ucode_rate |= RATE_MCS_SGI_MSK_V1;</div><div class='ctx'> 	if (rate-&gt;ldpc)</div><div class='del'>-		ucode_rate |= RATE_MCS_LDPC_MSK;</div><div class='add'>+		ucode_rate |= RATE_MCS_LDPC_MSK_V1;</div><div class='ctx'> </div><div class='ctx'> 	return ucode_rate;</div><div class='ctx'> }</div><div class='hunk'>@@ -885,7 +842,7 @@ static int rs_rate_from_ucode_rate(const u32 ucode_rate,</div><div class='ctx'> 				   enum nl80211_band band,</div><div class='ctx'> 				   struct rs_rate *rate)</div><div class='ctx'> {</div><div class='del'>-	u32 ant_msk = ucode_rate &amp; RATE_MCS_ANT_ABC_MSK;</div><div class='add'>+	u32 ant_msk = ucode_rate &amp; RATE_MCS_ANT_AB_MSK;</div><div class='ctx'> 	u8 num_of_ant = get_num_of_ant_from_rate(ucode_rate);</div><div class='ctx'> 	u8 nss;</div><div class='ctx'> </div><div class='hunk'>@@ -898,9 +855,9 @@ static int rs_rate_from_ucode_rate(const u32 ucode_rate,</div><div class='ctx'> 	rate-&gt;ant = (ant_msk &gt;&gt; RATE_MCS_ANT_POS);</div><div class='ctx'> </div><div class='ctx'> 	/* Legacy */</div><div class='del'>-	if (!(ucode_rate &amp; RATE_MCS_HT_MSK) &amp;&amp;</div><div class='del'>-	    !(ucode_rate &amp; RATE_MCS_VHT_MSK) &amp;&amp;</div><div class='del'>-	    !(ucode_rate &amp; RATE_MCS_HE_MSK)) {</div><div class='add'>+	if (!(ucode_rate &amp; RATE_MCS_HT_MSK_V1) &amp;&amp;</div><div class='add'>+	    !(ucode_rate &amp; RATE_MCS_VHT_MSK_V1) &amp;&amp;</div><div class='add'>+	    !(ucode_rate &amp; RATE_MCS_HE_MSK_V1)) {</div><div class='ctx'> 		if (num_of_ant == 1) {</div><div class='ctx'> 			if (band == NL80211_BAND_5GHZ)</div><div class='ctx'> 				rate-&gt;type = LQ_LEGACY_A;</div><div class='hunk'>@@ -912,20 +869,20 @@ static int rs_rate_from_ucode_rate(const u32 ucode_rate,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* HT, VHT or HE */</div><div class='del'>-	if (ucode_rate &amp; RATE_MCS_SGI_MSK)</div><div class='add'>+	if (ucode_rate &amp; RATE_MCS_SGI_MSK_V1)</div><div class='ctx'> 		rate-&gt;sgi = true;</div><div class='del'>-	if (ucode_rate &amp; RATE_MCS_LDPC_MSK)</div><div class='add'>+	if (ucode_rate &amp; RATE_MCS_LDPC_MSK_V1)</div><div class='ctx'> 		rate-&gt;ldpc = true;</div><div class='ctx'> 	if (ucode_rate &amp; RATE_MCS_STBC_MSK)</div><div class='ctx'> 		rate-&gt;stbc = true;</div><div class='ctx'> 	if (ucode_rate &amp; RATE_MCS_BF_MSK)</div><div class='ctx'> 		rate-&gt;bfer = true;</div><div class='ctx'> </div><div class='del'>-	rate-&gt;bw = ucode_rate &amp; RATE_MCS_CHAN_WIDTH_MSK;</div><div class='add'>+	rate-&gt;bw = ucode_rate &amp; RATE_MCS_CHAN_WIDTH_MSK_V1;</div><div class='ctx'> </div><div class='del'>-	if (ucode_rate &amp; RATE_MCS_HT_MSK) {</div><div class='del'>-		nss = ((ucode_rate &amp; RATE_HT_MCS_NSS_MSK) &gt;&gt;</div><div class='del'>-		       RATE_HT_MCS_NSS_POS) + 1;</div><div class='add'>+	if (ucode_rate &amp; RATE_MCS_HT_MSK_V1) {</div><div class='add'>+		nss = ((ucode_rate &amp; RATE_HT_MCS_NSS_MSK_V1) &gt;&gt;</div><div class='add'>+		       RATE_HT_MCS_NSS_POS_V1) + 1;</div><div class='ctx'> </div><div class='ctx'> 		if (nss == 1) {</div><div class='ctx'> 			rate-&gt;type = LQ_HT_SISO;</div><div class='hunk'>@@ -938,9 +895,8 @@ static int rs_rate_from_ucode_rate(const u32 ucode_rate,</div><div class='ctx'> 		} else {</div><div class='ctx'> 			WARN_ON_ONCE(1);</div><div class='ctx'> 		}</div><div class='del'>-	} else if (ucode_rate &amp; RATE_MCS_VHT_MSK) {</div><div class='del'>-		nss = ((ucode_rate &amp; RATE_VHT_MCS_NSS_MSK) &gt;&gt;</div><div class='del'>-		       RATE_VHT_MCS_NSS_POS) + 1;</div><div class='add'>+	} else if (ucode_rate &amp; RATE_MCS_VHT_MSK_V1) {</div><div class='add'>+		nss = FIELD_GET(RATE_VHT_MCS_NSS_MSK, ucode_rate) + 1;</div><div class='ctx'> </div><div class='ctx'> 		if (nss == 1) {</div><div class='ctx'> 			rate-&gt;type = LQ_VHT_SISO;</div><div class='hunk'>@@ -953,9 +909,8 @@ static int rs_rate_from_ucode_rate(const u32 ucode_rate,</div><div class='ctx'> 		} else {</div><div class='ctx'> 			WARN_ON_ONCE(1);</div><div class='ctx'> 		}</div><div class='del'>-	} else if (ucode_rate &amp; RATE_MCS_HE_MSK) {</div><div class='del'>-		nss = ((ucode_rate &amp; RATE_VHT_MCS_NSS_MSK) &gt;&gt;</div><div class='del'>-		      RATE_VHT_MCS_NSS_POS) + 1;</div><div class='add'>+	} else if (ucode_rate &amp; RATE_MCS_HE_MSK_V1) {</div><div class='add'>+		nss = FIELD_GET(RATE_VHT_MCS_NSS_MSK, ucode_rate) + 1;</div><div class='ctx'> </div><div class='ctx'> 		if (nss == 1) {</div><div class='ctx'> 			rate-&gt;type = LQ_HE_SISO;</div><div class='hunk'>@@ -981,9 +936,6 @@ static int rs_toggle_antenna(u32 valid_ant, struct rs_rate *rate)</div><div class='ctx'> {</div><div class='ctx'> 	u8 new_ant_type;</div><div class='ctx'> </div><div class='del'>-	if (!rate-&gt;ant || WARN_ON_ONCE(rate-&gt;ant &amp; ANT_C))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	if (!rs_is_valid_ant(valid_ant, rate-&gt;ant))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1119,10 +1071,13 @@ static void rs_get_lower_rate_down_column(struct iwl_lq_sta *lq_sta,</div><div class='ctx'> </div><div class='ctx'> 		rate-&gt;bw = RATE_MCS_CHAN_WIDTH_20;</div><div class='ctx'> </div><div class='del'>-		WARN_ON_ONCE(rate-&gt;index &lt; IWL_RATE_MCS_0_INDEX ||</div><div class='del'>-			     rate-&gt;index &gt; IWL_RATE_MCS_9_INDEX);</div><div class='add'>+		if (WARN_ON_ONCE(rate-&gt;index &lt; IWL_RATE_MCS_0_INDEX))</div><div class='add'>+			rate-&gt;index = rs_ht_to_legacy[IWL_RATE_MCS_0_INDEX];</div><div class='add'>+		else if (WARN_ON_ONCE(rate-&gt;index &gt; IWL_RATE_MCS_9_INDEX))</div><div class='add'>+			rate-&gt;index = rs_ht_to_legacy[IWL_RATE_MCS_9_INDEX];</div><div class='add'>+		else</div><div class='add'>+			rate-&gt;index = rs_ht_to_legacy[rate-&gt;index];</div><div class='ctx'> </div><div class='del'>-		rate-&gt;index = rs_ht_to_legacy[rate-&gt;index];</div><div class='ctx'> 		rate-&gt;ldpc = false;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Downgrade to SISO with same MCS if in MIMO  */</div><div class='hunk'>@@ -1416,13 +1371,13 @@ static s32 rs_get_best_rate(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> static u32 rs_bw_from_sta_bw(struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sta_vht_cap *sta_vht_cap = &amp;sta-&gt;vht_cap;</div><div class='add'>+	struct ieee80211_sta_vht_cap *sta_vht_cap = &amp;sta-&gt;deflink.vht_cap;</div><div class='ctx'> 	struct ieee80211_vht_cap vht_cap = {</div><div class='ctx'> 		.vht_cap_info = cpu_to_le32(sta_vht_cap-&gt;cap),</div><div class='ctx'> 		.supp_mcs = sta_vht_cap-&gt;vht_mcs,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	switch (sta-&gt;bandwidth) {</div><div class='add'>+	switch (sta-&gt;deflink.bandwidth) {</div><div class='ctx'> 	case IEEE80211_STA_RX_BW_160:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Don't use 160 MHz if VHT extended NSS support</div><div class='hunk'>@@ -1435,7 +1390,7 @@ static u32 rs_bw_from_sta_bw(struct ieee80211_sta *sta)</div><div class='ctx'> 		if (ieee80211_get_vht_max_nss(&amp;vht_cap,</div><div class='ctx'> 					      IEEE80211_VHT_CHANWIDTH_160MHZ,</div><div class='ctx'> 					      0, true,</div><div class='del'>-					      sta-&gt;rx_nss) &lt; sta-&gt;rx_nss)</div><div class='add'>+					      sta-&gt;deflink.rx_nss) &lt; sta-&gt;deflink.rx_nss)</div><div class='ctx'> 			return RATE_MCS_CHAN_WIDTH_80;</div><div class='ctx'> 		return RATE_MCS_CHAN_WIDTH_160;</div><div class='ctx'> 	case IEEE80211_STA_RX_BW_80:</div><div class='hunk'>@@ -1536,9 +1491,11 @@ static void rs_set_amsdu_len(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 			     enum rs_action scale_action)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	struct ieee80211_bss_conf *bss_conf = &amp;mvmsta-&gt;vif-&gt;bss_conf;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	sta-&gt;max_amsdu_len = rs_fw_get_max_amsdu_len(sta);</div><div class='add'>+	sta-&gt;deflink.agg.max_amsdu_len =</div><div class='add'>+		rs_fw_get_max_amsdu_len(sta, bss_conf, &amp;sta-&gt;deflink);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In case TLC offload is not active amsdu_enabled is either 0xFFFF</div><div class='hunk'>@@ -1551,24 +1508,25 @@ static void rs_set_amsdu_len(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 	else</div><div class='ctx'> 		mvmsta-&gt;amsdu_enabled = 0xFFFF;</div><div class='ctx'> </div><div class='del'>-	if (mvmsta-&gt;vif-&gt;bss_conf.he_support &amp;&amp;</div><div class='add'>+	if (bss_conf-&gt;he_support &amp;&amp;</div><div class='ctx'> 	    !iwlwifi_mod_params.disable_11ax)</div><div class='del'>-		mvmsta-&gt;max_amsdu_len = sta-&gt;max_amsdu_len;</div><div class='add'>+		mvmsta-&gt;max_amsdu_len = sta-&gt;deflink.agg.max_amsdu_len;</div><div class='ctx'> 	else</div><div class='del'>-		mvmsta-&gt;max_amsdu_len = min_t(int, sta-&gt;max_amsdu_len, 8500);</div><div class='add'>+		mvmsta-&gt;max_amsdu_len =</div><div class='add'>+			min_t(int, sta-&gt;deflink.agg.max_amsdu_len, 8500);</div><div class='ctx'> </div><div class='del'>-	sta-&gt;max_rc_amsdu_len = mvmsta-&gt;max_amsdu_len;</div><div class='add'>+	sta-&gt;deflink.agg.max_rc_amsdu_len = mvmsta-&gt;max_amsdu_len;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; IWL_MAX_TID_COUNT; i++) {</div><div class='ctx'> 		if (mvmsta-&gt;amsdu_enabled)</div><div class='del'>-			sta-&gt;max_tid_amsdu_len[i] =</div><div class='add'>+			sta-&gt;deflink.agg.max_tid_amsdu_len[i] =</div><div class='ctx'> 				iwl_mvm_max_amsdu_size(mvm, sta, i);</div><div class='ctx'> 		else</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Not so elegant, but this will effectively</div><div class='ctx'> 			 * prevent AMSDU on this TID</div><div class='ctx'> 			 */</div><div class='del'>-			sta-&gt;max_tid_amsdu_len[i] = 1;</div><div class='add'>+			sta-&gt;deflink.agg.max_tid_amsdu_len[i] = 1;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1826,7 +1784,7 @@ static enum rs_action rs_get_rate_action(struct iwl_mvm *mvm,</div><div class='ctx'> 	if ((high_tpt != IWL_INVALID_VALUE) &amp;&amp;</div><div class='ctx'> 	    (high_tpt &gt; current_tpt)) {</div><div class='ctx'> 		IWL_DEBUG_RATE(mvm,</div><div class='del'>-			       "Higher rate is better. Increate rate\n");</div><div class='add'>+			       "Higher rate is better. Increase rate\n");</div><div class='ctx'> 		return RS_ACTION_UPSCALE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1908,7 +1866,7 @@ static bool rs_tpc_allowed(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	int index = rate-&gt;index;</div><div class='ctx'> 	bool cam = (iwlmvm_mod_params.power_scheme == IWL_POWER_SCHEME_CAM);</div><div class='ctx'> 	bool sta_ps_disabled = (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='del'>-				!vif-&gt;bss_conf.ps);</div><div class='add'>+				!vif-&gt;cfg.ps);</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_RATE(mvm, "cam: %d sta_ps_disabled %d\n",</div><div class='ctx'> 		       cam, sta_ps_disabled);</div><div class='hunk'>@@ -2027,7 +1985,7 @@ static bool rs_tpc_perform(struct iwl_mvm *mvm,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	chanctx_conf = rcu_dereference(vif-&gt;chanctx_conf);</div><div class='add'>+	chanctx_conf = rcu_dereference(vif-&gt;bss_conf.chanctx_conf);</div><div class='ctx'> 	if (WARN_ON(!chanctx_conf))</div><div class='ctx'> 		band = NUM_NL80211_BANDS;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -2552,7 +2510,7 @@ static void rs_get_initial_rate(struct iwl_mvm *mvm,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_RATE(mvm, "Best ANT: %s Best RSSI: %d\n",</div><div class='del'>-		       rs_pretty_ant(best_ant), best_rssi);</div><div class='add'>+		       iwl_rs_pretty_ant(best_ant), best_rssi);</div><div class='ctx'> </div><div class='ctx'> 	if (best_ant != ANT_A &amp;&amp; best_ant != ANT_B)</div><div class='ctx'> 		rate-&gt;ant = first_antenna(valid_tx_ant);</div><div class='hunk'>@@ -2584,7 +2542,7 @@ static void rs_get_initial_rate(struct iwl_mvm *mvm,</div><div class='ctx'> 	 * In case of VHT/HT when the rssi is low fallback to the case of</div><div class='ctx'> 	 * legacy rates.</div><div class='ctx'> 	 */</div><div class='del'>-	if (sta-&gt;vht_cap.vht_supported &amp;&amp;</div><div class='add'>+	if (sta-&gt;deflink.vht_cap.vht_supported &amp;&amp;</div><div class='ctx'> 	    best_rssi &gt; IWL_RS_LOW_RSSI_THRESHOLD) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * In AP mode, when a new station associates, rs is initialized</div><div class='hunk'>@@ -2610,14 +2568,15 @@ static void rs_get_initial_rate(struct iwl_mvm *mvm,</div><div class='ctx'> 			nentries = ARRAY_SIZE(rs_optimal_rates_vht_20mhz);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			IWL_ERR(mvm, "Invalid BW %d\n", sta-&gt;bandwidth);</div><div class='add'>+			IWL_ERR(mvm, "Invalid BW %d\n",</div><div class='add'>+				sta-&gt;deflink.bandwidth);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		active_rate = lq_sta-&gt;active_siso_rate;</div><div class='ctx'> 		rate-&gt;type = LQ_VHT_SISO;</div><div class='ctx'> 		rate-&gt;bw = bw;</div><div class='del'>-	} else if (sta-&gt;ht_cap.ht_supported &amp;&amp;</div><div class='add'>+	} else if (sta-&gt;deflink.ht_cap.ht_supported &amp;&amp;</div><div class='ctx'> 		   best_rssi &gt; IWL_RS_LOW_RSSI_THRESHOLD) {</div><div class='ctx'> 		initial_rates = rs_optimal_rates_ht;</div><div class='ctx'> 		nentries = ARRAY_SIZE(rs_optimal_rates_ht);</div><div class='hunk'>@@ -2646,13 +2605,12 @@ void rs_update_last_rssi(struct iwl_mvm *mvm,</div><div class='ctx'> 			 struct iwl_mvm_sta *mvmsta,</div><div class='ctx'> 			 struct ieee80211_rx_status *rx_status)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_lq_sta *lq_sta = &amp;mvmsta-&gt;lq_sta.rs_drv;</div><div class='add'>+	struct iwl_lq_sta *lq_sta = &amp;mvmsta-&gt;deflink.lq_sta.rs_drv;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	lq_sta-&gt;pers.chains = rx_status-&gt;chains;</div><div class='ctx'> 	lq_sta-&gt;pers.chain_signal[0] = rx_status-&gt;chain_signal[0];</div><div class='ctx'> 	lq_sta-&gt;pers.chain_signal[1] = rx_status-&gt;chain_signal[1];</div><div class='del'>-	lq_sta-&gt;pers.chain_signal[2] = rx_status-&gt;chain_signal[2];</div><div class='ctx'> 	lq_sta-&gt;pers.last_rssi = S8_MIN;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(lq_sta-&gt;pers.chain_signal); i++) {</div><div class='hunk'>@@ -2730,7 +2688,6 @@ static void rs_drv_get_rate(void *mvm_r, struct ieee80211_sta *sta,</div><div class='ctx'> 		/* if vif isn't initialized mvm doesn't know about</div><div class='ctx'> 		 * this station, so don't do anything with the it</div><div class='ctx'> 		 */</div><div class='del'>-		sta = NULL;</div><div class='ctx'> 		mvm_sta = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2738,7 +2695,11 @@ static void rs_drv_get_rate(void *mvm_r, struct ieee80211_sta *sta,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	lq_sta = mvm_sta;</div><div class='del'>-	iwl_mvm_hwrate_to_tx_rate(lq_sta-&gt;last_rate_n_flags,</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;lq_sta-&gt;pers.lock);</div><div class='add'>+	iwl_mvm_hwrate_to_tx_rate(iwl_mvm_v3_rate_from_fw(</div><div class='add'>+					cpu_to_le32(lq_sta-&gt;last_rate_n_flags),</div><div class='add'>+					1),</div><div class='ctx'> 				  info-&gt;band, &amp;info-&gt;control.rates[0]);</div><div class='ctx'> 	info-&gt;control.rates[0].count = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -2749,9 +2710,14 @@ static void rs_drv_get_rate(void *mvm_r, struct ieee80211_sta *sta,</div><div class='ctx'> 		optimal_rate = rs_get_optimal_rate(mvm, lq_sta);</div><div class='ctx'> 		last_ucode_rate = ucode_rate_from_rs_rate(mvm,</div><div class='ctx'> 							  optimal_rate);</div><div class='add'>+		last_ucode_rate =</div><div class='add'>+			iwl_mvm_v3_rate_from_fw(cpu_to_le32(last_ucode_rate),</div><div class='add'>+						1);</div><div class='ctx'> 		iwl_mvm_hwrate_to_tx_rate(last_ucode_rate, info-&gt;band,</div><div class='ctx'> 					  &amp;txrc-&gt;reported_rate);</div><div class='add'>+		txrc-&gt;reported_rate.count = 1;</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock_bh(&amp;lq_sta-&gt;pers.lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *rs_drv_alloc_sta(void *mvm_rate, struct ieee80211_sta *sta,</div><div class='hunk'>@@ -2760,7 +2726,7 @@ static void *rs_drv_alloc_sta(void *mvm_rate, struct ieee80211_sta *sta,</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> 	struct iwl_op_mode *op_mode = (struct iwl_op_mode *)mvm_rate;</div><div class='ctx'> 	struct iwl_mvm *mvm  = IWL_OP_MODE_GET_MVM(op_mode);</div><div class='del'>-	struct iwl_lq_sta *lq_sta = &amp;mvmsta-&gt;lq_sta.rs_drv;</div><div class='add'>+	struct iwl_lq_sta *lq_sta = &amp;mvmsta-&gt;deflink.lq_sta.rs_drv;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_RATE(mvm, "create station rate scale window\n");</div><div class='ctx'> </div><div class='hunk'>@@ -2809,14 +2775,14 @@ static void rs_vht_set_enabled_rates(struct ieee80211_sta *sta,</div><div class='ctx'> </div><div class='ctx'> 			/* VHT MCS9 isn't valid for 20Mhz for NSS=1,2 */</div><div class='ctx'> 			if (i == IWL_RATE_MCS_9_INDEX &amp;&amp;</div><div class='del'>-			    sta-&gt;bandwidth == IEEE80211_STA_RX_BW_20)</div><div class='add'>+			    sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_20)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			lq_sta-&gt;active_siso_rate |= BIT(i);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;rx_nss &lt; 2)</div><div class='add'>+	if (sta-&gt;deflink.rx_nss &lt; 2)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	highest_mcs = rs_vht_highest_rx_mcs_index(vht_cap, 2);</div><div class='hunk'>@@ -2827,7 +2793,7 @@ static void rs_vht_set_enabled_rates(struct ieee80211_sta *sta,</div><div class='ctx'> </div><div class='ctx'> 			/* VHT MCS9 isn't valid for 20Mhz for NSS=1,2 */</div><div class='ctx'> 			if (i == IWL_RATE_MCS_9_INDEX &amp;&amp;</div><div class='del'>-			    sta-&gt;bandwidth == IEEE80211_STA_RX_BW_20)</div><div class='add'>+			    sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_20)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			lq_sta-&gt;active_mimo2_rate |= BIT(i);</div><div class='hunk'>@@ -2854,11 +2820,11 @@ static void rs_ht_init(struct iwl_mvm *mvm,</div><div class='ctx'> 	lq_sta-&gt;active_mimo2_rate &amp;= ~((u16)0x2);</div><div class='ctx'> 	lq_sta-&gt;active_mimo2_rate &lt;&lt;= IWL_FIRST_OFDM_RATE;</div><div class='ctx'> </div><div class='del'>-	if (mvm-&gt;cfg-&gt;ht_params-&gt;ldpc &amp;&amp;</div><div class='add'>+	if (mvm-&gt;cfg-&gt;ht_params.ldpc &amp;&amp;</div><div class='ctx'> 	    (ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_LDPC_CODING))</div><div class='ctx'> 		lq_sta-&gt;ldpc = true;</div><div class='ctx'> </div><div class='del'>-	if (mvm-&gt;cfg-&gt;ht_params-&gt;stbc &amp;&amp;</div><div class='add'>+	if (mvm-&gt;cfg-&gt;ht_params.stbc &amp;&amp;</div><div class='ctx'> 	    (num_of_ant(iwl_mvm_get_valid_tx_ant(mvm)) &gt; 1) &amp;&amp;</div><div class='ctx'> 	    (ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_RX_STBC))</div><div class='ctx'> 		lq_sta-&gt;stbc_capable = true;</div><div class='hunk'>@@ -2873,11 +2839,11 @@ static void rs_vht_init(struct iwl_mvm *mvm,</div><div class='ctx'> {</div><div class='ctx'> 	rs_vht_set_enabled_rates(sta, vht_cap, lq_sta);</div><div class='ctx'> </div><div class='del'>-	if (mvm-&gt;cfg-&gt;ht_params-&gt;ldpc &amp;&amp;</div><div class='add'>+	if (mvm-&gt;cfg-&gt;ht_params.ldpc &amp;&amp;</div><div class='ctx'> 	    (vht_cap-&gt;cap &amp; IEEE80211_VHT_CAP_RXLDPC))</div><div class='ctx'> 		lq_sta-&gt;ldpc = true;</div><div class='ctx'> </div><div class='del'>-	if (mvm-&gt;cfg-&gt;ht_params-&gt;stbc &amp;&amp;</div><div class='add'>+	if (mvm-&gt;cfg-&gt;ht_params.stbc &amp;&amp;</div><div class='ctx'> 	    (num_of_ant(iwl_mvm_get_valid_tx_ant(mvm)) &gt; 1) &amp;&amp;</div><div class='ctx'> 	    (vht_cap-&gt;cap &amp; IEEE80211_VHT_CAP_RXSTBC_MASK))</div><div class='ctx'> 		lq_sta-&gt;stbc_capable = true;</div><div class='hunk'>@@ -2909,7 +2875,7 @@ void iwl_mvm_update_frame_stats(struct iwl_mvm *mvm, u32 rate, bool agg)</div><div class='ctx'> </div><div class='ctx'> 	mvm-&gt;drv_rx_stats.success_frames++;</div><div class='ctx'> </div><div class='del'>-	switch (rate &amp; RATE_MCS_CHAN_WIDTH_MSK) {</div><div class='add'>+	switch (rate &amp; RATE_MCS_CHAN_WIDTH_MSK_V1) {</div><div class='ctx'> 	case RATE_MCS_CHAN_WIDTH_20:</div><div class='ctx'> 		mvm-&gt;drv_rx_stats.bw_20_frames++;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2926,13 +2892,12 @@ void iwl_mvm_update_frame_stats(struct iwl_mvm *mvm, u32 rate, bool agg)</div><div class='ctx'> 		WARN_ONCE(1, "bad BW. rate 0x%x", rate);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (rate &amp; RATE_MCS_HT_MSK) {</div><div class='add'>+	if (rate &amp; RATE_MCS_HT_MSK_V1) {</div><div class='ctx'> 		mvm-&gt;drv_rx_stats.ht_frames++;</div><div class='del'>-		nss = ((rate &amp; RATE_HT_MCS_NSS_MSK) &gt;&gt; RATE_HT_MCS_NSS_POS) + 1;</div><div class='del'>-	} else if (rate &amp; RATE_MCS_VHT_MSK) {</div><div class='add'>+		nss = FIELD_GET(RATE_HT_MCS_MIMO2_MSK, rate) + 1;</div><div class='add'>+	} else if (rate &amp; RATE_MCS_VHT_MSK_V1) {</div><div class='ctx'> 		mvm-&gt;drv_rx_stats.vht_frames++;</div><div class='del'>-		nss = ((rate &amp; RATE_VHT_MCS_NSS_MSK) &gt;&gt;</div><div class='del'>-		       RATE_VHT_MCS_NSS_POS) + 1;</div><div class='add'>+		nss = FIELD_GET(RATE_VHT_MCS_NSS_MSK, rate) + 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mvm-&gt;drv_rx_stats.legacy_frames++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2942,7 +2907,7 @@ void iwl_mvm_update_frame_stats(struct iwl_mvm *mvm, u32 rate, bool agg)</div><div class='ctx'> 	else if (nss == 2)</div><div class='ctx'> 		mvm-&gt;drv_rx_stats.mimo2_frames++;</div><div class='ctx'> </div><div class='del'>-	if (rate &amp; RATE_MCS_SGI_MSK)</div><div class='add'>+	if (rate &amp; RATE_MCS_SGI_MSK_V1)</div><div class='ctx'> 		mvm-&gt;drv_rx_stats.sgi_frames++;</div><div class='ctx'> 	else</div><div class='ctx'> 		mvm-&gt;drv_rx_stats.ngi_frames++;</div><div class='hunk'>@@ -2964,23 +2929,23 @@ static void rs_drv_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> {</div><div class='ctx'> 	int i, j;</div><div class='ctx'> 	struct ieee80211_hw *hw = mvm-&gt;hw;</div><div class='del'>-	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='del'>-	struct ieee80211_sta_vht_cap *vht_cap = &amp;sta-&gt;vht_cap;</div><div class='add'>+	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;deflink.ht_cap;</div><div class='add'>+	struct ieee80211_sta_vht_cap *vht_cap = &amp;sta-&gt;deflink.vht_cap;</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='del'>-	struct iwl_lq_sta *lq_sta = &amp;mvmsta-&gt;lq_sta.rs_drv;</div><div class='add'>+	struct iwl_lq_sta *lq_sta = &amp;mvmsta-&gt;deflink.lq_sta.rs_drv;</div><div class='ctx'> 	struct ieee80211_supported_band *sband;</div><div class='ctx'> 	unsigned long supp; /* must be unsigned long for for_each_set_bit */</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;mvmsta-&gt;lq_sta.rs_drv.pers.lock);</div><div class='add'>+	lockdep_assert_held(&amp;mvmsta-&gt;deflink.lq_sta.rs_drv.pers.lock);</div><div class='ctx'> </div><div class='ctx'> 	/* clear all non-persistent lq data */</div><div class='ctx'> 	memset(lq_sta, 0, offsetof(typeof(*lq_sta), pers));</div><div class='ctx'> </div><div class='ctx'> 	sband = hw-&gt;wiphy-&gt;bands[band];</div><div class='ctx'> </div><div class='del'>-	lq_sta-&gt;lq.sta_id = mvmsta-&gt;sta_id;</div><div class='add'>+	lq_sta-&gt;lq.sta_id = mvmsta-&gt;deflink.sta_id;</div><div class='ctx'> 	mvmsta-&gt;amsdu_enabled = 0;</div><div class='del'>-	mvmsta-&gt;max_amsdu_len = sta-&gt;max_amsdu_len;</div><div class='add'>+	mvmsta-&gt;max_amsdu_len = sta-&gt;cur-&gt;max_amsdu_len;</div><div class='ctx'> </div><div class='ctx'> 	for (j = 0; j &lt; LQ_SIZE; j++)</div><div class='ctx'> 		rs_rate_scale_clear_tbl_windows(mvm, &amp;lq_sta-&gt;lq_info[j]);</div><div class='hunk'>@@ -2990,7 +2955,7 @@ static void rs_drv_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_RATE(mvm,</div><div class='ctx'> 		       "LQ: *** rate scale station global init for station %d ***\n",</div><div class='del'>-		       mvmsta-&gt;sta_id);</div><div class='add'>+		       mvmsta-&gt;deflink.sta_id);</div><div class='ctx'> 	/* TODO: what is a good starting rate for STA? About middle? Maybe not</div><div class='ctx'> 	 * the lowest or the highest rate.. Could consider using RSSI from</div><div class='ctx'> 	 * previous packets? Need to have IEEE 802.1X auth succeed immediately</div><div class='hunk'>@@ -3001,7 +2966,7 @@ static void rs_drv_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * active legacy rates as per supported rates bitmap</div><div class='ctx'> 	 */</div><div class='del'>-	supp = sta-&gt;supp_rates[sband-&gt;band];</div><div class='add'>+	supp = sta-&gt;deflink.supp_rates[sband-&gt;band];</div><div class='ctx'> 	lq_sta-&gt;active_legacy_rate = 0;</div><div class='ctx'> 	for_each_set_bit(i, &amp;supp, BITS_PER_LONG)</div><div class='ctx'> 		lq_sta-&gt;active_legacy_rate |= BIT(sband-&gt;bitrates[i].hw_value);</div><div class='hunk'>@@ -3052,17 +3017,20 @@ static void rs_drv_rate_update(void *mvm_r,</div><div class='ctx'> 			       void *priv_sta, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_op_mode *op_mode = mvm_r;</div><div class='add'>+	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> 	struct iwl_mvm *mvm __maybe_unused = IWL_OP_MODE_GET_MVM(op_mode);</div><div class='ctx'> 	u8 tid;</div><div class='ctx'> </div><div class='del'>-	if (!iwl_mvm_sta_from_mac80211(sta)-&gt;vif)</div><div class='add'>+	if (!mvmsta-&gt;vif)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Stop any ongoing aggregations as rs starts off assuming no agg */</div><div class='ctx'> 	for (tid = 0; tid &lt; IWL_MAX_TID_COUNT; tid++)</div><div class='ctx'> 		ieee80211_stop_tx_ba_session(sta, tid);</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_rs_rate_init(mvm, sta, sband-&gt;band, true);</div><div class='add'>+	iwl_mvm_rs_rate_init(mvm, mvmsta-&gt;vif, sta,</div><div class='add'>+			     &amp;mvmsta-&gt;vif-&gt;bss_conf, &amp;sta-&gt;deflink,</div><div class='add'>+			     sband-&gt;band);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __iwl_mvm_rs_tx_status(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -3082,7 +3050,7 @@ static void __iwl_mvm_rs_tx_status(struct iwl_mvm *mvm,</div><div class='ctx'> 	u8 lq_color = RS_DRV_DATA_LQ_COLOR_GET(tlc_info);</div><div class='ctx'> 	u32 tx_resp_hwrate = (uintptr_t)info-&gt;status.status_driver_data[1];</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='del'>-	struct iwl_lq_sta *lq_sta = &amp;mvmsta-&gt;lq_sta.rs_drv;</div><div class='add'>+	struct iwl_lq_sta *lq_sta = &amp;mvmsta-&gt;deflink.lq_sta.rs_drv;</div><div class='ctx'> </div><div class='ctx'> 	if (!lq_sta-&gt;pers.drv) {</div><div class='ctx'> 		IWL_DEBUG_RATE(mvm, "Rate scaling not initialized yet.\n");</div><div class='hunk'>@@ -3294,7 +3262,7 @@ static void __iwl_mvm_rs_tx_status(struct iwl_mvm *mvm,</div><div class='ctx'> 	IWL_DEBUG_RATE(mvm, "reduced txpower: %d\n", reduced_txp);</div><div class='ctx'> done:</div><div class='ctx'> 	/* See if there's a better rate or modulation mode to try. */</div><div class='del'>-	if (sta-&gt;supp_rates[info-&gt;band])</div><div class='add'>+	if (sta-&gt;deflink.supp_rates[info-&gt;band])</div><div class='ctx'> 		rs_rate_scale_perform(mvm, sta, lq_sta, tid, ndp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3306,11 +3274,11 @@ void iwl_mvm_rs_tx_status(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 	/* If it's locked we are in middle of init flow</div><div class='ctx'> 	 * just wait for next tx status to update the lq_sta data</div><div class='ctx'> 	 */</div><div class='del'>-	if (!spin_trylock(&amp;mvmsta-&gt;lq_sta.rs_drv.pers.lock))</div><div class='add'>+	if (!spin_trylock_bh(&amp;mvmsta-&gt;deflink.lq_sta.rs_drv.pers.lock))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	__iwl_mvm_rs_tx_status(mvm, sta, tid, info, ndp);</div><div class='del'>-	spin_unlock(&amp;mvmsta-&gt;lq_sta.rs_drv.pers.lock);</div><div class='add'>+	spin_unlock_bh(&amp;mvmsta-&gt;deflink.lq_sta.rs_drv.pers.lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MAC80211_DEBUGFS</div><div class='hunk'>@@ -3323,7 +3291,7 @@ static void rs_build_rates_table_from_fixed(struct iwl_mvm *mvm,</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int num_rates = ARRAY_SIZE(lq_cmd-&gt;rs_table);</div><div class='ctx'> 	__le32 ucode_rate_le32 = cpu_to_le32(ucode_rate);</div><div class='del'>-	u8 ant = (ucode_rate &amp; RATE_MCS_ANT_ABC_MSK) &gt;&gt; RATE_MCS_ANT_POS;</div><div class='add'>+	u8 ant = (ucode_rate &amp; RATE_MCS_ANT_AB_MSK) &gt;&gt; RATE_MCS_ANT_POS;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num_rates; i++)</div><div class='ctx'> 		lq_cmd-&gt;rs_table[i] = ucode_rate_le32;</div><div class='hunk'>@@ -3343,7 +3311,7 @@ static void rs_build_rates_table_from_fixed(struct iwl_mvm *mvm,</div><div class='ctx'> 	if (num_of_ant(ant) == 1)</div><div class='ctx'> 		lq_cmd-&gt;single_stream_ant_msk = ant;</div><div class='ctx'> </div><div class='del'>-	if (!mvm-&gt;trans-&gt;trans_cfg-&gt;gen2)</div><div class='add'>+	if (!mvm-&gt;trans-&gt;mac_cfg-&gt;gen2)</div><div class='ctx'> 		lq_cmd-&gt;agg_frame_cnt_limit = LINK_QUAL_AGG_FRAME_LIMIT_DEF;</div><div class='ctx'> 	else</div><div class='ctx'> 		lq_cmd-&gt;agg_frame_cnt_limit =</div><div class='hunk'>@@ -3486,7 +3454,7 @@ static void rs_bfer_active_iter(void *_data,</div><div class='ctx'> {</div><div class='ctx'> 	struct rs_bfer_active_iter_data *data = _data;</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='del'>-	struct iwl_lq_cmd *lq_cmd = &amp;mvmsta-&gt;lq_sta.rs_drv.lq;</div><div class='add'>+	struct iwl_lq_cmd *lq_cmd = &amp;mvmsta-&gt;deflink.lq_sta.rs_drv.lq;</div><div class='ctx'> 	u32 ss_params = le32_to_cpu(lq_cmd-&gt;ss_params);</div><div class='ctx'> </div><div class='ctx'> 	if (sta == data-&gt;exclude_sta)</div><div class='hunk'>@@ -3517,7 +3485,8 @@ static int rs_bfer_priority(struct iwl_mvm_sta *sta)</div><div class='ctx'> 		prio = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		WARN_ONCE(true, "viftype %d sta_id %d", viftype, sta-&gt;sta_id);</div><div class='add'>+		WARN_ONCE(true, "viftype %d sta_id %d", viftype,</div><div class='add'>+			  sta-&gt;deflink.sta_id);</div><div class='ctx'> 		prio = -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3594,12 +3563,12 @@ static void rs_set_lq_ss_params(struct iwl_mvm *mvm,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_RATE(mvm, "Found existing sta %d with BFER activated\n",</div><div class='del'>-		       bfer_mvmsta-&gt;sta_id);</div><div class='add'>+		       bfer_mvmsta-&gt;deflink.sta_id);</div><div class='ctx'> </div><div class='ctx'> 	/* Disallow BFER on another STA if active and we're a higher priority */</div><div class='ctx'> 	if (rs_bfer_priority_cmp(mvmsta, bfer_mvmsta) &gt; 0) {</div><div class='ctx'> 		struct iwl_lq_cmd *bfersta_lq_cmd =</div><div class='del'>-			&amp;bfer_mvmsta-&gt;lq_sta.rs_drv.lq;</div><div class='add'>+			&amp;bfer_mvmsta-&gt;deflink.lq_sta.rs_drv.lq;</div><div class='ctx'> 		u32 bfersta_ss_params = le32_to_cpu(bfersta_lq_cmd-&gt;ss_params);</div><div class='ctx'> </div><div class='ctx'> 		bfersta_ss_params &amp;= ~LQ_SS_BFER_ALLOWED;</div><div class='hunk'>@@ -3609,7 +3578,7 @@ static void rs_set_lq_ss_params(struct iwl_mvm *mvm,</div><div class='ctx'> 		ss_params |= LQ_SS_BFER_ALLOWED;</div><div class='ctx'> 		IWL_DEBUG_RATE(mvm,</div><div class='ctx'> 			       "Lower priority BFER sta found (%d). Switch BFER\n",</div><div class='del'>-			       bfer_mvmsta-&gt;sta_id);</div><div class='add'>+			       bfer_mvmsta-&gt;deflink.sta_id);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	lq_cmd-&gt;ss_params = cpu_to_le32(ss_params);</div><div class='hunk'>@@ -3651,7 +3620,7 @@ static void rs_fill_lq_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 	    num_of_ant(initial_rate-&gt;ant) == 1)</div><div class='ctx'> 		lq_cmd-&gt;single_stream_ant_msk = initial_rate-&gt;ant;</div><div class='ctx'> </div><div class='del'>-	lq_cmd-&gt;agg_frame_cnt_limit = mvmsta-&gt;max_agg_bufsize;</div><div class='add'>+	lq_cmd-&gt;agg_frame_cnt_limit = lq_sta-&gt;pers.max_agg_bufsize;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In case of low latency, tell the firmware to leave a frame in the</div><div class='hunk'>@@ -3688,66 +3657,48 @@ static void rs_free_sta(void *mvm_r, struct ieee80211_sta *sta, void *mvm_sta)</div><div class='ctx'> 	IWL_DEBUG_RATE(mvm, "leave\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int rs_pretty_print_rate(char *buf, int bufsz, const u32 rate)</div><div class='add'>+int rs_pretty_print_rate_v1(char *buf, int bufsz, const u32 rate)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	char *type, *bw;</div><div class='add'>+	char *type;</div><div class='ctx'> 	u8 mcs = 0, nss = 0;</div><div class='del'>-	u8 ant = (rate &amp; RATE_MCS_ANT_ABC_MSK) &gt;&gt; RATE_MCS_ANT_POS;</div><div class='add'>+	u8 ant = (rate &amp; RATE_MCS_ANT_AB_MSK) &gt;&gt; RATE_MCS_ANT_POS;</div><div class='add'>+	u32 bw = (rate &amp; RATE_MCS_CHAN_WIDTH_MSK_V1) &gt;&gt;</div><div class='add'>+		RATE_MCS_CHAN_WIDTH_POS;</div><div class='ctx'> </div><div class='del'>-	if (!(rate &amp; RATE_MCS_HT_MSK) &amp;&amp;</div><div class='del'>-	    !(rate &amp; RATE_MCS_VHT_MSK) &amp;&amp;</div><div class='del'>-	    !(rate &amp; RATE_MCS_HE_MSK)) {</div><div class='add'>+	if (!(rate &amp; RATE_MCS_HT_MSK_V1) &amp;&amp;</div><div class='add'>+	    !(rate &amp; RATE_MCS_VHT_MSK_V1) &amp;&amp;</div><div class='add'>+	    !(rate &amp; RATE_MCS_HE_MSK_V1)) {</div><div class='ctx'> 		int index = iwl_hwrate_to_plcp_idx(rate);</div><div class='ctx'> </div><div class='ctx'> 		return scnprintf(buf, bufsz, "Legacy | ANT: %s Rate: %s Mbps",</div><div class='del'>-				 rs_pretty_ant(ant),</div><div class='add'>+				 iwl_rs_pretty_ant(ant),</div><div class='ctx'> 				 index == IWL_RATE_INVALID ? "BAD" :</div><div class='del'>-				 iwl_rate_mcs[index].mbps);</div><div class='add'>+				 iwl_rate_mcs(index)-&gt;mbps);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (rate &amp; RATE_MCS_VHT_MSK) {</div><div class='add'>+	if (rate &amp; RATE_MCS_VHT_MSK_V1) {</div><div class='ctx'> 		type = "VHT";</div><div class='ctx'> 		mcs = rate &amp; RATE_VHT_MCS_RATE_CODE_MSK;</div><div class='del'>-		nss = ((rate &amp; RATE_VHT_MCS_NSS_MSK)</div><div class='del'>-		       &gt;&gt; RATE_VHT_MCS_NSS_POS) + 1;</div><div class='del'>-	} else if (rate &amp; RATE_MCS_HT_MSK) {</div><div class='add'>+		nss = FIELD_GET(RATE_VHT_MCS_NSS_MSK, rate) + 1;</div><div class='add'>+	} else if (rate &amp; RATE_MCS_HT_MSK_V1) {</div><div class='ctx'> 		type = "HT";</div><div class='del'>-		mcs = rate &amp; RATE_HT_MCS_INDEX_MSK;</div><div class='del'>-		nss = ((rate &amp; RATE_HT_MCS_NSS_MSK)</div><div class='del'>-		       &gt;&gt; RATE_HT_MCS_NSS_POS) + 1;</div><div class='del'>-	} else if (rate &amp; RATE_MCS_HE_MSK) {</div><div class='add'>+		mcs = rate &amp; RATE_HT_MCS_INDEX_MSK_V1;</div><div class='add'>+		nss = FIELD_GET(RATE_HT_MCS_MIMO2_MSK, rate) + 1;</div><div class='add'>+	} else if (rate &amp; RATE_MCS_HE_MSK_V1) {</div><div class='ctx'> 		type = "HE";</div><div class='ctx'> 		mcs = rate &amp; RATE_VHT_MCS_RATE_CODE_MSK;</div><div class='del'>-		nss = ((rate &amp; RATE_VHT_MCS_NSS_MSK)</div><div class='del'>-		       &gt;&gt; RATE_VHT_MCS_NSS_POS) + 1;</div><div class='add'>+		nss = FIELD_GET(RATE_VHT_MCS_NSS_MSK, rate) + 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		type = "Unknown"; /* shouldn't happen */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (rate &amp; RATE_MCS_CHAN_WIDTH_MSK) {</div><div class='del'>-	case RATE_MCS_CHAN_WIDTH_20:</div><div class='del'>-		bw = "20Mhz";</div><div class='del'>-		break;</div><div class='del'>-	case RATE_MCS_CHAN_WIDTH_40:</div><div class='del'>-		bw = "40Mhz";</div><div class='del'>-		break;</div><div class='del'>-	case RATE_MCS_CHAN_WIDTH_80:</div><div class='del'>-		bw = "80Mhz";</div><div class='del'>-		break;</div><div class='del'>-	case RATE_MCS_CHAN_WIDTH_160:</div><div class='del'>-		bw = "160Mhz";</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		bw = "BAD BW";</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return scnprintf(buf, bufsz,</div><div class='ctx'> 			 "0x%x: %s | ANT: %s BW: %s MCS: %d NSS: %d %s%s%s%s%s",</div><div class='del'>-			 rate, type, rs_pretty_ant(ant), bw, mcs, nss,</div><div class='del'>-			 (rate &amp; RATE_MCS_SGI_MSK) ? "SGI " : "NGI ",</div><div class='add'>+			 rate, type, iwl_rs_pretty_ant(ant), iwl_rs_pretty_bw(bw), mcs, nss,</div><div class='add'>+			 (rate &amp; RATE_MCS_SGI_MSK_V1) ? "SGI " : "NGI ",</div><div class='ctx'> 			 (rate &amp; RATE_MCS_STBC_MSK) ? "STBC " : "",</div><div class='del'>-			 (rate &amp; RATE_MCS_LDPC_MSK) ? "LDPC " : "",</div><div class='add'>+			 (rate &amp; RATE_MCS_LDPC_MSK_V1) ? "LDPC " : "",</div><div class='ctx'> 			 (rate &amp; RATE_HE_DUAL_CARRIER_MODE_MSK) ? "DCM " : "",</div><div class='ctx'> 			 (rate &amp; RATE_MCS_BF_MSK) ? "BF " : "");</div><div class='ctx'> }</div><div class='hunk'>@@ -3811,7 +3762,7 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	struct iwl_lq_sta *lq_sta = file-&gt;private_data;</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta =</div><div class='del'>-		container_of(lq_sta, struct iwl_mvm_sta, lq_sta.rs_drv);</div><div class='add'>+		container_of(lq_sta, struct iwl_mvm_sta, deflink.lq_sta.rs_drv);</div><div class='ctx'> 	struct iwl_mvm *mvm;</div><div class='ctx'> 	struct iwl_scale_tbl_info *tbl = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='ctx'> 	struct rs_rate *rate = &amp;tbl-&gt;rate;</div><div class='hunk'>@@ -3830,10 +3781,9 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,</div><div class='ctx'> 			  lq_sta-&gt;active_legacy_rate);</div><div class='ctx'> 	desc += scnprintf(buff + desc, bufsz - desc, "fixed rate 0x%X\n",</div><div class='ctx'> 			  lq_sta-&gt;pers.dbg_fixed_rate);</div><div class='del'>-	desc += scnprintf(buff + desc, bufsz - desc, "valid_tx_ant %s%s%s\n",</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc, "valid_tx_ant %s%s\n",</div><div class='ctx'> 	    (iwl_mvm_get_valid_tx_ant(mvm) &amp; ANT_A) ? "ANT_A," : "",</div><div class='del'>-	    (iwl_mvm_get_valid_tx_ant(mvm) &amp; ANT_B) ? "ANT_B," : "",</div><div class='del'>-	    (iwl_mvm_get_valid_tx_ant(mvm) &amp; ANT_C) ? "ANT_C" : "");</div><div class='add'>+	    (iwl_mvm_get_valid_tx_ant(mvm) &amp; ANT_B) ? "ANT_B," : "");</div><div class='ctx'> 	desc += scnprintf(buff + desc, bufsz - desc, "lq type %s\n",</div><div class='ctx'> 			  (is_legacy(rate)) ? "legacy" :</div><div class='ctx'> 			  is_vht(rate) ? "VHT" : "HT");</div><div class='hunk'>@@ -3891,7 +3841,7 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,</div><div class='ctx'> </div><div class='ctx'> 		desc += scnprintf(buff + desc, bufsz - desc,</div><div class='ctx'> 				  " rate[%d] 0x%X ", i, r);</div><div class='del'>-		desc += rs_pretty_print_rate(buff + desc, bufsz - desc, r);</div><div class='add'>+		desc += rs_pretty_print_rate_v1(buff + desc, bufsz - desc, r);</div><div class='ctx'> 		if (desc &lt; bufsz - 1)</div><div class='ctx'> 			buff[desc++] = '\n';</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4113,7 +4063,8 @@ static void rs_drv_add_sta_debugfs(void *mvm, void *priv_sta,</div><div class='ctx'> 	struct iwl_lq_sta *lq_sta = priv_sta;</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta;</div><div class='ctx'> </div><div class='del'>-	mvmsta = container_of(lq_sta, struct iwl_mvm_sta, lq_sta.rs_drv);</div><div class='add'>+	mvmsta = container_of(lq_sta, struct iwl_mvm_sta,</div><div class='add'>+			      deflink.lq_sta.rs_drv);</div><div class='ctx'> </div><div class='ctx'> 	if (!mvmsta-&gt;vif)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -4162,17 +4113,22 @@ static const struct rate_control_ops rs_mvm_ops_drv = {</div><div class='ctx'> 	.capa = RATE_CTRL_CAPA_VHT_EXT_NSS_BW,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void iwl_mvm_rs_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='del'>-			  enum nl80211_band band, bool update)</div><div class='add'>+void iwl_mvm_rs_rate_init(struct iwl_mvm *mvm,</div><div class='add'>+			  struct ieee80211_vif *vif,</div><div class='add'>+			  struct ieee80211_sta *sta,</div><div class='add'>+			  struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			  struct ieee80211_link_sta *link_sta,</div><div class='add'>+			  enum nl80211_band band)</div><div class='ctx'> {</div><div class='ctx'> 	if (iwl_mvm_has_tlc_offload(mvm)) {</div><div class='del'>-		rs_fw_rate_init(mvm, sta, band, update);</div><div class='add'>+		iwl_mvm_rs_fw_rate_init(mvm, vif, sta, link_conf,</div><div class='add'>+					link_sta, band);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;mvmsta-&gt;lq_sta.rs_drv.pers.lock);</div><div class='add'>+		spin_lock_bh(&amp;mvmsta-&gt;deflink.lq_sta.rs_drv.pers.lock);</div><div class='ctx'> 		rs_drv_rate_init(mvm, sta, band);</div><div class='del'>-		spin_unlock(&amp;mvmsta-&gt;lq_sta.rs_drv.pers.lock);</div><div class='add'>+		spin_unlock_bh(&amp;mvmsta-&gt;deflink.lq_sta.rs_drv.pers.lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4189,7 +4145,7 @@ void iwl_mvm_rate_control_unregister(void)</div><div class='ctx'> static int rs_drv_tx_protection(struct iwl_mvm *mvm, struct iwl_mvm_sta *mvmsta,</div><div class='ctx'> 				bool enable)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_lq_cmd *lq = &amp;mvmsta-&gt;lq_sta.rs_drv.lq;</div><div class='add'>+	struct iwl_lq_cmd *lq = &amp;mvmsta-&gt;deflink.lq_sta.rs_drv.lq;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -4211,6 +4167,8 @@ static int rs_drv_tx_protection(struct iwl_mvm *mvm, struct iwl_mvm_sta *mvmsta,</div><div class='ctx'>  * @mvm: The mvm component</div><div class='ctx'>  * @mvmsta: The station</div><div class='ctx'>  * @enable: Enable Tx protection?</div><div class='add'>+ *</div><div class='add'>+ * Returns: an error code</div><div class='ctx'>  */</div><div class='ctx'> int iwl_mvm_tx_protection(struct iwl_mvm *mvm, struct iwl_mvm_sta *mvmsta,</div><div class='ctx'> 			  bool enable)</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rs.h b/drivers/net/wireless/intel/iwlwifi/mvm/rs.h<br/>index 32104c9f8f5e..34c957bef6f8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/rs.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/rs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/rs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/rs.h</a></div><div class='hunk'>@@ -1,15 +1,9 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.</div><div class='ctx'>  * Copyright(c) 2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright(c) 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright(c) 2018 - 2019 Intel Corporation</div><div class='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;linuxwifi@intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='add'>+ * Copyright (C) 2003 - 2014, 2018 - 2025 Intel Corporation</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #ifndef __rs_h__</div><div class='hunk'>@@ -36,11 +30,6 @@ struct iwl_rs_rate_info {</div><div class='ctx'> </div><div class='ctx'> #define IWL_RATE_60M_PLCP 3</div><div class='ctx'> </div><div class='del'>-enum {</div><div class='del'>-	IWL_RATE_INVM_INDEX = IWL_RATE_COUNT,</div><div class='del'>-	IWL_RATE_INVALID = IWL_RATE_COUNT,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define LINK_QUAL_MAX_RETRY_NUM 16</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -133,13 +122,8 @@ enum {</div><div class='ctx'> </div><div class='ctx'> #define LINK_QUAL_AGG_FRAME_LIMIT_DEF	(63)</div><div class='ctx'> #define LINK_QUAL_AGG_FRAME_LIMIT_MAX	(63)</div><div class='del'>-/*</div><div class='del'>- * FIXME - various places in firmware API still use u8,</div><div class='del'>- * e.g. LQ command and SCD config command.</div><div class='del'>- * This should be 256 instead.</div><div class='del'>- */</div><div class='del'>-#define LINK_QUAL_AGG_FRAME_LIMIT_GEN2_DEF	(255)</div><div class='del'>-#define LINK_QUAL_AGG_FRAME_LIMIT_GEN2_MAX	(255)</div><div class='add'>+#define LINK_QUAL_AGG_FRAME_LIMIT_GEN2_DEF	(64)</div><div class='add'>+#define LINK_QUAL_AGG_FRAME_LIMIT_GEN2_MAX	(64)</div><div class='ctx'> #define LINK_QUAL_AGG_FRAME_LIMIT_MIN	(0)</div><div class='ctx'> </div><div class='ctx'> #define LQ_SIZE		2	/* 2 mode tables:  "Active" and "Search" */</div><div class='hunk'>@@ -211,27 +195,16 @@ struct rs_rate {</div><div class='ctx'> #define is_ht80(rate)         ((rate)-&gt;bw == RATE_MCS_CHAN_WIDTH_80)</div><div class='ctx'> #define is_ht160(rate)        ((rate)-&gt;bw == RATE_MCS_CHAN_WIDTH_160)</div><div class='ctx'> </div><div class='del'>-#define IWL_MAX_MCS_DISPLAY_SIZE	12</div><div class='del'>-</div><div class='del'>-struct iwl_rate_mcs_info {</div><div class='del'>-	char	mbps[IWL_MAX_MCS_DISPLAY_SIZE];</div><div class='del'>-	char	mcs[IWL_MAX_MCS_DISPLAY_SIZE];</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_lq_sta_rs_fw - rate and related statistics for RS in FW</div><div class='ctx'>  * @last_rate_n_flags: last rate reported by FW</div><div class='del'>- * @sta_id: the id of the station</div><div class='del'>-#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='del'>- * @dbg_fixed_rate: for debug, use fixed rate if not 0</div><div class='del'>- * @dbg_agg_frame_count_lim: for debug, max number of frames in A-MPDU</div><div class='del'>-#endif</div><div class='del'>- * @chains: bitmask of chains reported in %chain_signal</div><div class='del'>- * @chain_signal: per chain signal strength</div><div class='del'>- * @last_rssi: last rssi reported</div><div class='del'>- * @drv: pointer back to the driver data</div><div class='add'>+ * @pers: persistent fields</div><div class='add'>+ * @pers.sta_id: the id of the station</div><div class='add'>+ * @pers.chains: bitmask of chains reported in %chain_signal</div><div class='add'>+ * @pers.chain_signal: per chain signal strength</div><div class='add'>+ * @pers.last_rssi: last rssi reported</div><div class='add'>+ * @pers.drv: pointer back to the driver data</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> struct iwl_lq_sta_rs_fw {</div><div class='ctx'> 	/* last tx rate_n_flags */</div><div class='ctx'> 	u32 last_rate_n_flags;</div><div class='hunk'>@@ -240,7 +213,14 @@ struct iwl_lq_sta_rs_fw {</div><div class='ctx'> 	struct lq_sta_pers_rs_fw {</div><div class='ctx'> 		u32 sta_id;</div><div class='ctx'> #ifdef CONFIG_MAC80211_DEBUGFS</div><div class='add'>+		/**</div><div class='add'>+		 * @pers.dbg_fixed_rate: for debug, use fixed rate if not 0</div><div class='add'>+		 */</div><div class='ctx'> 		u32 dbg_fixed_rate;</div><div class='add'>+		/**</div><div class='add'>+		 * @pers.dbg_agg_frame_count_lim: for debug, max number of</div><div class='add'>+		 *	frames in A-MPDU</div><div class='add'>+		 */</div><div class='ctx'> 		u16 dbg_agg_frame_count_lim;</div><div class='ctx'> #endif</div><div class='ctx'> 		u8 chains;</div><div class='hunk'>@@ -250,7 +230,7 @@ struct iwl_lq_sta_rs_fw {</div><div class='ctx'> 	} pers;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * struct iwl_rate_scale_data -- tx success history for one rate</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_rate_scale_data {</div><div class='hunk'>@@ -292,7 +272,7 @@ struct rs_rate_stats {</div><div class='ctx'> 	u64 total;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * struct iwl_scale_tbl_info -- tx params and success history for all rates</div><div class='ctx'>  *</div><div class='ctx'>  * There are two of these in struct iwl_lq_sta,</div><div class='hunk'>@@ -313,7 +293,7 @@ enum {</div><div class='ctx'> 	RS_STATE_STAY_IN_COLUMN,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * struct iwl_lq_sta -- driver's rate scaling private structure</div><div class='ctx'>  *</div><div class='ctx'>  * Pointer to this gets passed back and forth between driver and mac80211.</div><div class='hunk'>@@ -370,6 +350,7 @@ struct iwl_lq_sta {</div><div class='ctx'> </div><div class='ctx'> 	/* last tx rate_n_flags */</div><div class='ctx'> 	u32 last_rate_n_flags;</div><div class='add'>+</div><div class='ctx'> 	/* packets destined for this STA are aggregated */</div><div class='ctx'> 	u8 is_agg;</div><div class='ctx'> </div><div class='hunk'>@@ -388,6 +369,7 @@ struct iwl_lq_sta {</div><div class='ctx'> 		u8 chains;</div><div class='ctx'> 		s8 chain_signal[IEEE80211_MAX_CHAINS];</div><div class='ctx'> 		s8 last_rssi;</div><div class='add'>+		u16 max_agg_bufsize;</div><div class='ctx'> 		struct rs_rate_stats tx_stats[RS_COLUMN_COUNT][IWL_RATE_COUNT];</div><div class='ctx'> 		struct iwl_mvm *drv;</div><div class='ctx'> 		spinlock_t lock; /* for races in reinit/update table */</div><div class='hunk'>@@ -409,15 +391,19 @@ struct iwl_lq_sta {</div><div class='ctx'> 				   ((_c) &lt;&lt; RS_DRV_DATA_LQ_COLOR_POS)))</div><div class='ctx'> </div><div class='ctx'> /* Initialize station's rate scaling information after adding station */</div><div class='del'>-void iwl_mvm_rs_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='del'>-			  enum nl80211_band band, bool init);</div><div class='add'>+void iwl_mvm_rs_rate_init(struct iwl_mvm *mvm,</div><div class='add'>+			  struct ieee80211_vif *vif,</div><div class='add'>+			  struct ieee80211_sta *sta,</div><div class='add'>+			  struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			  struct ieee80211_link_sta *link_sta,</div><div class='add'>+			  enum nl80211_band band);</div><div class='ctx'> </div><div class='ctx'> /* Notify RS about Tx status */</div><div class='ctx'> void iwl_mvm_rs_tx_status(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 			  int tid, struct ieee80211_tx_info *info, bool ndp);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * iwl_rate_control_register - Register the rate control algorithm callbacks</div><div class='add'>+ * iwl_mvm_rate_control_register - Register the rate control algorithm callbacks</div><div class='ctx'>  *</div><div class='ctx'>  * Since the rate control algorithm is hardware specific, there is no need</div><div class='ctx'>  * or reason to place it as a stand alone module.  The driver can call</div><div class='hunk'>@@ -425,11 +411,12 @@ void iwl_mvm_rs_tx_status(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'>  * with the mac80211 subsystem.  This should be performed prior to calling</div><div class='ctx'>  * ieee80211_register_hw</div><div class='ctx'>  *</div><div class='add'>+ * Return: negative error code, or 0 on success</div><div class='ctx'>  */</div><div class='ctx'> int iwl_mvm_rate_control_register(void);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * iwl_rate_control_unregister - Unregister the rate control callbacks</div><div class='add'>+ * iwl_mvm_rate_control_unregister - Unregister the rate control callbacks</div><div class='ctx'>  *</div><div class='ctx'>  * This should be called after calling ieee80211_unregister_hw, but before</div><div class='ctx'>  * the driver is unloaded.</div><div class='hunk'>@@ -445,13 +432,24 @@ int iwl_mvm_tx_protection(struct iwl_mvm *mvm, struct iwl_mvm_sta *mvmsta,</div><div class='ctx'> void iwl_mvm_reset_frame_stats(struct iwl_mvm *mvm);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+struct iwl_mvm_link_sta;</div><div class='add'>+</div><div class='ctx'> void iwl_mvm_rs_add_sta(struct iwl_mvm *mvm, struct iwl_mvm_sta *mvmsta);</div><div class='del'>-void rs_fw_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='del'>-		     enum nl80211_band band, bool update);</div><div class='add'>+void iwl_mvm_rs_add_sta_link(struct iwl_mvm *mvm,</div><div class='add'>+			     struct iwl_mvm_link_sta *link_sta);</div><div class='add'>+</div><div class='add'>+void iwl_mvm_rs_fw_rate_init(struct iwl_mvm *mvm,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_sta *sta,</div><div class='add'>+			     struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			     struct ieee80211_link_sta *link_sta,</div><div class='add'>+			     enum nl80211_band band);</div><div class='ctx'> int rs_fw_tx_protection(struct iwl_mvm *mvm, struct iwl_mvm_sta *mvmsta,</div><div class='ctx'> 			bool enable);</div><div class='ctx'> void iwl_mvm_tlc_update_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 			      struct iwl_rx_cmd_buffer *rxb);</div><div class='ctx'> </div><div class='del'>-u16 rs_fw_get_max_amsdu_len(struct ieee80211_sta *sta);</div><div class='add'>+u16 rs_fw_get_max_amsdu_len(struct ieee80211_sta *sta,</div><div class='add'>+			    struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			    struct ieee80211_link_sta *link_sta);</div><div class='ctx'> #endif /* __rs__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c<br/>index 8ef5399ad9be..d0c0faae0122 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/rx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/rx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/rx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/rx.c</a></div><div class='hunk'>@@ -1,10 +1,10 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include "iwl-trans.h"</div><div class='hunk'>@@ -83,8 +83,8 @@ static void iwl_mvm_pass_packet_to_mac80211(struct iwl_mvm *mvm,</div><div class='ctx'> 	fraglen = len - hdrlen;</div><div class='ctx'> </div><div class='ctx'> 	if (fraglen) {</div><div class='del'>-		int offset = (void *)hdr + hdrlen -</div><div class='del'>-			     rxb_addr(rxb) + rxb_offset(rxb);</div><div class='add'>+		int offset = (u8 *)hdr + hdrlen -</div><div class='add'>+			     (u8 *)rxb_addr(rxb) + rxb_offset(rxb);</div><div class='ctx'> </div><div class='ctx'> 		skb_add_rx_frag(skb, 0, rxb_steal_page(rxb), offset,</div><div class='ctx'> 				fraglen, rxb-&gt;truesize);</div><div class='hunk'>@@ -103,7 +103,7 @@ static void iwl_mvm_get_signal_strength(struct iwl_mvm *mvm,</div><div class='ctx'> 					struct iwl_rx_phy_info *phy_info,</div><div class='ctx'> 					struct ieee80211_rx_status *rx_status)</div><div class='ctx'> {</div><div class='del'>-	int energy_a, energy_b, energy_c, max_energy;</div><div class='add'>+	int energy_a, energy_b, max_energy;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	val =</div><div class='hunk'>@@ -114,14 +114,10 @@ static void iwl_mvm_get_signal_strength(struct iwl_mvm *mvm,</div><div class='ctx'> 	energy_b = (val &amp; IWL_RX_INFO_ENERGY_ANT_B_MSK) &gt;&gt;</div><div class='ctx'> 						IWL_RX_INFO_ENERGY_ANT_B_POS;</div><div class='ctx'> 	energy_b = energy_b ? -energy_b : S8_MIN;</div><div class='del'>-	energy_c = (val &amp; IWL_RX_INFO_ENERGY_ANT_C_MSK) &gt;&gt;</div><div class='del'>-						IWL_RX_INFO_ENERGY_ANT_C_POS;</div><div class='del'>-	energy_c = energy_c ? -energy_c : S8_MIN;</div><div class='ctx'> 	max_energy = max(energy_a, energy_b);</div><div class='del'>-	max_energy = max(max_energy, energy_c);</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_STATS(mvm, "energy In A %d B %d C %d , and max %d\n",</div><div class='del'>-			energy_a, energy_b, energy_c, max_energy);</div><div class='add'>+	IWL_DEBUG_STATS(mvm, "energy In A %d B %d  , and max %d\n",</div><div class='add'>+			energy_a, energy_b, max_energy);</div><div class='ctx'> </div><div class='ctx'> 	rx_status-&gt;signal = max_energy;</div><div class='ctx'> 	rx_status-&gt;chains = (le16_to_cpu(phy_info-&gt;phy_flags) &amp;</div><div class='hunk'>@@ -129,7 +125,6 @@ static void iwl_mvm_get_signal_strength(struct iwl_mvm *mvm,</div><div class='ctx'> 					&gt;&gt; RX_RES_PHY_FLAGS_ANTENNA_POS;</div><div class='ctx'> 	rx_status-&gt;chain_signal[0] = energy_a;</div><div class='ctx'> 	rx_status-&gt;chain_signal[1] = energy_b;</div><div class='del'>-	rx_status-&gt;chain_signal[2] = energy_c;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -195,7 +190,7 @@ static u32 iwl_mvm_set_mac80211_rx_flag(struct iwl_mvm *mvm,</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* Expected in monitor (not having the keys) */</div><div class='ctx'> 		if (!mvm-&gt;monitor_on)</div><div class='del'>-			IWL_ERR(mvm, "Unhandled alg: 0x%x\n", rx_pkt_status);</div><div class='add'>+			IWL_WARN(mvm, "Unhandled alg: 0x%x\n", rx_pkt_status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -218,8 +213,12 @@ static void iwl_mvm_rx_handle_tcm(struct iwl_mvm *mvm,</div><div class='ctx'> 	};</div><div class='ctx'> 	u16 thr;</div><div class='ctx'> </div><div class='del'>-	if (ieee80211_is_data_qos(hdr-&gt;frame_control))</div><div class='del'>-		ac = tid_to_mac80211_ac[ieee80211_get_tid(hdr)];</div><div class='add'>+	if (ieee80211_is_data_qos(hdr-&gt;frame_control)) {</div><div class='add'>+		u8 tid = ieee80211_get_tid(hdr);</div><div class='add'>+</div><div class='add'>+		if (tid &lt; IWL_MAX_TID_COUNT)</div><div class='add'>+			ac = tid_to_mac80211_ac[tid];</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> 	mac = mvmsta-&gt;mac_id_n_color &amp; FW_CTXT_ID_MSK;</div><div class='hunk'>@@ -235,34 +234,33 @@ static void iwl_mvm_rx_handle_tcm(struct iwl_mvm *mvm,</div><div class='ctx'> 		mdata-&gt;rx.airtime += le16_to_cpu(phy_info-&gt;frame_time);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(rate_n_flags &amp; (RATE_MCS_HT_MSK | RATE_MCS_VHT_MSK)))</div><div class='add'>+	if (!(rate_n_flags &amp; (RATE_MCS_HT_MSK_V1 | RATE_MCS_VHT_MSK_V1)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	mvmvif = iwl_mvm_vif_from_mac80211(mvmsta-&gt;vif);</div><div class='ctx'> </div><div class='ctx'> 	if (mdata-&gt;opened_rx_ba_sessions ||</div><div class='ctx'> 	    mdata-&gt;uapsd_nonagg_detect.detected ||</div><div class='del'>-	    (!mvmvif-&gt;queue_params[IEEE80211_AC_VO].uapsd &amp;&amp;</div><div class='del'>-	     !mvmvif-&gt;queue_params[IEEE80211_AC_VI].uapsd &amp;&amp;</div><div class='del'>-	     !mvmvif-&gt;queue_params[IEEE80211_AC_BE].uapsd &amp;&amp;</div><div class='del'>-	     !mvmvif-&gt;queue_params[IEEE80211_AC_BK].uapsd) ||</div><div class='del'>-	    mvmsta-&gt;sta_id != mvmvif-&gt;ap_sta_id)</div><div class='add'>+	    (!mvmvif-&gt;deflink.queue_params[IEEE80211_AC_VO].uapsd &amp;&amp;</div><div class='add'>+	     !mvmvif-&gt;deflink.queue_params[IEEE80211_AC_VI].uapsd &amp;&amp;</div><div class='add'>+	     !mvmvif-&gt;deflink.queue_params[IEEE80211_AC_BE].uapsd &amp;&amp;</div><div class='add'>+	     !mvmvif-&gt;deflink.queue_params[IEEE80211_AC_BK].uapsd) ||</div><div class='add'>+	    mvmsta-&gt;deflink.sta_id != mvmvif-&gt;deflink.ap_sta_id)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_HT_MSK) {</div><div class='del'>-		thr = thresh_tpt[rate_n_flags &amp; RATE_HT_MCS_RATE_CODE_MSK];</div><div class='del'>-		thr *= 1 + ((rate_n_flags &amp; RATE_HT_MCS_NSS_MSK) &gt;&gt;</div><div class='del'>-					RATE_HT_MCS_NSS_POS);</div><div class='add'>+	if (rate_n_flags &amp; RATE_MCS_HT_MSK_V1) {</div><div class='add'>+		thr = thresh_tpt[rate_n_flags &amp; RATE_HT_MCS_RATE_CODE_MSK_V1];</div><div class='add'>+		thr *= 1 + ((rate_n_flags &amp; RATE_HT_MCS_NSS_MSK_V1) &gt;&gt;</div><div class='add'>+					RATE_HT_MCS_NSS_POS_V1);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (WARN_ON((rate_n_flags &amp; RATE_VHT_MCS_RATE_CODE_MSK) &gt;=</div><div class='ctx'> 				ARRAY_SIZE(thresh_tpt)))</div><div class='ctx'> 			return;</div><div class='ctx'> 		thr = thresh_tpt[rate_n_flags &amp; RATE_VHT_MCS_RATE_CODE_MSK];</div><div class='del'>-		thr *= 1 + ((rate_n_flags &amp; RATE_VHT_MCS_NSS_MSK) &gt;&gt;</div><div class='del'>-					RATE_VHT_MCS_NSS_POS);</div><div class='add'>+		thr *= 1 + FIELD_GET(RATE_MCS_NSS_MSK, rate_n_flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	thr &lt;&lt;= ((rate_n_flags &amp; RATE_MCS_CHAN_WIDTH_MSK) &gt;&gt;</div><div class='add'>+	thr &lt;&lt;= ((rate_n_flags &amp; RATE_MCS_CHAN_WIDTH_MSK_V1) &gt;&gt;</div><div class='ctx'> 				RATE_MCS_CHAN_WIDTH_POS);</div><div class='ctx'> </div><div class='ctx'> 	mdata-&gt;uapsd_nonagg_detect.rx_bytes += len;</div><div class='hunk'>@@ -332,17 +330,6 @@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 	rx_status = IEEE80211_SKB_RXCB(skb);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * drop the packet if it has failed being decrypted by HW</div><div class='del'>-	 */</div><div class='del'>-	if (iwl_mvm_set_mac80211_rx_flag(mvm, hdr, rx_status, rx_pkt_status,</div><div class='del'>-					 &amp;crypt_len)) {</div><div class='del'>-		IWL_DEBUG_DROP(mvm, "Bad decryption results 0x%08x\n",</div><div class='del'>-			       rx_pkt_status);</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Keep packets with CRC errors (and with overrun) for monitor mode</div><div class='ctx'> 	 * (otherwise the firmware discards them) but mark them as bad.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -393,6 +380,38 @@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> </div><div class='ctx'> 	if (sta) {</div><div class='ctx'> 		struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+		struct ieee80211_vif *vif = mvmsta-&gt;vif;</div><div class='add'>+		struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Don't even try to decrypt a MCAST frame that was received</div><div class='add'>+		 * before the managed vif is authorized, we'd fail anyway.</div><div class='add'>+		 */</div><div class='add'>+		if (is_multicast_ether_addr(hdr-&gt;addr1) &amp;&amp;</div><div class='add'>+		    vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+		    !mvmvif-&gt;authorized &amp;&amp;</div><div class='add'>+		    ieee80211_has_protected(hdr-&gt;frame_control)) {</div><div class='add'>+			IWL_DEBUG_DROP(mvm, "MCAST before the vif is authorized\n");</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * drop the packet if it has failed being decrypted by HW</div><div class='add'>+	 */</div><div class='add'>+	if (iwl_mvm_set_mac80211_rx_flag(mvm, hdr, rx_status, rx_pkt_status,</div><div class='add'>+					 &amp;crypt_len)) {</div><div class='add'>+		IWL_DEBUG_DROP(mvm, "Bad decryption results 0x%08x\n",</div><div class='add'>+			       rx_pkt_status);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sta) {</div><div class='add'>+		struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> 		struct ieee80211_vif *tx_blocked_vif =</div><div class='ctx'> 			rcu_dereference(mvm-&gt;csa_tx_blocked_vif);</div><div class='ctx'> 		struct iwl_fw_dbg_trigger_tlv *trig;</div><div class='hunk'>@@ -455,7 +474,7 @@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set up the HT phy flags */</div><div class='del'>-	switch (rate_n_flags &amp; RATE_MCS_CHAN_WIDTH_MSK) {</div><div class='add'>+	switch (rate_n_flags &amp; RATE_MCS_CHAN_WIDTH_MSK_V1) {</div><div class='ctx'> 	case RATE_MCS_CHAN_WIDTH_20:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case RATE_MCS_CHAN_WIDTH_40:</div><div class='hunk'>@@ -468,25 +487,22 @@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 		rx_status-&gt;bw = RATE_INFO_BW_160;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	if (!(rate_n_flags &amp; RATE_MCS_CCK_MSK) &amp;&amp;</div><div class='del'>-	    rate_n_flags &amp; RATE_MCS_SGI_MSK)</div><div class='add'>+	if (!(rate_n_flags &amp; RATE_MCS_CCK_MSK_V1) &amp;&amp;</div><div class='add'>+	    rate_n_flags &amp; RATE_MCS_SGI_MSK_V1)</div><div class='ctx'> 		rx_status-&gt;enc_flags |= RX_ENC_FLAG_SHORT_GI;</div><div class='del'>-	if (rate_n_flags &amp; RATE_HT_MCS_GF_MSK)</div><div class='del'>-		rx_status-&gt;enc_flags |= RX_ENC_FLAG_HT_GF;</div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_LDPC_MSK)</div><div class='add'>+	if (rate_n_flags &amp; RATE_MCS_LDPC_MSK_V1)</div><div class='ctx'> 		rx_status-&gt;enc_flags |= RX_ENC_FLAG_LDPC;</div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_HT_MSK) {</div><div class='add'>+	if (rate_n_flags &amp; RATE_MCS_HT_MSK_V1) {</div><div class='ctx'> 		u8 stbc = (rate_n_flags &amp; RATE_MCS_STBC_MSK) &gt;&gt;</div><div class='ctx'> 				RATE_MCS_STBC_POS;</div><div class='ctx'> 		rx_status-&gt;encoding = RX_ENC_HT;</div><div class='del'>-		rx_status-&gt;rate_idx = rate_n_flags &amp; RATE_HT_MCS_INDEX_MSK;</div><div class='add'>+		rx_status-&gt;rate_idx = rate_n_flags &amp; RATE_HT_MCS_INDEX_MSK_V1;</div><div class='ctx'> 		rx_status-&gt;enc_flags |= stbc &lt;&lt; RX_ENC_FLAG_STBC_SHIFT;</div><div class='del'>-	} else if (rate_n_flags &amp; RATE_MCS_VHT_MSK) {</div><div class='add'>+	} else if (rate_n_flags &amp; RATE_MCS_VHT_MSK_V1) {</div><div class='ctx'> 		u8 stbc = (rate_n_flags &amp; RATE_MCS_STBC_MSK) &gt;&gt;</div><div class='ctx'> 				RATE_MCS_STBC_POS;</div><div class='ctx'> 		rx_status-&gt;nss =</div><div class='del'>-			((rate_n_flags &amp; RATE_VHT_MCS_NSS_MSK) &gt;&gt;</div><div class='del'>-						RATE_VHT_MCS_NSS_POS) + 1;</div><div class='add'>+			FIELD_GET(RATE_MCS_NSS_MSK, rate_n_flags) + 1;</div><div class='ctx'> 		rx_status-&gt;rate_idx = rate_n_flags &amp; RATE_VHT_MCS_RATE_CODE_MSK;</div><div class='ctx'> 		rx_status-&gt;encoding = RX_ENC_VHT;</div><div class='ctx'> 		rx_status-&gt;enc_flags |= stbc &lt;&lt; RX_ENC_FLAG_STBC_SHIFT;</div><div class='hunk'>@@ -503,6 +519,8 @@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		rx_status-&gt;rate_idx = rate;</div><div class='add'>+		/* override BW - it could be DUP and indicate the wrong BW */</div><div class='add'>+		rx_status-&gt;bw = RATE_INFO_BW_20;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='hunk'>@@ -532,63 +550,44 @@ struct iwl_mvm_stat_data {</div><div class='ctx'> 	u8 *beacon_average_energy;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_stat_iterator(void *_data, u8 *mac,</div><div class='del'>-				  struct ieee80211_vif *vif)</div><div class='add'>+struct iwl_mvm_stat_data_all_macs {</div><div class='add'>+	struct iwl_mvm *mvm;</div><div class='add'>+	__le32 flags;</div><div class='add'>+	struct iwl_stats_ntfy_per_mac *per_mac;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_update_link_sig(struct ieee80211_vif *vif, int sig,</div><div class='add'>+				    struct iwl_mvm_vif_link_info *link_info,</div><div class='add'>+				    struct ieee80211_bss_conf *bss_conf)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm_stat_data *data = _data;</div><div class='del'>-	struct iwl_mvm *mvm = data-&gt;mvm;</div><div class='del'>-	int sig = -data-&gt;beacon_filter_average_energy;</div><div class='del'>-	int last_event;</div><div class='del'>-	int thold = vif-&gt;bss_conf.cqm_rssi_thold;</div><div class='del'>-	int hyst = vif-&gt;bss_conf.cqm_rssi_hyst;</div><div class='del'>-	u16 id = le32_to_cpu(data-&gt;mac_id);</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-	u16 vif_id = mvmvif-&gt;id;</div><div class='del'>-</div><div class='del'>-	/* This doesn't need the MAC ID check since it's not taking the</div><div class='del'>-	 * data copied into the "data" struct, but rather the data from</div><div class='del'>-	 * the notification directly.</div><div class='del'>-	 */</div><div class='del'>-	mvmvif-&gt;beacon_stats.num_beacons =</div><div class='del'>-		le32_to_cpu(data-&gt;beacon_counter[vif_id]);</div><div class='del'>-	mvmvif-&gt;beacon_stats.avg_signal =</div><div class='del'>-		-data-&gt;beacon_average_energy[vif_id];</div><div class='del'>-</div><div class='del'>-	/* make sure that beacon statistics don't go backwards with TCM</div><div class='del'>-	 * request to clear statistics</div><div class='del'>-	 */</div><div class='del'>-	if (le32_to_cpu(data-&gt;flags) &amp; IWL_STATISTICS_REPLY_FLG_CLEAR)</div><div class='del'>-		mvmvif-&gt;beacon_stats.accu_num_beacons +=</div><div class='del'>-			mvmvif-&gt;beacon_stats.num_beacons;</div><div class='del'>-</div><div class='del'>-	if (mvmvif-&gt;id != id)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='del'>-		return;</div><div class='add'>+	struct iwl_mvm *mvm = mvmvif-&gt;mvm;</div><div class='add'>+	int thold = bss_conf-&gt;cqm_rssi_thold;</div><div class='add'>+	int hyst = bss_conf-&gt;cqm_rssi_hyst;</div><div class='add'>+	int last_event;</div><div class='ctx'> </div><div class='ctx'> 	if (sig == 0) {</div><div class='ctx'> 		IWL_DEBUG_RX(mvm, "RSSI is 0 - skip signal based decision\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mvmvif-&gt;bf_data.ave_beacon_signal = sig;</div><div class='add'>+	link_info-&gt;bf_data.ave_beacon_signal = sig;</div><div class='ctx'> </div><div class='ctx'> 	/* BT Coex */</div><div class='del'>-	if (mvmvif-&gt;bf_data.bt_coex_min_thold !=</div><div class='del'>-	    mvmvif-&gt;bf_data.bt_coex_max_thold) {</div><div class='del'>-		last_event = mvmvif-&gt;bf_data.last_bt_coex_event;</div><div class='del'>-		if (sig &gt; mvmvif-&gt;bf_data.bt_coex_max_thold &amp;&amp;</div><div class='del'>-		    (last_event &lt;= mvmvif-&gt;bf_data.bt_coex_min_thold ||</div><div class='add'>+	if (link_info-&gt;bf_data.bt_coex_min_thold !=</div><div class='add'>+	    link_info-&gt;bf_data.bt_coex_max_thold) {</div><div class='add'>+		last_event = link_info-&gt;bf_data.last_bt_coex_event;</div><div class='add'>+		if (sig &gt; link_info-&gt;bf_data.bt_coex_max_thold &amp;&amp;</div><div class='add'>+		    (last_event &lt;= link_info-&gt;bf_data.bt_coex_min_thold ||</div><div class='ctx'> 		     last_event == 0)) {</div><div class='del'>-			mvmvif-&gt;bf_data.last_bt_coex_event = sig;</div><div class='add'>+			link_info-&gt;bf_data.last_bt_coex_event = sig;</div><div class='ctx'> 			IWL_DEBUG_RX(mvm, "cqm_iterator bt coex high %d\n",</div><div class='ctx'> 				     sig);</div><div class='ctx'> 			iwl_mvm_bt_rssi_event(mvm, vif, RSSI_EVENT_HIGH);</div><div class='del'>-		} else if (sig &lt; mvmvif-&gt;bf_data.bt_coex_min_thold &amp;&amp;</div><div class='del'>-			   (last_event &gt;= mvmvif-&gt;bf_data.bt_coex_max_thold ||</div><div class='add'>+		} else if (sig &lt; link_info-&gt;bf_data.bt_coex_min_thold &amp;&amp;</div><div class='add'>+			   (last_event &gt;= link_info-&gt;bf_data.bt_coex_max_thold ||</div><div class='ctx'> 			    last_event == 0)) {</div><div class='del'>-			mvmvif-&gt;bf_data.last_bt_coex_event = sig;</div><div class='add'>+			link_info-&gt;bf_data.last_bt_coex_event = sig;</div><div class='ctx'> 			IWL_DEBUG_RX(mvm, "cqm_iterator bt coex low %d\n",</div><div class='ctx'> 				     sig);</div><div class='ctx'> 			iwl_mvm_bt_rssi_event(mvm, vif, RSSI_EVENT_LOW);</div><div class='hunk'>@@ -599,10 +598,10 @@ static void iwl_mvm_stat_iterator(void *_data, u8 *mac,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* CQM Notification */</div><div class='del'>-	last_event = mvmvif-&gt;bf_data.last_cqm_event;</div><div class='add'>+	last_event = link_info-&gt;bf_data.last_cqm_event;</div><div class='ctx'> 	if (thold &amp;&amp; sig &lt; thold &amp;&amp; (last_event == 0 ||</div><div class='ctx'> 				     sig &lt; last_event - hyst)) {</div><div class='del'>-		mvmvif-&gt;bf_data.last_cqm_event = sig;</div><div class='add'>+		link_info-&gt;bf_data.last_cqm_event = sig;</div><div class='ctx'> 		IWL_DEBUG_RX(mvm, "cqm_iterator cqm low %d\n",</div><div class='ctx'> 			     sig);</div><div class='ctx'> 		ieee80211_cqm_rssi_notify(</div><div class='hunk'>@@ -612,7 +611,7 @@ static void iwl_mvm_stat_iterator(void *_data, u8 *mac,</div><div class='ctx'> 			GFP_KERNEL);</div><div class='ctx'> 	} else if (sig &gt; thold &amp;&amp;</div><div class='ctx'> 		   (last_event == 0 || sig &gt; last_event + hyst)) {</div><div class='del'>-		mvmvif-&gt;bf_data.last_cqm_event = sig;</div><div class='add'>+		link_info-&gt;bf_data.last_cqm_event = sig;</div><div class='ctx'> 		IWL_DEBUG_RX(mvm, "cqm_iterator cqm high %d\n",</div><div class='ctx'> 			     sig);</div><div class='ctx'> 		ieee80211_cqm_rssi_notify(</div><div class='hunk'>@@ -623,6 +622,76 @@ static void iwl_mvm_stat_iterator(void *_data, u8 *mac,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void iwl_mvm_stat_iterator(void *_data, u8 *mac,</div><div class='add'>+				  struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_stat_data *data = _data;</div><div class='add'>+	int sig = -data-&gt;beacon_filter_average_energy;</div><div class='add'>+	u16 id = le32_to_cpu(data-&gt;mac_id);</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	u16 vif_id = mvmvif-&gt;id;</div><div class='add'>+</div><div class='add'>+	/* This doesn't need the MAC ID check since it's not taking the</div><div class='add'>+	 * data copied into the "data" struct, but rather the data from</div><div class='add'>+	 * the notification directly.</div><div class='add'>+	 */</div><div class='add'>+	mvmvif-&gt;deflink.beacon_stats.num_beacons =</div><div class='add'>+		le32_to_cpu(data-&gt;beacon_counter[vif_id]);</div><div class='add'>+	mvmvif-&gt;deflink.beacon_stats.avg_signal =</div><div class='add'>+		-data-&gt;beacon_average_energy[vif_id];</div><div class='add'>+</div><div class='add'>+	if (mvmvif-&gt;id != id)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* make sure that beacon statistics don't go backwards with TCM</div><div class='add'>+	 * request to clear statistics</div><div class='add'>+	 */</div><div class='add'>+	if (le32_to_cpu(data-&gt;flags) &amp; IWL_STATISTICS_REPLY_FLG_CLEAR)</div><div class='add'>+		mvmvif-&gt;deflink.beacon_stats.accu_num_beacons +=</div><div class='add'>+			mvmvif-&gt;deflink.beacon_stats.num_beacons;</div><div class='add'>+</div><div class='add'>+	/* This is used in pre-MLO API so use deflink */</div><div class='add'>+	iwl_mvm_update_link_sig(vif, sig, &amp;mvmvif-&gt;deflink, &amp;vif-&gt;bss_conf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_stat_iterator_all_macs(void *_data, u8 *mac,</div><div class='add'>+					   struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_stat_data_all_macs *data = _data;</div><div class='add'>+	struct iwl_stats_ntfy_per_mac *mac_stats;</div><div class='add'>+	int sig;</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	u16 vif_id = mvmvif-&gt;id;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(vif_id &gt;= MAC_INDEX_AUX, "invalid vif id: %d", vif_id))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mac_stats = &amp;data-&gt;per_mac[vif_id];</div><div class='add'>+</div><div class='add'>+	mvmvif-&gt;deflink.beacon_stats.num_beacons =</div><div class='add'>+		le32_to_cpu(mac_stats-&gt;beacon_counter);</div><div class='add'>+	mvmvif-&gt;deflink.beacon_stats.avg_signal =</div><div class='add'>+		-le32_to_cpu(mac_stats-&gt;beacon_average_energy);</div><div class='add'>+</div><div class='add'>+	/* make sure that beacon statistics don't go backwards with TCM</div><div class='add'>+	 * request to clear statistics</div><div class='add'>+	 */</div><div class='add'>+	if (le32_to_cpu(data-&gt;flags) &amp; IWL_STATISTICS_REPLY_FLG_CLEAR)</div><div class='add'>+		mvmvif-&gt;deflink.beacon_stats.accu_num_beacons +=</div><div class='add'>+			mvmvif-&gt;deflink.beacon_stats.num_beacons;</div><div class='add'>+</div><div class='add'>+	sig = -le32_to_cpu(mac_stats-&gt;beacon_filter_average_energy);</div><div class='add'>+</div><div class='add'>+	/* This is used in pre-MLO API so use deflink */</div><div class='add'>+	iwl_mvm_update_link_sig(vif, sig, &amp;mvmvif-&gt;deflink, &amp;vif-&gt;bss_conf);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void</div><div class='ctx'> iwl_mvm_rx_stats_check_trigger(struct iwl_mvm *mvm, struct iwl_rx_packet *pkt)</div><div class='ctx'> {</div><div class='hunk'>@@ -653,14 +722,14 @@ static void iwl_mvm_stats_energy_iter(void *_data,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> 	u8 *energy = _data;</div><div class='del'>-	u32 sta_id = mvmsta-&gt;sta_id;</div><div class='add'>+	u32 sta_id = mvmsta-&gt;deflink.sta_id;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ONCE(sta_id &gt;= IWL_MVM_STATION_COUNT_MAX, "sta_id %d &gt;= %d",</div><div class='del'>-		      sta_id, IWL_MVM_STATION_COUNT_MAX))</div><div class='add'>+	if (WARN_ONCE(sta_id &gt;= IWL_STATION_COUNT_MAX, "sta_id %d &gt;= %d",</div><div class='add'>+		      sta_id, IWL_STATION_COUNT_MAX))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (energy[sta_id])</div><div class='del'>-		mvmsta-&gt;avg_energy = energy[sta_id];</div><div class='add'>+		mvmsta-&gt;deflink.avg_energy = energy[sta_id];</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -688,48 +757,58 @@ iwl_mvm_update_tcm_from_stats(struct iwl_mvm *mvm, __le32 *air_time_le,</div><div class='ctx'> 	spin_unlock(&amp;mvm-&gt;tcm.lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void iwl_mvm_handle_per_phy_stats(struct iwl_mvm *mvm,</div><div class='add'>+					 struct iwl_stats_ntfy_per_phy *per_phy)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_PHY_CTX; i++) {</div><div class='add'>+		if (!mvm-&gt;phy_ctxts[i].ref)</div><div class='add'>+			continue;</div><div class='add'>+		mvm-&gt;phy_ctxts[i].channel_load_by_us =</div><div class='add'>+			le32_to_cpu(per_phy[i].channel_load_by_us);</div><div class='add'>+		mvm-&gt;phy_ctxts[i].channel_load_not_by_us =</div><div class='add'>+			le32_to_cpu(per_phy[i].channel_load_not_by_us);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='del'>-iwl_mvm_handle_rx_statistics_tlv(struct iwl_mvm *mvm,</div><div class='del'>-				 struct iwl_rx_packet *pkt)</div><div class='add'>+iwl_mvm_stats_ver_15(struct iwl_mvm *mvm,</div><div class='add'>+		     struct iwl_statistics_operational_ntfy *stats)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_stat_data_all_macs data = {</div><div class='add'>+		.mvm = mvm,</div><div class='add'>+		.flags = stats-&gt;flags,</div><div class='add'>+		.per_mac = stats-&gt;per_mac,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces(mvm-&gt;hw,</div><div class='add'>+					    IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+					    iwl_mvm_stat_iterator_all_macs,</div><div class='add'>+					    &amp;data);</div><div class='add'>+	iwl_mvm_handle_per_phy_stats(mvm, stats-&gt;per_phy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mvm_stats_ver_14(struct iwl_mvm *mvm,</div><div class='add'>+		     struct iwl_statistics_operational_ntfy_ver_14 *stats)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_stat_data data = {</div><div class='ctx'> 		.mvm = mvm,</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='ctx'> 	u8 beacon_average_energy[MAC_INDEX_AUX];</div><div class='del'>-	u8 average_energy[IWL_MVM_STATION_COUNT_MAX];</div><div class='del'>-	struct iwl_statistics_operational_ntfy *stats;</div><div class='del'>-	int expected_size;</div><div class='ctx'> 	__le32 flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	expected_size = sizeof(*stats);</div><div class='del'>-	if (WARN_ONCE(iwl_rx_packet_payload_len(pkt) &lt; expected_size,</div><div class='del'>-		      "received invalid statistics size (%d)!, expected_size: %d\n",</div><div class='del'>-		      iwl_rx_packet_payload_len(pkt), expected_size))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	stats = (void *)&amp;pkt-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (WARN_ONCE(stats-&gt;hdr.type != FW_STATISTICS_OPERATIONAL ||</div><div class='del'>-		      stats-&gt;hdr.version !=</div><div class='del'>-		      iwl_fw_lookup_notif_ver(mvm-&gt;fw, LONG_GROUP, STATISTICS_CMD, 0),</div><div class='del'>-		      "received unsupported hdr type %d, version %d\n",</div><div class='del'>-		      stats-&gt;hdr.type, stats-&gt;hdr.version))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	flags = stats-&gt;flags;</div><div class='del'>-	mvm-&gt;radio_stats.rx_time = le64_to_cpu(stats-&gt;rx_time);</div><div class='del'>-	mvm-&gt;radio_stats.tx_time = le64_to_cpu(stats-&gt;tx_time);</div><div class='del'>-	mvm-&gt;radio_stats.on_time_rf = le64_to_cpu(stats-&gt;on_time_rf);</div><div class='del'>-	mvm-&gt;radio_stats.on_time_scan = le64_to_cpu(stats-&gt;on_time_scan);</div><div class='del'>-</div><div class='del'>-	iwl_mvm_rx_stats_check_trigger(mvm, pkt);</div><div class='ctx'> </div><div class='ctx'> 	data.mac_id = stats-&gt;mac_id;</div><div class='ctx'> 	data.beacon_filter_average_energy =</div><div class='ctx'> 		le32_to_cpu(stats-&gt;beacon_filter_average_energy);</div><div class='ctx'> 	data.flags = flags;</div><div class='ctx'> 	data.beacon_counter = stats-&gt;beacon_counter;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(beacon_average_energy); i++)</div><div class='ctx'> 		beacon_average_energy[i] =</div><div class='ctx'> 			le32_to_cpu(stats-&gt;beacon_average_energy[i]);</div><div class='hunk'>@@ -740,9 +819,244 @@ iwl_mvm_handle_rx_statistics_tlv(struct iwl_mvm *mvm,</div><div class='ctx'> 					    IEEE80211_IFACE_ITER_NORMAL,</div><div class='ctx'> 					    iwl_mvm_stat_iterator,</div><div class='ctx'> 					    &amp;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mvm_verify_stats_len(struct iwl_mvm *mvm,</div><div class='add'>+				     struct iwl_rx_packet *pkt,</div><div class='add'>+				     u32 expected_size)</div><div class='add'>+{</div><div class='add'>+	struct iwl_statistics_ntfy_hdr *hdr;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(iwl_rx_packet_payload_len(pkt) &lt; expected_size,</div><div class='add'>+		      "received invalid statistics size (%d)!, expected_size: %d\n",</div><div class='add'>+		      iwl_rx_packet_payload_len(pkt), expected_size))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	hdr = (void *)&amp;pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE((hdr-&gt;type &amp; IWL_STATISTICS_TYPE_MSK) != FW_STATISTICS_OPERATIONAL ||</div><div class='add'>+		      hdr-&gt;version !=</div><div class='add'>+		      iwl_fw_lookup_notif_ver(mvm-&gt;fw, LEGACY_GROUP, STATISTICS_NOTIFICATION, 0),</div><div class='add'>+		      "received unsupported hdr type %d, version %d\n",</div><div class='add'>+		      hdr-&gt;type, hdr-&gt;version))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(le16_to_cpu(hdr-&gt;size) != expected_size,</div><div class='add'>+		      "received invalid statistics size in header (%d)!, expected_size: %d\n",</div><div class='add'>+		      le16_to_cpu(hdr-&gt;size), expected_size))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mvm_stat_iterator_all_links(struct iwl_mvm *mvm,</div><div class='add'>+				struct iwl_stats_ntfy_per_link *per_link)</div><div class='add'>+{</div><div class='add'>+	u32 air_time[MAC_INDEX_AUX] = {};</div><div class='add'>+	u32 rx_bytes[MAC_INDEX_AUX] = {};</div><div class='add'>+	int fw_link_id;</div><div class='add'>+</div><div class='add'>+	/* driver uses link ID == MAC ID */</div><div class='add'>+	for (fw_link_id = 0; fw_link_id &lt; ARRAY_SIZE(mvm-&gt;vif_id_to_mac);</div><div class='add'>+	     fw_link_id++) {</div><div class='add'>+		struct iwl_stats_ntfy_per_link *link_stats;</div><div class='add'>+		struct iwl_mvm_vif_link_info *link_info;</div><div class='add'>+		struct iwl_mvm_vif *mvmvif;</div><div class='add'>+		struct ieee80211_vif *vif;</div><div class='add'>+		int link_id;</div><div class='add'>+		int sig;</div><div class='add'>+</div><div class='add'>+		vif = iwl_mvm_rcu_dereference_vif_id(mvm, fw_link_id, false);</div><div class='add'>+		if (!vif)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		link_id = vif-&gt;bss_conf.link_id;</div><div class='add'>+		if (link_id &gt;= ARRAY_SIZE(mvmvif-&gt;link))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+		link_info = mvmvif-&gt;link[link_id];</div><div class='add'>+		if (!link_info)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		link_stats = &amp;per_link[fw_link_id];</div><div class='add'>+</div><div class='add'>+		link_info-&gt;beacon_stats.num_beacons =</div><div class='add'>+			le32_to_cpu(link_stats-&gt;beacon_counter);</div><div class='add'>+</div><div class='add'>+		/* we basically just use the u8 to store 8 bits and then treat</div><div class='add'>+		 * it as a s8 whenever we take it out to a different type.</div><div class='add'>+		 */</div><div class='add'>+		link_info-&gt;beacon_stats.avg_signal =</div><div class='add'>+			-le32_to_cpu(link_stats-&gt;beacon_average_energy);</div><div class='add'>+</div><div class='add'>+		/* make sure that beacon statistics don't go backwards with TCM</div><div class='add'>+		 * request to clear statistics</div><div class='add'>+		 */</div><div class='add'>+		if (mvm-&gt;statistics_clear)</div><div class='add'>+			mvmvif-&gt;link[link_id]-&gt;beacon_stats.accu_num_beacons +=</div><div class='add'>+				mvmvif-&gt;link[link_id]-&gt;beacon_stats.num_beacons;</div><div class='add'>+</div><div class='add'>+		sig = -le32_to_cpu(link_stats-&gt;beacon_filter_average_energy);</div><div class='add'>+		iwl_mvm_update_link_sig(vif, sig, link_info, &amp;vif-&gt;bss_conf);</div><div class='add'>+</div><div class='add'>+		if (WARN_ONCE(mvmvif-&gt;id &gt;= MAC_INDEX_AUX,</div><div class='add'>+			      "invalid mvmvif id: %d", mvmvif-&gt;id))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		air_time[mvmvif-&gt;id] +=</div><div class='add'>+			le32_to_cpu(per_link[fw_link_id].air_time);</div><div class='add'>+		rx_bytes[mvmvif-&gt;id] +=</div><div class='add'>+			le32_to_cpu(per_link[fw_link_id].rx_bytes);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Don't update in case the statistics are not cleared, since</div><div class='add'>+	 * we will end up counting twice the same airtime, once in TCM</div><div class='add'>+	 * request and once in statistics notification.</div><div class='add'>+	 */</div><div class='add'>+	if (mvm-&gt;statistics_clear) {</div><div class='add'>+		__le32 air_time_le[MAC_INDEX_AUX];</div><div class='add'>+		__le32 rx_bytes_le[MAC_INDEX_AUX];</div><div class='add'>+		int vif_id;</div><div class='add'>+</div><div class='add'>+		for (vif_id = 0; vif_id &lt; ARRAY_SIZE(air_time_le); vif_id++) {</div><div class='add'>+			air_time_le[vif_id] = cpu_to_le32(air_time[vif_id]);</div><div class='add'>+			rx_bytes_le[vif_id] = cpu_to_le32(rx_bytes[vif_id]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		iwl_mvm_update_tcm_from_stats(mvm, air_time_le, rx_bytes_le);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_handle_rx_system_oper_stats(struct iwl_mvm *mvm,</div><div class='add'>+					 struct iwl_rx_cmd_buffer *rxb)</div><div class='add'>+{</div><div class='add'>+	u8 average_energy[IWL_STATION_COUNT_MAX];</div><div class='add'>+	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='add'>+	struct iwl_system_statistics_notif_oper *stats;</div><div class='add'>+	int i;</div><div class='add'>+	u32 notif_ver = iwl_fw_lookup_notif_ver(mvm-&gt;fw, STATISTICS_GROUP,</div><div class='add'>+						STATISTICS_OPER_NOTIF, 0);</div><div class='add'>+</div><div class='add'>+	if (notif_ver != 3) {</div><div class='add'>+		IWL_FW_CHECK_FAILED(mvm,</div><div class='add'>+				    "Oper stats notif ver %d is not supported\n",</div><div class='add'>+				    notif_ver);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats = (void *)&amp;pkt-&gt;data;</div><div class='add'>+	iwl_mvm_stat_iterator_all_links(mvm, stats-&gt;per_link);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(average_energy); i++)</div><div class='del'>-		average_energy[i] = le32_to_cpu(stats-&gt;average_energy[i]);</div><div class='add'>+		average_energy[i] =</div><div class='add'>+			le32_to_cpu(stats-&gt;per_sta[i].average_energy);</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_stations_atomic(mvm-&gt;hw, iwl_mvm_stats_energy_iter,</div><div class='add'>+					  average_energy);</div><div class='add'>+	iwl_mvm_handle_per_phy_stats(mvm, stats-&gt;per_phy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_handle_rx_system_oper_part1_stats(struct iwl_mvm *mvm,</div><div class='add'>+					       struct iwl_rx_cmd_buffer *rxb)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='add'>+	struct iwl_system_statistics_part1_notif_oper *part1_stats;</div><div class='add'>+	int i;</div><div class='add'>+	u32 notif_ver = iwl_fw_lookup_notif_ver(mvm-&gt;fw, STATISTICS_GROUP,</div><div class='add'>+						STATISTICS_OPER_PART1_NOTIF, 0);</div><div class='add'>+</div><div class='add'>+	if (notif_ver != 4) {</div><div class='add'>+		IWL_FW_CHECK_FAILED(mvm,</div><div class='add'>+				    "Part1 stats notif ver %d is not supported\n",</div><div class='add'>+				    notif_ver);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	part1_stats = (void *)&amp;pkt-&gt;data;</div><div class='add'>+	mvm-&gt;radio_stats.rx_time = 0;</div><div class='add'>+	mvm-&gt;radio_stats.tx_time = 0;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(part1_stats-&gt;per_link); i++) {</div><div class='add'>+		mvm-&gt;radio_stats.rx_time +=</div><div class='add'>+			le64_to_cpu(part1_stats-&gt;per_link[i].rx_time);</div><div class='add'>+		mvm-&gt;radio_stats.tx_time +=</div><div class='add'>+			le64_to_cpu(part1_stats-&gt;per_link[i].tx_time);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_mvm_handle_rx_statistics_tlv(struct iwl_mvm *mvm,</div><div class='add'>+				 struct iwl_rx_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	u8 average_energy[IWL_STATION_COUNT_MAX];</div><div class='add'>+	__le32 air_time[MAC_INDEX_AUX];</div><div class='add'>+	__le32 rx_bytes[MAC_INDEX_AUX];</div><div class='add'>+	__le32 flags = 0;</div><div class='add'>+	int i;</div><div class='add'>+	u32 notif_ver = iwl_fw_lookup_notif_ver(mvm-&gt;fw, LEGACY_GROUP,</div><div class='add'>+					      STATISTICS_NOTIFICATION, 0);</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(notif_ver &gt; 15,</div><div class='add'>+		      "invalid statistics version id: %d\n", notif_ver))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (notif_ver == 14) {</div><div class='add'>+		struct iwl_statistics_operational_ntfy_ver_14 *stats =</div><div class='add'>+			(void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (!iwl_mvm_verify_stats_len(mvm, pkt, sizeof(*stats)))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		iwl_mvm_stats_ver_14(mvm, stats);</div><div class='add'>+</div><div class='add'>+		flags = stats-&gt;flags;</div><div class='add'>+		mvm-&gt;radio_stats.rx_time = le64_to_cpu(stats-&gt;rx_time);</div><div class='add'>+		mvm-&gt;radio_stats.tx_time = le64_to_cpu(stats-&gt;tx_time);</div><div class='add'>+		mvm-&gt;radio_stats.on_time_rf = le64_to_cpu(stats-&gt;on_time_rf);</div><div class='add'>+		mvm-&gt;radio_stats.on_time_scan =</div><div class='add'>+			le64_to_cpu(stats-&gt;on_time_scan);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(average_energy); i++)</div><div class='add'>+			average_energy[i] = le32_to_cpu(stats-&gt;average_energy[i]);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(air_time); i++) {</div><div class='add'>+			air_time[i] = stats-&gt;air_time[i];</div><div class='add'>+			rx_bytes[i] = stats-&gt;rx_bytes[i];</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (notif_ver == 15) {</div><div class='add'>+		struct iwl_statistics_operational_ntfy *stats =</div><div class='add'>+			(void *)pkt-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (!iwl_mvm_verify_stats_len(mvm, pkt, sizeof(*stats)))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		iwl_mvm_stats_ver_15(mvm, stats);</div><div class='add'>+</div><div class='add'>+		flags = stats-&gt;flags;</div><div class='add'>+		mvm-&gt;radio_stats.rx_time = le64_to_cpu(stats-&gt;rx_time);</div><div class='add'>+		mvm-&gt;radio_stats.tx_time = le64_to_cpu(stats-&gt;tx_time);</div><div class='add'>+		mvm-&gt;radio_stats.on_time_rf = le64_to_cpu(stats-&gt;on_time_rf);</div><div class='add'>+		mvm-&gt;radio_stats.on_time_scan =</div><div class='add'>+			le64_to_cpu(stats-&gt;on_time_scan);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(average_energy); i++)</div><div class='add'>+			average_energy[i] =</div><div class='add'>+				le32_to_cpu(stats-&gt;per_sta[i].average_energy);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(air_time); i++) {</div><div class='add'>+			air_time[i] = stats-&gt;per_mac[i].air_time;</div><div class='add'>+			rx_bytes[i] = stats-&gt;per_mac[i].rx_bytes;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_mvm_rx_stats_check_trigger(mvm, pkt);</div><div class='add'>+</div><div class='ctx'> 	ieee80211_iterate_stations_atomic(mvm-&gt;hw, iwl_mvm_stats_energy_iter,</div><div class='ctx'> 					  average_energy);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -751,8 +1065,7 @@ iwl_mvm_handle_rx_statistics_tlv(struct iwl_mvm *mvm,</div><div class='ctx'> 	 * request and once in statistics notification.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (le32_to_cpu(flags) &amp; IWL_STATISTICS_REPLY_FLG_CLEAR)</div><div class='del'>-		iwl_mvm_update_tcm_from_stats(mvm, stats-&gt;air_time,</div><div class='del'>-					      stats-&gt;rx_bytes);</div><div class='add'>+		iwl_mvm_update_tcm_from_stats(mvm, air_time, rx_bytes);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_handle_rx_statistics(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -764,10 +1077,17 @@ void iwl_mvm_handle_rx_statistics(struct iwl_mvm *mvm,</div><div class='ctx'> 	__le32 *bytes, *air_time, flags;</div><div class='ctx'> 	int expected_size;</div><div class='ctx'> 	u8 *energy;</div><div class='add'>+	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw,</div><div class='add'>+					   WIDE_ID(SYSTEM_GROUP,</div><div class='add'>+						   SYSTEM_STATISTICS_CMD),</div><div class='add'>+					   IWL_FW_CMD_VER_UNKNOWN);</div><div class='add'>+</div><div class='add'>+	if (cmd_ver != IWL_FW_CMD_VER_UNKNOWN)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* From ver 14 and up we use TLV statistics format */</div><div class='del'>-	if (iwl_fw_lookup_notif_ver(mvm-&gt;fw, LONG_GROUP,</div><div class='del'>-				    STATISTICS_CMD, 0) &gt;= 14)</div><div class='add'>+	if (iwl_fw_lookup_notif_ver(mvm-&gt;fw, LEGACY_GROUP,</div><div class='add'>+				    STATISTICS_NOTIFICATION, 0) &gt;= 14)</div><div class='ctx'> 		return iwl_mvm_handle_rx_statistics_tlv(mvm, pkt);</div><div class='ctx'> </div><div class='ctx'> 	if (!iwl_mvm_has_new_rx_stats_api(mvm)) {</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c<br/>index 8e26422ca326..d35c63a673b6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -9,38 +9,13 @@</div><div class='ctx'> #include "iwl-trans.h"</div><div class='ctx'> #include "mvm.h"</div><div class='ctx'> #include "fw-api.h"</div><div class='del'>-</div><div class='del'>-static void *iwl_mvm_skb_get_hdr(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);</div><div class='del'>-	u8 *data = skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	/* Alignment concerns */</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct ieee80211_radiotap_he) % 4);</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct ieee80211_radiotap_he_mu) % 4);</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct ieee80211_radiotap_lsig) % 4);</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct ieee80211_vendor_radiotap) % 4);</div><div class='del'>-</div><div class='del'>-	if (rx_status-&gt;flag &amp; RX_FLAG_RADIOTAP_HE)</div><div class='del'>-		data += sizeof(struct ieee80211_radiotap_he);</div><div class='del'>-	if (rx_status-&gt;flag &amp; RX_FLAG_RADIOTAP_HE_MU)</div><div class='del'>-		data += sizeof(struct ieee80211_radiotap_he_mu);</div><div class='del'>-	if (rx_status-&gt;flag &amp; RX_FLAG_RADIOTAP_LSIG)</div><div class='del'>-		data += sizeof(struct ieee80211_radiotap_lsig);</div><div class='del'>-	if (rx_status-&gt;flag &amp; RX_FLAG_RADIOTAP_VENDOR_DATA) {</div><div class='del'>-		struct ieee80211_vendor_radiotap *radiotap = (void *)data;</div><div class='del'>-</div><div class='del'>-		data += sizeof(*radiotap) + radiotap-&gt;len + radiotap-&gt;pad;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return data;</div><div class='del'>-}</div><div class='add'>+#include "time-sync.h"</div><div class='ctx'> </div><div class='ctx'> static inline int iwl_mvm_check_pn(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 				   int queue, struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta;</div><div class='del'>-	struct ieee80211_hdr *hdr = iwl_mvm_skb_get_hdr(skb);</div><div class='add'>+	struct ieee80211_hdr *hdr = (void *)skb_mac_header(skb);</div><div class='ctx'> 	struct ieee80211_rx_status *stats = IEEE80211_SKB_RXCB(skb);</div><div class='ctx'> 	struct iwl_mvm_key_pn *ptk_pn;</div><div class='ctx'> 	int res;</div><div class='hunk'>@@ -69,8 +44,8 @@ static inline int iwl_mvm_check_pn(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	/* if we are here - this for sure is either CCMP or GCMP */</div><div class='ctx'> 	if (IS_ERR_OR_NULL(sta)) {</div><div class='del'>-		IWL_ERR(mvm,</div><div class='del'>-			"expected hw-decrypted unicast frame for station\n");</div><div class='add'>+		IWL_DEBUG_DROP(mvm,</div><div class='add'>+			       "expected hw-decrypted unicast frame for station\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -121,12 +96,23 @@ static int iwl_mvm_create_skb(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 	struct iwl_rx_mpdu_desc *desc = (void *)pkt-&gt;data;</div><div class='ctx'> 	unsigned int headlen, fraglen, pad_len = 0;</div><div class='ctx'> 	unsigned int hdrlen = ieee80211_hdrlen(hdr-&gt;frame_control);</div><div class='add'>+	u8 mic_crc_len = u8_get_bits(desc-&gt;mac_flags1,</div><div class='add'>+				     IWL_RX_MPDU_MFLG1_MIC_CRC_LEN_MASK) &lt;&lt; 1;</div><div class='ctx'> </div><div class='ctx'> 	if (desc-&gt;mac_flags2 &amp; IWL_RX_MPDU_MFLG2_PAD) {</div><div class='ctx'> 		len -= 2;</div><div class='ctx'> 		pad_len = 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * For non monitor interface strip the bytes the RADA might not have</div><div class='add'>+	 * removed (it might be disabled, e.g. for mgmt frames). As a monitor</div><div class='add'>+	 * interface cannot exist with other interfaces, this removal is safe</div><div class='add'>+	 * and sufficient, in monitor mode there's no decryption being done.</div><div class='add'>+	 */</div><div class='add'>+	if (len &gt; mic_crc_len &amp;&amp; !ieee80211_hw_check(mvm-&gt;hw, RX_INCLUDES_FCS))</div><div class='add'>+		len -= mic_crc_len;</div><div class='add'>+</div><div class='ctx'> 	/* If frame is small enough to fit in skb-&gt;head, pull it completely.</div><div class='ctx'> 	 * If not, only pull ieee80211_hdr (including crypto if present, and</div><div class='ctx'> 	 * an additional 8 bytes for SNAP/ethertype, see below) so that</div><div class='hunk'>@@ -149,19 +135,13 @@ static int iwl_mvm_create_skb(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 	 */</div><div class='ctx'> 	hdrlen += crypt_len;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ONCE(headlen &lt; hdrlen,</div><div class='del'>-		      "invalid packet lengths (hdrlen=%d, len=%d, crypt_len=%d)\n",</div><div class='del'>-		      hdrlen, len, crypt_len)) {</div><div class='del'>-		/*</div><div class='del'>-		 * We warn and trace because we want to be able to see</div><div class='del'>-		 * it in trace-cmd as well.</div><div class='del'>-		 */</div><div class='del'>-		IWL_DEBUG_RX(mvm,</div><div class='del'>-			     "invalid packet lengths (hdrlen=%d, len=%d, crypt_len=%d)\n",</div><div class='del'>-			     hdrlen, len, crypt_len);</div><div class='add'>+	if (unlikely(headlen &lt; hdrlen))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+	/* Since data doesn't move data while putting data on skb and that is</div><div class='add'>+	 * the only way we use, data + len is the next place that hdr would be put</div><div class='add'>+	 */</div><div class='add'>+	skb_set_mac_header(skb, skb-&gt;len);</div><div class='ctx'> 	skb_put_data(skb, hdr, hdrlen);</div><div class='ctx'> 	skb_put_data(skb, (u8 *)hdr + hdrlen + pad_len, headlen - hdrlen);</div><div class='ctx'> </div><div class='hunk'>@@ -172,6 +152,9 @@ static int iwl_mvm_create_skb(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 	 * in the cases the hardware didn't handle, since it's rare to see</div><div class='ctx'> 	 * such packets, even though the hardware did calculate the checksum</div><div class='ctx'> 	 * in this case, just starting after the MAC header instead.</div><div class='add'>+	 *</div><div class='add'>+	 * Starting from Bz hardware, it calculates starting directly after</div><div class='add'>+	 * the MAC header, so that matches mac80211's expectation.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (skb-&gt;ip_summed == CHECKSUM_COMPLETE) {</div><div class='ctx'> 		struct {</div><div class='hunk'>@@ -188,13 +171,16 @@ static int iwl_mvm_create_skb(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 			      shdr-&gt;type != htons(ETH_P_PAE) &amp;&amp;</div><div class='ctx'> 			      shdr-&gt;type != htons(ETH_P_TDLS))))</div><div class='ctx'> 			skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+		else if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_BZ)</div><div class='add'>+			/* mac80211 assumes full CSUM including SNAP header */</div><div class='add'>+			skb_postpush_rcsum(skb, shdr, sizeof(*shdr));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fraglen = len - headlen;</div><div class='ctx'> </div><div class='ctx'> 	if (fraglen) {</div><div class='del'>-		int offset = (void *)hdr + headlen + pad_len -</div><div class='del'>-			     rxb_addr(rxb) + rxb_offset(rxb);</div><div class='add'>+		int offset = (u8 *)hdr + headlen + pad_len -</div><div class='add'>+			     (u8 *)rxb_addr(rxb) + rxb_offset(rxb);</div><div class='ctx'> </div><div class='ctx'> 		skb_add_rx_frag(skb, 0, rxb_steal_page(rxb), offset,</div><div class='ctx'> 				fraglen, rxb-&gt;truesize);</div><div class='hunk'>@@ -203,59 +189,119 @@ static int iwl_mvm_create_skb(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* put a TLV on the skb and return data pointer</div><div class='add'>+ *</div><div class='add'>+ * Also pad to 4 the len and zero out all data part</div><div class='add'>+ */</div><div class='add'>+static void *</div><div class='add'>+iwl_mvm_radiotap_put_tlv(struct sk_buff *skb, u16 type, u16 len)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_radiotap_tlv *tlv;</div><div class='add'>+</div><div class='add'>+	tlv = skb_put(skb, sizeof(*tlv));</div><div class='add'>+	tlv-&gt;type = cpu_to_le16(type);</div><div class='add'>+	tlv-&gt;len = cpu_to_le16(len);</div><div class='add'>+	return skb_put_zero(skb, ALIGN(len, 4));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void iwl_mvm_add_rtap_sniffer_config(struct iwl_mvm *mvm,</div><div class='ctx'> 					    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);</div><div class='del'>-	struct ieee80211_vendor_radiotap *radiotap;</div><div class='del'>-	const int size = sizeof(*radiotap) + sizeof(__le16);</div><div class='add'>+	struct ieee80211_radiotap_vendor_content *radiotap;</div><div class='add'>+	const u16 vendor_data_len = sizeof(mvm-&gt;cur_aid);</div><div class='ctx'> </div><div class='ctx'> 	if (!mvm-&gt;cur_aid)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* ensure alignment */</div><div class='del'>-	BUILD_BUG_ON((size + 2) % 4);</div><div class='add'>+	radiotap = iwl_mvm_radiotap_put_tlv(skb,</div><div class='add'>+					    IEEE80211_RADIOTAP_VENDOR_NAMESPACE,</div><div class='add'>+					    sizeof(*radiotap) + vendor_data_len);</div><div class='ctx'> </div><div class='del'>-	radiotap = skb_put(skb, size + 2);</div><div class='del'>-	radiotap-&gt;align = 1;</div><div class='ctx'> 	/* Intel OUI */</div><div class='ctx'> 	radiotap-&gt;oui[0] = 0xf6;</div><div class='ctx'> 	radiotap-&gt;oui[1] = 0x54;</div><div class='ctx'> 	radiotap-&gt;oui[2] = 0x25;</div><div class='ctx'> 	/* radiotap sniffer config sub-namespace */</div><div class='del'>-	radiotap-&gt;subns = 1;</div><div class='del'>-	radiotap-&gt;present = 0x1;</div><div class='del'>-	radiotap-&gt;len = size - sizeof(*radiotap);</div><div class='del'>-	radiotap-&gt;pad = 2;</div><div class='add'>+	radiotap-&gt;oui_subtype = 1;</div><div class='add'>+	radiotap-&gt;vendor_type = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* fill the data now */</div><div class='ctx'> 	memcpy(radiotap-&gt;data, &amp;mvm-&gt;cur_aid, sizeof(mvm-&gt;cur_aid));</div><div class='del'>-	/* and clear the padding */</div><div class='del'>-	memset(radiotap-&gt;data + sizeof(__le16), 0, radiotap-&gt;pad);</div><div class='ctx'> </div><div class='del'>-	rx_status-&gt;flag |= RX_FLAG_RADIOTAP_VENDOR_DATA;</div><div class='add'>+	rx_status-&gt;flag |= RX_FLAG_RADIOTAP_TLV_AT_END;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* iwl_mvm_pass_packet_to_mac80211 - passes the packet for mac80211 */</div><div class='ctx'> static void iwl_mvm_pass_packet_to_mac80211(struct iwl_mvm *mvm,</div><div class='ctx'> 					    struct napi_struct *napi,</div><div class='ctx'> 					    struct sk_buff *skb, int queue,</div><div class='del'>-					    struct ieee80211_sta *sta,</div><div class='del'>-					    bool csi)</div><div class='add'>+					    struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	if (iwl_mvm_check_pn(mvm, skb, queue, sta))</div><div class='add'>+	if (unlikely(iwl_mvm_check_pn(mvm, skb, queue, sta))) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='del'>-	else</div><div class='del'>-		ieee80211_rx_napi(mvm-&gt;hw, sta, skb, napi);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ieee80211_rx_napi(mvm-&gt;hw, sta, skb, napi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mvm_used_average_energy(struct iwl_mvm *mvm,</div><div class='add'>+					struct iwl_rx_mpdu_desc *desc,</div><div class='add'>+					struct ieee80211_hdr *hdr,</div><div class='add'>+					struct ieee80211_rx_status *rx_status)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvm_vif;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	u32 id;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!hdr || !desc))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (likely(!ieee80211_is_beacon(hdr-&gt;frame_control)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* for the link conf lookup */</div><div class='add'>+	guard(rcu)();</div><div class='add'>+</div><div class='add'>+	/* MAC or link ID depending on FW, but driver has them equal */</div><div class='add'>+	id = u8_get_bits(desc-&gt;mac_phy_band,</div><div class='add'>+			 IWL_RX_MPDU_MAC_PHY_BAND_MAC_MASK);</div><div class='add'>+</div><div class='add'>+	/* &gt;= means AUX MAC/link ID, no energy correction needed then */</div><div class='add'>+	if (id &gt;= ARRAY_SIZE(mvm-&gt;vif_id_to_mac))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	vif = iwl_mvm_rcu_dereference_vif_id(mvm, id, true);</div><div class='add'>+	if (!vif)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	mvm_vif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we know the MAC by MAC or link ID then the frame was</div><div class='add'>+	 * received for the link, so by filtering it means it was</div><div class='add'>+	 * from the AP the link is connected to.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* skip also in case we don't have it (yet) */</div><div class='add'>+	if (!mvm_vif-&gt;deflink.average_beacon_energy)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_STATS(mvm, "energy override by average %d\n",</div><div class='add'>+			mvm_vif-&gt;deflink.average_beacon_energy);</div><div class='add'>+	rx_status-&gt;signal = -mvm_vif-&gt;deflink.average_beacon_energy;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_get_signal_strength(struct iwl_mvm *mvm,</div><div class='add'>+					struct iwl_rx_mpdu_desc *desc,</div><div class='add'>+					struct ieee80211_hdr *hdr,</div><div class='ctx'> 					struct ieee80211_rx_status *rx_status,</div><div class='ctx'> 					u32 rate_n_flags, int energy_a,</div><div class='ctx'> 					int energy_b)</div><div class='ctx'> {</div><div class='ctx'> 	int max_energy;</div><div class='del'>-	u32 rate_flags = rate_n_flags;</div><div class='ctx'> </div><div class='ctx'> 	energy_a = energy_a ? -energy_a : S8_MIN;</div><div class='ctx'> 	energy_b = energy_b ? -energy_b : S8_MIN;</div><div class='hunk'>@@ -264,26 +310,29 @@ static void iwl_mvm_get_signal_strength(struct iwl_mvm *mvm,</div><div class='ctx'> 	IWL_DEBUG_STATS(mvm, "energy In A %d B %d, and max %d\n",</div><div class='ctx'> 			energy_a, energy_b, max_energy);</div><div class='ctx'> </div><div class='add'>+	if (iwl_mvm_used_average_energy(mvm, desc, hdr, rx_status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	rx_status-&gt;signal = max_energy;</div><div class='del'>-	rx_status-&gt;chains =</div><div class='del'>-		(rate_flags &amp; RATE_MCS_ANT_AB_MSK) &gt;&gt; RATE_MCS_ANT_POS;</div><div class='add'>+	rx_status-&gt;chains = u32_get_bits(rate_n_flags, RATE_MCS_ANT_AB_MSK);</div><div class='ctx'> 	rx_status-&gt;chain_signal[0] = energy_a;</div><div class='ctx'> 	rx_status-&gt;chain_signal[1] = energy_b;</div><div class='del'>-	rx_status-&gt;chain_signal[2] = S8_MIN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_mvm_rx_mgmt_prot(struct ieee80211_sta *sta,</div><div class='ctx'> 				struct ieee80211_hdr *hdr,</div><div class='ctx'> 				struct iwl_rx_mpdu_desc *desc,</div><div class='del'>-				u32 status)</div><div class='add'>+				u32 status,</div><div class='add'>+				struct ieee80211_rx_status *stats)</div><div class='ctx'> {</div><div class='add'>+	struct wireless_dev *wdev;</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta;</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif;</div><div class='del'>-	u8 fwkeyid = u32_get_bits(status, IWL_RX_MPDU_STATUS_KEY);</div><div class='ctx'> 	u8 keyid;</div><div class='ctx'> 	struct ieee80211_key_conf *key;</div><div class='ctx'> 	u32 len = le16_to_cpu(desc-&gt;mpdu_len);</div><div class='ctx'> 	const u8 *frame = (void *)hdr;</div><div class='add'>+	const u8 *mmie;</div><div class='ctx'> </div><div class='ctx'> 	if ((status &amp; IWL_RX_MPDU_STATUS_SEC_MASK) == IWL_RX_MPDU_STATUS_SEC_NONE)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -299,42 +348,65 @@ static int iwl_mvm_rx_mgmt_prot(struct ieee80211_sta *sta,</div><div class='ctx'> 	if (!ieee80211_is_beacon(hdr-&gt;frame_control))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/* good cases */</div><div class='del'>-	if (likely(status &amp; IWL_RX_MPDU_STATUS_MIC_OK &amp;&amp;</div><div class='del'>-		   !(status &amp; IWL_RX_MPDU_STATUS_REPLAY_ERROR)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	if (!sta)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='del'>-</div><div class='del'>-	/* what? */</div><div class='del'>-	if (fwkeyid != 6 &amp;&amp; fwkeyid != 7)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='ctx'> 	mvmvif = iwl_mvm_vif_from_mac80211(mvmsta-&gt;vif);</div><div class='ctx'> </div><div class='del'>-	key = rcu_dereference(mvmvif-&gt;bcn_prot.keys[fwkeyid - 6]);</div><div class='del'>-	if (!key)</div><div class='del'>-		return -1;</div><div class='add'>+	/* key mismatch - will also report !MIC_OK but we shouldn't count it */</div><div class='add'>+	if (!(status &amp; IWL_RX_MPDU_STATUS_KEY_VALID))</div><div class='add'>+		goto report;</div><div class='ctx'> </div><div class='del'>-	if (len &lt; key-&gt;icv_len + IEEE80211_GMAC_PN_LEN + 2)</div><div class='del'>-		return -1;</div><div class='add'>+	/* good cases */</div><div class='add'>+	if (likely(status &amp; IWL_RX_MPDU_STATUS_MIC_OK &amp;&amp;</div><div class='add'>+		   !(status &amp; IWL_RX_MPDU_STATUS_REPLAY_ERROR))) {</div><div class='add'>+		stats-&gt;flag |= RX_FLAG_DECRYPTED;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * See if the key ID matches - if not this may be due to a</div><div class='del'>-	 * switch and the firmware may erroneously report !MIC_OK.</div><div class='add'>+	 * both keys will have the same cipher and MIC length, use</div><div class='add'>+	 * whichever one is available</div><div class='ctx'> 	 */</div><div class='del'>-	keyid = frame[len - key-&gt;icv_len - IEEE80211_GMAC_PN_LEN - 2];</div><div class='del'>-	if (keyid != fwkeyid)</div><div class='del'>-		return -1;</div><div class='add'>+	key = rcu_dereference(mvmvif-&gt;bcn_prot.keys[0]);</div><div class='add'>+	if (!key) {</div><div class='add'>+		key = rcu_dereference(mvmvif-&gt;bcn_prot.keys[1]);</div><div class='add'>+		if (!key)</div><div class='add'>+			goto report;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len &lt; key-&gt;icv_len)</div><div class='add'>+		goto report;</div><div class='add'>+</div><div class='add'>+	/* get the real key ID */</div><div class='add'>+	mmie = frame + (len - key-&gt;icv_len);</div><div class='add'>+</div><div class='add'>+	/* the position of the key_id in ieee80211_mmie_16 is the same */</div><div class='add'>+	keyid = le16_to_cpu(((const struct ieee80211_mmie *) mmie)-&gt;key_id);</div><div class='add'>+</div><div class='add'>+	/* and if that's the other key, look it up */</div><div class='add'>+	if (keyid != key-&gt;keyidx) {</div><div class='add'>+		/*</div><div class='add'>+		 * shouldn't happen since firmware checked, but be safe</div><div class='add'>+		 * in case the MIC length is wrong too, for example</div><div class='add'>+		 */</div><div class='add'>+		if (keyid != 6 &amp;&amp; keyid != 7)</div><div class='add'>+			return -1;</div><div class='add'>+		key = rcu_dereference(mvmvif-&gt;bcn_prot.keys[keyid - 6]);</div><div class='add'>+		if (!key)</div><div class='add'>+			goto report;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Report status to mac80211 */</div><div class='ctx'> 	if (!(status &amp; IWL_RX_MPDU_STATUS_MIC_OK))</div><div class='ctx'> 		ieee80211_key_mic_failure(key);</div><div class='ctx'> 	else if (status &amp; IWL_RX_MPDU_STATUS_REPLAY_ERROR)</div><div class='ctx'> 		ieee80211_key_replay(key);</div><div class='add'>+report:</div><div class='add'>+	wdev = ieee80211_vif_to_wdev(mvmsta-&gt;vif);</div><div class='add'>+	if (wdev-&gt;netdev)</div><div class='add'>+		cfg80211_rx_unprot_mlme_mgmt(wdev-&gt;netdev, (void *)hdr, len);</div><div class='ctx'> </div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='hunk'>@@ -356,12 +428,14 @@ static int iwl_mvm_rx_crypto(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (phy_info &amp; IWL_RX_MPDU_PHY_AMPDU &amp;&amp;</div><div class='ctx'> 	    (status &amp; IWL_RX_MPDU_STATUS_SEC_MASK) ==</div><div class='del'>-	    IWL_RX_MPDU_STATUS_SEC_UNKNOWN &amp;&amp; !mvm-&gt;monitor_on)</div><div class='add'>+	    IWL_RX_MPDU_STATUS_SEC_UNKNOWN &amp;&amp; !mvm-&gt;monitor_on) {</div><div class='add'>+		IWL_DEBUG_DROP(mvm, "Dropping packets, bad enc status\n");</div><div class='ctx'> 		return -1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(ieee80211_is_mgmt(hdr-&gt;frame_control) &amp;&amp;</div><div class='ctx'> 		     !ieee80211_has_protected(hdr-&gt;frame_control)))</div><div class='del'>-		return iwl_mvm_rx_mgmt_prot(sta, hdr, desc, status);</div><div class='add'>+		return iwl_mvm_rx_mgmt_prot(sta, hdr, desc, status, stats);</div><div class='ctx'> </div><div class='ctx'> 	if (!ieee80211_has_protected(hdr-&gt;frame_control) ||</div><div class='ctx'> 	    (status &amp; IWL_RX_MPDU_STATUS_SEC_MASK) ==</div><div class='hunk'>@@ -375,12 +449,13 @@ static int iwl_mvm_rx_crypto(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 	case IWL_RX_MPDU_STATUS_SEC_GCM:</div><div class='ctx'> 		BUILD_BUG_ON(IEEE80211_CCMP_PN_LEN != IEEE80211_GCMP_PN_LEN);</div><div class='ctx'> 		/* alg is CCM: check MIC only */</div><div class='del'>-		if (!(status &amp; IWL_RX_MPDU_STATUS_MIC_OK))</div><div class='add'>+		if (!(status &amp; IWL_RX_MPDU_STATUS_MIC_OK)) {</div><div class='add'>+			IWL_DEBUG_DROP(mvm,</div><div class='add'>+				       "Dropping packet, bad MIC (CCM/GCM)\n");</div><div class='ctx'> 			return -1;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		stats-&gt;flag |= RX_FLAG_DECRYPTED;</div><div class='del'>-		if (pkt_flags &amp; FH_RSCSR_RADA_EN)</div><div class='del'>-			stats-&gt;flag |= RX_FLAG_MIC_STRIPPED;</div><div class='add'>+		stats-&gt;flag |= RX_FLAG_DECRYPTED | RX_FLAG_MIC_STRIPPED;</div><div class='ctx'> 		*crypt_len = IEEE80211_CCMP_HDR_LEN;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case IWL_RX_MPDU_STATUS_SEC_TKIP:</div><div class='hunk'>@@ -390,7 +465,7 @@ static int iwl_mvm_rx_crypto(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 		    !(status &amp; IWL_RX_MPDU_RES_STATUS_TTAK_OK))</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		if (mvm-&gt;trans-&gt;trans_cfg-&gt;gen2 &amp;&amp;</div><div class='add'>+		if (mvm-&gt;trans-&gt;mac_cfg-&gt;gen2 &amp;&amp;</div><div class='ctx'> 		    !(status &amp; RX_MPDU_RES_STATUS_MIC_OK))</div><div class='ctx'> 			stats-&gt;flag |= RX_FLAG_MMIC_ERROR;</div><div class='ctx'> </div><div class='hunk'>@@ -407,7 +482,7 @@ static int iwl_mvm_rx_crypto(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> </div><div class='ctx'> 		if (pkt_flags &amp; FH_RSCSR_RADA_EN) {</div><div class='ctx'> 			stats-&gt;flag |= RX_FLAG_ICV_STRIPPED;</div><div class='del'>-			if (mvm-&gt;trans-&gt;trans_cfg-&gt;gen2)</div><div class='add'>+			if (mvm-&gt;trans-&gt;mac_cfg-&gt;gen2)</div><div class='ctx'> 				stats-&gt;flag |= RX_FLAG_MMIC_STRIPPED;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -430,7 +505,7 @@ static int iwl_mvm_rx_crypto(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!is_multicast_ether_addr(hdr-&gt;addr1) &amp;&amp;</div><div class='ctx'> 		    !mvm-&gt;monitor_on &amp;&amp; net_ratelimit())</div><div class='del'>-			IWL_ERR(mvm, "Unhandled alg: 0x%x\n", status);</div><div class='add'>+			IWL_WARN(mvm, "Unhandled alg: 0x%x\n", status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -443,7 +518,7 @@ static void iwl_mvm_rx_csum(struct iwl_mvm *mvm,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_rx_mpdu_desc *desc = (void *)pkt-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if (mvm-&gt;trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='ctx'> 		if (pkt-&gt;len_n_flags &amp; cpu_to_le32(FH_RSCSR_RPA_EN)) {</div><div class='ctx'> 			u16 hwsum = be16_to_cpu(desc-&gt;v3.raw_xsum);</div><div class='ctx'> </div><div class='hunk'>@@ -469,7 +544,7 @@ static void iwl_mvm_rx_csum(struct iwl_mvm *mvm,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * returns true if a packet is a duplicate and should be dropped.</div><div class='add'>+ * returns true if a packet is a duplicate or invalid tid and should be dropped.</div><div class='ctx'>  * Updates AMSDU PN tracking info</div><div class='ctx'>  */</div><div class='ctx'> static bool iwl_mvm_is_dup(struct ieee80211_sta *sta, int queue,</div><div class='hunk'>@@ -485,6 +560,10 @@ static bool iwl_mvm_is_dup(struct ieee80211_sta *sta, int queue,</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!mvm_sta-&gt;dup_data))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	dup_data = &amp;mvm_sta-&gt;dup_data[queue];</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -492,17 +571,18 @@ static bool iwl_mvm_is_dup(struct ieee80211_sta *sta, int queue,</div><div class='ctx'> 	 * (IEEE 802.11-2012: 9.3.2.10 "Duplicate detection and recovery")</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ieee80211_is_ctl(hdr-&gt;frame_control) ||</div><div class='del'>-	    ieee80211_is_qos_nullfunc(hdr-&gt;frame_control) ||</div><div class='del'>-	    is_multicast_ether_addr(hdr-&gt;addr1)) {</div><div class='del'>-		rx_status-&gt;flag |= RX_FLAG_DUP_VALIDATED;</div><div class='add'>+	    ieee80211_is_any_nullfunc(hdr-&gt;frame_control) ||</div><div class='add'>+	    is_multicast_ether_addr(hdr-&gt;addr1))</div><div class='ctx'> 		return false;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (ieee80211_is_data_qos(hdr-&gt;frame_control))</div><div class='add'>+	if (ieee80211_is_data_qos(hdr-&gt;frame_control)) {</div><div class='ctx'> 		/* frame has qos control */</div><div class='ctx'> 		tid = ieee80211_get_tid(hdr);</div><div class='del'>-	else</div><div class='add'>+		if (tid &gt;= IWL_MAX_TID_COUNT)</div><div class='add'>+			return true;</div><div class='add'>+	} else {</div><div class='ctx'> 		tid = IWL_MAX_TID_COUNT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* If this wasn't a part of an A-MSDU the sub-frame index will be 0 */</div><div class='ctx'> 	sub_frame_idx = desc-&gt;amsdu_info &amp;</div><div class='hunk'>@@ -527,44 +607,12 @@ static bool iwl_mvm_is_dup(struct ieee80211_sta *sta, int queue,</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Returns true if sn2 - buffer_size &lt; sn1 &lt; sn2.</div><div class='del'>- * To be used only in order to compare reorder buffer head with NSSN.</div><div class='del'>- * We fully trust NSSN unless it is behind us due to reorder timeout.</div><div class='del'>- * Reorder timeout can only bring us up to buffer_size SNs ahead of NSSN.</div><div class='del'>- */</div><div class='del'>-static bool iwl_mvm_is_sn_less(u16 sn1, u16 sn2, u16 buffer_size)</div><div class='del'>-{</div><div class='del'>-	return ieee80211_sn_less(sn1, sn2) &amp;&amp;</div><div class='del'>-	       !ieee80211_sn_less(sn1, sn2 - buffer_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl_mvm_sync_nssn(struct iwl_mvm *mvm, u8 baid, u16 nssn)</div><div class='del'>-{</div><div class='del'>-	if (IWL_MVM_USE_NSSN_SYNC) {</div><div class='del'>-		struct iwl_mvm_nssn_sync_data notif = {</div><div class='del'>-			.baid = baid,</div><div class='del'>-			.nssn = nssn,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		iwl_mvm_sync_rx_queues_internal(mvm, IWL_MVM_RXQ_NSSN_SYNC, false,</div><div class='del'>-						&amp;notif, sizeof(notif));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define RX_REORDER_BUF_TIMEOUT_MQ (HZ / 10)</div><div class='del'>-</div><div class='del'>-enum iwl_mvm_release_flags {</div><div class='del'>-	IWL_MVM_RELEASE_SEND_RSS_SYNC = BIT(0),</div><div class='del'>-	IWL_MVM_RELEASE_FROM_RSS_SYNC = BIT(1),</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void iwl_mvm_release_frames(struct iwl_mvm *mvm,</div><div class='ctx'> 				   struct ieee80211_sta *sta,</div><div class='ctx'> 				   struct napi_struct *napi,</div><div class='ctx'> 				   struct iwl_mvm_baid_data *baid_data,</div><div class='ctx'> 				   struct iwl_mvm_reorder_buffer *reorder_buf,</div><div class='del'>-				   u16 nssn, u32 flags)</div><div class='add'>+				   u16 nssn)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_reorder_buf_entry *entries =</div><div class='ctx'> 		&amp;baid_data-&gt;entries[reorder_buf-&gt;queue *</div><div class='hunk'>@@ -573,31 +621,12 @@ static void iwl_mvm_release_frames(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;reorder_buf-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We keep the NSSN not too far behind, if we are sync'ing it and it</div><div class='del'>-	 * is more than 2048 ahead of us, it must be behind us. Discard it.</div><div class='del'>-	 * This can happen if the queue that hit the 0 / 2048 seqno was lagging</div><div class='del'>-	 * behind and this queue already processed packets. The next if</div><div class='del'>-	 * would have caught cases where this queue would have processed less</div><div class='del'>-	 * than 64 packets, but it may have processed more than 64 packets.</div><div class='del'>-	 */</div><div class='del'>-	if ((flags &amp; IWL_MVM_RELEASE_FROM_RSS_SYNC) &amp;&amp;</div><div class='del'>-	    ieee80211_sn_less(nssn, ssn))</div><div class='del'>-		goto set_timer;</div><div class='del'>-</div><div class='del'>-	/* ignore nssn smaller than head sn - this can happen due to timeout */</div><div class='del'>-	if (iwl_mvm_is_sn_less(nssn, ssn, reorder_buf-&gt;buf_size))</div><div class='del'>-		goto set_timer;</div><div class='del'>-</div><div class='del'>-	while (iwl_mvm_is_sn_less(ssn, nssn, reorder_buf-&gt;buf_size)) {</div><div class='del'>-		int index = ssn % reorder_buf-&gt;buf_size;</div><div class='del'>-		struct sk_buff_head *skb_list = &amp;entries[index].e.frames;</div><div class='add'>+	while (ieee80211_sn_less(ssn, nssn)) {</div><div class='add'>+		int index = ssn % baid_data-&gt;buf_size;</div><div class='add'>+		struct sk_buff_head *skb_list = &amp;entries[index].frames;</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='ctx'> </div><div class='ctx'> 		ssn = ieee80211_sn_inc(ssn);</div><div class='del'>-		if ((flags &amp; IWL_MVM_RELEASE_SEND_RSS_SYNC) &amp;&amp;</div><div class='del'>-		    (ssn == 2048 || ssn == 0))</div><div class='del'>-			iwl_mvm_sync_nssn(mvm, baid_data-&gt;baid, ssn);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Empty the list. Will have more than one frame for A-MSDU.</div><div class='hunk'>@@ -607,97 +636,11 @@ static void iwl_mvm_release_frames(struct iwl_mvm *mvm,</div><div class='ctx'> 		while ((skb = __skb_dequeue(skb_list))) {</div><div class='ctx'> 			iwl_mvm_pass_packet_to_mac80211(mvm, napi, skb,</div><div class='ctx'> 							reorder_buf-&gt;queue,</div><div class='del'>-							sta, false);</div><div class='add'>+							sta);</div><div class='ctx'> 			reorder_buf-&gt;num_stored--;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	reorder_buf-&gt;head_sn = nssn;</div><div class='del'>-</div><div class='del'>-set_timer:</div><div class='del'>-	if (reorder_buf-&gt;num_stored &amp;&amp; !reorder_buf-&gt;removed) {</div><div class='del'>-		u16 index = reorder_buf-&gt;head_sn % reorder_buf-&gt;buf_size;</div><div class='del'>-</div><div class='del'>-		while (skb_queue_empty(&amp;entries[index].e.frames))</div><div class='del'>-			index = (index + 1) % reorder_buf-&gt;buf_size;</div><div class='del'>-		/* modify timer to match next frame's expiration time */</div><div class='del'>-		mod_timer(&amp;reorder_buf-&gt;reorder_timer,</div><div class='del'>-			  entries[index].e.reorder_time + 1 +</div><div class='del'>-			  RX_REORDER_BUF_TIMEOUT_MQ);</div><div class='del'>-	} else {</div><div class='del'>-		del_timer(&amp;reorder_buf-&gt;reorder_timer);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_mvm_reorder_timer_expired(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	struct iwl_mvm_reorder_buffer *buf = from_timer(buf, t, reorder_timer);</div><div class='del'>-	struct iwl_mvm_baid_data *baid_data =</div><div class='del'>-		iwl_mvm_baid_data_from_reorder_buf(buf);</div><div class='del'>-	struct iwl_mvm_reorder_buf_entry *entries =</div><div class='del'>-		&amp;baid_data-&gt;entries[buf-&gt;queue * baid_data-&gt;entries_per_queue];</div><div class='del'>-	int i;</div><div class='del'>-	u16 sn = 0, index = 0;</div><div class='del'>-	bool expired = false;</div><div class='del'>-	bool cont = false;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;buf-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (!buf-&gt;num_stored || buf-&gt;removed) {</div><div class='del'>-		spin_unlock(&amp;buf-&gt;lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; buf-&gt;buf_size ; i++) {</div><div class='del'>-		index = (buf-&gt;head_sn + i) % buf-&gt;buf_size;</div><div class='del'>-</div><div class='del'>-		if (skb_queue_empty(&amp;entries[index].e.frames)) {</div><div class='del'>-			/*</div><div class='del'>-			 * If there is a hole and the next frame didn't expire</div><div class='del'>-			 * we want to break and not advance SN</div><div class='del'>-			 */</div><div class='del'>-			cont = false;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (!cont &amp;&amp;</div><div class='del'>-		    !time_after(jiffies, entries[index].e.reorder_time +</div><div class='del'>-					 RX_REORDER_BUF_TIMEOUT_MQ))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		expired = true;</div><div class='del'>-		/* continue until next hole after this expired frames */</div><div class='del'>-		cont = true;</div><div class='del'>-		sn = ieee80211_sn_add(buf-&gt;head_sn, i + 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (expired) {</div><div class='del'>-		struct ieee80211_sta *sta;</div><div class='del'>-		struct iwl_mvm_sta *mvmsta;</div><div class='del'>-		u8 sta_id = baid_data-&gt;sta_id;</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		sta = rcu_dereference(buf-&gt;mvm-&gt;fw_id_to_mac_id[sta_id]);</div><div class='del'>-		mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='del'>-</div><div class='del'>-		/* SN is set to the last expired frame + 1 */</div><div class='del'>-		IWL_DEBUG_HT(buf-&gt;mvm,</div><div class='del'>-			     "Releasing expired frames for sta %u, sn %d\n",</div><div class='del'>-			     sta_id, sn);</div><div class='del'>-		iwl_mvm_event_frame_timeout_callback(buf-&gt;mvm, mvmsta-&gt;vif,</div><div class='del'>-						     sta, baid_data-&gt;tid);</div><div class='del'>-		iwl_mvm_release_frames(buf-&gt;mvm, sta, NULL, baid_data,</div><div class='del'>-				       buf, sn, IWL_MVM_RELEASE_SEND_RSS_SYNC);</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * If no frame expired and there are stored frames, index is now</div><div class='del'>-		 * pointing to the first unexpired frame - modify timer</div><div class='del'>-		 * accordingly to this frame.</div><div class='del'>-		 */</div><div class='del'>-		mod_timer(&amp;buf-&gt;reorder_timer,</div><div class='del'>-			  entries[index].e.reorder_time +</div><div class='del'>-			  1 + RX_REORDER_BUF_TIMEOUT_MQ);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;buf-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_del_ba(struct iwl_mvm *mvm, int queue,</div><div class='hunk'>@@ -707,6 +650,7 @@ static void iwl_mvm_del_ba(struct iwl_mvm *mvm, int queue,</div><div class='ctx'> 	struct ieee80211_sta *sta;</div><div class='ctx'> 	struct iwl_mvm_reorder_buffer *reorder_buf;</div><div class='ctx'> 	u8 baid = data-&gt;baid;</div><div class='add'>+	u32 sta_id;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ONCE(baid &gt;= IWL_MAX_BAID, "invalid BAID: %x\n", baid))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -717,7 +661,9 @@ static void iwl_mvm_del_ba(struct iwl_mvm *mvm, int queue,</div><div class='ctx'> 	if (WARN_ON_ONCE(!ba_data))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	sta = rcu_dereference(mvm-&gt;fw_id_to_mac_id[ba_data-&gt;sta_id]);</div><div class='add'>+	/* pick any STA ID to find the pointer */</div><div class='add'>+	sta_id = ffs(ba_data-&gt;sta_mask) - 1;</div><div class='add'>+	sta = rcu_dereference(mvm-&gt;fw_id_to_mac_id[sta_id]);</div><div class='ctx'> 	if (WARN_ON_ONCE(IS_ERR_OR_NULL(sta)))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -727,10 +673,8 @@ static void iwl_mvm_del_ba(struct iwl_mvm *mvm, int queue,</div><div class='ctx'> 	spin_lock_bh(&amp;reorder_buf-&gt;lock);</div><div class='ctx'> 	iwl_mvm_release_frames(mvm, sta, NULL, ba_data, reorder_buf,</div><div class='ctx'> 			       ieee80211_sn_add(reorder_buf-&gt;head_sn,</div><div class='del'>-						reorder_buf-&gt;buf_size),</div><div class='del'>-			       0);</div><div class='add'>+						ba_data-&gt;buf_size));</div><div class='ctx'> 	spin_unlock_bh(&amp;reorder_buf-&gt;lock);</div><div class='del'>-	del_timer_sync(&amp;reorder_buf-&gt;reorder_timer);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='hunk'>@@ -738,27 +682,35 @@ out:</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_release_frames_from_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 					      struct napi_struct *napi,</div><div class='del'>-					      u8 baid, u16 nssn, int queue,</div><div class='del'>-					      u32 flags)</div><div class='add'>+					      u8 baid, u16 nssn, int queue)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sta *sta;</div><div class='ctx'> 	struct iwl_mvm_reorder_buffer *reorder_buf;</div><div class='ctx'> 	struct iwl_mvm_baid_data *ba_data;</div><div class='add'>+	u32 sta_id;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_HT(mvm, "Frame release notification for BAID %u, NSSN %d\n",</div><div class='ctx'> 		     baid, nssn);</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(baid == IWL_RX_REORDER_DATA_INVALID_BAID ||</div><div class='del'>-			 baid &gt;= ARRAY_SIZE(mvm-&gt;baid_map)))</div><div class='add'>+	if (IWL_FW_CHECK(mvm,</div><div class='add'>+			 baid == IWL_RX_REORDER_DATA_INVALID_BAID ||</div><div class='add'>+			 baid &gt;= ARRAY_SIZE(mvm-&gt;baid_map),</div><div class='add'>+			 "invalid BAID from FW: %d\n", baid))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	ba_data = rcu_dereference(mvm-&gt;baid_map[baid]);</div><div class='del'>-	if (WARN_ON_ONCE(!ba_data))</div><div class='add'>+	if (!ba_data) {</div><div class='add'>+		IWL_DEBUG_RX(mvm,</div><div class='add'>+			     "Got valid BAID %d but not allocated, invalid frame release!\n",</div><div class='add'>+			     baid);</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	sta = rcu_dereference(mvm-&gt;fw_id_to_mac_id[ba_data-&gt;sta_id]);</div><div class='add'>+	/* pick any STA ID to find the pointer */</div><div class='add'>+	sta_id = ffs(ba_data-&gt;sta_mask) - 1;</div><div class='add'>+	sta = rcu_dereference(mvm-&gt;fw_id_to_mac_id[sta_id]);</div><div class='ctx'> 	if (WARN_ON_ONCE(IS_ERR_OR_NULL(sta)))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -766,22 +718,13 @@ static void iwl_mvm_release_frames_from_notif(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;reorder_buf-&gt;lock);</div><div class='ctx'> 	iwl_mvm_release_frames(mvm, sta, napi, ba_data,</div><div class='del'>-			       reorder_buf, nssn, flags);</div><div class='add'>+			       reorder_buf, nssn);</div><div class='ctx'> 	spin_unlock_bh(&amp;reorder_buf-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_nssn_sync(struct iwl_mvm *mvm,</div><div class='del'>-			      struct napi_struct *napi, int queue,</div><div class='del'>-			      const struct iwl_mvm_nssn_sync_data *data)</div><div class='del'>-{</div><div class='del'>-	iwl_mvm_release_frames_from_notif(mvm, napi, data-&gt;baid,</div><div class='del'>-					  data-&gt;nssn, queue,</div><div class='del'>-					  IWL_MVM_RELEASE_FROM_RSS_SYNC);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void iwl_mvm_rx_queue_notif(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 			    struct iwl_rx_cmd_buffer *rxb, int queue)</div><div class='ctx'> {</div><div class='hunk'>@@ -799,11 +742,11 @@ void iwl_mvm_rx_queue_notif(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 		return;</div><div class='ctx'> 	len -= sizeof(*notif) + sizeof(*internal_notif);</div><div class='ctx'> </div><div class='del'>-	if (internal_notif-&gt;sync &amp;&amp;</div><div class='del'>-	    mvm-&gt;queue_sync_cookie != internal_notif-&gt;cookie) {</div><div class='del'>-		WARN_ONCE(1, "Received expired RX queue sync message\n");</div><div class='add'>+	if (WARN_ONCE(internal_notif-&gt;sync &amp;&amp;</div><div class='add'>+		      mvm-&gt;queue_sync_cookie != internal_notif-&gt;cookie,</div><div class='add'>+		      "Received expired RX queue sync message (cookie %d but wanted %d, queue %d)\n",</div><div class='add'>+		      internal_notif-&gt;cookie, mvm-&gt;queue_sync_cookie, queue))</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	switch (internal_notif-&gt;type) {</div><div class='ctx'> 	case IWL_MVM_RXQ_EMPTY:</div><div class='hunk'>@@ -816,14 +759,6 @@ void iwl_mvm_rx_queue_notif(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 			break;</div><div class='ctx'> 		iwl_mvm_del_ba(mvm, queue, (void *)internal_notif-&gt;data);</div><div class='ctx'> 		break;</div><div class='del'>-	case IWL_MVM_RXQ_NSSN_SYNC:</div><div class='del'>-		if (WARN_ONCE(len != sizeof(struct iwl_mvm_nssn_sync_data),</div><div class='del'>-			      "invalid nssn sync notification size %d (%d)",</div><div class='del'>-			      len, (int)sizeof(struct iwl_mvm_nssn_sync_data)))</div><div class='del'>-			break;</div><div class='del'>-		iwl_mvm_nssn_sync(mvm, napi, queue,</div><div class='del'>-				  (void *)internal_notif-&gt;data);</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ONCE(1, "Invalid identifier %d", internal_notif-&gt;type);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -837,55 +772,6 @@ void iwl_mvm_rx_queue_notif(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_oldsn_workaround(struct iwl_mvm *mvm,</div><div class='del'>-				     struct ieee80211_sta *sta, int tid,</div><div class='del'>-				     struct iwl_mvm_reorder_buffer *buffer,</div><div class='del'>-				     u32 reorder, u32 gp2, int queue)</div><div class='del'>-{</div><div class='del'>-	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='del'>-</div><div class='del'>-	if (gp2 != buffer-&gt;consec_oldsn_ampdu_gp2) {</div><div class='del'>-		/* we have a new (A-)MPDU ... */</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * reset counter to 0 if we didn't have any oldsn in</div><div class='del'>-		 * the last A-MPDU (as detected by GP2 being identical)</div><div class='del'>-		 */</div><div class='del'>-		if (!buffer-&gt;consec_oldsn_prev_drop)</div><div class='del'>-			buffer-&gt;consec_oldsn_drops = 0;</div><div class='del'>-</div><div class='del'>-		/* either way, update our tracking state */</div><div class='del'>-		buffer-&gt;consec_oldsn_ampdu_gp2 = gp2;</div><div class='del'>-	} else if (buffer-&gt;consec_oldsn_prev_drop) {</div><div class='del'>-		/*</div><div class='del'>-		 * tracking state didn't change, and we had an old SN</div><div class='del'>-		 * indication before - do nothing in this case, we</div><div class='del'>-		 * already noted this one down and are waiting for the</div><div class='del'>-		 * next A-MPDU (by GP2)</div><div class='del'>-		 */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* return unless this MPDU has old SN */</div><div class='del'>-	if (!(reorder &amp; IWL_RX_MPDU_REORDER_BA_OLD_SN))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* update state */</div><div class='del'>-	buffer-&gt;consec_oldsn_prev_drop = 1;</div><div class='del'>-	buffer-&gt;consec_oldsn_drops++;</div><div class='del'>-</div><div class='del'>-	/* if limit is reached, send del BA and reset state */</div><div class='del'>-	if (buffer-&gt;consec_oldsn_drops == IWL_MVM_AMPDU_CONSEC_DROPS_DELBA) {</div><div class='del'>-		IWL_WARN(mvm,</div><div class='del'>-			 "reached %d old SN frames from %pM on queue %d, stopping BA session on TID %d\n",</div><div class='del'>-			 IWL_MVM_AMPDU_CONSEC_DROPS_DELBA,</div><div class='del'>-			 sta-&gt;addr, queue, tid);</div><div class='del'>-		ieee80211_stop_rx_ba_session(mvmsta-&gt;vif, BIT(tid), sta-&gt;addr);</div><div class='del'>-		buffer-&gt;consec_oldsn_prev_drop = 0;</div><div class='del'>-		buffer-&gt;consec_oldsn_drops = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Returns true if the MPDU was buffered\dropped, false if it should be passed</div><div class='ctx'>  * to upper layer.</div><div class='hunk'>@@ -897,20 +783,16 @@ static bool iwl_mvm_reorder(struct iwl_mvm *mvm,</div><div class='ctx'> 			    struct sk_buff *skb,</div><div class='ctx'> 			    struct iwl_rx_mpdu_desc *desc)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);</div><div class='del'>-	struct ieee80211_hdr *hdr = iwl_mvm_skb_get_hdr(skb);</div><div class='del'>-	struct iwl_mvm_sta *mvm_sta;</div><div class='add'>+	struct ieee80211_hdr *hdr = (void *)skb_mac_header(skb);</div><div class='ctx'> 	struct iwl_mvm_baid_data *baid_data;</div><div class='ctx'> 	struct iwl_mvm_reorder_buffer *buffer;</div><div class='del'>-	struct sk_buff *tail;</div><div class='ctx'> 	u32 reorder = le32_to_cpu(desc-&gt;reorder_data);</div><div class='ctx'> 	bool amsdu = desc-&gt;mac_flags2 &amp; IWL_RX_MPDU_MFLG2_AMSDU;</div><div class='ctx'> 	bool last_subframe =</div><div class='ctx'> 		desc-&gt;amsdu_info &amp; IWL_RX_MPDU_AMSDU_LAST_SUBFRAME;</div><div class='ctx'> 	u8 tid = ieee80211_get_tid(hdr);</div><div class='del'>-	u8 sub_frame_idx = desc-&gt;amsdu_info &amp;</div><div class='del'>-			   IWL_RX_MPDU_AMSDU_SUBFRAME_IDX_MASK;</div><div class='ctx'> 	struct iwl_mvm_reorder_buf_entry *entries;</div><div class='add'>+	u32 sta_mask;</div><div class='ctx'> 	int index;</div><div class='ctx'> 	u16 nssn, sn;</div><div class='ctx'> 	u8 baid;</div><div class='hunk'>@@ -918,6 +800,9 @@ static bool iwl_mvm_reorder(struct iwl_mvm *mvm,</div><div class='ctx'> 	baid = (reorder &amp; IWL_RX_MPDU_REORDER_BAID_MASK) &gt;&gt;</div><div class='ctx'> 		IWL_RX_MPDU_REORDER_BAID_SHIFT;</div><div class='ctx'> </div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family == IWL_DEVICE_FAMILY_9000)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This also covers the case of receiving a Block Ack Request</div><div class='ctx'> 	 * outside a BA session; we'll pass it to mac80211 and that</div><div class='hunk'>@@ -933,8 +818,6 @@ static bool iwl_mvm_reorder(struct iwl_mvm *mvm,</div><div class='ctx'> 		      "Got valid BAID without a valid station assigned\n"))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='del'>-</div><div class='ctx'> 	/* not a data packet or a bar */</div><div class='ctx'> 	if (!ieee80211_is_back_req(hdr-&gt;frame_control) &amp;&amp;</div><div class='ctx'> 	    (!ieee80211_is_data_qos(hdr-&gt;frame_control) ||</div><div class='hunk'>@@ -952,10 +835,14 @@ static bool iwl_mvm_reorder(struct iwl_mvm *mvm,</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (WARN(tid != baid_data-&gt;tid || mvm_sta-&gt;sta_id != baid_data-&gt;sta_id,</div><div class='del'>-		 "baid 0x%x is mapped to sta:%d tid:%d, but was received for sta:%d tid:%d\n",</div><div class='del'>-		 baid, baid_data-&gt;sta_id, baid_data-&gt;tid, mvm_sta-&gt;sta_id,</div><div class='del'>-		 tid))</div><div class='add'>+	sta_mask = iwl_mvm_sta_fw_id_mask(mvm, sta, -1);</div><div class='add'>+</div><div class='add'>+	if (IWL_FW_CHECK(mvm,</div><div class='add'>+			 tid != baid_data-&gt;tid ||</div><div class='add'>+			 !(sta_mask &amp; baid_data-&gt;sta_mask),</div><div class='add'>+			 "baid 0x%x is mapped to sta_mask:0x%x tid:%d, but was received for sta_mask:0x%x tid:%d\n",</div><div class='add'>+			 baid, baid_data-&gt;sta_mask, baid_data-&gt;tid,</div><div class='add'>+			 sta_mask, tid))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	nssn = reorder &amp; IWL_RX_MPDU_REORDER_NSSN_MASK;</div><div class='hunk'>@@ -975,60 +862,19 @@ static bool iwl_mvm_reorder(struct iwl_mvm *mvm,</div><div class='ctx'> 		buffer-&gt;valid = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ieee80211_is_back_req(hdr-&gt;frame_control)) {</div><div class='del'>-		iwl_mvm_release_frames(mvm, sta, napi, baid_data,</div><div class='del'>-				       buffer, nssn, 0);</div><div class='add'>+	/* drop any duplicated packets */</div><div class='add'>+	if (desc-&gt;status &amp; cpu_to_le32(IWL_RX_MPDU_STATUS_DUPLICATE))</div><div class='ctx'> 		goto drop;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If there was a significant jump in the nssn - adjust.</div><div class='del'>-	 * If the SN is smaller than the NSSN it might need to first go into</div><div class='del'>-	 * the reorder buffer, in which case we just release up to it and the</div><div class='del'>-	 * rest of the function will take care of storing it and releasing up to</div><div class='del'>-	 * the nssn.</div><div class='del'>-	 * This should not happen. This queue has been lagging and it should</div><div class='del'>-	 * have been updated by a IWL_MVM_RXQ_NSSN_SYNC notification. Be nice</div><div class='del'>-	 * and update the other queues.</div><div class='del'>-	 */</div><div class='del'>-	if (!iwl_mvm_is_sn_less(nssn, buffer-&gt;head_sn + buffer-&gt;buf_size,</div><div class='del'>-				buffer-&gt;buf_size) ||</div><div class='del'>-	    !ieee80211_sn_less(sn, buffer-&gt;head_sn + buffer-&gt;buf_size)) {</div><div class='del'>-		u16 min_sn = ieee80211_sn_less(sn, nssn) ? sn : nssn;</div><div class='del'>-</div><div class='del'>-		iwl_mvm_release_frames(mvm, sta, napi, baid_data, buffer,</div><div class='del'>-				       min_sn, IWL_MVM_RELEASE_SEND_RSS_SYNC);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl_mvm_oldsn_workaround(mvm, sta, tid, buffer, reorder,</div><div class='del'>-				 rx_status-&gt;device_timestamp, queue);</div><div class='ctx'> </div><div class='ctx'> 	/* drop any oudated packets */</div><div class='del'>-	if (ieee80211_sn_less(sn, buffer-&gt;head_sn))</div><div class='add'>+	if (reorder &amp; IWL_RX_MPDU_REORDER_BA_OLD_SN)</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='ctx'> 	/* release immediately if allowed by nssn and no stored frames */</div><div class='ctx'> 	if (!buffer-&gt;num_stored &amp;&amp; ieee80211_sn_less(sn, nssn)) {</div><div class='del'>-		if (iwl_mvm_is_sn_less(buffer-&gt;head_sn, nssn,</div><div class='del'>-				       buffer-&gt;buf_size) &amp;&amp;</div><div class='del'>-		   (!amsdu || last_subframe)) {</div><div class='del'>-			/*</div><div class='del'>-			 * If we crossed the 2048 or 0 SN, notify all the</div><div class='del'>-			 * queues. This is done in order to avoid having a</div><div class='del'>-			 * head_sn that lags behind for too long. When that</div><div class='del'>-			 * happens, we can get to a situation where the head_sn</div><div class='del'>-			 * is within the interval [nssn - buf_size : nssn]</div><div class='del'>-			 * which will make us think that the nssn is a packet</div><div class='del'>-			 * that we already freed because of the reordering</div><div class='del'>-			 * buffer and we will ignore it. So maintain the</div><div class='del'>-			 * head_sn somewhat updated across all the queues:</div><div class='del'>-			 * when it crosses 0 and 2048.</div><div class='del'>-			 */</div><div class='del'>-			if (sn == 2048 || sn == 0)</div><div class='del'>-				iwl_mvm_sync_nssn(mvm, baid, sn);</div><div class='add'>+		if (!amsdu || last_subframe)</div><div class='ctx'> 			buffer-&gt;head_sn = nssn;</div><div class='del'>-		}</div><div class='del'>-		/* No need to update AMSDU last SN - we are moving the head */</div><div class='add'>+</div><div class='ctx'> 		spin_unlock_bh(&amp;buffer-&gt;lock);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1042,42 +888,17 @@ static bool iwl_mvm_reorder(struct iwl_mvm *mvm,</div><div class='ctx'> 	 * while technically there is no hole and we can move forward.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!buffer-&gt;num_stored &amp;&amp; sn == buffer-&gt;head_sn) {</div><div class='del'>-		if (!amsdu || last_subframe) {</div><div class='del'>-			if (sn == 2048 || sn == 0)</div><div class='del'>-				iwl_mvm_sync_nssn(mvm, baid, sn);</div><div class='add'>+		if (!amsdu || last_subframe)</div><div class='ctx'> 			buffer-&gt;head_sn = ieee80211_sn_inc(buffer-&gt;head_sn);</div><div class='del'>-		}</div><div class='del'>-		/* No need to update AMSDU last SN - we are moving the head */</div><div class='add'>+</div><div class='ctx'> 		spin_unlock_bh(&amp;buffer-&gt;lock);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	index = sn % buffer-&gt;buf_size;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check if we already stored this frame</div><div class='del'>-	 * As AMSDU is either received or not as whole, logic is simple:</div><div class='del'>-	 * If we have frames in that position in the buffer and the last frame</div><div class='del'>-	 * originated from AMSDU had a different SN then it is a retransmission.</div><div class='del'>-	 * If it is the same SN then if the subframe index is incrementing it</div><div class='del'>-	 * is the same AMSDU - otherwise it is a retransmission.</div><div class='del'>-	 */</div><div class='del'>-	tail = skb_peek_tail(&amp;entries[index].e.frames);</div><div class='del'>-	if (tail &amp;&amp; !amsdu)</div><div class='del'>-		goto drop;</div><div class='del'>-	else if (tail &amp;&amp; (sn != buffer-&gt;last_amsdu ||</div><div class='del'>-			  buffer-&gt;last_sub_index &gt;= sub_frame_idx))</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='ctx'> 	/* put in reorder buffer */</div><div class='del'>-	__skb_queue_tail(&amp;entries[index].e.frames, skb);</div><div class='add'>+	index = sn % baid_data-&gt;buf_size;</div><div class='add'>+	__skb_queue_tail(&amp;entries[index].frames, skb);</div><div class='ctx'> 	buffer-&gt;num_stored++;</div><div class='del'>-	entries[index].e.reorder_time = jiffies;</div><div class='del'>-</div><div class='del'>-	if (amsdu) {</div><div class='del'>-		buffer-&gt;last_amsdu = sn;</div><div class='del'>-		buffer-&gt;last_sub_index = sub_frame_idx;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We cannot trust NSSN for AMSDU sub-frames that are not the last.</div><div class='hunk'>@@ -1089,11 +910,15 @@ static bool iwl_mvm_reorder(struct iwl_mvm *mvm,</div><div class='ctx'> 	 * already ahead and it will be dropped.</div><div class='ctx'> 	 * If the last sub-frame is not on this queue - we will get frame</div><div class='ctx'> 	 * release notification with up to date NSSN.</div><div class='add'>+	 * If this is the first frame that is stored in the buffer, the head_sn</div><div class='add'>+	 * may be outdated. Update it based on the last NSSN to make sure it</div><div class='add'>+	 * will be released when the frame release notification arrives.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!amsdu || last_subframe)</div><div class='ctx'> 		iwl_mvm_release_frames(mvm, sta, napi, baid_data,</div><div class='del'>-				       buffer, nssn,</div><div class='del'>-				       IWL_MVM_RELEASE_SEND_RSS_SYNC);</div><div class='add'>+				       buffer, nssn);</div><div class='add'>+	else if (buffer-&gt;num_stored == 1)</div><div class='add'>+		buffer-&gt;head_sn = nssn;</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;buffer-&gt;lock);</div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -1151,18 +976,27 @@ static void iwl_mvm_flip_address(u8 *addr)</div><div class='ctx'> </div><div class='ctx'> struct iwl_mvm_rx_phy_data {</div><div class='ctx'> 	enum iwl_rx_phy_info_type info_type;</div><div class='del'>-	__le32 d0, d1, d2, d3;</div><div class='add'>+	__le32 d0, d1, d2, d3, eht_d4, d5;</div><div class='ctx'> 	__le16 d4;</div><div class='add'>+	bool with_data;</div><div class='add'>+	bool first_subframe;</div><div class='add'>+	__le32 rx_vec[4];</div><div class='add'>+</div><div class='add'>+	u32 rate_n_flags;</div><div class='add'>+	u32 gp2_on_air_rise;</div><div class='add'>+	u16 phy_info;</div><div class='add'>+	u8 energy_a, energy_b;</div><div class='add'>+	u8 channel;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_decode_he_mu_ext(struct iwl_mvm *mvm,</div><div class='ctx'> 				     struct iwl_mvm_rx_phy_data *phy_data,</div><div class='del'>-				     u32 rate_n_flags,</div><div class='ctx'> 				     struct ieee80211_radiotap_he_mu *he_mu)</div><div class='ctx'> {</div><div class='ctx'> 	u32 phy_data2 = le32_to_cpu(phy_data-&gt;d2);</div><div class='ctx'> 	u32 phy_data3 = le32_to_cpu(phy_data-&gt;d3);</div><div class='ctx'> 	u16 phy_data4 = le16_to_cpu(phy_data-&gt;d4);</div><div class='add'>+	u32 rate_n_flags = phy_data-&gt;rate_n_flags;</div><div class='ctx'> </div><div class='ctx'> 	if (FIELD_GET(IWL_RX_PHY_DATA4_HE_MU_EXT_CH1_CRC_OK, phy_data4)) {</div><div class='ctx'> 		he_mu-&gt;flags1 |=</div><div class='hunk'>@@ -1185,7 +1019,7 @@ static void iwl_mvm_decode_he_mu_ext(struct iwl_mvm *mvm,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (FIELD_GET(IWL_RX_PHY_DATA4_HE_MU_EXT_CH2_CRC_OK, phy_data4) &amp;&amp;</div><div class='del'>-	    (rate_n_flags &amp; RATE_MCS_CHAN_WIDTH_MSK) != RATE_MCS_CHAN_WIDTH_20) {</div><div class='add'>+	    (rate_n_flags &amp; RATE_MCS_CHAN_WIDTH_MSK_V1) != RATE_MCS_CHAN_WIDTH_20) {</div><div class='ctx'> 		he_mu-&gt;flags1 |=</div><div class='ctx'> 			cpu_to_le16(IEEE80211_RADIOTAP_HE_MU_FLAGS1_CH2_RU_KNOWN |</div><div class='ctx'> 				    IEEE80211_RADIOTAP_HE_MU_FLAGS1_CH2_CTR_26T_RU_KNOWN);</div><div class='hunk'>@@ -1208,7 +1042,6 @@ static void iwl_mvm_decode_he_mu_ext(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> iwl_mvm_decode_he_phy_ru_alloc(struct iwl_mvm_rx_phy_data *phy_data,</div><div class='del'>-			       u32 rate_n_flags,</div><div class='ctx'> 			       struct ieee80211_radiotap_he *he,</div><div class='ctx'> 			       struct ieee80211_radiotap_he_mu *he_mu,</div><div class='ctx'> 			       struct ieee80211_rx_status *rx_status)</div><div class='hunk'>@@ -1222,6 +1055,7 @@ iwl_mvm_decode_he_phy_ru_alloc(struct iwl_mvm_rx_phy_data *phy_data,</div><div class='ctx'> 	 * the TSF/timers are not be transmitted in HE-MU.</div><div class='ctx'> 	 */</div><div class='ctx'> 	u8 ru = le32_get_bits(phy_data-&gt;d1, IWL_RX_PHY_DATA1_HE_RU_ALLOC_MASK);</div><div class='add'>+	u32 rate_n_flags = phy_data-&gt;rate_n_flags;</div><div class='ctx'> 	u32 he_type = rate_n_flags &amp; RATE_MCS_HE_TYPE_MSK;</div><div class='ctx'> 	u8 offs = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1293,7 +1127,7 @@ static void iwl_mvm_decode_he_phy_data(struct iwl_mvm *mvm,</div><div class='ctx'> 				       struct ieee80211_radiotap_he *he,</div><div class='ctx'> 				       struct ieee80211_radiotap_he_mu *he_mu,</div><div class='ctx'> 				       struct ieee80211_rx_status *rx_status,</div><div class='del'>-				       u32 rate_n_flags, int queue)</div><div class='add'>+				       int queue)</div><div class='ctx'> {</div><div class='ctx'> 	switch (phy_data-&gt;info_type) {</div><div class='ctx'> 	case IWL_RX_PHY_INFO_TYPE_NONE:</div><div class='hunk'>@@ -1302,6 +1136,10 @@ static void iwl_mvm_decode_he_phy_data(struct iwl_mvm *mvm,</div><div class='ctx'> 	case IWL_RX_PHY_INFO_TYPE_HT:</div><div class='ctx'> 	case IWL_RX_PHY_INFO_TYPE_VHT_SU:</div><div class='ctx'> 	case IWL_RX_PHY_INFO_TYPE_VHT_MU:</div><div class='add'>+	case IWL_RX_PHY_INFO_TYPE_EHT_MU:</div><div class='add'>+	case IWL_RX_PHY_INFO_TYPE_EHT_TB:</div><div class='add'>+	case IWL_RX_PHY_INFO_TYPE_EHT_MU_EXT:</div><div class='add'>+	case IWL_RX_PHY_INFO_TYPE_EHT_TB_EXT:</div><div class='ctx'> 		return;</div><div class='ctx'> 	case IWL_RX_PHY_INFO_TYPE_HE_TB_EXT:</div><div class='ctx'> 		he-&gt;data1 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_SPTL_REUSE_KNOWN |</div><div class='hunk'>@@ -1392,7 +1230,7 @@ static void iwl_mvm_decode_he_phy_data(struct iwl_mvm *mvm,</div><div class='ctx'> 			le16_encode_bits(le16_get_bits(phy_data-&gt;d4,</div><div class='ctx'> 						       IWL_RX_PHY_DATA4_HE_MU_EXT_PREAMBLE_PUNC_TYPE_MASK),</div><div class='ctx'> 					 IEEE80211_RADIOTAP_HE_MU_FLAGS2_PUNC_FROM_SIG_A_BW);</div><div class='del'>-		iwl_mvm_decode_he_mu_ext(mvm, phy_data, rate_n_flags, he_mu);</div><div class='add'>+		iwl_mvm_decode_he_mu_ext(mvm, phy_data, he_mu);</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> 	case IWL_RX_PHY_INFO_TYPE_HE_MU:</div><div class='ctx'> 		he_mu-&gt;flags2 |=</div><div class='hunk'>@@ -1406,8 +1244,7 @@ static void iwl_mvm_decode_he_phy_data(struct iwl_mvm *mvm,</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> 	case IWL_RX_PHY_INFO_TYPE_HE_TB:</div><div class='ctx'> 	case IWL_RX_PHY_INFO_TYPE_HE_TB_EXT:</div><div class='del'>-		iwl_mvm_decode_he_phy_ru_alloc(phy_data, rate_n_flags,</div><div class='del'>-					       he, he_mu, rx_status);</div><div class='add'>+		iwl_mvm_decode_he_phy_ru_alloc(phy_data, he, he_mu, rx_status);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IWL_RX_PHY_INFO_TYPE_HE_SU:</div><div class='ctx'> 		he-&gt;data1 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_BEAM_CHANGE_KNOWN);</div><div class='hunk'>@@ -1421,15 +1258,547 @@ static void iwl_mvm_decode_he_phy_data(struct iwl_mvm *mvm,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define LE32_DEC_ENC(value, dec_bits, enc_bits) \</div><div class='add'>+	le32_encode_bits(le32_get_bits(value, dec_bits), enc_bits)</div><div class='add'>+</div><div class='add'>+#define IWL_MVM_ENC_USIG_VALUE_MASK(usig, in_value, dec_bits, enc_bits) do { \</div><div class='add'>+	typeof(enc_bits) _enc_bits = enc_bits; \</div><div class='add'>+	typeof(usig) _usig = usig; \</div><div class='add'>+	(_usig)-&gt;mask |= cpu_to_le32(_enc_bits); \</div><div class='add'>+	(_usig)-&gt;value |= LE32_DEC_ENC(in_value, dec_bits, _enc_bits); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define __IWL_MVM_ENC_EHT_RU(rt_data, rt_ru, fw_data, fw_ru) \</div><div class='add'>+	eht-&gt;data[(rt_data)] |= \</div><div class='add'>+		(cpu_to_le32 \</div><div class='add'>+		 (IEEE80211_RADIOTAP_EHT_DATA ## rt_data ## _RU_ALLOC_CC_ ## rt_ru ## _KNOWN) | \</div><div class='add'>+		 LE32_DEC_ENC(data ## fw_data, \</div><div class='add'>+			      IWL_RX_PHY_DATA ## fw_data ## _EHT_MU_EXT_RU_ALLOC_ ## fw_ru, \</div><div class='add'>+			      IEEE80211_RADIOTAP_EHT_DATA ## rt_data ## _RU_ALLOC_CC_ ## rt_ru))</div><div class='add'>+</div><div class='add'>+#define _IWL_MVM_ENC_EHT_RU(rt_data, rt_ru, fw_data, fw_ru)	\</div><div class='add'>+	__IWL_MVM_ENC_EHT_RU(rt_data, rt_ru, fw_data, fw_ru)</div><div class='add'>+</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_1_1_1	1</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_2_1_1	2</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_1_1_2	2</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_2_1_2	2</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_1_2_1	3</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_2_2_1	3</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_1_2_2	3</div><div class='add'>+#define IEEE80211_RADIOTAP_RU_DATA_2_2_2	4</div><div class='add'>+</div><div class='add'>+#define IWL_RX_RU_DATA_A1			2</div><div class='add'>+#define IWL_RX_RU_DATA_A2			2</div><div class='add'>+#define IWL_RX_RU_DATA_B1			2</div><div class='add'>+#define IWL_RX_RU_DATA_B2			4</div><div class='add'>+#define IWL_RX_RU_DATA_C1			3</div><div class='add'>+#define IWL_RX_RU_DATA_C2			3</div><div class='add'>+#define IWL_RX_RU_DATA_D1			4</div><div class='add'>+#define IWL_RX_RU_DATA_D2			4</div><div class='add'>+</div><div class='add'>+#define IWL_MVM_ENC_EHT_RU(rt_ru, fw_ru)				\</div><div class='add'>+	_IWL_MVM_ENC_EHT_RU(IEEE80211_RADIOTAP_RU_DATA_ ## rt_ru,	\</div><div class='add'>+			    rt_ru,					\</div><div class='add'>+			    IWL_RX_RU_DATA_ ## fw_ru,			\</div><div class='add'>+			    fw_ru)</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_decode_eht_ext_mu(struct iwl_mvm *mvm,</div><div class='add'>+				      struct iwl_mvm_rx_phy_data *phy_data,</div><div class='add'>+				      struct ieee80211_rx_status *rx_status,</div><div class='add'>+				      struct ieee80211_radiotap_eht *eht,</div><div class='add'>+				      struct ieee80211_radiotap_eht_usig *usig)</div><div class='add'>+{</div><div class='add'>+	if (phy_data-&gt;with_data) {</div><div class='add'>+		__le32 data1 = phy_data-&gt;d1;</div><div class='add'>+		__le32 data2 = phy_data-&gt;d2;</div><div class='add'>+		__le32 data3 = phy_data-&gt;d3;</div><div class='add'>+		__le32 data4 = phy_data-&gt;eht_d4;</div><div class='add'>+		__le32 data5 = phy_data-&gt;d5;</div><div class='add'>+		u32 phy_bw = phy_data-&gt;rate_n_flags &amp; RATE_MCS_CHAN_WIDTH_MSK;</div><div class='add'>+</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK(usig, data5,</div><div class='add'>+					    IWL_RX_PHY_DATA5_EHT_TYPE_AND_COMP,</div><div class='add'>+					    IEEE80211_RADIOTAP_EHT_USIG2_MU_B0_B1_PPDU_TYPE);</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK(usig, data5,</div><div class='add'>+					    IWL_RX_PHY_DATA5_EHT_MU_PUNC_CH_CODE,</div><div class='add'>+					    IEEE80211_RADIOTAP_EHT_USIG2_MU_B3_B7_PUNCTURED_INFO);</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK(usig, data4,</div><div class='add'>+					    IWL_RX_PHY_DATA4_EHT_MU_EXT_SIGB_MCS,</div><div class='add'>+					    IEEE80211_RADIOTAP_EHT_USIG2_MU_B9_B10_SIG_MCS);</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK</div><div class='add'>+			(usig, data1, IWL_RX_PHY_DATA1_EHT_MU_NUM_SIG_SYM_USIGA2,</div><div class='add'>+			 IEEE80211_RADIOTAP_EHT_USIG2_MU_B11_B15_EHT_SIG_SYMBOLS);</div><div class='add'>+</div><div class='add'>+		eht-&gt;user_info[0] |=</div><div class='add'>+			cpu_to_le32(IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID_KNOWN) |</div><div class='add'>+			LE32_DEC_ENC(data5, IWL_RX_PHY_DATA5_EHT_MU_STA_ID_USR,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID);</div><div class='add'>+</div><div class='add'>+		eht-&gt;known |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_KNOWN_NR_NON_OFDMA_USERS_M);</div><div class='add'>+		eht-&gt;data[7] |= LE32_DEC_ENC</div><div class='add'>+			(data5, IWL_RX_PHY_DATA5_EHT_MU_NUM_USR_NON_OFDMA,</div><div class='add'>+			 IEEE80211_RADIOTAP_EHT_DATA7_NUM_OF_NON_OFDMA_USERS);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Hardware labels the content channels/RU allocation values</div><div class='add'>+		 * as follows:</div><div class='add'>+		 *           Content Channel 1		Content Channel 2</div><div class='add'>+		 *   20 MHz: A1</div><div class='add'>+		 *   40 MHz: A1				B1</div><div class='add'>+		 *   80 MHz: A1 C1			B1 D1</div><div class='add'>+		 *  160 MHz: A1 C1 A2 C2		B1 D1 B2 D2</div><div class='add'>+		 *  320 MHz: A1 C1 A2 C2 A3 C3 A4 C4	B1 D1 B2 D2 B3 D3 B4 D4</div><div class='add'>+		 *</div><div class='add'>+		 * However firmware can only give us A1-D2, so the higher</div><div class='add'>+		 * frequencies are missing.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		switch (phy_bw) {</div><div class='add'>+		case RATE_MCS_CHAN_WIDTH_320:</div><div class='add'>+			/* additional values are missing in RX metadata */</div><div class='add'>+		case RATE_MCS_CHAN_WIDTH_160:</div><div class='add'>+			/* content channel 1 */</div><div class='add'>+			IWL_MVM_ENC_EHT_RU(1_2_1, A2);</div><div class='add'>+			IWL_MVM_ENC_EHT_RU(1_2_2, C2);</div><div class='add'>+			/* content channel 2 */</div><div class='add'>+			IWL_MVM_ENC_EHT_RU(2_2_1, B2);</div><div class='add'>+			IWL_MVM_ENC_EHT_RU(2_2_2, D2);</div><div class='add'>+			fallthrough;</div><div class='add'>+		case RATE_MCS_CHAN_WIDTH_80:</div><div class='add'>+			/* content channel 1 */</div><div class='add'>+			IWL_MVM_ENC_EHT_RU(1_1_2, C1);</div><div class='add'>+			/* content channel 2 */</div><div class='add'>+			IWL_MVM_ENC_EHT_RU(2_1_2, D1);</div><div class='add'>+			fallthrough;</div><div class='add'>+		case RATE_MCS_CHAN_WIDTH_40:</div><div class='add'>+			/* content channel 2 */</div><div class='add'>+			IWL_MVM_ENC_EHT_RU(2_1_1, B1);</div><div class='add'>+			fallthrough;</div><div class='add'>+		case RATE_MCS_CHAN_WIDTH_20:</div><div class='add'>+			IWL_MVM_ENC_EHT_RU(1_1_1, A1);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		__le32 usig_a1 = phy_data-&gt;rx_vec[0];</div><div class='add'>+		__le32 usig_a2 = phy_data-&gt;rx_vec[1];</div><div class='add'>+</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK(usig, usig_a1,</div><div class='add'>+					    IWL_RX_USIG_A1_DISREGARD,</div><div class='add'>+					    IEEE80211_RADIOTAP_EHT_USIG1_MU_B20_B24_DISREGARD);</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK(usig, usig_a1,</div><div class='add'>+					    IWL_RX_USIG_A1_VALIDATE,</div><div class='add'>+					    IEEE80211_RADIOTAP_EHT_USIG1_MU_B25_VALIDATE);</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+					    IWL_RX_USIG_A2_EHT_PPDU_TYPE,</div><div class='add'>+					    IEEE80211_RADIOTAP_EHT_USIG2_MU_B0_B1_PPDU_TYPE);</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+					    IWL_RX_USIG_A2_EHT_USIG2_VALIDATE_B2,</div><div class='add'>+					    IEEE80211_RADIOTAP_EHT_USIG2_MU_B2_VALIDATE);</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+					    IWL_RX_USIG_A2_EHT_PUNC_CHANNEL,</div><div class='add'>+					    IEEE80211_RADIOTAP_EHT_USIG2_MU_B3_B7_PUNCTURED_INFO);</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+					    IWL_RX_USIG_A2_EHT_USIG2_VALIDATE_B8,</div><div class='add'>+					    IEEE80211_RADIOTAP_EHT_USIG2_MU_B8_VALIDATE);</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+					    IWL_RX_USIG_A2_EHT_SIG_MCS,</div><div class='add'>+					    IEEE80211_RADIOTAP_EHT_USIG2_MU_B9_B10_SIG_MCS);</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK</div><div class='add'>+			(usig, usig_a2, IWL_RX_USIG_A2_EHT_SIG_SYM_NUM,</div><div class='add'>+			 IEEE80211_RADIOTAP_EHT_USIG2_MU_B11_B15_EHT_SIG_SYMBOLS);</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+					    IWL_RX_USIG_A2_EHT_CRC_OK,</div><div class='add'>+					    IEEE80211_RADIOTAP_EHT_USIG2_MU_B16_B19_CRC);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_decode_eht_ext_tb(struct iwl_mvm *mvm,</div><div class='add'>+				      struct iwl_mvm_rx_phy_data *phy_data,</div><div class='add'>+				      struct ieee80211_rx_status *rx_status,</div><div class='add'>+				      struct ieee80211_radiotap_eht *eht,</div><div class='add'>+				      struct ieee80211_radiotap_eht_usig *usig)</div><div class='add'>+{</div><div class='add'>+	if (phy_data-&gt;with_data) {</div><div class='add'>+		__le32 data5 = phy_data-&gt;d5;</div><div class='add'>+</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK(usig, data5,</div><div class='add'>+					    IWL_RX_PHY_DATA5_EHT_TYPE_AND_COMP,</div><div class='add'>+					    IEEE80211_RADIOTAP_EHT_USIG2_TB_B0_B1_PPDU_TYPE);</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK(usig, data5,</div><div class='add'>+					    IWL_RX_PHY_DATA5_EHT_TB_SPATIAL_REUSE1,</div><div class='add'>+					    IEEE80211_RADIOTAP_EHT_USIG2_TB_B3_B6_SPATIAL_REUSE_1);</div><div class='add'>+</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK(usig, data5,</div><div class='add'>+					    IWL_RX_PHY_DATA5_EHT_TB_SPATIAL_REUSE2,</div><div class='add'>+					    IEEE80211_RADIOTAP_EHT_USIG2_TB_B7_B10_SPATIAL_REUSE_2);</div><div class='add'>+	} else {</div><div class='add'>+		__le32 usig_a1 = phy_data-&gt;rx_vec[0];</div><div class='add'>+		__le32 usig_a2 = phy_data-&gt;rx_vec[1];</div><div class='add'>+</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK(usig, usig_a1,</div><div class='add'>+					    IWL_RX_USIG_A1_DISREGARD,</div><div class='add'>+					    IEEE80211_RADIOTAP_EHT_USIG1_TB_B20_B25_DISREGARD);</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+					    IWL_RX_USIG_A2_EHT_PPDU_TYPE,</div><div class='add'>+					    IEEE80211_RADIOTAP_EHT_USIG2_TB_B0_B1_PPDU_TYPE);</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+					    IWL_RX_USIG_A2_EHT_USIG2_VALIDATE_B2,</div><div class='add'>+					    IEEE80211_RADIOTAP_EHT_USIG2_TB_B2_VALIDATE);</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+					    IWL_RX_USIG_A2_EHT_TRIG_SPATIAL_REUSE_1,</div><div class='add'>+					    IEEE80211_RADIOTAP_EHT_USIG2_TB_B3_B6_SPATIAL_REUSE_1);</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+					    IWL_RX_USIG_A2_EHT_TRIG_SPATIAL_REUSE_2,</div><div class='add'>+					    IEEE80211_RADIOTAP_EHT_USIG2_TB_B7_B10_SPATIAL_REUSE_2);</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+					    IWL_RX_USIG_A2_EHT_TRIG_USIG2_DISREGARD,</div><div class='add'>+					    IEEE80211_RADIOTAP_EHT_USIG2_TB_B11_B15_DISREGARD);</div><div class='add'>+		IWL_MVM_ENC_USIG_VALUE_MASK(usig, usig_a2,</div><div class='add'>+					    IWL_RX_USIG_A2_EHT_CRC_OK,</div><div class='add'>+					    IEEE80211_RADIOTAP_EHT_USIG2_TB_B16_B19_CRC);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_decode_eht_ru(struct iwl_mvm *mvm,</div><div class='add'>+				  struct ieee80211_rx_status *rx_status,</div><div class='add'>+				  struct ieee80211_radiotap_eht *eht)</div><div class='add'>+{</div><div class='add'>+	u32 ru = le32_get_bits(eht-&gt;data[8],</div><div class='add'>+			       IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_B7_B1);</div><div class='add'>+	enum nl80211_eht_ru_alloc nl_ru;</div><div class='add'>+</div><div class='add'>+	/* Using D1.5 Table 9-53a - Encoding of PS160 and RU Allocation subfields</div><div class='add'>+	 * in an EHT variant User Info field</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	switch (ru) {</div><div class='add'>+	case 0 ... 36:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_26;</div><div class='add'>+		break;</div><div class='add'>+	case 37 ... 52:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_52;</div><div class='add'>+		break;</div><div class='add'>+	case 53 ... 60:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_106;</div><div class='add'>+		break;</div><div class='add'>+	case 61 ... 64:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_242;</div><div class='add'>+		break;</div><div class='add'>+	case 65 ... 66:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_484;</div><div class='add'>+		break;</div><div class='add'>+	case 67:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_996;</div><div class='add'>+		break;</div><div class='add'>+	case 68:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_2x996;</div><div class='add'>+		break;</div><div class='add'>+	case 69:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_4x996;</div><div class='add'>+		break;</div><div class='add'>+	case 70 ... 81:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_52P26;</div><div class='add'>+		break;</div><div class='add'>+	case 82 ... 89:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_106P26;</div><div class='add'>+		break;</div><div class='add'>+	case 90 ... 93:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_484P242;</div><div class='add'>+		break;</div><div class='add'>+	case 94 ... 95:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_996P484;</div><div class='add'>+		break;</div><div class='add'>+	case 96 ... 99:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_996P484P242;</div><div class='add'>+		break;</div><div class='add'>+	case 100 ... 103:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_2x996P484;</div><div class='add'>+		break;</div><div class='add'>+	case 104:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_3x996;</div><div class='add'>+		break;</div><div class='add'>+	case 105 ... 106:</div><div class='add'>+		nl_ru = NL80211_RATE_INFO_EHT_RU_ALLOC_3x996P484;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_status-&gt;bw = RATE_INFO_BW_EHT_RU;</div><div class='add'>+	rx_status-&gt;eht.ru = nl_ru;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_decode_eht_phy_data(struct iwl_mvm *mvm,</div><div class='add'>+					struct iwl_mvm_rx_phy_data *phy_data,</div><div class='add'>+					struct ieee80211_rx_status *rx_status,</div><div class='add'>+					struct ieee80211_radiotap_eht *eht,</div><div class='add'>+					struct ieee80211_radiotap_eht_usig *usig)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	__le32 data0 = phy_data-&gt;d0;</div><div class='add'>+	__le32 data1 = phy_data-&gt;d1;</div><div class='add'>+	__le32 usig_a1 = phy_data-&gt;rx_vec[0];</div><div class='add'>+	u8 info_type = phy_data-&gt;info_type;</div><div class='add'>+</div><div class='add'>+	/* Not in EHT range */</div><div class='add'>+	if (info_type &lt; IWL_RX_PHY_INFO_TYPE_EHT_MU ||</div><div class='add'>+	    info_type &gt; IWL_RX_PHY_INFO_TYPE_EHT_TB_EXT)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	usig-&gt;common |= cpu_to_le32</div><div class='add'>+		(IEEE80211_RADIOTAP_EHT_USIG_COMMON_UL_DL_KNOWN |</div><div class='add'>+		 IEEE80211_RADIOTAP_EHT_USIG_COMMON_BSS_COLOR_KNOWN);</div><div class='add'>+	if (phy_data-&gt;with_data) {</div><div class='add'>+		usig-&gt;common |= LE32_DEC_ENC(data0,</div><div class='add'>+					     IWL_RX_PHY_DATA0_EHT_UPLINK,</div><div class='add'>+					     IEEE80211_RADIOTAP_EHT_USIG_COMMON_UL_DL);</div><div class='add'>+		usig-&gt;common |= LE32_DEC_ENC(data0,</div><div class='add'>+					     IWL_RX_PHY_DATA0_EHT_BSS_COLOR_MASK,</div><div class='add'>+					     IEEE80211_RADIOTAP_EHT_USIG_COMMON_BSS_COLOR);</div><div class='add'>+	} else {</div><div class='add'>+		usig-&gt;common |= LE32_DEC_ENC(usig_a1,</div><div class='add'>+					     IWL_RX_USIG_A1_UL_FLAG,</div><div class='add'>+					     IEEE80211_RADIOTAP_EHT_USIG_COMMON_UL_DL);</div><div class='add'>+		usig-&gt;common |= LE32_DEC_ENC(usig_a1,</div><div class='add'>+					     IWL_RX_USIG_A1_BSS_COLOR,</div><div class='add'>+					     IEEE80211_RADIOTAP_EHT_USIG_COMMON_BSS_COLOR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			IWL_UCODE_TLV_CAPA_SNIFF_VALIDATE_SUPPORT)) {</div><div class='add'>+		usig-&gt;common |=</div><div class='add'>+			cpu_to_le32(IEEE80211_RADIOTAP_EHT_USIG_COMMON_VALIDATE_BITS_CHECKED);</div><div class='add'>+		usig-&gt;common |=</div><div class='add'>+			LE32_DEC_ENC(data0, IWL_RX_PHY_DATA0_EHT_VALIDATE,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_USIG_COMMON_VALIDATE_BITS_OK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	eht-&gt;known |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_KNOWN_SPATIAL_REUSE);</div><div class='add'>+	eht-&gt;data[0] |= LE32_DEC_ENC(data0,</div><div class='add'>+				     IWL_RX_PHY_DATA0_ETH_SPATIAL_REUSE_MASK,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA0_SPATIAL_REUSE);</div><div class='add'>+</div><div class='add'>+	/* All RU allocating size/index is in TB format */</div><div class='add'>+	eht-&gt;known |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_KNOWN_RU_ALLOC_TB_FMT);</div><div class='add'>+	eht-&gt;data[8] |= LE32_DEC_ENC(data0, IWL_RX_PHY_DATA0_EHT_PS160,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_PS_160);</div><div class='add'>+	eht-&gt;data[8] |= LE32_DEC_ENC(data1, IWL_RX_PHY_DATA1_EHT_RU_ALLOC_B0,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_B0);</div><div class='add'>+	eht-&gt;data[8] |= LE32_DEC_ENC(data1, IWL_RX_PHY_DATA1_EHT_RU_ALLOC_B1_B7,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_B7_B1);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_decode_eht_ru(mvm, rx_status, eht);</div><div class='add'>+</div><div class='add'>+	/* We only get here in case of IWL_RX_MPDU_PHY_TSF_OVERLOAD is set</div><div class='add'>+	 * which is on only in case of monitor mode so no need to check monitor</div><div class='add'>+	 * mode</div><div class='add'>+	 */</div><div class='add'>+	eht-&gt;known |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_KNOWN_PRIMARY_80);</div><div class='add'>+	eht-&gt;data[1] |=</div><div class='add'>+		le32_encode_bits(mvm-&gt;monitor_p80,</div><div class='add'>+				 IEEE80211_RADIOTAP_EHT_DATA1_PRIMARY_80);</div><div class='add'>+</div><div class='add'>+	usig-&gt;common |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_USIG_COMMON_TXOP_KNOWN);</div><div class='add'>+	if (phy_data-&gt;with_data)</div><div class='add'>+		usig-&gt;common |= LE32_DEC_ENC(data0, IWL_RX_PHY_DATA0_EHT_TXOP_DUR_MASK,</div><div class='add'>+					     IEEE80211_RADIOTAP_EHT_USIG_COMMON_TXOP);</div><div class='add'>+	else</div><div class='add'>+		usig-&gt;common |= LE32_DEC_ENC(usig_a1, IWL_RX_USIG_A1_TXOP_DURATION,</div><div class='add'>+					     IEEE80211_RADIOTAP_EHT_USIG_COMMON_TXOP);</div><div class='add'>+</div><div class='add'>+	eht-&gt;known |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_KNOWN_LDPC_EXTRA_SYM_OM);</div><div class='add'>+	eht-&gt;data[0] |= LE32_DEC_ENC(data0, IWL_RX_PHY_DATA0_EHT_LDPC_EXT_SYM,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA0_LDPC_EXTRA_SYM_OM);</div><div class='add'>+</div><div class='add'>+	eht-&gt;known |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_KNOWN_PRE_PADD_FACOR_OM);</div><div class='add'>+	eht-&gt;data[0] |= LE32_DEC_ENC(data0, IWL_RX_PHY_DATA0_EHT_PRE_FEC_PAD_MASK,</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_DATA0_PRE_PADD_FACOR_OM);</div><div class='add'>+</div><div class='add'>+	eht-&gt;known |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_KNOWN_PE_DISAMBIGUITY_OM);</div><div class='add'>+	eht-&gt;data[0] |= LE32_DEC_ENC(data0, IWL_RX_PHY_DATA0_EHT_PE_DISAMBIG,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA0_PE_DISAMBIGUITY_OM);</div><div class='add'>+</div><div class='add'>+	/* TODO: what about IWL_RX_PHY_DATA0_EHT_BW320_SLOT */</div><div class='add'>+</div><div class='add'>+	if (!le32_get_bits(data0, IWL_RX_PHY_DATA0_EHT_SIGA_CRC_OK))</div><div class='add'>+		usig-&gt;common |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_USIG_COMMON_BAD_USIG_CRC);</div><div class='add'>+</div><div class='add'>+	usig-&gt;common |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_USIG_COMMON_PHY_VER_KNOWN);</div><div class='add'>+	usig-&gt;common |= LE32_DEC_ENC(data0, IWL_RX_PHY_DATA0_EHT_PHY_VER,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_USIG_COMMON_PHY_VER);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * TODO: what about TB - IWL_RX_PHY_DATA1_EHT_TB_PILOT_TYPE,</div><div class='add'>+	 *			 IWL_RX_PHY_DATA1_EHT_TB_LOW_SS</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	eht-&gt;known |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_KNOWN_EHT_LTF);</div><div class='add'>+	eht-&gt;data[0] |= LE32_DEC_ENC(data1, IWL_RX_PHY_DATA1_EHT_SIG_LTF_NUM,</div><div class='add'>+				     IEEE80211_RADIOTAP_EHT_DATA0_EHT_LTF);</div><div class='add'>+</div><div class='add'>+	if (info_type == IWL_RX_PHY_INFO_TYPE_EHT_TB_EXT ||</div><div class='add'>+	    info_type == IWL_RX_PHY_INFO_TYPE_EHT_TB)</div><div class='add'>+		iwl_mvm_decode_eht_ext_tb(mvm, phy_data, rx_status, eht, usig);</div><div class='add'>+</div><div class='add'>+	if (info_type == IWL_RX_PHY_INFO_TYPE_EHT_MU_EXT ||</div><div class='add'>+	    info_type == IWL_RX_PHY_INFO_TYPE_EHT_MU)</div><div class='add'>+		iwl_mvm_decode_eht_ext_mu(mvm, phy_data, rx_status, eht, usig);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_rx_eht(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='add'>+			   struct iwl_mvm_rx_phy_data *phy_data,</div><div class='add'>+			   int queue)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);</div><div class='add'>+</div><div class='add'>+	struct ieee80211_radiotap_eht *eht;</div><div class='add'>+	struct ieee80211_radiotap_eht_usig *usig;</div><div class='add'>+	size_t eht_len = sizeof(*eht);</div><div class='add'>+</div><div class='add'>+	u32 rate_n_flags = phy_data-&gt;rate_n_flags;</div><div class='add'>+	u32 he_type = rate_n_flags &amp; RATE_MCS_HE_TYPE_MSK;</div><div class='add'>+	/* EHT and HE have the same valus for LTF */</div><div class='add'>+	u8 ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_UNKNOWN;</div><div class='add'>+	u16 phy_info = phy_data-&gt;phy_info;</div><div class='add'>+	u32 bw;</div><div class='add'>+</div><div class='add'>+	/* u32 for 1 user_info */</div><div class='add'>+	if (phy_data-&gt;with_data)</div><div class='add'>+		eht_len += sizeof(u32);</div><div class='add'>+</div><div class='add'>+	eht = iwl_mvm_radiotap_put_tlv(skb, IEEE80211_RADIOTAP_EHT, eht_len);</div><div class='add'>+</div><div class='add'>+	usig = iwl_mvm_radiotap_put_tlv(skb, IEEE80211_RADIOTAP_EHT_USIG,</div><div class='add'>+					sizeof(*usig));</div><div class='add'>+	rx_status-&gt;flag |= RX_FLAG_RADIOTAP_TLV_AT_END;</div><div class='add'>+	usig-&gt;common |=</div><div class='add'>+		cpu_to_le32(IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_KNOWN);</div><div class='add'>+</div><div class='add'>+	/* specific handling for 320MHz */</div><div class='add'>+	bw = FIELD_GET(RATE_MCS_CHAN_WIDTH_MSK, rate_n_flags);</div><div class='add'>+	if (bw == RATE_MCS_CHAN_WIDTH_320_VAL)</div><div class='add'>+		bw += FIELD_GET(IWL_RX_PHY_DATA0_EHT_BW320_SLOT,</div><div class='add'>+				le32_to_cpu(phy_data-&gt;d0));</div><div class='add'>+</div><div class='add'>+	usig-&gt;common |= cpu_to_le32</div><div class='add'>+		(FIELD_PREP(IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW, bw));</div><div class='add'>+</div><div class='add'>+	/* report the AMPDU-EOF bit on single frames */</div><div class='add'>+	if (!queue &amp;&amp; !(phy_info &amp; IWL_RX_MPDU_PHY_AMPDU)) {</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_AMPDU_DETAILS;</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_AMPDU_EOF_BIT_KNOWN;</div><div class='add'>+		if (phy_data-&gt;d0 &amp; cpu_to_le32(IWL_RX_PHY_DATA0_EHT_DELIM_EOF))</div><div class='add'>+			rx_status-&gt;flag |= RX_FLAG_AMPDU_EOF_BIT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* update aggregation data for monitor sake on default queue */</div><div class='add'>+	if (!queue &amp;&amp; (phy_info &amp; IWL_RX_MPDU_PHY_TSF_OVERLOAD) &amp;&amp;</div><div class='add'>+	    (phy_info &amp; IWL_RX_MPDU_PHY_AMPDU) &amp;&amp; phy_data-&gt;first_subframe) {</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_AMPDU_EOF_BIT_KNOWN;</div><div class='add'>+		if (phy_data-&gt;d0 &amp; cpu_to_le32(IWL_RX_PHY_DATA0_EHT_DELIM_EOF))</div><div class='add'>+			rx_status-&gt;flag |= RX_FLAG_AMPDU_EOF_BIT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (phy_info &amp; IWL_RX_MPDU_PHY_TSF_OVERLOAD)</div><div class='add'>+		iwl_mvm_decode_eht_phy_data(mvm, phy_data, rx_status, eht, usig);</div><div class='add'>+</div><div class='add'>+#define CHECK_TYPE(F)							\</div><div class='add'>+	BUILD_BUG_ON(IEEE80211_RADIOTAP_HE_DATA1_FORMAT_ ## F !=	\</div><div class='add'>+		     (RATE_MCS_HE_TYPE_ ## F &gt;&gt; RATE_MCS_HE_TYPE_POS))</div><div class='add'>+</div><div class='add'>+	CHECK_TYPE(SU);</div><div class='add'>+	CHECK_TYPE(EXT_SU);</div><div class='add'>+	CHECK_TYPE(MU);</div><div class='add'>+	CHECK_TYPE(TRIG);</div><div class='add'>+</div><div class='add'>+	switch (FIELD_GET(RATE_MCS_HE_GI_LTF_MSK, rate_n_flags)) {</div><div class='add'>+	case 0:</div><div class='add'>+		if (he_type == RATE_MCS_HE_TYPE_TRIG) {</div><div class='add'>+			rx_status-&gt;eht.gi = NL80211_RATE_INFO_EHT_GI_1_6;</div><div class='add'>+			ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_1X;</div><div class='add'>+		} else {</div><div class='add'>+			rx_status-&gt;eht.gi = NL80211_RATE_INFO_EHT_GI_0_8;</div><div class='add'>+			ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_2X;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		rx_status-&gt;eht.gi = NL80211_RATE_INFO_EHT_GI_1_6;</div><div class='add'>+		ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_2X;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_4X;</div><div class='add'>+		if (he_type == RATE_MCS_HE_TYPE_TRIG)</div><div class='add'>+			rx_status-&gt;eht.gi = NL80211_RATE_INFO_EHT_GI_3_2;</div><div class='add'>+		else</div><div class='add'>+			rx_status-&gt;eht.gi = NL80211_RATE_INFO_EHT_GI_0_8;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		if (he_type != RATE_MCS_HE_TYPE_TRIG) {</div><div class='add'>+			ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_4X;</div><div class='add'>+			rx_status-&gt;eht.gi = NL80211_RATE_INFO_EHT_GI_3_2;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* nothing here */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ltf != IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_UNKNOWN) {</div><div class='add'>+		eht-&gt;known |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_KNOWN_GI);</div><div class='add'>+		eht-&gt;data[0] |= cpu_to_le32</div><div class='add'>+			(FIELD_PREP(IEEE80211_RADIOTAP_EHT_DATA0_LTF,</div><div class='add'>+				    ltf) |</div><div class='add'>+			 FIELD_PREP(IEEE80211_RADIOTAP_EHT_DATA0_GI,</div><div class='add'>+				    rx_status-&gt;eht.gi));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (!phy_data-&gt;with_data) {</div><div class='add'>+		eht-&gt;known |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_KNOWN_NSS_S |</div><div class='add'>+					  IEEE80211_RADIOTAP_EHT_KNOWN_BEAMFORMED_S);</div><div class='add'>+		eht-&gt;data[7] |=</div><div class='add'>+			le32_encode_bits(le32_get_bits(phy_data-&gt;rx_vec[2],</div><div class='add'>+						       RX_NO_DATA_RX_VEC2_EHT_NSTS_MSK),</div><div class='add'>+					 IEEE80211_RADIOTAP_EHT_DATA7_NSS_S);</div><div class='add'>+		if (rate_n_flags &amp; RATE_MCS_BF_MSK)</div><div class='add'>+			eht-&gt;data[7] |=</div><div class='add'>+				cpu_to_le32(IEEE80211_RADIOTAP_EHT_DATA7_BEAMFORMED_S);</div><div class='add'>+	} else {</div><div class='add'>+		eht-&gt;user_info[0] |=</div><div class='add'>+			cpu_to_le32(IEEE80211_RADIOTAP_EHT_USER_INFO_MCS_KNOWN |</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USER_INFO_CODING_KNOWN |</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_KNOWN_O |</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USER_INFO_BEAMFORMING_KNOWN_O |</div><div class='add'>+				    IEEE80211_RADIOTAP_EHT_USER_INFO_DATA_FOR_USER);</div><div class='add'>+</div><div class='add'>+		if (rate_n_flags &amp; RATE_MCS_BF_MSK)</div><div class='add'>+			eht-&gt;user_info[0] |=</div><div class='add'>+				cpu_to_le32(IEEE80211_RADIOTAP_EHT_USER_INFO_BEAMFORMING_O);</div><div class='add'>+</div><div class='add'>+		if (rate_n_flags &amp; RATE_MCS_LDPC_MSK)</div><div class='add'>+			eht-&gt;user_info[0] |=</div><div class='add'>+				cpu_to_le32(IEEE80211_RADIOTAP_EHT_USER_INFO_CODING);</div><div class='add'>+</div><div class='add'>+		eht-&gt;user_info[0] |= cpu_to_le32</div><div class='add'>+			(FIELD_PREP(IEEE80211_RADIOTAP_EHT_USER_INFO_MCS,</div><div class='add'>+				    FIELD_GET(RATE_VHT_MCS_RATE_CODE_MSK,</div><div class='add'>+					      rate_n_flags)) |</div><div class='add'>+			 FIELD_PREP(IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_O,</div><div class='add'>+				    FIELD_GET(RATE_MCS_NSS_MSK, rate_n_flags)));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void iwl_mvm_rx_he(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 			  struct iwl_mvm_rx_phy_data *phy_data,</div><div class='del'>-			  u32 rate_n_flags, u16 phy_info, int queue)</div><div class='add'>+			  int queue)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);</div><div class='ctx'> 	struct ieee80211_radiotap_he *he = NULL;</div><div class='ctx'> 	struct ieee80211_radiotap_he_mu *he_mu = NULL;</div><div class='add'>+	u32 rate_n_flags = phy_data-&gt;rate_n_flags;</div><div class='ctx'> 	u32 he_type = rate_n_flags &amp; RATE_MCS_HE_TYPE_MSK;</div><div class='del'>-	u8 stbc, ltf;</div><div class='add'>+	u8 ltf;</div><div class='ctx'> 	static const struct ieee80211_radiotap_he known = {</div><div class='ctx'> 		.data1 = cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_DATA_MCS_KNOWN |</div><div class='ctx'> 				     IEEE80211_RADIOTAP_HE_DATA1_DATA_DCM_KNOWN |</div><div class='hunk'>@@ -1446,6 +1815,7 @@ static void iwl_mvm_rx_he(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 		.flags2 = cpu_to_le16(IEEE80211_RADIOTAP_HE_MU_FLAGS2_PUNC_FROM_SIG_A_BW_KNOWN |</div><div class='ctx'> 				      IEEE80211_RADIOTAP_HE_MU_FLAGS2_BW_FROM_SIG_A_BW_KNOWN),</div><div class='ctx'> 	};</div><div class='add'>+	u16 phy_info = phy_data-&gt;phy_info;</div><div class='ctx'> </div><div class='ctx'> 	he = skb_put_data(skb, &amp;known, sizeof(known));</div><div class='ctx'> 	rx_status-&gt;flag |= RX_FLAG_RADIOTAP_HE;</div><div class='hunk'>@@ -1466,19 +1836,14 @@ static void iwl_mvm_rx_he(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	if (phy_info &amp; IWL_RX_MPDU_PHY_TSF_OVERLOAD)</div><div class='ctx'> 		iwl_mvm_decode_he_phy_data(mvm, phy_data, he, he_mu, rx_status,</div><div class='del'>-					   rate_n_flags, queue);</div><div class='add'>+					   queue);</div><div class='ctx'> </div><div class='ctx'> 	/* update aggregation data for monitor sake on default queue */</div><div class='ctx'> 	if (!queue &amp;&amp; (phy_info &amp; IWL_RX_MPDU_PHY_TSF_OVERLOAD) &amp;&amp;</div><div class='del'>-	    (phy_info &amp; IWL_RX_MPDU_PHY_AMPDU)) {</div><div class='del'>-		bool toggle_bit = phy_info &amp; IWL_RX_MPDU_PHY_AMPDU_TOGGLE;</div><div class='del'>-</div><div class='del'>-		/* toggle is switched whenever new aggregation starts */</div><div class='del'>-		if (toggle_bit != mvm-&gt;ampdu_toggle) {</div><div class='del'>-			rx_status-&gt;flag |= RX_FLAG_AMPDU_EOF_BIT_KNOWN;</div><div class='del'>-			if (phy_data-&gt;d0 &amp; cpu_to_le32(IWL_RX_PHY_DATA0_HE_DELIM_EOF))</div><div class='del'>-				rx_status-&gt;flag |= RX_FLAG_AMPDU_EOF_BIT;</div><div class='del'>-		}</div><div class='add'>+	    (phy_info &amp; IWL_RX_MPDU_PHY_AMPDU) &amp;&amp; phy_data-&gt;first_subframe) {</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_AMPDU_EOF_BIT_KNOWN;</div><div class='add'>+		if (phy_data-&gt;d0 &amp; cpu_to_le32(IWL_RX_PHY_DATA0_EHT_DELIM_EOF))</div><div class='add'>+			rx_status-&gt;flag |= RX_FLAG_AMPDU_EOF_BIT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (he_type == RATE_MCS_HE_TYPE_EXT_SU &amp;&amp;</div><div class='hunk'>@@ -1493,19 +1858,6 @@ static void iwl_mvm_rx_he(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 		he-&gt;data1 |=</div><div class='ctx'> 			cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_BW_RU_ALLOC_KNOWN);</div><div class='ctx'> </div><div class='del'>-	stbc = (rate_n_flags &amp; RATE_MCS_STBC_MSK) &gt;&gt; RATE_MCS_STBC_POS;</div><div class='del'>-	rx_status-&gt;nss =</div><div class='del'>-		((rate_n_flags &amp; RATE_VHT_MCS_NSS_MSK) &gt;&gt;</div><div class='del'>-					RATE_VHT_MCS_NSS_POS) + 1;</div><div class='del'>-	rx_status-&gt;rate_idx = rate_n_flags &amp; RATE_VHT_MCS_RATE_CODE_MSK;</div><div class='del'>-	rx_status-&gt;encoding = RX_ENC_HE;</div><div class='del'>-	rx_status-&gt;enc_flags |= stbc &lt;&lt; RX_ENC_FLAG_STBC_SHIFT;</div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_BF_MSK)</div><div class='del'>-		rx_status-&gt;enc_flags |= RX_ENC_FLAG_BF;</div><div class='del'>-</div><div class='del'>-	rx_status-&gt;he_dcm =</div><div class='del'>-		!!(rate_n_flags &amp; RATE_HE_DUAL_CARRIER_MODE_MSK);</div><div class='del'>-</div><div class='ctx'> #define CHECK_TYPE(F)							\</div><div class='ctx'> 	BUILD_BUG_ON(IEEE80211_RADIOTAP_HE_DATA1_FORMAT_ ## F !=	\</div><div class='ctx'> 		     (RATE_MCS_HE_TYPE_ ## F &gt;&gt; RATE_MCS_HE_TYPE_POS))</div><div class='hunk'>@@ -1549,14 +1901,15 @@ static void iwl_mvm_rx_he(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		if ((he_type == RATE_MCS_HE_TYPE_SU ||</div><div class='del'>-		     he_type == RATE_MCS_HE_TYPE_EXT_SU) &amp;&amp;</div><div class='del'>-		    rate_n_flags &amp; RATE_MCS_SGI_MSK)</div><div class='del'>-			rx_status-&gt;he_gi = NL80211_RATE_INFO_HE_GI_0_8;</div><div class='del'>-		else</div><div class='del'>-			rx_status-&gt;he_gi = NL80211_RATE_INFO_HE_GI_3_2;</div><div class='add'>+		rx_status-&gt;he_gi = NL80211_RATE_INFO_HE_GI_3_2;</div><div class='add'>+		ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_4X;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		rx_status-&gt;he_gi = NL80211_RATE_INFO_HE_GI_0_8;</div><div class='ctx'> 		ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_4X;</div><div class='ctx'> 		break;</div><div class='add'>+	default:</div><div class='add'>+		ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_UNKNOWN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	he-&gt;data5 |= le16_encode_bits(ltf,</div><div class='hunk'>@@ -1578,6 +1931,10 @@ static void iwl_mvm_decode_lsig(struct sk_buff *skb,</div><div class='ctx'> 	case IWL_RX_PHY_INFO_TYPE_HE_MU:</div><div class='ctx'> 	case IWL_RX_PHY_INFO_TYPE_HE_MU_EXT:</div><div class='ctx'> 	case IWL_RX_PHY_INFO_TYPE_HE_TB:</div><div class='add'>+	case IWL_RX_PHY_INFO_TYPE_EHT_MU:</div><div class='add'>+	case IWL_RX_PHY_INFO_TYPE_EHT_TB:</div><div class='add'>+	case IWL_RX_PHY_INFO_TYPE_EHT_MU_EXT:</div><div class='add'>+	case IWL_RX_PHY_INFO_TYPE_EHT_TB_EXT:</div><div class='ctx'> 		lsig = skb_put(skb, sizeof(*lsig));</div><div class='ctx'> 		lsig-&gt;data1 = cpu_to_le16(IEEE80211_RADIOTAP_LSIG_DATA1_LENGTH_KNOWN);</div><div class='ctx'> 		lsig-&gt;data2 = le16_encode_bits(le32_get_bits(phy_data-&gt;d1,</div><div class='hunk'>@@ -1590,21 +1947,6 @@ static void iwl_mvm_decode_lsig(struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u8 iwl_mvm_nl80211_band_from_rx_msdu(u8 phy_band)</div><div class='del'>-{</div><div class='del'>-	switch (phy_band) {</div><div class='del'>-	case PHY_BAND_24:</div><div class='del'>-		return NL80211_BAND_2GHZ;</div><div class='del'>-	case PHY_BAND_5:</div><div class='del'>-		return NL80211_BAND_5GHZ;</div><div class='del'>-	case PHY_BAND_6:</div><div class='del'>-		return NL80211_BAND_6GHZ;</div><div class='del'>-	default:</div><div class='del'>-		WARN_ONCE(1, "Unsupported phy band (%u)\n", phy_band);</div><div class='del'>-		return NL80211_BAND_5GHZ;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct iwl_rx_sta_csa {</div><div class='ctx'> 	bool all_sta_unblocked;</div><div class='ctx'> 	struct ieee80211_vif *vif;</div><div class='hunk'>@@ -1622,6 +1964,134 @@ static void iwl_mvm_rx_get_sta_block_tx(void *data, struct ieee80211_sta *sta)</div><div class='ctx'> 		rx_sta_csa-&gt;all_sta_unblocked = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Note: requires also rx_status-&gt;band to be prefilled, as well</div><div class='add'>+ * as phy_data (apart from phy_data-&gt;info_type)</div><div class='add'>+ * Note: desc/hdr may be NULL</div><div class='add'>+ */</div><div class='add'>+static void iwl_mvm_rx_fill_status(struct iwl_mvm *mvm,</div><div class='add'>+				   struct iwl_rx_mpdu_desc *desc,</div><div class='add'>+				   struct ieee80211_hdr *hdr,</div><div class='add'>+				   struct sk_buff *skb,</div><div class='add'>+				   struct iwl_mvm_rx_phy_data *phy_data,</div><div class='add'>+				   int queue)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);</div><div class='add'>+	u32 rate_n_flags = phy_data-&gt;rate_n_flags;</div><div class='add'>+	u8 stbc = u32_get_bits(rate_n_flags, RATE_MCS_STBC_MSK);</div><div class='add'>+	u32 format = rate_n_flags &amp; RATE_MCS_MOD_TYPE_MSK;</div><div class='add'>+	bool is_sgi;</div><div class='add'>+</div><div class='add'>+	phy_data-&gt;info_type = IWL_RX_PHY_INFO_TYPE_NONE;</div><div class='add'>+</div><div class='add'>+	if (phy_data-&gt;phy_info &amp; IWL_RX_MPDU_PHY_TSF_OVERLOAD)</div><div class='add'>+		phy_data-&gt;info_type =</div><div class='add'>+			le32_get_bits(phy_data-&gt;d1,</div><div class='add'>+				      IWL_RX_PHY_DATA1_INFO_TYPE_MASK);</div><div class='add'>+</div><div class='add'>+	/* This may be overridden by iwl_mvm_rx_he() to HE_RU */</div><div class='add'>+	switch (rate_n_flags &amp; RATE_MCS_CHAN_WIDTH_MSK) {</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_20:</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_40:</div><div class='add'>+		rx_status-&gt;bw = RATE_INFO_BW_40;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_80:</div><div class='add'>+		rx_status-&gt;bw = RATE_INFO_BW_80;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_160:</div><div class='add'>+		rx_status-&gt;bw = RATE_INFO_BW_160;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_CHAN_WIDTH_320:</div><div class='add'>+		rx_status-&gt;bw = RATE_INFO_BW_320;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* must be before L-SIG data */</div><div class='add'>+	if (format == RATE_MCS_MOD_TYPE_HE)</div><div class='add'>+		iwl_mvm_rx_he(mvm, skb, phy_data, queue);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_decode_lsig(skb, phy_data);</div><div class='add'>+</div><div class='add'>+	rx_status-&gt;device_timestamp = phy_data-&gt;gp2_on_air_rise;</div><div class='add'>+</div><div class='add'>+	if (mvm-&gt;rx_ts_ptp &amp;&amp; mvm-&gt;monitor_on) {</div><div class='add'>+		u64 adj_time =</div><div class='add'>+			iwl_mvm_ptp_get_adj_time(mvm, phy_data-&gt;gp2_on_air_rise * NSEC_PER_USEC);</div><div class='add'>+</div><div class='add'>+		rx_status-&gt;mactime = div64_u64(adj_time, NSEC_PER_USEC);</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_MACTIME_IS_RTAP_TS64;</div><div class='add'>+		rx_status-&gt;flag &amp;= ~RX_FLAG_MACTIME;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_status-&gt;freq = ieee80211_channel_to_frequency(phy_data-&gt;channel,</div><div class='add'>+							 rx_status-&gt;band);</div><div class='add'>+	iwl_mvm_get_signal_strength(mvm, desc, hdr, rx_status, rate_n_flags,</div><div class='add'>+				    phy_data-&gt;energy_a, phy_data-&gt;energy_b);</div><div class='add'>+</div><div class='add'>+	/* using TLV format and must be after all fixed len fields */</div><div class='add'>+	if (format == RATE_MCS_MOD_TYPE_EHT)</div><div class='add'>+		iwl_mvm_rx_eht(mvm, skb, phy_data, queue);</div><div class='add'>+</div><div class='add'>+	if (unlikely(mvm-&gt;monitor_on))</div><div class='add'>+		iwl_mvm_add_rtap_sniffer_config(mvm, skb);</div><div class='add'>+</div><div class='add'>+	is_sgi = format == RATE_MCS_MOD_TYPE_HE ?</div><div class='add'>+		iwl_he_is_sgi(rate_n_flags) :</div><div class='add'>+		rate_n_flags &amp; RATE_MCS_SGI_MSK;</div><div class='add'>+</div><div class='add'>+	if (!(format == RATE_MCS_MOD_TYPE_CCK) &amp;&amp; is_sgi)</div><div class='add'>+		rx_status-&gt;enc_flags |= RX_ENC_FLAG_SHORT_GI;</div><div class='add'>+</div><div class='add'>+	if (rate_n_flags &amp; RATE_MCS_LDPC_MSK)</div><div class='add'>+		rx_status-&gt;enc_flags |= RX_ENC_FLAG_LDPC;</div><div class='add'>+</div><div class='add'>+	switch (format) {</div><div class='add'>+	case RATE_MCS_MOD_TYPE_VHT:</div><div class='add'>+		rx_status-&gt;encoding = RX_ENC_VHT;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_HE:</div><div class='add'>+		rx_status-&gt;encoding = RX_ENC_HE;</div><div class='add'>+		rx_status-&gt;he_dcm =</div><div class='add'>+			!!(rate_n_flags &amp; RATE_HE_DUAL_CARRIER_MODE_MSK);</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_EHT:</div><div class='add'>+		rx_status-&gt;encoding = RX_ENC_EHT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (format) {</div><div class='add'>+	case RATE_MCS_MOD_TYPE_HT:</div><div class='add'>+		rx_status-&gt;encoding = RX_ENC_HT;</div><div class='add'>+		rx_status-&gt;rate_idx = RATE_HT_MCS_INDEX(rate_n_flags);</div><div class='add'>+		rx_status-&gt;enc_flags |= stbc &lt;&lt; RX_ENC_FLAG_STBC_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_VHT:</div><div class='add'>+	case RATE_MCS_MOD_TYPE_HE:</div><div class='add'>+	case RATE_MCS_MOD_TYPE_EHT:</div><div class='add'>+		rx_status-&gt;nss =</div><div class='add'>+			u32_get_bits(rate_n_flags, RATE_MCS_NSS_MSK) + 1;</div><div class='add'>+		rx_status-&gt;rate_idx = rate_n_flags &amp; RATE_MCS_CODE_MSK;</div><div class='add'>+		rx_status-&gt;enc_flags |= stbc &lt;&lt; RX_ENC_FLAG_STBC_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	default: {</div><div class='add'>+		int rate = iwl_mvm_legacy_hw_idx_to_mac80211_idx(rate_n_flags,</div><div class='add'>+								 rx_status-&gt;band);</div><div class='add'>+</div><div class='add'>+		rx_status-&gt;rate_idx = rate;</div><div class='add'>+</div><div class='add'>+		if ((rate &lt; 0 || rate &gt; 0xFF)) {</div><div class='add'>+			rx_status-&gt;rate_idx = 0;</div><div class='add'>+			if (net_ratelimit())</div><div class='add'>+				IWL_ERR(mvm, "Invalid rate flags 0x%x, band %d,\n",</div><div class='add'>+					rate_n_flags, rx_status-&gt;band);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 			struct iwl_rx_cmd_buffer *rxb, int queue)</div><div class='ctx'> {</div><div class='hunk'>@@ -1631,21 +2101,17 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='ctx'> 	u32 len;</div><div class='ctx'> 	u32 pkt_len = iwl_rx_packet_payload_len(pkt);</div><div class='del'>-	u32 rate_n_flags, gp2_on_air_rise;</div><div class='del'>-	u16 phy_info;</div><div class='ctx'> 	struct ieee80211_sta *sta = NULL;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	u8 crypt_len = 0, channel, energy_a, energy_b;</div><div class='add'>+	u8 crypt_len = 0;</div><div class='ctx'> 	size_t desc_size;</div><div class='del'>-	struct iwl_mvm_rx_phy_data phy_data = {</div><div class='del'>-		.info_type = IWL_RX_PHY_INFO_TYPE_NONE,</div><div class='del'>-	};</div><div class='del'>-	bool csi = false;</div><div class='add'>+	struct iwl_mvm_rx_phy_data phy_data = {};</div><div class='add'>+	u32 format;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (mvm-&gt;trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='ctx'> 		desc_size = sizeof(*desc);</div><div class='ctx'> 	else</div><div class='ctx'> 		desc_size = IWL_RX_DESC_SIZE_V1;</div><div class='hunk'>@@ -1655,23 +2121,29 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mvm-&gt;trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='del'>-		rate_n_flags = le32_to_cpu(desc-&gt;v3.rate_n_flags);</div><div class='del'>-		channel = desc-&gt;v3.channel;</div><div class='del'>-		gp2_on_air_rise = le32_to_cpu(desc-&gt;v3.gp2_on_air_rise);</div><div class='del'>-		energy_a = desc-&gt;v3.energy_a;</div><div class='del'>-		energy_b = desc-&gt;v3.energy_b;</div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+		phy_data.rate_n_flags =</div><div class='add'>+			iwl_mvm_v3_rate_from_fw(desc-&gt;v3.rate_n_flags,</div><div class='add'>+						mvm-&gt;fw_rates_ver);</div><div class='add'>+		phy_data.channel = desc-&gt;v3.channel;</div><div class='add'>+		phy_data.gp2_on_air_rise = le32_to_cpu(desc-&gt;v3.gp2_on_air_rise);</div><div class='add'>+		phy_data.energy_a = desc-&gt;v3.energy_a;</div><div class='add'>+		phy_data.energy_b = desc-&gt;v3.energy_b;</div><div class='ctx'> </div><div class='ctx'> 		phy_data.d0 = desc-&gt;v3.phy_data0;</div><div class='ctx'> 		phy_data.d1 = desc-&gt;v3.phy_data1;</div><div class='ctx'> 		phy_data.d2 = desc-&gt;v3.phy_data2;</div><div class='ctx'> 		phy_data.d3 = desc-&gt;v3.phy_data3;</div><div class='add'>+		phy_data.eht_d4 = desc-&gt;phy_eht_data4;</div><div class='add'>+		phy_data.d5 = desc-&gt;v3.phy_data5;</div><div class='ctx'> 	} else {</div><div class='del'>-		rate_n_flags = le32_to_cpu(desc-&gt;v1.rate_n_flags);</div><div class='del'>-		channel = desc-&gt;v1.channel;</div><div class='del'>-		gp2_on_air_rise = le32_to_cpu(desc-&gt;v1.gp2_on_air_rise);</div><div class='del'>-		energy_a = desc-&gt;v1.energy_a;</div><div class='del'>-		energy_b = desc-&gt;v1.energy_b;</div><div class='add'>+		phy_data.rate_n_flags =</div><div class='add'>+			iwl_mvm_v3_rate_from_fw(desc-&gt;v1.rate_n_flags,</div><div class='add'>+						mvm-&gt;fw_rates_ver);</div><div class='add'>+		phy_data.channel = desc-&gt;v1.channel;</div><div class='add'>+		phy_data.gp2_on_air_rise = le32_to_cpu(desc-&gt;v1.gp2_on_air_rise);</div><div class='add'>+		phy_data.energy_a = desc-&gt;v1.energy_a;</div><div class='add'>+		phy_data.energy_b = desc-&gt;v1.energy_b;</div><div class='ctx'> </div><div class='ctx'> 		phy_data.d0 = desc-&gt;v1.phy_data0;</div><div class='ctx'> 		phy_data.d1 = desc-&gt;v1.phy_data1;</div><div class='hunk'>@@ -1679,6 +2151,8 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 		phy_data.d3 = desc-&gt;v1.phy_data3;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	format = phy_data.rate_n_flags &amp; RATE_MCS_MOD_TYPE_MSK;</div><div class='add'>+</div><div class='ctx'> 	len = le16_to_cpu(desc-&gt;mpdu_len);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(len + desc_size &gt; pkt_len)) {</div><div class='hunk'>@@ -1686,14 +2160,10 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	phy_info = le16_to_cpu(desc-&gt;phy_info);</div><div class='add'>+	phy_data.with_data = true;</div><div class='add'>+	phy_data.phy_info = le16_to_cpu(desc-&gt;phy_info);</div><div class='ctx'> 	phy_data.d4 = desc-&gt;phy_data4;</div><div class='ctx'> </div><div class='del'>-	if (phy_info &amp; IWL_RX_MPDU_PHY_TSF_OVERLOAD)</div><div class='del'>-		phy_data.info_type =</div><div class='del'>-			le32_get_bits(phy_data.d1,</div><div class='del'>-				      IWL_RX_PHY_DATA1_INFO_TYPE_MASK);</div><div class='del'>-</div><div class='ctx'> 	hdr = (void *)(pkt-&gt;data + desc_size);</div><div class='ctx'> 	/* Dont use dev_alloc_skb(), we'll have enough headroom once</div><div class='ctx'> 	 * ieee80211_hdr pulled.</div><div class='hunk'>@@ -1716,27 +2186,6 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> </div><div class='ctx'> 	rx_status = IEEE80211_SKB_RXCB(skb);</div><div class='ctx'> </div><div class='del'>-	/* This may be overridden by iwl_mvm_rx_he() to HE_RU */</div><div class='del'>-	switch (rate_n_flags &amp; RATE_MCS_CHAN_WIDTH_MSK) {</div><div class='del'>-	case RATE_MCS_CHAN_WIDTH_20:</div><div class='del'>-		break;</div><div class='del'>-	case RATE_MCS_CHAN_WIDTH_40:</div><div class='del'>-		rx_status-&gt;bw = RATE_INFO_BW_40;</div><div class='del'>-		break;</div><div class='del'>-	case RATE_MCS_CHAN_WIDTH_80:</div><div class='del'>-		rx_status-&gt;bw = RATE_INFO_BW_80;</div><div class='del'>-		break;</div><div class='del'>-	case RATE_MCS_CHAN_WIDTH_160:</div><div class='del'>-		rx_status-&gt;bw = RATE_INFO_BW_160;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_HE_MSK)</div><div class='del'>-		iwl_mvm_rx_he(mvm, skb, &amp;phy_data, rate_n_flags,</div><div class='del'>-			      phy_info, queue);</div><div class='del'>-</div><div class='del'>-	iwl_mvm_decode_lsig(skb, &amp;phy_data);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Keep packets with CRC errors (and with overrun) for monitor mode</div><div class='ctx'> 	 * (otherwise the firmware discards them) but mark them as bad.</div><div class='hunk'>@@ -1747,15 +2196,16 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 			     le32_to_cpu(desc-&gt;status));</div><div class='ctx'> 		rx_status-&gt;flag |= RX_FLAG_FAILED_FCS_CRC;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/* set the preamble flag if appropriate */</div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_CCK_MSK &amp;&amp;</div><div class='del'>-	    phy_info &amp; IWL_RX_MPDU_PHY_SHORT_PREAMBLE)</div><div class='add'>+	if (format == RATE_MCS_MOD_TYPE_CCK &amp;&amp;</div><div class='add'>+	    phy_data.phy_info &amp; IWL_RX_MPDU_PHY_SHORT_PREAMBLE)</div><div class='ctx'> 		rx_status-&gt;enc_flags |= RX_ENC_FLAG_SHORTPRE;</div><div class='ctx'> </div><div class='del'>-	if (likely(!(phy_info &amp; IWL_RX_MPDU_PHY_TSF_OVERLOAD))) {</div><div class='add'>+	if (likely(!(phy_data.phy_info &amp; IWL_RX_MPDU_PHY_TSF_OVERLOAD))) {</div><div class='ctx'> 		u64 tsf_on_air_rise;</div><div class='ctx'> </div><div class='del'>-		if (mvm-&gt;trans-&gt;trans_cfg-&gt;device_family &gt;=</div><div class='add'>+		if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;=</div><div class='ctx'> 		    IWL_DEVICE_FAMILY_AX210)</div><div class='ctx'> 			tsf_on_air_rise = le64_to_cpu(desc-&gt;v3.tsf_on_air_rise);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1766,24 +2216,21 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 		rx_status-&gt;flag |= RX_FLAG_MACTIME_PLCP_START;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rx_status-&gt;device_timestamp = gp2_on_air_rise;</div><div class='ctx'> 	if (iwl_mvm_is_band_in_rx_supported(mvm)) {</div><div class='del'>-		u8 band = BAND_IN_RX_STATUS(desc-&gt;mac_phy_idx);</div><div class='add'>+		u8 band = u8_get_bits(desc-&gt;mac_phy_band,</div><div class='add'>+				      IWL_RX_MPDU_MAC_PHY_BAND_BAND_MASK);</div><div class='ctx'> </div><div class='del'>-		rx_status-&gt;band = iwl_mvm_nl80211_band_from_rx_msdu(band);</div><div class='add'>+		rx_status-&gt;band = iwl_mvm_nl80211_band_from_phy(band);</div><div class='ctx'> 	} else {</div><div class='del'>-		rx_status-&gt;band = channel &gt; 14 ? NL80211_BAND_5GHZ :</div><div class='add'>+		rx_status-&gt;band = phy_data.channel &gt; 14 ? NL80211_BAND_5GHZ :</div><div class='ctx'> 			NL80211_BAND_2GHZ;</div><div class='ctx'> 	}</div><div class='del'>-	rx_status-&gt;freq = ieee80211_channel_to_frequency(channel,</div><div class='del'>-							 rx_status-&gt;band);</div><div class='del'>-	iwl_mvm_get_signal_strength(mvm, rx_status, rate_n_flags, energy_a,</div><div class='del'>-				    energy_b);</div><div class='ctx'> </div><div class='ctx'> 	/* update aggregation data for monitor sake on default queue */</div><div class='del'>-	if (!queue &amp;&amp; (phy_info &amp; IWL_RX_MPDU_PHY_AMPDU)) {</div><div class='del'>-		bool toggle_bit = phy_info &amp; IWL_RX_MPDU_PHY_AMPDU_TOGGLE;</div><div class='add'>+	if (!queue &amp;&amp; (phy_data.phy_info &amp; IWL_RX_MPDU_PHY_AMPDU)) {</div><div class='add'>+		bool toggle_bit;</div><div class='ctx'> </div><div class='add'>+		toggle_bit = phy_data.phy_info &amp; IWL_RX_MPDU_PHY_AMPDU_TOGGLE;</div><div class='ctx'> 		rx_status-&gt;flag |= RX_FLAG_AMPDU_DETAILS;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Toggle is switched whenever new aggregation starts. Make</div><div class='hunk'>@@ -1795,22 +2242,29 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 			if (mvm-&gt;ampdu_ref == 0)</div><div class='ctx'> 				mvm-&gt;ampdu_ref++;</div><div class='ctx'> 			mvm-&gt;ampdu_toggle = toggle_bit;</div><div class='add'>+			phy_data.first_subframe = true;</div><div class='ctx'> 		}</div><div class='ctx'> 		rx_status-&gt;ampdu_reference = mvm-&gt;ampdu_ref;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(mvm-&gt;monitor_on))</div><div class='del'>-		iwl_mvm_add_rtap_sniffer_config(mvm, skb);</div><div class='del'>-</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	if (desc-&gt;status &amp; cpu_to_le32(IWL_RX_MPDU_STATUS_SRC_STA_FOUND)) {</div><div class='del'>-		u8 id = le32_get_bits(desc-&gt;status, IWL_RX_MPDU_STATUS_STA_ID);</div><div class='add'>+		u8 sta_id = le32_get_bits(desc-&gt;status,</div><div class='add'>+					  IWL_RX_MPDU_STATUS_STA_ID);</div><div class='add'>+</div><div class='add'>+		if (!WARN_ON_ONCE(sta_id &gt;= mvm-&gt;fw-&gt;ucode_capa.num_stations)) {</div><div class='add'>+			struct ieee80211_link_sta *link_sta;</div><div class='ctx'> </div><div class='del'>-		if (!WARN_ON_ONCE(id &gt;= mvm-&gt;fw-&gt;ucode_capa.num_stations)) {</div><div class='del'>-			sta = rcu_dereference(mvm-&gt;fw_id_to_mac_id[id]);</div><div class='add'>+			sta = rcu_dereference(mvm-&gt;fw_id_to_mac_id[sta_id]);</div><div class='ctx'> 			if (IS_ERR(sta))</div><div class='ctx'> 				sta = NULL;</div><div class='add'>+			link_sta = rcu_dereference(mvm-&gt;fw_id_to_link_sta[sta_id]);</div><div class='add'>+</div><div class='add'>+			if (sta &amp;&amp; sta-&gt;valid_links &amp;&amp; link_sta) {</div><div class='add'>+				rx_status-&gt;link_valid = 1;</div><div class='add'>+				rx_status-&gt;link_id = link_sta-&gt;link_id;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (!is_multicast_ether_addr(hdr-&gt;addr2)) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1820,13 +2274,15 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 		sta = ieee80211_find_sta_by_ifaddr(mvm-&gt;hw, hdr-&gt;addr2, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (iwl_mvm_rx_crypto(mvm, sta, hdr, rx_status, phy_info, desc,</div><div class='add'>+	if (iwl_mvm_rx_crypto(mvm, sta, hdr, rx_status, phy_data.phy_info, desc,</div><div class='ctx'> 			      le32_to_cpu(pkt-&gt;len_n_flags), queue,</div><div class='ctx'> 			      &amp;crypt_len)) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	iwl_mvm_rx_fill_status(mvm, desc, hdr, skb, &amp;phy_data, queue);</div><div class='add'>+</div><div class='ctx'> 	if (sta) {</div><div class='ctx'> 		struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> 		struct ieee80211_vif *tx_blocked_vif =</div><div class='hunk'>@@ -1867,7 +2323,7 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 				RCU_INIT_POINTER(mvm-&gt;csa_tx_blocked_vif, NULL);</div><div class='ctx'> 				/* Unblock BCAST / MCAST station */</div><div class='ctx'> 				iwl_mvm_modify_all_sta_disable_tx(mvm, mvmvif, false);</div><div class='del'>-				cancel_delayed_work_sync(&amp;mvm-&gt;cs_tx_unblock_dwork);</div><div class='add'>+				cancel_delayed_work(&amp;mvm-&gt;cs_tx_unblock_dwork);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1893,6 +2349,8 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 			iwl_mvm_rx_csum(mvm, sta, skb, pkt);</div><div class='ctx'> </div><div class='ctx'> 		if (iwl_mvm_is_dup(sta, queue, rx_status, hdr, desc)) {</div><div class='add'>+			IWL_DEBUG_DROP(mvm, "Dropping duplicate packet 0x%x\n",</div><div class='add'>+				       le16_to_cpu(hdr-&gt;seq_ctrl));</div><div class='ctx'> 			kfree_skb(skb);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1909,7 +2367,7 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> </div><div class='ctx'> 			*qc &amp;= ~IEEE80211_QOS_CTL_A_MSDU_PRESENT;</div><div class='ctx'> </div><div class='del'>-			if (mvm-&gt;trans-&gt;trans_cfg-&gt;device_family ==</div><div class='add'>+			if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family ==</div><div class='ctx'> 			    IWL_DEVICE_FAMILY_9000) {</div><div class='ctx'> 				iwl_mvm_flip_address(hdr-&gt;addr3);</div><div class='ctx'> </div><div class='hunk'>@@ -1924,43 +2382,6 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(rate_n_flags &amp; RATE_MCS_CCK_MSK) &amp;&amp;</div><div class='del'>-	    rate_n_flags &amp; RATE_MCS_SGI_MSK)</div><div class='del'>-		rx_status-&gt;enc_flags |= RX_ENC_FLAG_SHORT_GI;</div><div class='del'>-	if (rate_n_flags &amp; RATE_HT_MCS_GF_MSK)</div><div class='del'>-		rx_status-&gt;enc_flags |= RX_ENC_FLAG_HT_GF;</div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_LDPC_MSK)</div><div class='del'>-		rx_status-&gt;enc_flags |= RX_ENC_FLAG_LDPC;</div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_HT_MSK) {</div><div class='del'>-		u8 stbc = (rate_n_flags &amp; RATE_MCS_STBC_MSK) &gt;&gt;</div><div class='del'>-				RATE_MCS_STBC_POS;</div><div class='del'>-		rx_status-&gt;encoding = RX_ENC_HT;</div><div class='del'>-		rx_status-&gt;rate_idx = rate_n_flags &amp; RATE_HT_MCS_INDEX_MSK;</div><div class='del'>-		rx_status-&gt;enc_flags |= stbc &lt;&lt; RX_ENC_FLAG_STBC_SHIFT;</div><div class='del'>-	} else if (rate_n_flags &amp; RATE_MCS_VHT_MSK) {</div><div class='del'>-		u8 stbc = (rate_n_flags &amp; RATE_MCS_STBC_MSK) &gt;&gt;</div><div class='del'>-				RATE_MCS_STBC_POS;</div><div class='del'>-		rx_status-&gt;nss =</div><div class='del'>-			((rate_n_flags &amp; RATE_VHT_MCS_NSS_MSK) &gt;&gt;</div><div class='del'>-						RATE_VHT_MCS_NSS_POS) + 1;</div><div class='del'>-		rx_status-&gt;rate_idx = rate_n_flags &amp; RATE_VHT_MCS_RATE_CODE_MSK;</div><div class='del'>-		rx_status-&gt;encoding = RX_ENC_VHT;</div><div class='del'>-		rx_status-&gt;enc_flags |= stbc &lt;&lt; RX_ENC_FLAG_STBC_SHIFT;</div><div class='del'>-		if (rate_n_flags &amp; RATE_MCS_BF_MSK)</div><div class='del'>-			rx_status-&gt;enc_flags |= RX_ENC_FLAG_BF;</div><div class='del'>-	} else if (!(rate_n_flags &amp; RATE_MCS_HE_MSK)) {</div><div class='del'>-		int rate = iwl_mvm_legacy_rate_to_mac80211_idx(rate_n_flags,</div><div class='del'>-							       rx_status-&gt;band);</div><div class='del'>-</div><div class='del'>-		if (WARN(rate &lt; 0 || rate &gt; 0xFF,</div><div class='del'>-			 "Invalid rate flags 0x%x, band %d,\n",</div><div class='del'>-			 rate_n_flags, rx_status-&gt;band)) {</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		rx_status-&gt;rate_idx = rate;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* management stuff on default queue */</div><div class='ctx'> 	if (!queue) {</div><div class='ctx'> 		if (unlikely((ieee80211_is_beacon(hdr-&gt;frame_control) ||</div><div class='hunk'>@@ -1979,9 +2400,16 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!iwl_mvm_reorder(mvm, napi, queue, sta, skb, desc))</div><div class='del'>-		iwl_mvm_pass_packet_to_mac80211(mvm, napi, skb, queue,</div><div class='del'>-						sta, csi);</div><div class='add'>+	if (!iwl_mvm_reorder(mvm, napi, queue, sta, skb, desc) &amp;&amp;</div><div class='add'>+	    likely(!iwl_mvm_time_sync_frame(mvm, skb, hdr-&gt;addr2)) &amp;&amp;</div><div class='add'>+	    likely(!iwl_mvm_mei_filter_scan(mvm, skb))) {</div><div class='add'>+		if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family == IWL_DEVICE_FAMILY_9000 &amp;&amp;</div><div class='add'>+		    (desc-&gt;mac_flags2 &amp; IWL_RX_MPDU_MFLG2_AMSDU) &amp;&amp;</div><div class='add'>+		    !(desc-&gt;amsdu_info &amp; IWL_RX_MPDU_AMSDU_LAST_SUBFRAME))</div><div class='add'>+			rx_status-&gt;flag |= RX_FLAG_AMSDU_MORE;</div><div class='add'>+</div><div class='add'>+		iwl_mvm_pass_packet_to_mac80211(mvm, napi, skb, queue, sta);</div><div class='add'>+	}</div><div class='ctx'> out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='hunk'>@@ -1991,33 +2419,49 @@ void iwl_mvm_rx_monitor_no_data(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_rx_status *rx_status;</div><div class='ctx'> 	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl_rx_no_data *desc = (void *)pkt-&gt;data;</div><div class='del'>-	u32 rate_n_flags = le32_to_cpu(desc-&gt;rate);</div><div class='del'>-	u32 gp2_on_air_rise = le32_to_cpu(desc-&gt;on_air_rise_time);</div><div class='del'>-	u32 rssi = le32_to_cpu(desc-&gt;rssi);</div><div class='del'>-	u32 info_type = le32_to_cpu(desc-&gt;info) &amp; RX_NO_DATA_INFO_TYPE_MSK;</div><div class='del'>-	u16 phy_info = IWL_RX_MPDU_PHY_TSF_OVERLOAD;</div><div class='add'>+	struct iwl_rx_no_data_ver_3 *desc = (void *)pkt-&gt;data;</div><div class='add'>+	u32 rssi;</div><div class='ctx'> 	struct ieee80211_sta *sta = NULL;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	u8 channel, energy_a, energy_b;</div><div class='del'>-	struct iwl_mvm_rx_phy_data phy_data = {</div><div class='del'>-		.d0 = desc-&gt;phy_info[0],</div><div class='del'>-		.info_type = IWL_RX_PHY_INFO_TYPE_NONE,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (unlikely(iwl_rx_packet_payload_len(pkt) &lt; sizeof(*desc)))</div><div class='del'>-		return;</div><div class='add'>+	struct iwl_mvm_rx_phy_data phy_data;</div><div class='add'>+	u32 format;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	energy_a = (rssi &amp; RX_NO_DATA_CHAIN_A_MSK) &gt;&gt; RX_NO_DATA_CHAIN_A_POS;</div><div class='del'>-	energy_b = (rssi &amp; RX_NO_DATA_CHAIN_B_MSK) &gt;&gt; RX_NO_DATA_CHAIN_B_POS;</div><div class='del'>-	channel = (rssi &amp; RX_NO_DATA_CHANNEL_MSK) &gt;&gt; RX_NO_DATA_CHANNEL_POS;</div><div class='add'>+	if (unlikely(iwl_rx_packet_payload_len(pkt) &lt; sizeof(struct iwl_rx_no_data)))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	phy_data.info_type =</div><div class='del'>-		le32_get_bits(desc-&gt;phy_info[1],</div><div class='del'>-			      IWL_RX_PHY_DATA1_INFO_TYPE_MASK);</div><div class='add'>+	rssi = le32_to_cpu(desc-&gt;rssi);</div><div class='add'>+	phy_data.d0 = desc-&gt;phy_info[0];</div><div class='add'>+	phy_data.d1 = desc-&gt;phy_info[1];</div><div class='add'>+	phy_data.phy_info = IWL_RX_MPDU_PHY_TSF_OVERLOAD;</div><div class='add'>+	phy_data.gp2_on_air_rise = le32_to_cpu(desc-&gt;on_air_rise_time);</div><div class='add'>+	phy_data.energy_a = u32_get_bits(rssi, RX_NO_DATA_CHAIN_A_MSK);</div><div class='add'>+	phy_data.energy_b = u32_get_bits(rssi, RX_NO_DATA_CHAIN_B_MSK);</div><div class='add'>+	phy_data.channel = u32_get_bits(rssi, RX_NO_DATA_CHANNEL_MSK);</div><div class='add'>+	phy_data.with_data = false;</div><div class='add'>+	phy_data.rx_vec[0] = desc-&gt;rx_vec[0];</div><div class='add'>+	phy_data.rx_vec[1] = desc-&gt;rx_vec[1];</div><div class='add'>+</div><div class='add'>+	phy_data.rate_n_flags = iwl_mvm_v3_rate_from_fw(desc-&gt;rate,</div><div class='add'>+							mvm-&gt;fw_rates_ver);</div><div class='add'>+</div><div class='add'>+	format = phy_data.rate_n_flags &amp; RATE_MCS_MOD_TYPE_MSK;</div><div class='add'>+</div><div class='add'>+	if (iwl_fw_lookup_notif_ver(mvm-&gt;fw, DATA_PATH_GROUP,</div><div class='add'>+				    RX_NO_DATA_NOTIF, 0) &gt;= 3) {</div><div class='add'>+		if (unlikely(iwl_rx_packet_payload_len(pkt) &lt;</div><div class='add'>+		    sizeof(struct iwl_rx_no_data_ver_3)))</div><div class='add'>+		/* invalid len for ver 3 */</div><div class='add'>+			return;</div><div class='add'>+		phy_data.rx_vec[2] = desc-&gt;rx_vec[2];</div><div class='add'>+		phy_data.rx_vec[3] = desc-&gt;rx_vec[3];</div><div class='add'>+	} else {</div><div class='add'>+		if (format == RATE_MCS_MOD_TYPE_EHT)</div><div class='add'>+			/* no support for EHT before version 3 API */</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Dont use dev_alloc_skb(), we'll have enough headroom once</div><div class='ctx'> 	 * ieee80211_hdr pulled.</div><div class='hunk'>@@ -2033,13 +2477,18 @@ void iwl_mvm_rx_monitor_no_data(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 	/* 0-length PSDU */</div><div class='ctx'> 	rx_status-&gt;flag |= RX_FLAG_NO_PSDU;</div><div class='ctx'> </div><div class='del'>-	switch (info_type) {</div><div class='add'>+	/* mark as failed PLCP on any errors to skip checks in mac80211 */</div><div class='add'>+	if (le32_get_bits(desc-&gt;info, RX_NO_DATA_INFO_ERR_MSK) !=</div><div class='add'>+	    RX_NO_DATA_INFO_ERR_NONE)</div><div class='add'>+		rx_status-&gt;flag |= RX_FLAG_FAILED_PLCP_CRC;</div><div class='add'>+</div><div class='add'>+	switch (le32_get_bits(desc-&gt;info, RX_NO_DATA_INFO_TYPE_MSK)) {</div><div class='ctx'> 	case RX_NO_DATA_INFO_TYPE_NDP:</div><div class='ctx'> 		rx_status-&gt;zero_length_psdu_type =</div><div class='ctx'> 			IEEE80211_RADIOTAP_ZERO_LEN_PSDU_SOUNDING;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case RX_NO_DATA_INFO_TYPE_MU_UNMATCHED:</div><div class='del'>-	case RX_NO_DATA_INFO_TYPE_HE_TB_UNMATCHED:</div><div class='add'>+	case RX_NO_DATA_INFO_TYPE_TB_UNMATCHED:</div><div class='ctx'> 		rx_status-&gt;zero_length_psdu_type =</div><div class='ctx'> 			IEEE80211_RADIOTAP_ZERO_LEN_PSDU_NOT_CAPTURED;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2049,85 +2498,45 @@ void iwl_mvm_rx_monitor_no_data(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* This may be overridden by iwl_mvm_rx_he() to HE_RU */</div><div class='del'>-	switch (rate_n_flags &amp; RATE_MCS_CHAN_WIDTH_MSK) {</div><div class='del'>-	case RATE_MCS_CHAN_WIDTH_20:</div><div class='del'>-		break;</div><div class='del'>-	case RATE_MCS_CHAN_WIDTH_40:</div><div class='del'>-		rx_status-&gt;bw = RATE_INFO_BW_40;</div><div class='del'>-		break;</div><div class='del'>-	case RATE_MCS_CHAN_WIDTH_80:</div><div class='del'>-		rx_status-&gt;bw = RATE_INFO_BW_80;</div><div class='del'>-		break;</div><div class='del'>-	case RATE_MCS_CHAN_WIDTH_160:</div><div class='del'>-		rx_status-&gt;bw = RATE_INFO_BW_160;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_HE_MSK)</div><div class='del'>-		iwl_mvm_rx_he(mvm, skb, &amp;phy_data, rate_n_flags,</div><div class='del'>-			      phy_info, queue);</div><div class='del'>-</div><div class='del'>-	iwl_mvm_decode_lsig(skb, &amp;phy_data);</div><div class='del'>-</div><div class='del'>-	rx_status-&gt;device_timestamp = gp2_on_air_rise;</div><div class='del'>-	rx_status-&gt;band = channel &gt; 14 ? NL80211_BAND_5GHZ :</div><div class='add'>+	rx_status-&gt;band = phy_data.channel &gt; 14 ? NL80211_BAND_5GHZ :</div><div class='ctx'> 		NL80211_BAND_2GHZ;</div><div class='del'>-	rx_status-&gt;freq = ieee80211_channel_to_frequency(channel,</div><div class='del'>-							 rx_status-&gt;band);</div><div class='del'>-	iwl_mvm_get_signal_strength(mvm, rx_status, rate_n_flags, energy_a,</div><div class='del'>-				    energy_b);</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='add'>+	iwl_mvm_rx_fill_status(mvm, NULL, NULL, skb, &amp;phy_data, queue);</div><div class='ctx'> </div><div class='del'>-	if (!(rate_n_flags &amp; RATE_MCS_CCK_MSK) &amp;&amp;</div><div class='del'>-	    rate_n_flags &amp; RATE_MCS_SGI_MSK)</div><div class='del'>-		rx_status-&gt;enc_flags |= RX_ENC_FLAG_SHORT_GI;</div><div class='del'>-	if (rate_n_flags &amp; RATE_HT_MCS_GF_MSK)</div><div class='del'>-		rx_status-&gt;enc_flags |= RX_ENC_FLAG_HT_GF;</div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_LDPC_MSK)</div><div class='del'>-		rx_status-&gt;enc_flags |= RX_ENC_FLAG_LDPC;</div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_HT_MSK) {</div><div class='del'>-		u8 stbc = (rate_n_flags &amp; RATE_MCS_STBC_MSK) &gt;&gt;</div><div class='del'>-				RATE_MCS_STBC_POS;</div><div class='del'>-		rx_status-&gt;encoding = RX_ENC_HT;</div><div class='del'>-		rx_status-&gt;rate_idx = rate_n_flags &amp; RATE_HT_MCS_INDEX_MSK;</div><div class='del'>-		rx_status-&gt;enc_flags |= stbc &lt;&lt; RX_ENC_FLAG_STBC_SHIFT;</div><div class='del'>-	} else if (rate_n_flags &amp; RATE_MCS_VHT_MSK) {</div><div class='del'>-		u8 stbc = (rate_n_flags &amp; RATE_MCS_STBC_MSK) &gt;&gt;</div><div class='del'>-				RATE_MCS_STBC_POS;</div><div class='del'>-		rx_status-&gt;rate_idx = rate_n_flags &amp; RATE_VHT_MCS_RATE_CODE_MSK;</div><div class='del'>-		rx_status-&gt;encoding = RX_ENC_VHT;</div><div class='del'>-		rx_status-&gt;enc_flags |= stbc &lt;&lt; RX_ENC_FLAG_STBC_SHIFT;</div><div class='del'>-		if (rate_n_flags &amp; RATE_MCS_BF_MSK)</div><div class='del'>-			rx_status-&gt;enc_flags |= RX_ENC_FLAG_BF;</div><div class='del'>-		/*</div><div class='del'>-		 * take the nss from the rx_vec since the rate_n_flags has</div><div class='del'>-		 * only 2 bits for the nss which gives a max of 4 ss but</div><div class='del'>-		 * there may be up to 8 spatial streams</div><div class='del'>-		 */</div><div class='add'>+	/* no more radio tap info should be put after this point.</div><div class='add'>+	 *</div><div class='add'>+	 * We mark it as mac header, for upper layers to know where</div><div class='add'>+	 * all radio tap header ends.</div><div class='add'>+	 *</div><div class='add'>+	 * Since data doesn't move data while putting data on skb and that is</div><div class='add'>+	 * the only way we use, data + len is the next place that hdr would be put</div><div class='add'>+	 */</div><div class='add'>+	skb_set_mac_header(skb, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Override the nss from the rx_vec since the rate_n_flags has</div><div class='add'>+	 * only 2 bits for the nss which gives a max of 4 ss but there</div><div class='add'>+	 * may be up to 8 spatial streams.</div><div class='add'>+	 */</div><div class='add'>+	switch (format) {</div><div class='add'>+	case RATE_MCS_MOD_TYPE_VHT:</div><div class='ctx'> 		rx_status-&gt;nss =</div><div class='ctx'> 			le32_get_bits(desc-&gt;rx_vec[0],</div><div class='ctx'> 				      RX_NO_DATA_RX_VEC0_VHT_NSTS_MSK) + 1;</div><div class='del'>-	} else if (rate_n_flags &amp; RATE_MCS_HE_MSK) {</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_HE:</div><div class='ctx'> 		rx_status-&gt;nss =</div><div class='ctx'> 			le32_get_bits(desc-&gt;rx_vec[0],</div><div class='ctx'> 				      RX_NO_DATA_RX_VEC0_HE_NSTS_MSK) + 1;</div><div class='del'>-	} else {</div><div class='del'>-		int rate = iwl_mvm_legacy_rate_to_mac80211_idx(rate_n_flags,</div><div class='del'>-							       rx_status-&gt;band);</div><div class='del'>-</div><div class='del'>-		if (WARN(rate &lt; 0 || rate &gt; 0xFF,</div><div class='del'>-			 "Invalid rate flags 0x%x, band %d,\n",</div><div class='del'>-			 rate_n_flags, rx_status-&gt;band)) {</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		rx_status-&gt;rate_idx = rate;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_EHT:</div><div class='add'>+		rx_status-&gt;nss =</div><div class='add'>+			le32_get_bits(desc-&gt;rx_vec[2],</div><div class='add'>+				      RX_NO_DATA_RX_VEC2_EHT_NSTS_MSK) + 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	ieee80211_rx_napi(mvm-&gt;hw, sta, skb, napi);</div><div class='del'>-out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2142,7 +2551,7 @@ void iwl_mvm_rx_frame_release(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_release_frames_from_notif(mvm, napi, release-&gt;baid,</div><div class='ctx'> 					  le16_to_cpu(release-&gt;nssn),</div><div class='del'>-					  queue, 0);</div><div class='add'>+					  queue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_rx_bar_frame_release(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='hunk'>@@ -2150,19 +2559,24 @@ void iwl_mvm_rx_bar_frame_release(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='ctx'> 	struct iwl_bar_frame_release *release = (void *)pkt-&gt;data;</div><div class='del'>-	unsigned int baid = le32_get_bits(release-&gt;ba_info,</div><div class='del'>-					  IWL_BAR_FRAME_RELEASE_BAID_MASK);</div><div class='del'>-	unsigned int nssn = le32_get_bits(release-&gt;ba_info,</div><div class='del'>-					  IWL_BAR_FRAME_RELEASE_NSSN_MASK);</div><div class='del'>-	unsigned int sta_id = le32_get_bits(release-&gt;sta_tid,</div><div class='del'>-					    IWL_BAR_FRAME_RELEASE_STA_MASK);</div><div class='del'>-	unsigned int tid = le32_get_bits(release-&gt;sta_tid,</div><div class='del'>-					 IWL_BAR_FRAME_RELEASE_TID_MASK);</div><div class='ctx'> 	struct iwl_mvm_baid_data *baid_data;</div><div class='add'>+	u32 pkt_len = iwl_rx_packet_payload_len(pkt);</div><div class='add'>+	unsigned int baid, nssn, sta_id, tid;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(iwl_rx_packet_payload_len(pkt) &lt; sizeof(*release)))</div><div class='add'>+	if (IWL_FW_CHECK(mvm, pkt_len &lt; sizeof(*release),</div><div class='add'>+			 "Unexpected frame release notif size %d (expected %zu)\n",</div><div class='add'>+			 pkt_len, sizeof(*release)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	baid = le32_get_bits(release-&gt;ba_info,</div><div class='add'>+			     IWL_BAR_FRAME_RELEASE_BAID_MASK);</div><div class='add'>+	nssn = le32_get_bits(release-&gt;ba_info,</div><div class='add'>+			     IWL_BAR_FRAME_RELEASE_NSSN_MASK);</div><div class='add'>+	sta_id = le32_get_bits(release-&gt;sta_tid,</div><div class='add'>+			       IWL_BAR_FRAME_RELEASE_STA_MASK);</div><div class='add'>+	tid = le32_get_bits(release-&gt;sta_tid,</div><div class='add'>+			    IWL_BAR_FRAME_RELEASE_TID_MASK);</div><div class='add'>+</div><div class='ctx'> 	if (WARN_ON_ONCE(baid == IWL_RX_REORDER_DATA_INVALID_BAID ||</div><div class='ctx'> 			 baid &gt;= ARRAY_SIZE(mvm-&gt;baid_map)))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2176,13 +2590,42 @@ void iwl_mvm_rx_bar_frame_release(struct iwl_mvm *mvm, struct napi_struct *napi,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (WARN(tid != baid_data-&gt;tid || sta_id != baid_data-&gt;sta_id,</div><div class='del'>-		 "baid 0x%x is mapped to sta:%d tid:%d, but BAR release received for sta:%d tid:%d\n",</div><div class='del'>-		 baid, baid_data-&gt;sta_id, baid_data-&gt;tid, sta_id,</div><div class='add'>+	if (WARN(tid != baid_data-&gt;tid || sta_id &gt; IWL_STATION_COUNT_MAX ||</div><div class='add'>+		 !(baid_data-&gt;sta_mask &amp; BIT(sta_id)),</div><div class='add'>+		 "baid 0x%x is mapped to sta_mask:0x%x tid:%d, but BAR release received for sta:%d tid:%d\n",</div><div class='add'>+		 baid, baid_data-&gt;sta_mask, baid_data-&gt;tid, sta_id,</div><div class='ctx'> 		 tid))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_release_frames_from_notif(mvm, napi, baid, nssn, queue, 0);</div><div class='add'>+	IWL_DEBUG_DROP(mvm, "Received a BAR, expect packet loss: nssn %d\n",</div><div class='add'>+		       nssn);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_release_frames_from_notif(mvm, napi, baid, nssn, queue);</div><div class='ctx'> out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void iwl_mvm_rx_beacon_filter_notif(struct iwl_mvm *mvm,</div><div class='add'>+				    struct iwl_rx_cmd_buffer *rxb)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='add'>+	/* MAC or link ID in v1/v2, but driver has the IDs equal */</div><div class='add'>+	struct iwl_beacon_filter_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+	u32 id = le32_to_cpu(notif-&gt;link_id);</div><div class='add'>+	struct iwl_mvm_vif *mvm_vif;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+</div><div class='add'>+	/* &gt;= means AUX MAC/link ID, no energy correction needed then */</div><div class='add'>+	if (IWL_FW_CHECK(mvm, id &gt;= ARRAY_SIZE(mvm-&gt;vif_id_to_mac),</div><div class='add'>+			 "invalid link ID %d\n", id))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vif = iwl_mvm_rcu_dereference_vif_id(mvm, id, false);</div><div class='add'>+	if (!vif)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mvm_vif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	mvm_vif-&gt;deflink.average_beacon_energy =</div><div class='add'>+		le32_to_cpu(notif-&gt;average_energy);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c<br/>index 5a0696c44f6d..b588f1dcf20d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/scan.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/scan.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/scan.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/scan.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include "mvm.h"</div><div class='ctx'> #include "fw/api/scan.h"</div><div class='ctx'> #include "iwl-io.h"</div><div class='add'>+#include "iwl-utils.h"</div><div class='ctx'> </div><div class='ctx'> #define IWL_DENSE_EBS_SCAN_RATIO 5</div><div class='ctx'> #define IWL_SPARSE_EBS_SCAN_RATIO 1</div><div class='hunk'>@@ -20,7 +21,6 @@</div><div class='ctx'> #define IWL_SCAN_DWELL_FRAGMENTED	44</div><div class='ctx'> #define IWL_SCAN_DWELL_EXTENDED		90</div><div class='ctx'> #define IWL_SCAN_NUM_OF_FRAGS		3</div><div class='del'>-#define IWL_SCAN_LAST_2_4_CHN		14</div><div class='ctx'> </div><div class='ctx'> /* adaptive dwell max budget time [TU] for full scan */</div><div class='ctx'> #define IWL_SCAN_ADWELL_MAX_BUDGET_FULL_SCAN 300</div><div class='hunk'>@@ -46,6 +46,11 @@</div><div class='ctx'> /* minimal number of 2GHz and 5GHz channels in the regular scan request */</div><div class='ctx'> #define IWL_MVM_6GHZ_PASSIVE_SCAN_MIN_CHANS 4</div><div class='ctx'> </div><div class='add'>+/* Number of iterations on the channel for mei filtered scan */</div><div class='add'>+#define IWL_MEI_SCAN_NUM_ITER	5U</div><div class='add'>+</div><div class='add'>+#define WFA_TPC_IE_LEN	9</div><div class='add'>+</div><div class='ctx'> struct iwl_mvm_scan_timing_params {</div><div class='ctx'> 	u32 suspend_time;</div><div class='ctx'> 	u32 max_out_time;</div><div class='hunk'>@@ -98,6 +103,9 @@ struct iwl_mvm_scan_params {</div><div class='ctx'> 	u32 n_6ghz_params;</div><div class='ctx'> 	bool scan_6ghz;</div><div class='ctx'> 	bool enable_6ghz_passive;</div><div class='add'>+	bool respect_p2p_go, respect_p2p_go_hb;</div><div class='add'>+	s8 tsf_report_link_id;</div><div class='add'>+	u8 bssid[ETH_ALEN] __aligned(2);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void *iwl_mvm_get_scan_req_umac_data(struct iwl_mvm *mvm)</div><div class='hunk'>@@ -163,23 +171,12 @@ iwl_mvm_scan_rate_n_flags(struct iwl_mvm *mvm, enum nl80211_band band,</div><div class='ctx'> 	tx_ant = BIT(mvm-&gt;scan_last_antenna_idx) &lt;&lt; RATE_MCS_ANT_POS;</div><div class='ctx'> </div><div class='ctx'> 	if (band == NL80211_BAND_2GHZ &amp;&amp; !no_cck)</div><div class='del'>-		return cpu_to_le32(IWL_RATE_1M_PLCP | RATE_MCS_CCK_MSK |</div><div class='add'>+		return cpu_to_le32(IWL_RATE_1M_PLCP | RATE_MCS_CCK_MSK_V1 |</div><div class='ctx'> 				   tx_ant);</div><div class='ctx'> 	else</div><div class='ctx'> 		return cpu_to_le32(IWL_RATE_6M_PLCP | tx_ant);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_scan_condition_iterator(void *data, u8 *mac,</div><div class='del'>-					    struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-	int *global_cnt = data;</div><div class='del'>-</div><div class='del'>-	if (vif-&gt;type != NL80211_IFTYPE_P2P_DEVICE &amp;&amp; mvmvif-&gt;phy_ctxt &amp;&amp;</div><div class='del'>-	    mvmvif-&gt;phy_ctxt-&gt;id &lt; NUM_PHY_CTX)</div><div class='del'>-		*global_cnt += 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static enum iwl_mvm_traffic_load iwl_mvm_get_traffic_load(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='ctx'> 	return mvm-&gt;tcm.result.global_load;</div><div class='hunk'>@@ -191,26 +188,32 @@ iwl_mvm_get_traffic_load_band(struct iwl_mvm *mvm, enum nl80211_band band)</div><div class='ctx'> 	return mvm-&gt;tcm.result.band_load[band];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct iwl_is_dcm_with_go_iterator_data {</div><div class='add'>+struct iwl_mvm_scan_iter_data {</div><div class='add'>+	u32 global_cnt;</div><div class='ctx'> 	struct ieee80211_vif *current_vif;</div><div class='ctx'> 	bool is_dcm_with_p2p_go;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_is_dcm_with_go_iterator(void *_data, u8 *mac,</div><div class='del'>-					    struct ieee80211_vif *vif)</div><div class='add'>+static void iwl_mvm_scan_iterator(void *_data, u8 *mac,</div><div class='add'>+				  struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_is_dcm_with_go_iterator_data *data = _data;</div><div class='del'>-	struct iwl_mvm_vif *other_mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-	struct iwl_mvm_vif *curr_mvmvif =</div><div class='del'>-		iwl_mvm_vif_from_mac80211(data-&gt;current_vif);</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm_scan_iter_data *data = _data;</div><div class='add'>+	struct iwl_mvm_vif *curr_mvmvif;</div><div class='ctx'> </div><div class='del'>-	/* exclude the given vif */</div><div class='del'>-	if (vif == data-&gt;current_vif)</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_P2P_DEVICE &amp;&amp;</div><div class='add'>+	    mvmvif-&gt;deflink.phy_ctxt &amp;&amp;</div><div class='add'>+	    mvmvif-&gt;deflink.phy_ctxt-&gt;id &lt; NUM_PHY_CTX)</div><div class='add'>+		data-&gt;global_cnt += 1;</div><div class='add'>+</div><div class='add'>+	if (!data-&gt;current_vif || vif == data-&gt;current_vif)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp; vif-&gt;p2p &amp;&amp;</div><div class='del'>-	    other_mvmvif-&gt;phy_ctxt &amp;&amp; curr_mvmvif-&gt;phy_ctxt &amp;&amp;</div><div class='del'>-	    other_mvmvif-&gt;phy_ctxt-&gt;id != curr_mvmvif-&gt;phy_ctxt-&gt;id)</div><div class='add'>+	curr_mvmvif = iwl_mvm_vif_from_mac80211(data-&gt;current_vif);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_type_p2p(vif) == NL80211_IFTYPE_P2P_GO &amp;&amp;</div><div class='add'>+	    mvmvif-&gt;deflink.phy_ctxt &amp;&amp; curr_mvmvif-&gt;deflink.phy_ctxt &amp;&amp;</div><div class='add'>+	    mvmvif-&gt;deflink.phy_ctxt-&gt;id != curr_mvmvif-&gt;deflink.phy_ctxt-&gt;id)</div><div class='ctx'> 		data-&gt;is_dcm_with_p2p_go = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -220,13 +223,26 @@ iwl_mvm_scan_type _iwl_mvm_get_scan_type(struct iwl_mvm *mvm,</div><div class='ctx'> 					 enum iwl_mvm_traffic_load load,</div><div class='ctx'> 					 bool low_latency)</div><div class='ctx'> {</div><div class='del'>-	int global_cnt = 0;</div><div class='add'>+	struct iwl_mvm_scan_iter_data data = {</div><div class='add'>+		.current_vif = vif,</div><div class='add'>+		.is_dcm_with_p2p_go = false,</div><div class='add'>+		.global_cnt = 0,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * A scanning AP interface probably wants to generate a survey to do</div><div class='add'>+	 * ACS (automatic channel selection).</div><div class='add'>+	 * Force a non-fragmented scan in that case.</div><div class='add'>+	 */</div><div class='add'>+	if (vif &amp;&amp; ieee80211_vif_type_p2p(vif) == NL80211_IFTYPE_AP)</div><div class='add'>+		return IWL_SCAN_TYPE_WILD;</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_iterate_active_interfaces_atomic(mvm-&gt;hw,</div><div class='del'>-					    IEEE80211_IFACE_ITER_NORMAL,</div><div class='del'>-					    iwl_mvm_scan_condition_iterator,</div><div class='del'>-					    &amp;global_cnt);</div><div class='del'>-	if (!global_cnt)</div><div class='add'>+						   IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						   iwl_mvm_scan_iterator,</div><div class='add'>+						   &amp;data);</div><div class='add'>+</div><div class='add'>+	if (!data.global_cnt)</div><div class='ctx'> 		return IWL_SCAN_TYPE_UNASSOC;</div><div class='ctx'> </div><div class='ctx'> 	if (fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='hunk'>@@ -235,23 +251,13 @@ iwl_mvm_scan_type _iwl_mvm_get_scan_type(struct iwl_mvm *mvm,</div><div class='ctx'> 		    (!vif || vif-&gt;type != NL80211_IFTYPE_P2P_DEVICE))</div><div class='ctx'> 			return IWL_SCAN_TYPE_FRAGMENTED;</div><div class='ctx'> </div><div class='del'>-		/* in case of DCM with GO where BSS DTIM interval &lt; 220msec</div><div class='del'>-		 * set all scan requests as fast-balance scan</div><div class='del'>-		 * */</div><div class='add'>+		/*</div><div class='add'>+		 * in case of DCM with P2P GO set all scan requests as</div><div class='add'>+		 * fast-balance scan</div><div class='add'>+		 */</div><div class='ctx'> 		if (vif &amp;&amp; vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='del'>-		    vif-&gt;bss_conf.dtim_period &lt; 220) {</div><div class='del'>-			struct iwl_is_dcm_with_go_iterator_data data = {</div><div class='del'>-				.current_vif = vif,</div><div class='del'>-				.is_dcm_with_p2p_go = false,</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			ieee80211_iterate_active_interfaces_atomic(mvm-&gt;hw,</div><div class='del'>-						IEEE80211_IFACE_ITER_NORMAL,</div><div class='del'>-						iwl_mvm_is_dcm_with_go_iterator,</div><div class='del'>-						&amp;data);</div><div class='del'>-			if (data.is_dcm_with_p2p_go)</div><div class='del'>-				return IWL_SCAN_TYPE_FAST_BALANCE;</div><div class='del'>-		}</div><div class='add'>+		    data.is_dcm_with_p2p_go)</div><div class='add'>+			return IWL_SCAN_TYPE_FAST_BALANCE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (load &gt;= IWL_MVM_TRAFFIC_MEDIUM || low_latency)</div><div class='hunk'>@@ -300,8 +306,8 @@ static int iwl_mvm_max_scan_ie_fw_cmd_room(struct iwl_mvm *mvm)</div><div class='ctx'> </div><div class='ctx'> 	max_probe_len = SCAN_OFFLOAD_PROBE_REQ_SIZE;</div><div class='ctx'> </div><div class='del'>-	/* we create the 802.11 header and SSID element */</div><div class='del'>-	max_probe_len -= 24 + 2;</div><div class='add'>+	/* we create the 802.11 header SSID element and WFA TPC element */</div><div class='add'>+	max_probe_len -= 24 + 2 + WFA_TPC_IE_LEN;</div><div class='ctx'> </div><div class='ctx'> 	/* DS parameter set element is added on 2.4GHZ band if required */</div><div class='ctx'> 	if (iwl_mvm_rrm_scan_needed(mvm))</div><div class='hunk'>@@ -457,7 +463,7 @@ static int iwl_ssid_exist(u8 *ssid, u8 ssid_len, struct iwl_ssid_ie *ssid_list)</div><div class='ctx'> 		if (!ssid_list[i].len)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (ssid_list[i].len == ssid_len &amp;&amp;</div><div class='del'>-		    !memcmp(ssid_list-&gt;ssid, ssid, ssid_len))</div><div class='add'>+		    !memcmp(ssid_list[i].ssid, ssid, ssid_len))</div><div class='ctx'> 			return i;</div><div class='ctx'> 	}</div><div class='ctx'> 	return -1;</div><div class='hunk'>@@ -579,7 +585,9 @@ iwl_mvm_config_sched_scan_profiles(struct iwl_mvm *mvm,</div><div class='ctx'> 		profile-&gt;ssid_index = i;</div><div class='ctx'> 		/* Support any cipher and auth algorithm */</div><div class='ctx'> 		profile-&gt;unicast_cipher = 0xff;</div><div class='del'>-		profile-&gt;auth_alg = 0xff;</div><div class='add'>+		profile-&gt;auth_alg = IWL_AUTH_ALGO_UNSUPPORTED |</div><div class='add'>+			IWL_AUTH_ALGO_NONE | IWL_AUTH_ALGO_PSK | IWL_AUTH_ALGO_8021X |</div><div class='add'>+			IWL_AUTH_ALGO_SAE | IWL_AUTH_ALGO_8021X_SHA384 | IWL_AUTH_ALGO_OWE;</div><div class='ctx'> 		profile-&gt;network_type = IWL_NETWORK_TYPE_ANY;</div><div class='ctx'> 		profile-&gt;band_selection = IWL_SCAN_OFFLOAD_SELECT_ANY;</div><div class='ctx'> 		profile-&gt;client_bitmap = SCAN_CLIENT_SCHED_SCAN;</div><div class='hunk'>@@ -649,9 +657,7 @@ static void iwl_mvm_scan_fill_tx_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 							   NL80211_BAND_2GHZ,</div><div class='ctx'> 							   no_cck);</div><div class='ctx'> </div><div class='del'>-	if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, LONG_GROUP,</div><div class='del'>-				  ADD_STA,</div><div class='del'>-				  0) &lt; 12) {</div><div class='add'>+	if (!iwl_mvm_has_new_station_api(mvm-&gt;fw)) {</div><div class='ctx'> 		tx_cmd[0].sta_id = mvm-&gt;aux_sta.sta_id;</div><div class='ctx'> 		tx_cmd[1].sta_id = mvm-&gt;aux_sta.sta_id;</div><div class='ctx'> </div><div class='hunk'>@@ -728,8 +734,6 @@ static u8 *iwl_mvm_copy_and_insert_ds_elem(struct iwl_mvm *mvm, const u8 *ies,</div><div class='ctx'> 	return newpos;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define WFA_TPC_IE_LEN	9</div><div class='del'>-</div><div class='ctx'> static void iwl_mvm_add_tpc_report_ie(u8 *pos)</div><div class='ctx'> {</div><div class='ctx'> 	pos[0] = WLAN_EID_VENDOR_SPECIFIC;</div><div class='hunk'>@@ -768,7 +772,7 @@ iwl_mvm_build_scan_probe(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> </div><div class='ctx'> 	frame-&gt;frame_control = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ);</div><div class='ctx'> 	eth_broadcast_addr(frame-&gt;da);</div><div class='del'>-	eth_broadcast_addr(frame-&gt;bssid);</div><div class='add'>+	ether_addr_copy(frame-&gt;bssid, params-&gt;bssid);</div><div class='ctx'> 	frame-&gt;seq_ctrl = 0;</div><div class='ctx'> </div><div class='ctx'> 	pos = frame-&gt;u.probe_req.variable;</div><div class='hunk'>@@ -832,10 +836,10 @@ static inline bool iwl_mvm_scan_fits(struct iwl_mvm *mvm, int n_ssids,</div><div class='ctx'> 				     int n_channels)</div><div class='ctx'> {</div><div class='ctx'> 	return ((n_ssids &lt;= PROBE_OPTION_MAX) &amp;&amp;</div><div class='del'>-		(n_channels &lt;= mvm-&gt;fw-&gt;ucode_capa.n_scan_channels) &amp;</div><div class='add'>+		(n_channels &lt;= mvm-&gt;fw-&gt;ucode_capa.n_scan_channels) &amp;&amp;</div><div class='ctx'> 		(ies-&gt;common_ie_len +</div><div class='del'>-		 ies-&gt;len[NL80211_BAND_2GHZ] +</div><div class='del'>-		 ies-&gt;len[NL80211_BAND_5GHZ] &lt;=</div><div class='add'>+		 ies-&gt;len[NL80211_BAND_2GHZ] + ies-&gt;len[NL80211_BAND_5GHZ] +</div><div class='add'>+		 ies-&gt;len[NL80211_BAND_6GHZ] &lt;=</div><div class='ctx'> 		 iwl_mvm_max_scan_ie_fw_cmd_room(mvm)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -857,11 +861,13 @@ static inline bool iwl_mvm_scan_use_ebs(struct iwl_mvm *mvm,</div><div class='ctx'> 	 *	4. it's not a p2p find operation.</div><div class='ctx'> 	 *	5. we are not in low latency mode,</div><div class='ctx'> 	 *	   or if fragmented ebs is supported by the FW</div><div class='add'>+	 *	6. the VIF is not an AP interface (scan wants survey results)</div><div class='ctx'> 	 */</div><div class='ctx'> 	return ((capa-&gt;flags &amp; IWL_UCODE_TLV_FLAGS_EBS_SUPPORT) &amp;&amp;</div><div class='ctx'> 		mvm-&gt;last_ebs_successful &amp;&amp; IWL_MVM_ENABLE_EBS &amp;&amp;</div><div class='ctx'> 		vif-&gt;type != NL80211_IFTYPE_P2P_DEVICE &amp;&amp;</div><div class='del'>-		(!low_latency || iwl_mvm_is_frag_ebs_supported(mvm)));</div><div class='add'>+		(!low_latency || iwl_mvm_is_frag_ebs_supported(mvm)) &amp;&amp;</div><div class='add'>+		ieee80211_vif_type_p2p(vif) != NL80211_IFTYPE_AP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool iwl_mvm_is_regular_scan(struct iwl_mvm_scan_params *params)</div><div class='hunk'>@@ -1088,8 +1094,7 @@ static void iwl_mvm_fill_scan_config_v1(struct iwl_mvm *mvm, void *config,</div><div class='ctx'> 	memcpy(&amp;cfg-&gt;mac_addr, &amp;mvm-&gt;addresses[0].addr, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	/* This function should not be called when using ADD_STA ver &gt;=12 */</div><div class='del'>-	WARN_ON_ONCE(iwl_fw_lookup_cmd_ver(mvm-&gt;fw, LONG_GROUP,</div><div class='del'>-					   ADD_STA, 0) &gt;= 12);</div><div class='add'>+	WARN_ON_ONCE(iwl_mvm_has_new_station_api(mvm-&gt;fw));</div><div class='ctx'> </div><div class='ctx'> 	cfg-&gt;bcast_sta_id = mvm-&gt;aux_sta.sta_id;</div><div class='ctx'> 	cfg-&gt;channel_flags = channel_flags;</div><div class='hunk'>@@ -1140,8 +1145,7 @@ static void iwl_mvm_fill_scan_config_v2(struct iwl_mvm *mvm, void *config,</div><div class='ctx'> 	memcpy(&amp;cfg-&gt;mac_addr, &amp;mvm-&gt;addresses[0].addr, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	/* This function should not be called when using ADD_STA ver &gt;=12 */</div><div class='del'>-	WARN_ON_ONCE(iwl_fw_lookup_cmd_ver(mvm-&gt;fw, LONG_GROUP,</div><div class='del'>-					   ADD_STA, 0) &gt;= 12);</div><div class='add'>+	WARN_ON_ONCE(iwl_mvm_has_new_station_api(mvm-&gt;fw));</div><div class='ctx'> </div><div class='ctx'> 	cfg-&gt;bcast_sta_id = mvm-&gt;aux_sta.sta_id;</div><div class='ctx'> 	cfg-&gt;channel_flags = channel_flags;</div><div class='hunk'>@@ -1154,7 +1158,7 @@ static int iwl_mvm_legacy_config_scan(struct iwl_mvm *mvm)</div><div class='ctx'> 	void *cfg;</div><div class='ctx'> 	int ret, cmd_size;</div><div class='ctx'> 	struct iwl_host_cmd cmd = {</div><div class='del'>-		.id = iwl_cmd_id(SCAN_CFG_CMD, IWL_ALWAYS_LONG_GROUP, 0),</div><div class='add'>+		.id = WIDE_ID(IWL_ALWAYS_LONG_GROUP, SCAN_CFG_CMD),</div><div class='ctx'> 	};</div><div class='ctx'> 	enum iwl_mvm_scan_type type;</div><div class='ctx'> 	enum iwl_mvm_scan_type hb_type = IWL_SCAN_TYPE_NOT_SET;</div><div class='hunk'>@@ -1245,7 +1249,7 @@ int iwl_mvm_config_scan(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_scan_config cfg;</div><div class='ctx'> 	struct iwl_host_cmd cmd = {</div><div class='del'>-		.id = iwl_cmd_id(SCAN_CFG_CMD, IWL_ALWAYS_LONG_GROUP, 0),</div><div class='add'>+		.id = WIDE_ID(IWL_ALWAYS_LONG_GROUP, SCAN_CFG_CMD),</div><div class='ctx'> 		.len[0] = sizeof(cfg),</div><div class='ctx'> 		.data[0] = &amp;cfg,</div><div class='ctx'> 		.dataflags[0] = IWL_HCMD_DFL_NOCOPY,</div><div class='hunk'>@@ -1256,11 +1260,9 @@ int iwl_mvm_config_scan(struct iwl_mvm *mvm)</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;cfg, 0, sizeof(cfg));</div><div class='ctx'> </div><div class='del'>-	if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, LONG_GROUP,</div><div class='del'>-				  ADD_STA, 0) &lt; 12) {</div><div class='add'>+	if (!iwl_mvm_has_new_station_api(mvm-&gt;fw)) {</div><div class='ctx'> 		cfg.bcast_sta_id = mvm-&gt;aux_sta.sta_id;</div><div class='del'>-	} else if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, LONG_GROUP,</div><div class='del'>-					 SCAN_CFG_CMD, 0) &lt; 5) {</div><div class='add'>+	} else if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, SCAN_CFG_CMD, 0) &lt; 5) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Fw doesn't use this sta anymore. Deprecated on SCAN_CFG_CMD</div><div class='ctx'> 		 * version 5.</div><div class='hunk'>@@ -1312,7 +1314,7 @@ static void iwl_mvm_scan_umac_dwell(struct iwl_mvm *mvm,</div><div class='ctx'> 		if (IWL_MVM_ADWELL_MAX_BUDGET)</div><div class='ctx'> 			cmd-&gt;v7.adwell_max_budget =</div><div class='ctx'> 				cpu_to_le16(IWL_MVM_ADWELL_MAX_BUDGET);</div><div class='del'>-		else if (params-&gt;ssids &amp;&amp; params-&gt;ssids[0].ssid_len)</div><div class='add'>+		else if (params-&gt;n_ssids &amp;&amp; params-&gt;ssids[0].ssid_len)</div><div class='ctx'> 			cmd-&gt;v7.adwell_max_budget =</div><div class='ctx'> 				cpu_to_le16(IWL_SCAN_ADWELL_MAX_BUDGET_DIRECTED_SCAN);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1386,16 +1388,17 @@ static void iwl_mvm_scan_umac_dwell(struct iwl_mvm *mvm,</div><div class='ctx'> 		cmd-&gt;ooc_priority = cpu_to_le32(IWL_SCAN_PRIORITY_EXT_2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 iwl_mvm_scan_umac_ooc_priority(struct iwl_mvm_scan_params *params)</div><div class='add'>+static u32 iwl_mvm_scan_umac_ooc_priority(int type)</div><div class='ctx'> {</div><div class='del'>-	return iwl_mvm_is_regular_scan(params) ?</div><div class='del'>-		IWL_SCAN_PRIORITY_EXT_6 :</div><div class='del'>-		IWL_SCAN_PRIORITY_EXT_2;</div><div class='add'>+	if (type == IWL_MVM_SCAN_REGULAR)</div><div class='add'>+		return IWL_SCAN_PRIORITY_EXT_6;</div><div class='add'>+</div><div class='add'>+	return IWL_SCAN_PRIORITY_EXT_2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-iwl_mvm_scan_umac_dwell_v10(struct iwl_mvm *mvm,</div><div class='del'>-			    struct iwl_scan_general_params_v10 *general_params,</div><div class='add'>+iwl_mvm_scan_umac_dwell_v11(struct iwl_mvm *mvm,</div><div class='add'>+			    struct iwl_scan_general_params_v11 *general_params,</div><div class='ctx'> 			    struct iwl_mvm_scan_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_scan_timing_params *timing, *hb_timing;</div><div class='hunk'>@@ -1414,7 +1417,7 @@ iwl_mvm_scan_umac_dwell_v10(struct iwl_mvm *mvm,</div><div class='ctx'> 	if (IWL_MVM_ADWELL_MAX_BUDGET)</div><div class='ctx'> 		general_params-&gt;adwell_max_budget =</div><div class='ctx'> 			cpu_to_le16(IWL_MVM_ADWELL_MAX_BUDGET);</div><div class='del'>-	else if (params-&gt;ssids &amp;&amp; params-&gt;ssids[0].ssid_len)</div><div class='add'>+	else if (params-&gt;n_ssids &amp;&amp; params-&gt;ssids[0].ssid_len)</div><div class='ctx'> 		general_params-&gt;adwell_max_budget =</div><div class='ctx'> 			cpu_to_le16(IWL_SCAN_ADWELL_MAX_BUDGET_DIRECTED_SCAN);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1590,7 +1593,7 @@ iwl_mvm_umac_scan_cfg_channels(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; n_channels; i++) {</div><div class='ctx'> 		channel_cfg[i].flags = cpu_to_le32(flags);</div><div class='del'>-		channel_cfg[i].v1.channel_num = channels[i]-&gt;hw_value;</div><div class='add'>+		channel_cfg[i].channel_num = channels[i]-&gt;hw_value;</div><div class='ctx'> 		if (iwl_mvm_is_scan_ext_chan_supported(mvm)) {</div><div class='ctx'> 			enum nl80211_band band = channels[i]-&gt;band;</div><div class='ctx'> </div><div class='hunk'>@@ -1622,24 +1625,24 @@ iwl_mvm_umac_scan_cfg_channels_v4(struct iwl_mvm *mvm,</div><div class='ctx'> 			&amp;cp-&gt;channel_config[i];</div><div class='ctx'> </div><div class='ctx'> 		cfg-&gt;flags = cpu_to_le32(flags);</div><div class='del'>-		cfg-&gt;v2.channel_num = channels[i]-&gt;hw_value;</div><div class='add'>+		cfg-&gt;channel_num = channels[i]-&gt;hw_value;</div><div class='ctx'> 		cfg-&gt;v2.band = iwl_mvm_phy_band_from_nl80211(band);</div><div class='ctx'> 		cfg-&gt;v2.iter_count = 1;</div><div class='ctx'> 		cfg-&gt;v2.iter_interval = 0;</div><div class='ctx'> </div><div class='ctx'> 		iwl_mvm_scan_ch_add_n_aps_override(vif_type,</div><div class='del'>-						   cfg-&gt;v2.channel_num,</div><div class='add'>+						   cfg-&gt;channel_num,</div><div class='ctx'> 						   cfg-&gt;v2.band, bitmap,</div><div class='ctx'> 						   bitmap_n_entries);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-iwl_mvm_umac_scan_cfg_channels_v6(struct iwl_mvm *mvm,</div><div class='add'>+iwl_mvm_umac_scan_cfg_channels_v7(struct iwl_mvm *mvm,</div><div class='ctx'> 				  struct ieee80211_channel **channels,</div><div class='del'>-				  struct iwl_scan_channel_params_v6 *cp,</div><div class='add'>+				  struct iwl_scan_channel_params_v7 *cp,</div><div class='ctx'> 				  int n_channels, u32 flags,</div><div class='del'>-				  enum nl80211_iftype vif_type)</div><div class='add'>+				  enum nl80211_iftype vif_type, u32 version)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1648,35 +1651,61 @@ iwl_mvm_umac_scan_cfg_channels_v6(struct iwl_mvm *mvm,</div><div class='ctx'> 		struct iwl_scan_channel_cfg_umac *cfg = &amp;cp-&gt;channel_config[i];</div><div class='ctx'> 		u32 n_aps_flag =</div><div class='ctx'> 			iwl_mvm_scan_ch_n_aps_flag(vif_type,</div><div class='del'>-						   cfg-&gt;v2.channel_num);</div><div class='add'>+						   channels[i]-&gt;hw_value);</div><div class='add'>+		u8 iwl_band = iwl_mvm_phy_band_from_nl80211(band);</div><div class='ctx'> </div><div class='ctx'> 		cfg-&gt;flags = cpu_to_le32(flags | n_aps_flag);</div><div class='del'>-		cfg-&gt;v2.channel_num = channels[i]-&gt;hw_value;</div><div class='del'>-		cfg-&gt;v2.band = iwl_mvm_phy_band_from_nl80211(band);</div><div class='add'>+		cfg-&gt;channel_num = channels[i]-&gt;hw_value;</div><div class='ctx'> 		if (cfg80211_channel_is_psc(channels[i]))</div><div class='ctx'> 			cfg-&gt;flags = 0;</div><div class='add'>+</div><div class='add'>+		if (band == NL80211_BAND_6GHZ) {</div><div class='add'>+			/* 6 GHz channels should only appear in a scan request</div><div class='add'>+			 * that has scan_6ghz set. The only exception is MLO</div><div class='add'>+			 * scan, which has to be passive.</div><div class='add'>+			 */</div><div class='add'>+			WARN_ON_ONCE(cfg-&gt;flags != 0);</div><div class='add'>+			cfg-&gt;flags =</div><div class='add'>+				cpu_to_le32(IWL_UHB_CHAN_CFG_FLAG_FORCE_PASSIVE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		cfg-&gt;v2.iter_count = 1;</div><div class='ctx'> 		cfg-&gt;v2.iter_interval = 0;</div><div class='add'>+		if (version &lt; 17)</div><div class='add'>+			cfg-&gt;v2.band = iwl_band;</div><div class='add'>+		else</div><div class='add'>+			cfg-&gt;flags |= cpu_to_le32((iwl_band &lt;&lt;</div><div class='add'>+						   IWL_CHAN_CFG_FLAGS_BAND_POS));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-iwl_mvm_umac_scan_fill_6g_chan_list(struct iwl_mvm_scan_params *params,</div><div class='del'>-				    __le32 *cmd_short_ssid, u8 *cmd_bssid,</div><div class='del'>-				    u8 *scan_ssid_num, u8 *bssid_num)</div><div class='add'>+static void</div><div class='add'>+iwl_mvm_umac_scan_fill_6g_chan_list(struct iwl_mvm *mvm,</div><div class='add'>+				    struct iwl_mvm_scan_params *params,</div><div class='add'>+				     struct iwl_scan_probe_params_v4 *pp)</div><div class='ctx'> {</div><div class='ctx'> 	int j, idex_s = 0, idex_b = 0;</div><div class='ctx'> 	struct cfg80211_scan_6ghz_params *scan_6ghz_params =</div><div class='ctx'> 		params-&gt;scan_6ghz_params;</div><div class='add'>+	bool hidden_supported = fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+					    IWL_UCODE_TLV_CAPA_HIDDEN_6GHZ_SCAN);</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; params-&gt;n_ssids &amp;&amp; idex_s &lt; SCAN_SHORT_SSID_MAX_SIZE;</div><div class='add'>+	     j++) {</div><div class='add'>+		if (!params-&gt;ssids[j].ssid_len)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		pp-&gt;short_ssid[idex_s] =</div><div class='add'>+			cpu_to_le32(~crc32_le(~0, params-&gt;ssids[j].ssid,</div><div class='add'>+					      params-&gt;ssids[j].ssid_len));</div><div class='ctx'> </div><div class='del'>-	if (!params-&gt;n_6ghz_params) {</div><div class='del'>-		for (j = 0; j &lt; params-&gt;n_ssids; j++) {</div><div class='del'>-			cmd_short_ssid[idex_s++] =</div><div class='del'>-				cpu_to_le32(~crc32_le(~0, params-&gt;ssids[j].ssid,</div><div class='del'>-						      params-&gt;ssids[j].ssid_len));</div><div class='del'>-			(*scan_ssid_num)++;</div><div class='add'>+		if (hidden_supported) {</div><div class='add'>+			pp-&gt;direct_scan[idex_s].id = WLAN_EID_SSID;</div><div class='add'>+			pp-&gt;direct_scan[idex_s].len = params-&gt;ssids[j].ssid_len;</div><div class='add'>+			memcpy(pp-&gt;direct_scan[idex_s].ssid, params-&gt;ssids[j].ssid,</div><div class='add'>+			       params-&gt;ssids[j].ssid_len);</div><div class='ctx'> 		}</div><div class='del'>-		return 0;</div><div class='add'>+		idex_s++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1693,61 +1722,148 @@ iwl_mvm_umac_scan_fill_6g_chan_list(struct iwl_mvm_scan_params *params,</div><div class='ctx'> 		/* First, try to place the short SSID */</div><div class='ctx'> 		if (scan_6ghz_params[j].short_ssid_valid) {</div><div class='ctx'> 			for (k = 0; k &lt; idex_s; k++) {</div><div class='del'>-				if (cmd_short_ssid[k] ==</div><div class='add'>+				if (pp-&gt;short_ssid[k] ==</div><div class='ctx'> 				    cpu_to_le32(scan_6ghz_params[j].short_ssid))</div><div class='ctx'> 					break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (k == idex_s &amp;&amp; idex_s &lt; SCAN_SHORT_SSID_MAX_SIZE) {</div><div class='del'>-				cmd_short_ssid[idex_s++] =</div><div class='add'>+				pp-&gt;short_ssid[idex_s++] =</div><div class='ctx'> 					cpu_to_le32(scan_6ghz_params[j].short_ssid);</div><div class='del'>-				(*scan_ssid_num)++;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* try to place BSSID for the same entry */</div><div class='ctx'> 		for (k = 0; k &lt; idex_b; k++) {</div><div class='del'>-			if (!memcmp(&amp;cmd_bssid[ETH_ALEN * k],</div><div class='add'>+			if (!memcmp(&amp;pp-&gt;bssid_array[k],</div><div class='ctx'> 				    scan_6ghz_params[j].bssid, ETH_ALEN))</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (k == idex_b &amp;&amp; idex_b &lt; SCAN_BSSID_MAX_SIZE) {</div><div class='del'>-			memcpy(&amp;cmd_bssid[ETH_ALEN * idex_b++],</div><div class='add'>+		if (k == idex_b &amp;&amp; idex_b &lt; SCAN_BSSID_MAX_SIZE &amp;&amp;</div><div class='add'>+		    !WARN_ONCE(!is_valid_ether_addr(scan_6ghz_params[j].bssid),</div><div class='add'>+			       "scan: invalid BSSID at index %u, index_b=%u\n",</div><div class='add'>+			       j, idex_b)) {</div><div class='add'>+			memcpy(&amp;pp-&gt;bssid_array[idex_b++],</div><div class='ctx'> 			       scan_6ghz_params[j].bssid, ETH_ALEN);</div><div class='del'>-			(*bssid_num)++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	pp-&gt;short_ssid_num = idex_s;</div><div class='add'>+	pp-&gt;bssid_num = idex_b;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* TODO: this function can be merged with iwl_mvm_scan_umac_fill_ch_p_v6 */</div><div class='del'>-static void</div><div class='del'>-iwl_mvm_umac_scan_cfg_channels_v6_6g(struct iwl_mvm_scan_params *params,</div><div class='del'>-				     u32 n_channels, __le32 *cmd_short_ssid,</div><div class='del'>-				     u8 *cmd_bssid, u8 scan_ssid_num,</div><div class='del'>-				     u8 bssid_num,</div><div class='del'>-				     struct iwl_scan_channel_params_v6 *cp,</div><div class='del'>-				     enum nl80211_iftype vif_type)</div><div class='del'>-{</div><div class='del'>-	struct iwl_scan_channel_cfg_umac *channel_cfg = cp-&gt;channel_config;</div><div class='add'>+/* TODO: this function can be merged with iwl_mvm_scan_umac_fill_ch_p_v7 */</div><div class='add'>+static u32</div><div class='add'>+iwl_mvm_umac_scan_cfg_channels_v7_6g(struct iwl_mvm *mvm,</div><div class='add'>+				     struct iwl_mvm_scan_params *params,</div><div class='add'>+				     u32 n_channels,</div><div class='add'>+				     struct iwl_scan_probe_params_v4 *pp,</div><div class='add'>+				     struct iwl_scan_channel_params_v7 *cp,</div><div class='add'>+				     enum nl80211_iftype vif_type,</div><div class='add'>+				     u32 version)</div><div class='add'>+{</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct cfg80211_scan_6ghz_params *scan_6ghz_params =</div><div class='ctx'> 		params-&gt;scan_6ghz_params;</div><div class='add'>+	u32 ch_cnt;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; params-&gt;n_channels; i++) {</div><div class='add'>+	for (i = 0, ch_cnt = 0; i &lt; params-&gt;n_channels; i++) {</div><div class='ctx'> 		struct iwl_scan_channel_cfg_umac *cfg =</div><div class='del'>-			&amp;cp-&gt;channel_config[i];</div><div class='add'>+			&amp;cp-&gt;channel_config[ch_cnt];</div><div class='ctx'> </div><div class='ctx'> 		u32 s_ssid_bitmap = 0, bssid_bitmap = 0, flags = 0;</div><div class='del'>-		u8 j, k, s_max = 0, b_max = 0, n_used_bssid_entries;</div><div class='del'>-		bool force_passive, found = false,</div><div class='add'>+		u8 k, n_s_ssids = 0, n_bssids = 0;</div><div class='add'>+		u8 max_s_ssids, max_bssids;</div><div class='add'>+		bool force_passive = false, found = false, allow_passive = true,</div><div class='ctx'> 		     unsolicited_probe_on_chan = false, psc_no_listen = false;</div><div class='add'>+		s8 psd_20 = IEEE80211_RNR_TBTT_PARAMS_PSD_RESERVED;</div><div class='ctx'> </div><div class='del'>-		cfg-&gt;v1.channel_num = params-&gt;channels[i]-&gt;hw_value;</div><div class='del'>-		cfg-&gt;v2.band = 2;</div><div class='del'>-		cfg-&gt;v2.iter_count = 1;</div><div class='del'>-		cfg-&gt;v2.iter_interval = 0;</div><div class='add'>+		/*</div><div class='add'>+		 * Avoid performing passive scan on non PSC channels unless the</div><div class='add'>+		 * scan is specifically a passive scan, i.e., no SSIDs</div><div class='add'>+		 * configured in the scan command.</div><div class='add'>+		 */</div><div class='add'>+		if (!cfg80211_channel_is_psc(params-&gt;channels[i]) &amp;&amp;</div><div class='add'>+		    !params-&gt;n_6ghz_params &amp;&amp; params-&gt;n_ssids)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		cfg-&gt;channel_num = params-&gt;channels[i]-&gt;hw_value;</div><div class='add'>+		if (version &lt; 17)</div><div class='add'>+			cfg-&gt;v2.band = PHY_BAND_6;</div><div class='add'>+		else</div><div class='add'>+			cfg-&gt;flags |= cpu_to_le32(PHY_BAND_6 &lt;&lt;</div><div class='add'>+						  IWL_CHAN_CFG_FLAGS_BAND_POS);</div><div class='add'>+</div><div class='add'>+		cfg-&gt;v5.iter_count = 1;</div><div class='add'>+		cfg-&gt;v5.iter_interval = 0;</div><div class='add'>+</div><div class='add'>+		for (u32 j = 0; j &lt; params-&gt;n_6ghz_params; j++) {</div><div class='add'>+			s8 tmp_psd_20;</div><div class='add'>+</div><div class='add'>+			if (!(scan_6ghz_params[j].channel_idx == i))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			unsolicited_probe_on_chan |=</div><div class='add'>+				scan_6ghz_params[j].unsolicited_probe;</div><div class='add'>+</div><div class='add'>+			/* Use the highest PSD value allowed as advertised by</div><div class='add'>+			 * APs for this channel</div><div class='add'>+			 */</div><div class='add'>+			tmp_psd_20 = scan_6ghz_params[j].psd_20;</div><div class='add'>+			if (tmp_psd_20 !=</div><div class='add'>+			    IEEE80211_RNR_TBTT_PARAMS_PSD_RESERVED &amp;&amp;</div><div class='add'>+			    (psd_20 ==</div><div class='add'>+			     IEEE80211_RNR_TBTT_PARAMS_PSD_RESERVED ||</div><div class='add'>+			     psd_20 &lt; tmp_psd_20))</div><div class='add'>+				psd_20 = tmp_psd_20;</div><div class='add'>+</div><div class='add'>+			psc_no_listen |= scan_6ghz_params[j].psc_no_listen;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * In the following cases apply passive scan:</div><div class='add'>+		 * 1. Non fragmented scan:</div><div class='add'>+		 *	- PSC channel with NO_LISTEN_FLAG on should be treated</div><div class='add'>+		 *	  like non PSC channel</div><div class='add'>+		 *	- Non PSC channel with more than 3 short SSIDs or more</div><div class='add'>+		 *	  than 9 BSSIDs.</div><div class='add'>+		 *	- Non PSC Channel with unsolicited probe response and</div><div class='add'>+		 *	  more than 2 short SSIDs or more than 6 BSSIDs.</div><div class='add'>+		 *	- PSC channel with more than 2 short SSIDs or more than</div><div class='add'>+		 *	  6 BSSIDs.</div><div class='add'>+		 * 3. Fragmented scan:</div><div class='add'>+		 *	- PSC channel with more than 1 SSID or 3 BSSIDs.</div><div class='add'>+		 *	- Non PSC channel with more than 2 SSIDs or 6 BSSIDs.</div><div class='add'>+		 *	- Non PSC channel with unsolicited probe response and</div><div class='add'>+		 *	  more than 1 SSID or more than 3 BSSIDs.</div><div class='add'>+		 */</div><div class='add'>+		if (!iwl_mvm_is_scan_fragmented(params-&gt;type)) {</div><div class='add'>+			if (!cfg80211_channel_is_psc(params-&gt;channels[i]) ||</div><div class='add'>+			    psc_no_listen) {</div><div class='add'>+				if (unsolicited_probe_on_chan) {</div><div class='add'>+					max_s_ssids = 2;</div><div class='add'>+					max_bssids = 6;</div><div class='add'>+				} else {</div><div class='add'>+					max_s_ssids = 3;</div><div class='add'>+					max_bssids = 9;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				max_s_ssids = 2;</div><div class='add'>+				max_bssids = 6;</div><div class='add'>+			}</div><div class='add'>+		} else if (cfg80211_channel_is_psc(params-&gt;channels[i])) {</div><div class='add'>+			max_s_ssids = 1;</div><div class='add'>+			max_bssids = 3;</div><div class='add'>+		} else {</div><div class='add'>+			if (unsolicited_probe_on_chan) {</div><div class='add'>+				max_s_ssids = 1;</div><div class='add'>+				max_bssids = 3;</div><div class='add'>+			} else {</div><div class='add'>+				max_s_ssids = 2;</div><div class='add'>+				max_bssids = 6;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The optimize the scan time, i.e., reduce the scan dwell time</div><div class='hunk'>@@ -1756,19 +1872,17 @@ iwl_mvm_umac_scan_cfg_channels_v6_6g(struct iwl_mvm_scan_params *params,</div><div class='ctx'> 		 * SSID.</div><div class='ctx'> 		 * TODO: improve this logic</div><div class='ctx'> 		 */</div><div class='del'>-		n_used_bssid_entries = 3;</div><div class='del'>-		for (j = 0; j &lt; params-&gt;n_6ghz_params; j++) {</div><div class='add'>+		for (u32 j = 0; j &lt; params-&gt;n_6ghz_params; j++) {</div><div class='ctx'> 			if (!(scan_6ghz_params[j].channel_idx == i))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			found = false;</div><div class='del'>-			unsolicited_probe_on_chan |=</div><div class='del'>-				scan_6ghz_params[j].unsolicited_probe;</div><div class='del'>-			psc_no_listen |= scan_6ghz_params[j].psc_no_listen;</div><div class='ctx'> </div><div class='del'>-			for (k = 0; k &lt; scan_ssid_num; k++) {</div><div class='add'>+			for (k = 0;</div><div class='add'>+			     k &lt; pp-&gt;short_ssid_num &amp;&amp; n_s_ssids &lt; max_s_ssids;</div><div class='add'>+			     k++) {</div><div class='ctx'> 				if (!scan_6ghz_params[j].unsolicited_probe &amp;&amp;</div><div class='del'>-				    le32_to_cpu(cmd_short_ssid[k]) ==</div><div class='add'>+				    le32_to_cpu(pp-&gt;short_ssid[k]) ==</div><div class='ctx'> 				    scan_6ghz_params[j].short_ssid) {</div><div class='ctx'> 					/* Relevant short SSID bit set */</div><div class='ctx'> 					if (s_ssid_bitmap &amp; BIT(k)) {</div><div class='hunk'>@@ -1777,38 +1891,48 @@ iwl_mvm_umac_scan_cfg_channels_v6_6g(struct iwl_mvm_scan_params *params,</div><div class='ctx'> 					}</div><div class='ctx'> </div><div class='ctx'> 					/*</div><div class='del'>-					 * Use short SSID only to create a new</div><div class='del'>-					 * iteration during channel dwell.</div><div class='add'>+					 * Prefer creating BSSID entries unless</div><div class='add'>+					 * the short SSID probe can be done in</div><div class='add'>+					 * the same channel dwell iteration.</div><div class='add'>+					 *</div><div class='add'>+					 * We also need to create a short SSID</div><div class='add'>+					 * entry for any hidden AP.</div><div class='ctx'> 					 */</div><div class='del'>-					if (n_used_bssid_entries &gt;= 3) {</div><div class='del'>-						s_ssid_bitmap |= BIT(k);</div><div class='del'>-						s_max++;</div><div class='del'>-						n_used_bssid_entries -= 3;</div><div class='del'>-						found = true;</div><div class='add'>+					if (3 * n_s_ssids &gt; n_bssids &amp;&amp;</div><div class='add'>+					    !pp-&gt;direct_scan[k].len)</div><div class='ctx'> 						break;</div><div class='del'>-					}</div><div class='add'>+</div><div class='add'>+					/* Hidden AP, cannot do passive scan */</div><div class='add'>+					if (pp-&gt;direct_scan[k].len)</div><div class='add'>+						allow_passive = false;</div><div class='add'>+</div><div class='add'>+					s_ssid_bitmap |= BIT(k);</div><div class='add'>+					n_s_ssids++;</div><div class='add'>+					found = true;</div><div class='add'>+					break;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (found)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			for (k = 0; k &lt; bssid_num; k++) {</div><div class='del'>-				if (!memcmp(&amp;cmd_bssid[ETH_ALEN * k],</div><div class='add'>+			for (k = 0; k &lt; pp-&gt;bssid_num; k++) {</div><div class='add'>+				if (!memcmp(&amp;pp-&gt;bssid_array[k],</div><div class='ctx'> 					    scan_6ghz_params[j].bssid,</div><div class='ctx'> 					    ETH_ALEN)) {</div><div class='ctx'> 					if (!(bssid_bitmap &amp; BIT(k))) {</div><div class='del'>-						bssid_bitmap |= BIT(k);</div><div class='del'>-						b_max++;</div><div class='del'>-						n_used_bssid_entries++;</div><div class='add'>+						if (n_bssids &lt; max_bssids) {</div><div class='add'>+							bssid_bitmap |= BIT(k);</div><div class='add'>+							n_bssids++;</div><div class='add'>+						} else {</div><div class='add'>+							force_passive = TRUE;</div><div class='add'>+						}</div><div class='ctx'> 					}</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		flags = bssid_bitmap | (s_ssid_bitmap &lt;&lt; 16);</div><div class='del'>-</div><div class='ctx'> 		if (cfg80211_channel_is_psc(params-&gt;channels[i]) &amp;&amp;</div><div class='ctx'> 		    psc_no_listen)</div><div class='ctx'> 			flags |= IWL_UHB_CHAN_CFG_FLAG_PSC_CHAN_NO_LISTEN;</div><div class='hunk'>@@ -1816,45 +1940,26 @@ iwl_mvm_umac_scan_cfg_channels_v6_6g(struct iwl_mvm_scan_params *params,</div><div class='ctx'> 		if (unsolicited_probe_on_chan)</div><div class='ctx'> 			flags |= IWL_UHB_CHAN_CFG_FLAG_UNSOLICITED_PROBE_RES;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * In the following cases apply passive scan:</div><div class='del'>-		 * 1. Non fragmented scan:</div><div class='del'>-		 *	- PSC channel with NO_LISTEN_FLAG on should be treated</div><div class='del'>-		 *	  like non PSC channel</div><div class='del'>-		 *	- Non PSC channel with more than 3 short SSIDs or more</div><div class='del'>-		 *	  than 9 BSSIDs.</div><div class='del'>-		 *	- Non PSC Channel with unsolicited probe response and</div><div class='del'>-		 *	  more than 2 short SSIDs or more than 6 BSSIDs.</div><div class='del'>-		 *	- PSC channel with more than 2 short SSIDs or more than</div><div class='del'>-		 *	  6 BSSIDs.</div><div class='del'>-		 * 3. Fragmented scan:</div><div class='del'>-		 *	- PSC channel with more than 1 SSID or 3 BSSIDs.</div><div class='del'>-		 *	- Non PSC channel with more than 2 SSIDs or 6 BSSIDs.</div><div class='del'>-		 *	- Non PSC channel with unsolicited probe response and</div><div class='del'>-		 *	  more than 1 SSID or more than 3 BSSIDs.</div><div class='del'>-		 */</div><div class='del'>-		if (!iwl_mvm_is_scan_fragmented(params-&gt;type)) {</div><div class='del'>-			if (!cfg80211_channel_is_psc(params-&gt;channels[i]) ||</div><div class='del'>-			    flags &amp; IWL_UHB_CHAN_CFG_FLAG_PSC_CHAN_NO_LISTEN) {</div><div class='del'>-				force_passive = (s_max &gt; 3 || b_max &gt; 9);</div><div class='del'>-				force_passive |= (unsolicited_probe_on_chan &amp;&amp;</div><div class='del'>-						  (s_max &gt; 2 || b_max &gt; 6));</div><div class='del'>-			} else {</div><div class='del'>-				force_passive = (s_max &gt; 2 || b_max &gt; 6);</div><div class='del'>-			}</div><div class='del'>-		} else if (cfg80211_channel_is_psc(params-&gt;channels[i])) {</div><div class='del'>-			force_passive = (s_max &gt; 1 || b_max &gt; 3);</div><div class='del'>-		} else {</div><div class='del'>-			force_passive = (s_max &gt; 2 || b_max &gt; 6);</div><div class='del'>-			force_passive |= (unsolicited_probe_on_chan &amp;&amp;</div><div class='del'>-					  (s_max &gt; 1 || b_max &gt; 3));</div><div class='del'>-		}</div><div class='del'>-		if (force_passive ||</div><div class='del'>-		    (!flags &amp;&amp; !cfg80211_channel_is_psc(params-&gt;channels[i])))</div><div class='add'>+		if ((allow_passive &amp;&amp; force_passive) ||</div><div class='add'>+		    (!(bssid_bitmap | s_ssid_bitmap) &amp;&amp;</div><div class='add'>+		     !cfg80211_channel_is_psc(params-&gt;channels[i])))</div><div class='ctx'> 			flags |= IWL_UHB_CHAN_CFG_FLAG_FORCE_PASSIVE;</div><div class='add'>+		else</div><div class='add'>+			flags |= bssid_bitmap | (s_ssid_bitmap &lt;&lt; 16);</div><div class='ctx'> </div><div class='del'>-		channel_cfg[i].flags |= cpu_to_le32(flags);</div><div class='add'>+		cfg-&gt;flags |= cpu_to_le32(flags);</div><div class='add'>+		if (version &gt;= 17)</div><div class='add'>+			cfg-&gt;v5.psd_20 = psd_20;</div><div class='add'>+</div><div class='add'>+		ch_cnt++;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (params-&gt;n_channels &gt; ch_cnt)</div><div class='add'>+		IWL_DEBUG_SCAN(mvm,</div><div class='add'>+			       "6GHz: reducing number channels: (%u-&gt;%u)\n",</div><div class='add'>+			       params-&gt;n_channels, ch_cnt);</div><div class='add'>+</div><div class='add'>+	return ch_cnt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u8 iwl_mvm_scan_umac_chan_flags_v2(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -1871,9 +1976,25 @@ static u8 iwl_mvm_scan_umac_chan_flags_v2(struct iwl_mvm *mvm,</div><div class='ctx'> 			IWL_SCAN_CHANNEL_FLAG_CACHE_ADD;</div><div class='ctx'> </div><div class='ctx'> 	/* set fragmented ebs for fragmented scan on HB channels */</div><div class='del'>-	if (iwl_mvm_is_scan_fragmented(params-&gt;hb_type))</div><div class='add'>+	if ((!iwl_mvm_is_cdb_supported(mvm) &amp;&amp;</div><div class='add'>+	     iwl_mvm_is_scan_fragmented(params-&gt;type)) ||</div><div class='add'>+	    (iwl_mvm_is_cdb_supported(mvm) &amp;&amp;</div><div class='add'>+	     iwl_mvm_is_scan_fragmented(params-&gt;hb_type)))</div><div class='ctx'> 		flags |= IWL_SCAN_CHANNEL_FLAG_EBS_FRAG;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * force EBS in case the scan is a fragmented and there is a need to take P2P</div><div class='add'>+	 * GO operation into consideration during scan operation.</div><div class='add'>+	 */</div><div class='add'>+	if ((!iwl_mvm_is_cdb_supported(mvm) &amp;&amp;</div><div class='add'>+	     iwl_mvm_is_scan_fragmented(params-&gt;type) &amp;&amp; params-&gt;respect_p2p_go) ||</div><div class='add'>+	    (iwl_mvm_is_cdb_supported(mvm) &amp;&amp;</div><div class='add'>+	     iwl_mvm_is_scan_fragmented(params-&gt;hb_type) &amp;&amp;</div><div class='add'>+	     params-&gt;respect_p2p_go_hb)) {</div><div class='add'>+		IWL_DEBUG_SCAN(mvm, "Respect P2P GO. Force EBS\n");</div><div class='add'>+		flags |= IWL_SCAN_CHANNEL_FLAG_FORCE_EBS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1905,22 +2026,19 @@ static void iwl_mvm_scan_6ghz_passive_scan(struct iwl_mvm *mvm,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * 6GHz passive scan is allowed while associated in a defined time</div><div class='del'>-	 * interval following HW reset or resume flow</div><div class='add'>+	 * 6GHz passive scan is allowed in a defined time interval following HW</div><div class='add'>+	 * reset or resume flow, or while not associated and a large interval</div><div class='add'>+	 * has passed since the last 6GHz passive scan.</div><div class='ctx'> 	 */</div><div class='del'>-	if (vif-&gt;bss_conf.assoc &amp;&amp;</div><div class='add'>+	if ((vif-&gt;cfg.assoc ||</div><div class='add'>+	     time_after(mvm-&gt;last_6ghz_passive_scan_jiffies +</div><div class='add'>+			(IWL_MVM_6GHZ_PASSIVE_SCAN_TIMEOUT * HZ), jiffies)) &amp;&amp;</div><div class='ctx'> 	    (time_before(mvm-&gt;last_reset_or_resume_time_jiffies +</div><div class='ctx'> 			 (IWL_MVM_6GHZ_PASSIVE_SCAN_ASSOC_TIMEOUT * HZ),</div><div class='ctx'> 			 jiffies))) {</div><div class='del'>-		IWL_DEBUG_SCAN(mvm, "6GHz passive scan: associated\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* No need for 6GHz passive scan if not enough time elapsed */</div><div class='del'>-	if (time_after(mvm-&gt;last_6ghz_passive_scan_jiffies +</div><div class='del'>-		       (IWL_MVM_6GHZ_PASSIVE_SCAN_TIMEOUT * HZ), jiffies)) {</div><div class='del'>-		IWL_DEBUG_SCAN(mvm,</div><div class='del'>-			       "6GHz passive scan: timeout did not expire\n");</div><div class='add'>+		IWL_DEBUG_SCAN(mvm, "6GHz passive scan: %s\n",</div><div class='add'>+			       vif-&gt;cfg.assoc ? "associated" :</div><div class='add'>+			       "timeout did not expire");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1976,8 +2094,16 @@ static u16 iwl_mvm_scan_umac_flags_v2(struct iwl_mvm *mvm,</div><div class='ctx'> {</div><div class='ctx'> 	u16 flags = 0;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If no direct SSIDs are provided perform a passive scan. Otherwise,</div><div class='add'>+	 * if there is a single SSID which is not the broadcast SSID, assume</div><div class='add'>+	 * that the scan is intended for roaming purposes and thus enable Rx on</div><div class='add'>+	 * all chains to improve chances of hearing the beacons/probe responses.</div><div class='add'>+	 */</div><div class='ctx'> 	if (params-&gt;n_ssids == 0)</div><div class='ctx'> 		flags |= IWL_UMAC_SCAN_GEN_FLAGS_V2_FORCE_PASSIVE;</div><div class='add'>+	else if (params-&gt;n_ssids == 1 &amp;&amp; params-&gt;ssids[0].ssid_len)</div><div class='add'>+		flags |= IWL_UMAC_SCAN_GEN_FLAGS_V2_USE_ALL_RX_CHAINS;</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_mvm_is_scan_fragmented(params-&gt;type))</div><div class='ctx'> 		flags |= IWL_UMAC_SCAN_GEN_FLAGS_V2_FRAGMENTED_LMAC1;</div><div class='hunk'>@@ -2010,6 +2136,45 @@ static u16 iwl_mvm_scan_umac_flags_v2(struct iwl_mvm *mvm,</div><div class='ctx'> 	if (params-&gt;enable_6ghz_passive)</div><div class='ctx'> 		flags |= IWL_UMAC_SCAN_GEN_FLAGS_V2_6GHZ_PASSIVE_SCAN;</div><div class='ctx'> </div><div class='add'>+	if (iwl_mvm_is_oce_supported(mvm) &amp;&amp;</div><div class='add'>+	    (params-&gt;flags &amp; (NL80211_SCAN_FLAG_ACCEPT_BCAST_PROBE_RESP |</div><div class='add'>+			      NL80211_SCAN_FLAG_OCE_PROBE_REQ_HIGH_TX_RATE |</div><div class='add'>+			      NL80211_SCAN_FLAG_FILS_MAX_CHANNEL_TIME)))</div><div class='add'>+		flags |= IWL_UMAC_SCAN_GEN_FLAGS_V2_OCE;</div><div class='add'>+</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 iwl_mvm_scan_umac_flags2(struct iwl_mvm *mvm,</div><div class='add'>+				   struct iwl_mvm_scan_params *params,</div><div class='add'>+				   struct ieee80211_vif *vif, int type,</div><div class='add'>+				   u16 gen_flags)</div><div class='add'>+{</div><div class='add'>+	u8 flags = 0;</div><div class='add'>+</div><div class='add'>+	if (iwl_mvm_is_cdb_supported(mvm)) {</div><div class='add'>+		if (params-&gt;respect_p2p_go)</div><div class='add'>+			flags |= IWL_UMAC_SCAN_GEN_PARAMS_FLAGS2_RESPECT_P2P_GO_LB;</div><div class='add'>+		if (params-&gt;respect_p2p_go_hb)</div><div class='add'>+			flags |= IWL_UMAC_SCAN_GEN_PARAMS_FLAGS2_RESPECT_P2P_GO_HB;</div><div class='add'>+	} else {</div><div class='add'>+		if (params-&gt;respect_p2p_go)</div><div class='add'>+			flags = IWL_UMAC_SCAN_GEN_PARAMS_FLAGS2_RESPECT_P2P_GO_LB |</div><div class='add'>+				IWL_UMAC_SCAN_GEN_PARAMS_FLAGS2_RESPECT_P2P_GO_HB;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (params-&gt;scan_6ghz &amp;&amp;</div><div class='add'>+	    fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			IWL_UCODE_TLV_CAPA_SCAN_DONT_TOGGLE_ANT))</div><div class='add'>+		flags |= IWL_UMAC_SCAN_GEN_PARAMS_FLAGS2_DONT_TOGGLE_ANT;</div><div class='add'>+</div><div class='add'>+	/* Passive and AP interface -&gt; ACS (automatic channel selection) */</div><div class='add'>+	if (gen_flags &amp; IWL_UMAC_SCAN_GEN_FLAGS_V2_FORCE_PASSIVE &amp;&amp;</div><div class='add'>+	    ieee80211_vif_type_p2p(vif) == NL80211_IFTYPE_AP &amp;&amp;</div><div class='add'>+	    iwl_fw_lookup_notif_ver(mvm-&gt;fw, SCAN_GROUP, CHANNEL_SURVEY_NOTIF,</div><div class='add'>+				    0) &gt;= 1)</div><div class='add'>+		flags |= IWL_UMAC_SCAN_GEN_FLAGS2_COLLECT_CHANNEL_STATS;</div><div class='add'>+</div><div class='ctx'> 	return flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2131,7 +2296,7 @@ static int iwl_mvm_scan_umac(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	struct iwl_scan_req_umac *cmd = mvm-&gt;scan_cmd;</div><div class='ctx'> 	struct iwl_scan_umac_chan_param *chan_param;</div><div class='ctx'> 	void *cmd_data = iwl_mvm_get_scan_req_umac_data(mvm);</div><div class='del'>-	void *sec_part = cmd_data + sizeof(struct iwl_scan_channel_cfg_umac) *</div><div class='add'>+	void *sec_part = (u8 *)cmd_data + sizeof(struct iwl_scan_channel_cfg_umac) *</div><div class='ctx'> 		mvm-&gt;fw-&gt;ucode_capa.n_scan_channels;</div><div class='ctx'> 	struct iwl_scan_req_umac_tail_v2 *tail_v2 =</div><div class='ctx'> 		(struct iwl_scan_req_umac_tail_v2 *)sec_part;</div><div class='hunk'>@@ -2147,8 +2312,6 @@ static int iwl_mvm_scan_umac(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_scan_umac_dwell(mvm, cmd, params);</div><div class='ctx'> </div><div class='del'>-	mvm-&gt;scan_uid_status[uid] = type;</div><div class='del'>-</div><div class='ctx'> 	cmd-&gt;uid = cpu_to_le32(uid);</div><div class='ctx'> 	gen_flags = iwl_mvm_scan_umac_flags(mvm, params, vif);</div><div class='ctx'> 	cmd-&gt;general_flags = cpu_to_le16(gen_flags);</div><div class='hunk'>@@ -2189,10 +2352,8 @@ static int iwl_mvm_scan_umac(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_mvm_fill_scan_sched_params(params, tail_v2-&gt;schedule,</div><div class='ctx'> 					     &amp;tail_v2-&gt;delay);</div><div class='del'>-	if (ret) {</div><div class='del'>-		mvm-&gt;scan_uid_status[uid] = 0;</div><div class='add'>+	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_mvm_is_scan_ext_chan_supported(mvm)) {</div><div class='ctx'> 		tail_v2-&gt;preq = params-&gt;preq;</div><div class='hunk'>@@ -2211,24 +2372,40 @@ static int iwl_mvm_scan_umac(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-iwl_mvm_scan_umac_fill_general_p_v10(struct iwl_mvm *mvm,</div><div class='add'>+iwl_mvm_scan_umac_fill_general_p_v12(struct iwl_mvm *mvm,</div><div class='ctx'> 				     struct iwl_mvm_scan_params *params,</div><div class='ctx'> 				     struct ieee80211_vif *vif,</div><div class='del'>-				     struct iwl_scan_general_params_v10 *gp,</div><div class='del'>-				     u16 gen_flags)</div><div class='add'>+				     struct iwl_scan_general_params_v11 *gp,</div><div class='add'>+				     u16 gen_flags, u8 gen_flags2,</div><div class='add'>+				     u32 version)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *scan_vif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_scan_umac_dwell_v10(mvm, gp, params);</div><div class='add'>+	iwl_mvm_scan_umac_dwell_v11(mvm, gp, params);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mvm, "General: flags=0x%x, flags2=0x%x\n",</div><div class='add'>+		       gen_flags, gen_flags2);</div><div class='ctx'> </div><div class='ctx'> 	gp-&gt;flags = cpu_to_le16(gen_flags);</div><div class='add'>+	gp-&gt;flags2 = gen_flags2;</div><div class='ctx'> </div><div class='ctx'> 	if (gen_flags &amp; IWL_UMAC_SCAN_GEN_FLAGS_V2_FRAGMENTED_LMAC1)</div><div class='ctx'> 		gp-&gt;num_of_fragments[SCAN_LB_LMAC_IDX] = IWL_SCAN_NUM_OF_FRAGS;</div><div class='ctx'> 	if (gen_flags &amp; IWL_UMAC_SCAN_GEN_FLAGS_V2_FRAGMENTED_LMAC2)</div><div class='ctx'> 		gp-&gt;num_of_fragments[SCAN_HB_LMAC_IDX] = IWL_SCAN_NUM_OF_FRAGS;</div><div class='ctx'> </div><div class='del'>-	gp-&gt;scan_start_mac_id = scan_vif-&gt;id;</div><div class='add'>+	mvm-&gt;scan_link_id = 0;</div><div class='add'>+</div><div class='add'>+	if (version &lt; 16) {</div><div class='add'>+		gp-&gt;scan_start_mac_or_link_id = scan_vif-&gt;id;</div><div class='add'>+	} else {</div><div class='add'>+		struct iwl_mvm_vif_link_info *link_info =</div><div class='add'>+			scan_vif-&gt;link[params-&gt;tsf_report_link_id];</div><div class='add'>+</div><div class='add'>+		mvm-&gt;scan_link_id = params-&gt;tsf_report_link_id;</div><div class='add'>+		if (!WARN_ON(!link_info))</div><div class='add'>+			gp-&gt;scan_start_mac_or_link_id = link_info-&gt;fw_link_id;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -2267,21 +2444,22 @@ iwl_mvm_scan_umac_fill_ch_p_v4(struct iwl_mvm *mvm,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-iwl_mvm_scan_umac_fill_ch_p_v6(struct iwl_mvm *mvm,</div><div class='add'>+iwl_mvm_scan_umac_fill_ch_p_v7(struct iwl_mvm *mvm,</div><div class='ctx'> 			       struct iwl_mvm_scan_params *params,</div><div class='ctx'> 			       struct ieee80211_vif *vif,</div><div class='del'>-			       struct iwl_scan_channel_params_v6 *cp,</div><div class='del'>-			       u32 channel_cfg_flags)</div><div class='add'>+			       struct iwl_scan_channel_params_v7 *cp,</div><div class='add'>+			       u32 channel_cfg_flags,</div><div class='add'>+			       u32 version)</div><div class='ctx'> {</div><div class='ctx'> 	cp-&gt;flags = iwl_mvm_scan_umac_chan_flags_v2(mvm, params, vif);</div><div class='ctx'> 	cp-&gt;count = params-&gt;n_channels;</div><div class='ctx'> 	cp-&gt;n_aps_override[0] = IWL_SCAN_ADWELL_N_APS_GO_FRIENDLY;</div><div class='ctx'> 	cp-&gt;n_aps_override[1] = IWL_SCAN_ADWELL_N_APS_SOCIAL_CHS;</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_umac_scan_cfg_channels_v6(mvm, params-&gt;channels, cp,</div><div class='add'>+	iwl_mvm_umac_scan_cfg_channels_v7(mvm, params-&gt;channels, cp,</div><div class='ctx'> 					  params-&gt;n_channels,</div><div class='ctx'> 					  channel_cfg_flags,</div><div class='del'>-					  vif-&gt;type);</div><div class='add'>+					  vif-&gt;type, version);</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;enable_6ghz_passive) {</div><div class='ctx'> 		struct ieee80211_supported_band *sband =</div><div class='hunk'>@@ -2298,11 +2476,19 @@ iwl_mvm_scan_umac_fill_ch_p_v6(struct iwl_mvm *mvm,</div><div class='ctx'> 			if (!cfg80211_channel_is_psc(channel))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			cfg-&gt;flags = 0;</div><div class='del'>-			cfg-&gt;v2.channel_num = channel-&gt;hw_value;</div><div class='del'>-			cfg-&gt;v2.band = PHY_BAND_6;</div><div class='del'>-			cfg-&gt;v2.iter_count = 1;</div><div class='del'>-			cfg-&gt;v2.iter_interval = 0;</div><div class='add'>+			cfg-&gt;channel_num = channel-&gt;hw_value;</div><div class='add'>+			cfg-&gt;v5.iter_count = 1;</div><div class='add'>+			cfg-&gt;v5.iter_interval = 0;</div><div class='add'>+</div><div class='add'>+			if (version &lt; 17) {</div><div class='add'>+				cfg-&gt;flags = 0;</div><div class='add'>+				cfg-&gt;v2.band = PHY_BAND_6;</div><div class='add'>+			} else {</div><div class='add'>+				cfg-&gt;flags = cpu_to_le32(PHY_BAND_6 &lt;&lt;</div><div class='add'>+							 IWL_CHAN_CFG_FLAGS_BAND_POS);</div><div class='add'>+				cfg-&gt;v5.psd_20 =</div><div class='add'>+					IEEE80211_RNR_TBTT_PARAMS_PSD_RESERVED;</div><div class='add'>+			}</div><div class='ctx'> 			cp-&gt;count++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2317,19 +2503,17 @@ static int iwl_mvm_scan_umac_v12(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u16 gen_flags;</div><div class='ctx'> </div><div class='del'>-	mvm-&gt;scan_uid_status[uid] = type;</div><div class='del'>-</div><div class='del'>-	cmd-&gt;ooc_priority = cpu_to_le32(iwl_mvm_scan_umac_ooc_priority(params));</div><div class='add'>+	cmd-&gt;ooc_priority = cpu_to_le32(iwl_mvm_scan_umac_ooc_priority(type));</div><div class='ctx'> 	cmd-&gt;uid = cpu_to_le32(uid);</div><div class='ctx'> </div><div class='ctx'> 	gen_flags = iwl_mvm_scan_umac_flags_v2(mvm, params, vif, type);</div><div class='del'>-	iwl_mvm_scan_umac_fill_general_p_v10(mvm, params, vif,</div><div class='add'>+	iwl_mvm_scan_umac_fill_general_p_v12(mvm, params, vif,</div><div class='ctx'> 					     &amp;scan_p-&gt;general_params,</div><div class='del'>-					     gen_flags);</div><div class='add'>+					     gen_flags, 0, 12);</div><div class='ctx'> </div><div class='del'>-	 ret = iwl_mvm_fill_scan_sched_params(params,</div><div class='del'>-					      scan_p-&gt;periodic_params.schedule,</div><div class='del'>-					      &amp;scan_p-&gt;periodic_params.delay);</div><div class='add'>+	ret = iwl_mvm_fill_scan_sched_params(params,</div><div class='add'>+					     scan_p-&gt;periodic_params.schedule,</div><div class='add'>+					     &amp;scan_p-&gt;periodic_params.delay);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -2340,61 +2524,67 @@ static int iwl_mvm_scan_umac_v12(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_scan_umac_v14(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='del'>-				 struct iwl_mvm_scan_params *params, int type,</div><div class='del'>-				 int uid)</div><div class='add'>+static int iwl_mvm_scan_umac_v14_and_above(struct iwl_mvm *mvm,</div><div class='add'>+					   struct ieee80211_vif *vif,</div><div class='add'>+					   struct iwl_mvm_scan_params *params,</div><div class='add'>+					   int type, int uid, u32 version)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_scan_req_umac_v14 *cmd = mvm-&gt;scan_cmd;</div><div class='del'>-	struct iwl_scan_req_params_v14 *scan_p = &amp;cmd-&gt;scan_params;</div><div class='del'>-	struct iwl_scan_channel_params_v6 *cp = &amp;scan_p-&gt;channel_params;</div><div class='add'>+	struct iwl_scan_req_umac_v17 *cmd = mvm-&gt;scan_cmd;</div><div class='add'>+	struct iwl_scan_req_params_v17 *scan_p = &amp;cmd-&gt;scan_params;</div><div class='add'>+	struct iwl_scan_channel_params_v7 *cp = &amp;scan_p-&gt;channel_params;</div><div class='ctx'> 	struct iwl_scan_probe_params_v4 *pb = &amp;scan_p-&gt;probe_params;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u16 gen_flags;</div><div class='add'>+	u8 gen_flags2;</div><div class='ctx'> 	u32 bitmap_ssid = 0;</div><div class='ctx'> </div><div class='del'>-	mvm-&gt;scan_uid_status[uid] = type;</div><div class='del'>-</div><div class='del'>-	cmd-&gt;ooc_priority = cpu_to_le32(iwl_mvm_scan_umac_ooc_priority(params));</div><div class='add'>+	cmd-&gt;ooc_priority = cpu_to_le32(iwl_mvm_scan_umac_ooc_priority(type));</div><div class='ctx'> 	cmd-&gt;uid = cpu_to_le32(uid);</div><div class='ctx'> </div><div class='ctx'> 	gen_flags = iwl_mvm_scan_umac_flags_v2(mvm, params, vif, type);</div><div class='del'>-	iwl_mvm_scan_umac_fill_general_p_v10(mvm, params, vif,</div><div class='add'>+</div><div class='add'>+	if (version &gt;= 15)</div><div class='add'>+		gen_flags2 = iwl_mvm_scan_umac_flags2(mvm, params, vif, type,</div><div class='add'>+						      gen_flags);</div><div class='add'>+	else</div><div class='add'>+		gen_flags2 = 0;</div><div class='add'>+</div><div class='add'>+	iwl_mvm_scan_umac_fill_general_p_v12(mvm, params, vif,</div><div class='ctx'> 					     &amp;scan_p-&gt;general_params,</div><div class='del'>-					     gen_flags);</div><div class='add'>+					     gen_flags, gen_flags2, version);</div><div class='ctx'> </div><div class='del'>-	 ret = iwl_mvm_fill_scan_sched_params(params,</div><div class='del'>-					      scan_p-&gt;periodic_params.schedule,</div><div class='del'>-					      &amp;scan_p-&gt;periodic_params.delay);</div><div class='add'>+	ret = iwl_mvm_fill_scan_sched_params(params,</div><div class='add'>+					     scan_p-&gt;periodic_params.schedule,</div><div class='add'>+					     &amp;scan_p-&gt;periodic_params.delay);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_scan_umac_fill_probe_p_v4(params, &amp;scan_p-&gt;probe_params,</div><div class='del'>-					  &amp;bitmap_ssid);</div><div class='ctx'> 	if (!params-&gt;scan_6ghz) {</div><div class='del'>-		iwl_mvm_scan_umac_fill_ch_p_v6(mvm, params, vif,</div><div class='del'>-					       &amp;scan_p-&gt;channel_params, bitmap_ssid);</div><div class='del'>-</div><div class='add'>+		iwl_mvm_scan_umac_fill_probe_p_v4(params,</div><div class='add'>+						  &amp;scan_p-&gt;probe_params,</div><div class='add'>+						  &amp;bitmap_ssid);</div><div class='add'>+		iwl_mvm_scan_umac_fill_ch_p_v7(mvm, params, vif,</div><div class='add'>+					       &amp;scan_p-&gt;channel_params,</div><div class='add'>+					       bitmap_ssid,</div><div class='add'>+					       version);</div><div class='ctx'> 		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		pb-&gt;preq = params-&gt;preq;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	cp-&gt;flags = iwl_mvm_scan_umac_chan_flags_v2(mvm, params, vif);</div><div class='ctx'> 	cp-&gt;n_aps_override[0] = IWL_SCAN_ADWELL_N_APS_GO_FRIENDLY;</div><div class='ctx'> 	cp-&gt;n_aps_override[1] = IWL_SCAN_ADWELL_N_APS_SOCIAL_CHS;</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_umac_scan_fill_6g_chan_list(params, pb-&gt;short_ssid,</div><div class='del'>-						  pb-&gt;bssid_array[0],</div><div class='del'>-						  &amp;pb-&gt;short_ssid_num,</div><div class='del'>-						  &amp;pb-&gt;bssid_num);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	iwl_mvm_umac_scan_fill_6g_chan_list(mvm, params, pb);</div><div class='add'>+</div><div class='add'>+	cp-&gt;count = iwl_mvm_umac_scan_cfg_channels_v7_6g(mvm, params,</div><div class='add'>+							 params-&gt;n_channels,</div><div class='add'>+							 pb, cp, vif-&gt;type,</div><div class='add'>+							 version);</div><div class='add'>+	if (!cp-&gt;count)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_umac_scan_cfg_channels_v6_6g(params,</div><div class='del'>-					     params-&gt;n_channels,</div><div class='del'>-					     pb-&gt;short_ssid,</div><div class='del'>-					     pb-&gt;bssid_array[0],</div><div class='del'>-					     pb-&gt;short_ssid_num,</div><div class='del'>-					     pb-&gt;bssid_num, cp,</div><div class='del'>-					     vif-&gt;type);</div><div class='del'>-	cp-&gt;count = params-&gt;n_channels;</div><div class='ctx'> 	if (!params-&gt;n_ssids ||</div><div class='ctx'> 	    (params-&gt;n_ssids == 1 &amp;&amp; !params-&gt;ssids[0].ssid_len))</div><div class='ctx'> 		cp-&gt;flags |= IWL_SCAN_CHANNEL_FLAG_6G_PSC_NO_FILTER;</div><div class='hunk'>@@ -2402,6 +2592,34 @@ static int iwl_mvm_scan_umac_v14(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int iwl_mvm_scan_umac_v14(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+				 struct iwl_mvm_scan_params *params, int type,</div><div class='add'>+				 int uid)</div><div class='add'>+{</div><div class='add'>+	return iwl_mvm_scan_umac_v14_and_above(mvm, vif, params, type, uid, 14);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_scan_umac_v15(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+				 struct iwl_mvm_scan_params *params, int type,</div><div class='add'>+				 int uid)</div><div class='add'>+{</div><div class='add'>+	return iwl_mvm_scan_umac_v14_and_above(mvm, vif, params, type, uid, 15);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_scan_umac_v16(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+				 struct iwl_mvm_scan_params *params, int type,</div><div class='add'>+				 int uid)</div><div class='add'>+{</div><div class='add'>+	return iwl_mvm_scan_umac_v14_and_above(mvm, vif, params, type, uid, 16);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_scan_umac_v17(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+				 struct iwl_mvm_scan_params *params, int type,</div><div class='add'>+				 int uid)</div><div class='add'>+{</div><div class='add'>+	return iwl_mvm_scan_umac_v14_and_above(mvm, vif, params, type, uid, 17);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int iwl_mvm_num_scans(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='ctx'> 	return hweight32(mvm-&gt;scan_status &amp; IWL_MVM_SCAN_MASK);</div><div class='hunk'>@@ -2475,7 +2693,7 @@ static int iwl_mvm_check_running_scans(struct iwl_mvm *mvm, int type)</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define SCAN_TIMEOUT 20000</div><div class='add'>+#define SCAN_TIMEOUT 30000</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_scan_timeout_wk(struct work_struct *work)</div><div class='ctx'> {</div><div class='hunk'>@@ -2517,10 +2735,96 @@ struct iwl_scan_umac_handler {</div><div class='ctx'> </div><div class='ctx'> static const struct iwl_scan_umac_handler iwl_scan_umac_handlers[] = {</div><div class='ctx'> 	/* set the newest version first to shorten the list traverse time */</div><div class='add'>+	IWL_SCAN_UMAC_HANDLER(17),</div><div class='add'>+	IWL_SCAN_UMAC_HANDLER(16),</div><div class='add'>+	IWL_SCAN_UMAC_HANDLER(15),</div><div class='ctx'> 	IWL_SCAN_UMAC_HANDLER(14),</div><div class='ctx'> 	IWL_SCAN_UMAC_HANDLER(12),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void iwl_mvm_mei_scan_work(struct work_struct *wk)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mei_scan_filter *scan_filter =</div><div class='add'>+		container_of(wk, struct iwl_mei_scan_filter, scan_work);</div><div class='add'>+	struct iwl_mvm *mvm =</div><div class='add'>+		container_of(scan_filter, struct iwl_mvm, mei_scan_filter);</div><div class='add'>+	struct iwl_mvm_csme_conn_info *info;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	info = iwl_mvm_get_csme_conn_info(mvm);</div><div class='add'>+	memcpy(bssid, info-&gt;conn_info.bssid, ETH_ALEN);</div><div class='add'>+	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	while ((skb = skb_dequeue(&amp;scan_filter-&gt;scan_res))) {</div><div class='add'>+		struct ieee80211_mgmt *mgmt = (void *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (!memcmp(mgmt-&gt;bssid, bssid, ETH_ALEN))</div><div class='add'>+			ieee80211_rx_irqsafe(mvm-&gt;hw, skb);</div><div class='add'>+		else</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_mei_scan_filter_init(struct iwl_mei_scan_filter *mei_scan_filter)</div><div class='add'>+{</div><div class='add'>+	skb_queue_head_init(&amp;mei_scan_filter-&gt;scan_res);</div><div class='add'>+	INIT_WORK(&amp;mei_scan_filter-&gt;scan_work, iwl_mvm_mei_scan_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* In case CSME is connected and has link protection set, this function will</div><div class='add'>+ * override the scan request to scan only the associated channel and only for</div><div class='add'>+ * the associated SSID.</div><div class='add'>+ */</div><div class='add'>+static void iwl_mvm_mei_limited_scan(struct iwl_mvm *mvm,</div><div class='add'>+				     struct iwl_mvm_scan_params *params)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_csme_conn_info *info = iwl_mvm_get_csme_conn_info(mvm);</div><div class='add'>+	struct iwl_mei_conn_info *conn_info;</div><div class='add'>+	struct ieee80211_channel *chan;</div><div class='add'>+	int scan_iters, i;</div><div class='add'>+</div><div class='add'>+	if (!info) {</div><div class='add'>+		IWL_DEBUG_SCAN(mvm, "mei_limited_scan: no connection info\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conn_info = &amp;info-&gt;conn_info;</div><div class='add'>+	if (!info-&gt;conn_info.lp_state || !info-&gt;conn_info.ssid_len)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!params-&gt;n_channels || !params-&gt;n_ssids)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mvm-&gt;mei_scan_filter.is_mei_limited_scan = true;</div><div class='add'>+</div><div class='add'>+	chan = ieee80211_get_channel(mvm-&gt;hw-&gt;wiphy,</div><div class='add'>+				     ieee80211_channel_to_frequency(conn_info-&gt;channel,</div><div class='add'>+								    conn_info-&gt;band));</div><div class='add'>+	if (!chan) {</div><div class='add'>+		IWL_DEBUG_SCAN(mvm,</div><div class='add'>+			       "Failed to get CSME channel (chan=%u band=%u)\n",</div><div class='add'>+			       conn_info-&gt;channel, conn_info-&gt;band);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The mei filtered scan must find the AP, otherwise CSME will</div><div class='add'>+	 * take the NIC ownership. Add several iterations on the channel to</div><div class='add'>+	 * make the scan more robust.</div><div class='add'>+	 */</div><div class='add'>+	scan_iters = min(IWL_MEI_SCAN_NUM_ITER, params-&gt;n_channels);</div><div class='add'>+	params-&gt;n_channels = scan_iters;</div><div class='add'>+	for (i = 0; i &lt; scan_iters; i++)</div><div class='add'>+		params-&gt;channels[i] = chan;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mvm, "Mei scan: num iterations=%u\n", scan_iters);</div><div class='add'>+</div><div class='add'>+	params-&gt;n_ssids = 1;</div><div class='add'>+	params-&gt;ssids[0].ssid_len = conn_info-&gt;ssid_len;</div><div class='add'>+	memcpy(params-&gt;ssids[0].ssid, conn_info-&gt;ssid, conn_info-&gt;ssid_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int iwl_mvm_build_scan_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 				  struct ieee80211_vif *vif,</div><div class='ctx'> 				  struct iwl_host_cmd *hcmd,</div><div class='hunk'>@@ -2531,7 +2835,9 @@ static int iwl_mvm_build_scan_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 	u8 scan_ver;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='del'>-	memset(mvm-&gt;scan_cmd, 0, ksize(mvm-&gt;scan_cmd));</div><div class='add'>+	memset(mvm-&gt;scan_cmd, 0, mvm-&gt;scan_cmd_size);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_mei_limited_scan(mvm, params);</div><div class='ctx'> </div><div class='ctx'> 	if (!fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa, IWL_UCODE_TLV_CAPA_UMAC_SCAN)) {</div><div class='ctx'> 		hcmd-&gt;id = SCAN_OFFLOAD_REQUEST_CMD;</div><div class='hunk'>@@ -2543,10 +2849,9 @@ static int iwl_mvm_build_scan_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 	if (uid &lt; 0)</div><div class='ctx'> 		return uid;</div><div class='ctx'> </div><div class='del'>-	hcmd-&gt;id = iwl_cmd_id(SCAN_REQ_UMAC, IWL_ALWAYS_LONG_GROUP, 0);</div><div class='add'>+	hcmd-&gt;id = WIDE_ID(IWL_ALWAYS_LONG_GROUP, SCAN_REQ_UMAC);</div><div class='ctx'> </div><div class='del'>-	scan_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, IWL_ALWAYS_LONG_GROUP,</div><div class='del'>-					 SCAN_REQ_UMAC,</div><div class='add'>+	scan_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, SCAN_REQ_UMAC,</div><div class='ctx'> 					 IWL_FW_CMD_VER_UNKNOWN);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(iwl_scan_umac_handlers); i++) {</div><div class='hunk'>@@ -2556,7 +2861,8 @@ static int iwl_mvm_build_scan_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 		if (ver_handler-&gt;version != scan_ver)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		return ver_handler-&gt;handler(mvm, vif, params, type, uid);</div><div class='add'>+		err = ver_handler-&gt;handler(mvm, vif, params, type, uid);</div><div class='add'>+		return err ? : uid;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = iwl_mvm_scan_umac(mvm, vif, params, type, uid);</div><div class='hunk'>@@ -2566,9 +2872,102 @@ static int iwl_mvm_build_scan_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 	return uid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwl_mvm_reg_scan_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='del'>-			   struct cfg80211_scan_request *req,</div><div class='del'>-			   struct ieee80211_scan_ies *ies)</div><div class='add'>+struct iwl_mvm_scan_respect_p2p_go_iter_data {</div><div class='add'>+	struct ieee80211_vif *current_vif;</div><div class='add'>+	bool p2p_go;</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_scan_respect_p2p_go_iter(void *_data, u8 *mac,</div><div class='add'>+					     struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_scan_respect_p2p_go_iter_data *data = _data;</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	/* exclude the given vif */</div><div class='add'>+	if (vif == data-&gt;current_vif)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_type_p2p(vif) == NL80211_IFTYPE_P2P_GO) {</div><div class='add'>+		u32 link_id;</div><div class='add'>+</div><div class='add'>+		for (link_id = 0;</div><div class='add'>+		     link_id &lt; ARRAY_SIZE(mvmvif-&gt;link);</div><div class='add'>+		     link_id++) {</div><div class='add'>+			struct iwl_mvm_vif_link_info *link =</div><div class='add'>+				mvmvif-&gt;link[link_id];</div><div class='add'>+</div><div class='add'>+			if (link &amp;&amp; link-&gt;phy_ctxt-&gt;id &lt; NUM_PHY_CTX &amp;&amp;</div><div class='add'>+			    (data-&gt;band == NUM_NL80211_BANDS ||</div><div class='add'>+			     link-&gt;phy_ctxt-&gt;channel-&gt;band == data-&gt;band)) {</div><div class='add'>+				data-&gt;p2p_go = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool _iwl_mvm_get_respect_p2p_go(struct iwl_mvm *mvm,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					bool low_latency,</div><div class='add'>+					enum nl80211_band band)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_scan_respect_p2p_go_iter_data data = {</div><div class='add'>+		.current_vif = vif,</div><div class='add'>+		.p2p_go = false,</div><div class='add'>+		.band = band,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!low_latency)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_atomic(mvm-&gt;hw,</div><div class='add'>+						   IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						   iwl_mvm_scan_respect_p2p_go_iter,</div><div class='add'>+						   &amp;data);</div><div class='add'>+</div><div class='add'>+	return data.p2p_go;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mvm_get_respect_p2p_go_band(struct iwl_mvm *mvm,</div><div class='add'>+					    struct ieee80211_vif *vif,</div><div class='add'>+					    enum nl80211_band band)</div><div class='add'>+{</div><div class='add'>+	bool low_latency = iwl_mvm_low_latency_band(mvm, band);</div><div class='add'>+</div><div class='add'>+	return _iwl_mvm_get_respect_p2p_go(mvm, vif, low_latency, band);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mvm_get_respect_p2p_go(struct iwl_mvm *mvm,</div><div class='add'>+				       struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	bool low_latency = iwl_mvm_low_latency(mvm);</div><div class='add'>+</div><div class='add'>+	return _iwl_mvm_get_respect_p2p_go(mvm, vif, low_latency,</div><div class='add'>+					   NUM_NL80211_BANDS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_fill_respect_p2p_go(struct iwl_mvm *mvm,</div><div class='add'>+					struct iwl_mvm_scan_params *params,</div><div class='add'>+					struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	if (iwl_mvm_is_cdb_supported(mvm)) {</div><div class='add'>+		params-&gt;respect_p2p_go =</div><div class='add'>+			iwl_mvm_get_respect_p2p_go_band(mvm, vif,</div><div class='add'>+							NL80211_BAND_2GHZ);</div><div class='add'>+		params-&gt;respect_p2p_go_hb =</div><div class='add'>+			iwl_mvm_get_respect_p2p_go_band(mvm, vif,</div><div class='add'>+							NL80211_BAND_5GHZ);</div><div class='add'>+	} else {</div><div class='add'>+		params-&gt;respect_p2p_go = iwl_mvm_get_respect_p2p_go(mvm, vif);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int _iwl_mvm_single_scan_start(struct iwl_mvm *mvm,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      struct cfg80211_scan_request *req,</div><div class='add'>+				      struct ieee80211_scan_ies *ies,</div><div class='add'>+				      int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_host_cmd hcmd = {</div><div class='ctx'> 		.len = { iwl_mvm_scan_size(mvm), },</div><div class='hunk'>@@ -2586,7 +2985,7 @@ int iwl_mvm_reg_scan_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_check_running_scans(mvm, IWL_MVM_SCAN_REGULAR);</div><div class='add'>+	ret = iwl_mvm_check_running_scans(mvm, type);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -2609,6 +3008,7 @@ int iwl_mvm_reg_scan_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	params.pass_all = true;</div><div class='ctx'> 	params.n_match_sets = 0;</div><div class='ctx'> 	params.match_sets = NULL;</div><div class='add'>+	ether_addr_copy(params.bssid, req-&gt;bssid);</div><div class='ctx'> </div><div class='ctx'> 	params.scan_plans = &amp;scan_plan;</div><div class='ctx'> 	params.n_scan_plans = 1;</div><div class='hunk'>@@ -2617,16 +3017,24 @@ int iwl_mvm_reg_scan_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	params.scan_6ghz_params = req-&gt;scan_6ghz_params;</div><div class='ctx'> 	params.scan_6ghz = req-&gt;scan_6ghz;</div><div class='ctx'> 	iwl_mvm_fill_scan_type(mvm, &amp;params, vif);</div><div class='add'>+	iwl_mvm_fill_respect_p2p_go(mvm, &amp;params, vif);</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;duration)</div><div class='ctx'> 		params.iter_notif = true;</div><div class='ctx'> </div><div class='add'>+	params.tsf_report_link_id = req-&gt;tsf_report_link_id;</div><div class='add'>+	if (params.tsf_report_link_id &lt; 0) {</div><div class='add'>+		if (vif-&gt;active_links)</div><div class='add'>+			params.tsf_report_link_id = __ffs(vif-&gt;active_links);</div><div class='add'>+		else</div><div class='add'>+			params.tsf_report_link_id = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	iwl_mvm_build_scan_probe(mvm, vif, ies, &amp;params);</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_scan_6ghz_passive_scan(mvm, &amp;params, vif);</div><div class='ctx'> </div><div class='del'>-	uid = iwl_mvm_build_scan_cmd(mvm, vif, &amp;hcmd, &amp;params,</div><div class='del'>-				     IWL_MVM_SCAN_REGULAR);</div><div class='add'>+	uid = iwl_mvm_build_scan_cmd(mvm, vif, &amp;hcmd, &amp;params, type);</div><div class='ctx'> </div><div class='ctx'> 	if (uid &lt; 0)</div><div class='ctx'> 		return uid;</div><div class='hunk'>@@ -2641,23 +3049,35 @@ int iwl_mvm_reg_scan_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 		 */</div><div class='ctx'> 		IWL_ERR(mvm, "Scan failed! ret %d\n", ret);</div><div class='ctx'> 		iwl_mvm_resume_tcm(mvm);</div><div class='del'>-		mvm-&gt;scan_uid_status[uid] = 0;</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_SCAN(mvm, "Scan request was sent successfully\n");</div><div class='del'>-	mvm-&gt;scan_status |= IWL_MVM_SCAN_REGULAR;</div><div class='del'>-	mvm-&gt;scan_vif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	IWL_DEBUG_SCAN(mvm, "Scan request send success: type=%u, uid=%u\n",</div><div class='add'>+		       type, uid);</div><div class='add'>+</div><div class='add'>+	mvm-&gt;scan_uid_status[uid] = type;</div><div class='add'>+	mvm-&gt;scan_status |= type;</div><div class='add'>+</div><div class='add'>+	if (type == IWL_MVM_SCAN_REGULAR) {</div><div class='add'>+		mvm-&gt;scan_vif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+		schedule_delayed_work(&amp;mvm-&gt;scan_timeout_dwork,</div><div class='add'>+				      msecs_to_jiffies(SCAN_TIMEOUT));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (params.enable_6ghz_passive)</div><div class='ctx'> 		mvm-&gt;last_6ghz_passive_scan_jiffies = jiffies;</div><div class='ctx'> </div><div class='del'>-	schedule_delayed_work(&amp;mvm-&gt;scan_timeout_dwork,</div><div class='del'>-			      msecs_to_jiffies(SCAN_TIMEOUT));</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int iwl_mvm_reg_scan_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			   struct cfg80211_scan_request *req,</div><div class='add'>+			   struct ieee80211_scan_ies *ies)</div><div class='add'>+{</div><div class='add'>+	return _iwl_mvm_single_scan_start(mvm, vif, req, ies,</div><div class='add'>+					  IWL_MVM_SCAN_REGULAR);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,</div><div class='ctx'> 			     struct ieee80211_vif *vif,</div><div class='ctx'> 			     struct cfg80211_sched_scan_request *req,</div><div class='hunk'>@@ -2701,6 +3121,7 @@ int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,</div><div class='ctx'> 	params.pass_all =  iwl_mvm_scan_pass_all(mvm, req);</div><div class='ctx'> 	params.n_match_sets = req-&gt;n_match_sets;</div><div class='ctx'> 	params.match_sets = req-&gt;match_sets;</div><div class='add'>+	eth_broadcast_addr(params.bssid);</div><div class='ctx'> 	if (!req-&gt;n_scan_plans)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -2708,6 +3129,7 @@ int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,</div><div class='ctx'> 	params.scan_plans = req-&gt;scan_plans;</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_fill_scan_type(mvm, &amp;params, vif);</div><div class='add'>+	iwl_mvm_fill_respect_p2p_go(mvm, &amp;params, vif);</div><div class='ctx'> </div><div class='ctx'> 	/* In theory, LMAC scans can handle a 32-bit delay, but since</div><div class='ctx'> 	 * waiting for over 18 hours to start the scan is a bit silly</div><div class='hunk'>@@ -2756,23 +3178,23 @@ int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,</div><div class='ctx'> 		params.n_channels = j;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (non_psc_included &amp;&amp;</div><div class='del'>-	    !iwl_mvm_scan_fits(mvm, req-&gt;n_ssids, ies, params.n_channels)) {</div><div class='del'>-		kfree(params.channels);</div><div class='del'>-		return -ENOBUFS;</div><div class='add'>+	if (!iwl_mvm_scan_fits(mvm, req-&gt;n_ssids, ies, params.n_channels)) {</div><div class='add'>+		ret = -ENOBUFS;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	uid = iwl_mvm_build_scan_cmd(mvm, vif, &amp;hcmd, &amp;params, type);</div><div class='del'>-</div><div class='del'>-	if (non_psc_included)</div><div class='del'>-		kfree(params.channels);</div><div class='del'>-	if (uid &lt; 0)</div><div class='del'>-		return uid;</div><div class='add'>+	if (uid &lt; 0) {</div><div class='add'>+		ret = uid;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_mvm_send_cmd(mvm, &amp;hcmd);</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		IWL_DEBUG_SCAN(mvm,</div><div class='del'>-			       "Sched scan request was sent successfully\n");</div><div class='add'>+			       "Sched scan request send success: type=%u, uid=%u\n",</div><div class='add'>+			       type, uid);</div><div class='add'>+		mvm-&gt;scan_uid_status[uid] = type;</div><div class='ctx'> 		mvm-&gt;scan_status |= type;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* If the scan failed, it usually means that the FW was unable</div><div class='hunk'>@@ -2780,10 +3202,12 @@ int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,</div><div class='ctx'> 		 * should try to send the command again with different params.</div><div class='ctx'> 		 */</div><div class='ctx'> 		IWL_ERR(mvm, "Sched scan failed! ret %d\n", ret);</div><div class='del'>-		mvm-&gt;scan_uid_status[uid] = 0;</div><div class='ctx'> 		mvm-&gt;sched_scan_pass_all = SCHED_SCAN_PASS_ALL_DISABLED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='add'>+	if (non_psc_included)</div><div class='add'>+		kfree(params.channels);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2795,6 +3219,23 @@ void iwl_mvm_rx_umac_scan_complete_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 	u32 uid = __le32_to_cpu(notif-&gt;uid);</div><div class='ctx'> 	bool aborted = (notif-&gt;status == IWL_SCAN_OFFLOAD_ABORTED);</div><div class='ctx'> </div><div class='add'>+	mvm-&gt;mei_scan_filter.is_mei_limited_scan = false;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mvm,</div><div class='add'>+		       "Scan completed: uid=%u type=%u, status=%s, EBS=%s\n",</div><div class='add'>+		       uid, mvm-&gt;scan_uid_status[uid],</div><div class='add'>+		       notif-&gt;status == IWL_SCAN_OFFLOAD_COMPLETED ?</div><div class='add'>+				"completed" : "aborted",</div><div class='add'>+		       iwl_mvm_ebs_status_str(notif-&gt;ebs_status));</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mvm, "Scan completed: scan_status=0x%x\n",</div><div class='add'>+		       mvm-&gt;scan_status);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mvm,</div><div class='add'>+		       "Scan completed: line=%u, iter=%u, elapsed time=%u\n",</div><div class='add'>+		       notif-&gt;last_schedule, notif-&gt;last_iter,</div><div class='add'>+		       __le32_to_cpu(notif-&gt;time_from_last_iter));</div><div class='add'>+</div><div class='ctx'> 	if (WARN_ON(!(mvm-&gt;scan_uid_status[uid] &amp; mvm-&gt;scan_status)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -2804,8 +3245,18 @@ void iwl_mvm_rx_umac_scan_complete_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 			.aborted = aborted,</div><div class='ctx'> 			.scan_start_tsf = mvm-&gt;scan_start,</div><div class='ctx'> 		};</div><div class='add'>+		struct iwl_mvm_vif *scan_vif = mvm-&gt;scan_vif;</div><div class='add'>+		struct iwl_mvm_vif_link_info *link_info =</div><div class='add'>+			scan_vif-&gt;link[mvm-&gt;scan_link_id];</div><div class='add'>+</div><div class='add'>+		/* It is possible that by the time the scan is complete the link</div><div class='add'>+		 * was already removed and is not valid.</div><div class='add'>+		 */</div><div class='add'>+		if (link_info)</div><div class='add'>+			memcpy(info.tsf_bssid, link_info-&gt;bssid, ETH_ALEN);</div><div class='add'>+		else</div><div class='add'>+			IWL_DEBUG_SCAN(mvm, "Scan link is no longer valid\n");</div><div class='ctx'> </div><div class='del'>-		memcpy(info.tsf_bssid, mvm-&gt;scan_vif-&gt;bssid, ETH_ALEN);</div><div class='ctx'> 		ieee80211_scan_completed(mvm-&gt;hw, &amp;info);</div><div class='ctx'> 		mvm-&gt;scan_vif = NULL;</div><div class='ctx'> 		cancel_delayed_work(&amp;mvm-&gt;scan_timeout_dwork);</div><div class='hunk'>@@ -2816,16 +3267,9 @@ void iwl_mvm_rx_umac_scan_complete_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mvm-&gt;scan_status &amp;= ~mvm-&gt;scan_uid_status[uid];</div><div class='del'>-	IWL_DEBUG_SCAN(mvm,</div><div class='del'>-		       "Scan completed, uid %u type %u, status %s, EBS status %s\n",</div><div class='del'>-		       uid, mvm-&gt;scan_uid_status[uid],</div><div class='del'>-		       notif-&gt;status == IWL_SCAN_OFFLOAD_COMPLETED ?</div><div class='del'>-				"completed" : "aborted",</div><div class='del'>-		       iwl_mvm_ebs_status_str(notif-&gt;ebs_status));</div><div class='del'>-	IWL_DEBUG_SCAN(mvm,</div><div class='del'>-		       "Last line %d, Last iteration %d, Time from last iteration %d\n",</div><div class='del'>-		       notif-&gt;last_schedule, notif-&gt;last_iter,</div><div class='del'>-		       __le32_to_cpu(notif-&gt;time_from_last_iter));</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mvm, "Scan completed: after update: scan_status=0x%x\n",</div><div class='add'>+		       mvm-&gt;scan_status);</div><div class='ctx'> </div><div class='ctx'> 	if (notif-&gt;ebs_status != IWL_SCAN_EBS_SUCCESS &amp;&amp;</div><div class='ctx'> 	    notif-&gt;ebs_status != IWL_SCAN_EBS_INACTIVE)</div><div class='hunk'>@@ -2857,13 +3301,23 @@ void iwl_mvm_rx_umac_scan_iter_complete_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 		       mvm-&gt;scan_start);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_umac_scan_abort(struct iwl_mvm *mvm, int type)</div><div class='add'>+static int iwl_mvm_umac_scan_abort(struct iwl_mvm *mvm, int type, bool *wait)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_umac_scan_abort cmd = {};</div><div class='add'>+	struct iwl_umac_scan_abort abort_cmd = {};</div><div class='add'>+	struct iwl_host_cmd cmd = {</div><div class='add'>+		.id = WIDE_ID(IWL_ALWAYS_LONG_GROUP, SCAN_ABORT_UMAC),</div><div class='add'>+		.len = { sizeof(abort_cmd), },</div><div class='add'>+		.data = { &amp;abort_cmd, },</div><div class='add'>+		.flags = CMD_SEND_IN_RFKILL,</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	int uid, ret;</div><div class='add'>+	u32 status = IWL_UMAC_SCAN_ABORT_STATUS_NOT_FOUND;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='add'>+	*wait = true;</div><div class='add'>+</div><div class='ctx'> 	/* We should always get a valid index here, because we already</div><div class='ctx'> 	 * checked that this type of scan was running in the generic</div><div class='ctx'> 	 * code.</div><div class='hunk'>@@ -2872,17 +3326,28 @@ static int iwl_mvm_umac_scan_abort(struct iwl_mvm *mvm, int type)</div><div class='ctx'> 	if (WARN_ON_ONCE(uid &lt; 0))</div><div class='ctx'> 		return uid;</div><div class='ctx'> </div><div class='del'>-	cmd.uid = cpu_to_le32(uid);</div><div class='add'>+	abort_cmd.uid = cpu_to_le32(uid);</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_SCAN(mvm, "Sending scan abort, uid %u\n", uid);</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_send_cmd_pdu(mvm,</div><div class='del'>-				   iwl_cmd_id(SCAN_ABORT_UMAC,</div><div class='del'>-					      IWL_ALWAYS_LONG_GROUP, 0),</div><div class='del'>-				   0, sizeof(cmd), &amp;cmd);</div><div class='add'>+	ret = iwl_mvm_send_cmd_status(mvm, &amp;cmd, &amp;status);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mvm, "Scan abort: ret=%d, status=%u\n", ret, status);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		mvm-&gt;scan_uid_status[uid] = type &lt;&lt; IWL_MVM_SCAN_STOPPING_SHIFT;</div><div class='ctx'> </div><div class='add'>+	/* Handle the case that the FW is no longer familiar with the scan that</div><div class='add'>+	 * is to be stopped. In such a case, it is expected that the scan</div><div class='add'>+	 * complete notification was already received but not yet processed.</div><div class='add'>+	 * In such a case, there is no need to wait for a scan complete</div><div class='add'>+	 * notification and the flow should continue similar to the case that</div><div class='add'>+	 * the scan was really aborted.</div><div class='add'>+	 */</div><div class='add'>+	if (status == IWL_UMAC_SCAN_ABORT_STATUS_NOT_FOUND) {</div><div class='add'>+		mvm-&gt;scan_uid_status[uid] = type &lt;&lt; IWL_MVM_SCAN_STOPPING_SHIFT;</div><div class='add'>+		*wait = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2892,6 +3357,7 @@ static int iwl_mvm_scan_stop_wait(struct iwl_mvm *mvm, int type)</div><div class='ctx'> 	static const u16 scan_done_notif[] = { SCAN_COMPLETE_UMAC,</div><div class='ctx'> 					      SCAN_OFFLOAD_COMPLETE, };</div><div class='ctx'> 	int ret;</div><div class='add'>+	bool wait = true;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -2903,7 +3369,7 @@ static int iwl_mvm_scan_stop_wait(struct iwl_mvm *mvm, int type)</div><div class='ctx'> 	IWL_DEBUG_SCAN(mvm, "Preparing to stop scan, type %x\n", type);</div><div class='ctx'> </div><div class='ctx'> 	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa, IWL_UCODE_TLV_CAPA_UMAC_SCAN))</div><div class='del'>-		ret = iwl_mvm_umac_scan_abort(mvm, type);</div><div class='add'>+		ret = iwl_mvm_umac_scan_abort(mvm, type, &amp;wait);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = iwl_mvm_lmac_scan_abort(mvm);</div><div class='ctx'> </div><div class='hunk'>@@ -2911,31 +3377,35 @@ static int iwl_mvm_scan_stop_wait(struct iwl_mvm *mvm, int type)</div><div class='ctx'> 		IWL_DEBUG_SCAN(mvm, "couldn't stop scan type %d\n", type);</div><div class='ctx'> 		iwl_remove_notification(&amp;mvm-&gt;notif_wait, &amp;wait_scan_done);</div><div class='ctx'> 		return ret;</div><div class='add'>+	} else if (!wait) {</div><div class='add'>+		IWL_DEBUG_SCAN(mvm, "no need to wait for scan type %d\n", type);</div><div class='add'>+		iwl_remove_notification(&amp;mvm-&gt;notif_wait, &amp;wait_scan_done);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return iwl_wait_notification(&amp;mvm-&gt;notif_wait, &amp;wait_scan_done,</div><div class='ctx'> 				     1 * HZ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define IWL_SCAN_REQ_UMAC_HANDLE_SIZE(_ver) {				\</div><div class='del'>-	case (_ver): return sizeof(struct iwl_scan_req_umac_v##_ver);	\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl_scan_req_umac_get_size(u8 scan_ver)</div><div class='add'>+static size_t iwl_scan_req_umac_get_size(u8 scan_ver)</div><div class='ctx'> {</div><div class='ctx'> 	switch (scan_ver) {</div><div class='del'>-		IWL_SCAN_REQ_UMAC_HANDLE_SIZE(14);</div><div class='del'>-		IWL_SCAN_REQ_UMAC_HANDLE_SIZE(12);</div><div class='add'>+	case 12:</div><div class='add'>+		return sizeof(struct iwl_scan_req_umac_v12);</div><div class='add'>+	case 14:</div><div class='add'>+	case 15:</div><div class='add'>+	case 16:</div><div class='add'>+	case 17:</div><div class='add'>+		return sizeof(struct iwl_scan_req_umac_v17);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwl_mvm_scan_size(struct iwl_mvm *mvm)</div><div class='add'>+size_t iwl_mvm_scan_size(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='ctx'> 	int base_size, tail_size;</div><div class='del'>-	u8 scan_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, IWL_ALWAYS_LONG_GROUP,</div><div class='del'>-					    SCAN_REQ_UMAC,</div><div class='add'>+	u8 scan_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, SCAN_REQ_UMAC,</div><div class='ctx'> 					    IWL_FW_CMD_VER_UNKNOWN);</div><div class='ctx'> </div><div class='ctx'> 	base_size = iwl_scan_req_umac_get_size(scan_ver);</div><div class='hunk'>@@ -2995,11 +3465,12 @@ void iwl_mvm_report_scan_aborted(struct iwl_mvm *mvm)</div><div class='ctx'> 			 * restart_hw, so do not report if FW is about to be</div><div class='ctx'> 			 * restarted.</div><div class='ctx'> 			 */</div><div class='del'>-			if (!mvm-&gt;fw_restart)</div><div class='add'>+			if (!iwlwifi_mod_params.fw_restart)</div><div class='ctx'> 				ieee80211_sched_scan_stopped(mvm-&gt;hw);</div><div class='ctx'> 			mvm-&gt;sched_scan_pass_all = SCHED_SCAN_PASS_ALL_DISABLED;</div><div class='ctx'> 			mvm-&gt;scan_uid_status[uid] = 0;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		uid = iwl_mvm_scan_uid_by_status(mvm,</div><div class='ctx'> 						 IWL_MVM_SCAN_STOPPING_REGULAR);</div><div class='ctx'> 		if (uid &gt;= 0)</div><div class='hunk'>@@ -3010,6 +3481,11 @@ void iwl_mvm_report_scan_aborted(struct iwl_mvm *mvm)</div><div class='ctx'> 		if (uid &gt;= 0)</div><div class='ctx'> 			mvm-&gt;scan_uid_status[uid] = 0;</div><div class='ctx'> </div><div class='add'>+		uid = iwl_mvm_scan_uid_by_status(mvm,</div><div class='add'>+						 IWL_MVM_SCAN_STOPPING_INT_MLO);</div><div class='add'>+		if (uid &gt;= 0)</div><div class='add'>+			mvm-&gt;scan_uid_status[uid] = 0;</div><div class='add'>+</div><div class='ctx'> 		/* We shouldn't have any UIDs still set.  Loop over all the</div><div class='ctx'> 		 * UIDs to make sure there's nothing left there and warn if</div><div class='ctx'> 		 * any is found.</div><div class='hunk'>@@ -3035,7 +3511,7 @@ void iwl_mvm_report_scan_aborted(struct iwl_mvm *mvm)</div><div class='ctx'> 		 * restarted.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if ((mvm-&gt;scan_status &amp; IWL_MVM_SCAN_SCHED) &amp;&amp;</div><div class='del'>-		    !mvm-&gt;fw_restart) {</div><div class='add'>+		    !iwlwifi_mod_params.fw_restart) {</div><div class='ctx'> 			ieee80211_sched_scan_stopped(mvm-&gt;hw);</div><div class='ctx'> 			mvm-&gt;sched_scan_pass_all = SCHED_SCAN_PASS_ALL_DISABLED;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3046,10 +3522,14 @@ int iwl_mvm_scan_stop(struct iwl_mvm *mvm, int type, bool notify)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	IWL_DEBUG_SCAN(mvm,</div><div class='add'>+		       "Request to stop scan: type=0x%x, status=0x%x\n",</div><div class='add'>+		       type, mvm-&gt;scan_status);</div><div class='add'>+</div><div class='ctx'> 	if (!(mvm-&gt;scan_status &amp; type))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (iwl_mvm_is_radio_killed(mvm)) {</div><div class='add'>+	if (!iwl_trans_device_enabled(mvm-&gt;trans)) {</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3057,6 +3537,9 @@ int iwl_mvm_scan_stop(struct iwl_mvm *mvm, int type, bool notify)</div><div class='ctx'> 	ret = iwl_mvm_scan_stop_wait(mvm, type);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		mvm-&gt;scan_status |= type &lt;&lt; IWL_MVM_SCAN_STOPPING_SHIFT;</div><div class='add'>+	else</div><div class='add'>+		IWL_DEBUG_SCAN(mvm, "Failed to stop scan\n");</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	/* Clear the scan status so the next scan requests will</div><div class='ctx'> 	 * succeed and mark the scan as stopping, so that the Rx</div><div class='hunk'>@@ -3081,3 +3564,84 @@ out:</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_chanidx_from_phy(struct iwl_mvm *mvm,</div><div class='add'>+				    enum nl80211_band band,</div><div class='add'>+				    u16 phy_chan_num)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_supported_band *sband = mvm-&gt;hw-&gt;wiphy-&gt;bands[band];</div><div class='add'>+	int chan_idx;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!sband))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (chan_idx = 0; chan_idx &lt; sband-&gt;n_channels; chan_idx++) {</div><div class='add'>+		struct ieee80211_channel *channel = &amp;sband-&gt;channels[chan_idx];</div><div class='add'>+</div><div class='add'>+		if (channel-&gt;hw_value == phy_chan_num)</div><div class='add'>+			return chan_idx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_rx_channel_survey_notif(struct iwl_mvm *mvm,</div><div class='add'>+				     struct iwl_rx_cmd_buffer *rxb)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='add'>+	const struct iwl_umac_scan_channel_survey_notif *notif =</div><div class='add'>+		(void *)pkt-&gt;data;</div><div class='add'>+	struct iwl_mvm_acs_survey_channel *info;</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	int chan_idx;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!mvm-&gt;acs_survey) {</div><div class='add'>+		size_t n_channels = 0;</div><div class='add'>+</div><div class='add'>+		for (band = 0; band &lt; NUM_NL80211_BANDS; band++) {</div><div class='add'>+			if (!mvm-&gt;hw-&gt;wiphy-&gt;bands[band])</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			n_channels += mvm-&gt;hw-&gt;wiphy-&gt;bands[band]-&gt;n_channels;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mvm-&gt;acs_survey = kzalloc(struct_size(mvm-&gt;acs_survey,</div><div class='add'>+						      channels, n_channels),</div><div class='add'>+					  GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+		if (!mvm-&gt;acs_survey)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		mvm-&gt;acs_survey-&gt;n_channels = n_channels;</div><div class='add'>+		n_channels = 0;</div><div class='add'>+		for (band = 0; band &lt; NUM_NL80211_BANDS; band++) {</div><div class='add'>+			if (!mvm-&gt;hw-&gt;wiphy-&gt;bands[band])</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			mvm-&gt;acs_survey-&gt;bands[band] =</div><div class='add'>+				&amp;mvm-&gt;acs_survey-&gt;channels[n_channels];</div><div class='add'>+			n_channels += mvm-&gt;hw-&gt;wiphy-&gt;bands[band]-&gt;n_channels;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	band = iwl_mvm_nl80211_band_from_phy(le32_to_cpu(notif-&gt;band));</div><div class='add'>+	chan_idx = iwl_mvm_chanidx_from_phy(mvm, band,</div><div class='add'>+					    le32_to_cpu(notif-&gt;channel));</div><div class='add'>+	if (WARN_ON_ONCE(chan_idx &lt; 0))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_SCAN(mvm, "channel survey received for freq %d\n",</div><div class='add'>+		       mvm-&gt;hw-&gt;wiphy-&gt;bands[band]-&gt;channels[chan_idx].center_freq);</div><div class='add'>+</div><div class='add'>+	info = &amp;mvm-&gt;acs_survey-&gt;bands[band][chan_idx];</div><div class='add'>+</div><div class='add'>+	/* Times are all in ms */</div><div class='add'>+	info-&gt;time = le32_to_cpu(notif-&gt;active_time);</div><div class='add'>+	info-&gt;time_busy = le32_to_cpu(notif-&gt;busy_time);</div><div class='add'>+	info-&gt;time_rx = le32_to_cpu(notif-&gt;rx_time);</div><div class='add'>+	info-&gt;time_tx = le32_to_cpu(notif-&gt;tx_time);</div><div class='add'>+	info-&gt;noise =</div><div class='add'>+		iwl_average_neg_dbm(notif-&gt;noise, ARRAY_SIZE(notif-&gt;noise));</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sf.c b/drivers/net/wireless/intel/iwlwifi/mvm/sf.c<br/>index 655da8856c75..16285ae7cae9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/sf.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/sf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/sf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/sf.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2013-2014, 2018-2019 Intel Corporation</div><div class='add'>+ * Copyright (C) 2013-2014, 2018-2019, 2022-2024 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2014 Intel Mobile Communications GmbH</div><div class='ctx'>  */</div><div class='ctx'> #include "mvm.h"</div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> /* For counting bound interfaces */</div><div class='ctx'> struct iwl_mvm_active_iface_iterator_data {</div><div class='ctx'> 	struct ieee80211_vif *ignore_vif;</div><div class='del'>-	u8 sta_vif_ap_sta_id;</div><div class='add'>+	struct ieee80211_sta *sta_vif_ap_sta;</div><div class='ctx'> 	enum iwl_sf_state sta_vif_state;</div><div class='ctx'> 	u32 num_active_macs;</div><div class='ctx'> };</div><div class='hunk'>@@ -23,15 +23,15 @@ static void iwl_mvm_bound_iface_iterator(void *_data, u8 *mac,</div><div class='ctx'> 	struct iwl_mvm_active_iface_iterator_data *data = _data;</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> </div><div class='del'>-	if (vif == data-&gt;ignore_vif || !mvmvif-&gt;phy_ctxt ||</div><div class='add'>+	if (vif == data-&gt;ignore_vif || !mvmvif-&gt;deflink.phy_ctxt ||</div><div class='ctx'> 	    vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;num_active_macs++;</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='del'>-		data-&gt;sta_vif_ap_sta_id = mvmvif-&gt;ap_sta_id;</div><div class='del'>-		if (vif-&gt;bss_conf.assoc)</div><div class='add'>+		data-&gt;sta_vif_ap_sta = mvmvif-&gt;ap_sta;</div><div class='add'>+		if (vif-&gt;cfg.assoc)</div><div class='ctx'> 			data-&gt;sta_vif_state = SF_FULL_ON;</div><div class='ctx'> 		else</div><div class='ctx'> 			data-&gt;sta_vif_state = SF_INIT_OFF;</div><div class='hunk'>@@ -98,6 +98,10 @@ static void iwl_mvm_fill_sf_command(struct iwl_mvm *mvm,</div><div class='ctx'> 				    struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j, watermark;</div><div class='add'>+	u8 max_rx_nss = 0;</div><div class='add'>+	bool is_legacy = true;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	unsigned int link_id;</div><div class='ctx'> </div><div class='ctx'> 	sf_cmd-&gt;watermark[SF_LONG_DELAY_ON] = cpu_to_le32(SF_W_MARK_SCAN);</div><div class='ctx'> </div><div class='hunk'>@@ -106,10 +110,25 @@ static void iwl_mvm_fill_sf_command(struct iwl_mvm *mvm,</div><div class='ctx'> 	 * capabilities of the AP station, and choose the watermark accordingly.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (sta) {</div><div class='del'>-		if (sta-&gt;ht_cap.ht_supported ||</div><div class='del'>-		    sta-&gt;vht_cap.vht_supported ||</div><div class='del'>-		    sta-&gt;he_cap.has_he) {</div><div class='del'>-			switch (sta-&gt;rx_nss) {</div><div class='add'>+		/* find the maximal NSS number among all links (if relevant) */</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		for (link_id = 0; link_id &lt; ARRAY_SIZE(sta-&gt;link); link_id++) {</div><div class='add'>+			link_sta = rcu_dereference(sta-&gt;link[link_id]);</div><div class='add'>+			if (!link_sta)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (link_sta-&gt;ht_cap.ht_supported ||</div><div class='add'>+			    link_sta-&gt;vht_cap.vht_supported ||</div><div class='add'>+			    link_sta-&gt;eht_cap.has_eht ||</div><div class='add'>+			    link_sta-&gt;he_cap.has_he) {</div><div class='add'>+				is_legacy = false;</div><div class='add'>+				max_rx_nss = max(max_rx_nss, link_sta-&gt;rx_nss);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		if (!is_legacy) {</div><div class='add'>+			switch (max_rx_nss) {</div><div class='ctx'> 			case 1:</div><div class='ctx'> 				watermark = SF_W_MARK_SISO;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -151,21 +170,16 @@ static void iwl_mvm_fill_sf_command(struct iwl_mvm *mvm,</div><div class='ctx'> 		memcpy(sf_cmd-&gt;full_on_timeouts, sf_full_timeout_def,</div><div class='ctx'> 		       sizeof(sf_full_timeout_def));</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_sf_config(struct iwl_mvm *mvm, u8 sta_id,</div><div class='add'>+static int iwl_mvm_sf_config(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 			     enum iwl_sf_state new_state)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_sf_cfg_cmd sf_cmd = {</div><div class='ctx'> 		.state = cpu_to_le32(new_state),</div><div class='ctx'> 	};</div><div class='del'>-	struct ieee80211_sta *sta;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (mvm-&gt;cfg-&gt;disable_dummy_notification)</div><div class='del'>-		sf_cmd.state |= cpu_to_le32(SF_CFG_DUMMY_NOTIF_OFF);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If an associated AP sta changed its antenna configuration, the state</div><div class='ctx'> 	 * will remain FULL_ON but SF parameters need to be reconsidered.</div><div class='hunk'>@@ -178,20 +192,12 @@ static int iwl_mvm_sf_config(struct iwl_mvm *mvm, u8 sta_id,</div><div class='ctx'> 		iwl_mvm_fill_sf_command(mvm, &amp;sf_cmd, NULL);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SF_FULL_ON:</div><div class='del'>-		if (sta_id == IWL_MVM_INVALID_STA) {</div><div class='add'>+		if (!sta) {</div><div class='ctx'> 			IWL_ERR(mvm,</div><div class='ctx'> 				"No station: Cannot switch SF to FULL_ON\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		sta = rcu_dereference(mvm-&gt;fw_id_to_mac_id[sta_id]);</div><div class='del'>-		if (IS_ERR_OR_NULL(sta)) {</div><div class='del'>-			IWL_ERR(mvm, "Invalid station id\n");</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='ctx'> 		iwl_mvm_fill_sf_command(mvm, &amp;sf_cmd, sta);</div><div class='del'>-		rcu_read_unlock();</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SF_INIT_OFF:</div><div class='ctx'> 		iwl_mvm_fill_sf_command(mvm, &amp;sf_cmd, NULL);</div><div class='hunk'>@@ -219,14 +225,16 @@ int iwl_mvm_sf_update(struct iwl_mvm *mvm, struct ieee80211_vif *changed_vif,</div><div class='ctx'> 		      bool remove_vif)</div><div class='ctx'> {</div><div class='ctx'> 	enum iwl_sf_state new_state;</div><div class='del'>-	u8 sta_id = IWL_MVM_INVALID_STA;</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = NULL;</div><div class='ctx'> 	struct iwl_mvm_active_iface_iterator_data data = {</div><div class='ctx'> 		.ignore_vif = changed_vif,</div><div class='ctx'> 		.sta_vif_state = SF_UNINIT,</div><div class='del'>-		.sta_vif_ap_sta_id = IWL_MVM_INVALID_STA,</div><div class='ctx'> 	};</div><div class='add'>+	struct ieee80211_sta *sta = NULL;</div><div class='ctx'> </div><div class='add'>+	if (fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+		       IWL_UCODE_TLV_API_SMART_FIFO_OFFLOAD))</div><div class='add'>+		return 0;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Ignore the call if we are in HW Restart flow, or if the handled</div><div class='ctx'> 	 * vif is a p2p device.</div><div class='hunk'>@@ -255,16 +263,16 @@ int iwl_mvm_sf_update(struct iwl_mvm *mvm, struct ieee80211_vif *changed_vif,</div><div class='ctx'> 			 * and we filled the relevant data during iteration</div><div class='ctx'> 			 */</div><div class='ctx'> 			new_state = data.sta_vif_state;</div><div class='del'>-			sta_id = data.sta_vif_ap_sta_id;</div><div class='add'>+			sta = data.sta_vif_ap_sta;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (WARN_ON(!changed_vif))</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			if (changed_vif-&gt;type != NL80211_IFTYPE_STATION) {</div><div class='ctx'> 				new_state = SF_UNINIT;</div><div class='del'>-			} else if (changed_vif-&gt;bss_conf.assoc &amp;&amp;</div><div class='add'>+			} else if (changed_vif-&gt;cfg.assoc &amp;&amp;</div><div class='ctx'> 				   changed_vif-&gt;bss_conf.dtim_period) {</div><div class='ctx'> 				mvmvif = iwl_mvm_vif_from_mac80211(changed_vif);</div><div class='del'>-				sta_id = mvmvif-&gt;ap_sta_id;</div><div class='add'>+				sta = mvmvif-&gt;ap_sta;</div><div class='ctx'> 				new_state = SF_FULL_ON;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				new_state = SF_INIT_OFF;</div><div class='hunk'>@@ -275,5 +283,6 @@ int iwl_mvm_sf_update(struct iwl_mvm *mvm, struct ieee80211_vif *changed_vif,</div><div class='ctx'> 		/* If there are multiple active macs - change to SF_UNINIT */</div><div class='ctx'> 		new_state = SF_UNINIT;</div><div class='ctx'> 	}</div><div class='del'>-	return iwl_mvm_sf_config(mvm, sta_id, new_state);</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_sf_config(mvm, sta, new_state);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c<br/>index f618368eda83..363232bb74fa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/sta.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/sta.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/sta.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/sta.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2015, 2018-2021 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2015, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -24,13 +24,12 @@ static inline int iwl_mvm_add_sta_cmd_size(struct iwl_mvm *mvm)</div><div class='ctx'> 		return sizeof(struct iwl_mvm_add_sta_cmd_v7);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_find_free_sta_id(struct iwl_mvm *mvm,</div><div class='del'>-				    enum nl80211_iftype iftype)</div><div class='add'>+int iwl_mvm_find_free_sta_id(struct iwl_mvm *mvm, enum nl80211_iftype iftype)</div><div class='ctx'> {</div><div class='ctx'> 	int sta_id;</div><div class='ctx'> 	u32 reserved_ids = 0;</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON(IWL_MVM_STATION_COUNT_MAX &gt; 32);</div><div class='add'>+	BUILD_BUG_ON(IWL_STATION_COUNT_MAX &gt; 32);</div><div class='ctx'> 	WARN_ON_ONCE(test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status));</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='hunk'>@@ -48,7 +47,81 @@ static int iwl_mvm_find_free_sta_id(struct iwl_mvm *mvm,</div><div class='ctx'> 					       lockdep_is_held(&amp;mvm-&gt;mutex)))</div><div class='ctx'> 			return sta_id;</div><div class='ctx'> 	}</div><div class='del'>-	return IWL_MVM_INVALID_STA;</div><div class='add'>+	return IWL_INVALID_STA;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Calculate the ampdu density and max size */</div><div class='add'>+u32 iwl_mvm_get_sta_ampdu_dens(struct ieee80211_link_sta *link_sta,</div><div class='add'>+			       struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			       u32 *_agg_size)</div><div class='add'>+{</div><div class='add'>+	u32 agg_size = 0, mpdu_dens = 0;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!link_sta))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Note that we always use only legacy &amp; highest supported PPDUs, so</div><div class='add'>+	 * of Draft P802.11be D.30 Table 10-12a--Fields used for calculating</div><div class='add'>+	 * the maximum A-MPDU size of various PPDU types in different bands,</div><div class='add'>+	 * we only need to worry about the highest supported PPDU type here.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;ht_cap.ht_supported) {</div><div class='add'>+		agg_size = link_sta-&gt;ht_cap.ampdu_factor;</div><div class='add'>+		mpdu_dens = link_sta-&gt;ht_cap.ampdu_density;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link_conf-&gt;chanreq.oper.chan-&gt;band == NL80211_BAND_6GHZ) {</div><div class='add'>+		/* overwrite HT values on 6 GHz */</div><div class='add'>+		mpdu_dens = le16_get_bits(link_sta-&gt;he_6ghz_capa.capa,</div><div class='add'>+					  IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START);</div><div class='add'>+		agg_size = le16_get_bits(link_sta-&gt;he_6ghz_capa.capa,</div><div class='add'>+					 IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP);</div><div class='add'>+	} else if (link_sta-&gt;vht_cap.vht_supported) {</div><div class='add'>+		/* if VHT supported overwrite HT value */</div><div class='add'>+		agg_size = u32_get_bits(link_sta-&gt;vht_cap.cap,</div><div class='add'>+					IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* D6.0 10.12.2 A-MPDU length limit rules</div><div class='add'>+	 * A STA indicates the maximum length of the A-MPDU preEOF padding</div><div class='add'>+	 * that it can receive in an HE PPDU in the Maximum A-MPDU Length</div><div class='add'>+	 * Exponent field in its HT Capabilities, VHT Capabilities,</div><div class='add'>+	 * and HE 6 GHz Band Capabilities elements (if present) and the</div><div class='add'>+	 * Maximum AMPDU Length Exponent Extension field in its HE</div><div class='add'>+	 * Capabilities element</div><div class='add'>+	 */</div><div class='add'>+	if (link_sta-&gt;he_cap.has_he)</div><div class='add'>+		agg_size +=</div><div class='add'>+			u8_get_bits(link_sta-&gt;he_cap.he_cap_elem.mac_cap_info[3],</div><div class='add'>+				    IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK);</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;eht_cap.has_eht)</div><div class='add'>+		agg_size += u8_get_bits(link_sta-&gt;eht_cap.eht_cap_elem.mac_cap_info[1],</div><div class='add'>+					IEEE80211_EHT_MAC_CAP1_MAX_AMPDU_LEN_MASK);</div><div class='add'>+</div><div class='add'>+	/* Limit to max A-MPDU supported by FW */</div><div class='add'>+	agg_size = min_t(u32, agg_size,</div><div class='add'>+			 STA_FLG_MAX_AGG_SIZE_4M &gt;&gt; STA_FLG_MAX_AGG_SIZE_SHIFT);</div><div class='add'>+</div><div class='add'>+	*_agg_size = agg_size;</div><div class='add'>+	return mpdu_dens;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 iwl_mvm_get_sta_uapsd_acs(struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	u8 uapsd_acs = 0;</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;uapsd_queues &amp; IEEE80211_WMM_IE_STA_QOSINFO_AC_BK)</div><div class='add'>+		uapsd_acs |= BIT(AC_BK);</div><div class='add'>+	if (sta-&gt;uapsd_queues &amp; IEEE80211_WMM_IE_STA_QOSINFO_AC_BE)</div><div class='add'>+		uapsd_acs |= BIT(AC_BE);</div><div class='add'>+	if (sta-&gt;uapsd_queues &amp; IEEE80211_WMM_IE_STA_QOSINFO_AC_VI)</div><div class='add'>+		uapsd_acs |= BIT(AC_VI);</div><div class='add'>+	if (sta-&gt;uapsd_queues &amp; IEEE80211_WMM_IE_STA_QOSINFO_AC_VO)</div><div class='add'>+		uapsd_acs |= BIT(AC_VO);</div><div class='add'>+</div><div class='add'>+	return uapsd_acs | uapsd_acs &lt;&lt; 4;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* send station add/update command to firmware */</div><div class='hunk'>@@ -57,7 +130,7 @@ int iwl_mvm_sta_send_to_fw(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> 	struct iwl_mvm_add_sta_cmd add_sta_cmd = {</div><div class='del'>-		.sta_id = mvm_sta-&gt;sta_id,</div><div class='add'>+		.sta_id = mvm_sta-&gt;deflink.sta_id,</div><div class='ctx'> 		.mac_id_n_color = cpu_to_le32(mvm_sta-&gt;mac_id_n_color),</div><div class='ctx'> 		.add_modify = update ? 1 : 0,</div><div class='ctx'> 		.station_flags_msk = cpu_to_le32(STA_FLG_FAT_EN_MSK |</div><div class='hunk'>@@ -86,7 +159,8 @@ int iwl_mvm_sta_send_to_fw(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (sta-&gt;bandwidth) {</div><div class='add'>+	switch (sta-&gt;deflink.bandwidth) {</div><div class='add'>+	case IEEE80211_STA_RX_BW_320:</div><div class='ctx'> 	case IEEE80211_STA_RX_BW_160:</div><div class='ctx'> 		add_sta_cmd.station_flags |= cpu_to_le32(STA_FLG_FAT_EN_160MHZ);</div><div class='ctx'> 		fallthrough;</div><div class='hunk'>@@ -97,13 +171,13 @@ int iwl_mvm_sta_send_to_fw(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 		add_sta_cmd.station_flags |= cpu_to_le32(STA_FLG_FAT_EN_40MHZ);</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> 	case IEEE80211_STA_RX_BW_20:</div><div class='del'>-		if (sta-&gt;ht_cap.ht_supported)</div><div class='add'>+		if (sta-&gt;deflink.ht_cap.ht_supported)</div><div class='ctx'> 			add_sta_cmd.station_flags |=</div><div class='ctx'> 				cpu_to_le32(STA_FLG_FAT_EN_20MHZ);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (sta-&gt;rx_nss) {</div><div class='add'>+	switch (sta-&gt;deflink.rx_nss) {</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		add_sta_cmd.station_flags |= cpu_to_le32(STA_FLG_MIMO_EN_SISO);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -115,7 +189,7 @@ int iwl_mvm_sta_send_to_fw(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (sta-&gt;smps_mode) {</div><div class='add'>+	switch (sta-&gt;deflink.smps_mode) {</div><div class='ctx'> 	case IEEE80211_SMPS_AUTOMATIC:</div><div class='ctx'> 	case IEEE80211_SMPS_NUM_MODES:</div><div class='ctx'> 		WARN_ON(1);</div><div class='hunk'>@@ -133,69 +207,26 @@ int iwl_mvm_sta_send_to_fw(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;ht_cap.ht_supported) {</div><div class='del'>-		add_sta_cmd.station_flags_msk |=</div><div class='del'>-			cpu_to_le32(STA_FLG_MAX_AGG_SIZE_MSK |</div><div class='del'>-				    STA_FLG_AGG_MPDU_DENS_MSK);</div><div class='del'>-</div><div class='del'>-		mpdu_dens = sta-&gt;ht_cap.ampdu_density;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mvm_sta-&gt;vif-&gt;bss_conf.chandef.chan-&gt;band == NL80211_BAND_6GHZ) {</div><div class='add'>+	if (sta-&gt;deflink.ht_cap.ht_supported ||</div><div class='add'>+	    mvm_sta-&gt;vif-&gt;bss_conf.chanreq.oper.chan-&gt;band == NL80211_BAND_6GHZ)</div><div class='ctx'> 		add_sta_cmd.station_flags_msk |=</div><div class='ctx'> 			cpu_to_le32(STA_FLG_MAX_AGG_SIZE_MSK |</div><div class='ctx'> 				    STA_FLG_AGG_MPDU_DENS_MSK);</div><div class='ctx'> </div><div class='del'>-		mpdu_dens = le16_get_bits(sta-&gt;he_6ghz_capa.capa,</div><div class='del'>-					  IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START);</div><div class='del'>-		agg_size = le16_get_bits(sta-&gt;he_6ghz_capa.capa,</div><div class='del'>-				IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP);</div><div class='del'>-	} else</div><div class='del'>-	if (sta-&gt;vht_cap.vht_supported) {</div><div class='del'>-		agg_size = sta-&gt;vht_cap.cap &amp;</div><div class='del'>-			IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;</div><div class='del'>-		agg_size &gt;&gt;=</div><div class='del'>-			IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT;</div><div class='del'>-	} else if (sta-&gt;ht_cap.ht_supported) {</div><div class='del'>-		agg_size = sta-&gt;ht_cap.ampdu_factor;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* D6.0 10.12.2 A-MPDU length limit rules</div><div class='del'>-	 * A STA indicates the maximum length of the A-MPDU preEOF padding</div><div class='del'>-	 * that it can receive in an HE PPDU in the Maximum A-MPDU Length</div><div class='del'>-	 * Exponent field in its HT Capabilities, VHT Capabilities,</div><div class='del'>-	 * and HE 6 GHz Band Capabilities elements (if present) and the</div><div class='del'>-	 * Maximum AMPDU Length Exponent Extension field in its HE</div><div class='del'>-	 * Capabilities element</div><div class='del'>-	 */</div><div class='del'>-	if (sta-&gt;he_cap.has_he)</div><div class='del'>-		agg_size += u8_get_bits(sta-&gt;he_cap.he_cap_elem.mac_cap_info[3],</div><div class='del'>-					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK);</div><div class='del'>-</div><div class='del'>-	/* Limit to max A-MPDU supported by FW */</div><div class='del'>-	if (agg_size &gt; (STA_FLG_MAX_AGG_SIZE_4M &gt;&gt; STA_FLG_MAX_AGG_SIZE_SHIFT))</div><div class='del'>-		agg_size = (STA_FLG_MAX_AGG_SIZE_4M &gt;&gt;</div><div class='del'>-			    STA_FLG_MAX_AGG_SIZE_SHIFT);</div><div class='del'>-</div><div class='add'>+	mpdu_dens = iwl_mvm_get_sta_ampdu_dens(&amp;sta-&gt;deflink,</div><div class='add'>+					       &amp;mvm_sta-&gt;vif-&gt;bss_conf,</div><div class='add'>+					       &amp;agg_size);</div><div class='ctx'> 	add_sta_cmd.station_flags |=</div><div class='ctx'> 		cpu_to_le32(agg_size &lt;&lt; STA_FLG_MAX_AGG_SIZE_SHIFT);</div><div class='ctx'> 	add_sta_cmd.station_flags |=</div><div class='ctx'> 		cpu_to_le32(mpdu_dens &lt;&lt; STA_FLG_AGG_MPDU_DENS_SHIFT);</div><div class='add'>+</div><div class='ctx'> 	if (mvm_sta-&gt;sta_state &gt;= IEEE80211_STA_ASSOC)</div><div class='ctx'> 		add_sta_cmd.assoc_id = cpu_to_le16(sta-&gt;aid);</div><div class='ctx'> </div><div class='ctx'> 	if (sta-&gt;wme) {</div><div class='ctx'> 		add_sta_cmd.modify_mask |= STA_MODIFY_UAPSD_ACS;</div><div class='del'>-</div><div class='del'>-		if (sta-&gt;uapsd_queues &amp; IEEE80211_WMM_IE_STA_QOSINFO_AC_BK)</div><div class='del'>-			add_sta_cmd.uapsd_acs |= BIT(AC_BK);</div><div class='del'>-		if (sta-&gt;uapsd_queues &amp; IEEE80211_WMM_IE_STA_QOSINFO_AC_BE)</div><div class='del'>-			add_sta_cmd.uapsd_acs |= BIT(AC_BE);</div><div class='del'>-		if (sta-&gt;uapsd_queues &amp; IEEE80211_WMM_IE_STA_QOSINFO_AC_VI)</div><div class='del'>-			add_sta_cmd.uapsd_acs |= BIT(AC_VI);</div><div class='del'>-		if (sta-&gt;uapsd_queues &amp; IEEE80211_WMM_IE_STA_QOSINFO_AC_VO)</div><div class='del'>-			add_sta_cmd.uapsd_acs |= BIT(AC_VO);</div><div class='del'>-		add_sta_cmd.uapsd_acs |= add_sta_cmd.uapsd_acs &lt;&lt; 4;</div><div class='add'>+		add_sta_cmd.uapsd_acs = iwl_mvm_get_sta_uapsd_acs(sta);</div><div class='ctx'> 		add_sta_cmd.sp_length = sta-&gt;max_sp ? sta-&gt;max_sp * 2 : 128;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -222,12 +253,13 @@ int iwl_mvm_sta_send_to_fw(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> static void iwl_mvm_rx_agg_session_expired(struct timer_list *t)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_baid_data *data =</div><div class='del'>-		from_timer(data, t, session_timer);</div><div class='add'>+		timer_container_of(data, t, session_timer);</div><div class='ctx'> 	struct iwl_mvm_baid_data __rcu **rcu_ptr = data-&gt;rcu_ptr;</div><div class='ctx'> 	struct iwl_mvm_baid_data *ba_data;</div><div class='ctx'> 	struct ieee80211_sta *sta;</div><div class='ctx'> 	struct iwl_mvm_sta *mvm_sta;</div><div class='ctx'> 	unsigned long timeout;</div><div class='add'>+	unsigned int sta_id;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='hunk'>@@ -246,7 +278,8 @@ static void iwl_mvm_rx_agg_session_expired(struct timer_list *t)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Timer expired */</div><div class='del'>-	sta = rcu_dereference(ba_data-&gt;mvm-&gt;fw_id_to_mac_id[ba_data-&gt;sta_id]);</div><div class='add'>+	sta_id = ffs(ba_data-&gt;sta_mask) - 1; /* don't care which one */</div><div class='add'>+	sta = rcu_dereference(ba_data-&gt;mvm-&gt;fw_id_to_mac_id[sta_id]);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * sta should be valid unless the following happens:</div><div class='hunk'>@@ -256,7 +289,7 @@ static void iwl_mvm_rx_agg_session_expired(struct timer_list *t)</div><div class='ctx'> 	 * A-MDPU and hence the timer continues to run. Then, the</div><div class='ctx'> 	 * timer expires and sta is NULL.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!sta)</div><div class='add'>+	if (IS_ERR_OR_NULL(sta))</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='hunk'>@@ -296,7 +329,7 @@ static int iwl_mvm_invalidate_sta_queue(struct iwl_mvm *mvm, int queue,</div><div class='ctx'> 	mvmsta-&gt;tid_disable_agg |= disable_agg_tids;</div><div class='ctx'> </div><div class='ctx'> 	cmd.mac_id_n_color = cpu_to_le32(mvmsta-&gt;mac_id_n_color);</div><div class='del'>-	cmd.sta_id = mvmsta-&gt;sta_id;</div><div class='add'>+	cmd.sta_id = mvmsta-&gt;deflink.sta_id;</div><div class='ctx'> 	cmd.add_modify = STA_MODE_MODIFY;</div><div class='ctx'> 	cmd.modify_mask = STA_MODIFY_QUEUES;</div><div class='ctx'> 	if (disable_agg_tids)</div><div class='hunk'>@@ -316,18 +349,42 @@ static int iwl_mvm_invalidate_sta_queue(struct iwl_mvm *mvm, int queue,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_mvm_disable_txq(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='del'>-			       int queue, u8 tid, u8 flags)</div><div class='add'>+			       int sta_id, u16 *queueptr, u8 tid)</div><div class='ctx'> {</div><div class='add'>+	int queue = *queueptr;</div><div class='ctx'> 	struct iwl_scd_txq_cfg_cmd cmd = {</div><div class='ctx'> 		.scd_queue = queue,</div><div class='ctx'> 		.action = SCD_CFG_DISABLE_QUEUE,</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='ctx'> 	if (iwl_mvm_has_new_tx_api(mvm)) {</div><div class='add'>+		if (mvm-&gt;sta_remove_requires_queue_remove) {</div><div class='add'>+			u32 cmd_id = WIDE_ID(DATA_PATH_GROUP,</div><div class='add'>+					     SCD_QUEUE_CONFIG_CMD);</div><div class='add'>+			struct iwl_scd_queue_cfg_cmd remove_cmd = {</div><div class='add'>+				.operation = cpu_to_le32(IWL_SCD_QUEUE_REMOVE),</div><div class='add'>+				.u.remove.sta_mask = cpu_to_le32(BIT(sta_id)),</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			if (tid == IWL_MAX_TID_COUNT)</div><div class='add'>+				tid = IWL_MGMT_TID;</div><div class='add'>+</div><div class='add'>+			remove_cmd.u.remove.tid = cpu_to_le32(tid);</div><div class='add'>+</div><div class='add'>+			ret = iwl_mvm_send_cmd_pdu(mvm, cmd_id, 0,</div><div class='add'>+						   sizeof(remove_cmd),</div><div class='add'>+						   &amp;remove_cmd);</div><div class='add'>+		} else {</div><div class='add'>+			ret = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		iwl_trans_txq_free(mvm-&gt;trans, queue);</div><div class='add'>+		*queueptr = IWL_MVM_INVALID_QUEUE;</div><div class='ctx'> </div><div class='del'>-		return 0;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(mvm-&gt;queue_info[queue].tid_bitmap == 0))</div><div class='hunk'>@@ -364,14 +421,18 @@ static int iwl_mvm_disable_txq(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 		struct iwl_mvm_txq *mvmtxq =</div><div class='ctx'> 			iwl_mvm_txq_from_tid(sta, tid);</div><div class='ctx'> </div><div class='add'>+		spin_lock_bh(&amp;mvm-&gt;add_stream_lock);</div><div class='add'>+		list_del_init(&amp;mvmtxq-&gt;list);</div><div class='add'>+		clear_bit(IWL_MVM_TXQ_STATE_READY, &amp;mvmtxq-&gt;state);</div><div class='ctx'> 		mvmtxq-&gt;txq_id = IWL_MVM_INVALID_QUEUE;</div><div class='add'>+		spin_unlock_bh(&amp;mvm-&gt;add_stream_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Regardless if this is a reserved TXQ for a STA - mark it as false */</div><div class='ctx'> 	mvm-&gt;queue_info[queue].reserved = false;</div><div class='ctx'> </div><div class='ctx'> 	iwl_trans_txq_disable(mvm-&gt;trans, queue, false);</div><div class='del'>-	ret = iwl_mvm_send_cmd_pdu(mvm, SCD_QUEUE_CFG, flags,</div><div class='add'>+	ret = iwl_mvm_send_cmd_pdu(mvm, SCD_QUEUE_CFG, 0,</div><div class='ctx'> 				   sizeof(struct iwl_scd_txq_cfg_cmd), &amp;cmd);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -458,7 +519,11 @@ static int iwl_mvm_remove_sta_queue_marking(struct iwl_mvm *mvm, int queue)</div><div class='ctx'> 			disable_agg_tids |= BIT(tid);</div><div class='ctx'> 		mvmsta-&gt;tid_data[tid].txq_id = IWL_MVM_INVALID_QUEUE;</div><div class='ctx'> </div><div class='add'>+		spin_lock_bh(&amp;mvm-&gt;add_stream_lock);</div><div class='add'>+		list_del_init(&amp;mvmtxq-&gt;list);</div><div class='add'>+		clear_bit(IWL_MVM_TXQ_STATE_READY, &amp;mvmtxq-&gt;state);</div><div class='ctx'> 		mvmtxq-&gt;txq_id = IWL_MVM_INVALID_QUEUE;</div><div class='add'>+		spin_unlock_bh(&amp;mvm-&gt;add_stream_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mvmsta-&gt;tfd_queue_msk &amp;= ~BIT(queue); /* Don't use this queue anymore */</div><div class='hunk'>@@ -487,6 +552,7 @@ static int iwl_mvm_free_inactive_queue(struct iwl_mvm *mvm, int queue,</div><div class='ctx'> 	u8 sta_id, tid;</div><div class='ctx'> 	unsigned long disable_agg_tids = 0;</div><div class='ctx'> 	bool same_sta;</div><div class='add'>+	u16 queue_tmp = queue;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='hunk'>@@ -509,7 +575,7 @@ static int iwl_mvm_free_inactive_queue(struct iwl_mvm *mvm, int queue,</div><div class='ctx'> 		iwl_mvm_invalidate_sta_queue(mvm, queue,</div><div class='ctx'> 					     disable_agg_tids, false);</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_disable_txq(mvm, old_sta, queue, tid, 0);</div><div class='add'>+	ret = iwl_mvm_disable_txq(mvm, old_sta, sta_id, &amp;queue_tmp, tid);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		IWL_ERR(mvm,</div><div class='ctx'> 			"Failed to free inactive queue %d (ret=%d)\n",</div><div class='hunk'>@@ -593,6 +659,39 @@ static int iwl_mvm_get_shared_queue(struct iwl_mvm *mvm,</div><div class='ctx'> 	return queue;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Re-configure the SCD for a queue that has already been configured */</div><div class='add'>+static int iwl_mvm_reconfig_scd(struct iwl_mvm *mvm, int queue, int fifo,</div><div class='add'>+				int sta_id, int tid, int frame_limit, u16 ssn)</div><div class='add'>+{</div><div class='add'>+	struct iwl_scd_txq_cfg_cmd cmd = {</div><div class='add'>+		.scd_queue = queue,</div><div class='add'>+		.action = SCD_CFG_ENABLE_QUEUE,</div><div class='add'>+		.window = frame_limit,</div><div class='add'>+		.sta_id = sta_id,</div><div class='add'>+		.ssn = cpu_to_le16(ssn),</div><div class='add'>+		.tx_fifo = fifo,</div><div class='add'>+		.aggregate = (queue &gt;= IWL_MVM_DQA_MIN_DATA_QUEUE ||</div><div class='add'>+			      queue == IWL_MVM_DQA_BSS_CLIENT_QUEUE),</div><div class='add'>+		.tid = tid,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(iwl_mvm_has_new_tx_api(mvm)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (WARN(mvm-&gt;queue_info[queue].tid_bitmap == 0,</div><div class='add'>+		 "Trying to reconfig unallocated queue %d\n", queue))</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_TX_QUEUES(mvm, "Reconfig SCD for TXQ #%d\n", queue);</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_send_cmd_pdu(mvm, SCD_QUEUE_CFG, 0, sizeof(cmd), &amp;cmd);</div><div class='add'>+	WARN_ONCE(ret, "Failed to re-configure queue %d on FIFO %d, ret=%d\n",</div><div class='add'>+		  queue, fifo, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * If a given queue has a higher AC than the TID stream that is being compared</div><div class='ctx'>  * to, the queue needs to be redirected to the lower AC. This function does that</div><div class='hunk'>@@ -637,7 +736,7 @@ static int iwl_mvm_redirect_queue(struct iwl_mvm *mvm, int queue, int tid,</div><div class='ctx'> 			    queue, iwl_mvm_ac_to_tx_fifo[ac]);</div><div class='ctx'> </div><div class='ctx'> 	/* Stop the queue and wait for it to empty */</div><div class='del'>-	txq-&gt;stopped = true;</div><div class='add'>+	set_bit(IWL_MVM_TXQ_STATE_STOP_REDIRECT, &amp;txq-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_trans_wait_tx_queues_empty(mvm-&gt;trans, BIT(queue));</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -680,7 +779,7 @@ static int iwl_mvm_redirect_queue(struct iwl_mvm *mvm, int queue, int tid,</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	/* Continue using the queue */</div><div class='del'>-	txq-&gt;stopped = false;</div><div class='add'>+	clear_bit(IWL_MVM_TXQ_STATE_STOP_REDIRECT, &amp;txq-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -692,10 +791,10 @@ static int iwl_mvm_find_free_queue(struct iwl_mvm *mvm, u8 sta_id,</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	if (WARN(maxq &gt;= mvm-&gt;trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues,</div><div class='add'>+	if (WARN(maxq &gt;= mvm-&gt;trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues,</div><div class='ctx'> 		 "max queue %d &gt;= num_of_queues (%d)", maxq,</div><div class='del'>-		 mvm-&gt;trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues))</div><div class='del'>-		maxq = mvm-&gt;trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues - 1;</div><div class='add'>+		 mvm-&gt;trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues))</div><div class='add'>+		maxq = mvm-&gt;trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues - 1;</div><div class='ctx'> </div><div class='ctx'> 	/* This should not be hit with new TX path */</div><div class='ctx'> 	if (WARN_ON(iwl_mvm_has_new_tx_api(mvm)))</div><div class='hunk'>@@ -710,37 +809,85 @@ static int iwl_mvm_find_free_queue(struct iwl_mvm *mvm, u8 sta_id,</div><div class='ctx'> 	return -ENOSPC;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_mvm_tvqm_enable_txq(struct iwl_mvm *mvm,</div><div class='del'>-				   u8 sta_id, u8 tid, unsigned int timeout)</div><div class='add'>+static int iwl_mvm_get_queue_size(struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	int max_size = IWL_DEFAULT_QUEUE_SIZE;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+</div><div class='add'>+	/* this queue isn't used for traffic (cab_queue) */</div><div class='add'>+	if (!sta)</div><div class='add'>+		return IWL_MGMT_QUEUE_SIZE;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	for (link_id = 0; link_id &lt; ARRAY_SIZE(sta-&gt;link); link_id++) {</div><div class='add'>+		struct ieee80211_link_sta *link =</div><div class='add'>+			rcu_dereference(sta-&gt;link[link_id]);</div><div class='add'>+</div><div class='add'>+		if (!link)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* support for 512 ba size */</div><div class='add'>+		if (link-&gt;eht_cap.has_eht &amp;&amp;</div><div class='add'>+		    max_size &lt; IWL_DEFAULT_QUEUE_SIZE_EHT)</div><div class='add'>+			max_size = IWL_DEFAULT_QUEUE_SIZE_EHT;</div><div class='add'>+</div><div class='add'>+		/* support for 256 ba size */</div><div class='add'>+		if (link-&gt;he_cap.has_he &amp;&amp;</div><div class='add'>+		    max_size &lt; IWL_DEFAULT_QUEUE_SIZE_HE)</div><div class='add'>+			max_size = IWL_DEFAULT_QUEUE_SIZE_HE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return max_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_tvqm_enable_txq(struct iwl_mvm *mvm,</div><div class='add'>+			    struct ieee80211_sta *sta,</div><div class='add'>+			    u8 sta_id, u8 tid, unsigned int timeout)</div><div class='ctx'> {</div><div class='del'>-	int queue, size = max_t(u32, IWL_DEFAULT_QUEUE_SIZE,</div><div class='del'>-				mvm-&gt;trans-&gt;cfg-&gt;min_256_ba_txq_size);</div><div class='add'>+	int queue, size;</div><div class='add'>+	u32 sta_mask = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (tid == IWL_MAX_TID_COUNT) {</div><div class='ctx'> 		tid = IWL_MGMT_TID;</div><div class='ctx'> 		size = max_t(u32, IWL_MGMT_QUEUE_SIZE,</div><div class='del'>-			     mvm-&gt;trans-&gt;cfg-&gt;min_txq_size);</div><div class='add'>+			     mvm-&gt;trans-&gt;mac_cfg-&gt;base-&gt;min_txq_size);</div><div class='add'>+	} else {</div><div class='add'>+		size = iwl_mvm_get_queue_size(sta);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		__le16 enable = cpu_to_le16(TX_QUEUE_CFG_ENABLE_QUEUE);</div><div class='add'>+	if (sta) {</div><div class='add'>+		struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+		struct ieee80211_link_sta *link_sta;</div><div class='add'>+		unsigned int link_id;</div><div class='ctx'> </div><div class='del'>-		queue = iwl_trans_txq_alloc(mvm-&gt;trans, enable,</div><div class='del'>-					    sta_id, tid, SCD_QUEUE_CFG,</div><div class='del'>-					    size, timeout);</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		for_each_sta_active_link(mvmsta-&gt;vif, sta, link_sta, link_id) {</div><div class='add'>+			struct iwl_mvm_link_sta *link =</div><div class='add'>+				rcu_dereference_protected(mvmsta-&gt;link[link_id],</div><div class='add'>+							  lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='ctx'> </div><div class='del'>-		if (queue &lt; 0)</div><div class='del'>-			IWL_DEBUG_TX_QUEUES(mvm,</div><div class='del'>-					    "Failed allocating TXQ of size %d for sta %d tid %d, ret: %d\n",</div><div class='del'>-					    size, sta_id, tid, queue);</div><div class='del'>-		size /= 2;</div><div class='del'>-	} while (queue &lt; 0 &amp;&amp; size &gt;= 16);</div><div class='add'>+			if (!link)</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='del'>-	if (queue &lt; 0)</div><div class='del'>-		return queue;</div><div class='add'>+			sta_mask |= BIT(link-&gt;sta_id);</div><div class='add'>+		}</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	} else {</div><div class='add'>+		sta_mask |= BIT(sta_id);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_TX_QUEUES(mvm, "Enabling TXQ #%d for sta %d tid %d\n",</div><div class='del'>-			    queue, sta_id, tid);</div><div class='add'>+	if (!sta_mask)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	queue = iwl_trans_txq_alloc(mvm-&gt;trans, 0, sta_mask,</div><div class='add'>+				    tid, size, timeout);</div><div class='add'>+</div><div class='add'>+	if (queue &gt;= 0)</div><div class='add'>+		IWL_DEBUG_TX_QUEUES(mvm,</div><div class='add'>+				    "Enabling TXQ #%d for sta mask 0x%x tid %d\n",</div><div class='add'>+				    queue, sta_mask, tid);</div><div class='ctx'> </div><div class='ctx'> 	return queue;</div><div class='ctx'> }</div><div class='hunk'>@@ -753,21 +900,22 @@ static int iwl_mvm_sta_alloc_queue_tvqm(struct iwl_mvm *mvm,</div><div class='ctx'> 	struct iwl_mvm_txq *mvmtxq =</div><div class='ctx'> 		iwl_mvm_txq_from_tid(sta, tid);</div><div class='ctx'> 	unsigned int wdg_timeout =</div><div class='del'>-		iwl_mvm_get_wd_timeout(mvm, mvmsta-&gt;vif, false, false);</div><div class='add'>+		iwl_mvm_get_wd_timeout(mvm, mvmsta-&gt;vif);</div><div class='ctx'> 	int queue = -1;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_TX_QUEUES(mvm,</div><div class='ctx'> 			    "Allocating queue for sta %d on tid %d\n",</div><div class='del'>-			    mvmsta-&gt;sta_id, tid);</div><div class='del'>-	queue = iwl_mvm_tvqm_enable_txq(mvm, mvmsta-&gt;sta_id, tid, wdg_timeout);</div><div class='add'>+			    mvmsta-&gt;deflink.sta_id, tid);</div><div class='add'>+	queue = iwl_mvm_tvqm_enable_txq(mvm, sta, mvmsta-&gt;deflink.sta_id,</div><div class='add'>+					tid, wdg_timeout);</div><div class='ctx'> 	if (queue &lt; 0)</div><div class='ctx'> 		return queue;</div><div class='ctx'> </div><div class='ctx'> 	mvmtxq-&gt;txq_id = queue;</div><div class='ctx'> 	mvm-&gt;tvqm_info[queue].txq_tid = tid;</div><div class='del'>-	mvm-&gt;tvqm_info[queue].sta_id = mvmsta-&gt;sta_id;</div><div class='add'>+	mvm-&gt;tvqm_info[queue].sta_id = mvmsta-&gt;deflink.sta_id;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_TX_QUEUES(mvm, "Allocated queue is %d\n", queue);</div><div class='ctx'> </div><div class='hunk'>@@ -932,7 +1080,7 @@ static void iwl_mvm_unshare_queue(struct iwl_mvm *mvm, int queue)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='del'>-	wdg_timeout = iwl_mvm_get_wd_timeout(mvm, mvmsta-&gt;vif, false, false);</div><div class='add'>+	wdg_timeout = iwl_mvm_get_wd_timeout(mvm, mvmsta-&gt;vif);</div><div class='ctx'> </div><div class='ctx'> 	ssn = IEEE80211_SEQ_TO_SN(mvmsta-&gt;tid_data[tid].seq_number);</div><div class='ctx'> </div><div class='hunk'>@@ -952,7 +1100,7 @@ static void iwl_mvm_unshare_queue(struct iwl_mvm *mvm, int queue)</div><div class='ctx'> 		mvmsta-&gt;tid_disable_agg &amp;= ~BIT(tid);</div><div class='ctx'> </div><div class='ctx'> 		cmd.mac_id_n_color = cpu_to_le32(mvmsta-&gt;mac_id_n_color);</div><div class='del'>-		cmd.sta_id = mvmsta-&gt;sta_id;</div><div class='add'>+		cmd.sta_id = mvmsta-&gt;deflink.sta_id;</div><div class='ctx'> 		cmd.add_modify = STA_MODE_MODIFY;</div><div class='ctx'> 		cmd.modify_mask = STA_MODIFY_TID_DISABLE_TX;</div><div class='ctx'> 		cmd.tfd_queue_msk = cpu_to_le32(mvmsta-&gt;tfd_queue_msk);</div><div class='hunk'>@@ -986,7 +1134,7 @@ static bool iwl_mvm_remove_inactive_tids(struct iwl_mvm *mvm,</div><div class='ctx'> 					 unsigned long *unshare_queues,</div><div class='ctx'> 					 unsigned long *changetid_queues)</div><div class='ctx'> {</div><div class='del'>-	int tid;</div><div class='add'>+	unsigned int tid;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvmsta-&gt;lock);</div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='hunk'>@@ -1016,12 +1164,12 @@ static bool iwl_mvm_remove_inactive_tids(struct iwl_mvm *mvm,</div><div class='ctx'> 	 * Remove the ones that did.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for_each_set_bit(tid, &amp;tid_bitmap, IWL_MAX_TID_COUNT + 1) {</div><div class='del'>-		u16 tid_bitmap;</div><div class='add'>+		u16 q_tid_bitmap;</div><div class='ctx'> </div><div class='ctx'> 		mvmsta-&gt;tid_data[tid].txq_id = IWL_MVM_INVALID_QUEUE;</div><div class='ctx'> 		mvm-&gt;queue_info[queue].tid_bitmap &amp;= ~BIT(tid);</div><div class='ctx'> </div><div class='del'>-		tid_bitmap = mvm-&gt;queue_info[queue].tid_bitmap;</div><div class='add'>+		q_tid_bitmap = mvm-&gt;queue_info[queue].tid_bitmap;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We need to take into account a situation in which a TXQ was</div><div class='hunk'>@@ -1034,7 +1182,7 @@ static bool iwl_mvm_remove_inactive_tids(struct iwl_mvm *mvm,</div><div class='ctx'> 		 * Mark this queue in the right bitmap, we'll send the command</div><div class='ctx'> 		 * to the firmware later.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!(tid_bitmap &amp; BIT(mvm-&gt;queue_info[queue].txq_tid)))</div><div class='add'>+		if (!(q_tid_bitmap &amp; BIT(mvm-&gt;queue_info[queue].txq_tid)))</div><div class='ctx'> 			set_bit(queue, changetid_queues);</div><div class='ctx'> </div><div class='ctx'> 		IWL_DEBUG_TX_QUEUES(mvm,</div><div class='hunk'>@@ -1068,7 +1216,7 @@ static bool iwl_mvm_remove_inactive_tids(struct iwl_mvm *mvm,</div><div class='ctx'>  * can be unshared and finding one (and only one) that can be</div><div class='ctx'>  * reused.</div><div class='ctx'>  * This function is also invoked as a sort of clean-up task,</div><div class='del'>- * in which case @alloc_for_sta is IWL_MVM_INVALID_STA.</div><div class='add'>+ * in which case @alloc_for_sta is IWL_INVALID_STA.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns the queue number, or -ENOSPC.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1161,7 +1309,7 @@ static int iwl_mvm_inactivity_check(struct iwl_mvm *mvm, u8 alloc_for_sta)</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	if (free_queue &gt;= 0 &amp;&amp; alloc_for_sta != IWL_MVM_INVALID_STA) {</div><div class='add'>+	if (free_queue &gt;= 0 &amp;&amp; alloc_for_sta != IWL_INVALID_STA) {</div><div class='ctx'> 		ret = iwl_mvm_free_inactive_queue(mvm, free_queue, queue_owner,</div><div class='ctx'> 						  alloc_for_sta);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -1177,13 +1325,14 @@ static int iwl_mvm_sta_alloc_queue(struct iwl_mvm *mvm,</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> 	struct iwl_trans_txq_scd_cfg cfg = {</div><div class='ctx'> 		.fifo = iwl_mvm_mac_ac_to_tx_fifo(mvm, ac),</div><div class='del'>-		.sta_id = mvmsta-&gt;sta_id,</div><div class='add'>+		.sta_id = mvmsta-&gt;deflink.sta_id,</div><div class='ctx'> 		.tid = tid,</div><div class='ctx'> 		.frame_limit = IWL_FRAME_LIMIT,</div><div class='ctx'> 	};</div><div class='ctx'> 	unsigned int wdg_timeout =</div><div class='del'>-		iwl_mvm_get_wd_timeout(mvm, mvmsta-&gt;vif, false, false);</div><div class='add'>+		iwl_mvm_get_wd_timeout(mvm, mvmsta-&gt;vif);</div><div class='ctx'> 	int queue = -1;</div><div class='add'>+	u16 queue_tmp;</div><div class='ctx'> 	unsigned long disable_agg_tids = 0;</div><div class='ctx'> 	enum iwl_mvm_agg_state queue_state;</div><div class='ctx'> 	bool shared_queue = false, inc_ssn;</div><div class='hunk'>@@ -1202,7 +1351,7 @@ static int iwl_mvm_sta_alloc_queue(struct iwl_mvm *mvm,</div><div class='ctx'> 	spin_unlock_bh(&amp;mvmsta-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (tid == IWL_MAX_TID_COUNT) {</div><div class='del'>-		queue = iwl_mvm_find_free_queue(mvm, mvmsta-&gt;sta_id,</div><div class='add'>+		queue = iwl_mvm_find_free_queue(mvm, mvmsta-&gt;deflink.sta_id,</div><div class='ctx'> 						IWL_MVM_DQA_MIN_MGMT_QUEUE,</div><div class='ctx'> 						IWL_MVM_DQA_MAX_MGMT_QUEUE);</div><div class='ctx'> 		if (queue &gt;= IWL_MVM_DQA_MIN_MGMT_QUEUE)</div><div class='hunk'>@@ -1221,12 +1370,12 @@ static int iwl_mvm_sta_alloc_queue(struct iwl_mvm *mvm,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (queue &lt; 0)</div><div class='del'>-		queue = iwl_mvm_find_free_queue(mvm, mvmsta-&gt;sta_id,</div><div class='add'>+		queue = iwl_mvm_find_free_queue(mvm, mvmsta-&gt;deflink.sta_id,</div><div class='ctx'> 						IWL_MVM_DQA_MIN_DATA_QUEUE,</div><div class='ctx'> 						IWL_MVM_DQA_MAX_DATA_QUEUE);</div><div class='ctx'> 	if (queue &lt; 0) {</div><div class='ctx'> 		/* try harder - perhaps kill an inactive queue */</div><div class='del'>-		queue = iwl_mvm_inactivity_check(mvm, mvmsta-&gt;sta_id);</div><div class='add'>+		queue = iwl_mvm_inactivity_check(mvm, mvmsta-&gt;deflink.sta_id);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* No free queue - we'll have to share */</div><div class='hunk'>@@ -1266,7 +1415,7 @@ static int iwl_mvm_sta_alloc_queue(struct iwl_mvm *mvm,</div><div class='ctx'> 	IWL_DEBUG_TX_QUEUES(mvm,</div><div class='ctx'> 			    "Allocating %squeue #%d to sta %d on tid %d\n",</div><div class='ctx'> 			    shared_queue ? "shared " : "", queue,</div><div class='del'>-			    mvmsta-&gt;sta_id, tid);</div><div class='add'>+			    mvmsta-&gt;deflink.sta_id, tid);</div><div class='ctx'> </div><div class='ctx'> 	if (shared_queue) {</div><div class='ctx'> 		/* Disable any open aggs on this queue */</div><div class='hunk'>@@ -1332,7 +1481,36 @@ static int iwl_mvm_sta_alloc_queue(struct iwl_mvm *mvm,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_err:</div><div class='del'>-	iwl_mvm_disable_txq(mvm, sta, queue, tid, 0);</div><div class='add'>+	queue_tmp = queue;</div><div class='add'>+	iwl_mvm_disable_txq(mvm, sta, mvmsta-&gt;deflink.sta_id, &amp;queue_tmp, tid);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_sta_ensure_queue(struct iwl_mvm *mvm,</div><div class='add'>+			     struct ieee80211_txq *txq)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_txq *mvmtxq = iwl_mvm_txq_from_mac80211(txq);</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (likely(test_bit(IWL_MVM_TXQ_STATE_READY, &amp;mvmtxq-&gt;state)) ||</div><div class='add'>+	    !txq-&gt;sta) {</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!iwl_mvm_sta_alloc_queue(mvm, txq-&gt;sta, txq-&gt;ac, txq-&gt;tid)) {</div><div class='add'>+		set_bit(IWL_MVM_TXQ_STATE_READY, &amp;mvmtxq-&gt;state);</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	spin_lock(&amp;mvm-&gt;add_stream_lock);</div><div class='add'>+	if (!list_empty(&amp;mvmtxq-&gt;list))</div><div class='add'>+		list_del_init(&amp;mvmtxq-&gt;list);</div><div class='add'>+	spin_unlock(&amp;mvm-&gt;add_stream_lock);</div><div class='add'>+	local_bh_enable();</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1342,9 +1520,14 @@ void iwl_mvm_add_new_dqa_stream_wk(struct work_struct *wk)</div><div class='ctx'> 	struct iwl_mvm *mvm = container_of(wk, struct iwl_mvm,</div><div class='ctx'> 					   add_stream_wk);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='add'>+</div><div class='add'>+	/* will reschedule to run after restart */</div><div class='add'>+	if (test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &amp;mvm-&gt;status) ||</div><div class='add'>+	    test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_inactivity_check(mvm, IWL_MVM_INVALID_STA);</div><div class='add'>+	iwl_mvm_inactivity_check(mvm, IWL_INVALID_STA);</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;mvm-&gt;add_stream_txqs)) {</div><div class='ctx'> 		struct iwl_mvm_txq *mvmtxq;</div><div class='hunk'>@@ -1367,17 +1550,25 @@ void iwl_mvm_add_new_dqa_stream_wk(struct work_struct *wk)</div><div class='ctx'> 		 * a queue in the function itself.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (iwl_mvm_sta_alloc_queue(mvm, txq-&gt;sta, txq-&gt;ac, tid)) {</div><div class='add'>+			spin_lock_bh(&amp;mvm-&gt;add_stream_lock);</div><div class='ctx'> 			list_del_init(&amp;mvmtxq-&gt;list);</div><div class='add'>+			spin_unlock_bh(&amp;mvm-&gt;add_stream_lock);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		list_del_init(&amp;mvmtxq-&gt;list);</div><div class='add'>+		/* now we're ready, any remaining races/concurrency will be</div><div class='add'>+		 * handled in iwl_mvm_mac_itxq_xmit()</div><div class='add'>+		 */</div><div class='add'>+		set_bit(IWL_MVM_TXQ_STATE_READY, &amp;mvmtxq-&gt;state);</div><div class='add'>+</div><div class='ctx'> 		local_bh_disable();</div><div class='add'>+		spin_lock(&amp;mvm-&gt;add_stream_lock);</div><div class='add'>+		list_del_init(&amp;mvmtxq-&gt;list);</div><div class='add'>+		spin_unlock(&amp;mvm-&gt;add_stream_lock);</div><div class='add'>+</div><div class='ctx'> 		iwl_mvm_mac_itxq_xmit(mvm-&gt;hw, txq);</div><div class='ctx'> 		local_bh_enable();</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_mvm_reserve_sta_stream(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -1392,7 +1583,7 @@ static int iwl_mvm_reserve_sta_stream(struct iwl_mvm *mvm,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* run the general cleanup/unsharing of queues */</div><div class='del'>-	iwl_mvm_inactivity_check(mvm, IWL_MVM_INVALID_STA);</div><div class='add'>+	iwl_mvm_inactivity_check(mvm, IWL_INVALID_STA);</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure we have free resources for this STA */</div><div class='ctx'> 	if (vif_type == NL80211_IFTYPE_STATION &amp;&amp; !sta-&gt;tdls &amp;&amp;</div><div class='hunk'>@@ -1401,12 +1592,12 @@ static int iwl_mvm_reserve_sta_stream(struct iwl_mvm *mvm,</div><div class='ctx'> 	     IWL_MVM_QUEUE_FREE))</div><div class='ctx'> 		queue = IWL_MVM_DQA_BSS_CLIENT_QUEUE;</div><div class='ctx'> 	else</div><div class='del'>-		queue = iwl_mvm_find_free_queue(mvm, mvmsta-&gt;sta_id,</div><div class='add'>+		queue = iwl_mvm_find_free_queue(mvm, mvmsta-&gt;deflink.sta_id,</div><div class='ctx'> 						IWL_MVM_DQA_MIN_DATA_QUEUE,</div><div class='ctx'> 						IWL_MVM_DQA_MAX_DATA_QUEUE);</div><div class='ctx'> 	if (queue &lt; 0) {</div><div class='ctx'> 		/* try again - this time kick out a queue if needed */</div><div class='del'>-		queue = iwl_mvm_inactivity_check(mvm, mvmsta-&gt;sta_id);</div><div class='add'>+		queue = iwl_mvm_inactivity_check(mvm, mvmsta-&gt;deflink.sta_id);</div><div class='ctx'> 		if (queue &lt; 0) {</div><div class='ctx'> 			IWL_ERR(mvm, "No available queues for new station\n");</div><div class='ctx'> 			return -ENOSPC;</div><div class='hunk'>@@ -1417,7 +1608,7 @@ static int iwl_mvm_reserve_sta_stream(struct iwl_mvm *mvm,</div><div class='ctx'> 	mvmsta-&gt;reserved_queue = queue;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_TX_QUEUES(mvm, "Reserving data queue #%d for sta_id %d\n",</div><div class='del'>-			    queue, mvmsta-&gt;sta_id);</div><div class='add'>+			    queue, mvmsta-&gt;deflink.sta_id);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1429,15 +1620,15 @@ static int iwl_mvm_reserve_sta_stream(struct iwl_mvm *mvm,</div><div class='ctx'>  *</div><div class='ctx'>  * Note that re-enabling aggregations isn't done in this function.</div><div class='ctx'>  */</div><div class='del'>-static void iwl_mvm_realloc_queues_after_restart(struct iwl_mvm *mvm,</div><div class='del'>-						 struct ieee80211_sta *sta)</div><div class='add'>+void iwl_mvm_realloc_queues_after_restart(struct iwl_mvm *mvm,</div><div class='add'>+					  struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> 	unsigned int wdg =</div><div class='del'>-		iwl_mvm_get_wd_timeout(mvm, mvm_sta-&gt;vif, false, false);</div><div class='add'>+		iwl_mvm_get_wd_timeout(mvm, mvm_sta-&gt;vif);</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct iwl_trans_txq_scd_cfg cfg = {</div><div class='del'>-		.sta_id = mvm_sta-&gt;sta_id,</div><div class='add'>+		.sta_id = mvm_sta-&gt;deflink.sta_id,</div><div class='ctx'> 		.frame_limit = IWL_FRAME_LIMIT,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -1459,8 +1650,9 @@ static void iwl_mvm_realloc_queues_after_restart(struct iwl_mvm *mvm,</div><div class='ctx'> 		if (iwl_mvm_has_new_tx_api(mvm)) {</div><div class='ctx'> 			IWL_DEBUG_TX_QUEUES(mvm,</div><div class='ctx'> 					    "Re-mapping sta %d tid %d\n",</div><div class='del'>-					    mvm_sta-&gt;sta_id, i);</div><div class='del'>-			txq_id = iwl_mvm_tvqm_enable_txq(mvm, mvm_sta-&gt;sta_id,</div><div class='add'>+					    mvm_sta-&gt;deflink.sta_id, i);</div><div class='add'>+			txq_id = iwl_mvm_tvqm_enable_txq(mvm, sta,</div><div class='add'>+							 mvm_sta-&gt;deflink.sta_id,</div><div class='ctx'> 							 i, wdg);</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * on failures, just set it to IWL_MVM_INVALID_QUEUE</div><div class='hunk'>@@ -1489,7 +1681,8 @@ static void iwl_mvm_realloc_queues_after_restart(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 			IWL_DEBUG_TX_QUEUES(mvm,</div><div class='ctx'> 					    "Re-mapping sta %d tid %d to queue %d\n",</div><div class='del'>-					    mvm_sta-&gt;sta_id, i, txq_id);</div><div class='add'>+					    mvm_sta-&gt;deflink.sta_id, i,</div><div class='add'>+					    txq_id);</div><div class='ctx'> </div><div class='ctx'> 			iwl_mvm_enable_txq(mvm, sta, txq_id, seq, &amp;cfg, wdg);</div><div class='ctx'> 			mvm-&gt;queue_info[txq_id].status = IWL_MVM_QUEUE_READY;</div><div class='hunk'>@@ -1511,8 +1704,7 @@ static int iwl_mvm_add_int_sta_common(struct iwl_mvm *mvm,</div><div class='ctx'> 	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='ctx'> 	cmd.sta_id = sta-&gt;sta_id;</div><div class='ctx'> </div><div class='del'>-	if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, LONG_GROUP, ADD_STA,</div><div class='del'>-				  0) &gt;= 12 &amp;&amp;</div><div class='add'>+	if (iwl_mvm_has_new_station_api(mvm-&gt;fw) &amp;&amp;</div><div class='ctx'> 	    sta-&gt;type == IWL_STA_AUX_ACTIVITY)</div><div class='ctx'> 		cmd.mac_id_n_color = cpu_to_le32(mac_id);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1548,74 +1740,45 @@ static int iwl_mvm_add_int_sta_common(struct iwl_mvm *mvm,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwl_mvm_add_sta(struct iwl_mvm *mvm,</div><div class='del'>-		    struct ieee80211_vif *vif,</div><div class='del'>-		    struct ieee80211_sta *sta)</div><div class='add'>+/* Initialize driver data of a new sta */</div><div class='add'>+int iwl_mvm_sta_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+		     struct ieee80211_sta *sta, int sta_id, u8 sta_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> 	struct iwl_mvm_rxq_dup_data *dup_data;</div><div class='del'>-	int i, ret, sta_id;</div><div class='del'>-	bool sta_update = false;</div><div class='del'>-	unsigned int sta_flags = 0;</div><div class='add'>+	int i, ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status))</div><div class='del'>-		sta_id = iwl_mvm_find_free_sta_id(mvm,</div><div class='del'>-						  ieee80211_vif_type_p2p(vif));</div><div class='del'>-	else</div><div class='del'>-		sta_id = mvm_sta-&gt;sta_id;</div><div class='del'>-</div><div class='del'>-	if (sta_id == IWL_MVM_INVALID_STA)</div><div class='del'>-		return -ENOSPC;</div><div class='add'>+	mvm_sta-&gt;mac_id_n_color = FW_CMD_ID_AND_COLOR(mvmvif-&gt;id,</div><div class='add'>+						      mvmvif-&gt;color);</div><div class='add'>+	mvm_sta-&gt;vif = vif;</div><div class='ctx'> </div><div class='del'>-	spin_lock_init(&amp;mvm_sta-&gt;lock);</div><div class='add'>+	/* for MLD sta_id(s) should be allocated for each link before calling</div><div class='add'>+	 * this function</div><div class='add'>+	 */</div><div class='add'>+	if (!mvm-&gt;mld_api_is_used) {</div><div class='add'>+		if (WARN_ON(sta_id == IWL_INVALID_STA))</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* if this is a HW restart re-alloc existing queues */</div><div class='del'>-	if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status)) {</div><div class='del'>-		struct iwl_mvm_int_sta tmp_sta = {</div><div class='del'>-			.sta_id = sta_id,</div><div class='del'>-			.type = mvm_sta-&gt;sta_type,</div><div class='del'>-		};</div><div class='add'>+		mvm_sta-&gt;deflink.sta_id = sta_id;</div><div class='add'>+		rcu_assign_pointer(mvm_sta-&gt;link[0], &amp;mvm_sta-&gt;deflink);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * First add an empty station since allocating</div><div class='del'>-		 * a queue requires a valid station</div><div class='del'>-		 */</div><div class='del'>-		ret = iwl_mvm_add_int_sta_common(mvm, &amp;tmp_sta, sta-&gt;addr,</div><div class='del'>-						 mvmvif-&gt;id, mvmvif-&gt;color);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		iwl_mvm_realloc_queues_after_restart(mvm, sta);</div><div class='del'>-		sta_update = true;</div><div class='del'>-		sta_flags = iwl_mvm_has_new_tx_api(mvm) ? 0 : STA_MODIFY_QUEUES;</div><div class='del'>-		goto update_fw;</div><div class='add'>+		if (!mvm-&gt;trans-&gt;mac_cfg-&gt;gen2)</div><div class='add'>+			mvm_sta-&gt;deflink.lq_sta.rs_drv.pers.max_agg_bufsize =</div><div class='add'>+				LINK_QUAL_AGG_FRAME_LIMIT_DEF;</div><div class='add'>+		else</div><div class='add'>+			mvm_sta-&gt;deflink.lq_sta.rs_drv.pers.max_agg_bufsize =</div><div class='add'>+				LINK_QUAL_AGG_FRAME_LIMIT_GEN2_DEF;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mvm_sta-&gt;sta_id = sta_id;</div><div class='del'>-	mvm_sta-&gt;mac_id_n_color = FW_CMD_ID_AND_COLOR(mvmvif-&gt;id,</div><div class='del'>-						      mvmvif-&gt;color);</div><div class='del'>-	mvm_sta-&gt;vif = vif;</div><div class='del'>-	if (!mvm-&gt;trans-&gt;trans_cfg-&gt;gen2)</div><div class='del'>-		mvm_sta-&gt;max_agg_bufsize = LINK_QUAL_AGG_FRAME_LIMIT_DEF;</div><div class='del'>-	else</div><div class='del'>-		mvm_sta-&gt;max_agg_bufsize = LINK_QUAL_AGG_FRAME_LIMIT_GEN2_DEF;</div><div class='del'>-	mvm_sta-&gt;tx_protection = 0;</div><div class='ctx'> 	mvm_sta-&gt;tt_tx_protection = false;</div><div class='del'>-	mvm_sta-&gt;sta_type = sta-&gt;tdls ? IWL_STA_TDLS_LINK : IWL_STA_LINK;</div><div class='add'>+	mvm_sta-&gt;sta_type = sta_type;</div><div class='ctx'> </div><div class='del'>-	/* HW restart, don't assume the memory has been zeroed */</div><div class='ctx'> 	mvm_sta-&gt;tid_disable_agg = 0xffff; /* No aggs at first */</div><div class='del'>-	mvm_sta-&gt;tfd_queue_msk = 0;</div><div class='ctx'> </div><div class='del'>-	/* for HW restart - reset everything but the sequence number */</div><div class='ctx'> 	for (i = 0; i &lt;= IWL_MAX_TID_COUNT; i++) {</div><div class='del'>-		u16 seq = mvm_sta-&gt;tid_data[i].seq_number;</div><div class='del'>-		memset(&amp;mvm_sta-&gt;tid_data[i], 0, sizeof(mvm_sta-&gt;tid_data[i]));</div><div class='del'>-		mvm_sta-&gt;tid_data[i].seq_number = seq;</div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Mark all queues for this STA as unallocated and defer TX</div><div class='ctx'> 		 * frames until the queue is allocated</div><div class='hunk'>@@ -1632,13 +1795,10 @@ int iwl_mvm_add_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 		atomic_set(&amp;mvmtxq-&gt;tx_request, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mvm_sta-&gt;agg_tids = 0;</div><div class='del'>-</div><div class='del'>-	if (iwl_mvm_has_new_rx_api(mvm) &amp;&amp;</div><div class='del'>-	    !test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status)) {</div><div class='add'>+	if (iwl_mvm_has_new_rx_api(mvm)) {</div><div class='ctx'> 		int q;</div><div class='ctx'> </div><div class='del'>-		dup_data = kcalloc(mvm-&gt;trans-&gt;num_rx_queues,</div><div class='add'>+		dup_data = kcalloc(mvm-&gt;trans-&gt;info.num_rxqs,</div><div class='ctx'> 				   sizeof(*dup_data), GFP_KERNEL);</div><div class='ctx'> 		if (!dup_data)</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -1651,7 +1811,7 @@ int iwl_mvm_add_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 		 * This thus allows receiving a packet with seqno 0 and the</div><div class='ctx'> 		 * retry bit set as the very first packet on a new TID.</div><div class='ctx'> 		 */</div><div class='del'>-		for (q = 0; q &lt; mvm-&gt;trans-&gt;num_rx_queues; q++)</div><div class='add'>+		for (q = 0; q &lt; mvm-&gt;trans-&gt;info.num_rxqs; q++)</div><div class='ctx'> 			memset(dup_data[q].last_seq, 0xff,</div><div class='ctx'> 			       sizeof(dup_data[q].last_seq));</div><div class='ctx'> 		mvm_sta-&gt;dup_data = dup_data;</div><div class='hunk'>@@ -1661,7 +1821,7 @@ int iwl_mvm_add_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 		ret = iwl_mvm_reserve_sta_stream(mvm, sta,</div><div class='ctx'> 						 ieee80211_vif_type_p2p(vif));</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto err;</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1671,10 +1831,62 @@ int iwl_mvm_add_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 	if (iwl_mvm_has_tlc_offload(mvm))</div><div class='ctx'> 		iwl_mvm_rs_add_sta(mvm, mvm_sta);</div><div class='ctx'> 	else</div><div class='del'>-		spin_lock_init(&amp;mvm_sta-&gt;lq_sta.rs_drv.pers.lock);</div><div class='add'>+		spin_lock_init(&amp;mvm_sta-&gt;deflink.lq_sta.rs_drv.pers.lock);</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_toggle_tx_ant(mvm, &amp;mvm_sta-&gt;tx_ant);</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_add_sta(struct iwl_mvm *mvm,</div><div class='add'>+		    struct ieee80211_vif *vif,</div><div class='add'>+		    struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	int ret, sta_id;</div><div class='add'>+	bool sta_update = false;</div><div class='add'>+	unsigned int sta_flags = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status))</div><div class='add'>+		sta_id = iwl_mvm_find_free_sta_id(mvm,</div><div class='add'>+						  ieee80211_vif_type_p2p(vif));</div><div class='add'>+	else</div><div class='add'>+		sta_id = mvm_sta-&gt;deflink.sta_id;</div><div class='add'>+</div><div class='add'>+	if (sta_id == IWL_INVALID_STA)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;mvm_sta-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* if this is a HW restart re-alloc existing queues */</div><div class='add'>+	if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status)) {</div><div class='add'>+		struct iwl_mvm_int_sta tmp_sta = {</div><div class='add'>+			.sta_id = sta_id,</div><div class='add'>+			.type = mvm_sta-&gt;sta_type,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		/* First add an empty station since allocating</div><div class='add'>+		 * a queue requires a valid station</div><div class='add'>+		 */</div><div class='add'>+		ret = iwl_mvm_add_int_sta_common(mvm, &amp;tmp_sta, sta-&gt;addr,</div><div class='add'>+						 mvmvif-&gt;id, mvmvif-&gt;color);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		iwl_mvm_realloc_queues_after_restart(mvm, sta);</div><div class='add'>+		sta_update = true;</div><div class='add'>+		sta_flags = iwl_mvm_has_new_tx_api(mvm) ? 0 : STA_MODIFY_QUEUES;</div><div class='add'>+		goto update_fw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_sta_init(mvm, vif, sta, sta_id,</div><div class='add'>+			       sta-&gt;tdls ? IWL_STA_TDLS_LINK : IWL_STA_LINK);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='ctx'> update_fw:</div><div class='ctx'> 	ret = iwl_mvm_sta_send_to_fw(mvm, sta, sta_update, sta_flags);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -1682,10 +1894,10 @@ update_fw:</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='ctx'> 		if (!sta-&gt;tdls) {</div><div class='del'>-			WARN_ON(mvmvif-&gt;ap_sta_id != IWL_MVM_INVALID_STA);</div><div class='del'>-			mvmvif-&gt;ap_sta_id = sta_id;</div><div class='add'>+			WARN_ON(mvmvif-&gt;deflink.ap_sta_id != IWL_INVALID_STA);</div><div class='add'>+			mvmvif-&gt;deflink.ap_sta_id = sta_id;</div><div class='ctx'> 		} else {</div><div class='del'>-			WARN_ON(mvmvif-&gt;ap_sta_id == IWL_MVM_INVALID_STA);</div><div class='add'>+			WARN_ON(mvmvif-&gt;deflink.ap_sta_id == IWL_INVALID_STA);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1707,7 +1919,7 @@ int iwl_mvm_drain_sta(struct iwl_mvm *mvm, struct iwl_mvm_sta *mvmsta,</div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	cmd.mac_id_n_color = cpu_to_le32(mvmsta-&gt;mac_id_n_color);</div><div class='del'>-	cmd.sta_id = mvmsta-&gt;sta_id;</div><div class='add'>+	cmd.sta_id = mvmsta-&gt;deflink.sta_id;</div><div class='ctx'> 	cmd.add_modify = STA_MODE_MODIFY;</div><div class='ctx'> 	cmd.station_flags = drain ? cpu_to_le32(STA_FLG_DRAIN_FLOW) : 0;</div><div class='ctx'> 	cmd.station_flags_msk = cpu_to_le32(STA_FLG_DRAIN_FLOW);</div><div class='hunk'>@@ -1722,12 +1934,12 @@ int iwl_mvm_drain_sta(struct iwl_mvm *mvm, struct iwl_mvm_sta *mvmsta,</div><div class='ctx'> 	switch (status &amp; IWL_ADD_STA_STATUS_MASK) {</div><div class='ctx'> 	case ADD_STA_SUCCESS:</div><div class='ctx'> 		IWL_DEBUG_INFO(mvm, "Frames for staid %d will drained in fw\n",</div><div class='del'>-			       mvmsta-&gt;sta_id);</div><div class='add'>+			       mvmsta-&gt;deflink.sta_id);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		IWL_ERR(mvm, "Couldn't drain frames for staid %d\n",</div><div class='del'>-			mvmsta-&gt;sta_id);</div><div class='add'>+			mvmsta-&gt;deflink.sta_id);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1779,8 +1991,8 @@ static void iwl_mvm_disable_sta_queues(struct iwl_mvm *mvm,</div><div class='ctx'> 		if (mvm_sta-&gt;tid_data[i].txq_id == IWL_MVM_INVALID_QUEUE)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		iwl_mvm_disable_txq(mvm, sta, mvm_sta-&gt;tid_data[i].txq_id, i,</div><div class='del'>-				    0);</div><div class='add'>+		iwl_mvm_disable_txq(mvm, sta, mvm_sta-&gt;deflink.sta_id,</div><div class='add'>+				    &amp;mvm_sta-&gt;tid_data[i].txq_id, i);</div><div class='ctx'> 		mvm_sta-&gt;tid_data[i].txq_id = IWL_MVM_INVALID_QUEUE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1788,7 +2000,11 @@ static void iwl_mvm_disable_sta_queues(struct iwl_mvm *mvm,</div><div class='ctx'> 		struct iwl_mvm_txq *mvmtxq =</div><div class='ctx'> 			iwl_mvm_txq_from_mac80211(sta-&gt;txq[i]);</div><div class='ctx'> </div><div class='add'>+		spin_lock_bh(&amp;mvm-&gt;add_stream_lock);</div><div class='ctx'> 		mvmtxq-&gt;txq_id = IWL_MVM_INVALID_QUEUE;</div><div class='add'>+		list_del_init(&amp;mvmtxq-&gt;list);</div><div class='add'>+		clear_bit(IWL_MVM_TXQ_STATE_READY, &amp;mvmtxq-&gt;state);</div><div class='add'>+		spin_unlock_bh(&amp;mvm-&gt;add_stream_lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1816,26 +2032,63 @@ int iwl_mvm_wait_sta_queues_empty(struct iwl_mvm *mvm,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Execute the common part for both MLD and non-MLD modes.</div><div class='add'>+ * Returns if we're done with removing the station, either</div><div class='add'>+ * with error or success</div><div class='add'>+ */</div><div class='add'>+void iwl_mvm_sta_del(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+		     struct ieee80211_sta *sta,</div><div class='add'>+		     struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm_vif_link_info *mvm_link =</div><div class='add'>+		mvmvif-&gt;link[link_sta-&gt;link_id];</div><div class='add'>+	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	struct iwl_mvm_link_sta *mvm_link_sta;</div><div class='add'>+	u8 sta_id;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	mvm_link_sta =</div><div class='add'>+		rcu_dereference_protected(mvm_sta-&gt;link[link_sta-&gt;link_id],</div><div class='add'>+					  lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+	sta_id = mvm_link_sta-&gt;sta_id;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+	    mvm_link-&gt;ap_sta_id == sta_id) {</div><div class='add'>+		/* first remove remaining keys */</div><div class='add'>+		iwl_mvm_sec_key_remove_ap(mvm, vif, mvm_link,</div><div class='add'>+					  link_sta-&gt;link_id);</div><div class='add'>+</div><div class='add'>+		mvm_link-&gt;ap_sta_id = IWL_INVALID_STA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This shouldn't happen - the TDLS channel switch should be canceled</div><div class='add'>+	 * before the STA is removed.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON_ONCE(mvm-&gt;tdls_cs.peer.sta_id == sta_id)) {</div><div class='add'>+		mvm-&gt;tdls_cs.peer.sta_id = IWL_INVALID_STA;</div><div class='add'>+		cancel_delayed_work(&amp;mvm-&gt;tdls_cs.dwork);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int iwl_mvm_rm_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 		   struct ieee80211_vif *vif,</div><div class='ctx'> 		   struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='del'>-	u8 sta_id = mvm_sta-&gt;sta_id;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	if (iwl_mvm_has_new_rx_api(mvm))</div><div class='del'>-		kfree(mvm_sta-&gt;dup_data);</div><div class='del'>-</div><div class='ctx'> 	ret = iwl_mvm_drain_sta(mvm, mvm_sta, true);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* flush its queues here since we are freeing mvm_sta */</div><div class='del'>-	ret = iwl_mvm_flush_sta(mvm, mvm_sta, false);</div><div class='add'>+	ret = iwl_mvm_flush_sta(mvm, mvm_sta-&gt;deflink.sta_id,</div><div class='add'>+				mvm_sta-&gt;tfd_queue_msk);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	if (iwl_mvm_has_new_tx_api(mvm)) {</div><div class='hunk'>@@ -1867,40 +2120,16 @@ int iwl_mvm_rm_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 		if (WARN((*status != IWL_MVM_QUEUE_RESERVED) &amp;&amp;</div><div class='ctx'> 			 (*status != IWL_MVM_QUEUE_FREE),</div><div class='ctx'> 			 "sta_id %d reserved txq %d status %d",</div><div class='del'>-			 sta_id, reserved_txq, *status))</div><div class='add'>+			 mvm_sta-&gt;deflink.sta_id, reserved_txq, *status))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		*status = IWL_MVM_QUEUE_FREE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='del'>-	    mvmvif-&gt;ap_sta_id == sta_id) {</div><div class='del'>-		/* if associated - we can't remove the AP STA now */</div><div class='del'>-		if (vif-&gt;bss_conf.assoc)</div><div class='del'>-			return ret;</div><div class='add'>+	iwl_mvm_sta_del(mvm, vif, sta, &amp;sta-&gt;deflink);</div><div class='ctx'> </div><div class='del'>-		/* unassoc - go ahead - remove the AP STA now */</div><div class='del'>-		mvmvif-&gt;ap_sta_id = IWL_MVM_INVALID_STA;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This shouldn't happen - the TDLS channel switch should be canceled</div><div class='del'>-	 * before the STA is removed.</div><div class='del'>-	 */</div><div class='del'>-	if (WARN_ON_ONCE(mvm-&gt;tdls_cs.peer.sta_id == sta_id)) {</div><div class='del'>-		mvm-&gt;tdls_cs.peer.sta_id = IWL_MVM_INVALID_STA;</div><div class='del'>-		cancel_delayed_work(&amp;mvm-&gt;tdls_cs.dwork);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure that the tx response code sees the station as -EBUSY and</div><div class='del'>-	 * calls the drain worker.</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_bh(&amp;mvm_sta-&gt;lock);</div><div class='del'>-	spin_unlock_bh(&amp;mvm_sta-&gt;lock);</div><div class='del'>-</div><div class='del'>-	ret = iwl_mvm_rm_sta_common(mvm, mvm_sta-&gt;sta_id);</div><div class='del'>-	RCU_INIT_POINTER(mvm-&gt;fw_id_to_mac_id[mvm_sta-&gt;sta_id], NULL);</div><div class='add'>+	ret = iwl_mvm_rm_sta_common(mvm, mvm_sta-&gt;deflink.sta_id);</div><div class='add'>+	RCU_INIT_POINTER(mvm-&gt;fw_id_to_mac_id[mvm_sta-&gt;deflink.sta_id], NULL);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1920,12 +2149,12 @@ int iwl_mvm_rm_sta_id(struct iwl_mvm *mvm,</div><div class='ctx'> int iwl_mvm_allocate_int_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 			     struct iwl_mvm_int_sta *sta,</div><div class='ctx'> 			     u32 qmask, enum nl80211_iftype iftype,</div><div class='del'>-			     enum iwl_sta_type type)</div><div class='add'>+			     u8 type)</div><div class='ctx'> {</div><div class='ctx'> 	if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status) ||</div><div class='del'>-	    sta-&gt;sta_id == IWL_MVM_INVALID_STA) {</div><div class='add'>+	    sta-&gt;sta_id == IWL_INVALID_STA) {</div><div class='ctx'> 		sta-&gt;sta_id = iwl_mvm_find_free_sta_id(mvm, iftype);</div><div class='del'>-		if (WARN_ON_ONCE(sta-&gt;sta_id == IWL_MVM_INVALID_STA))</div><div class='add'>+		if (WARN_ON_ONCE(sta-&gt;sta_id == IWL_INVALID_STA))</div><div class='ctx'> 			return -ENOSPC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1933,7 +2162,7 @@ int iwl_mvm_allocate_int_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 	sta-&gt;type = type;</div><div class='ctx'> </div><div class='ctx'> 	/* put a non-NULL value so iterating over the stations won't stop */</div><div class='del'>-	rcu_assign_pointer(mvm-&gt;fw_id_to_mac_id[sta-&gt;sta_id], ERR_PTR(-EINVAL));</div><div class='add'>+	RCU_INIT_POINTER(mvm-&gt;fw_id_to_mac_id[sta-&gt;sta_id], ERR_PTR(-EINVAL));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1941,14 +2170,14 @@ void iwl_mvm_dealloc_int_sta(struct iwl_mvm *mvm, struct iwl_mvm_int_sta *sta)</div><div class='ctx'> {</div><div class='ctx'> 	RCU_INIT_POINTER(mvm-&gt;fw_id_to_mac_id[sta-&gt;sta_id], NULL);</div><div class='ctx'> 	memset(sta, 0, sizeof(struct iwl_mvm_int_sta));</div><div class='del'>-	sta-&gt;sta_id = IWL_MVM_INVALID_STA;</div><div class='add'>+	sta-&gt;sta_id = IWL_INVALID_STA;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_enable_aux_snif_queue(struct iwl_mvm *mvm, u16 queue,</div><div class='ctx'> 					  u8 sta_id, u8 fifo)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int wdg_timeout =</div><div class='del'>-		mvm-&gt;trans-&gt;trans_cfg-&gt;base_params-&gt;wd_timeout;</div><div class='add'>+		mvm-&gt;trans-&gt;mac_cfg-&gt;base-&gt;wd_timeout;</div><div class='ctx'> 	struct iwl_trans_txq_scd_cfg cfg = {</div><div class='ctx'> 		.fifo = fifo,</div><div class='ctx'> 		.sta_id = sta_id,</div><div class='hunk'>@@ -1965,11 +2194,11 @@ static void iwl_mvm_enable_aux_snif_queue(struct iwl_mvm *mvm, u16 queue,</div><div class='ctx'> static int iwl_mvm_enable_aux_snif_queue_tvqm(struct iwl_mvm *mvm, u8 sta_id)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int wdg_timeout =</div><div class='del'>-		mvm-&gt;trans-&gt;trans_cfg-&gt;base_params-&gt;wd_timeout;</div><div class='add'>+		mvm-&gt;trans-&gt;mac_cfg-&gt;base-&gt;wd_timeout;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(!iwl_mvm_has_new_tx_api(mvm));</div><div class='ctx'> </div><div class='del'>-	return iwl_mvm_tvqm_enable_txq(mvm, sta_id, IWL_MAX_TID_COUNT,</div><div class='add'>+	return iwl_mvm_tvqm_enable_txq(mvm, NULL, sta_id, IWL_MAX_TID_COUNT,</div><div class='ctx'> 				       wdg_timeout);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1987,8 +2216,8 @@ static int iwl_mvm_add_int_sta_with_queue(struct iwl_mvm *mvm, int macidx,</div><div class='ctx'> 	ret = iwl_mvm_add_int_sta_common(mvm, sta, addr, macidx, maccolor);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		if (!iwl_mvm_has_new_tx_api(mvm))</div><div class='del'>-			iwl_mvm_disable_txq(mvm, NULL, *queue,</div><div class='del'>-					    IWL_MAX_TID_COUNT, 0);</div><div class='add'>+			iwl_mvm_disable_txq(mvm, NULL, sta-&gt;sta_id, queue,</div><div class='add'>+					    IWL_MAX_TID_COUNT);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2014,11 +2243,13 @@ static int iwl_mvm_add_int_sta_with_queue(struct iwl_mvm *mvm, int macidx,</div><div class='ctx'> int iwl_mvm_add_aux_sta(struct iwl_mvm *mvm, u32 lmac_id)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+	u32 qmask = mvm-&gt;aux_queue == IWL_MVM_INVALID_QUEUE ? 0 :</div><div class='add'>+		BIT(mvm-&gt;aux_queue);</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate aux station and assign to it the aux queue */</div><div class='del'>-	ret = iwl_mvm_allocate_int_sta(mvm, &amp;mvm-&gt;aux_sta, BIT(mvm-&gt;aux_queue),</div><div class='add'>+	ret = iwl_mvm_allocate_int_sta(mvm, &amp;mvm-&gt;aux_sta, qmask,</div><div class='ctx'> 				       NL80211_IFTYPE_UNSPECIFIED,</div><div class='ctx'> 				       IWL_STA_AUX_ACTIVITY);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -2057,10 +2288,11 @@ int iwl_mvm_rm_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(mvm-&gt;snif_sta.sta_id == IWL_MVM_INVALID_STA))</div><div class='add'>+	if (WARN_ON_ONCE(mvm-&gt;snif_sta.sta_id == IWL_INVALID_STA))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_disable_txq(mvm, NULL, mvm-&gt;snif_queue, IWL_MAX_TID_COUNT, 0);</div><div class='add'>+	iwl_mvm_disable_txq(mvm, NULL, mvm-&gt;snif_sta.sta_id,</div><div class='add'>+			    &amp;mvm-&gt;snif_queue, IWL_MAX_TID_COUNT);</div><div class='ctx'> 	ret = iwl_mvm_rm_sta_common(mvm, mvm-&gt;snif_sta.sta_id);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		IWL_WARN(mvm, "Failed sending remove station\n");</div><div class='hunk'>@@ -2074,10 +2306,11 @@ int iwl_mvm_rm_aux_sta(struct iwl_mvm *mvm)</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(mvm-&gt;aux_sta.sta_id == IWL_MVM_INVALID_STA))</div><div class='add'>+	if (WARN_ON_ONCE(mvm-&gt;aux_sta.sta_id == IWL_INVALID_STA))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_disable_txq(mvm, NULL, mvm-&gt;aux_queue, IWL_MAX_TID_COUNT, 0);</div><div class='add'>+	iwl_mvm_disable_txq(mvm, NULL, mvm-&gt;aux_sta.sta_id,</div><div class='add'>+			    &amp;mvm-&gt;aux_queue, IWL_MAX_TID_COUNT);</div><div class='ctx'> 	ret = iwl_mvm_rm_sta_common(mvm, mvm-&gt;aux_sta.sta_id);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		IWL_WARN(mvm, "Failed sending remove station\n");</div><div class='hunk'>@@ -2102,16 +2335,16 @@ void iwl_mvm_dealloc_snif_sta(struct iwl_mvm *mvm)</div><div class='ctx'> int iwl_mvm_send_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-	struct iwl_mvm_int_sta *bsta = &amp;mvmvif-&gt;bcast_sta;</div><div class='add'>+	struct iwl_mvm_int_sta *bsta = &amp;mvmvif-&gt;deflink.bcast_sta;</div><div class='ctx'> 	static const u8 _baddr[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};</div><div class='ctx'> 	const u8 *baddr = _baddr;</div><div class='ctx'> 	int queue;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned int wdg_timeout =</div><div class='del'>-		iwl_mvm_get_wd_timeout(mvm, vif, false, false);</div><div class='add'>+		iwl_mvm_get_wd_timeout(mvm, vif);</div><div class='ctx'> 	struct iwl_trans_txq_scd_cfg cfg = {</div><div class='ctx'> 		.fifo = IWL_MVM_TX_FIFO_VO,</div><div class='del'>-		.sta_id = mvmvif-&gt;bcast_sta.sta_id,</div><div class='add'>+		.sta_id = mvmvif-&gt;deflink.bcast_sta.sta_id,</div><div class='ctx'> 		.tid = IWL_MAX_TID_COUNT,</div><div class='ctx'> 		.aggregate = false,</div><div class='ctx'> 		.frame_limit = IWL_FRAME_LIMIT,</div><div class='hunk'>@@ -2138,7 +2371,7 @@ int iwl_mvm_send_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_ADHOC)</div><div class='ctx'> 		baddr = vif-&gt;bss_conf.bssid;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(bsta-&gt;sta_id == IWL_MVM_INVALID_STA))</div><div class='add'>+	if (WARN_ON_ONCE(bsta-&gt;sta_id == IWL_INVALID_STA))</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_mvm_add_int_sta_common(mvm, bsta, baddr,</div><div class='hunk'>@@ -2151,7 +2384,7 @@ int iwl_mvm_send_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 	 * to firmware so enable queue here - after the station was added</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (iwl_mvm_has_new_tx_api(mvm)) {</div><div class='del'>-		queue = iwl_mvm_tvqm_enable_txq(mvm, bsta-&gt;sta_id,</div><div class='add'>+		queue = iwl_mvm_tvqm_enable_txq(mvm, NULL, bsta-&gt;sta_id,</div><div class='ctx'> 						IWL_MAX_TID_COUNT,</div><div class='ctx'> 						wdg_timeout);</div><div class='ctx'> 		if (queue &lt; 0) {</div><div class='hunk'>@@ -2160,32 +2393,41 @@ int iwl_mvm_send_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='del'>-		    vif-&gt;type == NL80211_IFTYPE_ADHOC)</div><div class='add'>+		    vif-&gt;type == NL80211_IFTYPE_ADHOC) {</div><div class='add'>+			/* for queue management */</div><div class='ctx'> 			mvm-&gt;probe_queue = queue;</div><div class='del'>-		else if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE)</div><div class='add'>+			/* for use in TX */</div><div class='add'>+			mvmvif-&gt;deflink.mgmt_queue = queue;</div><div class='add'>+		} else if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE) {</div><div class='ctx'> 			mvm-&gt;p2p_dev_queue = queue;</div><div class='add'>+		}</div><div class='add'>+	} else if (vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='add'>+		   vif-&gt;type == NL80211_IFTYPE_ADHOC) {</div><div class='add'>+		/* set it for use in TX */</div><div class='add'>+		mvmvif-&gt;deflink.mgmt_queue = mvm-&gt;probe_queue;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_mvm_free_bcast_sta_queues(struct iwl_mvm *mvm,</div><div class='del'>-					  struct ieee80211_vif *vif)</div><div class='add'>+void iwl_mvm_free_bcast_sta_queues(struct iwl_mvm *mvm,</div><div class='add'>+				   struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-	int queue;</div><div class='add'>+	u16 *queueptr, queue;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_flush_sta(mvm, &amp;mvmvif-&gt;bcast_sta, true);</div><div class='add'>+	iwl_mvm_flush_sta(mvm, mvmvif-&gt;deflink.bcast_sta.sta_id,</div><div class='add'>+			  mvmvif-&gt;deflink.bcast_sta.tfd_queue_msk);</div><div class='ctx'> </div><div class='ctx'> 	switch (vif-&gt;type) {</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='ctx'> 	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		queue = mvm-&gt;probe_queue;</div><div class='add'>+		queueptr = &amp;mvm-&gt;probe_queue;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_P2P_DEVICE:</div><div class='del'>-		queue = mvm-&gt;p2p_dev_queue;</div><div class='add'>+		queueptr = &amp;mvm-&gt;p2p_dev_queue;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN(1, "Can't free bcast queue on vif type %d\n",</div><div class='hunk'>@@ -2193,15 +2435,21 @@ static void iwl_mvm_free_bcast_sta_queues(struct iwl_mvm *mvm,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_disable_txq(mvm, NULL, queue, IWL_MAX_TID_COUNT, 0);</div><div class='add'>+	queue = *queueptr;</div><div class='add'>+	iwl_mvm_disable_txq(mvm, NULL, mvmvif-&gt;deflink.bcast_sta.sta_id,</div><div class='add'>+			    queueptr, IWL_MAX_TID_COUNT);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP || vif-&gt;type == NL80211_IFTYPE_ADHOC)</div><div class='add'>+		mvmvif-&gt;deflink.mgmt_queue = mvm-&gt;probe_queue;</div><div class='add'>+</div><div class='ctx'> 	if (iwl_mvm_has_new_tx_api(mvm))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	WARN_ON(!(mvmvif-&gt;bcast_sta.tfd_queue_msk &amp; BIT(queue)));</div><div class='del'>-	mvmvif-&gt;bcast_sta.tfd_queue_msk &amp;= ~BIT(queue);</div><div class='add'>+	WARN_ON(!(mvmvif-&gt;deflink.bcast_sta.tfd_queue_msk &amp; BIT(queue)));</div><div class='add'>+	mvmvif-&gt;deflink.bcast_sta.tfd_queue_msk &amp;= ~BIT(queue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Send the FW a request to remove the station from it's internal data</div><div class='add'>+/* Send the FW a request to remove the station from its internal data</div><div class='ctx'>  * structures, but DO NOT remove the entry from the local data structures. */</div><div class='ctx'> int iwl_mvm_send_rm_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='hunk'>@@ -2212,7 +2460,7 @@ int iwl_mvm_send_rm_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_free_bcast_sta_queues(mvm, vif);</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_rm_sta_common(mvm, mvmvif-&gt;bcast_sta.sta_id);</div><div class='add'>+	ret = iwl_mvm_rm_sta_common(mvm, mvmvif-&gt;deflink.bcast_sta.sta_id);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		IWL_WARN(mvm, "Failed sending remove station\n");</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -2224,7 +2472,7 @@ int iwl_mvm_alloc_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	return iwl_mvm_allocate_int_sta(mvm, &amp;mvmvif-&gt;bcast_sta, 0,</div><div class='add'>+	return iwl_mvm_allocate_int_sta(mvm, &amp;mvmvif-&gt;deflink.bcast_sta, 0,</div><div class='ctx'> 					ieee80211_vif_type_p2p(vif),</div><div class='ctx'> 					IWL_STA_GENERAL_PURPOSE);</div><div class='ctx'> }</div><div class='hunk'>@@ -2239,7 +2487,7 @@ int iwl_mvm_alloc_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> int iwl_mvm_add_p2p_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-	struct iwl_mvm_int_sta *bsta = &amp;mvmvif-&gt;bcast_sta;</div><div class='add'>+	struct iwl_mvm_int_sta *bsta = &amp;mvmvif-&gt;deflink.bcast_sta;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='hunk'>@@ -2260,11 +2508,11 @@ void iwl_mvm_dealloc_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_dealloc_int_sta(mvm, &amp;mvmvif-&gt;bcast_sta);</div><div class='add'>+	iwl_mvm_dealloc_int_sta(mvm, &amp;mvmvif-&gt;deflink.bcast_sta);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Send the FW a request to remove the station from it's internal data</div><div class='add'>+ * Send the FW a request to remove the station from its internal data</div><div class='ctx'>  * structures, and in addition remove it from the local data structure.</div><div class='ctx'>  */</div><div class='ctx'> int iwl_mvm_rm_p2p_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='hunk'>@@ -2291,7 +2539,7 @@ int iwl_mvm_rm_p2p_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> int iwl_mvm_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-	struct iwl_mvm_int_sta *msta = &amp;mvmvif-&gt;mcast_sta;</div><div class='add'>+	struct iwl_mvm_int_sta *msta = &amp;mvmvif-&gt;deflink.mcast_sta;</div><div class='ctx'> 	static const u8 _maddr[] = {0x03, 0x00, 0x00, 0x00, 0x00, 0x00};</div><div class='ctx'> 	const u8 *maddr = _maddr;</div><div class='ctx'> 	struct iwl_trans_txq_scd_cfg cfg = {</div><div class='hunk'>@@ -2302,14 +2550,14 @@ int iwl_mvm_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 		.aggregate = false,</div><div class='ctx'> 		.frame_limit = IWL_FRAME_LIMIT,</div><div class='ctx'> 	};</div><div class='del'>-	unsigned int timeout = iwl_mvm_get_wd_timeout(mvm, vif, false, false);</div><div class='add'>+	unsigned int timeout = iwl_mvm_get_wd_timeout(mvm, vif);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(vif-&gt;type != NL80211_IFTYPE_AP &amp;&amp;</div><div class='ctx'> 		    vif-&gt;type != NL80211_IFTYPE_ADHOC))</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In IBSS, ieee80211_check_queues() sets the cab_queue to be</div><div class='hunk'>@@ -2318,7 +2566,7 @@ int iwl_mvm_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 	 * changes in mac80211 layer.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_ADHOC)</div><div class='del'>-		mvmvif-&gt;cab_queue = IWL_MVM_DQA_GCAST_QUEUE;</div><div class='add'>+		mvmvif-&gt;deflink.cab_queue = IWL_MVM_DQA_GCAST_QUEUE;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * While in previous FWs we had to exclude cab queue from TFD queue</div><div class='hunk'>@@ -2326,9 +2574,10 @@ int iwl_mvm_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!iwl_mvm_has_new_tx_api(mvm) &amp;&amp;</div><div class='ctx'> 	    fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa, IWL_UCODE_TLV_API_STA_TYPE)) {</div><div class='del'>-		iwl_mvm_enable_txq(mvm, NULL, mvmvif-&gt;cab_queue, 0, &amp;cfg,</div><div class='add'>+		iwl_mvm_enable_txq(mvm, NULL, mvmvif-&gt;deflink.cab_queue, 0,</div><div class='add'>+				   &amp;cfg,</div><div class='ctx'> 				   timeout);</div><div class='del'>-		msta-&gt;tfd_queue_msk |= BIT(mvmvif-&gt;cab_queue);</div><div class='add'>+		msta-&gt;tfd_queue_msk |= BIT(mvmvif-&gt;deflink.cab_queue);</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = iwl_mvm_add_int_sta_common(mvm, msta, maddr,</div><div class='ctx'> 					 mvmvif-&gt;id, mvmvif-&gt;color);</div><div class='hunk'>@@ -2343,17 +2592,17 @@ int iwl_mvm_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 	 * tfd_queue_mask.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (iwl_mvm_has_new_tx_api(mvm)) {</div><div class='del'>-		int queue = iwl_mvm_tvqm_enable_txq(mvm, msta-&gt;sta_id,</div><div class='del'>-						    0,</div><div class='del'>-						    timeout);</div><div class='add'>+		int queue = iwl_mvm_tvqm_enable_txq(mvm, NULL, msta-&gt;sta_id,</div><div class='add'>+						    0, timeout);</div><div class='ctx'> 		if (queue &lt; 0) {</div><div class='ctx'> 			ret = queue;</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='del'>-		mvmvif-&gt;cab_queue = queue;</div><div class='add'>+		mvmvif-&gt;deflink.cab_queue = queue;</div><div class='ctx'> 	} else if (!fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 			       IWL_UCODE_TLV_API_STA_TYPE))</div><div class='del'>-		iwl_mvm_enable_txq(mvm, NULL, mvmvif-&gt;cab_queue, 0, &amp;cfg,</div><div class='add'>+		iwl_mvm_enable_txq(mvm, NULL, mvmvif-&gt;deflink.cab_queue, 0,</div><div class='add'>+				   &amp;cfg,</div><div class='ctx'> 				   timeout);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2377,7 +2626,7 @@ static int __iwl_mvm_remove_sta_key(struct iwl_mvm *mvm, u8 sta_id,</div><div class='ctx'> 	u32 status;</div><div class='ctx'> </div><div class='ctx'> 	/* This is a valid situation for GTK removal */</div><div class='del'>-	if (sta_id == IWL_MVM_INVALID_STA)</div><div class='add'>+	if (sta_id == IWL_INVALID_STA)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	key_flags = cpu_to_le16((keyconf-&gt;keyidx &lt;&lt; STA_KEY_FLG_KEYID_POS) &amp;</div><div class='hunk'>@@ -2416,7 +2665,7 @@ static int __iwl_mvm_remove_sta_key(struct iwl_mvm *mvm, u8 sta_id,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Send the FW a request to remove the station from it's internal data</div><div class='add'>+ * Send the FW a request to remove the station from its internal data</div><div class='ctx'>  * structures, and in addition remove it from the local data structure.</div><div class='ctx'>  */</div><div class='ctx'> int iwl_mvm_rm_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='hunk'>@@ -2426,19 +2675,19 @@ int iwl_mvm_rm_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_flush_sta(mvm, &amp;mvmvif-&gt;mcast_sta, true);</div><div class='add'>+	iwl_mvm_flush_sta(mvm, mvmvif-&gt;deflink.mcast_sta.sta_id,</div><div class='add'>+			  mvmvif-&gt;deflink.mcast_sta.tfd_queue_msk);</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_disable_txq(mvm, NULL, mvmvif-&gt;cab_queue, 0, 0);</div><div class='add'>+	iwl_mvm_disable_txq(mvm, NULL, mvmvif-&gt;deflink.mcast_sta.sta_id,</div><div class='add'>+			    &amp;mvmvif-&gt;deflink.cab_queue, 0);</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_rm_sta_common(mvm, mvmvif-&gt;mcast_sta.sta_id);</div><div class='add'>+	ret = iwl_mvm_rm_sta_common(mvm, mvmvif-&gt;deflink.mcast_sta.sta_id);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		IWL_WARN(mvm, "Failed sending remove station\n");</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define IWL_MAX_RX_BA_SESSIONS 16</div><div class='del'>-</div><div class='ctx'> static void iwl_mvm_sync_rxq_del_ba(struct iwl_mvm *mvm, u8 baid)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_delba_data notif = {</div><div class='hunk'>@@ -2456,7 +2705,7 @@ static void iwl_mvm_free_reorder(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_sync_rxq_del_ba(mvm, data-&gt;baid);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; mvm-&gt;trans-&gt;num_rx_queues; i++) {</div><div class='add'>+	for (i = 0; i &lt; mvm-&gt;trans-&gt;info.num_rxqs; i++) {</div><div class='ctx'> 		int j;</div><div class='ctx'> 		struct iwl_mvm_reorder_buffer *reorder_buf =</div><div class='ctx'> 			&amp;data-&gt;reorder_buf[i];</div><div class='hunk'>@@ -2476,29 +2725,20 @@ static void iwl_mvm_free_reorder(struct iwl_mvm *mvm,</div><div class='ctx'> 		 */</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> </div><div class='del'>-		for (j = 0; j &lt; reorder_buf-&gt;buf_size; j++)</div><div class='del'>-			__skb_queue_purge(&amp;entries[j].e.frames);</div><div class='del'>-		/*</div><div class='del'>-		 * Prevent timer re-arm. This prevents a very far fetched case</div><div class='del'>-		 * where we timed out on the notification. There may be prior</div><div class='del'>-		 * RX frames pending in the RX queue before the notification</div><div class='del'>-		 * that might get processed between now and the actual deletion</div><div class='del'>-		 * and we would re-arm the timer although we are deleting the</div><div class='del'>-		 * reorder buffer.</div><div class='del'>-		 */</div><div class='del'>-		reorder_buf-&gt;removed = true;</div><div class='add'>+		for (j = 0; j &lt; data-&gt;buf_size; j++)</div><div class='add'>+			__skb_queue_purge(&amp;entries[j].frames);</div><div class='add'>+</div><div class='ctx'> 		spin_unlock_bh(&amp;reorder_buf-&gt;lock);</div><div class='del'>-		del_timer_sync(&amp;reorder_buf-&gt;reorder_timer);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_init_reorder_buffer(struct iwl_mvm *mvm,</div><div class='ctx'> 					struct iwl_mvm_baid_data *data,</div><div class='del'>-					u16 ssn, u16 buf_size)</div><div class='add'>+					u16 ssn)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; mvm-&gt;trans-&gt;num_rx_queues; i++) {</div><div class='add'>+	for (i = 0; i &lt; mvm-&gt;trans-&gt;info.num_rxqs; i++) {</div><div class='ctx'> 		struct iwl_mvm_reorder_buffer *reorder_buf =</div><div class='ctx'> 			&amp;data-&gt;reorder_buf[i];</div><div class='ctx'> 		struct iwl_mvm_reorder_buf_entry *entries =</div><div class='hunk'>@@ -2507,44 +2747,154 @@ static void iwl_mvm_init_reorder_buffer(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 		reorder_buf-&gt;num_stored = 0;</div><div class='ctx'> 		reorder_buf-&gt;head_sn = ssn;</div><div class='del'>-		reorder_buf-&gt;buf_size = buf_size;</div><div class='del'>-		/* rx reorder timer */</div><div class='del'>-		timer_setup(&amp;reorder_buf-&gt;reorder_timer,</div><div class='del'>-			    iwl_mvm_reorder_timer_expired, 0);</div><div class='ctx'> 		spin_lock_init(&amp;reorder_buf-&gt;lock);</div><div class='del'>-		reorder_buf-&gt;mvm = mvm;</div><div class='ctx'> 		reorder_buf-&gt;queue = i;</div><div class='ctx'> 		reorder_buf-&gt;valid = false;</div><div class='del'>-		for (j = 0; j &lt; reorder_buf-&gt;buf_size; j++)</div><div class='del'>-			__skb_queue_head_init(&amp;entries[j].e.frames);</div><div class='add'>+		for (j = 0; j &lt; data-&gt;buf_size; j++)</div><div class='add'>+			__skb_queue_head_init(&amp;entries[j].frames);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_fw_baid_op_sta(struct iwl_mvm *mvm,</div><div class='add'>+				  struct ieee80211_sta *sta,</div><div class='add'>+				  bool start, int tid, u16 ssn,</div><div class='add'>+				  u16 buf_size)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	struct iwl_mvm_add_sta_cmd cmd = {</div><div class='add'>+		.mac_id_n_color = cpu_to_le32(mvm_sta-&gt;mac_id_n_color),</div><div class='add'>+		.sta_id = mvm_sta-&gt;deflink.sta_id,</div><div class='add'>+		.add_modify = STA_MODE_MODIFY,</div><div class='add'>+	};</div><div class='add'>+	u32 status;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (start) {</div><div class='add'>+		cmd.add_immediate_ba_tid = tid;</div><div class='add'>+		cmd.add_immediate_ba_ssn = cpu_to_le16(ssn);</div><div class='add'>+		cmd.rx_ba_window = cpu_to_le16(buf_size);</div><div class='add'>+		cmd.modify_mask = STA_MODIFY_ADD_BA_TID;</div><div class='add'>+	} else {</div><div class='add'>+		cmd.remove_immediate_ba_tid = tid;</div><div class='add'>+		cmd.modify_mask = STA_MODIFY_REMOVE_BA_TID;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = ADD_STA_SUCCESS;</div><div class='add'>+	ret = iwl_mvm_send_cmd_pdu_status(mvm, ADD_STA,</div><div class='add'>+					  iwl_mvm_add_sta_cmd_size(mvm),</div><div class='add'>+					  &amp;cmd, &amp;status);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	switch (status &amp; IWL_ADD_STA_STATUS_MASK) {</div><div class='add'>+	case ADD_STA_SUCCESS:</div><div class='add'>+		IWL_DEBUG_HT(mvm, "RX BA Session %sed in fw\n",</div><div class='add'>+			     start ? "start" : "stopp");</div><div class='add'>+		if (WARN_ON(start &amp;&amp; iwl_mvm_has_new_rx_api(mvm) &amp;&amp;</div><div class='add'>+			    !(status &amp; IWL_ADD_STA_BAID_VALID_MASK)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		return u32_get_bits(status, IWL_ADD_STA_BAID_MASK);</div><div class='add'>+	case ADD_STA_IMMEDIATE_BA_FAILURE:</div><div class='add'>+		IWL_WARN(mvm, "RX BA Session refused by fw\n");</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	default:</div><div class='add'>+		IWL_ERR(mvm, "RX BA Session failed %sing, status 0x%x\n",</div><div class='add'>+			start ? "start" : "stopp", status);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_fw_baid_op_cmd(struct iwl_mvm *mvm,</div><div class='add'>+				  struct ieee80211_sta *sta,</div><div class='add'>+				  bool start, int tid, u16 ssn,</div><div class='add'>+				  u16 buf_size, int baid)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rx_baid_cfg_cmd cmd = {</div><div class='add'>+		.action = start ? cpu_to_le32(IWL_RX_BAID_ACTION_ADD) :</div><div class='add'>+				  cpu_to_le32(IWL_RX_BAID_ACTION_REMOVE),</div><div class='add'>+	};</div><div class='add'>+	struct iwl_host_cmd hcmd = {</div><div class='add'>+		.id = WIDE_ID(DATA_PATH_GROUP, RX_BAID_ALLOCATION_CONFIG_CMD),</div><div class='add'>+		.flags = CMD_SEND_IN_RFKILL,</div><div class='add'>+		.len[0] = sizeof(cmd),</div><div class='add'>+		.data[0] = &amp;cmd,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct iwl_rx_baid_cfg_resp) != sizeof(baid));</div><div class='add'>+</div><div class='add'>+	if (start) {</div><div class='add'>+		cmd.alloc.sta_id_mask =</div><div class='add'>+			cpu_to_le32(iwl_mvm_sta_fw_id_mask(mvm, sta, -1));</div><div class='add'>+		cmd.alloc.tid = tid;</div><div class='add'>+		cmd.alloc.ssn = cpu_to_le16(ssn);</div><div class='add'>+		cmd.alloc.win_size = cpu_to_le16(buf_size);</div><div class='add'>+		baid = -EIO;</div><div class='add'>+	} else if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, hcmd.id, 1) == 1) {</div><div class='add'>+		cmd.remove_v1.baid = cpu_to_le32(baid);</div><div class='add'>+		BUILD_BUG_ON(sizeof(cmd.remove_v1) &gt; sizeof(cmd.remove));</div><div class='add'>+	} else {</div><div class='add'>+		cmd.remove.sta_id_mask =</div><div class='add'>+			cpu_to_le32(iwl_mvm_sta_fw_id_mask(mvm, sta, -1));</div><div class='add'>+		cmd.remove.tid = cpu_to_le32(tid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_send_cmd_status(mvm, &amp;hcmd, &amp;baid);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!start) {</div><div class='add'>+		/* ignore firmware baid on remove */</div><div class='add'>+		baid = 0;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_HT(mvm, "RX BA Session %sed in fw\n",</div><div class='add'>+		     start ? "start" : "stopp");</div><div class='add'>+</div><div class='add'>+	if (baid &lt; 0 || baid &gt;= ARRAY_SIZE(mvm-&gt;baid_map))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return baid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_fw_baid_op(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='add'>+			      bool start, int tid, u16 ssn, u16 buf_size,</div><div class='add'>+			      int baid)</div><div class='add'>+{</div><div class='add'>+	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			IWL_UCODE_TLV_CAPA_BAID_ML_SUPPORT))</div><div class='add'>+		return iwl_mvm_fw_baid_op_cmd(mvm, sta, start,</div><div class='add'>+					      tid, ssn, buf_size, baid);</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_fw_baid_op_sta(mvm, sta, start,</div><div class='add'>+				      tid, ssn, buf_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iwl_mvm_sta_rx_agg(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 		       int tid, u16 ssn, bool start, u16 buf_size, u16 timeout)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='del'>-	struct iwl_mvm_add_sta_cmd cmd = {};</div><div class='ctx'> 	struct iwl_mvm_baid_data *baid_data = NULL;</div><div class='del'>-	int ret;</div><div class='del'>-	u32 status;</div><div class='add'>+	int ret, baid;</div><div class='add'>+	u32 max_ba_id_sessions = iwl_mvm_has_new_tx_api(mvm) ? IWL_MAX_BAID :</div><div class='add'>+							       IWL_MAX_BAID_OLD;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	if (start &amp;&amp; mvm-&gt;rx_ba_sessions &gt;= IWL_MAX_RX_BA_SESSIONS) {</div><div class='add'>+	if (start &amp;&amp; mvm-&gt;rx_ba_sessions &gt;= max_ba_id_sessions) {</div><div class='ctx'> 		IWL_WARN(mvm, "Not enough RX BA SESSIONS\n");</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_mvm_has_new_rx_api(mvm) &amp;&amp; start) {</div><div class='del'>-		u16 reorder_buf_size = buf_size * sizeof(baid_data-&gt;entries[0]);</div><div class='add'>+		u32 reorder_buf_size = buf_size * sizeof(baid_data-&gt;entries[0]);</div><div class='ctx'> </div><div class='ctx'> 		/* sparse doesn't like the __align() so don't check */</div><div class='ctx'> #ifndef __CHECKER__</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The division below will be OK if either the cache line size</div><div class='ctx'> 		 * can be divided by the entry size (ALIGN will round up) or if</div><div class='del'>-		 * if the entry size can be divided by the cache line size, in</div><div class='add'>+		 * the entry size can be divided by the cache line size, in</div><div class='ctx'> 		 * which case the ALIGN() will do nothing.</div><div class='ctx'> 		 */</div><div class='ctx'> 		BUILD_BUG_ON(SMP_CACHE_BYTES % sizeof(baid_data-&gt;entries[0]) &amp;&amp;</div><div class='hunk'>@@ -2563,7 +2913,7 @@ int iwl_mvm_sta_rx_agg(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 		 * before starting the BA session in the firmware</div><div class='ctx'> 		 */</div><div class='ctx'> 		baid_data = kzalloc(sizeof(*baid_data) +</div><div class='del'>-				    mvm-&gt;trans-&gt;num_rx_queues *</div><div class='add'>+				    mvm-&gt;trans-&gt;info.num_rxqs *</div><div class='ctx'> 				    reorder_buf_size,</div><div class='ctx'> 				    GFP_KERNEL);</div><div class='ctx'> 		if (!baid_data)</div><div class='hunk'>@@ -2577,59 +2927,29 @@ int iwl_mvm_sta_rx_agg(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 			reorder_buf_size / sizeof(baid_data-&gt;entries[0]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cmd.mac_id_n_color = cpu_to_le32(mvm_sta-&gt;mac_id_n_color);</div><div class='del'>-	cmd.sta_id = mvm_sta-&gt;sta_id;</div><div class='del'>-	cmd.add_modify = STA_MODE_MODIFY;</div><div class='del'>-	if (start) {</div><div class='del'>-		cmd.add_immediate_ba_tid = (u8) tid;</div><div class='del'>-		cmd.add_immediate_ba_ssn = cpu_to_le16(ssn);</div><div class='del'>-		cmd.rx_ba_window = cpu_to_le16(buf_size);</div><div class='add'>+	if (iwl_mvm_has_new_rx_api(mvm) &amp;&amp; !start) {</div><div class='add'>+		baid = mvm_sta-&gt;tid_to_baid[tid];</div><div class='ctx'> 	} else {</div><div class='del'>-		cmd.remove_immediate_ba_tid = (u8) tid;</div><div class='add'>+		/* we don't really need it in this case */</div><div class='add'>+		baid = -1;</div><div class='ctx'> 	}</div><div class='del'>-	cmd.modify_mask = start ? STA_MODIFY_ADD_BA_TID :</div><div class='del'>-				  STA_MODIFY_REMOVE_BA_TID;</div><div class='del'>-</div><div class='del'>-	status = ADD_STA_SUCCESS;</div><div class='del'>-	ret = iwl_mvm_send_cmd_pdu_status(mvm, ADD_STA,</div><div class='del'>-					  iwl_mvm_add_sta_cmd_size(mvm),</div><div class='del'>-					  &amp;cmd, &amp;status);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_free;</div><div class='ctx'> </div><div class='del'>-	switch (status &amp; IWL_ADD_STA_STATUS_MASK) {</div><div class='del'>-	case ADD_STA_SUCCESS:</div><div class='del'>-		IWL_DEBUG_HT(mvm, "RX BA Session %sed in fw\n",</div><div class='del'>-			     start ? "start" : "stopp");</div><div class='del'>-		break;</div><div class='del'>-	case ADD_STA_IMMEDIATE_BA_FAILURE:</div><div class='del'>-		IWL_WARN(mvm, "RX BA Session refused by fw\n");</div><div class='del'>-		ret = -ENOSPC;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		IWL_ERR(mvm, "RX BA Session failed %sing, status 0x%x\n",</div><div class='del'>-			start ? "start" : "stopp", status);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	/* Don't send command to remove (start=0) BAID during restart */</div><div class='add'>+	if (start || !test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status))</div><div class='add'>+		baid = iwl_mvm_fw_baid_op(mvm, sta, start, tid, ssn, buf_size,</div><div class='add'>+					  baid);</div><div class='ctx'> </div><div class='del'>-	if (ret)</div><div class='add'>+	if (baid &lt; 0) {</div><div class='add'>+		ret = baid;</div><div class='ctx'> 		goto out_free;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (start) {</div><div class='del'>-		u8 baid;</div><div class='del'>-</div><div class='ctx'> 		mvm-&gt;rx_ba_sessions++;</div><div class='ctx'> </div><div class='ctx'> 		if (!iwl_mvm_has_new_rx_api(mvm))</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		if (WARN_ON(!(status &amp; IWL_ADD_STA_BAID_VALID_MASK))) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto out_free;</div><div class='del'>-		}</div><div class='del'>-		baid = (u8)((status &amp; IWL_ADD_STA_BAID_MASK) &gt;&gt;</div><div class='del'>-			    IWL_ADD_STA_BAID_SHIFT);</div><div class='ctx'> 		baid_data-&gt;baid = baid;</div><div class='ctx'> 		baid_data-&gt;timeout = timeout;</div><div class='ctx'> 		baid_data-&gt;last_rx = jiffies;</div><div class='hunk'>@@ -2638,14 +2958,15 @@ int iwl_mvm_sta_rx_agg(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 			    iwl_mvm_rx_agg_session_expired, 0);</div><div class='ctx'> 		baid_data-&gt;mvm = mvm;</div><div class='ctx'> 		baid_data-&gt;tid = tid;</div><div class='del'>-		baid_data-&gt;sta_id = mvm_sta-&gt;sta_id;</div><div class='add'>+		baid_data-&gt;sta_mask = iwl_mvm_sta_fw_id_mask(mvm, sta, -1);</div><div class='add'>+		baid_data-&gt;buf_size = buf_size;</div><div class='ctx'> </div><div class='ctx'> 		mvm_sta-&gt;tid_to_baid[tid] = baid;</div><div class='ctx'> 		if (timeout)</div><div class='ctx'> 			mod_timer(&amp;baid_data-&gt;session_timer,</div><div class='ctx'> 				  TU_TO_EXP_TIME(timeout * 2));</div><div class='ctx'> </div><div class='del'>-		iwl_mvm_init_reorder_buffer(mvm, baid_data, ssn, buf_size);</div><div class='add'>+		iwl_mvm_init_reorder_buffer(mvm, baid_data, ssn);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * protect the BA data with RCU to cover a case where our</div><div class='ctx'> 		 * internal RX sync mechanism will timeout (not that it's</div><div class='hunk'>@@ -2653,11 +2974,11 @@ int iwl_mvm_sta_rx_agg(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 		 * RX is being processed in parallel</div><div class='ctx'> 		 */</div><div class='ctx'> 		IWL_DEBUG_HT(mvm, "Sta %d(%d) is assigned to BAID %d\n",</div><div class='del'>-			     mvm_sta-&gt;sta_id, tid, baid);</div><div class='add'>+			     mvm_sta-&gt;deflink.sta_id, tid, baid);</div><div class='ctx'> 		WARN_ON(rcu_access_pointer(mvm-&gt;baid_map[baid]));</div><div class='ctx'> 		rcu_assign_pointer(mvm-&gt;baid_map[baid], baid_data);</div><div class='ctx'> 	} else  {</div><div class='del'>-		u8 baid = mvm_sta-&gt;tid_to_baid[tid];</div><div class='add'>+		baid = mvm_sta-&gt;tid_to_baid[tid];</div><div class='ctx'> </div><div class='ctx'> 		if (mvm-&gt;rx_ba_sessions &gt; 0)</div><div class='ctx'> 			/* check that restart flow didn't zero the counter */</div><div class='hunk'>@@ -2674,7 +2995,7 @@ int iwl_mvm_sta_rx_agg(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> </div><div class='ctx'> 		/* synchronize all rx queues so we can safely delete */</div><div class='ctx'> 		iwl_mvm_free_reorder(mvm, baid_data);</div><div class='del'>-		del_timer_sync(&amp;baid_data-&gt;session_timer);</div><div class='add'>+		timer_shutdown_sync(&amp;baid_data-&gt;session_timer);</div><div class='ctx'> 		RCU_INIT_POINTER(mvm-&gt;baid_map[baid], NULL);</div><div class='ctx'> 		kfree_rcu(baid_data, rcu_head);</div><div class='ctx'> 		IWL_DEBUG_HT(mvm, "BAID %d is free\n", baid);</div><div class='hunk'>@@ -2705,7 +3026,7 @@ int iwl_mvm_sta_tx_agg(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cmd.mac_id_n_color = cpu_to_le32(mvm_sta-&gt;mac_id_n_color);</div><div class='del'>-	cmd.sta_id = mvm_sta-&gt;sta_id;</div><div class='add'>+	cmd.sta_id = mvm_sta-&gt;deflink.sta_id;</div><div class='ctx'> 	cmd.add_modify = STA_MODE_MODIFY;</div><div class='ctx'> 	if (!iwl_mvm_has_new_tx_api(mvm))</div><div class='ctx'> 		cmd.modify_mask = STA_MODIFY_QUEUES;</div><div class='hunk'>@@ -2797,7 +3118,7 @@ int iwl_mvm_sta_tx_agg_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	 */</div><div class='ctx'> 	txq_id = mvmsta-&gt;tid_data[tid].txq_id;</div><div class='ctx'> 	if (txq_id == IWL_MVM_INVALID_QUEUE) {</div><div class='del'>-		ret = iwl_mvm_find_free_queue(mvm, mvmsta-&gt;sta_id,</div><div class='add'>+		ret = iwl_mvm_find_free_queue(mvm, mvmsta-&gt;deflink.sta_id,</div><div class='ctx'> 					      IWL_MVM_DQA_MIN_DATA_QUEUE,</div><div class='ctx'> 					      IWL_MVM_DQA_MAX_DATA_QUEUE);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='hunk'>@@ -2835,7 +3156,8 @@ int iwl_mvm_sta_tx_agg_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_TX_QUEUES(mvm,</div><div class='ctx'> 			    "Start AGG: sta %d tid %d queue %d - ssn = %d, next_recl = %d\n",</div><div class='del'>-			    mvmsta-&gt;sta_id, tid, txq_id, tid_data-&gt;ssn,</div><div class='add'>+			    mvmsta-&gt;deflink.sta_id, tid, txq_id,</div><div class='add'>+			    tid_data-&gt;ssn,</div><div class='ctx'> 			    tid_data-&gt;next_reclaimed);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2843,7 +3165,7 @@ int iwl_mvm_sta_tx_agg_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	 * to align the wrap around of ssn so we compare relevant values.</div><div class='ctx'> 	 */</div><div class='ctx'> 	normalized_ssn = tid_data-&gt;ssn;</div><div class='del'>-	if (mvm-&gt;trans-&gt;trans_cfg-&gt;gen2)</div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;gen2)</div><div class='ctx'> 		normalized_ssn &amp;= 0xff;</div><div class='ctx'> </div><div class='ctx'> 	if (normalized_ssn == tid_data-&gt;next_reclaimed) {</div><div class='hunk'>@@ -2867,14 +3189,14 @@ int iwl_mvm_sta_tx_agg_oper(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> 	struct iwl_mvm_tid_data *tid_data = &amp;mvmsta-&gt;tid_data[tid];</div><div class='ctx'> 	unsigned int wdg_timeout =</div><div class='del'>-		iwl_mvm_get_wd_timeout(mvm, vif, sta-&gt;tdls, false);</div><div class='add'>+		iwl_mvm_get_wd_timeout(mvm, vif);</div><div class='ctx'> 	int queue, ret;</div><div class='ctx'> 	bool alloc_queue = true;</div><div class='ctx'> 	enum iwl_mvm_queue_status queue_status;</div><div class='ctx'> 	u16 ssn;</div><div class='ctx'> </div><div class='ctx'> 	struct iwl_trans_txq_scd_cfg cfg = {</div><div class='del'>-		.sta_id = mvmsta-&gt;sta_id,</div><div class='add'>+		.sta_id = mvmsta-&gt;deflink.sta_id,</div><div class='ctx'> 		.tid = tid,</div><div class='ctx'> 		.frame_limit = buf_size,</div><div class='ctx'> 		.aggregate = true,</div><div class='hunk'>@@ -2912,7 +3234,7 @@ int iwl_mvm_sta_tx_agg_oper(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 		 * should be updated as well.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (buf_size &lt; IWL_FRAME_LIMIT)</div><div class='del'>-			return -ENOTSUPP;</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 		ret = iwl_mvm_sta_tx_agg(mvm, sta, tid, queue, true);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -2946,7 +3268,7 @@ int iwl_mvm_sta_tx_agg_oper(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = iwl_mvm_reconfig_scd(mvm, queue, cfg.fifo,</div><div class='del'>-					   mvmsta-&gt;sta_id, tid,</div><div class='add'>+					   mvmsta-&gt;deflink.sta_id, tid,</div><div class='ctx'> 					   buf_size, ssn);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			IWL_ERR(mvm,</div><div class='hunk'>@@ -2977,14 +3299,16 @@ out:</div><div class='ctx'> 	 * for each station. Therefore, use the minimum of all the</div><div class='ctx'> 	 * aggregation sessions and our default value.</div><div class='ctx'> 	 */</div><div class='del'>-	mvmsta-&gt;max_agg_bufsize =</div><div class='del'>-		min(mvmsta-&gt;max_agg_bufsize, buf_size);</div><div class='del'>-	mvmsta-&gt;lq_sta.rs_drv.lq.agg_frame_cnt_limit = mvmsta-&gt;max_agg_bufsize;</div><div class='add'>+	mvmsta-&gt;deflink.lq_sta.rs_drv.pers.max_agg_bufsize =</div><div class='add'>+		min(mvmsta-&gt;deflink.lq_sta.rs_drv.pers.max_agg_bufsize,</div><div class='add'>+		    buf_size);</div><div class='add'>+	mvmsta-&gt;deflink.lq_sta.rs_drv.lq.agg_frame_cnt_limit =</div><div class='add'>+		mvmsta-&gt;deflink.lq_sta.rs_drv.pers.max_agg_bufsize;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_HT(mvm, "Tx aggregation enabled on ra = %pM tid = %d\n",</div><div class='ctx'> 		     sta-&gt;addr, tid);</div><div class='ctx'> </div><div class='del'>-	return iwl_mvm_send_lq_cmd(mvm, &amp;mvmsta-&gt;lq_sta.rs_drv.lq);</div><div class='add'>+	return iwl_mvm_send_lq_cmd(mvm, &amp;mvmsta-&gt;deflink.lq_sta.rs_drv.lq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_unreserve_agg_queue(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -3033,7 +3357,8 @@ int iwl_mvm_sta_tx_agg_stop(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	txq_id = tid_data-&gt;txq_id;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_TX_QUEUES(mvm, "Stop AGG: sta %d tid %d q %d state %d\n",</div><div class='del'>-			    mvmsta-&gt;sta_id, tid, txq_id, tid_data-&gt;state);</div><div class='add'>+			    mvmsta-&gt;deflink.sta_id, tid, txq_id,</div><div class='add'>+			    tid_data-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 	mvmsta-&gt;agg_tids &amp;= ~BIT(tid);</div><div class='ctx'> </div><div class='hunk'>@@ -3072,7 +3397,7 @@ int iwl_mvm_sta_tx_agg_stop(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	default:</div><div class='ctx'> 		IWL_ERR(mvm,</div><div class='ctx'> 			"Stopping AGG while state not ON or starting for %d on %d (%d)\n",</div><div class='del'>-			mvmsta-&gt;sta_id, tid, tid_data-&gt;state);</div><div class='add'>+			mvmsta-&gt;deflink.sta_id, tid, tid_data-&gt;state);</div><div class='ctx'> 		IWL_ERR(mvm,</div><div class='ctx'> 			"\ttid_data-&gt;txq_id = %d\n", tid_data-&gt;txq_id);</div><div class='ctx'> 		err = -EINVAL;</div><div class='hunk'>@@ -3098,7 +3423,8 @@ int iwl_mvm_sta_tx_agg_flush(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	spin_lock_bh(&amp;mvmsta-&gt;lock);</div><div class='ctx'> 	txq_id = tid_data-&gt;txq_id;</div><div class='ctx'> 	IWL_DEBUG_TX_QUEUES(mvm, "Flush AGG: sta %d tid %d q %d state %d\n",</div><div class='del'>-			    mvmsta-&gt;sta_id, tid, txq_id, tid_data-&gt;state);</div><div class='add'>+			    mvmsta-&gt;deflink.sta_id, tid, txq_id,</div><div class='add'>+			    tid_data-&gt;state);</div><div class='ctx'> 	old_state = tid_data-&gt;state;</div><div class='ctx'> 	tid_data-&gt;state = IWL_AGG_OFF;</div><div class='ctx'> 	mvmsta-&gt;agg_tids &amp;= ~BIT(tid);</div><div class='hunk'>@@ -3110,7 +3436,7 @@ int iwl_mvm_sta_tx_agg_flush(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 		iwl_mvm_drain_sta(mvm, mvmsta, true);</div><div class='ctx'> </div><div class='ctx'> 		if (iwl_mvm_has_new_tx_api(mvm)) {</div><div class='del'>-			if (iwl_mvm_flush_sta_tids(mvm, mvmsta-&gt;sta_id,</div><div class='add'>+			if (iwl_mvm_flush_sta_tids(mvm, mvmsta-&gt;deflink.sta_id,</div><div class='ctx'> 						   BIT(tid)))</div><div class='ctx'> 				IWL_ERR(mvm, "Couldn't flush the AGG queue\n");</div><div class='ctx'> 			iwl_trans_wait_txq_empty(mvm-&gt;trans, txq_id);</div><div class='hunk'>@@ -3170,8 +3496,8 @@ static struct iwl_mvm_sta *iwl_mvm_get_key_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 	 * station ID, then use AP's station ID.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='del'>-	    mvmvif-&gt;ap_sta_id != IWL_MVM_INVALID_STA) {</div><div class='del'>-		u8 sta_id = mvmvif-&gt;ap_sta_id;</div><div class='add'>+	    mvmvif-&gt;deflink.ap_sta_id != IWL_INVALID_STA) {</div><div class='add'>+		u8 sta_id = mvmvif-&gt;deflink.ap_sta_id;</div><div class='ctx'> </div><div class='ctx'> 		sta = rcu_dereference_check(mvm-&gt;fw_id_to_mac_id[sta_id],</div><div class='ctx'> 					    lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='hunk'>@@ -3190,6 +3516,20 @@ static struct iwl_mvm_sta *iwl_mvm_get_key_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int iwl_mvm_pn_cmp(const u8 *pn1, const u8 *pn2, int len)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = len - 1; i &gt;= 0; i--) {</div><div class='add'>+		if (pn1[i] &gt; pn2[i])</div><div class='add'>+			return 1;</div><div class='add'>+		if (pn1[i] &lt; pn2[i])</div><div class='add'>+			return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int iwl_mvm_send_sta_key(struct iwl_mvm *mvm,</div><div class='ctx'> 				u32 sta_id,</div><div class='ctx'> 				struct ieee80211_key_conf *key, bool mcast,</div><div class='hunk'>@@ -3208,8 +3548,10 @@ static int iwl_mvm_send_sta_key(struct iwl_mvm *mvm,</div><div class='ctx'> 	int i, size;</div><div class='ctx'> 	bool new_api = fw_has_api(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 				  IWL_UCODE_TLV_API_TKIP_MIC_KEYS);</div><div class='add'>+	int api_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, ADD_STA_KEY,</div><div class='add'>+					    new_api ? 2 : 1);</div><div class='ctx'> </div><div class='del'>-	if (sta_id == IWL_MVM_INVALID_STA)</div><div class='add'>+	if (sta_id == IWL_INVALID_STA)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	keyidx = (key-&gt;keyidx &lt;&lt; STA_KEY_FLG_KEYID_POS) &amp;</div><div class='hunk'>@@ -3217,10 +3559,13 @@ static int iwl_mvm_send_sta_key(struct iwl_mvm *mvm,</div><div class='ctx'> 	key_flags = cpu_to_le16(keyidx);</div><div class='ctx'> 	key_flags |= cpu_to_le16(STA_KEY_FLG_WEP_KEY_MAP);</div><div class='ctx'> </div><div class='add'>+	if (key-&gt;flags &amp; IEEE80211_KEY_FLAG_SPP_AMSDU)</div><div class='add'>+		key_flags |= cpu_to_le16(STA_KEY_FLG_AMSDU_SPP);</div><div class='add'>+</div><div class='ctx'> 	switch (key-&gt;cipher) {</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_TKIP:</div><div class='ctx'> 		key_flags |= cpu_to_le16(STA_KEY_FLG_TKIP);</div><div class='del'>-		if (new_api) {</div><div class='add'>+		if (api_ver &gt;= 2) {</div><div class='ctx'> 			memcpy((void *)&amp;u.cmd.tx_mic_key,</div><div class='ctx'> 			       &amp;key-&gt;key[NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY],</div><div class='ctx'> 			       IWL_MIC_KEY_SIZE);</div><div class='hunk'>@@ -3241,7 +3586,7 @@ static int iwl_mvm_send_sta_key(struct iwl_mvm *mvm,</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_CCMP:</div><div class='ctx'> 		key_flags |= cpu_to_le16(STA_KEY_FLG_CCM);</div><div class='ctx'> 		memcpy(u.cmd.common.key, key-&gt;key, key-&gt;keylen);</div><div class='del'>-		if (new_api)</div><div class='add'>+		if (api_ver &gt;= 2)</div><div class='ctx'> 			pn = atomic64_read(&amp;key-&gt;tx_pn);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_WEP104:</div><div class='hunk'>@@ -3257,7 +3602,7 @@ static int iwl_mvm_send_sta_key(struct iwl_mvm *mvm,</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_GCMP:</div><div class='ctx'> 		key_flags |= cpu_to_le16(STA_KEY_FLG_GCMP);</div><div class='ctx'> 		memcpy(u.cmd.common.key, key-&gt;key, key-&gt;keylen);</div><div class='del'>-		if (new_api)</div><div class='add'>+		if (api_ver &gt;= 2)</div><div class='ctx'> 			pn = atomic64_read(&amp;key-&gt;tx_pn);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -3274,7 +3619,46 @@ static int iwl_mvm_send_sta_key(struct iwl_mvm *mvm,</div><div class='ctx'> 	u.cmd.common.key_flags = key_flags;</div><div class='ctx'> 	u.cmd.common.sta_id = sta_id;</div><div class='ctx'> </div><div class='del'>-	if (new_api) {</div><div class='add'>+	if (key-&gt;cipher == WLAN_CIPHER_SUITE_TKIP)</div><div class='add'>+		i = 0;</div><div class='add'>+	else</div><div class='add'>+		i = -1;</div><div class='add'>+</div><div class='add'>+	for (; i &lt; IEEE80211_NUM_TIDS; i++) {</div><div class='add'>+		struct ieee80211_key_seq seq = {};</div><div class='add'>+		u8 _rx_pn[IEEE80211_MAX_PN_LEN] = {}, *rx_pn = _rx_pn;</div><div class='add'>+		int rx_pn_len = 8;</div><div class='add'>+		/* there's a hole at 2/3 in FW format depending on version */</div><div class='add'>+		int hole = api_ver &gt;= 3 ? 0 : 2;</div><div class='add'>+</div><div class='add'>+		ieee80211_get_key_rx_seq(key, i, &amp;seq);</div><div class='add'>+</div><div class='add'>+		if (key-&gt;cipher == WLAN_CIPHER_SUITE_TKIP) {</div><div class='add'>+			rx_pn[0] = seq.tkip.iv16;</div><div class='add'>+			rx_pn[1] = seq.tkip.iv16 &gt;&gt; 8;</div><div class='add'>+			rx_pn[2 + hole] = seq.tkip.iv32;</div><div class='add'>+			rx_pn[3 + hole] = seq.tkip.iv32 &gt;&gt; 8;</div><div class='add'>+			rx_pn[4 + hole] = seq.tkip.iv32 &gt;&gt; 16;</div><div class='add'>+			rx_pn[5 + hole] = seq.tkip.iv32 &gt;&gt; 24;</div><div class='add'>+		} else if (key_flags &amp; cpu_to_le16(STA_KEY_FLG_EXT)) {</div><div class='add'>+			rx_pn = seq.hw.seq;</div><div class='add'>+			rx_pn_len = seq.hw.seq_len;</div><div class='add'>+		} else {</div><div class='add'>+			rx_pn[0] = seq.ccmp.pn[0];</div><div class='add'>+			rx_pn[1] = seq.ccmp.pn[1];</div><div class='add'>+			rx_pn[2 + hole] = seq.ccmp.pn[2];</div><div class='add'>+			rx_pn[3 + hole] = seq.ccmp.pn[3];</div><div class='add'>+			rx_pn[4 + hole] = seq.ccmp.pn[4];</div><div class='add'>+			rx_pn[5 + hole] = seq.ccmp.pn[5];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (iwl_mvm_pn_cmp(rx_pn, (u8 *)&amp;u.cmd.common.rx_secur_seq_cnt,</div><div class='add'>+				   rx_pn_len) &gt; 0)</div><div class='add'>+			memcpy(&amp;u.cmd.common.rx_secur_seq_cnt, rx_pn,</div><div class='add'>+			       rx_pn_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (api_ver &gt;= 2) {</div><div class='ctx'> 		u.cmd.transmit_seq_cnt = cpu_to_le64(pn);</div><div class='ctx'> 		size = sizeof(u.cmd);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -3326,7 +3710,7 @@ static int iwl_mvm_send_sta_igtk(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	if (remove_key) {</div><div class='ctx'> 		/* This is a valid situation for IGTK */</div><div class='del'>-		if (sta_id == IWL_MVM_INVALID_STA)</div><div class='add'>+		if (sta_id == IWL_INVALID_STA)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='ctx'> 		igtk_cmd.ctrl_flags |= cpu_to_le32(STA_KEY_NOT_VALID);</div><div class='hunk'>@@ -3393,10 +3777,13 @@ static inline u8 *iwl_mvm_get_mac_addr(struct iwl_mvm *mvm,</div><div class='ctx'> 		return sta-&gt;addr;</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='del'>-	    mvmvif-&gt;ap_sta_id != IWL_MVM_INVALID_STA) {</div><div class='del'>-		u8 sta_id = mvmvif-&gt;ap_sta_id;</div><div class='add'>+	    mvmvif-&gt;deflink.ap_sta_id != IWL_INVALID_STA) {</div><div class='add'>+		u8 sta_id = mvmvif-&gt;deflink.ap_sta_id;</div><div class='ctx'> 		sta = rcu_dereference_protected(mvm-&gt;fw_id_to_mac_id[sta_id],</div><div class='ctx'> 						lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='add'>+		if (WARN_ON_ONCE(IS_ERR_OR_NULL(sta)))</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='ctx'> 		return sta-&gt;addr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3411,7 +3798,6 @@ static int __iwl_mvm_set_sta_key(struct iwl_mvm *mvm,</div><div class='ctx'> 				 u8 key_offset,</div><div class='ctx'> 				 bool mcast)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='ctx'> 	const u8 *addr;</div><div class='ctx'> 	struct ieee80211_key_seq seq;</div><div class='ctx'> 	u16 p1k[5];</div><div class='hunk'>@@ -3421,42 +3807,36 @@ static int __iwl_mvm_set_sta_key(struct iwl_mvm *mvm,</div><div class='ctx'> 	if (sta) {</div><div class='ctx'> 		struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> </div><div class='del'>-		sta_id = mvm_sta-&gt;sta_id;</div><div class='add'>+		sta_id = mvm_sta-&gt;deflink.sta_id;</div><div class='ctx'> 		mfp = sta-&gt;mfp;</div><div class='ctx'> 	} else if (vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp;</div><div class='ctx'> 		   !(keyconf-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE)) {</div><div class='ctx'> 		struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> </div><div class='del'>-		sta_id = mvmvif-&gt;mcast_sta.sta_id;</div><div class='add'>+		sta_id = mvmvif-&gt;deflink.mcast_sta.sta_id;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		IWL_ERR(mvm, "Failed to find station id\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (keyconf-&gt;cipher) {</div><div class='del'>-	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+	if (keyconf-&gt;cipher == WLAN_CIPHER_SUITE_TKIP) {</div><div class='ctx'> 		addr = iwl_mvm_get_mac_addr(mvm, vif, sta);</div><div class='add'>+		if (!addr) {</div><div class='add'>+			IWL_ERR(mvm, "Failed to find mac address\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* get phase 1 key from mac80211 */</div><div class='ctx'> 		ieee80211_get_key_rx_seq(keyconf, 0, &amp;seq);</div><div class='ctx'> 		ieee80211_get_tkip_rx_p1k(keyconf, addr, seq.tkip.iv32, p1k);</div><div class='del'>-		ret = iwl_mvm_send_sta_key(mvm, sta_id, keyconf, mcast,</div><div class='del'>-					   seq.tkip.iv32, p1k, 0, key_offset,</div><div class='del'>-					   mfp);</div><div class='del'>-		break;</div><div class='del'>-	case WLAN_CIPHER_SUITE_CCMP:</div><div class='del'>-	case WLAN_CIPHER_SUITE_WEP40:</div><div class='del'>-	case WLAN_CIPHER_SUITE_WEP104:</div><div class='del'>-	case WLAN_CIPHER_SUITE_GCMP:</div><div class='del'>-	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='del'>-		ret = iwl_mvm_send_sta_key(mvm, sta_id, keyconf, mcast,</div><div class='del'>-					   0, NULL, 0, key_offset, mfp);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = iwl_mvm_send_sta_key(mvm, sta_id, keyconf, mcast,</div><div class='del'>-					   0, NULL, 0, key_offset, mfp);</div><div class='add'>+</div><div class='add'>+		return iwl_mvm_send_sta_key(mvm, sta_id, keyconf, mcast,</div><div class='add'>+					    seq.tkip.iv32, p1k, 0, key_offset,</div><div class='add'>+					    mfp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return iwl_mvm_send_sta_key(mvm, sta_id, keyconf, mcast,</div><div class='add'>+				    0, NULL, 0, key_offset, mfp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iwl_mvm_set_sta_key(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -3467,7 +3847,7 @@ int iwl_mvm_set_sta_key(struct iwl_mvm *mvm,</div><div class='ctx'> {</div><div class='ctx'> 	bool mcast = !(keyconf-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE);</div><div class='ctx'> 	struct iwl_mvm_sta *mvm_sta;</div><div class='del'>-	u8 sta_id = IWL_MVM_INVALID_STA;</div><div class='add'>+	u8 sta_id = IWL_INVALID_STA;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	static const u8 __maybe_unused zero_addr[ETH_ALEN] = {0};</div><div class='ctx'> </div><div class='hunk'>@@ -3481,7 +3861,7 @@ int iwl_mvm_set_sta_key(struct iwl_mvm *mvm,</div><div class='ctx'> 			IWL_ERR(mvm, "Failed to find station\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		sta_id = mvm_sta-&gt;sta_id;</div><div class='add'>+		sta_id = mvm_sta-&gt;deflink.sta_id;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * It is possible that the 'sta' parameter is NULL, and thus</div><div class='hunk'>@@ -3503,7 +3883,7 @@ int iwl_mvm_set_sta_key(struct iwl_mvm *mvm,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> </div><div class='del'>-		sta_id = mvmvif-&gt;mcast_sta.sta_id;</div><div class='add'>+		sta_id = mvmvif-&gt;deflink.mcast_sta.sta_id;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (keyconf-&gt;cipher == WLAN_CIPHER_SUITE_AES_CMAC ||</div><div class='hunk'>@@ -3568,7 +3948,7 @@ int iwl_mvm_remove_sta_key(struct iwl_mvm *mvm,</div><div class='ctx'> {</div><div class='ctx'> 	bool mcast = !(keyconf-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE);</div><div class='ctx'> 	struct iwl_mvm_sta *mvm_sta;</div><div class='del'>-	u8 sta_id = IWL_MVM_INVALID_STA;</div><div class='add'>+	u8 sta_id = IWL_INVALID_STA;</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='hunk'>@@ -3576,9 +3956,9 @@ int iwl_mvm_remove_sta_key(struct iwl_mvm *mvm,</div><div class='ctx'> 	/* Get the station from the mvm local station table */</div><div class='ctx'> 	mvm_sta = iwl_mvm_get_key_sta(mvm, vif, sta);</div><div class='ctx'> 	if (mvm_sta)</div><div class='del'>-		sta_id = mvm_sta-&gt;sta_id;</div><div class='add'>+		sta_id = mvm_sta-&gt;deflink.sta_id;</div><div class='ctx'> 	else if (!sta &amp;&amp; vif-&gt;type == NL80211_IFTYPE_AP &amp;&amp; mcast)</div><div class='del'>-		sta_id = iwl_mvm_vif_from_mac80211(vif)-&gt;mcast_sta.sta_id;</div><div class='add'>+		sta_id = iwl_mvm_vif_from_mac80211(vif)-&gt;deflink.mcast_sta.sta_id;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_WEP(mvm, "mvm remove dynamic key: idx=%d sta=%d\n",</div><div class='hunk'>@@ -3634,7 +4014,7 @@ void iwl_mvm_update_tkip_key(struct iwl_mvm *mvm,</div><div class='ctx'> 	mvm_sta = iwl_mvm_get_key_sta(mvm, vif, sta);</div><div class='ctx'> 	if (WARN_ON_ONCE(!mvm_sta))</div><div class='ctx'> 		goto unlock;</div><div class='del'>-	iwl_mvm_send_sta_key(mvm, mvm_sta-&gt;sta_id, keyconf, mcast,</div><div class='add'>+	iwl_mvm_send_sta_key(mvm, mvm_sta-&gt;deflink.sta_id, keyconf, mcast,</div><div class='ctx'> 			     iv32, phase1key, CMD_ASYNC, keyconf-&gt;hw_key_idx,</div><div class='ctx'> 			     mfp);</div><div class='ctx'> </div><div class='hunk'>@@ -3648,7 +4028,7 @@ void iwl_mvm_sta_modify_ps_wake(struct iwl_mvm *mvm,</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> 	struct iwl_mvm_add_sta_cmd cmd = {</div><div class='ctx'> 		.add_modify = STA_MODE_MODIFY,</div><div class='del'>-		.sta_id = mvmsta-&gt;sta_id,</div><div class='add'>+		.sta_id = mvmsta-&gt;deflink.sta_id,</div><div class='ctx'> 		.station_flags_msk = cpu_to_le32(STA_FLG_PS),</div><div class='ctx'> 		.mac_id_n_color = cpu_to_le32(mvmsta-&gt;mac_id_n_color),</div><div class='ctx'> 	};</div><div class='hunk'>@@ -3669,7 +4049,7 @@ void iwl_mvm_sta_modify_sleep_tx_count(struct iwl_mvm *mvm,</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> 	struct iwl_mvm_add_sta_cmd cmd = {</div><div class='ctx'> 		.add_modify = STA_MODE_MODIFY,</div><div class='del'>-		.sta_id = mvmsta-&gt;sta_id,</div><div class='add'>+		.sta_id = mvmsta-&gt;deflink.sta_id,</div><div class='ctx'> 		.modify_mask = STA_MODIFY_SLEEPING_STA_TX_COUNT,</div><div class='ctx'> 		.sleep_tx_count = cpu_to_le16(cnt),</div><div class='ctx'> 		.mac_id_n_color = cpu_to_le32(mvmsta-&gt;mac_id_n_color),</div><div class='hunk'>@@ -3734,10 +4114,8 @@ void iwl_mvm_sta_modify_sleep_tx_count(struct iwl_mvm *mvm,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* block the Tx queues until the FW updated the sleep Tx count */</div><div class='del'>-	iwl_trans_block_txq_ptrs(mvm-&gt;trans, true);</div><div class='del'>-</div><div class='ctx'> 	ret = iwl_mvm_send_cmd_pdu(mvm, ADD_STA,</div><div class='del'>-				   CMD_ASYNC | CMD_WANT_ASYNC_CALLBACK,</div><div class='add'>+				   CMD_ASYNC | CMD_BLOCK_TXQS,</div><div class='ctx'> 				   iwl_mvm_add_sta_cmd_size(mvm), &amp;cmd);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		IWL_ERR(mvm, "Failed to send ADD_STA command (%d)\n", ret);</div><div class='hunk'>@@ -3762,17 +4140,24 @@ void iwl_mvm_rx_eosp_notif(struct iwl_mvm *mvm,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_sta_modify_disable_tx(struct iwl_mvm *mvm,</div><div class='del'>-				   struct iwl_mvm_sta *mvmsta, bool disable)</div><div class='add'>+				   struct iwl_mvm_sta *mvmsta,</div><div class='add'>+				   bool disable)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_add_sta_cmd cmd = {</div><div class='ctx'> 		.add_modify = STA_MODE_MODIFY,</div><div class='del'>-		.sta_id = mvmsta-&gt;sta_id,</div><div class='add'>+		.sta_id = mvmsta-&gt;deflink.sta_id,</div><div class='ctx'> 		.station_flags = disable ? cpu_to_le32(STA_FLG_DISABLE_TX) : 0,</div><div class='ctx'> 		.station_flags_msk = cpu_to_le32(STA_FLG_DISABLE_TX),</div><div class='ctx'> 		.mac_id_n_color = cpu_to_le32(mvmsta-&gt;mac_id_n_color),</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (mvm-&gt;mld_api_is_used) {</div><div class='add'>+		if (!iwl_mvm_has_no_host_disable_tx(mvm))</div><div class='add'>+			iwl_mvm_mld_sta_modify_disable_tx(mvm, mvmsta, disable);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = iwl_mvm_send_cmd_pdu(mvm, ADD_STA, CMD_ASYNC,</div><div class='ctx'> 				   iwl_mvm_add_sta_cmd_size(mvm), &amp;cmd);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -3785,6 +4170,12 @@ void iwl_mvm_sta_modify_disable_tx_ap(struct iwl_mvm *mvm,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> </div><div class='add'>+	if (mvm-&gt;mld_api_is_used) {</div><div class='add'>+		if (!iwl_mvm_has_no_host_disable_tx(mvm))</div><div class='add'>+			iwl_mvm_mld_sta_modify_disable_tx_ap(mvm, sta, disable);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	spin_lock_bh(&amp;mvm_sta-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (mvm_sta-&gt;disable_tx == disable) {</div><div class='hunk'>@@ -3794,8 +4185,12 @@ void iwl_mvm_sta_modify_disable_tx_ap(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	mvm_sta-&gt;disable_tx = disable;</div><div class='ctx'> </div><div class='del'>-	/* Tell mac80211 to start/stop queuing tx for this station */</div><div class='del'>-	ieee80211_sta_block_awake(mvm-&gt;hw, sta, disable);</div><div class='add'>+	/*</div><div class='add'>+	 * If sta PS state is handled by mac80211, tell it to start/stop</div><div class='add'>+	 * queuing tx for this station.</div><div class='add'>+	 */</div><div class='add'>+	if (!ieee80211_hw_check(mvm-&gt;hw, AP_LINK_PS))</div><div class='add'>+		ieee80211_sta_block_awake(mvm-&gt;hw, sta, disable);</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_sta_modify_disable_tx(mvm, mvm_sta, disable);</div><div class='ctx'> </div><div class='hunk'>@@ -3831,6 +4226,13 @@ void iwl_mvm_modify_all_sta_disable_tx(struct iwl_mvm *mvm,</div><div class='ctx'> 	struct iwl_mvm_sta *mvm_sta;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (mvm-&gt;mld_api_is_used) {</div><div class='add'>+		if (!iwl_mvm_has_no_host_disable_tx(mvm))</div><div class='add'>+			iwl_mvm_mld_modify_all_sta_disable_tx(mvm, mvmvif,</div><div class='add'>+							      disable);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	/* Block/unblock all the stations of the given mvmvif */</div><div class='hunk'>@@ -3853,17 +4255,19 @@ void iwl_mvm_modify_all_sta_disable_tx(struct iwl_mvm *mvm,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Need to block/unblock also multicast station */</div><div class='del'>-	if (mvmvif-&gt;mcast_sta.sta_id != IWL_MVM_INVALID_STA)</div><div class='add'>+	if (mvmvif-&gt;deflink.mcast_sta.sta_id != IWL_INVALID_STA)</div><div class='ctx'> 		iwl_mvm_int_sta_modify_disable_tx(mvm, mvmvif,</div><div class='del'>-						  &amp;mvmvif-&gt;mcast_sta, disable);</div><div class='add'>+						  &amp;mvmvif-&gt;deflink.mcast_sta,</div><div class='add'>+						  disable);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Only unblock the broadcast station (FW blocks it for immediate</div><div class='ctx'> 	 * quiet, not the driver)</div><div class='ctx'> 	 */</div><div class='del'>-	if (!disable &amp;&amp; mvmvif-&gt;bcast_sta.sta_id != IWL_MVM_INVALID_STA)</div><div class='add'>+	if (!disable &amp;&amp; mvmvif-&gt;deflink.bcast_sta.sta_id != IWL_INVALID_STA)</div><div class='ctx'> 		iwl_mvm_int_sta_modify_disable_tx(mvm, mvmvif,</div><div class='del'>-						  &amp;mvmvif-&gt;bcast_sta, disable);</div><div class='add'>+						  &amp;mvmvif-&gt;deflink.bcast_sta,</div><div class='add'>+						  disable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_csa_client_absent(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='hunk'>@@ -3873,9 +4277,9 @@ void iwl_mvm_csa_client_absent(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-	mvmsta = iwl_mvm_sta_from_staid_rcu(mvm, mvmvif-&gt;ap_sta_id);</div><div class='add'>+	mvmsta = iwl_mvm_sta_from_staid_rcu(mvm, mvmvif-&gt;deflink.ap_sta_id);</div><div class='ctx'> </div><div class='del'>-	if (!WARN_ON(!mvmsta))</div><div class='add'>+	if (mvmsta)</div><div class='ctx'> 		iwl_mvm_sta_modify_disable_tx(mvm, mvmsta, true);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_unlock();</div><div class='hunk'>@@ -3889,48 +4293,26 @@ u16 iwl_mvm_tid_queued(struct iwl_mvm *mvm, struct iwl_mvm_tid_data *tid_data)</div><div class='ctx'> 	 * In 22000 HW, the next_reclaimed index is only 8 bit, so we'll need</div><div class='ctx'> 	 * to align the wrap around of ssn so we compare relevant values.</div><div class='ctx'> 	 */</div><div class='del'>-	if (mvm-&gt;trans-&gt;trans_cfg-&gt;gen2)</div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;gen2)</div><div class='ctx'> 		sn &amp;= 0xff;</div><div class='ctx'> </div><div class='ctx'> 	return ieee80211_sn_sub(sn, tid_data-&gt;next_reclaimed);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwl_mvm_add_pasn_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='del'>-			 struct iwl_mvm_int_sta *sta, u8 *addr, u32 cipher,</div><div class='del'>-			 u8 *key, u32 key_len)</div><div class='add'>+void iwl_mvm_cancel_channel_switch(struct iwl_mvm *mvm,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   u32 id)</div><div class='ctx'> {</div><div class='add'>+	struct iwl_cancel_channel_switch_cmd cancel_channel_switch_cmd = {</div><div class='add'>+		.id = cpu_to_le32(id),</div><div class='add'>+	};</div><div class='ctx'> 	int ret;</div><div class='del'>-	u16 queue;</div><div class='del'>-	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-	struct ieee80211_key_conf *keyconf;</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_allocate_int_sta(mvm, sta, 0,</div><div class='del'>-				       NL80211_IFTYPE_UNSPECIFIED,</div><div class='del'>-				       IWL_STA_LINK);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = iwl_mvm_add_int_sta_with_queue(mvm, mvmvif-&gt;id, mvmvif-&gt;color,</div><div class='del'>-					     addr, sta, &amp;queue,</div><div class='del'>-					     IWL_MVM_TX_FIFO_BE);</div><div class='add'>+	ret = iwl_mvm_send_cmd_pdu(mvm,</div><div class='add'>+				   WIDE_ID(MAC_CONF_GROUP, CANCEL_CHANNEL_SWITCH_CMD),</div><div class='add'>+				   CMD_ASYNC,</div><div class='add'>+				   sizeof(cancel_channel_switch_cmd),</div><div class='add'>+				   &amp;cancel_channel_switch_cmd);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	keyconf = kzalloc(sizeof(*keyconf) + key_len, GFP_KERNEL);</div><div class='del'>-	if (!keyconf) {</div><div class='del'>-		ret = -ENOBUFS;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	keyconf-&gt;cipher = cipher;</div><div class='del'>-	memcpy(keyconf-&gt;key, key, key_len);</div><div class='del'>-	keyconf-&gt;keylen = key_len;</div><div class='del'>-</div><div class='del'>-	ret = iwl_mvm_send_sta_key(mvm, sta-&gt;sta_id, keyconf, false,</div><div class='del'>-				   0, NULL, 0, 0, true);</div><div class='del'>-	kfree(keyconf);</div><div class='del'>-	return 0;</div><div class='del'>-out:</div><div class='del'>-	iwl_mvm_dealloc_int_sta(mvm, sta);</div><div class='del'>-	return ret;</div><div class='add'>+		IWL_ERR(mvm, "Failed to cancel the channel switch\n");</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.h b/drivers/net/wireless/intel/iwlwifi/mvm/sta.h<br/>index 32b4d1935788..c25edc7c1813 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/sta.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/sta.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/sta.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/sta.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2015-2016 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "iwl-trans.h" /* for IWL_MAX_TID_COUNT */</div><div class='del'>-#include "fw-api.h" /* IWL_MVM_STATION_COUNT_MAX */</div><div class='add'>+#include "fw-api.h" /* IWL_STATION_COUNT_MAX */</div><div class='ctx'> #include "rs.h"</div><div class='ctx'> </div><div class='ctx'> struct iwl_mvm;</div><div class='hunk'>@@ -133,7 +133,7 @@ struct iwl_mvm_vif;</div><div class='ctx'>  * and no TID data as this is also not needed.</div><div class='ctx'>  * One thing to note, is that these stations have an ID in the fw, but not</div><div class='ctx'>  * in mac80211. In order to "reserve" them a sta_id in %fw_id_to_mac_id</div><div class='del'>- * we fill ERR_PTR(EINVAL) in this mapping and all other dereferencing of</div><div class='add'>+ * we fill ERR_PTR(-EINVAL) in this mapping and all other dereferencing of</div><div class='ctx'>  * pointers from this mapping need to check that the value is not error</div><div class='ctx'>  * or NULL.</div><div class='ctx'>  *</div><div class='hunk'>@@ -214,7 +214,7 @@ struct iwl_mvm_vif;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum iwl_mvm_agg_state</div><div class='add'>+ * enum iwl_mvm_agg_state - aggregation session state</div><div class='ctx'>  *</div><div class='ctx'>  * The state machine of the BA agreement establishment / tear down.</div><div class='ctx'>  * These states relate to a specific RA / TID.</div><div class='hunk'>@@ -225,8 +225,6 @@ struct iwl_mvm_vif;</div><div class='ctx'>  * @IWL_AGG_ON: aggregation session is up</div><div class='ctx'>  * @IWL_EMPTYING_HW_QUEUE_ADDBA: establishing a BA session - waiting for the</div><div class='ctx'>  *	HW queue to be empty from packets for this RA /TID.</div><div class='del'>- * @IWL_EMPTYING_HW_QUEUE_DELBA: tearing down a BA session - waiting for the</div><div class='del'>- *	HW queue to be empty from packets for this RA /TID.</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_mvm_agg_state {</div><div class='ctx'> 	IWL_AGG_OFF = 0,</div><div class='hunk'>@@ -234,7 +232,6 @@ enum iwl_mvm_agg_state {</div><div class='ctx'> 	IWL_AGG_STARTING,</div><div class='ctx'> 	IWL_AGG_ON,</div><div class='ctx'> 	IWL_EMPTYING_HW_QUEUE_ADDBA,</div><div class='del'>-	IWL_EMPTYING_HW_QUEUE_DELBA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -262,7 +259,7 @@ struct iwl_mvm_tid_data {</div><div class='ctx'> 	u16 seq_number;</div><div class='ctx'> 	u16 next_reclaimed;</div><div class='ctx'> 	/* The rest is Tx AGG related */</div><div class='del'>-	u32 rate_n_flags;</div><div class='add'>+	__le32 rate_n_flags;</div><div class='ctx'> 	u8 lq_color;</div><div class='ctx'> 	bool amsdu_in_ampdu_allowed;</div><div class='ctx'> 	enum iwl_mvm_agg_state state;</div><div class='hunk'>@@ -286,12 +283,10 @@ struct iwl_mvm_key_pn {</div><div class='ctx'>  *</div><div class='ctx'>  * @IWL_MVM_RXQ_EMPTY: empty sync notification</div><div class='ctx'>  * @IWL_MVM_RXQ_NOTIF_DEL_BA: notify RSS queues of delBA</div><div class='del'>- * @IWL_MVM_RXQ_NSSN_SYNC: notify all the RSS queues with the new NSSN</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_mvm_rxq_notif_type {</div><div class='ctx'> 	IWL_MVM_RXQ_EMPTY,</div><div class='ctx'> 	IWL_MVM_RXQ_NOTIF_DEL_BA,</div><div class='del'>-	IWL_MVM_RXQ_NSSN_SYNC,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -315,11 +310,6 @@ struct iwl_mvm_delba_data {</div><div class='ctx'> 	u32 baid;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl_mvm_nssn_sync_data {</div><div class='del'>-	u32 baid;</div><div class='del'>-	u32 nssn;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_mvm_rxq_dup_data - per station per rx queue data</div><div class='ctx'>  * @last_seq: last sequence per tid for duplicate packet detection</div><div class='hunk'>@@ -331,14 +321,38 @@ struct iwl_mvm_rxq_dup_data {</div><div class='ctx'> } ____cacheline_aligned_in_smp;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct iwl_mvm_link_sta - link specific parameters of a station</div><div class='add'>+ * @rcu_head: used for freeing the data</div><div class='add'>+ * @sta_id: the index of the station in the fw</div><div class='add'>+ * @lq_sta: holds rate scaling data, either for the case when RS is done in</div><div class='add'>+ *	the driver - %rs_drv or in the FW - %rs_fw.</div><div class='add'>+ * @orig_amsdu_len: used to save the original amsdu_len when it is changed via</div><div class='add'>+ *      debugfs.  If it's set to 0, it means that it is it's not set via</div><div class='add'>+ *      debugfs.</div><div class='add'>+ * @avg_energy: energy as reported by FW statistics notification</div><div class='add'>+ */</div><div class='add'>+struct iwl_mvm_link_sta {</div><div class='add'>+	struct rcu_head rcu_head;</div><div class='add'>+	u32 sta_id;</div><div class='add'>+	union {</div><div class='add'>+		struct iwl_lq_sta_rs_fw rs_fw;</div><div class='add'>+		struct iwl_lq_sta rs_drv;</div><div class='add'>+	} lq_sta;</div><div class='add'>+</div><div class='add'>+	u16 orig_amsdu_len;</div><div class='add'>+</div><div class='add'>+	u8 avg_energy;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_mvm_sta - representation of a station in the driver</div><div class='del'>- * @sta_id: the index of the station in the fw (will be replaced by id_n_color)</div><div class='add'>+ * @vif: the interface the station belongs to</div><div class='ctx'>  * @tfd_queue_msk: the tfd queues used by the station</div><div class='ctx'>  * @mac_id_n_color: the MAC context this station is linked to</div><div class='ctx'>  * @tid_disable_agg: bitmap: if bit(tid) is set, the fw won't send ampdus for</div><div class='ctx'>  *	tid.</div><div class='del'>- * @max_agg_bufsize: the maximal size of the AGG buffer for this station</div><div class='ctx'>  * @sta_type: station type</div><div class='add'>+ * @authorized: indicates station is authorized</div><div class='ctx'>  * @sta_state: station state according to enum %ieee80211_sta_state</div><div class='ctx'>  * @bt_reduced_txpower: is reduced tx power enabled for this station</div><div class='ctx'>  * @next_status_eosp: the next reclaimed packet is a PS-Poll response and</div><div class='hunk'>@@ -347,8 +361,7 @@ struct iwl_mvm_rxq_dup_data {</div><div class='ctx'>  * and from Tx response flow, it needs a spinlock.</div><div class='ctx'>  * @tid_data: per tid data + mgmt. Look at %iwl_mvm_tid_data.</div><div class='ctx'>  * @tid_to_baid: a simple map of TID to baid</div><div class='del'>- * @lq_sta: holds rate scaling data, either for the case when RS is done in</div><div class='del'>- *	the driver - %rs_drv or in the FW - %rs_fw.</div><div class='add'>+ * @vif: a vif pointer</div><div class='ctx'>  * @reserved_queue: the queue reserved for this STA for DQA purposes</div><div class='ctx'>  *	Every STA has is given one reserved queue to allow it to operate. If no</div><div class='ctx'>  *	such queue can be guaranteed, the STA addition will fail.</div><div class='hunk'>@@ -358,10 +371,9 @@ struct iwl_mvm_rxq_dup_data {</div><div class='ctx'>  * @amsdu_enabled: bitmap of TX AMSDU allowed TIDs.</div><div class='ctx'>  *	In case TLC offload is not active it is either 0xFFFF or 0.</div><div class='ctx'>  * @max_amsdu_len: max AMSDU length</div><div class='del'>- * @orig_amsdu_len: used to save the original amsdu_len when it is changed via</div><div class='del'>- *      debugfs.  If it's set to 0, it means that it is it's not set via</div><div class='del'>- *      debugfs.</div><div class='add'>+ * @sleeping: indicates the station is sleeping (when not offloaded to FW)</div><div class='ctx'>  * @agg_tids: bitmap of tids whose status is operational aggregated (IWL_AGG_ON)</div><div class='add'>+ * @sleeping: sta sleep transitions in power management</div><div class='ctx'>  * @sleep_tx_count: the number of frames that we told the firmware to let out</div><div class='ctx'>  *	even when that station is asleep. This is useful in case the queue</div><div class='ctx'>  *	gets empty before all the frames were sent, which can happen when</div><div class='hunk'>@@ -369,10 +381,16 @@ struct iwl_mvm_rxq_dup_data {</div><div class='ctx'>  *	the BA window. To be used for UAPSD only.</div><div class='ctx'>  * @ptk_pn: per-queue PTK PN data structures</div><div class='ctx'>  * @dup_data: per queue duplicate packet detection data</div><div class='del'>- * @deferred_traffic_tid_map: indication bitmap of deferred traffic per-TID</div><div class='ctx'>  * @tx_ant: the index of the antenna to use for data tx to this station. Only</div><div class='ctx'>  *	used during connection establishment (e.g. for the 4 way handshake</div><div class='ctx'>  *	exchange).</div><div class='add'>+ * @pairwise_cipher: used to feed iwlmei upon authorization</div><div class='add'>+ * @deflink: the default link station, for non-MLO STA, all link specific data</div><div class='add'>+ *	is accessed via deflink (or link[0]). For MLO, it will hold data of the</div><div class='add'>+ *	first added link STA.</div><div class='add'>+ * @link: per link sta entries. For non-MLO only link[0] holds data. For MLO,</div><div class='add'>+ *	link[0] points to deflink and link[link_id] is allocated when new link</div><div class='add'>+ *	sta is added.</div><div class='ctx'>  *</div><div class='ctx'>  * When mac80211 creates a station it reserves some space (hw-&gt;sta_data_size)</div><div class='ctx'>  * in the structure for use by driver. This structure is placed in that</div><div class='hunk'>@@ -380,22 +398,17 @@ struct iwl_mvm_rxq_dup_data {</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_mvm_sta {</div><div class='del'>-	u32 sta_id;</div><div class='ctx'> 	u32 tfd_queue_msk;</div><div class='ctx'> 	u32 mac_id_n_color;</div><div class='ctx'> 	u16 tid_disable_agg;</div><div class='del'>-	u16 max_agg_bufsize;</div><div class='del'>-	enum iwl_sta_type sta_type;</div><div class='add'>+	u8 sta_type;</div><div class='ctx'> 	enum ieee80211_sta_state sta_state;</div><div class='ctx'> 	bool bt_reduced_txpower;</div><div class='ctx'> 	bool next_status_eosp;</div><div class='add'>+	bool authorized;</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> 	struct iwl_mvm_tid_data tid_data[IWL_MAX_TID_COUNT + 1];</div><div class='ctx'> 	u8 tid_to_baid[IWL_MAX_TID_COUNT];</div><div class='del'>-	union {</div><div class='del'>-		struct iwl_lq_sta_rs_fw rs_fw;</div><div class='del'>-		struct iwl_lq_sta rs_drv;</div><div class='del'>-	} lq_sta;</div><div class='ctx'> 	struct ieee80211_vif *vif;</div><div class='ctx'> 	struct iwl_mvm_key_pn __rcu *ptk_pn[4];</div><div class='ctx'> 	struct iwl_mvm_rxq_dup_data *dup_data;</div><div class='hunk'>@@ -409,12 +422,14 @@ struct iwl_mvm_sta {</div><div class='ctx'> 	bool disable_tx;</div><div class='ctx'> 	u16 amsdu_enabled;</div><div class='ctx'> 	u16 max_amsdu_len;</div><div class='del'>-	u16 orig_amsdu_len;</div><div class='ctx'> 	bool sleeping;</div><div class='ctx'> 	u8 agg_tids;</div><div class='ctx'> 	u8 sleep_tx_count;</div><div class='del'>-	u8 avg_energy;</div><div class='ctx'> 	u8 tx_ant;</div><div class='add'>+	u32 pairwise_cipher;</div><div class='add'>+</div><div class='add'>+	struct iwl_mvm_link_sta deflink;</div><div class='add'>+	struct iwl_mvm_link_sta __rcu *link[IEEE80211_MLD_MAX_NUM_LINKS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> u16 iwl_mvm_tid_queued(struct iwl_mvm *mvm, struct iwl_mvm_tid_data *tid_data);</div><div class='hunk'>@@ -434,12 +449,12 @@ iwl_mvm_sta_from_mac80211(struct ieee80211_sta *sta)</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_mvm_int_sta {</div><div class='ctx'> 	u32 sta_id;</div><div class='del'>-	enum iwl_sta_type type;</div><div class='add'>+	u8 type;</div><div class='ctx'> 	u32 tfd_queue_msk;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Send the STA info to the FW.</div><div class='add'>+ * iwl_mvm_sta_send_to_fw - Send the STA info to the FW.</div><div class='ctx'>  *</div><div class='ctx'>  * @mvm: the iwl_mvm* to use</div><div class='ctx'>  * @sta: the STA</div><div class='hunk'>@@ -447,9 +462,13 @@ struct iwl_mvm_int_sta {</div><div class='ctx'>  *	about. Otherwise (if this is a new STA), this should be false.</div><div class='ctx'>  * @flags: if update==true, this marks what is being changed via ORs of values</div><div class='ctx'>  *	from enum iwl_sta_modify_flag. Otherwise, this is ignored.</div><div class='add'>+ * Return: negative error code or 0 on success</div><div class='ctx'>  */</div><div class='ctx'> int iwl_mvm_sta_send_to_fw(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='ctx'> 			   bool update, unsigned int flags);</div><div class='add'>+int iwl_mvm_find_free_sta_id(struct iwl_mvm *mvm, enum nl80211_iftype iftype);</div><div class='add'>+int iwl_mvm_sta_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+		     struct ieee80211_sta *sta, int sta_id, u8 sta_type);</div><div class='ctx'> int iwl_mvm_add_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 		    struct ieee80211_vif *vif,</div><div class='ctx'> 		    struct ieee80211_sta *sta);</div><div class='hunk'>@@ -461,8 +480,13 @@ static inline int iwl_mvm_update_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 	return iwl_mvm_sta_send_to_fw(mvm, sta, true, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void iwl_mvm_realloc_queues_after_restart(struct iwl_mvm *mvm,</div><div class='add'>+					  struct ieee80211_sta *sta);</div><div class='ctx'> int iwl_mvm_wait_sta_queues_empty(struct iwl_mvm *mvm,</div><div class='ctx'> 				  struct iwl_mvm_sta *mvm_sta);</div><div class='add'>+void iwl_mvm_sta_del(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+		     struct ieee80211_sta *sta,</div><div class='add'>+		     struct ieee80211_link_sta *link_sta);</div><div class='ctx'> int iwl_mvm_rm_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 		   struct ieee80211_vif *vif,</div><div class='ctx'> 		   struct ieee80211_sta *sta);</div><div class='hunk'>@@ -508,6 +532,8 @@ int iwl_mvm_add_aux_sta(struct iwl_mvm *mvm, u32 lmac_id);</div><div class='ctx'> int iwl_mvm_rm_aux_sta(struct iwl_mvm *mvm);</div><div class='ctx'> </div><div class='ctx'> int iwl_mvm_alloc_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='add'>+void iwl_mvm_free_bcast_sta_queues(struct iwl_mvm *mvm,</div><div class='add'>+				   struct ieee80211_vif *vif);</div><div class='ctx'> int iwl_mvm_send_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='ctx'> int iwl_mvm_add_p2p_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='ctx'> int iwl_mvm_send_rm_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='hunk'>@@ -517,7 +543,7 @@ int iwl_mvm_rm_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='ctx'> int iwl_mvm_allocate_int_sta(struct iwl_mvm *mvm,</div><div class='ctx'> 			     struct iwl_mvm_int_sta *sta,</div><div class='ctx'> 				    u32 qmask, enum nl80211_iftype iftype,</div><div class='del'>-				    enum iwl_sta_type type);</div><div class='add'>+				    u8 type);</div><div class='ctx'> void iwl_mvm_dealloc_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='ctx'> void iwl_mvm_dealloc_int_sta(struct iwl_mvm *mvm, struct iwl_mvm_int_sta *sta);</div><div class='ctx'> int iwl_mvm_add_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='hunk'>@@ -541,9 +567,96 @@ void iwl_mvm_sta_modify_disable_tx_ap(struct iwl_mvm *mvm,</div><div class='ctx'> void iwl_mvm_modify_all_sta_disable_tx(struct iwl_mvm *mvm,</div><div class='ctx'> 				       struct iwl_mvm_vif *mvmvif,</div><div class='ctx'> 				       bool disable);</div><div class='add'>+</div><div class='ctx'> void iwl_mvm_csa_client_absent(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='add'>+int iwl_mvm_sta_ensure_queue(struct iwl_mvm *mvm, struct ieee80211_txq *txq);</div><div class='ctx'> void iwl_mvm_add_new_dqa_stream_wk(struct work_struct *wk);</div><div class='del'>-int iwl_mvm_add_pasn_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='del'>-			 struct iwl_mvm_int_sta *sta, u8 *addr, u32 cipher,</div><div class='del'>-			 u8 *key, u32 key_len);</div><div class='add'>+void iwl_mvm_cancel_channel_switch(struct iwl_mvm *mvm,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   u32 id);</div><div class='add'>+/* Queues */</div><div class='add'>+int iwl_mvm_tvqm_enable_txq(struct iwl_mvm *mvm,</div><div class='add'>+			    struct ieee80211_sta *sta,</div><div class='add'>+			    u8 sta_id, u8 tid, unsigned int timeout);</div><div class='add'>+</div><div class='add'>+/* Sta state */</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_mvm_sta_state_ops - callbacks for the sta_state() ops</div><div class='add'>+ *</div><div class='add'>+ * Since the only difference between both MLD and</div><div class='add'>+ * non-MLD versions of sta_state() is these function calls,</div><div class='add'>+ * each version will send its specific function calls to</div><div class='add'>+ * %iwl_mvm_mac_sta_state_common().</div><div class='add'>+ *</div><div class='add'>+ * @add_sta: pointer to the function that adds a new sta</div><div class='add'>+ * @update_sta: pointer to the function that updates a sta</div><div class='add'>+ * @rm_sta: pointer to the functions that removes a sta</div><div class='add'>+ * @mac_ctxt_changed: pointer to the function that handles a change in mac ctxt</div><div class='add'>+ */</div><div class='add'>+struct iwl_mvm_sta_state_ops {</div><div class='add'>+	int (*add_sta)(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+		       struct ieee80211_sta *sta);</div><div class='add'>+	int (*update_sta)(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			  struct ieee80211_sta *sta);</div><div class='add'>+	int (*rm_sta)(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+		      struct ieee80211_sta *sta);</div><div class='add'>+	int (*mac_ctxt_changed)(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+				bool force_assoc_off);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int iwl_mvm_mac_sta_state_common(struct ieee80211_hw *hw,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_sta *sta,</div><div class='add'>+				 enum ieee80211_sta_state old_state,</div><div class='add'>+				 enum ieee80211_sta_state new_state,</div><div class='add'>+				 const struct iwl_mvm_sta_state_ops *callbacks);</div><div class='add'>+</div><div class='add'>+/* New MLD STA related APIs */</div><div class='add'>+/* STA */</div><div class='add'>+int iwl_mvm_mld_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			      struct ieee80211_bss_conf *link_conf);</div><div class='add'>+int iwl_mvm_mld_add_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_bss_conf *link_conf);</div><div class='add'>+int iwl_mvm_mld_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			      struct ieee80211_bss_conf *link_conf);</div><div class='add'>+int iwl_mvm_mld_add_aux_sta(struct iwl_mvm *mvm, u32 lmac_id);</div><div class='add'>+int iwl_mvm_mld_rm_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_bss_conf *link_conf);</div><div class='add'>+int iwl_mvm_mld_rm_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='add'>+int iwl_mvm_mld_rm_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_bss_conf *link_conf);</div><div class='add'>+int iwl_mvm_mld_rm_aux_sta(struct iwl_mvm *mvm);</div><div class='add'>+int iwl_mvm_mld_add_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_sta *sta);</div><div class='add'>+int iwl_mvm_mld_update_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+			   struct ieee80211_sta *sta);</div><div class='add'>+int iwl_mvm_mld_rm_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='add'>+		       struct ieee80211_sta *sta);</div><div class='add'>+void iwl_mvm_mld_free_sta_link(struct iwl_mvm *mvm,</div><div class='add'>+			       struct iwl_mvm_sta *mvm_sta,</div><div class='add'>+			       struct iwl_mvm_link_sta *mvm_sta_link,</div><div class='add'>+			       unsigned int link_id);</div><div class='add'>+int iwl_mvm_mld_rm_sta_id(struct iwl_mvm *mvm, u8 sta_id);</div><div class='add'>+int iwl_mvm_mld_update_sta_links(struct iwl_mvm *mvm,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_sta *sta,</div><div class='add'>+				 u16 old_links, u16 new_links);</div><div class='add'>+u32 iwl_mvm_sta_fw_id_mask(struct iwl_mvm *mvm, struct ieee80211_sta *sta,</div><div class='add'>+			   int filter_link_id);</div><div class='add'>+int iwl_mvm_mld_add_int_sta_with_queue(struct iwl_mvm *mvm,</div><div class='add'>+				       struct iwl_mvm_int_sta *sta,</div><div class='add'>+				       const u8 *addr, int link_id,</div><div class='add'>+				       u16 *queue, u8 tid,</div><div class='add'>+				       unsigned int *_wdg_timeout);</div><div class='add'>+</div><div class='add'>+/* Queues */</div><div class='add'>+void iwl_mvm_mld_modify_all_sta_disable_tx(struct iwl_mvm *mvm,</div><div class='add'>+					   struct iwl_mvm_vif *mvmvif,</div><div class='add'>+					   bool disable);</div><div class='add'>+void iwl_mvm_mld_sta_modify_disable_tx(struct iwl_mvm *mvm,</div><div class='add'>+				       struct iwl_mvm_sta *mvm_sta,</div><div class='add'>+				       bool disable);</div><div class='add'>+void iwl_mvm_mld_sta_modify_disable_tx_ap(struct iwl_mvm *mvm,</div><div class='add'>+					  struct ieee80211_sta *sta,</div><div class='add'>+					  bool disable);</div><div class='ctx'> #endif /* __sta_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tdls.c b/drivers/net/wireless/intel/iwlwifi/mvm/tdls.c<br/>index bf04326e35ff..36379b738de1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/tdls.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/tdls.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/tdls.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/tdls.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2018-2020, 2022-2024 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include "mvm.h"</div><div class='hunk'>@@ -24,7 +24,7 @@ void iwl_mvm_teardown_tdls_peers(struct iwl_mvm *mvm)</div><div class='ctx'> 	for (i = 0; i &lt; mvm-&gt;fw-&gt;ucode_capa.num_stations; i++) {</div><div class='ctx'> 		sta = rcu_dereference_protected(mvm-&gt;fw_id_to_mac_id[i],</div><div class='ctx'> 						lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='del'>-		if (!sta || IS_ERR(sta) || !sta-&gt;tdls)</div><div class='add'>+		if (IS_ERR_OR_NULL(sta) || !sta-&gt;tdls)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='hunk'>@@ -47,7 +47,7 @@ int iwl_mvm_tdls_sta_count(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> 	for (i = 0; i &lt; mvm-&gt;fw-&gt;ucode_capa.num_stations; i++) {</div><div class='ctx'> 		sta = rcu_dereference_protected(mvm-&gt;fw_id_to_mac_id[i],</div><div class='ctx'> 						lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='del'>-		if (!sta || IS_ERR(sta) || !sta-&gt;tdls)</div><div class='add'>+		if (IS_ERR_OR_NULL(sta) || !sta-&gt;tdls)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (vif) {</div><div class='hunk'>@@ -144,21 +144,21 @@ void iwl_mvm_recalc_tdls_state(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_mac_mgd_protect_tdls_discover(struct ieee80211_hw *hw,</div><div class='del'>-					   struct ieee80211_vif *vif)</div><div class='add'>+					   struct ieee80211_vif *vif,</div><div class='add'>+					   unsigned int link_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='ctx'> 	u32 duration = 2 * vif-&gt;bss_conf.dtim_period * vif-&gt;bss_conf.beacon_int;</div><div class='ctx'> </div><div class='ctx'> 	/* Protect the session to hear the TDLS setup response on the channel */</div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> 	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='ctx'> 			IWL_UCODE_TLV_CAPA_SESSION_PROT_CMD))</div><div class='ctx'> 		iwl_mvm_schedule_session_protection(mvm, vif, duration,</div><div class='del'>-						    duration, true);</div><div class='add'>+						    duration, true, link_id);</div><div class='ctx'> 	else</div><div class='ctx'> 		iwl_mvm_protect_session(mvm, vif, duration,</div><div class='ctx'> 					duration, 100, true);</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const char *</div><div class='hunk'>@@ -196,7 +196,7 @@ static void iwl_mvm_tdls_update_cs_state(struct iwl_mvm *mvm,</div><div class='ctx'> 		mvm-&gt;tdls_cs.peer.sent_timestamp = iwl_mvm_get_systime(mvm);</div><div class='ctx'> </div><div class='ctx'> 	if (state == IWL_MVM_TDLS_SW_IDLE)</div><div class='del'>-		mvm-&gt;tdls_cs.cur_sta_id = IWL_MVM_INVALID_STA;</div><div class='add'>+		mvm-&gt;tdls_cs.cur_sta_id = IWL_INVALID_STA;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_rx_tdls_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)</div><div class='hunk'>@@ -250,7 +250,7 @@ iwl_mvm_tdls_check_action(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	/* get the existing peer if it's there */</div><div class='ctx'> 	if (mvm-&gt;tdls_cs.state != IWL_MVM_TDLS_SW_IDLE &amp;&amp;</div><div class='del'>-	    mvm-&gt;tdls_cs.cur_sta_id != IWL_MVM_INVALID_STA) {</div><div class='add'>+	    mvm-&gt;tdls_cs.cur_sta_id != IWL_INVALID_STA) {</div><div class='ctx'> 		struct ieee80211_sta *sta = rcu_dereference_protected(</div><div class='ctx'> 				mvm-&gt;fw_id_to_mac_id[mvm-&gt;tdls_cs.cur_sta_id],</div><div class='ctx'> 				lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='hunk'>@@ -369,7 +369,7 @@ iwl_mvm_tdls_config_channel_switch(struct iwl_mvm *mvm,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='del'>-	cmd.peer_sta_id = cpu_to_le32(mvmsta-&gt;sta_id);</div><div class='add'>+	cmd.peer_sta_id = cpu_to_le32(mvmsta-&gt;deflink.sta_id);</div><div class='ctx'> </div><div class='ctx'> 	if (!chandef) {</div><div class='ctx'> 		if (mvm-&gt;tdls_cs.state == IWL_MVM_TDLS_SW_REQ_SENT &amp;&amp;</div><div class='hunk'>@@ -380,7 +380,7 @@ iwl_mvm_tdls_config_channel_switch(struct iwl_mvm *mvm,</div><div class='ctx'> 			   type == TDLS_MOVE_CH) {</div><div class='ctx'> 			/* we need to return to base channel */</div><div class='ctx'> 			struct ieee80211_chanctx_conf *chanctx =</div><div class='del'>-					rcu_dereference(vif-&gt;chanctx_conf);</div><div class='add'>+					rcu_dereference(vif-&gt;bss_conf.chanctx_conf);</div><div class='ctx'> </div><div class='ctx'> 			if (WARN_ON_ONCE(!chanctx)) {</div><div class='ctx'> 				rcu_read_unlock();</div><div class='hunk'>@@ -414,7 +414,7 @@ iwl_mvm_tdls_config_channel_switch(struct iwl_mvm *mvm,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_set_tx_cmd(mvm, skb, &amp;tail-&gt;frame.tx_cmd, info,</div><div class='del'>-			   mvmsta-&gt;sta_id);</div><div class='add'>+			   mvmsta-&gt;deflink.sta_id);</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_set_tx_cmd_rate(mvm, &amp;tail-&gt;frame.tx_cmd, info, sta,</div><div class='ctx'> 				hdr-&gt;frame_control);</div><div class='hunk'>@@ -431,7 +431,7 @@ iwl_mvm_tdls_config_channel_switch(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	/* channel switch has started, update state */</div><div class='ctx'> 	if (type != TDLS_MOVE_CH) {</div><div class='del'>-		mvm-&gt;tdls_cs.cur_sta_id = mvmsta-&gt;sta_id;</div><div class='add'>+		mvm-&gt;tdls_cs.cur_sta_id = mvmsta-&gt;deflink.sta_id;</div><div class='ctx'> 		iwl_mvm_tdls_update_cs_state(mvm,</div><div class='ctx'> 					     type == TDLS_SEND_CHAN_SW_REQ ?</div><div class='ctx'> 					     IWL_MVM_TDLS_SW_REQ_SENT :</div><div class='hunk'>@@ -459,21 +459,21 @@ void iwl_mvm_tdls_ch_switch_work(struct work_struct *work)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mvm = container_of(work, struct iwl_mvm, tdls_cs.dwork.work);</div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> </div><div class='ctx'> 	/* called after an active channel switch has finished or timed-out */</div><div class='ctx'> 	iwl_mvm_tdls_update_cs_state(mvm, IWL_MVM_TDLS_SW_IDLE);</div><div class='ctx'> </div><div class='ctx'> 	/* station might be gone, in that case do nothing */</div><div class='del'>-	if (mvm-&gt;tdls_cs.peer.sta_id == IWL_MVM_INVALID_STA)</div><div class='del'>-		goto out;</div><div class='add'>+	if (mvm-&gt;tdls_cs.peer.sta_id == IWL_INVALID_STA)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	sta = rcu_dereference_protected(</div><div class='ctx'> 				mvm-&gt;fw_id_to_mac_id[mvm-&gt;tdls_cs.peer.sta_id],</div><div class='ctx'> 				lockdep_is_held(&amp;mvm-&gt;mutex));</div><div class='ctx'> 	/* the station may not be here, but if it is, it must be a TDLS peer */</div><div class='del'>-	if (!sta || IS_ERR(sta) || WARN_ON(!sta-&gt;tdls))</div><div class='del'>-		goto out;</div><div class='add'>+	if (IS_ERR_OR_NULL(sta) || WARN_ON(!sta-&gt;tdls))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> 	vif = mvmsta-&gt;vif;</div><div class='hunk'>@@ -492,8 +492,6 @@ void iwl_mvm_tdls_ch_switch_work(struct work_struct *work)</div><div class='ctx'> 	/* retry after a DTIM if we failed sending now */</div><div class='ctx'> 	delay = TU_TO_MS(vif-&gt;bss_conf.dtim_period * vif-&gt;bss_conf.beacon_int);</div><div class='ctx'> 	schedule_delayed_work(&amp;mvm-&gt;tdls_cs.dwork, msecs_to_jiffies(delay));</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='hunk'>@@ -508,18 +506,17 @@ iwl_mvm_tdls_channel_switch(struct ieee80211_hw *hw,</div><div class='ctx'> 	unsigned int delay;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_TDLS(mvm, "TDLS channel switch with %pM ch %d width %d\n",</div><div class='ctx'> 		       sta-&gt;addr, chandef-&gt;chan-&gt;center_freq, chandef-&gt;width);</div><div class='ctx'> </div><div class='ctx'> 	/* we only support a single peer for channel switching */</div><div class='del'>-	if (mvm-&gt;tdls_cs.peer.sta_id != IWL_MVM_INVALID_STA) {</div><div class='add'>+	if (mvm-&gt;tdls_cs.peer.sta_id != IWL_INVALID_STA) {</div><div class='ctx'> 		IWL_DEBUG_TDLS(mvm,</div><div class='ctx'> 			       "Existing peer. Can't start switch with %pM\n",</div><div class='ctx'> 			       sta-&gt;addr);</div><div class='del'>-		ret = -EBUSY;</div><div class='del'>-		goto out;</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_mvm_tdls_config_channel_switch(mvm, vif,</div><div class='hunk'>@@ -528,20 +525,18 @@ iwl_mvm_tdls_channel_switch(struct ieee80211_hw *hw,</div><div class='ctx'> 						 oper_class, chandef, 0, 0, 0,</div><div class='ctx'> 						 tmpl_skb, ch_sw_tm_ie);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Mark the peer as "in tdls switch" for this vif. We only allow a</div><div class='ctx'> 	 * single such peer per vif.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mvm-&gt;tdls_cs.peer.skb = skb_copy(tmpl_skb, GFP_KERNEL);</div><div class='del'>-	if (!mvm-&gt;tdls_cs.peer.skb) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!mvm-&gt;tdls_cs.peer.skb)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='del'>-	mvm-&gt;tdls_cs.peer.sta_id = mvmsta-&gt;sta_id;</div><div class='add'>+	mvm-&gt;tdls_cs.peer.sta_id = mvmsta-&gt;deflink.sta_id;</div><div class='ctx'> 	mvm-&gt;tdls_cs.peer.chandef = *chandef;</div><div class='ctx'> 	mvm-&gt;tdls_cs.peer.initiator = sta-&gt;tdls_initiator;</div><div class='ctx'> 	mvm-&gt;tdls_cs.peer.op_class = oper_class;</div><div class='hunk'>@@ -555,10 +550,7 @@ iwl_mvm_tdls_channel_switch(struct ieee80211_hw *hw,</div><div class='ctx'> 			     vif-&gt;bss_conf.beacon_int);</div><div class='ctx'> 	mod_delayed_work(system_wq, &amp;mvm-&gt;tdls_cs.dwork,</div><div class='ctx'> 			 msecs_to_jiffies(delay));</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_tdls_cancel_channel_switch(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -574,7 +566,7 @@ void iwl_mvm_tdls_cancel_channel_switch(struct ieee80211_hw *hw,</div><div class='ctx'> 	IWL_DEBUG_TDLS(mvm, "TDLS cancel channel switch with %pM\n", sta-&gt;addr);</div><div class='ctx'> </div><div class='ctx'> 	/* we only support a single peer for channel switching */</div><div class='del'>-	if (mvm-&gt;tdls_cs.peer.sta_id == IWL_MVM_INVALID_STA) {</div><div class='add'>+	if (mvm-&gt;tdls_cs.peer.sta_id == IWL_INVALID_STA) {</div><div class='ctx'> 		IWL_DEBUG_TDLS(mvm, "No ch switch peer - %pM\n", sta-&gt;addr);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -595,7 +587,7 @@ void iwl_mvm_tdls_cancel_channel_switch(struct ieee80211_hw *hw,</div><div class='ctx'> 	    mvm-&gt;tdls_cs.state != IWL_MVM_TDLS_SW_IDLE)</div><div class='ctx'> 		wait_for_phy = true;</div><div class='ctx'> </div><div class='del'>-	mvm-&gt;tdls_cs.peer.sta_id = IWL_MVM_INVALID_STA;</div><div class='add'>+	mvm-&gt;tdls_cs.peer.sta_id = IWL_INVALID_STA;</div><div class='ctx'> 	dev_kfree_skb(mvm-&gt;tdls_cs.peer.skb);</div><div class='ctx'> 	mvm-&gt;tdls_cs.peer.skb = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -625,7 +617,7 @@ iwl_mvm_tdls_recv_channel_switch(struct ieee80211_hw *hw,</div><div class='ctx'> 		params-&gt;action_code == WLAN_TDLS_CHANNEL_SWITCH_REQUEST ?</div><div class='ctx'> 		"REQ" : "RESP";</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_TDLS(mvm,</div><div class='ctx'> 		       "Received TDLS ch switch action %s from %pM status %d\n",</div><div class='hunk'>@@ -638,7 +630,7 @@ iwl_mvm_tdls_recv_channel_switch(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (params-&gt;action_code == WLAN_TDLS_CHANNEL_SWITCH_RESPONSE &amp;&amp;</div><div class='ctx'> 	    params-&gt;status != 0 &amp;&amp;</div><div class='ctx'> 	    mvm-&gt;tdls_cs.state == IWL_MVM_TDLS_SW_REQ_SENT &amp;&amp;</div><div class='del'>-	    mvm-&gt;tdls_cs.cur_sta_id != IWL_MVM_INVALID_STA) {</div><div class='add'>+	    mvm-&gt;tdls_cs.cur_sta_id != IWL_INVALID_STA) {</div><div class='ctx'> 		struct ieee80211_sta *cur_sta;</div><div class='ctx'> </div><div class='ctx'> 		/* make sure it's the same peer */</div><div class='hunk'>@@ -669,5 +661,4 @@ retry:</div><div class='ctx'> 		1024 / 1000;</div><div class='ctx'> 	mod_delayed_work(system_wq, &amp;mvm-&gt;tdls_cs.dwork,</div><div class='ctx'> 			 msecs_to_jiffies(delay));</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tests/Makefile b/drivers/net/wireless/intel/iwlwifi/mvm/tests/Makefile<br/>new file mode 100644<br/>index 000000000000..2267be4cfb44<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/tests/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/tests/Makefile</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+iwlmvm-tests-y += module.o hcmd.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_IWLWIFI_KUNIT_TESTS) += iwlmvm-tests.o</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tests/hcmd.c b/drivers/net/wireless/intel/iwlwifi/mvm/tests/hcmd.c<br/>new file mode 100644<br/>index 000000000000..1fee0320c756<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/tests/hcmd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/tests/hcmd.c</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * KUnit tests for channel helper functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;kunit/test.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;iwl-trans.h&gt;</div><div class='add'>+#include "../mvm.h"</div><div class='add'>+</div><div class='add'>+MODULE_IMPORT_NS("EXPORTED_FOR_KUNIT_TESTING");</div><div class='add'>+</div><div class='add'>+static void test_hcmd_names_sorted(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; iwl_mvm_groups_size; i++) {</div><div class='add'>+		const struct iwl_hcmd_arr *arr = &amp;iwl_mvm_groups[i];</div><div class='add'>+</div><div class='add'>+		if (!arr-&gt;arr)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (int j = 0; j &lt; arr-&gt;size - 1; j++)</div><div class='add'>+			KUNIT_EXPECT_LE(test, arr-&gt;arr[j].cmd_id,</div><div class='add'>+					arr-&gt;arr[j + 1].cmd_id);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kunit_case hcmd_names_cases[] = {</div><div class='add'>+	KUNIT_CASE(test_hcmd_names_sorted),</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kunit_suite hcmd_names = {</div><div class='add'>+	.name = "iwlmvm-hcmd-names",</div><div class='add'>+	.test_cases = hcmd_names_cases,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+kunit_test_suite(hcmd_names);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tests/module.c b/drivers/net/wireless/intel/iwlwifi/mvm/tests/module.c<br/>new file mode 100644<br/>index 000000000000..f556acbac77f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/tests/module.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/tests/module.c</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * This is just module boilerplate for the iwlmvm kunit module.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("kunit tests for iwlmvm");</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c b/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c<br/>index 83342a6a6d5b..0b12ee8ad618 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/time-event.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/time-event.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2021 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -31,39 +31,42 @@ void iwl_mvm_te_clear_data(struct iwl_mvm *mvm,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	list_del(&amp;te_data-&gt;list);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * the list is only used for AUX ROC events so make sure it is always</div><div class='add'>+	 * initialized</div><div class='add'>+	 */</div><div class='add'>+	INIT_LIST_HEAD(&amp;te_data-&gt;list);</div><div class='add'>+</div><div class='ctx'> 	te_data-&gt;running = false;</div><div class='ctx'> 	te_data-&gt;uid = 0;</div><div class='ctx'> 	te_data-&gt;id = TE_MAX;</div><div class='ctx'> 	te_data-&gt;vif = NULL;</div><div class='add'>+	te_data-&gt;link_id = -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_mvm_roc_done_wk(struct work_struct *wk)</div><div class='add'>+static void iwl_mvm_cleanup_roc(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm *mvm = container_of(wk, struct iwl_mvm, roc_done_wk);</div><div class='add'>+	struct ieee80211_vif *vif = mvm-&gt;p2p_device_vif;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Clear the ROC_RUNNING /ROC_AUX_RUNNING status bit.</div><div class='add'>+	 * Clear the ROC_P2P_RUNNING status bit.</div><div class='ctx'> 	 * This will cause the TX path to drop offchannel transmissions.</div><div class='ctx'> 	 * That would also be done by mac80211, but it is racy, in particular</div><div class='del'>-	 * in the case that the time event actually completed in the firmware</div><div class='del'>-	 * (which is handled in iwl_mvm_te_handle_notif).</div><div class='del'>-	 */</div><div class='del'>-	clear_bit(IWL_MVM_STATUS_ROC_RUNNING, &amp;mvm-&gt;status);</div><div class='del'>-	clear_bit(IWL_MVM_STATUS_ROC_AUX_RUNNING, &amp;mvm-&gt;status);</div><div class='del'>-</div><div class='del'>-	synchronize_net();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Flush the offchannel queue -- this is called when the time</div><div class='add'>+	 * in the case that the time event actually completed in the firmware.</div><div class='add'>+	 *</div><div class='add'>+	 * Also flush the offchannel queue -- this is called when the time</div><div class='ctx'> 	 * event finishes or is canceled, so that frames queued for it</div><div class='ctx'> 	 * won't get stuck on the queue and be transmitted in the next</div><div class='ctx'> 	 * time event.</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='del'>-	if (test_and_clear_bit(IWL_MVM_STATUS_NEED_FLUSH_P2P, &amp;mvm-&gt;status)) {</div><div class='add'>+	if (test_and_clear_bit(IWL_MVM_STATUS_ROC_P2P_RUNNING, &amp;mvm-&gt;status)) {</div><div class='ctx'> 		struct iwl_mvm_vif *mvmvif;</div><div class='ctx'> </div><div class='add'>+		synchronize_net();</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * NB: access to this pointer would be racy, but the flush bit</div><div class='ctx'> 		 * can only be set when we had a P2P-Device VIF, and we have a</div><div class='hunk'>@@ -71,24 +74,68 @@ void iwl_mvm_roc_done_wk(struct work_struct *wk)</div><div class='ctx'> 		 * not really racy.</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		if (!WARN_ON(!mvm-&gt;p2p_device_vif)) {</div><div class='del'>-			mvmvif = iwl_mvm_vif_from_mac80211(mvm-&gt;p2p_device_vif);</div><div class='del'>-			iwl_mvm_flush_sta(mvm, &amp;mvmvif-&gt;bcast_sta, true);</div><div class='add'>+		if (!WARN_ON(!vif)) {</div><div class='add'>+			mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+			iwl_mvm_flush_sta(mvm, mvmvif-&gt;deflink.bcast_sta.sta_id,</div><div class='add'>+					  mvmvif-&gt;deflink.bcast_sta.tfd_queue_msk);</div><div class='add'>+</div><div class='add'>+			if (mvm-&gt;mld_api_is_used) {</div><div class='add'>+				iwl_mvm_mld_rm_bcast_sta(mvm, vif,</div><div class='add'>+							 &amp;vif-&gt;bss_conf);</div><div class='add'>+</div><div class='add'>+				iwl_mvm_link_changed(mvm, vif, &amp;vif-&gt;bss_conf,</div><div class='add'>+						     LINK_CONTEXT_MODIFY_ACTIVE,</div><div class='add'>+						     false);</div><div class='add'>+			} else {</div><div class='add'>+				iwl_mvm_rm_p2p_bcast_sta(mvm, vif);</div><div class='add'>+				iwl_mvm_binding_remove_vif(mvm, vif);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Do not remove the PHY context as removing and adding</div><div class='add'>+			 * a PHY context has timing overheads. Leaving it</div><div class='add'>+			 * configured in FW would be useful in case the next ROC</div><div class='add'>+			 * is with the same channel.</div><div class='add'>+			 */</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		/* do the same in case of hot spot 2.0 */</div><div class='del'>-		iwl_mvm_flush_sta(mvm, &amp;mvm-&gt;aux_sta, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * P2P AUX ROC and HS2.0 ROC do not run simultaneously.</div><div class='add'>+	 * Clear the ROC_AUX_RUNNING status bit.</div><div class='add'>+	 * This will cause the TX path to drop offchannel transmissions.</div><div class='add'>+	 * That would also be done by mac80211, but it is racy, in particular</div><div class='add'>+	 * in the case that the time event actually completed in the firmware</div><div class='add'>+	 * (which is handled in iwl_mvm_te_handle_notif).</div><div class='add'>+	 */</div><div class='add'>+	if (test_and_clear_bit(IWL_MVM_STATUS_ROC_AUX_RUNNING, &amp;mvm-&gt;status)) {</div><div class='add'>+		synchronize_net();</div><div class='add'>+</div><div class='add'>+		iwl_mvm_flush_sta(mvm, mvm-&gt;aux_sta.sta_id,</div><div class='add'>+				  mvm-&gt;aux_sta.tfd_queue_msk);</div><div class='add'>+</div><div class='ctx'> 		/* In newer version of this command an aux station is added only</div><div class='ctx'> 		 * in cases of dedicated tx queue and need to be removed in end</div><div class='del'>-		 * of use */</div><div class='del'>-		if (iwl_fw_lookup_cmd_ver(mvm-&gt;fw, LONG_GROUP,</div><div class='del'>-					  ADD_STA, 0) &gt;= 12)</div><div class='add'>+		 * of use. For the even newer mld api, use the appropriate</div><div class='add'>+		 * function.</div><div class='add'>+		 */</div><div class='add'>+		if (mvm-&gt;mld_api_is_used)</div><div class='add'>+			iwl_mvm_mld_rm_aux_sta(mvm);</div><div class='add'>+		else if (iwl_mvm_has_new_station_api(mvm-&gt;fw))</div><div class='ctx'> 			iwl_mvm_rm_aux_sta(mvm);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void iwl_mvm_roc_done_wk(struct work_struct *wk)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm *mvm = container_of(wk, struct iwl_mvm, roc_done_wk);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	/* Mutex is released inside */</div><div class='add'>+	iwl_mvm_cleanup_roc(mvm);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void iwl_mvm_roc_finished(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -108,7 +155,7 @@ static void iwl_mvm_csa_noa_start(struct iwl_mvm *mvm)</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	csa_vif = rcu_dereference(mvm-&gt;csa_vif);</div><div class='del'>-	if (!csa_vif || !csa_vif-&gt;csa_active)</div><div class='add'>+	if (!csa_vif || !csa_vif-&gt;bss_conf.csa_active)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_TE(mvm, "CSA NOA started\n");</div><div class='hunk'>@@ -119,12 +166,12 @@ static void iwl_mvm_csa_noa_start(struct iwl_mvm *mvm)</div><div class='ctx'> 	 * So we just do nothing here and the switch</div><div class='ctx'> 	 * will be performed on the last TBTT.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!ieee80211_beacon_cntdwn_is_complete(csa_vif)) {</div><div class='add'>+	if (!ieee80211_beacon_cntdwn_is_complete(csa_vif, 0)) {</div><div class='ctx'> 		IWL_WARN(mvm, "CSA NOA started too early\n");</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ieee80211_csa_finish(csa_vif);</div><div class='add'>+	ieee80211_csa_finish(csa_vif, 0);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='hunk'>@@ -145,7 +192,7 @@ static bool iwl_mvm_te_check_disconnect(struct iwl_mvm *mvm,</div><div class='ctx'> 	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (!mvmvif-&gt;csa_bcn_pending &amp;&amp; vif-&gt;bss_conf.assoc &amp;&amp;</div><div class='add'>+	if (!mvmvif-&gt;csa_bcn_pending &amp;&amp; vif-&gt;cfg.assoc &amp;&amp;</div><div class='ctx'> 	    vif-&gt;bss_conf.dtim_period)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (errmsg)</div><div class='hunk'>@@ -155,12 +202,25 @@ static bool iwl_mvm_te_check_disconnect(struct iwl_mvm *mvm,</div><div class='ctx'> 		struct iwl_mvm_sta *mvmsta;</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_lock();</div><div class='del'>-		mvmsta = iwl_mvm_sta_from_staid_rcu(mvm, mvmvif-&gt;ap_sta_id);</div><div class='add'>+		mvmsta = iwl_mvm_sta_from_staid_rcu(mvm,</div><div class='add'>+						    mvmvif-&gt;deflink.ap_sta_id);</div><div class='ctx'> 		if (!WARN_ON(!mvmsta))</div><div class='ctx'> 			iwl_mvm_sta_modify_disable_tx(mvm, mvmsta, false);</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (vif-&gt;cfg.assoc) {</div><div class='add'>+		/*</div><div class='add'>+		 * When not associated, this will be called from</div><div class='add'>+		 * iwl_mvm_event_mlme_callback_ini()</div><div class='add'>+		 */</div><div class='add'>+		iwl_dbg_tlv_time_point(&amp;mvm-&gt;fwrt,</div><div class='add'>+				       IWL_FW_INI_TIME_POINT_ASSOC_FAILED,</div><div class='add'>+				       NULL);</div><div class='add'>+</div><div class='add'>+		mvmvif-&gt;session_prot_connection_loss = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	iwl_mvm_connection_loss(mvm, vif, errmsg);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -190,7 +250,7 @@ iwl_mvm_te_handle_notify_csa(struct iwl_mvm *mvm,</div><div class='ctx'> 		}</div><div class='ctx'> 		iwl_mvm_csa_client_absent(mvm, te_data-&gt;vif);</div><div class='ctx'> 		cancel_delayed_work(&amp;mvmvif-&gt;csa_work);</div><div class='del'>-		ieee80211_chswitch_done(te_data-&gt;vif, true);</div><div class='add'>+		ieee80211_chswitch_done(te_data-&gt;vif, true, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* should never happen */</div><div class='hunk'>@@ -290,7 +350,6 @@ static void iwl_mvm_te_handle_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 		switch (te_data-&gt;vif-&gt;type) {</div><div class='ctx'> 		case NL80211_IFTYPE_P2P_DEVICE:</div><div class='ctx'> 			ieee80211_remain_on_channel_expired(mvm-&gt;hw);</div><div class='del'>-			set_bit(IWL_MVM_STATUS_NEED_FLUSH_P2P, &amp;mvm-&gt;status);</div><div class='ctx'> 			iwl_mvm_roc_finished(mvm);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case NL80211_IFTYPE_STATION:</div><div class='hunk'>@@ -310,6 +369,8 @@ static void iwl_mvm_te_handle_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 			 * and know the dtim period.</div><div class='ctx'> 			 */</div><div class='ctx'> 			iwl_mvm_te_check_disconnect(mvm, te_data-&gt;vif,</div><div class='add'>+				!te_data-&gt;vif-&gt;cfg.assoc ?</div><div class='add'>+				"Not associated and the time event is over already..." :</div><div class='ctx'> 				"No beacon heard and the time event is over already...");</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -322,7 +383,7 @@ static void iwl_mvm_te_handle_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 		te_data-&gt;end_jiffies = TU_TO_EXP_TIME(te_data-&gt;duration);</div><div class='ctx'> </div><div class='ctx'> 		if (te_data-&gt;vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE) {</div><div class='del'>-			set_bit(IWL_MVM_STATUS_ROC_RUNNING, &amp;mvm-&gt;status);</div><div class='add'>+			set_bit(IWL_MVM_STATUS_ROC_P2P_RUNNING, &amp;mvm-&gt;status);</div><div class='ctx'> 			ieee80211_ready_on_channel(mvm-&gt;hw);</div><div class='ctx'> 		} else if (te_data-&gt;id == TE_CHANNEL_SWITCH_PERIOD) {</div><div class='ctx'> 			iwl_mvm_te_handle_notify_csa(mvm, te_data, notif);</div><div class='hunk'>@@ -332,25 +393,77 @@ static void iwl_mvm_te_handle_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct iwl_mvm_rx_roc_iterator_data {</div><div class='add'>+	u32 activity;</div><div class='add'>+	bool end_activity;</div><div class='add'>+	bool found;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_rx_roc_iterator(void *_data, u8 *mac,</div><div class='add'>+				    struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	struct iwl_mvm_rx_roc_iterator_data *data = _data;</div><div class='add'>+</div><div class='add'>+	if (mvmvif-&gt;roc_activity == data-&gt;activity) {</div><div class='add'>+		data-&gt;found = true;</div><div class='add'>+		if (data-&gt;end_activity)</div><div class='add'>+			mvmvif-&gt;roc_activity = ROC_NUM_ACTIVITIES;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_rx_roc_notif(struct iwl_mvm *mvm,</div><div class='add'>+			  struct iwl_rx_cmd_buffer *rxb)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='add'>+	struct iwl_roc_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+	u32 activity = le32_to_cpu(notif-&gt;activity);</div><div class='add'>+	bool started = le32_to_cpu(notif-&gt;success) &amp;&amp;</div><div class='add'>+		le32_to_cpu(notif-&gt;started);</div><div class='add'>+	struct iwl_mvm_rx_roc_iterator_data data = {</div><div class='add'>+		.activity = activity,</div><div class='add'>+		.end_activity = !started,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Clear vif roc_activity if done (set to ROC_NUM_ACTIVITIES) */</div><div class='add'>+	ieee80211_iterate_active_interfaces_atomic(mvm-&gt;hw,</div><div class='add'>+						   IEEE80211_IFACE_ITER_NORMAL,</div><div class='add'>+						   iwl_mvm_rx_roc_iterator,</div><div class='add'>+						   &amp;data);</div><div class='add'>+	/*</div><div class='add'>+	 * It is possible that the ROC was canceled</div><div class='add'>+	 * but the notification was already fired.</div><div class='add'>+	 */</div><div class='add'>+	if (!data.found)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (started) {</div><div class='add'>+		set_bit(IWL_MVM_STATUS_ROC_AUX_RUNNING, &amp;mvm-&gt;status);</div><div class='add'>+		ieee80211_ready_on_channel(mvm-&gt;hw);</div><div class='add'>+	} else {</div><div class='add'>+		iwl_mvm_roc_finished(mvm);</div><div class='add'>+		ieee80211_remain_on_channel_expired(mvm-&gt;hw);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Handle A Aux ROC time event</div><div class='ctx'>  */</div><div class='ctx'> static int iwl_mvm_aux_roc_te_handle_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 					   struct iwl_time_event_notif *notif)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm_time_event_data *te_data, *tmp;</div><div class='del'>-	bool aux_roc_te = false;</div><div class='add'>+	struct iwl_mvm_time_event_data *aux_roc_te = NULL, *te_data;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_safe(te_data, tmp, &amp;mvm-&gt;aux_roc_te_list, list) {</div><div class='add'>+	list_for_each_entry(te_data, &amp;mvm-&gt;aux_roc_te_list, list) {</div><div class='ctx'> 		if (le32_to_cpu(notif-&gt;unique_id) == te_data-&gt;uid) {</div><div class='del'>-			aux_roc_te = true;</div><div class='add'>+			aux_roc_te = te_data;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!aux_roc_te) /* Not a Aux ROC time event */</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_te_check_trigger(mvm, notif, te_data);</div><div class='add'>+	iwl_mvm_te_check_trigger(mvm, notif, aux_roc_te);</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_TE(mvm,</div><div class='ctx'> 		     "Aux ROC time event notification  - UID = 0x%x action %d (error = %d)\n",</div><div class='hunk'>@@ -362,14 +475,14 @@ static int iwl_mvm_aux_roc_te_handle_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 		/* End TE, notify mac80211 */</div><div class='ctx'> 		ieee80211_remain_on_channel_expired(mvm-&gt;hw);</div><div class='ctx'> 		iwl_mvm_roc_finished(mvm); /* flush aux queue */</div><div class='del'>-		list_del(&amp;te_data-&gt;list); /* remove from list */</div><div class='del'>-		te_data-&gt;running = false;</div><div class='del'>-		te_data-&gt;vif = NULL;</div><div class='del'>-		te_data-&gt;uid = 0;</div><div class='del'>-		te_data-&gt;id = TE_MAX;</div><div class='add'>+		list_del(&amp;aux_roc_te-&gt;list); /* remove from list */</div><div class='add'>+		aux_roc_te-&gt;running = false;</div><div class='add'>+		aux_roc_te-&gt;vif = NULL;</div><div class='add'>+		aux_roc_te-&gt;uid = 0;</div><div class='add'>+		aux_roc_te-&gt;id = TE_MAX;</div><div class='ctx'> 	} else if (le32_to_cpu(notif-&gt;action) == TE_V2_NOTIF_HOST_EVENT_START) {</div><div class='ctx'> 		set_bit(IWL_MVM_STATUS_ROC_AUX_RUNNING, &amp;mvm-&gt;status);</div><div class='del'>-		te_data-&gt;running = true;</div><div class='add'>+		aux_roc_te-&gt;running = true;</div><div class='ctx'> 		ieee80211_ready_on_channel(mvm-&gt;hw); /* Start TE */</div><div class='ctx'> 	} else {</div><div class='ctx'> 		IWL_DEBUG_TE(mvm,</div><div class='hunk'>@@ -606,32 +719,88 @@ void iwl_mvm_protect_session(struct iwl_mvm *mvm,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Determine whether mac or link id should be used, and validate the link id */</div><div class='add'>+static int iwl_mvm_get_session_prot_id(struct iwl_mvm *mvm,</div><div class='add'>+				       struct ieee80211_vif *vif,</div><div class='add'>+				       s8 link_id)</div><div class='add'>+{</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	int ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw,</div><div class='add'>+					WIDE_ID(MAC_CONF_GROUP,</div><div class='add'>+						SESSION_PROTECTION_CMD), 1);</div><div class='add'>+</div><div class='add'>+	if (ver &lt; 2)</div><div class='add'>+		return mvmvif-&gt;id;</div><div class='add'>+</div><div class='add'>+	if (WARN(link_id &lt; 0 || !mvmvif-&gt;link[link_id],</div><div class='add'>+		 "Invalid link ID for session protection: %u\n", link_id))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (WARN(!mvmvif-&gt;link[link_id]-&gt;active,</div><div class='add'>+		 "Session Protection on an inactive link: %u\n", link_id))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return mvmvif-&gt;link[link_id]-&gt;fw_link_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void iwl_mvm_cancel_session_protection(struct iwl_mvm *mvm,</div><div class='del'>-					      struct iwl_mvm_vif *mvmvif)</div><div class='add'>+					      struct ieee80211_vif *vif,</div><div class='add'>+					      u32 id, s8 link_id)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm_session_prot_cmd cmd = {</div><div class='del'>-		.id_and_color =</div><div class='del'>-			cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif-&gt;id,</div><div class='del'>-							mvmvif-&gt;color)),</div><div class='add'>+	int mac_link_id = iwl_mvm_get_session_prot_id(mvm, vif, link_id);</div><div class='add'>+	struct iwl_session_prot_cmd cmd = {</div><div class='add'>+		.id_and_color = cpu_to_le32(mac_link_id),</div><div class='ctx'> 		.action = cpu_to_le32(FW_CTXT_ACTION_REMOVE),</div><div class='del'>-		.conf_id = cpu_to_le32(mvmvif-&gt;time_event_data.id),</div><div class='add'>+		.conf_id = cpu_to_le32(id),</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_send_cmd_pdu(mvm, iwl_cmd_id(SESSION_PROTECTION_CMD,</div><div class='del'>-						   MAC_CONF_GROUP, 0),</div><div class='add'>+	if (mac_link_id &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = iwl_mvm_send_cmd_pdu(mvm,</div><div class='add'>+				   WIDE_ID(MAC_CONF_GROUP, SESSION_PROTECTION_CMD),</div><div class='ctx'> 				   0, sizeof(cmd), &amp;cmd);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		IWL_ERR(mvm,</div><div class='ctx'> 			"Couldn't send the SESSION_PROTECTION_CMD: %d\n", ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void iwl_mvm_roc_rm_cmd(struct iwl_mvm *mvm, u32 activity)</div><div class='add'>+{</div><div class='add'>+	struct iwl_roc_req roc_cmd = {</div><div class='add'>+		.action = cpu_to_le32(FW_CTXT_ACTION_REMOVE),</div><div class='add'>+		.activity = cpu_to_le32(activity),</div><div class='add'>+	};</div><div class='add'>+	u8 ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, WIDE_ID(MAC_CONF_GROUP, ROC_CMD), 0);</div><div class='add'>+	u16 cmd_len = ver &lt; 6 ? sizeof(struct iwl_roc_req_v5) : sizeof(roc_cmd);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+	ret = iwl_mvm_send_cmd_pdu(mvm, WIDE_ID(MAC_CONF_GROUP, ROC_CMD), 0,</div><div class='add'>+				   cmd_len, &amp;roc_cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(mvm, "Couldn't send the ROC_CMD: %d\n", ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool __iwl_mvm_remove_time_event(struct iwl_mvm *mvm,</div><div class='ctx'> 					struct iwl_mvm_time_event_data *te_data,</div><div class='ctx'> 					u32 *uid)</div><div class='ctx'> {</div><div class='ctx'> 	u32 id;</div><div class='del'>-	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(te_data-&gt;vif);</div><div class='add'>+	struct ieee80211_vif *vif = te_data-&gt;vif;</div><div class='add'>+	struct iwl_mvm_vif *mvmvif;</div><div class='add'>+	enum nl80211_iftype iftype;</div><div class='add'>+	s8 link_id;</div><div class='add'>+	bool p2p_aux = iwl_mvm_has_p2p_over_aux(mvm);</div><div class='add'>+	u8 roc_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw,</div><div class='add'>+					   WIDE_ID(MAC_CONF_GROUP, ROC_CMD), 0);</div><div class='add'>+</div><div class='add'>+	if (!vif)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	mvmvif = iwl_mvm_vif_from_mac80211(te_data-&gt;vif);</div><div class='add'>+	iftype = te_data-&gt;vif-&gt;type;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * It is possible that by the time we got to this point the time</div><div class='hunk'>@@ -642,6 +811,7 @@ static bool __iwl_mvm_remove_time_event(struct iwl_mvm *mvm,</div><div class='ctx'> 	/* Save time event uid before clearing its data */</div><div class='ctx'> 	*uid = te_data-&gt;uid;</div><div class='ctx'> 	id = te_data-&gt;id;</div><div class='add'>+	link_id = te_data-&gt;link_id;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The clear_data function handles time events that were already removed</div><div class='hunk'>@@ -649,16 +819,27 @@ static bool __iwl_mvm_remove_time_event(struct iwl_mvm *mvm,</div><div class='ctx'> 	iwl_mvm_te_clear_data(mvm, te_data);</div><div class='ctx'> 	spin_unlock_bh(&amp;mvm-&gt;time_event_lock);</div><div class='ctx'> </div><div class='del'>-	/* When session protection is supported, the te_data-&gt;id field</div><div class='del'>-	 * is reused to save session protection's configuration.</div><div class='del'>-	 */</div><div class='del'>-	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='del'>-			IWL_UCODE_TLV_CAPA_SESSION_PROT_CMD)) {</div><div class='add'>+	if ((p2p_aux &amp;&amp; iftype == NL80211_IFTYPE_P2P_DEVICE) ||</div><div class='add'>+	    (roc_ver &gt;= 3 &amp;&amp; mvmvif-&gt;roc_activity == ROC_ACTIVITY_HOTSPOT)) {</div><div class='add'>+		if (mvmvif-&gt;roc_activity &lt; ROC_NUM_ACTIVITIES) {</div><div class='add'>+			iwl_mvm_roc_rm_cmd(mvm, mvmvif-&gt;roc_activity);</div><div class='add'>+			mvmvif-&gt;roc_activity = ROC_NUM_ACTIVITIES;</div><div class='add'>+			iwl_mvm_roc_finished(mvm);</div><div class='add'>+		}</div><div class='add'>+		return false;</div><div class='add'>+	} else if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			       IWL_UCODE_TLV_CAPA_SESSION_PROT_CMD) &amp;&amp;</div><div class='add'>+		   id != HOT_SPOT_CMD) {</div><div class='add'>+		/* When session protection is used, the te_data-&gt;id field</div><div class='add'>+		 * is reused to save session protection's configuration.</div><div class='add'>+		 * For AUX ROC, HOT_SPOT_CMD is used and the te_data-&gt;id</div><div class='add'>+		 * field is set to HOT_SPOT_CMD.</div><div class='add'>+		 */</div><div class='ctx'> 		if (mvmvif &amp;&amp; id &lt; SESSION_PROTECT_CONF_MAX_ID) {</div><div class='ctx'> 			/* Session protection is still ongoing. Cancel it */</div><div class='del'>-			iwl_mvm_cancel_session_protection(mvm, mvmvif);</div><div class='del'>-			if (te_data-&gt;vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE) {</div><div class='del'>-				set_bit(IWL_MVM_STATUS_NEED_FLUSH_P2P, &amp;mvm-&gt;status);</div><div class='add'>+			iwl_mvm_cancel_session_protection(mvm, vif, id,</div><div class='add'>+							  link_id);</div><div class='add'>+			if (iftype == NL80211_IFTYPE_P2P_DEVICE) {</div><div class='ctx'> 				iwl_mvm_roc_finished(mvm);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -738,11 +919,6 @@ void iwl_mvm_remove_time_event(struct iwl_mvm *mvm,</div><div class='ctx'> 		IWL_ERR(mvm, "Couldn't remove the time event\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * When the firmware supports the session protection API,</div><div class='del'>- * this is not needed since it'll automatically remove the</div><div class='del'>- * session protection after association + beacon reception.</div><div class='del'>- */</div><div class='ctx'> void iwl_mvm_stop_session_protection(struct iwl_mvm *mvm,</div><div class='ctx'> 				     struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='hunk'>@@ -756,7 +932,15 @@ void iwl_mvm_stop_session_protection(struct iwl_mvm *mvm,</div><div class='ctx'> 	id = te_data-&gt;id;</div><div class='ctx'> 	spin_unlock_bh(&amp;mvm-&gt;time_event_lock);</div><div class='ctx'> </div><div class='del'>-	if (id != TE_BSS_STA_AGGRESSIVE_ASSOC) {</div><div class='add'>+	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			IWL_UCODE_TLV_CAPA_SESSION_PROT_CMD)) {</div><div class='add'>+		if (id != SESSION_PROTECT_CONF_ASSOC) {</div><div class='add'>+			IWL_DEBUG_TE(mvm,</div><div class='add'>+				     "don't remove session protection id=%u\n",</div><div class='add'>+				     id);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	} else if (id != TE_BSS_STA_AGGRESSIVE_ASSOC) {</div><div class='ctx'> 		IWL_DEBUG_TE(mvm,</div><div class='ctx'> 			     "don't remove TE with id=%u (not session protection)\n",</div><div class='ctx'> 			     id);</div><div class='hunk'>@@ -770,14 +954,15 @@ void iwl_mvm_rx_session_protect_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 				      struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl_mvm_session_prot_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+	struct iwl_session_prot_notif *notif = (void *)pkt-&gt;data;</div><div class='add'>+	int id = le32_to_cpu(notif-&gt;mac_link_id);</div><div class='ctx'> 	struct ieee80211_vif *vif;</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	vif = iwl_mvm_rcu_dereference_vif_id(mvm, le32_to_cpu(notif-&gt;mac_id),</div><div class='del'>-					     true);</div><div class='ctx'> </div><div class='add'>+	/* note we use link ID == MAC ID */</div><div class='add'>+	vif = iwl_mvm_rcu_dereference_vif_id(mvm, id, true);</div><div class='ctx'> 	if (!vif)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='hunk'>@@ -808,6 +993,8 @@ void iwl_mvm_rx_session_protect_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 			 * and know the dtim period.</div><div class='ctx'> 			 */</div><div class='ctx'> 			iwl_mvm_te_check_disconnect(mvm, vif,</div><div class='add'>+						    !vif-&gt;cfg.assoc ?</div><div class='add'>+						    "Not associated and the session protection is over already..." :</div><div class='ctx'> 						    "No beacon heard and the session protection is over already...");</div><div class='ctx'> 			spin_lock_bh(&amp;mvm-&gt;time_event_lock);</div><div class='ctx'> 			iwl_mvm_te_clear_data(mvm, te_data);</div><div class='hunk'>@@ -820,14 +1007,16 @@ void iwl_mvm_rx_session_protect_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 	if (!le32_to_cpu(notif-&gt;status) || !le32_to_cpu(notif-&gt;start)) {</div><div class='ctx'> 		/* End TE, notify mac80211 */</div><div class='ctx'> 		mvmvif-&gt;time_event_data.id = SESSION_PROTECT_CONF_MAX_ID;</div><div class='del'>-		ieee80211_remain_on_channel_expired(mvm-&gt;hw);</div><div class='del'>-		set_bit(IWL_MVM_STATUS_NEED_FLUSH_P2P, &amp;mvm-&gt;status);</div><div class='add'>+		mvmvif-&gt;time_event_data.link_id = -1;</div><div class='add'>+		/* set the bit so the ROC cleanup will actually clean up */</div><div class='add'>+		set_bit(IWL_MVM_STATUS_ROC_P2P_RUNNING, &amp;mvm-&gt;status);</div><div class='ctx'> 		iwl_mvm_roc_finished(mvm);</div><div class='add'>+		ieee80211_remain_on_channel_expired(mvm-&gt;hw);</div><div class='ctx'> 	} else if (le32_to_cpu(notif-&gt;start)) {</div><div class='ctx'> 		if (WARN_ON(mvmvif-&gt;time_event_data.id !=</div><div class='ctx'> 				le32_to_cpu(notif-&gt;conf_id)))</div><div class='ctx'> 			goto out_unlock;</div><div class='del'>-		set_bit(IWL_MVM_STATUS_ROC_RUNNING, &amp;mvm-&gt;status);</div><div class='add'>+		set_bit(IWL_MVM_STATUS_ROC_P2P_RUNNING, &amp;mvm-&gt;status);</div><div class='ctx'> 		ieee80211_ready_on_channel(mvm-&gt;hw); /* Start TE */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -835,6 +1024,105 @@ void iwl_mvm_rx_session_protect_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define AUX_ROC_MIN_DURATION MSEC_TO_TU(100)</div><div class='add'>+#define AUX_ROC_MIN_DELAY MSEC_TO_TU(200)</div><div class='add'>+#define AUX_ROC_MAX_DELAY MSEC_TO_TU(600)</div><div class='add'>+#define AUX_ROC_SAFETY_BUFFER MSEC_TO_TU(20)</div><div class='add'>+#define AUX_ROC_MIN_SAFETY_BUFFER MSEC_TO_TU(10)</div><div class='add'>+</div><div class='add'>+void iwl_mvm_roc_duration_and_delay(struct ieee80211_vif *vif,</div><div class='add'>+				    u32 duration_ms,</div><div class='add'>+				    u32 *duration_tu,</div><div class='add'>+				    u32 *delay)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+	u32 dtim_interval = 0;</div><div class='add'>+</div><div class='add'>+	*delay = AUX_ROC_MIN_DELAY;</div><div class='add'>+	*duration_tu = MSEC_TO_TU(duration_ms);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for_each_vif_active_link(vif, link_conf, link_id) {</div><div class='add'>+		dtim_interval =</div><div class='add'>+			max_t(u32, dtim_interval,</div><div class='add'>+			      link_conf-&gt;dtim_period * link_conf-&gt;beacon_int);</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we are associated we want the delay time to be at least one</div><div class='add'>+	 * dtim interval so that the FW can wait until after the DTIM and</div><div class='add'>+	 * then start the time event, this will potentially allow us to</div><div class='add'>+	 * remain off-channel for the max duration.</div><div class='add'>+	 * Since we want to use almost a whole dtim interval we would also</div><div class='add'>+	 * like the delay to be for 2-3 dtim intervals, in case there are</div><div class='add'>+	 * other time events with higher priority.</div><div class='add'>+	 * dtim_interval should never be 0, it can be 1 if we don't know it</div><div class='add'>+	 * (we haven't heard any beacon yet).</div><div class='add'>+	 */</div><div class='add'>+	if (vif-&gt;cfg.assoc &amp;&amp; !WARN_ON(!dtim_interval)) {</div><div class='add'>+		*delay = min_t(u32, dtim_interval * 3, AUX_ROC_MAX_DELAY);</div><div class='add'>+		/* We cannot remain off-channel longer than the DTIM interval */</div><div class='add'>+		if (dtim_interval &lt;= *duration_tu) {</div><div class='add'>+			*duration_tu = dtim_interval - AUX_ROC_SAFETY_BUFFER;</div><div class='add'>+			if (*duration_tu &lt;= AUX_ROC_MIN_DURATION)</div><div class='add'>+				*duration_tu = dtim_interval -</div><div class='add'>+					AUX_ROC_MIN_SAFETY_BUFFER;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_roc_add_cmd(struct iwl_mvm *mvm,</div><div class='add'>+			struct ieee80211_channel *channel,</div><div class='add'>+			struct ieee80211_vif *vif,</div><div class='add'>+			int duration, enum iwl_roc_activity activity)</div><div class='add'>+{</div><div class='add'>+	int res;</div><div class='add'>+	u32 duration_tu, delay;</div><div class='add'>+	struct iwl_roc_req roc_req = {</div><div class='add'>+		.action = cpu_to_le32(FW_CTXT_ACTION_ADD),</div><div class='add'>+		.activity = cpu_to_le32(activity),</div><div class='add'>+		.sta_id = cpu_to_le32(mvm-&gt;aux_sta.sta_id),</div><div class='add'>+	};</div><div class='add'>+	u8 ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, WIDE_ID(MAC_CONF_GROUP, ROC_CMD), 0);</div><div class='add'>+	u16 cmd_len = ver &lt; 6 ? sizeof(struct iwl_roc_req_v5) : sizeof(roc_req);</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(mvmvif-&gt;roc_activity != ROC_NUM_ACTIVITIES))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/* Set the channel info data */</div><div class='add'>+	iwl_mvm_set_chan_info(mvm, &amp;roc_req.channel_info,</div><div class='add'>+			      channel-&gt;hw_value,</div><div class='add'>+			      iwl_mvm_phy_band_from_nl80211(channel-&gt;band),</div><div class='add'>+			      IWL_PHY_CHANNEL_MODE20, 0);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_roc_duration_and_delay(vif, duration, &amp;duration_tu,</div><div class='add'>+				       &amp;delay);</div><div class='add'>+	roc_req.duration = cpu_to_le32(duration_tu);</div><div class='add'>+	roc_req.max_delay = cpu_to_le32(delay);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_TE(mvm,</div><div class='add'>+		     "\t(requested = %ums, max_delay = %ums)\n",</div><div class='add'>+		     duration, delay);</div><div class='add'>+	IWL_DEBUG_TE(mvm,</div><div class='add'>+		     "Requesting to remain on channel %u for %utu. activity %u\n",</div><div class='add'>+		     channel-&gt;hw_value, duration_tu, activity);</div><div class='add'>+</div><div class='add'>+	/* Set the node address */</div><div class='add'>+	memcpy(roc_req.node_addr, vif-&gt;addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	res = iwl_mvm_send_cmd_pdu(mvm, WIDE_ID(MAC_CONF_GROUP, ROC_CMD),</div><div class='add'>+				   0, cmd_len, &amp;roc_req);</div><div class='add'>+	if (!res)</div><div class='add'>+		mvmvif-&gt;roc_activity = activity;</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> iwl_mvm_start_p2p_roc_session_protection(struct iwl_mvm *mvm,</div><div class='ctx'> 					 struct ieee80211_vif *vif,</div><div class='hunk'>@@ -842,10 +1130,9 @@ iwl_mvm_start_p2p_roc_session_protection(struct iwl_mvm *mvm,</div><div class='ctx'> 					 enum ieee80211_roc_type type)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-	struct iwl_mvm_session_prot_cmd cmd = {</div><div class='add'>+	struct iwl_session_prot_cmd cmd = {</div><div class='ctx'> 		.id_and_color =</div><div class='del'>-			cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif-&gt;id,</div><div class='del'>-							mvmvif-&gt;color)),</div><div class='add'>+			cpu_to_le32(iwl_mvm_get_session_prot_id(mvm, vif, 0)),</div><div class='ctx'> 		.action = cpu_to_le32(FW_CTXT_ACTION_ADD),</div><div class='ctx'> 		.duration_tu = cpu_to_le32(MSEC_TO_TU(duration)),</div><div class='ctx'> 	};</div><div class='hunk'>@@ -855,6 +1142,9 @@ iwl_mvm_start_p2p_roc_session_protection(struct iwl_mvm *mvm,</div><div class='ctx'> 	/* The time_event_data.id field is reused to save session</div><div class='ctx'> 	 * protection's configuration.</div><div class='ctx'> 	 */</div><div class='add'>+</div><div class='add'>+	mvmvif-&gt;time_event_data.link_id = 0;</div><div class='add'>+</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case IEEE80211_ROC_TYPE_NORMAL:</div><div class='ctx'> 		mvmvif-&gt;time_event_data.id =</div><div class='hunk'>@@ -870,8 +1160,8 @@ iwl_mvm_start_p2p_roc_session_protection(struct iwl_mvm *mvm,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cmd.conf_id = cpu_to_le32(mvmvif-&gt;time_event_data.id);</div><div class='del'>-	return iwl_mvm_send_cmd_pdu(mvm, iwl_cmd_id(SESSION_PROTECTION_CMD,</div><div class='del'>-						    MAC_CONF_GROUP, 0),</div><div class='add'>+	return iwl_mvm_send_cmd_pdu(mvm,</div><div class='add'>+				    WIDE_ID(MAC_CONF_GROUP, SESSION_PROTECTION_CMD),</div><div class='ctx'> 				    0, sizeof(cmd), &amp;cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -973,42 +1263,69 @@ void iwl_mvm_cleanup_roc_te(struct iwl_mvm *mvm)</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_stop_roc(struct iwl_mvm *mvm, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm_vif *mvmvif;</div><div class='add'>+	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	struct iwl_mvm_time_event_data *te_data;</div><div class='add'>+	bool p2p_aux = iwl_mvm_has_p2p_over_aux(mvm);</div><div class='add'>+	u8 roc_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw,</div><div class='add'>+					   WIDE_ID(MAC_CONF_GROUP, ROC_CMD), 0);</div><div class='add'>+	int iftype = vif-&gt;type;</div><div class='ctx'> </div><div class='del'>-	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='del'>-			IWL_UCODE_TLV_CAPA_SESSION_PROT_CMD)) {</div><div class='del'>-		mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-		if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE) {</div><div class='del'>-			iwl_mvm_cancel_session_protection(mvm, mvmvif);</div><div class='del'>-			set_bit(IWL_MVM_STATUS_NEED_FLUSH_P2P, &amp;mvm-&gt;status);</div><div class='add'>+	if (p2p_aux || (roc_ver &gt;= 3 &amp;&amp; iftype != NL80211_IFTYPE_P2P_DEVICE)) {</div><div class='add'>+		if (mvmvif-&gt;roc_activity &lt; ROC_NUM_ACTIVITIES) {</div><div class='add'>+			iwl_mvm_roc_rm_cmd(mvm, mvmvif-&gt;roc_activity);</div><div class='add'>+			mvmvif-&gt;roc_activity = ROC_NUM_ACTIVITIES;</div><div class='add'>+		}</div><div class='add'>+		goto cleanup_roc;</div><div class='add'>+	} else if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			       IWL_UCODE_TLV_CAPA_SESSION_PROT_CMD)) {</div><div class='add'>+		te_data = &amp;mvmvif-&gt;time_event_data;</div><div class='add'>+</div><div class='add'>+		if (iftype == NL80211_IFTYPE_P2P_DEVICE) {</div><div class='add'>+			if (te_data-&gt;id &gt;= SESSION_PROTECT_CONF_MAX_ID) {</div><div class='add'>+				IWL_DEBUG_TE(mvm,</div><div class='add'>+					     "No remain on channel event\n");</div><div class='add'>+				mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+			iwl_mvm_cancel_session_protection(mvm, vif,</div><div class='add'>+							  te_data-&gt;id,</div><div class='add'>+							  te_data-&gt;link_id);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			iwl_mvm_remove_aux_roc_te(mvm, mvmvif,</div><div class='del'>-						  &amp;mvmvif-&gt;time_event_data);</div><div class='add'>+						  &amp;mvmvif-&gt;hs_time_event_data);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		iwl_mvm_roc_finished(mvm);</div><div class='del'>-</div><div class='del'>-		return;</div><div class='add'>+		goto cleanup_roc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	te_data = iwl_mvm_get_roc_te(mvm);</div><div class='ctx'> 	if (!te_data) {</div><div class='ctx'> 		IWL_WARN(mvm, "No remain on channel event\n");</div><div class='add'>+		mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mvmvif = iwl_mvm_vif_from_mac80211(te_data-&gt;vif);</div><div class='del'>-</div><div class='del'>-	if (te_data-&gt;vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE) {</div><div class='add'>+	iftype = te_data-&gt;vif-&gt;type;</div><div class='add'>+	if (iftype == NL80211_IFTYPE_P2P_DEVICE)</div><div class='ctx'> 		iwl_mvm_remove_time_event(mvm, mvmvif, te_data);</div><div class='del'>-		set_bit(IWL_MVM_STATUS_NEED_FLUSH_P2P, &amp;mvm-&gt;status);</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		iwl_mvm_remove_aux_roc_te(mvm, mvmvif, te_data);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_roc_finished(mvm);</div><div class='add'>+cleanup_roc:</div><div class='add'>+	/*</div><div class='add'>+	 * In case we get here before the ROC event started,</div><div class='add'>+	 * (so the status bit isn't set) set it here so iwl_mvm_cleanup_roc will</div><div class='add'>+	 * cleanup things properly</div><div class='add'>+	 */</div><div class='add'>+	if (p2p_aux || iftype != NL80211_IFTYPE_P2P_DEVICE)</div><div class='add'>+		set_bit(IWL_MVM_STATUS_ROC_AUX_RUNNING, &amp;mvm-&gt;status);</div><div class='add'>+	else</div><div class='add'>+		set_bit(IWL_MVM_STATUS_ROC_P2P_RUNNING, &amp;mvm-&gt;status);</div><div class='add'>+</div><div class='add'>+	/* Mutex is released inside this function */</div><div class='add'>+	iwl_mvm_cleanup_roc(mvm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_remove_csa_period(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -1082,7 +1399,7 @@ static bool iwl_mvm_session_prot_notif(struct iwl_notif_wait_data *notif_wait,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm =</div><div class='ctx'> 		container_of(notif_wait, struct iwl_mvm, notif_wait);</div><div class='del'>-	struct iwl_mvm_session_prot_notif *resp;</div><div class='add'>+	struct iwl_session_prot_notif *resp;</div><div class='ctx'> 	int resp_len = iwl_rx_packet_payload_len(pkt);</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(pkt-&gt;hdr.cmd != SESSION_PROTECTION_NOTIF ||</div><div class='hunk'>@@ -1106,31 +1423,28 @@ static bool iwl_mvm_session_prot_notif(struct iwl_notif_wait_data *notif_wait,</div><div class='ctx'> void iwl_mvm_schedule_session_protection(struct iwl_mvm *mvm,</div><div class='ctx'> 					 struct ieee80211_vif *vif,</div><div class='ctx'> 					 u32 duration, u32 min_duration,</div><div class='del'>-					 bool wait_for_notif)</div><div class='add'>+					 bool wait_for_notif,</div><div class='add'>+					 unsigned int link_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	struct iwl_mvm_time_event_data *te_data = &amp;mvmvif-&gt;time_event_data;</div><div class='del'>-	const u16 notif[] = { iwl_cmd_id(SESSION_PROTECTION_NOTIF,</div><div class='del'>-					 MAC_CONF_GROUP, 0) };</div><div class='add'>+	const u16 notif[] = { WIDE_ID(MAC_CONF_GROUP, SESSION_PROTECTION_NOTIF) };</div><div class='ctx'> 	struct iwl_notification_wait wait_notif;</div><div class='del'>-	struct iwl_mvm_session_prot_cmd cmd = {</div><div class='del'>-		.id_and_color =</div><div class='del'>-			cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif-&gt;id,</div><div class='del'>-							mvmvif-&gt;color)),</div><div class='add'>+	int mac_link_id = iwl_mvm_get_session_prot_id(mvm, vif, (s8)link_id);</div><div class='add'>+	struct iwl_session_prot_cmd cmd = {</div><div class='add'>+		.id_and_color = cpu_to_le32(mac_link_id),</div><div class='ctx'> 		.action = cpu_to_le32(FW_CTXT_ACTION_ADD),</div><div class='add'>+		.conf_id = cpu_to_le32(SESSION_PROTECT_CONF_ASSOC),</div><div class='ctx'> 		.duration_tu = cpu_to_le32(MSEC_TO_TU(duration)),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	/* The time_event_data.id field is reused to save session</div><div class='del'>-	 * protection's configuration.</div><div class='del'>-	 */</div><div class='del'>-	mvmvif-&gt;time_event_data.id = SESSION_PROTECT_CONF_ASSOC;</div><div class='del'>-	cmd.conf_id = cpu_to_le32(mvmvif-&gt;time_event_data.id);</div><div class='add'>+	if (mac_link_id &lt; 0)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;mvm-&gt;time_event_lock);</div><div class='del'>-	if (te_data-&gt;running &amp;&amp;</div><div class='add'>+	if (te_data-&gt;running &amp;&amp; te_data-&gt;link_id == link_id &amp;&amp;</div><div class='ctx'> 	    time_after(te_data-&gt;end_jiffies, TU_TO_EXP_TIME(min_duration))) {</div><div class='ctx'> 		IWL_DEBUG_TE(mvm, "We have enough time in the current TE: %u\n",</div><div class='ctx'> 			     jiffies_to_msecs(te_data-&gt;end_jiffies - jiffies));</div><div class='hunk'>@@ -1140,7 +1454,14 @@ void iwl_mvm_schedule_session_protection(struct iwl_mvm *mvm,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_te_clear_data(mvm, te_data);</div><div class='add'>+	/*</div><div class='add'>+	 * The time_event_data.id field is reused to save session</div><div class='add'>+	 * protection's configuration.</div><div class='add'>+	 */</div><div class='add'>+	te_data-&gt;id = le32_to_cpu(cmd.conf_id);</div><div class='ctx'> 	te_data-&gt;duration = le32_to_cpu(cmd.duration_tu);</div><div class='add'>+	te_data-&gt;vif = vif;</div><div class='add'>+	te_data-&gt;link_id = link_id;</div><div class='ctx'> 	spin_unlock_bh(&amp;mvm-&gt;time_event_lock);</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_TE(mvm, "Add new session protection, duration %d TU\n",</div><div class='hunk'>@@ -1148,14 +1469,9 @@ void iwl_mvm_schedule_session_protection(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	if (!wait_for_notif) {</div><div class='ctx'> 		if (iwl_mvm_send_cmd_pdu(mvm,</div><div class='del'>-					 iwl_cmd_id(SESSION_PROTECTION_CMD,</div><div class='del'>-						    MAC_CONF_GROUP, 0),</div><div class='add'>+					 WIDE_ID(MAC_CONF_GROUP, SESSION_PROTECTION_CMD),</div><div class='ctx'> 					 0, sizeof(cmd), &amp;cmd)) {</div><div class='del'>-			IWL_ERR(mvm,</div><div class='del'>-				"Couldn't send the SESSION_PROTECTION_CMD\n");</div><div class='del'>-			spin_lock_bh(&amp;mvm-&gt;time_event_lock);</div><div class='del'>-			iwl_mvm_te_clear_data(mvm, te_data);</div><div class='del'>-			spin_unlock_bh(&amp;mvm-&gt;time_event_lock);</div><div class='add'>+			goto send_cmd_err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1166,15 +1482,21 @@ void iwl_mvm_schedule_session_protection(struct iwl_mvm *mvm,</div><div class='ctx'> 				   iwl_mvm_session_prot_notif, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_mvm_send_cmd_pdu(mvm,</div><div class='del'>-				 iwl_cmd_id(SESSION_PROTECTION_CMD,</div><div class='del'>-					    MAC_CONF_GROUP, 0),</div><div class='add'>+				 WIDE_ID(MAC_CONF_GROUP, SESSION_PROTECTION_CMD),</div><div class='ctx'> 				 0, sizeof(cmd), &amp;cmd)) {</div><div class='del'>-		IWL_ERR(mvm,</div><div class='del'>-			"Couldn't send the SESSION_PROTECTION_CMD\n");</div><div class='ctx'> 		iwl_remove_notification(&amp;mvm-&gt;notif_wait, &amp;wait_notif);</div><div class='add'>+		goto send_cmd_err;</div><div class='ctx'> 	} else if (iwl_wait_notification(&amp;mvm-&gt;notif_wait, &amp;wait_notif,</div><div class='ctx'> 					 TU_TO_JIFFIES(100))) {</div><div class='ctx'> 		IWL_ERR(mvm,</div><div class='ctx'> 			"Failed to protect session until session protection\n");</div><div class='ctx'> 	}</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+send_cmd_err:</div><div class='add'>+	IWL_ERR(mvm,</div><div class='add'>+		"Couldn't send the SESSION_PROTECTION_CMD\n");</div><div class='add'>+	spin_lock_bh(&amp;mvm-&gt;time_event_lock);</div><div class='add'>+	iwl_mvm_te_clear_data(mvm, te_data);</div><div class='add'>+	spin_unlock_bh(&amp;mvm-&gt;time_event_lock);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/time-event.h b/drivers/net/wireless/intel/iwlwifi/mvm/time-event.h<br/>index 989a5319fb21..1ef8768756db 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/time-event.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/time-event.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/time-event.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/time-event.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2019-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2019-2020, 2023, 2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2014 Intel Mobile Communications GmbH</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __time_event_h__</div><div class='hunk'>@@ -101,6 +101,14 @@ void iwl_mvm_rx_time_event_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 				 struct iwl_rx_cmd_buffer *rxb);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * iwl_mvm_rx_roc_notif - handles %DISCOVERY_ROC_NTF.</div><div class='add'>+ * @mvm: the mvm component</div><div class='add'>+ * @rxb: RX buffer</div><div class='add'>+ */</div><div class='add'>+void iwl_mvm_rx_roc_notif(struct iwl_mvm *mvm,</div><div class='add'>+			  struct iwl_rx_cmd_buffer *rxb);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * iwl_mvm_start_p2p_roc - start remain on channel for p2p device functionality</div><div class='ctx'>  * @mvm: the mvm component</div><div class='ctx'>  * @vif: the virtual interface for which the roc is requested. It is assumed</div><div class='hunk'>@@ -116,6 +124,8 @@ void iwl_mvm_rx_time_event_notif(struct iwl_mvm *mvm,</div><div class='ctx'>  * ROC request, it will issue a notification to the driver that it is on the</div><div class='ctx'>  * requested channel. Once the FW completes the ROC request it will issue</div><div class='ctx'>  * another notification to the driver.</div><div class='add'>+ *</div><div class='add'>+ * Return: negative error code or 0 on success</div><div class='ctx'>  */</div><div class='ctx'> int iwl_mvm_start_p2p_roc(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 			  int duration, enum ieee80211_roc_type type);</div><div class='hunk'>@@ -134,7 +144,7 @@ void iwl_mvm_stop_roc(struct iwl_mvm *mvm, struct ieee80211_vif *vif);</div><div class='ctx'> /**</div><div class='ctx'>  * iwl_mvm_remove_time_event - general function to clean up of time event</div><div class='ctx'>  * @mvm: the mvm component</div><div class='del'>- * @vif: the vif to which the time event belongs</div><div class='add'>+ * @mvmvif: the vif to which the time event belongs</div><div class='ctx'>  * @te_data: the time event data that corresponds to that time event</div><div class='ctx'>  *</div><div class='ctx'>  * This function can be used to cancel a time event regardless its type.</div><div class='hunk'>@@ -171,6 +181,8 @@ void iwl_mvm_remove_csa_period(struct iwl_mvm *mvm,</div><div class='ctx'>  *</div><div class='ctx'>  * This function is used to schedule NoA time event and is used to perform</div><div class='ctx'>  * the channel switch flow.</div><div class='add'>+ *</div><div class='add'>+ * Return: negative error code or 0 on success</div><div class='ctx'>  */</div><div class='ctx'> int iwl_mvm_schedule_csa_period(struct iwl_mvm *mvm,</div><div class='ctx'> 				struct ieee80211_vif *vif,</div><div class='hunk'>@@ -180,7 +192,7 @@ int iwl_mvm_schedule_csa_period(struct iwl_mvm *mvm,</div><div class='ctx'>  * iwl_mvm_te_scheduled - check if the fw received the TE cmd</div><div class='ctx'>  * @te_data: the time event data that corresponds to that time event</div><div class='ctx'>  *</div><div class='del'>- * This function returns true iff this TE is added to the fw.</div><div class='add'>+ * Return: %true if this TE is added to the fw, %false otherwise</div><div class='ctx'>  */</div><div class='ctx'> static inline bool</div><div class='ctx'> iwl_mvm_te_scheduled(struct iwl_mvm_time_event_data *te_data)</div><div class='hunk'>@@ -195,16 +207,21 @@ iwl_mvm_te_scheduled(struct iwl_mvm_time_event_data *te_data)</div><div class='ctx'>  * iwl_mvm_schedule_session_protection - schedule a session protection</div><div class='ctx'>  * @mvm: the mvm component</div><div class='ctx'>  * @vif: the virtual interface for which the protection issued</div><div class='del'>- * @duration: the duration of the protection</div><div class='add'>+ * @duration: the requested duration of the protection</div><div class='add'>+ * @min_duration: the minimum duration of the protection</div><div class='ctx'>  * @wait_for_notif: if true, will block until the start of the protection</div><div class='add'>+ * @link_id: The link to schedule a session protection for</div><div class='ctx'>  */</div><div class='ctx'> void iwl_mvm_schedule_session_protection(struct iwl_mvm *mvm,</div><div class='ctx'> 					 struct ieee80211_vif *vif,</div><div class='ctx'> 					 u32 duration, u32 min_duration,</div><div class='del'>-					 bool wait_for_notif);</div><div class='add'>+					 bool wait_for_notif,</div><div class='add'>+					 unsigned int link_id);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * iwl_mvm_rx_session_protect_notif - handles %SESSION_PROTECTION_NOTIF</div><div class='add'>+ * @mvm: the mvm component</div><div class='add'>+ * @rxb: the RX buffer containing the notification</div><div class='ctx'>  */</div><div class='ctx'> void iwl_mvm_rx_session_protect_notif(struct iwl_mvm *mvm,</div><div class='ctx'> 				      struct iwl_rx_cmd_buffer *rxb);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/time-sync.c b/drivers/net/wireless/intel/iwlwifi/mvm/time-sync.c<br/>new file mode 100644<br/>index 000000000000..edae3e24192b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/time-sync.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/time-sync.c</a></div><div class='hunk'>@@ -0,0 +1,173 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2022 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "mvm.h"</div><div class='add'>+#include "time-sync.h"</div><div class='add'>+#include &lt;linux/ieee80211.h&gt;</div><div class='add'>+</div><div class='add'>+void iwl_mvm_init_time_sync(struct iwl_time_sync_data *data)</div><div class='add'>+{</div><div class='add'>+	skb_queue_head_init(&amp;data-&gt;frame_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_mvm_is_skb_match(struct sk_buff *skb, u8 *addr, u8 dialog_token)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_mgmt *mgmt = (void *)skb-&gt;data;</div><div class='add'>+	u8 skb_dialog_token;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_timing_measurement(skb))</div><div class='add'>+		skb_dialog_token = mgmt-&gt;u.action.u.wnm_timing_msr.dialog_token;</div><div class='add'>+	else</div><div class='add'>+		skb_dialog_token = mgmt-&gt;u.action.u.ftm.dialog_token;</div><div class='add'>+</div><div class='add'>+	if ((ether_addr_equal(mgmt-&gt;sa, addr) ||</div><div class='add'>+	     ether_addr_equal(mgmt-&gt;da, addr)) &amp;&amp;</div><div class='add'>+	    skb_dialog_token == dialog_token)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *iwl_mvm_time_sync_find_skb(struct iwl_mvm *mvm, u8 *addr,</div><div class='add'>+						  u8 dialog_token)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	/* The queue is expected to have only one SKB. If there are other SKBs</div><div class='add'>+	 * in the queue, they did not get a time sync notification and are</div><div class='add'>+	 * probably obsolete by now, so drop them.</div><div class='add'>+	 */</div><div class='add'>+	while ((skb = skb_dequeue(&amp;mvm-&gt;time_sync.frame_list))) {</div><div class='add'>+		if (iwl_mvm_is_skb_match(skb, addr, dialog_token))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		skb = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 iwl_mvm_get_64_bit(__le32 high, __le32 low)</div><div class='add'>+{</div><div class='add'>+	return ((u64)le32_to_cpu(high) &lt;&lt; 32) | le32_to_cpu(low);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_time_sync_msmt_event(struct iwl_mvm *mvm,</div><div class='add'>+				  struct iwl_rx_cmd_buffer *rxb)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='add'>+	struct iwl_time_msmt_notify *notif = (void *)pkt-&gt;data;</div><div class='add'>+	struct ieee80211_rx_status *rx_status;</div><div class='add'>+	struct skb_shared_hwtstamps *shwt;</div><div class='add'>+	u64 ts_10ns;</div><div class='add'>+	struct sk_buff *skb =</div><div class='add'>+		iwl_mvm_time_sync_find_skb(mvm, notif-&gt;peer_addr,</div><div class='add'>+					   le32_to_cpu(notif-&gt;dialog_token));</div><div class='add'>+	u64 adj_time;</div><div class='add'>+</div><div class='add'>+	if (!skb) {</div><div class='add'>+		IWL_DEBUG_INFO(mvm, "Time sync event but no pending skb\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ts_10ns = iwl_mvm_get_64_bit(notif-&gt;t2_hi, notif-&gt;t2_lo);</div><div class='add'>+	adj_time = iwl_mvm_ptp_get_adj_time(mvm, ts_10ns * 10);</div><div class='add'>+	shwt = skb_hwtstamps(skb);</div><div class='add'>+	shwt-&gt;hwtstamp = ktime_set(0, adj_time);</div><div class='add'>+</div><div class='add'>+	ts_10ns = iwl_mvm_get_64_bit(notif-&gt;t3_hi, notif-&gt;t3_lo);</div><div class='add'>+	adj_time = iwl_mvm_ptp_get_adj_time(mvm, ts_10ns * 10);</div><div class='add'>+	rx_status = IEEE80211_SKB_RXCB(skb);</div><div class='add'>+	rx_status-&gt;ack_tx_hwtstamp = ktime_set(0, adj_time);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(mvm,</div><div class='add'>+		       "Time sync: RX event - report frame t2=%llu t3=%llu\n",</div><div class='add'>+		       ktime_to_ns(shwt-&gt;hwtstamp),</div><div class='add'>+		       ktime_to_ns(rx_status-&gt;ack_tx_hwtstamp));</div><div class='add'>+	ieee80211_rx_napi(mvm-&gt;hw, NULL, skb, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_time_sync_msmt_confirm_event(struct iwl_mvm *mvm,</div><div class='add'>+					  struct iwl_rx_cmd_buffer *rxb)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='add'>+	struct iwl_time_msmt_cfm_notify *notif = (void *)pkt-&gt;data;</div><div class='add'>+	struct ieee80211_tx_status status = {};</div><div class='add'>+	struct skb_shared_hwtstamps *shwt;</div><div class='add'>+	u64 ts_10ns, adj_time;</div><div class='add'>+</div><div class='add'>+	status.skb =</div><div class='add'>+		iwl_mvm_time_sync_find_skb(mvm, notif-&gt;peer_addr,</div><div class='add'>+					   le32_to_cpu(notif-&gt;dialog_token));</div><div class='add'>+</div><div class='add'>+	if (!status.skb) {</div><div class='add'>+		IWL_DEBUG_INFO(mvm, "Time sync confirm but no pending skb\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ts_10ns = iwl_mvm_get_64_bit(notif-&gt;t1_hi, notif-&gt;t1_lo);</div><div class='add'>+	adj_time = iwl_mvm_ptp_get_adj_time(mvm, ts_10ns * 10);</div><div class='add'>+	shwt = skb_hwtstamps(status.skb);</div><div class='add'>+	shwt-&gt;hwtstamp = ktime_set(0, adj_time);</div><div class='add'>+</div><div class='add'>+	ts_10ns = iwl_mvm_get_64_bit(notif-&gt;t4_hi, notif-&gt;t4_lo);</div><div class='add'>+	adj_time = iwl_mvm_ptp_get_adj_time(mvm, ts_10ns * 10);</div><div class='add'>+	status.info = IEEE80211_SKB_CB(status.skb);</div><div class='add'>+	status.ack_hwtstamp = ktime_set(0, adj_time);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(mvm,</div><div class='add'>+		       "Time sync: TX event - report frame t1=%llu t4=%llu\n",</div><div class='add'>+		       ktime_to_ns(shwt-&gt;hwtstamp),</div><div class='add'>+		       ktime_to_ns(status.ack_hwtstamp));</div><div class='add'>+	ieee80211_tx_status_ext(mvm-&gt;hw, &amp;status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_mvm_time_sync_config(struct iwl_mvm *mvm, const u8 *addr, u32 protocols)</div><div class='add'>+{</div><div class='add'>+	struct iwl_time_sync_cfg_cmd cmd = {};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			 IWL_UCODE_TLV_CAPA_TIME_SYNC_BOTH_FTM_TM))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* The fw only supports one peer. We do allow reconfiguration of the</div><div class='add'>+	 * same peer for cases of fw reset etc.</div><div class='add'>+	 */</div><div class='add'>+	if (mvm-&gt;time_sync.active &amp;&amp;</div><div class='add'>+	    !ether_addr_equal(addr, mvm-&gt;time_sync.peer_addr)) {</div><div class='add'>+		IWL_DEBUG_INFO(mvm, "Time sync: reject config for peer: %pM\n",</div><div class='add'>+			       addr);</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (protocols &amp; ~(IWL_TIME_SYNC_PROTOCOL_TM |</div><div class='add'>+			  IWL_TIME_SYNC_PROTOCOL_FTM))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cmd.protocols = cpu_to_le32(protocols);</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(cmd.peer_addr, addr);</div><div class='add'>+</div><div class='add'>+	err = iwl_mvm_send_cmd_pdu(mvm,</div><div class='add'>+				   WIDE_ID(DATA_PATH_GROUP,</div><div class='add'>+					   WNM_80211V_TIMING_MEASUREMENT_CONFIG_CMD),</div><div class='add'>+				   0, sizeof(cmd), &amp;cmd);</div><div class='add'>+	if (err) {</div><div class='add'>+		IWL_ERR(mvm, "Failed to send time sync cfg cmd: %d\n", err);</div><div class='add'>+	} else {</div><div class='add'>+		mvm-&gt;time_sync.active = protocols != 0;</div><div class='add'>+		ether_addr_copy(mvm-&gt;time_sync.peer_addr, addr);</div><div class='add'>+		IWL_DEBUG_INFO(mvm, "Time sync: set peer addr=%pM\n", addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mvm-&gt;time_sync.active)</div><div class='add'>+		skb_queue_purge(&amp;mvm-&gt;time_sync.frame_list);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/time-sync.h b/drivers/net/wireless/intel/iwlwifi/mvm/time-sync.h<br/>new file mode 100644<br/>index 000000000000..2cfd0fb5e781<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/time-sync.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/time-sync.h</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2022 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#ifndef __TIME_SYNC_H__</div><div class='add'>+#define __TIME_SYNC_H__</div><div class='add'>+</div><div class='add'>+#include "mvm.h"</div><div class='add'>+#include &lt;linux/ieee80211.h&gt;</div><div class='add'>+</div><div class='add'>+void iwl_mvm_init_time_sync(struct iwl_time_sync_data *data);</div><div class='add'>+void iwl_mvm_time_sync_msmt_event(struct iwl_mvm *mvm,</div><div class='add'>+				  struct iwl_rx_cmd_buffer *rxb);</div><div class='add'>+void iwl_mvm_time_sync_msmt_confirm_event(struct iwl_mvm *mvm,</div><div class='add'>+					  struct iwl_rx_cmd_buffer *rxb);</div><div class='add'>+int iwl_mvm_time_sync_config(struct iwl_mvm *mvm, const u8 *addr,</div><div class='add'>+			     u32 protocols);</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+bool iwl_mvm_time_sync_frame(struct iwl_mvm *mvm, struct sk_buff *skb, u8 *addr)</div><div class='add'>+{</div><div class='add'>+	if (ether_addr_equal(mvm-&gt;time_sync.peer_addr, addr) &amp;&amp;</div><div class='add'>+	    (ieee80211_is_timing_measurement(skb) || ieee80211_is_ftm(skb))) {</div><div class='add'>+		skb_queue_tail(&amp;mvm-&gt;time_sync.frame_list, skb);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c<br/>index 398390c59344..53bab21ebae2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/tt.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/tt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/tt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/tt.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2019-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2019-2022, 2024-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2015-2016 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -8,6 +8,9 @@</div><div class='ctx'> </div><div class='ctx'> #include "mvm.h"</div><div class='ctx'> </div><div class='add'>+#define IWL_MVM_NUM_CTDP_STEPS		20</div><div class='add'>+#define IWL_MVM_MIN_CTDP_BUDGET_MW	150</div><div class='add'>+</div><div class='ctx'> #define IWL_MVM_TEMP_NOTIF_WAIT_TIMEOUT	HZ</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_enter_ctkill(struct iwl_mvm *mvm)</div><div class='hunk'>@@ -105,7 +108,7 @@ static bool iwl_mvm_temp_notif_wait(struct iwl_notif_wait_data *notif_wait,</div><div class='ctx'> void iwl_mvm_temp_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl_dts_measurement_notif_v2 *notif_v2;</div><div class='add'>+	struct iwl_dts_measurement_notif *notif_v2;</div><div class='ctx'> 	int len = iwl_rx_packet_payload_len(pkt);</div><div class='ctx'> 	int temp;</div><div class='ctx'> 	u32 ths_crossed;</div><div class='hunk'>@@ -160,6 +163,11 @@ void iwl_mvm_ct_kill_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> 	notif = (struct ct_kill_notif *)pkt-&gt;data;</div><div class='ctx'> 	IWL_DEBUG_TEMP(mvm, "CT Kill notification temperature = %d\n",</div><div class='ctx'> 		       notif-&gt;temperature);</div><div class='add'>+	if (iwl_fw_lookup_notif_ver(mvm-&gt;fw, PHY_OPS_GROUP,</div><div class='add'>+				    CT_KILL_NOTIFICATION, 0) &gt; 1)</div><div class='add'>+		IWL_DEBUG_TEMP(mvm,</div><div class='add'>+			       "CT kill notification DTS bitmap = 0x%x, Scheme = %d\n",</div><div class='add'>+			       notif-&gt;dts, notif-&gt;scheme);</div><div class='ctx'> </div><div class='ctx'> 	iwl_mvm_enter_ctkill(mvm);</div><div class='ctx'> }</div><div class='hunk'>@@ -240,8 +248,8 @@ int iwl_mvm_get_temp(struct iwl_mvm *mvm, s32 *temp)</div><div class='ctx'> 	 * a response. For older versions we send the command and wait for a</div><div class='ctx'> 	 * notification (no command TLV for previous versions).</div><div class='ctx'> 	 */</div><div class='del'>-	cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw, PHY_OPS_GROUP,</div><div class='del'>-					CMD_DTS_MEASUREMENT_TRIGGER_WIDE,</div><div class='add'>+	cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw,</div><div class='add'>+					WIDE_ID(PHY_OPS_GROUP, CMD_DTS_MEASUREMENT_TRIGGER_WIDE),</div><div class='ctx'> 					IWL_FW_CMD_VER_UNKNOWN);</div><div class='ctx'> 	if (cmd_ver == 1)</div><div class='ctx'> 		return iwl_mvm_send_temp_cmd(mvm, true, temp);</div><div class='hunk'>@@ -294,7 +302,7 @@ static void check_exit_ctkill(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_mvm_get_temp(mvm, &amp;temp);</div><div class='ctx'> </div><div class='del'>-	__iwl_mvm_mac_stop(mvm);</div><div class='add'>+	__iwl_mvm_mac_stop(mvm, false);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto reschedule;</div><div class='hunk'>@@ -329,7 +337,7 @@ static void iwl_mvm_tt_smps_iterator(void *_data, u8 *mac,</div><div class='ctx'> 	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_update_smps(mvm, vif, IWL_MVM_SMPS_REQ_TT, smps_mode);</div><div class='add'>+	iwl_mvm_update_smps(mvm, vif, IWL_MVM_SMPS_REQ_TT, smps_mode, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_tt_tx_protection(struct iwl_mvm *mvm, bool enable)</div><div class='hunk'>@@ -474,43 +482,28 @@ static const struct iwl_tt_params iwl_mvm_default_tt_params = {</div><div class='ctx'> 	.support_tx_backoff = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* budget in mWatt */</div><div class='del'>-static const u32 iwl_mvm_cdev_budgets[] = {</div><div class='del'>-	2400,	/* cooling state 0 */</div><div class='del'>-	2000,	/* cooling state 1 */</div><div class='del'>-	1800,	/* cooling state 2 */</div><div class='del'>-	1600,	/* cooling state 3 */</div><div class='del'>-	1400,	/* cooling state 4 */</div><div class='del'>-	1200,	/* cooling state 5 */</div><div class='del'>-	1000,	/* cooling state 6 */</div><div class='del'>-	900,	/* cooling state 7 */</div><div class='del'>-	800,	/* cooling state 8 */</div><div class='del'>-	700,	/* cooling state 9 */</div><div class='del'>-	650,	/* cooling state 10 */</div><div class='del'>-	600,	/* cooling state 11 */</div><div class='del'>-	550,	/* cooling state 12 */</div><div class='del'>-	500,	/* cooling state 13 */</div><div class='del'>-	450,	/* cooling state 14 */</div><div class='del'>-	400,	/* cooling state 15 */</div><div class='del'>-	350,	/* cooling state 16 */</div><div class='del'>-	300,	/* cooling state 17 */</div><div class='del'>-	250,	/* cooling state 18 */</div><div class='del'>-	200,	/* cooling state 19 */</div><div class='del'>-	150,	/* cooling state 20 */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> int iwl_mvm_ctdp_command(struct iwl_mvm *mvm, u32 op, u32 state)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm_ctdp_cmd cmd = {</div><div class='add'>+	struct iwl_ctdp_cmd cmd = {</div><div class='ctx'> 		.operation = cpu_to_le32(op),</div><div class='del'>-		.budget = cpu_to_le32(iwl_mvm_cdev_budgets[state]),</div><div class='ctx'> 		.window_size = 0,</div><div class='ctx'> 	};</div><div class='add'>+	u32 budget;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 status;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='add'>+	/* Do a linear scale from IWL_MVM_MIN_CTDP_BUDGET_MW to the configured</div><div class='add'>+	 * maximum in the predefined number of steps.</div><div class='add'>+	 */</div><div class='add'>+	budget = ((mvm-&gt;thermal_throttle.power_budget_mw -</div><div class='add'>+		   IWL_MVM_MIN_CTDP_BUDGET_MW) *</div><div class='add'>+		  (IWL_MVM_NUM_CTDP_STEPS - 1 - state)) /</div><div class='add'>+		 (IWL_MVM_NUM_CTDP_STEPS - 1) +</div><div class='add'>+		 IWL_MVM_MIN_CTDP_BUDGET_MW;</div><div class='add'>+	cmd.budget = cpu_to_le32(budget);</div><div class='add'>+</div><div class='ctx'> 	status = 0;</div><div class='ctx'> 	ret = iwl_mvm_send_cmd_pdu_status(mvm, WIDE_ID(PHY_OPS_GROUP,</div><div class='ctx'> 						       CTDP_CONFIG_CMD),</div><div class='hunk'>@@ -547,8 +540,24 @@ int iwl_mvm_ctdp_command(struct iwl_mvm *mvm, u32 op, u32 state)</div><div class='ctx'> #ifdef CONFIG_THERMAL</div><div class='ctx'> static int compare_temps(const void *a, const void *b)</div><div class='ctx'> {</div><div class='del'>-	return ((s16)le16_to_cpu(*(__le16 *)a) -</div><div class='del'>-		(s16)le16_to_cpu(*(__le16 *)b));</div><div class='add'>+	return ((s16)le16_to_cpu(*(const __le16 *)a) -</div><div class='add'>+		(s16)le16_to_cpu(*(const __le16 *)b));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct iwl_trip_walk_data {</div><div class='add'>+	__le16 *thresholds;</div><div class='add'>+	int count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int iwl_trip_temp_cb(struct thermal_trip *trip, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trip_walk_data *twd = arg;</div><div class='add'>+</div><div class='add'>+	if (trip-&gt;temperature == THERMAL_TEMP_INVALID)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	twd-&gt;thresholds[twd-&gt;count++] = cpu_to_le16((s16)(trip-&gt;temperature / 1000));</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -557,42 +566,25 @@ int iwl_mvm_send_temp_report_ths_cmd(struct iwl_mvm *mvm)</div><div class='ctx'> 	struct temp_report_ths_cmd cmd = {0};</div><div class='ctx'> 	int ret;</div><div class='ctx'> #ifdef CONFIG_THERMAL</div><div class='del'>-	int i, j, idx = 0;</div><div class='add'>+	struct iwl_trip_walk_data twd = { .thresholds = cmd.thresholds, .count = 0 };</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (!mvm-&gt;tz_device.tzone)</div><div class='ctx'> 		goto send;</div><div class='ctx'> </div><div class='del'>-	/* The driver holds array of temperature trips that are unsorted</div><div class='del'>-	 * and uncompressed, the FW should get it compressed and sorted</div><div class='add'>+	/*</div><div class='add'>+	 * The thermal core holds an array of temperature trips that are</div><div class='add'>+	 * unsorted and uncompressed, the FW should get it compressed and</div><div class='add'>+	 * sorted.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	/* compress temp_trips to cmd array, remove uninitialized values*/</div><div class='del'>-	for (i = 0; i &lt; IWL_MAX_DTS_TRIPS; i++) {</div><div class='del'>-		if (mvm-&gt;tz_device.temp_trips[i] != S16_MIN) {</div><div class='del'>-			cmd.thresholds[idx++] =</div><div class='del'>-				cpu_to_le16(mvm-&gt;tz_device.temp_trips[i]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	cmd.num_temps = cpu_to_le32(idx);</div><div class='del'>-</div><div class='del'>-	if (!idx)</div><div class='del'>-		goto send;</div><div class='del'>-</div><div class='del'>-	/*sort cmd array*/</div><div class='del'>-	sort(cmd.thresholds, idx, sizeof(s16), compare_temps, NULL);</div><div class='add'>+	/* compress trips to cmd array, remove uninitialized values*/</div><div class='add'>+	for_each_thermal_trip(mvm-&gt;tz_device.tzone, iwl_trip_temp_cb, &amp;twd);</div><div class='ctx'> </div><div class='del'>-	/* we should save the indexes of trips because we sort</div><div class='del'>-	 * and compress the orginal array</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; idx; i++) {</div><div class='del'>-		for (j = 0; j &lt; IWL_MAX_DTS_TRIPS; j++) {</div><div class='del'>-			if (le16_to_cpu(cmd.thresholds[i]) ==</div><div class='del'>-				mvm-&gt;tz_device.temp_trips[j])</div><div class='del'>-				mvm-&gt;tz_device.fw_trips_index[i] = j;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	cmd.num_temps = cpu_to_le32(twd.count);</div><div class='add'>+	if (twd.count)</div><div class='add'>+		sort(cmd.thresholds, twd.count, sizeof(s16), compare_temps, NULL);</div><div class='ctx'> </div><div class='ctx'> send:</div><div class='ctx'> #endif</div><div class='hunk'>@@ -610,119 +602,52 @@ send:</div><div class='ctx'> static int iwl_mvm_tzone_get_temp(struct thermal_zone_device *device,</div><div class='ctx'> 				  int *temperature)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm *mvm = (struct iwl_mvm *)device-&gt;devdata;</div><div class='add'>+	struct iwl_mvm *mvm = thermal_zone_device_priv(device);</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int temp;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> </div><div class='ctx'> 	if (!iwl_mvm_firmware_running(mvm) ||</div><div class='ctx'> 	    mvm-&gt;fwrt.cur_fw_img != IWL_UCODE_REGULAR) {</div><div class='del'>-		ret = -ENODATA;</div><div class='del'>-		goto out;</div><div class='add'>+		/*</div><div class='add'>+		 * Tell the core that there is no valid temperature value to</div><div class='add'>+		 * return, but it need not worry about this.</div><div class='add'>+		 */</div><div class='add'>+		*temperature = THERMAL_TEMP_INVALID;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_mvm_get_temp(mvm, &amp;temp);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	*temperature = temp * 1000;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl_mvm_tzone_get_trip_temp(struct thermal_zone_device *device,</div><div class='del'>-				       int trip, int *temp)</div><div class='del'>-{</div><div class='del'>-	struct iwl_mvm *mvm = (struct iwl_mvm *)device-&gt;devdata;</div><div class='del'>-</div><div class='del'>-	if (trip &lt; 0 || trip &gt;= IWL_MAX_DTS_TRIPS)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	*temp = mvm-&gt;tz_device.temp_trips[trip] * 1000;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl_mvm_tzone_get_trip_type(struct thermal_zone_device *device,</div><div class='del'>-				       int trip, enum thermal_trip_type *type)</div><div class='del'>-{</div><div class='del'>-	if (trip &lt; 0 || trip &gt;= IWL_MAX_DTS_TRIPS)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	*type = THERMAL_TRIP_PASSIVE;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_mvm_tzone_set_trip_temp(struct thermal_zone_device *device,</div><div class='del'>-				       int trip, int temp)</div><div class='add'>+				       const struct thermal_trip *trip, int temp)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm *mvm = (struct iwl_mvm *)device-&gt;devdata;</div><div class='del'>-	struct iwl_mvm_thermal_device *tzone;</div><div class='del'>-	int i, ret;</div><div class='del'>-	s16 temperature;</div><div class='add'>+	struct iwl_mvm *mvm = thermal_zone_device_priv(device);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> </div><div class='ctx'> 	if (!iwl_mvm_firmware_running(mvm) ||</div><div class='del'>-	    mvm-&gt;fwrt.cur_fw_img != IWL_UCODE_REGULAR) {</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	    mvm-&gt;fwrt.cur_fw_img != IWL_UCODE_REGULAR)</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='del'>-	if (trip &lt; 0 || trip &gt;= IWL_MAX_DTS_TRIPS) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((temp / 1000) &gt; S16_MAX) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	temperature = (s16)(temp / 1000);</div><div class='del'>-	tzone = &amp;mvm-&gt;tz_device;</div><div class='del'>-</div><div class='del'>-	if (!tzone) {</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* no updates*/</div><div class='del'>-	if (tzone-&gt;temp_trips[trip] == temperature) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* already existing temperature */</div><div class='del'>-	for (i = 0; i &lt; IWL_MAX_DTS_TRIPS; i++) {</div><div class='del'>-		if (tzone-&gt;temp_trips[i] == temperature) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tzone-&gt;temp_trips[trip] = temperature;</div><div class='add'>+	if ((temp / 1000) &gt; S16_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_send_temp_report_ths_cmd(mvm);</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-	return ret;</div><div class='add'>+	return iwl_mvm_send_temp_report_ths_cmd(mvm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static  struct thermal_zone_device_ops tzone_ops = {</div><div class='ctx'> 	.get_temp = iwl_mvm_tzone_get_temp,</div><div class='del'>-	.get_trip_temp = iwl_mvm_tzone_get_trip_temp,</div><div class='del'>-	.get_trip_type = iwl_mvm_tzone_get_trip_type,</div><div class='ctx'> 	.set_trip_temp = iwl_mvm_tzone_set_trip_temp,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* make all trips writable */</div><div class='del'>-#define IWL_WRITABLE_TRIPS_MSK (BIT(IWL_MAX_DTS_TRIPS) - 1)</div><div class='del'>-</div><div class='ctx'> static void iwl_mvm_thermal_zone_register(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret;</div><div class='hunk'>@@ -738,9 +663,18 @@ static void iwl_mvm_thermal_zone_register(struct iwl_mvm *mvm)</div><div class='ctx'> 	BUILD_BUG_ON(ARRAY_SIZE(name) &gt;= THERMAL_NAME_LENGTH);</div><div class='ctx'> </div><div class='ctx'> 	sprintf(name, "iwlwifi_%u", atomic_inc_return(&amp;counter) &amp; 0xFF);</div><div class='del'>-	mvm-&gt;tz_device.tzone = thermal_zone_device_register(name,</div><div class='add'>+	/*</div><div class='add'>+	 * 0 is a valid temperature,</div><div class='add'>+	 * so initialize the array with S16_MIN which invalid temperature</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0 ; i &lt; IWL_MAX_DTS_TRIPS; i++) {</div><div class='add'>+		mvm-&gt;tz_device.trips[i].temperature = THERMAL_TEMP_INVALID;</div><div class='add'>+		mvm-&gt;tz_device.trips[i].type = THERMAL_TRIP_PASSIVE;</div><div class='add'>+		mvm-&gt;tz_device.trips[i].flags = THERMAL_TRIP_FLAG_RW_TEMP;</div><div class='add'>+	}</div><div class='add'>+	mvm-&gt;tz_device.tzone = thermal_zone_device_register_with_trips(name,</div><div class='add'>+							mvm-&gt;tz_device.trips,</div><div class='ctx'> 							IWL_MAX_DTS_TRIPS,</div><div class='del'>-							IWL_WRITABLE_TRIPS_MSK,</div><div class='ctx'> 							mvm, &amp;tzone_ops,</div><div class='ctx'> 							NULL, 0, 0);</div><div class='ctx'> 	if (IS_ERR(mvm-&gt;tz_device.tzone)) {</div><div class='hunk'>@@ -755,20 +689,13 @@ static void iwl_mvm_thermal_zone_register(struct iwl_mvm *mvm)</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		IWL_DEBUG_TEMP(mvm, "Failed to enable thermal zone\n");</div><div class='ctx'> 		thermal_zone_device_unregister(mvm-&gt;tz_device.tzone);</div><div class='del'>-		return;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/* 0 is a valid temperature,</div><div class='del'>-	 * so initialize the array with S16_MIN which invalid temperature</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0 ; i &lt; IWL_MAX_DTS_TRIPS; i++)</div><div class='del'>-		mvm-&gt;tz_device.temp_trips[i] = S16_MIN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_mvm_tcool_get_max_state(struct thermal_cooling_device *cdev,</div><div class='ctx'> 				       unsigned long *state)</div><div class='ctx'> {</div><div class='del'>-	*state = ARRAY_SIZE(iwl_mvm_cdev_budgets) - 1;</div><div class='add'>+	*state = IWL_MVM_NUM_CTDP_STEPS - 1;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -787,27 +714,18 @@ static int iwl_mvm_tcool_set_cur_state(struct thermal_cooling_device *cdev,</div><div class='ctx'> 				       unsigned long new_state)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm *mvm = (struct iwl_mvm *)(cdev-&gt;devdata);</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> </div><div class='ctx'> 	if (!iwl_mvm_firmware_running(mvm) ||</div><div class='del'>-	    mvm-&gt;fwrt.cur_fw_img != IWL_UCODE_REGULAR) {</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (new_state &gt;= ARRAY_SIZE(iwl_mvm_cdev_budgets)) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='add'>+	    mvm-&gt;fwrt.cur_fw_img != IWL_UCODE_REGULAR)</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_ctdp_command(mvm, CTDP_CMD_OPERATION_START,</div><div class='del'>-				   new_state);</div><div class='add'>+	if (new_state &gt;= IWL_MVM_NUM_CTDP_STEPS)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='del'>-	return ret;</div><div class='add'>+	return iwl_mvm_ctdp_command(mvm, CTDP_CMD_OPERATION_START,</div><div class='add'>+				    new_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct thermal_cooling_device_ops tcooling_ops = {</div><div class='hunk'>@@ -864,6 +782,47 @@ static void iwl_mvm_cooling_device_unregister(struct iwl_mvm *mvm)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_THERMAL */</div><div class='ctx'> </div><div class='add'>+static u32 iwl_mvm_ctdp_get_max_budget(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	u64 bios_power_budget = 0;</div><div class='add'>+	u32 default_power_budget;</div><div class='add'>+</div><div class='add'>+	switch (CSR_HW_RFID_TYPE(mvm-&gt;trans-&gt;info.hw_rf_id)) {</div><div class='add'>+	case IWL_CFG_RF_TYPE_JF2:</div><div class='add'>+	case IWL_CFG_RF_TYPE_JF1:</div><div class='add'>+		default_power_budget = 2000;</div><div class='add'>+		break;</div><div class='add'>+	case IWL_CFG_RF_TYPE_HR2:</div><div class='add'>+	case IWL_CFG_RF_TYPE_HR1:</div><div class='add'>+		default_power_budget = 2400;</div><div class='add'>+		break;</div><div class='add'>+	case IWL_CFG_RF_TYPE_GF:</div><div class='add'>+		/* dual-radio devices have a higher budget */</div><div class='add'>+		if (CSR_HW_RFID_IS_CDB(mvm-&gt;trans-&gt;info.hw_rf_id))</div><div class='add'>+			default_power_budget = 5200;</div><div class='add'>+		else</div><div class='add'>+			default_power_budget = 2880;</div><div class='add'>+		break;</div><div class='add'>+	case IWL_CFG_RF_TYPE_FM:</div><div class='add'>+		default_power_budget = 3450;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		default_power_budget = 5550;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_bios_get_pwr_limit(&amp;mvm-&gt;fwrt, &amp;bios_power_budget);</div><div class='add'>+</div><div class='add'>+	/* 32bit in UEFI, 16bit in ACPI; use BIOS value if it is in range */</div><div class='add'>+	if (bios_power_budget &amp;&amp;</div><div class='add'>+	    bios_power_budget != 0xffff &amp;&amp; bios_power_budget != 0xffffffff &amp;&amp;</div><div class='add'>+	    bios_power_budget &gt;= IWL_MVM_MIN_CTDP_BUDGET_MW &amp;&amp;</div><div class='add'>+	    bios_power_budget &lt;= default_power_budget)</div><div class='add'>+		return (u32)bios_power_budget;</div><div class='add'>+</div><div class='add'>+	return default_power_budget;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void iwl_mvm_thermal_initialize(struct iwl_mvm *mvm, u32 min_backoff)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_tt_mgmt *tt = &amp;mvm-&gt;thermal_throttle;</div><div class='hunk'>@@ -875,6 +834,8 @@ void iwl_mvm_thermal_initialize(struct iwl_mvm *mvm, u32 min_backoff)</div><div class='ctx'> 	else</div><div class='ctx'> 		tt-&gt;params = iwl_mvm_default_tt_params;</div><div class='ctx'> </div><div class='add'>+	tt-&gt;power_budget_mw = iwl_mvm_ctdp_get_max_budget(mvm);</div><div class='add'>+	IWL_DEBUG_TEMP(mvm, "cTDP power budget: %d mW\n", tt-&gt;power_budget_mw);</div><div class='ctx'> 	tt-&gt;throttle = false;</div><div class='ctx'> 	tt-&gt;dynamic_smps = false;</div><div class='ctx'> 	tt-&gt;min_backoff = min_backoff;</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c<br/>index 1ad621d13ad3..bb97837baeda 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/tx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/tx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/tx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/tx.c</a></div><div class='hunk'>@@ -1,19 +1,22 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/ieee80211.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/tcp.h&gt;</div><div class='add'>+#include &lt;net/gso.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "iwl-trans.h"</div><div class='del'>-#include "iwl-eeprom-parse.h"</div><div class='add'>+#include "iwl-nvm-utils.h"</div><div class='add'>+#include "iwl-utils.h"</div><div class='ctx'> #include "mvm.h"</div><div class='ctx'> #include "sta.h"</div><div class='add'>+#include "time-sync.h"</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> iwl_mvm_bar_check_trigger(struct iwl_mvm *mvm, const u8 *addr,</div><div class='hunk'>@@ -39,13 +42,14 @@ iwl_mvm_bar_check_trigger(struct iwl_mvm *mvm, const u8 *addr,</div><div class='ctx'> #define OPT_HDR(type, skb, off) \</div><div class='ctx'> 	(type *)(skb_network_header(skb) + (off))</div><div class='ctx'> </div><div class='del'>-static u16 iwl_mvm_tx_csum(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='del'>-			   struct ieee80211_hdr *hdr,</div><div class='add'>+static u32 iwl_mvm_tx_csum(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 			   struct ieee80211_tx_info *info,</div><div class='del'>-			   u16 offload_assist)</div><div class='add'>+			   bool amsdu)</div><div class='ctx'> {</div><div class='del'>-#if IS_ENABLED(CONFIG_INET)</div><div class='add'>+	struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='ctx'> 	u16 mh_len = ieee80211_hdrlen(hdr-&gt;frame_control);</div><div class='add'>+	u16 offload_assist = 0;</div><div class='add'>+#if IS_ENABLED(CONFIG_INET)</div><div class='ctx'> 	u8 protocol = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Do not compute checksum if already computed */</div><div class='hunk'>@@ -106,8 +110,7 @@ static u16 iwl_mvm_tx_csum(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 	offload_assist |= (4 &lt;&lt; TX_CMD_OFFLD_IP_HDR);</div><div class='ctx'> </div><div class='ctx'> 	/* Do IPv4 csum for AMSDU only (no IP csum for Ipv6) */</div><div class='del'>-	if (skb-&gt;protocol == htons(ETH_P_IP) &amp;&amp;</div><div class='del'>-	    (offload_assist &amp; BIT(TX_CMD_OFFLD_AMSDU))) {</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IP) &amp;&amp; amsdu) {</div><div class='ctx'> 		ip_hdr(skb)-&gt;check = 0;</div><div class='ctx'> 		offload_assist |= BIT(TX_CMD_OFFLD_L3_EN);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -118,6 +121,8 @@ static u16 iwl_mvm_tx_csum(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 	else</div><div class='ctx'> 		udp_hdr(skb)-&gt;check = 0;</div><div class='ctx'> </div><div class='add'>+out:</div><div class='add'>+#endif</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * mac header len should include IV, size is in words unless</div><div class='ctx'> 	 * the IV is added by the firmware like in WEP.</div><div class='hunk'>@@ -130,8 +135,12 @@ static u16 iwl_mvm_tx_csum(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 	mh_len /= 2;</div><div class='ctx'> 	offload_assist |= mh_len &lt;&lt; TX_CMD_OFFLD_MH_SIZE;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-#endif</div><div class='add'>+	if (amsdu)</div><div class='add'>+		offload_assist |= BIT(TX_CMD_OFFLD_AMSDU);</div><div class='add'>+	else if (ieee80211_hdrlen(hdr-&gt;frame_control) % 4)</div><div class='add'>+		/* padding is inserted later in transport */</div><div class='add'>+		offload_assist |= BIT(TX_CMD_OFFLD_PAD);</div><div class='add'>+</div><div class='ctx'> 	return offload_assist;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -139,14 +148,14 @@ out:</div><div class='ctx'>  * Sets most of the Tx cmd's fields</div><div class='ctx'>  */</div><div class='ctx'> void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='del'>-			struct iwl_tx_cmd *tx_cmd,</div><div class='add'>+			struct iwl_tx_cmd_v6_params *tx_cmd_params,</div><div class='ctx'> 			struct ieee80211_tx_info *info, u8 sta_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='ctx'> 	__le16 fc = hdr-&gt;frame_control;</div><div class='del'>-	u32 tx_flags = le32_to_cpu(tx_cmd-&gt;tx_flags);</div><div class='add'>+	u32 tx_flags = le32_to_cpu(tx_cmd_params-&gt;tx_flags);</div><div class='ctx'> 	u32 len = skb-&gt;len + FCS_LEN;</div><div class='del'>-	u16 offload_assist = 0;</div><div class='add'>+	bool amsdu = false;</div><div class='ctx'> 	u8 ac;</div><div class='ctx'> </div><div class='ctx'> 	if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK) ||</div><div class='hunk'>@@ -164,27 +173,26 @@ void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	if (ieee80211_is_data_qos(fc)) {</div><div class='ctx'> 		u8 *qc = ieee80211_get_qos_ctl(hdr);</div><div class='del'>-		tx_cmd-&gt;tid_tspec = qc[0] &amp; 0xf;</div><div class='add'>+		tx_cmd_params-&gt;tid_tspec = qc[0] &amp; 0xf;</div><div class='ctx'> 		tx_flags &amp;= ~TX_CMD_FLG_SEQ_CTL;</div><div class='del'>-		if (*qc &amp; IEEE80211_QOS_CTL_A_MSDU_PRESENT)</div><div class='del'>-			offload_assist |= BIT(TX_CMD_OFFLD_AMSDU);</div><div class='add'>+		amsdu = *qc &amp; IEEE80211_QOS_CTL_A_MSDU_PRESENT;</div><div class='ctx'> 	} else if (ieee80211_is_back_req(fc)) {</div><div class='ctx'> 		struct ieee80211_bar *bar = (void *)skb-&gt;data;</div><div class='ctx'> 		u16 control = le16_to_cpu(bar-&gt;control);</div><div class='ctx'> 		u16 ssn = le16_to_cpu(bar-&gt;start_seq_num);</div><div class='ctx'> </div><div class='ctx'> 		tx_flags |= TX_CMD_FLG_ACK | TX_CMD_FLG_BAR;</div><div class='del'>-		tx_cmd-&gt;tid_tspec = (control &amp;</div><div class='add'>+		tx_cmd_params-&gt;tid_tspec = (control &amp;</div><div class='ctx'> 				     IEEE80211_BAR_CTRL_TID_INFO_MASK) &gt;&gt;</div><div class='ctx'> 			IEEE80211_BAR_CTRL_TID_INFO_SHIFT;</div><div class='del'>-		WARN_ON_ONCE(tx_cmd-&gt;tid_tspec &gt;= IWL_MAX_TID_COUNT);</div><div class='del'>-		iwl_mvm_bar_check_trigger(mvm, bar-&gt;ra, tx_cmd-&gt;tid_tspec,</div><div class='add'>+		WARN_ON_ONCE(tx_cmd_params-&gt;tid_tspec &gt;= IWL_MAX_TID_COUNT);</div><div class='add'>+		iwl_mvm_bar_check_trigger(mvm, bar-&gt;ra, tx_cmd_params-&gt;tid_tspec,</div><div class='ctx'> 					  ssn);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (ieee80211_is_data(fc))</div><div class='del'>-			tx_cmd-&gt;tid_tspec = IWL_TID_NON_QOS;</div><div class='add'>+			tx_cmd_params-&gt;tid_tspec = IWL_TID_NON_QOS;</div><div class='ctx'> 		else</div><div class='del'>-			tx_cmd-&gt;tid_tspec = IWL_MAX_TID_COUNT;</div><div class='add'>+			tx_cmd_params-&gt;tid_tspec = IWL_MAX_TID_COUNT;</div><div class='ctx'> </div><div class='ctx'> 		if (info-&gt;flags &amp; IEEE80211_TX_CTL_ASSIGN_SEQ)</div><div class='ctx'> 			tx_flags |= TX_CMD_FLG_SEQ_CTL;</div><div class='hunk'>@@ -193,8 +201,8 @@ void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Default to 0 (BE) when tid_spec is set to IWL_MAX_TID_COUNT */</div><div class='del'>-	if (tx_cmd-&gt;tid_tspec &lt; IWL_MAX_TID_COUNT)</div><div class='del'>-		ac = tid_to_mac80211_ac[tx_cmd-&gt;tid_tspec];</div><div class='add'>+	if (tx_cmd_params-&gt;tid_tspec &lt; IWL_MAX_TID_COUNT)</div><div class='add'>+		ac = tid_to_mac80211_ac[tx_cmd_params-&gt;tid_tspec];</div><div class='ctx'> 	else</div><div class='ctx'> 		ac = tid_to_mac80211_ac[0];</div><div class='ctx'> </div><div class='hunk'>@@ -203,20 +211,20 @@ void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	if (ieee80211_is_mgmt(fc)) {</div><div class='ctx'> 		if (ieee80211_is_assoc_req(fc) || ieee80211_is_reassoc_req(fc))</div><div class='del'>-			tx_cmd-&gt;pm_frame_timeout = cpu_to_le16(PM_FRAME_ASSOC);</div><div class='add'>+			tx_cmd_params-&gt;pm_frame_timeout = cpu_to_le16(PM_FRAME_ASSOC);</div><div class='ctx'> 		else if (ieee80211_is_action(fc))</div><div class='del'>-			tx_cmd-&gt;pm_frame_timeout = cpu_to_le16(PM_FRAME_NONE);</div><div class='add'>+			tx_cmd_params-&gt;pm_frame_timeout = cpu_to_le16(PM_FRAME_NONE);</div><div class='ctx'> 		else</div><div class='del'>-			tx_cmd-&gt;pm_frame_timeout = cpu_to_le16(PM_FRAME_MGMT);</div><div class='add'>+			tx_cmd_params-&gt;pm_frame_timeout = cpu_to_le16(PM_FRAME_MGMT);</div><div class='ctx'> </div><div class='ctx'> 		/* The spec allows Action frames in A-MPDU, we don't support</div><div class='ctx'> 		 * it</div><div class='ctx'> 		 */</div><div class='ctx'> 		WARN_ON_ONCE(info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU);</div><div class='ctx'> 	} else if (info-&gt;control.flags &amp; IEEE80211_TX_CTRL_PORT_CTRL_PROTO) {</div><div class='del'>-		tx_cmd-&gt;pm_frame_timeout = cpu_to_le16(PM_FRAME_MGMT);</div><div class='add'>+		tx_cmd_params-&gt;pm_frame_timeout = cpu_to_le16(PM_FRAME_MGMT);</div><div class='ctx'> 	} else {</div><div class='del'>-		tx_cmd-&gt;pm_frame_timeout = cpu_to_le16(PM_FRAME_NONE);</div><div class='add'>+		tx_cmd_params-&gt;pm_frame_timeout = cpu_to_le16(PM_FRAME_NONE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ieee80211_is_data(fc) &amp;&amp; len &gt; mvm-&gt;rts_threshold &amp;&amp;</div><div class='hunk'>@@ -228,20 +236,14 @@ void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 	    ieee80211_action_contains_tpc(skb))</div><div class='ctx'> 		tx_flags |= TX_CMD_FLG_WRITE_TX_POWER;</div><div class='ctx'> </div><div class='del'>-	tx_cmd-&gt;tx_flags = cpu_to_le32(tx_flags);</div><div class='add'>+	tx_cmd_params-&gt;tx_flags = cpu_to_le32(tx_flags);</div><div class='ctx'> 	/* Total # bytes to be transmitted - PCIe code will adjust for A-MSDU */</div><div class='del'>-	tx_cmd-&gt;len = cpu_to_le16((u16)skb-&gt;len);</div><div class='del'>-	tx_cmd-&gt;life_time = cpu_to_le32(TX_CMD_LIFE_TIME_INFINITE);</div><div class='del'>-	tx_cmd-&gt;sta_id = sta_id;</div><div class='del'>-</div><div class='del'>-	/* padding is inserted later in transport */</div><div class='del'>-	if (ieee80211_hdrlen(fc) % 4 &amp;&amp;</div><div class='del'>-	    !(offload_assist &amp; BIT(TX_CMD_OFFLD_AMSDU)))</div><div class='del'>-		offload_assist |= BIT(TX_CMD_OFFLD_PAD);</div><div class='add'>+	tx_cmd_params-&gt;len = cpu_to_le16((u16)skb-&gt;len);</div><div class='add'>+	tx_cmd_params-&gt;life_time = cpu_to_le32(TX_CMD_LIFE_TIME_INFINITE);</div><div class='add'>+	tx_cmd_params-&gt;sta_id = sta_id;</div><div class='ctx'> </div><div class='del'>-	tx_cmd-&gt;offload_assist |=</div><div class='del'>-		cpu_to_le16(iwl_mvm_tx_csum(mvm, skb, hdr, info,</div><div class='del'>-					    offload_assist));</div><div class='add'>+	tx_cmd_params-&gt;offload_assist =</div><div class='add'>+		cpu_to_le16(iwl_mvm_tx_csum(mvm, skb, info, amsdu));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 iwl_mvm_get_tx_ant(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -261,80 +263,155 @@ static u32 iwl_mvm_get_tx_ant(struct iwl_mvm *mvm,</div><div class='ctx'> 	return BIT(mvm-&gt;mgmt_last_antenna_idx) &lt;&lt; RATE_MCS_ANT_POS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 iwl_mvm_convert_rate_idx(struct iwl_mvm *mvm,</div><div class='add'>+				    struct ieee80211_tx_info *info,</div><div class='add'>+				    int rate_idx)</div><div class='add'>+{</div><div class='add'>+	u32 rate_flags = 0;</div><div class='add'>+	u8 rate_plcp;</div><div class='add'>+	bool is_cck;</div><div class='add'>+</div><div class='add'>+	/* if the rate isn't a well known legacy rate, take the lowest one */</div><div class='add'>+	if (rate_idx &lt; 0 || rate_idx &gt;= IWL_RATE_COUNT_LEGACY)</div><div class='add'>+		rate_idx = iwl_mvm_mac_ctxt_get_lowest_rate(mvm,</div><div class='add'>+							    info,</div><div class='add'>+							    info-&gt;control.vif);</div><div class='add'>+</div><div class='add'>+	/* Get PLCP rate for tx_cmd-&gt;rate_n_flags */</div><div class='add'>+	rate_plcp = iwl_mvm_mac80211_idx_to_hwrate(mvm-&gt;fw, rate_idx);</div><div class='add'>+	is_cck = (rate_idx &gt;= IWL_FIRST_CCK_RATE) &amp;&amp;</div><div class='add'>+		 (rate_idx &lt;= IWL_LAST_CCK_RATE);</div><div class='add'>+</div><div class='add'>+	/* Set CCK or OFDM flag */</div><div class='add'>+	if (!is_cck)</div><div class='add'>+		rate_flags |= RATE_MCS_MOD_TYPE_LEGACY_OFDM;</div><div class='add'>+	else</div><div class='add'>+		rate_flags |= RATE_MCS_MOD_TYPE_CCK;</div><div class='add'>+</div><div class='add'>+	return (u32)rate_plcp | rate_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 iwl_mvm_get_inject_tx_rate(struct iwl_mvm *mvm,</div><div class='add'>+				      struct ieee80211_tx_info *info,</div><div class='add'>+				      struct ieee80211_sta *sta,</div><div class='add'>+				      __le16 fc)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_tx_rate *rate = &amp;info-&gt;control.rates[0];</div><div class='add'>+	u32 result;</div><div class='add'>+</div><div class='add'>+	if (rate-&gt;flags &amp; IEEE80211_TX_RC_VHT_MCS) {</div><div class='add'>+		u8 mcs = ieee80211_rate_get_vht_mcs(rate);</div><div class='add'>+		u8 nss = ieee80211_rate_get_vht_nss(rate);</div><div class='add'>+</div><div class='add'>+		result = RATE_MCS_MOD_TYPE_VHT;</div><div class='add'>+		result |= u32_encode_bits(mcs, RATE_VHT_MCS_RATE_CODE_MSK);</div><div class='add'>+		result |= u32_encode_bits(nss, RATE_MCS_NSS_MSK);</div><div class='add'>+		if (rate-&gt;flags &amp; IEEE80211_TX_RC_SHORT_GI)</div><div class='add'>+			result |= RATE_MCS_SGI_MSK;</div><div class='add'>+		if (rate-&gt;flags &amp; IEEE80211_TX_RC_40_MHZ_WIDTH)</div><div class='add'>+			result |= RATE_MCS_CHAN_WIDTH_40;</div><div class='add'>+		else if (rate-&gt;flags &amp; IEEE80211_TX_RC_80_MHZ_WIDTH)</div><div class='add'>+			result |= RATE_MCS_CHAN_WIDTH_80;</div><div class='add'>+		else if (rate-&gt;flags &amp; IEEE80211_TX_RC_160_MHZ_WIDTH)</div><div class='add'>+			result |= RATE_MCS_CHAN_WIDTH_160;</div><div class='add'>+	} else if (rate-&gt;flags &amp; IEEE80211_TX_RC_MCS) {</div><div class='add'>+		result = RATE_MCS_MOD_TYPE_HT;</div><div class='add'>+		result |= u32_encode_bits(rate-&gt;idx &amp; 0x7,</div><div class='add'>+					  RATE_HT_MCS_CODE_MSK);</div><div class='add'>+		result |= u32_encode_bits(rate-&gt;idx &gt;&gt; 3,</div><div class='add'>+					  RATE_MCS_NSS_MSK);</div><div class='add'>+		if (rate-&gt;flags &amp; IEEE80211_TX_RC_SHORT_GI)</div><div class='add'>+			result |= RATE_MCS_SGI_MSK;</div><div class='add'>+		if (rate-&gt;flags &amp; IEEE80211_TX_RC_40_MHZ_WIDTH)</div><div class='add'>+			result |= RATE_MCS_CHAN_WIDTH_40;</div><div class='add'>+		if (info-&gt;flags &amp; IEEE80211_TX_CTL_LDPC)</div><div class='add'>+			result |= RATE_MCS_LDPC_MSK;</div><div class='add'>+		if (u32_get_bits(info-&gt;flags, IEEE80211_TX_CTL_STBC))</div><div class='add'>+			result |= RATE_MCS_STBC_MSK;</div><div class='add'>+	} else {</div><div class='add'>+		int rate_idx = info-&gt;control.rates[0].idx;</div><div class='add'>+</div><div class='add'>+		result = iwl_mvm_convert_rate_idx(mvm, info, rate_idx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;control.antennas)</div><div class='add'>+		result |= u32_encode_bits(info-&gt;control.antennas,</div><div class='add'>+					  RATE_MCS_ANT_AB_MSK);</div><div class='add'>+	else</div><div class='add'>+		result |= iwl_mvm_get_tx_ant(mvm, info, sta, fc);</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u32 iwl_mvm_get_tx_rate(struct iwl_mvm *mvm,</div><div class='ctx'> 			       struct ieee80211_tx_info *info,</div><div class='ctx'> 			       struct ieee80211_sta *sta, __le16 fc)</div><div class='ctx'> {</div><div class='ctx'> 	int rate_idx = -1;</div><div class='del'>-	u8 rate_plcp;</div><div class='del'>-	u32 rate_flags = 0;</div><div class='del'>-	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> </div><div class='del'>-	/* info-&gt;control is only relevant for non HW rate control */</div><div class='ctx'> 	if (!ieee80211_hw_check(mvm-&gt;hw, HAS_RATE_CONTROL)) {</div><div class='add'>+		/* info-&gt;control is only relevant for non HW rate control */</div><div class='add'>+</div><div class='ctx'> 		/* HT rate doesn't make sense for a non data frame */</div><div class='ctx'> 		WARN_ONCE(info-&gt;control.rates[0].flags &amp; IEEE80211_TX_RC_MCS &amp;&amp;</div><div class='ctx'> 			  !ieee80211_is_data(fc),</div><div class='ctx'> 			  "Got a HT rate (flags:0x%x/mcs:%d/fc:0x%x/state:%d) for a non data frame\n",</div><div class='ctx'> 			  info-&gt;control.rates[0].flags,</div><div class='ctx'> 			  info-&gt;control.rates[0].idx,</div><div class='del'>-			  le16_to_cpu(fc), mvmsta-&gt;sta_state);</div><div class='add'>+			  le16_to_cpu(fc),</div><div class='add'>+			  sta ? iwl_mvm_sta_from_mac80211(sta)-&gt;sta_state : -1);</div><div class='ctx'> </div><div class='ctx'> 		rate_idx = info-&gt;control.rates[0].idx;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if the rate isn't a well known legacy rate, take the lowest one */</div><div class='del'>-	if (rate_idx &lt; 0 || rate_idx &gt;= IWL_RATE_COUNT_LEGACY)</div><div class='del'>-		rate_idx = rate_lowest_index(</div><div class='del'>-				&amp;mvm-&gt;nvm_data-&gt;bands[info-&gt;band], sta);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * For non 2 GHZ band, remap mac80211 rate</div><div class='del'>-	 * indices into driver indices</div><div class='del'>-	 */</div><div class='del'>-	if (info-&gt;band != NL80211_BAND_2GHZ)</div><div class='del'>-		rate_idx += IWL_FIRST_OFDM_RATE;</div><div class='del'>-</div><div class='del'>-	/* For 2.4 GHZ band, check that there is no need to remap */</div><div class='del'>-	BUILD_BUG_ON(IWL_FIRST_CCK_RATE != 0);</div><div class='ctx'> </div><div class='del'>-	/* Get PLCP rate for tx_cmd-&gt;rate_n_flags */</div><div class='del'>-	rate_plcp = iwl_mvm_mac80211_idx_to_hwrate(rate_idx);</div><div class='add'>+		/* For non 2 GHZ band, remap mac80211 rate indices into driver</div><div class='add'>+		 * indices.</div><div class='add'>+		 */</div><div class='add'>+		if (info-&gt;band != NL80211_BAND_2GHZ ||</div><div class='add'>+		    (info-&gt;flags &amp; IEEE80211_TX_CTL_NO_CCK_RATE))</div><div class='add'>+			rate_idx += IWL_FIRST_OFDM_RATE;</div><div class='ctx'> </div><div class='del'>-	/* Set CCK flag as needed */</div><div class='del'>-	if ((rate_idx &gt;= IWL_FIRST_CCK_RATE) &amp;&amp; (rate_idx &lt;= IWL_LAST_CCK_RATE))</div><div class='del'>-		rate_flags |= RATE_MCS_CCK_MSK;</div><div class='add'>+		/* For 2.4 GHZ band, check that there is no need to remap */</div><div class='add'>+		BUILD_BUG_ON(IWL_FIRST_CCK_RATE != 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return (u32)rate_plcp | rate_flags;</div><div class='add'>+	return iwl_mvm_convert_rate_idx(mvm, info, rate_idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 iwl_mvm_get_tx_rate_n_flags(struct iwl_mvm *mvm,</div><div class='del'>-				       struct ieee80211_tx_info *info,</div><div class='del'>-				       struct ieee80211_sta *sta, __le16 fc)</div><div class='add'>+static __le32 iwl_mvm_get_tx_rate_n_flags(struct iwl_mvm *mvm,</div><div class='add'>+					  struct ieee80211_tx_info *info,</div><div class='add'>+					  struct ieee80211_sta *sta, __le16 fc)</div><div class='ctx'> {</div><div class='del'>-	return iwl_mvm_get_tx_rate(mvm, info, sta, fc) |</div><div class='del'>-		iwl_mvm_get_tx_ant(mvm, info, sta, fc);</div><div class='add'>+	u32 rate;</div><div class='add'>+</div><div class='add'>+	if (unlikely(info-&gt;control.flags &amp; IEEE80211_TX_CTRL_RATE_INJECT))</div><div class='add'>+		rate = iwl_mvm_get_inject_tx_rate(mvm, info, sta, fc);</div><div class='add'>+	else</div><div class='add'>+		rate = iwl_mvm_get_tx_rate(mvm, info, sta, fc) |</div><div class='add'>+		       iwl_mvm_get_tx_ant(mvm, info, sta, fc);</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_v3_rate_to_fw(rate, mvm-&gt;fw_rates_ver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Sets the fields in the Tx cmd that are rate related</div><div class='ctx'>  */</div><div class='del'>-void iwl_mvm_set_tx_cmd_rate(struct iwl_mvm *mvm, struct iwl_tx_cmd *tx_cmd,</div><div class='del'>-			    struct ieee80211_tx_info *info,</div><div class='del'>-			    struct ieee80211_sta *sta, __le16 fc)</div><div class='add'>+void iwl_mvm_set_tx_cmd_rate(struct iwl_mvm *mvm,</div><div class='add'>+			     struct iwl_tx_cmd_v6_params *tx_cmd_params,</div><div class='add'>+			     struct ieee80211_tx_info *info,</div><div class='add'>+			     struct ieee80211_sta *sta, __le16 fc)</div><div class='ctx'> {</div><div class='ctx'> 	/* Set retry limit on RTS packets */</div><div class='del'>-	tx_cmd-&gt;rts_retry_limit = IWL_RTS_DFAULT_RETRY_LIMIT;</div><div class='add'>+	tx_cmd_params-&gt;rts_retry_limit = IWL_RTS_DFAULT_RETRY_LIMIT;</div><div class='ctx'> </div><div class='ctx'> 	/* Set retry limit on DATA packets and Probe Responses*/</div><div class='ctx'> 	if (ieee80211_is_probe_resp(fc)) {</div><div class='del'>-		tx_cmd-&gt;data_retry_limit = IWL_MGMT_DFAULT_RETRY_LIMIT;</div><div class='del'>-		tx_cmd-&gt;rts_retry_limit =</div><div class='del'>-			min(tx_cmd-&gt;data_retry_limit, tx_cmd-&gt;rts_retry_limit);</div><div class='add'>+		tx_cmd_params-&gt;data_retry_limit = IWL_MGMT_DFAULT_RETRY_LIMIT;</div><div class='add'>+		tx_cmd_params-&gt;rts_retry_limit =</div><div class='add'>+			min(tx_cmd_params-&gt;data_retry_limit, tx_cmd_params-&gt;rts_retry_limit);</div><div class='ctx'> 	} else if (ieee80211_is_back_req(fc)) {</div><div class='del'>-		tx_cmd-&gt;data_retry_limit = IWL_BAR_DFAULT_RETRY_LIMIT;</div><div class='add'>+		tx_cmd_params-&gt;data_retry_limit = IWL_BAR_DFAULT_RETRY_LIMIT;</div><div class='ctx'> 	} else {</div><div class='del'>-		tx_cmd-&gt;data_retry_limit = IWL_DEFAULT_TX_RETRY;</div><div class='add'>+		tx_cmd_params-&gt;data_retry_limit = IWL_DEFAULT_TX_RETRY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -342,22 +419,22 @@ void iwl_mvm_set_tx_cmd_rate(struct iwl_mvm *mvm, struct iwl_tx_cmd *tx_cmd,</div><div class='ctx'> 	 * table is controlled by LINK_QUALITY commands</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	if (ieee80211_is_data(fc) &amp;&amp; sta) {</div><div class='add'>+	if (likely(ieee80211_is_data(fc) &amp;&amp; sta &amp;&amp;</div><div class='add'>+		   !(info-&gt;control.flags &amp; IEEE80211_TX_CTRL_RATE_INJECT))) {</div><div class='ctx'> 		struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> </div><div class='ctx'> 		if (mvmsta-&gt;sta_state &gt;= IEEE80211_STA_AUTHORIZED) {</div><div class='del'>-			tx_cmd-&gt;initial_rate_index = 0;</div><div class='del'>-			tx_cmd-&gt;tx_flags |= cpu_to_le32(TX_CMD_FLG_STA_RATE);</div><div class='add'>+			tx_cmd_params-&gt;initial_rate_index = 0;</div><div class='add'>+			tx_cmd_params-&gt;tx_flags |= cpu_to_le32(TX_CMD_FLG_STA_RATE);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (ieee80211_is_back_req(fc)) {</div><div class='del'>-		tx_cmd-&gt;tx_flags |=</div><div class='add'>+		tx_cmd_params-&gt;tx_flags |=</div><div class='ctx'> 			cpu_to_le32(TX_CMD_FLG_ACK | TX_CMD_FLG_BAR);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set the rate in the TX cmd */</div><div class='del'>-	tx_cmd-&gt;rate_n_flags =</div><div class='del'>-		cpu_to_le32(iwl_mvm_get_tx_rate_n_flags(mvm, info, sta, fc));</div><div class='add'>+	tx_cmd_params-&gt;rate_n_flags = iwl_mvm_get_tx_rate_n_flags(mvm, info, sta, fc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void iwl_mvm_set_tx_cmd_pn(struct ieee80211_tx_info *info,</div><div class='hunk'>@@ -382,7 +459,7 @@ static inline void iwl_mvm_set_tx_cmd_pn(struct ieee80211_tx_info *info,</div><div class='ctx'>  */</div><div class='ctx'> static void iwl_mvm_set_tx_cmd_crypto(struct iwl_mvm *mvm,</div><div class='ctx'> 				      struct ieee80211_tx_info *info,</div><div class='del'>-				      struct iwl_tx_cmd *tx_cmd,</div><div class='add'>+				      struct iwl_tx_cmd_v6_params *tx_cmd_params,</div><div class='ctx'> 				      struct sk_buff *skb_frag,</div><div class='ctx'> 				      int hdrlen)</div><div class='ctx'> {</div><div class='hunk'>@@ -393,26 +470,26 @@ static void iwl_mvm_set_tx_cmd_crypto(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	switch (keyconf-&gt;cipher) {</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_CCMP:</div><div class='del'>-		iwl_mvm_set_tx_cmd_ccmp(info, tx_cmd);</div><div class='add'>+		iwl_mvm_set_tx_cmd_ccmp(info, tx_cmd_params);</div><div class='ctx'> 		iwl_mvm_set_tx_cmd_pn(info, crypto_hdr);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case WLAN_CIPHER_SUITE_TKIP:</div><div class='del'>-		tx_cmd-&gt;sec_ctl = TX_CMD_SEC_TKIP;</div><div class='add'>+		tx_cmd_params-&gt;sec_ctl = TX_CMD_SEC_TKIP;</div><div class='ctx'> 		pn = atomic64_inc_return(&amp;keyconf-&gt;tx_pn);</div><div class='ctx'> 		ieee80211_tkip_add_iv(crypto_hdr, keyconf, pn);</div><div class='del'>-		ieee80211_get_tkip_p2k(keyconf, skb_frag, tx_cmd-&gt;key);</div><div class='add'>+		ieee80211_get_tkip_p2k(keyconf, skb_frag, tx_cmd_params-&gt;key);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case WLAN_CIPHER_SUITE_WEP104:</div><div class='del'>-		tx_cmd-&gt;sec_ctl |= TX_CMD_SEC_KEY128;</div><div class='add'>+		tx_cmd_params-&gt;sec_ctl |= TX_CMD_SEC_KEY128;</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_WEP40:</div><div class='del'>-		tx_cmd-&gt;sec_ctl |= TX_CMD_SEC_WEP |</div><div class='add'>+		tx_cmd_params-&gt;sec_ctl |= TX_CMD_SEC_WEP |</div><div class='ctx'> 			((keyconf-&gt;keyidx &lt;&lt; TX_CMD_SEC_WEP_KEY_IDX_POS) &amp;</div><div class='ctx'> 			  TX_CMD_SEC_WEP_KEY_IDX_MSK);</div><div class='ctx'> </div><div class='del'>-		memcpy(&amp;tx_cmd-&gt;key[3], keyconf-&gt;key, keyconf-&gt;keylen);</div><div class='add'>+		memcpy(&amp;tx_cmd_params-&gt;key[3], keyconf-&gt;key, keyconf-&gt;keylen);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_GCMP:</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='hunk'>@@ -425,26 +502,62 @@ static void iwl_mvm_set_tx_cmd_crypto(struct iwl_mvm *mvm,</div><div class='ctx'> 		 * one.</div><div class='ctx'> 		 * Need to handle this.</div><div class='ctx'> 		 */</div><div class='del'>-		tx_cmd-&gt;sec_ctl |= type | TX_CMD_SEC_KEY_FROM_TABLE;</div><div class='del'>-		tx_cmd-&gt;key[0] = keyconf-&gt;hw_key_idx;</div><div class='add'>+		tx_cmd_params-&gt;sec_ctl |= type | TX_CMD_SEC_KEY_FROM_TABLE;</div><div class='add'>+		tx_cmd_params-&gt;key[0] = keyconf-&gt;hw_key_idx;</div><div class='ctx'> 		iwl_mvm_set_tx_cmd_pn(info, crypto_hdr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		tx_cmd-&gt;sec_ctl |= TX_CMD_SEC_EXT;</div><div class='add'>+		tx_cmd_params-&gt;sec_ctl |= TX_CMD_SEC_EXT;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool iwl_mvm_use_host_rate(struct iwl_mvm *mvm,</div><div class='add'>+				  struct iwl_mvm_sta *mvmsta,</div><div class='add'>+				  struct ieee80211_hdr *hdr,</div><div class='add'>+				  struct ieee80211_tx_info *info)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(!mvmsta))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (unlikely(info-&gt;control.flags &amp; IEEE80211_TX_CTRL_RATE_INJECT))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (likely(ieee80211_is_data(hdr-&gt;frame_control) &amp;&amp;</div><div class='add'>+		   mvmsta-&gt;sta_state &gt;= IEEE80211_STA_AUTHORIZED))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Not a data frame, use host rate if on an old device that</div><div class='add'>+	 * can't possibly be doing MLO (firmware may be selecting a</div><div class='add'>+	 * bad rate), if we might be doing MLO we need to let FW pick</div><div class='add'>+	 * (since we don't necesarily know the link), but FW rate</div><div class='add'>+	 * selection was fixed.</div><div class='add'>+	 */</div><div class='add'>+	return mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_BZ;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_mvm_copy_hdr(void *cmd, const void *hdr, int hdrlen,</div><div class='add'>+			     const u8 *addr3_override)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *out_hdr = cmd;</div><div class='add'>+</div><div class='add'>+	memcpy(cmd, hdr, hdrlen);</div><div class='add'>+	if (addr3_override)</div><div class='add'>+		memcpy(out_hdr-&gt;addr3, addr3_override, ETH_ALEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Allocates and sets the Tx cmd the driver data pointers in the skb</div><div class='ctx'>  */</div><div class='ctx'> static struct iwl_device_tx_cmd *</div><div class='ctx'> iwl_mvm_set_tx_params(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 		      struct ieee80211_tx_info *info, int hdrlen,</div><div class='del'>-		      struct ieee80211_sta *sta, u8 sta_id)</div><div class='add'>+		      struct ieee80211_sta *sta, u8 sta_id,</div><div class='add'>+		      const u8 *addr3_override)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='ctx'> 	struct iwl_device_tx_cmd *dev_cmd;</div><div class='del'>-	struct iwl_tx_cmd *tx_cmd;</div><div class='add'>+	struct iwl_tx_cmd_v6 *tx_cmd;</div><div class='ctx'> </div><div class='ctx'> 	dev_cmd = iwl_trans_alloc_tx_cmd(mvm-&gt;trans);</div><div class='ctx'> </div><div class='hunk'>@@ -454,85 +567,84 @@ iwl_mvm_set_tx_params(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 	dev_cmd-&gt;hdr.cmd = TX_CMD;</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_mvm_has_new_tx_api(mvm)) {</div><div class='del'>-		u16 offload_assist = 0;</div><div class='del'>-		u32 rate_n_flags = 0;</div><div class='add'>+		__le32 rate_n_flags = 0;</div><div class='ctx'> 		u16 flags = 0;</div><div class='ctx'> 		struct iwl_mvm_sta *mvmsta = sta ?</div><div class='ctx'> 			iwl_mvm_sta_from_mac80211(sta) : NULL;</div><div class='add'>+		bool amsdu = false;</div><div class='ctx'> </div><div class='ctx'> 		if (ieee80211_is_data_qos(hdr-&gt;frame_control)) {</div><div class='ctx'> 			u8 *qc = ieee80211_get_qos_ctl(hdr);</div><div class='ctx'> </div><div class='del'>-			if (*qc &amp; IEEE80211_QOS_CTL_A_MSDU_PRESENT)</div><div class='del'>-				offload_assist |= BIT(TX_CMD_OFFLD_AMSDU);</div><div class='add'>+			amsdu = *qc &amp; IEEE80211_QOS_CTL_A_MSDU_PRESENT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		offload_assist = iwl_mvm_tx_csum(mvm, skb, hdr, info,</div><div class='del'>-						 offload_assist);</div><div class='del'>-</div><div class='del'>-		/* padding is inserted later in transport */</div><div class='del'>-		if (ieee80211_hdrlen(hdr-&gt;frame_control) % 4 &amp;&amp;</div><div class='del'>-		    !(offload_assist &amp; BIT(TX_CMD_OFFLD_AMSDU)))</div><div class='del'>-			offload_assist |= BIT(TX_CMD_OFFLD_PAD);</div><div class='del'>-</div><div class='ctx'> 		if (!info-&gt;control.hw_key)</div><div class='ctx'> 			flags |= IWL_TX_FLAGS_ENCRYPT_DIS;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * For data packets rate info comes from the fw. Only</div><div class='del'>-		 * set rate/antenna during connection establishment or in case</div><div class='del'>-		 * no station is given.</div><div class='add'>+		 * For data and mgmt packets rate info comes from the fw (for</div><div class='add'>+		 * new devices, older FW is somewhat broken for this). Only</div><div class='add'>+		 * set rate/antenna for injected frames with fixed rate, or</div><div class='add'>+		 * when no sta is given, or with older firmware.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!sta || !ieee80211_is_data(hdr-&gt;frame_control) ||</div><div class='del'>-		    mvmsta-&gt;sta_state &lt; IEEE80211_STA_AUTHORIZED) {</div><div class='add'>+		if (unlikely(iwl_mvm_use_host_rate(mvm, mvmsta, hdr, info))) {</div><div class='ctx'> 			flags |= IWL_TX_FLAGS_CMD_RATE;</div><div class='ctx'> 			rate_n_flags =</div><div class='ctx'> 				iwl_mvm_get_tx_rate_n_flags(mvm, info, sta,</div><div class='ctx'> 							    hdr-&gt;frame_control);</div><div class='add'>+		} else if (!ieee80211_is_data(hdr-&gt;frame_control) ||</div><div class='add'>+			   mvmsta-&gt;sta_state &lt; IEEE80211_STA_AUTHORIZED) {</div><div class='add'>+			/* These are important frames */</div><div class='add'>+			flags |= IWL_TX_FLAGS_HIGH_PRI;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (mvm-&gt;trans-&gt;trans_cfg-&gt;device_family &gt;=</div><div class='add'>+		if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;=</div><div class='ctx'> 		    IWL_DEVICE_FAMILY_AX210) {</div><div class='del'>-			struct iwl_tx_cmd_gen3 *cmd = (void *)dev_cmd-&gt;payload;</div><div class='add'>+			struct iwl_tx_cmd *cmd = (void *)dev_cmd-&gt;payload;</div><div class='add'>+			u32 offload_assist = iwl_mvm_tx_csum(mvm, skb,</div><div class='add'>+							     info, amsdu);</div><div class='ctx'> </div><div class='del'>-			cmd-&gt;offload_assist |= cpu_to_le32(offload_assist);</div><div class='add'>+			cmd-&gt;offload_assist = cpu_to_le32(offload_assist);</div><div class='ctx'> </div><div class='ctx'> 			/* Total # bytes to be transmitted */</div><div class='ctx'> 			cmd-&gt;len = cpu_to_le16((u16)skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 			/* Copy MAC header from skb into command buffer */</div><div class='del'>-			memcpy(cmd-&gt;hdr, hdr, hdrlen);</div><div class='add'>+			iwl_mvm_copy_hdr(cmd-&gt;hdr, hdr, hdrlen, addr3_override);</div><div class='ctx'> </div><div class='ctx'> 			cmd-&gt;flags = cpu_to_le16(flags);</div><div class='del'>-			cmd-&gt;rate_n_flags = cpu_to_le32(rate_n_flags);</div><div class='add'>+			cmd-&gt;rate_n_flags = rate_n_flags;</div><div class='ctx'> 		} else {</div><div class='del'>-			struct iwl_tx_cmd_gen2 *cmd = (void *)dev_cmd-&gt;payload;</div><div class='add'>+			struct iwl_tx_cmd_v9 *cmd = (void *)dev_cmd-&gt;payload;</div><div class='add'>+			u16 offload_assist = iwl_mvm_tx_csum(mvm, skb,</div><div class='add'>+							     info, amsdu);</div><div class='ctx'> </div><div class='del'>-			cmd-&gt;offload_assist |= cpu_to_le16(offload_assist);</div><div class='add'>+			cmd-&gt;offload_assist = cpu_to_le16(offload_assist);</div><div class='ctx'> </div><div class='ctx'> 			/* Total # bytes to be transmitted */</div><div class='ctx'> 			cmd-&gt;len = cpu_to_le16((u16)skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 			/* Copy MAC header from skb into command buffer */</div><div class='del'>-			memcpy(cmd-&gt;hdr, hdr, hdrlen);</div><div class='add'>+			iwl_mvm_copy_hdr(cmd-&gt;hdr, hdr, hdrlen, addr3_override);</div><div class='ctx'> </div><div class='ctx'> 			cmd-&gt;flags = cpu_to_le32(flags);</div><div class='del'>-			cmd-&gt;rate_n_flags = cpu_to_le32(rate_n_flags);</div><div class='add'>+			cmd-&gt;rate_n_flags = rate_n_flags;</div><div class='ctx'> 		}</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tx_cmd = (struct iwl_tx_cmd *)dev_cmd-&gt;payload;</div><div class='add'>+	tx_cmd = (struct iwl_tx_cmd_v6 *)dev_cmd-&gt;payload;</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;control.hw_key)</div><div class='del'>-		iwl_mvm_set_tx_cmd_crypto(mvm, info, tx_cmd, skb, hdrlen);</div><div class='add'>+		iwl_mvm_set_tx_cmd_crypto(mvm, info, &amp;tx_cmd-&gt;params, skb, hdrlen);</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_set_tx_cmd(mvm, skb, tx_cmd, info, sta_id);</div><div class='add'>+	iwl_mvm_set_tx_cmd(mvm, skb, &amp;tx_cmd-&gt;params, info, sta_id);</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_set_tx_cmd_rate(mvm, tx_cmd, info, sta, hdr-&gt;frame_control);</div><div class='add'>+	iwl_mvm_set_tx_cmd_rate(mvm, &amp;tx_cmd-&gt;params, info, sta, hdr-&gt;frame_control);</div><div class='ctx'> </div><div class='ctx'> 	/* Copy MAC header from skb into command buffer */</div><div class='del'>-	memcpy(tx_cmd-&gt;hdr, hdr, hdrlen);</div><div class='add'>+	iwl_mvm_copy_hdr(tx_cmd-&gt;hdr, hdr, hdrlen, addr3_override);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return dev_cmd;</div><div class='hunk'>@@ -550,11 +662,11 @@ static void iwl_mvm_skb_prepare_status(struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_mvm_get_ctrl_vif_queue(struct iwl_mvm *mvm,</div><div class='add'>+				      struct iwl_mvm_vif_link_info *link,</div><div class='ctx'> 				      struct ieee80211_tx_info *info,</div><div class='del'>-				      struct ieee80211_hdr *hdr)</div><div class='add'>+				      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm_vif *mvmvif =</div><div class='del'>-		iwl_mvm_vif_from_mac80211(info-&gt;control.vif);</div><div class='add'>+	struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='ctx'> 	__le16 fc = hdr-&gt;frame_control;</div><div class='ctx'> </div><div class='ctx'> 	switch (info-&gt;control.vif-&gt;type) {</div><div class='hunk'>@@ -571,17 +683,17 @@ static int iwl_mvm_get_ctrl_vif_queue(struct iwl_mvm *mvm,</div><div class='ctx'> 		 * reason 7 ("Class 3 frame received from nonassociated STA").</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (ieee80211_is_mgmt(fc) &amp;&amp;</div><div class='del'>-		    (!ieee80211_is_bufferable_mmpdu(fc) ||</div><div class='add'>+		    (!ieee80211_is_bufferable_mmpdu(skb) ||</div><div class='ctx'> 		     ieee80211_is_deauth(fc) || ieee80211_is_disassoc(fc)))</div><div class='del'>-			return mvm-&gt;probe_queue;</div><div class='add'>+			return link-&gt;mgmt_queue;</div><div class='ctx'> </div><div class='ctx'> 		if (!ieee80211_has_order(fc) &amp;&amp; !ieee80211_is_probe_req(fc) &amp;&amp;</div><div class='ctx'> 		    is_multicast_ether_addr(hdr-&gt;addr1))</div><div class='del'>-			return mvmvif-&gt;cab_queue;</div><div class='add'>+			return link-&gt;cab_queue;</div><div class='ctx'> </div><div class='ctx'> 		WARN_ONCE(info-&gt;control.vif-&gt;type != NL80211_IFTYPE_ADHOC,</div><div class='ctx'> 			  "fc=0x%02x", le16_to_cpu(fc));</div><div class='del'>-		return mvm-&gt;probe_queue;</div><div class='add'>+		return link-&gt;mgmt_queue;</div><div class='ctx'> 	case NL80211_IFTYPE_P2P_DEVICE:</div><div class='ctx'> 		if (ieee80211_is_mgmt(fc))</div><div class='ctx'> 			return mvm-&gt;p2p_dev_queue;</div><div class='hunk'>@@ -603,7 +715,8 @@ static void iwl_mvm_probe_resp_set_noa(struct iwl_mvm *mvm,</div><div class='ctx'> 	struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb-&gt;data;</div><div class='ctx'> 	int base_len = (u8 *)mgmt-&gt;u.probe_resp.variable - (u8 *)mgmt;</div><div class='ctx'> 	struct iwl_probe_resp_data *resp_data;</div><div class='del'>-	u8 *ie, *pos;</div><div class='add'>+	const u8 *ie;</div><div class='add'>+	u8 *pos;</div><div class='ctx'> 	u8 match[] = {</div><div class='ctx'> 		(WLAN_OUI_WFA &gt;&gt; 16) &amp; 0xff,</div><div class='ctx'> 		(WLAN_OUI_WFA &gt;&gt; 8) &amp; 0xff,</div><div class='hunk'>@@ -613,17 +726,17 @@ static void iwl_mvm_probe_resp_set_noa(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-	resp_data = rcu_dereference(mvmvif-&gt;probe_resp_data);</div><div class='add'>+	resp_data = rcu_dereference(mvmvif-&gt;deflink.probe_resp_data);</div><div class='ctx'> 	if (!resp_data)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (!resp_data-&gt;notif.noa_active)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ie = (u8 *)cfg80211_find_ie_match(WLAN_EID_VENDOR_SPECIFIC,</div><div class='del'>-					  mgmt-&gt;u.probe_resp.variable,</div><div class='del'>-					  skb-&gt;len - base_len,</div><div class='del'>-					  match, 4, 2);</div><div class='add'>+	ie = cfg80211_find_ie_match(WLAN_EID_VENDOR_SPECIFIC,</div><div class='add'>+				    mgmt-&gt;u.probe_resp.variable,</div><div class='add'>+				    skb-&gt;len - base_len,</div><div class='add'>+				    match, 4, 2);</div><div class='ctx'> 	if (!ie) {</div><div class='ctx'> 		IWL_DEBUG_TX(mvm, "probe resp doesn't have P2P IE\n");</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -680,31 +793,55 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb)</div><div class='ctx'> 	if (info.control.vif) {</div><div class='ctx'> 		struct iwl_mvm_vif *mvmvif =</div><div class='ctx'> 			iwl_mvm_vif_from_mac80211(info.control.vif);</div><div class='add'>+		bool p2p_aux = iwl_mvm_has_p2p_over_aux(mvm);</div><div class='ctx'> </div><div class='del'>-		if (info.control.vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE ||</div><div class='del'>-		    info.control.vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='del'>-		    info.control.vif-&gt;type == NL80211_IFTYPE_ADHOC) {</div><div class='del'>-			if (!ieee80211_is_data(hdr-&gt;frame_control))</div><div class='del'>-				sta_id = mvmvif-&gt;bcast_sta.sta_id;</div><div class='del'>-			else</div><div class='del'>-				sta_id = mvmvif-&gt;mcast_sta.sta_id;</div><div class='del'>-</div><div class='del'>-			queue = iwl_mvm_get_ctrl_vif_queue(mvm, &amp;info, hdr);</div><div class='del'>-		} else if (info.control.vif-&gt;type == NL80211_IFTYPE_MONITOR) {</div><div class='del'>-			queue = mvm-&gt;snif_queue;</div><div class='del'>-			sta_id = mvm-&gt;snif_sta.sta_id;</div><div class='del'>-		} else if (info.control.vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='del'>-			   offchannel) {</div><div class='add'>+		if ((info.control.vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE &amp;&amp;</div><div class='add'>+		     p2p_aux) ||</div><div class='add'>+		    (info.control.vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+		     offchannel)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * IWL_MVM_OFFCHANNEL_QUEUE is used for ROC packets</div><div class='del'>-			 * that can be used in 2 different types of vifs, P2P &amp;</div><div class='del'>-			 * STATION.</div><div class='del'>-			 * P2P uses the offchannel queue.</div><div class='add'>+			 * that can be used in 2 different types of vifs, P2P</div><div class='add'>+			 * Device and STATION.</div><div class='add'>+			 * P2P Device uses the offchannel queue.</div><div class='ctx'> 			 * STATION (HS2.0) uses the auxiliary context of the FW,</div><div class='ctx'> 			 * and hence needs to be sent on the aux queue.</div><div class='add'>+			 * If P2P_DEV_OVER_AUX is supported (p2p_aux = true)</div><div class='add'>+			 * also P2P Device uses the aux queue.</div><div class='ctx'> 			 */</div><div class='ctx'> 			sta_id = mvm-&gt;aux_sta.sta_id;</div><div class='ctx'> 			queue = mvm-&gt;aux_queue;</div><div class='add'>+			if (WARN_ON(queue == IWL_MVM_INVALID_QUEUE))</div><div class='add'>+				return -1;</div><div class='add'>+		} else if (info.control.vif-&gt;type ==</div><div class='add'>+			   NL80211_IFTYPE_P2P_DEVICE ||</div><div class='add'>+			   info.control.vif-&gt;type == NL80211_IFTYPE_AP ||</div><div class='add'>+			   info.control.vif-&gt;type == NL80211_IFTYPE_ADHOC) {</div><div class='add'>+			u32 link_id = u32_get_bits(info.control.flags,</div><div class='add'>+						   IEEE80211_TX_CTRL_MLO_LINK);</div><div class='add'>+			struct iwl_mvm_vif_link_info *link;</div><div class='add'>+</div><div class='add'>+			if (link_id == IEEE80211_LINK_UNSPECIFIED) {</div><div class='add'>+				if (info.control.vif-&gt;active_links)</div><div class='add'>+					link_id = ffs(info.control.vif-&gt;active_links) - 1;</div><div class='add'>+				else</div><div class='add'>+					link_id = 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			link = mvmvif-&gt;link[link_id];</div><div class='add'>+			if (WARN_ON(!link))</div><div class='add'>+				return -1;</div><div class='add'>+</div><div class='add'>+			if (!ieee80211_is_data(hdr-&gt;frame_control))</div><div class='add'>+				sta_id = link-&gt;bcast_sta.sta_id;</div><div class='add'>+			else</div><div class='add'>+				sta_id = link-&gt;mcast_sta.sta_id;</div><div class='add'>+</div><div class='add'>+			queue = iwl_mvm_get_ctrl_vif_queue(mvm, link, &amp;info,</div><div class='add'>+							   skb);</div><div class='add'>+		} else if (info.control.vif-&gt;type == NL80211_IFTYPE_MONITOR) {</div><div class='add'>+			queue = mvm-&gt;snif_queue;</div><div class='add'>+			sta_id = mvm-&gt;snif_sta.sta_id;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -718,7 +855,8 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_TX(mvm, "station Id %d, queue=%d\n", sta_id, queue);</div><div class='ctx'> </div><div class='del'>-	dev_cmd = iwl_mvm_set_tx_params(mvm, skb, &amp;info, hdrlen, NULL, sta_id);</div><div class='add'>+	dev_cmd = iwl_mvm_set_tx_params(mvm, skb, &amp;info, hdrlen, NULL, sta_id,</div><div class='add'>+					NULL);</div><div class='ctx'> 	if (!dev_cmd)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='hunk'>@@ -737,13 +875,14 @@ unsigned int iwl_mvm_max_amsdu_size(struct iwl_mvm *mvm,</div><div class='ctx'> 				    struct ieee80211_sta *sta, unsigned int tid)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='del'>-	enum nl80211_band band = mvmsta-&gt;vif-&gt;bss_conf.chandef.chan-&gt;band;</div><div class='ctx'> 	u8 ac = tid_to_mac80211_ac[tid];</div><div class='add'>+	enum nl80211_band band;</div><div class='ctx'> 	unsigned int txf;</div><div class='del'>-	int lmac = iwl_mvm_get_lmac_id(mvm-&gt;fw, band);</div><div class='add'>+	unsigned int val;</div><div class='add'>+	int lmac;</div><div class='ctx'> </div><div class='ctx'> 	/* For HE redirect to trigger based fifos */</div><div class='del'>-	if (sta-&gt;he_cap.has_he &amp;&amp; !WARN_ON(!iwl_mvm_has_new_tx_api(mvm)))</div><div class='add'>+	if (sta-&gt;deflink.he_cap.has_he &amp;&amp; !WARN_ON(!iwl_mvm_has_new_tx_api(mvm)))</div><div class='ctx'> 		ac += 4;</div><div class='ctx'> </div><div class='ctx'> 	txf = iwl_mvm_mac_ac_to_tx_fifo(mvm, ac);</div><div class='hunk'>@@ -754,78 +893,42 @@ unsigned int iwl_mvm_max_amsdu_size(struct iwl_mvm *mvm,</div><div class='ctx'> 	 * We also want to have the start of the next packet inside the</div><div class='ctx'> 	 * fifo to be able to send bursts.</div><div class='ctx'> 	 */</div><div class='del'>-	return min_t(unsigned int, mvmsta-&gt;max_amsdu_len,</div><div class='del'>-		     mvm-&gt;fwrt.smem_cfg.lmac[lmac].txfifo_size[txf] - 256);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_INET</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-iwl_mvm_tx_tso_segment(struct sk_buff *skb, unsigned int num_subframes,</div><div class='del'>-		       netdev_features_t netdev_flags,</div><div class='del'>-		       struct sk_buff_head *mpdus_skb)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *tmp, *next;</div><div class='del'>-	struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='del'>-	char cb[sizeof(skb-&gt;cb)];</div><div class='del'>-	u16 i = 0;</div><div class='del'>-	unsigned int tcp_payload_len;</div><div class='del'>-	unsigned int mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='del'>-	bool ipv4 = (skb-&gt;protocol == htons(ETH_P_IP));</div><div class='del'>-	bool qos = ieee80211_is_data_qos(hdr-&gt;frame_control);</div><div class='del'>-	u16 ip_base_id = ipv4 ? ntohs(ip_hdr(skb)-&gt;id) : 0;</div><div class='add'>+	val = mvmsta-&gt;max_amsdu_len;</div><div class='ctx'> </div><div class='del'>-	skb_shinfo(skb)-&gt;gso_size = num_subframes * mss;</div><div class='del'>-	memcpy(cb, skb-&gt;cb, sizeof(cb));</div><div class='add'>+	if (hweight16(sta-&gt;valid_links) &lt;= 1) {</div><div class='add'>+		if (sta-&gt;valid_links) {</div><div class='add'>+			struct ieee80211_bss_conf *link_conf;</div><div class='add'>+			unsigned int link = ffs(sta-&gt;valid_links) - 1;</div><div class='ctx'> </div><div class='del'>-	next = skb_gso_segment(skb, netdev_flags);</div><div class='del'>-	skb_shinfo(skb)-&gt;gso_size = mss;</div><div class='del'>-	skb_shinfo(skb)-&gt;gso_type = ipv4 ? SKB_GSO_TCPV4 : SKB_GSO_TCPV6;</div><div class='del'>-	if (WARN_ON_ONCE(IS_ERR(next)))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	else if (next)</div><div class='del'>-		consume_skb(skb);</div><div class='del'>-</div><div class='del'>-	skb_list_walk_safe(next, tmp, next) {</div><div class='del'>-		memcpy(tmp-&gt;cb, cb, sizeof(tmp-&gt;cb));</div><div class='del'>-		/*</div><div class='del'>-		 * Compute the length of all the data added for the A-MSDU.</div><div class='del'>-		 * This will be used to compute the length to write in the TX</div><div class='del'>-		 * command. We have: SNAP + IP + TCP for n -1 subframes and</div><div class='del'>-		 * ETH header for n subframes.</div><div class='del'>-		 */</div><div class='del'>-		tcp_payload_len = skb_tail_pointer(tmp) -</div><div class='del'>-			skb_transport_header(tmp) -</div><div class='del'>-			tcp_hdrlen(tmp) + tmp-&gt;data_len;</div><div class='del'>-</div><div class='del'>-		if (ipv4)</div><div class='del'>-			ip_hdr(tmp)-&gt;id = htons(ip_base_id + i * num_subframes);</div><div class='del'>-</div><div class='del'>-		if (tcp_payload_len &gt; mss) {</div><div class='del'>-			skb_shinfo(tmp)-&gt;gso_size = mss;</div><div class='del'>-			skb_shinfo(tmp)-&gt;gso_type = ipv4 ? SKB_GSO_TCPV4 :</div><div class='del'>-							   SKB_GSO_TCPV6;</div><div class='add'>+			rcu_read_lock();</div><div class='add'>+			link_conf = rcu_dereference(mvmsta-&gt;vif-&gt;link_conf[link]);</div><div class='add'>+			if (WARN_ON(!link_conf))</div><div class='add'>+				band = NL80211_BAND_2GHZ;</div><div class='add'>+			else</div><div class='add'>+				band = link_conf-&gt;chanreq.oper.chan-&gt;band;</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> 		} else {</div><div class='del'>-			if (qos) {</div><div class='del'>-				u8 *qc;</div><div class='del'>-</div><div class='del'>-				if (ipv4)</div><div class='del'>-					ip_send_check(ip_hdr(tmp));</div><div class='del'>-</div><div class='del'>-				qc = ieee80211_get_qos_ctl((void *)tmp-&gt;data);</div><div class='del'>-				*qc &amp;= ~IEEE80211_QOS_CTL_A_MSDU_PRESENT;</div><div class='del'>-			}</div><div class='del'>-			skb_shinfo(tmp)-&gt;gso_size = 0;</div><div class='add'>+			band = mvmsta-&gt;vif-&gt;bss_conf.chanreq.oper.chan-&gt;band;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		skb_mark_not_on_list(tmp);</div><div class='del'>-		__skb_queue_tail(mpdus_skb, tmp);</div><div class='del'>-		i++;</div><div class='add'>+		lmac = iwl_mvm_get_lmac_id(mvm, band);</div><div class='add'>+	} else if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			       IWL_UCODE_TLV_CAPA_CDB_SUPPORT)) {</div><div class='add'>+		/* for real MLO restrict to both LMACs if they exist */</div><div class='add'>+		lmac = IWL_LMAC_5G_INDEX;</div><div class='add'>+		val = min_t(unsigned int, val,</div><div class='add'>+			    mvm-&gt;fwrt.smem_cfg.lmac[lmac].txfifo_size[txf] - 256);</div><div class='add'>+		lmac = IWL_LMAC_24G_INDEX;</div><div class='add'>+	} else {</div><div class='add'>+		lmac = IWL_LMAC_24G_INDEX;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return min_t(unsigned int, val,</div><div class='add'>+		     mvm-&gt;fwrt.smem_cfg.lmac[lmac].txfifo_size[txf] - 256);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_INET</div><div class='add'>+</div><div class='ctx'> static int iwl_mvm_tx_tso(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 			  struct ieee80211_tx_info *info,</div><div class='ctx'> 			  struct ieee80211_sta *sta,</div><div class='hunk'>@@ -839,13 +942,12 @@ static int iwl_mvm_tx_tso(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 	netdev_features_t netdev_flags = NETIF_F_CSUM_MASK | NETIF_F_SG;</div><div class='ctx'> 	u8 tid;</div><div class='ctx'> </div><div class='del'>-	snap_ip_tcp = 8 + skb_transport_header(skb) - skb_network_header(skb) +</div><div class='del'>-		tcp_hdrlen(skb);</div><div class='add'>+	snap_ip_tcp = 8 + skb_network_header_len(skb) + tcp_hdrlen(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (!mvmsta-&gt;max_amsdu_len ||</div><div class='ctx'> 	    !ieee80211_is_data_qos(hdr-&gt;frame_control) ||</div><div class='ctx'> 	    !mvmsta-&gt;amsdu_enabled)</div><div class='del'>-		return iwl_mvm_tx_tso_segment(skb, 1, netdev_flags, mpdus_skb);</div><div class='add'>+		return iwl_tx_tso_segment(skb, 1, netdev_flags, mpdus_skb);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Do not build AMSDU for IPv6 with extension headers.</div><div class='hunk'>@@ -855,7 +957,7 @@ static int iwl_mvm_tx_tso(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 	    ((struct ipv6hdr *)skb_network_header(skb))-&gt;nexthdr !=</div><div class='ctx'> 	    IPPROTO_TCP) {</div><div class='ctx'> 		netdev_flags &amp;= ~NETIF_F_CSUM_MASK;</div><div class='del'>-		return iwl_mvm_tx_tso_segment(skb, 1, netdev_flags, mpdus_skb);</div><div class='add'>+		return iwl_tx_tso_segment(skb, 1, netdev_flags, mpdus_skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tid = ieee80211_get_tid(hdr);</div><div class='hunk'>@@ -869,13 +971,13 @@ static int iwl_mvm_tx_tso(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 	if ((info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU &amp;&amp;</div><div class='ctx'> 	     !mvmsta-&gt;tid_data[tid].amsdu_in_ampdu_allowed) ||</div><div class='ctx'> 	    !(mvmsta-&gt;amsdu_enabled &amp; BIT(tid)))</div><div class='del'>-		return iwl_mvm_tx_tso_segment(skb, 1, netdev_flags, mpdus_skb);</div><div class='add'>+		return iwl_tx_tso_segment(skb, 1, netdev_flags, mpdus_skb);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Take the min of ieee80211 station and mvm station</div><div class='ctx'> 	 */</div><div class='ctx'> 	max_amsdu_len =</div><div class='del'>-		min_t(unsigned int, sta-&gt;max_amsdu_len,</div><div class='add'>+		min_t(unsigned int, sta-&gt;cur-&gt;max_amsdu_len,</div><div class='ctx'> 		      iwl_mvm_max_amsdu_size(mvm, sta, tid));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -884,7 +986,7 @@ static int iwl_mvm_tx_tso(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 	 * section 8.7.3 NOTE 3).</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU &amp;&amp;</div><div class='del'>-	    !sta-&gt;vht_cap.vht_supported)</div><div class='add'>+	    !sta-&gt;deflink.vht_cap.vht_supported)</div><div class='ctx'> 		max_amsdu_len = min_t(unsigned int, max_amsdu_len, 4095);</div><div class='ctx'> </div><div class='ctx'> 	/* Sub frame header + SNAP + IP header + TCP header + MSS */</div><div class='hunk'>@@ -911,7 +1013,7 @@ static int iwl_mvm_tx_tso(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 	 *	1 more for the potential data in the header</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((num_subframes * 2 + skb_shinfo(skb)-&gt;nr_frags + 1) &gt;</div><div class='del'>-	    mvm-&gt;trans-&gt;max_skb_frags)</div><div class='add'>+	    mvm-&gt;trans-&gt;info.max_skb_frags)</div><div class='ctx'> 		num_subframes = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (num_subframes &gt; 1)</div><div class='hunk'>@@ -927,8 +1029,7 @@ static int iwl_mvm_tx_tso(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 	 * Trick the segmentation function to make it</div><div class='ctx'> 	 * create SKBs that can fit into one A-MSDU.</div><div class='ctx'> 	 */</div><div class='del'>-	return iwl_mvm_tx_tso_segment(skb, num_subframes, netdev_flags,</div><div class='del'>-				      mpdus_skb);</div><div class='add'>+	return iwl_tx_tso_segment(skb, num_subframes, netdev_flags, mpdus_skb);</div><div class='ctx'> }</div><div class='ctx'> #else /* CONFIG_INET */</div><div class='ctx'> static int iwl_mvm_tx_tso(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='hunk'>@@ -1007,7 +1108,8 @@ static int iwl_mvm_tx_pkt_queued(struct iwl_mvm *mvm,</div><div class='ctx'>  */</div><div class='ctx'> static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 			   struct ieee80211_tx_info *info,</div><div class='del'>-			   struct ieee80211_sta *sta)</div><div class='add'>+			   struct ieee80211_sta *sta,</div><div class='add'>+			   const u8 *addr3_override)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta;</div><div class='hunk'>@@ -1019,6 +1121,9 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 	bool is_ampdu = false;</div><div class='ctx'> 	int hdrlen;</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON_ONCE(!sta))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='ctx'> 	mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='ctx'> 	fc = hdr-&gt;frame_control;</div><div class='ctx'> 	hdrlen = ieee80211_hdrlen(fc);</div><div class='hunk'>@@ -1026,17 +1131,18 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 	if (IWL_MVM_NON_TRANSMITTING_AP &amp;&amp; ieee80211_is_probe_resp(fc))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(!mvmsta))</div><div class='add'>+	if (WARN_ON_ONCE(mvmsta-&gt;deflink.sta_id == IWL_INVALID_STA))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(mvmsta-&gt;sta_id == IWL_MVM_INVALID_STA))</div><div class='add'>+	if (unlikely(ieee80211_is_any_nullfunc(fc)) &amp;&amp; sta-&gt;deflink.he_cap.has_he)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(ieee80211_is_probe_resp(fc)))</div><div class='ctx'> 		iwl_mvm_probe_resp_set_noa(mvm, skb);</div><div class='ctx'> </div><div class='ctx'> 	dev_cmd = iwl_mvm_set_tx_params(mvm, skb, info, hdrlen,</div><div class='del'>-					sta, mvmsta-&gt;sta_id);</div><div class='add'>+					sta, mvmsta-&gt;deflink.sta_id,</div><div class='add'>+					addr3_override);</div><div class='ctx'> 	if (!dev_cmd)</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='hunk'>@@ -1050,8 +1156,8 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 	spin_lock(&amp;mvmsta-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* nullfunc frames should go to the MGMT queue regardless of QOS,</div><div class='del'>-	 * the condition of !ieee80211_is_qos_nullfunc(fc) keeps the default</div><div class='del'>-	 * assignment of MGMT TID</div><div class='add'>+	 * the conditions of !ieee80211_is_qos_nullfunc(fc) and</div><div class='add'>+	 * !ieee80211_is_data_qos(fc) keep the default assignment of MGMT TID</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ieee80211_is_data_qos(fc) &amp;&amp; !ieee80211_is_qos_nullfunc(fc)) {</div><div class='ctx'> 		tid = ieee80211_get_tid(hdr);</div><div class='hunk'>@@ -1069,14 +1175,15 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 		seq_number &amp;= IEEE80211_SCTL_SEQ;</div><div class='ctx'> </div><div class='ctx'> 		if (!iwl_mvm_has_new_tx_api(mvm)) {</div><div class='del'>-			struct iwl_tx_cmd *tx_cmd = (void *)dev_cmd-&gt;payload;</div><div class='add'>+			struct iwl_tx_cmd_v6 *tx_cmd = (void *)dev_cmd-&gt;payload;</div><div class='ctx'> </div><div class='ctx'> 			hdr-&gt;seq_ctrl &amp;= cpu_to_le16(IEEE80211_SCTL_FRAG);</div><div class='ctx'> 			hdr-&gt;seq_ctrl |= cpu_to_le16(seq_number);</div><div class='ctx'> 			/* update the tx_cmd hdr as it was already copied */</div><div class='ctx'> 			tx_cmd-&gt;hdr-&gt;seq_ctrl = hdr-&gt;seq_ctrl;</div><div class='ctx'> 		}</div><div class='del'>-	} else if (ieee80211_is_data(fc) &amp;&amp; !ieee80211_is_data_qos(fc)) {</div><div class='add'>+	} else if (ieee80211_is_data(fc) &amp;&amp; !ieee80211_is_data_qos(fc) &amp;&amp;</div><div class='add'>+		   !ieee80211_is_nullfunc(fc)) {</div><div class='ctx'> 		tid = IWL_TID_NON_QOS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1111,12 +1218,23 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_TX(mvm, "TX to [%d|%d] Q:%d - seq: 0x%x len %d\n",</div><div class='del'>-		     mvmsta-&gt;sta_id, tid, txq_id,</div><div class='add'>+		     mvmsta-&gt;deflink.sta_id, tid, txq_id,</div><div class='ctx'> 		     IEEE80211_SEQ_TO_SN(seq_number), skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	/* From now on, we cannot access info-&gt;control */</div><div class='ctx'> 	iwl_mvm_skb_prepare_status(skb, dev_cmd);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * The IV is introduced by the HW for new tx api, and it is not present</div><div class='add'>+	 * in the skb, hence, don't tell iwl_mvm_mei_tx_copy_to_csme about the</div><div class='add'>+	 * IV for those devices.</div><div class='add'>+	 */</div><div class='add'>+	if (ieee80211_is_data(fc))</div><div class='add'>+		iwl_mvm_mei_tx_copy_to_csme(mvm, skb,</div><div class='add'>+					    info-&gt;control.hw_key &amp;&amp;</div><div class='add'>+					    !iwl_mvm_has_new_tx_api(mvm) ?</div><div class='add'>+					    info-&gt;control.hw_key-&gt;iv_len : 0);</div><div class='add'>+</div><div class='ctx'> 	if (iwl_trans_tx(mvm-&gt;trans, skb, dev_cmd, txq_id))</div><div class='ctx'> 		goto drop_unlock_sta;</div><div class='ctx'> </div><div class='hunk'>@@ -1135,52 +1253,99 @@ drop_unlock_sta:</div><div class='ctx'> 	iwl_trans_free_tx_cmd(mvm-&gt;trans, dev_cmd);</div><div class='ctx'> 	spin_unlock(&amp;mvmsta-&gt;lock);</div><div class='ctx'> drop:</div><div class='del'>-	IWL_DEBUG_TX(mvm, "TX to [%d|%d] dropped\n", mvmsta-&gt;sta_id, tid);</div><div class='add'>+	IWL_DEBUG_TX(mvm, "TX to [%d|%d] dropped\n", mvmsta-&gt;deflink.sta_id,</div><div class='add'>+		     tid);</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iwl_mvm_tx_skb_sta(struct iwl_mvm *mvm, struct sk_buff *skb,</div><div class='ctx'> 		       struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+	struct iwl_mvm_sta *mvmsta;</div><div class='ctx'> 	struct ieee80211_tx_info info;</div><div class='ctx'> 	struct sk_buff_head mpdus_skbs;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='ctx'> 	unsigned int payload_len;</div><div class='ctx'> 	int ret;</div><div class='add'>+	struct sk_buff *orig_skb = skb;</div><div class='add'>+	const u8 *addr3;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(!mvmsta))</div><div class='add'>+	if (WARN_ON_ONCE(!sta))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(mvmsta-&gt;sta_id == IWL_MVM_INVALID_STA))</div><div class='add'>+	mvmsta = iwl_mvm_sta_from_mac80211(sta);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(mvmsta-&gt;deflink.sta_id == IWL_INVALID_STA))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;info, skb-&gt;cb, sizeof(info));</div><div class='ctx'> </div><div class='ctx'> 	if (!skb_is_gso(skb))</div><div class='del'>-		return iwl_mvm_tx_mpdu(mvm, skb, &amp;info, sta);</div><div class='add'>+		return iwl_mvm_tx_mpdu(mvm, skb, &amp;info, sta, NULL);</div><div class='ctx'> </div><div class='ctx'> 	payload_len = skb_tail_pointer(skb) - skb_transport_header(skb) -</div><div class='ctx'> 		tcp_hdrlen(skb) + skb-&gt;data_len;</div><div class='ctx'> </div><div class='ctx'> 	if (payload_len &lt;= skb_shinfo(skb)-&gt;gso_size)</div><div class='del'>-		return iwl_mvm_tx_mpdu(mvm, skb, &amp;info, sta);</div><div class='add'>+		return iwl_mvm_tx_mpdu(mvm, skb, &amp;info, sta, NULL);</div><div class='ctx'> </div><div class='ctx'> 	__skb_queue_head_init(&amp;mpdus_skbs);</div><div class='ctx'> </div><div class='add'>+	vif = info.control.vif;</div><div class='add'>+	if (!vif)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='ctx'> 	ret = iwl_mvm_tx_tso(mvm, skb, &amp;info, sta, &amp;mpdus_skbs);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(skb_queue_empty(&amp;mpdus_skbs)))</div><div class='del'>-		return ret;</div><div class='add'>+	WARN_ON(skb_queue_empty(&amp;mpdus_skbs));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * As described in IEEE sta 802.11-2020, table 9-30 (Address</div><div class='add'>+	 * field contents), A-MSDU address 3 should contain the BSSID</div><div class='add'>+	 * address.</div><div class='add'>+	 * Pass address 3 down to iwl_mvm_tx_mpdu() and further to set it</div><div class='add'>+	 * in the command header. We need to preserve the original</div><div class='add'>+	 * address 3 in the skb header to correctly create all the</div><div class='add'>+	 * A-MSDU subframe headers from it.</div><div class='add'>+	 */</div><div class='add'>+	switch (vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		addr3 = vif-&gt;cfg.ap_addr;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		addr3 = vif-&gt;addr;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		addr3 = NULL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	while (!skb_queue_empty(&amp;mpdus_skbs)) {</div><div class='add'>+		struct ieee80211_hdr *hdr;</div><div class='add'>+		bool amsdu;</div><div class='add'>+</div><div class='ctx'> 		skb = __skb_dequeue(&amp;mpdus_skbs);</div><div class='add'>+		hdr = (void *)skb-&gt;data;</div><div class='add'>+		amsdu = ieee80211_is_data_qos(hdr-&gt;frame_control) &amp;&amp;</div><div class='add'>+			(*ieee80211_get_qos_ctl(hdr) &amp;</div><div class='add'>+			 IEEE80211_QOS_CTL_A_MSDU_PRESENT);</div><div class='ctx'> </div><div class='del'>-		ret = iwl_mvm_tx_mpdu(mvm, skb, &amp;info, sta);</div><div class='add'>+		ret = iwl_mvm_tx_mpdu(mvm, skb, &amp;info, sta,</div><div class='add'>+				      amsdu ? addr3 : NULL);</div><div class='ctx'> 		if (ret) {</div><div class='add'>+			/* Free skbs created as part of TSO logic that have not yet been dequeued */</div><div class='ctx'> 			__skb_queue_purge(&amp;mpdus_skbs);</div><div class='del'>-			return ret;</div><div class='add'>+			/* skb here is not necessarily same as skb that entered this method,</div><div class='add'>+			 * so free it explicitly.</div><div class='add'>+			 */</div><div class='add'>+			if (skb == orig_skb)</div><div class='add'>+				ieee80211_free_txskb(mvm-&gt;hw, skb);</div><div class='add'>+			else</div><div class='add'>+				kfree_skb(skb);</div><div class='add'>+			/* there was error, but we consumed skb one way or another, so return 0 */</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1197,8 +1362,7 @@ static void iwl_mvm_check_ratid_empty(struct iwl_mvm *mvm,</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvmsta-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if ((tid_data-&gt;state == IWL_AGG_ON ||</div><div class='del'>-	     tid_data-&gt;state == IWL_EMPTYING_HW_QUEUE_DELBA) &amp;&amp;</div><div class='add'>+	if (tid_data-&gt;state == IWL_AGG_ON &amp;&amp;</div><div class='ctx'> 	    iwl_mvm_tid_queued(mvm, tid_data) == 0) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Now that this aggregation or DQA queue is empty tell</div><div class='hunk'>@@ -1213,7 +1377,7 @@ static void iwl_mvm_check_ratid_empty(struct iwl_mvm *mvm,</div><div class='ctx'> 	 * to align the wrap around of ssn so we compare relevant values.</div><div class='ctx'> 	 */</div><div class='ctx'> 	normalized_ssn = tid_data-&gt;ssn;</div><div class='del'>-	if (mvm-&gt;trans-&gt;trans_cfg-&gt;gen2)</div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;gen2)</div><div class='ctx'> 		normalized_ssn &amp;= 0xff;</div><div class='ctx'> </div><div class='ctx'> 	if (normalized_ssn != tid_data-&gt;next_reclaimed)</div><div class='hunk'>@@ -1227,15 +1391,6 @@ static void iwl_mvm_check_ratid_empty(struct iwl_mvm *mvm,</div><div class='ctx'> 		tid_data-&gt;state = IWL_AGG_STARTING;</div><div class='ctx'> 		ieee80211_start_tx_ba_cb_irqsafe(vif, sta-&gt;addr, tid);</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='del'>-	case IWL_EMPTYING_HW_QUEUE_DELBA:</div><div class='del'>-		IWL_DEBUG_TX_QUEUES(mvm,</div><div class='del'>-				    "Can continue DELBA flow ssn = next_recl = %d\n",</div><div class='del'>-				    tid_data-&gt;next_reclaimed);</div><div class='del'>-		tid_data-&gt;state = IWL_AGG_OFF;</div><div class='del'>-		ieee80211_stop_tx_ba_cb_irqsafe(vif, sta-&gt;addr, tid);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1281,53 +1436,82 @@ const char *iwl_mvm_get_tx_fail_reason(u32 status)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_IWLWIFI_DEBUG */</div><div class='ctx'> </div><div class='del'>-void iwl_mvm_hwrate_to_tx_rate(u32 rate_n_flags,</div><div class='del'>-			       enum nl80211_band band,</div><div class='del'>-			       struct ieee80211_tx_rate *r)</div><div class='add'>+static int iwl_mvm_get_hwrate_chan_width(u32 chan_width)</div><div class='ctx'> {</div><div class='del'>-	if (rate_n_flags &amp; RATE_HT_MCS_GF_MSK)</div><div class='del'>-		r-&gt;flags |= IEEE80211_TX_RC_GREEN_FIELD;</div><div class='del'>-	switch (rate_n_flags &amp; RATE_MCS_CHAN_WIDTH_MSK) {</div><div class='add'>+	switch (chan_width) {</div><div class='ctx'> 	case RATE_MCS_CHAN_WIDTH_20:</div><div class='del'>-		break;</div><div class='add'>+		return 0;</div><div class='ctx'> 	case RATE_MCS_CHAN_WIDTH_40:</div><div class='del'>-		r-&gt;flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;</div><div class='del'>-		break;</div><div class='add'>+		return IEEE80211_TX_RC_40_MHZ_WIDTH;</div><div class='ctx'> 	case RATE_MCS_CHAN_WIDTH_80:</div><div class='del'>-		r-&gt;flags |= IEEE80211_TX_RC_80_MHZ_WIDTH;</div><div class='del'>-		break;</div><div class='add'>+		return IEEE80211_TX_RC_80_MHZ_WIDTH;</div><div class='ctx'> 	case RATE_MCS_CHAN_WIDTH_160:</div><div class='del'>-		r-&gt;flags |= IEEE80211_TX_RC_160_MHZ_WIDTH;</div><div class='del'>-		break;</div><div class='add'>+		return IEEE80211_TX_RC_160_MHZ_WIDTH;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_hwrate_to_tx_rate(u32 rate_n_flags,</div><div class='add'>+			       enum nl80211_band band,</div><div class='add'>+			       struct ieee80211_tx_rate *r)</div><div class='add'>+{</div><div class='add'>+	u32 format = rate_n_flags &amp; RATE_MCS_MOD_TYPE_MSK;</div><div class='add'>+	u32 rate = format == RATE_MCS_MOD_TYPE_HT ?</div><div class='add'>+		RATE_HT_MCS_INDEX(rate_n_flags) :</div><div class='add'>+		rate_n_flags &amp; RATE_MCS_CODE_MSK;</div><div class='add'>+</div><div class='add'>+	r-&gt;flags |=</div><div class='add'>+		iwl_mvm_get_hwrate_chan_width(rate_n_flags &amp;</div><div class='add'>+					      RATE_MCS_CHAN_WIDTH_MSK);</div><div class='add'>+</div><div class='ctx'> 	if (rate_n_flags &amp; RATE_MCS_SGI_MSK)</div><div class='ctx'> 		r-&gt;flags |= IEEE80211_TX_RC_SHORT_GI;</div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_HT_MSK) {</div><div class='add'>+	switch (format) {</div><div class='add'>+	case RATE_MCS_MOD_TYPE_HT:</div><div class='ctx'> 		r-&gt;flags |= IEEE80211_TX_RC_MCS;</div><div class='del'>-		r-&gt;idx = rate_n_flags &amp; RATE_HT_MCS_INDEX_MSK;</div><div class='del'>-	} else if (rate_n_flags &amp; RATE_MCS_VHT_MSK) {</div><div class='del'>-		ieee80211_rate_set_vht(</div><div class='del'>-			r, rate_n_flags &amp; RATE_VHT_MCS_RATE_CODE_MSK,</div><div class='del'>-			((rate_n_flags &amp; RATE_VHT_MCS_NSS_MSK) &gt;&gt;</div><div class='del'>-						RATE_VHT_MCS_NSS_POS) + 1);</div><div class='add'>+		r-&gt;idx = rate;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_VHT:</div><div class='add'>+		ieee80211_rate_set_vht(r, rate,</div><div class='add'>+				       FIELD_GET(RATE_MCS_NSS_MSK,</div><div class='add'>+						 rate_n_flags) + 1);</div><div class='ctx'> 		r-&gt;flags |= IEEE80211_TX_RC_VHT_MCS;</div><div class='del'>-	} else {</div><div class='del'>-		r-&gt;idx = iwl_mvm_legacy_rate_to_mac80211_idx(rate_n_flags,</div><div class='del'>-							     band);</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_HE:</div><div class='add'>+	case RATE_MCS_MOD_TYPE_EHT:</div><div class='add'>+		/* mac80211 cannot do this without ieee80211_tx_status_ext()</div><div class='add'>+		 * but it only matters for radiotap */</div><div class='add'>+		r-&gt;idx = 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		r-&gt;idx = iwl_mvm_legacy_hw_idx_to_mac80211_idx(rate_n_flags,</div><div class='add'>+							       band);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * translate ucode response to mac80211 tx status control values</div><div class='ctx'>  */</div><div class='del'>-static void iwl_mvm_hwrate_to_tx_status(u32 rate_n_flags,</div><div class='add'>+static void iwl_mvm_hwrate_to_tx_status(struct iwl_mvm *mvm,</div><div class='add'>+					__le32 rate_n_flags,</div><div class='ctx'> 					struct ieee80211_tx_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_tx_rate *r = &amp;info-&gt;status.rates[0];</div><div class='add'>+	u32 rate;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Technically this conversion is incorrect for BA status, however:</div><div class='add'>+	 *  - we only use the BA notif data for older firmware that have</div><div class='add'>+	 *    host rate scaling and don't use newer rate formats</div><div class='add'>+	 *  - the firmware API changed together for BA notif and TX CMD</div><div class='add'>+	 *    as well</div><div class='add'>+	 */</div><div class='add'>+	rate = iwl_mvm_v3_rate_from_fw(rate_n_flags, mvm-&gt;fw_rates_ver);</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;status.antenna =</div><div class='del'>-		((rate_n_flags &amp; RATE_MCS_ANT_ABC_MSK) &gt;&gt; RATE_MCS_ANT_POS);</div><div class='del'>-	iwl_mvm_hwrate_to_tx_rate(rate_n_flags, info-&gt;band, r);</div><div class='add'>+		((rate &amp; RATE_MCS_ANT_AB_MSK) &gt;&gt; RATE_MCS_ANT_POS);</div><div class='add'>+	iwl_mvm_hwrate_to_tx_rate(rate, info-&gt;band, r);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_tx_status_check_trigger(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -1383,12 +1567,18 @@ static void iwl_mvm_tx_status_check_trigger(struct iwl_mvm *mvm,</div><div class='ctx'>  * of the batch. This is why the SSN of the SCD is written at the end of the</div><div class='ctx'>  * whole struct at a variable offset. This function knows how to cope with the</div><div class='ctx'>  * variable offset and returns the SSN of the SCD.</div><div class='add'>+ *</div><div class='add'>+ * For 22000-series and lower, this is just 12 bits. For later, 16 bits.</div><div class='ctx'>  */</div><div class='ctx'> static inline u32 iwl_mvm_get_scd_ssn(struct iwl_mvm *mvm,</div><div class='del'>-				      struct iwl_mvm_tx_resp *tx_resp)</div><div class='add'>+				      struct iwl_tx_resp *tx_resp)</div><div class='ctx'> {</div><div class='del'>-	return le32_to_cpup((__le32 *)iwl_mvm_get_agg_status(mvm, tx_resp) +</div><div class='del'>-			    tx_resp-&gt;frame_count) &amp; 0xfff;</div><div class='add'>+	u32 val = le32_to_cpup((__le32 *)iwl_mvm_get_agg_status(mvm, tx_resp) +</div><div class='add'>+			       tx_resp-&gt;frame_count);</div><div class='add'>+</div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		return val &amp; 0xFFFF;</div><div class='add'>+	return val &amp; 0xFFF;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -1397,10 +1587,10 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,</div><div class='ctx'> 	struct ieee80211_sta *sta;</div><div class='ctx'> 	u16 sequence = le16_to_cpu(pkt-&gt;hdr.sequence);</div><div class='ctx'> 	int txq_id = SEQ_TO_QUEUE(sequence);</div><div class='del'>-	/* struct iwl_mvm_tx_resp_v3 is almost the same */</div><div class='del'>-	struct iwl_mvm_tx_resp *tx_resp = (void *)pkt-&gt;data;</div><div class='del'>-	int sta_id = IWL_MVM_TX_RES_GET_RA(tx_resp-&gt;ra_tid);</div><div class='del'>-	int tid = IWL_MVM_TX_RES_GET_TID(tx_resp-&gt;ra_tid);</div><div class='add'>+	/* struct iwl_tx_resp_v3 is almost the same */</div><div class='add'>+	struct iwl_tx_resp *tx_resp = (void *)pkt-&gt;data;</div><div class='add'>+	int sta_id = IWL_TX_RES_GET_RA(tx_resp-&gt;ra_tid);</div><div class='add'>+	int tid = IWL_TX_RES_GET_TID(tx_resp-&gt;ra_tid);</div><div class='ctx'> 	struct agg_tx_status *agg_status =</div><div class='ctx'> 		iwl_mvm_get_agg_status(mvm, tx_resp);</div><div class='ctx'> 	u32 status = le16_to_cpu(agg_status-&gt;status);</div><div class='hunk'>@@ -1419,7 +1609,7 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,</div><div class='ctx'> 	seq_ctl = le16_to_cpu(tx_resp-&gt;seq_ctl);</div><div class='ctx'> </div><div class='ctx'> 	/* we can free until ssn % q.n_bd not inclusive */</div><div class='del'>-	iwl_trans_reclaim(mvm-&gt;trans, txq_id, ssn, &amp;skbs);</div><div class='add'>+	iwl_trans_reclaim(mvm-&gt;trans, txq_id, ssn, &amp;skbs, false);</div><div class='ctx'> </div><div class='ctx'> 	while (!skb_queue_empty(&amp;skbs)) {</div><div class='ctx'> 		struct sk_buff *skb = __skb_dequeue(&amp;skbs);</div><div class='hunk'>@@ -1432,6 +1622,7 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,</div><div class='ctx'> 		iwl_trans_free_tx_cmd(mvm-&gt;trans, info-&gt;driver_data[1]);</div><div class='ctx'> </div><div class='ctx'> 		memset(&amp;info-&gt;status, 0, sizeof(info-&gt;status));</div><div class='add'>+		info-&gt;flags &amp;= ~(IEEE80211_TX_STAT_ACK | IEEE80211_TX_STAT_TX_FILTERED);</div><div class='ctx'> </div><div class='ctx'> 		/* inform mac80211 about what happened with the frame */</div><div class='ctx'> 		switch (status &amp; TX_STATUS_MSK) {</div><div class='hunk'>@@ -1447,7 +1638,9 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,</div><div class='ctx'> 			/* the FW should have stopped the queue and not</div><div class='ctx'> 			 * return this status</div><div class='ctx'> 			 */</div><div class='del'>-			WARN_ON(1);</div><div class='add'>+			IWL_ERR_LIMIT(mvm,</div><div class='add'>+				      "FW reported TX filtered, status=0x%x, FC=0x%x\n",</div><div class='add'>+				      status, le16_to_cpu(hdr-&gt;frame_control));</div><div class='ctx'> 			info-&gt;flags |= IEEE80211_TX_STAT_TX_FILTERED;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -1469,8 +1662,12 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,</div><div class='ctx'> 		iwl_mvm_tx_status_check_trigger(mvm, status, hdr-&gt;frame_control);</div><div class='ctx'> </div><div class='ctx'> 		info-&gt;status.rates[0].count = tx_resp-&gt;failure_frame + 1;</div><div class='del'>-		iwl_mvm_hwrate_to_tx_status(le32_to_cpu(tx_resp-&gt;initial_rate),</div><div class='del'>-					    info);</div><div class='add'>+</div><div class='add'>+		iwl_mvm_hwrate_to_tx_status(mvm, tx_resp-&gt;initial_rate, info);</div><div class='add'>+</div><div class='add'>+		/* Don't assign the converted initial_rate, because driver</div><div class='add'>+		 * TLC uses this and doesn't support the new FW rate</div><div class='add'>+		 */</div><div class='ctx'> 		info-&gt;status.status_driver_data[1] =</div><div class='ctx'> 			(void *)(uintptr_t)le32_to_cpu(tx_resp-&gt;initial_rate);</div><div class='ctx'> </div><div class='hunk'>@@ -1488,8 +1685,6 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,</div><div class='ctx'> 			seq_ctl = le16_to_cpu(hdr-&gt;seq_ctrl);</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(!seq_ctl)) {</div><div class='del'>-			struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='del'>-</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If it is an NDP, we can't update next_reclaim since</div><div class='ctx'> 			 * its sequence control is 0. Note that for that same</div><div class='hunk'>@@ -1512,7 +1707,8 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,</div><div class='ctx'> 		info-&gt;status.status_driver_data[0] =</div><div class='ctx'> 			RS_DRV_DATA_PACK(lq_color, tx_resp-&gt;reduced_tpc);</div><div class='ctx'> </div><div class='del'>-		ieee80211_tx_status(mvm-&gt;hw, skb);</div><div class='add'>+		if (likely(!iwl_mvm_time_sync_frame(mvm, skb, hdr-&gt;addr1)))</div><div class='add'>+			ieee80211_tx_status_skb(mvm-&gt;hw, skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* This is an aggregation queue or might become one, so we use</div><div class='hunk'>@@ -1646,7 +1842,7 @@ static const char *iwl_get_agg_tx_status(u16 status)</div><div class='ctx'> static void iwl_mvm_rx_tx_cmd_agg_dbg(struct iwl_mvm *mvm,</div><div class='ctx'> 				      struct iwl_rx_packet *pkt)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm_tx_resp *tx_resp = (void *)pkt-&gt;data;</div><div class='add'>+	struct iwl_tx_resp *tx_resp = (void *)pkt-&gt;data;</div><div class='ctx'> 	struct agg_tx_status *frame_status =</div><div class='ctx'> 		iwl_mvm_get_agg_status(mvm, tx_resp);</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1680,9 +1876,9 @@ static void iwl_mvm_rx_tx_cmd_agg_dbg(struct iwl_mvm *mvm,</div><div class='ctx'> static void iwl_mvm_rx_tx_cmd_agg(struct iwl_mvm *mvm,</div><div class='ctx'> 				  struct iwl_rx_packet *pkt)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm_tx_resp *tx_resp = (void *)pkt-&gt;data;</div><div class='del'>-	int sta_id = IWL_MVM_TX_RES_GET_RA(tx_resp-&gt;ra_tid);</div><div class='del'>-	int tid = IWL_MVM_TX_RES_GET_TID(tx_resp-&gt;ra_tid);</div><div class='add'>+	struct iwl_tx_resp *tx_resp = (void *)pkt-&gt;data;</div><div class='add'>+	int sta_id = IWL_TX_RES_GET_RA(tx_resp-&gt;ra_tid);</div><div class='add'>+	int tid = IWL_TX_RES_GET_TID(tx_resp-&gt;ra_tid);</div><div class='ctx'> 	u16 sequence = le16_to_cpu(pkt-&gt;hdr.sequence);</div><div class='ctx'> 	struct iwl_mvm_sta *mvmsta;</div><div class='ctx'> 	int queue = SEQ_TO_QUEUE(sequence);</div><div class='hunk'>@@ -1699,14 +1895,14 @@ static void iwl_mvm_rx_tx_cmd_agg(struct iwl_mvm *mvm,</div><div class='ctx'> 	mvmsta = iwl_mvm_sta_from_staid_rcu(mvm, sta_id);</div><div class='ctx'> </div><div class='ctx'> 	sta = rcu_dereference(mvm-&gt;fw_id_to_mac_id[sta_id]);</div><div class='del'>-	if (WARN_ON_ONCE(!sta || !sta-&gt;wme)) {</div><div class='add'>+	if (WARN_ON_ONCE(IS_ERR_OR_NULL(sta) || !sta-&gt;wme)) {</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!WARN_ON_ONCE(!mvmsta)) {</div><div class='ctx'> 		mvmsta-&gt;tid_data[tid].rate_n_flags =</div><div class='del'>-			le32_to_cpu(tx_resp-&gt;initial_rate);</div><div class='add'>+			tx_resp-&gt;initial_rate;</div><div class='ctx'> 		mvmsta-&gt;tid_data[tid].tx_time =</div><div class='ctx'> 			le16_to_cpu(tx_resp-&gt;wireless_media_time);</div><div class='ctx'> 		mvmsta-&gt;tid_data[tid].lq_color =</div><div class='hunk'>@@ -1721,7 +1917,7 @@ static void iwl_mvm_rx_tx_cmd_agg(struct iwl_mvm *mvm,</div><div class='ctx'> void iwl_mvm_rx_tx_cmd(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl_mvm_tx_resp *tx_resp = (void *)pkt-&gt;data;</div><div class='add'>+	struct iwl_tx_resp *tx_resp = (void *)pkt-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	if (tx_resp-&gt;frame_count == 1)</div><div class='ctx'> 		iwl_mvm_rx_tx_cmd_single(mvm, pkt);</div><div class='hunk'>@@ -1731,7 +1927,7 @@ void iwl_mvm_rx_tx_cmd(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_tx_reclaim(struct iwl_mvm *mvm, int sta_id, int tid,</div><div class='ctx'> 			       int txq, int index,</div><div class='del'>-			       struct ieee80211_tx_info *tx_info, u32 rate,</div><div class='add'>+			       struct ieee80211_tx_info *tx_info, __le32 rate,</div><div class='ctx'> 			       bool is_flush)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff_head reclaimed_skbs;</div><div class='hunk'>@@ -1763,7 +1959,7 @@ static void iwl_mvm_tx_reclaim(struct iwl_mvm *mvm, int sta_id, int tid,</div><div class='ctx'> 	 * block-ack window (we assume that they've been successfully</div><div class='ctx'> 	 * transmitted ... if not, it's too late anyway).</div><div class='ctx'> 	 */</div><div class='del'>-	iwl_trans_reclaim(mvm-&gt;trans, txq, index, &amp;reclaimed_skbs);</div><div class='add'>+	iwl_trans_reclaim(mvm-&gt;trans, txq, index, &amp;reclaimed_skbs, is_flush);</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_walk(&amp;reclaimed_skbs, skb) {</div><div class='ctx'> 		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='hunk'>@@ -1777,6 +1973,8 @@ static void iwl_mvm_tx_reclaim(struct iwl_mvm *mvm, int sta_id, int tid,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!is_flush)</div><div class='ctx'> 			info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='add'>+		else</div><div class='add'>+			info-&gt;flags &amp;= ~IEEE80211_TX_STAT_ACK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1813,7 +2011,9 @@ static void iwl_mvm_tx_reclaim(struct iwl_mvm *mvm, int sta_id, int tid,</div><div class='ctx'> 	tx_info-&gt;status.status_driver_data[0] =</div><div class='ctx'> 		RS_DRV_DATA_PACK(tid_data-&gt;lq_color,</div><div class='ctx'> 				 tx_info-&gt;status.status_driver_data[0]);</div><div class='del'>-	tx_info-&gt;status.status_driver_data[1] = (void *)(uintptr_t)rate;</div><div class='add'>+	/* the value is only consumed for old FW that has v1 rates anyway */</div><div class='add'>+	tx_info-&gt;status.status_driver_data[1] =</div><div class='add'>+		(void *)(uintptr_t)le32_to_cpu(rate);</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_walk(&amp;reclaimed_skbs, skb) {</div><div class='ctx'> 		struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='hunk'>@@ -1832,7 +2032,7 @@ static void iwl_mvm_tx_reclaim(struct iwl_mvm *mvm, int sta_id, int tid,</div><div class='ctx'> 			info-&gt;flags |= IEEE80211_TX_STAT_AMPDU;</div><div class='ctx'> 			memcpy(&amp;info-&gt;status, &amp;tx_info-&gt;status,</div><div class='ctx'> 			       sizeof(tx_info-&gt;status));</div><div class='del'>-			iwl_mvm_hwrate_to_tx_status(rate, info);</div><div class='add'>+			iwl_mvm_hwrate_to_tx_status(mvm, rate, info);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1842,24 +2042,23 @@ static void iwl_mvm_tx_reclaim(struct iwl_mvm *mvm, int sta_id, int tid,</div><div class='ctx'> 	 * possible (i.e. first MPDU in the aggregation wasn't acked)</div><div class='ctx'> 	 * Still it's important to update RS about sent vs. acked.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!is_flush &amp;&amp; skb_queue_empty(&amp;reclaimed_skbs)) {</div><div class='add'>+	if (!is_flush &amp;&amp; skb_queue_empty(&amp;reclaimed_skbs) &amp;&amp;</div><div class='add'>+	    !iwl_mvm_has_tlc_offload(mvm)) {</div><div class='ctx'> 		struct ieee80211_chanctx_conf *chanctx_conf = NULL;</div><div class='ctx'> </div><div class='add'>+		/* no TLC offload, so non-MLD mode */</div><div class='ctx'> 		if (mvmsta-&gt;vif)</div><div class='ctx'> 			chanctx_conf =</div><div class='del'>-				rcu_dereference(mvmsta-&gt;vif-&gt;chanctx_conf);</div><div class='add'>+				rcu_dereference(mvmsta-&gt;vif-&gt;bss_conf.chanctx_conf);</div><div class='ctx'> </div><div class='ctx'> 		if (WARN_ON_ONCE(!chanctx_conf))</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		tx_info-&gt;band = chanctx_conf-&gt;def.chan-&gt;band;</div><div class='del'>-		iwl_mvm_hwrate_to_tx_status(rate, tx_info);</div><div class='add'>+		iwl_mvm_hwrate_to_tx_status(mvm, rate, tx_info);</div><div class='ctx'> </div><div class='del'>-		if (!iwl_mvm_has_tlc_offload(mvm)) {</div><div class='del'>-			IWL_DEBUG_TX_REPLY(mvm,</div><div class='del'>-					   "No reclaim. Update rs directly\n");</div><div class='del'>-			iwl_mvm_rs_tx_status(mvm, sta, tid, tx_info, false);</div><div class='del'>-		}</div><div class='add'>+		IWL_DEBUG_TX_REPLY(mvm, "No reclaim. Update rs directly\n");</div><div class='add'>+		iwl_mvm_rs_tx_status(mvm, sta, tid, tx_info, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -1867,7 +2066,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> 	while (!skb_queue_empty(&amp;reclaimed_skbs)) {</div><div class='ctx'> 		skb = __skb_dequeue(&amp;reclaimed_skbs);</div><div class='del'>-		ieee80211_tx_status(mvm-&gt;hw, skb);</div><div class='add'>+		ieee80211_tx_status_skb(mvm-&gt;hw, skb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1884,13 +2083,14 @@ void iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> 	ba_info.flags = IEEE80211_TX_STAT_AMPDU;</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_mvm_has_new_tx_api(mvm)) {</div><div class='del'>-		struct iwl_mvm_compressed_ba_notif *ba_res =</div><div class='add'>+		struct iwl_compressed_ba_notif *ba_res =</div><div class='ctx'> 			(void *)pkt-&gt;data;</div><div class='ctx'> 		u8 lq_color = TX_RES_RATE_TABLE_COL_GET(ba_res-&gt;tlc_rate_info);</div><div class='ctx'> 		u16 tfd_cnt;</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='del'>-		if (unlikely(sizeof(*ba_res) &gt; pkt_len))</div><div class='add'>+		if (IWL_FW_CHECK(mvm, sizeof(*ba_res) &gt; pkt_len,</div><div class='add'>+				 "short BA notification (%d)\n", pkt_len))</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		sta_id = ba_res-&gt;sta_id;</div><div class='hunk'>@@ -1902,9 +2102,21 @@ void iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> 			(void *)(uintptr_t)ba_res-&gt;reduced_txp;</div><div class='ctx'> </div><div class='ctx'> 		tfd_cnt = le16_to_cpu(ba_res-&gt;tfd_cnt);</div><div class='del'>-		if (!tfd_cnt || struct_size(ba_res, tfd, tfd_cnt) &gt; pkt_len)</div><div class='add'>+		if (!tfd_cnt)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		if (IWL_FW_CHECK(mvm,</div><div class='add'>+				 struct_size(ba_res, tfd, tfd_cnt) &gt; pkt_len,</div><div class='add'>+				 "short BA notification (tfds:%d, size:%d)\n",</div><div class='add'>+				 tfd_cnt, pkt_len))</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='add'>+		IWL_DEBUG_TX_REPLY(mvm,</div><div class='add'>+				   "BA_NOTIFICATION Received from sta_id = %d, flags %x, sent:%d, acked:%d\n",</div><div class='add'>+				   sta_id, le32_to_cpu(ba_res-&gt;flags),</div><div class='add'>+				   le16_to_cpu(ba_res-&gt;txed),</div><div class='add'>+				   le16_to_cpu(ba_res-&gt;done));</div><div class='add'>+</div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 		mvmsta = iwl_mvm_sta_from_staid_rcu(mvm, sta_id);</div><div class='hunk'>@@ -1919,8 +2131,7 @@ void iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> </div><div class='ctx'> 		/* Free per TID */</div><div class='ctx'> 		for (i = 0; i &lt; tfd_cnt; i++) {</div><div class='del'>-			struct iwl_mvm_compressed_ba_tfd *ba_tfd =</div><div class='del'>-				&amp;ba_res-&gt;tfd[i];</div><div class='add'>+			struct iwl_compressed_ba_tfd *ba_tfd = &amp;ba_res-&gt;tfd[i];</div><div class='ctx'> </div><div class='ctx'> 			tid = ba_tfd-&gt;tid;</div><div class='ctx'> 			if (tid == IWL_MGMT_TID)</div><div class='hunk'>@@ -1933,19 +2144,14 @@ void iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> 					   (int)(le16_to_cpu(ba_tfd-&gt;q_num)),</div><div class='ctx'> 					   le16_to_cpu(ba_tfd-&gt;tfd_index),</div><div class='ctx'> 					   &amp;ba_info,</div><div class='del'>-					   le32_to_cpu(ba_res-&gt;tx_rate), false);</div><div class='add'>+					   ba_res-&gt;tx_rate, false);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (mvmsta)</div><div class='ctx'> 			iwl_mvm_tx_airtime(mvm, mvmsta,</div><div class='ctx'> 					   le32_to_cpu(ba_res-&gt;wireless_time));</div><div class='del'>-		rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-		IWL_DEBUG_TX_REPLY(mvm,</div><div class='del'>-				   "BA_NOTIFICATION Received from sta_id = %d, flags %x, sent:%d, acked:%d\n",</div><div class='del'>-				   sta_id, le32_to_cpu(ba_res-&gt;flags),</div><div class='del'>-				   le16_to_cpu(ba_res-&gt;txed),</div><div class='del'>-				   le16_to_cpu(ba_res-&gt;done));</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1960,7 +2166,9 @@ void iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	mvmsta = iwl_mvm_sta_from_staid_rcu(mvm, sta_id);</div><div class='del'>-	if (WARN_ON_ONCE(!mvmsta)) {</div><div class='add'>+	if (IWL_FW_CHECK(mvm, !mvmsta,</div><div class='add'>+			 "invalid STA ID %d in BA notif\n",</div><div class='add'>+			 sta_id)) {</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1975,9 +2183,6 @@ void iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_tx_reclaim(mvm, sta_id, tid, txq, index, &amp;ba_info,</div><div class='del'>-			   tid_data-&gt;rate_n_flags, false);</div><div class='del'>-</div><div class='ctx'> 	IWL_DEBUG_TX_REPLY(mvm,</div><div class='ctx'> 			   "BA_NOTIFICATION Received from %pM, sta_id = %d\n",</div><div class='ctx'> 			   ba_notif-&gt;sta_addr, ba_notif-&gt;sta_id);</div><div class='hunk'>@@ -1990,6 +2195,9 @@ void iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_TX_REPLY(mvm, "reduced txp from ba notif %d\n",</div><div class='ctx'> 			   ba_notif-&gt;reduced_txp);</div><div class='add'>+</div><div class='add'>+	iwl_mvm_tx_reclaim(mvm, sta_id, tid, txq, index, &amp;ba_info,</div><div class='add'>+			   tid_data-&gt;rate_n_flags, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2034,7 +2242,7 @@ int iwl_mvm_flush_sta_tids(struct iwl_mvm *mvm, u32 sta_id, u16 tids)</div><div class='ctx'> 	WARN_ON(!iwl_mvm_has_new_tx_api(mvm));</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_fw_lookup_notif_ver(mvm-&gt;fw, LONG_GROUP, TXPATH_FLUSH, 0) &gt; 0)</div><div class='del'>-		cmd.flags |= CMD_WANT_SKB;</div><div class='add'>+		cmd.flags |= CMD_WANT_SKB | CMD_SEND_IN_RFKILL;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_TX_QUEUES(mvm, "flush for sta id %d tid mask 0x%x\n",</div><div class='ctx'> 			    sta_id, tids);</div><div class='hunk'>@@ -2095,19 +2303,10 @@ free_rsp:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwl_mvm_flush_sta(struct iwl_mvm *mvm, void *sta, bool internal)</div><div class='add'>+int iwl_mvm_flush_sta(struct iwl_mvm *mvm, u32 sta_id, u32 tfd_queue_mask)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_mvm_int_sta *int_sta = sta;</div><div class='del'>-	struct iwl_mvm_sta *mvm_sta = sta;</div><div class='del'>-</div><div class='del'>-	BUILD_BUG_ON(offsetof(struct iwl_mvm_int_sta, sta_id) !=</div><div class='del'>-		     offsetof(struct iwl_mvm_sta, sta_id));</div><div class='del'>-</div><div class='ctx'> 	if (iwl_mvm_has_new_tx_api(mvm))</div><div class='del'>-		return iwl_mvm_flush_sta_tids(mvm, mvm_sta-&gt;sta_id, 0xffff);</div><div class='del'>-</div><div class='del'>-	if (internal)</div><div class='del'>-		return iwl_mvm_flush_tx_path(mvm, int_sta-&gt;tfd_queue_msk);</div><div class='add'>+		return iwl_mvm_flush_sta_tids(mvm, sta_id, 0xffff);</div><div class='ctx'> </div><div class='del'>-	return iwl_mvm_flush_tx_path(mvm, mvm_sta-&gt;tfd_queue_msk);</div><div class='add'>+	return iwl_mvm_flush_tx_path(mvm, tfd_queue_mask);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c<br/>index c566be99a4c7..1a6c1f8706e1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/utils.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/mvm/utils.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/utils.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/utils.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2015-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -22,11 +22,6 @@ int iwl_mvm_send_cmd(struct iwl_mvm *mvm, struct iwl_host_cmd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_IWLWIFI_DEBUGFS) &amp;&amp; defined(CONFIG_PM_SLEEP)</div><div class='del'>-	if (WARN_ON(mvm-&gt;d3_test_active))</div><div class='del'>-		return -EIO;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Synchronous commands from this op-mode must hold</div><div class='ctx'> 	 * the mutex, this ensures we don't try to send two</div><div class='hunk'>@@ -79,11 +74,6 @@ int iwl_mvm_send_cmd_status(struct iwl_mvm *mvm, struct iwl_host_cmd *cmd,</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_IWLWIFI_DEBUGFS) &amp;&amp; defined(CONFIG_PM_SLEEP)</div><div class='del'>-	if (WARN_ON(mvm-&gt;d3_test_active))</div><div class='del'>-		return -EIO;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Only synchronous commands can wait for status,</div><div class='ctx'> 	 * we use WANT_SKB so the caller can't.</div><div class='hunk'>@@ -135,31 +125,25 @@ int iwl_mvm_send_cmd_pdu_status(struct iwl_mvm *mvm, u32 id, u16 len,</div><div class='ctx'> 	return iwl_mvm_send_cmd_status(mvm, &amp;cmd, status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define IWL_DECLARE_RATE_INFO(r) \</div><div class='del'>-	[IWL_RATE_##r##M_INDEX] = IWL_RATE_##r##M_PLCP</div><div class='add'>+int iwl_mvm_legacy_hw_idx_to_mac80211_idx(u32 rate_n_flags,</div><div class='add'>+					  enum nl80211_band band)</div><div class='add'>+{</div><div class='add'>+	int format = rate_n_flags &amp; RATE_MCS_MOD_TYPE_MSK;</div><div class='add'>+	int rate = rate_n_flags &amp; RATE_LEGACY_RATE_MSK;</div><div class='add'>+	bool is_LB = band == NL80211_BAND_2GHZ;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Translate from fw_rate_index (IWL_RATE_XXM_INDEX) to PLCP</div><div class='del'>- */</div><div class='del'>-static const u8 fw_rate_idx_to_plcp[IWL_RATE_COUNT] = {</div><div class='del'>-	IWL_DECLARE_RATE_INFO(1),</div><div class='del'>-	IWL_DECLARE_RATE_INFO(2),</div><div class='del'>-	IWL_DECLARE_RATE_INFO(5),</div><div class='del'>-	IWL_DECLARE_RATE_INFO(11),</div><div class='del'>-	IWL_DECLARE_RATE_INFO(6),</div><div class='del'>-	IWL_DECLARE_RATE_INFO(9),</div><div class='del'>-	IWL_DECLARE_RATE_INFO(12),</div><div class='del'>-	IWL_DECLARE_RATE_INFO(18),</div><div class='del'>-	IWL_DECLARE_RATE_INFO(24),</div><div class='del'>-	IWL_DECLARE_RATE_INFO(36),</div><div class='del'>-	IWL_DECLARE_RATE_INFO(48),</div><div class='del'>-	IWL_DECLARE_RATE_INFO(54),</div><div class='del'>-};</div><div class='add'>+	if (format == RATE_MCS_MOD_TYPE_LEGACY_OFDM)</div><div class='add'>+		return is_LB ? rate + IWL_FIRST_OFDM_RATE :</div><div class='add'>+			rate;</div><div class='add'>+</div><div class='add'>+	/* CCK is not allowed in HB */</div><div class='add'>+	return is_LB ? rate : -1;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> int iwl_mvm_legacy_rate_to_mac80211_idx(u32 rate_n_flags,</div><div class='ctx'> 					enum nl80211_band band)</div><div class='ctx'> {</div><div class='del'>-	int rate = rate_n_flags &amp; RATE_LEGACY_RATE_MSK;</div><div class='add'>+	int rate = rate_n_flags &amp; RATE_LEGACY_RATE_MSK_V1;</div><div class='ctx'> 	int idx;</div><div class='ctx'> 	int band_offset = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -167,16 +151,23 @@ int iwl_mvm_legacy_rate_to_mac80211_idx(u32 rate_n_flags,</div><div class='ctx'> 	if (band != NL80211_BAND_2GHZ)</div><div class='ctx'> 		band_offset = IWL_FIRST_OFDM_RATE;</div><div class='ctx'> 	for (idx = band_offset; idx &lt; IWL_RATE_COUNT_LEGACY; idx++)</div><div class='del'>-		if (fw_rate_idx_to_plcp[idx] == rate)</div><div class='add'>+		if (iwl_fw_rate_idx_to_plcp(idx) == rate)</div><div class='ctx'> 			return idx - band_offset;</div><div class='ctx'> </div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u8 iwl_mvm_mac80211_idx_to_hwrate(int rate_idx)</div><div class='add'>+u8 iwl_mvm_mac80211_idx_to_hwrate(const struct iwl_fw *fw, int rate_idx)</div><div class='ctx'> {</div><div class='del'>-	/* Get PLCP rate for tx_cmd-&gt;rate_n_flags */</div><div class='del'>-	return fw_rate_idx_to_plcp[rate_idx];</div><div class='add'>+	if (iwl_fw_lookup_cmd_ver(fw, TX_CMD, 0) &gt; 8)</div><div class='add'>+		/* In the new rate legacy rates are indexed:</div><div class='add'>+		 * 0 - 3 for CCK and 0 - 7 for OFDM.</div><div class='add'>+		 */</div><div class='add'>+		return (rate_idx &gt;= IWL_FIRST_OFDM_RATE ?</div><div class='add'>+			rate_idx - IWL_FIRST_OFDM_RATE :</div><div class='add'>+			rate_idx);</div><div class='add'>+</div><div class='add'>+	return iwl_fw_rate_idx_to_plcp(rate_idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u8 iwl_mvm_mac80211_ac_to_ucode_ac(enum ieee80211_ac_numbers ac)</div><div class='hunk'>@@ -217,6 +208,7 @@ u8 first_antenna(u8 mask)</div><div class='ctx'> 	return BIT(ffs(mask) - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define MAX_ANT_NUM 2</div><div class='ctx'> /*</div><div class='ctx'>  * Toggles between TX antennas to send the probe request on.</div><div class='ctx'>  * Receives the bitmask of valid TX antennas and the *index* used</div><div class='hunk'>@@ -238,348 +230,6 @@ u8 iwl_mvm_next_antenna(struct iwl_mvm *mvm, u8 valid, u8 last_idx)</div><div class='ctx'> 	return last_idx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Note: This structure is read from the device with IO accesses,</div><div class='del'>- * and the reading already does the endian conversion. As it is</div><div class='del'>- * read with u32-sized accesses, any members with a different size</div><div class='del'>- * need to be ordered correctly though!</div><div class='del'>- */</div><div class='del'>-struct iwl_error_event_table_v1 {</div><div class='del'>-	u32 valid;		/* (nonzero) valid, (0) log is empty */</div><div class='del'>-	u32 error_id;		/* type of error */</div><div class='del'>-	u32 pc;			/* program counter */</div><div class='del'>-	u32 blink1;		/* branch link */</div><div class='del'>-	u32 blink2;		/* branch link */</div><div class='del'>-	u32 ilink1;		/* interrupt link */</div><div class='del'>-	u32 ilink2;		/* interrupt link */</div><div class='del'>-	u32 data1;		/* error-specific data */</div><div class='del'>-	u32 data2;		/* error-specific data */</div><div class='del'>-	u32 data3;		/* error-specific data */</div><div class='del'>-	u32 bcon_time;		/* beacon timer */</div><div class='del'>-	u32 tsf_low;		/* network timestamp function timer */</div><div class='del'>-	u32 tsf_hi;		/* network timestamp function timer */</div><div class='del'>-	u32 gp1;		/* GP1 timer register */</div><div class='del'>-	u32 gp2;		/* GP2 timer register */</div><div class='del'>-	u32 gp3;		/* GP3 timer register */</div><div class='del'>-	u32 ucode_ver;		/* uCode version */</div><div class='del'>-	u32 hw_ver;		/* HW Silicon version */</div><div class='del'>-	u32 brd_ver;		/* HW board version */</div><div class='del'>-	u32 log_pc;		/* log program counter */</div><div class='del'>-	u32 frame_ptr;		/* frame pointer */</div><div class='del'>-	u32 stack_ptr;		/* stack pointer */</div><div class='del'>-	u32 hcmd;		/* last host command header */</div><div class='del'>-	u32 isr0;		/* isr status register LMPM_NIC_ISR0:</div><div class='del'>-				 * rxtx_flag */</div><div class='del'>-	u32 isr1;		/* isr status register LMPM_NIC_ISR1:</div><div class='del'>-				 * host_flag */</div><div class='del'>-	u32 isr2;		/* isr status register LMPM_NIC_ISR2:</div><div class='del'>-				 * enc_flag */</div><div class='del'>-	u32 isr3;		/* isr status register LMPM_NIC_ISR3:</div><div class='del'>-				 * time_flag */</div><div class='del'>-	u32 isr4;		/* isr status register LMPM_NIC_ISR4:</div><div class='del'>-				 * wico interrupt */</div><div class='del'>-	u32 isr_pref;		/* isr status register LMPM_NIC_PREF_STAT */</div><div class='del'>-	u32 wait_event;		/* wait event() caller address */</div><div class='del'>-	u32 l2p_control;	/* L2pControlField */</div><div class='del'>-	u32 l2p_duration;	/* L2pDurationField */</div><div class='del'>-	u32 l2p_mhvalid;	/* L2pMhValidBits */</div><div class='del'>-	u32 l2p_addr_match;	/* L2pAddrMatchStat */</div><div class='del'>-	u32 lmpm_pmg_sel;	/* indicate which clocks are turned on</div><div class='del'>-				 * (LMPM_PMG_SEL) */</div><div class='del'>-	u32 u_timestamp;	/* indicate when the date and time of the</div><div class='del'>-				 * compilation */</div><div class='del'>-	u32 flow_handler;	/* FH read/write pointers, RX credit */</div><div class='del'>-} __packed /* LOG_ERROR_TABLE_API_S_VER_1 */;</div><div class='del'>-</div><div class='del'>-struct iwl_error_event_table {</div><div class='del'>-	u32 valid;		/* (nonzero) valid, (0) log is empty */</div><div class='del'>-	u32 error_id;		/* type of error */</div><div class='del'>-	u32 trm_hw_status0;	/* TRM HW status */</div><div class='del'>-	u32 trm_hw_status1;	/* TRM HW status */</div><div class='del'>-	u32 blink2;		/* branch link */</div><div class='del'>-	u32 ilink1;		/* interrupt link */</div><div class='del'>-	u32 ilink2;		/* interrupt link */</div><div class='del'>-	u32 data1;		/* error-specific data */</div><div class='del'>-	u32 data2;		/* error-specific data */</div><div class='del'>-	u32 data3;		/* error-specific data */</div><div class='del'>-	u32 bcon_time;		/* beacon timer */</div><div class='del'>-	u32 tsf_low;		/* network timestamp function timer */</div><div class='del'>-	u32 tsf_hi;		/* network timestamp function timer */</div><div class='del'>-	u32 gp1;		/* GP1 timer register */</div><div class='del'>-	u32 gp2;		/* GP2 timer register */</div><div class='del'>-	u32 fw_rev_type;	/* firmware revision type */</div><div class='del'>-	u32 major;		/* uCode version major */</div><div class='del'>-	u32 minor;		/* uCode version minor */</div><div class='del'>-	u32 hw_ver;		/* HW Silicon version */</div><div class='del'>-	u32 brd_ver;		/* HW board version */</div><div class='del'>-	u32 log_pc;		/* log program counter */</div><div class='del'>-	u32 frame_ptr;		/* frame pointer */</div><div class='del'>-	u32 stack_ptr;		/* stack pointer */</div><div class='del'>-	u32 hcmd;		/* last host command header */</div><div class='del'>-	u32 isr0;		/* isr status register LMPM_NIC_ISR0:</div><div class='del'>-				 * rxtx_flag */</div><div class='del'>-	u32 isr1;		/* isr status register LMPM_NIC_ISR1:</div><div class='del'>-				 * host_flag */</div><div class='del'>-	u32 isr2;		/* isr status register LMPM_NIC_ISR2:</div><div class='del'>-				 * enc_flag */</div><div class='del'>-	u32 isr3;		/* isr status register LMPM_NIC_ISR3:</div><div class='del'>-				 * time_flag */</div><div class='del'>-	u32 isr4;		/* isr status register LMPM_NIC_ISR4:</div><div class='del'>-				 * wico interrupt */</div><div class='del'>-	u32 last_cmd_id;	/* last HCMD id handled by the firmware */</div><div class='del'>-	u32 wait_event;		/* wait event() caller address */</div><div class='del'>-	u32 l2p_control;	/* L2pControlField */</div><div class='del'>-	u32 l2p_duration;	/* L2pDurationField */</div><div class='del'>-	u32 l2p_mhvalid;	/* L2pMhValidBits */</div><div class='del'>-	u32 l2p_addr_match;	/* L2pAddrMatchStat */</div><div class='del'>-	u32 lmpm_pmg_sel;	/* indicate which clocks are turned on</div><div class='del'>-				 * (LMPM_PMG_SEL) */</div><div class='del'>-	u32 u_timestamp;	/* indicate when the date and time of the</div><div class='del'>-				 * compilation */</div><div class='del'>-	u32 flow_handler;	/* FH read/write pointers, RX credit */</div><div class='del'>-} __packed /* LOG_ERROR_TABLE_API_S_VER_3 */;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * UMAC error struct - relevant starting from family 8000 chip.</div><div class='del'>- * Note: This structure is read from the device with IO accesses,</div><div class='del'>- * and the reading already does the endian conversion. As it is</div><div class='del'>- * read with u32-sized accesses, any members with a different size</div><div class='del'>- * need to be ordered correctly though!</div><div class='del'>- */</div><div class='del'>-struct iwl_umac_error_event_table {</div><div class='del'>-	u32 valid;		/* (nonzero) valid, (0) log is empty */</div><div class='del'>-	u32 error_id;		/* type of error */</div><div class='del'>-	u32 blink1;		/* branch link */</div><div class='del'>-	u32 blink2;		/* branch link */</div><div class='del'>-	u32 ilink1;		/* interrupt link */</div><div class='del'>-	u32 ilink2;		/* interrupt link */</div><div class='del'>-	u32 data1;		/* error-specific data */</div><div class='del'>-	u32 data2;		/* error-specific data */</div><div class='del'>-	u32 data3;		/* error-specific data */</div><div class='del'>-	u32 umac_major;</div><div class='del'>-	u32 umac_minor;</div><div class='del'>-	u32 frame_pointer;	/* core register 27*/</div><div class='del'>-	u32 stack_pointer;	/* core register 28 */</div><div class='del'>-	u32 cmd_header;		/* latest host cmd sent to UMAC */</div><div class='del'>-	u32 nic_isr_pref;	/* ISR status register */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define ERROR_START_OFFSET  (1 * sizeof(u32))</div><div class='del'>-#define ERROR_ELEM_SIZE     (7 * sizeof(u32))</div><div class='del'>-</div><div class='del'>-static void iwl_mvm_dump_umac_error_log(struct iwl_mvm *mvm)</div><div class='del'>-{</div><div class='del'>-	struct iwl_trans *trans = mvm-&gt;trans;</div><div class='del'>-	struct iwl_umac_error_event_table table = {};</div><div class='del'>-	u32 base = mvm-&gt;trans-&gt;dbg.umac_error_event_table;</div><div class='del'>-</div><div class='del'>-	if (!base &amp;&amp;</div><div class='del'>-	    !(mvm-&gt;trans-&gt;dbg.error_event_table_tlv_status &amp;</div><div class='del'>-	      IWL_ERROR_EVENT_TABLE_UMAC))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	iwl_trans_read_mem_bytes(trans, base, &amp;table, sizeof(table));</div><div class='del'>-</div><div class='del'>-	if (table.valid)</div><div class='del'>-		mvm-&gt;fwrt.dump.umac_err_id = table.error_id;</div><div class='del'>-</div><div class='del'>-	if (ERROR_START_OFFSET &lt;= table.valid * ERROR_ELEM_SIZE) {</div><div class='del'>-		IWL_ERR(trans, "Start IWL Error Log Dump:\n");</div><div class='del'>-		IWL_ERR(trans, "Status: 0x%08lX, count: %d\n",</div><div class='del'>-			mvm-&gt;status, table.valid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | %s\n", table.error_id,</div><div class='del'>-		iwl_fw_lookup_assert_desc(table.error_id));</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | umac branchlink1\n", table.blink1);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | umac branchlink2\n", table.blink2);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | umac interruptlink1\n", table.ilink1);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | umac interruptlink2\n", table.ilink2);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | umac data1\n", table.data1);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | umac data2\n", table.data2);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | umac data3\n", table.data3);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | umac major\n", table.umac_major);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | umac minor\n", table.umac_minor);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | frame pointer\n", table.frame_pointer);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | stack pointer\n", table.stack_pointer);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | last host cmd\n", table.cmd_header);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | isr status reg\n", table.nic_isr_pref);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl_mvm_dump_lmac_error_log(struct iwl_mvm *mvm, u8 lmac_num)</div><div class='del'>-{</div><div class='del'>-	struct iwl_trans *trans = mvm-&gt;trans;</div><div class='del'>-	struct iwl_error_event_table table = {};</div><div class='del'>-	u32 val, base = mvm-&gt;trans-&gt;dbg.lmac_error_event_table[lmac_num];</div><div class='del'>-</div><div class='del'>-	if (mvm-&gt;fwrt.cur_fw_img == IWL_UCODE_INIT) {</div><div class='del'>-		if (!base)</div><div class='del'>-			base = mvm-&gt;fw-&gt;init_errlog_ptr;</div><div class='del'>-	} else {</div><div class='del'>-		if (!base)</div><div class='del'>-			base = mvm-&gt;fw-&gt;inst_errlog_ptr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (base &lt; 0x400000) {</div><div class='del'>-		IWL_ERR(mvm,</div><div class='del'>-			"Not valid error log pointer 0x%08X for %s uCode\n",</div><div class='del'>-			base,</div><div class='del'>-			(mvm-&gt;fwrt.cur_fw_img == IWL_UCODE_INIT)</div><div class='del'>-			? "Init" : "RT");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check if there is a HW error */</div><div class='del'>-	val = iwl_trans_read_mem32(trans, base);</div><div class='del'>-	if (((val &amp; ~0xf) == 0xa5a5a5a0) || ((val &amp; ~0xf) == 0x5a5a5a50)) {</div><div class='del'>-		int err;</div><div class='del'>-</div><div class='del'>-		IWL_ERR(trans, "HW error, resetting before reading\n");</div><div class='del'>-</div><div class='del'>-		/* reset the device */</div><div class='del'>-		iwl_trans_sw_reset(trans);</div><div class='del'>-</div><div class='del'>-		err = iwl_finish_nic_init(trans, trans-&gt;trans_cfg);</div><div class='del'>-		if (err)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl_trans_read_mem_bytes(trans, base, &amp;table, sizeof(table));</div><div class='del'>-</div><div class='del'>-	if (table.valid)</div><div class='del'>-		mvm-&gt;fwrt.dump.lmac_err_id[lmac_num] = table.error_id;</div><div class='del'>-</div><div class='del'>-	if (ERROR_START_OFFSET &lt;= table.valid * ERROR_ELEM_SIZE) {</div><div class='del'>-		IWL_ERR(trans, "Start IWL Error Log Dump:\n");</div><div class='del'>-		IWL_ERR(trans, "Status: 0x%08lX, count: %d\n",</div><div class='del'>-			mvm-&gt;status, table.valid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Do not change this output - scripts rely on it */</div><div class='del'>-</div><div class='del'>-	IWL_ERR(mvm, "Loaded firmware version: %s\n", mvm-&gt;fw-&gt;fw_version);</div><div class='del'>-</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | %-28s\n", table.error_id,</div><div class='del'>-		iwl_fw_lookup_assert_desc(table.error_id));</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | trm_hw_status0\n", table.trm_hw_status0);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | trm_hw_status1\n", table.trm_hw_status1);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | branchlink2\n", table.blink2);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | interruptlink1\n", table.ilink1);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | interruptlink2\n", table.ilink2);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | data1\n", table.data1);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | data2\n", table.data2);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | data3\n", table.data3);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | beacon time\n", table.bcon_time);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | tsf low\n", table.tsf_low);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | tsf hi\n", table.tsf_hi);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | time gp1\n", table.gp1);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | time gp2\n", table.gp2);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | uCode revision type\n", table.fw_rev_type);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | uCode version major\n", table.major);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | uCode version minor\n", table.minor);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | hw version\n", table.hw_ver);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | board version\n", table.brd_ver);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | hcmd\n", table.hcmd);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | isr0\n", table.isr0);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | isr1\n", table.isr1);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | isr2\n", table.isr2);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | isr3\n", table.isr3);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | isr4\n", table.isr4);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | last cmd Id\n", table.last_cmd_id);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | wait_event\n", table.wait_event);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | l2p_control\n", table.l2p_control);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | l2p_duration\n", table.l2p_duration);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | l2p_mhvalid\n", table.l2p_mhvalid);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | l2p_addr_match\n", table.l2p_addr_match);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | lmpm_pmg_sel\n", table.lmpm_pmg_sel);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | timestamp\n", table.u_timestamp);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | flow_handler\n", table.flow_handler);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl_mvm_dump_iml_error_log(struct iwl_mvm *mvm)</div><div class='del'>-{</div><div class='del'>-	struct iwl_trans *trans = mvm-&gt;trans;</div><div class='del'>-	u32 error, data1;</div><div class='del'>-</div><div class='del'>-	if (mvm-&gt;trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_22000) {</div><div class='del'>-		error = UMAG_SB_CPU_2_STATUS;</div><div class='del'>-		data1 = UMAG_SB_CPU_1_STATUS;</div><div class='del'>-	} else if (mvm-&gt;trans-&gt;trans_cfg-&gt;device_family &gt;=</div><div class='del'>-		   IWL_DEVICE_FAMILY_8000) {</div><div class='del'>-		error = SB_CPU_2_STATUS;</div><div class='del'>-		data1 = SB_CPU_1_STATUS;</div><div class='del'>-	} else {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	error = iwl_read_umac_prph(trans, UMAG_SB_CPU_2_STATUS);</div><div class='del'>-</div><div class='del'>-	IWL_ERR(trans, "IML/ROM dump:\n");</div><div class='del'>-</div><div class='del'>-	if (error &amp; 0xFFFF0000)</div><div class='del'>-		IWL_ERR(trans, "0x%04X | IML/ROM SYSASSERT\n", error &gt;&gt; 16);</div><div class='del'>-</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | IML/ROM error/state\n", error);</div><div class='del'>-	IWL_ERR(mvm, "0x%08X | IML/ROM data1\n",</div><div class='del'>-		iwl_read_umac_prph(trans, data1));</div><div class='del'>-</div><div class='del'>-	if (mvm-&gt;trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_22000)</div><div class='del'>-		IWL_ERR(mvm, "0x%08X | IML/ROM WFPM_AUTH_KEY_0\n",</div><div class='del'>-			iwl_read_umac_prph(trans, SB_MODIFY_CFG_FLAG));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm)</div><div class='del'>-{</div><div class='del'>-	if (!test_bit(STATUS_DEVICE_ENABLED, &amp;mvm-&gt;trans-&gt;status)) {</div><div class='del'>-		IWL_ERR(mvm,</div><div class='del'>-			"DEVICE_ENABLED bit is not set. Aborting dump.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl_mvm_dump_lmac_error_log(mvm, 0);</div><div class='del'>-</div><div class='del'>-	if (mvm-&gt;trans-&gt;dbg.lmac_error_event_table[1])</div><div class='del'>-		iwl_mvm_dump_lmac_error_log(mvm, 1);</div><div class='del'>-</div><div class='del'>-	iwl_mvm_dump_umac_error_log(mvm);</div><div class='del'>-</div><div class='del'>-	iwl_mvm_dump_iml_error_log(mvm);</div><div class='del'>-</div><div class='del'>-	iwl_fw_error_print_fseq_regs(&amp;mvm-&gt;fwrt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl_mvm_reconfig_scd(struct iwl_mvm *mvm, int queue, int fifo, int sta_id,</div><div class='del'>-			 int tid, int frame_limit, u16 ssn)</div><div class='del'>-{</div><div class='del'>-	struct iwl_scd_txq_cfg_cmd cmd = {</div><div class='del'>-		.scd_queue = queue,</div><div class='del'>-		.action = SCD_CFG_ENABLE_QUEUE,</div><div class='del'>-		.window = frame_limit,</div><div class='del'>-		.sta_id = sta_id,</div><div class='del'>-		.ssn = cpu_to_le16(ssn),</div><div class='del'>-		.tx_fifo = fifo,</div><div class='del'>-		.aggregate = (queue &gt;= IWL_MVM_DQA_MIN_DATA_QUEUE ||</div><div class='del'>-			      queue == IWL_MVM_DQA_BSS_CLIENT_QUEUE),</div><div class='del'>-		.tid = tid,</div><div class='del'>-	};</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(iwl_mvm_has_new_tx_api(mvm)))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (WARN(mvm-&gt;queue_info[queue].tid_bitmap == 0,</div><div class='del'>-		 "Trying to reconfig unallocated queue %d\n", queue))</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_TX_QUEUES(mvm, "Reconfig SCD for TXQ #%d\n", queue);</div><div class='del'>-</div><div class='del'>-	ret = iwl_mvm_send_cmd_pdu(mvm, SCD_QUEUE_CFG, 0, sizeof(cmd), &amp;cmd);</div><div class='del'>-	WARN_ONCE(ret, "Failed to re-configure queue %d on FIFO %d, ret=%d\n",</div><div class='del'>-		  queue, fifo, ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * iwl_mvm_send_lq_cmd() - Send link quality command</div><div class='ctx'>  * @mvm: Driver data.</div><div class='hunk'>@@ -589,6 +239,8 @@ int iwl_mvm_reconfig_scd(struct iwl_mvm *mvm, int queue, int fifo, int sta_id,</div><div class='ctx'>  * This is the special case in which init is set and we call a callback in</div><div class='ctx'>  * this case to clear the state indicating that station creation is in</div><div class='ctx'>  * progress.</div><div class='add'>+ *</div><div class='add'>+ * Returns: an error code indicating success or failure</div><div class='ctx'>  */</div><div class='ctx'> int iwl_mvm_send_lq_cmd(struct iwl_mvm *mvm, struct iwl_lq_cmd *lq)</div><div class='ctx'> {</div><div class='hunk'>@@ -599,7 +251,7 @@ int iwl_mvm_send_lq_cmd(struct iwl_mvm *mvm, struct iwl_lq_cmd *lq)</div><div class='ctx'> 		.data = { lq, },</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(lq-&gt;sta_id == IWL_MVM_INVALID_STA ||</div><div class='add'>+	if (WARN_ON(lq-&gt;sta_id == IWL_INVALID_STA ||</div><div class='ctx'> 		    iwl_mvm_has_tlc_offload(mvm)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -612,16 +264,18 @@ int iwl_mvm_send_lq_cmd(struct iwl_mvm *mvm, struct iwl_lq_cmd *lq)</div><div class='ctx'>  * @vif: Pointer to the ieee80211_vif structure</div><div class='ctx'>  * @req_type: The part of the driver who call for a change.</div><div class='ctx'>  * @smps_request: The request to change the SMPS mode.</div><div class='add'>+ * @link_id: for MLO link_id, otherwise 0 (deflink)</div><div class='ctx'>  *</div><div class='ctx'>  * Get a requst to change the SMPS mode,</div><div class='ctx'>  * and change it according to all other requests in the driver.</div><div class='ctx'>  */</div><div class='ctx'> void iwl_mvm_update_smps(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 			 enum iwl_mvm_smps_type_request req_type,</div><div class='del'>-			 enum ieee80211_smps_mode smps_request)</div><div class='add'>+			 enum ieee80211_smps_mode smps_request,</div><div class='add'>+			 unsigned int link_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif;</div><div class='del'>-	enum ieee80211_smps_mode smps_mode;</div><div class='add'>+	enum ieee80211_smps_mode smps_mode = IEEE80211_SMPS_AUTOMATIC;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='hunk'>@@ -630,23 +284,132 @@ void iwl_mvm_update_smps(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='ctx'> 	if (num_of_ant(iwl_mvm_get_valid_rx_ant(mvm)) == 1)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;type == NL80211_IFTYPE_AP)</div><div class='del'>-		smps_mode = IEEE80211_SMPS_OFF;</div><div class='del'>-	else</div><div class='del'>-		smps_mode = IEEE80211_SMPS_AUTOMATIC;</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* SMPS is handled by firmware */</div><div class='add'>+	if (iwl_mvm_has_rlc_offload(mvm))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-	mvmvif-&gt;smps_requests[req_type] = smps_request;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!mvmvif-&gt;link[link_id]))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mvmvif-&gt;link[link_id]-&gt;smps_requests[req_type] = smps_request;</div><div class='ctx'> 	for (i = 0; i &lt; NUM_IWL_MVM_SMPS_REQ; i++) {</div><div class='del'>-		if (mvmvif-&gt;smps_requests[i] == IEEE80211_SMPS_STATIC) {</div><div class='add'>+		if (mvmvif-&gt;link[link_id]-&gt;smps_requests[i] ==</div><div class='add'>+		    IEEE80211_SMPS_STATIC) {</div><div class='ctx'> 			smps_mode = IEEE80211_SMPS_STATIC;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (mvmvif-&gt;smps_requests[i] == IEEE80211_SMPS_DYNAMIC)</div><div class='add'>+		if (mvmvif-&gt;link[link_id]-&gt;smps_requests[i] ==</div><div class='add'>+		    IEEE80211_SMPS_DYNAMIC)</div><div class='ctx'> 			smps_mode = IEEE80211_SMPS_DYNAMIC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ieee80211_request_smps(vif, smps_mode);</div><div class='add'>+	/* SMPS is disabled in eSR */</div><div class='add'>+	if (mvmvif-&gt;esr_active)</div><div class='add'>+		smps_mode = IEEE80211_SMPS_OFF;</div><div class='add'>+</div><div class='add'>+	ieee80211_request_smps(vif, link_id, smps_mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_update_smps_on_active_links(struct iwl_mvm *mvm,</div><div class='add'>+					 struct ieee80211_vif *vif,</div><div class='add'>+					 enum iwl_mvm_smps_type_request req_type,</div><div class='add'>+					 enum ieee80211_smps_mode smps_request)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for_each_vif_active_link(vif, link_conf, link_id)</div><div class='add'>+		iwl_mvm_update_smps(mvm, vif, req_type, smps_request,</div><div class='add'>+				    link_id);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_wait_stats_complete(struct iwl_notif_wait_data *notif_wait,</div><div class='add'>+				    struct iwl_rx_packet *pkt, void *data)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(pkt-&gt;hdr.cmd != STATISTICS_NOTIFICATION);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define PERIODIC_STAT_RATE 5</div><div class='add'>+</div><div class='add'>+int iwl_mvm_request_periodic_system_statistics(struct iwl_mvm *mvm, bool enable)</div><div class='add'>+{</div><div class='add'>+	u32 flags = enable ? 0 : IWL_STATS_CFG_FLG_DISABLE_NTFY_MSK;</div><div class='add'>+	u32 type = enable ? (IWL_STATS_NTFY_TYPE_ID_OPER |</div><div class='add'>+			     IWL_STATS_NTFY_TYPE_ID_OPER_PART1) : 0;</div><div class='add'>+	struct iwl_system_statistics_cmd system_cmd = {</div><div class='add'>+		.cfg_mask = cpu_to_le32(flags),</div><div class='add'>+		.config_time_sec = cpu_to_le32(enable ?</div><div class='add'>+					       PERIODIC_STAT_RATE : 0),</div><div class='add'>+		.type_id_mask = cpu_to_le32(type),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return iwl_mvm_send_cmd_pdu(mvm,</div><div class='add'>+				    WIDE_ID(SYSTEM_GROUP,</div><div class='add'>+					    SYSTEM_STATISTICS_CMD),</div><div class='add'>+				    0, sizeof(system_cmd), &amp;system_cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_request_system_statistics(struct iwl_mvm *mvm, bool clear,</div><div class='add'>+					     u8 cmd_ver)</div><div class='add'>+{</div><div class='add'>+	struct iwl_system_statistics_cmd system_cmd = {</div><div class='add'>+		.cfg_mask = clear ?</div><div class='add'>+			    cpu_to_le32(IWL_STATS_CFG_FLG_ON_DEMAND_NTFY_MSK) :</div><div class='add'>+			    cpu_to_le32(IWL_STATS_CFG_FLG_RESET_MSK |</div><div class='add'>+					IWL_STATS_CFG_FLG_ON_DEMAND_NTFY_MSK),</div><div class='add'>+		.type_id_mask = cpu_to_le32(IWL_STATS_NTFY_TYPE_ID_OPER |</div><div class='add'>+					    IWL_STATS_NTFY_TYPE_ID_OPER_PART1),</div><div class='add'>+	};</div><div class='add'>+	struct iwl_host_cmd cmd = {</div><div class='add'>+		.id = WIDE_ID(SYSTEM_GROUP, SYSTEM_STATISTICS_CMD),</div><div class='add'>+		.len[0] = sizeof(system_cmd),</div><div class='add'>+		.data[0] = &amp;system_cmd,</div><div class='add'>+	};</div><div class='add'>+	struct iwl_notification_wait stats_wait;</div><div class='add'>+	static const u16 stats_complete[] = {</div><div class='add'>+		WIDE_ID(SYSTEM_GROUP, SYSTEM_STATISTICS_END_NOTIF),</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (cmd_ver != 1) {</div><div class='add'>+		IWL_FW_CHECK_FAILED(mvm,</div><div class='add'>+				    "Invalid system statistics command version:%d\n",</div><div class='add'>+				    cmd_ver);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_init_notification_wait(&amp;mvm-&gt;notif_wait, &amp;stats_wait,</div><div class='add'>+				   stats_complete, ARRAY_SIZE(stats_complete),</div><div class='add'>+				   NULL, NULL);</div><div class='add'>+</div><div class='add'>+	mvm-&gt;statistics_clear = clear;</div><div class='add'>+	ret = iwl_mvm_send_cmd(mvm, &amp;cmd);</div><div class='add'>+	if (ret) {</div><div class='add'>+		iwl_remove_notification(&amp;mvm-&gt;notif_wait, &amp;stats_wait);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 500ms for OPERATIONAL, PART1 and END notification should be enough</div><div class='add'>+	 * for FW to collect data from all LMACs and send</div><div class='add'>+	 * STATISTICS_NOTIFICATION to host</div><div class='add'>+	 */</div><div class='add'>+	ret = iwl_wait_notification(&amp;mvm-&gt;notif_wait, &amp;stats_wait, HZ / 2);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (clear)</div><div class='add'>+		iwl_mvm_accu_radio_stats(mvm);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iwl_mvm_request_statistics(struct iwl_mvm *mvm, bool clear)</div><div class='hunk'>@@ -654,20 +417,65 @@ int iwl_mvm_request_statistics(struct iwl_mvm *mvm, bool clear)</div><div class='ctx'> 	struct iwl_statistics_cmd scmd = {</div><div class='ctx'> 		.flags = clear ? cpu_to_le32(IWL_STATISTICS_FLG_CLEAR) : 0,</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='ctx'> 	struct iwl_host_cmd cmd = {</div><div class='ctx'> 		.id = STATISTICS_CMD,</div><div class='ctx'> 		.len[0] = sizeof(scmd),</div><div class='ctx'> 		.data[0] = &amp;scmd,</div><div class='del'>-		.flags = CMD_WANT_SKB,</div><div class='ctx'> 	};</div><div class='add'>+	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm-&gt;fw,</div><div class='add'>+					   WIDE_ID(SYSTEM_GROUP,</div><div class='add'>+						   SYSTEM_STATISTICS_CMD),</div><div class='add'>+					   IWL_FW_CMD_VER_UNKNOWN);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = iwl_mvm_send_cmd(mvm, &amp;cmd);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	/*</div><div class='add'>+	 * Don't request statistics during restart, they'll not have any useful</div><div class='add'>+	 * information right after restart, nor is clearing needed</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &amp;mvm-&gt;status))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (cmd_ver != IWL_FW_CMD_VER_UNKNOWN)</div><div class='add'>+		return iwl_mvm_request_system_statistics(mvm, clear, cmd_ver);</div><div class='add'>+</div><div class='add'>+	/* From version 15 - STATISTICS_NOTIFICATION, the reply for</div><div class='add'>+	 * STATISTICS_CMD is empty, and the response is with</div><div class='add'>+	 * STATISTICS_NOTIFICATION notification</div><div class='add'>+	 */</div><div class='add'>+	if (iwl_fw_lookup_notif_ver(mvm-&gt;fw, LEGACY_GROUP,</div><div class='add'>+				    STATISTICS_NOTIFICATION, 0) &lt; 15) {</div><div class='add'>+		cmd.flags = CMD_WANT_SKB;</div><div class='add'>+</div><div class='add'>+		ret = iwl_mvm_send_cmd(mvm, &amp;cmd);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		iwl_mvm_handle_rx_statistics(mvm, cmd.resp_pkt);</div><div class='add'>+		iwl_free_resp(&amp;cmd);</div><div class='add'>+	} else {</div><div class='add'>+		struct iwl_notification_wait stats_wait;</div><div class='add'>+		static const u16 stats_complete[] = {</div><div class='add'>+			STATISTICS_NOTIFICATION,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		iwl_init_notification_wait(&amp;mvm-&gt;notif_wait, &amp;stats_wait,</div><div class='add'>+					   stats_complete, ARRAY_SIZE(stats_complete),</div><div class='add'>+					   iwl_wait_stats_complete, NULL);</div><div class='add'>+</div><div class='add'>+		ret = iwl_mvm_send_cmd(mvm, &amp;cmd);</div><div class='add'>+		if (ret) {</div><div class='add'>+			iwl_remove_notification(&amp;mvm-&gt;notif_wait, &amp;stats_wait);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	iwl_mvm_handle_rx_statistics(mvm, cmd.resp_pkt);</div><div class='del'>-	iwl_free_resp(&amp;cmd);</div><div class='add'>+		/* 200ms should be enough for FW to collect data from all</div><div class='add'>+		 * LMACs and send STATISTICS_NOTIFICATION to host</div><div class='add'>+		 */</div><div class='add'>+		ret = iwl_wait_notification(&amp;mvm-&gt;notif_wait, &amp;stats_wait, HZ / 5);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (clear)</div><div class='ctx'> 		iwl_mvm_accu_radio_stats(mvm);</div><div class='hunk'>@@ -683,26 +491,47 @@ void iwl_mvm_accu_radio_stats(struct iwl_mvm *mvm)</div><div class='ctx'> 	mvm-&gt;accu_radio_stats.on_time_scan += mvm-&gt;radio_stats.on_time_scan;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct iwl_mvm_diversity_iter_data {</div><div class='add'>+	struct iwl_mvm_phy_ctxt *ctxt;</div><div class='add'>+	bool result;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void iwl_mvm_diversity_iter(void *_data, u8 *mac,</div><div class='ctx'> 				   struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='del'>-	bool *result = _data;</div><div class='del'>-	int i;</div><div class='add'>+	struct iwl_mvm_diversity_iter_data *data = _data;</div><div class='add'>+	int i, link_id;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; NUM_IWL_MVM_SMPS_REQ; i++) {</div><div class='del'>-		if (mvmvif-&gt;smps_requests[i] == IEEE80211_SMPS_STATIC ||</div><div class='del'>-		    mvmvif-&gt;smps_requests[i] == IEEE80211_SMPS_DYNAMIC)</div><div class='del'>-			*result = false;</div><div class='add'>+	for_each_mvm_vif_valid_link(mvmvif, link_id) {</div><div class='add'>+		struct iwl_mvm_vif_link_info *link_info = mvmvif-&gt;link[link_id];</div><div class='add'>+</div><div class='add'>+		if (link_info-&gt;phy_ctxt != data-&gt;ctxt)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; NUM_IWL_MVM_SMPS_REQ; i++) {</div><div class='add'>+			if (link_info-&gt;smps_requests[i] == IEEE80211_SMPS_STATIC ||</div><div class='add'>+			    link_info-&gt;smps_requests[i] == IEEE80211_SMPS_DYNAMIC) {</div><div class='add'>+				data-&gt;result = false;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool iwl_mvm_rx_diversity_allowed(struct iwl_mvm *mvm)</div><div class='add'>+bool iwl_mvm_rx_diversity_allowed(struct iwl_mvm *mvm,</div><div class='add'>+				  struct iwl_mvm_phy_ctxt *ctxt)</div><div class='ctx'> {</div><div class='del'>-	bool result = true;</div><div class='add'>+	struct iwl_mvm_diversity_iter_data data = {</div><div class='add'>+		.ctxt = ctxt,</div><div class='add'>+		.result = true,</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;mvm-&gt;mutex);</div><div class='ctx'> </div><div class='add'>+	if (iwlmvm_mod_params.power_scheme != IWL_POWER_SCHEME_CAM)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	if (num_of_ant(iwl_mvm_get_valid_rx_ant(mvm)) == 1)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='hunk'>@@ -711,9 +540,9 @@ bool iwl_mvm_rx_diversity_allowed(struct iwl_mvm *mvm)</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_iterate_active_interfaces_atomic(</div><div class='ctx'> 			mvm-&gt;hw, IEEE80211_IFACE_ITER_NORMAL,</div><div class='del'>-			iwl_mvm_diversity_iter, &amp;result);</div><div class='add'>+			iwl_mvm_diversity_iter, &amp;data);</div><div class='ctx'> </div><div class='del'>-	return result;</div><div class='add'>+	return data.result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_send_low_latency_cmd(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -733,8 +562,7 @@ void iwl_mvm_send_low_latency_cmd(struct iwl_mvm *mvm,</div><div class='ctx'> 		cmd.low_latency_tx = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (iwl_mvm_send_cmd_pdu(mvm, iwl_cmd_id(LOW_LATENCY_CMD,</div><div class='del'>-						 MAC_CONF_GROUP, 0),</div><div class='add'>+	if (iwl_mvm_send_cmd_pdu(mvm, WIDE_ID(MAC_CONF_GROUP, LOW_LATENCY_CMD),</div><div class='ctx'> 				 0, sizeof(cmd), &amp;cmd))</div><div class='ctx'> 		IWL_ERR(mvm, "Failed to send low latency command\n");</div><div class='ctx'> }</div><div class='hunk'>@@ -782,10 +610,10 @@ static void iwl_mvm_ll_iter(void *_data, u8 *mac, struct ieee80211_vif *vif)</div><div class='ctx'> 	if (iwl_mvm_vif_low_latency(mvmvif)) {</div><div class='ctx'> 		result-&gt;result = true;</div><div class='ctx'> </div><div class='del'>-		if (!mvmvif-&gt;phy_ctxt)</div><div class='add'>+		if (!mvmvif-&gt;deflink.phy_ctxt)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='del'>-		band = mvmvif-&gt;phy_ctxt-&gt;channel-&gt;band;</div><div class='add'>+		band = mvmvif-&gt;deflink.phy_ctxt-&gt;channel-&gt;band;</div><div class='ctx'> 		result-&gt;result_per_band[band] = true;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -841,10 +669,8 @@ struct ieee80211_vif *iwl_mvm_get_bss_vif(struct iwl_mvm *mvm)</div><div class='ctx'> 		mvm-&gt;hw, IEEE80211_IFACE_ITER_NORMAL,</div><div class='ctx'> 		iwl_mvm_bss_iface_iterator, &amp;bss_iter_data);</div><div class='ctx'> </div><div class='del'>-	if (bss_iter_data.error) {</div><div class='del'>-		IWL_ERR(mvm, "More than one managed interface active!\n");</div><div class='add'>+	if (bss_iter_data.error)</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return bss_iter_data.vif;</div><div class='ctx'> }</div><div class='hunk'>@@ -891,7 +717,7 @@ static void iwl_mvm_sta_iface_iterator(void *_data, u8 *mac,</div><div class='ctx'> 	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;bss_conf.assoc)</div><div class='add'>+	if (vif-&gt;cfg.assoc)</div><div class='ctx'> 		data-&gt;assoc = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -909,58 +735,20 @@ bool iwl_mvm_is_vif_assoc(struct iwl_mvm *mvm)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned int iwl_mvm_get_wd_timeout(struct iwl_mvm *mvm,</div><div class='del'>-				    struct ieee80211_vif *vif,</div><div class='del'>-				    bool tdls, bool cmd_q)</div><div class='add'>+				    struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_fw_dbg_trigger_tlv *trigger;</div><div class='del'>-	struct iwl_fw_dbg_trigger_txq_timer *txq_timer;</div><div class='del'>-	unsigned int default_timeout = cmd_q ?</div><div class='del'>-		IWL_DEF_WD_TIMEOUT :</div><div class='del'>-		mvm-&gt;trans-&gt;trans_cfg-&gt;base_params-&gt;wd_timeout;</div><div class='add'>+	unsigned int default_timeout =</div><div class='add'>+		mvm-&gt;trans-&gt;mac_cfg-&gt;base-&gt;wd_timeout;</div><div class='ctx'> </div><div class='del'>-	if (!iwl_fw_dbg_trigger_enabled(mvm-&gt;fw, FW_DBG_TRIGGER_TXQ_TIMERS)) {</div><div class='del'>-		/*</div><div class='del'>-		 * We can't know when the station is asleep or awake, so we</div><div class='del'>-		 * must disable the queue hang detection.</div><div class='del'>-		 */</div><div class='del'>-		if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='del'>-				IWL_UCODE_TLV_CAPA_STA_PM_NOTIF) &amp;&amp;</div><div class='del'>-		    vif &amp;&amp; vif-&gt;type == NL80211_IFTYPE_AP)</div><div class='del'>-			return IWL_WATCHDOG_DISABLED;</div><div class='del'>-		return default_timeout;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	trigger = iwl_fw_dbg_get_trigger(mvm-&gt;fw, FW_DBG_TRIGGER_TXQ_TIMERS);</div><div class='del'>-	txq_timer = (void *)trigger-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (tdls)</div><div class='del'>-		return le32_to_cpu(txq_timer-&gt;tdls);</div><div class='del'>-</div><div class='del'>-	if (cmd_q)</div><div class='del'>-		return le32_to_cpu(txq_timer-&gt;command_queue);</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(!vif))</div><div class='del'>-		return default_timeout;</div><div class='del'>-</div><div class='del'>-	switch (ieee80211_vif_type_p2p(vif)) {</div><div class='del'>-	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		return le32_to_cpu(txq_timer-&gt;ibss);</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-		return le32_to_cpu(txq_timer-&gt;bss);</div><div class='del'>-	case NL80211_IFTYPE_AP:</div><div class='del'>-		return le32_to_cpu(txq_timer-&gt;softap);</div><div class='del'>-	case NL80211_IFTYPE_P2P_CLIENT:</div><div class='del'>-		return le32_to_cpu(txq_timer-&gt;p2p_client);</div><div class='del'>-	case NL80211_IFTYPE_P2P_GO:</div><div class='del'>-		return le32_to_cpu(txq_timer-&gt;p2p_go);</div><div class='del'>-	case NL80211_IFTYPE_P2P_DEVICE:</div><div class='del'>-		return le32_to_cpu(txq_timer-&gt;p2p_device);</div><div class='del'>-	case NL80211_IFTYPE_MONITOR:</div><div class='del'>-		return default_timeout;</div><div class='del'>-	default:</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		return mvm-&gt;trans-&gt;trans_cfg-&gt;base_params-&gt;wd_timeout;</div><div class='del'>-	}</div><div class='add'>+	/*</div><div class='add'>+	 * We can't know when the station is asleep or awake, so we</div><div class='add'>+	 * must disable the queue hang detection.</div><div class='add'>+	 */</div><div class='add'>+	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa,</div><div class='add'>+			IWL_UCODE_TLV_CAPA_STA_PM_NOTIF) &amp;&amp;</div><div class='add'>+	    vif-&gt;type == NL80211_IFTYPE_AP)</div><div class='add'>+		return IWL_WATCHDOG_DISABLED;</div><div class='add'>+	return default_timeout;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_mvm_connection_loss(struct iwl_mvm *mvm, struct ieee80211_vif *vif,</div><div class='hunk'>@@ -1058,7 +846,7 @@ static void iwl_mvm_tcm_iter(void *_data, u8 *mac, struct ieee80211_vif *vif)</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_tcm_results(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	guard(mvm)(mvm);</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_iterate_active_interfaces(</div><div class='ctx'> 		mvm-&gt;hw, IEEE80211_IFACE_ITER_NORMAL,</div><div class='hunk'>@@ -1066,8 +854,6 @@ static void iwl_mvm_tcm_results(struct iwl_mvm *mvm)</div><div class='ctx'> </div><div class='ctx'> 	if (fw_has_capa(&amp;mvm-&gt;fw-&gt;ucode_capa, IWL_UCODE_TLV_CAPA_UMAC_SCAN))</div><div class='ctx'> 		iwl_mvm_config_scan(mvm);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_tcm_uapsd_nonagg_detected_wk(struct work_struct *wk)</div><div class='hunk'>@@ -1103,13 +889,13 @@ static void iwl_mvm_uapsd_agg_disconnect(struct iwl_mvm *mvm,</div><div class='ctx'> 	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!vif-&gt;bss_conf.assoc)</div><div class='add'>+	if (!vif-&gt;cfg.assoc)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!mvmvif-&gt;queue_params[IEEE80211_AC_VO].uapsd &amp;&amp;</div><div class='del'>-	    !mvmvif-&gt;queue_params[IEEE80211_AC_VI].uapsd &amp;&amp;</div><div class='del'>-	    !mvmvif-&gt;queue_params[IEEE80211_AC_BE].uapsd &amp;&amp;</div><div class='del'>-	    !mvmvif-&gt;queue_params[IEEE80211_AC_BK].uapsd)</div><div class='add'>+	if (!mvmvif-&gt;deflink.queue_params[IEEE80211_AC_VO].uapsd &amp;&amp;</div><div class='add'>+	    !mvmvif-&gt;deflink.queue_params[IEEE80211_AC_VI].uapsd &amp;&amp;</div><div class='add'>+	    !mvmvif-&gt;deflink.queue_params[IEEE80211_AC_BE].uapsd &amp;&amp;</div><div class='add'>+	    !mvmvif-&gt;deflink.queue_params[IEEE80211_AC_BK].uapsd)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (mvm-&gt;tcm.data[mvmvif-&gt;id].uapsd_nonagg_detect.detected)</div><div class='hunk'>@@ -1118,7 +904,8 @@ static void iwl_mvm_uapsd_agg_disconnect(struct iwl_mvm *mvm,</div><div class='ctx'> 	mvm-&gt;tcm.data[mvmvif-&gt;id].uapsd_nonagg_detect.detected = true;</div><div class='ctx'> 	IWL_INFO(mvm,</div><div class='ctx'> 		 "detected AP should do aggregation but isn't, likely due to U-APSD\n");</div><div class='del'>-	schedule_delayed_work(&amp;mvmvif-&gt;uapsd_nonagg_detected_wk, 15 * HZ);</div><div class='add'>+	schedule_delayed_work(&amp;mvmvif-&gt;uapsd_nonagg_detected_wk,</div><div class='add'>+			      15 * HZ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_mvm_check_uapsd_agg_expected_tpt(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -1170,10 +957,10 @@ static void iwl_mvm_tcm_iterator(void *_data, u8 *mac,</div><div class='ctx'> 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);</div><div class='ctx'> 	u32 *band = _data;</div><div class='ctx'> </div><div class='del'>-	if (!mvmvif-&gt;phy_ctxt)</div><div class='add'>+	if (!mvmvif-&gt;deflink.phy_ctxt)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	band[mvmvif-&gt;id] = mvmvif-&gt;phy_ctxt-&gt;channel-&gt;band;</div><div class='add'>+	band[mvmvif-&gt;id] = mvmvif-&gt;deflink.phy_ctxt-&gt;channel-&gt;band;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned long iwl_mvm_calc_tcm_stats(struct iwl_mvm *mvm,</div><div class='hunk'>@@ -1295,10 +1082,9 @@ void iwl_mvm_recalc_tcm(struct iwl_mvm *mvm)</div><div class='ctx'> 	spin_unlock(&amp;mvm-&gt;tcm.lock);</div><div class='ctx'> </div><div class='ctx'> 	if (handle_uapsd &amp;&amp; iwl_mvm_has_new_rx_api(mvm)) {</div><div class='del'>-		mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+		guard(mvm)(mvm);</div><div class='ctx'> 		if (iwl_mvm_request_statistics(mvm, true))</div><div class='ctx'> 			handle_uapsd = false;</div><div class='del'>-		mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;mvm-&gt;tcm.lock);</div><div class='hunk'>@@ -1391,14 +1177,15 @@ u32 iwl_mvm_get_systime(struct iwl_mvm *mvm)</div><div class='ctx'> {</div><div class='ctx'> 	u32 reg_addr = DEVICE_SYSTEM_TIME_REG;</div><div class='ctx'> </div><div class='del'>-	if (mvm-&gt;trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_22000 &amp;&amp;</div><div class='del'>-	    mvm-&gt;trans-&gt;cfg-&gt;gp2_reg_addr)</div><div class='del'>-		reg_addr = mvm-&gt;trans-&gt;cfg-&gt;gp2_reg_addr;</div><div class='add'>+	if (mvm-&gt;trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_22000 &amp;&amp;</div><div class='add'>+	    mvm-&gt;trans-&gt;mac_cfg-&gt;base-&gt;gp2_reg_addr)</div><div class='add'>+		reg_addr = mvm-&gt;trans-&gt;mac_cfg-&gt;base-&gt;gp2_reg_addr;</div><div class='ctx'> </div><div class='ctx'> 	return iwl_read_prph(mvm-&gt;trans, reg_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_mvm_get_sync_time(struct iwl_mvm *mvm, u32 *gp2, u64 *boottime)</div><div class='add'>+void iwl_mvm_get_sync_time(struct iwl_mvm *mvm, int clock_type,</div><div class='add'>+			   u32 *gp2, u64 *boottime, ktime_t *realtime)</div><div class='ctx'> {</div><div class='ctx'> 	bool ps_disabled;</div><div class='ctx'> </div><div class='hunk'>@@ -1412,10 +1199,211 @@ void iwl_mvm_get_sync_time(struct iwl_mvm *mvm, u32 *gp2, u64 *boottime)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*gp2 = iwl_mvm_get_systime(mvm);</div><div class='del'>-	*boottime = ktime_get_boottime_ns();</div><div class='add'>+</div><div class='add'>+	if (clock_type == CLOCK_BOOTTIME &amp;&amp; boottime)</div><div class='add'>+		*boottime = ktime_get_boottime_ns();</div><div class='add'>+	else if (clock_type == CLOCK_REALTIME &amp;&amp; realtime)</div><div class='add'>+		*realtime = ktime_get_real();</div><div class='ctx'> </div><div class='ctx'> 	if (!ps_disabled) {</div><div class='ctx'> 		mvm-&gt;ps_disabled = ps_disabled;</div><div class='ctx'> 		iwl_mvm_power_update_device(mvm);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* Find if at least two links from different vifs use same channel</div><div class='add'>+ * FIXME: consider having a refcount array in struct iwl_mvm_vif for</div><div class='add'>+ * used phy_ctxt ids.</div><div class='add'>+ */</div><div class='add'>+bool iwl_mvm_have_links_same_channel(struct iwl_mvm_vif *vif1,</div><div class='add'>+				     struct iwl_mvm_vif *vif2)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, j;</div><div class='add'>+</div><div class='add'>+	for_each_mvm_vif_valid_link(vif1, i) {</div><div class='add'>+		for_each_mvm_vif_valid_link(vif2, j) {</div><div class='add'>+			if (vif1-&gt;link[i]-&gt;phy_ctxt == vif2-&gt;link[j]-&gt;phy_ctxt)</div><div class='add'>+				return true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool iwl_mvm_vif_is_active(struct iwl_mvm_vif *mvmvif)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	/* FIXME: can it fail when phy_ctxt is assigned? */</div><div class='add'>+	for_each_mvm_vif_valid_link(mvmvif, i) {</div><div class='add'>+		if (mvmvif-&gt;link[i]-&gt;phy_ctxt &amp;&amp;</div><div class='add'>+		    mvmvif-&gt;link[i]-&gt;phy_ctxt-&gt;id &lt; NUM_PHY_CTX)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 iwl_legacy_rate_to_fw_idx(u32 rate_n_flags)</div><div class='add'>+{</div><div class='add'>+	int rate = rate_n_flags &amp; RATE_LEGACY_RATE_MSK_V1;</div><div class='add'>+	int idx;</div><div class='add'>+	bool ofdm = !(rate_n_flags &amp; RATE_MCS_CCK_MSK_V1);</div><div class='add'>+	int offset = ofdm ? IWL_FIRST_OFDM_RATE : 0;</div><div class='add'>+	int last = ofdm ? IWL_RATE_COUNT_LEGACY : IWL_FIRST_OFDM_RATE;</div><div class='add'>+</div><div class='add'>+	for (idx = offset; idx &lt; last; idx++)</div><div class='add'>+		if (iwl_fw_rate_idx_to_plcp(idx) == rate)</div><div class='add'>+			return idx - offset;</div><div class='add'>+	return IWL_RATE_INVALID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 iwl_mvm_v3_rate_from_fw(__le32 rate, u8 rate_ver)</div><div class='add'>+{</div><div class='add'>+	u32 rate_v3 = 0, rate_v1;</div><div class='add'>+	u32 dup = 0;</div><div class='add'>+</div><div class='add'>+	if (rate_ver &gt; 1)</div><div class='add'>+		return iwl_v3_rate_from_v2_v3(rate, rate_ver &gt;= 3);</div><div class='add'>+</div><div class='add'>+	rate_v1 = le32_to_cpu(rate);</div><div class='add'>+	if (rate_v1 == 0)</div><div class='add'>+		return rate_v1;</div><div class='add'>+	/* convert rate */</div><div class='add'>+	if (rate_v1 &amp; RATE_MCS_HT_MSK_V1) {</div><div class='add'>+		u32 nss;</div><div class='add'>+</div><div class='add'>+		rate_v3 |= RATE_MCS_MOD_TYPE_HT;</div><div class='add'>+		rate_v3 |=</div><div class='add'>+			rate_v1 &amp; RATE_HT_MCS_RATE_CODE_MSK_V1;</div><div class='add'>+		nss = u32_get_bits(rate_v1, RATE_HT_MCS_MIMO2_MSK);</div><div class='add'>+		rate_v3 |= u32_encode_bits(nss, RATE_MCS_NSS_MSK);</div><div class='add'>+	} else if (rate_v1 &amp; RATE_MCS_VHT_MSK_V1 ||</div><div class='add'>+		   rate_v1 &amp; RATE_MCS_HE_MSK_V1) {</div><div class='add'>+		u32 nss = u32_get_bits(rate_v1, RATE_VHT_MCS_NSS_MSK);</div><div class='add'>+</div><div class='add'>+		rate_v3 |= rate_v1 &amp; RATE_VHT_MCS_RATE_CODE_MSK;</div><div class='add'>+</div><div class='add'>+		rate_v3 |= u32_encode_bits(nss, RATE_MCS_NSS_MSK);</div><div class='add'>+</div><div class='add'>+		if (rate_v1 &amp; RATE_MCS_HE_MSK_V1) {</div><div class='add'>+			u32 he_type_bits = rate_v1 &amp; RATE_MCS_HE_TYPE_MSK_V1;</div><div class='add'>+			u32 he_type = he_type_bits &gt;&gt; RATE_MCS_HE_TYPE_POS_V1;</div><div class='add'>+			u32 he_106t = (rate_v1 &amp; RATE_MCS_HE_106T_MSK_V1) &gt;&gt;</div><div class='add'>+				RATE_MCS_HE_106T_POS_V1;</div><div class='add'>+			u32 he_gi_ltf = (rate_v1 &amp; RATE_MCS_HE_GI_LTF_MSK_V1) &gt;&gt;</div><div class='add'>+				RATE_MCS_HE_GI_LTF_POS;</div><div class='add'>+</div><div class='add'>+			if ((he_type_bits == RATE_MCS_HE_TYPE_SU ||</div><div class='add'>+			     he_type_bits == RATE_MCS_HE_TYPE_EXT_SU) &amp;&amp;</div><div class='add'>+			    he_gi_ltf == RATE_MCS_HE_SU_4_LTF)</div><div class='add'>+				/* the new rate have an additional bit to</div><div class='add'>+				 * represent the value 4 rather then using SGI</div><div class='add'>+				 * bit for this purpose - as it was done in the</div><div class='add'>+				 * old rate</div><div class='add'>+				 */</div><div class='add'>+				he_gi_ltf += (rate_v1 &amp; RATE_MCS_SGI_MSK_V1) &gt;&gt;</div><div class='add'>+					RATE_MCS_SGI_POS_V1;</div><div class='add'>+</div><div class='add'>+			rate_v3 |= he_gi_ltf &lt;&lt; RATE_MCS_HE_GI_LTF_POS;</div><div class='add'>+			rate_v3 |= he_type &lt;&lt; RATE_MCS_HE_TYPE_POS;</div><div class='add'>+			rate_v3 |= he_106t &lt;&lt; RATE_MCS_HE_106T_POS;</div><div class='add'>+			rate_v3 |= rate_v1 &amp; RATE_HE_DUAL_CARRIER_MODE_MSK;</div><div class='add'>+			rate_v3 |= RATE_MCS_MOD_TYPE_HE;</div><div class='add'>+		} else {</div><div class='add'>+			rate_v3 |= RATE_MCS_MOD_TYPE_VHT;</div><div class='add'>+		}</div><div class='add'>+	/* if legacy format */</div><div class='add'>+	} else {</div><div class='add'>+		u32 legacy_rate = iwl_legacy_rate_to_fw_idx(rate_v1);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON_ONCE(legacy_rate == IWL_RATE_INVALID))</div><div class='add'>+			legacy_rate = (rate_v1 &amp; RATE_MCS_CCK_MSK_V1) ?</div><div class='add'>+				IWL_FIRST_CCK_RATE : IWL_FIRST_OFDM_RATE;</div><div class='add'>+</div><div class='add'>+		rate_v3 |= legacy_rate;</div><div class='add'>+		if (!(rate_v1 &amp; RATE_MCS_CCK_MSK_V1))</div><div class='add'>+			rate_v3 |= RATE_MCS_MOD_TYPE_LEGACY_OFDM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* convert flags */</div><div class='add'>+	if (rate_v1 &amp; RATE_MCS_LDPC_MSK_V1)</div><div class='add'>+		rate_v3 |= RATE_MCS_LDPC_MSK;</div><div class='add'>+	rate_v3 |= (rate_v1 &amp; RATE_MCS_CHAN_WIDTH_MSK_V1) |</div><div class='add'>+		(rate_v1 &amp; RATE_MCS_ANT_AB_MSK) |</div><div class='add'>+		(rate_v1 &amp; RATE_MCS_STBC_MSK) |</div><div class='add'>+		(rate_v1 &amp; RATE_MCS_BF_MSK);</div><div class='add'>+</div><div class='add'>+	dup = (rate_v1 &amp; RATE_MCS_DUP_MSK_V1) &gt;&gt; RATE_MCS_DUP_POS_V1;</div><div class='add'>+	if (dup) {</div><div class='add'>+		rate_v3 |= RATE_MCS_DUP_MSK;</div><div class='add'>+		rate_v3 |= dup &lt;&lt; RATE_MCS_CHAN_WIDTH_POS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((!(rate_v1 &amp; RATE_MCS_HE_MSK_V1)) &amp;&amp;</div><div class='add'>+	    (rate_v1 &amp; RATE_MCS_SGI_MSK_V1))</div><div class='add'>+		rate_v3 |= RATE_MCS_SGI_MSK;</div><div class='add'>+</div><div class='add'>+	return rate_v3;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__le32 iwl_mvm_v3_rate_to_fw(u32 rate, u8 rate_ver)</div><div class='add'>+{</div><div class='add'>+	u32 result = 0;</div><div class='add'>+	int rate_idx;</div><div class='add'>+</div><div class='add'>+	if (rate_ver &gt; 1)</div><div class='add'>+		return iwl_v3_rate_to_v2_v3(rate, rate_ver &gt; 2);</div><div class='add'>+</div><div class='add'>+	switch (rate &amp; RATE_MCS_MOD_TYPE_MSK) {</div><div class='add'>+	case RATE_MCS_MOD_TYPE_CCK:</div><div class='add'>+		result = RATE_MCS_CCK_MSK_V1;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_LEGACY_OFDM:</div><div class='add'>+		rate_idx = u32_get_bits(rate, RATE_LEGACY_RATE_MSK);</div><div class='add'>+		if (!(result &amp; RATE_MCS_CCK_MSK_V1))</div><div class='add'>+			rate_idx += IWL_FIRST_OFDM_RATE;</div><div class='add'>+		result |= u32_encode_bits(iwl_fw_rate_idx_to_plcp(rate_idx),</div><div class='add'>+					  RATE_LEGACY_RATE_MSK_V1);</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_HT:</div><div class='add'>+		result = RATE_MCS_HT_MSK_V1;</div><div class='add'>+		result |= u32_encode_bits(u32_get_bits(rate,</div><div class='add'>+						       RATE_HT_MCS_CODE_MSK),</div><div class='add'>+					  RATE_HT_MCS_RATE_CODE_MSK_V1);</div><div class='add'>+		result |= u32_encode_bits(u32_get_bits(rate,</div><div class='add'>+						       RATE_MCS_NSS_MSK),</div><div class='add'>+					  RATE_HT_MCS_MIMO2_MSK);</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_VHT:</div><div class='add'>+		result = RATE_MCS_VHT_MSK_V1;</div><div class='add'>+		result |= u32_encode_bits(u32_get_bits(rate,</div><div class='add'>+						       RATE_VHT_MCS_NSS_MSK),</div><div class='add'>+					  RATE_MCS_CODE_MSK);</div><div class='add'>+		result |= u32_encode_bits(u32_get_bits(rate, RATE_MCS_NSS_MSK),</div><div class='add'>+					  RATE_VHT_MCS_NSS_MSK);</div><div class='add'>+		break;</div><div class='add'>+	case RATE_MCS_MOD_TYPE_HE: /* not generated */</div><div class='add'>+	default:</div><div class='add'>+		WARN_ONCE(1, "bad modulation type %d\n",</div><div class='add'>+			  u32_get_bits(rate, RATE_MCS_MOD_TYPE_MSK));</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rate &amp; RATE_MCS_LDPC_MSK)</div><div class='add'>+		result |= RATE_MCS_LDPC_MSK_V1;</div><div class='add'>+	WARN_ON_ONCE(u32_get_bits(rate, RATE_MCS_CHAN_WIDTH_MSK) &gt;</div><div class='add'>+			RATE_MCS_CHAN_WIDTH_160_VAL);</div><div class='add'>+	result |= (rate &amp; RATE_MCS_CHAN_WIDTH_MSK_V1) |</div><div class='add'>+		  (rate &amp; RATE_MCS_ANT_AB_MSK) |</div><div class='add'>+		  (rate &amp; RATE_MCS_STBC_MSK) |</div><div class='add'>+		  (rate &amp; RATE_MCS_BF_MSK);</div><div class='add'>+</div><div class='add'>+	/* not handling DUP since we don't use it */</div><div class='add'>+	WARN_ON_ONCE(rate &amp; RATE_MCS_DUP_MSK);</div><div class='add'>+</div><div class='add'>+	if (rate &amp; RATE_MCS_SGI_MSK)</div><div class='add'>+		result |= RATE_MCS_SGI_MSK_V1;</div><div class='add'>+</div><div class='add'>+	return cpu_to_le32(result);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c b/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c<br/>new file mode 100644<br/>index 000000000000..0f7fa6032c66<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c</a></div><div class='hunk'>@@ -0,0 +1,153 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2021 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include "mvm.h"</div><div class='add'>+#include &lt;linux/nl80211-vnd-intel.h&gt;</div><div class='add'>+#include &lt;net/netlink.h&gt;</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+iwl_mvm_vendor_attr_policy[NUM_IWL_MVM_VENDOR_ATTR] = {</div><div class='add'>+	[IWL_MVM_VENDOR_ATTR_ROAMING_FORBIDDEN] = { .type = NLA_U8 },</div><div class='add'>+	[IWL_MVM_VENDOR_ATTR_AUTH_MODE] = { .type = NLA_U32 },</div><div class='add'>+	[IWL_MVM_VENDOR_ATTR_CHANNEL_NUM] = { .type = NLA_U8 },</div><div class='add'>+	[IWL_MVM_VENDOR_ATTR_SSID] = { .type = NLA_BINARY,</div><div class='add'>+				       .len = IEEE80211_MAX_SSID_LEN },</div><div class='add'>+	[IWL_MVM_VENDOR_ATTR_BAND] = { .type = NLA_U8 },</div><div class='add'>+	[IWL_MVM_VENDOR_ATTR_COLLOC_CHANNEL] = { .type = NLA_U8 },</div><div class='add'>+	[IWL_MVM_VENDOR_ATTR_COLLOC_ADDR] = { .type = NLA_BINARY, .len = ETH_ALEN },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_vendor_get_csme_conn_info(struct wiphy *wiphy,</div><div class='add'>+					     struct wireless_dev *wdev,</div><div class='add'>+					     const void *data, int data_len)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+	struct iwl_mvm_csme_conn_info *csme_conn_info;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	csme_conn_info = iwl_mvm_get_csme_conn_info(mvm);</div><div class='add'>+</div><div class='add'>+	if (!csme_conn_info) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, 200);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, IWL_MVM_VENDOR_ATTR_AUTH_MODE,</div><div class='add'>+			csme_conn_info-&gt;conn_info.auth_mode) ||</div><div class='add'>+	    nla_put(skb, IWL_MVM_VENDOR_ATTR_SSID,</div><div class='add'>+		    csme_conn_info-&gt;conn_info.ssid_len,</div><div class='add'>+		    csme_conn_info-&gt;conn_info.ssid) ||</div><div class='add'>+	    nla_put_u32(skb, IWL_MVM_VENDOR_ATTR_STA_CIPHER,</div><div class='add'>+			csme_conn_info-&gt;conn_info.pairwise_cipher) ||</div><div class='add'>+	    nla_put_u8(skb, IWL_MVM_VENDOR_ATTR_CHANNEL_NUM,</div><div class='add'>+		       csme_conn_info-&gt;conn_info.channel) ||</div><div class='add'>+	    nla_put(skb, IWL_MVM_VENDOR_ATTR_ADDR, ETH_ALEN,</div><div class='add'>+		    csme_conn_info-&gt;conn_info.bssid)) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		err = -ENOBUFS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return cfg80211_vendor_cmd_reply(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_mvm_vendor_host_get_ownership(struct wiphy *wiphy,</div><div class='add'>+					     struct wireless_dev *wdev,</div><div class='add'>+					     const void *data, int data_len)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);</div><div class='add'>+	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mvm-&gt;mutex);</div><div class='add'>+	ret = iwl_mvm_mei_get_ownership(mvm);</div><div class='add'>+	mutex_unlock(&amp;mvm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct wiphy_vendor_command iwl_mvm_vendor_commands[] = {</div><div class='add'>+	{</div><div class='add'>+		.info = {</div><div class='add'>+			.vendor_id = INTEL_OUI,</div><div class='add'>+			.subcmd = IWL_MVM_VENDOR_CMD_GET_CSME_CONN_INFO,</div><div class='add'>+		},</div><div class='add'>+		.doit = iwl_mvm_vendor_get_csme_conn_info,</div><div class='add'>+		.flags = WIPHY_VENDOR_CMD_NEED_WDEV,</div><div class='add'>+		.policy = iwl_mvm_vendor_attr_policy,</div><div class='add'>+		.maxattr = MAX_IWL_MVM_VENDOR_ATTR,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.info = {</div><div class='add'>+			.vendor_id = INTEL_OUI,</div><div class='add'>+			.subcmd = IWL_MVM_VENDOR_CMD_HOST_GET_OWNERSHIP,</div><div class='add'>+		},</div><div class='add'>+		.doit = iwl_mvm_vendor_host_get_ownership,</div><div class='add'>+		.flags = WIPHY_VENDOR_CMD_NEED_WDEV,</div><div class='add'>+		.policy = iwl_mvm_vendor_attr_policy,</div><div class='add'>+		.maxattr = MAX_IWL_MVM_VENDOR_ATTR,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum iwl_mvm_vendor_events_idx {</div><div class='add'>+	/* 0x0 - 0x3 are deprecated */</div><div class='add'>+	IWL_MVM_VENDOR_EVENT_IDX_ROAMING_FORBIDDEN = 4,</div><div class='add'>+	NUM_IWL_MVM_VENDOR_EVENT_IDX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nl80211_vendor_cmd_info</div><div class='add'>+iwl_mvm_vendor_events[NUM_IWL_MVM_VENDOR_EVENT_IDX] = {</div><div class='add'>+	[IWL_MVM_VENDOR_EVENT_IDX_ROAMING_FORBIDDEN] = {</div><div class='add'>+		.vendor_id = INTEL_OUI,</div><div class='add'>+		.subcmd = IWL_MVM_VENDOR_CMD_ROAMING_FORBIDDEN_EVENT,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void iwl_mvm_vendor_cmds_register(struct iwl_mvm *mvm)</div><div class='add'>+{</div><div class='add'>+	mvm-&gt;hw-&gt;wiphy-&gt;vendor_commands = iwl_mvm_vendor_commands;</div><div class='add'>+	mvm-&gt;hw-&gt;wiphy-&gt;n_vendor_commands = ARRAY_SIZE(iwl_mvm_vendor_commands);</div><div class='add'>+	mvm-&gt;hw-&gt;wiphy-&gt;vendor_events = iwl_mvm_vendor_events;</div><div class='add'>+	mvm-&gt;hw-&gt;wiphy-&gt;n_vendor_events = ARRAY_SIZE(iwl_mvm_vendor_events);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_mvm_send_roaming_forbidden_event(struct iwl_mvm *mvm,</div><div class='add'>+					  struct ieee80211_vif *vif,</div><div class='add'>+					  bool forbidden)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *msg =</div><div class='add'>+		cfg80211_vendor_event_alloc(mvm-&gt;hw-&gt;wiphy,</div><div class='add'>+					    ieee80211_vif_to_wdev(vif),</div><div class='add'>+					    200, IWL_MVM_VENDOR_EVENT_IDX_ROAMING_FORBIDDEN,</div><div class='add'>+					    GFP_ATOMIC);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!vif))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (nla_put(msg, IWL_MVM_VENDOR_ATTR_VIF_ADDR,</div><div class='add'>+		    ETH_ALEN, vif-&gt;addr) ||</div><div class='add'>+	    nla_put_u8(msg, IWL_MVM_VENDOR_ATTR_ROAMING_FORBIDDEN, forbidden))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	cfg80211_vendor_event(msg, GFP_ATOMIC);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+ nla_put_failure:</div><div class='add'>+	kfree_skb(msg);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c<br/>deleted file mode 100644<br/>index cecc32e7dbe8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,292 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2018-2021 Intel Corporation</div><div class='del'>- */</div><div class='del'>-#include "iwl-trans.h"</div><div class='del'>-#include "iwl-fh.h"</div><div class='del'>-#include "iwl-context-info-gen3.h"</div><div class='del'>-#include "internal.h"</div><div class='del'>-#include "iwl-prph.h"</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-iwl_pcie_ctxt_info_dbg_enable(struct iwl_trans *trans,</div><div class='del'>-			      struct iwl_prph_scratch_hwm_cfg *dbg_cfg,</div><div class='del'>-			      u32 *control_flags)</div><div class='del'>-{</div><div class='del'>-	enum iwl_fw_ini_allocation_id alloc_id = IWL_FW_INI_ALLOCATION_ID_DBGC1;</div><div class='del'>-	struct iwl_fw_ini_allocation_tlv *fw_mon_cfg;</div><div class='del'>-	u32 dbg_flags = 0;</div><div class='del'>-</div><div class='del'>-	if (!iwl_trans_dbg_ini_valid(trans)) {</div><div class='del'>-		struct iwl_dram_data *fw_mon = &amp;trans-&gt;dbg.fw_mon;</div><div class='del'>-</div><div class='del'>-		iwl_pcie_alloc_fw_monitor(trans, 0);</div><div class='del'>-</div><div class='del'>-		if (fw_mon-&gt;size) {</div><div class='del'>-			dbg_flags |= IWL_PRPH_SCRATCH_EDBG_DEST_DRAM;</div><div class='del'>-</div><div class='del'>-			IWL_DEBUG_FW(trans,</div><div class='del'>-				     "WRT: Applying DRAM buffer destination\n");</div><div class='del'>-</div><div class='del'>-			dbg_cfg-&gt;hwm_base_addr = cpu_to_le64(fw_mon-&gt;physical);</div><div class='del'>-			dbg_cfg-&gt;hwm_size = cpu_to_le32(fw_mon-&gt;size);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fw_mon_cfg = &amp;trans-&gt;dbg.fw_mon_cfg[alloc_id];</div><div class='del'>-</div><div class='del'>-	switch (le32_to_cpu(fw_mon_cfg-&gt;buf_location)) {</div><div class='del'>-	case IWL_FW_INI_LOCATION_SRAM_PATH:</div><div class='del'>-		dbg_flags |= IWL_PRPH_SCRATCH_EDBG_DEST_INTERNAL;</div><div class='del'>-		IWL_DEBUG_FW(trans,</div><div class='del'>-				"WRT: Applying SMEM buffer destination\n");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IWL_FW_INI_LOCATION_NPK_PATH:</div><div class='del'>-		dbg_flags |= IWL_PRPH_SCRATCH_EDBG_DEST_TB22DTF;</div><div class='del'>-		IWL_DEBUG_FW(trans,</div><div class='del'>-			     "WRT: Applying NPK buffer destination\n");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IWL_FW_INI_LOCATION_DRAM_PATH:</div><div class='del'>-		if (trans-&gt;dbg.fw_mon_ini[alloc_id].num_frags) {</div><div class='del'>-			struct iwl_dram_data *frag =</div><div class='del'>-				&amp;trans-&gt;dbg.fw_mon_ini[alloc_id].frags[0];</div><div class='del'>-			dbg_flags |= IWL_PRPH_SCRATCH_EDBG_DEST_DRAM;</div><div class='del'>-			dbg_cfg-&gt;hwm_base_addr = cpu_to_le64(frag-&gt;physical);</div><div class='del'>-			dbg_cfg-&gt;hwm_size = cpu_to_le32(frag-&gt;size);</div><div class='del'>-			IWL_DEBUG_FW(trans,</div><div class='del'>-				     "WRT: Applying DRAM destination (alloc_id=%u, num_frags=%u)\n",</div><div class='del'>-				     alloc_id,</div><div class='del'>-				     trans-&gt;dbg.fw_mon_ini[alloc_id].num_frags);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		IWL_ERR(trans, "WRT: Invalid buffer destination\n");</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	if (dbg_flags)</div><div class='del'>-		*control_flags |= IWL_PRPH_SCRATCH_EARLY_DEBUG_EN | dbg_flags;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans,</div><div class='del'>-				 const struct fw_img *fw)</div><div class='del'>-{</div><div class='del'>-	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-	struct iwl_context_info_gen3 *ctxt_info_gen3;</div><div class='del'>-	struct iwl_prph_scratch *prph_scratch;</div><div class='del'>-	struct iwl_prph_scratch_ctrl_cfg *prph_sc_ctrl;</div><div class='del'>-	struct iwl_prph_info *prph_info;</div><div class='del'>-	void *iml_img;</div><div class='del'>-	u32 control_flags = 0;</div><div class='del'>-	int ret;</div><div class='del'>-	int cmdq_size = max_t(u32, IWL_CMD_QUEUE_SIZE,</div><div class='del'>-			      trans-&gt;cfg-&gt;min_txq_size);</div><div class='del'>-</div><div class='del'>-	switch (trans_pcie-&gt;rx_buf_size) {</div><div class='del'>-	case IWL_AMSDU_DEF:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	case IWL_AMSDU_2K:</div><div class='del'>-		break;</div><div class='del'>-	case IWL_AMSDU_4K:</div><div class='del'>-		control_flags |= IWL_PRPH_SCRATCH_RB_SIZE_4K;</div><div class='del'>-		break;</div><div class='del'>-	case IWL_AMSDU_8K:</div><div class='del'>-		control_flags |= IWL_PRPH_SCRATCH_RB_SIZE_4K;</div><div class='del'>-		/* if firmware supports the ext size, tell it */</div><div class='del'>-		control_flags |= IWL_PRPH_SCRATCH_RB_SIZE_EXT_8K;</div><div class='del'>-		break;</div><div class='del'>-	case IWL_AMSDU_12K:</div><div class='del'>-		control_flags |= IWL_PRPH_SCRATCH_RB_SIZE_4K;</div><div class='del'>-		/* if firmware supports the ext size, tell it */</div><div class='del'>-		control_flags |= IWL_PRPH_SCRATCH_RB_SIZE_EXT_16K;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Allocate prph scratch */</div><div class='del'>-	prph_scratch = dma_alloc_coherent(trans-&gt;dev, sizeof(*prph_scratch),</div><div class='del'>-					  &amp;trans_pcie-&gt;prph_scratch_dma_addr,</div><div class='del'>-					  GFP_KERNEL);</div><div class='del'>-	if (!prph_scratch)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	prph_sc_ctrl = &amp;prph_scratch-&gt;ctrl_cfg;</div><div class='del'>-</div><div class='del'>-	prph_sc_ctrl-&gt;version.version = 0;</div><div class='del'>-	prph_sc_ctrl-&gt;version.mac_id =</div><div class='del'>-		cpu_to_le16((u16)iwl_read32(trans, CSR_HW_REV));</div><div class='del'>-	prph_sc_ctrl-&gt;version.size = cpu_to_le16(sizeof(*prph_scratch) / 4);</div><div class='del'>-</div><div class='del'>-	control_flags |= IWL_PRPH_SCRATCH_MTR_MODE;</div><div class='del'>-	control_flags |= IWL_PRPH_MTR_FORMAT_256B &amp; IWL_PRPH_SCRATCH_MTR_FORMAT;</div><div class='del'>-</div><div class='del'>-	/* initialize RX default queue */</div><div class='del'>-	prph_sc_ctrl-&gt;rbd_cfg.free_rbd_addr =</div><div class='del'>-		cpu_to_le64(trans_pcie-&gt;rxq-&gt;bd_dma);</div><div class='del'>-</div><div class='del'>-	iwl_pcie_ctxt_info_dbg_enable(trans, &amp;prph_sc_ctrl-&gt;hwm_cfg,</div><div class='del'>-				      &amp;control_flags);</div><div class='del'>-	prph_sc_ctrl-&gt;control.control_flags = cpu_to_le32(control_flags);</div><div class='del'>-</div><div class='del'>-	/* allocate ucode sections in dram and set addresses */</div><div class='del'>-	ret = iwl_pcie_init_fw_sec(trans, fw, &amp;prph_scratch-&gt;dram);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_free_prph_scratch;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Allocate prph information</div><div class='del'>-	 * currently we don't assign to the prph info anything, but it would get</div><div class='del'>-	 * assigned later */</div><div class='del'>-	prph_info = dma_alloc_coherent(trans-&gt;dev, sizeof(*prph_info),</div><div class='del'>-				       &amp;trans_pcie-&gt;prph_info_dma_addr,</div><div class='del'>-				       GFP_KERNEL);</div><div class='del'>-	if (!prph_info) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err_free_prph_scratch;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Allocate context info */</div><div class='del'>-	ctxt_info_gen3 = dma_alloc_coherent(trans-&gt;dev,</div><div class='del'>-					    sizeof(*ctxt_info_gen3),</div><div class='del'>-					    &amp;trans_pcie-&gt;ctxt_info_dma_addr,</div><div class='del'>-					    GFP_KERNEL);</div><div class='del'>-	if (!ctxt_info_gen3) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err_free_prph_info;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ctxt_info_gen3-&gt;prph_info_base_addr =</div><div class='del'>-		cpu_to_le64(trans_pcie-&gt;prph_info_dma_addr);</div><div class='del'>-	ctxt_info_gen3-&gt;prph_scratch_base_addr =</div><div class='del'>-		cpu_to_le64(trans_pcie-&gt;prph_scratch_dma_addr);</div><div class='del'>-	ctxt_info_gen3-&gt;prph_scratch_size =</div><div class='del'>-		cpu_to_le32(sizeof(*prph_scratch));</div><div class='del'>-	ctxt_info_gen3-&gt;cr_head_idx_arr_base_addr =</div><div class='del'>-		cpu_to_le64(trans_pcie-&gt;rxq-&gt;rb_stts_dma);</div><div class='del'>-	ctxt_info_gen3-&gt;tr_tail_idx_arr_base_addr =</div><div class='del'>-		cpu_to_le64(trans_pcie-&gt;rxq-&gt;tr_tail_dma);</div><div class='del'>-	ctxt_info_gen3-&gt;cr_tail_idx_arr_base_addr =</div><div class='del'>-		cpu_to_le64(trans_pcie-&gt;rxq-&gt;cr_tail_dma);</div><div class='del'>-	ctxt_info_gen3-&gt;cr_idx_arr_size =</div><div class='del'>-		cpu_to_le16(IWL_NUM_OF_COMPLETION_RINGS);</div><div class='del'>-	ctxt_info_gen3-&gt;tr_idx_arr_size =</div><div class='del'>-		cpu_to_le16(IWL_NUM_OF_TRANSFER_RINGS);</div><div class='del'>-	ctxt_info_gen3-&gt;mtr_base_addr =</div><div class='del'>-		cpu_to_le64(trans-&gt;txqs.txq[trans-&gt;txqs.cmd.q_id]-&gt;dma_addr);</div><div class='del'>-	ctxt_info_gen3-&gt;mcr_base_addr =</div><div class='del'>-		cpu_to_le64(trans_pcie-&gt;rxq-&gt;used_bd_dma);</div><div class='del'>-	ctxt_info_gen3-&gt;mtr_size =</div><div class='del'>-		cpu_to_le16(TFD_QUEUE_CB_SIZE(cmdq_size));</div><div class='del'>-	ctxt_info_gen3-&gt;mcr_size =</div><div class='del'>-		cpu_to_le16(RX_QUEUE_CB_SIZE(trans-&gt;cfg-&gt;num_rbds));</div><div class='del'>-</div><div class='del'>-	trans_pcie-&gt;ctxt_info_gen3 = ctxt_info_gen3;</div><div class='del'>-	trans_pcie-&gt;prph_info = prph_info;</div><div class='del'>-	trans_pcie-&gt;prph_scratch = prph_scratch;</div><div class='del'>-</div><div class='del'>-	/* Allocate IML */</div><div class='del'>-	iml_img = dma_alloc_coherent(trans-&gt;dev, trans-&gt;iml_len,</div><div class='del'>-				     &amp;trans_pcie-&gt;iml_dma_addr, GFP_KERNEL);</div><div class='del'>-	if (!iml_img) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err_free_ctxt_info;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(iml_img, trans-&gt;iml, trans-&gt;iml_len);</div><div class='del'>-</div><div class='del'>-	iwl_enable_fw_load_int_ctx_info(trans);</div><div class='del'>-</div><div class='del'>-	/* kick FW self load */</div><div class='del'>-	iwl_write64(trans, CSR_CTXT_INFO_ADDR,</div><div class='del'>-		    trans_pcie-&gt;ctxt_info_dma_addr);</div><div class='del'>-	iwl_write64(trans, CSR_IML_DATA_ADDR,</div><div class='del'>-		    trans_pcie-&gt;iml_dma_addr);</div><div class='del'>-	iwl_write32(trans, CSR_IML_SIZE_ADDR, trans-&gt;iml_len);</div><div class='del'>-</div><div class='del'>-	iwl_set_bit(trans, CSR_CTXT_INFO_BOOT_CTRL,</div><div class='del'>-		    CSR_AUTO_FUNC_BOOT_ENA);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_free_ctxt_info:</div><div class='del'>-	dma_free_coherent(trans-&gt;dev, sizeof(*trans_pcie-&gt;ctxt_info_gen3),</div><div class='del'>-			  trans_pcie-&gt;ctxt_info_gen3,</div><div class='del'>-			  trans_pcie-&gt;ctxt_info_dma_addr);</div><div class='del'>-	trans_pcie-&gt;ctxt_info_gen3 = NULL;</div><div class='del'>-err_free_prph_info:</div><div class='del'>-	dma_free_coherent(trans-&gt;dev,</div><div class='del'>-			  sizeof(*prph_info),</div><div class='del'>-			prph_info,</div><div class='del'>-			trans_pcie-&gt;prph_info_dma_addr);</div><div class='del'>-</div><div class='del'>-err_free_prph_scratch:</div><div class='del'>-	dma_free_coherent(trans-&gt;dev,</div><div class='del'>-			  sizeof(*prph_scratch),</div><div class='del'>-			prph_scratch,</div><div class='del'>-			trans_pcie-&gt;prph_scratch_dma_addr);</div><div class='del'>-	return ret;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_pcie_ctxt_info_gen3_free(struct iwl_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-</div><div class='del'>-	if (!trans_pcie-&gt;ctxt_info_gen3)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dma_free_coherent(trans-&gt;dev, sizeof(*trans_pcie-&gt;ctxt_info_gen3),</div><div class='del'>-			  trans_pcie-&gt;ctxt_info_gen3,</div><div class='del'>-			  trans_pcie-&gt;ctxt_info_dma_addr);</div><div class='del'>-	trans_pcie-&gt;ctxt_info_dma_addr = 0;</div><div class='del'>-	trans_pcie-&gt;ctxt_info_gen3 = NULL;</div><div class='del'>-</div><div class='del'>-	iwl_pcie_ctxt_info_free_fw_img(trans);</div><div class='del'>-</div><div class='del'>-	dma_free_coherent(trans-&gt;dev, sizeof(*trans_pcie-&gt;prph_scratch),</div><div class='del'>-			  trans_pcie-&gt;prph_scratch,</div><div class='del'>-			  trans_pcie-&gt;prph_scratch_dma_addr);</div><div class='del'>-	trans_pcie-&gt;prph_scratch_dma_addr = 0;</div><div class='del'>-	trans_pcie-&gt;prph_scratch = NULL;</div><div class='del'>-</div><div class='del'>-	dma_free_coherent(trans-&gt;dev, sizeof(*trans_pcie-&gt;prph_info),</div><div class='del'>-			  trans_pcie-&gt;prph_info,</div><div class='del'>-			  trans_pcie-&gt;prph_info_dma_addr);</div><div class='del'>-	trans_pcie-&gt;prph_info_dma_addr = 0;</div><div class='del'>-	trans_pcie-&gt;prph_info = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl_trans_pcie_ctx_info_gen3_set_pnvm(struct iwl_trans *trans,</div><div class='del'>-					  const void *data, u32 len)</div><div class='del'>-{</div><div class='del'>-	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-	struct iwl_prph_scratch_ctrl_cfg *prph_sc_ctrl =</div><div class='del'>-		&amp;trans_pcie-&gt;prph_scratch-&gt;ctrl_cfg;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* only allocate the DRAM if not allocated yet */</div><div class='del'>-	if (!trans-&gt;pnvm_loaded) {</div><div class='del'>-		if (WARN_ON(prph_sc_ctrl-&gt;pnvm_cfg.pnvm_size))</div><div class='del'>-			return -EBUSY;</div><div class='del'>-</div><div class='del'>-		ret = iwl_pcie_ctxt_info_alloc_dma(trans, data, len,</div><div class='del'>-						   &amp;trans_pcie-&gt;pnvm_dram);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			IWL_DEBUG_FW(trans, "Failed to allocate PNVM DMA %d.\n",</div><div class='del'>-				     ret);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prph_sc_ctrl-&gt;pnvm_cfg.pnvm_base_addr =</div><div class='del'>-		cpu_to_le64(trans_pcie-&gt;pnvm_dram.physical);</div><div class='del'>-	prph_sc_ctrl-&gt;pnvm_cfg.pnvm_size =</div><div class='del'>-		cpu_to_le32(trans_pcie-&gt;pnvm_dram.size);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-v2.c b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-v2.c<br/>new file mode 100644<br/>index 000000000000..06be929a3ca5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-v2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-v2.c</a></div><div class='hunk'>@@ -0,0 +1,618 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2018-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/dmi.h&gt;</div><div class='add'>+#include "iwl-trans.h"</div><div class='add'>+#include "iwl-fh.h"</div><div class='add'>+#include "iwl-context-info-v2.h"</div><div class='add'>+#include "gen1_2/internal.h"</div><div class='add'>+#include "iwl-prph.h"</div><div class='add'>+</div><div class='add'>+static const struct dmi_system_id dmi_force_scu_active_approved_list[] = {</div><div class='add'>+	{ .ident = "DELL",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ .ident = "DELL",</div><div class='add'>+	  .matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	/* keep last */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool iwl_is_force_scu_active_approved(void)</div><div class='add'>+{</div><div class='add'>+	return !!dmi_check_system(dmi_force_scu_active_approved_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iwl_pcie_ctxt_info_dbg_enable(struct iwl_trans *trans,</div><div class='add'>+			      struct iwl_prph_scratch_hwm_cfg *dbg_cfg,</div><div class='add'>+			      u32 *control_flags)</div><div class='add'>+{</div><div class='add'>+	enum iwl_fw_ini_allocation_id alloc_id = IWL_FW_INI_ALLOCATION_ID_DBGC1;</div><div class='add'>+	struct iwl_fw_ini_allocation_tlv *fw_mon_cfg;</div><div class='add'>+	u32 dbg_flags = 0;</div><div class='add'>+</div><div class='add'>+	if (!iwl_trans_dbg_ini_valid(trans)) {</div><div class='add'>+		struct iwl_dram_data *fw_mon = &amp;trans-&gt;dbg.fw_mon;</div><div class='add'>+</div><div class='add'>+		iwl_pcie_alloc_fw_monitor(trans, 0);</div><div class='add'>+</div><div class='add'>+		if (fw_mon-&gt;size) {</div><div class='add'>+			dbg_flags |= IWL_PRPH_SCRATCH_EDBG_DEST_DRAM;</div><div class='add'>+</div><div class='add'>+			IWL_DEBUG_FW(trans,</div><div class='add'>+				     "WRT: Applying DRAM buffer destination\n");</div><div class='add'>+</div><div class='add'>+			dbg_cfg-&gt;hwm_base_addr = cpu_to_le64(fw_mon-&gt;physical);</div><div class='add'>+			dbg_cfg-&gt;hwm_size = cpu_to_le32(fw_mon-&gt;size);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fw_mon_cfg = &amp;trans-&gt;dbg.fw_mon_cfg[alloc_id];</div><div class='add'>+</div><div class='add'>+	switch (le32_to_cpu(fw_mon_cfg-&gt;buf_location)) {</div><div class='add'>+	case IWL_FW_INI_LOCATION_SRAM_PATH:</div><div class='add'>+		dbg_flags |= IWL_PRPH_SCRATCH_EDBG_DEST_INTERNAL;</div><div class='add'>+		IWL_DEBUG_FW(trans,</div><div class='add'>+				"WRT: Applying SMEM buffer destination\n");</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IWL_FW_INI_LOCATION_NPK_PATH:</div><div class='add'>+		dbg_flags |= IWL_PRPH_SCRATCH_EDBG_DEST_TB22DTF;</div><div class='add'>+		IWL_DEBUG_FW(trans,</div><div class='add'>+			     "WRT: Applying NPK buffer destination\n");</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IWL_FW_INI_LOCATION_DRAM_PATH:</div><div class='add'>+		if (trans-&gt;dbg.fw_mon_ini[alloc_id].num_frags) {</div><div class='add'>+			struct iwl_dram_data *frag =</div><div class='add'>+				&amp;trans-&gt;dbg.fw_mon_ini[alloc_id].frags[0];</div><div class='add'>+			dbg_flags |= IWL_PRPH_SCRATCH_EDBG_DEST_DRAM;</div><div class='add'>+			dbg_cfg-&gt;hwm_base_addr = cpu_to_le64(frag-&gt;physical);</div><div class='add'>+			dbg_cfg-&gt;hwm_size = cpu_to_le32(frag-&gt;size);</div><div class='add'>+			dbg_cfg-&gt;debug_token_config = cpu_to_le32(trans-&gt;dbg.ucode_preset);</div><div class='add'>+			IWL_DEBUG_FW(trans,</div><div class='add'>+				     "WRT: Applying DRAM destination (debug_token_config=%u)\n",</div><div class='add'>+				     dbg_cfg-&gt;debug_token_config);</div><div class='add'>+			IWL_DEBUG_FW(trans,</div><div class='add'>+				     "WRT: Applying DRAM destination (alloc_id=%u, num_frags=%u)\n",</div><div class='add'>+				     alloc_id,</div><div class='add'>+				     trans-&gt;dbg.fw_mon_ini[alloc_id].num_frags);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		IWL_DEBUG_FW(trans, "WRT: Invalid buffer destination (%d)\n",</div><div class='add'>+			     le32_to_cpu(fw_mon_cfg-&gt;buf_location));</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	if (dbg_flags)</div><div class='add'>+		*control_flags |= IWL_PRPH_SCRATCH_EARLY_DEBUG_EN | dbg_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_pcie_ctxt_info_v2_alloc(struct iwl_trans *trans,</div><div class='add'>+				const struct iwl_fw *fw,</div><div class='add'>+				const struct fw_img *img)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_context_info_v2 *ctxt_info_v2;</div><div class='add'>+	struct iwl_prph_scratch *prph_scratch;</div><div class='add'>+	struct iwl_prph_scratch_ctrl_cfg *prph_sc_ctrl;</div><div class='add'>+	struct iwl_prph_info *prph_info;</div><div class='add'>+	u32 control_flags = 0;</div><div class='add'>+	u32 control_flags_ext = 0;</div><div class='add'>+	int ret;</div><div class='add'>+	int cmdq_size = max_t(u32, IWL_CMD_QUEUE_SIZE,</div><div class='add'>+			      trans-&gt;mac_cfg-&gt;base-&gt;min_txq_size);</div><div class='add'>+</div><div class='add'>+	switch (trans-&gt;conf.rx_buf_size) {</div><div class='add'>+	case IWL_AMSDU_DEF:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	case IWL_AMSDU_2K:</div><div class='add'>+		break;</div><div class='add'>+	case IWL_AMSDU_4K:</div><div class='add'>+		control_flags |= IWL_PRPH_SCRATCH_RB_SIZE_4K;</div><div class='add'>+		break;</div><div class='add'>+	case IWL_AMSDU_8K:</div><div class='add'>+		control_flags |= IWL_PRPH_SCRATCH_RB_SIZE_4K;</div><div class='add'>+		/* if firmware supports the ext size, tell it */</div><div class='add'>+		control_flags |= IWL_PRPH_SCRATCH_RB_SIZE_EXT_8K;</div><div class='add'>+		break;</div><div class='add'>+	case IWL_AMSDU_12K:</div><div class='add'>+		control_flags |= IWL_PRPH_SCRATCH_RB_SIZE_4K;</div><div class='add'>+		/* if firmware supports the ext size, tell it */</div><div class='add'>+		control_flags |= IWL_PRPH_SCRATCH_RB_SIZE_EXT_16K;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;conf.dsbr_urm_fw_dependent)</div><div class='add'>+		control_flags_ext |= IWL_PRPH_SCRATCH_EXT_URM_FW;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;conf.dsbr_urm_permanent)</div><div class='add'>+		control_flags_ext |= IWL_PRPH_SCRATCH_EXT_URM_PERM;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;conf.ext_32khz_clock_valid)</div><div class='add'>+		control_flags_ext |= IWL_PRPH_SCRATCH_EXT_32KHZ_CLK_VALID;</div><div class='add'>+</div><div class='add'>+	/* Allocate prph scratch */</div><div class='add'>+	prph_scratch = dma_alloc_coherent(trans-&gt;dev, sizeof(*prph_scratch),</div><div class='add'>+					  &amp;trans_pcie-&gt;prph_scratch_dma_addr,</div><div class='add'>+					  GFP_KERNEL);</div><div class='add'>+	if (!prph_scratch)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	prph_sc_ctrl = &amp;prph_scratch-&gt;ctrl_cfg;</div><div class='add'>+</div><div class='add'>+	prph_sc_ctrl-&gt;version.version = 0;</div><div class='add'>+	prph_sc_ctrl-&gt;version.mac_id =</div><div class='add'>+		cpu_to_le16((u16)trans-&gt;info.hw_rev);</div><div class='add'>+	prph_sc_ctrl-&gt;version.size = cpu_to_le16(sizeof(*prph_scratch) / 4);</div><div class='add'>+</div><div class='add'>+	control_flags |= IWL_PRPH_SCRATCH_MTR_MODE;</div><div class='add'>+	control_flags |= IWL_PRPH_MTR_FORMAT_256B &amp; IWL_PRPH_SCRATCH_MTR_FORMAT;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;imr_enabled)</div><div class='add'>+		control_flags |= IWL_PRPH_SCRATCH_IMR_DEBUG_EN;</div><div class='add'>+</div><div class='add'>+	if (CSR_HW_REV_TYPE(trans-&gt;info.hw_rev) == IWL_CFG_MAC_TYPE_GL &amp;&amp;</div><div class='add'>+	    iwl_is_force_scu_active_approved()) {</div><div class='add'>+		control_flags |= IWL_PRPH_SCRATCH_SCU_FORCE_ACTIVE;</div><div class='add'>+		IWL_DEBUG_FW(trans,</div><div class='add'>+			     "Context Info: Set SCU_FORCE_ACTIVE (0x%x) in control_flags\n",</div><div class='add'>+			     IWL_PRPH_SCRATCH_SCU_FORCE_ACTIVE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;do_top_reset) {</div><div class='add'>+		WARN_ON(trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_SC);</div><div class='add'>+		control_flags |= IWL_PRPH_SCRATCH_TOP_RESET;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* initialize RX default queue */</div><div class='add'>+	prph_sc_ctrl-&gt;rbd_cfg.free_rbd_addr =</div><div class='add'>+		cpu_to_le64(trans_pcie-&gt;rxq-&gt;bd_dma);</div><div class='add'>+</div><div class='add'>+	iwl_pcie_ctxt_info_dbg_enable(trans, &amp;prph_sc_ctrl-&gt;hwm_cfg,</div><div class='add'>+				      &amp;control_flags);</div><div class='add'>+	prph_sc_ctrl-&gt;control.control_flags = cpu_to_le32(control_flags);</div><div class='add'>+	prph_sc_ctrl-&gt;control.control_flags_ext = cpu_to_le32(control_flags_ext);</div><div class='add'>+</div><div class='add'>+	/* initialize the Step equalizer data */</div><div class='add'>+	prph_sc_ctrl-&gt;step_cfg.mbx_addr_0 =</div><div class='add'>+		cpu_to_le32(trans-&gt;conf.mbx_addr_0_step);</div><div class='add'>+	prph_sc_ctrl-&gt;step_cfg.mbx_addr_1 =</div><div class='add'>+		cpu_to_le32(trans-&gt;conf.mbx_addr_1_step);</div><div class='add'>+</div><div class='add'>+	/* allocate ucode sections in dram and set addresses */</div><div class='add'>+	ret = iwl_pcie_init_fw_sec(trans, img, &amp;prph_scratch-&gt;dram.common);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free_prph_scratch;</div><div class='add'>+</div><div class='add'>+	/* Allocate prph information</div><div class='add'>+	 * currently we don't assign to the prph info anything, but it would get</div><div class='add'>+	 * assigned later</div><div class='add'>+	 *</div><div class='add'>+	 * We also use the second half of this page to give the device some</div><div class='add'>+	 * dummy TR/CR tail pointers - which shouldn't be necessary as we don't</div><div class='add'>+	 * use this, but the hardware still reads/writes there and we can't let</div><div class='add'>+	 * it go do that with a NULL pointer.</div><div class='add'>+	 */</div><div class='add'>+	BUILD_BUG_ON(sizeof(*prph_info) &gt; PAGE_SIZE / 2);</div><div class='add'>+	prph_info = dma_alloc_coherent(trans-&gt;dev, PAGE_SIZE,</div><div class='add'>+				       &amp;trans_pcie-&gt;prph_info_dma_addr,</div><div class='add'>+				       GFP_KERNEL);</div><div class='add'>+	if (!prph_info) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_free_prph_scratch;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate context info */</div><div class='add'>+	ctxt_info_v2 = dma_alloc_coherent(trans-&gt;dev,</div><div class='add'>+					  sizeof(*ctxt_info_v2),</div><div class='add'>+					  &amp;trans_pcie-&gt;ctxt_info_dma_addr,</div><div class='add'>+					  GFP_KERNEL);</div><div class='add'>+	if (!ctxt_info_v2) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_free_prph_info;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctxt_info_v2-&gt;prph_info_base_addr =</div><div class='add'>+		cpu_to_le64(trans_pcie-&gt;prph_info_dma_addr);</div><div class='add'>+	ctxt_info_v2-&gt;prph_scratch_base_addr =</div><div class='add'>+		cpu_to_le64(trans_pcie-&gt;prph_scratch_dma_addr);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This code assumes the FSEQ is last and we can make that</div><div class='add'>+	 * optional; old devices _should_ be fine with a bigger size,</div><div class='add'>+	 * but in simulation we check the size more precisely.</div><div class='add'>+	 */</div><div class='add'>+	BUILD_BUG_ON(offsetofend(typeof(*prph_scratch), dram.common) +</div><div class='add'>+		     sizeof(prph_scratch-&gt;dram.fseq_img) !=</div><div class='add'>+		     sizeof(*prph_scratch));</div><div class='add'>+	if (control_flags_ext &amp; IWL_PRPH_SCRATCH_EXT_EXT_FSEQ)</div><div class='add'>+		ctxt_info_v2-&gt;prph_scratch_size =</div><div class='add'>+			cpu_to_le32(sizeof(*prph_scratch));</div><div class='add'>+	else</div><div class='add'>+		ctxt_info_v2-&gt;prph_scratch_size =</div><div class='add'>+			cpu_to_le32(offsetofend(typeof(*prph_scratch),</div><div class='add'>+						dram.common));</div><div class='add'>+</div><div class='add'>+	ctxt_info_v2-&gt;cr_head_idx_arr_base_addr =</div><div class='add'>+		cpu_to_le64(trans_pcie-&gt;rxq-&gt;rb_stts_dma);</div><div class='add'>+	ctxt_info_v2-&gt;tr_tail_idx_arr_base_addr =</div><div class='add'>+		cpu_to_le64(trans_pcie-&gt;prph_info_dma_addr + PAGE_SIZE / 2);</div><div class='add'>+	ctxt_info_v2-&gt;cr_tail_idx_arr_base_addr =</div><div class='add'>+		cpu_to_le64(trans_pcie-&gt;prph_info_dma_addr + 3 * PAGE_SIZE / 4);</div><div class='add'>+	ctxt_info_v2-&gt;mtr_base_addr =</div><div class='add'>+		cpu_to_le64(trans_pcie-&gt;txqs.txq[trans-&gt;conf.cmd_queue]-&gt;dma_addr);</div><div class='add'>+	ctxt_info_v2-&gt;mcr_base_addr =</div><div class='add'>+		cpu_to_le64(trans_pcie-&gt;rxq-&gt;used_bd_dma);</div><div class='add'>+	ctxt_info_v2-&gt;mtr_size =</div><div class='add'>+		cpu_to_le16(TFD_QUEUE_CB_SIZE(cmdq_size));</div><div class='add'>+	ctxt_info_v2-&gt;mcr_size =</div><div class='add'>+		cpu_to_le16(RX_QUEUE_CB_SIZE(iwl_trans_get_num_rbds(trans)));</div><div class='add'>+</div><div class='add'>+	trans_pcie-&gt;ctxt_info_v2 = ctxt_info_v2;</div><div class='add'>+	trans_pcie-&gt;prph_info = prph_info;</div><div class='add'>+	trans_pcie-&gt;prph_scratch = prph_scratch;</div><div class='add'>+</div><div class='add'>+	/* Allocate IML */</div><div class='add'>+	trans_pcie-&gt;iml_len = fw-&gt;iml_len;</div><div class='add'>+	trans_pcie-&gt;iml = dma_alloc_coherent(trans-&gt;dev, fw-&gt;iml_len,</div><div class='add'>+					     &amp;trans_pcie-&gt;iml_dma_addr,</div><div class='add'>+					     GFP_KERNEL);</div><div class='add'>+	if (!trans_pcie-&gt;iml) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_free_ctxt_info;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(trans_pcie-&gt;iml, fw-&gt;iml, fw-&gt;iml_len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_ctxt_info:</div><div class='add'>+	dma_free_coherent(trans-&gt;dev, sizeof(*trans_pcie-&gt;ctxt_info_v2),</div><div class='add'>+			  trans_pcie-&gt;ctxt_info_v2,</div><div class='add'>+			  trans_pcie-&gt;ctxt_info_dma_addr);</div><div class='add'>+	trans_pcie-&gt;ctxt_info_v2 = NULL;</div><div class='add'>+err_free_prph_info:</div><div class='add'>+	dma_free_coherent(trans-&gt;dev, PAGE_SIZE, prph_info,</div><div class='add'>+			  trans_pcie-&gt;prph_info_dma_addr);</div><div class='add'>+</div><div class='add'>+err_free_prph_scratch:</div><div class='add'>+	dma_free_coherent(trans-&gt;dev,</div><div class='add'>+			  sizeof(*prph_scratch),</div><div class='add'>+			prph_scratch,</div><div class='add'>+			trans_pcie-&gt;prph_scratch_dma_addr);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_pcie_ctxt_info_v2_kick(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+</div><div class='add'>+	iwl_enable_fw_load_int_ctx_info(trans, trans-&gt;do_top_reset);</div><div class='add'>+</div><div class='add'>+	/* kick FW self load */</div><div class='add'>+	iwl_write64(trans, CSR_CTXT_INFO_ADDR, trans_pcie-&gt;ctxt_info_dma_addr);</div><div class='add'>+	iwl_write64(trans, CSR_IML_DATA_ADDR, trans_pcie-&gt;iml_dma_addr);</div><div class='add'>+	iwl_write32(trans, CSR_IML_SIZE_ADDR, trans_pcie-&gt;iml_len);</div><div class='add'>+</div><div class='add'>+	iwl_set_bit(trans, CSR_CTXT_INFO_BOOT_CTRL,</div><div class='add'>+		    CSR_AUTO_FUNC_BOOT_ENA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_pcie_ctxt_info_v2_free(struct iwl_trans *trans, bool alive)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+</div><div class='add'>+	if (trans_pcie-&gt;iml) {</div><div class='add'>+		dma_free_coherent(trans-&gt;dev, trans_pcie-&gt;iml_len,</div><div class='add'>+				  trans_pcie-&gt;iml,</div><div class='add'>+				  trans_pcie-&gt;iml_dma_addr);</div><div class='add'>+		trans_pcie-&gt;iml_dma_addr = 0;</div><div class='add'>+		trans_pcie-&gt;iml_len = 0;</div><div class='add'>+		trans_pcie-&gt;iml = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_pcie_ctxt_info_free_fw_img(trans);</div><div class='add'>+</div><div class='add'>+	if (alive)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!trans_pcie-&gt;ctxt_info_v2)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* ctxt_info_v2 and prph_scratch are still needed for PNVM load */</div><div class='add'>+	dma_free_coherent(trans-&gt;dev, sizeof(*trans_pcie-&gt;ctxt_info_v2),</div><div class='add'>+			  trans_pcie-&gt;ctxt_info_v2,</div><div class='add'>+			  trans_pcie-&gt;ctxt_info_dma_addr);</div><div class='add'>+	trans_pcie-&gt;ctxt_info_dma_addr = 0;</div><div class='add'>+	trans_pcie-&gt;ctxt_info_v2 = NULL;</div><div class='add'>+</div><div class='add'>+	dma_free_coherent(trans-&gt;dev, sizeof(*trans_pcie-&gt;prph_scratch),</div><div class='add'>+			  trans_pcie-&gt;prph_scratch,</div><div class='add'>+			  trans_pcie-&gt;prph_scratch_dma_addr);</div><div class='add'>+	trans_pcie-&gt;prph_scratch_dma_addr = 0;</div><div class='add'>+	trans_pcie-&gt;prph_scratch = NULL;</div><div class='add'>+</div><div class='add'>+	/* this is needed for the entire lifetime */</div><div class='add'>+	dma_free_coherent(trans-&gt;dev, PAGE_SIZE, trans_pcie-&gt;prph_info,</div><div class='add'>+			  trans_pcie-&gt;prph_info_dma_addr);</div><div class='add'>+	trans_pcie-&gt;prph_info_dma_addr = 0;</div><div class='add'>+	trans_pcie-&gt;prph_info = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_pcie_load_payloads_contig(struct iwl_trans *trans,</div><div class='add'>+					 const struct iwl_pnvm_image *pnvm_data,</div><div class='add'>+					 struct iwl_dram_data *dram)</div><div class='add'>+{</div><div class='add'>+	u32 len, len0, len1;</div><div class='add'>+</div><div class='add'>+	if (pnvm_data-&gt;n_chunks != UNFRAGMENTED_PNVM_PAYLOADS_NUMBER) {</div><div class='add'>+		IWL_DEBUG_FW(trans, "expected 2 payloads, got %d.\n",</div><div class='add'>+			     pnvm_data-&gt;n_chunks);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len0 = pnvm_data-&gt;chunks[0].len;</div><div class='add'>+	len1 = pnvm_data-&gt;chunks[1].len;</div><div class='add'>+	if (len1 &gt; 0xFFFFFFFF - len0) {</div><div class='add'>+		IWL_DEBUG_FW(trans, "sizes of payloads overflow.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	len = len0 + len1;</div><div class='add'>+</div><div class='add'>+	dram-&gt;block = iwl_pcie_ctxt_info_dma_alloc_coherent(trans, len,</div><div class='add'>+							    &amp;dram-&gt;physical);</div><div class='add'>+	if (!dram-&gt;block) {</div><div class='add'>+		IWL_DEBUG_FW(trans, "Failed to allocate PNVM DMA.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dram-&gt;size = len;</div><div class='add'>+	memcpy(dram-&gt;block, pnvm_data-&gt;chunks[0].data, len0);</div><div class='add'>+	memcpy((u8 *)dram-&gt;block + len0, pnvm_data-&gt;chunks[1].data, len1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_pcie_load_payloads_segments</div><div class='add'>+				(struct iwl_trans *trans,</div><div class='add'>+				 struct iwl_dram_regions *dram_regions,</div><div class='add'>+				 const struct iwl_pnvm_image *pnvm_data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_dram_data *cur_payload_dram = &amp;dram_regions-&gt;drams[0];</div><div class='add'>+	struct iwl_dram_data *desc_dram = &amp;dram_regions-&gt;prph_scratch_mem_desc;</div><div class='add'>+	struct iwl_prph_scratch_mem_desc_addr_array *addresses;</div><div class='add'>+	const void *data;</div><div class='add'>+	u32 len;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* allocate and init DRAM descriptors array */</div><div class='add'>+	len = sizeof(struct iwl_prph_scratch_mem_desc_addr_array);</div><div class='add'>+	desc_dram-&gt;block = iwl_pcie_ctxt_info_dma_alloc_coherent</div><div class='add'>+						(trans,</div><div class='add'>+						 len,</div><div class='add'>+						 &amp;desc_dram-&gt;physical);</div><div class='add'>+	if (!desc_dram-&gt;block) {</div><div class='add'>+		IWL_DEBUG_FW(trans, "Failed to allocate PNVM DMA.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	desc_dram-&gt;size = len;</div><div class='add'>+	memset(desc_dram-&gt;block, 0, len);</div><div class='add'>+</div><div class='add'>+	/* allocate DRAM region for each payload */</div><div class='add'>+	dram_regions-&gt;n_regions = 0;</div><div class='add'>+	for (i = 0; i &lt; pnvm_data-&gt;n_chunks; i++) {</div><div class='add'>+		len = pnvm_data-&gt;chunks[i].len;</div><div class='add'>+		data = pnvm_data-&gt;chunks[i].data;</div><div class='add'>+</div><div class='add'>+		if (iwl_pcie_ctxt_info_alloc_dma(trans,</div><div class='add'>+						 data,</div><div class='add'>+						 len,</div><div class='add'>+						 cur_payload_dram)) {</div><div class='add'>+			iwl_trans_pcie_free_pnvm_dram_regions(dram_regions,</div><div class='add'>+							      trans-&gt;dev);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dram_regions-&gt;n_regions++;</div><div class='add'>+		cur_payload_dram++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* fill desc with the DRAM payloads addresses */</div><div class='add'>+	addresses = desc_dram-&gt;block;</div><div class='add'>+	for (i = 0; i &lt; pnvm_data-&gt;n_chunks; i++) {</div><div class='add'>+		addresses-&gt;mem_descs[i] =</div><div class='add'>+			cpu_to_le64(dram_regions-&gt;drams[i].physical);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_trans_pcie_ctx_info_v2_load_pnvm(struct iwl_trans *trans,</div><div class='add'>+					 const struct iwl_pnvm_image *pnvm_payloads,</div><div class='add'>+					 const struct iwl_ucode_capabilities *capa)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_prph_scratch_ctrl_cfg *prph_sc_ctrl =</div><div class='add'>+		&amp;trans_pcie-&gt;prph_scratch-&gt;ctrl_cfg;</div><div class='add'>+	struct iwl_dram_regions *dram_regions = &amp;trans_pcie-&gt;pnvm_data;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* only allocate the DRAM if not allocated yet */</div><div class='add'>+	if (trans-&gt;pnvm_loaded)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(prph_sc_ctrl-&gt;pnvm_cfg.pnvm_size))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!pnvm_payloads-&gt;n_chunks) {</div><div class='add'>+		IWL_DEBUG_FW(trans, "no payloads\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* save payloads in several DRAM sections */</div><div class='add'>+	if (fw_has_capa(capa, IWL_UCODE_TLV_CAPA_FRAGMENTED_PNVM_IMG)) {</div><div class='add'>+		ret = iwl_pcie_load_payloads_segments(trans,</div><div class='add'>+						      dram_regions,</div><div class='add'>+						      pnvm_payloads);</div><div class='add'>+		if (!ret)</div><div class='add'>+			trans-&gt;pnvm_loaded = true;</div><div class='add'>+	} else {</div><div class='add'>+		/* save only in one DRAM section */</div><div class='add'>+		ret = iwl_pcie_load_payloads_contig(trans, pnvm_payloads,</div><div class='add'>+						    &amp;dram_regions-&gt;drams[0]);</div><div class='add'>+		if (!ret) {</div><div class='add'>+			dram_regions-&gt;n_regions = 1;</div><div class='add'>+			trans-&gt;pnvm_loaded = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline size_t</div><div class='add'>+iwl_dram_regions_size(const struct iwl_dram_regions *dram_regions)</div><div class='add'>+{</div><div class='add'>+	size_t total_size = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dram_regions-&gt;n_regions; i++)</div><div class='add'>+		total_size += dram_regions-&gt;drams[i].size;</div><div class='add'>+</div><div class='add'>+	return total_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_pcie_set_pnvm_segments(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_prph_scratch_ctrl_cfg *prph_sc_ctrl =</div><div class='add'>+		&amp;trans_pcie-&gt;prph_scratch-&gt;ctrl_cfg;</div><div class='add'>+	struct iwl_dram_regions *dram_regions = &amp;trans_pcie-&gt;pnvm_data;</div><div class='add'>+</div><div class='add'>+	prph_sc_ctrl-&gt;pnvm_cfg.pnvm_base_addr =</div><div class='add'>+		cpu_to_le64(dram_regions-&gt;prph_scratch_mem_desc.physical);</div><div class='add'>+	prph_sc_ctrl-&gt;pnvm_cfg.pnvm_size =</div><div class='add'>+		cpu_to_le32(iwl_dram_regions_size(dram_regions));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_pcie_set_contig_pnvm(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_prph_scratch_ctrl_cfg *prph_sc_ctrl =</div><div class='add'>+		&amp;trans_pcie-&gt;prph_scratch-&gt;ctrl_cfg;</div><div class='add'>+</div><div class='add'>+	prph_sc_ctrl-&gt;pnvm_cfg.pnvm_base_addr =</div><div class='add'>+		cpu_to_le64(trans_pcie-&gt;pnvm_data.drams[0].physical);</div><div class='add'>+	prph_sc_ctrl-&gt;pnvm_cfg.pnvm_size =</div><div class='add'>+		cpu_to_le32(trans_pcie-&gt;pnvm_data.drams[0].size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_trans_pcie_ctx_info_v2_set_pnvm(struct iwl_trans *trans,</div><div class='add'>+					 const struct iwl_ucode_capabilities *capa)</div><div class='add'>+{</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (fw_has_capa(capa, IWL_UCODE_TLV_CAPA_FRAGMENTED_PNVM_IMG))</div><div class='add'>+		iwl_pcie_set_pnvm_segments(trans);</div><div class='add'>+	else</div><div class='add'>+		iwl_pcie_set_contig_pnvm(trans);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_trans_pcie_ctx_info_v2_load_reduce_power(struct iwl_trans *trans,</div><div class='add'>+						 const struct iwl_pnvm_image *payloads,</div><div class='add'>+						 const struct iwl_ucode_capabilities *capa)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_prph_scratch_ctrl_cfg *prph_sc_ctrl =</div><div class='add'>+		&amp;trans_pcie-&gt;prph_scratch-&gt;ctrl_cfg;</div><div class='add'>+	struct iwl_dram_regions *dram_regions = &amp;trans_pcie-&gt;reduced_tables_data;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* only allocate the DRAM if not allocated yet */</div><div class='add'>+	if (trans-&gt;reduce_power_loaded)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(prph_sc_ctrl-&gt;reduce_power_cfg.size))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (!payloads-&gt;n_chunks) {</div><div class='add'>+		IWL_DEBUG_FW(trans, "no payloads\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* save payloads in several DRAM sections */</div><div class='add'>+	if (fw_has_capa(capa, IWL_UCODE_TLV_CAPA_FRAGMENTED_PNVM_IMG)) {</div><div class='add'>+		ret = iwl_pcie_load_payloads_segments(trans,</div><div class='add'>+						      dram_regions,</div><div class='add'>+						      payloads);</div><div class='add'>+		if (!ret)</div><div class='add'>+			trans-&gt;reduce_power_loaded = true;</div><div class='add'>+	} else {</div><div class='add'>+		/* save only in one DRAM section */</div><div class='add'>+		ret = iwl_pcie_load_payloads_contig(trans, payloads,</div><div class='add'>+						    &amp;dram_regions-&gt;drams[0]);</div><div class='add'>+		if (!ret) {</div><div class='add'>+			dram_regions-&gt;n_regions = 1;</div><div class='add'>+			trans-&gt;reduce_power_loaded = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_pcie_set_reduce_power_segments(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_prph_scratch_ctrl_cfg *prph_sc_ctrl =</div><div class='add'>+		&amp;trans_pcie-&gt;prph_scratch-&gt;ctrl_cfg;</div><div class='add'>+	struct iwl_dram_regions *dram_regions = &amp;trans_pcie-&gt;reduced_tables_data;</div><div class='add'>+</div><div class='add'>+	prph_sc_ctrl-&gt;reduce_power_cfg.base_addr =</div><div class='add'>+		cpu_to_le64(dram_regions-&gt;prph_scratch_mem_desc.physical);</div><div class='add'>+	prph_sc_ctrl-&gt;reduce_power_cfg.size =</div><div class='add'>+		cpu_to_le32(iwl_dram_regions_size(dram_regions));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_pcie_set_contig_reduce_power(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_prph_scratch_ctrl_cfg *prph_sc_ctrl =</div><div class='add'>+		&amp;trans_pcie-&gt;prph_scratch-&gt;ctrl_cfg;</div><div class='add'>+</div><div class='add'>+	prph_sc_ctrl-&gt;reduce_power_cfg.base_addr =</div><div class='add'>+		cpu_to_le64(trans_pcie-&gt;reduced_tables_data.drams[0].physical);</div><div class='add'>+	prph_sc_ctrl-&gt;reduce_power_cfg.size =</div><div class='add'>+		cpu_to_le32(trans_pcie-&gt;reduced_tables_data.drams[0].size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+iwl_trans_pcie_ctx_info_v2_set_reduce_power(struct iwl_trans *trans,</div><div class='add'>+					    const struct iwl_ucode_capabilities *capa)</div><div class='add'>+{</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (fw_has_capa(capa, IWL_UCODE_TLV_CAPA_FRAGMENTED_PNVM_IMG))</div><div class='add'>+		iwl_pcie_set_reduce_power_segments(trans);</div><div class='add'>+	else</div><div class='add'>+		iwl_pcie_set_contig_reduce_power(trans);</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c<br/>index 74ce31fdf45e..0957223c776d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c</a></div><div class='hunk'>@@ -1,12 +1,12 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2018-2021 Intel Corporation</div><div class='add'>+ * Copyright (C) 2018-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #include "iwl-trans.h"</div><div class='ctx'> #include "iwl-fh.h"</div><div class='ctx'> #include "iwl-context-info.h"</div><div class='del'>-#include "internal.h"</div><div class='add'>+#include "gen1_2/internal.h"</div><div class='ctx'> #include "iwl-prph.h"</div><div class='ctx'> </div><div class='ctx'> static void *_iwl_pcie_ctxt_info_dma_alloc_coherent(struct iwl_trans *trans,</div><div class='hunk'>@@ -38,9 +38,9 @@ static void *_iwl_pcie_ctxt_info_dma_alloc_coherent(struct iwl_trans *trans,</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *iwl_pcie_ctxt_info_dma_alloc_coherent(struct iwl_trans *trans,</div><div class='del'>-						   size_t size,</div><div class='del'>-						   dma_addr_t *phys)</div><div class='add'>+void *iwl_pcie_ctxt_info_dma_alloc_coherent(struct iwl_trans *trans,</div><div class='add'>+					    size_t size,</div><div class='add'>+					    dma_addr_t *phys)</div><div class='ctx'> {</div><div class='ctx'> 	return _iwl_pcie_ctxt_info_dma_alloc_coherent(trans, size, phys, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -83,7 +83,7 @@ void iwl_pcie_ctxt_info_free_paging(struct iwl_trans *trans)</div><div class='ctx'> </div><div class='ctx'> int iwl_pcie_init_fw_sec(struct iwl_trans *trans,</div><div class='ctx'> 			 const struct fw_img *fw,</div><div class='del'>-			 struct iwl_context_info_dram *ctxt_dram)</div><div class='add'>+			 struct iwl_context_info_dram_nonfseq *ctxt_dram)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_self_init_dram *dram = &amp;trans-&gt;init_dram;</div><div class='ctx'> 	int i, ret, lmac_cnt, umac_cnt, paging_cnt;</div><div class='hunk'>@@ -161,12 +161,12 @@ int iwl_pcie_init_fw_sec(struct iwl_trans *trans,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iwl_pcie_ctxt_info_init(struct iwl_trans *trans,</div><div class='del'>-			    const struct fw_img *fw)</div><div class='add'>+			    const struct fw_img *img)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	struct iwl_context_info *ctxt_info;</div><div class='ctx'> 	struct iwl_context_info_rbd_cfg *rx_cfg;</div><div class='del'>-	u32 control_flags = 0, rb_size;</div><div class='add'>+	u32 control_flags = 0, rb_size, cb_size;</div><div class='ctx'> 	dma_addr_t phys;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -180,11 +180,11 @@ int iwl_pcie_ctxt_info_init(struct iwl_trans *trans,</div><div class='ctx'> </div><div class='ctx'> 	ctxt_info-&gt;version.version = 0;</div><div class='ctx'> 	ctxt_info-&gt;version.mac_id =</div><div class='del'>-		cpu_to_le16((u16)iwl_read32(trans, CSR_HW_REV));</div><div class='add'>+		cpu_to_le16((u16)trans-&gt;info.hw_rev);</div><div class='ctx'> 	/* size is in DWs */</div><div class='ctx'> 	ctxt_info-&gt;version.size = cpu_to_le16(sizeof(*ctxt_info) / 4);</div><div class='ctx'> </div><div class='del'>-	switch (trans_pcie-&gt;rx_buf_size) {</div><div class='add'>+	switch (trans-&gt;conf.rx_buf_size) {</div><div class='ctx'> 	case IWL_AMSDU_2K:</div><div class='ctx'> 		rb_size = IWL_CTXT_INFO_RB_SIZE_2K;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -202,11 +202,12 @@ int iwl_pcie_ctxt_info_init(struct iwl_trans *trans,</div><div class='ctx'> 		rb_size = IWL_CTXT_INFO_RB_SIZE_4K;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	WARN_ON(RX_QUEUE_CB_SIZE(trans-&gt;cfg-&gt;num_rbds) &gt; 12);</div><div class='add'>+	cb_size = RX_QUEUE_CB_SIZE(iwl_trans_get_num_rbds(trans));</div><div class='add'>+	if (WARN_ON(cb_size &gt; 12))</div><div class='add'>+		cb_size = 12;</div><div class='add'>+</div><div class='ctx'> 	control_flags = IWL_CTXT_INFO_TFD_FORMAT_LONG;</div><div class='del'>-	control_flags |=</div><div class='del'>-		u32_encode_bits(RX_QUEUE_CB_SIZE(trans-&gt;cfg-&gt;num_rbds),</div><div class='del'>-				IWL_CTXT_INFO_RB_CB_SIZE);</div><div class='add'>+	control_flags |= u32_encode_bits(cb_size, IWL_CTXT_INFO_RB_CB_SIZE);</div><div class='ctx'> 	control_flags |= u32_encode_bits(rb_size, IWL_CTXT_INFO_RB_SIZE);</div><div class='ctx'> 	ctxt_info-&gt;control.control_flags = cpu_to_le32(control_flags);</div><div class='ctx'> </div><div class='hunk'>@@ -218,12 +219,12 @@ int iwl_pcie_ctxt_info_init(struct iwl_trans *trans,</div><div class='ctx'> </div><div class='ctx'> 	/* initialize TX command queue */</div><div class='ctx'> 	ctxt_info-&gt;hcmd_cfg.cmd_queue_addr =</div><div class='del'>-		cpu_to_le64(trans-&gt;txqs.txq[trans-&gt;txqs.cmd.q_id]-&gt;dma_addr);</div><div class='add'>+		cpu_to_le64(trans_pcie-&gt;txqs.txq[trans-&gt;conf.cmd_queue]-&gt;dma_addr);</div><div class='ctx'> 	ctxt_info-&gt;hcmd_cfg.cmd_queue_size =</div><div class='ctx'> 		TFD_QUEUE_CB_SIZE(IWL_CMD_QUEUE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* allocate ucode sections in dram and set addresses */</div><div class='del'>-	ret = iwl_pcie_init_fw_sec(trans, fw, &amp;ctxt_info-&gt;dram);</div><div class='add'>+	ret = iwl_pcie_init_fw_sec(trans, img, &amp;ctxt_info-&gt;dram);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dma_free_coherent(trans-&gt;dev, sizeof(*trans_pcie-&gt;ctxt_info),</div><div class='ctx'> 				  ctxt_info, trans_pcie-&gt;ctxt_info_dma_addr);</div><div class='hunk'>@@ -232,7 +233,7 @@ int iwl_pcie_ctxt_info_init(struct iwl_trans *trans,</div><div class='ctx'> </div><div class='ctx'> 	trans_pcie-&gt;ctxt_info = ctxt_info;</div><div class='ctx'> </div><div class='del'>-	iwl_enable_fw_load_int_ctx_info(trans);</div><div class='add'>+	iwl_enable_fw_load_int_ctx_info(trans, false);</div><div class='ctx'> </div><div class='ctx'> 	/* Configure debug, if exists */</div><div class='ctx'> 	if (iwl_pcie_dbg_on(trans))</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c<br/>index d94bd8d732e9..dc99e7ac4726 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/drv.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/drv.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/drv.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/pcie/drv.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2005-2014, 2018-2021 Intel Corporation</div><div class='add'>+ * Copyright (C) 2005-2014, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -15,17 +15,15 @@</div><div class='ctx'> #include "iwl-trans.h"</div><div class='ctx'> #include "iwl-drv.h"</div><div class='ctx'> #include "iwl-prph.h"</div><div class='del'>-#include "internal.h"</div><div class='add'>+#include "gen1_2/internal.h"</div><div class='ctx'> </div><div class='del'>-#define TRANS_CFG_MARKER BIT(0)</div><div class='ctx'> #define _IS_A(cfg, _struct) __builtin_types_compatible_p(typeof(cfg),	\</div><div class='ctx'> 							 struct _struct)</div><div class='ctx'> extern int _invalid_type;</div><div class='del'>-#define _TRANS_CFG_MARKER(cfg)						\</div><div class='del'>-	(__builtin_choose_expr(_IS_A(cfg, iwl_cfg_trans_params),	\</div><div class='del'>-			       TRANS_CFG_MARKER,			\</div><div class='del'>-	 __builtin_choose_expr(_IS_A(cfg, iwl_cfg), 0, _invalid_type)))</div><div class='del'>-#define _ASSIGN_CFG(cfg) (_TRANS_CFG_MARKER(cfg) + (kernel_ulong_t)&amp;(cfg))</div><div class='add'>+#define _TRANS_CFG_CHECK(cfg)						\</div><div class='add'>+	(__builtin_choose_expr(_IS_A(cfg, iwl_mac_cfg),	\</div><div class='add'>+			       0, _invalid_type))</div><div class='add'>+#define _ASSIGN_CFG(cfg) (_TRANS_CFG_CHECK(cfg) + (kernel_ulong_t)&amp;(cfg))</div><div class='ctx'> </div><div class='ctx'> #define IWL_PCI_DEVICE(dev, subdev, cfg) \</div><div class='ctx'> 	.vendor = PCI_VENDOR_ID_INTEL,  .device = (dev), \</div><div class='hunk'>@@ -33,1278 +31,1165 @@ extern int _invalid_type;</div><div class='ctx'> 	.driver_data = _ASSIGN_CFG(cfg)</div><div class='ctx'> </div><div class='ctx'> /* Hardware specific file defines the PCI IDs table for that hardware module */</div><div class='del'>-static const struct pci_device_id iwl_hw_card_ids[] = {</div><div class='add'>+VISIBLE_IF_IWLWIFI_KUNIT const struct pci_device_id iwl_hw_card_ids[] = {</div><div class='ctx'> #if IS_ENABLED(CONFIG_IWLDVM)</div><div class='del'>-	{IWL_PCI_DEVICE(0x4232, 0x1201, iwl5100_agn_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4232, 0x1301, iwl5100_agn_cfg)}, /* Half Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4232, 0x1204, iwl5100_agn_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4232, 0x1304, iwl5100_agn_cfg)}, /* Half Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4232, 0x1205, iwl5100_bgn_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4232, 0x1305, iwl5100_bgn_cfg)}, /* Half Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4232, 0x1206, iwl5100_abg_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4232, 0x1306, iwl5100_abg_cfg)}, /* Half Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4232, 0x1221, iwl5100_agn_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4232, 0x1321, iwl5100_agn_cfg)}, /* Half Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4232, 0x1224, iwl5100_agn_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4232, 0x1324, iwl5100_agn_cfg)}, /* Half Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4232, 0x1225, iwl5100_bgn_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4232, 0x1325, iwl5100_bgn_cfg)}, /* Half Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4232, 0x1226, iwl5100_abg_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4232, 0x1326, iwl5100_abg_cfg)}, /* Half Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4237, 0x1211, iwl5100_agn_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4237, 0x1311, iwl5100_agn_cfg)}, /* Half Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4237, 0x1214, iwl5100_agn_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4237, 0x1314, iwl5100_agn_cfg)}, /* Half Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4237, 0x1215, iwl5100_bgn_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4237, 0x1315, iwl5100_bgn_cfg)}, /* Half Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4237, 0x1216, iwl5100_abg_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4237, 0x1316, iwl5100_abg_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4232, 0x1201, iwl5000_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4232, 0x1301, iwl5000_mac_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4232, 0x1204, iwl5000_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4232, 0x1304, iwl5000_mac_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4232, 0x1205, iwl5000_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4232, 0x1305, iwl5000_mac_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4232, 0x1206, iwl5000_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4232, 0x1306, iwl5000_mac_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4232, 0x1221, iwl5000_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4232, 0x1321, iwl5000_mac_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4232, 0x1224, iwl5000_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4232, 0x1324, iwl5000_mac_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4232, 0x1225, iwl5000_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4232, 0x1325, iwl5000_mac_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4232, 0x1226, iwl5000_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4232, 0x1326, iwl5000_mac_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4237, 0x1211, iwl5000_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4237, 0x1311, iwl5000_mac_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4237, 0x1214, iwl5000_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4237, 0x1314, iwl5000_mac_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4237, 0x1215, iwl5000_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4237, 0x1315, iwl5000_mac_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4237, 0x1216, iwl5000_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4237, 0x1316, iwl5000_mac_cfg)}, /* Half Mini Card */</div><div class='ctx'> </div><div class='ctx'> /* 5300 Series WiFi */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4235, 0x1021, iwl5300_agn_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4235, 0x1121, iwl5300_agn_cfg)}, /* Half Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4235, 0x1024, iwl5300_agn_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4235, 0x1124, iwl5300_agn_cfg)}, /* Half Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4235, 0x1001, iwl5300_agn_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4235, 0x1101, iwl5300_agn_cfg)}, /* Half Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4235, 0x1004, iwl5300_agn_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4235, 0x1104, iwl5300_agn_cfg)}, /* Half Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4236, 0x1011, iwl5300_agn_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4236, 0x1111, iwl5300_agn_cfg)}, /* Half Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4236, 0x1014, iwl5300_agn_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x4236, 0x1114, iwl5300_agn_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4235, 0x1021, iwl5000_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4235, 0x1121, iwl5000_mac_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4235, 0x1024, iwl5000_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4235, 0x1124, iwl5000_mac_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4235, 0x1001, iwl5000_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4235, 0x1101, iwl5000_mac_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4235, 0x1004, iwl5000_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4235, 0x1104, iwl5000_mac_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4236, 0x1011, iwl5000_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4236, 0x1111, iwl5000_mac_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4236, 0x1014, iwl5000_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x4236, 0x1114, iwl5000_mac_cfg)}, /* Half Mini Card */</div><div class='ctx'> </div><div class='ctx'> /* 5350 Series WiFi/WiMax */</div><div class='del'>-	{IWL_PCI_DEVICE(0x423A, 0x1001, iwl5350_agn_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x423A, 0x1021, iwl5350_agn_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x423B, 0x1011, iwl5350_agn_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x423A, 0x1001, iwl5000_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x423A, 0x1021, iwl5000_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x423B, 0x1011, iwl5000_mac_cfg)}, /* Mini Card */</div><div class='ctx'> </div><div class='ctx'> /* 5150 Series Wifi/WiMax */</div><div class='del'>-	{IWL_PCI_DEVICE(0x423C, 0x1201, iwl5150_agn_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x423C, 0x1301, iwl5150_agn_cfg)}, /* Half Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x423C, 0x1206, iwl5150_abg_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x423C, 0x1306, iwl5150_abg_cfg)}, /* Half Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x423C, 0x1221, iwl5150_agn_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x423C, 0x1321, iwl5150_agn_cfg)}, /* Half Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x423C, 0x1326, iwl5150_abg_cfg)}, /* Half Mini Card */</div><div class='del'>-</div><div class='del'>-	{IWL_PCI_DEVICE(0x423D, 0x1211, iwl5150_agn_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x423D, 0x1311, iwl5150_agn_cfg)}, /* Half Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x423D, 0x1216, iwl5150_abg_cfg)}, /* Mini Card */</div><div class='del'>-	{IWL_PCI_DEVICE(0x423D, 0x1316, iwl5150_abg_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x423C, 0x1201, iwl5150_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x423C, 0x1301, iwl5150_mac_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x423C, 0x1206, iwl5150_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x423C, 0x1306, iwl5150_mac_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x423C, 0x1221, iwl5150_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x423C, 0x1321, iwl5150_mac_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x423C, 0x1326, iwl5150_mac_cfg)}, /* Half Mini Card */</div><div class='add'>+</div><div class='add'>+	{IWL_PCI_DEVICE(0x423D, 0x1211, iwl5150_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x423D, 0x1311, iwl5150_mac_cfg)}, /* Half Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x423D, 0x1216, iwl5150_mac_cfg)}, /* Mini Card */</div><div class='add'>+	{IWL_PCI_DEVICE(0x423D, 0x1316, iwl5150_mac_cfg)}, /* Half Mini Card */</div><div class='ctx'> </div><div class='ctx'> /* 6x00 Series */</div><div class='del'>-	{IWL_PCI_DEVICE(0x422B, 0x1101, iwl6000_3agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x422B, 0x1108, iwl6000_3agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x422B, 0x1121, iwl6000_3agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x422B, 0x1128, iwl6000_3agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x422C, 0x1301, iwl6000i_2agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x422C, 0x1306, iwl6000i_2abg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x422C, 0x1307, iwl6000i_2bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x422C, 0x1321, iwl6000i_2agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x422C, 0x1326, iwl6000i_2abg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x4238, 0x1111, iwl6000_3agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x4238, 0x1118, iwl6000_3agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x4239, 0x1311, iwl6000i_2agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x4239, 0x1316, iwl6000i_2abg_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x422B, 0x1101, iwl6000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x422B, 0x1108, iwl6000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x422B, 0x1121, iwl6000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x422B, 0x1128, iwl6000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x422C, 0x1301, iwl6000i_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x422C, 0x1306, iwl6000i_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x422C, 0x1307, iwl6000i_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x422C, 0x1321, iwl6000i_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x422C, 0x1326, iwl6000i_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x4238, 0x1111, iwl6000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x4238, 0x1118, iwl6000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x4239, 0x1311, iwl6000i_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x4239, 0x1316, iwl6000i_mac_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* 6x05 Series */</div><div class='del'>-	{IWL_PCI_DEVICE(0x0082, 0x1301, iwl6005_2agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0082, 0x1306, iwl6005_2abg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0082, 0x1307, iwl6005_2bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0082, 0x1308, iwl6005_2agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0082, 0x1321, iwl6005_2agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0082, 0x1326, iwl6005_2abg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0082, 0x1328, iwl6005_2agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0085, 0x1311, iwl6005_2agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0085, 0x1318, iwl6005_2agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0085, 0x1316, iwl6005_2abg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0082, 0xC020, iwl6005_2agn_sff_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0085, 0xC220, iwl6005_2agn_sff_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0085, 0xC228, iwl6005_2agn_sff_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0082, 0x4820, iwl6005_2agn_d_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0082, 0x1304, iwl6005_2agn_mow1_cfg)},/* low 5GHz active */</div><div class='del'>-	{IWL_PCI_DEVICE(0x0082, 0x1305, iwl6005_2agn_mow2_cfg)},/* high 5GHz active */</div><div class='del'>-</div><div class='del'>-/* 6x30 Series */</div><div class='del'>-	{IWL_PCI_DEVICE(0x008A, 0x5305, iwl1030_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x008A, 0x5307, iwl1030_bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x008A, 0x5325, iwl1030_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x008A, 0x5327, iwl1030_bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x008B, 0x5315, iwl1030_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x008B, 0x5317, iwl1030_bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0090, 0x5211, iwl6030_2agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0090, 0x5215, iwl6030_2bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0090, 0x5216, iwl6030_2abg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0091, 0x5201, iwl6030_2agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0091, 0x5205, iwl6030_2bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0091, 0x5206, iwl6030_2abg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0091, 0x5207, iwl6030_2bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0091, 0x5221, iwl6030_2agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0091, 0x5225, iwl6030_2bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0091, 0x5226, iwl6030_2abg_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0082, 0x1301, iwl6005_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0082, 0x1306, iwl6005_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0082, 0x1307, iwl6005_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0082, 0x1308, iwl6005_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0082, 0x1321, iwl6005_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0082, 0x1326, iwl6005_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0082, 0x1328, iwl6005_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0085, 0x1311, iwl6005_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0085, 0x1318, iwl6005_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0085, 0x1316, iwl6005_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0082, 0xC020, iwl6005_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0085, 0xC220, iwl6005_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0085, 0xC228, iwl6005_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0082, 0x4820, iwl6005_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0082, 0x1304, iwl6005_mac_cfg)},/* low 5GHz active */</div><div class='add'>+	{IWL_PCI_DEVICE(0x0082, 0x1305, iwl6005_mac_cfg)},/* high 5GHz active */</div><div class='add'>+</div><div class='add'>+/* 1030/6x30 Series */</div><div class='add'>+	{IWL_PCI_DEVICE(0x008A, 0x5305, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x008A, 0x5307, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x008A, 0x5325, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x008A, 0x5327, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x008B, 0x5315, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x008B, 0x5317, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0090, 0x5211, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0090, 0x5215, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0090, 0x5216, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0091, 0x5201, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0091, 0x5205, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0091, 0x5206, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0091, 0x5207, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0091, 0x5221, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0091, 0x5225, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0091, 0x5226, iwl6030_mac_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* 6x50 WiFi/WiMax Series */</div><div class='del'>-	{IWL_PCI_DEVICE(0x0087, 0x1301, iwl6050_2agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0087, 0x1306, iwl6050_2abg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0087, 0x1321, iwl6050_2agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0087, 0x1326, iwl6050_2abg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0089, 0x1311, iwl6050_2agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0089, 0x1316, iwl6050_2abg_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0087, 0x1301, iwl6050_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0087, 0x1306, iwl6050_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0087, 0x1321, iwl6050_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0087, 0x1326, iwl6050_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0089, 0x1311, iwl6050_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0089, 0x1316, iwl6050_mac_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* 6150 WiFi/WiMax Series */</div><div class='del'>-	{IWL_PCI_DEVICE(0x0885, 0x1305, iwl6150_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0885, 0x1307, iwl6150_bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0885, 0x1325, iwl6150_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0885, 0x1327, iwl6150_bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0886, 0x1315, iwl6150_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0886, 0x1317, iwl6150_bg_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0885, 0x1305, iwl6150_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0885, 0x1307, iwl6150_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0885, 0x1325, iwl6150_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0885, 0x1327, iwl6150_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0886, 0x1315, iwl6150_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0886, 0x1317, iwl6150_mac_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* 1000 Series WiFi */</div><div class='del'>-	{IWL_PCI_DEVICE(0x0083, 0x1205, iwl1000_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0083, 0x1305, iwl1000_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0083, 0x1225, iwl1000_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0083, 0x1325, iwl1000_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0084, 0x1215, iwl1000_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0084, 0x1315, iwl1000_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0083, 0x1206, iwl1000_bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0083, 0x1306, iwl1000_bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0083, 0x1226, iwl1000_bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0083, 0x1326, iwl1000_bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0084, 0x1216, iwl1000_bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0084, 0x1316, iwl1000_bg_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0083, 0x1205, iwl1000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0083, 0x1305, iwl1000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0083, 0x1225, iwl1000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0083, 0x1325, iwl1000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0084, 0x1215, iwl1000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0084, 0x1315, iwl1000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0083, 0x1206, iwl1000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0083, 0x1306, iwl1000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0083, 0x1226, iwl1000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0083, 0x1326, iwl1000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0084, 0x1216, iwl1000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0084, 0x1316, iwl1000_mac_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* 100 Series WiFi */</div><div class='del'>-	{IWL_PCI_DEVICE(0x08AE, 0x1005, iwl100_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08AE, 0x1007, iwl100_bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08AF, 0x1015, iwl100_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08AF, 0x1017, iwl100_bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08AE, 0x1025, iwl100_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08AE, 0x1027, iwl100_bg_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08AE, 0x1005, iwl1000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08AE, 0x1007, iwl1000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08AF, 0x1015, iwl1000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08AF, 0x1017, iwl1000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08AE, 0x1025, iwl1000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08AE, 0x1027, iwl1000_mac_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* 130 Series WiFi */</div><div class='del'>-	{IWL_PCI_DEVICE(0x0896, 0x5005, iwl130_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0896, 0x5007, iwl130_bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0897, 0x5015, iwl130_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0897, 0x5017, iwl130_bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0896, 0x5025, iwl130_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0896, 0x5027, iwl130_bg_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0896, 0x5005, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0896, 0x5007, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0897, 0x5015, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0897, 0x5017, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0896, 0x5025, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0896, 0x5027, iwl6030_mac_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* 2x00 Series */</div><div class='del'>-	{IWL_PCI_DEVICE(0x0890, 0x4022, iwl2000_2bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0891, 0x4222, iwl2000_2bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0890, 0x4422, iwl2000_2bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0890, 0x4822, iwl2000_2bgn_d_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0890, 0x4022, iwl2000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0891, 0x4222, iwl2000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0890, 0x4422, iwl2000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0890, 0x4822, iwl2000_mac_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* 2x30 Series */</div><div class='del'>-	{IWL_PCI_DEVICE(0x0887, 0x4062, iwl2030_2bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0888, 0x4262, iwl2030_2bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0887, 0x4462, iwl2030_2bgn_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0887, 0x4062, iwl2030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0888, 0x4262, iwl2030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0887, 0x4462, iwl2030_mac_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* 6x35 Series */</div><div class='del'>-	{IWL_PCI_DEVICE(0x088E, 0x4060, iwl6035_2agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x088E, 0x406A, iwl6035_2agn_sff_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x088F, 0x4260, iwl6035_2agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x088F, 0x426A, iwl6035_2agn_sff_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x088E, 0x4460, iwl6035_2agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x088E, 0x446A, iwl6035_2agn_sff_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x088E, 0x4860, iwl6035_2agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x088F, 0x5260, iwl6035_2agn_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x088E, 0x4060, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x088E, 0x406A, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x088F, 0x4260, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x088F, 0x426A, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x088E, 0x4460, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x088E, 0x446A, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x088E, 0x4860, iwl6030_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x088F, 0x5260, iwl6030_mac_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* 105 Series */</div><div class='del'>-	{IWL_PCI_DEVICE(0x0894, 0x0022, iwl105_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0895, 0x0222, iwl105_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0894, 0x0422, iwl105_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0894, 0x0822, iwl105_bgn_d_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0894, 0x0022, iwl105_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0895, 0x0222, iwl105_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0894, 0x0422, iwl105_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0894, 0x0822, iwl105_mac_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* 135 Series */</div><div class='del'>-	{IWL_PCI_DEVICE(0x0892, 0x0062, iwl135_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0893, 0x0262, iwl135_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0892, 0x0462, iwl135_bgn_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0892, 0x0062, iwl135_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0893, 0x0262, iwl135_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0892, 0x0462, iwl135_mac_cfg)},</div><div class='ctx'> #endif /* CONFIG_IWLDVM */</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IWLMVM)</div><div class='ctx'> /* 7260 Series */</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x4070, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x4072, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x4170, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x4C60, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x4C70, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x4060, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x406A, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x4160, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x4062, iwl7260_n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x4162, iwl7260_n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B2, 0x4270, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B2, 0x4272, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B2, 0x4260, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B2, 0x426A, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B2, 0x4262, iwl7260_n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x4470, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x4472, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x4460, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x446A, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x4462, iwl7260_n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x4870, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x486E, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x4A70, iwl7260_2ac_cfg_high_temp)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x4A6E, iwl7260_2ac_cfg_high_temp)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x4A6C, iwl7260_2ac_cfg_high_temp)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x4570, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x4560, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B2, 0x4370, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B2, 0x4360, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x5070, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x5072, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x5170, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x5770, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x4020, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x402A, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B2, 0x4220, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0x4420, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0xC070, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0xC072, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0xC170, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0xC060, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0xC06A, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0xC160, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0xC062, iwl7260_n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0xC162, iwl7260_n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0xC770, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0xC760, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B2, 0xC270, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0xCC70, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0xCC60, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B2, 0xC272, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B2, 0xC260, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B2, 0xC26A, iwl7260_n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B2, 0xC262, iwl7260_n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0xC470, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0xC472, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0xC460, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0xC462, iwl7260_n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0xC570, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0xC560, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B2, 0xC370, iwl7260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0xC360, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0xC020, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0xC02A, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B2, 0xC220, iwl7260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B1, 0xC420, iwl7260_2n_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x4070, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x4072, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x4170, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x4C60, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x4C70, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x4060, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x406A, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x4160, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x4062, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x4162, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B2, 0x4270, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B2, 0x4272, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B2, 0x4260, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B2, 0x426A, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B2, 0x4262, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x4470, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x4472, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x4460, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x446A, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x4462, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x4870, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x486E, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x4A70, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x4A6E, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x4A6C, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x4570, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x4560, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B2, 0x4370, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B2, 0x4360, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x5070, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x5072, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x5170, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x5770, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x4020, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x402A, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B2, 0x4220, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0x4420, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0xC070, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0xC072, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0xC170, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0xC060, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0xC06A, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0xC160, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0xC062, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0xC162, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0xC770, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0xC760, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B2, 0xC270, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0xCC70, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0xCC60, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B2, 0xC272, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B2, 0xC260, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B2, 0xC26A, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B2, 0xC262, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0xC470, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0xC472, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0xC460, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0xC462, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0xC570, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0xC560, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B2, 0xC370, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0xC360, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0xC020, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0xC02A, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B2, 0xC220, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B1, 0xC420, iwl7000_mac_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* 3160 Series */</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B3, 0x0070, iwl3160_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B3, 0x0072, iwl3160_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B3, 0x0170, iwl3160_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B3, 0x0172, iwl3160_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B3, 0x0060, iwl3160_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B3, 0x0062, iwl3160_n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B4, 0x0270, iwl3160_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B4, 0x0272, iwl3160_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B3, 0x0470, iwl3160_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B3, 0x0472, iwl3160_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B4, 0x0370, iwl3160_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B3, 0x8070, iwl3160_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B3, 0x8072, iwl3160_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B3, 0x8170, iwl3160_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B3, 0x8172, iwl3160_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B3, 0x8060, iwl3160_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B3, 0x8062, iwl3160_n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B4, 0x8270, iwl3160_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B4, 0x8370, iwl3160_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B4, 0x8272, iwl3160_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B3, 0x8470, iwl3160_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B3, 0x8570, iwl3160_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B3, 0x1070, iwl3160_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x08B3, 0x1170, iwl3160_2ac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B3, 0x0070, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B3, 0x0072, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B3, 0x0170, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B3, 0x0172, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B3, 0x0060, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B3, 0x0062, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B4, 0x0270, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B4, 0x0272, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B3, 0x0470, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B3, 0x0472, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B4, 0x0370, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B3, 0x8070, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B3, 0x8072, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B3, 0x8170, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B3, 0x8172, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B3, 0x8060, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B3, 0x8062, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B4, 0x8270, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B4, 0x8370, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B4, 0x8272, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B3, 0x8470, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B3, 0x8570, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B3, 0x1070, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x08B3, 0x1170, iwl7000_mac_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* 3165 Series */</div><div class='del'>-	{IWL_PCI_DEVICE(0x3165, 0x4010, iwl3165_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x3165, 0x4012, iwl3165_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x3166, 0x4212, iwl3165_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x3165, 0x4410, iwl3165_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x3165, 0x4510, iwl3165_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x3165, 0x4110, iwl3165_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x3166, 0x4310, iwl3165_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x3166, 0x4210, iwl3165_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x3165, 0x8010, iwl3165_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x3165, 0x8110, iwl3165_2ac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x3165, 0x4010, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x3165, 0x4012, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x3166, 0x4212, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x3165, 0x4410, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x3165, 0x4510, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x3165, 0x4110, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x3166, 0x4310, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x3166, 0x4210, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x3165, 0x8010, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x3165, 0x8110, iwl7000_mac_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* 3168 Series */</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FB, 0x2010, iwl3168_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FB, 0x2110, iwl3168_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FB, 0x2050, iwl3168_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FB, 0x2150, iwl3168_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FB, 0x0000, iwl3168_2ac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FB, 0x2010, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FB, 0x2110, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FB, 0x2050, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FB, 0x2150, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FB, 0x0000, iwl7000_mac_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* 7265 Series */</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x5010, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x5110, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x5100, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095B, 0x5310, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095B, 0x5302, iwl7265_n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095B, 0x5210, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x5C10, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x5012, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x5412, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x5410, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x5510, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x5400, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x1010, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x5000, iwl7265_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x500A, iwl7265_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095B, 0x5200, iwl7265_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x5002, iwl7265_n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x5102, iwl7265_n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095B, 0x5202, iwl7265_n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x9010, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x9012, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x900A, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x9110, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x9112, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095B, 0x9210, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095B, 0x9200, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x9510, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095B, 0x9310, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x9410, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x5020, iwl7265_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x502A, iwl7265_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x5420, iwl7265_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x5090, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x5190, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x5590, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095B, 0x5290, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x5490, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x5F10, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095B, 0x5212, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095B, 0x520A, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x9000, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x9400, iwl7265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x095A, 0x9E10, iwl7265_2ac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x5010, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x5110, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x5100, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095B, 0x5310, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095B, 0x5302, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095B, 0x5210, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x5C10, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x5012, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x5412, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x5410, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x5510, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x5400, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x1010, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x5000, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x500A, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095B, 0x5200, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x5002, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x5102, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095B, 0x5202, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x9010, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x9012, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x900A, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x9110, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x9112, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095B, 0x9210, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095B, 0x9200, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x9510, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095B, 0x9310, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x9410, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x5020, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x502A, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x5420, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x5090, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x5190, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x5590, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095B, 0x5290, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x5490, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x5F10, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095B, 0x5212, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095B, 0x520A, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x9000, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x9400, iwl7000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x095A, 0x9E10, iwl7000_mac_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* 8000 Series */</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x0010, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x1010, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x10B0, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x0130, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x1130, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x0132, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x1132, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x0110, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x01F0, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x0012, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x1012, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x1110, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x0050, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x0250, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x1050, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x0150, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x1150, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F4, 0x0030, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F4, 0x1030, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0xC010, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0xC110, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0xD010, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0xC050, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0xD050, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0xD0B0, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0xB0B0, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x8010, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x8110, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x9010, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x9110, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F4, 0x8030, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F4, 0x9030, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F4, 0xC030, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F4, 0xD030, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x8130, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x9130, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x8132, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x9132, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x8050, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x8150, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x9050, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x9150, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x0004, iwl8260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x0044, iwl8260_2n_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F5, 0x0010, iwl4165_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F6, 0x0030, iwl4165_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x0810, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x0910, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x0850, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x0950, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x0930, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x0000, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24F3, 0x4010, iwl8260_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x0010, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x0110, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x1110, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x1130, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x0130, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x1010, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x10D0, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x0050, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x0150, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x9010, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x8110, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x8050, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x8010, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x0810, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x9110, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x8130, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x0910, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x0930, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x0950, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x0850, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x1014, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x3E02, iwl8275_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x3E01, iwl8275_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x1012, iwl8275_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x0012, iwl8275_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x0014, iwl8265_2ac_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x24FD, 0x9074, iwl8265_2ac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x0010, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x1010, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x10B0, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x0130, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x1130, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x0132, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x1132, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x0110, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x01F0, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x0012, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x1012, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x1110, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x0050, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x0250, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x1050, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x0150, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x1150, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F4, 0x0030, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F4, 0x1030, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0xC010, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0xC110, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0xD010, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0xC050, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0xD050, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0xD0B0, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0xB0B0, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x8010, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x8110, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x9010, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x9110, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F4, 0x8030, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F4, 0x9030, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F4, 0xC030, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F4, 0xD030, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x8130, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x9130, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x8132, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x9132, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x8050, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x8150, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x9050, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x9150, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x0004, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x0044, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F5, 0x0010, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F6, 0x0030, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x0810, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x0910, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x0850, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x0950, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x0930, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x0000, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0x4010, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0xC030, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24F3, 0xD030, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x0010, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x0110, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x1110, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x1130, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x0130, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x1010, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x10D0, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x0050, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x0150, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x9010, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x8110, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x8050, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x8010, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x0810, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x9110, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x8130, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x0910, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x0930, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x0950, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x0850, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x1014, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x3E02, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x3E01, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x1012, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x0012, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x0014, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x9074, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x1431, iwl8000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x24FD, 0x1432, iwl8000_mac_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* 9000 Series */</div><div class='del'>-	{IWL_PCI_DEVICE(0x2526, PCI_ANY_ID, iwl9000_trans_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x271B, PCI_ANY_ID, iwl9000_trans_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x271C, PCI_ANY_ID, iwl9000_trans_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x30DC, PCI_ANY_ID, iwl9560_long_latency_trans_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x31DC, PCI_ANY_ID, iwl9560_shared_clk_trans_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x9DF0, PCI_ANY_ID, iwl9560_trans_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0xA370, PCI_ANY_ID, iwl9560_trans_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x2526, PCI_ANY_ID, iwl9000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x271B, PCI_ANY_ID, iwl9000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x271C, PCI_ANY_ID, iwl9000_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x30DC, PCI_ANY_ID, iwl9560_long_latency_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x31DC, PCI_ANY_ID, iwl9560_shared_clk_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x9DF0, PCI_ANY_ID, iwl9560_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA370, PCI_ANY_ID, iwl9560_mac_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* Qu devices */</div><div class='del'>-	{IWL_PCI_DEVICE(0x02F0, PCI_ANY_ID, iwl_qu_trans_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x06F0, PCI_ANY_ID, iwl_qu_trans_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x02F0, PCI_ANY_ID, iwl_qu_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x06F0, PCI_ANY_ID, iwl_qu_mac_cfg)},</div><div class='ctx'> </div><div class='del'>-	{IWL_PCI_DEVICE(0x34F0, PCI_ANY_ID, iwl_qu_medium_latency_trans_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x3DF0, PCI_ANY_ID, iwl_qu_medium_latency_trans_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x4DF0, PCI_ANY_ID, iwl_qu_medium_latency_trans_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x34F0, PCI_ANY_ID, iwl_qu_medium_latency_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x3DF0, PCI_ANY_ID, iwl_qu_medium_latency_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x4DF0, PCI_ANY_ID, iwl_qu_medium_latency_mac_cfg)},</div><div class='ctx'> </div><div class='del'>-	{IWL_PCI_DEVICE(0x43F0, PCI_ANY_ID, iwl_qu_long_latency_trans_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0xA0F0, PCI_ANY_ID, iwl_qu_long_latency_trans_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x43F0, PCI_ANY_ID, iwl_qu_long_latency_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA0F0, PCI_ANY_ID, iwl_qu_long_latency_mac_cfg)},</div><div class='ctx'> </div><div class='del'>-	{IWL_PCI_DEVICE(0x2720, PCI_ANY_ID, iwl_qnj_trans_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x2723, PCI_ANY_ID, iwl_ax200_mac_cfg)},</div><div class='ctx'> </div><div class='del'>-	{IWL_PCI_DEVICE(0x2723, PCI_ANY_ID, iwl_ax200_trans_cfg)},</div><div class='del'>-</div><div class='del'>-/* So devices */</div><div class='del'>-	{IWL_PCI_DEVICE(0x2725, PCI_ANY_ID, iwl_so_trans_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x2726, PCI_ANY_ID, iwl_snj_trans_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x7A70, PCI_ANY_ID, iwl_so_long_latency_trans_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x7AF0, PCI_ANY_ID, iwl_so_trans_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x51F0, PCI_ANY_ID, iwl_so_long_latency_trans_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x54F0, PCI_ANY_ID, iwl_so_long_latency_trans_cfg)},</div><div class='add'>+/* Ty/So devices */</div><div class='add'>+	{IWL_PCI_DEVICE(0x2725, PCI_ANY_ID, iwl_ty_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x7A70, PCI_ANY_ID, iwl_so_long_latency_imr_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x7AF0, PCI_ANY_ID, iwl_so_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x51F0, PCI_ANY_ID, iwl_so_long_latency_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x51F1, PCI_ANY_ID, iwl_so_long_latency_imr_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x54F0, PCI_ANY_ID, iwl_so_long_latency_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x7F70, PCI_ANY_ID, iwl_so_mac_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* Ma devices */</div><div class='del'>-	{IWL_PCI_DEVICE(0x2729, PCI_ANY_ID, iwl_ma_trans_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x7E40, PCI_ANY_ID, iwl_ma_trans_cfg)},</div><div class='del'>-</div><div class='del'>-/* Bz devices */</div><div class='del'>-	{IWL_PCI_DEVICE(0x2727, PCI_ANY_ID, iwl_bz_trans_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x2729, PCI_ANY_ID, iwl_ma_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x7E40, PCI_ANY_ID, iwl_ma_mac_cfg)},</div><div class='ctx'> #endif /* CONFIG_IWLMVM */</div><div class='add'>+#if IS_ENABLED(CONFIG_IWLMVM) || IS_ENABLED(CONFIG_IWLMLD)</div><div class='add'>+/* Bz devices */</div><div class='add'>+	{IWL_PCI_DEVICE(0x272b, PCI_ANY_ID, iwl_gl_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x0000, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x0090, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x0094, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x0098, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x009C, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x00C0, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x00C4, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x00E0, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x00E4, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x00E8, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x00EC, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x0100, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x0110, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x0114, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x0118, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x011C, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x0310, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x0314, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x0510, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x0A10, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x1671, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x1672, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x1771, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x1772, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x1791, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x1792, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x4090, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x40C4, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x40E0, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x4110, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x4314, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x1775, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xA840, 0x1776, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x7740, PCI_ANY_ID, iwl_bz_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x4D40, PCI_ANY_ID, iwl_bz_mac_cfg)},</div><div class='add'>+</div><div class='add'>+/* Sc devices */</div><div class='add'>+	{IWL_PCI_DEVICE(0xE440, PCI_ANY_ID, iwl_sc_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xE340, PCI_ANY_ID, iwl_sc_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xD340, PCI_ANY_ID, iwl_sc_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x6E70, PCI_ANY_ID, iwl_sc_mac_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0xD240, PCI_ANY_ID, iwl_sc_mac_cfg)},</div><div class='add'>+#endif /* CONFIG_IWLMVM || CONFIG_IWLMLD */</div><div class='ctx'> </div><div class='ctx'> 	{0}</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, iwl_hw_card_ids);</div><div class='add'>+EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_hw_card_ids);</div><div class='add'>+</div><div class='add'>+#define _IWL_DEV_INFO(_cfg, _name, ...) {	\</div><div class='add'>+	.cfg = &amp;_cfg,				\</div><div class='add'>+	.name = _name,				\</div><div class='add'>+	.device = IWL_CFG_ANY,			\</div><div class='add'>+	.subdevice = IWL_CFG_ANY,		\</div><div class='add'>+	.subdevice_m_h = 15,			\</div><div class='add'>+	__VA_ARGS__				\</div><div class='add'>+}</div><div class='add'>+#define IWL_DEV_INFO(_cfg, _name, ...)		\</div><div class='add'>+	_IWL_DEV_INFO(_cfg, _name, __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define DEVICE(n)		.device = (n)</div><div class='add'>+#define SUBDEV(n)		.subdevice = (n)</div><div class='add'>+#define _LOWEST_BIT(n)		(__builtin_ffs(n) - 1)</div><div class='add'>+#define _BIT_ABOVE_MASK(n)	((n) + (1 &lt;&lt; _LOWEST_BIT(n)))</div><div class='add'>+#define _HIGHEST_BIT(n)		(__builtin_ffs(_BIT_ABOVE_MASK(n)) - 2)</div><div class='add'>+#define _IS_POW2(n)		(((n) &amp; ((n) - 1)) == 0)</div><div class='add'>+#define _IS_CONTIG(n)		_IS_POW2(_BIT_ABOVE_MASK(n))</div><div class='add'>+#define _CHECK_MASK(m)		BUILD_BUG_ON_ZERO(!_IS_CONTIG(m))</div><div class='add'>+#define SUBDEV_MASKED(v, m)	.subdevice = (v) + _CHECK_MASK(m),	\</div><div class='add'>+				.subdevice_m_l = _LOWEST_BIT(m),	\</div><div class='add'>+				.subdevice_m_h = _HIGHEST_BIT(m)</div><div class='add'>+#define RF_TYPE(n)		.match_rf_type = 1,			\</div><div class='add'>+				.rf_type = IWL_CFG_RF_TYPE_##n</div><div class='add'>+#define DISCRETE		.match_discrete = 1,			\</div><div class='add'>+				.discrete = 1</div><div class='add'>+#define INTEGRATED		.match_discrete = 1,			\</div><div class='add'>+				.discrete = 0</div><div class='add'>+#define RF_ID(n)		.match_rf_id = 1,			\</div><div class='add'>+				.rf_id = IWL_CFG_RF_ID_##n</div><div class='add'>+#define NO_CDB			.match_cdb = 1, .cdb = 0</div><div class='add'>+#define CDB			.match_cdb = 1, .cdb = 1</div><div class='add'>+#define BW_NOT_LIMITED		.match_bw_limit = 1, .bw_limit = 0</div><div class='add'>+#define BW_LIMITED		.match_bw_limit = 1, .bw_limit = 1</div><div class='add'>+</div><div class='add'>+VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {</div><div class='add'>+#if IS_ENABLED(CONFIG_IWLDVM)</div><div class='add'>+	IWL_DEV_INFO(iwl5100_n_cfg, iwl5100_agn_name,</div><div class='add'>+		     DEVICE(0x4232), SUBDEV_MASKED(0x1, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl5100_n_cfg, iwl5100_agn_name,</div><div class='add'>+		     DEVICE(0x4232), SUBDEV_MASKED(0x4, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl5100_n_cfg, iwl5100_bgn_name,</div><div class='add'>+		     DEVICE(0x4232), SUBDEV_MASKED(0x5, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl5100_abg_cfg, iwl5100_abg_name,</div><div class='add'>+		     DEVICE(0x4232), SUBDEV_MASKED(0x6, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl5100_n_cfg, iwl5100_agn_name,</div><div class='add'>+		     DEVICE(0x4237), SUBDEV_MASKED(0x1, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl5100_n_cfg, iwl5100_agn_name,</div><div class='add'>+		     DEVICE(0x4237), SUBDEV_MASKED(0x4, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl5100_n_cfg, iwl5100_bgn_name,</div><div class='add'>+		     DEVICE(0x4237), SUBDEV_MASKED(0x5, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl5100_abg_cfg, iwl5100_abg_name,</div><div class='add'>+		     DEVICE(0x4237), SUBDEV_MASKED(0x6, 0xF)),</div><div class='add'>+</div><div class='add'>+/* 5300 Series WiFi */</div><div class='add'>+	IWL_DEV_INFO(iwl5300_agn_cfg, iwl5300_agn_name,</div><div class='add'>+		     DEVICE(0x4235), SUBDEV_MASKED(0x1, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl5300_agn_cfg, iwl5300_agn_name,</div><div class='add'>+		     DEVICE(0x4235), SUBDEV_MASKED(0x4, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl5300_agn_cfg, iwl5300_agn_name,</div><div class='add'>+		     DEVICE(0x4236), SUBDEV_MASKED(0x1, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl5300_agn_cfg, iwl5300_agn_name,</div><div class='add'>+		     DEVICE(0x4236), SUBDEV_MASKED(0x4, 0xF)),</div><div class='add'>+</div><div class='add'>+/* 5350 Series WiFi/WiMax */</div><div class='add'>+	IWL_DEV_INFO(iwl5350_agn_cfg, iwl5350_agn_name,</div><div class='add'>+		     DEVICE(0x423A)),</div><div class='add'>+	IWL_DEV_INFO(iwl5350_agn_cfg, iwl5350_agn_name,</div><div class='add'>+		     DEVICE(0x423B)),</div><div class='add'>+</div><div class='add'>+/* 5150 Series Wifi/WiMax */</div><div class='add'>+	IWL_DEV_INFO(iwl5150_agn_cfg, iwl5150_agn_name,</div><div class='add'>+		     DEVICE(0x423C), SUBDEV_MASKED(0x1, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl5150_abg_cfg, iwl5150_abg_name,</div><div class='add'>+		     DEVICE(0x423C), SUBDEV_MASKED(0x6, 0xF)),</div><div class='ctx'> </div><div class='del'>-#define _IWL_DEV_INFO(_device, _subdevice, _mac_type, _mac_step, _rf_type, \</div><div class='del'>-		      _rf_id, _no_160, _cores, _cdb, _cfg, _name)		   \</div><div class='del'>-	{ .device = (_device), .subdevice = (_subdevice), .cfg = &amp;(_cfg),  \</div><div class='del'>-	  .name = _name, .mac_type = _mac_type, .rf_type = _rf_type,	   \</div><div class='del'>-	  .no_160 = _no_160, .cores = _cores, .rf_id = _rf_id,		   \</div><div class='del'>-	  .mac_step = _mac_step, .cdb = _cdb }</div><div class='add'>+	IWL_DEV_INFO(iwl5150_agn_cfg, iwl5150_agn_name,</div><div class='add'>+		     DEVICE(0x423D), SUBDEV_MASKED(0x1, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl5150_abg_cfg, iwl5150_abg_name,</div><div class='add'>+		     DEVICE(0x423D), SUBDEV_MASKED(0x6, 0xF)),</div><div class='ctx'> </div><div class='del'>-#define IWL_DEV_INFO(_device, _subdevice, _cfg, _name) \</div><div class='del'>-	_IWL_DEV_INFO(_device, _subdevice, IWL_CFG_ANY, IWL_CFG_ANY,	   \</div><div class='del'>-		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,  \</div><div class='del'>-		      IWL_CFG_NO_CDB, _cfg, _name)</div><div class='add'>+/* 6x00 Series */</div><div class='add'>+	IWL_DEV_INFO(iwl6000_3agn_cfg, iwl6000_3agn_name,</div><div class='add'>+		     DEVICE(0x422B), SUBDEV_MASKED(0x1, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl6000_3agn_cfg, iwl6000_3agn_name,</div><div class='add'>+		     DEVICE(0x422B), SUBDEV_MASKED(0x8, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl6000i_2agn_cfg, iwl6000i_2agn_name,</div><div class='add'>+		     DEVICE(0x422C), SUBDEV_MASKED(0x1, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl6000i_non_n_cfg, iwl6000i_2abg_name,</div><div class='add'>+		     DEVICE(0x422C), SUBDEV_MASKED(0x6, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl6000i_non_n_cfg, iwl6000i_2bg_name,</div><div class='add'>+		     DEVICE(0x422C), SUBDEV_MASKED(0x7, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl6000_3agn_cfg, iwl6000_3agn_name,</div><div class='add'>+		     DEVICE(0x4238), SUBDEV(0x1111)),</div><div class='add'>+	IWL_DEV_INFO(iwl6000_3agn_cfg, iwl6000_3agn_name,</div><div class='add'>+		     DEVICE(0x4238), SUBDEV(0x1118)),</div><div class='add'>+	IWL_DEV_INFO(iwl6000i_2agn_cfg, iwl6000i_2agn_name,</div><div class='add'>+		     DEVICE(0x4239), SUBDEV(0x1311)),</div><div class='add'>+	IWL_DEV_INFO(iwl6000i_non_n_cfg, iwl6000i_2abg_name,</div><div class='add'>+		     DEVICE(0x4239), SUBDEV(0x1316)),</div><div class='add'>+</div><div class='add'>+/* 6x05 Series */</div><div class='add'>+	IWL_DEV_INFO(iwl6005_n_cfg, iwl6005_2agn_name,</div><div class='add'>+		     DEVICE(0x0082), SUBDEV_MASKED(0x1, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl6005_non_n_cfg, iwl6005_2abg_name,</div><div class='add'>+		     DEVICE(0x0082), SUBDEV_MASKED(0x6, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl6005_non_n_cfg, iwl6005_2bg_name,</div><div class='add'>+		     DEVICE(0x0082), SUBDEV_MASKED(0x7, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl6005_n_cfg, iwl6005_2agn_name,</div><div class='add'>+		     DEVICE(0x0082), SUBDEV_MASKED(0x8, 0xF)),</div><div class='add'>+</div><div class='add'>+	IWL_DEV_INFO(iwl6005_n_cfg, iwl6005_2agn_name,</div><div class='add'>+		     DEVICE(0x0085), SUBDEV_MASKED(0x1, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl6005_n_cfg, iwl6005_2agn_name,</div><div class='add'>+		     DEVICE(0x0085), SUBDEV_MASKED(0x8, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl6005_non_n_cfg, iwl6005_2abg_name,</div><div class='add'>+		     DEVICE(0x0085), SUBDEV_MASKED(0x6, 0xF)),</div><div class='add'>+</div><div class='add'>+	IWL_DEV_INFO(iwl6005_n_cfg, iwl6005_2agn_sff_name,</div><div class='add'>+		     DEVICE(0x0082), SUBDEV_MASKED(0xC000, 0xF000)),</div><div class='add'>+	IWL_DEV_INFO(iwl6005_n_cfg, iwl6005_2agn_sff_name,</div><div class='add'>+		     DEVICE(0x0085), SUBDEV_MASKED(0xC000, 0xF000)),</div><div class='add'>+	IWL_DEV_INFO(iwl6005_n_cfg, iwl6005_2agn_d_name,</div><div class='add'>+		     DEVICE(0x0082), SUBDEV(0x4820)),</div><div class='add'>+	IWL_DEV_INFO(iwl6005_n_cfg, iwl6005_2agn_mow1_name,</div><div class='add'>+		     DEVICE(0x0082), SUBDEV(0x1304)),/* low 5GHz active */</div><div class='add'>+	IWL_DEV_INFO(iwl6005_n_cfg, iwl6005_2agn_mow2_name,</div><div class='add'>+		     DEVICE(0x0082), SUBDEV(0x1305)),/* high 5GHz active */</div><div class='add'>+</div><div class='add'>+/* 6x30 Series */</div><div class='add'>+	IWL_DEV_INFO(iwl6030_n_cfg, iwl1030_bgn_name,</div><div class='add'>+		     DEVICE(0x008A), SUBDEV_MASKED(0x5, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl6030_non_n_cfg, iwl1030_bg_name,</div><div class='add'>+		     DEVICE(0x008A), SUBDEV_MASKED(0x7, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl6030_n_cfg, iwl1030_bgn_name,</div><div class='add'>+		     DEVICE(0x008B), SUBDEV(0x5315)),</div><div class='add'>+	IWL_DEV_INFO(iwl6030_non_n_cfg, iwl1030_bg_name,</div><div class='add'>+		     DEVICE(0x008B), SUBDEV(0x5317)),</div><div class='add'>+	IWL_DEV_INFO(iwl6030_n_cfg, iwl6030_2agn_name,</div><div class='add'>+		     DEVICE(0x0090), SUBDEV(0x5211)),</div><div class='add'>+	IWL_DEV_INFO(iwl6030_n_cfg, iwl6030_2bgn_name,</div><div class='add'>+		     DEVICE(0x0090), SUBDEV(0x5215)),</div><div class='add'>+	IWL_DEV_INFO(iwl6030_non_n_cfg, iwl6030_2abg_name,</div><div class='add'>+		     DEVICE(0x0090), SUBDEV(0x5216)),</div><div class='add'>+	IWL_DEV_INFO(iwl6030_n_cfg, iwl6030_2agn_name,</div><div class='add'>+		     DEVICE(0x0091), SUBDEV_MASKED(0x1, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl6030_n_cfg, iwl6030_2bgn_name,</div><div class='add'>+		     DEVICE(0x0091), SUBDEV_MASKED(0x5, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl6030_non_n_cfg, iwl6030_2abg_name,</div><div class='add'>+		     DEVICE(0x0091), SUBDEV_MASKED(0x6, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl6030_non_n_cfg, iwl6030_2bg_name,</div><div class='add'>+		     DEVICE(0x0091), SUBDEV(0x5207)),</div><div class='add'>+</div><div class='add'>+/* 6x50 WiFi/WiMax Series */</div><div class='add'>+	IWL_DEV_INFO(iwl6050_2agn_cfg, iwl6050_2agn_name,</div><div class='add'>+		     DEVICE(0x0087), SUBDEV_MASKED(0x1, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl6050_2abg_cfg, iwl6050_2abg_name,</div><div class='add'>+		     DEVICE(0x0087), SUBDEV_MASKED(0x6, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl6050_2agn_cfg, iwl6050_2agn_name,</div><div class='add'>+		     DEVICE(0x0089), SUBDEV(0x1311)),</div><div class='add'>+	IWL_DEV_INFO(iwl6050_2abg_cfg, iwl6050_2abg_name,</div><div class='add'>+		     DEVICE(0x0089), SUBDEV(0x1316)),</div><div class='add'>+</div><div class='add'>+/* 6150 WiFi/WiMax Series */</div><div class='add'>+	IWL_DEV_INFO(iwl6150_bgn_cfg, iwl6150_bgn_name,</div><div class='add'>+		     DEVICE(0x0885), SUBDEV_MASKED(0x5, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl6150_bg_cfg, iwl6150_bg_name,</div><div class='add'>+		     DEVICE(0x0885), SUBDEV_MASKED(0x7, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl6150_bgn_cfg, iwl6150_bgn_name,</div><div class='add'>+		     DEVICE(0x0886), SUBDEV(0x1315)),</div><div class='add'>+	IWL_DEV_INFO(iwl6150_bg_cfg, iwl6150_bg_name,</div><div class='add'>+		     DEVICE(0x0886), SUBDEV(0x1317)),</div><div class='add'>+</div><div class='add'>+/* 1000 Series WiFi */</div><div class='add'>+	IWL_DEV_INFO(iwl1000_bgn_cfg, iwl1000_bgn_name,</div><div class='add'>+		     DEVICE(0x0083), SUBDEV_MASKED(0x5, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl1000_bg_cfg, iwl1000_bg_name,</div><div class='add'>+		     DEVICE(0x0083), SUBDEV_MASKED(0x6, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl1000_bgn_cfg, iwl1000_bgn_name,</div><div class='add'>+		     DEVICE(0x0084), SUBDEV_MASKED(0x5, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl1000_bg_cfg, iwl1000_bg_name,</div><div class='add'>+		     DEVICE(0x0084), SUBDEV_MASKED(0x6, 0xF)),</div><div class='add'>+</div><div class='add'>+/* 100 Series WiFi */</div><div class='add'>+	IWL_DEV_INFO(iwl100_bgn_cfg, iwl100_bgn_name,</div><div class='add'>+		     DEVICE(0x08AE), SUBDEV_MASKED(0x5, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl100_bg_cfg, iwl100_bg_name,</div><div class='add'>+		     DEVICE(0x08AE), SUBDEV_MASKED(0x7, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl100_bgn_cfg, iwl100_bgn_name,</div><div class='add'>+		     DEVICE(0x08AF), SUBDEV(0x1015)),</div><div class='add'>+	IWL_DEV_INFO(iwl100_bg_cfg, iwl100_bg_name,</div><div class='add'>+		     DEVICE(0x08AF), SUBDEV(0x1017)),</div><div class='add'>+</div><div class='add'>+/* 130 Series WiFi */</div><div class='add'>+	IWL_DEV_INFO(iwl130_bgn_cfg, iwl130_bgn_name,</div><div class='add'>+		     DEVICE(0x0896), SUBDEV_MASKED(0x5, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl130_bg_cfg, iwl130_bg_name,</div><div class='add'>+		     DEVICE(0x0896), SUBDEV_MASKED(0x7, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl130_bgn_cfg, iwl130_bgn_name,</div><div class='add'>+		     DEVICE(0x0897), SUBDEV(0x5015)),</div><div class='add'>+	IWL_DEV_INFO(iwl130_bg_cfg, iwl130_bg_name,</div><div class='add'>+		     DEVICE(0x0897), SUBDEV(0x5017)),</div><div class='add'>+</div><div class='add'>+/* 2x00 Series */</div><div class='add'>+	IWL_DEV_INFO(iwl2000_2bgn_cfg, iwl2000_2bgn_name,</div><div class='add'>+		     DEVICE(0x0890), SUBDEV(0x4022)),</div><div class='add'>+	IWL_DEV_INFO(iwl2000_2bgn_cfg, iwl2000_2bgn_name,</div><div class='add'>+		     DEVICE(0x0891), SUBDEV(0x4222)),</div><div class='add'>+	IWL_DEV_INFO(iwl2000_2bgn_cfg, iwl2000_2bgn_name,</div><div class='add'>+		     DEVICE(0x0890), SUBDEV(0x4422)),</div><div class='add'>+	IWL_DEV_INFO(iwl2000_2bgn_cfg, iwl2000_2bgn_d_name,</div><div class='add'>+		     DEVICE(0x0890), SUBDEV(0x4822)),</div><div class='add'>+</div><div class='add'>+/* 2x30 Series */</div><div class='add'>+	IWL_DEV_INFO(iwl2030_2bgn_cfg, iwl2030_2bgn_name,</div><div class='add'>+		     DEVICE(0x0887)),</div><div class='add'>+	IWL_DEV_INFO(iwl2030_2bgn_cfg, iwl2030_2bgn_name,</div><div class='add'>+		     DEVICE(0x0888), SUBDEV(0x4262)),</div><div class='add'>+</div><div class='add'>+/* 6x35 Series */</div><div class='add'>+	IWL_DEV_INFO(iwl6035_2agn_cfg, iwl6035_2agn_name,</div><div class='add'>+		     DEVICE(0x088E), SUBDEV_MASKED(0x0, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl6035_2agn_cfg, iwl6035_2agn_sff_name,</div><div class='add'>+		     DEVICE(0x088E), SUBDEV_MASKED(0xA, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl6035_2agn_cfg, iwl6035_2agn_name,</div><div class='add'>+		     DEVICE(0x088F), SUBDEV_MASKED(0x0, 0xF)),</div><div class='add'>+	IWL_DEV_INFO(iwl6035_2agn_cfg, iwl6035_2agn_sff_name,</div><div class='add'>+		     DEVICE(0x088F), SUBDEV_MASKED(0xA, 0xF)),</div><div class='add'>+</div><div class='add'>+/* 105 Series */</div><div class='add'>+	IWL_DEV_INFO(iwl105_bgn_cfg, iwl105_bgn_name,</div><div class='add'>+		     DEVICE(0x0894)),</div><div class='add'>+	IWL_DEV_INFO(iwl105_bgn_cfg, iwl105_bgn_name,</div><div class='add'>+		     DEVICE(0x0895), SUBDEV(0x0222)),</div><div class='add'>+</div><div class='add'>+/* 135 Series */</div><div class='add'>+	IWL_DEV_INFO(iwl135_bgn_cfg, iwl135_bgn_name,</div><div class='add'>+		     DEVICE(0x0892)),</div><div class='add'>+	IWL_DEV_INFO(iwl135_bgn_cfg, iwl135_bgn_name,</div><div class='add'>+		     DEVICE(0x0893), SUBDEV(0x0262)),</div><div class='add'>+#endif /* CONFIG_IWLDVM */</div><div class='ctx'> </div><div class='del'>-static const struct iwl_dev_info iwl_dev_info_table[] = {</div><div class='ctx'> #if IS_ENABLED(CONFIG_IWLMVM)</div><div class='del'>-/* 9000 */</div><div class='del'>-	IWL_DEV_INFO(0x2526, 0x1550, iwl9260_2ac_cfg, iwl9260_killer_1550_name),</div><div class='del'>-	IWL_DEV_INFO(0x2526, 0x1551, iwl9560_2ac_cfg_soc, iwl9560_killer_1550s_name),</div><div class='del'>-	IWL_DEV_INFO(0x2526, 0x1552, iwl9560_2ac_cfg_soc, iwl9560_killer_1550i_name),</div><div class='del'>-	IWL_DEV_INFO(0x30DC, 0x1551, iwl9560_2ac_cfg_soc, iwl9560_killer_1550s_name),</div><div class='del'>-	IWL_DEV_INFO(0x30DC, 0x1552, iwl9560_2ac_cfg_soc, iwl9560_killer_1550i_name),</div><div class='del'>-	IWL_DEV_INFO(0x31DC, 0x1551, iwl9560_2ac_cfg_soc, iwl9560_killer_1550s_name),</div><div class='del'>-	IWL_DEV_INFO(0x31DC, 0x1552, iwl9560_2ac_cfg_soc, iwl9560_killer_1550i_name),</div><div class='del'>-	IWL_DEV_INFO(0xA370, 0x1551, iwl9560_2ac_cfg_soc, iwl9560_killer_1550s_name),</div><div class='del'>-	IWL_DEV_INFO(0xA370, 0x1552, iwl9560_2ac_cfg_soc, iwl9560_killer_1550i_name),</div><div class='del'>-</div><div class='del'>-	IWL_DEV_INFO(0x271C, 0x0214, iwl9260_2ac_cfg, iwl9260_1_name),</div><div class='del'>-</div><div class='del'>-/* AX200 */</div><div class='del'>-	IWL_DEV_INFO(0x2723, 0x1653, iwl_ax200_cfg_cc, iwl_ax200_killer_1650w_name),</div><div class='del'>-	IWL_DEV_INFO(0x2723, 0x1654, iwl_ax200_cfg_cc, iwl_ax200_killer_1650x_name),</div><div class='del'>-	IWL_DEV_INFO(0x2723, IWL_CFG_ANY, iwl_ax200_cfg_cc, iwl_ax200_name),</div><div class='del'>-</div><div class='del'>-	/* Qu with Hr */</div><div class='del'>-	IWL_DEV_INFO(0x43F0, 0x0070, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x43F0, 0x0074, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x43F0, 0x0078, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x43F0, 0x007C, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x43F0, 0x2074, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x43F0, 0x4070, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0xA0F0, 0x0070, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0xA0F0, 0x0074, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0xA0F0, 0x0078, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0xA0F0, 0x007C, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0xA0F0, 0x0A10, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0xA0F0, 0x1651, killer1650s_2ax_cfg_qu_b0_hr_b0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0xA0F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0xA0F0, 0x2074, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0xA0F0, 0x4070, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x02F0, 0x0070, iwl_ax201_cfg_quz_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x02F0, 0x0074, iwl_ax201_cfg_quz_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x02F0, 0x6074, iwl_ax201_cfg_quz_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x02F0, 0x0078, iwl_ax201_cfg_quz_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x02F0, 0x007C, iwl_ax201_cfg_quz_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x02F0, 0x0310, iwl_ax201_cfg_quz_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x02F0, 0x1651, iwl_ax1650s_cfg_quz_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x02F0, 0x1652, iwl_ax1650i_cfg_quz_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x02F0, 0x2074, iwl_ax201_cfg_quz_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x02F0, 0x4070, iwl_ax201_cfg_quz_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x06F0, 0x0070, iwl_ax201_cfg_quz_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x06F0, 0x0074, iwl_ax201_cfg_quz_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x06F0, 0x0078, iwl_ax201_cfg_quz_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x06F0, 0x007C, iwl_ax201_cfg_quz_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x06F0, 0x0310, iwl_ax201_cfg_quz_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x06F0, 0x1651, iwl_ax1650s_cfg_quz_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x06F0, 0x1652, iwl_ax1650i_cfg_quz_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x06F0, 0x2074, iwl_ax201_cfg_quz_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x06F0, 0x4070, iwl_ax201_cfg_quz_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x34F0, 0x0070, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x34F0, 0x0074, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x34F0, 0x0078, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x34F0, 0x007C, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x34F0, 0x0310, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x34F0, 0x1651, killer1650s_2ax_cfg_qu_b0_hr_b0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x34F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x34F0, 0x2074, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x34F0, 0x4070, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-</div><div class='del'>-	IWL_DEV_INFO(0x3DF0, 0x0070, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x3DF0, 0x0074, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x3DF0, 0x0078, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x3DF0, 0x007C, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x3DF0, 0x0310, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x3DF0, 0x1651, killer1650s_2ax_cfg_qu_b0_hr_b0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x3DF0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x3DF0, 0x2074, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x3DF0, 0x4070, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-</div><div class='del'>-	IWL_DEV_INFO(0x4DF0, 0x0070, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x4DF0, 0x0074, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x4DF0, 0x0078, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x4DF0, 0x007C, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x4DF0, 0x0310, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x4DF0, 0x1651, killer1650s_2ax_cfg_qu_b0_hr_b0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x4DF0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x4DF0, 0x2074, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x4DF0, 0x4070, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x4DF0, 0x6074, iwl_ax201_cfg_qu_hr, NULL),</div><div class='del'>-</div><div class='del'>-	/* So with HR */</div><div class='del'>-	IWL_DEV_INFO(0x2725, 0x0090, iwlax211_2ax_cfg_so_gf_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x2725, 0x0020, iwlax210_2ax_cfg_ty_gf_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x2725, 0x2020, iwlax210_2ax_cfg_ty_gf_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x2725, 0x0024, iwlax210_2ax_cfg_ty_gf_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x2725, 0x0310, iwlax210_2ax_cfg_ty_gf_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x2725, 0x0510, iwlax210_2ax_cfg_ty_gf_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x2725, 0x0A10, iwlax210_2ax_cfg_ty_gf_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x2725, 0xE020, iwlax210_2ax_cfg_ty_gf_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x2725, 0xE024, iwlax210_2ax_cfg_ty_gf_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x2725, 0x4020, iwlax210_2ax_cfg_ty_gf_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x2725, 0x6020, iwlax210_2ax_cfg_ty_gf_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x2725, 0x6024, iwlax210_2ax_cfg_ty_gf_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x2725, 0x1673, iwlax210_2ax_cfg_ty_gf_a0, iwl_ax210_killer_1675w_name),</div><div class='del'>-	IWL_DEV_INFO(0x2725, 0x1674, iwlax210_2ax_cfg_ty_gf_a0, iwl_ax210_killer_1675x_name),</div><div class='del'>-	IWL_DEV_INFO(0x7A70, 0x0090, iwlax211_2ax_cfg_so_gf_a0_long, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x7A70, 0x0098, iwlax211_2ax_cfg_so_gf_a0_long, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x7A70, 0x00B0, iwlax411_2ax_cfg_so_gf4_a0_long, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x7A70, 0x0310, iwlax211_2ax_cfg_so_gf_a0_long, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x7A70, 0x0510, iwlax211_2ax_cfg_so_gf_a0_long, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x7A70, 0x0A10, iwlax211_2ax_cfg_so_gf_a0_long, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x7AF0, 0x0090, iwlax211_2ax_cfg_so_gf_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x7AF0, 0x0098, iwlax211_2ax_cfg_so_gf_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x7AF0, 0x00B0, iwlax411_2ax_cfg_so_gf4_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x7AF0, 0x0310, iwlax211_2ax_cfg_so_gf_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x7AF0, 0x0510, iwlax211_2ax_cfg_so_gf_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x7AF0, 0x0A10, iwlax211_2ax_cfg_so_gf_a0, NULL),</div><div class='del'>-</div><div class='del'>-	/* SnJ with HR */</div><div class='del'>-	IWL_DEV_INFO(0x2725, 0x00B0, iwlax411_2ax_cfg_sosnj_gf4_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x2726, 0x0090, iwlax211_cfg_snj_gf_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x2726, 0x0098, iwlax211_cfg_snj_gf_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x2726, 0x00B0, iwlax411_2ax_cfg_sosnj_gf4_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x2726, 0x00B4, iwlax411_2ax_cfg_sosnj_gf4_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x2726, 0x0510, iwlax211_cfg_snj_gf_a0, NULL),</div><div class='del'>-	IWL_DEV_INFO(0x2726, 0x1651, iwl_cfg_snj_hr_b0, iwl_ax201_killer_1650s_name),</div><div class='del'>-	IWL_DEV_INFO(0x2726, 0x1652, iwl_cfg_snj_hr_b0, iwl_ax201_killer_1650i_name),</div><div class='del'>-</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_PU, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_2ac_cfg_soc, iwl9461_160_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_PU, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_2ac_cfg_soc, iwl9461_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_PU, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_2ac_cfg_soc, iwl9462_160_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_PU, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_2ac_cfg_soc, iwl9462_name),</div><div class='del'>-</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_PU, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_2ac_cfg_soc, iwl9560_160_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_PU, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_2ac_cfg_soc, iwl9560_name),</div><div class='del'>-</div><div class='del'>-	_IWL_DEV_INFO(0x2526, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_PNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9260_2ac_cfg, iwl9461_160_name),</div><div class='del'>-	_IWL_DEV_INFO(0x2526, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_PNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9260_2ac_cfg, iwl9461_name),</div><div class='del'>-	_IWL_DEV_INFO(0x2526, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_PNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9260_2ac_cfg, iwl9462_160_name),</div><div class='del'>-	_IWL_DEV_INFO(0x2526, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_PNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9260_2ac_cfg, iwl9462_name),</div><div class='del'>-</div><div class='del'>-	_IWL_DEV_INFO(0x2526, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_PNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9260_2ac_cfg, iwl9560_160_name),</div><div class='del'>-	_IWL_DEV_INFO(0x2526, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_PNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9260_2ac_cfg, iwl9560_name),</div><div class='del'>-</div><div class='del'>-	_IWL_DEV_INFO(0x2526, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_TH, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_TH, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT_GNSS, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9260_2ac_cfg, iwl9270_160_name),</div><div class='del'>-	_IWL_DEV_INFO(0x2526, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_TH, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_TH, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT_GNSS, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9260_2ac_cfg, iwl9270_name),</div><div class='del'>-</div><div class='del'>-	_IWL_DEV_INFO(0x271B, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_TH, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_TH1, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9260_2ac_cfg, iwl9162_160_name),</div><div class='del'>-	_IWL_DEV_INFO(0x271B, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_TH, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_TH1, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9260_2ac_cfg, iwl9162_name),</div><div class='del'>-</div><div class='del'>-	_IWL_DEV_INFO(0x2526, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_TH, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_TH, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9260_2ac_cfg, iwl9260_160_name),</div><div class='del'>-	_IWL_DEV_INFO(0x2526, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_TH, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_TH, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9260_2ac_cfg, iwl9260_name),</div><div class='del'>-</div><div class='del'>-/* Qu with Jf */</div><div class='del'>-	/* Qu B step */</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QU, SILICON_B_STEP,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qu_b0_jf_b0_cfg, iwl9461_160_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QU, SILICON_B_STEP,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qu_b0_jf_b0_cfg, iwl9461_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QU, SILICON_B_STEP,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qu_b0_jf_b0_cfg, iwl9462_160_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QU, SILICON_B_STEP,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qu_b0_jf_b0_cfg, iwl9462_name),</div><div class='del'>-</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QU, SILICON_B_STEP,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qu_b0_jf_b0_cfg, iwl9560_160_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QU, SILICON_B_STEP,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qu_b0_jf_b0_cfg, iwl9560_name),</div><div class='del'>-</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, 0x1551,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QU, SILICON_B_STEP,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qu_b0_jf_b0_cfg, iwl9560_killer_1550s_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, 0x1552,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QU, SILICON_B_STEP,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qu_b0_jf_b0_cfg, iwl9560_killer_1550i_name),</div><div class='del'>-</div><div class='del'>-	/* Qu C step */</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QU, SILICON_C_STEP,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qu_c0_jf_b0_cfg, iwl9461_160_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QU, SILICON_C_STEP,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qu_c0_jf_b0_cfg, iwl9461_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QU, SILICON_C_STEP,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qu_c0_jf_b0_cfg, iwl9462_160_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QU, SILICON_C_STEP,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qu_c0_jf_b0_cfg, iwl9462_name),</div><div class='del'>-</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QU, SILICON_C_STEP,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qu_c0_jf_b0_cfg, iwl9560_160_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QU, SILICON_C_STEP,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qu_c0_jf_b0_cfg, iwl9560_name),</div><div class='del'>-</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, 0x1551,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QU, SILICON_C_STEP,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qu_c0_jf_b0_cfg, iwl9560_killer_1550s_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, 0x1552,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QU, SILICON_C_STEP,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qu_c0_jf_b0_cfg, iwl9560_killer_1550i_name),</div><div class='del'>-</div><div class='del'>-	/* QuZ */</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QUZ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_quz_a0_jf_b0_cfg, iwl9461_160_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QUZ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_quz_a0_jf_b0_cfg, iwl9461_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QUZ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_quz_a0_jf_b0_cfg, iwl9462_160_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QUZ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_quz_a0_jf_b0_cfg, iwl9462_name),</div><div class='del'>-</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QUZ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_quz_a0_jf_b0_cfg, iwl9560_160_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QUZ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_quz_a0_jf_b0_cfg, iwl9560_name),</div><div class='del'>-</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, 0x1551,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QUZ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_quz_a0_jf_b0_cfg, iwl9560_killer_1550s_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, 0x1552,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QUZ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_quz_a0_jf_b0_cfg, iwl9560_killer_1550i_name),</div><div class='del'>-</div><div class='del'>-	/* QnJ */</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qnj_b0_jf_b0_cfg, iwl9461_160_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qnj_b0_jf_b0_cfg, iwl9461_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qnj_b0_jf_b0_cfg, iwl9462_160_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qnj_b0_jf_b0_cfg, iwl9462_name),</div><div class='del'>-</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qnj_b0_jf_b0_cfg, iwl9560_160_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qnj_b0_jf_b0_cfg, iwl9560_name),</div><div class='del'>-</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, 0x1551,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qnj_b0_jf_b0_cfg, iwl9560_killer_1550s_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, 0x1552,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl9560_qnj_b0_jf_b0_cfg, iwl9560_killer_1550i_name),</div><div class='del'>-</div><div class='del'>-/* Qu with Hr */</div><div class='del'>-	/* Qu B step */</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QU, SILICON_B_STEP,</div><div class='del'>-		      IWL_CFG_RF_TYPE_HR1, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_qu_b0_hr1_b0, iwl_ax101_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QU, SILICON_C_STEP,</div><div class='del'>-		      IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_qu_b0_hr_b0, iwl_ax203_name),</div><div class='del'>-</div><div class='del'>-	/* Qu C step */</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QU, SILICON_C_STEP,</div><div class='del'>-		      IWL_CFG_RF_TYPE_HR1, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_qu_c0_hr1_b0, iwl_ax101_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QU, SILICON_C_STEP,</div><div class='del'>-		      IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_qu_c0_hr_b0, iwl_ax203_name),</div><div class='del'>-</div><div class='del'>-	/* QuZ */</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QUZ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_HR1, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_quz_a0_hr1_b0, iwl_ax101_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QUZ, SILICON_B_STEP,</div><div class='del'>-		      IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_quz_a0_hr_b0, iwl_ax203_name),</div><div class='del'>-</div><div class='del'>-/* QnJ with Hr */</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_QNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_qnj_b0_hr_b0_cfg, iwl_ax201_name),</div><div class='del'>-</div><div class='del'>-/* SnJ with Jf */</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_SNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_snj_a0_jf_b0, iwl9461_160_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_SNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_snj_a0_jf_b0, iwl9461_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_SNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_snj_a0_jf_b0, iwl9462_160_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_SNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_snj_a0_jf_b0, iwl9462_name),</div><div class='del'>-</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_SNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_snj_a0_jf_b0, iwl9560_160_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_SNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_snj_a0_jf_b0, iwl9560_name),</div><div class='del'>-</div><div class='del'>-/* SnJ with Hr */</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_SNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_HR1, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_snj_hr_b0, iwl_ax101_name),</div><div class='del'>-</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_SNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_snj_hr_b0, iwl_ax201_name),</div><div class='del'>-</div><div class='del'>-/* Ma */</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_MA, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_ma_a0_hr_b0, iwl_ax201_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_MA, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_ma_a0_gf_a0, iwl_ax211_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_MA, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_CDB,</div><div class='del'>-		      iwl_cfg_ma_a0_gf4_a0, iwl_ax211_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_MA, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_MR, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_ma_a0_mr_a0, iwl_ax221_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_SNJ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_MR, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_snj_a0_mr_a0, iwl_ax221_name),</div><div class='del'>-</div><div class='del'>-/* So with Hr */</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_so_a0_hr_a0, iwl_ax203_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_so_a0_hr_a0, iwl_ax203_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_HR1, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_so_a0_hr_a0, iwl_ax101_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_so_a0_hr_a0, iwl_ax201_name),</div><div class='del'>-</div><div class='del'>-/* So-F with Hr */</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_NO_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_so_a0_hr_a0, iwl_ax203_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_HR1, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_so_a0_hr_a0, iwl_ax101_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_so_a0_hr_a0, iwl_ax201_name),</div><div class='del'>-</div><div class='del'>-/* So-F with Gf */</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwlax211_2ax_cfg_so_gf_a0, iwl_ax211_name),</div><div class='del'>-</div><div class='del'>-/* Bz */</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_bz_a0_hr_b0, iwl_ax201_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_bz_a0_gf_a0, iwl_ax211_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_CDB,</div><div class='del'>-		      iwl_cfg_bz_a0_gf4_a0, iwl_ax211_name),</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_MR, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwl_cfg_bz_a0_mr_a0, iwl_ax211_name),</div><div class='del'>-</div><div class='del'>-/* So with GF */</div><div class='del'>-	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY,</div><div class='del'>-		      IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,</div><div class='del'>-		      iwlax211_2ax_cfg_so_gf_a0, iwl_ax211_name)</div><div class='add'>+/* 7260 Series */</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2ac_name,</div><div class='add'>+		     DEVICE(0x08B1)), // unlisted ones fall through to here</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0x4060)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0x406A)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0x4160)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0x4062)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0x4162)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0x4460)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0x446A)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0x4462)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_high_temp_cfg, iwl7260_2ac_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0x4A70)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_high_temp_cfg, iwl7260_2ac_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0x4A6E)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_high_temp_cfg, iwl7260_2ac_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0x4A6C)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0x4560)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0x4020)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0x402A)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0x4420)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0xC060)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0xC06A)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0xC160)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0xC062)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0xC162)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0xC760)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0xC460)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0xC462)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0xC560)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0xC360)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0xC020)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0xC02A)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B1), SUBDEV(0xC420)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2ac_name,</div><div class='add'>+		     DEVICE(0x08B2), SUBDEV(0x4270)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2ac_name,</div><div class='add'>+		     DEVICE(0x08B2), SUBDEV(0x4272)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B2), SUBDEV(0x4260)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B2), SUBDEV(0x426A)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_n_name,</div><div class='add'>+		     DEVICE(0x08B2), SUBDEV(0x4262)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2ac_name,</div><div class='add'>+		     DEVICE(0x08B2), SUBDEV(0x4370)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B2), SUBDEV(0x4360)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B2), SUBDEV(0x4220)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2ac_name,</div><div class='add'>+		     DEVICE(0x08B2), SUBDEV(0xC270)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2ac_name,</div><div class='add'>+		     DEVICE(0x08B2), SUBDEV(0xC272)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B2), SUBDEV(0xC260)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_n_name,</div><div class='add'>+		     DEVICE(0x08B2), SUBDEV(0xC26A)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_n_name,</div><div class='add'>+		     DEVICE(0x08B2), SUBDEV(0xC262)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2ac_name,</div><div class='add'>+		     DEVICE(0x08B2), SUBDEV(0xC370)),</div><div class='add'>+	IWL_DEV_INFO(iwl7260_cfg, iwl7260_2n_name,</div><div class='add'>+		     DEVICE(0x08B2), SUBDEV(0xC220)),</div><div class='ctx'> </div><div class='add'>+/* 3160 Series */</div><div class='add'>+	IWL_DEV_INFO(iwl3160_cfg, iwl3160_2ac_name,</div><div class='add'>+		     DEVICE(0x08B3)),</div><div class='add'>+</div><div class='add'>+	IWL_DEV_INFO(iwl3160_cfg, iwl3160_n_name,</div><div class='add'>+		     DEVICE(0x08B3), SUBDEV_MASKED(0x62, 0xFF)),</div><div class='add'>+	IWL_DEV_INFO(iwl3160_cfg, iwl3160_2n_name,</div><div class='add'>+		     DEVICE(0x08B3), SUBDEV_MASKED(0x60, 0xFF)),</div><div class='add'>+</div><div class='add'>+	IWL_DEV_INFO(iwl3160_cfg, iwl3160_2ac_name,</div><div class='add'>+		     DEVICE(0x08B4)),</div><div class='add'>+</div><div class='add'>+/* 3165 Series */</div><div class='add'>+	IWL_DEV_INFO(iwl3165_2ac_cfg, iwl3165_2ac_name,</div><div class='add'>+		     DEVICE(0x3165)),</div><div class='add'>+	IWL_DEV_INFO(iwl3165_2ac_cfg, iwl3165_2ac_name,</div><div class='add'>+		     DEVICE(0x3166)),</div><div class='add'>+</div><div class='add'>+/* 3168 Series */</div><div class='add'>+	IWL_DEV_INFO(iwl3168_2ac_cfg, iwl3168_2ac_name,</div><div class='add'>+		     DEVICE(0x24FB)),</div><div class='add'>+</div><div class='add'>+/* 7265 Series */</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2ac_name,</div><div class='add'>+		     DEVICE(0x095A)),</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,</div><div class='add'>+		     DEVICE(0x095A), SUBDEV(0x5000)),</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,</div><div class='add'>+		     DEVICE(0x095A), SUBDEV(0x500A)),</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_n_name,</div><div class='add'>+		     DEVICE(0x095A), SUBDEV(0x5002)),</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_n_name,</div><div class='add'>+		     DEVICE(0x095A), SUBDEV(0x5102)),</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,</div><div class='add'>+		     DEVICE(0x095A), SUBDEV(0x5020)),</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,</div><div class='add'>+		     DEVICE(0x095A), SUBDEV(0x502A)),</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,</div><div class='add'>+		     DEVICE(0x095A), SUBDEV(0x5090)),</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,</div><div class='add'>+		     DEVICE(0x095A), SUBDEV(0x5190)),</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,</div><div class='add'>+		     DEVICE(0x095A), SUBDEV(0x5100)),</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,</div><div class='add'>+		     DEVICE(0x095A), SUBDEV(0x5400)),</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,</div><div class='add'>+		     DEVICE(0x095A), SUBDEV(0x5420)),</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,</div><div class='add'>+		     DEVICE(0x095A), SUBDEV(0x5490)),</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,</div><div class='add'>+		     DEVICE(0x095A), SUBDEV(0x5C10)),</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,</div><div class='add'>+		     DEVICE(0x095A), SUBDEV(0x5590)),</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,</div><div class='add'>+		     DEVICE(0x095A), SUBDEV(0x9000)),</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,</div><div class='add'>+		     DEVICE(0x095A), SUBDEV(0x900A)),</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,</div><div class='add'>+		     DEVICE(0x095A), SUBDEV(0x9400)),</div><div class='add'>+</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2ac_name,</div><div class='add'>+		     DEVICE(0x095B)),</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,</div><div class='add'>+		     DEVICE(0x095B), SUBDEV(0x520A)),</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_n_name,</div><div class='add'>+		     DEVICE(0x095B), SUBDEV(0x5302)),</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,</div><div class='add'>+		     DEVICE(0x095B), SUBDEV(0x5200)),</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_n_name,</div><div class='add'>+		     DEVICE(0x095B), SUBDEV(0x5202)),</div><div class='add'>+	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,</div><div class='add'>+		     DEVICE(0x095B), SUBDEV(0x9200)),</div><div class='add'>+</div><div class='add'>+/* 8000 Series */</div><div class='add'>+	IWL_DEV_INFO(iwl8260_cfg, iwl8260_2ac_name,</div><div class='add'>+		     DEVICE(0x24F3)),</div><div class='add'>+	IWL_DEV_INFO(iwl8260_cfg, iwl8260_2n_name,</div><div class='add'>+		     DEVICE(0x24F3), SUBDEV(0x0004)),</div><div class='add'>+	IWL_DEV_INFO(iwl8260_cfg, iwl8260_2n_name,</div><div class='add'>+		     DEVICE(0x24F3), SUBDEV(0x0044)),</div><div class='add'>+	IWL_DEV_INFO(iwl8260_cfg, iwl8260_2ac_name,</div><div class='add'>+		     DEVICE(0x24F4)),</div><div class='add'>+	IWL_DEV_INFO(iwl8260_cfg, iwl4165_2ac_name,</div><div class='add'>+		     DEVICE(0x24F5)),</div><div class='add'>+	IWL_DEV_INFO(iwl8260_cfg, iwl4165_2ac_name,</div><div class='add'>+		     DEVICE(0x24F6)),</div><div class='add'>+	IWL_DEV_INFO(iwl8265_cfg, iwl8265_2ac_name,</div><div class='add'>+		     DEVICE(0x24FD)),</div><div class='add'>+	IWL_DEV_INFO(iwl8265_cfg, iwl8275_2ac_name,</div><div class='add'>+		     DEVICE(0x24FD), SUBDEV(0x3E02)),</div><div class='add'>+	IWL_DEV_INFO(iwl8265_cfg, iwl8275_2ac_name,</div><div class='add'>+		     DEVICE(0x24FD), SUBDEV(0x3E01)),</div><div class='add'>+	IWL_DEV_INFO(iwl8265_cfg, iwl8275_2ac_name,</div><div class='add'>+		     DEVICE(0x24FD), SUBDEV(0x1012)),</div><div class='add'>+	IWL_DEV_INFO(iwl8265_cfg, iwl8275_2ac_name,</div><div class='add'>+		     DEVICE(0x24FD), SUBDEV(0x0012)),</div><div class='add'>+	IWL_DEV_INFO(iwl8265_cfg, iwl_killer_1435i_name,</div><div class='add'>+		     DEVICE(0x24FD), SUBDEV(0x1431)),</div><div class='add'>+	IWL_DEV_INFO(iwl8265_cfg, iwl_killer_1434_kix_name,</div><div class='add'>+		     DEVICE(0x24FD), SUBDEV(0x1432)),</div><div class='add'>+</div><div class='add'>+/* JF1 RF */</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_jf, iwl9461_160_name,</div><div class='add'>+		     RF_TYPE(JF1)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9461_name,</div><div class='add'>+		     RF_TYPE(JF1), BW_LIMITED),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_jf, iwl9462_160_name,</div><div class='add'>+		     RF_TYPE(JF1), RF_ID(JF1_DIV)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9462_name,</div><div class='add'>+		     RF_TYPE(JF1), RF_ID(JF1_DIV), BW_LIMITED),</div><div class='add'>+/* JF2 RF */</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_jf, iwl9260_160_name,</div><div class='add'>+		     RF_TYPE(JF2)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9260_name,</div><div class='add'>+		     RF_TYPE(JF2), BW_LIMITED),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_jf, iwl9560_160_name,</div><div class='add'>+		     RF_TYPE(JF2), RF_ID(JF)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9560_name,</div><div class='add'>+		     RF_TYPE(JF2), RF_ID(JF), BW_LIMITED),</div><div class='add'>+</div><div class='add'>+/* HR RF */</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name, RF_TYPE(HR2)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_hr_80mhz, iwl_ax101_name, RF_TYPE(HR1)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_hr_80mhz, iwl_ax203_name, RF_TYPE(HR2), BW_LIMITED),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_hr, iwl_ax200_name, DEVICE(0x2723)),</div><div class='add'>+</div><div class='add'>+/* GF RF */</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name, RF_TYPE(GF)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_name, RF_TYPE(GF), CDB),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name, DEVICE(0x2725)),</div><div class='add'>+</div><div class='add'>+/* Killer CRFs */</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_jf, iwl9260_killer_1550_name, SUBDEV(0x1550)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_jf, iwl9560_killer_1550s_name, SUBDEV(0x1551)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_jf, iwl9560_killer_1550i_name, SUBDEV(0x1552)),</div><div class='add'>+</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_killer_1650s_name, SUBDEV(0x1651)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_killer_1650i_name, SUBDEV(0x1652)),</div><div class='add'>+</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_killer_1675s_name, SUBDEV(0x1671)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_killer_1675i_name, SUBDEV(0x1672)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_killer_1675w_name, SUBDEV(0x1673)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_killer_1675x_name, SUBDEV(0x1674)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_killer_1690s_name, SUBDEV(0x1691)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_killer_1690i_name, SUBDEV(0x1692)),</div><div class='add'>+</div><div class='add'>+/* Killer discrete */</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_hr, iwl_ax200_killer_1650w_name,</div><div class='add'>+		     DEVICE(0x2723), SUBDEV(0x1653)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_hr, iwl_ax200_killer_1650x_name,</div><div class='add'>+		     DEVICE(0x2723), SUBDEV(0x1654)),</div><div class='ctx'> #endif /* CONFIG_IWLMVM */</div><div class='add'>+#if IS_ENABLED(CONFIG_IWLMLD)</div><div class='add'>+/* FM RF */</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_fm, iwl_be201_name, RF_TYPE(FM)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_fm, iwl_be401_name, RF_TYPE(FM), CDB),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_fm, iwl_be200_name, RF_TYPE(FM),</div><div class='add'>+		     DEVICE(0x272B), DISCRETE),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_fm_160mhz, iwl_be202_name,</div><div class='add'>+		     RF_TYPE(FM), BW_LIMITED),</div><div class='add'>+</div><div class='add'>+/* Killer CRFs */</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_fm, iwl_killer_be1750s_name, SUBDEV(0x1771)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_fm, iwl_killer_be1750i_name, SUBDEV(0x1772)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_fm, iwl_killer_be1790s_name, SUBDEV(0x1791)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_fm, iwl_killer_be1790i_name, SUBDEV(0x1792)),</div><div class='add'>+</div><div class='add'>+/* Killer discrete */</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_fm, iwl_killer_be1750w_name,</div><div class='add'>+		     DEVICE(0x272B), SUBDEV(0x1773)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_fm, iwl_killer_be1750x_name,</div><div class='add'>+		     DEVICE(0x272B), SUBDEV(0x1774)),</div><div class='add'>+</div><div class='add'>+/* WH RF */</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_wh, iwl_be211_name, RF_TYPE(WH)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_wh_non_eht, iwl_ax221_name, RF_TYPE(WH),</div><div class='add'>+		     SUBDEV(0x0514)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_wh_non_eht, iwl_ax221_name, RF_TYPE(WH),</div><div class='add'>+		     SUBDEV(0x4514)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_wh_160mhz, iwl_be213_name, RF_TYPE(WH), BW_LIMITED),</div><div class='add'>+</div><div class='add'>+/* PE RF */</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_pe, iwl_bn201_name, RF_TYPE(PE)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_pe, iwl_be223_name, RF_TYPE(PE),</div><div class='add'>+		     SUBDEV_MASKED(0x0524, 0xFFF)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_pe, iwl_bn203_name, RF_TYPE(PE),</div><div class='add'>+		     SUBDEV_MASKED(0x0324, 0xFFF)),</div><div class='add'>+</div><div class='add'>+/* Killer */</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_wh, iwl_killer_be1775s_name, SUBDEV(0x1776)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_wh, iwl_killer_be1775i_name, SUBDEV(0x1775)),</div><div class='add'>+</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_pe, iwl_killer_bn1850w2_name, SUBDEV(0x1851)),</div><div class='add'>+	IWL_DEV_INFO(iwl_rf_pe, iwl_killer_bn1850i_name, SUBDEV(0x1852)),</div><div class='add'>+#endif /* CONFIG_IWLMLD */</div><div class='ctx'> };</div><div class='add'>+EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_dev_info_table);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IWLWIFI_KUNIT_TESTS)</div><div class='add'>+const unsigned int iwl_dev_info_table_size = ARRAY_SIZE(iwl_dev_info_table);</div><div class='add'>+EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_dev_info_table_size);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* PCI registers */</div><div class='ctx'> #define PCI_CFG_RETRY_TIMEOUT	0x041</div><div class='ctx'> </div><div class='del'>-static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='add'>+const struct iwl_dev_info *</div><div class='add'>+iwl_pci_find_dev_info(u16 device, u16 subsystem_device, u16 rf_type, u8 cdb,</div><div class='add'>+		      u8 rf_id, u8 bw_limit, bool discrete)</div><div class='ctx'> {</div><div class='del'>-	const struct iwl_cfg_trans_params *trans;</div><div class='del'>-	const struct iwl_cfg *cfg_7265d __maybe_unused = NULL;</div><div class='del'>-	struct iwl_trans *iwl_trans;</div><div class='del'>-	struct iwl_trans_pcie *trans_pcie;</div><div class='del'>-	int i, ret;</div><div class='del'>-	const struct iwl_cfg *cfg;</div><div class='add'>+	int num_devices = ARRAY_SIZE(iwl_dev_info_table);</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	trans = (void *)(ent-&gt;driver_data &amp; ~TRANS_CFG_MARKER);</div><div class='add'>+	if (!num_devices)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * This is needed for backwards compatibility with the old</div><div class='del'>-	 * tables, so we don't need to change all the config structs</div><div class='del'>-	 * at the same time.  The cfg is used to compare with the old</div><div class='del'>-	 * full cfg structs.</div><div class='del'>-	 */</div><div class='del'>-	cfg = (void *)(ent-&gt;driver_data &amp; ~TRANS_CFG_MARKER);</div><div class='del'>-</div><div class='del'>-	/* make sure trans is the first element in iwl_cfg */</div><div class='del'>-	BUILD_BUG_ON(offsetof(struct iwl_cfg, trans));</div><div class='add'>+	for (i = num_devices - 1; i &gt;= 0; i--) {</div><div class='add'>+		const struct iwl_dev_info *dev_info = &amp;iwl_dev_info_table[i];</div><div class='add'>+		u16 subdevice_mask;</div><div class='ctx'> </div><div class='del'>-	iwl_trans = iwl_trans_pcie_alloc(pdev, ent, trans);</div><div class='del'>-	if (IS_ERR(iwl_trans))</div><div class='del'>-		return PTR_ERR(iwl_trans);</div><div class='add'>+		if (dev_info-&gt;device != (u16)IWL_CFG_ANY &amp;&amp;</div><div class='add'>+		    dev_info-&gt;device != device)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	trans_pcie = IWL_TRANS_GET_PCIE_TRANS(iwl_trans);</div><div class='add'>+		subdevice_mask = GENMASK(dev_info-&gt;subdevice_m_h,</div><div class='add'>+					 dev_info-&gt;subdevice_m_l);</div><div class='ctx'> </div><div class='del'>-	iwl_trans-&gt;hw_rf_id = iwl_read32(iwl_trans, CSR_HW_RF_ID);</div><div class='add'>+		if (dev_info-&gt;subdevice != (u16)IWL_CFG_ANY &amp;&amp;</div><div class='add'>+		    dev_info-&gt;subdevice != (subsystem_device &amp; subdevice_mask))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(iwl_dev_info_table); i++) {</div><div class='del'>-		const struct iwl_dev_info *dev_info = &amp;iwl_dev_info_table[i];</div><div class='del'>-		if ((dev_info-&gt;device == (u16)IWL_CFG_ANY ||</div><div class='del'>-		     dev_info-&gt;device == pdev-&gt;device) &amp;&amp;</div><div class='del'>-		    (dev_info-&gt;subdevice == (u16)IWL_CFG_ANY ||</div><div class='del'>-		     dev_info-&gt;subdevice == pdev-&gt;subsystem_device) &amp;&amp;</div><div class='del'>-		    (dev_info-&gt;mac_type == (u16)IWL_CFG_ANY ||</div><div class='del'>-		     dev_info-&gt;mac_type ==</div><div class='del'>-		     CSR_HW_REV_TYPE(iwl_trans-&gt;hw_rev)) &amp;&amp;</div><div class='del'>-		    (dev_info-&gt;mac_step == (u8)IWL_CFG_ANY ||</div><div class='del'>-		     dev_info-&gt;mac_step ==</div><div class='del'>-		     CSR_HW_REV_STEP(iwl_trans-&gt;hw_rev)) &amp;&amp;</div><div class='del'>-		    (dev_info-&gt;rf_type == (u16)IWL_CFG_ANY ||</div><div class='del'>-		     dev_info-&gt;rf_type ==</div><div class='del'>-		     CSR_HW_RFID_TYPE(iwl_trans-&gt;hw_rf_id)) &amp;&amp;</div><div class='del'>-		    (dev_info-&gt;cdb == IWL_CFG_NO_CDB ||</div><div class='del'>-		     CSR_HW_RFID_IS_CDB(iwl_trans-&gt;hw_rf_id)) &amp;&amp;</div><div class='del'>-		    (dev_info-&gt;rf_id == (u8)IWL_CFG_ANY ||</div><div class='del'>-		     dev_info-&gt;rf_id ==</div><div class='del'>-		     IWL_SUBDEVICE_RF_ID(pdev-&gt;subsystem_device)) &amp;&amp;</div><div class='del'>-		    (dev_info-&gt;no_160 == (u8)IWL_CFG_ANY ||</div><div class='del'>-		     dev_info-&gt;no_160 ==</div><div class='del'>-		     IWL_SUBDEVICE_NO_160(pdev-&gt;subsystem_device)) &amp;&amp;</div><div class='del'>-		    (dev_info-&gt;cores == (u8)IWL_CFG_ANY ||</div><div class='del'>-		     dev_info-&gt;cores ==</div><div class='del'>-		     IWL_SUBDEVICE_CORES(pdev-&gt;subsystem_device))) {</div><div class='del'>-			iwl_trans-&gt;cfg = dev_info-&gt;cfg;</div><div class='del'>-			iwl_trans-&gt;name = dev_info-&gt;name;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+		if (dev_info-&gt;match_rf_type &amp;&amp; dev_info-&gt;rf_type != rf_type)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_IWLMVM)</div><div class='add'>+		if (dev_info-&gt;match_cdb &amp;&amp; dev_info-&gt;cdb != cdb)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Workaround for problematic SnJ device: sometimes when</div><div class='del'>-	 * certain RF modules are connected to SnJ, the device ID</div><div class='del'>-	 * changes to QnJ's ID.  So we are using QnJ's trans_cfg until</div><div class='del'>-	 * here.  But if we detect that the MAC type is actually SnJ,</div><div class='del'>-	 * we should switch to it here to avoid problems later.</div><div class='del'>-	 */</div><div class='del'>-	if (CSR_HW_REV_TYPE(iwl_trans-&gt;hw_rev) == IWL_CFG_MAC_TYPE_SNJ)</div><div class='del'>-		iwl_trans-&gt;trans_cfg = &amp;iwl_so_trans_cfg;</div><div class='add'>+		if (dev_info-&gt;match_rf_id &amp;&amp; dev_info-&gt;rf_id != rf_id)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * special-case 7265D, it has the same PCI IDs.</div><div class='del'>-	 *</div><div class='del'>-	 * Note that because we already pass the cfg to the transport above,</div><div class='del'>-	 * all the parameters that the transport uses must, until that is</div><div class='del'>-	 * changed, be identical to the ones in the 7265D configuration.</div><div class='del'>-	 */</div><div class='del'>-	if (cfg == &amp;iwl7265_2ac_cfg)</div><div class='del'>-		cfg_7265d = &amp;iwl7265d_2ac_cfg;</div><div class='del'>-	else if (cfg == &amp;iwl7265_2n_cfg)</div><div class='del'>-		cfg_7265d = &amp;iwl7265d_2n_cfg;</div><div class='del'>-	else if (cfg == &amp;iwl7265_n_cfg)</div><div class='del'>-		cfg_7265d = &amp;iwl7265d_n_cfg;</div><div class='del'>-	if (cfg_7265d &amp;&amp;</div><div class='del'>-	    (iwl_trans-&gt;hw_rev &amp; CSR_HW_REV_TYPE_MSK) == CSR_HW_REV_TYPE_7265D)</div><div class='del'>-		iwl_trans-&gt;cfg = cfg_7265d;</div><div class='del'>-</div><div class='del'>-	if (cfg == &amp;iwlax210_2ax_cfg_so_hr_a0) {</div><div class='del'>-		if (iwl_trans-&gt;hw_rev == CSR_HW_REV_TYPE_TY) {</div><div class='del'>-			iwl_trans-&gt;cfg = &amp;iwlax210_2ax_cfg_ty_gf_a0;</div><div class='del'>-		} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(iwl_trans-&gt;hw_rf_id) ==</div><div class='del'>-			   CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_JF)) {</div><div class='del'>-			iwl_trans-&gt;cfg = &amp;iwlax210_2ax_cfg_so_jf_b0;</div><div class='del'>-		} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(iwl_trans-&gt;hw_rf_id) ==</div><div class='del'>-			   CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_GF)) {</div><div class='del'>-			iwl_trans-&gt;cfg = &amp;iwlax211_2ax_cfg_so_gf_a0;</div><div class='del'>-		} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(iwl_trans-&gt;hw_rf_id) ==</div><div class='del'>-			   CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_GF4)) {</div><div class='del'>-			iwl_trans-&gt;cfg = &amp;iwlax411_2ax_cfg_so_gf4_a0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+		if (dev_info-&gt;match_bw_limit &amp;&amp; dev_info-&gt;bw_limit != bw_limit)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * This is a hack to switch from Qu B0 to Qu C0.  We need to</div><div class='del'>-	 * do this for all cfgs that use Qu B0, except for those using</div><div class='del'>-	 * Jf, which have already been moved to the new table.  The</div><div class='del'>-	 * rest must be removed once we convert Qu with Hr as well.</div><div class='del'>-	 */</div><div class='del'>-	if (iwl_trans-&gt;hw_rev == CSR_HW_REV_TYPE_QU_C0) {</div><div class='del'>-		if (iwl_trans-&gt;cfg == &amp;iwl_ax201_cfg_qu_hr)</div><div class='del'>-			iwl_trans-&gt;cfg = &amp;iwl_ax201_cfg_qu_c0_hr_b0;</div><div class='del'>-		else if (iwl_trans-&gt;cfg == &amp;killer1650s_2ax_cfg_qu_b0_hr_b0)</div><div class='del'>-			iwl_trans-&gt;cfg = &amp;killer1650s_2ax_cfg_qu_c0_hr_b0;</div><div class='del'>-		else if (iwl_trans-&gt;cfg == &amp;killer1650i_2ax_cfg_qu_b0_hr_b0)</div><div class='del'>-			iwl_trans-&gt;cfg = &amp;killer1650i_2ax_cfg_qu_c0_hr_b0;</div><div class='del'>-	}</div><div class='add'>+		if (dev_info-&gt;match_discrete &amp;&amp; dev_info-&gt;discrete != discrete)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	/* same thing for QuZ... */</div><div class='del'>-	if (iwl_trans-&gt;hw_rev == CSR_HW_REV_TYPE_QUZ) {</div><div class='del'>-		if (iwl_trans-&gt;cfg == &amp;iwl_ax201_cfg_qu_hr)</div><div class='del'>-			iwl_trans-&gt;cfg = &amp;iwl_ax201_cfg_quz_hr;</div><div class='del'>-		else if (iwl_trans-&gt;cfg == &amp;killer1650s_2ax_cfg_qu_b0_hr_b0)</div><div class='del'>-			iwl_trans-&gt;cfg = &amp;iwl_ax1650s_cfg_quz_hr;</div><div class='del'>-		else if (iwl_trans-&gt;cfg == &amp;killer1650i_2ax_cfg_qu_b0_hr_b0)</div><div class='del'>-			iwl_trans-&gt;cfg = &amp;iwl_ax1650i_cfg_quz_hr;</div><div class='add'>+		return dev_info;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='del'>-	/*</div><div class='del'>-	 * If we didn't set the cfg yet, the PCI ID table entry should have</div><div class='del'>-	 * been a full config - if yes, use it, otherwise fail.</div><div class='del'>-	 */</div><div class='del'>-	if (!iwl_trans-&gt;cfg) {</div><div class='del'>-		if (ent-&gt;driver_data &amp; TRANS_CFG_MARKER) {</div><div class='del'>-			pr_err("No config found for PCI dev %04x/%04x, rev=0x%x, rfid=0x%x\n",</div><div class='del'>-			       pdev-&gt;device, pdev-&gt;subsystem_device,</div><div class='del'>-			       iwl_trans-&gt;hw_rev, iwl_trans-&gt;hw_rf_id);</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto out_free_trans;</div><div class='del'>-		}</div><div class='del'>-		iwl_trans-&gt;cfg = cfg;</div><div class='del'>-	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_pci_find_dev_info);</div><div class='ctx'> </div><div class='del'>-	/* if we don't have a name yet, copy name from the old cfg */</div><div class='del'>-	if (!iwl_trans-&gt;name)</div><div class='del'>-		iwl_trans-&gt;name = iwl_trans-&gt;cfg-&gt;name;</div><div class='add'>+static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_mac_cfg *mac_cfg = (void *)ent-&gt;driver_data;</div><div class='add'>+	u8 __iomem *hw_base;</div><div class='add'>+	u32 bar0, hw_rev;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (iwl_trans-&gt;trans_cfg-&gt;mq_rx_supported) {</div><div class='del'>-		if (WARN_ON(!iwl_trans-&gt;cfg-&gt;num_rbds)) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto out_free_trans;</div><div class='del'>-		}</div><div class='del'>-		trans_pcie-&gt;num_rx_bufs = iwl_trans-&gt;cfg-&gt;num_rbds;</div><div class='del'>-	} else {</div><div class='del'>-		trans_pcie-&gt;num_rx_bufs = RX_QUEUE_SIZE;</div><div class='add'>+	/* reassign our BAR 0 if invalid due to possible runtime PM races */</div><div class='add'>+	pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &amp;bar0);</div><div class='add'>+	if (bar0 == PCI_BASE_ADDRESS_MEM_TYPE_64) {</div><div class='add'>+		ret = pci_assign_resource(pdev, 0);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = iwl_trans_init(iwl_trans);</div><div class='add'>+	ret = pcim_enable_device(pdev);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out_free_trans;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	pci_set_drvdata(pdev, iwl_trans);</div><div class='del'>-	iwl_trans-&gt;drv = iwl_drv_start(iwl_trans);</div><div class='add'>+	pci_set_master(pdev);</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR(iwl_trans-&gt;drv)) {</div><div class='del'>-		ret = PTR_ERR(iwl_trans-&gt;drv);</div><div class='del'>-		goto out_free_trans;</div><div class='add'>+	ret = pcim_request_all_regions(pdev, DRV_NAME);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Requesting all PCI BARs failed.\n");</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* register transport layer debugfs here */</div><div class='del'>-	iwl_trans_pcie_dbgfs_register(iwl_trans);</div><div class='add'>+	hw_base = pcim_iomap(pdev, 0, 0);</div><div class='add'>+	if (!hw_base) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to map BAR 0.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	/* We can't use iwl_read32 because trans wasn't allocated */</div><div class='add'>+	hw_rev = readl(hw_base + CSR_HW_REV);</div><div class='add'>+	if (hw_rev == 0xffffffff) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "HW_REV=0xFFFFFFFF, PCI issues?\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-out_free_trans:</div><div class='del'>-	iwl_trans_pcie_free(iwl_trans);</div><div class='del'>-	return ret;</div><div class='add'>+	return iwl_pci_gen1_2_probe(pdev, ent, mac_cfg, hw_base, hw_rev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans *trans = pci_get_drvdata(pdev);</div><div class='ctx'> </div><div class='del'>-	iwl_drv_stop(trans-&gt;drv);</div><div class='add'>+	if (!trans)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	iwl_trans_pcie_free(trans);</div><div class='add'>+	iwl_pcie_gen1_2_remove(trans);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='hunk'>@@ -1319,11 +1204,12 @@ static int iwl_pci_suspend(struct device *device)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_pci_resume(struct device *device)</div><div class='add'>+static int _iwl_pci_resume(struct device *device, bool restore)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = to_pci_dev(device);</div><div class='ctx'> 	struct iwl_trans *trans = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	bool device_was_powered_off = false;</div><div class='ctx'> </div><div class='ctx'> 	/* Before you put code here, think about WoWLAN. You cannot check here</div><div class='ctx'> 	 * whether WoWLAN is enabled or not, and your code will run even if</div><div class='hunk'>@@ -1339,6 +1225,46 @@ static int iwl_pci_resume(struct device *device)</div><div class='ctx'> 	if (!trans-&gt;op_mode)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Scratch value was altered, this means the device was powered off, we</div><div class='add'>+	 * need to reset it completely.</div><div class='add'>+	 * Note: MAC (bits 0:7) will be cleared upon suspend even with wowlan,</div><div class='add'>+	 * but not bits [15:8]. So if we have bits set in lower word, assume</div><div class='add'>+	 * the device is alive.</div><div class='add'>+	 * Alternatively, if the scratch value is 0xFFFFFFFF, then we no longer</div><div class='add'>+	 * have access to the device and consider it powered off.</div><div class='add'>+	 * For older devices, just try silently to grab the NIC.</div><div class='add'>+	 */</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ) {</div><div class='add'>+		u32 scratch = iwl_read32(trans, CSR_FUNC_SCRATCH);</div><div class='add'>+</div><div class='add'>+		if (!(scratch &amp; CSR_FUNC_SCRATCH_POWER_OFF_MASK) ||</div><div class='add'>+		    scratch == ~0U)</div><div class='add'>+			device_was_powered_off = true;</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * bh are re-enabled by iwl_trans_pcie_release_nic_access,</div><div class='add'>+		 * so re-enable them if _iwl_trans_pcie_grab_nic_access fails.</div><div class='add'>+		 */</div><div class='add'>+		local_bh_disable();</div><div class='add'>+		if (_iwl_trans_pcie_grab_nic_access(trans, true)) {</div><div class='add'>+			iwl_trans_pcie_release_nic_access(trans);</div><div class='add'>+		} else {</div><div class='add'>+			device_was_powered_off = true;</div><div class='add'>+			local_bh_enable();</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (restore || device_was_powered_off) {</div><div class='add'>+		trans-&gt;state = IWL_TRANS_NO_FW;</div><div class='add'>+		/* Hope for the best here ... If one of those steps fails we</div><div class='add'>+		 * won't really know how to recover.</div><div class='add'>+		 */</div><div class='add'>+		iwl_pcie_prepare_card_hw(trans);</div><div class='add'>+		iwl_trans_activate_nic(trans);</div><div class='add'>+		iwl_op_mode_device_powered_off(trans-&gt;op_mode);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* In WOWLAN, let iwl_trans_pcie_d3_resume do the rest of the work */</div><div class='ctx'> 	if (test_bit(STATUS_DEVICE_ENABLED, &amp;trans-&gt;status))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1359,9 +1285,23 @@ static int iwl_pci_resume(struct device *device)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int iwl_pci_restore(struct device *device)</div><div class='add'>+{</div><div class='add'>+	return _iwl_pci_resume(device, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_pci_resume(struct device *device)</div><div class='add'>+{</div><div class='add'>+	return _iwl_pci_resume(device, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct dev_pm_ops iwl_dev_pm_ops = {</div><div class='del'>-	SET_SYSTEM_SLEEP_PM_OPS(iwl_pci_suspend,</div><div class='del'>-				iwl_pci_resume)</div><div class='add'>+	.suspend = pm_sleep_ptr(iwl_pci_suspend),</div><div class='add'>+	.resume = pm_sleep_ptr(iwl_pci_resume),</div><div class='add'>+	.freeze = pm_sleep_ptr(iwl_pci_suspend),</div><div class='add'>+	.thaw = pm_sleep_ptr(iwl_pci_resume),</div><div class='add'>+	.poweroff = pm_sleep_ptr(iwl_pci_suspend),</div><div class='add'>+	.restore = pm_sleep_ptr(iwl_pci_restore),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IWL_PM_OPS	(&amp;iwl_dev_pm_ops)</div><div class='hunk'>@@ -1372,12 +1312,21 @@ static const struct dev_pm_ops iwl_dev_pm_ops = {</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_PM_SLEEP */</div><div class='ctx'> </div><div class='add'>+static void iwl_pci_dump(struct device *device)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(device);</div><div class='add'>+	struct iwl_trans *trans = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	iwl_op_mode_dump(trans-&gt;op_mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct pci_driver iwl_pci_driver = {</div><div class='ctx'> 	.name = DRV_NAME,</div><div class='ctx'> 	.id_table = iwl_hw_card_ids,</div><div class='ctx'> 	.probe = iwl_pci_probe,</div><div class='ctx'> 	.remove = iwl_pci_remove,</div><div class='ctx'> 	.driver.pm = IWL_PM_OPS,</div><div class='add'>+	.driver.coredump = iwl_pci_dump,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int __must_check iwl_pci_register_driver(void)</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h<br/>index 76a512cd2e5c..207c56e338dd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/internal.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/internal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2003-2015, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2003-2015, 2018-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include "iwl-io.h"</div><div class='ctx'> #include "iwl-op-mode.h"</div><div class='ctx'> #include "iwl-drv.h"</div><div class='del'>-#include "queue/tx.h"</div><div class='add'>+#include "pcie/iwl-context-info.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * RX related structures and functions</div><div class='hunk'>@@ -39,9 +39,10 @@ struct iwl_host_cmd;</div><div class='ctx'>  * trans_pcie layer */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_rx_mem_buffer</div><div class='add'>+ * struct iwl_rx_mem_buffer - driver-side RX buffer descriptor</div><div class='ctx'>  * @page_dma: bus address of rxb page</div><div class='ctx'>  * @page: driver's pointer to the rxb page</div><div class='add'>+ * @list: list entry for the membuffer</div><div class='ctx'>  * @invalid: rxb is in driver ownership - not owned by HW</div><div class='ctx'>  * @vid: index of this rxb in the global table</div><div class='ctx'>  * @offset: indicates which offset of the page (in bytes)</div><div class='hunk'>@@ -50,16 +51,13 @@ struct iwl_host_cmd;</div><div class='ctx'> struct iwl_rx_mem_buffer {</div><div class='ctx'> 	dma_addr_t page_dma;</div><div class='ctx'> 	struct page *page;</div><div class='del'>-	u16 vid;</div><div class='del'>-	bool invalid;</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	u32 offset;</div><div class='add'>+	u16 vid;</div><div class='add'>+	bool invalid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct isr_statistics - interrupt statistics</div><div class='del'>- *</div><div class='del'>- */</div><div class='add'>+/* interrupt statistics */</div><div class='ctx'> struct isr_statistics {</div><div class='ctx'> 	u32 hw;</div><div class='ctx'> 	u32 sw;</div><div class='hunk'>@@ -103,20 +101,30 @@ struct iwl_rx_completion_desc {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct iwl_rx_completion_desc_bz - Bz completion descriptor</div><div class='add'>+ * @rbid: unique tag of the received buffer</div><div class='add'>+ * @flags: flags (0: fragmented, all others: reserved)</div><div class='add'>+ * @reserved: reserved</div><div class='add'>+ */</div><div class='add'>+struct iwl_rx_completion_desc_bz {</div><div class='add'>+	__le16 rbid;</div><div class='add'>+	u8 flags;</div><div class='add'>+	u8 reserved[1];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_rxq - Rx queue</div><div class='ctx'>  * @id: queue index</div><div class='ctx'>  * @bd: driver's pointer to buffer of receive buffer descriptors (rbd).</div><div class='ctx'>  *	Address size is 32 bit in pre-9000 devices and 64 bit in 9000 devices.</div><div class='ctx'>  *	In AX210 devices it is a pointer to a list of iwl_rx_transfer_desc's</div><div class='ctx'>  * @bd_dma: bus address of buffer of receive buffer descriptors (rbd)</div><div class='del'>- * @ubd: driver's pointer to buffer of used receive buffer descriptors (rbd)</div><div class='del'>- * @ubd_dma: physical address of buffer of used receive buffer descriptors (rbd)</div><div class='del'>- * @tr_tail: driver's pointer to the transmission ring tail buffer</div><div class='del'>- * @tr_tail_dma: physical address of the buffer for the transmission ring tail</div><div class='del'>- * @cr_tail: driver's pointer to the completion ring tail buffer</div><div class='del'>- * @cr_tail_dma: physical address of the buffer for the completion ring tail</div><div class='add'>+ * @used_bd: driver's pointer to buffer of used receive buffer descriptors (rbd)</div><div class='add'>+ * @used_bd_dma: physical address of buffer of used receive buffer descriptors (rbd)</div><div class='ctx'>  * @read: Shared index to newest available Rx buffer</div><div class='ctx'>  * @write: Shared index to oldest written Rx packet</div><div class='add'>+ * @write_actual: actual write pointer written to device, since we update in</div><div class='add'>+ *	blocks of 8 only</div><div class='ctx'>  * @free_count: Number of pre-allocated buffers in rx_free</div><div class='ctx'>  * @used_count: Number of RBDs handled to allocator to use for allocation</div><div class='ctx'>  * @write_actual:</div><div class='hunk'>@@ -125,10 +133,12 @@ struct iwl_rx_completion_desc {</div><div class='ctx'>  * @need_update: flag to indicate we need to update read/write index</div><div class='ctx'>  * @rb_stts: driver's pointer to receive buffer status</div><div class='ctx'>  * @rb_stts_dma: bus address of receive buffer status</div><div class='del'>- * @lock:</div><div class='add'>+ * @lock: per-queue lock</div><div class='ctx'>  * @queue: actual rx queue. Not used for multi-rx queue.</div><div class='ctx'>  * @next_rb_is_fragment: indicates that the previous RB that we handled set</div><div class='ctx'>  *	the fragmented flag, so the next one is still another fragment</div><div class='add'>+ * @napi: NAPI struct for this queue</div><div class='add'>+ * @queue_size: size of this queue</div><div class='ctx'>  *</div><div class='ctx'>  * NOTE:  rx_free and rx_used are used as a FIFO for iwl_rx_mem_buffers</div><div class='ctx'>  */</div><div class='hunk'>@@ -136,16 +146,8 @@ struct iwl_rxq {</div><div class='ctx'> 	int id;</div><div class='ctx'> 	void *bd;</div><div class='ctx'> 	dma_addr_t bd_dma;</div><div class='del'>-	union {</div><div class='del'>-		void *used_bd;</div><div class='del'>-		__le32 *bd_32;</div><div class='del'>-		struct iwl_rx_completion_desc *cd;</div><div class='del'>-	};</div><div class='add'>+	void *used_bd;</div><div class='ctx'> 	dma_addr_t used_bd_dma;</div><div class='del'>-	__le16 *tr_tail;</div><div class='del'>-	dma_addr_t tr_tail_dma;</div><div class='del'>-	__le16 *cr_tail;</div><div class='del'>-	dma_addr_t cr_tail_dma;</div><div class='ctx'> 	u32 read;</div><div class='ctx'> 	u32 write;</div><div class='ctx'> 	u32 free_count;</div><div class='hunk'>@@ -186,19 +188,21 @@ struct iwl_rb_allocator {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * iwl_get_closed_rb_stts - get closed rb stts from different structs</div><div class='del'>- * @rxq - the rxq to get the rb stts from</div><div class='add'>+ * @trans: transport pointer (for configuration)</div><div class='add'>+ * @rxq: the rxq to get the rb stts from</div><div class='add'>+ * Return: last closed RB index</div><div class='ctx'>  */</div><div class='del'>-static inline __le16 iwl_get_closed_rb_stts(struct iwl_trans *trans,</div><div class='del'>-					    struct iwl_rxq *rxq)</div><div class='add'>+static inline u16 iwl_get_closed_rb_stts(struct iwl_trans *trans,</div><div class='add'>+					 struct iwl_rxq *rxq)</div><div class='ctx'> {</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='ctx'> 		__le16 *rb_stts = rxq-&gt;rb_stts;</div><div class='ctx'> </div><div class='del'>-		return READ_ONCE(*rb_stts);</div><div class='add'>+		return le16_to_cpu(READ_ONCE(*rb_stts));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct iwl_rb_status *rb_stts = rxq-&gt;rb_stts;</div><div class='ctx'> </div><div class='del'>-		return READ_ONCE(rb_stts-&gt;closed_rb_num);</div><div class='add'>+		return le16_to_cpu(READ_ONCE(rb_stts-&gt;closed_rb_num)) &amp; 0xFFF;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -241,6 +245,7 @@ enum iwl_image_response_code {</div><div class='ctx'> 	IWL_IMAGE_RESP_FAIL		= 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> /**</div><div class='ctx'>  * struct cont_rec: continuous recording data structure</div><div class='ctx'>  * @prev_wr_ptr: the last address that was read in monitor_data</div><div class='hunk'>@@ -251,7 +256,6 @@ enum iwl_image_response_code {</div><div class='ctx'>  *	in &amp;iwl_fw_mon_dbgfs_state enum</div><div class='ctx'>  * @mutex: locked while reading from monitor_data debugfs file</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> struct cont_rec {</div><div class='ctx'> 	u32 prev_wr_ptr;</div><div class='ctx'> 	u32 prev_wrap_cnt;</div><div class='hunk'>@@ -261,6 +265,61 @@ struct cont_rec {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+enum iwl_pcie_fw_reset_state {</div><div class='add'>+	FW_RESET_IDLE,</div><div class='add'>+	FW_RESET_REQUESTED,</div><div class='add'>+	FW_RESET_OK,</div><div class='add'>+	FW_RESET_ERROR,</div><div class='add'>+	FW_RESET_TOP_REQUESTED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_pcie_imr_status - imr dma transfer state</div><div class='add'>+ * @IMR_D2S_IDLE: default value of the dma transfer</div><div class='add'>+ * @IMR_D2S_REQUESTED: dma transfer requested</div><div class='add'>+ * @IMR_D2S_COMPLETED: dma transfer completed</div><div class='add'>+ * @IMR_D2S_ERROR: dma transfer error</div><div class='add'>+ */</div><div class='add'>+enum iwl_pcie_imr_status {</div><div class='add'>+	IMR_D2S_IDLE,</div><div class='add'>+	IMR_D2S_REQUESTED,</div><div class='add'>+	IMR_D2S_COMPLETED,</div><div class='add'>+	IMR_D2S_ERROR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_pcie_txqs - TX queues data</div><div class='add'>+ *</div><div class='add'>+ * @queue_used: bit mask of used queues</div><div class='add'>+ * @queue_stopped: bit mask of stopped queues</div><div class='add'>+ * @txq: array of TXQ data structures representing the TXQs</div><div class='add'>+ * @scd_bc_tbls: gen1 pointer to the byte count table of the scheduler</div><div class='add'>+ * @bc_pool: bytecount DMA allocations pool</div><div class='add'>+ * @bc_tbl_size: bytecount table size</div><div class='add'>+ * @tso_hdr_page: page allocated (per CPU) for A-MSDU headers when doing TSO</div><div class='add'>+ *	(and similar usage)</div><div class='add'>+ * @tfd: TFD data</div><div class='add'>+ * @tfd.max_tbs: max number of buffers per TFD</div><div class='add'>+ * @tfd.size: TFD size</div><div class='add'>+ * @tfd.addr_size: TFD/TB address size</div><div class='add'>+ */</div><div class='add'>+struct iwl_pcie_txqs {</div><div class='add'>+	unsigned long queue_used[BITS_TO_LONGS(IWL_MAX_TVQM_QUEUES)];</div><div class='add'>+	unsigned long queue_stopped[BITS_TO_LONGS(IWL_MAX_TVQM_QUEUES)];</div><div class='add'>+	struct iwl_txq *txq[IWL_MAX_TVQM_QUEUES];</div><div class='add'>+	struct dma_pool *bc_pool;</div><div class='add'>+	size_t bc_tbl_size;</div><div class='add'>+	struct iwl_tso_hdr_page __percpu *tso_hdr_page;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u8 max_tbs;</div><div class='add'>+		u16 size;</div><div class='add'>+		u8 addr_size;</div><div class='add'>+	} tfd;</div><div class='add'>+</div><div class='add'>+	struct iwl_dma_ptr scd_bc_tbls;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_trans_pcie - PCIe transport specific data</div><div class='ctx'>  * @rxq: all the RX queue data</div><div class='hunk'>@@ -268,37 +327,33 @@ struct cont_rec {</div><div class='ctx'>  * @global_table: table mapping received VID from hw to rxb</div><div class='ctx'>  * @rba: allocator for RX replenishing</div><div class='ctx'>  * @ctxt_info: context information for FW self init</div><div class='del'>- * @ctxt_info_gen3: context information for gen3 devices</div><div class='add'>+ * @ctxt_info_v2: context information for v1 devices</div><div class='ctx'>  * @prph_info: prph info for self init</div><div class='ctx'>  * @prph_scratch: prph scratch for self init</div><div class='ctx'>  * @ctxt_info_dma_addr: dma addr of context information</div><div class='ctx'>  * @prph_info_dma_addr: dma addr of prph info</div><div class='ctx'>  * @prph_scratch_dma_addr: dma addr of prph scratch</div><div class='ctx'>  * @ctxt_info_dma_addr: dma addr of context information</div><div class='del'>- * @init_dram: DRAM data of firmware image (including paging).</div><div class='del'>- *	Context information addresses will be taken from here.</div><div class='del'>- *	This is driver's local copy for keeping track of size and</div><div class='del'>- *	count for allocating and freeing the memory.</div><div class='add'>+ * @iml: image loader image virtual address</div><div class='add'>+ * @iml_len: image loader image size</div><div class='add'>+ * @iml_dma_addr: image loader image DMA address</div><div class='ctx'>  * @trans: pointer to the generic transport area</div><div class='ctx'>  * @scd_base_addr: scheduler sram base address in SRAM</div><div class='ctx'>  * @kw: keep warm address</div><div class='del'>- * @pnvm_dram: DRAM area that contains the PNVM data</div><div class='add'>+ * @pnvm_data: holds info about pnvm payloads allocated in DRAM</div><div class='add'>+ * @reduced_tables_data: holds info about power reduced tablse</div><div class='add'>+ *	payloads allocated in DRAM</div><div class='ctx'>  * @pci_dev: basic pci-network driver stuff</div><div class='ctx'>  * @hw_base: pci hardware address support</div><div class='ctx'>  * @ucode_write_complete: indicates that the ucode has been copied.</div><div class='ctx'>  * @ucode_write_waitq: wait queue for uCode load</div><div class='del'>- * @cmd_queue - command queue number</div><div class='del'>- * @def_rx_queue - default rx queue number</div><div class='del'>- * @rx_buf_size: Rx buffer size</div><div class='del'>- * @scd_set_active: should the transport configure the SCD for HCMD queue</div><div class='ctx'>  * @rx_page_order: page order for receive buffer size</div><div class='ctx'>  * @rx_buf_bytes: RX buffer (RB) size in bytes</div><div class='ctx'>  * @reg_lock: protect hw register access</div><div class='ctx'>  * @mutex: to protect stop_device / start_fw / start_hw</div><div class='del'>- * @cmd_in_flight: true when we have a host command in flight</div><div class='del'>-#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'>  * @fw_mon_data: fw continuous recording data</div><div class='del'>-#endif</div><div class='add'>+ * @cmd_hold_nic_awake: indicates NIC is held awake for APMG workaround</div><div class='add'>+ *	during commands in flight</div><div class='ctx'>  * @msix_entries: array of MSI-X entries</div><div class='ctx'>  * @msix_enabled: true if managed to enable MSI-X</div><div class='ctx'>  * @shared_vec_mask: the type of causes the shared vector handles</div><div class='hunk'>@@ -317,6 +372,39 @@ struct cont_rec {</div><div class='ctx'>  * @alloc_page_lock: spinlock for the page allocator</div><div class='ctx'>  * @alloc_page: allocated page to still use parts of</div><div class='ctx'>  * @alloc_page_used: how much of the allocated page was already used (bytes)</div><div class='add'>+ * @imr_status: imr dma state machine</div><div class='add'>+ * @imr_waitq: imr wait queue for dma completion</div><div class='add'>+ * @rf_name: name/version of the CRF, if any</div><div class='add'>+ * @use_ict: whether or not ICT (interrupt table) is used</div><div class='add'>+ * @ict_index: current ICT read index</div><div class='add'>+ * @ict_tbl: ICT table pointer</div><div class='add'>+ * @ict_tbl_dma: ICT table DMA address</div><div class='add'>+ * @inta_mask: interrupt (INT-A) mask</div><div class='add'>+ * @irq_lock: lock to synchronize IRQ handling</div><div class='add'>+ * @txq_memory: TXQ allocation array</div><div class='add'>+ * @sx_waitq: waitqueue for Sx transitions</div><div class='add'>+ * @sx_state: state tracking Sx transitions</div><div class='add'>+ * @opmode_down: indicates opmode went away</div><div class='add'>+ * @num_rx_bufs: number of RX buffers to allocate/use</div><div class='add'>+ * @affinity_mask: IRQ affinity mask for each RX queue</div><div class='add'>+ * @debug_rfkill: RF-kill debugging state, -1 for unset, 0/1 for radio</div><div class='add'>+ *	enable/disable</div><div class='add'>+ * @fw_reset_state: state of FW reset handshake</div><div class='add'>+ * @fw_reset_waitq: waitqueue for FW reset handshake</div><div class='add'>+ * @is_down: indicates the NIC is down</div><div class='add'>+ * @isr_stats: interrupt statistics</div><div class='add'>+ * @napi_dev: (fake) netdev for NAPI registration</div><div class='add'>+ * @txqs: transport tx queues data.</div><div class='add'>+ * @me_present: WiAMT/CSME is detected as present (1), not present (0)</div><div class='add'>+ *	or unknown (-1, so can still use it as a boolean safely)</div><div class='add'>+ * @me_recheck_wk: worker to recheck WiAMT/CSME presence</div><div class='add'>+ * @invalid_tx_cmd: invalid TX command buffer</div><div class='add'>+ * @wait_command_queue: wait queue for sync commands</div><div class='add'>+ * @dev_cmd_pool: pool for Tx cmd allocation - for internal use only.</div><div class='add'>+ *	The user should use iwl_trans_{alloc,free}_tx_cmd.</div><div class='add'>+ * @dev_cmd_pool_name: name for the TX command allocation pool</div><div class='add'>+ * @pm_support: set to true in start_hw if link pm is supported</div><div class='add'>+ * @ltr_enabled: set to true if the LTR is enabled</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_trans_pcie {</div><div class='ctx'> 	struct iwl_rxq *rxq;</div><div class='hunk'>@@ -325,17 +413,19 @@ struct iwl_trans_pcie {</div><div class='ctx'> 	struct iwl_rb_allocator rba;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct iwl_context_info *ctxt_info;</div><div class='del'>-		struct iwl_context_info_gen3 *ctxt_info_gen3;</div><div class='add'>+		struct iwl_context_info_v2 *ctxt_info_v2;</div><div class='ctx'> 	};</div><div class='ctx'> 	struct iwl_prph_info *prph_info;</div><div class='ctx'> 	struct iwl_prph_scratch *prph_scratch;</div><div class='add'>+	void *iml;</div><div class='add'>+	size_t iml_len;</div><div class='ctx'> 	dma_addr_t ctxt_info_dma_addr;</div><div class='ctx'> 	dma_addr_t prph_info_dma_addr;</div><div class='ctx'> 	dma_addr_t prph_scratch_dma_addr;</div><div class='ctx'> 	dma_addr_t iml_dma_addr;</div><div class='ctx'> 	struct iwl_trans *trans;</div><div class='ctx'> </div><div class='del'>-	struct net_device napi_dev;</div><div class='add'>+	struct net_device *napi_dev;</div><div class='ctx'> </div><div class='ctx'> 	/* INT ICT Table */</div><div class='ctx'> 	__le32 *ict_tbl;</div><div class='hunk'>@@ -352,27 +442,28 @@ struct iwl_trans_pcie {</div><div class='ctx'> 	u32 scd_base_addr;</div><div class='ctx'> 	struct iwl_dma_ptr kw;</div><div class='ctx'> </div><div class='del'>-	struct iwl_dram_data pnvm_dram;</div><div class='add'>+	/* pnvm data */</div><div class='add'>+	struct iwl_dram_regions pnvm_data;</div><div class='add'>+	struct iwl_dram_regions reduced_tables_data;</div><div class='ctx'> </div><div class='ctx'> 	struct iwl_txq *txq_memory;</div><div class='ctx'> </div><div class='ctx'> 	/* PCI bus related data */</div><div class='ctx'> 	struct pci_dev *pci_dev;</div><div class='del'>-	void __iomem *hw_base;</div><div class='add'>+	u8 __iomem *hw_base;</div><div class='ctx'> </div><div class='ctx'> 	bool ucode_write_complete;</div><div class='del'>-	bool sx_complete;</div><div class='add'>+	enum {</div><div class='add'>+		IWL_SX_INVALID = 0,</div><div class='add'>+		IWL_SX_WAITING,</div><div class='add'>+		IWL_SX_ERROR,</div><div class='add'>+		IWL_SX_COMPLETE,</div><div class='add'>+	} sx_state;</div><div class='ctx'> 	wait_queue_head_t ucode_write_waitq;</div><div class='ctx'> 	wait_queue_head_t sx_waitq;</div><div class='ctx'> </div><div class='del'>-	u8 def_rx_queue;</div><div class='del'>-	u8 n_no_reclaim_cmds;</div><div class='del'>-	u8 no_reclaim_cmds[MAX_NO_RECLAIM_CMDS];</div><div class='ctx'> 	u16 num_rx_bufs;</div><div class='ctx'> </div><div class='del'>-	enum iwl_amsdu_size rx_buf_size;</div><div class='del'>-	bool scd_set_active;</div><div class='del'>-	bool pcie_dbg_dumped_once;</div><div class='ctx'> 	u32 rx_page_order;</div><div class='ctx'> 	u32 rx_buf_bytes;</div><div class='ctx'> 	u32 supported_dma_mask;</div><div class='hunk'>@@ -406,9 +497,26 @@ struct iwl_trans_pcie {</div><div class='ctx'> 	void *base_rb_stts;</div><div class='ctx'> 	dma_addr_t base_rb_stts_dma;</div><div class='ctx'> </div><div class='del'>-	bool fw_reset_handshake;</div><div class='del'>-	bool fw_reset_done;</div><div class='add'>+	enum iwl_pcie_fw_reset_state fw_reset_state;</div><div class='ctx'> 	wait_queue_head_t fw_reset_waitq;</div><div class='add'>+	enum iwl_pcie_imr_status imr_status;</div><div class='add'>+	wait_queue_head_t imr_waitq;</div><div class='add'>+	char rf_name[32];</div><div class='add'>+</div><div class='add'>+	struct iwl_pcie_txqs txqs;</div><div class='add'>+</div><div class='add'>+	s8 me_present;</div><div class='add'>+	struct delayed_work me_recheck_wk;</div><div class='add'>+</div><div class='add'>+	struct iwl_dma_ptr invalid_tx_cmd;</div><div class='add'>+</div><div class='add'>+	wait_queue_head_t wait_command_queue;</div><div class='add'>+</div><div class='add'>+	struct kmem_cache *dev_cmd_pool;</div><div class='add'>+	char dev_cmd_pool_name[50];</div><div class='add'>+</div><div class='add'>+	bool pm_support;</div><div class='add'>+	bool ltr_enabled;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct iwl_trans_pcie *</div><div class='hunk'>@@ -441,16 +549,17 @@ iwl_trans_pcie_get_trans(struct iwl_trans_pcie *trans_pcie)</div><div class='ctx'>  * Convention: trans API functions: iwl_trans_pcie_XXX</div><div class='ctx'>  *	Other functions: iwl_pcie_XXX</div><div class='ctx'>  */</div><div class='del'>-struct iwl_trans</div><div class='del'>-*iwl_trans_pcie_alloc(struct pci_dev *pdev,</div><div class='del'>-		      const struct pci_device_id *ent,</div><div class='del'>-		      const struct iwl_cfg_trans_params *cfg_trans);</div><div class='ctx'> void iwl_trans_pcie_free(struct iwl_trans *trans);</div><div class='add'>+void iwl_trans_pcie_free_pnvm_dram_regions(struct iwl_dram_regions *dram_regions,</div><div class='add'>+					   struct device *dev);</div><div class='ctx'> </div><div class='del'>-bool __iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans);</div><div class='del'>-#define _iwl_trans_pcie_grab_nic_access(trans)			\</div><div class='add'>+bool __iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans, bool silent);</div><div class='add'>+#define _iwl_trans_pcie_grab_nic_access(trans, silent)		\</div><div class='ctx'> 	__cond_lock(nic_access_nobh,				\</div><div class='del'>-		    likely(__iwl_trans_pcie_grab_nic_access(trans)))</div><div class='add'>+		    likely(__iwl_trans_pcie_grab_nic_access(trans, silent)))</div><div class='add'>+</div><div class='add'>+void iwl_trans_pcie_check_product_reset_status(struct pci_dev *pdev);</div><div class='add'>+void iwl_trans_pcie_check_product_reset_mode(struct pci_dev *pdev);</div><div class='ctx'> </div><div class='ctx'> /*****************************************************</div><div class='ctx'> * RX</div><div class='hunk'>@@ -465,6 +574,7 @@ int iwl_pcie_rx_stop(struct iwl_trans *trans);</div><div class='ctx'> void iwl_pcie_rx_free(struct iwl_trans *trans);</div><div class='ctx'> void iwl_pcie_free_rbs_pool(struct iwl_trans *trans);</div><div class='ctx'> void iwl_pcie_rx_init_rxb_lists(struct iwl_rxq *rxq);</div><div class='add'>+void iwl_pcie_rx_napi_sync(struct iwl_trans *trans);</div><div class='ctx'> void iwl_pcie_rxq_alloc_rbs(struct iwl_trans *trans, gfp_t priority,</div><div class='ctx'> 			    struct iwl_rxq *rxq);</div><div class='ctx'> </div><div class='hunk'>@@ -480,8 +590,35 @@ void iwl_pcie_disable_ict(struct iwl_trans *trans);</div><div class='ctx'> /*****************************************************</div><div class='ctx'> * TX / HCMD</div><div class='ctx'> ******************************************************/</div><div class='add'>+/* We need 2 entries for the TX command and header, and another one might</div><div class='add'>+ * be needed for potential data in the SKB's head. The remaining ones can</div><div class='add'>+ * be used for frags.</div><div class='add'>+ */</div><div class='add'>+#define IWL_TRANS_PCIE_MAX_FRAGS(trans_pcie) ((trans_pcie)-&gt;txqs.tfd.max_tbs - 3)</div><div class='add'>+</div><div class='add'>+struct iwl_tso_hdr_page {</div><div class='add'>+	struct page *page;</div><div class='add'>+	u8 *pos;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Note that we put this struct *last* in the page. By doing that, we ensure</div><div class='add'>+ * that no TB referencing this page can trigger the 32-bit boundary hardware</div><div class='add'>+ * bug.</div><div class='add'>+ */</div><div class='add'>+struct iwl_tso_page_info {</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+	struct page *next;</div><div class='add'>+	refcount_t use_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IWL_TSO_PAGE_DATA_SIZE	(PAGE_SIZE - sizeof(struct iwl_tso_page_info))</div><div class='add'>+#define IWL_TSO_PAGE_INFO(addr)	\</div><div class='add'>+	((struct iwl_tso_page_info *)(((unsigned long)addr &amp; PAGE_MASK) + \</div><div class='add'>+				      IWL_TSO_PAGE_DATA_SIZE))</div><div class='add'>+</div><div class='ctx'> int iwl_pcie_tx_init(struct iwl_trans *trans);</div><div class='del'>-void iwl_pcie_tx_start(struct iwl_trans *trans, u32 scd_base_addr);</div><div class='add'>+void iwl_pcie_tx_start(struct iwl_trans *trans);</div><div class='ctx'> int iwl_pcie_tx_stop(struct iwl_trans *trans);</div><div class='ctx'> void iwl_pcie_tx_free(struct iwl_trans *trans);</div><div class='ctx'> bool iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int queue, u16 ssn,</div><div class='hunk'>@@ -494,10 +631,193 @@ void iwl_trans_pcie_txq_set_shared_mode(struct iwl_trans *trans, u32 txq_id,</div><div class='ctx'> int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> 		      struct iwl_device_tx_cmd *dev_cmd, int txq_id);</div><div class='ctx'> void iwl_pcie_txq_check_wrptrs(struct iwl_trans *trans);</div><div class='del'>-int iwl_trans_pcie_send_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd);</div><div class='ctx'> void iwl_pcie_hcmd_complete(struct iwl_trans *trans,</div><div class='ctx'> 			    struct iwl_rx_cmd_buffer *rxb);</div><div class='ctx'> void iwl_trans_pcie_tx_reset(struct iwl_trans *trans);</div><div class='add'>+int iwl_pcie_txq_alloc(struct iwl_trans *trans, struct iwl_txq *txq,</div><div class='add'>+		       int slots_num, bool cmd_queue);</div><div class='add'>+</div><div class='add'>+dma_addr_t iwl_pcie_get_sgt_tb_phys(struct sg_table *sgt, unsigned int offset,</div><div class='add'>+				    unsigned int len);</div><div class='add'>+struct sg_table *iwl_pcie_prep_tso(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='add'>+				   struct iwl_cmd_meta *cmd_meta,</div><div class='add'>+				   u8 **hdr, unsigned int hdr_room,</div><div class='add'>+				   unsigned int offset);</div><div class='add'>+</div><div class='add'>+void iwl_pcie_free_tso_pages(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='add'>+			     struct iwl_cmd_meta *cmd_meta);</div><div class='add'>+</div><div class='add'>+static inline dma_addr_t iwl_pcie_get_tso_page_phys(void *addr)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t res;</div><div class='add'>+</div><div class='add'>+	res = IWL_TSO_PAGE_INFO(addr)-&gt;dma_addr;</div><div class='add'>+	res += (unsigned long)addr &amp; ~PAGE_MASK;</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline dma_addr_t</div><div class='add'>+iwl_txq_get_first_tb_dma(struct iwl_txq *txq, int idx)</div><div class='add'>+{</div><div class='add'>+	return txq-&gt;first_tb_dma +</div><div class='add'>+	       sizeof(struct iwl_pcie_first_tb_buf) * idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 iwl_txq_get_cmd_index(const struct iwl_txq *q, u32 index)</div><div class='add'>+{</div><div class='add'>+	return index &amp; (q-&gt;n_window - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *iwl_txq_get_tfd(struct iwl_trans *trans,</div><div class='add'>+				    struct iwl_txq *txq, int idx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;gen2)</div><div class='add'>+		idx = iwl_txq_get_cmd_index(txq, idx);</div><div class='add'>+</div><div class='add'>+	return (u8 *)txq-&gt;tfds + trans_pcie-&gt;txqs.tfd.size * idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We need this inline in case dma_addr_t is only 32-bits - since the</div><div class='add'>+ * hardware is always 64-bit, the issue can still occur in that case,</div><div class='add'>+ * so use u64 for 'phys' here to force the addition in 64-bit.</div><div class='add'>+ */</div><div class='add'>+static inline bool iwl_txq_crosses_4g_boundary(u64 phys, u16 len)</div><div class='add'>+{</div><div class='add'>+	return upper_32_bits(phys) != upper_32_bits(phys + len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_txq_space(struct iwl_trans *trans, const struct iwl_txq *q);</div><div class='add'>+</div><div class='add'>+static inline void iwl_txq_stop(struct iwl_trans *trans, struct iwl_txq *txq)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+</div><div class='add'>+	if (!test_and_set_bit(txq-&gt;id, trans_pcie-&gt;txqs.queue_stopped)) {</div><div class='add'>+		iwl_op_mode_queue_full(trans-&gt;op_mode, txq-&gt;id);</div><div class='add'>+		IWL_DEBUG_TX_QUEUES(trans, "Stop hwq %d\n", txq-&gt;id);</div><div class='add'>+	} else {</div><div class='add'>+		IWL_DEBUG_TX_QUEUES(trans, "hwq %d already stopped\n",</div><div class='add'>+				    txq-&gt;id);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_txq_inc_wrap - increment queue index, wrap back to beginning</div><div class='add'>+ * @trans: the transport (for configuration data)</div><div class='add'>+ * @index: current index</div><div class='add'>+ * Return: the queue index incremented, subject to wrapping</div><div class='add'>+ */</div><div class='add'>+static inline int iwl_txq_inc_wrap(struct iwl_trans *trans, int index)</div><div class='add'>+{</div><div class='add'>+	return ++index &amp;</div><div class='add'>+		(trans-&gt;mac_cfg-&gt;base-&gt;max_tfd_queue_size - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_txq_dec_wrap - decrement queue index, wrap back to end</div><div class='add'>+ * @trans: the transport (for configuration data)</div><div class='add'>+ * @index: current index</div><div class='add'>+ * Return: the queue index decremented, subject to wrapping</div><div class='add'>+ */</div><div class='add'>+static inline int iwl_txq_dec_wrap(struct iwl_trans *trans, int index)</div><div class='add'>+{</div><div class='add'>+	return --index &amp;</div><div class='add'>+		(trans-&gt;mac_cfg-&gt;base-&gt;max_tfd_queue_size - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_txq_log_scd_error(struct iwl_trans *trans, struct iwl_txq *txq);</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+iwl_trans_pcie_wake_queue(struct iwl_trans *trans, struct iwl_txq *txq)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+</div><div class='add'>+	if (test_and_clear_bit(txq-&gt;id, trans_pcie-&gt;txqs.queue_stopped)) {</div><div class='add'>+		IWL_DEBUG_TX_QUEUES(trans, "Wake hwq %d\n", txq-&gt;id);</div><div class='add'>+		iwl_op_mode_queue_not_full(trans-&gt;op_mode, txq-&gt;id);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_txq_gen2_set_tb(struct iwl_trans *trans,</div><div class='add'>+			struct iwl_tfh_tfd *tfd, dma_addr_t addr,</div><div class='add'>+			u16 len);</div><div class='add'>+</div><div class='add'>+static inline void iwl_txq_set_tfd_invalid_gen2(struct iwl_trans *trans,</div><div class='add'>+						struct iwl_tfh_tfd *tfd)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+</div><div class='add'>+	tfd-&gt;num_tbs = 0;</div><div class='add'>+</div><div class='add'>+	iwl_txq_gen2_set_tb(trans, tfd, trans_pcie-&gt;invalid_tx_cmd.dma,</div><div class='add'>+			    trans_pcie-&gt;invalid_tx_cmd.size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_txq_gen2_tfd_unmap(struct iwl_trans *trans,</div><div class='add'>+			    struct iwl_cmd_meta *meta,</div><div class='add'>+			    struct iwl_tfh_tfd *tfd);</div><div class='add'>+</div><div class='add'>+int iwl_txq_dyn_alloc(struct iwl_trans *trans, u32 flags,</div><div class='add'>+		      u32 sta_mask, u8 tid,</div><div class='add'>+		      int size, unsigned int timeout);</div><div class='add'>+</div><div class='add'>+int iwl_txq_gen2_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='add'>+		    struct iwl_device_tx_cmd *dev_cmd, int txq_id);</div><div class='add'>+</div><div class='add'>+void iwl_txq_dyn_free(struct iwl_trans *trans, int queue);</div><div class='add'>+void iwl_txq_gen2_tx_free(struct iwl_trans *trans);</div><div class='add'>+int iwl_txq_init(struct iwl_trans *trans, struct iwl_txq *txq,</div><div class='add'>+		 int slots_num, bool cmd_queue);</div><div class='add'>+int iwl_txq_gen2_init(struct iwl_trans *trans, int txq_id,</div><div class='add'>+		      int queue_size);</div><div class='add'>+</div><div class='add'>+static inline u16 iwl_txq_gen1_tfd_tb_get_len(struct iwl_trans *trans,</div><div class='add'>+					      void *_tfd, u8 idx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_tfd *tfd;</div><div class='add'>+	struct iwl_tfd_tb *tb;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;gen2) {</div><div class='add'>+		struct iwl_tfh_tfd *tfh_tfd = _tfd;</div><div class='add'>+		struct iwl_tfh_tb *tfh_tb = &amp;tfh_tfd-&gt;tbs[idx];</div><div class='add'>+</div><div class='add'>+		return le16_to_cpu(tfh_tb-&gt;tb_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tfd = (struct iwl_tfd *)_tfd;</div><div class='add'>+	tb = &amp;tfd-&gt;tbs[idx];</div><div class='add'>+</div><div class='add'>+	return le16_to_cpu(tb-&gt;hi_n_len) &gt;&gt; 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct iwl_device_tx_cmd *</div><div class='add'>+iwl_pcie_gen1_2_alloc_tx_cmd(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+</div><div class='add'>+	return kmem_cache_zalloc(trans_pcie-&gt;dev_cmd_pool, GFP_ATOMIC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+iwl_pcie_gen1_2_free_tx_cmd(struct iwl_trans *trans,</div><div class='add'>+			    struct iwl_device_tx_cmd *dev_cmd)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+</div><div class='add'>+	kmem_cache_free(trans_pcie-&gt;dev_cmd_pool, dev_cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn,</div><div class='add'>+		      struct sk_buff_head *skbs, bool is_flush);</div><div class='add'>+void iwl_pcie_set_q_ptrs(struct iwl_trans *trans, int txq_id, int ptr);</div><div class='add'>+void iwl_pcie_freeze_txq_timer(struct iwl_trans *trans,</div><div class='add'>+			       unsigned long txqs, bool freeze);</div><div class='add'>+int iwl_trans_pcie_wait_txq_empty(struct iwl_trans *trans, int txq_idx);</div><div class='add'>+int iwl_trans_pcie_wait_txqs_empty(struct iwl_trans *trans, u32 txq_bm);</div><div class='ctx'> </div><div class='ctx'> /*****************************************************</div><div class='ctx'> * Error handling</div><div class='hunk'>@@ -526,13 +846,12 @@ static inline void _iwl_disable_interrupts(struct iwl_trans *trans)</div><div class='ctx'> 			    trans_pcie-&gt;fh_init_mask);</div><div class='ctx'> 		iwl_write32(trans, CSR_MSIX_HW_INT_MASK_AD,</div><div class='ctx'> 			    trans_pcie-&gt;hw_init_mask);</div><div class='add'>+		trans_pcie-&gt;fh_mask = 0;</div><div class='add'>+		trans_pcie-&gt;hw_mask = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	IWL_DEBUG_ISR(trans, "Disabled interrupts\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define IWL_NUM_OF_COMPLETION_RINGS	31</div><div class='del'>-#define IWL_NUM_OF_TRANSFER_RINGS	527</div><div class='del'>-</div><div class='ctx'> static inline int iwl_pcie_get_num_sections(const struct fw_img *fw,</div><div class='ctx'> 					    int start)</div><div class='ctx'> {</div><div class='hunk'>@@ -639,11 +958,13 @@ static inline void iwl_enable_fw_load_int(struct iwl_trans *trans)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void iwl_enable_fw_load_int_ctx_info(struct iwl_trans *trans)</div><div class='add'>+static inline void iwl_enable_fw_load_int_ctx_info(struct iwl_trans *trans,</div><div class='add'>+						   bool top_reset)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_ISR(trans, "Enabling ALIVE interrupt only\n");</div><div class='add'>+	IWL_DEBUG_ISR(trans, "Enabling %s interrupt only\n",</div><div class='add'>+		      top_reset ? "RESET" : "ALIVE");</div><div class='ctx'> </div><div class='ctx'> 	if (!trans_pcie-&gt;msix_enabled) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -653,11 +974,20 @@ static inline void iwl_enable_fw_load_int_ctx_info(struct iwl_trans *trans)</div><div class='ctx'> 		 * RX interrupt which will allow us to receive the ALIVE</div><div class='ctx'> 		 * notification (which is Rx) and continue the flow.</div><div class='ctx'> 		 */</div><div class='del'>-		trans_pcie-&gt;inta_mask =  CSR_INT_BIT_ALIVE | CSR_INT_BIT_FH_RX;</div><div class='add'>+		if (top_reset)</div><div class='add'>+			trans_pcie-&gt;inta_mask =  CSR_INT_BIT_RESET_DONE;</div><div class='add'>+		else</div><div class='add'>+			trans_pcie-&gt;inta_mask =  CSR_INT_BIT_ALIVE |</div><div class='add'>+						 CSR_INT_BIT_FH_RX;</div><div class='ctx'> 		iwl_write32(trans, CSR_INT_MASK, trans_pcie-&gt;inta_mask);</div><div class='ctx'> 	} else {</div><div class='del'>-		iwl_enable_hw_int_msk_msix(trans,</div><div class='del'>-					   MSIX_HW_INT_CAUSES_REG_ALIVE);</div><div class='add'>+		u32 val = top_reset ? MSIX_HW_INT_CAUSES_REG_RESET_DONE</div><div class='add'>+				    : MSIX_HW_INT_CAUSES_REG_ALIVE;</div><div class='add'>+</div><div class='add'>+		iwl_enable_hw_int_msk_msix(trans, val);</div><div class='add'>+</div><div class='add'>+		if (top_reset)</div><div class='add'>+			return;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Leave all the FH causes enabled to get the ALIVE</div><div class='ctx'> 		 * notification.</div><div class='hunk'>@@ -674,19 +1004,19 @@ static inline const char *queue_name(struct device *dev,</div><div class='ctx'> 			  IWL_SHARED_IRQ_FIRST_RSS ? 1 : 0;</div><div class='ctx'> </div><div class='ctx'> 		if (i == 0)</div><div class='del'>-			return DRV_NAME ": shared IRQ";</div><div class='add'>+			return DRV_NAME ":shared_IRQ";</div><div class='ctx'> </div><div class='ctx'> 		return devm_kasprintf(dev, GFP_KERNEL,</div><div class='del'>-				      DRV_NAME ": queue %d", i + vec);</div><div class='add'>+				      DRV_NAME ":queue_%d", i + vec);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (i == 0)</div><div class='del'>-		return DRV_NAME ": default queue";</div><div class='add'>+		return DRV_NAME ":default_queue";</div><div class='ctx'> </div><div class='ctx'> 	if (i == trans_p-&gt;alloc_vecs - 1)</div><div class='del'>-		return DRV_NAME ": exception";</div><div class='add'>+		return DRV_NAME ":exception";</div><div class='ctx'> </div><div class='ctx'> 	return devm_kasprintf(dev, GFP_KERNEL,</div><div class='del'>-			      DRV_NAME  ": queue %d", i);</div><div class='add'>+			      DRV_NAME  ":queue_%d", i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void iwl_enable_rfkill_int(struct iwl_trans *trans)</div><div class='hunk'>@@ -700,11 +1030,12 @@ static inline void iwl_enable_rfkill_int(struct iwl_trans *trans)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		iwl_write32(trans, CSR_MSIX_FH_INT_MASK_AD,</div><div class='ctx'> 			    trans_pcie-&gt;fh_init_mask);</div><div class='add'>+		trans_pcie-&gt;fh_mask = 0;</div><div class='ctx'> 		iwl_enable_hw_int_msk_msix(trans,</div><div class='ctx'> 					   MSIX_HW_INT_CAUSES_REG_RF_KILL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_9000) {</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_9000) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * On 9000-series devices this bit isn't enabled by default, so</div><div class='ctx'> 		 * when we power down the device we need set the bit to allow it</div><div class='hunk'>@@ -715,7 +1046,7 @@ static inline void iwl_enable_rfkill_int(struct iwl_trans *trans)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_pcie_handle_rfkill_irq(struct iwl_trans *trans);</div><div class='add'>+void iwl_pcie_handle_rfkill_irq(struct iwl_trans *trans, bool from_irq);</div><div class='ctx'> </div><div class='ctx'> static inline bool iwl_is_rfkill_set(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='hunk'>@@ -730,50 +1061,68 @@ static inline bool iwl_is_rfkill_set(struct iwl_trans *trans)</div><div class='ctx'> 		CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void __iwl_trans_pcie_set_bits_mask(struct iwl_trans *trans,</div><div class='del'>-						  u32 reg, u32 mask, u32 value)</div><div class='del'>-{</div><div class='del'>-	u32 v;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_DEBUG</div><div class='del'>-	WARN_ON_ONCE(value &amp; ~mask);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	v = iwl_read32(trans, reg);</div><div class='del'>-	v &amp;= ~mask;</div><div class='del'>-	v |= value;</div><div class='del'>-	iwl_write32(trans, reg, v);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __iwl_trans_pcie_clear_bit(struct iwl_trans *trans,</div><div class='del'>-					      u32 reg, u32 mask)</div><div class='del'>-{</div><div class='del'>-	__iwl_trans_pcie_set_bits_mask(trans, reg, mask, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __iwl_trans_pcie_set_bit(struct iwl_trans *trans,</div><div class='del'>-					    u32 reg, u32 mask)</div><div class='del'>-{</div><div class='del'>-	__iwl_trans_pcie_set_bits_mask(trans, reg, mask, mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline bool iwl_pcie_dbg_on(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	return (trans-&gt;dbg.dest_tlv || iwl_trans_dbg_ini_valid(trans));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_trans_pcie_rf_kill(struct iwl_trans *trans, bool state);</div><div class='del'>-void iwl_trans_pcie_dump_regs(struct iwl_trans *trans);</div><div class='add'>+void iwl_trans_pcie_rf_kill(struct iwl_trans *trans, bool state, bool from_irq);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> void iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans);</div><div class='add'>+void iwl_trans_pcie_debugfs_cleanup(struct iwl_trans *trans);</div><div class='ctx'> #else</div><div class='ctx'> static inline void iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> void iwl_pcie_rx_allocator_work(struct work_struct *data);</div><div class='ctx'> </div><div class='add'>+/* common trans ops for all generations transports */</div><div class='add'>+void iwl_pcie_gen1_2_op_mode_enter(struct iwl_trans *trans);</div><div class='add'>+int _iwl_trans_pcie_start_hw(struct iwl_trans *trans);</div><div class='add'>+int iwl_trans_pcie_start_hw(struct iwl_trans *trans);</div><div class='add'>+void iwl_trans_pcie_op_mode_leave(struct iwl_trans *trans);</div><div class='add'>+void iwl_trans_pcie_write8(struct iwl_trans *trans, u32 ofs, u8 val);</div><div class='add'>+void iwl_trans_pcie_write32(struct iwl_trans *trans, u32 ofs, u32 val);</div><div class='add'>+u32 iwl_trans_pcie_read32(struct iwl_trans *trans, u32 ofs);</div><div class='add'>+u32 iwl_trans_pcie_read_prph(struct iwl_trans *trans, u32 reg);</div><div class='add'>+void iwl_trans_pcie_write_prph(struct iwl_trans *trans, u32 addr, u32 val);</div><div class='add'>+int iwl_trans_pcie_read_mem(struct iwl_trans *trans, u32 addr,</div><div class='add'>+			    void *buf, int dwords);</div><div class='add'>+int iwl_trans_pcie_sw_reset(struct iwl_trans *trans, bool retake_ownership);</div><div class='add'>+struct iwl_trans_dump_data *</div><div class='add'>+iwl_trans_pcie_dump_data(struct iwl_trans *trans, u32 dump_mask,</div><div class='add'>+			 const struct iwl_dump_sanitize_ops *sanitize_ops,</div><div class='add'>+			 void *sanitize_ctx);</div><div class='add'>+int iwl_trans_pcie_d3_resume(struct iwl_trans *trans,</div><div class='add'>+			     bool reset);</div><div class='add'>+int iwl_trans_pcie_d3_suspend(struct iwl_trans *trans, bool reset);</div><div class='add'>+void iwl_trans_pci_interrupts(struct iwl_trans *trans, bool enable);</div><div class='add'>+void iwl_trans_pcie_sync_nmi(struct iwl_trans *trans);</div><div class='add'>+void iwl_trans_pcie_set_bits_mask(struct iwl_trans *trans, u32 reg,</div><div class='add'>+				  u32 mask, u32 value);</div><div class='add'>+int iwl_trans_pcie_read_config32(struct iwl_trans *trans, u32 ofs,</div><div class='add'>+				 u32 *val);</div><div class='add'>+bool iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans);</div><div class='add'>+void __releases(nic_access_nobh)</div><div class='add'>+iwl_trans_pcie_release_nic_access(struct iwl_trans *trans);</div><div class='add'>+void iwl_pcie_alloc_fw_monitor(struct iwl_trans *trans, u8 max_power);</div><div class='add'>+int iwl_pci_gen1_2_probe(struct pci_dev *pdev,</div><div class='add'>+			 const struct pci_device_id *ent,</div><div class='add'>+			 const struct iwl_mac_cfg *mac_cfg,</div><div class='add'>+			 u8 __iomem *hw_base, u32 hw_rev);</div><div class='add'>+void iwl_pcie_gen1_2_remove(struct iwl_trans *trans);</div><div class='add'>+</div><div class='add'>+/* transport gen 1 exported functions */</div><div class='add'>+void iwl_trans_pcie_fw_alive(struct iwl_trans *trans);</div><div class='add'>+int iwl_trans_pcie_start_fw(struct iwl_trans *trans,</div><div class='add'>+			    const struct iwl_fw *fw,</div><div class='add'>+			    const struct fw_img *img,</div><div class='add'>+			    bool run_in_rfkill);</div><div class='add'>+void iwl_trans_pcie_stop_device(struct iwl_trans *trans);</div><div class='add'>+</div><div class='ctx'> /* common functions that are used by gen2 transport */</div><div class='add'>+void iwl_trans_pcie_gen2_op_mode_leave(struct iwl_trans *trans);</div><div class='ctx'> int iwl_pcie_gen2_apm_init(struct iwl_trans *trans);</div><div class='ctx'> void iwl_pcie_apm_config(struct iwl_trans *trans);</div><div class='ctx'> int iwl_pcie_prepare_card_hw(struct iwl_trans *trans);</div><div class='hunk'>@@ -787,22 +1136,37 @@ int iwl_pcie_alloc_dma_ptr(struct iwl_trans *trans,</div><div class='ctx'> 			   struct iwl_dma_ptr *ptr, size_t size);</div><div class='ctx'> void iwl_pcie_free_dma_ptr(struct iwl_trans *trans, struct iwl_dma_ptr *ptr);</div><div class='ctx'> void iwl_pcie_apply_destination(struct iwl_trans *trans);</div><div class='del'>-</div><div class='del'>-/* common functions that are used by gen3 transport */</div><div class='del'>-void iwl_pcie_alloc_fw_monitor(struct iwl_trans *trans, u8 max_power);</div><div class='add'>+int iwl_pcie_gen1_2_activate_nic(struct iwl_trans *trans);</div><div class='ctx'> </div><div class='ctx'> /* transport gen 2 exported functions */</div><div class='ctx'> int iwl_trans_pcie_gen2_start_fw(struct iwl_trans *trans,</div><div class='del'>-				 const struct fw_img *fw, bool run_in_rfkill);</div><div class='del'>-void iwl_trans_pcie_gen2_fw_alive(struct iwl_trans *trans, u32 scd_addr);</div><div class='del'>-int iwl_trans_pcie_gen2_send_hcmd(struct iwl_trans *trans,</div><div class='del'>-				  struct iwl_host_cmd *cmd);</div><div class='add'>+				 const struct iwl_fw *fw,</div><div class='add'>+				 const struct fw_img *img,</div><div class='add'>+				 bool run_in_rfkill);</div><div class='add'>+void iwl_trans_pcie_gen2_fw_alive(struct iwl_trans *trans);</div><div class='ctx'> void iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans);</div><div class='del'>-void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans);</div><div class='del'>-void iwl_pcie_d3_complete_suspend(struct iwl_trans *trans,</div><div class='del'>-				  bool test, bool reset);</div><div class='ctx'> int iwl_pcie_gen2_enqueue_hcmd(struct iwl_trans *trans,</div><div class='ctx'> 			       struct iwl_host_cmd *cmd);</div><div class='ctx'> int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans,</div><div class='ctx'> 			  struct iwl_host_cmd *cmd);</div><div class='add'>+void iwl_trans_pcie_copy_imr_fh(struct iwl_trans *trans,</div><div class='add'>+				u32 dst_addr, u64 src_addr, u32 byte_cnt);</div><div class='add'>+int iwl_trans_pcie_copy_imr(struct iwl_trans *trans,</div><div class='add'>+			    u32 dst_addr, u64 src_addr, u32 byte_cnt);</div><div class='add'>+int iwl_trans_pcie_rxq_dma_data(struct iwl_trans *trans, int queue,</div><div class='add'>+				struct iwl_trans_rxq_dma_data *data);</div><div class='add'>+</div><div class='add'>+static inline bool iwl_pcie_gen1_is_pm_supported(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+</div><div class='add'>+	return trans_pcie-&gt;pm_support;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool iwl_pcie_gen1_2_is_ltr_enabled(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+</div><div class='add'>+	return trans_pcie-&gt;ltr_enabled;</div><div class='add'>+}</div><div class='ctx'> #endif /* __iwl_trans_int_pcie_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/rx.c<br/>index fb8491412be4..619a9505e6d9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/rx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/rx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/rx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/rx.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2003-2014, 2018-2021 Intel Corporation</div><div class='add'>+ * Copyright (C) 2003-2014, 2018-2024 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -12,7 +12,8 @@</div><div class='ctx'> #include "iwl-io.h"</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> #include "iwl-op-mode.h"</div><div class='del'>-#include "iwl-context-info-gen3.h"</div><div class='add'>+#include "pcie/iwl-context-info-v2.h"</div><div class='add'>+#include "fw/dbg.h"</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -143,12 +144,12 @@ static inline __le32 iwl_pcie_dma_addr2rbd_ptr(dma_addr_t dma_addr)</div><div class='ctx'>  */</div><div class='ctx'> int iwl_pcie_rx_stop(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='ctx'> 		/* TODO: remove this once fw does it */</div><div class='del'>-		iwl_write_umac_prph(trans, RFH_RXF_DMA_CFG_GEN3, 0);</div><div class='del'>-		return iwl_poll_umac_prph_bit(trans, RFH_GEN_STATUS_GEN3,</div><div class='add'>+		iwl_write_umac_prph(trans, RFH_RXF_DMA_CFG_AX210, 0);</div><div class='add'>+		return iwl_poll_umac_prph_bit(trans, RFH_GEN_STATUS_AX210,</div><div class='ctx'> 					      RXF_DMA_IDLE, RXF_DMA_IDLE, 1000);</div><div class='del'>-	} else if (trans-&gt;trans_cfg-&gt;mq_rx_supported) {</div><div class='add'>+	} else if (trans-&gt;mac_cfg-&gt;mq_rx_supported) {</div><div class='ctx'> 		iwl_write_prph(trans, RFH_RXF_DMA_CFG, 0);</div><div class='ctx'> 		return iwl_poll_prph_bit(trans, RFH_GEN_STATUS,</div><div class='ctx'> 					   RXF_DMA_IDLE, RXF_DMA_IDLE, 1000);</div><div class='hunk'>@@ -175,7 +176,7 @@ static void iwl_pcie_rxq_inc_wr_ptr(struct iwl_trans *trans,</div><div class='ctx'> 	 * 1. shadow registers aren't enabled</div><div class='ctx'> 	 * 2. there is a chance that the NIC is asleep</div><div class='ctx'> 	 */</div><div class='del'>-	if (!trans-&gt;trans_cfg-&gt;base_params-&gt;shadow_reg_enable &amp;&amp;</div><div class='add'>+	if (!trans-&gt;mac_cfg-&gt;base-&gt;shadow_reg_enable &amp;&amp;</div><div class='ctx'> 	    test_bit(STATUS_TPOWER_PMI, &amp;trans-&gt;status)) {</div><div class='ctx'> 		reg = iwl_read32(trans, CSR_UCODE_DRV_GP1);</div><div class='ctx'> </div><div class='hunk'>@@ -190,11 +191,14 @@ static void iwl_pcie_rxq_inc_wr_ptr(struct iwl_trans *trans,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rxq-&gt;write_actual = round_down(rxq-&gt;write, 8);</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;mq_rx_supported)</div><div class='add'>+	if (!trans-&gt;mac_cfg-&gt;mq_rx_supported)</div><div class='add'>+		iwl_write32(trans, FH_RSCSR_CHNL0_WPTR, rxq-&gt;write_actual);</div><div class='add'>+	else if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ)</div><div class='add'>+		iwl_write32(trans, HBUS_TARG_WRPTR, rxq-&gt;write_actual |</div><div class='add'>+			    HBUS_TARG_WRPTR_RX_Q(rxq-&gt;id));</div><div class='add'>+	else</div><div class='ctx'> 		iwl_write32(trans, RFH_Q_FRBDCB_WIDX_TRG(rxq-&gt;id),</div><div class='ctx'> 			    rxq-&gt;write_actual);</div><div class='del'>-	else</div><div class='del'>-		iwl_write32(trans, FH_RSCSR_CHNL0_WPTR, rxq-&gt;write_actual);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_pcie_rxq_check_wrptr(struct iwl_trans *trans)</div><div class='hunk'>@@ -202,7 +206,7 @@ static void iwl_pcie_rxq_check_wrptr(struct iwl_trans *trans)</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; trans-&gt;num_rx_queues; i++) {</div><div class='add'>+	for (i = 0; i &lt; trans-&gt;info.num_rxqs; i++) {</div><div class='ctx'> 		struct iwl_rxq *rxq = &amp;trans_pcie-&gt;rxq[i];</div><div class='ctx'> </div><div class='ctx'> 		if (!rxq-&gt;need_update)</div><div class='hunk'>@@ -218,7 +222,7 @@ static void iwl_pcie_restock_bd(struct iwl_trans *trans,</div><div class='ctx'> 				struct iwl_rxq *rxq,</div><div class='ctx'> 				struct iwl_rx_mem_buffer *rxb)</div><div class='ctx'> {</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='ctx'> 		struct iwl_rx_transfer_desc *bd = rxq-&gt;bd;</div><div class='ctx'> </div><div class='ctx'> 		BUILD_BUG_ON(sizeof(*bd) != 2 * sizeof(u64));</div><div class='hunk'>@@ -345,7 +349,7 @@ static void iwl_pcie_rxsq_restock(struct iwl_trans *trans,</div><div class='ctx'> static</div><div class='ctx'> void iwl_pcie_rxq_restock(struct iwl_trans *trans, struct iwl_rxq *rxq)</div><div class='ctx'> {</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;mq_rx_supported)</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;mq_rx_supported)</div><div class='ctx'> 		iwl_pcie_rxmq_restock(trans, rxq);</div><div class='ctx'> 	else</div><div class='ctx'> 		iwl_pcie_rxsq_restock(trans, rxq);</div><div class='hunk'>@@ -359,8 +363,8 @@ static struct page *iwl_pcie_rx_alloc_page(struct iwl_trans *trans,</div><div class='ctx'> 					   u32 *offset, gfp_t priority)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-	unsigned int rbsize = iwl_trans_get_rb_size(trans_pcie-&gt;rx_buf_size);</div><div class='ctx'> 	unsigned int allocsize = PAGE_SIZE &lt;&lt; trans_pcie-&gt;rx_page_order;</div><div class='add'>+	unsigned int rbsize = trans_pcie-&gt;rx_buf_bytes;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	gfp_t gfp_mask = priority;</div><div class='ctx'> </div><div class='hunk'>@@ -487,6 +491,9 @@ void iwl_pcie_free_rbs_pool(struct iwl_trans *trans)</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (!trans_pcie-&gt;rx_pool)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; RX_POOL_SIZE(trans_pcie-&gt;num_rx_bufs); i++) {</div><div class='ctx'> 		if (!trans_pcie-&gt;rx_pool[i].page)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -649,24 +656,30 @@ void iwl_pcie_rx_allocator_work(struct work_struct *data)</div><div class='ctx'> 	iwl_pcie_rx_allocator(trans_pcie-&gt;trans);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_pcie_free_bd_size(struct iwl_trans *trans, bool use_rx_td)</div><div class='add'>+static int iwl_pcie_free_bd_size(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_rx_transfer_desc *rx_td;</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		return sizeof(struct iwl_rx_transfer_desc);</div><div class='ctx'> </div><div class='del'>-	if (use_rx_td)</div><div class='del'>-		return sizeof(*rx_td);</div><div class='del'>-	else</div><div class='del'>-		return trans-&gt;trans_cfg-&gt;mq_rx_supported ? sizeof(__le64) :</div><div class='del'>-			sizeof(__le32);</div><div class='add'>+	return trans-&gt;mac_cfg-&gt;mq_rx_supported ?</div><div class='add'>+			sizeof(__le64) : sizeof(__le32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_pcie_used_bd_size(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ)</div><div class='add'>+		return sizeof(struct iwl_rx_completion_desc_bz);</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		return sizeof(struct iwl_rx_completion_desc);</div><div class='add'>+</div><div class='add'>+	return sizeof(__le32);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_pcie_free_rxq_dma(struct iwl_trans *trans,</div><div class='ctx'> 				  struct iwl_rxq *rxq)</div><div class='ctx'> {</div><div class='del'>-	struct device *dev = trans-&gt;dev;</div><div class='del'>-	bool use_rx_td = (trans-&gt;trans_cfg-&gt;device_family &gt;=</div><div class='del'>-			  IWL_DEVICE_FAMILY_AX210);</div><div class='del'>-	int free_size = iwl_pcie_free_bd_size(trans, use_rx_td);</div><div class='add'>+	int free_size = iwl_pcie_free_bd_size(trans);</div><div class='ctx'> </div><div class='ctx'> 	if (rxq-&gt;bd)</div><div class='ctx'> 		dma_free_coherent(trans-&gt;dev,</div><div class='hunk'>@@ -680,47 +693,40 @@ static void iwl_pcie_free_rxq_dma(struct iwl_trans *trans,</div><div class='ctx'> </div><div class='ctx'> 	if (rxq-&gt;used_bd)</div><div class='ctx'> 		dma_free_coherent(trans-&gt;dev,</div><div class='del'>-				  (use_rx_td ? sizeof(*rxq-&gt;cd) :</div><div class='del'>-				   sizeof(__le32)) * rxq-&gt;queue_size,</div><div class='add'>+				  iwl_pcie_used_bd_size(trans) *</div><div class='add'>+					rxq-&gt;queue_size,</div><div class='ctx'> 				  rxq-&gt;used_bd, rxq-&gt;used_bd_dma);</div><div class='ctx'> 	rxq-&gt;used_bd_dma = 0;</div><div class='ctx'> 	rxq-&gt;used_bd = NULL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210)</div><div class='del'>-		return;</div><div class='add'>+static size_t iwl_pcie_rb_stts_size(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	bool use_rx_td = (trans-&gt;mac_cfg-&gt;device_family &gt;=</div><div class='add'>+			  IWL_DEVICE_FAMILY_AX210);</div><div class='ctx'> </div><div class='del'>-	if (rxq-&gt;tr_tail)</div><div class='del'>-		dma_free_coherent(dev, sizeof(__le16),</div><div class='del'>-				  rxq-&gt;tr_tail, rxq-&gt;tr_tail_dma);</div><div class='del'>-	rxq-&gt;tr_tail_dma = 0;</div><div class='del'>-	rxq-&gt;tr_tail = NULL;</div><div class='del'>-</div><div class='del'>-	if (rxq-&gt;cr_tail)</div><div class='del'>-		dma_free_coherent(dev, sizeof(__le16),</div><div class='del'>-				  rxq-&gt;cr_tail, rxq-&gt;cr_tail_dma);</div><div class='del'>-	rxq-&gt;cr_tail_dma = 0;</div><div class='del'>-	rxq-&gt;cr_tail = NULL;</div><div class='add'>+	if (use_rx_td)</div><div class='add'>+		return sizeof(__le16);</div><div class='add'>+</div><div class='add'>+	return sizeof(struct iwl_rb_status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_pcie_alloc_rxq_dma(struct iwl_trans *trans,</div><div class='ctx'> 				  struct iwl_rxq *rxq)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	size_t rb_stts_size = iwl_pcie_rb_stts_size(trans);</div><div class='ctx'> 	struct device *dev = trans-&gt;dev;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int free_size;</div><div class='del'>-	bool use_rx_td = (trans-&gt;trans_cfg-&gt;device_family &gt;=</div><div class='del'>-			  IWL_DEVICE_FAMILY_AX210);</div><div class='del'>-	size_t rb_stts_size = use_rx_td ? sizeof(__le16) :</div><div class='del'>-			      sizeof(struct iwl_rb_status);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;rxq-&gt;lock);</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;mq_rx_supported)</div><div class='del'>-		rxq-&gt;queue_size = trans-&gt;cfg-&gt;num_rbds;</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;mq_rx_supported)</div><div class='add'>+		rxq-&gt;queue_size = iwl_trans_get_num_rbds(trans);</div><div class='ctx'> 	else</div><div class='ctx'> 		rxq-&gt;queue_size = RX_QUEUE_SIZE;</div><div class='ctx'> </div><div class='del'>-	free_size = iwl_pcie_free_bd_size(trans, use_rx_td);</div><div class='add'>+	free_size = iwl_pcie_free_bd_size(trans);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Allocate the circular buffer of Read Buffer Descriptors</div><div class='hunk'>@@ -731,38 +737,24 @@ static int iwl_pcie_alloc_rxq_dma(struct iwl_trans *trans,</div><div class='ctx'> 	if (!rxq-&gt;bd)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;mq_rx_supported) {</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;mq_rx_supported) {</div><div class='ctx'> 		rxq-&gt;used_bd = dma_alloc_coherent(dev,</div><div class='del'>-						  (use_rx_td ? sizeof(*rxq-&gt;cd) : sizeof(__le32)) * rxq-&gt;queue_size,</div><div class='add'>+						  iwl_pcie_used_bd_size(trans) *</div><div class='add'>+							rxq-&gt;queue_size,</div><div class='ctx'> 						  &amp;rxq-&gt;used_bd_dma,</div><div class='ctx'> 						  GFP_KERNEL);</div><div class='ctx'> 		if (!rxq-&gt;used_bd)</div><div class='ctx'> 			goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rxq-&gt;rb_stts = trans_pcie-&gt;base_rb_stts + rxq-&gt;id * rb_stts_size;</div><div class='add'>+	rxq-&gt;rb_stts = (u8 *)trans_pcie-&gt;base_rb_stts + rxq-&gt;id * rb_stts_size;</div><div class='ctx'> 	rxq-&gt;rb_stts_dma =</div><div class='ctx'> 		trans_pcie-&gt;base_rb_stts_dma + rxq-&gt;id * rb_stts_size;</div><div class='ctx'> </div><div class='del'>-	if (!use_rx_td)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Allocate the driver's pointer to TR tail */</div><div class='del'>-	rxq-&gt;tr_tail = dma_alloc_coherent(dev, sizeof(__le16),</div><div class='del'>-					  &amp;rxq-&gt;tr_tail_dma, GFP_KERNEL);</div><div class='del'>-	if (!rxq-&gt;tr_tail)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	/* Allocate the driver's pointer to CR tail */</div><div class='del'>-	rxq-&gt;cr_tail = dma_alloc_coherent(dev, sizeof(__le16),</div><div class='del'>-					  &amp;rxq-&gt;cr_tail_dma, GFP_KERNEL);</div><div class='del'>-	if (!rxq-&gt;cr_tail)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	for (i = 0; i &lt; trans-&gt;num_rx_queues; i++) {</div><div class='add'>+	for (i = 0; i &lt; trans-&gt;info.num_rxqs; i++) {</div><div class='ctx'> 		struct iwl_rxq *rxq = &amp;trans_pcie-&gt;rxq[i];</div><div class='ctx'> </div><div class='ctx'> 		iwl_pcie_free_rxq_dma(trans, rxq);</div><div class='hunk'>@@ -774,16 +766,14 @@ err:</div><div class='ctx'> static int iwl_pcie_rx_alloc(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	size_t rb_stts_size = iwl_pcie_rb_stts_size(trans);</div><div class='ctx'> 	struct iwl_rb_allocator *rba = &amp;trans_pcie-&gt;rba;</div><div class='ctx'> 	int i, ret;</div><div class='del'>-	size_t rb_stts_size = trans-&gt;trans_cfg-&gt;device_family &gt;=</div><div class='del'>-				IWL_DEVICE_FAMILY_AX210 ?</div><div class='del'>-			      sizeof(__le16) : sizeof(struct iwl_rb_status);</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(trans_pcie-&gt;rxq))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	trans_pcie-&gt;rxq = kcalloc(trans-&gt;num_rx_queues, sizeof(struct iwl_rxq),</div><div class='add'>+	trans_pcie-&gt;rxq = kcalloc(trans-&gt;info.num_rxqs, sizeof(struct iwl_rxq),</div><div class='ctx'> 				  GFP_KERNEL);</div><div class='ctx'> 	trans_pcie-&gt;rx_pool = kcalloc(RX_POOL_SIZE(trans_pcie-&gt;num_rx_bufs),</div><div class='ctx'> 				      sizeof(trans_pcie-&gt;rx_pool[0]),</div><div class='hunk'>@@ -806,7 +796,7 @@ static int iwl_pcie_rx_alloc(struct iwl_trans *trans)</div><div class='ctx'> 	 */</div><div class='ctx'> 	trans_pcie-&gt;base_rb_stts =</div><div class='ctx'> 			dma_alloc_coherent(trans-&gt;dev,</div><div class='del'>-					   rb_stts_size * trans-&gt;num_rx_queues,</div><div class='add'>+					   rb_stts_size * trans-&gt;info.num_rxqs,</div><div class='ctx'> 					   &amp;trans_pcie-&gt;base_rb_stts_dma,</div><div class='ctx'> 					   GFP_KERNEL);</div><div class='ctx'> 	if (!trans_pcie-&gt;base_rb_stts) {</div><div class='hunk'>@@ -814,7 +804,7 @@ static int iwl_pcie_rx_alloc(struct iwl_trans *trans)</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; trans-&gt;num_rx_queues; i++) {</div><div class='add'>+	for (i = 0; i &lt; trans-&gt;info.num_rxqs; i++) {</div><div class='ctx'> 		struct iwl_rxq *rxq = &amp;trans_pcie-&gt;rxq[i];</div><div class='ctx'> </div><div class='ctx'> 		rxq-&gt;id = i;</div><div class='hunk'>@@ -827,7 +817,7 @@ static int iwl_pcie_rx_alloc(struct iwl_trans *trans)</div><div class='ctx'> err:</div><div class='ctx'> 	if (trans_pcie-&gt;base_rb_stts) {</div><div class='ctx'> 		dma_free_coherent(trans-&gt;dev,</div><div class='del'>-				  rb_stts_size * trans-&gt;num_rx_queues,</div><div class='add'>+				  rb_stts_size * trans-&gt;info.num_rxqs,</div><div class='ctx'> 				  trans_pcie-&gt;base_rb_stts,</div><div class='ctx'> 				  trans_pcie-&gt;base_rb_stts_dma);</div><div class='ctx'> 		trans_pcie-&gt;base_rb_stts = NULL;</div><div class='hunk'>@@ -845,11 +835,10 @@ err:</div><div class='ctx'> </div><div class='ctx'> static void iwl_pcie_rx_hw_init(struct iwl_trans *trans, struct iwl_rxq *rxq)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	u32 rb_size;</div><div class='ctx'> 	const u32 rfdnlog = RX_QUEUE_SIZE_LOG; /* 256 RBDs */</div><div class='ctx'> </div><div class='del'>-	switch (trans_pcie-&gt;rx_buf_size) {</div><div class='add'>+	switch (trans-&gt;conf.rx_buf_size) {</div><div class='ctx'> 	case IWL_AMSDU_4K:</div><div class='ctx'> 		rb_size = FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_4K;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -917,7 +906,7 @@ static void iwl_pcie_rx_mq_hw_init(struct iwl_trans *trans)</div><div class='ctx'> 	u32 rb_size, enabled = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	switch (trans_pcie-&gt;rx_buf_size) {</div><div class='add'>+	switch (trans-&gt;conf.rx_buf_size) {</div><div class='ctx'> 	case IWL_AMSDU_2K:</div><div class='ctx'> 		rb_size = RFH_RXF_DMA_RB_SIZE_2K;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -943,7 +932,7 @@ static void iwl_pcie_rx_mq_hw_init(struct iwl_trans *trans)</div><div class='ctx'> 	/* disable free amd used rx queue operation */</div><div class='ctx'> 	iwl_write_prph_no_grab(trans, RFH_RXF_RXQ_ACTIVE, 0);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; trans-&gt;num_rx_queues; i++) {</div><div class='add'>+	for (i = 0; i &lt; trans-&gt;info.num_rxqs; i++) {</div><div class='ctx'> 		/* Tell device where to find RBD free table in DRAM */</div><div class='ctx'> 		iwl_write_prph64_no_grab(trans,</div><div class='ctx'> 					 RFH_Q_FRBDCB_BA_LSB(i),</div><div class='hunk'>@@ -987,7 +976,7 @@ static void iwl_pcie_rx_mq_hw_init(struct iwl_trans *trans)</div><div class='ctx'> 			       RFH_GEN_CFG_VAL(DEFAULT_RXQ_NUM, 0) |</div><div class='ctx'> 			       RFH_GEN_CFG_SERVICE_DMA_SNOOP |</div><div class='ctx'> 			       RFH_GEN_CFG_VAL(RB_CHUNK_SIZE,</div><div class='del'>-					       trans-&gt;trans_cfg-&gt;integrated ?</div><div class='add'>+					       trans-&gt;mac_cfg-&gt;integrated ?</div><div class='ctx'> 					       RFH_GEN_CFG_RB_CHUNK_SIZE_64 :</div><div class='ctx'> 					       RFH_GEN_CFG_RB_CHUNK_SIZE_128));</div><div class='ctx'> 	/* Enable the relevant rx queues */</div><div class='hunk'>@@ -1011,6 +1000,11 @@ void iwl_pcie_rx_init_rxb_lists(struct iwl_rxq *rxq)</div><div class='ctx'> </div><div class='ctx'> static int iwl_pcie_rx_handle(struct iwl_trans *trans, int queue, int budget);</div><div class='ctx'> </div><div class='add'>+static inline struct iwl_trans_pcie *iwl_netdev_to_trans_pcie(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return *(struct iwl_trans_pcie **)netdev_priv(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int iwl_pcie_napi_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_rxq *rxq = container_of(napi, struct iwl_rxq, napi);</div><div class='hunk'>@@ -1018,7 +1012,7 @@ static int iwl_pcie_napi_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	struct iwl_trans *trans;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	trans_pcie = container_of(napi-&gt;dev, struct iwl_trans_pcie, napi_dev);</div><div class='add'>+	trans_pcie = iwl_netdev_to_trans_pcie(napi-&gt;dev);</div><div class='ctx'> 	trans = trans_pcie-&gt;trans;</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_pcie_rx_handle(trans, rxq-&gt;id, budget);</div><div class='hunk'>@@ -1045,7 +1039,7 @@ static int iwl_pcie_napi_poll_msix(struct napi_struct *napi, int budget)</div><div class='ctx'> 	struct iwl_trans *trans;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	trans_pcie = container_of(napi-&gt;dev, struct iwl_trans_pcie, napi_dev);</div><div class='add'>+	trans_pcie = iwl_netdev_to_trans_pcie(napi-&gt;dev);</div><div class='ctx'> 	trans = trans_pcie-&gt;trans;</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_pcie_rx_handle(trans, rxq-&gt;id, budget);</div><div class='hunk'>@@ -1070,6 +1064,22 @@ static int iwl_pcie_napi_poll_msix(struct napi_struct *napi, int budget)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void iwl_pcie_rx_napi_sync(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!trans_pcie-&gt;rxq))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; trans-&gt;info.num_rxqs; i++) {</div><div class='add'>+		struct iwl_rxq *rxq = &amp;trans_pcie-&gt;rxq[i];</div><div class='add'>+</div><div class='add'>+		if (rxq &amp;&amp; rxq-&gt;napi.poll)</div><div class='add'>+			napi_synchronize(&amp;rxq-&gt;napi);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int _iwl_pcie_rx_init(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='hunk'>@@ -1093,13 +1103,13 @@ static int _iwl_pcie_rx_init(struct iwl_trans *trans)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;rba-&gt;rbd_empty);</div><div class='ctx'> 	spin_unlock_bh(&amp;rba-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	/* free all first - we might be reconfigured for a different size */</div><div class='add'>+	/* free all first - we overwrite everything here */</div><div class='ctx'> 	iwl_pcie_free_rbs_pool(trans);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; RX_QUEUE_SIZE; i++)</div><div class='ctx'> 		def_rxq-&gt;queue[i] = NULL;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; trans-&gt;num_rx_queues; i++) {</div><div class='add'>+	for (i = 0; i &lt; trans-&gt;info.num_rxqs; i++) {</div><div class='ctx'> 		struct iwl_rxq *rxq = &amp;trans_pcie-&gt;rxq[i];</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;rxq-&gt;lock);</div><div class='hunk'>@@ -1112,7 +1122,7 @@ static int _iwl_pcie_rx_init(struct iwl_trans *trans)</div><div class='ctx'> 		rxq-&gt;write = 0;</div><div class='ctx'> 		rxq-&gt;write_actual = 0;</div><div class='ctx'> 		memset(rxq-&gt;rb_stts, 0,</div><div class='del'>-		       (trans-&gt;trans_cfg-&gt;device_family &gt;=</div><div class='add'>+		       (trans-&gt;mac_cfg-&gt;device_family &gt;=</div><div class='ctx'> 			IWL_DEVICE_FAMILY_AX210) ?</div><div class='ctx'> 		       sizeof(__le16) : sizeof(struct iwl_rb_status));</div><div class='ctx'> </div><div class='hunk'>@@ -1126,17 +1136,17 @@ static int _iwl_pcie_rx_init(struct iwl_trans *trans)</div><div class='ctx'> 			if (trans_pcie-&gt;msix_enabled)</div><div class='ctx'> 				poll = iwl_pcie_napi_poll_msix;</div><div class='ctx'> </div><div class='del'>-			netif_napi_add(&amp;trans_pcie-&gt;napi_dev, &amp;rxq-&gt;napi,</div><div class='del'>-				       poll, NAPI_POLL_WEIGHT);</div><div class='add'>+			netif_napi_add(trans_pcie-&gt;napi_dev, &amp;rxq-&gt;napi,</div><div class='add'>+				       poll);</div><div class='ctx'> 			napi_enable(&amp;rxq-&gt;napi);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* move the pool to the default queue and allocator ownerships */</div><div class='del'>-	queue_size = trans-&gt;trans_cfg-&gt;mq_rx_supported ?</div><div class='add'>+	queue_size = trans-&gt;mac_cfg-&gt;mq_rx_supported ?</div><div class='ctx'> 			trans_pcie-&gt;num_rx_bufs - 1 : RX_QUEUE_SIZE;</div><div class='del'>-	allocator_pool_size = trans-&gt;num_rx_queues *</div><div class='add'>+	allocator_pool_size = trans-&gt;info.num_rxqs *</div><div class='ctx'> 		(RX_CLAIM_REQ_ALLOC - RX_POST_REQ_ALLOC);</div><div class='ctx'> 	num_alloc = queue_size + allocator_pool_size;</div><div class='ctx'> </div><div class='hunk'>@@ -1165,7 +1175,7 @@ int iwl_pcie_rx_init(struct iwl_trans *trans)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;mq_rx_supported)</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;mq_rx_supported)</div><div class='ctx'> 		iwl_pcie_rx_mq_hw_init(trans);</div><div class='ctx'> 	else</div><div class='ctx'> 		iwl_pcie_rx_hw_init(trans, trans_pcie-&gt;rxq);</div><div class='hunk'>@@ -1194,11 +1204,9 @@ int iwl_pcie_gen2_rx_init(struct iwl_trans *trans)</div><div class='ctx'> void iwl_pcie_rx_free(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	size_t rb_stts_size = iwl_pcie_rb_stts_size(trans);</div><div class='ctx'> 	struct iwl_rb_allocator *rba = &amp;trans_pcie-&gt;rba;</div><div class='ctx'> 	int i;</div><div class='del'>-	size_t rb_stts_size = trans-&gt;trans_cfg-&gt;device_family &gt;=</div><div class='del'>-				IWL_DEVICE_FAMILY_AX210 ?</div><div class='del'>-			      sizeof(__le16) : sizeof(struct iwl_rb_status);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * if rxq is NULL, it means that nothing has been allocated,</div><div class='hunk'>@@ -1215,14 +1223,14 @@ void iwl_pcie_rx_free(struct iwl_trans *trans)</div><div class='ctx'> </div><div class='ctx'> 	if (trans_pcie-&gt;base_rb_stts) {</div><div class='ctx'> 		dma_free_coherent(trans-&gt;dev,</div><div class='del'>-				  rb_stts_size * trans-&gt;num_rx_queues,</div><div class='add'>+				  rb_stts_size * trans-&gt;info.num_rxqs,</div><div class='ctx'> 				  trans_pcie-&gt;base_rb_stts,</div><div class='ctx'> 				  trans_pcie-&gt;base_rb_stts_dma);</div><div class='ctx'> 		trans_pcie-&gt;base_rb_stts = NULL;</div><div class='ctx'> 		trans_pcie-&gt;base_rb_stts_dma = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; trans-&gt;num_rx_queues; i++) {</div><div class='add'>+	for (i = 0; i &lt; trans-&gt;info.num_rxqs; i++) {</div><div class='ctx'> 		struct iwl_rxq *rxq = &amp;trans_pcie-&gt;rxq[i];</div><div class='ctx'> </div><div class='ctx'> 		iwl_pcie_free_rxq_dma(trans, rxq);</div><div class='hunk'>@@ -1293,7 +1301,7 @@ static void iwl_pcie_rx_handle_rb(struct iwl_trans *trans,</div><div class='ctx'> 				int i)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-	struct iwl_txq *txq = trans-&gt;txqs.txq[trans-&gt;txqs.cmd.q_id];</div><div class='add'>+	struct iwl_txq *txq = trans_pcie-&gt;txqs.txq[trans-&gt;conf.cmd_queue];</div><div class='ctx'> 	bool page_stolen = false;</div><div class='ctx'> 	int max_len = trans_pcie-&gt;rx_buf_bytes;</div><div class='ctx'> 	u32 offset = 0;</div><div class='hunk'>@@ -1335,9 +1343,7 @@ static void iwl_pcie_rx_handle_rb(struct iwl_trans *trans,</div><div class='ctx'> 			     "Q %d: cmd at offset %d: %s (%.2x.%2x, seq 0x%x)\n",</div><div class='ctx'> 			     rxq-&gt;id, offset,</div><div class='ctx'> 			     iwl_get_cmd_string(trans,</div><div class='del'>-						iwl_cmd_id(pkt-&gt;hdr.cmd,</div><div class='del'>-							   pkt-&gt;hdr.group_id,</div><div class='del'>-							   0)),</div><div class='add'>+						WIDE_ID(pkt-&gt;hdr.group_id, pkt-&gt;hdr.cmd)),</div><div class='ctx'> 			     pkt-&gt;hdr.group_id, pkt-&gt;hdr.cmd,</div><div class='ctx'> 			     le16_to_cpu(pkt-&gt;hdr.sequence));</div><div class='ctx'> </div><div class='hunk'>@@ -1347,11 +1353,10 @@ static void iwl_pcie_rx_handle_rb(struct iwl_trans *trans,</div><div class='ctx'> 		offset += ALIGN(len, FH_RSCSR_FRAME_ALIGN);</div><div class='ctx'> </div><div class='ctx'> 		/* check that what the device tells us made sense */</div><div class='del'>-		if (offset &gt; max_len)</div><div class='add'>+		if (len &lt; sizeof(*pkt) || offset &gt; max_len)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		trace_iwlwifi_dev_rx(trans-&gt;dev, trans, pkt, len);</div><div class='del'>-		trace_iwlwifi_dev_rx_data(trans-&gt;dev, trans, pkt, len);</div><div class='add'>+		maybe_trace_iwlwifi_dev_rx(trans, pkt, len);</div><div class='ctx'> </div><div class='ctx'> 		/* Reclaim a command buffer only if this packet is a response</div><div class='ctx'> 		 *   to a (driver-originated) command.</div><div class='hunk'>@@ -1363,8 +1368,8 @@ static void iwl_pcie_rx_handle_rb(struct iwl_trans *trans,</div><div class='ctx'> 		if (reclaim &amp;&amp; !pkt-&gt;hdr.group_id) {</div><div class='ctx'> 			int i;</div><div class='ctx'> </div><div class='del'>-			for (i = 0; i &lt; trans_pcie-&gt;n_no_reclaim_cmds; i++) {</div><div class='del'>-				if (trans_pcie-&gt;no_reclaim_cmds[i] ==</div><div class='add'>+			for (i = 0; i &lt; trans-&gt;conf.n_no_reclaim_cmds; i++) {</div><div class='add'>+				if (trans-&gt;conf.no_reclaim_cmds[i] ==</div><div class='ctx'> 							pkt-&gt;hdr.cmd) {</div><div class='ctx'> 					reclaim = false;</div><div class='ctx'> 					break;</div><div class='hunk'>@@ -1372,7 +1377,7 @@ static void iwl_pcie_rx_handle_rb(struct iwl_trans *trans,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (rxq-&gt;id == trans_pcie-&gt;def_rx_queue)</div><div class='add'>+		if (rxq-&gt;id == IWL_DEFAULT_RX_QUEUE)</div><div class='ctx'> 			iwl_op_mode_rx(trans-&gt;op_mode, &amp;rxq-&gt;napi,</div><div class='ctx'> 				       &amp;rxcb);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1384,7 +1389,7 @@ static void iwl_pcie_rx_handle_rb(struct iwl_trans *trans,</div><div class='ctx'> 		 * if it is true then one of the handlers took the page.</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		if (reclaim) {</div><div class='add'>+		if (reclaim &amp;&amp; txq) {</div><div class='ctx'> 			u16 sequence = le16_to_cpu(pkt-&gt;hdr.sequence);</div><div class='ctx'> 			int index = SEQ_TO_INDEX(sequence);</div><div class='ctx'> 			int cmd_index = iwl_txq_get_cmd_index(txq, index);</div><div class='hunk'>@@ -1403,7 +1408,7 @@ static void iwl_pcie_rx_handle_rb(struct iwl_trans *trans,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		page_stolen |= rxcb._page_stolen;</div><div class='del'>-		if (trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1447,18 +1452,28 @@ static struct iwl_rx_mem_buffer *iwl_pcie_get_rxb(struct iwl_trans *trans,</div><div class='ctx'> 	u16 vid;</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct iwl_rx_completion_desc) != 32);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct iwl_rx_completion_desc_bz) != 4);</div><div class='ctx'> </div><div class='del'>-	if (!trans-&gt;trans_cfg-&gt;mq_rx_supported) {</div><div class='add'>+	if (!trans-&gt;mac_cfg-&gt;mq_rx_supported) {</div><div class='ctx'> 		rxb = rxq-&gt;queue[i];</div><div class='ctx'> 		rxq-&gt;queue[i] = NULL;</div><div class='ctx'> 		return rxb;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='del'>-		vid = le16_to_cpu(rxq-&gt;cd[i].rbid);</div><div class='del'>-		*join = rxq-&gt;cd[i].flags &amp; IWL_RX_CD_FLAGS_FRAGMENTED;</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ) {</div><div class='add'>+		struct iwl_rx_completion_desc_bz *cd = rxq-&gt;used_bd;</div><div class='add'>+</div><div class='add'>+		vid = le16_to_cpu(cd[i].rbid);</div><div class='add'>+		*join = cd[i].flags &amp; IWL_RX_CD_FLAGS_FRAGMENTED;</div><div class='add'>+	} else if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+		struct iwl_rx_completion_desc *cd = rxq-&gt;used_bd;</div><div class='add'>+</div><div class='add'>+		vid = le16_to_cpu(cd[i].rbid);</div><div class='add'>+		*join = cd[i].flags &amp; IWL_RX_CD_FLAGS_FRAGMENTED;</div><div class='ctx'> 	} else {</div><div class='del'>-		vid = le32_to_cpu(rxq-&gt;bd_32[i]) &amp; 0x0FFF; /* 12-bit VID */</div><div class='add'>+		__le32 *cd = rxq-&gt;used_bd;</div><div class='add'>+</div><div class='add'>+		vid = le32_to_cpu(cd[i]) &amp; 0x0FFF; /* 12-bit VID */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!vid || vid &gt; RX_POOL_SIZE(trans_pcie-&gt;num_rx_bufs))</div><div class='hunk'>@@ -1499,7 +1514,7 @@ restart:</div><div class='ctx'> 	spin_lock(&amp;rxq-&gt;lock);</div><div class='ctx'> 	/* uCode's read index (stored in shared DRAM) indicates the last Rx</div><div class='ctx'> 	 * buffer that the driver may process (last buffer filled by ucode). */</div><div class='del'>-	r = le16_to_cpu(iwl_get_closed_rb_stts(trans, rxq)) &amp; 0x0FFF;</div><div class='add'>+	r = iwl_get_closed_rb_stts(trans, rxq);</div><div class='ctx'> 	i = rxq-&gt;read;</div><div class='ctx'> </div><div class='ctx'> 	/* W/A 9000 device step A0 wrap-around bug */</div><div class='hunk'>@@ -1590,9 +1605,6 @@ restart:</div><div class='ctx'> out:</div><div class='ctx'> 	/* Backtrack one entry */</div><div class='ctx'> 	rxq-&gt;read = i;</div><div class='del'>-	/* update cr tail with the rxq read pointer */</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='del'>-		*rxq-&gt;cr_tail = cpu_to_le16(r);</div><div class='ctx'> 	spin_unlock(&amp;rxq-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1632,25 +1644,27 @@ irqreturn_t iwl_pcie_irq_rx_msix_handler(int irq, void *dev_id)</div><div class='ctx'> 	struct msix_entry *entry = dev_id;</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = iwl_pcie_get_trans_pcie(entry);</div><div class='ctx'> 	struct iwl_trans *trans = trans_pcie-&gt;trans;</div><div class='del'>-	struct iwl_rxq *rxq = &amp;trans_pcie-&gt;rxq[entry-&gt;entry];</div><div class='add'>+	struct iwl_rxq *rxq;</div><div class='ctx'> </div><div class='ctx'> 	trace_iwlwifi_dev_irq_msix(trans-&gt;dev, entry, false, 0, 0);</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(entry-&gt;entry &gt;= trans-&gt;num_rx_queues))</div><div class='add'>+	if (WARN_ON(entry-&gt;entry &gt;= trans-&gt;info.num_rxqs))</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ONCE(!rxq,</div><div class='del'>-		      "[%d] Got MSI-X interrupt before we have Rx queues",</div><div class='del'>-		      entry-&gt;entry))</div><div class='add'>+	if (!trans_pcie-&gt;rxq) {</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			IWL_ERR(trans,</div><div class='add'>+				"[%d] Got MSI-X interrupt before we have Rx queues\n",</div><div class='add'>+				entry-&gt;entry);</div><div class='ctx'> 		return IRQ_NONE;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	rxq = &amp;trans_pcie-&gt;rxq[entry-&gt;entry];</div><div class='ctx'> 	lock_map_acquire(&amp;trans-&gt;sync_cmd_lockdep_map);</div><div class='ctx'> 	IWL_DEBUG_ISR(trans, "[%d] Got interrupt\n", entry-&gt;entry);</div><div class='ctx'> </div><div class='ctx'> 	local_bh_disable();</div><div class='del'>-	if (napi_schedule_prep(&amp;rxq-&gt;napi))</div><div class='del'>-		__napi_schedule(&amp;rxq-&gt;napi);</div><div class='del'>-	else</div><div class='add'>+	if (!napi_schedule(&amp;rxq-&gt;napi))</div><div class='ctx'> 		iwl_pcie_clear_irq(trans, entry-&gt;entry);</div><div class='ctx'> 	local_bh_enable();</div><div class='ctx'> </div><div class='hunk'>@@ -1664,33 +1678,43 @@ irqreturn_t iwl_pcie_irq_rx_msix_handler(int irq, void *dev_id)</div><div class='ctx'>  */</div><div class='ctx'> static void iwl_pcie_irq_handle_error(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* W/A for WiFi/WiMAX coex and WiMAX own the RF */</div><div class='ctx'> 	if (trans-&gt;cfg-&gt;internal_wimax_coex &amp;&amp;</div><div class='del'>-	    !trans-&gt;cfg-&gt;apmg_not_supported &amp;&amp;</div><div class='add'>+	    !trans-&gt;mac_cfg-&gt;base-&gt;apmg_not_supported &amp;&amp;</div><div class='ctx'> 	    (!(iwl_read_prph(trans, APMG_CLK_CTRL_REG) &amp;</div><div class='ctx'> 			     APMS_CLK_VAL_MRB_FUNC_MODE) ||</div><div class='ctx'> 	     (iwl_read_prph(trans, APMG_PS_CTRL_REG) &amp;</div><div class='ctx'> 			    APMG_PS_CTRL_VAL_RESET_REQ))) {</div><div class='ctx'> 		clear_bit(STATUS_SYNC_HCMD_ACTIVE, &amp;trans-&gt;status);</div><div class='ctx'> 		iwl_op_mode_wimax_active(trans-&gt;op_mode);</div><div class='del'>-		wake_up(&amp;trans-&gt;wait_command_queue);</div><div class='add'>+		wake_up(&amp;trans_pcie-&gt;wait_command_queue);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues; i++) {</div><div class='del'>-		if (!trans-&gt;txqs.txq[i])</div><div class='add'>+	for (i = 0; i &lt; trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues; i++) {</div><div class='add'>+		if (!trans_pcie-&gt;txqs.txq[i])</div><div class='ctx'> 			continue;</div><div class='del'>-		del_timer(&amp;trans-&gt;txqs.txq[i]-&gt;stuck_timer);</div><div class='add'>+		timer_delete(&amp;trans_pcie-&gt;txqs.txq[i]-&gt;stuck_timer);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_SC) {</div><div class='add'>+		u32 val = iwl_read32(trans, CSR_IPC_STATE);</div><div class='add'>+</div><div class='add'>+		if (val &amp; CSR_IPC_STATE_TOP_RESET_REQ) {</div><div class='add'>+			IWL_ERR(trans, "FW requested TOP reset for FSEQ\n");</div><div class='add'>+			trans-&gt;do_top_reset = 1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* The STATUS_FW_ERROR bit is set in this function. This must happen</div><div class='ctx'> 	 * before we wake up the command caller, to ensure a proper cleanup. */</div><div class='del'>-	iwl_trans_fw_error(trans);</div><div class='add'>+	iwl_trans_fw_error(trans, IWL_ERR_TYPE_IRQ);</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(STATUS_SYNC_HCMD_ACTIVE, &amp;trans-&gt;status);</div><div class='del'>-	wake_up(&amp;trans-&gt;wait_command_queue);</div><div class='add'>+	wake_up(&amp;trans_pcie-&gt;wait_command_queue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 iwl_pcie_int_cause_non_ict(struct iwl_trans *trans)</div><div class='hunk'>@@ -1773,7 +1797,7 @@ static u32 iwl_pcie_int_cause_ict(struct iwl_trans *trans)</div><div class='ctx'> 	return inta;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_pcie_handle_rfkill_irq(struct iwl_trans *trans)</div><div class='add'>+void iwl_pcie_handle_rfkill_irq(struct iwl_trans *trans, bool from_irq)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	struct isr_statistics *isr_stats = &amp;trans_pcie-&gt;isr_stats;</div><div class='hunk'>@@ -1797,7 +1821,7 @@ void iwl_pcie_handle_rfkill_irq(struct iwl_trans *trans)</div><div class='ctx'> 	isr_stats-&gt;rfkill++;</div><div class='ctx'> </div><div class='ctx'> 	if (prev != report)</div><div class='del'>-		iwl_trans_pcie_rf_kill(trans, report);</div><div class='add'>+		iwl_trans_pcie_rf_kill(trans, report, from_irq);</div><div class='ctx'> 	mutex_unlock(&amp;trans_pcie-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (hw_rfkill) {</div><div class='hunk'>@@ -1805,7 +1829,7 @@ void iwl_pcie_handle_rfkill_irq(struct iwl_trans *trans)</div><div class='ctx'> 				       &amp;trans-&gt;status))</div><div class='ctx'> 			IWL_DEBUG_RF_KILL(trans,</div><div class='ctx'> 					  "Rfkill while SYNC HCMD in flight\n");</div><div class='del'>-		wake_up(&amp;trans-&gt;wait_command_queue);</div><div class='add'>+		wake_up(&amp;trans_pcie-&gt;wait_command_queue);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		clear_bit(STATUS_RFKILL_HW, &amp;trans-&gt;status);</div><div class='ctx'> 		if (trans_pcie-&gt;opmode_down)</div><div class='hunk'>@@ -1813,6 +1837,59 @@ void iwl_pcie_handle_rfkill_irq(struct iwl_trans *trans)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void iwl_trans_pcie_handle_reset_interrupt(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	u32 state;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_SC) {</div><div class='add'>+		u32 val = iwl_read32(trans, CSR_IPC_STATE);</div><div class='add'>+</div><div class='add'>+		state = u32_get_bits(val, CSR_IPC_STATE_RESET);</div><div class='add'>+		IWL_DEBUG_ISR(trans, "IPC state = 0x%x/%d\n", val, state);</div><div class='add'>+	} else {</div><div class='add'>+		state = CSR_IPC_STATE_RESET_SW_READY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case CSR_IPC_STATE_RESET_SW_READY:</div><div class='add'>+		if (trans_pcie-&gt;fw_reset_state == FW_RESET_REQUESTED) {</div><div class='add'>+			IWL_DEBUG_ISR(trans, "Reset flow completed\n");</div><div class='add'>+			trans_pcie-&gt;fw_reset_state = FW_RESET_OK;</div><div class='add'>+			wake_up(&amp;trans_pcie-&gt;fw_reset_waitq);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='add'>+	case CSR_IPC_STATE_RESET_TOP_READY:</div><div class='add'>+		if (trans_pcie-&gt;fw_reset_state == FW_RESET_TOP_REQUESTED) {</div><div class='add'>+			IWL_DEBUG_ISR(trans, "TOP Reset continues\n");</div><div class='add'>+			trans_pcie-&gt;fw_reset_state = FW_RESET_OK;</div><div class='add'>+			wake_up(&amp;trans_pcie-&gt;fw_reset_waitq);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='add'>+	case CSR_IPC_STATE_RESET_NONE:</div><div class='add'>+		IWL_FW_CHECK_FAILED(trans,</div><div class='add'>+				    "Invalid reset interrupt (state=%d)!\n",</div><div class='add'>+				    state);</div><div class='add'>+		break;</div><div class='add'>+	case CSR_IPC_STATE_RESET_TOP_FOLLOWER:</div><div class='add'>+		if (trans_pcie-&gt;fw_reset_state == FW_RESET_REQUESTED) {</div><div class='add'>+			/* if we were in reset, wake that up */</div><div class='add'>+			IWL_INFO(trans,</div><div class='add'>+				 "TOP reset from BT while doing reset\n");</div><div class='add'>+			trans_pcie-&gt;fw_reset_state = FW_RESET_OK;</div><div class='add'>+			wake_up(&amp;trans_pcie-&gt;fw_reset_waitq);</div><div class='add'>+		} else {</div><div class='add'>+			IWL_INFO(trans, "TOP reset from BT\n");</div><div class='add'>+			trans-&gt;state = IWL_TRANS_NO_FW;</div><div class='add'>+			iwl_trans_schedule_reset(trans,</div><div class='add'>+						 IWL_ERR_TYPE_TOP_RESET_BY_BT);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans *trans = dev_id;</div><div class='hunk'>@@ -1866,7 +1943,7 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(inta == 0xFFFFFFFF || (inta &amp; 0xFFFFFFF0) == 0xa5a5a5a0)) {</div><div class='add'>+	if (unlikely(inta == 0xFFFFFFFF || iwl_trans_is_hw_error_value(inta))) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Hardware disappeared. It might have</div><div class='ctx'> 		 * already raised an interrupt.</div><div class='hunk'>@@ -1921,7 +1998,7 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)</div><div class='ctx'> 	if (inta &amp; CSR_INT_BIT_ALIVE) {</div><div class='ctx'> 		IWL_DEBUG_ISR(trans, "Alive interrupt\n");</div><div class='ctx'> 		isr_stats-&gt;alive++;</div><div class='del'>-		if (trans-&gt;trans_cfg-&gt;gen2) {</div><div class='add'>+		if (trans-&gt;mac_cfg-&gt;gen2) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * We can restock, since firmware configured</div><div class='ctx'> 			 * the RFH</div><div class='hunk'>@@ -1932,12 +2009,17 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)</div><div class='ctx'> 		handled |= CSR_INT_BIT_ALIVE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (inta &amp; CSR_INT_BIT_RESET_DONE) {</div><div class='add'>+		iwl_trans_pcie_handle_reset_interrupt(trans);</div><div class='add'>+		handled |= CSR_INT_BIT_RESET_DONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Safely ignore these bits for debug checks below */</div><div class='ctx'> 	inta &amp;= ~(CSR_INT_BIT_SCD | CSR_INT_BIT_ALIVE);</div><div class='ctx'> </div><div class='ctx'> 	/* HW RF KILL switch toggled */</div><div class='ctx'> 	if (inta &amp; CSR_INT_BIT_RF_KILL) {</div><div class='del'>-		iwl_pcie_handle_rfkill_irq(trans);</div><div class='add'>+		iwl_pcie_handle_rfkill_irq(trans, true);</div><div class='ctx'> 		handled |= CSR_INT_BIT_RF_KILL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1953,7 +2035,12 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)</div><div class='ctx'> 		IWL_ERR(trans, "Microcode SW error detected. "</div><div class='ctx'> 			" Restarting 0x%X.\n", inta);</div><div class='ctx'> 		isr_stats-&gt;sw++;</div><div class='del'>-		iwl_pcie_irq_handle_error(trans);</div><div class='add'>+		if (trans_pcie-&gt;fw_reset_state == FW_RESET_REQUESTED) {</div><div class='add'>+			trans_pcie-&gt;fw_reset_state = FW_RESET_ERROR;</div><div class='add'>+			wake_up(&amp;trans_pcie-&gt;fw_reset_waitq);</div><div class='add'>+		} else {</div><div class='add'>+			iwl_pcie_irq_handle_error(trans);</div><div class='add'>+		}</div><div class='ctx'> 		handled |= CSR_INT_BIT_SW_ERR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1985,7 +2072,7 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)</div><div class='ctx'> 				CSR_INT, CSR_INT_BIT_RX_PERIODIC);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Sending RX interrupt require many steps to be done in the</div><div class='del'>-		 * the device:</div><div class='add'>+		 * device:</div><div class='ctx'> 		 * 1- write interrupt to current index in ICT table.</div><div class='ctx'> 		 * 2- dma RX frame.</div><div class='ctx'> 		 * 3- update RX shared data to indicate last write index.</div><div class='hunk'>@@ -2029,6 +2116,11 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)</div><div class='ctx'> 		/* Wake up uCode load routine, now that load is complete */</div><div class='ctx'> 		trans_pcie-&gt;ucode_write_complete = true;</div><div class='ctx'> 		wake_up(&amp;trans_pcie-&gt;ucode_write_waitq);</div><div class='add'>+		/* Wake up IMR write routine, now that write to SRAM is complete */</div><div class='add'>+		if (trans_pcie-&gt;imr_status == IMR_D2S_REQUESTED) {</div><div class='add'>+			trans_pcie-&gt;imr_status = IMR_D2S_COMPLETED;</div><div class='add'>+			wake_up(&amp;trans_pcie-&gt;ucode_write_waitq);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (inta &amp; ~handled) {</div><div class='hunk'>@@ -2054,7 +2146,7 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)</div><div class='ctx'> 			iwl_enable_rfkill_int(trans);</div><div class='ctx'> 		/* Re-enable the ALIVE / Rx interrupt if it occurred */</div><div class='ctx'> 		else if (handled &amp; (CSR_INT_BIT_ALIVE | CSR_INT_BIT_FH_RX))</div><div class='del'>-			iwl_enable_fw_load_int_ctx_info(trans);</div><div class='add'>+			iwl_enable_fw_load_int_ctx_info(trans, false);</div><div class='ctx'> 		spin_unlock_bh(&amp;trans_pcie-&gt;irq_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2180,6 +2272,7 @@ irqreturn_t iwl_pcie_irq_msix_handler(int irq, void *dev_id)</div><div class='ctx'> 	u32 inta_fh_msk = ~MSIX_FH_INT_CAUSES_DATA_QUEUE;</div><div class='ctx'> 	u32 inta_fh, inta_hw;</div><div class='ctx'> 	bool polling = false;</div><div class='add'>+	bool sw_err;</div><div class='ctx'> </div><div class='ctx'> 	if (trans_pcie-&gt;shared_vec_mask &amp; IWL_SHARED_IRQ_NON_RX)</div><div class='ctx'> 		inta_fh_msk |= MSIX_FH_INT_CAUSES_Q0;</div><div class='hunk'>@@ -2241,7 +2334,17 @@ irqreturn_t iwl_pcie_irq_msix_handler(int irq, void *dev_id)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* This "Tx" DMA channel is used only for loading uCode */</div><div class='del'>-	if (inta_fh &amp; MSIX_FH_INT_CAUSES_D2S_CH0_NUM) {</div><div class='add'>+	if (inta_fh &amp; MSIX_FH_INT_CAUSES_D2S_CH0_NUM &amp;&amp;</div><div class='add'>+	    trans_pcie-&gt;imr_status == IMR_D2S_REQUESTED) {</div><div class='add'>+		IWL_DEBUG_ISR(trans, "IMR Complete interrupt\n");</div><div class='add'>+		isr_stats-&gt;tx++;</div><div class='add'>+</div><div class='add'>+		/* Wake up IMR routine once write to SRAM is complete */</div><div class='add'>+		if (trans_pcie-&gt;imr_status == IMR_D2S_REQUESTED) {</div><div class='add'>+			trans_pcie-&gt;imr_status = IMR_D2S_COMPLETED;</div><div class='add'>+			wake_up(&amp;trans_pcie-&gt;ucode_write_waitq);</div><div class='add'>+		}</div><div class='add'>+	} else if (inta_fh &amp; MSIX_FH_INT_CAUSES_D2S_CH0_NUM) {</div><div class='ctx'> 		IWL_DEBUG_ISR(trans, "uCode load interrupt\n");</div><div class='ctx'> 		isr_stats-&gt;tx++;</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -2250,16 +2353,52 @@ irqreturn_t iwl_pcie_irq_msix_handler(int irq, void *dev_id)</div><div class='ctx'> 		 */</div><div class='ctx'> 		trans_pcie-&gt;ucode_write_complete = true;</div><div class='ctx'> 		wake_up(&amp;trans_pcie-&gt;ucode_write_waitq);</div><div class='add'>+</div><div class='add'>+		/* Wake up IMR routine once write to SRAM is complete */</div><div class='add'>+		if (trans_pcie-&gt;imr_status == IMR_D2S_REQUESTED) {</div><div class='add'>+			trans_pcie-&gt;imr_status = IMR_D2S_COMPLETED;</div><div class='add'>+			wake_up(&amp;trans_pcie-&gt;ucode_write_waitq);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ)</div><div class='add'>+		sw_err = inta_hw &amp; MSIX_HW_INT_CAUSES_REG_SW_ERR_BZ;</div><div class='add'>+	else</div><div class='add'>+		sw_err = inta_hw &amp; MSIX_HW_INT_CAUSES_REG_SW_ERR;</div><div class='add'>+</div><div class='add'>+	if (inta_hw &amp; MSIX_HW_INT_CAUSES_REG_TOP_FATAL_ERR) {</div><div class='add'>+		IWL_ERR(trans, "TOP Fatal error detected, inta_hw=0x%x.\n",</div><div class='add'>+			inta_hw);</div><div class='add'>+		if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ) {</div><div class='add'>+			trans-&gt;request_top_reset = 1;</div><div class='add'>+			iwl_op_mode_nic_error(trans-&gt;op_mode,</div><div class='add'>+					      IWL_ERR_TYPE_TOP_FATAL_ERROR);</div><div class='add'>+			iwl_trans_schedule_reset(trans,</div><div class='add'>+						 IWL_ERR_TYPE_TOP_FATAL_ERROR);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Error detected by uCode */</div><div class='del'>-	if ((inta_fh &amp; MSIX_FH_INT_CAUSES_FH_ERR) ||</div><div class='del'>-	    (inta_hw &amp; MSIX_HW_INT_CAUSES_REG_SW_ERR)) {</div><div class='add'>+	if ((inta_fh &amp; MSIX_FH_INT_CAUSES_FH_ERR) || sw_err) {</div><div class='ctx'> 		IWL_ERR(trans,</div><div class='ctx'> 			"Microcode SW error detected. Restarting 0x%X.\n",</div><div class='ctx'> 			inta_fh);</div><div class='ctx'> 		isr_stats-&gt;sw++;</div><div class='del'>-		iwl_pcie_irq_handle_error(trans);</div><div class='add'>+		/* during FW reset flow report errors from there */</div><div class='add'>+		if (trans_pcie-&gt;imr_status == IMR_D2S_REQUESTED) {</div><div class='add'>+			trans_pcie-&gt;imr_status = IMR_D2S_ERROR;</div><div class='add'>+			wake_up(&amp;trans_pcie-&gt;imr_waitq);</div><div class='add'>+		} else if (trans_pcie-&gt;fw_reset_state == FW_RESET_REQUESTED) {</div><div class='add'>+			trans_pcie-&gt;fw_reset_state = FW_RESET_ERROR;</div><div class='add'>+			wake_up(&amp;trans_pcie-&gt;fw_reset_waitq);</div><div class='add'>+		} else {</div><div class='add'>+			iwl_pcie_irq_handle_error(trans);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (trans_pcie-&gt;sx_state == IWL_SX_WAITING) {</div><div class='add'>+			trans_pcie-&gt;sx_state = IWL_SX_ERROR;</div><div class='add'>+			wake_up(&amp;trans_pcie-&gt;sx_waitq);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* After checking FH register check HW register */</div><div class='hunk'>@@ -2280,22 +2419,34 @@ irqreturn_t iwl_pcie_irq_msix_handler(int irq, void *dev_id)</div><div class='ctx'> 	if (inta_hw &amp; MSIX_HW_INT_CAUSES_REG_ALIVE) {</div><div class='ctx'> 		IWL_DEBUG_ISR(trans, "Alive interrupt\n");</div><div class='ctx'> 		isr_stats-&gt;alive++;</div><div class='del'>-		if (trans-&gt;trans_cfg-&gt;gen2) {</div><div class='add'>+		if (trans-&gt;mac_cfg-&gt;gen2) {</div><div class='ctx'> 			/* We can restock, since firmware configured the RFH */</div><div class='ctx'> 			iwl_pcie_rxmq_restock(trans, trans_pcie-&gt;rxq);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (inta_hw &amp; MSIX_HW_INT_CAUSES_REG_WAKEUP) {</div><div class='add'>+	/*</div><div class='add'>+	 * In some rare cases when the HW is in a bad state, we may</div><div class='add'>+	 * get this interrupt too early, when prph_info is still NULL.</div><div class='add'>+	 * So make sure that it's not NULL to prevent crashing.</div><div class='add'>+	 */</div><div class='add'>+	if (inta_hw &amp; MSIX_HW_INT_CAUSES_REG_WAKEUP &amp;&amp; trans_pcie-&gt;prph_info) {</div><div class='ctx'> 		u32 sleep_notif =</div><div class='ctx'> 			le32_to_cpu(trans_pcie-&gt;prph_info-&gt;sleep_notif);</div><div class='add'>+</div><div class='ctx'> 		if (sleep_notif == IWL_D3_SLEEP_STATUS_SUSPEND ||</div><div class='ctx'> 		    sleep_notif == IWL_D3_SLEEP_STATUS_RESUME) {</div><div class='ctx'> 			IWL_DEBUG_ISR(trans,</div><div class='ctx'> 				      "Sx interrupt: sleep notification = 0x%x\n",</div><div class='ctx'> 				      sleep_notif);</div><div class='del'>-			trans_pcie-&gt;sx_complete = true;</div><div class='del'>-			wake_up(&amp;trans_pcie-&gt;sx_waitq);</div><div class='add'>+			if (trans_pcie-&gt;sx_state == IWL_SX_WAITING) {</div><div class='add'>+				trans_pcie-&gt;sx_state = IWL_SX_COMPLETE;</div><div class='add'>+				wake_up(&amp;trans_pcie-&gt;sx_waitq);</div><div class='add'>+			} else {</div><div class='add'>+				IWL_ERR(trans,</div><div class='add'>+					"unexpected Sx interrupt (0x%x)\n",</div><div class='add'>+					sleep_notif);</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* uCode wakes up after power-down sleep */</div><div class='ctx'> 			IWL_DEBUG_ISR(trans, "Wakeup interrupt\n");</div><div class='hunk'>@@ -2314,7 +2465,7 @@ irqreturn_t iwl_pcie_irq_msix_handler(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	/* HW RF KILL switch toggled */</div><div class='ctx'> 	if (inta_hw &amp; MSIX_HW_INT_CAUSES_REG_RF_KILL)</div><div class='del'>-		iwl_pcie_handle_rfkill_irq(trans);</div><div class='add'>+		iwl_pcie_handle_rfkill_irq(trans, true);</div><div class='ctx'> </div><div class='ctx'> 	if (inta_hw &amp; MSIX_HW_INT_CAUSES_REG_HW_ERR) {</div><div class='ctx'> 		IWL_ERR(trans,</div><div class='hunk'>@@ -2325,11 +2476,8 @@ irqreturn_t iwl_pcie_irq_msix_handler(int irq, void *dev_id)</div><div class='ctx'> 		iwl_pcie_irq_handle_error(trans);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (inta_hw &amp; MSIX_HW_INT_CAUSES_REG_RESET_DONE) {</div><div class='del'>-		IWL_DEBUG_ISR(trans, "Reset flow completed\n");</div><div class='del'>-		trans_pcie-&gt;fw_reset_done = true;</div><div class='del'>-		wake_up(&amp;trans_pcie-&gt;fw_reset_waitq);</div><div class='del'>-	}</div><div class='add'>+	if (inta_hw &amp; MSIX_HW_INT_CAUSES_REG_RESET_DONE)</div><div class='add'>+		iwl_trans_pcie_handle_reset_interrupt(trans);</div><div class='ctx'> </div><div class='ctx'> 	if (!polling)</div><div class='ctx'> 		iwl_pcie_clear_irq(trans, entry-&gt;entry);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c<br/>new file mode 100644<br/>index 000000000000..b15c5d486527<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c</a></div><div class='hunk'>@@ -0,0 +1,654 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2017 Intel Deutschland GmbH</div><div class='add'>+ * Copyright (C) 2018-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include "iwl-trans.h"</div><div class='add'>+#include "iwl-prph.h"</div><div class='add'>+#include "pcie/iwl-context-info.h"</div><div class='add'>+#include "pcie/iwl-context-info-v2.h"</div><div class='add'>+#include "internal.h"</div><div class='add'>+#include "fw/dbg.h"</div><div class='add'>+</div><div class='add'>+#define FW_RESET_TIMEOUT (HZ / 5)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Start up NIC's basic functionality after it has been reset</div><div class='add'>+ * (e.g. after platform boot, or shutdown via iwl_pcie_apm_stop())</div><div class='add'>+ * NOTE:  This does not load uCode nor start the embedded processor</div><div class='add'>+ */</div><div class='add'>+int iwl_pcie_gen2_apm_init(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(trans, "Init card's basic functions\n");</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Use "set_bit" below rather than "write", to preserve any hardware</div><div class='add'>+	 * bits already set by default after reset.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disable L0s without affecting L1;</div><div class='add'>+	 * don't wait for ICH L0s (ICH bug W/A)</div><div class='add'>+	 */</div><div class='add'>+	iwl_set_bit(trans, CSR_GIO_CHICKEN_BITS,</div><div class='add'>+		    CSR_GIO_CHICKEN_BITS_REG_BIT_L1A_NO_L0S_RX);</div><div class='add'>+</div><div class='add'>+	/* Set FH wait threshold to maximum (HW error during stress W/A) */</div><div class='add'>+	iwl_set_bit(trans, CSR_DBG_HPET_MEM_REG, CSR_DBG_HPET_MEM_REG_VAL);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable HAP INTA (interrupt from management bus) to</div><div class='add'>+	 * wake device's PCI Express link L1a -&gt; L0s</div><div class='add'>+	 */</div><div class='add'>+	iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+		    CSR_HW_IF_CONFIG_REG_HAP_WAKE);</div><div class='add'>+</div><div class='add'>+	iwl_pcie_apm_config(trans);</div><div class='add'>+</div><div class='add'>+	ret = iwl_trans_activate_nic(trans);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	set_bit(STATUS_DEVICE_ENABLED, &amp;trans-&gt;status);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_pcie_gen2_apm_stop(struct iwl_trans *trans, bool op_mode_leave)</div><div class='add'>+{</div><div class='add'>+	IWL_DEBUG_INFO(trans, "Stop card, put in low power state\n");</div><div class='add'>+</div><div class='add'>+	if (op_mode_leave) {</div><div class='add'>+		if (!test_bit(STATUS_DEVICE_ENABLED, &amp;trans-&gt;status))</div><div class='add'>+			iwl_pcie_gen2_apm_init(trans);</div><div class='add'>+</div><div class='add'>+		/* inform ME that we are leaving */</div><div class='add'>+		iwl_set_bit(trans, CSR_DBG_LINK_PWR_MGMT_REG,</div><div class='add'>+			    CSR_RESET_LINK_PWR_MGMT_DISABLED);</div><div class='add'>+		iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+			    CSR_HW_IF_CONFIG_REG_WAKE_ME |</div><div class='add'>+			    CSR_HW_IF_CONFIG_REG_WAKE_ME_PCIE_OWNER_EN);</div><div class='add'>+		mdelay(1);</div><div class='add'>+		iwl_clear_bit(trans, CSR_DBG_LINK_PWR_MGMT_REG,</div><div class='add'>+			      CSR_RESET_LINK_PWR_MGMT_DISABLED);</div><div class='add'>+		mdelay(5);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clear_bit(STATUS_DEVICE_ENABLED, &amp;trans-&gt;status);</div><div class='add'>+</div><div class='add'>+	/* Stop device's DMA activity */</div><div class='add'>+	iwl_pcie_apm_stop_master(trans);</div><div class='add'>+</div><div class='add'>+	iwl_trans_pcie_sw_reset(trans, false);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clear "initialization complete" bit to move adapter from</div><div class='add'>+	 * D0A* (powered-up Active) --&gt; D0U* (Uninitialized) state.</div><div class='add'>+	 */</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ)</div><div class='add'>+		iwl_clear_bit(trans, CSR_GP_CNTRL,</div><div class='add'>+			      CSR_GP_CNTRL_REG_FLAG_MAC_INIT);</div><div class='add'>+	else</div><div class='add'>+		iwl_clear_bit(trans, CSR_GP_CNTRL,</div><div class='add'>+			      CSR_GP_CNTRL_REG_FLAG_INIT_DONE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_trans_pcie_fw_reset_handshake(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	trans_pcie-&gt;fw_reset_state = FW_RESET_REQUESTED;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		iwl_write_umac_prph(trans, UREG_NIC_SET_NMI_DRIVER,</div><div class='add'>+				    UREG_NIC_SET_NMI_DRIVER_RESET_HANDSHAKE);</div><div class='add'>+	else if (trans-&gt;mac_cfg-&gt;device_family == IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		iwl_write_umac_prph(trans, UREG_DOORBELL_TO_ISR6,</div><div class='add'>+				    UREG_DOORBELL_TO_ISR6_RESET_HANDSHAKE);</div><div class='add'>+	else</div><div class='add'>+		iwl_write32(trans, CSR_DOORBELL_VECTOR,</div><div class='add'>+			    UREG_DOORBELL_TO_ISR6_RESET_HANDSHAKE);</div><div class='add'>+</div><div class='add'>+	/* wait 200ms */</div><div class='add'>+	ret = wait_event_timeout(trans_pcie-&gt;fw_reset_waitq,</div><div class='add'>+				 trans_pcie-&gt;fw_reset_state != FW_RESET_REQUESTED,</div><div class='add'>+				 FW_RESET_TIMEOUT);</div><div class='add'>+	if (!ret || trans_pcie-&gt;fw_reset_state == FW_RESET_ERROR) {</div><div class='add'>+		bool reset_done;</div><div class='add'>+		u32 inta_hw;</div><div class='add'>+</div><div class='add'>+		if (trans_pcie-&gt;msix_enabled) {</div><div class='add'>+			inta_hw = iwl_read32(trans, CSR_MSIX_HW_INT_CAUSES_AD);</div><div class='add'>+			reset_done =</div><div class='add'>+				inta_hw &amp; MSIX_HW_INT_CAUSES_REG_RESET_DONE;</div><div class='add'>+		} else {</div><div class='add'>+			inta_hw = iwl_read32(trans, CSR_INT);</div><div class='add'>+			reset_done = inta_hw &amp; CSR_INT_BIT_RESET_DONE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		IWL_ERR(trans,</div><div class='add'>+			"timeout waiting for FW reset ACK (inta_hw=0x%x, reset_done %d)\n",</div><div class='add'>+			inta_hw, reset_done);</div><div class='add'>+</div><div class='add'>+		if (!reset_done) {</div><div class='add'>+			struct iwl_fw_error_dump_mode mode = {</div><div class='add'>+				.type = IWL_ERR_TYPE_RESET_HS_TIMEOUT,</div><div class='add'>+				.context = IWL_ERR_CONTEXT_FROM_OPMODE,</div><div class='add'>+			};</div><div class='add'>+			iwl_op_mode_nic_error(trans-&gt;op_mode,</div><div class='add'>+					      IWL_ERR_TYPE_RESET_HS_TIMEOUT);</div><div class='add'>+			iwl_op_mode_dump_error(trans-&gt;op_mode, &amp;mode);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trans_pcie-&gt;fw_reset_state = FW_RESET_IDLE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;trans_pcie-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (trans_pcie-&gt;is_down)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;state &gt;= IWL_TRANS_FW_STARTED &amp;&amp;</div><div class='add'>+	    trans-&gt;conf.fw_reset_handshake) {</div><div class='add'>+		/*</div><div class='add'>+		 * Reset handshake can dump firmware on timeout, but that</div><div class='add'>+		 * should assume that the firmware is already dead.</div><div class='add'>+		 */</div><div class='add'>+		trans-&gt;state = IWL_TRANS_NO_FW;</div><div class='add'>+		iwl_trans_pcie_fw_reset_handshake(trans);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trans_pcie-&gt;is_down = true;</div><div class='add'>+</div><div class='add'>+	/* tell the device to stop sending interrupts */</div><div class='add'>+	iwl_disable_interrupts(trans);</div><div class='add'>+</div><div class='add'>+	/* device going down, Stop using ICT table */</div><div class='add'>+	iwl_pcie_disable_ict(trans);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If a HW restart happens during firmware loading,</div><div class='add'>+	 * then the firmware loading might call this function</div><div class='add'>+	 * and later it might be called again due to the</div><div class='add'>+	 * restart. So don't process again if the device is</div><div class='add'>+	 * already dead.</div><div class='add'>+	 */</div><div class='add'>+	if (test_and_clear_bit(STATUS_DEVICE_ENABLED, &amp;trans-&gt;status)) {</div><div class='add'>+		IWL_DEBUG_INFO(trans,</div><div class='add'>+			       "DEVICE_ENABLED bit was set and is now cleared\n");</div><div class='add'>+		iwl_pcie_synchronize_irqs(trans);</div><div class='add'>+		iwl_pcie_rx_napi_sync(trans);</div><div class='add'>+		iwl_txq_gen2_tx_free(trans);</div><div class='add'>+		iwl_pcie_rx_stop(trans);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_pcie_ctxt_info_free_paging(trans);</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		iwl_pcie_ctxt_info_v2_free(trans, false);</div><div class='add'>+	else</div><div class='add'>+		iwl_pcie_ctxt_info_free(trans);</div><div class='add'>+</div><div class='add'>+	/* Stop the device, and put it in low power state */</div><div class='add'>+	iwl_pcie_gen2_apm_stop(trans, false);</div><div class='add'>+</div><div class='add'>+	/* re-take ownership to prevent other users from stealing the device */</div><div class='add'>+	iwl_trans_pcie_sw_reset(trans, true);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Upon stop, the IVAR table gets erased, so msi-x won't</div><div class='add'>+	 * work. This causes a bug in RF-KILL flows, since the interrupt</div><div class='add'>+	 * that enables radio won't fire on the correct irq, and the</div><div class='add'>+	 * driver won't be able to handle the interrupt.</div><div class='add'>+	 * Configure the IVAR table again after reset.</div><div class='add'>+	 */</div><div class='add'>+	iwl_pcie_conf_msix_hw(trans_pcie);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Upon stop, the APM issues an interrupt if HW RF kill is set.</div><div class='add'>+	 * This is a bug in certain verions of the hardware.</div><div class='add'>+	 * Certain devices also keep sending HW RF kill interrupt all</div><div class='add'>+	 * the time, unless the interrupt is ACKed even if the interrupt</div><div class='add'>+	 * should be masked. Re-ACK all the interrupts here.</div><div class='add'>+	 */</div><div class='add'>+	iwl_disable_interrupts(trans);</div><div class='add'>+</div><div class='add'>+	/* clear all status bits */</div><div class='add'>+	clear_bit(STATUS_SYNC_HCMD_ACTIVE, &amp;trans-&gt;status);</div><div class='add'>+	clear_bit(STATUS_INT_ENABLED, &amp;trans-&gt;status);</div><div class='add'>+	clear_bit(STATUS_TPOWER_PMI, &amp;trans-&gt;status);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Even if we stop the HW, we still want the RF kill</div><div class='add'>+	 * interrupt</div><div class='add'>+	 */</div><div class='add'>+	iwl_enable_rfkill_int(trans);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	bool was_in_rfkill;</div><div class='add'>+</div><div class='add'>+	iwl_op_mode_time_point(trans-&gt;op_mode,</div><div class='add'>+			       IWL_FW_INI_TIME_POINT_HOST_DEVICE_DISABLE,</div><div class='add'>+			       NULL);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;trans_pcie-&gt;mutex);</div><div class='add'>+	trans_pcie-&gt;opmode_down = true;</div><div class='add'>+	was_in_rfkill = test_bit(STATUS_RFKILL_OPMODE, &amp;trans-&gt;status);</div><div class='add'>+	_iwl_trans_pcie_gen2_stop_device(trans);</div><div class='add'>+	iwl_trans_pcie_handle_stop_rfkill(trans, was_in_rfkill);</div><div class='add'>+	mutex_unlock(&amp;trans_pcie-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_pcie_gen2_nic_init(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	int queue_size = max_t(u32, IWL_CMD_QUEUE_SIZE,</div><div class='add'>+			       trans-&gt;mac_cfg-&gt;base-&gt;min_txq_size);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* TODO: most of the logic can be removed in A0 - but not in Z0 */</div><div class='add'>+	spin_lock_bh(&amp;trans_pcie-&gt;irq_lock);</div><div class='add'>+	ret = iwl_pcie_gen2_apm_init(trans);</div><div class='add'>+	spin_unlock_bh(&amp;trans_pcie-&gt;irq_lock);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	iwl_op_mode_nic_config(trans-&gt;op_mode);</div><div class='add'>+</div><div class='add'>+	/* Allocate the RX queue, or reset if it is already allocated */</div><div class='add'>+	if (iwl_pcie_gen2_rx_init(trans))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Allocate or reset and init all Tx and Command queues */</div><div class='add'>+	if (iwl_txq_gen2_init(trans, trans-&gt;conf.cmd_queue, queue_size))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* enable shadow regs in HW */</div><div class='add'>+	iwl_set_bit(trans, CSR_MAC_SHADOW_REG_CTRL, 0x800FFFFF);</div><div class='add'>+	IWL_DEBUG_INFO(trans, "Enabling shadow registers in device\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_pcie_get_rf_name(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	char *buf = trans_pcie-&gt;rf_name;</div><div class='add'>+	size_t buflen = sizeof(trans_pcie-&gt;rf_name);</div><div class='add'>+	size_t pos;</div><div class='add'>+	u32 version;</div><div class='add'>+</div><div class='add'>+	if (buf[0])</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (CSR_HW_RFID_TYPE(trans-&gt;info.hw_rf_id)) {</div><div class='add'>+	case CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_JF):</div><div class='add'>+		pos = scnprintf(buf, buflen, "JF");</div><div class='add'>+		break;</div><div class='add'>+	case CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_GF):</div><div class='add'>+		pos = scnprintf(buf, buflen, "GF");</div><div class='add'>+		break;</div><div class='add'>+	case CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_GF4):</div><div class='add'>+		pos = scnprintf(buf, buflen, "GF4");</div><div class='add'>+		break;</div><div class='add'>+	case CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_HR):</div><div class='add'>+		pos = scnprintf(buf, buflen, "HR");</div><div class='add'>+		break;</div><div class='add'>+	case CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_HR1):</div><div class='add'>+		pos = scnprintf(buf, buflen, "HR1");</div><div class='add'>+		break;</div><div class='add'>+	case CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_HRCDB):</div><div class='add'>+		pos = scnprintf(buf, buflen, "HRCDB");</div><div class='add'>+		break;</div><div class='add'>+	case CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_FM):</div><div class='add'>+		pos = scnprintf(buf, buflen, "FM");</div><div class='add'>+		break;</div><div class='add'>+	case CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_WP):</div><div class='add'>+		if (SILICON_Z_STEP ==</div><div class='add'>+		    CSR_HW_RFID_STEP(trans-&gt;info.hw_rf_id))</div><div class='add'>+			pos = scnprintf(buf, buflen, "WHTC");</div><div class='add'>+		else</div><div class='add'>+			pos = scnprintf(buf, buflen, "WH");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (CSR_HW_RFID_TYPE(trans-&gt;info.hw_rf_id)) {</div><div class='add'>+	case CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_HR):</div><div class='add'>+	case CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_HR1):</div><div class='add'>+	case CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_HRCDB):</div><div class='add'>+		version = iwl_read_prph(trans, CNVI_MBOX_C);</div><div class='add'>+		switch (version) {</div><div class='add'>+		case 0x20000:</div><div class='add'>+			pos += scnprintf(buf + pos, buflen - pos, " B3");</div><div class='add'>+			break;</div><div class='add'>+		case 0x120000:</div><div class='add'>+			pos += scnprintf(buf + pos, buflen - pos, " B5");</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			pos += scnprintf(buf + pos, buflen - pos,</div><div class='add'>+					 " (0x%x)", version);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos += scnprintf(buf + pos, buflen - pos, ", rfid=0x%x",</div><div class='add'>+			 trans-&gt;info.hw_rf_id);</div><div class='add'>+</div><div class='add'>+	IWL_INFO(trans, "Detected RF %s\n", buf);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * also add a \n for debugfs - need to do it after printing</div><div class='add'>+	 * since our IWL_INFO machinery wants to see a static \n at</div><div class='add'>+	 * the end of the string</div><div class='add'>+	 */</div><div class='add'>+	pos += scnprintf(buf + pos, buflen - pos, "\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_trans_pcie_gen2_fw_alive(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+</div><div class='add'>+	iwl_pcie_reset_ict(trans);</div><div class='add'>+</div><div class='add'>+	/* make sure all queue are not stopped/used */</div><div class='add'>+	memset(trans_pcie-&gt;txqs.queue_stopped, 0,</div><div class='add'>+	       sizeof(trans_pcie-&gt;txqs.queue_stopped));</div><div class='add'>+	memset(trans_pcie-&gt;txqs.queue_used, 0,</div><div class='add'>+	       sizeof(trans_pcie-&gt;txqs.queue_used));</div><div class='add'>+</div><div class='add'>+	/* now that we got alive we can free the fw image &amp; the context info.</div><div class='add'>+	 * paging memory cannot be freed included since FW will still use it</div><div class='add'>+	 */</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		iwl_pcie_ctxt_info_v2_free(trans, true);</div><div class='add'>+	else</div><div class='add'>+		iwl_pcie_ctxt_info_free(trans);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Re-enable all the interrupts, including the RF-Kill one, now that</div><div class='add'>+	 * the firmware is alive.</div><div class='add'>+	 */</div><div class='add'>+	iwl_enable_interrupts(trans);</div><div class='add'>+	mutex_lock(&amp;trans_pcie-&gt;mutex);</div><div class='add'>+	iwl_pcie_check_hw_rf_kill(trans);</div><div class='add'>+</div><div class='add'>+	iwl_pcie_get_rf_name(trans);</div><div class='add'>+	mutex_unlock(&amp;trans_pcie-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ)</div><div class='add'>+		trans-&gt;step_urm = !!(iwl_read_umac_prph(trans,</div><div class='add'>+							CNVI_PMU_STEP_FLOW) &amp;</div><div class='add'>+					CNVI_PMU_STEP_FLOW_FORCE_URM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iwl_pcie_set_ltr(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	u32 ltr_val = CSR_LTR_LONG_VAL_AD_NO_SNOOP_REQ |</div><div class='add'>+		      u32_encode_bits(CSR_LTR_LONG_VAL_AD_SCALE_USEC,</div><div class='add'>+				      CSR_LTR_LONG_VAL_AD_NO_SNOOP_SCALE) |</div><div class='add'>+		      u32_encode_bits(250,</div><div class='add'>+				      CSR_LTR_LONG_VAL_AD_NO_SNOOP_VAL) |</div><div class='add'>+		      CSR_LTR_LONG_VAL_AD_SNOOP_REQ |</div><div class='add'>+		      u32_encode_bits(CSR_LTR_LONG_VAL_AD_SCALE_USEC,</div><div class='add'>+				      CSR_LTR_LONG_VAL_AD_SNOOP_SCALE) |</div><div class='add'>+		      u32_encode_bits(250, CSR_LTR_LONG_VAL_AD_SNOOP_VAL);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * To workaround hardware latency issues during the boot process,</div><div class='add'>+	 * initialize the LTR to ~250 usec (see ltr_val above).</div><div class='add'>+	 * The firmware initializes this again later (to a smaller value).</div><div class='add'>+	 */</div><div class='add'>+	if ((trans-&gt;mac_cfg-&gt;device_family == IWL_DEVICE_FAMILY_AX210 ||</div><div class='add'>+	     trans-&gt;mac_cfg-&gt;device_family == IWL_DEVICE_FAMILY_22000) &amp;&amp;</div><div class='add'>+	    !trans-&gt;mac_cfg-&gt;integrated) {</div><div class='add'>+		iwl_write32(trans, CSR_LTR_LONG_VAL_AD, ltr_val);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;integrated &amp;&amp;</div><div class='add'>+	    trans-&gt;mac_cfg-&gt;device_family == IWL_DEVICE_FAMILY_22000) {</div><div class='add'>+		iwl_write_prph(trans, HPM_MAC_LTR_CSR, HPM_MAC_LRT_ENABLE_ALL);</div><div class='add'>+		iwl_write_prph(trans, HPM_UMAC_LTR, ltr_val);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family == IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+		/* First clear the interrupt, just in case */</div><div class='add'>+		iwl_write32(trans, CSR_MSIX_HW_INT_CAUSES_AD,</div><div class='add'>+			    MSIX_HW_INT_CAUSES_REG_IML);</div><div class='add'>+		/* In this case, unfortunately the same ROM bug exists in the</div><div class='add'>+		 * device (not setting LTR correctly), but we don't have control</div><div class='add'>+		 * over the settings from the host due to some hardware security</div><div class='add'>+		 * features. The only workaround we've been able to come up with</div><div class='add'>+		 * so far is to try to keep the CPU and device busy by polling</div><div class='add'>+		 * it and the IML (image loader) completed interrupt.</div><div class='add'>+		 */</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* nothing needs to be done on other devices */</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_pcie_spin_for_iml(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+/* in practice, this seems to complete in around 20-30ms at most, wait 100 */</div><div class='add'>+#define IML_WAIT_TIMEOUT	(HZ / 10)</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	unsigned long end_time = jiffies + IML_WAIT_TIMEOUT;</div><div class='add'>+	u32 value, loops = 0;</div><div class='add'>+	bool irq = false;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!trans_pcie-&gt;iml))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	value = iwl_read32(trans, CSR_LTR_LAST_MSG);</div><div class='add'>+	IWL_DEBUG_INFO(trans, "Polling for IML load - CSR_LTR_LAST_MSG=0x%x\n",</div><div class='add'>+		       value);</div><div class='add'>+</div><div class='add'>+	while (time_before(jiffies, end_time)) {</div><div class='add'>+		if (iwl_read32(trans, CSR_MSIX_HW_INT_CAUSES_AD) &amp;</div><div class='add'>+				MSIX_HW_INT_CAUSES_REG_IML) {</div><div class='add'>+			irq = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		/* Keep the CPU and device busy. */</div><div class='add'>+		value = iwl_read32(trans, CSR_LTR_LAST_MSG);</div><div class='add'>+		loops++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(trans,</div><div class='add'>+		       "Polled for IML load: irq=%d, loops=%d, CSR_LTR_LAST_MSG=0x%x\n",</div><div class='add'>+		       irq, loops, value);</div><div class='add'>+</div><div class='add'>+	/* We don't fail here even if we timed out - maybe we get lucky and the</div><div class='add'>+	 * interrupt comes in later (and we get alive from firmware) and then</div><div class='add'>+	 * we're all happy - but if not we'll fail on alive timeout or get some</div><div class='add'>+	 * other error out.</div><div class='add'>+	 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_trans_pcie_gen2_start_fw(struct iwl_trans *trans,</div><div class='add'>+				 const struct iwl_fw *fw,</div><div class='add'>+				 const struct fw_img *img,</div><div class='add'>+				 bool run_in_rfkill)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	bool hw_rfkill, keep_ram_busy;</div><div class='add'>+	bool top_reset_done = false;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;trans_pcie-&gt;mutex);</div><div class='add'>+again:</div><div class='add'>+	/* This may fail if AMT took ownership of the device */</div><div class='add'>+	if (iwl_pcie_prepare_card_hw(trans)) {</div><div class='add'>+		IWL_WARN(trans, "Exit HW not ready\n");</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_enable_rfkill_int(trans);</div><div class='add'>+</div><div class='add'>+	iwl_write32(trans, CSR_INT, 0xFFFFFFFF);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We enabled the RF-Kill interrupt and the handler may very</div><div class='add'>+	 * well be running. Disable the interrupts to make sure no other</div><div class='add'>+	 * interrupt can be fired.</div><div class='add'>+	 */</div><div class='add'>+	iwl_disable_interrupts(trans);</div><div class='add'>+</div><div class='add'>+	/* Make sure it finished running */</div><div class='add'>+	iwl_pcie_synchronize_irqs(trans);</div><div class='add'>+</div><div class='add'>+	/* If platform's RF_KILL switch is NOT set to KILL */</div><div class='add'>+	hw_rfkill = iwl_pcie_check_hw_rf_kill(trans);</div><div class='add'>+	if (hw_rfkill &amp;&amp; !run_in_rfkill) {</div><div class='add'>+		ret = -ERFKILL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Someone called stop_device, don't try to start_fw */</div><div class='add'>+	if (trans_pcie-&gt;is_down) {</div><div class='add'>+		IWL_WARN(trans,</div><div class='add'>+			 "Can't start_fw since the HW hasn't been started\n");</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* make sure rfkill handshake bits are cleared */</div><div class='add'>+	iwl_write32(trans, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);</div><div class='add'>+	iwl_write32(trans, CSR_UCODE_DRV_GP1_CLR,</div><div class='add'>+		    CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);</div><div class='add'>+</div><div class='add'>+	/* clear (again), then enable host interrupts */</div><div class='add'>+	iwl_write32(trans, CSR_INT, 0xFFFFFFFF);</div><div class='add'>+</div><div class='add'>+	ret = iwl_pcie_gen2_nic_init(trans);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(trans, "Unable to init nic\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(trans-&gt;do_top_reset &amp;&amp;</div><div class='add'>+		    trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_SC)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* we need to wait later - set state */</div><div class='add'>+	if (trans-&gt;do_top_reset)</div><div class='add'>+		trans_pcie-&gt;fw_reset_state = FW_RESET_TOP_REQUESTED;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+		if (!top_reset_done) {</div><div class='add'>+			ret = iwl_pcie_ctxt_info_v2_alloc(trans, fw, img);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		iwl_pcie_ctxt_info_v2_kick(trans);</div><div class='add'>+	} else {</div><div class='add'>+		ret = iwl_pcie_ctxt_info_init(trans, img);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	keep_ram_busy = !iwl_pcie_set_ltr(trans);</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ) {</div><div class='add'>+		IWL_DEBUG_POWER(trans, "function scratch register value is 0x%08x\n",</div><div class='add'>+				iwl_read32(trans, CSR_FUNC_SCRATCH));</div><div class='add'>+		iwl_write32(trans, CSR_FUNC_SCRATCH, CSR_FUNC_SCRATCH_INIT_VALUE);</div><div class='add'>+		iwl_set_bit(trans, CSR_GP_CNTRL,</div><div class='add'>+			    CSR_GP_CNTRL_REG_FLAG_ROM_START);</div><div class='add'>+	} else if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+		iwl_write_umac_prph(trans, UREG_CPU_INIT_RUN, 1);</div><div class='add'>+	} else {</div><div class='add'>+		iwl_write_prph(trans, UREG_CPU_INIT_RUN, 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (keep_ram_busy)</div><div class='add'>+		iwl_pcie_spin_for_iml(trans);</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;do_top_reset) {</div><div class='add'>+		trans-&gt;do_top_reset = 0;</div><div class='add'>+</div><div class='add'>+#define FW_TOP_RESET_TIMEOUT	(HZ / 4)</div><div class='add'>+		ret = wait_event_timeout(trans_pcie-&gt;fw_reset_waitq,</div><div class='add'>+					 trans_pcie-&gt;fw_reset_state != FW_RESET_TOP_REQUESTED,</div><div class='add'>+					 FW_TOP_RESET_TIMEOUT);</div><div class='add'>+</div><div class='add'>+		if (trans_pcie-&gt;fw_reset_state != FW_RESET_OK) {</div><div class='add'>+			if (trans_pcie-&gt;fw_reset_state != FW_RESET_TOP_REQUESTED)</div><div class='add'>+				IWL_ERR(trans,</div><div class='add'>+					"TOP reset interrupted by error (state %d)!\n",</div><div class='add'>+					trans_pcie-&gt;fw_reset_state);</div><div class='add'>+			else</div><div class='add'>+				IWL_ERR(trans, "TOP reset timed out!\n");</div><div class='add'>+			iwl_op_mode_nic_error(trans-&gt;op_mode,</div><div class='add'>+					      IWL_ERR_TYPE_TOP_RESET_FAILED);</div><div class='add'>+			iwl_trans_schedule_reset(trans,</div><div class='add'>+						 IWL_ERR_TYPE_TOP_RESET_FAILED);</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		msleep(10);</div><div class='add'>+		IWL_INFO(trans, "TOP reset successful, reinit now\n");</div><div class='add'>+		/* now load the firmware again properly */</div><div class='add'>+		ret = _iwl_trans_pcie_start_hw(trans);</div><div class='add'>+		if (ret) {</div><div class='add'>+			IWL_ERR(trans, "failed to start HW after TOP reset\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		trans_pcie-&gt;prph_scratch-&gt;ctrl_cfg.control.control_flags &amp;=</div><div class='add'>+			~cpu_to_le32(IWL_PRPH_SCRATCH_TOP_RESET);</div><div class='add'>+		top_reset_done = true;</div><div class='add'>+		goto again;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* re-check RF-Kill state since we may have missed the interrupt */</div><div class='add'>+	hw_rfkill = iwl_pcie_check_hw_rf_kill(trans);</div><div class='add'>+	if (hw_rfkill &amp;&amp; !run_in_rfkill)</div><div class='add'>+		ret = -ERFKILL;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;trans_pcie-&gt;mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_trans_pcie_gen2_op_mode_leave(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;trans_pcie-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* disable interrupts - don't enable HW RF kill interrupt */</div><div class='add'>+	iwl_disable_interrupts(trans);</div><div class='add'>+</div><div class='add'>+	iwl_pcie_gen2_apm_stop(trans, true);</div><div class='add'>+</div><div class='add'>+	iwl_disable_interrupts(trans);</div><div class='add'>+</div><div class='add'>+	iwl_pcie_disable_ict(trans);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;trans_pcie-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	iwl_pcie_synchronize_irqs(trans);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c<br/>index 239bc177a3e5..164d060ec617 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/trans.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/trans.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2007-2015, 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2007-2015, 2018-2024 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='hunk'>@@ -24,113 +24,74 @@</div><div class='ctx'> #include "fw/error-dump.h"</div><div class='ctx'> #include "fw/dbg.h"</div><div class='ctx'> #include "fw/api/tx.h"</div><div class='add'>+#include "fw/acpi.h"</div><div class='add'>+#include "mei/iwl-mei.h"</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> #include "iwl-fh.h"</div><div class='del'>-#include "iwl-context-info-gen3.h"</div><div class='add'>+#include "pcie/iwl-context-info-v2.h"</div><div class='add'>+#include "pcie/utils.h"</div><div class='ctx'> </div><div class='del'>-/* extended range in FW SRAM */</div><div class='del'>-#define IWL_FW_MEM_EXTENDED_START	0x40000</div><div class='del'>-#define IWL_FW_MEM_EXTENDED_END		0x57FFF</div><div class='del'>-</div><div class='del'>-void iwl_trans_pcie_dump_regs(struct iwl_trans *trans)</div><div class='del'>-{</div><div class='del'>-#define PCI_DUMP_SIZE		352</div><div class='del'>-#define PCI_MEM_DUMP_SIZE	64</div><div class='del'>-#define PCI_PARENT_DUMP_SIZE	524</div><div class='del'>-#define PREFIX_LEN		32</div><div class='del'>-	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-	struct pci_dev *pdev = trans_pcie-&gt;pci_dev;</div><div class='del'>-	u32 i, pos, alloc_size, *ptr, *buf;</div><div class='del'>-	char *prefix;</div><div class='add'>+#define IWL_HOST_MON_BLOCK_PEMON	0x00</div><div class='add'>+#define IWL_HOST_MON_BLOCK_HIPM		0x22</div><div class='ctx'> </div><div class='del'>-	if (trans_pcie-&gt;pcie_dbg_dumped_once)</div><div class='del'>-		return;</div><div class='add'>+#define IWL_HOST_MON_BLOCK_PEMON_VEC0	0x00</div><div class='add'>+#define IWL_HOST_MON_BLOCK_PEMON_VEC1	0x01</div><div class='add'>+#define IWL_HOST_MON_BLOCK_PEMON_WFPM	0x06</div><div class='ctx'> </div><div class='del'>-	/* Should be a multiple of 4 */</div><div class='del'>-	BUILD_BUG_ON(PCI_DUMP_SIZE &gt; 4096 || PCI_DUMP_SIZE &amp; 0x3);</div><div class='del'>-	BUILD_BUG_ON(PCI_MEM_DUMP_SIZE &gt; 4096 || PCI_MEM_DUMP_SIZE &amp; 0x3);</div><div class='del'>-	BUILD_BUG_ON(PCI_PARENT_DUMP_SIZE &gt; 4096 || PCI_PARENT_DUMP_SIZE &amp; 0x3);</div><div class='add'>+static void iwl_dump_host_monitor_block(struct iwl_trans *trans,</div><div class='add'>+					u32 block, u32 vec, u32 iter)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	/* Alloc a max size buffer */</div><div class='del'>-	alloc_size = PCI_ERR_ROOT_ERR_SRC +  4 + PREFIX_LEN;</div><div class='del'>-	alloc_size = max_t(u32, alloc_size, PCI_DUMP_SIZE + PREFIX_LEN);</div><div class='del'>-	alloc_size = max_t(u32, alloc_size, PCI_MEM_DUMP_SIZE + PREFIX_LEN);</div><div class='del'>-	alloc_size = max_t(u32, alloc_size, PCI_PARENT_DUMP_SIZE + PREFIX_LEN);</div><div class='add'>+	IWL_ERR(trans, "Host monitor block 0x%x vector 0x%x\n", block, vec);</div><div class='add'>+	iwl_write32(trans, CSR_MONITOR_CFG_REG, (block &lt;&lt; 8) | vec);</div><div class='add'>+	for (i = 0; i &lt; iter; i++)</div><div class='add'>+		IWL_ERR(trans, "    value [iter %d]: 0x%08x\n",</div><div class='add'>+			i, iwl_read32(trans, CSR_MONITOR_STATUS_REG));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	buf = kmalloc(alloc_size, GFP_ATOMIC);</div><div class='del'>-	if (!buf)</div><div class='add'>+static void iwl_pcie_dump_host_monitor(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	switch (trans-&gt;mac_cfg-&gt;device_family) {</div><div class='add'>+	case IWL_DEVICE_FAMILY_22000:</div><div class='add'>+	case IWL_DEVICE_FAMILY_AX210:</div><div class='add'>+		IWL_ERR(trans, "CSR_RESET = 0x%x\n",</div><div class='add'>+			iwl_read32(trans, CSR_RESET));</div><div class='add'>+		iwl_dump_host_monitor_block(trans, IWL_HOST_MON_BLOCK_PEMON,</div><div class='add'>+					    IWL_HOST_MON_BLOCK_PEMON_VEC0, 15);</div><div class='add'>+		iwl_dump_host_monitor_block(trans, IWL_HOST_MON_BLOCK_PEMON,</div><div class='add'>+					    IWL_HOST_MON_BLOCK_PEMON_VEC1, 15);</div><div class='add'>+		iwl_dump_host_monitor_block(trans, IWL_HOST_MON_BLOCK_PEMON,</div><div class='add'>+					    IWL_HOST_MON_BLOCK_PEMON_WFPM, 15);</div><div class='add'>+		iwl_dump_host_monitor_block(trans, IWL_HOST_MON_BLOCK_HIPM,</div><div class='add'>+					    IWL_HOST_MON_BLOCK_PEMON_VEC0, 1);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		return;</div><div class='del'>-	prefix = (char *)buf + alloc_size - PREFIX_LEN;</div><div class='del'>-</div><div class='del'>-	IWL_ERR(trans, "iwlwifi transaction failed, dumping registers\n");</div><div class='del'>-</div><div class='del'>-	/* Print wifi device registers */</div><div class='del'>-	sprintf(prefix, "iwlwifi %s: ", pci_name(pdev));</div><div class='del'>-	IWL_ERR(trans, "iwlwifi device config registers:\n");</div><div class='del'>-	for (i = 0, ptr = buf; i &lt; PCI_DUMP_SIZE; i += 4, ptr++)</div><div class='del'>-		if (pci_read_config_dword(pdev, i, ptr))</div><div class='del'>-			goto err_read;</div><div class='del'>-	print_hex_dump(KERN_ERR, prefix, DUMP_PREFIX_OFFSET, 32, 4, buf, i, 0);</div><div class='del'>-</div><div class='del'>-	IWL_ERR(trans, "iwlwifi device memory mapped registers:\n");</div><div class='del'>-	for (i = 0, ptr = buf; i &lt; PCI_MEM_DUMP_SIZE; i += 4, ptr++)</div><div class='del'>-		*ptr = iwl_read32(trans, i);</div><div class='del'>-	print_hex_dump(KERN_ERR, prefix, DUMP_PREFIX_OFFSET, 32, 4, buf, i, 0);</div><div class='del'>-</div><div class='del'>-	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_ERR);</div><div class='del'>-	if (pos) {</div><div class='del'>-		IWL_ERR(trans, "iwlwifi device AER capability structure:\n");</div><div class='del'>-		for (i = 0, ptr = buf; i &lt; PCI_ERR_ROOT_COMMAND; i += 4, ptr++)</div><div class='del'>-			if (pci_read_config_dword(pdev, pos + i, ptr))</div><div class='del'>-				goto err_read;</div><div class='del'>-		print_hex_dump(KERN_ERR, prefix, DUMP_PREFIX_OFFSET,</div><div class='del'>-			       32, 4, buf, i, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Print parent device registers next */</div><div class='del'>-	if (!pdev-&gt;bus-&gt;self)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	pdev = pdev-&gt;bus-&gt;self;</div><div class='del'>-	sprintf(prefix, "iwlwifi %s: ", pci_name(pdev));</div><div class='del'>-</div><div class='del'>-	IWL_ERR(trans, "iwlwifi parent port (%s) config registers:\n",</div><div class='del'>-		pci_name(pdev));</div><div class='del'>-	for (i = 0, ptr = buf; i &lt; PCI_PARENT_DUMP_SIZE; i += 4, ptr++)</div><div class='del'>-		if (pci_read_config_dword(pdev, i, ptr))</div><div class='del'>-			goto err_read;</div><div class='del'>-	print_hex_dump(KERN_ERR, prefix, DUMP_PREFIX_OFFSET, 32, 4, buf, i, 0);</div><div class='del'>-</div><div class='del'>-	/* Print root port AER registers */</div><div class='del'>-	pos = 0;</div><div class='del'>-	pdev = pcie_find_root_port(pdev);</div><div class='del'>-	if (pdev)</div><div class='del'>-		pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_ERR);</div><div class='del'>-	if (pos) {</div><div class='del'>-		IWL_ERR(trans, "iwlwifi root port (%s) AER cap structure:\n",</div><div class='del'>-			pci_name(pdev));</div><div class='del'>-		sprintf(prefix, "iwlwifi %s: ", pci_name(pdev));</div><div class='del'>-		for (i = 0, ptr = buf; i &lt;= PCI_ERR_ROOT_ERR_SRC; i += 4, ptr++)</div><div class='del'>-			if (pci_read_config_dword(pdev, pos + i, ptr))</div><div class='del'>-				goto err_read;</div><div class='del'>-		print_hex_dump(KERN_ERR, prefix, DUMP_PREFIX_OFFSET, 32,</div><div class='del'>-			       4, buf, i, 0);</div><div class='del'>-	}</div><div class='del'>-	goto out;</div><div class='del'>-</div><div class='del'>-err_read:</div><div class='del'>-	print_hex_dump(KERN_ERR, prefix, DUMP_PREFIX_OFFSET, 32, 4, buf, i, 0);</div><div class='del'>-	IWL_ERR(trans, "Read failed at 0x%X\n", i);</div><div class='del'>-out:</div><div class='del'>-	trans_pcie-&gt;pcie_dbg_dumped_once = 1;</div><div class='del'>-	kfree(buf);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_trans_pcie_sw_reset(struct iwl_trans *trans)</div><div class='add'>+/* extended range in FW SRAM */</div><div class='add'>+#define IWL_FW_MEM_EXTENDED_START	0x40000</div><div class='add'>+#define IWL_FW_MEM_EXTENDED_END		0x57FFF</div><div class='add'>+</div><div class='add'>+int iwl_trans_pcie_sw_reset(struct iwl_trans *trans, bool retake_ownership)</div><div class='ctx'> {</div><div class='ctx'> 	/* Reset entire device - do controller reset (results in SHRD_HW_RST) */</div><div class='del'>-	iwl_set_bit(trans, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET);</div><div class='del'>-	usleep_range(5000, 6000);</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ) {</div><div class='add'>+		iwl_set_bit(trans, CSR_GP_CNTRL,</div><div class='add'>+			    CSR_GP_CNTRL_REG_FLAG_SW_RESET);</div><div class='add'>+		usleep_range(10000, 20000);</div><div class='add'>+	} else {</div><div class='add'>+		iwl_set_bit(trans, CSR_RESET,</div><div class='add'>+			    CSR_RESET_REG_FLAG_SW_RESET);</div><div class='add'>+		usleep_range(5000, 6000);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (retake_ownership)</div><div class='add'>+		return iwl_pcie_prepare_card_hw(trans);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_pcie_free_fw_monitor(struct iwl_trans *trans)</div><div class='hunk'>@@ -149,7 +110,7 @@ static void iwl_pcie_free_fw_monitor(struct iwl_trans *trans)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_pcie_alloc_fw_monitor_block(struct iwl_trans *trans,</div><div class='del'>-					    u8 max_power, u8 min_power)</div><div class='add'>+					    u8 max_power)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_dram_data *fw_mon = &amp;trans-&gt;dbg.fw_mon;</div><div class='ctx'> 	void *block = NULL;</div><div class='hunk'>@@ -157,10 +118,13 @@ static void iwl_pcie_alloc_fw_monitor_block(struct iwl_trans *trans,</div><div class='ctx'> 	u32 size = 0;</div><div class='ctx'> 	u8 power;</div><div class='ctx'> </div><div class='del'>-	if (fw_mon-&gt;size)</div><div class='add'>+	if (fw_mon-&gt;size) {</div><div class='add'>+		memset(fw_mon-&gt;block, 0, fw_mon-&gt;size);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	for (power = max_power; power &gt;= min_power; power--) {</div><div class='add'>+	/* need at least 2 KiB, so stop at 11 */</div><div class='add'>+	for (power = max_power; power &gt;= 11; power--) {</div><div class='ctx'> 		size = BIT(power);</div><div class='ctx'> 		block = dma_alloc_coherent(trans-&gt;dev, size, &amp;physical,</div><div class='ctx'> 					   GFP_KERNEL | __GFP_NOWARN);</div><div class='hunk'>@@ -201,10 +165,7 @@ void iwl_pcie_alloc_fw_monitor(struct iwl_trans *trans, u8 max_power)</div><div class='ctx'> 		 max_power))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (trans-&gt;dbg.fw_mon.size)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	iwl_pcie_alloc_fw_monitor_block(trans, max_power, 11);</div><div class='add'>+	iwl_pcie_alloc_fw_monitor_block(trans, max_power);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 iwl_trans_pcie_read_shr(struct iwl_trans *trans, u32 reg)</div><div class='hunk'>@@ -223,7 +184,7 @@ static void iwl_trans_pcie_write_shr(struct iwl_trans *trans, u32 reg, u32 val)</div><div class='ctx'> </div><div class='ctx'> static void iwl_pcie_set_pwr(struct iwl_trans *trans, bool vaux)</div><div class='ctx'> {</div><div class='del'>-	if (trans-&gt;cfg-&gt;apmg_not_supported)</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;base-&gt;apmg_not_supported)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (vaux &amp;&amp; pci_pme_capable(to_pci_dev(trans-&gt;dev), PCI_D3cold))</div><div class='hunk'>@@ -253,13 +214,13 @@ void iwl_pcie_apm_config(struct iwl_trans *trans)</div><div class='ctx'> 	iwl_set_bit(trans, CSR_GIO_REG, CSR_GIO_REG_VAL_L0S_DISABLED);</div><div class='ctx'> </div><div class='ctx'> 	pcie_capability_read_word(trans_pcie-&gt;pci_dev, PCI_EXP_LNKCTL, &amp;lctl);</div><div class='del'>-	trans-&gt;pm_support = !(lctl &amp; PCI_EXP_LNKCTL_ASPM_L0S);</div><div class='add'>+	trans_pcie-&gt;pm_support = !(lctl &amp; PCI_EXP_LNKCTL_ASPM_L0S);</div><div class='ctx'> </div><div class='ctx'> 	pcie_capability_read_word(trans_pcie-&gt;pci_dev, PCI_EXP_DEVCTL2, &amp;cap);</div><div class='del'>-	trans-&gt;ltr_enabled = cap &amp; PCI_EXP_DEVCTL2_LTR_EN;</div><div class='add'>+	trans_pcie-&gt;ltr_enabled = cap &amp; PCI_EXP_DEVCTL2_LTR_EN;</div><div class='ctx'> 	IWL_DEBUG_POWER(trans, "L1 %sabled - LTR %sabled\n",</div><div class='ctx'> 			(lctl &amp; PCI_EXP_LNKCTL_ASPM_L1) ? "En" : "Dis",</div><div class='del'>-			trans-&gt;ltr_enabled ? "En" : "Dis");</div><div class='add'>+			trans_pcie-&gt;ltr_enabled ? "En" : "Dis");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -279,7 +240,7 @@ static int iwl_pcie_apm_init(struct iwl_trans *trans)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	/* Disable L0S exit timer (platform NMI Work/Around) */</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_8000)</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_8000)</div><div class='ctx'> 		iwl_set_bit(trans, CSR_GIO_CHICKEN_BITS,</div><div class='ctx'> 			    CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER);</div><div class='ctx'> </div><div class='hunk'>@@ -298,15 +259,15 @@ static int iwl_pcie_apm_init(struct iwl_trans *trans)</div><div class='ctx'> 	 * wake device's PCI Express link L1a -&gt; L0s</div><div class='ctx'> 	 */</div><div class='ctx'> 	iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-		    CSR_HW_IF_CONFIG_REG_BIT_HAP_WAKE_L1A);</div><div class='add'>+		    CSR_HW_IF_CONFIG_REG_HAP_WAKE);</div><div class='ctx'> </div><div class='ctx'> 	iwl_pcie_apm_config(trans);</div><div class='ctx'> </div><div class='ctx'> 	/* Configure analog phase-lock-loop before activating to D0A */</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;base_params-&gt;pll_cfg)</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;base-&gt;pll_cfg)</div><div class='ctx'> 		iwl_set_bit(trans, CSR_ANA_PLL_CFG, CSR50_ANA_PLL_CFG_VAL);</div><div class='ctx'> </div><div class='del'>-	ret = iwl_finish_nic_init(trans, trans-&gt;trans_cfg);</div><div class='add'>+	ret = iwl_trans_activate_nic(trans);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -339,7 +300,7 @@ static int iwl_pcie_apm_init(struct iwl_trans *trans)</div><div class='ctx'> 	 * bits do not disable clocks.  This preserves any hardware</div><div class='ctx'> 	 * bits already set by default in "CLK_CTRL_REG" after reset.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!trans-&gt;cfg-&gt;apmg_not_supported) {</div><div class='add'>+	if (!trans-&gt;mac_cfg-&gt;base-&gt;apmg_not_supported) {</div><div class='ctx'> 		iwl_write_prph(trans, APMG_CLK_EN_REG,</div><div class='ctx'> 			       APMG_CLK_VAL_DMA_CLK_RQT);</div><div class='ctx'> 		udelay(20);</div><div class='hunk'>@@ -373,16 +334,18 @@ static void iwl_pcie_apm_lp_xtal_enable(struct iwl_trans *trans)</div><div class='ctx'> 	u32 dl_cfg_reg;</div><div class='ctx'> </div><div class='ctx'> 	/* Force XTAL ON */</div><div class='del'>-	__iwl_trans_pcie_set_bit(trans, CSR_GP_CNTRL,</div><div class='del'>-				 CSR_GP_CNTRL_REG_FLAG_XTAL_ON);</div><div class='add'>+	iwl_trans_set_bit(trans, CSR_GP_CNTRL,</div><div class='add'>+			  CSR_GP_CNTRL_REG_FLAG_XTAL_ON);</div><div class='ctx'> </div><div class='del'>-	iwl_trans_pcie_sw_reset(trans);</div><div class='add'>+	ret = iwl_trans_pcie_sw_reset(trans, true);</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = iwl_trans_activate_nic(trans);</div><div class='ctx'> </div><div class='del'>-	ret = iwl_finish_nic_init(trans, trans-&gt;trans_cfg);</div><div class='ctx'> 	if (WARN_ON(ret)) {</div><div class='ctx'> 		/* Release XTAL ON request */</div><div class='del'>-		__iwl_trans_pcie_clear_bit(trans, CSR_GP_CNTRL,</div><div class='del'>-					   CSR_GP_CNTRL_REG_FLAG_XTAL_ON);</div><div class='add'>+		iwl_trans_clear_bit(trans, CSR_GP_CNTRL,</div><div class='add'>+				    CSR_GP_CNTRL_REG_FLAG_XTAL_ON);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -403,7 +366,10 @@ static void iwl_pcie_apm_lp_xtal_enable(struct iwl_trans *trans)</div><div class='ctx'> 				 apmg_xtal_cfg_reg |</div><div class='ctx'> 				 SHR_APMG_XTAL_CFG_XTAL_ON_REQ);</div><div class='ctx'> </div><div class='del'>-	iwl_trans_pcie_sw_reset(trans);</div><div class='add'>+	ret = iwl_trans_pcie_sw_reset(trans, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_ERR(trans,</div><div class='add'>+			"iwl_pcie_apm_lp_xtal_enable: failed to retake NIC ownership\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Enable LP XTAL by indirect access through CSR */</div><div class='ctx'> 	apmg_gp1_reg = iwl_trans_pcie_read_shr(trans, SHR_APMG_GP1_REG);</div><div class='hunk'>@@ -421,7 +387,7 @@ static void iwl_pcie_apm_lp_xtal_enable(struct iwl_trans *trans)</div><div class='ctx'> 	 * SHRD_HW_RST is applied in S3.</div><div class='ctx'> 	 */</div><div class='ctx'> 	iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-		    CSR_HW_IF_CONFIG_REG_PERSIST_MODE);</div><div class='add'>+		    CSR_HW_IF_CONFIG_REG_PERSISTENCE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Clear "initialization complete" bit to move adapter from</div><div class='hunk'>@@ -430,12 +396,12 @@ static void iwl_pcie_apm_lp_xtal_enable(struct iwl_trans *trans)</div><div class='ctx'> 	iwl_clear_bit(trans, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);</div><div class='ctx'> </div><div class='ctx'> 	/* Activates XTAL resources monitor */</div><div class='del'>-	__iwl_trans_pcie_set_bit(trans, CSR_MONITOR_CFG_REG,</div><div class='del'>-				 CSR_MONITOR_XTAL_RESOURCES);</div><div class='add'>+	iwl_trans_set_bit(trans, CSR_MONITOR_CFG_REG,</div><div class='add'>+			  CSR_MONITOR_XTAL_RESOURCES);</div><div class='ctx'> </div><div class='ctx'> 	/* Release XTAL ON request */</div><div class='del'>-	__iwl_trans_pcie_clear_bit(trans, CSR_GP_CNTRL,</div><div class='del'>-				   CSR_GP_CNTRL_REG_FLAG_XTAL_ON);</div><div class='add'>+	iwl_trans_clear_bit(trans, CSR_GP_CNTRL,</div><div class='add'>+			    CSR_GP_CNTRL_REG_FLAG_XTAL_ON);</div><div class='ctx'> 	udelay(10);</div><div class='ctx'> </div><div class='ctx'> 	/* Release APMG XTAL */</div><div class='hunk'>@@ -449,12 +415,23 @@ void iwl_pcie_apm_stop_master(struct iwl_trans *trans)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* stop device's busmaster DMA activity */</div><div class='del'>-	iwl_set_bit(trans, CSR_RESET, CSR_RESET_REG_FLAG_STOP_MASTER);</div><div class='ctx'> </div><div class='del'>-	ret = iwl_poll_bit(trans, CSR_RESET,</div><div class='del'>-			   CSR_RESET_REG_FLAG_MASTER_DISABLED,</div><div class='del'>-			   CSR_RESET_REG_FLAG_MASTER_DISABLED, 100);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ) {</div><div class='add'>+		iwl_set_bit(trans, CSR_GP_CNTRL,</div><div class='add'>+			    CSR_GP_CNTRL_REG_FLAG_BUS_MASTER_DISABLE_REQ);</div><div class='add'>+</div><div class='add'>+		ret = iwl_poll_bits(trans, CSR_GP_CNTRL,</div><div class='add'>+				    CSR_GP_CNTRL_REG_FLAG_BUS_MASTER_DISABLE_STATUS,</div><div class='add'>+				    100);</div><div class='add'>+		usleep_range(10000, 20000);</div><div class='add'>+	} else {</div><div class='add'>+		iwl_set_bit(trans, CSR_RESET, CSR_RESET_REG_FLAG_STOP_MASTER);</div><div class='add'>+</div><div class='add'>+		ret = iwl_poll_bits(trans, CSR_RESET,</div><div class='add'>+				    CSR_RESET_REG_FLAG_MASTER_DISABLED, 100);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='ctx'> 		IWL_WARN(trans, "Master Disable Timed Out, 100 usec\n");</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_INFO(trans, "stop master\n");</div><div class='hunk'>@@ -469,16 +446,16 @@ static void iwl_pcie_apm_stop(struct iwl_trans *trans, bool op_mode_leave)</div><div class='ctx'> 			iwl_pcie_apm_init(trans);</div><div class='ctx'> </div><div class='ctx'> 		/* inform ME that we are leaving */</div><div class='del'>-		if (trans-&gt;trans_cfg-&gt;device_family == IWL_DEVICE_FAMILY_7000)</div><div class='add'>+		if (trans-&gt;mac_cfg-&gt;device_family == IWL_DEVICE_FAMILY_7000)</div><div class='ctx'> 			iwl_set_bits_prph(trans, APMG_PCIDEV_STT_REG,</div><div class='ctx'> 					  APMG_PCIDEV_STT_VAL_WAKE_ME);</div><div class='del'>-		else if (trans-&gt;trans_cfg-&gt;device_family &gt;=</div><div class='add'>+		else if (trans-&gt;mac_cfg-&gt;device_family &gt;=</div><div class='ctx'> 			 IWL_DEVICE_FAMILY_8000) {</div><div class='ctx'> 			iwl_set_bit(trans, CSR_DBG_LINK_PWR_MGMT_REG,</div><div class='ctx'> 				    CSR_RESET_LINK_PWR_MGMT_DISABLED);</div><div class='ctx'> 			iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-				    CSR_HW_IF_CONFIG_REG_PREPARE |</div><div class='del'>-				    CSR_HW_IF_CONFIG_REG_ENABLE_PME);</div><div class='add'>+				    CSR_HW_IF_CONFIG_REG_WAKE_ME |</div><div class='add'>+				    CSR_HW_IF_CONFIG_REG_WAKE_ME_PCIE_OWNER_EN);</div><div class='ctx'> 			mdelay(1);</div><div class='ctx'> 			iwl_clear_bit(trans, CSR_DBG_LINK_PWR_MGMT_REG,</div><div class='ctx'> 				      CSR_RESET_LINK_PWR_MGMT_DISABLED);</div><div class='hunk'>@@ -496,7 +473,7 @@ static void iwl_pcie_apm_stop(struct iwl_trans *trans, bool op_mode_leave)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	iwl_trans_pcie_sw_reset(trans);</div><div class='add'>+	iwl_trans_pcie_sw_reset(trans, false);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Clear "initialization complete" bit to move adapter from</div><div class='hunk'>@@ -533,7 +510,7 @@ static int iwl_pcie_nic_init(struct iwl_trans *trans)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;base_params-&gt;shadow_reg_enable) {</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;base-&gt;shadow_reg_enable) {</div><div class='ctx'> 		/* enable shadow regs in HW */</div><div class='ctx'> 		iwl_set_bit(trans, CSR_MAC_SHADOW_REG_CTRL, 0x800FFFFF);</div><div class='ctx'> 		IWL_DEBUG_INFO(trans, "Enabling shadow registers in device\n");</div><div class='hunk'>@@ -550,18 +527,17 @@ static int iwl_pcie_set_hw_ready(struct iwl_trans *trans)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-		    CSR_HW_IF_CONFIG_REG_BIT_NIC_READY);</div><div class='add'>+		    CSR_HW_IF_CONFIG_REG_PCI_OWN_SET);</div><div class='ctx'> </div><div class='ctx'> 	/* See if we got it */</div><div class='del'>-	ret = iwl_poll_bit(trans, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-			   CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,</div><div class='del'>-			   CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,</div><div class='del'>-			   HW_READY_TIMEOUT);</div><div class='add'>+	ret = iwl_poll_bits(trans, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+			    CSR_HW_IF_CONFIG_REG_PCI_OWN_SET,</div><div class='add'>+			    HW_READY_TIMEOUT);</div><div class='ctx'> </div><div class='del'>-	if (ret &gt;= 0)</div><div class='add'>+	if (!ret)</div><div class='ctx'> 		iwl_set_bit(trans, CSR_MBOX_SET_REG, CSR_MBOX_SET_REG_OS_ALIVE);</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_INFO(trans, "hardware%s ready\n", ret &lt; 0 ? " not" : "");</div><div class='add'>+	IWL_DEBUG_INFO(trans, "hardware%s ready\n", ret ? " not" : "");</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -569,29 +545,46 @@ static int iwl_pcie_set_hw_ready(struct iwl_trans *trans)</div><div class='ctx'> int iwl_pcie_prepare_card_hw(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	int t = 0;</div><div class='ctx'> 	int iter;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_INFO(trans, "iwl_trans_prepare_card_hw enter\n");</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_pcie_set_hw_ready(trans);</div><div class='ctx'> 	/* If the card is ready, exit 0 */</div><div class='del'>-	if (ret &gt;= 0)</div><div class='add'>+	if (!ret) {</div><div class='add'>+		trans-&gt;csme_own = false;</div><div class='ctx'> 		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	iwl_set_bit(trans, CSR_DBG_LINK_PWR_MGMT_REG,</div><div class='ctx'> 		    CSR_RESET_LINK_PWR_MGMT_DISABLED);</div><div class='ctx'> 	usleep_range(1000, 2000);</div><div class='ctx'> </div><div class='ctx'> 	for (iter = 0; iter &lt; 10; iter++) {</div><div class='add'>+		int t = 0;</div><div class='add'>+</div><div class='ctx'> 		/* If HW is not ready, prepare the conditions to check again */</div><div class='ctx'> 		iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-			    CSR_HW_IF_CONFIG_REG_PREPARE);</div><div class='add'>+			    CSR_HW_IF_CONFIG_REG_WAKE_ME);</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='ctx'> 			ret = iwl_pcie_set_hw_ready(trans);</div><div class='del'>-			if (ret &gt;= 0)</div><div class='add'>+			if (!ret) {</div><div class='add'>+				trans-&gt;csme_own = false;</div><div class='ctx'> 				return 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (iwl_mei_is_connected()) {</div><div class='add'>+				IWL_DEBUG_INFO(trans,</div><div class='add'>+					       "Couldn't prepare the card but SAP is connected\n");</div><div class='add'>+				trans-&gt;csme_own = true;</div><div class='add'>+				if (trans-&gt;mac_cfg-&gt;device_family !=</div><div class='add'>+				    IWL_DEVICE_FAMILY_9000)</div><div class='add'>+					IWL_ERR(trans,</div><div class='add'>+						"SAP not supported for this NIC family\n");</div><div class='add'>+</div><div class='add'>+				return -EBUSY;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			usleep_range(200, 1000);</div><div class='ctx'> 			t += 200;</div><div class='hunk'>@@ -655,7 +648,7 @@ static int iwl_pcie_load_firmware_chunk(struct iwl_trans *trans,</div><div class='ctx'> 				 trans_pcie-&gt;ucode_write_complete, 5 * HZ);</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		IWL_ERR(trans, "Failed to load firmware chunk!\n");</div><div class='del'>-		iwl_trans_pcie_dump_regs(trans);</div><div class='add'>+		iwl_trans_pcie_dump_regs(trans, trans_pcie-&gt;pci_dev);</div><div class='ctx'> 		return -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -699,7 +692,7 @@ static int iwl_pcie_load_section(struct iwl_trans *trans, u8 section_num,</div><div class='ctx'> 			iwl_set_bits_prph(trans, LMPM_CHICK,</div><div class='ctx'> 					  LMPM_CHICK_EXTENDED_ADDR_SPACE);</div><div class='ctx'> </div><div class='del'>-		memcpy(v_addr, (u8 *)section-&gt;data + offset, copy_size);</div><div class='add'>+		memcpy(v_addr, (const u8 *)section-&gt;data + offset, copy_size);</div><div class='ctx'> 		ret = iwl_pcie_load_firmware_chunk(trans, dst_addr, p_addr,</div><div class='ctx'> 						   copy_size);</div><div class='ctx'> </div><div class='hunk'>@@ -770,7 +763,7 @@ static int iwl_pcie_load_cpu_sections_8000(struct iwl_trans *trans,</div><div class='ctx'> </div><div class='ctx'> 	iwl_enable_interrupts(trans);</div><div class='ctx'> </div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;use_tfh) {</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;gen2) {</div><div class='ctx'> 		if (cpu == 1)</div><div class='ctx'> 			iwl_write_prph(trans, UREG_UCODE_LOAD_STATUS,</div><div class='ctx'> 				       0xFFFF);</div><div class='hunk'>@@ -928,7 +921,7 @@ monitor:</div><div class='ctx'> 	if (dest-&gt;monitor_mode == EXTERNAL_MODE &amp;&amp; fw_mon-&gt;size) {</div><div class='ctx'> 		iwl_write_prph(trans, le32_to_cpu(dest-&gt;base_reg),</div><div class='ctx'> 			       fw_mon-&gt;physical &gt;&gt; dest-&gt;base_shift);</div><div class='del'>-		if (trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_8000)</div><div class='add'>+		if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_8000)</div><div class='ctx'> 			iwl_write_prph(trans, le32_to_cpu(dest-&gt;end_reg),</div><div class='ctx'> 				       (fw_mon-&gt;physical + fw_mon-&gt;size -</div><div class='ctx'> 					256) &gt;&gt; dest-&gt;end_shift);</div><div class='hunk'>@@ -1033,52 +1026,83 @@ bool iwl_pcie_check_hw_rf_kill(struct iwl_trans *trans)</div><div class='ctx'> 	report = test_bit(STATUS_RFKILL_OPMODE, &amp;trans-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (prev != report)</div><div class='del'>-		iwl_trans_pcie_rf_kill(trans, report);</div><div class='add'>+		iwl_trans_pcie_rf_kill(trans, report, false);</div><div class='ctx'> </div><div class='ctx'> 	return hw_rfkill;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct iwl_causes_list {</div><div class='del'>-	u32 cause_num;</div><div class='del'>-	u32 mask_reg;</div><div class='add'>+	u16 mask_reg;</div><div class='add'>+	u8 bit;</div><div class='ctx'> 	u8 addr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct iwl_causes_list causes_list[] = {</div><div class='del'>-	{MSIX_FH_INT_CAUSES_D2S_CH0_NUM,	CSR_MSIX_FH_INT_MASK_AD, 0},</div><div class='del'>-	{MSIX_FH_INT_CAUSES_D2S_CH1_NUM,	CSR_MSIX_FH_INT_MASK_AD, 0x1},</div><div class='del'>-	{MSIX_FH_INT_CAUSES_S2D,		CSR_MSIX_FH_INT_MASK_AD, 0x3},</div><div class='del'>-	{MSIX_FH_INT_CAUSES_FH_ERR,		CSR_MSIX_FH_INT_MASK_AD, 0x5},</div><div class='del'>-	{MSIX_HW_INT_CAUSES_REG_ALIVE,		CSR_MSIX_HW_INT_MASK_AD, 0x10},</div><div class='del'>-	{MSIX_HW_INT_CAUSES_REG_WAKEUP,		CSR_MSIX_HW_INT_MASK_AD, 0x11},</div><div class='del'>-	{MSIX_HW_INT_CAUSES_REG_RESET_DONE,	CSR_MSIX_HW_INT_MASK_AD, 0x12},</div><div class='del'>-	{MSIX_HW_INT_CAUSES_REG_CT_KILL,	CSR_MSIX_HW_INT_MASK_AD, 0x16},</div><div class='del'>-	{MSIX_HW_INT_CAUSES_REG_RF_KILL,	CSR_MSIX_HW_INT_MASK_AD, 0x17},</div><div class='del'>-	{MSIX_HW_INT_CAUSES_REG_PERIODIC,	CSR_MSIX_HW_INT_MASK_AD, 0x18},</div><div class='del'>-	{MSIX_HW_INT_CAUSES_REG_SW_ERR,		CSR_MSIX_HW_INT_MASK_AD, 0x29},</div><div class='del'>-	{MSIX_HW_INT_CAUSES_REG_SCD,		CSR_MSIX_HW_INT_MASK_AD, 0x2A},</div><div class='del'>-	{MSIX_HW_INT_CAUSES_REG_FH_TX,		CSR_MSIX_HW_INT_MASK_AD, 0x2B},</div><div class='del'>-	{MSIX_HW_INT_CAUSES_REG_HW_ERR,		CSR_MSIX_HW_INT_MASK_AD, 0x2D},</div><div class='del'>-	{MSIX_HW_INT_CAUSES_REG_HAP,		CSR_MSIX_HW_INT_MASK_AD, 0x2E},</div><div class='add'>+#define IWL_CAUSE(reg, mask)						\</div><div class='add'>+	{								\</div><div class='add'>+		.mask_reg = reg,					\</div><div class='add'>+		.bit = ilog2(mask),					\</div><div class='add'>+		.addr = ilog2(mask) +					\</div><div class='add'>+			((reg) == CSR_MSIX_FH_INT_MASK_AD ? -16 :	\</div><div class='add'>+			 (reg) == CSR_MSIX_HW_INT_MASK_AD ? 16 :	\</div><div class='add'>+			 0xffff),	/* causes overflow warning */	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct iwl_causes_list causes_list_common[] = {</div><div class='add'>+	IWL_CAUSE(CSR_MSIX_FH_INT_MASK_AD, MSIX_FH_INT_CAUSES_D2S_CH0_NUM),</div><div class='add'>+	IWL_CAUSE(CSR_MSIX_FH_INT_MASK_AD, MSIX_FH_INT_CAUSES_D2S_CH1_NUM),</div><div class='add'>+	IWL_CAUSE(CSR_MSIX_FH_INT_MASK_AD, MSIX_FH_INT_CAUSES_S2D),</div><div class='add'>+	IWL_CAUSE(CSR_MSIX_FH_INT_MASK_AD, MSIX_FH_INT_CAUSES_FH_ERR),</div><div class='add'>+	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_ALIVE),</div><div class='add'>+	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_WAKEUP),</div><div class='add'>+	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_RESET_DONE),</div><div class='add'>+	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_TOP_FATAL_ERR),</div><div class='add'>+	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_CT_KILL),</div><div class='add'>+	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_RF_KILL),</div><div class='add'>+	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_PERIODIC),</div><div class='add'>+	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_SCD),</div><div class='add'>+	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_FH_TX),</div><div class='add'>+	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_HW_ERR),</div><div class='add'>+	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_HAP),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct iwl_causes_list causes_list_pre_bz[] = {</div><div class='add'>+	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_SW_ERR),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct iwl_causes_list causes_list_bz[] = {</div><div class='add'>+	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_SW_ERR_BZ),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void iwl_pcie_map_list(struct iwl_trans *trans,</div><div class='add'>+			      const struct iwl_causes_list *causes,</div><div class='add'>+			      int arr_size, int val)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; arr_size; i++) {</div><div class='add'>+		iwl_write8(trans, CSR_MSIX_IVAR(causes[i].addr), val);</div><div class='add'>+		iwl_clear_bit(trans, causes[i].mask_reg,</div><div class='add'>+			      BIT(causes[i].bit));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void iwl_pcie_map_non_rx_causes(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie =  IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	int val = trans_pcie-&gt;def_irq | MSIX_NON_AUTO_CLEAR_CAUSE;</div><div class='del'>-	int i, arr_size = ARRAY_SIZE(causes_list);</div><div class='del'>-	struct iwl_causes_list *causes = causes_list;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Access all non RX causes and map them to the default irq.</div><div class='ctx'> 	 * In case we are missing at least one interrupt vector,</div><div class='ctx'> 	 * the first interrupt vector will serve non-RX and FBQ causes.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; arr_size; i++) {</div><div class='del'>-		iwl_write8(trans, CSR_MSIX_IVAR(causes[i].addr), val);</div><div class='del'>-		iwl_clear_bit(trans, causes[i].mask_reg,</div><div class='del'>-			      causes[i].cause_num);</div><div class='del'>-	}</div><div class='add'>+	iwl_pcie_map_list(trans, causes_list_common,</div><div class='add'>+			  ARRAY_SIZE(causes_list_common), val);</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ)</div><div class='add'>+		iwl_pcie_map_list(trans, causes_list_bz,</div><div class='add'>+				  ARRAY_SIZE(causes_list_bz), val);</div><div class='add'>+	else</div><div class='add'>+		iwl_pcie_map_list(trans, causes_list_pre_bz,</div><div class='add'>+				  ARRAY_SIZE(causes_list_pre_bz), val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_pcie_map_rx_causes(struct iwl_trans *trans)</div><div class='hunk'>@@ -1095,7 +1119,7 @@ static void iwl_pcie_map_rx_causes(struct iwl_trans *trans)</div><div class='ctx'> 	 * the other (N - 2) interrupt vectors.</div><div class='ctx'> 	 */</div><div class='ctx'> 	val = BIT(MSIX_FH_INT_CAUSES_Q(0));</div><div class='del'>-	for (idx = 1; idx &lt; trans-&gt;num_rx_queues; idx++) {</div><div class='add'>+	for (idx = 1; idx &lt; trans-&gt;info.num_rxqs; idx++) {</div><div class='ctx'> 		iwl_write8(trans, CSR_MSIX_RX_IVAR(idx),</div><div class='ctx'> 			   MSIX_FH_INT_CAUSES_Q(idx - offset));</div><div class='ctx'> 		val |= BIT(MSIX_FH_INT_CAUSES_Q(idx));</div><div class='hunk'>@@ -1116,7 +1140,7 @@ void iwl_pcie_conf_msix_hw(struct iwl_trans_pcie *trans_pcie)</div><div class='ctx'> 	struct iwl_trans *trans = trans_pcie-&gt;trans;</div><div class='ctx'> </div><div class='ctx'> 	if (!trans_pcie-&gt;msix_enabled) {</div><div class='del'>-		if (trans-&gt;trans_cfg-&gt;mq_rx_supported &amp;&amp;</div><div class='add'>+		if (trans-&gt;mac_cfg-&gt;mq_rx_supported &amp;&amp;</div><div class='ctx'> 		    test_bit(STATUS_DEVICE_ENABLED, &amp;trans-&gt;status))</div><div class='ctx'> 			iwl_write_umac_prph(trans, UREG_CHICK,</div><div class='ctx'> 					    UREG_CHICK_MSI_ENABLE);</div><div class='hunk'>@@ -1157,7 +1181,7 @@ static void iwl_pcie_init_msix(struct iwl_trans_pcie *trans_pcie)</div><div class='ctx'> 	trans_pcie-&gt;hw_mask = trans_pcie-&gt;hw_init_mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void _iwl_trans_pcie_stop_device(struct iwl_trans *trans)</div><div class='add'>+static void _iwl_trans_pcie_stop_device(struct iwl_trans *trans, bool from_irq)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> </div><div class='hunk'>@@ -1184,11 +1208,14 @@ static void _iwl_trans_pcie_stop_device(struct iwl_trans *trans)</div><div class='ctx'> 	if (test_and_clear_bit(STATUS_DEVICE_ENABLED, &amp;trans-&gt;status)) {</div><div class='ctx'> 		IWL_DEBUG_INFO(trans,</div><div class='ctx'> 			       "DEVICE_ENABLED bit was set and is now cleared\n");</div><div class='add'>+		if (!from_irq)</div><div class='add'>+			iwl_pcie_synchronize_irqs(trans);</div><div class='add'>+		iwl_pcie_rx_napi_sync(trans);</div><div class='ctx'> 		iwl_pcie_tx_stop(trans);</div><div class='ctx'> 		iwl_pcie_rx_stop(trans);</div><div class='ctx'> </div><div class='ctx'> 		/* Power-down device's busmaster DMA clocks */</div><div class='del'>-		if (!trans-&gt;cfg-&gt;apmg_not_supported) {</div><div class='add'>+		if (!trans-&gt;mac_cfg-&gt;base-&gt;apmg_not_supported) {</div><div class='ctx'> 			iwl_write_prph(trans, APMG_CLK_DIS_REG,</div><div class='ctx'> 				       APMG_CLK_VAL_DMA_CLK_RQT);</div><div class='ctx'> 			udelay(5);</div><div class='hunk'>@@ -1196,13 +1223,18 @@ static void _iwl_trans_pcie_stop_device(struct iwl_trans *trans)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure (redundant) we've released our request to stay awake */</div><div class='del'>-	iwl_clear_bit(trans, CSR_GP_CNTRL,</div><div class='del'>-		      CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ)</div><div class='add'>+		iwl_clear_bit(trans, CSR_GP_CNTRL,</div><div class='add'>+			      CSR_GP_CNTRL_REG_FLAG_BZ_MAC_ACCESS_REQ);</div><div class='add'>+	else</div><div class='add'>+		iwl_clear_bit(trans, CSR_GP_CNTRL,</div><div class='add'>+			      CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='ctx'> </div><div class='ctx'> 	/* Stop the device, and put it in low power state */</div><div class='ctx'> 	iwl_pcie_apm_stop(trans, false);</div><div class='ctx'> </div><div class='del'>-	iwl_trans_pcie_sw_reset(trans);</div><div class='add'>+	/* re-take ownership to prevent other users from stealing the device */</div><div class='add'>+	iwl_trans_pcie_sw_reset(trans, true);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Upon stop, the IVAR table gets erased, so msi-x won't</div><div class='hunk'>@@ -1232,9 +1264,6 @@ static void _iwl_trans_pcie_stop_device(struct iwl_trans *trans)</div><div class='ctx'> 	 * interrupt</div><div class='ctx'> 	 */</div><div class='ctx'> 	iwl_enable_rfkill_int(trans);</div><div class='del'>-</div><div class='del'>-	/* re-take ownership to prevent other users from stealing the device */</div><div class='del'>-	iwl_pcie_prepare_card_hw(trans);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_pcie_synchronize_irqs(struct iwl_trans *trans)</div><div class='hunk'>@@ -1251,8 +1280,10 @@ void iwl_pcie_synchronize_irqs(struct iwl_trans *trans)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_trans_pcie_start_fw(struct iwl_trans *trans,</div><div class='del'>-				   const struct fw_img *fw, bool run_in_rfkill)</div><div class='add'>+int iwl_trans_pcie_start_fw(struct iwl_trans *trans,</div><div class='add'>+			    const struct iwl_fw *fw,</div><div class='add'>+			    const struct fw_img *img,</div><div class='add'>+			    bool run_in_rfkill)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	bool hw_rfkill;</div><div class='hunk'>@@ -1261,8 +1292,7 @@ static int iwl_trans_pcie_start_fw(struct iwl_trans *trans,</div><div class='ctx'> 	/* This may fail if AMT took ownership of the device */</div><div class='ctx'> 	if (iwl_pcie_prepare_card_hw(trans)) {</div><div class='ctx'> 		IWL_WARN(trans, "Exit HW not ready\n");</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out;</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	iwl_enable_rfkill_int(trans);</div><div class='hunk'>@@ -1324,10 +1354,10 @@ static int iwl_trans_pcie_start_fw(struct iwl_trans *trans,</div><div class='ctx'> 	iwl_write32(trans, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);</div><div class='ctx'> </div><div class='ctx'> 	/* Load the given image to the HW */</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_8000)</div><div class='del'>-		ret = iwl_pcie_load_given_ucode_8000(trans, fw);</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_8000)</div><div class='add'>+		ret = iwl_pcie_load_given_ucode_8000(trans, img);</div><div class='ctx'> 	else</div><div class='del'>-		ret = iwl_pcie_load_given_ucode(trans, fw);</div><div class='add'>+		ret = iwl_pcie_load_given_ucode(trans, img);</div><div class='ctx'> </div><div class='ctx'> 	/* re-check RF-Kill state since we may have missed the interrupt */</div><div class='ctx'> 	hw_rfkill = iwl_pcie_check_hw_rf_kill(trans);</div><div class='hunk'>@@ -1339,10 +1369,10 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_trans_pcie_fw_alive(struct iwl_trans *trans, u32 scd_addr)</div><div class='add'>+void iwl_trans_pcie_fw_alive(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	iwl_pcie_reset_ict(trans);</div><div class='del'>-	iwl_pcie_tx_start(trans, scd_addr);</div><div class='add'>+	iwl_pcie_tx_start(trans);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_trans_pcie_handle_stop_rfkill(struct iwl_trans *trans,</div><div class='hunk'>@@ -1371,10 +1401,10 @@ void iwl_trans_pcie_handle_stop_rfkill(struct iwl_trans *trans,</div><div class='ctx'> 		clear_bit(STATUS_RFKILL_OPMODE, &amp;trans-&gt;status);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (hw_rfkill != was_in_rfkill)</div><div class='del'>-		iwl_trans_pcie_rf_kill(trans, hw_rfkill);</div><div class='add'>+		iwl_trans_pcie_rf_kill(trans, hw_rfkill, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)</div><div class='add'>+void iwl_trans_pcie_stop_device(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	bool was_in_rfkill;</div><div class='hunk'>@@ -1386,12 +1416,12 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)</div><div class='ctx'> 	mutex_lock(&amp;trans_pcie-&gt;mutex);</div><div class='ctx'> 	trans_pcie-&gt;opmode_down = true;</div><div class='ctx'> 	was_in_rfkill = test_bit(STATUS_RFKILL_OPMODE, &amp;trans-&gt;status);</div><div class='del'>-	_iwl_trans_pcie_stop_device(trans);</div><div class='add'>+	_iwl_trans_pcie_stop_device(trans, false);</div><div class='ctx'> 	iwl_trans_pcie_handle_stop_rfkill(trans, was_in_rfkill);</div><div class='ctx'> 	mutex_unlock(&amp;trans_pcie-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_trans_pcie_rf_kill(struct iwl_trans *trans, bool state)</div><div class='add'>+void iwl_trans_pcie_rf_kill(struct iwl_trans *trans, bool state, bool from_irq)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie __maybe_unused *trans_pcie =</div><div class='ctx'> 		IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='hunk'>@@ -1400,33 +1430,31 @@ void iwl_trans_pcie_rf_kill(struct iwl_trans *trans, bool state)</div><div class='ctx'> </div><div class='ctx'> 	IWL_WARN(trans, "reporting RF_KILL (radio %s)\n",</div><div class='ctx'> 		 state ? "disabled" : "enabled");</div><div class='del'>-	if (iwl_op_mode_hw_rf_kill(trans-&gt;op_mode, state)) {</div><div class='del'>-		if (trans-&gt;trans_cfg-&gt;gen2)</div><div class='del'>-			_iwl_trans_pcie_gen2_stop_device(trans);</div><div class='del'>-		else</div><div class='del'>-			_iwl_trans_pcie_stop_device(trans);</div><div class='del'>-	}</div><div class='add'>+	if (iwl_op_mode_hw_rf_kill(trans-&gt;op_mode, state) &amp;&amp;</div><div class='add'>+	    !WARN_ON(trans-&gt;mac_cfg-&gt;gen2))</div><div class='add'>+		_iwl_trans_pcie_stop_device(trans, from_irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_pcie_d3_complete_suspend(struct iwl_trans *trans,</div><div class='del'>-				  bool test, bool reset)</div><div class='add'>+static void iwl_pcie_d3_complete_suspend(struct iwl_trans *trans,</div><div class='add'>+					 bool reset)</div><div class='ctx'> {</div><div class='ctx'> 	iwl_disable_interrupts(trans);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * in testing mode, the host stays awake and the</div><div class='del'>-	 * hardware won't be reset (not even partially)</div><div class='del'>-	 */</div><div class='del'>-	if (test)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	iwl_pcie_disable_ict(trans);</div><div class='ctx'> </div><div class='ctx'> 	iwl_pcie_synchronize_irqs(trans);</div><div class='ctx'> </div><div class='del'>-	iwl_clear_bit(trans, CSR_GP_CNTRL,</div><div class='del'>-		      CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='del'>-	iwl_clear_bit(trans, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ) {</div><div class='add'>+		iwl_clear_bit(trans, CSR_GP_CNTRL,</div><div class='add'>+			      CSR_GP_CNTRL_REG_FLAG_BZ_MAC_ACCESS_REQ);</div><div class='add'>+		iwl_clear_bit(trans, CSR_GP_CNTRL,</div><div class='add'>+			      CSR_GP_CNTRL_REG_FLAG_MAC_INIT);</div><div class='add'>+	} else {</div><div class='add'>+		iwl_clear_bit(trans, CSR_GP_CNTRL,</div><div class='add'>+			      CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='add'>+		iwl_clear_bit(trans, CSR_GP_CNTRL,</div><div class='add'>+			      CSR_GP_CNTRL_REG_FLAG_INIT_DONE);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (reset) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1440,58 +1468,86 @@ void iwl_pcie_d3_complete_suspend(struct iwl_trans *trans,</div><div class='ctx'> 	iwl_pcie_set_pwr(trans, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_trans_pcie_d3_suspend(struct iwl_trans *trans, bool test,</div><div class='del'>-				     bool reset)</div><div class='add'>+static int iwl_pcie_d3_handshake(struct iwl_trans *trans, bool suspend)</div><div class='ctx'> {</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct iwl_trans_pcie *trans_pcie =  IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> </div><div class='del'>-	if (!reset)</div><div class='del'>-		/* Enable persistence mode to avoid reset */</div><div class='del'>-		iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-			    CSR_HW_IF_CONFIG_REG_PERSIST_MODE);</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+	trans_pcie-&gt;sx_state = IWL_SX_WAITING;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family == IWL_DEVICE_FAMILY_AX210)</div><div class='ctx'> 		iwl_write_umac_prph(trans, UREG_DOORBELL_TO_ISR6,</div><div class='del'>-				    UREG_DOORBELL_TO_ISR6_SUSPEND);</div><div class='add'>+				    suspend ? UREG_DOORBELL_TO_ISR6_SUSPEND :</div><div class='add'>+					      UREG_DOORBELL_TO_ISR6_RESUME);</div><div class='add'>+	else</div><div class='add'>+		iwl_write32(trans, CSR_IPC_SLEEP_CONTROL,</div><div class='add'>+			    suspend ? CSR_IPC_SLEEP_CONTROL_SUSPEND :</div><div class='add'>+				      CSR_IPC_SLEEP_CONTROL_RESUME);</div><div class='ctx'> </div><div class='del'>-		ret = wait_event_timeout(trans_pcie-&gt;sx_waitq,</div><div class='del'>-					 trans_pcie-&gt;sx_complete, 2 * HZ);</div><div class='del'>-		/*</div><div class='del'>-		 * Invalidate it toward resume.</div><div class='del'>-		 */</div><div class='del'>-		trans_pcie-&gt;sx_complete = false;</div><div class='add'>+	ret = wait_event_timeout(trans_pcie-&gt;sx_waitq,</div><div class='add'>+				 trans_pcie-&gt;sx_state != IWL_SX_WAITING,</div><div class='add'>+				 2 * HZ);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		IWL_ERR(trans, "Timeout %s D3\n",</div><div class='add'>+			suspend ? "entering" : "exiting");</div><div class='add'>+		ret = -ETIMEDOUT;</div><div class='add'>+	} else {</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (!ret) {</div><div class='del'>-			IWL_ERR(trans, "Timeout entering D3\n");</div><div class='del'>-			return -ETIMEDOUT;</div><div class='del'>-		}</div><div class='add'>+	if (trans_pcie-&gt;sx_state == IWL_SX_ERROR) {</div><div class='add'>+		IWL_ERR(trans, "FW error while %s D3\n",</div><div class='add'>+			suspend ? "entering" : "exiting");</div><div class='add'>+		ret = -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	iwl_pcie_d3_complete_suspend(trans, test, reset);</div><div class='add'>+</div><div class='add'>+	/* Invalidate it toward next suspend or resume */</div><div class='add'>+	trans_pcie-&gt;sx_state = IWL_SX_INVALID;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_trans_pcie_d3_suspend(struct iwl_trans *trans, bool reset)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!reset)</div><div class='add'>+		/* Enable persistence mode to avoid reset */</div><div class='add'>+		iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+			    CSR_HW_IF_CONFIG_REG_PERSISTENCE);</div><div class='add'>+</div><div class='add'>+	ret = iwl_pcie_d3_handshake(trans, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	iwl_pcie_d3_complete_suspend(trans, reset);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_trans_pcie_d3_resume(struct iwl_trans *trans,</div><div class='del'>-				    enum iwl_d3_status *status,</div><div class='del'>-				    bool test,  bool reset)</div><div class='add'>+int iwl_trans_pcie_d3_resume(struct iwl_trans *trans,</div><div class='add'>+			     bool reset)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie =  IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	u32 val;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (test) {</div><div class='del'>-		iwl_enable_interrupts(trans);</div><div class='del'>-		*status = IWL_D3_STATUS_ALIVE;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl_set_bit(trans, CSR_GP_CNTRL,</div><div class='del'>-		    CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ)</div><div class='add'>+		iwl_set_bit(trans, CSR_GP_CNTRL,</div><div class='add'>+			    CSR_GP_CNTRL_REG_FLAG_BZ_MAC_ACCESS_REQ);</div><div class='add'>+	else</div><div class='add'>+		iwl_set_bit(trans, CSR_GP_CNTRL,</div><div class='add'>+			    CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='ctx'> </div><div class='del'>-	ret = iwl_finish_nic_init(trans, trans-&gt;trans_cfg);</div><div class='del'>-	if (ret)</div><div class='add'>+	ret = iwl_trans_activate_nic(trans);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(trans, "Failed to init nic upon resume. err = %d\n",</div><div class='add'>+			ret);</div><div class='ctx'> 		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Reconfigure IVAR table in case of MSIX or reset ict table in</div><div class='hunk'>@@ -1525,47 +1581,30 @@ static int iwl_trans_pcie_d3_resume(struct iwl_trans *trans,</div><div class='ctx'> 			iwl_read_umac_prph(trans, WFPM_GP2));</div><div class='ctx'> </div><div class='ctx'> 	val = iwl_read32(trans, CSR_RESET);</div><div class='del'>-	if (val &amp; CSR_RESET_REG_FLAG_NEVO_RESET)</div><div class='del'>-		*status = IWL_D3_STATUS_RESET;</div><div class='del'>-	else</div><div class='del'>-		*status = IWL_D3_STATUS_ALIVE;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	if (*status == IWL_D3_STATUS_ALIVE &amp;&amp;</div><div class='del'>-	    trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='del'>-		trans_pcie-&gt;sx_complete = false;</div><div class='del'>-		iwl_write_umac_prph(trans, UREG_DOORBELL_TO_ISR6,</div><div class='del'>-				    UREG_DOORBELL_TO_ISR6_RESUME);</div><div class='del'>-</div><div class='del'>-		ret = wait_event_timeout(trans_pcie-&gt;sx_waitq,</div><div class='del'>-					 trans_pcie-&gt;sx_complete, 2 * HZ);</div><div class='del'>-		/*</div><div class='del'>-		 * Invalidate it toward next suspend.</div><div class='del'>-		 */</div><div class='del'>-		trans_pcie-&gt;sx_complete = false;</div><div class='del'>-</div><div class='del'>-		if (!ret) {</div><div class='del'>-			IWL_ERR(trans, "Timeout exiting D3\n");</div><div class='del'>-			return -ETIMEDOUT;</div><div class='del'>-		}</div><div class='add'>+	if (val &amp; CSR_RESET_REG_FLAG_NEVO_RESET) {</div><div class='add'>+		IWL_INFO(trans, "Device was reset during suspend\n");</div><div class='add'>+		trans-&gt;state = IWL_TRANS_NO_FW;</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	return iwl_pcie_d3_handshake(trans, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> iwl_pcie_set_interrupt_capa(struct pci_dev *pdev,</div><div class='ctx'> 			    struct iwl_trans *trans,</div><div class='del'>-			    const struct iwl_cfg_trans_params *cfg_trans)</div><div class='add'>+			    const struct iwl_mac_cfg *mac_cfg,</div><div class='add'>+			    struct iwl_trans_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	int max_irqs, num_irqs, i, ret;</div><div class='ctx'> 	u16 pci_cmd;</div><div class='ctx'> 	u32 max_rx_queues = IWL_MAX_RX_HW_QUEUES;</div><div class='ctx'> </div><div class='del'>-	if (!cfg_trans-&gt;mq_rx_supported)</div><div class='add'>+	if (!mac_cfg-&gt;mq_rx_supported)</div><div class='ctx'> 		goto enable_msi;</div><div class='ctx'> </div><div class='del'>-	if (cfg_trans-&gt;device_family &lt;= IWL_DEVICE_FAMILY_9000)</div><div class='add'>+	if (mac_cfg-&gt;device_family &lt;= IWL_DEVICE_FAMILY_9000)</div><div class='ctx'> 		max_rx_queues = IWL_9000_MAX_RX_HW_QUEUES;</div><div class='ctx'> </div><div class='ctx'> 	max_irqs = min_t(u32, num_online_cpus() + 2, max_rx_queues);</div><div class='hunk'>@@ -1595,27 +1634,28 @@ iwl_pcie_set_interrupt_capa(struct pci_dev *pdev,</div><div class='ctx'> 	 * More than two interrupts: we will use fewer RSS queues.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (num_irqs &lt;= max_irqs - 2) {</div><div class='del'>-		trans_pcie-&gt;trans-&gt;num_rx_queues = num_irqs + 1;</div><div class='add'>+		info-&gt;num_rxqs = num_irqs + 1;</div><div class='ctx'> 		trans_pcie-&gt;shared_vec_mask = IWL_SHARED_IRQ_NON_RX |</div><div class='ctx'> 			IWL_SHARED_IRQ_FIRST_RSS;</div><div class='ctx'> 	} else if (num_irqs == max_irqs - 1) {</div><div class='del'>-		trans_pcie-&gt;trans-&gt;num_rx_queues = num_irqs;</div><div class='add'>+		info-&gt;num_rxqs = num_irqs;</div><div class='ctx'> 		trans_pcie-&gt;shared_vec_mask = IWL_SHARED_IRQ_NON_RX;</div><div class='ctx'> 	} else {</div><div class='del'>-		trans_pcie-&gt;trans-&gt;num_rx_queues = num_irqs - 1;</div><div class='add'>+		info-&gt;num_rxqs = num_irqs - 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_INFO(trans,</div><div class='ctx'> 		       "MSI-X enabled with rx queues %d, vec mask 0x%x\n",</div><div class='del'>-		       trans_pcie-&gt;trans-&gt;num_rx_queues, trans_pcie-&gt;shared_vec_mask);</div><div class='add'>+		       info-&gt;num_rxqs, trans_pcie-&gt;shared_vec_mask);</div><div class='ctx'> </div><div class='del'>-	WARN_ON(trans_pcie-&gt;trans-&gt;num_rx_queues &gt; IWL_MAX_RX_HW_QUEUES);</div><div class='add'>+	WARN_ON(info-&gt;num_rxqs &gt; IWL_MAX_RX_HW_QUEUES);</div><div class='ctx'> </div><div class='ctx'> 	trans_pcie-&gt;alloc_vecs = num_irqs;</div><div class='ctx'> 	trans_pcie-&gt;msix_enabled = true;</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> enable_msi:</div><div class='add'>+	info-&gt;num_rxqs = 1;</div><div class='ctx'> 	ret = pci_enable_msi(pdev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "pci_enable_msi failed - %d\n", ret);</div><div class='hunk'>@@ -1628,13 +1668,15 @@ enable_msi:</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_pcie_irq_set_affinity(struct iwl_trans *trans)</div><div class='add'>+static void iwl_pcie_irq_set_affinity(struct iwl_trans *trans,</div><div class='add'>+				      struct iwl_trans_info *info)</div><div class='ctx'> {</div><div class='add'>+#if defined(CONFIG_SMP)</div><div class='ctx'> 	int iter_rx_q, i, ret, cpu, offset;</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> </div><div class='ctx'> 	i = trans_pcie-&gt;shared_vec_mask &amp; IWL_SHARED_IRQ_FIRST_RSS ? 0 : 1;</div><div class='del'>-	iter_rx_q = trans_pcie-&gt;trans-&gt;num_rx_queues - 1 + i;</div><div class='add'>+	iter_rx_q = info-&gt;num_rxqs - 1 + i;</div><div class='ctx'> 	offset = 1 + i;</div><div class='ctx'> 	for (; i &lt; iter_rx_q ; i++) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1648,12 +1690,14 @@ static void iwl_pcie_irq_set_affinity(struct iwl_trans *trans)</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			IWL_ERR(trans_pcie-&gt;trans,</div><div class='ctx'> 				"Failed to set affinity mask for IRQ %d\n",</div><div class='del'>-				i);</div><div class='add'>+				trans_pcie-&gt;msix_entries[i].vector);</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_pcie_init_msix_handler(struct pci_dev *pdev,</div><div class='del'>-				      struct iwl_trans_pcie *trans_pcie)</div><div class='add'>+				      struct iwl_trans_pcie *trans_pcie,</div><div class='add'>+				      struct iwl_trans_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1682,7 +1726,7 @@ static int iwl_pcie_init_msix_handler(struct pci_dev *pdev,</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	iwl_pcie_irq_set_affinity(trans_pcie-&gt;trans);</div><div class='add'>+	iwl_pcie_irq_set_affinity(trans_pcie-&gt;trans, info);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1691,7 +1735,7 @@ static int iwl_trans_pcie_clear_persistence_bit(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	u32 hpm, wprot;</div><div class='ctx'> </div><div class='del'>-	switch (trans-&gt;trans_cfg-&gt;device_family) {</div><div class='add'>+	switch (trans-&gt;mac_cfg-&gt;device_family) {</div><div class='ctx'> 	case IWL_DEVICE_FAMILY_9000:</div><div class='ctx'> 		wprot = PREG_PRPH_WPROT_9000;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1703,7 +1747,7 @@ static int iwl_trans_pcie_clear_persistence_bit(struct iwl_trans *trans)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hpm = iwl_read_umac_prph_no_grab(trans, HPM_DEBUG);</div><div class='del'>-	if (hpm != 0xa5a5a5a0 &amp;&amp; (hpm &amp; PERSISTENCE_BIT)) {</div><div class='add'>+	if (!iwl_trans_is_hw_error_value(hpm) &amp;&amp; (hpm &amp; PERSISTENCE_BIT)) {</div><div class='ctx'> 		u32 wprot_val = iwl_read_umac_prph_no_grab(trans, wprot);</div><div class='ctx'> </div><div class='ctx'> 		if (wprot_val &amp; PREG_WFPM_ACCESS) {</div><div class='hunk'>@@ -1722,7 +1766,7 @@ static int iwl_pcie_gen2_force_power_gating(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = iwl_finish_nic_init(trans, trans-&gt;trans_cfg);</div><div class='add'>+	ret = iwl_trans_activate_nic(trans);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1736,12 +1780,10 @@ static int iwl_pcie_gen2_force_power_gating(struct iwl_trans *trans)</div><div class='ctx'> 	iwl_clear_bits_prph(trans, HPM_HIPM_GEN_CFG,</div><div class='ctx'> 			    HPM_HIPM_GEN_CFG_CR_FORCE_ACTIVE);</div><div class='ctx'> </div><div class='del'>-	iwl_trans_pcie_sw_reset(trans);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return iwl_trans_pcie_sw_reset(trans, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int _iwl_trans_pcie_start_hw(struct iwl_trans *trans)</div><div class='add'>+int _iwl_trans_pcie_start_hw(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1758,10 +1800,12 @@ static int _iwl_trans_pcie_start_hw(struct iwl_trans *trans)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	iwl_trans_pcie_sw_reset(trans);</div><div class='add'>+	err = iwl_trans_pcie_sw_reset(trans, true);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family == IWL_DEVICE_FAMILY_22000 &amp;&amp;</div><div class='del'>-	    trans-&gt;trans_cfg-&gt;integrated) {</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family == IWL_DEVICE_FAMILY_22000 &amp;&amp;</div><div class='add'>+	    trans-&gt;mac_cfg-&gt;integrated) {</div><div class='ctx'> 		err = iwl_pcie_gen2_force_power_gating(trans);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -1787,7 +1831,7 @@ static int _iwl_trans_pcie_start_hw(struct iwl_trans *trans)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_trans_pcie_start_hw(struct iwl_trans *trans)</div><div class='add'>+int iwl_trans_pcie_start_hw(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1799,7 +1843,7 @@ static int iwl_trans_pcie_start_hw(struct iwl_trans *trans)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_trans_pcie_op_mode_leave(struct iwl_trans *trans)</div><div class='add'>+void iwl_trans_pcie_op_mode_leave(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> </div><div class='hunk'>@@ -1819,30 +1863,30 @@ static void iwl_trans_pcie_op_mode_leave(struct iwl_trans *trans)</div><div class='ctx'> 	iwl_pcie_synchronize_irqs(trans);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_trans_pcie_write8(struct iwl_trans *trans, u32 ofs, u8 val)</div><div class='add'>+void iwl_trans_pcie_write8(struct iwl_trans *trans, u32 ofs, u8 val)</div><div class='ctx'> {</div><div class='ctx'> 	writeb(val, IWL_TRANS_GET_PCIE_TRANS(trans)-&gt;hw_base + ofs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_trans_pcie_write32(struct iwl_trans *trans, u32 ofs, u32 val)</div><div class='add'>+void iwl_trans_pcie_write32(struct iwl_trans *trans, u32 ofs, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	writel(val, IWL_TRANS_GET_PCIE_TRANS(trans)-&gt;hw_base + ofs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 iwl_trans_pcie_read32(struct iwl_trans *trans, u32 ofs)</div><div class='add'>+u32 iwl_trans_pcie_read32(struct iwl_trans *trans, u32 ofs)</div><div class='ctx'> {</div><div class='ctx'> 	return readl(IWL_TRANS_GET_PCIE_TRANS(trans)-&gt;hw_base + ofs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 iwl_trans_pcie_prph_msk(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='ctx'> 		return 0x00FFFFFF;</div><div class='ctx'> 	else</div><div class='ctx'> 		return 0x000FFFFF;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 iwl_trans_pcie_read_prph(struct iwl_trans *trans, u32 reg)</div><div class='add'>+u32 iwl_trans_pcie_read_prph(struct iwl_trans *trans, u32 reg)</div><div class='ctx'> {</div><div class='ctx'> 	u32 mask = iwl_trans_pcie_prph_msk(trans);</div><div class='ctx'> </div><div class='hunk'>@@ -1851,8 +1895,7 @@ static u32 iwl_trans_pcie_read_prph(struct iwl_trans *trans, u32 reg)</div><div class='ctx'> 	return iwl_trans_pcie_read32(trans, HBUS_TARG_PRPH_RDAT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_trans_pcie_write_prph(struct iwl_trans *trans, u32 addr,</div><div class='del'>-				      u32 val)</div><div class='add'>+void iwl_trans_pcie_write_prph(struct iwl_trans *trans, u32 addr, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	u32 mask = iwl_trans_pcie_prph_msk(trans);</div><div class='ctx'> </div><div class='hunk'>@@ -1861,49 +1904,67 @@ static void iwl_trans_pcie_write_prph(struct iwl_trans *trans, u32 addr,</div><div class='ctx'> 	iwl_trans_pcie_write32(trans, HBUS_TARG_PRPH_WDAT, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_trans_pcie_configure(struct iwl_trans *trans,</div><div class='del'>-				     const struct iwl_trans_config *trans_cfg)</div><div class='add'>+void iwl_pcie_gen1_2_op_mode_enter(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> </div><div class='del'>-	trans-&gt;txqs.cmd.q_id = trans_cfg-&gt;cmd_queue;</div><div class='del'>-	trans-&gt;txqs.cmd.fifo = trans_cfg-&gt;cmd_fifo;</div><div class='del'>-	trans-&gt;txqs.cmd.wdg_timeout = trans_cfg-&gt;cmd_q_wdg_timeout;</div><div class='del'>-	trans-&gt;txqs.page_offs = trans_cfg-&gt;cb_data_offs;</div><div class='del'>-	trans-&gt;txqs.dev_cmd_offs = trans_cfg-&gt;cb_data_offs + sizeof(void *);</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(trans_cfg-&gt;n_no_reclaim_cmds &gt; MAX_NO_RECLAIM_CMDS))</div><div class='del'>-		trans_pcie-&gt;n_no_reclaim_cmds = 0;</div><div class='del'>-	else</div><div class='del'>-		trans_pcie-&gt;n_no_reclaim_cmds = trans_cfg-&gt;n_no_reclaim_cmds;</div><div class='del'>-	if (trans_pcie-&gt;n_no_reclaim_cmds)</div><div class='del'>-		memcpy(trans_pcie-&gt;no_reclaim_cmds, trans_cfg-&gt;no_reclaim_cmds,</div><div class='del'>-		       trans_pcie-&gt;n_no_reclaim_cmds * sizeof(u8));</div><div class='add'>+	/* free all first - we might be reconfigured for a different size */</div><div class='add'>+	iwl_pcie_free_rbs_pool(trans);</div><div class='ctx'> </div><div class='del'>-	trans_pcie-&gt;rx_buf_size = trans_cfg-&gt;rx_buf_size;</div><div class='ctx'> 	trans_pcie-&gt;rx_page_order =</div><div class='del'>-		iwl_trans_get_rb_size_order(trans_pcie-&gt;rx_buf_size);</div><div class='add'>+		iwl_trans_get_rb_size_order(trans-&gt;conf.rx_buf_size);</div><div class='ctx'> 	trans_pcie-&gt;rx_buf_bytes =</div><div class='del'>-		iwl_trans_get_rb_size(trans_pcie-&gt;rx_buf_size);</div><div class='del'>-	trans_pcie-&gt;supported_dma_mask = DMA_BIT_MASK(12);</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='del'>-		trans_pcie-&gt;supported_dma_mask = DMA_BIT_MASK(11);</div><div class='add'>+		iwl_trans_get_rb_size(trans-&gt;conf.rx_buf_size);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	trans-&gt;txqs.bc_table_dword = trans_cfg-&gt;bc_table_dword;</div><div class='del'>-	trans_pcie-&gt;scd_set_active = trans_cfg-&gt;scd_set_active;</div><div class='add'>+void iwl_trans_pcie_free_pnvm_dram_regions(struct iwl_dram_regions *dram_regions,</div><div class='add'>+					   struct device *dev)</div><div class='add'>+{</div><div class='add'>+	u8 i;</div><div class='add'>+	struct iwl_dram_data *desc_dram = &amp;dram_regions-&gt;prph_scratch_mem_desc;</div><div class='add'>+</div><div class='add'>+	/* free DRAM payloads */</div><div class='add'>+	for (i = 0; i &lt; dram_regions-&gt;n_regions; i++) {</div><div class='add'>+		dma_free_coherent(dev, dram_regions-&gt;drams[i].size,</div><div class='add'>+				  dram_regions-&gt;drams[i].block,</div><div class='add'>+				  dram_regions-&gt;drams[i].physical);</div><div class='add'>+	}</div><div class='add'>+	dram_regions-&gt;n_regions = 0;</div><div class='ctx'> </div><div class='del'>-	trans-&gt;command_groups = trans_cfg-&gt;command_groups;</div><div class='del'>-	trans-&gt;command_groups_size = trans_cfg-&gt;command_groups_size;</div><div class='add'>+	/* free DRAM addresses array */</div><div class='add'>+	if (desc_dram-&gt;block) {</div><div class='add'>+		dma_free_coherent(dev, desc_dram-&gt;size,</div><div class='add'>+				  desc_dram-&gt;block,</div><div class='add'>+				  desc_dram-&gt;physical);</div><div class='add'>+	}</div><div class='add'>+	memset(desc_dram, 0, sizeof(*desc_dram));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* Initialize NAPI here - it should be before registering to mac80211</div><div class='del'>-	 * in the opmode but after the HW struct is allocated.</div><div class='del'>-	 * As this function may be called again in some corner cases don't</div><div class='del'>-	 * do anything if NAPI was already initialized.</div><div class='del'>-	 */</div><div class='del'>-	if (trans_pcie-&gt;napi_dev.reg_state != NETREG_DUMMY)</div><div class='del'>-		init_dummy_netdev(&amp;trans_pcie-&gt;napi_dev);</div><div class='add'>+static void iwl_pcie_free_invalid_tx_cmd(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> </div><div class='del'>-	trans_pcie-&gt;fw_reset_handshake = trans_cfg-&gt;fw_reset_handshake;</div><div class='add'>+	iwl_pcie_free_dma_ptr(trans, &amp;trans_pcie-&gt;invalid_tx_cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_pcie_alloc_invalid_tx_cmd(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_cmd_header_wide bad_cmd = {</div><div class='add'>+		.cmd = INVALID_WR_PTR_CMD,</div><div class='add'>+		.group_id = DEBUG_GROUP,</div><div class='add'>+		.sequence = cpu_to_le16(0xffff),</div><div class='add'>+		.length = cpu_to_le16(0),</div><div class='add'>+		.version = 0,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = iwl_pcie_alloc_dma_ptr(trans, &amp;trans_pcie-&gt;invalid_tx_cmd,</div><div class='add'>+				     sizeof(bad_cmd));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	memcpy(trans_pcie-&gt;invalid_tx_cmd.addr, &amp;bad_cmd, sizeof(bad_cmd));</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_trans_pcie_free(struct iwl_trans *trans)</div><div class='hunk'>@@ -1913,7 +1974,7 @@ void iwl_trans_pcie_free(struct iwl_trans *trans)</div><div class='ctx'> </div><div class='ctx'> 	iwl_pcie_synchronize_irqs(trans);</div><div class='ctx'> </div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;gen2)</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;gen2)</div><div class='ctx'> 		iwl_txq_gen2_tx_free(trans);</div><div class='ctx'> 	else</div><div class='ctx'> 		iwl_pcie_tx_free(trans);</div><div class='hunk'>@@ -1936,28 +1997,186 @@ void iwl_trans_pcie_free(struct iwl_trans *trans)</div><div class='ctx'> 		iwl_pcie_free_ict(trans);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	free_netdev(trans_pcie-&gt;napi_dev);</div><div class='add'>+</div><div class='add'>+	iwl_pcie_free_invalid_tx_cmd(trans);</div><div class='add'>+</div><div class='ctx'> 	iwl_pcie_free_fw_monitor(trans);</div><div class='ctx'> </div><div class='del'>-	if (trans_pcie-&gt;pnvm_dram.size)</div><div class='del'>-		dma_free_coherent(trans-&gt;dev, trans_pcie-&gt;pnvm_dram.size,</div><div class='del'>-				  trans_pcie-&gt;pnvm_dram.block,</div><div class='del'>-				  trans_pcie-&gt;pnvm_dram.physical);</div><div class='add'>+	iwl_trans_pcie_free_pnvm_dram_regions(&amp;trans_pcie-&gt;pnvm_data,</div><div class='add'>+					      trans-&gt;dev);</div><div class='add'>+	iwl_trans_pcie_free_pnvm_dram_regions(&amp;trans_pcie-&gt;reduced_tables_data,</div><div class='add'>+					      trans-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	mutex_destroy(&amp;trans_pcie-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (trans_pcie-&gt;txqs.tso_hdr_page) {</div><div class='add'>+		for_each_possible_cpu(i) {</div><div class='add'>+			struct iwl_tso_hdr_page *p =</div><div class='add'>+				per_cpu_ptr(trans_pcie-&gt;txqs.tso_hdr_page, i);</div><div class='add'>+</div><div class='add'>+			if (p &amp;&amp; p-&gt;page)</div><div class='add'>+				__free_page(p-&gt;page);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		free_percpu(trans_pcie-&gt;txqs.tso_hdr_page);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kmem_cache_destroy(trans_pcie-&gt;dev_cmd_pool);</div><div class='ctx'> 	iwl_trans_free(trans);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_trans_pcie_set_pmi(struct iwl_trans *trans, bool state)</div><div class='add'>+static union acpi_object *</div><div class='add'>+iwl_trans_pcie_call_prod_reset_dsm(struct pci_dev *pdev, u16 cmd, u16 value)</div><div class='ctx'> {</div><div class='del'>-	if (state)</div><div class='del'>-		set_bit(STATUS_TPOWER_PMI, &amp;trans-&gt;status);</div><div class='add'>+#ifdef CONFIG_ACPI</div><div class='add'>+	struct iwl_dsm_internal_product_reset_cmd pldr_arg = {</div><div class='add'>+		.cmd = cmd,</div><div class='add'>+		.value = value,</div><div class='add'>+	};</div><div class='add'>+	union acpi_object arg = {</div><div class='add'>+		.buffer.type = ACPI_TYPE_BUFFER,</div><div class='add'>+		.buffer.length = sizeof(pldr_arg),</div><div class='add'>+		.buffer.pointer = (void *)&amp;pldr_arg,</div><div class='add'>+	};</div><div class='add'>+	static const guid_t dsm_guid = GUID_INIT(0x7266172C, 0x220B, 0x4B29,</div><div class='add'>+						 0x81, 0x4F, 0x75, 0xE4,</div><div class='add'>+						 0xDD, 0x26, 0xB5, 0xFD);</div><div class='add'>+</div><div class='add'>+	if (!acpi_check_dsm(ACPI_HANDLE(&amp;pdev-&gt;dev), &amp;dsm_guid, ACPI_DSM_REV,</div><div class='add'>+			    DSM_INTERNAL_FUNC_PRODUCT_RESET))</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='add'>+</div><div class='add'>+	return iwl_acpi_get_dsm_object(&amp;pdev-&gt;dev, ACPI_DSM_REV,</div><div class='add'>+				       DSM_INTERNAL_FUNC_PRODUCT_RESET,</div><div class='add'>+				       &amp;arg, &amp;dsm_guid);</div><div class='add'>+#else</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_trans_pcie_check_product_reset_mode(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	union acpi_object *res;</div><div class='add'>+</div><div class='add'>+	res = iwl_trans_pcie_call_prod_reset_dsm(pdev,</div><div class='add'>+						 DSM_INTERNAL_PLDR_CMD_GET_MODE,</div><div class='add'>+						 0);</div><div class='add'>+	if (IS_ERR(res))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (res-&gt;type != ACPI_TYPE_INTEGER)</div><div class='add'>+		IWL_ERR_DEV(&amp;pdev-&gt;dev,</div><div class='add'>+			    "unexpected return type from product reset DSM\n");</div><div class='add'>+	else</div><div class='add'>+		IWL_DEBUG_DEV_POWER(&amp;pdev-&gt;dev,</div><div class='add'>+				    "product reset mode is 0x%llx\n",</div><div class='add'>+				    res-&gt;integer.value);</div><div class='add'>+</div><div class='add'>+	ACPI_FREE(res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_trans_pcie_set_product_reset(struct pci_dev *pdev, bool enable,</div><div class='add'>+					     bool integrated)</div><div class='add'>+{</div><div class='add'>+	union acpi_object *res;</div><div class='add'>+	u16 mode = enable ? DSM_INTERNAL_PLDR_MODE_EN_PROD_RESET : 0;</div><div class='add'>+</div><div class='add'>+	if (!integrated)</div><div class='add'>+		mode |= DSM_INTERNAL_PLDR_MODE_EN_WIFI_FLR |</div><div class='add'>+			DSM_INTERNAL_PLDR_MODE_EN_BT_OFF_ON;</div><div class='add'>+</div><div class='add'>+	res = iwl_trans_pcie_call_prod_reset_dsm(pdev,</div><div class='add'>+						 DSM_INTERNAL_PLDR_CMD_SET_MODE,</div><div class='add'>+						 mode);</div><div class='add'>+	if (IS_ERR(res)) {</div><div class='add'>+		if (enable)</div><div class='add'>+			IWL_ERR_DEV(&amp;pdev-&gt;dev,</div><div class='add'>+				    "ACPI _DSM not available (%d), cannot do product reset\n",</div><div class='add'>+				    (int)PTR_ERR(res));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ACPI_FREE(res);</div><div class='add'>+	IWL_DEBUG_DEV_POWER(&amp;pdev-&gt;dev, "%sabled product reset via DSM\n",</div><div class='add'>+			    enable ? "En" : "Dis");</div><div class='add'>+	iwl_trans_pcie_check_product_reset_mode(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_trans_pcie_check_product_reset_status(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	union acpi_object *res;</div><div class='add'>+</div><div class='add'>+	res = iwl_trans_pcie_call_prod_reset_dsm(pdev,</div><div class='add'>+						 DSM_INTERNAL_PLDR_CMD_GET_STATUS,</div><div class='add'>+						 0);</div><div class='add'>+	if (IS_ERR(res))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (res-&gt;type != ACPI_TYPE_INTEGER)</div><div class='add'>+		IWL_ERR_DEV(&amp;pdev-&gt;dev,</div><div class='add'>+			    "unexpected return type from product reset DSM\n");</div><div class='ctx'> 	else</div><div class='del'>-		clear_bit(STATUS_TPOWER_PMI, &amp;trans-&gt;status);</div><div class='add'>+		IWL_DEBUG_DEV_POWER(&amp;pdev-&gt;dev,</div><div class='add'>+				    "product reset status is 0x%llx\n",</div><div class='add'>+				    res-&gt;integer.value);</div><div class='add'>+</div><div class='add'>+	ACPI_FREE(res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_trans_pcie_call_reset(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_ACPI</div><div class='add'>+	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='add'>+	union acpi_object *p, *ref;</div><div class='add'>+	acpi_status status;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	status = acpi_evaluate_object(ACPI_HANDLE(&amp;pdev-&gt;dev),</div><div class='add'>+				      "_PRR", NULL, &amp;buffer);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		IWL_DEBUG_DEV_POWER(&amp;pdev-&gt;dev, "No _PRR method found\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	p = buffer.pointer;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;type != ACPI_TYPE_PACKAGE || p-&gt;package.count != 1) {</div><div class='add'>+		pci_err(pdev, "Bad _PRR return type\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ref = &amp;p-&gt;package.elements[0];</div><div class='add'>+	if (ref-&gt;type != ACPI_TYPE_LOCAL_REFERENCE) {</div><div class='add'>+		pci_err(pdev, "_PRR wasn't a reference\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = acpi_evaluate_object(ref-&gt;reference.handle,</div><div class='add'>+				      "_RST", NULL, NULL);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		pci_err(pdev,</div><div class='add'>+			"Failed to call _RST on object returned by _PRR (%d)\n",</div><div class='add'>+			status);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	ret = 0;</div><div class='add'>+out:</div><div class='add'>+	kfree(buffer.pointer);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		IWL_DEBUG_DEV_POWER(&amp;pdev-&gt;dev, "called _RST on _PRR object\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	IWL_DEBUG_DEV_POWER(&amp;pdev-&gt;dev,</div><div class='add'>+			    "No BIOS support, using pci_reset_function()\n");</div><div class='add'>+#endif</div><div class='add'>+	pci_reset_function(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct iwl_trans_pcie_removal {</div><div class='ctx'> 	struct pci_dev *pdev;</div><div class='ctx'> 	struct work_struct work;</div><div class='add'>+	enum iwl_reset_mode mode;</div><div class='add'>+	bool integrated;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void iwl_trans_pcie_removal_wk(struct work_struct *wk)</div><div class='hunk'>@@ -1966,36 +2185,174 @@ static void iwl_trans_pcie_removal_wk(struct work_struct *wk)</div><div class='ctx'> 		container_of(wk, struct iwl_trans_pcie_removal, work);</div><div class='ctx'> 	struct pci_dev *pdev = removal-&gt;pdev;</div><div class='ctx'> 	static char *prop[] = {"EVENT=INACCESSIBLE", NULL};</div><div class='add'>+	struct pci_bus *bus;</div><div class='ctx'> </div><div class='del'>-	dev_err(&amp;pdev-&gt;dev, "Device gone - attempting removal\n");</div><div class='del'>-	kobject_uevent_env(&amp;pdev-&gt;dev.kobj, KOBJ_CHANGE, prop);</div><div class='ctx'> 	pci_lock_rescan_remove();</div><div class='del'>-	pci_dev_put(pdev);</div><div class='add'>+</div><div class='add'>+	bus = pdev-&gt;bus;</div><div class='add'>+	/* in this case, something else already removed the device */</div><div class='add'>+	if (!bus)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	kobject_uevent_env(&amp;pdev-&gt;dev.kobj, KOBJ_CHANGE, prop);</div><div class='add'>+</div><div class='add'>+	if (removal-&gt;mode == IWL_RESET_MODE_PROD_RESET) {</div><div class='add'>+		struct pci_dev *bt = NULL;</div><div class='add'>+</div><div class='add'>+		if (!removal-&gt;integrated) {</div><div class='add'>+			/* discrete devices have WiFi/BT at function 0/1 */</div><div class='add'>+			int slot = PCI_SLOT(pdev-&gt;devfn);</div><div class='add'>+			int func = PCI_FUNC(pdev-&gt;devfn);</div><div class='add'>+</div><div class='add'>+			if (func == 0)</div><div class='add'>+				bt = pci_get_slot(bus, PCI_DEVFN(slot, 1));</div><div class='add'>+			else</div><div class='add'>+				pci_info(pdev, "Unexpected function %d\n",</div><div class='add'>+					 func);</div><div class='add'>+		} else {</div><div class='add'>+			/* on integrated we have to look up by ID (same bus) */</div><div class='add'>+			static const struct pci_device_id bt_device_ids[] = {</div><div class='add'>+#define BT_DEV(_id) { PCI_DEVICE(PCI_VENDOR_ID_INTEL, _id) }</div><div class='add'>+				BT_DEV(0xA876), /* LNL */</div><div class='add'>+				BT_DEV(0xE476), /* PTL-P */</div><div class='add'>+				BT_DEV(0xE376), /* PTL-H */</div><div class='add'>+				BT_DEV(0xD346), /* NVL-H */</div><div class='add'>+				BT_DEV(0x6E74), /* NVL-S */</div><div class='add'>+				BT_DEV(0x4D76), /* WCL */</div><div class='add'>+				BT_DEV(0xD246), /* RZL-H */</div><div class='add'>+				BT_DEV(0x6C46), /* RZL-M */</div><div class='add'>+				{}</div><div class='add'>+			};</div><div class='add'>+			struct pci_dev *tmp = NULL;</div><div class='add'>+</div><div class='add'>+			for_each_pci_dev(tmp) {</div><div class='add'>+				if (tmp-&gt;bus != bus)</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				if (pci_match_id(bt_device_ids, tmp)) {</div><div class='add'>+					bt = tmp;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (bt) {</div><div class='add'>+			pci_info(bt, "Removal by WiFi due to product reset\n");</div><div class='add'>+			pci_stop_and_remove_bus_device(bt);</div><div class='add'>+			pci_dev_put(bt);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_trans_pcie_set_product_reset(pdev,</div><div class='add'>+					 removal-&gt;mode ==</div><div class='add'>+						IWL_RESET_MODE_PROD_RESET,</div><div class='add'>+					 removal-&gt;integrated);</div><div class='add'>+	if (removal-&gt;mode &gt;= IWL_RESET_MODE_FUNC_RESET)</div><div class='add'>+		iwl_trans_pcie_call_reset(pdev);</div><div class='add'>+</div><div class='ctx'> 	pci_stop_and_remove_bus_device(pdev);</div><div class='add'>+	pci_dev_put(pdev);</div><div class='add'>+</div><div class='add'>+	if (removal-&gt;mode &gt;= IWL_RESET_MODE_RESCAN) {</div><div class='add'>+		if (bus-&gt;parent)</div><div class='add'>+			bus = bus-&gt;parent;</div><div class='add'>+		pci_rescan_bus(bus);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='ctx'> 	pci_unlock_rescan_remove();</div><div class='ctx'> </div><div class='ctx'> 	kfree(removal);</div><div class='ctx'> 	module_put(THIS_MODULE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void iwl_trans_pcie_reset(struct iwl_trans *trans, enum iwl_reset_mode mode)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_trans_pcie_removal *removal;</div><div class='add'>+	char _msg = 0, *msg = &amp;_msg;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(mode &lt; IWL_RESET_MODE_REMOVE_ONLY ||</div><div class='add'>+		    mode == IWL_RESET_MODE_BACKOFF))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (test_bit(STATUS_TRANS_DEAD, &amp;trans-&gt;status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (trans_pcie-&gt;me_present &amp;&amp; mode == IWL_RESET_MODE_PROD_RESET) {</div><div class='add'>+		mode = IWL_RESET_MODE_FUNC_RESET;</div><div class='add'>+		if (trans_pcie-&gt;me_present &lt; 0)</div><div class='add'>+			msg = " instead of product reset as ME may be present";</div><div class='add'>+		else</div><div class='add'>+			msg = " instead of product reset as ME is present";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_INFO(trans, "scheduling reset (mode=%d%s)\n", mode, msg);</div><div class='add'>+</div><div class='add'>+	iwl_pcie_dump_csr(trans);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * get a module reference to avoid doing this</div><div class='add'>+	 * while unloading anyway and to avoid</div><div class='add'>+	 * scheduling a work with code that's being</div><div class='add'>+	 * removed.</div><div class='add'>+	 */</div><div class='add'>+	if (!try_module_get(THIS_MODULE)) {</div><div class='add'>+		IWL_ERR(trans,</div><div class='add'>+			"Module is being unloaded - abort\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	removal = kzalloc(sizeof(*removal), GFP_ATOMIC);</div><div class='add'>+	if (!removal) {</div><div class='add'>+		module_put(THIS_MODULE);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * we don't need to clear this flag, because</div><div class='add'>+	 * the trans will be freed and reallocated.</div><div class='add'>+	 */</div><div class='add'>+	set_bit(STATUS_TRANS_DEAD, &amp;trans-&gt;status);</div><div class='add'>+</div><div class='add'>+	removal-&gt;pdev = to_pci_dev(trans-&gt;dev);</div><div class='add'>+	removal-&gt;mode = mode;</div><div class='add'>+	removal-&gt;integrated = trans-&gt;mac_cfg-&gt;integrated;</div><div class='add'>+	INIT_WORK(&amp;removal-&gt;work, iwl_trans_pcie_removal_wk);</div><div class='add'>+	pci_dev_get(removal-&gt;pdev);</div><div class='add'>+	schedule_work(&amp;removal-&gt;work);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(iwl_trans_pcie_reset);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This version doesn't disable BHs but rather assumes they're</div><div class='ctx'>  * already disabled.</div><div class='ctx'>  */</div><div class='del'>-bool __iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans)</div><div class='add'>+bool __iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans, bool silent)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	u32 write = CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ;</div><div class='add'>+	u32 mask = CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY |</div><div class='add'>+		   CSR_GP_CNTRL_REG_FLAG_GOING_TO_SLEEP;</div><div class='add'>+	u32 poll = CSR_GP_CNTRL_REG_VAL_MAC_ACCESS_EN;</div><div class='add'>+</div><div class='add'>+	if (test_bit(STATUS_TRANS_DEAD, &amp;trans-&gt;status))</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;trans_pcie-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (trans_pcie-&gt;cmd_hold_nic_awake)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ) {</div><div class='add'>+		write = CSR_GP_CNTRL_REG_FLAG_BZ_MAC_ACCESS_REQ;</div><div class='add'>+		mask = CSR_GP_CNTRL_REG_FLAG_MAC_STATUS;</div><div class='add'>+		poll = CSR_GP_CNTRL_REG_FLAG_MAC_STATUS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* this bit wakes up the NIC */</div><div class='del'>-	__iwl_trans_pcie_set_bit(trans, CSR_GP_CNTRL,</div><div class='del'>-				 CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_8000)</div><div class='add'>+	iwl_trans_set_bit(trans, CSR_GP_CNTRL, write);</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_8000)</div><div class='ctx'> 		udelay(2);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2018,60 +2375,28 @@ bool __iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans)</div><div class='ctx'> 	 * 5000 series and later (including 1000 series) have non-volatile SRAM,</div><div class='ctx'> 	 * and do not save/restore SRAM when power cycling.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = iwl_poll_bit(trans, CSR_GP_CNTRL,</div><div class='del'>-			   CSR_GP_CNTRL_REG_VAL_MAC_ACCESS_EN,</div><div class='del'>-			   (CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY |</div><div class='del'>-			    CSR_GP_CNTRL_REG_FLAG_GOING_TO_SLEEP), 15000);</div><div class='del'>-	if (unlikely(ret &lt; 0)) {</div><div class='add'>+	ret = iwl_poll_bits_mask(trans, CSR_GP_CNTRL, poll, mask, 15000);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		u32 cntrl = iwl_read32(trans, CSR_GP_CNTRL);</div><div class='ctx'> </div><div class='add'>+		if (silent) {</div><div class='add'>+			spin_unlock(&amp;trans_pcie-&gt;reg_lock);</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		WARN_ONCE(1,</div><div class='ctx'> 			  "Timeout waiting for hardware access (CSR_GP_CNTRL 0x%08x)\n",</div><div class='ctx'> 			  cntrl);</div><div class='ctx'> </div><div class='del'>-		iwl_trans_pcie_dump_regs(trans);</div><div class='add'>+		iwl_trans_pcie_dump_regs(trans, trans_pcie-&gt;pci_dev);</div><div class='ctx'> </div><div class='del'>-		if (iwlwifi_mod_params.remove_when_gone &amp;&amp; cntrl == ~0U) {</div><div class='del'>-			struct iwl_trans_pcie_removal *removal;</div><div class='del'>-</div><div class='del'>-			if (test_bit(STATUS_TRANS_DEAD, &amp;trans-&gt;status))</div><div class='del'>-				goto err;</div><div class='del'>-</div><div class='del'>-			IWL_ERR(trans, "Device gone - scheduling removal!\n");</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * get a module reference to avoid doing this</div><div class='del'>-			 * while unloading anyway and to avoid</div><div class='del'>-			 * scheduling a work with code that's being</div><div class='del'>-			 * removed.</div><div class='del'>-			 */</div><div class='del'>-			if (!try_module_get(THIS_MODULE)) {</div><div class='del'>-				IWL_ERR(trans,</div><div class='del'>-					"Module is being unloaded - abort\n");</div><div class='del'>-				goto err;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			removal = kzalloc(sizeof(*removal), GFP_ATOMIC);</div><div class='del'>-			if (!removal) {</div><div class='del'>-				module_put(THIS_MODULE);</div><div class='del'>-				goto err;</div><div class='del'>-			}</div><div class='del'>-			/*</div><div class='del'>-			 * we don't need to clear this flag, because</div><div class='del'>-			 * the trans will be freed and reallocated.</div><div class='del'>-			*/</div><div class='del'>-			set_bit(STATUS_TRANS_DEAD, &amp;trans-&gt;status);</div><div class='del'>-</div><div class='del'>-			removal-&gt;pdev = to_pci_dev(trans-&gt;dev);</div><div class='del'>-			INIT_WORK(&amp;removal-&gt;work, iwl_trans_pcie_removal_wk);</div><div class='del'>-			pci_dev_get(removal-&gt;pdev);</div><div class='del'>-			schedule_work(&amp;removal-&gt;work);</div><div class='del'>-		} else {</div><div class='add'>+		if (iwlwifi_mod_params.remove_when_gone &amp;&amp; cntrl == ~0U)</div><div class='add'>+			iwl_trans_pcie_reset(trans,</div><div class='add'>+					     IWL_RESET_MODE_REMOVE_ONLY);</div><div class='add'>+		else</div><div class='ctx'> 			iwl_write32(trans, CSR_RESET,</div><div class='ctx'> 				    CSR_RESET_REG_FLAG_FORCE_NMI);</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-err:</div><div class='ctx'> 		spin_unlock(&amp;trans_pcie-&gt;reg_lock);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2085,12 +2410,12 @@ out:</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans)</div><div class='add'>+bool iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	bool ret;</div><div class='ctx'> </div><div class='ctx'> 	local_bh_disable();</div><div class='del'>-	ret = __iwl_trans_pcie_grab_nic_access(trans);</div><div class='add'>+	ret = __iwl_trans_pcie_grab_nic_access(trans, false);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		/* keep BHs disabled until iwl_trans_pcie_release_nic_access */</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -2099,7 +2424,8 @@ static bool iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_trans_pcie_release_nic_access(struct iwl_trans *trans)</div><div class='add'>+void __releases(nic_access_nobh)</div><div class='add'>+iwl_trans_pcie_release_nic_access(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> </div><div class='hunk'>@@ -2113,9 +2439,12 @@ static void iwl_trans_pcie_release_nic_access(struct iwl_trans *trans)</div><div class='ctx'> </div><div class='ctx'> 	if (trans_pcie-&gt;cmd_hold_nic_awake)</div><div class='ctx'> 		goto out;</div><div class='del'>-</div><div class='del'>-	__iwl_trans_pcie_clear_bit(trans, CSR_GP_CNTRL,</div><div class='del'>-				   CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ)</div><div class='add'>+		iwl_trans_clear_bit(trans, CSR_GP_CNTRL,</div><div class='add'>+				    CSR_GP_CNTRL_REG_FLAG_BZ_MAC_ACCESS_REQ);</div><div class='add'>+	else</div><div class='add'>+		iwl_trans_clear_bit(trans, CSR_GP_CNTRL,</div><div class='add'>+				    CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Above we read the CSR_GP_CNTRL register, which will flush</div><div class='ctx'> 	 * any previous writes, but we need the write that clears the</div><div class='hunk'>@@ -2123,12 +2452,15 @@ static void iwl_trans_pcie_release_nic_access(struct iwl_trans *trans)</div><div class='ctx'> 	 * scheduled on different CPUs (after we drop reg_lock).</div><div class='ctx'> 	 */</div><div class='ctx'> out:</div><div class='add'>+	__release(nic_access_nobh);</div><div class='ctx'> 	spin_unlock_bh(&amp;trans_pcie-&gt;reg_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_trans_pcie_read_mem(struct iwl_trans *trans, u32 addr,</div><div class='del'>-				   void *buf, int dwords)</div><div class='add'>+int iwl_trans_pcie_read_mem(struct iwl_trans *trans, u32 addr,</div><div class='add'>+			    void *buf, int dwords)</div><div class='ctx'> {</div><div class='add'>+#define IWL_MAX_HW_ERRS 5</div><div class='add'>+	unsigned int num_consec_hw_errors = 0;</div><div class='ctx'> 	int offs = 0;</div><div class='ctx'> 	u32 *vals = buf;</div><div class='ctx'> </div><div class='hunk'>@@ -2144,6 +2476,17 @@ static int iwl_trans_pcie_read_mem(struct iwl_trans *trans, u32 addr,</div><div class='ctx'> 			while (offs &lt; dwords) {</div><div class='ctx'> 				vals[offs] = iwl_read32(trans,</div><div class='ctx'> 							HBUS_TARG_MEM_RDAT);</div><div class='add'>+</div><div class='add'>+				if (iwl_trans_is_hw_error_value(vals[offs]))</div><div class='add'>+					num_consec_hw_errors++;</div><div class='add'>+				else</div><div class='add'>+					num_consec_hw_errors = 0;</div><div class='add'>+</div><div class='add'>+				if (num_consec_hw_errors &gt;= IWL_MAX_HW_ERRS) {</div><div class='add'>+					iwl_trans_release_nic_access(trans);</div><div class='add'>+					return -EIO;</div><div class='add'>+				}</div><div class='add'>+</div><div class='ctx'> 				offs++;</div><div class='ctx'> </div><div class='ctx'> 				if (time_after(jiffies, end)) {</div><div class='hunk'>@@ -2163,65 +2506,21 @@ static int iwl_trans_pcie_read_mem(struct iwl_trans *trans, u32 addr,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_trans_pcie_write_mem(struct iwl_trans *trans, u32 addr,</div><div class='del'>-				    const void *buf, int dwords)</div><div class='del'>-{</div><div class='del'>-	int offs, ret = 0;</div><div class='del'>-	const u32 *vals = buf;</div><div class='del'>-</div><div class='del'>-	if (iwl_trans_grab_nic_access(trans)) {</div><div class='del'>-		iwl_write32(trans, HBUS_TARG_MEM_WADDR, addr);</div><div class='del'>-		for (offs = 0; offs &lt; dwords; offs++)</div><div class='del'>-			iwl_write32(trans, HBUS_TARG_MEM_WDAT,</div><div class='del'>-				    vals ? vals[offs] : 0);</div><div class='del'>-		iwl_trans_release_nic_access(trans);</div><div class='del'>-	} else {</div><div class='del'>-		ret = -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl_trans_pcie_read_config32(struct iwl_trans *trans, u32 ofs,</div><div class='del'>-					u32 *val)</div><div class='add'>+int iwl_trans_pcie_read_config32(struct iwl_trans *trans, u32 ofs,</div><div class='add'>+				 u32 *val)</div><div class='ctx'> {</div><div class='ctx'> 	return pci_read_config_dword(IWL_TRANS_GET_PCIE_TRANS(trans)-&gt;pci_dev,</div><div class='ctx'> 				     ofs, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_trans_pcie_block_txq_ptrs(struct iwl_trans *trans, bool block)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues; i++) {</div><div class='del'>-		struct iwl_txq *txq = trans-&gt;txqs.txq[i];</div><div class='del'>-</div><div class='del'>-		if (i == trans-&gt;txqs.cmd.q_id)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		spin_lock_bh(&amp;txq-&gt;lock);</div><div class='del'>-</div><div class='del'>-		if (!block &amp;&amp; !(WARN_ON_ONCE(!txq-&gt;block))) {</div><div class='del'>-			txq-&gt;block--;</div><div class='del'>-			if (!txq-&gt;block) {</div><div class='del'>-				iwl_write32(trans, HBUS_TARG_WRPTR,</div><div class='del'>-					    txq-&gt;write_ptr | (i &lt;&lt; 8));</div><div class='del'>-			}</div><div class='del'>-		} else if (block) {</div><div class='del'>-			txq-&gt;block++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		spin_unlock_bh(&amp;txq-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define IWL_FLUSH_WAIT_MS	2000</div><div class='ctx'> </div><div class='del'>-static int iwl_trans_pcie_rxq_dma_data(struct iwl_trans *trans, int queue,</div><div class='del'>-				       struct iwl_trans_rxq_dma_data *data)</div><div class='add'>+int iwl_trans_pcie_rxq_dma_data(struct iwl_trans *trans, int queue,</div><div class='add'>+				struct iwl_trans_rxq_dma_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> </div><div class='del'>-	if (queue &gt;= trans-&gt;num_rx_queues || !trans_pcie-&gt;rxq)</div><div class='add'>+	if (queue &gt;= trans-&gt;info.num_rxqs || !trans_pcie-&gt;rxq)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;fr_bd_cb = trans_pcie-&gt;rxq[queue].bd_dma;</div><div class='hunk'>@@ -2232,8 +2531,9 @@ static int iwl_trans_pcie_rxq_dma_data(struct iwl_trans *trans, int queue,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_trans_pcie_wait_txq_empty(struct iwl_trans *trans, int txq_idx)</div><div class='add'>+int iwl_trans_pcie_wait_txq_empty(struct iwl_trans *trans, int txq_idx)</div><div class='ctx'> {</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	struct iwl_txq *txq;</div><div class='ctx'> 	unsigned long now = jiffies;</div><div class='ctx'> 	bool overflow_tx;</div><div class='hunk'>@@ -2243,11 +2543,11 @@ static int iwl_trans_pcie_wait_txq_empty(struct iwl_trans *trans, int txq_idx)</div><div class='ctx'> 	if (test_bit(STATUS_TRANS_DEAD, &amp;trans-&gt;status))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(txq_idx, trans-&gt;txqs.queue_used))</div><div class='add'>+	if (!test_bit(txq_idx, trans_pcie-&gt;txqs.queue_used))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_TX_QUEUES(trans, "Emptying queue %d...\n", txq_idx);</div><div class='del'>-	txq = trans-&gt;txqs.txq[txq_idx];</div><div class='add'>+	txq = trans_pcie-&gt;txqs.txq[txq_idx];</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;txq-&gt;lock);</div><div class='ctx'> 	overflow_tx = txq-&gt;overflow_tx ||</div><div class='hunk'>@@ -2293,19 +2593,20 @@ static int iwl_trans_pcie_wait_txq_empty(struct iwl_trans *trans, int txq_idx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_trans_pcie_wait_txqs_empty(struct iwl_trans *trans, u32 txq_bm)</div><div class='add'>+int iwl_trans_pcie_wait_txqs_empty(struct iwl_trans *trans, u32 txq_bm)</div><div class='ctx'> {</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	int cnt;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* waiting for all the tx frames complete might take a while */</div><div class='ctx'> 	for (cnt = 0;</div><div class='del'>-	     cnt &lt; trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues;</div><div class='add'>+	     cnt &lt; trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues;</div><div class='ctx'> 	     cnt++) {</div><div class='ctx'> </div><div class='del'>-		if (cnt == trans-&gt;txqs.cmd.q_id)</div><div class='add'>+		if (cnt == trans-&gt;conf.cmd_queue)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (!test_bit(cnt, trans-&gt;txqs.queue_used))</div><div class='add'>+		if (!test_bit(cnt, trans_pcie-&gt;txqs.queue_used))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (!(BIT(cnt) &amp; txq_bm))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -2318,13 +2619,13 @@ static int iwl_trans_pcie_wait_txqs_empty(struct iwl_trans *trans, u32 txq_bm)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_trans_pcie_set_bits_mask(struct iwl_trans *trans, u32 reg,</div><div class='del'>-					 u32 mask, u32 value)</div><div class='add'>+void iwl_trans_pcie_set_bits_mask(struct iwl_trans *trans, u32 reg,</div><div class='add'>+				  u32 mask, u32 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;trans_pcie-&gt;reg_lock);</div><div class='del'>-	__iwl_trans_pcie_set_bits_mask(trans, reg, mask, value);</div><div class='add'>+	_iwl_trans_set_bits_mask(trans, reg, mask, value);</div><div class='ctx'> 	spin_unlock_bh(&amp;trans_pcie-&gt;reg_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2444,7 +2745,7 @@ static void *iwl_dbgfs_tx_queue_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> 	struct iwl_dbgfs_tx_queue_priv *priv = seq-&gt;private;</div><div class='ctx'> 	struct iwl_dbgfs_tx_queue_state *state;</div><div class='ctx'> </div><div class='del'>-	if (*pos &gt;= priv-&gt;trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues)</div><div class='add'>+	if (*pos &gt;= priv-&gt;trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	state = kmalloc(sizeof(*state), GFP_KERNEL);</div><div class='hunk'>@@ -2462,7 +2763,7 @@ static void *iwl_dbgfs_tx_queue_seq_next(struct seq_file *seq,</div><div class='ctx'> </div><div class='ctx'> 	*pos = ++state-&gt;pos;</div><div class='ctx'> </div><div class='del'>-	if (*pos &gt;= priv-&gt;trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues)</div><div class='add'>+	if (*pos &gt;= priv-&gt;trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	return state;</div><div class='hunk'>@@ -2478,12 +2779,13 @@ static int iwl_dbgfs_tx_queue_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	struct iwl_dbgfs_tx_queue_priv *priv = seq-&gt;private;</div><div class='ctx'> 	struct iwl_dbgfs_tx_queue_state *state = v;</div><div class='ctx'> 	struct iwl_trans *trans = priv-&gt;trans;</div><div class='del'>-	struct iwl_txq *txq = trans-&gt;txqs.txq[state-&gt;pos];</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_txq *txq = trans_pcie-&gt;txqs.txq[state-&gt;pos];</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq, "hwq %.3u: used=%d stopped=%d ",</div><div class='ctx'> 		   (unsigned int)state-&gt;pos,</div><div class='del'>-		   !!test_bit(state-&gt;pos, trans-&gt;txqs.queue_used),</div><div class='del'>-		   !!test_bit(state-&gt;pos, trans-&gt;txqs.queue_stopped));</div><div class='add'>+		   !!test_bit(state-&gt;pos, trans_pcie-&gt;txqs.queue_used),</div><div class='add'>+		   !!test_bit(state-&gt;pos, trans_pcie-&gt;txqs.queue_stopped));</div><div class='ctx'> 	if (txq)</div><div class='ctx'> 		seq_printf(seq,</div><div class='ctx'> 			   "read=%u write=%u need_update=%d frozen=%d n_window=%d ampdu=%d",</div><div class='hunk'>@@ -2493,7 +2795,7 @@ static int iwl_dbgfs_tx_queue_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	else</div><div class='ctx'> 		seq_puts(seq, "(unallocated)");</div><div class='ctx'> </div><div class='del'>-	if (state-&gt;pos == trans-&gt;txqs.cmd.q_id)</div><div class='add'>+	if (state-&gt;pos == trans-&gt;conf.cmd_queue)</div><div class='ctx'> 		seq_puts(seq, " (HCMD)");</div><div class='ctx'> 	seq_puts(seq, "\n");</div><div class='ctx'> </div><div class='hunk'>@@ -2531,7 +2833,7 @@ static ssize_t iwl_dbgfs_rx_queue_read(struct file *file,</div><div class='ctx'> 	int pos = 0, i, ret;</div><div class='ctx'> 	size_t bufsz;</div><div class='ctx'> </div><div class='del'>-	bufsz = sizeof(char) * 121 * trans-&gt;num_rx_queues;</div><div class='add'>+	bufsz = sizeof(char) * 121 * trans-&gt;info.num_rxqs;</div><div class='ctx'> </div><div class='ctx'> 	if (!trans_pcie-&gt;rxq)</div><div class='ctx'> 		return -EAGAIN;</div><div class='hunk'>@@ -2540,9 +2842,11 @@ static ssize_t iwl_dbgfs_rx_queue_read(struct file *file,</div><div class='ctx'> 	if (!buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; trans-&gt;num_rx_queues &amp;&amp; pos &lt; bufsz; i++) {</div><div class='add'>+	for (i = 0; i &lt; trans-&gt;info.num_rxqs &amp;&amp; pos &lt; bufsz; i++) {</div><div class='ctx'> 		struct iwl_rxq *rxq = &amp;trans_pcie-&gt;rxq[i];</div><div class='ctx'> </div><div class='add'>+		spin_lock_bh(&amp;rxq-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 		pos += scnprintf(buf + pos, bufsz - pos, "queue#: %2d\n",</div><div class='ctx'> 				 i);</div><div class='ctx'> 		pos += scnprintf(buf + pos, bufsz - pos, "\tread: %u\n",</div><div class='hunk'>@@ -2556,15 +2860,14 @@ static ssize_t iwl_dbgfs_rx_queue_read(struct file *file,</div><div class='ctx'> 		pos += scnprintf(buf + pos, bufsz - pos, "\tfree_count: %u\n",</div><div class='ctx'> 				 rxq-&gt;free_count);</div><div class='ctx'> 		if (rxq-&gt;rb_stts) {</div><div class='del'>-			u32 r =	__le16_to_cpu(iwl_get_closed_rb_stts(trans,</div><div class='del'>-								     rxq));</div><div class='add'>+			u32 r =	iwl_get_closed_rb_stts(trans, rxq);</div><div class='ctx'> 			pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-					 "\tclosed_rb_num: %u\n",</div><div class='del'>-					 r &amp; 0x0FFF);</div><div class='add'>+					 "\tclosed_rb_num: %u\n", r);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			pos += scnprintf(buf + pos, bufsz - pos,</div><div class='ctx'> 					 "\tclosed_rb_num: Not Allocated\n");</div><div class='ctx'> 		}</div><div class='add'>+		spin_unlock_bh(&amp;rxq-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='ctx'> 	kfree(buf);</div><div class='hunk'>@@ -2712,7 +3015,7 @@ static ssize_t iwl_dbgfs_rfkill_write(struct file *file,</div><div class='ctx'> 	IWL_WARN(trans, "changing debug rfkill %d-&gt;%d\n",</div><div class='ctx'> 		 trans_pcie-&gt;debug_rfkill, new_value);</div><div class='ctx'> 	trans_pcie-&gt;debug_rfkill = new_value;</div><div class='del'>-	iwl_pcie_handle_rfkill_irq(trans);</div><div class='add'>+	iwl_pcie_handle_rfkill_irq(trans, false);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -2751,7 +3054,7 @@ static bool iwl_write_to_user_buf(char __user *user_buf, ssize_t count,</div><div class='ctx'> 				  void *buf, ssize_t *size,</div><div class='ctx'> 				  ssize_t *bytes_copied)</div><div class='ctx'> {</div><div class='del'>-	int buf_size_left = count - *bytes_copied;</div><div class='add'>+	ssize_t buf_size_left = count - *bytes_copied;</div><div class='ctx'> </div><div class='ctx'> 	buf_size_left = buf_size_left - (buf_size_left % sizeof(u32));</div><div class='ctx'> 	if (*size &gt; buf_size_left)</div><div class='hunk'>@@ -2771,7 +3074,7 @@ static ssize_t iwl_dbgfs_monitor_data_read(struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans *trans = file-&gt;private_data;</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-	void *cpu_addr = (void *)trans-&gt;dbg.fw_mon.block, *curr_buf;</div><div class='add'>+	u8 *cpu_addr = (void *)trans-&gt;dbg.fw_mon.block, *curr_buf;</div><div class='ctx'> 	struct cont_rec *data = &amp;trans_pcie-&gt;fw_mon_data;</div><div class='ctx'> 	u32 write_ptr_addr, wrap_cnt_addr, write_ptr, wrap_cnt;</div><div class='ctx'> 	ssize_t size, bytes_copied = 0;</div><div class='hunk'>@@ -2848,11 +3151,74 @@ static ssize_t iwl_dbgfs_monitor_data_read(struct file *file,</div><div class='ctx'> 	return bytes_copied;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t iwl_dbgfs_rf_read(struct file *file,</div><div class='add'>+				 char __user *user_buf,</div><div class='add'>+				 size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans *trans = file-&gt;private_data;</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+</div><div class='add'>+	if (!trans_pcie-&gt;rf_name[0])</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos,</div><div class='add'>+				       trans_pcie-&gt;rf_name,</div><div class='add'>+				       strlen(trans_pcie-&gt;rf_name));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t iwl_dbgfs_reset_write(struct file *file,</div><div class='add'>+				     const char __user *user_buf,</div><div class='add'>+				     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans *trans = file-&gt;private_data;</div><div class='add'>+	static const char * const modes[] = {</div><div class='add'>+		[IWL_RESET_MODE_SW_RESET] = "sw",</div><div class='add'>+		[IWL_RESET_MODE_REPROBE] = "reprobe",</div><div class='add'>+		[IWL_RESET_MODE_TOP_RESET] = "top",</div><div class='add'>+		[IWL_RESET_MODE_REMOVE_ONLY] = "remove",</div><div class='add'>+		[IWL_RESET_MODE_RESCAN] = "rescan",</div><div class='add'>+		[IWL_RESET_MODE_FUNC_RESET] = "function",</div><div class='add'>+		[IWL_RESET_MODE_PROD_RESET] = "product",</div><div class='add'>+	};</div><div class='add'>+	char buf[10] = {};</div><div class='add'>+	int mode;</div><div class='add'>+</div><div class='add'>+	if (count &gt; sizeof(buf) - 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(buf, user_buf, count))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	mode = sysfs_match_string(modes, buf);</div><div class='add'>+	if (mode &lt; 0)</div><div class='add'>+		return mode;</div><div class='add'>+</div><div class='add'>+	if (mode &lt; IWL_RESET_MODE_REMOVE_ONLY) {</div><div class='add'>+		if (!test_bit(STATUS_DEVICE_ENABLED, &amp;trans-&gt;status))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (mode == IWL_RESET_MODE_TOP_RESET) {</div><div class='add'>+			if (trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_SC)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			trans-&gt;request_top_reset = 1;</div><div class='add'>+		}</div><div class='add'>+		iwl_op_mode_nic_error(trans-&gt;op_mode, IWL_ERR_TYPE_DEBUGFS);</div><div class='add'>+		iwl_trans_schedule_reset(trans, IWL_ERR_TYPE_DEBUGFS);</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_trans_pcie_reset(trans, mode);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> DEBUGFS_READ_WRITE_FILE_OPS(interrupt);</div><div class='ctx'> DEBUGFS_READ_FILE_OPS(fh_reg);</div><div class='ctx'> DEBUGFS_READ_FILE_OPS(rx_queue);</div><div class='ctx'> DEBUGFS_WRITE_FILE_OPS(csr);</div><div class='ctx'> DEBUGFS_READ_WRITE_FILE_OPS(rfkill);</div><div class='add'>+DEBUGFS_READ_FILE_OPS(rf);</div><div class='add'>+DEBUGFS_WRITE_FILE_OPS(reset);</div><div class='add'>+</div><div class='ctx'> static const struct file_operations iwl_dbgfs_tx_queue_ops = {</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> 	.open = iwl_dbgfs_tx_queue_open,</div><div class='hunk'>@@ -2879,9 +3245,11 @@ void iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans)</div><div class='ctx'> 	DEBUGFS_ADD_FILE(fh_reg, dir, 0400);</div><div class='ctx'> 	DEBUGFS_ADD_FILE(rfkill, dir, 0600);</div><div class='ctx'> 	DEBUGFS_ADD_FILE(monitor_data, dir, 0400);</div><div class='add'>+	DEBUGFS_ADD_FILE(rf, dir, 0400);</div><div class='add'>+	DEBUGFS_ADD_FILE(reset, dir, 0200);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_trans_pcie_debugfs_cleanup(struct iwl_trans *trans)</div><div class='add'>+void iwl_trans_pcie_debugfs_cleanup(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	struct cont_rec *data = &amp;trans_pcie-&gt;fw_mon_data;</div><div class='hunk'>@@ -2894,10 +3262,11 @@ static void iwl_trans_pcie_debugfs_cleanup(struct iwl_trans *trans)</div><div class='ctx'> </div><div class='ctx'> static u32 iwl_trans_pcie_get_cmdlen(struct iwl_trans *trans, void *tfd)</div><div class='ctx'> {</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	u32 cmdlen = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; trans-&gt;txqs.tfd.max_tbs; i++)</div><div class='add'>+	for (i = 0; i &lt; trans_pcie-&gt;txqs.tfd.max_tbs; i++)</div><div class='ctx'> 		cmdlen += iwl_txq_gen1_tfd_tb_get_len(trans, tfd, i);</div><div class='ctx'> </div><div class='ctx'> 	return cmdlen;</div><div class='hunk'>@@ -2913,9 +3282,9 @@ static u32 iwl_trans_pcie_dump_rbs(struct iwl_trans *trans,</div><div class='ctx'> 	struct iwl_rxq *rxq = &amp;trans_pcie-&gt;rxq[0];</div><div class='ctx'> 	u32 i, r, j, rb_len = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;rxq-&gt;lock);</div><div class='add'>+	spin_lock_bh(&amp;rxq-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	r = le16_to_cpu(iwl_get_closed_rb_stts(trans, rxq)) &amp; 0x0FFF;</div><div class='add'>+	r = iwl_get_closed_rb_stts(trans, rxq);</div><div class='ctx'> </div><div class='ctx'> 	for (i = rxq-&gt;read, j = 0;</div><div class='ctx'> 	     i != r &amp;&amp; j &lt; allocated_rb_nums;</div><div class='hunk'>@@ -2923,8 +3292,8 @@ static u32 iwl_trans_pcie_dump_rbs(struct iwl_trans *trans,</div><div class='ctx'> 		struct iwl_rx_mem_buffer *rxb = rxq-&gt;queue[i];</div><div class='ctx'> 		struct iwl_fw_error_dump_rb *rb;</div><div class='ctx'> </div><div class='del'>-		dma_unmap_page(trans-&gt;dev, rxb-&gt;page_dma, max_len,</div><div class='del'>-			       DMA_FROM_DEVICE);</div><div class='add'>+		dma_sync_single_for_cpu(trans-&gt;dev, rxb-&gt;page_dma,</div><div class='add'>+					max_len, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		rb_len += sizeof(**data) + sizeof(*rb) + max_len;</div><div class='ctx'> </div><div class='hunk'>@@ -2933,15 +3302,11 @@ static u32 iwl_trans_pcie_dump_rbs(struct iwl_trans *trans,</div><div class='ctx'> 		rb = (void *)(*data)-&gt;data;</div><div class='ctx'> 		rb-&gt;index = cpu_to_le32(i);</div><div class='ctx'> 		memcpy(rb-&gt;data, page_address(rxb-&gt;page), max_len);</div><div class='del'>-		/* remap the page for the free benefit */</div><div class='del'>-		rxb-&gt;page_dma = dma_map_page(trans-&gt;dev, rxb-&gt;page,</div><div class='del'>-					     rxb-&gt;offset, max_len,</div><div class='del'>-					     DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		*data = iwl_fw_error_next_data(*data);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;rxq-&gt;lock);</div><div class='add'>+	spin_unlock_bh(&amp;rxq-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return rb_len;</div><div class='ctx'> }</div><div class='hunk'>@@ -2980,7 +3345,7 @@ static u32 iwl_trans_pcie_fh_regs_dump(struct iwl_trans *trans,</div><div class='ctx'> 	(*data)-&gt;len = cpu_to_le32(fh_regs_len);</div><div class='ctx'> 	val = (void *)(*data)-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if (!trans-&gt;trans_cfg-&gt;gen2)</div><div class='add'>+	if (!trans-&gt;mac_cfg-&gt;gen2)</div><div class='ctx'> 		for (i = FH_MEM_LOWER_BOUND; i &lt; FH_MEM_UPPER_BOUND;</div><div class='ctx'> 		     i += sizeof(u32))</div><div class='ctx'> 			*val++ = cpu_to_le32(iwl_trans_pcie_read32(trans, i));</div><div class='hunk'>@@ -3027,7 +3392,7 @@ iwl_trans_pcie_dump_pointers(struct iwl_trans *trans,</div><div class='ctx'> {</div><div class='ctx'> 	u32 base, base_high, write_ptr, write_ptr_val, wrap_cnt;</div><div class='ctx'> </div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='ctx'> 		base = DBGC_CUR_DBGBUF_BASE_ADDR_LSB;</div><div class='ctx'> 		base_high = DBGC_CUR_DBGBUF_BASE_ADDR_MSB;</div><div class='ctx'> 		write_ptr = DBGC_CUR_DBGBUF_STATUS;</div><div class='hunk'>@@ -3047,7 +3412,7 @@ iwl_trans_pcie_dump_pointers(struct iwl_trans *trans,</div><div class='ctx'> 		cpu_to_le32(iwl_read_prph(trans, wrap_cnt));</div><div class='ctx'> 	fw_mon_data-&gt;fw_mon_base_ptr =</div><div class='ctx'> 		cpu_to_le32(iwl_read_prph(trans, base));</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='ctx'> 		fw_mon_data-&gt;fw_mon_base_high_ptr =</div><div class='ctx'> 			cpu_to_le32(iwl_read_prph(trans, base_high));</div><div class='ctx'> 		write_ptr_val &amp;= DBGC_CUR_DBGBUF_STATUS_OFFSET_MSK;</div><div class='hunk'>@@ -3067,8 +3432,8 @@ iwl_trans_pcie_dump_monitor(struct iwl_trans *trans,</div><div class='ctx'> </div><div class='ctx'> 	if (trans-&gt;dbg.dest_tlv ||</div><div class='ctx'> 	    (fw_mon-&gt;size &amp;&amp;</div><div class='del'>-	     (trans-&gt;trans_cfg-&gt;device_family == IWL_DEVICE_FAMILY_7000 ||</div><div class='del'>-	      trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210))) {</div><div class='add'>+	     (trans-&gt;mac_cfg-&gt;device_family == IWL_DEVICE_FAMILY_7000 ||</div><div class='add'>+	      trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210))) {</div><div class='ctx'> 		struct iwl_fw_error_dump_fw_mon *fw_mon_data;</div><div class='ctx'> </div><div class='ctx'> 		(*data)-&gt;type = cpu_to_le32(IWL_FW_ERROR_DUMP_FW_MONITOR);</div><div class='hunk'>@@ -3091,14 +3456,14 @@ iwl_trans_pcie_dump_monitor(struct iwl_trans *trans,</div><div class='ctx'> 					IWL_LDBG_M2S_BUF_BA_MSK) &lt;&lt;</div><div class='ctx'> 				       trans-&gt;dbg.dest_tlv-&gt;base_shift;</div><div class='ctx'> 				base *= IWL_M2S_UNIT_SIZE;</div><div class='del'>-				base += trans-&gt;cfg-&gt;smem_offset;</div><div class='add'>+				base += trans-&gt;mac_cfg-&gt;base-&gt;smem_offset;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				base = iwl_read_prph(trans, base) &lt;&lt;</div><div class='ctx'> 				       trans-&gt;dbg.dest_tlv-&gt;base_shift;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			iwl_trans_read_mem(trans, base, fw_mon_data-&gt;data,</div><div class='del'>-					   monitor_len / sizeof(u32));</div><div class='add'>+			iwl_trans_pcie_read_mem(trans, base, fw_mon_data-&gt;data,</div><div class='add'>+						monitor_len / sizeof(u32));</div><div class='ctx'> 		} else if (trans-&gt;dbg.dest_tlv-&gt;monitor_mode == MARBH_MODE) {</div><div class='ctx'> 			monitor_len =</div><div class='ctx'> 				iwl_trans_pci_dump_marbh_monitor(trans,</div><div class='hunk'>@@ -3132,7 +3497,7 @@ static int iwl_trans_get_fw_monitor_len(struct iwl_trans *trans, u32 *len)</div><div class='ctx'> 			base = (cfg_reg &amp; IWL_LDBG_M2S_BUF_BA_MSK) &lt;&lt;</div><div class='ctx'> 				trans-&gt;dbg.dest_tlv-&gt;base_shift;</div><div class='ctx'> 			base *= IWL_M2S_UNIT_SIZE;</div><div class='del'>-			base += trans-&gt;cfg-&gt;smem_offset;</div><div class='add'>+			base += trans-&gt;mac_cfg-&gt;base-&gt;smem_offset;</div><div class='ctx'> </div><div class='ctx'> 			monitor_len =</div><div class='ctx'> 				(cfg_reg &amp; IWL_LDBG_M2S_BUF_SIZE_MSK) &gt;&gt;</div><div class='hunk'>@@ -3148,7 +3513,7 @@ static int iwl_trans_get_fw_monitor_len(struct iwl_trans *trans, u32 *len)</div><div class='ctx'> 			      trans-&gt;dbg.dest_tlv-&gt;end_shift;</div><div class='ctx'> </div><div class='ctx'> 			/* Make "end" point to the actual end */</div><div class='del'>-			if (trans-&gt;trans_cfg-&gt;device_family &gt;=</div><div class='add'>+			if (trans-&gt;mac_cfg-&gt;device_family &gt;=</div><div class='ctx'> 			    IWL_DEVICE_FAMILY_8000 ||</div><div class='ctx'> 			    trans-&gt;dbg.dest_tlv-&gt;monitor_mode == MARBH_MODE)</div><div class='ctx'> 				end += (1 &lt;&lt; trans-&gt;dbg.dest_tlv-&gt;end_shift);</div><div class='hunk'>@@ -3162,19 +3527,20 @@ static int iwl_trans_get_fw_monitor_len(struct iwl_trans *trans, u32 *len)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct iwl_trans_dump_data</div><div class='del'>-*iwl_trans_pcie_dump_data(struct iwl_trans *trans,</div><div class='del'>-			  u32 dump_mask)</div><div class='add'>+struct iwl_trans_dump_data *</div><div class='add'>+iwl_trans_pcie_dump_data(struct iwl_trans *trans, u32 dump_mask,</div><div class='add'>+			 const struct iwl_dump_sanitize_ops *sanitize_ops,</div><div class='add'>+			 void *sanitize_ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	struct iwl_fw_error_dump_data *data;</div><div class='del'>-	struct iwl_txq *cmdq = trans-&gt;txqs.txq[trans-&gt;txqs.cmd.q_id];</div><div class='add'>+	struct iwl_txq *cmdq = trans_pcie-&gt;txqs.txq[trans-&gt;conf.cmd_queue];</div><div class='ctx'> 	struct iwl_fw_error_dump_txcmd *txcmd;</div><div class='ctx'> 	struct iwl_trans_dump_data *dump_data;</div><div class='ctx'> 	u32 len, num_rbs = 0, monitor_len = 0;</div><div class='ctx'> 	int i, ptr;</div><div class='del'>-	bool dump_rbs = test_bit(STATUS_FW_ERROR, &amp;trans-&gt;status) &amp;&amp;</div><div class='del'>-			!trans-&gt;trans_cfg-&gt;mq_rx_supported &amp;&amp;</div><div class='add'>+	bool dump_rbs = iwl_trans_is_fw_error(trans) &amp;&amp;</div><div class='add'>+			!trans-&gt;mac_cfg-&gt;mq_rx_supported &amp;&amp;</div><div class='ctx'> 			dump_mask &amp; BIT(IWL_FW_ERROR_DUMP_RB);</div><div class='ctx'> </div><div class='ctx'> 	if (!dump_mask)</div><div class='hunk'>@@ -3199,7 +3565,7 @@ static struct iwl_trans_dump_data</div><div class='ctx'> </div><div class='ctx'> 	/* FH registers */</div><div class='ctx'> 	if (dump_mask &amp; BIT(IWL_FW_ERROR_DUMP_FH_REGS)) {</div><div class='del'>-		if (trans-&gt;trans_cfg-&gt;gen2)</div><div class='add'>+		if (trans-&gt;mac_cfg-&gt;gen2)</div><div class='ctx'> 			len += sizeof(*data) +</div><div class='ctx'> 			       (iwl_umac_prph(trans, FH_MEM_UPPER_BOUND_GEN2) -</div><div class='ctx'> 				iwl_umac_prph(trans, FH_MEM_LOWER_BOUND_GEN2));</div><div class='hunk'>@@ -3213,17 +3579,18 @@ static struct iwl_trans_dump_data</div><div class='ctx'> 		/* Dump RBs is supported only for pre-9000 devices (1 queue) */</div><div class='ctx'> 		struct iwl_rxq *rxq = &amp;trans_pcie-&gt;rxq[0];</div><div class='ctx'> 		/* RBs */</div><div class='del'>-		num_rbs =</div><div class='del'>-			le16_to_cpu(iwl_get_closed_rb_stts(trans, rxq))</div><div class='del'>-			&amp; 0x0FFF;</div><div class='add'>+		spin_lock_bh(&amp;rxq-&gt;lock);</div><div class='add'>+		num_rbs = iwl_get_closed_rb_stts(trans, rxq);</div><div class='ctx'> 		num_rbs = (num_rbs - rxq-&gt;read) &amp; RX_QUEUE_MASK;</div><div class='add'>+		spin_unlock_bh(&amp;rxq-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 		len += num_rbs * (sizeof(*data) +</div><div class='ctx'> 				  sizeof(struct iwl_fw_error_dump_rb) +</div><div class='ctx'> 				  (PAGE_SIZE &lt;&lt; trans_pcie-&gt;rx_page_order));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Paged memory for gen2 HW */</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;gen2 &amp;&amp; dump_mask &amp; BIT(IWL_FW_ERROR_DUMP_PAGING))</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;gen2 &amp;&amp; dump_mask &amp; BIT(IWL_FW_ERROR_DUMP_PAGING))</div><div class='ctx'> 		for (i = 0; i &lt; trans-&gt;init_dram.paging_cnt; i++)</div><div class='ctx'> 			len += sizeof(*data) +</div><div class='ctx'> 			       sizeof(struct iwl_fw_error_dump_paging) +</div><div class='hunk'>@@ -3237,7 +3604,7 @@ static struct iwl_trans_dump_data</div><div class='ctx'> 	data = (void *)dump_data-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	if (dump_mask &amp; BIT(IWL_FW_ERROR_DUMP_TXCMD) &amp;&amp; cmdq) {</div><div class='del'>-		u16 tfd_size = trans-&gt;txqs.tfd.size;</div><div class='add'>+		u16 tfd_size = trans_pcie-&gt;txqs.tfd.size;</div><div class='ctx'> </div><div class='ctx'> 		data-&gt;type = cpu_to_le32(IWL_FW_ERROR_DUMP_TXCMD);</div><div class='ctx'> 		txcmd = (void *)data-&gt;data;</div><div class='hunk'>@@ -3248,7 +3615,7 @@ static struct iwl_trans_dump_data</div><div class='ctx'> 			u8 tfdidx;</div><div class='ctx'> 			u32 caplen, cmdlen;</div><div class='ctx'> </div><div class='del'>-			if (trans-&gt;trans_cfg-&gt;use_tfh)</div><div class='add'>+			if (trans-&gt;mac_cfg-&gt;gen2)</div><div class='ctx'> 				tfdidx = idx;</div><div class='ctx'> 			else</div><div class='ctx'> 				tfdidx = ptr;</div><div class='hunk'>@@ -3264,6 +3631,10 @@ static struct iwl_trans_dump_data</div><div class='ctx'> 				txcmd-&gt;caplen = cpu_to_le32(caplen);</div><div class='ctx'> 				memcpy(txcmd-&gt;data, cmdq-&gt;entries[idx].cmd,</div><div class='ctx'> 				       caplen);</div><div class='add'>+				if (sanitize_ops &amp;&amp; sanitize_ops-&gt;frob_hcmd)</div><div class='add'>+					sanitize_ops-&gt;frob_hcmd(sanitize_ctx,</div><div class='add'>+								txcmd-&gt;data,</div><div class='add'>+								caplen);</div><div class='ctx'> 				txcmd = (void *)((u8 *)txcmd-&gt;data + caplen);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -3284,7 +3655,7 @@ static struct iwl_trans_dump_data</div><div class='ctx'> 		len += iwl_trans_pcie_dump_rbs(trans, &amp;data, num_rbs);</div><div class='ctx'> </div><div class='ctx'> 	/* Paged memory for gen2 HW */</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;gen2 &amp;&amp;</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;gen2 &amp;&amp;</div><div class='ctx'> 	    dump_mask &amp; BIT(IWL_FW_ERROR_DUMP_PAGING)) {</div><div class='ctx'> 		for (i = 0; i &lt; trans-&gt;init_dram.paging_cnt; i++) {</div><div class='ctx'> 			struct iwl_fw_error_dump_paging *paging;</div><div class='hunk'>@@ -3309,7 +3680,7 @@ static struct iwl_trans_dump_data</div><div class='ctx'> 	return dump_data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_trans_pci_interrupts(struct iwl_trans *trans, bool enable)</div><div class='add'>+void iwl_trans_pci_interrupts(struct iwl_trans *trans, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	if (enable)</div><div class='ctx'> 		iwl_enable_interrupts(trans);</div><div class='hunk'>@@ -3317,14 +3688,17 @@ static void iwl_trans_pci_interrupts(struct iwl_trans *trans, bool enable)</div><div class='ctx'> 		iwl_disable_interrupts(trans);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_trans_pcie_sync_nmi(struct iwl_trans *trans)</div><div class='add'>+void iwl_trans_pcie_sync_nmi(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	u32 inta_addr, sw_err_bit;</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> </div><div class='ctx'> 	if (trans_pcie-&gt;msix_enabled) {</div><div class='ctx'> 		inta_addr = CSR_MSIX_HW_INT_CAUSES_AD;</div><div class='del'>-		sw_err_bit = MSIX_HW_INT_CAUSES_REG_SW_ERR;</div><div class='add'>+		if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ)</div><div class='add'>+			sw_err_bit = MSIX_HW_INT_CAUSES_REG_SW_ERR_BZ;</div><div class='add'>+		else</div><div class='add'>+			sw_err_bit = MSIX_HW_INT_CAUSES_REG_SW_ERR;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		inta_addr = CSR_INT;</div><div class='ctx'> 		sw_err_bit = CSR_INT_BIT_SW_ERR;</div><div class='hunk'>@@ -3333,101 +3707,132 @@ static void iwl_trans_pcie_sync_nmi(struct iwl_trans *trans)</div><div class='ctx'> 	iwl_trans_sync_nmi_with_addr(trans, inta_addr, sw_err_bit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define IWL_TRANS_COMMON_OPS						\</div><div class='del'>-	.op_mode_leave = iwl_trans_pcie_op_mode_leave,			\</div><div class='del'>-	.write8 = iwl_trans_pcie_write8,				\</div><div class='del'>-	.write32 = iwl_trans_pcie_write32,				\</div><div class='del'>-	.read32 = iwl_trans_pcie_read32,				\</div><div class='del'>-	.read_prph = iwl_trans_pcie_read_prph,				\</div><div class='del'>-	.write_prph = iwl_trans_pcie_write_prph,			\</div><div class='del'>-	.read_mem = iwl_trans_pcie_read_mem,				\</div><div class='del'>-	.write_mem = iwl_trans_pcie_write_mem,				\</div><div class='del'>-	.read_config32 = iwl_trans_pcie_read_config32,			\</div><div class='del'>-	.configure = iwl_trans_pcie_configure,				\</div><div class='del'>-	.set_pmi = iwl_trans_pcie_set_pmi,				\</div><div class='del'>-	.sw_reset = iwl_trans_pcie_sw_reset,				\</div><div class='del'>-	.grab_nic_access = iwl_trans_pcie_grab_nic_access,		\</div><div class='del'>-	.release_nic_access = iwl_trans_pcie_release_nic_access,	\</div><div class='del'>-	.set_bits_mask = iwl_trans_pcie_set_bits_mask,			\</div><div class='del'>-	.dump_data = iwl_trans_pcie_dump_data,				\</div><div class='del'>-	.d3_suspend = iwl_trans_pcie_d3_suspend,			\</div><div class='del'>-	.d3_resume = iwl_trans_pcie_d3_resume,				\</div><div class='del'>-	.interrupts = iwl_trans_pci_interrupts,				\</div><div class='del'>-	.sync_nmi = iwl_trans_pcie_sync_nmi				\</div><div class='del'>-</div><div class='del'>-static const struct iwl_trans_ops trans_ops_pcie = {</div><div class='del'>-	IWL_TRANS_COMMON_OPS,</div><div class='del'>-	.start_hw = iwl_trans_pcie_start_hw,</div><div class='del'>-	.fw_alive = iwl_trans_pcie_fw_alive,</div><div class='del'>-	.start_fw = iwl_trans_pcie_start_fw,</div><div class='del'>-	.stop_device = iwl_trans_pcie_stop_device,</div><div class='del'>-</div><div class='del'>-	.send_cmd = iwl_pcie_enqueue_hcmd,</div><div class='del'>-</div><div class='del'>-	.tx = iwl_trans_pcie_tx,</div><div class='del'>-	.reclaim = iwl_txq_reclaim,</div><div class='del'>-</div><div class='del'>-	.txq_disable = iwl_trans_pcie_txq_disable,</div><div class='del'>-	.txq_enable = iwl_trans_pcie_txq_enable,</div><div class='del'>-</div><div class='del'>-	.txq_set_shared_mode = iwl_trans_pcie_txq_set_shared_mode,</div><div class='del'>-</div><div class='del'>-	.wait_tx_queues_empty = iwl_trans_pcie_wait_txqs_empty,</div><div class='del'>-</div><div class='del'>-	.freeze_txq_timer = iwl_trans_txq_freeze_timer,</div><div class='del'>-	.block_txq_ptrs = iwl_trans_pcie_block_txq_ptrs,</div><div class='del'>-#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='del'>-	.debugfs_cleanup = iwl_trans_pcie_debugfs_cleanup,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='add'>+static int iwl_trans_pcie_alloc_txcmd_pool(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	unsigned int txcmd_size, txcmd_align;</div><div class='add'>+</div><div class='add'>+	if (!trans-&gt;mac_cfg-&gt;gen2) {</div><div class='add'>+		txcmd_size = sizeof(struct iwl_tx_cmd_v6);</div><div class='add'>+		txcmd_align = sizeof(void *);</div><div class='add'>+	} else if (trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+		txcmd_size = sizeof(struct iwl_tx_cmd_v9);</div><div class='add'>+		txcmd_align = 64;</div><div class='add'>+	} else {</div><div class='add'>+		txcmd_size = sizeof(struct iwl_tx_cmd);</div><div class='add'>+		txcmd_align = 128;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-static const struct iwl_trans_ops trans_ops_pcie_gen2 = {</div><div class='del'>-	IWL_TRANS_COMMON_OPS,</div><div class='del'>-	.start_hw = iwl_trans_pcie_start_hw,</div><div class='del'>-	.fw_alive = iwl_trans_pcie_gen2_fw_alive,</div><div class='del'>-	.start_fw = iwl_trans_pcie_gen2_start_fw,</div><div class='del'>-	.stop_device = iwl_trans_pcie_gen2_stop_device,</div><div class='add'>+	txcmd_size += sizeof(struct iwl_cmd_header);</div><div class='add'>+	txcmd_size += 36; /* biggest possible 802.11 header */</div><div class='ctx'> </div><div class='del'>-	.send_cmd = iwl_pcie_gen2_enqueue_hcmd,</div><div class='add'>+	/* Ensure device TX cmd cannot reach/cross a page boundary in gen2 */</div><div class='add'>+	if (WARN_ON((trans-&gt;mac_cfg-&gt;gen2 &amp;&amp; txcmd_size &gt;= txcmd_align)))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	.tx = iwl_txq_gen2_tx,</div><div class='del'>-	.reclaim = iwl_txq_reclaim,</div><div class='add'>+	snprintf(trans_pcie-&gt;dev_cmd_pool_name,</div><div class='add'>+		 sizeof(trans_pcie-&gt;dev_cmd_pool_name),</div><div class='add'>+		 "iwl_cmd_pool:%s", dev_name(trans-&gt;dev));</div><div class='ctx'> </div><div class='del'>-	.set_q_ptrs = iwl_txq_set_q_ptrs,</div><div class='add'>+	trans_pcie-&gt;dev_cmd_pool =</div><div class='add'>+		kmem_cache_create(trans_pcie-&gt;dev_cmd_pool_name,</div><div class='add'>+				  txcmd_size, txcmd_align,</div><div class='add'>+				  SLAB_HWCACHE_ALIGN, NULL);</div><div class='add'>+	if (!trans_pcie-&gt;dev_cmd_pool)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	.txq_alloc = iwl_txq_dyn_alloc,</div><div class='del'>-	.txq_free = iwl_txq_dyn_free,</div><div class='del'>-	.wait_txq_empty = iwl_trans_pcie_wait_txq_empty,</div><div class='del'>-	.rxq_dma_data = iwl_trans_pcie_rxq_dma_data,</div><div class='del'>-	.set_pnvm = iwl_trans_pcie_ctx_info_gen3_set_pnvm,</div><div class='del'>-#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='del'>-	.debugfs_cleanup = iwl_trans_pcie_debugfs_cleanup,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,</div><div class='del'>-			       const struct pci_device_id *ent,</div><div class='del'>-			       const struct iwl_cfg_trans_params *cfg_trans)</div><div class='add'>+static struct iwl_trans *</div><div class='add'>+iwl_trans_pcie_alloc(struct pci_dev *pdev,</div><div class='add'>+		     const struct iwl_mac_cfg *mac_cfg,</div><div class='add'>+		     struct iwl_trans_info *info, u8 __iomem *hw_base)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_trans_pcie *trans_pcie;</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie, **priv;</div><div class='ctx'> 	struct iwl_trans *trans;</div><div class='add'>+	unsigned int bc_tbl_n_entries;</div><div class='ctx'> 	int ret, addr_size;</div><div class='del'>-	const struct iwl_trans_ops *ops = &amp;trans_ops_pcie_gen2;</div><div class='del'>-</div><div class='del'>-	if (!cfg_trans-&gt;gen2)</div><div class='del'>-		ops = &amp;trans_ops_pcie;</div><div class='del'>-</div><div class='del'>-	ret = pcim_enable_device(pdev);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ERR_PTR(ret);</div><div class='ctx'> </div><div class='del'>-	trans = iwl_trans_alloc(sizeof(struct iwl_trans_pcie), &amp;pdev-&gt;dev, ops,</div><div class='del'>-				cfg_trans);</div><div class='add'>+	trans = iwl_trans_alloc(sizeof(struct iwl_trans_pcie), &amp;pdev-&gt;dev,</div><div class='add'>+				mac_cfg);</div><div class='ctx'> 	if (!trans)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> </div><div class='add'>+	trans_pcie-&gt;hw_base = hw_base;</div><div class='add'>+</div><div class='add'>+	/* Initialize the wait queue for commands */</div><div class='add'>+	init_waitqueue_head(&amp;trans_pcie-&gt;wait_command_queue);</div><div class='add'>+</div><div class='add'>+	ret = iwl_trans_pcie_alloc_txcmd_pool(trans);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_free_trans;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;gen2) {</div><div class='add'>+		trans_pcie-&gt;txqs.tfd.addr_size = 64;</div><div class='add'>+		trans_pcie-&gt;txqs.tfd.max_tbs = IWL_TFH_NUM_TBS;</div><div class='add'>+		trans_pcie-&gt;txqs.tfd.size = sizeof(struct iwl_tfh_tfd);</div><div class='add'>+	} else {</div><div class='add'>+		trans_pcie-&gt;txqs.tfd.addr_size = 36;</div><div class='add'>+		trans_pcie-&gt;txqs.tfd.max_tbs = IWL_NUM_OF_TBS;</div><div class='add'>+		trans_pcie-&gt;txqs.tfd.size = sizeof(struct iwl_tfd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trans_pcie-&gt;supported_dma_mask = (u32)DMA_BIT_MASK(12);</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		trans_pcie-&gt;supported_dma_mask = (u32)DMA_BIT_MASK(11);</div><div class='add'>+</div><div class='add'>+	info-&gt;max_skb_frags = IWL_TRANS_PCIE_MAX_FRAGS(trans_pcie);</div><div class='add'>+</div><div class='add'>+	trans_pcie-&gt;txqs.tso_hdr_page = alloc_percpu(struct iwl_tso_hdr_page);</div><div class='add'>+	if (!trans_pcie-&gt;txqs.tso_hdr_page) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_free_txcmd_pool;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ)</div><div class='add'>+		bc_tbl_n_entries = TFD_QUEUE_BC_SIZE_BZ;</div><div class='add'>+	else if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		bc_tbl_n_entries = TFD_QUEUE_BC_SIZE_AX210;</div><div class='add'>+	else</div><div class='add'>+		bc_tbl_n_entries = TFD_QUEUE_BC_SIZE;</div><div class='add'>+</div><div class='add'>+	trans_pcie-&gt;txqs.bc_tbl_size =</div><div class='add'>+		sizeof(struct iwl_bc_tbl_entry) * bc_tbl_n_entries;</div><div class='add'>+	/*</div><div class='add'>+	 * For gen2 devices, we use a single allocation for each byte-count</div><div class='add'>+	 * table, but they're pretty small (1k) so use a DMA pool that we</div><div class='add'>+	 * allocate here.</div><div class='add'>+	 */</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;gen2) {</div><div class='add'>+		trans_pcie-&gt;txqs.bc_pool =</div><div class='add'>+			dmam_pool_create("iwlwifi:bc", trans-&gt;dev,</div><div class='add'>+					 trans_pcie-&gt;txqs.bc_tbl_size,</div><div class='add'>+					 256, 0);</div><div class='add'>+		if (!trans_pcie-&gt;txqs.bc_pool) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out_free_tso;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Some things must not change even if the config does */</div><div class='add'>+	WARN_ON(trans_pcie-&gt;txqs.tfd.addr_size !=</div><div class='add'>+		(trans-&gt;mac_cfg-&gt;gen2 ? 64 : 36));</div><div class='add'>+</div><div class='add'>+	/* Initialize NAPI here - it should be before registering to mac80211</div><div class='add'>+	 * in the opmode but after the HW struct is allocated.</div><div class='add'>+	 */</div><div class='add'>+	trans_pcie-&gt;napi_dev = alloc_netdev_dummy(sizeof(struct iwl_trans_pcie *));</div><div class='add'>+	if (!trans_pcie-&gt;napi_dev) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_free_tso;</div><div class='add'>+	}</div><div class='add'>+	/* The private struct in netdev is a pointer to struct iwl_trans_pcie */</div><div class='add'>+	priv = netdev_priv(trans_pcie-&gt;napi_dev);</div><div class='add'>+	*priv = trans_pcie;</div><div class='add'>+</div><div class='ctx'> 	trans_pcie-&gt;trans = trans;</div><div class='ctx'> 	trans_pcie-&gt;opmode_down = true;</div><div class='ctx'> 	spin_lock_init(&amp;trans_pcie-&gt;irq_lock);</div><div class='hunk'>@@ -3436,18 +3841,19 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,</div><div class='ctx'> 	mutex_init(&amp;trans_pcie-&gt;mutex);</div><div class='ctx'> 	init_waitqueue_head(&amp;trans_pcie-&gt;ucode_write_waitq);</div><div class='ctx'> 	init_waitqueue_head(&amp;trans_pcie-&gt;fw_reset_waitq);</div><div class='add'>+	init_waitqueue_head(&amp;trans_pcie-&gt;imr_waitq);</div><div class='ctx'> </div><div class='ctx'> 	trans_pcie-&gt;rba.alloc_wq = alloc_workqueue("rb_allocator",</div><div class='del'>-						   WQ_HIGHPRI | WQ_UNBOUND, 1);</div><div class='add'>+						   WQ_HIGHPRI | WQ_UNBOUND, 0);</div><div class='ctx'> 	if (!trans_pcie-&gt;rba.alloc_wq) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='del'>-		goto out_free_trans;</div><div class='add'>+		goto out_free_ndev;</div><div class='ctx'> 	}</div><div class='ctx'> 	INIT_WORK(&amp;trans_pcie-&gt;rba.rx_alloc, iwl_pcie_rx_allocator_work);</div><div class='ctx'> </div><div class='ctx'> 	trans_pcie-&gt;debug_rfkill = -1;</div><div class='ctx'> </div><div class='del'>-	if (!cfg_trans-&gt;base_params-&gt;pcie_l1_allowed) {</div><div class='add'>+	if (!mac_cfg-&gt;base-&gt;pcie_l1_allowed) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * W/A - seems to solve weird behavior. We need to remove this</div><div class='ctx'> 		 * if we don't want to stay in L1 all the time. This wastes a</div><div class='hunk'>@@ -3458,20 +3864,10 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,</div><div class='ctx'> 				       PCIE_LINK_STATE_CLKPM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	trans_pcie-&gt;def_rx_queue = 0;</div><div class='del'>-</div><div class='del'>-	pci_set_master(pdev);</div><div class='del'>-</div><div class='del'>-	addr_size = trans-&gt;txqs.tfd.addr_size;</div><div class='del'>-	ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(addr_size));</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = pci_set_consistent_dma_mask(pdev,</div><div class='del'>-						  DMA_BIT_MASK(addr_size));</div><div class='add'>+	addr_size = trans_pcie-&gt;txqs.tfd.addr_size;</div><div class='add'>+	ret = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(addr_size));</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='del'>-		if (!ret)</div><div class='del'>-			ret = pci_set_consistent_dma_mask(pdev,</div><div class='del'>-							  DMA_BIT_MASK(32));</div><div class='add'>+		ret = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> 		/* both attempts failed: */</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "No suitable DMA available\n");</div><div class='hunk'>@@ -3479,19 +3875,6 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = pcim_iomap_regions_request_all(pdev, BIT(0), DRV_NAME);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "pcim_iomap_regions_request_all failed\n");</div><div class='del'>-		goto out_no_pci;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	trans_pcie-&gt;hw_base = pcim_iomap_table(pdev)[0];</div><div class='del'>-	if (!trans_pcie-&gt;hw_base) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "pcim_iomap_table failed\n");</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto out_no_pci;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* We disable the RETRY_TIMEOUT register (0x41) to keep</div><div class='ctx'> 	 * PCI Tx retries from interfering with C3 CPU state */</div><div class='ctx'> 	pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);</div><div class='hunk'>@@ -3499,35 +3882,29 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,</div><div class='ctx'> 	trans_pcie-&gt;pci_dev = pdev;</div><div class='ctx'> 	iwl_disable_interrupts(trans);</div><div class='ctx'> </div><div class='del'>-	trans-&gt;hw_rev = iwl_read32(trans, CSR_HW_REV);</div><div class='del'>-	if (trans-&gt;hw_rev == 0xffffffff) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "HW_REV=0xFFFFFFFF, PCI issues?\n");</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out_no_pci;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In the 8000 HW family the format of the 4 bytes of CSR_HW_REV have</div><div class='ctx'> 	 * changed, and now the revision step also includes bit 0-1 (no more</div><div class='ctx'> 	 * "dash" value). To keep hw_rev backwards compatible - we'll store it</div><div class='ctx'> 	 * in the old format.</div><div class='ctx'> 	 */</div><div class='del'>-	if (cfg_trans-&gt;device_family &gt;= IWL_DEVICE_FAMILY_8000)</div><div class='del'>-		trans-&gt;hw_rev = (trans-&gt;hw_rev &amp; 0xfff0) |</div><div class='del'>-				(CSR_HW_REV_STEP(trans-&gt;hw_rev &lt;&lt; 2) &lt;&lt; 2);</div><div class='add'>+	if (mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_8000)</div><div class='add'>+		info-&gt;hw_rev_step = info-&gt;hw_rev &amp; 0xF;</div><div class='add'>+	else</div><div class='add'>+		info-&gt;hw_rev_step = (info-&gt;hw_rev &amp; 0xC) &gt;&gt; 2;</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_INFO(trans, "HW REV: 0x%0x\n", trans-&gt;hw_rev);</div><div class='add'>+	IWL_DEBUG_INFO(trans, "HW REV: 0x%0x\n", info-&gt;hw_rev);</div><div class='ctx'> </div><div class='del'>-	iwl_pcie_set_interrupt_capa(pdev, trans, cfg_trans);</div><div class='del'>-	trans-&gt;hw_id = (pdev-&gt;device &lt;&lt; 16) + pdev-&gt;subsystem_device;</div><div class='del'>-	snprintf(trans-&gt;hw_id_str, sizeof(trans-&gt;hw_id_str),</div><div class='del'>-		 "PCI ID: 0x%04X:0x%04X", pdev-&gt;device, pdev-&gt;subsystem_device);</div><div class='add'>+	iwl_pcie_set_interrupt_capa(pdev, trans, mac_cfg, info);</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_head(&amp;trans_pcie-&gt;sx_waitq);</div><div class='ctx'> </div><div class='add'>+	ret = iwl_pcie_alloc_invalid_tx_cmd(trans);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_no_pci;</div><div class='ctx'> </div><div class='ctx'> 	if (trans_pcie-&gt;msix_enabled) {</div><div class='del'>-		ret = iwl_pcie_init_msix_handler(pdev, trans_pcie);</div><div class='add'>+		ret = iwl_pcie_init_msix_handler(pdev, trans_pcie, info);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out_no_pci;</div><div class='ctx'> 	 } else {</div><div class='hunk'>@@ -3558,7 +3935,433 @@ out_free_ict:</div><div class='ctx'> 	iwl_pcie_free_ict(trans);</div><div class='ctx'> out_no_pci:</div><div class='ctx'> 	destroy_workqueue(trans_pcie-&gt;rba.alloc_wq);</div><div class='add'>+out_free_ndev:</div><div class='add'>+	free_netdev(trans_pcie-&gt;napi_dev);</div><div class='add'>+out_free_tso:</div><div class='add'>+	free_percpu(trans_pcie-&gt;txqs.tso_hdr_page);</div><div class='add'>+out_free_txcmd_pool:</div><div class='add'>+	kmem_cache_destroy(trans_pcie-&gt;dev_cmd_pool);</div><div class='ctx'> out_free_trans:</div><div class='ctx'> 	iwl_trans_free(trans);</div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void iwl_trans_pcie_copy_imr_fh(struct iwl_trans *trans,</div><div class='add'>+				u32 dst_addr, u64 src_addr, u32 byte_cnt)</div><div class='add'>+{</div><div class='add'>+	iwl_write_prph(trans, IMR_UREG_CHICK,</div><div class='add'>+		       iwl_read_prph(trans, IMR_UREG_CHICK) |</div><div class='add'>+		       IMR_UREG_CHICK_HALT_UMAC_PERMANENTLY_MSK);</div><div class='add'>+	iwl_write_prph(trans, IMR_TFH_SRV_DMA_CHNL0_SRAM_ADDR, dst_addr);</div><div class='add'>+	iwl_write_prph(trans, IMR_TFH_SRV_DMA_CHNL0_DRAM_ADDR_LSB,</div><div class='add'>+		       (u32)(src_addr &amp; 0xFFFFFFFF));</div><div class='add'>+	iwl_write_prph(trans, IMR_TFH_SRV_DMA_CHNL0_DRAM_ADDR_MSB,</div><div class='add'>+		       iwl_get_dma_hi_addr(src_addr));</div><div class='add'>+	iwl_write_prph(trans, IMR_TFH_SRV_DMA_CHNL0_BC, byte_cnt);</div><div class='add'>+	iwl_write_prph(trans, IMR_TFH_SRV_DMA_CHNL0_CTRL,</div><div class='add'>+		       IMR_TFH_SRV_DMA_CHNL0_CTRL_D2S_IRQ_TARGET_POS |</div><div class='add'>+		       IMR_TFH_SRV_DMA_CHNL0_CTRL_D2S_DMA_EN_POS |</div><div class='add'>+		       IMR_TFH_SRV_DMA_CHNL0_CTRL_D2S_RS_MSK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_trans_pcie_copy_imr(struct iwl_trans *trans,</div><div class='add'>+			    u32 dst_addr, u64 src_addr, u32 byte_cnt)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	int ret = -1;</div><div class='add'>+</div><div class='add'>+	trans_pcie-&gt;imr_status = IMR_D2S_REQUESTED;</div><div class='add'>+	iwl_trans_pcie_copy_imr_fh(trans, dst_addr, src_addr, byte_cnt);</div><div class='add'>+	ret = wait_event_timeout(trans_pcie-&gt;imr_waitq,</div><div class='add'>+				 trans_pcie-&gt;imr_status !=</div><div class='add'>+				 IMR_D2S_REQUESTED, 5 * HZ);</div><div class='add'>+	if (!ret || trans_pcie-&gt;imr_status == IMR_D2S_ERROR) {</div><div class='add'>+		IWL_ERR(trans, "Failed to copy IMR Memory chunk!\n");</div><div class='add'>+		iwl_trans_pcie_dump_regs(trans, trans_pcie-&gt;pci_dev);</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+	trans_pcie-&gt;imr_status = IMR_D2S_IDLE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read rf id and cdb info from prph register and store it</div><div class='add'>+ */</div><div class='add'>+static void get_crf_id(struct iwl_trans *iwl_trans,</div><div class='add'>+		       struct iwl_trans_info *info)</div><div class='add'>+{</div><div class='add'>+	u32 sd_reg_ver_addr;</div><div class='add'>+	u32 hw_wfpm_id;</div><div class='add'>+	u32 val = 0;</div><div class='add'>+	u8 step;</div><div class='add'>+</div><div class='add'>+	if (iwl_trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		sd_reg_ver_addr = SD_REG_VER_GEN2;</div><div class='add'>+	else</div><div class='add'>+		sd_reg_ver_addr = SD_REG_VER;</div><div class='add'>+</div><div class='add'>+	/* Enable access to peripheral registers */</div><div class='add'>+	val = iwl_read_umac_prph_no_grab(iwl_trans, WFPM_CTRL_REG);</div><div class='add'>+	val |= WFPM_AUX_CTL_AUX_IF_MAC_OWNER_MSK;</div><div class='add'>+	iwl_write_umac_prph_no_grab(iwl_trans, WFPM_CTRL_REG, val);</div><div class='add'>+</div><div class='add'>+	/* Read crf info */</div><div class='add'>+	info-&gt;hw_crf_id = iwl_read_prph_no_grab(iwl_trans, sd_reg_ver_addr);</div><div class='add'>+</div><div class='add'>+	/* Read cnv info */</div><div class='add'>+	info-&gt;hw_cnv_id = iwl_read_prph_no_grab(iwl_trans, CNVI_AUX_MISC_CHIP);</div><div class='add'>+</div><div class='add'>+	/* For BZ-W, take B step also when A step is indicated */</div><div class='add'>+	if (CSR_HW_REV_TYPE(info-&gt;hw_rev) == IWL_CFG_MAC_TYPE_BZ_W)</div><div class='add'>+		step = SILICON_B_STEP;</div><div class='add'>+</div><div class='add'>+	/* In BZ, the MAC step must be read from the CNVI aux register */</div><div class='add'>+	if (CSR_HW_REV_TYPE(info-&gt;hw_rev) == IWL_CFG_MAC_TYPE_BZ) {</div><div class='add'>+		step = CNVI_AUX_MISC_CHIP_MAC_STEP(info-&gt;hw_cnv_id);</div><div class='add'>+</div><div class='add'>+		/* For BZ-U, take B step also when A step is indicated */</div><div class='add'>+		if ((CNVI_AUX_MISC_CHIP_PROD_TYPE(info-&gt;hw_cnv_id) ==</div><div class='add'>+		    CNVI_AUX_MISC_CHIP_PROD_TYPE_BZ_U) &amp;&amp;</div><div class='add'>+		    step == SILICON_A_STEP)</div><div class='add'>+			step = SILICON_B_STEP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (CSR_HW_REV_TYPE(info-&gt;hw_rev) == IWL_CFG_MAC_TYPE_BZ ||</div><div class='add'>+	    CSR_HW_REV_TYPE(info-&gt;hw_rev) == IWL_CFG_MAC_TYPE_BZ_W) {</div><div class='add'>+		info-&gt;hw_rev_step = step;</div><div class='add'>+		info-&gt;hw_rev |= step;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Read cdb info (also contains the jacket info if needed in the future */</div><div class='add'>+	hw_wfpm_id = iwl_read_umac_prph_no_grab(iwl_trans, WFPM_OTP_CFG1_ADDR);</div><div class='add'>+</div><div class='add'>+	IWL_INFO(iwl_trans, "Detected crf-id 0x%x, cnv-id 0x%x wfpm id 0x%x\n",</div><div class='add'>+		 info-&gt;hw_crf_id, info-&gt;hw_cnv_id, hw_wfpm_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * In case that there is no OTP on the NIC, map the rf id and cdb info</div><div class='add'>+ * from the prph registers.</div><div class='add'>+ */</div><div class='add'>+static int map_crf_id(struct iwl_trans *iwl_trans,</div><div class='add'>+		      struct iwl_trans_info *info)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u32 val = info-&gt;hw_crf_id;</div><div class='add'>+	u32 step_id = REG_CRF_ID_STEP(val);</div><div class='add'>+	u32 slave_id = REG_CRF_ID_SLAVE(val);</div><div class='add'>+	u32 hw_wfpm_id = iwl_read_umac_prph_no_grab(iwl_trans,</div><div class='add'>+						    WFPM_OTP_CFG1_ADDR);</div><div class='add'>+	u32 cdb_id_wfpm = WFPM_OTP_CFG1_IS_CDB(hw_wfpm_id);</div><div class='add'>+</div><div class='add'>+	/* Map between crf id to rf id */</div><div class='add'>+	switch (REG_CRF_ID_TYPE(val)) {</div><div class='add'>+	case REG_CRF_ID_TYPE_JF_1:</div><div class='add'>+		info-&gt;hw_rf_id = (IWL_CFG_RF_TYPE_JF1 &lt;&lt; 12);</div><div class='add'>+		break;</div><div class='add'>+	case REG_CRF_ID_TYPE_JF_2:</div><div class='add'>+		info-&gt;hw_rf_id = (IWL_CFG_RF_TYPE_JF2 &lt;&lt; 12);</div><div class='add'>+		break;</div><div class='add'>+	case REG_CRF_ID_TYPE_HR_NONE_CDB_1X1:</div><div class='add'>+		info-&gt;hw_rf_id = (IWL_CFG_RF_TYPE_HR1 &lt;&lt; 12);</div><div class='add'>+		break;</div><div class='add'>+	case REG_CRF_ID_TYPE_HR_NONE_CDB:</div><div class='add'>+		info-&gt;hw_rf_id = (IWL_CFG_RF_TYPE_HR2 &lt;&lt; 12);</div><div class='add'>+		break;</div><div class='add'>+	case REG_CRF_ID_TYPE_HR_CDB:</div><div class='add'>+		info-&gt;hw_rf_id = (IWL_CFG_RF_TYPE_HR2 &lt;&lt; 12);</div><div class='add'>+		break;</div><div class='add'>+	case REG_CRF_ID_TYPE_GF:</div><div class='add'>+		info-&gt;hw_rf_id = (IWL_CFG_RF_TYPE_GF &lt;&lt; 12);</div><div class='add'>+		break;</div><div class='add'>+	case REG_CRF_ID_TYPE_FM:</div><div class='add'>+		info-&gt;hw_rf_id = (IWL_CFG_RF_TYPE_FM &lt;&lt; 12);</div><div class='add'>+		break;</div><div class='add'>+	case REG_CRF_ID_TYPE_WHP:</div><div class='add'>+		info-&gt;hw_rf_id = (IWL_CFG_RF_TYPE_WH &lt;&lt; 12);</div><div class='add'>+		break;</div><div class='add'>+	case REG_CRF_ID_TYPE_PE:</div><div class='add'>+		info-&gt;hw_rf_id = (IWL_CFG_RF_TYPE_PE &lt;&lt; 12);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		IWL_ERR(iwl_trans,</div><div class='add'>+			"Can't find a correct rfid for crf id 0x%x\n",</div><div class='add'>+			REG_CRF_ID_TYPE(val));</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set Step-id */</div><div class='add'>+	info-&gt;hw_rf_id |= (step_id &lt;&lt; 8);</div><div class='add'>+</div><div class='add'>+	/* Set CDB capabilities */</div><div class='add'>+	if (cdb_id_wfpm || slave_id) {</div><div class='add'>+		info-&gt;hw_rf_id += BIT(28);</div><div class='add'>+		IWL_INFO(iwl_trans, "Adding cdb to rf id\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_INFO(iwl_trans,</div><div class='add'>+		 "Detected rf-type 0x%x step-id 0x%x slave-id 0x%x from crf id 0x%x\n",</div><div class='add'>+		 REG_CRF_ID_TYPE(val), step_id, slave_id, info-&gt;hw_rf_id);</div><div class='add'>+	IWL_INFO(iwl_trans,</div><div class='add'>+		 "Detected cdb-id 0x%x from wfpm id 0x%x\n",</div><div class='add'>+		 cdb_id_wfpm, hw_wfpm_id);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_pcie_recheck_me_status(struct work_struct *wk)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = container_of(wk,</div><div class='add'>+							 typeof(*trans_pcie),</div><div class='add'>+							 me_recheck_wk.work);</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = iwl_read32(trans_pcie-&gt;trans, CSR_HW_IF_CONFIG_REG);</div><div class='add'>+	trans_pcie-&gt;me_present = !!(val &amp; CSR_HW_IF_CONFIG_REG_IAMT_UP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_pcie_check_me_status(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	trans_pcie-&gt;me_present = -1;</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;trans_pcie-&gt;me_recheck_wk,</div><div class='add'>+			  iwl_pcie_recheck_me_status);</div><div class='add'>+</div><div class='add'>+	/* we don't have a good way of determining this until BZ */</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_BZ)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	val = iwl_read_prph(trans, CNVI_SCU_REG_FOR_ECO_1);</div><div class='add'>+	if (val &amp; CNVI_SCU_REG_FOR_ECO_1_WIAMT_KNOWN) {</div><div class='add'>+		trans_pcie-&gt;me_present =</div><div class='add'>+			!!(val &amp; CNVI_SCU_REG_FOR_ECO_1_WIAMT_PRESENT);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = iwl_read32(trans, CSR_HW_IF_CONFIG_REG);</div><div class='add'>+	if (val &amp; (CSR_HW_IF_CONFIG_REG_ME_OWN |</div><div class='add'>+		   CSR_HW_IF_CONFIG_REG_IAMT_UP)) {</div><div class='add'>+		trans_pcie-&gt;me_present = 1;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* recheck again later, ME might still be initializing */</div><div class='add'>+	schedule_delayed_work(&amp;trans_pcie-&gt;me_recheck_wk, HZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_pci_gen1_2_probe(struct pci_dev *pdev,</div><div class='add'>+			 const struct pci_device_id *ent,</div><div class='add'>+			 const struct iwl_mac_cfg *mac_cfg,</div><div class='add'>+			 u8 __iomem *hw_base, u32 hw_rev)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_dev_info *dev_info;</div><div class='add'>+	struct iwl_trans_info info = {</div><div class='add'>+		.hw_id = (pdev-&gt;device &lt;&lt; 16) + pdev-&gt;subsystem_device,</div><div class='add'>+		.hw_rev = hw_rev,</div><div class='add'>+	};</div><div class='add'>+	struct iwl_trans *iwl_trans;</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	iwl_trans = iwl_trans_pcie_alloc(pdev, mac_cfg, &amp;info, hw_base);</div><div class='add'>+	if (IS_ERR(iwl_trans))</div><div class='add'>+		return PTR_ERR(iwl_trans);</div><div class='add'>+</div><div class='add'>+	trans_pcie = IWL_TRANS_GET_PCIE_TRANS(iwl_trans);</div><div class='add'>+</div><div class='add'>+	iwl_trans_pcie_check_product_reset_status(pdev);</div><div class='add'>+	iwl_trans_pcie_check_product_reset_mode(pdev);</div><div class='add'>+</div><div class='add'>+	/* set the things we know so far for the grab NIC access */</div><div class='add'>+	iwl_trans_set_info(iwl_trans, &amp;info);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Let's try to grab NIC access early here. Sometimes, NICs may</div><div class='add'>+	 * fail to initialize, and if that happens it's better if we see</div><div class='add'>+	 * issues early on (and can reprobe, per the logic inside), than</div><div class='add'>+	 * first trying to load the firmware etc. and potentially only</div><div class='add'>+	 * detecting any problems when the first interface is brought up.</div><div class='add'>+	 */</div><div class='add'>+	ret = iwl_pcie_prepare_card_hw(iwl_trans);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		ret = iwl_trans_activate_nic(iwl_trans);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_free_trans;</div><div class='add'>+		if (iwl_trans_grab_nic_access(iwl_trans)) {</div><div class='add'>+			get_crf_id(iwl_trans, &amp;info);</div><div class='add'>+			/* all good */</div><div class='add'>+			iwl_trans_release_nic_access(iwl_trans);</div><div class='add'>+		} else {</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			goto out_free_trans;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info.hw_rf_id = iwl_read32(iwl_trans, CSR_HW_RF_ID);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The RF_ID is set to zero in blank OTP so read version to</div><div class='add'>+	 * extract the RF_ID.</div><div class='add'>+	 * This is relevant only for family 9000 and up.</div><div class='add'>+	 */</div><div class='add'>+	if (iwl_trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_9000 &amp;&amp;</div><div class='add'>+	    !CSR_HW_RFID_TYPE(info.hw_rf_id) &amp;&amp; map_crf_id(iwl_trans, &amp;info)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_free_trans;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_INFO(iwl_trans, "PCI dev %04x/%04x, rev=0x%x, rfid=0x%x\n",</div><div class='add'>+		 pdev-&gt;device, pdev-&gt;subsystem_device,</div><div class='add'>+		 info.hw_rev, info.hw_rf_id);</div><div class='add'>+</div><div class='add'>+#if !IS_ENABLED(CONFIG_IWLMLD)</div><div class='add'>+	if (iwl_drv_is_wifi7_supported(iwl_trans)) {</div><div class='add'>+		IWL_ERR(iwl_trans,</div><div class='add'>+			"IWLMLD needs to be compiled to support this device\n");</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto out_free_trans;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	dev_info = iwl_pci_find_dev_info(pdev-&gt;device, pdev-&gt;subsystem_device,</div><div class='add'>+					 CSR_HW_RFID_TYPE(info.hw_rf_id),</div><div class='add'>+					 CSR_HW_RFID_IS_CDB(info.hw_rf_id),</div><div class='add'>+					 IWL_SUBDEVICE_RF_ID(pdev-&gt;subsystem_device),</div><div class='add'>+					 IWL_SUBDEVICE_BW_LIM(pdev-&gt;subsystem_device),</div><div class='add'>+					 !iwl_trans-&gt;mac_cfg-&gt;integrated);</div><div class='add'>+	if (dev_info) {</div><div class='add'>+		iwl_trans-&gt;cfg = dev_info-&gt;cfg;</div><div class='add'>+		info.name = dev_info-&gt;name;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IWLMVM)</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * special-case 7265D, it has the same PCI IDs.</div><div class='add'>+	 *</div><div class='add'>+	 * Note that because we already pass the cfg to the transport above,</div><div class='add'>+	 * all the parameters that the transport uses must, until that is</div><div class='add'>+	 * changed, be identical to the ones in the 7265D configuration.</div><div class='add'>+	 */</div><div class='add'>+	if (iwl_trans-&gt;cfg == &amp;iwl7265_cfg &amp;&amp;</div><div class='add'>+	    (info.hw_rev &amp; CSR_HW_REV_TYPE_MSK) == CSR_HW_REV_TYPE_7265D)</div><div class='add'>+		iwl_trans-&gt;cfg = &amp;iwl7265d_cfg;</div><div class='add'>+#endif</div><div class='add'>+	if (!iwl_trans-&gt;cfg) {</div><div class='add'>+		pr_err("No config found for PCI dev %04x/%04x, rev=0x%x, rfid=0x%x\n",</div><div class='add'>+		       pdev-&gt;device, pdev-&gt;subsystem_device,</div><div class='add'>+		       info.hw_rev, info.hw_rf_id);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_free_trans;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_INFO(iwl_trans, "Detected %s\n", info.name);</div><div class='add'>+</div><div class='add'>+	if (iwl_trans-&gt;mac_cfg-&gt;mq_rx_supported) {</div><div class='add'>+		if (WARN_ON(!iwl_trans-&gt;cfg-&gt;num_rbds)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out_free_trans;</div><div class='add'>+		}</div><div class='add'>+		trans_pcie-&gt;num_rx_bufs = iwl_trans_get_num_rbds(iwl_trans);</div><div class='add'>+	} else {</div><div class='add'>+		trans_pcie-&gt;num_rx_bufs = RX_QUEUE_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!iwl_trans-&gt;mac_cfg-&gt;integrated) {</div><div class='add'>+		u16 link_status;</div><div class='add'>+</div><div class='add'>+		pcie_capability_read_word(pdev, PCI_EXP_LNKSTA, &amp;link_status);</div><div class='add'>+</div><div class='add'>+		info.pcie_link_speed =</div><div class='add'>+			u16_get_bits(link_status, PCI_EXP_LNKSTA_CLS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_trans_set_info(iwl_trans, &amp;info);</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pdev, iwl_trans);</div><div class='add'>+</div><div class='add'>+	iwl_pcie_check_me_status(iwl_trans);</div><div class='add'>+</div><div class='add'>+	/* try to get ownership so that we'll know if we don't own it */</div><div class='add'>+	iwl_pcie_prepare_card_hw(iwl_trans);</div><div class='add'>+</div><div class='add'>+	iwl_trans-&gt;drv = iwl_drv_start(iwl_trans);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(iwl_trans-&gt;drv)) {</div><div class='add'>+		ret = PTR_ERR(iwl_trans-&gt;drv);</div><div class='add'>+		goto out_free_trans;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* register transport layer debugfs here */</div><div class='add'>+	iwl_trans_pcie_dbgfs_register(iwl_trans);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free_trans:</div><div class='add'>+	iwl_trans_pcie_free(iwl_trans);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_pcie_gen1_2_remove(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;trans_pcie-&gt;me_recheck_wk);</div><div class='add'>+</div><div class='add'>+	iwl_drv_stop(trans-&gt;drv);</div><div class='add'>+</div><div class='add'>+	iwl_trans_pcie_free(trans);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_pcie_gen1_2_activate_nic(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	const struct iwl_mac_cfg *mac_cfg = trans-&gt;mac_cfg;</div><div class='add'>+	u32 poll_ready;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (mac_cfg-&gt;bisr_workaround) {</div><div class='add'>+		/* ensure the TOP FSM isn't still in previous reset */</div><div class='add'>+		mdelay(2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set "initialization complete" bit to move adapter from</div><div class='add'>+	 * D0U* --&gt; D0A* (powered-up active) state.</div><div class='add'>+	 */</div><div class='add'>+	if (mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_BZ) {</div><div class='add'>+		iwl_set_bit(trans, CSR_GP_CNTRL,</div><div class='add'>+			    CSR_GP_CNTRL_REG_FLAG_BZ_MAC_ACCESS_REQ |</div><div class='add'>+			    CSR_GP_CNTRL_REG_FLAG_MAC_INIT);</div><div class='add'>+		poll_ready = CSR_GP_CNTRL_REG_FLAG_MAC_STATUS;</div><div class='add'>+	} else {</div><div class='add'>+		iwl_set_bit(trans, CSR_GP_CNTRL,</div><div class='add'>+			    CSR_GP_CNTRL_REG_FLAG_INIT_DONE);</div><div class='add'>+		poll_ready = CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mac_cfg-&gt;device_family == IWL_DEVICE_FAMILY_8000)</div><div class='add'>+		udelay(2);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Wait for clock stabilization; once stabilized, access to</div><div class='add'>+	 * device-internal resources is supported, e.g. iwl_write_prph()</div><div class='add'>+	 * and accesses to uCode SRAM.</div><div class='add'>+	 */</div><div class='add'>+	err = iwl_poll_bits(trans, CSR_GP_CNTRL, poll_ready, 25000);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		IWL_DEBUG_INFO(trans, "Failed to wake NIC\n");</div><div class='add'>+</div><div class='add'>+		iwl_pcie_dump_host_monitor(trans);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mac_cfg-&gt;bisr_workaround) {</div><div class='add'>+		/* ensure BISR shift has finished */</div><div class='add'>+		udelay(200);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx-gen2.c<br/>new file mode 100644<br/>index 000000000000..df0545f09da9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx-gen2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx-gen2.c</a></div><div class='hunk'>@@ -0,0 +1,1434 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2017 Intel Deutschland GmbH</div><div class='add'>+ * Copyright (C) 2018-2020, 2023-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;net/tso.h&gt;</div><div class='add'>+#include &lt;linux/tcp.h&gt;</div><div class='add'>+</div><div class='add'>+#include "iwl-debug.h"</div><div class='add'>+#include "iwl-csr.h"</div><div class='add'>+#include "iwl-io.h"</div><div class='add'>+#include "internal.h"</div><div class='add'>+#include "fw/api/tx.h"</div><div class='add'>+#include "fw/api/commands.h"</div><div class='add'>+#include "fw/api/datapath.h"</div><div class='add'>+#include "iwl-scd.h"</div><div class='add'>+</div><div class='add'>+static struct page *get_workaround_page(struct iwl_trans *trans,</div><div class='add'>+					struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct iwl_tso_page_info *info;</div><div class='add'>+	struct page **page_ptr;</div><div class='add'>+	struct page *ret;</div><div class='add'>+	dma_addr_t phys;</div><div class='add'>+</div><div class='add'>+	page_ptr = (void *)((u8 *)skb-&gt;cb + trans-&gt;conf.cb_data_offs);</div><div class='add'>+</div><div class='add'>+	ret = alloc_page(GFP_ATOMIC);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	info = IWL_TSO_PAGE_INFO(page_address(ret));</div><div class='add'>+</div><div class='add'>+	/* Create a DMA mapping for the page */</div><div class='add'>+	phys = dma_map_page_attrs(trans-&gt;dev, ret, 0, PAGE_SIZE,</div><div class='add'>+				  DMA_TO_DEVICE, DMA_ATTR_SKIP_CPU_SYNC);</div><div class='add'>+	if (unlikely(dma_mapping_error(trans-&gt;dev, phys))) {</div><div class='add'>+		__free_page(ret);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Store physical address and set use count */</div><div class='add'>+	info-&gt;dma_addr = phys;</div><div class='add'>+	refcount_set(&amp;info-&gt;use_count, 1);</div><div class='add'>+</div><div class='add'>+	/* set the chaining pointer to the previous page if there */</div><div class='add'>+	info-&gt;next = *page_ptr;</div><div class='add'>+	*page_ptr = ret;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Add a TB and if needed apply the FH HW bug workaround;</div><div class='add'>+ * meta != NULL indicates that it's a page mapping and we</div><div class='add'>+ * need to dma_unmap_page() and set the meta-&gt;tbs bit in</div><div class='add'>+ * this case.</div><div class='add'>+ */</div><div class='add'>+static int iwl_txq_gen2_set_tb_with_wa(struct iwl_trans *trans,</div><div class='add'>+				       struct sk_buff *skb,</div><div class='add'>+				       struct iwl_tfh_tfd *tfd,</div><div class='add'>+				       dma_addr_t phys, void *virt,</div><div class='add'>+				       u16 len, struct iwl_cmd_meta *meta,</div><div class='add'>+				       bool unmap)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t oldphys = phys;</div><div class='add'>+	struct page *page;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (unlikely(dma_mapping_error(trans-&gt;dev, phys)))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (likely(!iwl_txq_crosses_4g_boundary(phys, len))) {</div><div class='add'>+		ret = iwl_txq_gen2_set_tb(trans, tfd, phys, len);</div><div class='add'>+</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto unmap;</div><div class='add'>+</div><div class='add'>+		if (meta)</div><div class='add'>+			meta-&gt;tbs |= BIT(ret);</div><div class='add'>+</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto trace;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Work around a hardware bug. If (as expressed in the</div><div class='add'>+	 * condition above) the TB ends on a 32-bit boundary,</div><div class='add'>+	 * then the next TB may be accessed with the wrong</div><div class='add'>+	 * address.</div><div class='add'>+	 * To work around it, copy the data elsewhere and make</div><div class='add'>+	 * a new mapping for it so the device will not fail.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(len &gt; IWL_TSO_PAGE_DATA_SIZE)) {</div><div class='add'>+		ret = -ENOBUFS;</div><div class='add'>+		goto unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	page = get_workaround_page(trans, skb);</div><div class='add'>+	if (!page) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(page_address(page), virt, len);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This is a bit odd, but performance does not matter here, what</div><div class='add'>+	 * matters are the expectations of the calling code and TB cleanup</div><div class='add'>+	 * function.</div><div class='add'>+	 *</div><div class='add'>+	 * As such, if unmap is set, then create another mapping for the TB</div><div class='add'>+	 * entry as it will be unmapped later. On the other hand, if it is not</div><div class='add'>+	 * set, then the TB entry will not be unmapped and instead we simply</div><div class='add'>+	 * reference and sync the mapping that get_workaround_page() created.</div><div class='add'>+	 */</div><div class='add'>+	if (unmap) {</div><div class='add'>+		phys = dma_map_single(trans-&gt;dev, page_address(page), len,</div><div class='add'>+				      DMA_TO_DEVICE);</div><div class='add'>+		if (unlikely(dma_mapping_error(trans-&gt;dev, phys)))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	} else {</div><div class='add'>+		phys = iwl_pcie_get_tso_page_phys(page_address(page));</div><div class='add'>+		dma_sync_single_for_device(trans-&gt;dev, phys, len,</div><div class='add'>+					   DMA_TO_DEVICE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_txq_gen2_set_tb(trans, tfd, phys, len);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		/* unmap the new allocation as single */</div><div class='add'>+		oldphys = phys;</div><div class='add'>+		meta = NULL;</div><div class='add'>+		goto unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_TX(trans,</div><div class='add'>+		     "TB bug workaround: copied %d bytes from 0x%llx to 0x%llx\n",</div><div class='add'>+		     len, (unsigned long long)oldphys,</div><div class='add'>+		     (unsigned long long)phys);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+unmap:</div><div class='add'>+	if (!unmap)</div><div class='add'>+		goto trace;</div><div class='add'>+</div><div class='add'>+	if (meta)</div><div class='add'>+		dma_unmap_page(trans-&gt;dev, oldphys, len, DMA_TO_DEVICE);</div><div class='add'>+	else</div><div class='add'>+		dma_unmap_single(trans-&gt;dev, oldphys, len, DMA_TO_DEVICE);</div><div class='add'>+trace:</div><div class='add'>+	trace_iwlwifi_dev_tx_tb(trans-&gt;dev, skb, virt, phys, len);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_txq_gen2_build_amsdu(struct iwl_trans *trans,</div><div class='add'>+				    struct sk_buff *skb,</div><div class='add'>+				    struct iwl_tfh_tfd *tfd,</div><div class='add'>+				    struct iwl_cmd_meta *out_meta,</div><div class='add'>+				    int start_len,</div><div class='add'>+				    u8 hdr_len,</div><div class='add'>+				    struct iwl_device_tx_cmd *dev_cmd)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_INET</div><div class='add'>+	struct iwl_tx_cmd_v9 *tx_cmd = (void *)dev_cmd-&gt;payload;</div><div class='add'>+	struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='add'>+	unsigned int snap_ip_tcp_hdrlen, ip_hdrlen, total_len, hdr_room;</div><div class='add'>+	unsigned int mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='add'>+	unsigned int data_offset = 0;</div><div class='add'>+	dma_addr_t start_hdr_phys;</div><div class='add'>+	u16 length, amsdu_pad;</div><div class='add'>+	u8 *start_hdr;</div><div class='add'>+	struct sg_table *sgt;</div><div class='add'>+	struct tso_t tso;</div><div class='add'>+</div><div class='add'>+	trace_iwlwifi_dev_tx(trans-&gt;dev, skb, tfd, sizeof(*tfd),</div><div class='add'>+			     &amp;dev_cmd-&gt;hdr, start_len, 0);</div><div class='add'>+</div><div class='add'>+	ip_hdrlen = skb_network_header_len(skb);</div><div class='add'>+	snap_ip_tcp_hdrlen = 8 + ip_hdrlen + tcp_hdrlen(skb);</div><div class='add'>+	total_len = skb-&gt;len - snap_ip_tcp_hdrlen - hdr_len;</div><div class='add'>+	amsdu_pad = 0;</div><div class='add'>+</div><div class='add'>+	/* total amount of header we may need for this A-MSDU */</div><div class='add'>+	hdr_room = DIV_ROUND_UP(total_len, mss) *</div><div class='add'>+		(3 + snap_ip_tcp_hdrlen + sizeof(struct ethhdr));</div><div class='add'>+</div><div class='add'>+	/* Our device supports 9 segments at most, it will fit in 1 page */</div><div class='add'>+	sgt = iwl_pcie_prep_tso(trans, skb, out_meta, &amp;start_hdr, hdr_room,</div><div class='add'>+				snap_ip_tcp_hdrlen + hdr_len);</div><div class='add'>+	if (!sgt)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	start_hdr_phys = iwl_pcie_get_tso_page_phys(start_hdr);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Pull the ieee80211 header to be able to use TSO core,</div><div class='add'>+	 * we will restore it for the tx_status flow.</div><div class='add'>+	 */</div><div class='add'>+	skb_pull(skb, hdr_len);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Remove the length of all the headers that we don't actually</div><div class='add'>+	 * have in the MPDU by themselves, but that we duplicate into</div><div class='add'>+	 * all the different MSDUs inside the A-MSDU.</div><div class='add'>+	 */</div><div class='add'>+	le16_add_cpu(&amp;tx_cmd-&gt;len, -snap_ip_tcp_hdrlen);</div><div class='add'>+</div><div class='add'>+	tso_start(skb, &amp;tso);</div><div class='add'>+</div><div class='add'>+	while (total_len) {</div><div class='add'>+		/* this is the data left for this subframe */</div><div class='add'>+		unsigned int data_left = min_t(unsigned int, mss, total_len);</div><div class='add'>+		unsigned int tb_len;</div><div class='add'>+		dma_addr_t tb_phys;</div><div class='add'>+		u8 *pos_hdr = start_hdr;</div><div class='add'>+</div><div class='add'>+		total_len -= data_left;</div><div class='add'>+</div><div class='add'>+		memset(pos_hdr, 0, amsdu_pad);</div><div class='add'>+		pos_hdr += amsdu_pad;</div><div class='add'>+		amsdu_pad = (4 - (sizeof(struct ethhdr) + snap_ip_tcp_hdrlen +</div><div class='add'>+				  data_left)) &amp; 0x3;</div><div class='add'>+		ether_addr_copy(pos_hdr, ieee80211_get_DA(hdr));</div><div class='add'>+		pos_hdr += ETH_ALEN;</div><div class='add'>+		ether_addr_copy(pos_hdr, ieee80211_get_SA(hdr));</div><div class='add'>+		pos_hdr += ETH_ALEN;</div><div class='add'>+</div><div class='add'>+		length = snap_ip_tcp_hdrlen + data_left;</div><div class='add'>+		*((__be16 *)pos_hdr) = cpu_to_be16(length);</div><div class='add'>+		pos_hdr += sizeof(length);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * This will copy the SNAP as well which will be considered</div><div class='add'>+		 * as MAC header.</div><div class='add'>+		 */</div><div class='add'>+		tso_build_hdr(skb, pos_hdr, &amp;tso, data_left, !total_len);</div><div class='add'>+</div><div class='add'>+		pos_hdr += snap_ip_tcp_hdrlen;</div><div class='add'>+</div><div class='add'>+		tb_len = pos_hdr - start_hdr;</div><div class='add'>+		tb_phys = iwl_pcie_get_tso_page_phys(start_hdr);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * No need for _with_wa, this is from the TSO page and</div><div class='add'>+		 * we leave some space at the end of it so can't hit</div><div class='add'>+		 * the buggy scenario.</div><div class='add'>+		 */</div><div class='add'>+		iwl_txq_gen2_set_tb(trans, tfd, tb_phys, tb_len);</div><div class='add'>+		trace_iwlwifi_dev_tx_tb(trans-&gt;dev, skb, start_hdr,</div><div class='add'>+					tb_phys, tb_len);</div><div class='add'>+		/* add this subframe's headers' length to the tx_cmd */</div><div class='add'>+		le16_add_cpu(&amp;tx_cmd-&gt;len, tb_len);</div><div class='add'>+</div><div class='add'>+		/* prepare the start_hdr for the next subframe */</div><div class='add'>+		start_hdr = pos_hdr;</div><div class='add'>+</div><div class='add'>+		/* put the payload */</div><div class='add'>+		while (data_left) {</div><div class='add'>+			int ret;</div><div class='add'>+</div><div class='add'>+			tb_len = min_t(unsigned int, tso.size, data_left);</div><div class='add'>+			tb_phys = iwl_pcie_get_sgt_tb_phys(sgt, data_offset,</div><div class='add'>+							   tb_len);</div><div class='add'>+			/* Not a real mapping error, use direct comparison */</div><div class='add'>+			if (unlikely(tb_phys == DMA_MAPPING_ERROR))</div><div class='add'>+				goto out_err;</div><div class='add'>+</div><div class='add'>+			ret = iwl_txq_gen2_set_tb_with_wa(trans, skb, tfd,</div><div class='add'>+							  tb_phys, tso.data,</div><div class='add'>+							  tb_len, NULL, false);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out_err;</div><div class='add'>+</div><div class='add'>+			data_left -= tb_len;</div><div class='add'>+			data_offset += tb_len;</div><div class='add'>+			tso_build_data(skb, &amp;tso, tb_len);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dma_sync_single_for_device(trans-&gt;dev, start_hdr_phys, hdr_room,</div><div class='add'>+				   DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	/* re -add the WiFi header */</div><div class='add'>+	skb_push(skb, hdr_len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+#endif</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct</div><div class='add'>+iwl_tfh_tfd *iwl_txq_gen2_build_tx_amsdu(struct iwl_trans *trans,</div><div class='add'>+					 struct iwl_txq *txq,</div><div class='add'>+					 struct iwl_device_tx_cmd *dev_cmd,</div><div class='add'>+					 struct sk_buff *skb,</div><div class='add'>+					 struct iwl_cmd_meta *out_meta,</div><div class='add'>+					 int hdr_len,</div><div class='add'>+					 int tx_cmd_len)</div><div class='add'>+{</div><div class='add'>+	int idx = iwl_txq_get_cmd_index(txq, txq-&gt;write_ptr);</div><div class='add'>+	struct iwl_tfh_tfd *tfd = iwl_txq_get_tfd(trans, txq, idx);</div><div class='add'>+	dma_addr_t tb_phys;</div><div class='add'>+	int len;</div><div class='add'>+	void *tb1_addr;</div><div class='add'>+</div><div class='add'>+	tb_phys = iwl_txq_get_first_tb_dma(txq, idx);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * No need for _with_wa, the first TB allocation is aligned up</div><div class='add'>+	 * to a 64-byte boundary and thus can't be at the end or cross</div><div class='add'>+	 * a page boundary (much less a 2^32 boundary).</div><div class='add'>+	 */</div><div class='add'>+	iwl_txq_gen2_set_tb(trans, tfd, tb_phys, IWL_FIRST_TB_SIZE);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The second TB (tb1) points to the remainder of the TX command</div><div class='add'>+	 * and the 802.11 header - dword aligned size</div><div class='add'>+	 * (This calculation modifies the TX command, so do it before the</div><div class='add'>+	 * setup of the first TB)</div><div class='add'>+	 */</div><div class='add'>+	len = tx_cmd_len + sizeof(struct iwl_cmd_header) + hdr_len -</div><div class='add'>+	      IWL_FIRST_TB_SIZE;</div><div class='add'>+</div><div class='add'>+	/* do not align A-MSDU to dword as the subframe header aligns it */</div><div class='add'>+</div><div class='add'>+	/* map the data for TB1 */</div><div class='add'>+	tb1_addr = ((u8 *)&amp;dev_cmd-&gt;hdr) + IWL_FIRST_TB_SIZE;</div><div class='add'>+	tb_phys = dma_map_single(trans-&gt;dev, tb1_addr, len, DMA_TO_DEVICE);</div><div class='add'>+	if (unlikely(dma_mapping_error(trans-&gt;dev, tb_phys)))</div><div class='add'>+		goto out_err;</div><div class='add'>+	/*</div><div class='add'>+	 * No need for _with_wa(), we ensure (via alignment) that the data</div><div class='add'>+	 * here can never cross or end at a page boundary.</div><div class='add'>+	 */</div><div class='add'>+	iwl_txq_gen2_set_tb(trans, tfd, tb_phys, len);</div><div class='add'>+</div><div class='add'>+	if (iwl_txq_gen2_build_amsdu(trans, skb, tfd, out_meta,</div><div class='add'>+				     len + IWL_FIRST_TB_SIZE, hdr_len, dev_cmd))</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	/* building the A-MSDU might have changed this data, memcpy it now */</div><div class='add'>+	memcpy(&amp;txq-&gt;first_tb_bufs[idx], dev_cmd, IWL_FIRST_TB_SIZE);</div><div class='add'>+	return tfd;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	iwl_pcie_free_tso_pages(trans, skb, out_meta);</div><div class='add'>+	iwl_txq_gen2_tfd_unmap(trans, out_meta, tfd);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_txq_gen2_tx_add_frags(struct iwl_trans *trans,</div><div class='add'>+				     struct sk_buff *skb,</div><div class='add'>+				     struct iwl_tfh_tfd *tfd,</div><div class='add'>+				     struct iwl_cmd_meta *out_meta)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='add'>+		const skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='add'>+		dma_addr_t tb_phys;</div><div class='add'>+		unsigned int fragsz = skb_frag_size(frag);</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		if (!fragsz)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		tb_phys = skb_frag_dma_map(trans-&gt;dev, frag, 0,</div><div class='add'>+					   fragsz, DMA_TO_DEVICE);</div><div class='add'>+		ret = iwl_txq_gen2_set_tb_with_wa(trans, skb, tfd, tb_phys,</div><div class='add'>+						  skb_frag_address(frag),</div><div class='add'>+						  fragsz, out_meta, true);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct</div><div class='add'>+iwl_tfh_tfd *iwl_txq_gen2_build_tx(struct iwl_trans *trans,</div><div class='add'>+				   struct iwl_txq *txq,</div><div class='add'>+				   struct iwl_device_tx_cmd *dev_cmd,</div><div class='add'>+				   struct sk_buff *skb,</div><div class='add'>+				   struct iwl_cmd_meta *out_meta,</div><div class='add'>+				   int hdr_len,</div><div class='add'>+				   int tx_cmd_len,</div><div class='add'>+				   bool pad)</div><div class='add'>+{</div><div class='add'>+	int idx = iwl_txq_get_cmd_index(txq, txq-&gt;write_ptr);</div><div class='add'>+	struct iwl_tfh_tfd *tfd = iwl_txq_get_tfd(trans, txq, idx);</div><div class='add'>+	dma_addr_t tb_phys;</div><div class='add'>+	int len, tb1_len, tb2_len;</div><div class='add'>+	void *tb1_addr;</div><div class='add'>+	struct sk_buff *frag;</div><div class='add'>+</div><div class='add'>+	tb_phys = iwl_txq_get_first_tb_dma(txq, idx);</div><div class='add'>+</div><div class='add'>+	/* The first TB points to bi-directional DMA data */</div><div class='add'>+	memcpy(&amp;txq-&gt;first_tb_bufs[idx], dev_cmd, IWL_FIRST_TB_SIZE);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * No need for _with_wa, the first TB allocation is aligned up</div><div class='add'>+	 * to a 64-byte boundary and thus can't be at the end or cross</div><div class='add'>+	 * a page boundary (much less a 2^32 boundary).</div><div class='add'>+	 */</div><div class='add'>+	iwl_txq_gen2_set_tb(trans, tfd, tb_phys, IWL_FIRST_TB_SIZE);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The second TB (tb1) points to the remainder of the TX command</div><div class='add'>+	 * and the 802.11 header - dword aligned size</div><div class='add'>+	 * (This calculation modifies the TX command, so do it before the</div><div class='add'>+	 * setup of the first TB)</div><div class='add'>+	 */</div><div class='add'>+	len = tx_cmd_len + sizeof(struct iwl_cmd_header) + hdr_len -</div><div class='add'>+	      IWL_FIRST_TB_SIZE;</div><div class='add'>+</div><div class='add'>+	if (pad)</div><div class='add'>+		tb1_len = ALIGN(len, 4);</div><div class='add'>+	else</div><div class='add'>+		tb1_len = len;</div><div class='add'>+</div><div class='add'>+	/* map the data for TB1 */</div><div class='add'>+	tb1_addr = ((u8 *)&amp;dev_cmd-&gt;hdr) + IWL_FIRST_TB_SIZE;</div><div class='add'>+	tb_phys = dma_map_single(trans-&gt;dev, tb1_addr, tb1_len, DMA_TO_DEVICE);</div><div class='add'>+	if (unlikely(dma_mapping_error(trans-&gt;dev, tb_phys)))</div><div class='add'>+		goto out_err;</div><div class='add'>+	/*</div><div class='add'>+	 * No need for _with_wa(), we ensure (via alignment) that the data</div><div class='add'>+	 * here can never cross or end at a page boundary.</div><div class='add'>+	 */</div><div class='add'>+	iwl_txq_gen2_set_tb(trans, tfd, tb_phys, tb1_len);</div><div class='add'>+	trace_iwlwifi_dev_tx(trans-&gt;dev, skb, tfd, sizeof(*tfd), &amp;dev_cmd-&gt;hdr,</div><div class='add'>+			     IWL_FIRST_TB_SIZE + tb1_len, hdr_len);</div><div class='add'>+</div><div class='add'>+	/* set up TFD's third entry to point to remainder of skb's head */</div><div class='add'>+	tb2_len = skb_headlen(skb) - hdr_len;</div><div class='add'>+</div><div class='add'>+	if (tb2_len &gt; 0) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		tb_phys = dma_map_single(trans-&gt;dev, skb-&gt;data + hdr_len,</div><div class='add'>+					 tb2_len, DMA_TO_DEVICE);</div><div class='add'>+		ret = iwl_txq_gen2_set_tb_with_wa(trans, skb, tfd, tb_phys,</div><div class='add'>+						  skb-&gt;data + hdr_len, tb2_len,</div><div class='add'>+						  NULL, true);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iwl_txq_gen2_tx_add_frags(trans, skb, tfd, out_meta))</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	skb_walk_frags(skb, frag) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		tb_phys = dma_map_single(trans-&gt;dev, frag-&gt;data,</div><div class='add'>+					 skb_headlen(frag), DMA_TO_DEVICE);</div><div class='add'>+		ret = iwl_txq_gen2_set_tb_with_wa(trans, skb, tfd, tb_phys,</div><div class='add'>+						  frag-&gt;data,</div><div class='add'>+						  skb_headlen(frag), NULL,</div><div class='add'>+						  true);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_err;</div><div class='add'>+		if (iwl_txq_gen2_tx_add_frags(trans, frag, tfd, out_meta))</div><div class='add'>+			goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return tfd;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	iwl_txq_gen2_tfd_unmap(trans, out_meta, tfd);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+struct iwl_tfh_tfd *iwl_txq_gen2_build_tfd(struct iwl_trans *trans,</div><div class='add'>+					   struct iwl_txq *txq,</div><div class='add'>+					   struct iwl_device_tx_cmd *dev_cmd,</div><div class='add'>+					   struct sk_buff *skb,</div><div class='add'>+					   struct iwl_cmd_meta *out_meta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	int idx = iwl_txq_get_cmd_index(txq, txq-&gt;write_ptr);</div><div class='add'>+	struct iwl_tfh_tfd *tfd = iwl_txq_get_tfd(trans, txq, idx);</div><div class='add'>+	int len, hdr_len;</div><div class='add'>+	bool amsdu;</div><div class='add'>+</div><div class='add'>+	/* There must be data left over for TB1 or this code must be changed */</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct iwl_tx_cmd_v9) &lt; IWL_FIRST_TB_SIZE);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct iwl_cmd_header) +</div><div class='add'>+		     offsetofend(struct iwl_tx_cmd_v9, dram_info) &gt;</div><div class='add'>+		     IWL_FIRST_TB_SIZE);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct iwl_tx_cmd) &lt; IWL_FIRST_TB_SIZE);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct iwl_cmd_header) +</div><div class='add'>+		     offsetofend(struct iwl_tx_cmd, dram_info) &gt;</div><div class='add'>+		     IWL_FIRST_TB_SIZE);</div><div class='add'>+</div><div class='add'>+	memset(tfd, 0, sizeof(*tfd));</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		len = sizeof(struct iwl_tx_cmd_v9);</div><div class='add'>+	else</div><div class='add'>+		len = sizeof(struct iwl_tx_cmd);</div><div class='add'>+</div><div class='add'>+	amsdu = ieee80211_is_data_qos(hdr-&gt;frame_control) &amp;&amp;</div><div class='add'>+			(*ieee80211_get_qos_ctl(hdr) &amp;</div><div class='add'>+			 IEEE80211_QOS_CTL_A_MSDU_PRESENT);</div><div class='add'>+</div><div class='add'>+	hdr_len = ieee80211_hdrlen(hdr-&gt;frame_control);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Only build A-MSDUs here if doing so by GSO, otherwise it may be</div><div class='add'>+	 * an A-MSDU for other reasons, e.g. NAN or an A-MSDU having been</div><div class='add'>+	 * built in the higher layers already.</div><div class='add'>+	 */</div><div class='add'>+	if (amsdu &amp;&amp; skb_shinfo(skb)-&gt;gso_size)</div><div class='add'>+		return iwl_txq_gen2_build_tx_amsdu(trans, txq, dev_cmd, skb,</div><div class='add'>+						    out_meta, hdr_len, len);</div><div class='add'>+	return iwl_txq_gen2_build_tx(trans, txq, dev_cmd, skb, out_meta,</div><div class='add'>+				      hdr_len, len, !amsdu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_txq_space(struct iwl_trans *trans, const struct iwl_txq *q)</div><div class='add'>+{</div><div class='add'>+	unsigned int max;</div><div class='add'>+	unsigned int used;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * To avoid ambiguity between empty and completely full queues, there</div><div class='add'>+	 * should always be less than max_tfd_queue_size elements in the queue.</div><div class='add'>+	 * If q-&gt;n_window is smaller than max_tfd_queue_size, there is no need</div><div class='add'>+	 * to reserve any queue entries for this purpose.</div><div class='add'>+	 */</div><div class='add'>+	if (q-&gt;n_window &lt; trans-&gt;mac_cfg-&gt;base-&gt;max_tfd_queue_size)</div><div class='add'>+		max = q-&gt;n_window;</div><div class='add'>+	else</div><div class='add'>+		max = trans-&gt;mac_cfg-&gt;base-&gt;max_tfd_queue_size - 1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * max_tfd_queue_size is a power of 2, so the following is equivalent to</div><div class='add'>+	 * modulo by max_tfd_queue_size and is well defined.</div><div class='add'>+	 */</div><div class='add'>+	used = (q-&gt;write_ptr - q-&gt;read_ptr) &amp;</div><div class='add'>+		(trans-&gt;mac_cfg-&gt;base-&gt;max_tfd_queue_size - 1);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(used &gt; max))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return max - used;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * iwl_pcie_gen2_update_byte_tbl - Set up entry in Tx byte-count array</div><div class='add'>+ */</div><div class='add'>+static void iwl_pcie_gen2_update_byte_tbl(struct iwl_trans *trans,</div><div class='add'>+					  struct iwl_txq *txq, u16 byte_cnt,</div><div class='add'>+					  int num_tbs)</div><div class='add'>+{</div><div class='add'>+	int idx = iwl_txq_get_cmd_index(txq, txq-&gt;write_ptr);</div><div class='add'>+	struct iwl_bc_tbl_entry *scd_bc_tbl = txq-&gt;bc_tbl.addr;</div><div class='add'>+	u8 filled_tfd_size, num_fetch_chunks;</div><div class='add'>+	u16 len = byte_cnt;</div><div class='add'>+	__le16 bc_ent;</div><div class='add'>+</div><div class='add'>+	if (WARN(idx &gt;= txq-&gt;n_window, "%d &gt;= %d\n", idx, txq-&gt;n_window))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	filled_tfd_size = offsetof(struct iwl_tfh_tfd, tbs) +</div><div class='add'>+			  num_tbs * sizeof(struct iwl_tfh_tb);</div><div class='add'>+	/*</div><div class='add'>+	 * filled_tfd_size contains the number of filled bytes in the TFD.</div><div class='add'>+	 * Dividing it by 64 will give the number of chunks to fetch</div><div class='add'>+	 * to SRAM- 0 for one chunk, 1 for 2 and so on.</div><div class='add'>+	 * If, for example, TFD contains only 3 TBs then 32 bytes</div><div class='add'>+	 * of the TFD are used, and only one chunk of 64 bytes should</div><div class='add'>+	 * be fetched</div><div class='add'>+	 */</div><div class='add'>+	num_fetch_chunks = DIV_ROUND_UP(filled_tfd_size, 64) - 1;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+		WARN_ON(len &gt; 0x3FFF);</div><div class='add'>+		bc_ent = cpu_to_le16(len | (num_fetch_chunks &lt;&lt; 14));</div><div class='add'>+	} else {</div><div class='add'>+		len = DIV_ROUND_UP(len, 4);</div><div class='add'>+		WARN_ON(len &gt; 0xFFF);</div><div class='add'>+		bc_ent = cpu_to_le16(len | (num_fetch_chunks &lt;&lt; 12));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	scd_bc_tbl[idx].tfd_offset = bc_ent;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 iwl_txq_gen2_get_num_tbs(struct iwl_tfh_tfd *tfd)</div><div class='add'>+{</div><div class='add'>+	return le16_to_cpu(tfd-&gt;num_tbs) &amp; 0x1f;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_txq_gen2_set_tb(struct iwl_trans *trans, struct iwl_tfh_tfd *tfd,</div><div class='add'>+			dma_addr_t addr, u16 len)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	int idx = iwl_txq_gen2_get_num_tbs(tfd);</div><div class='add'>+	struct iwl_tfh_tb *tb;</div><div class='add'>+</div><div class='add'>+	/* Only WARN here so we know about the issue, but we mess up our</div><div class='add'>+	 * unmap path because not every place currently checks for errors</div><div class='add'>+	 * returned from this function - it can only return an error if</div><div class='add'>+	 * there's no more space, and so when we know there is enough we</div><div class='add'>+	 * don't always check ...</div><div class='add'>+	 */</div><div class='add'>+	WARN(iwl_txq_crosses_4g_boundary(addr, len),</div><div class='add'>+	     "possible DMA problem with iova:0x%llx, len:%d\n",</div><div class='add'>+	     (unsigned long long)addr, len);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(idx &gt;= IWL_TFH_NUM_TBS))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	tb = &amp;tfd-&gt;tbs[idx];</div><div class='add'>+</div><div class='add'>+	/* Each TFD can point to a maximum max_tbs Tx buffers */</div><div class='add'>+	if (le16_to_cpu(tfd-&gt;num_tbs) &gt;= trans_pcie-&gt;txqs.tfd.max_tbs) {</div><div class='add'>+		IWL_ERR(trans, "Error can not send more than %d chunks\n",</div><div class='add'>+			trans_pcie-&gt;txqs.tfd.max_tbs);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	put_unaligned_le64(addr, &amp;tb-&gt;addr);</div><div class='add'>+	tb-&gt;tb_len = cpu_to_le16(len);</div><div class='add'>+</div><div class='add'>+	tfd-&gt;num_tbs = cpu_to_le16(idx + 1);</div><div class='add'>+</div><div class='add'>+	return idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_txq_gen2_tfd_unmap(struct iwl_trans *trans,</div><div class='add'>+			    struct iwl_cmd_meta *meta,</div><div class='add'>+			    struct iwl_tfh_tfd *tfd)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	int i, num_tbs;</div><div class='add'>+</div><div class='add'>+	/* Sanity check on number of chunks */</div><div class='add'>+	num_tbs = iwl_txq_gen2_get_num_tbs(tfd);</div><div class='add'>+</div><div class='add'>+	if (num_tbs &gt; trans_pcie-&gt;txqs.tfd.max_tbs) {</div><div class='add'>+		IWL_ERR(trans, "Too many chunks: %i\n", num_tbs);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TB1 is mapped directly, the rest is the TSO page and SG list. */</div><div class='add'>+	if (meta-&gt;sg_offset)</div><div class='add'>+		num_tbs = 2;</div><div class='add'>+</div><div class='add'>+	/* first TB is never freed - it's the bidirectional DMA data */</div><div class='add'>+	for (i = 1; i &lt; num_tbs; i++) {</div><div class='add'>+		if (meta-&gt;tbs &amp; BIT(i))</div><div class='add'>+			dma_unmap_page(trans-&gt;dev,</div><div class='add'>+				       le64_to_cpu(tfd-&gt;tbs[i].addr),</div><div class='add'>+				       le16_to_cpu(tfd-&gt;tbs[i].tb_len),</div><div class='add'>+				       DMA_TO_DEVICE);</div><div class='add'>+		else</div><div class='add'>+			dma_unmap_single(trans-&gt;dev,</div><div class='add'>+					 le64_to_cpu(tfd-&gt;tbs[i].addr),</div><div class='add'>+					 le16_to_cpu(tfd-&gt;tbs[i].tb_len),</div><div class='add'>+					 DMA_TO_DEVICE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_txq_set_tfd_invalid_gen2(trans, tfd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_txq_gen2_free_tfd(struct iwl_trans *trans, struct iwl_txq *txq)</div><div class='add'>+{</div><div class='add'>+	/* rd_ptr is bounded by TFD_QUEUE_SIZE_MAX and</div><div class='add'>+	 * idx is bounded by n_window</div><div class='add'>+	 */</div><div class='add'>+	int idx = iwl_txq_get_cmd_index(txq, txq-&gt;read_ptr);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;txq-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!txq-&gt;entries)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_txq_gen2_tfd_unmap(trans, &amp;txq-&gt;entries[idx].meta,</div><div class='add'>+			       iwl_txq_get_tfd(trans, txq, idx));</div><div class='add'>+</div><div class='add'>+	skb = txq-&gt;entries[idx].skb;</div><div class='add'>+</div><div class='add'>+	/* Can be called from irqs-disabled context</div><div class='add'>+	 * If skb is not NULL, it means that the whole queue is being</div><div class='add'>+	 * freed and that the queue is not empty - free the skb</div><div class='add'>+	 */</div><div class='add'>+	if (skb) {</div><div class='add'>+		iwl_op_mode_free_skb(trans-&gt;op_mode, skb);</div><div class='add'>+		txq-&gt;entries[idx].skb = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * iwl_txq_inc_wr_ptr - Send new write index to hardware</div><div class='add'>+ */</div><div class='add'>+static void iwl_txq_inc_wr_ptr(struct iwl_trans *trans, struct iwl_txq *txq)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;txq-&gt;lock);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_TX(trans, "Q:%d WR: 0x%x\n", txq-&gt;id, txq-&gt;write_ptr);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * if not in power-save mode, uCode will never sleep when we're</div><div class='add'>+	 * trying to tx (during RFKILL, we're not trying to tx).</div><div class='add'>+	 */</div><div class='add'>+	iwl_write32(trans, HBUS_TARG_WRPTR, txq-&gt;write_ptr | (txq-&gt;id &lt;&lt; 16));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_txq_gen2_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='add'>+		    struct iwl_device_tx_cmd *dev_cmd, int txq_id)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_cmd_meta *out_meta;</div><div class='add'>+	struct iwl_txq *txq = trans_pcie-&gt;txqs.txq[txq_id];</div><div class='add'>+	u16 cmd_len;</div><div class='add'>+	int idx;</div><div class='add'>+	void *tfd;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(txq_id &gt;= IWL_MAX_TVQM_QUEUES,</div><div class='add'>+		      "queue %d out of range", txq_id))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(!test_bit(txq_id, trans_pcie-&gt;txqs.queue_used),</div><div class='add'>+		      "TX on unused queue %d\n", txq_id))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (skb_is_nonlinear(skb) &amp;&amp;</div><div class='add'>+	    skb_shinfo(skb)-&gt;nr_frags &gt; IWL_TRANS_PCIE_MAX_FRAGS(trans_pcie) &amp;&amp;</div><div class='add'>+	    __skb_linearize(skb))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;txq-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (iwl_txq_space(trans, txq) &lt; txq-&gt;high_mark) {</div><div class='add'>+		iwl_txq_stop(trans, txq);</div><div class='add'>+</div><div class='add'>+		/* don't put the packet on the ring, if there is no room */</div><div class='add'>+		if (unlikely(iwl_txq_space(trans, txq) &lt; 3)) {</div><div class='add'>+			struct iwl_device_tx_cmd **dev_cmd_ptr;</div><div class='add'>+</div><div class='add'>+			dev_cmd_ptr = (void *)((u8 *)skb-&gt;cb +</div><div class='add'>+					       trans-&gt;conf.cb_data_offs +</div><div class='add'>+					       sizeof(void *));</div><div class='add'>+</div><div class='add'>+			*dev_cmd_ptr = dev_cmd;</div><div class='add'>+			__skb_queue_tail(&amp;txq-&gt;overflow_q, skb);</div><div class='add'>+			spin_unlock(&amp;txq-&gt;lock);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	idx = iwl_txq_get_cmd_index(txq, txq-&gt;write_ptr);</div><div class='add'>+</div><div class='add'>+	/* Set up driver data for this TFD */</div><div class='add'>+	txq-&gt;entries[idx].skb = skb;</div><div class='add'>+	txq-&gt;entries[idx].cmd = dev_cmd;</div><div class='add'>+</div><div class='add'>+	dev_cmd-&gt;hdr.sequence =</div><div class='add'>+		cpu_to_le16((u16)(QUEUE_TO_SEQ(txq_id) |</div><div class='add'>+			    INDEX_TO_SEQ(idx)));</div><div class='add'>+</div><div class='add'>+	/* Set up first empty entry in queue's array of Tx/cmd buffers */</div><div class='add'>+	out_meta = &amp;txq-&gt;entries[idx].meta;</div><div class='add'>+	memset(out_meta, 0, sizeof(*out_meta));</div><div class='add'>+</div><div class='add'>+	tfd = iwl_txq_gen2_build_tfd(trans, txq, dev_cmd, skb, out_meta);</div><div class='add'>+	if (!tfd) {</div><div class='add'>+		spin_unlock(&amp;txq-&gt;lock);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='add'>+		struct iwl_tx_cmd *tx_cmd =</div><div class='add'>+			(void *)dev_cmd-&gt;payload;</div><div class='add'>+</div><div class='add'>+		cmd_len = le16_to_cpu(tx_cmd-&gt;len);</div><div class='add'>+	} else {</div><div class='add'>+		struct iwl_tx_cmd_v9 *tx_cmd_v9 =</div><div class='add'>+			(void *)dev_cmd-&gt;payload;</div><div class='add'>+</div><div class='add'>+		cmd_len = le16_to_cpu(tx_cmd_v9-&gt;len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set up entry for this TFD in Tx byte-count array */</div><div class='add'>+	iwl_pcie_gen2_update_byte_tbl(trans, txq, cmd_len,</div><div class='add'>+				      iwl_txq_gen2_get_num_tbs(tfd));</div><div class='add'>+</div><div class='add'>+	/* start timer if queue currently empty */</div><div class='add'>+	if (txq-&gt;read_ptr == txq-&gt;write_ptr &amp;&amp; txq-&gt;wd_timeout)</div><div class='add'>+		mod_timer(&amp;txq-&gt;stuck_timer, jiffies + txq-&gt;wd_timeout);</div><div class='add'>+</div><div class='add'>+	/* Tell device the write index *just past* this latest filled TFD */</div><div class='add'>+	txq-&gt;write_ptr = iwl_txq_inc_wrap(trans, txq-&gt;write_ptr);</div><div class='add'>+	iwl_txq_inc_wr_ptr(trans, txq);</div><div class='add'>+	/*</div><div class='add'>+	 * At this point the frame is "transmitted" successfully</div><div class='add'>+	 * and we will get a TX status notification eventually.</div><div class='add'>+	 */</div><div class='add'>+	spin_unlock(&amp;txq-&gt;lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*************** HOST COMMAND QUEUE FUNCTIONS   *****/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * iwl_txq_gen2_unmap -  Unmap any remaining DMA mappings and free skb's</div><div class='add'>+ */</div><div class='add'>+static void iwl_txq_gen2_unmap(struct iwl_trans *trans, int txq_id)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_txq *txq = trans_pcie-&gt;txqs.txq[txq_id];</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;txq-&gt;reclaim_lock);</div><div class='add'>+	spin_lock(&amp;txq-&gt;lock);</div><div class='add'>+	while (txq-&gt;write_ptr != txq-&gt;read_ptr) {</div><div class='add'>+		IWL_DEBUG_TX_REPLY(trans, "Q %d Free %d\n",</div><div class='add'>+				   txq_id, txq-&gt;read_ptr);</div><div class='add'>+</div><div class='add'>+		if (txq_id != trans-&gt;conf.cmd_queue) {</div><div class='add'>+			int idx = iwl_txq_get_cmd_index(txq, txq-&gt;read_ptr);</div><div class='add'>+			struct iwl_cmd_meta *cmd_meta = &amp;txq-&gt;entries[idx].meta;</div><div class='add'>+			struct sk_buff *skb = txq-&gt;entries[idx].skb;</div><div class='add'>+</div><div class='add'>+			if (!WARN_ON_ONCE(!skb))</div><div class='add'>+				iwl_pcie_free_tso_pages(trans, skb, cmd_meta);</div><div class='add'>+		}</div><div class='add'>+		iwl_txq_gen2_free_tfd(trans, txq);</div><div class='add'>+		txq-&gt;read_ptr = iwl_txq_inc_wrap(trans, txq-&gt;read_ptr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (!skb_queue_empty(&amp;txq-&gt;overflow_q)) {</div><div class='add'>+		struct sk_buff *skb = __skb_dequeue(&amp;txq-&gt;overflow_q);</div><div class='add'>+</div><div class='add'>+		iwl_op_mode_free_skb(trans-&gt;op_mode, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;txq-&gt;lock);</div><div class='add'>+	spin_unlock_bh(&amp;txq-&gt;reclaim_lock);</div><div class='add'>+</div><div class='add'>+	/* just in case - this queue may have been stopped */</div><div class='add'>+	iwl_trans_pcie_wake_queue(trans, txq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_txq_gen2_free_memory(struct iwl_trans *trans,</div><div class='add'>+				     struct iwl_txq *txq)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct device *dev = trans-&gt;dev;</div><div class='add'>+</div><div class='add'>+	/* De-alloc circular buffer of TFDs */</div><div class='add'>+	if (txq-&gt;tfds) {</div><div class='add'>+		dma_free_coherent(dev,</div><div class='add'>+				  trans_pcie-&gt;txqs.tfd.size * txq-&gt;n_window,</div><div class='add'>+				  txq-&gt;tfds, txq-&gt;dma_addr);</div><div class='add'>+		dma_free_coherent(dev,</div><div class='add'>+				  sizeof(*txq-&gt;first_tb_bufs) * txq-&gt;n_window,</div><div class='add'>+				  txq-&gt;first_tb_bufs, txq-&gt;first_tb_dma);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(txq-&gt;entries);</div><div class='add'>+	if (txq-&gt;bc_tbl.addr)</div><div class='add'>+		dma_pool_free(trans_pcie-&gt;txqs.bc_pool,</div><div class='add'>+			      txq-&gt;bc_tbl.addr, txq-&gt;bc_tbl.dma);</div><div class='add'>+	kfree(txq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * iwl_pcie_txq_free - Deallocate DMA queue.</div><div class='add'>+ * @txq: Transmit queue to deallocate.</div><div class='add'>+ *</div><div class='add'>+ * Empty queue by removing and destroying all BD's.</div><div class='add'>+ * Free all buffers.</div><div class='add'>+ * 0-fill, but do not free "txq" descriptor structure.</div><div class='add'>+ */</div><div class='add'>+static void iwl_txq_gen2_free(struct iwl_trans *trans, int txq_id)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_txq *txq;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(txq_id &gt;= IWL_MAX_TVQM_QUEUES,</div><div class='add'>+		      "queue %d out of range", txq_id))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	txq = trans_pcie-&gt;txqs.txq[txq_id];</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!txq))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iwl_txq_gen2_unmap(trans, txq_id);</div><div class='add'>+</div><div class='add'>+	/* De-alloc array of command/tx buffers */</div><div class='add'>+	if (txq_id == trans-&gt;conf.cmd_queue)</div><div class='add'>+		for (i = 0; i &lt; txq-&gt;n_window; i++) {</div><div class='add'>+			kfree_sensitive(txq-&gt;entries[i].cmd);</div><div class='add'>+			kfree_sensitive(txq-&gt;entries[i].free_buf);</div><div class='add'>+		}</div><div class='add'>+	timer_delete_sync(&amp;txq-&gt;stuck_timer);</div><div class='add'>+</div><div class='add'>+	iwl_txq_gen2_free_memory(trans, txq);</div><div class='add'>+</div><div class='add'>+	trans_pcie-&gt;txqs.txq[txq_id] = NULL;</div><div class='add'>+</div><div class='add'>+	clear_bit(txq_id, trans_pcie-&gt;txqs.queue_used);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct iwl_txq *</div><div class='add'>+iwl_txq_dyn_alloc_dma(struct iwl_trans *trans, int size, unsigned int timeout)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	size_t bc_tbl_size, bc_tbl_entries;</div><div class='add'>+	struct iwl_txq *txq;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!trans_pcie-&gt;txqs.bc_tbl_size);</div><div class='add'>+</div><div class='add'>+	bc_tbl_size = trans_pcie-&gt;txqs.bc_tbl_size;</div><div class='add'>+	bc_tbl_entries = bc_tbl_size / sizeof(u16);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(size &gt; bc_tbl_entries))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	txq = kzalloc(sizeof(*txq), GFP_KERNEL);</div><div class='add'>+	if (!txq)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	txq-&gt;bc_tbl.addr = dma_pool_alloc(trans_pcie-&gt;txqs.bc_pool, GFP_KERNEL,</div><div class='add'>+					  &amp;txq-&gt;bc_tbl.dma);</div><div class='add'>+	if (!txq-&gt;bc_tbl.addr) {</div><div class='add'>+		IWL_ERR(trans, "Scheduler BC Table allocation failed\n");</div><div class='add'>+		kfree(txq);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_pcie_txq_alloc(trans, txq, size, false);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(trans, "Tx queue alloc failed\n");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	ret = iwl_txq_init(trans, txq, size, false);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(trans, "Tx queue init failed\n");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	txq-&gt;wd_timeout = msecs_to_jiffies(timeout);</div><div class='add'>+</div><div class='add'>+	return txq;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	iwl_txq_gen2_free_memory(trans, txq);</div><div class='add'>+	return ERR_PTR(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_pcie_txq_alloc_response(struct iwl_trans *trans,</div><div class='add'>+				       struct iwl_txq *txq,</div><div class='add'>+				       struct iwl_host_cmd *hcmd)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_tx_queue_cfg_rsp *rsp;</div><div class='add'>+	int ret, qid;</div><div class='add'>+	u32 wr_ptr;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(iwl_rx_packet_payload_len(hcmd-&gt;resp_pkt) !=</div><div class='add'>+		    sizeof(*rsp))) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto error_free_resp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rsp = (void *)hcmd-&gt;resp_pkt-&gt;data;</div><div class='add'>+	qid = le16_to_cpu(rsp-&gt;queue_number);</div><div class='add'>+	wr_ptr = le16_to_cpu(rsp-&gt;write_pointer);</div><div class='add'>+</div><div class='add'>+	if (qid &gt;= ARRAY_SIZE(trans_pcie-&gt;txqs.txq)) {</div><div class='add'>+		WARN_ONCE(1, "queue index %d unsupported", qid);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto error_free_resp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_and_set_bit(qid, trans_pcie-&gt;txqs.queue_used)) {</div><div class='add'>+		WARN_ONCE(1, "queue %d already used", qid);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto error_free_resp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(trans_pcie-&gt;txqs.txq[qid],</div><div class='add'>+		      "queue %d already allocated\n", qid)) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto error_free_resp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	txq-&gt;id = qid;</div><div class='add'>+	trans_pcie-&gt;txqs.txq[qid] = txq;</div><div class='add'>+	wr_ptr &amp;= (trans-&gt;mac_cfg-&gt;base-&gt;max_tfd_queue_size - 1);</div><div class='add'>+</div><div class='add'>+	/* Place first TFD at index corresponding to start sequence number */</div><div class='add'>+	txq-&gt;read_ptr = wr_ptr;</div><div class='add'>+	txq-&gt;write_ptr = wr_ptr;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_TX_QUEUES(trans, "Activate queue %d\n", qid);</div><div class='add'>+</div><div class='add'>+	iwl_free_resp(hcmd);</div><div class='add'>+	return qid;</div><div class='add'>+</div><div class='add'>+error_free_resp:</div><div class='add'>+	iwl_free_resp(hcmd);</div><div class='add'>+	iwl_txq_gen2_free_memory(trans, txq);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_txq_dyn_alloc(struct iwl_trans *trans, u32 flags, u32 sta_mask,</div><div class='add'>+		      u8 tid, int size, unsigned int timeout)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_txq *txq;</div><div class='add'>+	union {</div><div class='add'>+		struct iwl_tx_queue_cfg_cmd old;</div><div class='add'>+		struct iwl_scd_queue_cfg_cmd new;</div><div class='add'>+	} cmd;</div><div class='add'>+	struct iwl_host_cmd hcmd = {</div><div class='add'>+		.flags = CMD_WANT_SKB,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* take the min with bytecount table entries allowed */</div><div class='add'>+	size = min_t(u32, size, trans_pcie-&gt;txqs.bc_tbl_size / sizeof(u16));</div><div class='add'>+	/* but must be power of 2 values for calculating read/write pointers */</div><div class='add'>+	size = rounddown_pow_of_two(size);</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family == IWL_DEVICE_FAMILY_BZ &amp;&amp;</div><div class='add'>+	    trans-&gt;info.hw_rev_step == SILICON_A_STEP) {</div><div class='add'>+		size = 4096;</div><div class='add'>+		txq = iwl_txq_dyn_alloc_dma(trans, size, timeout);</div><div class='add'>+	} else {</div><div class='add'>+		do {</div><div class='add'>+			txq = iwl_txq_dyn_alloc_dma(trans, size, timeout);</div><div class='add'>+			if (!IS_ERR(txq))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			IWL_DEBUG_TX_QUEUES(trans,</div><div class='add'>+					    "Failed allocating TXQ of size %d for sta mask %x tid %d, ret: %ld\n",</div><div class='add'>+					    size, sta_mask, tid,</div><div class='add'>+					    PTR_ERR(txq));</div><div class='add'>+			size /= 2;</div><div class='add'>+		} while (size &gt;= 16);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(txq))</div><div class='add'>+		return PTR_ERR(txq);</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;conf.queue_alloc_cmd_ver == 0) {</div><div class='add'>+		memset(&amp;cmd.old, 0, sizeof(cmd.old));</div><div class='add'>+		cmd.old.tfdq_addr = cpu_to_le64(txq-&gt;dma_addr);</div><div class='add'>+		cmd.old.byte_cnt_addr = cpu_to_le64(txq-&gt;bc_tbl.dma);</div><div class='add'>+		cmd.old.cb_size = cpu_to_le32(TFD_QUEUE_CB_SIZE(size));</div><div class='add'>+		cmd.old.flags = cpu_to_le16(flags | TX_QUEUE_CFG_ENABLE_QUEUE);</div><div class='add'>+		cmd.old.tid = tid;</div><div class='add'>+</div><div class='add'>+		if (hweight32(sta_mask) != 1) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+		cmd.old.sta_id = ffs(sta_mask) - 1;</div><div class='add'>+</div><div class='add'>+		hcmd.id = SCD_QUEUE_CFG;</div><div class='add'>+		hcmd.len[0] = sizeof(cmd.old);</div><div class='add'>+		hcmd.data[0] = &amp;cmd.old;</div><div class='add'>+	} else if (trans-&gt;conf.queue_alloc_cmd_ver == 3) {</div><div class='add'>+		memset(&amp;cmd.new, 0, sizeof(cmd.new));</div><div class='add'>+		cmd.new.operation = cpu_to_le32(IWL_SCD_QUEUE_ADD);</div><div class='add'>+		cmd.new.u.add.tfdq_dram_addr = cpu_to_le64(txq-&gt;dma_addr);</div><div class='add'>+		cmd.new.u.add.bc_dram_addr = cpu_to_le64(txq-&gt;bc_tbl.dma);</div><div class='add'>+		cmd.new.u.add.cb_size = cpu_to_le32(TFD_QUEUE_CB_SIZE(size));</div><div class='add'>+		cmd.new.u.add.flags = cpu_to_le32(flags);</div><div class='add'>+		cmd.new.u.add.sta_mask = cpu_to_le32(sta_mask);</div><div class='add'>+		cmd.new.u.add.tid = tid;</div><div class='add'>+</div><div class='add'>+		hcmd.id = WIDE_ID(DATA_PATH_GROUP, SCD_QUEUE_CONFIG_CMD);</div><div class='add'>+		hcmd.len[0] = sizeof(cmd.new);</div><div class='add'>+		hcmd.data[0] = &amp;cmd.new;</div><div class='add'>+	} else {</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_trans_send_cmd(trans, &amp;hcmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return iwl_pcie_txq_alloc_response(trans, txq, &amp;hcmd);</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	iwl_txq_gen2_free_memory(trans, txq);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_txq_dyn_free(struct iwl_trans *trans, int queue)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+</div><div class='add'>+	if (WARN(queue &gt;= IWL_MAX_TVQM_QUEUES,</div><div class='add'>+		 "queue %d out of range", queue))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Upon HW Rfkill - we stop the device, and then stop the queues</div><div class='add'>+	 * in the op_mode. Just for the sake of the simplicity of the op_mode,</div><div class='add'>+	 * allow the op_mode to call txq_disable after it already called</div><div class='add'>+	 * stop_device.</div><div class='add'>+	 */</div><div class='add'>+	if (!test_and_clear_bit(queue, trans_pcie-&gt;txqs.queue_used)) {</div><div class='add'>+		WARN_ONCE(test_bit(STATUS_DEVICE_ENABLED, &amp;trans-&gt;status),</div><div class='add'>+			  "queue %d not used", queue);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iwl_txq_gen2_free(trans, queue);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_TX_QUEUES(trans, "Deactivate queue %d\n", queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_txq_gen2_tx_free(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	memset(trans_pcie-&gt;txqs.queue_used, 0,</div><div class='add'>+	       sizeof(trans_pcie-&gt;txqs.queue_used));</div><div class='add'>+</div><div class='add'>+	/* Free all TX queues */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(trans_pcie-&gt;txqs.txq); i++) {</div><div class='add'>+		if (!trans_pcie-&gt;txqs.txq[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		iwl_txq_gen2_free(trans, i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_txq_gen2_init(struct iwl_trans *trans, int txq_id, int queue_size)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_txq *queue;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* alloc and init the tx queue */</div><div class='add'>+	if (!trans_pcie-&gt;txqs.txq[txq_id]) {</div><div class='add'>+		queue = kzalloc(sizeof(*queue), GFP_KERNEL);</div><div class='add'>+		if (!queue) {</div><div class='add'>+			IWL_ERR(trans, "Not enough memory for tx queue\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+		trans_pcie-&gt;txqs.txq[txq_id] = queue;</div><div class='add'>+		ret = iwl_pcie_txq_alloc(trans, queue, queue_size, true);</div><div class='add'>+		if (ret) {</div><div class='add'>+			IWL_ERR(trans, "Tx %d queue init failed\n", txq_id);</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		queue = trans_pcie-&gt;txqs.txq[txq_id];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_txq_init(trans, queue, queue_size,</div><div class='add'>+			   (txq_id == trans-&gt;conf.cmd_queue));</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(trans, "Tx %d queue alloc failed\n", txq_id);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	trans_pcie-&gt;txqs.txq[txq_id]-&gt;id = txq_id;</div><div class='add'>+	set_bit(txq_id, trans_pcie-&gt;txqs.queue_used);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	iwl_txq_gen2_tx_free(trans);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*************** HOST COMMAND QUEUE FUNCTIONS   *****/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * iwl_pcie_gen2_enqueue_hcmd - enqueue a uCode command</div><div class='add'>+ * @priv: device private data point</div><div class='add'>+ * @cmd: a pointer to the ucode command structure</div><div class='add'>+ *</div><div class='add'>+ * The function returns &lt; 0 values to indicate the operation</div><div class='add'>+ * failed. On success, it returns the index (&gt;= 0) of command in the</div><div class='add'>+ * command queue.</div><div class='add'>+ */</div><div class='add'>+int iwl_pcie_gen2_enqueue_hcmd(struct iwl_trans *trans,</div><div class='add'>+			       struct iwl_host_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_txq *txq = trans_pcie-&gt;txqs.txq[trans-&gt;conf.cmd_queue];</div><div class='add'>+	struct iwl_device_cmd *out_cmd;</div><div class='add'>+	struct iwl_cmd_meta *out_meta;</div><div class='add'>+	void *dup_buf = NULL;</div><div class='add'>+	dma_addr_t phys_addr;</div><div class='add'>+	int i, cmd_pos, idx;</div><div class='add'>+	u16 copy_size, cmd_size, tb0_size;</div><div class='add'>+	bool had_nocopy = false;</div><div class='add'>+	u8 group_id = iwl_cmd_groupid(cmd-&gt;id);</div><div class='add'>+	const u8 *cmddata[IWL_MAX_CMD_TBS_PER_TFD];</div><div class='add'>+	u16 cmdlen[IWL_MAX_CMD_TBS_PER_TFD];</div><div class='add'>+	struct iwl_tfh_tfd *tfd;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(cmd-&gt;flags &amp; CMD_BLOCK_TXQS))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	copy_size = sizeof(struct iwl_cmd_header_wide);</div><div class='add'>+	cmd_size = sizeof(struct iwl_cmd_header_wide);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IWL_MAX_CMD_TBS_PER_TFD; i++) {</div><div class='add'>+		cmddata[i] = cmd-&gt;data[i];</div><div class='add'>+		cmdlen[i] = cmd-&gt;len[i];</div><div class='add'>+</div><div class='add'>+		if (!cmd-&gt;len[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* need at least IWL_FIRST_TB_SIZE copied */</div><div class='add'>+		if (copy_size &lt; IWL_FIRST_TB_SIZE) {</div><div class='add'>+			int copy = IWL_FIRST_TB_SIZE - copy_size;</div><div class='add'>+</div><div class='add'>+			if (copy &gt; cmdlen[i])</div><div class='add'>+				copy = cmdlen[i];</div><div class='add'>+			cmdlen[i] -= copy;</div><div class='add'>+			cmddata[i] += copy;</div><div class='add'>+			copy_size += copy;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (cmd-&gt;dataflags[i] &amp; IWL_HCMD_DFL_NOCOPY) {</div><div class='add'>+			had_nocopy = true;</div><div class='add'>+			if (WARN_ON(cmd-&gt;dataflags[i] &amp; IWL_HCMD_DFL_DUP)) {</div><div class='add'>+				idx = -EINVAL;</div><div class='add'>+				goto free_dup_buf;</div><div class='add'>+			}</div><div class='add'>+		} else if (cmd-&gt;dataflags[i] &amp; IWL_HCMD_DFL_DUP) {</div><div class='add'>+			/*</div><div class='add'>+			 * This is also a chunk that isn't copied</div><div class='add'>+			 * to the static buffer so set had_nocopy.</div><div class='add'>+			 */</div><div class='add'>+			had_nocopy = true;</div><div class='add'>+</div><div class='add'>+			/* only allowed once */</div><div class='add'>+			if (WARN_ON(dup_buf)) {</div><div class='add'>+				idx = -EINVAL;</div><div class='add'>+				goto free_dup_buf;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			dup_buf = kmemdup(cmddata[i], cmdlen[i],</div><div class='add'>+					  GFP_ATOMIC);</div><div class='add'>+			if (!dup_buf)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+		} else {</div><div class='add'>+			/* NOCOPY must not be followed by normal! */</div><div class='add'>+			if (WARN_ON(had_nocopy)) {</div><div class='add'>+				idx = -EINVAL;</div><div class='add'>+				goto free_dup_buf;</div><div class='add'>+			}</div><div class='add'>+			copy_size += cmdlen[i];</div><div class='add'>+		}</div><div class='add'>+		cmd_size += cmd-&gt;len[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If any of the command structures end up being larger than the</div><div class='add'>+	 * TFD_MAX_PAYLOAD_SIZE and they aren't dynamically allocated into</div><div class='add'>+	 * separate TFDs, then we will need to increase the size of the buffers</div><div class='add'>+	 */</div><div class='add'>+	if (WARN(copy_size &gt; TFD_MAX_PAYLOAD_SIZE,</div><div class='add'>+		 "Command %s (%#x) is too large (%d bytes)\n",</div><div class='add'>+		 iwl_get_cmd_string(trans, cmd-&gt;id), cmd-&gt;id, copy_size)) {</div><div class='add'>+		idx = -EINVAL;</div><div class='add'>+		goto free_dup_buf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;txq-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	idx = iwl_txq_get_cmd_index(txq, txq-&gt;write_ptr);</div><div class='add'>+	tfd = iwl_txq_get_tfd(trans, txq, txq-&gt;write_ptr);</div><div class='add'>+	memset(tfd, 0, sizeof(*tfd));</div><div class='add'>+</div><div class='add'>+	if (iwl_txq_space(trans, txq) &lt; ((cmd-&gt;flags &amp; CMD_ASYNC) ? 2 : 1)) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;txq-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		IWL_ERR(trans, "No space in command queue\n");</div><div class='add'>+		iwl_op_mode_nic_error(trans-&gt;op_mode,</div><div class='add'>+				      IWL_ERR_TYPE_CMD_QUEUE_FULL);</div><div class='add'>+		iwl_trans_schedule_reset(trans, IWL_ERR_TYPE_CMD_QUEUE_FULL);</div><div class='add'>+		idx = -ENOSPC;</div><div class='add'>+		goto free_dup_buf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	out_cmd = txq-&gt;entries[idx].cmd;</div><div class='add'>+	out_meta = &amp;txq-&gt;entries[idx].meta;</div><div class='add'>+</div><div class='add'>+	/* re-initialize, this also marks the SG list as unused */</div><div class='add'>+	memset(out_meta, 0, sizeof(*out_meta));</div><div class='add'>+	if (cmd-&gt;flags &amp; CMD_WANT_SKB)</div><div class='add'>+		out_meta-&gt;source = cmd;</div><div class='add'>+</div><div class='add'>+	/* set up the header */</div><div class='add'>+	out_cmd-&gt;hdr_wide.cmd = iwl_cmd_opcode(cmd-&gt;id);</div><div class='add'>+	out_cmd-&gt;hdr_wide.group_id = group_id;</div><div class='add'>+	out_cmd-&gt;hdr_wide.version = iwl_cmd_version(cmd-&gt;id);</div><div class='add'>+	out_cmd-&gt;hdr_wide.length =</div><div class='add'>+		cpu_to_le16(cmd_size - sizeof(struct iwl_cmd_header_wide));</div><div class='add'>+	out_cmd-&gt;hdr_wide.reserved = 0;</div><div class='add'>+	out_cmd-&gt;hdr_wide.sequence =</div><div class='add'>+		cpu_to_le16(QUEUE_TO_SEQ(trans-&gt;conf.cmd_queue) |</div><div class='add'>+					 INDEX_TO_SEQ(txq-&gt;write_ptr));</div><div class='add'>+</div><div class='add'>+	cmd_pos = sizeof(struct iwl_cmd_header_wide);</div><div class='add'>+	copy_size = sizeof(struct iwl_cmd_header_wide);</div><div class='add'>+</div><div class='add'>+	/* and copy the data that needs to be copied */</div><div class='add'>+	for (i = 0; i &lt; IWL_MAX_CMD_TBS_PER_TFD; i++) {</div><div class='add'>+		int copy;</div><div class='add'>+</div><div class='add'>+		if (!cmd-&gt;len[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* copy everything if not nocopy/dup */</div><div class='add'>+		if (!(cmd-&gt;dataflags[i] &amp; (IWL_HCMD_DFL_NOCOPY |</div><div class='add'>+					   IWL_HCMD_DFL_DUP))) {</div><div class='add'>+			copy = cmd-&gt;len[i];</div><div class='add'>+</div><div class='add'>+			memcpy((u8 *)out_cmd + cmd_pos, cmd-&gt;data[i], copy);</div><div class='add'>+			cmd_pos += copy;</div><div class='add'>+			copy_size += copy;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Otherwise we need at least IWL_FIRST_TB_SIZE copied</div><div class='add'>+		 * in total (for bi-directional DMA), but copy up to what</div><div class='add'>+		 * we can fit into the payload for debug dump purposes.</div><div class='add'>+		 */</div><div class='add'>+		copy = min_t(int, TFD_MAX_PAYLOAD_SIZE - cmd_pos, cmd-&gt;len[i]);</div><div class='add'>+</div><div class='add'>+		memcpy((u8 *)out_cmd + cmd_pos, cmd-&gt;data[i], copy);</div><div class='add'>+		cmd_pos += copy;</div><div class='add'>+</div><div class='add'>+		/* However, treat copy_size the proper way, we need it below */</div><div class='add'>+		if (copy_size &lt; IWL_FIRST_TB_SIZE) {</div><div class='add'>+			copy = IWL_FIRST_TB_SIZE - copy_size;</div><div class='add'>+</div><div class='add'>+			if (copy &gt; cmd-&gt;len[i])</div><div class='add'>+				copy = cmd-&gt;len[i];</div><div class='add'>+			copy_size += copy;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_HC(trans,</div><div class='add'>+		     "Sending command %s (%.2x.%.2x), seq: 0x%04X, %d bytes at %d[%d]:%d\n",</div><div class='add'>+		     iwl_get_cmd_string(trans, cmd-&gt;id), group_id,</div><div class='add'>+		     out_cmd-&gt;hdr.cmd, le16_to_cpu(out_cmd-&gt;hdr.sequence),</div><div class='add'>+		     cmd_size, txq-&gt;write_ptr, idx, trans-&gt;conf.cmd_queue);</div><div class='add'>+</div><div class='add'>+	/* start the TFD with the minimum copy bytes */</div><div class='add'>+	tb0_size = min_t(int, copy_size, IWL_FIRST_TB_SIZE);</div><div class='add'>+	memcpy(&amp;txq-&gt;first_tb_bufs[idx], out_cmd, tb0_size);</div><div class='add'>+	iwl_txq_gen2_set_tb(trans, tfd, iwl_txq_get_first_tb_dma(txq, idx),</div><div class='add'>+			    tb0_size);</div><div class='add'>+</div><div class='add'>+	/* map first command fragment, if any remains */</div><div class='add'>+	if (copy_size &gt; tb0_size) {</div><div class='add'>+		phys_addr = dma_map_single(trans-&gt;dev,</div><div class='add'>+					   (u8 *)out_cmd + tb0_size,</div><div class='add'>+					   copy_size - tb0_size,</div><div class='add'>+					   DMA_TO_DEVICE);</div><div class='add'>+		if (dma_mapping_error(trans-&gt;dev, phys_addr)) {</div><div class='add'>+			idx = -ENOMEM;</div><div class='add'>+			iwl_txq_gen2_tfd_unmap(trans, out_meta, tfd);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		iwl_txq_gen2_set_tb(trans, tfd, phys_addr,</div><div class='add'>+				    copy_size - tb0_size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* map the remaining (adjusted) nocopy/dup fragments */</div><div class='add'>+	for (i = 0; i &lt; IWL_MAX_CMD_TBS_PER_TFD; i++) {</div><div class='add'>+		void *data = (void *)(uintptr_t)cmddata[i];</div><div class='add'>+</div><div class='add'>+		if (!cmdlen[i])</div><div class='add'>+			continue;</div><div class='add'>+		if (!(cmd-&gt;dataflags[i] &amp; (IWL_HCMD_DFL_NOCOPY |</div><div class='add'>+					   IWL_HCMD_DFL_DUP)))</div><div class='add'>+			continue;</div><div class='add'>+		if (cmd-&gt;dataflags[i] &amp; IWL_HCMD_DFL_DUP)</div><div class='add'>+			data = dup_buf;</div><div class='add'>+		phys_addr = dma_map_single(trans-&gt;dev, data,</div><div class='add'>+					   cmdlen[i], DMA_TO_DEVICE);</div><div class='add'>+		if (dma_mapping_error(trans-&gt;dev, phys_addr)) {</div><div class='add'>+			idx = -ENOMEM;</div><div class='add'>+			iwl_txq_gen2_tfd_unmap(trans, out_meta, tfd);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		iwl_txq_gen2_set_tb(trans, tfd, phys_addr, cmdlen[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(IWL_TFH_NUM_TBS &gt; sizeof(out_meta-&gt;tbs) * BITS_PER_BYTE);</div><div class='add'>+	out_meta-&gt;flags = cmd-&gt;flags;</div><div class='add'>+	if (WARN_ON_ONCE(txq-&gt;entries[idx].free_buf))</div><div class='add'>+		kfree_sensitive(txq-&gt;entries[idx].free_buf);</div><div class='add'>+	txq-&gt;entries[idx].free_buf = dup_buf;</div><div class='add'>+</div><div class='add'>+	trace_iwlwifi_dev_hcmd(trans-&gt;dev, cmd, cmd_size, &amp;out_cmd-&gt;hdr_wide);</div><div class='add'>+</div><div class='add'>+	/* start timer if queue currently empty */</div><div class='add'>+	if (txq-&gt;read_ptr == txq-&gt;write_ptr &amp;&amp; txq-&gt;wd_timeout)</div><div class='add'>+		mod_timer(&amp;txq-&gt;stuck_timer, jiffies + txq-&gt;wd_timeout);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;trans_pcie-&gt;reg_lock);</div><div class='add'>+	/* Increment and update queue's write index */</div><div class='add'>+	txq-&gt;write_ptr = iwl_txq_inc_wrap(trans, txq-&gt;write_ptr);</div><div class='add'>+	iwl_txq_inc_wr_ptr(trans, txq);</div><div class='add'>+	spin_unlock(&amp;trans_pcie-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_irqrestore(&amp;txq-&gt;lock, flags);</div><div class='add'>+free_dup_buf:</div><div class='add'>+	if (idx &lt; 0)</div><div class='add'>+		kfree(dup_buf);</div><div class='add'>+	return idx;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c<br/>index 4f6c187eed69..6e85aa519e1b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/tx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/tx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c</a></div><div class='hunk'>@@ -1,16 +1,22 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2003-2014, 2018-2021 Intel Corporation</div><div class='add'>+ * Copyright (C) 2003-2014, 2018-2021, 2023-2025 Intel Corporation</div><div class='ctx'>  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (C) 2016-2017 Intel Deutschland GmbH</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/ieee80211.h&gt;</div><div class='add'>+#include &lt;linux/dmapool.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/tcp.h&gt;</div><div class='ctx'> #include &lt;net/ip6_checksum.h&gt;</div><div class='ctx'> #include &lt;net/tso.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "fw/api/commands.h"</div><div class='add'>+#include "fw/api/datapath.h"</div><div class='add'>+#include "fw/api/debug.h"</div><div class='add'>+#include "iwl-fh.h"</div><div class='ctx'> #include "iwl-debug.h"</div><div class='ctx'> #include "iwl-csr.h"</div><div class='ctx'> #include "iwl-prph.h"</div><div class='hunk'>@@ -19,6 +25,8 @@</div><div class='ctx'> #include "iwl-op-mode.h"</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> #include "fw/api/tx.h"</div><div class='add'>+#include "fw/dbg.h"</div><div class='add'>+#include "pcie/utils.h"</div><div class='ctx'> </div><div class='ctx'> /*************** DMA-QUEUE-GENERAL-FUNCTIONS  *****</div><div class='ctx'>  * DMA services</div><div class='hunk'>@@ -83,8 +91,8 @@ static void iwl_pcie_txq_inc_wr_ptr(struct iwl_trans *trans,</div><div class='ctx'> 	 * 2. NIC is woken up for CMD regardless of shadow outside this function</div><div class='ctx'> 	 * 3. there is a chance that the NIC is asleep</div><div class='ctx'> 	 */</div><div class='del'>-	if (!trans-&gt;trans_cfg-&gt;base_params-&gt;shadow_reg_enable &amp;&amp;</div><div class='del'>-	    txq_id != trans-&gt;txqs.cmd.q_id &amp;&amp;</div><div class='add'>+	if (!trans-&gt;mac_cfg-&gt;base-&gt;shadow_reg_enable &amp;&amp;</div><div class='add'>+	    txq_id != trans-&gt;conf.cmd_queue &amp;&amp;</div><div class='ctx'> 	    test_bit(STATUS_TPOWER_PMI, &amp;trans-&gt;status)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * wake up nic if it's powered down ...</div><div class='hunk'>@@ -115,12 +123,13 @@ static void iwl_pcie_txq_inc_wr_ptr(struct iwl_trans *trans,</div><div class='ctx'> </div><div class='ctx'> void iwl_pcie_txq_check_wrptrs(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues; i++) {</div><div class='del'>-		struct iwl_txq *txq = trans-&gt;txqs.txq[i];</div><div class='add'>+	for (i = 0; i &lt; trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues; i++) {</div><div class='add'>+		struct iwl_txq *txq = trans_pcie-&gt;txqs.txq[i];</div><div class='ctx'> </div><div class='del'>-		if (!test_bit(i, trans-&gt;txqs.queue_used))</div><div class='add'>+		if (!test_bit(i, trans_pcie-&gt;txqs.queue_used))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;txq-&gt;lock);</div><div class='hunk'>@@ -132,12 +141,10 @@ void iwl_pcie_txq_check_wrptrs(struct iwl_trans *trans)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void iwl_pcie_tfd_set_tb(struct iwl_trans *trans, void *tfd,</div><div class='del'>-				       u8 idx, dma_addr_t addr, u16 len)</div><div class='add'>+static inline void iwl_pcie_gen1_tfd_set_tb(struct iwl_tfd *tfd,</div><div class='add'>+					    u8 idx, dma_addr_t addr, u16 len)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_tfd *tfd_fh = (void *)tfd;</div><div class='del'>-	struct iwl_tfd_tb *tb = &amp;tfd_fh-&gt;tbs[idx];</div><div class='del'>-</div><div class='add'>+	struct iwl_tfd_tb *tb = &amp;tfd-&gt;tbs[idx];</div><div class='ctx'> 	u16 hi_n_len = len &lt;&lt; 4;</div><div class='ctx'> </div><div class='ctx'> 	put_unaligned_le32(addr, &amp;tb-&gt;lo);</div><div class='hunk'>@@ -145,26 +152,32 @@ static inline void iwl_pcie_tfd_set_tb(struct iwl_trans *trans, void *tfd,</div><div class='ctx'> </div><div class='ctx'> 	tb-&gt;hi_n_len = cpu_to_le16(hi_n_len);</div><div class='ctx'> </div><div class='del'>-	tfd_fh-&gt;num_tbs = idx + 1;</div><div class='add'>+	tfd-&gt;num_tbs = idx + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 iwl_txq_gen1_tfd_get_num_tbs(struct iwl_tfd *tfd)</div><div class='add'>+{</div><div class='add'>+	return tfd-&gt;num_tbs &amp; 0x1f;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwl_pcie_txq_build_tfd(struct iwl_trans *trans, struct iwl_txq *txq,</div><div class='ctx'> 				  dma_addr_t addr, u16 len, bool reset)</div><div class='ctx'> {</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	void *tfd;</div><div class='ctx'> 	u32 num_tbs;</div><div class='ctx'> </div><div class='del'>-	tfd = txq-&gt;tfds + trans-&gt;txqs.tfd.size * txq-&gt;write_ptr;</div><div class='add'>+	tfd = (u8 *)txq-&gt;tfds + trans_pcie-&gt;txqs.tfd.size * txq-&gt;write_ptr;</div><div class='ctx'> </div><div class='ctx'> 	if (reset)</div><div class='del'>-		memset(tfd, 0, trans-&gt;txqs.tfd.size);</div><div class='add'>+		memset(tfd, 0, trans_pcie-&gt;txqs.tfd.size);</div><div class='ctx'> </div><div class='del'>-	num_tbs = iwl_txq_gen1_tfd_get_num_tbs(trans, tfd);</div><div class='add'>+	num_tbs = iwl_txq_gen1_tfd_get_num_tbs(tfd);</div><div class='ctx'> </div><div class='ctx'> 	/* Each TFD can point to a maximum max_tbs Tx buffers */</div><div class='del'>-	if (num_tbs &gt;= trans-&gt;txqs.tfd.max_tbs) {</div><div class='add'>+	if (num_tbs &gt;= trans_pcie-&gt;txqs.tfd.max_tbs) {</div><div class='ctx'> 		IWL_ERR(trans, "Error can not send more than %d chunks\n",</div><div class='del'>-			trans-&gt;txqs.tfd.max_tbs);</div><div class='add'>+			trans_pcie-&gt;txqs.tfd.max_tbs);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -172,7 +185,7 @@ static int iwl_pcie_txq_build_tfd(struct iwl_trans *trans, struct iwl_txq *txq,</div><div class='ctx'> 		 "Unaligned address = %llx\n", (unsigned long long)addr))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	iwl_pcie_tfd_set_tb(trans, tfd, num_tbs, addr, len);</div><div class='add'>+	iwl_pcie_gen1_tfd_set_tb(tfd, num_tbs, addr, len);</div><div class='ctx'> </div><div class='ctx'> 	return num_tbs;</div><div class='ctx'> }</div><div class='hunk'>@@ -181,7 +194,7 @@ static void iwl_pcie_clear_cmd_in_flight(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> </div><div class='del'>-	if (!trans-&gt;trans_cfg-&gt;base_params-&gt;apmg_wake_up_wa)</div><div class='add'>+	if (!trans-&gt;mac_cfg-&gt;base-&gt;apmg_wake_up_wa)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;trans_pcie-&gt;reg_lock);</div><div class='hunk'>@@ -192,41 +205,212 @@ static void iwl_pcie_clear_cmd_in_flight(struct iwl_trans *trans)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	trans_pcie-&gt;cmd_hold_nic_awake = false;</div><div class='del'>-	__iwl_trans_pcie_clear_bit(trans, CSR_GP_CNTRL,</div><div class='del'>-				   CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='add'>+	iwl_trans_clear_bit(trans, CSR_GP_CNTRL,</div><div class='add'>+			    CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='ctx'> 	spin_unlock(&amp;trans_pcie-&gt;reg_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void iwl_pcie_free_and_unmap_tso_page(struct iwl_trans *trans,</div><div class='add'>+					     struct page *page)</div><div class='add'>+{</div><div class='add'>+	struct iwl_tso_page_info *info = IWL_TSO_PAGE_INFO(page_address(page));</div><div class='add'>+</div><div class='add'>+	/* Decrease internal use count and unmap/free page if needed */</div><div class='add'>+	if (refcount_dec_and_test(&amp;info-&gt;use_count)) {</div><div class='add'>+		dma_unmap_page(trans-&gt;dev, info-&gt;dma_addr, PAGE_SIZE,</div><div class='add'>+			       DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+		__free_page(page);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_pcie_free_tso_pages(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='add'>+			     struct iwl_cmd_meta *cmd_meta)</div><div class='add'>+{</div><div class='add'>+	struct page **page_ptr;</div><div class='add'>+	struct page *next;</div><div class='add'>+</div><div class='add'>+	page_ptr = (void *)((u8 *)skb-&gt;cb + trans-&gt;conf.cb_data_offs);</div><div class='add'>+	next = *page_ptr;</div><div class='add'>+	*page_ptr = NULL;</div><div class='add'>+</div><div class='add'>+	while (next) {</div><div class='add'>+		struct iwl_tso_page_info *info;</div><div class='add'>+		struct page *tmp = next;</div><div class='add'>+</div><div class='add'>+		info = IWL_TSO_PAGE_INFO(page_address(next));</div><div class='add'>+		next = info-&gt;next;</div><div class='add'>+</div><div class='add'>+		/* Unmap the scatter gather list that is on the last page */</div><div class='add'>+		if (!next &amp;&amp; cmd_meta-&gt;sg_offset) {</div><div class='add'>+			struct sg_table *sgt;</div><div class='add'>+</div><div class='add'>+			sgt = (void *)((u8 *)page_address(tmp) +</div><div class='add'>+				       cmd_meta-&gt;sg_offset);</div><div class='add'>+</div><div class='add'>+			dma_unmap_sgtable(trans-&gt;dev, sgt, DMA_TO_DEVICE, 0);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		iwl_pcie_free_and_unmap_tso_page(trans, tmp);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline dma_addr_t</div><div class='add'>+iwl_txq_gen1_tfd_tb_get_addr(struct iwl_tfd *tfd, u8 idx)</div><div class='add'>+{</div><div class='add'>+	struct iwl_tfd_tb *tb = &amp;tfd-&gt;tbs[idx];</div><div class='add'>+	dma_addr_t addr;</div><div class='add'>+	dma_addr_t hi_len;</div><div class='add'>+</div><div class='add'>+	addr = get_unaligned_le32(&amp;tb-&gt;lo);</div><div class='add'>+</div><div class='add'>+	if (sizeof(dma_addr_t) &lt;= sizeof(u32))</div><div class='add'>+		return addr;</div><div class='add'>+</div><div class='add'>+	hi_len = le16_to_cpu(tb-&gt;hi_n_len) &amp; 0xF;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * shift by 16 twice to avoid warnings on 32-bit</div><div class='add'>+	 * (where this code never runs anyway due to the</div><div class='add'>+	 * if statement above)</div><div class='add'>+	 */</div><div class='add'>+	return addr | ((hi_len &lt;&lt; 16) &lt;&lt; 16);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_txq_set_tfd_invalid_gen1(struct iwl_trans *trans,</div><div class='add'>+					 struct iwl_tfd *tfd)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+</div><div class='add'>+	tfd-&gt;num_tbs = 0;</div><div class='add'>+</div><div class='add'>+	iwl_pcie_gen1_tfd_set_tb(tfd, 0, trans_pcie-&gt;invalid_tx_cmd.dma,</div><div class='add'>+				 trans_pcie-&gt;invalid_tx_cmd.size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_txq_gen1_tfd_unmap(struct iwl_trans *trans,</div><div class='add'>+				   struct iwl_cmd_meta *meta,</div><div class='add'>+				   struct iwl_txq *txq, int index)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	int i, num_tbs;</div><div class='add'>+	struct iwl_tfd *tfd = iwl_txq_get_tfd(trans, txq, index);</div><div class='add'>+</div><div class='add'>+	/* Sanity check on number of chunks */</div><div class='add'>+	num_tbs = iwl_txq_gen1_tfd_get_num_tbs(tfd);</div><div class='add'>+</div><div class='add'>+	if (num_tbs &gt; trans_pcie-&gt;txqs.tfd.max_tbs) {</div><div class='add'>+		IWL_ERR(trans, "Too many chunks: %i\n", num_tbs);</div><div class='add'>+		/* @todo issue fatal error, it is quite serious situation */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TB1 is mapped directly, the rest is the TSO page and SG list. */</div><div class='add'>+	if (meta-&gt;sg_offset)</div><div class='add'>+		num_tbs = 2;</div><div class='add'>+</div><div class='add'>+	/* first TB is never freed - it's the bidirectional DMA data */</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; num_tbs; i++) {</div><div class='add'>+		if (meta-&gt;tbs &amp; BIT(i))</div><div class='add'>+			dma_unmap_page(trans-&gt;dev,</div><div class='add'>+				       iwl_txq_gen1_tfd_tb_get_addr(tfd, i),</div><div class='add'>+				       iwl_txq_gen1_tfd_tb_get_len(trans,</div><div class='add'>+								   tfd, i),</div><div class='add'>+				       DMA_TO_DEVICE);</div><div class='add'>+		else</div><div class='add'>+			dma_unmap_single(trans-&gt;dev,</div><div class='add'>+					 iwl_txq_gen1_tfd_tb_get_addr(tfd, i),</div><div class='add'>+					 iwl_txq_gen1_tfd_tb_get_len(trans,</div><div class='add'>+								     tfd, i),</div><div class='add'>+					 DMA_TO_DEVICE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	meta-&gt;tbs = 0;</div><div class='add'>+</div><div class='add'>+	iwl_txq_set_tfd_invalid_gen1(trans, tfd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_txq_free_tfd - Free all chunks referenced by TFD [txq-&gt;q.read_ptr]</div><div class='add'>+ * @trans: transport private data</div><div class='add'>+ * @txq: tx queue</div><div class='add'>+ * @read_ptr: the TXQ read_ptr to free</div><div class='add'>+ *</div><div class='add'>+ * Does NOT advance any TFD circular buffer read/write indexes</div><div class='add'>+ * Does NOT free the TFD itself (which is within circular buffer)</div><div class='add'>+ */</div><div class='add'>+static void iwl_txq_free_tfd(struct iwl_trans *trans, struct iwl_txq *txq,</div><div class='add'>+			     int read_ptr)</div><div class='add'>+{</div><div class='add'>+	/* rd_ptr is bounded by TFD_QUEUE_SIZE_MAX and</div><div class='add'>+	 * idx is bounded by n_window</div><div class='add'>+	 */</div><div class='add'>+	int idx = iwl_txq_get_cmd_index(txq, read_ptr);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;txq-&gt;reclaim_lock);</div><div class='add'>+</div><div class='add'>+	if (!txq-&gt;entries)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* We have only q-&gt;n_window txq-&gt;entries, but we use</div><div class='add'>+	 * TFD_QUEUE_SIZE_MAX tfds</div><div class='add'>+	 */</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;gen2)</div><div class='add'>+		iwl_txq_gen2_tfd_unmap(trans, &amp;txq-&gt;entries[idx].meta,</div><div class='add'>+				       iwl_txq_get_tfd(trans, txq, read_ptr));</div><div class='add'>+	else</div><div class='add'>+		iwl_txq_gen1_tfd_unmap(trans, &amp;txq-&gt;entries[idx].meta,</div><div class='add'>+				       txq, read_ptr);</div><div class='add'>+</div><div class='add'>+	/* free SKB */</div><div class='add'>+	skb = txq-&gt;entries[idx].skb;</div><div class='add'>+</div><div class='add'>+	/* Can be called from irqs-disabled context</div><div class='add'>+	 * If skb is not NULL, it means that the whole queue is being</div><div class='add'>+	 * freed and that the queue is not empty - free the skb</div><div class='add'>+	 */</div><div class='add'>+	if (skb) {</div><div class='add'>+		iwl_op_mode_free_skb(trans-&gt;op_mode, skb);</div><div class='add'>+		txq-&gt;entries[idx].skb = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * iwl_pcie_txq_unmap -  Unmap any remaining DMA mappings and free skb's</div><div class='ctx'>  */</div><div class='ctx'> static void iwl_pcie_txq_unmap(struct iwl_trans *trans, int txq_id)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_txq *txq = trans-&gt;txqs.txq[txq_id];</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_txq *txq = trans_pcie-&gt;txqs.txq[txq_id];</div><div class='ctx'> </div><div class='ctx'> 	if (!txq) {</div><div class='ctx'> 		IWL_ERR(trans, "Trying to free a queue that wasn't allocated?\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;txq-&gt;lock);</div><div class='add'>+	spin_lock_bh(&amp;txq-&gt;reclaim_lock);</div><div class='add'>+	spin_lock(&amp;txq-&gt;lock);</div><div class='ctx'> 	while (txq-&gt;write_ptr != txq-&gt;read_ptr) {</div><div class='ctx'> 		IWL_DEBUG_TX_REPLY(trans, "Q %d Free %d\n",</div><div class='ctx'> 				   txq_id, txq-&gt;read_ptr);</div><div class='ctx'> </div><div class='del'>-		if (txq_id != trans-&gt;txqs.cmd.q_id) {</div><div class='add'>+		if (txq_id != trans-&gt;conf.cmd_queue) {</div><div class='ctx'> 			struct sk_buff *skb = txq-&gt;entries[txq-&gt;read_ptr].skb;</div><div class='add'>+			struct iwl_cmd_meta *cmd_meta =</div><div class='add'>+				&amp;txq-&gt;entries[txq-&gt;read_ptr].meta;</div><div class='ctx'> </div><div class='ctx'> 			if (WARN_ON_ONCE(!skb))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			iwl_txq_free_tso_page(trans, skb);</div><div class='add'>+			iwl_pcie_free_tso_pages(trans, skb, cmd_meta);</div><div class='ctx'> 		}</div><div class='del'>-		iwl_txq_free_tfd(trans, txq);</div><div class='add'>+		iwl_txq_free_tfd(trans, txq, txq-&gt;read_ptr);</div><div class='ctx'> 		txq-&gt;read_ptr = iwl_txq_inc_wrap(trans, txq-&gt;read_ptr);</div><div class='ctx'> </div><div class='ctx'> 		if (txq-&gt;read_ptr == txq-&gt;write_ptr &amp;&amp;</div><div class='del'>-		    txq_id == trans-&gt;txqs.cmd.q_id)</div><div class='add'>+		    txq_id == trans-&gt;conf.cmd_queue)</div><div class='ctx'> 			iwl_pcie_clear_cmd_in_flight(trans);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -236,10 +420,11 @@ static void iwl_pcie_txq_unmap(struct iwl_trans *trans, int txq_id)</div><div class='ctx'> 		iwl_op_mode_free_skb(trans-&gt;op_mode, skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;txq-&gt;lock);</div><div class='add'>+	spin_unlock(&amp;txq-&gt;lock);</div><div class='add'>+	spin_unlock_bh(&amp;txq-&gt;reclaim_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* just in case - this queue may have been stopped */</div><div class='del'>-	iwl_wake_queue(trans, txq);</div><div class='add'>+	iwl_trans_pcie_wake_queue(trans, txq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -252,7 +437,8 @@ static void iwl_pcie_txq_unmap(struct iwl_trans *trans, int txq_id)</div><div class='ctx'>  */</div><div class='ctx'> static void iwl_pcie_txq_free(struct iwl_trans *trans, int txq_id)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_txq *txq = trans-&gt;txqs.txq[txq_id];</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_txq *txq = trans_pcie-&gt;txqs.txq[txq_id];</div><div class='ctx'> 	struct device *dev = trans-&gt;dev;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -262,7 +448,7 @@ static void iwl_pcie_txq_free(struct iwl_trans *trans, int txq_id)</div><div class='ctx'> 	iwl_pcie_txq_unmap(trans, txq_id);</div><div class='ctx'> </div><div class='ctx'> 	/* De-alloc array of command/tx buffers */</div><div class='del'>-	if (txq_id == trans-&gt;txqs.cmd.q_id)</div><div class='add'>+	if (txq_id == trans-&gt;conf.cmd_queue)</div><div class='ctx'> 		for (i = 0; i &lt; txq-&gt;n_window; i++) {</div><div class='ctx'> 			kfree_sensitive(txq-&gt;entries[i].cmd);</div><div class='ctx'> 			kfree_sensitive(txq-&gt;entries[i].free_buf);</div><div class='hunk'>@@ -271,8 +457,8 @@ static void iwl_pcie_txq_free(struct iwl_trans *trans, int txq_id)</div><div class='ctx'> 	/* De-alloc circular buffer of TFDs */</div><div class='ctx'> 	if (txq-&gt;tfds) {</div><div class='ctx'> 		dma_free_coherent(dev,</div><div class='del'>-				  trans-&gt;txqs.tfd.size *</div><div class='del'>-				  trans-&gt;trans_cfg-&gt;base_params-&gt;max_tfd_queue_size,</div><div class='add'>+				  trans_pcie-&gt;txqs.tfd.size *</div><div class='add'>+				  trans-&gt;mac_cfg-&gt;base-&gt;max_tfd_queue_size,</div><div class='ctx'> 				  txq-&gt;tfds, txq-&gt;dma_addr);</div><div class='ctx'> 		txq-&gt;dma_addr = 0;</div><div class='ctx'> 		txq-&gt;tfds = NULL;</div><div class='hunk'>@@ -285,49 +471,47 @@ static void iwl_pcie_txq_free(struct iwl_trans *trans, int txq_id)</div><div class='ctx'> 	kfree(txq-&gt;entries);</div><div class='ctx'> 	txq-&gt;entries = NULL;</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;txq-&gt;stuck_timer);</div><div class='add'>+	timer_delete_sync(&amp;txq-&gt;stuck_timer);</div><div class='ctx'> </div><div class='ctx'> 	/* 0-fill queue descriptor structure */</div><div class='ctx'> 	memset(txq, 0, sizeof(*txq));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_pcie_tx_start(struct iwl_trans *trans, u32 scd_base_addr)</div><div class='add'>+void iwl_pcie_tx_start(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-	int nq = trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues;</div><div class='add'>+	int nq = trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues;</div><div class='ctx'> 	int chan;</div><div class='ctx'> 	u32 reg_val;</div><div class='ctx'> 	int clear_dwords = (SCD_TRANS_TBL_OFFSET_QUEUE(nq) -</div><div class='ctx'> 				SCD_CONTEXT_MEM_LOWER_BOUND) / sizeof(u32);</div><div class='ctx'> </div><div class='ctx'> 	/* make sure all queue are not stopped/used */</div><div class='del'>-	memset(trans-&gt;txqs.queue_stopped, 0,</div><div class='del'>-	       sizeof(trans-&gt;txqs.queue_stopped));</div><div class='del'>-	memset(trans-&gt;txqs.queue_used, 0, sizeof(trans-&gt;txqs.queue_used));</div><div class='add'>+	memset(trans_pcie-&gt;txqs.queue_stopped, 0,</div><div class='add'>+	       sizeof(trans_pcie-&gt;txqs.queue_stopped));</div><div class='add'>+	memset(trans_pcie-&gt;txqs.queue_used, 0,</div><div class='add'>+	       sizeof(trans_pcie-&gt;txqs.queue_used));</div><div class='ctx'> </div><div class='ctx'> 	trans_pcie-&gt;scd_base_addr =</div><div class='ctx'> 		iwl_read_prph(trans, SCD_SRAM_BASE_ADDR);</div><div class='ctx'> </div><div class='del'>-	WARN_ON(scd_base_addr != 0 &amp;&amp;</div><div class='del'>-		scd_base_addr != trans_pcie-&gt;scd_base_addr);</div><div class='del'>-</div><div class='ctx'> 	/* reset context data, TX status and translation data */</div><div class='ctx'> 	iwl_trans_write_mem(trans, trans_pcie-&gt;scd_base_addr +</div><div class='ctx'> 				   SCD_CONTEXT_MEM_LOWER_BOUND,</div><div class='ctx'> 			    NULL, clear_dwords);</div><div class='ctx'> </div><div class='ctx'> 	iwl_write_prph(trans, SCD_DRAM_BASE_ADDR,</div><div class='del'>-		       trans-&gt;txqs.scd_bc_tbls.dma &gt;&gt; 10);</div><div class='add'>+		       trans_pcie-&gt;txqs.scd_bc_tbls.dma &gt;&gt; 10);</div><div class='ctx'> </div><div class='ctx'> 	/* The chain extension of the SCD doesn't work well. This feature is</div><div class='ctx'> 	 * enabled by default by the HW, so we need to disable it manually.</div><div class='ctx'> 	 */</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;base_params-&gt;scd_chain_ext_wa)</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;base-&gt;scd_chain_ext_wa)</div><div class='ctx'> 		iwl_write_prph(trans, SCD_CHAINEXT_EN, 0);</div><div class='ctx'> </div><div class='del'>-	iwl_trans_ac_txq_enable(trans, trans-&gt;txqs.cmd.q_id,</div><div class='del'>-				trans-&gt;txqs.cmd.fifo,</div><div class='del'>-				trans-&gt;txqs.cmd.wdg_timeout);</div><div class='add'>+	iwl_trans_ac_txq_enable(trans, trans-&gt;conf.cmd_queue,</div><div class='add'>+				trans-&gt;conf.cmd_fifo,</div><div class='add'>+				IWL_DEF_WD_TIMEOUT);</div><div class='ctx'> </div><div class='ctx'> 	/* Activate all Tx DMA/FIFO channels */</div><div class='ctx'> 	iwl_scd_activate_fifos(trans);</div><div class='hunk'>@@ -344,7 +528,7 @@ void iwl_pcie_tx_start(struct iwl_trans *trans, u32 scd_base_addr)</div><div class='ctx'> 			   reg_val | FH_TX_CHICKEN_BITS_SCD_AUTO_RETRY_EN);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable L1-Active */</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_8000)</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_8000)</div><div class='ctx'> 		iwl_clear_bits_prph(trans, APMG_PCIDEV_STT_REG,</div><div class='ctx'> 				    APMG_PCIDEV_STT_VAL_L1_ACT_DIS);</div><div class='ctx'> }</div><div class='hunk'>@@ -358,13 +542,13 @@ void iwl_trans_pcie_tx_reset(struct iwl_trans *trans)</div><div class='ctx'> 	 * we should never get here in gen2 trans mode return early to avoid</div><div class='ctx'> 	 * having invalid accesses</div><div class='ctx'> 	 */</div><div class='del'>-	if (WARN_ON_ONCE(trans-&gt;trans_cfg-&gt;gen2))</div><div class='add'>+	if (WARN_ON_ONCE(trans-&gt;mac_cfg-&gt;gen2))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (txq_id = 0; txq_id &lt; trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues;</div><div class='add'>+	for (txq_id = 0; txq_id &lt; trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues;</div><div class='ctx'> 	     txq_id++) {</div><div class='del'>-		struct iwl_txq *txq = trans-&gt;txqs.txq[txq_id];</div><div class='del'>-		if (trans-&gt;trans_cfg-&gt;use_tfh)</div><div class='add'>+		struct iwl_txq *txq = trans_pcie-&gt;txqs.txq[txq_id];</div><div class='add'>+		if (trans-&gt;mac_cfg-&gt;gen2)</div><div class='ctx'> 			iwl_write_direct64(trans,</div><div class='ctx'> 					   FH_MEM_CBBC_QUEUE(trans, txq_id),</div><div class='ctx'> 					   txq-&gt;dma_addr);</div><div class='hunk'>@@ -386,7 +570,7 @@ void iwl_trans_pcie_tx_reset(struct iwl_trans *trans)</div><div class='ctx'> 	 * while we were in WoWLAN in which case SCD_SRAM_BASE_ADDR will</div><div class='ctx'> 	 * contain garbage.</div><div class='ctx'> 	 */</div><div class='del'>-	iwl_pcie_tx_start(trans, 0);</div><div class='add'>+	iwl_pcie_tx_start(trans);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_pcie_tx_stop_fh(struct iwl_trans *trans)</div><div class='hunk'>@@ -407,8 +591,8 @@ static void iwl_pcie_tx_stop_fh(struct iwl_trans *trans)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for DMA channels to be idle */</div><div class='del'>-	ret = iwl_poll_bit(trans, FH_TSSR_TX_STATUS_REG, mask, mask, 5000);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	ret = iwl_poll_bits(trans, FH_TSSR_TX_STATUS_REG, mask, 5000);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		IWL_ERR(trans,</div><div class='ctx'> 			"Failing on timeout while stopping DMA channel %d [0x%08x]\n",</div><div class='ctx'> 			ch, iwl_read32(trans, FH_TSSR_TX_STATUS_REG));</div><div class='hunk'>@@ -438,16 +622,17 @@ int iwl_pcie_tx_stop(struct iwl_trans *trans)</div><div class='ctx'> 	 * queues. This happens when we have an rfkill interrupt.</div><div class='ctx'> 	 * Since we stop Tx altogether - mark the queues as stopped.</div><div class='ctx'> 	 */</div><div class='del'>-	memset(trans-&gt;txqs.queue_stopped, 0,</div><div class='del'>-	       sizeof(trans-&gt;txqs.queue_stopped));</div><div class='del'>-	memset(trans-&gt;txqs.queue_used, 0, sizeof(trans-&gt;txqs.queue_used));</div><div class='add'>+	memset(trans_pcie-&gt;txqs.queue_stopped, 0,</div><div class='add'>+	       sizeof(trans_pcie-&gt;txqs.queue_stopped));</div><div class='add'>+	memset(trans_pcie-&gt;txqs.queue_used, 0,</div><div class='add'>+	       sizeof(trans_pcie-&gt;txqs.queue_used));</div><div class='ctx'> </div><div class='ctx'> 	/* This can happen: start_hw, stop_device */</div><div class='ctx'> 	if (!trans_pcie-&gt;txq_memory)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Unmap DMA from host system and free skb's */</div><div class='del'>-	for (txq_id = 0; txq_id &lt; trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues;</div><div class='add'>+	for (txq_id = 0; txq_id &lt; trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues;</div><div class='ctx'> 	     txq_id++)</div><div class='ctx'> 		iwl_pcie_txq_unmap(trans, txq_id);</div><div class='ctx'> </div><div class='hunk'>@@ -464,15 +649,16 @@ void iwl_pcie_tx_free(struct iwl_trans *trans)</div><div class='ctx'> 	int txq_id;</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> </div><div class='del'>-	memset(trans-&gt;txqs.queue_used, 0, sizeof(trans-&gt;txqs.queue_used));</div><div class='add'>+	memset(trans_pcie-&gt;txqs.queue_used, 0,</div><div class='add'>+	       sizeof(trans_pcie-&gt;txqs.queue_used));</div><div class='ctx'> </div><div class='ctx'> 	/* Tx queues */</div><div class='ctx'> 	if (trans_pcie-&gt;txq_memory) {</div><div class='ctx'> 		for (txq_id = 0;</div><div class='del'>-		     txq_id &lt; trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues;</div><div class='add'>+		     txq_id &lt; trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues;</div><div class='ctx'> 		     txq_id++) {</div><div class='ctx'> 			iwl_pcie_txq_free(trans, txq_id);</div><div class='del'>-			trans-&gt;txqs.txq[txq_id] = NULL;</div><div class='add'>+			trans_pcie-&gt;txqs.txq[txq_id] = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -481,9 +667,139 @@ void iwl_pcie_tx_free(struct iwl_trans *trans)</div><div class='ctx'> </div><div class='ctx'> 	iwl_pcie_free_dma_ptr(trans, &amp;trans_pcie-&gt;kw);</div><div class='ctx'> </div><div class='del'>-	iwl_pcie_free_dma_ptr(trans, &amp;trans-&gt;txqs.scd_bc_tbls);</div><div class='add'>+	iwl_pcie_free_dma_ptr(trans, &amp;trans_pcie-&gt;txqs.scd_bc_tbls);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_txq_log_scd_error(struct iwl_trans *trans, struct iwl_txq *txq)</div><div class='add'>+{</div><div class='add'>+	u32 txq_id = txq-&gt;id;</div><div class='add'>+	u32 status;</div><div class='add'>+	bool active;</div><div class='add'>+	u8 fifo;</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;gen2) {</div><div class='add'>+		IWL_ERR(trans, "Queue %d is stuck %d %d\n", txq_id,</div><div class='add'>+			txq-&gt;read_ptr, txq-&gt;write_ptr);</div><div class='add'>+		/* TODO: access new SCD registers and dump them */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = iwl_read_prph(trans, SCD_QUEUE_STATUS_BITS(txq_id));</div><div class='add'>+	fifo = (status &gt;&gt; SCD_QUEUE_STTS_REG_POS_TXF) &amp; 0x7;</div><div class='add'>+	active = !!(status &amp; BIT(SCD_QUEUE_STTS_REG_POS_ACTIVE));</div><div class='add'>+</div><div class='add'>+	IWL_ERR(trans,</div><div class='add'>+		"Queue %d is %sactive on fifo %d and stuck for %u ms. SW [%d, %d] HW [%d, %d] FH TRB=0x0%x\n",</div><div class='add'>+		txq_id, active ? "" : "in", fifo,</div><div class='add'>+		jiffies_to_msecs(txq-&gt;wd_timeout),</div><div class='add'>+		txq-&gt;read_ptr, txq-&gt;write_ptr,</div><div class='add'>+		iwl_read_prph(trans, SCD_QUEUE_RDPTR(txq_id)) &amp;</div><div class='add'>+			(trans-&gt;mac_cfg-&gt;base-&gt;max_tfd_queue_size - 1),</div><div class='add'>+			iwl_read_prph(trans, SCD_QUEUE_WRPTR(txq_id)) &amp;</div><div class='add'>+			(trans-&gt;mac_cfg-&gt;base-&gt;max_tfd_queue_size - 1),</div><div class='add'>+			iwl_read_direct32(trans, FH_TX_TRB_REG(fifo)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_txq_stuck_timer(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct iwl_txq *txq = timer_container_of(txq, t, stuck_timer);</div><div class='add'>+	struct iwl_trans *trans = txq-&gt;trans;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;txq-&gt;lock);</div><div class='add'>+	/* check if triggered erroneously */</div><div class='add'>+	if (txq-&gt;read_ptr == txq-&gt;write_ptr) {</div><div class='add'>+		spin_unlock(&amp;txq-&gt;lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;txq-&gt;lock);</div><div class='add'>+</div><div class='add'>+	iwl_txq_log_scd_error(trans, txq);</div><div class='add'>+</div><div class='add'>+	iwl_force_nmi(trans);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int iwl_pcie_txq_alloc(struct iwl_trans *trans, struct iwl_txq *txq,</div><div class='add'>+		       int slots_num, bool cmd_queue)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	size_t num_entries = trans-&gt;mac_cfg-&gt;gen2 ?</div><div class='add'>+		slots_num : trans-&gt;mac_cfg-&gt;base-&gt;max_tfd_queue_size;</div><div class='add'>+	size_t tfd_sz;</div><div class='add'>+	size_t tb0_buf_sz;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(slots_num &lt;= 0, "Invalid slots num:%d\n", slots_num))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(txq-&gt;entries || txq-&gt;tfds))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	tfd_sz = trans_pcie-&gt;txqs.tfd.size * num_entries;</div><div class='add'>+</div><div class='add'>+	timer_setup(&amp;txq-&gt;stuck_timer, iwl_txq_stuck_timer, 0);</div><div class='add'>+	txq-&gt;trans = trans;</div><div class='add'>+</div><div class='add'>+	txq-&gt;n_window = slots_num;</div><div class='add'>+</div><div class='add'>+	txq-&gt;entries = kcalloc(slots_num,</div><div class='add'>+			       sizeof(struct iwl_pcie_txq_entry),</div><div class='add'>+			       GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!txq-&gt;entries)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (cmd_queue)</div><div class='add'>+		for (i = 0; i &lt; slots_num; i++) {</div><div class='add'>+			txq-&gt;entries[i].cmd =</div><div class='add'>+				kmalloc(sizeof(struct iwl_device_cmd),</div><div class='add'>+					GFP_KERNEL);</div><div class='add'>+			if (!txq-&gt;entries[i].cmd)</div><div class='add'>+				goto error;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	/* Circular buffer of transmit frame descriptors (TFDs),</div><div class='add'>+	 * shared with device</div><div class='add'>+	 */</div><div class='add'>+	txq-&gt;tfds = dma_alloc_coherent(trans-&gt;dev, tfd_sz,</div><div class='add'>+				       &amp;txq-&gt;dma_addr, GFP_KERNEL);</div><div class='add'>+	if (!txq-&gt;tfds)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(*txq-&gt;first_tb_bufs) != IWL_FIRST_TB_SIZE_ALIGN);</div><div class='add'>+</div><div class='add'>+	tb0_buf_sz = sizeof(*txq-&gt;first_tb_bufs) * slots_num;</div><div class='add'>+</div><div class='add'>+	txq-&gt;first_tb_bufs = dma_alloc_coherent(trans-&gt;dev, tb0_buf_sz,</div><div class='add'>+						&amp;txq-&gt;first_tb_dma,</div><div class='add'>+						GFP_KERNEL);</div><div class='add'>+	if (!txq-&gt;first_tb_bufs)</div><div class='add'>+		goto err_free_tfds;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_entries; i++) {</div><div class='add'>+		void *tfd = iwl_txq_get_tfd(trans, txq, i);</div><div class='add'>+</div><div class='add'>+		if (trans-&gt;mac_cfg-&gt;gen2)</div><div class='add'>+			iwl_txq_set_tfd_invalid_gen2(trans, tfd);</div><div class='add'>+		else</div><div class='add'>+			iwl_txq_set_tfd_invalid_gen1(trans, tfd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_free_tfds:</div><div class='add'>+	dma_free_coherent(trans-&gt;dev, tfd_sz, txq-&gt;tfds, txq-&gt;dma_addr);</div><div class='add'>+	txq-&gt;tfds = NULL;</div><div class='add'>+error:</div><div class='add'>+	if (txq-&gt;entries &amp;&amp; cmd_queue)</div><div class='add'>+		for (i = 0; i &lt; slots_num; i++)</div><div class='add'>+			kfree(txq-&gt;entries[i].cmd);</div><div class='add'>+	kfree(txq-&gt;entries);</div><div class='add'>+	txq-&gt;entries = NULL;</div><div class='add'>+</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define BC_TABLE_SIZE	(sizeof(struct iwl_bc_tbl_entry) * TFD_QUEUE_BC_SIZE)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * iwl_pcie_tx_alloc - allocate TX context</div><div class='ctx'>  * Allocate all Tx DMA structures and initialize them</div><div class='hunk'>@@ -493,12 +809,12 @@ static int iwl_pcie_tx_alloc(struct iwl_trans *trans)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int txq_id, slots_num;</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-	u16 bc_tbls_size = trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues;</div><div class='add'>+	u16 bc_tbls_size = trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210))</div><div class='add'>+	if (WARN_ON(trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	bc_tbls_size *= sizeof(struct iwlagn_scd_bc_tbl);</div><div class='add'>+	bc_tbls_size *= BC_TABLE_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	/*It is not allowed to alloc twice, so warn when this happens.</div><div class='ctx'> 	 * We cannot rely on the previous allocation, so free and fail */</div><div class='hunk'>@@ -507,7 +823,7 @@ static int iwl_pcie_tx_alloc(struct iwl_trans *trans)</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = iwl_pcie_alloc_dma_ptr(trans, &amp;trans-&gt;txqs.scd_bc_tbls,</div><div class='add'>+	ret = iwl_pcie_alloc_dma_ptr(trans, &amp;trans_pcie-&gt;txqs.scd_bc_tbls,</div><div class='ctx'> 				     bc_tbls_size);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		IWL_ERR(trans, "Scheduler BC Table allocation failed\n");</div><div class='hunk'>@@ -522,7 +838,7 @@ static int iwl_pcie_tx_alloc(struct iwl_trans *trans)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	trans_pcie-&gt;txq_memory =</div><div class='del'>-		kcalloc(trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues,</div><div class='add'>+		kcalloc(trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues,</div><div class='ctx'> 			sizeof(struct iwl_txq), GFP_KERNEL);</div><div class='ctx'> 	if (!trans_pcie-&gt;txq_memory) {</div><div class='ctx'> 		IWL_ERR(trans, "Not enough memory for txq\n");</div><div class='hunk'>@@ -531,24 +847,24 @@ static int iwl_pcie_tx_alloc(struct iwl_trans *trans)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Alloc and init all Tx queues, including the command queue (#4/#9) */</div><div class='del'>-	for (txq_id = 0; txq_id &lt; trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues;</div><div class='add'>+	for (txq_id = 0; txq_id &lt; trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues;</div><div class='ctx'> 	     txq_id++) {</div><div class='del'>-		bool cmd_queue = (txq_id == trans-&gt;txqs.cmd.q_id);</div><div class='add'>+		bool cmd_queue = (txq_id == trans-&gt;conf.cmd_queue);</div><div class='ctx'> </div><div class='ctx'> 		if (cmd_queue)</div><div class='ctx'> 			slots_num = max_t(u32, IWL_CMD_QUEUE_SIZE,</div><div class='del'>-					  trans-&gt;cfg-&gt;min_txq_size);</div><div class='add'>+					  trans-&gt;mac_cfg-&gt;base-&gt;min_txq_size);</div><div class='ctx'> 		else</div><div class='ctx'> 			slots_num = max_t(u32, IWL_DEFAULT_QUEUE_SIZE,</div><div class='del'>-					  trans-&gt;cfg-&gt;min_256_ba_txq_size);</div><div class='del'>-		trans-&gt;txqs.txq[txq_id] = &amp;trans_pcie-&gt;txq_memory[txq_id];</div><div class='del'>-		ret = iwl_txq_alloc(trans, trans-&gt;txqs.txq[txq_id], slots_num,</div><div class='del'>-				    cmd_queue);</div><div class='add'>+					  trans-&gt;mac_cfg-&gt;base-&gt;min_ba_txq_size);</div><div class='add'>+		trans_pcie-&gt;txqs.txq[txq_id] = &amp;trans_pcie-&gt;txq_memory[txq_id];</div><div class='add'>+		ret = iwl_pcie_txq_alloc(trans, trans_pcie-&gt;txqs.txq[txq_id],</div><div class='add'>+					 slots_num, cmd_queue);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			IWL_ERR(trans, "Tx %d queue alloc failed\n", txq_id);</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		}</div><div class='del'>-		trans-&gt;txqs.txq[txq_id]-&gt;id = txq_id;</div><div class='add'>+		trans_pcie-&gt;txqs.txq[txq_id]-&gt;id = txq_id;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -559,6 +875,69 @@ error:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * iwl_queue_init - Initialize queue's high/low-water and read/write indexes</div><div class='add'>+ */</div><div class='add'>+static int iwl_queue_init(struct iwl_txq *q, int slots_num)</div><div class='add'>+{</div><div class='add'>+	q-&gt;n_window = slots_num;</div><div class='add'>+</div><div class='add'>+	/* slots_num must be power-of-two size, otherwise</div><div class='add'>+	 * iwl_txq_get_cmd_index is broken.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON(!is_power_of_2(slots_num)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	q-&gt;low_mark = q-&gt;n_window / 4;</div><div class='add'>+	if (q-&gt;low_mark &lt; 4)</div><div class='add'>+		q-&gt;low_mark = 4;</div><div class='add'>+</div><div class='add'>+	q-&gt;high_mark = q-&gt;n_window / 8;</div><div class='add'>+	if (q-&gt;high_mark &lt; 2)</div><div class='add'>+		q-&gt;high_mark = 2;</div><div class='add'>+</div><div class='add'>+	q-&gt;write_ptr = 0;</div><div class='add'>+	q-&gt;read_ptr = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_txq_init(struct iwl_trans *trans, struct iwl_txq *txq,</div><div class='add'>+		 int slots_num, bool cmd_queue)</div><div class='add'>+{</div><div class='add'>+	u32 tfd_queue_max_size =</div><div class='add'>+		trans-&gt;mac_cfg-&gt;base-&gt;max_tfd_queue_size;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	txq-&gt;need_update = false;</div><div class='add'>+</div><div class='add'>+	/* max_tfd_queue_size must be power-of-two size, otherwise</div><div class='add'>+	 * iwl_txq_inc_wrap and iwl_txq_dec_wrap are broken.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ONCE(tfd_queue_max_size &amp; (tfd_queue_max_size - 1),</div><div class='add'>+		      "Max tfd queue size must be a power of two, but is %d",</div><div class='add'>+		      tfd_queue_max_size))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Initialize queue's high/low-water marks, and head/tail indexes */</div><div class='add'>+	ret = iwl_queue_init(txq, slots_num);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;txq-&gt;lock);</div><div class='add'>+	spin_lock_init(&amp;txq-&gt;reclaim_lock);</div><div class='add'>+</div><div class='add'>+	if (cmd_queue) {</div><div class='add'>+		static struct lock_class_key iwl_txq_cmd_queue_lock_class;</div><div class='add'>+</div><div class='add'>+		lockdep_set_class(&amp;txq-&gt;lock, &amp;iwl_txq_cmd_queue_lock_class);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__skb_queue_head_init(&amp;txq-&gt;overflow_q);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int iwl_pcie_tx_init(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='hunk'>@@ -585,17 +964,17 @@ int iwl_pcie_tx_init(struct iwl_trans *trans)</div><div class='ctx'> 	spin_unlock_bh(&amp;trans_pcie-&gt;irq_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Alloc and init all Tx queues, including the command queue (#4/#9) */</div><div class='del'>-	for (txq_id = 0; txq_id &lt; trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues;</div><div class='add'>+	for (txq_id = 0; txq_id &lt; trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues;</div><div class='ctx'> 	     txq_id++) {</div><div class='del'>-		bool cmd_queue = (txq_id == trans-&gt;txqs.cmd.q_id);</div><div class='add'>+		bool cmd_queue = (txq_id == trans-&gt;conf.cmd_queue);</div><div class='ctx'> </div><div class='ctx'> 		if (cmd_queue)</div><div class='ctx'> 			slots_num = max_t(u32, IWL_CMD_QUEUE_SIZE,</div><div class='del'>-					  trans-&gt;cfg-&gt;min_txq_size);</div><div class='add'>+					  trans-&gt;mac_cfg-&gt;base-&gt;min_txq_size);</div><div class='ctx'> 		else</div><div class='ctx'> 			slots_num = max_t(u32, IWL_DEFAULT_QUEUE_SIZE,</div><div class='del'>-					  trans-&gt;cfg-&gt;min_256_ba_txq_size);</div><div class='del'>-		ret = iwl_txq_init(trans, trans-&gt;txqs.txq[txq_id], slots_num,</div><div class='add'>+					  trans-&gt;mac_cfg-&gt;base-&gt;min_ba_txq_size);</div><div class='add'>+		ret = iwl_txq_init(trans, trans_pcie-&gt;txqs.txq[txq_id], slots_num,</div><div class='ctx'> 				   cmd_queue);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			IWL_ERR(trans, "Tx %d queue init failed\n", txq_id);</div><div class='hunk'>@@ -609,11 +988,11 @@ int iwl_pcie_tx_init(struct iwl_trans *trans)</div><div class='ctx'> 		 * Circular buffer (TFD queue in DRAM) physical base address</div><div class='ctx'> 		 */</div><div class='ctx'> 		iwl_write_direct32(trans, FH_MEM_CBBC_QUEUE(trans, txq_id),</div><div class='del'>-				   trans-&gt;txqs.txq[txq_id]-&gt;dma_addr &gt;&gt; 8);</div><div class='add'>+				   trans_pcie-&gt;txqs.txq[txq_id]-&gt;dma_addr &gt;&gt; 8);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	iwl_set_bits_prph(trans, SCD_GP_CTRL, SCD_GP_CTRL_AUTO_ACTIVE_MODE);</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;base_params-&gt;num_of_queues &gt; 20)</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues &gt; 20)</div><div class='ctx'> 		iwl_set_bits_prph(trans, SCD_GP_CTRL,</div><div class='ctx'> 				  SCD_GP_CTRL_ENABLE_31_QUEUES);</div><div class='ctx'> </div><div class='hunk'>@@ -634,7 +1013,7 @@ static int iwl_pcie_set_cmd_in_flight(struct iwl_trans *trans,</div><div class='ctx'> 	if (test_bit(STATUS_TRANS_DEAD, &amp;trans-&gt;status))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (!trans-&gt;trans_cfg-&gt;base_params-&gt;apmg_wake_up_wa)</div><div class='add'>+	if (!trans-&gt;mac_cfg-&gt;base-&gt;apmg_wake_up_wa)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -643,7 +1022,7 @@ static int iwl_pcie_set_cmd_in_flight(struct iwl_trans *trans,</div><div class='ctx'> 	 * returned. This needs to be done only on NICs that have</div><div class='ctx'> 	 * apmg_wake_up_wa set (see above.)</div><div class='ctx'> 	 */</div><div class='del'>-	if (!_iwl_trans_pcie_grab_nic_access(trans))</div><div class='add'>+	if (!_iwl_trans_pcie_grab_nic_access(trans, false))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -657,6 +1036,42 @@ static int iwl_pcie_set_cmd_in_flight(struct iwl_trans *trans,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void iwl_txq_progress(struct iwl_txq *txq)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;txq-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!txq-&gt;wd_timeout)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * station is asleep and we send data - that must</div><div class='add'>+	 * be uAPSD or PS-Poll. Don't rearm the timer.</div><div class='add'>+	 */</div><div class='add'>+	if (txq-&gt;frozen)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * if empty delete timer, otherwise move timer forward</div><div class='add'>+	 * since we're making progress on this queue</div><div class='add'>+	 */</div><div class='add'>+	if (txq-&gt;read_ptr == txq-&gt;write_ptr)</div><div class='add'>+		timer_delete(&amp;txq-&gt;stuck_timer);</div><div class='add'>+	else</div><div class='add'>+		mod_timer(&amp;txq-&gt;stuck_timer, jiffies + txq-&gt;wd_timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool iwl_txq_used(const struct iwl_txq *q, int i,</div><div class='add'>+				int read_ptr, int write_ptr)</div><div class='add'>+{</div><div class='add'>+	int index = iwl_txq_get_cmd_index(q, i);</div><div class='add'>+	int r = iwl_txq_get_cmd_index(q, read_ptr);</div><div class='add'>+	int w = iwl_txq_get_cmd_index(q, write_ptr);</div><div class='add'>+</div><div class='add'>+	return w &gt;= r ?</div><div class='add'>+		(index &gt;= r &amp;&amp; index &lt; w) :</div><div class='add'>+		!(index &lt; r &amp;&amp; index &gt;= w);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * iwl_pcie_cmdq_reclaim - Reclaim TX command queue entries already Tx'd</div><div class='ctx'>  *</div><div class='hunk'>@@ -666,7 +1081,8 @@ static int iwl_pcie_set_cmd_in_flight(struct iwl_trans *trans,</div><div class='ctx'>  */</div><div class='ctx'> static void iwl_pcie_cmdq_reclaim(struct iwl_trans *trans, int txq_id, int idx)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_txq *txq = trans-&gt;txqs.txq[txq_id];</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_txq *txq = trans_pcie-&gt;txqs.txq[txq_id];</div><div class='ctx'> 	int nfreed = 0;</div><div class='ctx'> 	u16 r;</div><div class='ctx'> </div><div class='hunk'>@@ -675,12 +1091,12 @@ static void iwl_pcie_cmdq_reclaim(struct iwl_trans *trans, int txq_id, int idx)</div><div class='ctx'> 	idx = iwl_txq_get_cmd_index(txq, idx);</div><div class='ctx'> 	r = iwl_txq_get_cmd_index(txq, txq-&gt;read_ptr);</div><div class='ctx'> </div><div class='del'>-	if (idx &gt;= trans-&gt;trans_cfg-&gt;base_params-&gt;max_tfd_queue_size ||</div><div class='del'>-	    (!iwl_txq_used(txq, idx))) {</div><div class='del'>-		WARN_ONCE(test_bit(txq_id, trans-&gt;txqs.queue_used),</div><div class='add'>+	if (idx &gt;= trans-&gt;mac_cfg-&gt;base-&gt;max_tfd_queue_size ||</div><div class='add'>+	    (!iwl_txq_used(txq, idx, txq-&gt;read_ptr, txq-&gt;write_ptr))) {</div><div class='add'>+		WARN_ONCE(test_bit(txq_id, trans_pcie-&gt;txqs.queue_used),</div><div class='ctx'> 			  "%s: Read index for DMA queue txq id (%d), index %d is out of range [0-%d] %d %d.\n",</div><div class='ctx'> 			  __func__, txq_id, idx,</div><div class='del'>-			  trans-&gt;trans_cfg-&gt;base_params-&gt;max_tfd_queue_size,</div><div class='add'>+			  trans-&gt;mac_cfg-&gt;base-&gt;max_tfd_queue_size,</div><div class='ctx'> 			  txq-&gt;write_ptr, txq-&gt;read_ptr);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -736,11 +1152,11 @@ bool iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, u16 ssn,</div><div class='ctx'> 			       unsigned int wdg_timeout)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-	struct iwl_txq *txq = trans-&gt;txqs.txq[txq_id];</div><div class='add'>+	struct iwl_txq *txq = trans_pcie-&gt;txqs.txq[txq_id];</div><div class='ctx'> 	int fifo = -1;</div><div class='ctx'> 	bool scd_bug = false;</div><div class='ctx'> </div><div class='del'>-	if (test_and_set_bit(txq_id, trans-&gt;txqs.queue_used))</div><div class='add'>+	if (test_and_set_bit(txq_id, trans_pcie-&gt;txqs.queue_used))</div><div class='ctx'> 		WARN_ONCE(1, "queue %d already used - expect issues", txq_id);</div><div class='ctx'> </div><div class='ctx'> 	txq-&gt;wd_timeout = msecs_to_jiffies(wdg_timeout);</div><div class='hunk'>@@ -749,15 +1165,15 @@ bool iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, u16 ssn,</div><div class='ctx'> 		fifo = cfg-&gt;fifo;</div><div class='ctx'> </div><div class='ctx'> 		/* Disable the scheduler prior configuring the cmd queue */</div><div class='del'>-		if (txq_id == trans-&gt;txqs.cmd.q_id &amp;&amp;</div><div class='del'>-		    trans_pcie-&gt;scd_set_active)</div><div class='add'>+		if (txq_id == trans-&gt;conf.cmd_queue &amp;&amp;</div><div class='add'>+		    trans-&gt;conf.scd_set_active)</div><div class='ctx'> 			iwl_scd_enable_set_active(trans, 0);</div><div class='ctx'> </div><div class='ctx'> 		/* Stop this Tx queue before configuring it */</div><div class='ctx'> 		iwl_scd_txq_set_inactive(trans, txq_id);</div><div class='ctx'> </div><div class='ctx'> 		/* Set this queue as a chain-building queue unless it is CMD */</div><div class='del'>-		if (txq_id != trans-&gt;txqs.cmd.q_id)</div><div class='add'>+		if (txq_id != trans-&gt;conf.cmd_queue)</div><div class='ctx'> 			iwl_scd_txq_set_chain(trans, txq_id);</div><div class='ctx'> </div><div class='ctx'> 		if (cfg-&gt;aggregate) {</div><div class='hunk'>@@ -791,7 +1207,7 @@ bool iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, u16 ssn,</div><div class='ctx'> 		 * this sad hardware issue.</div><div class='ctx'> 		 * This bug has been fixed on devices 9000 and up.</div><div class='ctx'> 		 */</div><div class='del'>-		scd_bug = !trans-&gt;trans_cfg-&gt;mq_rx_supported &amp;&amp;</div><div class='add'>+		scd_bug = !trans-&gt;mac_cfg-&gt;mq_rx_supported &amp;&amp;</div><div class='ctx'> 			!((ssn - txq-&gt;write_ptr) &amp; 0x3f) &amp;&amp;</div><div class='ctx'> 			(ssn != txq-&gt;write_ptr);</div><div class='ctx'> 		if (scd_bug)</div><div class='hunk'>@@ -827,8 +1243,8 @@ bool iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, u16 ssn,</div><div class='ctx'> 			       SCD_QUEUE_STTS_REG_MSK);</div><div class='ctx'> </div><div class='ctx'> 		/* enable the scheduler for this queue (only) */</div><div class='del'>-		if (txq_id == trans-&gt;txqs.cmd.q_id &amp;&amp;</div><div class='del'>-		    trans_pcie-&gt;scd_set_active)</div><div class='add'>+		if (txq_id == trans-&gt;conf.cmd_queue &amp;&amp;</div><div class='add'>+		    trans-&gt;conf.scd_set_active)</div><div class='ctx'> 			iwl_scd_enable_set_active(trans, BIT(txq_id));</div><div class='ctx'> </div><div class='ctx'> 		IWL_DEBUG_TX_QUEUES(trans,</div><div class='hunk'>@@ -846,7 +1262,8 @@ bool iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, u16 ssn,</div><div class='ctx'> void iwl_trans_pcie_txq_set_shared_mode(struct iwl_trans *trans, u32 txq_id,</div><div class='ctx'> 					bool shared_mode)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_txq *txq = trans-&gt;txqs.txq[txq_id];</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_txq *txq = trans_pcie-&gt;txqs.txq[txq_id];</div><div class='ctx'> </div><div class='ctx'> 	txq-&gt;ampdu = !shared_mode;</div><div class='ctx'> }</div><div class='hunk'>@@ -859,8 +1276,8 @@ void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int txq_id,</div><div class='ctx'> 			SCD_TX_STTS_QUEUE_OFFSET(txq_id);</div><div class='ctx'> 	static const u32 zero_val[4] = {};</div><div class='ctx'> </div><div class='del'>-	trans-&gt;txqs.txq[txq_id]-&gt;frozen_expiry_remainder = 0;</div><div class='del'>-	trans-&gt;txqs.txq[txq_id]-&gt;frozen = false;</div><div class='add'>+	trans_pcie-&gt;txqs.txq[txq_id]-&gt;frozen_expiry_remainder = 0;</div><div class='add'>+	trans_pcie-&gt;txqs.txq[txq_id]-&gt;frozen = false;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Upon HW Rfkill - we stop the device, and then stop the queues</div><div class='hunk'>@@ -868,7 +1285,7 @@ void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int txq_id,</div><div class='ctx'> 	 * allow the op_mode to call txq_disable after it already called</div><div class='ctx'> 	 * stop_device.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!test_and_clear_bit(txq_id, trans-&gt;txqs.queue_used)) {</div><div class='add'>+	if (!test_and_clear_bit(txq_id, trans_pcie-&gt;txqs.queue_used)) {</div><div class='ctx'> 		WARN_ONCE(test_bit(STATUS_DEVICE_ENABLED, &amp;trans-&gt;status),</div><div class='ctx'> 			  "queue %d not used", txq_id);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -877,18 +1294,46 @@ void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int txq_id,</div><div class='ctx'> 	if (configure_scd) {</div><div class='ctx'> 		iwl_scd_txq_set_inactive(trans, txq_id);</div><div class='ctx'> </div><div class='del'>-		iwl_trans_write_mem(trans, stts_addr, (void *)zero_val,</div><div class='add'>+		iwl_trans_write_mem(trans, stts_addr, (const void *)zero_val,</div><div class='ctx'> 				    ARRAY_SIZE(zero_val));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	iwl_pcie_txq_unmap(trans, txq_id);</div><div class='del'>-	trans-&gt;txqs.txq[txq_id]-&gt;ampdu = false;</div><div class='add'>+	trans_pcie-&gt;txqs.txq[txq_id]-&gt;ampdu = false;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_TX_QUEUES(trans, "Deactivate queue %d\n", txq_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*************** HOST COMMAND QUEUE FUNCTIONS   *****/</div><div class='ctx'> </div><div class='add'>+static void iwl_trans_pcie_block_txq_ptrs(struct iwl_trans *trans, bool block)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; trans-&gt;mac_cfg-&gt;base-&gt;num_of_queues; i++) {</div><div class='add'>+		struct iwl_txq *txq = trans_pcie-&gt;txqs.txq[i];</div><div class='add'>+</div><div class='add'>+		if (i == trans-&gt;conf.cmd_queue)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* we skip the command queue (obviously) so it's OK to nest */</div><div class='add'>+		spin_lock_nested(&amp;txq-&gt;lock, 1);</div><div class='add'>+</div><div class='add'>+		if (!block &amp;&amp; !(WARN_ON_ONCE(!txq-&gt;block))) {</div><div class='add'>+			txq-&gt;block--;</div><div class='add'>+			if (!txq-&gt;block) {</div><div class='add'>+				iwl_write32(trans, HBUS_TARG_WRPTR,</div><div class='add'>+					    txq-&gt;write_ptr | (i &lt;&lt; 8));</div><div class='add'>+			}</div><div class='add'>+		} else if (block) {</div><div class='add'>+			txq-&gt;block++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_unlock(&amp;txq-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * iwl_pcie_enqueue_hcmd - enqueue a uCode command</div><div class='ctx'>  * @priv: device private data point</div><div class='hunk'>@@ -901,7 +1346,8 @@ void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int txq_id,</div><div class='ctx'> int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans,</div><div class='ctx'> 			  struct iwl_host_cmd *cmd)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_txq *txq = trans-&gt;txqs.txq[trans-&gt;txqs.cmd.q_id];</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_txq *txq = trans_pcie-&gt;txqs.txq[trans-&gt;conf.cmd_queue];</div><div class='ctx'> 	struct iwl_device_cmd *out_cmd;</div><div class='ctx'> 	struct iwl_cmd_meta *out_meta;</div><div class='ctx'> 	void *dup_buf = NULL;</div><div class='hunk'>@@ -916,7 +1362,7 @@ int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans,</div><div class='ctx'> 	u16 cmdlen[IWL_MAX_CMD_TBS_PER_TFD];</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (WARN(!trans-&gt;wide_cmd_header &amp;&amp;</div><div class='add'>+	if (WARN(!trans-&gt;conf.wide_cmd_header &amp;&amp;</div><div class='ctx'> 		 group_id &gt; IWL_ALWAYS_LONG_GROUP,</div><div class='ctx'> 		 "unsupported wide command %#x\n", cmd-&gt;id))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1004,7 +1450,9 @@ int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans,</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;txq-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 		IWL_ERR(trans, "No space in command queue\n");</div><div class='del'>-		iwl_op_mode_cmd_queue_full(trans-&gt;op_mode);</div><div class='add'>+		iwl_op_mode_nic_error(trans-&gt;op_mode,</div><div class='add'>+				      IWL_ERR_TYPE_CMD_QUEUE_FULL);</div><div class='add'>+		iwl_trans_schedule_reset(trans, IWL_ERR_TYPE_CMD_QUEUE_FULL);</div><div class='ctx'> 		idx = -ENOSPC;</div><div class='ctx'> 		goto free_dup_buf;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1013,7 +1461,8 @@ int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans,</div><div class='ctx'> 	out_cmd = txq-&gt;entries[idx].cmd;</div><div class='ctx'> 	out_meta = &amp;txq-&gt;entries[idx].meta;</div><div class='ctx'> </div><div class='del'>-	memset(out_meta, 0, sizeof(*out_meta));	/* re-initialize to NULL */</div><div class='add'>+	/* re-initialize, this also marks the SG list as unused */</div><div class='add'>+	memset(out_meta, 0, sizeof(*out_meta));</div><div class='ctx'> 	if (cmd-&gt;flags &amp; CMD_WANT_SKB)</div><div class='ctx'> 		out_meta-&gt;source = cmd;</div><div class='ctx'> </div><div class='hunk'>@@ -1027,7 +1476,7 @@ int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans,</div><div class='ctx'> 				    sizeof(struct iwl_cmd_header_wide));</div><div class='ctx'> 		out_cmd-&gt;hdr_wide.reserved = 0;</div><div class='ctx'> 		out_cmd-&gt;hdr_wide.sequence =</div><div class='del'>-			cpu_to_le16(QUEUE_TO_SEQ(trans-&gt;txqs.cmd.q_id) |</div><div class='add'>+			cpu_to_le16(QUEUE_TO_SEQ(trans-&gt;conf.cmd_queue) |</div><div class='ctx'> 						 INDEX_TO_SEQ(txq-&gt;write_ptr));</div><div class='ctx'> </div><div class='ctx'> 		cmd_pos = sizeof(struct iwl_cmd_header_wide);</div><div class='hunk'>@@ -1035,7 +1484,7 @@ int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		out_cmd-&gt;hdr.cmd = iwl_cmd_opcode(cmd-&gt;id);</div><div class='ctx'> 		out_cmd-&gt;hdr.sequence =</div><div class='del'>-			cpu_to_le16(QUEUE_TO_SEQ(trans-&gt;txqs.cmd.q_id) |</div><div class='add'>+			cpu_to_le16(QUEUE_TO_SEQ(trans-&gt;conf.cmd_queue) |</div><div class='ctx'> 						 INDEX_TO_SEQ(txq-&gt;write_ptr));</div><div class='ctx'> 		out_cmd-&gt;hdr.group_id = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1086,7 +1535,7 @@ int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans,</div><div class='ctx'> 		     iwl_get_cmd_string(trans, cmd-&gt;id),</div><div class='ctx'> 		     group_id, out_cmd-&gt;hdr.cmd,</div><div class='ctx'> 		     le16_to_cpu(out_cmd-&gt;hdr.sequence),</div><div class='del'>-		     cmd_size, txq-&gt;write_ptr, idx, trans-&gt;txqs.cmd.q_id);</div><div class='add'>+		     cmd_size, txq-&gt;write_ptr, idx, trans-&gt;conf.cmd_queue);</div><div class='ctx'> </div><div class='ctx'> 	/* start the TFD with the minimum copy bytes */</div><div class='ctx'> 	tb0_size = min_t(int, copy_size, IWL_FIRST_TB_SIZE);</div><div class='hunk'>@@ -1114,7 +1563,7 @@ int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans,</div><div class='ctx'> </div><div class='ctx'> 	/* map the remaining (adjusted) nocopy/dup fragments */</div><div class='ctx'> 	for (i = 0; i &lt; IWL_MAX_CMD_TBS_PER_TFD; i++) {</div><div class='del'>-		const void *data = cmddata[i];</div><div class='add'>+		void *data = (void *)(uintptr_t)cmddata[i];</div><div class='ctx'> </div><div class='ctx'> 		if (!cmdlen[i])</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -1123,7 +1572,7 @@ int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (cmd-&gt;dataflags[i] &amp; IWL_HCMD_DFL_DUP)</div><div class='ctx'> 			data = dup_buf;</div><div class='del'>-		phys_addr = dma_map_single(trans-&gt;dev, (void *)data,</div><div class='add'>+		phys_addr = dma_map_single(trans-&gt;dev, data,</div><div class='ctx'> 					   cmdlen[i], DMA_TO_DEVICE);</div><div class='ctx'> 		if (dma_mapping_error(trans-&gt;dev, phys_addr)) {</div><div class='ctx'> 			iwl_txq_gen1_tfd_unmap(trans, out_meta, txq,</div><div class='hunk'>@@ -1153,6 +1602,9 @@ int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (cmd-&gt;flags &amp; CMD_BLOCK_TXQS)</div><div class='add'>+		iwl_trans_pcie_block_txq_ptrs(trans, true);</div><div class='add'>+</div><div class='ctx'> 	/* Increment and update queue's write index */</div><div class='ctx'> 	txq-&gt;write_ptr = iwl_txq_inc_wrap(trans, txq-&gt;write_ptr);</div><div class='ctx'> 	iwl_pcie_txq_inc_wr_ptr(trans, txq);</div><div class='hunk'>@@ -1182,18 +1634,16 @@ void iwl_pcie_hcmd_complete(struct iwl_trans *trans,</div><div class='ctx'> 	struct iwl_device_cmd *cmd;</div><div class='ctx'> 	struct iwl_cmd_meta *meta;</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-	struct iwl_txq *txq = trans-&gt;txqs.txq[trans-&gt;txqs.cmd.q_id];</div><div class='add'>+	struct iwl_txq *txq = trans_pcie-&gt;txqs.txq[trans-&gt;conf.cmd_queue];</div><div class='ctx'> </div><div class='ctx'> 	/* If a Tx command is being handled and it isn't in the actual</div><div class='ctx'> 	 * command queue then there a command routing bug has been introduced</div><div class='ctx'> 	 * in the queue management code. */</div><div class='del'>-	if (WARN(txq_id != trans-&gt;txqs.cmd.q_id,</div><div class='del'>-		 "wrong command queue %d (should be %d), sequence 0x%X readp=%d writep=%d\n",</div><div class='del'>-		 txq_id, trans-&gt;txqs.cmd.q_id, sequence, txq-&gt;read_ptr,</div><div class='del'>-		 txq-&gt;write_ptr)) {</div><div class='del'>-		iwl_print_hex_error(trans, pkt, 32);</div><div class='add'>+	if (IWL_FW_CHECK(trans, txq_id != trans-&gt;conf.cmd_queue,</div><div class='add'>+			 "wrong command queue %d (should be %d), sequence 0x%X readp=%d writep=%d pkt=%*phN\n",</div><div class='add'>+			 txq_id, trans-&gt;conf.cmd_queue, sequence, txq-&gt;read_ptr,</div><div class='add'>+			 txq-&gt;write_ptr, 32, pkt))</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;txq-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1201,9 +1651,13 @@ void iwl_pcie_hcmd_complete(struct iwl_trans *trans,</div><div class='ctx'> 	cmd = txq-&gt;entries[cmd_index].cmd;</div><div class='ctx'> 	meta = &amp;txq-&gt;entries[cmd_index].meta;</div><div class='ctx'> 	group_id = cmd-&gt;hdr.group_id;</div><div class='del'>-	cmd_id = iwl_cmd_id(cmd-&gt;hdr.cmd, group_id, 0);</div><div class='add'>+	cmd_id = WIDE_ID(group_id, cmd-&gt;hdr.cmd);</div><div class='ctx'> </div><div class='del'>-	iwl_txq_gen1_tfd_unmap(trans, meta, txq, index);</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;gen2)</div><div class='add'>+		iwl_txq_gen2_tfd_unmap(trans, meta,</div><div class='add'>+				       iwl_txq_get_tfd(trans, txq, index));</div><div class='add'>+	else</div><div class='add'>+		iwl_txq_gen1_tfd_unmap(trans, meta, txq, index);</div><div class='ctx'> </div><div class='ctx'> 	/* Input error checking is done when commands are added to queue. */</div><div class='ctx'> 	if (meta-&gt;flags &amp; CMD_WANT_SKB) {</div><div class='hunk'>@@ -1214,8 +1668,8 @@ void iwl_pcie_hcmd_complete(struct iwl_trans *trans,</div><div class='ctx'> 		meta-&gt;source-&gt;_rx_page_order = trans_pcie-&gt;rx_page_order;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (meta-&gt;flags &amp; CMD_WANT_ASYNC_CALLBACK)</div><div class='del'>-		iwl_op_mode_async_cb(trans-&gt;op_mode, cmd);</div><div class='add'>+	if (meta-&gt;flags &amp; CMD_BLOCK_TXQS)</div><div class='add'>+		iwl_trans_pcie_block_txq_ptrs(trans, false);</div><div class='ctx'> </div><div class='ctx'> 	iwl_pcie_cmdq_reclaim(trans, txq_id, index);</div><div class='ctx'> </div><div class='hunk'>@@ -1228,7 +1682,7 @@ void iwl_pcie_hcmd_complete(struct iwl_trans *trans,</div><div class='ctx'> 		clear_bit(STATUS_SYNC_HCMD_ACTIVE, &amp;trans-&gt;status);</div><div class='ctx'> 		IWL_DEBUG_INFO(trans, "Clearing HCMD_ACTIVE for command %s\n",</div><div class='ctx'> 			       iwl_get_cmd_string(trans, cmd_id));</div><div class='del'>-		wake_up(&amp;trans-&gt;wait_command_queue);</div><div class='add'>+		wake_up(&amp;trans_pcie-&gt;wait_command_queue);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	meta-&gt;flags = 0;</div><div class='hunk'>@@ -1288,19 +1742,184 @@ static int iwl_fill_data_tbs(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_INET</div><div class='add'>+static void *iwl_pcie_get_page_hdr(struct iwl_trans *trans,</div><div class='add'>+				   size_t len, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_tso_hdr_page *p = this_cpu_ptr(trans_pcie-&gt;txqs.tso_hdr_page);</div><div class='add'>+	struct iwl_tso_page_info *info;</div><div class='add'>+	struct page **page_ptr;</div><div class='add'>+	dma_addr_t phys;</div><div class='add'>+	void *ret;</div><div class='add'>+</div><div class='add'>+	page_ptr = (void *)((u8 *)skb-&gt;cb + trans-&gt;conf.cb_data_offs);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(*page_ptr))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (!p-&gt;page)</div><div class='add'>+		goto alloc;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if there's enough room on this page</div><div class='add'>+	 *</div><div class='add'>+	 * Note that we put a page chaining pointer *last* in the</div><div class='add'>+	 * page - we need it somewhere, and if it's there then we</div><div class='add'>+	 * avoid DMA mapping the last bits of the page which may</div><div class='add'>+	 * trigger the 32-bit boundary hardware bug.</div><div class='add'>+	 *</div><div class='add'>+	 * (see also get_workaround_page() in tx-gen2.c)</div><div class='add'>+	 */</div><div class='add'>+	if (((unsigned long)p-&gt;pos &amp; ~PAGE_MASK) + len &lt; IWL_TSO_PAGE_DATA_SIZE) {</div><div class='add'>+		info = IWL_TSO_PAGE_INFO(page_address(p-&gt;page));</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We don't have enough room on this page, get a new one. */</div><div class='add'>+	iwl_pcie_free_and_unmap_tso_page(trans, p-&gt;page);</div><div class='add'>+</div><div class='add'>+alloc:</div><div class='add'>+	p-&gt;page = alloc_page(GFP_ATOMIC);</div><div class='add'>+	if (!p-&gt;page)</div><div class='add'>+		return NULL;</div><div class='add'>+	p-&gt;pos = page_address(p-&gt;page);</div><div class='add'>+</div><div class='add'>+	info = IWL_TSO_PAGE_INFO(page_address(p-&gt;page));</div><div class='add'>+</div><div class='add'>+	/* set the chaining pointer to NULL */</div><div class='add'>+	info-&gt;next = NULL;</div><div class='add'>+</div><div class='add'>+	/* Create a DMA mapping for the page */</div><div class='add'>+	phys = dma_map_page_attrs(trans-&gt;dev, p-&gt;page, 0, PAGE_SIZE,</div><div class='add'>+				  DMA_TO_DEVICE, DMA_ATTR_SKIP_CPU_SYNC);</div><div class='add'>+	if (unlikely(dma_mapping_error(trans-&gt;dev, phys))) {</div><div class='add'>+		__free_page(p-&gt;page);</div><div class='add'>+		p-&gt;page = NULL;</div><div class='add'>+</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Store physical address and set use count */</div><div class='add'>+	info-&gt;dma_addr = phys;</div><div class='add'>+	refcount_set(&amp;info-&gt;use_count, 1);</div><div class='add'>+out:</div><div class='add'>+	*page_ptr = p-&gt;page;</div><div class='add'>+	/* Return an internal reference for the caller */</div><div class='add'>+	refcount_inc(&amp;info-&gt;use_count);</div><div class='add'>+	ret = p-&gt;pos;</div><div class='add'>+	p-&gt;pos += len;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_pcie_get_sgt_tb_phys - Find TB address in mapped SG list</div><div class='add'>+ * @sgt: scatter gather table</div><div class='add'>+ * @offset: Offset into the mapped memory (i.e. SKB payload data)</div><div class='add'>+ * @len: Length of the area</div><div class='add'>+ *</div><div class='add'>+ * Find the DMA address that corresponds to the SKB payload data at the</div><div class='add'>+ * position given by @offset.</div><div class='add'>+ *</div><div class='add'>+ * Returns: Address for TB entry</div><div class='add'>+ */</div><div class='add'>+dma_addr_t iwl_pcie_get_sgt_tb_phys(struct sg_table *sgt, unsigned int offset,</div><div class='add'>+				    unsigned int len)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	unsigned int sg_offset = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Search the mapped DMA areas in the SG for the area that contains the</div><div class='add'>+	 * data at offset with the given length.</div><div class='add'>+	 */</div><div class='add'>+	for_each_sgtable_dma_sg(sgt, sg, i) {</div><div class='add'>+		if (offset &gt;= sg_offset &amp;&amp;</div><div class='add'>+		    offset + len &lt;= sg_offset + sg_dma_len(sg))</div><div class='add'>+			return sg_dma_address(sg) + offset - sg_offset;</div><div class='add'>+</div><div class='add'>+		sg_offset += sg_dma_len(sg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(1);</div><div class='add'>+</div><div class='add'>+	return DMA_MAPPING_ERROR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iwl_pcie_prep_tso - Prepare TSO page and SKB for sending</div><div class='add'>+ * @trans: transport private data</div><div class='add'>+ * @skb: the SKB to map</div><div class='add'>+ * @cmd_meta: command meta to store the scatter list information for unmapping</div><div class='add'>+ * @hdr: output argument for TSO headers</div><div class='add'>+ * @hdr_room: requested length for TSO headers</div><div class='add'>+ * @offset: offset into the data from which mapping should start</div><div class='add'>+ *</div><div class='add'>+ * Allocate space for a scatter gather list and TSO headers and map the SKB</div><div class='add'>+ * using the scatter gather list. The SKB is unmapped again when the page is</div><div class='add'>+ * free'ed again at the end of the operation.</div><div class='add'>+ *</div><div class='add'>+ * Returns: newly allocated and mapped scatter gather table with list</div><div class='add'>+ */</div><div class='add'>+struct sg_table *iwl_pcie_prep_tso(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='add'>+				   struct iwl_cmd_meta *cmd_meta,</div><div class='add'>+				   u8 **hdr, unsigned int hdr_room,</div><div class='add'>+				   unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	struct sg_table *sgt;</div><div class='add'>+	unsigned int n_segments = skb_shinfo(skb)-&gt;nr_frags + 1;</div><div class='add'>+	int orig_nents;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(skb_has_frag_list(skb)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	*hdr = iwl_pcie_get_page_hdr(trans,</div><div class='add'>+				     hdr_room + __alignof__(struct sg_table) +</div><div class='add'>+				     sizeof(struct sg_table) +</div><div class='add'>+				     n_segments * sizeof(struct scatterlist),</div><div class='add'>+				     skb);</div><div class='add'>+	if (!*hdr)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	sgt = (void *)PTR_ALIGN(*hdr + hdr_room, __alignof__(struct sg_table));</div><div class='add'>+	sgt-&gt;sgl = (void *)(sgt + 1);</div><div class='add'>+</div><div class='add'>+	sg_init_table(sgt-&gt;sgl, n_segments);</div><div class='add'>+</div><div class='add'>+	/* Only map the data, not the header (it is copied to the TSO page) */</div><div class='add'>+	orig_nents = skb_to_sgvec(skb, sgt-&gt;sgl, offset, skb-&gt;len - offset);</div><div class='add'>+	if (WARN_ON_ONCE(orig_nents &lt;= 0))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	sgt-&gt;orig_nents = orig_nents;</div><div class='add'>+</div><div class='add'>+	/* And map the entire SKB */</div><div class='add'>+	if (dma_map_sgtable(trans-&gt;dev, sgt, DMA_TO_DEVICE, 0) &lt; 0)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* Store non-zero (i.e. valid) offset for unmapping */</div><div class='add'>+	cmd_meta-&gt;sg_offset = (unsigned long) sgt &amp; ~PAGE_MASK;</div><div class='add'>+</div><div class='add'>+	return sgt;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int iwl_fill_data_tbs_amsdu(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> 				   struct iwl_txq *txq, u8 hdr_len,</div><div class='ctx'> 				   struct iwl_cmd_meta *out_meta,</div><div class='ctx'> 				   struct iwl_device_tx_cmd *dev_cmd,</div><div class='ctx'> 				   u16 tb1_len)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_tx_cmd *tx_cmd = (void *)dev_cmd-&gt;payload;</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_tx_cmd_v6 *tx_cmd = (void *)dev_cmd-&gt;payload;</div><div class='ctx'> 	struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='ctx'> 	unsigned int snap_ip_tcp_hdrlen, ip_hdrlen, total_len, hdr_room;</div><div class='ctx'> 	unsigned int mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='add'>+	unsigned int data_offset = 0;</div><div class='ctx'> 	u16 length, iv_len, amsdu_pad;</div><div class='del'>-	u8 *start_hdr;</div><div class='del'>-	struct iwl_tso_hdr_page *hdr_page;</div><div class='add'>+	dma_addr_t start_hdr_phys;</div><div class='add'>+	u8 *start_hdr, *pos_hdr;</div><div class='add'>+	struct sg_table *sgt;</div><div class='ctx'> 	struct tso_t tso;</div><div class='ctx'> </div><div class='ctx'> 	/* if the packet is protected, then it must be CCMP or GCMP */</div><div class='hunk'>@@ -1310,10 +1929,10 @@ static int iwl_fill_data_tbs_amsdu(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	trace_iwlwifi_dev_tx(trans-&gt;dev, skb,</div><div class='ctx'> 			     iwl_txq_get_tfd(trans, txq, txq-&gt;write_ptr),</div><div class='del'>-			     trans-&gt;txqs.tfd.size,</div><div class='add'>+			     trans_pcie-&gt;txqs.tfd.size,</div><div class='ctx'> 			     &amp;dev_cmd-&gt;hdr, IWL_FIRST_TB_SIZE + tb1_len, 0);</div><div class='ctx'> </div><div class='del'>-	ip_hdrlen = skb_transport_header(skb) - skb_network_header(skb);</div><div class='add'>+	ip_hdrlen = skb_network_header_len(skb);</div><div class='ctx'> 	snap_ip_tcp_hdrlen = 8 + ip_hdrlen + tcp_hdrlen(skb);</div><div class='ctx'> 	total_len = skb-&gt;len - snap_ip_tcp_hdrlen - hdr_len - iv_len;</div><div class='ctx'> 	amsdu_pad = 0;</div><div class='hunk'>@@ -1323,13 +1942,15 @@ static int iwl_fill_data_tbs_amsdu(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> 		(3 + snap_ip_tcp_hdrlen + sizeof(struct ethhdr)) + iv_len;</div><div class='ctx'> </div><div class='ctx'> 	/* Our device supports 9 segments at most, it will fit in 1 page */</div><div class='del'>-	hdr_page = get_page_hdr(trans, hdr_room, skb);</div><div class='del'>-	if (!hdr_page)</div><div class='add'>+	sgt = iwl_pcie_prep_tso(trans, skb, out_meta, &amp;start_hdr, hdr_room,</div><div class='add'>+				snap_ip_tcp_hdrlen + hdr_len + iv_len);</div><div class='add'>+	if (!sgt)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	start_hdr = hdr_page-&gt;pos;</div><div class='del'>-	memcpy(hdr_page-&gt;pos, skb-&gt;data + hdr_len, iv_len);</div><div class='del'>-	hdr_page-&gt;pos += iv_len;</div><div class='add'>+	start_hdr_phys = iwl_pcie_get_tso_page_phys(start_hdr);</div><div class='add'>+	pos_hdr = start_hdr;</div><div class='add'>+	memcpy(pos_hdr, skb-&gt;data + hdr_len, iv_len);</div><div class='add'>+	pos_hdr += iv_len;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Pull the ieee80211 header + IV to be able to use TSO core,</div><div class='hunk'>@@ -1342,7 +1963,7 @@ static int iwl_fill_data_tbs_amsdu(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> 	 * have in the MPDU by themselves, but that we duplicate into</div><div class='ctx'> 	 * all the different MSDUs inside the A-MSDU.</div><div class='ctx'> 	 */</div><div class='del'>-	le16_add_cpu(&amp;tx_cmd-&gt;len, -snap_ip_tcp_hdrlen);</div><div class='add'>+	le16_add_cpu(&amp;tx_cmd-&gt;params.len, -snap_ip_tcp_hdrlen);</div><div class='ctx'> </div><div class='ctx'> 	tso_start(skb, &amp;tso);</div><div class='ctx'> </div><div class='hunk'>@@ -1352,45 +1973,43 @@ static int iwl_fill_data_tbs_amsdu(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> 			min_t(unsigned int, mss, total_len);</div><div class='ctx'> 		unsigned int hdr_tb_len;</div><div class='ctx'> 		dma_addr_t hdr_tb_phys;</div><div class='del'>-		u8 *subf_hdrs_start = hdr_page-&gt;pos;</div><div class='add'>+		u8 *subf_hdrs_start = pos_hdr;</div><div class='ctx'> </div><div class='ctx'> 		total_len -= data_left;</div><div class='ctx'> </div><div class='del'>-		memset(hdr_page-&gt;pos, 0, amsdu_pad);</div><div class='del'>-		hdr_page-&gt;pos += amsdu_pad;</div><div class='add'>+		memset(pos_hdr, 0, amsdu_pad);</div><div class='add'>+		pos_hdr += amsdu_pad;</div><div class='ctx'> 		amsdu_pad = (4 - (sizeof(struct ethhdr) + snap_ip_tcp_hdrlen +</div><div class='ctx'> 				  data_left)) &amp; 0x3;</div><div class='del'>-		ether_addr_copy(hdr_page-&gt;pos, ieee80211_get_DA(hdr));</div><div class='del'>-		hdr_page-&gt;pos += ETH_ALEN;</div><div class='del'>-		ether_addr_copy(hdr_page-&gt;pos, ieee80211_get_SA(hdr));</div><div class='del'>-		hdr_page-&gt;pos += ETH_ALEN;</div><div class='add'>+		ether_addr_copy(pos_hdr, ieee80211_get_DA(hdr));</div><div class='add'>+		pos_hdr += ETH_ALEN;</div><div class='add'>+		ether_addr_copy(pos_hdr, ieee80211_get_SA(hdr));</div><div class='add'>+		pos_hdr += ETH_ALEN;</div><div class='ctx'> </div><div class='ctx'> 		length = snap_ip_tcp_hdrlen + data_left;</div><div class='del'>-		*((__be16 *)hdr_page-&gt;pos) = cpu_to_be16(length);</div><div class='del'>-		hdr_page-&gt;pos += sizeof(length);</div><div class='add'>+		*((__be16 *)pos_hdr) = cpu_to_be16(length);</div><div class='add'>+		pos_hdr += sizeof(length);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * This will copy the SNAP as well which will be considered</div><div class='ctx'> 		 * as MAC header.</div><div class='ctx'> 		 */</div><div class='del'>-		tso_build_hdr(skb, hdr_page-&gt;pos, &amp;tso, data_left, !total_len);</div><div class='add'>+		tso_build_hdr(skb, pos_hdr, &amp;tso, data_left, !total_len);</div><div class='ctx'> </div><div class='del'>-		hdr_page-&gt;pos += snap_ip_tcp_hdrlen;</div><div class='add'>+		pos_hdr += snap_ip_tcp_hdrlen;</div><div class='add'>+</div><div class='add'>+		hdr_tb_len = pos_hdr - start_hdr;</div><div class='add'>+		hdr_tb_phys = iwl_pcie_get_tso_page_phys(start_hdr);</div><div class='ctx'> </div><div class='del'>-		hdr_tb_len = hdr_page-&gt;pos - start_hdr;</div><div class='del'>-		hdr_tb_phys = dma_map_single(trans-&gt;dev, start_hdr,</div><div class='del'>-					     hdr_tb_len, DMA_TO_DEVICE);</div><div class='del'>-		if (unlikely(dma_mapping_error(trans-&gt;dev, hdr_tb_phys)))</div><div class='del'>-			return -EINVAL;</div><div class='ctx'> 		iwl_pcie_txq_build_tfd(trans, txq, hdr_tb_phys,</div><div class='ctx'> 				       hdr_tb_len, false);</div><div class='ctx'> 		trace_iwlwifi_dev_tx_tb(trans-&gt;dev, skb, start_hdr,</div><div class='ctx'> 					hdr_tb_phys, hdr_tb_len);</div><div class='ctx'> 		/* add this subframe's headers' length to the tx_cmd */</div><div class='del'>-		le16_add_cpu(&amp;tx_cmd-&gt;len, hdr_page-&gt;pos - subf_hdrs_start);</div><div class='add'>+		le16_add_cpu(&amp;tx_cmd-&gt;params.len, pos_hdr - subf_hdrs_start);</div><div class='ctx'> </div><div class='ctx'> 		/* prepare the start_hdr for the next subframe */</div><div class='del'>-		start_hdr = hdr_page-&gt;pos;</div><div class='add'>+		start_hdr = pos_hdr;</div><div class='ctx'> </div><div class='ctx'> 		/* put the payload */</div><div class='ctx'> 		while (data_left) {</div><div class='hunk'>@@ -1398,9 +2017,9 @@ static int iwl_fill_data_tbs_amsdu(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> 						  data_left);</div><div class='ctx'> 			dma_addr_t tb_phys;</div><div class='ctx'> </div><div class='del'>-			tb_phys = dma_map_single(trans-&gt;dev, tso.data,</div><div class='del'>-						 size, DMA_TO_DEVICE);</div><div class='del'>-			if (unlikely(dma_mapping_error(trans-&gt;dev, tb_phys)))</div><div class='add'>+			tb_phys = iwl_pcie_get_sgt_tb_phys(sgt, data_offset, size);</div><div class='add'>+			/* Not a real mapping error, use direct comparison */</div><div class='add'>+			if (unlikely(tb_phys == DMA_MAPPING_ERROR))</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 			iwl_pcie_txq_build_tfd(trans, txq, tb_phys,</div><div class='hunk'>@@ -1409,10 +2028,14 @@ static int iwl_fill_data_tbs_amsdu(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> 						tb_phys, size);</div><div class='ctx'> </div><div class='ctx'> 			data_left -= size;</div><div class='add'>+			data_offset += size;</div><div class='ctx'> 			tso_build_data(skb, &amp;tso, size);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	dma_sync_single_for_device(trans-&gt;dev, start_hdr_phys, hdr_room,</div><div class='add'>+				   DMA_TO_DEVICE);</div><div class='add'>+</div><div class='ctx'> 	/* re -add the WiFi header and IV */</div><div class='ctx'> 	skb_push(skb, hdr_len + iv_len);</div><div class='ctx'> </div><div class='hunk'>@@ -1432,11 +2055,65 @@ static int iwl_fill_data_tbs_amsdu(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_INET */</div><div class='ctx'> </div><div class='add'>+#define IWL_TX_CRC_SIZE 4</div><div class='add'>+#define IWL_TX_DELIMITER_SIZE 4</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * iwl_txq_gen1_update_byte_cnt_tbl - Set up entry in Tx byte-count array</div><div class='add'>+ */</div><div class='add'>+static void iwl_txq_gen1_update_byte_cnt_tbl(struct iwl_trans *trans,</div><div class='add'>+					     struct iwl_txq *txq, u16 byte_cnt,</div><div class='add'>+					     int num_tbs)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_bc_tbl_entry *scd_bc_tbl;</div><div class='add'>+	int write_ptr = txq-&gt;write_ptr;</div><div class='add'>+	int txq_id = txq-&gt;id;</div><div class='add'>+	u8 sec_ctl = 0;</div><div class='add'>+	u16 len = byte_cnt + IWL_TX_CRC_SIZE + IWL_TX_DELIMITER_SIZE;</div><div class='add'>+	__le16 bc_ent;</div><div class='add'>+	struct iwl_device_tx_cmd *dev_cmd = txq-&gt;entries[txq-&gt;write_ptr].cmd;</div><div class='add'>+	struct iwl_tx_cmd_v6 *tx_cmd = (void *)dev_cmd-&gt;payload;</div><div class='add'>+	u8 sta_id = tx_cmd-&gt;params.sta_id;</div><div class='add'>+</div><div class='add'>+	scd_bc_tbl = trans_pcie-&gt;txqs.scd_bc_tbls.addr;</div><div class='add'>+</div><div class='add'>+	sec_ctl = tx_cmd-&gt;params.sec_ctl;</div><div class='add'>+</div><div class='add'>+	switch (sec_ctl &amp; TX_CMD_SEC_MSK) {</div><div class='add'>+	case TX_CMD_SEC_CCM:</div><div class='add'>+		len += IEEE80211_CCMP_MIC_LEN;</div><div class='add'>+		break;</div><div class='add'>+	case TX_CMD_SEC_TKIP:</div><div class='add'>+		len += IEEE80211_TKIP_ICV_LEN;</div><div class='add'>+		break;</div><div class='add'>+	case TX_CMD_SEC_WEP:</div><div class='add'>+		len += IEEE80211_WEP_IV_LEN + IEEE80211_WEP_ICV_LEN;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_7000 &amp;&amp;</div><div class='add'>+	    trans-&gt;mac_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210)</div><div class='add'>+		len = DIV_ROUND_UP(len, 4);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(len &gt; 0xFFF || write_ptr &gt;= TFD_QUEUE_SIZE_MAX))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bc_ent = cpu_to_le16(len | (sta_id &lt;&lt; 12));</div><div class='add'>+</div><div class='add'>+	scd_bc_tbl[txq_id * TFD_QUEUE_BC_SIZE + write_ptr].tfd_offset = bc_ent;</div><div class='add'>+</div><div class='add'>+	if (write_ptr &lt; TFD_QUEUE_SIZE_BC_DUP)</div><div class='add'>+		scd_bc_tbl[txq_id * TFD_QUEUE_BC_SIZE + TFD_QUEUE_SIZE_MAX + write_ptr].tfd_offset =</div><div class='add'>+			bc_ent;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> 		      struct iwl_device_tx_cmd *dev_cmd, int txq_id)</div><div class='ctx'> {</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='del'>-	struct iwl_tx_cmd *tx_cmd = (struct iwl_tx_cmd *)dev_cmd-&gt;payload;</div><div class='add'>+	struct iwl_tx_cmd_v6 *tx_cmd = (struct iwl_tx_cmd_v6 *)dev_cmd-&gt;payload;</div><div class='ctx'> 	struct iwl_cmd_meta *out_meta;</div><div class='ctx'> 	struct iwl_txq *txq;</div><div class='ctx'> 	dma_addr_t tb0_phys, tb1_phys, scratch_phys;</div><div class='hunk'>@@ -1449,14 +2126,14 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> 	u16 wifi_seq;</div><div class='ctx'> 	bool amsdu;</div><div class='ctx'> </div><div class='del'>-	txq = trans-&gt;txqs.txq[txq_id];</div><div class='add'>+	txq = trans_pcie-&gt;txqs.txq[txq_id];</div><div class='ctx'> </div><div class='del'>-	if (WARN_ONCE(!test_bit(txq_id, trans-&gt;txqs.queue_used),</div><div class='add'>+	if (WARN_ONCE(!test_bit(txq_id, trans_pcie-&gt;txqs.queue_used),</div><div class='ctx'> 		      "TX on unused queue %d\n", txq_id))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_is_nonlinear(skb) &amp;&amp;</div><div class='del'>-	    skb_shinfo(skb)-&gt;nr_frags &gt; IWL_TRANS_MAX_FRAGS(trans) &amp;&amp;</div><div class='add'>+	    skb_shinfo(skb)-&gt;nr_frags &gt; IWL_TRANS_PCIE_MAX_FRAGS(trans_pcie) &amp;&amp;</div><div class='ctx'> 	    __skb_linearize(skb))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1477,7 +2154,8 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> 			struct iwl_device_tx_cmd **dev_cmd_ptr;</div><div class='ctx'> </div><div class='ctx'> 			dev_cmd_ptr = (void *)((u8 *)skb-&gt;cb +</div><div class='del'>-					       trans-&gt;txqs.dev_cmd_offs);</div><div class='add'>+					       trans-&gt;conf.cb_data_offs +</div><div class='add'>+					       sizeof(void *));</div><div class='ctx'> </div><div class='ctx'> 			*dev_cmd_ptr = dev_cmd;</div><div class='ctx'> 			__skb_queue_tail(&amp;txq-&gt;overflow_q, skb);</div><div class='hunk'>@@ -1508,14 +2186,14 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	tb0_phys = iwl_txq_get_first_tb_dma(txq, txq-&gt;write_ptr);</div><div class='ctx'> 	scratch_phys = tb0_phys + sizeof(struct iwl_cmd_header) +</div><div class='del'>-		       offsetof(struct iwl_tx_cmd, scratch);</div><div class='add'>+		       offsetof(struct iwl_tx_cmd_v6_params, scratch);</div><div class='ctx'> </div><div class='del'>-	tx_cmd-&gt;dram_lsb_ptr = cpu_to_le32(scratch_phys);</div><div class='del'>-	tx_cmd-&gt;dram_msb_ptr = iwl_get_dma_hi_addr(scratch_phys);</div><div class='add'>+	tx_cmd-&gt;params.dram_lsb_ptr = cpu_to_le32(scratch_phys);</div><div class='add'>+	tx_cmd-&gt;params.dram_msb_ptr = iwl_get_dma_hi_addr(scratch_phys);</div><div class='ctx'> </div><div class='ctx'> 	/* Set up first empty entry in queue's array of Tx/cmd buffers */</div><div class='ctx'> 	out_meta = &amp;txq-&gt;entries[txq-&gt;write_ptr].meta;</div><div class='del'>-	out_meta-&gt;flags = 0;</div><div class='add'>+	memset(out_meta, 0, sizeof(*out_meta));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The second TB (tb1) points to the remainder of the TX command</div><div class='hunk'>@@ -1523,7 +2201,7 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> 	 * (This calculation modifies the TX command, so do it before the</div><div class='ctx'> 	 * setup of the first TB)</div><div class='ctx'> 	 */</div><div class='del'>-	len = sizeof(struct iwl_tx_cmd) + sizeof(struct iwl_cmd_header) +</div><div class='add'>+	len = sizeof(struct iwl_tx_cmd_v6) + sizeof(struct iwl_cmd_header) +</div><div class='ctx'> 	      hdr_len - IWL_FIRST_TB_SIZE;</div><div class='ctx'> 	/* do not align A-MSDU to dword as the subframe header aligns it */</div><div class='ctx'> 	amsdu = ieee80211_is_data_qos(fc) &amp;&amp;</div><div class='hunk'>@@ -1533,7 +2211,7 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> 		tb1_len = ALIGN(len, 4);</div><div class='ctx'> 		/* Tell NIC about any 2-byte padding after MAC header */</div><div class='ctx'> 		if (tb1_len != len)</div><div class='del'>-			tx_cmd-&gt;tx_flags |= cpu_to_le32(TX_CMD_FLG_MH_PAD);</div><div class='add'>+			tx_cmd-&gt;params.tx_flags |= cpu_to_le32(TX_CMD_FLG_MH_PAD);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		tb1_len = len;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1546,7 +2224,10 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> 			       IWL_FIRST_TB_SIZE, true);</div><div class='ctx'> </div><div class='ctx'> 	/* there must be data left over for TB1 or this code must be changed */</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct iwl_tx_cmd) &lt; IWL_FIRST_TB_SIZE);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct iwl_tx_cmd_v6) &lt; IWL_FIRST_TB_SIZE);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct iwl_cmd_header) +</div><div class='add'>+		     offsetofend(struct iwl_tx_cmd_v6_params, scratch) &gt;</div><div class='add'>+		     IWL_FIRST_TB_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* map the data for TB1 */</div><div class='ctx'> 	tb1_addr = ((u8 *)&amp;dev_cmd-&gt;hdr) + IWL_FIRST_TB_SIZE;</div><div class='hunk'>@@ -1557,7 +2238,7 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	trace_iwlwifi_dev_tx(trans-&gt;dev, skb,</div><div class='ctx'> 			     iwl_txq_get_tfd(trans, txq, txq-&gt;write_ptr),</div><div class='del'>-			     trans-&gt;txqs.tfd.size,</div><div class='add'>+			     trans_pcie-&gt;txqs.tfd.size,</div><div class='ctx'> 			     &amp;dev_cmd-&gt;hdr, IWL_FIRST_TB_SIZE + tb1_len,</div><div class='ctx'> 			     hdr_len);</div><div class='ctx'> </div><div class='hunk'>@@ -1591,9 +2272,8 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	tfd = iwl_txq_get_tfd(trans, txq, txq-&gt;write_ptr);</div><div class='ctx'> 	/* Set up entry for this TFD in Tx byte-count array */</div><div class='del'>-	iwl_txq_gen1_update_byte_cnt_tbl(trans, txq, le16_to_cpu(tx_cmd-&gt;len),</div><div class='del'>-					 iwl_txq_gen1_tfd_get_num_tbs(trans,</div><div class='del'>-								      tfd));</div><div class='add'>+	iwl_txq_gen1_update_byte_cnt_tbl(trans, txq, le16_to_cpu(tx_cmd-&gt;params.len),</div><div class='add'>+					 iwl_txq_gen1_tfd_get_num_tbs(tfd));</div><div class='ctx'> </div><div class='ctx'> 	wait_write_ptr = ieee80211_has_morefrags(fc);</div><div class='ctx'> </div><div class='hunk'>@@ -1628,3 +2308,382 @@ out_err:</div><div class='ctx'> 	spin_unlock(&amp;txq-&gt;lock);</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static void iwl_txq_gen1_inval_byte_cnt_tbl(struct iwl_trans *trans,</div><div class='add'>+					    struct iwl_txq *txq,</div><div class='add'>+					    int read_ptr)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_bc_tbl_entry *scd_bc_tbl = trans_pcie-&gt;txqs.scd_bc_tbls.addr;</div><div class='add'>+	int txq_id = txq-&gt;id;</div><div class='add'>+	u8 sta_id = 0;</div><div class='add'>+	__le16 bc_ent;</div><div class='add'>+	struct iwl_device_tx_cmd *dev_cmd = txq-&gt;entries[read_ptr].cmd;</div><div class='add'>+	struct iwl_tx_cmd_v6 *tx_cmd = (void *)dev_cmd-&gt;payload;</div><div class='add'>+</div><div class='add'>+	WARN_ON(read_ptr &gt;= TFD_QUEUE_SIZE_MAX);</div><div class='add'>+</div><div class='add'>+	if (txq_id != trans-&gt;conf.cmd_queue)</div><div class='add'>+		sta_id = tx_cmd-&gt;params.sta_id;</div><div class='add'>+</div><div class='add'>+	bc_ent = cpu_to_le16(1 | (sta_id &lt;&lt; 12));</div><div class='add'>+</div><div class='add'>+	scd_bc_tbl[txq_id * TFD_QUEUE_BC_SIZE + read_ptr].tfd_offset = bc_ent;</div><div class='add'>+</div><div class='add'>+	if (read_ptr &lt; TFD_QUEUE_SIZE_BC_DUP)</div><div class='add'>+		scd_bc_tbl[txq_id * TFD_QUEUE_BC_SIZE + TFD_QUEUE_SIZE_MAX + read_ptr].tfd_offset =</div><div class='add'>+			bc_ent;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Frees buffers until index _not_ inclusive */</div><div class='add'>+void iwl_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn,</div><div class='add'>+		      struct sk_buff_head *skbs, bool is_flush)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_txq *txq = trans_pcie-&gt;txqs.txq[txq_id];</div><div class='add'>+	int tfd_num, read_ptr, last_to_free;</div><div class='add'>+	int txq_read_ptr, txq_write_ptr;</div><div class='add'>+</div><div class='add'>+	/* This function is not meant to release cmd queue*/</div><div class='add'>+	if (WARN_ON(txq_id == trans-&gt;conf.cmd_queue))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!txq))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tfd_num = iwl_txq_get_cmd_index(txq, ssn);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;txq-&gt;reclaim_lock);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;txq-&gt;lock);</div><div class='add'>+	txq_read_ptr = txq-&gt;read_ptr;</div><div class='add'>+	txq_write_ptr = txq-&gt;write_ptr;</div><div class='add'>+	spin_unlock(&amp;txq-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* There is nothing to do if we are flushing an empty queue */</div><div class='add'>+	if (is_flush &amp;&amp; txq_write_ptr == txq_read_ptr)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	read_ptr = iwl_txq_get_cmd_index(txq, txq_read_ptr);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(txq_id, trans_pcie-&gt;txqs.queue_used)) {</div><div class='add'>+		IWL_DEBUG_TX_QUEUES(trans, "Q %d inactive - ignoring idx %d\n",</div><div class='add'>+				    txq_id, ssn);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (read_ptr == tfd_num)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_TX_REPLY(trans, "[Q %d] %d (%d) -&gt; %d (%d)\n",</div><div class='add'>+			   txq_id, read_ptr, txq_read_ptr, tfd_num, ssn);</div><div class='add'>+</div><div class='add'>+	/* Since we free until index _not_ inclusive, the one before index is</div><div class='add'>+	 * the last we will free. This one must be used</div><div class='add'>+	 */</div><div class='add'>+	last_to_free = iwl_txq_dec_wrap(trans, tfd_num);</div><div class='add'>+</div><div class='add'>+	if (!iwl_txq_used(txq, last_to_free, txq_read_ptr, txq_write_ptr)) {</div><div class='add'>+		IWL_ERR(trans,</div><div class='add'>+			"%s: Read index for txq id (%d), last_to_free %d is out of range [0-%d] %d %d.\n",</div><div class='add'>+			__func__, txq_id, last_to_free,</div><div class='add'>+			trans-&gt;mac_cfg-&gt;base-&gt;max_tfd_queue_size,</div><div class='add'>+			txq_write_ptr, txq_read_ptr);</div><div class='add'>+</div><div class='add'>+		iwl_op_mode_time_point(trans-&gt;op_mode,</div><div class='add'>+				       IWL_FW_INI_TIME_POINT_FAKE_TX,</div><div class='add'>+				       NULL);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!skb_queue_empty(skbs)))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	for (;</div><div class='add'>+	     read_ptr != tfd_num;</div><div class='add'>+	     txq_read_ptr = iwl_txq_inc_wrap(trans, txq_read_ptr),</div><div class='add'>+	     read_ptr = iwl_txq_get_cmd_index(txq, txq_read_ptr)) {</div><div class='add'>+		struct iwl_cmd_meta *cmd_meta = &amp;txq-&gt;entries[read_ptr].meta;</div><div class='add'>+		struct sk_buff *skb = txq-&gt;entries[read_ptr].skb;</div><div class='add'>+</div><div class='add'>+		if (WARN_ONCE(!skb, "no SKB at %d (%d) on queue %d\n",</div><div class='add'>+			      read_ptr, txq_read_ptr, txq_id))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		iwl_pcie_free_tso_pages(trans, skb, cmd_meta);</div><div class='add'>+</div><div class='add'>+		__skb_queue_tail(skbs, skb);</div><div class='add'>+</div><div class='add'>+		txq-&gt;entries[read_ptr].skb = NULL;</div><div class='add'>+</div><div class='add'>+		if (!trans-&gt;mac_cfg-&gt;gen2)</div><div class='add'>+			iwl_txq_gen1_inval_byte_cnt_tbl(trans, txq,</div><div class='add'>+							txq_read_ptr);</div><div class='add'>+</div><div class='add'>+		iwl_txq_free_tfd(trans, txq, txq_read_ptr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;txq-&gt;lock);</div><div class='add'>+	txq-&gt;read_ptr = txq_read_ptr;</div><div class='add'>+</div><div class='add'>+	iwl_txq_progress(txq);</div><div class='add'>+</div><div class='add'>+	if (iwl_txq_space(trans, txq) &gt; txq-&gt;low_mark &amp;&amp;</div><div class='add'>+	    test_bit(txq_id, trans_pcie-&gt;txqs.queue_stopped)) {</div><div class='add'>+		struct sk_buff_head overflow_skbs;</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+		__skb_queue_head_init(&amp;overflow_skbs);</div><div class='add'>+		skb_queue_splice_init(&amp;txq-&gt;overflow_q,</div><div class='add'>+				      is_flush ? skbs : &amp;overflow_skbs);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We are going to transmit from the overflow queue.</div><div class='add'>+		 * Remember this state so that wait_for_txq_empty will know we</div><div class='add'>+		 * are adding more packets to the TFD queue. It cannot rely on</div><div class='add'>+		 * the state of &amp;txq-&gt;overflow_q, as we just emptied it, but</div><div class='add'>+		 * haven't TXed the content yet.</div><div class='add'>+		 */</div><div class='add'>+		txq-&gt;overflow_tx = true;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * This is tricky: we are in reclaim path and are holding</div><div class='add'>+		 * reclaim_lock, so noone will try to access the txq data</div><div class='add'>+		 * from that path. We stopped tx, so we can't have tx as well.</div><div class='add'>+		 * Bottom line, we can unlock and re-lock later.</div><div class='add'>+		 */</div><div class='add'>+		spin_unlock(&amp;txq-&gt;lock);</div><div class='add'>+</div><div class='add'>+		while ((skb = __skb_dequeue(&amp;overflow_skbs))) {</div><div class='add'>+			struct iwl_device_tx_cmd *dev_cmd_ptr;</div><div class='add'>+</div><div class='add'>+			dev_cmd_ptr = *(void **)((u8 *)skb-&gt;cb +</div><div class='add'>+						 trans-&gt;conf.cb_data_offs +</div><div class='add'>+						 sizeof(void *));</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Note that we can very well be overflowing again.</div><div class='add'>+			 * In that case, iwl_txq_space will be small again</div><div class='add'>+			 * and we won't wake mac80211's queue.</div><div class='add'>+			 */</div><div class='add'>+			iwl_trans_tx(trans, skb, dev_cmd_ptr, txq_id);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (iwl_txq_space(trans, txq) &gt; txq-&gt;low_mark)</div><div class='add'>+			iwl_trans_pcie_wake_queue(trans, txq);</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;txq-&gt;lock);</div><div class='add'>+		txq-&gt;overflow_tx = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;txq-&gt;lock);</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_bh(&amp;txq-&gt;reclaim_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set wr_ptr of specific device and txq  */</div><div class='add'>+void iwl_pcie_set_q_ptrs(struct iwl_trans *trans, int txq_id, int ptr)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_txq *txq = trans_pcie-&gt;txqs.txq[txq_id];</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;txq-&gt;lock);</div><div class='add'>+</div><div class='add'>+	txq-&gt;write_ptr = ptr;</div><div class='add'>+	txq-&gt;read_ptr = txq-&gt;write_ptr;</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;txq-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_pcie_freeze_txq_timer(struct iwl_trans *trans,</div><div class='add'>+			       unsigned long txqs, bool freeze)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	int queue;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(queue, &amp;txqs, BITS_PER_LONG) {</div><div class='add'>+		struct iwl_txq *txq = trans_pcie-&gt;txqs.txq[queue];</div><div class='add'>+		unsigned long now;</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;txq-&gt;lock);</div><div class='add'>+</div><div class='add'>+		now = jiffies;</div><div class='add'>+</div><div class='add'>+		if (txq-&gt;frozen == freeze)</div><div class='add'>+			goto next_queue;</div><div class='add'>+</div><div class='add'>+		IWL_DEBUG_TX_QUEUES(trans, "%s TXQ %d\n",</div><div class='add'>+				    freeze ? "Freezing" : "Waking", queue);</div><div class='add'>+</div><div class='add'>+		txq-&gt;frozen = freeze;</div><div class='add'>+</div><div class='add'>+		if (txq-&gt;read_ptr == txq-&gt;write_ptr)</div><div class='add'>+			goto next_queue;</div><div class='add'>+</div><div class='add'>+		if (freeze) {</div><div class='add'>+			if (unlikely(time_after(now,</div><div class='add'>+						txq-&gt;stuck_timer.expires))) {</div><div class='add'>+				/*</div><div class='add'>+				 * The timer should have fired, maybe it is</div><div class='add'>+				 * spinning right now on the lock.</div><div class='add'>+				 */</div><div class='add'>+				goto next_queue;</div><div class='add'>+			}</div><div class='add'>+			/* remember how long until the timer fires */</div><div class='add'>+			txq-&gt;frozen_expiry_remainder =</div><div class='add'>+				txq-&gt;stuck_timer.expires - now;</div><div class='add'>+			timer_delete(&amp;txq-&gt;stuck_timer);</div><div class='add'>+			goto next_queue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Wake a non-empty queue -&gt; arm timer with the</div><div class='add'>+		 * remainder before it froze</div><div class='add'>+		 */</div><div class='add'>+		mod_timer(&amp;txq-&gt;stuck_timer,</div><div class='add'>+			  now + txq-&gt;frozen_expiry_remainder);</div><div class='add'>+</div><div class='add'>+next_queue:</div><div class='add'>+		spin_unlock_bh(&amp;txq-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define HOST_COMPLETE_TIMEOUT	(2 * HZ)</div><div class='add'>+</div><div class='add'>+static int iwl_trans_pcie_send_hcmd_sync(struct iwl_trans *trans,</div><div class='add'>+					 struct iwl_host_cmd *cmd,</div><div class='add'>+					 const char *cmd_str)</div><div class='add'>+{</div><div class='add'>+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='add'>+	struct iwl_txq *txq = trans_pcie-&gt;txqs.txq[trans-&gt;conf.cmd_queue];</div><div class='add'>+	int cmd_idx;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(trans, "Attempting to send sync command %s\n", cmd_str);</div><div class='add'>+</div><div class='add'>+	if (WARN(test_and_set_bit(STATUS_SYNC_HCMD_ACTIVE,</div><div class='add'>+				  &amp;trans-&gt;status),</div><div class='add'>+		 "Command %s: a command is already active!\n", cmd_str))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(trans, "Setting HCMD_ACTIVE for command %s\n", cmd_str);</div><div class='add'>+</div><div class='add'>+	if (trans-&gt;mac_cfg-&gt;gen2)</div><div class='add'>+		cmd_idx = iwl_pcie_gen2_enqueue_hcmd(trans, cmd);</div><div class='add'>+	else</div><div class='add'>+		cmd_idx = iwl_pcie_enqueue_hcmd(trans, cmd);</div><div class='add'>+</div><div class='add'>+	if (cmd_idx &lt; 0) {</div><div class='add'>+		ret = cmd_idx;</div><div class='add'>+		clear_bit(STATUS_SYNC_HCMD_ACTIVE, &amp;trans-&gt;status);</div><div class='add'>+		IWL_ERR(trans, "Error sending %s: enqueue_hcmd failed: %d\n",</div><div class='add'>+			cmd_str, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = wait_event_timeout(trans_pcie-&gt;wait_command_queue,</div><div class='add'>+				 !test_bit(STATUS_SYNC_HCMD_ACTIVE,</div><div class='add'>+					   &amp;trans-&gt;status),</div><div class='add'>+				 HOST_COMPLETE_TIMEOUT);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		IWL_ERR(trans, "Error sending %s: time out after %dms.\n",</div><div class='add'>+			cmd_str, jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));</div><div class='add'>+</div><div class='add'>+		IWL_ERR(trans, "Current CMD queue read_ptr %d write_ptr %d\n",</div><div class='add'>+			txq-&gt;read_ptr, txq-&gt;write_ptr);</div><div class='add'>+</div><div class='add'>+		clear_bit(STATUS_SYNC_HCMD_ACTIVE, &amp;trans-&gt;status);</div><div class='add'>+		IWL_DEBUG_INFO(trans, "Clearing HCMD_ACTIVE for command %s\n",</div><div class='add'>+			       cmd_str);</div><div class='add'>+		ret = -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+		iwl_trans_pcie_sync_nmi(trans);</div><div class='add'>+		goto cancel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(STATUS_FW_ERROR, &amp;trans-&gt;status)) {</div><div class='add'>+		if (trans-&gt;suppress_cmd_error_once) {</div><div class='add'>+			trans-&gt;suppress_cmd_error_once = false;</div><div class='add'>+		} else {</div><div class='add'>+			IWL_ERR(trans, "FW error in SYNC CMD %s\n", cmd_str);</div><div class='add'>+			dump_stack();</div><div class='add'>+		}</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto cancel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(cmd-&gt;flags &amp; CMD_SEND_IN_RFKILL) &amp;&amp;</div><div class='add'>+	    test_bit(STATUS_RFKILL_OPMODE, &amp;trans-&gt;status)) {</div><div class='add'>+		IWL_DEBUG_RF_KILL(trans, "RFKILL in SYNC CMD... no rsp\n");</div><div class='add'>+		ret = -ERFKILL;</div><div class='add'>+		goto cancel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((cmd-&gt;flags &amp; CMD_WANT_SKB) &amp;&amp; !cmd-&gt;resp_pkt) {</div><div class='add'>+		IWL_ERR(trans, "Error: Response NULL in '%s'\n", cmd_str);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto cancel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+cancel:</div><div class='add'>+	if (cmd-&gt;flags &amp; CMD_WANT_SKB) {</div><div class='add'>+		/*</div><div class='add'>+		 * Cancel the CMD_WANT_SKB flag for the cmd in the</div><div class='add'>+		 * TX cmd queue. Otherwise in case the cmd comes</div><div class='add'>+		 * in later, it will possibly set an invalid</div><div class='add'>+		 * address (cmd-&gt;meta.source).</div><div class='add'>+		 */</div><div class='add'>+		txq-&gt;entries[cmd_idx].meta.flags &amp;= ~CMD_WANT_SKB;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;resp_pkt) {</div><div class='add'>+		iwl_free_resp(cmd);</div><div class='add'>+		cmd-&gt;resp_pkt = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_trans_pcie_send_hcmd(struct iwl_trans *trans,</div><div class='add'>+			     struct iwl_host_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	const char *cmd_str = iwl_get_cmd_string(trans, cmd-&gt;id);</div><div class='add'>+</div><div class='add'>+	/* Make sure the NIC is still alive in the bus */</div><div class='add'>+	if (test_bit(STATUS_TRANS_DEAD, &amp;trans-&gt;status))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (!(cmd-&gt;flags &amp; CMD_SEND_IN_RFKILL) &amp;&amp;</div><div class='add'>+	    test_bit(STATUS_RFKILL_OPMODE, &amp;trans-&gt;status)) {</div><div class='add'>+		IWL_DEBUG_RF_KILL(trans, "Dropping CMD 0x%x: RF KILL\n",</div><div class='add'>+				  cmd-&gt;id);</div><div class='add'>+		return -ERFKILL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;flags &amp; CMD_ASYNC) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		IWL_DEBUG_INFO(trans, "Sending async command %s\n", cmd_str);</div><div class='add'>+</div><div class='add'>+		/* An asynchronous command can not expect an SKB to be set. */</div><div class='add'>+		if (WARN_ON(cmd-&gt;flags &amp; CMD_WANT_SKB))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (trans-&gt;mac_cfg-&gt;gen2)</div><div class='add'>+			ret = iwl_pcie_gen2_enqueue_hcmd(trans, cmd);</div><div class='add'>+		else</div><div class='add'>+			ret = iwl_pcie_enqueue_hcmd(trans, cmd);</div><div class='add'>+</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			IWL_ERR(trans,</div><div class='add'>+				"Error sending %s: enqueue_hcmd failed: %d\n",</div><div class='add'>+				iwl_get_cmd_string(trans, cmd-&gt;id), ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return iwl_trans_pcie_send_hcmd_sync(trans, cmd, cmd_str);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-context-info-gen3.h b/drivers/net/wireless/intel/iwlwifi/pcie/iwl-context-info-v2.h<br/>index 2be605cc6fbf..416baadc5017 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-context-info-gen3.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-context-info-gen3.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/iwl-context-info-v2.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/pcie/iwl-context-info-v2.h</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2018, 2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2018, 2020-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='del'>-#ifndef __iwl_context_info_file_gen3_h__</div><div class='del'>-#define __iwl_context_info_file_gen3_h__</div><div class='add'>+#ifndef __iwl_context_info_file_v2_h__</div><div class='add'>+#define __iwl_context_info_file_v2_h__</div><div class='ctx'> </div><div class='ctx'> #include "iwl-context-info.h"</div><div class='ctx'> </div><div class='hunk'>@@ -13,6 +13,8 @@</div><div class='ctx'> #define CSR_IML_SIZE_ADDR               0x128</div><div class='ctx'> #define CSR_IML_RESP_ADDR               0x12c</div><div class='ctx'> </div><div class='add'>+#define UNFRAGMENTED_PNVM_PAYLOADS_NUMBER 2</div><div class='add'>+</div><div class='ctx'> /* Set bit for enabling automatic function boot */</div><div class='ctx'> #define CSR_AUTO_FUNC_BOOT_ENA          BIT(1)</div><div class='ctx'> /* Set bit for initiating function boot */</div><div class='hunk'>@@ -34,6 +36,7 @@ enum iwl_prph_scratch_mtr_format {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum iwl_prph_scratch_flags - PRPH scratch control flags</div><div class='add'>+ * @IWL_PRPH_SCRATCH_IMR_DEBUG_EN: IMR support for debug</div><div class='ctx'>  * @IWL_PRPH_SCRATCH_EARLY_DEBUG_EN: enable early debug conf</div><div class='ctx'>  * @IWL_PRPH_SCRATCH_EDBG_DEST_DRAM: use DRAM, with size allocated</div><div class='ctx'>  *	in hwm config.</div><div class='hunk'>@@ -41,7 +44,7 @@ enum iwl_prph_scratch_mtr_format {</div><div class='ctx'>  * @IWL_PRPH_SCRATCH_EDBG_DEST_ST_ARBITER: use st arbiter, mainly for</div><div class='ctx'>  *	multicomm.</div><div class='ctx'>  * @IWL_PRPH_SCRATCH_EDBG_DEST_TB22DTF: route debug data to SoC HW</div><div class='del'>- * @IWL_PRPH_SCTATCH_RB_SIZE_4K: Use 4K RB size (the default is 2K)</div><div class='add'>+ * @IWL_PRPH_SCRATCH_RB_SIZE_4K: Use 4K RB size (the default is 2K)</div><div class='ctx'>  * @IWL_PRPH_SCRATCH_MTR_MODE: format used for completion - 0: for</div><div class='ctx'>  *	completion descriptor, 1 for responses (legacy)</div><div class='ctx'>  * @IWL_PRPH_SCRATCH_MTR_FORMAT: a mask for the size of the tfd.</div><div class='hunk'>@@ -53,8 +56,12 @@ enum iwl_prph_scratch_mtr_format {</div><div class='ctx'>  * @IWL_PRPH_SCRATCH_RB_SIZE_EXT_8K: 8kB RB size</div><div class='ctx'>  * @IWL_PRPH_SCRATCH_RB_SIZE_EXT_12K: 12kB RB size</div><div class='ctx'>  * @IWL_PRPH_SCRATCH_RB_SIZE_EXT_16K: 16kB RB size</div><div class='add'>+ * @IWL_PRPH_SCRATCH_SCU_FORCE_ACTIVE: Indicate fw to set SCU_FORCE_ACTIVE</div><div class='add'>+ *	upon reset.</div><div class='add'>+ * @IWL_PRPH_SCRATCH_TOP_RESET: request TOP reset</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_prph_scratch_flags {</div><div class='add'>+	IWL_PRPH_SCRATCH_IMR_DEBUG_EN		= BIT(1),</div><div class='ctx'> 	IWL_PRPH_SCRATCH_EARLY_DEBUG_EN		= BIT(4),</div><div class='ctx'> 	IWL_PRPH_SCRATCH_EDBG_DEST_DRAM		= BIT(8),</div><div class='ctx'> 	IWL_PRPH_SCRATCH_EDBG_DEST_INTERNAL	= BIT(9),</div><div class='hunk'>@@ -67,9 +74,25 @@ enum iwl_prph_scratch_flags {</div><div class='ctx'> 	IWL_PRPH_SCRATCH_RB_SIZE_EXT_8K		= 8 &lt;&lt; 20,</div><div class='ctx'> 	IWL_PRPH_SCRATCH_RB_SIZE_EXT_12K	= 9 &lt;&lt; 20,</div><div class='ctx'> 	IWL_PRPH_SCRATCH_RB_SIZE_EXT_16K	= 10 &lt;&lt; 20,</div><div class='add'>+	IWL_PRPH_SCRATCH_SCU_FORCE_ACTIVE	= BIT(29),</div><div class='add'>+	IWL_PRPH_SCRATCH_TOP_RESET		= BIT(30),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='add'>+ * enum iwl_prph_scratch_ext_flags - PRPH scratch control ext flags</div><div class='add'>+ * @IWL_PRPH_SCRATCH_EXT_EXT_FSEQ: external FSEQ image provided</div><div class='add'>+ * @IWL_PRPH_SCRATCH_EXT_URM_FW: switch to URM mode based on fw setting</div><div class='add'>+ * @IWL_PRPH_SCRATCH_EXT_URM_PERM: switch to permanent URM mode</div><div class='add'>+ * @IWL_PRPH_SCRATCH_EXT_32KHZ_CLK_VALID: use external 32 KHz clock</div><div class='add'>+ */</div><div class='add'>+enum iwl_prph_scratch_ext_flags {</div><div class='add'>+	IWL_PRPH_SCRATCH_EXT_EXT_FSEQ		= BIT(0),</div><div class='add'>+	IWL_PRPH_SCRATCH_EXT_URM_FW		= BIT(4),</div><div class='add'>+	IWL_PRPH_SCRATCH_EXT_URM_PERM		= BIT(5),</div><div class='add'>+	IWL_PRPH_SCRATCH_EXT_32KHZ_CLK_VALID	= BIT(8),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_prph_scratch_version - version structure</div><div class='ctx'>  * @mac_id: SKU and revision id</div><div class='ctx'>  * @version: prph scratch information version id</div><div class='hunk'>@@ -83,20 +106,21 @@ struct iwl_prph_scratch_version {</div><div class='ctx'> 	__le16 reserved;</div><div class='ctx'> } __packed; /* PERIPH_SCRATCH_VERSION_S */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_prph_scratch_control - control structure</div><div class='ctx'>  * @control_flags: context information flags see &amp;enum iwl_prph_scratch_flags</div><div class='del'>- * @reserved: reserved</div><div class='add'>+ * @control_flags_ext: context information for extended flags,</div><div class='add'>+ *	see &amp;enum iwl_prph_scratch_ext_flags</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_prph_scratch_control {</div><div class='ctx'> 	__le32 control_flags;</div><div class='del'>-	__le32 reserved;</div><div class='add'>+	__le32 control_flags_ext;</div><div class='ctx'> } __packed; /* PERIPH_SCRATCH_CONTROL_S */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * struct iwl_prph_scratch_pnvm_cfg - ror config</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_prph_scratch_pnvm_cfg - PNVM scratch</div><div class='ctx'>  * @pnvm_base_addr: PNVM start address</div><div class='del'>- * @pnvm_size: PNVM size in DWs</div><div class='add'>+ * @pnvm_size: the size of the PNVM image in bytes</div><div class='ctx'>  * @reserved: reserved</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_prph_scratch_pnvm_cfg {</div><div class='hunk'>@@ -105,19 +129,28 @@ struct iwl_prph_scratch_pnvm_cfg {</div><div class='ctx'> 	__le32 reserved;</div><div class='ctx'> } __packed; /* PERIPH_SCRATCH_PNVM_CFG_S */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_prph_scratch_mem_desc_addr_array - DRAM</div><div class='add'>+ * @mem_descs: array of dram addresses.</div><div class='add'>+ * Each address is the beginning of a PNVM payload.</div><div class='add'>+ */</div><div class='add'>+struct iwl_prph_scratch_mem_desc_addr_array {</div><div class='add'>+	__le64 mem_descs[IPC_DRAM_MAP_ENTRY_NUM_MAX];</div><div class='add'>+} __packed; /* PERIPH_SCRATCH_MEM_DESC_ADDR_ARRAY_S_VER_1 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_prph_scratch_hwm_cfg - hwm config</div><div class='ctx'>  * @hwm_base_addr: hwm start address</div><div class='ctx'>  * @hwm_size: hwm size in DWs</div><div class='del'>- * @reserved: reserved</div><div class='add'>+ * @debug_token_config: debug preset</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_prph_scratch_hwm_cfg {</div><div class='ctx'> 	__le64 hwm_base_addr;</div><div class='ctx'> 	__le32 hwm_size;</div><div class='del'>-	__le32 reserved;</div><div class='add'>+	__le32 debug_token_config;</div><div class='ctx'> } __packed; /* PERIPH_SCRATCH_HWM_CFG_S */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_prph_scratch_rbd_cfg - RBDs configuration</div><div class='ctx'>  * @free_rbd_addr: default queue free RB CB base address</div><div class='ctx'>  * @reserved: reserved</div><div class='hunk'>@@ -127,13 +160,41 @@ struct iwl_prph_scratch_rbd_cfg {</div><div class='ctx'> 	__le32 reserved;</div><div class='ctx'> } __packed; /* PERIPH_SCRATCH_RBD_CFG_S */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_prph_scratch_uefi_cfg - prph scratch reduce power table</div><div class='add'>+ * @base_addr: reduce power table address</div><div class='add'>+ * @size: the size of the entire power table image</div><div class='add'>+ * @reserved: (reserved)</div><div class='add'>+ */</div><div class='add'>+struct iwl_prph_scratch_uefi_cfg {</div><div class='add'>+	__le64 base_addr;</div><div class='add'>+	__le32 size;</div><div class='add'>+	__le32 reserved;</div><div class='add'>+} __packed; /* PERIPH_SCRATCH_UEFI_CFG_S */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_prph_scratch_step_cfg - prph scratch step configuration</div><div class='add'>+ * @mbx_addr_0: [0:7] revision,</div><div class='add'>+ *		[8:15] cnvi_to_cnvr length,</div><div class='add'>+ *		[16:23] cnvr_to_cnvi channel length,</div><div class='add'>+ *		[24:31] radio1 reserved</div><div class='add'>+ * @mbx_addr_1: [0:7] radio2 reserved</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct iwl_prph_scratch_step_cfg {</div><div class='add'>+	__le32 mbx_addr_0;</div><div class='add'>+	__le32 mbx_addr_1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_prph_scratch_ctrl_cfg - prph scratch ctrl and config</div><div class='ctx'>  * @version: version information of context info and HW</div><div class='ctx'>  * @control: control flags of FH configurations</div><div class='ctx'>  * @pnvm_cfg: ror configuration</div><div class='ctx'>  * @hwm_cfg: hwm configuration</div><div class='ctx'>  * @rbd_cfg: default RX queue configuration</div><div class='add'>+ * @reduce_power_cfg: UEFI power reduction table</div><div class='add'>+ * @step_cfg: step configuration</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_prph_scratch_ctrl_cfg {</div><div class='ctx'> 	struct iwl_prph_scratch_version version;</div><div class='hunk'>@@ -141,21 +202,40 @@ struct iwl_prph_scratch_ctrl_cfg {</div><div class='ctx'> 	struct iwl_prph_scratch_pnvm_cfg pnvm_cfg;</div><div class='ctx'> 	struct iwl_prph_scratch_hwm_cfg hwm_cfg;</div><div class='ctx'> 	struct iwl_prph_scratch_rbd_cfg rbd_cfg;</div><div class='add'>+	struct iwl_prph_scratch_uefi_cfg reduce_power_cfg;</div><div class='add'>+	struct iwl_prph_scratch_step_cfg step_cfg;</div><div class='ctx'> } __packed; /* PERIPH_SCRATCH_CTRL_CFG_S */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+#define IWL_NUM_DRAM_FSEQ_ENTRIES	8</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_context_info_dram_fseq - images DRAM map (with fseq)</div><div class='add'>+ * each entry in the map represents a DRAM chunk of up to 32 KB</div><div class='add'>+ * @common: UMAC/LMAC/virtual images</div><div class='add'>+ * @fseq_img: FSEQ image DRAM map</div><div class='add'>+ */</div><div class='add'>+struct iwl_context_info_dram_fseq {</div><div class='add'>+	struct iwl_context_info_dram_nonfseq common;</div><div class='add'>+	__le64 fseq_img[IWL_NUM_DRAM_FSEQ_ENTRIES];</div><div class='add'>+} __packed; /* PERIPH_SCRATCH_DRAM_MAP_S */</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_prph_scratch - peripheral scratch mapping</div><div class='ctx'>  * @ctrl_cfg: control and configuration of prph scratch</div><div class='ctx'>  * @dram: firmware images addresses in DRAM</div><div class='add'>+ * @fseq_override: FSEQ override parameters</div><div class='add'>+ * @step_analog_params: STEP analog calibration values</div><div class='ctx'>  * @reserved: reserved</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_prph_scratch {</div><div class='ctx'> 	struct iwl_prph_scratch_ctrl_cfg ctrl_cfg;</div><div class='del'>-	__le32 reserved[16];</div><div class='del'>-	struct iwl_context_info_dram dram;</div><div class='add'>+	__le32 fseq_override;</div><div class='add'>+	__le32 step_analog_params;</div><div class='add'>+	__le32 reserved[8];</div><div class='add'>+	struct iwl_context_info_dram_fseq dram;</div><div class='ctx'> } __packed; /* PERIPH_SCRATCH_S */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_prph_info - peripheral information</div><div class='ctx'>  * @boot_stage_mirror: reflects the value in the Boot Stage CSR register</div><div class='ctx'>  * @ipc_status_mirror: reflects the value in the IPC Status CSR register</div><div class='hunk'>@@ -169,8 +249,8 @@ struct iwl_prph_info {</div><div class='ctx'> 	__le32 reserved;</div><div class='ctx'> } __packed; /* PERIPH_INFO_S */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * struct iwl_context_info_gen3 - device INIT configuration</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_context_info_v2 - device INIT configuration</div><div class='ctx'>  * @version: version of the context information</div><div class='ctx'>  * @size: size of context information in DWs</div><div class='ctx'>  * @config: context in which the peripheral would execute - a subset of</div><div class='hunk'>@@ -213,7 +293,7 @@ struct iwl_prph_info {</div><div class='ctx'>  * @prph_scratch_size: the size of the peripheral scratch structure in DWs</div><div class='ctx'>  * @reserved: reserved</div><div class='ctx'>  */</div><div class='del'>-struct iwl_context_info_gen3 {</div><div class='add'>+struct iwl_context_info_v2 {</div><div class='ctx'> 	__le16 version;</div><div class='ctx'> 	__le16 size;</div><div class='ctx'> 	__le32 config;</div><div class='hunk'>@@ -243,11 +323,22 @@ struct iwl_context_info_gen3 {</div><div class='ctx'> 	__le32 reserved;</div><div class='ctx'> } __packed; /* IPC_CONTEXT_INFO_S */</div><div class='ctx'> </div><div class='del'>-int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans,</div><div class='del'>-				 const struct fw_img *fw);</div><div class='del'>-void iwl_pcie_ctxt_info_gen3_free(struct iwl_trans *trans);</div><div class='del'>-</div><div class='del'>-int iwl_trans_pcie_ctx_info_gen3_set_pnvm(struct iwl_trans *trans,</div><div class='del'>-					  const void *data, u32 len);</div><div class='add'>+int iwl_pcie_ctxt_info_v2_alloc(struct iwl_trans *trans,</div><div class='add'>+				const struct iwl_fw *fw,</div><div class='add'>+				const struct fw_img *img);</div><div class='add'>+void iwl_pcie_ctxt_info_v2_kick(struct iwl_trans *trans);</div><div class='add'>+void iwl_pcie_ctxt_info_v2_free(struct iwl_trans *trans, bool alive);</div><div class='ctx'> </div><div class='del'>-#endif /* __iwl_context_info_file_gen3_h__ */</div><div class='add'>+int iwl_trans_pcie_ctx_info_v2_load_pnvm(struct iwl_trans *trans,</div><div class='add'>+					 const struct iwl_pnvm_image *pnvm_payloads,</div><div class='add'>+					 const struct iwl_ucode_capabilities *capa);</div><div class='add'>+void iwl_trans_pcie_ctx_info_v2_set_pnvm(struct iwl_trans *trans,</div><div class='add'>+					 const struct iwl_ucode_capabilities *capa);</div><div class='add'>+int</div><div class='add'>+iwl_trans_pcie_ctx_info_v2_load_reduce_power(struct iwl_trans *trans,</div><div class='add'>+					     const struct iwl_pnvm_image *payloads,</div><div class='add'>+					     const struct iwl_ucode_capabilities *capa);</div><div class='add'>+void</div><div class='add'>+iwl_trans_pcie_ctx_info_v2_set_reduce_power(struct iwl_trans *trans,</div><div class='add'>+					    const struct iwl_ucode_capabilities *capa);</div><div class='add'>+#endif /* __iwl_context_info_file_v2_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-context-info.h b/drivers/net/wireless/intel/iwlwifi/pcie/iwl-context-info.h<br/>index 4354d5acac9f..7ae0fbdef208 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/iwl-context-info.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/iwl-context-info.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/iwl-context-info.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/pcie/iwl-context-info.h</a></div><div class='hunk'>@@ -1,12 +1,12 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2018-2020 Intel Corporation</div><div class='add'>+ * Copyright (C) 2018-2020, 2022, 2024-2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __iwl_context_info_file_h__</div><div class='ctx'> #define __iwl_context_info_file_h__</div><div class='ctx'> </div><div class='del'>-/* maximmum number of DRAM map entries supported by FW */</div><div class='add'>+/* maximum number of DRAM map entries supported by FW */</div><div class='ctx'> #define IWL_MAX_DRAM_ENTRY	64</div><div class='ctx'> #define CSR_CTXT_INFO_BA	0x40</div><div class='ctx'> </div><div class='hunk'>@@ -53,11 +53,12 @@ enum iwl_context_info_flags {</div><div class='ctx'> 	IWL_CTXT_INFO_RB_SIZE_32K	= 0xe,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_context_info_version - version structure</div><div class='ctx'>  * @mac_id: SKU and revision id</div><div class='ctx'>  * @version: context information version id</div><div class='ctx'>  * @size: the size of the context information in DWs</div><div class='add'>+ * @reserved: (reserved)</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_context_info_version {</div><div class='ctx'> 	__le16 mac_id;</div><div class='hunk'>@@ -66,29 +67,30 @@ struct iwl_context_info_version {</div><div class='ctx'> 	__le16 reserved;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_context_info_control - version structure</div><div class='ctx'>  * @control_flags: context information flags see &amp;enum iwl_context_info_flags</div><div class='add'>+ * @reserved: (reserved)</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_context_info_control {</div><div class='ctx'> 	__le32 control_flags;</div><div class='ctx'> 	__le32 reserved;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * struct iwl_context_info_dram - images DRAM map</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_context_info_dram_nonfseq - images DRAM map</div><div class='ctx'>  * each entry in the map represents a DRAM chunk of up to 32 KB</div><div class='ctx'>  * @umac_img: UMAC image DRAM map</div><div class='ctx'>  * @lmac_img: LMAC image DRAM map</div><div class='ctx'>  * @virtual_img: paged image DRAM map</div><div class='ctx'>  */</div><div class='del'>-struct iwl_context_info_dram {</div><div class='add'>+struct iwl_context_info_dram_nonfseq {</div><div class='ctx'> 	__le64 umac_img[IWL_MAX_DRAM_ENTRY];</div><div class='ctx'> 	__le64 lmac_img[IWL_MAX_DRAM_ENTRY];</div><div class='ctx'> 	__le64 virtual_img[IWL_MAX_DRAM_ENTRY];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_context_info_rbd_cfg - RBDs configuration</div><div class='ctx'>  * @free_rbd_addr: default queue free RB CB base address</div><div class='ctx'>  * @used_rbd_addr: default queue used RB CB base address</div><div class='hunk'>@@ -100,10 +102,11 @@ struct iwl_context_info_rbd_cfg {</div><div class='ctx'> 	__le64 status_wr_ptr;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_context_info_hcmd_cfg  - command queue configuration</div><div class='ctx'>  * @cmd_queue_addr: address of command queue</div><div class='ctx'>  * @cmd_queue_size: number of entries</div><div class='add'>+ * @reserved: (reserved)</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_context_info_hcmd_cfg {</div><div class='ctx'> 	__le64 cmd_queue_addr;</div><div class='hunk'>@@ -111,10 +114,11 @@ struct iwl_context_info_hcmd_cfg {</div><div class='ctx'> 	u8 reserved[7];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_context_info_dump_cfg - Core Dump configuration</div><div class='ctx'>  * @core_dump_addr: core dump (debug DRAM address) start address</div><div class='ctx'>  * @core_dump_size: size, in DWs</div><div class='add'>+ * @reserved: (reserved)</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_context_info_dump_cfg {</div><div class='ctx'> 	__le64 core_dump_addr;</div><div class='hunk'>@@ -122,10 +126,11 @@ struct iwl_context_info_dump_cfg {</div><div class='ctx'> 	__le32 reserved;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_context_info_pnvm_cfg - platform NVM data configuration</div><div class='ctx'>  * @platform_nvm_addr: Platform NVM data start address</div><div class='ctx'>  * @platform_nvm_size: size in DWs</div><div class='add'>+ * @reserved: (reserved)</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_context_info_pnvm_cfg {</div><div class='ctx'> 	__le64 platform_nvm_addr;</div><div class='hunk'>@@ -133,11 +138,12 @@ struct iwl_context_info_pnvm_cfg {</div><div class='ctx'> 	__le32 reserved;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_context_info_early_dbg_cfg - early debug configuration for</div><div class='ctx'>  *	dumping DRAM addresses</div><div class='ctx'>  * @early_debug_addr: early debug start address</div><div class='ctx'>  * @early_debug_size: size in DWs</div><div class='add'>+ * @reserved: (reserved)</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_context_info_early_dbg_cfg {</div><div class='ctx'> 	__le64 early_debug_addr;</div><div class='hunk'>@@ -145,16 +151,20 @@ struct iwl_context_info_early_dbg_cfg {</div><div class='ctx'> 	__le32 reserved;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='ctx'>  * struct iwl_context_info - device INIT configuration</div><div class='ctx'>  * @version: version information of context info and HW</div><div class='ctx'>  * @control: control flags of FH configurations</div><div class='add'>+ * @reserved0: (reserved)</div><div class='ctx'>  * @rbd_cfg: default RX queue configuration</div><div class='ctx'>  * @hcmd_cfg: command queue configuration</div><div class='add'>+ * @reserved1: (reserved)</div><div class='ctx'>  * @dump_cfg: core dump data</div><div class='ctx'>  * @edbg_cfg: early debug configuration</div><div class='ctx'>  * @pnvm_cfg: platform nvm configuration</div><div class='add'>+ * @reserved2: (reserved)</div><div class='ctx'>  * @dram: firmware image addresses in DRAM</div><div class='add'>+ * @reserved3: (reserved)</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_context_info {</div><div class='ctx'> 	struct iwl_context_info_version version;</div><div class='hunk'>@@ -167,16 +177,19 @@ struct iwl_context_info {</div><div class='ctx'> 	struct iwl_context_info_early_dbg_cfg edbg_cfg;</div><div class='ctx'> 	struct iwl_context_info_pnvm_cfg pnvm_cfg;</div><div class='ctx'> 	__le32 reserved2[16];</div><div class='del'>-	struct iwl_context_info_dram dram;</div><div class='add'>+	struct iwl_context_info_dram_nonfseq dram;</div><div class='ctx'> 	__le32 reserved3[16];</div><div class='del'>-} __packed;</div><div class='add'>+} __packed; /* BOOT_LOADER_CONTEXT_INFO_S */</div><div class='ctx'> </div><div class='del'>-int iwl_pcie_ctxt_info_init(struct iwl_trans *trans, const struct fw_img *fw);</div><div class='add'>+int iwl_pcie_ctxt_info_init(struct iwl_trans *trans, const struct fw_img *img);</div><div class='ctx'> void iwl_pcie_ctxt_info_free(struct iwl_trans *trans);</div><div class='ctx'> void iwl_pcie_ctxt_info_free_paging(struct iwl_trans *trans);</div><div class='ctx'> int iwl_pcie_init_fw_sec(struct iwl_trans *trans,</div><div class='ctx'> 			 const struct fw_img *fw,</div><div class='del'>-			 struct iwl_context_info_dram *ctxt_dram);</div><div class='add'>+			 struct iwl_context_info_dram_nonfseq *ctxt_dram);</div><div class='add'>+void *iwl_pcie_ctxt_info_dma_alloc_coherent(struct iwl_trans *trans,</div><div class='add'>+					    size_t size,</div><div class='add'>+					    dma_addr_t *phys);</div><div class='ctx'> int iwl_pcie_ctxt_info_alloc_dma(struct iwl_trans *trans,</div><div class='ctx'> 				 const void *data, u32 len,</div><div class='ctx'> 				 struct iwl_dram_data *dram);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c<br/>deleted file mode 100644<br/>index 1bcd36e9e008..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,378 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2018-2021 Intel Corporation</div><div class='del'>- */</div><div class='del'>-#include "iwl-trans.h"</div><div class='del'>-#include "iwl-prph.h"</div><div class='del'>-#include "iwl-context-info.h"</div><div class='del'>-#include "iwl-context-info-gen3.h"</div><div class='del'>-#include "internal.h"</div><div class='del'>-#include "fw/dbg.h"</div><div class='del'>-</div><div class='del'>-#define FW_RESET_TIMEOUT (HZ / 5)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Start up NIC's basic functionality after it has been reset</div><div class='del'>- * (e.g. after platform boot, or shutdown via iwl_pcie_apm_stop())</div><div class='del'>- * NOTE:  This does not load uCode nor start the embedded processor</div><div class='del'>- */</div><div class='del'>-int iwl_pcie_gen2_apm_init(struct iwl_trans *trans)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(trans, "Init card's basic functions\n");</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Use "set_bit" below rather than "write", to preserve any hardware</div><div class='del'>-	 * bits already set by default after reset.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Disable L0s without affecting L1;</div><div class='del'>-	 * don't wait for ICH L0s (ICH bug W/A)</div><div class='del'>-	 */</div><div class='del'>-	iwl_set_bit(trans, CSR_GIO_CHICKEN_BITS,</div><div class='del'>-		    CSR_GIO_CHICKEN_BITS_REG_BIT_L1A_NO_L0S_RX);</div><div class='del'>-</div><div class='del'>-	/* Set FH wait threshold to maximum (HW error during stress W/A) */</div><div class='del'>-	iwl_set_bit(trans, CSR_DBG_HPET_MEM_REG, CSR_DBG_HPET_MEM_REG_VAL);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Enable HAP INTA (interrupt from management bus) to</div><div class='del'>-	 * wake device's PCI Express link L1a -&gt; L0s</div><div class='del'>-	 */</div><div class='del'>-	iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-		    CSR_HW_IF_CONFIG_REG_BIT_HAP_WAKE_L1A);</div><div class='del'>-</div><div class='del'>-	iwl_pcie_apm_config(trans);</div><div class='del'>-</div><div class='del'>-	ret = iwl_finish_nic_init(trans, trans-&gt;trans_cfg);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	set_bit(STATUS_DEVICE_ENABLED, &amp;trans-&gt;status);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl_pcie_gen2_apm_stop(struct iwl_trans *trans, bool op_mode_leave)</div><div class='del'>-{</div><div class='del'>-	IWL_DEBUG_INFO(trans, "Stop card, put in low power state\n");</div><div class='del'>-</div><div class='del'>-	if (op_mode_leave) {</div><div class='del'>-		if (!test_bit(STATUS_DEVICE_ENABLED, &amp;trans-&gt;status))</div><div class='del'>-			iwl_pcie_gen2_apm_init(trans);</div><div class='del'>-</div><div class='del'>-		/* inform ME that we are leaving */</div><div class='del'>-		iwl_set_bit(trans, CSR_DBG_LINK_PWR_MGMT_REG,</div><div class='del'>-			    CSR_RESET_LINK_PWR_MGMT_DISABLED);</div><div class='del'>-		iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-			    CSR_HW_IF_CONFIG_REG_PREPARE |</div><div class='del'>-			    CSR_HW_IF_CONFIG_REG_ENABLE_PME);</div><div class='del'>-		mdelay(1);</div><div class='del'>-		iwl_clear_bit(trans, CSR_DBG_LINK_PWR_MGMT_REG,</div><div class='del'>-			      CSR_RESET_LINK_PWR_MGMT_DISABLED);</div><div class='del'>-		mdelay(5);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	clear_bit(STATUS_DEVICE_ENABLED, &amp;trans-&gt;status);</div><div class='del'>-</div><div class='del'>-	/* Stop device's DMA activity */</div><div class='del'>-	iwl_pcie_apm_stop_master(trans);</div><div class='del'>-</div><div class='del'>-	iwl_trans_sw_reset(trans);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Clear "initialization complete" bit to move adapter from</div><div class='del'>-	 * D0A* (powered-up Active) --&gt; D0U* (Uninitialized) state.</div><div class='del'>-	 */</div><div class='del'>-	iwl_clear_bit(trans, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl_trans_pcie_fw_reset_handshake(struct iwl_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	trans_pcie-&gt;fw_reset_done = false;</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210)</div><div class='del'>-		iwl_write_umac_prph(trans, UREG_NIC_SET_NMI_DRIVER,</div><div class='del'>-				    UREG_NIC_SET_NMI_DRIVER_RESET_HANDSHAKE);</div><div class='del'>-	else</div><div class='del'>-		iwl_write_umac_prph(trans, UREG_DOORBELL_TO_ISR6,</div><div class='del'>-				    UREG_DOORBELL_TO_ISR6_RESET_HANDSHAKE);</div><div class='del'>-</div><div class='del'>-	/* wait 200ms */</div><div class='del'>-	ret = wait_event_timeout(trans_pcie-&gt;fw_reset_waitq,</div><div class='del'>-				 trans_pcie-&gt;fw_reset_done, FW_RESET_TIMEOUT);</div><div class='del'>-	if (!ret)</div><div class='del'>-		IWL_INFO(trans,</div><div class='del'>-			 "firmware didn't ACK the reset - continue anyway\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;trans_pcie-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (trans_pcie-&gt;is_down)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (trans_pcie-&gt;fw_reset_handshake &amp;&amp;</div><div class='del'>-	    trans-&gt;state &gt;= IWL_TRANS_FW_STARTED)</div><div class='del'>-		iwl_trans_pcie_fw_reset_handshake(trans);</div><div class='del'>-</div><div class='del'>-	trans_pcie-&gt;is_down = true;</div><div class='del'>-</div><div class='del'>-	/* tell the device to stop sending interrupts */</div><div class='del'>-	iwl_disable_interrupts(trans);</div><div class='del'>-</div><div class='del'>-	/* device going down, Stop using ICT table */</div><div class='del'>-	iwl_pcie_disable_ict(trans);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If a HW restart happens during firmware loading,</div><div class='del'>-	 * then the firmware loading might call this function</div><div class='del'>-	 * and later it might be called again due to the</div><div class='del'>-	 * restart. So don't process again if the device is</div><div class='del'>-	 * already dead.</div><div class='del'>-	 */</div><div class='del'>-	if (test_and_clear_bit(STATUS_DEVICE_ENABLED, &amp;trans-&gt;status)) {</div><div class='del'>-		IWL_DEBUG_INFO(trans,</div><div class='del'>-			       "DEVICE_ENABLED bit was set and is now cleared\n");</div><div class='del'>-		iwl_txq_gen2_tx_free(trans);</div><div class='del'>-		iwl_pcie_rx_stop(trans);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl_pcie_ctxt_info_free_paging(trans);</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='del'>-		iwl_pcie_ctxt_info_gen3_free(trans);</div><div class='del'>-	else</div><div class='del'>-		iwl_pcie_ctxt_info_free(trans);</div><div class='del'>-</div><div class='del'>-	/* Make sure (redundant) we've released our request to stay awake */</div><div class='del'>-	iwl_clear_bit(trans, CSR_GP_CNTRL,</div><div class='del'>-		      CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='del'>-</div><div class='del'>-	/* Stop the device, and put it in low power state */</div><div class='del'>-	iwl_pcie_gen2_apm_stop(trans, false);</div><div class='del'>-</div><div class='del'>-	iwl_trans_sw_reset(trans);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Upon stop, the IVAR table gets erased, so msi-x won't</div><div class='del'>-	 * work. This causes a bug in RF-KILL flows, since the interrupt</div><div class='del'>-	 * that enables radio won't fire on the correct irq, and the</div><div class='del'>-	 * driver won't be able to handle the interrupt.</div><div class='del'>-	 * Configure the IVAR table again after reset.</div><div class='del'>-	 */</div><div class='del'>-	iwl_pcie_conf_msix_hw(trans_pcie);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Upon stop, the APM issues an interrupt if HW RF kill is set.</div><div class='del'>-	 * This is a bug in certain verions of the hardware.</div><div class='del'>-	 * Certain devices also keep sending HW RF kill interrupt all</div><div class='del'>-	 * the time, unless the interrupt is ACKed even if the interrupt</div><div class='del'>-	 * should be masked. Re-ACK all the interrupts here.</div><div class='del'>-	 */</div><div class='del'>-	iwl_disable_interrupts(trans);</div><div class='del'>-</div><div class='del'>-	/* clear all status bits */</div><div class='del'>-	clear_bit(STATUS_SYNC_HCMD_ACTIVE, &amp;trans-&gt;status);</div><div class='del'>-	clear_bit(STATUS_INT_ENABLED, &amp;trans-&gt;status);</div><div class='del'>-	clear_bit(STATUS_TPOWER_PMI, &amp;trans-&gt;status);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Even if we stop the HW, we still want the RF kill</div><div class='del'>-	 * interrupt</div><div class='del'>-	 */</div><div class='del'>-	iwl_enable_rfkill_int(trans);</div><div class='del'>-</div><div class='del'>-	/* re-take ownership to prevent other users from stealing the device */</div><div class='del'>-	iwl_pcie_prepare_card_hw(trans);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-	bool was_in_rfkill;</div><div class='del'>-</div><div class='del'>-	iwl_op_mode_time_point(trans-&gt;op_mode,</div><div class='del'>-			       IWL_FW_INI_TIME_POINT_HOST_DEVICE_DISABLE,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;trans_pcie-&gt;mutex);</div><div class='del'>-	trans_pcie-&gt;opmode_down = true;</div><div class='del'>-	was_in_rfkill = test_bit(STATUS_RFKILL_OPMODE, &amp;trans-&gt;status);</div><div class='del'>-	_iwl_trans_pcie_gen2_stop_device(trans);</div><div class='del'>-	iwl_trans_pcie_handle_stop_rfkill(trans, was_in_rfkill);</div><div class='del'>-	mutex_unlock(&amp;trans_pcie-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl_pcie_gen2_nic_init(struct iwl_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-	int queue_size = max_t(u32, IWL_CMD_QUEUE_SIZE,</div><div class='del'>-			       trans-&gt;cfg-&gt;min_txq_size);</div><div class='del'>-</div><div class='del'>-	/* TODO: most of the logic can be removed in A0 - but not in Z0 */</div><div class='del'>-	spin_lock_bh(&amp;trans_pcie-&gt;irq_lock);</div><div class='del'>-	iwl_pcie_gen2_apm_init(trans);</div><div class='del'>-	spin_unlock_bh(&amp;trans_pcie-&gt;irq_lock);</div><div class='del'>-</div><div class='del'>-	iwl_op_mode_nic_config(trans-&gt;op_mode);</div><div class='del'>-</div><div class='del'>-	/* Allocate the RX queue, or reset if it is already allocated */</div><div class='del'>-	if (iwl_pcie_gen2_rx_init(trans))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* Allocate or reset and init all Tx and Command queues */</div><div class='del'>-	if (iwl_txq_gen2_init(trans, trans-&gt;txqs.cmd.q_id, queue_size))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* enable shadow regs in HW */</div><div class='del'>-	iwl_set_bit(trans, CSR_MAC_SHADOW_REG_CTRL, 0x800FFFFF);</div><div class='del'>-	IWL_DEBUG_INFO(trans, "Enabling shadow registers in device\n");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_trans_pcie_gen2_fw_alive(struct iwl_trans *trans, u32 scd_addr)</div><div class='del'>-{</div><div class='del'>-	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-</div><div class='del'>-	iwl_pcie_reset_ict(trans);</div><div class='del'>-</div><div class='del'>-	/* make sure all queue are not stopped/used */</div><div class='del'>-	memset(trans-&gt;txqs.queue_stopped, 0,</div><div class='del'>-	       sizeof(trans-&gt;txqs.queue_stopped));</div><div class='del'>-	memset(trans-&gt;txqs.queue_used, 0, sizeof(trans-&gt;txqs.queue_used));</div><div class='del'>-</div><div class='del'>-	/* now that we got alive we can free the fw image &amp; the context info.</div><div class='del'>-	 * paging memory cannot be freed included since FW will still use it</div><div class='del'>-	 */</div><div class='del'>-	iwl_pcie_ctxt_info_free(trans);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Re-enable all the interrupts, including the RF-Kill one, now that</div><div class='del'>-	 * the firmware is alive.</div><div class='del'>-	 */</div><div class='del'>-	iwl_enable_interrupts(trans);</div><div class='del'>-	mutex_lock(&amp;trans_pcie-&gt;mutex);</div><div class='del'>-	iwl_pcie_check_hw_rf_kill(trans);</div><div class='del'>-	mutex_unlock(&amp;trans_pcie-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl_pcie_set_ltr(struct iwl_trans *trans)</div><div class='del'>-{</div><div class='del'>-	u32 ltr_val = CSR_LTR_LONG_VAL_AD_NO_SNOOP_REQ |</div><div class='del'>-		      u32_encode_bits(CSR_LTR_LONG_VAL_AD_SCALE_USEC,</div><div class='del'>-				      CSR_LTR_LONG_VAL_AD_NO_SNOOP_SCALE) |</div><div class='del'>-		      u32_encode_bits(250,</div><div class='del'>-				      CSR_LTR_LONG_VAL_AD_NO_SNOOP_VAL) |</div><div class='del'>-		      CSR_LTR_LONG_VAL_AD_SNOOP_REQ |</div><div class='del'>-		      u32_encode_bits(CSR_LTR_LONG_VAL_AD_SCALE_USEC,</div><div class='del'>-				      CSR_LTR_LONG_VAL_AD_SNOOP_SCALE) |</div><div class='del'>-		      u32_encode_bits(250, CSR_LTR_LONG_VAL_AD_SNOOP_VAL);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * To workaround hardware latency issues during the boot process,</div><div class='del'>-	 * initialize the LTR to ~250 usec (see ltr_val above).</div><div class='del'>-	 * The firmware initializes this again later (to a smaller value).</div><div class='del'>-	 */</div><div class='del'>-	if ((trans-&gt;trans_cfg-&gt;device_family == IWL_DEVICE_FAMILY_AX210 ||</div><div class='del'>-	     trans-&gt;trans_cfg-&gt;device_family == IWL_DEVICE_FAMILY_22000) &amp;&amp;</div><div class='del'>-	    !trans-&gt;trans_cfg-&gt;integrated) {</div><div class='del'>-		iwl_write32(trans, CSR_LTR_LONG_VAL_AD, ltr_val);</div><div class='del'>-	} else if (trans-&gt;trans_cfg-&gt;integrated &amp;&amp;</div><div class='del'>-		   trans-&gt;trans_cfg-&gt;device_family == IWL_DEVICE_FAMILY_22000) {</div><div class='del'>-		iwl_write_prph(trans, HPM_MAC_LTR_CSR, HPM_MAC_LRT_ENABLE_ALL);</div><div class='del'>-		iwl_write_prph(trans, HPM_UMAC_LTR, ltr_val);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl_trans_pcie_gen2_start_fw(struct iwl_trans *trans,</div><div class='del'>-				 const struct fw_img *fw, bool run_in_rfkill)</div><div class='del'>-{</div><div class='del'>-	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-	bool hw_rfkill;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* This may fail if AMT took ownership of the device */</div><div class='del'>-	if (iwl_pcie_prepare_card_hw(trans)) {</div><div class='del'>-		IWL_WARN(trans, "Exit HW not ready\n");</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl_enable_rfkill_int(trans);</div><div class='del'>-</div><div class='del'>-	iwl_write32(trans, CSR_INT, 0xFFFFFFFF);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We enabled the RF-Kill interrupt and the handler may very</div><div class='del'>-	 * well be running. Disable the interrupts to make sure no other</div><div class='del'>-	 * interrupt can be fired.</div><div class='del'>-	 */</div><div class='del'>-	iwl_disable_interrupts(trans);</div><div class='del'>-</div><div class='del'>-	/* Make sure it finished running */</div><div class='del'>-	iwl_pcie_synchronize_irqs(trans);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;trans_pcie-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	/* If platform's RF_KILL switch is NOT set to KILL */</div><div class='del'>-	hw_rfkill = iwl_pcie_check_hw_rf_kill(trans);</div><div class='del'>-	if (hw_rfkill &amp;&amp; !run_in_rfkill) {</div><div class='del'>-		ret = -ERFKILL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Someone called stop_device, don't try to start_fw */</div><div class='del'>-	if (trans_pcie-&gt;is_down) {</div><div class='del'>-		IWL_WARN(trans,</div><div class='del'>-			 "Can't start_fw since the HW hasn't been started\n");</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* make sure rfkill handshake bits are cleared */</div><div class='del'>-	iwl_write32(trans, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);</div><div class='del'>-	iwl_write32(trans, CSR_UCODE_DRV_GP1_CLR,</div><div class='del'>-		    CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);</div><div class='del'>-</div><div class='del'>-	/* clear (again), then enable host interrupts */</div><div class='del'>-	iwl_write32(trans, CSR_INT, 0xFFFFFFFF);</div><div class='del'>-</div><div class='del'>-	ret = iwl_pcie_gen2_nic_init(trans);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(trans, "Unable to init nic\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='del'>-		ret = iwl_pcie_ctxt_info_gen3_init(trans, fw);</div><div class='del'>-	else</div><div class='del'>-		ret = iwl_pcie_ctxt_info_init(trans, fw);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	iwl_pcie_set_ltr(trans);</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210)</div><div class='del'>-		iwl_write_umac_prph(trans, UREG_CPU_INIT_RUN, 1);</div><div class='del'>-	else</div><div class='del'>-		iwl_write_prph(trans, UREG_CPU_INIT_RUN, 1);</div><div class='del'>-</div><div class='del'>-	/* re-check RF-Kill state since we may have missed the interrupt */</div><div class='del'>-	hw_rfkill = iwl_pcie_check_hw_rf_kill(trans);</div><div class='del'>-	if (hw_rfkill &amp;&amp; !run_in_rfkill)</div><div class='del'>-		ret = -ERFKILL;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;trans_pcie-&gt;mutex);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c<br/>deleted file mode 100644<br/>index 34bde8c87324..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,259 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (C) 2018-2020 Intel Corporation</div><div class='del'>- */</div><div class='del'>-#include &lt;net/tso.h&gt;</div><div class='del'>-#include &lt;linux/tcp.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-debug.h"</div><div class='del'>-#include "iwl-csr.h"</div><div class='del'>-#include "iwl-io.h"</div><div class='del'>-#include "internal.h"</div><div class='del'>-#include "fw/api/tx.h"</div><div class='del'>-#include "queue/tx.h"</div><div class='del'>-</div><div class='del'>-/*************** HOST COMMAND QUEUE FUNCTIONS   *****/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * iwl_pcie_gen2_enqueue_hcmd - enqueue a uCode command</div><div class='del'>- * @priv: device private data point</div><div class='del'>- * @cmd: a pointer to the ucode command structure</div><div class='del'>- *</div><div class='del'>- * The function returns &lt; 0 values to indicate the operation</div><div class='del'>- * failed. On success, it returns the index (&gt;= 0) of command in the</div><div class='del'>- * command queue.</div><div class='del'>- */</div><div class='del'>-int iwl_pcie_gen2_enqueue_hcmd(struct iwl_trans *trans,</div><div class='del'>-			       struct iwl_host_cmd *cmd)</div><div class='del'>-{</div><div class='del'>-	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-	struct iwl_txq *txq = trans-&gt;txqs.txq[trans-&gt;txqs.cmd.q_id];</div><div class='del'>-	struct iwl_device_cmd *out_cmd;</div><div class='del'>-	struct iwl_cmd_meta *out_meta;</div><div class='del'>-	void *dup_buf = NULL;</div><div class='del'>-	dma_addr_t phys_addr;</div><div class='del'>-	int i, cmd_pos, idx;</div><div class='del'>-	u16 copy_size, cmd_size, tb0_size;</div><div class='del'>-	bool had_nocopy = false;</div><div class='del'>-	u8 group_id = iwl_cmd_groupid(cmd-&gt;id);</div><div class='del'>-	const u8 *cmddata[IWL_MAX_CMD_TBS_PER_TFD];</div><div class='del'>-	u16 cmdlen[IWL_MAX_CMD_TBS_PER_TFD];</div><div class='del'>-	struct iwl_tfh_tfd *tfd;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	copy_size = sizeof(struct iwl_cmd_header_wide);</div><div class='del'>-	cmd_size = sizeof(struct iwl_cmd_header_wide);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; IWL_MAX_CMD_TBS_PER_TFD; i++) {</div><div class='del'>-		cmddata[i] = cmd-&gt;data[i];</div><div class='del'>-		cmdlen[i] = cmd-&gt;len[i];</div><div class='del'>-</div><div class='del'>-		if (!cmd-&gt;len[i])</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* need at least IWL_FIRST_TB_SIZE copied */</div><div class='del'>-		if (copy_size &lt; IWL_FIRST_TB_SIZE) {</div><div class='del'>-			int copy = IWL_FIRST_TB_SIZE - copy_size;</div><div class='del'>-</div><div class='del'>-			if (copy &gt; cmdlen[i])</div><div class='del'>-				copy = cmdlen[i];</div><div class='del'>-			cmdlen[i] -= copy;</div><div class='del'>-			cmddata[i] += copy;</div><div class='del'>-			copy_size += copy;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (cmd-&gt;dataflags[i] &amp; IWL_HCMD_DFL_NOCOPY) {</div><div class='del'>-			had_nocopy = true;</div><div class='del'>-			if (WARN_ON(cmd-&gt;dataflags[i] &amp; IWL_HCMD_DFL_DUP)) {</div><div class='del'>-				idx = -EINVAL;</div><div class='del'>-				goto free_dup_buf;</div><div class='del'>-			}</div><div class='del'>-		} else if (cmd-&gt;dataflags[i] &amp; IWL_HCMD_DFL_DUP) {</div><div class='del'>-			/*</div><div class='del'>-			 * This is also a chunk that isn't copied</div><div class='del'>-			 * to the static buffer so set had_nocopy.</div><div class='del'>-			 */</div><div class='del'>-			had_nocopy = true;</div><div class='del'>-</div><div class='del'>-			/* only allowed once */</div><div class='del'>-			if (WARN_ON(dup_buf)) {</div><div class='del'>-				idx = -EINVAL;</div><div class='del'>-				goto free_dup_buf;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			dup_buf = kmemdup(cmddata[i], cmdlen[i],</div><div class='del'>-					  GFP_ATOMIC);</div><div class='del'>-			if (!dup_buf)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-		} else {</div><div class='del'>-			/* NOCOPY must not be followed by normal! */</div><div class='del'>-			if (WARN_ON(had_nocopy)) {</div><div class='del'>-				idx = -EINVAL;</div><div class='del'>-				goto free_dup_buf;</div><div class='del'>-			}</div><div class='del'>-			copy_size += cmdlen[i];</div><div class='del'>-		}</div><div class='del'>-		cmd_size += cmd-&gt;len[i];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If any of the command structures end up being larger than the</div><div class='del'>-	 * TFD_MAX_PAYLOAD_SIZE and they aren't dynamically allocated into</div><div class='del'>-	 * separate TFDs, then we will need to increase the size of the buffers</div><div class='del'>-	 */</div><div class='del'>-	if (WARN(copy_size &gt; TFD_MAX_PAYLOAD_SIZE,</div><div class='del'>-		 "Command %s (%#x) is too large (%d bytes)\n",</div><div class='del'>-		 iwl_get_cmd_string(trans, cmd-&gt;id), cmd-&gt;id, copy_size)) {</div><div class='del'>-		idx = -EINVAL;</div><div class='del'>-		goto free_dup_buf;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;txq-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	idx = iwl_txq_get_cmd_index(txq, txq-&gt;write_ptr);</div><div class='del'>-	tfd = iwl_txq_get_tfd(trans, txq, txq-&gt;write_ptr);</div><div class='del'>-	memset(tfd, 0, sizeof(*tfd));</div><div class='del'>-</div><div class='del'>-	if (iwl_txq_space(trans, txq) &lt; ((cmd-&gt;flags &amp; CMD_ASYNC) ? 2 : 1)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;txq-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-		IWL_ERR(trans, "No space in command queue\n");</div><div class='del'>-		iwl_op_mode_cmd_queue_full(trans-&gt;op_mode);</div><div class='del'>-		idx = -ENOSPC;</div><div class='del'>-		goto free_dup_buf;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	out_cmd = txq-&gt;entries[idx].cmd;</div><div class='del'>-	out_meta = &amp;txq-&gt;entries[idx].meta;</div><div class='del'>-</div><div class='del'>-	/* re-initialize to NULL */</div><div class='del'>-	memset(out_meta, 0, sizeof(*out_meta));</div><div class='del'>-	if (cmd-&gt;flags &amp; CMD_WANT_SKB)</div><div class='del'>-		out_meta-&gt;source = cmd;</div><div class='del'>-</div><div class='del'>-	/* set up the header */</div><div class='del'>-	out_cmd-&gt;hdr_wide.cmd = iwl_cmd_opcode(cmd-&gt;id);</div><div class='del'>-	out_cmd-&gt;hdr_wide.group_id = group_id;</div><div class='del'>-	out_cmd-&gt;hdr_wide.version = iwl_cmd_version(cmd-&gt;id);</div><div class='del'>-	out_cmd-&gt;hdr_wide.length =</div><div class='del'>-		cpu_to_le16(cmd_size - sizeof(struct iwl_cmd_header_wide));</div><div class='del'>-	out_cmd-&gt;hdr_wide.reserved = 0;</div><div class='del'>-	out_cmd-&gt;hdr_wide.sequence =</div><div class='del'>-		cpu_to_le16(QUEUE_TO_SEQ(trans-&gt;txqs.cmd.q_id) |</div><div class='del'>-					 INDEX_TO_SEQ(txq-&gt;write_ptr));</div><div class='del'>-</div><div class='del'>-	cmd_pos = sizeof(struct iwl_cmd_header_wide);</div><div class='del'>-	copy_size = sizeof(struct iwl_cmd_header_wide);</div><div class='del'>-</div><div class='del'>-	/* and copy the data that needs to be copied */</div><div class='del'>-	for (i = 0; i &lt; IWL_MAX_CMD_TBS_PER_TFD; i++) {</div><div class='del'>-		int copy;</div><div class='del'>-</div><div class='del'>-		if (!cmd-&gt;len[i])</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* copy everything if not nocopy/dup */</div><div class='del'>-		if (!(cmd-&gt;dataflags[i] &amp; (IWL_HCMD_DFL_NOCOPY |</div><div class='del'>-					   IWL_HCMD_DFL_DUP))) {</div><div class='del'>-			copy = cmd-&gt;len[i];</div><div class='del'>-</div><div class='del'>-			memcpy((u8 *)out_cmd + cmd_pos, cmd-&gt;data[i], copy);</div><div class='del'>-			cmd_pos += copy;</div><div class='del'>-			copy_size += copy;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Otherwise we need at least IWL_FIRST_TB_SIZE copied</div><div class='del'>-		 * in total (for bi-directional DMA), but copy up to what</div><div class='del'>-		 * we can fit into the payload for debug dump purposes.</div><div class='del'>-		 */</div><div class='del'>-		copy = min_t(int, TFD_MAX_PAYLOAD_SIZE - cmd_pos, cmd-&gt;len[i]);</div><div class='del'>-</div><div class='del'>-		memcpy((u8 *)out_cmd + cmd_pos, cmd-&gt;data[i], copy);</div><div class='del'>-		cmd_pos += copy;</div><div class='del'>-</div><div class='del'>-		/* However, treat copy_size the proper way, we need it below */</div><div class='del'>-		if (copy_size &lt; IWL_FIRST_TB_SIZE) {</div><div class='del'>-			copy = IWL_FIRST_TB_SIZE - copy_size;</div><div class='del'>-</div><div class='del'>-			if (copy &gt; cmd-&gt;len[i])</div><div class='del'>-				copy = cmd-&gt;len[i];</div><div class='del'>-			copy_size += copy;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_HC(trans,</div><div class='del'>-		     "Sending command %s (%.2x.%.2x), seq: 0x%04X, %d bytes at %d[%d]:%d\n",</div><div class='del'>-		     iwl_get_cmd_string(trans, cmd-&gt;id), group_id,</div><div class='del'>-		     out_cmd-&gt;hdr.cmd, le16_to_cpu(out_cmd-&gt;hdr.sequence),</div><div class='del'>-		     cmd_size, txq-&gt;write_ptr, idx, trans-&gt;txqs.cmd.q_id);</div><div class='del'>-</div><div class='del'>-	/* start the TFD with the minimum copy bytes */</div><div class='del'>-	tb0_size = min_t(int, copy_size, IWL_FIRST_TB_SIZE);</div><div class='del'>-	memcpy(&amp;txq-&gt;first_tb_bufs[idx], out_cmd, tb0_size);</div><div class='del'>-	iwl_txq_gen2_set_tb(trans, tfd, iwl_txq_get_first_tb_dma(txq, idx),</div><div class='del'>-			    tb0_size);</div><div class='del'>-</div><div class='del'>-	/* map first command fragment, if any remains */</div><div class='del'>-	if (copy_size &gt; tb0_size) {</div><div class='del'>-		phys_addr = dma_map_single(trans-&gt;dev,</div><div class='del'>-					   (u8 *)out_cmd + tb0_size,</div><div class='del'>-					   copy_size - tb0_size,</div><div class='del'>-					   DMA_TO_DEVICE);</div><div class='del'>-		if (dma_mapping_error(trans-&gt;dev, phys_addr)) {</div><div class='del'>-			idx = -ENOMEM;</div><div class='del'>-			iwl_txq_gen2_tfd_unmap(trans, out_meta, tfd);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		iwl_txq_gen2_set_tb(trans, tfd, phys_addr,</div><div class='del'>-				    copy_size - tb0_size);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* map the remaining (adjusted) nocopy/dup fragments */</div><div class='del'>-	for (i = 0; i &lt; IWL_MAX_CMD_TBS_PER_TFD; i++) {</div><div class='del'>-		const void *data = cmddata[i];</div><div class='del'>-</div><div class='del'>-		if (!cmdlen[i])</div><div class='del'>-			continue;</div><div class='del'>-		if (!(cmd-&gt;dataflags[i] &amp; (IWL_HCMD_DFL_NOCOPY |</div><div class='del'>-					   IWL_HCMD_DFL_DUP)))</div><div class='del'>-			continue;</div><div class='del'>-		if (cmd-&gt;dataflags[i] &amp; IWL_HCMD_DFL_DUP)</div><div class='del'>-			data = dup_buf;</div><div class='del'>-		phys_addr = dma_map_single(trans-&gt;dev, (void *)data,</div><div class='del'>-					   cmdlen[i], DMA_TO_DEVICE);</div><div class='del'>-		if (dma_mapping_error(trans-&gt;dev, phys_addr)) {</div><div class='del'>-			idx = -ENOMEM;</div><div class='del'>-			iwl_txq_gen2_tfd_unmap(trans, out_meta, tfd);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		iwl_txq_gen2_set_tb(trans, tfd, phys_addr, cmdlen[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUILD_BUG_ON(IWL_TFH_NUM_TBS &gt; sizeof(out_meta-&gt;tbs) * BITS_PER_BYTE);</div><div class='del'>-	out_meta-&gt;flags = cmd-&gt;flags;</div><div class='del'>-	if (WARN_ON_ONCE(txq-&gt;entries[idx].free_buf))</div><div class='del'>-		kfree_sensitive(txq-&gt;entries[idx].free_buf);</div><div class='del'>-	txq-&gt;entries[idx].free_buf = dup_buf;</div><div class='del'>-</div><div class='del'>-	trace_iwlwifi_dev_hcmd(trans-&gt;dev, cmd, cmd_size, &amp;out_cmd-&gt;hdr_wide);</div><div class='del'>-</div><div class='del'>-	/* start timer if queue currently empty */</div><div class='del'>-	if (txq-&gt;read_ptr == txq-&gt;write_ptr &amp;&amp; txq-&gt;wd_timeout)</div><div class='del'>-		mod_timer(&amp;txq-&gt;stuck_timer, jiffies + txq-&gt;wd_timeout);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;trans_pcie-&gt;reg_lock);</div><div class='del'>-	/* Increment and update queue's write index */</div><div class='del'>-	txq-&gt;write_ptr = iwl_txq_inc_wrap(trans, txq-&gt;write_ptr);</div><div class='del'>-	iwl_txq_inc_wr_ptr(trans, txq);</div><div class='del'>-	spin_unlock(&amp;trans_pcie-&gt;reg_lock);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	spin_unlock_irqrestore(&amp;txq-&gt;lock, flags);</div><div class='del'>-free_dup_buf:</div><div class='del'>-	if (idx &lt; 0)</div><div class='del'>-		kfree(dup_buf);</div><div class='del'>-	return idx;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/utils.c b/drivers/net/wireless/intel/iwlwifi/pcie/utils.c<br/>new file mode 100644<br/>index 000000000000..1bb274d8390c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/utils.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/pcie/utils.c</a></div><div class='hunk'>@@ -0,0 +1,104 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/gfp.h&gt;</div><div class='add'>+</div><div class='add'>+#include "iwl-io.h"</div><div class='add'>+#include "pcie/utils.h"</div><div class='add'>+</div><div class='add'>+void iwl_trans_pcie_dump_regs(struct iwl_trans *trans, struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+#define PCI_DUMP_SIZE		352</div><div class='add'>+#define PCI_MEM_DUMP_SIZE	64</div><div class='add'>+#define PCI_PARENT_DUMP_SIZE	524</div><div class='add'>+#define PREFIX_LEN		32</div><div class='add'>+</div><div class='add'>+	static bool pcie_dbg_dumped_once = 0;</div><div class='add'>+	u32 i, pos, alloc_size, *ptr, *buf;</div><div class='add'>+	char *prefix;</div><div class='add'>+</div><div class='add'>+	if (pcie_dbg_dumped_once)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Should be a multiple of 4 */</div><div class='add'>+	BUILD_BUG_ON(PCI_DUMP_SIZE &gt; 4096 || PCI_DUMP_SIZE &amp; 0x3);</div><div class='add'>+	BUILD_BUG_ON(PCI_MEM_DUMP_SIZE &gt; 4096 || PCI_MEM_DUMP_SIZE &amp; 0x3);</div><div class='add'>+	BUILD_BUG_ON(PCI_PARENT_DUMP_SIZE &gt; 4096 || PCI_PARENT_DUMP_SIZE &amp; 0x3);</div><div class='add'>+</div><div class='add'>+	/* Alloc a max size buffer */</div><div class='add'>+	alloc_size = PCI_ERR_ROOT_ERR_SRC +  4 + PREFIX_LEN;</div><div class='add'>+	alloc_size = max_t(u32, alloc_size, PCI_DUMP_SIZE + PREFIX_LEN);</div><div class='add'>+	alloc_size = max_t(u32, alloc_size, PCI_MEM_DUMP_SIZE + PREFIX_LEN);</div><div class='add'>+	alloc_size = max_t(u32, alloc_size, PCI_PARENT_DUMP_SIZE + PREFIX_LEN);</div><div class='add'>+</div><div class='add'>+	buf = kmalloc(alloc_size, GFP_ATOMIC);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return;</div><div class='add'>+	prefix = (char *)buf + alloc_size - PREFIX_LEN;</div><div class='add'>+</div><div class='add'>+	IWL_ERR(trans, "iwlwifi transaction failed, dumping registers\n");</div><div class='add'>+</div><div class='add'>+	/* Print wifi device registers */</div><div class='add'>+	sprintf(prefix, "iwlwifi %s: ", pci_name(pdev));</div><div class='add'>+	IWL_ERR(trans, "iwlwifi device config registers:\n");</div><div class='add'>+	for (i = 0, ptr = buf; i &lt; PCI_DUMP_SIZE; i += 4, ptr++)</div><div class='add'>+		if (pci_read_config_dword(pdev, i, ptr))</div><div class='add'>+			goto err_read;</div><div class='add'>+	print_hex_dump(KERN_ERR, prefix, DUMP_PREFIX_OFFSET, 32, 4, buf, i, 0);</div><div class='add'>+</div><div class='add'>+	IWL_ERR(trans, "iwlwifi device memory mapped registers:\n");</div><div class='add'>+	for (i = 0, ptr = buf; i &lt; PCI_MEM_DUMP_SIZE; i += 4, ptr++)</div><div class='add'>+		*ptr = iwl_read32(trans, i);</div><div class='add'>+	print_hex_dump(KERN_ERR, prefix, DUMP_PREFIX_OFFSET, 32, 4, buf, i, 0);</div><div class='add'>+</div><div class='add'>+	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_ERR);</div><div class='add'>+	if (pos) {</div><div class='add'>+		IWL_ERR(trans, "iwlwifi device AER capability structure:\n");</div><div class='add'>+		for (i = 0, ptr = buf; i &lt; PCI_ERR_ROOT_COMMAND; i += 4, ptr++)</div><div class='add'>+			if (pci_read_config_dword(pdev, pos + i, ptr))</div><div class='add'>+				goto err_read;</div><div class='add'>+		print_hex_dump(KERN_ERR, prefix, DUMP_PREFIX_OFFSET,</div><div class='add'>+			       32, 4, buf, i, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Print parent device registers next */</div><div class='add'>+	if (!pdev-&gt;bus-&gt;self)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	pdev = pdev-&gt;bus-&gt;self;</div><div class='add'>+	sprintf(prefix, "iwlwifi %s: ", pci_name(pdev));</div><div class='add'>+</div><div class='add'>+	IWL_ERR(trans, "iwlwifi parent port (%s) config registers:\n",</div><div class='add'>+		pci_name(pdev));</div><div class='add'>+	for (i = 0, ptr = buf; i &lt; PCI_PARENT_DUMP_SIZE; i += 4, ptr++)</div><div class='add'>+		if (pci_read_config_dword(pdev, i, ptr))</div><div class='add'>+			goto err_read;</div><div class='add'>+	print_hex_dump(KERN_ERR, prefix, DUMP_PREFIX_OFFSET, 32, 4, buf, i, 0);</div><div class='add'>+</div><div class='add'>+	/* Print root port AER registers */</div><div class='add'>+	pos = 0;</div><div class='add'>+	pdev = pcie_find_root_port(pdev);</div><div class='add'>+	if (pdev)</div><div class='add'>+		pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_ERR);</div><div class='add'>+	if (pos) {</div><div class='add'>+		IWL_ERR(trans, "iwlwifi root port (%s) AER cap structure:\n",</div><div class='add'>+			pci_name(pdev));</div><div class='add'>+		sprintf(prefix, "iwlwifi %s: ", pci_name(pdev));</div><div class='add'>+		for (i = 0, ptr = buf; i &lt;= PCI_ERR_ROOT_ERR_SRC; i += 4, ptr++)</div><div class='add'>+			if (pci_read_config_dword(pdev, pos + i, ptr))</div><div class='add'>+				goto err_read;</div><div class='add'>+		print_hex_dump(KERN_ERR, prefix, DUMP_PREFIX_OFFSET, 32,</div><div class='add'>+			       4, buf, i, 0);</div><div class='add'>+	}</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+err_read:</div><div class='add'>+	print_hex_dump(KERN_ERR, prefix, DUMP_PREFIX_OFFSET, 32, 4, buf, i, 0);</div><div class='add'>+	IWL_ERR(trans, "Read failed at 0x%X\n", i);</div><div class='add'>+out:</div><div class='add'>+	pcie_dbg_dumped_once = 1;</div><div class='add'>+	kfree(buf);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/utils.h b/drivers/net/wireless/intel/iwlwifi/pcie/utils.h<br/>new file mode 100644<br/>index 000000000000..27437d5e099b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/pcie/utils.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/pcie/utils.h</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __iwl_pcie_utils_h__</div><div class='add'>+#define __iwl_pcie_utils_h__</div><div class='add'>+</div><div class='add'>+#include "iwl-io.h"</div><div class='add'>+</div><div class='add'>+void iwl_trans_pcie_dump_regs(struct iwl_trans *trans, struct pci_dev *pdev);</div><div class='add'>+</div><div class='add'>+static inline void _iwl_trans_set_bits_mask(struct iwl_trans *trans,</div><div class='add'>+					    u32 reg, u32 mask, u32 value)</div><div class='add'>+{</div><div class='add'>+	u32 v;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUG</div><div class='add'>+	WARN_ON_ONCE(value &amp; ~mask);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	v = iwl_read32(trans, reg);</div><div class='add'>+	v &amp;= ~mask;</div><div class='add'>+	v |= value;</div><div class='add'>+	iwl_write32(trans, reg, v);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void iwl_trans_clear_bit(struct iwl_trans *trans,</div><div class='add'>+				       u32 reg, u32 mask)</div><div class='add'>+{</div><div class='add'>+	_iwl_trans_set_bits_mask(trans, reg, mask, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void iwl_trans_set_bit(struct iwl_trans *trans,</div><div class='add'>+				     u32 reg, u32 mask)</div><div class='add'>+{</div><div class='add'>+	_iwl_trans_set_bits_mask(trans, reg, mask, mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* __iwl_pcie_utils_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/queue/tx.c b/drivers/net/wireless/intel/iwlwifi/queue/tx.c<br/>deleted file mode 100644<br/>index 451b06069350..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/queue/tx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/queue/tx.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1834 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2020-2021 Intel Corporation</div><div class='del'>- */</div><div class='del'>-#include &lt;net/tso.h&gt;</div><div class='del'>-#include &lt;linux/tcp.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-debug.h"</div><div class='del'>-#include "iwl-io.h"</div><div class='del'>-#include "fw/api/tx.h"</div><div class='del'>-#include "queue/tx.h"</div><div class='del'>-#include "iwl-fh.h"</div><div class='del'>-#include "iwl-scd.h"</div><div class='del'>-#include &lt;linux/dmapool.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * iwl_txq_update_byte_tbl - Set up entry in Tx byte-count array</div><div class='del'>- */</div><div class='del'>-static void iwl_pcie_gen2_update_byte_tbl(struct iwl_trans *trans,</div><div class='del'>-					  struct iwl_txq *txq, u16 byte_cnt,</div><div class='del'>-					  int num_tbs)</div><div class='del'>-{</div><div class='del'>-	int idx = iwl_txq_get_cmd_index(txq, txq-&gt;write_ptr);</div><div class='del'>-	u8 filled_tfd_size, num_fetch_chunks;</div><div class='del'>-	u16 len = byte_cnt;</div><div class='del'>-	__le16 bc_ent;</div><div class='del'>-</div><div class='del'>-	if (WARN(idx &gt;= txq-&gt;n_window, "%d &gt;= %d\n", idx, txq-&gt;n_window))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	filled_tfd_size = offsetof(struct iwl_tfh_tfd, tbs) +</div><div class='del'>-			  num_tbs * sizeof(struct iwl_tfh_tb);</div><div class='del'>-	/*</div><div class='del'>-	 * filled_tfd_size contains the number of filled bytes in the TFD.</div><div class='del'>-	 * Dividing it by 64 will give the number of chunks to fetch</div><div class='del'>-	 * to SRAM- 0 for one chunk, 1 for 2 and so on.</div><div class='del'>-	 * If, for example, TFD contains only 3 TBs then 32 bytes</div><div class='del'>-	 * of the TFD are used, and only one chunk of 64 bytes should</div><div class='del'>-	 * be fetched</div><div class='del'>-	 */</div><div class='del'>-	num_fetch_chunks = DIV_ROUND_UP(filled_tfd_size, 64) - 1;</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='del'>-		struct iwl_gen3_bc_tbl *scd_bc_tbl_gen3 = txq-&gt;bc_tbl.addr;</div><div class='del'>-</div><div class='del'>-		/* Starting from AX210, the HW expects bytes */</div><div class='del'>-		WARN_ON(trans-&gt;txqs.bc_table_dword);</div><div class='del'>-		WARN_ON(len &gt; 0x3FFF);</div><div class='del'>-		bc_ent = cpu_to_le16(len | (num_fetch_chunks &lt;&lt; 14));</div><div class='del'>-		scd_bc_tbl_gen3-&gt;tfd_offset[idx] = bc_ent;</div><div class='del'>-	} else {</div><div class='del'>-		struct iwlagn_scd_bc_tbl *scd_bc_tbl = txq-&gt;bc_tbl.addr;</div><div class='del'>-</div><div class='del'>-		/* Before AX210, the HW expects DW */</div><div class='del'>-		WARN_ON(!trans-&gt;txqs.bc_table_dword);</div><div class='del'>-		len = DIV_ROUND_UP(len, 4);</div><div class='del'>-		WARN_ON(len &gt; 0xFFF);</div><div class='del'>-		bc_ent = cpu_to_le16(len | (num_fetch_chunks &lt;&lt; 12));</div><div class='del'>-		scd_bc_tbl-&gt;tfd_offset[idx] = bc_ent;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * iwl_txq_inc_wr_ptr - Send new write index to hardware</div><div class='del'>- */</div><div class='del'>-void iwl_txq_inc_wr_ptr(struct iwl_trans *trans, struct iwl_txq *txq)</div><div class='del'>-{</div><div class='del'>-	lockdep_assert_held(&amp;txq-&gt;lock);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_TX(trans, "Q:%d WR: 0x%x\n", txq-&gt;id, txq-&gt;write_ptr);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if not in power-save mode, uCode will never sleep when we're</div><div class='del'>-	 * trying to tx (during RFKILL, we're not trying to tx).</div><div class='del'>-	 */</div><div class='del'>-	iwl_write32(trans, HBUS_TARG_WRPTR, txq-&gt;write_ptr | (txq-&gt;id &lt;&lt; 16));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 iwl_txq_gen2_get_num_tbs(struct iwl_trans *trans,</div><div class='del'>-				   struct iwl_tfh_tfd *tfd)</div><div class='del'>-{</div><div class='del'>-	return le16_to_cpu(tfd-&gt;num_tbs) &amp; 0x1f;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_txq_gen2_tfd_unmap(struct iwl_trans *trans, struct iwl_cmd_meta *meta,</div><div class='del'>-			    struct iwl_tfh_tfd *tfd)</div><div class='del'>-{</div><div class='del'>-	int i, num_tbs;</div><div class='del'>-</div><div class='del'>-	/* Sanity check on number of chunks */</div><div class='del'>-	num_tbs = iwl_txq_gen2_get_num_tbs(trans, tfd);</div><div class='del'>-</div><div class='del'>-	if (num_tbs &gt; trans-&gt;txqs.tfd.max_tbs) {</div><div class='del'>-		IWL_ERR(trans, "Too many chunks: %i\n", num_tbs);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* first TB is never freed - it's the bidirectional DMA data */</div><div class='del'>-	for (i = 1; i &lt; num_tbs; i++) {</div><div class='del'>-		if (meta-&gt;tbs &amp; BIT(i))</div><div class='del'>-			dma_unmap_page(trans-&gt;dev,</div><div class='del'>-				       le64_to_cpu(tfd-&gt;tbs[i].addr),</div><div class='del'>-				       le16_to_cpu(tfd-&gt;tbs[i].tb_len),</div><div class='del'>-				       DMA_TO_DEVICE);</div><div class='del'>-		else</div><div class='del'>-			dma_unmap_single(trans-&gt;dev,</div><div class='del'>-					 le64_to_cpu(tfd-&gt;tbs[i].addr),</div><div class='del'>-					 le16_to_cpu(tfd-&gt;tbs[i].tb_len),</div><div class='del'>-					 DMA_TO_DEVICE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tfd-&gt;num_tbs = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_txq_gen2_free_tfd(struct iwl_trans *trans, struct iwl_txq *txq)</div><div class='del'>-{</div><div class='del'>-	/* rd_ptr is bounded by TFD_QUEUE_SIZE_MAX and</div><div class='del'>-	 * idx is bounded by n_window</div><div class='del'>-	 */</div><div class='del'>-	int idx = iwl_txq_get_cmd_index(txq, txq-&gt;read_ptr);</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;txq-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (!txq-&gt;entries)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	iwl_txq_gen2_tfd_unmap(trans, &amp;txq-&gt;entries[idx].meta,</div><div class='del'>-			       iwl_txq_get_tfd(trans, txq, idx));</div><div class='del'>-</div><div class='del'>-	skb = txq-&gt;entries[idx].skb;</div><div class='del'>-</div><div class='del'>-	/* Can be called from irqs-disabled context</div><div class='del'>-	 * If skb is not NULL, it means that the whole queue is being</div><div class='del'>-	 * freed and that the queue is not empty - free the skb</div><div class='del'>-	 */</div><div class='del'>-	if (skb) {</div><div class='del'>-		iwl_op_mode_free_skb(trans-&gt;op_mode, skb);</div><div class='del'>-		txq-&gt;entries[idx].skb = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl_txq_gen2_set_tb(struct iwl_trans *trans, struct iwl_tfh_tfd *tfd,</div><div class='del'>-			dma_addr_t addr, u16 len)</div><div class='del'>-{</div><div class='del'>-	int idx = iwl_txq_gen2_get_num_tbs(trans, tfd);</div><div class='del'>-	struct iwl_tfh_tb *tb;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Only WARN here so we know about the issue, but we mess up our</div><div class='del'>-	 * unmap path because not every place currently checks for errors</div><div class='del'>-	 * returned from this function - it can only return an error if</div><div class='del'>-	 * there's no more space, and so when we know there is enough we</div><div class='del'>-	 * don't always check ...</div><div class='del'>-	 */</div><div class='del'>-	WARN(iwl_txq_crosses_4g_boundary(addr, len),</div><div class='del'>-	     "possible DMA problem with iova:0x%llx, len:%d\n",</div><div class='del'>-	     (unsigned long long)addr, len);</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(idx &gt;= IWL_TFH_NUM_TBS))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	tb = &amp;tfd-&gt;tbs[idx];</div><div class='del'>-</div><div class='del'>-	/* Each TFD can point to a maximum max_tbs Tx buffers */</div><div class='del'>-	if (le16_to_cpu(tfd-&gt;num_tbs) &gt;= trans-&gt;txqs.tfd.max_tbs) {</div><div class='del'>-		IWL_ERR(trans, "Error can not send more than %d chunks\n",</div><div class='del'>-			trans-&gt;txqs.tfd.max_tbs);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	put_unaligned_le64(addr, &amp;tb-&gt;addr);</div><div class='del'>-	tb-&gt;tb_len = cpu_to_le16(len);</div><div class='del'>-</div><div class='del'>-	tfd-&gt;num_tbs = cpu_to_le16(idx + 1);</div><div class='del'>-</div><div class='del'>-	return idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct page *get_workaround_page(struct iwl_trans *trans,</div><div class='del'>-					struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct page **page_ptr;</div><div class='del'>-	struct page *ret;</div><div class='del'>-</div><div class='del'>-	page_ptr = (void *)((u8 *)skb-&gt;cb + trans-&gt;txqs.page_offs);</div><div class='del'>-</div><div class='del'>-	ret = alloc_page(GFP_ATOMIC);</div><div class='del'>-	if (!ret)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* set the chaining pointer to the previous page if there */</div><div class='del'>-	*(void **)(page_address(ret) + PAGE_SIZE - sizeof(void *)) = *page_ptr;</div><div class='del'>-	*page_ptr = ret;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Add a TB and if needed apply the FH HW bug workaround;</div><div class='del'>- * meta != NULL indicates that it's a page mapping and we</div><div class='del'>- * need to dma_unmap_page() and set the meta-&gt;tbs bit in</div><div class='del'>- * this case.</div><div class='del'>- */</div><div class='del'>-static int iwl_txq_gen2_set_tb_with_wa(struct iwl_trans *trans,</div><div class='del'>-				       struct sk_buff *skb,</div><div class='del'>-				       struct iwl_tfh_tfd *tfd,</div><div class='del'>-				       dma_addr_t phys, void *virt,</div><div class='del'>-				       u16 len, struct iwl_cmd_meta *meta)</div><div class='del'>-{</div><div class='del'>-	dma_addr_t oldphys = phys;</div><div class='del'>-	struct page *page;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (unlikely(dma_mapping_error(trans-&gt;dev, phys)))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (likely(!iwl_txq_crosses_4g_boundary(phys, len))) {</div><div class='del'>-		ret = iwl_txq_gen2_set_tb(trans, tfd, phys, len);</div><div class='del'>-</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto unmap;</div><div class='del'>-</div><div class='del'>-		if (meta)</div><div class='del'>-			meta-&gt;tbs |= BIT(ret);</div><div class='del'>-</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto trace;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Work around a hardware bug. If (as expressed in the</div><div class='del'>-	 * condition above) the TB ends on a 32-bit boundary,</div><div class='del'>-	 * then the next TB may be accessed with the wrong</div><div class='del'>-	 * address.</div><div class='del'>-	 * To work around it, copy the data elsewhere and make</div><div class='del'>-	 * a new mapping for it so the device will not fail.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(len &gt; PAGE_SIZE - sizeof(void *))) {</div><div class='del'>-		ret = -ENOBUFS;</div><div class='del'>-		goto unmap;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	page = get_workaround_page(trans, skb);</div><div class='del'>-	if (!page) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto unmap;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(page_address(page), virt, len);</div><div class='del'>-</div><div class='del'>-	phys = dma_map_single(trans-&gt;dev, page_address(page), len,</div><div class='del'>-			      DMA_TO_DEVICE);</div><div class='del'>-	if (unlikely(dma_mapping_error(trans-&gt;dev, phys)))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	ret = iwl_txq_gen2_set_tb(trans, tfd, phys, len);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		/* unmap the new allocation as single */</div><div class='del'>-		oldphys = phys;</div><div class='del'>-		meta = NULL;</div><div class='del'>-		goto unmap;</div><div class='del'>-	}</div><div class='del'>-	IWL_WARN(trans,</div><div class='del'>-		 "TB bug workaround: copied %d bytes from 0x%llx to 0x%llx\n",</div><div class='del'>-		 len, (unsigned long long)oldphys, (unsigned long long)phys);</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-unmap:</div><div class='del'>-	if (meta)</div><div class='del'>-		dma_unmap_page(trans-&gt;dev, oldphys, len, DMA_TO_DEVICE);</div><div class='del'>-	else</div><div class='del'>-		dma_unmap_single(trans-&gt;dev, oldphys, len, DMA_TO_DEVICE);</div><div class='del'>-trace:</div><div class='del'>-	trace_iwlwifi_dev_tx_tb(trans-&gt;dev, skb, virt, phys, len);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_INET</div><div class='del'>-struct iwl_tso_hdr_page *get_page_hdr(struct iwl_trans *trans, size_t len,</div><div class='del'>-				      struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_tso_hdr_page *p = this_cpu_ptr(trans-&gt;txqs.tso_hdr_page);</div><div class='del'>-	struct page **page_ptr;</div><div class='del'>-</div><div class='del'>-	page_ptr = (void *)((u8 *)skb-&gt;cb + trans-&gt;txqs.page_offs);</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(*page_ptr))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (!p-&gt;page)</div><div class='del'>-		goto alloc;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check if there's enough room on this page</div><div class='del'>-	 *</div><div class='del'>-	 * Note that we put a page chaining pointer *last* in the</div><div class='del'>-	 * page - we need it somewhere, and if it's there then we</div><div class='del'>-	 * avoid DMA mapping the last bits of the page which may</div><div class='del'>-	 * trigger the 32-bit boundary hardware bug.</div><div class='del'>-	 *</div><div class='del'>-	 * (see also get_workaround_page() in tx-gen2.c)</div><div class='del'>-	 */</div><div class='del'>-	if (p-&gt;pos + len &lt; (u8 *)page_address(p-&gt;page) + PAGE_SIZE -</div><div class='del'>-			   sizeof(void *))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* We don't have enough room on this page, get a new one. */</div><div class='del'>-	__free_page(p-&gt;page);</div><div class='del'>-</div><div class='del'>-alloc:</div><div class='del'>-	p-&gt;page = alloc_page(GFP_ATOMIC);</div><div class='del'>-	if (!p-&gt;page)</div><div class='del'>-		return NULL;</div><div class='del'>-	p-&gt;pos = page_address(p-&gt;page);</div><div class='del'>-	/* set the chaining pointer to NULL */</div><div class='del'>-	*(void **)(page_address(p-&gt;page) + PAGE_SIZE - sizeof(void *)) = NULL;</div><div class='del'>-out:</div><div class='del'>-	*page_ptr = p-&gt;page;</div><div class='del'>-	get_page(p-&gt;page);</div><div class='del'>-	return p;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int iwl_txq_gen2_build_amsdu(struct iwl_trans *trans,</div><div class='del'>-				    struct sk_buff *skb,</div><div class='del'>-				    struct iwl_tfh_tfd *tfd, int start_len,</div><div class='del'>-				    u8 hdr_len,</div><div class='del'>-				    struct iwl_device_tx_cmd *dev_cmd)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_INET</div><div class='del'>-	struct iwl_tx_cmd_gen2 *tx_cmd = (void *)dev_cmd-&gt;payload;</div><div class='del'>-	struct ieee80211_hdr *hdr = (void *)skb-&gt;data;</div><div class='del'>-	unsigned int snap_ip_tcp_hdrlen, ip_hdrlen, total_len, hdr_room;</div><div class='del'>-	unsigned int mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='del'>-	u16 length, amsdu_pad;</div><div class='del'>-	u8 *start_hdr;</div><div class='del'>-	struct iwl_tso_hdr_page *hdr_page;</div><div class='del'>-	struct tso_t tso;</div><div class='del'>-</div><div class='del'>-	trace_iwlwifi_dev_tx(trans-&gt;dev, skb, tfd, sizeof(*tfd),</div><div class='del'>-			     &amp;dev_cmd-&gt;hdr, start_len, 0);</div><div class='del'>-</div><div class='del'>-	ip_hdrlen = skb_transport_header(skb) - skb_network_header(skb);</div><div class='del'>-	snap_ip_tcp_hdrlen = 8 + ip_hdrlen + tcp_hdrlen(skb);</div><div class='del'>-	total_len = skb-&gt;len - snap_ip_tcp_hdrlen - hdr_len;</div><div class='del'>-	amsdu_pad = 0;</div><div class='del'>-</div><div class='del'>-	/* total amount of header we may need for this A-MSDU */</div><div class='del'>-	hdr_room = DIV_ROUND_UP(total_len, mss) *</div><div class='del'>-		(3 + snap_ip_tcp_hdrlen + sizeof(struct ethhdr));</div><div class='del'>-</div><div class='del'>-	/* Our device supports 9 segments at most, it will fit in 1 page */</div><div class='del'>-	hdr_page = get_page_hdr(trans, hdr_room, skb);</div><div class='del'>-	if (!hdr_page)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	start_hdr = hdr_page-&gt;pos;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Pull the ieee80211 header to be able to use TSO core,</div><div class='del'>-	 * we will restore it for the tx_status flow.</div><div class='del'>-	 */</div><div class='del'>-	skb_pull(skb, hdr_len);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Remove the length of all the headers that we don't actually</div><div class='del'>-	 * have in the MPDU by themselves, but that we duplicate into</div><div class='del'>-	 * all the different MSDUs inside the A-MSDU.</div><div class='del'>-	 */</div><div class='del'>-	le16_add_cpu(&amp;tx_cmd-&gt;len, -snap_ip_tcp_hdrlen);</div><div class='del'>-</div><div class='del'>-	tso_start(skb, &amp;tso);</div><div class='del'>-</div><div class='del'>-	while (total_len) {</div><div class='del'>-		/* this is the data left for this subframe */</div><div class='del'>-		unsigned int data_left = min_t(unsigned int, mss, total_len);</div><div class='del'>-		unsigned int tb_len;</div><div class='del'>-		dma_addr_t tb_phys;</div><div class='del'>-		u8 *subf_hdrs_start = hdr_page-&gt;pos;</div><div class='del'>-</div><div class='del'>-		total_len -= data_left;</div><div class='del'>-</div><div class='del'>-		memset(hdr_page-&gt;pos, 0, amsdu_pad);</div><div class='del'>-		hdr_page-&gt;pos += amsdu_pad;</div><div class='del'>-		amsdu_pad = (4 - (sizeof(struct ethhdr) + snap_ip_tcp_hdrlen +</div><div class='del'>-				  data_left)) &amp; 0x3;</div><div class='del'>-		ether_addr_copy(hdr_page-&gt;pos, ieee80211_get_DA(hdr));</div><div class='del'>-		hdr_page-&gt;pos += ETH_ALEN;</div><div class='del'>-		ether_addr_copy(hdr_page-&gt;pos, ieee80211_get_SA(hdr));</div><div class='del'>-		hdr_page-&gt;pos += ETH_ALEN;</div><div class='del'>-</div><div class='del'>-		length = snap_ip_tcp_hdrlen + data_left;</div><div class='del'>-		*((__be16 *)hdr_page-&gt;pos) = cpu_to_be16(length);</div><div class='del'>-		hdr_page-&gt;pos += sizeof(length);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * This will copy the SNAP as well which will be considered</div><div class='del'>-		 * as MAC header.</div><div class='del'>-		 */</div><div class='del'>-		tso_build_hdr(skb, hdr_page-&gt;pos, &amp;tso, data_left, !total_len);</div><div class='del'>-</div><div class='del'>-		hdr_page-&gt;pos += snap_ip_tcp_hdrlen;</div><div class='del'>-</div><div class='del'>-		tb_len = hdr_page-&gt;pos - start_hdr;</div><div class='del'>-		tb_phys = dma_map_single(trans-&gt;dev, start_hdr,</div><div class='del'>-					 tb_len, DMA_TO_DEVICE);</div><div class='del'>-		if (unlikely(dma_mapping_error(trans-&gt;dev, tb_phys)))</div><div class='del'>-			goto out_err;</div><div class='del'>-		/*</div><div class='del'>-		 * No need for _with_wa, this is from the TSO page and</div><div class='del'>-		 * we leave some space at the end of it so can't hit</div><div class='del'>-		 * the buggy scenario.</div><div class='del'>-		 */</div><div class='del'>-		iwl_txq_gen2_set_tb(trans, tfd, tb_phys, tb_len);</div><div class='del'>-		trace_iwlwifi_dev_tx_tb(trans-&gt;dev, skb, start_hdr,</div><div class='del'>-					tb_phys, tb_len);</div><div class='del'>-		/* add this subframe's headers' length to the tx_cmd */</div><div class='del'>-		le16_add_cpu(&amp;tx_cmd-&gt;len, hdr_page-&gt;pos - subf_hdrs_start);</div><div class='del'>-</div><div class='del'>-		/* prepare the start_hdr for the next subframe */</div><div class='del'>-		start_hdr = hdr_page-&gt;pos;</div><div class='del'>-</div><div class='del'>-		/* put the payload */</div><div class='del'>-		while (data_left) {</div><div class='del'>-			int ret;</div><div class='del'>-</div><div class='del'>-			tb_len = min_t(unsigned int, tso.size, data_left);</div><div class='del'>-			tb_phys = dma_map_single(trans-&gt;dev, tso.data,</div><div class='del'>-						 tb_len, DMA_TO_DEVICE);</div><div class='del'>-			ret = iwl_txq_gen2_set_tb_with_wa(trans, skb, tfd,</div><div class='del'>-							  tb_phys, tso.data,</div><div class='del'>-							  tb_len, NULL);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto out_err;</div><div class='del'>-</div><div class='del'>-			data_left -= tb_len;</div><div class='del'>-			tso_build_data(skb, &amp;tso, tb_len);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* re -add the WiFi header */</div><div class='del'>-	skb_push(skb, hdr_len);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out_err:</div><div class='del'>-#endif</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct</div><div class='del'>-iwl_tfh_tfd *iwl_txq_gen2_build_tx_amsdu(struct iwl_trans *trans,</div><div class='del'>-					 struct iwl_txq *txq,</div><div class='del'>-					 struct iwl_device_tx_cmd *dev_cmd,</div><div class='del'>-					 struct sk_buff *skb,</div><div class='del'>-					 struct iwl_cmd_meta *out_meta,</div><div class='del'>-					 int hdr_len,</div><div class='del'>-					 int tx_cmd_len)</div><div class='del'>-{</div><div class='del'>-	int idx = iwl_txq_get_cmd_index(txq, txq-&gt;write_ptr);</div><div class='del'>-	struct iwl_tfh_tfd *tfd = iwl_txq_get_tfd(trans, txq, idx);</div><div class='del'>-	dma_addr_t tb_phys;</div><div class='del'>-	int len;</div><div class='del'>-	void *tb1_addr;</div><div class='del'>-</div><div class='del'>-	tb_phys = iwl_txq_get_first_tb_dma(txq, idx);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * No need for _with_wa, the first TB allocation is aligned up</div><div class='del'>-	 * to a 64-byte boundary and thus can't be at the end or cross</div><div class='del'>-	 * a page boundary (much less a 2^32 boundary).</div><div class='del'>-	 */</div><div class='del'>-	iwl_txq_gen2_set_tb(trans, tfd, tb_phys, IWL_FIRST_TB_SIZE);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The second TB (tb1) points to the remainder of the TX command</div><div class='del'>-	 * and the 802.11 header - dword aligned size</div><div class='del'>-	 * (This calculation modifies the TX command, so do it before the</div><div class='del'>-	 * setup of the first TB)</div><div class='del'>-	 */</div><div class='del'>-	len = tx_cmd_len + sizeof(struct iwl_cmd_header) + hdr_len -</div><div class='del'>-	      IWL_FIRST_TB_SIZE;</div><div class='del'>-</div><div class='del'>-	/* do not align A-MSDU to dword as the subframe header aligns it */</div><div class='del'>-</div><div class='del'>-	/* map the data for TB1 */</div><div class='del'>-	tb1_addr = ((u8 *)&amp;dev_cmd-&gt;hdr) + IWL_FIRST_TB_SIZE;</div><div class='del'>-	tb_phys = dma_map_single(trans-&gt;dev, tb1_addr, len, DMA_TO_DEVICE);</div><div class='del'>-	if (unlikely(dma_mapping_error(trans-&gt;dev, tb_phys)))</div><div class='del'>-		goto out_err;</div><div class='del'>-	/*</div><div class='del'>-	 * No need for _with_wa(), we ensure (via alignment) that the data</div><div class='del'>-	 * here can never cross or end at a page boundary.</div><div class='del'>-	 */</div><div class='del'>-	iwl_txq_gen2_set_tb(trans, tfd, tb_phys, len);</div><div class='del'>-</div><div class='del'>-	if (iwl_txq_gen2_build_amsdu(trans, skb, tfd, len + IWL_FIRST_TB_SIZE,</div><div class='del'>-				     hdr_len, dev_cmd))</div><div class='del'>-		goto out_err;</div><div class='del'>-</div><div class='del'>-	/* building the A-MSDU might have changed this data, memcpy it now */</div><div class='del'>-	memcpy(&amp;txq-&gt;first_tb_bufs[idx], dev_cmd, IWL_FIRST_TB_SIZE);</div><div class='del'>-	return tfd;</div><div class='del'>-</div><div class='del'>-out_err:</div><div class='del'>-	iwl_txq_gen2_tfd_unmap(trans, out_meta, tfd);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl_txq_gen2_tx_add_frags(struct iwl_trans *trans,</div><div class='del'>-				     struct sk_buff *skb,</div><div class='del'>-				     struct iwl_tfh_tfd *tfd,</div><div class='del'>-				     struct iwl_cmd_meta *out_meta)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='del'>-		const skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='del'>-		dma_addr_t tb_phys;</div><div class='del'>-		unsigned int fragsz = skb_frag_size(frag);</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		if (!fragsz)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		tb_phys = skb_frag_dma_map(trans-&gt;dev, frag, 0,</div><div class='del'>-					   fragsz, DMA_TO_DEVICE);</div><div class='del'>-		ret = iwl_txq_gen2_set_tb_with_wa(trans, skb, tfd, tb_phys,</div><div class='del'>-						  skb_frag_address(frag),</div><div class='del'>-						  fragsz, out_meta);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct</div><div class='del'>-iwl_tfh_tfd *iwl_txq_gen2_build_tx(struct iwl_trans *trans,</div><div class='del'>-				   struct iwl_txq *txq,</div><div class='del'>-				   struct iwl_device_tx_cmd *dev_cmd,</div><div class='del'>-				   struct sk_buff *skb,</div><div class='del'>-				   struct iwl_cmd_meta *out_meta,</div><div class='del'>-				   int hdr_len,</div><div class='del'>-				   int tx_cmd_len,</div><div class='del'>-				   bool pad)</div><div class='del'>-{</div><div class='del'>-	int idx = iwl_txq_get_cmd_index(txq, txq-&gt;write_ptr);</div><div class='del'>-	struct iwl_tfh_tfd *tfd = iwl_txq_get_tfd(trans, txq, idx);</div><div class='del'>-	dma_addr_t tb_phys;</div><div class='del'>-	int len, tb1_len, tb2_len;</div><div class='del'>-	void *tb1_addr;</div><div class='del'>-	struct sk_buff *frag;</div><div class='del'>-</div><div class='del'>-	tb_phys = iwl_txq_get_first_tb_dma(txq, idx);</div><div class='del'>-</div><div class='del'>-	/* The first TB points to bi-directional DMA data */</div><div class='del'>-	memcpy(&amp;txq-&gt;first_tb_bufs[idx], dev_cmd, IWL_FIRST_TB_SIZE);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * No need for _with_wa, the first TB allocation is aligned up</div><div class='del'>-	 * to a 64-byte boundary and thus can't be at the end or cross</div><div class='del'>-	 * a page boundary (much less a 2^32 boundary).</div><div class='del'>-	 */</div><div class='del'>-	iwl_txq_gen2_set_tb(trans, tfd, tb_phys, IWL_FIRST_TB_SIZE);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The second TB (tb1) points to the remainder of the TX command</div><div class='del'>-	 * and the 802.11 header - dword aligned size</div><div class='del'>-	 * (This calculation modifies the TX command, so do it before the</div><div class='del'>-	 * setup of the first TB)</div><div class='del'>-	 */</div><div class='del'>-	len = tx_cmd_len + sizeof(struct iwl_cmd_header) + hdr_len -</div><div class='del'>-	      IWL_FIRST_TB_SIZE;</div><div class='del'>-</div><div class='del'>-	if (pad)</div><div class='del'>-		tb1_len = ALIGN(len, 4);</div><div class='del'>-	else</div><div class='del'>-		tb1_len = len;</div><div class='del'>-</div><div class='del'>-	/* map the data for TB1 */</div><div class='del'>-	tb1_addr = ((u8 *)&amp;dev_cmd-&gt;hdr) + IWL_FIRST_TB_SIZE;</div><div class='del'>-	tb_phys = dma_map_single(trans-&gt;dev, tb1_addr, tb1_len, DMA_TO_DEVICE);</div><div class='del'>-	if (unlikely(dma_mapping_error(trans-&gt;dev, tb_phys)))</div><div class='del'>-		goto out_err;</div><div class='del'>-	/*</div><div class='del'>-	 * No need for _with_wa(), we ensure (via alignment) that the data</div><div class='del'>-	 * here can never cross or end at a page boundary.</div><div class='del'>-	 */</div><div class='del'>-	iwl_txq_gen2_set_tb(trans, tfd, tb_phys, tb1_len);</div><div class='del'>-	trace_iwlwifi_dev_tx(trans-&gt;dev, skb, tfd, sizeof(*tfd), &amp;dev_cmd-&gt;hdr,</div><div class='del'>-			     IWL_FIRST_TB_SIZE + tb1_len, hdr_len);</div><div class='del'>-</div><div class='del'>-	/* set up TFD's third entry to point to remainder of skb's head */</div><div class='del'>-	tb2_len = skb_headlen(skb) - hdr_len;</div><div class='del'>-</div><div class='del'>-	if (tb2_len &gt; 0) {</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		tb_phys = dma_map_single(trans-&gt;dev, skb-&gt;data + hdr_len,</div><div class='del'>-					 tb2_len, DMA_TO_DEVICE);</div><div class='del'>-		ret = iwl_txq_gen2_set_tb_with_wa(trans, skb, tfd, tb_phys,</div><div class='del'>-						  skb-&gt;data + hdr_len, tb2_len,</div><div class='del'>-						  NULL);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out_err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (iwl_txq_gen2_tx_add_frags(trans, skb, tfd, out_meta))</div><div class='del'>-		goto out_err;</div><div class='del'>-</div><div class='del'>-	skb_walk_frags(skb, frag) {</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		tb_phys = dma_map_single(trans-&gt;dev, frag-&gt;data,</div><div class='del'>-					 skb_headlen(frag), DMA_TO_DEVICE);</div><div class='del'>-		ret = iwl_txq_gen2_set_tb_with_wa(trans, skb, tfd, tb_phys,</div><div class='del'>-						  frag-&gt;data,</div><div class='del'>-						  skb_headlen(frag), NULL);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out_err;</div><div class='del'>-		if (iwl_txq_gen2_tx_add_frags(trans, frag, tfd, out_meta))</div><div class='del'>-			goto out_err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return tfd;</div><div class='del'>-</div><div class='del'>-out_err:</div><div class='del'>-	iwl_txq_gen2_tfd_unmap(trans, out_meta, tfd);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static</div><div class='del'>-struct iwl_tfh_tfd *iwl_txq_gen2_build_tfd(struct iwl_trans *trans,</div><div class='del'>-					   struct iwl_txq *txq,</div><div class='del'>-					   struct iwl_device_tx_cmd *dev_cmd,</div><div class='del'>-					   struct sk_buff *skb,</div><div class='del'>-					   struct iwl_cmd_meta *out_meta)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='del'>-	int idx = iwl_txq_get_cmd_index(txq, txq-&gt;write_ptr);</div><div class='del'>-	struct iwl_tfh_tfd *tfd = iwl_txq_get_tfd(trans, txq, idx);</div><div class='del'>-	int len, hdr_len;</div><div class='del'>-	bool amsdu;</div><div class='del'>-</div><div class='del'>-	/* There must be data left over for TB1 or this code must be changed */</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct iwl_tx_cmd_gen2) &lt; IWL_FIRST_TB_SIZE);</div><div class='del'>-</div><div class='del'>-	memset(tfd, 0, sizeof(*tfd));</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &lt; IWL_DEVICE_FAMILY_AX210)</div><div class='del'>-		len = sizeof(struct iwl_tx_cmd_gen2);</div><div class='del'>-	else</div><div class='del'>-		len = sizeof(struct iwl_tx_cmd_gen3);</div><div class='del'>-</div><div class='del'>-	amsdu = ieee80211_is_data_qos(hdr-&gt;frame_control) &amp;&amp;</div><div class='del'>-			(*ieee80211_get_qos_ctl(hdr) &amp;</div><div class='del'>-			 IEEE80211_QOS_CTL_A_MSDU_PRESENT);</div><div class='del'>-</div><div class='del'>-	hdr_len = ieee80211_hdrlen(hdr-&gt;frame_control);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Only build A-MSDUs here if doing so by GSO, otherwise it may be</div><div class='del'>-	 * an A-MSDU for other reasons, e.g. NAN or an A-MSDU having been</div><div class='del'>-	 * built in the higher layers already.</div><div class='del'>-	 */</div><div class='del'>-	if (amsdu &amp;&amp; skb_shinfo(skb)-&gt;gso_size)</div><div class='del'>-		return iwl_txq_gen2_build_tx_amsdu(trans, txq, dev_cmd, skb,</div><div class='del'>-						    out_meta, hdr_len, len);</div><div class='del'>-	return iwl_txq_gen2_build_tx(trans, txq, dev_cmd, skb, out_meta,</div><div class='del'>-				      hdr_len, len, !amsdu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl_txq_space(struct iwl_trans *trans, const struct iwl_txq *q)</div><div class='del'>-{</div><div class='del'>-	unsigned int max;</div><div class='del'>-	unsigned int used;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * To avoid ambiguity between empty and completely full queues, there</div><div class='del'>-	 * should always be less than max_tfd_queue_size elements in the queue.</div><div class='del'>-	 * If q-&gt;n_window is smaller than max_tfd_queue_size, there is no need</div><div class='del'>-	 * to reserve any queue entries for this purpose.</div><div class='del'>-	 */</div><div class='del'>-	if (q-&gt;n_window &lt; trans-&gt;trans_cfg-&gt;base_params-&gt;max_tfd_queue_size)</div><div class='del'>-		max = q-&gt;n_window;</div><div class='del'>-	else</div><div class='del'>-		max = trans-&gt;trans_cfg-&gt;base_params-&gt;max_tfd_queue_size - 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * max_tfd_queue_size is a power of 2, so the following is equivalent to</div><div class='del'>-	 * modulo by max_tfd_queue_size and is well defined.</div><div class='del'>-	 */</div><div class='del'>-	used = (q-&gt;write_ptr - q-&gt;read_ptr) &amp;</div><div class='del'>-		(trans-&gt;trans_cfg-&gt;base_params-&gt;max_tfd_queue_size - 1);</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(used &gt; max))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return max - used;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl_txq_gen2_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='del'>-		    struct iwl_device_tx_cmd *dev_cmd, int txq_id)</div><div class='del'>-{</div><div class='del'>-	struct iwl_cmd_meta *out_meta;</div><div class='del'>-	struct iwl_txq *txq = trans-&gt;txqs.txq[txq_id];</div><div class='del'>-	u16 cmd_len;</div><div class='del'>-	int idx;</div><div class='del'>-	void *tfd;</div><div class='del'>-</div><div class='del'>-	if (WARN_ONCE(txq_id &gt;= IWL_MAX_TVQM_QUEUES,</div><div class='del'>-		      "queue %d out of range", txq_id))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (WARN_ONCE(!test_bit(txq_id, trans-&gt;txqs.queue_used),</div><div class='del'>-		      "TX on unused queue %d\n", txq_id))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (skb_is_nonlinear(skb) &amp;&amp;</div><div class='del'>-	    skb_shinfo(skb)-&gt;nr_frags &gt; IWL_TRANS_MAX_FRAGS(trans) &amp;&amp;</div><div class='del'>-	    __skb_linearize(skb))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;txq-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (iwl_txq_space(trans, txq) &lt; txq-&gt;high_mark) {</div><div class='del'>-		iwl_txq_stop(trans, txq);</div><div class='del'>-</div><div class='del'>-		/* don't put the packet on the ring, if there is no room */</div><div class='del'>-		if (unlikely(iwl_txq_space(trans, txq) &lt; 3)) {</div><div class='del'>-			struct iwl_device_tx_cmd **dev_cmd_ptr;</div><div class='del'>-</div><div class='del'>-			dev_cmd_ptr = (void *)((u8 *)skb-&gt;cb +</div><div class='del'>-					       trans-&gt;txqs.dev_cmd_offs);</div><div class='del'>-</div><div class='del'>-			*dev_cmd_ptr = dev_cmd;</div><div class='del'>-			__skb_queue_tail(&amp;txq-&gt;overflow_q, skb);</div><div class='del'>-			spin_unlock(&amp;txq-&gt;lock);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	idx = iwl_txq_get_cmd_index(txq, txq-&gt;write_ptr);</div><div class='del'>-</div><div class='del'>-	/* Set up driver data for this TFD */</div><div class='del'>-	txq-&gt;entries[idx].skb = skb;</div><div class='del'>-	txq-&gt;entries[idx].cmd = dev_cmd;</div><div class='del'>-</div><div class='del'>-	dev_cmd-&gt;hdr.sequence =</div><div class='del'>-		cpu_to_le16((u16)(QUEUE_TO_SEQ(txq_id) |</div><div class='del'>-			    INDEX_TO_SEQ(idx)));</div><div class='del'>-</div><div class='del'>-	/* Set up first empty entry in queue's array of Tx/cmd buffers */</div><div class='del'>-	out_meta = &amp;txq-&gt;entries[idx].meta;</div><div class='del'>-	out_meta-&gt;flags = 0;</div><div class='del'>-</div><div class='del'>-	tfd = iwl_txq_gen2_build_tfd(trans, txq, dev_cmd, skb, out_meta);</div><div class='del'>-	if (!tfd) {</div><div class='del'>-		spin_unlock(&amp;txq-&gt;lock);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;device_family &gt;= IWL_DEVICE_FAMILY_AX210) {</div><div class='del'>-		struct iwl_tx_cmd_gen3 *tx_cmd_gen3 =</div><div class='del'>-			(void *)dev_cmd-&gt;payload;</div><div class='del'>-</div><div class='del'>-		cmd_len = le16_to_cpu(tx_cmd_gen3-&gt;len);</div><div class='del'>-	} else {</div><div class='del'>-		struct iwl_tx_cmd_gen2 *tx_cmd_gen2 =</div><div class='del'>-			(void *)dev_cmd-&gt;payload;</div><div class='del'>-</div><div class='del'>-		cmd_len = le16_to_cpu(tx_cmd_gen2-&gt;len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set up entry for this TFD in Tx byte-count array */</div><div class='del'>-	iwl_pcie_gen2_update_byte_tbl(trans, txq, cmd_len,</div><div class='del'>-				      iwl_txq_gen2_get_num_tbs(trans, tfd));</div><div class='del'>-</div><div class='del'>-	/* start timer if queue currently empty */</div><div class='del'>-	if (txq-&gt;read_ptr == txq-&gt;write_ptr &amp;&amp; txq-&gt;wd_timeout)</div><div class='del'>-		mod_timer(&amp;txq-&gt;stuck_timer, jiffies + txq-&gt;wd_timeout);</div><div class='del'>-</div><div class='del'>-	/* Tell device the write index *just past* this latest filled TFD */</div><div class='del'>-	txq-&gt;write_ptr = iwl_txq_inc_wrap(trans, txq-&gt;write_ptr);</div><div class='del'>-	iwl_txq_inc_wr_ptr(trans, txq);</div><div class='del'>-	/*</div><div class='del'>-	 * At this point the frame is "transmitted" successfully</div><div class='del'>-	 * and we will get a TX status notification eventually.</div><div class='del'>-	 */</div><div class='del'>-	spin_unlock(&amp;txq-&gt;lock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*************** HOST COMMAND QUEUE FUNCTIONS   *****/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * iwl_txq_gen2_unmap -  Unmap any remaining DMA mappings and free skb's</div><div class='del'>- */</div><div class='del'>-void iwl_txq_gen2_unmap(struct iwl_trans *trans, int txq_id)</div><div class='del'>-{</div><div class='del'>-	struct iwl_txq *txq = trans-&gt;txqs.txq[txq_id];</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;txq-&gt;lock);</div><div class='del'>-	while (txq-&gt;write_ptr != txq-&gt;read_ptr) {</div><div class='del'>-		IWL_DEBUG_TX_REPLY(trans, "Q %d Free %d\n",</div><div class='del'>-				   txq_id, txq-&gt;read_ptr);</div><div class='del'>-</div><div class='del'>-		if (txq_id != trans-&gt;txqs.cmd.q_id) {</div><div class='del'>-			int idx = iwl_txq_get_cmd_index(txq, txq-&gt;read_ptr);</div><div class='del'>-			struct sk_buff *skb = txq-&gt;entries[idx].skb;</div><div class='del'>-</div><div class='del'>-			if (!WARN_ON_ONCE(!skb))</div><div class='del'>-				iwl_txq_free_tso_page(trans, skb);</div><div class='del'>-		}</div><div class='del'>-		iwl_txq_gen2_free_tfd(trans, txq);</div><div class='del'>-		txq-&gt;read_ptr = iwl_txq_inc_wrap(trans, txq-&gt;read_ptr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (!skb_queue_empty(&amp;txq-&gt;overflow_q)) {</div><div class='del'>-		struct sk_buff *skb = __skb_dequeue(&amp;txq-&gt;overflow_q);</div><div class='del'>-</div><div class='del'>-		iwl_op_mode_free_skb(trans-&gt;op_mode, skb);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_bh(&amp;txq-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/* just in case - this queue may have been stopped */</div><div class='del'>-	iwl_wake_queue(trans, txq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl_txq_gen2_free_memory(struct iwl_trans *trans,</div><div class='del'>-				     struct iwl_txq *txq)</div><div class='del'>-{</div><div class='del'>-	struct device *dev = trans-&gt;dev;</div><div class='del'>-</div><div class='del'>-	/* De-alloc circular buffer of TFDs */</div><div class='del'>-	if (txq-&gt;tfds) {</div><div class='del'>-		dma_free_coherent(dev,</div><div class='del'>-				  trans-&gt;txqs.tfd.size * txq-&gt;n_window,</div><div class='del'>-				  txq-&gt;tfds, txq-&gt;dma_addr);</div><div class='del'>-		dma_free_coherent(dev,</div><div class='del'>-				  sizeof(*txq-&gt;first_tb_bufs) * txq-&gt;n_window,</div><div class='del'>-				  txq-&gt;first_tb_bufs, txq-&gt;first_tb_dma);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(txq-&gt;entries);</div><div class='del'>-	if (txq-&gt;bc_tbl.addr)</div><div class='del'>-		dma_pool_free(trans-&gt;txqs.bc_pool,</div><div class='del'>-			      txq-&gt;bc_tbl.addr, txq-&gt;bc_tbl.dma);</div><div class='del'>-	kfree(txq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * iwl_pcie_txq_free - Deallocate DMA queue.</div><div class='del'>- * @txq: Transmit queue to deallocate.</div><div class='del'>- *</div><div class='del'>- * Empty queue by removing and destroying all BD's.</div><div class='del'>- * Free all buffers.</div><div class='del'>- * 0-fill, but do not free "txq" descriptor structure.</div><div class='del'>- */</div><div class='del'>-static void iwl_txq_gen2_free(struct iwl_trans *trans, int txq_id)</div><div class='del'>-{</div><div class='del'>-	struct iwl_txq *txq;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (WARN_ONCE(txq_id &gt;= IWL_MAX_TVQM_QUEUES,</div><div class='del'>-		      "queue %d out of range", txq_id))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	txq = trans-&gt;txqs.txq[txq_id];</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(!txq))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	iwl_txq_gen2_unmap(trans, txq_id);</div><div class='del'>-</div><div class='del'>-	/* De-alloc array of command/tx buffers */</div><div class='del'>-	if (txq_id == trans-&gt;txqs.cmd.q_id)</div><div class='del'>-		for (i = 0; i &lt; txq-&gt;n_window; i++) {</div><div class='del'>-			kfree_sensitive(txq-&gt;entries[i].cmd);</div><div class='del'>-			kfree_sensitive(txq-&gt;entries[i].free_buf);</div><div class='del'>-		}</div><div class='del'>-	del_timer_sync(&amp;txq-&gt;stuck_timer);</div><div class='del'>-</div><div class='del'>-	iwl_txq_gen2_free_memory(trans, txq);</div><div class='del'>-</div><div class='del'>-	trans-&gt;txqs.txq[txq_id] = NULL;</div><div class='del'>-</div><div class='del'>-	clear_bit(txq_id, trans-&gt;txqs.queue_used);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * iwl_queue_init - Initialize queue's high/low-water and read/write indexes</div><div class='del'>- */</div><div class='del'>-static int iwl_queue_init(struct iwl_txq *q, int slots_num)</div><div class='del'>-{</div><div class='del'>-	q-&gt;n_window = slots_num;</div><div class='del'>-</div><div class='del'>-	/* slots_num must be power-of-two size, otherwise</div><div class='del'>-	 * iwl_txq_get_cmd_index is broken. */</div><div class='del'>-	if (WARN_ON(!is_power_of_2(slots_num)))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	q-&gt;low_mark = q-&gt;n_window / 4;</div><div class='del'>-	if (q-&gt;low_mark &lt; 4)</div><div class='del'>-		q-&gt;low_mark = 4;</div><div class='del'>-</div><div class='del'>-	q-&gt;high_mark = q-&gt;n_window / 8;</div><div class='del'>-	if (q-&gt;high_mark &lt; 2)</div><div class='del'>-		q-&gt;high_mark = 2;</div><div class='del'>-</div><div class='del'>-	q-&gt;write_ptr = 0;</div><div class='del'>-	q-&gt;read_ptr = 0;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl_txq_init(struct iwl_trans *trans, struct iwl_txq *txq, int slots_num,</div><div class='del'>-		 bool cmd_queue)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	u32 tfd_queue_max_size =</div><div class='del'>-		trans-&gt;trans_cfg-&gt;base_params-&gt;max_tfd_queue_size;</div><div class='del'>-</div><div class='del'>-	txq-&gt;need_update = false;</div><div class='del'>-</div><div class='del'>-	/* max_tfd_queue_size must be power-of-two size, otherwise</div><div class='del'>-	 * iwl_txq_inc_wrap and iwl_txq_dec_wrap are broken. */</div><div class='del'>-	if (WARN_ONCE(tfd_queue_max_size &amp; (tfd_queue_max_size - 1),</div><div class='del'>-		      "Max tfd queue size must be a power of two, but is %d",</div><div class='del'>-		      tfd_queue_max_size))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* Initialize queue's high/low-water marks, and head/tail indexes */</div><div class='del'>-	ret = iwl_queue_init(txq, slots_num);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;txq-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (cmd_queue) {</div><div class='del'>-		static struct lock_class_key iwl_txq_cmd_queue_lock_class;</div><div class='del'>-</div><div class='del'>-		lockdep_set_class(&amp;txq-&gt;lock, &amp;iwl_txq_cmd_queue_lock_class);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__skb_queue_head_init(&amp;txq-&gt;overflow_q);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_txq_free_tso_page(struct iwl_trans *trans, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct page **page_ptr;</div><div class='del'>-	struct page *next;</div><div class='del'>-</div><div class='del'>-	page_ptr = (void *)((u8 *)skb-&gt;cb + trans-&gt;txqs.page_offs);</div><div class='del'>-	next = *page_ptr;</div><div class='del'>-	*page_ptr = NULL;</div><div class='del'>-</div><div class='del'>-	while (next) {</div><div class='del'>-		struct page *tmp = next;</div><div class='del'>-</div><div class='del'>-		next = *(void **)(page_address(next) + PAGE_SIZE -</div><div class='del'>-				  sizeof(void *));</div><div class='del'>-		__free_page(tmp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_txq_log_scd_error(struct iwl_trans *trans, struct iwl_txq *txq)</div><div class='del'>-{</div><div class='del'>-	u32 txq_id = txq-&gt;id;</div><div class='del'>-	u32 status;</div><div class='del'>-	bool active;</div><div class='del'>-	u8 fifo;</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;use_tfh) {</div><div class='del'>-		IWL_ERR(trans, "Queue %d is stuck %d %d\n", txq_id,</div><div class='del'>-			txq-&gt;read_ptr, txq-&gt;write_ptr);</div><div class='del'>-		/* TODO: access new SCD registers and dump them */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = iwl_read_prph(trans, SCD_QUEUE_STATUS_BITS(txq_id));</div><div class='del'>-	fifo = (status &gt;&gt; SCD_QUEUE_STTS_REG_POS_TXF) &amp; 0x7;</div><div class='del'>-	active = !!(status &amp; BIT(SCD_QUEUE_STTS_REG_POS_ACTIVE));</div><div class='del'>-</div><div class='del'>-	IWL_ERR(trans,</div><div class='del'>-		"Queue %d is %sactive on fifo %d and stuck for %u ms. SW [%d, %d] HW [%d, %d] FH TRB=0x0%x\n",</div><div class='del'>-		txq_id, active ? "" : "in", fifo,</div><div class='del'>-		jiffies_to_msecs(txq-&gt;wd_timeout),</div><div class='del'>-		txq-&gt;read_ptr, txq-&gt;write_ptr,</div><div class='del'>-		iwl_read_prph(trans, SCD_QUEUE_RDPTR(txq_id)) &amp;</div><div class='del'>-			(trans-&gt;trans_cfg-&gt;base_params-&gt;max_tfd_queue_size - 1),</div><div class='del'>-			iwl_read_prph(trans, SCD_QUEUE_WRPTR(txq_id)) &amp;</div><div class='del'>-			(trans-&gt;trans_cfg-&gt;base_params-&gt;max_tfd_queue_size - 1),</div><div class='del'>-			iwl_read_direct32(trans, FH_TX_TRB_REG(fifo)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl_txq_stuck_timer(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	struct iwl_txq *txq = from_timer(txq, t, stuck_timer);</div><div class='del'>-	struct iwl_trans *trans = txq-&gt;trans;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;txq-&gt;lock);</div><div class='del'>-	/* check if triggered erroneously */</div><div class='del'>-	if (txq-&gt;read_ptr == txq-&gt;write_ptr) {</div><div class='del'>-		spin_unlock(&amp;txq-&gt;lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;txq-&gt;lock);</div><div class='del'>-</div><div class='del'>-	iwl_txq_log_scd_error(trans, txq);</div><div class='del'>-</div><div class='del'>-	iwl_force_nmi(trans);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl_txq_alloc(struct iwl_trans *trans, struct iwl_txq *txq, int slots_num,</div><div class='del'>-		  bool cmd_queue)</div><div class='del'>-{</div><div class='del'>-	size_t tfd_sz = trans-&gt;txqs.tfd.size *</div><div class='del'>-		trans-&gt;trans_cfg-&gt;base_params-&gt;max_tfd_queue_size;</div><div class='del'>-	size_t tb0_buf_sz;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(txq-&gt;entries || txq-&gt;tfds))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;use_tfh)</div><div class='del'>-		tfd_sz = trans-&gt;txqs.tfd.size * slots_num;</div><div class='del'>-</div><div class='del'>-	timer_setup(&amp;txq-&gt;stuck_timer, iwl_txq_stuck_timer, 0);</div><div class='del'>-	txq-&gt;trans = trans;</div><div class='del'>-</div><div class='del'>-	txq-&gt;n_window = slots_num;</div><div class='del'>-</div><div class='del'>-	txq-&gt;entries = kcalloc(slots_num,</div><div class='del'>-			       sizeof(struct iwl_pcie_txq_entry),</div><div class='del'>-			       GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!txq-&gt;entries)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	if (cmd_queue)</div><div class='del'>-		for (i = 0; i &lt; slots_num; i++) {</div><div class='del'>-			txq-&gt;entries[i].cmd =</div><div class='del'>-				kmalloc(sizeof(struct iwl_device_cmd),</div><div class='del'>-					GFP_KERNEL);</div><div class='del'>-			if (!txq-&gt;entries[i].cmd)</div><div class='del'>-				goto error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	/* Circular buffer of transmit frame descriptors (TFDs),</div><div class='del'>-	 * shared with device */</div><div class='del'>-	txq-&gt;tfds = dma_alloc_coherent(trans-&gt;dev, tfd_sz,</div><div class='del'>-				       &amp;txq-&gt;dma_addr, GFP_KERNEL);</div><div class='del'>-	if (!txq-&gt;tfds)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	BUILD_BUG_ON(sizeof(*txq-&gt;first_tb_bufs) != IWL_FIRST_TB_SIZE_ALIGN);</div><div class='del'>-</div><div class='del'>-	tb0_buf_sz = sizeof(*txq-&gt;first_tb_bufs) * slots_num;</div><div class='del'>-</div><div class='del'>-	txq-&gt;first_tb_bufs = dma_alloc_coherent(trans-&gt;dev, tb0_buf_sz,</div><div class='del'>-						&amp;txq-&gt;first_tb_dma,</div><div class='del'>-						GFP_KERNEL);</div><div class='del'>-	if (!txq-&gt;first_tb_bufs)</div><div class='del'>-		goto err_free_tfds;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-err_free_tfds:</div><div class='del'>-	dma_free_coherent(trans-&gt;dev, tfd_sz, txq-&gt;tfds, txq-&gt;dma_addr);</div><div class='del'>-error:</div><div class='del'>-	if (txq-&gt;entries &amp;&amp; cmd_queue)</div><div class='del'>-		for (i = 0; i &lt; slots_num; i++)</div><div class='del'>-			kfree(txq-&gt;entries[i].cmd);</div><div class='del'>-	kfree(txq-&gt;entries);</div><div class='del'>-	txq-&gt;entries = NULL;</div><div class='del'>-</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl_txq_dyn_alloc_dma(struct iwl_trans *trans,</div><div class='del'>-				 struct iwl_txq **intxq, int size,</div><div class='del'>-				 unsigned int timeout)</div><div class='del'>-{</div><div class='del'>-	size_t bc_tbl_size, bc_tbl_entries;</div><div class='del'>-	struct iwl_txq *txq;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	WARN_ON(!trans-&gt;txqs.bc_tbl_size);</div><div class='del'>-</div><div class='del'>-	bc_tbl_size = trans-&gt;txqs.bc_tbl_size;</div><div class='del'>-	bc_tbl_entries = bc_tbl_size / sizeof(u16);</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(size &gt; bc_tbl_entries))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	txq = kzalloc(sizeof(*txq), GFP_KERNEL);</div><div class='del'>-	if (!txq)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	txq-&gt;bc_tbl.addr = dma_pool_alloc(trans-&gt;txqs.bc_pool, GFP_KERNEL,</div><div class='del'>-					  &amp;txq-&gt;bc_tbl.dma);</div><div class='del'>-	if (!txq-&gt;bc_tbl.addr) {</div><div class='del'>-		IWL_ERR(trans, "Scheduler BC Table allocation failed\n");</div><div class='del'>-		kfree(txq);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = iwl_txq_alloc(trans, txq, size, false);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(trans, "Tx queue alloc failed\n");</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-	ret = iwl_txq_init(trans, txq, size, false);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(trans, "Tx queue init failed\n");</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	txq-&gt;wd_timeout = msecs_to_jiffies(timeout);</div><div class='del'>-</div><div class='del'>-	*intxq = txq;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	iwl_txq_gen2_free_memory(trans, txq);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl_txq_alloc_response(struct iwl_trans *trans, struct iwl_txq *txq,</div><div class='del'>-				  struct iwl_host_cmd *hcmd)</div><div class='del'>-{</div><div class='del'>-	struct iwl_tx_queue_cfg_rsp *rsp;</div><div class='del'>-	int ret, qid;</div><div class='del'>-	u32 wr_ptr;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(iwl_rx_packet_payload_len(hcmd-&gt;resp_pkt) !=</div><div class='del'>-		    sizeof(*rsp))) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto error_free_resp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rsp = (void *)hcmd-&gt;resp_pkt-&gt;data;</div><div class='del'>-	qid = le16_to_cpu(rsp-&gt;queue_number);</div><div class='del'>-	wr_ptr = le16_to_cpu(rsp-&gt;write_pointer);</div><div class='del'>-</div><div class='del'>-	if (qid &gt;= ARRAY_SIZE(trans-&gt;txqs.txq)) {</div><div class='del'>-		WARN_ONCE(1, "queue index %d unsupported", qid);</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto error_free_resp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (test_and_set_bit(qid, trans-&gt;txqs.queue_used)) {</div><div class='del'>-		WARN_ONCE(1, "queue %d already used", qid);</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto error_free_resp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (WARN_ONCE(trans-&gt;txqs.txq[qid],</div><div class='del'>-		      "queue %d already allocated\n", qid)) {</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto error_free_resp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	txq-&gt;id = qid;</div><div class='del'>-	trans-&gt;txqs.txq[qid] = txq;</div><div class='del'>-	wr_ptr &amp;= (trans-&gt;trans_cfg-&gt;base_params-&gt;max_tfd_queue_size - 1);</div><div class='del'>-</div><div class='del'>-	/* Place first TFD at index corresponding to start sequence number */</div><div class='del'>-	txq-&gt;read_ptr = wr_ptr;</div><div class='del'>-	txq-&gt;write_ptr = wr_ptr;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_TX_QUEUES(trans, "Activate queue %d\n", qid);</div><div class='del'>-</div><div class='del'>-	iwl_free_resp(hcmd);</div><div class='del'>-	return qid;</div><div class='del'>-</div><div class='del'>-error_free_resp:</div><div class='del'>-	iwl_free_resp(hcmd);</div><div class='del'>-	iwl_txq_gen2_free_memory(trans, txq);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl_txq_dyn_alloc(struct iwl_trans *trans, __le16 flags, u8 sta_id, u8 tid,</div><div class='del'>-		      int cmd_id, int size, unsigned int timeout)</div><div class='del'>-{</div><div class='del'>-	struct iwl_txq *txq = NULL;</div><div class='del'>-	struct iwl_tx_queue_cfg_cmd cmd = {</div><div class='del'>-		.flags = flags,</div><div class='del'>-		.sta_id = sta_id,</div><div class='del'>-		.tid = tid,</div><div class='del'>-	};</div><div class='del'>-	struct iwl_host_cmd hcmd = {</div><div class='del'>-		.id = cmd_id,</div><div class='del'>-		.len = { sizeof(cmd) },</div><div class='del'>-		.data = { &amp;cmd, },</div><div class='del'>-		.flags = CMD_WANT_SKB,</div><div class='del'>-	};</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = iwl_txq_dyn_alloc_dma(trans, &amp;txq, size, timeout);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	cmd.tfdq_addr = cpu_to_le64(txq-&gt;dma_addr);</div><div class='del'>-	cmd.byte_cnt_addr = cpu_to_le64(txq-&gt;bc_tbl.dma);</div><div class='del'>-	cmd.cb_size = cpu_to_le32(TFD_QUEUE_CB_SIZE(size));</div><div class='del'>-</div><div class='del'>-	ret = iwl_trans_send_cmd(trans, &amp;hcmd);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	return iwl_txq_alloc_response(trans, txq, &amp;hcmd);</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	iwl_txq_gen2_free_memory(trans, txq);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_txq_dyn_free(struct iwl_trans *trans, int queue)</div><div class='del'>-{</div><div class='del'>-	if (WARN(queue &gt;= IWL_MAX_TVQM_QUEUES,</div><div class='del'>-		 "queue %d out of range", queue))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Upon HW Rfkill - we stop the device, and then stop the queues</div><div class='del'>-	 * in the op_mode. Just for the sake of the simplicity of the op_mode,</div><div class='del'>-	 * allow the op_mode to call txq_disable after it already called</div><div class='del'>-	 * stop_device.</div><div class='del'>-	 */</div><div class='del'>-	if (!test_and_clear_bit(queue, trans-&gt;txqs.queue_used)) {</div><div class='del'>-		WARN_ONCE(test_bit(STATUS_DEVICE_ENABLED, &amp;trans-&gt;status),</div><div class='del'>-			  "queue %d not used", queue);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl_txq_gen2_free(trans, queue);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_TX_QUEUES(trans, "Deactivate queue %d\n", queue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_txq_gen2_tx_free(struct iwl_trans *trans)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	memset(trans-&gt;txqs.queue_used, 0, sizeof(trans-&gt;txqs.queue_used));</div><div class='del'>-</div><div class='del'>-	/* Free all TX queues */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(trans-&gt;txqs.txq); i++) {</div><div class='del'>-		if (!trans-&gt;txqs.txq[i])</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		iwl_txq_gen2_free(trans, i);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl_txq_gen2_init(struct iwl_trans *trans, int txq_id, int queue_size)</div><div class='del'>-{</div><div class='del'>-	struct iwl_txq *queue;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* alloc and init the tx queue */</div><div class='del'>-	if (!trans-&gt;txqs.txq[txq_id]) {</div><div class='del'>-		queue = kzalloc(sizeof(*queue), GFP_KERNEL);</div><div class='del'>-		if (!queue) {</div><div class='del'>-			IWL_ERR(trans, "Not enough memory for tx queue\n");</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		trans-&gt;txqs.txq[txq_id] = queue;</div><div class='del'>-		ret = iwl_txq_alloc(trans, queue, queue_size, true);</div><div class='del'>-		if (ret) {</div><div class='del'>-			IWL_ERR(trans, "Tx %d queue init failed\n", txq_id);</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		queue = trans-&gt;txqs.txq[txq_id];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = iwl_txq_init(trans, queue, queue_size,</div><div class='del'>-			   (txq_id == trans-&gt;txqs.cmd.q_id));</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(trans, "Tx %d queue alloc failed\n", txq_id);</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-	trans-&gt;txqs.txq[txq_id]-&gt;id = txq_id;</div><div class='del'>-	set_bit(txq_id, trans-&gt;txqs.queue_used);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	iwl_txq_gen2_tx_free(trans);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline dma_addr_t iwl_txq_gen1_tfd_tb_get_addr(struct iwl_trans *trans,</div><div class='del'>-						      void *_tfd, u8 idx)</div><div class='del'>-{</div><div class='del'>-	struct iwl_tfd *tfd;</div><div class='del'>-	struct iwl_tfd_tb *tb;</div><div class='del'>-	dma_addr_t addr;</div><div class='del'>-	dma_addr_t hi_len;</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;use_tfh) {</div><div class='del'>-		struct iwl_tfh_tfd *tfd = _tfd;</div><div class='del'>-		struct iwl_tfh_tb *tb = &amp;tfd-&gt;tbs[idx];</div><div class='del'>-</div><div class='del'>-		return (dma_addr_t)(le64_to_cpu(tb-&gt;addr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tfd = _tfd;</div><div class='del'>-	tb = &amp;tfd-&gt;tbs[idx];</div><div class='del'>-	addr = get_unaligned_le32(&amp;tb-&gt;lo);</div><div class='del'>-</div><div class='del'>-	if (sizeof(dma_addr_t) &lt;= sizeof(u32))</div><div class='del'>-		return addr;</div><div class='del'>-</div><div class='del'>-	hi_len = le16_to_cpu(tb-&gt;hi_n_len) &amp; 0xF;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * shift by 16 twice to avoid warnings on 32-bit</div><div class='del'>-	 * (where this code never runs anyway due to the</div><div class='del'>-	 * if statement above)</div><div class='del'>-	 */</div><div class='del'>-	return addr | ((hi_len &lt;&lt; 16) &lt;&lt; 16);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_txq_gen1_tfd_unmap(struct iwl_trans *trans,</div><div class='del'>-			    struct iwl_cmd_meta *meta,</div><div class='del'>-			    struct iwl_txq *txq, int index)</div><div class='del'>-{</div><div class='del'>-	int i, num_tbs;</div><div class='del'>-	void *tfd = iwl_txq_get_tfd(trans, txq, index);</div><div class='del'>-</div><div class='del'>-	/* Sanity check on number of chunks */</div><div class='del'>-	num_tbs = iwl_txq_gen1_tfd_get_num_tbs(trans, tfd);</div><div class='del'>-</div><div class='del'>-	if (num_tbs &gt; trans-&gt;txqs.tfd.max_tbs) {</div><div class='del'>-		IWL_ERR(trans, "Too many chunks: %i\n", num_tbs);</div><div class='del'>-		/* @todo issue fatal error, it is quite serious situation */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* first TB is never freed - it's the bidirectional DMA data */</div><div class='del'>-</div><div class='del'>-	for (i = 1; i &lt; num_tbs; i++) {</div><div class='del'>-		if (meta-&gt;tbs &amp; BIT(i))</div><div class='del'>-			dma_unmap_page(trans-&gt;dev,</div><div class='del'>-				       iwl_txq_gen1_tfd_tb_get_addr(trans,</div><div class='del'>-								    tfd, i),</div><div class='del'>-				       iwl_txq_gen1_tfd_tb_get_len(trans,</div><div class='del'>-								   tfd, i),</div><div class='del'>-				       DMA_TO_DEVICE);</div><div class='del'>-		else</div><div class='del'>-			dma_unmap_single(trans-&gt;dev,</div><div class='del'>-					 iwl_txq_gen1_tfd_tb_get_addr(trans,</div><div class='del'>-								      tfd, i),</div><div class='del'>-					 iwl_txq_gen1_tfd_tb_get_len(trans,</div><div class='del'>-								     tfd, i),</div><div class='del'>-					 DMA_TO_DEVICE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	meta-&gt;tbs = 0;</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;use_tfh) {</div><div class='del'>-		struct iwl_tfh_tfd *tfd_fh = (void *)tfd;</div><div class='del'>-</div><div class='del'>-		tfd_fh-&gt;num_tbs = 0;</div><div class='del'>-	} else {</div><div class='del'>-		struct iwl_tfd *tfd_fh = (void *)tfd;</div><div class='del'>-</div><div class='del'>-		tfd_fh-&gt;num_tbs = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define IWL_TX_CRC_SIZE 4</div><div class='del'>-#define IWL_TX_DELIMITER_SIZE 4</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * iwl_txq_gen1_update_byte_cnt_tbl - Set up entry in Tx byte-count array</div><div class='del'>- */</div><div class='del'>-void iwl_txq_gen1_update_byte_cnt_tbl(struct iwl_trans *trans,</div><div class='del'>-				      struct iwl_txq *txq, u16 byte_cnt,</div><div class='del'>-				      int num_tbs)</div><div class='del'>-{</div><div class='del'>-	struct iwlagn_scd_bc_tbl *scd_bc_tbl;</div><div class='del'>-	int write_ptr = txq-&gt;write_ptr;</div><div class='del'>-	int txq_id = txq-&gt;id;</div><div class='del'>-	u8 sec_ctl = 0;</div><div class='del'>-	u16 len = byte_cnt + IWL_TX_CRC_SIZE + IWL_TX_DELIMITER_SIZE;</div><div class='del'>-	__le16 bc_ent;</div><div class='del'>-	struct iwl_device_tx_cmd *dev_cmd = txq-&gt;entries[txq-&gt;write_ptr].cmd;</div><div class='del'>-	struct iwl_tx_cmd *tx_cmd = (void *)dev_cmd-&gt;payload;</div><div class='del'>-	u8 sta_id = tx_cmd-&gt;sta_id;</div><div class='del'>-</div><div class='del'>-	scd_bc_tbl = trans-&gt;txqs.scd_bc_tbls.addr;</div><div class='del'>-</div><div class='del'>-	sec_ctl = tx_cmd-&gt;sec_ctl;</div><div class='del'>-</div><div class='del'>-	switch (sec_ctl &amp; TX_CMD_SEC_MSK) {</div><div class='del'>-	case TX_CMD_SEC_CCM:</div><div class='del'>-		len += IEEE80211_CCMP_MIC_LEN;</div><div class='del'>-		break;</div><div class='del'>-	case TX_CMD_SEC_TKIP:</div><div class='del'>-		len += IEEE80211_TKIP_ICV_LEN;</div><div class='del'>-		break;</div><div class='del'>-	case TX_CMD_SEC_WEP:</div><div class='del'>-		len += IEEE80211_WEP_IV_LEN + IEEE80211_WEP_ICV_LEN;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	if (trans-&gt;txqs.bc_table_dword)</div><div class='del'>-		len = DIV_ROUND_UP(len, 4);</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(len &gt; 0xFFF || write_ptr &gt;= TFD_QUEUE_SIZE_MAX))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	bc_ent = cpu_to_le16(len | (sta_id &lt;&lt; 12));</div><div class='del'>-</div><div class='del'>-	scd_bc_tbl[txq_id].tfd_offset[write_ptr] = bc_ent;</div><div class='del'>-</div><div class='del'>-	if (write_ptr &lt; TFD_QUEUE_SIZE_BC_DUP)</div><div class='del'>-		scd_bc_tbl[txq_id].tfd_offset[TFD_QUEUE_SIZE_MAX + write_ptr] =</div><div class='del'>-			bc_ent;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_txq_gen1_inval_byte_cnt_tbl(struct iwl_trans *trans,</div><div class='del'>-				     struct iwl_txq *txq)</div><div class='del'>-{</div><div class='del'>-	struct iwlagn_scd_bc_tbl *scd_bc_tbl = trans-&gt;txqs.scd_bc_tbls.addr;</div><div class='del'>-	int txq_id = txq-&gt;id;</div><div class='del'>-	int read_ptr = txq-&gt;read_ptr;</div><div class='del'>-	u8 sta_id = 0;</div><div class='del'>-	__le16 bc_ent;</div><div class='del'>-	struct iwl_device_tx_cmd *dev_cmd = txq-&gt;entries[read_ptr].cmd;</div><div class='del'>-	struct iwl_tx_cmd *tx_cmd = (void *)dev_cmd-&gt;payload;</div><div class='del'>-</div><div class='del'>-	WARN_ON(read_ptr &gt;= TFD_QUEUE_SIZE_MAX);</div><div class='del'>-</div><div class='del'>-	if (txq_id != trans-&gt;txqs.cmd.q_id)</div><div class='del'>-		sta_id = tx_cmd-&gt;sta_id;</div><div class='del'>-</div><div class='del'>-	bc_ent = cpu_to_le16(1 | (sta_id &lt;&lt; 12));</div><div class='del'>-</div><div class='del'>-	scd_bc_tbl[txq_id].tfd_offset[read_ptr] = bc_ent;</div><div class='del'>-</div><div class='del'>-	if (read_ptr &lt; TFD_QUEUE_SIZE_BC_DUP)</div><div class='del'>-		scd_bc_tbl[txq_id].tfd_offset[TFD_QUEUE_SIZE_MAX + read_ptr] =</div><div class='del'>-			bc_ent;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * iwl_txq_free_tfd - Free all chunks referenced by TFD [txq-&gt;q.read_ptr]</div><div class='del'>- * @trans - transport private data</div><div class='del'>- * @txq - tx queue</div><div class='del'>- * @dma_dir - the direction of the DMA mapping</div><div class='del'>- *</div><div class='del'>- * Does NOT advance any TFD circular buffer read/write indexes</div><div class='del'>- * Does NOT free the TFD itself (which is within circular buffer)</div><div class='del'>- */</div><div class='del'>-void iwl_txq_free_tfd(struct iwl_trans *trans, struct iwl_txq *txq)</div><div class='del'>-{</div><div class='del'>-	/* rd_ptr is bounded by TFD_QUEUE_SIZE_MAX and</div><div class='del'>-	 * idx is bounded by n_window</div><div class='del'>-	 */</div><div class='del'>-	int rd_ptr = txq-&gt;read_ptr;</div><div class='del'>-	int idx = iwl_txq_get_cmd_index(txq, rd_ptr);</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;txq-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (!txq-&gt;entries)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* We have only q-&gt;n_window txq-&gt;entries, but we use</div><div class='del'>-	 * TFD_QUEUE_SIZE_MAX tfds</div><div class='del'>-	 */</div><div class='del'>-	iwl_txq_gen1_tfd_unmap(trans, &amp;txq-&gt;entries[idx].meta, txq, rd_ptr);</div><div class='del'>-</div><div class='del'>-	/* free SKB */</div><div class='del'>-	skb = txq-&gt;entries[idx].skb;</div><div class='del'>-</div><div class='del'>-	/* Can be called from irqs-disabled context</div><div class='del'>-	 * If skb is not NULL, it means that the whole queue is being</div><div class='del'>-	 * freed and that the queue is not empty - free the skb</div><div class='del'>-	 */</div><div class='del'>-	if (skb) {</div><div class='del'>-		iwl_op_mode_free_skb(trans-&gt;op_mode, skb);</div><div class='del'>-		txq-&gt;entries[idx].skb = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_txq_progress(struct iwl_txq *txq)</div><div class='del'>-{</div><div class='del'>-	lockdep_assert_held(&amp;txq-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (!txq-&gt;wd_timeout)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * station is asleep and we send data - that must</div><div class='del'>-	 * be uAPSD or PS-Poll. Don't rearm the timer.</div><div class='del'>-	 */</div><div class='del'>-	if (txq-&gt;frozen)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if empty delete timer, otherwise move timer forward</div><div class='del'>-	 * since we're making progress on this queue</div><div class='del'>-	 */</div><div class='del'>-	if (txq-&gt;read_ptr == txq-&gt;write_ptr)</div><div class='del'>-		del_timer(&amp;txq-&gt;stuck_timer);</div><div class='del'>-	else</div><div class='del'>-		mod_timer(&amp;txq-&gt;stuck_timer, jiffies + txq-&gt;wd_timeout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Frees buffers until index _not_ inclusive */</div><div class='del'>-void iwl_txq_reclaim(struct iwl_trans *trans, int txq_id, int ssn,</div><div class='del'>-		     struct sk_buff_head *skbs)</div><div class='del'>-{</div><div class='del'>-	struct iwl_txq *txq = trans-&gt;txqs.txq[txq_id];</div><div class='del'>-	int tfd_num = iwl_txq_get_cmd_index(txq, ssn);</div><div class='del'>-	int read_ptr = iwl_txq_get_cmd_index(txq, txq-&gt;read_ptr);</div><div class='del'>-	int last_to_free;</div><div class='del'>-</div><div class='del'>-	/* This function is not meant to release cmd queue*/</div><div class='del'>-	if (WARN_ON(txq_id == trans-&gt;txqs.cmd.q_id))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;txq-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (!test_bit(txq_id, trans-&gt;txqs.queue_used)) {</div><div class='del'>-		IWL_DEBUG_TX_QUEUES(trans, "Q %d inactive - ignoring idx %d\n",</div><div class='del'>-				    txq_id, ssn);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (read_ptr == tfd_num)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_TX_REPLY(trans, "[Q %d] %d -&gt; %d (%d)\n",</div><div class='del'>-			   txq_id, txq-&gt;read_ptr, tfd_num, ssn);</div><div class='del'>-</div><div class='del'>-	/*Since we free until index _not_ inclusive, the one before index is</div><div class='del'>-	 * the last we will free. This one must be used */</div><div class='del'>-	last_to_free = iwl_txq_dec_wrap(trans, tfd_num);</div><div class='del'>-</div><div class='del'>-	if (!iwl_txq_used(txq, last_to_free)) {</div><div class='del'>-		IWL_ERR(trans,</div><div class='del'>-			"%s: Read index for txq id (%d), last_to_free %d is out of range [0-%d] %d %d.\n",</div><div class='del'>-			__func__, txq_id, last_to_free,</div><div class='del'>-			trans-&gt;trans_cfg-&gt;base_params-&gt;max_tfd_queue_size,</div><div class='del'>-			txq-&gt;write_ptr, txq-&gt;read_ptr);</div><div class='del'>-</div><div class='del'>-		iwl_op_mode_time_point(trans-&gt;op_mode,</div><div class='del'>-				       IWL_FW_INI_TIME_POINT_FAKE_TX,</div><div class='del'>-				       NULL);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(!skb_queue_empty(skbs)))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	for (;</div><div class='del'>-	     read_ptr != tfd_num;</div><div class='del'>-	     txq-&gt;read_ptr = iwl_txq_inc_wrap(trans, txq-&gt;read_ptr),</div><div class='del'>-	     read_ptr = iwl_txq_get_cmd_index(txq, txq-&gt;read_ptr)) {</div><div class='del'>-		struct sk_buff *skb = txq-&gt;entries[read_ptr].skb;</div><div class='del'>-</div><div class='del'>-		if (WARN_ON_ONCE(!skb))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		iwl_txq_free_tso_page(trans, skb);</div><div class='del'>-</div><div class='del'>-		__skb_queue_tail(skbs, skb);</div><div class='del'>-</div><div class='del'>-		txq-&gt;entries[read_ptr].skb = NULL;</div><div class='del'>-</div><div class='del'>-		if (!trans-&gt;trans_cfg-&gt;use_tfh)</div><div class='del'>-			iwl_txq_gen1_inval_byte_cnt_tbl(trans, txq);</div><div class='del'>-</div><div class='del'>-		iwl_txq_free_tfd(trans, txq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl_txq_progress(txq);</div><div class='del'>-</div><div class='del'>-	if (iwl_txq_space(trans, txq) &gt; txq-&gt;low_mark &amp;&amp;</div><div class='del'>-	    test_bit(txq_id, trans-&gt;txqs.queue_stopped)) {</div><div class='del'>-		struct sk_buff_head overflow_skbs;</div><div class='del'>-</div><div class='del'>-		__skb_queue_head_init(&amp;overflow_skbs);</div><div class='del'>-		skb_queue_splice_init(&amp;txq-&gt;overflow_q, &amp;overflow_skbs);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We are going to transmit from the overflow queue.</div><div class='del'>-		 * Remember this state so that wait_for_txq_empty will know we</div><div class='del'>-		 * are adding more packets to the TFD queue. It cannot rely on</div><div class='del'>-		 * the state of &amp;txq-&gt;overflow_q, as we just emptied it, but</div><div class='del'>-		 * haven't TXed the content yet.</div><div class='del'>-		 */</div><div class='del'>-		txq-&gt;overflow_tx = true;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * This is tricky: we are in reclaim path which is non</div><div class='del'>-		 * re-entrant, so noone will try to take the access the</div><div class='del'>-		 * txq data from that path. We stopped tx, so we can't</div><div class='del'>-		 * have tx as well. Bottom line, we can unlock and re-lock</div><div class='del'>-		 * later.</div><div class='del'>-		 */</div><div class='del'>-		spin_unlock_bh(&amp;txq-&gt;lock);</div><div class='del'>-</div><div class='del'>-		while (!skb_queue_empty(&amp;overflow_skbs)) {</div><div class='del'>-			struct sk_buff *skb = __skb_dequeue(&amp;overflow_skbs);</div><div class='del'>-			struct iwl_device_tx_cmd *dev_cmd_ptr;</div><div class='del'>-</div><div class='del'>-			dev_cmd_ptr = *(void **)((u8 *)skb-&gt;cb +</div><div class='del'>-						 trans-&gt;txqs.dev_cmd_offs);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Note that we can very well be overflowing again.</div><div class='del'>-			 * In that case, iwl_txq_space will be small again</div><div class='del'>-			 * and we won't wake mac80211's queue.</div><div class='del'>-			 */</div><div class='del'>-			iwl_trans_tx(trans, skb, dev_cmd_ptr, txq_id);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (iwl_txq_space(trans, txq) &gt; txq-&gt;low_mark)</div><div class='del'>-			iwl_wake_queue(trans, txq);</div><div class='del'>-</div><div class='del'>-		spin_lock_bh(&amp;txq-&gt;lock);</div><div class='del'>-		txq-&gt;overflow_tx = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	spin_unlock_bh(&amp;txq-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Set wr_ptr of specific device and txq  */</div><div class='del'>-void iwl_txq_set_q_ptrs(struct iwl_trans *trans, int txq_id, int ptr)</div><div class='del'>-{</div><div class='del'>-	struct iwl_txq *txq = trans-&gt;txqs.txq[txq_id];</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;txq-&gt;lock);</div><div class='del'>-</div><div class='del'>-	txq-&gt;write_ptr = ptr;</div><div class='del'>-	txq-&gt;read_ptr = txq-&gt;write_ptr;</div><div class='del'>-</div><div class='del'>-	spin_unlock_bh(&amp;txq-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_trans_txq_freeze_timer(struct iwl_trans *trans, unsigned long txqs,</div><div class='del'>-				bool freeze)</div><div class='del'>-{</div><div class='del'>-	int queue;</div><div class='del'>-</div><div class='del'>-	for_each_set_bit(queue, &amp;txqs, BITS_PER_LONG) {</div><div class='del'>-		struct iwl_txq *txq = trans-&gt;txqs.txq[queue];</div><div class='del'>-		unsigned long now;</div><div class='del'>-</div><div class='del'>-		spin_lock_bh(&amp;txq-&gt;lock);</div><div class='del'>-</div><div class='del'>-		now = jiffies;</div><div class='del'>-</div><div class='del'>-		if (txq-&gt;frozen == freeze)</div><div class='del'>-			goto next_queue;</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_TX_QUEUES(trans, "%s TXQ %d\n",</div><div class='del'>-				    freeze ? "Freezing" : "Waking", queue);</div><div class='del'>-</div><div class='del'>-		txq-&gt;frozen = freeze;</div><div class='del'>-</div><div class='del'>-		if (txq-&gt;read_ptr == txq-&gt;write_ptr)</div><div class='del'>-			goto next_queue;</div><div class='del'>-</div><div class='del'>-		if (freeze) {</div><div class='del'>-			if (unlikely(time_after(now,</div><div class='del'>-						txq-&gt;stuck_timer.expires))) {</div><div class='del'>-				/*</div><div class='del'>-				 * The timer should have fired, maybe it is</div><div class='del'>-				 * spinning right now on the lock.</div><div class='del'>-				 */</div><div class='del'>-				goto next_queue;</div><div class='del'>-			}</div><div class='del'>-			/* remember how long until the timer fires */</div><div class='del'>-			txq-&gt;frozen_expiry_remainder =</div><div class='del'>-				txq-&gt;stuck_timer.expires - now;</div><div class='del'>-			del_timer(&amp;txq-&gt;stuck_timer);</div><div class='del'>-			goto next_queue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Wake a non-empty queue -&gt; arm timer with the</div><div class='del'>-		 * remainder before it froze</div><div class='del'>-		 */</div><div class='del'>-		mod_timer(&amp;txq-&gt;stuck_timer,</div><div class='del'>-			  now + txq-&gt;frozen_expiry_remainder);</div><div class='del'>-</div><div class='del'>-next_queue:</div><div class='del'>-		spin_unlock_bh(&amp;txq-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define HOST_COMPLETE_TIMEOUT	(2 * HZ)</div><div class='del'>-</div><div class='del'>-static int iwl_trans_txq_send_hcmd_sync(struct iwl_trans *trans,</div><div class='del'>-					struct iwl_host_cmd *cmd)</div><div class='del'>-{</div><div class='del'>-	const char *cmd_str = iwl_get_cmd_string(trans, cmd-&gt;id);</div><div class='del'>-	struct iwl_txq *txq = trans-&gt;txqs.txq[trans-&gt;txqs.cmd.q_id];</div><div class='del'>-	int cmd_idx;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(trans, "Attempting to send sync command %s\n", cmd_str);</div><div class='del'>-</div><div class='del'>-	if (WARN(test_and_set_bit(STATUS_SYNC_HCMD_ACTIVE,</div><div class='del'>-				  &amp;trans-&gt;status),</div><div class='del'>-		 "Command %s: a command is already active!\n", cmd_str))</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(trans, "Setting HCMD_ACTIVE for command %s\n", cmd_str);</div><div class='del'>-</div><div class='del'>-	cmd_idx = trans-&gt;ops-&gt;send_cmd(trans, cmd);</div><div class='del'>-	if (cmd_idx &lt; 0) {</div><div class='del'>-		ret = cmd_idx;</div><div class='del'>-		clear_bit(STATUS_SYNC_HCMD_ACTIVE, &amp;trans-&gt;status);</div><div class='del'>-		IWL_ERR(trans, "Error sending %s: enqueue_hcmd failed: %d\n",</div><div class='del'>-			cmd_str, ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = wait_event_timeout(trans-&gt;wait_command_queue,</div><div class='del'>-				 !test_bit(STATUS_SYNC_HCMD_ACTIVE,</div><div class='del'>-					   &amp;trans-&gt;status),</div><div class='del'>-				 HOST_COMPLETE_TIMEOUT);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		IWL_ERR(trans, "Error sending %s: time out after %dms.\n",</div><div class='del'>-			cmd_str, jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));</div><div class='del'>-</div><div class='del'>-		IWL_ERR(trans, "Current CMD queue read_ptr %d write_ptr %d\n",</div><div class='del'>-			txq-&gt;read_ptr, txq-&gt;write_ptr);</div><div class='del'>-</div><div class='del'>-		clear_bit(STATUS_SYNC_HCMD_ACTIVE, &amp;trans-&gt;status);</div><div class='del'>-		IWL_DEBUG_INFO(trans, "Clearing HCMD_ACTIVE for command %s\n",</div><div class='del'>-			       cmd_str);</div><div class='del'>-		ret = -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-		iwl_trans_sync_nmi(trans);</div><div class='del'>-		goto cancel;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_FW_ERROR, &amp;trans-&gt;status)) {</div><div class='del'>-		IWL_ERR(trans, "FW error in SYNC CMD %s\n", cmd_str);</div><div class='del'>-		dump_stack();</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto cancel;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(cmd-&gt;flags &amp; CMD_SEND_IN_RFKILL) &amp;&amp;</div><div class='del'>-	    test_bit(STATUS_RFKILL_OPMODE, &amp;trans-&gt;status)) {</div><div class='del'>-		IWL_DEBUG_RF_KILL(trans, "RFKILL in SYNC CMD... no rsp\n");</div><div class='del'>-		ret = -ERFKILL;</div><div class='del'>-		goto cancel;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((cmd-&gt;flags &amp; CMD_WANT_SKB) &amp;&amp; !cmd-&gt;resp_pkt) {</div><div class='del'>-		IWL_ERR(trans, "Error: Response NULL in '%s'\n", cmd_str);</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto cancel;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-cancel:</div><div class='del'>-	if (cmd-&gt;flags &amp; CMD_WANT_SKB) {</div><div class='del'>-		/*</div><div class='del'>-		 * Cancel the CMD_WANT_SKB flag for the cmd in the</div><div class='del'>-		 * TX cmd queue. Otherwise in case the cmd comes</div><div class='del'>-		 * in later, it will possibly set an invalid</div><div class='del'>-		 * address (cmd-&gt;meta.source).</div><div class='del'>-		 */</div><div class='del'>-		txq-&gt;entries[cmd_idx].meta.flags &amp;= ~CMD_WANT_SKB;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cmd-&gt;resp_pkt) {</div><div class='del'>-		iwl_free_resp(cmd);</div><div class='del'>-		cmd-&gt;resp_pkt = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl_trans_txq_send_hcmd(struct iwl_trans *trans,</div><div class='del'>-			    struct iwl_host_cmd *cmd)</div><div class='del'>-{</div><div class='del'>-	/* Make sure the NIC is still alive in the bus */</div><div class='del'>-	if (test_bit(STATUS_TRANS_DEAD, &amp;trans-&gt;status))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if (!(cmd-&gt;flags &amp; CMD_SEND_IN_RFKILL) &amp;&amp;</div><div class='del'>-	    test_bit(STATUS_RFKILL_OPMODE, &amp;trans-&gt;status)) {</div><div class='del'>-		IWL_DEBUG_RF_KILL(trans, "Dropping CMD 0x%x: RF KILL\n",</div><div class='del'>-				  cmd-&gt;id);</div><div class='del'>-		return -ERFKILL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(trans-&gt;system_pm_mode == IWL_PLAT_PM_MODE_D3 &amp;&amp;</div><div class='del'>-		     !(cmd-&gt;flags &amp; CMD_SEND_IN_D3))) {</div><div class='del'>-		IWL_DEBUG_WOWLAN(trans, "Dropping CMD 0x%x: D3\n", cmd-&gt;id);</div><div class='del'>-		return -EHOSTDOWN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cmd-&gt;flags &amp; CMD_ASYNC) {</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		/* An asynchronous command can not expect an SKB to be set. */</div><div class='del'>-		if (WARN_ON(cmd-&gt;flags &amp; CMD_WANT_SKB))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		ret = trans-&gt;ops-&gt;send_cmd(trans, cmd);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			IWL_ERR(trans,</div><div class='del'>-				"Error sending %s: enqueue_hcmd failed: %d\n",</div><div class='del'>-				iwl_get_cmd_string(trans, cmd-&gt;id), ret);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return iwl_trans_txq_send_hcmd_sync(trans, cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/queue/tx.h b/drivers/net/wireless/intel/iwlwifi/queue/tx.h<br/>deleted file mode 100644<br/>index 20efc62acf13..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/queue/tx.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intel/iwlwifi/queue/tx.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,184 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2020-2021 Intel Corporation</div><div class='del'>- */</div><div class='del'>-#ifndef __iwl_trans_queue_tx_h__</div><div class='del'>-#define __iwl_trans_queue_tx_h__</div><div class='del'>-#include "iwl-fh.h"</div><div class='del'>-#include "fw/api/tx.h"</div><div class='del'>-</div><div class='del'>-struct iwl_tso_hdr_page {</div><div class='del'>-	struct page *page;</div><div class='del'>-	u8 *pos;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline dma_addr_t</div><div class='del'>-iwl_txq_get_first_tb_dma(struct iwl_txq *txq, int idx)</div><div class='del'>-{</div><div class='del'>-	return txq-&gt;first_tb_dma +</div><div class='del'>-	       sizeof(struct iwl_pcie_first_tb_buf) * idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 iwl_txq_get_cmd_index(const struct iwl_txq *q, u32 index)</div><div class='del'>-{</div><div class='del'>-	return index &amp; (q-&gt;n_window - 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_txq_gen2_unmap(struct iwl_trans *trans, int txq_id);</div><div class='del'>-</div><div class='del'>-static inline void iwl_wake_queue(struct iwl_trans *trans,</div><div class='del'>-				  struct iwl_txq *txq)</div><div class='del'>-{</div><div class='del'>-	if (test_and_clear_bit(txq-&gt;id, trans-&gt;txqs.queue_stopped)) {</div><div class='del'>-		IWL_DEBUG_TX_QUEUES(trans, "Wake hwq %d\n", txq-&gt;id);</div><div class='del'>-		iwl_op_mode_queue_not_full(trans-&gt;op_mode, txq-&gt;id);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void *iwl_txq_get_tfd(struct iwl_trans *trans,</div><div class='del'>-				    struct iwl_txq *txq, int idx)</div><div class='del'>-{</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;use_tfh)</div><div class='del'>-		idx = iwl_txq_get_cmd_index(txq, idx);</div><div class='del'>-</div><div class='del'>-	return txq-&gt;tfds + trans-&gt;txqs.tfd.size * idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl_txq_alloc(struct iwl_trans *trans, struct iwl_txq *txq, int slots_num,</div><div class='del'>-		  bool cmd_queue);</div><div class='del'>-/*</div><div class='del'>- * We need this inline in case dma_addr_t is only 32-bits - since the</div><div class='del'>- * hardware is always 64-bit, the issue can still occur in that case,</div><div class='del'>- * so use u64 for 'phys' here to force the addition in 64-bit.</div><div class='del'>- */</div><div class='del'>-static inline bool iwl_txq_crosses_4g_boundary(u64 phys, u16 len)</div><div class='del'>-{</div><div class='del'>-	return upper_32_bits(phys) != upper_32_bits(phys + len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl_txq_space(struct iwl_trans *trans, const struct iwl_txq *q);</div><div class='del'>-</div><div class='del'>-static inline void iwl_txq_stop(struct iwl_trans *trans, struct iwl_txq *txq)</div><div class='del'>-{</div><div class='del'>-	if (!test_and_set_bit(txq-&gt;id, trans-&gt;txqs.queue_stopped)) {</div><div class='del'>-		iwl_op_mode_queue_full(trans-&gt;op_mode, txq-&gt;id);</div><div class='del'>-		IWL_DEBUG_TX_QUEUES(trans, "Stop hwq %d\n", txq-&gt;id);</div><div class='del'>-	} else {</div><div class='del'>-		IWL_DEBUG_TX_QUEUES(trans, "hwq %d already stopped\n",</div><div class='del'>-				    txq-&gt;id);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_txq_inc_wrap - increment queue index, wrap back to beginning</div><div class='del'>- * @index -- current index</div><div class='del'>- */</div><div class='del'>-static inline int iwl_txq_inc_wrap(struct iwl_trans *trans, int index)</div><div class='del'>-{</div><div class='del'>-	return ++index &amp;</div><div class='del'>-		(trans-&gt;trans_cfg-&gt;base_params-&gt;max_tfd_queue_size - 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_txq_dec_wrap - decrement queue index, wrap back to end</div><div class='del'>- * @index -- current index</div><div class='del'>- */</div><div class='del'>-static inline int iwl_txq_dec_wrap(struct iwl_trans *trans, int index)</div><div class='del'>-{</div><div class='del'>-	return --index &amp;</div><div class='del'>-		(trans-&gt;trans_cfg-&gt;base_params-&gt;max_tfd_queue_size - 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool iwl_txq_used(const struct iwl_txq *q, int i)</div><div class='del'>-{</div><div class='del'>-	int index = iwl_txq_get_cmd_index(q, i);</div><div class='del'>-	int r = iwl_txq_get_cmd_index(q, q-&gt;read_ptr);</div><div class='del'>-	int w = iwl_txq_get_cmd_index(q, q-&gt;write_ptr);</div><div class='del'>-</div><div class='del'>-	return w &gt;= r ?</div><div class='del'>-		(index &gt;= r &amp;&amp; index &lt; w) :</div><div class='del'>-		!(index &lt; r &amp;&amp; index &gt;= w);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_txq_free_tso_page(struct iwl_trans *trans, struct sk_buff *skb);</div><div class='del'>-</div><div class='del'>-void iwl_txq_log_scd_error(struct iwl_trans *trans, struct iwl_txq *txq);</div><div class='del'>-</div><div class='del'>-int iwl_txq_gen2_set_tb(struct iwl_trans *trans,</div><div class='del'>-			struct iwl_tfh_tfd *tfd, dma_addr_t addr,</div><div class='del'>-			u16 len);</div><div class='del'>-</div><div class='del'>-void iwl_txq_gen2_tfd_unmap(struct iwl_trans *trans,</div><div class='del'>-			    struct iwl_cmd_meta *meta,</div><div class='del'>-			    struct iwl_tfh_tfd *tfd);</div><div class='del'>-</div><div class='del'>-int iwl_txq_dyn_alloc(struct iwl_trans *trans,</div><div class='del'>-		      __le16 flags, u8 sta_id, u8 tid,</div><div class='del'>-		      int cmd_id, int size,</div><div class='del'>-		      unsigned int timeout);</div><div class='del'>-</div><div class='del'>-int iwl_txq_gen2_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='del'>-		    struct iwl_device_tx_cmd *dev_cmd, int txq_id);</div><div class='del'>-</div><div class='del'>-void iwl_txq_dyn_free(struct iwl_trans *trans, int queue);</div><div class='del'>-void iwl_txq_gen2_free_tfd(struct iwl_trans *trans, struct iwl_txq *txq);</div><div class='del'>-void iwl_txq_inc_wr_ptr(struct iwl_trans *trans, struct iwl_txq *txq);</div><div class='del'>-void iwl_txq_gen2_tx_free(struct iwl_trans *trans);</div><div class='del'>-int iwl_txq_init(struct iwl_trans *trans, struct iwl_txq *txq, int slots_num,</div><div class='del'>-		 bool cmd_queue);</div><div class='del'>-int iwl_txq_gen2_init(struct iwl_trans *trans, int txq_id, int queue_size);</div><div class='del'>-#ifdef CONFIG_INET</div><div class='del'>-struct iwl_tso_hdr_page *get_page_hdr(struct iwl_trans *trans, size_t len,</div><div class='del'>-				      struct sk_buff *skb);</div><div class='del'>-#endif</div><div class='del'>-static inline u8 iwl_txq_gen1_tfd_get_num_tbs(struct iwl_trans *trans,</div><div class='del'>-					      void *_tfd)</div><div class='del'>-{</div><div class='del'>-	struct iwl_tfd *tfd;</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;use_tfh) {</div><div class='del'>-		struct iwl_tfh_tfd *tfd = _tfd;</div><div class='del'>-</div><div class='del'>-		return le16_to_cpu(tfd-&gt;num_tbs) &amp; 0x1f;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tfd = (struct iwl_tfd *)_tfd;</div><div class='del'>-	return tfd-&gt;num_tbs &amp; 0x1f;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 iwl_txq_gen1_tfd_tb_get_len(struct iwl_trans *trans,</div><div class='del'>-					      void *_tfd, u8 idx)</div><div class='del'>-{</div><div class='del'>-	struct iwl_tfd *tfd;</div><div class='del'>-	struct iwl_tfd_tb *tb;</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;trans_cfg-&gt;use_tfh) {</div><div class='del'>-		struct iwl_tfh_tfd *tfd = _tfd;</div><div class='del'>-		struct iwl_tfh_tb *tb = &amp;tfd-&gt;tbs[idx];</div><div class='del'>-</div><div class='del'>-		return le16_to_cpu(tb-&gt;tb_len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tfd = (struct iwl_tfd *)_tfd;</div><div class='del'>-	tb = &amp;tfd-&gt;tbs[idx];</div><div class='del'>-</div><div class='del'>-	return le16_to_cpu(tb-&gt;hi_n_len) &gt;&gt; 4;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_txq_gen1_tfd_unmap(struct iwl_trans *trans,</div><div class='del'>-			    struct iwl_cmd_meta *meta,</div><div class='del'>-			    struct iwl_txq *txq, int index);</div><div class='del'>-void iwl_txq_gen1_inval_byte_cnt_tbl(struct iwl_trans *trans,</div><div class='del'>-				     struct iwl_txq *txq);</div><div class='del'>-void iwl_txq_gen1_update_byte_cnt_tbl(struct iwl_trans *trans,</div><div class='del'>-				      struct iwl_txq *txq, u16 byte_cnt,</div><div class='del'>-				      int num_tbs);</div><div class='del'>-void iwl_txq_reclaim(struct iwl_trans *trans, int txq_id, int ssn,</div><div class='del'>-		     struct sk_buff_head *skbs);</div><div class='del'>-void iwl_txq_set_q_ptrs(struct iwl_trans *trans, int txq_id, int ptr);</div><div class='del'>-void iwl_trans_txq_freeze_timer(struct iwl_trans *trans, unsigned long txqs,</div><div class='del'>-				bool freeze);</div><div class='del'>-void iwl_txq_progress(struct iwl_txq *txq);</div><div class='del'>-void iwl_txq_free_tfd(struct iwl_trans *trans, struct iwl_txq *txq);</div><div class='del'>-int iwl_trans_txq_send_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd);</div><div class='del'>-#endif /* __iwl_trans_queue_tx_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/tests/Makefile b/drivers/net/wireless/intel/iwlwifi/tests/Makefile<br/>new file mode 100644<br/>index 000000000000..b996c45d43e7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/tests/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/tests/Makefile</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+</div><div class='add'>+iwlwifi-tests-y += module.o devinfo.o utils.o nvm_parse.o</div><div class='add'>+</div><div class='add'>+ccflags-y += -I$(src)/../</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_IWLWIFI_KUNIT_TESTS) += iwlwifi-tests.o</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/tests/devinfo.c b/drivers/net/wireless/intel/iwlwifi/tests/devinfo.c<br/>new file mode 100644<br/>index 000000000000..6bf2ad18b009<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/tests/devinfo.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/tests/devinfo.c</a></div><div class='hunk'>@@ -0,0 +1,316 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * KUnit tests for the iwlwifi device info table</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2023-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;kunit/test.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include "iwl-drv.h"</div><div class='add'>+#include "iwl-config.h"</div><div class='add'>+</div><div class='add'>+MODULE_IMPORT_NS("EXPORTED_FOR_KUNIT_TESTING");</div><div class='add'>+</div><div class='add'>+static void iwl_pci_print_dev_info(const char *pfx, const struct iwl_dev_info *di)</div><div class='add'>+{</div><div class='add'>+	u16 subdevice_mask = GENMASK(di-&gt;subdevice_m_h, di-&gt;subdevice_m_l);</div><div class='add'>+	char buf[100] = {};</div><div class='add'>+	int pos = 0;</div><div class='add'>+</div><div class='add'>+	if (di-&gt;match_rf_type)</div><div class='add'>+		pos += scnprintf(buf + pos, sizeof(buf) - pos,</div><div class='add'>+				 " rf_type=%03x", di-&gt;rf_type);</div><div class='add'>+	else</div><div class='add'>+		pos += scnprintf(buf + pos, sizeof(buf) - pos,</div><div class='add'>+				 " rf_type=*");</div><div class='add'>+</div><div class='add'>+	if (di-&gt;match_bw_limit)</div><div class='add'>+		pos += scnprintf(buf + pos, sizeof(buf) - pos,</div><div class='add'>+				 " bw_limit=%d", di-&gt;bw_limit);</div><div class='add'>+	else</div><div class='add'>+		pos += scnprintf(buf + pos, sizeof(buf) - pos,</div><div class='add'>+				 " bw_limit=*");</div><div class='add'>+</div><div class='add'>+	if (di-&gt;match_rf_id)</div><div class='add'>+		pos += scnprintf(buf + pos, sizeof(buf) - pos,</div><div class='add'>+				 " rf_id=0x%x", di-&gt;rf_id);</div><div class='add'>+	else</div><div class='add'>+		pos += scnprintf(buf + pos, sizeof(buf) - pos,</div><div class='add'>+				 " rf_id=*");</div><div class='add'>+</div><div class='add'>+	if (di-&gt;match_cdb)</div><div class='add'>+		pos += scnprintf(buf + pos, sizeof(buf) - pos,</div><div class='add'>+				 " cdb=%d", di-&gt;cdb);</div><div class='add'>+	else</div><div class='add'>+		pos += scnprintf(buf + pos, sizeof(buf) - pos,</div><div class='add'>+				 " cdb=*");</div><div class='add'>+</div><div class='add'>+	if (di-&gt;match_discrete)</div><div class='add'>+		pos += scnprintf(buf + pos, sizeof(buf) - pos,</div><div class='add'>+				 " discrete=%d",</div><div class='add'>+				 di-&gt;discrete);</div><div class='add'>+	else</div><div class='add'>+		pos += scnprintf(buf + pos, sizeof(buf) - pos,</div><div class='add'>+				 " discrete=*");</div><div class='add'>+</div><div class='add'>+	printk(KERN_DEBUG "%sdev=%04x subdev=%04x/%04x%s\n",</div><div class='add'>+	       pfx, di-&gt;device, di-&gt;subdevice, subdevice_mask, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devinfo_table_order(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; iwl_dev_info_table_size; idx++) {</div><div class='add'>+		const struct iwl_dev_info *di = &amp;iwl_dev_info_table[idx];</div><div class='add'>+		const struct iwl_dev_info *ret;</div><div class='add'>+</div><div class='add'>+		ret = iwl_pci_find_dev_info(di-&gt;device, di-&gt;subdevice,</div><div class='add'>+					    di-&gt;rf_type, di-&gt;cdb,</div><div class='add'>+					    di-&gt;rf_id, di-&gt;bw_limit,</div><div class='add'>+					    di-&gt;discrete);</div><div class='add'>+		if (!ret) {</div><div class='add'>+			iwl_pci_print_dev_info("No entry found for: ", di);</div><div class='add'>+			KUNIT_FAIL(test,</div><div class='add'>+				   "No entry found for entry at index %d\n", idx);</div><div class='add'>+		} else if (ret != di) {</div><div class='add'>+			iwl_pci_print_dev_info("searched: ", di);</div><div class='add'>+			iwl_pci_print_dev_info("found:    ", ret);</div><div class='add'>+			KUNIT_FAIL(test,</div><div class='add'>+				   "unusable entry at index %d (found index %d instead)\n",</div><div class='add'>+				   idx, (int)(ret - iwl_dev_info_table));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devinfo_discrete_match(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Validate that any entries with discrete/integrated match have</div><div class='add'>+	 * the same config with the value inverted (if they match at all.)</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	for (int idx = 0; idx &lt; iwl_dev_info_table_size; idx++) {</div><div class='add'>+		const struct iwl_dev_info *di = &amp;iwl_dev_info_table[idx];</div><div class='add'>+		const struct iwl_dev_info *ret;</div><div class='add'>+</div><div class='add'>+		if (!di-&gt;match_discrete)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = iwl_pci_find_dev_info(di-&gt;device, di-&gt;subdevice,</div><div class='add'>+					    di-&gt;rf_type, di-&gt;cdb,</div><div class='add'>+					    di-&gt;rf_id, di-&gt;bw_limit,</div><div class='add'>+					    !di-&gt;discrete);</div><div class='add'>+		if (!ret)</div><div class='add'>+			continue;</div><div class='add'>+		KUNIT_EXPECT_PTR_EQ(test, di-&gt;cfg, ret-&gt;cfg);</div><div class='add'>+		/* and check the name is different, that'd be the point of it */</div><div class='add'>+		KUNIT_EXPECT_NE(test, strcmp(di-&gt;name, ret-&gt;name), 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devinfo_names(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; iwl_dev_info_table_size; idx++) {</div><div class='add'>+		const struct iwl_dev_info *di = &amp;iwl_dev_info_table[idx];</div><div class='add'>+</div><div class='add'>+		KUNIT_ASSERT_TRUE(test, di-&gt;name);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devinfo_no_cfg_dups(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; iwl_dev_info_table_size; i++) {</div><div class='add'>+		const struct iwl_rf_cfg *cfg_i = iwl_dev_info_table[i].cfg;</div><div class='add'>+</div><div class='add'>+		for (int j = 0; j &lt; i; j++) {</div><div class='add'>+			const struct iwl_rf_cfg *cfg_j = iwl_dev_info_table[j].cfg;</div><div class='add'>+</div><div class='add'>+			if (cfg_i == cfg_j)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			KUNIT_EXPECT_NE_MSG(test, memcmp(cfg_i, cfg_j,</div><div class='add'>+							 sizeof(*cfg_i)), 0,</div><div class='add'>+					    "identical configs: %ps and %ps\n",</div><div class='add'>+					    cfg_i, cfg_j);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devinfo_no_name_dups(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; iwl_dev_info_table_size; i++) {</div><div class='add'>+		for (int j = 0; j &lt; i; j++) {</div><div class='add'>+			if (iwl_dev_info_table[i].name == iwl_dev_info_table[j].name)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			KUNIT_EXPECT_NE_MSG(test,</div><div class='add'>+					    strcmp(iwl_dev_info_table[i].name,</div><div class='add'>+						   iwl_dev_info_table[j].name),</div><div class='add'>+					    0,</div><div class='add'>+					    "name dup: %ps/%ps",</div><div class='add'>+					    iwl_dev_info_table[i].name,</div><div class='add'>+					    iwl_dev_info_table[j].name);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devinfo_check_subdev_match(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; iwl_dev_info_table_size; i++) {</div><div class='add'>+		const struct iwl_dev_info *di = &amp;iwl_dev_info_table[i];</div><div class='add'>+		u16 subdevice_mask = GENMASK(di-&gt;subdevice_m_h,</div><div class='add'>+					     di-&gt;subdevice_m_l);</div><div class='add'>+</div><div class='add'>+		/* if BW limit bit is matched then must have a limit */</div><div class='add'>+		if (di-&gt;match_bw_limit == 1 &amp;&amp; di-&gt;bw_limit == 1)</div><div class='add'>+			KUNIT_EXPECT_NE(test, di-&gt;cfg-&gt;bw_limit, 0);</div><div class='add'>+</div><div class='add'>+		/* if subdevice is ANY we can have RF ID/BW limit */</div><div class='add'>+		if (di-&gt;subdevice == (u16)IWL_CFG_ANY)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* same if the subdevice mask doesn't overlap them */</div><div class='add'>+		if (IWL_SUBDEVICE_RF_ID(subdevice_mask) == 0 &amp;&amp;</div><div class='add'>+		    IWL_SUBDEVICE_BW_LIM(subdevice_mask) == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* but otherwise they shouldn't be used */</div><div class='add'>+		KUNIT_EXPECT_EQ(test, (int)di-&gt;match_rf_id, 0);</div><div class='add'>+		KUNIT_EXPECT_EQ(test, (int)di-&gt;match_bw_limit, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devinfo_check_killer_subdev(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; iwl_dev_info_table_size; i++) {</div><div class='add'>+		const struct iwl_dev_info *di = &amp;iwl_dev_info_table[i];</div><div class='add'>+</div><div class='add'>+		if (!strstr(di-&gt;name, "Killer"))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		KUNIT_EXPECT_NE(test, di-&gt;subdevice, (u16)IWL_CFG_ANY);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devinfo_pci_ids(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *dev;</div><div class='add'>+</div><div class='add'>+	dev = kunit_kmalloc(test, sizeof(*dev), GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, dev);</div><div class='add'>+</div><div class='add'>+	for (int i = 0; iwl_hw_card_ids[i].vendor; i++) {</div><div class='add'>+		const struct pci_device_id *s, *t;</div><div class='add'>+</div><div class='add'>+		s = &amp;iwl_hw_card_ids[i];</div><div class='add'>+		dev-&gt;vendor = s-&gt;vendor;</div><div class='add'>+		dev-&gt;device = s-&gt;device;</div><div class='add'>+		dev-&gt;subsystem_vendor = s-&gt;subvendor;</div><div class='add'>+		dev-&gt;subsystem_device = s-&gt;subdevice;</div><div class='add'>+		dev-&gt;class = s-&gt;class;</div><div class='add'>+</div><div class='add'>+		t = pci_match_id(iwl_hw_card_ids, dev);</div><div class='add'>+		KUNIT_EXPECT_PTR_EQ(test, t, s);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devinfo_no_mac_cfg_dups(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; iwl_hw_card_ids[i].vendor; i++) {</div><div class='add'>+		const struct iwl_mac_cfg *cfg_i =</div><div class='add'>+			(void *)iwl_hw_card_ids[i].driver_data;</div><div class='add'>+</div><div class='add'>+		for (int j = 0; j &lt; i; j++) {</div><div class='add'>+			const struct iwl_mac_cfg *cfg_j =</div><div class='add'>+				(void *)iwl_hw_card_ids[j].driver_data;</div><div class='add'>+</div><div class='add'>+			if (cfg_i == cfg_j)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			KUNIT_EXPECT_NE_MSG(test, memcmp(cfg_j, cfg_i,</div><div class='add'>+							 sizeof(*cfg_i)), 0,</div><div class='add'>+					    "identical configs: %ps and %ps\n",</div><div class='add'>+					    cfg_i, cfg_j);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devinfo_api_range(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	/* Check that all iwl_mac_cfg's have either both min and max set, or neither */</div><div class='add'>+	for (int i = 0; iwl_hw_card_ids[i].vendor; i++) {</div><div class='add'>+		const struct iwl_mac_cfg *mac_cfg =</div><div class='add'>+			(void *)iwl_hw_card_ids[i].driver_data;</div><div class='add'>+		const struct iwl_family_base_params *base = mac_cfg-&gt;base;</div><div class='add'>+</div><div class='add'>+		KUNIT_EXPECT_EQ_MSG(test, !!base-&gt;ucode_api_min,</div><div class='add'>+				    !!base-&gt;ucode_api_max,</div><div class='add'>+				    "%ps: ucode_api_min (%u) and ucode_api_min (%u) should be both set or neither.\n",</div><div class='add'>+				    base, base-&gt;ucode_api_min,</div><div class='add'>+				    base-&gt;ucode_api_max);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check the same for the iwl_rf_cfg's */</div><div class='add'>+	for (int i = 0; i &lt; iwl_dev_info_table_size; i++) {</div><div class='add'>+		const struct iwl_rf_cfg *rf_cfg = iwl_dev_info_table[i].cfg;</div><div class='add'>+</div><div class='add'>+		KUNIT_EXPECT_EQ_MSG(test, !!rf_cfg-&gt;ucode_api_min,</div><div class='add'>+				    !!rf_cfg-&gt;ucode_api_max,</div><div class='add'>+				    "%ps: ucode_api_min (%u) and ucode_api_min (%u) should be both set or neither.\n",</div><div class='add'>+				    rf_cfg, rf_cfg-&gt;ucode_api_min,</div><div class='add'>+				    rf_cfg-&gt;ucode_api_max);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devinfo_pci_ids_config(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; iwl_hw_card_ids[i].vendor; i++) {</div><div class='add'>+		const struct pci_device_id *s = &amp;iwl_hw_card_ids[i];</div><div class='add'>+		const struct iwl_dev_info *di;</div><div class='add'>+</div><div class='add'>+		if (s-&gt;device == PCI_ANY_ID || s-&gt;subdevice == PCI_ANY_ID)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IWLMVM) || IS_ENABLED(CONFIG_IWLMLD)</div><div class='add'>+		/*</div><div class='add'>+		 * The check below only works for old (pre-CNVI) devices. Most</div><div class='add'>+		 * new have subdevice==ANY, so are already skipped, but for some</div><div class='add'>+		 * Bz platform(s) we list all the RF PCI IDs. Skip those too.</div><div class='add'>+		 */</div><div class='add'>+		if (s-&gt;driver_data == (kernel_ulong_t)&amp;iwl_bz_mac_cfg)</div><div class='add'>+			continue;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		di = iwl_pci_find_dev_info(s-&gt;device, s-&gt;subdevice,</div><div class='add'>+					   0, 0, 0, 0, true);</div><div class='add'>+</div><div class='add'>+		KUNIT_EXPECT_PTR_NE_MSG(test, di, NULL,</div><div class='add'>+					"PCI ID %04x:%04x not found\n",</div><div class='add'>+					s-&gt;device, s-&gt;subdevice);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kunit_case devinfo_test_cases[] = {</div><div class='add'>+	KUNIT_CASE(devinfo_table_order),</div><div class='add'>+	KUNIT_CASE(devinfo_discrete_match),</div><div class='add'>+	KUNIT_CASE(devinfo_names),</div><div class='add'>+	KUNIT_CASE(devinfo_no_cfg_dups),</div><div class='add'>+	KUNIT_CASE(devinfo_no_name_dups),</div><div class='add'>+	KUNIT_CASE(devinfo_check_subdev_match),</div><div class='add'>+	KUNIT_CASE(devinfo_check_killer_subdev),</div><div class='add'>+	KUNIT_CASE(devinfo_pci_ids),</div><div class='add'>+	KUNIT_CASE(devinfo_no_mac_cfg_dups),</div><div class='add'>+	KUNIT_CASE(devinfo_api_range),</div><div class='add'>+	KUNIT_CASE(devinfo_pci_ids_config),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kunit_suite iwlwifi_devinfo = {</div><div class='add'>+	.name = "iwlwifi-devinfo",</div><div class='add'>+	.test_cases = devinfo_test_cases,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+kunit_test_suite(iwlwifi_devinfo);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/tests/module.c b/drivers/net/wireless/intel/iwlwifi/tests/module.c<br/>new file mode 100644<br/>index 000000000000..0c54f818e5a7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/tests/module.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/tests/module.c</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/*</div><div class='add'>+ * Module boilerplate for the iwlwifi kunit module.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2023 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("kunit tests for iwlwifi");</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/tests/nvm_parse.c b/drivers/net/wireless/intel/iwlwifi/tests/nvm_parse.c<br/>new file mode 100644<br/>index 000000000000..853911900bfd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/tests/nvm_parse.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/tests/nvm_parse.c</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * KUnit tests for NVM parse</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include &lt;kunit/static_stub.h&gt;</div><div class='add'>+#include &lt;kunit/test.h&gt;</div><div class='add'>+#include &lt;iwl-nvm-parse.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_IMPORT_NS("EXPORTED_FOR_KUNIT_TESTING");</div><div class='add'>+</div><div class='add'>+static const struct nvm_flag_case {</div><div class='add'>+	const char *desc;</div><div class='add'>+	u16 nvm_flags;</div><div class='add'>+	u32 reg_rule_flags;</div><div class='add'>+	u32 set_reg_rule_flags;</div><div class='add'>+	u32 clear_reg_rule_flags;</div><div class='add'>+} nvm_flag_cases[] = {</div><div class='add'>+	{</div><div class='add'>+		.desc = "Restricting VLP client and AP access",</div><div class='add'>+		.nvm_flags = 0,</div><div class='add'>+		.set_reg_rule_flags = NL80211_RRF_NO_6GHZ_VLP_CLIENT,</div><div class='add'>+		.clear_reg_rule_flags = NL80211_RRF_ALLOW_6GHZ_VLP_AP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "Allow VLP client and AP access",</div><div class='add'>+		.nvm_flags = NVM_CHANNEL_VLP,</div><div class='add'>+		.set_reg_rule_flags = NL80211_RRF_ALLOW_6GHZ_VLP_AP,</div><div class='add'>+		.clear_reg_rule_flags = NL80211_RRF_NO_6GHZ_VLP_CLIENT,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "Allow VLP client access, while restricting AP access",</div><div class='add'>+		.nvm_flags = NVM_CHANNEL_VLP | NVM_CHANNEL_VLP_AP_NOT_ALLOWED,</div><div class='add'>+		.set_reg_rule_flags = 0,</div><div class='add'>+		.clear_reg_rule_flags = NL80211_RRF_ALLOW_6GHZ_VLP_AP |</div><div class='add'>+					NL80211_RRF_NO_6GHZ_VLP_CLIENT,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+KUNIT_ARRAY_PARAM_DESC(nvm_flag, nvm_flag_cases, desc)</div><div class='add'>+</div><div class='add'>+static void test_nvm_flags(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	const struct nvm_flag_case *params = test-&gt;param_value;</div><div class='add'>+	struct iwl_reg_capa reg_capa = {};</div><div class='add'>+	u32 flags = 0;</div><div class='add'>+</div><div class='add'>+	flags = iwl_nvm_get_regdom_bw_flags(NULL, 0, params-&gt;nvm_flags,</div><div class='add'>+					    reg_capa);</div><div class='add'>+</div><div class='add'>+	if ((params-&gt;set_reg_rule_flags &amp; flags) != params-&gt;set_reg_rule_flags)</div><div class='add'>+		KUNIT_FAIL(test, "Expected set bits:0x%08x flags:0x%08x\n",</div><div class='add'>+			   params-&gt;set_reg_rule_flags, flags);</div><div class='add'>+</div><div class='add'>+	if (params-&gt;clear_reg_rule_flags &amp; flags)</div><div class='add'>+		KUNIT_FAIL(test, "Expected clear bits:0x%08x flags:0x%08x\n",</div><div class='add'>+			   params-&gt;clear_reg_rule_flags, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kunit_case nvm_flags_test_cases[] = {</div><div class='add'>+	KUNIT_CASE_PARAM(test_nvm_flags,</div><div class='add'>+			 nvm_flag_gen_params),</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kunit_suite nvm_flags_suite = {</div><div class='add'>+	.name = "iwlwifi-nvm_flags",</div><div class='add'>+	.test_cases = nvm_flags_test_cases,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+kunit_test_suite(nvm_flags_suite);</div><div class='head'>diff --git a/drivers/net/wireless/intel/iwlwifi/tests/utils.c b/drivers/net/wireless/intel/iwlwifi/tests/utils.c<br/>new file mode 100644<br/>index 000000000000..df2c3a891e7e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intel/iwlwifi/tests/utils.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intel/iwlwifi/tests/utils.c</a></div><div class='hunk'>@@ -0,0 +1,109 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * KUnit tests for utilities</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024-2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+#include "../iwl-utils.h"</div><div class='add'>+#include &lt;kunit/test.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_IMPORT_NS("IWLWIFI");</div><div class='add'>+</div><div class='add'>+static const struct average_neg_db_case {</div><div class='add'>+	const char *desc;</div><div class='add'>+	u8 neg_dbm[22];</div><div class='add'>+	s8 result;</div><div class='add'>+} average_neg_db_cases[] = {</div><div class='add'>+	{</div><div class='add'>+		.desc = "Smallest possible value, all filled",</div><div class='add'>+		.neg_dbm = {</div><div class='add'>+			128, 128, 128, 128, 128, 128, 128, 128, 128, 128,</div><div class='add'>+			128, 128, 128, 128, 128, 128, 128, 128, 128, 128,</div><div class='add'>+			128, 128</div><div class='add'>+		},</div><div class='add'>+		.result = -128,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "Biggest possible value, all filled",</div><div class='add'>+		.neg_dbm = {</div><div class='add'>+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+			0, 0,</div><div class='add'>+		},</div><div class='add'>+		.result = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "Smallest possible value, partial filled",</div><div class='add'>+		.neg_dbm = {</div><div class='add'>+			128, 128, 128, 128, 128, 128, 128, 128, 128, 128,</div><div class='add'>+			0xff, 0xff, 0xff, 0xff, 0xff,</div><div class='add'>+			0xff, 0xff, 0xff, 0xff, 0xff,</div><div class='add'>+			0xff, 0xff,</div><div class='add'>+		},</div><div class='add'>+		.result = -128,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "Biggest possible value, partial filled",</div><div class='add'>+		.neg_dbm = {</div><div class='add'>+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+			0xff, 0xff, 0xff, 0xff, 0xff,</div><div class='add'>+			0xff, 0xff, 0xff, 0xff, 0xff,</div><div class='add'>+			0xff, 0xff,</div><div class='add'>+		},</div><div class='add'>+		.result = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "Adding -80dBm to -75dBm until it is still rounded to -79dBm",</div><div class='add'>+		.neg_dbm = {</div><div class='add'>+			75, 80, 80, 80, 80, 80, 80, 80, 80, 80,</div><div class='add'>+			80, 80, 80, 80, 80, 80, 80, 0xff, 0xff, 0xff,</div><div class='add'>+			0xff, 0xff,</div><div class='add'>+		},</div><div class='add'>+		.result = -79,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc = "Adding -80dBm to -75dBm until it is just rounded to -80dBm",</div><div class='add'>+		.neg_dbm = {</div><div class='add'>+			75, 80, 80, 80, 80, 80, 80, 80, 80, 80,</div><div class='add'>+			80, 80, 80, 80, 80, 80, 80, 80, 0xff, 0xff,</div><div class='add'>+			0xff, 0xff,</div><div class='add'>+		},</div><div class='add'>+		.result = -80,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+KUNIT_ARRAY_PARAM_DESC(average_neg_db, average_neg_db_cases, desc)</div><div class='add'>+</div><div class='add'>+static void test_average_neg_db(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	const struct average_neg_db_case *params = test-&gt;param_value;</div><div class='add'>+	u8 reversed[ARRAY_SIZE(params-&gt;neg_dbm)];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Test the values in the given order */</div><div class='add'>+	KUNIT_ASSERT_EQ(test,</div><div class='add'>+			iwl_average_neg_dbm(params-&gt;neg_dbm,</div><div class='add'>+					    ARRAY_SIZE(params-&gt;neg_dbm)),</div><div class='add'>+			params-&gt;result);</div><div class='add'>+</div><div class='add'>+	/* Test in reverse order */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(params-&gt;neg_dbm); i++)</div><div class='add'>+		reversed[ARRAY_SIZE(params-&gt;neg_dbm) - i - 1] =</div><div class='add'>+			params-&gt;neg_dbm[i];</div><div class='add'>+	KUNIT_ASSERT_EQ(test,</div><div class='add'>+			iwl_average_neg_dbm(reversed,</div><div class='add'>+					    ARRAY_SIZE(params-&gt;neg_dbm)),</div><div class='add'>+			params-&gt;result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kunit_case average_db_case[] = {</div><div class='add'>+	KUNIT_CASE_PARAM(test_average_neg_db, average_neg_db_gen_params),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kunit_suite average_db = {</div><div class='add'>+	.name = "iwl-average-db",</div><div class='add'>+	.test_cases = average_db_case,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+kunit_test_suite(average_db);</div><div class='head'>diff --git a/drivers/net/wireless/intersil/Kconfig b/drivers/net/wireless/intersil/Kconfig<br/>index c52d9b535623..201b1534a9ca 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intersil/Kconfig</a></div><div class='hunk'>@@ -12,28 +12,6 @@ config WLAN_VENDOR_INTERSIL</div><div class='ctx'> </div><div class='ctx'> if WLAN_VENDOR_INTERSIL</div><div class='ctx'> </div><div class='del'>-source "drivers/net/wireless/intersil/hostap/Kconfig"</div><div class='del'>-source "drivers/net/wireless/intersil/orinoco/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/intersil/p54/Kconfig"</div><div class='ctx'> </div><div class='del'>-config PRISM54</div><div class='del'>-	tristate 'Intersil Prism GT/Duette/Indigo PCI/Cardbus (DEPRECATED)'</div><div class='del'>-	depends on PCI</div><div class='del'>-	select WIRELESS_EXT</div><div class='del'>-	select WEXT_SPY</div><div class='del'>-	select WEXT_PRIV</div><div class='del'>-	select FW_LOADER</div><div class='del'>-	help</div><div class='del'>-	  This enables support for FullMAC PCI/Cardbus prism54 devices. This</div><div class='del'>-	  driver is now deprecated in favor for the SoftMAC driver, p54pci.</div><div class='del'>-	  p54pci supports FullMAC PCI/Cardbus devices as well.</div><div class='del'>-</div><div class='del'>-	  For more information refer to the p54 wiki:</div><div class='del'>-</div><div class='del'>-	  http://wireless.wiki.kernel.org/en/users/Drivers/p54</div><div class='del'>-</div><div class='del'>-	  Note: You need a motherboard with DMA support to use any of these cards</div><div class='del'>-</div><div class='del'>-	  When built as module you get the module prism54</div><div class='del'>-</div><div class='ctx'> endif # WLAN_VENDOR_INTERSIL</div><div class='head'>diff --git a/drivers/net/wireless/intersil/Makefile b/drivers/net/wireless/intersil/Makefile<br/>index aa630e9c3d3d..27e9b2869da1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intersil/Makefile</a></div><div class='hunk'>@@ -1,5 +1,2 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-obj-$(CONFIG_HOSTAP)		+= hostap/</div><div class='del'>-obj-$(CONFIG_HERMES)		+= orinoco/</div><div class='ctx'> obj-$(CONFIG_P54_COMMON)	+= p54/</div><div class='del'>-obj-$(CONFIG_PRISM54)		+= prism54/</div><div class='head'>diff --git a/drivers/net/wireless/intersil/hostap/Kconfig b/drivers/net/wireless/intersil/hostap/Kconfig<br/>deleted file mode 100644<br/>index c865d3156cea..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/hostap/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,95 +0,0 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-config HOSTAP</div><div class='del'>-	tristate "IEEE 802.11 for Host AP (Prism2/2.5/3 and WEP/TKIP/CCMP)"</div><div class='del'>-	select WIRELESS_EXT</div><div class='del'>-	select WEXT_SPY</div><div class='del'>-	select WEXT_PRIV</div><div class='del'>-	select CRYPTO</div><div class='del'>-	select CRYPTO_MICHAEL_MIC</div><div class='del'>-	select CRC32</div><div class='del'>-	select LIB80211</div><div class='del'>-	select LIB80211_CRYPT_WEP</div><div class='del'>-	select LIB80211_CRYPT_TKIP</div><div class='del'>-	select LIB80211_CRYPT_CCMP</div><div class='del'>-	help</div><div class='del'>-	Shared driver code for IEEE 802.11b wireless cards based on</div><div class='del'>-	Intersil Prism2/2.5/3 chipset. This driver supports so called</div><div class='del'>-	Host AP mode that allows the card to act as an IEEE 802.11</div><div class='del'>-	access point.</div><div class='del'>-</div><div class='del'>-	See &lt;http://hostap.epitest.fi/&gt; for more information about the</div><div class='del'>-	Host AP driver configuration and tools. This site includes</div><div class='del'>-	information and tools (hostapd and wpa_supplicant) for WPA/WPA2</div><div class='del'>-	support.</div><div class='del'>-</div><div class='del'>-	This option includes the base Host AP driver code that is shared by</div><div class='del'>-	different hardware models. You will also need to enable support for</div><div class='del'>-	PLX/PCI/CS version of the driver to actually use the driver.</div><div class='del'>-</div><div class='del'>-	The driver can be compiled as a module and it will be called</div><div class='del'>-	hostap.</div><div class='del'>-</div><div class='del'>-config HOSTAP_FIRMWARE</div><div class='del'>-	bool "Support downloading firmware images with Host AP driver"</div><div class='del'>-	depends on HOSTAP</div><div class='del'>-	help</div><div class='del'>-	Configure Host AP driver to include support for firmware image</div><div class='del'>-	download. This option by itself only enables downloading to the</div><div class='del'>-	volatile memory, i.e. the card RAM. This option is required to</div><div class='del'>-	support cards that don't have firmware in flash, such as D-Link</div><div class='del'>-	DWL-520 rev E and D-Link DWL-650 rev P.</div><div class='del'>-</div><div class='del'>-	Firmware image downloading needs a user space tool, prism2_srec.</div><div class='del'>-	It is available from http://hostap.epitest.fi/.</div><div class='del'>-</div><div class='del'>-config HOSTAP_FIRMWARE_NVRAM</div><div class='del'>-	bool "Support for non-volatile firmware download"</div><div class='del'>-	depends on HOSTAP_FIRMWARE</div><div class='del'>-	help</div><div class='del'>-	Allow Host AP driver to write firmware images to the non-volatile</div><div class='del'>-	card memory, i.e. flash memory that survives power cycling.</div><div class='del'>-	Enable this option if you want to be able to change card firmware</div><div class='del'>-	permanently.</div><div class='del'>-</div><div class='del'>-	Firmware image downloading needs a user space tool, prism2_srec.</div><div class='del'>-	It is available from http://hostap.epitest.fi/.</div><div class='del'>-</div><div class='del'>-config HOSTAP_PLX</div><div class='del'>-	tristate "Host AP driver for Prism2/2.5/3 in PLX9052 PCI adaptors"</div><div class='del'>-	depends on PCI &amp;&amp; HOSTAP</div><div class='del'>-	help</div><div class='del'>-	Host AP driver's version for Prism2/2.5/3 PC Cards in PLX9052 based</div><div class='del'>-	PCI adaptors.</div><div class='del'>-</div><div class='del'>-	"Host AP support for Prism2/2.5/3 IEEE 802.11b" is required for this</div><div class='del'>-	driver and its help text includes more information about the Host AP</div><div class='del'>-	driver.</div><div class='del'>-</div><div class='del'>-	The driver can be compiled as a module and will be named</div><div class='del'>-	hostap_plx.</div><div class='del'>-</div><div class='del'>-config HOSTAP_PCI</div><div class='del'>-	tristate "Host AP driver for Prism2.5 PCI adaptors"</div><div class='del'>-	depends on PCI &amp;&amp; HOSTAP</div><div class='del'>-	help</div><div class='del'>-	Host AP driver's version for Prism2.5 PCI adaptors.</div><div class='del'>-</div><div class='del'>-	"Host AP support for Prism2/2.5/3 IEEE 802.11b" is required for this</div><div class='del'>-	driver and its help text includes more information about the Host AP</div><div class='del'>-	driver.</div><div class='del'>-</div><div class='del'>-	The driver can be compiled as a module and will be named</div><div class='del'>-	hostap_pci.</div><div class='del'>-</div><div class='del'>-config HOSTAP_CS</div><div class='del'>-	tristate "Host AP driver for Prism2/2.5/3 PC Cards"</div><div class='del'>-	depends on PCMCIA &amp;&amp; HOSTAP</div><div class='del'>-	help</div><div class='del'>-	Host AP driver's version for Prism2/2.5/3 PC Cards.</div><div class='del'>-</div><div class='del'>-	"Host AP support for Prism2/2.5/3 IEEE 802.11b" is required for this</div><div class='del'>-	driver and its help text includes more information about the Host AP</div><div class='del'>-	driver.</div><div class='del'>-</div><div class='del'>-	The driver can be compiled as a module and will be named</div><div class='del'>-	hostap_cs.</div><div class='head'>diff --git a/drivers/net/wireless/intersil/hostap/Makefile b/drivers/net/wireless/intersil/hostap/Makefile<br/>deleted file mode 100644<br/>index ae3bb73b2d99..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/hostap/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-hostap-y := hostap_80211_rx.o hostap_80211_tx.o hostap_ap.o hostap_info.o \</div><div class='del'>-            hostap_ioctl.o hostap_main.o hostap_proc.o </div><div class='del'>-obj-$(CONFIG_HOSTAP) += hostap.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_HOSTAP_CS) += hostap_cs.o</div><div class='del'>-obj-$(CONFIG_HOSTAP_PLX) += hostap_plx.o</div><div class='del'>-obj-$(CONFIG_HOSTAP_PCI) += hostap_pci.o</div><div class='head'>diff --git a/drivers/net/wireless/intersil/hostap/hostap.h b/drivers/net/wireless/intersil/hostap/hostap.h<br/>deleted file mode 100644<br/>index c4b81ff7d7e4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/hostap/hostap.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,98 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef HOSTAP_H</div><div class='del'>-#define HOSTAP_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/ethtool.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hostap_wlan.h"</div><div class='del'>-#include "hostap_ap.h"</div><div class='del'>-</div><div class='del'>-static const long __maybe_unused freq_list[] = {</div><div class='del'>-	2412, 2417, 2422, 2427, 2432, 2437, 2442,</div><div class='del'>-	2447, 2452, 2457, 2462, 2467, 2472, 2484</div><div class='del'>-};</div><div class='del'>-#define FREQ_COUNT ARRAY_SIZE(freq_list)</div><div class='del'>-</div><div class='del'>-/* hostap.c */</div><div class='del'>-</div><div class='del'>-extern struct proc_dir_entry *hostap_proc;</div><div class='del'>-</div><div class='del'>-u16 hostap_tx_callback_register(local_info_t *local,</div><div class='del'>-				void (*func)(struct sk_buff *, int ok, void *),</div><div class='del'>-				void *data);</div><div class='del'>-int hostap_tx_callback_unregister(local_info_t *local, u16 idx);</div><div class='del'>-int hostap_set_word(struct net_device *dev, int rid, u16 val);</div><div class='del'>-int hostap_set_string(struct net_device *dev, int rid, const char *val);</div><div class='del'>-u16 hostap_get_porttype(local_info_t *local);</div><div class='del'>-int hostap_set_encryption(local_info_t *local);</div><div class='del'>-int hostap_set_antsel(local_info_t *local);</div><div class='del'>-int hostap_set_roaming(local_info_t *local);</div><div class='del'>-int hostap_set_auth_algs(local_info_t *local);</div><div class='del'>-void hostap_dump_rx_header(const char *name,</div><div class='del'>-			   const struct hfa384x_rx_frame *rx);</div><div class='del'>-void hostap_dump_tx_header(const char *name,</div><div class='del'>-			   const struct hfa384x_tx_frame *tx);</div><div class='del'>-extern const struct header_ops hostap_80211_ops;</div><div class='del'>-int hostap_80211_get_hdrlen(__le16 fc);</div><div class='del'>-struct net_device_stats *hostap_get_stats(struct net_device *dev);</div><div class='del'>-void hostap_setup_dev(struct net_device *dev, local_info_t *local,</div><div class='del'>-		      int type);</div><div class='del'>-void hostap_set_multicast_list_queue(struct work_struct *work);</div><div class='del'>-int hostap_set_hostapd(local_info_t *local, int val, int rtnl_locked);</div><div class='del'>-int hostap_set_hostapd_sta(local_info_t *local, int val, int rtnl_locked);</div><div class='del'>-void hostap_cleanup(local_info_t *local);</div><div class='del'>-void hostap_cleanup_handler(void *data);</div><div class='del'>-struct net_device * hostap_add_interface(struct local_info *local,</div><div class='del'>-					 int type, int rtnl_locked,</div><div class='del'>-					 const char *prefix, const char *name);</div><div class='del'>-void hostap_remove_interface(struct net_device *dev, int rtnl_locked,</div><div class='del'>-			     int remove_from_list);</div><div class='del'>-int prism2_update_comms_qual(struct net_device *dev);</div><div class='del'>-int prism2_sta_send_mgmt(local_info_t *local, u8 *dst, u16 stype,</div><div class='del'>-			 u8 *body, size_t bodylen);</div><div class='del'>-int prism2_sta_deauth(local_info_t *local, u16 reason);</div><div class='del'>-int prism2_wds_add(local_info_t *local, u8 *remote_addr,</div><div class='del'>-		   int rtnl_locked);</div><div class='del'>-int prism2_wds_del(local_info_t *local, u8 *remote_addr,</div><div class='del'>-		   int rtnl_locked, int do_not_remove);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* hostap_ap.c */</div><div class='del'>-</div><div class='del'>-int ap_control_add_mac(struct mac_restrictions *mac_restrictions, u8 *mac);</div><div class='del'>-int ap_control_del_mac(struct mac_restrictions *mac_restrictions, u8 *mac);</div><div class='del'>-void ap_control_flush_macs(struct mac_restrictions *mac_restrictions);</div><div class='del'>-int ap_control_kick_mac(struct ap_data *ap, struct net_device *dev, u8 *mac);</div><div class='del'>-void ap_control_kickall(struct ap_data *ap);</div><div class='del'>-void * ap_crypt_get_ptrs(struct ap_data *ap, u8 *addr, int permanent,</div><div class='del'>-			 struct lib80211_crypt_data ***crypt);</div><div class='del'>-int prism2_ap_get_sta_qual(local_info_t *local, struct sockaddr addr[],</div><div class='del'>-			   struct iw_quality qual[], int buf_size,</div><div class='del'>-			   int aplist);</div><div class='del'>-int prism2_ap_translate_scan(struct net_device *dev,</div><div class='del'>-			     struct iw_request_info *info, char *buffer);</div><div class='del'>-int prism2_hostapd(struct ap_data *ap, struct prism2_hostapd_param *param);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* hostap_proc.c */</div><div class='del'>-</div><div class='del'>-void hostap_init_proc(local_info_t *local);</div><div class='del'>-void hostap_remove_proc(local_info_t *local);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* hostap_info.c */</div><div class='del'>-</div><div class='del'>-void hostap_info_init(local_info_t *local);</div><div class='del'>-void hostap_info_process(local_info_t *local, struct sk_buff *skb);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* hostap_ioctl.c */</div><div class='del'>-</div><div class='del'>-extern const struct iw_handler_def hostap_iw_handler_def;</div><div class='del'>-extern const struct ethtool_ops prism2_ethtool_ops;</div><div class='del'>-</div><div class='del'>-int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* HOSTAP_H */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/hostap/hostap_80211.h b/drivers/net/wireless/intersil/hostap/hostap_80211.h<br/>deleted file mode 100644<br/>index 1452cf6ecb07..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/hostap/hostap_80211.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_80211.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,97 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef HOSTAP_80211_H</div><div class='del'>-#define HOSTAP_80211_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-</div><div class='del'>-struct hostap_ieee80211_mgmt {</div><div class='del'>-	__le16 frame_control;</div><div class='del'>-	__le16 duration;</div><div class='del'>-	u8 da[6];</div><div class='del'>-	u8 sa[6];</div><div class='del'>-	u8 bssid[6];</div><div class='del'>-	__le16 seq_ctrl;</div><div class='del'>-	union {</div><div class='del'>-		struct {</div><div class='del'>-			__le16 auth_alg;</div><div class='del'>-			__le16 auth_transaction;</div><div class='del'>-			__le16 status_code;</div><div class='del'>-			/* possibly followed by Challenge text */</div><div class='del'>-			u8 variable[0];</div><div class='del'>-		} __packed auth;</div><div class='del'>-		struct {</div><div class='del'>-			__le16 reason_code;</div><div class='del'>-		} __packed deauth;</div><div class='del'>-		struct {</div><div class='del'>-			__le16 capab_info;</div><div class='del'>-			__le16 listen_interval;</div><div class='del'>-			/* followed by SSID and Supported rates */</div><div class='del'>-			u8 variable[0];</div><div class='del'>-		} __packed assoc_req;</div><div class='del'>-		struct {</div><div class='del'>-			__le16 capab_info;</div><div class='del'>-			__le16 status_code;</div><div class='del'>-			__le16 aid;</div><div class='del'>-			/* followed by Supported rates */</div><div class='del'>-			u8 variable[0];</div><div class='del'>-		} __packed assoc_resp, reassoc_resp;</div><div class='del'>-		struct {</div><div class='del'>-			__le16 capab_info;</div><div class='del'>-			__le16 listen_interval;</div><div class='del'>-			u8 current_ap[6];</div><div class='del'>-			/* followed by SSID and Supported rates */</div><div class='del'>-			u8 variable[0];</div><div class='del'>-		} __packed reassoc_req;</div><div class='del'>-		struct {</div><div class='del'>-			__le16 reason_code;</div><div class='del'>-		} __packed disassoc;</div><div class='del'>-		struct {</div><div class='del'>-		} __packed probe_req;</div><div class='del'>-		struct {</div><div class='del'>-			u8 timestamp[8];</div><div class='del'>-			__le16 beacon_int;</div><div class='del'>-			__le16 capab_info;</div><div class='del'>-			/* followed by some of SSID, Supported rates,</div><div class='del'>-			 * FH Params, DS Params, CF Params, IBSS Params, TIM */</div><div class='del'>-			u8 variable[0];</div><div class='del'>-		} __packed beacon, probe_resp;</div><div class='del'>-	} u;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define IEEE80211_MGMT_HDR_LEN 24</div><div class='del'>-#define IEEE80211_DATA_HDR3_LEN 24</div><div class='del'>-#define IEEE80211_DATA_HDR4_LEN 30</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct hostap_80211_rx_status {</div><div class='del'>-	u32 mac_time;</div><div class='del'>-	u8 signal;</div><div class='del'>-	u8 noise;</div><div class='del'>-	u16 rate; /* in 100 kbps */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* prism2_rx_80211 'type' argument */</div><div class='del'>-enum {</div><div class='del'>-	PRISM2_RX_MONITOR, PRISM2_RX_MGMT, PRISM2_RX_NON_ASSOC,</div><div class='del'>-	PRISM2_RX_NULLFUNC_ACK</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int prism2_rx_80211(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-		    struct hostap_80211_rx_status *rx_stats, int type);</div><div class='del'>-void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-		     struct hostap_80211_rx_status *rx_stats);</div><div class='del'>-void hostap_dump_rx_80211(const char *name, struct sk_buff *skb,</div><div class='del'>-			  struct hostap_80211_rx_status *rx_stats);</div><div class='del'>-</div><div class='del'>-void hostap_dump_tx_80211(const char *name, struct sk_buff *skb);</div><div class='del'>-netdev_tx_t hostap_data_start_xmit(struct sk_buff *skb,</div><div class='del'>-				   struct net_device *dev);</div><div class='del'>-netdev_tx_t hostap_mgmt_start_xmit(struct sk_buff *skb,</div><div class='del'>-				   struct net_device *dev);</div><div class='del'>-netdev_tx_t hostap_master_start_xmit(struct sk_buff *skb,</div><div class='del'>-				     struct net_device *dev);</div><div class='del'>-</div><div class='del'>-#endif /* HOSTAP_80211_H */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/hostap/hostap_80211_rx.c b/drivers/net/wireless/intersil/hostap/hostap_80211_rx.c<br/>deleted file mode 100644<br/>index 61be822f90b5..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/hostap/hostap_80211_rx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_80211_rx.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1116 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;net/lib80211.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hostap_80211.h"</div><div class='del'>-#include "hostap.h"</div><div class='del'>-#include "hostap_ap.h"</div><div class='del'>-</div><div class='del'>-/* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */</div><div class='del'>-/* Ethernet-II snap header (RFC1042 for most EtherTypes) */</div><div class='del'>-static unsigned char rfc1042_header[] =</div><div class='del'>-{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };</div><div class='del'>-/* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */</div><div class='del'>-static unsigned char bridge_tunnel_header[] =</div><div class='del'>-{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };</div><div class='del'>-/* No encapsulation header if EtherType &lt; 0x600 (=length) */</div><div class='del'>-</div><div class='del'>-void hostap_dump_rx_80211(const char *name, struct sk_buff *skb,</div><div class='del'>-			  struct hostap_80211_rx_status *rx_stats)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-	u16 fc;</div><div class='del'>-</div><div class='del'>-	hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: RX signal=%d noise=%d rate=%d len=%d "</div><div class='del'>-	       "jiffies=%ld\n",</div><div class='del'>-	       name, rx_stats-&gt;signal, rx_stats-&gt;noise, rx_stats-&gt;rate,</div><div class='del'>-	       skb-&gt;len, jiffies);</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; 2)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	fc = le16_to_cpu(hdr-&gt;frame_control);</div><div class='del'>-	printk(KERN_DEBUG "   FC=0x%04x (type=%d:%d)%s%s",</div><div class='del'>-	       fc, (fc &amp; IEEE80211_FCTL_FTYPE) &gt;&gt; 2,</div><div class='del'>-	       (fc &amp; IEEE80211_FCTL_STYPE) &gt;&gt; 4,</div><div class='del'>-	       fc &amp; IEEE80211_FCTL_TODS ? " [ToDS]" : "",</div><div class='del'>-	       fc &amp; IEEE80211_FCTL_FROMDS ? " [FromDS]" : "");</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; IEEE80211_DATA_HDR3_LEN) {</div><div class='del'>-		printk("\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(" dur=0x%04x seq=0x%04x\n", le16_to_cpu(hdr-&gt;duration_id),</div><div class='del'>-	       le16_to_cpu(hdr-&gt;seq_ctrl));</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "   A1=%pM", hdr-&gt;addr1);</div><div class='del'>-	printk(" A2=%pM", hdr-&gt;addr2);</div><div class='del'>-	printk(" A3=%pM", hdr-&gt;addr3);</div><div class='del'>-	if (skb-&gt;len &gt;= 30)</div><div class='del'>-		printk(" A4=%pM", hdr-&gt;addr4);</div><div class='del'>-	printk("\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Send RX frame to netif with 802.11 (and possible prism) header.</div><div class='del'>- * Called from hardware or software IRQ context. */</div><div class='del'>-int prism2_rx_80211(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-		    struct hostap_80211_rx_status *rx_stats, int type)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int hdrlen, phdrlen, head_need, tail_need;</div><div class='del'>-	u16 fc;</div><div class='del'>-	int prism_header, ret;</div><div class='del'>-	struct ieee80211_hdr *fhdr;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;type == ARPHRD_IEEE80211_PRISM) {</div><div class='del'>-		if (local-&gt;monitor_type == PRISM2_MONITOR_PRISM) {</div><div class='del'>-			prism_header = 1;</div><div class='del'>-			phdrlen = sizeof(struct linux_wlan_ng_prism_hdr);</div><div class='del'>-		} else { /* local-&gt;monitor_type == PRISM2_MONITOR_CAPHDR */</div><div class='del'>-			prism_header = 2;</div><div class='del'>-			phdrlen = sizeof(struct linux_wlan_ng_cap_hdr);</div><div class='del'>-		}</div><div class='del'>-	} else if (dev-&gt;type == ARPHRD_IEEE80211_RADIOTAP) {</div><div class='del'>-		prism_header = 3;</div><div class='del'>-		phdrlen = sizeof(struct hostap_radiotap_rx);</div><div class='del'>-	} else {</div><div class='del'>-		prism_header = 0;</div><div class='del'>-		phdrlen = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fhdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-	fc = le16_to_cpu(fhdr-&gt;frame_control);</div><div class='del'>-</div><div class='del'>-	if (type == PRISM2_RX_MGMT &amp;&amp; (fc &amp; IEEE80211_FCTL_VERS)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: dropped management frame with header "</div><div class='del'>-		       "version %d\n", dev-&gt;name, fc &amp; IEEE80211_FCTL_VERS);</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hdrlen = hostap_80211_get_hdrlen(fhdr-&gt;frame_control);</div><div class='del'>-</div><div class='del'>-	/* check if there is enough room for extra data; if not, expand skb</div><div class='del'>-	 * buffer to be large enough for the changes */</div><div class='del'>-	head_need = phdrlen;</div><div class='del'>-	tail_need = 0;</div><div class='del'>-#ifdef PRISM2_ADD_BOGUS_CRC</div><div class='del'>-	tail_need += 4;</div><div class='del'>-#endif /* PRISM2_ADD_BOGUS_CRC */</div><div class='del'>-</div><div class='del'>-	head_need -= skb_headroom(skb);</div><div class='del'>-	tail_need -= skb_tailroom(skb);</div><div class='del'>-</div><div class='del'>-	if (head_need &gt; 0 || tail_need &gt; 0) {</div><div class='del'>-		if (pskb_expand_head(skb, head_need &gt; 0 ? head_need : 0,</div><div class='del'>-				     tail_need &gt; 0 ? tail_need : 0,</div><div class='del'>-				     GFP_ATOMIC)) {</div><div class='del'>-			printk(KERN_DEBUG "%s: prism2_rx_80211 failed to "</div><div class='del'>-			       "reallocate skb buffer\n", dev-&gt;name);</div><div class='del'>-			dev_kfree_skb_any(skb);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We now have an skb with enough head and tail room, so just insert</div><div class='del'>-	 * the extra data */</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_ADD_BOGUS_CRC</div><div class='del'>-	memset(skb_put(skb, 4), 0xff, 4); /* Prism2 strips CRC */</div><div class='del'>-#endif /* PRISM2_ADD_BOGUS_CRC */</div><div class='del'>-</div><div class='del'>-	if (prism_header == 1) {</div><div class='del'>-		struct linux_wlan_ng_prism_hdr *hdr;</div><div class='del'>-		hdr = skb_push(skb, phdrlen);</div><div class='del'>-		memset(hdr, 0, phdrlen);</div><div class='del'>-		hdr-&gt;msgcode = LWNG_CAP_DID_BASE;</div><div class='del'>-		hdr-&gt;msglen = sizeof(*hdr);</div><div class='del'>-		memcpy(hdr-&gt;devname, dev-&gt;name, sizeof(hdr-&gt;devname));</div><div class='del'>-#define LWNG_SETVAL(f,i,s,l,d) \</div><div class='del'>-hdr-&gt;f.did = LWNG_CAP_DID_BASE | (i &lt;&lt; 12); \</div><div class='del'>-hdr-&gt;f.status = s; hdr-&gt;f.len = l; hdr-&gt;f.data = d</div><div class='del'>-		LWNG_SETVAL(hosttime, 1, 0, 4, jiffies);</div><div class='del'>-		LWNG_SETVAL(mactime, 2, 0, 4, rx_stats-&gt;mac_time);</div><div class='del'>-		LWNG_SETVAL(channel, 3, 1 /* no value */, 4, 0);</div><div class='del'>-		LWNG_SETVAL(rssi, 4, 1 /* no value */, 4, 0);</div><div class='del'>-		LWNG_SETVAL(sq, 5, 1 /* no value */, 4, 0);</div><div class='del'>-		LWNG_SETVAL(signal, 6, 0, 4, rx_stats-&gt;signal);</div><div class='del'>-		LWNG_SETVAL(noise, 7, 0, 4, rx_stats-&gt;noise);</div><div class='del'>-		LWNG_SETVAL(rate, 8, 0, 4, rx_stats-&gt;rate / 5);</div><div class='del'>-		LWNG_SETVAL(istx, 9, 0, 4, 0);</div><div class='del'>-		LWNG_SETVAL(frmlen, 10, 0, 4, skb-&gt;len - phdrlen);</div><div class='del'>-#undef LWNG_SETVAL</div><div class='del'>-	} else if (prism_header == 2) {</div><div class='del'>-		struct linux_wlan_ng_cap_hdr *hdr;</div><div class='del'>-		hdr = skb_push(skb, phdrlen);</div><div class='del'>-		memset(hdr, 0, phdrlen);</div><div class='del'>-		hdr-&gt;version    = htonl(LWNG_CAPHDR_VERSION);</div><div class='del'>-		hdr-&gt;length     = htonl(phdrlen);</div><div class='del'>-		hdr-&gt;mactime    = __cpu_to_be64(rx_stats-&gt;mac_time);</div><div class='del'>-		hdr-&gt;hosttime   = __cpu_to_be64(jiffies);</div><div class='del'>-		hdr-&gt;phytype    = htonl(4); /* dss_dot11_b */</div><div class='del'>-		hdr-&gt;channel    = htonl(local-&gt;channel);</div><div class='del'>-		hdr-&gt;datarate   = htonl(rx_stats-&gt;rate);</div><div class='del'>-		hdr-&gt;antenna    = htonl(0); /* unknown */</div><div class='del'>-		hdr-&gt;priority   = htonl(0); /* unknown */</div><div class='del'>-		hdr-&gt;ssi_type   = htonl(3); /* raw */</div><div class='del'>-		hdr-&gt;ssi_signal = htonl(rx_stats-&gt;signal);</div><div class='del'>-		hdr-&gt;ssi_noise  = htonl(rx_stats-&gt;noise);</div><div class='del'>-		hdr-&gt;preamble   = htonl(0); /* unknown */</div><div class='del'>-		hdr-&gt;encoding   = htonl(1); /* cck */</div><div class='del'>-	} else if (prism_header == 3) {</div><div class='del'>-		struct hostap_radiotap_rx *hdr;</div><div class='del'>-		hdr = skb_push(skb, phdrlen);</div><div class='del'>-		memset(hdr, 0, phdrlen);</div><div class='del'>-		hdr-&gt;hdr.it_len = cpu_to_le16(phdrlen);</div><div class='del'>-		hdr-&gt;hdr.it_present =</div><div class='del'>-			cpu_to_le32((1 &lt;&lt; IEEE80211_RADIOTAP_TSFT) |</div><div class='del'>-				    (1 &lt;&lt; IEEE80211_RADIOTAP_CHANNEL) |</div><div class='del'>-				    (1 &lt;&lt; IEEE80211_RADIOTAP_RATE) |</div><div class='del'>-				    (1 &lt;&lt; IEEE80211_RADIOTAP_DBM_ANTSIGNAL) |</div><div class='del'>-				    (1 &lt;&lt; IEEE80211_RADIOTAP_DBM_ANTNOISE));</div><div class='del'>-		hdr-&gt;tsft = cpu_to_le64(rx_stats-&gt;mac_time);</div><div class='del'>-		hdr-&gt;chan_freq = cpu_to_le16(freq_list[local-&gt;channel - 1]);</div><div class='del'>-		hdr-&gt;chan_flags = cpu_to_le16(IEEE80211_CHAN_CCK |</div><div class='del'>-						 IEEE80211_CHAN_2GHZ);</div><div class='del'>-		hdr-&gt;rate = rx_stats-&gt;rate / 5;</div><div class='del'>-		hdr-&gt;dbm_antsignal = rx_stats-&gt;signal;</div><div class='del'>-		hdr-&gt;dbm_antnoise = rx_stats-&gt;noise;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = skb-&gt;len - phdrlen;</div><div class='del'>-	skb-&gt;dev = dev;</div><div class='del'>-	skb_reset_mac_header(skb);</div><div class='del'>-	skb_pull(skb, hdrlen);</div><div class='del'>-	if (prism_header)</div><div class='del'>-		skb_pull(skb, phdrlen);</div><div class='del'>-	skb-&gt;pkt_type = PACKET_OTHERHOST;</div><div class='del'>-	skb-&gt;protocol = cpu_to_be16(ETH_P_802_2);</div><div class='del'>-	memset(skb-&gt;cb, 0, sizeof(skb-&gt;cb));</div><div class='del'>-	netif_rx(skb);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static void monitor_rx(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-		       struct hostap_80211_rx_status *rx_stats)</div><div class='del'>-{</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	len = prism2_rx_80211(dev, skb, rx_stats, PRISM2_RX_MONITOR);</div><div class='del'>-	dev-&gt;stats.rx_packets++;</div><div class='del'>-	dev-&gt;stats.rx_bytes += len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static struct prism2_frag_entry *</div><div class='del'>-prism2_frag_cache_find(local_info_t *local, unsigned int seq,</div><div class='del'>-		       unsigned int frag, u8 *src, u8 *dst)</div><div class='del'>-{</div><div class='del'>-	struct prism2_frag_entry *entry;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; PRISM2_FRAG_CACHE_LEN; i++) {</div><div class='del'>-		entry = &amp;local-&gt;frag_cache[i];</div><div class='del'>-		if (entry-&gt;skb != NULL &amp;&amp;</div><div class='del'>-		    time_after(jiffies, entry-&gt;first_frag_time + 2 * HZ)) {</div><div class='del'>-			printk(KERN_DEBUG "%s: expiring fragment cache entry "</div><div class='del'>-			       "seq=%u last_frag=%u\n",</div><div class='del'>-			       local-&gt;dev-&gt;name, entry-&gt;seq, entry-&gt;last_frag);</div><div class='del'>-			dev_kfree_skb(entry-&gt;skb);</div><div class='del'>-			entry-&gt;skb = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (entry-&gt;skb != NULL &amp;&amp; entry-&gt;seq == seq &amp;&amp;</div><div class='del'>-		    (entry-&gt;last_frag + 1 == frag || frag == -1) &amp;&amp;</div><div class='del'>-		    memcmp(entry-&gt;src_addr, src, ETH_ALEN) == 0 &amp;&amp;</div><div class='del'>-		    memcmp(entry-&gt;dst_addr, dst, ETH_ALEN) == 0)</div><div class='del'>-			return entry;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static struct sk_buff *</div><div class='del'>-prism2_frag_cache_get(local_info_t *local, struct ieee80211_hdr *hdr)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-	u16 sc;</div><div class='del'>-	unsigned int frag, seq;</div><div class='del'>-	struct prism2_frag_entry *entry;</div><div class='del'>-</div><div class='del'>-	sc = le16_to_cpu(hdr-&gt;seq_ctrl);</div><div class='del'>-	frag = sc &amp; IEEE80211_SCTL_FRAG;</div><div class='del'>-	seq = (sc &amp; IEEE80211_SCTL_SEQ) &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	if (frag == 0) {</div><div class='del'>-		/* Reserve enough space to fit maximum frame length */</div><div class='del'>-		skb = dev_alloc_skb(local-&gt;dev-&gt;mtu +</div><div class='del'>-				    sizeof(struct ieee80211_hdr) +</div><div class='del'>-				    8 /* LLC */ +</div><div class='del'>-				    2 /* alignment */ +</div><div class='del'>-				    8 /* WEP */ + ETH_ALEN /* WDS */);</div><div class='del'>-		if (skb == NULL)</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='del'>-		entry = &amp;local-&gt;frag_cache[local-&gt;frag_next_idx];</div><div class='del'>-		local-&gt;frag_next_idx++;</div><div class='del'>-		if (local-&gt;frag_next_idx &gt;= PRISM2_FRAG_CACHE_LEN)</div><div class='del'>-			local-&gt;frag_next_idx = 0;</div><div class='del'>-</div><div class='del'>-		if (entry-&gt;skb != NULL)</div><div class='del'>-			dev_kfree_skb(entry-&gt;skb);</div><div class='del'>-</div><div class='del'>-		entry-&gt;first_frag_time = jiffies;</div><div class='del'>-		entry-&gt;seq = seq;</div><div class='del'>-		entry-&gt;last_frag = frag;</div><div class='del'>-		entry-&gt;skb = skb;</div><div class='del'>-		memcpy(entry-&gt;src_addr, hdr-&gt;addr2, ETH_ALEN);</div><div class='del'>-		memcpy(entry-&gt;dst_addr, hdr-&gt;addr1, ETH_ALEN);</div><div class='del'>-	} else {</div><div class='del'>-		/* received a fragment of a frame for which the head fragment</div><div class='del'>-		 * should have already been received */</div><div class='del'>-		entry = prism2_frag_cache_find(local, seq, frag, hdr-&gt;addr2,</div><div class='del'>-					       hdr-&gt;addr1);</div><div class='del'>-		if (entry != NULL) {</div><div class='del'>-			entry-&gt;last_frag = frag;</div><div class='del'>-			skb = entry-&gt;skb;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static int prism2_frag_cache_invalidate(local_info_t *local,</div><div class='del'>-					struct ieee80211_hdr *hdr)</div><div class='del'>-{</div><div class='del'>-	u16 sc;</div><div class='del'>-	unsigned int seq;</div><div class='del'>-	struct prism2_frag_entry *entry;</div><div class='del'>-</div><div class='del'>-	sc = le16_to_cpu(hdr-&gt;seq_ctrl);</div><div class='del'>-	seq = (sc &amp; IEEE80211_SCTL_SEQ) &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	entry = prism2_frag_cache_find(local, seq, -1, hdr-&gt;addr2, hdr-&gt;addr1);</div><div class='del'>-</div><div class='del'>-	if (entry == NULL) {</div><div class='del'>-		printk(KERN_DEBUG "%s: could not invalidate fragment cache "</div><div class='del'>-		       "entry (seq=%u)\n",</div><div class='del'>-		       local-&gt;dev-&gt;name, seq);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	entry-&gt;skb = NULL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct hostap_bss_info *__hostap_get_bss(local_info_t *local, u8 *bssid,</div><div class='del'>-						u8 *ssid, size_t ssid_len)</div><div class='del'>-{</div><div class='del'>-	struct list_head *ptr;</div><div class='del'>-	struct hostap_bss_info *bss;</div><div class='del'>-</div><div class='del'>-	list_for_each(ptr, &amp;local-&gt;bss_list) {</div><div class='del'>-		bss = list_entry(ptr, struct hostap_bss_info, list);</div><div class='del'>-		if (memcmp(bss-&gt;bssid, bssid, ETH_ALEN) == 0 &amp;&amp;</div><div class='del'>-		    (ssid == NULL ||</div><div class='del'>-		     (ssid_len == bss-&gt;ssid_len &amp;&amp;</div><div class='del'>-		      memcmp(ssid, bss-&gt;ssid, ssid_len) == 0))) {</div><div class='del'>-			list_move(&amp;bss-&gt;list, &amp;local-&gt;bss_list);</div><div class='del'>-			return bss;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct hostap_bss_info *__hostap_add_bss(local_info_t *local, u8 *bssid,</div><div class='del'>-						u8 *ssid, size_t ssid_len)</div><div class='del'>-{</div><div class='del'>-	struct hostap_bss_info *bss;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;num_bss_info &gt;= HOSTAP_MAX_BSS_COUNT) {</div><div class='del'>-		bss = list_entry(local-&gt;bss_list.prev,</div><div class='del'>-				 struct hostap_bss_info, list);</div><div class='del'>-		list_del(&amp;bss-&gt;list);</div><div class='del'>-		local-&gt;num_bss_info--;</div><div class='del'>-	} else {</div><div class='del'>-		bss = kmalloc(sizeof(*bss), GFP_ATOMIC);</div><div class='del'>-		if (bss == NULL)</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(bss, 0, sizeof(*bss));</div><div class='del'>-	memcpy(bss-&gt;bssid, bssid, ETH_ALEN);</div><div class='del'>-	memcpy(bss-&gt;ssid, ssid, ssid_len);</div><div class='del'>-	bss-&gt;ssid_len = ssid_len;</div><div class='del'>-	local-&gt;num_bss_info++;</div><div class='del'>-	list_add(&amp;bss-&gt;list, &amp;local-&gt;bss_list);</div><div class='del'>-	return bss;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void __hostap_expire_bss(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	struct hostap_bss_info *bss;</div><div class='del'>-</div><div class='del'>-	while (local-&gt;num_bss_info &gt; 0) {</div><div class='del'>-		bss = list_entry(local-&gt;bss_list.prev,</div><div class='del'>-				 struct hostap_bss_info, list);</div><div class='del'>-		if (!time_after(jiffies, bss-&gt;last_update + 60 * HZ))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		list_del(&amp;bss-&gt;list);</div><div class='del'>-		local-&gt;num_bss_info--;</div><div class='del'>-		kfree(bss);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Both IEEE 802.11 Beacon and Probe Response frames have similar structure, so</div><div class='del'>- * the same routine can be used to parse both of them. */</div><div class='del'>-static void hostap_rx_sta_beacon(local_info_t *local, struct sk_buff *skb,</div><div class='del'>-				 int stype)</div><div class='del'>-{</div><div class='del'>-	struct hostap_ieee80211_mgmt *mgmt;</div><div class='del'>-	int left, chan = 0;</div><div class='del'>-	u8 *pos;</div><div class='del'>-	u8 *ssid = NULL, *wpa = NULL, *rsn = NULL;</div><div class='del'>-	size_t ssid_len = 0, wpa_len = 0, rsn_len = 0;</div><div class='del'>-	struct hostap_bss_info *bss;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; IEEE80211_MGMT_HDR_LEN + sizeof(mgmt-&gt;u.beacon))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mgmt = (struct hostap_ieee80211_mgmt *) skb-&gt;data;</div><div class='del'>-	pos = mgmt-&gt;u.beacon.variable;</div><div class='del'>-	left = skb-&gt;len - (pos - skb-&gt;data);</div><div class='del'>-</div><div class='del'>-	while (left &gt;= 2) {</div><div class='del'>-		if (2 + pos[1] &gt; left)</div><div class='del'>-			return; /* parse failed */</div><div class='del'>-		switch (*pos) {</div><div class='del'>-		case WLAN_EID_SSID:</div><div class='del'>-			ssid = pos + 2;</div><div class='del'>-			ssid_len = pos[1];</div><div class='del'>-			break;</div><div class='del'>-		case WLAN_EID_VENDOR_SPECIFIC:</div><div class='del'>-			if (pos[1] &gt;= 4 &amp;&amp;</div><div class='del'>-			    pos[2] == 0x00 &amp;&amp; pos[3] == 0x50 &amp;&amp;</div><div class='del'>-			    pos[4] == 0xf2 &amp;&amp; pos[5] == 1) {</div><div class='del'>-				wpa = pos;</div><div class='del'>-				wpa_len = pos[1] + 2;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case WLAN_EID_RSN:</div><div class='del'>-			rsn = pos;</div><div class='del'>-			rsn_len = pos[1] + 2;</div><div class='del'>-			break;</div><div class='del'>-		case WLAN_EID_DS_PARAMS:</div><div class='del'>-			if (pos[1] &gt;= 1)</div><div class='del'>-				chan = pos[2];</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		left -= 2 + pos[1];</div><div class='del'>-		pos += 2 + pos[1];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (wpa_len &gt; MAX_WPA_IE_LEN)</div><div class='del'>-		wpa_len = MAX_WPA_IE_LEN;</div><div class='del'>-	if (rsn_len &gt; MAX_WPA_IE_LEN)</div><div class='del'>-		rsn_len = MAX_WPA_IE_LEN;</div><div class='del'>-	if (ssid_len &gt; sizeof(bss-&gt;ssid))</div><div class='del'>-		ssid_len = sizeof(bss-&gt;ssid);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;local-&gt;lock);</div><div class='del'>-	bss = __hostap_get_bss(local, mgmt-&gt;bssid, ssid, ssid_len);</div><div class='del'>-	if (bss == NULL)</div><div class='del'>-		bss = __hostap_add_bss(local, mgmt-&gt;bssid, ssid, ssid_len);</div><div class='del'>-	if (bss) {</div><div class='del'>-		bss-&gt;last_update = jiffies;</div><div class='del'>-		bss-&gt;count++;</div><div class='del'>-		bss-&gt;capab_info = le16_to_cpu(mgmt-&gt;u.beacon.capab_info);</div><div class='del'>-		if (wpa) {</div><div class='del'>-			memcpy(bss-&gt;wpa_ie, wpa, wpa_len);</div><div class='del'>-			bss-&gt;wpa_ie_len = wpa_len;</div><div class='del'>-		} else</div><div class='del'>-			bss-&gt;wpa_ie_len = 0;</div><div class='del'>-		if (rsn) {</div><div class='del'>-			memcpy(bss-&gt;rsn_ie, rsn, rsn_len);</div><div class='del'>-			bss-&gt;rsn_ie_len = rsn_len;</div><div class='del'>-		} else</div><div class='del'>-			bss-&gt;rsn_ie_len = 0;</div><div class='del'>-		bss-&gt;chan = chan;</div><div class='del'>-	}</div><div class='del'>-	__hostap_expire_bss(local);</div><div class='del'>-	spin_unlock(&amp;local-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-hostap_rx_frame_mgmt(local_info_t *local, struct sk_buff *skb,</div><div class='del'>-		     struct hostap_80211_rx_status *rx_stats, u16 type,</div><div class='del'>-		     u16 stype)</div><div class='del'>-{</div><div class='del'>-	if (local-&gt;iw_mode == IW_MODE_MASTER)</div><div class='del'>-		hostap_update_sta_ps(local, (struct ieee80211_hdr *) skb-&gt;data);</div><div class='del'>-</div><div class='del'>-	if (local-&gt;hostapd &amp;&amp; type == IEEE80211_FTYPE_MGMT) {</div><div class='del'>-		if (stype == IEEE80211_STYPE_BEACON &amp;&amp;</div><div class='del'>-		    local-&gt;iw_mode == IW_MODE_MASTER) {</div><div class='del'>-			struct sk_buff *skb2;</div><div class='del'>-			/* Process beacon frames also in kernel driver to</div><div class='del'>-			 * update STA(AP) table statistics */</div><div class='del'>-			skb2 = skb_clone(skb, GFP_ATOMIC);</div><div class='del'>-			if (skb2)</div><div class='del'>-				hostap_rx(skb2-&gt;dev, skb2, rx_stats);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* send management frames to the user space daemon for</div><div class='del'>-		 * processing */</div><div class='del'>-		local-&gt;apdevstats.rx_packets++;</div><div class='del'>-		local-&gt;apdevstats.rx_bytes += skb-&gt;len;</div><div class='del'>-		if (local-&gt;apdev == NULL)</div><div class='del'>-			return -1;</div><div class='del'>-		prism2_rx_80211(local-&gt;apdev, skb, rx_stats, PRISM2_RX_MGMT);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;iw_mode == IW_MODE_MASTER) {</div><div class='del'>-		if (type != IEEE80211_FTYPE_MGMT &amp;&amp;</div><div class='del'>-		    type != IEEE80211_FTYPE_CTL) {</div><div class='del'>-			printk(KERN_DEBUG "%s: unknown management frame "</div><div class='del'>-			       "(type=0x%02x, stype=0x%02x) dropped\n",</div><div class='del'>-			       skb-&gt;dev-&gt;name, type &gt;&gt; 2, stype &gt;&gt; 4);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		hostap_rx(skb-&gt;dev, skb, rx_stats);</div><div class='del'>-		return 0;</div><div class='del'>-	} else if (type == IEEE80211_FTYPE_MGMT &amp;&amp;</div><div class='del'>-		   (stype == IEEE80211_STYPE_BEACON ||</div><div class='del'>-		    stype == IEEE80211_STYPE_PROBE_RESP)) {</div><div class='del'>-		hostap_rx_sta_beacon(local, skb, stype);</div><div class='del'>-		return -1;</div><div class='del'>-	} else if (type == IEEE80211_FTYPE_MGMT &amp;&amp;</div><div class='del'>-		   (stype == IEEE80211_STYPE_ASSOC_RESP ||</div><div class='del'>-		    stype == IEEE80211_STYPE_REASSOC_RESP)) {</div><div class='del'>-		/* Ignore (Re)AssocResp silently since these are not currently</div><div class='del'>-		 * needed but are still received when WPA/RSN mode is enabled.</div><div class='del'>-		 */</div><div class='del'>-		return -1;</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_DEBUG "%s: hostap_rx_frame_mgmt: dropped unhandled"</div><div class='del'>-		       " management frame in non-Host AP mode (type=%d:%d)\n",</div><div class='del'>-		       skb-&gt;dev-&gt;name, type &gt;&gt; 2, stype &gt;&gt; 4);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static struct net_device *prism2_rx_get_wds(local_info_t *local,</div><div class='del'>-						   u8 *addr)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface = NULL;</div><div class='del'>-	struct list_head *ptr;</div><div class='del'>-</div><div class='del'>-	read_lock_bh(&amp;local-&gt;iface_lock);</div><div class='del'>-	list_for_each(ptr, &amp;local-&gt;hostap_interfaces) {</div><div class='del'>-		iface = list_entry(ptr, struct hostap_interface, list);</div><div class='del'>-		if (iface-&gt;type == HOSTAP_INTERFACE_WDS &amp;&amp;</div><div class='del'>-		    memcmp(iface-&gt;u.wds.remote_addr, addr, ETH_ALEN) == 0)</div><div class='del'>-			break;</div><div class='del'>-		iface = NULL;</div><div class='del'>-	}</div><div class='del'>-	read_unlock_bh(&amp;local-&gt;iface_lock);</div><div class='del'>-</div><div class='del'>-	return iface ? iface-&gt;dev : NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-hostap_rx_frame_wds(local_info_t *local, struct ieee80211_hdr *hdr, u16 fc,</div><div class='del'>-		    struct net_device **wds)</div><div class='del'>-{</div><div class='del'>-	/* FIX: is this really supposed to accept WDS frames only in Master</div><div class='del'>-	 * mode? What about Repeater or Managed with WDS frames? */</div><div class='del'>-	if ((fc &amp; (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) !=</div><div class='del'>-	    (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS) &amp;&amp;</div><div class='del'>-	    (local-&gt;iw_mode != IW_MODE_MASTER || !(fc &amp; IEEE80211_FCTL_TODS)))</div><div class='del'>-		return 0; /* not a WDS frame */</div><div class='del'>-</div><div class='del'>-	/* Possible WDS frame: either IEEE 802.11 compliant (if FromDS)</div><div class='del'>-	 * or own non-standard frame with 4th address after payload */</div><div class='del'>-	if (!ether_addr_equal(hdr-&gt;addr1, local-&gt;dev-&gt;dev_addr) &amp;&amp;</div><div class='del'>-	    (hdr-&gt;addr1[0] != 0xff || hdr-&gt;addr1[1] != 0xff ||</div><div class='del'>-	     hdr-&gt;addr1[2] != 0xff || hdr-&gt;addr1[3] != 0xff ||</div><div class='del'>-	     hdr-&gt;addr1[4] != 0xff || hdr-&gt;addr1[5] != 0xff)) {</div><div class='del'>-		/* RA (or BSSID) is not ours - drop */</div><div class='del'>-		PDEBUG(DEBUG_EXTRA2, "%s: received WDS frame with "</div><div class='del'>-		       "not own or broadcast %s=%pM\n",</div><div class='del'>-		       local-&gt;dev-&gt;name,</div><div class='del'>-		       fc &amp; IEEE80211_FCTL_FROMDS ? "RA" : "BSSID",</div><div class='del'>-		       hdr-&gt;addr1);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check if the frame came from a registered WDS connection */</div><div class='del'>-	*wds = prism2_rx_get_wds(local, hdr-&gt;addr2);</div><div class='del'>-	if (*wds == NULL &amp;&amp; fc &amp; IEEE80211_FCTL_FROMDS &amp;&amp;</div><div class='del'>-	    (local-&gt;iw_mode != IW_MODE_INFRA ||</div><div class='del'>-	     !(local-&gt;wds_type &amp; HOSTAP_WDS_AP_CLIENT) ||</div><div class='del'>-	     memcmp(hdr-&gt;addr2, local-&gt;bssid, ETH_ALEN) != 0)) {</div><div class='del'>-		/* require that WDS link has been registered with TA or the</div><div class='del'>-		 * frame is from current AP when using 'AP client mode' */</div><div class='del'>-		PDEBUG(DEBUG_EXTRA, "%s: received WDS[4 addr] frame "</div><div class='del'>-		       "from unknown TA=%pM\n",</div><div class='del'>-		       local-&gt;dev-&gt;name, hdr-&gt;addr2);</div><div class='del'>-		if (local-&gt;ap &amp;&amp; local-&gt;ap-&gt;autom_ap_wds)</div><div class='del'>-			hostap_wds_link_oper(local, hdr-&gt;addr2, WDS_ADD);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (*wds &amp;&amp; !(fc &amp; IEEE80211_FCTL_FROMDS) &amp;&amp; local-&gt;ap &amp;&amp;</div><div class='del'>-	    hostap_is_sta_assoc(local-&gt;ap, hdr-&gt;addr2)) {</div><div class='del'>-		/* STA is actually associated with us even though it has a</div><div class='del'>-		 * registered WDS link. Assume it is in 'AP client' mode.</div><div class='del'>-		 * Since this is a 3-addr frame, assume it is not (bogus) WDS</div><div class='del'>-		 * frame and process it like any normal ToDS frame from</div><div class='del'>-		 * associated STA. */</div><div class='del'>-		*wds = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int hostap_is_eapol_frame(local_info_t *local, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-	u16 fc, ethertype;</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-	u8 *pos;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; 24)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-	fc = le16_to_cpu(hdr-&gt;frame_control);</div><div class='del'>-</div><div class='del'>-	/* check that the frame is unicast frame to us */</div><div class='del'>-	if ((fc &amp; (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==</div><div class='del'>-	    IEEE80211_FCTL_TODS &amp;&amp;</div><div class='del'>-	    ether_addr_equal(hdr-&gt;addr1, dev-&gt;dev_addr) &amp;&amp;</div><div class='del'>-	    ether_addr_equal(hdr-&gt;addr3, dev-&gt;dev_addr)) {</div><div class='del'>-		/* ToDS frame with own addr BSSID and DA */</div><div class='del'>-	} else if ((fc &amp; (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==</div><div class='del'>-		   IEEE80211_FCTL_FROMDS &amp;&amp;</div><div class='del'>-		   ether_addr_equal(hdr-&gt;addr1, dev-&gt;dev_addr)) {</div><div class='del'>-		/* FromDS frame with own addr as DA */</div><div class='del'>-	} else</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; 24 + 8)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* check for port access entity Ethernet type */</div><div class='del'>-	pos = skb-&gt;data + 24;</div><div class='del'>-	ethertype = (pos[6] &lt;&lt; 8) | pos[7];</div><div class='del'>-	if (ethertype == ETH_P_PAE)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static int</div><div class='del'>-hostap_rx_frame_decrypt(local_info_t *local, struct sk_buff *skb,</div><div class='del'>-			struct lib80211_crypt_data *crypt)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-	int res, hdrlen;</div><div class='del'>-</div><div class='del'>-	if (crypt == NULL || crypt-&gt;ops-&gt;decrypt_mpdu == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-	hdrlen = hostap_80211_get_hdrlen(hdr-&gt;frame_control);</div><div class='del'>-</div><div class='del'>-	if (local-&gt;tkip_countermeasures &amp;&amp;</div><div class='del'>-	    strcmp(crypt-&gt;ops-&gt;name, "TKIP") == 0) {</div><div class='del'>-		if (net_ratelimit()) {</div><div class='del'>-			printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "</div><div class='del'>-			       "received packet from %pM\n",</div><div class='del'>-			       local-&gt;dev-&gt;name, hdr-&gt;addr2);</div><div class='del'>-		}</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	atomic_inc(&amp;crypt-&gt;refcnt);</div><div class='del'>-	res = crypt-&gt;ops-&gt;decrypt_mpdu(skb, hdrlen, crypt-&gt;priv);</div><div class='del'>-	atomic_dec(&amp;crypt-&gt;refcnt);</div><div class='del'>-	if (res &lt; 0) {</div><div class='del'>-		printk(KERN_DEBUG "%s: decryption failed (SA=%pM) res=%d\n",</div><div class='del'>-		       local-&gt;dev-&gt;name, hdr-&gt;addr2, res);</div><div class='del'>-		local-&gt;comm_tallies.rx_discards_wep_undecryptable++;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static int</div><div class='del'>-hostap_rx_frame_decrypt_msdu(local_info_t *local, struct sk_buff *skb,</div><div class='del'>-			     int keyidx, struct lib80211_crypt_data *crypt)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-	int res, hdrlen;</div><div class='del'>-</div><div class='del'>-	if (crypt == NULL || crypt-&gt;ops-&gt;decrypt_msdu == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-	hdrlen = hostap_80211_get_hdrlen(hdr-&gt;frame_control);</div><div class='del'>-</div><div class='del'>-	atomic_inc(&amp;crypt-&gt;refcnt);</div><div class='del'>-	res = crypt-&gt;ops-&gt;decrypt_msdu(skb, keyidx, hdrlen, crypt-&gt;priv);</div><div class='del'>-	atomic_dec(&amp;crypt-&gt;refcnt);</div><div class='del'>-	if (res &lt; 0) {</div><div class='del'>-		printk(KERN_DEBUG "%s: MSDU decryption/MIC verification failed"</div><div class='del'>-		       " (SA=%pM keyidx=%d)\n",</div><div class='del'>-		       local-&gt;dev-&gt;name, hdr-&gt;addr2, keyidx);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* All received frames are sent to this function. @skb contains the frame in</div><div class='del'>- * IEEE 802.11 format, i.e., in the format it was sent over air.</div><div class='del'>- * This function is called only as a tasklet (software IRQ). */</div><div class='del'>-void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-		     struct hostap_80211_rx_status *rx_stats)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-	size_t hdrlen;</div><div class='del'>-	u16 fc, type, stype, sc;</div><div class='del'>-	struct net_device *wds = NULL;</div><div class='del'>-	unsigned int frag;</div><div class='del'>-	u8 *payload;</div><div class='del'>-	struct sk_buff *skb2 = NULL;</div><div class='del'>-	u16 ethertype;</div><div class='del'>-	int frame_authorized = 0;</div><div class='del'>-	int from_assoc_ap = 0;</div><div class='del'>-	u8 dst[ETH_ALEN];</div><div class='del'>-	u8 src[ETH_ALEN];</div><div class='del'>-	struct lib80211_crypt_data *crypt = NULL;</div><div class='del'>-	void *sta = NULL;</div><div class='del'>-	int keyidx = 0;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-	iface-&gt;stats.rx_packets++;</div><div class='del'>-	iface-&gt;stats.rx_bytes += skb-&gt;len;</div><div class='del'>-</div><div class='del'>-	/* dev is the master radio device; change this to be the default</div><div class='del'>-	 * virtual interface (this may be changed to WDS device below) */</div><div class='del'>-	dev = local-&gt;ddev;</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; 10)</div><div class='del'>-		goto rx_dropped;</div><div class='del'>-</div><div class='del'>-	fc = le16_to_cpu(hdr-&gt;frame_control);</div><div class='del'>-	type = fc &amp; IEEE80211_FCTL_FTYPE;</div><div class='del'>-	stype = fc &amp; IEEE80211_FCTL_STYPE;</div><div class='del'>-	sc = le16_to_cpu(hdr-&gt;seq_ctrl);</div><div class='del'>-	frag = sc &amp; IEEE80211_SCTL_FRAG;</div><div class='del'>-	hdrlen = hostap_80211_get_hdrlen(hdr-&gt;frame_control);</div><div class='del'>-</div><div class='del'>-	/* Put this code here so that we avoid duplicating it in all</div><div class='del'>-	 * Rx paths. - Jean II */</div><div class='del'>-#ifdef IW_WIRELESS_SPY		/* defined in iw_handler.h */</div><div class='del'>-	/* If spy monitoring on */</div><div class='del'>-	if (iface-&gt;spy_data.spy_number &gt; 0) {</div><div class='del'>-		struct iw_quality wstats;</div><div class='del'>-		wstats.level = rx_stats-&gt;signal;</div><div class='del'>-		wstats.noise = rx_stats-&gt;noise;</div><div class='del'>-		wstats.updated = IW_QUAL_LEVEL_UPDATED | IW_QUAL_NOISE_UPDATED</div><div class='del'>-			| IW_QUAL_QUAL_INVALID | IW_QUAL_DBM;</div><div class='del'>-		/* Update spy records */</div><div class='del'>-		wireless_spy_update(dev, hdr-&gt;addr2, &amp;wstats);</div><div class='del'>-	}</div><div class='del'>-#endif /* IW_WIRELESS_SPY */</div><div class='del'>-	hostap_update_rx_stats(local-&gt;ap, hdr, rx_stats);</div><div class='del'>-</div><div class='del'>-	if (local-&gt;iw_mode == IW_MODE_MONITOR) {</div><div class='del'>-		monitor_rx(dev, skb, rx_stats);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;host_decrypt) {</div><div class='del'>-		int idx = 0;</div><div class='del'>-		if (skb-&gt;len &gt;= hdrlen + 3)</div><div class='del'>-			idx = skb-&gt;data[hdrlen + 3] &gt;&gt; 6;</div><div class='del'>-		crypt = local-&gt;crypt_info.crypt[idx];</div><div class='del'>-		sta = NULL;</div><div class='del'>-</div><div class='del'>-		/* Use station specific key to override default keys if the</div><div class='del'>-		 * receiver address is a unicast address ("individual RA"). If</div><div class='del'>-		 * bcrx_sta_key parameter is set, station specific key is used</div><div class='del'>-		 * even with broad/multicast targets (this is against IEEE</div><div class='del'>-		 * 802.11, but makes it easier to use different keys with</div><div class='del'>-		 * stations that do not support WEP key mapping). */</div><div class='del'>-</div><div class='del'>-		if (!(hdr-&gt;addr1[0] &amp; 0x01) || local-&gt;bcrx_sta_key)</div><div class='del'>-			(void) hostap_handle_sta_crypto(local, hdr, &amp;crypt,</div><div class='del'>-							&amp;sta);</div><div class='del'>-</div><div class='del'>-		/* allow NULL decrypt to indicate an station specific override</div><div class='del'>-		 * for default encryption */</div><div class='del'>-		if (crypt &amp;&amp; (crypt-&gt;ops == NULL ||</div><div class='del'>-			      crypt-&gt;ops-&gt;decrypt_mpdu == NULL))</div><div class='del'>-			crypt = NULL;</div><div class='del'>-</div><div class='del'>-		if (!crypt &amp;&amp; (fc &amp; IEEE80211_FCTL_PROTECTED)) {</div><div class='del'>-#if 0</div><div class='del'>-			/* This seems to be triggered by some (multicast?)</div><div class='del'>-			 * frames from other than current BSS, so just drop the</div><div class='del'>-			 * frames silently instead of filling system log with</div><div class='del'>-			 * these reports. */</div><div class='del'>-			printk(KERN_DEBUG "%s: WEP decryption failed (not set)"</div><div class='del'>-			       " (SA=%pM)\n",</div><div class='del'>-			       local-&gt;dev-&gt;name, hdr-&gt;addr2);</div><div class='del'>-#endif</div><div class='del'>-			local-&gt;comm_tallies.rx_discards_wep_undecryptable++;</div><div class='del'>-			goto rx_dropped;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (type != IEEE80211_FTYPE_DATA) {</div><div class='del'>-		if (type == IEEE80211_FTYPE_MGMT &amp;&amp;</div><div class='del'>-		    stype == IEEE80211_STYPE_AUTH &amp;&amp;</div><div class='del'>-		    fc &amp; IEEE80211_FCTL_PROTECTED &amp;&amp; local-&gt;host_decrypt &amp;&amp;</div><div class='del'>-		    (keyidx = hostap_rx_frame_decrypt(local, skb, crypt)) &lt; 0)</div><div class='del'>-		{</div><div class='del'>-			printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth "</div><div class='del'>-			       "from %pM\n", dev-&gt;name, hdr-&gt;addr2);</div><div class='del'>-			/* TODO: could inform hostapd about this so that it</div><div class='del'>-			 * could send auth failure report */</div><div class='del'>-			goto rx_dropped;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (hostap_rx_frame_mgmt(local, skb, rx_stats, type, stype))</div><div class='del'>-			goto rx_dropped;</div><div class='del'>-		else</div><div class='del'>-			goto rx_exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Data frame - extract src/dst addresses */</div><div class='del'>-	if (skb-&gt;len &lt; IEEE80211_DATA_HDR3_LEN)</div><div class='del'>-		goto rx_dropped;</div><div class='del'>-</div><div class='del'>-	switch (fc &amp; (IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS)) {</div><div class='del'>-	case IEEE80211_FCTL_FROMDS:</div><div class='del'>-		memcpy(dst, hdr-&gt;addr1, ETH_ALEN);</div><div class='del'>-		memcpy(src, hdr-&gt;addr3, ETH_ALEN);</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_FCTL_TODS:</div><div class='del'>-		memcpy(dst, hdr-&gt;addr3, ETH_ALEN);</div><div class='del'>-		memcpy(src, hdr-&gt;addr2, ETH_ALEN);</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS:</div><div class='del'>-		if (skb-&gt;len &lt; IEEE80211_DATA_HDR4_LEN)</div><div class='del'>-			goto rx_dropped;</div><div class='del'>-		memcpy(dst, hdr-&gt;addr3, ETH_ALEN);</div><div class='del'>-		memcpy(src, hdr-&gt;addr4, ETH_ALEN);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		memcpy(dst, hdr-&gt;addr1, ETH_ALEN);</div><div class='del'>-		memcpy(src, hdr-&gt;addr2, ETH_ALEN);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hostap_rx_frame_wds(local, hdr, fc, &amp;wds))</div><div class='del'>-		goto rx_dropped;</div><div class='del'>-	if (wds)</div><div class='del'>-		skb-&gt;dev = dev = wds;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;iw_mode == IW_MODE_MASTER &amp;&amp; !wds &amp;&amp;</div><div class='del'>-	    (fc &amp; (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==</div><div class='del'>-	    IEEE80211_FCTL_FROMDS &amp;&amp;</div><div class='del'>-	    local-&gt;stadev &amp;&amp;</div><div class='del'>-	    memcmp(hdr-&gt;addr2, local-&gt;assoc_ap_addr, ETH_ALEN) == 0) {</div><div class='del'>-		/* Frame from BSSID of the AP for which we are a client */</div><div class='del'>-		skb-&gt;dev = dev = local-&gt;stadev;</div><div class='del'>-		from_assoc_ap = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((local-&gt;iw_mode == IW_MODE_MASTER ||</div><div class='del'>-	     local-&gt;iw_mode == IW_MODE_REPEAT) &amp;&amp;</div><div class='del'>-	    !from_assoc_ap) {</div><div class='del'>-		switch (hostap_handle_sta_rx(local, dev, skb, rx_stats,</div><div class='del'>-					     wds != NULL)) {</div><div class='del'>-		case AP_RX_CONTINUE_NOT_AUTHORIZED:</div><div class='del'>-			frame_authorized = 0;</div><div class='del'>-			break;</div><div class='del'>-		case AP_RX_CONTINUE:</div><div class='del'>-			frame_authorized = 1;</div><div class='del'>-			break;</div><div class='del'>-		case AP_RX_DROP:</div><div class='del'>-			goto rx_dropped;</div><div class='del'>-		case AP_RX_EXIT:</div><div class='del'>-			goto rx_exit;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Nullfunc frames may have PS-bit set, so they must be passed to</div><div class='del'>-	 * hostap_handle_sta_rx() before being dropped here. */</div><div class='del'>-	if (stype != IEEE80211_STYPE_DATA &amp;&amp;</div><div class='del'>-	    stype != IEEE80211_STYPE_DATA_CFACK &amp;&amp;</div><div class='del'>-	    stype != IEEE80211_STYPE_DATA_CFPOLL &amp;&amp;</div><div class='del'>-	    stype != IEEE80211_STYPE_DATA_CFACKPOLL) {</div><div class='del'>-		if (stype != IEEE80211_STYPE_NULLFUNC)</div><div class='del'>-			printk(KERN_DEBUG "%s: RX: dropped data frame "</div><div class='del'>-			       "with no data (type=0x%02x, subtype=0x%02x)\n",</div><div class='del'>-			       dev-&gt;name, type &gt;&gt; 2, stype &gt;&gt; 4);</div><div class='del'>-		goto rx_dropped;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* skb: hdr + (possibly fragmented, possibly encrypted) payload */</div><div class='del'>-</div><div class='del'>-	if (local-&gt;host_decrypt &amp;&amp; (fc &amp; IEEE80211_FCTL_PROTECTED) &amp;&amp;</div><div class='del'>-	    (keyidx = hostap_rx_frame_decrypt(local, skb, crypt)) &lt; 0)</div><div class='del'>-		goto rx_dropped;</div><div class='del'>-	hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	/* skb: hdr + (possibly fragmented) plaintext payload */</div><div class='del'>-</div><div class='del'>-	if (local-&gt;host_decrypt &amp;&amp; (fc &amp; IEEE80211_FCTL_PROTECTED) &amp;&amp;</div><div class='del'>-	    (frag != 0 || (fc &amp; IEEE80211_FCTL_MOREFRAGS))) {</div><div class='del'>-		int flen;</div><div class='del'>-		struct sk_buff *frag_skb =</div><div class='del'>-			prism2_frag_cache_get(local, hdr);</div><div class='del'>-		if (!frag_skb) {</div><div class='del'>-			printk(KERN_DEBUG "%s: Rx cannot get skb from "</div><div class='del'>-			       "fragment cache (morefrag=%d seq=%u frag=%u)\n",</div><div class='del'>-			       dev-&gt;name, (fc &amp; IEEE80211_FCTL_MOREFRAGS) != 0,</div><div class='del'>-			       (sc &amp; IEEE80211_SCTL_SEQ) &gt;&gt; 4, frag);</div><div class='del'>-			goto rx_dropped;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		flen = skb-&gt;len;</div><div class='del'>-		if (frag != 0)</div><div class='del'>-			flen -= hdrlen;</div><div class='del'>-</div><div class='del'>-		if (frag_skb-&gt;tail + flen &gt; frag_skb-&gt;end) {</div><div class='del'>-			printk(KERN_WARNING "%s: host decrypted and "</div><div class='del'>-			       "reassembled frame did not fit skb\n",</div><div class='del'>-			       dev-&gt;name);</div><div class='del'>-			prism2_frag_cache_invalidate(local, hdr);</div><div class='del'>-			goto rx_dropped;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (frag == 0) {</div><div class='del'>-			/* copy first fragment (including full headers) into</div><div class='del'>-			 * beginning of the fragment cache skb */</div><div class='del'>-			skb_copy_from_linear_data(skb, skb_put(frag_skb, flen),</div><div class='del'>-						  flen);</div><div class='del'>-		} else {</div><div class='del'>-			/* append frame payload to the end of the fragment</div><div class='del'>-			 * cache skb */</div><div class='del'>-			skb_copy_from_linear_data_offset(skb, hdrlen,</div><div class='del'>-							 skb_put(frag_skb,</div><div class='del'>-								 flen), flen);</div><div class='del'>-		}</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		skb = NULL;</div><div class='del'>-</div><div class='del'>-		if (fc &amp; IEEE80211_FCTL_MOREFRAGS) {</div><div class='del'>-			/* more fragments expected - leave the skb in fragment</div><div class='del'>-			 * cache for now; it will be delivered to upper layers</div><div class='del'>-			 * after all fragments have been received */</div><div class='del'>-			goto rx_exit;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* this was the last fragment and the frame will be</div><div class='del'>-		 * delivered, so remove skb from fragment cache */</div><div class='del'>-		skb = frag_skb;</div><div class='del'>-		hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-		prism2_frag_cache_invalidate(local, hdr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* skb: hdr + (possible reassembled) full MSDU payload; possibly still</div><div class='del'>-	 * encrypted/authenticated */</div><div class='del'>-</div><div class='del'>-	if (local-&gt;host_decrypt &amp;&amp; (fc &amp; IEEE80211_FCTL_PROTECTED) &amp;&amp;</div><div class='del'>-	    hostap_rx_frame_decrypt_msdu(local, skb, keyidx, crypt))</div><div class='del'>-		goto rx_dropped;</div><div class='del'>-</div><div class='del'>-	hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-	if (crypt &amp;&amp; !(fc &amp; IEEE80211_FCTL_PROTECTED) &amp;&amp; !local-&gt;open_wep) {</div><div class='del'>-		if (local-&gt;ieee_802_1x &amp;&amp;</div><div class='del'>-		    hostap_is_eapol_frame(local, skb)) {</div><div class='del'>-			/* pass unencrypted EAPOL frames even if encryption is</div><div class='del'>-			 * configured */</div><div class='del'>-			PDEBUG(DEBUG_EXTRA2, "%s: RX: IEEE 802.1X - passing "</div><div class='del'>-			       "unencrypted EAPOL frame\n", local-&gt;dev-&gt;name);</div><div class='del'>-		} else {</div><div class='del'>-			printk(KERN_DEBUG "%s: encryption configured, but RX "</div><div class='del'>-			       "frame not encrypted (SA=%pM)\n",</div><div class='del'>-			       local-&gt;dev-&gt;name, hdr-&gt;addr2);</div><div class='del'>-			goto rx_dropped;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;drop_unencrypted &amp;&amp; !(fc &amp; IEEE80211_FCTL_PROTECTED) &amp;&amp;</div><div class='del'>-	    !hostap_is_eapol_frame(local, skb)) {</div><div class='del'>-		if (net_ratelimit()) {</div><div class='del'>-			printk(KERN_DEBUG "%s: dropped unencrypted RX data "</div><div class='del'>-			       "frame from %pM (drop_unencrypted=1)\n",</div><div class='del'>-			       dev-&gt;name, hdr-&gt;addr2);</div><div class='del'>-		}</div><div class='del'>-		goto rx_dropped;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* skb: hdr + (possible reassembled) full plaintext payload */</div><div class='del'>-</div><div class='del'>-	payload = skb-&gt;data + hdrlen;</div><div class='del'>-	ethertype = (payload[6] &lt;&lt; 8) | payload[7];</div><div class='del'>-</div><div class='del'>-	/* If IEEE 802.1X is used, check whether the port is authorized to send</div><div class='del'>-	 * the received frame. */</div><div class='del'>-	if (local-&gt;ieee_802_1x &amp;&amp; local-&gt;iw_mode == IW_MODE_MASTER) {</div><div class='del'>-		if (ethertype == ETH_P_PAE) {</div><div class='del'>-			PDEBUG(DEBUG_EXTRA2, "%s: RX: IEEE 802.1X frame\n",</div><div class='del'>-			       dev-&gt;name);</div><div class='del'>-			if (local-&gt;hostapd &amp;&amp; local-&gt;apdev) {</div><div class='del'>-				/* Send IEEE 802.1X frames to the user</div><div class='del'>-				 * space daemon for processing */</div><div class='del'>-				prism2_rx_80211(local-&gt;apdev, skb, rx_stats,</div><div class='del'>-						PRISM2_RX_MGMT);</div><div class='del'>-				local-&gt;apdevstats.rx_packets++;</div><div class='del'>-				local-&gt;apdevstats.rx_bytes += skb-&gt;len;</div><div class='del'>-				goto rx_exit;</div><div class='del'>-			}</div><div class='del'>-		} else if (!frame_authorized) {</div><div class='del'>-			printk(KERN_DEBUG "%s: dropped frame from "</div><div class='del'>-			       "unauthorized port (IEEE 802.1X): "</div><div class='del'>-			       "ethertype=0x%04x\n",</div><div class='del'>-			       dev-&gt;name, ethertype);</div><div class='del'>-			goto rx_dropped;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* convert hdr + possible LLC headers into Ethernet header */</div><div class='del'>-	if (skb-&gt;len - hdrlen &gt;= 8 &amp;&amp;</div><div class='del'>-	    ((memcmp(payload, rfc1042_header, 6) == 0 &amp;&amp;</div><div class='del'>-	      ethertype != ETH_P_AARP &amp;&amp; ethertype != ETH_P_IPX) ||</div><div class='del'>-	     memcmp(payload, bridge_tunnel_header, 6) == 0)) {</div><div class='del'>-		/* remove RFC1042 or Bridge-Tunnel encapsulation and</div><div class='del'>-		 * replace EtherType */</div><div class='del'>-		skb_pull(skb, hdrlen + 6);</div><div class='del'>-		memcpy(skb_push(skb, ETH_ALEN), src, ETH_ALEN);</div><div class='del'>-		memcpy(skb_push(skb, ETH_ALEN), dst, ETH_ALEN);</div><div class='del'>-	} else {</div><div class='del'>-		__be16 len;</div><div class='del'>-		/* Leave Ethernet header part of hdr and full payload */</div><div class='del'>-		skb_pull(skb, hdrlen);</div><div class='del'>-		len = htons(skb-&gt;len);</div><div class='del'>-		memcpy(skb_push(skb, 2), &amp;len, 2);</div><div class='del'>-		memcpy(skb_push(skb, ETH_ALEN), src, ETH_ALEN);</div><div class='del'>-		memcpy(skb_push(skb, ETH_ALEN), dst, ETH_ALEN);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (wds &amp;&amp; ((fc &amp; (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==</div><div class='del'>-		    IEEE80211_FCTL_TODS) &amp;&amp;</div><div class='del'>-	    skb-&gt;len &gt;= ETH_HLEN + ETH_ALEN) {</div><div class='del'>-		/* Non-standard frame: get addr4 from its bogus location after</div><div class='del'>-		 * the payload */</div><div class='del'>-		skb_copy_from_linear_data_offset(skb, skb-&gt;len - ETH_ALEN,</div><div class='del'>-						 skb-&gt;data + ETH_ALEN,</div><div class='del'>-						 ETH_ALEN);</div><div class='del'>-		skb_trim(skb, skb-&gt;len - ETH_ALEN);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev-&gt;stats.rx_packets++;</div><div class='del'>-	dev-&gt;stats.rx_bytes += skb-&gt;len;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;iw_mode == IW_MODE_MASTER &amp;&amp; !wds &amp;&amp;</div><div class='del'>-	    local-&gt;ap-&gt;bridge_packets) {</div><div class='del'>-		if (dst[0] &amp; 0x01) {</div><div class='del'>-			/* copy multicast frame both to the higher layers and</div><div class='del'>-			 * to the wireless media */</div><div class='del'>-			local-&gt;ap-&gt;bridged_multicast++;</div><div class='del'>-			skb2 = skb_clone(skb, GFP_ATOMIC);</div><div class='del'>-			if (skb2 == NULL)</div><div class='del'>-				printk(KERN_DEBUG "%s: skb_clone failed for "</div><div class='del'>-				       "multicast frame\n", dev-&gt;name);</div><div class='del'>-		} else if (hostap_is_sta_authorized(local-&gt;ap, dst)) {</div><div class='del'>-			/* send frame directly to the associated STA using</div><div class='del'>-			 * wireless media and not passing to higher layers */</div><div class='del'>-			local-&gt;ap-&gt;bridged_unicast++;</div><div class='del'>-			skb2 = skb;</div><div class='del'>-			skb = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (skb2 != NULL) {</div><div class='del'>-		/* send to wireless media */</div><div class='del'>-		skb2-&gt;dev = dev;</div><div class='del'>-		skb2-&gt;protocol = cpu_to_be16(ETH_P_802_3);</div><div class='del'>-		skb_reset_mac_header(skb2);</div><div class='del'>-		skb_reset_network_header(skb2);</div><div class='del'>-		/* skb2-&gt;network_header += ETH_HLEN; */</div><div class='del'>-		dev_queue_xmit(skb2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (skb) {</div><div class='del'>-		skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='del'>-		memset(skb-&gt;cb, 0, sizeof(skb-&gt;cb));</div><div class='del'>-		netif_rx(skb);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- rx_exit:</div><div class='del'>-	if (sta)</div><div class='del'>-		hostap_handle_sta_release(sta);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>- rx_dropped:</div><div class='del'>-	dev_kfree_skb(skb);</div><div class='del'>-</div><div class='del'>-	dev-&gt;stats.rx_dropped++;</div><div class='del'>-	goto rx_exit;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(hostap_80211_rx);</div><div class='head'>diff --git a/drivers/net/wireless/intersil/hostap/hostap_80211_tx.c b/drivers/net/wireless/intersil/hostap/hostap_80211_tx.c<br/>deleted file mode 100644<br/>index c47da06945c2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/hostap/hostap_80211_tx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_80211_tx.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,554 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hostap_80211.h"</div><div class='del'>-#include "hostap_common.h"</div><div class='del'>-#include "hostap_wlan.h"</div><div class='del'>-#include "hostap.h"</div><div class='del'>-#include "hostap_ap.h"</div><div class='del'>-</div><div class='del'>-/* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */</div><div class='del'>-/* Ethernet-II snap header (RFC1042 for most EtherTypes) */</div><div class='del'>-static unsigned char rfc1042_header[] =</div><div class='del'>-{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };</div><div class='del'>-/* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */</div><div class='del'>-static unsigned char bridge_tunnel_header[] =</div><div class='del'>-{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };</div><div class='del'>-/* No encapsulation header if EtherType &lt; 0x600 (=length) */</div><div class='del'>-</div><div class='del'>-void hostap_dump_tx_80211(const char *name, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-	u16 fc;</div><div class='del'>-</div><div class='del'>-	hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: TX len=%d jiffies=%ld\n",</div><div class='del'>-	       name, skb-&gt;len, jiffies);</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; 2)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	fc = le16_to_cpu(hdr-&gt;frame_control);</div><div class='del'>-	printk(KERN_DEBUG "   FC=0x%04x (type=%d:%d)%s%s",</div><div class='del'>-	       fc, (fc &amp; IEEE80211_FCTL_FTYPE) &gt;&gt; 2,</div><div class='del'>-	       (fc &amp; IEEE80211_FCTL_STYPE) &gt;&gt; 4,</div><div class='del'>-	       fc &amp; IEEE80211_FCTL_TODS ? " [ToDS]" : "",</div><div class='del'>-	       fc &amp; IEEE80211_FCTL_FROMDS ? " [FromDS]" : "");</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; IEEE80211_DATA_HDR3_LEN) {</div><div class='del'>-		printk("\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(" dur=0x%04x seq=0x%04x\n", le16_to_cpu(hdr-&gt;duration_id),</div><div class='del'>-	       le16_to_cpu(hdr-&gt;seq_ctrl));</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "   A1=%pM", hdr-&gt;addr1);</div><div class='del'>-	printk(" A2=%pM", hdr-&gt;addr2);</div><div class='del'>-	printk(" A3=%pM", hdr-&gt;addr3);</div><div class='del'>-	if (skb-&gt;len &gt;= 30)</div><div class='del'>-		printk(" A4=%pM", hdr-&gt;addr4);</div><div class='del'>-	printk("\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* hard_start_xmit function for data interfaces (wlan#, wlan#wds#, wlan#sta)</div><div class='del'>- * Convert Ethernet header into a suitable IEEE 802.11 header depending on</div><div class='del'>- * device configuration. */</div><div class='del'>-netdev_tx_t hostap_data_start_xmit(struct sk_buff *skb,</div><div class='del'>-				   struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int need_headroom, need_tailroom = 0;</div><div class='del'>-	struct ieee80211_hdr hdr;</div><div class='del'>-	u16 fc, ethertype = 0;</div><div class='del'>-	enum {</div><div class='del'>-		WDS_NO = 0, WDS_OWN_FRAME, WDS_COMPLIANT_FRAME</div><div class='del'>-	} use_wds = WDS_NO;</div><div class='del'>-	u8 *encaps_data;</div><div class='del'>-	int hdr_len, encaps_len, skip_header_bytes;</div><div class='del'>-	int to_assoc_ap = 0;</div><div class='del'>-	struct hostap_skb_tx_data *meta;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; ETH_HLEN) {</div><div class='del'>-		printk(KERN_DEBUG "%s: hostap_data_start_xmit: short skb "</div><div class='del'>-		       "(len=%d)\n", dev-&gt;name, skb-&gt;len);</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;ddev != dev) {</div><div class='del'>-		use_wds = (local-&gt;iw_mode == IW_MODE_MASTER &amp;&amp;</div><div class='del'>-			   !(local-&gt;wds_type &amp; HOSTAP_WDS_STANDARD_FRAME)) ?</div><div class='del'>-			WDS_OWN_FRAME : WDS_COMPLIANT_FRAME;</div><div class='del'>-		if (dev == local-&gt;stadev) {</div><div class='del'>-			to_assoc_ap = 1;</div><div class='del'>-			use_wds = WDS_NO;</div><div class='del'>-		} else if (dev == local-&gt;apdev) {</div><div class='del'>-			printk(KERN_DEBUG "%s: prism2_tx: trying to use "</div><div class='del'>-			       "AP device with Ethernet net dev\n", dev-&gt;name);</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-			return NETDEV_TX_OK;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (local-&gt;iw_mode == IW_MODE_REPEAT) {</div><div class='del'>-			printk(KERN_DEBUG "%s: prism2_tx: trying to use "</div><div class='del'>-			       "non-WDS link in Repeater mode\n", dev-&gt;name);</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-			return NETDEV_TX_OK;</div><div class='del'>-		} else if (local-&gt;iw_mode == IW_MODE_INFRA &amp;&amp;</div><div class='del'>-			   (local-&gt;wds_type &amp; HOSTAP_WDS_AP_CLIENT) &amp;&amp;</div><div class='del'>-			   !ether_addr_equal(skb-&gt;data + ETH_ALEN, dev-&gt;dev_addr)) {</div><div class='del'>-			/* AP client mode: send frames with foreign src addr</div><div class='del'>-			 * using 4-addr WDS frames */</div><div class='del'>-			use_wds = WDS_COMPLIANT_FRAME;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Incoming skb-&gt;data: dst_addr[6], src_addr[6], proto[2], payload</div><div class='del'>-	 * ==&gt;</div><div class='del'>-	 * Prism2 TX frame with 802.11 header:</div><div class='del'>-	 * txdesc (address order depending on used mode; includes dst_addr and</div><div class='del'>-	 * src_addr), possible encapsulation (RFC1042/Bridge-Tunnel;</div><div class='del'>-	 * proto[2], payload {, possible addr4[6]} */</div><div class='del'>-</div><div class='del'>-	ethertype = (skb-&gt;data[12] &lt;&lt; 8) | skb-&gt;data[13];</div><div class='del'>-</div><div class='del'>-	memset(&amp;hdr, 0, sizeof(hdr));</div><div class='del'>-</div><div class='del'>-	/* Length of data after IEEE 802.11 header */</div><div class='del'>-	encaps_data = NULL;</div><div class='del'>-	encaps_len = 0;</div><div class='del'>-	skip_header_bytes = ETH_HLEN;</div><div class='del'>-	if (ethertype == ETH_P_AARP || ethertype == ETH_P_IPX) {</div><div class='del'>-		encaps_data = bridge_tunnel_header;</div><div class='del'>-		encaps_len = sizeof(bridge_tunnel_header);</div><div class='del'>-		skip_header_bytes -= 2;</div><div class='del'>-	} else if (ethertype &gt;= 0x600) {</div><div class='del'>-		encaps_data = rfc1042_header;</div><div class='del'>-		encaps_len = sizeof(rfc1042_header);</div><div class='del'>-		skip_header_bytes -= 2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA;</div><div class='del'>-	hdr_len = IEEE80211_DATA_HDR3_LEN;</div><div class='del'>-</div><div class='del'>-	if (use_wds != WDS_NO) {</div><div class='del'>-		/* Note! Prism2 station firmware has problems with sending real</div><div class='del'>-		 * 802.11 frames with four addresses; until these problems can</div><div class='del'>-		 * be fixed or worked around, 4-addr frames needed for WDS are</div><div class='del'>-		 * using incompatible format: FromDS flag is not set and the</div><div class='del'>-		 * fourth address is added after the frame payload; it is</div><div class='del'>-		 * assumed, that the receiving station knows how to handle this</div><div class='del'>-		 * frame format */</div><div class='del'>-</div><div class='del'>-		if (use_wds == WDS_COMPLIANT_FRAME) {</div><div class='del'>-			fc |= IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS;</div><div class='del'>-			/* From&amp;To DS: Addr1 = RA, Addr2 = TA, Addr3 = DA,</div><div class='del'>-			 * Addr4 = SA */</div><div class='del'>-			skb_copy_from_linear_data_offset(skb, ETH_ALEN,</div><div class='del'>-							 &amp;hdr.addr4, ETH_ALEN);</div><div class='del'>-			hdr_len += ETH_ALEN;</div><div class='del'>-		} else {</div><div class='del'>-			/* bogus 4-addr format to workaround Prism2 station</div><div class='del'>-			 * f/w bug */</div><div class='del'>-			fc |= IEEE80211_FCTL_TODS;</div><div class='del'>-			/* From DS: Addr1 = DA (used as RA),</div><div class='del'>-			 * Addr2 = BSSID (used as TA), Addr3 = SA (used as DA),</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			/* SA from skb-&gt;data + ETH_ALEN will be added after</div><div class='del'>-			 * frame payload; use hdr.addr4 as a temporary buffer</div><div class='del'>-			 */</div><div class='del'>-			skb_copy_from_linear_data_offset(skb, ETH_ALEN,</div><div class='del'>-							 &amp;hdr.addr4, ETH_ALEN);</div><div class='del'>-			need_tailroom += ETH_ALEN;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* send broadcast and multicast frames to broadcast RA, if</div><div class='del'>-		 * configured; otherwise, use unicast RA of the WDS link */</div><div class='del'>-		if ((local-&gt;wds_type &amp; HOSTAP_WDS_BROADCAST_RA) &amp;&amp;</div><div class='del'>-		    is_multicast_ether_addr(skb-&gt;data))</div><div class='del'>-			eth_broadcast_addr(hdr.addr1);</div><div class='del'>-		else if (iface-&gt;type == HOSTAP_INTERFACE_WDS)</div><div class='del'>-			memcpy(&amp;hdr.addr1, iface-&gt;u.wds.remote_addr,</div><div class='del'>-			       ETH_ALEN);</div><div class='del'>-		else</div><div class='del'>-			memcpy(&amp;hdr.addr1, local-&gt;bssid, ETH_ALEN);</div><div class='del'>-		memcpy(&amp;hdr.addr2, dev-&gt;dev_addr, ETH_ALEN);</div><div class='del'>-		skb_copy_from_linear_data(skb, &amp;hdr.addr3, ETH_ALEN);</div><div class='del'>-	} else if (local-&gt;iw_mode == IW_MODE_MASTER &amp;&amp; !to_assoc_ap) {</div><div class='del'>-		fc |= IEEE80211_FCTL_FROMDS;</div><div class='del'>-		/* From DS: Addr1 = DA, Addr2 = BSSID, Addr3 = SA */</div><div class='del'>-		skb_copy_from_linear_data(skb, &amp;hdr.addr1, ETH_ALEN);</div><div class='del'>-		memcpy(&amp;hdr.addr2, dev-&gt;dev_addr, ETH_ALEN);</div><div class='del'>-		skb_copy_from_linear_data_offset(skb, ETH_ALEN, &amp;hdr.addr3,</div><div class='del'>-						 ETH_ALEN);</div><div class='del'>-	} else if (local-&gt;iw_mode == IW_MODE_INFRA || to_assoc_ap) {</div><div class='del'>-		fc |= IEEE80211_FCTL_TODS;</div><div class='del'>-		/* To DS: Addr1 = BSSID, Addr2 = SA, Addr3 = DA */</div><div class='del'>-		memcpy(&amp;hdr.addr1, to_assoc_ap ?</div><div class='del'>-		       local-&gt;assoc_ap_addr : local-&gt;bssid, ETH_ALEN);</div><div class='del'>-		skb_copy_from_linear_data_offset(skb, ETH_ALEN, &amp;hdr.addr2,</div><div class='del'>-						 ETH_ALEN);</div><div class='del'>-		skb_copy_from_linear_data(skb, &amp;hdr.addr3, ETH_ALEN);</div><div class='del'>-	} else if (local-&gt;iw_mode == IW_MODE_ADHOC) {</div><div class='del'>-		/* not From/To DS: Addr1 = DA, Addr2 = SA, Addr3 = BSSID */</div><div class='del'>-		skb_copy_from_linear_data(skb, &amp;hdr.addr1, ETH_ALEN);</div><div class='del'>-		skb_copy_from_linear_data_offset(skb, ETH_ALEN, &amp;hdr.addr2,</div><div class='del'>-						 ETH_ALEN);</div><div class='del'>-		memcpy(&amp;hdr.addr3, local-&gt;bssid, ETH_ALEN);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hdr.frame_control = cpu_to_le16(fc);</div><div class='del'>-</div><div class='del'>-	skb_pull(skb, skip_header_bytes);</div><div class='del'>-	need_headroom = local-&gt;func-&gt;need_tx_headroom + hdr_len + encaps_len;</div><div class='del'>-	if (skb_tailroom(skb) &lt; need_tailroom) {</div><div class='del'>-		skb = skb_unshare(skb, GFP_ATOMIC);</div><div class='del'>-		if (skb == NULL) {</div><div class='del'>-			iface-&gt;stats.tx_dropped++;</div><div class='del'>-			return NETDEV_TX_OK;</div><div class='del'>-		}</div><div class='del'>-		if (pskb_expand_head(skb, need_headroom, need_tailroom,</div><div class='del'>-				     GFP_ATOMIC)) {</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-			iface-&gt;stats.tx_dropped++;</div><div class='del'>-			return NETDEV_TX_OK;</div><div class='del'>-		}</div><div class='del'>-	} else if (skb_headroom(skb) &lt; need_headroom) {</div><div class='del'>-		struct sk_buff *tmp = skb;</div><div class='del'>-		skb = skb_realloc_headroom(skb, need_headroom);</div><div class='del'>-		kfree_skb(tmp);</div><div class='del'>-		if (skb == NULL) {</div><div class='del'>-			iface-&gt;stats.tx_dropped++;</div><div class='del'>-			return NETDEV_TX_OK;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		skb = skb_unshare(skb, GFP_ATOMIC);</div><div class='del'>-		if (skb == NULL) {</div><div class='del'>-			iface-&gt;stats.tx_dropped++;</div><div class='del'>-			return NETDEV_TX_OK;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (encaps_data)</div><div class='del'>-		memcpy(skb_push(skb, encaps_len), encaps_data, encaps_len);</div><div class='del'>-	memcpy(skb_push(skb, hdr_len), &amp;hdr, hdr_len);</div><div class='del'>-	if (use_wds == WDS_OWN_FRAME) {</div><div class='del'>-		skb_put_data(skb, &amp;hdr.addr4, ETH_ALEN);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iface-&gt;stats.tx_packets++;</div><div class='del'>-	iface-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='del'>-</div><div class='del'>-	skb_reset_mac_header(skb);</div><div class='del'>-	meta = (struct hostap_skb_tx_data *) skb-&gt;cb;</div><div class='del'>-	memset(meta, 0, sizeof(*meta));</div><div class='del'>-	meta-&gt;magic = HOSTAP_SKB_TX_DATA_MAGIC;</div><div class='del'>-	if (use_wds)</div><div class='del'>-		meta-&gt;flags |= HOSTAP_TX_FLAGS_WDS;</div><div class='del'>-	meta-&gt;ethertype = ethertype;</div><div class='del'>-	meta-&gt;iface = iface;</div><div class='del'>-</div><div class='del'>-	/* Send IEEE 802.11 encapsulated frame using the master radio device */</div><div class='del'>-	skb-&gt;dev = local-&gt;dev;</div><div class='del'>-	dev_queue_xmit(skb);</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* hard_start_xmit function for hostapd wlan#ap interfaces */</div><div class='del'>-netdev_tx_t hostap_mgmt_start_xmit(struct sk_buff *skb,</div><div class='del'>-				   struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	struct hostap_skb_tx_data *meta;</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-	u16 fc;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; 10) {</div><div class='del'>-		printk(KERN_DEBUG "%s: hostap_mgmt_start_xmit: short skb "</div><div class='del'>-		       "(len=%d)\n", dev-&gt;name, skb-&gt;len);</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iface-&gt;stats.tx_packets++;</div><div class='del'>-	iface-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='del'>-</div><div class='del'>-	meta = (struct hostap_skb_tx_data *) skb-&gt;cb;</div><div class='del'>-	memset(meta, 0, sizeof(*meta));</div><div class='del'>-	meta-&gt;magic = HOSTAP_SKB_TX_DATA_MAGIC;</div><div class='del'>-	meta-&gt;iface = iface;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &gt;= IEEE80211_DATA_HDR3_LEN + sizeof(rfc1042_header) + 2) {</div><div class='del'>-		hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-		fc = le16_to_cpu(hdr-&gt;frame_control);</div><div class='del'>-		if (ieee80211_is_data(hdr-&gt;frame_control) &amp;&amp;</div><div class='del'>-		    (fc &amp; IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_DATA) {</div><div class='del'>-			u8 *pos = &amp;skb-&gt;data[IEEE80211_DATA_HDR3_LEN +</div><div class='del'>-					     sizeof(rfc1042_header)];</div><div class='del'>-			meta-&gt;ethertype = (pos[0] &lt;&lt; 8) | pos[1];</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Send IEEE 802.11 encapsulated frame using the master radio device */</div><div class='del'>-	skb-&gt;dev = local-&gt;dev;</div><div class='del'>-	dev_queue_xmit(skb);</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only from software IRQ */</div><div class='del'>-static struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,</div><div class='del'>-					  struct lib80211_crypt_data *crypt)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-	int prefix_len, postfix_len, hdr_len, res;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(skb-&gt;dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; IEEE80211_DATA_HDR3_LEN) {</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;tkip_countermeasures &amp;&amp;</div><div class='del'>-	    strcmp(crypt-&gt;ops-&gt;name, "TKIP") == 0) {</div><div class='del'>-		hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-		if (net_ratelimit()) {</div><div class='del'>-			printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "</div><div class='del'>-			       "TX packet to %pM\n",</div><div class='del'>-			       local-&gt;dev-&gt;name, hdr-&gt;addr1);</div><div class='del'>-		}</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb = skb_unshare(skb, GFP_ATOMIC);</div><div class='del'>-	if (skb == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	prefix_len = crypt-&gt;ops-&gt;extra_mpdu_prefix_len +</div><div class='del'>-		crypt-&gt;ops-&gt;extra_msdu_prefix_len;</div><div class='del'>-	postfix_len = crypt-&gt;ops-&gt;extra_mpdu_postfix_len +</div><div class='del'>-		crypt-&gt;ops-&gt;extra_msdu_postfix_len;</div><div class='del'>-	if ((skb_headroom(skb) &lt; prefix_len ||</div><div class='del'>-	     skb_tailroom(skb) &lt; postfix_len) &amp;&amp;</div><div class='del'>-	    pskb_expand_head(skb, prefix_len, postfix_len, GFP_ATOMIC)) {</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-	hdr_len = hostap_80211_get_hdrlen(hdr-&gt;frame_control);</div><div class='del'>-</div><div class='del'>-	/* Host-based IEEE 802.11 fragmentation for TX is not yet supported, so</div><div class='del'>-	 * call both MSDU and MPDU encryption functions from here. */</div><div class='del'>-	atomic_inc(&amp;crypt-&gt;refcnt);</div><div class='del'>-	res = 0;</div><div class='del'>-	if (crypt-&gt;ops-&gt;encrypt_msdu)</div><div class='del'>-		res = crypt-&gt;ops-&gt;encrypt_msdu(skb, hdr_len, crypt-&gt;priv);</div><div class='del'>-	if (res == 0 &amp;&amp; crypt-&gt;ops-&gt;encrypt_mpdu)</div><div class='del'>-		res = crypt-&gt;ops-&gt;encrypt_mpdu(skb, hdr_len, crypt-&gt;priv);</div><div class='del'>-	atomic_dec(&amp;crypt-&gt;refcnt);</div><div class='del'>-	if (res &lt; 0) {</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* hard_start_xmit function for master radio interface wifi#.</div><div class='del'>- * AP processing (TX rate control, power save buffering, etc.).</div><div class='del'>- * Use hardware TX function to send the frame. */</div><div class='del'>-netdev_tx_t hostap_master_start_xmit(struct sk_buff *skb,</div><div class='del'>-				     struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	netdev_tx_t ret = NETDEV_TX_BUSY;</div><div class='del'>-	u16 fc;</div><div class='del'>-	struct hostap_tx_data tx;</div><div class='del'>-	ap_tx_ret tx_ret;</div><div class='del'>-	struct hostap_skb_tx_data *meta;</div><div class='del'>-	int no_encrypt = 0;</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	tx.skb = skb;</div><div class='del'>-	tx.sta_ptr = NULL;</div><div class='del'>-</div><div class='del'>-	meta = (struct hostap_skb_tx_data *) skb-&gt;cb;</div><div class='del'>-	if (meta-&gt;magic != HOSTAP_SKB_TX_DATA_MAGIC) {</div><div class='del'>-		printk(KERN_DEBUG "%s: invalid skb-&gt;cb magic (0x%08x, "</div><div class='del'>-		       "expected 0x%08x)\n",</div><div class='del'>-		       dev-&gt;name, meta-&gt;magic, HOSTAP_SKB_TX_DATA_MAGIC);</div><div class='del'>-		ret = NETDEV_TX_OK;</div><div class='del'>-		iface-&gt;stats.tx_dropped++;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;host_encrypt) {</div><div class='del'>-		/* Set crypt to default algorithm and key; will be replaced in</div><div class='del'>-		 * AP code if STA has own alg/key */</div><div class='del'>-		tx.crypt = local-&gt;crypt_info.crypt[local-&gt;crypt_info.tx_keyidx];</div><div class='del'>-		tx.host_encrypt = 1;</div><div class='del'>-	} else {</div><div class='del'>-		tx.crypt = NULL;</div><div class='del'>-		tx.host_encrypt = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; 24) {</div><div class='del'>-		printk(KERN_DEBUG "%s: hostap_master_start_xmit: short skb "</div><div class='del'>-		       "(len=%d)\n", dev-&gt;name, skb-&gt;len);</div><div class='del'>-		ret = NETDEV_TX_OK;</div><div class='del'>-		iface-&gt;stats.tx_dropped++;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIX (?):</div><div class='del'>-	 * Wi-Fi 802.11b test plan suggests that AP should ignore power save</div><div class='del'>-	 * bit in authentication and (re)association frames and assume tha</div><div class='del'>-	 * STA remains awake for the response. */</div><div class='del'>-	tx_ret = hostap_handle_sta_tx(local, &amp;tx);</div><div class='del'>-	skb = tx.skb;</div><div class='del'>-	meta = (struct hostap_skb_tx_data *) skb-&gt;cb;</div><div class='del'>-	hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-	fc = le16_to_cpu(hdr-&gt;frame_control);</div><div class='del'>-	switch (tx_ret) {</div><div class='del'>-	case AP_TX_CONTINUE:</div><div class='del'>-		break;</div><div class='del'>-	case AP_TX_CONTINUE_NOT_AUTHORIZED:</div><div class='del'>-		if (local-&gt;ieee_802_1x &amp;&amp;</div><div class='del'>-		    ieee80211_is_data(hdr-&gt;frame_control) &amp;&amp;</div><div class='del'>-		    meta-&gt;ethertype != ETH_P_PAE &amp;&amp;</div><div class='del'>-		    !(meta-&gt;flags &amp; HOSTAP_TX_FLAGS_WDS)) {</div><div class='del'>-			printk(KERN_DEBUG "%s: dropped frame to unauthorized "</div><div class='del'>-			       "port (IEEE 802.1X): ethertype=0x%04x\n",</div><div class='del'>-			       dev-&gt;name, meta-&gt;ethertype);</div><div class='del'>-			hostap_dump_tx_80211(dev-&gt;name, skb);</div><div class='del'>-</div><div class='del'>-			ret = NETDEV_TX_OK; /* drop packet */</div><div class='del'>-			iface-&gt;stats.tx_dropped++;</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case AP_TX_DROP:</div><div class='del'>-		ret = NETDEV_TX_OK; /* drop packet */</div><div class='del'>-		iface-&gt;stats.tx_dropped++;</div><div class='del'>-		goto fail;</div><div class='del'>-	case AP_TX_RETRY:</div><div class='del'>-		goto fail;</div><div class='del'>-	case AP_TX_BUFFERED:</div><div class='del'>-		/* do not free skb here, it will be freed when the</div><div class='del'>-		 * buffered frame is sent/timed out */</div><div class='del'>-		ret = NETDEV_TX_OK;</div><div class='del'>-		goto tx_exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Request TX callback if protocol version is 2 in 802.11 header;</div><div class='del'>-	 * this version 2 is a special case used between hostapd and kernel</div><div class='del'>-	 * driver */</div><div class='del'>-	if (((fc &amp; IEEE80211_FCTL_VERS) == BIT(1)) &amp;&amp;</div><div class='del'>-	    local-&gt;ap &amp;&amp; local-&gt;ap-&gt;tx_callback_idx &amp;&amp; meta-&gt;tx_cb_idx == 0) {</div><div class='del'>-		meta-&gt;tx_cb_idx = local-&gt;ap-&gt;tx_callback_idx;</div><div class='del'>-</div><div class='del'>-		/* remove special version from the frame header */</div><div class='del'>-		fc &amp;= ~IEEE80211_FCTL_VERS;</div><div class='del'>-		hdr-&gt;frame_control = cpu_to_le16(fc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ieee80211_is_data(hdr-&gt;frame_control)) {</div><div class='del'>-		no_encrypt = 1;</div><div class='del'>-		tx.crypt = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;ieee_802_1x &amp;&amp; meta-&gt;ethertype == ETH_P_PAE &amp;&amp; tx.crypt &amp;&amp;</div><div class='del'>-	    !(fc &amp; IEEE80211_FCTL_PROTECTED)) {</div><div class='del'>-		no_encrypt = 1;</div><div class='del'>-		PDEBUG(DEBUG_EXTRA2, "%s: TX: IEEE 802.1X - passing "</div><div class='del'>-		       "unencrypted EAPOL frame\n", dev-&gt;name);</div><div class='del'>-		tx.crypt = NULL; /* no encryption for IEEE 802.1X frames */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tx.crypt &amp;&amp; (!tx.crypt-&gt;ops || !tx.crypt-&gt;ops-&gt;encrypt_mpdu))</div><div class='del'>-		tx.crypt = NULL;</div><div class='del'>-	else if ((tx.crypt ||</div><div class='del'>-		 local-&gt;crypt_info.crypt[local-&gt;crypt_info.tx_keyidx]) &amp;&amp;</div><div class='del'>-		 !no_encrypt) {</div><div class='del'>-		/* Add ISWEP flag both for firmware and host based encryption</div><div class='del'>-		 */</div><div class='del'>-		fc |= IEEE80211_FCTL_PROTECTED;</div><div class='del'>-		hdr-&gt;frame_control = cpu_to_le16(fc);</div><div class='del'>-	} else if (local-&gt;drop_unencrypted &amp;&amp;</div><div class='del'>-		   ieee80211_is_data(hdr-&gt;frame_control) &amp;&amp;</div><div class='del'>-		   meta-&gt;ethertype != ETH_P_PAE) {</div><div class='del'>-		if (net_ratelimit()) {</div><div class='del'>-			printk(KERN_DEBUG "%s: dropped unencrypted TX data "</div><div class='del'>-			       "frame (drop_unencrypted=1)\n", dev-&gt;name);</div><div class='del'>-		}</div><div class='del'>-		iface-&gt;stats.tx_dropped++;</div><div class='del'>-		ret = NETDEV_TX_OK;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tx.crypt) {</div><div class='del'>-		skb = hostap_tx_encrypt(skb, tx.crypt);</div><div class='del'>-		if (skb == NULL) {</div><div class='del'>-			printk(KERN_DEBUG "%s: TX - encryption failed\n",</div><div class='del'>-			       dev-&gt;name);</div><div class='del'>-			ret = NETDEV_TX_OK;</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-		meta = (struct hostap_skb_tx_data *) skb-&gt;cb;</div><div class='del'>-		if (meta-&gt;magic != HOSTAP_SKB_TX_DATA_MAGIC) {</div><div class='del'>-			printk(KERN_DEBUG "%s: invalid skb-&gt;cb magic (0x%08x, "</div><div class='del'>-			       "expected 0x%08x) after hostap_tx_encrypt\n",</div><div class='del'>-			       dev-&gt;name, meta-&gt;magic,</div><div class='del'>-			       HOSTAP_SKB_TX_DATA_MAGIC);</div><div class='del'>-			ret = NETDEV_TX_OK;</div><div class='del'>-			iface-&gt;stats.tx_dropped++;</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;tx == NULL || local-&gt;func-&gt;tx(skb, dev)) {</div><div class='del'>-		ret = NETDEV_TX_OK;</div><div class='del'>-		iface-&gt;stats.tx_dropped++;</div><div class='del'>-	} else {</div><div class='del'>-		ret = NETDEV_TX_OK;</div><div class='del'>-		iface-&gt;stats.tx_packets++;</div><div class='del'>-		iface-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- fail:</div><div class='del'>-	if (ret == NETDEV_TX_OK &amp;&amp; skb)</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>- tx_exit:</div><div class='del'>-	if (tx.sta_ptr)</div><div class='del'>-		hostap_handle_sta_release(tx.sta_ptr);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(hostap_master_start_xmit);</div><div class='head'>diff --git a/drivers/net/wireless/intersil/hostap/hostap_ap.c b/drivers/net/wireless/intersil/hostap/hostap_ap.c<br/>deleted file mode 100644<br/>index 8bcc1cdcb75b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/hostap/hostap_ap.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_ap.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3277 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * Intersil Prism2 driver with Host AP (software access point) support</div><div class='del'>- * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen</div><div class='del'>- * &lt;j@w1.fi&gt;</div><div class='del'>- * Copyright (c) 2002-2005, Jouni Malinen &lt;j@w1.fi&gt;</div><div class='del'>- *</div><div class='del'>- * This file is to be included into hostap.c when S/W AP functionality is</div><div class='del'>- * compiled.</div><div class='del'>- *</div><div class='del'>- * AP:  FIX:</div><div class='del'>- * - if unicast Class 2 (assoc,reassoc,disassoc) frame received from</div><div class='del'>- *   unauthenticated STA, send deauth. frame (8802.11: 5.5)</div><div class='del'>- * - if unicast Class 3 (data with to/from DS,deauth,pspoll) frame received</div><div class='del'>- *   from authenticated, but unassoc STA, send disassoc frame (8802.11: 5.5)</div><div class='del'>- * - if unicast Class 3 received from unauthenticated STA, send deauth. frame</div><div class='del'>- *   (8802.11: 5.5)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hostap_wlan.h"</div><div class='del'>-#include "hostap.h"</div><div class='del'>-#include "hostap_ap.h"</div><div class='del'>-</div><div class='del'>-static int other_ap_policy[MAX_PARM_DEVICES] = { AP_OTHER_AP_SKIP_ALL,</div><div class='del'>-						 DEF_INTS };</div><div class='del'>-module_param_array(other_ap_policy, int, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(other_ap_policy, "Other AP beacon monitoring policy (0-3)");</div><div class='del'>-</div><div class='del'>-static int ap_max_inactivity[MAX_PARM_DEVICES] = { AP_MAX_INACTIVITY_SEC,</div><div class='del'>-						   DEF_INTS };</div><div class='del'>-module_param_array(ap_max_inactivity, int, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(ap_max_inactivity, "AP timeout (in seconds) for station "</div><div class='del'>-		 "inactivity");</div><div class='del'>-</div><div class='del'>-static int ap_bridge_packets[MAX_PARM_DEVICES] = { 1, DEF_INTS };</div><div class='del'>-module_param_array(ap_bridge_packets, int, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(ap_bridge_packets, "Bridge packets directly between "</div><div class='del'>-		 "stations");</div><div class='del'>-</div><div class='del'>-static int autom_ap_wds[MAX_PARM_DEVICES] = { 0, DEF_INTS };</div><div class='del'>-module_param_array(autom_ap_wds, int, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(autom_ap_wds, "Add WDS connections to other APs "</div><div class='del'>-		 "automatically");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct sta_info* ap_get_sta(struct ap_data *ap, u8 *sta);</div><div class='del'>-static void hostap_event_expired_sta(struct net_device *dev,</div><div class='del'>-				     struct sta_info *sta);</div><div class='del'>-static void handle_add_proc_queue(struct work_struct *work);</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-static void handle_wds_oper_queue(struct work_struct *work);</div><div class='del'>-static void prism2_send_mgmt(struct net_device *dev,</div><div class='del'>-			     u16 type_subtype, char *body,</div><div class='del'>-			     int body_len, u8 *addr, u16 tx_cb_idx);</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if !defined(PRISM2_NO_PROCFS_DEBUG) &amp;&amp; defined(CONFIG_PROC_FS)</div><div class='del'>-static int ap_debug_proc_show(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	struct ap_data *ap = PDE_DATA(file_inode(m-&gt;file));</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "BridgedUnicastFrames=%u\n", ap-&gt;bridged_unicast);</div><div class='del'>-	seq_printf(m, "BridgedMulticastFrames=%u\n", ap-&gt;bridged_multicast);</div><div class='del'>-	seq_printf(m, "max_inactivity=%u\n", ap-&gt;max_inactivity / HZ);</div><div class='del'>-	seq_printf(m, "bridge_packets=%u\n", ap-&gt;bridge_packets);</div><div class='del'>-	seq_printf(m, "nullfunc_ack=%u\n", ap-&gt;nullfunc_ack);</div><div class='del'>-	seq_printf(m, "autom_ap_wds=%u\n", ap-&gt;autom_ap_wds);</div><div class='del'>-	seq_printf(m, "auth_algs=%u\n", ap-&gt;local-&gt;auth_algs);</div><div class='del'>-	seq_printf(m, "tx_drop_nonassoc=%u\n", ap-&gt;tx_drop_nonassoc);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void ap_sta_hash_add(struct ap_data *ap, struct sta_info *sta)</div><div class='del'>-{</div><div class='del'>-	sta-&gt;hnext = ap-&gt;sta_hash[STA_HASH(sta-&gt;addr)];</div><div class='del'>-	ap-&gt;sta_hash[STA_HASH(sta-&gt;addr)] = sta;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ap_sta_hash_del(struct ap_data *ap, struct sta_info *sta)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *s;</div><div class='del'>-</div><div class='del'>-	s = ap-&gt;sta_hash[STA_HASH(sta-&gt;addr)];</div><div class='del'>-	if (s == NULL) return;</div><div class='del'>-	if (ether_addr_equal(s-&gt;addr, sta-&gt;addr)) {</div><div class='del'>-		ap-&gt;sta_hash[STA_HASH(sta-&gt;addr)] = s-&gt;hnext;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (s-&gt;hnext != NULL &amp;&amp; !ether_addr_equal(s-&gt;hnext-&gt;addr, sta-&gt;addr))</div><div class='del'>-		s = s-&gt;hnext;</div><div class='del'>-	if (s-&gt;hnext != NULL)</div><div class='del'>-		s-&gt;hnext = s-&gt;hnext-&gt;hnext;</div><div class='del'>-	else</div><div class='del'>-		printk("AP: could not remove STA %pM from hash table\n",</div><div class='del'>-		       sta-&gt;addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ap_free_sta(struct ap_data *ap, struct sta_info *sta)</div><div class='del'>-{</div><div class='del'>-	if (sta-&gt;ap &amp;&amp; sta-&gt;local)</div><div class='del'>-		hostap_event_expired_sta(sta-&gt;local-&gt;dev, sta);</div><div class='del'>-</div><div class='del'>-	if (ap-&gt;proc != NULL) {</div><div class='del'>-		char name[20];</div><div class='del'>-		sprintf(name, "%pM", sta-&gt;addr);</div><div class='del'>-		remove_proc_entry(name, ap-&gt;proc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sta-&gt;crypt) {</div><div class='del'>-		sta-&gt;crypt-&gt;ops-&gt;deinit(sta-&gt;crypt-&gt;priv);</div><div class='del'>-		kfree(sta-&gt;crypt);</div><div class='del'>-		sta-&gt;crypt = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_queue_purge(&amp;sta-&gt;tx_buf);</div><div class='del'>-</div><div class='del'>-	ap-&gt;num_sta--;</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-	if (sta-&gt;aid &gt; 0)</div><div class='del'>-		ap-&gt;sta_aid[sta-&gt;aid - 1] = NULL;</div><div class='del'>-</div><div class='del'>-	if (!sta-&gt;ap)</div><div class='del'>-		kfree(sta-&gt;u.sta.challenge);</div><div class='del'>-	del_timer_sync(&amp;sta-&gt;timer);</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-</div><div class='del'>-	kfree(sta);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void hostap_set_tim(local_info_t *local, int aid, int set)</div><div class='del'>-{</div><div class='del'>-	if (local-&gt;func-&gt;set_tim)</div><div class='del'>-		local-&gt;func-&gt;set_tim(local-&gt;dev, aid, set);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void hostap_event_new_sta(struct net_device *dev, struct sta_info *sta)</div><div class='del'>-{</div><div class='del'>-	union iwreq_data wrqu;</div><div class='del'>-	memset(&amp;wrqu, 0, sizeof(wrqu));</div><div class='del'>-	memcpy(wrqu.addr.sa_data, sta-&gt;addr, ETH_ALEN);</div><div class='del'>-	wrqu.addr.sa_family = ARPHRD_ETHER;</div><div class='del'>-	wireless_send_event(dev, IWEVREGISTERED, &amp;wrqu, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void hostap_event_expired_sta(struct net_device *dev,</div><div class='del'>-				     struct sta_info *sta)</div><div class='del'>-{</div><div class='del'>-	union iwreq_data wrqu;</div><div class='del'>-	memset(&amp;wrqu, 0, sizeof(wrqu));</div><div class='del'>-	memcpy(wrqu.addr.sa_data, sta-&gt;addr, ETH_ALEN);</div><div class='del'>-	wrqu.addr.sa_family = ARPHRD_ETHER;</div><div class='del'>-	wireless_send_event(dev, IWEVEXPIRED, &amp;wrqu, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-</div><div class='del'>-static void ap_handle_timer(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *sta = from_timer(sta, t, timer);</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	struct ap_data *ap;</div><div class='del'>-	unsigned long next_time = 0;</div><div class='del'>-	int was_assoc;</div><div class='del'>-</div><div class='del'>-	if (sta == NULL || sta-&gt;local == NULL || sta-&gt;local-&gt;ap == NULL) {</div><div class='del'>-		PDEBUG(DEBUG_AP, "ap_handle_timer() called with NULL data\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	local = sta-&gt;local;</div><div class='del'>-	ap = local-&gt;ap;</div><div class='del'>-	was_assoc = sta-&gt;flags &amp; WLAN_STA_ASSOC;</div><div class='del'>-</div><div class='del'>-	if (atomic_read(&amp;sta-&gt;users) != 0)</div><div class='del'>-		next_time = jiffies + HZ;</div><div class='del'>-	else if ((sta-&gt;flags &amp; WLAN_STA_PERM) &amp;&amp; !(sta-&gt;flags &amp; WLAN_STA_AUTH))</div><div class='del'>-		next_time = jiffies + ap-&gt;max_inactivity;</div><div class='del'>-</div><div class='del'>-	if (time_before(jiffies, sta-&gt;last_rx + ap-&gt;max_inactivity)) {</div><div class='del'>-		/* station activity detected; reset timeout state */</div><div class='del'>-		sta-&gt;timeout_next = STA_NULLFUNC;</div><div class='del'>-		next_time = sta-&gt;last_rx + ap-&gt;max_inactivity;</div><div class='del'>-	} else if (sta-&gt;timeout_next == STA_DISASSOC &amp;&amp;</div><div class='del'>-		   !(sta-&gt;flags &amp; WLAN_STA_PENDING_POLL)) {</div><div class='del'>-		/* STA ACKed data nullfunc frame poll */</div><div class='del'>-		sta-&gt;timeout_next = STA_NULLFUNC;</div><div class='del'>-		next_time = jiffies + ap-&gt;max_inactivity;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (next_time) {</div><div class='del'>-		sta-&gt;timer.expires = next_time;</div><div class='del'>-		add_timer(&amp;sta-&gt;timer);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sta-&gt;ap)</div><div class='del'>-		sta-&gt;timeout_next = STA_DEAUTH;</div><div class='del'>-</div><div class='del'>-	if (sta-&gt;timeout_next == STA_DEAUTH &amp;&amp; !(sta-&gt;flags &amp; WLAN_STA_PERM)) {</div><div class='del'>-		spin_lock(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-		ap_sta_hash_del(ap, sta);</div><div class='del'>-		list_del(&amp;sta-&gt;list);</div><div class='del'>-		spin_unlock(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-		sta-&gt;flags &amp;= ~(WLAN_STA_AUTH | WLAN_STA_ASSOC);</div><div class='del'>-	} else if (sta-&gt;timeout_next == STA_DISASSOC)</div><div class='del'>-		sta-&gt;flags &amp;= ~WLAN_STA_ASSOC;</div><div class='del'>-</div><div class='del'>-	if (was_assoc &amp;&amp; !(sta-&gt;flags &amp; WLAN_STA_ASSOC) &amp;&amp; !sta-&gt;ap)</div><div class='del'>-		hostap_event_expired_sta(local-&gt;dev, sta);</div><div class='del'>-</div><div class='del'>-	if (sta-&gt;timeout_next == STA_DEAUTH &amp;&amp; sta-&gt;aid &gt; 0 &amp;&amp;</div><div class='del'>-	    !skb_queue_empty(&amp;sta-&gt;tx_buf)) {</div><div class='del'>-		hostap_set_tim(local, sta-&gt;aid, 0);</div><div class='del'>-		sta-&gt;flags &amp;= ~WLAN_STA_TIM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sta-&gt;ap) {</div><div class='del'>-		if (ap-&gt;autom_ap_wds) {</div><div class='del'>-			PDEBUG(DEBUG_AP, "%s: removing automatic WDS "</div><div class='del'>-			       "connection to AP %pM\n",</div><div class='del'>-			       local-&gt;dev-&gt;name, sta-&gt;addr);</div><div class='del'>-			hostap_wds_link_oper(local, sta-&gt;addr, WDS_DEL);</div><div class='del'>-		}</div><div class='del'>-	} else if (sta-&gt;timeout_next == STA_NULLFUNC) {</div><div class='del'>-		/* send data frame to poll STA and check whether this frame</div><div class='del'>-		 * is ACKed */</div><div class='del'>-		/* FIX: IEEE80211_STYPE_NULLFUNC would be more appropriate, but</div><div class='del'>-		 * it is apparently not retried so TX Exc events are not</div><div class='del'>-		 * received for it */</div><div class='del'>-		sta-&gt;flags |= WLAN_STA_PENDING_POLL;</div><div class='del'>-		prism2_send_mgmt(local-&gt;dev, IEEE80211_FTYPE_DATA |</div><div class='del'>-				 IEEE80211_STYPE_DATA, NULL, 0,</div><div class='del'>-				 sta-&gt;addr, ap-&gt;tx_callback_poll);</div><div class='del'>-	} else {</div><div class='del'>-		int deauth = sta-&gt;timeout_next == STA_DEAUTH;</div><div class='del'>-		__le16 resp;</div><div class='del'>-		PDEBUG(DEBUG_AP, "%s: sending %s info to STA %pM"</div><div class='del'>-		       "(last=%lu, jiffies=%lu)\n",</div><div class='del'>-		       local-&gt;dev-&gt;name,</div><div class='del'>-		       deauth ? "deauthentication" : "disassociation",</div><div class='del'>-		       sta-&gt;addr, sta-&gt;last_rx, jiffies);</div><div class='del'>-</div><div class='del'>-		resp = cpu_to_le16(deauth ? WLAN_REASON_PREV_AUTH_NOT_VALID :</div><div class='del'>-				   WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY);</div><div class='del'>-		prism2_send_mgmt(local-&gt;dev, IEEE80211_FTYPE_MGMT |</div><div class='del'>-				 (deauth ? IEEE80211_STYPE_DEAUTH :</div><div class='del'>-				  IEEE80211_STYPE_DISASSOC),</div><div class='del'>-				 (char *) &amp;resp, 2, sta-&gt;addr, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sta-&gt;timeout_next == STA_DEAUTH) {</div><div class='del'>-		if (sta-&gt;flags &amp; WLAN_STA_PERM) {</div><div class='del'>-			PDEBUG(DEBUG_AP, "%s: STA %pM"</div><div class='del'>-			       " would have been removed, "</div><div class='del'>-			       "but it has 'perm' flag\n",</div><div class='del'>-			       local-&gt;dev-&gt;name, sta-&gt;addr);</div><div class='del'>-		} else</div><div class='del'>-			ap_free_sta(ap, sta);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sta-&gt;timeout_next == STA_NULLFUNC) {</div><div class='del'>-		sta-&gt;timeout_next = STA_DISASSOC;</div><div class='del'>-		sta-&gt;timer.expires = jiffies + AP_DISASSOC_DELAY;</div><div class='del'>-	} else {</div><div class='del'>-		sta-&gt;timeout_next = STA_DEAUTH;</div><div class='del'>-		sta-&gt;timer.expires = jiffies + AP_DEAUTH_DELAY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	add_timer(&amp;sta-&gt;timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void hostap_deauth_all_stas(struct net_device *dev, struct ap_data *ap,</div><div class='del'>-			    int resend)</div><div class='del'>-{</div><div class='del'>-	u8 addr[ETH_ALEN];</div><div class='del'>-	__le16 resp;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_AP, "%s: Deauthenticate all stations\n", dev-&gt;name);</div><div class='del'>-	eth_broadcast_addr(addr);</div><div class='del'>-</div><div class='del'>-	resp = cpu_to_le16(WLAN_REASON_PREV_AUTH_NOT_VALID);</div><div class='del'>-</div><div class='del'>-	/* deauth message sent; try to resend it few times; the message is</div><div class='del'>-	 * broadcast, so it may be delayed until next DTIM; there is not much</div><div class='del'>-	 * else we can do at this point since the driver is going to be shut</div><div class='del'>-	 * down */</div><div class='del'>-	for (i = 0; i &lt; 5; i++) {</div><div class='del'>-		prism2_send_mgmt(dev, IEEE80211_FTYPE_MGMT |</div><div class='del'>-				 IEEE80211_STYPE_DEAUTH,</div><div class='del'>-				 (char *) &amp;resp, 2, addr, 0);</div><div class='del'>-</div><div class='del'>-		if (!resend || ap-&gt;num_sta &lt;= 0)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		mdelay(50);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int ap_control_proc_show(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	struct ap_data *ap = PDE_DATA(file_inode(m-&gt;file));</div><div class='del'>-	char *policy_txt;</div><div class='del'>-	struct mac_entry *entry;</div><div class='del'>-</div><div class='del'>-	if (v == SEQ_START_TOKEN) {</div><div class='del'>-		switch (ap-&gt;mac_restrictions.policy) {</div><div class='del'>-		case MAC_POLICY_OPEN:</div><div class='del'>-			policy_txt = "open";</div><div class='del'>-			break;</div><div class='del'>-		case MAC_POLICY_ALLOW:</div><div class='del'>-			policy_txt = "allow";</div><div class='del'>-			break;</div><div class='del'>-		case MAC_POLICY_DENY:</div><div class='del'>-			policy_txt = "deny";</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			policy_txt = "unknown";</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		seq_printf(m, "MAC policy: %s\n", policy_txt);</div><div class='del'>-		seq_printf(m, "MAC entries: %u\n", ap-&gt;mac_restrictions.entries);</div><div class='del'>-		seq_puts(m, "MAC list:\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	entry = v;</div><div class='del'>-	seq_printf(m, "%pM\n", entry-&gt;addr);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *ap_control_proc_start(struct seq_file *m, loff_t *_pos)</div><div class='del'>-{</div><div class='del'>-	struct ap_data *ap = PDE_DATA(file_inode(m-&gt;file));</div><div class='del'>-	spin_lock_bh(&amp;ap-&gt;mac_restrictions.lock);</div><div class='del'>-	return seq_list_start_head(&amp;ap-&gt;mac_restrictions.mac_list, *_pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *ap_control_proc_next(struct seq_file *m, void *v, loff_t *_pos)</div><div class='del'>-{</div><div class='del'>-	struct ap_data *ap = PDE_DATA(file_inode(m-&gt;file));</div><div class='del'>-	return seq_list_next(v, &amp;ap-&gt;mac_restrictions.mac_list, _pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ap_control_proc_stop(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	struct ap_data *ap = PDE_DATA(file_inode(m-&gt;file));</div><div class='del'>-	spin_unlock_bh(&amp;ap-&gt;mac_restrictions.lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct seq_operations ap_control_proc_seqops = {</div><div class='del'>-	.start	= ap_control_proc_start,</div><div class='del'>-	.next	= ap_control_proc_next,</div><div class='del'>-	.stop	= ap_control_proc_stop,</div><div class='del'>-	.show	= ap_control_proc_show,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int ap_control_add_mac(struct mac_restrictions *mac_restrictions, u8 *mac)</div><div class='del'>-{</div><div class='del'>-	struct mac_entry *entry;</div><div class='del'>-</div><div class='del'>-	entry = kmalloc(sizeof(struct mac_entry), GFP_KERNEL);</div><div class='del'>-	if (entry == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	memcpy(entry-&gt;addr, mac, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;mac_restrictions-&gt;lock);</div><div class='del'>-	list_add_tail(&amp;entry-&gt;list, &amp;mac_restrictions-&gt;mac_list);</div><div class='del'>-	mac_restrictions-&gt;entries++;</div><div class='del'>-	spin_unlock_bh(&amp;mac_restrictions-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int ap_control_del_mac(struct mac_restrictions *mac_restrictions, u8 *mac)</div><div class='del'>-{</div><div class='del'>-	struct list_head *ptr;</div><div class='del'>-	struct mac_entry *entry;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;mac_restrictions-&gt;lock);</div><div class='del'>-	for (ptr = mac_restrictions-&gt;mac_list.next;</div><div class='del'>-	     ptr != &amp;mac_restrictions-&gt;mac_list; ptr = ptr-&gt;next) {</div><div class='del'>-		entry = list_entry(ptr, struct mac_entry, list);</div><div class='del'>-</div><div class='del'>-		if (ether_addr_equal(entry-&gt;addr, mac)) {</div><div class='del'>-			list_del(ptr);</div><div class='del'>-			kfree(entry);</div><div class='del'>-			mac_restrictions-&gt;entries--;</div><div class='del'>-			spin_unlock_bh(&amp;mac_restrictions-&gt;lock);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_bh(&amp;mac_restrictions-&gt;lock);</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int ap_control_mac_deny(struct mac_restrictions *mac_restrictions,</div><div class='del'>-			       u8 *mac)</div><div class='del'>-{</div><div class='del'>-	struct mac_entry *entry;</div><div class='del'>-	int found = 0;</div><div class='del'>-</div><div class='del'>-	if (mac_restrictions-&gt;policy == MAC_POLICY_OPEN)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;mac_restrictions-&gt;lock);</div><div class='del'>-	list_for_each_entry(entry, &amp;mac_restrictions-&gt;mac_list, list) {</div><div class='del'>-		if (ether_addr_equal(entry-&gt;addr, mac)) {</div><div class='del'>-			found = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_bh(&amp;mac_restrictions-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (mac_restrictions-&gt;policy == MAC_POLICY_ALLOW)</div><div class='del'>-		return !found;</div><div class='del'>-	else</div><div class='del'>-		return found;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void ap_control_flush_macs(struct mac_restrictions *mac_restrictions)</div><div class='del'>-{</div><div class='del'>-	struct list_head *ptr, *n;</div><div class='del'>-	struct mac_entry *entry;</div><div class='del'>-</div><div class='del'>-	if (mac_restrictions-&gt;entries == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;mac_restrictions-&gt;lock);</div><div class='del'>-	for (ptr = mac_restrictions-&gt;mac_list.next, n = ptr-&gt;next;</div><div class='del'>-	     ptr != &amp;mac_restrictions-&gt;mac_list;</div><div class='del'>-	     ptr = n, n = ptr-&gt;next) {</div><div class='del'>-		entry = list_entry(ptr, struct mac_entry, list);</div><div class='del'>-		list_del(ptr);</div><div class='del'>-		kfree(entry);</div><div class='del'>-	}</div><div class='del'>-	mac_restrictions-&gt;entries = 0;</div><div class='del'>-	spin_unlock_bh(&amp;mac_restrictions-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int ap_control_kick_mac(struct ap_data *ap, struct net_device *dev, u8 *mac)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-	__le16 resp;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(ap, mac);</div><div class='del'>-	if (sta) {</div><div class='del'>-		ap_sta_hash_del(ap, sta);</div><div class='del'>-		list_del(&amp;sta-&gt;list);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	if (!sta)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	resp = cpu_to_le16(WLAN_REASON_PREV_AUTH_NOT_VALID);</div><div class='del'>-	prism2_send_mgmt(dev, IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_DEAUTH,</div><div class='del'>-			 (char *) &amp;resp, 2, sta-&gt;addr, 0);</div><div class='del'>-</div><div class='del'>-	if ((sta-&gt;flags &amp; WLAN_STA_ASSOC) &amp;&amp; !sta-&gt;ap)</div><div class='del'>-		hostap_event_expired_sta(dev, sta);</div><div class='del'>-</div><div class='del'>-	ap_free_sta(ap, sta);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void ap_control_kickall(struct ap_data *ap)</div><div class='del'>-{</div><div class='del'>-	struct list_head *ptr, *n;</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-	for (ptr = ap-&gt;sta_list.next, n = ptr-&gt;next; ptr != &amp;ap-&gt;sta_list;</div><div class='del'>-	     ptr = n, n = ptr-&gt;next) {</div><div class='del'>-		sta = list_entry(ptr, struct sta_info, list);</div><div class='del'>-		ap_sta_hash_del(ap, sta);</div><div class='del'>-		list_del(&amp;sta-&gt;list);</div><div class='del'>-		if ((sta-&gt;flags &amp; WLAN_STA_ASSOC) &amp;&amp; !sta-&gt;ap &amp;&amp; sta-&gt;local)</div><div class='del'>-			hostap_event_expired_sta(sta-&gt;local-&gt;dev, sta);</div><div class='del'>-		ap_free_sta(ap, sta);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-</div><div class='del'>-static int prism2_ap_proc_show(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *sta = v;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (v == SEQ_START_TOKEN) {</div><div class='del'>-		seq_printf(m, "# BSSID CHAN SIGNAL NOISE RATE SSID FLAGS\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!sta-&gt;ap)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "%pM %d %d %d %d '",</div><div class='del'>-		   sta-&gt;addr,</div><div class='del'>-		   sta-&gt;u.ap.channel, sta-&gt;last_rx_signal,</div><div class='del'>-		   sta-&gt;last_rx_silence, sta-&gt;last_rx_rate);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; sta-&gt;u.ap.ssid_len; i++) {</div><div class='del'>-		if (sta-&gt;u.ap.ssid[i] &gt;= 32 &amp;&amp; sta-&gt;u.ap.ssid[i] &lt; 127)</div><div class='del'>-			seq_putc(m, sta-&gt;u.ap.ssid[i]);</div><div class='del'>-		else</div><div class='del'>-			seq_printf(m, "&lt;%02x&gt;", sta-&gt;u.ap.ssid[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	seq_putc(m, '\'');</div><div class='del'>-	if (sta-&gt;capability &amp; WLAN_CAPABILITY_ESS)</div><div class='del'>-		seq_puts(m, " [ESS]");</div><div class='del'>-	if (sta-&gt;capability &amp; WLAN_CAPABILITY_IBSS)</div><div class='del'>-		seq_puts(m, " [IBSS]");</div><div class='del'>-	if (sta-&gt;capability &amp; WLAN_CAPABILITY_PRIVACY)</div><div class='del'>-		seq_puts(m, " [WEP]");</div><div class='del'>-	seq_putc(m, '\n');</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *prism2_ap_proc_start(struct seq_file *m, loff_t *_pos)</div><div class='del'>-{</div><div class='del'>-	struct ap_data *ap = PDE_DATA(file_inode(m-&gt;file));</div><div class='del'>-	spin_lock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-	return seq_list_start_head(&amp;ap-&gt;sta_list, *_pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *prism2_ap_proc_next(struct seq_file *m, void *v, loff_t *_pos)</div><div class='del'>-{</div><div class='del'>-	struct ap_data *ap = PDE_DATA(file_inode(m-&gt;file));</div><div class='del'>-	return seq_list_next(v, &amp;ap-&gt;sta_list, _pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void prism2_ap_proc_stop(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	struct ap_data *ap = PDE_DATA(file_inode(m-&gt;file));</div><div class='del'>-	spin_unlock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct seq_operations prism2_ap_proc_seqops = {</div><div class='del'>-	.start	= prism2_ap_proc_start,</div><div class='del'>-	.next	= prism2_ap_proc_next,</div><div class='del'>-	.stop	= prism2_ap_proc_stop,</div><div class='del'>-	.show	= prism2_ap_proc_show,</div><div class='del'>-};</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void hostap_check_sta_fw_version(struct ap_data *ap, int sta_fw_ver)</div><div class='del'>-{</div><div class='del'>-	if (!ap)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (sta_fw_ver == PRISM2_FW_VER(0,8,0)) {</div><div class='del'>-		PDEBUG(DEBUG_AP, "Using data::nullfunc ACK workaround - "</div><div class='del'>-		       "firmware upgrade recommended\n");</div><div class='del'>-		ap-&gt;nullfunc_ack = 1;</div><div class='del'>-	} else</div><div class='del'>-		ap-&gt;nullfunc_ack = 0;</div><div class='del'>-</div><div class='del'>-	if (sta_fw_ver == PRISM2_FW_VER(1,4,2)) {</div><div class='del'>-		printk(KERN_WARNING "%s: Warning: secondary station firmware "</div><div class='del'>-		       "version 1.4.2 does not seem to work in Host AP mode\n",</div><div class='del'>-		       ap-&gt;local-&gt;dev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static void hostap_ap_tx_cb(struct sk_buff *skb, int ok, void *data)</div><div class='del'>-{</div><div class='del'>-	struct ap_data *ap = data;</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-</div><div class='del'>-	if (!ap-&gt;local-&gt;hostapd || !ap-&gt;local-&gt;apdev) {</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Pass the TX callback frame to the hostapd; use 802.11 header version</div><div class='del'>-	 * 1 to indicate failure (no ACK) and 2 success (frame ACKed) */</div><div class='del'>-</div><div class='del'>-	hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-	hdr-&gt;frame_control &amp;= cpu_to_le16(~IEEE80211_FCTL_VERS);</div><div class='del'>-	hdr-&gt;frame_control |= cpu_to_le16(ok ? BIT(1) : BIT(0));</div><div class='del'>-</div><div class='del'>-	skb-&gt;dev = ap-&gt;local-&gt;apdev;</div><div class='del'>-	skb_pull(skb, hostap_80211_get_hdrlen(hdr-&gt;frame_control));</div><div class='del'>-	skb-&gt;pkt_type = PACKET_OTHERHOST;</div><div class='del'>-	skb-&gt;protocol = cpu_to_be16(ETH_P_802_2);</div><div class='del'>-	memset(skb-&gt;cb, 0, sizeof(skb-&gt;cb));</div><div class='del'>-	netif_rx(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static void hostap_ap_tx_cb_auth(struct sk_buff *skb, int ok, void *data)</div><div class='del'>-{</div><div class='del'>-	struct ap_data *ap = data;</div><div class='del'>-	struct net_device *dev = ap-&gt;local-&gt;dev;</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-	u16 auth_alg, auth_transaction, status;</div><div class='del'>-	__le16 *pos;</div><div class='del'>-	struct sta_info *sta = NULL;</div><div class='del'>-	char *txt = NULL;</div><div class='del'>-</div><div class='del'>-	if (ap-&gt;local-&gt;hostapd) {</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-	if (!ieee80211_is_auth(hdr-&gt;frame_control) ||</div><div class='del'>-	    skb-&gt;len &lt; IEEE80211_MGMT_HDR_LEN + 6) {</div><div class='del'>-		printk(KERN_DEBUG "%s: hostap_ap_tx_cb_auth received invalid "</div><div class='del'>-		       "frame\n", dev-&gt;name);</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pos = (__le16 *) (skb-&gt;data + IEEE80211_MGMT_HDR_LEN);</div><div class='del'>-	auth_alg = le16_to_cpu(*pos++);</div><div class='del'>-	auth_transaction = le16_to_cpu(*pos++);</div><div class='del'>-	status = le16_to_cpu(*pos++);</div><div class='del'>-</div><div class='del'>-	if (!ok) {</div><div class='del'>-		txt = "frame was not ACKed";</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(ap, hdr-&gt;addr1);</div><div class='del'>-	if (sta)</div><div class='del'>-		atomic_inc(&amp;sta-&gt;users);</div><div class='del'>-	spin_unlock(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	if (!sta) {</div><div class='del'>-		txt = "STA not found";</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (status == WLAN_STATUS_SUCCESS &amp;&amp;</div><div class='del'>-	    ((auth_alg == WLAN_AUTH_OPEN &amp;&amp; auth_transaction == 2) ||</div><div class='del'>-	     (auth_alg == WLAN_AUTH_SHARED_KEY &amp;&amp; auth_transaction == 4))) {</div><div class='del'>-		txt = "STA authenticated";</div><div class='del'>-		sta-&gt;flags |= WLAN_STA_AUTH;</div><div class='del'>-		sta-&gt;last_auth = jiffies;</div><div class='del'>-	} else if (status != WLAN_STATUS_SUCCESS)</div><div class='del'>-		txt = "authentication failed";</div><div class='del'>-</div><div class='del'>- done:</div><div class='del'>-	if (sta)</div><div class='del'>-		atomic_dec(&amp;sta-&gt;users);</div><div class='del'>-	if (txt) {</div><div class='del'>-		PDEBUG(DEBUG_AP, "%s: %pM auth_cb - alg=%d "</div><div class='del'>-		       "trans#=%d status=%d - %s\n",</div><div class='del'>-		       dev-&gt;name, hdr-&gt;addr1,</div><div class='del'>-		       auth_alg, auth_transaction, status, txt);</div><div class='del'>-	}</div><div class='del'>-	dev_kfree_skb(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static void hostap_ap_tx_cb_assoc(struct sk_buff *skb, int ok, void *data)</div><div class='del'>-{</div><div class='del'>-	struct ap_data *ap = data;</div><div class='del'>-	struct net_device *dev = ap-&gt;local-&gt;dev;</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-	u16 status;</div><div class='del'>-	__le16 *pos;</div><div class='del'>-	struct sta_info *sta = NULL;</div><div class='del'>-	char *txt = NULL;</div><div class='del'>-</div><div class='del'>-	if (ap-&gt;local-&gt;hostapd) {</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-	if ((!ieee80211_is_assoc_resp(hdr-&gt;frame_control) &amp;&amp;</div><div class='del'>-	     !ieee80211_is_reassoc_resp(hdr-&gt;frame_control)) ||</div><div class='del'>-	    skb-&gt;len &lt; IEEE80211_MGMT_HDR_LEN + 4) {</div><div class='del'>-		printk(KERN_DEBUG "%s: hostap_ap_tx_cb_assoc received invalid "</div><div class='del'>-		       "frame\n", dev-&gt;name);</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ok) {</div><div class='del'>-		txt = "frame was not ACKed";</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(ap, hdr-&gt;addr1);</div><div class='del'>-	if (sta)</div><div class='del'>-		atomic_inc(&amp;sta-&gt;users);</div><div class='del'>-	spin_unlock(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	if (!sta) {</div><div class='del'>-		txt = "STA not found";</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pos = (__le16 *) (skb-&gt;data + IEEE80211_MGMT_HDR_LEN);</div><div class='del'>-	pos++;</div><div class='del'>-	status = le16_to_cpu(*pos++);</div><div class='del'>-	if (status == WLAN_STATUS_SUCCESS) {</div><div class='del'>-		if (!(sta-&gt;flags &amp; WLAN_STA_ASSOC))</div><div class='del'>-			hostap_event_new_sta(dev, sta);</div><div class='del'>-		txt = "STA associated";</div><div class='del'>-		sta-&gt;flags |= WLAN_STA_ASSOC;</div><div class='del'>-		sta-&gt;last_assoc = jiffies;</div><div class='del'>-	} else</div><div class='del'>-		txt = "association failed";</div><div class='del'>-</div><div class='del'>- done:</div><div class='del'>-	if (sta)</div><div class='del'>-		atomic_dec(&amp;sta-&gt;users);</div><div class='del'>-	if (txt) {</div><div class='del'>-		PDEBUG(DEBUG_AP, "%s: %pM assoc_cb - %s\n",</div><div class='del'>-		       dev-&gt;name, hdr-&gt;addr1, txt);</div><div class='del'>-	}</div><div class='del'>-	dev_kfree_skb(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ); TX callback for poll frames used</div><div class='del'>- * in verifying whether the STA is still present. */</div><div class='del'>-static void hostap_ap_tx_cb_poll(struct sk_buff *skb, int ok, void *data)</div><div class='del'>-{</div><div class='del'>-	struct ap_data *ap = data;</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; 24)</div><div class='del'>-		goto fail;</div><div class='del'>-	hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-	if (ok) {</div><div class='del'>-		spin_lock(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-		sta = ap_get_sta(ap, hdr-&gt;addr1);</div><div class='del'>-		if (sta)</div><div class='del'>-			sta-&gt;flags &amp;= ~WLAN_STA_PENDING_POLL;</div><div class='del'>-		spin_unlock(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-	} else {</div><div class='del'>-		PDEBUG(DEBUG_AP,</div><div class='del'>-		       "%s: STA %pM did not ACK activity poll frame\n",</div><div class='del'>-		       ap-&gt;local-&gt;dev-&gt;name, hdr-&gt;addr1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- fail:</div><div class='del'>-	dev_kfree_skb(skb);</div><div class='del'>-}</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void hostap_init_data(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	struct ap_data *ap = local-&gt;ap;</div><div class='del'>-</div><div class='del'>-	if (ap == NULL) {</div><div class='del'>-		printk(KERN_WARNING "hostap_init_data: ap == NULL\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	memset(ap, 0, sizeof(struct ap_data));</div><div class='del'>-	ap-&gt;local = local;</div><div class='del'>-</div><div class='del'>-	ap-&gt;ap_policy = GET_INT_PARM(other_ap_policy, local-&gt;card_idx);</div><div class='del'>-	ap-&gt;bridge_packets = GET_INT_PARM(ap_bridge_packets, local-&gt;card_idx);</div><div class='del'>-	ap-&gt;max_inactivity =</div><div class='del'>-		GET_INT_PARM(ap_max_inactivity, local-&gt;card_idx) * HZ;</div><div class='del'>-	ap-&gt;autom_ap_wds = GET_INT_PARM(autom_ap_wds, local-&gt;card_idx);</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-	INIT_LIST_HEAD(&amp;ap-&gt;sta_list);</div><div class='del'>-</div><div class='del'>-	/* Initialize task queue structure for AP management */</div><div class='del'>-	INIT_WORK(&amp;local-&gt;ap-&gt;add_sta_proc_queue, handle_add_proc_queue);</div><div class='del'>-</div><div class='del'>-	ap-&gt;tx_callback_idx =</div><div class='del'>-		hostap_tx_callback_register(local, hostap_ap_tx_cb, ap);</div><div class='del'>-	if (ap-&gt;tx_callback_idx == 0)</div><div class='del'>-		printk(KERN_WARNING "%s: failed to register TX callback for "</div><div class='del'>-		       "AP\n", local-&gt;dev-&gt;name);</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-	INIT_WORK(&amp;local-&gt;ap-&gt;wds_oper_queue, handle_wds_oper_queue);</div><div class='del'>-</div><div class='del'>-	ap-&gt;tx_callback_auth =</div><div class='del'>-		hostap_tx_callback_register(local, hostap_ap_tx_cb_auth, ap);</div><div class='del'>-	ap-&gt;tx_callback_assoc =</div><div class='del'>-		hostap_tx_callback_register(local, hostap_ap_tx_cb_assoc, ap);</div><div class='del'>-	ap-&gt;tx_callback_poll =</div><div class='del'>-		hostap_tx_callback_register(local, hostap_ap_tx_cb_poll, ap);</div><div class='del'>-	if (ap-&gt;tx_callback_auth == 0 || ap-&gt;tx_callback_assoc == 0 ||</div><div class='del'>-		ap-&gt;tx_callback_poll == 0)</div><div class='del'>-		printk(KERN_WARNING "%s: failed to register TX callback for "</div><div class='del'>-		       "AP\n", local-&gt;dev-&gt;name);</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;ap-&gt;mac_restrictions.lock);</div><div class='del'>-	INIT_LIST_HEAD(&amp;ap-&gt;mac_restrictions.mac_list);</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-</div><div class='del'>-	ap-&gt;initialized = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void hostap_init_ap_proc(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	struct ap_data *ap = local-&gt;ap;</div><div class='del'>-</div><div class='del'>-	ap-&gt;proc = local-&gt;proc;</div><div class='del'>-	if (ap-&gt;proc == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_PROCFS_DEBUG</div><div class='del'>-	proc_create_single_data("ap_debug", 0, ap-&gt;proc, ap_debug_proc_show, ap);</div><div class='del'>-#endif /* PRISM2_NO_PROCFS_DEBUG */</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-	proc_create_seq_data("ap_control", 0, ap-&gt;proc, &amp;ap_control_proc_seqops,</div><div class='del'>-			ap);</div><div class='del'>-	proc_create_seq_data("ap", 0, ap-&gt;proc, &amp;prism2_ap_proc_seqops, ap);</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void hostap_free_data(struct ap_data *ap)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *n, *sta;</div><div class='del'>-</div><div class='del'>-	if (ap == NULL || !ap-&gt;initialized) {</div><div class='del'>-		printk(KERN_DEBUG "hostap_free_data: ap has not yet been "</div><div class='del'>-		       "initialized - skip resource freeing\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	flush_work(&amp;ap-&gt;add_sta_proc_queue);</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-	flush_work(&amp;ap-&gt;wds_oper_queue);</div><div class='del'>-	if (ap-&gt;crypt)</div><div class='del'>-		ap-&gt;crypt-&gt;deinit(ap-&gt;crypt_priv);</div><div class='del'>-	ap-&gt;crypt = ap-&gt;crypt_priv = NULL;</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(sta, n, &amp;ap-&gt;sta_list, list) {</div><div class='del'>-		ap_sta_hash_del(ap, sta);</div><div class='del'>-		list_del(&amp;sta-&gt;list);</div><div class='del'>-		if ((sta-&gt;flags &amp; WLAN_STA_ASSOC) &amp;&amp; !sta-&gt;ap &amp;&amp; sta-&gt;local)</div><div class='del'>-			hostap_event_expired_sta(sta-&gt;local-&gt;dev, sta);</div><div class='del'>-		ap_free_sta(ap, sta);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_PROCFS_DEBUG</div><div class='del'>-	if (ap-&gt;proc != NULL) {</div><div class='del'>-		remove_proc_entry("ap_debug", ap-&gt;proc);</div><div class='del'>-	}</div><div class='del'>-#endif /* PRISM2_NO_PROCFS_DEBUG */</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-	if (ap-&gt;proc != NULL) {</div><div class='del'>-	  remove_proc_entry("ap", ap-&gt;proc);</div><div class='del'>-		remove_proc_entry("ap_control", ap-&gt;proc);</div><div class='del'>-	}</div><div class='del'>-	ap_control_flush_macs(&amp;ap-&gt;mac_restrictions);</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-</div><div class='del'>-	ap-&gt;initialized = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* caller should have mutex for AP STA list handling */</div><div class='del'>-static struct sta_info* ap_get_sta(struct ap_data *ap, u8 *sta)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *s;</div><div class='del'>-</div><div class='del'>-	s = ap-&gt;sta_hash[STA_HASH(sta)];</div><div class='del'>-	while (s != NULL &amp;&amp; !ether_addr_equal(s-&gt;addr, sta))</div><div class='del'>-		s = s-&gt;hnext;</div><div class='del'>-	return s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-</div><div class='del'>-/* Called from timer handler and from scheduled AP queue handlers */</div><div class='del'>-static void prism2_send_mgmt(struct net_device *dev,</div><div class='del'>-			     u16 type_subtype, char *body,</div><div class='del'>-			     int body_len, u8 *addr, u16 tx_cb_idx)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-	u16 fc;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct hostap_skb_tx_data *meta;</div><div class='del'>-	int hdrlen;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-	dev = local-&gt;dev; /* always use master radio device */</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (!(dev-&gt;flags &amp; IFF_UP)) {</div><div class='del'>-		PDEBUG(DEBUG_AP, "%s: prism2_send_mgmt - device is not UP - "</div><div class='del'>-		       "cannot send frame\n", dev-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb = dev_alloc_skb(sizeof(*hdr) + body_len);</div><div class='del'>-	if (skb == NULL) {</div><div class='del'>-		PDEBUG(DEBUG_AP, "%s: prism2_send_mgmt failed to allocate "</div><div class='del'>-		       "skb\n", dev-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fc = type_subtype;</div><div class='del'>-	hdrlen = hostap_80211_get_hdrlen(cpu_to_le16(type_subtype));</div><div class='del'>-	hdr = skb_put_zero(skb, hdrlen);</div><div class='del'>-	if (body)</div><div class='del'>-		skb_put_data(skb, body, body_len);</div><div class='del'>-</div><div class='del'>-	/* FIX: ctrl::ack sending used special HFA384X_TX_CTRL_802_11</div><div class='del'>-	 * tx_control instead of using local-&gt;tx_control */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	memcpy(hdr-&gt;addr1, addr, ETH_ALEN); /* DA / RA */</div><div class='del'>-	if (ieee80211_is_data(hdr-&gt;frame_control)) {</div><div class='del'>-		fc |= IEEE80211_FCTL_FROMDS;</div><div class='del'>-		memcpy(hdr-&gt;addr2, dev-&gt;dev_addr, ETH_ALEN); /* BSSID */</div><div class='del'>-		memcpy(hdr-&gt;addr3, dev-&gt;dev_addr, ETH_ALEN); /* SA */</div><div class='del'>-	} else if (ieee80211_is_ctl(hdr-&gt;frame_control)) {</div><div class='del'>-		/* control:ACK does not have addr2 or addr3 */</div><div class='del'>-		eth_zero_addr(hdr-&gt;addr2);</div><div class='del'>-		eth_zero_addr(hdr-&gt;addr3);</div><div class='del'>-	} else {</div><div class='del'>-		memcpy(hdr-&gt;addr2, dev-&gt;dev_addr, ETH_ALEN); /* SA */</div><div class='del'>-		memcpy(hdr-&gt;addr3, dev-&gt;dev_addr, ETH_ALEN); /* BSSID */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hdr-&gt;frame_control = cpu_to_le16(fc);</div><div class='del'>-</div><div class='del'>-	meta = (struct hostap_skb_tx_data *) skb-&gt;cb;</div><div class='del'>-	memset(meta, 0, sizeof(*meta));</div><div class='del'>-	meta-&gt;magic = HOSTAP_SKB_TX_DATA_MAGIC;</div><div class='del'>-	meta-&gt;iface = iface;</div><div class='del'>-	meta-&gt;tx_cb_idx = tx_cb_idx;</div><div class='del'>-</div><div class='del'>-	skb-&gt;dev = dev;</div><div class='del'>-	skb_reset_mac_header(skb);</div><div class='del'>-	skb_reset_network_header(skb);</div><div class='del'>-	dev_queue_xmit(skb);</div><div class='del'>-}</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-static int prism2_sta_proc_show(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *sta = m-&gt;private;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* FIX: possible race condition.. the STA data could have just expired,</div><div class='del'>-	 * but proc entry was still here so that the read could have started;</div><div class='del'>-	 * some locking should be done here.. */</div><div class='del'>-</div><div class='del'>-	seq_printf(m,</div><div class='del'>-		   "%s=%pM\nusers=%d\naid=%d\n"</div><div class='del'>-		   "flags=0x%04x%s%s%s%s%s%s%s\n"</div><div class='del'>-		   "capability=0x%02x\nlisten_interval=%d\nsupported_rates=",</div><div class='del'>-		   sta-&gt;ap ? "AP" : "STA",</div><div class='del'>-		   sta-&gt;addr, atomic_read(&amp;sta-&gt;users), sta-&gt;aid,</div><div class='del'>-		   sta-&gt;flags,</div><div class='del'>-		   sta-&gt;flags &amp; WLAN_STA_AUTH ? " AUTH" : "",</div><div class='del'>-		   sta-&gt;flags &amp; WLAN_STA_ASSOC ? " ASSOC" : "",</div><div class='del'>-		   sta-&gt;flags &amp; WLAN_STA_PS ? " PS" : "",</div><div class='del'>-		   sta-&gt;flags &amp; WLAN_STA_TIM ? " TIM" : "",</div><div class='del'>-		   sta-&gt;flags &amp; WLAN_STA_PERM ? " PERM" : "",</div><div class='del'>-		   sta-&gt;flags &amp; WLAN_STA_AUTHORIZED ? " AUTHORIZED" : "",</div><div class='del'>-		   sta-&gt;flags &amp; WLAN_STA_PENDING_POLL ? " POLL" : "",</div><div class='del'>-		   sta-&gt;capability, sta-&gt;listen_interval);</div><div class='del'>-	/* supported_rates: 500 kbit/s units with msb ignored */</div><div class='del'>-	for (i = 0; i &lt; sizeof(sta-&gt;supported_rates); i++)</div><div class='del'>-		if (sta-&gt;supported_rates[i] != 0)</div><div class='del'>-			seq_printf(m, "%d%sMbps ",</div><div class='del'>-				   (sta-&gt;supported_rates[i] &amp; 0x7f) / 2,</div><div class='del'>-				   sta-&gt;supported_rates[i] &amp; 1 ? ".5" : "");</div><div class='del'>-	seq_printf(m,</div><div class='del'>-		   "\njiffies=%lu\nlast_auth=%lu\nlast_assoc=%lu\n"</div><div class='del'>-		   "last_rx=%lu\nlast_tx=%lu\nrx_packets=%lu\n"</div><div class='del'>-		   "tx_packets=%lu\n"</div><div class='del'>-		   "rx_bytes=%lu\ntx_bytes=%lu\nbuffer_count=%d\n"</div><div class='del'>-		   "last_rx: silence=%d dBm signal=%d dBm rate=%d%s Mbps\n"</div><div class='del'>-		   "tx_rate=%d\ntx[1M]=%d\ntx[2M]=%d\ntx[5.5M]=%d\n"</div><div class='del'>-		   "tx[11M]=%d\n"</div><div class='del'>-		   "rx[1M]=%d\nrx[2M]=%d\nrx[5.5M]=%d\nrx[11M]=%d\n",</div><div class='del'>-		   jiffies, sta-&gt;last_auth, sta-&gt;last_assoc, sta-&gt;last_rx,</div><div class='del'>-		   sta-&gt;last_tx,</div><div class='del'>-		   sta-&gt;rx_packets, sta-&gt;tx_packets, sta-&gt;rx_bytes,</div><div class='del'>-		   sta-&gt;tx_bytes, skb_queue_len(&amp;sta-&gt;tx_buf),</div><div class='del'>-		   sta-&gt;last_rx_silence,</div><div class='del'>-		   sta-&gt;last_rx_signal, sta-&gt;last_rx_rate / 10,</div><div class='del'>-		   sta-&gt;last_rx_rate % 10 ? ".5" : "",</div><div class='del'>-		   sta-&gt;tx_rate, sta-&gt;tx_count[0], sta-&gt;tx_count[1],</div><div class='del'>-		   sta-&gt;tx_count[2], sta-&gt;tx_count[3],  sta-&gt;rx_count[0],</div><div class='del'>-		   sta-&gt;rx_count[1], sta-&gt;rx_count[2], sta-&gt;rx_count[3]);</div><div class='del'>-	if (sta-&gt;crypt &amp;&amp; sta-&gt;crypt-&gt;ops &amp;&amp; sta-&gt;crypt-&gt;ops-&gt;print_stats)</div><div class='del'>-		sta-&gt;crypt-&gt;ops-&gt;print_stats(m, sta-&gt;crypt-&gt;priv);</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-	if (sta-&gt;ap) {</div><div class='del'>-		if (sta-&gt;u.ap.channel &gt;= 0)</div><div class='del'>-			seq_printf(m, "channel=%d\n", sta-&gt;u.ap.channel);</div><div class='del'>-		seq_puts(m, "ssid=");</div><div class='del'>-		for (i = 0; i &lt; sta-&gt;u.ap.ssid_len; i++) {</div><div class='del'>-			if (sta-&gt;u.ap.ssid[i] &gt;= 32 &amp;&amp; sta-&gt;u.ap.ssid[i] &lt; 127)</div><div class='del'>-				seq_putc(m, sta-&gt;u.ap.ssid[i]);</div><div class='del'>-			else</div><div class='del'>-				seq_printf(m, "&lt;%02x&gt;", sta-&gt;u.ap.ssid[i]);</div><div class='del'>-		}</div><div class='del'>-		seq_putc(m, '\n');</div><div class='del'>-	}</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void handle_add_proc_queue(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct ap_data *ap = container_of(work, struct ap_data,</div><div class='del'>-					  add_sta_proc_queue);</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-	char name[20];</div><div class='del'>-	struct add_sta_proc_data *entry, *prev;</div><div class='del'>-</div><div class='del'>-	entry = ap-&gt;add_sta_proc_entries;</div><div class='del'>-	ap-&gt;add_sta_proc_entries = NULL;</div><div class='del'>-</div><div class='del'>-	while (entry) {</div><div class='del'>-		spin_lock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-		sta = ap_get_sta(ap, entry-&gt;addr);</div><div class='del'>-		if (sta)</div><div class='del'>-			atomic_inc(&amp;sta-&gt;users);</div><div class='del'>-		spin_unlock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-		if (sta) {</div><div class='del'>-			sprintf(name, "%pM", sta-&gt;addr);</div><div class='del'>-			sta-&gt;proc = proc_create_single_data(</div><div class='del'>-				name, 0, ap-&gt;proc,</div><div class='del'>-				prism2_sta_proc_show, sta);</div><div class='del'>-</div><div class='del'>-			atomic_dec(&amp;sta-&gt;users);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		prev = entry;</div><div class='del'>-		entry = entry-&gt;next;</div><div class='del'>-		kfree(prev);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct sta_info * ap_add_sta(struct ap_data *ap, u8 *addr)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-</div><div class='del'>-	sta = kzalloc(sizeof(struct sta_info), GFP_ATOMIC);</div><div class='del'>-	if (sta == NULL) {</div><div class='del'>-		PDEBUG(DEBUG_AP, "AP: kmalloc failed\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* initialize STA info data */</div><div class='del'>-	sta-&gt;local = ap-&gt;local;</div><div class='del'>-	skb_queue_head_init(&amp;sta-&gt;tx_buf);</div><div class='del'>-	memcpy(sta-&gt;addr, addr, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	atomic_inc(&amp;sta-&gt;users);</div><div class='del'>-	spin_lock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-	list_add(&amp;sta-&gt;list, &amp;ap-&gt;sta_list);</div><div class='del'>-	ap-&gt;num_sta++;</div><div class='del'>-	ap_sta_hash_add(ap, sta);</div><div class='del'>-	spin_unlock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	if (ap-&gt;proc) {</div><div class='del'>-		struct add_sta_proc_data *entry;</div><div class='del'>-		/* schedule a non-interrupt context process to add a procfs</div><div class='del'>-		 * entry for the STA since procfs code use GFP_KERNEL */</div><div class='del'>-		entry = kmalloc(sizeof(*entry), GFP_ATOMIC);</div><div class='del'>-		if (entry) {</div><div class='del'>-			memcpy(entry-&gt;addr, sta-&gt;addr, ETH_ALEN);</div><div class='del'>-			entry-&gt;next = ap-&gt;add_sta_proc_entries;</div><div class='del'>-			ap-&gt;add_sta_proc_entries = entry;</div><div class='del'>-			schedule_work(&amp;ap-&gt;add_sta_proc_queue);</div><div class='del'>-		} else</div><div class='del'>-			printk(KERN_DEBUG "Failed to add STA proc data\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-	timer_setup(&amp;sta-&gt;timer, ap_handle_timer, 0);</div><div class='del'>-	sta-&gt;timer.expires = jiffies + ap-&gt;max_inactivity;</div><div class='del'>-	if (!ap-&gt;local-&gt;hostapd)</div><div class='del'>-		add_timer(&amp;sta-&gt;timer);</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-</div><div class='del'>-	return sta;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int ap_tx_rate_ok(int rateidx, struct sta_info *sta,</div><div class='del'>-			 local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	if (rateidx &gt; sta-&gt;tx_max_rate ||</div><div class='del'>-	    !(sta-&gt;tx_supp_rates &amp; (1 &lt;&lt; rateidx)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;tx_rate_control != 0 &amp;&amp;</div><div class='del'>-	    !(local-&gt;tx_rate_control &amp; (1 &lt;&lt; rateidx)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void prism2_check_tx_rates(struct sta_info *sta)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	sta-&gt;tx_supp_rates = 0;</div><div class='del'>-	for (i = 0; i &lt; sizeof(sta-&gt;supported_rates); i++) {</div><div class='del'>-		if ((sta-&gt;supported_rates[i] &amp; 0x7f) == 2)</div><div class='del'>-			sta-&gt;tx_supp_rates |= WLAN_RATE_1M;</div><div class='del'>-		if ((sta-&gt;supported_rates[i] &amp; 0x7f) == 4)</div><div class='del'>-			sta-&gt;tx_supp_rates |= WLAN_RATE_2M;</div><div class='del'>-		if ((sta-&gt;supported_rates[i] &amp; 0x7f) == 11)</div><div class='del'>-			sta-&gt;tx_supp_rates |= WLAN_RATE_5M5;</div><div class='del'>-		if ((sta-&gt;supported_rates[i] &amp; 0x7f) == 22)</div><div class='del'>-			sta-&gt;tx_supp_rates |= WLAN_RATE_11M;</div><div class='del'>-	}</div><div class='del'>-	sta-&gt;tx_max_rate = sta-&gt;tx_rate = sta-&gt;tx_rate_idx = 0;</div><div class='del'>-	if (sta-&gt;tx_supp_rates &amp; WLAN_RATE_1M) {</div><div class='del'>-		sta-&gt;tx_max_rate = 0;</div><div class='del'>-		if (ap_tx_rate_ok(0, sta, sta-&gt;local)) {</div><div class='del'>-			sta-&gt;tx_rate = 10;</div><div class='del'>-			sta-&gt;tx_rate_idx = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (sta-&gt;tx_supp_rates &amp; WLAN_RATE_2M) {</div><div class='del'>-		sta-&gt;tx_max_rate = 1;</div><div class='del'>-		if (ap_tx_rate_ok(1, sta, sta-&gt;local)) {</div><div class='del'>-			sta-&gt;tx_rate = 20;</div><div class='del'>-			sta-&gt;tx_rate_idx = 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (sta-&gt;tx_supp_rates &amp; WLAN_RATE_5M5) {</div><div class='del'>-		sta-&gt;tx_max_rate = 2;</div><div class='del'>-		if (ap_tx_rate_ok(2, sta, sta-&gt;local)) {</div><div class='del'>-			sta-&gt;tx_rate = 55;</div><div class='del'>-			sta-&gt;tx_rate_idx = 2;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (sta-&gt;tx_supp_rates &amp; WLAN_RATE_11M) {</div><div class='del'>-		sta-&gt;tx_max_rate = 3;</div><div class='del'>-		if (ap_tx_rate_ok(3, sta, sta-&gt;local)) {</div><div class='del'>-			sta-&gt;tx_rate = 110;</div><div class='del'>-			sta-&gt;tx_rate_idx = 3;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-</div><div class='del'>-static void ap_crypt_init(struct ap_data *ap)</div><div class='del'>-{</div><div class='del'>-	ap-&gt;crypt = lib80211_get_crypto_ops("WEP");</div><div class='del'>-</div><div class='del'>-	if (ap-&gt;crypt) {</div><div class='del'>-		if (ap-&gt;crypt-&gt;init) {</div><div class='del'>-			ap-&gt;crypt_priv = ap-&gt;crypt-&gt;init(0);</div><div class='del'>-			if (ap-&gt;crypt_priv == NULL)</div><div class='del'>-				ap-&gt;crypt = NULL;</div><div class='del'>-			else {</div><div class='del'>-				u8 key[WEP_KEY_LEN];</div><div class='del'>-				get_random_bytes(key, WEP_KEY_LEN);</div><div class='del'>-				ap-&gt;crypt-&gt;set_key(key, WEP_KEY_LEN, NULL,</div><div class='del'>-						   ap-&gt;crypt_priv);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ap-&gt;crypt == NULL) {</div><div class='del'>-		printk(KERN_WARNING "AP could not initialize WEP: load module "</div><div class='del'>-		       "lib80211_crypt_wep.ko\n");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Generate challenge data for shared key authentication. IEEE 802.11 specifies</div><div class='del'>- * that WEP algorithm is used for generating challenge. This should be unique,</div><div class='del'>- * but otherwise there is not really need for randomness etc. Initialize WEP</div><div class='del'>- * with pseudo random key and then use increasing IV to get unique challenge</div><div class='del'>- * streams.</div><div class='del'>- *</div><div class='del'>- * Called only as a scheduled task for pending AP frames.</div><div class='del'>- */</div><div class='del'>-static char * ap_auth_make_challenge(struct ap_data *ap)</div><div class='del'>-{</div><div class='del'>-	char *tmpbuf;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	if (ap-&gt;crypt == NULL) {</div><div class='del'>-		ap_crypt_init(ap);</div><div class='del'>-		if (ap-&gt;crypt == NULL)</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tmpbuf = kmalloc(WLAN_AUTH_CHALLENGE_LEN, GFP_ATOMIC);</div><div class='del'>-	if (tmpbuf == NULL) {</div><div class='del'>-		PDEBUG(DEBUG_AP, "AP: kmalloc failed for challenge\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb = dev_alloc_skb(WLAN_AUTH_CHALLENGE_LEN +</div><div class='del'>-			    ap-&gt;crypt-&gt;extra_mpdu_prefix_len +</div><div class='del'>-			    ap-&gt;crypt-&gt;extra_mpdu_postfix_len);</div><div class='del'>-	if (skb == NULL) {</div><div class='del'>-		kfree(tmpbuf);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_reserve(skb, ap-&gt;crypt-&gt;extra_mpdu_prefix_len);</div><div class='del'>-	skb_put_zero(skb, WLAN_AUTH_CHALLENGE_LEN);</div><div class='del'>-	if (ap-&gt;crypt-&gt;encrypt_mpdu(skb, 0, ap-&gt;crypt_priv)) {</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		kfree(tmpbuf);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_copy_from_linear_data_offset(skb, ap-&gt;crypt-&gt;extra_mpdu_prefix_len,</div><div class='del'>-					 tmpbuf, WLAN_AUTH_CHALLENGE_LEN);</div><div class='del'>-	dev_kfree_skb(skb);</div><div class='del'>-</div><div class='del'>-	return tmpbuf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a scheduled task for pending AP frames. */</div><div class='del'>-static void handle_authen(local_info_t *local, struct sk_buff *skb,</div><div class='del'>-			  struct hostap_80211_rx_status *rx_stats)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-	size_t hdrlen;</div><div class='del'>-	struct ap_data *ap = local-&gt;ap;</div><div class='del'>-	char body[8 + WLAN_AUTH_CHALLENGE_LEN], *challenge = NULL;</div><div class='del'>-	int len, olen;</div><div class='del'>-	u16 auth_alg, auth_transaction, status_code;</div><div class='del'>-	__le16 *pos;</div><div class='del'>-	u16 resp = WLAN_STATUS_SUCCESS;</div><div class='del'>-	struct sta_info *sta = NULL;</div><div class='del'>-	struct lib80211_crypt_data *crypt;</div><div class='del'>-	char *txt = "";</div><div class='del'>-</div><div class='del'>-	len = skb-&gt;len - IEEE80211_MGMT_HDR_LEN;</div><div class='del'>-</div><div class='del'>-	hdrlen = hostap_80211_get_hdrlen(hdr-&gt;frame_control);</div><div class='del'>-</div><div class='del'>-	if (len &lt; 6) {</div><div class='del'>-		PDEBUG(DEBUG_AP, "%s: handle_authen - too short payload "</div><div class='del'>-		       "(len=%d) from %pM\n", dev-&gt;name, len, hdr-&gt;addr2);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(local-&gt;ap, hdr-&gt;addr2);</div><div class='del'>-	if (sta)</div><div class='del'>-		atomic_inc(&amp;sta-&gt;users);</div><div class='del'>-	spin_unlock_bh(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	if (sta &amp;&amp; sta-&gt;crypt)</div><div class='del'>-		crypt = sta-&gt;crypt;</div><div class='del'>-	else {</div><div class='del'>-		int idx = 0;</div><div class='del'>-		if (skb-&gt;len &gt;= hdrlen + 3)</div><div class='del'>-			idx = skb-&gt;data[hdrlen + 3] &gt;&gt; 6;</div><div class='del'>-		crypt = local-&gt;crypt_info.crypt[idx];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pos = (__le16 *) (skb-&gt;data + IEEE80211_MGMT_HDR_LEN);</div><div class='del'>-	auth_alg = __le16_to_cpu(*pos);</div><div class='del'>-	pos++;</div><div class='del'>-	auth_transaction = __le16_to_cpu(*pos);</div><div class='del'>-	pos++;</div><div class='del'>-	status_code = __le16_to_cpu(*pos);</div><div class='del'>-	pos++;</div><div class='del'>-</div><div class='del'>-	if (ether_addr_equal(dev-&gt;dev_addr, hdr-&gt;addr2) ||</div><div class='del'>-	    ap_control_mac_deny(&amp;ap-&gt;mac_restrictions, hdr-&gt;addr2)) {</div><div class='del'>-		txt = "authentication denied";</div><div class='del'>-		resp = WLAN_STATUS_UNSPECIFIED_FAILURE;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (((local-&gt;auth_algs &amp; PRISM2_AUTH_OPEN) &amp;&amp;</div><div class='del'>-	     auth_alg == WLAN_AUTH_OPEN) ||</div><div class='del'>-	    ((local-&gt;auth_algs &amp; PRISM2_AUTH_SHARED_KEY) &amp;&amp;</div><div class='del'>-	     crypt &amp;&amp; auth_alg == WLAN_AUTH_SHARED_KEY)) {</div><div class='del'>-	} else {</div><div class='del'>-		txt = "unsupported algorithm";</div><div class='del'>-		resp = WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (len &gt;= 8) {</div><div class='del'>-		u8 *u = (u8 *) pos;</div><div class='del'>-		if (*u == WLAN_EID_CHALLENGE) {</div><div class='del'>-			if (*(u + 1) != WLAN_AUTH_CHALLENGE_LEN) {</div><div class='del'>-				txt = "invalid challenge len";</div><div class='del'>-				resp = WLAN_STATUS_CHALLENGE_FAIL;</div><div class='del'>-				goto fail;</div><div class='del'>-			}</div><div class='del'>-			if (len - 8 &lt; WLAN_AUTH_CHALLENGE_LEN) {</div><div class='del'>-				txt = "challenge underflow";</div><div class='del'>-				resp = WLAN_STATUS_CHALLENGE_FAIL;</div><div class='del'>-				goto fail;</div><div class='del'>-			}</div><div class='del'>-			challenge = (char *) (u + 2);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sta &amp;&amp; sta-&gt;ap) {</div><div class='del'>-		if (time_after(jiffies, sta-&gt;u.ap.last_beacon +</div><div class='del'>-			       (10 * sta-&gt;listen_interval * HZ) / 1024)) {</div><div class='del'>-			PDEBUG(DEBUG_AP, "%s: no beacons received for a while,"</div><div class='del'>-			       " assuming AP %pM is now STA\n",</div><div class='del'>-			       dev-&gt;name, sta-&gt;addr);</div><div class='del'>-			sta-&gt;ap = 0;</div><div class='del'>-			sta-&gt;flags = 0;</div><div class='del'>-			sta-&gt;u.sta.challenge = NULL;</div><div class='del'>-		} else {</div><div class='del'>-			txt = "AP trying to authenticate?";</div><div class='del'>-			resp = WLAN_STATUS_UNSPECIFIED_FAILURE;</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((auth_alg == WLAN_AUTH_OPEN &amp;&amp; auth_transaction == 1) ||</div><div class='del'>-	    (auth_alg == WLAN_AUTH_SHARED_KEY &amp;&amp;</div><div class='del'>-	     (auth_transaction == 1 ||</div><div class='del'>-	      (auth_transaction == 3 &amp;&amp; sta != NULL &amp;&amp;</div><div class='del'>-	       sta-&gt;u.sta.challenge != NULL)))) {</div><div class='del'>-	} else {</div><div class='del'>-		txt = "unknown authentication transaction number";</div><div class='del'>-		resp = WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sta == NULL) {</div><div class='del'>-		txt = "new STA";</div><div class='del'>-</div><div class='del'>-		if (local-&gt;ap-&gt;num_sta &gt;= MAX_STA_COUNT) {</div><div class='del'>-			/* FIX: might try to remove some old STAs first? */</div><div class='del'>-			txt = "no more room for new STAs";</div><div class='del'>-			resp = WLAN_STATUS_UNSPECIFIED_FAILURE;</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		sta = ap_add_sta(local-&gt;ap, hdr-&gt;addr2);</div><div class='del'>-		if (sta == NULL) {</div><div class='del'>-			txt = "ap_add_sta failed";</div><div class='del'>-			resp = WLAN_STATUS_UNSPECIFIED_FAILURE;</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (auth_alg) {</div><div class='del'>-	case WLAN_AUTH_OPEN:</div><div class='del'>-		txt = "authOK";</div><div class='del'>-		/* IEEE 802.11 standard is not completely clear about</div><div class='del'>-		 * whether STA is considered authenticated after</div><div class='del'>-		 * authentication OK frame has been send or after it</div><div class='del'>-		 * has been ACKed. In order to reduce interoperability</div><div class='del'>-		 * issues, mark the STA authenticated before ACK. */</div><div class='del'>-		sta-&gt;flags |= WLAN_STA_AUTH;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case WLAN_AUTH_SHARED_KEY:</div><div class='del'>-		if (auth_transaction == 1) {</div><div class='del'>-			if (sta-&gt;u.sta.challenge == NULL) {</div><div class='del'>-				sta-&gt;u.sta.challenge =</div><div class='del'>-					ap_auth_make_challenge(local-&gt;ap);</div><div class='del'>-				if (sta-&gt;u.sta.challenge == NULL) {</div><div class='del'>-					resp = WLAN_STATUS_UNSPECIFIED_FAILURE;</div><div class='del'>-					goto fail;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (sta-&gt;u.sta.challenge == NULL ||</div><div class='del'>-			    challenge == NULL ||</div><div class='del'>-			    memcmp(sta-&gt;u.sta.challenge, challenge,</div><div class='del'>-				   WLAN_AUTH_CHALLENGE_LEN) != 0 ||</div><div class='del'>-			    !ieee80211_has_protected(hdr-&gt;frame_control)) {</div><div class='del'>-				txt = "challenge response incorrect";</div><div class='del'>-				resp = WLAN_STATUS_CHALLENGE_FAIL;</div><div class='del'>-				goto fail;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			txt = "challenge OK - authOK";</div><div class='del'>-			/* IEEE 802.11 standard is not completely clear about</div><div class='del'>-			 * whether STA is considered authenticated after</div><div class='del'>-			 * authentication OK frame has been send or after it</div><div class='del'>-			 * has been ACKed. In order to reduce interoperability</div><div class='del'>-			 * issues, mark the STA authenticated before ACK. */</div><div class='del'>-			sta-&gt;flags |= WLAN_STA_AUTH;</div><div class='del'>-			kfree(sta-&gt;u.sta.challenge);</div><div class='del'>-			sta-&gt;u.sta.challenge = NULL;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- fail:</div><div class='del'>-	pos = (__le16 *) body;</div><div class='del'>-	*pos = cpu_to_le16(auth_alg);</div><div class='del'>-	pos++;</div><div class='del'>-	*pos = cpu_to_le16(auth_transaction + 1);</div><div class='del'>-	pos++;</div><div class='del'>-	*pos = cpu_to_le16(resp); /* status_code */</div><div class='del'>-	pos++;</div><div class='del'>-	olen = 6;</div><div class='del'>-</div><div class='del'>-	if (resp == WLAN_STATUS_SUCCESS &amp;&amp; sta != NULL &amp;&amp;</div><div class='del'>-	    sta-&gt;u.sta.challenge != NULL &amp;&amp;</div><div class='del'>-	    auth_alg == WLAN_AUTH_SHARED_KEY &amp;&amp; auth_transaction == 1) {</div><div class='del'>-		u8 *tmp = (u8 *) pos;</div><div class='del'>-		*tmp++ = WLAN_EID_CHALLENGE;</div><div class='del'>-		*tmp++ = WLAN_AUTH_CHALLENGE_LEN;</div><div class='del'>-		pos++;</div><div class='del'>-		memcpy(pos, sta-&gt;u.sta.challenge, WLAN_AUTH_CHALLENGE_LEN);</div><div class='del'>-		olen += 2 + WLAN_AUTH_CHALLENGE_LEN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prism2_send_mgmt(dev, IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_AUTH,</div><div class='del'>-			 body, olen, hdr-&gt;addr2, ap-&gt;tx_callback_auth);</div><div class='del'>-</div><div class='del'>-	if (sta) {</div><div class='del'>-		sta-&gt;last_rx = jiffies;</div><div class='del'>-		atomic_dec(&amp;sta-&gt;users);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (resp) {</div><div class='del'>-		PDEBUG(DEBUG_AP, "%s: %pM auth (alg=%d "</div><div class='del'>-		       "trans#=%d stat=%d len=%d fc=%04x) ==&gt; %d (%s)\n",</div><div class='del'>-		       dev-&gt;name, hdr-&gt;addr2,</div><div class='del'>-		       auth_alg, auth_transaction, status_code, len,</div><div class='del'>-		       le16_to_cpu(hdr-&gt;frame_control), resp, txt);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a scheduled task for pending AP frames. */</div><div class='del'>-static void handle_assoc(local_info_t *local, struct sk_buff *skb,</div><div class='del'>-			 struct hostap_80211_rx_status *rx_stats, int reassoc)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-	char body[12], *p, *lpos;</div><div class='del'>-	int len, left;</div><div class='del'>-	__le16 *pos;</div><div class='del'>-	u16 resp = WLAN_STATUS_SUCCESS;</div><div class='del'>-	struct sta_info *sta = NULL;</div><div class='del'>-	int send_deauth = 0;</div><div class='del'>-	char __always_unused *txt = "";</div><div class='del'>-	u8 prev_ap[ETH_ALEN];</div><div class='del'>-</div><div class='del'>-	left = len = skb-&gt;len - IEEE80211_MGMT_HDR_LEN;</div><div class='del'>-</div><div class='del'>-	if (len &lt; (reassoc ? 10 : 4)) {</div><div class='del'>-		PDEBUG(DEBUG_AP, "%s: handle_assoc - too short payload "</div><div class='del'>-		       "(len=%d, reassoc=%d) from %pM\n",</div><div class='del'>-		       dev-&gt;name, len, reassoc, hdr-&gt;addr2);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(local-&gt;ap, hdr-&gt;addr2);</div><div class='del'>-	if (sta == NULL || (sta-&gt;flags &amp; WLAN_STA_AUTH) == 0) {</div><div class='del'>-		spin_unlock_bh(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-		txt = "trying to associate before authentication";</div><div class='del'>-		send_deauth = 1;</div><div class='del'>-		resp = WLAN_STATUS_UNSPECIFIED_FAILURE;</div><div class='del'>-		sta = NULL; /* do not decrement sta-&gt;users */</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-	atomic_inc(&amp;sta-&gt;users);</div><div class='del'>-	spin_unlock_bh(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	pos = (__le16 *) (skb-&gt;data + IEEE80211_MGMT_HDR_LEN);</div><div class='del'>-	sta-&gt;capability = __le16_to_cpu(*pos);</div><div class='del'>-	pos++; left -= 2;</div><div class='del'>-	sta-&gt;listen_interval = __le16_to_cpu(*pos);</div><div class='del'>-	pos++; left -= 2;</div><div class='del'>-</div><div class='del'>-	if (reassoc) {</div><div class='del'>-		memcpy(prev_ap, pos, ETH_ALEN);</div><div class='del'>-		pos++; pos++; pos++; left -= 6;</div><div class='del'>-	} else</div><div class='del'>-		eth_zero_addr(prev_ap);</div><div class='del'>-</div><div class='del'>-	if (left &gt;= 2) {</div><div class='del'>-		unsigned int ileft;</div><div class='del'>-		unsigned char *u = (unsigned char *) pos;</div><div class='del'>-</div><div class='del'>-		if (*u == WLAN_EID_SSID) {</div><div class='del'>-			u++; left--;</div><div class='del'>-			ileft = *u;</div><div class='del'>-			u++; left--;</div><div class='del'>-</div><div class='del'>-			if (ileft &gt; left || ileft &gt; MAX_SSID_LEN) {</div><div class='del'>-				txt = "SSID overflow";</div><div class='del'>-				resp = WLAN_STATUS_UNSPECIFIED_FAILURE;</div><div class='del'>-				goto fail;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (ileft != strlen(local-&gt;essid) ||</div><div class='del'>-			    memcmp(local-&gt;essid, u, ileft) != 0) {</div><div class='del'>-				txt = "not our SSID";</div><div class='del'>-				resp = WLAN_STATUS_ASSOC_DENIED_UNSPEC;</div><div class='del'>-				goto fail;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			u += ileft;</div><div class='del'>-			left -= ileft;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (left &gt;= 2 &amp;&amp; *u == WLAN_EID_SUPP_RATES) {</div><div class='del'>-			u++; left--;</div><div class='del'>-			ileft = *u;</div><div class='del'>-			u++; left--;</div><div class='del'>-</div><div class='del'>-			if (ileft &gt; left || ileft == 0 ||</div><div class='del'>-			    ileft &gt; WLAN_SUPP_RATES_MAX) {</div><div class='del'>-				txt = "SUPP_RATES len error";</div><div class='del'>-				resp = WLAN_STATUS_UNSPECIFIED_FAILURE;</div><div class='del'>-				goto fail;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			memset(sta-&gt;supported_rates, 0,</div><div class='del'>-			       sizeof(sta-&gt;supported_rates));</div><div class='del'>-			memcpy(sta-&gt;supported_rates, u, ileft);</div><div class='del'>-			prism2_check_tx_rates(sta);</div><div class='del'>-</div><div class='del'>-			u += ileft;</div><div class='del'>-			left -= ileft;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (left &gt; 0) {</div><div class='del'>-			PDEBUG(DEBUG_AP, "%s: assoc from %pM"</div><div class='del'>-			       " with extra data (%d bytes) [",</div><div class='del'>-			       dev-&gt;name, hdr-&gt;addr2, left);</div><div class='del'>-			while (left &gt; 0) {</div><div class='del'>-				PDEBUG2(DEBUG_AP, "&lt;%02x&gt;", *u);</div><div class='del'>-				u++; left--;</div><div class='del'>-			}</div><div class='del'>-			PDEBUG2(DEBUG_AP, "]\n");</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		txt = "frame underflow";</div><div class='del'>-		resp = WLAN_STATUS_UNSPECIFIED_FAILURE;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* get a unique AID */</div><div class='del'>-	if (sta-&gt;aid &gt; 0)</div><div class='del'>-		txt = "OK, old AID";</div><div class='del'>-	else {</div><div class='del'>-		spin_lock_bh(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-		for (sta-&gt;aid = 1; sta-&gt;aid &lt;= MAX_AID_TABLE_SIZE; sta-&gt;aid++)</div><div class='del'>-			if (local-&gt;ap-&gt;sta_aid[sta-&gt;aid - 1] == NULL)</div><div class='del'>-				break;</div><div class='del'>-		if (sta-&gt;aid &gt; MAX_AID_TABLE_SIZE) {</div><div class='del'>-			sta-&gt;aid = 0;</div><div class='del'>-			spin_unlock_bh(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-			resp = WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA;</div><div class='del'>-			txt = "no room for more AIDs";</div><div class='del'>-		} else {</div><div class='del'>-			local-&gt;ap-&gt;sta_aid[sta-&gt;aid - 1] = sta;</div><div class='del'>-			spin_unlock_bh(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-			txt = "OK, new AID";</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- fail:</div><div class='del'>-	pos = (__le16 *) body;</div><div class='del'>-</div><div class='del'>-	if (send_deauth) {</div><div class='del'>-		*pos = cpu_to_le16(WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH);</div><div class='del'>-		pos++;</div><div class='del'>-	} else {</div><div class='del'>-		/* FIX: CF-Pollable and CF-PollReq should be set to match the</div><div class='del'>-		 * values in beacons/probe responses */</div><div class='del'>-		/* FIX: how about privacy and WEP? */</div><div class='del'>-		/* capability */</div><div class='del'>-		*pos = cpu_to_le16(WLAN_CAPABILITY_ESS);</div><div class='del'>-		pos++;</div><div class='del'>-</div><div class='del'>-		/* status_code */</div><div class='del'>-		*pos = cpu_to_le16(resp);</div><div class='del'>-		pos++;</div><div class='del'>-</div><div class='del'>-		*pos = cpu_to_le16((sta &amp;&amp; sta-&gt;aid &gt; 0 ? sta-&gt;aid : 0) |</div><div class='del'>-				     BIT(14) | BIT(15)); /* AID */</div><div class='del'>-		pos++;</div><div class='del'>-</div><div class='del'>-		/* Supported rates (Information element) */</div><div class='del'>-		p = (char *) pos;</div><div class='del'>-		*p++ = WLAN_EID_SUPP_RATES;</div><div class='del'>-		lpos = p;</div><div class='del'>-		*p++ = 0; /* len */</div><div class='del'>-		if (local-&gt;tx_rate_control &amp; WLAN_RATE_1M) {</div><div class='del'>-			*p++ = local-&gt;basic_rates &amp; WLAN_RATE_1M ? 0x82 : 0x02;</div><div class='del'>-			(*lpos)++;</div><div class='del'>-		}</div><div class='del'>-		if (local-&gt;tx_rate_control &amp; WLAN_RATE_2M) {</div><div class='del'>-			*p++ = local-&gt;basic_rates &amp; WLAN_RATE_2M ? 0x84 : 0x04;</div><div class='del'>-			(*lpos)++;</div><div class='del'>-		}</div><div class='del'>-		if (local-&gt;tx_rate_control &amp; WLAN_RATE_5M5) {</div><div class='del'>-			*p++ = local-&gt;basic_rates &amp; WLAN_RATE_5M5 ?</div><div class='del'>-				0x8b : 0x0b;</div><div class='del'>-			(*lpos)++;</div><div class='del'>-		}</div><div class='del'>-		if (local-&gt;tx_rate_control &amp; WLAN_RATE_11M) {</div><div class='del'>-			*p++ = local-&gt;basic_rates &amp; WLAN_RATE_11M ?</div><div class='del'>-				0x96 : 0x16;</div><div class='del'>-			(*lpos)++;</div><div class='del'>-		}</div><div class='del'>-		pos = (__le16 *) p;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prism2_send_mgmt(dev, IEEE80211_FTYPE_MGMT |</div><div class='del'>-			 (send_deauth ? IEEE80211_STYPE_DEAUTH :</div><div class='del'>-			  (reassoc ? IEEE80211_STYPE_REASSOC_RESP :</div><div class='del'>-			   IEEE80211_STYPE_ASSOC_RESP)),</div><div class='del'>-			 body, (u8 *) pos - (u8 *) body,</div><div class='del'>-			 hdr-&gt;addr2,</div><div class='del'>-			 send_deauth ? 0 : local-&gt;ap-&gt;tx_callback_assoc);</div><div class='del'>-</div><div class='del'>-	if (sta) {</div><div class='del'>-		if (resp == WLAN_STATUS_SUCCESS) {</div><div class='del'>-			sta-&gt;last_rx = jiffies;</div><div class='del'>-			/* STA will be marked associated from TX callback, if</div><div class='del'>-			 * AssocResp is ACKed */</div><div class='del'>-		}</div><div class='del'>-		atomic_dec(&amp;sta-&gt;users);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	PDEBUG(DEBUG_AP, "%s: %pM %sassoc (len=%d "</div><div class='del'>-	       "prev_ap=%pM) =&gt; %d(%d) (%s)\n",</div><div class='del'>-	       dev-&gt;name,</div><div class='del'>-	       hdr-&gt;addr2,</div><div class='del'>-	       reassoc ? "re" : "", len,</div><div class='del'>-	       prev_ap,</div><div class='del'>-	       resp, send_deauth, txt);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a scheduled task for pending AP frames. */</div><div class='del'>-static void handle_deauth(local_info_t *local, struct sk_buff *skb,</div><div class='del'>-			  struct hostap_80211_rx_status *rx_stats)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-	char *body = (char *) (skb-&gt;data + IEEE80211_MGMT_HDR_LEN);</div><div class='del'>-	int len;</div><div class='del'>-	u16 reason_code;</div><div class='del'>-	__le16 *pos;</div><div class='del'>-	struct sta_info *sta = NULL;</div><div class='del'>-</div><div class='del'>-	len = skb-&gt;len - IEEE80211_MGMT_HDR_LEN;</div><div class='del'>-</div><div class='del'>-	if (len &lt; 2) {</div><div class='del'>-		printk("handle_deauth - too short payload (len=%d)\n", len);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pos = (__le16 *) body;</div><div class='del'>-	reason_code = le16_to_cpu(*pos);</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_AP, "%s: deauthentication: %pM len=%d, "</div><div class='del'>-	       "reason_code=%d\n", dev-&gt;name, hdr-&gt;addr2,</div><div class='del'>-	       len, reason_code);</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(local-&gt;ap, hdr-&gt;addr2);</div><div class='del'>-	if (sta != NULL) {</div><div class='del'>-		if ((sta-&gt;flags &amp; WLAN_STA_ASSOC) &amp;&amp; !sta-&gt;ap)</div><div class='del'>-			hostap_event_expired_sta(local-&gt;dev, sta);</div><div class='del'>-		sta-&gt;flags &amp;= ~(WLAN_STA_AUTH | WLAN_STA_ASSOC);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_bh(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-	if (sta == NULL) {</div><div class='del'>-		printk("%s: deauthentication from %pM, "</div><div class='del'>-	       "reason_code=%d, but STA not authenticated\n", dev-&gt;name,</div><div class='del'>-		       hdr-&gt;addr2, reason_code);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a scheduled task for pending AP frames. */</div><div class='del'>-static void handle_disassoc(local_info_t *local, struct sk_buff *skb,</div><div class='del'>-			    struct hostap_80211_rx_status *rx_stats)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-	char *body = skb-&gt;data + IEEE80211_MGMT_HDR_LEN;</div><div class='del'>-	int len;</div><div class='del'>-	u16 reason_code;</div><div class='del'>-	__le16 *pos;</div><div class='del'>-	struct sta_info *sta = NULL;</div><div class='del'>-</div><div class='del'>-	len = skb-&gt;len - IEEE80211_MGMT_HDR_LEN;</div><div class='del'>-</div><div class='del'>-	if (len &lt; 2) {</div><div class='del'>-		printk("handle_disassoc - too short payload (len=%d)\n", len);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pos = (__le16 *) body;</div><div class='del'>-	reason_code = le16_to_cpu(*pos);</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_AP, "%s: disassociation: %pM len=%d, "</div><div class='del'>-	       "reason_code=%d\n", dev-&gt;name, hdr-&gt;addr2,</div><div class='del'>-	       len, reason_code);</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(local-&gt;ap, hdr-&gt;addr2);</div><div class='del'>-	if (sta != NULL) {</div><div class='del'>-		if ((sta-&gt;flags &amp; WLAN_STA_ASSOC) &amp;&amp; !sta-&gt;ap)</div><div class='del'>-			hostap_event_expired_sta(local-&gt;dev, sta);</div><div class='del'>-		sta-&gt;flags &amp;= ~WLAN_STA_ASSOC;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_bh(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-	if (sta == NULL) {</div><div class='del'>-		printk("%s: disassociation from %pM, "</div><div class='del'>-		       "reason_code=%d, but STA not authenticated\n",</div><div class='del'>-		       dev-&gt;name, hdr-&gt;addr2, reason_code);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a scheduled task for pending AP frames. */</div><div class='del'>-static void ap_handle_data_nullfunc(local_info_t *local,</div><div class='del'>-				    struct ieee80211_hdr *hdr)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-</div><div class='del'>-	/* some STA f/w's seem to require control::ACK frame for</div><div class='del'>-	 * data::nullfunc, but at least Prism2 station f/w version 0.8.0 does</div><div class='del'>-	 * not send this..</div><div class='del'>-	 * send control::ACK for the data::nullfunc */</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "Sending control::ACK for data::nullfunc\n");</div><div class='del'>-	prism2_send_mgmt(dev, IEEE80211_FTYPE_CTL | IEEE80211_STYPE_ACK,</div><div class='del'>-			 NULL, 0, hdr-&gt;addr2, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a scheduled task for pending AP frames. */</div><div class='del'>-static void ap_handle_dropped_data(local_info_t *local,</div><div class='del'>-				   struct ieee80211_hdr *hdr)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-	__le16 reason;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(local-&gt;ap, hdr-&gt;addr2);</div><div class='del'>-	if (sta)</div><div class='del'>-		atomic_inc(&amp;sta-&gt;users);</div><div class='del'>-	spin_unlock_bh(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	if (sta != NULL &amp;&amp; (sta-&gt;flags &amp; WLAN_STA_ASSOC)) {</div><div class='del'>-		PDEBUG(DEBUG_AP, "ap_handle_dropped_data: STA is now okay?\n");</div><div class='del'>-		atomic_dec(&amp;sta-&gt;users);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reason = cpu_to_le16(WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);</div><div class='del'>-	prism2_send_mgmt(dev, IEEE80211_FTYPE_MGMT |</div><div class='del'>-			 ((sta == NULL || !(sta-&gt;flags &amp; WLAN_STA_ASSOC)) ?</div><div class='del'>-			  IEEE80211_STYPE_DEAUTH : IEEE80211_STYPE_DISASSOC),</div><div class='del'>-			 (char *) &amp;reason, sizeof(reason), hdr-&gt;addr2, 0);</div><div class='del'>-</div><div class='del'>-	if (sta)</div><div class='del'>-		atomic_dec(&amp;sta-&gt;users);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a scheduled task for pending AP frames. */</div><div class='del'>-static void pspoll_send_buffered(local_info_t *local, struct sta_info *sta,</div><div class='del'>-				 struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct hostap_skb_tx_data *meta;</div><div class='del'>-</div><div class='del'>-	if (!(sta-&gt;flags &amp; WLAN_STA_PS)) {</div><div class='del'>-		/* Station has moved to non-PS mode, so send all buffered</div><div class='del'>-		 * frames using normal device queue. */</div><div class='del'>-		dev_queue_xmit(skb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* add a flag for hostap_handle_sta_tx() to know that this skb should</div><div class='del'>-	 * be passed through even though STA is using PS */</div><div class='del'>-	meta = (struct hostap_skb_tx_data *) skb-&gt;cb;</div><div class='del'>-	meta-&gt;flags |= HOSTAP_TX_FLAGS_BUFFERED_FRAME;</div><div class='del'>-	if (!skb_queue_empty(&amp;sta-&gt;tx_buf)) {</div><div class='del'>-		/* indicate to STA that more frames follow */</div><div class='del'>-		meta-&gt;flags |= HOSTAP_TX_FLAGS_ADD_MOREDATA;</div><div class='del'>-	}</div><div class='del'>-	dev_queue_xmit(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a scheduled task for pending AP frames. */</div><div class='del'>-static void handle_pspoll(local_info_t *local,</div><div class='del'>-			  struct ieee80211_hdr *hdr,</div><div class='del'>-			  struct hostap_80211_rx_status *rx_stats)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-	u16 aid;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_PS2, "handle_pspoll: BSSID=%pM, TA=%pM PWRMGT=%d\n",</div><div class='del'>-	       hdr-&gt;addr1, hdr-&gt;addr2, !!ieee80211_has_pm(hdr-&gt;frame_control));</div><div class='del'>-</div><div class='del'>-	if (!ether_addr_equal(hdr-&gt;addr1, dev-&gt;dev_addr)) {</div><div class='del'>-		PDEBUG(DEBUG_AP,</div><div class='del'>-		       "handle_pspoll - addr1(BSSID)=%pM not own MAC\n",</div><div class='del'>-		       hdr-&gt;addr1);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	aid = le16_to_cpu(hdr-&gt;duration_id);</div><div class='del'>-	if ((aid &amp; (BIT(15) | BIT(14))) != (BIT(15) | BIT(14))) {</div><div class='del'>-		PDEBUG(DEBUG_PS, "   PSPOLL and AID[15:14] not set\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	aid &amp;= ~(BIT(15) | BIT(14));</div><div class='del'>-	if (aid == 0 || aid &gt; MAX_AID_TABLE_SIZE) {</div><div class='del'>-		PDEBUG(DEBUG_PS, "   invalid aid=%d\n", aid);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	PDEBUG(DEBUG_PS2, "   aid=%d\n", aid);</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(local-&gt;ap, hdr-&gt;addr2);</div><div class='del'>-	if (sta)</div><div class='del'>-		atomic_inc(&amp;sta-&gt;users);</div><div class='del'>-	spin_unlock_bh(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	if (sta == NULL) {</div><div class='del'>-		PDEBUG(DEBUG_PS, "   STA not found\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (sta-&gt;aid != aid) {</div><div class='del'>-		PDEBUG(DEBUG_PS, "   received aid=%i does not match with "</div><div class='del'>-		       "assoc.aid=%d\n", aid, sta-&gt;aid);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIX: todo:</div><div class='del'>-	 * - add timeout for buffering (clear aid in TIM vector if buffer timed</div><div class='del'>-	 *   out (expiry time must be longer than ListenInterval for</div><div class='del'>-	 *   the corresponding STA; "8802-11: 11.2.1.9 AP aging function"</div><div class='del'>-	 * - what to do, if buffered, pspolled, and sent frame is not ACKed by</div><div class='del'>-	 *   sta; store buffer for later use and leave TIM aid bit set? use</div><div class='del'>-	 *   TX event to check whether frame was ACKed?</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	while ((skb = skb_dequeue(&amp;sta-&gt;tx_buf)) != NULL) {</div><div class='del'>-		/* send buffered frame .. */</div><div class='del'>-		PDEBUG(DEBUG_PS2, "Sending buffered frame to STA after PS POLL"</div><div class='del'>-		       " (buffer_count=%d)\n", skb_queue_len(&amp;sta-&gt;tx_buf));</div><div class='del'>-</div><div class='del'>-		pspoll_send_buffered(local, sta, skb);</div><div class='del'>-</div><div class='del'>-		if (sta-&gt;flags &amp; WLAN_STA_PS) {</div><div class='del'>-			/* send only one buffered packet per PS Poll */</div><div class='del'>-			/* FIX: should ignore further PS Polls until the</div><div class='del'>-			 * buffered packet that was just sent is acknowledged</div><div class='del'>-			 * (Tx or TxExc event) */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (skb_queue_empty(&amp;sta-&gt;tx_buf)) {</div><div class='del'>-		/* try to clear aid from TIM */</div><div class='del'>-		if (!(sta-&gt;flags &amp; WLAN_STA_TIM))</div><div class='del'>-			PDEBUG(DEBUG_PS2,  "Re-unsetting TIM for aid %d\n",</div><div class='del'>-			       aid);</div><div class='del'>-		hostap_set_tim(local, aid, 0);</div><div class='del'>-		sta-&gt;flags &amp;= ~WLAN_STA_TIM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	atomic_dec(&amp;sta-&gt;users);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-</div><div class='del'>-static void handle_wds_oper_queue(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct ap_data *ap = container_of(work, struct ap_data,</div><div class='del'>-					  wds_oper_queue);</div><div class='del'>-	local_info_t *local = ap-&gt;local;</div><div class='del'>-	struct wds_oper_data *entry, *prev;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;local-&gt;lock);</div><div class='del'>-	entry = local-&gt;ap-&gt;wds_oper_entries;</div><div class='del'>-	local-&gt;ap-&gt;wds_oper_entries = NULL;</div><div class='del'>-	spin_unlock_bh(&amp;local-&gt;lock);</div><div class='del'>-</div><div class='del'>-	while (entry) {</div><div class='del'>-		PDEBUG(DEBUG_AP, "%s: %s automatic WDS connection "</div><div class='del'>-		       "to AP %pM\n",</div><div class='del'>-		       local-&gt;dev-&gt;name,</div><div class='del'>-		       entry-&gt;type == WDS_ADD ? "adding" : "removing",</div><div class='del'>-		       entry-&gt;addr);</div><div class='del'>-		if (entry-&gt;type == WDS_ADD)</div><div class='del'>-			prism2_wds_add(local, entry-&gt;addr, 0);</div><div class='del'>-		else if (entry-&gt;type == WDS_DEL)</div><div class='del'>-			prism2_wds_del(local, entry-&gt;addr, 0, 1);</div><div class='del'>-</div><div class='del'>-		prev = entry;</div><div class='del'>-		entry = entry-&gt;next;</div><div class='del'>-		kfree(prev);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a scheduled task for pending AP frames. */</div><div class='del'>-static void handle_beacon(local_info_t *local, struct sk_buff *skb,</div><div class='del'>-			  struct hostap_80211_rx_status *rx_stats)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-	char *body = skb-&gt;data + IEEE80211_MGMT_HDR_LEN;</div><div class='del'>-	int len, left;</div><div class='del'>-	u16 beacon_int, capability;</div><div class='del'>-	__le16 *pos;</div><div class='del'>-	char *ssid = NULL;</div><div class='del'>-	unsigned char *supp_rates = NULL;</div><div class='del'>-	int ssid_len = 0, supp_rates_len = 0;</div><div class='del'>-	struct sta_info *sta = NULL;</div><div class='del'>-	int new_sta = 0, channel = -1;</div><div class='del'>-</div><div class='del'>-	len = skb-&gt;len - IEEE80211_MGMT_HDR_LEN;</div><div class='del'>-</div><div class='del'>-	if (len &lt; 8 + 2 + 2) {</div><div class='del'>-		printk(KERN_DEBUG "handle_beacon - too short payload "</div><div class='del'>-		       "(len=%d)\n", len);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pos = (__le16 *) body;</div><div class='del'>-	left = len;</div><div class='del'>-</div><div class='del'>-	/* Timestamp (8 octets) */</div><div class='del'>-	pos += 4; left -= 8;</div><div class='del'>-	/* Beacon interval (2 octets) */</div><div class='del'>-	beacon_int = le16_to_cpu(*pos);</div><div class='del'>-	pos++; left -= 2;</div><div class='del'>-	/* Capability information (2 octets) */</div><div class='del'>-	capability = le16_to_cpu(*pos);</div><div class='del'>-	pos++; left -= 2;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;ap-&gt;ap_policy != AP_OTHER_AP_EVEN_IBSS &amp;&amp;</div><div class='del'>-	    capability &amp; WLAN_CAPABILITY_IBSS)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (left &gt;= 2) {</div><div class='del'>-		unsigned int ileft;</div><div class='del'>-		unsigned char *u = (unsigned char *) pos;</div><div class='del'>-</div><div class='del'>-		if (*u == WLAN_EID_SSID) {</div><div class='del'>-			u++; left--;</div><div class='del'>-			ileft = *u;</div><div class='del'>-			u++; left--;</div><div class='del'>-</div><div class='del'>-			if (ileft &gt; left || ileft &gt; MAX_SSID_LEN) {</div><div class='del'>-				PDEBUG(DEBUG_AP, "SSID: overflow\n");</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (local-&gt;ap-&gt;ap_policy == AP_OTHER_AP_SAME_SSID &amp;&amp;</div><div class='del'>-			    (ileft != strlen(local-&gt;essid) ||</div><div class='del'>-			     memcmp(local-&gt;essid, u, ileft) != 0)) {</div><div class='del'>-				/* not our SSID */</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			ssid = u;</div><div class='del'>-			ssid_len = ileft;</div><div class='del'>-</div><div class='del'>-			u += ileft;</div><div class='del'>-			left -= ileft;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (*u == WLAN_EID_SUPP_RATES) {</div><div class='del'>-			u++; left--;</div><div class='del'>-			ileft = *u;</div><div class='del'>-			u++; left--;</div><div class='del'>-</div><div class='del'>-			if (ileft &gt; left || ileft == 0 || ileft &gt; 8) {</div><div class='del'>-				PDEBUG(DEBUG_AP, " - SUPP_RATES len error\n");</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			supp_rates = u;</div><div class='del'>-			supp_rates_len = ileft;</div><div class='del'>-</div><div class='del'>-			u += ileft;</div><div class='del'>-			left -= ileft;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (*u == WLAN_EID_DS_PARAMS) {</div><div class='del'>-			u++; left--;</div><div class='del'>-			ileft = *u;</div><div class='del'>-			u++; left--;</div><div class='del'>-</div><div class='del'>-			if (ileft &gt; left || ileft != 1) {</div><div class='del'>-				PDEBUG(DEBUG_AP, " - DS_PARAMS len error\n");</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			channel = *u;</div><div class='del'>-</div><div class='del'>-			u += ileft;</div><div class='del'>-			left -= ileft;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(local-&gt;ap, hdr-&gt;addr2);</div><div class='del'>-	if (sta != NULL)</div><div class='del'>-		atomic_inc(&amp;sta-&gt;users);</div><div class='del'>-	spin_unlock_bh(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	if (sta == NULL) {</div><div class='del'>-		/* add new AP */</div><div class='del'>-		new_sta = 1;</div><div class='del'>-		sta = ap_add_sta(local-&gt;ap, hdr-&gt;addr2);</div><div class='del'>-		if (sta == NULL) {</div><div class='del'>-			printk(KERN_INFO "prism2: kmalloc failed for AP "</div><div class='del'>-			       "data structure\n");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		hostap_event_new_sta(local-&gt;dev, sta);</div><div class='del'>-</div><div class='del'>-		/* mark APs authentication and associated for pseudo ad-hoc</div><div class='del'>-		 * style communication */</div><div class='del'>-		sta-&gt;flags = WLAN_STA_AUTH | WLAN_STA_ASSOC;</div><div class='del'>-</div><div class='del'>-		if (local-&gt;ap-&gt;autom_ap_wds) {</div><div class='del'>-			hostap_wds_link_oper(local, sta-&gt;addr, WDS_ADD);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sta-&gt;ap = 1;</div><div class='del'>-	if (ssid) {</div><div class='del'>-		sta-&gt;u.ap.ssid_len = ssid_len;</div><div class='del'>-		memcpy(sta-&gt;u.ap.ssid, ssid, ssid_len);</div><div class='del'>-		sta-&gt;u.ap.ssid[ssid_len] = '\0';</div><div class='del'>-	} else {</div><div class='del'>-		sta-&gt;u.ap.ssid_len = 0;</div><div class='del'>-		sta-&gt;u.ap.ssid[0] = '\0';</div><div class='del'>-	}</div><div class='del'>-	sta-&gt;u.ap.channel = channel;</div><div class='del'>-	sta-&gt;rx_packets++;</div><div class='del'>-	sta-&gt;rx_bytes += len;</div><div class='del'>-	sta-&gt;u.ap.last_beacon = sta-&gt;last_rx = jiffies;</div><div class='del'>-	sta-&gt;capability = capability;</div><div class='del'>-	sta-&gt;listen_interval = beacon_int;</div><div class='del'>-</div><div class='del'>-	atomic_dec(&amp;sta-&gt;users);</div><div class='del'>-</div><div class='del'>-	if (new_sta) {</div><div class='del'>-		memset(sta-&gt;supported_rates, 0, sizeof(sta-&gt;supported_rates));</div><div class='del'>-		memcpy(sta-&gt;supported_rates, supp_rates, supp_rates_len);</div><div class='del'>-		prism2_check_tx_rates(sta);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet. */</div><div class='del'>-static void handle_ap_item(local_info_t *local, struct sk_buff *skb,</div><div class='del'>-			   struct hostap_80211_rx_status *rx_stats)</div><div class='del'>-{</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-	u16 fc, type, stype;</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-</div><div class='del'>-	/* FIX: should give skb-&gt;len to handler functions and check that the</div><div class='del'>-	 * buffer is long enough */</div><div class='del'>-	hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-	fc = le16_to_cpu(hdr-&gt;frame_control);</div><div class='del'>-	type = fc &amp; IEEE80211_FCTL_FTYPE;</div><div class='del'>-	stype = fc &amp; IEEE80211_FCTL_STYPE;</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-	if (!local-&gt;hostapd &amp;&amp; type == IEEE80211_FTYPE_DATA) {</div><div class='del'>-		PDEBUG(DEBUG_AP, "handle_ap_item - data frame\n");</div><div class='del'>-</div><div class='del'>-		if (!(fc &amp; IEEE80211_FCTL_TODS) ||</div><div class='del'>-		    (fc &amp; IEEE80211_FCTL_FROMDS)) {</div><div class='del'>-			if (stype == IEEE80211_STYPE_NULLFUNC) {</div><div class='del'>-				/* no ToDS nullfunc seems to be used to check</div><div class='del'>-				 * AP association; so send reject message to</div><div class='del'>-				 * speed up re-association */</div><div class='del'>-				ap_handle_dropped_data(local, hdr);</div><div class='del'>-				goto done;</div><div class='del'>-			}</div><div class='del'>-			PDEBUG(DEBUG_AP, "   not ToDS frame (fc=0x%04x)\n",</div><div class='del'>-			       fc);</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!ether_addr_equal(hdr-&gt;addr1, dev-&gt;dev_addr)) {</div><div class='del'>-			PDEBUG(DEBUG_AP, "handle_ap_item - addr1(BSSID)=%pM"</div><div class='del'>-			       " not own MAC\n", hdr-&gt;addr1);</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (local-&gt;ap-&gt;nullfunc_ack &amp;&amp;</div><div class='del'>-		    stype == IEEE80211_STYPE_NULLFUNC)</div><div class='del'>-			ap_handle_data_nullfunc(local, hdr);</div><div class='del'>-		else</div><div class='del'>-			ap_handle_dropped_data(local, hdr);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (type == IEEE80211_FTYPE_MGMT &amp;&amp; stype == IEEE80211_STYPE_BEACON) {</div><div class='del'>-		handle_beacon(local, skb, rx_stats);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-</div><div class='del'>-	if (type == IEEE80211_FTYPE_CTL &amp;&amp; stype == IEEE80211_STYPE_PSPOLL) {</div><div class='del'>-		handle_pspoll(local, hdr, rx_stats);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;hostapd) {</div><div class='del'>-		PDEBUG(DEBUG_AP, "Unknown frame in AP queue: type=0x%02x "</div><div class='del'>-		       "subtype=0x%02x\n", type, stype);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-	if (type != IEEE80211_FTYPE_MGMT) {</div><div class='del'>-		PDEBUG(DEBUG_AP, "handle_ap_item - not a management frame?\n");</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ether_addr_equal(hdr-&gt;addr1, dev-&gt;dev_addr)) {</div><div class='del'>-		PDEBUG(DEBUG_AP, "handle_ap_item - addr1(DA)=%pM"</div><div class='del'>-		       " not own MAC\n", hdr-&gt;addr1);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ether_addr_equal(hdr-&gt;addr3, dev-&gt;dev_addr)) {</div><div class='del'>-		PDEBUG(DEBUG_AP, "handle_ap_item - addr3(BSSID)=%pM"</div><div class='del'>-		       " not own MAC\n", hdr-&gt;addr3);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (stype) {</div><div class='del'>-	case IEEE80211_STYPE_ASSOC_REQ:</div><div class='del'>-		handle_assoc(local, skb, rx_stats, 0);</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_STYPE_ASSOC_RESP:</div><div class='del'>-		PDEBUG(DEBUG_AP, "==&gt; ASSOC RESP (ignored)\n");</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_STYPE_REASSOC_REQ:</div><div class='del'>-		handle_assoc(local, skb, rx_stats, 1);</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_STYPE_REASSOC_RESP:</div><div class='del'>-		PDEBUG(DEBUG_AP, "==&gt; REASSOC RESP (ignored)\n");</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_STYPE_ATIM:</div><div class='del'>-		PDEBUG(DEBUG_AP, "==&gt; ATIM (ignored)\n");</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_STYPE_DISASSOC:</div><div class='del'>-		handle_disassoc(local, skb, rx_stats);</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_STYPE_AUTH:</div><div class='del'>-		handle_authen(local, skb, rx_stats);</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_STYPE_DEAUTH:</div><div class='del'>-		handle_deauth(local, skb, rx_stats);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		PDEBUG(DEBUG_AP, "Unknown mgmt frame subtype 0x%02x\n",</div><div class='del'>-		       stype &gt;&gt; 4);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-</div><div class='del'>- done:</div><div class='del'>-	dev_kfree_skb(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-void hostap_rx(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-	       struct hostap_80211_rx_status *rx_stats)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &lt; 16)</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	dev-&gt;stats.rx_packets++;</div><div class='del'>-</div><div class='del'>-	hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;ap-&gt;ap_policy == AP_OTHER_AP_SKIP_ALL &amp;&amp;</div><div class='del'>-	    ieee80211_is_beacon(hdr-&gt;frame_control))</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	skb-&gt;protocol = cpu_to_be16(ETH_P_HOSTAP);</div><div class='del'>-	handle_ap_item(local, skb, rx_stats);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>- drop:</div><div class='del'>-	dev_kfree_skb(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static void schedule_packet_send(local_info_t *local, struct sta_info *sta)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-	struct hostap_80211_rx_status rx_stats;</div><div class='del'>-</div><div class='del'>-	if (skb_queue_empty(&amp;sta-&gt;tx_buf))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	skb = dev_alloc_skb(16);</div><div class='del'>-	if (skb == NULL) {</div><div class='del'>-		printk(KERN_DEBUG "%s: schedule_packet_send: skb alloc "</div><div class='del'>-		       "failed\n", local-&gt;dev-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hdr = skb_put(skb, 16);</div><div class='del'>-</div><div class='del'>-	/* Generate a fake pspoll frame to start packet delivery */</div><div class='del'>-	hdr-&gt;frame_control = cpu_to_le16(</div><div class='del'>-		IEEE80211_FTYPE_CTL | IEEE80211_STYPE_PSPOLL);</div><div class='del'>-	memcpy(hdr-&gt;addr1, local-&gt;dev-&gt;dev_addr, ETH_ALEN);</div><div class='del'>-	memcpy(hdr-&gt;addr2, sta-&gt;addr, ETH_ALEN);</div><div class='del'>-	hdr-&gt;duration_id = cpu_to_le16(sta-&gt;aid | BIT(15) | BIT(14));</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_PS2,</div><div class='del'>-	       "%s: Scheduling buffered packet delivery for STA %pM\n",</div><div class='del'>-	       local-&gt;dev-&gt;name, sta-&gt;addr);</div><div class='del'>-</div><div class='del'>-	skb-&gt;dev = local-&gt;dev;</div><div class='del'>-</div><div class='del'>-	memset(&amp;rx_stats, 0, sizeof(rx_stats));</div><div class='del'>-	hostap_rx(local-&gt;dev, skb, &amp;rx_stats);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int prism2_ap_get_sta_qual(local_info_t *local, struct sockaddr addr[],</div><div class='del'>-			   struct iw_quality qual[], int buf_size,</div><div class='del'>-			   int aplist)</div><div class='del'>-{</div><div class='del'>-	struct ap_data *ap = local-&gt;ap;</div><div class='del'>-	struct list_head *ptr;</div><div class='del'>-	int count = 0;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	for (ptr = ap-&gt;sta_list.next; ptr != NULL &amp;&amp; ptr != &amp;ap-&gt;sta_list;</div><div class='del'>-	     ptr = ptr-&gt;next) {</div><div class='del'>-		struct sta_info *sta = (struct sta_info *) ptr;</div><div class='del'>-</div><div class='del'>-		if (aplist &amp;&amp; !sta-&gt;ap)</div><div class='del'>-			continue;</div><div class='del'>-		addr[count].sa_family = ARPHRD_ETHER;</div><div class='del'>-		memcpy(addr[count].sa_data, sta-&gt;addr, ETH_ALEN);</div><div class='del'>-		if (sta-&gt;last_rx_silence == 0)</div><div class='del'>-			qual[count].qual = sta-&gt;last_rx_signal &lt; 27 ?</div><div class='del'>-				0 : (sta-&gt;last_rx_signal - 27) * 92 / 127;</div><div class='del'>-		else</div><div class='del'>-			qual[count].qual = sta-&gt;last_rx_signal -</div><div class='del'>-				sta-&gt;last_rx_silence - 35;</div><div class='del'>-		qual[count].level = HFA384X_LEVEL_TO_dBm(sta-&gt;last_rx_signal);</div><div class='del'>-		qual[count].noise = HFA384X_LEVEL_TO_dBm(sta-&gt;last_rx_silence);</div><div class='del'>-		qual[count].updated = sta-&gt;last_rx_updated;</div><div class='del'>-</div><div class='del'>-		sta-&gt;last_rx_updated = IW_QUAL_DBM;</div><div class='del'>-</div><div class='del'>-		count++;</div><div class='del'>-		if (count &gt;= buf_size)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Translate our list of Access Points &amp; Stations to a card independent</div><div class='del'>- * format that the Wireless Tools will understand - Jean II */</div><div class='del'>-int prism2_ap_translate_scan(struct net_device *dev,</div><div class='del'>-			     struct iw_request_info *info, char *buffer)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	struct ap_data *ap;</div><div class='del'>-	struct list_head *ptr;</div><div class='del'>-	struct iw_event iwe;</div><div class='del'>-	char *current_ev = buffer;</div><div class='del'>-	char *end_buf = buffer + IW_SCAN_MAX_DATA;</div><div class='del'>-#if !defined(PRISM2_NO_KERNEL_IEEE80211_MGMT)</div><div class='del'>-	char buf[64];</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-	ap = local-&gt;ap;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	for (ptr = ap-&gt;sta_list.next; ptr != NULL &amp;&amp; ptr != &amp;ap-&gt;sta_list;</div><div class='del'>-	     ptr = ptr-&gt;next) {</div><div class='del'>-		struct sta_info *sta = (struct sta_info *) ptr;</div><div class='del'>-</div><div class='del'>-		/* First entry *MUST* be the AP MAC address */</div><div class='del'>-		memset(&amp;iwe, 0, sizeof(iwe));</div><div class='del'>-		iwe.cmd = SIOCGIWAP;</div><div class='del'>-		iwe.u.ap_addr.sa_family = ARPHRD_ETHER;</div><div class='del'>-		memcpy(iwe.u.ap_addr.sa_data, sta-&gt;addr, ETH_ALEN);</div><div class='del'>-		iwe.len = IW_EV_ADDR_LEN;</div><div class='del'>-		current_ev = iwe_stream_add_event(info, current_ev, end_buf,</div><div class='del'>-						  &amp;iwe, IW_EV_ADDR_LEN);</div><div class='del'>-</div><div class='del'>-		/* Use the mode to indicate if it's a station or</div><div class='del'>-		 * an Access Point */</div><div class='del'>-		memset(&amp;iwe, 0, sizeof(iwe));</div><div class='del'>-		iwe.cmd = SIOCGIWMODE;</div><div class='del'>-		if (sta-&gt;ap)</div><div class='del'>-			iwe.u.mode = IW_MODE_MASTER;</div><div class='del'>-		else</div><div class='del'>-			iwe.u.mode = IW_MODE_INFRA;</div><div class='del'>-		iwe.len = IW_EV_UINT_LEN;</div><div class='del'>-		current_ev = iwe_stream_add_event(info, current_ev, end_buf,</div><div class='del'>-						  &amp;iwe, IW_EV_UINT_LEN);</div><div class='del'>-</div><div class='del'>-		/* Some quality */</div><div class='del'>-		memset(&amp;iwe, 0, sizeof(iwe));</div><div class='del'>-		iwe.cmd = IWEVQUAL;</div><div class='del'>-		if (sta-&gt;last_rx_silence == 0)</div><div class='del'>-			iwe.u.qual.qual = sta-&gt;last_rx_signal &lt; 27 ?</div><div class='del'>-				0 : (sta-&gt;last_rx_signal - 27) * 92 / 127;</div><div class='del'>-		else</div><div class='del'>-			iwe.u.qual.qual = sta-&gt;last_rx_signal -</div><div class='del'>-				sta-&gt;last_rx_silence - 35;</div><div class='del'>-		iwe.u.qual.level = HFA384X_LEVEL_TO_dBm(sta-&gt;last_rx_signal);</div><div class='del'>-		iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta-&gt;last_rx_silence);</div><div class='del'>-		iwe.u.qual.updated = sta-&gt;last_rx_updated;</div><div class='del'>-		iwe.len = IW_EV_QUAL_LEN;</div><div class='del'>-		current_ev = iwe_stream_add_event(info, current_ev, end_buf,</div><div class='del'>-						  &amp;iwe, IW_EV_QUAL_LEN);</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-		if (sta-&gt;ap) {</div><div class='del'>-			memset(&amp;iwe, 0, sizeof(iwe));</div><div class='del'>-			iwe.cmd = SIOCGIWESSID;</div><div class='del'>-			iwe.u.data.length = sta-&gt;u.ap.ssid_len;</div><div class='del'>-			iwe.u.data.flags = 1;</div><div class='del'>-			current_ev = iwe_stream_add_point(info, current_ev,</div><div class='del'>-							  end_buf, &amp;iwe,</div><div class='del'>-							  sta-&gt;u.ap.ssid);</div><div class='del'>-</div><div class='del'>-			memset(&amp;iwe, 0, sizeof(iwe));</div><div class='del'>-			iwe.cmd = SIOCGIWENCODE;</div><div class='del'>-			if (sta-&gt;capability &amp; WLAN_CAPABILITY_PRIVACY)</div><div class='del'>-				iwe.u.data.flags =</div><div class='del'>-					IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;</div><div class='del'>-			else</div><div class='del'>-				iwe.u.data.flags = IW_ENCODE_DISABLED;</div><div class='del'>-			current_ev = iwe_stream_add_point(info, current_ev,</div><div class='del'>-							  end_buf, &amp;iwe,</div><div class='del'>-							  sta-&gt;u.ap.ssid);</div><div class='del'>-</div><div class='del'>-			if (sta-&gt;u.ap.channel &gt; 0 &amp;&amp;</div><div class='del'>-			    sta-&gt;u.ap.channel &lt;= FREQ_COUNT) {</div><div class='del'>-				memset(&amp;iwe, 0, sizeof(iwe));</div><div class='del'>-				iwe.cmd = SIOCGIWFREQ;</div><div class='del'>-				iwe.u.freq.m = freq_list[sta-&gt;u.ap.channel - 1]</div><div class='del'>-					* 100000;</div><div class='del'>-				iwe.u.freq.e = 1;</div><div class='del'>-				current_ev = iwe_stream_add_event(</div><div class='del'>-					info, current_ev, end_buf, &amp;iwe,</div><div class='del'>-					IW_EV_FREQ_LEN);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			memset(&amp;iwe, 0, sizeof(iwe));</div><div class='del'>-			iwe.cmd = IWEVCUSTOM;</div><div class='del'>-			sprintf(buf, "beacon_interval=%d",</div><div class='del'>-				sta-&gt;listen_interval);</div><div class='del'>-			iwe.u.data.length = strlen(buf);</div><div class='del'>-			current_ev = iwe_stream_add_point(info, current_ev,</div><div class='del'>-							  end_buf, &amp;iwe, buf);</div><div class='del'>-		}</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-</div><div class='del'>-		sta-&gt;last_rx_updated = IW_QUAL_DBM;</div><div class='del'>-</div><div class='del'>-		/* To be continued, we should make good use of IWEVCUSTOM */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	return current_ev - buffer;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_hostapd_add_sta(struct ap_data *ap,</div><div class='del'>-				  struct prism2_hostapd_param *param)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(ap, param-&gt;sta_addr);</div><div class='del'>-	if (sta)</div><div class='del'>-		atomic_inc(&amp;sta-&gt;users);</div><div class='del'>-	spin_unlock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	if (sta == NULL) {</div><div class='del'>-		sta = ap_add_sta(ap, param-&gt;sta_addr);</div><div class='del'>-		if (sta == NULL)</div><div class='del'>-			return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(sta-&gt;flags &amp; WLAN_STA_ASSOC) &amp;&amp; !sta-&gt;ap &amp;&amp; sta-&gt;local)</div><div class='del'>-		hostap_event_new_sta(sta-&gt;local-&gt;dev, sta);</div><div class='del'>-</div><div class='del'>-	sta-&gt;flags |= WLAN_STA_AUTH | WLAN_STA_ASSOC;</div><div class='del'>-	sta-&gt;last_rx = jiffies;</div><div class='del'>-	sta-&gt;aid = param-&gt;u.add_sta.aid;</div><div class='del'>-	sta-&gt;capability = param-&gt;u.add_sta.capability;</div><div class='del'>-	sta-&gt;tx_supp_rates = param-&gt;u.add_sta.tx_supp_rates;</div><div class='del'>-	if (sta-&gt;tx_supp_rates &amp; WLAN_RATE_1M)</div><div class='del'>-		sta-&gt;supported_rates[0] = 2;</div><div class='del'>-	if (sta-&gt;tx_supp_rates &amp; WLAN_RATE_2M)</div><div class='del'>-		sta-&gt;supported_rates[1] = 4;</div><div class='del'>-	if (sta-&gt;tx_supp_rates &amp; WLAN_RATE_5M5)</div><div class='del'>-		sta-&gt;supported_rates[2] = 11;</div><div class='del'>-	if (sta-&gt;tx_supp_rates &amp; WLAN_RATE_11M)</div><div class='del'>-		sta-&gt;supported_rates[3] = 22;</div><div class='del'>-	prism2_check_tx_rates(sta);</div><div class='del'>-	atomic_dec(&amp;sta-&gt;users);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_hostapd_remove_sta(struct ap_data *ap,</div><div class='del'>-				     struct prism2_hostapd_param *param)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(ap, param-&gt;sta_addr);</div><div class='del'>-	if (sta) {</div><div class='del'>-		ap_sta_hash_del(ap, sta);</div><div class='del'>-		list_del(&amp;sta-&gt;list);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	if (!sta)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='del'>-	if ((sta-&gt;flags &amp; WLAN_STA_ASSOC) &amp;&amp; !sta-&gt;ap &amp;&amp; sta-&gt;local)</div><div class='del'>-		hostap_event_expired_sta(sta-&gt;local-&gt;dev, sta);</div><div class='del'>-	ap_free_sta(ap, sta);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_hostapd_get_info_sta(struct ap_data *ap,</div><div class='del'>-				       struct prism2_hostapd_param *param)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(ap, param-&gt;sta_addr);</div><div class='del'>-	if (sta)</div><div class='del'>-		atomic_inc(&amp;sta-&gt;users);</div><div class='del'>-	spin_unlock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	if (!sta)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='del'>-	param-&gt;u.get_info_sta.inactive_sec = (jiffies - sta-&gt;last_rx) / HZ;</div><div class='del'>-</div><div class='del'>-	atomic_dec(&amp;sta-&gt;users);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_hostapd_set_flags_sta(struct ap_data *ap,</div><div class='del'>-					struct prism2_hostapd_param *param)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(ap, param-&gt;sta_addr);</div><div class='del'>-	if (sta) {</div><div class='del'>-		sta-&gt;flags |= param-&gt;u.set_flags_sta.flags_or;</div><div class='del'>-		sta-&gt;flags &amp;= param-&gt;u.set_flags_sta.flags_and;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	if (!sta)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_hostapd_sta_clear_stats(struct ap_data *ap,</div><div class='del'>-					  struct prism2_hostapd_param *param)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-	int rate;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(ap, param-&gt;sta_addr);</div><div class='del'>-	if (sta) {</div><div class='del'>-		sta-&gt;rx_packets = sta-&gt;tx_packets = 0;</div><div class='del'>-		sta-&gt;rx_bytes = sta-&gt;tx_bytes = 0;</div><div class='del'>-		for (rate = 0; rate &lt; WLAN_RATE_COUNT; rate++) {</div><div class='del'>-			sta-&gt;tx_count[rate] = 0;</div><div class='del'>-			sta-&gt;rx_count[rate] = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	if (!sta)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int prism2_hostapd(struct ap_data *ap, struct prism2_hostapd_param *param)</div><div class='del'>-{</div><div class='del'>-	switch (param-&gt;cmd) {</div><div class='del'>-	case PRISM2_HOSTAPD_FLUSH:</div><div class='del'>-		ap_control_kickall(ap);</div><div class='del'>-		return 0;</div><div class='del'>-	case PRISM2_HOSTAPD_ADD_STA:</div><div class='del'>-		return prism2_hostapd_add_sta(ap, param);</div><div class='del'>-	case PRISM2_HOSTAPD_REMOVE_STA:</div><div class='del'>-		return prism2_hostapd_remove_sta(ap, param);</div><div class='del'>-	case PRISM2_HOSTAPD_GET_INFO_STA:</div><div class='del'>-		return prism2_hostapd_get_info_sta(ap, param);</div><div class='del'>-	case PRISM2_HOSTAPD_SET_FLAGS_STA:</div><div class='del'>-		return prism2_hostapd_set_flags_sta(ap, param);</div><div class='del'>-	case PRISM2_HOSTAPD_STA_CLEAR_STATS:</div><div class='del'>-		return prism2_hostapd_sta_clear_stats(ap, param);</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_WARNING "prism2_hostapd: unknown cmd=%d\n",</div><div class='del'>-		       param-&gt;cmd);</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Update station info for host-based TX rate control and return current</div><div class='del'>- * TX rate */</div><div class='del'>-static int ap_update_sta_tx_rate(struct sta_info *sta, struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	int ret = sta-&gt;tx_rate;</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	sta-&gt;tx_count[sta-&gt;tx_rate_idx]++;</div><div class='del'>-	sta-&gt;tx_since_last_failure++;</div><div class='del'>-	sta-&gt;tx_consecutive_exc = 0;</div><div class='del'>-	if (sta-&gt;tx_since_last_failure &gt;= WLAN_RATE_UPDATE_COUNT &amp;&amp;</div><div class='del'>-	    sta-&gt;tx_rate_idx &lt; sta-&gt;tx_max_rate) {</div><div class='del'>-		/* use next higher rate */</div><div class='del'>-		int old_rate, new_rate;</div><div class='del'>-		old_rate = new_rate = sta-&gt;tx_rate_idx;</div><div class='del'>-		while (new_rate &lt; sta-&gt;tx_max_rate) {</div><div class='del'>-			new_rate++;</div><div class='del'>-			if (ap_tx_rate_ok(new_rate, sta, local)) {</div><div class='del'>-				sta-&gt;tx_rate_idx = new_rate;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (old_rate != sta-&gt;tx_rate_idx) {</div><div class='del'>-			switch (sta-&gt;tx_rate_idx) {</div><div class='del'>-			case 0: sta-&gt;tx_rate = 10; break;</div><div class='del'>-			case 1: sta-&gt;tx_rate = 20; break;</div><div class='del'>-			case 2: sta-&gt;tx_rate = 55; break;</div><div class='del'>-			case 3: sta-&gt;tx_rate = 110; break;</div><div class='del'>-			default: sta-&gt;tx_rate = 0; break;</div><div class='del'>-			}</div><div class='del'>-			PDEBUG(DEBUG_AP, "%s: STA %pM TX rate raised to %d\n",</div><div class='del'>-			       dev-&gt;name, sta-&gt;addr, sta-&gt;tx_rate);</div><div class='del'>-		}</div><div class='del'>-		sta-&gt;tx_since_last_failure = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only from software IRQ. Called for each TX frame prior possible</div><div class='del'>- * encryption and transmit. */</div><div class='del'>-ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *sta = NULL;</div><div class='del'>-	struct sk_buff *skb = tx-&gt;skb;</div><div class='del'>-	int set_tim, ret;</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-	struct hostap_skb_tx_data *meta;</div><div class='del'>-</div><div class='del'>-	meta = (struct hostap_skb_tx_data *) skb-&gt;cb;</div><div class='del'>-	ret = AP_TX_CONTINUE;</div><div class='del'>-	if (local-&gt;ap == NULL || skb-&gt;len &lt; 10 ||</div><div class='del'>-	    meta-&gt;iface-&gt;type == HOSTAP_INTERFACE_STA)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (hdr-&gt;addr1[0] &amp; 0x01) {</div><div class='del'>-		/* broadcast/multicast frame - no AP related processing */</div><div class='del'>-		if (local-&gt;ap-&gt;num_sta &lt;= 0)</div><div class='del'>-			ret = AP_TX_DROP;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* unicast packet - check whether destination STA is associated */</div><div class='del'>-	spin_lock(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(local-&gt;ap, hdr-&gt;addr1);</div><div class='del'>-	if (sta)</div><div class='del'>-		atomic_inc(&amp;sta-&gt;users);</div><div class='del'>-	spin_unlock(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	if (local-&gt;iw_mode == IW_MODE_MASTER &amp;&amp; sta == NULL &amp;&amp;</div><div class='del'>-	    !(meta-&gt;flags &amp; HOSTAP_TX_FLAGS_WDS) &amp;&amp;</div><div class='del'>-	    meta-&gt;iface-&gt;type != HOSTAP_INTERFACE_MASTER &amp;&amp;</div><div class='del'>-	    meta-&gt;iface-&gt;type != HOSTAP_INTERFACE_AP) {</div><div class='del'>-#if 0</div><div class='del'>-		/* This can happen, e.g., when wlan0 is added to a bridge and</div><div class='del'>-		 * bridging code does not know which port is the correct target</div><div class='del'>-		 * for a unicast frame. In this case, the packet is send to all</div><div class='del'>-		 * ports of the bridge. Since this is a valid scenario, do not</div><div class='del'>-		 * print out any errors here. */</div><div class='del'>-		if (net_ratelimit()) {</div><div class='del'>-			printk(KERN_DEBUG "AP: drop packet to non-associated "</div><div class='del'>-			       "STA %pM\n", hdr-&gt;addr1);</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-		local-&gt;ap-&gt;tx_drop_nonassoc++;</div><div class='del'>-		ret = AP_TX_DROP;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sta == NULL)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (!(sta-&gt;flags &amp; WLAN_STA_AUTHORIZED))</div><div class='del'>-		ret = AP_TX_CONTINUE_NOT_AUTHORIZED;</div><div class='del'>-</div><div class='del'>-	/* Set tx_rate if using host-based TX rate control */</div><div class='del'>-	if (!local-&gt;fw_tx_rate_control)</div><div class='del'>-		local-&gt;ap-&gt;last_tx_rate = meta-&gt;rate =</div><div class='del'>-			ap_update_sta_tx_rate(sta, local-&gt;dev);</div><div class='del'>-</div><div class='del'>-	if (local-&gt;iw_mode != IW_MODE_MASTER)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (!(sta-&gt;flags &amp; WLAN_STA_PS))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (meta-&gt;flags &amp; HOSTAP_TX_FLAGS_ADD_MOREDATA) {</div><div class='del'>-		/* indicate to STA that more frames follow */</div><div class='del'>-		hdr-&gt;frame_control |=</div><div class='del'>-			cpu_to_le16(IEEE80211_FCTL_MOREDATA);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (meta-&gt;flags &amp; HOSTAP_TX_FLAGS_BUFFERED_FRAME) {</div><div class='del'>-		/* packet was already buffered and now send due to</div><div class='del'>-		 * PS poll, so do not rebuffer it */</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (skb_queue_len(&amp;sta-&gt;tx_buf) &gt;= STA_MAX_TX_BUFFER) {</div><div class='del'>-		PDEBUG(DEBUG_PS, "%s: No more space in STA (%pM)'s"</div><div class='del'>-		       "PS mode buffer\n",</div><div class='del'>-		       local-&gt;dev-&gt;name, sta-&gt;addr);</div><div class='del'>-		/* Make sure that TIM is set for the station (it might not be</div><div class='del'>-		 * after AP wlan hw reset). */</div><div class='del'>-		/* FIX: should fix hw reset to restore bits based on STA</div><div class='del'>-		 * buffer state.. */</div><div class='del'>-		hostap_set_tim(local, sta-&gt;aid, 1);</div><div class='del'>-		sta-&gt;flags |= WLAN_STA_TIM;</div><div class='del'>-		ret = AP_TX_DROP;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* STA in PS mode, buffer frame for later delivery */</div><div class='del'>-	set_tim = skb_queue_empty(&amp;sta-&gt;tx_buf);</div><div class='del'>-	skb_queue_tail(&amp;sta-&gt;tx_buf, skb);</div><div class='del'>-	/* FIX: could save RX time to skb and expire buffered frames after</div><div class='del'>-	 * some time if STA does not poll for them */</div><div class='del'>-</div><div class='del'>-	if (set_tim) {</div><div class='del'>-		if (sta-&gt;flags &amp; WLAN_STA_TIM)</div><div class='del'>-			PDEBUG(DEBUG_PS2, "Re-setting TIM for aid %d\n",</div><div class='del'>-			       sta-&gt;aid);</div><div class='del'>-		hostap_set_tim(local, sta-&gt;aid, 1);</div><div class='del'>-		sta-&gt;flags |= WLAN_STA_TIM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = AP_TX_BUFFERED;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	if (sta != NULL) {</div><div class='del'>-		if (ret == AP_TX_CONTINUE ||</div><div class='del'>-		    ret == AP_TX_CONTINUE_NOT_AUTHORIZED) {</div><div class='del'>-			sta-&gt;tx_packets++;</div><div class='del'>-			sta-&gt;tx_bytes += skb-&gt;len;</div><div class='del'>-			sta-&gt;last_tx = jiffies;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((ret == AP_TX_CONTINUE ||</div><div class='del'>-		     ret == AP_TX_CONTINUE_NOT_AUTHORIZED) &amp;&amp;</div><div class='del'>-		    sta-&gt;crypt &amp;&amp; tx-&gt;host_encrypt) {</div><div class='del'>-			tx-&gt;crypt = sta-&gt;crypt;</div><div class='del'>-			tx-&gt;sta_ptr = sta; /* hostap_handle_sta_release() will</div><div class='del'>-					    * be called to release sta info</div><div class='del'>-					    * later */</div><div class='del'>-		} else</div><div class='del'>-			atomic_dec(&amp;sta-&gt;users);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void hostap_handle_sta_release(void *ptr)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *sta = ptr;</div><div class='del'>-	atomic_dec(&amp;sta-&gt;users);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-	struct hostap_skb_tx_data *meta;</div><div class='del'>-</div><div class='del'>-	hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-	meta = (struct hostap_skb_tx_data *) skb-&gt;cb;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(local-&gt;ap, hdr-&gt;addr1);</div><div class='del'>-	if (!sta) {</div><div class='del'>-		spin_unlock(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-		PDEBUG(DEBUG_AP, "%s: Could not find STA %pM"</div><div class='del'>-		       " for this TX error (@%lu)\n",</div><div class='del'>-		       local-&gt;dev-&gt;name, hdr-&gt;addr1, jiffies);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sta-&gt;tx_since_last_failure = 0;</div><div class='del'>-	sta-&gt;tx_consecutive_exc++;</div><div class='del'>-</div><div class='del'>-	if (sta-&gt;tx_consecutive_exc &gt;= WLAN_RATE_DECREASE_THRESHOLD &amp;&amp;</div><div class='del'>-	    sta-&gt;tx_rate_idx &gt; 0 &amp;&amp; meta-&gt;rate &lt;= sta-&gt;tx_rate) {</div><div class='del'>-		/* use next lower rate */</div><div class='del'>-		int old, rate;</div><div class='del'>-		old = rate = sta-&gt;tx_rate_idx;</div><div class='del'>-		while (rate &gt; 0) {</div><div class='del'>-			rate--;</div><div class='del'>-			if (ap_tx_rate_ok(rate, sta, local)) {</div><div class='del'>-				sta-&gt;tx_rate_idx = rate;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (old != sta-&gt;tx_rate_idx) {</div><div class='del'>-			switch (sta-&gt;tx_rate_idx) {</div><div class='del'>-			case 0: sta-&gt;tx_rate = 10; break;</div><div class='del'>-			case 1: sta-&gt;tx_rate = 20; break;</div><div class='del'>-			case 2: sta-&gt;tx_rate = 55; break;</div><div class='del'>-			case 3: sta-&gt;tx_rate = 110; break;</div><div class='del'>-			default: sta-&gt;tx_rate = 0; break;</div><div class='del'>-			}</div><div class='del'>-			PDEBUG(DEBUG_AP,</div><div class='del'>-			       "%s: STA %pM TX rate lowered to %d\n",</div><div class='del'>-			       local-&gt;dev-&gt;name, sta-&gt;addr, sta-&gt;tx_rate);</div><div class='del'>-		}</div><div class='del'>-		sta-&gt;tx_consecutive_exc = 0;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void hostap_update_sta_ps2(local_info_t *local, struct sta_info *sta,</div><div class='del'>-				  int pwrmgt, int type, int stype)</div><div class='del'>-{</div><div class='del'>-	if (pwrmgt &amp;&amp; !(sta-&gt;flags &amp; WLAN_STA_PS)) {</div><div class='del'>-		sta-&gt;flags |= WLAN_STA_PS;</div><div class='del'>-		PDEBUG(DEBUG_PS2, "STA %pM changed to use PS "</div><div class='del'>-		       "mode (type=0x%02X, stype=0x%02X)\n",</div><div class='del'>-		       sta-&gt;addr, type &gt;&gt; 2, stype &gt;&gt; 4);</div><div class='del'>-	} else if (!pwrmgt &amp;&amp; (sta-&gt;flags &amp; WLAN_STA_PS)) {</div><div class='del'>-		sta-&gt;flags &amp;= ~WLAN_STA_PS;</div><div class='del'>-		PDEBUG(DEBUG_PS2, "STA %pM changed to not use "</div><div class='del'>-		       "PS mode (type=0x%02X, stype=0x%02X)\n",</div><div class='del'>-		       sta-&gt;addr, type &gt;&gt; 2, stype &gt;&gt; 4);</div><div class='del'>-		if (type != IEEE80211_FTYPE_CTL ||</div><div class='del'>-		    stype != IEEE80211_STYPE_PSPOLL)</div><div class='del'>-			schedule_packet_send(local, sta);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ). Called for each RX frame to update</div><div class='del'>- * STA power saving state. pwrmgt is a flag from 802.11 frame_control field. */</div><div class='del'>-int hostap_update_sta_ps(local_info_t *local, struct ieee80211_hdr *hdr)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-	u16 fc;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(local-&gt;ap, hdr-&gt;addr2);</div><div class='del'>-	if (sta)</div><div class='del'>-		atomic_inc(&amp;sta-&gt;users);</div><div class='del'>-	spin_unlock(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	if (!sta)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	fc = le16_to_cpu(hdr-&gt;frame_control);</div><div class='del'>-	hostap_update_sta_ps2(local, sta, fc &amp; IEEE80211_FCTL_PM,</div><div class='del'>-			      fc &amp; IEEE80211_FCTL_FTYPE,</div><div class='del'>-			      fc &amp; IEEE80211_FCTL_STYPE);</div><div class='del'>-</div><div class='del'>-	atomic_dec(&amp;sta-&gt;users);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ). Called for each RX frame after</div><div class='del'>- * getting RX header and payload from hardware. */</div><div class='del'>-ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev,</div><div class='del'>-			       struct sk_buff *skb,</div><div class='del'>-			       struct hostap_80211_rx_status *rx_stats,</div><div class='del'>-			       int wds)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-	u16 fc, type, stype;</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;ap == NULL)</div><div class='del'>-		return AP_RX_CONTINUE;</div><div class='del'>-</div><div class='del'>-	hdr = (struct ieee80211_hdr *) skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	fc = le16_to_cpu(hdr-&gt;frame_control);</div><div class='del'>-	type = fc &amp; IEEE80211_FCTL_FTYPE;</div><div class='del'>-	stype = fc &amp; IEEE80211_FCTL_STYPE;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(local-&gt;ap, hdr-&gt;addr2);</div><div class='del'>-	if (sta)</div><div class='del'>-		atomic_inc(&amp;sta-&gt;users);</div><div class='del'>-	spin_unlock(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	if (sta &amp;&amp; !(sta-&gt;flags &amp; WLAN_STA_AUTHORIZED))</div><div class='del'>-		ret = AP_RX_CONTINUE_NOT_AUTHORIZED;</div><div class='del'>-	else</div><div class='del'>-		ret = AP_RX_CONTINUE;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (fc &amp; IEEE80211_FCTL_TODS) {</div><div class='del'>-		if (!wds &amp;&amp; (sta == NULL || !(sta-&gt;flags &amp; WLAN_STA_ASSOC))) {</div><div class='del'>-			if (local-&gt;hostapd) {</div><div class='del'>-				prism2_rx_80211(local-&gt;apdev, skb, rx_stats,</div><div class='del'>-						PRISM2_RX_NON_ASSOC);</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-			} else {</div><div class='del'>-				printk(KERN_DEBUG "%s: dropped received packet"</div><div class='del'>-				       " from non-associated STA %pM"</div><div class='del'>-				       " (type=0x%02x, subtype=0x%02x)\n",</div><div class='del'>-				       dev-&gt;name, hdr-&gt;addr2,</div><div class='del'>-				       type &gt;&gt; 2, stype &gt;&gt; 4);</div><div class='del'>-				hostap_rx(dev, skb, rx_stats);</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-			}</div><div class='del'>-			ret = AP_RX_EXIT;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	} else if (fc &amp; IEEE80211_FCTL_FROMDS) {</div><div class='del'>-		if (!wds) {</div><div class='del'>-			/* FromDS frame - not for us; probably</div><div class='del'>-			 * broadcast/multicast in another BSS - drop */</div><div class='del'>-			if (ether_addr_equal(hdr-&gt;addr1, dev-&gt;dev_addr)) {</div><div class='del'>-				printk(KERN_DEBUG "Odd.. FromDS packet "</div><div class='del'>-				       "received with own BSSID\n");</div><div class='del'>-				hostap_dump_rx_80211(dev-&gt;name, skb, rx_stats);</div><div class='del'>-			}</div><div class='del'>-			ret = AP_RX_DROP;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	} else if (stype == IEEE80211_STYPE_NULLFUNC &amp;&amp; sta == NULL &amp;&amp;</div><div class='del'>-		   ether_addr_equal(hdr-&gt;addr1, dev-&gt;dev_addr)) {</div><div class='del'>-</div><div class='del'>-		if (local-&gt;hostapd) {</div><div class='del'>-			prism2_rx_80211(local-&gt;apdev, skb, rx_stats,</div><div class='del'>-					PRISM2_RX_NON_ASSOC);</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-		} else {</div><div class='del'>-			/* At least Lucent f/w seems to send data::nullfunc</div><div class='del'>-			 * frames with no ToDS flag when the current AP returns</div><div class='del'>-			 * after being unavailable for some time. Speed up</div><div class='del'>-			 * re-association by informing the station about it not</div><div class='del'>-			 * being associated. */</div><div class='del'>-			printk(KERN_DEBUG "%s: rejected received nullfunc frame"</div><div class='del'>-			       " without ToDS from not associated STA %pM\n",</div><div class='del'>-			       dev-&gt;name, hdr-&gt;addr2);</div><div class='del'>-			hostap_rx(dev, skb, rx_stats);</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-		}</div><div class='del'>-		ret = AP_RX_EXIT;</div><div class='del'>-		goto out;</div><div class='del'>-	} else if (stype == IEEE80211_STYPE_NULLFUNC) {</div><div class='del'>-		/* At least Lucent cards seem to send periodic nullfunc</div><div class='del'>-		 * frames with ToDS. Let these through to update SQ</div><div class='del'>-		 * stats and PS state. Nullfunc frames do not contain</div><div class='del'>-		 * any data and they will be dropped below. */</div><div class='del'>-	} else {</div><div class='del'>-		/* If BSSID (Addr3) is foreign, this frame is a normal</div><div class='del'>-		 * broadcast frame from an IBSS network. Drop it silently.</div><div class='del'>-		 * If BSSID is own, report the dropping of this frame. */</div><div class='del'>-		if (ether_addr_equal(hdr-&gt;addr3, dev-&gt;dev_addr)) {</div><div class='del'>-			printk(KERN_DEBUG "%s: dropped received packet from %pM"</div><div class='del'>-			       " with no ToDS flag "</div><div class='del'>-			       "(type=0x%02x, subtype=0x%02x)\n", dev-&gt;name,</div><div class='del'>-			       hdr-&gt;addr2, type &gt;&gt; 2, stype &gt;&gt; 4);</div><div class='del'>-			hostap_dump_rx_80211(dev-&gt;name, skb, rx_stats);</div><div class='del'>-		}</div><div class='del'>-		ret = AP_RX_DROP;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sta) {</div><div class='del'>-		hostap_update_sta_ps2(local, sta, fc &amp; IEEE80211_FCTL_PM,</div><div class='del'>-				      type, stype);</div><div class='del'>-</div><div class='del'>-		sta-&gt;rx_packets++;</div><div class='del'>-		sta-&gt;rx_bytes += skb-&gt;len;</div><div class='del'>-		sta-&gt;last_rx = jiffies;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;ap-&gt;nullfunc_ack &amp;&amp; stype == IEEE80211_STYPE_NULLFUNC &amp;&amp;</div><div class='del'>-	    fc &amp; IEEE80211_FCTL_TODS) {</div><div class='del'>-		if (local-&gt;hostapd) {</div><div class='del'>-			prism2_rx_80211(local-&gt;apdev, skb, rx_stats,</div><div class='del'>-					PRISM2_RX_NULLFUNC_ACK);</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-		} else {</div><div class='del'>-			/* some STA f/w's seem to require control::ACK frame</div><div class='del'>-			 * for data::nullfunc, but Prism2 f/w 0.8.0 (at least</div><div class='del'>-			 * from Compaq) does not send this.. Try to generate</div><div class='del'>-			 * ACK for these frames from the host driver to make</div><div class='del'>-			 * power saving work with, e.g., Lucent WaveLAN f/w */</div><div class='del'>-			hostap_rx(dev, skb, rx_stats);</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-		}</div><div class='del'>-		ret = AP_RX_EXIT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	if (sta)</div><div class='del'>-		atomic_dec(&amp;sta-&gt;users);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-int hostap_handle_sta_crypto(local_info_t *local,</div><div class='del'>-			     struct ieee80211_hdr *hdr,</div><div class='del'>-			     struct lib80211_crypt_data **crypt,</div><div class='del'>-			     void **sta_ptr)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(local-&gt;ap, hdr-&gt;addr2);</div><div class='del'>-	if (sta)</div><div class='del'>-		atomic_inc(&amp;sta-&gt;users);</div><div class='del'>-	spin_unlock(&amp;local-&gt;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	if (!sta)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (sta-&gt;crypt) {</div><div class='del'>-		*crypt = sta-&gt;crypt;</div><div class='del'>-		*sta_ptr = sta;</div><div class='del'>-		/* hostap_handle_sta_release() will be called to release STA</div><div class='del'>-		 * info */</div><div class='del'>-	} else</div><div class='del'>-		atomic_dec(&amp;sta-&gt;users);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-int hostap_is_sta_assoc(struct ap_data *ap, u8 *sta_addr)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(ap, sta_addr);</div><div class='del'>-	if (sta != NULL &amp;&amp; (sta-&gt;flags &amp; WLAN_STA_ASSOC) &amp;&amp; !sta-&gt;ap)</div><div class='del'>-		ret = 1;</div><div class='del'>-	spin_unlock(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-int hostap_is_sta_authorized(struct ap_data *ap, u8 *sta_addr)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(ap, sta_addr);</div><div class='del'>-	if (sta != NULL &amp;&amp; (sta-&gt;flags &amp; WLAN_STA_ASSOC) &amp;&amp; !sta-&gt;ap &amp;&amp;</div><div class='del'>-	    ((sta-&gt;flags &amp; WLAN_STA_AUTHORIZED) ||</div><div class='del'>-	     ap-&gt;local-&gt;ieee_802_1x == 0))</div><div class='del'>-		ret = 1;</div><div class='del'>-	spin_unlock(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-int hostap_add_sta(struct ap_data *ap, u8 *sta_addr)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-	int ret = 1;</div><div class='del'>-</div><div class='del'>-	if (!ap)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(ap, sta_addr);</div><div class='del'>-	if (sta)</div><div class='del'>-		ret = 0;</div><div class='del'>-	spin_unlock(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	if (ret == 1) {</div><div class='del'>-		sta = ap_add_sta(ap, sta_addr);</div><div class='del'>-		if (!sta)</div><div class='del'>-			return -1;</div><div class='del'>-		sta-&gt;flags = WLAN_STA_AUTH | WLAN_STA_ASSOC;</div><div class='del'>-		sta-&gt;ap = 1;</div><div class='del'>-		memset(sta-&gt;supported_rates, 0, sizeof(sta-&gt;supported_rates));</div><div class='del'>-		/* No way of knowing which rates are supported since we did not</div><div class='del'>-		 * get supported rates element from beacon/assoc req. Assume</div><div class='del'>-		 * that remote end supports all 802.11b rates. */</div><div class='del'>-		sta-&gt;supported_rates[0] = 0x82;</div><div class='del'>-		sta-&gt;supported_rates[1] = 0x84;</div><div class='del'>-		sta-&gt;supported_rates[2] = 0x0b;</div><div class='del'>-		sta-&gt;supported_rates[3] = 0x16;</div><div class='del'>-		sta-&gt;tx_supp_rates = WLAN_RATE_1M | WLAN_RATE_2M |</div><div class='del'>-			WLAN_RATE_5M5 | WLAN_RATE_11M;</div><div class='del'>-		sta-&gt;tx_rate = 110;</div><div class='del'>-		sta-&gt;tx_max_rate = sta-&gt;tx_rate_idx = 3;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-int hostap_update_rx_stats(struct ap_data *ap,</div><div class='del'>-			   struct ieee80211_hdr *hdr,</div><div class='del'>-			   struct hostap_80211_rx_status *rx_stats)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-</div><div class='del'>-	if (!ap)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(ap, hdr-&gt;addr2);</div><div class='del'>-	if (sta) {</div><div class='del'>-		sta-&gt;last_rx_silence = rx_stats-&gt;noise;</div><div class='del'>-		sta-&gt;last_rx_signal = rx_stats-&gt;signal;</div><div class='del'>-		sta-&gt;last_rx_rate = rx_stats-&gt;rate;</div><div class='del'>-		sta-&gt;last_rx_updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;</div><div class='del'>-		if (rx_stats-&gt;rate == 10)</div><div class='del'>-			sta-&gt;rx_count[0]++;</div><div class='del'>-		else if (rx_stats-&gt;rate == 20)</div><div class='del'>-			sta-&gt;rx_count[1]++;</div><div class='del'>-		else if (rx_stats-&gt;rate == 55)</div><div class='del'>-			sta-&gt;rx_count[2]++;</div><div class='del'>-		else if (rx_stats-&gt;rate == 110)</div><div class='del'>-			sta-&gt;rx_count[3]++;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	return sta ? 0 : -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void hostap_update_rates(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-	struct ap_data *ap = local-&gt;ap;</div><div class='del'>-</div><div class='del'>-	if (!ap)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-	list_for_each_entry(sta, &amp;ap-&gt;sta_list, list) {</div><div class='del'>-		prism2_check_tx_rates(sta);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void * ap_crypt_get_ptrs(struct ap_data *ap, u8 *addr, int permanent,</div><div class='del'>-			 struct lib80211_crypt_data ***crypt)</div><div class='del'>-{</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-	sta = ap_get_sta(ap, addr);</div><div class='del'>-	if (sta)</div><div class='del'>-		atomic_inc(&amp;sta-&gt;users);</div><div class='del'>-	spin_unlock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	if (!sta &amp;&amp; permanent)</div><div class='del'>-		sta = ap_add_sta(ap, addr);</div><div class='del'>-</div><div class='del'>-	if (!sta)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (permanent)</div><div class='del'>-		sta-&gt;flags |= WLAN_STA_PERM;</div><div class='del'>-</div><div class='del'>-	*crypt = &amp;sta-&gt;crypt;</div><div class='del'>-</div><div class='del'>-	return sta;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void hostap_add_wds_links(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	struct ap_data *ap = local-&gt;ap;</div><div class='del'>-	struct sta_info *sta;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-	list_for_each_entry(sta, &amp;ap-&gt;sta_list, list) {</div><div class='del'>-		if (sta-&gt;ap)</div><div class='del'>-			hostap_wds_link_oper(local, sta-&gt;addr, WDS_ADD);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_bh(&amp;ap-&gt;sta_table_lock);</div><div class='del'>-</div><div class='del'>-	schedule_work(&amp;local-&gt;ap-&gt;wds_oper_queue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void hostap_wds_link_oper(local_info_t *local, u8 *addr, wds_oper_type type)</div><div class='del'>-{</div><div class='del'>-	struct wds_oper_data *entry;</div><div class='del'>-</div><div class='del'>-	entry = kmalloc(sizeof(*entry), GFP_ATOMIC);</div><div class='del'>-	if (!entry)</div><div class='del'>-		return;</div><div class='del'>-	memcpy(entry-&gt;addr, addr, ETH_ALEN);</div><div class='del'>-	entry-&gt;type = type;</div><div class='del'>-	spin_lock_bh(&amp;local-&gt;lock);</div><div class='del'>-	entry-&gt;next = local-&gt;ap-&gt;wds_oper_entries;</div><div class='del'>-	local-&gt;ap-&gt;wds_oper_entries = entry;</div><div class='del'>-	spin_unlock_bh(&amp;local-&gt;lock);</div><div class='del'>-</div><div class='del'>-	schedule_work(&amp;local-&gt;ap-&gt;wds_oper_queue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(hostap_init_data);</div><div class='del'>-EXPORT_SYMBOL(hostap_init_ap_proc);</div><div class='del'>-EXPORT_SYMBOL(hostap_free_data);</div><div class='del'>-EXPORT_SYMBOL(hostap_check_sta_fw_version);</div><div class='del'>-EXPORT_SYMBOL(hostap_handle_sta_tx_exc);</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/hostap/hostap_ap.h b/drivers/net/wireless/intersil/hostap/hostap_ap.h<br/>deleted file mode 100644<br/>index b7ac9e2f1a39..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/hostap/hostap_ap.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_ap.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,264 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef HOSTAP_AP_H</div><div class='del'>-#define HOSTAP_AP_H</div><div class='del'>-</div><div class='del'>-#include "hostap_80211.h"</div><div class='del'>-</div><div class='del'>-/* AP data structures for STAs */</div><div class='del'>-</div><div class='del'>-/* maximum number of frames to buffer per STA */</div><div class='del'>-#define STA_MAX_TX_BUFFER 32</div><div class='del'>-</div><div class='del'>-/* STA flags */</div><div class='del'>-#define WLAN_STA_AUTH BIT(0)</div><div class='del'>-#define WLAN_STA_ASSOC BIT(1)</div><div class='del'>-#define WLAN_STA_PS BIT(2)</div><div class='del'>-#define WLAN_STA_TIM BIT(3) /* TIM bit is on for PS stations */</div><div class='del'>-#define WLAN_STA_PERM BIT(4) /* permanent; do not remove entry on expiration */</div><div class='del'>-#define WLAN_STA_AUTHORIZED BIT(5) /* If 802.1X is used, this flag is</div><div class='del'>-				    * controlling whether STA is authorized to</div><div class='del'>-				    * send and receive non-IEEE 802.1X frames</div><div class='del'>-				    */</div><div class='del'>-#define WLAN_STA_PENDING_POLL BIT(6) /* pending activity poll not ACKed */</div><div class='del'>-</div><div class='del'>-#define WLAN_RATE_1M BIT(0)</div><div class='del'>-#define WLAN_RATE_2M BIT(1)</div><div class='del'>-#define WLAN_RATE_5M5 BIT(2)</div><div class='del'>-#define WLAN_RATE_11M BIT(3)</div><div class='del'>-#define WLAN_RATE_COUNT 4</div><div class='del'>-</div><div class='del'>-/* Maximum size of Supported Rates info element. IEEE 802.11 has a limit of 8,</div><div class='del'>- * but some pre-standard IEEE 802.11g products use longer elements. */</div><div class='del'>-#define WLAN_SUPP_RATES_MAX 32</div><div class='del'>-</div><div class='del'>-/* Try to increase TX rate after # successfully sent consecutive packets */</div><div class='del'>-#define WLAN_RATE_UPDATE_COUNT 50</div><div class='del'>-</div><div class='del'>-/* Decrease TX rate after # consecutive dropped packets */</div><div class='del'>-#define WLAN_RATE_DECREASE_THRESHOLD 2</div><div class='del'>-</div><div class='del'>-struct sta_info {</div><div class='del'>-	struct list_head list;</div><div class='del'>-	struct sta_info *hnext; /* next entry in hash table list */</div><div class='del'>-	atomic_t users; /* number of users (do not remove if &gt; 0) */</div><div class='del'>-	struct proc_dir_entry *proc;</div><div class='del'>-</div><div class='del'>-	u8 addr[6];</div><div class='del'>-	u16 aid; /* STA's unique AID (1 .. 2007) or 0 if not yet assigned */</div><div class='del'>-	u32 flags;</div><div class='del'>-	u16 capability;</div><div class='del'>-	u16 listen_interval; /* or beacon_int for APs */</div><div class='del'>-	u8 supported_rates[WLAN_SUPP_RATES_MAX];</div><div class='del'>-</div><div class='del'>-	unsigned long last_auth;</div><div class='del'>-	unsigned long last_assoc;</div><div class='del'>-	unsigned long last_rx;</div><div class='del'>-	unsigned long last_tx;</div><div class='del'>-	unsigned long rx_packets, tx_packets;</div><div class='del'>-	unsigned long rx_bytes, tx_bytes;</div><div class='del'>-	struct sk_buff_head tx_buf;</div><div class='del'>-	/* FIX: timeout buffers with an expiry time somehow derived from</div><div class='del'>-	 * listen_interval */</div><div class='del'>-</div><div class='del'>-	s8 last_rx_silence; /* Noise in dBm */</div><div class='del'>-	s8 last_rx_signal; /* Signal strength in dBm */</div><div class='del'>-	u8 last_rx_rate; /* TX rate in 0.1 Mbps */</div><div class='del'>-	u8 last_rx_updated; /* IWSPY's struct iw_quality::updated */</div><div class='del'>-</div><div class='del'>-	u8 tx_supp_rates; /* bit field of supported TX rates */</div><div class='del'>-	u8 tx_rate; /* current TX rate (in 0.1 Mbps) */</div><div class='del'>-	u8 tx_rate_idx; /* current TX rate (WLAN_RATE_*) */</div><div class='del'>-	u8 tx_max_rate; /* max TX rate (WLAN_RATE_*) */</div><div class='del'>-	u32 tx_count[WLAN_RATE_COUNT]; /* number of frames sent (per rate) */</div><div class='del'>-	u32 rx_count[WLAN_RATE_COUNT]; /* number of frames received (per rate)</div><div class='del'>-					*/</div><div class='del'>-	u32 tx_since_last_failure;</div><div class='del'>-	u32 tx_consecutive_exc;</div><div class='del'>-</div><div class='del'>-	struct lib80211_crypt_data *crypt;</div><div class='del'>-</div><div class='del'>-	int ap; /* whether this station is an AP */</div><div class='del'>-</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-	union {</div><div class='del'>-		struct {</div><div class='del'>-			char *challenge; /* shared key authentication</div><div class='del'>-					  * challenge */</div><div class='del'>-		} sta;</div><div class='del'>-		struct {</div><div class='del'>-			int ssid_len;</div><div class='del'>-			unsigned char ssid[MAX_SSID_LEN + 1]; /* AP's ssid */</div><div class='del'>-			int channel;</div><div class='del'>-			unsigned long last_beacon; /* last RX beacon time */</div><div class='del'>-		} ap;</div><div class='del'>-	} u;</div><div class='del'>-</div><div class='del'>-	struct timer_list timer;</div><div class='del'>-	enum { STA_NULLFUNC = 0, STA_DISASSOC, STA_DEAUTH } timeout_next;</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define MAX_STA_COUNT 1024</div><div class='del'>-</div><div class='del'>-/* Maximum number of AIDs to use for STAs; must be 2007 or lower</div><div class='del'>- * (8802.11 limitation) */</div><div class='del'>-#define MAX_AID_TABLE_SIZE 128</div><div class='del'>-</div><div class='del'>-#define STA_HASH_SIZE 256</div><div class='del'>-#define STA_HASH(sta) (sta[5])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Default value for maximum station inactivity. After AP_MAX_INACTIVITY_SEC</div><div class='del'>- * has passed since last received frame from the station, a nullfunc data</div><div class='del'>- * frame is sent to the station. If this frame is not acknowledged and no other</div><div class='del'>- * frames have been received, the station will be disassociated after</div><div class='del'>- * AP_DISASSOC_DELAY. Similarly, a the station will be deauthenticated after</div><div class='del'>- * AP_DEAUTH_DELAY. AP_TIMEOUT_RESOLUTION is the resolution that is used with</div><div class='del'>- * max inactivity timer. */</div><div class='del'>-#define AP_MAX_INACTIVITY_SEC (5 * 60)</div><div class='del'>-#define AP_DISASSOC_DELAY (HZ)</div><div class='del'>-#define AP_DEAUTH_DELAY (HZ)</div><div class='del'>-</div><div class='del'>-/* ap_policy: whether to accept frames to/from other APs/IBSS */</div><div class='del'>-typedef enum {</div><div class='del'>-	AP_OTHER_AP_SKIP_ALL = 0,</div><div class='del'>-	AP_OTHER_AP_SAME_SSID = 1,</div><div class='del'>-	AP_OTHER_AP_ALL = 2,</div><div class='del'>-	AP_OTHER_AP_EVEN_IBSS = 3</div><div class='del'>-} ap_policy_enum;</div><div class='del'>-</div><div class='del'>-#define PRISM2_AUTH_OPEN BIT(0)</div><div class='del'>-#define PRISM2_AUTH_SHARED_KEY BIT(1)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* MAC address-based restrictions */</div><div class='del'>-struct mac_entry {</div><div class='del'>-	struct list_head list;</div><div class='del'>-	u8 addr[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct mac_restrictions {</div><div class='del'>-	enum { MAC_POLICY_OPEN = 0, MAC_POLICY_ALLOW, MAC_POLICY_DENY } policy;</div><div class='del'>-	unsigned int entries;</div><div class='del'>-	struct list_head mac_list;</div><div class='del'>-	spinlock_t lock;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct add_sta_proc_data {</div><div class='del'>-	u8 addr[ETH_ALEN];</div><div class='del'>-	struct add_sta_proc_data *next;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef enum { WDS_ADD, WDS_DEL } wds_oper_type;</div><div class='del'>-struct wds_oper_data {</div><div class='del'>-	wds_oper_type type;</div><div class='del'>-	u8 addr[ETH_ALEN];</div><div class='del'>-	struct wds_oper_data *next;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct ap_data {</div><div class='del'>-	int initialized; /* whether ap_data has been initialized */</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int bridge_packets; /* send packet to associated STAs directly to the</div><div class='del'>-			     * wireless media instead of higher layers in the</div><div class='del'>-			     * kernel */</div><div class='del'>-	unsigned int bridged_unicast; /* number of unicast frames bridged on</div><div class='del'>-				       * wireless media */</div><div class='del'>-	unsigned int bridged_multicast; /* number of non-unicast frames</div><div class='del'>-					 * bridged on wireless media */</div><div class='del'>-	unsigned int tx_drop_nonassoc; /* number of unicast TX packets dropped</div><div class='del'>-					* because they were to an address that</div><div class='del'>-					* was not associated */</div><div class='del'>-	int nullfunc_ack; /* use workaround for nullfunc frame ACKs */</div><div class='del'>-</div><div class='del'>-	spinlock_t sta_table_lock;</div><div class='del'>-	int num_sta; /* number of entries in sta_list */</div><div class='del'>-	struct list_head sta_list; /* STA info list head */</div><div class='del'>-	struct sta_info *sta_hash[STA_HASH_SIZE];</div><div class='del'>-</div><div class='del'>-	struct proc_dir_entry *proc;</div><div class='del'>-</div><div class='del'>-	ap_policy_enum ap_policy;</div><div class='del'>-	unsigned int max_inactivity;</div><div class='del'>-	int autom_ap_wds;</div><div class='del'>-</div><div class='del'>-	struct mac_restrictions mac_restrictions; /* MAC-based auth */</div><div class='del'>-	int last_tx_rate;</div><div class='del'>-</div><div class='del'>-	struct work_struct add_sta_proc_queue;</div><div class='del'>-	struct add_sta_proc_data *add_sta_proc_entries;</div><div class='del'>-</div><div class='del'>-	struct work_struct wds_oper_queue;</div><div class='del'>-	struct wds_oper_data *wds_oper_entries;</div><div class='del'>-</div><div class='del'>-	u16 tx_callback_idx;</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-	/* pointers to STA info; based on allocated AID or NULL if AID free</div><div class='del'>-	 * AID is in the range 1-2007, so sta_aid[0] corresponders to AID 1</div><div class='del'>-	 * and so on</div><div class='del'>-	 */</div><div class='del'>-	struct sta_info *sta_aid[MAX_AID_TABLE_SIZE];</div><div class='del'>-</div><div class='del'>-	u16 tx_callback_auth, tx_callback_assoc, tx_callback_poll;</div><div class='del'>-</div><div class='del'>-	/* WEP operations for generating challenges to be used with shared key</div><div class='del'>-	 * authentication */</div><div class='del'>-	struct lib80211_crypto_ops *crypt;</div><div class='del'>-	void *crypt_priv;</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void hostap_rx(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-	       struct hostap_80211_rx_status *rx_stats);</div><div class='del'>-void hostap_init_data(local_info_t *local);</div><div class='del'>-void hostap_init_ap_proc(local_info_t *local);</div><div class='del'>-void hostap_free_data(struct ap_data *ap);</div><div class='del'>-void hostap_check_sta_fw_version(struct ap_data *ap, int sta_fw_ver);</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	AP_TX_CONTINUE, AP_TX_DROP, AP_TX_RETRY, AP_TX_BUFFERED,</div><div class='del'>-	AP_TX_CONTINUE_NOT_AUTHORIZED</div><div class='del'>-} ap_tx_ret;</div><div class='del'>-struct hostap_tx_data {</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int host_encrypt;</div><div class='del'>-	struct lib80211_crypt_data *crypt;</div><div class='del'>-	void *sta_ptr;</div><div class='del'>-};</div><div class='del'>-ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx);</div><div class='del'>-void hostap_handle_sta_release(void *ptr);</div><div class='del'>-void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb);</div><div class='del'>-int hostap_update_sta_ps(local_info_t *local, struct ieee80211_hdr *hdr);</div><div class='del'>-typedef enum {</div><div class='del'>-	AP_RX_CONTINUE, AP_RX_DROP, AP_RX_EXIT, AP_RX_CONTINUE_NOT_AUTHORIZED</div><div class='del'>-} ap_rx_ret;</div><div class='del'>-ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev,</div><div class='del'>-			       struct sk_buff *skb,</div><div class='del'>-			       struct hostap_80211_rx_status *rx_stats,</div><div class='del'>-			       int wds);</div><div class='del'>-int hostap_handle_sta_crypto(local_info_t *local, struct ieee80211_hdr *hdr,</div><div class='del'>-			     struct lib80211_crypt_data **crypt,</div><div class='del'>-			     void **sta_ptr);</div><div class='del'>-int hostap_is_sta_assoc(struct ap_data *ap, u8 *sta_addr);</div><div class='del'>-int hostap_is_sta_authorized(struct ap_data *ap, u8 *sta_addr);</div><div class='del'>-int hostap_add_sta(struct ap_data *ap, u8 *sta_addr);</div><div class='del'>-int hostap_update_rx_stats(struct ap_data *ap, struct ieee80211_hdr *hdr,</div><div class='del'>-			   struct hostap_80211_rx_status *rx_stats);</div><div class='del'>-void hostap_update_rates(local_info_t *local);</div><div class='del'>-void hostap_add_wds_links(local_info_t *local);</div><div class='del'>-void hostap_wds_link_oper(local_info_t *local, u8 *addr, wds_oper_type type);</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-void hostap_deauth_all_stas(struct net_device *dev, struct ap_data *ap,</div><div class='del'>-			    int resend);</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-</div><div class='del'>-#endif /* HOSTAP_AP_H */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/hostap/hostap_common.h b/drivers/net/wireless/intersil/hostap/hostap_common.h<br/>deleted file mode 100644<br/>index dd29a8e8d349..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/hostap/hostap_common.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_common.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,420 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef HOSTAP_COMMON_H</div><div class='del'>-#define HOSTAP_COMMON_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/if_ether.h&gt;</div><div class='del'>-</div><div class='del'>-/* IEEE 802.11 defines */</div><div class='del'>-</div><div class='del'>-/* HFA384X Configuration RIDs */</div><div class='del'>-#define HFA384X_RID_CNFPORTTYPE 0xFC00</div><div class='del'>-#define HFA384X_RID_CNFOWNMACADDR 0xFC01</div><div class='del'>-#define HFA384X_RID_CNFDESIREDSSID 0xFC02</div><div class='del'>-#define HFA384X_RID_CNFOWNCHANNEL 0xFC03</div><div class='del'>-#define HFA384X_RID_CNFOWNSSID 0xFC04</div><div class='del'>-#define HFA384X_RID_CNFOWNATIMWINDOW 0xFC05</div><div class='del'>-#define HFA384X_RID_CNFSYSTEMSCALE 0xFC06</div><div class='del'>-#define HFA384X_RID_CNFMAXDATALEN 0xFC07</div><div class='del'>-#define HFA384X_RID_CNFWDSADDRESS 0xFC08</div><div class='del'>-#define HFA384X_RID_CNFPMENABLED 0xFC09</div><div class='del'>-#define HFA384X_RID_CNFPMEPS 0xFC0A</div><div class='del'>-#define HFA384X_RID_CNFMULTICASTRECEIVE 0xFC0B</div><div class='del'>-#define HFA384X_RID_CNFMAXSLEEPDURATION 0xFC0C</div><div class='del'>-#define HFA384X_RID_CNFPMHOLDOVERDURATION 0xFC0D</div><div class='del'>-#define HFA384X_RID_CNFOWNNAME 0xFC0E</div><div class='del'>-#define HFA384X_RID_CNFOWNDTIMPERIOD 0xFC10</div><div class='del'>-#define HFA384X_RID_CNFWDSADDRESS1 0xFC11 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_CNFWDSADDRESS2 0xFC12 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_CNFWDSADDRESS3 0xFC13 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_CNFWDSADDRESS4 0xFC14 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_CNFWDSADDRESS5 0xFC15 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_CNFWDSADDRESS6 0xFC16 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_CNFMULTICASTPMBUFFERING 0xFC17 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_UNKNOWN1 0xFC20</div><div class='del'>-#define HFA384X_RID_UNKNOWN2 0xFC21</div><div class='del'>-#define HFA384X_RID_CNFWEPDEFAULTKEYID 0xFC23</div><div class='del'>-#define HFA384X_RID_CNFDEFAULTKEY0 0xFC24</div><div class='del'>-#define HFA384X_RID_CNFDEFAULTKEY1 0xFC25</div><div class='del'>-#define HFA384X_RID_CNFDEFAULTKEY2 0xFC26</div><div class='del'>-#define HFA384X_RID_CNFDEFAULTKEY3 0xFC27</div><div class='del'>-#define HFA384X_RID_CNFWEPFLAGS 0xFC28</div><div class='del'>-#define HFA384X_RID_CNFWEPKEYMAPPINGTABLE 0xFC29</div><div class='del'>-#define HFA384X_RID_CNFAUTHENTICATION 0xFC2A</div><div class='del'>-#define HFA384X_RID_CNFMAXASSOCSTA 0xFC2B /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_CNFTXCONTROL 0xFC2C</div><div class='del'>-#define HFA384X_RID_CNFROAMINGMODE 0xFC2D</div><div class='del'>-#define HFA384X_RID_CNFHOSTAUTHENTICATION 0xFC2E /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_CNFRCVCRCERROR 0xFC30</div><div class='del'>-#define HFA384X_RID_CNFMMLIFE 0xFC31</div><div class='del'>-#define HFA384X_RID_CNFALTRETRYCOUNT 0xFC32</div><div class='del'>-#define HFA384X_RID_CNFBEACONINT 0xFC33</div><div class='del'>-#define HFA384X_RID_CNFAPPCFINFO 0xFC34 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_CNFSTAPCFINFO 0xFC35</div><div class='del'>-#define HFA384X_RID_CNFPRIORITYQUSAGE 0xFC37</div><div class='del'>-#define HFA384X_RID_CNFTIMCTRL 0xFC40</div><div class='del'>-#define HFA384X_RID_UNKNOWN3 0xFC41 /* added in STA f/w 0.7.x */</div><div class='del'>-#define HFA384X_RID_CNFTHIRTY2TALLY 0xFC42 /* added in STA f/w 0.8.0 */</div><div class='del'>-#define HFA384X_RID_CNFENHSECURITY 0xFC43 /* AP f/w or STA f/w &gt;= 1.6.3 */</div><div class='del'>-#define HFA384X_RID_CNFDBMADJUST 0xFC46 /* added in STA f/w 1.3.1 */</div><div class='del'>-#define HFA384X_RID_GENERICELEMENT 0xFC48 /* added in STA f/w 1.7.0;</div><div class='del'>-					   * write only */</div><div class='del'>-#define HFA384X_RID_PROPAGATIONDELAY 0xFC49 /* added in STA f/w 1.7.6 */</div><div class='del'>-#define HFA384X_RID_GROUPADDRESSES 0xFC80</div><div class='del'>-#define HFA384X_RID_CREATEIBSS 0xFC81</div><div class='del'>-#define HFA384X_RID_FRAGMENTATIONTHRESHOLD 0xFC82</div><div class='del'>-#define HFA384X_RID_RTSTHRESHOLD 0xFC83</div><div class='del'>-#define HFA384X_RID_TXRATECONTROL 0xFC84</div><div class='del'>-#define HFA384X_RID_PROMISCUOUSMODE 0xFC85</div><div class='del'>-#define HFA384X_RID_FRAGMENTATIONTHRESHOLD0 0xFC90 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_FRAGMENTATIONTHRESHOLD1 0xFC91 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_FRAGMENTATIONTHRESHOLD2 0xFC92 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_FRAGMENTATIONTHRESHOLD3 0xFC93 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_FRAGMENTATIONTHRESHOLD4 0xFC94 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_FRAGMENTATIONTHRESHOLD5 0xFC95 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_FRAGMENTATIONTHRESHOLD6 0xFC96 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_RTSTHRESHOLD0 0xFC97 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_RTSTHRESHOLD1 0xFC98 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_RTSTHRESHOLD2 0xFC99 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_RTSTHRESHOLD3 0xFC9A /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_RTSTHRESHOLD4 0xFC9B /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_RTSTHRESHOLD5 0xFC9C /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_RTSTHRESHOLD6 0xFC9D /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_TXRATECONTROL0 0xFC9E /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_TXRATECONTROL1 0xFC9F /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_TXRATECONTROL2 0xFCA0 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_TXRATECONTROL3 0xFCA1 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_TXRATECONTROL4 0xFCA2 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_TXRATECONTROL5 0xFCA3 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_TXRATECONTROL6 0xFCA4 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_CNFSHORTPREAMBLE 0xFCB0</div><div class='del'>-#define HFA384X_RID_CNFEXCLUDELONGPREAMBLE 0xFCB1</div><div class='del'>-#define HFA384X_RID_CNFAUTHENTICATIONRSPTO 0xFCB2</div><div class='del'>-#define HFA384X_RID_CNFBASICRATES 0xFCB3</div><div class='del'>-#define HFA384X_RID_CNFSUPPORTEDRATES 0xFCB4</div><div class='del'>-#define HFA384X_RID_CNFFALLBACKCTRL 0xFCB5 /* added in STA f/w 1.3.1 */</div><div class='del'>-#define HFA384X_RID_WEPKEYDISABLE 0xFCB6 /* added in STA f/w 1.3.1 */</div><div class='del'>-#define HFA384X_RID_WEPKEYMAPINDEX 0xFCB7 /* ? */</div><div class='del'>-#define HFA384X_RID_BROADCASTKEYID 0xFCB8 /* ? */</div><div class='del'>-#define HFA384X_RID_ENTSECFLAGEYID 0xFCB9 /* ? */</div><div class='del'>-#define HFA384X_RID_CNFPASSIVESCANCTRL 0xFCBA /* added in STA f/w 1.5.0 */</div><div class='del'>-#define HFA384X_RID_SSNHANDLINGMODE 0xFCBB /* added in STA f/w 1.7.0 */</div><div class='del'>-#define HFA384X_RID_MDCCONTROL 0xFCBC /* added in STA f/w 1.7.0 */</div><div class='del'>-#define HFA384X_RID_MDCCOUNTRY 0xFCBD /* added in STA f/w 1.7.0 */</div><div class='del'>-#define HFA384X_RID_TXPOWERMAX 0xFCBE /* added in STA f/w 1.7.0 */</div><div class='del'>-#define HFA384X_RID_CNFLFOENABLED 0xFCBF /* added in STA f/w 1.6.3 */</div><div class='del'>-#define HFA384X_RID_CAPINFO 0xFCC0 /* added in STA f/w 1.7.0 */</div><div class='del'>-#define HFA384X_RID_LISTENINTERVAL 0xFCC1 /* added in STA f/w 1.7.0 */</div><div class='del'>-#define HFA384X_RID_SW_ANT_DIV 0xFCC2 /* added in STA f/w 1.7.0; Prism3 */</div><div class='del'>-#define HFA384X_RID_LED_CTRL 0xFCC4 /* added in STA f/w 1.7.6 */</div><div class='del'>-#define HFA384X_RID_HFODELAY 0xFCC5 /* added in STA f/w 1.7.6 */</div><div class='del'>-#define HFA384X_RID_DISALLOWEDBSSID 0xFCC6 /* added in STA f/w 1.8.0 */</div><div class='del'>-#define HFA384X_RID_TICKTIME 0xFCE0</div><div class='del'>-#define HFA384X_RID_SCANREQUEST 0xFCE1</div><div class='del'>-#define HFA384X_RID_JOINREQUEST 0xFCE2</div><div class='del'>-#define HFA384X_RID_AUTHENTICATESTATION 0xFCE3 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_CHANNELINFOREQUEST 0xFCE4 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_HOSTSCAN 0xFCE5 /* added in STA f/w 1.3.1 */</div><div class='del'>-</div><div class='del'>-/* HFA384X Information RIDs */</div><div class='del'>-#define HFA384X_RID_MAXLOADTIME 0xFD00</div><div class='del'>-#define HFA384X_RID_DOWNLOADBUFFER 0xFD01</div><div class='del'>-#define HFA384X_RID_PRIID 0xFD02</div><div class='del'>-#define HFA384X_RID_PRISUPRANGE 0xFD03</div><div class='del'>-#define HFA384X_RID_CFIACTRANGES 0xFD04</div><div class='del'>-#define HFA384X_RID_NICSERNUM 0xFD0A</div><div class='del'>-#define HFA384X_RID_NICID 0xFD0B</div><div class='del'>-#define HFA384X_RID_MFISUPRANGE 0xFD0C</div><div class='del'>-#define HFA384X_RID_CFISUPRANGE 0xFD0D</div><div class='del'>-#define HFA384X_RID_CHANNELLIST 0xFD10</div><div class='del'>-#define HFA384X_RID_REGULATORYDOMAINS 0xFD11</div><div class='del'>-#define HFA384X_RID_TEMPTYPE 0xFD12</div><div class='del'>-#define HFA384X_RID_CIS 0xFD13</div><div class='del'>-#define HFA384X_RID_STAID 0xFD20</div><div class='del'>-#define HFA384X_RID_STASUPRANGE 0xFD21</div><div class='del'>-#define HFA384X_RID_MFIACTRANGES 0xFD22</div><div class='del'>-#define HFA384X_RID_CFIACTRANGES2 0xFD23</div><div class='del'>-#define HFA384X_RID_PRODUCTNAME 0xFD24 /* added in STA f/w 1.3.1;</div><div class='del'>-					* only Prism2.5(?) */</div><div class='del'>-#define HFA384X_RID_PORTSTATUS 0xFD40</div><div class='del'>-#define HFA384X_RID_CURRENTSSID 0xFD41</div><div class='del'>-#define HFA384X_RID_CURRENTBSSID 0xFD42</div><div class='del'>-#define HFA384X_RID_COMMSQUALITY 0xFD43</div><div class='del'>-#define HFA384X_RID_CURRENTTXRATE 0xFD44</div><div class='del'>-#define HFA384X_RID_CURRENTBEACONINTERVAL 0xFD45</div><div class='del'>-#define HFA384X_RID_CURRENTSCALETHRESHOLDS 0xFD46</div><div class='del'>-#define HFA384X_RID_PROTOCOLRSPTIME 0xFD47</div><div class='del'>-#define HFA384X_RID_SHORTRETRYLIMIT 0xFD48</div><div class='del'>-#define HFA384X_RID_LONGRETRYLIMIT 0xFD49</div><div class='del'>-#define HFA384X_RID_MAXTRANSMITLIFETIME 0xFD4A</div><div class='del'>-#define HFA384X_RID_MAXRECEIVELIFETIME 0xFD4B</div><div class='del'>-#define HFA384X_RID_CFPOLLABLE 0xFD4C</div><div class='del'>-#define HFA384X_RID_AUTHENTICATIONALGORITHMS 0xFD4D</div><div class='del'>-#define HFA384X_RID_PRIVACYOPTIONIMPLEMENTED 0xFD4F</div><div class='del'>-#define HFA384X_RID_DBMCOMMSQUALITY 0xFD51 /* added in STA f/w 1.3.1 */</div><div class='del'>-#define HFA384X_RID_CURRENTTXRATE1 0xFD80 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_CURRENTTXRATE2 0xFD81 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_CURRENTTXRATE3 0xFD82 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_CURRENTTXRATE4 0xFD83 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_CURRENTTXRATE5 0xFD84 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_CURRENTTXRATE6 0xFD85 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_OWNMACADDR 0xFD86 /* AP f/w only */</div><div class='del'>-#define HFA384X_RID_SCANRESULTSTABLE 0xFD88 /* added in STA f/w 0.8.3 */</div><div class='del'>-#define HFA384X_RID_HOSTSCANRESULTS 0xFD89 /* added in STA f/w 1.3.1 */</div><div class='del'>-#define HFA384X_RID_AUTHENTICATIONUSED 0xFD8A /* added in STA f/w 1.3.4 */</div><div class='del'>-#define HFA384X_RID_CNFFAASWITCHCTRL 0xFD8B /* added in STA f/w 1.6.3 */</div><div class='del'>-#define HFA384X_RID_ASSOCIATIONFAILURE 0xFD8D /* added in STA f/w 1.8.0 */</div><div class='del'>-#define HFA384X_RID_PHYTYPE 0xFDC0</div><div class='del'>-#define HFA384X_RID_CURRENTCHANNEL 0xFDC1</div><div class='del'>-#define HFA384X_RID_CURRENTPOWERSTATE 0xFDC2</div><div class='del'>-#define HFA384X_RID_CCAMODE 0xFDC3</div><div class='del'>-#define HFA384X_RID_SUPPORTEDDATARATES 0xFDC6</div><div class='del'>-#define HFA384X_RID_LFO_VOLT_REG_TEST_RES 0xFDC7 /* added in STA f/w 1.7.1 */</div><div class='del'>-#define HFA384X_RID_BUILDSEQ 0xFFFE</div><div class='del'>-#define HFA384X_RID_FWID 0xFFFF</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct hfa384x_comp_ident</div><div class='del'>-{</div><div class='del'>-	__le16 id;</div><div class='del'>-	__le16 variant;</div><div class='del'>-	__le16 major;</div><div class='del'>-	__le16 minor;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define HFA384X_COMP_ID_PRI 0x15</div><div class='del'>-#define HFA384X_COMP_ID_STA 0x1f</div><div class='del'>-#define HFA384X_COMP_ID_FW_AP 0x14b</div><div class='del'>-</div><div class='del'>-struct hfa384x_sup_range</div><div class='del'>-{</div><div class='del'>-	__le16 role;</div><div class='del'>-	__le16 id;</div><div class='del'>-	__le16 variant;</div><div class='del'>-	__le16 bottom;</div><div class='del'>-	__le16 top;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct hfa384x_build_id</div><div class='del'>-{</div><div class='del'>-	__le16 pri_seq;</div><div class='del'>-	__le16 sec_seq;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* FD01 - Download Buffer */</div><div class='del'>-struct hfa384x_rid_download_buffer</div><div class='del'>-{</div><div class='del'>-	__le16 page;</div><div class='del'>-	__le16 offset;</div><div class='del'>-	__le16 length;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* BSS connection quality (RID FD43 range, RID FD51 dBm-normalized) */</div><div class='del'>-struct hfa384x_comms_quality {</div><div class='del'>-	__le16 comm_qual; /* 0 .. 92 */</div><div class='del'>-	__le16 signal_level; /* 27 .. 154 */</div><div class='del'>-	__le16 noise_level; /* 27 .. 154 */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* netdevice private ioctls (used, e.g., with iwpriv from user space) */</div><div class='del'>-</div><div class='del'>-/* New wireless extensions API - SET/GET convention (even ioctl numbers are</div><div class='del'>- * root only)</div><div class='del'>- */</div><div class='del'>-#define PRISM2_IOCTL_PRISM2_PARAM (SIOCIWFIRSTPRIV + 0)</div><div class='del'>-#define PRISM2_IOCTL_GET_PRISM2_PARAM (SIOCIWFIRSTPRIV + 1)</div><div class='del'>-#define PRISM2_IOCTL_WRITEMIF (SIOCIWFIRSTPRIV + 2)</div><div class='del'>-#define PRISM2_IOCTL_READMIF (SIOCIWFIRSTPRIV + 3)</div><div class='del'>-#define PRISM2_IOCTL_MONITOR (SIOCIWFIRSTPRIV + 4)</div><div class='del'>-#define PRISM2_IOCTL_RESET (SIOCIWFIRSTPRIV + 6)</div><div class='del'>-#define PRISM2_IOCTL_INQUIRE (SIOCIWFIRSTPRIV + 8)</div><div class='del'>-#define PRISM2_IOCTL_WDS_ADD (SIOCIWFIRSTPRIV + 10)</div><div class='del'>-#define PRISM2_IOCTL_WDS_DEL (SIOCIWFIRSTPRIV + 12)</div><div class='del'>-#define PRISM2_IOCTL_SET_RID_WORD (SIOCIWFIRSTPRIV + 14)</div><div class='del'>-#define PRISM2_IOCTL_MACCMD (SIOCIWFIRSTPRIV + 16)</div><div class='del'>-#define PRISM2_IOCTL_ADDMAC (SIOCIWFIRSTPRIV + 18)</div><div class='del'>-#define PRISM2_IOCTL_DELMAC (SIOCIWFIRSTPRIV + 20)</div><div class='del'>-#define PRISM2_IOCTL_KICKMAC (SIOCIWFIRSTPRIV + 22)</div><div class='del'>-</div><div class='del'>-/* following are not in SIOCGIWPRIV list; check permission in the driver code</div><div class='del'>- */</div><div class='del'>-#define PRISM2_IOCTL_DOWNLOAD (SIOCDEVPRIVATE + 13)</div><div class='del'>-#define PRISM2_IOCTL_HOSTAPD (SIOCDEVPRIVATE + 14)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* PRISM2_IOCTL_PRISM2_PARAM ioctl() subtypes: */</div><div class='del'>-enum {</div><div class='del'>-	/* PRISM2_PARAM_PTYPE = 1, */ /* REMOVED 2003-10-22 */</div><div class='del'>-	PRISM2_PARAM_TXRATECTRL = 2,</div><div class='del'>-	PRISM2_PARAM_BEACON_INT = 3,</div><div class='del'>-	PRISM2_PARAM_PSEUDO_IBSS = 4,</div><div class='del'>-	PRISM2_PARAM_ALC = 5,</div><div class='del'>-	/* PRISM2_PARAM_TXPOWER = 6, */ /* REMOVED 2003-10-22 */</div><div class='del'>-	PRISM2_PARAM_DUMP = 7,</div><div class='del'>-	PRISM2_PARAM_OTHER_AP_POLICY = 8,</div><div class='del'>-	PRISM2_PARAM_AP_MAX_INACTIVITY = 9,</div><div class='del'>-	PRISM2_PARAM_AP_BRIDGE_PACKETS = 10,</div><div class='del'>-	PRISM2_PARAM_DTIM_PERIOD = 11,</div><div class='del'>-	PRISM2_PARAM_AP_NULLFUNC_ACK = 12,</div><div class='del'>-	PRISM2_PARAM_MAX_WDS = 13,</div><div class='del'>-	PRISM2_PARAM_AP_AUTOM_AP_WDS = 14,</div><div class='del'>-	PRISM2_PARAM_AP_AUTH_ALGS = 15,</div><div class='del'>-	PRISM2_PARAM_MONITOR_ALLOW_FCSERR = 16,</div><div class='del'>-	PRISM2_PARAM_HOST_ENCRYPT = 17,</div><div class='del'>-	PRISM2_PARAM_HOST_DECRYPT = 18,</div><div class='del'>-	/* PRISM2_PARAM_BUS_MASTER_THRESHOLD_RX = 19, REMOVED 2005-08-14 */</div><div class='del'>-	/* PRISM2_PARAM_BUS_MASTER_THRESHOLD_TX = 20, REMOVED 2005-08-14 */</div><div class='del'>-	PRISM2_PARAM_HOST_ROAMING = 21,</div><div class='del'>-	PRISM2_PARAM_BCRX_STA_KEY = 22,</div><div class='del'>-	PRISM2_PARAM_IEEE_802_1X = 23,</div><div class='del'>-	PRISM2_PARAM_ANTSEL_TX = 24,</div><div class='del'>-	PRISM2_PARAM_ANTSEL_RX = 25,</div><div class='del'>-	PRISM2_PARAM_MONITOR_TYPE = 26,</div><div class='del'>-	PRISM2_PARAM_WDS_TYPE = 27,</div><div class='del'>-	PRISM2_PARAM_HOSTSCAN = 28,</div><div class='del'>-	PRISM2_PARAM_AP_SCAN = 29,</div><div class='del'>-	PRISM2_PARAM_ENH_SEC = 30,</div><div class='del'>-	PRISM2_PARAM_IO_DEBUG = 31,</div><div class='del'>-	PRISM2_PARAM_BASIC_RATES = 32,</div><div class='del'>-	PRISM2_PARAM_OPER_RATES = 33,</div><div class='del'>-	PRISM2_PARAM_HOSTAPD = 34,</div><div class='del'>-	PRISM2_PARAM_HOSTAPD_STA = 35,</div><div class='del'>-	PRISM2_PARAM_WPA = 36,</div><div class='del'>-	PRISM2_PARAM_PRIVACY_INVOKED = 37,</div><div class='del'>-	PRISM2_PARAM_TKIP_COUNTERMEASURES = 38,</div><div class='del'>-	PRISM2_PARAM_DROP_UNENCRYPTED = 39,</div><div class='del'>-	PRISM2_PARAM_SCAN_CHANNEL_MASK = 40,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum { HOSTAP_ANTSEL_DO_NOT_TOUCH = 0, HOSTAP_ANTSEL_DIVERSITY = 1,</div><div class='del'>-       HOSTAP_ANTSEL_LOW = 2, HOSTAP_ANTSEL_HIGH = 3 };</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* PRISM2_IOCTL_MACCMD ioctl() subcommands: */</div><div class='del'>-enum { AP_MAC_CMD_POLICY_OPEN = 0, AP_MAC_CMD_POLICY_ALLOW = 1,</div><div class='del'>-       AP_MAC_CMD_POLICY_DENY = 2, AP_MAC_CMD_FLUSH = 3,</div><div class='del'>-       AP_MAC_CMD_KICKALL = 4 };</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* PRISM2_IOCTL_DOWNLOAD ioctl() dl_cmd: */</div><div class='del'>-enum {</div><div class='del'>-	PRISM2_DOWNLOAD_VOLATILE = 1 /* RAM */,</div><div class='del'>-	/* Note! Old versions of prism2_srec have a fatal error in CRC-16</div><div class='del'>-	 * calculation, which will corrupt all non-volatile downloads.</div><div class='del'>-	 * PRISM2_DOWNLOAD_NON_VOLATILE used to be 2, but it is now 3 to</div><div class='del'>-	 * prevent use of old versions of prism2_srec for non-volatile</div><div class='del'>-	 * download. */</div><div class='del'>-	PRISM2_DOWNLOAD_NON_VOLATILE = 3 /* FLASH */,</div><div class='del'>-	PRISM2_DOWNLOAD_VOLATILE_GENESIS = 4 /* RAM in Genesis mode */,</div><div class='del'>-	/* Persistent versions of volatile download commands (keep firmware</div><div class='del'>-	 * data in memory and automatically re-download after hw_reset */</div><div class='del'>-	PRISM2_DOWNLOAD_VOLATILE_PERSISTENT = 5,</div><div class='del'>-	PRISM2_DOWNLOAD_VOLATILE_GENESIS_PERSISTENT = 6,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct prism2_download_param {</div><div class='del'>-	u32 dl_cmd;</div><div class='del'>-	u32 start_addr;</div><div class='del'>-	u32 num_areas;</div><div class='del'>-	struct prism2_download_area {</div><div class='del'>-		u32 addr; /* wlan card address */</div><div class='del'>-		u32 len;</div><div class='del'>-		void __user *ptr; /* pointer to data in user space */</div><div class='del'>-	} data[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define PRISM2_MAX_DOWNLOAD_AREA_LEN 131072</div><div class='del'>-#define PRISM2_MAX_DOWNLOAD_LEN 262144</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* PRISM2_IOCTL_HOSTAPD ioctl() cmd: */</div><div class='del'>-enum {</div><div class='del'>-	PRISM2_HOSTAPD_FLUSH = 1,</div><div class='del'>-	PRISM2_HOSTAPD_ADD_STA = 2,</div><div class='del'>-	PRISM2_HOSTAPD_REMOVE_STA = 3,</div><div class='del'>-	PRISM2_HOSTAPD_GET_INFO_STA = 4,</div><div class='del'>-	/* REMOVED: PRISM2_HOSTAPD_RESET_TXEXC_STA = 5, */</div><div class='del'>-	PRISM2_SET_ENCRYPTION = 6,</div><div class='del'>-	PRISM2_GET_ENCRYPTION = 7,</div><div class='del'>-	PRISM2_HOSTAPD_SET_FLAGS_STA = 8,</div><div class='del'>-	PRISM2_HOSTAPD_GET_RID = 9,</div><div class='del'>-	PRISM2_HOSTAPD_SET_RID = 10,</div><div class='del'>-	PRISM2_HOSTAPD_SET_ASSOC_AP_ADDR = 11,</div><div class='del'>-	PRISM2_HOSTAPD_SET_GENERIC_ELEMENT = 12,</div><div class='del'>-	PRISM2_HOSTAPD_MLME = 13,</div><div class='del'>-	PRISM2_HOSTAPD_SCAN_REQ = 14,</div><div class='del'>-	PRISM2_HOSTAPD_STA_CLEAR_STATS = 15,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define PRISM2_HOSTAPD_MAX_BUF_SIZE 1024</div><div class='del'>-#define PRISM2_HOSTAPD_RID_HDR_LEN \</div><div class='del'>-offsetof(struct prism2_hostapd_param, u.rid.data)</div><div class='del'>-#define PRISM2_HOSTAPD_GENERIC_ELEMENT_HDR_LEN \</div><div class='del'>-offsetof(struct prism2_hostapd_param, u.generic_elem.data)</div><div class='del'>-</div><div class='del'>-/* Maximum length for algorithm names (-1 for nul termination) used in ioctl()</div><div class='del'>- */</div><div class='del'>-#define HOSTAP_CRYPT_ALG_NAME_LEN 16</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct prism2_hostapd_param {</div><div class='del'>-	u32 cmd;</div><div class='del'>-	u8 sta_addr[ETH_ALEN];</div><div class='del'>-	union {</div><div class='del'>-		struct {</div><div class='del'>-			u16 aid;</div><div class='del'>-			u16 capability;</div><div class='del'>-			u8 tx_supp_rates;</div><div class='del'>-		} add_sta;</div><div class='del'>-		struct {</div><div class='del'>-			u32 inactive_sec;</div><div class='del'>-		} get_info_sta;</div><div class='del'>-		struct {</div><div class='del'>-			u8 alg[HOSTAP_CRYPT_ALG_NAME_LEN];</div><div class='del'>-			u32 flags;</div><div class='del'>-			u32 err;</div><div class='del'>-			u8 idx;</div><div class='del'>-			u8 seq[8]; /* sequence counter (set: RX, get: TX) */</div><div class='del'>-			u16 key_len;</div><div class='del'>-			u8 key[0];</div><div class='del'>-		} crypt;</div><div class='del'>-		struct {</div><div class='del'>-			u32 flags_and;</div><div class='del'>-			u32 flags_or;</div><div class='del'>-		} set_flags_sta;</div><div class='del'>-		struct {</div><div class='del'>-			u16 rid;</div><div class='del'>-			u16 len;</div><div class='del'>-			u8 data[0];</div><div class='del'>-		} rid;</div><div class='del'>-		struct {</div><div class='del'>-			u8 len;</div><div class='del'>-			u8 data[0];</div><div class='del'>-		} generic_elem;</div><div class='del'>-		struct {</div><div class='del'>-#define MLME_STA_DEAUTH 0</div><div class='del'>-#define MLME_STA_DISASSOC 1</div><div class='del'>-			u16 cmd;</div><div class='del'>-			u16 reason_code;</div><div class='del'>-		} mlme;</div><div class='del'>-		struct {</div><div class='del'>-			u8 ssid_len;</div><div class='del'>-			u8 ssid[32];</div><div class='del'>-		} scan_req;</div><div class='del'>-	} u;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define HOSTAP_CRYPT_FLAG_SET_TX_KEY BIT(0)</div><div class='del'>-#define HOSTAP_CRYPT_FLAG_PERMANENT BIT(1)</div><div class='del'>-</div><div class='del'>-#define HOSTAP_CRYPT_ERR_UNKNOWN_ALG 2</div><div class='del'>-#define HOSTAP_CRYPT_ERR_UNKNOWN_ADDR 3</div><div class='del'>-#define HOSTAP_CRYPT_ERR_CRYPT_INIT_FAILED 4</div><div class='del'>-#define HOSTAP_CRYPT_ERR_KEY_SET_FAILED 5</div><div class='del'>-#define HOSTAP_CRYPT_ERR_TX_KEY_SET_FAILED 6</div><div class='del'>-#define HOSTAP_CRYPT_ERR_CARD_CONF_FAILED 7</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* HOSTAP_COMMON_H */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/hostap/hostap_config.h b/drivers/net/wireless/intersil/hostap/hostap_config.h<br/>deleted file mode 100644<br/>index 3ebd55847fad..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/hostap/hostap_config.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_config.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,49 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef HOSTAP_CONFIG_H</div><div class='del'>-#define HOSTAP_CONFIG_H</div><div class='del'>-</div><div class='del'>-/* In the previous versions of Host AP driver, support for user space version</div><div class='del'>- * of IEEE 802.11 management (hostapd) used to be disabled in the default</div><div class='del'>- * configuration. From now on, support for hostapd is always included and it is</div><div class='del'>- * possible to disable kernel driver version of IEEE 802.11 management with a</div><div class='del'>- * separate define, PRISM2_NO_KERNEL_IEEE80211_MGMT. */</div><div class='del'>-/* #define PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-</div><div class='del'>-/* Maximum number of events handler per one interrupt */</div><div class='del'>-#define PRISM2_MAX_INTERRUPT_EVENTS 20</div><div class='del'>-</div><div class='del'>-/* Include code for downloading firmware images into volatile RAM. */</div><div class='del'>-#define PRISM2_DOWNLOAD_SUPPORT</div><div class='del'>-</div><div class='del'>-/* Allow kernel configuration to enable download support. */</div><div class='del'>-#if !defined(PRISM2_DOWNLOAD_SUPPORT) &amp;&amp; defined(CONFIG_HOSTAP_FIRMWARE)</div><div class='del'>-#define PRISM2_DOWNLOAD_SUPPORT</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Allow kernel configuration to enable non-volatile download support. */</div><div class='del'>-#ifdef CONFIG_HOSTAP_FIRMWARE_NVRAM</div><div class='del'>-#define PRISM2_NON_VOLATILE_DOWNLOAD</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Save low-level I/O for debugging. This should not be enabled in normal use.</div><div class='del'>- */</div><div class='del'>-/* #define PRISM2_IO_DEBUG */</div><div class='del'>-</div><div class='del'>-/* Following defines can be used to remove unneeded parts of the driver, e.g.,</div><div class='del'>- * to limit the size of the kernel module. Definitions can be added here in</div><div class='del'>- * hostap_config.h or they can be added to make command with ccflags-y,</div><div class='del'>- * e.g.,</div><div class='del'>- * 'make pccard ccflags-y="-DPRISM2_NO_DEBUG -DPRISM2_NO_PROCFS_DEBUG"'</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Do not include debug messages into the driver */</div><div class='del'>-/* #define PRISM2_NO_DEBUG */</div><div class='del'>-</div><div class='del'>-/* Do not include /proc/net/prism2/wlan#/{registers,debug} */</div><div class='del'>-/* #define PRISM2_NO_PROCFS_DEBUG */</div><div class='del'>-</div><div class='del'>-/* Do not include station functionality (i.e., allow only Master (Host AP) mode</div><div class='del'>- */</div><div class='del'>-/* #define PRISM2_NO_STATION_MODES */</div><div class='del'>-</div><div class='del'>-#endif /* HOSTAP_CONFIG_H */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/hostap/hostap_cs.c b/drivers/net/wireless/intersil/hostap/hostap_cs.c<br/>deleted file mode 100644<br/>index ec7db2badc40..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/hostap/hostap_cs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_cs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,710 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-#define PRISM2_PCCARD</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/if.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;linux/wireless.h&gt;</div><div class='del'>-#include &lt;net/iw_handler.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;pcmcia/cistpl.h&gt;</div><div class='del'>-#include &lt;pcmcia/cisreg.h&gt;</div><div class='del'>-#include &lt;pcmcia/ds.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hostap_wlan.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *dev_info = "hostap_cs";</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Jouni Malinen");</div><div class='del'>-MODULE_DESCRIPTION("Support for Intersil Prism2-based 802.11 wireless LAN "</div><div class='del'>-		   "cards (PC Card).");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int ignore_cis_vcc;</div><div class='del'>-module_param(ignore_cis_vcc, int, 0444);</div><div class='del'>-MODULE_PARM_DESC(ignore_cis_vcc, "Ignore broken CIS VCC entry");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* struct local_info::hw_priv */</div><div class='del'>-struct hostap_cs_priv {</div><div class='del'>-	struct pcmcia_device *link;</div><div class='del'>-	int sandisk_connectplus;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_IO_DEBUG</div><div class='del'>-</div><div class='del'>-static inline void hfa384x_outb_debug(struct net_device *dev, int a, u8 v)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_OUTB, a, v);</div><div class='del'>-	outb(v, dev-&gt;base_addr + a);</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u8 hfa384x_inb_debug(struct net_device *dev, int a)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u8 v;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	v = inb(dev-&gt;base_addr + a);</div><div class='del'>-	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INB, a, v);</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void hfa384x_outw_debug(struct net_device *dev, int a, u16 v)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_OUTW, a, v);</div><div class='del'>-	outw(v, dev-&gt;base_addr + a);</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 hfa384x_inw_debug(struct net_device *dev, int a)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u16 v;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	v = inw(dev-&gt;base_addr + a);</div><div class='del'>-	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INW, a, v);</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void hfa384x_outsw_debug(struct net_device *dev, int a,</div><div class='del'>-				       u8 *buf, int wc)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_OUTSW, a, wc);</div><div class='del'>-	outsw(dev-&gt;base_addr + a, buf, wc);</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void hfa384x_insw_debug(struct net_device *dev, int a,</div><div class='del'>-				      u8 *buf, int wc)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INSW, a, wc);</div><div class='del'>-	insw(dev-&gt;base_addr + a, buf, wc);</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define HFA384X_OUTB(v,a) hfa384x_outb_debug(dev, (a), (v))</div><div class='del'>-#define HFA384X_INB(a) hfa384x_inb_debug(dev, (a))</div><div class='del'>-#define HFA384X_OUTW(v,a) hfa384x_outw_debug(dev, (a), (v))</div><div class='del'>-#define HFA384X_INW(a) hfa384x_inw_debug(dev, (a))</div><div class='del'>-#define HFA384X_OUTSW(a, buf, wc) hfa384x_outsw_debug(dev, (a), (buf), (wc))</div><div class='del'>-#define HFA384X_INSW(a, buf, wc) hfa384x_insw_debug(dev, (a), (buf), (wc))</div><div class='del'>-</div><div class='del'>-#else /* PRISM2_IO_DEBUG */</div><div class='del'>-</div><div class='del'>-#define HFA384X_OUTB(v,a) outb((v), dev-&gt;base_addr + (a))</div><div class='del'>-#define HFA384X_INB(a) inb(dev-&gt;base_addr + (a))</div><div class='del'>-#define HFA384X_OUTW(v,a) outw((v), dev-&gt;base_addr + (a))</div><div class='del'>-#define HFA384X_INW(a) inw(dev-&gt;base_addr + (a))</div><div class='del'>-#define HFA384X_INSW(a, buf, wc) insw(dev-&gt;base_addr + (a), buf, wc)</div><div class='del'>-#define HFA384X_OUTSW(a, buf, wc) outsw(dev-&gt;base_addr + (a), buf, wc)</div><div class='del'>-</div><div class='del'>-#endif /* PRISM2_IO_DEBUG */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int hfa384x_from_bap(struct net_device *dev, u16 bap, void *buf,</div><div class='del'>-			    int len)</div><div class='del'>-{</div><div class='del'>-	u16 d_off;</div><div class='del'>-	u16 *pos;</div><div class='del'>-</div><div class='del'>-	d_off = (bap == 1) ? HFA384X_DATA1_OFF : HFA384X_DATA0_OFF;</div><div class='del'>-	pos = (u16 *) buf;</div><div class='del'>-</div><div class='del'>-	if (len / 2)</div><div class='del'>-		HFA384X_INSW(d_off, buf, len / 2);</div><div class='del'>-	pos += len / 2;</div><div class='del'>-</div><div class='del'>-	if (len &amp; 1)</div><div class='del'>-		*((char *) pos) = HFA384X_INB(d_off);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int hfa384x_to_bap(struct net_device *dev, u16 bap, void *buf, int len)</div><div class='del'>-{</div><div class='del'>-	u16 d_off;</div><div class='del'>-	u16 *pos;</div><div class='del'>-</div><div class='del'>-	d_off = (bap == 1) ? HFA384X_DATA1_OFF : HFA384X_DATA0_OFF;</div><div class='del'>-	pos = (u16 *) buf;</div><div class='del'>-</div><div class='del'>-	if (len / 2)</div><div class='del'>-		HFA384X_OUTSW(d_off, buf, len / 2);</div><div class='del'>-	pos += len / 2;</div><div class='del'>-</div><div class='del'>-	if (len &amp; 1)</div><div class='del'>-		HFA384X_OUTB(*((char *) pos), d_off);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* FIX: This might change at some point.. */</div><div class='del'>-#include "hostap_hw.c"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void prism2_detach(struct pcmcia_device *p_dev);</div><div class='del'>-static void prism2_release(u_long arg);</div><div class='del'>-static int prism2_config(struct pcmcia_device *link);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_pccard_card_present(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	struct hostap_cs_priv *hw_priv = local-&gt;hw_priv;</div><div class='del'>-	if (hw_priv != NULL &amp;&amp; hw_priv-&gt;link != NULL &amp;&amp; pcmcia_dev_present(hw_priv-&gt;link))</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SanDisk CompactFlash WLAN Flashcard - Product Manual v1.0</div><div class='del'>- * Document No. 20-10-00058, January 2004</div><div class='del'>- * http://www.sandisk.com/pdf/industrial/ProdManualCFWLANv1.0.pdf</div><div class='del'>- */</div><div class='del'>-#define SANDISK_WLAN_ACTIVATION_OFF 0x40</div><div class='del'>-#define SANDISK_HCR_OFF 0x42</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void sandisk_set_iobase(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	int res;</div><div class='del'>-	struct hostap_cs_priv *hw_priv = local-&gt;hw_priv;</div><div class='del'>-</div><div class='del'>-	res = pcmcia_write_config_byte(hw_priv-&gt;link, 0x10,</div><div class='del'>-				hw_priv-&gt;link-&gt;resource[0]-&gt;start &amp; 0x00ff);</div><div class='del'>-	if (res != 0) {</div><div class='del'>-		printk(KERN_DEBUG "Prism3 SanDisk - failed to set I/O base 0 -"</div><div class='del'>-		       " res=%d\n", res);</div><div class='del'>-	}</div><div class='del'>-	udelay(10);</div><div class='del'>-</div><div class='del'>-	res = pcmcia_write_config_byte(hw_priv-&gt;link, 0x12,</div><div class='del'>-				(hw_priv-&gt;link-&gt;resource[0]-&gt;start &gt;&gt; 8) &amp; 0x00ff);</div><div class='del'>-	if (res != 0) {</div><div class='del'>-		printk(KERN_DEBUG "Prism3 SanDisk - failed to set I/O base 1 -"</div><div class='del'>-		       " res=%d\n", res);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void sandisk_write_hcr(local_info_t *local, int hcr)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	HFA384X_OUTB(0x80, SANDISK_WLAN_ACTIVATION_OFF);</div><div class='del'>-	udelay(50);</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		HFA384X_OUTB(hcr, SANDISK_HCR_OFF);</div><div class='del'>-	}</div><div class='del'>-	udelay(55);</div><div class='del'>-	HFA384X_OUTB(0x45, SANDISK_WLAN_ACTIVATION_OFF);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int sandisk_enable_wireless(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	int res, ret = 0;</div><div class='del'>-	struct hostap_interface *iface = netdev_priv(dev);</div><div class='del'>-	local_info_t *local = iface-&gt;local;</div><div class='del'>-	struct hostap_cs_priv *hw_priv = local-&gt;hw_priv;</div><div class='del'>-</div><div class='del'>-	if (resource_size(hw_priv-&gt;link-&gt;resource[0]) &lt; 0x42) {</div><div class='del'>-		/* Not enough ports to be SanDisk multi-function card */</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hw_priv-&gt;link-&gt;manf_id != 0xd601 || hw_priv-&gt;link-&gt;card_id != 0x0101) {</div><div class='del'>-		/* No SanDisk manfid found */</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hw_priv-&gt;link-&gt;socket-&gt;functions &lt; 2) {</div><div class='del'>-		/* No multi-function links found */</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: Multi-function SanDisk ConnectPlus detected"</div><div class='del'>-	       " - using vendor-specific initialization\n", dev-&gt;name);</div><div class='del'>-	hw_priv-&gt;sandisk_connectplus = 1;</div><div class='del'>-</div><div class='del'>-	res = pcmcia_write_config_byte(hw_priv-&gt;link, CISREG_COR,</div><div class='del'>-				COR_SOFT_RESET);</div><div class='del'>-	if (res != 0) {</div><div class='del'>-		printk(KERN_DEBUG "%s: SanDisk - COR sreset failed (%d)\n",</div><div class='del'>-		       dev-&gt;name, res);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-	mdelay(5);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Do not enable interrupts here to avoid some bogus events. Interrupts</div><div class='del'>-	 * will be enabled during the first cor_sreset call.</div><div class='del'>-	 */</div><div class='del'>-	res = pcmcia_write_config_byte(hw_priv-&gt;link, CISREG_COR,</div><div class='del'>-				(COR_LEVEL_REQ | 0x8 | COR_ADDR_DECODE |</div><div class='del'>-					COR_FUNC_ENA));</div><div class='del'>-	if (res != 0) {</div><div class='del'>-		printk(KERN_DEBUG "%s: SanDisk - COR sreset failed (%d)\n",</div><div class='del'>-		       dev-&gt;name, res);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-	mdelay(5);</div><div class='del'>-</div><div class='del'>-	sandisk_set_iobase(local);</div><div class='del'>-</div><div class='del'>-	HFA384X_OUTB(0xc5, SANDISK_WLAN_ACTIVATION_OFF);</div><div class='del'>-	udelay(10);</div><div class='del'>-	HFA384X_OUTB(0x4b, SANDISK_WLAN_ACTIVATION_OFF);</div><div class='del'>-	udelay(10);</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void prism2_pccard_cor_sreset(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	int res;</div><div class='del'>-	u8 val;</div><div class='del'>-	struct hostap_cs_priv *hw_priv = local-&gt;hw_priv;</div><div class='del'>-</div><div class='del'>-	if (!prism2_pccard_card_present(local))</div><div class='del'>-	       return;</div><div class='del'>-</div><div class='del'>-	res = pcmcia_read_config_byte(hw_priv-&gt;link, CISREG_COR, &amp;val);</div><div class='del'>-	if (res != 0) {</div><div class='del'>-		printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 1 (%d)\n",</div><div class='del'>-		       res);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	printk(KERN_DEBUG "prism2_pccard_cor_sreset: original COR %02x\n",</div><div class='del'>-		val);</div><div class='del'>-</div><div class='del'>-	val |= COR_SOFT_RESET;</div><div class='del'>-	res = pcmcia_write_config_byte(hw_priv-&gt;link, CISREG_COR, val);</div><div class='del'>-	if (res != 0) {</div><div class='del'>-		printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 2 (%d)\n",</div><div class='del'>-		       res);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mdelay(hw_priv-&gt;sandisk_connectplus ? 5 : 2);</div><div class='del'>-</div><div class='del'>-	val &amp;= ~COR_SOFT_RESET;</div><div class='del'>-	if (hw_priv-&gt;sandisk_connectplus)</div><div class='del'>-		val |= COR_IREQ_ENA;</div><div class='del'>-	res = pcmcia_write_config_byte(hw_priv-&gt;link, CISREG_COR, val);</div><div class='del'>-	if (res != 0) {</div><div class='del'>-		printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 3 (%d)\n",</div><div class='del'>-		       res);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mdelay(hw_priv-&gt;sandisk_connectplus ? 5 : 2);</div><div class='del'>-</div><div class='del'>-	if (hw_priv-&gt;sandisk_connectplus)</div><div class='del'>-		sandisk_set_iobase(local);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)</div><div class='del'>-{</div><div class='del'>-	int res;</div><div class='del'>-	u8 old_cor;</div><div class='del'>-	struct hostap_cs_priv *hw_priv = local-&gt;hw_priv;</div><div class='del'>-</div><div class='del'>-	if (!prism2_pccard_card_present(local))</div><div class='del'>-	       return;</div><div class='del'>-</div><div class='del'>-	if (hw_priv-&gt;sandisk_connectplus) {</div><div class='del'>-		sandisk_write_hcr(local, hcr);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	res = pcmcia_read_config_byte(hw_priv-&gt;link, CISREG_COR, &amp;old_cor);</div><div class='del'>-	if (res != 0) {</div><div class='del'>-		printk(KERN_DEBUG "%s failed 1 (%d)\n", __func__, res);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	printk(KERN_DEBUG "%s: original COR %02x\n", __func__, old_cor);</div><div class='del'>-</div><div class='del'>-	res = pcmcia_write_config_byte(hw_priv-&gt;link, CISREG_COR,</div><div class='del'>-				old_cor | COR_SOFT_RESET);</div><div class='del'>-	if (res != 0) {</div><div class='del'>-		printk(KERN_DEBUG "%s failed 2 (%d)\n", __func__, res);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mdelay(10);</div><div class='del'>-</div><div class='del'>-	/* Setup Genesis mode */</div><div class='del'>-	res = pcmcia_write_config_byte(hw_priv-&gt;link, CISREG_CCSR, hcr);</div><div class='del'>-	if (res != 0) {</div><div class='del'>-		printk(KERN_DEBUG "%s failed 3 (%d)\n", __func__, res);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	mdelay(10);</div><div class='del'>-</div><div class='del'>-	res = pcmcia_write_config_byte(hw_priv-&gt;link, CISREG_COR,</div><div class='del'>-				old_cor &amp; ~COR_SOFT_RESET);</div><div class='del'>-	if (res != 0) {</div><div class='del'>-		printk(KERN_DEBUG "%s failed 4 (%d)\n", __func__, res);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mdelay(10);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct prism2_helper_functions prism2_pccard_funcs =</div><div class='del'>-{</div><div class='del'>-	.card_present	= prism2_pccard_card_present,</div><div class='del'>-	.cor_sreset	= prism2_pccard_cor_sreset,</div><div class='del'>-	.genesis_reset	= prism2_pccard_genesis_reset,</div><div class='del'>-	.hw_type	= HOSTAP_HW_PCCARD,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* allocate local data and register with CardServices</div><div class='del'>- * initialize dev_link structure, but do not configure the card yet */</div><div class='del'>-static int hostap_cs_probe(struct pcmcia_device *p_dev)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_HW, "%s: setting Vcc=33 (constant)\n", dev_info);</div><div class='del'>-</div><div class='del'>-	ret = prism2_config(p_dev);</div><div class='del'>-	if (ret) {</div><div class='del'>-		PDEBUG(DEBUG_EXTRA, "prism2_config() failed\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void prism2_detach(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	PDEBUG(DEBUG_FLOW, "prism2_detach\n");</div><div class='del'>-</div><div class='del'>-	prism2_release((u_long)link);</div><div class='del'>-</div><div class='del'>-	/* release net devices */</div><div class='del'>-	if (link-&gt;priv) {</div><div class='del'>-		struct hostap_cs_priv *hw_priv;</div><div class='del'>-		struct net_device *dev;</div><div class='del'>-		struct hostap_interface *iface;</div><div class='del'>-		dev = link-&gt;priv;</div><div class='del'>-		iface = netdev_priv(dev);</div><div class='del'>-		hw_priv = iface-&gt;local-&gt;hw_priv;</div><div class='del'>-		prism2_free_local_data(dev);</div><div class='del'>-		kfree(hw_priv);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_config_check(struct pcmcia_device *p_dev, void *priv_data)</div><div class='del'>-{</div><div class='del'>-	if (p_dev-&gt;config_index == 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return pcmcia_request_io(p_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int prism2_config(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int ret;</div><div class='del'>-	struct hostap_cs_priv *hw_priv;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_FLOW, "prism2_config()\n");</div><div class='del'>-</div><div class='del'>-	hw_priv = kzalloc(sizeof(*hw_priv), GFP_KERNEL);</div><div class='del'>-	if (hw_priv == NULL) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Look for an appropriate configuration table entry in the CIS */</div><div class='del'>-	link-&gt;config_flags |= CONF_AUTO_SET_VPP | CONF_AUTO_AUDIO |</div><div class='del'>-		CONF_AUTO_CHECK_VCC | CONF_AUTO_SET_IO | CONF_ENABLE_IRQ;</div><div class='del'>-	if (ignore_cis_vcc)</div><div class='del'>-		link-&gt;config_flags &amp;= ~CONF_AUTO_CHECK_VCC;</div><div class='del'>-	ret = pcmcia_loop_config(link, prism2_config_check, NULL);</div><div class='del'>-	if (ret) {</div><div class='del'>-		if (!ignore_cis_vcc)</div><div class='del'>-			printk(KERN_ERR "GetNextTuple(): No matching "</div><div class='del'>-			       "CIS configuration.  Maybe you need the "</div><div class='del'>-			       "ignore_cis_vcc=1 parameter.\n");</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Need to allocate net_device before requesting IRQ handler */</div><div class='del'>-	dev = prism2_init_local_data(&amp;prism2_pccard_funcs, 0,</div><div class='del'>-				     &amp;link-&gt;dev);</div><div class='del'>-	if (!dev) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-	link-&gt;priv = dev;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-	local-&gt;hw_priv = hw_priv;</div><div class='del'>-	hw_priv-&gt;link = link;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We enable IRQ here, but IRQ handler will not proceed</div><div class='del'>-	 * until dev-&gt;base_addr is set below. This protect us from</div><div class='del'>-	 * receive interrupts when driver is not initialized.</div><div class='del'>-	 */</div><div class='del'>-	ret = pcmcia_request_irq(link, prism2_interrupt);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto failed;</div><div class='del'>-</div><div class='del'>-	ret = pcmcia_enable_device(link);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto failed;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;irq_init_lock, flags);</div><div class='del'>-	dev-&gt;irq = link-&gt;irq;</div><div class='del'>-	dev-&gt;base_addr = link-&gt;resource[0]-&gt;start;</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;irq_init_lock, flags);</div><div class='del'>-</div><div class='del'>-	local-&gt;shutdown = 0;</div><div class='del'>-</div><div class='del'>-	sandisk_enable_wireless(dev);</div><div class='del'>-</div><div class='del'>-	ret = prism2_hw_config(dev, 1);</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = hostap_hw_ready(dev);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-</div><div class='del'>- failed:</div><div class='del'>-	kfree(hw_priv);</div><div class='del'>-	prism2_release((u_long)link);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void prism2_release(u_long arg)</div><div class='del'>-{</div><div class='del'>-	struct pcmcia_device *link = (struct pcmcia_device *)arg;</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_FLOW, "prism2_release\n");</div><div class='del'>-</div><div class='del'>-	if (link-&gt;priv) {</div><div class='del'>-		struct net_device *dev = link-&gt;priv;</div><div class='del'>-		struct hostap_interface *iface;</div><div class='del'>-</div><div class='del'>-		iface = netdev_priv(dev);</div><div class='del'>-		prism2_hw_shutdown(dev, 0);</div><div class='del'>-		iface-&gt;local-&gt;shutdown = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pcmcia_disable_device(link);</div><div class='del'>-	PDEBUG(DEBUG_FLOW, "release - done\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hostap_cs_suspend(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = (struct net_device *) link-&gt;priv;</div><div class='del'>-	int dev_open = 0;</div><div class='del'>-	struct hostap_interface *iface = NULL;</div><div class='del'>-</div><div class='del'>-	if (!dev)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_SUSPEND\n", dev_info);</div><div class='del'>-	if (iface &amp;&amp; iface-&gt;local)</div><div class='del'>-		dev_open = iface-&gt;local-&gt;num_dev_open &gt; 0;</div><div class='del'>-	if (dev_open) {</div><div class='del'>-		netif_stop_queue(dev);</div><div class='del'>-		netif_device_detach(dev);</div><div class='del'>-	}</div><div class='del'>-	prism2_suspend(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hostap_cs_resume(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = (struct net_device *) link-&gt;priv;</div><div class='del'>-	int dev_open = 0;</div><div class='del'>-	struct hostap_interface *iface = NULL;</div><div class='del'>-</div><div class='del'>-	if (!dev)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_RESUME\n", dev_info);</div><div class='del'>-</div><div class='del'>-	if (iface &amp;&amp; iface-&gt;local)</div><div class='del'>-		dev_open = iface-&gt;local-&gt;num_dev_open &gt; 0;</div><div class='del'>-</div><div class='del'>-	prism2_hw_shutdown(dev, 1);</div><div class='del'>-	prism2_hw_config(dev, dev_open ? 0 : 1);</div><div class='del'>-	if (dev_open) {</div><div class='del'>-		netif_device_attach(dev);</div><div class='del'>-		netif_start_queue(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct pcmcia_device_id hostap_cs_ids[] = {</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x01bf, 0x3301),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x026f, 0x030b),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1613),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0002),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x02aa, 0x0002),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300),</div><div class='del'>-/*	PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),    conflict with pcnet_cs */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0xc250, 0x0002),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x0126, 0x0002),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0xd601, 0x0005, "ADLINK 345 CF",</div><div class='del'>-					 0x2d858104),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "INTERSIL",</div><div class='del'>-					 0x74c5e40d),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "Intersil",</div><div class='del'>-					 0x4b801a17),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD_PROD_ID3(0x0156, 0x0002, "Version 01.02",</div><div class='del'>-					 0x4b74baa0),</div><div class='del'>-	PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus",</div><div class='del'>-				    0x7a954bd9, 0x74be00c6),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID123(</div><div class='del'>-		"Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02",</div><div class='del'>-		0xe6ec52ce, 0x08649af2, 0x4b74baa0),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID123(</div><div class='del'>-		"Canon", "Wireless LAN CF Card K30225", "Version 01.00",</div><div class='del'>-		0x96ef6fe2, 0x263fcbab, 0xa57adb8c),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID123(</div><div class='del'>-		"D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02",</div><div class='del'>-		0x71b18589, 0xb6f1b0ab, 0x4b74baa0),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID123(</div><div class='del'>-		"Instant Wireless ", " Network PC CARD", "Version 01.02",</div><div class='del'>-		0x11d901af, 0x6e9bd926, 0x4b74baa0),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID123(</div><div class='del'>-		"SMC", "SMC2632W", "Version 01.02",</div><div class='del'>-		0xc4f8b18b, 0x474a1f2a, 0x4b74baa0),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("BUFFALO", "WLI-CF-S11G", </div><div class='del'>-				0x2decece3, 0x82067c18),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("Compaq", "WL200_11Mbps_Wireless_PCI_Card",</div><div class='del'>-				0x54f7c49c, 0x15a75e5b),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE",</div><div class='del'>-				0x74c5e40d, 0xdb472a18),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("Linksys", "Wireless CompactFlash Card",</div><div class='del'>-				0x0733cc81, 0x0c52f395),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12(</div><div class='del'>-		"ZoomAir 11Mbps High", "Rate wireless Networking",</div><div class='del'>-		0x273fe3db, 0x32a1eaee),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("NETGEAR MA401 Wireless PC", "Card",</div><div class='del'>-		0xa37434e9, 0x9762e8f1),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID123(</div><div class='del'>-		"Pretec", "CompactWLAN Card 802.11b", "2.5",</div><div class='del'>-		0x1cadd3e5, 0xe697636c, 0x7a5bfcf1),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID123(</div><div class='del'>-		"U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02",</div><div class='del'>-		0xc7b8df9d, 0x1700d087, 0x4b74baa0),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID123(</div><div class='del'>-		"Allied Telesyn", "AT-WCL452 Wireless PCMCIA Radio",</div><div class='del'>-		"Ver. 1.00",</div><div class='del'>-		0x5cd01705, 0x4271660f, 0x9d08ee12),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID123(</div><div class='del'>-		"Wireless LAN" , "11Mbps PC Card", "Version 01.02",</div><div class='del'>-		0x4b8870ff, 0x70e946d1, 0x4b74baa0),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID3("HFA3863", 0x355cb092),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID3("ISL37100P", 0x630d52b2),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID3("ISL37101P-10", 0xdd97a26b),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID3("ISL37300P", 0xc9049a39),</div><div class='del'>-	PCMCIA_DEVICE_NULL</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct pcmcia_driver hostap_driver = {</div><div class='del'>-	.name		= "hostap_cs",</div><div class='del'>-	.probe		= hostap_cs_probe,</div><div class='del'>-	.remove		= prism2_detach,</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.id_table	= hostap_cs_ids,</div><div class='del'>-	.suspend	= hostap_cs_suspend,</div><div class='del'>-	.resume		= hostap_cs_resume,</div><div class='del'>-};</div><div class='del'>-module_pcmcia_driver(hostap_driver);</div><div class='head'>diff --git a/drivers/net/wireless/intersil/hostap/hostap_download.c b/drivers/net/wireless/intersil/hostap/hostap_download.c<br/>deleted file mode 100644<br/>index 7c6a5a6d1d45..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/hostap/hostap_download.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_download.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,811 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-static int prism2_enable_aux_port(struct net_device *dev, int enable)</div><div class='del'>-{</div><div class='del'>-	u16 val, reg;</div><div class='del'>-	int i, tries;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;no_pri) {</div><div class='del'>-		if (enable) {</div><div class='del'>-			PDEBUG(DEBUG_EXTRA2, "%s: no PRI f/w - assuming Aux "</div><div class='del'>-			       "port is already enabled\n", dev-&gt;name);</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;cmdlock, flags);</div><div class='del'>-</div><div class='del'>-	/* wait until busy bit is clear */</div><div class='del'>-	tries = HFA384X_CMD_BUSY_TIMEOUT;</div><div class='del'>-	while (HFA384X_INW(HFA384X_CMD_OFF) &amp; HFA384X_CMD_BUSY &amp;&amp; tries &gt; 0) {</div><div class='del'>-		tries--;</div><div class='del'>-		udelay(1);</div><div class='del'>-	}</div><div class='del'>-	if (tries == 0) {</div><div class='del'>-		reg = HFA384X_INW(HFA384X_CMD_OFF);</div><div class='del'>-		spin_unlock_irqrestore(&amp;local-&gt;cmdlock, flags);</div><div class='del'>-		printk("%s: prism2_enable_aux_port - timeout - reg=0x%04x\n",</div><div class='del'>-		       dev-&gt;name, reg);</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	val = HFA384X_INW(HFA384X_CONTROL_OFF);</div><div class='del'>-</div><div class='del'>-	if (enable) {</div><div class='del'>-		HFA384X_OUTW(HFA384X_AUX_MAGIC0, HFA384X_PARAM0_OFF);</div><div class='del'>-		HFA384X_OUTW(HFA384X_AUX_MAGIC1, HFA384X_PARAM1_OFF);</div><div class='del'>-		HFA384X_OUTW(HFA384X_AUX_MAGIC2, HFA384X_PARAM2_OFF);</div><div class='del'>-</div><div class='del'>-		if ((val &amp; HFA384X_AUX_PORT_MASK) != HFA384X_AUX_PORT_DISABLED)</div><div class='del'>-			printk("prism2_enable_aux_port: was not disabled!?\n");</div><div class='del'>-		val &amp;= ~HFA384X_AUX_PORT_MASK;</div><div class='del'>-		val |= HFA384X_AUX_PORT_ENABLE;</div><div class='del'>-	} else {</div><div class='del'>-		HFA384X_OUTW(0, HFA384X_PARAM0_OFF);</div><div class='del'>-		HFA384X_OUTW(0, HFA384X_PARAM1_OFF);</div><div class='del'>-		HFA384X_OUTW(0, HFA384X_PARAM2_OFF);</div><div class='del'>-</div><div class='del'>-		if ((val &amp; HFA384X_AUX_PORT_MASK) != HFA384X_AUX_PORT_ENABLED)</div><div class='del'>-			printk("prism2_enable_aux_port: was not enabled!?\n");</div><div class='del'>-		val &amp;= ~HFA384X_AUX_PORT_MASK;</div><div class='del'>-		val |= HFA384X_AUX_PORT_DISABLE;</div><div class='del'>-	}</div><div class='del'>-	HFA384X_OUTW(val, HFA384X_CONTROL_OFF);</div><div class='del'>-</div><div class='del'>-	udelay(5);</div><div class='del'>-</div><div class='del'>-	i = 10000;</div><div class='del'>-	while (i &gt; 0) {</div><div class='del'>-		val = HFA384X_INW(HFA384X_CONTROL_OFF);</div><div class='del'>-		val &amp;= HFA384X_AUX_PORT_MASK;</div><div class='del'>-</div><div class='del'>-		if ((enable &amp;&amp; val == HFA384X_AUX_PORT_ENABLED) ||</div><div class='del'>-		    (!enable &amp;&amp; val == HFA384X_AUX_PORT_DISABLED))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		udelay(10);</div><div class='del'>-		i--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;cmdlock, flags);</div><div class='del'>-</div><div class='del'>-	if (i == 0) {</div><div class='del'>-		printk("prism2_enable_aux_port(%d) timed out\n",</div><div class='del'>-		       enable);</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int hfa384x_from_aux(struct net_device *dev, unsigned int addr, int len,</div><div class='del'>-			    void *buf)</div><div class='del'>-{</div><div class='del'>-	u16 page, offset;</div><div class='del'>-	if (addr &amp; 1 || len &amp; 1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	page = addr &gt;&gt; 7;</div><div class='del'>-	offset = addr &amp; 0x7f;</div><div class='del'>-</div><div class='del'>-	HFA384X_OUTW(page, HFA384X_AUXPAGE_OFF);</div><div class='del'>-	HFA384X_OUTW(offset, HFA384X_AUXOFFSET_OFF);</div><div class='del'>-</div><div class='del'>-	udelay(5);</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_PCI</div><div class='del'>-	{</div><div class='del'>-		__le16 *pos = (__le16 *) buf;</div><div class='del'>-		while (len &gt; 0) {</div><div class='del'>-			*pos++ = HFA384X_INW_DATA(HFA384X_AUXDATA_OFF);</div><div class='del'>-			len -= 2;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#else /* PRISM2_PCI */</div><div class='del'>-	HFA384X_INSW(HFA384X_AUXDATA_OFF, buf, len / 2);</div><div class='del'>-#endif /* PRISM2_PCI */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int hfa384x_to_aux(struct net_device *dev, unsigned int addr, int len,</div><div class='del'>-			  void *buf)</div><div class='del'>-{</div><div class='del'>-	u16 page, offset;</div><div class='del'>-	if (addr &amp; 1 || len &amp; 1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	page = addr &gt;&gt; 7;</div><div class='del'>-	offset = addr &amp; 0x7f;</div><div class='del'>-</div><div class='del'>-	HFA384X_OUTW(page, HFA384X_AUXPAGE_OFF);</div><div class='del'>-	HFA384X_OUTW(offset, HFA384X_AUXOFFSET_OFF);</div><div class='del'>-</div><div class='del'>-	udelay(5);</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_PCI</div><div class='del'>-	{</div><div class='del'>-		__le16 *pos = (__le16 *) buf;</div><div class='del'>-		while (len &gt; 0) {</div><div class='del'>-			HFA384X_OUTW_DATA(*pos++, HFA384X_AUXDATA_OFF);</div><div class='del'>-			len -= 2;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#else /* PRISM2_PCI */</div><div class='del'>-	HFA384X_OUTSW(HFA384X_AUXDATA_OFF, buf, len / 2);</div><div class='del'>-#endif /* PRISM2_PCI */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_pda_ok(u8 *buf)</div><div class='del'>-{</div><div class='del'>-	__le16 *pda = (__le16 *) buf;</div><div class='del'>-	int pos;</div><div class='del'>-	u16 len, pdr;</div><div class='del'>-</div><div class='del'>-	if (buf[0] == 0xff &amp;&amp; buf[1] == 0x00 &amp;&amp; buf[2] == 0xff &amp;&amp;</div><div class='del'>-	    buf[3] == 0x00)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	pos = 0;</div><div class='del'>-	while (pos + 1 &lt; PRISM2_PDA_SIZE / 2) {</div><div class='del'>-		len = le16_to_cpu(pda[pos]);</div><div class='del'>-		pdr = le16_to_cpu(pda[pos + 1]);</div><div class='del'>-		if (len == 0 || pos + len &gt; PRISM2_PDA_SIZE / 2)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		if (pdr == 0x0000 &amp;&amp; len == 2) {</div><div class='del'>-			/* PDA end found */</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pos += len + 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define prism2_download_aux_dump_npages 65536</div><div class='del'>-</div><div class='del'>-struct prism2_download_aux_dump {</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	u16 page[0x80];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int prism2_download_aux_dump_proc_show(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	struct prism2_download_aux_dump *ctx = m-&gt;private;</div><div class='del'>-</div><div class='del'>-	hfa384x_from_aux(ctx-&gt;local-&gt;dev, (unsigned long)v - 1, 0x80, ctx-&gt;page);</div><div class='del'>-	seq_write(m, ctx-&gt;page, 0x80);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *prism2_download_aux_dump_proc_start(struct seq_file *m, loff_t *_pos)</div><div class='del'>-{</div><div class='del'>-	struct prism2_download_aux_dump *ctx = m-&gt;private;</div><div class='del'>-	prism2_enable_aux_port(ctx-&gt;local-&gt;dev, 1);</div><div class='del'>-	if (*_pos &gt;= prism2_download_aux_dump_npages)</div><div class='del'>-		return NULL;</div><div class='del'>-	return (void *)((unsigned long)*_pos + 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *prism2_download_aux_dump_proc_next(struct seq_file *m, void *v, loff_t *_pos)</div><div class='del'>-{</div><div class='del'>-	++*_pos;</div><div class='del'>-	if (*_pos &gt;= prism2_download_aux_dump_npages)</div><div class='del'>-		return NULL;</div><div class='del'>-	return (void *)((unsigned long)*_pos + 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void prism2_download_aux_dump_proc_stop(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	struct prism2_download_aux_dump *ctx = m-&gt;private;</div><div class='del'>-	prism2_enable_aux_port(ctx-&gt;local-&gt;dev, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct seq_operations prism2_download_aux_dump_proc_seqops = {</div><div class='del'>-	.start	= prism2_download_aux_dump_proc_start,</div><div class='del'>-	.next	= prism2_download_aux_dump_proc_next,</div><div class='del'>-	.stop	= prism2_download_aux_dump_proc_stop,</div><div class='del'>-	.show	= prism2_download_aux_dump_proc_show,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int prism2_download_aux_dump_proc_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int ret = seq_open_private(file, &amp;prism2_download_aux_dump_proc_seqops,</div><div class='del'>-				   sizeof(struct prism2_download_aux_dump));</div><div class='del'>-	if (ret == 0) {</div><div class='del'>-		struct seq_file *m = file-&gt;private_data;</div><div class='del'>-		m-&gt;private = PDE_DATA(inode);</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct proc_ops prism2_download_aux_dump_proc_ops = {</div><div class='del'>-	.proc_open		= prism2_download_aux_dump_proc_open,</div><div class='del'>-	.proc_read		= seq_read,</div><div class='del'>-	.proc_lseek		= seq_lseek,</div><div class='del'>-	.proc_release		= seq_release_private,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static u8 * prism2_read_pda(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	u8 *buf;</div><div class='del'>-	int res, i, found = 0;</div><div class='del'>-#define NUM_PDA_ADDRS 4</div><div class='del'>-	unsigned int pda_addr[NUM_PDA_ADDRS] = {</div><div class='del'>-		0x7f0000 /* others than HFA3841 */,</div><div class='del'>-		0x3f0000 /* HFA3841 */,</div><div class='del'>-		0x390000 /* apparently used in older cards */,</div><div class='del'>-		0x7f0002 /* Intel PRO/Wireless 2011B (PCI) */,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	buf = kmalloc(PRISM2_PDA_SIZE, GFP_KERNEL);</div><div class='del'>-	if (buf == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* Note: wlan card should be in initial state (just after init cmd)</div><div class='del'>-	 * and no other operations should be performed concurrently. */</div><div class='del'>-</div><div class='del'>-	prism2_enable_aux_port(dev, 1);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_PDA_ADDRS; i++) {</div><div class='del'>-		PDEBUG(DEBUG_EXTRA2, "%s: trying to read PDA from 0x%08x",</div><div class='del'>-		       dev-&gt;name, pda_addr[i]);</div><div class='del'>-		res = hfa384x_from_aux(dev, pda_addr[i], PRISM2_PDA_SIZE, buf);</div><div class='del'>-		if (res)</div><div class='del'>-			continue;</div><div class='del'>-		if (res == 0 &amp;&amp; prism2_pda_ok(buf)) {</div><div class='del'>-			PDEBUG2(DEBUG_EXTRA2, ": OK\n");</div><div class='del'>-			found = 1;</div><div class='del'>-			break;</div><div class='del'>-		} else {</div><div class='del'>-			PDEBUG2(DEBUG_EXTRA2, ": failed\n");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prism2_enable_aux_port(dev, 0);</div><div class='del'>-</div><div class='del'>-	if (!found) {</div><div class='del'>-		printk(KERN_DEBUG "%s: valid PDA not found\n", dev-&gt;name);</div><div class='del'>-		kfree(buf);</div><div class='del'>-		buf = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_download_volatile(local_info_t *local,</div><div class='del'>-				    struct prism2_download_data *param)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-	int ret = 0, i;</div><div class='del'>-	u16 param0, param1;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;hw_downloading) {</div><div class='del'>-		printk(KERN_WARNING "%s: Already downloading - aborting new "</div><div class='del'>-		       "request\n", dev-&gt;name);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	local-&gt;hw_downloading = 1;</div><div class='del'>-	if (local-&gt;pri_only) {</div><div class='del'>-		hfa384x_disable_interrupts(dev);</div><div class='del'>-	} else {</div><div class='del'>-		prism2_hw_shutdown(dev, 0);</div><div class='del'>-</div><div class='del'>-		if (prism2_hw_init(dev, 0)) {</div><div class='del'>-			printk(KERN_WARNING "%s: Could not initialize card for"</div><div class='del'>-			       " download\n", dev-&gt;name);</div><div class='del'>-			ret = -1;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (prism2_enable_aux_port(dev, 1)) {</div><div class='del'>-		printk(KERN_WARNING "%s: Could not enable AUX port\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		ret = -1;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	param0 = param-&gt;start_addr &amp; 0xffff;</div><div class='del'>-	param1 = param-&gt;start_addr &gt;&gt; 16;</div><div class='del'>-</div><div class='del'>-	HFA384X_OUTW(0, HFA384X_PARAM2_OFF);</div><div class='del'>-	HFA384X_OUTW(param1, HFA384X_PARAM1_OFF);</div><div class='del'>-	if (hfa384x_cmd_wait(dev, HFA384X_CMDCODE_DOWNLOAD |</div><div class='del'>-			     (HFA384X_PROGMODE_ENABLE_VOLATILE &lt;&lt; 8),</div><div class='del'>-			     param0)) {</div><div class='del'>-		printk(KERN_WARNING "%s: Download command execution failed\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		ret = -1;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; param-&gt;num_areas; i++) {</div><div class='del'>-		PDEBUG(DEBUG_EXTRA2, "%s: Writing %d bytes at 0x%08x\n",</div><div class='del'>-		       dev-&gt;name, param-&gt;data[i].len, param-&gt;data[i].addr);</div><div class='del'>-		if (hfa384x_to_aux(dev, param-&gt;data[i].addr,</div><div class='del'>-				   param-&gt;data[i].len, param-&gt;data[i].data)) {</div><div class='del'>-			printk(KERN_WARNING "%s: RAM download at 0x%08x "</div><div class='del'>-			       "(len=%d) failed\n", dev-&gt;name,</div><div class='del'>-			       param-&gt;data[i].addr, param-&gt;data[i].len);</div><div class='del'>-			ret = -1;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HFA384X_OUTW(param1, HFA384X_PARAM1_OFF);</div><div class='del'>-	HFA384X_OUTW(0, HFA384X_PARAM2_OFF);</div><div class='del'>-	if (hfa384x_cmd_no_wait(dev, HFA384X_CMDCODE_DOWNLOAD |</div><div class='del'>-				(HFA384X_PROGMODE_DISABLE &lt;&lt; 8), param0)) {</div><div class='del'>-		printk(KERN_WARNING "%s: Download command execution failed\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		ret = -1;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	/* ProgMode disable causes the hardware to restart itself from the</div><div class='del'>-	 * given starting address. Give hw some time and ACK command just in</div><div class='del'>-	 * case restart did not happen. */</div><div class='del'>-	mdelay(5);</div><div class='del'>-	HFA384X_OUTW(HFA384X_EV_CMD, HFA384X_EVACK_OFF);</div><div class='del'>-</div><div class='del'>-	if (prism2_enable_aux_port(dev, 0)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: Disabling AUX port failed\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		/* continue anyway.. restart should have taken care of this */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mdelay(5);</div><div class='del'>-	local-&gt;hw_downloading = 0;</div><div class='del'>-	if (prism2_hw_config(dev, 2)) {</div><div class='del'>-		printk(KERN_WARNING "%s: Card configuration after RAM "</div><div class='del'>-		       "download failed\n", dev-&gt;name);</div><div class='del'>-		ret = -1;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	local-&gt;hw_downloading = 0;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_enable_genesis(local_info_t *local, int hcr)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-	u8 initseq[4] = { 0x00, 0xe1, 0xa1, 0xff };</div><div class='del'>-	u8 readbuf[4];</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: test Genesis mode with HCR 0x%02x\n",</div><div class='del'>-	       dev-&gt;name, hcr);</div><div class='del'>-	local-&gt;func-&gt;cor_sreset(local);</div><div class='del'>-	hfa384x_to_aux(dev, 0x7e0038, sizeof(initseq), initseq);</div><div class='del'>-	local-&gt;func-&gt;genesis_reset(local, hcr);</div><div class='del'>-</div><div class='del'>-	/* Readback test */</div><div class='del'>-	hfa384x_from_aux(dev, 0x7e0038, sizeof(readbuf), readbuf);</div><div class='del'>-	hfa384x_to_aux(dev, 0x7e0038, sizeof(initseq), initseq);</div><div class='del'>-	hfa384x_from_aux(dev, 0x7e0038, sizeof(readbuf), readbuf);</div><div class='del'>-</div><div class='del'>-	if (memcmp(initseq, readbuf, sizeof(initseq)) == 0) {</div><div class='del'>-		printk(KERN_DEBUG "Readback test succeeded, HCR 0x%02x\n",</div><div class='del'>-		       hcr);</div><div class='del'>-		return 0;</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_DEBUG "Readback test failed, HCR 0x%02x write %4ph read %4ph\n",</div><div class='del'>-		       hcr, initseq, readbuf);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_get_ram_size(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* Try to enable genesis mode; 0x1F for x8 SRAM or 0x0F for x16 SRAM */</div><div class='del'>-	if (prism2_enable_genesis(local, 0x1f) == 0)</div><div class='del'>-		ret = 8;</div><div class='del'>-	else if (prism2_enable_genesis(local, 0x0f) == 0)</div><div class='del'>-		ret = 16;</div><div class='del'>-	else</div><div class='del'>-		ret = -1;</div><div class='del'>-</div><div class='del'>-	/* Disable genesis mode */</div><div class='del'>-	local-&gt;func-&gt;genesis_reset(local, ret == 16 ? 0x07 : 0x17);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_download_genesis(local_info_t *local,</div><div class='del'>-				   struct prism2_download_data *param)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-	int ram16 = 0, i;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;hw_downloading) {</div><div class='del'>-		printk(KERN_WARNING "%s: Already downloading - aborting new "</div><div class='del'>-		       "request\n", dev-&gt;name);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!local-&gt;func-&gt;genesis_reset || !local-&gt;func-&gt;cor_sreset) {</div><div class='del'>-		printk(KERN_INFO "%s: Genesis mode downloading not supported "</div><div class='del'>-		       "with this hwmodel\n", dev-&gt;name);</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	local-&gt;hw_downloading = 1;</div><div class='del'>-</div><div class='del'>-	if (prism2_enable_aux_port(dev, 1)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: failed to enable AUX port\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;sram_type == -1) {</div><div class='del'>-		/* 0x1F for x8 SRAM or 0x0F for x16 SRAM */</div><div class='del'>-		if (prism2_enable_genesis(local, 0x1f) == 0) {</div><div class='del'>-			ram16 = 0;</div><div class='del'>-			PDEBUG(DEBUG_EXTRA2, "%s: Genesis mode OK using x8 "</div><div class='del'>-			       "SRAM\n", dev-&gt;name);</div><div class='del'>-		} else if (prism2_enable_genesis(local, 0x0f) == 0) {</div><div class='del'>-			ram16 = 1;</div><div class='del'>-			PDEBUG(DEBUG_EXTRA2, "%s: Genesis mode OK using x16 "</div><div class='del'>-			       "SRAM\n", dev-&gt;name);</div><div class='del'>-		} else {</div><div class='del'>-			printk(KERN_DEBUG "%s: Could not initiate genesis "</div><div class='del'>-			       "mode\n", dev-&gt;name);</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (prism2_enable_genesis(local, local-&gt;sram_type == 8 ?</div><div class='del'>-					  0x1f : 0x0f)) {</div><div class='del'>-			printk(KERN_DEBUG "%s: Failed to set Genesis "</div><div class='del'>-			       "mode (sram_type=%d)\n", dev-&gt;name,</div><div class='del'>-			       local-&gt;sram_type);</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		ram16 = local-&gt;sram_type != 8;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; param-&gt;num_areas; i++) {</div><div class='del'>-		PDEBUG(DEBUG_EXTRA2, "%s: Writing %d bytes at 0x%08x\n",</div><div class='del'>-		       dev-&gt;name, param-&gt;data[i].len, param-&gt;data[i].addr);</div><div class='del'>-		if (hfa384x_to_aux(dev, param-&gt;data[i].addr,</div><div class='del'>-				   param-&gt;data[i].len, param-&gt;data[i].data)) {</div><div class='del'>-			printk(KERN_WARNING "%s: RAM download at 0x%08x "</div><div class='del'>-			       "(len=%d) failed\n", dev-&gt;name,</div><div class='del'>-			       param-&gt;data[i].addr, param-&gt;data[i].len);</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_EXTRA2, "Disable genesis mode\n");</div><div class='del'>-	local-&gt;func-&gt;genesis_reset(local, ram16 ? 0x07 : 0x17);</div><div class='del'>-	if (prism2_enable_aux_port(dev, 0)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: Failed to disable AUX port\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mdelay(5);</div><div class='del'>-	local-&gt;hw_downloading = 0;</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_EXTRA2, "Trying to initialize card\n");</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure the INIT command does not generate a command completion</div><div class='del'>-	 * event by disabling interrupts.</div><div class='del'>-	 */</div><div class='del'>-	hfa384x_disable_interrupts(dev);</div><div class='del'>-	if (prism2_hw_init(dev, 1)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: Initialization after genesis mode "</div><div class='del'>-		       "download failed\n", dev-&gt;name);</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_EXTRA2, "Card initialized - running PRI only\n");</div><div class='del'>-	if (prism2_hw_init2(dev, 1)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: Initialization(2) after genesis mode "</div><div class='del'>-		       "download failed\n", dev-&gt;name);</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	local-&gt;hw_downloading = 0;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_NON_VOLATILE_DOWNLOAD</div><div class='del'>-/* Note! Non-volatile downloading functionality has not yet been tested</div><div class='del'>- * thoroughly and it may corrupt flash image and effectively kill the card that</div><div class='del'>- * is being updated. You have been warned. */</div><div class='del'>-</div><div class='del'>-static inline int prism2_download_block(struct net_device *dev,</div><div class='del'>-					u32 addr, u8 *data,</div><div class='del'>-					u32 bufaddr, int rest_len)</div><div class='del'>-{</div><div class='del'>-	u16 param0, param1;</div><div class='del'>-	int block_len;</div><div class='del'>-</div><div class='del'>-	block_len = rest_len &lt; 4096 ? rest_len : 4096;</div><div class='del'>-</div><div class='del'>-	param0 = addr &amp; 0xffff;</div><div class='del'>-	param1 = addr &gt;&gt; 16;</div><div class='del'>-</div><div class='del'>-	HFA384X_OUTW(block_len, HFA384X_PARAM2_OFF);</div><div class='del'>-	HFA384X_OUTW(param1, HFA384X_PARAM1_OFF);</div><div class='del'>-</div><div class='del'>-	if (hfa384x_cmd_wait(dev, HFA384X_CMDCODE_DOWNLOAD |</div><div class='del'>-			     (HFA384X_PROGMODE_ENABLE_NON_VOLATILE &lt;&lt; 8),</div><div class='del'>-			     param0)) {</div><div class='del'>-		printk(KERN_WARNING "%s: Flash download command execution "</div><div class='del'>-		       "failed\n", dev-&gt;name);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hfa384x_to_aux(dev, bufaddr, block_len, data)) {</div><div class='del'>-		printk(KERN_WARNING "%s: flash download at 0x%08x "</div><div class='del'>-		       "(len=%d) failed\n", dev-&gt;name, addr, block_len);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HFA384X_OUTW(0, HFA384X_PARAM2_OFF);</div><div class='del'>-	HFA384X_OUTW(0, HFA384X_PARAM1_OFF);</div><div class='del'>-	if (hfa384x_cmd_wait(dev, HFA384X_CMDCODE_DOWNLOAD |</div><div class='del'>-			     (HFA384X_PROGMODE_PROGRAM_NON_VOLATILE &lt;&lt; 8),</div><div class='del'>-			     0)) {</div><div class='del'>-		printk(KERN_WARNING "%s: Flash write command execution "</div><div class='del'>-		       "failed\n", dev-&gt;name);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return block_len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_download_nonvolatile(local_info_t *local,</div><div class='del'>-				       struct prism2_download_data *dl)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-	int ret = 0, i;</div><div class='del'>-	struct {</div><div class='del'>-		__le16 page;</div><div class='del'>-		__le16 offset;</div><div class='del'>-		__le16 len;</div><div class='del'>-	} dlbuffer;</div><div class='del'>-	u32 bufaddr;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;hw_downloading) {</div><div class='del'>-		printk(KERN_WARNING "%s: Already downloading - aborting new "</div><div class='del'>-		       "request\n", dev-&gt;name);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = local-&gt;func-&gt;get_rid(dev, HFA384X_RID_DOWNLOADBUFFER,</div><div class='del'>-				   &amp;dlbuffer, 6, 0);</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		printk(KERN_WARNING "%s: Could not read download buffer "</div><div class='del'>-		       "parameters\n", dev-&gt;name);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "Download buffer: %d bytes at 0x%04x:0x%04x\n",</div><div class='del'>-	       le16_to_cpu(dlbuffer.len),</div><div class='del'>-	       le16_to_cpu(dlbuffer.page),</div><div class='del'>-	       le16_to_cpu(dlbuffer.offset));</div><div class='del'>-</div><div class='del'>-	bufaddr = (le16_to_cpu(dlbuffer.page) &lt;&lt; 7) + le16_to_cpu(dlbuffer.offset);</div><div class='del'>-</div><div class='del'>-	local-&gt;hw_downloading = 1;</div><div class='del'>-</div><div class='del'>-	if (!local-&gt;pri_only) {</div><div class='del'>-		prism2_hw_shutdown(dev, 0);</div><div class='del'>-</div><div class='del'>-		if (prism2_hw_init(dev, 0)) {</div><div class='del'>-			printk(KERN_WARNING "%s: Could not initialize card for"</div><div class='del'>-			       " download\n", dev-&gt;name);</div><div class='del'>-			ret = -1;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hfa384x_disable_interrupts(dev);</div><div class='del'>-</div><div class='del'>-	if (prism2_enable_aux_port(dev, 1)) {</div><div class='del'>-		printk(KERN_WARNING "%s: Could not enable AUX port\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		ret = -1;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: starting flash download\n", dev-&gt;name);</div><div class='del'>-	for (i = 0; i &lt; dl-&gt;num_areas; i++) {</div><div class='del'>-		int rest_len = dl-&gt;data[i].len;</div><div class='del'>-		int data_off = 0;</div><div class='del'>-</div><div class='del'>-		while (rest_len &gt; 0) {</div><div class='del'>-			int block_len;</div><div class='del'>-</div><div class='del'>-			block_len = prism2_download_block(</div><div class='del'>-				dev, dl-&gt;data[i].addr + data_off,</div><div class='del'>-				dl-&gt;data[i].data + data_off, bufaddr,</div><div class='del'>-				rest_len);</div><div class='del'>-</div><div class='del'>-			if (block_len &lt; 0) {</div><div class='del'>-				ret = -1;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			rest_len -= block_len;</div><div class='del'>-			data_off += block_len;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HFA384X_OUTW(0, HFA384X_PARAM1_OFF);</div><div class='del'>-	HFA384X_OUTW(0, HFA384X_PARAM2_OFF);</div><div class='del'>-	if (hfa384x_cmd_wait(dev, HFA384X_CMDCODE_DOWNLOAD |</div><div class='del'>-				(HFA384X_PROGMODE_DISABLE &lt;&lt; 8), 0)) {</div><div class='del'>-		printk(KERN_WARNING "%s: Download command execution failed\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		ret = -1;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (prism2_enable_aux_port(dev, 0)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: Disabling AUX port failed\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		/* continue anyway.. restart should have taken care of this */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mdelay(5);</div><div class='del'>-</div><div class='del'>-	local-&gt;func-&gt;hw_reset(dev);</div><div class='del'>-	local-&gt;hw_downloading = 0;</div><div class='del'>-	if (prism2_hw_config(dev, 2)) {</div><div class='del'>-		printk(KERN_WARNING "%s: Card configuration after flash "</div><div class='del'>-		       "download failed\n", dev-&gt;name);</div><div class='del'>-		ret = -1;</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_INFO "%s: Card initialized successfully after "</div><div class='del'>-		       "flash download\n", dev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	local-&gt;hw_downloading = 0;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-#endif /* PRISM2_NON_VOLATILE_DOWNLOAD */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void prism2_download_free_data(struct prism2_download_data *dl)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (dl == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; dl-&gt;num_areas; i++)</div><div class='del'>-		kfree(dl-&gt;data[i].data);</div><div class='del'>-	kfree(dl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_download(local_info_t *local,</div><div class='del'>-			   struct prism2_download_param *param)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int i;</div><div class='del'>-	u32 total_len = 0;</div><div class='del'>-	struct prism2_download_data *dl = NULL;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "prism2_download: dl_cmd=%d start_addr=0x%08x "</div><div class='del'>-	       "num_areas=%d\n",</div><div class='del'>-	       param-&gt;dl_cmd, param-&gt;start_addr, param-&gt;num_areas);</div><div class='del'>-</div><div class='del'>-	if (param-&gt;num_areas &gt; 100) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dl = kzalloc(sizeof(*dl) + param-&gt;num_areas *</div><div class='del'>-		     sizeof(struct prism2_download_data_area), GFP_KERNEL);</div><div class='del'>-	if (dl == NULL) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	dl-&gt;dl_cmd = param-&gt;dl_cmd;</div><div class='del'>-	dl-&gt;start_addr = param-&gt;start_addr;</div><div class='del'>-	dl-&gt;num_areas = param-&gt;num_areas;</div><div class='del'>-	for (i = 0; i &lt; param-&gt;num_areas; i++) {</div><div class='del'>-		PDEBUG(DEBUG_EXTRA2,</div><div class='del'>-		       "  area %d: addr=0x%08x len=%d ptr=0x%p\n",</div><div class='del'>-		       i, param-&gt;data[i].addr, param-&gt;data[i].len,</div><div class='del'>-		       param-&gt;data[i].ptr);</div><div class='del'>-</div><div class='del'>-		dl-&gt;data[i].addr = param-&gt;data[i].addr;</div><div class='del'>-		dl-&gt;data[i].len = param-&gt;data[i].len;</div><div class='del'>-</div><div class='del'>-		total_len += param-&gt;data[i].len;</div><div class='del'>-		if (param-&gt;data[i].len &gt; PRISM2_MAX_DOWNLOAD_AREA_LEN ||</div><div class='del'>-		    total_len &gt; PRISM2_MAX_DOWNLOAD_LEN) {</div><div class='del'>-			ret = -E2BIG;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		dl-&gt;data[i].data = kmalloc(dl-&gt;data[i].len, GFP_KERNEL);</div><div class='del'>-		if (dl-&gt;data[i].data == NULL) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (copy_from_user(dl-&gt;data[i].data, param-&gt;data[i].ptr,</div><div class='del'>-				   param-&gt;data[i].len)) {</div><div class='del'>-			ret = -EFAULT;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (param-&gt;dl_cmd) {</div><div class='del'>-	case PRISM2_DOWNLOAD_VOLATILE:</div><div class='del'>-	case PRISM2_DOWNLOAD_VOLATILE_PERSISTENT:</div><div class='del'>-		ret = prism2_download_volatile(local, dl);</div><div class='del'>-		break;</div><div class='del'>-	case PRISM2_DOWNLOAD_VOLATILE_GENESIS:</div><div class='del'>-	case PRISM2_DOWNLOAD_VOLATILE_GENESIS_PERSISTENT:</div><div class='del'>-		ret = prism2_download_genesis(local, dl);</div><div class='del'>-		break;</div><div class='del'>-	case PRISM2_DOWNLOAD_NON_VOLATILE:</div><div class='del'>-#ifdef PRISM2_NON_VOLATILE_DOWNLOAD</div><div class='del'>-		ret = prism2_download_nonvolatile(local, dl);</div><div class='del'>-#else /* PRISM2_NON_VOLATILE_DOWNLOAD */</div><div class='del'>-		printk(KERN_INFO "%s: non-volatile downloading not enabled\n",</div><div class='del'>-		       local-&gt;dev-&gt;name);</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-#endif /* PRISM2_NON_VOLATILE_DOWNLOAD */</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_DEBUG "%s: unsupported download command %d\n",</div><div class='del'>-		       local-&gt;dev-&gt;name, param-&gt;dl_cmd);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	if (ret == 0 &amp;&amp; dl &amp;&amp;</div><div class='del'>-	    param-&gt;dl_cmd == PRISM2_DOWNLOAD_VOLATILE_GENESIS_PERSISTENT) {</div><div class='del'>-		prism2_download_free_data(local-&gt;dl_pri);</div><div class='del'>-		local-&gt;dl_pri = dl;</div><div class='del'>-	} else if (ret == 0 &amp;&amp; dl &amp;&amp;</div><div class='del'>-		   param-&gt;dl_cmd == PRISM2_DOWNLOAD_VOLATILE_PERSISTENT) {</div><div class='del'>-		prism2_download_free_data(local-&gt;dl_sec);</div><div class='del'>-		local-&gt;dl_sec = dl;</div><div class='del'>-	} else</div><div class='del'>-		prism2_download_free_data(dl);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/intersil/hostap/hostap_hw.c b/drivers/net/wireless/intersil/hostap/hostap_hw.c<br/>deleted file mode 100644<br/>index 9a19046217df..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/hostap/hostap_hw.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_hw.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3383 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-/*</div><div class='del'>- * Host AP (software wireless LAN access point) driver for</div><div class='del'>- * Intersil Prism2/2.5/3.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen</div><div class='del'>- * &lt;j@w1.fi&gt;</div><div class='del'>- * Copyright (c) 2002-2005, Jouni Malinen &lt;j@w1.fi&gt;</div><div class='del'>- *</div><div class='del'>- * FIX:</div><div class='del'>- * - there is currently no way of associating TX packets to correct wds device</div><div class='del'>- *   when TX Exc/OK event occurs, so all tx_packets and some</div><div class='del'>- *   tx_errors/tx_dropped are added to the main netdevice; using sw_support</div><div class='del'>- *   field in txdesc might be used to fix this (using Alloc event to increment</div><div class='del'>- *   tx_packets would need some further info in txfid table)</div><div class='del'>- *</div><div class='del'>- * Buffer Access Path (BAP) usage:</div><div class='del'>- *   Prism2 cards have two separate BAPs for accessing the card memory. These</div><div class='del'>- *   should allow concurrent access to two different frames and the driver</div><div class='del'>- *   previously used BAP0 for sending data and BAP1 for receiving data.</div><div class='del'>- *   However, there seems to be number of issues with concurrent access and at</div><div class='del'>- *   least one know hardware bug in using BAP0 and BAP1 concurrently with PCI</div><div class='del'>- *   Prism2.5. Therefore, the driver now only uses BAP0 for moving data between</div><div class='del'>- *   host and card memories. BAP0 accesses are protected with local-&gt;baplock</div><div class='del'>- *   (spin_lock_bh) to prevent concurrent use.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;asm/delay.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;linux/sched/signal.h&gt;</div><div class='del'>-#include &lt;linux/rtnetlink.h&gt;</div><div class='del'>-#include &lt;linux/wireless.h&gt;</div><div class='del'>-#include &lt;net/iw_handler.h&gt;</div><div class='del'>-#include &lt;net/lib80211.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hostap_80211.h"</div><div class='del'>-#include "hostap.h"</div><div class='del'>-#include "hostap_ap.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* #define final_version */</div><div class='del'>-</div><div class='del'>-static int mtu = 1500;</div><div class='del'>-module_param(mtu, int, 0444);</div><div class='del'>-MODULE_PARM_DESC(mtu, "Maximum transfer unit");</div><div class='del'>-</div><div class='del'>-static int channel[MAX_PARM_DEVICES] = { 3, DEF_INTS };</div><div class='del'>-module_param_array(channel, int, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(channel, "Initial channel");</div><div class='del'>-</div><div class='del'>-static char essid[33] = "test";</div><div class='del'>-module_param_string(essid, essid, sizeof(essid), 0444);</div><div class='del'>-MODULE_PARM_DESC(essid, "Host AP's ESSID");</div><div class='del'>-</div><div class='del'>-static int iw_mode[MAX_PARM_DEVICES] = { IW_MODE_MASTER, DEF_INTS };</div><div class='del'>-module_param_array(iw_mode, int, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(iw_mode, "Initial operation mode");</div><div class='del'>-</div><div class='del'>-static int beacon_int[MAX_PARM_DEVICES] = { 100, DEF_INTS };</div><div class='del'>-module_param_array(beacon_int, int, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(beacon_int, "Beacon interval (1 = 1024 usec)");</div><div class='del'>-</div><div class='del'>-static int dtim_period[MAX_PARM_DEVICES] = { 1, DEF_INTS };</div><div class='del'>-module_param_array(dtim_period, int, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(dtim_period, "DTIM period");</div><div class='del'>-</div><div class='del'>-static char dev_template[16] = "wlan%d";</div><div class='del'>-module_param_string(dev_template, dev_template, sizeof(dev_template), 0444);</div><div class='del'>-MODULE_PARM_DESC(dev_template, "Prefix for network device name (default: "</div><div class='del'>-		 "wlan%d)");</div><div class='del'>-</div><div class='del'>-#ifdef final_version</div><div class='del'>-#define EXTRA_EVENTS_WTERR 0</div><div class='del'>-#else</div><div class='del'>-/* check WTERR events (Wait Time-out) in development versions */</div><div class='del'>-#define EXTRA_EVENTS_WTERR HFA384X_EV_WTERR</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Events that will be using BAP0 */</div><div class='del'>-#define HFA384X_BAP0_EVENTS \</div><div class='del'>-	(HFA384X_EV_TXEXC | HFA384X_EV_RX | HFA384X_EV_INFO | HFA384X_EV_TX)</div><div class='del'>-</div><div class='del'>-/* event mask, i.e., events that will result in an interrupt */</div><div class='del'>-#define HFA384X_EVENT_MASK \</div><div class='del'>-	(HFA384X_BAP0_EVENTS | HFA384X_EV_ALLOC | HFA384X_EV_INFDROP | \</div><div class='del'>-	HFA384X_EV_CMD | HFA384X_EV_TICK | \</div><div class='del'>-	EXTRA_EVENTS_WTERR)</div><div class='del'>-</div><div class='del'>-/* Default TX control flags: use 802.11 headers and request interrupt for</div><div class='del'>- * failed transmits. Frames that request ACK callback, will add</div><div class='del'>- * _TX_OK flag and _ALT_RTRY flag may be used to select different retry policy.</div><div class='del'>- */</div><div class='del'>-#define HFA384X_TX_CTRL_FLAGS \</div><div class='del'>-	(HFA384X_TX_CTRL_802_11 | HFA384X_TX_CTRL_TX_EX)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* ca. 1 usec */</div><div class='del'>-#define HFA384X_CMD_BUSY_TIMEOUT 5000</div><div class='del'>-#define HFA384X_BAP_BUSY_TIMEOUT 50000</div><div class='del'>-</div><div class='del'>-/* ca. 10 usec */</div><div class='del'>-#define HFA384X_CMD_COMPL_TIMEOUT 20000</div><div class='del'>-#define HFA384X_DL_COMPL_TIMEOUT 1000000</div><div class='del'>-</div><div class='del'>-/* Wait times for initialization; yield to other processes to avoid busy</div><div class='del'>- * waiting for long time. */</div><div class='del'>-#define HFA384X_INIT_TIMEOUT (HZ / 2) /* 500 ms */</div><div class='del'>-#define HFA384X_ALLOC_COMPL_TIMEOUT (HZ / 20) /* 50 ms */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void prism2_hw_reset(struct net_device *dev);</div><div class='del'>-static void prism2_check_sta_fw_version(local_info_t *local);</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_DOWNLOAD_SUPPORT</div><div class='del'>-/* hostap_download.c */</div><div class='del'>-static const struct proc_ops prism2_download_aux_dump_proc_ops;</div><div class='del'>-static u8 * prism2_read_pda(struct net_device *dev);</div><div class='del'>-static int prism2_download(local_info_t *local,</div><div class='del'>-			   struct prism2_download_param *param);</div><div class='del'>-static void prism2_download_free_data(struct prism2_download_data *dl);</div><div class='del'>-static int prism2_download_volatile(local_info_t *local,</div><div class='del'>-				    struct prism2_download_data *param);</div><div class='del'>-static int prism2_download_genesis(local_info_t *local,</div><div class='del'>-				   struct prism2_download_data *param);</div><div class='del'>-static int prism2_get_ram_size(local_info_t *local);</div><div class='del'>-#endif /* PRISM2_DOWNLOAD_SUPPORT */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef final_version</div><div class='del'>-/* magic value written to SWSUPPORT0 reg. for detecting whether card is still</div><div class='del'>- * present */</div><div class='del'>-#define HFA384X_MAGIC 0x8A32</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void hfa384x_read_regs(struct net_device *dev,</div><div class='del'>-			      struct hfa384x_regs *regs)</div><div class='del'>-{</div><div class='del'>-	regs-&gt;cmd = HFA384X_INW(HFA384X_CMD_OFF);</div><div class='del'>-	regs-&gt;evstat = HFA384X_INW(HFA384X_EVSTAT_OFF);</div><div class='del'>-	regs-&gt;offset0 = HFA384X_INW(HFA384X_OFFSET0_OFF);</div><div class='del'>-	regs-&gt;offset1 = HFA384X_INW(HFA384X_OFFSET1_OFF);</div><div class='del'>-	regs-&gt;swsupport0 = HFA384X_INW(HFA384X_SWSUPPORT0_OFF);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __hostap_cmd_queue_free - Free Prism2 command queue entry (private)</div><div class='del'>- * @local: pointer to private Host AP driver data</div><div class='del'>- * @entry: Prism2 command queue entry to be freed</div><div class='del'>- * @del_req: request the entry to be removed</div><div class='del'>- *</div><div class='del'>- * Internal helper function for freeing Prism2 command queue entries.</div><div class='del'>- * Caller must have acquired local-&gt;cmdlock before calling this function.</div><div class='del'>- */</div><div class='del'>-static inline void __hostap_cmd_queue_free(local_info_t *local,</div><div class='del'>-					   struct hostap_cmd_queue *entry,</div><div class='del'>-					   int del_req)</div><div class='del'>-{</div><div class='del'>-	if (del_req) {</div><div class='del'>-		entry-&gt;del_req = 1;</div><div class='del'>-		if (!list_empty(&amp;entry-&gt;list)) {</div><div class='del'>-			list_del_init(&amp;entry-&gt;list);</div><div class='del'>-			local-&gt;cmd_queue_len--;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (refcount_dec_and_test(&amp;entry-&gt;usecnt) &amp;&amp; entry-&gt;del_req)</div><div class='del'>-		kfree(entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * hostap_cmd_queue_free - Free Prism2 command queue entry</div><div class='del'>- * @local: pointer to private Host AP driver data</div><div class='del'>- * @entry: Prism2 command queue entry to be freed</div><div class='del'>- * @del_req: request the entry to be removed</div><div class='del'>- *</div><div class='del'>- * Free a Prism2 command queue entry.</div><div class='del'>- */</div><div class='del'>-static inline void hostap_cmd_queue_free(local_info_t *local,</div><div class='del'>-					 struct hostap_cmd_queue *entry,</div><div class='del'>-					 int del_req)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;cmdlock, flags);</div><div class='del'>-	__hostap_cmd_queue_free(local, entry, del_req);</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;cmdlock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * prism2_clear_cmd_queue - Free all pending Prism2 command queue entries</div><div class='del'>- * @local: pointer to private Host AP driver data</div><div class='del'>- */</div><div class='del'>-static void prism2_clear_cmd_queue(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	struct list_head *ptr, *n;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct hostap_cmd_queue *entry;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;cmdlock, flags);</div><div class='del'>-	list_for_each_safe(ptr, n, &amp;local-&gt;cmd_queue) {</div><div class='del'>-		entry = list_entry(ptr, struct hostap_cmd_queue, list);</div><div class='del'>-		refcount_inc(&amp;entry-&gt;usecnt);</div><div class='del'>-		printk(KERN_DEBUG "%s: removed pending cmd_queue entry "</div><div class='del'>-		       "(type=%d, cmd=0x%04x, param0=0x%04x)\n",</div><div class='del'>-		       local-&gt;dev-&gt;name, entry-&gt;type, entry-&gt;cmd,</div><div class='del'>-		       entry-&gt;param0);</div><div class='del'>-		__hostap_cmd_queue_free(local, entry, 1);</div><div class='del'>-	}</div><div class='del'>-	if (local-&gt;cmd_queue_len) {</div><div class='del'>-		/* This should not happen; print debug message and clear</div><div class='del'>-		 * queue length. */</div><div class='del'>-		printk(KERN_DEBUG "%s: cmd_queue_len (%d) not zero after "</div><div class='del'>-		       "flush\n", local-&gt;dev-&gt;name, local-&gt;cmd_queue_len);</div><div class='del'>-		local-&gt;cmd_queue_len = 0;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;cmdlock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * hfa384x_cmd_issue - Issue a Prism2 command to the hardware</div><div class='del'>- * @dev: pointer to net_device</div><div class='del'>- * @entry: Prism2 command queue entry to be issued</div><div class='del'>- */</div><div class='del'>-static int hfa384x_cmd_issue(struct net_device *dev,</div><div class='del'>-				    struct hostap_cmd_queue *entry)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int tries;</div><div class='del'>-	u16 reg;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;card_present &amp;&amp; !local-&gt;func-&gt;card_present(local))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if (entry-&gt;issued) {</div><div class='del'>-		printk(KERN_DEBUG "%s: driver bug - re-issuing command @%p\n",</div><div class='del'>-		       dev-&gt;name, entry);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* wait until busy bit is clear; this should always be clear since the</div><div class='del'>-	 * commands are serialized */</div><div class='del'>-	tries = HFA384X_CMD_BUSY_TIMEOUT;</div><div class='del'>-	while (HFA384X_INW(HFA384X_CMD_OFF) &amp; HFA384X_CMD_BUSY &amp;&amp; tries &gt; 0) {</div><div class='del'>-		tries--;</div><div class='del'>-		udelay(1);</div><div class='del'>-	}</div><div class='del'>-#ifndef final_version</div><div class='del'>-	if (tries != HFA384X_CMD_BUSY_TIMEOUT) {</div><div class='del'>-		prism2_io_debug_error(dev, 1);</div><div class='del'>-		printk(KERN_DEBUG "%s: hfa384x_cmd_issue: cmd reg was busy "</div><div class='del'>-		       "for %d usec\n", dev-&gt;name,</div><div class='del'>-		       HFA384X_CMD_BUSY_TIMEOUT - tries);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	if (tries == 0) {</div><div class='del'>-		reg = HFA384X_INW(HFA384X_CMD_OFF);</div><div class='del'>-		prism2_io_debug_error(dev, 2);</div><div class='del'>-		printk(KERN_DEBUG "%s: hfa384x_cmd_issue - timeout - "</div><div class='del'>-		       "reg=0x%04x\n", dev-&gt;name, reg);</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* write command */</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;cmdlock, flags);</div><div class='del'>-	HFA384X_OUTW(entry-&gt;param0, HFA384X_PARAM0_OFF);</div><div class='del'>-	HFA384X_OUTW(entry-&gt;param1, HFA384X_PARAM1_OFF);</div><div class='del'>-	HFA384X_OUTW(entry-&gt;cmd, HFA384X_CMD_OFF);</div><div class='del'>-	entry-&gt;issued = 1;</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;cmdlock, flags);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * hfa384x_cmd - Issue a Prism2 command and wait (sleep) for completion</div><div class='del'>- * @dev: pointer to net_device</div><div class='del'>- * @cmd: Prism2 command code (HFA384X_CMD_CODE_*)</div><div class='del'>- * @param0: value for Param0 register</div><div class='del'>- * @param1: value for Param1 register (pointer; %NULL if not used)</div><div class='del'>- * @resp0: pointer for Resp0 data or %NULL if Resp0 is not needed</div><div class='del'>- *</div><div class='del'>- * Issue given command (possibly after waiting in command queue) and sleep</div><div class='del'>- * until the command is completed (or timed out or interrupted). This can be</div><div class='del'>- * called only from user process context.</div><div class='del'>- */</div><div class='del'>-static int hfa384x_cmd(struct net_device *dev, u16 cmd, u16 param0,</div><div class='del'>-		       u16 *param1, u16 *resp0)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int err, res, issue, issued = 0;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct hostap_cmd_queue *entry;</div><div class='del'>-	DECLARE_WAITQUEUE(wait, current);</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;cmd_queue_len &gt;= HOSTAP_CMD_QUEUE_MAX_LEN) {</div><div class='del'>-		printk(KERN_DEBUG "%s: hfa384x_cmd: cmd_queue full\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (signal_pending(current))</div><div class='del'>-		return -EINTR;</div><div class='del'>-</div><div class='del'>-	entry = kzalloc(sizeof(*entry), GFP_ATOMIC);</div><div class='del'>-	if (entry == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	refcount_set(&amp;entry-&gt;usecnt, 1);</div><div class='del'>-	entry-&gt;type = CMD_SLEEP;</div><div class='del'>-	entry-&gt;cmd = cmd;</div><div class='del'>-	entry-&gt;param0 = param0;</div><div class='del'>-	if (param1)</div><div class='del'>-		entry-&gt;param1 = *param1;</div><div class='del'>-	init_waitqueue_head(&amp;entry-&gt;compl);</div><div class='del'>-</div><div class='del'>-	/* prepare to wait for command completion event, but do not sleep yet</div><div class='del'>-	 */</div><div class='del'>-	add_wait_queue(&amp;entry-&gt;compl, &amp;wait);</div><div class='del'>-	set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;cmdlock, flags);</div><div class='del'>-	issue = list_empty(&amp;local-&gt;cmd_queue);</div><div class='del'>-	if (issue)</div><div class='del'>-		entry-&gt;issuing = 1;</div><div class='del'>-	list_add_tail(&amp;entry-&gt;list, &amp;local-&gt;cmd_queue);</div><div class='del'>-	local-&gt;cmd_queue_len++;</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;cmdlock, flags);</div><div class='del'>-</div><div class='del'>-	err = 0;</div><div class='del'>-	if (!issue)</div><div class='del'>-		goto wait_completion;</div><div class='del'>-</div><div class='del'>-	if (signal_pending(current))</div><div class='del'>-		err = -EINTR;</div><div class='del'>-</div><div class='del'>-	if (!err) {</div><div class='del'>-		if (hfa384x_cmd_issue(dev, entry))</div><div class='del'>-			err = -ETIMEDOUT;</div><div class='del'>-		else</div><div class='del'>-			issued = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- wait_completion:</div><div class='del'>-	if (!err &amp;&amp; entry-&gt;type != CMD_COMPLETED) {</div><div class='del'>-		/* sleep until command is completed or timed out */</div><div class='del'>-		res = schedule_timeout(2 * HZ);</div><div class='del'>-	} else</div><div class='del'>-		res = -1;</div><div class='del'>-</div><div class='del'>-	if (!err &amp;&amp; signal_pending(current))</div><div class='del'>-		err = -EINTR;</div><div class='del'>-</div><div class='del'>-	if (err &amp;&amp; issued) {</div><div class='del'>-		/* the command was issued, so a CmdCompl event should occur</div><div class='del'>-		 * soon; however, there's a pending signal and</div><div class='del'>-		 * schedule_timeout() would be interrupted; wait a short period</div><div class='del'>-		 * of time to avoid removing entry from the list before</div><div class='del'>-		 * CmdCompl event */</div><div class='del'>-		udelay(300);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_current_state(TASK_RUNNING);</div><div class='del'>-	remove_wait_queue(&amp;entry-&gt;compl, &amp;wait);</div><div class='del'>-</div><div class='del'>-	/* If entry-&gt;list is still in the list, it must be removed</div><div class='del'>-	 * first and in this case prism2_cmd_ev() does not yet have</div><div class='del'>-	 * local reference to it, and the data can be kfree()'d</div><div class='del'>-	 * here. If the command completion event is still generated,</div><div class='del'>-	 * it will be assigned to next (possibly) pending command, but</div><div class='del'>-	 * the driver will reset the card anyway due to timeout</div><div class='del'>-	 *</div><div class='del'>-	 * If the entry is not in the list prism2_cmd_ev() has a local</div><div class='del'>-	 * reference to it, but keeps cmdlock as long as the data is</div><div class='del'>-	 * needed, so the data can be kfree()'d here. */</div><div class='del'>-</div><div class='del'>-	/* FIX: if the entry-&gt;list is in the list, it has not been completed</div><div class='del'>-	 * yet, so removing it here is somewhat wrong.. this could cause</div><div class='del'>-	 * references to freed memory and next list_del() causing NULL pointer</div><div class='del'>-	 * dereference.. it would probably be better to leave the entry in the</div><div class='del'>-	 * list and the list should be emptied during hw reset */</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;cmdlock, flags);</div><div class='del'>-	if (!list_empty(&amp;entry-&gt;list)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: hfa384x_cmd: entry still in list? "</div><div class='del'>-		       "(entry=%p, type=%d, res=%d)\n", dev-&gt;name, entry,</div><div class='del'>-		       entry-&gt;type, res);</div><div class='del'>-		list_del_init(&amp;entry-&gt;list);</div><div class='del'>-		local-&gt;cmd_queue_len--;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;cmdlock, flags);</div><div class='del'>-</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_DEBUG "%s: hfa384x_cmd: interrupted; err=%d\n",</div><div class='del'>-		       dev-&gt;name, err);</div><div class='del'>-		res = err;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (entry-&gt;type != CMD_COMPLETED) {</div><div class='del'>-		u16 reg = HFA384X_INW(HFA384X_EVSTAT_OFF);</div><div class='del'>-		printk(KERN_DEBUG "%s: hfa384x_cmd: command was not "</div><div class='del'>-		       "completed (res=%d, entry=%p, type=%d, cmd=0x%04x, "</div><div class='del'>-		       "param0=0x%04x, EVSTAT=%04x INTEN=%04x)\n", dev-&gt;name,</div><div class='del'>-		       res, entry, entry-&gt;type, entry-&gt;cmd, entry-&gt;param0, reg,</div><div class='del'>-		       HFA384X_INW(HFA384X_INTEN_OFF));</div><div class='del'>-		if (reg &amp; HFA384X_EV_CMD) {</div><div class='del'>-			/* Command completion event is pending, but the</div><div class='del'>-			 * interrupt was not delivered - probably an issue</div><div class='del'>-			 * with pcmcia-cs configuration. */</div><div class='del'>-			printk(KERN_WARNING "%s: interrupt delivery does not "</div><div class='del'>-			       "seem to work\n", dev-&gt;name);</div><div class='del'>-		}</div><div class='del'>-		prism2_io_debug_error(dev, 3);</div><div class='del'>-		res = -ETIMEDOUT;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (resp0 != NULL)</div><div class='del'>-		*resp0 = entry-&gt;resp0;</div><div class='del'>-#ifndef final_version</div><div class='del'>-	if (entry-&gt;res) {</div><div class='del'>-		printk(KERN_DEBUG "%s: CMD=0x%04x =&gt; res=0x%02x, "</div><div class='del'>-		       "resp0=0x%04x\n",</div><div class='del'>-		       dev-&gt;name, cmd, entry-&gt;res, entry-&gt;resp0);</div><div class='del'>-	}</div><div class='del'>-#endif /* final_version */</div><div class='del'>-</div><div class='del'>-	res = entry-&gt;res;</div><div class='del'>- done:</div><div class='del'>-	hostap_cmd_queue_free(local, entry, 1);</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * hfa384x_cmd_callback - Issue a Prism2 command; callback when completed</div><div class='del'>- * @dev: pointer to net_device</div><div class='del'>- * @cmd: Prism2 command code (HFA384X_CMD_CODE_*)</div><div class='del'>- * @param0: value for Param0 register</div><div class='del'>- * @callback: command completion callback function (%NULL = no callback)</div><div class='del'>- * @context: context data to be given to the callback function</div><div class='del'>- *</div><div class='del'>- * Issue given command (possibly after waiting in command queue) and use</div><div class='del'>- * callback function to indicate command completion. This can be called both</div><div class='del'>- * from user and interrupt context. The callback function will be called in</div><div class='del'>- * hardware IRQ context. It can be %NULL, when no function is called when</div><div class='del'>- * command is completed.</div><div class='del'>- */</div><div class='del'>-static int hfa384x_cmd_callback(struct net_device *dev, u16 cmd, u16 param0,</div><div class='del'>-				void (*callback)(struct net_device *dev,</div><div class='del'>-						 long context, u16 resp0,</div><div class='del'>-						 u16 status),</div><div class='del'>-				long context)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int issue, ret;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct hostap_cmd_queue *entry;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;cmd_queue_len &gt;= HOSTAP_CMD_QUEUE_MAX_LEN + 2) {</div><div class='del'>-		printk(KERN_DEBUG "%s: hfa384x_cmd: cmd_queue full\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	entry = kzalloc(sizeof(*entry), GFP_ATOMIC);</div><div class='del'>-	if (entry == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	refcount_set(&amp;entry-&gt;usecnt, 1);</div><div class='del'>-	entry-&gt;type = CMD_CALLBACK;</div><div class='del'>-	entry-&gt;cmd = cmd;</div><div class='del'>-	entry-&gt;param0 = param0;</div><div class='del'>-	entry-&gt;callback = callback;</div><div class='del'>-	entry-&gt;context = context;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;cmdlock, flags);</div><div class='del'>-	issue = list_empty(&amp;local-&gt;cmd_queue);</div><div class='del'>-	if (issue)</div><div class='del'>-		entry-&gt;issuing = 1;</div><div class='del'>-	list_add_tail(&amp;entry-&gt;list, &amp;local-&gt;cmd_queue);</div><div class='del'>-	local-&gt;cmd_queue_len++;</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;cmdlock, flags);</div><div class='del'>-</div><div class='del'>-	if (issue &amp;&amp; hfa384x_cmd_issue(dev, entry))</div><div class='del'>-		ret = -ETIMEDOUT;</div><div class='del'>-	else</div><div class='del'>-		ret = 0;</div><div class='del'>-</div><div class='del'>-	hostap_cmd_queue_free(local, entry, ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __hfa384x_cmd_no_wait - Issue a Prism2 command (private)</div><div class='del'>- * @dev: pointer to net_device</div><div class='del'>- * @cmd: Prism2 command code (HFA384X_CMD_CODE_*)</div><div class='del'>- * @param0: value for Param0 register</div><div class='del'>- * @io_debug_num: I/O debug error number</div><div class='del'>- *</div><div class='del'>- * Shared helper function for hfa384x_cmd_wait() and hfa384x_cmd_no_wait().</div><div class='del'>- */</div><div class='del'>-static int __hfa384x_cmd_no_wait(struct net_device *dev, u16 cmd, u16 param0,</div><div class='del'>-				 int io_debug_num)</div><div class='del'>-{</div><div class='del'>-	int tries;</div><div class='del'>-	u16 reg;</div><div class='del'>-</div><div class='del'>-	/* wait until busy bit is clear; this should always be clear since the</div><div class='del'>-	 * commands are serialized */</div><div class='del'>-	tries = HFA384X_CMD_BUSY_TIMEOUT;</div><div class='del'>-	while (HFA384X_INW(HFA384X_CMD_OFF) &amp; HFA384X_CMD_BUSY &amp;&amp; tries &gt; 0) {</div><div class='del'>-		tries--;</div><div class='del'>-		udelay(1);</div><div class='del'>-	}</div><div class='del'>-	if (tries == 0) {</div><div class='del'>-		reg = HFA384X_INW(HFA384X_CMD_OFF);</div><div class='del'>-		prism2_io_debug_error(dev, io_debug_num);</div><div class='del'>-		printk(KERN_DEBUG "%s: __hfa384x_cmd_no_wait(%d) - timeout - "</div><div class='del'>-		       "reg=0x%04x\n", dev-&gt;name, io_debug_num, reg);</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* write command */</div><div class='del'>-	HFA384X_OUTW(param0, HFA384X_PARAM0_OFF);</div><div class='del'>-	HFA384X_OUTW(cmd, HFA384X_CMD_OFF);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * hfa384x_cmd_wait - Issue a Prism2 command and busy wait for completion</div><div class='del'>- * @dev: pointer to net_device</div><div class='del'>- * @cmd: Prism2 command code (HFA384X_CMD_CODE_*)</div><div class='del'>- * @param0: value for Param0 register</div><div class='del'>- */</div><div class='del'>-static int hfa384x_cmd_wait(struct net_device *dev, u16 cmd, u16 param0)</div><div class='del'>-{</div><div class='del'>-	int res, tries;</div><div class='del'>-	u16 reg;</div><div class='del'>-</div><div class='del'>-	res = __hfa384x_cmd_no_wait(dev, cmd, param0, 4);</div><div class='del'>-	if (res)</div><div class='del'>-		return res;</div><div class='del'>-</div><div class='del'>-        /* wait for command completion */</div><div class='del'>-	if ((cmd &amp; HFA384X_CMDCODE_MASK) == HFA384X_CMDCODE_DOWNLOAD)</div><div class='del'>-		tries = HFA384X_DL_COMPL_TIMEOUT;</div><div class='del'>-	else</div><div class='del'>-		tries = HFA384X_CMD_COMPL_TIMEOUT;</div><div class='del'>-</div><div class='del'>-        while (!(HFA384X_INW(HFA384X_EVSTAT_OFF) &amp; HFA384X_EV_CMD) &amp;&amp;</div><div class='del'>-               tries &gt; 0) {</div><div class='del'>-                tries--;</div><div class='del'>-                udelay(10);</div><div class='del'>-        }</div><div class='del'>-        if (tries == 0) {</div><div class='del'>-                reg = HFA384X_INW(HFA384X_EVSTAT_OFF);</div><div class='del'>-		prism2_io_debug_error(dev, 5);</div><div class='del'>-                printk(KERN_DEBUG "%s: hfa384x_cmd_wait - timeout2 - "</div><div class='del'>-		       "reg=0x%04x\n", dev-&gt;name, reg);</div><div class='del'>-                return -ETIMEDOUT;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        res = (HFA384X_INW(HFA384X_STATUS_OFF) &amp;</div><div class='del'>-               (BIT(14) | BIT(13) | BIT(12) | BIT(11) | BIT(10) | BIT(9) |</div><div class='del'>-                BIT(8))) &gt;&gt; 8;</div><div class='del'>-#ifndef final_version</div><div class='del'>-	if (res) {</div><div class='del'>-		printk(KERN_DEBUG "%s: CMD=0x%04x =&gt; res=0x%02x\n",</div><div class='del'>-		       dev-&gt;name, cmd, res);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	HFA384X_OUTW(HFA384X_EV_CMD, HFA384X_EVACK_OFF);</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * hfa384x_cmd_no_wait - Issue a Prism2 command; do not wait for completion</div><div class='del'>- * @dev: pointer to net_device</div><div class='del'>- * @cmd: Prism2 command code (HFA384X_CMD_CODE_*)</div><div class='del'>- * @param0: value for Param0 register</div><div class='del'>- */</div><div class='del'>-static inline int hfa384x_cmd_no_wait(struct net_device *dev, u16 cmd,</div><div class='del'>-				      u16 param0)</div><div class='del'>-{</div><div class='del'>-	return __hfa384x_cmd_no_wait(dev, cmd, param0, 6);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * prism2_cmd_ev - Prism2 command completion event handler</div><div class='del'>- * @dev: pointer to net_device</div><div class='del'>- *</div><div class='del'>- * Interrupt handler for command completion events. Called by the main</div><div class='del'>- * interrupt handler in hardware IRQ context. Read Resp0 and status registers</div><div class='del'>- * from the hardware and ACK the event. Depending on the issued command type</div><div class='del'>- * either wake up the sleeping process that is waiting for command completion</div><div class='del'>- * or call the callback function. Issue the next command, if one is pending.</div><div class='del'>- */</div><div class='del'>-static void prism2_cmd_ev(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	struct hostap_cmd_queue *entry = NULL;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;local-&gt;cmdlock);</div><div class='del'>-	if (!list_empty(&amp;local-&gt;cmd_queue)) {</div><div class='del'>-		entry = list_entry(local-&gt;cmd_queue.next,</div><div class='del'>-				   struct hostap_cmd_queue, list);</div><div class='del'>-		refcount_inc(&amp;entry-&gt;usecnt);</div><div class='del'>-		list_del_init(&amp;entry-&gt;list);</div><div class='del'>-		local-&gt;cmd_queue_len--;</div><div class='del'>-</div><div class='del'>-		if (!entry-&gt;issued) {</div><div class='del'>-			printk(KERN_DEBUG "%s: Command completion event, but "</div><div class='del'>-			       "cmd not issued\n", dev-&gt;name);</div><div class='del'>-			__hostap_cmd_queue_free(local, entry, 1);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;local-&gt;cmdlock);</div><div class='del'>-</div><div class='del'>-	if (!entry) {</div><div class='del'>-		HFA384X_OUTW(HFA384X_EV_CMD, HFA384X_EVACK_OFF);</div><div class='del'>-		printk(KERN_DEBUG "%s: Command completion event, but no "</div><div class='del'>-		       "pending commands\n", dev-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	entry-&gt;resp0 = HFA384X_INW(HFA384X_RESP0_OFF);</div><div class='del'>-	entry-&gt;res = (HFA384X_INW(HFA384X_STATUS_OFF) &amp;</div><div class='del'>-		      (BIT(14) | BIT(13) | BIT(12) | BIT(11) | BIT(10) |</div><div class='del'>-		       BIT(9) | BIT(8))) &gt;&gt; 8;</div><div class='del'>-	HFA384X_OUTW(HFA384X_EV_CMD, HFA384X_EVACK_OFF);</div><div class='del'>-</div><div class='del'>-	/* TODO: rest of the CmdEv handling could be moved to tasklet */</div><div class='del'>-	if (entry-&gt;type == CMD_SLEEP) {</div><div class='del'>-		entry-&gt;type = CMD_COMPLETED;</div><div class='del'>-		wake_up_interruptible(&amp;entry-&gt;compl);</div><div class='del'>-	} else if (entry-&gt;type == CMD_CALLBACK) {</div><div class='del'>-		if (entry-&gt;callback)</div><div class='del'>-			entry-&gt;callback(dev, entry-&gt;context, entry-&gt;resp0,</div><div class='del'>-					entry-&gt;res);</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_DEBUG "%s: Invalid command completion type %d\n",</div><div class='del'>-		       dev-&gt;name, entry-&gt;type);</div><div class='del'>-	}</div><div class='del'>-	hostap_cmd_queue_free(local, entry, 1);</div><div class='del'>-</div><div class='del'>-	/* issue next command, if pending */</div><div class='del'>-	entry = NULL;</div><div class='del'>-	spin_lock(&amp;local-&gt;cmdlock);</div><div class='del'>-	if (!list_empty(&amp;local-&gt;cmd_queue)) {</div><div class='del'>-		entry = list_entry(local-&gt;cmd_queue.next,</div><div class='del'>-				   struct hostap_cmd_queue, list);</div><div class='del'>-		if (entry-&gt;issuing) {</div><div class='del'>-			/* hfa384x_cmd() has already started issuing this</div><div class='del'>-			 * command, so do not start here */</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='del'>-		if (entry)</div><div class='del'>-			refcount_inc(&amp;entry-&gt;usecnt);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;local-&gt;cmdlock);</div><div class='del'>-</div><div class='del'>-	if (entry) {</div><div class='del'>-		/* issue next command; if command issuing fails, remove the</div><div class='del'>-		 * entry from cmd_queue */</div><div class='del'>-		int res = hfa384x_cmd_issue(dev, entry);</div><div class='del'>-		spin_lock(&amp;local-&gt;cmdlock);</div><div class='del'>-		__hostap_cmd_queue_free(local, entry, res);</div><div class='del'>-		spin_unlock(&amp;local-&gt;cmdlock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int hfa384x_wait_offset(struct net_device *dev, u16 o_off)</div><div class='del'>-{</div><div class='del'>-	int tries = HFA384X_BAP_BUSY_TIMEOUT;</div><div class='del'>-	int res = HFA384X_INW(o_off) &amp; HFA384X_OFFSET_BUSY;</div><div class='del'>-</div><div class='del'>-	while (res &amp;&amp; tries &gt; 0) {</div><div class='del'>-		tries--;</div><div class='del'>-		udelay(1);</div><div class='del'>-		res = HFA384X_INW(o_off) &amp; HFA384X_OFFSET_BUSY;</div><div class='del'>-	}</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Offset must be even */</div><div class='del'>-static int hfa384x_setup_bap(struct net_device *dev, u16 bap, u16 id,</div><div class='del'>-			     int offset)</div><div class='del'>-{</div><div class='del'>-	u16 o_off, s_off;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (offset % 2 || bap &gt; 1)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (bap == BAP1) {</div><div class='del'>-		o_off = HFA384X_OFFSET1_OFF;</div><div class='del'>-		s_off = HFA384X_SELECT1_OFF;</div><div class='del'>-	} else {</div><div class='del'>-		o_off = HFA384X_OFFSET0_OFF;</div><div class='del'>-		s_off = HFA384X_SELECT0_OFF;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hfa384x_wait_offset(dev, o_off)) {</div><div class='del'>-		prism2_io_debug_error(dev, 7);</div><div class='del'>-		printk(KERN_DEBUG "%s: hfa384x_setup_bap - timeout before\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		ret = -ETIMEDOUT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HFA384X_OUTW(id, s_off);</div><div class='del'>-	HFA384X_OUTW(offset, o_off);</div><div class='del'>-</div><div class='del'>-	if (hfa384x_wait_offset(dev, o_off)) {</div><div class='del'>-		prism2_io_debug_error(dev, 8);</div><div class='del'>-		printk(KERN_DEBUG "%s: hfa384x_setup_bap - timeout after\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		ret = -ETIMEDOUT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-#ifndef final_version</div><div class='del'>-	if (HFA384X_INW(o_off) &amp; HFA384X_OFFSET_ERR) {</div><div class='del'>-		prism2_io_debug_error(dev, 9);</div><div class='del'>-		printk(KERN_DEBUG "%s: hfa384x_setup_bap - offset error "</div><div class='del'>-		       "(%d,0x04%x,%d); reg=0x%04x\n",</div><div class='del'>-		       dev-&gt;name, bap, id, offset, HFA384X_INW(o_off));</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int hfa384x_get_rid(struct net_device *dev, u16 rid, void *buf, int len,</div><div class='del'>-			   int exact_len)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int res, rlen = 0;</div><div class='del'>-	struct hfa384x_rid_hdr rec;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;no_pri) {</div><div class='del'>-		printk(KERN_DEBUG "%s: cannot get RID %04x (len=%d) - no PRI "</div><div class='del'>-		       "f/w\n", dev-&gt;name, rid, len);</div><div class='del'>-		return -ENOTTY; /* Well.. not really correct, but return</div><div class='del'>-				 * something unique enough.. */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((local-&gt;func-&gt;card_present &amp;&amp; !local-&gt;func-&gt;card_present(local)) ||</div><div class='del'>-	    local-&gt;hw_downloading)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	res = mutex_lock_interruptible(&amp;local-&gt;rid_bap_mtx);</div><div class='del'>-	if (res)</div><div class='del'>-		return res;</div><div class='del'>-</div><div class='del'>-	res = hfa384x_cmd(dev, HFA384X_CMDCODE_ACCESS, rid, NULL, NULL);</div><div class='del'>-	if (res) {</div><div class='del'>-		printk(KERN_DEBUG "%s: hfa384x_get_rid: CMDCODE_ACCESS failed "</div><div class='del'>-		       "(res=%d, rid=%04x, len=%d)\n",</div><div class='del'>-		       dev-&gt;name, res, rid, len);</div><div class='del'>-		mutex_unlock(&amp;local-&gt;rid_bap_mtx);</div><div class='del'>-		return res;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;local-&gt;baplock);</div><div class='del'>-</div><div class='del'>-	res = hfa384x_setup_bap(dev, BAP0, rid, 0);</div><div class='del'>-	if (res)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	res = hfa384x_from_bap(dev, BAP0, &amp;rec, sizeof(rec));</div><div class='del'>-	if (res)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(rec.len) == 0) {</div><div class='del'>-		/* RID not available */</div><div class='del'>-		res = -ENODATA;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rlen = (le16_to_cpu(rec.len) - 1) * 2;</div><div class='del'>-	if (exact_len &amp;&amp; rlen != len) {</div><div class='del'>-		printk(KERN_DEBUG "%s: hfa384x_get_rid - RID len mismatch: "</div><div class='del'>-		       "rid=0x%04x, len=%d (expected %d)\n",</div><div class='del'>-		       dev-&gt;name, rid, rlen, len);</div><div class='del'>-		res = -ENODATA;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	res = hfa384x_from_bap(dev, BAP0, buf, len);</div><div class='del'>-</div><div class='del'>-unlock:</div><div class='del'>-	spin_unlock_bh(&amp;local-&gt;baplock);</div><div class='del'>-	mutex_unlock(&amp;local-&gt;rid_bap_mtx);</div><div class='del'>-</div><div class='del'>-	if (res) {</div><div class='del'>-		if (res != -ENODATA)</div><div class='del'>-			printk(KERN_DEBUG "%s: hfa384x_get_rid (rid=%04x, "</div><div class='del'>-			       "len=%d) - failed - res=%d\n", dev-&gt;name, rid,</div><div class='del'>-			       len, res);</div><div class='del'>-		if (res == -ETIMEDOUT)</div><div class='del'>-			prism2_hw_reset(dev);</div><div class='del'>-		return res;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rlen;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int hfa384x_set_rid(struct net_device *dev, u16 rid, void *buf, int len)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	struct hfa384x_rid_hdr rec;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;no_pri) {</div><div class='del'>-		printk(KERN_DEBUG "%s: cannot set RID %04x (len=%d) - no PRI "</div><div class='del'>-		       "f/w\n", dev-&gt;name, rid, len);</div><div class='del'>-		return -ENOTTY; /* Well.. not really correct, but return</div><div class='del'>-				 * something unique enough.. */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((local-&gt;func-&gt;card_present &amp;&amp; !local-&gt;func-&gt;card_present(local)) ||</div><div class='del'>-	    local-&gt;hw_downloading)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	rec.rid = cpu_to_le16(rid);</div><div class='del'>-	/* RID len in words and +1 for rec.rid */</div><div class='del'>-	rec.len = cpu_to_le16(len / 2 + len % 2 + 1);</div><div class='del'>-</div><div class='del'>-	res = mutex_lock_interruptible(&amp;local-&gt;rid_bap_mtx);</div><div class='del'>-	if (res)</div><div class='del'>-		return res;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;local-&gt;baplock);</div><div class='del'>-	res = hfa384x_setup_bap(dev, BAP0, rid, 0);</div><div class='del'>-	if (!res)</div><div class='del'>-		res = hfa384x_to_bap(dev, BAP0, &amp;rec, sizeof(rec));</div><div class='del'>-	if (!res)</div><div class='del'>-		res = hfa384x_to_bap(dev, BAP0, buf, len);</div><div class='del'>-	spin_unlock_bh(&amp;local-&gt;baplock);</div><div class='del'>-</div><div class='del'>-	if (res) {</div><div class='del'>-		printk(KERN_DEBUG "%s: hfa384x_set_rid (rid=%04x, len=%d) - "</div><div class='del'>-		       "failed - res=%d\n", dev-&gt;name, rid, len, res);</div><div class='del'>-		mutex_unlock(&amp;local-&gt;rid_bap_mtx);</div><div class='del'>-		return res;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	res = hfa384x_cmd(dev, HFA384X_CMDCODE_ACCESS_WRITE, rid, NULL, NULL);</div><div class='del'>-	mutex_unlock(&amp;local-&gt;rid_bap_mtx);</div><div class='del'>-</div><div class='del'>-	if (res) {</div><div class='del'>-		printk(KERN_DEBUG "%s: hfa384x_set_rid: CMDCODE_ACCESS_WRITE "</div><div class='del'>-		       "failed (res=%d, rid=%04x, len=%d)\n",</div><div class='del'>-		       dev-&gt;name, res, rid, len);</div><div class='del'>-</div><div class='del'>-		if (res == -ETIMEDOUT)</div><div class='del'>-			prism2_hw_reset(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void hfa384x_disable_interrupts(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	/* disable interrupts and clear event status */</div><div class='del'>-	HFA384X_OUTW(0, HFA384X_INTEN_OFF);</div><div class='del'>-	HFA384X_OUTW(0xffff, HFA384X_EVACK_OFF);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void hfa384x_enable_interrupts(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	/* ack pending events and enable interrupts from selected events */</div><div class='del'>-	HFA384X_OUTW(0xffff, HFA384X_EVACK_OFF);</div><div class='del'>-	HFA384X_OUTW(HFA384X_EVENT_MASK, HFA384X_INTEN_OFF);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void hfa384x_events_no_bap0(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	HFA384X_OUTW(HFA384X_EVENT_MASK &amp; ~HFA384X_BAP0_EVENTS,</div><div class='del'>-		     HFA384X_INTEN_OFF);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void hfa384x_events_all(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	HFA384X_OUTW(HFA384X_EVENT_MASK, HFA384X_INTEN_OFF);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void hfa384x_events_only_cmd(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	HFA384X_OUTW(HFA384X_EV_CMD, HFA384X_INTEN_OFF);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static u16 hfa384x_allocate_fid(struct net_device *dev, int len)</div><div class='del'>-{</div><div class='del'>-	u16 fid;</div><div class='del'>-	unsigned long delay;</div><div class='del'>-</div><div class='del'>-	/* FIX: this could be replace with hfa384x_cmd() if the Alloc event</div><div class='del'>-	 * below would be handled like CmdCompl event (sleep here, wake up from</div><div class='del'>-	 * interrupt handler */</div><div class='del'>-	if (hfa384x_cmd_wait(dev, HFA384X_CMDCODE_ALLOC, len)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: cannot allocate fid, len=%d\n",</div><div class='del'>-		       dev-&gt;name, len);</div><div class='del'>-		return 0xffff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	delay = jiffies + HFA384X_ALLOC_COMPL_TIMEOUT;</div><div class='del'>-	while (!(HFA384X_INW(HFA384X_EVSTAT_OFF) &amp; HFA384X_EV_ALLOC) &amp;&amp;</div><div class='del'>-	       time_before(jiffies, delay))</div><div class='del'>-		yield();</div><div class='del'>-	if (!(HFA384X_INW(HFA384X_EVSTAT_OFF) &amp; HFA384X_EV_ALLOC)) {</div><div class='del'>-		printk("%s: fid allocate, len=%d - timeout\n", dev-&gt;name, len);</div><div class='del'>-		return 0xffff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fid = HFA384X_INW(HFA384X_ALLOCFID_OFF);</div><div class='del'>-	HFA384X_OUTW(HFA384X_EV_ALLOC, HFA384X_EVACK_OFF);</div><div class='del'>-</div><div class='del'>-	return fid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_reset_port(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (!local-&gt;dev_enabled)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	res = hfa384x_cmd(dev, HFA384X_CMDCODE_DISABLE, 0,</div><div class='del'>-			  NULL, NULL);</div><div class='del'>-	if (res)</div><div class='del'>-		printk(KERN_DEBUG "%s: reset port failed to disable port\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-	else {</div><div class='del'>-		res = hfa384x_cmd(dev, HFA384X_CMDCODE_ENABLE, 0,</div><div class='del'>-				  NULL, NULL);</div><div class='del'>-		if (res)</div><div class='del'>-			printk(KERN_DEBUG "%s: reset port failed to enable "</div><div class='del'>-			       "port\n", dev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* It looks like at least some STA firmware versions reset</div><div class='del'>-	 * fragmentation threshold back to 2346 after enable command. Restore</div><div class='del'>-	 * the configured value, if it differs from this default. */</div><div class='del'>-	if (local-&gt;fragm_threshold != 2346 &amp;&amp;</div><div class='del'>-	    hostap_set_word(dev, HFA384X_RID_FRAGMENTATIONTHRESHOLD,</div><div class='del'>-			    local-&gt;fragm_threshold)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: failed to restore fragmentation "</div><div class='del'>-		       "threshold (%d) after Port0 enable\n",</div><div class='del'>-		       dev-&gt;name, local-&gt;fragm_threshold);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Some firmwares lose antenna selection settings on reset */</div><div class='del'>-	(void) hostap_set_antsel(local);</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_get_version_info(struct net_device *dev, u16 rid,</div><div class='del'>-				   const char *txt)</div><div class='del'>-{</div><div class='del'>-	struct hfa384x_comp_ident comp;</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;no_pri) {</div><div class='del'>-		/* PRI f/w not yet available - cannot read RIDs */</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	if (hfa384x_get_rid(dev, rid, &amp;comp, sizeof(comp), 1) &lt; 0) {</div><div class='del'>-		printk(KERN_DEBUG "Could not get RID for component %s\n", txt);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "%s: %s: id=0x%02x v%d.%d.%d\n", dev-&gt;name, txt,</div><div class='del'>-	       __le16_to_cpu(comp.id), __le16_to_cpu(comp.major),</div><div class='del'>-	       __le16_to_cpu(comp.minor), __le16_to_cpu(comp.variant));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_setup_rids(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	__le16 tmp;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	hostap_set_word(dev, HFA384X_RID_TICKTIME, 2000);</div><div class='del'>-</div><div class='del'>-	if (!local-&gt;fw_ap) {</div><div class='del'>-		u16 tmp1 = hostap_get_porttype(local);</div><div class='del'>-		ret = hostap_set_word(dev, HFA384X_RID_CNFPORTTYPE, tmp1);</div><div class='del'>-		if (ret) {</div><div class='del'>-			printk("%s: Port type setting to %d failed\n",</div><div class='del'>-			       dev-&gt;name, tmp1);</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Setting SSID to empty string seems to kill the card in Host AP mode</div><div class='del'>-	 */</div><div class='del'>-	if (local-&gt;iw_mode != IW_MODE_MASTER || local-&gt;essid[0] != '\0') {</div><div class='del'>-		ret = hostap_set_string(dev, HFA384X_RID_CNFOWNSSID,</div><div class='del'>-					local-&gt;essid);</div><div class='del'>-		if (ret) {</div><div class='del'>-			printk("%s: AP own SSID setting failed\n", dev-&gt;name);</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = hostap_set_word(dev, HFA384X_RID_CNFMAXDATALEN,</div><div class='del'>-			      PRISM2_DATA_MAXLEN);</div><div class='del'>-	if (ret) {</div><div class='del'>-		printk("%s: MAC data length setting to %d failed\n",</div><div class='del'>-		       dev-&gt;name, PRISM2_DATA_MAXLEN);</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hfa384x_get_rid(dev, HFA384X_RID_CHANNELLIST, &amp;tmp, 2, 1) &lt; 0) {</div><div class='del'>-		printk("%s: Channel list read failed\n", dev-&gt;name);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-	local-&gt;channel_mask = le16_to_cpu(tmp);</div><div class='del'>-</div><div class='del'>-	if (local-&gt;channel &lt; 1 || local-&gt;channel &gt; 14 ||</div><div class='del'>-	    !(local-&gt;channel_mask &amp; (1 &lt;&lt; (local-&gt;channel - 1)))) {</div><div class='del'>-		printk(KERN_WARNING "%s: Channel setting out of range "</div><div class='del'>-		       "(%d)!\n", dev-&gt;name, local-&gt;channel);</div><div class='del'>-		ret = -EBUSY;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = hostap_set_word(dev, HFA384X_RID_CNFOWNCHANNEL, local-&gt;channel);</div><div class='del'>-	if (ret) {</div><div class='del'>-		printk("%s: Channel setting to %d failed\n",</div><div class='del'>-		       dev-&gt;name, local-&gt;channel);</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = hostap_set_word(dev, HFA384X_RID_CNFBEACONINT,</div><div class='del'>-			      local-&gt;beacon_int);</div><div class='del'>-	if (ret) {</div><div class='del'>-		printk("%s: Beacon interval setting to %d failed\n",</div><div class='del'>-		       dev-&gt;name, local-&gt;beacon_int);</div><div class='del'>-		/* this may fail with Symbol/Lucent firmware */</div><div class='del'>-		if (ret == -ETIMEDOUT)</div><div class='del'>-			goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = hostap_set_word(dev, HFA384X_RID_CNFOWNDTIMPERIOD,</div><div class='del'>-			      local-&gt;dtim_period);</div><div class='del'>-	if (ret) {</div><div class='del'>-		printk("%s: DTIM period setting to %d failed\n",</div><div class='del'>-		       dev-&gt;name, local-&gt;dtim_period);</div><div class='del'>-		/* this may fail with Symbol/Lucent firmware */</div><div class='del'>-		if (ret == -ETIMEDOUT)</div><div class='del'>-			goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = hostap_set_word(dev, HFA384X_RID_PROMISCUOUSMODE,</div><div class='del'>-			      local-&gt;is_promisc);</div><div class='del'>-	if (ret)</div><div class='del'>-		printk(KERN_INFO "%s: Setting promiscuous mode (%d) failed\n",</div><div class='del'>-		       dev-&gt;name, local-&gt;is_promisc);</div><div class='del'>-</div><div class='del'>-	if (!local-&gt;fw_ap) {</div><div class='del'>-		ret = hostap_set_string(dev, HFA384X_RID_CNFDESIREDSSID,</div><div class='del'>-					local-&gt;essid);</div><div class='del'>-		if (ret) {</div><div class='del'>-			printk("%s: Desired SSID setting failed\n", dev-&gt;name);</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Setup TXRateControl, defaults to allow use of 1, 2, 5.5, and</div><div class='del'>-	 * 11 Mbps in automatic TX rate fallback and 1 and 2 Mbps as basic</div><div class='del'>-	 * rates */</div><div class='del'>-	if (local-&gt;tx_rate_control == 0) {</div><div class='del'>-		local-&gt;tx_rate_control =</div><div class='del'>-			HFA384X_RATES_1MBPS |</div><div class='del'>-			HFA384X_RATES_2MBPS |</div><div class='del'>-			HFA384X_RATES_5MBPS |</div><div class='del'>-			HFA384X_RATES_11MBPS;</div><div class='del'>-	}</div><div class='del'>-	if (local-&gt;basic_rates == 0)</div><div class='del'>-		local-&gt;basic_rates = HFA384X_RATES_1MBPS | HFA384X_RATES_2MBPS;</div><div class='del'>-</div><div class='del'>-	if (!local-&gt;fw_ap) {</div><div class='del'>-		ret = hostap_set_word(dev, HFA384X_RID_TXRATECONTROL,</div><div class='del'>-				      local-&gt;tx_rate_control);</div><div class='del'>-		if (ret) {</div><div class='del'>-			printk("%s: TXRateControl setting to %d failed\n",</div><div class='del'>-			       dev-&gt;name, local-&gt;tx_rate_control);</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = hostap_set_word(dev, HFA384X_RID_CNFSUPPORTEDRATES,</div><div class='del'>-				      local-&gt;tx_rate_control);</div><div class='del'>-		if (ret) {</div><div class='del'>-			printk("%s: cnfSupportedRates setting to %d failed\n",</div><div class='del'>-			       dev-&gt;name, local-&gt;tx_rate_control);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = hostap_set_word(dev, HFA384X_RID_CNFBASICRATES,</div><div class='del'>-				      local-&gt;basic_rates);</div><div class='del'>-		if (ret) {</div><div class='del'>-			printk("%s: cnfBasicRates setting to %d failed\n",</div><div class='del'>-			       dev-&gt;name, local-&gt;basic_rates);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = hostap_set_word(dev, HFA384X_RID_CREATEIBSS, 1);</div><div class='del'>-		if (ret) {</div><div class='del'>-			printk("%s: Create IBSS setting to 1 failed\n",</div><div class='del'>-			       dev-&gt;name);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;name_set)</div><div class='del'>-		(void) hostap_set_string(dev, HFA384X_RID_CNFOWNNAME,</div><div class='del'>-					 local-&gt;name);</div><div class='del'>-</div><div class='del'>-	if (hostap_set_encryption(local)) {</div><div class='del'>-		printk(KERN_INFO "%s: could not configure encryption\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	(void) hostap_set_antsel(local);</div><div class='del'>-</div><div class='del'>-	if (hostap_set_roaming(local)) {</div><div class='del'>-		printk(KERN_INFO "%s: could not set host roaming\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;sta_fw_ver &gt;= PRISM2_FW_VER(1,6,3) &amp;&amp;</div><div class='del'>-	    hostap_set_word(dev, HFA384X_RID_CNFENHSECURITY, local-&gt;enh_sec))</div><div class='del'>-		printk(KERN_INFO "%s: cnfEnhSecurity setting to 0x%x failed\n",</div><div class='del'>-		       dev-&gt;name, local-&gt;enh_sec);</div><div class='del'>-</div><div class='del'>-	/* 32-bit tallies were added in STA f/w 0.8.0, but they were apparently</div><div class='del'>-	 * not working correctly (last seven counters report bogus values).</div><div class='del'>-	 * This has been fixed in 0.8.2, so enable 32-bit tallies only</div><div class='del'>-	 * beginning with that firmware version. Another bug fix for 32-bit</div><div class='del'>-	 * tallies in 1.4.0; should 16-bit tallies be used for some other</div><div class='del'>-	 * versions, too? */</div><div class='del'>-	if (local-&gt;sta_fw_ver &gt;= PRISM2_FW_VER(0,8,2)) {</div><div class='del'>-		if (hostap_set_word(dev, HFA384X_RID_CNFTHIRTY2TALLY, 1)) {</div><div class='del'>-			printk(KERN_INFO "%s: cnfThirty2Tally setting "</div><div class='del'>-			       "failed\n", dev-&gt;name);</div><div class='del'>-			local-&gt;tallies32 = 0;</div><div class='del'>-		} else</div><div class='del'>-			local-&gt;tallies32 = 1;</div><div class='del'>-	} else</div><div class='del'>-		local-&gt;tallies32 = 0;</div><div class='del'>-</div><div class='del'>-	hostap_set_auth_algs(local);</div><div class='del'>-</div><div class='del'>-	if (hostap_set_word(dev, HFA384X_RID_FRAGMENTATIONTHRESHOLD,</div><div class='del'>-			    local-&gt;fragm_threshold)) {</div><div class='del'>-		printk(KERN_INFO "%s: setting FragmentationThreshold to %d "</div><div class='del'>-		       "failed\n", dev-&gt;name, local-&gt;fragm_threshold);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hostap_set_word(dev, HFA384X_RID_RTSTHRESHOLD,</div><div class='del'>-			    local-&gt;rts_threshold)) {</div><div class='del'>-		printk(KERN_INFO "%s: setting RTSThreshold to %d failed\n",</div><div class='del'>-		       dev-&gt;name, local-&gt;rts_threshold);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;manual_retry_count &gt;= 0 &amp;&amp;</div><div class='del'>-	    hostap_set_word(dev, HFA384X_RID_CNFALTRETRYCOUNT,</div><div class='del'>-			    local-&gt;manual_retry_count)) {</div><div class='del'>-		printk(KERN_INFO "%s: setting cnfAltRetryCount to %d failed\n",</div><div class='del'>-		       dev-&gt;name, local-&gt;manual_retry_count);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;sta_fw_ver &gt;= PRISM2_FW_VER(1,3,1) &amp;&amp;</div><div class='del'>-	    hfa384x_get_rid(dev, HFA384X_RID_CNFDBMADJUST, &amp;tmp, 2, 1) == 2) {</div><div class='del'>-		local-&gt;rssi_to_dBm = le16_to_cpu(tmp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;sta_fw_ver &gt;= PRISM2_FW_VER(1,7,0) &amp;&amp; local-&gt;wpa &amp;&amp;</div><div class='del'>-	    hostap_set_word(dev, HFA384X_RID_SSNHANDLINGMODE, 1)) {</div><div class='del'>-		printk(KERN_INFO "%s: setting ssnHandlingMode to 1 failed\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;sta_fw_ver &gt;= PRISM2_FW_VER(1,7,0) &amp;&amp; local-&gt;generic_elem &amp;&amp;</div><div class='del'>-	    hfa384x_set_rid(dev, HFA384X_RID_GENERICELEMENT,</div><div class='del'>-			    local-&gt;generic_elem, local-&gt;generic_elem_len)) {</div><div class='del'>-		printk(KERN_INFO "%s: setting genericElement failed\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- fail:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_hw_init(struct net_device *dev, int initial)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int ret, first = 1;</div><div class='del'>-	unsigned long start, delay;</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_FLOW, "prism2_hw_init()\n");</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	clear_bit(HOSTAP_BITS_TRANSMIT, &amp;local-&gt;bits);</div><div class='del'>-</div><div class='del'>- init:</div><div class='del'>-	/* initialize HFA 384x */</div><div class='del'>-	ret = hfa384x_cmd_no_wait(dev, HFA384X_CMDCODE_INIT, 0);</div><div class='del'>-	if (ret) {</div><div class='del'>-		printk(KERN_INFO "%s: first command failed - assuming card "</div><div class='del'>-		       "does not have primary firmware\n", dev_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (first &amp;&amp; (HFA384X_INW(HFA384X_EVSTAT_OFF) &amp; HFA384X_EV_CMD)) {</div><div class='del'>-		/* EvStat has Cmd bit set in some cases, so retry once if no</div><div class='del'>-		 * wait was needed */</div><div class='del'>-		HFA384X_OUTW(HFA384X_EV_CMD, HFA384X_EVACK_OFF);</div><div class='del'>-		printk(KERN_DEBUG "%s: init command completed too quickly - "</div><div class='del'>-		       "retrying\n", dev-&gt;name);</div><div class='del'>-		first = 0;</div><div class='del'>-		goto init;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	start = jiffies;</div><div class='del'>-	delay = jiffies + HFA384X_INIT_TIMEOUT;</div><div class='del'>-	while (!(HFA384X_INW(HFA384X_EVSTAT_OFF) &amp; HFA384X_EV_CMD) &amp;&amp;</div><div class='del'>-	       time_before(jiffies, delay))</div><div class='del'>-		yield();</div><div class='del'>-	if (!(HFA384X_INW(HFA384X_EVSTAT_OFF) &amp; HFA384X_EV_CMD)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: assuming no Primary image in "</div><div class='del'>-		       "flash - card initialization not completed\n",</div><div class='del'>-		       dev_info);</div><div class='del'>-		local-&gt;no_pri = 1;</div><div class='del'>-#ifdef PRISM2_DOWNLOAD_SUPPORT</div><div class='del'>-			if (local-&gt;sram_type == -1)</div><div class='del'>-				local-&gt;sram_type = prism2_get_ram_size(local);</div><div class='del'>-#endif /* PRISM2_DOWNLOAD_SUPPORT */</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	local-&gt;no_pri = 0;</div><div class='del'>-	printk(KERN_DEBUG "prism2_hw_init: initialized in %lu ms\n",</div><div class='del'>-	       (jiffies - start) * 1000 / HZ);</div><div class='del'>-	HFA384X_OUTW(HFA384X_EV_CMD, HFA384X_EVACK_OFF);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_hw_init2(struct net_device *dev, int initial)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_DOWNLOAD_SUPPORT</div><div class='del'>-	kfree(local-&gt;pda);</div><div class='del'>-	if (local-&gt;no_pri)</div><div class='del'>-		local-&gt;pda = NULL;</div><div class='del'>-	else</div><div class='del'>-		local-&gt;pda = prism2_read_pda(dev);</div><div class='del'>-#endif /* PRISM2_DOWNLOAD_SUPPORT */</div><div class='del'>-</div><div class='del'>-	hfa384x_disable_interrupts(dev);</div><div class='del'>-</div><div class='del'>-#ifndef final_version</div><div class='del'>-	HFA384X_OUTW(HFA384X_MAGIC, HFA384X_SWSUPPORT0_OFF);</div><div class='del'>-	if (HFA384X_INW(HFA384X_SWSUPPORT0_OFF) != HFA384X_MAGIC) {</div><div class='del'>-		printk("SWSUPPORT0 write/read failed: %04X != %04X\n",</div><div class='del'>-		       HFA384X_INW(HFA384X_SWSUPPORT0_OFF), HFA384X_MAGIC);</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (initial || local-&gt;pri_only) {</div><div class='del'>-		hfa384x_events_only_cmd(dev);</div><div class='del'>-		/* get card version information */</div><div class='del'>-		if (prism2_get_version_info(dev, HFA384X_RID_NICID, "NIC") ||</div><div class='del'>-		    prism2_get_version_info(dev, HFA384X_RID_PRIID, "PRI")) {</div><div class='del'>-			hfa384x_disable_interrupts(dev);</div><div class='del'>-			goto failed;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (prism2_get_version_info(dev, HFA384X_RID_STAID, "STA")) {</div><div class='del'>-			printk(KERN_DEBUG "%s: Failed to read STA f/w version "</div><div class='del'>-			       "- only Primary f/w present\n", dev-&gt;name);</div><div class='del'>-			local-&gt;pri_only = 1;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		local-&gt;pri_only = 0;</div><div class='del'>-		hfa384x_disable_interrupts(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIX: could convert allocate_fid to use sleeping CmdCompl wait and</div><div class='del'>-	 * enable interrupts before this. This would also require some sort of</div><div class='del'>-	 * sleeping AllocEv waiting */</div><div class='del'>-</div><div class='del'>-	/* allocate TX FIDs */</div><div class='del'>-	local-&gt;txfid_len = PRISM2_TXFID_LEN;</div><div class='del'>-	for (i = 0; i &lt; PRISM2_TXFID_COUNT; i++) {</div><div class='del'>-		local-&gt;txfid[i] = hfa384x_allocate_fid(dev, local-&gt;txfid_len);</div><div class='del'>-		if (local-&gt;txfid[i] == 0xffff &amp;&amp; local-&gt;txfid_len &gt; 1600) {</div><div class='del'>-			local-&gt;txfid[i] = hfa384x_allocate_fid(dev, 1600);</div><div class='del'>-			if (local-&gt;txfid[i] != 0xffff) {</div><div class='del'>-				printk(KERN_DEBUG "%s: Using shorter TX FID "</div><div class='del'>-				       "(1600 bytes)\n", dev-&gt;name);</div><div class='del'>-				local-&gt;txfid_len = 1600;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (local-&gt;txfid[i] == 0xffff)</div><div class='del'>-			goto failed;</div><div class='del'>-		local-&gt;intransmitfid[i] = PRISM2_TXFID_EMPTY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hfa384x_events_only_cmd(dev);</div><div class='del'>-</div><div class='del'>-	if (initial) {</div><div class='del'>-		struct list_head *ptr;</div><div class='del'>-		prism2_check_sta_fw_version(local);</div><div class='del'>-</div><div class='del'>-		if (hfa384x_get_rid(dev, HFA384X_RID_CNFOWNMACADDR,</div><div class='del'>-				    dev-&gt;dev_addr, 6, 1) &lt; 0) {</div><div class='del'>-			printk("%s: could not get own MAC address\n",</div><div class='del'>-			       dev-&gt;name);</div><div class='del'>-		}</div><div class='del'>-		list_for_each(ptr, &amp;local-&gt;hostap_interfaces) {</div><div class='del'>-			iface = list_entry(ptr, struct hostap_interface, list);</div><div class='del'>-			eth_hw_addr_inherit(iface-&gt;dev, dev);</div><div class='del'>-		}</div><div class='del'>-	} else if (local-&gt;fw_ap)</div><div class='del'>-		prism2_check_sta_fw_version(local);</div><div class='del'>-</div><div class='del'>-	prism2_setup_rids(dev);</div><div class='del'>-</div><div class='del'>-	/* MAC is now configured, but port 0 is not yet enabled */</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- failed:</div><div class='del'>-	if (!local-&gt;no_pri)</div><div class='del'>-		printk(KERN_WARNING "%s: Initialization failed\n", dev_info);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_hw_enable(struct net_device *dev, int initial)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int was_resetting;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-	was_resetting = local-&gt;hw_resetting;</div><div class='del'>-</div><div class='del'>-	if (hfa384x_cmd(dev, HFA384X_CMDCODE_ENABLE, 0, NULL, NULL)) {</div><div class='del'>-		printk("%s: MAC port 0 enabling failed\n", dev-&gt;name);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	local-&gt;hw_ready = 1;</div><div class='del'>-	local-&gt;hw_reset_tries = 0;</div><div class='del'>-	local-&gt;hw_resetting = 0;</div><div class='del'>-	hfa384x_enable_interrupts(dev);</div><div class='del'>-</div><div class='del'>-	/* at least D-Link DWL-650 seems to require additional port reset</div><div class='del'>-	 * before it starts acting as an AP, so reset port automatically</div><div class='del'>-	 * here just in case */</div><div class='del'>-	if (initial &amp;&amp; prism2_reset_port(dev)) {</div><div class='del'>-		printk("%s: MAC port 0 resetting failed\n", dev-&gt;name);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (was_resetting &amp;&amp; netif_queue_stopped(dev)) {</div><div class='del'>-		/* If hw_reset() was called during pending transmit, netif</div><div class='del'>-		 * queue was stopped. Wake it up now since the wlan card has</div><div class='del'>-		 * been resetted. */</div><div class='del'>-		netif_wake_queue(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_hw_config(struct net_device *dev, int initial)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;hw_downloading)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (prism2_hw_init(dev, initial)) {</div><div class='del'>-		return local-&gt;no_pri ? 0 : 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (prism2_hw_init2(dev, initial))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	/* Enable firmware if secondary image is loaded and at least one of the</div><div class='del'>-	 * netdevices is up. */</div><div class='del'>-	if (!local-&gt;pri_only &amp;&amp;</div><div class='del'>-	    (initial == 0 || (initial == 2 &amp;&amp; local-&gt;num_dev_open &gt; 0))) {</div><div class='del'>-		if (!local-&gt;dev_enabled)</div><div class='del'>-			prism2_callback(local, PRISM2_CALLBACK_ENABLE);</div><div class='del'>-		local-&gt;dev_enabled = 1;</div><div class='del'>-		return prism2_hw_enable(dev, initial);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void prism2_hw_shutdown(struct net_device *dev, int no_disable)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	/* Allow only command completion events during disable */</div><div class='del'>-	hfa384x_events_only_cmd(dev);</div><div class='del'>-</div><div class='del'>-	local-&gt;hw_ready = 0;</div><div class='del'>-	if (local-&gt;dev_enabled)</div><div class='del'>-		prism2_callback(local, PRISM2_CALLBACK_DISABLE);</div><div class='del'>-	local-&gt;dev_enabled = 0;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;card_present &amp;&amp; !local-&gt;func-&gt;card_present(local)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: card already removed or not configured "</div><div class='del'>-		       "during shutdown\n", dev-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((no_disable &amp; HOSTAP_HW_NO_DISABLE) == 0 &amp;&amp;</div><div class='del'>-	    hfa384x_cmd(dev, HFA384X_CMDCODE_DISABLE, 0, NULL, NULL))</div><div class='del'>-		printk(KERN_WARNING "%s: Shutdown failed\n", dev_info);</div><div class='del'>-</div><div class='del'>-	hfa384x_disable_interrupts(dev);</div><div class='del'>-</div><div class='del'>-	if (no_disable &amp; HOSTAP_HW_ENABLE_CMDCOMPL)</div><div class='del'>-		hfa384x_events_only_cmd(dev);</div><div class='del'>-	else</div><div class='del'>-		prism2_clear_cmd_queue(local);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void prism2_hw_reset(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	static long last_reset = 0;</div><div class='del'>-</div><div class='del'>-	/* do not reset card more than once per second to avoid ending up in a</div><div class='del'>-	 * busy loop resetting the card */</div><div class='del'>-	if (time_before_eq(jiffies, last_reset + HZ))</div><div class='del'>-		return;</div><div class='del'>-	last_reset = jiffies;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;hw_downloading)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;hw_resetting) {</div><div class='del'>-		printk(KERN_WARNING "%s: %s: already resetting card - "</div><div class='del'>-		       "ignoring reset request\n", dev_info, dev-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	local-&gt;hw_reset_tries++;</div><div class='del'>-	if (local-&gt;hw_reset_tries &gt; 10) {</div><div class='del'>-		printk(KERN_WARNING "%s: too many reset tries, skipping\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_WARNING "%s: %s: resetting card\n", dev_info, dev-&gt;name);</div><div class='del'>-	hfa384x_disable_interrupts(dev);</div><div class='del'>-	local-&gt;hw_resetting = 1;</div><div class='del'>-	if (local-&gt;func-&gt;cor_sreset) {</div><div class='del'>-		/* Host system seems to hang in some cases with high traffic</div><div class='del'>-		 * load or shared interrupts during COR sreset. Disable shared</div><div class='del'>-		 * interrupts during reset to avoid these crashes. COS sreset</div><div class='del'>-		 * takes quite a long time, so it is unfortunate that this</div><div class='del'>-		 * seems to be needed. Anyway, I do not know of any better way</div><div class='del'>-		 * of avoiding the crash. */</div><div class='del'>-		disable_irq(dev-&gt;irq);</div><div class='del'>-		local-&gt;func-&gt;cor_sreset(local);</div><div class='del'>-		enable_irq(dev-&gt;irq);</div><div class='del'>-	}</div><div class='del'>-	prism2_hw_shutdown(dev, 1);</div><div class='del'>-	prism2_hw_config(dev, 0);</div><div class='del'>-	local-&gt;hw_resetting = 0;</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_DOWNLOAD_SUPPORT</div><div class='del'>-	if (local-&gt;dl_pri) {</div><div class='del'>-		printk(KERN_DEBUG "%s: persistent download of primary "</div><div class='del'>-		       "firmware\n", dev-&gt;name);</div><div class='del'>-		if (prism2_download_genesis(local, local-&gt;dl_pri) &lt; 0)</div><div class='del'>-			printk(KERN_WARNING "%s: download (PRI) failed\n",</div><div class='del'>-			       dev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;dl_sec) {</div><div class='del'>-		printk(KERN_DEBUG "%s: persistent download of secondary "</div><div class='del'>-		       "firmware\n", dev-&gt;name);</div><div class='del'>-		if (prism2_download_volatile(local, local-&gt;dl_sec) &lt; 0)</div><div class='del'>-			printk(KERN_WARNING "%s: download (SEC) failed\n",</div><div class='del'>-			       dev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-#endif /* PRISM2_DOWNLOAD_SUPPORT */</div><div class='del'>-</div><div class='del'>-	/* TODO: restore beacon TIM bits for STAs that have buffered frames */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void prism2_schedule_reset(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	schedule_work(&amp;local-&gt;reset_queue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as scheduled task after noticing card timeout in interrupt</div><div class='del'>- * context */</div><div class='del'>-static void handle_reset_queue(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = container_of(work, local_info_t, reset_queue);</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: scheduled card reset\n", local-&gt;dev-&gt;name);</div><div class='del'>-	prism2_hw_reset(local-&gt;dev);</div><div class='del'>-</div><div class='del'>-	if (netif_queue_stopped(local-&gt;dev)) {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; PRISM2_TXFID_COUNT; i++)</div><div class='del'>-			if (local-&gt;intransmitfid[i] == PRISM2_TXFID_EMPTY) {</div><div class='del'>-				PDEBUG(DEBUG_EXTRA, "prism2_tx_timeout: "</div><div class='del'>-				       "wake up queue\n");</div><div class='del'>-				netif_wake_queue(local-&gt;dev);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_get_txfid_idx(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	int idx, end;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;txfidlock, flags);</div><div class='del'>-	end = idx = local-&gt;next_txfid;</div><div class='del'>-	do {</div><div class='del'>-		if (local-&gt;intransmitfid[idx] == PRISM2_TXFID_EMPTY) {</div><div class='del'>-			local-&gt;intransmitfid[idx] = PRISM2_TXFID_RESERVED;</div><div class='del'>-			spin_unlock_irqrestore(&amp;local-&gt;txfidlock, flags);</div><div class='del'>-			return idx;</div><div class='del'>-		}</div><div class='del'>-		idx++;</div><div class='del'>-		if (idx &gt;= PRISM2_TXFID_COUNT)</div><div class='del'>-			idx = 0;</div><div class='del'>-	} while (idx != end);</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;txfidlock, flags);</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_EXTRA2, "prism2_get_txfid_idx: no room in txfid buf: "</div><div class='del'>-	       "packet dropped\n");</div><div class='del'>-	local-&gt;dev-&gt;stats.tx_dropped++;</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only from hardware IRQ */</div><div class='del'>-static void prism2_transmit_cb(struct net_device *dev, long context,</div><div class='del'>-			       u16 resp0, u16 res)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int idx = (int) context;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (res) {</div><div class='del'>-		printk(KERN_DEBUG "%s: prism2_transmit_cb - res=0x%02x\n",</div><div class='del'>-		       dev-&gt;name, res);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (idx &lt; 0 || idx &gt;= PRISM2_TXFID_COUNT) {</div><div class='del'>-		printk(KERN_DEBUG "%s: prism2_transmit_cb called with invalid "</div><div class='del'>-		       "idx=%d\n", dev-&gt;name, idx);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!test_and_clear_bit(HOSTAP_BITS_TRANSMIT, &amp;local-&gt;bits)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: driver bug: prism2_transmit_cb called "</div><div class='del'>-		       "with no pending transmit\n", dev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (netif_queue_stopped(dev)) {</div><div class='del'>-		/* ready for next TX, so wake up queue that was stopped in</div><div class='del'>-		 * prism2_transmit() */</div><div class='del'>-		netif_wake_queue(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;local-&gt;txfidlock);</div><div class='del'>-</div><div class='del'>-	/* With reclaim, Resp0 contains new txfid for transmit; the old txfid</div><div class='del'>-	 * will be automatically allocated for the next TX frame */</div><div class='del'>-	local-&gt;intransmitfid[idx] = resp0;</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_FID, "%s: prism2_transmit_cb: txfid[%d]=0x%04x, "</div><div class='del'>-	       "resp0=0x%04x, transmit_txfid=0x%04x\n",</div><div class='del'>-	       dev-&gt;name, idx, local-&gt;txfid[idx],</div><div class='del'>-	       resp0, local-&gt;intransmitfid[local-&gt;next_txfid]);</div><div class='del'>-</div><div class='del'>-	idx++;</div><div class='del'>-	if (idx &gt;= PRISM2_TXFID_COUNT)</div><div class='del'>-		idx = 0;</div><div class='del'>-	local-&gt;next_txfid = idx;</div><div class='del'>-</div><div class='del'>-	/* check if all TX buffers are occupied */</div><div class='del'>-	do {</div><div class='del'>-		if (local-&gt;intransmitfid[idx] == PRISM2_TXFID_EMPTY) {</div><div class='del'>-			spin_unlock(&amp;local-&gt;txfidlock);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		idx++;</div><div class='del'>-		if (idx &gt;= PRISM2_TXFID_COUNT)</div><div class='del'>-			idx = 0;</div><div class='del'>-	} while (idx != local-&gt;next_txfid);</div><div class='del'>-	spin_unlock(&amp;local-&gt;txfidlock);</div><div class='del'>-</div><div class='del'>-	/* no empty TX buffers, stop queue */</div><div class='del'>-	netif_stop_queue(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only from software IRQ if PCI bus master is not used (with bus master</div><div class='del'>- * this can be called both from software and hardware IRQ) */</div><div class='del'>-static int prism2_transmit(struct net_device *dev, int idx)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	/* The driver tries to stop netif queue so that there would not be</div><div class='del'>-	 * more than one attempt to transmit frames going on; check that this</div><div class='del'>-	 * is really the case */</div><div class='del'>-</div><div class='del'>-	if (test_and_set_bit(HOSTAP_BITS_TRANSMIT, &amp;local-&gt;bits)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: driver bug - prism2_transmit() called "</div><div class='del'>-		       "when previous TX was pending\n", dev-&gt;name);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* stop the queue for the time that transmit is pending */</div><div class='del'>-	netif_stop_queue(dev);</div><div class='del'>-</div><div class='del'>-	/* transmit packet */</div><div class='del'>-	res = hfa384x_cmd_callback(</div><div class='del'>-		dev,</div><div class='del'>-		HFA384X_CMDCODE_TRANSMIT | HFA384X_CMD_TX_RECLAIM,</div><div class='del'>-		local-&gt;txfid[idx],</div><div class='del'>-		prism2_transmit_cb, (long) idx);</div><div class='del'>-</div><div class='del'>-	if (res) {</div><div class='del'>-		printk(KERN_DEBUG "%s: prism2_transmit: CMDCODE_TRANSMIT "</div><div class='del'>-		       "failed (res=%d)\n", dev-&gt;name, res);</div><div class='del'>-		dev-&gt;stats.tx_dropped++;</div><div class='del'>-		netif_wake_queue(dev);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	netif_trans_update(dev);</div><div class='del'>-</div><div class='del'>-	/* Since we did not wait for command completion, the card continues</div><div class='del'>-	 * to process on the background and we will finish handling when</div><div class='del'>-	 * command completion event is handled (prism2_cmd_ev() function) */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Send IEEE 802.11 frame (convert the header into Prism2 TX descriptor and</div><div class='del'>- * send the payload with this descriptor) */</div><div class='del'>-/* Called only from software IRQ */</div><div class='del'>-static int prism2_tx_80211(struct sk_buff *skb, struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	struct hfa384x_tx_frame txdesc;</div><div class='del'>-	struct hostap_skb_tx_data *meta;</div><div class='del'>-	int hdr_len, data_len, idx, res, ret = -1;</div><div class='del'>-	u16 tx_control;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	meta = (struct hostap_skb_tx_data *) skb-&gt;cb;</div><div class='del'>-</div><div class='del'>-	prism2_callback(local, PRISM2_CALLBACK_TX_START);</div><div class='del'>-</div><div class='del'>-	if ((local-&gt;func-&gt;card_present &amp;&amp; !local-&gt;func-&gt;card_present(local)) ||</div><div class='del'>-	    !local-&gt;hw_ready || local-&gt;hw_downloading || local-&gt;pri_only) {</div><div class='del'>-		if (net_ratelimit()) {</div><div class='del'>-			printk(KERN_DEBUG "%s: prism2_tx_80211: hw not ready -"</div><div class='del'>-			       " skipping\n", dev-&gt;name);</div><div class='del'>-		}</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(&amp;txdesc, 0, sizeof(txdesc));</div><div class='del'>-</div><div class='del'>-	/* skb-&gt;data starts with txdesc-&gt;frame_control */</div><div class='del'>-	hdr_len = 24;</div><div class='del'>-	skb_copy_from_linear_data(skb, &amp;txdesc.frame_control, hdr_len);</div><div class='del'>-	if (ieee80211_is_data(txdesc.frame_control) &amp;&amp;</div><div class='del'>-	    ieee80211_has_a4(txdesc.frame_control) &amp;&amp;</div><div class='del'>-	    skb-&gt;len &gt;= 30) {</div><div class='del'>-		/* Addr4 */</div><div class='del'>-		skb_copy_from_linear_data_offset(skb, hdr_len, txdesc.addr4,</div><div class='del'>-						 ETH_ALEN);</div><div class='del'>-		hdr_len += ETH_ALEN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tx_control = local-&gt;tx_control;</div><div class='del'>-	if (meta-&gt;tx_cb_idx) {</div><div class='del'>-		tx_control |= HFA384X_TX_CTRL_TX_OK;</div><div class='del'>-		txdesc.sw_support = cpu_to_le32(meta-&gt;tx_cb_idx);</div><div class='del'>-	}</div><div class='del'>-	txdesc.tx_control = cpu_to_le16(tx_control);</div><div class='del'>-	txdesc.tx_rate = meta-&gt;rate;</div><div class='del'>-</div><div class='del'>-	data_len = skb-&gt;len - hdr_len;</div><div class='del'>-	txdesc.data_len = cpu_to_le16(data_len);</div><div class='del'>-	txdesc.len = cpu_to_be16(data_len);</div><div class='del'>-</div><div class='del'>-	idx = prism2_get_txfid_idx(local);</div><div class='del'>-	if (idx &lt; 0)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;frame_dump &amp; PRISM2_DUMP_TX_HDR)</div><div class='del'>-		hostap_dump_tx_header(dev-&gt;name, &amp;txdesc);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;local-&gt;baplock);</div><div class='del'>-	res = hfa384x_setup_bap(dev, BAP0, local-&gt;txfid[idx], 0);</div><div class='del'>-</div><div class='del'>-	if (!res)</div><div class='del'>-		res = hfa384x_to_bap(dev, BAP0, &amp;txdesc, sizeof(txdesc));</div><div class='del'>-	if (!res)</div><div class='del'>-		res = hfa384x_to_bap(dev, BAP0, skb-&gt;data + hdr_len,</div><div class='del'>-				     skb-&gt;len - hdr_len);</div><div class='del'>-	spin_unlock(&amp;local-&gt;baplock);</div><div class='del'>-</div><div class='del'>-	if (!res)</div><div class='del'>-		res = prism2_transmit(dev, idx);</div><div class='del'>-	if (res) {</div><div class='del'>-		printk(KERN_DEBUG "%s: prism2_tx_80211 - to BAP0 failed\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		local-&gt;intransmitfid[idx] = PRISM2_TXFID_EMPTY;</div><div class='del'>-		schedule_work(&amp;local-&gt;reset_queue);</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	prism2_callback(local, PRISM2_CALLBACK_TX_END);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Some SMP systems have reported number of odd errors with hostap_pci. fid</div><div class='del'>- * register has changed values between consecutive reads for an unknown reason.</div><div class='del'>- * This should really not happen, so more debugging is needed. This test</div><div class='del'>- * version is a bit slower, but it will detect most of such register changes</div><div class='del'>- * and will try to get the correct fid eventually. */</div><div class='del'>-#define EXTRA_FID_READ_TESTS</div><div class='del'>-</div><div class='del'>-static u16 prism2_read_fid_reg(struct net_device *dev, u16 reg)</div><div class='del'>-{</div><div class='del'>-#ifdef EXTRA_FID_READ_TESTS</div><div class='del'>-	u16 val, val2, val3;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		val = HFA384X_INW(reg);</div><div class='del'>-		val2 = HFA384X_INW(reg);</div><div class='del'>-		val3 = HFA384X_INW(reg);</div><div class='del'>-</div><div class='del'>-		if (val == val2 &amp;&amp; val == val3)</div><div class='del'>-			return val;</div><div class='del'>-</div><div class='del'>-		printk(KERN_DEBUG "%s: detected fid change (try=%d, reg=%04x):"</div><div class='del'>-		       " %04x %04x %04x\n",</div><div class='del'>-		       dev-&gt;name, i, reg, val, val2, val3);</div><div class='del'>-		if ((val == val2 || val == val3) &amp;&amp; val != 0)</div><div class='del'>-			return val;</div><div class='del'>-		if (val2 == val3 &amp;&amp; val2 != 0)</div><div class='del'>-			return val2;</div><div class='del'>-	}</div><div class='del'>-	printk(KERN_WARNING "%s: Uhhuh.. could not read good fid from reg "</div><div class='del'>-	       "%04x (%04x %04x %04x)\n", dev-&gt;name, reg, val, val2, val3);</div><div class='del'>-	return val;</div><div class='del'>-#else /* EXTRA_FID_READ_TESTS */</div><div class='del'>-	return HFA384X_INW(reg);</div><div class='del'>-#endif /* EXTRA_FID_READ_TESTS */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static void prism2_rx(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-	int res, rx_pending = 0;</div><div class='del'>-	u16 len, hdr_len, rxfid, status, macport;</div><div class='del'>-	struct hfa384x_rx_frame rxdesc;</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-</div><div class='del'>-	prism2_callback(local, PRISM2_CALLBACK_RX_START);</div><div class='del'>-</div><div class='del'>-	rxfid = prism2_read_fid_reg(dev, HFA384X_RXFID_OFF);</div><div class='del'>-#ifndef final_version</div><div class='del'>-	if (rxfid == 0) {</div><div class='del'>-		rxfid = HFA384X_INW(HFA384X_RXFID_OFF);</div><div class='del'>-		printk(KERN_DEBUG "prism2_rx: rxfid=0 (next 0x%04x)\n",</div><div class='del'>-		       rxfid);</div><div class='del'>-		if (rxfid == 0) {</div><div class='del'>-			schedule_work(&amp;local-&gt;reset_queue);</div><div class='del'>-			goto rx_dropped;</div><div class='del'>-		}</div><div class='del'>-		/* try to continue with the new rxfid value */</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;local-&gt;baplock);</div><div class='del'>-	res = hfa384x_setup_bap(dev, BAP0, rxfid, 0);</div><div class='del'>-	if (!res)</div><div class='del'>-		res = hfa384x_from_bap(dev, BAP0, &amp;rxdesc, sizeof(rxdesc));</div><div class='del'>-</div><div class='del'>-	if (res) {</div><div class='del'>-		spin_unlock(&amp;local-&gt;baplock);</div><div class='del'>-		printk(KERN_DEBUG "%s: copy from BAP0 failed %d\n", dev-&gt;name,</div><div class='del'>-		       res);</div><div class='del'>-		if (res == -ETIMEDOUT) {</div><div class='del'>-			schedule_work(&amp;local-&gt;reset_queue);</div><div class='del'>-		}</div><div class='del'>-		goto rx_dropped;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	len = le16_to_cpu(rxdesc.data_len);</div><div class='del'>-	hdr_len = sizeof(rxdesc);</div><div class='del'>-	status = le16_to_cpu(rxdesc.status);</div><div class='del'>-	macport = (status &gt;&gt; 8) &amp; 0x07;</div><div class='del'>-</div><div class='del'>-	/* Drop frames with too large reported payload length. Monitor mode</div><div class='del'>-	 * seems to sometimes pass frames (e.g., ctrl::ack) with signed and</div><div class='del'>-	 * negative value, so allow also values 65522 .. 65534 (-14 .. -2) for</div><div class='del'>-	 * macport 7 */</div><div class='del'>-	if (len &gt; PRISM2_DATA_MAXLEN + 8 /* WEP */) {</div><div class='del'>-		if (macport == 7 &amp;&amp; local-&gt;iw_mode == IW_MODE_MONITOR) {</div><div class='del'>-			if (len &gt;= (u16) -14) {</div><div class='del'>-				hdr_len -= 65535 - len;</div><div class='del'>-				hdr_len--;</div><div class='del'>-			}</div><div class='del'>-			len = 0;</div><div class='del'>-		} else {</div><div class='del'>-			spin_unlock(&amp;local-&gt;baplock);</div><div class='del'>-			printk(KERN_DEBUG "%s: Received frame with invalid "</div><div class='del'>-			       "length 0x%04x\n", dev-&gt;name, len);</div><div class='del'>-			hostap_dump_rx_header(dev-&gt;name, &amp;rxdesc);</div><div class='del'>-			goto rx_dropped;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb = dev_alloc_skb(len + hdr_len);</div><div class='del'>-	if (!skb) {</div><div class='del'>-		spin_unlock(&amp;local-&gt;baplock);</div><div class='del'>-		printk(KERN_DEBUG "%s: RX failed to allocate skb\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		goto rx_dropped;</div><div class='del'>-	}</div><div class='del'>-	skb-&gt;dev = dev;</div><div class='del'>-	skb_put_data(skb, &amp;rxdesc, hdr_len);</div><div class='del'>-</div><div class='del'>-	if (len &gt; 0)</div><div class='del'>-		res = hfa384x_from_bap(dev, BAP0, skb_put(skb, len), len);</div><div class='del'>-	spin_unlock(&amp;local-&gt;baplock);</div><div class='del'>-	if (res) {</div><div class='del'>-		printk(KERN_DEBUG "%s: RX failed to read "</div><div class='del'>-		       "frame data\n", dev-&gt;name);</div><div class='del'>-		goto rx_dropped;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_queue_tail(&amp;local-&gt;rx_list, skb);</div><div class='del'>-	tasklet_schedule(&amp;local-&gt;rx_tasklet);</div><div class='del'>-</div><div class='del'>- rx_exit:</div><div class='del'>-	prism2_callback(local, PRISM2_CALLBACK_RX_END);</div><div class='del'>-	if (!rx_pending) {</div><div class='del'>-		HFA384X_OUTW(HFA384X_EV_RX, HFA384X_EVACK_OFF);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>- rx_dropped:</div><div class='del'>-	dev-&gt;stats.rx_dropped++;</div><div class='del'>-	if (skb)</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-	goto rx_exit;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static void hostap_rx_skb(local_info_t *local, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct hfa384x_rx_frame *rxdesc;</div><div class='del'>-	struct net_device *dev = skb-&gt;dev;</div><div class='del'>-	struct hostap_80211_rx_status stats;</div><div class='del'>-	int hdrlen, rx_hdrlen;</div><div class='del'>-</div><div class='del'>-	rx_hdrlen = sizeof(*rxdesc);</div><div class='del'>-	if (skb-&gt;len &lt; sizeof(*rxdesc)) {</div><div class='del'>-		/* Allow monitor mode to receive shorter frames */</div><div class='del'>-		if (local-&gt;iw_mode == IW_MODE_MONITOR &amp;&amp;</div><div class='del'>-		    skb-&gt;len &gt;= sizeof(*rxdesc) - 30) {</div><div class='del'>-			rx_hdrlen = skb-&gt;len;</div><div class='del'>-		} else {</div><div class='del'>-			dev_kfree_skb(skb);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rxdesc = (struct hfa384x_rx_frame *) skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;frame_dump &amp; PRISM2_DUMP_RX_HDR &amp;&amp;</div><div class='del'>-	    skb-&gt;len &gt;= sizeof(*rxdesc))</div><div class='del'>-		hostap_dump_rx_header(dev-&gt;name, rxdesc);</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(rxdesc-&gt;status) &amp; HFA384X_RX_STATUS_FCSERR &amp;&amp;</div><div class='del'>-	    (!local-&gt;monitor_allow_fcserr ||</div><div class='del'>-	     local-&gt;iw_mode != IW_MODE_MONITOR))</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len &gt; PRISM2_DATA_MAXLEN) {</div><div class='del'>-		printk(KERN_DEBUG "%s: RX: len(%d) &gt; MAX(%d)\n",</div><div class='del'>-		       dev-&gt;name, skb-&gt;len, PRISM2_DATA_MAXLEN);</div><div class='del'>-		goto drop;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	stats.mac_time = le32_to_cpu(rxdesc-&gt;time);</div><div class='del'>-	stats.signal = rxdesc-&gt;signal - local-&gt;rssi_to_dBm;</div><div class='del'>-	stats.noise = rxdesc-&gt;silence - local-&gt;rssi_to_dBm;</div><div class='del'>-	stats.rate = rxdesc-&gt;rate;</div><div class='del'>-</div><div class='del'>-	/* Convert Prism2 RX structure into IEEE 802.11 header */</div><div class='del'>-	hdrlen = hostap_80211_get_hdrlen(rxdesc-&gt;frame_control);</div><div class='del'>-	if (hdrlen &gt; rx_hdrlen)</div><div class='del'>-		hdrlen = rx_hdrlen;</div><div class='del'>-</div><div class='del'>-	memmove(skb_pull(skb, rx_hdrlen - hdrlen),</div><div class='del'>-		&amp;rxdesc-&gt;frame_control, hdrlen);</div><div class='del'>-</div><div class='del'>-	hostap_80211_rx(dev, skb, &amp;stats);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>- drop:</div><div class='del'>-	dev_kfree_skb(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static void hostap_rx_tasklet(struct tasklet_struct *t)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = from_tasklet(local, t, rx_tasklet);</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	while ((skb = skb_dequeue(&amp;local-&gt;rx_list)) != NULL)</div><div class='del'>-		hostap_rx_skb(local, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only from hardware IRQ */</div><div class='del'>-static void prism2_alloc_ev(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int idx;</div><div class='del'>-	u16 fid;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	fid = prism2_read_fid_reg(dev, HFA384X_ALLOCFID_OFF);</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_FID, "FID: interrupt: ALLOC - fid=0x%04x\n", fid);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;local-&gt;txfidlock);</div><div class='del'>-	idx = local-&gt;next_alloc;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		if (local-&gt;txfid[idx] == fid) {</div><div class='del'>-			PDEBUG(DEBUG_FID, "FID: found matching txfid[%d]\n",</div><div class='del'>-			       idx);</div><div class='del'>-</div><div class='del'>-#ifndef final_version</div><div class='del'>-			if (local-&gt;intransmitfid[idx] == PRISM2_TXFID_EMPTY)</div><div class='del'>-				printk("Already released txfid found at idx "</div><div class='del'>-				       "%d\n", idx);</div><div class='del'>-			if (local-&gt;intransmitfid[idx] == PRISM2_TXFID_RESERVED)</div><div class='del'>-				printk("Already reserved txfid found at idx "</div><div class='del'>-				       "%d\n", idx);</div><div class='del'>-#endif</div><div class='del'>-			local-&gt;intransmitfid[idx] = PRISM2_TXFID_EMPTY;</div><div class='del'>-			idx++;</div><div class='del'>-			local-&gt;next_alloc = idx &gt;= PRISM2_TXFID_COUNT ? 0 :</div><div class='del'>-				idx;</div><div class='del'>-</div><div class='del'>-			if (!test_bit(HOSTAP_BITS_TRANSMIT, &amp;local-&gt;bits) &amp;&amp;</div><div class='del'>-			    netif_queue_stopped(dev))</div><div class='del'>-				netif_wake_queue(dev);</div><div class='del'>-</div><div class='del'>-			spin_unlock(&amp;local-&gt;txfidlock);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		idx++;</div><div class='del'>-		if (idx &gt;= PRISM2_TXFID_COUNT)</div><div class='del'>-			idx = 0;</div><div class='del'>-	} while (idx != local-&gt;next_alloc);</div><div class='del'>-</div><div class='del'>-	printk(KERN_WARNING "%s: could not find matching txfid (0x%04x, new "</div><div class='del'>-	       "read 0x%04x) for alloc event\n", dev-&gt;name, fid,</div><div class='del'>-	       HFA384X_INW(HFA384X_ALLOCFID_OFF));</div><div class='del'>-	printk(KERN_DEBUG "TXFIDs:");</div><div class='del'>-	for (idx = 0; idx &lt; PRISM2_TXFID_COUNT; idx++)</div><div class='del'>-		printk(" %04x[%04x]", local-&gt;txfid[idx],</div><div class='del'>-		       local-&gt;intransmitfid[idx]);</div><div class='del'>-	printk("\n");</div><div class='del'>-	spin_unlock(&amp;local-&gt;txfidlock);</div><div class='del'>-</div><div class='del'>-	/* FIX: should probably schedule reset; reference to one txfid was lost</div><div class='del'>-	 * completely.. Bad things will happen if we run out of txfids</div><div class='del'>-	 * Actually, this will cause netdev watchdog to notice TX timeout and</div><div class='del'>-	 * then card reset after all txfids have been leaked. */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static void hostap_tx_callback(local_info_t *local,</div><div class='del'>-			       struct hfa384x_tx_frame *txdesc, int ok,</div><div class='del'>-			       char *payload)</div><div class='del'>-{</div><div class='del'>-	u16 sw_support, hdrlen, len;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct hostap_tx_callback_info *cb;</div><div class='del'>-</div><div class='del'>-	/* Make sure that frame was from us. */</div><div class='del'>-	if (!ether_addr_equal(txdesc-&gt;addr2, local-&gt;dev-&gt;dev_addr)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: TX callback - foreign frame\n",</div><div class='del'>-		       local-&gt;dev-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sw_support = le32_to_cpu(txdesc-&gt;sw_support);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;local-&gt;lock);</div><div class='del'>-	cb = local-&gt;tx_callback;</div><div class='del'>-	while (cb != NULL &amp;&amp; cb-&gt;idx != sw_support)</div><div class='del'>-		cb = cb-&gt;next;</div><div class='del'>-	spin_unlock(&amp;local-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (cb == NULL) {</div><div class='del'>-		printk(KERN_DEBUG "%s: could not find TX callback (idx %d)\n",</div><div class='del'>-		       local-&gt;dev-&gt;name, sw_support);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hdrlen = hostap_80211_get_hdrlen(txdesc-&gt;frame_control);</div><div class='del'>-	len = le16_to_cpu(txdesc-&gt;data_len);</div><div class='del'>-	skb = dev_alloc_skb(hdrlen + len);</div><div class='del'>-	if (skb == NULL) {</div><div class='del'>-		printk(KERN_DEBUG "%s: hostap_tx_callback failed to allocate "</div><div class='del'>-		       "skb\n", local-&gt;dev-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_put_data(skb, (void *)&amp;txdesc-&gt;frame_control, hdrlen);</div><div class='del'>-	if (payload)</div><div class='del'>-		skb_put_data(skb, payload, len);</div><div class='del'>-</div><div class='del'>-	skb-&gt;dev = local-&gt;dev;</div><div class='del'>-	skb_reset_mac_header(skb);</div><div class='del'>-</div><div class='del'>-	cb-&gt;func(skb, ok, cb-&gt;data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static int hostap_tx_compl_read(local_info_t *local, int error,</div><div class='del'>-				struct hfa384x_tx_frame *txdesc,</div><div class='del'>-				char **payload)</div><div class='del'>-{</div><div class='del'>-	u16 fid, len;</div><div class='del'>-	int res, ret = 0;</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-</div><div class='del'>-	fid = prism2_read_fid_reg(dev, HFA384X_TXCOMPLFID_OFF);</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_FID, "interrupt: TX (err=%d) - fid=0x%04x\n", fid, error);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;local-&gt;baplock);</div><div class='del'>-	res = hfa384x_setup_bap(dev, BAP0, fid, 0);</div><div class='del'>-	if (!res)</div><div class='del'>-		res = hfa384x_from_bap(dev, BAP0, txdesc, sizeof(*txdesc));</div><div class='del'>-	if (res) {</div><div class='del'>-		PDEBUG(DEBUG_EXTRA, "%s: TX (err=%d) - fid=0x%04x - could not "</div><div class='del'>-		       "read txdesc\n", dev-&gt;name, error, fid);</div><div class='del'>-		if (res == -ETIMEDOUT) {</div><div class='del'>-			schedule_work(&amp;local-&gt;reset_queue);</div><div class='del'>-		}</div><div class='del'>-		ret = -1;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-	if (txdesc-&gt;sw_support) {</div><div class='del'>-		len = le16_to_cpu(txdesc-&gt;data_len);</div><div class='del'>-		if (len &lt; PRISM2_DATA_MAXLEN) {</div><div class='del'>-			*payload = kmalloc(len, GFP_ATOMIC);</div><div class='del'>-			if (*payload == NULL ||</div><div class='del'>-			    hfa384x_from_bap(dev, BAP0, *payload, len)) {</div><div class='del'>-				PDEBUG(DEBUG_EXTRA, "%s: could not read TX "</div><div class='del'>-				       "frame payload\n", dev-&gt;name);</div><div class='del'>-				kfree(*payload);</div><div class='del'>-				*payload = NULL;</div><div class='del'>-				ret = -1;</div><div class='del'>-				goto fail;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- fail:</div><div class='del'>-	spin_unlock(&amp;local-&gt;baplock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static void prism2_tx_ev(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-	char *payload = NULL;</div><div class='del'>-	struct hfa384x_tx_frame txdesc;</div><div class='del'>-</div><div class='del'>-	if (hostap_tx_compl_read(local, 0, &amp;txdesc, &amp;payload))</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;frame_dump &amp; PRISM2_DUMP_TX_HDR) {</div><div class='del'>-		PDEBUG(DEBUG_EXTRA, "%s: TX - status=0x%04x "</div><div class='del'>-		       "retry_count=%d tx_rate=%d seq_ctrl=%d "</div><div class='del'>-		       "duration_id=%d\n",</div><div class='del'>-		       dev-&gt;name, le16_to_cpu(txdesc.status),</div><div class='del'>-		       txdesc.retry_count, txdesc.tx_rate,</div><div class='del'>-		       le16_to_cpu(txdesc.seq_ctrl),</div><div class='del'>-		       le16_to_cpu(txdesc.duration_id));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (txdesc.sw_support)</div><div class='del'>-		hostap_tx_callback(local, &amp;txdesc, 1, payload);</div><div class='del'>-	kfree(payload);</div><div class='del'>-</div><div class='del'>- fail:</div><div class='del'>-	HFA384X_OUTW(HFA384X_EV_TX, HFA384X_EVACK_OFF);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static void hostap_sta_tx_exc_tasklet(struct tasklet_struct *t)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = from_tasklet(local, t, sta_tx_exc_tasklet);</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	while ((skb = skb_dequeue(&amp;local-&gt;sta_tx_exc_list)) != NULL) {</div><div class='del'>-		struct hfa384x_tx_frame *txdesc =</div><div class='del'>-			(struct hfa384x_tx_frame *) skb-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (skb-&gt;len &gt;= sizeof(*txdesc)) {</div><div class='del'>-			/* Convert Prism2 RX structure into IEEE 802.11 header</div><div class='del'>-			 */</div><div class='del'>-			int hdrlen = hostap_80211_get_hdrlen(txdesc-&gt;frame_control);</div><div class='del'>-			memmove(skb_pull(skb, sizeof(*txdesc) - hdrlen),</div><div class='del'>-				&amp;txdesc-&gt;frame_control, hdrlen);</div><div class='del'>-</div><div class='del'>-			hostap_handle_sta_tx_exc(local, skb);</div><div class='del'>-		}</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static void prism2_txexc(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-	u16 status, fc;</div><div class='del'>-	int show_dump, res;</div><div class='del'>-	char *payload = NULL;</div><div class='del'>-	struct hfa384x_tx_frame txdesc;</div><div class='del'>-</div><div class='del'>-	show_dump = local-&gt;frame_dump &amp; PRISM2_DUMP_TXEXC_HDR;</div><div class='del'>-	dev-&gt;stats.tx_errors++;</div><div class='del'>-</div><div class='del'>-	res = hostap_tx_compl_read(local, 1, &amp;txdesc, &amp;payload);</div><div class='del'>-	HFA384X_OUTW(HFA384X_EV_TXEXC, HFA384X_EVACK_OFF);</div><div class='del'>-	if (res)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	status = le16_to_cpu(txdesc.status);</div><div class='del'>-</div><div class='del'>-	/* We produce a TXDROP event only for retry or lifetime</div><div class='del'>-	 * exceeded, because that's the only status that really mean</div><div class='del'>-	 * that this particular node went away.</div><div class='del'>-	 * Other errors means that *we* screwed up. - Jean II */</div><div class='del'>-	if (status &amp; (HFA384X_TX_STATUS_RETRYERR | HFA384X_TX_STATUS_AGEDERR))</div><div class='del'>-	{</div><div class='del'>-		union iwreq_data wrqu;</div><div class='del'>-</div><div class='del'>-		/* Copy 802.11 dest address. */</div><div class='del'>-		memcpy(wrqu.addr.sa_data, txdesc.addr1, ETH_ALEN);</div><div class='del'>-		wrqu.addr.sa_family = ARPHRD_ETHER;</div><div class='del'>-		wireless_send_event(dev, IWEVTXDROP, &amp;wrqu, NULL);</div><div class='del'>-	} else</div><div class='del'>-		show_dump = 1;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;iw_mode == IW_MODE_MASTER ||</div><div class='del'>-	    local-&gt;iw_mode == IW_MODE_REPEAT ||</div><div class='del'>-	    local-&gt;wds_type &amp; HOSTAP_WDS_AP_CLIENT) {</div><div class='del'>-		struct sk_buff *skb;</div><div class='del'>-		skb = dev_alloc_skb(sizeof(txdesc));</div><div class='del'>-		if (skb) {</div><div class='del'>-			skb_put_data(skb, &amp;txdesc, sizeof(txdesc));</div><div class='del'>-			skb_queue_tail(&amp;local-&gt;sta_tx_exc_list, skb);</div><div class='del'>-			tasklet_schedule(&amp;local-&gt;sta_tx_exc_tasklet);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (txdesc.sw_support)</div><div class='del'>-		hostap_tx_callback(local, &amp;txdesc, 0, payload);</div><div class='del'>-	kfree(payload);</div><div class='del'>-</div><div class='del'>-	if (!show_dump)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_EXTRA, "%s: TXEXC - status=0x%04x (%s%s%s%s)"</div><div class='del'>-	       " tx_control=%04x\n",</div><div class='del'>-	       dev-&gt;name, status,</div><div class='del'>-	       status &amp; HFA384X_TX_STATUS_RETRYERR ? "[RetryErr]" : "",</div><div class='del'>-	       status &amp; HFA384X_TX_STATUS_AGEDERR ? "[AgedErr]" : "",</div><div class='del'>-	       status &amp; HFA384X_TX_STATUS_DISCON ? "[Discon]" : "",</div><div class='del'>-	       status &amp; HFA384X_TX_STATUS_FORMERR ? "[FormErr]" : "",</div><div class='del'>-	       le16_to_cpu(txdesc.tx_control));</div><div class='del'>-</div><div class='del'>-	fc = le16_to_cpu(txdesc.frame_control);</div><div class='del'>-	PDEBUG(DEBUG_EXTRA, "   retry_count=%d tx_rate=%d fc=0x%04x "</div><div class='del'>-	       "(%s%s%s::%d%s%s)\n",</div><div class='del'>-	       txdesc.retry_count, txdesc.tx_rate, fc,</div><div class='del'>-	       ieee80211_is_mgmt(txdesc.frame_control) ? "Mgmt" : "",</div><div class='del'>-	       ieee80211_is_ctl(txdesc.frame_control) ? "Ctrl" : "",</div><div class='del'>-	       ieee80211_is_data(txdesc.frame_control) ? "Data" : "",</div><div class='del'>-	       (fc &amp; IEEE80211_FCTL_STYPE) &gt;&gt; 4,</div><div class='del'>-	       ieee80211_has_tods(txdesc.frame_control) ? " ToDS" : "",</div><div class='del'>-	       ieee80211_has_fromds(txdesc.frame_control) ? " FromDS" : "");</div><div class='del'>-	PDEBUG(DEBUG_EXTRA, "   A1=%pM A2=%pM A3=%pM A4=%pM\n",</div><div class='del'>-	       txdesc.addr1, txdesc.addr2,</div><div class='del'>-	       txdesc.addr3, txdesc.addr4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static void hostap_info_tasklet(struct tasklet_struct *t)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = from_tasklet(local, t, info_tasklet);</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	while ((skb = skb_dequeue(&amp;local-&gt;info_list)) != NULL) {</div><div class='del'>-		hostap_info_process(local, skb);</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static void prism2_info(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-	u16 fid;</div><div class='del'>-	int res, left;</div><div class='del'>-	struct hfa384x_info_frame info;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	fid = HFA384X_INW(HFA384X_INFOFID_OFF);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;local-&gt;baplock);</div><div class='del'>-	res = hfa384x_setup_bap(dev, BAP0, fid, 0);</div><div class='del'>-	if (!res)</div><div class='del'>-		res = hfa384x_from_bap(dev, BAP0, &amp;info, sizeof(info));</div><div class='del'>-	if (res) {</div><div class='del'>-		spin_unlock(&amp;local-&gt;baplock);</div><div class='del'>-		printk(KERN_DEBUG "Could not get info frame (fid=0x%04x)\n",</div><div class='del'>-		       fid);</div><div class='del'>-		if (res == -ETIMEDOUT) {</div><div class='del'>-			schedule_work(&amp;local-&gt;reset_queue);</div><div class='del'>-		}</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	left = (le16_to_cpu(info.len) - 1) * 2;</div><div class='del'>-</div><div class='del'>-	if (info.len &amp; cpu_to_le16(0x8000) || info.len == 0 || left &gt; 2060) {</div><div class='del'>-		/* data register seems to give 0x8000 in some error cases even</div><div class='del'>-		 * though busy bit is not set in offset register;</div><div class='del'>-		 * in addition, length must be at least 1 due to type field */</div><div class='del'>-		spin_unlock(&amp;local-&gt;baplock);</div><div class='del'>-		printk(KERN_DEBUG "%s: Received info frame with invalid "</div><div class='del'>-		       "length 0x%04x (type 0x%04x)\n", dev-&gt;name,</div><div class='del'>-		       le16_to_cpu(info.len), le16_to_cpu(info.type));</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb = dev_alloc_skb(sizeof(info) + left);</div><div class='del'>-	if (skb == NULL) {</div><div class='del'>-		spin_unlock(&amp;local-&gt;baplock);</div><div class='del'>-		printk(KERN_DEBUG "%s: Could not allocate skb for info "</div><div class='del'>-		       "frame\n", dev-&gt;name);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_put_data(skb, &amp;info, sizeof(info));</div><div class='del'>-	if (left &gt; 0 &amp;&amp; hfa384x_from_bap(dev, BAP0, skb_put(skb, left), left))</div><div class='del'>-	{</div><div class='del'>-		spin_unlock(&amp;local-&gt;baplock);</div><div class='del'>-		printk(KERN_WARNING "%s: Info frame read failed (fid=0x%04x, "</div><div class='del'>-		       "len=0x%04x, type=0x%04x\n", dev-&gt;name, fid,</div><div class='del'>-		       le16_to_cpu(info.len), le16_to_cpu(info.type));</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;local-&gt;baplock);</div><div class='del'>-</div><div class='del'>-	skb_queue_tail(&amp;local-&gt;info_list, skb);</div><div class='del'>-	tasklet_schedule(&amp;local-&gt;info_tasklet);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	HFA384X_OUTW(HFA384X_EV_INFO, HFA384X_EVACK_OFF);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static void hostap_bap_tasklet(struct tasklet_struct *t)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = from_tasklet(local, t, bap_tasklet);</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-	u16 ev;</div><div class='del'>-	int frames = 30;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;card_present &amp;&amp; !local-&gt;func-&gt;card_present(local))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	set_bit(HOSTAP_BITS_BAP_TASKLET, &amp;local-&gt;bits);</div><div class='del'>-</div><div class='del'>-	/* Process all pending BAP events without generating new interrupts</div><div class='del'>-	 * for them */</div><div class='del'>-	while (frames-- &gt; 0) {</div><div class='del'>-		ev = HFA384X_INW(HFA384X_EVSTAT_OFF);</div><div class='del'>-		if (ev == 0xffff || !(ev &amp; HFA384X_BAP0_EVENTS))</div><div class='del'>-			break;</div><div class='del'>-		if (ev &amp; HFA384X_EV_RX)</div><div class='del'>-			prism2_rx(local);</div><div class='del'>-		if (ev &amp; HFA384X_EV_INFO)</div><div class='del'>-			prism2_info(local);</div><div class='del'>-		if (ev &amp; HFA384X_EV_TX)</div><div class='del'>-			prism2_tx_ev(local);</div><div class='del'>-		if (ev &amp; HFA384X_EV_TXEXC)</div><div class='del'>-			prism2_txexc(local);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_bit(HOSTAP_BITS_BAP_TASKLET2, &amp;local-&gt;bits);</div><div class='del'>-	clear_bit(HOSTAP_BITS_BAP_TASKLET, &amp;local-&gt;bits);</div><div class='del'>-</div><div class='del'>-	/* Enable interrupts for new BAP events */</div><div class='del'>-	hfa384x_events_all(dev);</div><div class='del'>-	clear_bit(HOSTAP_BITS_BAP_TASKLET2, &amp;local-&gt;bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only from hardware IRQ */</div><div class='del'>-static void prism2_infdrop(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	static unsigned long last_inquire = 0;</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_EXTRA, "%s: INFDROP event\n", dev-&gt;name);</div><div class='del'>-</div><div class='del'>-	/* some firmware versions seem to get stuck with</div><div class='del'>-	 * full CommTallies in high traffic load cases; every</div><div class='del'>-	 * packet will then cause INFDROP event and CommTallies</div><div class='del'>-	 * info frame will not be sent automatically. Try to</div><div class='del'>-	 * get out of this state by inquiring CommTallies. */</div><div class='del'>-	if (!last_inquire || time_after(jiffies, last_inquire + HZ)) {</div><div class='del'>-		hfa384x_cmd_callback(dev, HFA384X_CMDCODE_INQUIRE,</div><div class='del'>-				     HFA384X_INFO_COMMTALLIES, NULL, 0);</div><div class='del'>-		last_inquire = jiffies;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only from hardware IRQ */</div><div class='del'>-static void prism2_ev_tick(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	u16 evstat, inten;</div><div class='del'>-	static int prev_stuck = 0;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (time_after(jiffies, local-&gt;last_tick_timer + 5 * HZ) &amp;&amp;</div><div class='del'>-	    local-&gt;last_tick_timer) {</div><div class='del'>-		evstat = HFA384X_INW(HFA384X_EVSTAT_OFF);</div><div class='del'>-		inten = HFA384X_INW(HFA384X_INTEN_OFF);</div><div class='del'>-		if (!prev_stuck) {</div><div class='del'>-			printk(KERN_INFO "%s: SW TICK stuck? "</div><div class='del'>-			       "bits=0x%lx EvStat=%04x IntEn=%04x\n",</div><div class='del'>-			       dev-&gt;name, local-&gt;bits, evstat, inten);</div><div class='del'>-		}</div><div class='del'>-		local-&gt;sw_tick_stuck++;</div><div class='del'>-		if ((evstat &amp; HFA384X_BAP0_EVENTS) &amp;&amp;</div><div class='del'>-		    (inten &amp; HFA384X_BAP0_EVENTS)) {</div><div class='del'>-			printk(KERN_INFO "%s: trying to recover from IRQ "</div><div class='del'>-			       "hang\n", dev-&gt;name);</div><div class='del'>-			hfa384x_events_no_bap0(dev);</div><div class='del'>-		}</div><div class='del'>-		prev_stuck = 1;</div><div class='del'>-	} else</div><div class='del'>-		prev_stuck = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only from hardware IRQ */</div><div class='del'>-static void prism2_check_magic(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	/* at least PCI Prism2.5 with bus mastering seems to sometimes</div><div class='del'>-	 * return 0x0000 in SWSUPPORT0 for unknown reason, but re-reading the</div><div class='del'>-	 * register once or twice seems to get the correct value.. PCI cards</div><div class='del'>-	 * cannot anyway be removed during normal operation, so there is not</div><div class='del'>-	 * really any need for this verification with them. */</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_PCI</div><div class='del'>-#ifndef final_version</div><div class='del'>-	static unsigned long last_magic_err = 0;</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-</div><div class='del'>-	if (HFA384X_INW(HFA384X_SWSUPPORT0_OFF) != HFA384X_MAGIC) {</div><div class='del'>-		if (!local-&gt;hw_ready)</div><div class='del'>-			return;</div><div class='del'>-		HFA384X_OUTW(0xffff, HFA384X_EVACK_OFF);</div><div class='del'>-		if (time_after(jiffies, last_magic_err + 10 * HZ)) {</div><div class='del'>-			printk("%s: Interrupt, but SWSUPPORT0 does not match: "</div><div class='del'>-			       "%04X != %04X - card removed?\n", dev-&gt;name,</div><div class='del'>-			       HFA384X_INW(HFA384X_SWSUPPORT0_OFF),</div><div class='del'>-			       HFA384X_MAGIC);</div><div class='del'>-			last_magic_err = jiffies;</div><div class='del'>-		} else if (net_ratelimit()) {</div><div class='del'>-			printk(KERN_DEBUG "%s: interrupt - SWSUPPORT0=%04x "</div><div class='del'>-			       "MAGIC=%04x\n", dev-&gt;name,</div><div class='del'>-			       HFA384X_INW(HFA384X_SWSUPPORT0_OFF),</div><div class='del'>-			       HFA384X_MAGIC);</div><div class='del'>-		}</div><div class='del'>-		if (HFA384X_INW(HFA384X_SWSUPPORT0_OFF) != 0xffff)</div><div class='del'>-			schedule_work(&amp;local-&gt;reset_queue);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-#endif /* final_version */</div><div class='del'>-#endif /* !PRISM2_PCI */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only from hardware IRQ */</div><div class='del'>-static irqreturn_t prism2_interrupt(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = dev_id;</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int events = 0;</div><div class='del'>-	u16 ev;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	/* Detect early interrupt before driver is fully configured */</div><div class='del'>-	spin_lock(&amp;local-&gt;irq_init_lock);</div><div class='del'>-	if (!dev-&gt;base_addr) {</div><div class='del'>-		if (net_ratelimit()) {</div><div class='del'>-			printk(KERN_DEBUG "%s: Interrupt, but dev not configured\n",</div><div class='del'>-			       dev-&gt;name);</div><div class='del'>-		}</div><div class='del'>-		spin_unlock(&amp;local-&gt;irq_init_lock);</div><div class='del'>-		return IRQ_HANDLED;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;local-&gt;irq_init_lock);</div><div class='del'>-</div><div class='del'>-	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INTERRUPT, 0, 0);</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;card_present &amp;&amp; !local-&gt;func-&gt;card_present(local)) {</div><div class='del'>-		if (net_ratelimit()) {</div><div class='del'>-			printk(KERN_DEBUG "%s: Interrupt, but dev not OK\n",</div><div class='del'>-			       dev-&gt;name);</div><div class='del'>-		}</div><div class='del'>-		return IRQ_HANDLED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prism2_check_magic(local);</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-		ev = HFA384X_INW(HFA384X_EVSTAT_OFF);</div><div class='del'>-		if (ev == 0xffff) {</div><div class='del'>-			if (local-&gt;shutdown)</div><div class='del'>-				return IRQ_HANDLED;</div><div class='del'>-			HFA384X_OUTW(0xffff, HFA384X_EVACK_OFF);</div><div class='del'>-			printk(KERN_DEBUG "%s: prism2_interrupt: ev=0xffff\n",</div><div class='del'>-			       dev-&gt;name);</div><div class='del'>-			return IRQ_HANDLED;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ev &amp;= HFA384X_INW(HFA384X_INTEN_OFF);</div><div class='del'>-		if (ev == 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (ev &amp; HFA384X_EV_CMD) {</div><div class='del'>-			prism2_cmd_ev(dev);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Above events are needed even before hw is ready, but other</div><div class='del'>-		 * events should be skipped during initialization. This may</div><div class='del'>-		 * change for AllocEv if allocate_fid is implemented without</div><div class='del'>-		 * busy waiting. */</div><div class='del'>-		if (!local-&gt;hw_ready || local-&gt;hw_resetting ||</div><div class='del'>-		    !local-&gt;dev_enabled) {</div><div class='del'>-			ev = HFA384X_INW(HFA384X_EVSTAT_OFF);</div><div class='del'>-			if (ev &amp; HFA384X_EV_CMD)</div><div class='del'>-				goto next_event;</div><div class='del'>-			if ((ev &amp; HFA384X_EVENT_MASK) == 0)</div><div class='del'>-				return IRQ_HANDLED;</div><div class='del'>-			if (local-&gt;dev_enabled &amp;&amp; (ev &amp; ~HFA384X_EV_TICK) &amp;&amp;</div><div class='del'>-			    net_ratelimit()) {</div><div class='del'>-				printk(KERN_DEBUG "%s: prism2_interrupt: hw "</div><div class='del'>-				       "not ready; skipping events 0x%04x "</div><div class='del'>-				       "(IntEn=0x%04x)%s%s%s\n",</div><div class='del'>-				       dev-&gt;name, ev,</div><div class='del'>-				       HFA384X_INW(HFA384X_INTEN_OFF),</div><div class='del'>-				       !local-&gt;hw_ready ? " (!hw_ready)" : "",</div><div class='del'>-				       local-&gt;hw_resetting ?</div><div class='del'>-				       " (hw_resetting)" : "",</div><div class='del'>-				       !local-&gt;dev_enabled ?</div><div class='del'>-				       " (!dev_enabled)" : "");</div><div class='del'>-			}</div><div class='del'>-			HFA384X_OUTW(ev, HFA384X_EVACK_OFF);</div><div class='del'>-			return IRQ_HANDLED;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ev &amp; HFA384X_EV_TICK) {</div><div class='del'>-			prism2_ev_tick(dev);</div><div class='del'>-			HFA384X_OUTW(HFA384X_EV_TICK, HFA384X_EVACK_OFF);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ev &amp; HFA384X_EV_ALLOC) {</div><div class='del'>-			prism2_alloc_ev(dev);</div><div class='del'>-			HFA384X_OUTW(HFA384X_EV_ALLOC, HFA384X_EVACK_OFF);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Reading data from the card is quite time consuming, so do it</div><div class='del'>-		 * in tasklets. TX, TXEXC, RX, and INFO events will be ACKed</div><div class='del'>-		 * and unmasked after needed data has been read completely. */</div><div class='del'>-		if (ev &amp; HFA384X_BAP0_EVENTS) {</div><div class='del'>-			hfa384x_events_no_bap0(dev);</div><div class='del'>-			tasklet_schedule(&amp;local-&gt;bap_tasklet);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-#ifndef final_version</div><div class='del'>-		if (ev &amp; HFA384X_EV_WTERR) {</div><div class='del'>-			PDEBUG(DEBUG_EXTRA, "%s: WTERR event\n", dev-&gt;name);</div><div class='del'>-			HFA384X_OUTW(HFA384X_EV_WTERR, HFA384X_EVACK_OFF);</div><div class='del'>-		}</div><div class='del'>-#endif /* final_version */</div><div class='del'>-</div><div class='del'>-		if (ev &amp; HFA384X_EV_INFDROP) {</div><div class='del'>-			prism2_infdrop(dev);</div><div class='del'>-			HFA384X_OUTW(HFA384X_EV_INFDROP, HFA384X_EVACK_OFF);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	next_event:</div><div class='del'>-		events++;</div><div class='del'>-		if (events &gt;= PRISM2_MAX_INTERRUPT_EVENTS) {</div><div class='del'>-			PDEBUG(DEBUG_EXTRA, "prism2_interrupt: &gt;%d events "</div><div class='del'>-			       "(EvStat=0x%04x)\n",</div><div class='del'>-			       PRISM2_MAX_INTERRUPT_EVENTS,</div><div class='del'>-			       HFA384X_INW(HFA384X_EVSTAT_OFF));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INTERRUPT, 0, 1);</div><div class='del'>-	return IRQ_RETVAL(events);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void prism2_check_sta_fw_version(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	struct hfa384x_comp_ident comp;</div><div class='del'>-	int id, variant, major, minor;</div><div class='del'>-</div><div class='del'>-	if (hfa384x_get_rid(local-&gt;dev, HFA384X_RID_STAID,</div><div class='del'>-			    &amp;comp, sizeof(comp), 1) &lt; 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	local-&gt;fw_ap = 0;</div><div class='del'>-	id = le16_to_cpu(comp.id);</div><div class='del'>-	if (id != HFA384X_COMP_ID_STA) {</div><div class='del'>-		if (id == HFA384X_COMP_ID_FW_AP)</div><div class='del'>-			local-&gt;fw_ap = 1;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	major = __le16_to_cpu(comp.major);</div><div class='del'>-	minor = __le16_to_cpu(comp.minor);</div><div class='del'>-	variant = __le16_to_cpu(comp.variant);</div><div class='del'>-	local-&gt;sta_fw_ver = PRISM2_FW_VER(major, minor, variant);</div><div class='del'>-</div><div class='del'>-	/* Station firmware versions before 1.4.x seem to have a bug in</div><div class='del'>-	 * firmware-based WEP encryption when using Host AP mode, so use</div><div class='del'>-	 * host_encrypt as a default for them. Firmware version 1.4.9 is the</div><div class='del'>-	 * first one that has been seen to produce correct encryption, but the</div><div class='del'>-	 * bug might be fixed before that (although, at least 1.4.2 is broken).</div><div class='del'>-	 */</div><div class='del'>-	local-&gt;fw_encrypt_ok = local-&gt;sta_fw_ver &gt;= PRISM2_FW_VER(1,4,9);</div><div class='del'>-</div><div class='del'>-	if (local-&gt;iw_mode == IW_MODE_MASTER &amp;&amp; !local-&gt;host_encrypt &amp;&amp;</div><div class='del'>-	    !local-&gt;fw_encrypt_ok) {</div><div class='del'>-		printk(KERN_DEBUG "%s: defaulting to host-based encryption as "</div><div class='del'>-		       "a workaround for firmware bug in Host AP mode WEP\n",</div><div class='del'>-		       local-&gt;dev-&gt;name);</div><div class='del'>-		local-&gt;host_encrypt = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* IEEE 802.11 standard compliant WDS frames (4 addresses) were broken</div><div class='del'>-	 * in station firmware versions before 1.5.x. With these versions, the</div><div class='del'>-	 * driver uses a workaround with bogus frame format (4th address after</div><div class='del'>-	 * the payload). This is not compatible with other AP devices. Since</div><div class='del'>-	 * the firmware bug is fixed in the latest station firmware versions,</div><div class='del'>-	 * automatically enable standard compliant mode for cards using station</div><div class='del'>-	 * firmware version 1.5.0 or newer. */</div><div class='del'>-	if (local-&gt;sta_fw_ver &gt;= PRISM2_FW_VER(1,5,0))</div><div class='del'>-		local-&gt;wds_type |= HOSTAP_WDS_STANDARD_FRAME;</div><div class='del'>-	else {</div><div class='del'>-		printk(KERN_DEBUG "%s: defaulting to bogus WDS frame as a "</div><div class='del'>-		       "workaround for firmware bug in Host AP mode WDS\n",</div><div class='del'>-		       local-&gt;dev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hostap_check_sta_fw_version(local-&gt;ap, local-&gt;sta_fw_ver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void hostap_passive_scan(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = from_timer(local, t, passive_scan_timer);</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-	u16 chan;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;passive_scan_interval &lt;= 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;passive_scan_state == PASSIVE_SCAN_LISTEN) {</div><div class='del'>-		int max_tries = 16;</div><div class='del'>-</div><div class='del'>-		/* Even though host system does not really know when the WLAN</div><div class='del'>-		 * MAC is sending frames, try to avoid changing channels for</div><div class='del'>-		 * passive scanning when a host-generated frame is being</div><div class='del'>-		 * transmitted */</div><div class='del'>-		if (test_bit(HOSTAP_BITS_TRANSMIT, &amp;local-&gt;bits)) {</div><div class='del'>-			printk(KERN_DEBUG "%s: passive scan detected pending "</div><div class='del'>-			       "TX - delaying\n", dev-&gt;name);</div><div class='del'>-			local-&gt;passive_scan_timer.expires = jiffies + HZ / 10;</div><div class='del'>-			add_timer(&amp;local-&gt;passive_scan_timer);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		do {</div><div class='del'>-			local-&gt;passive_scan_channel++;</div><div class='del'>-			if (local-&gt;passive_scan_channel &gt; 14)</div><div class='del'>-				local-&gt;passive_scan_channel = 1;</div><div class='del'>-			max_tries--;</div><div class='del'>-		} while (!(local-&gt;channel_mask &amp;</div><div class='del'>-			   (1 &lt;&lt; (local-&gt;passive_scan_channel - 1))) &amp;&amp;</div><div class='del'>-			 max_tries &gt; 0);</div><div class='del'>-</div><div class='del'>-		if (max_tries == 0) {</div><div class='del'>-			printk(KERN_INFO "%s: no allowed passive scan channels"</div><div class='del'>-			       " found\n", dev-&gt;name);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		printk(KERN_DEBUG "%s: passive scan channel %d\n",</div><div class='del'>-		       dev-&gt;name, local-&gt;passive_scan_channel);</div><div class='del'>-		chan = local-&gt;passive_scan_channel;</div><div class='del'>-		local-&gt;passive_scan_state = PASSIVE_SCAN_WAIT;</div><div class='del'>-		local-&gt;passive_scan_timer.expires = jiffies + HZ / 10;</div><div class='del'>-	} else {</div><div class='del'>-		chan = local-&gt;channel;</div><div class='del'>-		local-&gt;passive_scan_state = PASSIVE_SCAN_LISTEN;</div><div class='del'>-		local-&gt;passive_scan_timer.expires = jiffies +</div><div class='del'>-			local-&gt;passive_scan_interval * HZ;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hfa384x_cmd_callback(dev, HFA384X_CMDCODE_TEST |</div><div class='del'>-				 (HFA384X_TEST_CHANGE_CHANNEL &lt;&lt; 8),</div><div class='del'>-				 chan, NULL, 0))</div><div class='del'>-		printk(KERN_ERR "%s: passive scan channel set %d "</div><div class='del'>-		       "failed\n", dev-&gt;name, chan);</div><div class='del'>-</div><div class='del'>-	add_timer(&amp;local-&gt;passive_scan_timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a scheduled task when communications quality values should</div><div class='del'>- * be updated. */</div><div class='del'>-static void handle_comms_qual_update(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local =</div><div class='del'>-		container_of(work, local_info_t, comms_qual_update);</div><div class='del'>-	prism2_update_comms_qual(local-&gt;dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Software watchdog - called as a timer. Hardware interrupt (Tick event) is</div><div class='del'>- * used to monitor that local-&gt;last_tick_timer is being updated. If not,</div><div class='del'>- * interrupt busy-loop is assumed and driver tries to recover by masking out</div><div class='del'>- * some events. */</div><div class='del'>-static void hostap_tick_timer(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	static unsigned long last_inquire = 0;</div><div class='del'>-	local_info_t *local = from_timer(local, t, tick_timer);</div><div class='del'>-	local-&gt;last_tick_timer = jiffies;</div><div class='del'>-</div><div class='del'>-	/* Inquire CommTallies every 10 seconds to keep the statistics updated</div><div class='del'>-	 * more often during low load and when using 32-bit tallies. */</div><div class='del'>-	if ((!last_inquire || time_after(jiffies, last_inquire + 10 * HZ)) &amp;&amp;</div><div class='del'>-	    !local-&gt;hw_downloading &amp;&amp; local-&gt;hw_ready &amp;&amp;</div><div class='del'>-	    !local-&gt;hw_resetting &amp;&amp; local-&gt;dev_enabled) {</div><div class='del'>-		hfa384x_cmd_callback(local-&gt;dev, HFA384X_CMDCODE_INQUIRE,</div><div class='del'>-				     HFA384X_INFO_COMMTALLIES, NULL, 0);</div><div class='del'>-		last_inquire = jiffies;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((local-&gt;last_comms_qual_update == 0 ||</div><div class='del'>-	     time_after(jiffies, local-&gt;last_comms_qual_update + 10 * HZ)) &amp;&amp;</div><div class='del'>-	    (local-&gt;iw_mode == IW_MODE_INFRA ||</div><div class='del'>-	     local-&gt;iw_mode == IW_MODE_ADHOC)) {</div><div class='del'>-		schedule_work(&amp;local-&gt;comms_qual_update);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	local-&gt;tick_timer.expires = jiffies + 2 * HZ;</div><div class='del'>-	add_timer(&amp;local-&gt;tick_timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if !defined(PRISM2_NO_PROCFS_DEBUG) &amp;&amp; defined(CONFIG_PROC_FS)</div><div class='del'>-static u16 hfa384x_read_reg(struct net_device *dev, u16 reg)</div><div class='del'>-{</div><div class='del'>-	return HFA384X_INW(reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int prism2_registers_proc_show(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = m-&gt;private;</div><div class='del'>-</div><div class='del'>-#define SHOW_REG(n) \</div><div class='del'>-  seq_printf(m, #n "=%04x\n", hfa384x_read_reg(local-&gt;dev, HFA384X_##n##_OFF))</div><div class='del'>-</div><div class='del'>-	SHOW_REG(CMD);</div><div class='del'>-	SHOW_REG(PARAM0);</div><div class='del'>-	SHOW_REG(PARAM1);</div><div class='del'>-	SHOW_REG(PARAM2);</div><div class='del'>-	SHOW_REG(STATUS);</div><div class='del'>-	SHOW_REG(RESP0);</div><div class='del'>-	SHOW_REG(RESP1);</div><div class='del'>-	SHOW_REG(RESP2);</div><div class='del'>-	SHOW_REG(INFOFID);</div><div class='del'>-	SHOW_REG(CONTROL);</div><div class='del'>-	SHOW_REG(SELECT0);</div><div class='del'>-	SHOW_REG(SELECT1);</div><div class='del'>-	SHOW_REG(OFFSET0);</div><div class='del'>-	SHOW_REG(OFFSET1);</div><div class='del'>-	SHOW_REG(RXFID);</div><div class='del'>-	SHOW_REG(ALLOCFID);</div><div class='del'>-	SHOW_REG(TXCOMPLFID);</div><div class='del'>-	SHOW_REG(SWSUPPORT0);</div><div class='del'>-	SHOW_REG(SWSUPPORT1);</div><div class='del'>-	SHOW_REG(SWSUPPORT2);</div><div class='del'>-	SHOW_REG(EVSTAT);</div><div class='del'>-	SHOW_REG(INTEN);</div><div class='del'>-	SHOW_REG(EVACK);</div><div class='del'>-	/* Do not read data registers, because they change the state of the</div><div class='del'>-	 * MAC (offset += 2) */</div><div class='del'>-	/* SHOW_REG(DATA0); */</div><div class='del'>-	/* SHOW_REG(DATA1); */</div><div class='del'>-	SHOW_REG(AUXPAGE);</div><div class='del'>-	SHOW_REG(AUXOFFSET);</div><div class='del'>-	/* SHOW_REG(AUXDATA); */</div><div class='del'>-#ifdef PRISM2_PCI</div><div class='del'>-	SHOW_REG(PCICOR);</div><div class='del'>-	SHOW_REG(PCIHCR);</div><div class='del'>-	SHOW_REG(PCI_M0_ADDRH);</div><div class='del'>-	SHOW_REG(PCI_M0_ADDRL);</div><div class='del'>-	SHOW_REG(PCI_M0_LEN);</div><div class='del'>-	SHOW_REG(PCI_M0_CTL);</div><div class='del'>-	SHOW_REG(PCI_STATUS);</div><div class='del'>-	SHOW_REG(PCI_M1_ADDRH);</div><div class='del'>-	SHOW_REG(PCI_M1_ADDRL);</div><div class='del'>-	SHOW_REG(PCI_M1_LEN);</div><div class='del'>-	SHOW_REG(PCI_M1_CTL);</div><div class='del'>-#endif /* PRISM2_PCI */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct set_tim_data {</div><div class='del'>-	struct list_head list;</div><div class='del'>-	int aid;</div><div class='del'>-	int set;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int prism2_set_tim(struct net_device *dev, int aid, int set)</div><div class='del'>-{</div><div class='del'>-	struct list_head *ptr;</div><div class='del'>-	struct set_tim_data *new_entry;</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	new_entry = kzalloc(sizeof(*new_entry), GFP_ATOMIC);</div><div class='del'>-	if (new_entry == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	new_entry-&gt;aid = aid;</div><div class='del'>-	new_entry-&gt;set = set;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;local-&gt;set_tim_lock);</div><div class='del'>-	list_for_each(ptr, &amp;local-&gt;set_tim_list) {</div><div class='del'>-		struct set_tim_data *entry =</div><div class='del'>-			list_entry(ptr, struct set_tim_data, list);</div><div class='del'>-		if (entry-&gt;aid == aid) {</div><div class='del'>-			PDEBUG(DEBUG_PS2, "%s: prism2_set_tim: aid=%d "</div><div class='del'>-			       "set=%d ==&gt; %d\n",</div><div class='del'>-			       local-&gt;dev-&gt;name, aid, entry-&gt;set, set);</div><div class='del'>-			entry-&gt;set = set;</div><div class='del'>-			kfree(new_entry);</div><div class='del'>-			new_entry = NULL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (new_entry)</div><div class='del'>-		list_add_tail(&amp;new_entry-&gt;list, &amp;local-&gt;set_tim_list);</div><div class='del'>-	spin_unlock_bh(&amp;local-&gt;set_tim_lock);</div><div class='del'>-</div><div class='del'>-	schedule_work(&amp;local-&gt;set_tim_queue);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void handle_set_tim_queue(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = container_of(work, local_info_t, set_tim_queue);</div><div class='del'>-	struct set_tim_data *entry;</div><div class='del'>-	u16 val;</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-		entry = NULL;</div><div class='del'>-		spin_lock_bh(&amp;local-&gt;set_tim_lock);</div><div class='del'>-		if (!list_empty(&amp;local-&gt;set_tim_list)) {</div><div class='del'>-			entry = list_entry(local-&gt;set_tim_list.next,</div><div class='del'>-					   struct set_tim_data, list);</div><div class='del'>-			list_del(&amp;entry-&gt;list);</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_bh(&amp;local-&gt;set_tim_lock);</div><div class='del'>-		if (!entry)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		PDEBUG(DEBUG_PS2, "%s: handle_set_tim_queue: aid=%d set=%d\n",</div><div class='del'>-		       local-&gt;dev-&gt;name, entry-&gt;aid, entry-&gt;set);</div><div class='del'>-</div><div class='del'>-		val = entry-&gt;aid;</div><div class='del'>-		if (entry-&gt;set)</div><div class='del'>-			val |= 0x8000;</div><div class='del'>-		if (hostap_set_word(local-&gt;dev, HFA384X_RID_CNFTIMCTRL, val)) {</div><div class='del'>-			printk(KERN_DEBUG "%s: set_tim failed (aid=%d "</div><div class='del'>-			       "set=%d)\n",</div><div class='del'>-			       local-&gt;dev-&gt;name, entry-&gt;aid, entry-&gt;set);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		kfree(entry);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void prism2_clear_set_tim_queue(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	struct list_head *ptr, *n;</div><div class='del'>-</div><div class='del'>-	list_for_each_safe(ptr, n, &amp;local-&gt;set_tim_list) {</div><div class='del'>-		struct set_tim_data *entry;</div><div class='del'>-		entry = list_entry(ptr, struct set_tim_data, list);</div><div class='del'>-		list_del(&amp;entry-&gt;list);</div><div class='del'>-		kfree(entry);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * HostAP uses two layers of net devices, where the inner</div><div class='del'>- * layer gets called all the time from the outer layer.</div><div class='del'>- * This is a natural nesting, which needs a split lock type.</div><div class='del'>- */</div><div class='del'>-static struct lock_class_key hostap_netdev_xmit_lock_key;</div><div class='del'>-static struct lock_class_key hostap_netdev_addr_lock_key;</div><div class='del'>-</div><div class='del'>-static void prism2_set_lockdep_class_one(struct net_device *dev,</div><div class='del'>-					 struct netdev_queue *txq,</div><div class='del'>-					 void *_unused)</div><div class='del'>-{</div><div class='del'>-	lockdep_set_class(&amp;txq-&gt;_xmit_lock,</div><div class='del'>-			  &amp;hostap_netdev_xmit_lock_key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void prism2_set_lockdep_class(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	lockdep_set_class(&amp;dev-&gt;addr_list_lock,</div><div class='del'>-			  &amp;hostap_netdev_addr_lock_key);</div><div class='del'>-	netdev_for_each_tx_queue(dev, prism2_set_lockdep_class_one, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct net_device *</div><div class='del'>-prism2_init_local_data(struct prism2_helper_functions *funcs, int card_idx,</div><div class='del'>-		       struct device *sdev)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	struct local_info *local;</div><div class='del'>-	int len, i, ret;</div><div class='del'>-</div><div class='del'>-	if (funcs == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	len = strlen(dev_template);</div><div class='del'>-	if (len &gt;= IFNAMSIZ || strstr(dev_template, "%d") == NULL) {</div><div class='del'>-		printk(KERN_WARNING "hostap: Invalid dev_template='%s'\n",</div><div class='del'>-		       dev_template);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	len = sizeof(struct hostap_interface) +</div><div class='del'>-		3 + sizeof(struct local_info) +</div><div class='del'>-		3 + sizeof(struct ap_data);</div><div class='del'>-</div><div class='del'>-	dev = alloc_etherdev(len);</div><div class='del'>-	if (dev == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = (struct local_info *) ((((long) (iface + 1)) + 3) &amp; ~3);</div><div class='del'>-	local-&gt;ap = (struct ap_data *) ((((long) (local + 1)) + 3) &amp; ~3);</div><div class='del'>-	local-&gt;dev = iface-&gt;dev = dev;</div><div class='del'>-	iface-&gt;local = local;</div><div class='del'>-	iface-&gt;type = HOSTAP_INTERFACE_MASTER;</div><div class='del'>-	INIT_LIST_HEAD(&amp;local-&gt;hostap_interfaces);</div><div class='del'>-</div><div class='del'>-	local-&gt;hw_module = THIS_MODULE;</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_IO_DEBUG</div><div class='del'>-	local-&gt;io_debug_enabled = 1;</div><div class='del'>-#endif /* PRISM2_IO_DEBUG */</div><div class='del'>-</div><div class='del'>-	local-&gt;func = funcs;</div><div class='del'>-	local-&gt;func-&gt;cmd = hfa384x_cmd;</div><div class='del'>-	local-&gt;func-&gt;read_regs = hfa384x_read_regs;</div><div class='del'>-	local-&gt;func-&gt;get_rid = hfa384x_get_rid;</div><div class='del'>-	local-&gt;func-&gt;set_rid = hfa384x_set_rid;</div><div class='del'>-	local-&gt;func-&gt;hw_enable = prism2_hw_enable;</div><div class='del'>-	local-&gt;func-&gt;hw_config = prism2_hw_config;</div><div class='del'>-	local-&gt;func-&gt;hw_reset = prism2_hw_reset;</div><div class='del'>-	local-&gt;func-&gt;hw_shutdown = prism2_hw_shutdown;</div><div class='del'>-	local-&gt;func-&gt;reset_port = prism2_reset_port;</div><div class='del'>-	local-&gt;func-&gt;schedule_reset = prism2_schedule_reset;</div><div class='del'>-#ifdef PRISM2_DOWNLOAD_SUPPORT</div><div class='del'>-	local-&gt;func-&gt;read_aux_proc_ops = &amp;prism2_download_aux_dump_proc_ops;</div><div class='del'>-	local-&gt;func-&gt;download = prism2_download;</div><div class='del'>-#endif /* PRISM2_DOWNLOAD_SUPPORT */</div><div class='del'>-	local-&gt;func-&gt;tx = prism2_tx_80211;</div><div class='del'>-	local-&gt;func-&gt;set_tim = prism2_set_tim;</div><div class='del'>-	local-&gt;func-&gt;need_tx_headroom = 0; /* no need to add txdesc in</div><div class='del'>-					    * skb-&gt;data (FIX: maybe for DMA bus</div><div class='del'>-					    * mastering? */</div><div class='del'>-</div><div class='del'>-	local-&gt;mtu = mtu;</div><div class='del'>-</div><div class='del'>-	rwlock_init(&amp;local-&gt;iface_lock);</div><div class='del'>-	spin_lock_init(&amp;local-&gt;txfidlock);</div><div class='del'>-	spin_lock_init(&amp;local-&gt;cmdlock);</div><div class='del'>-	spin_lock_init(&amp;local-&gt;baplock);</div><div class='del'>-	spin_lock_init(&amp;local-&gt;lock);</div><div class='del'>-	spin_lock_init(&amp;local-&gt;irq_init_lock);</div><div class='del'>-	mutex_init(&amp;local-&gt;rid_bap_mtx);</div><div class='del'>-</div><div class='del'>-	if (card_idx &lt; 0 || card_idx &gt;= MAX_PARM_DEVICES)</div><div class='del'>-		card_idx = 0;</div><div class='del'>-	local-&gt;card_idx = card_idx;</div><div class='del'>-</div><div class='del'>-	len = strlen(essid);</div><div class='del'>-	memcpy(local-&gt;essid, essid,</div><div class='del'>-	       len &gt; MAX_SSID_LEN ? MAX_SSID_LEN : len);</div><div class='del'>-	local-&gt;essid[MAX_SSID_LEN] = '\0';</div><div class='del'>-	i = GET_INT_PARM(iw_mode, card_idx);</div><div class='del'>-	if ((i &gt;= IW_MODE_ADHOC &amp;&amp; i &lt;= IW_MODE_REPEAT) ||</div><div class='del'>-	    i == IW_MODE_MONITOR) {</div><div class='del'>-		local-&gt;iw_mode = i;</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_WARNING "prism2: Unknown iw_mode %d; using "</div><div class='del'>-		       "IW_MODE_MASTER\n", i);</div><div class='del'>-		local-&gt;iw_mode = IW_MODE_MASTER;</div><div class='del'>-	}</div><div class='del'>-	local-&gt;channel = GET_INT_PARM(channel, card_idx);</div><div class='del'>-	local-&gt;beacon_int = GET_INT_PARM(beacon_int, card_idx);</div><div class='del'>-	local-&gt;dtim_period = GET_INT_PARM(dtim_period, card_idx);</div><div class='del'>-	local-&gt;wds_max_connections = 16;</div><div class='del'>-	local-&gt;tx_control = HFA384X_TX_CTRL_FLAGS;</div><div class='del'>-	local-&gt;manual_retry_count = -1;</div><div class='del'>-	local-&gt;rts_threshold = 2347;</div><div class='del'>-	local-&gt;fragm_threshold = 2346;</div><div class='del'>-	local-&gt;rssi_to_dBm = 100; /* default; to be overriden by</div><div class='del'>-				   * cnfDbmAdjust, if available */</div><div class='del'>-	local-&gt;auth_algs = PRISM2_AUTH_OPEN | PRISM2_AUTH_SHARED_KEY;</div><div class='del'>-	local-&gt;sram_type = -1;</div><div class='del'>-	local-&gt;scan_channel_mask = 0xffff;</div><div class='del'>-	local-&gt;monitor_type = PRISM2_MONITOR_RADIOTAP;</div><div class='del'>-</div><div class='del'>-	/* Initialize task queue structures */</div><div class='del'>-	INIT_WORK(&amp;local-&gt;reset_queue, handle_reset_queue);</div><div class='del'>-	INIT_WORK(&amp;local-&gt;set_multicast_list_queue,</div><div class='del'>-		  hostap_set_multicast_list_queue);</div><div class='del'>-</div><div class='del'>-	INIT_WORK(&amp;local-&gt;set_tim_queue, handle_set_tim_queue);</div><div class='del'>-	INIT_LIST_HEAD(&amp;local-&gt;set_tim_list);</div><div class='del'>-	spin_lock_init(&amp;local-&gt;set_tim_lock);</div><div class='del'>-</div><div class='del'>-	INIT_WORK(&amp;local-&gt;comms_qual_update, handle_comms_qual_update);</div><div class='del'>-</div><div class='del'>-	/* Initialize tasklets for handling hardware IRQ related operations</div><div class='del'>-	 * outside hw IRQ handler */</div><div class='del'>-	tasklet_setup(&amp;local-&gt;bap_tasklet, hostap_bap_tasklet);</div><div class='del'>-	tasklet_setup(&amp;local-&gt;info_tasklet, hostap_info_tasklet);</div><div class='del'>-	hostap_info_init(local);</div><div class='del'>-</div><div class='del'>-	tasklet_setup(&amp;local-&gt;rx_tasklet, hostap_rx_tasklet);</div><div class='del'>-	skb_queue_head_init(&amp;local-&gt;rx_list);</div><div class='del'>-</div><div class='del'>-	tasklet_setup(&amp;local-&gt;sta_tx_exc_tasklet,</div><div class='del'>-			    hostap_sta_tx_exc_tasklet);</div><div class='del'>-	skb_queue_head_init(&amp;local-&gt;sta_tx_exc_list);</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;local-&gt;cmd_queue);</div><div class='del'>-	init_waitqueue_head(&amp;local-&gt;hostscan_wq);</div><div class='del'>-</div><div class='del'>-	lib80211_crypt_info_init(&amp;local-&gt;crypt_info, dev-&gt;name, &amp;local-&gt;lock);</div><div class='del'>-</div><div class='del'>-	timer_setup(&amp;local-&gt;passive_scan_timer, hostap_passive_scan, 0);</div><div class='del'>-	timer_setup(&amp;local-&gt;tick_timer, hostap_tick_timer, 0);</div><div class='del'>-	local-&gt;tick_timer.expires = jiffies + 2 * HZ;</div><div class='del'>-	add_timer(&amp;local-&gt;tick_timer);</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;local-&gt;bss_list);</div><div class='del'>-</div><div class='del'>-	hostap_setup_dev(dev, local, HOSTAP_INTERFACE_MASTER);</div><div class='del'>-</div><div class='del'>-	dev-&gt;type = ARPHRD_IEEE80211;</div><div class='del'>-	dev-&gt;header_ops = &amp;hostap_80211_ops;</div><div class='del'>-</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	ret = dev_alloc_name(dev, "wifi%d");</div><div class='del'>-	SET_NETDEV_DEV(dev, sdev);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='del'>-		ret = register_netdevice(dev);</div><div class='del'>-</div><div class='del'>-	prism2_set_lockdep_class(dev);</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		printk(KERN_WARNING "%s: register netdevice failed!\n",</div><div class='del'>-		       dev_info);</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-	printk(KERN_INFO "%s: Registered netdevice %s\n", dev_info, dev-&gt;name);</div><div class='del'>-</div><div class='del'>-	hostap_init_data(local);</div><div class='del'>-	return dev;</div><div class='del'>-</div><div class='del'>- fail:</div><div class='del'>-	free_netdev(dev);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int hostap_hw_ready(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	struct local_info *local;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-	local-&gt;ddev = hostap_add_interface(local, HOSTAP_INTERFACE_MAIN, 0,</div><div class='del'>-					   "", dev_template);</div><div class='del'>-</div><div class='del'>-	if (local-&gt;ddev) {</div><div class='del'>-		if (local-&gt;iw_mode == IW_MODE_INFRA ||</div><div class='del'>-		    local-&gt;iw_mode == IW_MODE_ADHOC) {</div><div class='del'>-			netif_carrier_off(local-&gt;dev);</div><div class='del'>-			netif_carrier_off(local-&gt;ddev);</div><div class='del'>-		}</div><div class='del'>-		hostap_init_proc(local);</div><div class='del'>-#ifndef PRISM2_NO_PROCFS_DEBUG</div><div class='del'>-		proc_create_single_data("registers", 0, local-&gt;proc,</div><div class='del'>-				 prism2_registers_proc_show, local);</div><div class='del'>-#endif /* PRISM2_NO_PROCFS_DEBUG */</div><div class='del'>-		hostap_init_ap_proc(local);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void prism2_free_local_data(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct hostap_tx_callback_info *tx_cb, *tx_cb_prev;</div><div class='del'>-	int i;</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	struct local_info *local;</div><div class='del'>-	struct list_head *ptr, *n;</div><div class='del'>-</div><div class='del'>-	if (dev == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	/* Unregister all netdevs before freeing local data. */</div><div class='del'>-	list_for_each_safe(ptr, n, &amp;local-&gt;hostap_interfaces) {</div><div class='del'>-		iface = list_entry(ptr, struct hostap_interface, list);</div><div class='del'>-		if (iface-&gt;type == HOSTAP_INTERFACE_MASTER) {</div><div class='del'>-			/* special handling for this interface below */</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		hostap_remove_interface(iface-&gt;dev, 0, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	unregister_netdev(local-&gt;dev);</div><div class='del'>-</div><div class='del'>-	flush_work(&amp;local-&gt;reset_queue);</div><div class='del'>-	flush_work(&amp;local-&gt;set_multicast_list_queue);</div><div class='del'>-	flush_work(&amp;local-&gt;set_tim_queue);</div><div class='del'>-#ifndef PRISM2_NO_STATION_MODES</div><div class='del'>-	flush_work(&amp;local-&gt;info_queue);</div><div class='del'>-#endif</div><div class='del'>-	flush_work(&amp;local-&gt;comms_qual_update);</div><div class='del'>-</div><div class='del'>-	lib80211_crypt_info_free(&amp;local-&gt;crypt_info);</div><div class='del'>-</div><div class='del'>-	if (timer_pending(&amp;local-&gt;passive_scan_timer))</div><div class='del'>-		del_timer(&amp;local-&gt;passive_scan_timer);</div><div class='del'>-</div><div class='del'>-	if (timer_pending(&amp;local-&gt;tick_timer))</div><div class='del'>-		del_timer(&amp;local-&gt;tick_timer);</div><div class='del'>-</div><div class='del'>-	prism2_clear_cmd_queue(local);</div><div class='del'>-</div><div class='del'>-	skb_queue_purge(&amp;local-&gt;info_list);</div><div class='del'>-	skb_queue_purge(&amp;local-&gt;rx_list);</div><div class='del'>-	skb_queue_purge(&amp;local-&gt;sta_tx_exc_list);</div><div class='del'>-</div><div class='del'>-	if (local-&gt;dev_enabled)</div><div class='del'>-		prism2_callback(local, PRISM2_CALLBACK_DISABLE);</div><div class='del'>-</div><div class='del'>-	if (local-&gt;ap != NULL)</div><div class='del'>-		hostap_free_data(local-&gt;ap);</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_PROCFS_DEBUG</div><div class='del'>-	if (local-&gt;proc != NULL)</div><div class='del'>-		remove_proc_entry("registers", local-&gt;proc);</div><div class='del'>-#endif /* PRISM2_NO_PROCFS_DEBUG */</div><div class='del'>-	hostap_remove_proc(local);</div><div class='del'>-</div><div class='del'>-	tx_cb = local-&gt;tx_callback;</div><div class='del'>-	while (tx_cb != NULL) {</div><div class='del'>-		tx_cb_prev = tx_cb;</div><div class='del'>-		tx_cb = tx_cb-&gt;next;</div><div class='del'>-		kfree(tx_cb_prev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hostap_set_hostapd(local, 0, 0);</div><div class='del'>-	hostap_set_hostapd_sta(local, 0, 0);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; PRISM2_FRAG_CACHE_LEN; i++) {</div><div class='del'>-		if (local-&gt;frag_cache[i].skb != NULL)</div><div class='del'>-			dev_kfree_skb(local-&gt;frag_cache[i].skb);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_DOWNLOAD_SUPPORT</div><div class='del'>-	prism2_download_free_data(local-&gt;dl_pri);</div><div class='del'>-	prism2_download_free_data(local-&gt;dl_sec);</div><div class='del'>-#endif /* PRISM2_DOWNLOAD_SUPPORT */</div><div class='del'>-</div><div class='del'>-	prism2_clear_set_tim_queue(local);</div><div class='del'>-</div><div class='del'>-	list_for_each_safe(ptr, n, &amp;local-&gt;bss_list) {</div><div class='del'>-		struct hostap_bss_info *bss =</div><div class='del'>-			list_entry(ptr, struct hostap_bss_info, list);</div><div class='del'>-		kfree(bss);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(local-&gt;pda);</div><div class='del'>-	kfree(local-&gt;last_scan_results);</div><div class='del'>-	kfree(local-&gt;generic_elem);</div><div class='del'>-</div><div class='del'>-	free_netdev(local-&gt;dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if defined(PRISM2_PCI) || defined(PRISM2_PCCARD)</div><div class='del'>-static void __maybe_unused prism2_suspend(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	struct local_info *local;</div><div class='del'>-	union iwreq_data wrqu;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	/* Send disconnect event, e.g., to trigger reassociation after resume</div><div class='del'>-	 * if wpa_supplicant is used. */</div><div class='del'>-	memset(&amp;wrqu, 0, sizeof(wrqu));</div><div class='del'>-	wrqu.ap_addr.sa_family = ARPHRD_ETHER;</div><div class='del'>-	wireless_send_event(local-&gt;dev, SIOCGIWAP, &amp;wrqu, NULL);</div><div class='del'>-</div><div class='del'>-	/* Disable hardware and firmware */</div><div class='del'>-	prism2_hw_shutdown(dev, 0);</div><div class='del'>-}</div><div class='del'>-#endif /* PRISM2_PCI || PRISM2_PCCARD */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* These might at some point be compiled separately and used as separate</div><div class='del'>- * kernel modules or linked into one */</div><div class='del'>-#ifdef PRISM2_DOWNLOAD_SUPPORT</div><div class='del'>-#include "hostap_download.c"</div><div class='del'>-#endif /* PRISM2_DOWNLOAD_SUPPORT */</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_CALLBACK</div><div class='del'>-/* External hostap_callback.c file can be used to, e.g., blink activity led.</div><div class='del'>- * This can use platform specific code and must define prism2_callback()</div><div class='del'>- * function (if PRISM2_CALLBACK is not defined, these function calls are not</div><div class='del'>- * used. */</div><div class='del'>-#include "hostap_callback.c"</div><div class='del'>-#endif /* PRISM2_CALLBACK */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/hostap/hostap_info.c b/drivers/net/wireless/intersil/hostap/hostap_info.c<br/>deleted file mode 100644<br/>index da8c30f10d92..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/hostap/hostap_info.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_info.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,509 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Host AP driver Info Frame processing (part of hostap.o module) */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include "hostap_wlan.h"</div><div class='del'>-#include "hostap.h"</div><div class='del'>-#include "hostap_ap.h"</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static void prism2_info_commtallies16(local_info_t *local, unsigned char *buf,</div><div class='del'>-				      int left)</div><div class='del'>-{</div><div class='del'>-	struct hfa384x_comm_tallies *tallies;</div><div class='del'>-</div><div class='del'>-	if (left &lt; sizeof(struct hfa384x_comm_tallies)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: too short (len=%d) commtallies "</div><div class='del'>-		       "info frame\n", local-&gt;dev-&gt;name, left);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tallies = (struct hfa384x_comm_tallies *) buf;</div><div class='del'>-#define ADD_COMM_TALLIES(name) \</div><div class='del'>-local-&gt;comm_tallies.name += le16_to_cpu(tallies-&gt;name)</div><div class='del'>-	ADD_COMM_TALLIES(tx_unicast_frames);</div><div class='del'>-	ADD_COMM_TALLIES(tx_multicast_frames);</div><div class='del'>-	ADD_COMM_TALLIES(tx_fragments);</div><div class='del'>-	ADD_COMM_TALLIES(tx_unicast_octets);</div><div class='del'>-	ADD_COMM_TALLIES(tx_multicast_octets);</div><div class='del'>-	ADD_COMM_TALLIES(tx_deferred_transmissions);</div><div class='del'>-	ADD_COMM_TALLIES(tx_single_retry_frames);</div><div class='del'>-	ADD_COMM_TALLIES(tx_multiple_retry_frames);</div><div class='del'>-	ADD_COMM_TALLIES(tx_retry_limit_exceeded);</div><div class='del'>-	ADD_COMM_TALLIES(tx_discards);</div><div class='del'>-	ADD_COMM_TALLIES(rx_unicast_frames);</div><div class='del'>-	ADD_COMM_TALLIES(rx_multicast_frames);</div><div class='del'>-	ADD_COMM_TALLIES(rx_fragments);</div><div class='del'>-	ADD_COMM_TALLIES(rx_unicast_octets);</div><div class='del'>-	ADD_COMM_TALLIES(rx_multicast_octets);</div><div class='del'>-	ADD_COMM_TALLIES(rx_fcs_errors);</div><div class='del'>-	ADD_COMM_TALLIES(rx_discards_no_buffer);</div><div class='del'>-	ADD_COMM_TALLIES(tx_discards_wrong_sa);</div><div class='del'>-	ADD_COMM_TALLIES(rx_discards_wep_undecryptable);</div><div class='del'>-	ADD_COMM_TALLIES(rx_message_in_msg_fragments);</div><div class='del'>-	ADD_COMM_TALLIES(rx_message_in_bad_msg_fragments);</div><div class='del'>-#undef ADD_COMM_TALLIES</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static void prism2_info_commtallies32(local_info_t *local, unsigned char *buf,</div><div class='del'>-				      int left)</div><div class='del'>-{</div><div class='del'>-	struct hfa384x_comm_tallies32 *tallies;</div><div class='del'>-</div><div class='del'>-	if (left &lt; sizeof(struct hfa384x_comm_tallies32)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: too short (len=%d) commtallies32 "</div><div class='del'>-		       "info frame\n", local-&gt;dev-&gt;name, left);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tallies = (struct hfa384x_comm_tallies32 *) buf;</div><div class='del'>-#define ADD_COMM_TALLIES(name) \</div><div class='del'>-local-&gt;comm_tallies.name += le32_to_cpu(tallies-&gt;name)</div><div class='del'>-	ADD_COMM_TALLIES(tx_unicast_frames);</div><div class='del'>-	ADD_COMM_TALLIES(tx_multicast_frames);</div><div class='del'>-	ADD_COMM_TALLIES(tx_fragments);</div><div class='del'>-	ADD_COMM_TALLIES(tx_unicast_octets);</div><div class='del'>-	ADD_COMM_TALLIES(tx_multicast_octets);</div><div class='del'>-	ADD_COMM_TALLIES(tx_deferred_transmissions);</div><div class='del'>-	ADD_COMM_TALLIES(tx_single_retry_frames);</div><div class='del'>-	ADD_COMM_TALLIES(tx_multiple_retry_frames);</div><div class='del'>-	ADD_COMM_TALLIES(tx_retry_limit_exceeded);</div><div class='del'>-	ADD_COMM_TALLIES(tx_discards);</div><div class='del'>-	ADD_COMM_TALLIES(rx_unicast_frames);</div><div class='del'>-	ADD_COMM_TALLIES(rx_multicast_frames);</div><div class='del'>-	ADD_COMM_TALLIES(rx_fragments);</div><div class='del'>-	ADD_COMM_TALLIES(rx_unicast_octets);</div><div class='del'>-	ADD_COMM_TALLIES(rx_multicast_octets);</div><div class='del'>-	ADD_COMM_TALLIES(rx_fcs_errors);</div><div class='del'>-	ADD_COMM_TALLIES(rx_discards_no_buffer);</div><div class='del'>-	ADD_COMM_TALLIES(tx_discards_wrong_sa);</div><div class='del'>-	ADD_COMM_TALLIES(rx_discards_wep_undecryptable);</div><div class='del'>-	ADD_COMM_TALLIES(rx_message_in_msg_fragments);</div><div class='del'>-	ADD_COMM_TALLIES(rx_message_in_bad_msg_fragments);</div><div class='del'>-#undef ADD_COMM_TALLIES</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static void prism2_info_commtallies(local_info_t *local, unsigned char *buf,</div><div class='del'>-				    int left)</div><div class='del'>-{</div><div class='del'>-	if (local-&gt;tallies32)</div><div class='del'>-		prism2_info_commtallies32(local, buf, left);</div><div class='del'>-	else</div><div class='del'>-		prism2_info_commtallies16(local, buf, left);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_STATION_MODES</div><div class='del'>-#ifndef PRISM2_NO_DEBUG</div><div class='del'>-static const char* hfa384x_linkstatus_str(u16 linkstatus)</div><div class='del'>-{</div><div class='del'>-	switch (linkstatus) {</div><div class='del'>-	case HFA384X_LINKSTATUS_CONNECTED:</div><div class='del'>-		return "Connected";</div><div class='del'>-	case HFA384X_LINKSTATUS_DISCONNECTED:</div><div class='del'>-		return "Disconnected";</div><div class='del'>-	case HFA384X_LINKSTATUS_AP_CHANGE:</div><div class='del'>-		return "Access point change";</div><div class='del'>-	case HFA384X_LINKSTATUS_AP_OUT_OF_RANGE:</div><div class='del'>-		return "Access point out of range";</div><div class='del'>-	case HFA384X_LINKSTATUS_AP_IN_RANGE:</div><div class='del'>-		return "Access point in range";</div><div class='del'>-	case HFA384X_LINKSTATUS_ASSOC_FAILED:</div><div class='del'>-		return "Association failed";</div><div class='del'>-	default:</div><div class='del'>-		return "Unknown";</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif /* PRISM2_NO_DEBUG */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static void prism2_info_linkstatus(local_info_t *local, unsigned char *buf,</div><div class='del'>-				    int left)</div><div class='del'>-{</div><div class='del'>-	u16 val;</div><div class='del'>-	int non_sta_mode;</div><div class='del'>-</div><div class='del'>-	/* Alloc new JoinRequests to occur since LinkStatus for the previous</div><div class='del'>-	 * has been received */</div><div class='del'>-	local-&gt;last_join_time = 0;</div><div class='del'>-</div><div class='del'>-	if (left != 2) {</div><div class='del'>-		printk(KERN_DEBUG "%s: invalid linkstatus info frame "</div><div class='del'>-		       "length %d\n", local-&gt;dev-&gt;name, left);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	non_sta_mode = local-&gt;iw_mode == IW_MODE_MASTER ||</div><div class='del'>-		local-&gt;iw_mode == IW_MODE_REPEAT ||</div><div class='del'>-		local-&gt;iw_mode == IW_MODE_MONITOR;</div><div class='del'>-</div><div class='del'>-	val = buf[0] | (buf[1] &lt;&lt; 8);</div><div class='del'>-	if (!non_sta_mode || val != HFA384X_LINKSTATUS_DISCONNECTED) {</div><div class='del'>-		PDEBUG(DEBUG_EXTRA, "%s: LinkStatus=%d (%s)\n",</div><div class='del'>-		       local-&gt;dev-&gt;name, val, hfa384x_linkstatus_str(val));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (non_sta_mode) {</div><div class='del'>-		netif_carrier_on(local-&gt;dev);</div><div class='del'>-		netif_carrier_on(local-&gt;ddev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get current BSSID later in scheduled task */</div><div class='del'>-	set_bit(PRISM2_INFO_PENDING_LINKSTATUS, &amp;local-&gt;pending_info);</div><div class='del'>-	local-&gt;prev_link_status = val;</div><div class='del'>-	schedule_work(&amp;local-&gt;info_queue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void prism2_host_roaming(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	struct hfa384x_join_request req;</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-	struct hfa384x_hostscan_result *selected, *entry;</div><div class='del'>-	int i;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;last_join_time &amp;&amp;</div><div class='del'>-	    time_before(jiffies, local-&gt;last_join_time + 10 * HZ)) {</div><div class='del'>-		PDEBUG(DEBUG_EXTRA, "%s: last join request has not yet been "</div><div class='del'>-		       "completed - waiting for it before issuing new one\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* ScanResults are sorted: first ESS results in decreasing signal</div><div class='del'>-	 * quality then IBSS results in similar order.</div><div class='del'>-	 * Trivial roaming policy: just select the first entry.</div><div class='del'>-	 * This could probably be improved by adding hysteresis to limit</div><div class='del'>-	 * number of handoffs, etc.</div><div class='del'>-	 *</div><div class='del'>-	 * Could do periodic RID_SCANREQUEST or Inquire F101 to get new</div><div class='del'>-	 * ScanResults */</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	if (local-&gt;last_scan_results == NULL ||</div><div class='del'>-	    local-&gt;last_scan_results_count == 0) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-		PDEBUG(DEBUG_EXTRA, "%s: no scan results for host roaming\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	selected = &amp;local-&gt;last_scan_results[0];</div><div class='del'>-</div><div class='del'>-	if (local-&gt;preferred_ap[0] || local-&gt;preferred_ap[1] ||</div><div class='del'>-	    local-&gt;preferred_ap[2] || local-&gt;preferred_ap[3] ||</div><div class='del'>-	    local-&gt;preferred_ap[4] || local-&gt;preferred_ap[5]) {</div><div class='del'>-		/* Try to find preferred AP */</div><div class='del'>-		PDEBUG(DEBUG_EXTRA, "%s: Preferred AP BSSID %pM\n",</div><div class='del'>-		       dev-&gt;name, local-&gt;preferred_ap);</div><div class='del'>-		for (i = 0; i &lt; local-&gt;last_scan_results_count; i++) {</div><div class='del'>-			entry = &amp;local-&gt;last_scan_results[i];</div><div class='del'>-			if (memcmp(local-&gt;preferred_ap, entry-&gt;bssid, 6) == 0)</div><div class='del'>-			{</div><div class='del'>-				PDEBUG(DEBUG_EXTRA, "%s: using preferred AP "</div><div class='del'>-				       "selection\n", dev-&gt;name);</div><div class='del'>-				selected = entry;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(req.bssid, selected-&gt;bssid, ETH_ALEN);</div><div class='del'>-	req.channel = selected-&gt;chid;</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_EXTRA, "%s: JoinRequest: BSSID=%pM"</div><div class='del'>-	       " channel=%d\n",</div><div class='del'>-	       dev-&gt;name, req.bssid, le16_to_cpu(req.channel));</div><div class='del'>-	if (local-&gt;func-&gt;set_rid(dev, HFA384X_RID_JOINREQUEST, &amp;req,</div><div class='del'>-				 sizeof(req))) {</div><div class='del'>-		printk(KERN_DEBUG "%s: JoinRequest failed\n", dev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-	local-&gt;last_join_time = jiffies;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void hostap_report_scan_complete(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	union iwreq_data wrqu;</div><div class='del'>-</div><div class='del'>-	/* Inform user space about new scan results (just empty event,</div><div class='del'>-	 * SIOCGIWSCAN can be used to fetch data */</div><div class='del'>-	wrqu.data.length = 0;</div><div class='del'>-	wrqu.data.flags = 0;</div><div class='del'>-	wireless_send_event(local-&gt;dev, SIOCGIWSCAN, &amp;wrqu, NULL);</div><div class='del'>-</div><div class='del'>-	/* Allow SIOCGIWSCAN handling to occur since we have received</div><div class='del'>-	 * scanning result */</div><div class='del'>-	local-&gt;scan_timestamp = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static void prism2_info_scanresults(local_info_t *local, unsigned char *buf,</div><div class='del'>-				    int left)</div><div class='del'>-{</div><div class='del'>-	u16 *pos;</div><div class='del'>-	int new_count, i;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct hfa384x_scan_result *res;</div><div class='del'>-	struct hfa384x_hostscan_result *results, *prev;</div><div class='del'>-</div><div class='del'>-	if (left &lt; 4) {</div><div class='del'>-		printk(KERN_DEBUG "%s: invalid scanresult info frame "</div><div class='del'>-		       "length %d\n", local-&gt;dev-&gt;name, left);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pos = (u16 *) buf;</div><div class='del'>-	pos++;</div><div class='del'>-	pos++;</div><div class='del'>-	left -= 4;</div><div class='del'>-</div><div class='del'>-	new_count = left / sizeof(struct hfa384x_scan_result);</div><div class='del'>-	results = kmalloc_array(new_count,</div><div class='del'>-				sizeof(struct hfa384x_hostscan_result),</div><div class='del'>-				GFP_ATOMIC);</div><div class='del'>-	if (results == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Convert to hostscan result format. */</div><div class='del'>-	res = (struct hfa384x_scan_result *) pos;</div><div class='del'>-	for (i = 0; i &lt; new_count; i++) {</div><div class='del'>-		memcpy(&amp;results[i], &amp;res[i],</div><div class='del'>-		       sizeof(struct hfa384x_scan_result));</div><div class='del'>-		results[i].atim = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	local-&gt;last_scan_type = PRISM2_SCAN;</div><div class='del'>-	prev = local-&gt;last_scan_results;</div><div class='del'>-	local-&gt;last_scan_results = results;</div><div class='del'>-	local-&gt;last_scan_results_count = new_count;</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-	kfree(prev);</div><div class='del'>-</div><div class='del'>-	hostap_report_scan_complete(local);</div><div class='del'>-</div><div class='del'>-	/* Perform rest of ScanResults handling later in scheduled task */</div><div class='del'>-	set_bit(PRISM2_INFO_PENDING_SCANRESULTS, &amp;local-&gt;pending_info);</div><div class='del'>-	schedule_work(&amp;local-&gt;info_queue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-static void prism2_info_hostscanresults(local_info_t *local,</div><div class='del'>-					unsigned char *buf, int left)</div><div class='del'>-{</div><div class='del'>-	int i, result_size, copy_len, new_count;</div><div class='del'>-	struct hfa384x_hostscan_result *results, *prev;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	__le16 *pos;</div><div class='del'>-	u8 *ptr;</div><div class='del'>-</div><div class='del'>-	wake_up_interruptible(&amp;local-&gt;hostscan_wq);</div><div class='del'>-</div><div class='del'>-	if (left &lt; 4) {</div><div class='del'>-		printk(KERN_DEBUG "%s: invalid hostscanresult info frame "</div><div class='del'>-		       "length %d\n", local-&gt;dev-&gt;name, left);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pos = (__le16 *) buf;</div><div class='del'>-	copy_len = result_size = le16_to_cpu(*pos);</div><div class='del'>-	if (result_size == 0) {</div><div class='del'>-		printk(KERN_DEBUG "%s: invalid result_size (0) in "</div><div class='del'>-		       "hostscanresults\n", local-&gt;dev-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (copy_len &gt; sizeof(struct hfa384x_hostscan_result))</div><div class='del'>-		copy_len = sizeof(struct hfa384x_hostscan_result);</div><div class='del'>-</div><div class='del'>-	pos++;</div><div class='del'>-	pos++;</div><div class='del'>-	left -= 4;</div><div class='del'>-	ptr = (u8 *) pos;</div><div class='del'>-</div><div class='del'>-	new_count = left / result_size;</div><div class='del'>-	results = kcalloc(new_count, sizeof(struct hfa384x_hostscan_result),</div><div class='del'>-			  GFP_ATOMIC);</div><div class='del'>-	if (results == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; new_count; i++) {</div><div class='del'>-		memcpy(&amp;results[i], ptr, copy_len);</div><div class='del'>-		ptr += result_size;</div><div class='del'>-		left -= result_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (left) {</div><div class='del'>-		printk(KERN_DEBUG "%s: short HostScan result entry (%d/%d)\n",</div><div class='del'>-		       local-&gt;dev-&gt;name, left, result_size);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	local-&gt;last_scan_type = PRISM2_HOSTSCAN;</div><div class='del'>-	prev = local-&gt;last_scan_results;</div><div class='del'>-	local-&gt;last_scan_results = results;</div><div class='del'>-	local-&gt;last_scan_results_count = new_count;</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-	kfree(prev);</div><div class='del'>-</div><div class='del'>-	hostap_report_scan_complete(local);</div><div class='del'>-}</div><div class='del'>-#endif /* PRISM2_NO_STATION_MODES */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as a tasklet (software IRQ) */</div><div class='del'>-void hostap_info_process(local_info_t *local, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct hfa384x_info_frame *info;</div><div class='del'>-	unsigned char *buf;</div><div class='del'>-	int left;</div><div class='del'>-#ifndef PRISM2_NO_DEBUG</div><div class='del'>-	int i;</div><div class='del'>-#endif /* PRISM2_NO_DEBUG */</div><div class='del'>-</div><div class='del'>-	info = (struct hfa384x_info_frame *) skb-&gt;data;</div><div class='del'>-	buf = skb-&gt;data + sizeof(*info);</div><div class='del'>-	left = skb-&gt;len - sizeof(*info);</div><div class='del'>-</div><div class='del'>-	switch (le16_to_cpu(info-&gt;type)) {</div><div class='del'>-	case HFA384X_INFO_COMMTALLIES:</div><div class='del'>-		prism2_info_commtallies(local, buf, left);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_STATION_MODES</div><div class='del'>-	case HFA384X_INFO_LINKSTATUS:</div><div class='del'>-		prism2_info_linkstatus(local, buf, left);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HFA384X_INFO_SCANRESULTS:</div><div class='del'>-		prism2_info_scanresults(local, buf, left);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HFA384X_INFO_HOSTSCANRESULTS:</div><div class='del'>-		prism2_info_hostscanresults(local, buf, left);</div><div class='del'>-		break;</div><div class='del'>-#endif /* PRISM2_NO_STATION_MODES */</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_DEBUG</div><div class='del'>-	default:</div><div class='del'>-		PDEBUG(DEBUG_EXTRA, "%s: INFO - len=%d type=0x%04x\n",</div><div class='del'>-		       local-&gt;dev-&gt;name, le16_to_cpu(info-&gt;len),</div><div class='del'>-		       le16_to_cpu(info-&gt;type));</div><div class='del'>-		PDEBUG(DEBUG_EXTRA, "Unknown info frame:");</div><div class='del'>-		for (i = 0; i &lt; (left &lt; 100 ? left : 100); i++)</div><div class='del'>-			PDEBUG2(DEBUG_EXTRA, " %02x", buf[i]);</div><div class='del'>-		PDEBUG2(DEBUG_EXTRA, "\n");</div><div class='del'>-		break;</div><div class='del'>-#endif /* PRISM2_NO_DEBUG */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_STATION_MODES</div><div class='del'>-static void handle_info_queue_linkstatus(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	int val = local-&gt;prev_link_status;</div><div class='del'>-	int connected;</div><div class='del'>-	union iwreq_data wrqu;</div><div class='del'>-</div><div class='del'>-	connected =</div><div class='del'>-		val == HFA384X_LINKSTATUS_CONNECTED ||</div><div class='del'>-		val == HFA384X_LINKSTATUS_AP_CHANGE ||</div><div class='del'>-		val == HFA384X_LINKSTATUS_AP_IN_RANGE;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;get_rid(local-&gt;dev, HFA384X_RID_CURRENTBSSID,</div><div class='del'>-				 local-&gt;bssid, ETH_ALEN, 1) &lt; 0) {</div><div class='del'>-		printk(KERN_DEBUG "%s: could not read CURRENTBSSID after "</div><div class='del'>-		       "LinkStatus event\n", local-&gt;dev-&gt;name);</div><div class='del'>-	} else {</div><div class='del'>-		PDEBUG(DEBUG_EXTRA, "%s: LinkStatus: BSSID=%pM\n",</div><div class='del'>-		       local-&gt;dev-&gt;name,</div><div class='del'>-		       (unsigned char *) local-&gt;bssid);</div><div class='del'>-		if (local-&gt;wds_type &amp; HOSTAP_WDS_AP_CLIENT)</div><div class='del'>-			hostap_add_sta(local-&gt;ap, local-&gt;bssid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get BSSID if we have a valid AP address */</div><div class='del'>-	if (connected) {</div><div class='del'>-		netif_carrier_on(local-&gt;dev);</div><div class='del'>-		netif_carrier_on(local-&gt;ddev);</div><div class='del'>-		memcpy(wrqu.ap_addr.sa_data, local-&gt;bssid, ETH_ALEN);</div><div class='del'>-	} else {</div><div class='del'>-		netif_carrier_off(local-&gt;dev);</div><div class='del'>-		netif_carrier_off(local-&gt;ddev);</div><div class='del'>-		eth_zero_addr(wrqu.ap_addr.sa_data);</div><div class='del'>-	}</div><div class='del'>-	wrqu.ap_addr.sa_family = ARPHRD_ETHER;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Filter out sequential disconnect events in order not to cause a</div><div class='del'>-	 * flood of SIOCGIWAP events that have a race condition with EAPOL</div><div class='del'>-	 * frames and can confuse wpa_supplicant about the current association</div><div class='del'>-	 * status.</div><div class='del'>-	 */</div><div class='del'>-	if (connected || local-&gt;prev_linkstatus_connected)</div><div class='del'>-		wireless_send_event(local-&gt;dev, SIOCGIWAP, &amp;wrqu, NULL);</div><div class='del'>-	local-&gt;prev_linkstatus_connected = connected;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void handle_info_queue_scanresults(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	if (local-&gt;host_roaming == 1 &amp;&amp; local-&gt;iw_mode == IW_MODE_INFRA)</div><div class='del'>-		prism2_host_roaming(local);</div><div class='del'>-</div><div class='del'>-	if (local-&gt;host_roaming == 2 &amp;&amp; local-&gt;iw_mode == IW_MODE_INFRA &amp;&amp;</div><div class='del'>-	    !is_zero_ether_addr(local-&gt;preferred_ap)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Firmware seems to be getting into odd state in host_roaming</div><div class='del'>-		 * mode 2 when hostscan is used without join command, so try</div><div class='del'>-		 * to fix this by re-joining the current AP. This does not</div><div class='del'>-		 * actually trigger a new association if the current AP is</div><div class='del'>-		 * still in the scan results.</div><div class='del'>-		 */</div><div class='del'>-		prism2_host_roaming(local);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called only as scheduled task after receiving info frames (used to avoid</div><div class='del'>- * pending too much time in HW IRQ handler). */</div><div class='del'>-static void handle_info_queue(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = container_of(work, local_info_t, info_queue);</div><div class='del'>-</div><div class='del'>-	if (test_and_clear_bit(PRISM2_INFO_PENDING_LINKSTATUS,</div><div class='del'>-			       &amp;local-&gt;pending_info))</div><div class='del'>-		handle_info_queue_linkstatus(local);</div><div class='del'>-</div><div class='del'>-	if (test_and_clear_bit(PRISM2_INFO_PENDING_SCANRESULTS,</div><div class='del'>-			       &amp;local-&gt;pending_info))</div><div class='del'>-		handle_info_queue_scanresults(local);</div><div class='del'>-}</div><div class='del'>-#endif /* PRISM2_NO_STATION_MODES */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void hostap_info_init(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	skb_queue_head_init(&amp;local-&gt;info_list);</div><div class='del'>-#ifndef PRISM2_NO_STATION_MODES</div><div class='del'>-	INIT_WORK(&amp;local-&gt;info_queue, handle_info_queue);</div><div class='del'>-#endif /* PRISM2_NO_STATION_MODES */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(hostap_info_init);</div><div class='del'>-EXPORT_SYMBOL(hostap_info_process);</div><div class='head'>diff --git a/drivers/net/wireless/intersil/hostap/hostap_ioctl.c b/drivers/net/wireless/intersil/hostap/hostap_ioctl.c<br/>deleted file mode 100644<br/>index 49766b285230..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/hostap/hostap_ioctl.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_ioctl.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4035 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* ioctl() (mostly Linux Wireless Extensions) routines for Host AP driver */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/sched/signal.h&gt;</div><div class='del'>-#include &lt;linux/ethtool.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;net/lib80211.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hostap_wlan.h"</div><div class='del'>-#include "hostap.h"</div><div class='del'>-#include "hostap_ap.h"</div><div class='del'>-</div><div class='del'>-static struct iw_statistics *hostap_get_wireless_stats(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	struct iw_statistics *wstats;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	/* Why are we doing that ? Jean II */</div><div class='del'>-	if (iface-&gt;type != HOSTAP_INTERFACE_MAIN)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	wstats = &amp;local-&gt;wstats;</div><div class='del'>-</div><div class='del'>-	wstats-&gt;status = 0;</div><div class='del'>-	wstats-&gt;discard.code =</div><div class='del'>-		local-&gt;comm_tallies.rx_discards_wep_undecryptable;</div><div class='del'>-	wstats-&gt;discard.misc =</div><div class='del'>-		local-&gt;comm_tallies.rx_fcs_errors +</div><div class='del'>-		local-&gt;comm_tallies.rx_discards_no_buffer +</div><div class='del'>-		local-&gt;comm_tallies.tx_discards_wrong_sa;</div><div class='del'>-</div><div class='del'>-	wstats-&gt;discard.retries =</div><div class='del'>-		local-&gt;comm_tallies.tx_retry_limit_exceeded;</div><div class='del'>-	wstats-&gt;discard.fragment =</div><div class='del'>-		local-&gt;comm_tallies.rx_message_in_bad_msg_fragments;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;iw_mode != IW_MODE_MASTER &amp;&amp;</div><div class='del'>-	    local-&gt;iw_mode != IW_MODE_REPEAT) {</div><div class='del'>-</div><div class='del'>-		if (prism2_update_comms_qual(dev) == 0)</div><div class='del'>-			wstats-&gt;qual.updated = IW_QUAL_ALL_UPDATED |</div><div class='del'>-				IW_QUAL_DBM;</div><div class='del'>-</div><div class='del'>-		wstats-&gt;qual.qual = local-&gt;comms_qual;</div><div class='del'>-		wstats-&gt;qual.level = local-&gt;avg_signal;</div><div class='del'>-		wstats-&gt;qual.noise = local-&gt;avg_noise;</div><div class='del'>-	} else {</div><div class='del'>-		wstats-&gt;qual.qual = 0;</div><div class='del'>-		wstats-&gt;qual.level = 0;</div><div class='del'>-		wstats-&gt;qual.noise = 0;</div><div class='del'>-		wstats-&gt;qual.updated = IW_QUAL_ALL_INVALID;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return wstats;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_get_datarates(struct net_device *dev, u8 *rates)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	u8 buf[12];</div><div class='del'>-	int len;</div><div class='del'>-	u16 val;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	len = local-&gt;func-&gt;get_rid(dev, HFA384X_RID_SUPPORTEDDATARATES, buf,</div><div class='del'>-				   sizeof(buf), 0);</div><div class='del'>-	if (len &lt; 2)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	val = le16_to_cpu(*(__le16 *) buf); /* string length */</div><div class='del'>-</div><div class='del'>-	if (len - 2 &lt; val || val &gt; 10)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	memcpy(rates, buf + 2, val);</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_get_name(struct net_device *dev,</div><div class='del'>-			   struct iw_request_info *info,</div><div class='del'>-			   char *name, char *extra)</div><div class='del'>-{</div><div class='del'>-	u8 rates[10];</div><div class='del'>-	int len, i, over2 = 0;</div><div class='del'>-</div><div class='del'>-	len = prism2_get_datarates(dev, rates);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		if (rates[i] == 0x0b || rates[i] == 0x16) {</div><div class='del'>-			over2 = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	strcpy(name, over2 ? "IEEE 802.11b" : "IEEE 802.11-DS");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_siwencode(struct net_device *dev,</div><div class='del'>-				  struct iw_request_info *info,</div><div class='del'>-				  struct iw_point *erq, char *keybuf)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int i;</div><div class='del'>-	struct lib80211_crypt_data **crypt;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	i = erq-&gt;flags &amp; IW_ENCODE_INDEX;</div><div class='del'>-	if (i &lt; 1 || i &gt; 4)</div><div class='del'>-		i = local-&gt;crypt_info.tx_keyidx;</div><div class='del'>-	else</div><div class='del'>-		i--;</div><div class='del'>-	if (i &lt; 0 || i &gt;= WEP_KEYS)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	crypt = &amp;local-&gt;crypt_info.crypt[i];</div><div class='del'>-</div><div class='del'>-	if (erq-&gt;flags &amp; IW_ENCODE_DISABLED) {</div><div class='del'>-		if (*crypt)</div><div class='del'>-			lib80211_crypt_delayed_deinit(&amp;local-&gt;crypt_info, crypt);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (*crypt != NULL &amp;&amp; (*crypt)-&gt;ops != NULL &amp;&amp;</div><div class='del'>-	    strcmp((*crypt)-&gt;ops-&gt;name, "WEP") != 0) {</div><div class='del'>-		/* changing to use WEP; deinit previously used algorithm */</div><div class='del'>-		lib80211_crypt_delayed_deinit(&amp;local-&gt;crypt_info, crypt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (*crypt == NULL) {</div><div class='del'>-		struct lib80211_crypt_data *new_crypt;</div><div class='del'>-</div><div class='del'>-		/* take WEP into use */</div><div class='del'>-		new_crypt = kzalloc(sizeof(struct lib80211_crypt_data),</div><div class='del'>-				GFP_KERNEL);</div><div class='del'>-		if (new_crypt == NULL)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		new_crypt-&gt;ops = lib80211_get_crypto_ops("WEP");</div><div class='del'>-		if (!new_crypt-&gt;ops) {</div><div class='del'>-			request_module("lib80211_crypt_wep");</div><div class='del'>-			new_crypt-&gt;ops = lib80211_get_crypto_ops("WEP");</div><div class='del'>-		}</div><div class='del'>-		if (new_crypt-&gt;ops &amp;&amp; try_module_get(new_crypt-&gt;ops-&gt;owner))</div><div class='del'>-			new_crypt-&gt;priv = new_crypt-&gt;ops-&gt;init(i);</div><div class='del'>-		if (!new_crypt-&gt;ops || !new_crypt-&gt;priv) {</div><div class='del'>-			kfree(new_crypt);</div><div class='del'>-			new_crypt = NULL;</div><div class='del'>-</div><div class='del'>-			printk(KERN_WARNING "%s: could not initialize WEP: "</div><div class='del'>-			       "load module hostap_crypt_wep.o\n",</div><div class='del'>-			       dev-&gt;name);</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-		}</div><div class='del'>-		*crypt = new_crypt;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (erq-&gt;length &gt; 0) {</div><div class='del'>-		int len = erq-&gt;length &lt;= 5 ? 5 : 13;</div><div class='del'>-		int first = 1, j;</div><div class='del'>-		if (len &gt; erq-&gt;length)</div><div class='del'>-			memset(keybuf + erq-&gt;length, 0, len - erq-&gt;length);</div><div class='del'>-		(*crypt)-&gt;ops-&gt;set_key(keybuf, len, NULL, (*crypt)-&gt;priv);</div><div class='del'>-		for (j = 0; j &lt; WEP_KEYS; j++) {</div><div class='del'>-			if (j != i &amp;&amp; local-&gt;crypt_info.crypt[j]) {</div><div class='del'>-				first = 0;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (first)</div><div class='del'>-			local-&gt;crypt_info.tx_keyidx = i;</div><div class='del'>-	} else {</div><div class='del'>-		/* No key data - just set the default TX key index */</div><div class='del'>-		local-&gt;crypt_info.tx_keyidx = i;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- done:</div><div class='del'>-	local-&gt;open_wep = erq-&gt;flags &amp; IW_ENCODE_OPEN;</div><div class='del'>-</div><div class='del'>-	if (hostap_set_encryption(local)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: set_encryption failed\n", dev-&gt;name);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Do not reset port0 if card is in Managed mode since resetting will</div><div class='del'>-	 * generate new IEEE 802.11 authentication which may end up in looping</div><div class='del'>-	 * with IEEE 802.1X. Prism2 documentation seem to require port reset</div><div class='del'>-	 * after WEP configuration. However, keys are apparently changed at</div><div class='del'>-	 * least in Managed mode. */</div><div class='del'>-	if (local-&gt;iw_mode != IW_MODE_INFRA &amp;&amp; local-&gt;func-&gt;reset_port(dev)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: reset_port failed\n", dev-&gt;name);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_giwencode(struct net_device *dev,</div><div class='del'>-				  struct iw_request_info *info,</div><div class='del'>-				  struct iw_point *erq, char *key)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int i, len;</div><div class='del'>-	u16 val;</div><div class='del'>-	struct lib80211_crypt_data *crypt;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	i = erq-&gt;flags &amp; IW_ENCODE_INDEX;</div><div class='del'>-	if (i &lt; 1 || i &gt; 4)</div><div class='del'>-		i = local-&gt;crypt_info.tx_keyidx;</div><div class='del'>-	else</div><div class='del'>-		i--;</div><div class='del'>-	if (i &lt; 0 || i &gt;= WEP_KEYS)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	crypt = local-&gt;crypt_info.crypt[i];</div><div class='del'>-	erq-&gt;flags = i + 1;</div><div class='del'>-</div><div class='del'>-	if (crypt == NULL || crypt-&gt;ops == NULL) {</div><div class='del'>-		erq-&gt;length = 0;</div><div class='del'>-		erq-&gt;flags |= IW_ENCODE_DISABLED;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (strcmp(crypt-&gt;ops-&gt;name, "WEP") != 0) {</div><div class='del'>-		/* only WEP is supported with wireless extensions, so just</div><div class='del'>-		 * report that encryption is used */</div><div class='del'>-		erq-&gt;length = 0;</div><div class='del'>-		erq-&gt;flags |= IW_ENCODE_ENABLED;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Reads from HFA384X_RID_CNFDEFAULTKEY* return bogus values, so show</div><div class='del'>-	 * the keys from driver buffer */</div><div class='del'>-	len = crypt-&gt;ops-&gt;get_key(key, WEP_KEY_LEN, NULL, crypt-&gt;priv);</div><div class='del'>-	erq-&gt;length = (len &gt;= 0 ? len : 0);</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;get_rid(dev, HFA384X_RID_CNFWEPFLAGS, &amp;val, 2, 1) &lt; 0)</div><div class='del'>-	{</div><div class='del'>-		printk("CNFWEPFLAGS reading failed\n");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-	le16_to_cpus(&amp;val);</div><div class='del'>-	if (val &amp; HFA384X_WEPFLAGS_PRIVACYINVOKED)</div><div class='del'>-		erq-&gt;flags |= IW_ENCODE_ENABLED;</div><div class='del'>-	else</div><div class='del'>-		erq-&gt;flags |= IW_ENCODE_DISABLED;</div><div class='del'>-	if (val &amp; HFA384X_WEPFLAGS_EXCLUDEUNENCRYPTED)</div><div class='del'>-		erq-&gt;flags |= IW_ENCODE_RESTRICTED;</div><div class='del'>-	else</div><div class='del'>-		erq-&gt;flags |= IW_ENCODE_OPEN;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int hostap_set_rate(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int ret, basic_rates;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	basic_rates = local-&gt;basic_rates &amp; local-&gt;tx_rate_control;</div><div class='del'>-	if (!basic_rates || basic_rates != local-&gt;basic_rates) {</div><div class='del'>-		printk(KERN_INFO "%s: updating basic rate set automatically "</div><div class='del'>-		       "to match with the new supported rate set\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		if (!basic_rates)</div><div class='del'>-			basic_rates = local-&gt;tx_rate_control;</div><div class='del'>-</div><div class='del'>-		local-&gt;basic_rates = basic_rates;</div><div class='del'>-		if (hostap_set_word(dev, HFA384X_RID_CNFBASICRATES,</div><div class='del'>-				    basic_rates))</div><div class='del'>-			printk(KERN_WARNING "%s: failed to set "</div><div class='del'>-			       "cnfBasicRates\n", dev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = (hostap_set_word(dev, HFA384X_RID_TXRATECONTROL,</div><div class='del'>-			       local-&gt;tx_rate_control) ||</div><div class='del'>-	       hostap_set_word(dev, HFA384X_RID_CNFSUPPORTEDRATES,</div><div class='del'>-			       local-&gt;tx_rate_control) ||</div><div class='del'>-	       local-&gt;func-&gt;reset_port(dev));</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		printk(KERN_WARNING "%s: TXRateControl/cnfSupportedRates "</div><div class='del'>-		       "setting to 0x%x failed\n",</div><div class='del'>-		       dev-&gt;name, local-&gt;tx_rate_control);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Update TX rate configuration for all STAs based on new operational</div><div class='del'>-	 * rate set. */</div><div class='del'>-	hostap_update_rates(local);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_siwrate(struct net_device *dev,</div><div class='del'>-				struct iw_request_info *info,</div><div class='del'>-				struct iw_param *rrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (rrq-&gt;fixed) {</div><div class='del'>-		switch (rrq-&gt;value) {</div><div class='del'>-		case 11000000:</div><div class='del'>-			local-&gt;tx_rate_control = HFA384X_RATES_11MBPS;</div><div class='del'>-			break;</div><div class='del'>-		case 5500000:</div><div class='del'>-			local-&gt;tx_rate_control = HFA384X_RATES_5MBPS;</div><div class='del'>-			break;</div><div class='del'>-		case 2000000:</div><div class='del'>-			local-&gt;tx_rate_control = HFA384X_RATES_2MBPS;</div><div class='del'>-			break;</div><div class='del'>-		case 1000000:</div><div class='del'>-			local-&gt;tx_rate_control = HFA384X_RATES_1MBPS;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			local-&gt;tx_rate_control = HFA384X_RATES_1MBPS |</div><div class='del'>-				HFA384X_RATES_2MBPS | HFA384X_RATES_5MBPS |</div><div class='del'>-				HFA384X_RATES_11MBPS;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		switch (rrq-&gt;value) {</div><div class='del'>-		case 11000000:</div><div class='del'>-			local-&gt;tx_rate_control = HFA384X_RATES_1MBPS |</div><div class='del'>-				HFA384X_RATES_2MBPS | HFA384X_RATES_5MBPS |</div><div class='del'>-				HFA384X_RATES_11MBPS;</div><div class='del'>-			break;</div><div class='del'>-		case 5500000:</div><div class='del'>-			local-&gt;tx_rate_control = HFA384X_RATES_1MBPS |</div><div class='del'>-				HFA384X_RATES_2MBPS | HFA384X_RATES_5MBPS;</div><div class='del'>-			break;</div><div class='del'>-		case 2000000:</div><div class='del'>-			local-&gt;tx_rate_control = HFA384X_RATES_1MBPS |</div><div class='del'>-				HFA384X_RATES_2MBPS;</div><div class='del'>-			break;</div><div class='del'>-		case 1000000:</div><div class='del'>-			local-&gt;tx_rate_control = HFA384X_RATES_1MBPS;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			local-&gt;tx_rate_control = HFA384X_RATES_1MBPS |</div><div class='del'>-				HFA384X_RATES_2MBPS | HFA384X_RATES_5MBPS |</div><div class='del'>-				HFA384X_RATES_11MBPS;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return hostap_set_rate(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_giwrate(struct net_device *dev,</div><div class='del'>-				struct iw_request_info *info,</div><div class='del'>-				struct iw_param *rrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	u16 val;</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;get_rid(dev, HFA384X_RID_TXRATECONTROL, &amp;val, 2, 1) &lt;</div><div class='del'>-	    0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if ((val &amp; 0x1) &amp;&amp; (val &gt; 1))</div><div class='del'>-		rrq-&gt;fixed = 0;</div><div class='del'>-	else</div><div class='del'>-		rrq-&gt;fixed = 1;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;iw_mode == IW_MODE_MASTER &amp;&amp; local-&gt;ap != NULL &amp;&amp;</div><div class='del'>-	    !local-&gt;fw_tx_rate_control) {</div><div class='del'>-		/* HFA384X_RID_CURRENTTXRATE seems to always be 2 Mbps in</div><div class='del'>-		 * Host AP mode, so use the recorded TX rate of the last sent</div><div class='del'>-		 * frame */</div><div class='del'>-		rrq-&gt;value = local-&gt;ap-&gt;last_tx_rate &gt; 0 ?</div><div class='del'>-			local-&gt;ap-&gt;last_tx_rate * 100000 : 11000000;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;get_rid(dev, HFA384X_RID_CURRENTTXRATE, &amp;val, 2, 1) &lt;</div><div class='del'>-	    0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	switch (val) {</div><div class='del'>-	case HFA384X_RATES_1MBPS:</div><div class='del'>-		rrq-&gt;value = 1000000;</div><div class='del'>-		break;</div><div class='del'>-	case HFA384X_RATES_2MBPS:</div><div class='del'>-		rrq-&gt;value = 2000000;</div><div class='del'>-		break;</div><div class='del'>-	case HFA384X_RATES_5MBPS:</div><div class='del'>-		rrq-&gt;value = 5500000;</div><div class='del'>-		break;</div><div class='del'>-	case HFA384X_RATES_11MBPS:</div><div class='del'>-		rrq-&gt;value = 11000000;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/* should not happen */</div><div class='del'>-		rrq-&gt;value = 11000000;</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_siwsens(struct net_device *dev,</div><div class='del'>-				struct iw_request_info *info,</div><div class='del'>-				struct iw_param *sens, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	/* Set the desired AP density */</div><div class='del'>-	if (sens-&gt;value &lt; 1 || sens-&gt;value &gt; 3)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (hostap_set_word(dev, HFA384X_RID_CNFSYSTEMSCALE, sens-&gt;value) ||</div><div class='del'>-	    local-&gt;func-&gt;reset_port(dev))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_giwsens(struct net_device *dev,</div><div class='del'>-				struct iw_request_info *info,</div><div class='del'>-				struct iw_param *sens, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	__le16 val;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	/* Get the current AP density */</div><div class='del'>-	if (local-&gt;func-&gt;get_rid(dev, HFA384X_RID_CNFSYSTEMSCALE, &amp;val, 2, 1) &lt;</div><div class='del'>-	    0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	sens-&gt;value = le16_to_cpu(val);</div><div class='del'>-	sens-&gt;fixed = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Deprecated in new wireless extension API */</div><div class='del'>-static int prism2_ioctl_giwaplist(struct net_device *dev,</div><div class='del'>-				  struct iw_request_info *info,</div><div class='del'>-				  struct iw_point *data, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	struct sockaddr *addr;</div><div class='del'>-	struct iw_quality *qual;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;iw_mode != IW_MODE_MASTER) {</div><div class='del'>-		printk(KERN_DEBUG "SIOCGIWAPLIST is currently only supported "</div><div class='del'>-		       "in Host AP mode\n");</div><div class='del'>-		data-&gt;length = 0;</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	addr = kmalloc_array(IW_MAX_AP, sizeof(struct sockaddr), GFP_KERNEL);</div><div class='del'>-	qual = kmalloc_array(IW_MAX_AP, sizeof(struct iw_quality), GFP_KERNEL);</div><div class='del'>-	if (addr == NULL || qual == NULL) {</div><div class='del'>-		kfree(addr);</div><div class='del'>-		kfree(qual);</div><div class='del'>-		data-&gt;length = 0;</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	data-&gt;length = prism2_ap_get_sta_qual(local, addr, qual, IW_MAX_AP, 1);</div><div class='del'>-</div><div class='del'>-	memcpy(extra, addr, sizeof(struct sockaddr) * data-&gt;length);</div><div class='del'>-	data-&gt;flags = 1; /* has quality information */</div><div class='del'>-	memcpy(extra + sizeof(struct sockaddr) * data-&gt;length, qual,</div><div class='del'>-	       sizeof(struct iw_quality) * data-&gt;length);</div><div class='del'>-</div><div class='del'>-	kfree(addr);</div><div class='del'>-	kfree(qual);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_siwrts(struct net_device *dev,</div><div class='del'>-			       struct iw_request_info *info,</div><div class='del'>-			       struct iw_param *rts, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	__le16 val;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (rts-&gt;disabled)</div><div class='del'>-		val = cpu_to_le16(2347);</div><div class='del'>-	else if (rts-&gt;value &lt; 0 || rts-&gt;value &gt; 2347)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	else</div><div class='del'>-		val = cpu_to_le16(rts-&gt;value);</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;set_rid(dev, HFA384X_RID_RTSTHRESHOLD, &amp;val, 2) ||</div><div class='del'>-	    local-&gt;func-&gt;reset_port(dev))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	local-&gt;rts_threshold = rts-&gt;value;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_giwrts(struct net_device *dev,</div><div class='del'>-			       struct iw_request_info *info,</div><div class='del'>-			       struct iw_param *rts, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	__le16 val;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;get_rid(dev, HFA384X_RID_RTSTHRESHOLD, &amp;val, 2, 1) &lt;</div><div class='del'>-	    0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	rts-&gt;value = le16_to_cpu(val);</div><div class='del'>-	rts-&gt;disabled = (rts-&gt;value == 2347);</div><div class='del'>-	rts-&gt;fixed = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_siwfrag(struct net_device *dev,</div><div class='del'>-				struct iw_request_info *info,</div><div class='del'>-				struct iw_param *rts, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	__le16 val;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (rts-&gt;disabled)</div><div class='del'>-		val = cpu_to_le16(2346);</div><div class='del'>-	else if (rts-&gt;value &lt; 256 || rts-&gt;value &gt; 2346)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	else</div><div class='del'>-		val = cpu_to_le16(rts-&gt;value &amp; ~0x1); /* even numbers only */</div><div class='del'>-</div><div class='del'>-	local-&gt;fragm_threshold = rts-&gt;value &amp; ~0x1;</div><div class='del'>-	if (local-&gt;func-&gt;set_rid(dev, HFA384X_RID_FRAGMENTATIONTHRESHOLD, &amp;val,</div><div class='del'>-				 2)</div><div class='del'>-	    || local-&gt;func-&gt;reset_port(dev))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_giwfrag(struct net_device *dev,</div><div class='del'>-				struct iw_request_info *info,</div><div class='del'>-				struct iw_param *rts, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	__le16 val;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;get_rid(dev, HFA384X_RID_FRAGMENTATIONTHRESHOLD,</div><div class='del'>-				 &amp;val, 2, 1) &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	rts-&gt;value = le16_to_cpu(val);</div><div class='del'>-	rts-&gt;disabled = (rts-&gt;value == 2346);</div><div class='del'>-	rts-&gt;fixed = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_STATION_MODES</div><div class='del'>-static int hostap_join_ap(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	struct hfa384x_join_request req;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int i;</div><div class='del'>-	struct hfa384x_hostscan_result *entry;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	memcpy(req.bssid, local-&gt;preferred_ap, ETH_ALEN);</div><div class='del'>-	req.channel = 0;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	for (i = 0; i &lt; local-&gt;last_scan_results_count; i++) {</div><div class='del'>-		if (!local-&gt;last_scan_results)</div><div class='del'>-			break;</div><div class='del'>-		entry = &amp;local-&gt;last_scan_results[i];</div><div class='del'>-		if (ether_addr_equal(local-&gt;preferred_ap, entry-&gt;bssid)) {</div><div class='del'>-			req.channel = entry-&gt;chid;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;set_rid(dev, HFA384X_RID_JOINREQUEST, &amp;req,</div><div class='del'>-				 sizeof(req))) {</div><div class='del'>-		printk(KERN_DEBUG "%s: JoinRequest %pM failed\n",</div><div class='del'>-		       dev-&gt;name, local-&gt;preferred_ap);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: Trying to join BSSID %pM\n",</div><div class='del'>-	       dev-&gt;name, local-&gt;preferred_ap);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif /* PRISM2_NO_STATION_MODES */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_siwap(struct net_device *dev,</div><div class='del'>-			      struct iw_request_info *info,</div><div class='del'>-			      struct sockaddr *ap_addr, char *extra)</div><div class='del'>-{</div><div class='del'>-#ifdef PRISM2_NO_STATION_MODES</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-#else /* PRISM2_NO_STATION_MODES */</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	memcpy(local-&gt;preferred_ap, &amp;ap_addr-&gt;sa_data, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	if (local-&gt;host_roaming == 1 &amp;&amp; local-&gt;iw_mode == IW_MODE_INFRA) {</div><div class='del'>-		struct hfa384x_scan_request scan_req;</div><div class='del'>-		memset(&amp;scan_req, 0, sizeof(scan_req));</div><div class='del'>-		scan_req.channel_list = cpu_to_le16(0x3fff);</div><div class='del'>-		scan_req.txrate = cpu_to_le16(HFA384X_RATES_1MBPS);</div><div class='del'>-		if (local-&gt;func-&gt;set_rid(dev, HFA384X_RID_SCANREQUEST,</div><div class='del'>-					 &amp;scan_req, sizeof(scan_req))) {</div><div class='del'>-			printk(KERN_DEBUG "%s: ScanResults request failed - "</div><div class='del'>-			       "preferred AP delayed to next unsolicited "</div><div class='del'>-			       "scan\n", dev-&gt;name);</div><div class='del'>-		}</div><div class='del'>-	} else if (local-&gt;host_roaming == 2 &amp;&amp;</div><div class='del'>-		   local-&gt;iw_mode == IW_MODE_INFRA) {</div><div class='del'>-		if (hostap_join_ap(dev))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_DEBUG "%s: Preferred AP (SIOCSIWAP) is used only "</div><div class='del'>-		       "in Managed mode when host_roaming is enabled\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-#endif /* PRISM2_NO_STATION_MODES */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_giwap(struct net_device *dev,</div><div class='del'>-			      struct iw_request_info *info,</div><div class='del'>-			      struct sockaddr *ap_addr, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	ap_addr-&gt;sa_family = ARPHRD_ETHER;</div><div class='del'>-	switch (iface-&gt;type) {</div><div class='del'>-	case HOSTAP_INTERFACE_AP:</div><div class='del'>-		memcpy(&amp;ap_addr-&gt;sa_data, dev-&gt;dev_addr, ETH_ALEN);</div><div class='del'>-		break;</div><div class='del'>-	case HOSTAP_INTERFACE_STA:</div><div class='del'>-		memcpy(&amp;ap_addr-&gt;sa_data, local-&gt;assoc_ap_addr, ETH_ALEN);</div><div class='del'>-		break;</div><div class='del'>-	case HOSTAP_INTERFACE_WDS:</div><div class='del'>-		memcpy(&amp;ap_addr-&gt;sa_data, iface-&gt;u.wds.remote_addr, ETH_ALEN);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		if (local-&gt;func-&gt;get_rid(dev, HFA384X_RID_CURRENTBSSID,</div><div class='del'>-					 &amp;ap_addr-&gt;sa_data, ETH_ALEN, 1) &lt; 0)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-		/* local-&gt;bssid is also updated in LinkStatus handler when in</div><div class='del'>-		 * station mode */</div><div class='del'>-		memcpy(local-&gt;bssid, &amp;ap_addr-&gt;sa_data, ETH_ALEN);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_siwnickn(struct net_device *dev,</div><div class='del'>-				 struct iw_request_info *info,</div><div class='del'>-				 struct iw_point *data, char *nickname)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	memset(local-&gt;name, 0, sizeof(local-&gt;name));</div><div class='del'>-	memcpy(local-&gt;name, nickname, data-&gt;length);</div><div class='del'>-	local-&gt;name_set = 1;</div><div class='del'>-</div><div class='del'>-	if (hostap_set_string(dev, HFA384X_RID_CNFOWNNAME, local-&gt;name) ||</div><div class='del'>-	    local-&gt;func-&gt;reset_port(dev))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_giwnickn(struct net_device *dev,</div><div class='del'>-				 struct iw_request_info *info,</div><div class='del'>-				 struct iw_point *data, char *nickname)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int len;</div><div class='del'>-	char name[MAX_NAME_LEN + 3];</div><div class='del'>-	u16 val;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	len = local-&gt;func-&gt;get_rid(dev, HFA384X_RID_CNFOWNNAME,</div><div class='del'>-				   &amp;name, MAX_NAME_LEN + 2, 0);</div><div class='del'>-	val = le16_to_cpu(*(__le16 *) name);</div><div class='del'>-	if (len &gt; MAX_NAME_LEN + 2 || len &lt; 0 || val &gt; MAX_NAME_LEN)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	name[val + 2] = '\0';</div><div class='del'>-	data-&gt;length = val + 1;</div><div class='del'>-	memcpy(nickname, name + 2, val + 1);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_siwfreq(struct net_device *dev,</div><div class='del'>-				struct iw_request_info *info,</div><div class='del'>-				struct iw_freq *freq, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	/* freq =&gt; chan. */</div><div class='del'>-	if (freq-&gt;e == 1 &amp;&amp;</div><div class='del'>-	    freq-&gt;m / 100000 &gt;= freq_list[0] &amp;&amp;</div><div class='del'>-	    freq-&gt;m / 100000 &lt;= freq_list[FREQ_COUNT - 1]) {</div><div class='del'>-		int ch;</div><div class='del'>-		int fr = freq-&gt;m / 100000;</div><div class='del'>-		for (ch = 0; ch &lt; FREQ_COUNT; ch++) {</div><div class='del'>-			if (fr == freq_list[ch]) {</div><div class='del'>-				freq-&gt;e = 0;</div><div class='del'>-				freq-&gt;m = ch + 1;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (freq-&gt;e != 0 || freq-&gt;m &lt; 1 || freq-&gt;m &gt; FREQ_COUNT ||</div><div class='del'>-	    !(local-&gt;channel_mask &amp; (1 &lt;&lt; (freq-&gt;m - 1))))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	local-&gt;channel = freq-&gt;m; /* channel is used in prism2_setup_rids() */</div><div class='del'>-	if (hostap_set_word(dev, HFA384X_RID_CNFOWNCHANNEL, local-&gt;channel) ||</div><div class='del'>-	    local-&gt;func-&gt;reset_port(dev))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_giwfreq(struct net_device *dev,</div><div class='del'>-				struct iw_request_info *info,</div><div class='del'>-				struct iw_freq *freq, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	u16 val;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;get_rid(dev, HFA384X_RID_CURRENTCHANNEL, &amp;val, 2, 1) &lt;</div><div class='del'>-	    0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	le16_to_cpus(&amp;val);</div><div class='del'>-	if (val &lt; 1 || val &gt; FREQ_COUNT)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	freq-&gt;m = freq_list[val - 1] * 100000;</div><div class='del'>-	freq-&gt;e = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void hostap_monitor_set_type(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;ddev;</div><div class='del'>-</div><div class='del'>-	if (dev == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;monitor_type == PRISM2_MONITOR_PRISM ||</div><div class='del'>-	    local-&gt;monitor_type == PRISM2_MONITOR_CAPHDR) {</div><div class='del'>-		dev-&gt;type = ARPHRD_IEEE80211_PRISM;</div><div class='del'>-	} else if (local-&gt;monitor_type == PRISM2_MONITOR_RADIOTAP) {</div><div class='del'>-		dev-&gt;type = ARPHRD_IEEE80211_RADIOTAP;</div><div class='del'>-	} else {</div><div class='del'>-		dev-&gt;type = ARPHRD_IEEE80211;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_siwessid(struct net_device *dev,</div><div class='del'>-				 struct iw_request_info *info,</div><div class='del'>-				 struct iw_point *data, char *ssid)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (iface-&gt;type == HOSTAP_INTERFACE_WDS)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (data-&gt;flags == 0)</div><div class='del'>-		ssid[0] = '\0'; /* ANY */</div><div class='del'>-</div><div class='del'>-	if (local-&gt;iw_mode == IW_MODE_MASTER &amp;&amp; ssid[0] == '\0') {</div><div class='del'>-		/* Setting SSID to empty string seems to kill the card in</div><div class='del'>-		 * Host AP mode */</div><div class='del'>-		printk(KERN_DEBUG "%s: Host AP mode does not support "</div><div class='del'>-		       "'Any' essid\n", dev-&gt;name);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(local-&gt;essid, ssid, data-&gt;length);</div><div class='del'>-	local-&gt;essid[data-&gt;length] = '\0';</div><div class='del'>-</div><div class='del'>-	if ((!local-&gt;fw_ap &amp;&amp;</div><div class='del'>-	     hostap_set_string(dev, HFA384X_RID_CNFDESIREDSSID, local-&gt;essid))</div><div class='del'>-	    || hostap_set_string(dev, HFA384X_RID_CNFOWNSSID, local-&gt;essid) ||</div><div class='del'>-	    local-&gt;func-&gt;reset_port(dev))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_giwessid(struct net_device *dev,</div><div class='del'>-				 struct iw_request_info *info,</div><div class='del'>-				 struct iw_point *data, char *essid)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	u16 val;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (iface-&gt;type == HOSTAP_INTERFACE_WDS)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	data-&gt;flags = 1; /* active */</div><div class='del'>-	if (local-&gt;iw_mode == IW_MODE_MASTER) {</div><div class='del'>-		data-&gt;length = strlen(local-&gt;essid);</div><div class='del'>-		memcpy(essid, local-&gt;essid, IW_ESSID_MAX_SIZE);</div><div class='del'>-	} else {</div><div class='del'>-		int len;</div><div class='del'>-		char ssid[MAX_SSID_LEN + 2];</div><div class='del'>-		memset(ssid, 0, sizeof(ssid));</div><div class='del'>-		len = local-&gt;func-&gt;get_rid(dev, HFA384X_RID_CURRENTSSID,</div><div class='del'>-					   &amp;ssid, MAX_SSID_LEN + 2, 0);</div><div class='del'>-		val = le16_to_cpu(*(__le16 *) ssid);</div><div class='del'>-		if (len &gt; MAX_SSID_LEN + 2 || len &lt; 0 || val &gt; MAX_SSID_LEN) {</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-		}</div><div class='del'>-		data-&gt;length = val;</div><div class='del'>-		memcpy(essid, ssid + 2, IW_ESSID_MAX_SIZE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_giwrange(struct net_device *dev,</div><div class='del'>-				 struct iw_request_info *info,</div><div class='del'>-				 struct iw_point *data, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	struct iw_range *range = (struct iw_range *) extra;</div><div class='del'>-	u8 rates[10];</div><div class='del'>-	u16 val;</div><div class='del'>-	int i, len, over2;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	data-&gt;length = sizeof(struct iw_range);</div><div class='del'>-	memset(range, 0, sizeof(struct iw_range));</div><div class='del'>-</div><div class='del'>-	/* TODO: could fill num_txpower and txpower array with</div><div class='del'>-	 * something; however, there are 128 different values.. */</div><div class='del'>-</div><div class='del'>-	range-&gt;txpower_capa = IW_TXPOW_DBM;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;iw_mode == IW_MODE_INFRA || local-&gt;iw_mode == IW_MODE_ADHOC)</div><div class='del'>-	{</div><div class='del'>-		range-&gt;min_pmp = 1 * 1024;</div><div class='del'>-		range-&gt;max_pmp = 65535 * 1024;</div><div class='del'>-		range-&gt;min_pmt = 1 * 1024;</div><div class='del'>-		range-&gt;max_pmt = 1000 * 1024;</div><div class='del'>-		range-&gt;pmp_flags = IW_POWER_PERIOD;</div><div class='del'>-		range-&gt;pmt_flags = IW_POWER_TIMEOUT;</div><div class='del'>-		range-&gt;pm_capa = IW_POWER_PERIOD | IW_POWER_TIMEOUT |</div><div class='del'>-			IW_POWER_UNICAST_R | IW_POWER_ALL_R;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	range-&gt;we_version_compiled = WIRELESS_EXT;</div><div class='del'>-	range-&gt;we_version_source = 18;</div><div class='del'>-</div><div class='del'>-	range-&gt;retry_capa = IW_RETRY_LIMIT;</div><div class='del'>-	range-&gt;retry_flags = IW_RETRY_LIMIT;</div><div class='del'>-	range-&gt;min_retry = 0;</div><div class='del'>-	range-&gt;max_retry = 255;</div><div class='del'>-</div><div class='del'>-	range-&gt;num_channels = FREQ_COUNT;</div><div class='del'>-</div><div class='del'>-	val = 0;</div><div class='del'>-	for (i = 0; i &lt; FREQ_COUNT; i++) {</div><div class='del'>-		if (local-&gt;channel_mask &amp; (1 &lt;&lt; i)) {</div><div class='del'>-			range-&gt;freq[val].i = i + 1;</div><div class='del'>-			range-&gt;freq[val].m = freq_list[i] * 100000;</div><div class='del'>-			range-&gt;freq[val].e = 1;</div><div class='del'>-			val++;</div><div class='del'>-		}</div><div class='del'>-		if (val == IW_MAX_FREQUENCIES)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	range-&gt;num_frequency = val;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;sta_fw_ver &gt;= PRISM2_FW_VER(1,3,1)) {</div><div class='del'>-		range-&gt;max_qual.qual = 70; /* what is correct max? This was not</div><div class='del'>-					    * documented exactly. At least</div><div class='del'>-					    * 69 has been observed. */</div><div class='del'>-		range-&gt;max_qual.level = 0; /* dB */</div><div class='del'>-		range-&gt;max_qual.noise = 0; /* dB */</div><div class='del'>-</div><div class='del'>-		/* What would be suitable values for "average/typical" qual? */</div><div class='del'>-		range-&gt;avg_qual.qual = 20;</div><div class='del'>-		range-&gt;avg_qual.level = -60;</div><div class='del'>-		range-&gt;avg_qual.noise = -95;</div><div class='del'>-	} else {</div><div class='del'>-		range-&gt;max_qual.qual = 92; /* 0 .. 92 */</div><div class='del'>-		range-&gt;max_qual.level = 154; /* 27 .. 154 */</div><div class='del'>-		range-&gt;max_qual.noise = 154; /* 27 .. 154 */</div><div class='del'>-	}</div><div class='del'>-	range-&gt;sensitivity = 3;</div><div class='del'>-</div><div class='del'>-	range-&gt;max_encoding_tokens = WEP_KEYS;</div><div class='del'>-	range-&gt;num_encoding_sizes = 2;</div><div class='del'>-	range-&gt;encoding_size[0] = 5;</div><div class='del'>-	range-&gt;encoding_size[1] = 13;</div><div class='del'>-</div><div class='del'>-	over2 = 0;</div><div class='del'>-	len = prism2_get_datarates(dev, rates);</div><div class='del'>-	range-&gt;num_bitrates = 0;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		if (range-&gt;num_bitrates &lt; IW_MAX_BITRATES) {</div><div class='del'>-			range-&gt;bitrate[range-&gt;num_bitrates] =</div><div class='del'>-				rates[i] * 500000;</div><div class='del'>-			range-&gt;num_bitrates++;</div><div class='del'>-		}</div><div class='del'>-		if (rates[i] == 0x0b || rates[i] == 0x16)</div><div class='del'>-			over2 = 1;</div><div class='del'>-	}</div><div class='del'>-	/* estimated maximum TCP throughput values (bps) */</div><div class='del'>-	range-&gt;throughput = over2 ? 5500000 : 1500000;</div><div class='del'>-</div><div class='del'>-	range-&gt;min_rts = 0;</div><div class='del'>-	range-&gt;max_rts = 2347;</div><div class='del'>-	range-&gt;min_frag = 256;</div><div class='del'>-	range-&gt;max_frag = 2346;</div><div class='del'>-</div><div class='del'>-	/* Event capability (kernel + driver) */</div><div class='del'>-	range-&gt;event_capa[0] = (IW_EVENT_CAPA_K_0 |</div><div class='del'>-				IW_EVENT_CAPA_MASK(SIOCGIWTHRSPY) |</div><div class='del'>-				IW_EVENT_CAPA_MASK(SIOCGIWAP) |</div><div class='del'>-				IW_EVENT_CAPA_MASK(SIOCGIWSCAN));</div><div class='del'>-	range-&gt;event_capa[1] = IW_EVENT_CAPA_K_1;</div><div class='del'>-	range-&gt;event_capa[4] = (IW_EVENT_CAPA_MASK(IWEVTXDROP) |</div><div class='del'>-				IW_EVENT_CAPA_MASK(IWEVCUSTOM) |</div><div class='del'>-				IW_EVENT_CAPA_MASK(IWEVREGISTERED) |</div><div class='del'>-				IW_EVENT_CAPA_MASK(IWEVEXPIRED));</div><div class='del'>-</div><div class='del'>-	range-&gt;enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 |</div><div class='del'>-		IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;sta_fw_ver &gt;= PRISM2_FW_VER(1,3,1))</div><div class='del'>-		range-&gt;scan_capa = IW_SCAN_CAPA_ESSID;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int hostap_monitor_mode_enable(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "Enabling monitor mode\n");</div><div class='del'>-	hostap_monitor_set_type(local);</div><div class='del'>-</div><div class='del'>-	if (hostap_set_word(dev, HFA384X_RID_CNFPORTTYPE,</div><div class='del'>-			    HFA384X_PORTTYPE_PSEUDO_IBSS)) {</div><div class='del'>-		printk(KERN_DEBUG "Port type setting for monitor mode "</div><div class='del'>-		       "failed\n");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Host decrypt is needed to get the IV and ICV fields;</div><div class='del'>-	 * however, monitor mode seems to remove WEP flag from frame</div><div class='del'>-	 * control field */</div><div class='del'>-	if (hostap_set_word(dev, HFA384X_RID_CNFWEPFLAGS,</div><div class='del'>-			    HFA384X_WEPFLAGS_HOSTENCRYPT |</div><div class='del'>-			    HFA384X_WEPFLAGS_HOSTDECRYPT)) {</div><div class='del'>-		printk(KERN_DEBUG "WEP flags setting failed\n");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;reset_port(dev) ||</div><div class='del'>-	    local-&gt;func-&gt;cmd(dev, HFA384X_CMDCODE_TEST |</div><div class='del'>-			     (HFA384X_TEST_MONITOR &lt;&lt; 8),</div><div class='del'>-			     0, NULL, NULL)) {</div><div class='del'>-		printk(KERN_DEBUG "Setting monitor mode failed\n");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int hostap_monitor_mode_disable(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;ddev;</div><div class='del'>-</div><div class='del'>-	if (dev == NULL)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: Disabling monitor mode\n", dev-&gt;name);</div><div class='del'>-	dev-&gt;type = ARPHRD_ETHER;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;cmd(dev, HFA384X_CMDCODE_TEST |</div><div class='del'>-			     (HFA384X_TEST_STOP &lt;&lt; 8),</div><div class='del'>-			     0, NULL, NULL))</div><div class='del'>-		return -1;</div><div class='del'>-	return hostap_set_encryption(local);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_siwmode(struct net_device *dev,</div><div class='del'>-				struct iw_request_info *info,</div><div class='del'>-				__u32 *mode, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int double_reset = 0;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (*mode != IW_MODE_ADHOC &amp;&amp; *mode != IW_MODE_INFRA &amp;&amp;</div><div class='del'>-	    *mode != IW_MODE_MASTER &amp;&amp; *mode != IW_MODE_REPEAT &amp;&amp;</div><div class='del'>-	    *mode != IW_MODE_MONITOR)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_NO_STATION_MODES</div><div class='del'>-	if (*mode == IW_MODE_ADHOC || *mode == IW_MODE_INFRA)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-#endif /* PRISM2_NO_STATION_MODES */</div><div class='del'>-</div><div class='del'>-	if (*mode == local-&gt;iw_mode)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (*mode == IW_MODE_MASTER &amp;&amp; local-&gt;essid[0] == '\0') {</div><div class='del'>-		printk(KERN_WARNING "%s: empty SSID not allowed in Master "</div><div class='del'>-		       "mode\n", dev-&gt;name);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;iw_mode == IW_MODE_MONITOR)</div><div class='del'>-		hostap_monitor_mode_disable(local);</div><div class='del'>-</div><div class='del'>-	if ((local-&gt;iw_mode == IW_MODE_ADHOC ||</div><div class='del'>-	     local-&gt;iw_mode == IW_MODE_MONITOR) &amp;&amp; *mode == IW_MODE_MASTER) {</div><div class='del'>-		/* There seems to be a firmware bug in at least STA f/w v1.5.6</div><div class='del'>-		 * that leaves beacon frames to use IBSS type when moving from</div><div class='del'>-		 * IBSS to Host AP mode. Doing double Port0 reset seems to be</div><div class='del'>-		 * enough to workaround this. */</div><div class='del'>-		double_reset = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "prism2: %s: operating mode changed "</div><div class='del'>-	       "%d -&gt; %d\n", dev-&gt;name, local-&gt;iw_mode, *mode);</div><div class='del'>-	local-&gt;iw_mode = *mode;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;iw_mode == IW_MODE_MONITOR)</div><div class='del'>-		hostap_monitor_mode_enable(local);</div><div class='del'>-	else if (local-&gt;iw_mode == IW_MODE_MASTER &amp;&amp; !local-&gt;host_encrypt &amp;&amp;</div><div class='del'>-		 !local-&gt;fw_encrypt_ok) {</div><div class='del'>-		printk(KERN_DEBUG "%s: defaulting to host-based encryption as "</div><div class='del'>-		       "a workaround for firmware bug in Host AP mode WEP\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		local-&gt;host_encrypt = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hostap_set_word(dev, HFA384X_RID_CNFPORTTYPE,</div><div class='del'>-			    hostap_get_porttype(local)))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;reset_port(dev))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (double_reset &amp;&amp; local-&gt;func-&gt;reset_port(dev))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;iw_mode != IW_MODE_INFRA &amp;&amp; local-&gt;iw_mode != IW_MODE_ADHOC)</div><div class='del'>-	{</div><div class='del'>-		/* netif_carrier is used only in client modes for now, so make</div><div class='del'>-		 * sure carrier is on when moving to non-client modes. */</div><div class='del'>-		netif_carrier_on(local-&gt;dev);</div><div class='del'>-		netif_carrier_on(local-&gt;ddev);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_giwmode(struct net_device *dev,</div><div class='del'>-				struct iw_request_info *info,</div><div class='del'>-				__u32 *mode, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	switch (iface-&gt;type) {</div><div class='del'>-	case HOSTAP_INTERFACE_STA:</div><div class='del'>-		*mode = IW_MODE_INFRA;</div><div class='del'>-		break;</div><div class='del'>-	case HOSTAP_INTERFACE_WDS:</div><div class='del'>-		*mode = IW_MODE_REPEAT;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		*mode = local-&gt;iw_mode;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_siwpower(struct net_device *dev,</div><div class='del'>-				 struct iw_request_info *info,</div><div class='del'>-				 struct iw_param *wrq, char *extra)</div><div class='del'>-{</div><div class='del'>-#ifdef PRISM2_NO_STATION_MODES</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-#else /* PRISM2_NO_STATION_MODES */</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (wrq-&gt;disabled)</div><div class='del'>-		return hostap_set_word(dev, HFA384X_RID_CNFPMENABLED, 0);</div><div class='del'>-</div><div class='del'>-	switch (wrq-&gt;flags &amp; IW_POWER_MODE) {</div><div class='del'>-	case IW_POWER_UNICAST_R:</div><div class='del'>-		ret = hostap_set_word(dev, HFA384X_RID_CNFMULTICASTRECEIVE, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-		ret = hostap_set_word(dev, HFA384X_RID_CNFPMENABLED, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-		break;</div><div class='del'>-	case IW_POWER_ALL_R:</div><div class='del'>-		ret = hostap_set_word(dev, HFA384X_RID_CNFMULTICASTRECEIVE, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-		ret = hostap_set_word(dev, HFA384X_RID_CNFPMENABLED, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-		break;</div><div class='del'>-	case IW_POWER_ON:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (wrq-&gt;flags &amp; IW_POWER_TIMEOUT) {</div><div class='del'>-		ret = hostap_set_word(dev, HFA384X_RID_CNFPMENABLED, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-		ret = hostap_set_word(dev, HFA384X_RID_CNFPMHOLDOVERDURATION,</div><div class='del'>-				      wrq-&gt;value / 1024);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-	if (wrq-&gt;flags &amp; IW_POWER_PERIOD) {</div><div class='del'>-		ret = hostap_set_word(dev, HFA384X_RID_CNFPMENABLED, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-		ret = hostap_set_word(dev, HFA384X_RID_CNFMAXSLEEPDURATION,</div><div class='del'>-				      wrq-&gt;value / 1024);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-#endif /* PRISM2_NO_STATION_MODES */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_giwpower(struct net_device *dev,</div><div class='del'>-				 struct iw_request_info *info,</div><div class='del'>-				 struct iw_param *rrq, char *extra)</div><div class='del'>-{</div><div class='del'>-#ifdef PRISM2_NO_STATION_MODES</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-#else /* PRISM2_NO_STATION_MODES */</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	__le16 enable, mcast;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;get_rid(dev, HFA384X_RID_CNFPMENABLED, &amp;enable, 2, 1)</div><div class='del'>-	    &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!le16_to_cpu(enable)) {</div><div class='del'>-		rrq-&gt;disabled = 1;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rrq-&gt;disabled = 0;</div><div class='del'>-</div><div class='del'>-	if ((rrq-&gt;flags &amp; IW_POWER_TYPE) == IW_POWER_TIMEOUT) {</div><div class='del'>-		__le16 timeout;</div><div class='del'>-		if (local-&gt;func-&gt;get_rid(dev,</div><div class='del'>-					 HFA384X_RID_CNFPMHOLDOVERDURATION,</div><div class='del'>-					 &amp;timeout, 2, 1) &lt; 0)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		rrq-&gt;flags = IW_POWER_TIMEOUT;</div><div class='del'>-		rrq-&gt;value = le16_to_cpu(timeout) * 1024;</div><div class='del'>-	} else {</div><div class='del'>-		__le16 period;</div><div class='del'>-		if (local-&gt;func-&gt;get_rid(dev, HFA384X_RID_CNFMAXSLEEPDURATION,</div><div class='del'>-					 &amp;period, 2, 1) &lt; 0)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		rrq-&gt;flags = IW_POWER_PERIOD;</div><div class='del'>-		rrq-&gt;value = le16_to_cpu(period) * 1024;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;get_rid(dev, HFA384X_RID_CNFMULTICASTRECEIVE, &amp;mcast,</div><div class='del'>-				 2, 1) &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(mcast))</div><div class='del'>-		rrq-&gt;flags |= IW_POWER_ALL_R;</div><div class='del'>-	else</div><div class='del'>-		rrq-&gt;flags |= IW_POWER_UNICAST_R;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-#endif /* PRISM2_NO_STATION_MODES */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_siwretry(struct net_device *dev,</div><div class='del'>-				 struct iw_request_info *info,</div><div class='del'>-				 struct iw_param *rrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (rrq-&gt;disabled)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* setting retry limits is not supported with the current station</div><div class='del'>-	 * firmware code; simulate this with alternative retry count for now */</div><div class='del'>-	if (rrq-&gt;flags == IW_RETRY_LIMIT) {</div><div class='del'>-		if (rrq-&gt;value &lt; 0) {</div><div class='del'>-			/* disable manual retry count setting and use firmware</div><div class='del'>-			 * defaults */</div><div class='del'>-			local-&gt;manual_retry_count = -1;</div><div class='del'>-			local-&gt;tx_control &amp;= ~HFA384X_TX_CTRL_ALT_RTRY;</div><div class='del'>-		} else {</div><div class='del'>-			if (hostap_set_word(dev, HFA384X_RID_CNFALTRETRYCOUNT,</div><div class='del'>-					    rrq-&gt;value)) {</div><div class='del'>-				printk(KERN_DEBUG "%s: Alternate retry count "</div><div class='del'>-				       "setting to %d failed\n",</div><div class='del'>-				       dev-&gt;name, rrq-&gt;value);</div><div class='del'>-				return -EOPNOTSUPP;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			local-&gt;manual_retry_count = rrq-&gt;value;</div><div class='del'>-			local-&gt;tx_control |= HFA384X_TX_CTRL_ALT_RTRY;</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* what could be done, if firmware would support this.. */</div><div class='del'>-</div><div class='del'>-	if (rrq-&gt;flags &amp; IW_RETRY_LIMIT) {</div><div class='del'>-		if (rrq-&gt;flags &amp; IW_RETRY_LONG)</div><div class='del'>-			HFA384X_RID_LONGRETRYLIMIT = rrq-&gt;value;</div><div class='del'>-		else if (rrq-&gt;flags &amp; IW_RETRY_SHORT)</div><div class='del'>-			HFA384X_RID_SHORTRETRYLIMIT = rrq-&gt;value;</div><div class='del'>-		else {</div><div class='del'>-			HFA384X_RID_LONGRETRYLIMIT = rrq-&gt;value;</div><div class='del'>-			HFA384X_RID_SHORTRETRYLIMIT = rrq-&gt;value;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rrq-&gt;flags &amp; IW_RETRY_LIFETIME) {</div><div class='del'>-		HFA384X_RID_MAXTRANSMITLIFETIME = rrq-&gt;value / 1024;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-#endif /* 0 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_giwretry(struct net_device *dev,</div><div class='del'>-				 struct iw_request_info *info,</div><div class='del'>-				 struct iw_param *rrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	__le16 shortretry, longretry, lifetime, altretry;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;get_rid(dev, HFA384X_RID_SHORTRETRYLIMIT, &amp;shortretry,</div><div class='del'>-				 2, 1) &lt; 0 ||</div><div class='del'>-	    local-&gt;func-&gt;get_rid(dev, HFA384X_RID_LONGRETRYLIMIT, &amp;longretry,</div><div class='del'>-				 2, 1) &lt; 0 ||</div><div class='del'>-	    local-&gt;func-&gt;get_rid(dev, HFA384X_RID_MAXTRANSMITLIFETIME,</div><div class='del'>-				 &amp;lifetime, 2, 1) &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	rrq-&gt;disabled = 0;</div><div class='del'>-</div><div class='del'>-	if ((rrq-&gt;flags &amp; IW_RETRY_TYPE) == IW_RETRY_LIFETIME) {</div><div class='del'>-		rrq-&gt;flags = IW_RETRY_LIFETIME;</div><div class='del'>-		rrq-&gt;value = le16_to_cpu(lifetime) * 1024;</div><div class='del'>-	} else {</div><div class='del'>-		if (local-&gt;manual_retry_count &gt;= 0) {</div><div class='del'>-			rrq-&gt;flags = IW_RETRY_LIMIT;</div><div class='del'>-			if (local-&gt;func-&gt;get_rid(dev,</div><div class='del'>-						 HFA384X_RID_CNFALTRETRYCOUNT,</div><div class='del'>-						 &amp;altretry, 2, 1) &gt;= 0)</div><div class='del'>-				rrq-&gt;value = le16_to_cpu(altretry);</div><div class='del'>-			else</div><div class='del'>-				rrq-&gt;value = local-&gt;manual_retry_count;</div><div class='del'>-		} else if ((rrq-&gt;flags &amp; IW_RETRY_LONG)) {</div><div class='del'>-			rrq-&gt;flags = IW_RETRY_LIMIT | IW_RETRY_LONG;</div><div class='del'>-			rrq-&gt;value = le16_to_cpu(longretry);</div><div class='del'>-		} else {</div><div class='del'>-			rrq-&gt;flags = IW_RETRY_LIMIT;</div><div class='del'>-			rrq-&gt;value = le16_to_cpu(shortretry);</div><div class='del'>-			if (shortretry != longretry)</div><div class='del'>-				rrq-&gt;flags |= IW_RETRY_SHORT;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Note! This TX power controlling is experimental and should not be used in</div><div class='del'>- * production use. It just sets raw power register and does not use any kind of</div><div class='del'>- * feedback information from the measured TX power (CR58). This is now</div><div class='del'>- * commented out to make sure that it is not used by accident. TX power</div><div class='del'>- * configuration will be enabled again after proper algorithm using feedback</div><div class='del'>- * has been implemented. */</div><div class='del'>-</div><div class='del'>-#ifdef RAW_TXPOWER_SETTING</div><div class='del'>-/* Map HFA386x's CR31 to and from dBm with some sort of ad hoc mapping..</div><div class='del'>- * This version assumes following mapping:</div><div class='del'>- * CR31 is 7-bit value with -64 to +63 range.</div><div class='del'>- * -64 is mapped into +20dBm and +63 into -43dBm.</div><div class='del'>- * This is certainly not an exact mapping for every card, but at least</div><div class='del'>- * increasing dBm value should correspond to increasing TX power.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int prism2_txpower_hfa386x_to_dBm(u16 val)</div><div class='del'>-{</div><div class='del'>-	signed char tmp;</div><div class='del'>-</div><div class='del'>-	if (val &gt; 255)</div><div class='del'>-		val = 255;</div><div class='del'>-</div><div class='del'>-	tmp = val;</div><div class='del'>-	tmp &gt;&gt;= 2;</div><div class='del'>-</div><div class='del'>-	return -12 - tmp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u16 prism2_txpower_dBm_to_hfa386x(int val)</div><div class='del'>-{</div><div class='del'>-	signed char tmp;</div><div class='del'>-</div><div class='del'>-	if (val &gt; 20)</div><div class='del'>-		return 128;</div><div class='del'>-	else if (val &lt; -43)</div><div class='del'>-		return 127;</div><div class='del'>-</div><div class='del'>-	tmp = val;</div><div class='del'>-	tmp = -12 - tmp;</div><div class='del'>-	tmp &lt;&lt;= 2;</div><div class='del'>-</div><div class='del'>-	return (unsigned char) tmp;</div><div class='del'>-}</div><div class='del'>-#endif /* RAW_TXPOWER_SETTING */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_siwtxpow(struct net_device *dev,</div><div class='del'>-				 struct iw_request_info *info,</div><div class='del'>-				 struct iw_param *rrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-#ifdef RAW_TXPOWER_SETTING</div><div class='del'>-	char *tmp;</div><div class='del'>-#endif</div><div class='del'>-	u16 val;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (rrq-&gt;disabled) {</div><div class='del'>-		if (local-&gt;txpower_type != PRISM2_TXPOWER_OFF) {</div><div class='del'>-			val = 0xff; /* use all standby and sleep modes */</div><div class='del'>-			ret = local-&gt;func-&gt;cmd(dev, HFA384X_CMDCODE_WRITEMIF,</div><div class='del'>-					       HFA386X_CR_A_D_TEST_MODES2,</div><div class='del'>-					       &amp;val, NULL);</div><div class='del'>-			printk(KERN_DEBUG "%s: Turning radio off: %s\n",</div><div class='del'>-			       dev-&gt;name, ret ? "failed" : "OK");</div><div class='del'>-			local-&gt;txpower_type = PRISM2_TXPOWER_OFF;</div><div class='del'>-		}</div><div class='del'>-		return (ret ? -EOPNOTSUPP : 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;txpower_type == PRISM2_TXPOWER_OFF) {</div><div class='del'>-		val = 0; /* disable all standby and sleep modes */</div><div class='del'>-		ret = local-&gt;func-&gt;cmd(dev, HFA384X_CMDCODE_WRITEMIF,</div><div class='del'>-				       HFA386X_CR_A_D_TEST_MODES2, &amp;val, NULL);</div><div class='del'>-		printk(KERN_DEBUG "%s: Turning radio on: %s\n",</div><div class='del'>-		       dev-&gt;name, ret ? "failed" : "OK");</div><div class='del'>-		local-&gt;txpower_type = PRISM2_TXPOWER_UNKNOWN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef RAW_TXPOWER_SETTING</div><div class='del'>-	if (!rrq-&gt;fixed &amp;&amp; local-&gt;txpower_type != PRISM2_TXPOWER_AUTO) {</div><div class='del'>-		printk(KERN_DEBUG "Setting ALC on\n");</div><div class='del'>-		val = HFA384X_TEST_CFG_BIT_ALC;</div><div class='del'>-		local-&gt;func-&gt;cmd(dev, HFA384X_CMDCODE_TEST |</div><div class='del'>-				 (HFA384X_TEST_CFG_BITS &lt;&lt; 8), 1, &amp;val, NULL);</div><div class='del'>-		local-&gt;txpower_type = PRISM2_TXPOWER_AUTO;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;txpower_type != PRISM2_TXPOWER_FIXED) {</div><div class='del'>-		printk(KERN_DEBUG "Setting ALC off\n");</div><div class='del'>-		val = HFA384X_TEST_CFG_BIT_ALC;</div><div class='del'>-		local-&gt;func-&gt;cmd(dev, HFA384X_CMDCODE_TEST |</div><div class='del'>-				 (HFA384X_TEST_CFG_BITS &lt;&lt; 8), 0, &amp;val, NULL);</div><div class='del'>-			local-&gt;txpower_type = PRISM2_TXPOWER_FIXED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rrq-&gt;flags == IW_TXPOW_DBM)</div><div class='del'>-		tmp = "dBm";</div><div class='del'>-	else if (rrq-&gt;flags == IW_TXPOW_MWATT)</div><div class='del'>-		tmp = "mW";</div><div class='del'>-	else</div><div class='del'>-		tmp = "UNKNOWN";</div><div class='del'>-	printk(KERN_DEBUG "Setting TX power to %d %s\n", rrq-&gt;value, tmp);</div><div class='del'>-</div><div class='del'>-	if (rrq-&gt;flags != IW_TXPOW_DBM) {</div><div class='del'>-		printk("SIOCSIWTXPOW with mW is not supported; use dBm\n");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	local-&gt;txpower = rrq-&gt;value;</div><div class='del'>-	val = prism2_txpower_dBm_to_hfa386x(local-&gt;txpower);</div><div class='del'>-	if (local-&gt;func-&gt;cmd(dev, HFA384X_CMDCODE_WRITEMIF,</div><div class='del'>-			     HFA386X_CR_MANUAL_TX_POWER, &amp;val, NULL))</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-#else /* RAW_TXPOWER_SETTING */</div><div class='del'>-	if (rrq-&gt;fixed)</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-#endif /* RAW_TXPOWER_SETTING */</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_giwtxpow(struct net_device *dev,</div><div class='del'>-				 struct iw_request_info *info,</div><div class='del'>-				 struct iw_param *rrq, char *extra)</div><div class='del'>-{</div><div class='del'>-#ifdef RAW_TXPOWER_SETTING</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	u16 resp0;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	rrq-&gt;flags = IW_TXPOW_DBM;</div><div class='del'>-	rrq-&gt;disabled = 0;</div><div class='del'>-	rrq-&gt;fixed = 0;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;txpower_type == PRISM2_TXPOWER_AUTO) {</div><div class='del'>-		if (local-&gt;func-&gt;cmd(dev, HFA384X_CMDCODE_READMIF,</div><div class='del'>-				     HFA386X_CR_MANUAL_TX_POWER,</div><div class='del'>-				     NULL, &amp;resp0) == 0) {</div><div class='del'>-			rrq-&gt;value = prism2_txpower_hfa386x_to_dBm(resp0);</div><div class='del'>-		} else {</div><div class='del'>-			/* Could not get real txpower; guess 15 dBm */</div><div class='del'>-			rrq-&gt;value = 15;</div><div class='del'>-		}</div><div class='del'>-	} else if (local-&gt;txpower_type == PRISM2_TXPOWER_OFF) {</div><div class='del'>-		rrq-&gt;value = 0;</div><div class='del'>-		rrq-&gt;disabled = 1;</div><div class='del'>-	} else if (local-&gt;txpower_type == PRISM2_TXPOWER_FIXED) {</div><div class='del'>-		rrq-&gt;value = local-&gt;txpower;</div><div class='del'>-		rrq-&gt;fixed = 1;</div><div class='del'>-	} else {</div><div class='del'>-		printk("SIOCGIWTXPOW - unknown txpower_type=%d\n",</div><div class='del'>-		       local-&gt;txpower_type);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-#else /* RAW_TXPOWER_SETTING */</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-#endif /* RAW_TXPOWER_SETTING */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_STATION_MODES</div><div class='del'>-</div><div class='del'>-/* HostScan request works with and without host_roaming mode. In addition, it</div><div class='del'>- * does not break current association. However, it requires newer station</div><div class='del'>- * firmware version (&gt;= 1.3.1) than scan request. */</div><div class='del'>-static int prism2_request_hostscan(struct net_device *dev,</div><div class='del'>-				   u8 *ssid, u8 ssid_len)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	struct hfa384x_hostscan_request scan_req;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	memset(&amp;scan_req, 0, sizeof(scan_req));</div><div class='del'>-	scan_req.channel_list = cpu_to_le16(local-&gt;channel_mask &amp;</div><div class='del'>-					    local-&gt;scan_channel_mask);</div><div class='del'>-	scan_req.txrate = cpu_to_le16(HFA384X_RATES_1MBPS);</div><div class='del'>-	if (ssid) {</div><div class='del'>-		if (ssid_len &gt; 32)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		scan_req.target_ssid_len = cpu_to_le16(ssid_len);</div><div class='del'>-		memcpy(scan_req.target_ssid, ssid, ssid_len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;set_rid(dev, HFA384X_RID_HOSTSCAN, &amp;scan_req,</div><div class='del'>-				 sizeof(scan_req))) {</div><div class='del'>-		printk(KERN_DEBUG "%s: HOSTSCAN failed\n", dev-&gt;name);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_request_scan(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	struct hfa384x_scan_request scan_req;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	memset(&amp;scan_req, 0, sizeof(scan_req));</div><div class='del'>-	scan_req.channel_list = cpu_to_le16(local-&gt;channel_mask &amp;</div><div class='del'>-					    local-&gt;scan_channel_mask);</div><div class='del'>-	scan_req.txrate = cpu_to_le16(HFA384X_RATES_1MBPS);</div><div class='del'>-</div><div class='del'>-	/* FIX:</div><div class='del'>-	 * It seems to be enough to set roaming mode for a short moment to</div><div class='del'>-	 * host-based and then setup scanrequest data and return the mode to</div><div class='del'>-	 * firmware-based.</div><div class='del'>-	 *</div><div class='del'>-	 * Master mode would need to drop to Managed mode for a short while</div><div class='del'>-	 * to make scanning work.. Or sweep through the different channels and</div><div class='del'>-	 * use passive scan based on beacons. */</div><div class='del'>-</div><div class='del'>-	if (!local-&gt;host_roaming)</div><div class='del'>-		hostap_set_word(dev, HFA384X_RID_CNFROAMINGMODE,</div><div class='del'>-				HFA384X_ROAMING_HOST);</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;set_rid(dev, HFA384X_RID_SCANREQUEST, &amp;scan_req,</div><div class='del'>-				 sizeof(scan_req))) {</div><div class='del'>-		printk(KERN_DEBUG "SCANREQUEST failed\n");</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!local-&gt;host_roaming)</div><div class='del'>-		hostap_set_word(dev, HFA384X_RID_CNFROAMINGMODE,</div><div class='del'>-				HFA384X_ROAMING_FIRMWARE);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else /* !PRISM2_NO_STATION_MODES */</div><div class='del'>-</div><div class='del'>-static inline int prism2_request_hostscan(struct net_device *dev,</div><div class='del'>-					  u8 *ssid, u8 ssid_len)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline int prism2_request_scan(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* !PRISM2_NO_STATION_MODES */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_siwscan(struct net_device *dev,</div><div class='del'>-				struct iw_request_info *info,</div><div class='del'>-				struct iw_point *data, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int ret;</div><div class='del'>-	u8 *ssid = NULL, ssid_len = 0;</div><div class='del'>-	struct iw_scan_req *req = (struct iw_scan_req *) extra;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (data-&gt;length &lt; sizeof(struct iw_scan_req))</div><div class='del'>-		req = NULL;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;iw_mode == IW_MODE_MASTER) {</div><div class='del'>-		/* In master mode, we just return the results of our local</div><div class='del'>-		 * tables, so we don't need to start anything...</div><div class='del'>-		 * Jean II */</div><div class='del'>-		data-&gt;length = 0;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!local-&gt;dev_enabled)</div><div class='del'>-		return -ENETDOWN;</div><div class='del'>-</div><div class='del'>-	if (req &amp;&amp; data-&gt;flags &amp; IW_SCAN_THIS_ESSID) {</div><div class='del'>-		ssid = req-&gt;essid;</div><div class='del'>-		ssid_len = req-&gt;essid_len;</div><div class='del'>-</div><div class='del'>-		if (ssid_len &amp;&amp;</div><div class='del'>-		    ((local-&gt;iw_mode != IW_MODE_INFRA &amp;&amp;</div><div class='del'>-		      local-&gt;iw_mode != IW_MODE_ADHOC) ||</div><div class='del'>-		     (local-&gt;sta_fw_ver &lt; PRISM2_FW_VER(1,3,1))))</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;sta_fw_ver &gt;= PRISM2_FW_VER(1,3,1))</div><div class='del'>-		ret = prism2_request_hostscan(dev, ssid, ssid_len);</div><div class='del'>-	else</div><div class='del'>-		ret = prism2_request_scan(dev);</div><div class='del'>-</div><div class='del'>-	if (ret == 0)</div><div class='del'>-		local-&gt;scan_timestamp = jiffies;</div><div class='del'>-</div><div class='del'>-	/* Could inquire F101, F103 or wait for SIOCGIWSCAN and read RID */</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_STATION_MODES</div><div class='del'>-static char * __prism2_translate_scan(local_info_t *local,</div><div class='del'>-				      struct iw_request_info *info,</div><div class='del'>-				      struct hfa384x_hostscan_result *scan,</div><div class='del'>-				      struct hostap_bss_info *bss,</div><div class='del'>-				      char *current_ev, char *end_buf)</div><div class='del'>-{</div><div class='del'>-	int i, chan;</div><div class='del'>-	struct iw_event iwe;</div><div class='del'>-	char *current_val;</div><div class='del'>-	u16 capabilities;</div><div class='del'>-	u8 *pos;</div><div class='del'>-	u8 *ssid, *bssid;</div><div class='del'>-	size_t ssid_len;</div><div class='del'>-	char *buf;</div><div class='del'>-</div><div class='del'>-	if (bss) {</div><div class='del'>-		ssid = bss-&gt;ssid;</div><div class='del'>-		ssid_len = bss-&gt;ssid_len;</div><div class='del'>-		bssid = bss-&gt;bssid;</div><div class='del'>-	} else {</div><div class='del'>-		ssid = scan-&gt;ssid;</div><div class='del'>-		ssid_len = le16_to_cpu(scan-&gt;ssid_len);</div><div class='del'>-		bssid = scan-&gt;bssid;</div><div class='del'>-	}</div><div class='del'>-	if (ssid_len &gt; 32)</div><div class='del'>-		ssid_len = 32;</div><div class='del'>-</div><div class='del'>-	/* First entry *MUST* be the AP MAC address */</div><div class='del'>-	memset(&amp;iwe, 0, sizeof(iwe));</div><div class='del'>-	iwe.cmd = SIOCGIWAP;</div><div class='del'>-	iwe.u.ap_addr.sa_family = ARPHRD_ETHER;</div><div class='del'>-	memcpy(iwe.u.ap_addr.sa_data, bssid, ETH_ALEN);</div><div class='del'>-	current_ev = iwe_stream_add_event(info, current_ev, end_buf, &amp;iwe,</div><div class='del'>-					  IW_EV_ADDR_LEN);</div><div class='del'>-</div><div class='del'>-	/* Other entries will be displayed in the order we give them */</div><div class='del'>-</div><div class='del'>-	memset(&amp;iwe, 0, sizeof(iwe));</div><div class='del'>-	iwe.cmd = SIOCGIWESSID;</div><div class='del'>-	iwe.u.data.length = ssid_len;</div><div class='del'>-	iwe.u.data.flags = 1;</div><div class='del'>-	current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='del'>-					  &amp;iwe, ssid);</div><div class='del'>-</div><div class='del'>-	memset(&amp;iwe, 0, sizeof(iwe));</div><div class='del'>-	iwe.cmd = SIOCGIWMODE;</div><div class='del'>-	if (bss) {</div><div class='del'>-		capabilities = bss-&gt;capab_info;</div><div class='del'>-	} else {</div><div class='del'>-		capabilities = le16_to_cpu(scan-&gt;capability);</div><div class='del'>-	}</div><div class='del'>-	if (capabilities &amp; (WLAN_CAPABILITY_ESS |</div><div class='del'>-			    WLAN_CAPABILITY_IBSS)) {</div><div class='del'>-		if (capabilities &amp; WLAN_CAPABILITY_ESS)</div><div class='del'>-			iwe.u.mode = IW_MODE_MASTER;</div><div class='del'>-		else</div><div class='del'>-			iwe.u.mode = IW_MODE_ADHOC;</div><div class='del'>-		current_ev = iwe_stream_add_event(info, current_ev, end_buf,</div><div class='del'>-						  &amp;iwe, IW_EV_UINT_LEN);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(&amp;iwe, 0, sizeof(iwe));</div><div class='del'>-	iwe.cmd = SIOCGIWFREQ;</div><div class='del'>-	if (scan) {</div><div class='del'>-		chan = le16_to_cpu(scan-&gt;chid);</div><div class='del'>-	} else if (bss) {</div><div class='del'>-		chan = bss-&gt;chan;</div><div class='del'>-	} else {</div><div class='del'>-		chan = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (chan &gt; 0) {</div><div class='del'>-		iwe.u.freq.m = freq_list[chan - 1] * 100000;</div><div class='del'>-		iwe.u.freq.e = 1;</div><div class='del'>-		current_ev = iwe_stream_add_event(info, current_ev, end_buf,</div><div class='del'>-						  &amp;iwe, IW_EV_FREQ_LEN);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (scan) {</div><div class='del'>-		memset(&amp;iwe, 0, sizeof(iwe));</div><div class='del'>-		iwe.cmd = IWEVQUAL;</div><div class='del'>-		if (local-&gt;last_scan_type == PRISM2_HOSTSCAN) {</div><div class='del'>-			iwe.u.qual.level = le16_to_cpu(scan-&gt;sl);</div><div class='del'>-			iwe.u.qual.noise = le16_to_cpu(scan-&gt;anl);</div><div class='del'>-		} else {</div><div class='del'>-			iwe.u.qual.level =</div><div class='del'>-				HFA384X_LEVEL_TO_dBm(le16_to_cpu(scan-&gt;sl));</div><div class='del'>-			iwe.u.qual.noise =</div><div class='del'>-				HFA384X_LEVEL_TO_dBm(le16_to_cpu(scan-&gt;anl));</div><div class='del'>-		}</div><div class='del'>-		iwe.u.qual.updated = IW_QUAL_LEVEL_UPDATED</div><div class='del'>-			| IW_QUAL_NOISE_UPDATED</div><div class='del'>-			| IW_QUAL_QUAL_INVALID</div><div class='del'>-			| IW_QUAL_DBM;</div><div class='del'>-		current_ev = iwe_stream_add_event(info, current_ev, end_buf,</div><div class='del'>-						  &amp;iwe, IW_EV_QUAL_LEN);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(&amp;iwe, 0, sizeof(iwe));</div><div class='del'>-	iwe.cmd = SIOCGIWENCODE;</div><div class='del'>-	if (capabilities &amp; WLAN_CAPABILITY_PRIVACY)</div><div class='del'>-		iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;</div><div class='del'>-	else</div><div class='del'>-		iwe.u.data.flags = IW_ENCODE_DISABLED;</div><div class='del'>-	iwe.u.data.length = 0;</div><div class='del'>-	current_ev = iwe_stream_add_point(info, current_ev, end_buf, &amp;iwe, "");</div><div class='del'>-</div><div class='del'>-	/* TODO: add SuppRates into BSS table */</div><div class='del'>-	if (scan) {</div><div class='del'>-		memset(&amp;iwe, 0, sizeof(iwe));</div><div class='del'>-		iwe.cmd = SIOCGIWRATE;</div><div class='del'>-		current_val = current_ev + iwe_stream_lcp_len(info);</div><div class='del'>-		pos = scan-&gt;sup_rates;</div><div class='del'>-		for (i = 0; i &lt; sizeof(scan-&gt;sup_rates); i++) {</div><div class='del'>-			if (pos[i] == 0)</div><div class='del'>-				break;</div><div class='del'>-			/* Bit rate given in 500 kb/s units (+ 0x80) */</div><div class='del'>-			iwe.u.bitrate.value = ((pos[i] &amp; 0x7f) * 500000);</div><div class='del'>-			current_val = iwe_stream_add_value(</div><div class='del'>-				info, current_ev, current_val, end_buf, &amp;iwe,</div><div class='del'>-				IW_EV_PARAM_LEN);</div><div class='del'>-		}</div><div class='del'>-		/* Check if we added any event */</div><div class='del'>-		if ((current_val - current_ev) &gt; iwe_stream_lcp_len(info))</div><div class='del'>-			current_ev = current_val;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* TODO: add BeaconInt,resp_rate,atim into BSS table */</div><div class='del'>-	buf = kmalloc(MAX_WPA_IE_LEN * 2 + 30, GFP_ATOMIC);</div><div class='del'>-	if (buf &amp;&amp; scan) {</div><div class='del'>-		memset(&amp;iwe, 0, sizeof(iwe));</div><div class='del'>-		iwe.cmd = IWEVCUSTOM;</div><div class='del'>-		sprintf(buf, "bcn_int=%d", le16_to_cpu(scan-&gt;beacon_interval));</div><div class='del'>-		iwe.u.data.length = strlen(buf);</div><div class='del'>-		current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='del'>-						  &amp;iwe, buf);</div><div class='del'>-</div><div class='del'>-		memset(&amp;iwe, 0, sizeof(iwe));</div><div class='del'>-		iwe.cmd = IWEVCUSTOM;</div><div class='del'>-		sprintf(buf, "resp_rate=%d", le16_to_cpu(scan-&gt;rate));</div><div class='del'>-		iwe.u.data.length = strlen(buf);</div><div class='del'>-		current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='del'>-						  &amp;iwe, buf);</div><div class='del'>-</div><div class='del'>-		if (local-&gt;last_scan_type == PRISM2_HOSTSCAN &amp;&amp;</div><div class='del'>-		    (capabilities &amp; WLAN_CAPABILITY_IBSS)) {</div><div class='del'>-			memset(&amp;iwe, 0, sizeof(iwe));</div><div class='del'>-			iwe.cmd = IWEVCUSTOM;</div><div class='del'>-			sprintf(buf, "atim=%d", le16_to_cpu(scan-&gt;atim));</div><div class='del'>-			iwe.u.data.length = strlen(buf);</div><div class='del'>-			current_ev = iwe_stream_add_point(info, current_ev,</div><div class='del'>-							  end_buf, &amp;iwe, buf);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	kfree(buf);</div><div class='del'>-</div><div class='del'>-	if (bss &amp;&amp; bss-&gt;wpa_ie_len &gt; 0 &amp;&amp; bss-&gt;wpa_ie_len &lt;= MAX_WPA_IE_LEN) {</div><div class='del'>-		memset(&amp;iwe, 0, sizeof(iwe));</div><div class='del'>-		iwe.cmd = IWEVGENIE;</div><div class='del'>-		iwe.u.data.length = bss-&gt;wpa_ie_len;</div><div class='del'>-		current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='del'>-						  &amp;iwe, bss-&gt;wpa_ie);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bss &amp;&amp; bss-&gt;rsn_ie_len &gt; 0 &amp;&amp; bss-&gt;rsn_ie_len &lt;= MAX_WPA_IE_LEN) {</div><div class='del'>-		memset(&amp;iwe, 0, sizeof(iwe));</div><div class='del'>-		iwe.cmd = IWEVGENIE;</div><div class='del'>-		iwe.u.data.length = bss-&gt;rsn_ie_len;</div><div class='del'>-		current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='del'>-						  &amp;iwe, bss-&gt;rsn_ie);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return current_ev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Translate scan data returned from the card to a card independent</div><div class='del'>- * format that the Wireless Tools will understand - Jean II */</div><div class='del'>-static inline int prism2_translate_scan(local_info_t *local,</div><div class='del'>-					struct iw_request_info *info,</div><div class='del'>-					char *buffer, int buflen)</div><div class='del'>-{</div><div class='del'>-	struct hfa384x_hostscan_result *scan;</div><div class='del'>-	int entry;</div><div class='del'>-	char *current_ev = buffer;</div><div class='del'>-	char *end_buf = buffer + buflen;</div><div class='del'>-	struct list_head *ptr;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;local-&gt;lock);</div><div class='del'>-</div><div class='del'>-	list_for_each(ptr, &amp;local-&gt;bss_list) {</div><div class='del'>-		struct hostap_bss_info *bss;</div><div class='del'>-		bss = list_entry(ptr, struct hostap_bss_info, list);</div><div class='del'>-		bss-&gt;included = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (entry = 0; entry &lt; local-&gt;last_scan_results_count; entry++) {</div><div class='del'>-		int found = 0;</div><div class='del'>-		scan = &amp;local-&gt;last_scan_results[entry];</div><div class='del'>-</div><div class='del'>-		/* Report every SSID if the AP is using multiple SSIDs. If no</div><div class='del'>-		 * BSS record is found (e.g., when WPA mode is disabled),</div><div class='del'>-		 * report the AP once. */</div><div class='del'>-		list_for_each(ptr, &amp;local-&gt;bss_list) {</div><div class='del'>-			struct hostap_bss_info *bss;</div><div class='del'>-			bss = list_entry(ptr, struct hostap_bss_info, list);</div><div class='del'>-			if (ether_addr_equal(bss-&gt;bssid, scan-&gt;bssid)) {</div><div class='del'>-				bss-&gt;included = 1;</div><div class='del'>-				current_ev = __prism2_translate_scan(</div><div class='del'>-					local, info, scan, bss, current_ev,</div><div class='del'>-					end_buf);</div><div class='del'>-				found++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (!found) {</div><div class='del'>-			current_ev = __prism2_translate_scan(</div><div class='del'>-				local, info, scan, NULL, current_ev, end_buf);</div><div class='del'>-		}</div><div class='del'>-		/* Check if there is space for one more entry */</div><div class='del'>-		if ((end_buf - current_ev) &lt;= IW_EV_ADDR_LEN) {</div><div class='del'>-			/* Ask user space to try again with a bigger buffer */</div><div class='del'>-			spin_unlock_bh(&amp;local-&gt;lock);</div><div class='del'>-			return -E2BIG;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Prism2 firmware has limits (32 at least in some versions) for number</div><div class='del'>-	 * of BSSes in scan results. Extend this limit by using local BSS list.</div><div class='del'>-	 */</div><div class='del'>-	list_for_each(ptr, &amp;local-&gt;bss_list) {</div><div class='del'>-		struct hostap_bss_info *bss;</div><div class='del'>-		bss = list_entry(ptr, struct hostap_bss_info, list);</div><div class='del'>-		if (bss-&gt;included)</div><div class='del'>-			continue;</div><div class='del'>-		current_ev = __prism2_translate_scan(local, info, NULL, bss,</div><div class='del'>-						     current_ev, end_buf);</div><div class='del'>-		/* Check if there is space for one more entry */</div><div class='del'>-		if ((end_buf - current_ev) &lt;= IW_EV_ADDR_LEN) {</div><div class='del'>-			/* Ask user space to try again with a bigger buffer */</div><div class='del'>-			spin_unlock_bh(&amp;local-&gt;lock);</div><div class='del'>-			return -E2BIG;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_bh(&amp;local-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return current_ev - buffer;</div><div class='del'>-}</div><div class='del'>-#endif /* PRISM2_NO_STATION_MODES */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline int prism2_ioctl_giwscan_sta(struct net_device *dev,</div><div class='del'>-					   struct iw_request_info *info,</div><div class='del'>-					   struct iw_point *data, char *extra)</div><div class='del'>-{</div><div class='del'>-#ifdef PRISM2_NO_STATION_MODES</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-#else /* PRISM2_NO_STATION_MODES */</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	/* Wait until the scan is finished. We can probably do better</div><div class='del'>-	 * than that - Jean II */</div><div class='del'>-	if (local-&gt;scan_timestamp &amp;&amp;</div><div class='del'>-	    time_before(jiffies, local-&gt;scan_timestamp + 3 * HZ)) {</div><div class='del'>-		/* Important note : we don't want to block the caller</div><div class='del'>-		 * until results are ready for various reasons.</div><div class='del'>-		 * First, managing wait queues is complex and racy</div><div class='del'>-		 * (there may be multiple simultaneous callers).</div><div class='del'>-		 * Second, we grab some rtnetlink lock before coming</div><div class='del'>-		 * here (in dev_ioctl()).</div><div class='del'>-		 * Third, the caller can wait on the Wireless Event</div><div class='del'>-		 * - Jean II */</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-	local-&gt;scan_timestamp = 0;</div><div class='del'>-</div><div class='del'>-	res = prism2_translate_scan(local, info, extra, data-&gt;length);</div><div class='del'>-</div><div class='del'>-	if (res &gt;= 0) {</div><div class='del'>-		data-&gt;length = res;</div><div class='del'>-		return 0;</div><div class='del'>-	} else {</div><div class='del'>-		data-&gt;length = 0;</div><div class='del'>-		return res;</div><div class='del'>-	}</div><div class='del'>-#endif /* PRISM2_NO_STATION_MODES */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_giwscan(struct net_device *dev,</div><div class='del'>-				struct iw_request_info *info,</div><div class='del'>-				struct iw_point *data, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;iw_mode == IW_MODE_MASTER) {</div><div class='del'>-		/* In MASTER mode, it doesn't make sense to go around</div><div class='del'>-		 * scanning the frequencies and make the stations we serve</div><div class='del'>-		 * wait when what the user is really interested about is the</div><div class='del'>-		 * list of stations and access points we are talking to.</div><div class='del'>-		 * So, just extract results from our cache...</div><div class='del'>-		 * Jean II */</div><div class='del'>-</div><div class='del'>-		/* Translate to WE format */</div><div class='del'>-		res = prism2_ap_translate_scan(dev, info, extra);</div><div class='del'>-		if (res &gt;= 0) {</div><div class='del'>-			printk(KERN_DEBUG "Scan result translation succeeded "</div><div class='del'>-			       "(length=%d)\n", res);</div><div class='del'>-			data-&gt;length = res;</div><div class='del'>-			return 0;</div><div class='del'>-		} else {</div><div class='del'>-			printk(KERN_DEBUG</div><div class='del'>-			       "Scan result translation failed (res=%d)\n",</div><div class='del'>-			       res);</div><div class='del'>-			data-&gt;length = 0;</div><div class='del'>-			return res;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Station mode */</div><div class='del'>-		return prism2_ioctl_giwscan_sta(dev, info, data, extra);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const struct iw_priv_args prism2_priv[] = {</div><div class='del'>-	{ PRISM2_IOCTL_MONITOR,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "monitor" },</div><div class='del'>-	{ PRISM2_IOCTL_READMIF,</div><div class='del'>-	  IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1,</div><div class='del'>-	  IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1, "readmif" },</div><div class='del'>-	{ PRISM2_IOCTL_WRITEMIF,</div><div class='del'>-	  IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 2, 0, "writemif" },</div><div class='del'>-	{ PRISM2_IOCTL_RESET,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "reset" },</div><div class='del'>-	{ PRISM2_IOCTL_INQUIRE,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "inquire" },</div><div class='del'>-	{ PRISM2_IOCTL_SET_RID_WORD,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, 0, "set_rid_word" },</div><div class='del'>-	{ PRISM2_IOCTL_MACCMD,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "maccmd" },</div><div class='del'>-	{ PRISM2_IOCTL_WDS_ADD,</div><div class='del'>-	  IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0, "wds_add" },</div><div class='del'>-	{ PRISM2_IOCTL_WDS_DEL,</div><div class='del'>-	  IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0, "wds_del" },</div><div class='del'>-	{ PRISM2_IOCTL_ADDMAC,</div><div class='del'>-	  IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0, "addmac" },</div><div class='del'>-	{ PRISM2_IOCTL_DELMAC,</div><div class='del'>-	  IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0, "delmac" },</div><div class='del'>-	{ PRISM2_IOCTL_KICKMAC,</div><div class='del'>-	  IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0, "kickmac" },</div><div class='del'>-	/* --- raw access to sub-ioctls --- */</div><div class='del'>-	{ PRISM2_IOCTL_PRISM2_PARAM,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, 0, "prism2_param" },</div><div class='del'>-	{ PRISM2_IOCTL_GET_PRISM2_PARAM,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getprism2_param" },</div><div class='del'>-	/* --- sub-ioctls handlers --- */</div><div class='del'>-	{ PRISM2_IOCTL_PRISM2_PARAM,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "" },</div><div class='del'>-	{ PRISM2_IOCTL_GET_PRISM2_PARAM,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "" },</div><div class='del'>-	/* --- sub-ioctls definitions --- */</div><div class='del'>-	{ PRISM2_PARAM_TXRATECTRL,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "txratectrl" },</div><div class='del'>-	{ PRISM2_PARAM_TXRATECTRL,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "gettxratectrl" },</div><div class='del'>-	{ PRISM2_PARAM_BEACON_INT,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "beacon_int" },</div><div class='del'>-	{ PRISM2_PARAM_BEACON_INT,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getbeacon_int" },</div><div class='del'>-#ifndef PRISM2_NO_STATION_MODES</div><div class='del'>-	{ PRISM2_PARAM_PSEUDO_IBSS,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "pseudo_ibss" },</div><div class='del'>-	{ PRISM2_PARAM_PSEUDO_IBSS,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getpseudo_ibss" },</div><div class='del'>-#endif /* PRISM2_NO_STATION_MODES */</div><div class='del'>-	{ PRISM2_PARAM_ALC,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "alc" },</div><div class='del'>-	{ PRISM2_PARAM_ALC,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getalc" },</div><div class='del'>-	{ PRISM2_PARAM_DUMP,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "dump" },</div><div class='del'>-	{ PRISM2_PARAM_DUMP,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getdump" },</div><div class='del'>-	{ PRISM2_PARAM_OTHER_AP_POLICY,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "other_ap_policy" },</div><div class='del'>-	{ PRISM2_PARAM_OTHER_AP_POLICY,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getother_ap_pol" },</div><div class='del'>-	{ PRISM2_PARAM_AP_MAX_INACTIVITY,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "max_inactivity" },</div><div class='del'>-	{ PRISM2_PARAM_AP_MAX_INACTIVITY,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getmax_inactivi" },</div><div class='del'>-	{ PRISM2_PARAM_AP_BRIDGE_PACKETS,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "bridge_packets" },</div><div class='del'>-	{ PRISM2_PARAM_AP_BRIDGE_PACKETS,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getbridge_packe" },</div><div class='del'>-	{ PRISM2_PARAM_DTIM_PERIOD,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "dtim_period" },</div><div class='del'>-	{ PRISM2_PARAM_DTIM_PERIOD,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getdtim_period" },</div><div class='del'>-	{ PRISM2_PARAM_AP_NULLFUNC_ACK,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "nullfunc_ack" },</div><div class='del'>-	{ PRISM2_PARAM_AP_NULLFUNC_ACK,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getnullfunc_ack" },</div><div class='del'>-	{ PRISM2_PARAM_MAX_WDS,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "max_wds" },</div><div class='del'>-	{ PRISM2_PARAM_MAX_WDS,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getmax_wds" },</div><div class='del'>-	{ PRISM2_PARAM_AP_AUTOM_AP_WDS,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "autom_ap_wds" },</div><div class='del'>-	{ PRISM2_PARAM_AP_AUTOM_AP_WDS,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getautom_ap_wds" },</div><div class='del'>-	{ PRISM2_PARAM_AP_AUTH_ALGS,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "ap_auth_algs" },</div><div class='del'>-	{ PRISM2_PARAM_AP_AUTH_ALGS,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getap_auth_algs" },</div><div class='del'>-	{ PRISM2_PARAM_MONITOR_ALLOW_FCSERR,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "allow_fcserr" },</div><div class='del'>-	{ PRISM2_PARAM_MONITOR_ALLOW_FCSERR,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getallow_fcserr" },</div><div class='del'>-	{ PRISM2_PARAM_HOST_ENCRYPT,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "host_encrypt" },</div><div class='del'>-	{ PRISM2_PARAM_HOST_ENCRYPT,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "gethost_encrypt" },</div><div class='del'>-	{ PRISM2_PARAM_HOST_DECRYPT,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "host_decrypt" },</div><div class='del'>-	{ PRISM2_PARAM_HOST_DECRYPT,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "gethost_decrypt" },</div><div class='del'>-#ifndef PRISM2_NO_STATION_MODES</div><div class='del'>-	{ PRISM2_PARAM_HOST_ROAMING,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "host_roaming" },</div><div class='del'>-	{ PRISM2_PARAM_HOST_ROAMING,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "gethost_roaming" },</div><div class='del'>-#endif /* PRISM2_NO_STATION_MODES */</div><div class='del'>-	{ PRISM2_PARAM_BCRX_STA_KEY,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "bcrx_sta_key" },</div><div class='del'>-	{ PRISM2_PARAM_BCRX_STA_KEY,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getbcrx_sta_key" },</div><div class='del'>-	{ PRISM2_PARAM_IEEE_802_1X,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "ieee_802_1x" },</div><div class='del'>-	{ PRISM2_PARAM_IEEE_802_1X,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getieee_802_1x" },</div><div class='del'>-	{ PRISM2_PARAM_ANTSEL_TX,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "antsel_tx" },</div><div class='del'>-	{ PRISM2_PARAM_ANTSEL_TX,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getantsel_tx" },</div><div class='del'>-	{ PRISM2_PARAM_ANTSEL_RX,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "antsel_rx" },</div><div class='del'>-	{ PRISM2_PARAM_ANTSEL_RX,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getantsel_rx" },</div><div class='del'>-	{ PRISM2_PARAM_MONITOR_TYPE,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "monitor_type" },</div><div class='del'>-	{ PRISM2_PARAM_MONITOR_TYPE,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getmonitor_type" },</div><div class='del'>-	{ PRISM2_PARAM_WDS_TYPE,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "wds_type" },</div><div class='del'>-	{ PRISM2_PARAM_WDS_TYPE,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getwds_type" },</div><div class='del'>-	{ PRISM2_PARAM_HOSTSCAN,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "hostscan" },</div><div class='del'>-	{ PRISM2_PARAM_HOSTSCAN,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "gethostscan" },</div><div class='del'>-	{ PRISM2_PARAM_AP_SCAN,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "ap_scan" },</div><div class='del'>-	{ PRISM2_PARAM_AP_SCAN,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getap_scan" },</div><div class='del'>-	{ PRISM2_PARAM_ENH_SEC,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "enh_sec" },</div><div class='del'>-	{ PRISM2_PARAM_ENH_SEC,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getenh_sec" },</div><div class='del'>-#ifdef PRISM2_IO_DEBUG</div><div class='del'>-	{ PRISM2_PARAM_IO_DEBUG,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "io_debug" },</div><div class='del'>-	{ PRISM2_PARAM_IO_DEBUG,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getio_debug" },</div><div class='del'>-#endif /* PRISM2_IO_DEBUG */</div><div class='del'>-	{ PRISM2_PARAM_BASIC_RATES,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "basic_rates" },</div><div class='del'>-	{ PRISM2_PARAM_BASIC_RATES,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getbasic_rates" },</div><div class='del'>-	{ PRISM2_PARAM_OPER_RATES,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "oper_rates" },</div><div class='del'>-	{ PRISM2_PARAM_OPER_RATES,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getoper_rates" },</div><div class='del'>-	{ PRISM2_PARAM_HOSTAPD,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "hostapd" },</div><div class='del'>-	{ PRISM2_PARAM_HOSTAPD,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "gethostapd" },</div><div class='del'>-	{ PRISM2_PARAM_HOSTAPD_STA,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "hostapd_sta" },</div><div class='del'>-	{ PRISM2_PARAM_HOSTAPD_STA,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "gethostapd_sta" },</div><div class='del'>-	{ PRISM2_PARAM_WPA,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "wpa" },</div><div class='del'>-	{ PRISM2_PARAM_WPA,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getwpa" },</div><div class='del'>-	{ PRISM2_PARAM_PRIVACY_INVOKED,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "privacy_invoked" },</div><div class='del'>-	{ PRISM2_PARAM_PRIVACY_INVOKED,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getprivacy_invo" },</div><div class='del'>-	{ PRISM2_PARAM_TKIP_COUNTERMEASURES,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "tkip_countermea" },</div><div class='del'>-	{ PRISM2_PARAM_TKIP_COUNTERMEASURES,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "gettkip_counter" },</div><div class='del'>-	{ PRISM2_PARAM_DROP_UNENCRYPTED,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "drop_unencrypte" },</div><div class='del'>-	{ PRISM2_PARAM_DROP_UNENCRYPTED,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getdrop_unencry" },</div><div class='del'>-	{ PRISM2_PARAM_SCAN_CHANNEL_MASK,</div><div class='del'>-	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "scan_channels" },</div><div class='del'>-	{ PRISM2_PARAM_SCAN_CHANNEL_MASK,</div><div class='del'>-	  0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getscan_channel" },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_priv_inquire(struct net_device *dev, int *i)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;cmd(dev, HFA384X_CMDCODE_INQUIRE, *i, NULL, NULL))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_priv_prism2_param(struct net_device *dev,</div><div class='del'>-					  struct iw_request_info *info,</div><div class='del'>-					  void *wrqu, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int *i = (int *) extra;</div><div class='del'>-	int param = *i;</div><div class='del'>-	int value = *(i + 1);</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u16 val;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	switch (param) {</div><div class='del'>-	case PRISM2_PARAM_TXRATECTRL:</div><div class='del'>-		local-&gt;fw_tx_rate_control = value;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_BEACON_INT:</div><div class='del'>-		if (hostap_set_word(dev, HFA384X_RID_CNFBEACONINT, value) ||</div><div class='del'>-		    local-&gt;func-&gt;reset_port(dev))</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		else</div><div class='del'>-			local-&gt;beacon_int = value;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_STATION_MODES</div><div class='del'>-	case PRISM2_PARAM_PSEUDO_IBSS:</div><div class='del'>-		if (value == local-&gt;pseudo_adhoc)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (value != 0 &amp;&amp; value != 1) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		printk(KERN_DEBUG "prism2: %s: pseudo IBSS change %d -&gt; %d\n",</div><div class='del'>-		       dev-&gt;name, local-&gt;pseudo_adhoc, value);</div><div class='del'>-		local-&gt;pseudo_adhoc = value;</div><div class='del'>-		if (local-&gt;iw_mode != IW_MODE_ADHOC)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (hostap_set_word(dev, HFA384X_RID_CNFPORTTYPE,</div><div class='del'>-				    hostap_get_porttype(local))) {</div><div class='del'>-			ret = -EOPNOTSUPP;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (local-&gt;func-&gt;reset_port(dev))</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-#endif /* PRISM2_NO_STATION_MODES */</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_ALC:</div><div class='del'>-		printk(KERN_DEBUG "%s: %s ALC\n", dev-&gt;name,</div><div class='del'>-		       value == 0 ? "Disabling" : "Enabling");</div><div class='del'>-		val = HFA384X_TEST_CFG_BIT_ALC;</div><div class='del'>-		local-&gt;func-&gt;cmd(dev, HFA384X_CMDCODE_TEST |</div><div class='del'>-				 (HFA384X_TEST_CFG_BITS &lt;&lt; 8),</div><div class='del'>-				 value == 0 ? 0 : 1, &amp;val, NULL);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_DUMP:</div><div class='del'>-		local-&gt;frame_dump = value;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_OTHER_AP_POLICY:</div><div class='del'>-		if (value &lt; 0 || value &gt; 3) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (local-&gt;ap != NULL)</div><div class='del'>-			local-&gt;ap-&gt;ap_policy = value;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_AP_MAX_INACTIVITY:</div><div class='del'>-		if (value &lt; 0 || value &gt; 7 * 24 * 60 * 60) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (local-&gt;ap != NULL)</div><div class='del'>-			local-&gt;ap-&gt;max_inactivity = value * HZ;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_AP_BRIDGE_PACKETS:</div><div class='del'>-		if (local-&gt;ap != NULL)</div><div class='del'>-			local-&gt;ap-&gt;bridge_packets = value;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_DTIM_PERIOD:</div><div class='del'>-		if (value &lt; 0 || value &gt; 65535) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (hostap_set_word(dev, HFA384X_RID_CNFOWNDTIMPERIOD, value)</div><div class='del'>-		    || local-&gt;func-&gt;reset_port(dev))</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		else</div><div class='del'>-			local-&gt;dtim_period = value;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_AP_NULLFUNC_ACK:</div><div class='del'>-		if (local-&gt;ap != NULL)</div><div class='del'>-			local-&gt;ap-&gt;nullfunc_ack = value;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_MAX_WDS:</div><div class='del'>-		local-&gt;wds_max_connections = value;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_AP_AUTOM_AP_WDS:</div><div class='del'>-		if (local-&gt;ap != NULL) {</div><div class='del'>-			if (!local-&gt;ap-&gt;autom_ap_wds &amp;&amp; value) {</div><div class='del'>-				/* add WDS link to all APs in STA table */</div><div class='del'>-				hostap_add_wds_links(local);</div><div class='del'>-			}</div><div class='del'>-			local-&gt;ap-&gt;autom_ap_wds = value;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_AP_AUTH_ALGS:</div><div class='del'>-		local-&gt;auth_algs = value;</div><div class='del'>-		if (hostap_set_auth_algs(local))</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_MONITOR_ALLOW_FCSERR:</div><div class='del'>-		local-&gt;monitor_allow_fcserr = value;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_HOST_ENCRYPT:</div><div class='del'>-		local-&gt;host_encrypt = value;</div><div class='del'>-		if (hostap_set_encryption(local) ||</div><div class='del'>-		    local-&gt;func-&gt;reset_port(dev))</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_HOST_DECRYPT:</div><div class='del'>-		local-&gt;host_decrypt = value;</div><div class='del'>-		if (hostap_set_encryption(local) ||</div><div class='del'>-		    local-&gt;func-&gt;reset_port(dev))</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_STATION_MODES</div><div class='del'>-	case PRISM2_PARAM_HOST_ROAMING:</div><div class='del'>-		if (value &lt; 0 || value &gt; 2) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		local-&gt;host_roaming = value;</div><div class='del'>-		if (hostap_set_roaming(local) || local-&gt;func-&gt;reset_port(dev))</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-#endif /* PRISM2_NO_STATION_MODES */</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_BCRX_STA_KEY:</div><div class='del'>-		local-&gt;bcrx_sta_key = value;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_IEEE_802_1X:</div><div class='del'>-		local-&gt;ieee_802_1x = value;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_ANTSEL_TX:</div><div class='del'>-		if (value &lt; 0 || value &gt; HOSTAP_ANTSEL_HIGH) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		local-&gt;antsel_tx = value;</div><div class='del'>-		hostap_set_antsel(local);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_ANTSEL_RX:</div><div class='del'>-		if (value &lt; 0 || value &gt; HOSTAP_ANTSEL_HIGH) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		local-&gt;antsel_rx = value;</div><div class='del'>-		hostap_set_antsel(local);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_MONITOR_TYPE:</div><div class='del'>-		if (value != PRISM2_MONITOR_80211 &amp;&amp;</div><div class='del'>-		    value != PRISM2_MONITOR_CAPHDR &amp;&amp;</div><div class='del'>-		    value != PRISM2_MONITOR_PRISM &amp;&amp;</div><div class='del'>-		    value != PRISM2_MONITOR_RADIOTAP) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		local-&gt;monitor_type = value;</div><div class='del'>-		if (local-&gt;iw_mode == IW_MODE_MONITOR)</div><div class='del'>-			hostap_monitor_set_type(local);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_WDS_TYPE:</div><div class='del'>-		local-&gt;wds_type = value;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_HOSTSCAN:</div><div class='del'>-	{</div><div class='del'>-		struct hfa384x_hostscan_request scan_req;</div><div class='del'>-		u16 rate;</div><div class='del'>-</div><div class='del'>-		memset(&amp;scan_req, 0, sizeof(scan_req));</div><div class='del'>-		scan_req.channel_list = cpu_to_le16(0x3fff);</div><div class='del'>-		switch (value) {</div><div class='del'>-		case 1: rate = HFA384X_RATES_1MBPS; break;</div><div class='del'>-		case 2: rate = HFA384X_RATES_2MBPS; break;</div><div class='del'>-		case 3: rate = HFA384X_RATES_5MBPS; break;</div><div class='del'>-		case 4: rate = HFA384X_RATES_11MBPS; break;</div><div class='del'>-		default: rate = HFA384X_RATES_1MBPS; break;</div><div class='del'>-		}</div><div class='del'>-		scan_req.txrate = cpu_to_le16(rate);</div><div class='del'>-		/* leave SSID empty to accept all SSIDs */</div><div class='del'>-</div><div class='del'>-		if (local-&gt;iw_mode == IW_MODE_MASTER) {</div><div class='del'>-			if (hostap_set_word(dev, HFA384X_RID_CNFPORTTYPE,</div><div class='del'>-					    HFA384X_PORTTYPE_BSS) ||</div><div class='del'>-			    local-&gt;func-&gt;reset_port(dev))</div><div class='del'>-				printk(KERN_DEBUG "Leaving Host AP mode "</div><div class='del'>-				       "for HostScan failed\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (local-&gt;func-&gt;set_rid(dev, HFA384X_RID_HOSTSCAN, &amp;scan_req,</div><div class='del'>-					 sizeof(scan_req))) {</div><div class='del'>-			printk(KERN_DEBUG "HOSTSCAN failed\n");</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		if (local-&gt;iw_mode == IW_MODE_MASTER) {</div><div class='del'>-			wait_queue_entry_t __wait;</div><div class='del'>-			init_waitqueue_entry(&amp;__wait, current);</div><div class='del'>-			add_wait_queue(&amp;local-&gt;hostscan_wq, &amp;__wait);</div><div class='del'>-			set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-			schedule_timeout(HZ);</div><div class='del'>-			if (signal_pending(current))</div><div class='del'>-				ret = -EINTR;</div><div class='del'>-			set_current_state(TASK_RUNNING);</div><div class='del'>-			remove_wait_queue(&amp;local-&gt;hostscan_wq, &amp;__wait);</div><div class='del'>-</div><div class='del'>-			if (hostap_set_word(dev, HFA384X_RID_CNFPORTTYPE,</div><div class='del'>-					    HFA384X_PORTTYPE_HOSTAP) ||</div><div class='del'>-			    local-&gt;func-&gt;reset_port(dev))</div><div class='del'>-				printk(KERN_DEBUG "Returning to Host AP mode "</div><div class='del'>-				       "after HostScan failed\n");</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_AP_SCAN:</div><div class='del'>-		local-&gt;passive_scan_interval = value;</div><div class='del'>-		if (timer_pending(&amp;local-&gt;passive_scan_timer))</div><div class='del'>-			del_timer(&amp;local-&gt;passive_scan_timer);</div><div class='del'>-		if (value &gt; 0 &amp;&amp; value &lt; INT_MAX / HZ) {</div><div class='del'>-			local-&gt;passive_scan_timer.expires = jiffies +</div><div class='del'>-				local-&gt;passive_scan_interval * HZ;</div><div class='del'>-			add_timer(&amp;local-&gt;passive_scan_timer);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_ENH_SEC:</div><div class='del'>-		if (value &lt; 0 || value &gt; 3) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		local-&gt;enh_sec = value;</div><div class='del'>-		if (hostap_set_word(dev, HFA384X_RID_CNFENHSECURITY,</div><div class='del'>-				    local-&gt;enh_sec) ||</div><div class='del'>-		    local-&gt;func-&gt;reset_port(dev)) {</div><div class='del'>-			printk(KERN_INFO "%s: cnfEnhSecurity requires STA f/w "</div><div class='del'>-			       "1.6.3 or newer\n", dev-&gt;name);</div><div class='del'>-			ret = -EOPNOTSUPP;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_IO_DEBUG</div><div class='del'>-	case PRISM2_PARAM_IO_DEBUG:</div><div class='del'>-		local-&gt;io_debug_enabled = value;</div><div class='del'>-		break;</div><div class='del'>-#endif /* PRISM2_IO_DEBUG */</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_BASIC_RATES:</div><div class='del'>-		if ((value &amp; local-&gt;tx_rate_control) != value || value == 0) {</div><div class='del'>-			printk(KERN_INFO "%s: invalid basic rate set - basic "</div><div class='del'>-			       "rates must be in supported rate set\n",</div><div class='del'>-			       dev-&gt;name);</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		local-&gt;basic_rates = value;</div><div class='del'>-		if (hostap_set_word(dev, HFA384X_RID_CNFBASICRATES,</div><div class='del'>-				    local-&gt;basic_rates) ||</div><div class='del'>-		    local-&gt;func-&gt;reset_port(dev))</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_OPER_RATES:</div><div class='del'>-		local-&gt;tx_rate_control = value;</div><div class='del'>-		if (hostap_set_rate(dev))</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_HOSTAPD:</div><div class='del'>-		ret = hostap_set_hostapd(local, value, 1);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_HOSTAPD_STA:</div><div class='del'>-		ret = hostap_set_hostapd_sta(local, value, 1);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_WPA:</div><div class='del'>-		local-&gt;wpa = value;</div><div class='del'>-		if (local-&gt;sta_fw_ver &lt; PRISM2_FW_VER(1,7,0))</div><div class='del'>-			ret = -EOPNOTSUPP;</div><div class='del'>-		else if (hostap_set_word(dev, HFA384X_RID_SSNHANDLINGMODE,</div><div class='del'>-					 value ? 1 : 0))</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_PRIVACY_INVOKED:</div><div class='del'>-		local-&gt;privacy_invoked = value;</div><div class='del'>-		if (hostap_set_encryption(local) ||</div><div class='del'>-		    local-&gt;func-&gt;reset_port(dev))</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_TKIP_COUNTERMEASURES:</div><div class='del'>-		local-&gt;tkip_countermeasures = value;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_DROP_UNENCRYPTED:</div><div class='del'>-		local-&gt;drop_unencrypted = value;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_SCAN_CHANNEL_MASK:</div><div class='del'>-		local-&gt;scan_channel_mask = value;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_DEBUG "%s: prism2_param: unknown param %d\n",</div><div class='del'>-		       dev-&gt;name, param);</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_priv_get_prism2_param(struct net_device *dev,</div><div class='del'>-					      struct iw_request_info *info,</div><div class='del'>-					      void *wrqu, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int *param = (int *) extra;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	switch (*param) {</div><div class='del'>-	case PRISM2_PARAM_TXRATECTRL:</div><div class='del'>-		*param = local-&gt;fw_tx_rate_control;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_BEACON_INT:</div><div class='del'>-		*param = local-&gt;beacon_int;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_PSEUDO_IBSS:</div><div class='del'>-		*param = local-&gt;pseudo_adhoc;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_ALC:</div><div class='del'>-		ret = -EOPNOTSUPP; /* FIX */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_DUMP:</div><div class='del'>-		*param = local-&gt;frame_dump;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_OTHER_AP_POLICY:</div><div class='del'>-		if (local-&gt;ap != NULL)</div><div class='del'>-			*param = local-&gt;ap-&gt;ap_policy;</div><div class='del'>-		else</div><div class='del'>-			ret = -EOPNOTSUPP;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_AP_MAX_INACTIVITY:</div><div class='del'>-		if (local-&gt;ap != NULL)</div><div class='del'>-			*param = local-&gt;ap-&gt;max_inactivity / HZ;</div><div class='del'>-		else</div><div class='del'>-			ret = -EOPNOTSUPP;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_AP_BRIDGE_PACKETS:</div><div class='del'>-		if (local-&gt;ap != NULL)</div><div class='del'>-			*param = local-&gt;ap-&gt;bridge_packets;</div><div class='del'>-		else</div><div class='del'>-			ret = -EOPNOTSUPP;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_DTIM_PERIOD:</div><div class='del'>-		*param = local-&gt;dtim_period;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_AP_NULLFUNC_ACK:</div><div class='del'>-		if (local-&gt;ap != NULL)</div><div class='del'>-			*param = local-&gt;ap-&gt;nullfunc_ack;</div><div class='del'>-		else</div><div class='del'>-			ret = -EOPNOTSUPP;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_MAX_WDS:</div><div class='del'>-		*param = local-&gt;wds_max_connections;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_AP_AUTOM_AP_WDS:</div><div class='del'>-		if (local-&gt;ap != NULL)</div><div class='del'>-			*param = local-&gt;ap-&gt;autom_ap_wds;</div><div class='del'>-		else</div><div class='del'>-			ret = -EOPNOTSUPP;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_AP_AUTH_ALGS:</div><div class='del'>-		*param = local-&gt;auth_algs;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_MONITOR_ALLOW_FCSERR:</div><div class='del'>-		*param = local-&gt;monitor_allow_fcserr;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_HOST_ENCRYPT:</div><div class='del'>-		*param = local-&gt;host_encrypt;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_HOST_DECRYPT:</div><div class='del'>-		*param = local-&gt;host_decrypt;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_HOST_ROAMING:</div><div class='del'>-		*param = local-&gt;host_roaming;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_BCRX_STA_KEY:</div><div class='del'>-		*param = local-&gt;bcrx_sta_key;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_IEEE_802_1X:</div><div class='del'>-		*param = local-&gt;ieee_802_1x;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_ANTSEL_TX:</div><div class='del'>-		*param = local-&gt;antsel_tx;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_ANTSEL_RX:</div><div class='del'>-		*param = local-&gt;antsel_rx;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_MONITOR_TYPE:</div><div class='del'>-		*param = local-&gt;monitor_type;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_WDS_TYPE:</div><div class='del'>-		*param = local-&gt;wds_type;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_HOSTSCAN:</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_AP_SCAN:</div><div class='del'>-		*param = local-&gt;passive_scan_interval;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_ENH_SEC:</div><div class='del'>-		*param = local-&gt;enh_sec;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_IO_DEBUG</div><div class='del'>-	case PRISM2_PARAM_IO_DEBUG:</div><div class='del'>-		*param = local-&gt;io_debug_enabled;</div><div class='del'>-		break;</div><div class='del'>-#endif /* PRISM2_IO_DEBUG */</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_BASIC_RATES:</div><div class='del'>-		*param = local-&gt;basic_rates;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_OPER_RATES:</div><div class='del'>-		*param = local-&gt;tx_rate_control;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_HOSTAPD:</div><div class='del'>-		*param = local-&gt;hostapd;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_HOSTAPD_STA:</div><div class='del'>-		*param = local-&gt;hostapd_sta;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_WPA:</div><div class='del'>-		if (local-&gt;sta_fw_ver &lt; PRISM2_FW_VER(1,7,0))</div><div class='del'>-			ret = -EOPNOTSUPP;</div><div class='del'>-		*param = local-&gt;wpa;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_PRIVACY_INVOKED:</div><div class='del'>-		*param = local-&gt;privacy_invoked;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_TKIP_COUNTERMEASURES:</div><div class='del'>-		*param = local-&gt;tkip_countermeasures;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_DROP_UNENCRYPTED:</div><div class='del'>-		*param = local-&gt;drop_unencrypted;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_PARAM_SCAN_CHANNEL_MASK:</div><div class='del'>-		*param = local-&gt;scan_channel_mask;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_DEBUG "%s: get_prism2_param: unknown param %d\n",</div><div class='del'>-		       dev-&gt;name, *param);</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_priv_readmif(struct net_device *dev,</div><div class='del'>-				     struct iw_request_info *info,</div><div class='del'>-				     void *wrqu, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	u16 resp0;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;cmd(dev, HFA384X_CMDCODE_READMIF, *extra, NULL,</div><div class='del'>-			     &amp;resp0))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	else</div><div class='del'>-		*extra = resp0;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_priv_writemif(struct net_device *dev,</div><div class='del'>-				      struct iw_request_info *info,</div><div class='del'>-				      void *wrqu, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	u16 cr, val;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	cr = *extra;</div><div class='del'>-	val = *(extra + 1);</div><div class='del'>-	if (local-&gt;func-&gt;cmd(dev, HFA384X_CMDCODE_WRITEMIF, cr, &amp;val, NULL))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_priv_monitor(struct net_device *dev, int *i)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u32 mode;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: process %d (%s) used deprecated iwpriv monitor "</div><div class='del'>-	       "- update software to use iwconfig mode monitor\n",</div><div class='del'>-	       dev-&gt;name, task_pid_nr(current), current-&gt;comm);</div><div class='del'>-</div><div class='del'>-	/* Backward compatibility code - this can be removed at some point */</div><div class='del'>-</div><div class='del'>-	if (*i == 0) {</div><div class='del'>-		/* Disable monitor mode - old mode was not saved, so go to</div><div class='del'>-		 * Master mode */</div><div class='del'>-		mode = IW_MODE_MASTER;</div><div class='del'>-		ret = prism2_ioctl_siwmode(dev, NULL, &amp;mode, NULL);</div><div class='del'>-	} else if (*i == 1) {</div><div class='del'>-		/* netlink socket mode is not supported anymore since it did</div><div class='del'>-		 * not separate different devices from each other and was not</div><div class='del'>-		 * best method for delivering large amount of packets to</div><div class='del'>-		 * user space */</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-	} else if (*i == 2 || *i == 3) {</div><div class='del'>-		switch (*i) {</div><div class='del'>-		case 2:</div><div class='del'>-			local-&gt;monitor_type = PRISM2_MONITOR_80211;</div><div class='del'>-			break;</div><div class='del'>-		case 3:</div><div class='del'>-			local-&gt;monitor_type = PRISM2_MONITOR_PRISM;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		mode = IW_MODE_MONITOR;</div><div class='del'>-		ret = prism2_ioctl_siwmode(dev, NULL, &amp;mode, NULL);</div><div class='del'>-		hostap_monitor_mode_enable(local);</div><div class='del'>-	} else</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_priv_reset(struct net_device *dev, int *i)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: manual reset request(%d)\n", dev-&gt;name, *i);</div><div class='del'>-	switch (*i) {</div><div class='del'>-	case 0:</div><div class='del'>-		/* Disable and enable card */</div><div class='del'>-		local-&gt;func-&gt;hw_shutdown(dev, 1);</div><div class='del'>-		local-&gt;func-&gt;hw_config(dev, 0);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 1:</div><div class='del'>-		/* COR sreset */</div><div class='del'>-		local-&gt;func-&gt;hw_reset(dev);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 2:</div><div class='del'>-		/* Disable and enable port 0 */</div><div class='del'>-		local-&gt;func-&gt;reset_port(dev);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 3:</div><div class='del'>-		prism2_sta_deauth(local, WLAN_REASON_DEAUTH_LEAVING);</div><div class='del'>-		if (local-&gt;func-&gt;cmd(dev, HFA384X_CMDCODE_DISABLE, 0, NULL,</div><div class='del'>-				     NULL))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 4:</div><div class='del'>-		if (local-&gt;func-&gt;cmd(dev, HFA384X_CMDCODE_ENABLE, 0, NULL,</div><div class='del'>-				     NULL))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_DEBUG "Unknown reset request %d\n", *i);</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_priv_set_rid_word(struct net_device *dev, int *i)</div><div class='del'>-{</div><div class='del'>-	int rid = *i;</div><div class='del'>-	int value = *(i + 1);</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: Set RID[0x%X] = %d\n", dev-&gt;name, rid, value);</div><div class='del'>-</div><div class='del'>-	if (hostap_set_word(dev, rid, value))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-static int ap_mac_cmd_ioctl(local_info_t *local, int *cmd)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	switch (*cmd) {</div><div class='del'>-	case AP_MAC_CMD_POLICY_OPEN:</div><div class='del'>-		local-&gt;ap-&gt;mac_restrictions.policy = MAC_POLICY_OPEN;</div><div class='del'>-		break;</div><div class='del'>-	case AP_MAC_CMD_POLICY_ALLOW:</div><div class='del'>-		local-&gt;ap-&gt;mac_restrictions.policy = MAC_POLICY_ALLOW;</div><div class='del'>-		break;</div><div class='del'>-	case AP_MAC_CMD_POLICY_DENY:</div><div class='del'>-		local-&gt;ap-&gt;mac_restrictions.policy = MAC_POLICY_DENY;</div><div class='del'>-		break;</div><div class='del'>-	case AP_MAC_CMD_FLUSH:</div><div class='del'>-		ap_control_flush_macs(&amp;local-&gt;ap-&gt;mac_restrictions);</div><div class='del'>-		break;</div><div class='del'>-	case AP_MAC_CMD_KICKALL:</div><div class='del'>-		ap_control_kickall(local-&gt;ap);</div><div class='del'>-		hostap_deauth_all_stas(local-&gt;dev, local-&gt;ap, 0);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_DOWNLOAD_SUPPORT</div><div class='del'>-static int prism2_ioctl_priv_download(local_info_t *local, struct iw_point *p)</div><div class='del'>-{</div><div class='del'>-	struct prism2_download_param *param;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (p-&gt;length &lt; sizeof(struct prism2_download_param) ||</div><div class='del'>-	    p-&gt;length &gt; 1024 || !p-&gt;pointer)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	param = memdup_user(p-&gt;pointer, p-&gt;length);</div><div class='del'>-	if (IS_ERR(param)) {</div><div class='del'>-		return PTR_ERR(param);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (p-&gt;length &lt; sizeof(struct prism2_download_param) +</div><div class='del'>-	    param-&gt;num_areas * sizeof(struct prism2_download_area)) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = local-&gt;func-&gt;download(local, param);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	kfree(param);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-#endif /* PRISM2_DOWNLOAD_SUPPORT */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_set_genericelement(struct net_device *dev, u8 *elem,</div><div class='del'>-				     size_t len)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface = netdev_priv(dev);</div><div class='del'>-	local_info_t *local = iface-&gt;local;</div><div class='del'>-	u8 *buf;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Add 16-bit length in the beginning of the buffer because Prism2 RID</div><div class='del'>-	 * includes it.</div><div class='del'>-	 */</div><div class='del'>-	buf = kmalloc(len + 2, GFP_KERNEL);</div><div class='del'>-	if (buf == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	*((__le16 *) buf) = cpu_to_le16(len);</div><div class='del'>-	memcpy(buf + 2, elem, len);</div><div class='del'>-</div><div class='del'>-	kfree(local-&gt;generic_elem);</div><div class='del'>-	local-&gt;generic_elem = buf;</div><div class='del'>-	local-&gt;generic_elem_len = len + 2;</div><div class='del'>-</div><div class='del'>-	return local-&gt;func-&gt;set_rid(local-&gt;dev, HFA384X_RID_GENERICELEMENT,</div><div class='del'>-				    buf, len + 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_siwauth(struct net_device *dev,</div><div class='del'>-				struct iw_request_info *info,</div><div class='del'>-				struct iw_param *data, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface = netdev_priv(dev);</div><div class='del'>-	local_info_t *local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	switch (data-&gt;flags &amp; IW_AUTH_INDEX) {</div><div class='del'>-	case IW_AUTH_WPA_VERSION:</div><div class='del'>-	case IW_AUTH_CIPHER_PAIRWISE:</div><div class='del'>-	case IW_AUTH_CIPHER_GROUP:</div><div class='del'>-	case IW_AUTH_KEY_MGMT:</div><div class='del'>-		/*</div><div class='del'>-		 * Host AP driver does not use these parameters and allows</div><div class='del'>-		 * wpa_supplicant to control them internally.</div><div class='del'>-		 */</div><div class='del'>-		break;</div><div class='del'>-	case IW_AUTH_TKIP_COUNTERMEASURES:</div><div class='del'>-		local-&gt;tkip_countermeasures = data-&gt;value;</div><div class='del'>-		break;</div><div class='del'>-	case IW_AUTH_DROP_UNENCRYPTED:</div><div class='del'>-		local-&gt;drop_unencrypted = data-&gt;value;</div><div class='del'>-		break;</div><div class='del'>-	case IW_AUTH_80211_AUTH_ALG:</div><div class='del'>-		local-&gt;auth_algs = data-&gt;value;</div><div class='del'>-		break;</div><div class='del'>-	case IW_AUTH_WPA_ENABLED:</div><div class='del'>-		if (data-&gt;value == 0) {</div><div class='del'>-			local-&gt;wpa = 0;</div><div class='del'>-			if (local-&gt;sta_fw_ver &lt; PRISM2_FW_VER(1,7,0))</div><div class='del'>-				break;</div><div class='del'>-			prism2_set_genericelement(dev, "", 0);</div><div class='del'>-			local-&gt;host_roaming = 0;</div><div class='del'>-			local-&gt;privacy_invoked = 0;</div><div class='del'>-			if (hostap_set_word(dev, HFA384X_RID_SSNHANDLINGMODE,</div><div class='del'>-					    0) ||</div><div class='del'>-			    hostap_set_roaming(local) ||</div><div class='del'>-			    hostap_set_encryption(local) ||</div><div class='del'>-			    local-&gt;func-&gt;reset_port(dev))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (local-&gt;sta_fw_ver &lt; PRISM2_FW_VER(1,7,0))</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-		local-&gt;host_roaming = 2;</div><div class='del'>-		local-&gt;privacy_invoked = 1;</div><div class='del'>-		local-&gt;wpa = 1;</div><div class='del'>-		if (hostap_set_word(dev, HFA384X_RID_SSNHANDLINGMODE, 1) ||</div><div class='del'>-		    hostap_set_roaming(local) ||</div><div class='del'>-		    hostap_set_encryption(local) ||</div><div class='del'>-		    local-&gt;func-&gt;reset_port(dev))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	case IW_AUTH_RX_UNENCRYPTED_EAPOL:</div><div class='del'>-		local-&gt;ieee_802_1x = data-&gt;value;</div><div class='del'>-		break;</div><div class='del'>-	case IW_AUTH_PRIVACY_INVOKED:</div><div class='del'>-		local-&gt;privacy_invoked = data-&gt;value;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_giwauth(struct net_device *dev,</div><div class='del'>-				struct iw_request_info *info,</div><div class='del'>-				struct iw_param *data, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface = netdev_priv(dev);</div><div class='del'>-	local_info_t *local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	switch (data-&gt;flags &amp; IW_AUTH_INDEX) {</div><div class='del'>-	case IW_AUTH_WPA_VERSION:</div><div class='del'>-	case IW_AUTH_CIPHER_PAIRWISE:</div><div class='del'>-	case IW_AUTH_CIPHER_GROUP:</div><div class='del'>-	case IW_AUTH_KEY_MGMT:</div><div class='del'>-		/*</div><div class='del'>-		 * Host AP driver does not use these parameters and allows</div><div class='del'>-		 * wpa_supplicant to control them internally.</div><div class='del'>-		 */</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	case IW_AUTH_TKIP_COUNTERMEASURES:</div><div class='del'>-		data-&gt;value = local-&gt;tkip_countermeasures;</div><div class='del'>-		break;</div><div class='del'>-	case IW_AUTH_DROP_UNENCRYPTED:</div><div class='del'>-		data-&gt;value = local-&gt;drop_unencrypted;</div><div class='del'>-		break;</div><div class='del'>-	case IW_AUTH_80211_AUTH_ALG:</div><div class='del'>-		data-&gt;value = local-&gt;auth_algs;</div><div class='del'>-		break;</div><div class='del'>-	case IW_AUTH_WPA_ENABLED:</div><div class='del'>-		data-&gt;value = local-&gt;wpa;</div><div class='del'>-		break;</div><div class='del'>-	case IW_AUTH_RX_UNENCRYPTED_EAPOL:</div><div class='del'>-		data-&gt;value = local-&gt;ieee_802_1x;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_siwencodeext(struct net_device *dev,</div><div class='del'>-				     struct iw_request_info *info,</div><div class='del'>-				     struct iw_point *erq, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface = netdev_priv(dev);</div><div class='del'>-	local_info_t *local = iface-&gt;local;</div><div class='del'>-	struct iw_encode_ext *ext = (struct iw_encode_ext *) extra;</div><div class='del'>-	int i, ret = 0;</div><div class='del'>-	struct lib80211_crypto_ops *ops;</div><div class='del'>-	struct lib80211_crypt_data **crypt;</div><div class='del'>-	void *sta_ptr;</div><div class='del'>-	u8 *addr;</div><div class='del'>-	const char *alg, *module;</div><div class='del'>-</div><div class='del'>-	i = erq-&gt;flags &amp; IW_ENCODE_INDEX;</div><div class='del'>-	if (i &gt; WEP_KEYS)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (i &lt; 1 || i &gt; WEP_KEYS)</div><div class='del'>-		i = local-&gt;crypt_info.tx_keyidx;</div><div class='del'>-	else</div><div class='del'>-		i--;</div><div class='del'>-	if (i &lt; 0 || i &gt;= WEP_KEYS)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	addr = ext-&gt;addr.sa_data;</div><div class='del'>-	if (is_broadcast_ether_addr(addr)) {</div><div class='del'>-		sta_ptr = NULL;</div><div class='del'>-		crypt = &amp;local-&gt;crypt_info.crypt[i];</div><div class='del'>-	} else {</div><div class='del'>-		if (i != 0)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		sta_ptr = ap_crypt_get_ptrs(local-&gt;ap, addr, 0, &amp;crypt);</div><div class='del'>-		if (sta_ptr == NULL) {</div><div class='del'>-			if (local-&gt;iw_mode == IW_MODE_INFRA) {</div><div class='del'>-				/*</div><div class='del'>-				 * TODO: add STA entry for the current AP so</div><div class='del'>-				 * that unicast key can be used. For now, this</div><div class='del'>-				 * is emulated by using default key idx 0.</div><div class='del'>-				 */</div><div class='del'>-				i = 0;</div><div class='del'>-				crypt = &amp;local-&gt;crypt_info.crypt[i];</div><div class='del'>-			} else</div><div class='del'>-				return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((erq-&gt;flags &amp; IW_ENCODE_DISABLED) ||</div><div class='del'>-	    ext-&gt;alg == IW_ENCODE_ALG_NONE) {</div><div class='del'>-		if (*crypt)</div><div class='del'>-			lib80211_crypt_delayed_deinit(&amp;local-&gt;crypt_info, crypt);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (ext-&gt;alg) {</div><div class='del'>-	case IW_ENCODE_ALG_WEP:</div><div class='del'>-		alg = "WEP";</div><div class='del'>-		module = "lib80211_crypt_wep";</div><div class='del'>-		break;</div><div class='del'>-	case IW_ENCODE_ALG_TKIP:</div><div class='del'>-		alg = "TKIP";</div><div class='del'>-		module = "lib80211_crypt_tkip";</div><div class='del'>-		break;</div><div class='del'>-	case IW_ENCODE_ALG_CCMP:</div><div class='del'>-		alg = "CCMP";</div><div class='del'>-		module = "lib80211_crypt_ccmp";</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_DEBUG "%s: unsupported algorithm %d\n",</div><div class='del'>-		       local-&gt;dev-&gt;name, ext-&gt;alg);</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ops = lib80211_get_crypto_ops(alg);</div><div class='del'>-	if (ops == NULL) {</div><div class='del'>-		request_module(module);</div><div class='del'>-		ops = lib80211_get_crypto_ops(alg);</div><div class='del'>-	}</div><div class='del'>-	if (ops == NULL) {</div><div class='del'>-		printk(KERN_DEBUG "%s: unknown crypto alg '%s'\n",</div><div class='del'>-		       local-&gt;dev-&gt;name, alg);</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sta_ptr || ext-&gt;alg != IW_ENCODE_ALG_WEP) {</div><div class='del'>-		/*</div><div class='del'>-		 * Per station encryption and other than WEP algorithms</div><div class='del'>-		 * require host-based encryption, so force them on</div><div class='del'>-		 * automatically.</div><div class='del'>-		 */</div><div class='del'>-		local-&gt;host_decrypt = local-&gt;host_encrypt = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (*crypt == NULL || (*crypt)-&gt;ops != ops) {</div><div class='del'>-		struct lib80211_crypt_data *new_crypt;</div><div class='del'>-</div><div class='del'>-		lib80211_crypt_delayed_deinit(&amp;local-&gt;crypt_info, crypt);</div><div class='del'>-</div><div class='del'>-		new_crypt = kzalloc(sizeof(struct lib80211_crypt_data),</div><div class='del'>-				GFP_KERNEL);</div><div class='del'>-		if (new_crypt == NULL) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-		new_crypt-&gt;ops = ops;</div><div class='del'>-		if (new_crypt-&gt;ops &amp;&amp; try_module_get(new_crypt-&gt;ops-&gt;owner))</div><div class='del'>-			new_crypt-&gt;priv = new_crypt-&gt;ops-&gt;init(i);</div><div class='del'>-		if (new_crypt-&gt;priv == NULL) {</div><div class='del'>-			kfree(new_crypt);</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		*crypt = new_crypt;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * TODO: if ext_flags does not have IW_ENCODE_EXT_RX_SEQ_VALID, the</div><div class='del'>-	 * existing seq# should not be changed.</div><div class='del'>-	 * TODO: if ext_flags has IW_ENCODE_EXT_TX_SEQ_VALID, next TX seq#</div><div class='del'>-	 * should be changed to something else than zero.</div><div class='del'>-	 */</div><div class='del'>-	if ((!(ext-&gt;ext_flags &amp; IW_ENCODE_EXT_SET_TX_KEY) || ext-&gt;key_len &gt; 0)</div><div class='del'>-	    &amp;&amp; (*crypt)-&gt;ops-&gt;set_key &amp;&amp;</div><div class='del'>-	    (*crypt)-&gt;ops-&gt;set_key(ext-&gt;key, ext-&gt;key_len, ext-&gt;rx_seq,</div><div class='del'>-				   (*crypt)-&gt;priv) &lt; 0) {</div><div class='del'>-		printk(KERN_DEBUG "%s: key setting failed\n",</div><div class='del'>-		       local-&gt;dev-&gt;name);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ext-&gt;ext_flags &amp; IW_ENCODE_EXT_SET_TX_KEY) {</div><div class='del'>-		if (!sta_ptr)</div><div class='del'>-			local-&gt;crypt_info.tx_keyidx = i;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (sta_ptr == NULL &amp;&amp; ext-&gt;key_len &gt; 0) {</div><div class='del'>-		int first = 1, j;</div><div class='del'>-		for (j = 0; j &lt; WEP_KEYS; j++) {</div><div class='del'>-			if (j != i &amp;&amp; local-&gt;crypt_info.crypt[j]) {</div><div class='del'>-				first = 0;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (first)</div><div class='del'>-			local-&gt;crypt_info.tx_keyidx = i;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- done:</div><div class='del'>-	if (sta_ptr)</div><div class='del'>-		hostap_handle_sta_release(sta_ptr);</div><div class='del'>-</div><div class='del'>-	local-&gt;open_wep = erq-&gt;flags &amp; IW_ENCODE_OPEN;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Do not reset port0 if card is in Managed mode since resetting will</div><div class='del'>-	 * generate new IEEE 802.11 authentication which may end up in looping</div><div class='del'>-	 * with IEEE 802.1X. Prism2 documentation seem to require port reset</div><div class='del'>-	 * after WEP configuration. However, keys are apparently changed at</div><div class='del'>-	 * least in Managed mode.</div><div class='del'>-	 */</div><div class='del'>-	if (ret == 0 &amp;&amp;</div><div class='del'>-	    (hostap_set_encryption(local) ||</div><div class='del'>-	     (local-&gt;iw_mode != IW_MODE_INFRA &amp;&amp;</div><div class='del'>-	      local-&gt;func-&gt;reset_port(local-&gt;dev))))</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_giwencodeext(struct net_device *dev,</div><div class='del'>-				     struct iw_request_info *info,</div><div class='del'>-				     struct iw_point *erq, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface = netdev_priv(dev);</div><div class='del'>-	local_info_t *local = iface-&gt;local;</div><div class='del'>-	struct lib80211_crypt_data **crypt;</div><div class='del'>-	void *sta_ptr;</div><div class='del'>-	int max_key_len, i;</div><div class='del'>-	struct iw_encode_ext *ext = (struct iw_encode_ext *) extra;</div><div class='del'>-	u8 *addr;</div><div class='del'>-</div><div class='del'>-	max_key_len = erq-&gt;length - sizeof(*ext);</div><div class='del'>-	if (max_key_len &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	i = erq-&gt;flags &amp; IW_ENCODE_INDEX;</div><div class='del'>-	if (i &lt; 1 || i &gt; WEP_KEYS)</div><div class='del'>-		i = local-&gt;crypt_info.tx_keyidx;</div><div class='del'>-	else</div><div class='del'>-		i--;</div><div class='del'>-</div><div class='del'>-	addr = ext-&gt;addr.sa_data;</div><div class='del'>-	if (is_broadcast_ether_addr(addr)) {</div><div class='del'>-		sta_ptr = NULL;</div><div class='del'>-		crypt = &amp;local-&gt;crypt_info.crypt[i];</div><div class='del'>-	} else {</div><div class='del'>-		i = 0;</div><div class='del'>-		sta_ptr = ap_crypt_get_ptrs(local-&gt;ap, addr, 0, &amp;crypt);</div><div class='del'>-		if (sta_ptr == NULL)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	erq-&gt;flags = i + 1;</div><div class='del'>-	memset(ext, 0, sizeof(*ext));</div><div class='del'>-</div><div class='del'>-	if (*crypt == NULL || (*crypt)-&gt;ops == NULL) {</div><div class='del'>-		ext-&gt;alg = IW_ENCODE_ALG_NONE;</div><div class='del'>-		ext-&gt;key_len = 0;</div><div class='del'>-		erq-&gt;flags |= IW_ENCODE_DISABLED;</div><div class='del'>-	} else {</div><div class='del'>-		if (strcmp((*crypt)-&gt;ops-&gt;name, "WEP") == 0)</div><div class='del'>-			ext-&gt;alg = IW_ENCODE_ALG_WEP;</div><div class='del'>-		else if (strcmp((*crypt)-&gt;ops-&gt;name, "TKIP") == 0)</div><div class='del'>-			ext-&gt;alg = IW_ENCODE_ALG_TKIP;</div><div class='del'>-		else if (strcmp((*crypt)-&gt;ops-&gt;name, "CCMP") == 0)</div><div class='del'>-			ext-&gt;alg = IW_ENCODE_ALG_CCMP;</div><div class='del'>-		else</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		if ((*crypt)-&gt;ops-&gt;get_key) {</div><div class='del'>-			ext-&gt;key_len =</div><div class='del'>-				(*crypt)-&gt;ops-&gt;get_key(ext-&gt;key,</div><div class='del'>-						       max_key_len,</div><div class='del'>-						       ext-&gt;tx_seq,</div><div class='del'>-						       (*crypt)-&gt;priv);</div><div class='del'>-			if (ext-&gt;key_len &amp;&amp;</div><div class='del'>-			    (ext-&gt;alg == IW_ENCODE_ALG_TKIP ||</div><div class='del'>-			     ext-&gt;alg == IW_ENCODE_ALG_CCMP))</div><div class='del'>-				ext-&gt;ext_flags |= IW_ENCODE_EXT_TX_SEQ_VALID;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sta_ptr)</div><div class='del'>-		hostap_handle_sta_release(sta_ptr);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_set_encryption(local_info_t *local,</div><div class='del'>-				       struct prism2_hostapd_param *param,</div><div class='del'>-				       int param_len)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	struct lib80211_crypto_ops *ops;</div><div class='del'>-	struct lib80211_crypt_data **crypt;</div><div class='del'>-	void *sta_ptr;</div><div class='del'>-</div><div class='del'>-	param-&gt;u.crypt.err = 0;</div><div class='del'>-	param-&gt;u.crypt.alg[HOSTAP_CRYPT_ALG_NAME_LEN - 1] = '\0';</div><div class='del'>-</div><div class='del'>-	if (param_len !=</div><div class='del'>-	    (int) ((char *) param-&gt;u.crypt.key - (char *) param) +</div><div class='del'>-	    param-&gt;u.crypt.key_len)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (is_broadcast_ether_addr(param-&gt;sta_addr)) {</div><div class='del'>-		if (param-&gt;u.crypt.idx &gt;= WEP_KEYS)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		sta_ptr = NULL;</div><div class='del'>-		crypt = &amp;local-&gt;crypt_info.crypt[param-&gt;u.crypt.idx];</div><div class='del'>-	} else {</div><div class='del'>-		if (param-&gt;u.crypt.idx)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		sta_ptr = ap_crypt_get_ptrs(</div><div class='del'>-			local-&gt;ap, param-&gt;sta_addr,</div><div class='del'>-			(param-&gt;u.crypt.flags &amp; HOSTAP_CRYPT_FLAG_PERMANENT),</div><div class='del'>-			&amp;crypt);</div><div class='del'>-</div><div class='del'>-		if (sta_ptr == NULL) {</div><div class='del'>-			param-&gt;u.crypt.err = HOSTAP_CRYPT_ERR_UNKNOWN_ADDR;</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (strcmp(param-&gt;u.crypt.alg, "none") == 0) {</div><div class='del'>-		if (crypt)</div><div class='del'>-			lib80211_crypt_delayed_deinit(&amp;local-&gt;crypt_info, crypt);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ops = lib80211_get_crypto_ops(param-&gt;u.crypt.alg);</div><div class='del'>-	if (ops == NULL &amp;&amp; strcmp(param-&gt;u.crypt.alg, "WEP") == 0) {</div><div class='del'>-		request_module("lib80211_crypt_wep");</div><div class='del'>-		ops = lib80211_get_crypto_ops(param-&gt;u.crypt.alg);</div><div class='del'>-	} else if (ops == NULL &amp;&amp; strcmp(param-&gt;u.crypt.alg, "TKIP") == 0) {</div><div class='del'>-		request_module("lib80211_crypt_tkip");</div><div class='del'>-		ops = lib80211_get_crypto_ops(param-&gt;u.crypt.alg);</div><div class='del'>-	} else if (ops == NULL &amp;&amp; strcmp(param-&gt;u.crypt.alg, "CCMP") == 0) {</div><div class='del'>-		request_module("lib80211_crypt_ccmp");</div><div class='del'>-		ops = lib80211_get_crypto_ops(param-&gt;u.crypt.alg);</div><div class='del'>-	}</div><div class='del'>-	if (ops == NULL) {</div><div class='del'>-		printk(KERN_DEBUG "%s: unknown crypto alg '%s'\n",</div><div class='del'>-		       local-&gt;dev-&gt;name, param-&gt;u.crypt.alg);</div><div class='del'>-		param-&gt;u.crypt.err = HOSTAP_CRYPT_ERR_UNKNOWN_ALG;</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* station based encryption and other than WEP algorithms require</div><div class='del'>-	 * host-based encryption, so force them on automatically */</div><div class='del'>-	local-&gt;host_decrypt = local-&gt;host_encrypt = 1;</div><div class='del'>-</div><div class='del'>-	if (*crypt == NULL || (*crypt)-&gt;ops != ops) {</div><div class='del'>-		struct lib80211_crypt_data *new_crypt;</div><div class='del'>-</div><div class='del'>-		lib80211_crypt_delayed_deinit(&amp;local-&gt;crypt_info, crypt);</div><div class='del'>-</div><div class='del'>-		new_crypt = kzalloc(sizeof(struct lib80211_crypt_data),</div><div class='del'>-				GFP_KERNEL);</div><div class='del'>-		if (new_crypt == NULL) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-		new_crypt-&gt;ops = ops;</div><div class='del'>-		new_crypt-&gt;priv = new_crypt-&gt;ops-&gt;init(param-&gt;u.crypt.idx);</div><div class='del'>-		if (new_crypt-&gt;priv == NULL) {</div><div class='del'>-			kfree(new_crypt);</div><div class='del'>-			param-&gt;u.crypt.err =</div><div class='del'>-				HOSTAP_CRYPT_ERR_CRYPT_INIT_FAILED;</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		*crypt = new_crypt;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((!(param-&gt;u.crypt.flags &amp; HOSTAP_CRYPT_FLAG_SET_TX_KEY) ||</div><div class='del'>-	     param-&gt;u.crypt.key_len &gt; 0) &amp;&amp; (*crypt)-&gt;ops-&gt;set_key &amp;&amp;</div><div class='del'>-	    (*crypt)-&gt;ops-&gt;set_key(param-&gt;u.crypt.key,</div><div class='del'>-				   param-&gt;u.crypt.key_len, param-&gt;u.crypt.seq,</div><div class='del'>-				   (*crypt)-&gt;priv) &lt; 0) {</div><div class='del'>-		printk(KERN_DEBUG "%s: key setting failed\n",</div><div class='del'>-		       local-&gt;dev-&gt;name);</div><div class='del'>-		param-&gt;u.crypt.err = HOSTAP_CRYPT_ERR_KEY_SET_FAILED;</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (param-&gt;u.crypt.flags &amp; HOSTAP_CRYPT_FLAG_SET_TX_KEY) {</div><div class='del'>-		if (!sta_ptr)</div><div class='del'>-			local-&gt;crypt_info.tx_keyidx = param-&gt;u.crypt.idx;</div><div class='del'>-		else if (param-&gt;u.crypt.idx) {</div><div class='del'>-			printk(KERN_DEBUG "%s: TX key idx setting failed\n",</div><div class='del'>-			       local-&gt;dev-&gt;name);</div><div class='del'>-			param-&gt;u.crypt.err =</div><div class='del'>-				HOSTAP_CRYPT_ERR_TX_KEY_SET_FAILED;</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- done:</div><div class='del'>-	if (sta_ptr)</div><div class='del'>-		hostap_handle_sta_release(sta_ptr);</div><div class='del'>-</div><div class='del'>-	/* Do not reset port0 if card is in Managed mode since resetting will</div><div class='del'>-	 * generate new IEEE 802.11 authentication which may end up in looping</div><div class='del'>-	 * with IEEE 802.1X. Prism2 documentation seem to require port reset</div><div class='del'>-	 * after WEP configuration. However, keys are apparently changed at</div><div class='del'>-	 * least in Managed mode. */</div><div class='del'>-	if (ret == 0 &amp;&amp;</div><div class='del'>-	    (hostap_set_encryption(local) ||</div><div class='del'>-	     (local-&gt;iw_mode != IW_MODE_INFRA &amp;&amp;</div><div class='del'>-	      local-&gt;func-&gt;reset_port(local-&gt;dev)))) {</div><div class='del'>-		param-&gt;u.crypt.err = HOSTAP_CRYPT_ERR_CARD_CONF_FAILED;</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_get_encryption(local_info_t *local,</div><div class='del'>-				       struct prism2_hostapd_param *param,</div><div class='del'>-				       int param_len)</div><div class='del'>-{</div><div class='del'>-	struct lib80211_crypt_data **crypt;</div><div class='del'>-	void *sta_ptr;</div><div class='del'>-	int max_key_len;</div><div class='del'>-</div><div class='del'>-	param-&gt;u.crypt.err = 0;</div><div class='del'>-</div><div class='del'>-	max_key_len = param_len -</div><div class='del'>-		(int) ((char *) param-&gt;u.crypt.key - (char *) param);</div><div class='del'>-	if (max_key_len &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (is_broadcast_ether_addr(param-&gt;sta_addr)) {</div><div class='del'>-		sta_ptr = NULL;</div><div class='del'>-		if (param-&gt;u.crypt.idx &gt;= WEP_KEYS)</div><div class='del'>-			param-&gt;u.crypt.idx = local-&gt;crypt_info.tx_keyidx;</div><div class='del'>-		crypt = &amp;local-&gt;crypt_info.crypt[param-&gt;u.crypt.idx];</div><div class='del'>-	} else {</div><div class='del'>-		param-&gt;u.crypt.idx = 0;</div><div class='del'>-		sta_ptr = ap_crypt_get_ptrs(local-&gt;ap, param-&gt;sta_addr, 0,</div><div class='del'>-					    &amp;crypt);</div><div class='del'>-</div><div class='del'>-		if (sta_ptr == NULL) {</div><div class='del'>-			param-&gt;u.crypt.err = HOSTAP_CRYPT_ERR_UNKNOWN_ADDR;</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (*crypt == NULL || (*crypt)-&gt;ops == NULL) {</div><div class='del'>-		memcpy(param-&gt;u.crypt.alg, "none", 5);</div><div class='del'>-		param-&gt;u.crypt.key_len = 0;</div><div class='del'>-		param-&gt;u.crypt.idx = 0xff;</div><div class='del'>-	} else {</div><div class='del'>-		strncpy(param-&gt;u.crypt.alg, (*crypt)-&gt;ops-&gt;name,</div><div class='del'>-			HOSTAP_CRYPT_ALG_NAME_LEN);</div><div class='del'>-		param-&gt;u.crypt.key_len = 0;</div><div class='del'>-</div><div class='del'>-		memset(param-&gt;u.crypt.seq, 0, 8);</div><div class='del'>-		if ((*crypt)-&gt;ops-&gt;get_key) {</div><div class='del'>-			param-&gt;u.crypt.key_len =</div><div class='del'>-				(*crypt)-&gt;ops-&gt;get_key(param-&gt;u.crypt.key,</div><div class='del'>-						       max_key_len,</div><div class='del'>-						       param-&gt;u.crypt.seq,</div><div class='del'>-						       (*crypt)-&gt;priv);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sta_ptr)</div><div class='del'>-		hostap_handle_sta_release(sta_ptr);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_get_rid(local_info_t *local,</div><div class='del'>-				struct prism2_hostapd_param *param,</div><div class='del'>-				int param_len)</div><div class='del'>-{</div><div class='del'>-	int max_len, res;</div><div class='del'>-</div><div class='del'>-	max_len = param_len - PRISM2_HOSTAPD_RID_HDR_LEN;</div><div class='del'>-	if (max_len &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	res = local-&gt;func-&gt;get_rid(local-&gt;dev, param-&gt;u.rid.rid,</div><div class='del'>-				   param-&gt;u.rid.data, param-&gt;u.rid.len, 0);</div><div class='del'>-	if (res &gt;= 0) {</div><div class='del'>-		param-&gt;u.rid.len = res;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_set_rid(local_info_t *local,</div><div class='del'>-				struct prism2_hostapd_param *param,</div><div class='del'>-				int param_len)</div><div class='del'>-{</div><div class='del'>-	int max_len;</div><div class='del'>-</div><div class='del'>-	max_len = param_len - PRISM2_HOSTAPD_RID_HDR_LEN;</div><div class='del'>-	if (max_len &lt; 0 || max_len &lt; param-&gt;u.rid.len)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return local-&gt;func-&gt;set_rid(local-&gt;dev, param-&gt;u.rid.rid,</div><div class='del'>-				    param-&gt;u.rid.data, param-&gt;u.rid.len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_set_assoc_ap_addr(local_info_t *local,</div><div class='del'>-					  struct prism2_hostapd_param *param,</div><div class='del'>-					  int param_len)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_DEBUG "%ssta: associated as client with AP %pM\n",</div><div class='del'>-	       local-&gt;dev-&gt;name, param-&gt;sta_addr);</div><div class='del'>-	memcpy(local-&gt;assoc_ap_addr, param-&gt;sta_addr, ETH_ALEN);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_siwgenie(struct net_device *dev,</div><div class='del'>-				 struct iw_request_info *info,</div><div class='del'>-				 struct iw_point *data, char *extra)</div><div class='del'>-{</div><div class='del'>-	return prism2_set_genericelement(dev, extra, data-&gt;length);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_giwgenie(struct net_device *dev,</div><div class='del'>-				 struct iw_request_info *info,</div><div class='del'>-				 struct iw_point *data, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface = netdev_priv(dev);</div><div class='del'>-	local_info_t *local = iface-&gt;local;</div><div class='del'>-	int len = local-&gt;generic_elem_len - 2;</div><div class='del'>-</div><div class='del'>-	if (len &lt;= 0 || local-&gt;generic_elem == NULL) {</div><div class='del'>-		data-&gt;length = 0;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (data-&gt;length &lt; len)</div><div class='del'>-		return -E2BIG;</div><div class='del'>-</div><div class='del'>-	data-&gt;length = len;</div><div class='del'>-	memcpy(extra, local-&gt;generic_elem + 2, len);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_set_generic_element(local_info_t *local,</div><div class='del'>-					    struct prism2_hostapd_param *param,</div><div class='del'>-					    int param_len)</div><div class='del'>-{</div><div class='del'>-	int max_len, len;</div><div class='del'>-</div><div class='del'>-	len = param-&gt;u.generic_elem.len;</div><div class='del'>-	max_len = param_len - PRISM2_HOSTAPD_GENERIC_ELEMENT_HDR_LEN;</div><div class='del'>-	if (max_len &lt; 0 || max_len &lt; len)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return prism2_set_genericelement(local-&gt;dev,</div><div class='del'>-					 param-&gt;u.generic_elem.data, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_siwmlme(struct net_device *dev,</div><div class='del'>-				struct iw_request_info *info,</div><div class='del'>-				struct iw_point *data, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface = netdev_priv(dev);</div><div class='del'>-	local_info_t *local = iface-&gt;local;</div><div class='del'>-	struct iw_mlme *mlme = (struct iw_mlme *) extra;</div><div class='del'>-	__le16 reason;</div><div class='del'>-</div><div class='del'>-	reason = cpu_to_le16(mlme-&gt;reason_code);</div><div class='del'>-</div><div class='del'>-	switch (mlme-&gt;cmd) {</div><div class='del'>-	case IW_MLME_DEAUTH:</div><div class='del'>-		return prism2_sta_send_mgmt(local, mlme-&gt;addr.sa_data,</div><div class='del'>-					    IEEE80211_STYPE_DEAUTH,</div><div class='del'>-					    (u8 *) &amp;reason, 2);</div><div class='del'>-	case IW_MLME_DISASSOC:</div><div class='del'>-		return prism2_sta_send_mgmt(local, mlme-&gt;addr.sa_data,</div><div class='del'>-					    IEEE80211_STYPE_DISASSOC,</div><div class='del'>-					    (u8 *) &amp;reason, 2);</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_mlme(local_info_t *local,</div><div class='del'>-			     struct prism2_hostapd_param *param)</div><div class='del'>-{</div><div class='del'>-	__le16 reason;</div><div class='del'>-</div><div class='del'>-	reason = cpu_to_le16(param-&gt;u.mlme.reason_code);</div><div class='del'>-	switch (param-&gt;u.mlme.cmd) {</div><div class='del'>-	case MLME_STA_DEAUTH:</div><div class='del'>-		return prism2_sta_send_mgmt(local, param-&gt;sta_addr,</div><div class='del'>-					    IEEE80211_STYPE_DEAUTH,</div><div class='del'>-					    (u8 *) &amp;reason, 2);</div><div class='del'>-	case MLME_STA_DISASSOC:</div><div class='del'>-		return prism2_sta_send_mgmt(local, param-&gt;sta_addr,</div><div class='del'>-					    IEEE80211_STYPE_DISASSOC,</div><div class='del'>-					    (u8 *) &amp;reason, 2);</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_scan_req(local_info_t *local,</div><div class='del'>-				 struct prism2_hostapd_param *param)</div><div class='del'>-{</div><div class='del'>-#ifndef PRISM2_NO_STATION_MODES</div><div class='del'>-	if ((local-&gt;iw_mode != IW_MODE_INFRA &amp;&amp;</div><div class='del'>-	     local-&gt;iw_mode != IW_MODE_ADHOC) ||</div><div class='del'>-	    (local-&gt;sta_fw_ver &lt; PRISM2_FW_VER(1,3,1)))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (!local-&gt;dev_enabled)</div><div class='del'>-		return -ENETDOWN;</div><div class='del'>-</div><div class='del'>-	return prism2_request_hostscan(local-&gt;dev, param-&gt;u.scan_req.ssid,</div><div class='del'>-				       param-&gt;u.scan_req.ssid_len);</div><div class='del'>-#else /* PRISM2_NO_STATION_MODES */</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-#endif /* PRISM2_NO_STATION_MODES */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_ioctl_priv_hostapd(local_info_t *local, struct iw_point *p)</div><div class='del'>-{</div><div class='del'>-	struct prism2_hostapd_param *param;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int ap_ioctl = 0;</div><div class='del'>-</div><div class='del'>-	if (p-&gt;length &lt; sizeof(struct prism2_hostapd_param) ||</div><div class='del'>-	    p-&gt;length &gt; PRISM2_HOSTAPD_MAX_BUF_SIZE || !p-&gt;pointer)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	param = memdup_user(p-&gt;pointer, p-&gt;length);</div><div class='del'>-	if (IS_ERR(param)) {</div><div class='del'>-		return PTR_ERR(param);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (param-&gt;cmd) {</div><div class='del'>-	case PRISM2_SET_ENCRYPTION:</div><div class='del'>-		ret = prism2_ioctl_set_encryption(local, param, p-&gt;length);</div><div class='del'>-		break;</div><div class='del'>-	case PRISM2_GET_ENCRYPTION:</div><div class='del'>-		ret = prism2_ioctl_get_encryption(local, param, p-&gt;length);</div><div class='del'>-		break;</div><div class='del'>-	case PRISM2_HOSTAPD_GET_RID:</div><div class='del'>-		ret = prism2_ioctl_get_rid(local, param, p-&gt;length);</div><div class='del'>-		break;</div><div class='del'>-	case PRISM2_HOSTAPD_SET_RID:</div><div class='del'>-		ret = prism2_ioctl_set_rid(local, param, p-&gt;length);</div><div class='del'>-		break;</div><div class='del'>-	case PRISM2_HOSTAPD_SET_ASSOC_AP_ADDR:</div><div class='del'>-		ret = prism2_ioctl_set_assoc_ap_addr(local, param, p-&gt;length);</div><div class='del'>-		break;</div><div class='del'>-	case PRISM2_HOSTAPD_SET_GENERIC_ELEMENT:</div><div class='del'>-		ret = prism2_ioctl_set_generic_element(local, param,</div><div class='del'>-						       p-&gt;length);</div><div class='del'>-		break;</div><div class='del'>-	case PRISM2_HOSTAPD_MLME:</div><div class='del'>-		ret = prism2_ioctl_mlme(local, param);</div><div class='del'>-		break;</div><div class='del'>-	case PRISM2_HOSTAPD_SCAN_REQ:</div><div class='del'>-		ret = prism2_ioctl_scan_req(local, param);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = prism2_hostapd(local-&gt;ap, param);</div><div class='del'>-		ap_ioctl = 1;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret == 1 || !ap_ioctl) {</div><div class='del'>-		if (copy_to_user(p-&gt;pointer, param, p-&gt;length)) {</div><div class='del'>-			ret = -EFAULT;</div><div class='del'>-			goto out;</div><div class='del'>-		} else if (ap_ioctl)</div><div class='del'>-			ret = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	kfree(param);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void prism2_get_drvinfo(struct net_device *dev,</div><div class='del'>-			       struct ethtool_drvinfo *info)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	strlcpy(info-&gt;driver, "hostap", sizeof(info-&gt;driver));</div><div class='del'>-	snprintf(info-&gt;fw_version, sizeof(info-&gt;fw_version),</div><div class='del'>-		 "%d.%d.%d", (local-&gt;sta_fw_ver &gt;&gt; 16) &amp; 0xff,</div><div class='del'>-		 (local-&gt;sta_fw_ver &gt;&gt; 8) &amp; 0xff,</div><div class='del'>-		 local-&gt;sta_fw_ver &amp; 0xff);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct ethtool_ops prism2_ethtool_ops = {</div><div class='del'>-	.get_drvinfo = prism2_get_drvinfo</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Structures to export the Wireless Handlers */</div><div class='del'>-</div><div class='del'>-static const iw_handler prism2_handler[] =</div><div class='del'>-{</div><div class='del'>-	(iw_handler) NULL,				/* SIOCSIWCOMMIT */</div><div class='del'>-	(iw_handler) prism2_get_name,			/* SIOCGIWNAME */</div><div class='del'>-	(iw_handler) NULL,				/* SIOCSIWNWID */</div><div class='del'>-	(iw_handler) NULL,				/* SIOCGIWNWID */</div><div class='del'>-	(iw_handler) prism2_ioctl_siwfreq,		/* SIOCSIWFREQ */</div><div class='del'>-	(iw_handler) prism2_ioctl_giwfreq,		/* SIOCGIWFREQ */</div><div class='del'>-	(iw_handler) prism2_ioctl_siwmode,		/* SIOCSIWMODE */</div><div class='del'>-	(iw_handler) prism2_ioctl_giwmode,		/* SIOCGIWMODE */</div><div class='del'>-	(iw_handler) prism2_ioctl_siwsens,		/* SIOCSIWSENS */</div><div class='del'>-	(iw_handler) prism2_ioctl_giwsens,		/* SIOCGIWSENS */</div><div class='del'>-	(iw_handler) NULL /* not used */,		/* SIOCSIWRANGE */</div><div class='del'>-	(iw_handler) prism2_ioctl_giwrange,		/* SIOCGIWRANGE */</div><div class='del'>-	(iw_handler) NULL /* not used */,		/* SIOCSIWPRIV */</div><div class='del'>-	(iw_handler) NULL /* kernel code */,		/* SIOCGIWPRIV */</div><div class='del'>-	(iw_handler) NULL /* not used */,		/* SIOCSIWSTATS */</div><div class='del'>-	(iw_handler) NULL /* kernel code */,		/* SIOCGIWSTATS */</div><div class='del'>-	iw_handler_set_spy,				/* SIOCSIWSPY */</div><div class='del'>-	iw_handler_get_spy,				/* SIOCGIWSPY */</div><div class='del'>-	iw_handler_set_thrspy,				/* SIOCSIWTHRSPY */</div><div class='del'>-	iw_handler_get_thrspy,				/* SIOCGIWTHRSPY */</div><div class='del'>-	(iw_handler) prism2_ioctl_siwap,		/* SIOCSIWAP */</div><div class='del'>-	(iw_handler) prism2_ioctl_giwap,		/* SIOCGIWAP */</div><div class='del'>-	(iw_handler) prism2_ioctl_siwmlme,		/* SIOCSIWMLME */</div><div class='del'>-	(iw_handler) prism2_ioctl_giwaplist,		/* SIOCGIWAPLIST */</div><div class='del'>-	(iw_handler) prism2_ioctl_siwscan,		/* SIOCSIWSCAN */</div><div class='del'>-	(iw_handler) prism2_ioctl_giwscan,		/* SIOCGIWSCAN */</div><div class='del'>-	(iw_handler) prism2_ioctl_siwessid,		/* SIOCSIWESSID */</div><div class='del'>-	(iw_handler) prism2_ioctl_giwessid,		/* SIOCGIWESSID */</div><div class='del'>-	(iw_handler) prism2_ioctl_siwnickn,		/* SIOCSIWNICKN */</div><div class='del'>-	(iw_handler) prism2_ioctl_giwnickn,		/* SIOCGIWNICKN */</div><div class='del'>-	(iw_handler) NULL,				/* -- hole -- */</div><div class='del'>-	(iw_handler) NULL,				/* -- hole -- */</div><div class='del'>-	(iw_handler) prism2_ioctl_siwrate,		/* SIOCSIWRATE */</div><div class='del'>-	(iw_handler) prism2_ioctl_giwrate,		/* SIOCGIWRATE */</div><div class='del'>-	(iw_handler) prism2_ioctl_siwrts,		/* SIOCSIWRTS */</div><div class='del'>-	(iw_handler) prism2_ioctl_giwrts,		/* SIOCGIWRTS */</div><div class='del'>-	(iw_handler) prism2_ioctl_siwfrag,		/* SIOCSIWFRAG */</div><div class='del'>-	(iw_handler) prism2_ioctl_giwfrag,		/* SIOCGIWFRAG */</div><div class='del'>-	(iw_handler) prism2_ioctl_siwtxpow,		/* SIOCSIWTXPOW */</div><div class='del'>-	(iw_handler) prism2_ioctl_giwtxpow,		/* SIOCGIWTXPOW */</div><div class='del'>-	(iw_handler) prism2_ioctl_siwretry,		/* SIOCSIWRETRY */</div><div class='del'>-	(iw_handler) prism2_ioctl_giwretry,		/* SIOCGIWRETRY */</div><div class='del'>-	(iw_handler) prism2_ioctl_siwencode,		/* SIOCSIWENCODE */</div><div class='del'>-	(iw_handler) prism2_ioctl_giwencode,		/* SIOCGIWENCODE */</div><div class='del'>-	(iw_handler) prism2_ioctl_siwpower,		/* SIOCSIWPOWER */</div><div class='del'>-	(iw_handler) prism2_ioctl_giwpower,		/* SIOCGIWPOWER */</div><div class='del'>-	(iw_handler) NULL,				/* -- hole -- */</div><div class='del'>-	(iw_handler) NULL,				/* -- hole -- */</div><div class='del'>-	(iw_handler) prism2_ioctl_siwgenie,		/* SIOCSIWGENIE */</div><div class='del'>-	(iw_handler) prism2_ioctl_giwgenie,		/* SIOCGIWGENIE */</div><div class='del'>-	(iw_handler) prism2_ioctl_siwauth,		/* SIOCSIWAUTH */</div><div class='del'>-	(iw_handler) prism2_ioctl_giwauth,		/* SIOCGIWAUTH */</div><div class='del'>-	(iw_handler) prism2_ioctl_siwencodeext,		/* SIOCSIWENCODEEXT */</div><div class='del'>-	(iw_handler) prism2_ioctl_giwencodeext,		/* SIOCGIWENCODEEXT */</div><div class='del'>-	(iw_handler) NULL,				/* SIOCSIWPMKSA */</div><div class='del'>-	(iw_handler) NULL,				/* -- hole -- */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const iw_handler prism2_private_handler[] =</div><div class='del'>-{							/* SIOCIWFIRSTPRIV + */</div><div class='del'>-	(iw_handler) prism2_ioctl_priv_prism2_param,	/* 0 */</div><div class='del'>-	(iw_handler) prism2_ioctl_priv_get_prism2_param, /* 1 */</div><div class='del'>-	(iw_handler) prism2_ioctl_priv_writemif,	/* 2 */</div><div class='del'>-	(iw_handler) prism2_ioctl_priv_readmif,		/* 3 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iw_handler_def hostap_iw_handler_def =</div><div class='del'>-{</div><div class='del'>-	.num_standard	= ARRAY_SIZE(prism2_handler),</div><div class='del'>-	.num_private	= ARRAY_SIZE(prism2_private_handler),</div><div class='del'>-	.num_private_args = ARRAY_SIZE(prism2_priv),</div><div class='del'>-	.standard	= (iw_handler *) prism2_handler,</div><div class='del'>-	.private	= (iw_handler *) prism2_private_handler,</div><div class='del'>-	.private_args	= (struct iw_priv_args *) prism2_priv,</div><div class='del'>-	.get_wireless_stats = hostap_get_wireless_stats,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='del'>-{</div><div class='del'>-	struct iwreq *wrq = (struct iwreq *) ifr;</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-		/* Private ioctls (iwpriv) that have not yet been converted</div><div class='del'>-		 * into new wireless extensions API */</div><div class='del'>-</div><div class='del'>-	case PRISM2_IOCTL_INQUIRE:</div><div class='del'>-		if (!capable(CAP_NET_ADMIN)) ret = -EPERM;</div><div class='del'>-		else ret = prism2_ioctl_priv_inquire(dev, (int *) wrq-&gt;u.name);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_IOCTL_MONITOR:</div><div class='del'>-		if (!capable(CAP_NET_ADMIN)) ret = -EPERM;</div><div class='del'>-		else ret = prism2_ioctl_priv_monitor(dev, (int *) wrq-&gt;u.name);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_IOCTL_RESET:</div><div class='del'>-		if (!capable(CAP_NET_ADMIN)) ret = -EPERM;</div><div class='del'>-		else ret = prism2_ioctl_priv_reset(dev, (int *) wrq-&gt;u.name);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_IOCTL_WDS_ADD:</div><div class='del'>-		if (!capable(CAP_NET_ADMIN)) ret = -EPERM;</div><div class='del'>-		else ret = prism2_wds_add(local, wrq-&gt;u.ap_addr.sa_data, 1);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_IOCTL_WDS_DEL:</div><div class='del'>-		if (!capable(CAP_NET_ADMIN)) ret = -EPERM;</div><div class='del'>-		else ret = prism2_wds_del(local, wrq-&gt;u.ap_addr.sa_data, 1, 0);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_IOCTL_SET_RID_WORD:</div><div class='del'>-		if (!capable(CAP_NET_ADMIN)) ret = -EPERM;</div><div class='del'>-		else ret = prism2_ioctl_priv_set_rid_word(dev,</div><div class='del'>-							  (int *) wrq-&gt;u.name);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-	case PRISM2_IOCTL_MACCMD:</div><div class='del'>-		if (!capable(CAP_NET_ADMIN)) ret = -EPERM;</div><div class='del'>-		else ret = ap_mac_cmd_ioctl(local, (int *) wrq-&gt;u.name);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRISM2_IOCTL_ADDMAC:</div><div class='del'>-		if (!capable(CAP_NET_ADMIN)) ret = -EPERM;</div><div class='del'>-		else ret = ap_control_add_mac(&amp;local-&gt;ap-&gt;mac_restrictions,</div><div class='del'>-					      wrq-&gt;u.ap_addr.sa_data);</div><div class='del'>-		break;</div><div class='del'>-	case PRISM2_IOCTL_DELMAC:</div><div class='del'>-		if (!capable(CAP_NET_ADMIN)) ret = -EPERM;</div><div class='del'>-		else ret = ap_control_del_mac(&amp;local-&gt;ap-&gt;mac_restrictions,</div><div class='del'>-					      wrq-&gt;u.ap_addr.sa_data);</div><div class='del'>-		break;</div><div class='del'>-	case PRISM2_IOCTL_KICKMAC:</div><div class='del'>-		if (!capable(CAP_NET_ADMIN)) ret = -EPERM;</div><div class='del'>-		else ret = ap_control_kick_mac(local-&gt;ap, local-&gt;dev,</div><div class='del'>-					       wrq-&gt;u.ap_addr.sa_data);</div><div class='del'>-		break;</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		/* Private ioctls that are not used with iwpriv;</div><div class='del'>-		 * in SIOCDEVPRIVATE range */</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_DOWNLOAD_SUPPORT</div><div class='del'>-	case PRISM2_IOCTL_DOWNLOAD:</div><div class='del'>-		if (!capable(CAP_NET_ADMIN)) ret = -EPERM;</div><div class='del'>-		else ret = prism2_ioctl_priv_download(local, &amp;wrq-&gt;u.data);</div><div class='del'>-		break;</div><div class='del'>-#endif /* PRISM2_DOWNLOAD_SUPPORT */</div><div class='del'>-</div><div class='del'>-	case PRISM2_IOCTL_HOSTAPD:</div><div class='del'>-		if (!capable(CAP_NET_ADMIN)) ret = -EPERM;</div><div class='del'>-		else ret = prism2_ioctl_priv_hostapd(local, &amp;wrq-&gt;u.data);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/intersil/hostap/hostap_main.c b/drivers/net/wireless/intersil/hostap/hostap_main.c<br/>deleted file mode 100644<br/>index de97b3304115..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/hostap/hostap_main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_main.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1123 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-/*</div><div class='del'>- * Host AP (software wireless LAN access point) driver for</div><div class='del'>- * Intersil Prism2/2.5/3 - hostap.o module, common routines</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen</div><div class='del'>- * &lt;j@w1.fi&gt;</div><div class='del'>- * Copyright (c) 2002-2005, Jouni Malinen &lt;j@w1.fi&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;linux/kmod.h&gt;</div><div class='del'>-#include &lt;linux/rtnetlink.h&gt;</div><div class='del'>-#include &lt;linux/wireless.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;net/net_namespace.h&gt;</div><div class='del'>-#include &lt;net/iw_handler.h&gt;</div><div class='del'>-#include &lt;net/lib80211.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hostap_wlan.h"</div><div class='del'>-#include "hostap_80211.h"</div><div class='del'>-#include "hostap_ap.h"</div><div class='del'>-#include "hostap.h"</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Jouni Malinen");</div><div class='del'>-MODULE_DESCRIPTION("Host AP common routines");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-#define TX_TIMEOUT (2 * HZ)</div><div class='del'>-</div><div class='del'>-#define PRISM2_MAX_FRAME_SIZE 2304</div><div class='del'>-#define PRISM2_MIN_MTU 256</div><div class='del'>-/* FIX: */</div><div class='del'>-#define PRISM2_MAX_MTU (PRISM2_MAX_FRAME_SIZE - (6 /* LLC */ + 8 /* WEP */))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct net_device * hostap_add_interface(struct local_info *local,</div><div class='del'>-					 int type, int rtnl_locked,</div><div class='del'>-					 const char *prefix,</div><div class='del'>-					 const char *name)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev, *mdev;</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	dev = alloc_etherdev(sizeof(struct hostap_interface));</div><div class='del'>-	if (dev == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	iface-&gt;dev = dev;</div><div class='del'>-	iface-&gt;local = local;</div><div class='del'>-	iface-&gt;type = type;</div><div class='del'>-	list_add(&amp;iface-&gt;list, &amp;local-&gt;hostap_interfaces);</div><div class='del'>-</div><div class='del'>-	mdev = local-&gt;dev;</div><div class='del'>-	eth_hw_addr_inherit(dev, mdev);</div><div class='del'>-	dev-&gt;base_addr = mdev-&gt;base_addr;</div><div class='del'>-	dev-&gt;irq = mdev-&gt;irq;</div><div class='del'>-	dev-&gt;mem_start = mdev-&gt;mem_start;</div><div class='del'>-	dev-&gt;mem_end = mdev-&gt;mem_end;</div><div class='del'>-</div><div class='del'>-	hostap_setup_dev(dev, local, type);</div><div class='del'>-	dev-&gt;needs_free_netdev = true;</div><div class='del'>-</div><div class='del'>-	sprintf(dev-&gt;name, "%s%s", prefix, name);</div><div class='del'>-	if (!rtnl_locked)</div><div class='del'>-		rtnl_lock();</div><div class='del'>-</div><div class='del'>-	SET_NETDEV_DEV(dev, mdev-&gt;dev.parent);</div><div class='del'>-	ret = register_netdevice(dev);</div><div class='del'>-</div><div class='del'>-	if (!rtnl_locked)</div><div class='del'>-		rtnl_unlock();</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		printk(KERN_WARNING "%s: failed to add new netdevice!\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		free_netdev(dev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: registered netdevice %s\n",</div><div class='del'>-	       mdev-&gt;name, dev-&gt;name);</div><div class='del'>-</div><div class='del'>-	return dev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void hostap_remove_interface(struct net_device *dev, int rtnl_locked,</div><div class='del'>-			     int remove_from_list)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-</div><div class='del'>-	if (!dev)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (remove_from_list) {</div><div class='del'>-		list_del(&amp;iface-&gt;list);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dev == iface-&gt;local-&gt;ddev)</div><div class='del'>-		iface-&gt;local-&gt;ddev = NULL;</div><div class='del'>-	else if (dev == iface-&gt;local-&gt;apdev)</div><div class='del'>-		iface-&gt;local-&gt;apdev = NULL;</div><div class='del'>-	else if (dev == iface-&gt;local-&gt;stadev)</div><div class='del'>-		iface-&gt;local-&gt;stadev = NULL;</div><div class='del'>-</div><div class='del'>-	if (rtnl_locked)</div><div class='del'>-		unregister_netdevice(dev);</div><div class='del'>-	else</div><div class='del'>-		unregister_netdev(dev);</div><div class='del'>-</div><div class='del'>-	/* 'dev-&gt;needs_free_netdev = true' implies device data, including</div><div class='del'>-	 * private data, will be freed when the device is removed */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline int prism2_wds_special_addr(u8 *addr)</div><div class='del'>-{</div><div class='del'>-	if (addr[0] || addr[1] || addr[2] || addr[3] || addr[4] || addr[5])</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int prism2_wds_add(local_info_t *local, u8 *remote_addr,</div><div class='del'>-		   int rtnl_locked)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct list_head *ptr;</div><div class='del'>-	struct hostap_interface *iface, *empty, *match;</div><div class='del'>-</div><div class='del'>-	empty = match = NULL;</div><div class='del'>-	read_lock_bh(&amp;local-&gt;iface_lock);</div><div class='del'>-	list_for_each(ptr, &amp;local-&gt;hostap_interfaces) {</div><div class='del'>-		iface = list_entry(ptr, struct hostap_interface, list);</div><div class='del'>-		if (iface-&gt;type != HOSTAP_INTERFACE_WDS)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (prism2_wds_special_addr(iface-&gt;u.wds.remote_addr))</div><div class='del'>-			empty = iface;</div><div class='del'>-		else if (ether_addr_equal(iface-&gt;u.wds.remote_addr, remote_addr)) {</div><div class='del'>-			match = iface;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!match &amp;&amp; empty &amp;&amp; !prism2_wds_special_addr(remote_addr)) {</div><div class='del'>-		/* take pre-allocated entry into use */</div><div class='del'>-		memcpy(empty-&gt;u.wds.remote_addr, remote_addr, ETH_ALEN);</div><div class='del'>-		read_unlock_bh(&amp;local-&gt;iface_lock);</div><div class='del'>-		printk(KERN_DEBUG "%s: using pre-allocated WDS netdevice %s\n",</div><div class='del'>-		       local-&gt;dev-&gt;name, empty-&gt;dev-&gt;name);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	read_unlock_bh(&amp;local-&gt;iface_lock);</div><div class='del'>-</div><div class='del'>-	if (!prism2_wds_special_addr(remote_addr)) {</div><div class='del'>-		if (match)</div><div class='del'>-			return -EEXIST;</div><div class='del'>-		hostap_add_sta(local-&gt;ap, remote_addr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;wds_connections &gt;= local-&gt;wds_max_connections)</div><div class='del'>-		return -ENOBUFS;</div><div class='del'>-</div><div class='del'>-	/* verify that there is room for wds# postfix in the interface name */</div><div class='del'>-	if (strlen(local-&gt;dev-&gt;name) &gt;= IFNAMSIZ - 5) {</div><div class='del'>-		printk(KERN_DEBUG "'%s' too long base device name\n",</div><div class='del'>-		       local-&gt;dev-&gt;name);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev = hostap_add_interface(local, HOSTAP_INTERFACE_WDS, rtnl_locked,</div><div class='del'>-				   local-&gt;ddev-&gt;name, "wds%d");</div><div class='del'>-	if (dev == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	memcpy(iface-&gt;u.wds.remote_addr, remote_addr, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	local-&gt;wds_connections++;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int prism2_wds_del(local_info_t *local, u8 *remote_addr,</div><div class='del'>-		   int rtnl_locked, int do_not_remove)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct list_head *ptr;</div><div class='del'>-	struct hostap_interface *iface, *selected = NULL;</div><div class='del'>-</div><div class='del'>-	write_lock_irqsave(&amp;local-&gt;iface_lock, flags);</div><div class='del'>-	list_for_each(ptr, &amp;local-&gt;hostap_interfaces) {</div><div class='del'>-		iface = list_entry(ptr, struct hostap_interface, list);</div><div class='del'>-		if (iface-&gt;type != HOSTAP_INTERFACE_WDS)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (ether_addr_equal(iface-&gt;u.wds.remote_addr, remote_addr)) {</div><div class='del'>-			selected = iface;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (selected &amp;&amp; !do_not_remove)</div><div class='del'>-		list_del(&amp;selected-&gt;list);</div><div class='del'>-	write_unlock_irqrestore(&amp;local-&gt;iface_lock, flags);</div><div class='del'>-</div><div class='del'>-	if (selected) {</div><div class='del'>-		if (do_not_remove)</div><div class='del'>-			eth_zero_addr(selected-&gt;u.wds.remote_addr);</div><div class='del'>-		else {</div><div class='del'>-			hostap_remove_interface(selected-&gt;dev, rtnl_locked, 0);</div><div class='del'>-			local-&gt;wds_connections--;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return selected ? 0 : -ENODEV;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-u16 hostap_tx_callback_register(local_info_t *local,</div><div class='del'>-				void (*func)(struct sk_buff *, int ok, void *),</div><div class='del'>-				void *data)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct hostap_tx_callback_info *entry;</div><div class='del'>-</div><div class='del'>-	entry = kmalloc(sizeof(*entry), GFP_KERNEL);</div><div class='del'>-	if (entry == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	entry-&gt;func = func;</div><div class='del'>-	entry-&gt;data = data;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	entry-&gt;idx = local-&gt;tx_callback ? local-&gt;tx_callback-&gt;idx + 1 : 1;</div><div class='del'>-	entry-&gt;next = local-&gt;tx_callback;</div><div class='del'>-	local-&gt;tx_callback = entry;</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	return entry-&gt;idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int hostap_tx_callback_unregister(local_info_t *local, u16 idx)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct hostap_tx_callback_info *cb, *prev = NULL;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	cb = local-&gt;tx_callback;</div><div class='del'>-	while (cb != NULL &amp;&amp; cb-&gt;idx != idx) {</div><div class='del'>-		prev = cb;</div><div class='del'>-		cb = cb-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	if (cb) {</div><div class='del'>-		if (prev == NULL)</div><div class='del'>-			local-&gt;tx_callback = cb-&gt;next;</div><div class='del'>-		else</div><div class='del'>-			prev-&gt;next = cb-&gt;next;</div><div class='del'>-		kfree(cb);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	return cb ? 0 : -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* val is in host byte order */</div><div class='del'>-int hostap_set_word(struct net_device *dev, int rid, u16 val)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	__le16 tmp = cpu_to_le16(val);</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	return iface-&gt;local-&gt;func-&gt;set_rid(dev, rid, &amp;tmp, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int hostap_set_string(struct net_device *dev, int rid, const char *val)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	char buf[MAX_SSID_LEN + 2];</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	len = strlen(val);</div><div class='del'>-	if (len &gt; MAX_SSID_LEN)</div><div class='del'>-		return -1;</div><div class='del'>-	memset(buf, 0, sizeof(buf));</div><div class='del'>-	buf[0] = len; /* little endian 16 bit word */</div><div class='del'>-	memcpy(buf + 2, val, len);</div><div class='del'>-</div><div class='del'>-	return iface-&gt;local-&gt;func-&gt;set_rid(dev, rid, &amp;buf, MAX_SSID_LEN + 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-u16 hostap_get_porttype(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	if (local-&gt;iw_mode == IW_MODE_ADHOC &amp;&amp; local-&gt;pseudo_adhoc)</div><div class='del'>-		return HFA384X_PORTTYPE_PSEUDO_IBSS;</div><div class='del'>-	if (local-&gt;iw_mode == IW_MODE_ADHOC)</div><div class='del'>-		return HFA384X_PORTTYPE_IBSS;</div><div class='del'>-	if (local-&gt;iw_mode == IW_MODE_INFRA)</div><div class='del'>-		return HFA384X_PORTTYPE_BSS;</div><div class='del'>-	if (local-&gt;iw_mode == IW_MODE_REPEAT)</div><div class='del'>-		return HFA384X_PORTTYPE_WDS;</div><div class='del'>-	if (local-&gt;iw_mode == IW_MODE_MONITOR)</div><div class='del'>-		return HFA384X_PORTTYPE_PSEUDO_IBSS;</div><div class='del'>-	return HFA384X_PORTTYPE_HOSTAP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int hostap_set_encryption(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	u16 val, old_val;</div><div class='del'>-	int i, keylen, len, idx;</div><div class='del'>-	char keybuf[WEP_KEY_LEN + 1];</div><div class='del'>-	enum { NONE, WEP, OTHER } encrypt_type;</div><div class='del'>-</div><div class='del'>-	idx = local-&gt;crypt_info.tx_keyidx;</div><div class='del'>-	if (local-&gt;crypt_info.crypt[idx] == NULL ||</div><div class='del'>-	    local-&gt;crypt_info.crypt[idx]-&gt;ops == NULL)</div><div class='del'>-		encrypt_type = NONE;</div><div class='del'>-	else if (strcmp(local-&gt;crypt_info.crypt[idx]-&gt;ops-&gt;name, "WEP") == 0)</div><div class='del'>-		encrypt_type = WEP;</div><div class='del'>-	else</div><div class='del'>-		encrypt_type = OTHER;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;get_rid(local-&gt;dev, HFA384X_RID_CNFWEPFLAGS, &amp;val, 2,</div><div class='del'>-				 1) &lt; 0) {</div><div class='del'>-		printk(KERN_DEBUG "Could not read current WEP flags.\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-	le16_to_cpus(&amp;val);</div><div class='del'>-	old_val = val;</div><div class='del'>-</div><div class='del'>-	if (encrypt_type != NONE || local-&gt;privacy_invoked)</div><div class='del'>-		val |= HFA384X_WEPFLAGS_PRIVACYINVOKED;</div><div class='del'>-	else</div><div class='del'>-		val &amp;= ~HFA384X_WEPFLAGS_PRIVACYINVOKED;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;open_wep || encrypt_type == NONE ||</div><div class='del'>-	    ((local-&gt;ieee_802_1x || local-&gt;wpa) &amp;&amp; local-&gt;host_decrypt))</div><div class='del'>-		val &amp;= ~HFA384X_WEPFLAGS_EXCLUDEUNENCRYPTED;</div><div class='del'>-	else</div><div class='del'>-		val |= HFA384X_WEPFLAGS_EXCLUDEUNENCRYPTED;</div><div class='del'>-</div><div class='del'>-	if ((encrypt_type != NONE || local-&gt;privacy_invoked) &amp;&amp;</div><div class='del'>-	    (encrypt_type == OTHER || local-&gt;host_encrypt))</div><div class='del'>-		val |= HFA384X_WEPFLAGS_HOSTENCRYPT;</div><div class='del'>-	else</div><div class='del'>-		val &amp;= ~HFA384X_WEPFLAGS_HOSTENCRYPT;</div><div class='del'>-	if ((encrypt_type != NONE || local-&gt;privacy_invoked) &amp;&amp;</div><div class='del'>-	    (encrypt_type == OTHER || local-&gt;host_decrypt))</div><div class='del'>-		val |= HFA384X_WEPFLAGS_HOSTDECRYPT;</div><div class='del'>-	else</div><div class='del'>-		val &amp;= ~HFA384X_WEPFLAGS_HOSTDECRYPT;</div><div class='del'>-</div><div class='del'>-	if (val != old_val &amp;&amp;</div><div class='del'>-	    hostap_set_word(local-&gt;dev, HFA384X_RID_CNFWEPFLAGS, val)) {</div><div class='del'>-		printk(KERN_DEBUG "Could not write new WEP flags (0x%x)\n",</div><div class='del'>-		       val);</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (encrypt_type != WEP)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* 104-bit support seems to require that all the keys are set to the</div><div class='del'>-	 * same keylen */</div><div class='del'>-	keylen = 6; /* first 5 octets */</div><div class='del'>-	len = local-&gt;crypt_info.crypt[idx]-&gt;ops-&gt;get_key(keybuf, sizeof(keybuf), NULL,</div><div class='del'>-							   local-&gt;crypt_info.crypt[idx]-&gt;priv);</div><div class='del'>-	if (idx &gt;= 0 &amp;&amp; idx &lt; WEP_KEYS &amp;&amp; len &gt; 5)</div><div class='del'>-		keylen = WEP_KEY_LEN + 1; /* first 13 octets */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; WEP_KEYS; i++) {</div><div class='del'>-		memset(keybuf, 0, sizeof(keybuf));</div><div class='del'>-		if (local-&gt;crypt_info.crypt[i]) {</div><div class='del'>-			(void) local-&gt;crypt_info.crypt[i]-&gt;ops-&gt;get_key(</div><div class='del'>-				keybuf, sizeof(keybuf),</div><div class='del'>-				NULL, local-&gt;crypt_info.crypt[i]-&gt;priv);</div><div class='del'>-		}</div><div class='del'>-		if (local-&gt;func-&gt;set_rid(local-&gt;dev,</div><div class='del'>-					 HFA384X_RID_CNFDEFAULTKEY0 + i,</div><div class='del'>-					 keybuf, keylen)) {</div><div class='del'>-			printk(KERN_DEBUG "Could not set key %d (len=%d)\n",</div><div class='del'>-			       i, keylen);</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (hostap_set_word(local-&gt;dev, HFA384X_RID_CNFWEPDEFAULTKEYID, idx)) {</div><div class='del'>-		printk(KERN_DEBUG "Could not set default keyid %d\n", idx);</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- fail:</div><div class='del'>-	printk(KERN_DEBUG "%s: encryption setup failed\n", local-&gt;dev-&gt;name);</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int hostap_set_antsel(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	u16 val;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;antsel_tx != HOSTAP_ANTSEL_DO_NOT_TOUCH &amp;&amp;</div><div class='del'>-	    local-&gt;func-&gt;cmd(local-&gt;dev, HFA384X_CMDCODE_READMIF,</div><div class='del'>-			     HFA386X_CR_TX_CONFIGURE,</div><div class='del'>-			     NULL, &amp;val) == 0) {</div><div class='del'>-		val &amp;= ~(BIT(2) | BIT(1));</div><div class='del'>-		switch (local-&gt;antsel_tx) {</div><div class='del'>-		case HOSTAP_ANTSEL_DIVERSITY:</div><div class='del'>-			val |= BIT(1);</div><div class='del'>-			break;</div><div class='del'>-		case HOSTAP_ANTSEL_LOW:</div><div class='del'>-			break;</div><div class='del'>-		case HOSTAP_ANTSEL_HIGH:</div><div class='del'>-			val |= BIT(2);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (local-&gt;func-&gt;cmd(local-&gt;dev, HFA384X_CMDCODE_WRITEMIF,</div><div class='del'>-				     HFA386X_CR_TX_CONFIGURE, &amp;val, NULL)) {</div><div class='del'>-			printk(KERN_INFO "%s: setting TX AntSel failed\n",</div><div class='del'>-			       local-&gt;dev-&gt;name);</div><div class='del'>-			ret = -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;antsel_rx != HOSTAP_ANTSEL_DO_NOT_TOUCH &amp;&amp;</div><div class='del'>-	    local-&gt;func-&gt;cmd(local-&gt;dev, HFA384X_CMDCODE_READMIF,</div><div class='del'>-			     HFA386X_CR_RX_CONFIGURE,</div><div class='del'>-			     NULL, &amp;val) == 0) {</div><div class='del'>-		val &amp;= ~(BIT(1) | BIT(0));</div><div class='del'>-		switch (local-&gt;antsel_rx) {</div><div class='del'>-		case HOSTAP_ANTSEL_DIVERSITY:</div><div class='del'>-			break;</div><div class='del'>-		case HOSTAP_ANTSEL_LOW:</div><div class='del'>-			val |= BIT(0);</div><div class='del'>-			break;</div><div class='del'>-		case HOSTAP_ANTSEL_HIGH:</div><div class='del'>-			val |= BIT(0) | BIT(1);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (local-&gt;func-&gt;cmd(local-&gt;dev, HFA384X_CMDCODE_WRITEMIF,</div><div class='del'>-				     HFA386X_CR_RX_CONFIGURE, &amp;val, NULL)) {</div><div class='del'>-			printk(KERN_INFO "%s: setting RX AntSel failed\n",</div><div class='del'>-			       local-&gt;dev-&gt;name);</div><div class='del'>-			ret = -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int hostap_set_roaming(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	u16 val;</div><div class='del'>-</div><div class='del'>-	switch (local-&gt;host_roaming) {</div><div class='del'>-	case 1:</div><div class='del'>-		val = HFA384X_ROAMING_HOST;</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		val = HFA384X_ROAMING_DISABLED;</div><div class='del'>-		break;</div><div class='del'>-	case 0:</div><div class='del'>-	default:</div><div class='del'>-		val = HFA384X_ROAMING_FIRMWARE;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return hostap_set_word(local-&gt;dev, HFA384X_RID_CNFROAMINGMODE, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int hostap_set_auth_algs(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	int val = local-&gt;auth_algs;</div><div class='del'>-	/* At least STA f/w v0.6.2 seems to have issues with cnfAuthentication</div><div class='del'>-	 * set to include both Open and Shared Key flags. It tries to use</div><div class='del'>-	 * Shared Key authentication in that case even if WEP keys are not</div><div class='del'>-	 * configured.. STA f/w v0.7.6 is able to handle such configuration,</div><div class='del'>-	 * but it is unknown when this was fixed between 0.6.2 .. 0.7.6. */</div><div class='del'>-	if (local-&gt;sta_fw_ver &lt; PRISM2_FW_VER(0,7,0) &amp;&amp;</div><div class='del'>-	    val != PRISM2_AUTH_OPEN &amp;&amp; val != PRISM2_AUTH_SHARED_KEY)</div><div class='del'>-		val = PRISM2_AUTH_OPEN;</div><div class='del'>-</div><div class='del'>-	if (hostap_set_word(local-&gt;dev, HFA384X_RID_CNFAUTHENTICATION, val)) {</div><div class='del'>-		printk(KERN_INFO "%s: cnfAuthentication setting to 0x%x "</div><div class='del'>-		       "failed\n", local-&gt;dev-&gt;name, local-&gt;auth_algs);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void hostap_dump_rx_header(const char *name, const struct hfa384x_rx_frame *rx)</div><div class='del'>-{</div><div class='del'>-	u16 status, fc;</div><div class='del'>-</div><div class='del'>-	status = __le16_to_cpu(rx-&gt;status);</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: RX status=0x%04x (port=%d, type=%d, "</div><div class='del'>-	       "fcserr=%d) silence=%d signal=%d rate=%d rxflow=%d; "</div><div class='del'>-	       "jiffies=%ld\n",</div><div class='del'>-	       name, status, (status &gt;&gt; 8) &amp; 0x07, status &gt;&gt; 13, status &amp; 1,</div><div class='del'>-	       rx-&gt;silence, rx-&gt;signal, rx-&gt;rate, rx-&gt;rxflow, jiffies);</div><div class='del'>-</div><div class='del'>-	fc = __le16_to_cpu(rx-&gt;frame_control);</div><div class='del'>-	printk(KERN_DEBUG "   FC=0x%04x (type=%d:%d) dur=0x%04x seq=0x%04x "</div><div class='del'>-	       "data_len=%d%s%s\n",</div><div class='del'>-	       fc, (fc &amp; IEEE80211_FCTL_FTYPE) &gt;&gt; 2,</div><div class='del'>-	       (fc &amp; IEEE80211_FCTL_STYPE) &gt;&gt; 4,</div><div class='del'>-	       __le16_to_cpu(rx-&gt;duration_id), __le16_to_cpu(rx-&gt;seq_ctrl),</div><div class='del'>-	       __le16_to_cpu(rx-&gt;data_len),</div><div class='del'>-	       fc &amp; IEEE80211_FCTL_TODS ? " [ToDS]" : "",</div><div class='del'>-	       fc &amp; IEEE80211_FCTL_FROMDS ? " [FromDS]" : "");</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "   A1=%pM A2=%pM A3=%pM A4=%pM\n",</div><div class='del'>-	       rx-&gt;addr1, rx-&gt;addr2, rx-&gt;addr3, rx-&gt;addr4);</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "   dst=%pM src=%pM len=%d\n",</div><div class='del'>-	       rx-&gt;dst_addr, rx-&gt;src_addr,</div><div class='del'>-	       __be16_to_cpu(rx-&gt;len));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void hostap_dump_tx_header(const char *name, const struct hfa384x_tx_frame *tx)</div><div class='del'>-{</div><div class='del'>-	u16 fc;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: TX status=0x%04x retry_count=%d tx_rate=%d "</div><div class='del'>-	       "tx_control=0x%04x; jiffies=%ld\n",</div><div class='del'>-	       name, __le16_to_cpu(tx-&gt;status), tx-&gt;retry_count, tx-&gt;tx_rate,</div><div class='del'>-	       __le16_to_cpu(tx-&gt;tx_control), jiffies);</div><div class='del'>-</div><div class='del'>-	fc = __le16_to_cpu(tx-&gt;frame_control);</div><div class='del'>-	printk(KERN_DEBUG "   FC=0x%04x (type=%d:%d) dur=0x%04x seq=0x%04x "</div><div class='del'>-	       "data_len=%d%s%s\n",</div><div class='del'>-	       fc, (fc &amp; IEEE80211_FCTL_FTYPE) &gt;&gt; 2,</div><div class='del'>-	       (fc &amp; IEEE80211_FCTL_STYPE) &gt;&gt; 4,</div><div class='del'>-	       __le16_to_cpu(tx-&gt;duration_id), __le16_to_cpu(tx-&gt;seq_ctrl),</div><div class='del'>-	       __le16_to_cpu(tx-&gt;data_len),</div><div class='del'>-	       fc &amp; IEEE80211_FCTL_TODS ? " [ToDS]" : "",</div><div class='del'>-	       fc &amp; IEEE80211_FCTL_FROMDS ? " [FromDS]" : "");</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "   A1=%pM A2=%pM A3=%pM A4=%pM\n",</div><div class='del'>-	       tx-&gt;addr1, tx-&gt;addr2, tx-&gt;addr3, tx-&gt;addr4);</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "   dst=%pM src=%pM len=%d\n",</div><div class='del'>-	       tx-&gt;dst_addr, tx-&gt;src_addr,</div><div class='del'>-	       __be16_to_cpu(tx-&gt;len));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int hostap_80211_header_parse(const struct sk_buff *skb,</div><div class='del'>-				     unsigned char *haddr)</div><div class='del'>-{</div><div class='del'>-	memcpy(haddr, skb_mac_header(skb) + 10, ETH_ALEN); /* addr2 */</div><div class='del'>-	return ETH_ALEN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int hostap_80211_get_hdrlen(__le16 fc)</div><div class='del'>-{</div><div class='del'>-	if (ieee80211_is_data(fc) &amp;&amp; ieee80211_has_a4 (fc))</div><div class='del'>-		return 30; /* Addr4 */</div><div class='del'>-	else if (ieee80211_is_cts(fc) || ieee80211_is_ack(fc))</div><div class='del'>-		return 10;</div><div class='del'>-	else if (ieee80211_is_ctl(fc))</div><div class='del'>-		return 16;</div><div class='del'>-</div><div class='del'>-	return 24;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_close(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_FLOW, "%s: prism2_close\n", dev-&gt;name);</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (dev == local-&gt;ddev) {</div><div class='del'>-		prism2_sta_deauth(local, WLAN_REASON_DEAUTH_LEAVING);</div><div class='del'>-	}</div><div class='del'>-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-	if (!local-&gt;hostapd &amp;&amp; dev == local-&gt;dev &amp;&amp;</div><div class='del'>-	    (!local-&gt;func-&gt;card_present || local-&gt;func-&gt;card_present(local)) &amp;&amp;</div><div class='del'>-	    local-&gt;hw_ready &amp;&amp; local-&gt;ap &amp;&amp; local-&gt;iw_mode == IW_MODE_MASTER)</div><div class='del'>-		hostap_deauth_all_stas(dev, local-&gt;ap, 1);</div><div class='del'>-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='del'>-</div><div class='del'>-	if (dev == local-&gt;dev) {</div><div class='del'>-		local-&gt;func-&gt;hw_shutdown(dev, HOSTAP_HW_ENABLE_CMDCOMPL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (netif_running(dev)) {</div><div class='del'>-		netif_stop_queue(dev);</div><div class='del'>-		netif_device_detach(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cancel_work_sync(&amp;local-&gt;reset_queue);</div><div class='del'>-	cancel_work_sync(&amp;local-&gt;set_multicast_list_queue);</div><div class='del'>-	cancel_work_sync(&amp;local-&gt;set_tim_queue);</div><div class='del'>-#ifndef PRISM2_NO_STATION_MODES</div><div class='del'>-	cancel_work_sync(&amp;local-&gt;info_queue);</div><div class='del'>-#endif</div><div class='del'>-	cancel_work_sync(&amp;local-&gt;comms_qual_update);</div><div class='del'>-</div><div class='del'>-	module_put(local-&gt;hw_module);</div><div class='del'>-</div><div class='del'>-	local-&gt;num_dev_open--;</div><div class='del'>-</div><div class='del'>-	if (dev != local-&gt;dev &amp;&amp; local-&gt;dev-&gt;flags &amp; IFF_UP &amp;&amp;</div><div class='del'>-	    local-&gt;master_dev_auto_open &amp;&amp; local-&gt;num_dev_open == 1) {</div><div class='del'>-		/* Close master radio interface automatically if it was also</div><div class='del'>-		 * opened automatically and we are now closing the last</div><div class='del'>-		 * remaining non-master device. */</div><div class='del'>-		dev_close(local-&gt;dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_open(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-	PDEBUG(DEBUG_FLOW, "%s: prism2_open\n", dev-&gt;name);</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;no_pri) {</div><div class='del'>-		printk(KERN_DEBUG "%s: could not set interface UP - no PRI "</div><div class='del'>-		       "f/w\n", dev-&gt;name);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((local-&gt;func-&gt;card_present &amp;&amp; !local-&gt;func-&gt;card_present(local)) ||</div><div class='del'>-	    local-&gt;hw_downloading)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if (!try_module_get(local-&gt;hw_module))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	local-&gt;num_dev_open++;</div><div class='del'>-</div><div class='del'>-	if (!local-&gt;dev_enabled &amp;&amp; local-&gt;func-&gt;hw_enable(dev, 1)) {</div><div class='del'>-		printk(KERN_WARNING "%s: could not enable MAC port\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		prism2_close(dev);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	if (!local-&gt;dev_enabled)</div><div class='del'>-		prism2_callback(local, PRISM2_CALLBACK_ENABLE);</div><div class='del'>-	local-&gt;dev_enabled = 1;</div><div class='del'>-</div><div class='del'>-	if (dev != local-&gt;dev &amp;&amp; !(local-&gt;dev-&gt;flags &amp; IFF_UP)) {</div><div class='del'>-		/* Master radio interface is needed for all operation, so open</div><div class='del'>-		 * it automatically when any virtual net_device is opened. */</div><div class='del'>-		local-&gt;master_dev_auto_open = 1;</div><div class='del'>-		dev_open(local-&gt;dev, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	netif_device_attach(dev);</div><div class='del'>-	netif_start_queue(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_set_mac_address(struct net_device *dev, void *p)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	struct list_head *ptr;</div><div class='del'>-	struct sockaddr *addr = p;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;func-&gt;set_rid(dev, HFA384X_RID_CNFOWNMACADDR, addr-&gt;sa_data,</div><div class='del'>-				 ETH_ALEN) &lt; 0 || local-&gt;func-&gt;reset_port(dev))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	read_lock_bh(&amp;local-&gt;iface_lock);</div><div class='del'>-	list_for_each(ptr, &amp;local-&gt;hostap_interfaces) {</div><div class='del'>-		iface = list_entry(ptr, struct hostap_interface, list);</div><div class='del'>-		memcpy(iface-&gt;dev-&gt;dev_addr, addr-&gt;sa_data, ETH_ALEN);</div><div class='del'>-	}</div><div class='del'>-	memcpy(local-&gt;dev-&gt;dev_addr, addr-&gt;sa_data, ETH_ALEN);</div><div class='del'>-	read_unlock_bh(&amp;local-&gt;iface_lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* TODO: to be further implemented as soon as Prism2 fully supports</div><div class='del'>- *       GroupAddresses and correct documentation is available */</div><div class='del'>-void hostap_set_multicast_list_queue(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local =</div><div class='del'>-		container_of(work, local_info_t, set_multicast_list_queue);</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-</div><div class='del'>-	if (hostap_set_word(dev, HFA384X_RID_PROMISCUOUSMODE,</div><div class='del'>-			    local-&gt;is_promisc)) {</div><div class='del'>-		printk(KERN_INFO "%s: %sabling promiscuous mode failed\n",</div><div class='del'>-		       dev-&gt;name, local-&gt;is_promisc ? "en" : "dis");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void hostap_set_multicast_list(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-#if 0</div><div class='del'>-	/* FIX: promiscuous mode seems to be causing a lot of problems with</div><div class='del'>-	 * some station firmware versions (FCSErr frames, invalid MACPort, etc.</div><div class='del'>-	 * corrupted incoming frames). This code is now commented out while the</div><div class='del'>-	 * problems are investigated. */</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-	if ((dev-&gt;flags &amp; IFF_ALLMULTI) || (dev-&gt;flags &amp; IFF_PROMISC)) {</div><div class='del'>-		local-&gt;is_promisc = 1;</div><div class='del'>-	} else {</div><div class='del'>-		local-&gt;is_promisc = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	schedule_work(&amp;local-&gt;set_multicast_list_queue);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void prism2_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	struct hfa384x_regs regs;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	printk(KERN_WARNING "%s Tx timed out! Resetting card\n", dev-&gt;name);</div><div class='del'>-	netif_stop_queue(local-&gt;dev);</div><div class='del'>-</div><div class='del'>-	local-&gt;func-&gt;read_regs(dev, &amp;regs);</div><div class='del'>-	printk(KERN_DEBUG "%s: CMD=%04x EVSTAT=%04x "</div><div class='del'>-	       "OFFSET0=%04x OFFSET1=%04x SWSUPPORT0=%04x\n",</div><div class='del'>-	       dev-&gt;name, regs.cmd, regs.evstat, regs.offset0, regs.offset1,</div><div class='del'>-	       regs.swsupport0);</div><div class='del'>-</div><div class='del'>-	local-&gt;func-&gt;schedule_reset(local);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct header_ops hostap_80211_ops = {</div><div class='del'>-	.create		= eth_header,</div><div class='del'>-	.cache		= eth_header_cache,</div><div class='del'>-	.cache_update	= eth_header_cache_update,</div><div class='del'>-	.parse		= hostap_80211_header_parse,</div><div class='del'>-};</div><div class='del'>-EXPORT_SYMBOL(hostap_80211_ops);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops hostap_netdev_ops = {</div><div class='del'>-	.ndo_start_xmit		= hostap_data_start_xmit,</div><div class='del'>-</div><div class='del'>-	.ndo_open		= prism2_open,</div><div class='del'>-	.ndo_stop		= prism2_close,</div><div class='del'>-	.ndo_do_ioctl		= hostap_ioctl,</div><div class='del'>-	.ndo_set_mac_address	= prism2_set_mac_address,</div><div class='del'>-	.ndo_set_rx_mode	= hostap_set_multicast_list,</div><div class='del'>-	.ndo_tx_timeout 	= prism2_tx_timeout,</div><div class='del'>-	.ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops hostap_mgmt_netdev_ops = {</div><div class='del'>-	.ndo_start_xmit		= hostap_mgmt_start_xmit,</div><div class='del'>-</div><div class='del'>-	.ndo_open		= prism2_open,</div><div class='del'>-	.ndo_stop		= prism2_close,</div><div class='del'>-	.ndo_do_ioctl		= hostap_ioctl,</div><div class='del'>-	.ndo_set_mac_address	= prism2_set_mac_address,</div><div class='del'>-	.ndo_set_rx_mode	= hostap_set_multicast_list,</div><div class='del'>-	.ndo_tx_timeout 	= prism2_tx_timeout,</div><div class='del'>-	.ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops hostap_master_ops = {</div><div class='del'>-	.ndo_start_xmit 	= hostap_master_start_xmit,</div><div class='del'>-</div><div class='del'>-	.ndo_open		= prism2_open,</div><div class='del'>-	.ndo_stop		= prism2_close,</div><div class='del'>-	.ndo_do_ioctl		= hostap_ioctl,</div><div class='del'>-	.ndo_set_mac_address	= prism2_set_mac_address,</div><div class='del'>-	.ndo_set_rx_mode	= hostap_set_multicast_list,</div><div class='del'>-	.ndo_tx_timeout 	= prism2_tx_timeout,</div><div class='del'>-	.ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void hostap_setup_dev(struct net_device *dev, local_info_t *local,</div><div class='del'>-		      int type)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	ether_setup(dev);</div><div class='del'>-	dev-&gt;min_mtu = PRISM2_MIN_MTU;</div><div class='del'>-	dev-&gt;max_mtu = PRISM2_MAX_MTU;</div><div class='del'>-	dev-&gt;priv_flags &amp;= ~IFF_TX_SKB_SHARING;</div><div class='del'>-</div><div class='del'>-	/* kernel callbacks */</div><div class='del'>-	if (iface) {</div><div class='del'>-		/* Currently, we point to the proper spy_data only on</div><div class='del'>-		 * the main_dev. This could be fixed. Jean II */</div><div class='del'>-		iface-&gt;wireless_data.spy_data = &amp;iface-&gt;spy_data;</div><div class='del'>-		dev-&gt;wireless_data = &amp;iface-&gt;wireless_data;</div><div class='del'>-	}</div><div class='del'>-	dev-&gt;wireless_handlers = &amp;hostap_iw_handler_def;</div><div class='del'>-	dev-&gt;watchdog_timeo = TX_TIMEOUT;</div><div class='del'>-</div><div class='del'>-	switch(type) {</div><div class='del'>-	case HOSTAP_INTERFACE_AP:</div><div class='del'>-		dev-&gt;priv_flags |= IFF_NO_QUEUE;	/* use main radio device queue */</div><div class='del'>-		dev-&gt;netdev_ops = &amp;hostap_mgmt_netdev_ops;</div><div class='del'>-		dev-&gt;type = ARPHRD_IEEE80211;</div><div class='del'>-		dev-&gt;header_ops = &amp;hostap_80211_ops;</div><div class='del'>-		break;</div><div class='del'>-	case HOSTAP_INTERFACE_MASTER:</div><div class='del'>-		dev-&gt;netdev_ops = &amp;hostap_master_ops;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		dev-&gt;priv_flags |= IFF_NO_QUEUE;	/* use main radio device queue */</div><div class='del'>-		dev-&gt;netdev_ops = &amp;hostap_netdev_ops;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev-&gt;mtu = local-&gt;mtu;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	dev-&gt;ethtool_ops = &amp;prism2_ethtool_ops;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hostap_enable_hostapd(local_info_t *local, int rtnl_locked)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;apdev)</div><div class='del'>-		return -EEXIST;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: enabling hostapd mode\n", dev-&gt;name);</div><div class='del'>-</div><div class='del'>-	local-&gt;apdev = hostap_add_interface(local, HOSTAP_INTERFACE_AP,</div><div class='del'>-					    rtnl_locked, local-&gt;ddev-&gt;name,</div><div class='del'>-					    "ap");</div><div class='del'>-	if (local-&gt;apdev == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int hostap_disable_hostapd(local_info_t *local, int rtnl_locked)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: disabling hostapd mode\n", dev-&gt;name);</div><div class='del'>-</div><div class='del'>-	hostap_remove_interface(local-&gt;apdev, rtnl_locked, 1);</div><div class='del'>-	local-&gt;apdev = NULL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int hostap_enable_hostapd_sta(local_info_t *local, int rtnl_locked)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;stadev)</div><div class='del'>-		return -EEXIST;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: enabling hostapd STA mode\n", dev-&gt;name);</div><div class='del'>-</div><div class='del'>-	local-&gt;stadev = hostap_add_interface(local, HOSTAP_INTERFACE_STA,</div><div class='del'>-					     rtnl_locked, local-&gt;ddev-&gt;name,</div><div class='del'>-					     "sta");</div><div class='del'>-	if (local-&gt;stadev == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int hostap_disable_hostapd_sta(local_info_t *local, int rtnl_locked)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: disabling hostapd mode\n", dev-&gt;name);</div><div class='del'>-</div><div class='del'>-	hostap_remove_interface(local-&gt;stadev, rtnl_locked, 1);</div><div class='del'>-	local-&gt;stadev = NULL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int hostap_set_hostapd(local_info_t *local, int val, int rtnl_locked)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (val &lt; 0 || val &gt; 1)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;hostapd == val)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (val) {</div><div class='del'>-		ret = hostap_enable_hostapd(local, rtnl_locked);</div><div class='del'>-		if (ret == 0)</div><div class='del'>-			local-&gt;hostapd = 1;</div><div class='del'>-	} else {</div><div class='del'>-		local-&gt;hostapd = 0;</div><div class='del'>-		ret = hostap_disable_hostapd(local, rtnl_locked);</div><div class='del'>-		if (ret != 0)</div><div class='del'>-			local-&gt;hostapd = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int hostap_set_hostapd_sta(local_info_t *local, int val, int rtnl_locked)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (val &lt; 0 || val &gt; 1)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;hostapd_sta == val)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (val) {</div><div class='del'>-		ret = hostap_enable_hostapd_sta(local, rtnl_locked);</div><div class='del'>-		if (ret == 0)</div><div class='del'>-			local-&gt;hostapd_sta = 1;</div><div class='del'>-	} else {</div><div class='del'>-		local-&gt;hostapd_sta = 0;</div><div class='del'>-		ret = hostap_disable_hostapd_sta(local, rtnl_locked);</div><div class='del'>-		if (ret != 0)</div><div class='del'>-			local-&gt;hostapd_sta = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int prism2_update_comms_qual(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	struct hfa384x_comms_quality sq;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-	if (!local-&gt;sta_fw_ver)</div><div class='del'>-		ret = -1;</div><div class='del'>-	else if (local-&gt;sta_fw_ver &gt;= PRISM2_FW_VER(1,3,1)) {</div><div class='del'>-		if (local-&gt;func-&gt;get_rid(local-&gt;dev,</div><div class='del'>-					 HFA384X_RID_DBMCOMMSQUALITY,</div><div class='del'>-					 &amp;sq, sizeof(sq), 1) &gt;= 0) {</div><div class='del'>-			local-&gt;comms_qual = (s16) le16_to_cpu(sq.comm_qual);</div><div class='del'>-			local-&gt;avg_signal = (s16) le16_to_cpu(sq.signal_level);</div><div class='del'>-			local-&gt;avg_noise = (s16) le16_to_cpu(sq.noise_level);</div><div class='del'>-			local-&gt;last_comms_qual_update = jiffies;</div><div class='del'>-		} else</div><div class='del'>-			ret = -1;</div><div class='del'>-	} else {</div><div class='del'>-		if (local-&gt;func-&gt;get_rid(local-&gt;dev, HFA384X_RID_COMMSQUALITY,</div><div class='del'>-					 &amp;sq, sizeof(sq), 1) &gt;= 0) {</div><div class='del'>-			local-&gt;comms_qual = le16_to_cpu(sq.comm_qual);</div><div class='del'>-			local-&gt;avg_signal = HFA384X_LEVEL_TO_dBm(</div><div class='del'>-				le16_to_cpu(sq.signal_level));</div><div class='del'>-			local-&gt;avg_noise = HFA384X_LEVEL_TO_dBm(</div><div class='del'>-				le16_to_cpu(sq.noise_level));</div><div class='del'>-			local-&gt;last_comms_qual_update = jiffies;</div><div class='del'>-		} else</div><div class='del'>-			ret = -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int prism2_sta_send_mgmt(local_info_t *local, u8 *dst, u16 stype,</div><div class='del'>-			 u8 *body, size_t bodylen)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct hostap_ieee80211_mgmt *mgmt;</div><div class='del'>-	struct hostap_skb_tx_data *meta;</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-</div><div class='del'>-	skb = dev_alloc_skb(IEEE80211_MGMT_HDR_LEN + bodylen);</div><div class='del'>-	if (skb == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	mgmt = skb_put_zero(skb, IEEE80211_MGMT_HDR_LEN);</div><div class='del'>-	mgmt-&gt;frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | stype);</div><div class='del'>-	memcpy(mgmt-&gt;da, dst, ETH_ALEN);</div><div class='del'>-	memcpy(mgmt-&gt;sa, dev-&gt;dev_addr, ETH_ALEN);</div><div class='del'>-	memcpy(mgmt-&gt;bssid, dst, ETH_ALEN);</div><div class='del'>-	if (body)</div><div class='del'>-		skb_put_data(skb, body, bodylen);</div><div class='del'>-</div><div class='del'>-	meta = (struct hostap_skb_tx_data *) skb-&gt;cb;</div><div class='del'>-	memset(meta, 0, sizeof(*meta));</div><div class='del'>-	meta-&gt;magic = HOSTAP_SKB_TX_DATA_MAGIC;</div><div class='del'>-	meta-&gt;iface = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	skb-&gt;dev = dev;</div><div class='del'>-	skb_reset_mac_header(skb);</div><div class='del'>-	skb_reset_network_header(skb);</div><div class='del'>-	dev_queue_xmit(skb);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int prism2_sta_deauth(local_info_t *local, u16 reason)</div><div class='del'>-{</div><div class='del'>-	union iwreq_data wrqu;</div><div class='del'>-	int ret;</div><div class='del'>-	__le16 val = cpu_to_le16(reason);</div><div class='del'>-</div><div class='del'>-	if (local-&gt;iw_mode != IW_MODE_INFRA ||</div><div class='del'>-	    is_zero_ether_addr(local-&gt;bssid) ||</div><div class='del'>-	    ether_addr_equal(local-&gt;bssid, "\x44\x44\x44\x44\x44\x44"))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = prism2_sta_send_mgmt(local, local-&gt;bssid, IEEE80211_STYPE_DEAUTH,</div><div class='del'>-				   (u8 *) &amp;val, 2);</div><div class='del'>-	eth_zero_addr(wrqu.ap_addr.sa_data);</div><div class='del'>-	wireless_send_event(local-&gt;dev, SIOCGIWAP, &amp;wrqu, NULL);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct proc_dir_entry *hostap_proc;</div><div class='del'>-</div><div class='del'>-static int __init hostap_init(void)</div><div class='del'>-{</div><div class='del'>-	if (init_net.proc_net != NULL) {</div><div class='del'>-		hostap_proc = proc_mkdir("hostap", init_net.proc_net);</div><div class='del'>-		if (!hostap_proc)</div><div class='del'>-			printk(KERN_WARNING "Failed to mkdir "</div><div class='del'>-			       "/proc/net/hostap\n");</div><div class='del'>-	} else</div><div class='del'>-		hostap_proc = NULL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void __exit hostap_exit(void)</div><div class='del'>-{</div><div class='del'>-	if (hostap_proc != NULL) {</div><div class='del'>-		hostap_proc = NULL;</div><div class='del'>-		remove_proc_entry("hostap", init_net.proc_net);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(hostap_set_word);</div><div class='del'>-EXPORT_SYMBOL(hostap_set_string);</div><div class='del'>-EXPORT_SYMBOL(hostap_get_porttype);</div><div class='del'>-EXPORT_SYMBOL(hostap_set_encryption);</div><div class='del'>-EXPORT_SYMBOL(hostap_set_antsel);</div><div class='del'>-EXPORT_SYMBOL(hostap_set_roaming);</div><div class='del'>-EXPORT_SYMBOL(hostap_set_auth_algs);</div><div class='del'>-EXPORT_SYMBOL(hostap_dump_rx_header);</div><div class='del'>-EXPORT_SYMBOL(hostap_dump_tx_header);</div><div class='del'>-EXPORT_SYMBOL(hostap_80211_get_hdrlen);</div><div class='del'>-EXPORT_SYMBOL(hostap_setup_dev);</div><div class='del'>-EXPORT_SYMBOL(hostap_set_multicast_list_queue);</div><div class='del'>-EXPORT_SYMBOL(hostap_set_hostapd);</div><div class='del'>-EXPORT_SYMBOL(hostap_set_hostapd_sta);</div><div class='del'>-EXPORT_SYMBOL(hostap_add_interface);</div><div class='del'>-EXPORT_SYMBOL(hostap_remove_interface);</div><div class='del'>-EXPORT_SYMBOL(prism2_update_comms_qual);</div><div class='del'>-</div><div class='del'>-module_init(hostap_init);</div><div class='del'>-module_exit(hostap_exit);</div><div class='head'>diff --git a/drivers/net/wireless/intersil/hostap/hostap_pci.c b/drivers/net/wireless/intersil/hostap/hostap_pci.c<br/>deleted file mode 100644<br/>index 52d77506effd..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/hostap/hostap_pci.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_pci.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,445 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-#define PRISM2_PCI</div><div class='del'>-</div><div class='del'>-/* Host AP driver's support for Intersil Prism2.5 PCI cards is based on</div><div class='del'>- * driver patches from Reyk Floeter &lt;reyk@vantronix.net&gt; and</div><div class='del'>- * Andy Warner &lt;andyw@pobox.com&gt; */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/if.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;linux/wireless.h&gt;</div><div class='del'>-#include &lt;net/iw_handler.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hostap_wlan.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *dev_info = "hostap_pci";</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Jouni Malinen");</div><div class='del'>-MODULE_DESCRIPTION("Support for Intersil Prism2.5-based 802.11 wireless LAN "</div><div class='del'>-		   "PCI cards.");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* struct local_info::hw_priv */</div><div class='del'>-struct hostap_pci_priv {</div><div class='del'>-	void __iomem *mem_start;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* FIX: do we need mb/wmb/rmb with memory operations? */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const struct pci_device_id prism2_pci_id_table[] = {</div><div class='del'>-	/* Intersil Prism3 ISL3872 11Mb/s WLAN Controller */</div><div class='del'>-	{ 0x1260, 0x3872, PCI_ANY_ID, PCI_ANY_ID },</div><div class='del'>-	/* Intersil Prism2.5 ISL3874 11Mb/s WLAN Controller */</div><div class='del'>-	{ 0x1260, 0x3873, PCI_ANY_ID, PCI_ANY_ID },</div><div class='del'>-	/* Samsung MagicLAN SWL-2210P */</div><div class='del'>-	{ 0x167d, 0xa000, PCI_ANY_ID, PCI_ANY_ID },</div><div class='del'>-	{ 0 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_IO_DEBUG</div><div class='del'>-</div><div class='del'>-static inline void hfa384x_outb_debug(struct net_device *dev, int a, u8 v)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	struct hostap_pci_priv *hw_priv;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-	hw_priv = local-&gt;hw_priv;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_OUTB, a, v);</div><div class='del'>-	writeb(v, hw_priv-&gt;mem_start + a);</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u8 hfa384x_inb_debug(struct net_device *dev, int a)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	struct hostap_pci_priv *hw_priv;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u8 v;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-	hw_priv = local-&gt;hw_priv;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	v = readb(hw_priv-&gt;mem_start + a);</div><div class='del'>-	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INB, a, v);</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void hfa384x_outw_debug(struct net_device *dev, int a, u16 v)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	struct hostap_pci_priv *hw_priv;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-	hw_priv = local-&gt;hw_priv;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_OUTW, a, v);</div><div class='del'>-	writew(v, hw_priv-&gt;mem_start + a);</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 hfa384x_inw_debug(struct net_device *dev, int a)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	struct hostap_pci_priv *hw_priv;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u16 v;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-	hw_priv = local-&gt;hw_priv;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	v = readw(hw_priv-&gt;mem_start + a);</div><div class='del'>-	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INW, a, v);</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define HFA384X_OUTB(v,a) hfa384x_outb_debug(dev, (a), (v))</div><div class='del'>-#define HFA384X_INB(a) hfa384x_inb_debug(dev, (a))</div><div class='del'>-#define HFA384X_OUTW(v,a) hfa384x_outw_debug(dev, (a), (v))</div><div class='del'>-#define HFA384X_INW(a) hfa384x_inw_debug(dev, (a))</div><div class='del'>-#define HFA384X_OUTW_DATA(v,a) hfa384x_outw_debug(dev, (a), le16_to_cpu((v)))</div><div class='del'>-#define HFA384X_INW_DATA(a) cpu_to_le16(hfa384x_inw_debug(dev, (a)))</div><div class='del'>-</div><div class='del'>-#else /* PRISM2_IO_DEBUG */</div><div class='del'>-</div><div class='del'>-static inline void hfa384x_outb(struct net_device *dev, int a, u8 v)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	struct hostap_pci_priv *hw_priv;</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	hw_priv = iface-&gt;local-&gt;hw_priv;</div><div class='del'>-	writeb(v, hw_priv-&gt;mem_start + a);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u8 hfa384x_inb(struct net_device *dev, int a)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	struct hostap_pci_priv *hw_priv;</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	hw_priv = iface-&gt;local-&gt;hw_priv;</div><div class='del'>-	return readb(hw_priv-&gt;mem_start + a);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void hfa384x_outw(struct net_device *dev, int a, u16 v)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	struct hostap_pci_priv *hw_priv;</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	hw_priv = iface-&gt;local-&gt;hw_priv;</div><div class='del'>-	writew(v, hw_priv-&gt;mem_start + a);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 hfa384x_inw(struct net_device *dev, int a)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	struct hostap_pci_priv *hw_priv;</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	hw_priv = iface-&gt;local-&gt;hw_priv;</div><div class='del'>-	return readw(hw_priv-&gt;mem_start + a);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define HFA384X_OUTB(v,a) hfa384x_outb(dev, (a), (v))</div><div class='del'>-#define HFA384X_INB(a) hfa384x_inb(dev, (a))</div><div class='del'>-#define HFA384X_OUTW(v,a) hfa384x_outw(dev, (a), (v))</div><div class='del'>-#define HFA384X_INW(a) hfa384x_inw(dev, (a))</div><div class='del'>-#define HFA384X_OUTW_DATA(v,a) hfa384x_outw(dev, (a), le16_to_cpu((v)))</div><div class='del'>-#define HFA384X_INW_DATA(a) cpu_to_le16(hfa384x_inw(dev, (a)))</div><div class='del'>-</div><div class='del'>-#endif /* PRISM2_IO_DEBUG */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int hfa384x_from_bap(struct net_device *dev, u16 bap, void *buf,</div><div class='del'>-			    int len)</div><div class='del'>-{</div><div class='del'>-	u16 d_off;</div><div class='del'>-	__le16 *pos;</div><div class='del'>-</div><div class='del'>-	d_off = (bap == 1) ? HFA384X_DATA1_OFF : HFA384X_DATA0_OFF;</div><div class='del'>-	pos = (__le16 *) buf;</div><div class='del'>-</div><div class='del'>-	for ( ; len &gt; 1; len -= 2)</div><div class='del'>-		*pos++ = HFA384X_INW_DATA(d_off);</div><div class='del'>-</div><div class='del'>-	if (len &amp; 1)</div><div class='del'>-		*((char *) pos) = HFA384X_INB(d_off);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int hfa384x_to_bap(struct net_device *dev, u16 bap, void *buf, int len)</div><div class='del'>-{</div><div class='del'>-	u16 d_off;</div><div class='del'>-	__le16 *pos;</div><div class='del'>-</div><div class='del'>-	d_off = (bap == 1) ? HFA384X_DATA1_OFF : HFA384X_DATA0_OFF;</div><div class='del'>-	pos = (__le16 *) buf;</div><div class='del'>-</div><div class='del'>-	for ( ; len &gt; 1; len -= 2)</div><div class='del'>-		HFA384X_OUTW_DATA(*pos++, d_off);</div><div class='del'>-</div><div class='del'>-	if (len &amp; 1)</div><div class='del'>-		HFA384X_OUTB(*((char *) pos), d_off);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* FIX: This might change at some point.. */</div><div class='del'>-#include "hostap_hw.c"</div><div class='del'>-</div><div class='del'>-static void prism2_pci_cor_sreset(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-	u16 reg;</div><div class='del'>-</div><div class='del'>-	reg = HFA384X_INB(HFA384X_PCICOR_OFF);</div><div class='del'>-	printk(KERN_DEBUG "%s: Original COR value: 0x%0x\n", dev-&gt;name, reg);</div><div class='del'>-</div><div class='del'>-	/* linux-wlan-ng uses extremely long hold and settle times for</div><div class='del'>-	 * COR sreset. A comment in the driver code mentions that the long</div><div class='del'>-	 * delays appear to be necessary. However, at least IBM 22P6901 seems</div><div class='del'>-	 * to work fine with shorter delays.</div><div class='del'>-	 *</div><div class='del'>-	 * Longer delays can be configured by uncommenting following line: */</div><div class='del'>-/* #define PRISM2_PCI_USE_LONG_DELAYS */</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_PCI_USE_LONG_DELAYS</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	HFA384X_OUTW(reg | 0x0080, HFA384X_PCICOR_OFF);</div><div class='del'>-	mdelay(250);</div><div class='del'>-</div><div class='del'>-	HFA384X_OUTW(reg &amp; ~0x0080, HFA384X_PCICOR_OFF);</div><div class='del'>-	mdelay(500);</div><div class='del'>-</div><div class='del'>-	/* Wait for f/w to complete initialization (CMD:BUSY == 0) */</div><div class='del'>-	i = 2000000 / 10;</div><div class='del'>-	while ((HFA384X_INW(HFA384X_CMD_OFF) &amp; HFA384X_CMD_BUSY) &amp;&amp; --i)</div><div class='del'>-		udelay(10);</div><div class='del'>-</div><div class='del'>-#else /* PRISM2_PCI_USE_LONG_DELAYS */</div><div class='del'>-</div><div class='del'>-	HFA384X_OUTW(reg | 0x0080, HFA384X_PCICOR_OFF);</div><div class='del'>-	mdelay(2);</div><div class='del'>-	HFA384X_OUTW(reg &amp; ~0x0080, HFA384X_PCICOR_OFF);</div><div class='del'>-	mdelay(2);</div><div class='del'>-</div><div class='del'>-#endif /* PRISM2_PCI_USE_LONG_DELAYS */</div><div class='del'>-</div><div class='del'>-	if (HFA384X_INW(HFA384X_CMD_OFF) &amp; HFA384X_CMD_BUSY) {</div><div class='del'>-		printk(KERN_DEBUG "%s: COR sreset timeout\n", dev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void prism2_pci_genesis_reset(local_info_t *local, int hcr)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = local-&gt;dev;</div><div class='del'>-</div><div class='del'>-	HFA384X_OUTW(0x00C5, HFA384X_PCICOR_OFF);</div><div class='del'>-	mdelay(10);</div><div class='del'>-	HFA384X_OUTW(hcr, HFA384X_PCIHCR_OFF);</div><div class='del'>-	mdelay(10);</div><div class='del'>-	HFA384X_OUTW(0x0045, HFA384X_PCICOR_OFF);</div><div class='del'>-	mdelay(10);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct prism2_helper_functions prism2_pci_funcs =</div><div class='del'>-{</div><div class='del'>-	.card_present	= NULL,</div><div class='del'>-	.cor_sreset	= prism2_pci_cor_sreset,</div><div class='del'>-	.genesis_reset	= prism2_pci_genesis_reset,</div><div class='del'>-	.hw_type	= HOSTAP_HW_PCI,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_pci_probe(struct pci_dev *pdev,</div><div class='del'>-			    const struct pci_device_id *id)</div><div class='del'>-{</div><div class='del'>-	unsigned long phymem;</div><div class='del'>-	void __iomem *mem = NULL;</div><div class='del'>-	local_info_t *local = NULL;</div><div class='del'>-	struct net_device *dev = NULL;</div><div class='del'>-	static int cards_found /* = 0 */;</div><div class='del'>-	int irq_registered = 0;</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	struct hostap_pci_priv *hw_priv;</div><div class='del'>-</div><div class='del'>-	hw_priv = kzalloc(sizeof(*hw_priv), GFP_KERNEL);</div><div class='del'>-	if (hw_priv == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (pci_enable_device(pdev))</div><div class='del'>-		goto err_out_free;</div><div class='del'>-</div><div class='del'>-	phymem = pci_resource_start(pdev, 0);</div><div class='del'>-</div><div class='del'>-	if (!request_mem_region(phymem, pci_resource_len(pdev, 0), "Prism2")) {</div><div class='del'>-		printk(KERN_ERR "prism2: Cannot reserve PCI memory region\n");</div><div class='del'>-		goto err_out_disable;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mem = pci_ioremap_bar(pdev, 0);</div><div class='del'>-	if (mem == NULL) {</div><div class='del'>-		printk(KERN_ERR "prism2: Cannot remap PCI memory region\n") ;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev = prism2_init_local_data(&amp;prism2_pci_funcs, cards_found,</div><div class='del'>-				     &amp;pdev-&gt;dev);</div><div class='del'>-	if (dev == NULL)</div><div class='del'>-		goto fail;</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-	local-&gt;hw_priv = hw_priv;</div><div class='del'>-	cards_found++;</div><div class='del'>-</div><div class='del'>-        dev-&gt;irq = pdev-&gt;irq;</div><div class='del'>-        hw_priv-&gt;mem_start = mem;</div><div class='del'>-	dev-&gt;base_addr = (unsigned long) mem;</div><div class='del'>-</div><div class='del'>-	prism2_pci_cor_sreset(local);</div><div class='del'>-</div><div class='del'>-	pci_set_drvdata(pdev, dev);</div><div class='del'>-</div><div class='del'>-	if (request_irq(dev-&gt;irq, prism2_interrupt, IRQF_SHARED, dev-&gt;name,</div><div class='del'>-			dev)) {</div><div class='del'>-		printk(KERN_WARNING "%s: request_irq failed\n", dev-&gt;name);</div><div class='del'>-		goto fail;</div><div class='del'>-	} else</div><div class='del'>-		irq_registered = 1;</div><div class='del'>-</div><div class='del'>-	if (!local-&gt;pri_only &amp;&amp; prism2_hw_config(dev, 1)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: hardware initialization failed\n",</div><div class='del'>-		       dev_info);</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "%s: Intersil Prism2.5 PCI: "</div><div class='del'>-	       "mem=0x%lx, irq=%d\n", dev-&gt;name, phymem, dev-&gt;irq);</div><div class='del'>-</div><div class='del'>-	return hostap_hw_ready(dev);</div><div class='del'>-</div><div class='del'>- fail:</div><div class='del'>-	if (irq_registered &amp;&amp; dev)</div><div class='del'>-		free_irq(dev-&gt;irq, dev);</div><div class='del'>-</div><div class='del'>-	if (mem)</div><div class='del'>-		iounmap(mem);</div><div class='del'>-</div><div class='del'>-	release_mem_region(phymem, pci_resource_len(pdev, 0));</div><div class='del'>-</div><div class='del'>- err_out_disable:</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-	prism2_free_local_data(dev);</div><div class='del'>-</div><div class='del'>- err_out_free:</div><div class='del'>-	kfree(hw_priv);</div><div class='del'>-</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void prism2_pci_remove(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	void __iomem *mem_start;</div><div class='del'>-	struct hostap_pci_priv *hw_priv;</div><div class='del'>-</div><div class='del'>-	dev = pci_get_drvdata(pdev);</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	hw_priv = iface-&gt;local-&gt;hw_priv;</div><div class='del'>-</div><div class='del'>-	/* Reset the hardware, and ensure interrupts are disabled. */</div><div class='del'>-	prism2_pci_cor_sreset(iface-&gt;local);</div><div class='del'>-	hfa384x_disable_interrupts(dev);</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;irq)</div><div class='del'>-		free_irq(dev-&gt;irq, dev);</div><div class='del'>-</div><div class='del'>-	mem_start = hw_priv-&gt;mem_start;</div><div class='del'>-	prism2_free_local_data(dev);</div><div class='del'>-	kfree(hw_priv);</div><div class='del'>-</div><div class='del'>-	iounmap(mem_start);</div><div class='del'>-</div><div class='del'>-	release_mem_region(pci_resource_start(pdev, 0),</div><div class='del'>-			   pci_resource_len(pdev, 0));</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __maybe_unused prism2_pci_suspend(struct device *dev_d)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = dev_get_drvdata(dev_d);</div><div class='del'>-</div><div class='del'>-	if (netif_running(dev)) {</div><div class='del'>-		netif_stop_queue(dev);</div><div class='del'>-		netif_device_detach(dev);</div><div class='del'>-	}</div><div class='del'>-	prism2_suspend(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __maybe_unused prism2_pci_resume(struct device *dev_d)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = dev_get_drvdata(dev_d);</div><div class='del'>-</div><div class='del'>-	prism2_hw_config(dev, 0);</div><div class='del'>-	if (netif_running(dev)) {</div><div class='del'>-		netif_device_attach(dev);</div><div class='del'>-		netif_start_queue(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-MODULE_DEVICE_TABLE(pci, prism2_pci_id_table);</div><div class='del'>-</div><div class='del'>-static SIMPLE_DEV_PM_OPS(prism2_pci_pm_ops,</div><div class='del'>-			 prism2_pci_suspend,</div><div class='del'>-			 prism2_pci_resume);</div><div class='del'>-</div><div class='del'>-static struct pci_driver prism2_pci_driver = {</div><div class='del'>-	.name		= "hostap_pci",</div><div class='del'>-	.id_table	= prism2_pci_id_table,</div><div class='del'>-	.probe		= prism2_pci_probe,</div><div class='del'>-	.remove		= prism2_pci_remove,</div><div class='del'>-	.driver.pm	= &amp;prism2_pci_pm_ops,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-module_pci_driver(prism2_pci_driver);</div><div class='head'>diff --git a/drivers/net/wireless/intersil/hostap/hostap_plx.c b/drivers/net/wireless/intersil/hostap/hostap_plx.c<br/>deleted file mode 100644<br/>index 58247290fcbc..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/hostap/hostap_plx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_plx.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,617 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-#define PRISM2_PLX</div><div class='del'>-</div><div class='del'>-/* Host AP driver's support for PC Cards on PCI adapters using PLX9052 is</div><div class='del'>- * based on:</div><div class='del'>- * - Host AP driver patch from james@madingley.org</div><div class='del'>- * - linux-wlan-ng driver, Copyright (C) AbsoluteValue Systems, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/if.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;linux/wireless.h&gt;</div><div class='del'>-#include &lt;net/iw_handler.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hostap_wlan.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *dev_info = "hostap_plx";</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Jouni Malinen");</div><div class='del'>-MODULE_DESCRIPTION("Support for Intersil Prism2-based 802.11 wireless LAN "</div><div class='del'>-		   "cards (PLX).");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int ignore_cis;</div><div class='del'>-module_param(ignore_cis, int, 0444);</div><div class='del'>-MODULE_PARM_DESC(ignore_cis, "Do not verify manfid information in CIS");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* struct local_info::hw_priv */</div><div class='del'>-struct hostap_plx_priv {</div><div class='del'>-	void __iomem *attr_mem;</div><div class='del'>-	unsigned int cor_offset;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define PLX_MIN_ATTR_LEN 512	/* at least 2 x 256 is needed for CIS */</div><div class='del'>-#define COR_SRESET       0x80</div><div class='del'>-#define COR_LEVLREQ      0x40</div><div class='del'>-#define COR_ENABLE_FUNC  0x01</div><div class='del'>-/* PCI Configuration Registers */</div><div class='del'>-#define PLX_PCIIPR       0x3d   /* PCI Interrupt Pin */</div><div class='del'>-/* Local Configuration Registers */</div><div class='del'>-#define PLX_INTCSR       0x4c   /* Interrupt Control/Status Register */</div><div class='del'>-#define PLX_INTCSR_PCI_INTEN BIT(6) /* PCI Interrupt Enable */</div><div class='del'>-#define PLX_CNTRL        0x50</div><div class='del'>-#define PLX_CNTRL_SERIAL_EEPROM_PRESENT BIT(28)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define PLXDEV(vendor,dev,str) { vendor, dev, PCI_ANY_ID, PCI_ANY_ID }</div><div class='del'>-</div><div class='del'>-static const struct pci_device_id prism2_plx_id_table[] = {</div><div class='del'>-	PLXDEV(0x10b7, 0x7770, "3Com AirConnect PCI 777A"),</div><div class='del'>-	PLXDEV(0x111a, 0x1023, "Siemens SpeedStream SS1023"),</div><div class='del'>-	PLXDEV(0x126c, 0x8030, "Nortel emobility"),</div><div class='del'>-	PLXDEV(0x1562, 0x0001, "Symbol LA-4123"),</div><div class='del'>-	PLXDEV(0x1385, 0x4100, "Netgear MA301"),</div><div class='del'>-	PLXDEV(0x15e8, 0x0130, "National Datacomm NCP130 (PLX9052)"),</div><div class='del'>-	PLXDEV(0x15e8, 0x0131, "National Datacomm NCP130 (TMD7160)"),</div><div class='del'>-	PLXDEV(0x1638, 0x1100, "Eumitcom WL11000"),</div><div class='del'>-	PLXDEV(0x16ab, 0x1100, "Global Sun Tech GL24110P"),</div><div class='del'>-	PLXDEV(0x16ab, 0x1101, "Global Sun Tech GL24110P (?)"),</div><div class='del'>-	PLXDEV(0x16ab, 0x1102, "Linksys WPC11 with WDT11"),</div><div class='del'>-	PLXDEV(0x16ab, 0x1103, "Longshine 8031"),</div><div class='del'>-	PLXDEV(0x16ec, 0x3685, "US Robotics USR2415"),</div><div class='del'>-	PLXDEV(0xec80, 0xec00, "Belkin F5D6000"),</div><div class='del'>-	{ 0 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Array of known Prism2/2.5 PC Card manufactured ids. If your card's manfid</div><div class='del'>- * is not listed here, you will need to add it here to get the driver</div><div class='del'>- * initialized. */</div><div class='del'>-static struct prism2_plx_manfid {</div><div class='del'>-	u16 manfid1, manfid2;</div><div class='del'>-} prism2_plx_known_manfids[] = {</div><div class='del'>-	{ 0x000b, 0x7110 } /* D-Link DWL-650 Rev. P1 */,</div><div class='del'>-	{ 0x000b, 0x7300 } /* Philips 802.11b WLAN PCMCIA */,</div><div class='del'>-	{ 0x0101, 0x0777 } /* 3Com AirConnect PCI 777A */,</div><div class='del'>-	{ 0x0126, 0x8000 } /* Proxim RangeLAN */,</div><div class='del'>-	{ 0x0138, 0x0002 } /* Compaq WL100 */,</div><div class='del'>-	{ 0x0156, 0x0002 } /* Intersil Prism II Ref. Design (and others) */,</div><div class='del'>-	{ 0x026f, 0x030b } /* Buffalo WLI-CF-S11G */,</div><div class='del'>-	{ 0x0274, 0x1612 } /* Linksys WPC11 Ver 2.5 */,</div><div class='del'>-	{ 0x0274, 0x1613 } /* Linksys WPC11 Ver 3 */,</div><div class='del'>-	{ 0x028a, 0x0002 } /* D-Link DRC-650 */,</div><div class='del'>-	{ 0x0250, 0x0002 } /* Samsung SWL2000-N */,</div><div class='del'>-	{ 0xc250, 0x0002 } /* EMTAC A2424i */,</div><div class='del'>-	{ 0xd601, 0x0002 } /* Z-Com XI300 */,</div><div class='del'>-	{ 0xd601, 0x0005 } /* Zcomax XI-325H 200mW */,</div><div class='del'>-	{ 0, 0}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_IO_DEBUG</div><div class='del'>-</div><div class='del'>-static inline void hfa384x_outb_debug(struct net_device *dev, int a, u8 v)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_OUTB, a, v);</div><div class='del'>-	outb(v, dev-&gt;base_addr + a);</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u8 hfa384x_inb_debug(struct net_device *dev, int a)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u8 v;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	v = inb(dev-&gt;base_addr + a);</div><div class='del'>-	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INB, a, v);</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void hfa384x_outw_debug(struct net_device *dev, int a, u16 v)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_OUTW, a, v);</div><div class='del'>-	outw(v, dev-&gt;base_addr + a);</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 hfa384x_inw_debug(struct net_device *dev, int a)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u16 v;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	v = inw(dev-&gt;base_addr + a);</div><div class='del'>-	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INW, a, v);</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void hfa384x_outsw_debug(struct net_device *dev, int a,</div><div class='del'>-				       u8 *buf, int wc)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_OUTSW, a, wc);</div><div class='del'>-	outsw(dev-&gt;base_addr + a, buf, wc);</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void hfa384x_insw_debug(struct net_device *dev, int a,</div><div class='del'>-				      u8 *buf, int wc)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	local_info_t *local;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INSW, a, wc);</div><div class='del'>-	insw(dev-&gt;base_addr + a, buf, wc);</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define HFA384X_OUTB(v,a) hfa384x_outb_debug(dev, (a), (v))</div><div class='del'>-#define HFA384X_INB(a) hfa384x_inb_debug(dev, (a))</div><div class='del'>-#define HFA384X_OUTW(v,a) hfa384x_outw_debug(dev, (a), (v))</div><div class='del'>-#define HFA384X_INW(a) hfa384x_inw_debug(dev, (a))</div><div class='del'>-#define HFA384X_OUTSW(a, buf, wc) hfa384x_outsw_debug(dev, (a), (buf), (wc))</div><div class='del'>-#define HFA384X_INSW(a, buf, wc) hfa384x_insw_debug(dev, (a), (buf), (wc))</div><div class='del'>-</div><div class='del'>-#else /* PRISM2_IO_DEBUG */</div><div class='del'>-</div><div class='del'>-#define HFA384X_OUTB(v,a) outb((v), dev-&gt;base_addr + (a))</div><div class='del'>-#define HFA384X_INB(a) inb(dev-&gt;base_addr + (a))</div><div class='del'>-#define HFA384X_OUTW(v,a) outw((v), dev-&gt;base_addr + (a))</div><div class='del'>-#define HFA384X_INW(a) inw(dev-&gt;base_addr + (a))</div><div class='del'>-#define HFA384X_INSW(a, buf, wc) insw(dev-&gt;base_addr + (a), buf, wc)</div><div class='del'>-#define HFA384X_OUTSW(a, buf, wc) outsw(dev-&gt;base_addr + (a), buf, wc)</div><div class='del'>-</div><div class='del'>-#endif /* PRISM2_IO_DEBUG */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int hfa384x_from_bap(struct net_device *dev, u16 bap, void *buf,</div><div class='del'>-			    int len)</div><div class='del'>-{</div><div class='del'>-	u16 d_off;</div><div class='del'>-	u16 *pos;</div><div class='del'>-</div><div class='del'>-	d_off = (bap == 1) ? HFA384X_DATA1_OFF : HFA384X_DATA0_OFF;</div><div class='del'>-	pos = (u16 *) buf;</div><div class='del'>-</div><div class='del'>-	if (len / 2)</div><div class='del'>-		HFA384X_INSW(d_off, buf, len / 2);</div><div class='del'>-	pos += len / 2;</div><div class='del'>-</div><div class='del'>-	if (len &amp; 1)</div><div class='del'>-		*((char *) pos) = HFA384X_INB(d_off);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int hfa384x_to_bap(struct net_device *dev, u16 bap, void *buf, int len)</div><div class='del'>-{</div><div class='del'>-	u16 d_off;</div><div class='del'>-	u16 *pos;</div><div class='del'>-</div><div class='del'>-	d_off = (bap == 1) ? HFA384X_DATA1_OFF : HFA384X_DATA0_OFF;</div><div class='del'>-	pos = (u16 *) buf;</div><div class='del'>-</div><div class='del'>-	if (len / 2)</div><div class='del'>-		HFA384X_OUTSW(d_off, buf, len / 2);</div><div class='del'>-	pos += len / 2;</div><div class='del'>-</div><div class='del'>-	if (len &amp; 1)</div><div class='del'>-		HFA384X_OUTB(*((char *) pos), d_off);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* FIX: This might change at some point.. */</div><div class='del'>-#include "hostap_hw.c"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void prism2_plx_cor_sreset(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	unsigned char corsave;</div><div class='del'>-	struct hostap_plx_priv *hw_priv = local-&gt;hw_priv;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: Doing reset via direct COR access.\n",</div><div class='del'>-	       dev_info);</div><div class='del'>-</div><div class='del'>-	/* Set sreset bit of COR and clear it after hold time */</div><div class='del'>-</div><div class='del'>-	if (hw_priv-&gt;attr_mem == NULL) {</div><div class='del'>-		/* TMD7160 - COR at card's first I/O addr */</div><div class='del'>-		corsave = inb(hw_priv-&gt;cor_offset);</div><div class='del'>-		outb(corsave | COR_SRESET, hw_priv-&gt;cor_offset);</div><div class='del'>-		mdelay(2);</div><div class='del'>-		outb(corsave &amp; ~COR_SRESET, hw_priv-&gt;cor_offset);</div><div class='del'>-		mdelay(2);</div><div class='del'>-	} else {</div><div class='del'>-		/* PLX9052 */</div><div class='del'>-		corsave = readb(hw_priv-&gt;attr_mem + hw_priv-&gt;cor_offset);</div><div class='del'>-		writeb(corsave | COR_SRESET,</div><div class='del'>-		       hw_priv-&gt;attr_mem + hw_priv-&gt;cor_offset);</div><div class='del'>-		mdelay(2);</div><div class='del'>-		writeb(corsave &amp; ~COR_SRESET,</div><div class='del'>-		       hw_priv-&gt;attr_mem + hw_priv-&gt;cor_offset);</div><div class='del'>-		mdelay(2);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void prism2_plx_genesis_reset(local_info_t *local, int hcr)</div><div class='del'>-{</div><div class='del'>-	unsigned char corsave;</div><div class='del'>-	struct hostap_plx_priv *hw_priv = local-&gt;hw_priv;</div><div class='del'>-</div><div class='del'>-	if (hw_priv-&gt;attr_mem == NULL) {</div><div class='del'>-		/* TMD7160 - COR at card's first I/O addr */</div><div class='del'>-		corsave = inb(hw_priv-&gt;cor_offset);</div><div class='del'>-		outb(corsave | COR_SRESET, hw_priv-&gt;cor_offset);</div><div class='del'>-		mdelay(10);</div><div class='del'>-		outb(hcr, hw_priv-&gt;cor_offset + 2);</div><div class='del'>-		mdelay(10);</div><div class='del'>-		outb(corsave &amp; ~COR_SRESET, hw_priv-&gt;cor_offset);</div><div class='del'>-		mdelay(10);</div><div class='del'>-	} else {</div><div class='del'>-		/* PLX9052 */</div><div class='del'>-		corsave = readb(hw_priv-&gt;attr_mem + hw_priv-&gt;cor_offset);</div><div class='del'>-		writeb(corsave | COR_SRESET,</div><div class='del'>-		       hw_priv-&gt;attr_mem + hw_priv-&gt;cor_offset);</div><div class='del'>-		mdelay(10);</div><div class='del'>-		writeb(hcr, hw_priv-&gt;attr_mem + hw_priv-&gt;cor_offset + 2);</div><div class='del'>-		mdelay(10);</div><div class='del'>-		writeb(corsave &amp; ~COR_SRESET,</div><div class='del'>-		       hw_priv-&gt;attr_mem + hw_priv-&gt;cor_offset);</div><div class='del'>-		mdelay(10);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct prism2_helper_functions prism2_plx_funcs =</div><div class='del'>-{</div><div class='del'>-	.card_present	= NULL,</div><div class='del'>-	.cor_sreset	= prism2_plx_cor_sreset,</div><div class='del'>-	.genesis_reset	= prism2_plx_genesis_reset,</div><div class='del'>-	.hw_type	= HOSTAP_HW_PLX,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_plx_check_cis(void __iomem *attr_mem, int attr_len,</div><div class='del'>-				unsigned int *cor_offset,</div><div class='del'>-				unsigned int *cor_index)</div><div class='del'>-{</div><div class='del'>-#define CISTPL_CONFIG 0x1A</div><div class='del'>-#define CISTPL_MANFID 0x20</div><div class='del'>-#define CISTPL_END 0xFF</div><div class='del'>-#define CIS_MAX_LEN 256</div><div class='del'>-	u8 *cis;</div><div class='del'>-	int i, pos;</div><div class='del'>-	unsigned int rmsz, rasz, manfid1, manfid2;</div><div class='del'>-	struct prism2_plx_manfid *manfid;</div><div class='del'>-</div><div class='del'>-	cis = kmalloc(CIS_MAX_LEN, GFP_KERNEL);</div><div class='del'>-	if (cis == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* read CIS; it is in even offsets in the beginning of attr_mem */</div><div class='del'>-	for (i = 0; i &lt; CIS_MAX_LEN; i++)</div><div class='del'>-		cis[i] = readb(attr_mem + 2 * i);</div><div class='del'>-	printk(KERN_DEBUG "%s: CIS: %6ph ...\n", dev_info, cis);</div><div class='del'>-</div><div class='del'>-	/* set reasonable defaults for Prism2 cards just in case CIS parsing</div><div class='del'>-	 * fails */</div><div class='del'>-	*cor_offset = 0x3e0;</div><div class='del'>-	*cor_index = 0x01;</div><div class='del'>-	manfid1 = manfid2 = 0;</div><div class='del'>-</div><div class='del'>-	pos = 0;</div><div class='del'>-	while (pos &lt; CIS_MAX_LEN - 1 &amp;&amp; cis[pos] != CISTPL_END) {</div><div class='del'>-		if (pos + 2 + cis[pos + 1] &gt; CIS_MAX_LEN)</div><div class='del'>-			goto cis_error;</div><div class='del'>-</div><div class='del'>-		switch (cis[pos]) {</div><div class='del'>-		case CISTPL_CONFIG:</div><div class='del'>-			if (cis[pos + 1] &lt; 2)</div><div class='del'>-				goto cis_error;</div><div class='del'>-			rmsz = (cis[pos + 2] &amp; 0x3c) &gt;&gt; 2;</div><div class='del'>-			rasz = cis[pos + 2] &amp; 0x03;</div><div class='del'>-			if (4 + rasz + rmsz &gt; cis[pos + 1])</div><div class='del'>-				goto cis_error;</div><div class='del'>-			*cor_index = cis[pos + 3] &amp; 0x3F;</div><div class='del'>-			*cor_offset = 0;</div><div class='del'>-			for (i = 0; i &lt;= rasz; i++)</div><div class='del'>-				*cor_offset += cis[pos + 4 + i] &lt;&lt; (8 * i);</div><div class='del'>-			printk(KERN_DEBUG "%s: cor_index=0x%x "</div><div class='del'>-			       "cor_offset=0x%x\n", dev_info,</div><div class='del'>-			       *cor_index, *cor_offset);</div><div class='del'>-			if (*cor_offset &gt; attr_len) {</div><div class='del'>-				printk(KERN_ERR "%s: COR offset not within "</div><div class='del'>-				       "attr_mem\n", dev_info);</div><div class='del'>-				kfree(cis);</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case CISTPL_MANFID:</div><div class='del'>-			if (cis[pos + 1] &lt; 4)</div><div class='del'>-				goto cis_error;</div><div class='del'>-			manfid1 = cis[pos + 2] + (cis[pos + 3] &lt;&lt; 8);</div><div class='del'>-			manfid2 = cis[pos + 4] + (cis[pos + 5] &lt;&lt; 8);</div><div class='del'>-			printk(KERN_DEBUG "%s: manfid=0x%04x, 0x%04x\n",</div><div class='del'>-			       dev_info, manfid1, manfid2);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pos += cis[pos + 1] + 2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pos &gt;= CIS_MAX_LEN || cis[pos] != CISTPL_END)</div><div class='del'>-		goto cis_error;</div><div class='del'>-</div><div class='del'>-	for (manfid = prism2_plx_known_manfids; manfid-&gt;manfid1 != 0; manfid++)</div><div class='del'>-		if (manfid1 == manfid-&gt;manfid1 &amp;&amp; manfid2 == manfid-&gt;manfid2) {</div><div class='del'>-			kfree(cis);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "%s: unknown manfid 0x%04x, 0x%04x - assuming this is"</div><div class='del'>-	       " not supported card\n", dev_info, manfid1, manfid2);</div><div class='del'>-	goto fail;</div><div class='del'>-</div><div class='del'>- cis_error:</div><div class='del'>-	printk(KERN_WARNING "%s: invalid CIS data\n", dev_info);</div><div class='del'>-</div><div class='del'>- fail:</div><div class='del'>-	kfree(cis);</div><div class='del'>-	if (ignore_cis) {</div><div class='del'>-		printk(KERN_INFO "%s: ignore_cis parameter set - ignoring "</div><div class='del'>-		       "errors during CIS verification\n", dev_info);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism2_plx_probe(struct pci_dev *pdev,</div><div class='del'>-			    const struct pci_device_id *id)</div><div class='del'>-{</div><div class='del'>-	unsigned int pccard_ioaddr, plx_ioaddr;</div><div class='del'>-	unsigned long pccard_attr_mem;</div><div class='del'>-	unsigned int pccard_attr_len;</div><div class='del'>-	void __iomem *attr_mem = NULL;</div><div class='del'>-	unsigned int cor_offset = 0, cor_index = 0;</div><div class='del'>-	u32 reg;</div><div class='del'>-	local_info_t *local = NULL;</div><div class='del'>-	struct net_device *dev = NULL;</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	static int cards_found /* = 0 */;</div><div class='del'>-	int irq_registered = 0;</div><div class='del'>-	int tmd7160;</div><div class='del'>-	struct hostap_plx_priv *hw_priv;</div><div class='del'>-</div><div class='del'>-	hw_priv = kzalloc(sizeof(*hw_priv), GFP_KERNEL);</div><div class='del'>-	if (hw_priv == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (pci_enable_device(pdev))</div><div class='del'>-		goto err_out_free;</div><div class='del'>-</div><div class='del'>-	/* National Datacomm NCP130 based on TMD7160, not PLX9052. */</div><div class='del'>-	tmd7160 = (pdev-&gt;vendor == 0x15e8) &amp;&amp; (pdev-&gt;device == 0x0131);</div><div class='del'>-</div><div class='del'>-	plx_ioaddr = pci_resource_start(pdev, 1);</div><div class='del'>-	pccard_ioaddr = pci_resource_start(pdev, tmd7160 ? 2 : 3);</div><div class='del'>-</div><div class='del'>-	if (tmd7160) {</div><div class='del'>-		/* TMD7160 */</div><div class='del'>-		attr_mem = NULL; /* no access to PC Card attribute memory */</div><div class='del'>-</div><div class='del'>-		printk(KERN_INFO "TMD7160 PCI/PCMCIA adapter: io=0x%x, "</div><div class='del'>-		       "irq=%d, pccard_io=0x%x\n",</div><div class='del'>-		       plx_ioaddr, pdev-&gt;irq, pccard_ioaddr);</div><div class='del'>-</div><div class='del'>-		cor_offset = plx_ioaddr;</div><div class='del'>-		cor_index = 0x04;</div><div class='del'>-</div><div class='del'>-		outb(cor_index | COR_LEVLREQ | COR_ENABLE_FUNC, plx_ioaddr);</div><div class='del'>-		mdelay(1);</div><div class='del'>-		reg = inb(plx_ioaddr);</div><div class='del'>-		if (reg != (cor_index | COR_LEVLREQ | COR_ENABLE_FUNC)) {</div><div class='del'>-			printk(KERN_ERR "%s: Error setting COR (expected="</div><div class='del'>-			       "0x%02x, was=0x%02x)\n", dev_info,</div><div class='del'>-			       cor_index | COR_LEVLREQ | COR_ENABLE_FUNC, reg);</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* PLX9052 */</div><div class='del'>-		pccard_attr_mem = pci_resource_start(pdev, 2);</div><div class='del'>-		pccard_attr_len = pci_resource_len(pdev, 2);</div><div class='del'>-		if (pccard_attr_len &lt; PLX_MIN_ATTR_LEN)</div><div class='del'>-			goto fail;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		attr_mem = ioremap(pccard_attr_mem, pccard_attr_len);</div><div class='del'>-		if (attr_mem == NULL) {</div><div class='del'>-			printk(KERN_ERR "%s: cannot remap attr_mem\n",</div><div class='del'>-			       dev_info);</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		printk(KERN_INFO "PLX9052 PCI/PCMCIA adapter: "</div><div class='del'>-		       "mem=0x%lx, plx_io=0x%x, irq=%d, pccard_io=0x%x\n",</div><div class='del'>-		       pccard_attr_mem, plx_ioaddr, pdev-&gt;irq, pccard_ioaddr);</div><div class='del'>-</div><div class='del'>-		if (prism2_plx_check_cis(attr_mem, pccard_attr_len,</div><div class='del'>-					 &amp;cor_offset, &amp;cor_index)) {</div><div class='del'>-			printk(KERN_INFO "Unknown PC Card CIS - not a "</div><div class='del'>-			       "Prism2/2.5 card?\n");</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		printk(KERN_DEBUG "Prism2/2.5 PC Card detected in PLX9052 "</div><div class='del'>-		       "adapter\n");</div><div class='del'>-</div><div class='del'>-		/* Write COR to enable PC Card */</div><div class='del'>-		writeb(cor_index | COR_LEVLREQ | COR_ENABLE_FUNC,</div><div class='del'>-		       attr_mem + cor_offset);</div><div class='del'>-</div><div class='del'>-		/* Enable PCI interrupts if they are not already enabled */</div><div class='del'>-		reg = inl(plx_ioaddr + PLX_INTCSR);</div><div class='del'>-		printk(KERN_DEBUG "PLX_INTCSR=0x%x\n", reg);</div><div class='del'>-		if (!(reg &amp; PLX_INTCSR_PCI_INTEN)) {</div><div class='del'>-			outl(reg | PLX_INTCSR_PCI_INTEN,</div><div class='del'>-			     plx_ioaddr + PLX_INTCSR);</div><div class='del'>-			if (!(inl(plx_ioaddr + PLX_INTCSR) &amp;</div><div class='del'>-			      PLX_INTCSR_PCI_INTEN)) {</div><div class='del'>-				printk(KERN_WARNING "%s: Could not enable "</div><div class='del'>-				       "Local Interrupts\n", dev_info);</div><div class='del'>-				goto fail;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		reg = inl(plx_ioaddr + PLX_CNTRL);</div><div class='del'>-		printk(KERN_DEBUG "PLX_CNTRL=0x%x (Serial EEPROM "</div><div class='del'>-		       "present=%d)\n",</div><div class='del'>-		       reg, (reg &amp; PLX_CNTRL_SERIAL_EEPROM_PRESENT) != 0);</div><div class='del'>-		/* should set PLX_PCIIPR to 0x01 (INTA#) if Serial EEPROM is</div><div class='del'>-		 * not present; but are there really such cards in use(?) */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev = prism2_init_local_data(&amp;prism2_plx_funcs, cards_found,</div><div class='del'>-				     &amp;pdev-&gt;dev);</div><div class='del'>-	if (dev == NULL)</div><div class='del'>-		goto fail;</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	local = iface-&gt;local;</div><div class='del'>-	local-&gt;hw_priv = hw_priv;</div><div class='del'>-	cards_found++;</div><div class='del'>-</div><div class='del'>-	dev-&gt;irq = pdev-&gt;irq;</div><div class='del'>-	dev-&gt;base_addr = pccard_ioaddr;</div><div class='del'>-	hw_priv-&gt;attr_mem = attr_mem;</div><div class='del'>-	hw_priv-&gt;cor_offset = cor_offset;</div><div class='del'>-</div><div class='del'>-	pci_set_drvdata(pdev, dev);</div><div class='del'>-</div><div class='del'>-	if (request_irq(dev-&gt;irq, prism2_interrupt, IRQF_SHARED, dev-&gt;name,</div><div class='del'>-			dev)) {</div><div class='del'>-		printk(KERN_WARNING "%s: request_irq failed\n", dev-&gt;name);</div><div class='del'>-		goto fail;</div><div class='del'>-	} else</div><div class='del'>-		irq_registered = 1;</div><div class='del'>-</div><div class='del'>-	if (prism2_hw_config(dev, 1)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: hardware initialization failed\n",</div><div class='del'>-		       dev_info);</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return hostap_hw_ready(dev);</div><div class='del'>-</div><div class='del'>- fail:</div><div class='del'>-	if (irq_registered &amp;&amp; dev)</div><div class='del'>-		free_irq(dev-&gt;irq, dev);</div><div class='del'>-</div><div class='del'>-	if (attr_mem)</div><div class='del'>-		iounmap(attr_mem);</div><div class='del'>-</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-	prism2_free_local_data(dev);</div><div class='del'>-</div><div class='del'>- err_out_free:</div><div class='del'>-	kfree(hw_priv);</div><div class='del'>-</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void prism2_plx_remove(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	struct hostap_plx_priv *hw_priv;</div><div class='del'>-</div><div class='del'>-	dev = pci_get_drvdata(pdev);</div><div class='del'>-	iface = netdev_priv(dev);</div><div class='del'>-	hw_priv = iface-&gt;local-&gt;hw_priv;</div><div class='del'>-</div><div class='del'>-	/* Reset the hardware, and ensure interrupts are disabled. */</div><div class='del'>-	prism2_plx_cor_sreset(iface-&gt;local);</div><div class='del'>-	hfa384x_disable_interrupts(dev);</div><div class='del'>-</div><div class='del'>-	if (hw_priv-&gt;attr_mem)</div><div class='del'>-		iounmap(hw_priv-&gt;attr_mem);</div><div class='del'>-	if (dev-&gt;irq)</div><div class='del'>-		free_irq(dev-&gt;irq, dev);</div><div class='del'>-</div><div class='del'>-	prism2_free_local_data(dev);</div><div class='del'>-	kfree(hw_priv);</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-MODULE_DEVICE_TABLE(pci, prism2_plx_id_table);</div><div class='del'>-</div><div class='del'>-static struct pci_driver prism2_plx_driver = {</div><div class='del'>-	.name		= "hostap_plx",</div><div class='del'>-	.id_table	= prism2_plx_id_table,</div><div class='del'>-	.probe		= prism2_plx_probe,</div><div class='del'>-	.remove		= prism2_plx_remove,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-module_pci_driver(prism2_plx_driver);</div><div class='head'>diff --git a/drivers/net/wireless/intersil/hostap/hostap_proc.c b/drivers/net/wireless/intersil/hostap/hostap_proc.c<br/>deleted file mode 100644<br/>index 51c847d98755..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/hostap/hostap_proc.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_proc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,411 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* /proc routines for Host AP driver */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;net/lib80211.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hostap_wlan.h"</div><div class='del'>-#include "hostap.h"</div><div class='del'>-</div><div class='del'>-#define PROC_LIMIT (PAGE_SIZE - 80)</div><div class='del'>-</div><div class='del'>-#if !defined(PRISM2_NO_PROCFS_DEBUG) &amp;&amp; defined(CONFIG_PROC_FS)</div><div class='del'>-static int prism2_debug_proc_show(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = m-&gt;private;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "next_txfid=%d next_alloc=%d\n",</div><div class='del'>-		   local-&gt;next_txfid, local-&gt;next_alloc);</div><div class='del'>-	for (i = 0; i &lt; PRISM2_TXFID_COUNT; i++)</div><div class='del'>-		seq_printf(m, "FID: tx=%04X intransmit=%04X\n",</div><div class='del'>-			   local-&gt;txfid[i], local-&gt;intransmitfid[i]);</div><div class='del'>-	seq_printf(m, "FW TX rate control: %d\n", local-&gt;fw_tx_rate_control);</div><div class='del'>-	seq_printf(m, "beacon_int=%d\n", local-&gt;beacon_int);</div><div class='del'>-	seq_printf(m, "dtim_period=%d\n", local-&gt;dtim_period);</div><div class='del'>-	seq_printf(m, "wds_max_connections=%d\n", local-&gt;wds_max_connections);</div><div class='del'>-	seq_printf(m, "dev_enabled=%d\n", local-&gt;dev_enabled);</div><div class='del'>-	seq_printf(m, "sw_tick_stuck=%d\n", local-&gt;sw_tick_stuck);</div><div class='del'>-	for (i = 0; i &lt; WEP_KEYS; i++) {</div><div class='del'>-		if (local-&gt;crypt_info.crypt[i] &amp;&amp;</div><div class='del'>-		    local-&gt;crypt_info.crypt[i]-&gt;ops) {</div><div class='del'>-			seq_printf(m, "crypt[%d]=%s\n", i,</div><div class='del'>-				   local-&gt;crypt_info.crypt[i]-&gt;ops-&gt;name);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	seq_printf(m, "pri_only=%d\n", local-&gt;pri_only);</div><div class='del'>-	seq_printf(m, "pci=%d\n", local-&gt;func-&gt;hw_type == HOSTAP_HW_PCI);</div><div class='del'>-	seq_printf(m, "sram_type=%d\n", local-&gt;sram_type);</div><div class='del'>-	seq_printf(m, "no_pri=%d\n", local-&gt;no_pri);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-static int prism2_stats_proc_show(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = m-&gt;private;</div><div class='del'>-	struct comm_tallies_sums *sums = &amp;local-&gt;comm_tallies;</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "TxUnicastFrames=%u\n", sums-&gt;tx_unicast_frames);</div><div class='del'>-	seq_printf(m, "TxMulticastframes=%u\n", sums-&gt;tx_multicast_frames);</div><div class='del'>-	seq_printf(m, "TxFragments=%u\n", sums-&gt;tx_fragments);</div><div class='del'>-	seq_printf(m, "TxUnicastOctets=%u\n", sums-&gt;tx_unicast_octets);</div><div class='del'>-	seq_printf(m, "TxMulticastOctets=%u\n", sums-&gt;tx_multicast_octets);</div><div class='del'>-	seq_printf(m, "TxDeferredTransmissions=%u\n",</div><div class='del'>-		   sums-&gt;tx_deferred_transmissions);</div><div class='del'>-	seq_printf(m, "TxSingleRetryFrames=%u\n", sums-&gt;tx_single_retry_frames);</div><div class='del'>-	seq_printf(m, "TxMultipleRetryFrames=%u\n",</div><div class='del'>-		   sums-&gt;tx_multiple_retry_frames);</div><div class='del'>-	seq_printf(m, "TxRetryLimitExceeded=%u\n",</div><div class='del'>-		   sums-&gt;tx_retry_limit_exceeded);</div><div class='del'>-	seq_printf(m, "TxDiscards=%u\n", sums-&gt;tx_discards);</div><div class='del'>-	seq_printf(m, "RxUnicastFrames=%u\n", sums-&gt;rx_unicast_frames);</div><div class='del'>-	seq_printf(m, "RxMulticastFrames=%u\n", sums-&gt;rx_multicast_frames);</div><div class='del'>-	seq_printf(m, "RxFragments=%u\n", sums-&gt;rx_fragments);</div><div class='del'>-	seq_printf(m, "RxUnicastOctets=%u\n", sums-&gt;rx_unicast_octets);</div><div class='del'>-	seq_printf(m, "RxMulticastOctets=%u\n", sums-&gt;rx_multicast_octets);</div><div class='del'>-	seq_printf(m, "RxFCSErrors=%u\n", sums-&gt;rx_fcs_errors);</div><div class='del'>-	seq_printf(m, "RxDiscardsNoBuffer=%u\n", sums-&gt;rx_discards_no_buffer);</div><div class='del'>-	seq_printf(m, "TxDiscardsWrongSA=%u\n", sums-&gt;tx_discards_wrong_sa);</div><div class='del'>-	seq_printf(m, "RxDiscardsWEPUndecryptable=%u\n",</div><div class='del'>-		   sums-&gt;rx_discards_wep_undecryptable);</div><div class='del'>-	seq_printf(m, "RxMessageInMsgFragments=%u\n",</div><div class='del'>-		   sums-&gt;rx_message_in_msg_fragments);</div><div class='del'>-	seq_printf(m, "RxMessageInBadMsgFragments=%u\n",</div><div class='del'>-		   sums-&gt;rx_message_in_bad_msg_fragments);</div><div class='del'>-	/* FIX: this may grow too long for one page(?) */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int prism2_wds_proc_show(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	struct list_head *ptr = v;</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-</div><div class='del'>-	iface = list_entry(ptr, struct hostap_interface, list);</div><div class='del'>-	if (iface-&gt;type == HOSTAP_INTERFACE_WDS)</div><div class='del'>-		seq_printf(m, "%s\t%pM\n",</div><div class='del'>-			   iface-&gt;dev-&gt;name, iface-&gt;u.wds.remote_addr);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *prism2_wds_proc_start(struct seq_file *m, loff_t *_pos)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = PDE_DATA(file_inode(m-&gt;file));</div><div class='del'>-	read_lock_bh(&amp;local-&gt;iface_lock);</div><div class='del'>-	return seq_list_start(&amp;local-&gt;hostap_interfaces, *_pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *prism2_wds_proc_next(struct seq_file *m, void *v, loff_t *_pos)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = PDE_DATA(file_inode(m-&gt;file));</div><div class='del'>-	return seq_list_next(v, &amp;local-&gt;hostap_interfaces, _pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void prism2_wds_proc_stop(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = PDE_DATA(file_inode(m-&gt;file));</div><div class='del'>-	read_unlock_bh(&amp;local-&gt;iface_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct seq_operations prism2_wds_proc_seqops = {</div><div class='del'>-	.start	= prism2_wds_proc_start,</div><div class='del'>-	.next	= prism2_wds_proc_next,</div><div class='del'>-	.stop	= prism2_wds_proc_stop,</div><div class='del'>-	.show	= prism2_wds_proc_show,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int prism2_bss_list_proc_show(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = PDE_DATA(file_inode(m-&gt;file));</div><div class='del'>-	struct list_head *ptr = v;</div><div class='del'>-	struct hostap_bss_info *bss;</div><div class='del'>-</div><div class='del'>-	if (ptr == &amp;local-&gt;bss_list) {</div><div class='del'>-		seq_printf(m, "#BSSID\tlast_update\tcount\tcapab_info\tSSID(txt)\t"</div><div class='del'>-			   "SSID(hex)\tWPA IE\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bss = list_entry(ptr, struct hostap_bss_info, list);</div><div class='del'>-	seq_printf(m, "%pM\t%lu\t%u\t0x%x\t",</div><div class='del'>-		   bss-&gt;bssid, bss-&gt;last_update,</div><div class='del'>-		   bss-&gt;count, bss-&gt;capab_info);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "%*pE", (int)bss-&gt;ssid_len, bss-&gt;ssid);</div><div class='del'>-</div><div class='del'>-	seq_putc(m, '\t');</div><div class='del'>-	seq_printf(m, "%*phN", (int)bss-&gt;ssid_len, bss-&gt;ssid);</div><div class='del'>-	seq_putc(m, '\t');</div><div class='del'>-	seq_printf(m, "%*phN", (int)bss-&gt;wpa_ie_len, bss-&gt;wpa_ie);</div><div class='del'>-	seq_putc(m, '\n');</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *prism2_bss_list_proc_start(struct seq_file *m, loff_t *_pos)</div><div class='del'>-	__acquires(&amp;local-&gt;lock)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = PDE_DATA(file_inode(m-&gt;file));</div><div class='del'>-	spin_lock_bh(&amp;local-&gt;lock);</div><div class='del'>-	return seq_list_start_head(&amp;local-&gt;bss_list, *_pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *prism2_bss_list_proc_next(struct seq_file *m, void *v, loff_t *_pos)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = PDE_DATA(file_inode(m-&gt;file));</div><div class='del'>-	return seq_list_next(v, &amp;local-&gt;bss_list, _pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void prism2_bss_list_proc_stop(struct seq_file *m, void *v)</div><div class='del'>-	__releases(&amp;local-&gt;lock)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = PDE_DATA(file_inode(m-&gt;file));</div><div class='del'>-	spin_unlock_bh(&amp;local-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct seq_operations prism2_bss_list_proc_seqops = {</div><div class='del'>-	.start	= prism2_bss_list_proc_start,</div><div class='del'>-	.next	= prism2_bss_list_proc_next,</div><div class='del'>-	.stop	= prism2_bss_list_proc_stop,</div><div class='del'>-	.show	= prism2_bss_list_proc_show,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-static int prism2_crypt_proc_show(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = m-&gt;private;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "tx_keyidx=%d\n", local-&gt;crypt_info.tx_keyidx);</div><div class='del'>-	for (i = 0; i &lt; WEP_KEYS; i++) {</div><div class='del'>-		if (local-&gt;crypt_info.crypt[i] &amp;&amp;</div><div class='del'>-		    local-&gt;crypt_info.crypt[i]-&gt;ops &amp;&amp;</div><div class='del'>-		    local-&gt;crypt_info.crypt[i]-&gt;ops-&gt;print_stats) {</div><div class='del'>-			local-&gt;crypt_info.crypt[i]-&gt;ops-&gt;print_stats(</div><div class='del'>-				m, local-&gt;crypt_info.crypt[i]-&gt;priv);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static ssize_t prism2_pda_proc_read(struct file *file, char __user *buf,</div><div class='del'>-				    size_t count, loff_t *_pos)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = PDE_DATA(file_inode(file));</div><div class='del'>-	size_t off;</div><div class='del'>-</div><div class='del'>-	if (local-&gt;pda == NULL || *_pos &gt;= PRISM2_PDA_SIZE)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	off = *_pos;</div><div class='del'>-	if (count &gt; PRISM2_PDA_SIZE - off)</div><div class='del'>-		count = PRISM2_PDA_SIZE - off;</div><div class='del'>-	if (copy_to_user(buf, local-&gt;pda + off, count) != 0)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	*_pos += count;</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct proc_ops prism2_pda_proc_ops = {</div><div class='del'>-	.proc_read	= prism2_pda_proc_read,</div><div class='del'>-	.proc_lseek	= generic_file_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static ssize_t prism2_aux_dump_proc_no_read(struct file *file, char __user *buf,</div><div class='del'>-					    size_t bufsize, loff_t *_pos)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct proc_ops prism2_aux_dump_proc_ops = {</div><div class='del'>-	.proc_read	= prism2_aux_dump_proc_no_read,</div><div class='del'>-	.proc_lseek	= default_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_IO_DEBUG</div><div class='del'>-static int prism2_io_debug_proc_read(char *page, char **start, off_t off,</div><div class='del'>-				     int count, int *eof, void *data)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = (local_info_t *) data;</div><div class='del'>-	int head = local-&gt;io_debug_head;</div><div class='del'>-	int start_bytes, left, copy;</div><div class='del'>-</div><div class='del'>-	if (off + count &gt; PRISM2_IO_DEBUG_SIZE * 4) {</div><div class='del'>-		*eof = 1;</div><div class='del'>-		if (off &gt;= PRISM2_IO_DEBUG_SIZE * 4)</div><div class='del'>-			return 0;</div><div class='del'>-		count = PRISM2_IO_DEBUG_SIZE * 4 - off;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	start_bytes = (PRISM2_IO_DEBUG_SIZE - head) * 4;</div><div class='del'>-	left = count;</div><div class='del'>-</div><div class='del'>-	if (off &lt; start_bytes) {</div><div class='del'>-		copy = start_bytes - off;</div><div class='del'>-		if (copy &gt; count)</div><div class='del'>-			copy = count;</div><div class='del'>-		memcpy(page, ((u8 *) &amp;local-&gt;io_debug[head]) + off, copy);</div><div class='del'>-		left -= copy;</div><div class='del'>-		if (left &gt; 0)</div><div class='del'>-			memcpy(&amp;page[copy], local-&gt;io_debug, left);</div><div class='del'>-	} else {</div><div class='del'>-		memcpy(page, ((u8 *) local-&gt;io_debug) + (off - start_bytes),</div><div class='del'>-		       left);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*start = page;</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-#endif /* PRISM2_IO_DEBUG */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_STATION_MODES</div><div class='del'>-static int prism2_scan_results_proc_show(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = PDE_DATA(file_inode(m-&gt;file));</div><div class='del'>-	unsigned long entry;</div><div class='del'>-	int i, len;</div><div class='del'>-	struct hfa384x_hostscan_result *scanres;</div><div class='del'>-	u8 *p;</div><div class='del'>-</div><div class='del'>-	if (v == SEQ_START_TOKEN) {</div><div class='del'>-		seq_printf(m,</div><div class='del'>-			   "CHID ANL SL BcnInt Capab Rate BSSID ATIM SupRates SSID\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	entry = (unsigned long)v - 2;</div><div class='del'>-	scanres = &amp;local-&gt;last_scan_results[entry];</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "%d %d %d %d 0x%02x %d %pM %d ",</div><div class='del'>-		   le16_to_cpu(scanres-&gt;chid),</div><div class='del'>-		   (s16) le16_to_cpu(scanres-&gt;anl),</div><div class='del'>-		   (s16) le16_to_cpu(scanres-&gt;sl),</div><div class='del'>-		   le16_to_cpu(scanres-&gt;beacon_interval),</div><div class='del'>-		   le16_to_cpu(scanres-&gt;capability),</div><div class='del'>-		   le16_to_cpu(scanres-&gt;rate),</div><div class='del'>-		   scanres-&gt;bssid,</div><div class='del'>-		   le16_to_cpu(scanres-&gt;atim));</div><div class='del'>-</div><div class='del'>-	p = scanres-&gt;sup_rates;</div><div class='del'>-	for (i = 0; i &lt; sizeof(scanres-&gt;sup_rates); i++) {</div><div class='del'>-		if (p[i] == 0)</div><div class='del'>-			break;</div><div class='del'>-		seq_printf(m, "&lt;%02x&gt;", p[i]);</div><div class='del'>-	}</div><div class='del'>-	seq_putc(m, ' ');</div><div class='del'>-</div><div class='del'>-	p = scanres-&gt;ssid;</div><div class='del'>-	len = le16_to_cpu(scanres-&gt;ssid_len);</div><div class='del'>-	if (len &gt; 32)</div><div class='del'>-		len = 32;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		unsigned char c = p[i];</div><div class='del'>-		if (c &gt;= 32 &amp;&amp; c &lt; 127)</div><div class='del'>-			seq_putc(m, c);</div><div class='del'>-		else</div><div class='del'>-			seq_printf(m, "&lt;%02x&gt;", c);</div><div class='del'>-	}</div><div class='del'>-	seq_putc(m, '\n');</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *prism2_scan_results_proc_start(struct seq_file *m, loff_t *_pos)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = PDE_DATA(file_inode(m-&gt;file));</div><div class='del'>-	spin_lock_bh(&amp;local-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/* We have a header (pos 0) + N results to show (pos 1...N) */</div><div class='del'>-	if (*_pos &gt; local-&gt;last_scan_results_count)</div><div class='del'>-		return NULL;</div><div class='del'>-	return (void *)(unsigned long)(*_pos + 1); /* 0 would be EOF */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *prism2_scan_results_proc_next(struct seq_file *m, void *v, loff_t *_pos)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = PDE_DATA(file_inode(m-&gt;file));</div><div class='del'>-</div><div class='del'>-	++*_pos;</div><div class='del'>-	if (*_pos &gt; local-&gt;last_scan_results_count)</div><div class='del'>-		return NULL;</div><div class='del'>-	return (void *)(unsigned long)(*_pos + 1); /* 0 would be EOF */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void prism2_scan_results_proc_stop(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	local_info_t *local = PDE_DATA(file_inode(m-&gt;file));</div><div class='del'>-	spin_unlock_bh(&amp;local-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct seq_operations prism2_scan_results_proc_seqops = {</div><div class='del'>-	.start	= prism2_scan_results_proc_start,</div><div class='del'>-	.next	= prism2_scan_results_proc_next,</div><div class='del'>-	.stop	= prism2_scan_results_proc_stop,</div><div class='del'>-	.show	= prism2_scan_results_proc_show,</div><div class='del'>-};</div><div class='del'>-#endif /* PRISM2_NO_STATION_MODES */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void hostap_init_proc(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	local-&gt;proc = NULL;</div><div class='del'>-</div><div class='del'>-	if (hostap_proc == NULL) {</div><div class='del'>-		printk(KERN_WARNING "%s: hostap proc directory not created\n",</div><div class='del'>-		       local-&gt;dev-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	local-&gt;proc = proc_mkdir(local-&gt;ddev-&gt;name, hostap_proc);</div><div class='del'>-	if (local-&gt;proc == NULL) {</div><div class='del'>-		printk(KERN_INFO "/proc/net/hostap/%s creation failed\n",</div><div class='del'>-		       local-&gt;ddev-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_PROCFS_DEBUG</div><div class='del'>-	proc_create_single_data("debug", 0, local-&gt;proc,</div><div class='del'>-			prism2_debug_proc_show, local);</div><div class='del'>-#endif /* PRISM2_NO_PROCFS_DEBUG */</div><div class='del'>-	proc_create_single_data("stats", 0, local-&gt;proc, prism2_stats_proc_show,</div><div class='del'>-			local);</div><div class='del'>-	proc_create_seq_data("wds", 0, local-&gt;proc,</div><div class='del'>-			&amp;prism2_wds_proc_seqops, local);</div><div class='del'>-	proc_create_data("pda", 0, local-&gt;proc,</div><div class='del'>-			 &amp;prism2_pda_proc_ops, local);</div><div class='del'>-	proc_create_data("aux_dump", 0, local-&gt;proc,</div><div class='del'>-			 local-&gt;func-&gt;read_aux_proc_ops ?: &amp;prism2_aux_dump_proc_ops,</div><div class='del'>-			 local);</div><div class='del'>-	proc_create_seq_data("bss_list", 0, local-&gt;proc,</div><div class='del'>-			&amp;prism2_bss_list_proc_seqops, local);</div><div class='del'>-	proc_create_single_data("crypt", 0, local-&gt;proc, prism2_crypt_proc_show,</div><div class='del'>-		local);</div><div class='del'>-#ifdef PRISM2_IO_DEBUG</div><div class='del'>-	proc_create_single_data("io_debug", 0, local-&gt;proc,</div><div class='del'>-			prism2_debug_proc_show, local);</div><div class='del'>-#endif /* PRISM2_IO_DEBUG */</div><div class='del'>-#ifndef PRISM2_NO_STATION_MODES</div><div class='del'>-	proc_create_seq_data("scan_results", 0, local-&gt;proc,</div><div class='del'>-			&amp;prism2_scan_results_proc_seqops, local);</div><div class='del'>-#endif /* PRISM2_NO_STATION_MODES */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void hostap_remove_proc(local_info_t *local)</div><div class='del'>-{</div><div class='del'>-	proc_remove(local-&gt;proc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(hostap_init_proc);</div><div class='del'>-EXPORT_SYMBOL(hostap_remove_proc);</div><div class='head'>diff --git a/drivers/net/wireless/intersil/hostap/hostap_wlan.h b/drivers/net/wireless/intersil/hostap/hostap_wlan.h<br/>deleted file mode 100644<br/>index dd2603d9b5d3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/hostap/hostap_wlan.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/hostap/hostap_wlan.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1049 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef HOSTAP_WLAN_H</div><div class='del'>-#define HOSTAP_WLAN_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/wireless.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/refcount.h&gt;</div><div class='del'>-#include &lt;net/iw_handler.h&gt;</div><div class='del'>-#include &lt;net/ieee80211_radiotap.h&gt;</div><div class='del'>-#include &lt;net/lib80211.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hostap_config.h"</div><div class='del'>-#include "hostap_common.h"</div><div class='del'>-</div><div class='del'>-#define MAX_PARM_DEVICES 8</div><div class='del'>-#define PARM_MIN_MAX "1-" __MODULE_STRING(MAX_PARM_DEVICES)</div><div class='del'>-#define DEF_INTS -1, -1, -1, -1, -1, -1, -1</div><div class='del'>-#define GET_INT_PARM(var,idx) var[var[idx] &lt; 0 ? 0 : idx]</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Specific skb-&gt;protocol value that indicates that the packet already contains</div><div class='del'>- * txdesc header.</div><div class='del'>- * FIX: This might need own value that would be allocated especially for Prism2</div><div class='del'>- * txdesc; ETH_P_CONTROL is commented as "Card specific control frames".</div><div class='del'>- * However, these skb's should have only minimal path in the kernel side since</div><div class='del'>- * prism2_send_mgmt() sends these with dev_queue_xmit() to prism2_tx(). */</div><div class='del'>-#define ETH_P_HOSTAP ETH_P_CONTROL</div><div class='del'>-</div><div class='del'>-/* ARPHRD_IEEE80211_PRISM uses a bloated version of Prism2 RX frame header</div><div class='del'>- * (from linux-wlan-ng) */</div><div class='del'>-struct linux_wlan_ng_val {</div><div class='del'>-	u32 did;</div><div class='del'>-	u16 status, len;</div><div class='del'>-	u32 data;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct linux_wlan_ng_prism_hdr {</div><div class='del'>-	u32 msgcode, msglen;</div><div class='del'>-	char devname[16];</div><div class='del'>-	struct linux_wlan_ng_val hosttime, mactime, channel, rssi, sq, signal,</div><div class='del'>-		noise, rate, istx, frmlen;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct linux_wlan_ng_cap_hdr {</div><div class='del'>-	__be32 version;</div><div class='del'>-	__be32 length;</div><div class='del'>-	__be64 mactime;</div><div class='del'>-	__be64 hosttime;</div><div class='del'>-	__be32 phytype;</div><div class='del'>-	__be32 channel;</div><div class='del'>-	__be32 datarate;</div><div class='del'>-	__be32 antenna;</div><div class='del'>-	__be32 priority;</div><div class='del'>-	__be32 ssi_type;</div><div class='del'>-	__be32 ssi_signal;</div><div class='del'>-	__be32 ssi_noise;</div><div class='del'>-	__be32 preamble;</div><div class='del'>-	__be32 encoding;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hostap_radiotap_rx {</div><div class='del'>-	struct ieee80211_radiotap_header hdr;</div><div class='del'>-	__le64 tsft;</div><div class='del'>-	u8 rate;</div><div class='del'>-	u8 padding;</div><div class='del'>-	__le16 chan_freq;</div><div class='del'>-	__le16 chan_flags;</div><div class='del'>-	s8 dbm_antsignal;</div><div class='del'>-	s8 dbm_antnoise;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define LWNG_CAP_DID_BASE   (4 | (1 &lt;&lt; 6)) /* section 4, group 1 */</div><div class='del'>-#define LWNG_CAPHDR_VERSION 0x80211001</div><div class='del'>-</div><div class='del'>-struct hfa384x_rx_frame {</div><div class='del'>-	/* HFA384X RX frame descriptor */</div><div class='del'>-	__le16 status; /* HFA384X_RX_STATUS_ flags */</div><div class='del'>-	__le32 time; /* timestamp, 1 microsecond resolution */</div><div class='del'>-	u8 silence; /* 27 .. 154; seems to be 0 */</div><div class='del'>-	u8 signal; /* 27 .. 154 */</div><div class='del'>-	u8 rate; /* 10, 20, 55, or 110 */</div><div class='del'>-	u8 rxflow;</div><div class='del'>-	__le32 reserved;</div><div class='del'>-</div><div class='del'>-	/* 802.11 */</div><div class='del'>-	__le16 frame_control;</div><div class='del'>-	__le16 duration_id;</div><div class='del'>-	u8 addr1[ETH_ALEN];</div><div class='del'>-	u8 addr2[ETH_ALEN];</div><div class='del'>-	u8 addr3[ETH_ALEN];</div><div class='del'>-	__le16 seq_ctrl;</div><div class='del'>-	u8 addr4[ETH_ALEN];</div><div class='del'>-	__le16 data_len;</div><div class='del'>-</div><div class='del'>-	/* 802.3 */</div><div class='del'>-	u8 dst_addr[ETH_ALEN];</div><div class='del'>-	u8 src_addr[ETH_ALEN];</div><div class='del'>-	__be16 len;</div><div class='del'>-</div><div class='del'>-	/* followed by frame data; max 2304 bytes */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct hfa384x_tx_frame {</div><div class='del'>-	/* HFA384X TX frame descriptor */</div><div class='del'>-	__le16 status; /* HFA384X_TX_STATUS_ flags */</div><div class='del'>-	__le16 reserved1;</div><div class='del'>-	__le16 reserved2;</div><div class='del'>-	__le32 sw_support;</div><div class='del'>-	u8 retry_count; /* not yet implemented */</div><div class='del'>-	u8 tx_rate; /* Host AP only; 0 = firmware, or 10, 20, 55, 110 */</div><div class='del'>-	__le16 tx_control; /* HFA384X_TX_CTRL_ flags */</div><div class='del'>-</div><div class='del'>-	/* 802.11 */</div><div class='del'>-	__le16 frame_control; /* parts not used */</div><div class='del'>-	__le16 duration_id;</div><div class='del'>-	u8 addr1[ETH_ALEN];</div><div class='del'>-	u8 addr2[ETH_ALEN]; /* filled by firmware */</div><div class='del'>-	u8 addr3[ETH_ALEN];</div><div class='del'>-	__le16 seq_ctrl; /* filled by firmware */</div><div class='del'>-	u8 addr4[ETH_ALEN];</div><div class='del'>-	__le16 data_len;</div><div class='del'>-</div><div class='del'>-	/* 802.3 */</div><div class='del'>-	u8 dst_addr[ETH_ALEN];</div><div class='del'>-	u8 src_addr[ETH_ALEN];</div><div class='del'>-	__be16 len;</div><div class='del'>-</div><div class='del'>-	/* followed by frame data; max 2304 bytes */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct hfa384x_rid_hdr</div><div class='del'>-{</div><div class='del'>-	__le16 len;</div><div class='del'>-	__le16 rid;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Macro for converting signal levels (range 27 .. 154) to wireless ext</div><div class='del'>- * dBm value with some accuracy */</div><div class='del'>-#define HFA384X_LEVEL_TO_dBm(v) 0x100 + (v) * 100 / 255 - 100</div><div class='del'>-</div><div class='del'>-#define HFA384X_LEVEL_TO_dBm_sign(v) (v) * 100 / 255 - 100</div><div class='del'>-</div><div class='del'>-struct hfa384x_scan_request {</div><div class='del'>-	__le16 channel_list;</div><div class='del'>-	__le16 txrate; /* HFA384X_RATES_* */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hfa384x_hostscan_request {</div><div class='del'>-	__le16 channel_list;</div><div class='del'>-	__le16 txrate;</div><div class='del'>-	__le16 target_ssid_len;</div><div class='del'>-	u8 target_ssid[32];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hfa384x_join_request {</div><div class='del'>-	u8 bssid[ETH_ALEN];</div><div class='del'>-	__le16 channel;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hfa384x_info_frame {</div><div class='del'>-	__le16 len;</div><div class='del'>-	__le16 type;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hfa384x_comm_tallies {</div><div class='del'>-	__le16 tx_unicast_frames;</div><div class='del'>-	__le16 tx_multicast_frames;</div><div class='del'>-	__le16 tx_fragments;</div><div class='del'>-	__le16 tx_unicast_octets;</div><div class='del'>-	__le16 tx_multicast_octets;</div><div class='del'>-	__le16 tx_deferred_transmissions;</div><div class='del'>-	__le16 tx_single_retry_frames;</div><div class='del'>-	__le16 tx_multiple_retry_frames;</div><div class='del'>-	__le16 tx_retry_limit_exceeded;</div><div class='del'>-	__le16 tx_discards;</div><div class='del'>-	__le16 rx_unicast_frames;</div><div class='del'>-	__le16 rx_multicast_frames;</div><div class='del'>-	__le16 rx_fragments;</div><div class='del'>-	__le16 rx_unicast_octets;</div><div class='del'>-	__le16 rx_multicast_octets;</div><div class='del'>-	__le16 rx_fcs_errors;</div><div class='del'>-	__le16 rx_discards_no_buffer;</div><div class='del'>-	__le16 tx_discards_wrong_sa;</div><div class='del'>-	__le16 rx_discards_wep_undecryptable;</div><div class='del'>-	__le16 rx_message_in_msg_fragments;</div><div class='del'>-	__le16 rx_message_in_bad_msg_fragments;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hfa384x_comm_tallies32 {</div><div class='del'>-	__le32 tx_unicast_frames;</div><div class='del'>-	__le32 tx_multicast_frames;</div><div class='del'>-	__le32 tx_fragments;</div><div class='del'>-	__le32 tx_unicast_octets;</div><div class='del'>-	__le32 tx_multicast_octets;</div><div class='del'>-	__le32 tx_deferred_transmissions;</div><div class='del'>-	__le32 tx_single_retry_frames;</div><div class='del'>-	__le32 tx_multiple_retry_frames;</div><div class='del'>-	__le32 tx_retry_limit_exceeded;</div><div class='del'>-	__le32 tx_discards;</div><div class='del'>-	__le32 rx_unicast_frames;</div><div class='del'>-	__le32 rx_multicast_frames;</div><div class='del'>-	__le32 rx_fragments;</div><div class='del'>-	__le32 rx_unicast_octets;</div><div class='del'>-	__le32 rx_multicast_octets;</div><div class='del'>-	__le32 rx_fcs_errors;</div><div class='del'>-	__le32 rx_discards_no_buffer;</div><div class='del'>-	__le32 tx_discards_wrong_sa;</div><div class='del'>-	__le32 rx_discards_wep_undecryptable;</div><div class='del'>-	__le32 rx_message_in_msg_fragments;</div><div class='del'>-	__le32 rx_message_in_bad_msg_fragments;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hfa384x_scan_result_hdr {</div><div class='del'>-	__le16 reserved;</div><div class='del'>-	__le16 scan_reason;</div><div class='del'>-#define HFA384X_SCAN_IN_PROGRESS 0 /* no results available yet */</div><div class='del'>-#define HFA384X_SCAN_HOST_INITIATED 1</div><div class='del'>-#define HFA384X_SCAN_FIRMWARE_INITIATED 2</div><div class='del'>-#define HFA384X_SCAN_INQUIRY_FROM_HOST 3</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define HFA384X_SCAN_MAX_RESULTS 32</div><div class='del'>-</div><div class='del'>-struct hfa384x_scan_result {</div><div class='del'>-	__le16 chid;</div><div class='del'>-	__le16 anl;</div><div class='del'>-	__le16 sl;</div><div class='del'>-	u8 bssid[ETH_ALEN];</div><div class='del'>-	__le16 beacon_interval;</div><div class='del'>-	__le16 capability;</div><div class='del'>-	__le16 ssid_len;</div><div class='del'>-	u8 ssid[32];</div><div class='del'>-	u8 sup_rates[10];</div><div class='del'>-	__le16 rate;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hfa384x_hostscan_result {</div><div class='del'>-	__le16 chid;</div><div class='del'>-	__le16 anl;</div><div class='del'>-	__le16 sl;</div><div class='del'>-	u8 bssid[ETH_ALEN];</div><div class='del'>-	__le16 beacon_interval;</div><div class='del'>-	__le16 capability;</div><div class='del'>-	__le16 ssid_len;</div><div class='del'>-	u8 ssid[32];</div><div class='del'>-	u8 sup_rates[10];</div><div class='del'>-	__le16 rate;</div><div class='del'>-	__le16 atim;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct comm_tallies_sums {</div><div class='del'>-	unsigned int tx_unicast_frames;</div><div class='del'>-	unsigned int tx_multicast_frames;</div><div class='del'>-	unsigned int tx_fragments;</div><div class='del'>-	unsigned int tx_unicast_octets;</div><div class='del'>-	unsigned int tx_multicast_octets;</div><div class='del'>-	unsigned int tx_deferred_transmissions;</div><div class='del'>-	unsigned int tx_single_retry_frames;</div><div class='del'>-	unsigned int tx_multiple_retry_frames;</div><div class='del'>-	unsigned int tx_retry_limit_exceeded;</div><div class='del'>-	unsigned int tx_discards;</div><div class='del'>-	unsigned int rx_unicast_frames;</div><div class='del'>-	unsigned int rx_multicast_frames;</div><div class='del'>-	unsigned int rx_fragments;</div><div class='del'>-	unsigned int rx_unicast_octets;</div><div class='del'>-	unsigned int rx_multicast_octets;</div><div class='del'>-	unsigned int rx_fcs_errors;</div><div class='del'>-	unsigned int rx_discards_no_buffer;</div><div class='del'>-	unsigned int tx_discards_wrong_sa;</div><div class='del'>-	unsigned int rx_discards_wep_undecryptable;</div><div class='del'>-	unsigned int rx_message_in_msg_fragments;</div><div class='del'>-	unsigned int rx_message_in_bad_msg_fragments;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct hfa384x_regs {</div><div class='del'>-	u16 cmd;</div><div class='del'>-	u16 evstat;</div><div class='del'>-	u16 offset0;</div><div class='del'>-	u16 offset1;</div><div class='del'>-	u16 swsupport0;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if defined(PRISM2_PCCARD) || defined(PRISM2_PLX)</div><div class='del'>-/* I/O ports for HFA384X Controller access */</div><div class='del'>-#define HFA384X_CMD_OFF 0x00</div><div class='del'>-#define HFA384X_PARAM0_OFF 0x02</div><div class='del'>-#define HFA384X_PARAM1_OFF 0x04</div><div class='del'>-#define HFA384X_PARAM2_OFF 0x06</div><div class='del'>-#define HFA384X_STATUS_OFF 0x08</div><div class='del'>-#define HFA384X_RESP0_OFF 0x0A</div><div class='del'>-#define HFA384X_RESP1_OFF 0x0C</div><div class='del'>-#define HFA384X_RESP2_OFF 0x0E</div><div class='del'>-#define HFA384X_INFOFID_OFF 0x10</div><div class='del'>-#define HFA384X_CONTROL_OFF 0x14</div><div class='del'>-#define HFA384X_SELECT0_OFF 0x18</div><div class='del'>-#define HFA384X_SELECT1_OFF 0x1A</div><div class='del'>-#define HFA384X_OFFSET0_OFF 0x1C</div><div class='del'>-#define HFA384X_OFFSET1_OFF 0x1E</div><div class='del'>-#define HFA384X_RXFID_OFF 0x20</div><div class='del'>-#define HFA384X_ALLOCFID_OFF 0x22</div><div class='del'>-#define HFA384X_TXCOMPLFID_OFF 0x24</div><div class='del'>-#define HFA384X_SWSUPPORT0_OFF 0x28</div><div class='del'>-#define HFA384X_SWSUPPORT1_OFF 0x2A</div><div class='del'>-#define HFA384X_SWSUPPORT2_OFF 0x2C</div><div class='del'>-#define HFA384X_EVSTAT_OFF 0x30</div><div class='del'>-#define HFA384X_INTEN_OFF 0x32</div><div class='del'>-#define HFA384X_EVACK_OFF 0x34</div><div class='del'>-#define HFA384X_DATA0_OFF 0x36</div><div class='del'>-#define HFA384X_DATA1_OFF 0x38</div><div class='del'>-#define HFA384X_AUXPAGE_OFF 0x3A</div><div class='del'>-#define HFA384X_AUXOFFSET_OFF 0x3C</div><div class='del'>-#define HFA384X_AUXDATA_OFF 0x3E</div><div class='del'>-#endif /* PRISM2_PCCARD || PRISM2_PLX */</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_PCI</div><div class='del'>-/* Memory addresses for ISL3874 controller access */</div><div class='del'>-#define HFA384X_CMD_OFF 0x00</div><div class='del'>-#define HFA384X_PARAM0_OFF 0x04</div><div class='del'>-#define HFA384X_PARAM1_OFF 0x08</div><div class='del'>-#define HFA384X_PARAM2_OFF 0x0C</div><div class='del'>-#define HFA384X_STATUS_OFF 0x10</div><div class='del'>-#define HFA384X_RESP0_OFF 0x14</div><div class='del'>-#define HFA384X_RESP1_OFF 0x18</div><div class='del'>-#define HFA384X_RESP2_OFF 0x1C</div><div class='del'>-#define HFA384X_INFOFID_OFF 0x20</div><div class='del'>-#define HFA384X_CONTROL_OFF 0x28</div><div class='del'>-#define HFA384X_SELECT0_OFF 0x30</div><div class='del'>-#define HFA384X_SELECT1_OFF 0x34</div><div class='del'>-#define HFA384X_OFFSET0_OFF 0x38</div><div class='del'>-#define HFA384X_OFFSET1_OFF 0x3C</div><div class='del'>-#define HFA384X_RXFID_OFF 0x40</div><div class='del'>-#define HFA384X_ALLOCFID_OFF 0x44</div><div class='del'>-#define HFA384X_TXCOMPLFID_OFF 0x48</div><div class='del'>-#define HFA384X_PCICOR_OFF 0x4C</div><div class='del'>-#define HFA384X_SWSUPPORT0_OFF 0x50</div><div class='del'>-#define HFA384X_SWSUPPORT1_OFF 0x54</div><div class='del'>-#define HFA384X_SWSUPPORT2_OFF 0x58</div><div class='del'>-#define HFA384X_PCIHCR_OFF 0x5C</div><div class='del'>-#define HFA384X_EVSTAT_OFF 0x60</div><div class='del'>-#define HFA384X_INTEN_OFF 0x64</div><div class='del'>-#define HFA384X_EVACK_OFF 0x68</div><div class='del'>-#define HFA384X_DATA0_OFF 0x6C</div><div class='del'>-#define HFA384X_DATA1_OFF 0x70</div><div class='del'>-#define HFA384X_AUXPAGE_OFF 0x74</div><div class='del'>-#define HFA384X_AUXOFFSET_OFF 0x78</div><div class='del'>-#define HFA384X_AUXDATA_OFF 0x7C</div><div class='del'>-#define HFA384X_PCI_M0_ADDRH_OFF 0x80</div><div class='del'>-#define HFA384X_PCI_M0_ADDRL_OFF 0x84</div><div class='del'>-#define HFA384X_PCI_M0_LEN_OFF 0x88</div><div class='del'>-#define HFA384X_PCI_M0_CTL_OFF 0x8C</div><div class='del'>-#define HFA384X_PCI_STATUS_OFF 0x98</div><div class='del'>-#define HFA384X_PCI_M1_ADDRH_OFF 0xA0</div><div class='del'>-#define HFA384X_PCI_M1_ADDRL_OFF 0xA4</div><div class='del'>-#define HFA384X_PCI_M1_LEN_OFF 0xA8</div><div class='del'>-#define HFA384X_PCI_M1_CTL_OFF 0xAC</div><div class='del'>-</div><div class='del'>-/* PCI bus master control bits (these are undocumented; based on guessing and</div><div class='del'>- * experimenting..) */</div><div class='del'>-#define HFA384X_PCI_CTL_FROM_BAP (BIT(5) | BIT(1) | BIT(0))</div><div class='del'>-#define HFA384X_PCI_CTL_TO_BAP (BIT(5) | BIT(0))</div><div class='del'>-</div><div class='del'>-#endif /* PRISM2_PCI */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Command codes for CMD reg. */</div><div class='del'>-#define HFA384X_CMDCODE_INIT 0x00</div><div class='del'>-#define HFA384X_CMDCODE_ENABLE 0x01</div><div class='del'>-#define HFA384X_CMDCODE_DISABLE 0x02</div><div class='del'>-#define HFA384X_CMDCODE_ALLOC 0x0A</div><div class='del'>-#define HFA384X_CMDCODE_TRANSMIT 0x0B</div><div class='del'>-#define HFA384X_CMDCODE_INQUIRE 0x11</div><div class='del'>-#define HFA384X_CMDCODE_ACCESS 0x21</div><div class='del'>-#define HFA384X_CMDCODE_ACCESS_WRITE (0x21 | BIT(8))</div><div class='del'>-#define HFA384X_CMDCODE_DOWNLOAD 0x22</div><div class='del'>-#define HFA384X_CMDCODE_READMIF 0x30</div><div class='del'>-#define HFA384X_CMDCODE_WRITEMIF 0x31</div><div class='del'>-#define HFA384X_CMDCODE_TEST 0x38</div><div class='del'>-</div><div class='del'>-#define HFA384X_CMDCODE_MASK 0x3F</div><div class='del'>-</div><div class='del'>-/* Test mode operations */</div><div class='del'>-#define HFA384X_TEST_CHANGE_CHANNEL 0x08</div><div class='del'>-#define HFA384X_TEST_MONITOR 0x0B</div><div class='del'>-#define HFA384X_TEST_STOP 0x0F</div><div class='del'>-#define HFA384X_TEST_CFG_BITS 0x15</div><div class='del'>-#define HFA384X_TEST_CFG_BIT_ALC BIT(3)</div><div class='del'>-</div><div class='del'>-#define HFA384X_CMD_BUSY BIT(15)</div><div class='del'>-</div><div class='del'>-#define HFA384X_CMD_TX_RECLAIM BIT(8)</div><div class='del'>-</div><div class='del'>-#define HFA384X_OFFSET_ERR BIT(14)</div><div class='del'>-#define HFA384X_OFFSET_BUSY BIT(15)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* ProgMode for download command */</div><div class='del'>-#define HFA384X_PROGMODE_DISABLE 0</div><div class='del'>-#define HFA384X_PROGMODE_ENABLE_VOLATILE 1</div><div class='del'>-#define HFA384X_PROGMODE_ENABLE_NON_VOLATILE 2</div><div class='del'>-#define HFA384X_PROGMODE_PROGRAM_NON_VOLATILE 3</div><div class='del'>-</div><div class='del'>-#define HFA384X_AUX_MAGIC0 0xfe01</div><div class='del'>-#define HFA384X_AUX_MAGIC1 0xdc23</div><div class='del'>-#define HFA384X_AUX_MAGIC2 0xba45</div><div class='del'>-</div><div class='del'>-#define HFA384X_AUX_PORT_DISABLED 0</div><div class='del'>-#define HFA384X_AUX_PORT_DISABLE BIT(14)</div><div class='del'>-#define HFA384X_AUX_PORT_ENABLE BIT(15)</div><div class='del'>-#define HFA384X_AUX_PORT_ENABLED (BIT(14) | BIT(15))</div><div class='del'>-#define HFA384X_AUX_PORT_MASK (BIT(14) | BIT(15))</div><div class='del'>-</div><div class='del'>-#define PRISM2_PDA_SIZE 1024</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Events; EvStat, Interrupt mask (IntEn), and acknowledge bits (EvAck) */</div><div class='del'>-#define HFA384X_EV_TICK BIT(15)</div><div class='del'>-#define HFA384X_EV_WTERR BIT(14)</div><div class='del'>-#define HFA384X_EV_INFDROP BIT(13)</div><div class='del'>-#ifdef PRISM2_PCI</div><div class='del'>-#define HFA384X_EV_PCI_M1 BIT(9)</div><div class='del'>-#define HFA384X_EV_PCI_M0 BIT(8)</div><div class='del'>-#endif /* PRISM2_PCI */</div><div class='del'>-#define HFA384X_EV_INFO BIT(7)</div><div class='del'>-#define HFA384X_EV_DTIM BIT(5)</div><div class='del'>-#define HFA384X_EV_CMD BIT(4)</div><div class='del'>-#define HFA384X_EV_ALLOC BIT(3)</div><div class='del'>-#define HFA384X_EV_TXEXC BIT(2)</div><div class='del'>-#define HFA384X_EV_TX BIT(1)</div><div class='del'>-#define HFA384X_EV_RX BIT(0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* HFA384X Information frames */</div><div class='del'>-#define HFA384X_INFO_HANDOVERADDR 0xF000 /* AP f/w ? */</div><div class='del'>-#define HFA384X_INFO_HANDOVERDEAUTHADDR 0xF001 /* AP f/w 1.3.7 */</div><div class='del'>-#define HFA384X_INFO_COMMTALLIES 0xF100</div><div class='del'>-#define HFA384X_INFO_SCANRESULTS 0xF101</div><div class='del'>-#define HFA384X_INFO_CHANNELINFORESULTS 0xF102 /* AP f/w only */</div><div class='del'>-#define HFA384X_INFO_HOSTSCANRESULTS 0xF103</div><div class='del'>-#define HFA384X_INFO_LINKSTATUS 0xF200</div><div class='del'>-#define HFA384X_INFO_ASSOCSTATUS 0xF201 /* ? */</div><div class='del'>-#define HFA384X_INFO_AUTHREQ 0xF202 /* ? */</div><div class='del'>-#define HFA384X_INFO_PSUSERCNT 0xF203 /* ? */</div><div class='del'>-#define HFA384X_INFO_KEYIDCHANGED 0xF204 /* ? */</div><div class='del'>-</div><div class='del'>-enum { HFA384X_LINKSTATUS_CONNECTED = 1,</div><div class='del'>-       HFA384X_LINKSTATUS_DISCONNECTED = 2,</div><div class='del'>-       HFA384X_LINKSTATUS_AP_CHANGE = 3,</div><div class='del'>-       HFA384X_LINKSTATUS_AP_OUT_OF_RANGE = 4,</div><div class='del'>-       HFA384X_LINKSTATUS_AP_IN_RANGE = 5,</div><div class='del'>-       HFA384X_LINKSTATUS_ASSOC_FAILED = 6 };</div><div class='del'>-</div><div class='del'>-enum { HFA384X_PORTTYPE_BSS = 1, HFA384X_PORTTYPE_WDS = 2,</div><div class='del'>-       HFA384X_PORTTYPE_PSEUDO_IBSS = 3, HFA384X_PORTTYPE_IBSS = 0,</div><div class='del'>-       HFA384X_PORTTYPE_HOSTAP = 6 };</div><div class='del'>-</div><div class='del'>-#define HFA384X_RATES_1MBPS BIT(0)</div><div class='del'>-#define HFA384X_RATES_2MBPS BIT(1)</div><div class='del'>-#define HFA384X_RATES_5MBPS BIT(2)</div><div class='del'>-#define HFA384X_RATES_11MBPS BIT(3)</div><div class='del'>-</div><div class='del'>-#define HFA384X_ROAMING_FIRMWARE 1</div><div class='del'>-#define HFA384X_ROAMING_HOST 2</div><div class='del'>-#define HFA384X_ROAMING_DISABLED 3</div><div class='del'>-</div><div class='del'>-#define HFA384X_WEPFLAGS_PRIVACYINVOKED BIT(0)</div><div class='del'>-#define HFA384X_WEPFLAGS_EXCLUDEUNENCRYPTED BIT(1)</div><div class='del'>-#define HFA384X_WEPFLAGS_HOSTENCRYPT BIT(4)</div><div class='del'>-#define HFA384X_WEPFLAGS_HOSTDECRYPT BIT(7)</div><div class='del'>-</div><div class='del'>-#define HFA384X_RX_STATUS_MSGTYPE (BIT(15) | BIT(14) | BIT(13))</div><div class='del'>-#define HFA384X_RX_STATUS_PCF BIT(12)</div><div class='del'>-#define HFA384X_RX_STATUS_MACPORT (BIT(10) | BIT(9) | BIT(8))</div><div class='del'>-#define HFA384X_RX_STATUS_UNDECR BIT(1)</div><div class='del'>-#define HFA384X_RX_STATUS_FCSERR BIT(0)</div><div class='del'>-</div><div class='del'>-#define HFA384X_RX_STATUS_GET_MSGTYPE(s) \</div><div class='del'>-(((s) &amp; HFA384X_RX_STATUS_MSGTYPE) &gt;&gt; 13)</div><div class='del'>-#define HFA384X_RX_STATUS_GET_MACPORT(s) \</div><div class='del'>-(((s) &amp; HFA384X_RX_STATUS_MACPORT) &gt;&gt; 8)</div><div class='del'>-</div><div class='del'>-enum { HFA384X_RX_MSGTYPE_NORMAL = 0, HFA384X_RX_MSGTYPE_RFC1042 = 1,</div><div class='del'>-       HFA384X_RX_MSGTYPE_BRIDGETUNNEL = 2, HFA384X_RX_MSGTYPE_MGMT = 4 };</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define HFA384X_TX_CTRL_ALT_RTRY BIT(5)</div><div class='del'>-#define HFA384X_TX_CTRL_802_11 BIT(3)</div><div class='del'>-#define HFA384X_TX_CTRL_802_3 0</div><div class='del'>-#define HFA384X_TX_CTRL_TX_EX BIT(2)</div><div class='del'>-#define HFA384X_TX_CTRL_TX_OK BIT(1)</div><div class='del'>-</div><div class='del'>-#define HFA384X_TX_STATUS_RETRYERR BIT(0)</div><div class='del'>-#define HFA384X_TX_STATUS_AGEDERR BIT(1)</div><div class='del'>-#define HFA384X_TX_STATUS_DISCON BIT(2)</div><div class='del'>-#define HFA384X_TX_STATUS_FORMERR BIT(3)</div><div class='del'>-</div><div class='del'>-/* HFA3861/3863 (BBP) Control Registers */</div><div class='del'>-#define HFA386X_CR_TX_CONFIGURE 0x12 /* CR9 */</div><div class='del'>-#define HFA386X_CR_RX_CONFIGURE 0x14 /* CR10 */</div><div class='del'>-#define HFA386X_CR_A_D_TEST_MODES2 0x1A /* CR13 */</div><div class='del'>-#define HFA386X_CR_MANUAL_TX_POWER 0x3E /* CR31 */</div><div class='del'>-#define HFA386X_CR_MEASURED_TX_POWER 0x74 /* CR58 */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-</div><div class='del'>-#define PRISM2_TXFID_COUNT 8</div><div class='del'>-#define PRISM2_DATA_MAXLEN 2304</div><div class='del'>-#define PRISM2_TXFID_LEN (PRISM2_DATA_MAXLEN + sizeof(struct hfa384x_tx_frame))</div><div class='del'>-#define PRISM2_TXFID_EMPTY 0xffff</div><div class='del'>-#define PRISM2_TXFID_RESERVED 0xfffe</div><div class='del'>-#define PRISM2_DUMMY_FID 0xffff</div><div class='del'>-#define MAX_SSID_LEN 32</div><div class='del'>-#define MAX_NAME_LEN 32 /* this is assumed to be equal to MAX_SSID_LEN */</div><div class='del'>-</div><div class='del'>-#define PRISM2_DUMP_RX_HDR BIT(0)</div><div class='del'>-#define PRISM2_DUMP_TX_HDR BIT(1)</div><div class='del'>-#define PRISM2_DUMP_TXEXC_HDR BIT(2)</div><div class='del'>-</div><div class='del'>-struct hostap_tx_callback_info {</div><div class='del'>-	u16 idx;</div><div class='del'>-	void (*func)(struct sk_buff *, int ok, void *);</div><div class='del'>-	void *data;</div><div class='del'>-	struct hostap_tx_callback_info *next;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* IEEE 802.11 requires that STA supports concurrent reception of at least</div><div class='del'>- * three fragmented frames. This define can be increased to support more</div><div class='del'>- * concurrent frames, but it should be noted that each entry can consume about</div><div class='del'>- * 2 kB of RAM and increasing cache size will slow down frame reassembly. */</div><div class='del'>-#define PRISM2_FRAG_CACHE_LEN 4</div><div class='del'>-</div><div class='del'>-struct prism2_frag_entry {</div><div class='del'>-	unsigned long first_frag_time;</div><div class='del'>-	unsigned int seq;</div><div class='del'>-	unsigned int last_frag;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	u8 src_addr[ETH_ALEN];</div><div class='del'>-	u8 dst_addr[ETH_ALEN];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct hostap_cmd_queue {</div><div class='del'>-	struct list_head list;</div><div class='del'>-	wait_queue_head_t compl;</div><div class='del'>-	volatile enum { CMD_SLEEP, CMD_CALLBACK, CMD_COMPLETED } type;</div><div class='del'>-	void (*callback)(struct net_device *dev, long context, u16 resp0,</div><div class='del'>-			 u16 res);</div><div class='del'>-	long context;</div><div class='del'>-	u16 cmd, param0, param1;</div><div class='del'>-	u16 resp0, res;</div><div class='del'>-	volatile int issued, issuing;</div><div class='del'>-</div><div class='del'>-	refcount_t usecnt;</div><div class='del'>-	int del_req;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* options for hw_shutdown */</div><div class='del'>-#define HOSTAP_HW_NO_DISABLE BIT(0)</div><div class='del'>-#define HOSTAP_HW_ENABLE_CMDCOMPL BIT(1)</div><div class='del'>-</div><div class='del'>-typedef struct local_info local_info_t;</div><div class='del'>-</div><div class='del'>-struct prism2_helper_functions {</div><div class='del'>-	/* these functions are defined in hardware model specific files</div><div class='del'>-	 * (hostap_{cs,plx,pci}.c */</div><div class='del'>-	int (*card_present)(local_info_t *local);</div><div class='del'>-	void (*cor_sreset)(local_info_t *local);</div><div class='del'>-	void (*genesis_reset)(local_info_t *local, int hcr);</div><div class='del'>-</div><div class='del'>-	/* the following functions are from hostap_hw.c, but they may have some</div><div class='del'>-	 * hardware model specific code */</div><div class='del'>-</div><div class='del'>-	/* FIX: low-level commands like cmd might disappear at some point to</div><div class='del'>-	 * make it easier to change them if needed (e.g., cmd would be replaced</div><div class='del'>-	 * with write_mif/read_mif/testcmd/inquire); at least get_rid and</div><div class='del'>-	 * set_rid might move to hostap_{cs,plx,pci}.c */</div><div class='del'>-	int (*cmd)(struct net_device *dev, u16 cmd, u16 param0, u16 *param1,</div><div class='del'>-		   u16 *resp0);</div><div class='del'>-	void (*read_regs)(struct net_device *dev, struct hfa384x_regs *regs);</div><div class='del'>-	int (*get_rid)(struct net_device *dev, u16 rid, void *buf, int len,</div><div class='del'>-		       int exact_len);</div><div class='del'>-	int (*set_rid)(struct net_device *dev, u16 rid, void *buf, int len);</div><div class='del'>-	int (*hw_enable)(struct net_device *dev, int initial);</div><div class='del'>-	int (*hw_config)(struct net_device *dev, int initial);</div><div class='del'>-	void (*hw_reset)(struct net_device *dev);</div><div class='del'>-	void (*hw_shutdown)(struct net_device *dev, int no_disable);</div><div class='del'>-	int (*reset_port)(struct net_device *dev);</div><div class='del'>-	void (*schedule_reset)(local_info_t *local);</div><div class='del'>-	int (*download)(local_info_t *local,</div><div class='del'>-			struct prism2_download_param *param);</div><div class='del'>-	int (*tx)(struct sk_buff *skb, struct net_device *dev);</div><div class='del'>-	int (*set_tim)(struct net_device *dev, int aid, int set);</div><div class='del'>-	const struct proc_ops *read_aux_proc_ops;</div><div class='del'>-</div><div class='del'>-	int need_tx_headroom; /* number of bytes of headroom needed before</div><div class='del'>-			       * IEEE 802.11 header */</div><div class='del'>-	enum { HOSTAP_HW_PCCARD, HOSTAP_HW_PLX, HOSTAP_HW_PCI } hw_type;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct prism2_download_data {</div><div class='del'>-	u32 dl_cmd;</div><div class='del'>-	u32 start_addr;</div><div class='del'>-	u32 num_areas;</div><div class='del'>-	struct prism2_download_data_area {</div><div class='del'>-		u32 addr; /* wlan card address */</div><div class='del'>-		u32 len;</div><div class='del'>-		u8 *data; /* allocated data */</div><div class='del'>-	} data[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define HOSTAP_MAX_BSS_COUNT 64</div><div class='del'>-#define MAX_WPA_IE_LEN 64</div><div class='del'>-</div><div class='del'>-struct hostap_bss_info {</div><div class='del'>-	struct list_head list;</div><div class='del'>-	unsigned long last_update;</div><div class='del'>-	unsigned int count;</div><div class='del'>-	u8 bssid[ETH_ALEN];</div><div class='del'>-	u16 capab_info;</div><div class='del'>-	u8 ssid[32];</div><div class='del'>-	size_t ssid_len;</div><div class='del'>-	u8 wpa_ie[MAX_WPA_IE_LEN];</div><div class='del'>-	size_t wpa_ie_len;</div><div class='del'>-	u8 rsn_ie[MAX_WPA_IE_LEN];</div><div class='del'>-	size_t rsn_ie_len;</div><div class='del'>-	int chan;</div><div class='del'>-	int included;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Per radio private Host AP data - shared by all net devices interfaces used</div><div class='del'>- * by each radio (wlan#, wlan#ap, wlan#sta, WDS).</div><div class='del'>- * ((struct hostap_interface *) netdev_priv(dev))-&gt;local points to this</div><div class='del'>- * structure. */</div><div class='del'>-struct local_info {</div><div class='del'>-	struct module *hw_module;</div><div class='del'>-	int card_idx;</div><div class='del'>-	int dev_enabled;</div><div class='del'>-	int master_dev_auto_open; /* was master device opened automatically */</div><div class='del'>-	int num_dev_open; /* number of open devices */</div><div class='del'>-	struct net_device *dev; /* master radio device */</div><div class='del'>-	struct net_device *ddev; /* main data device */</div><div class='del'>-	struct list_head hostap_interfaces; /* Host AP interface list (contains</div><div class='del'>-					     * struct hostap_interface entries)</div><div class='del'>-					     */</div><div class='del'>-	rwlock_t iface_lock; /* hostap_interfaces read lock; use write lock</div><div class='del'>-			      * when removing entries from the list.</div><div class='del'>-			      * TX and RX paths can use read lock. */</div><div class='del'>-	spinlock_t cmdlock, baplock, lock, irq_init_lock;</div><div class='del'>-	struct mutex rid_bap_mtx;</div><div class='del'>-	u16 infofid; /* MAC buffer id for info frame */</div><div class='del'>-	/* txfid, intransmitfid, next_txtid, and next_alloc are protected by</div><div class='del'>-	 * txfidlock */</div><div class='del'>-	spinlock_t txfidlock;</div><div class='del'>-	int txfid_len; /* length of allocated TX buffers */</div><div class='del'>-	u16 txfid[PRISM2_TXFID_COUNT]; /* buffer IDs for TX frames */</div><div class='del'>-	/* buffer IDs for intransmit frames or PRISM2_TXFID_EMPTY if</div><div class='del'>-	 * corresponding txfid is free for next TX frame */</div><div class='del'>-	u16 intransmitfid[PRISM2_TXFID_COUNT];</div><div class='del'>-	int next_txfid; /* index to the next txfid to be checked for</div><div class='del'>-			 * availability */</div><div class='del'>-	int next_alloc; /* index to the next intransmitfid to be checked for</div><div class='del'>-			 * allocation events */</div><div class='del'>-</div><div class='del'>-	/* bitfield for atomic bitops */</div><div class='del'>-#define HOSTAP_BITS_TRANSMIT 0</div><div class='del'>-#define HOSTAP_BITS_BAP_TASKLET 1</div><div class='del'>-#define HOSTAP_BITS_BAP_TASKLET2 2</div><div class='del'>-	unsigned long bits;</div><div class='del'>-</div><div class='del'>-	struct ap_data *ap;</div><div class='del'>-</div><div class='del'>-	char essid[MAX_SSID_LEN + 1];</div><div class='del'>-	char name[MAX_NAME_LEN + 1];</div><div class='del'>-	int name_set;</div><div class='del'>-	u16 channel_mask; /* mask of allowed channels */</div><div class='del'>-	u16 scan_channel_mask; /* mask of channels to be scanned */</div><div class='del'>-	struct comm_tallies_sums comm_tallies;</div><div class='del'>-	struct proc_dir_entry *proc;</div><div class='del'>-	int iw_mode; /* operating mode (IW_MODE_*) */</div><div class='del'>-	int pseudo_adhoc; /* 0: IW_MODE_ADHOC is real 802.11 compliant IBSS</div><div class='del'>-			   * 1: IW_MODE_ADHOC is "pseudo IBSS" */</div><div class='del'>-	char bssid[ETH_ALEN];</div><div class='del'>-	int channel;</div><div class='del'>-	int beacon_int;</div><div class='del'>-	int dtim_period;</div><div class='del'>-	int mtu;</div><div class='del'>-	int frame_dump; /* dump RX/TX frame headers, PRISM2_DUMP_ flags */</div><div class='del'>-	int fw_tx_rate_control;</div><div class='del'>-	u16 tx_rate_control;</div><div class='del'>-	u16 basic_rates;</div><div class='del'>-	int hw_resetting;</div><div class='del'>-	int hw_ready;</div><div class='del'>-	int hw_reset_tries; /* how many times reset has been tried */</div><div class='del'>-	int hw_downloading;</div><div class='del'>-	int shutdown;</div><div class='del'>-	int pri_only;</div><div class='del'>-	int no_pri; /* no PRI f/w present */</div><div class='del'>-	int sram_type; /* 8 = x8 SRAM, 16 = x16 SRAM, -1 = unknown */</div><div class='del'>-</div><div class='del'>-	enum {</div><div class='del'>-		PRISM2_TXPOWER_AUTO = 0, PRISM2_TXPOWER_OFF,</div><div class='del'>-		PRISM2_TXPOWER_FIXED, PRISM2_TXPOWER_UNKNOWN</div><div class='del'>-	} txpower_type;</div><div class='del'>-	int txpower; /* if txpower_type == PRISM2_TXPOWER_FIXED */</div><div class='del'>-</div><div class='del'>-	/* command queue for hfa384x_cmd(); protected with cmdlock */</div><div class='del'>-	struct list_head cmd_queue;</div><div class='del'>-	/* max_len for cmd_queue; in addition, cmd_callback can use two</div><div class='del'>-	 * additional entries to prevent sleeping commands from stopping</div><div class='del'>-	 * transmits */</div><div class='del'>-#define HOSTAP_CMD_QUEUE_MAX_LEN 16</div><div class='del'>-	int cmd_queue_len; /* number of entries in cmd_queue */</div><div class='del'>-</div><div class='del'>-	/* if card timeout is detected in interrupt context, reset_queue is</div><div class='del'>-	 * used to schedule card reseting to be done in user context */</div><div class='del'>-	struct work_struct reset_queue;</div><div class='del'>-</div><div class='del'>-	/* For scheduling a change of the promiscuous mode RID */</div><div class='del'>-	int is_promisc;</div><div class='del'>-	struct work_struct set_multicast_list_queue;</div><div class='del'>-</div><div class='del'>-	struct work_struct set_tim_queue;</div><div class='del'>-	struct list_head set_tim_list;</div><div class='del'>-	spinlock_t set_tim_lock;</div><div class='del'>-</div><div class='del'>-	int wds_max_connections;</div><div class='del'>-	int wds_connections;</div><div class='del'>-#define HOSTAP_WDS_BROADCAST_RA BIT(0)</div><div class='del'>-#define HOSTAP_WDS_AP_CLIENT BIT(1)</div><div class='del'>-#define HOSTAP_WDS_STANDARD_FRAME BIT(2)</div><div class='del'>-	u32 wds_type;</div><div class='del'>-	u16 tx_control; /* flags to be used in TX description */</div><div class='del'>-	int manual_retry_count; /* -1 = use f/w default; otherwise retry count</div><div class='del'>-				 * to be used with all frames */</div><div class='del'>-</div><div class='del'>-	struct iw_statistics wstats;</div><div class='del'>-	unsigned long scan_timestamp; /* Time started to scan */</div><div class='del'>-	enum {</div><div class='del'>-		PRISM2_MONITOR_80211 = 0, PRISM2_MONITOR_PRISM = 1,</div><div class='del'>-		PRISM2_MONITOR_CAPHDR = 2, PRISM2_MONITOR_RADIOTAP = 3</div><div class='del'>-	} monitor_type;</div><div class='del'>-	int monitor_allow_fcserr;</div><div class='del'>-</div><div class='del'>-	int hostapd; /* whether user space daemon, hostapd, is used for AP</div><div class='del'>-		      * management */</div><div class='del'>-	int hostapd_sta; /* whether hostapd is used with an extra STA interface</div><div class='del'>-			  */</div><div class='del'>-	struct net_device *apdev;</div><div class='del'>-	struct net_device_stats apdevstats;</div><div class='del'>-</div><div class='del'>-	char assoc_ap_addr[ETH_ALEN];</div><div class='del'>-	struct net_device *stadev;</div><div class='del'>-	struct net_device_stats stadevstats;</div><div class='del'>-</div><div class='del'>-#define WEP_KEYS 4</div><div class='del'>-#define WEP_KEY_LEN 13</div><div class='del'>-	struct lib80211_crypt_info crypt_info;</div><div class='del'>-</div><div class='del'>-	int open_wep; /* allow unencrypted frames */</div><div class='del'>-	int host_encrypt;</div><div class='del'>-	int host_decrypt;</div><div class='del'>-	int privacy_invoked; /* force privacy invoked flag even if no keys are</div><div class='del'>-			      * configured */</div><div class='del'>-	int fw_encrypt_ok; /* whether firmware-based WEP encrypt is working</div><div class='del'>-			    * in Host AP mode (STA f/w 1.4.9 or newer) */</div><div class='del'>-	int bcrx_sta_key; /* use individual keys to override default keys even</div><div class='del'>-			   * with RX of broad/multicast frames */</div><div class='del'>-</div><div class='del'>-	struct prism2_frag_entry frag_cache[PRISM2_FRAG_CACHE_LEN];</div><div class='del'>-	unsigned int frag_next_idx;</div><div class='del'>-</div><div class='del'>-	int ieee_802_1x; /* is IEEE 802.1X used */</div><div class='del'>-</div><div class='del'>-	int antsel_tx, antsel_rx;</div><div class='del'>-	int rts_threshold; /* dot11RTSThreshold */</div><div class='del'>-	int fragm_threshold; /* dot11FragmentationThreshold */</div><div class='del'>-	int auth_algs; /* PRISM2_AUTH_ flags */</div><div class='del'>-</div><div class='del'>-	int enh_sec; /* cnfEnhSecurity options (broadcast SSID hide/ignore) */</div><div class='del'>-	int tallies32; /* 32-bit tallies in use */</div><div class='del'>-</div><div class='del'>-	struct prism2_helper_functions *func;</div><div class='del'>-</div><div class='del'>-	u8 *pda;</div><div class='del'>-	int fw_ap;</div><div class='del'>-#define PRISM2_FW_VER(major, minor, variant) \</div><div class='del'>-(((major) &lt;&lt; 16) | ((minor) &lt;&lt; 8) | variant)</div><div class='del'>-	u32 sta_fw_ver;</div><div class='del'>-</div><div class='del'>-	/* Tasklets for handling hardware IRQ related operations outside hw IRQ</div><div class='del'>-	 * handler */</div><div class='del'>-	struct tasklet_struct bap_tasklet;</div><div class='del'>-</div><div class='del'>-	struct tasklet_struct info_tasklet;</div><div class='del'>-	struct sk_buff_head info_list; /* info frames as skb's for</div><div class='del'>-					* info_tasklet */</div><div class='del'>-</div><div class='del'>-	struct hostap_tx_callback_info *tx_callback; /* registered TX callbacks</div><div class='del'>-						      */</div><div class='del'>-</div><div class='del'>-	struct tasklet_struct rx_tasklet;</div><div class='del'>-	struct sk_buff_head rx_list;</div><div class='del'>-</div><div class='del'>-	struct tasklet_struct sta_tx_exc_tasklet;</div><div class='del'>-	struct sk_buff_head sta_tx_exc_list;</div><div class='del'>-</div><div class='del'>-	int host_roaming;</div><div class='del'>-	unsigned long last_join_time; /* time of last JoinRequest */</div><div class='del'>-	struct hfa384x_hostscan_result *last_scan_results;</div><div class='del'>-	int last_scan_results_count;</div><div class='del'>-	enum { PRISM2_SCAN, PRISM2_HOSTSCAN } last_scan_type;</div><div class='del'>-	struct work_struct info_queue;</div><div class='del'>-	unsigned long pending_info; /* bit field of pending info_queue items */</div><div class='del'>-#define PRISM2_INFO_PENDING_LINKSTATUS 0</div><div class='del'>-#define PRISM2_INFO_PENDING_SCANRESULTS 1</div><div class='del'>-	int prev_link_status; /* previous received LinkStatus info */</div><div class='del'>-	int prev_linkstatus_connected;</div><div class='del'>-	u8 preferred_ap[ETH_ALEN]; /* use this AP if possible */</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_CALLBACK</div><div class='del'>-	void *callback_data; /* Can be used in callbacks; e.g., allocate</div><div class='del'>-			      * on enable event and free on disable event.</div><div class='del'>-			      * Host AP driver code does not touch this. */</div><div class='del'>-#endif /* PRISM2_CALLBACK */</div><div class='del'>-</div><div class='del'>-	wait_queue_head_t hostscan_wq;</div><div class='del'>-</div><div class='del'>-	/* Passive scan in Host AP mode */</div><div class='del'>-	struct timer_list passive_scan_timer;</div><div class='del'>-	int passive_scan_interval; /* in seconds, 0 = disabled */</div><div class='del'>-	int passive_scan_channel;</div><div class='del'>-	enum { PASSIVE_SCAN_WAIT, PASSIVE_SCAN_LISTEN } passive_scan_state;</div><div class='del'>-</div><div class='del'>-	struct timer_list tick_timer;</div><div class='del'>-	unsigned long last_tick_timer;</div><div class='del'>-	unsigned int sw_tick_stuck;</div><div class='del'>-</div><div class='del'>-	/* commsQuality / dBmCommsQuality data from periodic polling; only</div><div class='del'>-	 * valid for Managed and Ad-hoc modes */</div><div class='del'>-	unsigned long last_comms_qual_update;</div><div class='del'>-	int comms_qual; /* in some odd unit.. */</div><div class='del'>-	int avg_signal; /* in dB (note: negative) */</div><div class='del'>-	int avg_noise; /* in dB (note: negative) */</div><div class='del'>-	struct work_struct comms_qual_update;</div><div class='del'>-</div><div class='del'>-	/* RSSI to dBm adjustment (for RX descriptor fields) */</div><div class='del'>-	int rssi_to_dBm; /* subtract from RSSI to get approximate dBm value */</div><div class='del'>-</div><div class='del'>-	/* BSS list / protected by local-&gt;lock */</div><div class='del'>-	struct list_head bss_list;</div><div class='del'>-	int num_bss_info;</div><div class='del'>-	int wpa; /* WPA support enabled */</div><div class='del'>-	int tkip_countermeasures;</div><div class='del'>-	int drop_unencrypted;</div><div class='del'>-	/* Generic IEEE 802.11 info element to be added to</div><div class='del'>-	 * ProbeResp/Beacon/(Re)AssocReq */</div><div class='del'>-	u8 *generic_elem;</div><div class='del'>-	size_t generic_elem_len;</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_DOWNLOAD_SUPPORT</div><div class='del'>-	/* Persistent volatile download data */</div><div class='del'>-	struct prism2_download_data *dl_pri;</div><div class='del'>-	struct prism2_download_data *dl_sec;</div><div class='del'>-#endif /* PRISM2_DOWNLOAD_SUPPORT */</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_IO_DEBUG</div><div class='del'>-#define PRISM2_IO_DEBUG_SIZE 10000</div><div class='del'>-	u32 io_debug[PRISM2_IO_DEBUG_SIZE];</div><div class='del'>-	int io_debug_head;</div><div class='del'>-	int io_debug_enabled;</div><div class='del'>-#endif /* PRISM2_IO_DEBUG */</div><div class='del'>-</div><div class='del'>-	/* Pointer to hardware model specific (cs,pci,plx) private data. */</div><div class='del'>-	void *hw_priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Per interface private Host AP data</div><div class='del'>- * Allocated for each net device that Host AP uses (wlan#, wlan#ap, wlan#sta,</div><div class='del'>- * WDS) and netdev_priv(dev) points to this structure. */</div><div class='del'>-struct hostap_interface {</div><div class='del'>-	struct list_head list; /* list entry in Host AP interface list */</div><div class='del'>-	struct net_device *dev; /* pointer to this device */</div><div class='del'>-	struct local_info *local; /* pointer to shared private data */</div><div class='del'>-	struct net_device_stats stats;</div><div class='del'>-	struct iw_spy_data spy_data; /* iwspy support */</div><div class='del'>-	struct iw_public_data wireless_data;</div><div class='del'>-</div><div class='del'>-	enum {</div><div class='del'>-		HOSTAP_INTERFACE_MASTER,</div><div class='del'>-		HOSTAP_INTERFACE_MAIN,</div><div class='del'>-		HOSTAP_INTERFACE_AP,</div><div class='del'>-		HOSTAP_INTERFACE_STA,</div><div class='del'>-		HOSTAP_INTERFACE_WDS,</div><div class='del'>-	} type;</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-		struct hostap_interface_wds {</div><div class='del'>-			u8 remote_addr[ETH_ALEN];</div><div class='del'>-		} wds;</div><div class='del'>-	} u;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define HOSTAP_SKB_TX_DATA_MAGIC 0xf08a36a2</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * TX meta data - stored in skb-&gt;cb buffer, so this must not be increased over</div><div class='del'>- * the 48-byte limit.</div><div class='del'>- * THE PADDING THIS STARTS WITH IS A HORRIBLE HACK THAT SHOULD NOT LIVE</div><div class='del'>- * TO SEE THE DAY.</div><div class='del'>- */</div><div class='del'>-struct hostap_skb_tx_data {</div><div class='del'>-	unsigned int __padding_for_default_qdiscs;</div><div class='del'>-	u32 magic; /* HOSTAP_SKB_TX_DATA_MAGIC */</div><div class='del'>-	u8 rate; /* transmit rate */</div><div class='del'>-#define HOSTAP_TX_FLAGS_WDS BIT(0)</div><div class='del'>-#define HOSTAP_TX_FLAGS_BUFFERED_FRAME BIT(1)</div><div class='del'>-#define HOSTAP_TX_FLAGS_ADD_MOREDATA BIT(2)</div><div class='del'>-	u8 flags; /* HOSTAP_TX_FLAGS_* */</div><div class='del'>-	u16 tx_cb_idx;</div><div class='del'>-	struct hostap_interface *iface;</div><div class='del'>-	unsigned long jiffies; /* queueing timestamp */</div><div class='del'>-	unsigned short ethertype;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef PRISM2_NO_DEBUG</div><div class='del'>-</div><div class='del'>-#define DEBUG_FID BIT(0)</div><div class='del'>-#define DEBUG_PS BIT(1)</div><div class='del'>-#define DEBUG_FLOW BIT(2)</div><div class='del'>-#define DEBUG_AP BIT(3)</div><div class='del'>-#define DEBUG_HW BIT(4)</div><div class='del'>-#define DEBUG_EXTRA BIT(5)</div><div class='del'>-#define DEBUG_EXTRA2 BIT(6)</div><div class='del'>-#define DEBUG_PS2 BIT(7)</div><div class='del'>-#define DEBUG_MASK (DEBUG_PS | DEBUG_AP | DEBUG_HW | DEBUG_EXTRA)</div><div class='del'>-#define PDEBUG(n, args...) \</div><div class='del'>-do { if ((n) &amp; DEBUG_MASK) printk(KERN_DEBUG args); } while (0)</div><div class='del'>-#define PDEBUG2(n, args...) \</div><div class='del'>-do { if ((n) &amp; DEBUG_MASK) printk(args); } while (0)</div><div class='del'>-</div><div class='del'>-#else /* PRISM2_NO_DEBUG */</div><div class='del'>-</div><div class='del'>-#define PDEBUG(n, args...)</div><div class='del'>-#define PDEBUG2(n, args...)</div><div class='del'>-</div><div class='del'>-#endif /* PRISM2_NO_DEBUG */</div><div class='del'>-</div><div class='del'>-enum { BAP0 = 0, BAP1 = 1 };</div><div class='del'>-</div><div class='del'>-#define PRISM2_IO_DEBUG_CMD_INB 0</div><div class='del'>-#define PRISM2_IO_DEBUG_CMD_INW 1</div><div class='del'>-#define PRISM2_IO_DEBUG_CMD_INSW 2</div><div class='del'>-#define PRISM2_IO_DEBUG_CMD_OUTB 3</div><div class='del'>-#define PRISM2_IO_DEBUG_CMD_OUTW 4</div><div class='del'>-#define PRISM2_IO_DEBUG_CMD_OUTSW 5</div><div class='del'>-#define PRISM2_IO_DEBUG_CMD_ERROR 6</div><div class='del'>-#define PRISM2_IO_DEBUG_CMD_INTERRUPT 7</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_IO_DEBUG</div><div class='del'>-</div><div class='del'>-#define PRISM2_IO_DEBUG_ENTRY(cmd, reg, value) \</div><div class='del'>-(((cmd) &lt;&lt; 24) | ((reg) &lt;&lt; 16) | value)</div><div class='del'>-</div><div class='del'>-static inline void prism2_io_debug_add(struct net_device *dev, int cmd,</div><div class='del'>-				       int reg, int value)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface = netdev_priv(dev);</div><div class='del'>-	local_info_t *local = iface-&gt;local;</div><div class='del'>-</div><div class='del'>-	if (!local-&gt;io_debug_enabled)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	local-&gt;io_debug[local-&gt;io_debug_head] =	jiffies &amp; 0xffffffff;</div><div class='del'>-	if (++local-&gt;io_debug_head &gt;= PRISM2_IO_DEBUG_SIZE)</div><div class='del'>-		local-&gt;io_debug_head = 0;</div><div class='del'>-	local-&gt;io_debug[local-&gt;io_debug_head] =</div><div class='del'>-		PRISM2_IO_DEBUG_ENTRY(cmd, reg, value);</div><div class='del'>-	if (++local-&gt;io_debug_head &gt;= PRISM2_IO_DEBUG_SIZE)</div><div class='del'>-		local-&gt;io_debug_head = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline void prism2_io_debug_error(struct net_device *dev, int err)</div><div class='del'>-{</div><div class='del'>-	struct hostap_interface *iface = netdev_priv(dev);</div><div class='del'>-	local_info_t *local = iface-&gt;local;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (!local-&gt;io_debug_enabled)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;local-&gt;lock, flags);</div><div class='del'>-	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_ERROR, 0, err);</div><div class='del'>-	if (local-&gt;io_debug_enabled == 1) {</div><div class='del'>-		local-&gt;io_debug_enabled = 0;</div><div class='del'>-		printk(KERN_DEBUG "%s: I/O debug stopped\n", dev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;local-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else /* PRISM2_IO_DEBUG */</div><div class='del'>-</div><div class='del'>-static inline void prism2_io_debug_add(struct net_device *dev, int cmd,</div><div class='del'>-				       int reg, int value)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void prism2_io_debug_error(struct net_device *dev, int err)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* PRISM2_IO_DEBUG */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef PRISM2_CALLBACK</div><div class='del'>-enum {</div><div class='del'>-	/* Called when card is enabled */</div><div class='del'>-	PRISM2_CALLBACK_ENABLE,</div><div class='del'>-</div><div class='del'>-	/* Called when card is disabled */</div><div class='del'>-	PRISM2_CALLBACK_DISABLE,</div><div class='del'>-</div><div class='del'>-	/* Called when RX/TX starts/ends */</div><div class='del'>-	PRISM2_CALLBACK_RX_START, PRISM2_CALLBACK_RX_END,</div><div class='del'>-	PRISM2_CALLBACK_TX_START, PRISM2_CALLBACK_TX_END</div><div class='del'>-};</div><div class='del'>-void prism2_callback(local_info_t *local, int event);</div><div class='del'>-#else /* PRISM2_CALLBACK */</div><div class='del'>-#define prism2_callback(d, e) do { } while (0)</div><div class='del'>-#endif /* PRISM2_CALLBACK */</div><div class='del'>-</div><div class='del'>-#endif /* __KERNEL__ */</div><div class='del'>-</div><div class='del'>-#endif /* HOSTAP_WLAN_H */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/Kconfig b/drivers/net/wireless/intersil/orinoco/Kconfig<br/>deleted file mode 100644<br/>index f62730aa7be3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,143 +0,0 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-config HERMES</div><div class='del'>-	tristate "Hermes chipset 802.11b support (Orinoco/Prism2/Symbol)"</div><div class='del'>-	depends on (PPC_PMAC || PCI || PCMCIA)</div><div class='del'>-	depends on CFG80211</div><div class='del'>-	select CFG80211_WEXT_EXPORT</div><div class='del'>-	select WIRELESS_EXT</div><div class='del'>-	select WEXT_SPY</div><div class='del'>-	select WEXT_PRIV</div><div class='del'>-	select FW_LOADER</div><div class='del'>-	select CRYPTO</div><div class='del'>-	select CRYPTO_MICHAEL_MIC</div><div class='del'>-	help</div><div class='del'>-	  A driver for 802.11b wireless cards based on the "Hermes" or</div><div class='del'>-	  Intersil HFA384x (Prism 2) MAC controller.  This includes the vast</div><div class='del'>-	  majority of the PCMCIA 802.11b cards (which are nearly all rebadges)</div><div class='del'>-	  - except for the Cisco/Aironet cards.  Cards supported include the</div><div class='del'>-	  Apple Airport (not a PCMCIA card), WavelanIEEE/Orinoco,</div><div class='del'>-	  Cabletron/EnteraSys Roamabout, ELSA AirLancer, MELCO Buffalo, Avaya,</div><div class='del'>-	  IBM High Rate Wireless, Farralon Syyline, Samsung MagicLAN, Netgear</div><div class='del'>-	  MA401, LinkSys WPC-11, D-Link DWL-650, 3Com AirConnect, Intel</div><div class='del'>-	  IPW2011, and Symbol Spectrum24 High Rate amongst others.</div><div class='del'>-</div><div class='del'>-	  This option includes the guts of the driver, but in order to</div><div class='del'>-	  actually use a card you will also need to enable support for PCMCIA</div><div class='del'>-	  Hermes cards, PLX9052 based PCI adaptors or the Apple Airport below.</div><div class='del'>-</div><div class='del'>-	  You will also very likely also need the Wireless Tools in order to</div><div class='del'>-	  configure your card and that /etc/pcmcia/wireless.opts works :</div><div class='del'>-	  &lt;https://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html&gt;</div><div class='del'>-</div><div class='del'>-config HERMES_PRISM</div><div class='del'>-	bool "Support Prism 2/2.5 chipset"</div><div class='del'>-	depends on HERMES</div><div class='del'>-	help</div><div class='del'>-</div><div class='del'>-	  Say Y to enable support for Prism 2 and 2.5 chipsets.  These</div><div class='del'>-	  chipsets are better handled by the hostap driver.  This driver</div><div class='del'>-	  would not support WPA or firmware download for Prism chipset.</div><div class='del'>-</div><div class='del'>-	  If you are not sure, say N.</div><div class='del'>-</div><div class='del'>-config HERMES_CACHE_FW_ON_INIT</div><div class='del'>-	bool "Cache Hermes firmware on driver initialisation"</div><div class='del'>-	depends on HERMES</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Say Y to cache any firmware required by the Hermes drivers</div><div class='del'>-	  on startup.  The firmware will remain cached until the</div><div class='del'>-	  driver is unloaded.  The cache uses 64K of RAM.</div><div class='del'>-</div><div class='del'>-	  Otherwise load the firmware from userspace as required.  In</div><div class='del'>-	  this case the driver should be unloaded and restarted</div><div class='del'>-	  whenever the firmware is changed.</div><div class='del'>-</div><div class='del'>-	  If you are not sure, say Y.</div><div class='del'>-</div><div class='del'>-config APPLE_AIRPORT</div><div class='del'>-	tristate "Apple Airport support (built-in)"</div><div class='del'>-	depends on PPC_PMAC &amp;&amp; HERMES</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to support the Airport 802.11b wireless Ethernet hardware</div><div class='del'>-	  built into the Macintosh iBook and other recent PowerPC-based</div><div class='del'>-	  Macintosh machines. This is essentially a Lucent Orinoco card with</div><div class='del'>-	  a non-standard interface.</div><div class='del'>-</div><div class='del'>-	  This driver does not support the Airport Extreme (802.11b/g). Use</div><div class='del'>-	  the BCM43xx driver for Airport Extreme cards.</div><div class='del'>-</div><div class='del'>-config PLX_HERMES</div><div class='del'>-	tristate "Hermes in PLX9052 based PCI adaptor support (Netgear MA301 etc.)"</div><div class='del'>-	depends on PCI &amp;&amp; HERMES</div><div class='del'>-	help</div><div class='del'>-	  Enable support for PCMCIA cards supported by the "Hermes" (aka</div><div class='del'>-	  orinoco) driver when used in PLX9052 based PCI adaptors.  These</div><div class='del'>-	  adaptors are not a full PCMCIA controller but act as a more limited</div><div class='del'>-	  PCI &lt;-&gt; PCMCIA bridge.  Several vendors sell such adaptors so that</div><div class='del'>-	  802.11b PCMCIA cards can be used in desktop machines.  The Netgear</div><div class='del'>-	  MA301 is such an adaptor.</div><div class='del'>-</div><div class='del'>-config TMD_HERMES</div><div class='del'>-	tristate "Hermes in TMD7160 based PCI adaptor support"</div><div class='del'>-	depends on PCI &amp;&amp; HERMES</div><div class='del'>-	help</div><div class='del'>-	  Enable support for PCMCIA cards supported by the "Hermes" (aka</div><div class='del'>-	  orinoco) driver when used in TMD7160 based PCI adaptors.  These</div><div class='del'>-	  adaptors are not a full PCMCIA controller but act as a more limited</div><div class='del'>-	  PCI &lt;-&gt; PCMCIA bridge.  Several vendors sell such adaptors so that</div><div class='del'>-	  802.11b PCMCIA cards can be used in desktop machines.</div><div class='del'>-</div><div class='del'>-config NORTEL_HERMES</div><div class='del'>-	tristate "Nortel emobility PCI adaptor support"</div><div class='del'>-	depends on PCI &amp;&amp; HERMES</div><div class='del'>-	help</div><div class='del'>-	  Enable support for PCMCIA cards supported by the "Hermes" (aka</div><div class='del'>-	  orinoco) driver when used in Nortel emobility PCI adaptors.  These</div><div class='del'>-	  adaptors are not full PCMCIA controllers, but act as a more limited</div><div class='del'>-	  PCI &lt;-&gt; PCMCIA bridge.</div><div class='del'>-</div><div class='del'>-config PCI_HERMES</div><div class='del'>-	tristate "Prism 2.5 PCI 802.11b adaptor support"</div><div class='del'>-	depends on PCI &amp;&amp; HERMES &amp;&amp; HERMES_PRISM</div><div class='del'>-	help</div><div class='del'>-	  Enable support for PCI and mini-PCI 802.11b wireless NICs based on</div><div class='del'>-	  the Prism 2.5 chipset.  These are true PCI cards, not the 802.11b</div><div class='del'>-	  PCMCIA cards bundled with PCI&lt;-&gt;PCMCIA adaptors which are also</div><div class='del'>-	  common.  Some of the built-in wireless adaptors in laptops are of</div><div class='del'>-	  this variety.</div><div class='del'>-</div><div class='del'>-config PCMCIA_HERMES</div><div class='del'>-	tristate "Hermes PCMCIA card support"</div><div class='del'>-	depends on PCMCIA &amp;&amp; HERMES &amp;&amp; HAS_IOPORT_MAP</div><div class='del'>-	help</div><div class='del'>-	  A driver for "Hermes" chipset based PCMCIA wireless adaptors, such</div><div class='del'>-	  as the Lucent WavelanIEEE/Orinoco cards and their OEM (Cabletron/</div><div class='del'>-	  EnteraSys RoamAbout 802.11, ELSA Airlancer, Melco Buffalo and</div><div class='del'>-	  others).  It should also be usable on various Prism II based cards</div><div class='del'>-	  such as the Linksys, D-Link and Farallon Skyline.  It should also</div><div class='del'>-	  work on Symbol cards such as the 3Com AirConnect and Ericsson WLAN.</div><div class='del'>-</div><div class='del'>-	  You will very likely need the Wireless Tools in order to</div><div class='del'>-	  configure your card and that /etc/pcmcia/wireless.opts works:</div><div class='del'>-	  &lt;https://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html&gt;.</div><div class='del'>-</div><div class='del'>-config PCMCIA_SPECTRUM</div><div class='del'>-	tristate "Symbol Spectrum24 Trilogy PCMCIA card support"</div><div class='del'>-	depends on PCMCIA &amp;&amp; HERMES &amp;&amp; HAS_IOPORT_MAP</div><div class='del'>-	help</div><div class='del'>-</div><div class='del'>-	  This is a driver for 802.11b cards using RAM-loadable Symbol</div><div class='del'>-	  firmware, such as Symbol Wireless Networker LA4100, CompactFlash</div><div class='del'>-	  cards by Socket Communications and Intel PRO/Wireless 2011B.</div><div class='del'>-</div><div class='del'>-	  This driver requires firmware download on startup.  Utilities</div><div class='del'>-	  for downloading Symbol firmware are available at</div><div class='del'>-	  &lt;http://sourceforge.net/projects/orinoco/&gt;</div><div class='del'>-</div><div class='del'>-config ORINOCO_USB</div><div class='del'>-	tristate "Agere Orinoco USB support"</div><div class='del'>-	depends on USB &amp;&amp; HERMES</div><div class='del'>-	select FW_LOADER</div><div class='del'>-	help</div><div class='del'>-	  This driver is for USB versions of the Agere Orinoco card.</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/Makefile b/drivers/net/wireless/intersil/orinoco/Makefile<br/>deleted file mode 100644<br/>index 0c29c56c88d6..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#</div><div class='del'>-# Makefile for the orinoco wireless device drivers.</div><div class='del'>-#</div><div class='del'>-orinoco-objs := main.o fw.o hw.o mic.o scan.o wext.o hermes_dld.o hermes.o cfg.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_HERMES)		+= orinoco.o</div><div class='del'>-obj-$(CONFIG_PCMCIA_HERMES)	+= orinoco_cs.o</div><div class='del'>-obj-$(CONFIG_APPLE_AIRPORT)	+= airport.o</div><div class='del'>-obj-$(CONFIG_PLX_HERMES)	+= orinoco_plx.o</div><div class='del'>-obj-$(CONFIG_PCI_HERMES)	+= orinoco_pci.o</div><div class='del'>-obj-$(CONFIG_TMD_HERMES)	+= orinoco_tmd.o</div><div class='del'>-obj-$(CONFIG_NORTEL_HERMES)	+= orinoco_nortel.o</div><div class='del'>-obj-$(CONFIG_PCMCIA_SPECTRUM)	+= spectrum_cs.o</div><div class='del'>-obj-$(CONFIG_ORINOCO_USB)	+= orinoco_usb.o</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/airport.c b/drivers/net/wireless/intersil/orinoco/airport.c<br/>deleted file mode 100644<br/>index 77e6c53040a3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/airport.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/airport.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,267 +0,0 @@</div><div class='del'>-/* airport.c</div><div class='del'>- *</div><div class='del'>- * A driver for "Hermes" chipset based Apple Airport wireless</div><div class='del'>- * card.</div><div class='del'>- *</div><div class='del'>- * Copyright notice &amp; release notes in file main.c</div><div class='del'>- *</div><div class='del'>- * Note specific to airport stub:</div><div class='del'>- *</div><div class='del'>- *  0.05 : first version of the new split driver</div><div class='del'>- *  0.06 : fix possible hang on powerup, add sleep support</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define DRIVER_NAME "airport"</div><div class='del'>-#define PFX DRIVER_NAME ": "</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;asm/pmac_feature.h&gt;</div><div class='del'>-</div><div class='del'>-#include "orinoco.h"</div><div class='del'>-</div><div class='del'>-#define AIRPORT_IO_LEN	(0x1000)	/* one page */</div><div class='del'>-</div><div class='del'>-struct airport {</div><div class='del'>-	struct macio_dev *mdev;</div><div class='del'>-	void __iomem *vaddr;</div><div class='del'>-	unsigned int irq;</div><div class='del'>-	int irq_requested;</div><div class='del'>-	int ndev_registered;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-airport_suspend(struct macio_dev *mdev, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = dev_get_drvdata(&amp;mdev-&gt;ofdev.dev);</div><div class='del'>-	struct net_device *dev = priv-&gt;ndev;</div><div class='del'>-	struct airport *card = priv-&gt;card;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: Airport entering sleep mode\n", dev-&gt;name);</div><div class='del'>-</div><div class='del'>-	err = orinoco_lock(priv, &amp;flags);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: hw_unavailable on PBOOK_SLEEP_NOW\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	orinoco_down(priv);</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	disable_irq(card-&gt;irq);</div><div class='del'>-	pmac_call_feature(PMAC_FTR_AIRPORT_ENABLE,</div><div class='del'>-			  macio_get_of_node(mdev), 0, 0);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-airport_resume(struct macio_dev *mdev)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = dev_get_drvdata(&amp;mdev-&gt;ofdev.dev);</div><div class='del'>-	struct net_device *dev = priv-&gt;ndev;</div><div class='del'>-	struct airport *card = priv-&gt;card;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: Airport waking up\n", dev-&gt;name);</div><div class='del'>-</div><div class='del'>-	pmac_call_feature(PMAC_FTR_AIRPORT_ENABLE,</div><div class='del'>-			  macio_get_of_node(mdev), 0, 1);</div><div class='del'>-	msleep(200);</div><div class='del'>-</div><div class='del'>-	enable_irq(card-&gt;irq);</div><div class='del'>-</div><div class='del'>-	priv-&gt;hw.ops-&gt;lock_irqsave(&amp;priv-&gt;lock, &amp;flags);</div><div class='del'>-	err = orinoco_up(priv);</div><div class='del'>-	priv-&gt;hw.ops-&gt;unlock_irqrestore(&amp;priv-&gt;lock, &amp;flags);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-airport_detach(struct macio_dev *mdev)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = dev_get_drvdata(&amp;mdev-&gt;ofdev.dev);</div><div class='del'>-	struct airport *card = priv-&gt;card;</div><div class='del'>-</div><div class='del'>-	if (card-&gt;ndev_registered)</div><div class='del'>-		orinoco_if_del(priv);</div><div class='del'>-	card-&gt;ndev_registered = 0;</div><div class='del'>-</div><div class='del'>-	if (card-&gt;irq_requested)</div><div class='del'>-		free_irq(card-&gt;irq, priv);</div><div class='del'>-	card-&gt;irq_requested = 0;</div><div class='del'>-</div><div class='del'>-	if (card-&gt;vaddr)</div><div class='del'>-		iounmap(card-&gt;vaddr);</div><div class='del'>-	card-&gt;vaddr = NULL;</div><div class='del'>-</div><div class='del'>-	macio_release_resource(mdev, 0);</div><div class='del'>-</div><div class='del'>-	pmac_call_feature(PMAC_FTR_AIRPORT_ENABLE,</div><div class='del'>-			  macio_get_of_node(mdev), 0, 0);</div><div class='del'>-	ssleep(1);</div><div class='del'>-</div><div class='del'>-	macio_set_drvdata(mdev, NULL);</div><div class='del'>-	free_orinocodev(priv);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int airport_hard_reset(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	/* It would be nice to power cycle the Airport for a real hard</div><div class='del'>-	 * reset, but for some reason although it appears to</div><div class='del'>-	 * re-initialize properly, it falls in a screaming heap</div><div class='del'>-	 * shortly afterwards. */</div><div class='del'>-#if 0</div><div class='del'>-	struct airport *card = priv-&gt;card;</div><div class='del'>-</div><div class='del'>-	/* Vitally important.  If we don't do this it seems we get an</div><div class='del'>-	 * interrupt somewhere during the power cycle, since</div><div class='del'>-	 * hw_unavailable is already set it doesn't get ACKed, we get</div><div class='del'>-	 * into an interrupt loop and the PMU decides to turn us</div><div class='del'>-	 * off. */</div><div class='del'>-	disable_irq(card-&gt;irq);</div><div class='del'>-</div><div class='del'>-	pmac_call_feature(PMAC_FTR_AIRPORT_ENABLE,</div><div class='del'>-			  macio_get_of_node(card-&gt;mdev), 0, 0);</div><div class='del'>-	ssleep(1);</div><div class='del'>-	pmac_call_feature(PMAC_FTR_AIRPORT_ENABLE,</div><div class='del'>-			  macio_get_of_node(card-&gt;mdev), 0, 1);</div><div class='del'>-	ssleep(1);</div><div class='del'>-</div><div class='del'>-	enable_irq(card-&gt;irq);</div><div class='del'>-	ssleep(1);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-airport_attach(struct macio_dev *mdev, const struct of_device_id *match)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv;</div><div class='del'>-	struct airport *card;</div><div class='del'>-	unsigned long phys_addr;</div><div class='del'>-	struct hermes *hw;</div><div class='del'>-</div><div class='del'>-	if (macio_resource_count(mdev) &lt; 1 || macio_irq_count(mdev) &lt; 1) {</div><div class='del'>-		printk(KERN_ERR PFX "Wrong interrupt/addresses in OF tree\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Allocate space for private device-specific data */</div><div class='del'>-	priv = alloc_orinocodev(sizeof(*card), &amp;mdev-&gt;ofdev.dev,</div><div class='del'>-				airport_hard_reset, NULL);</div><div class='del'>-	if (!priv) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot allocate network device\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	card = priv-&gt;card;</div><div class='del'>-</div><div class='del'>-	hw = &amp;priv-&gt;hw;</div><div class='del'>-	card-&gt;mdev = mdev;</div><div class='del'>-</div><div class='del'>-	if (macio_request_resource(mdev, 0, DRIVER_NAME)) {</div><div class='del'>-		printk(KERN_ERR PFX "can't request IO resource !\n");</div><div class='del'>-		free_orinocodev(priv);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	macio_set_drvdata(mdev, priv);</div><div class='del'>-</div><div class='del'>-	/* Setup interrupts &amp; base address */</div><div class='del'>-	card-&gt;irq = macio_irq(mdev, 0);</div><div class='del'>-	phys_addr = macio_resource_start(mdev, 0);  /* Physical address */</div><div class='del'>-	printk(KERN_DEBUG PFX "Physical address %lx\n", phys_addr);</div><div class='del'>-	card-&gt;vaddr = ioremap(phys_addr, AIRPORT_IO_LEN);</div><div class='del'>-	if (!card-&gt;vaddr) {</div><div class='del'>-		printk(KERN_ERR PFX "ioremap() failed\n");</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hermes_struct_init(hw, card-&gt;vaddr, HERMES_16BIT_REGSPACING);</div><div class='del'>-</div><div class='del'>-	/* Power up card */</div><div class='del'>-	pmac_call_feature(PMAC_FTR_AIRPORT_ENABLE,</div><div class='del'>-			  macio_get_of_node(mdev), 0, 1);</div><div class='del'>-	ssleep(1);</div><div class='del'>-</div><div class='del'>-	/* Reset it before we get the interrupt */</div><div class='del'>-	hw-&gt;ops-&gt;init(hw);</div><div class='del'>-</div><div class='del'>-	if (request_irq(card-&gt;irq, orinoco_interrupt, 0, DRIVER_NAME, priv)) {</div><div class='del'>-		printk(KERN_ERR PFX "Couldn't get IRQ %d\n", card-&gt;irq);</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-	card-&gt;irq_requested = 1;</div><div class='del'>-</div><div class='del'>-	/* Initialise the main driver */</div><div class='del'>-	if (orinoco_init(priv) != 0) {</div><div class='del'>-		printk(KERN_ERR PFX "orinoco_init() failed\n");</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Register an interface with the stack */</div><div class='del'>-	if (orinoco_if_add(priv, phys_addr, card-&gt;irq, NULL) != 0) {</div><div class='del'>-		printk(KERN_ERR PFX "orinoco_if_add() failed\n");</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-	card-&gt;ndev_registered = 1;</div><div class='del'>-	return 0;</div><div class='del'>- failed:</div><div class='del'>-	airport_detach(mdev);</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}				/* airport_attach */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION</div><div class='del'>-	" (Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;)";</div><div class='del'>-MODULE_AUTHOR("Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Driver for the Apple Airport wireless card.");</div><div class='del'>-MODULE_LICENSE("Dual MPL/GPL");</div><div class='del'>-</div><div class='del'>-static const struct of_device_id airport_match[] = {</div><div class='del'>-	{</div><div class='del'>-	.name		= "radio",</div><div class='del'>-	},</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_DEVICE_TABLE(of, airport_match);</div><div class='del'>-</div><div class='del'>-static struct macio_driver airport_driver = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name		= DRIVER_NAME,</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-		.of_match_table	= airport_match,</div><div class='del'>-	},</div><div class='del'>-	.probe		= airport_attach,</div><div class='del'>-	.remove		= airport_detach,</div><div class='del'>-	.suspend	= airport_suspend,</div><div class='del'>-	.resume		= airport_resume,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-init_airport(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_DEBUG "%s\n", version);</div><div class='del'>-</div><div class='del'>-	return macio_register_driver(&amp;airport_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-exit_airport(void)</div><div class='del'>-{</div><div class='del'>-	macio_unregister_driver(&amp;airport_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(init_airport);</div><div class='del'>-module_exit(exit_airport);</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/cfg.c b/drivers/net/wireless/intersil/orinoco/cfg.c<br/>deleted file mode 100644<br/>index b2d5ec8634b5..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/cfg.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/cfg.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,291 +0,0 @@</div><div class='del'>-/* cfg80211 support</div><div class='del'>- *</div><div class='del'>- * See copyright notice in main.c</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/ieee80211.h&gt;</div><div class='del'>-#include &lt;net/cfg80211.h&gt;</div><div class='del'>-#include "hw.h"</div><div class='del'>-#include "main.h"</div><div class='del'>-#include "orinoco.h"</div><div class='del'>-</div><div class='del'>-#include "cfg.h"</div><div class='del'>-</div><div class='del'>-/* Supported bitrates. Must agree with hw.c */</div><div class='del'>-static struct ieee80211_rate orinoco_rates[] = {</div><div class='del'>-	{ .bitrate = 10 },</div><div class='del'>-	{ .bitrate = 20 },</div><div class='del'>-	{ .bitrate = 55 },</div><div class='del'>-	{ .bitrate = 110 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const void * const orinoco_wiphy_privid = &amp;orinoco_wiphy_privid;</div><div class='del'>-</div><div class='del'>-/* Called after orinoco_private is allocated. */</div><div class='del'>-void orinoco_wiphy_init(struct wiphy *wiphy)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = wiphy_priv(wiphy);</div><div class='del'>-</div><div class='del'>-	wiphy-&gt;privid = orinoco_wiphy_privid;</div><div class='del'>-</div><div class='del'>-	set_wiphy_dev(wiphy, priv-&gt;dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Called after firmware is initialised */</div><div class='del'>-int orinoco_wiphy_register(struct wiphy *wiphy)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = wiphy_priv(wiphy);</div><div class='del'>-	int i, channels = 0;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;firmware_type == FIRMWARE_TYPE_AGERE)</div><div class='del'>-		wiphy-&gt;max_scan_ssids = 1;</div><div class='del'>-	else</div><div class='del'>-		wiphy-&gt;max_scan_ssids = 0;</div><div class='del'>-</div><div class='del'>-	wiphy-&gt;interface_modes = BIT(NL80211_IFTYPE_STATION);</div><div class='del'>-</div><div class='del'>-	/* TODO: should we set if we only have demo ad-hoc?</div><div class='del'>-	 *       (priv-&gt;has_port3)</div><div class='del'>-	 */</div><div class='del'>-	if (priv-&gt;has_ibss)</div><div class='del'>-		wiphy-&gt;interface_modes |= BIT(NL80211_IFTYPE_ADHOC);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;broken_monitor || force_monitor)</div><div class='del'>-		wiphy-&gt;interface_modes |= BIT(NL80211_IFTYPE_MONITOR);</div><div class='del'>-</div><div class='del'>-	priv-&gt;band.bitrates = orinoco_rates;</div><div class='del'>-	priv-&gt;band.n_bitrates = ARRAY_SIZE(orinoco_rates);</div><div class='del'>-</div><div class='del'>-	/* Only support channels allowed by the card EEPROM */</div><div class='del'>-	for (i = 0; i &lt; NUM_CHANNELS; i++) {</div><div class='del'>-		if (priv-&gt;channel_mask &amp; (1 &lt;&lt; i)) {</div><div class='del'>-			priv-&gt;channels[i].center_freq =</div><div class='del'>-				ieee80211_channel_to_frequency(i + 1,</div><div class='del'>-							   NL80211_BAND_2GHZ);</div><div class='del'>-			channels++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	priv-&gt;band.channels = priv-&gt;channels;</div><div class='del'>-	priv-&gt;band.n_channels = channels;</div><div class='del'>-</div><div class='del'>-	wiphy-&gt;bands[NL80211_BAND_2GHZ] = &amp;priv-&gt;band;</div><div class='del'>-	wiphy-&gt;signal_type = CFG80211_SIGNAL_TYPE_MBM;</div><div class='del'>-</div><div class='del'>-	i = 0;</div><div class='del'>-	if (priv-&gt;has_wep) {</div><div class='del'>-		priv-&gt;cipher_suites[i] = WLAN_CIPHER_SUITE_WEP40;</div><div class='del'>-		i++;</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;has_big_wep) {</div><div class='del'>-			priv-&gt;cipher_suites[i] = WLAN_CIPHER_SUITE_WEP104;</div><div class='del'>-			i++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (priv-&gt;has_wpa) {</div><div class='del'>-		priv-&gt;cipher_suites[i] = WLAN_CIPHER_SUITE_TKIP;</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-	wiphy-&gt;cipher_suites = priv-&gt;cipher_suites;</div><div class='del'>-	wiphy-&gt;n_cipher_suites = i;</div><div class='del'>-</div><div class='del'>-	wiphy-&gt;rts_threshold = priv-&gt;rts_thresh;</div><div class='del'>-	if (!priv-&gt;has_mwo)</div><div class='del'>-		wiphy-&gt;frag_threshold = priv-&gt;frag_thresh + 1;</div><div class='del'>-	wiphy-&gt;retry_short = priv-&gt;short_retry_limit;</div><div class='del'>-	wiphy-&gt;retry_long = priv-&gt;long_retry_limit;</div><div class='del'>-</div><div class='del'>-	return wiphy_register(wiphy);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_change_vif(struct wiphy *wiphy, struct net_device *dev,</div><div class='del'>-			      enum nl80211_iftype type,</div><div class='del'>-			      struct vif_params *params)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = wiphy_priv(wiphy);</div><div class='del'>-	int err = 0;</div><div class='del'>-	unsigned long lock;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;lock) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		if (!priv-&gt;has_ibss &amp;&amp; !priv-&gt;has_port3)</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case NL80211_IFTYPE_MONITOR:</div><div class='del'>-		if (priv-&gt;broken_monitor &amp;&amp; !force_monitor) {</div><div class='del'>-			wiphy_warn(wiphy,</div><div class='del'>-				   "Monitor mode support is buggy in this firmware, not enabling\n");</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!err) {</div><div class='del'>-		priv-&gt;iw_mode = type;</div><div class='del'>-		set_port_type(priv);</div><div class='del'>-		err = orinoco_commit(priv);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	orinoco_unlock(priv, &amp;lock);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_scan(struct wiphy *wiphy,</div><div class='del'>-			struct cfg80211_scan_request *request)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = wiphy_priv(wiphy);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!request)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;scan_request &amp;&amp; priv-&gt;scan_request != request)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	priv-&gt;scan_request = request;</div><div class='del'>-</div><div class='del'>-	err = orinoco_hw_trigger_scan(priv, request-&gt;ssids);</div><div class='del'>-	/* On error the we aren't processing the request */</div><div class='del'>-	if (err)</div><div class='del'>-		priv-&gt;scan_request = NULL;</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_set_monitor_channel(struct wiphy *wiphy,</div><div class='del'>-				       struct cfg80211_chan_def *chandef)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = wiphy_priv(wiphy);</div><div class='del'>-	int err = 0;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int channel;</div><div class='del'>-</div><div class='del'>-	if (!chandef-&gt;chan)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (cfg80211_get_chandef_type(chandef) != NL80211_CHAN_NO_HT)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (chandef-&gt;chan-&gt;band != NL80211_BAND_2GHZ)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	channel = ieee80211_frequency_to_channel(chandef-&gt;chan-&gt;center_freq);</div><div class='del'>-</div><div class='del'>-	if ((channel &lt; 1) || (channel &gt; NUM_CHANNELS) ||</div><div class='del'>-	     !(priv-&gt;channel_mask &amp; (1 &lt;&lt; (channel - 1))))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	priv-&gt;channel = channel;</div><div class='del'>-	if (priv-&gt;iw_mode == NL80211_IFTYPE_MONITOR) {</div><div class='del'>-		/* Fast channel change - no commit if successful */</div><div class='del'>-		struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-		err = hw-&gt;ops-&gt;cmd_wait(hw, HERMES_CMD_TEST |</div><div class='del'>-					    HERMES_TEST_SET_CHANNEL,</div><div class='del'>-					channel, NULL);</div><div class='del'>-	}</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_set_wiphy_params(struct wiphy *wiphy, u32 changed)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = wiphy_priv(wiphy);</div><div class='del'>-	int frag_value = -1;</div><div class='del'>-	int rts_value = -1;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (changed &amp; WIPHY_PARAM_RETRY_SHORT) {</div><div class='del'>-		/* Setting short retry not supported */</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changed &amp; WIPHY_PARAM_RETRY_LONG) {</div><div class='del'>-		/* Setting long retry not supported */</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changed &amp; WIPHY_PARAM_FRAG_THRESHOLD) {</div><div class='del'>-		/* Set fragmentation */</div><div class='del'>-		if (priv-&gt;has_mwo) {</div><div class='del'>-			if (wiphy-&gt;frag_threshold == -1)</div><div class='del'>-				frag_value = 0;</div><div class='del'>-			else {</div><div class='del'>-				printk(KERN_WARNING "%s: Fixed fragmentation "</div><div class='del'>-				       "is not supported on this firmware. "</div><div class='del'>-				       "Using MWO robust instead.\n",</div><div class='del'>-				       priv-&gt;ndev-&gt;name);</div><div class='del'>-				frag_value = 1;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (wiphy-&gt;frag_threshold == -1)</div><div class='del'>-				frag_value = 2346;</div><div class='del'>-			else if ((wiphy-&gt;frag_threshold &lt; 257) ||</div><div class='del'>-				 (wiphy-&gt;frag_threshold &gt; 2347))</div><div class='del'>-				err = -EINVAL;</div><div class='del'>-			else</div><div class='del'>-				/* cfg80211 value is 257-2347 (odd only)</div><div class='del'>-				 * orinoco rid has range 256-2346 (even only) */</div><div class='del'>-				frag_value = wiphy-&gt;frag_threshold &amp; ~0x1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changed &amp; WIPHY_PARAM_RTS_THRESHOLD) {</div><div class='del'>-		/* Set RTS.</div><div class='del'>-		 *</div><div class='del'>-		 * Prism documentation suggests default of 2432,</div><div class='del'>-		 * and a range of 0-3000.</div><div class='del'>-		 *</div><div class='del'>-		 * Current implementation uses 2347 as the default and</div><div class='del'>-		 * the upper limit.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (wiphy-&gt;rts_threshold == -1)</div><div class='del'>-			rts_value = 2347;</div><div class='del'>-		else if (wiphy-&gt;rts_threshold &gt; 2347)</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-		else</div><div class='del'>-			rts_value = wiphy-&gt;rts_threshold;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!err) {</div><div class='del'>-		unsigned long flags;</div><div class='del'>-</div><div class='del'>-		if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-			return -EBUSY;</div><div class='del'>-</div><div class='del'>-		if (frag_value &gt;= 0) {</div><div class='del'>-			if (priv-&gt;has_mwo)</div><div class='del'>-				priv-&gt;mwo_robust = frag_value;</div><div class='del'>-			else</div><div class='del'>-				priv-&gt;frag_thresh = frag_value;</div><div class='del'>-		}</div><div class='del'>-		if (rts_value &gt;= 0)</div><div class='del'>-			priv-&gt;rts_thresh = rts_value;</div><div class='del'>-</div><div class='del'>-		err = orinoco_commit(priv);</div><div class='del'>-</div><div class='del'>-		orinoco_unlock(priv, &amp;flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct cfg80211_ops orinoco_cfg_ops = {</div><div class='del'>-	.change_virtual_intf = orinoco_change_vif,</div><div class='del'>-	.set_monitor_channel = orinoco_set_monitor_channel,</div><div class='del'>-	.scan = orinoco_scan,</div><div class='del'>-	.set_wiphy_params = orinoco_set_wiphy_params,</div><div class='del'>-};</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/cfg.h b/drivers/net/wireless/intersil/orinoco/cfg.h<br/>deleted file mode 100644<br/>index 3ddc96a06cd7..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/cfg.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/cfg.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-/* cfg80211 support.</div><div class='del'>- *</div><div class='del'>- * See copyright notice in main.c</div><div class='del'>- */</div><div class='del'>-#ifndef ORINOCO_CFG_H</div><div class='del'>-#define ORINOCO_CFG_H</div><div class='del'>-</div><div class='del'>-#include &lt;net/cfg80211.h&gt;</div><div class='del'>-</div><div class='del'>-extern const struct cfg80211_ops orinoco_cfg_ops;</div><div class='del'>-</div><div class='del'>-void orinoco_wiphy_init(struct wiphy *wiphy);</div><div class='del'>-int orinoco_wiphy_register(struct wiphy *wiphy);</div><div class='del'>-</div><div class='del'>-#endif /* ORINOCO_CFG_H */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/fw.c b/drivers/net/wireless/intersil/orinoco/fw.c<br/>deleted file mode 100644<br/>index 015af782881b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/fw.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/fw.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,387 +0,0 @@</div><div class='del'>-/* Firmware file reading and download helpers</div><div class='del'>- *</div><div class='del'>- * See copyright notice in main.c</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/firmware.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hermes.h"</div><div class='del'>-#include "hermes_dld.h"</div><div class='del'>-#include "orinoco.h"</div><div class='del'>-</div><div class='del'>-#include "fw.h"</div><div class='del'>-</div><div class='del'>-/* End markers (for Symbol firmware only) */</div><div class='del'>-#define TEXT_END	0x1A		/* End of text header */</div><div class='del'>-</div><div class='del'>-struct fw_info {</div><div class='del'>-	char *pri_fw;</div><div class='del'>-	char *sta_fw;</div><div class='del'>-	char *ap_fw;</div><div class='del'>-	u32 pda_addr;</div><div class='del'>-	u16 pda_size;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct fw_info orinoco_fw[] = {</div><div class='del'>-	{ NULL, "agere_sta_fw.bin", "agere_ap_fw.bin", 0x00390000, 1000 },</div><div class='del'>-	{ NULL, "prism_sta_fw.bin", "prism_ap_fw.bin", 0, 1024 },</div><div class='del'>-	{ "symbol_sp24t_prim_fw", "symbol_sp24t_sec_fw", NULL, 0x00003100, 512 }</div><div class='del'>-};</div><div class='del'>-MODULE_FIRMWARE("agere_sta_fw.bin");</div><div class='del'>-MODULE_FIRMWARE("agere_ap_fw.bin");</div><div class='del'>-MODULE_FIRMWARE("prism_sta_fw.bin");</div><div class='del'>-MODULE_FIRMWARE("prism_ap_fw.bin");</div><div class='del'>-MODULE_FIRMWARE("symbol_sp24t_prim_fw");</div><div class='del'>-MODULE_FIRMWARE("symbol_sp24t_sec_fw");</div><div class='del'>-</div><div class='del'>-/* Structure used to access fields in FW</div><div class='del'>- * Make sure LE decoding macros are used</div><div class='del'>- */</div><div class='del'>-struct orinoco_fw_header {</div><div class='del'>-	char hdr_vers[6];       /* ASCII string for header version */</div><div class='del'>-	__le16 headersize;      /* Total length of header */</div><div class='del'>-	__le32 entry_point;     /* NIC entry point */</div><div class='del'>-	__le32 blocks;          /* Number of blocks to program */</div><div class='del'>-	__le32 block_offset;    /* Offset of block data from eof header */</div><div class='del'>-	__le32 pdr_offset;      /* Offset to PDR data from eof header */</div><div class='del'>-	__le32 pri_offset;      /* Offset to primary plug data */</div><div class='del'>-	__le32 compat_offset;   /* Offset to compatibility data*/</div><div class='del'>-	char signature[];      /* FW signature length headersize-20 */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* Check the range of various header entries. Return a pointer to a</div><div class='del'>- * description of the problem, or NULL if everything checks out. */</div><div class='del'>-static const char *validate_fw(const struct orinoco_fw_header *hdr, size_t len)</div><div class='del'>-{</div><div class='del'>-	u16 hdrsize;</div><div class='del'>-</div><div class='del'>-	if (len &lt; sizeof(*hdr))</div><div class='del'>-		return "image too small";</div><div class='del'>-	if (memcmp(hdr-&gt;hdr_vers, "HFW", 3) != 0)</div><div class='del'>-		return "format not recognised";</div><div class='del'>-</div><div class='del'>-	hdrsize = le16_to_cpu(hdr-&gt;headersize);</div><div class='del'>-	if (hdrsize &gt; len)</div><div class='del'>-		return "bad headersize";</div><div class='del'>-	if ((hdrsize + le32_to_cpu(hdr-&gt;block_offset)) &gt; len)</div><div class='del'>-		return "bad block offset";</div><div class='del'>-	if ((hdrsize + le32_to_cpu(hdr-&gt;pdr_offset)) &gt; len)</div><div class='del'>-		return "bad PDR offset";</div><div class='del'>-	if ((hdrsize + le32_to_cpu(hdr-&gt;pri_offset)) &gt; len)</div><div class='del'>-		return "bad PRI offset";</div><div class='del'>-	if ((hdrsize + le32_to_cpu(hdr-&gt;compat_offset)) &gt; len)</div><div class='del'>-		return "bad compat offset";</div><div class='del'>-</div><div class='del'>-	/* TODO: consider adding a checksum or CRC to the firmware format */</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_HERMES_CACHE_FW_ON_INIT) || defined(CONFIG_PM_SLEEP)</div><div class='del'>-static inline const struct firmware *</div><div class='del'>-orinoco_cached_fw_get(struct orinoco_private *priv, bool primary)</div><div class='del'>-{</div><div class='del'>-	if (primary)</div><div class='del'>-		return priv-&gt;cached_pri_fw;</div><div class='del'>-	else</div><div class='del'>-		return priv-&gt;cached_fw;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define orinoco_cached_fw_get(priv, primary) (NULL)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Download either STA or AP firmware into the card. */</div><div class='del'>-static int</div><div class='del'>-orinoco_dl_firmware(struct orinoco_private *priv,</div><div class='del'>-		    const struct fw_info *fw,</div><div class='del'>-		    int ap)</div><div class='del'>-{</div><div class='del'>-	/* Plug Data Area (PDA) */</div><div class='del'>-	__le16 *pda;</div><div class='del'>-</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	const struct firmware *fw_entry;</div><div class='del'>-	const struct orinoco_fw_header *hdr;</div><div class='del'>-	const unsigned char *first_block;</div><div class='del'>-	const void *end;</div><div class='del'>-	const char *firmware;</div><div class='del'>-	const char *fw_err;</div><div class='del'>-	struct device *dev = priv-&gt;dev;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	pda = kzalloc(fw-&gt;pda_size, GFP_KERNEL);</div><div class='del'>-	if (!pda)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (ap)</div><div class='del'>-		firmware = fw-&gt;ap_fw;</div><div class='del'>-	else</div><div class='del'>-		firmware = fw-&gt;sta_fw;</div><div class='del'>-</div><div class='del'>-	dev_dbg(dev, "Attempting to download firmware %s\n", firmware);</div><div class='del'>-</div><div class='del'>-	/* Read current plug data */</div><div class='del'>-	err = hw-&gt;ops-&gt;read_pda(hw, pda, fw-&gt;pda_addr, fw-&gt;pda_size);</div><div class='del'>-	dev_dbg(dev, "Read PDA returned %d\n", err);</div><div class='del'>-	if (err)</div><div class='del'>-		goto free;</div><div class='del'>-</div><div class='del'>-	if (!orinoco_cached_fw_get(priv, false)) {</div><div class='del'>-		err = request_firmware(&amp;fw_entry, firmware, priv-&gt;dev);</div><div class='del'>-</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(dev, "Cannot find firmware %s\n", firmware);</div><div class='del'>-			err = -ENOENT;</div><div class='del'>-			goto free;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		fw_entry = orinoco_cached_fw_get(priv, false);</div><div class='del'>-</div><div class='del'>-	hdr = (const struct orinoco_fw_header *) fw_entry-&gt;data;</div><div class='del'>-</div><div class='del'>-	fw_err = validate_fw(hdr, fw_entry-&gt;size);</div><div class='del'>-	if (fw_err) {</div><div class='del'>-		dev_warn(dev, "Invalid firmware image detected (%s). "</div><div class='del'>-			 "Aborting download\n", fw_err);</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto abort;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Enable aux port to allow programming */</div><div class='del'>-	err = hw-&gt;ops-&gt;program_init(hw, le32_to_cpu(hdr-&gt;entry_point));</div><div class='del'>-	dev_dbg(dev, "Program init returned %d\n", err);</div><div class='del'>-	if (err != 0)</div><div class='del'>-		goto abort;</div><div class='del'>-</div><div class='del'>-	/* Program data */</div><div class='del'>-	first_block = (fw_entry-&gt;data +</div><div class='del'>-		       le16_to_cpu(hdr-&gt;headersize) +</div><div class='del'>-		       le32_to_cpu(hdr-&gt;block_offset));</div><div class='del'>-	end = fw_entry-&gt;data + fw_entry-&gt;size;</div><div class='del'>-</div><div class='del'>-	err = hermes_program(hw, first_block, end);</div><div class='del'>-	dev_dbg(dev, "Program returned %d\n", err);</div><div class='del'>-	if (err != 0)</div><div class='del'>-		goto abort;</div><div class='del'>-</div><div class='del'>-	/* Update production data */</div><div class='del'>-	first_block = (fw_entry-&gt;data +</div><div class='del'>-		       le16_to_cpu(hdr-&gt;headersize) +</div><div class='del'>-		       le32_to_cpu(hdr-&gt;pdr_offset));</div><div class='del'>-</div><div class='del'>-	err = hermes_apply_pda_with_defaults(hw, first_block, end, pda,</div><div class='del'>-					     &amp;pda[fw-&gt;pda_size / sizeof(*pda)]);</div><div class='del'>-	dev_dbg(dev, "Apply PDA returned %d\n", err);</div><div class='del'>-	if (err)</div><div class='del'>-		goto abort;</div><div class='del'>-</div><div class='del'>-	/* Tell card we've finished */</div><div class='del'>-	err = hw-&gt;ops-&gt;program_end(hw);</div><div class='del'>-	dev_dbg(dev, "Program end returned %d\n", err);</div><div class='del'>-	if (err != 0)</div><div class='del'>-		goto abort;</div><div class='del'>-</div><div class='del'>-	/* Check if we're running */</div><div class='del'>-	dev_dbg(dev, "hermes_present returned %d\n", hermes_present(hw));</div><div class='del'>-</div><div class='del'>-abort:</div><div class='del'>-	/* If we requested the firmware, release it. */</div><div class='del'>-	if (!orinoco_cached_fw_get(priv, false))</div><div class='del'>-		release_firmware(fw_entry);</div><div class='del'>-</div><div class='del'>-free:</div><div class='del'>-	kfree(pda);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Process a firmware image - stop the card, load the firmware, reset</div><div class='del'>- * the card and make sure it responds.  For the secondary firmware take</div><div class='del'>- * care of the PDA - read it and then write it on top of the firmware.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-symbol_dl_image(struct orinoco_private *priv, const struct fw_info *fw,</div><div class='del'>-		const unsigned char *image, const void *end,</div><div class='del'>-		int secondary)</div><div class='del'>-{</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	const unsigned char *ptr;</div><div class='del'>-	const unsigned char *first_block;</div><div class='del'>-</div><div class='del'>-	/* Plug Data Area (PDA) */</div><div class='del'>-	__le16 *pda = NULL;</div><div class='del'>-</div><div class='del'>-	/* Binary block begins after the 0x1A marker */</div><div class='del'>-	ptr = image;</div><div class='del'>-	while (*ptr++ != TEXT_END);</div><div class='del'>-	first_block = ptr;</div><div class='del'>-</div><div class='del'>-	/* Read the PDA from EEPROM */</div><div class='del'>-	if (secondary) {</div><div class='del'>-		pda = kzalloc(fw-&gt;pda_size, GFP_KERNEL);</div><div class='del'>-		if (!pda)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-</div><div class='del'>-		ret = hw-&gt;ops-&gt;read_pda(hw, pda, fw-&gt;pda_addr, fw-&gt;pda_size);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Stop the firmware, so that it can be safely rewritten */</div><div class='del'>-	if (priv-&gt;stop_fw) {</div><div class='del'>-		ret = priv-&gt;stop_fw(priv, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Program the adapter with new firmware */</div><div class='del'>-	ret = hermes_program(hw, first_block, end);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto free;</div><div class='del'>-</div><div class='del'>-	/* Write the PDA to the adapter */</div><div class='del'>-	if (secondary) {</div><div class='del'>-		size_t len = hermes_blocks_length(first_block, end);</div><div class='del'>-		ptr = first_block + len;</div><div class='del'>-		ret = hermes_apply_pda(hw, ptr, end, pda,</div><div class='del'>-				       &amp;pda[fw-&gt;pda_size / sizeof(*pda)]);</div><div class='del'>-		kfree(pda);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Run the firmware */</div><div class='del'>-	if (priv-&gt;stop_fw) {</div><div class='del'>-		ret = priv-&gt;stop_fw(priv, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Reset hermes chip and make sure it responds */</div><div class='del'>-	ret = hw-&gt;ops-&gt;init(hw);</div><div class='del'>-</div><div class='del'>-	/* hermes_reset() should return 0 with the secondary firmware */</div><div class='del'>-	if (secondary &amp;&amp; ret != 0)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	/* And this should work with any firmware */</div><div class='del'>-	if (!hermes_present(hw))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-free:</div><div class='del'>-	kfree(pda);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Download the firmware into the card, this also does a PCMCIA soft</div><div class='del'>- * reset on the card, to make sure it's in a sane state.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-symbol_dl_firmware(struct orinoco_private *priv,</div><div class='del'>-		   const struct fw_info *fw)</div><div class='del'>-{</div><div class='del'>-	struct device *dev = priv-&gt;dev;</div><div class='del'>-	int ret;</div><div class='del'>-	const struct firmware *fw_entry;</div><div class='del'>-</div><div class='del'>-	if (!orinoco_cached_fw_get(priv, true)) {</div><div class='del'>-		if (request_firmware(&amp;fw_entry, fw-&gt;pri_fw, priv-&gt;dev) != 0) {</div><div class='del'>-			dev_err(dev, "Cannot find firmware: %s\n", fw-&gt;pri_fw);</div><div class='del'>-			return -ENOENT;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		fw_entry = orinoco_cached_fw_get(priv, true);</div><div class='del'>-</div><div class='del'>-	/* Load primary firmware */</div><div class='del'>-	ret = symbol_dl_image(priv, fw, fw_entry-&gt;data,</div><div class='del'>-			      fw_entry-&gt;data + fw_entry-&gt;size, 0);</div><div class='del'>-</div><div class='del'>-	if (!orinoco_cached_fw_get(priv, true))</div><div class='del'>-		release_firmware(fw_entry);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(dev, "Primary firmware download failed\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!orinoco_cached_fw_get(priv, false)) {</div><div class='del'>-		if (request_firmware(&amp;fw_entry, fw-&gt;sta_fw, priv-&gt;dev) != 0) {</div><div class='del'>-			dev_err(dev, "Cannot find firmware: %s\n", fw-&gt;sta_fw);</div><div class='del'>-			return -ENOENT;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		fw_entry = orinoco_cached_fw_get(priv, false);</div><div class='del'>-</div><div class='del'>-	/* Load secondary firmware */</div><div class='del'>-	ret = symbol_dl_image(priv, fw, fw_entry-&gt;data,</div><div class='del'>-			      fw_entry-&gt;data + fw_entry-&gt;size, 1);</div><div class='del'>-	if (!orinoco_cached_fw_get(priv, false))</div><div class='del'>-		release_firmware(fw_entry);</div><div class='del'>-	if (ret)</div><div class='del'>-		dev_err(dev, "Secondary firmware download failed\n");</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int orinoco_download(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-	/* Reload firmware */</div><div class='del'>-	switch (priv-&gt;firmware_type) {</div><div class='del'>-	case FIRMWARE_TYPE_AGERE:</div><div class='del'>-		/* case FIRMWARE_TYPE_INTERSIL: */</div><div class='del'>-		err = orinoco_dl_firmware(priv,</div><div class='del'>-					  &amp;orinoco_fw[priv-&gt;firmware_type], 0);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case FIRMWARE_TYPE_SYMBOL:</div><div class='del'>-		err = symbol_dl_firmware(priv,</div><div class='del'>-					 &amp;orinoco_fw[priv-&gt;firmware_type]);</div><div class='del'>-		break;</div><div class='del'>-	case FIRMWARE_TYPE_INTERSIL:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	/* TODO: if we fail we probably need to reinitialise</div><div class='del'>-	 * the driver */</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_HERMES_CACHE_FW_ON_INIT) || defined(CONFIG_PM_SLEEP)</div><div class='del'>-void orinoco_cache_fw(struct orinoco_private *priv, int ap)</div><div class='del'>-{</div><div class='del'>-	const struct firmware *fw_entry = NULL;</div><div class='del'>-	const char *pri_fw;</div><div class='del'>-	const char *fw;</div><div class='del'>-</div><div class='del'>-	pri_fw = orinoco_fw[priv-&gt;firmware_type].pri_fw;</div><div class='del'>-	if (ap)</div><div class='del'>-		fw = orinoco_fw[priv-&gt;firmware_type].ap_fw;</div><div class='del'>-	else</div><div class='del'>-		fw = orinoco_fw[priv-&gt;firmware_type].sta_fw;</div><div class='del'>-</div><div class='del'>-	if (pri_fw) {</div><div class='del'>-		if (request_firmware(&amp;fw_entry, pri_fw, priv-&gt;dev) == 0)</div><div class='del'>-			priv-&gt;cached_pri_fw = fw_entry;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (fw) {</div><div class='del'>-		if (request_firmware(&amp;fw_entry, fw, priv-&gt;dev) == 0)</div><div class='del'>-			priv-&gt;cached_fw = fw_entry;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void orinoco_uncache_fw(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	release_firmware(priv-&gt;cached_pri_fw);</div><div class='del'>-	release_firmware(priv-&gt;cached_fw);</div><div class='del'>-	priv-&gt;cached_pri_fw = NULL;</div><div class='del'>-	priv-&gt;cached_fw = NULL;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/fw.h b/drivers/net/wireless/intersil/orinoco/fw.h<br/>deleted file mode 100644<br/>index aca63e3c4b5b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/fw.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/fw.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-/* Firmware file reading and download helpers</div><div class='del'>- *</div><div class='del'>- * See copyright notice in main.c</div><div class='del'>- */</div><div class='del'>-#ifndef _ORINOCO_FW_H_</div><div class='del'>-#define _ORINOCO_FW_H_</div><div class='del'>-</div><div class='del'>-/* Forward declations */</div><div class='del'>-struct orinoco_private;</div><div class='del'>-</div><div class='del'>-int orinoco_download(struct orinoco_private *priv);</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_HERMES_CACHE_FW_ON_INIT) || defined(CONFIG_PM_SLEEP)</div><div class='del'>-void orinoco_cache_fw(struct orinoco_private *priv, int ap);</div><div class='del'>-void orinoco_uncache_fw(struct orinoco_private *priv);</div><div class='del'>-#else</div><div class='del'>-#define orinoco_cache_fw(priv, ap) do { } while (0)</div><div class='del'>-#define orinoco_uncache_fw(priv) do { } while (0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* _ORINOCO_FW_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/hermes.c b/drivers/net/wireless/intersil/orinoco/hermes.c<br/>deleted file mode 100644<br/>index 6d4b7f64efcf..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/hermes.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/hermes.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,778 +0,0 @@</div><div class='del'>-/* hermes.c</div><div class='del'>- *</div><div class='del'>- * Driver core for the "Hermes" wireless MAC controller, as used in</div><div class='del'>- * the Lucent Orinoco and Cabletron RoamAbout cards. It should also</div><div class='del'>- * work on the hfa3841 and hfa3842 MAC controller chips used in the</div><div class='del'>- * Prism II chipsets.</div><div class='del'>- *</div><div class='del'>- * This is not a complete driver, just low-level access routines for</div><div class='del'>- * the MAC controller itself.</div><div class='del'>- *</div><div class='del'>- * Based on the prism2 driver from Absolute Value Systems' linux-wlan</div><div class='del'>- * project, the Linux wvlan_cs driver, Lucent's HCF-Light</div><div class='del'>- * (wvlan_hcf.c) library, and the NetBSD wireless driver (in no</div><div class='del'>- * particular order).</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000, David Gibson, Linuxcare Australia.</div><div class='del'>- * (C) Copyright David Gibson, IBM Corp. 2001-2003.</div><div class='del'>- *</div><div class='del'>- * The contents of this file are subject to the Mozilla Public License</div><div class='del'>- * Version 1.1 (the "License"); you may not use this file except in</div><div class='del'>- * compliance with the License. You may obtain a copy of the License</div><div class='del'>- * at http://www.mozilla.org/MPL/</div><div class='del'>- *</div><div class='del'>- * Software distributed under the License is distributed on an "AS IS"</div><div class='del'>- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See</div><div class='del'>- * the License for the specific language governing rights and</div><div class='del'>- * limitations under the License.</div><div class='del'>- *</div><div class='del'>- * Alternatively, the contents of this file may be used under the</div><div class='del'>- * terms of the GNU General Public License version 2 (the "GPL"), in</div><div class='del'>- * which case the provisions of the GPL are applicable instead of the</div><div class='del'>- * above.  If you wish to allow the use of your version of this file</div><div class='del'>- * only under the terms of the GPL and not to allow others to use your</div><div class='del'>- * version of this file under the MPL, indicate your decision by</div><div class='del'>- * deleting the provisions above and replace them with the notice and</div><div class='del'>- * other provisions required by the GPL.  If you do not delete the</div><div class='del'>- * provisions above, a recipient may use your version of this file</div><div class='del'>- * under either the MPL or the GPL.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hermes.h"</div><div class='del'>-</div><div class='del'>-/* These are maximum timeouts. Most often, card wil react much faster */</div><div class='del'>-#define CMD_BUSY_TIMEOUT (100) /* In iterations of ~1us */</div><div class='del'>-#define CMD_INIT_TIMEOUT (50000) /* in iterations of ~10us */</div><div class='del'>-#define CMD_COMPL_TIMEOUT (20000) /* in iterations of ~10us */</div><div class='del'>-#define ALLOC_COMPL_TIMEOUT (1000) /* in iterations of ~10us */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * AUX port access.  To unlock the AUX port write the access keys to the</div><div class='del'>- * PARAM0-2 registers, then write HERMES_AUX_ENABLE to the HERMES_CONTROL</div><div class='del'>- * register.  Then read it and make sure it's HERMES_AUX_ENABLED.</div><div class='del'>- */</div><div class='del'>-#define HERMES_AUX_ENABLE	0x8000	/* Enable auxiliary port access */</div><div class='del'>-#define HERMES_AUX_DISABLE	0x4000	/* Disable to auxiliary port access */</div><div class='del'>-#define HERMES_AUX_ENABLED	0xC000	/* Auxiliary port is open */</div><div class='del'>-#define HERMES_AUX_DISABLED	0x0000	/* Auxiliary port is closed */</div><div class='del'>-</div><div class='del'>-#define HERMES_AUX_PW0	0xFE01</div><div class='del'>-#define HERMES_AUX_PW1	0xDC23</div><div class='del'>-#define HERMES_AUX_PW2	0xBA45</div><div class='del'>-</div><div class='del'>-/* HERMES_CMD_DOWNLD */</div><div class='del'>-#define HERMES_PROGRAM_DISABLE             (0x0000 | HERMES_CMD_DOWNLD)</div><div class='del'>-#define HERMES_PROGRAM_ENABLE_VOLATILE     (0x0100 | HERMES_CMD_DOWNLD)</div><div class='del'>-#define HERMES_PROGRAM_ENABLE_NON_VOLATILE (0x0200 | HERMES_CMD_DOWNLD)</div><div class='del'>-#define HERMES_PROGRAM_NON_VOLATILE        (0x0300 | HERMES_CMD_DOWNLD)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Debugging helpers</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define DMSG(stuff...) do {printk(KERN_DEBUG "hermes @ %p: " , hw-&gt;iobase); \</div><div class='del'>-			printk(stuff); } while (0)</div><div class='del'>-</div><div class='del'>-#undef HERMES_DEBUG</div><div class='del'>-#ifdef HERMES_DEBUG</div><div class='del'>-#include &lt;stdarg.h&gt;</div><div class='del'>-</div><div class='del'>-#define DEBUG(lvl, stuff...) if ((lvl) &lt;= HERMES_DEBUG) DMSG(stuff)</div><div class='del'>-</div><div class='del'>-#else /* ! HERMES_DEBUG */</div><div class='del'>-</div><div class='del'>-#define DEBUG(lvl, stuff...) do { } while (0)</div><div class='del'>-</div><div class='del'>-#endif /* ! HERMES_DEBUG */</div><div class='del'>-</div><div class='del'>-static const struct hermes_ops hermes_ops_local;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Internal functions</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Issue a command to the chip. Waiting for it to complete is the caller's</div><div class='del'>-   problem.</div><div class='del'>-</div><div class='del'>-   Returns -EBUSY if the command register is busy, 0 on success.</div><div class='del'>-</div><div class='del'>-   Callable from any context.</div><div class='del'>-*/</div><div class='del'>-static int hermes_issue_cmd(struct hermes *hw, u16 cmd, u16 param0,</div><div class='del'>-			    u16 param1, u16 param2)</div><div class='del'>-{</div><div class='del'>-	int k = CMD_BUSY_TIMEOUT;</div><div class='del'>-	u16 reg;</div><div class='del'>-</div><div class='del'>-	/* First wait for the command register to unbusy */</div><div class='del'>-	reg = hermes_read_regn(hw, CMD);</div><div class='del'>-	while ((reg &amp; HERMES_CMD_BUSY) &amp;&amp; k) {</div><div class='del'>-		k--;</div><div class='del'>-		udelay(1);</div><div class='del'>-		reg = hermes_read_regn(hw, CMD);</div><div class='del'>-	}</div><div class='del'>-	if (reg &amp; HERMES_CMD_BUSY)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	hermes_write_regn(hw, PARAM2, param2);</div><div class='del'>-	hermes_write_regn(hw, PARAM1, param1);</div><div class='del'>-	hermes_write_regn(hw, PARAM0, param0);</div><div class='del'>-	hermes_write_regn(hw, CMD, cmd);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Function definitions</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* For doing cmds that wipe the magic constant in SWSUPPORT0 */</div><div class='del'>-static int hermes_doicmd_wait(struct hermes *hw, u16 cmd,</div><div class='del'>-			      u16 parm0, u16 parm1, u16 parm2,</div><div class='del'>-			      struct hermes_response *resp)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-	int k;</div><div class='del'>-	u16 status, reg;</div><div class='del'>-</div><div class='del'>-	err = hermes_issue_cmd(hw, cmd, parm0, parm1, parm2);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	reg = hermes_read_regn(hw, EVSTAT);</div><div class='del'>-	k = CMD_INIT_TIMEOUT;</div><div class='del'>-	while ((!(reg &amp; HERMES_EV_CMD)) &amp;&amp; k) {</div><div class='del'>-		k--;</div><div class='del'>-		udelay(10);</div><div class='del'>-		reg = hermes_read_regn(hw, EVSTAT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hermes_write_regn(hw, SWSUPPORT0, HERMES_MAGIC);</div><div class='del'>-</div><div class='del'>-	if (!hermes_present(hw)) {</div><div class='del'>-		DEBUG(0, "hermes @ 0x%x: Card removed during reset.\n",</div><div class='del'>-		       hw-&gt;iobase);</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(reg &amp; HERMES_EV_CMD)) {</div><div class='del'>-		printk(KERN_ERR "hermes @ %p: "</div><div class='del'>-		       "Timeout waiting for card to reset (reg=0x%04x)!\n",</div><div class='del'>-		       hw-&gt;iobase, reg);</div><div class='del'>-		err = -ETIMEDOUT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = hermes_read_regn(hw, STATUS);</div><div class='del'>-	if (resp) {</div><div class='del'>-		resp-&gt;status = status;</div><div class='del'>-		resp-&gt;resp0 = hermes_read_regn(hw, RESP0);</div><div class='del'>-		resp-&gt;resp1 = hermes_read_regn(hw, RESP1);</div><div class='del'>-		resp-&gt;resp2 = hermes_read_regn(hw, RESP2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hermes_write_regn(hw, EVACK, HERMES_EV_CMD);</div><div class='del'>-</div><div class='del'>-	if (status &amp; HERMES_STATUS_RESULT)</div><div class='del'>-		err = -EIO;</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void hermes_struct_init(struct hermes *hw, void __iomem *address,</div><div class='del'>-			int reg_spacing)</div><div class='del'>-{</div><div class='del'>-	hw-&gt;iobase = address;</div><div class='del'>-	hw-&gt;reg_spacing = reg_spacing;</div><div class='del'>-	hw-&gt;inten = 0x0;</div><div class='del'>-	hw-&gt;eeprom_pda = false;</div><div class='del'>-	hw-&gt;ops = &amp;hermes_ops_local;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(hermes_struct_init);</div><div class='del'>-</div><div class='del'>-static int hermes_init(struct hermes *hw)</div><div class='del'>-{</div><div class='del'>-	u16 reg;</div><div class='del'>-	int err = 0;</div><div class='del'>-	int k;</div><div class='del'>-</div><div class='del'>-	/* We don't want to be interrupted while resetting the chipset */</div><div class='del'>-	hw-&gt;inten = 0x0;</div><div class='del'>-	hermes_write_regn(hw, INTEN, 0);</div><div class='del'>-	hermes_write_regn(hw, EVACK, 0xffff);</div><div class='del'>-</div><div class='del'>-	/* Normally it's a "can't happen" for the command register to</div><div class='del'>-	   be busy when we go to issue a command because we are</div><div class='del'>-	   serializing all commands.  However we want to have some</div><div class='del'>-	   chance of resetting the card even if it gets into a stupid</div><div class='del'>-	   state, so we actually wait to see if the command register</div><div class='del'>-	   will unbusy itself here. */</div><div class='del'>-	k = CMD_BUSY_TIMEOUT;</div><div class='del'>-	reg = hermes_read_regn(hw, CMD);</div><div class='del'>-	while (k &amp;&amp; (reg &amp; HERMES_CMD_BUSY)) {</div><div class='del'>-		if (reg == 0xffff) /* Special case - the card has probably been</div><div class='del'>-				      removed, so don't wait for the timeout */</div><div class='del'>-			return -ENODEV;</div><div class='del'>-</div><div class='del'>-		k--;</div><div class='del'>-		udelay(1);</div><div class='del'>-		reg = hermes_read_regn(hw, CMD);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* No need to explicitly handle the timeout - if we've timed</div><div class='del'>-	   out hermes_issue_cmd() will probably return -EBUSY below */</div><div class='del'>-</div><div class='del'>-	/* According to the documentation, EVSTAT may contain</div><div class='del'>-	   obsolete event occurrence information.  We have to acknowledge</div><div class='del'>-	   it by writing EVACK. */</div><div class='del'>-	reg = hermes_read_regn(hw, EVSTAT);</div><div class='del'>-	hermes_write_regn(hw, EVACK, reg);</div><div class='del'>-</div><div class='del'>-	/* We don't use hermes_docmd_wait here, because the reset wipes</div><div class='del'>-	   the magic constant in SWSUPPORT0 away, and it gets confused */</div><div class='del'>-	err = hermes_doicmd_wait(hw, HERMES_CMD_INIT, 0, 0, 0, NULL);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Issue a command to the chip, and (busy!) wait for it to</div><div class='del'>- * complete.</div><div class='del'>- *</div><div class='del'>- * Returns:</div><div class='del'>- *     &lt; 0 on internal error</div><div class='del'>- *       0 on success</div><div class='del'>- *     &gt; 0 on error returned by the firmware</div><div class='del'>- *</div><div class='del'>- * Callable from any context, but locking is your problem. */</div><div class='del'>-static int hermes_docmd_wait(struct hermes *hw, u16 cmd, u16 parm0,</div><div class='del'>-			     struct hermes_response *resp)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	int k;</div><div class='del'>-	u16 reg;</div><div class='del'>-	u16 status;</div><div class='del'>-</div><div class='del'>-	err = hermes_issue_cmd(hw, cmd, parm0, 0, 0);</div><div class='del'>-	if (err) {</div><div class='del'>-		if (!hermes_present(hw)) {</div><div class='del'>-			if (net_ratelimit())</div><div class='del'>-				printk(KERN_WARNING "hermes @ %p: "</div><div class='del'>-				       "Card removed while issuing command "</div><div class='del'>-				       "0x%04x.\n", hw-&gt;iobase, cmd);</div><div class='del'>-			err = -ENODEV;</div><div class='del'>-		} else</div><div class='del'>-			if (net_ratelimit())</div><div class='del'>-				printk(KERN_ERR "hermes @ %p: "</div><div class='del'>-				       "Error %d issuing command 0x%04x.\n",</div><div class='del'>-				       hw-&gt;iobase, err, cmd);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reg = hermes_read_regn(hw, EVSTAT);</div><div class='del'>-	k = CMD_COMPL_TIMEOUT;</div><div class='del'>-	while ((!(reg &amp; HERMES_EV_CMD)) &amp;&amp; k) {</div><div class='del'>-		k--;</div><div class='del'>-		udelay(10);</div><div class='del'>-		reg = hermes_read_regn(hw, EVSTAT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!hermes_present(hw)) {</div><div class='del'>-		printk(KERN_WARNING "hermes @ %p: Card removed "</div><div class='del'>-		       "while waiting for command 0x%04x completion.\n",</div><div class='del'>-		       hw-&gt;iobase, cmd);</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(reg &amp; HERMES_EV_CMD)) {</div><div class='del'>-		printk(KERN_ERR "hermes @ %p: Timeout waiting for "</div><div class='del'>-		       "command 0x%04x completion.\n", hw-&gt;iobase, cmd);</div><div class='del'>-		err = -ETIMEDOUT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = hermes_read_regn(hw, STATUS);</div><div class='del'>-	if (resp) {</div><div class='del'>-		resp-&gt;status = status;</div><div class='del'>-		resp-&gt;resp0 = hermes_read_regn(hw, RESP0);</div><div class='del'>-		resp-&gt;resp1 = hermes_read_regn(hw, RESP1);</div><div class='del'>-		resp-&gt;resp2 = hermes_read_regn(hw, RESP2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hermes_write_regn(hw, EVACK, HERMES_EV_CMD);</div><div class='del'>-</div><div class='del'>-	if (status &amp; HERMES_STATUS_RESULT)</div><div class='del'>-		err = -EIO;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hermes_allocate(struct hermes *hw, u16 size, u16 *fid)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-	int k;</div><div class='del'>-	u16 reg;</div><div class='del'>-</div><div class='del'>-	if ((size &lt; HERMES_ALLOC_LEN_MIN) || (size &gt; HERMES_ALLOC_LEN_MAX))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	err = hermes_docmd_wait(hw, HERMES_CMD_ALLOC, size, NULL);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	reg = hermes_read_regn(hw, EVSTAT);</div><div class='del'>-	k = ALLOC_COMPL_TIMEOUT;</div><div class='del'>-	while ((!(reg &amp; HERMES_EV_ALLOC)) &amp;&amp; k) {</div><div class='del'>-		k--;</div><div class='del'>-		udelay(10);</div><div class='del'>-		reg = hermes_read_regn(hw, EVSTAT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!hermes_present(hw)) {</div><div class='del'>-		printk(KERN_WARNING "hermes @ %p: "</div><div class='del'>-		       "Card removed waiting for frame allocation.\n",</div><div class='del'>-		       hw-&gt;iobase);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(reg &amp; HERMES_EV_ALLOC)) {</div><div class='del'>-		printk(KERN_ERR "hermes @ %p: "</div><div class='del'>-		       "Timeout waiting for frame allocation\n",</div><div class='del'>-		       hw-&gt;iobase);</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*fid = hermes_read_regn(hw, ALLOCFID);</div><div class='del'>-	hermes_write_regn(hw, EVACK, HERMES_EV_ALLOC);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Set up a BAP to read a particular chunk of data from card's internal buffer.</div><div class='del'>- *</div><div class='del'>- * Returns:</div><div class='del'>- *     &lt; 0 on internal failure (errno)</div><div class='del'>- *       0 on success</div><div class='del'>- *     &gt; 0 on error</div><div class='del'>- * from firmware</div><div class='del'>- *</div><div class='del'>- * Callable from any context */</div><div class='del'>-static int hermes_bap_seek(struct hermes *hw, int bap, u16 id, u16 offset)</div><div class='del'>-{</div><div class='del'>-	int sreg = bap ? HERMES_SELECT1 : HERMES_SELECT0;</div><div class='del'>-	int oreg = bap ? HERMES_OFFSET1 : HERMES_OFFSET0;</div><div class='del'>-	int k;</div><div class='del'>-	u16 reg;</div><div class='del'>-</div><div class='del'>-	/* Paranoia.. */</div><div class='del'>-	if ((offset &gt; HERMES_BAP_OFFSET_MAX) || (offset % 2))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	k = HERMES_BAP_BUSY_TIMEOUT;</div><div class='del'>-	reg = hermes_read_reg(hw, oreg);</div><div class='del'>-	while ((reg &amp; HERMES_OFFSET_BUSY) &amp;&amp; k) {</div><div class='del'>-		k--;</div><div class='del'>-		udelay(1);</div><div class='del'>-		reg = hermes_read_reg(hw, oreg);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (reg &amp; HERMES_OFFSET_BUSY)</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-	/* Now we actually set up the transfer */</div><div class='del'>-	hermes_write_reg(hw, sreg, id);</div><div class='del'>-	hermes_write_reg(hw, oreg, offset);</div><div class='del'>-</div><div class='del'>-	/* Wait for the BAP to be ready */</div><div class='del'>-	k = HERMES_BAP_BUSY_TIMEOUT;</div><div class='del'>-	reg = hermes_read_reg(hw, oreg);</div><div class='del'>-	while ((reg &amp; (HERMES_OFFSET_BUSY | HERMES_OFFSET_ERR)) &amp;&amp; k) {</div><div class='del'>-		k--;</div><div class='del'>-		udelay(1);</div><div class='del'>-		reg = hermes_read_reg(hw, oreg);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (reg != offset) {</div><div class='del'>-		printk(KERN_ERR "hermes @ %p: BAP%d offset %s: "</div><div class='del'>-		       "reg=0x%x id=0x%x offset=0x%x\n", hw-&gt;iobase, bap,</div><div class='del'>-		       (reg &amp; HERMES_OFFSET_BUSY) ? "timeout" : "error",</div><div class='del'>-		       reg, id, offset);</div><div class='del'>-</div><div class='del'>-		if (reg &amp; HERMES_OFFSET_BUSY)</div><div class='del'>-			return -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-		return -EIO;		/* error or wrong offset */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Read a block of data from the chip's buffer, via the</div><div class='del'>- * BAP. Synchronization/serialization is the caller's problem.  len</div><div class='del'>- * must be even.</div><div class='del'>- *</div><div class='del'>- * Returns:</div><div class='del'>- *     &lt; 0 on internal failure (errno)</div><div class='del'>- *       0 on success</div><div class='del'>- *     &gt; 0 on error from firmware</div><div class='del'>- */</div><div class='del'>-static int hermes_bap_pread(struct hermes *hw, int bap, void *buf, int len,</div><div class='del'>-			    u16 id, u16 offset)</div><div class='del'>-{</div><div class='del'>-	int dreg = bap ? HERMES_DATA1 : HERMES_DATA0;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if ((len &lt; 0) || (len % 2))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	err = hermes_bap_seek(hw, bap, id, offset);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Actually do the transfer */</div><div class='del'>-	hermes_read_words(hw, dreg, buf, len / 2);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Write a block of data to the chip's buffer, via the</div><div class='del'>- * BAP. Synchronization/serialization is the caller's problem.</div><div class='del'>- *</div><div class='del'>- * Returns:</div><div class='del'>- *     &lt; 0 on internal failure (errno)</div><div class='del'>- *       0 on success</div><div class='del'>- *     &gt; 0 on error from firmware</div><div class='del'>- */</div><div class='del'>-static int hermes_bap_pwrite(struct hermes *hw, int bap, const void *buf,</div><div class='del'>-			     int len, u16 id, u16 offset)</div><div class='del'>-{</div><div class='del'>-	int dreg = bap ? HERMES_DATA1 : HERMES_DATA0;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (len &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	err = hermes_bap_seek(hw, bap, id, offset);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Actually do the transfer */</div><div class='del'>-	hermes_write_bytes(hw, dreg, buf, len);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Read a Length-Type-Value record from the card.</div><div class='del'>- *</div><div class='del'>- * If length is NULL, we ignore the length read from the card, and</div><div class='del'>- * read the entire buffer regardless. This is useful because some of</div><div class='del'>- * the configuration records appear to have incorrect lengths in</div><div class='del'>- * practice.</div><div class='del'>- *</div><div class='del'>- * Callable from user or bh context.  */</div><div class='del'>-static int hermes_read_ltv(struct hermes *hw, int bap, u16 rid,</div><div class='del'>-			   unsigned bufsize, u16 *length, void *buf)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-	int dreg = bap ? HERMES_DATA1 : HERMES_DATA0;</div><div class='del'>-	u16 rlength, rtype;</div><div class='del'>-	unsigned nwords;</div><div class='del'>-</div><div class='del'>-	if (bufsize % 2)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	err = hermes_docmd_wait(hw, HERMES_CMD_ACCESS, rid, NULL);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = hermes_bap_seek(hw, bap, rid, 0);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	rlength = hermes_read_reg(hw, dreg);</div><div class='del'>-</div><div class='del'>-	if (!rlength)</div><div class='del'>-		return -ENODATA;</div><div class='del'>-</div><div class='del'>-	rtype = hermes_read_reg(hw, dreg);</div><div class='del'>-</div><div class='del'>-	if (length)</div><div class='del'>-		*length = rlength;</div><div class='del'>-</div><div class='del'>-	if (rtype != rid)</div><div class='del'>-		printk(KERN_WARNING "hermes @ %p: %s(): "</div><div class='del'>-		       "rid (0x%04x) does not match type (0x%04x)\n",</div><div class='del'>-		       hw-&gt;iobase, __func__, rid, rtype);</div><div class='del'>-	if (HERMES_RECLEN_TO_BYTES(rlength) &gt; bufsize)</div><div class='del'>-		printk(KERN_WARNING "hermes @ %p: "</div><div class='del'>-		       "Truncating LTV record from %d to %d bytes. "</div><div class='del'>-		       "(rid=0x%04x, len=0x%04x)\n", hw-&gt;iobase,</div><div class='del'>-		       HERMES_RECLEN_TO_BYTES(rlength), bufsize, rid, rlength);</div><div class='del'>-</div><div class='del'>-	nwords = min((unsigned)rlength - 1, bufsize / 2);</div><div class='del'>-	hermes_read_words(hw, dreg, buf, nwords);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hermes_write_ltv(struct hermes *hw, int bap, u16 rid,</div><div class='del'>-			    u16 length, const void *value)</div><div class='del'>-{</div><div class='del'>-	int dreg = bap ? HERMES_DATA1 : HERMES_DATA0;</div><div class='del'>-	int err = 0;</div><div class='del'>-	unsigned count;</div><div class='del'>-</div><div class='del'>-	if (length == 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	err = hermes_bap_seek(hw, bap, rid, 0);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	hermes_write_reg(hw, dreg, length);</div><div class='del'>-	hermes_write_reg(hw, dreg, rid);</div><div class='del'>-</div><div class='del'>-	count = length - 1;</div><div class='del'>-</div><div class='del'>-	hermes_write_bytes(hw, dreg, value, count &lt;&lt; 1);</div><div class='del'>-</div><div class='del'>-	err = hermes_docmd_wait(hw, HERMES_CMD_ACCESS | HERMES_CMD_WRITE,</div><div class='del'>-				rid, NULL);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*** Hermes AUX control ***/</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-hermes_aux_setaddr(struct hermes *hw, u32 addr)</div><div class='del'>-{</div><div class='del'>-	hermes_write_reg(hw, HERMES_AUXPAGE, (u16) (addr &gt;&gt; 7));</div><div class='del'>-	hermes_write_reg(hw, HERMES_AUXOFFSET, (u16) (addr &amp; 0x7F));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-hermes_aux_control(struct hermes *hw, int enabled)</div><div class='del'>-{</div><div class='del'>-	int desired_state = enabled ? HERMES_AUX_ENABLED : HERMES_AUX_DISABLED;</div><div class='del'>-	int action = enabled ? HERMES_AUX_ENABLE : HERMES_AUX_DISABLE;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Already open? */</div><div class='del'>-	if (hermes_read_reg(hw, HERMES_CONTROL) == desired_state)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	hermes_write_reg(hw, HERMES_PARAM0, HERMES_AUX_PW0);</div><div class='del'>-	hermes_write_reg(hw, HERMES_PARAM1, HERMES_AUX_PW1);</div><div class='del'>-	hermes_write_reg(hw, HERMES_PARAM2, HERMES_AUX_PW2);</div><div class='del'>-	hermes_write_reg(hw, HERMES_CONTROL, action);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 20; i++) {</div><div class='del'>-		udelay(10);</div><div class='del'>-		if (hermes_read_reg(hw, HERMES_CONTROL) ==</div><div class='del'>-		    desired_state)</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EBUSY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*** Hermes programming ***/</div><div class='del'>-</div><div class='del'>-/* About to start programming data (Hermes I)</div><div class='del'>- * offset is the entry point</div><div class='del'>- *</div><div class='del'>- * Spectrum_cs' Symbol fw does not require this</div><div class='del'>- * wl_lkm Agere fw does</div><div class='del'>- * Don't know about intersil</div><div class='del'>- */</div><div class='del'>-static int hermesi_program_init(struct hermes *hw, u32 offset)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* Disable interrupts?*/</div><div class='del'>-	/*hw-&gt;inten = 0x0;*/</div><div class='del'>-	/*hermes_write_regn(hw, INTEN, 0);*/</div><div class='del'>-	/*hermes_set_irqmask(hw, 0);*/</div><div class='del'>-</div><div class='del'>-	/* Acknowledge any outstanding command */</div><div class='del'>-	hermes_write_regn(hw, EVACK, 0xFFFF);</div><div class='del'>-</div><div class='del'>-	/* Using init_cmd_wait rather than cmd_wait */</div><div class='del'>-	err = hw-&gt;ops-&gt;init_cmd_wait(hw,</div><div class='del'>-				     0x0100 | HERMES_CMD_INIT,</div><div class='del'>-				     0, 0, 0, NULL);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = hw-&gt;ops-&gt;init_cmd_wait(hw,</div><div class='del'>-				     0x0000 | HERMES_CMD_INIT,</div><div class='del'>-				     0, 0, 0, NULL);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = hermes_aux_control(hw, 1);</div><div class='del'>-	pr_debug("AUX enable returned %d\n", err);</div><div class='del'>-</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	pr_debug("Enabling volatile, EP 0x%08x\n", offset);</div><div class='del'>-	err = hw-&gt;ops-&gt;init_cmd_wait(hw,</div><div class='del'>-				     HERMES_PROGRAM_ENABLE_VOLATILE,</div><div class='del'>-				     offset &amp; 0xFFFFu,</div><div class='del'>-				     offset &gt;&gt; 16,</div><div class='del'>-				     0,</div><div class='del'>-				     NULL);</div><div class='del'>-	pr_debug("PROGRAM_ENABLE returned %d\n", err);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Done programming data (Hermes I)</div><div class='del'>- *</div><div class='del'>- * Spectrum_cs' Symbol fw does not require this</div><div class='del'>- * wl_lkm Agere fw does</div><div class='del'>- * Don't know about intersil</div><div class='del'>- */</div><div class='del'>-static int hermesi_program_end(struct hermes *hw)</div><div class='del'>-{</div><div class='del'>-	struct hermes_response resp;</div><div class='del'>-	int rc = 0;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	rc = hw-&gt;ops-&gt;cmd_wait(hw, HERMES_PROGRAM_DISABLE, 0, &amp;resp);</div><div class='del'>-</div><div class='del'>-	pr_debug("PROGRAM_DISABLE returned %d, "</div><div class='del'>-		 "r0 0x%04x, r1 0x%04x, r2 0x%04x\n",</div><div class='del'>-		 rc, resp.resp0, resp.resp1, resp.resp2);</div><div class='del'>-</div><div class='del'>-	if ((rc == 0) &amp;&amp;</div><div class='del'>-	    ((resp.status &amp; HERMES_STATUS_CMDCODE) != HERMES_CMD_DOWNLD))</div><div class='del'>-		rc = -EIO;</div><div class='del'>-</div><div class='del'>-	err = hermes_aux_control(hw, 0);</div><div class='del'>-	pr_debug("AUX disable returned %d\n", err);</div><div class='del'>-</div><div class='del'>-	/* Acknowledge any outstanding command */</div><div class='del'>-	hermes_write_regn(hw, EVACK, 0xFFFF);</div><div class='del'>-</div><div class='del'>-	/* Reinitialise, ignoring return */</div><div class='del'>-	(void) hw-&gt;ops-&gt;init_cmd_wait(hw, 0x0000 | HERMES_CMD_INIT,</div><div class='del'>-				      0, 0, 0, NULL);</div><div class='del'>-</div><div class='del'>-	return rc ? rc : err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hermes_program_bytes(struct hermes *hw, const char *data,</div><div class='del'>-				u32 addr, u32 len)</div><div class='del'>-{</div><div class='del'>-	/* wl lkm splits the programming into chunks of 2000 bytes.</div><div class='del'>-	 * This restriction appears to come from USB. The PCMCIA</div><div class='del'>-	 * adapters can program the whole lot in one go */</div><div class='del'>-	hermes_aux_setaddr(hw, addr);</div><div class='del'>-	hermes_write_bytes(hw, HERMES_AUXDATA, data, len);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Read PDA from the adapter */</div><div class='del'>-static int hermes_read_pda(struct hermes *hw, __le16 *pda, u32 pda_addr,</div><div class='del'>-			   u16 pda_len)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	u16 pda_size;</div><div class='del'>-	u16 data_len = pda_len;</div><div class='del'>-	__le16 *data = pda;</div><div class='del'>-</div><div class='del'>-	if (hw-&gt;eeprom_pda) {</div><div class='del'>-		/* PDA of spectrum symbol is in eeprom */</div><div class='del'>-</div><div class='del'>-		/* Issue command to read EEPROM */</div><div class='del'>-		ret = hw-&gt;ops-&gt;cmd_wait(hw, HERMES_CMD_READMIF, 0, NULL);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	} else {</div><div class='del'>-		/* wl_lkm does not include PDA size in the PDA area.</div><div class='del'>-		 * We will pad the information into pda, so other routines</div><div class='del'>-		 * don't have to be modified */</div><div class='del'>-		pda[0] = cpu_to_le16(pda_len - 2);</div><div class='del'>-			/* Includes CFG_PROD_DATA but not itself */</div><div class='del'>-		pda[1] = cpu_to_le16(0x0800); /* CFG_PROD_DATA */</div><div class='del'>-		data_len = pda_len - 4;</div><div class='del'>-		data = pda + 2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Open auxiliary port */</div><div class='del'>-	ret = hermes_aux_control(hw, 1);</div><div class='del'>-	pr_debug("AUX enable returned %d\n", ret);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Read PDA */</div><div class='del'>-	hermes_aux_setaddr(hw, pda_addr);</div><div class='del'>-	hermes_read_words(hw, HERMES_AUXDATA, data, data_len / 2);</div><div class='del'>-</div><div class='del'>-	/* Close aux port */</div><div class='del'>-	ret = hermes_aux_control(hw, 0);</div><div class='del'>-	pr_debug("AUX disable returned %d\n", ret);</div><div class='del'>-</div><div class='del'>-	/* Check PDA length */</div><div class='del'>-	pda_size = le16_to_cpu(pda[0]);</div><div class='del'>-	pr_debug("Actual PDA length %d, Max allowed %d\n",</div><div class='del'>-		 pda_size, pda_len);</div><div class='del'>-	if (pda_size &gt; pda_len)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hermes_lock_irqsave(spinlock_t *lock,</div><div class='del'>-				unsigned long *flags) __acquires(lock)</div><div class='del'>-{</div><div class='del'>-	spin_lock_irqsave(lock, *flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hermes_unlock_irqrestore(spinlock_t *lock,</div><div class='del'>-				     unsigned long *flags) __releases(lock)</div><div class='del'>-{</div><div class='del'>-	spin_unlock_irqrestore(lock, *flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hermes_lock_irq(spinlock_t *lock) __acquires(lock)</div><div class='del'>-{</div><div class='del'>-	spin_lock_irq(lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hermes_unlock_irq(spinlock_t *lock) __releases(lock)</div><div class='del'>-{</div><div class='del'>-	spin_unlock_irq(lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Hermes operations for local buses */</div><div class='del'>-static const struct hermes_ops hermes_ops_local = {</div><div class='del'>-	.init = hermes_init,</div><div class='del'>-	.cmd_wait = hermes_docmd_wait,</div><div class='del'>-	.init_cmd_wait = hermes_doicmd_wait,</div><div class='del'>-	.allocate = hermes_allocate,</div><div class='del'>-	.read_ltv = hermes_read_ltv,</div><div class='del'>-	.read_ltv_pr = hermes_read_ltv,</div><div class='del'>-	.write_ltv = hermes_write_ltv,</div><div class='del'>-	.bap_pread = hermes_bap_pread,</div><div class='del'>-	.bap_pwrite = hermes_bap_pwrite,</div><div class='del'>-	.read_pda = hermes_read_pda,</div><div class='del'>-	.program_init = hermesi_program_init,</div><div class='del'>-	.program_end = hermesi_program_end,</div><div class='del'>-	.program = hermes_program_bytes,</div><div class='del'>-	.lock_irqsave = hermes_lock_irqsave,</div><div class='del'>-	.unlock_irqrestore = hermes_unlock_irqrestore,</div><div class='del'>-	.lock_irq = hermes_lock_irq,</div><div class='del'>-	.unlock_irq = hermes_unlock_irq,</div><div class='del'>-};</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/hermes.h b/drivers/net/wireless/intersil/orinoco/hermes.h<br/>deleted file mode 100644<br/>index 3dc561a5cb7a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/hermes.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/hermes.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,534 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/* hermes.h</div><div class='del'>- *</div><div class='del'>- * Driver core for the "Hermes" wireless MAC controller, as used in</div><div class='del'>- * the Lucent Orinoco and Cabletron RoamAbout cards. It should also</div><div class='del'>- * work on the hfa3841 and hfa3842 MAC controller chips used in the</div><div class='del'>- * Prism I &amp; II chipsets.</div><div class='del'>- *</div><div class='del'>- * This is not a complete driver, just low-level access routines for</div><div class='del'>- * the MAC controller itself.</div><div class='del'>- *</div><div class='del'>- * Based on the prism2 driver from Absolute Value Systems' linux-wlan</div><div class='del'>- * project, the Linux wvlan_cs driver, Lucent's HCF-Light</div><div class='del'>- * (wvlan_hcf.c) library, and the NetBSD wireless driver.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000, David Gibson, Linuxcare Australia.</div><div class='del'>- * (C) Copyright David Gibson, IBM Corp. 2001-2003.</div><div class='del'>- *</div><div class='del'>- * Portions taken from hfa384x.h.</div><div class='del'>- * Copyright (C) 1999 AbsoluteValue Systems, Inc. All Rights Reserved.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _HERMES_H</div><div class='del'>-#define _HERMES_H</div><div class='del'>-</div><div class='del'>-/* Notes on locking:</div><div class='del'>- *</div><div class='del'>- * As a module of low level hardware access routines, there is no</div><div class='del'>- * locking. Users of this module should ensure that they serialize</div><div class='del'>- * access to the hermes structure, and to the hardware</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/if_ether.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Limits and constants</div><div class='del'>- */</div><div class='del'>-#define		HERMES_ALLOC_LEN_MIN		(4)</div><div class='del'>-#define		HERMES_ALLOC_LEN_MAX		(2400)</div><div class='del'>-#define		HERMES_LTV_LEN_MAX		(34)</div><div class='del'>-#define		HERMES_BAP_DATALEN_MAX		(4096)</div><div class='del'>-#define		HERMES_BAP_OFFSET_MAX		(4096)</div><div class='del'>-#define		HERMES_PORTID_MAX		(7)</div><div class='del'>-#define		HERMES_NUMPORTS_MAX		(HERMES_PORTID_MAX + 1)</div><div class='del'>-#define		HERMES_PDR_LEN_MAX		(260)	/* in bytes, from EK */</div><div class='del'>-#define		HERMES_PDA_RECS_MAX		(200)	/* a guess */</div><div class='del'>-#define		HERMES_PDA_LEN_MAX		(1024)	/* in bytes, from EK */</div><div class='del'>-#define		HERMES_SCANRESULT_MAX		(35)</div><div class='del'>-#define		HERMES_CHINFORESULT_MAX		(8)</div><div class='del'>-#define		HERMES_MAX_MULTICAST		(16)</div><div class='del'>-#define		HERMES_MAGIC			(0x7d1f)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Hermes register offsets</div><div class='del'>- */</div><div class='del'>-#define		HERMES_CMD			(0x00)</div><div class='del'>-#define		HERMES_PARAM0			(0x02)</div><div class='del'>-#define		HERMES_PARAM1			(0x04)</div><div class='del'>-#define		HERMES_PARAM2			(0x06)</div><div class='del'>-#define		HERMES_STATUS			(0x08)</div><div class='del'>-#define		HERMES_RESP0			(0x0A)</div><div class='del'>-#define		HERMES_RESP1			(0x0C)</div><div class='del'>-#define		HERMES_RESP2			(0x0E)</div><div class='del'>-#define		HERMES_INFOFID			(0x10)</div><div class='del'>-#define		HERMES_RXFID			(0x20)</div><div class='del'>-#define		HERMES_ALLOCFID			(0x22)</div><div class='del'>-#define		HERMES_TXCOMPLFID		(0x24)</div><div class='del'>-#define		HERMES_SELECT0			(0x18)</div><div class='del'>-#define		HERMES_OFFSET0			(0x1C)</div><div class='del'>-#define		HERMES_DATA0			(0x36)</div><div class='del'>-#define		HERMES_SELECT1			(0x1A)</div><div class='del'>-#define		HERMES_OFFSET1			(0x1E)</div><div class='del'>-#define		HERMES_DATA1			(0x38)</div><div class='del'>-#define		HERMES_EVSTAT			(0x30)</div><div class='del'>-#define		HERMES_INTEN			(0x32)</div><div class='del'>-#define		HERMES_EVACK			(0x34)</div><div class='del'>-#define		HERMES_CONTROL			(0x14)</div><div class='del'>-#define		HERMES_SWSUPPORT0		(0x28)</div><div class='del'>-#define		HERMES_SWSUPPORT1		(0x2A)</div><div class='del'>-#define		HERMES_SWSUPPORT2		(0x2C)</div><div class='del'>-#define		HERMES_AUXPAGE			(0x3A)</div><div class='del'>-#define		HERMES_AUXOFFSET		(0x3C)</div><div class='del'>-#define		HERMES_AUXDATA			(0x3E)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * CMD register bitmasks</div><div class='del'>- */</div><div class='del'>-#define		HERMES_CMD_BUSY			(0x8000)</div><div class='del'>-#define		HERMES_CMD_AINFO		(0x7f00)</div><div class='del'>-#define		HERMES_CMD_MACPORT		(0x0700)</div><div class='del'>-#define		HERMES_CMD_RECL			(0x0100)</div><div class='del'>-#define		HERMES_CMD_WRITE		(0x0100)</div><div class='del'>-#define		HERMES_CMD_PROGMODE		(0x0300)</div><div class='del'>-#define		HERMES_CMD_CMDCODE		(0x003f)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * STATUS register bitmasks</div><div class='del'>- */</div><div class='del'>-#define		HERMES_STATUS_RESULT		(0x7f00)</div><div class='del'>-#define		HERMES_STATUS_CMDCODE		(0x003f)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * OFFSET register bitmasks</div><div class='del'>- */</div><div class='del'>-#define		HERMES_OFFSET_BUSY		(0x8000)</div><div class='del'>-#define		HERMES_OFFSET_ERR		(0x4000)</div><div class='del'>-#define		HERMES_OFFSET_DATAOFF		(0x0ffe)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Event register bitmasks (INTEN, EVSTAT, EVACK)</div><div class='del'>- */</div><div class='del'>-#define		HERMES_EV_TICK			(0x8000)</div><div class='del'>-#define		HERMES_EV_WTERR			(0x4000)</div><div class='del'>-#define		HERMES_EV_INFDROP		(0x2000)</div><div class='del'>-#define		HERMES_EV_INFO			(0x0080)</div><div class='del'>-#define		HERMES_EV_DTIM			(0x0020)</div><div class='del'>-#define		HERMES_EV_CMD			(0x0010)</div><div class='del'>-#define		HERMES_EV_ALLOC			(0x0008)</div><div class='del'>-#define		HERMES_EV_TXEXC			(0x0004)</div><div class='del'>-#define		HERMES_EV_TX			(0x0002)</div><div class='del'>-#define		HERMES_EV_RX			(0x0001)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Command codes</div><div class='del'>- */</div><div class='del'>-/*--- Controller Commands ----------------------------*/</div><div class='del'>-#define		HERMES_CMD_INIT			(0x0000)</div><div class='del'>-#define		HERMES_CMD_ENABLE		(0x0001)</div><div class='del'>-#define		HERMES_CMD_DISABLE		(0x0002)</div><div class='del'>-#define		HERMES_CMD_DIAG			(0x0003)</div><div class='del'>-</div><div class='del'>-/*--- Buffer Mgmt Commands ---------------------------*/</div><div class='del'>-#define		HERMES_CMD_ALLOC		(0x000A)</div><div class='del'>-#define		HERMES_CMD_TX			(0x000B)</div><div class='del'>-</div><div class='del'>-/*--- Regulate Commands ------------------------------*/</div><div class='del'>-#define		HERMES_CMD_NOTIFY		(0x0010)</div><div class='del'>-#define		HERMES_CMD_INQUIRE		(0x0011)</div><div class='del'>-</div><div class='del'>-/*--- Configure Commands -----------------------------*/</div><div class='del'>-#define		HERMES_CMD_ACCESS		(0x0021)</div><div class='del'>-#define		HERMES_CMD_DOWNLD		(0x0022)</div><div class='del'>-</div><div class='del'>-/*--- Serial I/O Commands ----------------------------*/</div><div class='del'>-#define		HERMES_CMD_READMIF		(0x0030)</div><div class='del'>-#define		HERMES_CMD_WRITEMIF		(0x0031)</div><div class='del'>-</div><div class='del'>-/*--- Debugging Commands -----------------------------*/</div><div class='del'>-#define		HERMES_CMD_TEST			(0x0038)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Test command arguments */</div><div class='del'>-#define		HERMES_TEST_SET_CHANNEL		0x0800</div><div class='del'>-#define		HERMES_TEST_MONITOR		0x0b00</div><div class='del'>-#define		HERMES_TEST_STOP		0x0f00</div><div class='del'>-</div><div class='del'>-/* Authentication algorithms */</div><div class='del'>-#define		HERMES_AUTH_OPEN		1</div><div class='del'>-#define		HERMES_AUTH_SHARED_KEY		2</div><div class='del'>-</div><div class='del'>-/* WEP settings */</div><div class='del'>-#define		HERMES_WEP_PRIVACY_INVOKED	0x0001</div><div class='del'>-#define		HERMES_WEP_EXCL_UNENCRYPTED	0x0002</div><div class='del'>-#define		HERMES_WEP_HOST_ENCRYPT		0x0010</div><div class='del'>-#define		HERMES_WEP_HOST_DECRYPT		0x0080</div><div class='del'>-</div><div class='del'>-/* Symbol hostscan options */</div><div class='del'>-#define		HERMES_HOSTSCAN_SYMBOL_5SEC	0x0001</div><div class='del'>-#define		HERMES_HOSTSCAN_SYMBOL_ONCE	0x0002</div><div class='del'>-#define		HERMES_HOSTSCAN_SYMBOL_PASSIVE	0x0040</div><div class='del'>-#define		HERMES_HOSTSCAN_SYMBOL_BCAST	0x0080</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Frame structures and constants</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define HERMES_DESCRIPTOR_OFFSET	0</div><div class='del'>-#define HERMES_802_11_OFFSET		(14)</div><div class='del'>-#define HERMES_802_3_OFFSET		(14 + 32)</div><div class='del'>-#define HERMES_802_2_OFFSET		(14 + 32 + 14)</div><div class='del'>-#define HERMES_TXCNTL2_OFFSET		(HERMES_802_3_OFFSET - 2)</div><div class='del'>-</div><div class='del'>-#define HERMES_RXSTAT_ERR		(0x0003)</div><div class='del'>-#define	HERMES_RXSTAT_BADCRC		(0x0001)</div><div class='del'>-#define	HERMES_RXSTAT_UNDECRYPTABLE	(0x0002)</div><div class='del'>-#define	HERMES_RXSTAT_MIC		(0x0010)	/* Frame contains MIC */</div><div class='del'>-#define	HERMES_RXSTAT_MACPORT		(0x0700)</div><div class='del'>-#define HERMES_RXSTAT_PCF		(0x1000)	/* Frame was received in CF period */</div><div class='del'>-#define	HERMES_RXSTAT_MIC_KEY_ID	(0x1800)	/* MIC key used */</div><div class='del'>-#define	HERMES_RXSTAT_MSGTYPE		(0xE000)</div><div class='del'>-#define	HERMES_RXSTAT_1042		(0x2000)	/* RFC-1042 frame */</div><div class='del'>-#define	HERMES_RXSTAT_TUNNEL		(0x4000)	/* bridge-tunnel encoded frame */</div><div class='del'>-#define	HERMES_RXSTAT_WMP		(0x6000)	/* Wavelan-II Management Protocol frame */</div><div class='del'>-</div><div class='del'>-/* Shift amount for key ID in RXSTAT and TXCTRL */</div><div class='del'>-#define	HERMES_MIC_KEY_ID_SHIFT		11</div><div class='del'>-</div><div class='del'>-struct hermes_tx_descriptor {</div><div class='del'>-	__le16 status;</div><div class='del'>-	__le16 reserved1;</div><div class='del'>-	__le16 reserved2;</div><div class='del'>-	__le32 sw_support;</div><div class='del'>-	u8 retry_count;</div><div class='del'>-	u8 tx_rate;</div><div class='del'>-	__le16 tx_control;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define HERMES_TXSTAT_RETRYERR		(0x0001)</div><div class='del'>-#define HERMES_TXSTAT_AGEDERR		(0x0002)</div><div class='del'>-#define HERMES_TXSTAT_DISCON		(0x0004)</div><div class='del'>-#define HERMES_TXSTAT_FORMERR		(0x0008)</div><div class='del'>-</div><div class='del'>-#define HERMES_TXCTRL_TX_OK		(0x0002)	/* ?? interrupt on Tx complete */</div><div class='del'>-#define HERMES_TXCTRL_TX_EX		(0x0004)	/* ?? interrupt on Tx exception */</div><div class='del'>-#define HERMES_TXCTRL_802_11		(0x0008)	/* We supply 802.11 header */</div><div class='del'>-#define HERMES_TXCTRL_MIC		(0x0010)	/* 802.3 + TKIP */</div><div class='del'>-#define HERMES_TXCTRL_MIC_KEY_ID	(0x1800)	/* MIC Key ID mask */</div><div class='del'>-#define HERMES_TXCTRL_ALT_RTRY		(0x0020)</div><div class='del'>-</div><div class='del'>-/* Inquiry constants and data types */</div><div class='del'>-</div><div class='del'>-#define HERMES_INQ_TALLIES		(0xF100)</div><div class='del'>-#define HERMES_INQ_SCAN			(0xF101)</div><div class='del'>-#define HERMES_INQ_CHANNELINFO		(0xF102)</div><div class='del'>-#define HERMES_INQ_HOSTSCAN		(0xF103)</div><div class='del'>-#define HERMES_INQ_HOSTSCAN_SYMBOL	(0xF104)</div><div class='del'>-#define HERMES_INQ_LINKSTATUS		(0xF200)</div><div class='del'>-#define HERMES_INQ_SEC_STAT_AGERE	(0xF202)</div><div class='del'>-</div><div class='del'>-struct hermes_tallies_frame {</div><div class='del'>-	__le16 TxUnicastFrames;</div><div class='del'>-	__le16 TxMulticastFrames;</div><div class='del'>-	__le16 TxFragments;</div><div class='del'>-	__le16 TxUnicastOctets;</div><div class='del'>-	__le16 TxMulticastOctets;</div><div class='del'>-	__le16 TxDeferredTransmissions;</div><div class='del'>-	__le16 TxSingleRetryFrames;</div><div class='del'>-	__le16 TxMultipleRetryFrames;</div><div class='del'>-	__le16 TxRetryLimitExceeded;</div><div class='del'>-	__le16 TxDiscards;</div><div class='del'>-	__le16 RxUnicastFrames;</div><div class='del'>-	__le16 RxMulticastFrames;</div><div class='del'>-	__le16 RxFragments;</div><div class='del'>-	__le16 RxUnicastOctets;</div><div class='del'>-	__le16 RxMulticastOctets;</div><div class='del'>-	__le16 RxFCSErrors;</div><div class='del'>-	__le16 RxDiscards_NoBuffer;</div><div class='del'>-	__le16 TxDiscardsWrongSA;</div><div class='del'>-	__le16 RxWEPUndecryptable;</div><div class='del'>-	__le16 RxMsgInMsgFragments;</div><div class='del'>-	__le16 RxMsgInBadMsgFragments;</div><div class='del'>-	/* Those last are probably not available in very old firmwares */</div><div class='del'>-	__le16 RxDiscards_WEPICVError;</div><div class='del'>-	__le16 RxDiscards_WEPExcluded;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* Grabbed from wlan-ng - Thanks Mark... - Jean II</div><div class='del'>- * This is the result of a scan inquiry command */</div><div class='del'>-/* Structure describing info about an Access Point */</div><div class='del'>-struct prism2_scan_apinfo {</div><div class='del'>-	__le16 channel;		/* Channel where the AP sits */</div><div class='del'>-	__le16 noise;		/* Noise level */</div><div class='del'>-	__le16 level;		/* Signal level */</div><div class='del'>-	u8 bssid[ETH_ALEN];	/* MAC address of the Access Point */</div><div class='del'>-	__le16 beacon_interv;	/* Beacon interval */</div><div class='del'>-	__le16 capabilities;	/* Capabilities */</div><div class='del'>-	__le16 essid_len;	/* ESSID length */</div><div class='del'>-	u8 essid[32];		/* ESSID of the network */</div><div class='del'>-	u8 rates[10];		/* Bit rate supported */</div><div class='del'>-	__le16 proberesp_rate;	/* Data rate of the response frame */</div><div class='del'>-	__le16 atim;		/* ATIM window time, Kus (hostscan only) */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* Same stuff for the Lucent/Agere card.</div><div class='del'>- * Thanks to h1kari &lt;h1kari AT dachb0den.com&gt; - Jean II */</div><div class='del'>-struct agere_scan_apinfo {</div><div class='del'>-	__le16 channel;		/* Channel where the AP sits */</div><div class='del'>-	__le16 noise;		/* Noise level */</div><div class='del'>-	__le16 level;		/* Signal level */</div><div class='del'>-	u8 bssid[ETH_ALEN];	/* MAC address of the Access Point */</div><div class='del'>-	__le16 beacon_interv;	/* Beacon interval */</div><div class='del'>-	__le16 capabilities;	/* Capabilities */</div><div class='del'>-	/* bits: 0-ess, 1-ibss, 4-privacy [wep] */</div><div class='del'>-	__le16 essid_len;	/* ESSID length */</div><div class='del'>-	u8 essid[32];		/* ESSID of the network */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* Moustafa: Scan structure for Symbol cards */</div><div class='del'>-struct symbol_scan_apinfo {</div><div class='del'>-	u8 channel;		/* Channel where the AP sits */</div><div class='del'>-	u8 unknown1;		/* 8 in 2.9x and 3.9x f/w, 0 otherwise */</div><div class='del'>-	__le16 noise;		/* Noise level */</div><div class='del'>-	__le16 level;		/* Signal level */</div><div class='del'>-	u8 bssid[ETH_ALEN];	/* MAC address of the Access Point */</div><div class='del'>-	__le16 beacon_interv;	/* Beacon interval */</div><div class='del'>-	__le16 capabilities;	/* Capabilities */</div><div class='del'>-	/* bits: 0-ess, 1-ibss, 4-privacy [wep] */</div><div class='del'>-	__le16 essid_len;	/* ESSID length */</div><div class='del'>-	u8 essid[32];		/* ESSID of the network */</div><div class='del'>-	__le16 rates[5];	/* Bit rate supported */</div><div class='del'>-	__le16 basic_rates;	/* Basic rates bitmask */</div><div class='del'>-	u8 unknown2[6];		/* Always FF:FF:FF:FF:00:00 */</div><div class='del'>-	u8 unknown3[8];		/* Always 0, appeared in f/w 3.91-68 */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-union hermes_scan_info {</div><div class='del'>-	struct agere_scan_apinfo	a;</div><div class='del'>-	struct prism2_scan_apinfo	p;</div><div class='del'>-	struct symbol_scan_apinfo	s;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Extended scan struct for HERMES_INQ_CHANNELINFO.</div><div class='del'>- * wl_lkm calls this an ACS scan (Automatic Channel Select).</div><div class='del'>- * Keep out of union hermes_scan_info because it is much bigger than</div><div class='del'>- * the older scan structures. */</div><div class='del'>-struct agere_ext_scan_info {</div><div class='del'>-	__le16	reserved0;</div><div class='del'>-</div><div class='del'>-	u8	noise;</div><div class='del'>-	u8	level;</div><div class='del'>-	u8	rx_flow;</div><div class='del'>-	u8	rate;</div><div class='del'>-	__le16	reserved1[2];</div><div class='del'>-</div><div class='del'>-	__le16	frame_control;</div><div class='del'>-	__le16	dur_id;</div><div class='del'>-	u8	addr1[ETH_ALEN];</div><div class='del'>-	u8	addr2[ETH_ALEN];</div><div class='del'>-	u8	bssid[ETH_ALEN];</div><div class='del'>-	__le16	sequence;</div><div class='del'>-	u8	addr4[ETH_ALEN];</div><div class='del'>-</div><div class='del'>-	__le16	data_length;</div><div class='del'>-</div><div class='del'>-	/* Next 3 fields do not get filled in. */</div><div class='del'>-	u8	daddr[ETH_ALEN];</div><div class='del'>-	u8	saddr[ETH_ALEN];</div><div class='del'>-	__le16	len_type;</div><div class='del'>-</div><div class='del'>-	__le64	timestamp;</div><div class='del'>-	__le16	beacon_interval;</div><div class='del'>-	__le16	capabilities;</div><div class='del'>-	u8	data[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define HERMES_LINKSTATUS_NOT_CONNECTED   (0x0000)</div><div class='del'>-#define HERMES_LINKSTATUS_CONNECTED       (0x0001)</div><div class='del'>-#define HERMES_LINKSTATUS_DISCONNECTED    (0x0002)</div><div class='del'>-#define HERMES_LINKSTATUS_AP_CHANGE       (0x0003)</div><div class='del'>-#define HERMES_LINKSTATUS_AP_OUT_OF_RANGE (0x0004)</div><div class='del'>-#define HERMES_LINKSTATUS_AP_IN_RANGE     (0x0005)</div><div class='del'>-#define HERMES_LINKSTATUS_ASSOC_FAILED    (0x0006)</div><div class='del'>-</div><div class='del'>-struct hermes_linkstatus {</div><div class='del'>-	__le16 linkstatus;         /* Link status */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hermes_response {</div><div class='del'>-	u16 status, resp0, resp1, resp2;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* "ID" structure - used for ESSID and station nickname */</div><div class='del'>-struct hermes_idstring {</div><div class='del'>-	__le16 len;</div><div class='del'>-	__le16 val[16];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hermes_multicast {</div><div class='del'>-	u8 addr[HERMES_MAX_MULTICAST][ETH_ALEN];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* Timeouts */</div><div class='del'>-#define HERMES_BAP_BUSY_TIMEOUT (10000) /* In iterations of ~1us */</div><div class='del'>-</div><div class='del'>-struct hermes;</div><div class='del'>-</div><div class='del'>-/* Functions to access hardware */</div><div class='del'>-struct hermes_ops {</div><div class='del'>-	int (*init)(struct hermes *hw);</div><div class='del'>-	int (*cmd_wait)(struct hermes *hw, u16 cmd, u16 parm0,</div><div class='del'>-			struct hermes_response *resp);</div><div class='del'>-	int (*init_cmd_wait)(struct hermes *hw, u16 cmd,</div><div class='del'>-			     u16 parm0, u16 parm1, u16 parm2,</div><div class='del'>-			     struct hermes_response *resp);</div><div class='del'>-	int (*allocate)(struct hermes *hw, u16 size, u16 *fid);</div><div class='del'>-	int (*read_ltv)(struct hermes *hw, int bap, u16 rid, unsigned buflen,</div><div class='del'>-			u16 *length, void *buf);</div><div class='del'>-	int (*read_ltv_pr)(struct hermes *hw, int bap, u16 rid,</div><div class='del'>-			      unsigned buflen, u16 *length, void *buf);</div><div class='del'>-	int (*write_ltv)(struct hermes *hw, int bap, u16 rid,</div><div class='del'>-			 u16 length, const void *value);</div><div class='del'>-	int (*bap_pread)(struct hermes *hw, int bap, void *buf, int len,</div><div class='del'>-			 u16 id, u16 offset);</div><div class='del'>-	int (*bap_pwrite)(struct hermes *hw, int bap, const void *buf,</div><div class='del'>-			  int len, u16 id, u16 offset);</div><div class='del'>-	int (*read_pda)(struct hermes *hw, __le16 *pda,</div><div class='del'>-			u32 pda_addr, u16 pda_len);</div><div class='del'>-	int (*program_init)(struct hermes *hw, u32 entry_point);</div><div class='del'>-	int (*program_end)(struct hermes *hw);</div><div class='del'>-	int (*program)(struct hermes *hw, const char *buf,</div><div class='del'>-		       u32 addr, u32 len);</div><div class='del'>-	void (*lock_irqsave)(spinlock_t *lock, unsigned long *flags);</div><div class='del'>-	void (*unlock_irqrestore)(spinlock_t *lock, unsigned long *flags);</div><div class='del'>-	void (*lock_irq)(spinlock_t *lock);</div><div class='del'>-	void (*unlock_irq)(spinlock_t *lock);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Basic control structure */</div><div class='del'>-struct hermes {</div><div class='del'>-	void __iomem *iobase;</div><div class='del'>-	int reg_spacing;</div><div class='del'>-#define HERMES_16BIT_REGSPACING	0</div><div class='del'>-#define HERMES_32BIT_REGSPACING	1</div><div class='del'>-	u16 inten; /* Which interrupts should be enabled? */</div><div class='del'>-	bool eeprom_pda;</div><div class='del'>-	const struct hermes_ops *ops;</div><div class='del'>-	void *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Register access convenience macros */</div><div class='del'>-#define hermes_read_reg(hw, off) \</div><div class='del'>-	(ioread16((hw)-&gt;iobase + ((off) &lt;&lt; (hw)-&gt;reg_spacing)))</div><div class='del'>-#define hermes_write_reg(hw, off, val) \</div><div class='del'>-	(iowrite16((val), (hw)-&gt;iobase + ((off) &lt;&lt; (hw)-&gt;reg_spacing)))</div><div class='del'>-#define hermes_read_regn(hw, name) hermes_read_reg((hw), HERMES_##name)</div><div class='del'>-#define hermes_write_regn(hw, name, val) \</div><div class='del'>-	hermes_write_reg((hw), HERMES_##name, (val))</div><div class='del'>-</div><div class='del'>-/* Function prototypes */</div><div class='del'>-void hermes_struct_init(struct hermes *hw, void __iomem *address,</div><div class='del'>-			int reg_spacing);</div><div class='del'>-</div><div class='del'>-/* Inline functions */</div><div class='del'>-</div><div class='del'>-static inline int hermes_present(struct hermes *hw)</div><div class='del'>-{</div><div class='del'>-	return hermes_read_regn(hw, SWSUPPORT0) == HERMES_MAGIC;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void hermes_set_irqmask(struct hermes *hw, u16 events)</div><div class='del'>-{</div><div class='del'>-	hw-&gt;inten = events;</div><div class='del'>-	hermes_write_regn(hw, INTEN, events);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int hermes_enable_port(struct hermes *hw, int port)</div><div class='del'>-{</div><div class='del'>-	return hw-&gt;ops-&gt;cmd_wait(hw, HERMES_CMD_ENABLE | (port &lt;&lt; 8),</div><div class='del'>-				 0, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int hermes_disable_port(struct hermes *hw, int port)</div><div class='del'>-{</div><div class='del'>-	return hw-&gt;ops-&gt;cmd_wait(hw, HERMES_CMD_DISABLE | (port &lt;&lt; 8),</div><div class='del'>-				 0, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Initiate an INQUIRE command (tallies or scan).  The result will come as an</div><div class='del'>- * information frame in __orinoco_ev_info() */</div><div class='del'>-static inline int hermes_inquire(struct hermes *hw, u16 rid)</div><div class='del'>-{</div><div class='del'>-	return hw-&gt;ops-&gt;cmd_wait(hw, HERMES_CMD_INQUIRE, rid, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define HERMES_BYTES_TO_RECLEN(n) ((((n) + 1) / 2) + 1)</div><div class='del'>-#define HERMES_RECLEN_TO_BYTES(n) (((n) - 1) * 2)</div><div class='del'>-</div><div class='del'>-/* Note that for the next two, the count is in 16-bit words, not bytes */</div><div class='del'>-static inline void hermes_read_words(struct hermes *hw, int off,</div><div class='del'>-				     void *buf, unsigned count)</div><div class='del'>-{</div><div class='del'>-	off = off &lt;&lt; hw-&gt;reg_spacing;</div><div class='del'>-	ioread16_rep(hw-&gt;iobase + off, buf, count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void hermes_write_bytes(struct hermes *hw, int off,</div><div class='del'>-				      const char *buf, unsigned count)</div><div class='del'>-{</div><div class='del'>-	off = off &lt;&lt; hw-&gt;reg_spacing;</div><div class='del'>-	iowrite16_rep(hw-&gt;iobase + off, buf, count &gt;&gt; 1);</div><div class='del'>-	if (unlikely(count &amp; 1))</div><div class='del'>-		iowrite8(buf[count - 1], hw-&gt;iobase + off);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void hermes_clear_words(struct hermes *hw, int off,</div><div class='del'>-				      unsigned count)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	off = off &lt;&lt; hw-&gt;reg_spacing;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; count; i++)</div><div class='del'>-		iowrite16(0, hw-&gt;iobase + off);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define HERMES_READ_RECORD(hw, bap, rid, buf) \</div><div class='del'>-	(hw-&gt;ops-&gt;read_ltv((hw), (bap), (rid), sizeof(*buf), NULL, (buf)))</div><div class='del'>-#define HERMES_READ_RECORD_PR(hw, bap, rid, buf) \</div><div class='del'>-	(hw-&gt;ops-&gt;read_ltv_pr((hw), (bap), (rid), sizeof(*buf), NULL, (buf)))</div><div class='del'>-#define HERMES_WRITE_RECORD(hw, bap, rid, buf) \</div><div class='del'>-	(hw-&gt;ops-&gt;write_ltv((hw), (bap), (rid), \</div><div class='del'>-			    HERMES_BYTES_TO_RECLEN(sizeof(*buf)), (buf)))</div><div class='del'>-</div><div class='del'>-static inline int hermes_read_wordrec(struct hermes *hw, int bap, u16 rid,</div><div class='del'>-				      u16 *word)</div><div class='del'>-{</div><div class='del'>-	__le16 rec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = HERMES_READ_RECORD(hw, bap, rid, &amp;rec);</div><div class='del'>-	*word = le16_to_cpu(rec);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int hermes_read_wordrec_pr(struct hermes *hw, int bap, u16 rid,</div><div class='del'>-					 u16 *word)</div><div class='del'>-{</div><div class='del'>-	__le16 rec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = HERMES_READ_RECORD_PR(hw, bap, rid, &amp;rec);</div><div class='del'>-	*word = le16_to_cpu(rec);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int hermes_write_wordrec(struct hermes *hw, int bap, u16 rid,</div><div class='del'>-				       u16 word)</div><div class='del'>-{</div><div class='del'>-	__le16 rec = cpu_to_le16(word);</div><div class='del'>-	return HERMES_WRITE_RECORD(hw, bap, rid, &amp;rec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif  /* _HERMES_H */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/hermes_dld.c b/drivers/net/wireless/intersil/orinoco/hermes_dld.c<br/>deleted file mode 100644<br/>index dbeadfcfefe2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/hermes_dld.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/hermes_dld.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,477 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Hermes download helper.</div><div class='del'>- *</div><div class='del'>- * This helper:</div><div class='del'>- *  - is capable of writing to the volatile area of the hermes device</div><div class='del'>- *  - is currently not capable of writing to non-volatile areas</div><div class='del'>- *  - provide helpers to identify and update plugin data</div><div class='del'>- *  - is not capable of interpreting a fw image directly. That is up to</div><div class='del'>- *    the main card driver.</div><div class='del'>- *  - deals with Hermes I devices. It can probably be modified to deal</div><div class='del'>- *    with Hermes II devices</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2007, David Kilroy</div><div class='del'>- *</div><div class='del'>- * Plug data code slightly modified from spectrum_cs driver</div><div class='del'>- *    Copyright (C) 2002-2005 Pavel Roskin &lt;proski@gnu.org&gt;</div><div class='del'>- * Portions based on information in wl_lkm_718 Agere driver</div><div class='del'>- *    COPYRIGHT (C) 2001-2004 by Agere Systems Inc. All Rights Reserved</div><div class='del'>- *</div><div class='del'>- * The contents of this file are subject to the Mozilla Public License</div><div class='del'>- * Version 1.1 (the "License"); you may not use this file except in</div><div class='del'>- * compliance with the License. You may obtain a copy of the License</div><div class='del'>- * at http://www.mozilla.org/MPL/</div><div class='del'>- *</div><div class='del'>- * Software distributed under the License is distributed on an "AS IS"</div><div class='del'>- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See</div><div class='del'>- * the License for the specific language governing rights and</div><div class='del'>- * limitations under the License.</div><div class='del'>- *</div><div class='del'>- * Alternatively, the contents of this file may be used under the</div><div class='del'>- * terms of the GNU General Public License version 2 (the "GPL"), in</div><div class='del'>- * which case the provisions of the GPL are applicable instead of the</div><div class='del'>- * above.  If you wish to allow the use of your version of this file</div><div class='del'>- * only under the terms of the GPL and not to allow others to use your</div><div class='del'>- * version of this file under the MPL, indicate your decision by</div><div class='del'>- * deleting the provisions above and replace them with the notice and</div><div class='del'>- * other provisions required by the GPL.  If you do not delete the</div><div class='del'>- * provisions above, a recipient may use your version of this file</div><div class='del'>- * under either the MPL or the GPL.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include "hermes.h"</div><div class='del'>-#include "hermes_dld.h"</div><div class='del'>-</div><div class='del'>-#define PFX "hermes_dld: "</div><div class='del'>-</div><div class='del'>-/* End markers used in dblocks */</div><div class='del'>-#define PDI_END		0x00000000	/* End of PDA */</div><div class='del'>-#define BLOCK_END	0xFFFFFFFF	/* Last image block */</div><div class='del'>-#define TEXT_END	0x1A		/* End of text header */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The following structures have little-endian fields denoted by</div><div class='del'>- * the leading underscore.  Don't access them directly - use inline</div><div class='del'>- * functions defined below.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The binary image to be downloaded consists of series of data blocks.</div><div class='del'>- * Each block has the following structure.</div><div class='del'>- */</div><div class='del'>-struct dblock {</div><div class='del'>-	__le32 addr;		/* adapter address where to write the block */</div><div class='del'>-	__le16 len;		/* length of the data only, in bytes */</div><div class='del'>-	char data[];		/* data to be written */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Plug Data References are located in the image after the last data</div><div class='del'>- * block.  They refer to areas in the adapter memory where the plug data</div><div class='del'>- * items with matching ID should be written.</div><div class='del'>- */</div><div class='del'>-struct pdr {</div><div class='del'>-	__le32 id;		/* record ID */</div><div class='del'>-	__le32 addr;		/* adapter address where to write the data */</div><div class='del'>-	__le32 len;		/* expected length of the data, in bytes */</div><div class='del'>-	char next[];		/* next PDR starts here */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Plug Data Items are located in the EEPROM read from the adapter by</div><div class='del'>- * primary firmware.  They refer to the device-specific data that should</div><div class='del'>- * be plugged into the secondary firmware.</div><div class='del'>- */</div><div class='del'>-struct pdi {</div><div class='del'>-	__le16 len;		/* length of ID and data, in words */</div><div class='del'>-	__le16 id;		/* record ID */</div><div class='del'>-	char data[];		/* plug data */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/*** FW data block access functions ***/</div><div class='del'>-</div><div class='del'>-static inline u32</div><div class='del'>-dblock_addr(const struct dblock *blk)</div><div class='del'>-{</div><div class='del'>-	return le32_to_cpu(blk-&gt;addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32</div><div class='del'>-dblock_len(const struct dblock *blk)</div><div class='del'>-{</div><div class='del'>-	return le16_to_cpu(blk-&gt;len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*** PDR Access functions ***/</div><div class='del'>-</div><div class='del'>-static inline u32</div><div class='del'>-pdr_id(const struct pdr *pdr)</div><div class='del'>-{</div><div class='del'>-	return le32_to_cpu(pdr-&gt;id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32</div><div class='del'>-pdr_addr(const struct pdr *pdr)</div><div class='del'>-{</div><div class='del'>-	return le32_to_cpu(pdr-&gt;addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32</div><div class='del'>-pdr_len(const struct pdr *pdr)</div><div class='del'>-{</div><div class='del'>-	return le32_to_cpu(pdr-&gt;len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*** PDI Access functions ***/</div><div class='del'>-</div><div class='del'>-static inline u32</div><div class='del'>-pdi_id(const struct pdi *pdi)</div><div class='del'>-{</div><div class='del'>-	return le16_to_cpu(pdi-&gt;id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Return length of the data only, in bytes */</div><div class='del'>-static inline u32</div><div class='del'>-pdi_len(const struct pdi *pdi)</div><div class='del'>-{</div><div class='del'>-	return 2 * (le16_to_cpu(pdi-&gt;len) - 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*** Plug Data Functions ***/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Scan PDR for the record with the specified RECORD_ID.</div><div class='del'>- * If it's not found, return NULL.</div><div class='del'>- */</div><div class='del'>-static const struct pdr *</div><div class='del'>-hermes_find_pdr(const struct pdr *first_pdr, u32 record_id, const void *end)</div><div class='del'>-{</div><div class='del'>-	const struct pdr *pdr = first_pdr;</div><div class='del'>-</div><div class='del'>-	end -= sizeof(struct pdr);</div><div class='del'>-</div><div class='del'>-	while (((void *) pdr &lt;= end) &amp;&amp;</div><div class='del'>-	       (pdr_id(pdr) != PDI_END)) {</div><div class='del'>-		/*</div><div class='del'>-		 * PDR area is currently not terminated by PDI_END.</div><div class='del'>-		 * It's followed by CRC records, which have the type</div><div class='del'>-		 * field where PDR has length.  The type can be 0 or 1.</div><div class='del'>-		 */</div><div class='del'>-		if (pdr_len(pdr) &lt; 2)</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='del'>-		/* If the record ID matches, we are done */</div><div class='del'>-		if (pdr_id(pdr) == record_id)</div><div class='del'>-			return pdr;</div><div class='del'>-</div><div class='del'>-		pdr = (struct pdr *) pdr-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scan production data items for a particular entry */</div><div class='del'>-static const struct pdi *</div><div class='del'>-hermes_find_pdi(const struct pdi *first_pdi, u32 record_id, const void *end)</div><div class='del'>-{</div><div class='del'>-	const struct pdi *pdi = first_pdi;</div><div class='del'>-</div><div class='del'>-	end -= sizeof(struct pdi);</div><div class='del'>-</div><div class='del'>-	while (((void *) pdi &lt;= end) &amp;&amp;</div><div class='del'>-	       (pdi_id(pdi) != PDI_END)) {</div><div class='del'>-</div><div class='del'>-		/* If the record ID matches, we are done */</div><div class='del'>-		if (pdi_id(pdi) == record_id)</div><div class='del'>-			return pdi;</div><div class='del'>-</div><div class='del'>-		pdi = (struct pdi *) &amp;pdi-&gt;data[pdi_len(pdi)];</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Process one Plug Data Item - find corresponding PDR and plug it */</div><div class='del'>-static int</div><div class='del'>-hermes_plug_pdi(struct hermes *hw, const struct pdr *first_pdr,</div><div class='del'>-		const struct pdi *pdi, const void *pdr_end)</div><div class='del'>-{</div><div class='del'>-	const struct pdr *pdr;</div><div class='del'>-</div><div class='del'>-	/* Find the PDR corresponding to this PDI */</div><div class='del'>-	pdr = hermes_find_pdr(first_pdr, pdi_id(pdi), pdr_end);</div><div class='del'>-</div><div class='del'>-	/* No match is found, safe to ignore */</div><div class='del'>-	if (!pdr)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Lengths of the data in PDI and PDR must match */</div><div class='del'>-	if (pdi_len(pdi) != pdr_len(pdr))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* do the actual plugging */</div><div class='del'>-	hw-&gt;ops-&gt;program(hw, pdi-&gt;data, pdr_addr(pdr), pdi_len(pdi));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Parse PDA and write the records into the adapter</div><div class='del'>- *</div><div class='del'>- * Attempt to write every records that is in the specified pda</div><div class='del'>- * which also has a valid production data record for the firmware.</div><div class='del'>- */</div><div class='del'>-int hermes_apply_pda(struct hermes *hw,</div><div class='del'>-		     const char *first_pdr,</div><div class='del'>-		     const void *pdr_end,</div><div class='del'>-		     const __le16 *pda,</div><div class='del'>-		     const void *pda_end)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	const struct pdi *pdi;</div><div class='del'>-	const struct pdr *pdr;</div><div class='del'>-</div><div class='del'>-	pdr = (const struct pdr *) first_pdr;</div><div class='del'>-	pda_end -= sizeof(struct pdi);</div><div class='del'>-</div><div class='del'>-	/* Go through every PDI and plug them into the adapter */</div><div class='del'>-	pdi = (const struct pdi *) (pda + 2);</div><div class='del'>-	while (((void *) pdi &lt;= pda_end) &amp;&amp;</div><div class='del'>-	       (pdi_id(pdi) != PDI_END)) {</div><div class='del'>-		ret = hermes_plug_pdi(hw, pdr, pdi, pdr_end);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		/* Increment to the next PDI */</div><div class='del'>-		pdi = (const struct pdi *) &amp;pdi-&gt;data[pdi_len(pdi)];</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Identify the total number of bytes in all blocks</div><div class='del'>- * including the header data.</div><div class='del'>- */</div><div class='del'>-size_t</div><div class='del'>-hermes_blocks_length(const char *first_block, const void *end)</div><div class='del'>-{</div><div class='del'>-	const struct dblock *blk = (const struct dblock *) first_block;</div><div class='del'>-	int total_len = 0;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	end -= sizeof(*blk);</div><div class='del'>-</div><div class='del'>-	/* Skip all blocks to locate Plug Data References</div><div class='del'>-	 * (Spectrum CS) */</div><div class='del'>-	while (((void *) blk &lt;= end) &amp;&amp;</div><div class='del'>-	       (dblock_addr(blk) != BLOCK_END)) {</div><div class='del'>-		len = dblock_len(blk);</div><div class='del'>-		total_len += sizeof(*blk) + len;</div><div class='del'>-		blk = (struct dblock *) &amp;blk-&gt;data[len];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return total_len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*** Hermes programming ***/</div><div class='del'>-</div><div class='del'>-/* Program the data blocks */</div><div class='del'>-int hermes_program(struct hermes *hw, const char *first_block, const void *end)</div><div class='del'>-{</div><div class='del'>-	const struct dblock *blk;</div><div class='del'>-	u32 blkaddr;</div><div class='del'>-	u32 blklen;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	blk = (const struct dblock *) first_block;</div><div class='del'>-</div><div class='del'>-	if ((void *) blk &gt; (end - sizeof(*blk)))</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	blkaddr = dblock_addr(blk);</div><div class='del'>-	blklen = dblock_len(blk);</div><div class='del'>-</div><div class='del'>-	while ((blkaddr != BLOCK_END) &amp;&amp;</div><div class='del'>-	       (((void *) blk + blklen) &lt;= end)) {</div><div class='del'>-		pr_debug(PFX "Programming block of length %d "</div><div class='del'>-			 "to address 0x%08x\n", blklen, blkaddr);</div><div class='del'>-</div><div class='del'>-		err = hw-&gt;ops-&gt;program(hw, blk-&gt;data, blkaddr, blklen);</div><div class='del'>-		if (err)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		blk = (const struct dblock *) &amp;blk-&gt;data[blklen];</div><div class='del'>-</div><div class='del'>-		if ((void *) blk &gt; (end - sizeof(*blk)))</div><div class='del'>-			return -EIO;</div><div class='del'>-</div><div class='del'>-		blkaddr = dblock_addr(blk);</div><div class='del'>-		blklen = dblock_len(blk);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*** Default plugging data for Hermes I ***/</div><div class='del'>-/* Values from wl_lkm_718/hcf/dhf.c */</div><div class='del'>-</div><div class='del'>-#define DEFINE_DEFAULT_PDR(pid, length, data)				\</div><div class='del'>-static const struct {							\</div><div class='del'>-	__le16 len;							\</div><div class='del'>-	__le16 id;							\</div><div class='del'>-	u8 val[length];							\</div><div class='del'>-} __packed default_pdr_data_##pid = {			\</div><div class='del'>-	cpu_to_le16((sizeof(default_pdr_data_##pid)/			\</div><div class='del'>-				sizeof(__le16)) - 1),			\</div><div class='del'>-	cpu_to_le16(pid),						\</div><div class='del'>-	data								\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define DEFAULT_PDR(pid) default_pdr_data_##pid</div><div class='del'>-</div><div class='del'>-/*  HWIF Compatibility */</div><div class='del'>-DEFINE_DEFAULT_PDR(0x0005, 10, "\x00\x00\x06\x00\x01\x00\x01\x00\x01\x00");</div><div class='del'>-</div><div class='del'>-/* PPPPSign */</div><div class='del'>-DEFINE_DEFAULT_PDR(0x0108, 4, "\x00\x00\x00\x00");</div><div class='del'>-</div><div class='del'>-/* PPPPProf */</div><div class='del'>-DEFINE_DEFAULT_PDR(0x0109, 10, "\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00");</div><div class='del'>-</div><div class='del'>-/* Antenna diversity */</div><div class='del'>-DEFINE_DEFAULT_PDR(0x0150, 2, "\x00\x3F");</div><div class='del'>-</div><div class='del'>-/* Modem VCO band Set-up */</div><div class='del'>-DEFINE_DEFAULT_PDR(0x0160, 28,</div><div class='del'>-		   "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-		   "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-		   "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='del'>-		   "\x00\x00\x00\x00");</div><div class='del'>-</div><div class='del'>-/* Modem Rx Gain Table Values */</div><div class='del'>-DEFINE_DEFAULT_PDR(0x0161, 256,</div><div class='del'>-		   "\x3F\x01\x3F\01\x3F\x01\x3F\x01"</div><div class='del'>-		   "\x3F\x01\x3F\01\x3F\x01\x3F\x01"</div><div class='del'>-		   "\x3F\x01\x3F\01\x3F\x01\x3F\x01"</div><div class='del'>-		   "\x3F\x01\x3F\01\x3F\x01\x3F\x01"</div><div class='del'>-		   "\x3F\x01\x3E\01\x3E\x01\x3D\x01"</div><div class='del'>-		   "\x3D\x01\x3C\01\x3C\x01\x3B\x01"</div><div class='del'>-		   "\x3B\x01\x3A\01\x3A\x01\x39\x01"</div><div class='del'>-		   "\x39\x01\x38\01\x38\x01\x37\x01"</div><div class='del'>-		   "\x37\x01\x36\01\x36\x01\x35\x01"</div><div class='del'>-		   "\x35\x01\x34\01\x34\x01\x33\x01"</div><div class='del'>-		   "\x33\x01\x32\x01\x32\x01\x31\x01"</div><div class='del'>-		   "\x31\x01\x30\x01\x30\x01\x7B\x01"</div><div class='del'>-		   "\x7B\x01\x7A\x01\x7A\x01\x79\x01"</div><div class='del'>-		   "\x79\x01\x78\x01\x78\x01\x77\x01"</div><div class='del'>-		   "\x77\x01\x76\x01\x76\x01\x75\x01"</div><div class='del'>-		   "\x75\x01\x74\x01\x74\x01\x73\x01"</div><div class='del'>-		   "\x73\x01\x72\x01\x72\x01\x71\x01"</div><div class='del'>-		   "\x71\x01\x70\x01\x70\x01\x68\x01"</div><div class='del'>-		   "\x68\x01\x67\x01\x67\x01\x66\x01"</div><div class='del'>-		   "\x66\x01\x65\x01\x65\x01\x57\x01"</div><div class='del'>-		   "\x57\x01\x56\x01\x56\x01\x55\x01"</div><div class='del'>-		   "\x55\x01\x54\x01\x54\x01\x53\x01"</div><div class='del'>-		   "\x53\x01\x52\x01\x52\x01\x51\x01"</div><div class='del'>-		   "\x51\x01\x50\x01\x50\x01\x48\x01"</div><div class='del'>-		   "\x48\x01\x47\x01\x47\x01\x46\x01"</div><div class='del'>-		   "\x46\x01\x45\x01\x45\x01\x44\x01"</div><div class='del'>-		   "\x44\x01\x43\x01\x43\x01\x42\x01"</div><div class='del'>-		   "\x42\x01\x41\x01\x41\x01\x40\x01"</div><div class='del'>-		   "\x40\x01\x40\x01\x40\x01\x40\x01"</div><div class='del'>-		   "\x40\x01\x40\x01\x40\x01\x40\x01"</div><div class='del'>-		   "\x40\x01\x40\x01\x40\x01\x40\x01"</div><div class='del'>-		   "\x40\x01\x40\x01\x40\x01\x40\x01");</div><div class='del'>-</div><div class='del'>-/* Write PDA according to certain rules.</div><div class='del'>- *</div><div class='del'>- * For every production data record, look for a previous setting in</div><div class='del'>- * the pda, and use that.</div><div class='del'>- *</div><div class='del'>- * For certain records, use defaults if they are not found in pda.</div><div class='del'>- */</div><div class='del'>-int hermes_apply_pda_with_defaults(struct hermes *hw,</div><div class='del'>-				   const char *first_pdr,</div><div class='del'>-				   const void *pdr_end,</div><div class='del'>-				   const __le16 *pda,</div><div class='del'>-				   const void *pda_end)</div><div class='del'>-{</div><div class='del'>-	const struct pdr *pdr = (const struct pdr *) first_pdr;</div><div class='del'>-	const struct pdi *first_pdi = (const struct pdi *) &amp;pda[2];</div><div class='del'>-	const struct pdi *pdi;</div><div class='del'>-	const struct pdi *default_pdi = NULL;</div><div class='del'>-	const struct pdi *outdoor_pdi;</div><div class='del'>-	int record_id;</div><div class='del'>-</div><div class='del'>-	pdr_end -= sizeof(struct pdr);</div><div class='del'>-</div><div class='del'>-	while (((void *) pdr &lt;= pdr_end) &amp;&amp;</div><div class='del'>-	       (pdr_id(pdr) != PDI_END)) {</div><div class='del'>-		/*</div><div class='del'>-		 * For spectrum_cs firmwares,</div><div class='del'>-		 * PDR area is currently not terminated by PDI_END.</div><div class='del'>-		 * It's followed by CRC records, which have the type</div><div class='del'>-		 * field where PDR has length.  The type can be 0 or 1.</div><div class='del'>-		 */</div><div class='del'>-		if (pdr_len(pdr) &lt; 2)</div><div class='del'>-			break;</div><div class='del'>-		record_id = pdr_id(pdr);</div><div class='del'>-</div><div class='del'>-		pdi = hermes_find_pdi(first_pdi, record_id, pda_end);</div><div class='del'>-		if (pdi)</div><div class='del'>-			pr_debug(PFX "Found record 0x%04x at %p\n",</div><div class='del'>-				 record_id, pdi);</div><div class='del'>-</div><div class='del'>-		switch (record_id) {</div><div class='del'>-		case 0x110: /* Modem REFDAC values */</div><div class='del'>-		case 0x120: /* Modem VGDAC values */</div><div class='del'>-			outdoor_pdi = hermes_find_pdi(first_pdi, record_id + 1,</div><div class='del'>-						      pda_end);</div><div class='del'>-			default_pdi = NULL;</div><div class='del'>-			if (outdoor_pdi) {</div><div class='del'>-				pdi = outdoor_pdi;</div><div class='del'>-				pr_debug(PFX</div><div class='del'>-					 "Using outdoor record 0x%04x at %p\n",</div><div class='del'>-					 record_id + 1, pdi);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case 0x5: /*  HWIF Compatibility */</div><div class='del'>-			default_pdi = (struct pdi *) &amp;DEFAULT_PDR(0x0005);</div><div class='del'>-			break;</div><div class='del'>-		case 0x108: /* PPPPSign */</div><div class='del'>-			default_pdi = (struct pdi *) &amp;DEFAULT_PDR(0x0108);</div><div class='del'>-			break;</div><div class='del'>-		case 0x109: /* PPPPProf */</div><div class='del'>-			default_pdi = (struct pdi *) &amp;DEFAULT_PDR(0x0109);</div><div class='del'>-			break;</div><div class='del'>-		case 0x150: /* Antenna diversity */</div><div class='del'>-			default_pdi = (struct pdi *) &amp;DEFAULT_PDR(0x0150);</div><div class='del'>-			break;</div><div class='del'>-		case 0x160: /* Modem VCO band Set-up */</div><div class='del'>-			default_pdi = (struct pdi *) &amp;DEFAULT_PDR(0x0160);</div><div class='del'>-			break;</div><div class='del'>-		case 0x161: /* Modem Rx Gain Table Values */</div><div class='del'>-			default_pdi = (struct pdi *) &amp;DEFAULT_PDR(0x0161);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			default_pdi = NULL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (!pdi &amp;&amp; default_pdi) {</div><div class='del'>-			/* Use default */</div><div class='del'>-			pdi = default_pdi;</div><div class='del'>-			pr_debug(PFX "Using default record 0x%04x at %p\n",</div><div class='del'>-				 record_id, pdi);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (pdi) {</div><div class='del'>-			/* Lengths of the data in PDI and PDR must match */</div><div class='del'>-			if ((pdi_len(pdi) == pdr_len(pdr)) &amp;&amp;</div><div class='del'>-			    ((void *) pdi-&gt;data + pdi_len(pdi) &lt; pda_end)) {</div><div class='del'>-				/* do the actual plugging */</div><div class='del'>-				hw-&gt;ops-&gt;program(hw, pdi-&gt;data, pdr_addr(pdr),</div><div class='del'>-						 pdi_len(pdi));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pdr++;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/hermes_dld.h b/drivers/net/wireless/intersil/orinoco/hermes_dld.h<br/>deleted file mode 100644<br/>index b5377e232c63..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/hermes_dld.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/hermes_dld.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,52 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2007, David Kilroy</div><div class='del'>- *</div><div class='del'>- * The contents of this file are subject to the Mozilla Public License</div><div class='del'>- * Version 1.1 (the "License"); you may not use this file except in</div><div class='del'>- * compliance with the License. You may obtain a copy of the License</div><div class='del'>- * at http://www.mozilla.org/MPL/</div><div class='del'>- *</div><div class='del'>- * Software distributed under the License is distributed on an "AS IS"</div><div class='del'>- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See</div><div class='del'>- * the License for the specific language governing rights and</div><div class='del'>- * limitations under the License.</div><div class='del'>- *</div><div class='del'>- * Alternatively, the contents of this file may be used under the</div><div class='del'>- * terms of the GNU General Public License version 2 (the "GPL"), in</div><div class='del'>- * which case the provisions of the GPL are applicable instead of the</div><div class='del'>- * above.  If you wish to allow the use of your version of this file</div><div class='del'>- * only under the terms of the GPL and not to allow others to use your</div><div class='del'>- * version of this file under the MPL, indicate your decision by</div><div class='del'>- * deleting the provisions above and replace them with the notice and</div><div class='del'>- * other provisions required by the GPL.  If you do not delete the</div><div class='del'>- * provisions above, a recipient may use your version of this file</div><div class='del'>- * under either the MPL or the GPL.</div><div class='del'>- */</div><div class='del'>-#ifndef _HERMES_DLD_H</div><div class='del'>-#define _HERMES_DLD_H</div><div class='del'>-</div><div class='del'>-#include "hermes.h"</div><div class='del'>-</div><div class='del'>-int hermesi_program_init(struct hermes *hw, u32 offset);</div><div class='del'>-int hermesi_program_end(struct hermes *hw);</div><div class='del'>-int hermes_program(struct hermes *hw, const char *first_block, const void *end);</div><div class='del'>-</div><div class='del'>-int hermes_read_pda(struct hermes *hw,</div><div class='del'>-		    __le16 *pda,</div><div class='del'>-		    u32 pda_addr,</div><div class='del'>-		    u16 pda_len,</div><div class='del'>-		    int use_eeprom);</div><div class='del'>-int hermes_apply_pda(struct hermes *hw,</div><div class='del'>-		     const char *first_pdr,</div><div class='del'>-		     const void *pdr_end,</div><div class='del'>-		     const __le16 *pda,</div><div class='del'>-		     const void *pda_end);</div><div class='del'>-int hermes_apply_pda_with_defaults(struct hermes *hw,</div><div class='del'>-				   const char *first_pdr,</div><div class='del'>-				   const void *pdr_end,</div><div class='del'>-				   const __le16 *pda,</div><div class='del'>-				   const void *pda_end);</div><div class='del'>-</div><div class='del'>-size_t hermes_blocks_length(const char *first_block, const void *end);</div><div class='del'>-</div><div class='del'>-#endif /* _HERMES_DLD_H */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/hermes_rid.h b/drivers/net/wireless/intersil/orinoco/hermes_rid.h<br/>deleted file mode 100644<br/>index 42eb67dea1df..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/hermes_rid.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/hermes_rid.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,165 +0,0 @@</div><div class='del'>-#ifndef _HERMES_RID_H</div><div class='del'>-#define _HERMES_RID_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Configuration RIDs</div><div class='del'>- */</div><div class='del'>-#define HERMES_RID_CNFPORTTYPE			0xFC00</div><div class='del'>-#define HERMES_RID_CNFOWNMACADDR		0xFC01</div><div class='del'>-#define HERMES_RID_CNFDESIREDSSID		0xFC02</div><div class='del'>-#define HERMES_RID_CNFOWNCHANNEL		0xFC03</div><div class='del'>-#define HERMES_RID_CNFOWNSSID			0xFC04</div><div class='del'>-#define HERMES_RID_CNFOWNATIMWINDOW		0xFC05</div><div class='del'>-#define HERMES_RID_CNFSYSTEMSCALE		0xFC06</div><div class='del'>-#define HERMES_RID_CNFMAXDATALEN		0xFC07</div><div class='del'>-#define HERMES_RID_CNFWDSADDRESS		0xFC08</div><div class='del'>-#define HERMES_RID_CNFPMENABLED			0xFC09</div><div class='del'>-#define HERMES_RID_CNFPMEPS			0xFC0A</div><div class='del'>-#define HERMES_RID_CNFMULTICASTRECEIVE		0xFC0B</div><div class='del'>-#define HERMES_RID_CNFMAXSLEEPDURATION		0xFC0C</div><div class='del'>-#define HERMES_RID_CNFPMHOLDOVERDURATION	0xFC0D</div><div class='del'>-#define HERMES_RID_CNFOWNNAME			0xFC0E</div><div class='del'>-#define HERMES_RID_CNFOWNDTIMPERIOD		0xFC10</div><div class='del'>-#define HERMES_RID_CNFWDSADDRESS1		0xFC11</div><div class='del'>-#define HERMES_RID_CNFWDSADDRESS2		0xFC12</div><div class='del'>-#define HERMES_RID_CNFWDSADDRESS3		0xFC13</div><div class='del'>-#define HERMES_RID_CNFWDSADDRESS4		0xFC14</div><div class='del'>-#define HERMES_RID_CNFWDSADDRESS5		0xFC15</div><div class='del'>-#define HERMES_RID_CNFWDSADDRESS6		0xFC16</div><div class='del'>-#define HERMES_RID_CNFMULTICASTPMBUFFERING	0xFC17</div><div class='del'>-#define HERMES_RID_CNFWEPENABLED_AGERE		0xFC20</div><div class='del'>-#define HERMES_RID_CNFAUTHENTICATION_AGERE	0xFC21</div><div class='del'>-#define HERMES_RID_CNFMANDATORYBSSID_SYMBOL	0xFC21</div><div class='del'>-#define HERMES_RID_CNFDROPUNENCRYPTED		0xFC22</div><div class='del'>-#define HERMES_RID_CNFWEPDEFAULTKEYID		0xFC23</div><div class='del'>-#define HERMES_RID_CNFDEFAULTKEY0		0xFC24</div><div class='del'>-#define HERMES_RID_CNFDEFAULTKEY1		0xFC25</div><div class='del'>-#define HERMES_RID_CNFMWOROBUST_AGERE		0xFC25</div><div class='del'>-#define HERMES_RID_CNFDEFAULTKEY2		0xFC26</div><div class='del'>-#define HERMES_RID_CNFDEFAULTKEY3		0xFC27</div><div class='del'>-#define HERMES_RID_CNFWEPFLAGS_INTERSIL		0xFC28</div><div class='del'>-#define HERMES_RID_CNFWEPKEYMAPPINGTABLE	0xFC29</div><div class='del'>-#define HERMES_RID_CNFAUTHENTICATION		0xFC2A</div><div class='del'>-#define HERMES_RID_CNFMAXASSOCSTA		0xFC2B</div><div class='del'>-#define	HERMES_RID_CNFKEYLENGTH_SYMBOL		0xFC2B</div><div class='del'>-#define HERMES_RID_CNFTXCONTROL			0xFC2C</div><div class='del'>-#define HERMES_RID_CNFROAMINGMODE		0xFC2D</div><div class='del'>-#define HERMES_RID_CNFHOSTAUTHENTICATION	0xFC2E</div><div class='del'>-#define HERMES_RID_CNFRCVCRCERROR		0xFC30</div><div class='del'>-#define HERMES_RID_CNFMMLIFE			0xFC31</div><div class='del'>-#define HERMES_RID_CNFALTRETRYCOUNT		0xFC32</div><div class='del'>-#define HERMES_RID_CNFBEACONINT			0xFC33</div><div class='del'>-#define HERMES_RID_CNFAPPCFINFO			0xFC34</div><div class='del'>-#define HERMES_RID_CNFSTAPCFINFO		0xFC35</div><div class='del'>-#define HERMES_RID_CNFPRIORITYQUSAGE		0xFC37</div><div class='del'>-#define HERMES_RID_CNFTIMCTRL			0xFC40</div><div class='del'>-#define HERMES_RID_CNFTHIRTY2TALLY		0xFC42</div><div class='del'>-#define HERMES_RID_CNFENHSECURITY		0xFC43</div><div class='del'>-#define HERMES_RID_CNFGROUPADDRESSES		0xFC80</div><div class='del'>-#define HERMES_RID_CNFCREATEIBSS		0xFC81</div><div class='del'>-#define HERMES_RID_CNFFRAGMENTATIONTHRESHOLD	0xFC82</div><div class='del'>-#define HERMES_RID_CNFRTSTHRESHOLD		0xFC83</div><div class='del'>-#define HERMES_RID_CNFTXRATECONTROL		0xFC84</div><div class='del'>-#define HERMES_RID_CNFPROMISCUOUSMODE		0xFC85</div><div class='del'>-#define HERMES_RID_CNFBASICRATES_SYMBOL		0xFC8A</div><div class='del'>-#define HERMES_RID_CNFPREAMBLE_SYMBOL		0xFC8C</div><div class='del'>-#define HERMES_RID_CNFFRAGMENTATIONTHRESHOLD0	0xFC90</div><div class='del'>-#define HERMES_RID_CNFFRAGMENTATIONTHRESHOLD1	0xFC91</div><div class='del'>-#define HERMES_RID_CNFFRAGMENTATIONTHRESHOLD2	0xFC92</div><div class='del'>-#define HERMES_RID_CNFFRAGMENTATIONTHRESHOLD3	0xFC93</div><div class='del'>-#define HERMES_RID_CNFFRAGMENTATIONTHRESHOLD4	0xFC94</div><div class='del'>-#define HERMES_RID_CNFFRAGMENTATIONTHRESHOLD5	0xFC95</div><div class='del'>-#define HERMES_RID_CNFFRAGMENTATIONTHRESHOLD6	0xFC96</div><div class='del'>-#define HERMES_RID_CNFRTSTHRESHOLD0		0xFC97</div><div class='del'>-#define HERMES_RID_CNFRTSTHRESHOLD1		0xFC98</div><div class='del'>-#define HERMES_RID_CNFRTSTHRESHOLD2		0xFC99</div><div class='del'>-#define HERMES_RID_CNFRTSTHRESHOLD3		0xFC9A</div><div class='del'>-#define HERMES_RID_CNFRTSTHRESHOLD4		0xFC9B</div><div class='del'>-#define HERMES_RID_CNFRTSTHRESHOLD5		0xFC9C</div><div class='del'>-#define HERMES_RID_CNFRTSTHRESHOLD6		0xFC9D</div><div class='del'>-#define HERMES_RID_CNFHOSTSCAN_SYMBOL		0xFCAB</div><div class='del'>-#define HERMES_RID_CNFSHORTPREAMBLE		0xFCB0</div><div class='del'>-#define HERMES_RID_CNFWEPKEYS_AGERE		0xFCB0</div><div class='del'>-#define HERMES_RID_CNFEXCLUDELONGPREAMBLE	0xFCB1</div><div class='del'>-#define HERMES_RID_CNFTXKEY_AGERE		0xFCB1</div><div class='del'>-#define HERMES_RID_CNFAUTHENTICATIONRSPTO	0xFCB2</div><div class='del'>-#define HERMES_RID_CNFSCANSSID_AGERE		0xFCB2</div><div class='del'>-#define HERMES_RID_CNFBASICRATES		0xFCB3</div><div class='del'>-#define HERMES_RID_CNFSUPPORTEDRATES		0xFCB4</div><div class='del'>-#define HERMES_RID_CNFADDDEFAULTTKIPKEY_AGERE	0xFCB4</div><div class='del'>-#define HERMES_RID_CNFSETWPAAUTHMGMTSUITE_AGERE	0xFCB5</div><div class='del'>-#define HERMES_RID_CNFREMDEFAULTTKIPKEY_AGERE	0xFCB6</div><div class='del'>-#define HERMES_RID_CNFADDMAPPEDTKIPKEY_AGERE	0xFCB7</div><div class='del'>-#define HERMES_RID_CNFREMMAPPEDTKIPKEY_AGERE	0xFCB8</div><div class='del'>-#define HERMES_RID_CNFSETWPACAPABILITIES_AGERE	0xFCB9</div><div class='del'>-#define HERMES_RID_CNFCACHEDPMKADDRESS		0xFCBA</div><div class='del'>-#define HERMES_RID_CNFREMOVEPMKADDRESS		0xFCBB</div><div class='del'>-#define HERMES_RID_CNFSCANCHANNELS2GHZ		0xFCC2</div><div class='del'>-#define HERMES_RID_CNFDISASSOCIATE		0xFCC8</div><div class='del'>-#define HERMES_RID_CNFTICKTIME			0xFCE0</div><div class='del'>-#define HERMES_RID_CNFSCANREQUEST		0xFCE1</div><div class='del'>-#define HERMES_RID_CNFJOINREQUEST		0xFCE2</div><div class='del'>-#define HERMES_RID_CNFAUTHENTICATESTATION	0xFCE3</div><div class='del'>-#define HERMES_RID_CNFCHANNELINFOREQUEST	0xFCE4</div><div class='del'>-#define HERMES_RID_CNFHOSTSCAN			0xFCE5</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Information RIDs</div><div class='del'>- */</div><div class='del'>-#define HERMES_RID_MAXLOADTIME			0xFD00</div><div class='del'>-#define HERMES_RID_DOWNLOADBUFFER		0xFD01</div><div class='del'>-#define HERMES_RID_PRIID			0xFD02</div><div class='del'>-#define HERMES_RID_PRISUPRANGE			0xFD03</div><div class='del'>-#define HERMES_RID_CFIACTRANGES			0xFD04</div><div class='del'>-#define HERMES_RID_NICSERNUM			0xFD0A</div><div class='del'>-#define HERMES_RID_NICID			0xFD0B</div><div class='del'>-#define HERMES_RID_MFISUPRANGE			0xFD0C</div><div class='del'>-#define HERMES_RID_CFISUPRANGE			0xFD0D</div><div class='del'>-#define HERMES_RID_CHANNELLIST			0xFD10</div><div class='del'>-#define HERMES_RID_REGULATORYDOMAINS		0xFD11</div><div class='del'>-#define HERMES_RID_TEMPTYPE			0xFD12</div><div class='del'>-#define HERMES_RID_CIS				0xFD13</div><div class='del'>-#define HERMES_RID_STAID			0xFD20</div><div class='del'>-#define HERMES_RID_STASUPRANGE			0xFD21</div><div class='del'>-#define HERMES_RID_MFIACTRANGES			0xFD22</div><div class='del'>-#define HERMES_RID_CFIACTRANGES2		0xFD23</div><div class='del'>-#define HERMES_RID_SECONDARYVERSION_SYMBOL	0xFD24</div><div class='del'>-#define HERMES_RID_PORTSTATUS			0xFD40</div><div class='del'>-#define HERMES_RID_CURRENTSSID			0xFD41</div><div class='del'>-#define HERMES_RID_CURRENTBSSID			0xFD42</div><div class='del'>-#define HERMES_RID_COMMSQUALITY			0xFD43</div><div class='del'>-#define HERMES_RID_CURRENTTXRATE		0xFD44</div><div class='del'>-#define HERMES_RID_CURRENTBEACONINTERVAL	0xFD45</div><div class='del'>-#define HERMES_RID_CURRENTSCALETHRESHOLDS	0xFD46</div><div class='del'>-#define HERMES_RID_PROTOCOLRSPTIME		0xFD47</div><div class='del'>-#define HERMES_RID_SHORTRETRYLIMIT		0xFD48</div><div class='del'>-#define HERMES_RID_LONGRETRYLIMIT		0xFD49</div><div class='del'>-#define HERMES_RID_MAXTRANSMITLIFETIME		0xFD4A</div><div class='del'>-#define HERMES_RID_MAXRECEIVELIFETIME		0xFD4B</div><div class='del'>-#define HERMES_RID_CFPOLLABLE			0xFD4C</div><div class='del'>-#define HERMES_RID_AUTHENTICATIONALGORITHMS	0xFD4D</div><div class='del'>-#define HERMES_RID_PRIVACYOPTIONIMPLEMENTED	0xFD4F</div><div class='del'>-#define HERMES_RID_DBMCOMMSQUALITY_INTERSIL	0xFD51</div><div class='del'>-#define HERMES_RID_CURRENTTXRATE1		0xFD80</div><div class='del'>-#define HERMES_RID_CURRENTTXRATE2		0xFD81</div><div class='del'>-#define HERMES_RID_CURRENTTXRATE3		0xFD82</div><div class='del'>-#define HERMES_RID_CURRENTTXRATE4		0xFD83</div><div class='del'>-#define HERMES_RID_CURRENTTXRATE5		0xFD84</div><div class='del'>-#define HERMES_RID_CURRENTTXRATE6		0xFD85</div><div class='del'>-#define HERMES_RID_OWNMACADDR			0xFD86</div><div class='del'>-#define HERMES_RID_SCANRESULTSTABLE		0xFD88</div><div class='del'>-#define HERMES_RID_CURRENT_COUNTRY_INFO		0xFD89</div><div class='del'>-#define HERMES_RID_CURRENT_WPA_IE		0xFD8A</div><div class='del'>-#define HERMES_RID_CURRENT_TKIP_IV		0xFD8B</div><div class='del'>-#define HERMES_RID_CURRENT_ASSOC_REQ_INFO	0xFD8C</div><div class='del'>-#define HERMES_RID_CURRENT_ASSOC_RESP_INFO	0xFD8D</div><div class='del'>-#define HERMES_RID_TXQUEUEEMPTY			0xFD91</div><div class='del'>-#define HERMES_RID_PHYTYPE			0xFDC0</div><div class='del'>-#define HERMES_RID_CURRENTCHANNEL		0xFDC1</div><div class='del'>-#define HERMES_RID_CURRENTPOWERSTATE		0xFDC2</div><div class='del'>-#define HERMES_RID_CCAMODE			0xFDC3</div><div class='del'>-#define HERMES_RID_SUPPORTEDDATARATES		0xFDC6</div><div class='del'>-#define HERMES_RID_BUILDSEQ			0xFFFE</div><div class='del'>-#define HERMES_RID_FWID				0xFFFF</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/hw.c b/drivers/net/wireless/intersil/orinoco/hw.c<br/>deleted file mode 100644<br/>index 2c7adb4be100..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/hw.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/hw.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1356 +0,0 @@</div><div class='del'>-/* Encapsulate basic setting changes and retrieval on Hermes hardware</div><div class='del'>- *</div><div class='del'>- * See copyright notice in main.c</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/ieee80211.h&gt;</div><div class='del'>-#include &lt;linux/wireless.h&gt;</div><div class='del'>-#include &lt;net/cfg80211.h&gt;</div><div class='del'>-#include "hermes.h"</div><div class='del'>-#include "hermes_rid.h"</div><div class='del'>-#include "orinoco.h"</div><div class='del'>-</div><div class='del'>-#include "hw.h"</div><div class='del'>-</div><div class='del'>-#define SYMBOL_MAX_VER_LEN	(14)</div><div class='del'>-</div><div class='del'>-/* Symbol firmware has a bug allocating buffers larger than this */</div><div class='del'>-#define TX_NICBUF_SIZE_BUG	1585</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Data tables                                                      */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-/* This tables gives the actual meanings of the bitrate IDs returned</div><div class='del'>- * by the firmware. */</div><div class='del'>-static const struct {</div><div class='del'>-	int bitrate; /* in 100s of kilobits */</div><div class='del'>-	int automatic;</div><div class='del'>-	u16 agere_txratectrl;</div><div class='del'>-	u16 intersil_txratectrl;</div><div class='del'>-} bitrate_table[] = {</div><div class='del'>-	{110, 1,  3, 15}, /* Entry 0 is the default */</div><div class='del'>-	{10,  0,  1,  1},</div><div class='del'>-	{10,  1,  1,  1},</div><div class='del'>-	{20,  0,  2,  2},</div><div class='del'>-	{20,  1,  6,  3},</div><div class='del'>-	{55,  0,  4,  4},</div><div class='del'>-	{55,  1,  7,  7},</div><div class='del'>-	{110, 0,  5,  8},</div><div class='del'>-};</div><div class='del'>-#define BITRATE_TABLE_SIZE ARRAY_SIZE(bitrate_table)</div><div class='del'>-</div><div class='del'>-/* Firmware version encoding */</div><div class='del'>-struct comp_id {</div><div class='del'>-	u16 id, variant, major, minor;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-static inline enum fwtype determine_firmware_type(struct comp_id *nic_id)</div><div class='del'>-{</div><div class='del'>-	if (nic_id-&gt;id &lt; 0x8000)</div><div class='del'>-		return FIRMWARE_TYPE_AGERE;</div><div class='del'>-	else if (nic_id-&gt;id == 0x8000 &amp;&amp; nic_id-&gt;major == 0)</div><div class='del'>-		return FIRMWARE_TYPE_SYMBOL;</div><div class='del'>-	else</div><div class='del'>-		return FIRMWARE_TYPE_INTERSIL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Set priv-&gt;firmware type, determine firmware properties</div><div class='del'>- * This function can be called before we have registerred with netdev,</div><div class='del'>- * so all errors go out with dev_* rather than printk</div><div class='del'>- *</div><div class='del'>- * If non-NULL stores a firmware description in fw_name.</div><div class='del'>- * If non-NULL stores a HW version in hw_ver</div><div class='del'>- *</div><div class='del'>- * These are output via generic cfg80211 ethtool support.</div><div class='del'>- */</div><div class='del'>-int determine_fw_capabilities(struct orinoco_private *priv,</div><div class='del'>-			      char *fw_name, size_t fw_name_len,</div><div class='del'>-			      u32 *hw_ver)</div><div class='del'>-{</div><div class='del'>-	struct device *dev = priv-&gt;dev;</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int err;</div><div class='del'>-	struct comp_id nic_id, sta_id;</div><div class='del'>-	unsigned int firmver;</div><div class='del'>-	char tmp[SYMBOL_MAX_VER_LEN + 1] __attribute__((aligned(2)));</div><div class='del'>-</div><div class='del'>-	/* Get the hardware version */</div><div class='del'>-	err = HERMES_READ_RECORD_PR(hw, USER_BAP, HERMES_RID_NICID, &amp;nic_id);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(dev, "Cannot read hardware identity: error %d\n",</div><div class='del'>-			err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	le16_to_cpus(&amp;nic_id.id);</div><div class='del'>-	le16_to_cpus(&amp;nic_id.variant);</div><div class='del'>-	le16_to_cpus(&amp;nic_id.major);</div><div class='del'>-	le16_to_cpus(&amp;nic_id.minor);</div><div class='del'>-	dev_info(dev, "Hardware identity %04x:%04x:%04x:%04x\n",</div><div class='del'>-		 nic_id.id, nic_id.variant, nic_id.major, nic_id.minor);</div><div class='del'>-</div><div class='del'>-	if (hw_ver)</div><div class='del'>-		*hw_ver = (((nic_id.id &amp; 0xff) &lt;&lt; 24) |</div><div class='del'>-			   ((nic_id.variant &amp; 0xff) &lt;&lt; 16) |</div><div class='del'>-			   ((nic_id.major &amp; 0xff) &lt;&lt; 8) |</div><div class='del'>-			   (nic_id.minor &amp; 0xff));</div><div class='del'>-</div><div class='del'>-	priv-&gt;firmware_type = determine_firmware_type(&amp;nic_id);</div><div class='del'>-</div><div class='del'>-	/* Get the firmware version */</div><div class='del'>-	err = HERMES_READ_RECORD_PR(hw, USER_BAP, HERMES_RID_STAID, &amp;sta_id);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(dev, "Cannot read station identity: error %d\n",</div><div class='del'>-			err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	le16_to_cpus(&amp;sta_id.id);</div><div class='del'>-	le16_to_cpus(&amp;sta_id.variant);</div><div class='del'>-	le16_to_cpus(&amp;sta_id.major);</div><div class='del'>-	le16_to_cpus(&amp;sta_id.minor);</div><div class='del'>-	dev_info(dev, "Station identity  %04x:%04x:%04x:%04x\n",</div><div class='del'>-		 sta_id.id, sta_id.variant, sta_id.major, sta_id.minor);</div><div class='del'>-</div><div class='del'>-	switch (sta_id.id) {</div><div class='del'>-	case 0x15:</div><div class='del'>-		dev_err(dev, "Primary firmware is active\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	case 0x14b:</div><div class='del'>-		dev_err(dev, "Tertiary firmware is active\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	case 0x1f:	/* Intersil, Agere, Symbol Spectrum24 */</div><div class='del'>-	case 0x21:	/* Symbol Spectrum24 Trilogy */</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		dev_notice(dev, "Unknown station ID, please report\n");</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Default capabilities */</div><div class='del'>-	priv-&gt;has_sensitivity = 1;</div><div class='del'>-	priv-&gt;has_mwo = 0;</div><div class='del'>-	priv-&gt;has_preamble = 0;</div><div class='del'>-	priv-&gt;has_port3 = 1;</div><div class='del'>-	priv-&gt;has_ibss = 1;</div><div class='del'>-	priv-&gt;has_wep = 0;</div><div class='del'>-	priv-&gt;has_big_wep = 0;</div><div class='del'>-	priv-&gt;has_alt_txcntl = 0;</div><div class='del'>-	priv-&gt;has_ext_scan = 0;</div><div class='del'>-	priv-&gt;has_wpa = 0;</div><div class='del'>-	priv-&gt;do_fw_download = 0;</div><div class='del'>-</div><div class='del'>-	/* Determine capabilities from the firmware version */</div><div class='del'>-	switch (priv-&gt;firmware_type) {</div><div class='del'>-	case FIRMWARE_TYPE_AGERE:</div><div class='del'>-		/* Lucent Wavelan IEEE, Lucent Orinoco, Cabletron RoamAbout,</div><div class='del'>-		   ELSA, Melco, HP, IBM, Dell 1150, Compaq 110/210 */</div><div class='del'>-		if (fw_name)</div><div class='del'>-			snprintf(fw_name, fw_name_len, "Lucent/Agere %d.%02d",</div><div class='del'>-				 sta_id.major, sta_id.minor);</div><div class='del'>-</div><div class='del'>-		firmver = ((unsigned long)sta_id.major &lt;&lt; 16) | sta_id.minor;</div><div class='del'>-</div><div class='del'>-		priv-&gt;has_ibss = (firmver &gt;= 0x60006);</div><div class='del'>-		priv-&gt;has_wep = (firmver &gt;= 0x40020);</div><div class='del'>-		priv-&gt;has_big_wep = 1; /* FIXME: this is wrong - how do we tell</div><div class='del'>-					  Gold cards from the others? */</div><div class='del'>-		priv-&gt;has_mwo = (firmver &gt;= 0x60000);</div><div class='del'>-		priv-&gt;has_pm = (firmver &gt;= 0x40020); /* Don't work in 7.52 ? */</div><div class='del'>-		priv-&gt;ibss_port = 1;</div><div class='del'>-		priv-&gt;has_hostscan = (firmver &gt;= 0x8000a);</div><div class='del'>-		priv-&gt;do_fw_download = 1;</div><div class='del'>-		priv-&gt;broken_monitor = (firmver &gt;= 0x80000);</div><div class='del'>-		priv-&gt;has_alt_txcntl = (firmver &gt;= 0x90000); /* All 9.x ? */</div><div class='del'>-		priv-&gt;has_ext_scan = (firmver &gt;= 0x90000); /* All 9.x ? */</div><div class='del'>-		priv-&gt;has_wpa = (firmver &gt;= 0x9002a);</div><div class='del'>-		/* Tested with Agere firmware :</div><div class='del'>-		 *	1.16 ; 4.08 ; 4.52 ; 6.04 ; 6.16 ; 7.28 =&gt; Jean II</div><div class='del'>-		 * Tested CableTron firmware : 4.32 =&gt; Anton */</div><div class='del'>-		break;</div><div class='del'>-	case FIRMWARE_TYPE_SYMBOL:</div><div class='del'>-		/* Symbol , 3Com AirConnect, Intel, Ericsson WLAN */</div><div class='del'>-		/* Intel MAC : 00:02:B3:* */</div><div class='del'>-		/* 3Com MAC : 00:50:DA:* */</div><div class='del'>-		memset(tmp, 0, sizeof(tmp));</div><div class='del'>-		/* Get the Symbol firmware version */</div><div class='del'>-		err = hw-&gt;ops-&gt;read_ltv_pr(hw, USER_BAP,</div><div class='del'>-					HERMES_RID_SECONDARYVERSION_SYMBOL,</div><div class='del'>-					SYMBOL_MAX_VER_LEN, NULL, &amp;tmp);</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_warn(dev, "Error %d reading Symbol firmware info. "</div><div class='del'>-				 "Wildly guessing capabilities...\n", err);</div><div class='del'>-			firmver = 0;</div><div class='del'>-			tmp[0] = '\0';</div><div class='del'>-		} else {</div><div class='del'>-			/* The firmware revision is a string, the format is</div><div class='del'>-			 * something like : "V2.20-01".</div><div class='del'>-			 * Quick and dirty parsing... - Jean II</div><div class='del'>-			 */</div><div class='del'>-			firmver = ((tmp[1] - '0') &lt;&lt; 16)</div><div class='del'>-				| ((tmp[3] - '0') &lt;&lt; 12)</div><div class='del'>-				| ((tmp[4] - '0') &lt;&lt; 8)</div><div class='del'>-				| ((tmp[6] - '0') &lt;&lt; 4)</div><div class='del'>-				| (tmp[7] - '0');</div><div class='del'>-</div><div class='del'>-			tmp[SYMBOL_MAX_VER_LEN] = '\0';</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (fw_name)</div><div class='del'>-			snprintf(fw_name, fw_name_len, "Symbol %s", tmp);</div><div class='del'>-</div><div class='del'>-		priv-&gt;has_ibss = (firmver &gt;= 0x20000);</div><div class='del'>-		priv-&gt;has_wep = (firmver &gt;= 0x15012);</div><div class='del'>-		priv-&gt;has_big_wep = (firmver &gt;= 0x20000);</div><div class='del'>-		priv-&gt;has_pm = (firmver &gt;= 0x20000 &amp;&amp; firmver &lt; 0x22000) ||</div><div class='del'>-			       (firmver &gt;= 0x29000 &amp;&amp; firmver &lt; 0x30000) ||</div><div class='del'>-			       firmver &gt;= 0x31000;</div><div class='del'>-		priv-&gt;has_preamble = (firmver &gt;= 0x20000);</div><div class='del'>-		priv-&gt;ibss_port = 4;</div><div class='del'>-</div><div class='del'>-		/* Symbol firmware is found on various cards, but</div><div class='del'>-		 * there has been no attempt to check firmware</div><div class='del'>-		 * download on non-spectrum_cs based cards.</div><div class='del'>-		 *</div><div class='del'>-		 * Given that the Agere firmware download works</div><div class='del'>-		 * differently, we should avoid doing a firmware</div><div class='del'>-		 * download with the Symbol algorithm on non-spectrum</div><div class='del'>-		 * cards.</div><div class='del'>-		 *</div><div class='del'>-		 * For now we can identify a spectrum_cs based card</div><div class='del'>-		 * because it has a firmware reset function.</div><div class='del'>-		 */</div><div class='del'>-		priv-&gt;do_fw_download = (priv-&gt;stop_fw != NULL);</div><div class='del'>-</div><div class='del'>-		priv-&gt;broken_disableport = (firmver == 0x25013) ||</div><div class='del'>-				(firmver &gt;= 0x30000 &amp;&amp; firmver &lt;= 0x31000);</div><div class='del'>-		priv-&gt;has_hostscan = (firmver &gt;= 0x31001) ||</div><div class='del'>-				     (firmver &gt;= 0x29057 &amp;&amp; firmver &lt; 0x30000);</div><div class='del'>-		/* Tested with Intel firmware : 0x20015 =&gt; Jean II */</div><div class='del'>-		/* Tested with 3Com firmware : 0x15012 &amp; 0x22001 =&gt; Jean II */</div><div class='del'>-		break;</div><div class='del'>-	case FIRMWARE_TYPE_INTERSIL:</div><div class='del'>-		/* D-Link, Linksys, Adtron, ZoomAir, and many others...</div><div class='del'>-		 * Samsung, Compaq 100/200 and Proxim are slightly</div><div class='del'>-		 * different and less well tested */</div><div class='del'>-		/* D-Link MAC : 00:40:05:* */</div><div class='del'>-		/* Addtron MAC : 00:90:D1:* */</div><div class='del'>-		if (fw_name)</div><div class='del'>-			snprintf(fw_name, fw_name_len, "Intersil %d.%d.%d",</div><div class='del'>-				 sta_id.major, sta_id.minor, sta_id.variant);</div><div class='del'>-</div><div class='del'>-		firmver = ((unsigned long)sta_id.major &lt;&lt; 16) |</div><div class='del'>-			((unsigned long)sta_id.minor &lt;&lt; 8) | sta_id.variant;</div><div class='del'>-</div><div class='del'>-		priv-&gt;has_ibss = (firmver &gt;= 0x000700); /* FIXME */</div><div class='del'>-		priv-&gt;has_big_wep = priv-&gt;has_wep = (firmver &gt;= 0x000800);</div><div class='del'>-		priv-&gt;has_pm = (firmver &gt;= 0x000700);</div><div class='del'>-		priv-&gt;has_hostscan = (firmver &gt;= 0x010301);</div><div class='del'>-</div><div class='del'>-		if (firmver &gt;= 0x000800)</div><div class='del'>-			priv-&gt;ibss_port = 0;</div><div class='del'>-		else {</div><div class='del'>-			dev_notice(dev, "Intersil firmware earlier than v0.8.x"</div><div class='del'>-				   " - several features not supported\n");</div><div class='del'>-			priv-&gt;ibss_port = 1;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	if (fw_name)</div><div class='del'>-		dev_info(dev, "Firmware determined as %s\n", fw_name);</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_HERMES_PRISM</div><div class='del'>-	if (priv-&gt;firmware_type == FIRMWARE_TYPE_INTERSIL) {</div><div class='del'>-		dev_err(dev, "Support for Prism chipset is not enabled\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Read settings from EEPROM into our private structure.</div><div class='del'>- * MAC address gets dropped into callers buffer</div><div class='del'>- * Can be called before netdev registration.</div><div class='del'>- */</div><div class='del'>-int orinoco_hw_read_card_settings(struct orinoco_private *priv, u8 *dev_addr)</div><div class='del'>-{</div><div class='del'>-	struct device *dev = priv-&gt;dev;</div><div class='del'>-	struct hermes_idstring nickbuf;</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int len;</div><div class='del'>-	int err;</div><div class='del'>-	u16 reclen;</div><div class='del'>-</div><div class='del'>-	/* Get the MAC address */</div><div class='del'>-	err = hw-&gt;ops-&gt;read_ltv_pr(hw, USER_BAP, HERMES_RID_CNFOWNMACADDR,</div><div class='del'>-				ETH_ALEN, NULL, dev_addr);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_warn(dev, "Failed to read MAC address!\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_dbg(dev, "MAC address %pM\n", dev_addr);</div><div class='del'>-</div><div class='del'>-	/* Get the station name */</div><div class='del'>-	err = hw-&gt;ops-&gt;read_ltv_pr(hw, USER_BAP, HERMES_RID_CNFOWNNAME,</div><div class='del'>-				sizeof(nickbuf), &amp;reclen, &amp;nickbuf);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(dev, "failed to read station name\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	if (nickbuf.len)</div><div class='del'>-		len = min(IW_ESSID_MAX_SIZE, (int)le16_to_cpu(nickbuf.len));</div><div class='del'>-	else</div><div class='del'>-		len = min(IW_ESSID_MAX_SIZE, 2 * reclen);</div><div class='del'>-	memcpy(priv-&gt;nick, &amp;nickbuf.val, len);</div><div class='del'>-	priv-&gt;nick[len] = '\0';</div><div class='del'>-</div><div class='del'>-	dev_dbg(dev, "Station name \"%s\"\n", priv-&gt;nick);</div><div class='del'>-</div><div class='del'>-	/* Get allowed channels */</div><div class='del'>-	err = hermes_read_wordrec_pr(hw, USER_BAP, HERMES_RID_CHANNELLIST,</div><div class='del'>-				  &amp;priv-&gt;channel_mask);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(dev, "Failed to read channel list!\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get initial AP density */</div><div class='del'>-	err = hermes_read_wordrec_pr(hw, USER_BAP, HERMES_RID_CNFSYSTEMSCALE,</div><div class='del'>-				  &amp;priv-&gt;ap_density);</div><div class='del'>-	if (err || priv-&gt;ap_density &lt; 1 || priv-&gt;ap_density &gt; 3)</div><div class='del'>-		priv-&gt;has_sensitivity = 0;</div><div class='del'>-</div><div class='del'>-	/* Get initial RTS threshold */</div><div class='del'>-	err = hermes_read_wordrec_pr(hw, USER_BAP, HERMES_RID_CNFRTSTHRESHOLD,</div><div class='del'>-				  &amp;priv-&gt;rts_thresh);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(dev, "Failed to read RTS threshold!\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get initial fragmentation settings */</div><div class='del'>-	if (priv-&gt;has_mwo)</div><div class='del'>-		err = hermes_read_wordrec_pr(hw, USER_BAP,</div><div class='del'>-					  HERMES_RID_CNFMWOROBUST_AGERE,</div><div class='del'>-					  &amp;priv-&gt;mwo_robust);</div><div class='del'>-	else</div><div class='del'>-		err = hermes_read_wordrec_pr(hw, USER_BAP,</div><div class='del'>-					  HERMES_RID_CNFFRAGMENTATIONTHRESHOLD,</div><div class='del'>-					  &amp;priv-&gt;frag_thresh);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(dev, "Failed to read fragmentation settings!\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Power management setup */</div><div class='del'>-	if (priv-&gt;has_pm) {</div><div class='del'>-		priv-&gt;pm_on = 0;</div><div class='del'>-		priv-&gt;pm_mcast = 1;</div><div class='del'>-		err = hermes_read_wordrec_pr(hw, USER_BAP,</div><div class='del'>-					  HERMES_RID_CNFMAXSLEEPDURATION,</div><div class='del'>-					  &amp;priv-&gt;pm_period);</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(dev, "Failed to read power management "</div><div class='del'>-				"period!\n");</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		err = hermes_read_wordrec_pr(hw, USER_BAP,</div><div class='del'>-					  HERMES_RID_CNFPMHOLDOVERDURATION,</div><div class='del'>-					  &amp;priv-&gt;pm_timeout);</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(dev, "Failed to read power management "</div><div class='del'>-				"timeout!\n");</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Preamble setup */</div><div class='del'>-	if (priv-&gt;has_preamble) {</div><div class='del'>-		err = hermes_read_wordrec_pr(hw, USER_BAP,</div><div class='del'>-					  HERMES_RID_CNFPREAMBLE_SYMBOL,</div><div class='del'>-					  &amp;priv-&gt;preamble);</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(dev, "Failed to read preamble setup\n");</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Retry settings */</div><div class='del'>-	err = hermes_read_wordrec_pr(hw, USER_BAP, HERMES_RID_SHORTRETRYLIMIT,</div><div class='del'>-				  &amp;priv-&gt;short_retry_limit);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(dev, "Failed to read short retry limit\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = hermes_read_wordrec_pr(hw, USER_BAP, HERMES_RID_LONGRETRYLIMIT,</div><div class='del'>-				  &amp;priv-&gt;long_retry_limit);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(dev, "Failed to read long retry limit\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = hermes_read_wordrec_pr(hw, USER_BAP, HERMES_RID_MAXTRANSMITLIFETIME,</div><div class='del'>-				  &amp;priv-&gt;retry_lifetime);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(dev, "Failed to read max retry lifetime\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Can be called before netdev registration */</div><div class='del'>-int orinoco_hw_allocate_fid(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct device *dev = priv-&gt;dev;</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = hw-&gt;ops-&gt;allocate(hw, priv-&gt;nicbuf_size, &amp;priv-&gt;txfid);</div><div class='del'>-	if (err == -EIO &amp;&amp; priv-&gt;nicbuf_size &gt; TX_NICBUF_SIZE_BUG) {</div><div class='del'>-		/* Try workaround for old Symbol firmware bug */</div><div class='del'>-		priv-&gt;nicbuf_size = TX_NICBUF_SIZE_BUG;</div><div class='del'>-		err = hw-&gt;ops-&gt;allocate(hw, priv-&gt;nicbuf_size, &amp;priv-&gt;txfid);</div><div class='del'>-</div><div class='del'>-		dev_warn(dev, "Firmware ALLOC bug detected "</div><div class='del'>-			 "(old Symbol firmware?). Work around %s\n",</div><div class='del'>-			 err ? "failed!" : "ok.");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int orinoco_get_bitratemode(int bitrate, int automatic)</div><div class='del'>-{</div><div class='del'>-	int ratemode = -1;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if ((bitrate != 10) &amp;&amp; (bitrate != 20) &amp;&amp;</div><div class='del'>-	    (bitrate != 55) &amp;&amp; (bitrate != 110))</div><div class='del'>-		return ratemode;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; BITRATE_TABLE_SIZE; i++) {</div><div class='del'>-		if ((bitrate_table[i].bitrate == bitrate) &amp;&amp;</div><div class='del'>-		    (bitrate_table[i].automatic == automatic)) {</div><div class='del'>-			ratemode = i;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return ratemode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void orinoco_get_ratemode_cfg(int ratemode, int *bitrate, int *automatic)</div><div class='del'>-{</div><div class='del'>-	BUG_ON((ratemode &lt; 0) || (ratemode &gt;= BITRATE_TABLE_SIZE));</div><div class='del'>-</div><div class='del'>-	*bitrate = bitrate_table[ratemode].bitrate * 100000;</div><div class='del'>-	*automatic = bitrate_table[ratemode].automatic;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int orinoco_hw_program_rids(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = priv-&gt;ndev;</div><div class='del'>-	struct wireless_dev *wdev = netdev_priv(dev);</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int err;</div><div class='del'>-	struct hermes_idstring idbuf;</div><div class='del'>-</div><div class='del'>-	/* Set the MAC address */</div><div class='del'>-	err = hw-&gt;ops-&gt;write_ltv(hw, USER_BAP, HERMES_RID_CNFOWNMACADDR,</div><div class='del'>-				 HERMES_BYTES_TO_RECLEN(ETH_ALEN),</div><div class='del'>-				 dev-&gt;dev_addr);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: Error %d setting MAC address\n",</div><div class='del'>-		       dev-&gt;name, err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set up the link mode */</div><div class='del'>-	err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFPORTTYPE,</div><div class='del'>-				   priv-&gt;port_type);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: Error %d setting port type\n",</div><div class='del'>-		       dev-&gt;name, err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	/* Set the channel/frequency */</div><div class='del'>-	if (priv-&gt;channel != 0 &amp;&amp; priv-&gt;iw_mode != NL80211_IFTYPE_STATION) {</div><div class='del'>-		err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-					   HERMES_RID_CNFOWNCHANNEL,</div><div class='del'>-					   priv-&gt;channel);</div><div class='del'>-		if (err) {</div><div class='del'>-			printk(KERN_ERR "%s: Error %d setting channel %d\n",</div><div class='del'>-			       dev-&gt;name, err, priv-&gt;channel);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;has_ibss) {</div><div class='del'>-		u16 createibss;</div><div class='del'>-</div><div class='del'>-		if ((strlen(priv-&gt;desired_essid) == 0) &amp;&amp; (priv-&gt;createibss)) {</div><div class='del'>-			printk(KERN_WARNING "%s: This firmware requires an "</div><div class='del'>-			       "ESSID in IBSS-Ad-Hoc mode.\n", dev-&gt;name);</div><div class='del'>-			/* With wvlan_cs, in this case, we would crash.</div><div class='del'>-			 * hopefully, this driver will behave better...</div><div class='del'>-			 * Jean II */</div><div class='del'>-			createibss = 0;</div><div class='del'>-		} else {</div><div class='del'>-			createibss = priv-&gt;createibss;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-					   HERMES_RID_CNFCREATEIBSS,</div><div class='del'>-					   createibss);</div><div class='del'>-		if (err) {</div><div class='del'>-			printk(KERN_ERR "%s: Error %d setting CREATEIBSS\n",</div><div class='del'>-			       dev-&gt;name, err);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the desired BSSID */</div><div class='del'>-	err = __orinoco_hw_set_wap(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: Error %d setting AP address\n",</div><div class='del'>-		       dev-&gt;name, err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the desired ESSID */</div><div class='del'>-	idbuf.len = cpu_to_le16(strlen(priv-&gt;desired_essid));</div><div class='del'>-	memcpy(&amp;idbuf.val, priv-&gt;desired_essid, sizeof(idbuf.val));</div><div class='del'>-	/* WinXP wants partner to configure OWNSSID even in IBSS mode. (jimc) */</div><div class='del'>-	err = hw-&gt;ops-&gt;write_ltv(hw, USER_BAP, HERMES_RID_CNFOWNSSID,</div><div class='del'>-			HERMES_BYTES_TO_RECLEN(strlen(priv-&gt;desired_essid) + 2),</div><div class='del'>-			&amp;idbuf);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: Error %d setting OWNSSID\n",</div><div class='del'>-		       dev-&gt;name, err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	err = hw-&gt;ops-&gt;write_ltv(hw, USER_BAP, HERMES_RID_CNFDESIREDSSID,</div><div class='del'>-			HERMES_BYTES_TO_RECLEN(strlen(priv-&gt;desired_essid) + 2),</div><div class='del'>-			&amp;idbuf);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: Error %d setting DESIREDSSID\n",</div><div class='del'>-		       dev-&gt;name, err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the station name */</div><div class='del'>-	idbuf.len = cpu_to_le16(strlen(priv-&gt;nick));</div><div class='del'>-	memcpy(&amp;idbuf.val, priv-&gt;nick, sizeof(idbuf.val));</div><div class='del'>-	err = hw-&gt;ops-&gt;write_ltv(hw, USER_BAP, HERMES_RID_CNFOWNNAME,</div><div class='del'>-				 HERMES_BYTES_TO_RECLEN(strlen(priv-&gt;nick) + 2),</div><div class='del'>-				 &amp;idbuf);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: Error %d setting nickname\n",</div><div class='del'>-		       dev-&gt;name, err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set AP density */</div><div class='del'>-	if (priv-&gt;has_sensitivity) {</div><div class='del'>-		err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-					   HERMES_RID_CNFSYSTEMSCALE,</div><div class='del'>-					   priv-&gt;ap_density);</div><div class='del'>-		if (err) {</div><div class='del'>-			printk(KERN_WARNING "%s: Error %d setting SYSTEMSCALE. "</div><div class='del'>-			       "Disabling sensitivity control\n",</div><div class='del'>-			       dev-&gt;name, err);</div><div class='del'>-</div><div class='del'>-			priv-&gt;has_sensitivity = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set RTS threshold */</div><div class='del'>-	err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFRTSTHRESHOLD,</div><div class='del'>-				   priv-&gt;rts_thresh);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: Error %d setting RTS threshold\n",</div><div class='del'>-		       dev-&gt;name, err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set fragmentation threshold or MWO robustness */</div><div class='del'>-	if (priv-&gt;has_mwo)</div><div class='del'>-		err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-					   HERMES_RID_CNFMWOROBUST_AGERE,</div><div class='del'>-					   priv-&gt;mwo_robust);</div><div class='del'>-	else</div><div class='del'>-		err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-					   HERMES_RID_CNFFRAGMENTATIONTHRESHOLD,</div><div class='del'>-					   priv-&gt;frag_thresh);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: Error %d setting fragmentation\n",</div><div class='del'>-		       dev-&gt;name, err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set bitrate */</div><div class='del'>-	err = __orinoco_hw_set_bitrate(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: Error %d setting bitrate\n",</div><div class='del'>-		       dev-&gt;name, err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set power management */</div><div class='del'>-	if (priv-&gt;has_pm) {</div><div class='del'>-		err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-					   HERMES_RID_CNFPMENABLED,</div><div class='del'>-					   priv-&gt;pm_on);</div><div class='del'>-		if (err) {</div><div class='del'>-			printk(KERN_ERR "%s: Error %d setting up PM\n",</div><div class='del'>-			       dev-&gt;name, err);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-					   HERMES_RID_CNFMULTICASTRECEIVE,</div><div class='del'>-					   priv-&gt;pm_mcast);</div><div class='del'>-		if (err) {</div><div class='del'>-			printk(KERN_ERR "%s: Error %d setting up PM\n",</div><div class='del'>-			       dev-&gt;name, err);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-		err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-					   HERMES_RID_CNFMAXSLEEPDURATION,</div><div class='del'>-					   priv-&gt;pm_period);</div><div class='del'>-		if (err) {</div><div class='del'>-			printk(KERN_ERR "%s: Error %d setting up PM\n",</div><div class='del'>-			       dev-&gt;name, err);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-		err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-					   HERMES_RID_CNFPMHOLDOVERDURATION,</div><div class='del'>-					   priv-&gt;pm_timeout);</div><div class='del'>-		if (err) {</div><div class='del'>-			printk(KERN_ERR "%s: Error %d setting up PM\n",</div><div class='del'>-			       dev-&gt;name, err);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set preamble - only for Symbol so far... */</div><div class='del'>-	if (priv-&gt;has_preamble) {</div><div class='del'>-		err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-					   HERMES_RID_CNFPREAMBLE_SYMBOL,</div><div class='del'>-					   priv-&gt;preamble);</div><div class='del'>-		if (err) {</div><div class='del'>-			printk(KERN_ERR "%s: Error %d setting preamble\n",</div><div class='del'>-			       dev-&gt;name, err);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set up encryption */</div><div class='del'>-	if (priv-&gt;has_wep || priv-&gt;has_wpa) {</div><div class='del'>-		err = __orinoco_hw_setup_enc(priv);</div><div class='del'>-		if (err) {</div><div class='del'>-			printk(KERN_ERR "%s: Error %d activating encryption\n",</div><div class='del'>-			       dev-&gt;name, err);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;iw_mode == NL80211_IFTYPE_MONITOR) {</div><div class='del'>-		/* Enable monitor mode */</div><div class='del'>-		dev-&gt;type = ARPHRD_IEEE80211;</div><div class='del'>-		err = hw-&gt;ops-&gt;cmd_wait(hw, HERMES_CMD_TEST |</div><div class='del'>-					    HERMES_TEST_MONITOR, 0, NULL);</div><div class='del'>-	} else {</div><div class='del'>-		/* Disable monitor mode */</div><div class='del'>-		dev-&gt;type = ARPHRD_ETHER;</div><div class='del'>-		err = hw-&gt;ops-&gt;cmd_wait(hw, HERMES_CMD_TEST |</div><div class='del'>-					    HERMES_TEST_STOP, 0, NULL);</div><div class='del'>-	}</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/* Reset promiscuity / multicast*/</div><div class='del'>-	priv-&gt;promiscuous = 0;</div><div class='del'>-	priv-&gt;mc_count = 0;</div><div class='del'>-</div><div class='del'>-	/* Record mode change */</div><div class='del'>-	wdev-&gt;iftype = priv-&gt;iw_mode;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get tsc from the firmware */</div><div class='del'>-int orinoco_hw_get_tkip_iv(struct orinoco_private *priv, int key, u8 *tsc)</div><div class='del'>-{</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int err = 0;</div><div class='del'>-	u8 tsc_arr[4][ORINOCO_SEQ_LEN];</div><div class='del'>-</div><div class='del'>-	if ((key &lt; 0) || (key &gt;= 4))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	err = hw-&gt;ops-&gt;read_ltv(hw, USER_BAP, HERMES_RID_CURRENT_TKIP_IV,</div><div class='del'>-				sizeof(tsc_arr), NULL, &amp;tsc_arr);</div><div class='del'>-	if (!err)</div><div class='del'>-		memcpy(tsc, &amp;tsc_arr[key][0], sizeof(tsc_arr[0]));</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __orinoco_hw_set_bitrate(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int ratemode = priv-&gt;bitratemode;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (ratemode &gt;= BITRATE_TABLE_SIZE) {</div><div class='del'>-		printk(KERN_ERR "%s: BUG: Invalid bitrate mode %d\n",</div><div class='del'>-		       priv-&gt;ndev-&gt;name, ratemode);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;firmware_type) {</div><div class='del'>-	case FIRMWARE_TYPE_AGERE:</div><div class='del'>-		err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-				HERMES_RID_CNFTXRATECONTROL,</div><div class='del'>-				bitrate_table[ratemode].agere_txratectrl);</div><div class='del'>-		break;</div><div class='del'>-	case FIRMWARE_TYPE_INTERSIL:</div><div class='del'>-	case FIRMWARE_TYPE_SYMBOL:</div><div class='del'>-		err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-				HERMES_RID_CNFTXRATECONTROL,</div><div class='del'>-				bitrate_table[ratemode].intersil_txratectrl);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int orinoco_hw_get_act_bitrate(struct orinoco_private *priv, int *bitrate)</div><div class='del'>-{</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int i;</div><div class='del'>-	int err = 0;</div><div class='del'>-	u16 val;</div><div class='del'>-</div><div class='del'>-	err = hermes_read_wordrec(hw, USER_BAP,</div><div class='del'>-				  HERMES_RID_CURRENTTXRATE, &amp;val);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;firmware_type) {</div><div class='del'>-	case FIRMWARE_TYPE_AGERE: /* Lucent style rate */</div><div class='del'>-		/* Note : in Lucent firmware, the return value of</div><div class='del'>-		 * HERMES_RID_CURRENTTXRATE is the bitrate in Mb/s,</div><div class='del'>-		 * and therefore is totally different from the</div><div class='del'>-		 * encoding of HERMES_RID_CNFTXRATECONTROL.</div><div class='del'>-		 * Don't forget that 6Mb/s is really 5.5Mb/s */</div><div class='del'>-		if (val == 6)</div><div class='del'>-			*bitrate = 5500000;</div><div class='del'>-		else</div><div class='del'>-			*bitrate = val * 1000000;</div><div class='del'>-		break;</div><div class='del'>-	case FIRMWARE_TYPE_INTERSIL: /* Intersil style rate */</div><div class='del'>-	case FIRMWARE_TYPE_SYMBOL: /* Symbol style rate */</div><div class='del'>-		for (i = 0; i &lt; BITRATE_TABLE_SIZE; i++)</div><div class='del'>-			if (bitrate_table[i].intersil_txratectrl == val) {</div><div class='del'>-				*bitrate = bitrate_table[i].bitrate * 100000;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-		if (i &gt;= BITRATE_TABLE_SIZE) {</div><div class='del'>-			printk(KERN_INFO "%s: Unable to determine current bitrate (0x%04hx)\n",</div><div class='del'>-			       priv-&gt;ndev-&gt;name, val);</div><div class='del'>-			err = -EIO;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Set fixed AP address */</div><div class='del'>-int __orinoco_hw_set_wap(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	int roaming_flag;</div><div class='del'>-	int err = 0;</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;firmware_type) {</div><div class='del'>-	case FIRMWARE_TYPE_AGERE:</div><div class='del'>-		/* not supported */</div><div class='del'>-		break;</div><div class='del'>-	case FIRMWARE_TYPE_INTERSIL:</div><div class='del'>-		if (priv-&gt;bssid_fixed)</div><div class='del'>-			roaming_flag = 2;</div><div class='del'>-		else</div><div class='del'>-			roaming_flag = 1;</div><div class='del'>-</div><div class='del'>-		err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-					   HERMES_RID_CNFROAMINGMODE,</div><div class='del'>-					   roaming_flag);</div><div class='del'>-		break;</div><div class='del'>-	case FIRMWARE_TYPE_SYMBOL:</div><div class='del'>-		err = HERMES_WRITE_RECORD(hw, USER_BAP,</div><div class='del'>-					  HERMES_RID_CNFMANDATORYBSSID_SYMBOL,</div><div class='del'>-					  &amp;priv-&gt;desired_bssid);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Change the WEP keys and/or the current keys.  Can be called</div><div class='del'>- * either from __orinoco_hw_setup_enc() or directly from</div><div class='del'>- * orinoco_ioctl_setiwencode().  In the later case the association</div><div class='del'>- * with the AP is not broken (if the firmware can handle it),</div><div class='del'>- * which is needed for 802.1x implementations. */</div><div class='del'>-int __orinoco_hw_setup_wepkeys(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int err = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;firmware_type) {</div><div class='del'>-	case FIRMWARE_TYPE_AGERE:</div><div class='del'>-	{</div><div class='del'>-		struct orinoco_key keys[ORINOCO_MAX_KEYS];</div><div class='del'>-</div><div class='del'>-		memset(&amp;keys, 0, sizeof(keys));</div><div class='del'>-		for (i = 0; i &lt; ORINOCO_MAX_KEYS; i++) {</div><div class='del'>-			int len = min(priv-&gt;keys[i].key_len,</div><div class='del'>-				      ORINOCO_MAX_KEY_SIZE);</div><div class='del'>-			memcpy(&amp;keys[i].data, priv-&gt;keys[i].key, len);</div><div class='del'>-			if (len &gt; SMALL_KEY_SIZE)</div><div class='del'>-				keys[i].len = cpu_to_le16(LARGE_KEY_SIZE);</div><div class='del'>-			else if (len &gt; 0)</div><div class='del'>-				keys[i].len = cpu_to_le16(SMALL_KEY_SIZE);</div><div class='del'>-			else</div><div class='del'>-				keys[i].len = cpu_to_le16(0);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err = HERMES_WRITE_RECORD(hw, USER_BAP,</div><div class='del'>-					  HERMES_RID_CNFWEPKEYS_AGERE,</div><div class='del'>-					  &amp;keys);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-		err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-					   HERMES_RID_CNFTXKEY_AGERE,</div><div class='del'>-					   priv-&gt;tx_key);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case FIRMWARE_TYPE_INTERSIL:</div><div class='del'>-	case FIRMWARE_TYPE_SYMBOL:</div><div class='del'>-		{</div><div class='del'>-			int keylen;</div><div class='del'>-</div><div class='del'>-			/* Force uniform key length to work around</div><div class='del'>-			 * firmware bugs */</div><div class='del'>-			keylen = priv-&gt;keys[priv-&gt;tx_key].key_len;</div><div class='del'>-</div><div class='del'>-			if (keylen &gt; LARGE_KEY_SIZE) {</div><div class='del'>-				printk(KERN_ERR "%s: BUG: Key %d has oversize length %d.\n",</div><div class='del'>-				       priv-&gt;ndev-&gt;name, priv-&gt;tx_key, keylen);</div><div class='del'>-				return -E2BIG;</div><div class='del'>-			} else if (keylen &gt; SMALL_KEY_SIZE)</div><div class='del'>-				keylen = LARGE_KEY_SIZE;</div><div class='del'>-			else if (keylen &gt; 0)</div><div class='del'>-				keylen = SMALL_KEY_SIZE;</div><div class='del'>-			else</div><div class='del'>-				keylen = 0;</div><div class='del'>-</div><div class='del'>-			/* Write all 4 keys */</div><div class='del'>-			for (i = 0; i &lt; ORINOCO_MAX_KEYS; i++) {</div><div class='del'>-				u8 key[LARGE_KEY_SIZE] = { 0 };</div><div class='del'>-</div><div class='del'>-				memcpy(key, priv-&gt;keys[i].key,</div><div class='del'>-				       priv-&gt;keys[i].key_len);</div><div class='del'>-</div><div class='del'>-				err = hw-&gt;ops-&gt;write_ltv(hw, USER_BAP,</div><div class='del'>-						HERMES_RID_CNFDEFAULTKEY0 + i,</div><div class='del'>-						HERMES_BYTES_TO_RECLEN(keylen),</div><div class='del'>-						key);</div><div class='del'>-				if (err)</div><div class='del'>-					return err;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Write the index of the key used in transmission */</div><div class='del'>-			err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-						HERMES_RID_CNFWEPDEFAULTKEYID,</div><div class='del'>-						priv-&gt;tx_key);</div><div class='del'>-			if (err)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __orinoco_hw_setup_enc(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int err = 0;</div><div class='del'>-	int master_wep_flag;</div><div class='del'>-	int auth_flag;</div><div class='del'>-	int enc_flag;</div><div class='del'>-</div><div class='del'>-	/* Setup WEP keys */</div><div class='del'>-	if (priv-&gt;encode_alg == ORINOCO_ALG_WEP)</div><div class='del'>-		__orinoco_hw_setup_wepkeys(priv);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;wep_restrict)</div><div class='del'>-		auth_flag = HERMES_AUTH_SHARED_KEY;</div><div class='del'>-	else</div><div class='del'>-		auth_flag = HERMES_AUTH_OPEN;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;wpa_enabled)</div><div class='del'>-		enc_flag = 2;</div><div class='del'>-	else if (priv-&gt;encode_alg == ORINOCO_ALG_WEP)</div><div class='del'>-		enc_flag = 1;</div><div class='del'>-	else</div><div class='del'>-		enc_flag = 0;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;firmware_type) {</div><div class='del'>-	case FIRMWARE_TYPE_AGERE: /* Agere style WEP */</div><div class='del'>-		if (priv-&gt;encode_alg == ORINOCO_ALG_WEP) {</div><div class='del'>-			/* Enable the shared-key authentication. */</div><div class='del'>-			err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-					HERMES_RID_CNFAUTHENTICATION_AGERE,</div><div class='del'>-					auth_flag);</div><div class='del'>-		}</div><div class='del'>-		err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-					   HERMES_RID_CNFWEPENABLED_AGERE,</div><div class='del'>-					   enc_flag);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;has_wpa) {</div><div class='del'>-			/* Set WPA key management */</div><div class='del'>-			err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-				  HERMES_RID_CNFSETWPAAUTHMGMTSUITE_AGERE,</div><div class='del'>-				  priv-&gt;key_mgmt);</div><div class='del'>-			if (err)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case FIRMWARE_TYPE_INTERSIL: /* Intersil style WEP */</div><div class='del'>-	case FIRMWARE_TYPE_SYMBOL: /* Symbol style WEP */</div><div class='del'>-		if (priv-&gt;encode_alg == ORINOCO_ALG_WEP) {</div><div class='del'>-			if (priv-&gt;wep_restrict ||</div><div class='del'>-			    (priv-&gt;firmware_type == FIRMWARE_TYPE_SYMBOL))</div><div class='del'>-				master_wep_flag = HERMES_WEP_PRIVACY_INVOKED |</div><div class='del'>-						  HERMES_WEP_EXCL_UNENCRYPTED;</div><div class='del'>-			else</div><div class='del'>-				master_wep_flag = HERMES_WEP_PRIVACY_INVOKED;</div><div class='del'>-</div><div class='del'>-			err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-						   HERMES_RID_CNFAUTHENTICATION,</div><div class='del'>-						   auth_flag);</div><div class='del'>-			if (err)</div><div class='del'>-				return err;</div><div class='del'>-		} else</div><div class='del'>-			master_wep_flag = 0;</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;iw_mode == NL80211_IFTYPE_MONITOR)</div><div class='del'>-			master_wep_flag |= HERMES_WEP_HOST_DECRYPT;</div><div class='del'>-</div><div class='del'>-		/* Master WEP setting : on/off */</div><div class='del'>-		err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-					   HERMES_RID_CNFWEPFLAGS_INTERSIL,</div><div class='del'>-					   master_wep_flag);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* key must be 32 bytes, including the tx and rx MIC keys.</div><div class='del'>- * rsc must be NULL or up to 8 bytes</div><div class='del'>- * tsc must be NULL or up to 8 bytes</div><div class='del'>- */</div><div class='del'>-int __orinoco_hw_set_tkip_key(struct orinoco_private *priv, int key_idx,</div><div class='del'>-			      int set_tx, const u8 *key, const u8 *rsc,</div><div class='del'>-			      size_t rsc_len, const u8 *tsc, size_t tsc_len)</div><div class='del'>-{</div><div class='del'>-	struct {</div><div class='del'>-		__le16 idx;</div><div class='del'>-		u8 rsc[ORINOCO_SEQ_LEN];</div><div class='del'>-		u8 key[TKIP_KEYLEN];</div><div class='del'>-		u8 tx_mic[MIC_KEYLEN];</div><div class='del'>-		u8 rx_mic[MIC_KEYLEN];</div><div class='del'>-		u8 tsc[ORINOCO_SEQ_LEN];</div><div class='del'>-	} __packed buf;</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int ret;</div><div class='del'>-	int err;</div><div class='del'>-	int k;</div><div class='del'>-	u16 xmitting;</div><div class='del'>-</div><div class='del'>-	key_idx &amp;= 0x3;</div><div class='del'>-</div><div class='del'>-	if (set_tx)</div><div class='del'>-		key_idx |= 0x8000;</div><div class='del'>-</div><div class='del'>-	buf.idx = cpu_to_le16(key_idx);</div><div class='del'>-	memcpy(buf.key, key,</div><div class='del'>-	       sizeof(buf.key) + sizeof(buf.tx_mic) + sizeof(buf.rx_mic));</div><div class='del'>-</div><div class='del'>-	if (rsc_len &gt; sizeof(buf.rsc))</div><div class='del'>-		rsc_len = sizeof(buf.rsc);</div><div class='del'>-</div><div class='del'>-	if (tsc_len &gt; sizeof(buf.tsc))</div><div class='del'>-		tsc_len = sizeof(buf.tsc);</div><div class='del'>-</div><div class='del'>-	memset(buf.rsc, 0, sizeof(buf.rsc));</div><div class='del'>-	memset(buf.tsc, 0, sizeof(buf.tsc));</div><div class='del'>-</div><div class='del'>-	if (rsc != NULL)</div><div class='del'>-		memcpy(buf.rsc, rsc, rsc_len);</div><div class='del'>-</div><div class='del'>-	if (tsc != NULL)</div><div class='del'>-		memcpy(buf.tsc, tsc, tsc_len);</div><div class='del'>-	else</div><div class='del'>-		buf.tsc[4] = 0x10;</div><div class='del'>-</div><div class='del'>-	/* Wait up to 100ms for tx queue to empty */</div><div class='del'>-	for (k = 100; k &gt; 0; k--) {</div><div class='del'>-		udelay(1000);</div><div class='del'>-		ret = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_TXQUEUEEMPTY,</div><div class='del'>-					  &amp;xmitting);</div><div class='del'>-		if (ret || !xmitting)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (k == 0)</div><div class='del'>-		ret = -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-	err = HERMES_WRITE_RECORD(hw, USER_BAP,</div><div class='del'>-				  HERMES_RID_CNFADDDEFAULTTKIPKEY_AGERE,</div><div class='del'>-				  &amp;buf);</div><div class='del'>-</div><div class='del'>-	return ret ? ret : err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int orinoco_clear_tkip_key(struct orinoco_private *priv, int key_idx)</div><div class='del'>-{</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-				   HERMES_RID_CNFREMDEFAULTTKIPKEY_AGERE,</div><div class='del'>-				   key_idx);</div><div class='del'>-	if (err)</div><div class='del'>-		printk(KERN_WARNING "%s: Error %d clearing TKIP key %d\n",</div><div class='del'>-		       priv-&gt;ndev-&gt;name, err, key_idx);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __orinoco_hw_set_multicast_list(struct orinoco_private *priv,</div><div class='del'>-				    struct net_device *dev,</div><div class='del'>-				    int mc_count, int promisc)</div><div class='del'>-{</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (promisc != priv-&gt;promiscuous) {</div><div class='del'>-		err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-					   HERMES_RID_CNFPROMISCUOUSMODE,</div><div class='del'>-					   promisc);</div><div class='del'>-		if (err) {</div><div class='del'>-			printk(KERN_ERR "%s: Error %d setting PROMISCUOUSMODE to 1.\n",</div><div class='del'>-			       priv-&gt;ndev-&gt;name, err);</div><div class='del'>-		} else</div><div class='del'>-			priv-&gt;promiscuous = promisc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we're not in promiscuous mode, then we need to set the</div><div class='del'>-	 * group address if either we want to multicast, or if we were</div><div class='del'>-	 * multicasting and want to stop */</div><div class='del'>-	if (!promisc &amp;&amp; (mc_count || priv-&gt;mc_count)) {</div><div class='del'>-		struct netdev_hw_addr *ha;</div><div class='del'>-		struct hermes_multicast mclist;</div><div class='del'>-		int i = 0;</div><div class='del'>-</div><div class='del'>-		netdev_for_each_mc_addr(ha, dev) {</div><div class='del'>-			if (i == mc_count)</div><div class='del'>-				break;</div><div class='del'>-			memcpy(mclist.addr[i++], ha-&gt;addr, ETH_ALEN);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err = hw-&gt;ops-&gt;write_ltv(hw, USER_BAP,</div><div class='del'>-				   HERMES_RID_CNFGROUPADDRESSES,</div><div class='del'>-				   HERMES_BYTES_TO_RECLEN(mc_count * ETH_ALEN),</div><div class='del'>-				   &amp;mclist);</div><div class='del'>-		if (err)</div><div class='del'>-			printk(KERN_ERR "%s: Error %d setting multicast list.\n",</div><div class='del'>-			       priv-&gt;ndev-&gt;name, err);</div><div class='del'>-		else</div><div class='del'>-			priv-&gt;mc_count = mc_count;</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Return : &lt; 0 -&gt; error code ; &gt;= 0 -&gt; length */</div><div class='del'>-int orinoco_hw_get_essid(struct orinoco_private *priv, int *active,</div><div class='del'>-			 char buf[IW_ESSID_MAX_SIZE + 1])</div><div class='del'>-{</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int err = 0;</div><div class='del'>-	struct hermes_idstring essidbuf;</div><div class='del'>-	char *p = (char *)(&amp;essidbuf.val);</div><div class='del'>-	int len;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	if (strlen(priv-&gt;desired_essid) &gt; 0) {</div><div class='del'>-		/* We read the desired SSID from the hardware rather</div><div class='del'>-		   than from priv-&gt;desired_essid, just in case the</div><div class='del'>-		   firmware is allowed to change it on us. I'm not</div><div class='del'>-		   sure about this */</div><div class='del'>-		/* My guess is that the OWNSSID should always be whatever</div><div class='del'>-		 * we set to the card, whereas CURRENT_SSID is the one that</div><div class='del'>-		 * may change... - Jean II */</div><div class='del'>-		u16 rid;</div><div class='del'>-</div><div class='del'>-		*active = 1;</div><div class='del'>-</div><div class='del'>-		rid = (priv-&gt;port_type == 3) ? HERMES_RID_CNFOWNSSID :</div><div class='del'>-			HERMES_RID_CNFDESIREDSSID;</div><div class='del'>-</div><div class='del'>-		err = hw-&gt;ops-&gt;read_ltv(hw, USER_BAP, rid, sizeof(essidbuf),</div><div class='del'>-					NULL, &amp;essidbuf);</div><div class='del'>-		if (err)</div><div class='del'>-			goto fail_unlock;</div><div class='del'>-	} else {</div><div class='del'>-		*active = 0;</div><div class='del'>-</div><div class='del'>-		err = hw-&gt;ops-&gt;read_ltv(hw, USER_BAP, HERMES_RID_CURRENTSSID,</div><div class='del'>-					sizeof(essidbuf), NULL, &amp;essidbuf);</div><div class='del'>-		if (err)</div><div class='del'>-			goto fail_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	len = le16_to_cpu(essidbuf.len);</div><div class='del'>-	BUG_ON(len &gt; IW_ESSID_MAX_SIZE);</div><div class='del'>-</div><div class='del'>-	memset(buf, 0, IW_ESSID_MAX_SIZE);</div><div class='del'>-	memcpy(buf, p, len);</div><div class='del'>-	err = len;</div><div class='del'>-</div><div class='del'>- fail_unlock:</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int orinoco_hw_get_freq(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int err = 0;</div><div class='del'>-	u16 channel;</div><div class='del'>-	int freq = 0;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	err = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_CURRENTCHANNEL,</div><div class='del'>-				  &amp;channel);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Intersil firmware 1.3.5 returns 0 when the interface is down */</div><div class='del'>-	if (channel == 0) {</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((channel &lt; 1) || (channel &gt; NUM_CHANNELS)) {</div><div class='del'>-		printk(KERN_WARNING "%s: Channel out of range (%d)!\n",</div><div class='del'>-		       priv-&gt;ndev-&gt;name, channel);</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	freq = ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	if (err &gt; 0)</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-	return err ? err : freq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int orinoco_hw_get_bitratelist(struct orinoco_private *priv,</div><div class='del'>-			       int *numrates, s32 *rates, int max)</div><div class='del'>-{</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	struct hermes_idstring list;</div><div class='del'>-	unsigned char *p = (unsigned char *)&amp;list.val;</div><div class='del'>-	int err = 0;</div><div class='del'>-	int num;</div><div class='del'>-	int i;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	err = hw-&gt;ops-&gt;read_ltv(hw, USER_BAP, HERMES_RID_SUPPORTEDDATARATES,</div><div class='del'>-				sizeof(list), NULL, &amp;list);</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	num = le16_to_cpu(list.len);</div><div class='del'>-	*numrates = num;</div><div class='del'>-	num = min(num, max);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num; i++)</div><div class='del'>-		rates[i] = (p[i] &amp; 0x7f) * 500000; /* convert to bps */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int orinoco_hw_trigger_scan(struct orinoco_private *priv,</div><div class='del'>-			    const struct cfg80211_ssid *ssid)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = priv-&gt;ndev;</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	/* Scanning with port 0 disabled would fail */</div><div class='del'>-	if (!netif_running(dev)) {</div><div class='del'>-		err = -ENETDOWN;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* In monitor mode, the scan results are always empty.</div><div class='del'>-	 * Probe responses are passed to the driver as received</div><div class='del'>-	 * frames and could be processed in software. */</div><div class='del'>-	if (priv-&gt;iw_mode == NL80211_IFTYPE_MONITOR) {</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;has_hostscan) {</div><div class='del'>-		switch (priv-&gt;firmware_type) {</div><div class='del'>-		case FIRMWARE_TYPE_SYMBOL:</div><div class='del'>-			err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-						HERMES_RID_CNFHOSTSCAN_SYMBOL,</div><div class='del'>-						HERMES_HOSTSCAN_SYMBOL_ONCE |</div><div class='del'>-						HERMES_HOSTSCAN_SYMBOL_BCAST);</div><div class='del'>-			break;</div><div class='del'>-		case FIRMWARE_TYPE_INTERSIL: {</div><div class='del'>-			__le16 req[3];</div><div class='del'>-</div><div class='del'>-			req[0] = cpu_to_le16(0x3fff);	/* All channels */</div><div class='del'>-			req[1] = cpu_to_le16(0x0001);	/* rate 1 Mbps */</div><div class='del'>-			req[2] = 0;			/* Any ESSID */</div><div class='del'>-			err = HERMES_WRITE_RECORD(hw, USER_BAP,</div><div class='del'>-						  HERMES_RID_CNFHOSTSCAN, &amp;req);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		case FIRMWARE_TYPE_AGERE:</div><div class='del'>-			if (ssid-&gt;ssid_len &gt; 0) {</div><div class='del'>-				struct hermes_idstring idbuf;</div><div class='del'>-				size_t len = ssid-&gt;ssid_len;</div><div class='del'>-</div><div class='del'>-				idbuf.len = cpu_to_le16(len);</div><div class='del'>-				memcpy(idbuf.val, ssid-&gt;ssid, len);</div><div class='del'>-</div><div class='del'>-				err = hw-&gt;ops-&gt;write_ltv(hw, USER_BAP,</div><div class='del'>-					       HERMES_RID_CNFSCANSSID_AGERE,</div><div class='del'>-					       HERMES_BYTES_TO_RECLEN(len + 2),</div><div class='del'>-					       &amp;idbuf);</div><div class='del'>-			} else</div><div class='del'>-				err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-						   HERMES_RID_CNFSCANSSID_AGERE,</div><div class='del'>-						   0);	/* Any ESSID */</div><div class='del'>-			if (err)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			if (priv-&gt;has_ext_scan) {</div><div class='del'>-				err = hermes_write_wordrec(hw, USER_BAP,</div><div class='del'>-						HERMES_RID_CNFSCANCHANNELS2GHZ,</div><div class='del'>-						0x7FFF);</div><div class='del'>-				if (err)</div><div class='del'>-					goto out;</div><div class='del'>-</div><div class='del'>-				err = hermes_inquire(hw,</div><div class='del'>-						     HERMES_INQ_CHANNELINFO);</div><div class='del'>-			} else</div><div class='del'>-				err = hermes_inquire(hw, HERMES_INQ_SCAN);</div><div class='del'>-</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		err = hermes_inquire(hw, HERMES_INQ_SCAN);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Disassociate from node with BSSID addr */</div><div class='del'>-int orinoco_hw_disassociate(struct orinoco_private *priv,</div><div class='del'>-			    u8 *addr, u16 reason_code)</div><div class='del'>-{</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	struct {</div><div class='del'>-		u8 addr[ETH_ALEN];</div><div class='del'>-		__le16 reason_code;</div><div class='del'>-	} __packed buf;</div><div class='del'>-</div><div class='del'>-	/* Currently only supported by WPA enabled Agere fw */</div><div class='del'>-	if (!priv-&gt;has_wpa)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	memcpy(buf.addr, addr, ETH_ALEN);</div><div class='del'>-	buf.reason_code = cpu_to_le16(reason_code);</div><div class='del'>-	err = HERMES_WRITE_RECORD(hw, USER_BAP,</div><div class='del'>-				  HERMES_RID_CNFDISASSOCIATE,</div><div class='del'>-				  &amp;buf);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int orinoco_hw_get_current_bssid(struct orinoco_private *priv,</div><div class='del'>-				 u8 *addr)</div><div class='del'>-{</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = hw-&gt;ops-&gt;read_ltv(hw, USER_BAP, HERMES_RID_CURRENTBSSID,</div><div class='del'>-				ETH_ALEN, NULL, addr);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/hw.h b/drivers/net/wireless/intersil/orinoco/hw.h<br/>deleted file mode 100644<br/>index 466d1ede76f1..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/hw.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/hw.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-/* Encapsulate basic setting changes on Hermes hardware</div><div class='del'>- *</div><div class='del'>- * See copyright notice in main.c</div><div class='del'>- */</div><div class='del'>-#ifndef _ORINOCO_HW_H_</div><div class='del'>-#define _ORINOCO_HW_H_</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/wireless.h&gt;</div><div class='del'>-#include &lt;net/cfg80211.h&gt;</div><div class='del'>-</div><div class='del'>-/* Hardware BAPs */</div><div class='del'>-#define USER_BAP 0</div><div class='del'>-#define IRQ_BAP  1</div><div class='del'>-</div><div class='del'>-/* WEP key sizes */</div><div class='del'>-#define SMALL_KEY_SIZE 5</div><div class='del'>-#define LARGE_KEY_SIZE 13</div><div class='del'>-</div><div class='del'>-/* Number of supported channels */</div><div class='del'>-#define NUM_CHANNELS 14</div><div class='del'>-</div><div class='del'>-/* Forward declarations */</div><div class='del'>-struct orinoco_private;</div><div class='del'>-</div><div class='del'>-int determine_fw_capabilities(struct orinoco_private *priv, char *fw_name,</div><div class='del'>-			      size_t fw_name_len, u32 *hw_ver);</div><div class='del'>-int orinoco_hw_read_card_settings(struct orinoco_private *priv, u8 *dev_addr);</div><div class='del'>-int orinoco_hw_allocate_fid(struct orinoco_private *priv);</div><div class='del'>-int orinoco_get_bitratemode(int bitrate, int automatic);</div><div class='del'>-void orinoco_get_ratemode_cfg(int ratemode, int *bitrate, int *automatic);</div><div class='del'>-</div><div class='del'>-int orinoco_hw_program_rids(struct orinoco_private *priv);</div><div class='del'>-int orinoco_hw_get_tkip_iv(struct orinoco_private *priv, int key, u8 *tsc);</div><div class='del'>-int __orinoco_hw_set_bitrate(struct orinoco_private *priv);</div><div class='del'>-int orinoco_hw_get_act_bitrate(struct orinoco_private *priv, int *bitrate);</div><div class='del'>-int __orinoco_hw_set_wap(struct orinoco_private *priv);</div><div class='del'>-int __orinoco_hw_setup_wepkeys(struct orinoco_private *priv);</div><div class='del'>-int __orinoco_hw_setup_enc(struct orinoco_private *priv);</div><div class='del'>-int __orinoco_hw_set_tkip_key(struct orinoco_private *priv, int key_idx,</div><div class='del'>-			      int set_tx, const u8 *key, const u8 *rsc,</div><div class='del'>-			      size_t rsc_len, const u8 *tsc, size_t tsc_len);</div><div class='del'>-int orinoco_clear_tkip_key(struct orinoco_private *priv, int key_idx);</div><div class='del'>-int __orinoco_hw_set_multicast_list(struct orinoco_private *priv,</div><div class='del'>-				    struct net_device *dev,</div><div class='del'>-				    int mc_count, int promisc);</div><div class='del'>-int orinoco_hw_get_essid(struct orinoco_private *priv, int *active,</div><div class='del'>-			 char buf[IW_ESSID_MAX_SIZE + 1]);</div><div class='del'>-int orinoco_hw_get_freq(struct orinoco_private *priv);</div><div class='del'>-int orinoco_hw_get_bitratelist(struct orinoco_private *priv,</div><div class='del'>-			       int *numrates, s32 *rates, int max);</div><div class='del'>-int orinoco_hw_trigger_scan(struct orinoco_private *priv,</div><div class='del'>-			    const struct cfg80211_ssid *ssid);</div><div class='del'>-int orinoco_hw_disassociate(struct orinoco_private *priv,</div><div class='del'>-			    u8 *addr, u16 reason_code);</div><div class='del'>-int orinoco_hw_get_current_bssid(struct orinoco_private *priv,</div><div class='del'>-				 u8 *addr);</div><div class='del'>-</div><div class='del'>-#endif /* _ORINOCO_HW_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/main.c b/drivers/net/wireless/intersil/orinoco/main.c<br/>deleted file mode 100644<br/>index 0e73a10cc06c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/main.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2414 +0,0 @@</div><div class='del'>-/* main.c - (formerly known as dldwd_cs.c, orinoco_cs.c and orinoco.c)</div><div class='del'>- *</div><div class='del'>- * A driver for Hermes or Prism 2 chipset based PCMCIA wireless</div><div class='del'>- * adaptors, with Lucent/Agere, Intersil or Symbol firmware.</div><div class='del'>- *</div><div class='del'>- * Current maintainers (as of 29 September 2003) are:</div><div class='del'>- *	Pavel Roskin &lt;proski AT gnu.org&gt;</div><div class='del'>- * and	David Gibson &lt;hermes AT gibson.dropbear.id.au&gt;</div><div class='del'>- *</div><div class='del'>- * (C) Copyright David Gibson, IBM Corporation 2001-2003.</div><div class='del'>- * Copyright (C) 2000 David Gibson, Linuxcare Australia.</div><div class='del'>- *	With some help from :</div><div class='del'>- * Copyright (C) 2001 Jean Tourrilhes, HP Labs</div><div class='del'>- * Copyright (C) 2001 Benjamin Herrenschmidt</div><div class='del'>- *</div><div class='del'>- * Based on dummy_cs.c 1.27 2000/06/12 21:27:25</div><div class='del'>- *</div><div class='del'>- * Portions based on wvlan_cs.c 1.0.6, Copyright Andreas Neuhaus &lt;andy</div><div class='del'>- * AT fasta.fh-dortmund.de&gt;</div><div class='del'>- *      http://www.stud.fh-dortmund.de/~andy/wvlan/</div><div class='del'>- *</div><div class='del'>- * The contents of this file are subject to the Mozilla Public License</div><div class='del'>- * Version 1.1 (the "License"); you may not use this file except in</div><div class='del'>- * compliance with the License. You may obtain a copy of the License</div><div class='del'>- * at http://www.mozilla.org/MPL/</div><div class='del'>- *</div><div class='del'>- * Software distributed under the License is distributed on an "AS IS"</div><div class='del'>- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See</div><div class='del'>- * the License for the specific language governing rights and</div><div class='del'>- * limitations under the License.</div><div class='del'>- *</div><div class='del'>- * The initial developer of the original code is David A. Hinds</div><div class='del'>- * &lt;dahinds AT users.sourceforge.net&gt;.  Portions created by David</div><div class='del'>- * A. Hinds are Copyright (C) 1999 David A. Hinds.  All Rights</div><div class='del'>- * Reserved.</div><div class='del'>- *</div><div class='del'>- * Alternatively, the contents of this file may be used under the</div><div class='del'>- * terms of the GNU General Public License version 2 (the "GPL"), in</div><div class='del'>- * which case the provisions of the GPL are applicable instead of the</div><div class='del'>- * above.  If you wish to allow the use of your version of this file</div><div class='del'>- * only under the terms of the GPL and not to allow others to use your</div><div class='del'>- * version of this file under the MPL, indicate your decision by</div><div class='del'>- * deleting the provisions above and replace them with the notice and</div><div class='del'>- * other provisions required by the GPL.  If you do not delete the</div><div class='del'>- * provisions above, a recipient may use your version of this file</div><div class='del'>- * under either the MPL or the GPL.  */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * TODO</div><div class='del'>- *	o Handle de-encapsulation within network layer, provide 802.11</div><div class='del'>- *	  headers (patch from Thomas 'Dent' Mirlacher)</div><div class='del'>- *	o Fix possible races in SPY handling.</div><div class='del'>- *	o Disconnect wireless extensions from fundamental configuration.</div><div class='del'>- *	o (maybe) Software WEP support (patch from Stano Meduna).</div><div class='del'>- *	o (maybe) Use multiple Tx buffers - driver handling queue</div><div class='del'>- *	  rather than firmware.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Locking and synchronization:</div><div class='del'>- *</div><div class='del'>- * The basic principle is that everything is serialized through a</div><div class='del'>- * single spinlock, priv-&gt;lock.  The lock is used in user, bh and irq</div><div class='del'>- * context, so when taken outside hardirq context it should always be</div><div class='del'>- * taken with interrupts disabled.  The lock protects both the</div><div class='del'>- * hardware and the struct orinoco_private.</div><div class='del'>- *</div><div class='del'>- * Another flag, priv-&gt;hw_unavailable indicates that the hardware is</div><div class='del'>- * unavailable for an extended period of time (e.g. suspended, or in</div><div class='del'>- * the middle of a hard reset).  This flag is protected by the</div><div class='del'>- * spinlock.  All code which touches the hardware should check the</div><div class='del'>- * flag after taking the lock, and if it is set, give up on whatever</div><div class='del'>- * they are doing and drop the lock again.  The orinoco_lock()</div><div class='del'>- * function handles this (it unlocks and returns -EBUSY if</div><div class='del'>- * hw_unavailable is non-zero).</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define DRIVER_NAME "orinoco"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/suspend.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/wireless.h&gt;</div><div class='del'>-#include &lt;linux/ieee80211.h&gt;</div><div class='del'>-#include &lt;net/iw_handler.h&gt;</div><div class='del'>-#include &lt;net/cfg80211.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hermes_rid.h"</div><div class='del'>-#include "hermes_dld.h"</div><div class='del'>-#include "hw.h"</div><div class='del'>-#include "scan.h"</div><div class='del'>-#include "mic.h"</div><div class='del'>-#include "fw.h"</div><div class='del'>-#include "wext.h"</div><div class='del'>-#include "cfg.h"</div><div class='del'>-#include "main.h"</div><div class='del'>-</div><div class='del'>-#include "orinoco.h"</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Module information                                               */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Pavel Roskin &lt;proski@gnu.org&gt; &amp; "</div><div class='del'>-	      "David Gibson &lt;hermes@gibson.dropbear.id.au&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Driver for Lucent Orinoco, Prism II based "</div><div class='del'>-		   "and similar wireless cards");</div><div class='del'>-MODULE_LICENSE("Dual MPL/GPL");</div><div class='del'>-</div><div class='del'>-/* Level of debugging. Used in the macros in orinoco.h */</div><div class='del'>-#ifdef ORINOCO_DEBUG</div><div class='del'>-int orinoco_debug = ORINOCO_DEBUG;</div><div class='del'>-EXPORT_SYMBOL(orinoco_debug);</div><div class='del'>-module_param(orinoco_debug, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(orinoco_debug, "Debug level");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static bool suppress_linkstatus; /* = 0 */</div><div class='del'>-module_param(suppress_linkstatus, bool, 0644);</div><div class='del'>-MODULE_PARM_DESC(suppress_linkstatus, "Don't log link status changes");</div><div class='del'>-</div><div class='del'>-static int ignore_disconnect; /* = 0 */</div><div class='del'>-module_param(ignore_disconnect, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(ignore_disconnect,</div><div class='del'>-		 "Don't report lost link to the network layer");</div><div class='del'>-</div><div class='del'>-int force_monitor; /* = 0 */</div><div class='del'>-module_param(force_monitor, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(force_monitor, "Allow monitor mode for all firmware versions");</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Internal constants                                               */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-/* 802.2 LLC/SNAP header used for Ethernet encapsulation over 802.11 */</div><div class='del'>-static const u8 encaps_hdr[] = {0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00};</div><div class='del'>-#define ENCAPS_OVERHEAD		(sizeof(encaps_hdr) + 2)</div><div class='del'>-</div><div class='del'>-#define ORINOCO_MIN_MTU		256</div><div class='del'>-#define ORINOCO_MAX_MTU		(IEEE80211_MAX_DATA_LEN - ENCAPS_OVERHEAD)</div><div class='del'>-</div><div class='del'>-#define MAX_IRQLOOPS_PER_IRQ	10</div><div class='del'>-#define MAX_IRQLOOPS_PER_JIFFY	(20000 / HZ)	/* Based on a guestimate of</div><div class='del'>-						 * how many events the</div><div class='del'>-						 * device could</div><div class='del'>-						 * legitimately generate */</div><div class='del'>-</div><div class='del'>-#define DUMMY_FID		0xFFFF</div><div class='del'>-</div><div class='del'>-/*#define MAX_MULTICAST(priv)	(priv-&gt;firmware_type == FIRMWARE_TYPE_AGERE ? \</div><div class='del'>-  HERMES_MAX_MULTICAST : 0)*/</div><div class='del'>-#define MAX_MULTICAST(priv)	(HERMES_MAX_MULTICAST)</div><div class='del'>-</div><div class='del'>-#define ORINOCO_INTEN		(HERMES_EV_RX | HERMES_EV_ALLOC \</div><div class='del'>-				 | HERMES_EV_TX | HERMES_EV_TXEXC \</div><div class='del'>-				 | HERMES_EV_WTERR | HERMES_EV_INFO \</div><div class='del'>-				 | HERMES_EV_INFDROP)</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Data types                                                       */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-/* Beginning of the Tx descriptor, used in TxExc handling */</div><div class='del'>-struct hermes_txexc_data {</div><div class='del'>-	struct hermes_tx_descriptor desc;</div><div class='del'>-	__le16 frame_ctl;</div><div class='del'>-	__le16 duration_id;</div><div class='del'>-	u8 addr1[ETH_ALEN];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* Rx frame header except compatibility 802.3 header */</div><div class='del'>-struct hermes_rx_descriptor {</div><div class='del'>-	/* Control */</div><div class='del'>-	__le16 status;</div><div class='del'>-	__le32 time;</div><div class='del'>-	u8 silence;</div><div class='del'>-	u8 signal;</div><div class='del'>-	u8 rate;</div><div class='del'>-	u8 rxflow;</div><div class='del'>-	__le32 reserved;</div><div class='del'>-</div><div class='del'>-	/* 802.11 header */</div><div class='del'>-	__le16 frame_ctl;</div><div class='del'>-	__le16 duration_id;</div><div class='del'>-	u8 addr1[ETH_ALEN];</div><div class='del'>-	u8 addr2[ETH_ALEN];</div><div class='del'>-	u8 addr3[ETH_ALEN];</div><div class='del'>-	__le16 seq_ctl;</div><div class='del'>-	u8 addr4[ETH_ALEN];</div><div class='del'>-</div><div class='del'>-	/* Data length */</div><div class='del'>-	__le16 data_len;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct orinoco_rx_data {</div><div class='del'>-	struct hermes_rx_descriptor *desc;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct list_head list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct orinoco_scan_data {</div><div class='del'>-	void *buf;</div><div class='del'>-	size_t len;</div><div class='del'>-	int type;</div><div class='del'>-	struct list_head list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Function prototypes                                              */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-static int __orinoco_set_multicast_list(struct net_device *dev);</div><div class='del'>-static int __orinoco_up(struct orinoco_private *priv);</div><div class='del'>-static int __orinoco_down(struct orinoco_private *priv);</div><div class='del'>-static int __orinoco_commit(struct orinoco_private *priv);</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Internal helper functions                                        */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-void set_port_type(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	switch (priv-&gt;iw_mode) {</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-		priv-&gt;port_type = 1;</div><div class='del'>-		priv-&gt;createibss = 0;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		if (priv-&gt;prefer_port3) {</div><div class='del'>-			priv-&gt;port_type = 3;</div><div class='del'>-			priv-&gt;createibss = 0;</div><div class='del'>-		} else {</div><div class='del'>-			priv-&gt;port_type = priv-&gt;ibss_port;</div><div class='del'>-			priv-&gt;createibss = 1;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_MONITOR:</div><div class='del'>-		priv-&gt;port_type = 3;</div><div class='del'>-		priv-&gt;createibss = 0;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR "%s: Invalid priv-&gt;iw_mode in set_port_type()\n",</div><div class='del'>-		       priv-&gt;ndev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Device methods                                                   */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-int orinoco_open(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	err = __orinoco_up(priv);</div><div class='del'>-</div><div class='del'>-	if (!err)</div><div class='del'>-		priv-&gt;open = 1;</div><div class='del'>-</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(orinoco_open);</div><div class='del'>-</div><div class='del'>-int orinoco_stop(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	/* We mustn't use orinoco_lock() here, because we need to be</div><div class='del'>-	   able to close the interface even if hw_unavailable is set</div><div class='del'>-	   (e.g. as we're released after a PC Card removal) */</div><div class='del'>-	orinoco_lock_irq(priv);</div><div class='del'>-</div><div class='del'>-	priv-&gt;open = 0;</div><div class='del'>-</div><div class='del'>-	err = __orinoco_down(priv);</div><div class='del'>-</div><div class='del'>-	orinoco_unlock_irq(priv);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(orinoco_stop);</div><div class='del'>-</div><div class='del'>-void orinoco_set_multicast_list(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0) {</div><div class='del'>-		printk(KERN_DEBUG "%s: orinoco_set_multicast_list() "</div><div class='del'>-		       "called when hw_unavailable\n", dev-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__orinoco_set_multicast_list(dev);</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(orinoco_set_multicast_list);</div><div class='del'>-</div><div class='del'>-int orinoco_change_mtu(struct net_device *dev, int new_mtu)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-</div><div class='del'>-	/* MTU + encapsulation + header length */</div><div class='del'>-	if ((new_mtu + ENCAPS_OVERHEAD + sizeof(struct ieee80211_hdr)) &gt;</div><div class='del'>-	     (priv-&gt;nicbuf_size - ETH_HLEN))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(orinoco_change_mtu);</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Tx path                                                          */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-/* Add encapsulation and MIC to the existing SKB.</div><div class='del'>- * The main xmit routine will then send the whole lot to the card.</div><div class='del'>- * Need 8 bytes headroom</div><div class='del'>- * Need 8 bytes tailroom</div><div class='del'>- *</div><div class='del'>- *                          With encapsulated ethernet II frame</div><div class='del'>- *                          --------</div><div class='del'>- *                          803.3 header (14 bytes)</div><div class='del'>- *                           dst[6]</div><div class='del'>- * --------                  src[6]</div><div class='del'>- * 803.3 header (14 bytes)   len[2]</div><div class='del'>- *  dst[6]                  803.2 header (8 bytes)</div><div class='del'>- *  src[6]                   encaps[6]</div><div class='del'>- *  len[2] &lt;- leave alone -&gt; len[2]</div><div class='del'>- * --------                 -------- &lt;-- 0</div><div class='del'>- * Payload                  Payload</div><div class='del'>- * ...                      ...</div><div class='del'>- *</div><div class='del'>- * --------                 --------</div><div class='del'>- *                          MIC (8 bytes)</div><div class='del'>- *                          --------</div><div class='del'>- *</div><div class='del'>- * returns 0 on success, -ENOMEM on error.</div><div class='del'>- */</div><div class='del'>-int orinoco_process_xmit_skb(struct sk_buff *skb,</div><div class='del'>-			     struct net_device *dev,</div><div class='del'>-			     struct orinoco_private *priv,</div><div class='del'>-			     int *tx_control,</div><div class='del'>-			     u8 *mic_buf)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_tkip_key *key;</div><div class='del'>-	struct ethhdr *eh;</div><div class='del'>-	int do_mic;</div><div class='del'>-</div><div class='del'>-	key = (struct orinoco_tkip_key *) priv-&gt;keys[priv-&gt;tx_key].key;</div><div class='del'>-</div><div class='del'>-	do_mic = ((priv-&gt;encode_alg == ORINOCO_ALG_TKIP) &amp;&amp;</div><div class='del'>-		  (key != NULL));</div><div class='del'>-</div><div class='del'>-	if (do_mic)</div><div class='del'>-		*tx_control |= (priv-&gt;tx_key &lt;&lt; HERMES_MIC_KEY_ID_SHIFT) |</div><div class='del'>-			HERMES_TXCTRL_MIC;</div><div class='del'>-</div><div class='del'>-	eh = (struct ethhdr *)skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	/* Encapsulate Ethernet-II frames */</div><div class='del'>-	if (ntohs(eh-&gt;h_proto) &gt; ETH_DATA_LEN) { /* Ethernet-II frame */</div><div class='del'>-		struct header_struct {</div><div class='del'>-			struct ethhdr eth;	/* 802.3 header */</div><div class='del'>-			u8 encap[6];		/* 802.2 header */</div><div class='del'>-		} __packed hdr;</div><div class='del'>-		int len = skb-&gt;len + sizeof(encaps_hdr) - (2 * ETH_ALEN);</div><div class='del'>-</div><div class='del'>-		if (skb_headroom(skb) &lt; ENCAPS_OVERHEAD) {</div><div class='del'>-			if (net_ratelimit())</div><div class='del'>-				printk(KERN_ERR</div><div class='del'>-				       "%s: Not enough headroom for 802.2 headers %d\n",</div><div class='del'>-				       dev-&gt;name, skb_headroom(skb));</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Fill in new header */</div><div class='del'>-		memcpy(&amp;hdr.eth, eh, 2 * ETH_ALEN);</div><div class='del'>-		hdr.eth.h_proto = htons(len);</div><div class='del'>-		memcpy(hdr.encap, encaps_hdr, sizeof(encaps_hdr));</div><div class='del'>-</div><div class='del'>-		/* Make room for the new header, and copy it in */</div><div class='del'>-		eh = skb_push(skb, ENCAPS_OVERHEAD);</div><div class='del'>-		memcpy(eh, &amp;hdr, sizeof(hdr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate Michael MIC */</div><div class='del'>-	if (do_mic) {</div><div class='del'>-		size_t len = skb-&gt;len - ETH_HLEN;</div><div class='del'>-		u8 *mic = &amp;mic_buf[0];</div><div class='del'>-</div><div class='del'>-		/* Have to write to an even address, so copy the spare</div><div class='del'>-		 * byte across */</div><div class='del'>-		if (skb-&gt;len % 2) {</div><div class='del'>-			*mic = skb-&gt;data[skb-&gt;len - 1];</div><div class='del'>-			mic++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		orinoco_mic(priv-&gt;tx_tfm_mic, key-&gt;tx_mic,</div><div class='del'>-			    eh-&gt;h_dest, eh-&gt;h_source, 0 /* priority */,</div><div class='del'>-			    skb-&gt;data + ETH_HLEN,</div><div class='del'>-			    len, mic);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(orinoco_process_xmit_skb);</div><div class='del'>-</div><div class='del'>-static netdev_tx_t orinoco_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int err = 0;</div><div class='del'>-	u16 txfid = priv-&gt;txfid;</div><div class='del'>-	int tx_control;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u8 mic_buf[MICHAEL_MIC_LEN + 1];</div><div class='del'>-</div><div class='del'>-	if (!netif_running(dev)) {</div><div class='del'>-		printk(KERN_ERR "%s: Tx on stopped device!\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		return NETDEV_TX_BUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (netif_queue_stopped(dev)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: Tx while transmitter busy!\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		return NETDEV_TX_BUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0) {</div><div class='del'>-		printk(KERN_ERR "%s: orinoco_xmit() called while hw_unavailable\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		return NETDEV_TX_BUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!netif_carrier_ok(dev) ||</div><div class='del'>-	    (priv-&gt;iw_mode == NL80211_IFTYPE_MONITOR)) {</div><div class='del'>-		/* Oops, the firmware hasn't established a connection,</div><div class='del'>-		   silently drop the packet (this seems to be the</div><div class='del'>-		   safest approach). */</div><div class='del'>-		goto drop;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check packet length */</div><div class='del'>-	if (skb-&gt;len &lt; ETH_HLEN)</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	tx_control = HERMES_TXCTRL_TX_OK | HERMES_TXCTRL_TX_EX;</div><div class='del'>-</div><div class='del'>-	err = orinoco_process_xmit_skb(skb, dev, priv, &amp;tx_control,</div><div class='del'>-				       &amp;mic_buf[0]);</div><div class='del'>-	if (err)</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;has_alt_txcntl) {</div><div class='del'>-		/* WPA enabled firmwares have tx_cntl at the end of</div><div class='del'>-		 * the 802.11 header.  So write zeroed descriptor and</div><div class='del'>-		 * 802.11 header at the same time</div><div class='del'>-		 */</div><div class='del'>-		char desc[HERMES_802_3_OFFSET];</div><div class='del'>-		__le16 *txcntl = (__le16 *) &amp;desc[HERMES_TXCNTL2_OFFSET];</div><div class='del'>-</div><div class='del'>-		memset(&amp;desc, 0, sizeof(desc));</div><div class='del'>-</div><div class='del'>-		*txcntl = cpu_to_le16(tx_control);</div><div class='del'>-		err = hw-&gt;ops-&gt;bap_pwrite(hw, USER_BAP, &amp;desc, sizeof(desc),</div><div class='del'>-					  txfid, 0);</div><div class='del'>-		if (err) {</div><div class='del'>-			if (net_ratelimit())</div><div class='del'>-				printk(KERN_ERR "%s: Error %d writing Tx "</div><div class='del'>-				       "descriptor to BAP\n", dev-&gt;name, err);</div><div class='del'>-			goto busy;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		struct hermes_tx_descriptor desc;</div><div class='del'>-</div><div class='del'>-		memset(&amp;desc, 0, sizeof(desc));</div><div class='del'>-</div><div class='del'>-		desc.tx_control = cpu_to_le16(tx_control);</div><div class='del'>-		err = hw-&gt;ops-&gt;bap_pwrite(hw, USER_BAP, &amp;desc, sizeof(desc),</div><div class='del'>-					  txfid, 0);</div><div class='del'>-		if (err) {</div><div class='del'>-			if (net_ratelimit())</div><div class='del'>-				printk(KERN_ERR "%s: Error %d writing Tx "</div><div class='del'>-				       "descriptor to BAP\n", dev-&gt;name, err);</div><div class='del'>-			goto busy;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Clear the 802.11 header and data length fields - some</div><div class='del'>-		 * firmwares (e.g. Lucent/Agere 8.xx) appear to get confused</div><div class='del'>-		 * if this isn't done. */</div><div class='del'>-		hermes_clear_words(hw, HERMES_DATA0,</div><div class='del'>-				   HERMES_802_3_OFFSET - HERMES_802_11_OFFSET);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = hw-&gt;ops-&gt;bap_pwrite(hw, USER_BAP, skb-&gt;data, skb-&gt;len,</div><div class='del'>-				  txfid, HERMES_802_3_OFFSET);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: Error %d writing packet to BAP\n",</div><div class='del'>-		       dev-&gt;name, err);</div><div class='del'>-		goto busy;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tx_control &amp; HERMES_TXCTRL_MIC) {</div><div class='del'>-		size_t offset = HERMES_802_3_OFFSET + skb-&gt;len;</div><div class='del'>-		size_t len = MICHAEL_MIC_LEN;</div><div class='del'>-</div><div class='del'>-		if (offset % 2) {</div><div class='del'>-			offset--;</div><div class='del'>-			len++;</div><div class='del'>-		}</div><div class='del'>-		err = hw-&gt;ops-&gt;bap_pwrite(hw, USER_BAP, &amp;mic_buf[0], len,</div><div class='del'>-					  txfid, offset);</div><div class='del'>-		if (err) {</div><div class='del'>-			printk(KERN_ERR "%s: Error %d writing MIC to BAP\n",</div><div class='del'>-			       dev-&gt;name, err);</div><div class='del'>-			goto busy;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Finally, we actually initiate the send */</div><div class='del'>-	netif_stop_queue(dev);</div><div class='del'>-</div><div class='del'>-	err = hw-&gt;ops-&gt;cmd_wait(hw, HERMES_CMD_TX | HERMES_CMD_RECL,</div><div class='del'>-				txfid, NULL);</div><div class='del'>-	if (err) {</div><div class='del'>-		netif_start_queue(dev);</div><div class='del'>-		if (net_ratelimit())</div><div class='del'>-			printk(KERN_ERR "%s: Error %d transmitting packet\n",</div><div class='del'>-				dev-&gt;name, err);</div><div class='del'>-		goto busy;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	stats-&gt;tx_bytes += HERMES_802_3_OFFSET + skb-&gt;len;</div><div class='del'>-	goto ok;</div><div class='del'>-</div><div class='del'>- drop:</div><div class='del'>-	stats-&gt;tx_errors++;</div><div class='del'>-	stats-&gt;tx_dropped++;</div><div class='del'>-</div><div class='del'>- ok:</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-	dev_kfree_skb(skb);</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='del'>-</div><div class='del'>- busy:</div><div class='del'>-	if (err == -EIO)</div><div class='del'>-		schedule_work(&amp;priv-&gt;reset_work);</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-	return NETDEV_TX_BUSY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __orinoco_ev_alloc(struct net_device *dev, struct hermes *hw)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	u16 fid = hermes_read_regn(hw, ALLOCFID);</div><div class='del'>-</div><div class='del'>-	if (fid != priv-&gt;txfid) {</div><div class='del'>-		if (fid != DUMMY_FID)</div><div class='del'>-			printk(KERN_WARNING "%s: Allocate event on unexpected fid (%04X)\n",</div><div class='del'>-			       dev-&gt;name, fid);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hermes_write_regn(hw, ALLOCFID, DUMMY_FID);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __orinoco_ev_tx(struct net_device *dev, struct hermes *hw)</div><div class='del'>-{</div><div class='del'>-	dev-&gt;stats.tx_packets++;</div><div class='del'>-</div><div class='del'>-	netif_wake_queue(dev);</div><div class='del'>-</div><div class='del'>-	hermes_write_regn(hw, TXCOMPLFID, DUMMY_FID);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __orinoco_ev_txexc(struct net_device *dev, struct hermes *hw)</div><div class='del'>-{</div><div class='del'>-	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='del'>-	u16 fid = hermes_read_regn(hw, TXCOMPLFID);</div><div class='del'>-	u16 status;</div><div class='del'>-	struct hermes_txexc_data hdr;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (fid == DUMMY_FID)</div><div class='del'>-		return; /* Nothing's really happened */</div><div class='del'>-</div><div class='del'>-	/* Read part of the frame header - we need status and addr1 */</div><div class='del'>-	err = hw-&gt;ops-&gt;bap_pread(hw, IRQ_BAP, &amp;hdr,</div><div class='del'>-				 sizeof(struct hermes_txexc_data),</div><div class='del'>-				 fid, 0);</div><div class='del'>-</div><div class='del'>-	hermes_write_regn(hw, TXCOMPLFID, DUMMY_FID);</div><div class='del'>-	stats-&gt;tx_errors++;</div><div class='del'>-</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_WARNING "%s: Unable to read descriptor on Tx error "</div><div class='del'>-		       "(FID=%04X error %d)\n",</div><div class='del'>-		       dev-&gt;name, fid, err);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DEBUG(1, "%s: Tx error, err %d (FID=%04X)\n", dev-&gt;name,</div><div class='del'>-	      err, fid);</div><div class='del'>-</div><div class='del'>-	/* We produce a TXDROP event only for retry or lifetime</div><div class='del'>-	 * exceeded, because that's the only status that really mean</div><div class='del'>-	 * that this particular node went away.</div><div class='del'>-	 * Other errors means that *we* screwed up. - Jean II */</div><div class='del'>-	status = le16_to_cpu(hdr.desc.status);</div><div class='del'>-	if (status &amp; (HERMES_TXSTAT_RETRYERR | HERMES_TXSTAT_AGEDERR)) {</div><div class='del'>-		union iwreq_data	wrqu;</div><div class='del'>-</div><div class='del'>-		/* Copy 802.11 dest address.</div><div class='del'>-		 * We use the 802.11 header because the frame may</div><div class='del'>-		 * not be 802.3 or may be mangled...</div><div class='del'>-		 * In Ad-Hoc mode, it will be the node address.</div><div class='del'>-		 * In managed mode, it will be most likely the AP addr</div><div class='del'>-		 * User space will figure out how to convert it to</div><div class='del'>-		 * whatever it needs (IP address or else).</div><div class='del'>-		 * - Jean II */</div><div class='del'>-		memcpy(wrqu.addr.sa_data, hdr.addr1, ETH_ALEN);</div><div class='del'>-		wrqu.addr.sa_family = ARPHRD_ETHER;</div><div class='del'>-</div><div class='del'>-		/* Send event to user space */</div><div class='del'>-		wireless_send_event(dev, IWEVTXDROP, &amp;wrqu, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	netif_wake_queue(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void orinoco_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-</div><div class='del'>-	printk(KERN_WARNING "%s: Tx timeout! "</div><div class='del'>-	       "ALLOCFID=%04x, TXCOMPLFID=%04x, EVSTAT=%04x\n",</div><div class='del'>-	       dev-&gt;name, hermes_read_regn(hw, ALLOCFID),</div><div class='del'>-	       hermes_read_regn(hw, TXCOMPLFID), hermes_read_regn(hw, EVSTAT));</div><div class='del'>-</div><div class='del'>-	stats-&gt;tx_errors++;</div><div class='del'>-</div><div class='del'>-	schedule_work(&amp;priv-&gt;reset_work);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(orinoco_tx_timeout);</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Rx path (data frames)                                            */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-/* Does the frame have a SNAP header indicating it should be</div><div class='del'>- * de-encapsulated to Ethernet-II? */</div><div class='del'>-static inline int is_ethersnap(void *_hdr)</div><div class='del'>-{</div><div class='del'>-	u8 *hdr = _hdr;</div><div class='del'>-</div><div class='del'>-	/* We de-encapsulate all packets which, a) have SNAP headers</div><div class='del'>-	 * (i.e. SSAP=DSAP=0xaa and CTRL=0x3 in the 802.2 LLC header</div><div class='del'>-	 * and where b) the OUI of the SNAP header is 00:00:00 or</div><div class='del'>-	 * 00:00:f8 - we need both because different APs appear to use</div><div class='del'>-	 * different OUIs for some reason */</div><div class='del'>-	return (memcmp(hdr, &amp;encaps_hdr, 5) == 0)</div><div class='del'>-		&amp;&amp; ((hdr[5] == 0x00) || (hdr[5] == 0xf8));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void orinoco_spy_gather(struct net_device *dev, u_char *mac,</div><div class='del'>-				      int level, int noise)</div><div class='del'>-{</div><div class='del'>-	struct iw_quality wstats;</div><div class='del'>-	wstats.level = level - 0x95;</div><div class='del'>-	wstats.noise = noise - 0x95;</div><div class='del'>-	wstats.qual = (level &gt; noise) ? (level - noise) : 0;</div><div class='del'>-	wstats.updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;</div><div class='del'>-	/* Update spy records */</div><div class='del'>-	wireless_spy_update(dev, mac, &amp;wstats);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void orinoco_stat_gather(struct net_device *dev,</div><div class='del'>-				struct sk_buff *skb,</div><div class='del'>-				struct hermes_rx_descriptor *desc)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-</div><div class='del'>-	/* Using spy support with lots of Rx packets, like in an</div><div class='del'>-	 * infrastructure (AP), will really slow down everything, because</div><div class='del'>-	 * the MAC address must be compared to each entry of the spy list.</div><div class='del'>-	 * If the user really asks for it (set some address in the</div><div class='del'>-	 * spy list), we do it, but he will pay the price.</div><div class='del'>-	 * Note that to get here, you need both WIRELESS_SPY</div><div class='del'>-	 * compiled in AND some addresses in the list !!!</div><div class='del'>-	 */</div><div class='del'>-	/* Note : gcc will optimise the whole section away if</div><div class='del'>-	 * WIRELESS_SPY is not defined... - Jean II */</div><div class='del'>-	if (SPY_NUMBER(priv)) {</div><div class='del'>-		orinoco_spy_gather(dev, skb_mac_header(skb) + ETH_ALEN,</div><div class='del'>-				   desc-&gt;signal, desc-&gt;silence);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * orinoco_rx_monitor - handle received monitor frames.</div><div class='del'>- *</div><div class='del'>- * Arguments:</div><div class='del'>- *	dev		network device</div><div class='del'>- *	rxfid		received FID</div><div class='del'>- *	desc		rx descriptor of the frame</div><div class='del'>- *</div><div class='del'>- * Call context: interrupt</div><div class='del'>- */</div><div class='del'>-static void orinoco_rx_monitor(struct net_device *dev, u16 rxfid,</div><div class='del'>-			       struct hermes_rx_descriptor *desc)</div><div class='del'>-{</div><div class='del'>-	u32 hdrlen = 30;	/* return full header by default */</div><div class='del'>-	u32 datalen = 0;</div><div class='del'>-	u16 fc;</div><div class='del'>-	int err;</div><div class='del'>-	int len;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-</div><div class='del'>-	len = le16_to_cpu(desc-&gt;data_len);</div><div class='del'>-</div><div class='del'>-	/* Determine the size of the header and the data */</div><div class='del'>-	fc = le16_to_cpu(desc-&gt;frame_ctl);</div><div class='del'>-	switch (fc &amp; IEEE80211_FCTL_FTYPE) {</div><div class='del'>-	case IEEE80211_FTYPE_DATA:</div><div class='del'>-		if ((fc &amp; IEEE80211_FCTL_TODS)</div><div class='del'>-		    &amp;&amp; (fc &amp; IEEE80211_FCTL_FROMDS))</div><div class='del'>-			hdrlen = 30;</div><div class='del'>-		else</div><div class='del'>-			hdrlen = 24;</div><div class='del'>-		datalen = len;</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_FTYPE_MGMT:</div><div class='del'>-		hdrlen = 24;</div><div class='del'>-		datalen = len;</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_FTYPE_CTL:</div><div class='del'>-		switch (fc &amp; IEEE80211_FCTL_STYPE) {</div><div class='del'>-		case IEEE80211_STYPE_PSPOLL:</div><div class='del'>-		case IEEE80211_STYPE_RTS:</div><div class='del'>-		case IEEE80211_STYPE_CFEND:</div><div class='del'>-		case IEEE80211_STYPE_CFENDACK:</div><div class='del'>-			hdrlen = 16;</div><div class='del'>-			break;</div><div class='del'>-		case IEEE80211_STYPE_CTS:</div><div class='del'>-		case IEEE80211_STYPE_ACK:</div><div class='del'>-			hdrlen = 10;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/* Unknown frame type */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* sanity check the length */</div><div class='del'>-	if (datalen &gt; IEEE80211_MAX_DATA_LEN + 12) {</div><div class='del'>-		printk(KERN_DEBUG "%s: oversized monitor frame, "</div><div class='del'>-		       "data length = %d\n", dev-&gt;name, datalen);</div><div class='del'>-		stats-&gt;rx_length_errors++;</div><div class='del'>-		goto update_stats;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb = dev_alloc_skb(hdrlen + datalen);</div><div class='del'>-	if (!skb) {</div><div class='del'>-		printk(KERN_WARNING "%s: Cannot allocate skb for monitor frame\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		goto update_stats;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Copy the 802.11 header to the skb */</div><div class='del'>-	skb_put_data(skb, &amp;(desc-&gt;frame_ctl), hdrlen);</div><div class='del'>-	skb_reset_mac_header(skb);</div><div class='del'>-</div><div class='del'>-	/* If any, copy the data from the card to the skb */</div><div class='del'>-	if (datalen &gt; 0) {</div><div class='del'>-		err = hw-&gt;ops-&gt;bap_pread(hw, IRQ_BAP, skb_put(skb, datalen),</div><div class='del'>-					 ALIGN(datalen, 2), rxfid,</div><div class='del'>-					 HERMES_802_2_OFFSET);</div><div class='del'>-		if (err) {</div><div class='del'>-			printk(KERN_ERR "%s: error %d reading monitor frame\n",</div><div class='del'>-			       dev-&gt;name, err);</div><div class='del'>-			goto drop;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb-&gt;dev = dev;</div><div class='del'>-	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='del'>-	skb-&gt;pkt_type = PACKET_OTHERHOST;</div><div class='del'>-	skb-&gt;protocol = cpu_to_be16(ETH_P_802_2);</div><div class='del'>-</div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += skb-&gt;len;</div><div class='del'>-</div><div class='del'>-	netif_rx(skb);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>- drop:</div><div class='del'>-	dev_kfree_skb_irq(skb);</div><div class='del'>- update_stats:</div><div class='del'>-	stats-&gt;rx_errors++;</div><div class='del'>-	stats-&gt;rx_dropped++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __orinoco_ev_rx(struct net_device *dev, struct hermes *hw)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='del'>-	struct iw_statistics *wstats = &amp;priv-&gt;wstats;</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-	u16 rxfid, status;</div><div class='del'>-	int length;</div><div class='del'>-	struct hermes_rx_descriptor *desc;</div><div class='del'>-	struct orinoco_rx_data *rx_data;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	desc = kmalloc(sizeof(*desc), GFP_ATOMIC);</div><div class='del'>-	if (!desc)</div><div class='del'>-		goto update_stats;</div><div class='del'>-</div><div class='del'>-	rxfid = hermes_read_regn(hw, RXFID);</div><div class='del'>-</div><div class='del'>-	err = hw-&gt;ops-&gt;bap_pread(hw, IRQ_BAP, desc, sizeof(*desc),</div><div class='del'>-				 rxfid, 0);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: error %d reading Rx descriptor. "</div><div class='del'>-		       "Frame dropped.\n", dev-&gt;name, err);</div><div class='del'>-		goto update_stats;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = le16_to_cpu(desc-&gt;status);</div><div class='del'>-</div><div class='del'>-	if (status &amp; HERMES_RXSTAT_BADCRC) {</div><div class='del'>-		DEBUG(1, "%s: Bad CRC on Rx. Frame dropped.\n",</div><div class='del'>-		      dev-&gt;name);</div><div class='del'>-		stats-&gt;rx_crc_errors++;</div><div class='del'>-		goto update_stats;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Handle frames in monitor mode */</div><div class='del'>-	if (priv-&gt;iw_mode == NL80211_IFTYPE_MONITOR) {</div><div class='del'>-		orinoco_rx_monitor(dev, rxfid, desc);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (status &amp; HERMES_RXSTAT_UNDECRYPTABLE) {</div><div class='del'>-		DEBUG(1, "%s: Undecryptable frame on Rx. Frame dropped.\n",</div><div class='del'>-		      dev-&gt;name);</div><div class='del'>-		wstats-&gt;discard.code++;</div><div class='del'>-		goto update_stats;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	length = le16_to_cpu(desc-&gt;data_len);</div><div class='del'>-</div><div class='del'>-	/* Sanity checks */</div><div class='del'>-	if (length &lt; 3) { /* No for even an 802.2 LLC header */</div><div class='del'>-		/* At least on Symbol firmware with PCF we get quite a</div><div class='del'>-		   lot of these legitimately - Poll frames with no</div><div class='del'>-		   data. */</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	if (length &gt; IEEE80211_MAX_DATA_LEN) {</div><div class='del'>-		printk(KERN_WARNING "%s: Oversized frame received (%d bytes)\n",</div><div class='del'>-		       dev-&gt;name, length);</div><div class='del'>-		stats-&gt;rx_length_errors++;</div><div class='del'>-		goto update_stats;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Payload size does not include Michael MIC. Increase payload</div><div class='del'>-	 * size to read it together with the data. */</div><div class='del'>-	if (status &amp; HERMES_RXSTAT_MIC)</div><div class='del'>-		length += MICHAEL_MIC_LEN;</div><div class='del'>-</div><div class='del'>-	/* We need space for the packet data itself, plus an ethernet</div><div class='del'>-	   header, plus 2 bytes so we can align the IP header on a</div><div class='del'>-	   32bit boundary, plus 1 byte so we can read in odd length</div><div class='del'>-	   packets from the card, which has an IO granularity of 16</div><div class='del'>-	   bits */</div><div class='del'>-	skb = dev_alloc_skb(length + ETH_HLEN + 2 + 1);</div><div class='del'>-	if (!skb) {</div><div class='del'>-		printk(KERN_WARNING "%s: Can't allocate skb for Rx\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		goto update_stats;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We'll prepend the header, so reserve space for it.  The worst</div><div class='del'>-	   case is no decapsulation, when 802.3 header is prepended and</div><div class='del'>-	   nothing is removed.  2 is for aligning the IP header.  */</div><div class='del'>-	skb_reserve(skb, ETH_HLEN + 2);</div><div class='del'>-</div><div class='del'>-	err = hw-&gt;ops-&gt;bap_pread(hw, IRQ_BAP, skb_put(skb, length),</div><div class='del'>-				 ALIGN(length, 2), rxfid,</div><div class='del'>-				 HERMES_802_2_OFFSET);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: error %d reading frame. "</div><div class='del'>-		       "Frame dropped.\n", dev-&gt;name, err);</div><div class='del'>-		goto drop;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Add desc and skb to rx queue */</div><div class='del'>-	rx_data = kzalloc(sizeof(*rx_data), GFP_ATOMIC);</div><div class='del'>-	if (!rx_data)</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	rx_data-&gt;desc = desc;</div><div class='del'>-	rx_data-&gt;skb = skb;</div><div class='del'>-	list_add_tail(&amp;rx_data-&gt;list, &amp;priv-&gt;rx_list);</div><div class='del'>-	tasklet_schedule(&amp;priv-&gt;rx_tasklet);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-drop:</div><div class='del'>-	dev_kfree_skb_irq(skb);</div><div class='del'>-update_stats:</div><div class='del'>-	stats-&gt;rx_errors++;</div><div class='del'>-	stats-&gt;rx_dropped++;</div><div class='del'>-out:</div><div class='del'>-	kfree(desc);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(__orinoco_ev_rx);</div><div class='del'>-</div><div class='del'>-static void orinoco_rx(struct net_device *dev,</div><div class='del'>-		       struct hermes_rx_descriptor *desc,</div><div class='del'>-		       struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='del'>-	u16 status, fc;</div><div class='del'>-	int length;</div><div class='del'>-	struct ethhdr *hdr;</div><div class='del'>-</div><div class='del'>-	status = le16_to_cpu(desc-&gt;status);</div><div class='del'>-	length = le16_to_cpu(desc-&gt;data_len);</div><div class='del'>-	fc = le16_to_cpu(desc-&gt;frame_ctl);</div><div class='del'>-</div><div class='del'>-	/* Calculate and check MIC */</div><div class='del'>-	if (status &amp; HERMES_RXSTAT_MIC) {</div><div class='del'>-		struct orinoco_tkip_key *key;</div><div class='del'>-		int key_id = ((status &amp; HERMES_RXSTAT_MIC_KEY_ID) &gt;&gt;</div><div class='del'>-			      HERMES_MIC_KEY_ID_SHIFT);</div><div class='del'>-		u8 mic[MICHAEL_MIC_LEN];</div><div class='del'>-		u8 *rxmic;</div><div class='del'>-		u8 *src = (fc &amp; IEEE80211_FCTL_FROMDS) ?</div><div class='del'>-			desc-&gt;addr3 : desc-&gt;addr2;</div><div class='del'>-</div><div class='del'>-		/* Extract Michael MIC from payload */</div><div class='del'>-		rxmic = skb-&gt;data + skb-&gt;len - MICHAEL_MIC_LEN;</div><div class='del'>-</div><div class='del'>-		skb_trim(skb, skb-&gt;len - MICHAEL_MIC_LEN);</div><div class='del'>-		length -= MICHAEL_MIC_LEN;</div><div class='del'>-</div><div class='del'>-		key = (struct orinoco_tkip_key *) priv-&gt;keys[key_id].key;</div><div class='del'>-</div><div class='del'>-		if (!key) {</div><div class='del'>-			printk(KERN_WARNING "%s: Received encrypted frame from "</div><div class='del'>-			       "%pM using key %i, but key is not installed\n",</div><div class='del'>-			       dev-&gt;name, src, key_id);</div><div class='del'>-			goto drop;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		orinoco_mic(priv-&gt;rx_tfm_mic, key-&gt;rx_mic, desc-&gt;addr1, src,</div><div class='del'>-			    0, /* priority or QoS? */</div><div class='del'>-			    skb-&gt;data, skb-&gt;len, &amp;mic[0]);</div><div class='del'>-</div><div class='del'>-		if (memcmp(mic, rxmic,</div><div class='del'>-			   MICHAEL_MIC_LEN)) {</div><div class='del'>-			union iwreq_data wrqu;</div><div class='del'>-			struct iw_michaelmicfailure wxmic;</div><div class='del'>-</div><div class='del'>-			printk(KERN_WARNING "%s: "</div><div class='del'>-			       "Invalid Michael MIC in data frame from %pM, "</div><div class='del'>-			       "using key %i\n",</div><div class='del'>-			       dev-&gt;name, src, key_id);</div><div class='del'>-</div><div class='del'>-			/* TODO: update stats */</div><div class='del'>-</div><div class='del'>-			/* Notify userspace */</div><div class='del'>-			memset(&amp;wxmic, 0, sizeof(wxmic));</div><div class='del'>-			wxmic.flags = key_id &amp; IW_MICFAILURE_KEY_ID;</div><div class='del'>-			wxmic.flags |= (desc-&gt;addr1[0] &amp; 1) ?</div><div class='del'>-				IW_MICFAILURE_GROUP : IW_MICFAILURE_PAIRWISE;</div><div class='del'>-			wxmic.src_addr.sa_family = ARPHRD_ETHER;</div><div class='del'>-			memcpy(wxmic.src_addr.sa_data, src, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-			(void) orinoco_hw_get_tkip_iv(priv, key_id,</div><div class='del'>-						      &amp;wxmic.tsc[0]);</div><div class='del'>-</div><div class='del'>-			memset(&amp;wrqu, 0, sizeof(wrqu));</div><div class='del'>-			wrqu.data.length = sizeof(wxmic);</div><div class='del'>-			wireless_send_event(dev, IWEVMICHAELMICFAILURE, &amp;wrqu,</div><div class='del'>-					    (char *) &amp;wxmic);</div><div class='del'>-</div><div class='del'>-			goto drop;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Handle decapsulation</div><div class='del'>-	 * In most cases, the firmware tell us about SNAP frames.</div><div class='del'>-	 * For some reason, the SNAP frames sent by LinkSys APs</div><div class='del'>-	 * are not properly recognised by most firmwares.</div><div class='del'>-	 * So, check ourselves */</div><div class='del'>-	if (length &gt;= ENCAPS_OVERHEAD &amp;&amp;</div><div class='del'>-	    (((status &amp; HERMES_RXSTAT_MSGTYPE) == HERMES_RXSTAT_1042) ||</div><div class='del'>-	     ((status &amp; HERMES_RXSTAT_MSGTYPE) == HERMES_RXSTAT_TUNNEL) ||</div><div class='del'>-	     is_ethersnap(skb-&gt;data))) {</div><div class='del'>-		/* These indicate a SNAP within 802.2 LLC within</div><div class='del'>-		   802.11 frame which we'll need to de-encapsulate to</div><div class='del'>-		   the original EthernetII frame. */</div><div class='del'>-		hdr = skb_push(skb, ETH_HLEN - ENCAPS_OVERHEAD);</div><div class='del'>-	} else {</div><div class='del'>-		/* 802.3 frame - prepend 802.3 header as is */</div><div class='del'>-		hdr = skb_push(skb, ETH_HLEN);</div><div class='del'>-		hdr-&gt;h_proto = htons(length);</div><div class='del'>-	}</div><div class='del'>-	memcpy(hdr-&gt;h_dest, desc-&gt;addr1, ETH_ALEN);</div><div class='del'>-	if (fc &amp; IEEE80211_FCTL_FROMDS)</div><div class='del'>-		memcpy(hdr-&gt;h_source, desc-&gt;addr3, ETH_ALEN);</div><div class='del'>-	else</div><div class='del'>-		memcpy(hdr-&gt;h_source, desc-&gt;addr2, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='del'>-	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='del'>-	if (fc &amp; IEEE80211_FCTL_TODS)</div><div class='del'>-		skb-&gt;pkt_type = PACKET_OTHERHOST;</div><div class='del'>-</div><div class='del'>-	/* Process the wireless stats if needed */</div><div class='del'>-	orinoco_stat_gather(dev, skb, desc);</div><div class='del'>-</div><div class='del'>-	/* Pass the packet to the networking stack */</div><div class='del'>-	netif_rx(skb);</div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += length;</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>- drop:</div><div class='del'>-	dev_kfree_skb(skb);</div><div class='del'>-	stats-&gt;rx_errors++;</div><div class='del'>-	stats-&gt;rx_dropped++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void orinoco_rx_isr_tasklet(struct tasklet_struct *t)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = from_tasklet(priv, t, rx_tasklet);</div><div class='del'>-	struct net_device *dev = priv-&gt;ndev;</div><div class='del'>-	struct orinoco_rx_data *rx_data, *temp;</div><div class='del'>-	struct hermes_rx_descriptor *desc;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* orinoco_rx requires the driver lock, and we also need to</div><div class='del'>-	 * protect priv-&gt;rx_list, so just hold the lock over the</div><div class='del'>-	 * lot.</div><div class='del'>-	 *</div><div class='del'>-	 * If orinoco_lock fails, we've unplugged the card. In this</div><div class='del'>-	 * case just abort. */</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* extract desc and skb from queue */</div><div class='del'>-	list_for_each_entry_safe(rx_data, temp, &amp;priv-&gt;rx_list, list) {</div><div class='del'>-		desc = rx_data-&gt;desc;</div><div class='del'>-		skb = rx_data-&gt;skb;</div><div class='del'>-		list_del(&amp;rx_data-&gt;list);</div><div class='del'>-		kfree(rx_data);</div><div class='del'>-</div><div class='del'>-		orinoco_rx(dev, desc, skb);</div><div class='del'>-</div><div class='del'>-		kfree(desc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Rx path (info frames)                                            */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-static void print_linkstatus(struct net_device *dev, u16 status)</div><div class='del'>-{</div><div class='del'>-	char *s;</div><div class='del'>-</div><div class='del'>-	if (suppress_linkstatus)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case HERMES_LINKSTATUS_NOT_CONNECTED:</div><div class='del'>-		s = "Not Connected";</div><div class='del'>-		break;</div><div class='del'>-	case HERMES_LINKSTATUS_CONNECTED:</div><div class='del'>-		s = "Connected";</div><div class='del'>-		break;</div><div class='del'>-	case HERMES_LINKSTATUS_DISCONNECTED:</div><div class='del'>-		s = "Disconnected";</div><div class='del'>-		break;</div><div class='del'>-	case HERMES_LINKSTATUS_AP_CHANGE:</div><div class='del'>-		s = "AP Changed";</div><div class='del'>-		break;</div><div class='del'>-	case HERMES_LINKSTATUS_AP_OUT_OF_RANGE:</div><div class='del'>-		s = "AP Out of Range";</div><div class='del'>-		break;</div><div class='del'>-	case HERMES_LINKSTATUS_AP_IN_RANGE:</div><div class='del'>-		s = "AP In Range";</div><div class='del'>-		break;</div><div class='del'>-	case HERMES_LINKSTATUS_ASSOC_FAILED:</div><div class='del'>-		s = "Association Failed";</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		s = "UNKNOWN";</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: New link status: %s (%04x)\n",</div><div class='del'>-	       dev-&gt;name, s, status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Search scan results for requested BSSID, join it if found */</div><div class='del'>-static void orinoco_join_ap(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv =</div><div class='del'>-		container_of(work, struct orinoco_private, join_work);</div><div class='del'>-	struct net_device *dev = priv-&gt;ndev;</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int err;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct join_req {</div><div class='del'>-		u8 bssid[ETH_ALEN];</div><div class='del'>-		__le16 channel;</div><div class='del'>-	} __packed req;</div><div class='del'>-	const int atom_len = offsetof(struct prism2_scan_apinfo, atim);</div><div class='del'>-	struct prism2_scan_apinfo *atom = NULL;</div><div class='del'>-	int offset = 4;</div><div class='del'>-	int found = 0;</div><div class='del'>-	u8 *buf;</div><div class='del'>-	u16 len;</div><div class='del'>-</div><div class='del'>-	/* Allocate buffer for scan results */</div><div class='del'>-	buf = kmalloc(MAX_SCAN_LEN, GFP_KERNEL);</div><div class='del'>-	if (!buf)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		goto fail_lock;</div><div class='del'>-</div><div class='del'>-	/* Sanity checks in case user changed something in the meantime */</div><div class='del'>-	if (!priv-&gt;bssid_fixed)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (strlen(priv-&gt;desired_essid) == 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Read scan results from the firmware */</div><div class='del'>-	err = hw-&gt;ops-&gt;read_ltv(hw, USER_BAP,</div><div class='del'>-				HERMES_RID_SCANRESULTSTABLE,</div><div class='del'>-				MAX_SCAN_LEN, &amp;len, buf);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: Cannot read scan results\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	len = HERMES_RECLEN_TO_BYTES(len);</div><div class='del'>-</div><div class='del'>-	/* Go through the scan results looking for the channel of the AP</div><div class='del'>-	 * we were requested to join */</div><div class='del'>-	for (; offset + atom_len &lt;= len; offset += atom_len) {</div><div class='del'>-		atom = (struct prism2_scan_apinfo *) (buf + offset);</div><div class='del'>-		if (memcmp(&amp;atom-&gt;bssid, priv-&gt;desired_bssid, ETH_ALEN) == 0) {</div><div class='del'>-			found = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!found) {</div><div class='del'>-		DEBUG(1, "%s: Requested AP not found in scan results\n",</div><div class='del'>-		      dev-&gt;name);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(req.bssid, priv-&gt;desired_bssid, ETH_ALEN);</div><div class='del'>-	req.channel = atom-&gt;channel;	/* both are little-endian */</div><div class='del'>-	err = HERMES_WRITE_RECORD(hw, USER_BAP, HERMES_RID_CNFJOINREQUEST,</div><div class='del'>-				  &amp;req);</div><div class='del'>-	if (err)</div><div class='del'>-		printk(KERN_ERR "%s: Error issuing join request\n", dev-&gt;name);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>- fail_lock:</div><div class='del'>-	kfree(buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Send new BSSID to userspace */</div><div class='del'>-static void orinoco_send_bssid_wevent(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = priv-&gt;ndev;</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	union iwreq_data wrqu;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = hw-&gt;ops-&gt;read_ltv(hw, USER_BAP, HERMES_RID_CURRENTBSSID,</div><div class='del'>-				ETH_ALEN, NULL, wrqu.ap_addr.sa_data);</div><div class='del'>-	if (err != 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	wrqu.ap_addr.sa_family = ARPHRD_ETHER;</div><div class='del'>-</div><div class='del'>-	/* Send event to user space */</div><div class='del'>-	wireless_send_event(dev, SIOCGIWAP, &amp;wrqu, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void orinoco_send_assocreqie_wevent(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = priv-&gt;ndev;</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	union iwreq_data wrqu;</div><div class='del'>-	int err;</div><div class='del'>-	u8 buf[88];</div><div class='del'>-	u8 *ie;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;has_wpa)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	err = hw-&gt;ops-&gt;read_ltv(hw, USER_BAP, HERMES_RID_CURRENT_ASSOC_REQ_INFO,</div><div class='del'>-				sizeof(buf), NULL, &amp;buf);</div><div class='del'>-	if (err != 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ie = orinoco_get_wpa_ie(buf, sizeof(buf));</div><div class='del'>-	if (ie) {</div><div class='del'>-		int rem = sizeof(buf) - (ie - &amp;buf[0]);</div><div class='del'>-		wrqu.data.length = ie[1] + 2;</div><div class='del'>-		if (wrqu.data.length &gt; rem)</div><div class='del'>-			wrqu.data.length = rem;</div><div class='del'>-</div><div class='del'>-		if (wrqu.data.length)</div><div class='del'>-			/* Send event to user space */</div><div class='del'>-			wireless_send_event(dev, IWEVASSOCREQIE, &amp;wrqu, ie);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void orinoco_send_assocrespie_wevent(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = priv-&gt;ndev;</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	union iwreq_data wrqu;</div><div class='del'>-	int err;</div><div class='del'>-	u8 buf[88]; /* TODO: verify max size or IW_GENERIC_IE_MAX */</div><div class='del'>-	u8 *ie;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;has_wpa)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	err = hw-&gt;ops-&gt;read_ltv(hw, USER_BAP,</div><div class='del'>-				HERMES_RID_CURRENT_ASSOC_RESP_INFO,</div><div class='del'>-				sizeof(buf), NULL, &amp;buf);</div><div class='del'>-	if (err != 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ie = orinoco_get_wpa_ie(buf, sizeof(buf));</div><div class='del'>-	if (ie) {</div><div class='del'>-		int rem = sizeof(buf) - (ie - &amp;buf[0]);</div><div class='del'>-		wrqu.data.length = ie[1] + 2;</div><div class='del'>-		if (wrqu.data.length &gt; rem)</div><div class='del'>-			wrqu.data.length = rem;</div><div class='del'>-</div><div class='del'>-		if (wrqu.data.length)</div><div class='del'>-			/* Send event to user space */</div><div class='del'>-			wireless_send_event(dev, IWEVASSOCRESPIE, &amp;wrqu, ie);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void orinoco_send_wevents(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv =</div><div class='del'>-		container_of(work, struct orinoco_private, wevent_work);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	orinoco_send_assocreqie_wevent(priv);</div><div class='del'>-	orinoco_send_assocrespie_wevent(priv);</div><div class='del'>-	orinoco_send_bssid_wevent(priv);</div><div class='del'>-</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void qbuf_scan(struct orinoco_private *priv, void *buf,</div><div class='del'>-		      int len, int type)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_scan_data *sd;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	sd = kmalloc(sizeof(*sd), GFP_ATOMIC);</div><div class='del'>-	if (!sd)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	sd-&gt;buf = buf;</div><div class='del'>-	sd-&gt;len = len;</div><div class='del'>-	sd-&gt;type = type;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;scan_lock, flags);</div><div class='del'>-	list_add_tail(&amp;sd-&gt;list, &amp;priv-&gt;scan_list);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;scan_lock, flags);</div><div class='del'>-</div><div class='del'>-	schedule_work(&amp;priv-&gt;process_scan);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void qabort_scan(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_scan_data *sd;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	sd = kmalloc(sizeof(*sd), GFP_ATOMIC);</div><div class='del'>-	if (!sd)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	sd-&gt;len = -1; /* Abort */</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;scan_lock, flags);</div><div class='del'>-	list_add_tail(&amp;sd-&gt;list, &amp;priv-&gt;scan_list);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;scan_lock, flags);</div><div class='del'>-</div><div class='del'>-	schedule_work(&amp;priv-&gt;process_scan);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void orinoco_process_scan_results(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv =</div><div class='del'>-		container_of(work, struct orinoco_private, process_scan);</div><div class='del'>-	struct orinoco_scan_data *sd, *temp;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	void *buf;</div><div class='del'>-	int len;</div><div class='del'>-	int type;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;scan_lock, flags);</div><div class='del'>-	list_for_each_entry_safe(sd, temp, &amp;priv-&gt;scan_list, list) {</div><div class='del'>-</div><div class='del'>-		buf = sd-&gt;buf;</div><div class='del'>-		len = sd-&gt;len;</div><div class='del'>-		type = sd-&gt;type;</div><div class='del'>-</div><div class='del'>-		list_del(&amp;sd-&gt;list);</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;scan_lock, flags);</div><div class='del'>-		kfree(sd);</div><div class='del'>-</div><div class='del'>-		if (len &gt; 0) {</div><div class='del'>-			if (type == HERMES_INQ_CHANNELINFO)</div><div class='del'>-				orinoco_add_extscan_result(priv, buf, len);</div><div class='del'>-			else</div><div class='del'>-				orinoco_add_hostscan_results(priv, buf, len);</div><div class='del'>-</div><div class='del'>-			kfree(buf);</div><div class='del'>-		} else {</div><div class='del'>-			/* Either abort or complete the scan */</div><div class='del'>-			orinoco_scan_done(priv, (len &lt; 0));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;priv-&gt;scan_lock, flags);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;scan_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __orinoco_ev_info(struct net_device *dev, struct hermes *hw)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	u16 infofid;</div><div class='del'>-	struct {</div><div class='del'>-		__le16 len;</div><div class='del'>-		__le16 type;</div><div class='del'>-	} __packed info;</div><div class='del'>-	int len, type;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* This is an answer to an INQUIRE command that we did earlier,</div><div class='del'>-	 * or an information "event" generated by the card</div><div class='del'>-	 * The controller return to us a pseudo frame containing</div><div class='del'>-	 * the information in question - Jean II */</div><div class='del'>-	infofid = hermes_read_regn(hw, INFOFID);</div><div class='del'>-</div><div class='del'>-	/* Read the info frame header - don't try too hard */</div><div class='del'>-	err = hw-&gt;ops-&gt;bap_pread(hw, IRQ_BAP, &amp;info, sizeof(info),</div><div class='del'>-				 infofid, 0);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: error %d reading info frame. "</div><div class='del'>-		       "Frame dropped.\n", dev-&gt;name, err);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	len = HERMES_RECLEN_TO_BYTES(le16_to_cpu(info.len));</div><div class='del'>-	type = le16_to_cpu(info.type);</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case HERMES_INQ_TALLIES: {</div><div class='del'>-		struct hermes_tallies_frame tallies;</div><div class='del'>-		struct iw_statistics *wstats = &amp;priv-&gt;wstats;</div><div class='del'>-</div><div class='del'>-		if (len &gt; sizeof(tallies)) {</div><div class='del'>-			printk(KERN_WARNING "%s: Tallies frame too long (%d bytes)\n",</div><div class='del'>-			       dev-&gt;name, len);</div><div class='del'>-			len = sizeof(tallies);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err = hw-&gt;ops-&gt;bap_pread(hw, IRQ_BAP, &amp;tallies, len,</div><div class='del'>-					 infofid, sizeof(info));</div><div class='del'>-		if (err)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* Increment our various counters */</div><div class='del'>-		/* wstats-&gt;discard.nwid - no wrong BSSID stuff */</div><div class='del'>-		wstats-&gt;discard.code +=</div><div class='del'>-			le16_to_cpu(tallies.RxWEPUndecryptable);</div><div class='del'>-		if (len == sizeof(tallies))</div><div class='del'>-			wstats-&gt;discard.code +=</div><div class='del'>-				le16_to_cpu(tallies.RxDiscards_WEPICVError) +</div><div class='del'>-				le16_to_cpu(tallies.RxDiscards_WEPExcluded);</div><div class='del'>-		wstats-&gt;discard.misc +=</div><div class='del'>-			le16_to_cpu(tallies.TxDiscardsWrongSA);</div><div class='del'>-		wstats-&gt;discard.fragment +=</div><div class='del'>-			le16_to_cpu(tallies.RxMsgInBadMsgFragments);</div><div class='del'>-		wstats-&gt;discard.retries +=</div><div class='del'>-			le16_to_cpu(tallies.TxRetryLimitExceeded);</div><div class='del'>-		/* wstats-&gt;miss.beacon - no match */</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-	case HERMES_INQ_LINKSTATUS: {</div><div class='del'>-		struct hermes_linkstatus linkstatus;</div><div class='del'>-		u16 newstatus;</div><div class='del'>-		int connected;</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;iw_mode == NL80211_IFTYPE_MONITOR)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (len != sizeof(linkstatus)) {</div><div class='del'>-			printk(KERN_WARNING "%s: Unexpected size for linkstatus frame (%d bytes)\n",</div><div class='del'>-			       dev-&gt;name, len);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err = hw-&gt;ops-&gt;bap_pread(hw, IRQ_BAP, &amp;linkstatus, len,</div><div class='del'>-					 infofid, sizeof(info));</div><div class='del'>-		if (err)</div><div class='del'>-			break;</div><div class='del'>-		newstatus = le16_to_cpu(linkstatus.linkstatus);</div><div class='del'>-</div><div class='del'>-		/* Symbol firmware uses "out of range" to signal that</div><div class='del'>-		 * the hostscan frame can be requested.  */</div><div class='del'>-		if (newstatus == HERMES_LINKSTATUS_AP_OUT_OF_RANGE &amp;&amp;</div><div class='del'>-		    priv-&gt;firmware_type == FIRMWARE_TYPE_SYMBOL &amp;&amp;</div><div class='del'>-		    priv-&gt;has_hostscan &amp;&amp; priv-&gt;scan_request) {</div><div class='del'>-			hermes_inquire(hw, HERMES_INQ_HOSTSCAN_SYMBOL);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		connected = (newstatus == HERMES_LINKSTATUS_CONNECTED)</div><div class='del'>-			|| (newstatus == HERMES_LINKSTATUS_AP_CHANGE)</div><div class='del'>-			|| (newstatus == HERMES_LINKSTATUS_AP_IN_RANGE);</div><div class='del'>-</div><div class='del'>-		if (connected)</div><div class='del'>-			netif_carrier_on(dev);</div><div class='del'>-		else if (!ignore_disconnect)</div><div class='del'>-			netif_carrier_off(dev);</div><div class='del'>-</div><div class='del'>-		if (newstatus != priv-&gt;last_linkstatus) {</div><div class='del'>-			priv-&gt;last_linkstatus = newstatus;</div><div class='del'>-			print_linkstatus(dev, newstatus);</div><div class='del'>-			/* The info frame contains only one word which is the</div><div class='del'>-			 * status (see hermes.h). The status is pretty boring</div><div class='del'>-			 * in itself, that's why we export the new BSSID...</div><div class='del'>-			 * Jean II */</div><div class='del'>-			schedule_work(&amp;priv-&gt;wevent_work);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-	case HERMES_INQ_SCAN:</div><div class='del'>-		if (!priv-&gt;scan_request &amp;&amp; priv-&gt;bssid_fixed &amp;&amp;</div><div class='del'>-		    priv-&gt;firmware_type == FIRMWARE_TYPE_INTERSIL) {</div><div class='del'>-			schedule_work(&amp;priv-&gt;join_work);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		fallthrough;</div><div class='del'>-	case HERMES_INQ_HOSTSCAN:</div><div class='del'>-	case HERMES_INQ_HOSTSCAN_SYMBOL: {</div><div class='del'>-		/* Result of a scanning. Contains information about</div><div class='del'>-		 * cells in the vicinity - Jean II */</div><div class='del'>-		unsigned char *buf;</div><div class='del'>-</div><div class='del'>-		/* Sanity check */</div><div class='del'>-		if (len &gt; 4096) {</div><div class='del'>-			printk(KERN_WARNING "%s: Scan results too large (%d bytes)\n",</div><div class='del'>-			       dev-&gt;name, len);</div><div class='del'>-			qabort_scan(priv);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Allocate buffer for results */</div><div class='del'>-		buf = kmalloc(len, GFP_ATOMIC);</div><div class='del'>-		if (buf == NULL) {</div><div class='del'>-			/* No memory, so can't printk()... */</div><div class='del'>-			qabort_scan(priv);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Read scan data */</div><div class='del'>-		err = hw-&gt;ops-&gt;bap_pread(hw, IRQ_BAP, (void *) buf, len,</div><div class='del'>-					 infofid, sizeof(info));</div><div class='del'>-		if (err) {</div><div class='del'>-			kfree(buf);</div><div class='del'>-			qabort_scan(priv);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-#ifdef ORINOCO_DEBUG</div><div class='del'>-		{</div><div class='del'>-			int	i;</div><div class='del'>-			printk(KERN_DEBUG "Scan result [%02X", buf[0]);</div><div class='del'>-			for (i = 1; i &lt; (len * 2); i++)</div><div class='del'>-				printk(":%02X", buf[i]);</div><div class='del'>-			printk("]\n");</div><div class='del'>-		}</div><div class='del'>-#endif	/* ORINOCO_DEBUG */</div><div class='del'>-</div><div class='del'>-		qbuf_scan(priv, buf, len, type);</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-	case HERMES_INQ_CHANNELINFO:</div><div class='del'>-	{</div><div class='del'>-		struct agere_ext_scan_info *bss;</div><div class='del'>-</div><div class='del'>-		if (!priv-&gt;scan_request) {</div><div class='del'>-			printk(KERN_DEBUG "%s: Got chaninfo without scan, "</div><div class='del'>-			       "len=%d\n", dev-&gt;name, len);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* An empty result indicates that the scan is complete */</div><div class='del'>-		if (len == 0) {</div><div class='del'>-			qbuf_scan(priv, NULL, len, type);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Sanity check */</div><div class='del'>-		else if (len &lt; (offsetof(struct agere_ext_scan_info,</div><div class='del'>-					   data) + 2)) {</div><div class='del'>-			/* Drop this result now so we don't have to</div><div class='del'>-			 * keep checking later */</div><div class='del'>-			printk(KERN_WARNING</div><div class='del'>-			       "%s: Ext scan results too short (%d bytes)\n",</div><div class='del'>-			       dev-&gt;name, len);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bss = kmalloc(len, GFP_ATOMIC);</div><div class='del'>-		if (bss == NULL)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* Read scan data */</div><div class='del'>-		err = hw-&gt;ops-&gt;bap_pread(hw, IRQ_BAP, (void *) bss, len,</div><div class='del'>-					 infofid, sizeof(info));</div><div class='del'>-		if (err)</div><div class='del'>-			kfree(bss);</div><div class='del'>-		else</div><div class='del'>-			qbuf_scan(priv, bss, len, type);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case HERMES_INQ_SEC_STAT_AGERE:</div><div class='del'>-		/* Security status (Agere specific) */</div><div class='del'>-		/* Ignore this frame for now */</div><div class='del'>-		if (priv-&gt;firmware_type == FIRMWARE_TYPE_AGERE)</div><div class='del'>-			break;</div><div class='del'>-		fallthrough;</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_DEBUG "%s: Unknown information frame received: "</div><div class='del'>-		       "type 0x%04x, length %d\n", dev-&gt;name, type, len);</div><div class='del'>-		/* We don't actually do anything about it */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(__orinoco_ev_info);</div><div class='del'>-</div><div class='del'>-static void __orinoco_ev_infdrop(struct net_device *dev, struct hermes *hw)</div><div class='del'>-{</div><div class='del'>-	if (net_ratelimit())</div><div class='del'>-		printk(KERN_DEBUG "%s: Information frame lost.\n", dev-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Internal hardware control routines                               */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-static int __orinoco_up(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = priv-&gt;ndev;</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	netif_carrier_off(dev); /* just to make sure */</div><div class='del'>-</div><div class='del'>-	err = __orinoco_commit(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: Error %d configuring card\n",</div><div class='del'>-		       dev-&gt;name, err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Fire things up again */</div><div class='del'>-	hermes_set_irqmask(hw, ORINOCO_INTEN);</div><div class='del'>-	err = hermes_enable_port(hw, 0);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: Error %d enabling MAC port\n",</div><div class='del'>-		       dev-&gt;name, err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	netif_start_queue(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __orinoco_down(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = priv-&gt;ndev;</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	netif_stop_queue(dev);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;hw_unavailable) {</div><div class='del'>-		if (!priv-&gt;broken_disableport) {</div><div class='del'>-			err = hermes_disable_port(hw, 0);</div><div class='del'>-			if (err) {</div><div class='del'>-				/* Some firmwares (e.g. Intersil 1.3.x) seem</div><div class='del'>-				 * to have problems disabling the port, oh</div><div class='del'>-				 * well, too bad. */</div><div class='del'>-				printk(KERN_WARNING "%s: Error %d disabling MAC port\n",</div><div class='del'>-				       dev-&gt;name, err);</div><div class='del'>-				priv-&gt;broken_disableport = 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		hermes_set_irqmask(hw, 0);</div><div class='del'>-		hermes_write_regn(hw, EVACK, 0xffff);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	orinoco_scan_done(priv, true);</div><div class='del'>-</div><div class='del'>-	/* firmware will have to reassociate */</div><div class='del'>-	netif_carrier_off(dev);</div><div class='del'>-	priv-&gt;last_linkstatus = 0xffff;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_reinit_firmware(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = hw-&gt;ops-&gt;init(hw);</div><div class='del'>-	if (priv-&gt;do_fw_download &amp;&amp; !err) {</div><div class='del'>-		err = orinoco_download(priv);</div><div class='del'>-		if (err)</div><div class='del'>-			priv-&gt;do_fw_download = 0;</div><div class='del'>-	}</div><div class='del'>-	if (!err)</div><div class='del'>-		err = orinoco_hw_allocate_fid(priv);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-__orinoco_set_multicast_list(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	int err = 0;</div><div class='del'>-	int promisc, mc_count;</div><div class='del'>-</div><div class='del'>-	/* The Hermes doesn't seem to have an allmulti mode, so we go</div><div class='del'>-	 * into promiscuous mode and let the upper levels deal. */</div><div class='del'>-	if ((dev-&gt;flags &amp; IFF_PROMISC) || (dev-&gt;flags &amp; IFF_ALLMULTI) ||</div><div class='del'>-	    (netdev_mc_count(dev) &gt; MAX_MULTICAST(priv))) {</div><div class='del'>-		promisc = 1;</div><div class='del'>-		mc_count = 0;</div><div class='del'>-	} else {</div><div class='del'>-		promisc = 0;</div><div class='del'>-		mc_count = netdev_mc_count(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = __orinoco_hw_set_multicast_list(priv, dev, mc_count, promisc);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This must be called from user context, without locks held - use</div><div class='del'>- * schedule_work() */</div><div class='del'>-void orinoco_reset(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv =</div><div class='del'>-		container_of(work, struct orinoco_private, reset_work);</div><div class='del'>-	struct net_device *dev = priv-&gt;ndev;</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int err;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		/* When the hardware becomes available again, whatever</div><div class='del'>-		 * detects that is responsible for re-initializing</div><div class='del'>-		 * it. So no need for anything further */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	netif_stop_queue(dev);</div><div class='del'>-</div><div class='del'>-	/* Shut off interrupts.  Depending on what state the hardware</div><div class='del'>-	 * is in, this might not work, but we'll try anyway */</div><div class='del'>-	hermes_set_irqmask(hw, 0);</div><div class='del'>-	hermes_write_regn(hw, EVACK, 0xffff);</div><div class='del'>-</div><div class='del'>-	priv-&gt;hw_unavailable++;</div><div class='del'>-	priv-&gt;last_linkstatus = 0xffff; /* firmware will have to reassociate */</div><div class='del'>-	netif_carrier_off(dev);</div><div class='del'>-</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	/* Scanning support: Notify scan cancellation */</div><div class='del'>-	orinoco_scan_done(priv, true);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;hard_reset) {</div><div class='del'>-		err = (*priv-&gt;hard_reset)(priv);</div><div class='del'>-		if (err) {</div><div class='del'>-			printk(KERN_ERR "%s: orinoco_reset: Error %d "</div><div class='del'>-			       "performing hard reset\n", dev-&gt;name, err);</div><div class='del'>-			goto disable;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = orinoco_reinit_firmware(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: orinoco_reset: Error %d re-initializing firmware\n",</div><div class='del'>-		       dev-&gt;name, err);</div><div class='del'>-		goto disable;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* This has to be called from user context */</div><div class='del'>-	orinoco_lock_irq(priv);</div><div class='del'>-</div><div class='del'>-	priv-&gt;hw_unavailable--;</div><div class='del'>-</div><div class='del'>-	/* priv-&gt;open or priv-&gt;hw_unavailable might have changed while</div><div class='del'>-	 * we dropped the lock */</div><div class='del'>-	if (priv-&gt;open &amp;&amp; (!priv-&gt;hw_unavailable)) {</div><div class='del'>-		err = __orinoco_up(priv);</div><div class='del'>-		if (err) {</div><div class='del'>-			printk(KERN_ERR "%s: orinoco_reset: Error %d reenabling card\n",</div><div class='del'>-			       dev-&gt;name, err);</div><div class='del'>-		} else</div><div class='del'>-			netif_trans_update(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	orinoco_unlock_irq(priv);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>- disable:</div><div class='del'>-	hermes_set_irqmask(hw, 0);</div><div class='del'>-	netif_device_detach(dev);</div><div class='del'>-	printk(KERN_ERR "%s: Device has been disabled!\n", dev-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __orinoco_commit(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = priv-&gt;ndev;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	/* If we've called commit, we are reconfiguring or bringing the</div><div class='del'>-	 * interface up. Maintaining countermeasures across this would</div><div class='del'>-	 * be confusing, so note that we've disabled them. The port will</div><div class='del'>-	 * be enabled later in orinoco_commit or __orinoco_up. */</div><div class='del'>-	priv-&gt;tkip_cm_active = 0;</div><div class='del'>-</div><div class='del'>-	err = orinoco_hw_program_rids(priv);</div><div class='del'>-</div><div class='del'>-	/* FIXME: what about netif_tx_lock */</div><div class='del'>-	(void) __orinoco_set_multicast_list(dev);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Ensures configuration changes are applied. May result in a reset.</div><div class='del'>- * The caller should hold priv-&gt;lock</div><div class='del'>- */</div><div class='del'>-int orinoco_commit(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = priv-&gt;ndev;</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;broken_disableport) {</div><div class='del'>-		schedule_work(&amp;priv-&gt;reset_work);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = hermes_disable_port(hw, 0);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_WARNING "%s: Unable to disable port "</div><div class='del'>-		       "while reconfiguring card\n", dev-&gt;name);</div><div class='del'>-		priv-&gt;broken_disableport = 1;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = __orinoco_commit(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_WARNING "%s: Unable to reconfigure card\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = hermes_enable_port(hw, 0);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_WARNING "%s: Unable to enable port while reconfiguring card\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_WARNING "%s: Resetting instead...\n", dev-&gt;name);</div><div class='del'>-		schedule_work(&amp;priv-&gt;reset_work);</div><div class='del'>-		err = 0;</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Interrupt handler                                                */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-static void __orinoco_ev_tick(struct net_device *dev, struct hermes *hw)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_DEBUG "%s: TICK\n", dev-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __orinoco_ev_wterr(struct net_device *dev, struct hermes *hw)</div><div class='del'>-{</div><div class='del'>-	/* This seems to happen a fair bit under load, but ignoring it</div><div class='del'>-	   seems to work fine...*/</div><div class='del'>-	printk(KERN_DEBUG "%s: MAC controller error (WTERR). Ignoring.\n",</div><div class='del'>-	       dev-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-irqreturn_t orinoco_interrupt(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = dev_id;</div><div class='del'>-	struct net_device *dev = priv-&gt;ndev;</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int count = MAX_IRQLOOPS_PER_IRQ;</div><div class='del'>-	u16 evstat, events;</div><div class='del'>-	/* These are used to detect a runaway interrupt situation.</div><div class='del'>-	 *</div><div class='del'>-	 * If we get more than MAX_IRQLOOPS_PER_JIFFY iterations in a jiffy,</div><div class='del'>-	 * we panic and shut down the hardware</div><div class='del'>-	 */</div><div class='del'>-	/* jiffies value the last time we were called */</div><div class='del'>-	static int last_irq_jiffy; /* = 0 */</div><div class='del'>-	static int loops_this_jiffy; /* = 0 */</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0) {</div><div class='del'>-		/* If hw is unavailable - we don't know if the irq was</div><div class='del'>-		 * for us or not */</div><div class='del'>-		return IRQ_HANDLED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	evstat = hermes_read_regn(hw, EVSTAT);</div><div class='del'>-	events = evstat &amp; hw-&gt;inten;</div><div class='del'>-	if (!events) {</div><div class='del'>-		orinoco_unlock(priv, &amp;flags);</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (jiffies != last_irq_jiffy)</div><div class='del'>-		loops_this_jiffy = 0;</div><div class='del'>-	last_irq_jiffy = jiffies;</div><div class='del'>-</div><div class='del'>-	while (events &amp;&amp; count--) {</div><div class='del'>-		if (++loops_this_jiffy &gt; MAX_IRQLOOPS_PER_JIFFY) {</div><div class='del'>-			printk(KERN_WARNING "%s: IRQ handler is looping too "</div><div class='del'>-			       "much! Resetting.\n", dev-&gt;name);</div><div class='del'>-			/* Disable interrupts for now */</div><div class='del'>-			hermes_set_irqmask(hw, 0);</div><div class='del'>-			schedule_work(&amp;priv-&gt;reset_work);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Check the card hasn't been removed */</div><div class='del'>-		if (!hermes_present(hw)) {</div><div class='del'>-			DEBUG(0, "orinoco_interrupt(): card removed\n");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (events &amp; HERMES_EV_TICK)</div><div class='del'>-			__orinoco_ev_tick(dev, hw);</div><div class='del'>-		if (events &amp; HERMES_EV_WTERR)</div><div class='del'>-			__orinoco_ev_wterr(dev, hw);</div><div class='del'>-		if (events &amp; HERMES_EV_INFDROP)</div><div class='del'>-			__orinoco_ev_infdrop(dev, hw);</div><div class='del'>-		if (events &amp; HERMES_EV_INFO)</div><div class='del'>-			__orinoco_ev_info(dev, hw);</div><div class='del'>-		if (events &amp; HERMES_EV_RX)</div><div class='del'>-			__orinoco_ev_rx(dev, hw);</div><div class='del'>-		if (events &amp; HERMES_EV_TXEXC)</div><div class='del'>-			__orinoco_ev_txexc(dev, hw);</div><div class='del'>-		if (events &amp; HERMES_EV_TX)</div><div class='del'>-			__orinoco_ev_tx(dev, hw);</div><div class='del'>-		if (events &amp; HERMES_EV_ALLOC)</div><div class='del'>-			__orinoco_ev_alloc(dev, hw);</div><div class='del'>-</div><div class='del'>-		hermes_write_regn(hw, EVACK, evstat);</div><div class='del'>-</div><div class='del'>-		evstat = hermes_read_regn(hw, EVSTAT);</div><div class='del'>-		events = evstat &amp; hw-&gt;inten;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(orinoco_interrupt);</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Power management                                                 */</div><div class='del'>-/********************************************************************/</div><div class='del'>-#if defined(CONFIG_PM_SLEEP) &amp;&amp; !defined(CONFIG_HERMES_CACHE_FW_ON_INIT)</div><div class='del'>-static int orinoco_pm_notifier(struct notifier_block *notifier,</div><div class='del'>-			       unsigned long pm_event,</div><div class='del'>-			       void *unused)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = container_of(notifier,</div><div class='del'>-						    struct orinoco_private,</div><div class='del'>-						    pm_notifier);</div><div class='del'>-</div><div class='del'>-	/* All we need to do is cache the firmware before suspend, and</div><div class='del'>-	 * release it when we come out.</div><div class='del'>-	 *</div><div class='del'>-	 * Only need to do this if we're downloading firmware. */</div><div class='del'>-	if (!priv-&gt;do_fw_download)</div><div class='del'>-		return NOTIFY_DONE;</div><div class='del'>-</div><div class='del'>-	switch (pm_event) {</div><div class='del'>-	case PM_HIBERNATION_PREPARE:</div><div class='del'>-	case PM_SUSPEND_PREPARE:</div><div class='del'>-		orinoco_cache_fw(priv, 0);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PM_POST_RESTORE:</div><div class='del'>-		/* Restore from hibernation failed. We need to clean</div><div class='del'>-		 * up in exactly the same way, so fall through. */</div><div class='del'>-	case PM_POST_HIBERNATION:</div><div class='del'>-	case PM_POST_SUSPEND:</div><div class='del'>-		orinoco_uncache_fw(priv);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PM_RESTORE_PREPARE:</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NOTIFY_DONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void orinoco_register_pm_notifier(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	priv-&gt;pm_notifier.notifier_call = orinoco_pm_notifier;</div><div class='del'>-	register_pm_notifier(&amp;priv-&gt;pm_notifier);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void orinoco_unregister_pm_notifier(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	unregister_pm_notifier(&amp;priv-&gt;pm_notifier);</div><div class='del'>-}</div><div class='del'>-#else /* !PM_SLEEP || HERMES_CACHE_FW_ON_INIT */</div><div class='del'>-#define orinoco_register_pm_notifier(priv) do { } while (0)</div><div class='del'>-#define orinoco_unregister_pm_notifier(priv) do { } while (0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Initialization                                                   */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-int orinoco_init(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct device *dev = priv-&gt;dev;</div><div class='del'>-	struct wiphy *wiphy = priv_to_wiphy(priv);</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	/* No need to lock, the hw_unavailable flag is already set in</div><div class='del'>-	 * alloc_orinocodev() */</div><div class='del'>-	priv-&gt;nicbuf_size = IEEE80211_MAX_FRAME_LEN + ETH_HLEN;</div><div class='del'>-</div><div class='del'>-	/* Initialize the firmware */</div><div class='del'>-	err = hw-&gt;ops-&gt;init(hw);</div><div class='del'>-	if (err != 0) {</div><div class='del'>-		dev_err(dev, "Failed to initialize firmware (err = %d)\n",</div><div class='del'>-			err);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = determine_fw_capabilities(priv, wiphy-&gt;fw_version,</div><div class='del'>-					sizeof(wiphy-&gt;fw_version),</div><div class='del'>-					&amp;wiphy-&gt;hw_version);</div><div class='del'>-	if (err != 0) {</div><div class='del'>-		dev_err(dev, "Incompatible firmware, aborting\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;do_fw_download) {</div><div class='del'>-#ifdef CONFIG_HERMES_CACHE_FW_ON_INIT</div><div class='del'>-		orinoco_cache_fw(priv, 0);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		err = orinoco_download(priv);</div><div class='del'>-		if (err)</div><div class='del'>-			priv-&gt;do_fw_download = 0;</div><div class='del'>-</div><div class='del'>-		/* Check firmware version again */</div><div class='del'>-		err = determine_fw_capabilities(priv, wiphy-&gt;fw_version,</div><div class='del'>-						sizeof(wiphy-&gt;fw_version),</div><div class='del'>-						&amp;wiphy-&gt;hw_version);</div><div class='del'>-		if (err != 0) {</div><div class='del'>-			dev_err(dev, "Incompatible firmware, aborting\n");</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;has_port3)</div><div class='del'>-		dev_info(dev, "Ad-hoc demo mode supported\n");</div><div class='del'>-	if (priv-&gt;has_ibss)</div><div class='del'>-		dev_info(dev, "IEEE standard IBSS ad-hoc mode supported\n");</div><div class='del'>-	if (priv-&gt;has_wep)</div><div class='del'>-		dev_info(dev, "WEP supported, %s-bit key\n",</div><div class='del'>-			 priv-&gt;has_big_wep ? "104" : "40");</div><div class='del'>-	if (priv-&gt;has_wpa) {</div><div class='del'>-		dev_info(dev, "WPA-PSK supported\n");</div><div class='del'>-		if (orinoco_mic_init(priv)) {</div><div class='del'>-			dev_err(dev, "Failed to setup MIC crypto algorithm. "</div><div class='del'>-				"Disabling WPA support\n");</div><div class='del'>-			priv-&gt;has_wpa = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = orinoco_hw_read_card_settings(priv, wiphy-&gt;perm_addr);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = orinoco_hw_allocate_fid(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(dev, "Failed to allocate NIC buffer!\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set up the default configuration */</div><div class='del'>-	priv-&gt;iw_mode = NL80211_IFTYPE_STATION;</div><div class='del'>-	/* By default use IEEE/IBSS ad-hoc mode if we have it */</div><div class='del'>-	priv-&gt;prefer_port3 = priv-&gt;has_port3 &amp;&amp; (!priv-&gt;has_ibss);</div><div class='del'>-	set_port_type(priv);</div><div class='del'>-	priv-&gt;channel = 0; /* use firmware default */</div><div class='del'>-</div><div class='del'>-	priv-&gt;promiscuous = 0;</div><div class='del'>-	priv-&gt;encode_alg = ORINOCO_ALG_NONE;</div><div class='del'>-	priv-&gt;tx_key = 0;</div><div class='del'>-	priv-&gt;wpa_enabled = 0;</div><div class='del'>-	priv-&gt;tkip_cm_active = 0;</div><div class='del'>-	priv-&gt;key_mgmt = 0;</div><div class='del'>-	priv-&gt;wpa_ie_len = 0;</div><div class='del'>-	priv-&gt;wpa_ie = NULL;</div><div class='del'>-</div><div class='del'>-	if (orinoco_wiphy_register(wiphy)) {</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Make the hardware available, as long as it hasn't been</div><div class='del'>-	 * removed elsewhere (e.g. by PCMCIA hot unplug) */</div><div class='del'>-	orinoco_lock_irq(priv);</div><div class='del'>-	priv-&gt;hw_unavailable--;</div><div class='del'>-	orinoco_unlock_irq(priv);</div><div class='del'>-</div><div class='del'>-	dev_dbg(dev, "Ready\n");</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(orinoco_init);</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops orinoco_netdev_ops = {</div><div class='del'>-	.ndo_open		= orinoco_open,</div><div class='del'>-	.ndo_stop		= orinoco_stop,</div><div class='del'>-	.ndo_start_xmit		= orinoco_xmit,</div><div class='del'>-	.ndo_set_rx_mode	= orinoco_set_multicast_list,</div><div class='del'>-	.ndo_change_mtu		= orinoco_change_mtu,</div><div class='del'>-	.ndo_set_mac_address	= eth_mac_addr,</div><div class='del'>-	.ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-	.ndo_tx_timeout		= orinoco_tx_timeout,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Allocate private data.</div><div class='del'>- *</div><div class='del'>- * This driver has a number of structures associated with it</div><div class='del'>- *  netdev - Net device structure for each network interface</div><div class='del'>- *  wiphy - structure associated with wireless phy</div><div class='del'>- *  wireless_dev (wdev) - structure for each wireless interface</div><div class='del'>- *  hw - structure for hermes chip info</div><div class='del'>- *  card - card specific structure for use by the card driver</div><div class='del'>- *         (airport, orinoco_cs)</div><div class='del'>- *  priv - orinoco private data</div><div class='del'>- *  device - generic linux device structure</div><div class='del'>- *</div><div class='del'>- *  +---------+    +---------+</div><div class='del'>- *  |  wiphy  |    | netdev  |</div><div class='del'>- *  | +-------+    | +-------+</div><div class='del'>- *  | | priv  |    | | wdev  |</div><div class='del'>- *  | | +-----+    +-+-------+</div><div class='del'>- *  | | | hw  |</div><div class='del'>- *  | +-+-----+</div><div class='del'>- *  | | card  |</div><div class='del'>- *  +-+-------+</div><div class='del'>- *</div><div class='del'>- * priv has a link to netdev and device</div><div class='del'>- * wdev has a link to wiphy</div><div class='del'>- */</div><div class='del'>-struct orinoco_private</div><div class='del'>-*alloc_orinocodev(int sizeof_card,</div><div class='del'>-		  struct device *device,</div><div class='del'>-		  int (*hard_reset)(struct orinoco_private *),</div><div class='del'>-		  int (*stop_fw)(struct orinoco_private *, int))</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv;</div><div class='del'>-	struct wiphy *wiphy;</div><div class='del'>-</div><div class='del'>-	/* allocate wiphy</div><div class='del'>-	 * NOTE: We only support a single virtual interface</div><div class='del'>-	 *       but this may change when monitor mode is added</div><div class='del'>-	 */</div><div class='del'>-	wiphy = wiphy_new(&amp;orinoco_cfg_ops,</div><div class='del'>-			  sizeof(struct orinoco_private) + sizeof_card);</div><div class='del'>-	if (!wiphy)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	priv = wiphy_priv(wiphy);</div><div class='del'>-	priv-&gt;dev = device;</div><div class='del'>-</div><div class='del'>-	if (sizeof_card)</div><div class='del'>-		priv-&gt;card = (void *)((unsigned long)priv</div><div class='del'>-				      + sizeof(struct orinoco_private));</div><div class='del'>-	else</div><div class='del'>-		priv-&gt;card = NULL;</div><div class='del'>-</div><div class='del'>-	orinoco_wiphy_init(wiphy);</div><div class='del'>-</div><div class='del'>-#ifdef WIRELESS_SPY</div><div class='del'>-	priv-&gt;wireless_data.spy_data = &amp;priv-&gt;spy_data;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Set up default callbacks */</div><div class='del'>-	priv-&gt;hard_reset = hard_reset;</div><div class='del'>-	priv-&gt;stop_fw = stop_fw;</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;lock);</div><div class='del'>-	priv-&gt;open = 0;</div><div class='del'>-	priv-&gt;hw_unavailable = 1; /* orinoco_init() must clear this</div><div class='del'>-				   * before anything else touches the</div><div class='del'>-				   * hardware */</div><div class='del'>-	INIT_WORK(&amp;priv-&gt;reset_work, orinoco_reset);</div><div class='del'>-	INIT_WORK(&amp;priv-&gt;join_work, orinoco_join_ap);</div><div class='del'>-	INIT_WORK(&amp;priv-&gt;wevent_work, orinoco_send_wevents);</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;priv-&gt;rx_list);</div><div class='del'>-	tasklet_setup(&amp;priv-&gt;rx_tasklet, orinoco_rx_isr_tasklet);</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;scan_lock);</div><div class='del'>-	INIT_LIST_HEAD(&amp;priv-&gt;scan_list);</div><div class='del'>-	INIT_WORK(&amp;priv-&gt;process_scan, orinoco_process_scan_results);</div><div class='del'>-</div><div class='del'>-	priv-&gt;last_linkstatus = 0xffff;</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_HERMES_CACHE_FW_ON_INIT) || defined(CONFIG_PM_SLEEP)</div><div class='del'>-	priv-&gt;cached_pri_fw = NULL;</div><div class='del'>-	priv-&gt;cached_fw = NULL;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Register PM notifiers */</div><div class='del'>-	orinoco_register_pm_notifier(priv);</div><div class='del'>-</div><div class='del'>-	return priv;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(alloc_orinocodev);</div><div class='del'>-</div><div class='del'>-/* We can only support a single interface. We provide a separate</div><div class='del'>- * function to set it up to distinguish between hardware</div><div class='del'>- * initialisation and interface setup.</div><div class='del'>- *</div><div class='del'>- * The base_addr and irq parameters are passed on to netdev for use</div><div class='del'>- * with SIOCGIFMAP.</div><div class='del'>- */</div><div class='del'>-int orinoco_if_add(struct orinoco_private *priv,</div><div class='del'>-		   unsigned long base_addr,</div><div class='del'>-		   unsigned int irq,</div><div class='del'>-		   const struct net_device_ops *ops)</div><div class='del'>-{</div><div class='del'>-	struct wiphy *wiphy = priv_to_wiphy(priv);</div><div class='del'>-	struct wireless_dev *wdev;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	dev = alloc_etherdev(sizeof(struct wireless_dev));</div><div class='del'>-</div><div class='del'>-	if (!dev)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* Initialise wireless_dev */</div><div class='del'>-	wdev = netdev_priv(dev);</div><div class='del'>-	wdev-&gt;wiphy = wiphy;</div><div class='del'>-	wdev-&gt;iftype = NL80211_IFTYPE_STATION;</div><div class='del'>-</div><div class='del'>-	/* Setup / override net_device fields */</div><div class='del'>-	dev-&gt;ieee80211_ptr = wdev;</div><div class='del'>-	dev-&gt;watchdog_timeo = HZ; /* 1 second timeout */</div><div class='del'>-	dev-&gt;wireless_handlers = &amp;orinoco_handler_def;</div><div class='del'>-#ifdef WIRELESS_SPY</div><div class='del'>-	dev-&gt;wireless_data = &amp;priv-&gt;wireless_data;</div><div class='del'>-#endif</div><div class='del'>-	/* Default to standard ops if not set */</div><div class='del'>-	if (ops)</div><div class='del'>-		dev-&gt;netdev_ops = ops;</div><div class='del'>-	else</div><div class='del'>-		dev-&gt;netdev_ops = &amp;orinoco_netdev_ops;</div><div class='del'>-</div><div class='del'>-	/* we use the default eth_mac_addr for setting the MAC addr */</div><div class='del'>-</div><div class='del'>-	/* Reserve space in skb for the SNAP header */</div><div class='del'>-	dev-&gt;needed_headroom = ENCAPS_OVERHEAD;</div><div class='del'>-</div><div class='del'>-	netif_carrier_off(dev);</div><div class='del'>-</div><div class='del'>-	memcpy(dev-&gt;dev_addr, wiphy-&gt;perm_addr, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	dev-&gt;base_addr = base_addr;</div><div class='del'>-	dev-&gt;irq = irq;</div><div class='del'>-</div><div class='del'>-	dev-&gt;min_mtu = ORINOCO_MIN_MTU;</div><div class='del'>-	dev-&gt;max_mtu = ORINOCO_MAX_MTU;</div><div class='del'>-</div><div class='del'>-	SET_NETDEV_DEV(dev, priv-&gt;dev);</div><div class='del'>-	ret = register_netdev(dev);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	priv-&gt;ndev = dev;</div><div class='del'>-</div><div class='del'>-	/* Report what we've done */</div><div class='del'>-	dev_dbg(priv-&gt;dev, "Registered interface %s.\n", dev-&gt;name);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- fail:</div><div class='del'>-	free_netdev(dev);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(orinoco_if_add);</div><div class='del'>-</div><div class='del'>-void orinoco_if_del(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = priv-&gt;ndev;</div><div class='del'>-</div><div class='del'>-	unregister_netdev(dev);</div><div class='del'>-	free_netdev(dev);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(orinoco_if_del);</div><div class='del'>-</div><div class='del'>-void free_orinocodev(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct wiphy *wiphy = priv_to_wiphy(priv);</div><div class='del'>-	struct orinoco_rx_data *rx_data, *temp;</div><div class='del'>-	struct orinoco_scan_data *sd, *sdtemp;</div><div class='del'>-</div><div class='del'>-	/* If the tasklet is scheduled when we call tasklet_kill it</div><div class='del'>-	 * will run one final time. However the tasklet will only</div><div class='del'>-	 * drain priv-&gt;rx_list if the hw is still available. */</div><div class='del'>-	tasklet_kill(&amp;priv-&gt;rx_tasklet);</div><div class='del'>-</div><div class='del'>-	/* Explicitly drain priv-&gt;rx_list */</div><div class='del'>-	list_for_each_entry_safe(rx_data, temp, &amp;priv-&gt;rx_list, list) {</div><div class='del'>-		list_del(&amp;rx_data-&gt;list);</div><div class='del'>-</div><div class='del'>-		dev_kfree_skb(rx_data-&gt;skb);</div><div class='del'>-		kfree(rx_data-&gt;desc);</div><div class='del'>-		kfree(rx_data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cancel_work_sync(&amp;priv-&gt;process_scan);</div><div class='del'>-	/* Explicitly drain priv-&gt;scan_list */</div><div class='del'>-	list_for_each_entry_safe(sd, sdtemp, &amp;priv-&gt;scan_list, list) {</div><div class='del'>-		list_del(&amp;sd-&gt;list);</div><div class='del'>-</div><div class='del'>-		if (sd-&gt;len &gt; 0)</div><div class='del'>-			kfree(sd-&gt;buf);</div><div class='del'>-		kfree(sd);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	orinoco_unregister_pm_notifier(priv);</div><div class='del'>-	orinoco_uncache_fw(priv);</div><div class='del'>-</div><div class='del'>-	priv-&gt;wpa_ie_len = 0;</div><div class='del'>-	kfree(priv-&gt;wpa_ie);</div><div class='del'>-	orinoco_mic_free(priv);</div><div class='del'>-	wiphy_free(wiphy);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(free_orinocodev);</div><div class='del'>-</div><div class='del'>-int orinoco_up(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = priv-&gt;ndev;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	priv-&gt;hw.ops-&gt;lock_irqsave(&amp;priv-&gt;lock, &amp;flags);</div><div class='del'>-</div><div class='del'>-	err = orinoco_reinit_firmware(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: Error %d re-initializing firmware\n",</div><div class='del'>-		       dev-&gt;name, err);</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	netif_device_attach(dev);</div><div class='del'>-	priv-&gt;hw_unavailable--;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;open &amp;&amp; !priv-&gt;hw_unavailable) {</div><div class='del'>-		err = __orinoco_up(priv);</div><div class='del'>-		if (err)</div><div class='del'>-			printk(KERN_ERR "%s: Error %d restarting card\n",</div><div class='del'>-			       dev-&gt;name, err);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-exit:</div><div class='del'>-	priv-&gt;hw.ops-&gt;unlock_irqrestore(&amp;priv-&gt;lock, &amp;flags);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(orinoco_up);</div><div class='del'>-</div><div class='del'>-void orinoco_down(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = priv-&gt;ndev;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	priv-&gt;hw.ops-&gt;lock_irqsave(&amp;priv-&gt;lock, &amp;flags);</div><div class='del'>-	err = __orinoco_down(priv);</div><div class='del'>-	if (err)</div><div class='del'>-		printk(KERN_WARNING "%s: Error %d downing interface\n",</div><div class='del'>-		       dev-&gt;name, err);</div><div class='del'>-</div><div class='del'>-	netif_device_detach(dev);</div><div class='del'>-	priv-&gt;hw_unavailable++;</div><div class='del'>-	priv-&gt;hw.ops-&gt;unlock_irqrestore(&amp;priv-&gt;lock, &amp;flags);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(orinoco_down);</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Module initialization                                            */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-/* Can't be declared "const" or the whole __initdata section will</div><div class='del'>- * become const */</div><div class='del'>-static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION</div><div class='del'>-	" (David Gibson &lt;hermes@gibson.dropbear.id.au&gt;, "</div><div class='del'>-	"Pavel Roskin &lt;proski@gnu.org&gt;, et al)";</div><div class='del'>-</div><div class='del'>-static int __init init_orinoco(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_DEBUG "%s\n", version);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit exit_orinoco(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(init_orinoco);</div><div class='del'>-module_exit(exit_orinoco);</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/main.h b/drivers/net/wireless/intersil/orinoco/main.h<br/>deleted file mode 100644<br/>index 5a8fec26136e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/main.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/main.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,50 +0,0 @@</div><div class='del'>-/* Exports from main to helper modules</div><div class='del'>- *</div><div class='del'>- * See copyright notice in main.c</div><div class='del'>- */</div><div class='del'>-#ifndef _ORINOCO_MAIN_H_</div><div class='del'>-#define _ORINOCO_MAIN_H_</div><div class='del'>-</div><div class='del'>-#include &lt;linux/ieee80211.h&gt;</div><div class='del'>-#include "orinoco.h"</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Compile time configuration and compatibility stuff               */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-/* We do this this way to avoid ifdefs in the actual code */</div><div class='del'>-#ifdef WIRELESS_SPY</div><div class='del'>-#define SPY_NUMBER(priv)	(priv-&gt;spy_data.spy_number)</div><div class='del'>-#else</div><div class='del'>-#define SPY_NUMBER(priv)	0</div><div class='del'>-#endif /* WIRELESS_SPY */</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-/* Export module parameter */</div><div class='del'>-extern int force_monitor;</div><div class='del'>-</div><div class='del'>-/* Forward declarations */</div><div class='del'>-struct net_device;</div><div class='del'>-struct work_struct;</div><div class='del'>-</div><div class='del'>-void set_port_type(struct orinoco_private *priv);</div><div class='del'>-int orinoco_commit(struct orinoco_private *priv);</div><div class='del'>-void orinoco_reset(struct work_struct *work);</div><div class='del'>-</div><div class='del'>-/* Information element helpers - find a home for these... */</div><div class='del'>-#define WPA_OUI_TYPE	"\x00\x50\xF2\x01"</div><div class='del'>-#define WPA_SELECTOR_LEN 4</div><div class='del'>-static inline u8 *orinoco_get_wpa_ie(u8 *data, size_t len)</div><div class='del'>-{</div><div class='del'>-	u8 *p = data;</div><div class='del'>-	while ((p + 2 + WPA_SELECTOR_LEN) &lt; (data + len)) {</div><div class='del'>-		if ((p[0] == WLAN_EID_VENDOR_SPECIFIC) &amp;&amp;</div><div class='del'>-		    (memcmp(&amp;p[2], WPA_OUI_TYPE, WPA_SELECTOR_LEN) == 0))</div><div class='del'>-			return p;</div><div class='del'>-		p += p[1] + 2;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _ORINOCO_MAIN_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/mic.c b/drivers/net/wireless/intersil/orinoco/mic.c<br/>deleted file mode 100644<br/>index a324bc4b7938..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/mic.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/mic.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,89 +0,0 @@</div><div class='del'>-/* Orinoco MIC helpers</div><div class='del'>- *</div><div class='del'>- * See copyright notice in main.c</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/if_ether.h&gt;</div><div class='del'>-#include &lt;linux/scatterlist.h&gt;</div><div class='del'>-#include &lt;crypto/hash.h&gt;</div><div class='del'>-</div><div class='del'>-#include "orinoco.h"</div><div class='del'>-#include "mic.h"</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Michael MIC crypto setup                                         */</div><div class='del'>-/********************************************************************/</div><div class='del'>-int orinoco_mic_init(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	priv-&gt;tx_tfm_mic = crypto_alloc_shash("michael_mic", 0, 0);</div><div class='del'>-	if (IS_ERR(priv-&gt;tx_tfm_mic)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: could not allocate "</div><div class='del'>-		       "crypto API michael_mic\n", __func__);</div><div class='del'>-		priv-&gt;tx_tfm_mic = NULL;</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;rx_tfm_mic = crypto_alloc_shash("michael_mic", 0, 0);</div><div class='del'>-	if (IS_ERR(priv-&gt;rx_tfm_mic)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: could not allocate "</div><div class='del'>-		       "crypto API michael_mic\n", __func__);</div><div class='del'>-		priv-&gt;rx_tfm_mic = NULL;</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void orinoco_mic_free(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	if (priv-&gt;tx_tfm_mic)</div><div class='del'>-		crypto_free_shash(priv-&gt;tx_tfm_mic);</div><div class='del'>-	if (priv-&gt;rx_tfm_mic)</div><div class='del'>-		crypto_free_shash(priv-&gt;rx_tfm_mic);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int orinoco_mic(struct crypto_shash *tfm_michael, u8 *key,</div><div class='del'>-		u8 *da, u8 *sa, u8 priority,</div><div class='del'>-		u8 *data, size_t data_len, u8 *mic)</div><div class='del'>-{</div><div class='del'>-	SHASH_DESC_ON_STACK(desc, tfm_michael);</div><div class='del'>-	u8 hdr[ETH_HLEN + 2]; /* size of header + padding */</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (tfm_michael == NULL) {</div><div class='del'>-		printk(KERN_WARNING "%s: tfm_michael == NULL\n", __func__);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Copy header into buffer. We need the padding on the end zeroed */</div><div class='del'>-	memcpy(&amp;hdr[0], da, ETH_ALEN);</div><div class='del'>-	memcpy(&amp;hdr[ETH_ALEN], sa, ETH_ALEN);</div><div class='del'>-	hdr[ETH_ALEN * 2] = priority;</div><div class='del'>-	hdr[ETH_ALEN * 2 + 1] = 0;</div><div class='del'>-	hdr[ETH_ALEN * 2 + 2] = 0;</div><div class='del'>-	hdr[ETH_ALEN * 2 + 3] = 0;</div><div class='del'>-</div><div class='del'>-	desc-&gt;tfm = tfm_michael;</div><div class='del'>-</div><div class='del'>-	err = crypto_shash_setkey(tfm_michael, key, MIC_KEYLEN);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = crypto_shash_init(desc);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = crypto_shash_update(desc, hdr, sizeof(hdr));</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = crypto_shash_update(desc, data, data_len);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = crypto_shash_final(desc, mic);</div><div class='del'>-	shash_desc_zero(desc);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/mic.h b/drivers/net/wireless/intersil/orinoco/mic.h<br/>deleted file mode 100644<br/>index e8724e889219..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/mic.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/mic.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,23 +0,0 @@</div><div class='del'>-/* Orinoco MIC helpers</div><div class='del'>- *</div><div class='del'>- * See copyright notice in main.c</div><div class='del'>- */</div><div class='del'>-#ifndef _ORINOCO_MIC_H_</div><div class='del'>-#define _ORINOCO_MIC_H_</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;crypto/hash.h&gt;</div><div class='del'>-</div><div class='del'>-#define MICHAEL_MIC_LEN 8</div><div class='del'>-</div><div class='del'>-/* Forward declarations */</div><div class='del'>-struct orinoco_private;</div><div class='del'>-struct crypto_ahash;</div><div class='del'>-</div><div class='del'>-int orinoco_mic_init(struct orinoco_private *priv);</div><div class='del'>-void orinoco_mic_free(struct orinoco_private *priv);</div><div class='del'>-int orinoco_mic(struct crypto_shash *tfm_michael, u8 *key,</div><div class='del'>-		u8 *da, u8 *sa, u8 priority,</div><div class='del'>-		u8 *data, size_t data_len, u8 *mic);</div><div class='del'>-</div><div class='del'>-#endif /* ORINOCO_MIC_H */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/orinoco.h b/drivers/net/wireless/intersil/orinoco/orinoco.h<br/>deleted file mode 100644<br/>index cdd026af100b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/orinoco.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/orinoco.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,251 +0,0 @@</div><div class='del'>-/* orinoco.h</div><div class='del'>- *</div><div class='del'>- * Common definitions to all pieces of the various orinoco</div><div class='del'>- * drivers</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _ORINOCO_H</div><div class='del'>-#define _ORINOCO_H</div><div class='del'>-</div><div class='del'>-#define DRIVER_VERSION "0.15"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/suspend.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/wireless.h&gt;</div><div class='del'>-#include &lt;net/iw_handler.h&gt;</div><div class='del'>-#include &lt;net/cfg80211.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hermes.h"</div><div class='del'>-</div><div class='del'>-/* To enable debug messages */</div><div class='del'>-/*#define ORINOCO_DEBUG		3*/</div><div class='del'>-</div><div class='del'>-#define WIRELESS_SPY		/* enable iwspy support */</div><div class='del'>-</div><div class='del'>-#define MAX_SCAN_LEN		4096</div><div class='del'>-</div><div class='del'>-#define ORINOCO_SEQ_LEN		8</div><div class='del'>-#define ORINOCO_MAX_KEY_SIZE	14</div><div class='del'>-#define ORINOCO_MAX_KEYS	4</div><div class='del'>-</div><div class='del'>-struct orinoco_key {</div><div class='del'>-	__le16 len;	/* always stored as little-endian */</div><div class='del'>-	char data[ORINOCO_MAX_KEY_SIZE];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define TKIP_KEYLEN	16</div><div class='del'>-#define MIC_KEYLEN	8</div><div class='del'>-</div><div class='del'>-struct orinoco_tkip_key {</div><div class='del'>-	u8 tkip[TKIP_KEYLEN];</div><div class='del'>-	u8 tx_mic[MIC_KEYLEN];</div><div class='del'>-	u8 rx_mic[MIC_KEYLEN];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum orinoco_alg {</div><div class='del'>-	ORINOCO_ALG_NONE,</div><div class='del'>-	ORINOCO_ALG_WEP,</div><div class='del'>-	ORINOCO_ALG_TKIP</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum fwtype {</div><div class='del'>-	FIRMWARE_TYPE_AGERE,</div><div class='del'>-	FIRMWARE_TYPE_INTERSIL,</div><div class='del'>-	FIRMWARE_TYPE_SYMBOL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct firmware;</div><div class='del'>-</div><div class='del'>-struct orinoco_private {</div><div class='del'>-	void *card;	/* Pointer to card dependent structure */</div><div class='del'>-	struct device *dev;</div><div class='del'>-	int (*hard_reset)(struct orinoco_private *);</div><div class='del'>-	int (*stop_fw)(struct orinoco_private *, int);</div><div class='del'>-</div><div class='del'>-	struct ieee80211_supported_band band;</div><div class='del'>-	struct ieee80211_channel channels[14];</div><div class='del'>-	u32 cipher_suites[3];</div><div class='del'>-</div><div class='del'>-	/* Synchronisation stuff */</div><div class='del'>-	spinlock_t lock;</div><div class='del'>-	int hw_unavailable;</div><div class='del'>-	struct work_struct reset_work;</div><div class='del'>-</div><div class='del'>-	/* Interrupt tasklets */</div><div class='del'>-	struct tasklet_struct rx_tasklet;</div><div class='del'>-	struct list_head rx_list;</div><div class='del'>-</div><div class='del'>-	/* driver state */</div><div class='del'>-	int open;</div><div class='del'>-	u16 last_linkstatus;</div><div class='del'>-	struct work_struct join_work;</div><div class='del'>-	struct work_struct wevent_work;</div><div class='del'>-</div><div class='del'>-	/* Net device stuff */</div><div class='del'>-	struct net_device *ndev;</div><div class='del'>-	struct iw_statistics wstats;</div><div class='del'>-</div><div class='del'>-	/* Hardware control variables */</div><div class='del'>-	struct hermes hw;</div><div class='del'>-	u16 txfid;</div><div class='del'>-</div><div class='del'>-	/* Capabilities of the hardware/firmware */</div><div class='del'>-	enum fwtype firmware_type;</div><div class='del'>-	int ibss_port;</div><div class='del'>-	int nicbuf_size;</div><div class='del'>-	u16 channel_mask;</div><div class='del'>-</div><div class='del'>-	/* Boolean capabilities */</div><div class='del'>-	unsigned int has_ibss:1;</div><div class='del'>-	unsigned int has_port3:1;</div><div class='del'>-	unsigned int has_wep:1;</div><div class='del'>-	unsigned int has_big_wep:1;</div><div class='del'>-	unsigned int has_mwo:1;</div><div class='del'>-	unsigned int has_pm:1;</div><div class='del'>-	unsigned int has_preamble:1;</div><div class='del'>-	unsigned int has_sensitivity:1;</div><div class='del'>-	unsigned int has_hostscan:1;</div><div class='del'>-	unsigned int has_alt_txcntl:1;</div><div class='del'>-	unsigned int has_ext_scan:1;</div><div class='del'>-	unsigned int has_wpa:1;</div><div class='del'>-	unsigned int do_fw_download:1;</div><div class='del'>-	unsigned int broken_disableport:1;</div><div class='del'>-	unsigned int broken_monitor:1;</div><div class='del'>-	unsigned int prefer_port3:1;</div><div class='del'>-</div><div class='del'>-	/* Configuration paramaters */</div><div class='del'>-	enum nl80211_iftype iw_mode;</div><div class='del'>-	enum orinoco_alg encode_alg;</div><div class='del'>-	u16 wep_restrict, tx_key;</div><div class='del'>-	struct key_params keys[ORINOCO_MAX_KEYS];</div><div class='del'>-</div><div class='del'>-	int bitratemode;</div><div class='del'>-	char nick[IW_ESSID_MAX_SIZE + 1];</div><div class='del'>-	char desired_essid[IW_ESSID_MAX_SIZE + 1];</div><div class='del'>-	char desired_bssid[ETH_ALEN];</div><div class='del'>-	int bssid_fixed;</div><div class='del'>-	u16 frag_thresh, mwo_robust;</div><div class='del'>-	u16 channel;</div><div class='del'>-	u16 ap_density, rts_thresh;</div><div class='del'>-	u16 pm_on, pm_mcast, pm_period, pm_timeout;</div><div class='del'>-	u16 preamble;</div><div class='del'>-	u16 short_retry_limit, long_retry_limit;</div><div class='del'>-	u16 retry_lifetime;</div><div class='del'>-#ifdef WIRELESS_SPY</div><div class='del'>-	struct iw_spy_data spy_data; /* iwspy support */</div><div class='del'>-	struct iw_public_data	wireless_data;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Configuration dependent variables */</div><div class='del'>-	int port_type, createibss;</div><div class='del'>-	int promiscuous, mc_count;</div><div class='del'>-</div><div class='del'>-	/* Scanning support */</div><div class='del'>-	struct cfg80211_scan_request *scan_request;</div><div class='del'>-	struct work_struct process_scan;</div><div class='del'>-	struct list_head scan_list;</div><div class='del'>-	spinlock_t scan_lock; /* protects the scan list */</div><div class='del'>-</div><div class='del'>-	/* WPA support */</div><div class='del'>-	u8 *wpa_ie;</div><div class='del'>-	int wpa_ie_len;</div><div class='del'>-</div><div class='del'>-	struct crypto_shash *rx_tfm_mic;</div><div class='del'>-	struct crypto_shash *tx_tfm_mic;</div><div class='del'>-</div><div class='del'>-	unsigned int wpa_enabled:1;</div><div class='del'>-	unsigned int tkip_cm_active:1;</div><div class='del'>-	unsigned int key_mgmt:3;</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_HERMES_CACHE_FW_ON_INIT) || defined(CONFIG_PM_SLEEP)</div><div class='del'>-	/* Cached in memory firmware to use during -&gt;resume. */</div><div class='del'>-	const struct firmware *cached_pri_fw;</div><div class='del'>-	const struct firmware *cached_fw;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	struct notifier_block pm_notifier;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef ORINOCO_DEBUG</div><div class='del'>-extern int orinoco_debug;</div><div class='del'>-#define DEBUG(n, args...) do { \</div><div class='del'>-	if (orinoco_debug &gt; (n)) \</div><div class='del'>-		printk(KERN_DEBUG args); \</div><div class='del'>-} while (0)</div><div class='del'>-#else</div><div class='del'>-#define DEBUG(n, args...) do { } while (0)</div><div class='del'>-#endif	/* ORINOCO_DEBUG */</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Exported prototypes                                              */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-struct orinoco_private *alloc_orinocodev(int sizeof_card, struct device *device,</div><div class='del'>-					 int (*hard_reset)(struct orinoco_private *),</div><div class='del'>-					 int (*stop_fw)(struct orinoco_private *, int));</div><div class='del'>-void free_orinocodev(struct orinoco_private *priv);</div><div class='del'>-int orinoco_init(struct orinoco_private *priv);</div><div class='del'>-int orinoco_if_add(struct orinoco_private *priv, unsigned long base_addr,</div><div class='del'>-		   unsigned int irq, const struct net_device_ops *ops);</div><div class='del'>-void orinoco_if_del(struct orinoco_private *priv);</div><div class='del'>-int orinoco_up(struct orinoco_private *priv);</div><div class='del'>-void orinoco_down(struct orinoco_private *priv);</div><div class='del'>-irqreturn_t orinoco_interrupt(int irq, void *dev_id);</div><div class='del'>-</div><div class='del'>-void __orinoco_ev_info(struct net_device *dev, struct hermes *hw);</div><div class='del'>-void __orinoco_ev_rx(struct net_device *dev, struct hermes *hw);</div><div class='del'>-</div><div class='del'>-int orinoco_process_xmit_skb(struct sk_buff *skb,</div><div class='del'>-			     struct net_device *dev,</div><div class='del'>-			     struct orinoco_private *priv,</div><div class='del'>-			     int *tx_control,</div><div class='del'>-			     u8 *mic);</div><div class='del'>-</div><div class='del'>-/* Common ndo functions exported for reuse by orinoco_usb */</div><div class='del'>-int orinoco_open(struct net_device *dev);</div><div class='del'>-int orinoco_stop(struct net_device *dev);</div><div class='del'>-void orinoco_set_multicast_list(struct net_device *dev);</div><div class='del'>-int orinoco_change_mtu(struct net_device *dev, int new_mtu);</div><div class='del'>-void orinoco_tx_timeout(struct net_device *dev, unsigned int txqueue);</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Locking and synchronization functions                            */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-static inline int orinoco_lock(struct orinoco_private *priv,</div><div class='del'>-			       unsigned long *flags)</div><div class='del'>-{</div><div class='del'>-	priv-&gt;hw.ops-&gt;lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-	if (priv-&gt;hw_unavailable) {</div><div class='del'>-		DEBUG(1, "orinoco_lock() called with hw_unavailable (dev=%p)\n",</div><div class='del'>-		       priv-&gt;ndev);</div><div class='del'>-		priv-&gt;hw.ops-&gt;unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void orinoco_unlock(struct orinoco_private *priv,</div><div class='del'>-				  unsigned long *flags)</div><div class='del'>-{</div><div class='del'>-	priv-&gt;hw.ops-&gt;unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void orinoco_lock_irq(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	priv-&gt;hw.ops-&gt;lock_irq(&amp;priv-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void orinoco_unlock_irq(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	priv-&gt;hw.ops-&gt;unlock_irq(&amp;priv-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*** Navigate from net_device to orinoco_private ***/</div><div class='del'>-static inline struct orinoco_private *ndev_priv(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct wireless_dev *wdev = netdev_priv(dev);</div><div class='del'>-	return wdev_priv(wdev);</div><div class='del'>-}</div><div class='del'>-#endif /* _ORINOCO_H */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_cs.c b/drivers/net/wireless/intersil/orinoco/orinoco_cs.c<br/>deleted file mode 100644<br/>index a956f965a1e5..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/orinoco_cs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/orinoco_cs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,341 +0,0 @@</div><div class='del'>-/* orinoco_cs.c (formerly known as dldwd_cs.c)</div><div class='del'>- *</div><div class='del'>- * A driver for "Hermes" chipset based PCMCIA wireless adaptors, such</div><div class='del'>- * as the Lucent WavelanIEEE/Orinoco cards and their OEM (Cabletron/</div><div class='del'>- * EnteraSys RoamAbout 802.11, ELSA Airlancer, Melco Buffalo and others).</div><div class='del'>- * It should also be usable on various Prism II based cards such as the</div><div class='del'>- * Linksys, D-Link and Farallon Skyline. It should also work on Symbol</div><div class='del'>- * cards such as the 3Com AirConnect and Ericsson WLAN.</div><div class='del'>- *</div><div class='del'>- * Copyright notice &amp; release notes in file main.c</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define DRIVER_NAME "orinoco_cs"</div><div class='del'>-#define PFX DRIVER_NAME ": "</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;pcmcia/cistpl.h&gt;</div><div class='del'>-#include &lt;pcmcia/cisreg.h&gt;</div><div class='del'>-#include &lt;pcmcia/ds.h&gt;</div><div class='del'>-</div><div class='del'>-#include "orinoco.h"</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Module stuff							    */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("David Gibson &lt;hermes@gibson.dropbear.id.au&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Driver for PCMCIA Lucent Orinoco,"</div><div class='del'>-		   " Prism II based and similar wireless cards");</div><div class='del'>-MODULE_LICENSE("Dual MPL/GPL");</div><div class='del'>-</div><div class='del'>-/* Module parameters */</div><div class='del'>-</div><div class='del'>-/* Some D-Link cards have buggy CIS. They do work at 5v properly, but</div><div class='del'>- * don't have any CIS entry for it. This workaround it... */</div><div class='del'>-static int ignore_cis_vcc; /* = 0 */</div><div class='del'>-module_param(ignore_cis_vcc, int, 0);</div><div class='del'>-MODULE_PARM_DESC(ignore_cis_vcc, "Allow voltage mismatch between card and socket");</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Data structures						    */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-/* PCMCIA specific device information (goes in the card field of</div><div class='del'>- * struct orinoco_private */</div><div class='del'>-struct orinoco_pccard {</div><div class='del'>-	struct pcmcia_device	*p_dev;</div><div class='del'>-</div><div class='del'>-	/* Used to handle hard reset */</div><div class='del'>-	/* yuck, we need this hack to work around the insanity of the</div><div class='del'>-	 * PCMCIA layer */</div><div class='del'>-	unsigned long hard_reset_in_progress;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Function prototypes						    */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-static int orinoco_cs_config(struct pcmcia_device *link);</div><div class='del'>-static void orinoco_cs_release(struct pcmcia_device *link);</div><div class='del'>-static void orinoco_cs_detach(struct pcmcia_device *p_dev);</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Device methods						    */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-orinoco_cs_hard_reset(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_pccard *card = priv-&gt;card;</div><div class='del'>-	struct pcmcia_device *link = card-&gt;p_dev;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* We need atomic ops here, because we're not holding the lock */</div><div class='del'>-	set_bit(0, &amp;card-&gt;hard_reset_in_progress);</div><div class='del'>-</div><div class='del'>-	err = pcmcia_reset_card(link-&gt;socket);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	msleep(100);</div><div class='del'>-	clear_bit(0, &amp;card-&gt;hard_reset_in_progress);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* PCMCIA stuff							    */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-orinoco_cs_probe(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv;</div><div class='del'>-	struct orinoco_pccard *card;</div><div class='del'>-</div><div class='del'>-	priv = alloc_orinocodev(sizeof(*card), &amp;link-&gt;dev,</div><div class='del'>-				orinoco_cs_hard_reset, NULL);</div><div class='del'>-	if (!priv)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	card = priv-&gt;card;</div><div class='del'>-</div><div class='del'>-	/* Link both structures together */</div><div class='del'>-	card-&gt;p_dev = link;</div><div class='del'>-	link-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	return orinoco_cs_config(link);</div><div class='del'>-}				/* orinoco_cs_attach */</div><div class='del'>-</div><div class='del'>-static void orinoco_cs_detach(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = link-&gt;priv;</div><div class='del'>-</div><div class='del'>-	orinoco_if_del(priv);</div><div class='del'>-</div><div class='del'>-	orinoco_cs_release(link);</div><div class='del'>-</div><div class='del'>-	wiphy_unregister(priv_to_wiphy(priv));</div><div class='del'>-	free_orinocodev(priv);</div><div class='del'>-}				/* orinoco_cs_detach */</div><div class='del'>-</div><div class='del'>-static int orinoco_cs_config_check(struct pcmcia_device *p_dev, void *priv_data)</div><div class='del'>-{</div><div class='del'>-	if (p_dev-&gt;config_index == 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return pcmcia_request_io(p_dev);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-orinoco_cs_config(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = link-&gt;priv;</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int ret;</div><div class='del'>-	void __iomem *mem;</div><div class='del'>-</div><div class='del'>-	link-&gt;config_flags |= CONF_AUTO_SET_VPP | CONF_AUTO_CHECK_VCC |</div><div class='del'>-		CONF_AUTO_SET_IO | CONF_ENABLE_IRQ;</div><div class='del'>-	if (ignore_cis_vcc)</div><div class='del'>-		link-&gt;config_flags &amp;= ~CONF_AUTO_CHECK_VCC;</div><div class='del'>-	ret = pcmcia_loop_config(link, orinoco_cs_config_check, NULL);</div><div class='del'>-	if (ret) {</div><div class='del'>-		if (!ignore_cis_vcc)</div><div class='del'>-			printk(KERN_ERR PFX "GetNextTuple(): No matching "</div><div class='del'>-			       "CIS configuration.  Maybe you need the "</div><div class='del'>-			       "ignore_cis_vcc=1 parameter.\n");</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mem = ioport_map(link-&gt;resource[0]-&gt;start,</div><div class='del'>-			resource_size(link-&gt;resource[0]));</div><div class='del'>-	if (!mem)</div><div class='del'>-		goto failed;</div><div class='del'>-</div><div class='del'>-	/* We initialize the hermes structure before completing PCMCIA</div><div class='del'>-	 * configuration just in case the interrupt handler gets</div><div class='del'>-	 * called. */</div><div class='del'>-	hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING);</div><div class='del'>-</div><div class='del'>-	ret = pcmcia_request_irq(link, orinoco_interrupt);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto failed;</div><div class='del'>-</div><div class='del'>-	ret = pcmcia_enable_device(link);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto failed;</div><div class='del'>-</div><div class='del'>-	/* Initialise the main driver */</div><div class='del'>-	if (orinoco_init(priv) != 0) {</div><div class='del'>-		printk(KERN_ERR PFX "orinoco_init() failed\n");</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Register an interface with the stack */</div><div class='del'>-	if (orinoco_if_add(priv, link-&gt;resource[0]-&gt;start,</div><div class='del'>-			   link-&gt;irq, NULL) != 0) {</div><div class='del'>-		printk(KERN_ERR PFX "orinoco_if_add() failed\n");</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- failed:</div><div class='del'>-	orinoco_cs_release(link);</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}				/* orinoco_cs_config */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-orinoco_cs_release(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = link-&gt;priv;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* We're committed to taking the device away now, so mark the</div><div class='del'>-	 * hardware as unavailable */</div><div class='del'>-	priv-&gt;hw.ops-&gt;lock_irqsave(&amp;priv-&gt;lock, &amp;flags);</div><div class='del'>-	priv-&gt;hw_unavailable++;</div><div class='del'>-	priv-&gt;hw.ops-&gt;unlock_irqrestore(&amp;priv-&gt;lock, &amp;flags);</div><div class='del'>-</div><div class='del'>-	pcmcia_disable_device(link);</div><div class='del'>-	if (priv-&gt;hw.iobase)</div><div class='del'>-		ioport_unmap(priv-&gt;hw.iobase);</div><div class='del'>-}				/* orinoco_cs_release */</div><div class='del'>-</div><div class='del'>-static int orinoco_cs_suspend(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = link-&gt;priv;</div><div class='del'>-	struct orinoco_pccard *card = priv-&gt;card;</div><div class='del'>-</div><div class='del'>-	/* This is probably racy, but I can't think of</div><div class='del'>-	   a better way, short of rewriting the PCMCIA</div><div class='del'>-	   layer to not suck :-( */</div><div class='del'>-	if (!test_bit(0, &amp;card-&gt;hard_reset_in_progress))</div><div class='del'>-		orinoco_down(priv);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_cs_resume(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = link-&gt;priv;</div><div class='del'>-	struct orinoco_pccard *card = priv-&gt;card;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(0, &amp;card-&gt;hard_reset_in_progress))</div><div class='del'>-		err = orinoco_up(priv);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Module initialization					    */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-static const struct pcmcia_device_id orinoco_cs_ids[] = {</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), /* 3Com AirConnect PCI 777A */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x016b, 0x0001), /* Ericsson WLAN Card C11 */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x01eb, 0x080a), /* Nortel Networks eMobility 802.11 Wireless Adapter */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x0261, 0x0002), /* AirWay 802.11 Adapter (PCMCIA) */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x0268, 0x0001), /* ARtem Onair */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x0268, 0x0003), /* ARtem Onair Comcard 11 */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x026f, 0x0305), /* Buffalo WLI-PCM-S11 */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x02aa, 0x0002), /* ASUS SpaceLink WL-100 */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x02ac, 0x0002), /* SpeedStream SS1021 Wireless Adapter */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x02ac, 0x3021), /* SpeedStream Wireless Adapter */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x14ea, 0xb001), /* PLANEX RoadLannerWave GW-NS11H */</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("3Com", "3CRWE737A AirConnect Wireless LAN PC Card", 0x41240e5b, 0x56010af3),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("Allied Telesyn", "AT-WCL452 Wireless PCMCIA Radio", 0x5cd01705, 0x4271660f),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("ASUS", "802_11B_CF_CARD_25", 0x78fc06ee, 0x45a50c1e),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("ASUS", "802_11b_PC_CARD_25", 0x78fc06ee, 0xdb9aa842),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("Avaya Communication", "Avaya Wireless PC Card", 0xd8a43b78, 0x0d341169),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("BENQ", "AWL100 PCMCIA ADAPTER", 0x35dadc74, 0x01f7fedb),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("Cabletron", "RoamAbout 802.11 DS", 0x32d445f5, 0xedeffd90),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("D-Link Corporation", "D-Link DWL-650H 11Mbps WLAN Adapter", 0xef544d24, 0xcd8ea916),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("ELSA", "AirLancer MC-11", 0x4507a33a, 0xef54f0e3),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("HyperLink", "Wireless PC Card 11Mbps", 0x56cc3f1a, 0x0bcf220c),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("Intel", "PRO/Wireless 2011 LAN PC Card", 0x816cc815, 0x07f58077),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("LeArtery", "SYNCBYAIR 11Mbps Wireless LAN PC Card", 0x7e3b326a, 0x49893e92),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("Lucent Technologies", "WaveLAN/IEEE", 0x23eb9949, 0xc562e72a),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("MELCO", "WLI-PCM-L11", 0x481e0094, 0x7360e410),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("MELCO", "WLI-PCM-L11G", 0x481e0094, 0xf57ca4b3),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("NCR", "WaveLAN/IEEE", 0x24358cd4, 0xc562e72a),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("Nortel Networks", "emobility 802.11 Wireless LAN PC Card", 0x2d617ea0, 0x88cd5767),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("OTC", "Wireless AirEZY 2411-PCC WLAN Card", 0x4ac44287, 0x235a6bed),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PC CARD HARMONY 80211B", 0xc6536a5e, 0x090c3cd9),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PCI CARD HARMONY 80211B", 0xc6536a5e, 0x9f494e26),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "11Mbps WLAN Card", 0x43d74cb4, 0x579bd91b),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("Symbol Technologies", "LA4111 Spectrum24 Wireless LAN PC Card", 0x3f02b4d6, 0x3663cb0e),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD_PROD_ID3(0x0156, 0x0002, "Version 01.01", 0xd27deb1a), /* Lucent Orinoco */</div><div class='del'>-#ifdef CONFIG_HERMES_PRISM</div><div class='del'>-	/* Only entries that certainly identify Prism chipset */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100), /* SonicWALL Long Range Wireless Card */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300), /* Sohoware NCP110, Philips 802.11b */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x0089, 0x0002), /* AnyPoint(TM) Wireless II PC Card */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000), /* PROXIM RangeLAN-DS/LAN PC CARD */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002), /* Compaq WL100 11 Mbps Wireless Adapter */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x01ff, 0x0008), /* Intermec MobileLAN 11Mbps 802.11b WLAN Card */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002), /* Samsung SWL2000-N 11Mb/s WLAN Card */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612), /* Linksys WPC11 Version 2.5 */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1613), /* Linksys WPC11 Version 3 */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0002), /* Compaq HNW-100 11 Mbps Wireless Adapter */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0673), /* Linksys WCF12 Wireless CompactFlash Card */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300), /* Airvast WN-100 */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x9005, 0x0021), /* Adaptec Ultra Wireless ANW-8030 */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0xc001, 0x0008), /* CONTEC FLEXSCAN/FX-DDS110-PCC */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0xc250, 0x0002), /* Conceptronic CON11Cpro, EMTAC A2424i */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), /* Safeway 802.11b, ZCOMAX AirRunner/XI-300 */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), /* D-Link DCF660, Sandisk Connect SDWCFB-000 */</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID123("Instant Wireless ", " Network PC CARD", "Version 01.02", 0x11d901af, 0x6e9bd926, 0x4b74baa0),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("ACTIONTEC", "PRISM Wireless LAN PC Card", 0x393089da, 0xa71e69d5),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("Addtron", "AWP-100 Wireless PCMCIA", 0xe6ec52ce, 0x08649af2),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("BUFFALO", "WLI-CF-S11G", 0x2decece3, 0x82067c18),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("BUFFALO", "WLI-PCM-L11G", 0x2decece3, 0xf57ca4b3),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("Compaq", "WL200_11Mbps_Wireless_PCI_Card", 0x54f7c49c, 0x15a75e5b),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("corega K.K.", "Wireless LAN PCC-11", 0x5261440f, 0xa6405584),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("corega K.K.", "Wireless LAN PCCA-11", 0x5261440f, 0xdf6115f9),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("corega_K.K.", "Wireless_LAN_PCCB-11", 0x29e33311, 0xee7a27ae),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("Digital Data Communications", "WPC-0100", 0xfdd73470, 0xe0b6f146),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("D", "Link DRC-650 11Mbps WLAN Card", 0x71b18589, 0xf144e3ac),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("D", "Link DWL-650 11Mbps WLAN Card", 0x71b18589, 0xb6f1b0ab),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12(" ", "IEEE 802.11 Wireless LAN/PC Card", 0x3b6e20c8, 0xefccafe9),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE", 0x74c5e40d, 0xdb472a18),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("INTERSIL", "I-GATE 11M PC Card / PC Card plus", 0x74c5e40d, 0x8304ff77),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("Intersil", "PRISM 2_5 PCMCIA ADAPTER", 0x4b801a17, 0x6345a0bf),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("Linksys", "Wireless CompactFlash Card", 0x0733cc81, 0x0c52f395),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("Microsoft", "Wireless Notebook Adapter MN-520", 0x5961bf85, 0x6eec8c01),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("NETGEAR MA401RA Wireless PC", "Card", 0x0306467f, 0x9762e8f1),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("NETGEAR MA401 Wireless PC", "Card", 0xa37434e9, 0x9762e8f1),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("OEM", "PRISM2 IEEE 802.11 PC-Card", 0xfea54c90, 0x48f2bdd6),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("PLANEX", "GeoWave/GW-CF110", 0x209f40ab, 0xd9715264),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("PLANEX", "GeoWave/GW-NS110", 0x209f40ab, 0x46263178),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("SMC", "SMC2532W-B EliteConnect Wireless Adapter", 0xc4f8b18b, 0x196bd757),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("SMC", "SMC2632W", 0xc4f8b18b, 0x474a1f2a),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("ZoomAir 11Mbps High", "Rate wireless Networking", 0x273fe3db, 0x32a1eaee),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID3("HFA3863", 0x355cb092),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID3("ISL37100P", 0x630d52b2),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID3("ISL37101P-10", 0xdd97a26b),</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID3("ISL37300P", 0xc9049a39),</div><div class='del'>-</div><div class='del'>-	/* This may be Agere or Intersil Firmware */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002),</div><div class='del'>-#endif</div><div class='del'>-	PCMCIA_DEVICE_NULL,</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(pcmcia, orinoco_cs_ids);</div><div class='del'>-</div><div class='del'>-static struct pcmcia_driver orinoco_driver = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.name		= DRIVER_NAME,</div><div class='del'>-	.probe		= orinoco_cs_probe,</div><div class='del'>-	.remove		= orinoco_cs_detach,</div><div class='del'>-	.id_table       = orinoco_cs_ids,</div><div class='del'>-	.suspend	= orinoco_cs_suspend,</div><div class='del'>-	.resume		= orinoco_cs_resume,</div><div class='del'>-};</div><div class='del'>-module_pcmcia_driver(orinoco_driver);</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_nortel.c b/drivers/net/wireless/intersil/orinoco/orinoco_nortel.c<br/>deleted file mode 100644<br/>index 18bd0d9876c2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/orinoco_nortel.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/orinoco_nortel.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,314 +0,0 @@</div><div class='del'>-/* orinoco_nortel.c</div><div class='del'>- *</div><div class='del'>- * Driver for Prism II devices which would usually be driven by orinoco_cs,</div><div class='del'>- * but are connected to the PCI bus by a PCI-to-PCMCIA adapter used in</div><div class='del'>- * Nortel emobility, Symbol LA-4113 and Symbol LA-4123.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2002 Tobias Hoffmann</div><div class='del'>- *           (C) 2003 Christoph Jungegger &lt;disdos@traum404.de&gt;</div><div class='del'>- *</div><div class='del'>- * Some of this code is borrowed from orinoco_plx.c</div><div class='del'>- *	Copyright (C) 2001 Daniel Barlow</div><div class='del'>- * Some of this code is borrowed from orinoco_pci.c</div><div class='del'>- *  Copyright (C) 2001 Jean Tourrilhes</div><div class='del'>- * Some of this code is "inspired" by linux-wlan-ng-0.1.10, but nothing</div><div class='del'>- * has been copied from it. linux-wlan-ng-0.1.10 is originally :</div><div class='del'>- *	Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='del'>- *</div><div class='del'>- * The contents of this file are subject to the Mozilla Public License</div><div class='del'>- * Version 1.1 (the "License"); you may not use this file except in</div><div class='del'>- * compliance with the License. You may obtain a copy of the License</div><div class='del'>- * at http://www.mozilla.org/MPL/</div><div class='del'>- *</div><div class='del'>- * Software distributed under the License is distributed on an "AS IS"</div><div class='del'>- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See</div><div class='del'>- * the License for the specific language governing rights and</div><div class='del'>- * limitations under the License.</div><div class='del'>- *</div><div class='del'>- * Alternatively, the contents of this file may be used under the</div><div class='del'>- * terms of the GNU General Public License version 2 (the "GPL"), in</div><div class='del'>- * which case the provisions of the GPL are applicable instead of the</div><div class='del'>- * above.  If you wish to allow the use of your version of this file</div><div class='del'>- * only under the terms of the GPL and not to allow others to use your</div><div class='del'>- * version of this file under the MPL, indicate your decision by</div><div class='del'>- * deleting the provisions above and replace them with the notice and</div><div class='del'>- * other provisions required by the GPL.  If you do not delete the</div><div class='del'>- * provisions above, a recipient may use your version of this file</div><div class='del'>- * under either the MPL or the GPL.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define DRIVER_NAME "orinoco_nortel"</div><div class='del'>-#define PFX DRIVER_NAME ": "</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;pcmcia/cisreg.h&gt;</div><div class='del'>-</div><div class='del'>-#include "orinoco.h"</div><div class='del'>-#include "orinoco_pci.h"</div><div class='del'>-</div><div class='del'>-#define COR_OFFSET    (0xe0)	/* COR attribute offset of Prism2 PC card */</div><div class='del'>-#define COR_VALUE     (COR_LEVEL_REQ | COR_FUNC_ENA)	/* Enable PC card with interrupt in level trigger */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Do a soft reset of the card using the Configuration Option Register</div><div class='del'>- * We need this to get going...</div><div class='del'>- * This is the part of the code that is strongly inspired from wlan-ng</div><div class='del'>- *</div><div class='del'>- * Note bis : Don't try to access HERMES_CMD during the reset phase.</div><div class='del'>- * It just won't work !</div><div class='del'>- */</div><div class='del'>-static int orinoco_nortel_cor_reset(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_pci_card *card = priv-&gt;card;</div><div class='del'>-</div><div class='del'>-	/* Assert the reset until the card notices */</div><div class='del'>-	iowrite16(8, card-&gt;bridge_io + 2);</div><div class='del'>-	ioread16(card-&gt;attr_io + COR_OFFSET);</div><div class='del'>-	iowrite16(0x80, card-&gt;attr_io + COR_OFFSET);</div><div class='del'>-	mdelay(1);</div><div class='del'>-</div><div class='del'>-	/* Give time for the card to recover from this hard effort */</div><div class='del'>-	iowrite16(0, card-&gt;attr_io + COR_OFFSET);</div><div class='del'>-	iowrite16(0, card-&gt;attr_io + COR_OFFSET);</div><div class='del'>-	mdelay(1);</div><div class='del'>-</div><div class='del'>-	/* Set COR as usual */</div><div class='del'>-	iowrite16(COR_VALUE, card-&gt;attr_io + COR_OFFSET);</div><div class='del'>-	iowrite16(COR_VALUE, card-&gt;attr_io + COR_OFFSET);</div><div class='del'>-	mdelay(1);</div><div class='del'>-</div><div class='del'>-	iowrite16(0x228, card-&gt;bridge_io + 2);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_nortel_hw_init(struct orinoco_pci_card *card)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	/* Setup bridge */</div><div class='del'>-	if (ioread16(card-&gt;bridge_io) &amp; 1) {</div><div class='del'>-		printk(KERN_ERR PFX "brg1 answer1 wrong\n");</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	iowrite16(0x118, card-&gt;bridge_io + 2);</div><div class='del'>-	iowrite16(0x108, card-&gt;bridge_io + 2);</div><div class='del'>-	mdelay(30);</div><div class='del'>-	iowrite16(0x8, card-&gt;bridge_io + 2);</div><div class='del'>-	for (i = 0; i &lt; 30; i++) {</div><div class='del'>-		mdelay(30);</div><div class='del'>-		if (ioread16(card-&gt;bridge_io) &amp; 0x10)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (i == 30) {</div><div class='del'>-		printk(KERN_ERR PFX "brg1 timed out\n");</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	if (ioread16(card-&gt;attr_io + COR_OFFSET) &amp; 1) {</div><div class='del'>-		printk(KERN_ERR PFX "brg2 answer1 wrong\n");</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	if (ioread16(card-&gt;attr_io + COR_OFFSET + 2) &amp; 1) {</div><div class='del'>-		printk(KERN_ERR PFX "brg2 answer2 wrong\n");</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	if (ioread16(card-&gt;attr_io + COR_OFFSET + 4) &amp; 1) {</div><div class='del'>-		printk(KERN_ERR PFX "brg2 answer3 wrong\n");</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the PCMCIA COR register */</div><div class='del'>-	iowrite16(COR_VALUE, card-&gt;attr_io + COR_OFFSET);</div><div class='del'>-	mdelay(1);</div><div class='del'>-	reg = ioread16(card-&gt;attr_io + COR_OFFSET);</div><div class='del'>-	if (reg != COR_VALUE) {</div><div class='del'>-		printk(KERN_ERR PFX "Error setting COR value (reg=%x)\n",</div><div class='del'>-		       reg);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set LEDs */</div><div class='del'>-	iowrite16(1, card-&gt;bridge_io + 10);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_nortel_init_one(struct pci_dev *pdev,</div><div class='del'>-				   const struct pci_device_id *ent)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct orinoco_private *priv;</div><div class='del'>-	struct orinoco_pci_card *card;</div><div class='del'>-	void __iomem *hermes_io, *bridge_io, *attr_io;</div><div class='del'>-</div><div class='del'>-	err = pci_enable_device(pdev);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot enable PCI device\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = pci_request_regions(pdev, DRIVER_NAME);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot obtain PCI resources\n");</div><div class='del'>-		goto fail_resources;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bridge_io = pci_iomap(pdev, 0, 0);</div><div class='del'>-	if (!bridge_io) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot map bridge registers\n");</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto fail_map_bridge;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	attr_io = pci_iomap(pdev, 1, 0);</div><div class='del'>-	if (!attr_io) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot map PCMCIA attributes\n");</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto fail_map_attr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hermes_io = pci_iomap(pdev, 2, 0);</div><div class='del'>-	if (!hermes_io) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot map chipset registers\n");</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto fail_map_hermes;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Allocate network device */</div><div class='del'>-	priv = alloc_orinocodev(sizeof(*card), &amp;pdev-&gt;dev,</div><div class='del'>-				orinoco_nortel_cor_reset, NULL);</div><div class='del'>-	if (!priv) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot allocate network device\n");</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto fail_alloc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	card = priv-&gt;card;</div><div class='del'>-	card-&gt;bridge_io = bridge_io;</div><div class='del'>-	card-&gt;attr_io = attr_io;</div><div class='del'>-</div><div class='del'>-	hermes_struct_init(&amp;priv-&gt;hw, hermes_io, HERMES_16BIT_REGSPACING);</div><div class='del'>-</div><div class='del'>-	err = request_irq(pdev-&gt;irq, orinoco_interrupt, IRQF_SHARED,</div><div class='del'>-			  DRIVER_NAME, priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev-&gt;irq);</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto fail_irq;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = orinoco_nortel_hw_init(card);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Hardware initialization failed\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = orinoco_nortel_cor_reset(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Initial reset failed\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = orinoco_init(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "orinoco_init() failed\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = orinoco_if_add(priv, 0, 0, NULL);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "orinoco_if_add() failed\n");</div><div class='del'>-		goto fail_wiphy;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pci_set_drvdata(pdev, priv);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- fail_wiphy:</div><div class='del'>-	wiphy_unregister(priv_to_wiphy(priv));</div><div class='del'>- fail:</div><div class='del'>-	free_irq(pdev-&gt;irq, priv);</div><div class='del'>-</div><div class='del'>- fail_irq:</div><div class='del'>-	free_orinocodev(priv);</div><div class='del'>-</div><div class='del'>- fail_alloc:</div><div class='del'>-	pci_iounmap(pdev, hermes_io);</div><div class='del'>-</div><div class='del'>- fail_map_hermes:</div><div class='del'>-	pci_iounmap(pdev, attr_io);</div><div class='del'>-</div><div class='del'>- fail_map_attr:</div><div class='del'>-	pci_iounmap(pdev, bridge_io);</div><div class='del'>-</div><div class='del'>- fail_map_bridge:</div><div class='del'>-	pci_release_regions(pdev);</div><div class='del'>-</div><div class='del'>- fail_resources:</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void orinoco_nortel_remove_one(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = pci_get_drvdata(pdev);</div><div class='del'>-	struct orinoco_pci_card *card = priv-&gt;card;</div><div class='del'>-</div><div class='del'>-	/* Clear LEDs */</div><div class='del'>-	iowrite16(0, card-&gt;bridge_io + 10);</div><div class='del'>-</div><div class='del'>-	orinoco_if_del(priv);</div><div class='del'>-	wiphy_unregister(priv_to_wiphy(priv));</div><div class='del'>-	free_irq(pdev-&gt;irq, priv);</div><div class='del'>-	free_orinocodev(priv);</div><div class='del'>-	pci_iounmap(pdev, priv-&gt;hw.iobase);</div><div class='del'>-	pci_iounmap(pdev, card-&gt;attr_io);</div><div class='del'>-	pci_iounmap(pdev, card-&gt;bridge_io);</div><div class='del'>-	pci_release_regions(pdev);</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct pci_device_id orinoco_nortel_id_table[] = {</div><div class='del'>-	/* Nortel emobility PCI */</div><div class='del'>-	{0x126c, 0x8030, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='del'>-	/* Symbol LA-4123 PCI */</div><div class='del'>-	{0x1562, 0x0001, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='del'>-	{0,},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_DEVICE_TABLE(pci, orinoco_nortel_id_table);</div><div class='del'>-</div><div class='del'>-static struct pci_driver orinoco_nortel_driver = {</div><div class='del'>-	.name		= DRIVER_NAME,</div><div class='del'>-	.id_table	= orinoco_nortel_id_table,</div><div class='del'>-	.probe		= orinoco_nortel_init_one,</div><div class='del'>-	.remove		= orinoco_nortel_remove_one,</div><div class='del'>-	.driver.pm	= &amp;orinoco_pci_pm_ops,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION</div><div class='del'>-	" (Tobias Hoffmann &amp; Christoph Jungegger &lt;disdos@traum404.de&gt;)";</div><div class='del'>-MODULE_AUTHOR("Christoph Jungegger &lt;disdos@traum404.de&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Driver for wireless LAN cards using the Nortel PCI bridge");</div><div class='del'>-MODULE_LICENSE("Dual MPL/GPL");</div><div class='del'>-</div><div class='del'>-static int __init orinoco_nortel_init(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_DEBUG "%s\n", version);</div><div class='del'>-	return pci_register_driver(&amp;orinoco_nortel_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit orinoco_nortel_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;orinoco_nortel_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(orinoco_nortel_init);</div><div class='del'>-module_exit(orinoco_nortel_exit);</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_pci.c b/drivers/net/wireless/intersil/orinoco/orinoco_pci.c<br/>deleted file mode 100644<br/>index 7e3a6dd60c15..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/orinoco_pci.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/orinoco_pci.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,257 +0,0 @@</div><div class='del'>-/* orinoco_pci.c</div><div class='del'>- *</div><div class='del'>- * Driver for Prism 2.5/3 devices that have a direct PCI interface</div><div class='del'>- * (i.e. these are not PCMCIA cards in a PCMCIA-to-PCI bridge).</div><div class='del'>- * The card contains only one PCI region, which contains all the usual</div><div class='del'>- * hermes registers, as well as the COR register.</div><div class='del'>- *</div><div class='del'>- * Current maintainers are:</div><div class='del'>- *	Pavel Roskin &lt;proski AT gnu.org&gt;</div><div class='del'>- * and	David Gibson &lt;hermes AT gibson.dropbear.id.au&gt;</div><div class='del'>- *</div><div class='del'>- * Some of this code is borrowed from orinoco_plx.c</div><div class='del'>- *	Copyright (C) 2001 Daniel Barlow &lt;dan AT telent.net&gt;</div><div class='del'>- * Some of this code is "inspired" by linux-wlan-ng-0.1.10, but nothing</div><div class='del'>- * has been copied from it. linux-wlan-ng-0.1.10 is originally :</div><div class='del'>- *	Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='del'>- * This file originally written by:</div><div class='del'>- *	Copyright (C) 2001 Jean Tourrilhes &lt;jt AT hpl.hp.com&gt;</div><div class='del'>- * And is now maintained by:</div><div class='del'>- *	(C) Copyright David Gibson, IBM Corp. 2002-2003.</div><div class='del'>- *</div><div class='del'>- * The contents of this file are subject to the Mozilla Public License</div><div class='del'>- * Version 1.1 (the "License"); you may not use this file except in</div><div class='del'>- * compliance with the License. You may obtain a copy of the License</div><div class='del'>- * at http://www.mozilla.org/MPL/</div><div class='del'>- *</div><div class='del'>- * Software distributed under the License is distributed on an "AS IS"</div><div class='del'>- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See</div><div class='del'>- * the License for the specific language governing rights and</div><div class='del'>- * limitations under the License.</div><div class='del'>- *</div><div class='del'>- * Alternatively, the contents of this file may be used under the</div><div class='del'>- * terms of the GNU General Public License version 2 (the "GPL"), in</div><div class='del'>- * which case the provisions of the GPL are applicable instead of the</div><div class='del'>- * above.  If you wish to allow the use of your version of this file</div><div class='del'>- * only under the terms of the GPL and not to allow others to use your</div><div class='del'>- * version of this file under the MPL, indicate your decision by</div><div class='del'>- * deleting the provisions above and replace them with the notice and</div><div class='del'>- * other provisions required by the GPL.  If you do not delete the</div><div class='del'>- * provisions above, a recipient may use your version of this file</div><div class='del'>- * under either the MPL or the GPL.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define DRIVER_NAME "orinoco_pci"</div><div class='del'>-#define PFX DRIVER_NAME ": "</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-</div><div class='del'>-#include "orinoco.h"</div><div class='del'>-#include "orinoco_pci.h"</div><div class='del'>-</div><div class='del'>-/* Offset of the COR register of the PCI card */</div><div class='del'>-#define HERMES_PCI_COR		(0x26)</div><div class='del'>-</div><div class='del'>-/* Bitmask to reset the card */</div><div class='del'>-#define HERMES_PCI_COR_MASK	(0x0080)</div><div class='del'>-</div><div class='del'>-/* Magic timeouts for doing the reset.</div><div class='del'>- * Those times are straight from wlan-ng, and it is claimed that they</div><div class='del'>- * are necessary. Alan will kill me. Take your time and grab a coffee. */</div><div class='del'>-#define HERMES_PCI_COR_ONT	(250)		/* ms */</div><div class='del'>-#define HERMES_PCI_COR_OFFT	(500)		/* ms */</div><div class='del'>-#define HERMES_PCI_COR_BUSYT	(500)		/* ms */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Do a soft reset of the card using the Configuration Option Register</div><div class='del'>- * We need this to get going...</div><div class='del'>- * This is the part of the code that is strongly inspired from wlan-ng</div><div class='del'>- *</div><div class='del'>- * Note : This code is done with irq enabled. This mean that many</div><div class='del'>- * interrupts will occur while we are there. This is why we use the</div><div class='del'>- * jiffies to regulate time instead of a straight mdelay(). Usually we</div><div class='del'>- * need only around 245 iteration of the loop to do 250 ms delay.</div><div class='del'>- *</div><div class='del'>- * Note bis : Don't try to access HERMES_CMD during the reset phase.</div><div class='del'>- * It just won't work !</div><div class='del'>- */</div><div class='del'>-static int orinoco_pci_cor_reset(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	unsigned long timeout;</div><div class='del'>-	u16 reg;</div><div class='del'>-</div><div class='del'>-	/* Assert the reset until the card notices */</div><div class='del'>-	hermes_write_regn(hw, PCI_COR, HERMES_PCI_COR_MASK);</div><div class='del'>-	mdelay(HERMES_PCI_COR_ONT);</div><div class='del'>-</div><div class='del'>-	/* Give time for the card to recover from this hard effort */</div><div class='del'>-	hermes_write_regn(hw, PCI_COR, 0x0000);</div><div class='del'>-	mdelay(HERMES_PCI_COR_OFFT);</div><div class='del'>-</div><div class='del'>-	/* The card is ready when it's no longer busy */</div><div class='del'>-	timeout = jiffies + msecs_to_jiffies(HERMES_PCI_COR_BUSYT);</div><div class='del'>-	reg = hermes_read_regn(hw, CMD);</div><div class='del'>-	while (time_before(jiffies, timeout) &amp;&amp; (reg &amp; HERMES_CMD_BUSY)) {</div><div class='del'>-		mdelay(1);</div><div class='del'>-		reg = hermes_read_regn(hw, CMD);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Still busy? */</div><div class='del'>-	if (reg &amp; HERMES_CMD_BUSY) {</div><div class='del'>-		printk(KERN_ERR PFX "Busy timeout\n");</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_pci_init_one(struct pci_dev *pdev,</div><div class='del'>-				const struct pci_device_id *ent)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct orinoco_private *priv;</div><div class='del'>-	struct orinoco_pci_card *card;</div><div class='del'>-	void __iomem *hermes_io;</div><div class='del'>-</div><div class='del'>-	err = pci_enable_device(pdev);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot enable PCI device\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = pci_request_regions(pdev, DRIVER_NAME);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot obtain PCI resources\n");</div><div class='del'>-		goto fail_resources;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hermes_io = pci_iomap(pdev, 0, 0);</div><div class='del'>-	if (!hermes_io) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot remap chipset registers\n");</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto fail_map_hermes;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Allocate network device */</div><div class='del'>-	priv = alloc_orinocodev(sizeof(*card), &amp;pdev-&gt;dev,</div><div class='del'>-				orinoco_pci_cor_reset, NULL);</div><div class='del'>-	if (!priv) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot allocate network device\n");</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto fail_alloc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	card = priv-&gt;card;</div><div class='del'>-</div><div class='del'>-	hermes_struct_init(&amp;priv-&gt;hw, hermes_io, HERMES_32BIT_REGSPACING);</div><div class='del'>-</div><div class='del'>-	err = request_irq(pdev-&gt;irq, orinoco_interrupt, IRQF_SHARED,</div><div class='del'>-			  DRIVER_NAME, priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev-&gt;irq);</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto fail_irq;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = orinoco_pci_cor_reset(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Initial reset failed\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = orinoco_init(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "orinoco_init() failed\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = orinoco_if_add(priv, 0, 0, NULL);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "orinoco_if_add() failed\n");</div><div class='del'>-		goto fail_wiphy;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pci_set_drvdata(pdev, priv);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- fail_wiphy:</div><div class='del'>-	wiphy_unregister(priv_to_wiphy(priv));</div><div class='del'>- fail:</div><div class='del'>-	free_irq(pdev-&gt;irq, priv);</div><div class='del'>-</div><div class='del'>- fail_irq:</div><div class='del'>-	free_orinocodev(priv);</div><div class='del'>-</div><div class='del'>- fail_alloc:</div><div class='del'>-	pci_iounmap(pdev, hermes_io);</div><div class='del'>-</div><div class='del'>- fail_map_hermes:</div><div class='del'>-	pci_release_regions(pdev);</div><div class='del'>-</div><div class='del'>- fail_resources:</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void orinoco_pci_remove_one(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = pci_get_drvdata(pdev);</div><div class='del'>-</div><div class='del'>-	orinoco_if_del(priv);</div><div class='del'>-	wiphy_unregister(priv_to_wiphy(priv));</div><div class='del'>-	free_irq(pdev-&gt;irq, priv);</div><div class='del'>-	free_orinocodev(priv);</div><div class='del'>-	pci_iounmap(pdev, priv-&gt;hw.iobase);</div><div class='del'>-	pci_release_regions(pdev);</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct pci_device_id orinoco_pci_id_table[] = {</div><div class='del'>-	/* Intersil Prism 3 */</div><div class='del'>-	{0x1260, 0x3872, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='del'>-	/* Intersil Prism 2.5 */</div><div class='del'>-	{0x1260, 0x3873, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='del'>-	/* Samsung MagicLAN SWL-2210P */</div><div class='del'>-	{0x167d, 0xa000, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='del'>-	{0,},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_DEVICE_TABLE(pci, orinoco_pci_id_table);</div><div class='del'>-</div><div class='del'>-static struct pci_driver orinoco_pci_driver = {</div><div class='del'>-	.name		= DRIVER_NAME,</div><div class='del'>-	.id_table	= orinoco_pci_id_table,</div><div class='del'>-	.probe		= orinoco_pci_init_one,</div><div class='del'>-	.remove		= orinoco_pci_remove_one,</div><div class='del'>-	.driver.pm	= &amp;orinoco_pci_pm_ops,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION</div><div class='del'>-	" (Pavel Roskin &lt;proski@gnu.org&gt;,"</div><div class='del'>-	" David Gibson &lt;hermes@gibson.dropbear.id.au&gt; &amp;"</div><div class='del'>-	" Jean Tourrilhes &lt;jt@hpl.hp.com&gt;)";</div><div class='del'>-MODULE_AUTHOR("Pavel Roskin &lt;proski@gnu.org&gt; &amp;"</div><div class='del'>-	      " David Gibson &lt;hermes@gibson.dropbear.id.au&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Driver for wireless LAN cards using direct PCI interface");</div><div class='del'>-MODULE_LICENSE("Dual MPL/GPL");</div><div class='del'>-</div><div class='del'>-static int __init orinoco_pci_init(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_DEBUG "%s\n", version);</div><div class='del'>-	return pci_register_driver(&amp;orinoco_pci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit orinoco_pci_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;orinoco_pci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(orinoco_pci_init);</div><div class='del'>-module_exit(orinoco_pci_exit);</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_pci.h b/drivers/net/wireless/intersil/orinoco/orinoco_pci.h<br/>deleted file mode 100644<br/>index d49d940864b4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/orinoco_pci.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/orinoco_pci.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,54 +0,0 @@</div><div class='del'>-/* orinoco_pci.h</div><div class='del'>- *</div><div class='del'>- * Common code for all Orinoco drivers for PCI devices, including</div><div class='del'>- * both native PCI and PCMCIA-to-PCI bridges.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2005, Pavel Roskin.</div><div class='del'>- * See main.c for license.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _ORINOCO_PCI_H</div><div class='del'>-#define _ORINOCO_PCI_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-</div><div class='del'>-/* Driver specific data */</div><div class='del'>-struct orinoco_pci_card {</div><div class='del'>-	void __iomem *bridge_io;</div><div class='del'>-	void __iomem *attr_io;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __maybe_unused orinoco_pci_suspend(struct device *dev_d)</div><div class='del'>-{</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(dev_d);</div><div class='del'>-	struct orinoco_private *priv = pci_get_drvdata(pdev);</div><div class='del'>-</div><div class='del'>-	orinoco_down(priv);</div><div class='del'>-	free_irq(pdev-&gt;irq, priv);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __maybe_unused orinoco_pci_resume(struct device *dev_d)</div><div class='del'>-{</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(dev_d);</div><div class='del'>-	struct orinoco_private *priv = pci_get_drvdata(pdev);</div><div class='del'>-	struct net_device *dev = priv-&gt;ndev;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = request_irq(pdev-&gt;irq, orinoco_interrupt, IRQF_SHARED,</div><div class='del'>-			  dev-&gt;name, priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: cannot re-allocate IRQ on resume\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return orinoco_up(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static SIMPLE_DEV_PM_OPS(orinoco_pci_pm_ops,</div><div class='del'>-			 orinoco_pci_suspend,</div><div class='del'>-			 orinoco_pci_resume);</div><div class='del'>-</div><div class='del'>-#endif /* _ORINOCO_PCI_H */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_plx.c b/drivers/net/wireless/intersil/orinoco/orinoco_plx.c<br/>deleted file mode 100644<br/>index 73e6ae124013..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/orinoco_plx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/orinoco_plx.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,362 +0,0 @@</div><div class='del'>-/* orinoco_plx.c</div><div class='del'>- *</div><div class='del'>- * Driver for Prism II devices which would usually be driven by orinoco_cs,</div><div class='del'>- * but are connected to the PCI bus by a PLX9052.</div><div class='del'>- *</div><div class='del'>- * Current maintainers are:</div><div class='del'>- *	Pavel Roskin &lt;proski AT gnu.org&gt;</div><div class='del'>- * and	David Gibson &lt;hermes AT gibson.dropbear.id.au&gt;</div><div class='del'>- *</div><div class='del'>- * (C) Copyright David Gibson, IBM Corp. 2001-2003.</div><div class='del'>- * Copyright (C) 2001 Daniel Barlow</div><div class='del'>- *</div><div class='del'>- * The contents of this file are subject to the Mozilla Public License</div><div class='del'>- * Version 1.1 (the "License"); you may not use this file except in</div><div class='del'>- * compliance with the License. You may obtain a copy of the License</div><div class='del'>- * at http://www.mozilla.org/MPL/</div><div class='del'>- *</div><div class='del'>- * Software distributed under the License is distributed on an "AS IS"</div><div class='del'>- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See</div><div class='del'>- * the License for the specific language governing rights and</div><div class='del'>- * limitations under the License.</div><div class='del'>- *</div><div class='del'>- * Alternatively, the contents of this file may be used under the</div><div class='del'>- * terms of the GNU General Public License version 2 (the "GPL"), in</div><div class='del'>- * which case the provisions of the GPL are applicable instead of the</div><div class='del'>- * above.  If you wish to allow the use of your version of this file</div><div class='del'>- * only under the terms of the GPL and not to allow others to use your</div><div class='del'>- * version of this file under the MPL, indicate your decision by</div><div class='del'>- * deleting the provisions above and replace them with the notice and</div><div class='del'>- * other provisions required by the GPL.  If you do not delete the</div><div class='del'>- * provisions above, a recipient may use your version of this file</div><div class='del'>- * under either the MPL or the GPL.</div><div class='del'>- *</div><div class='del'>- * Here's the general details on how the PLX9052 adapter works:</div><div class='del'>- *</div><div class='del'>- * - Two PCI I/O address spaces, one 0x80 long which contains the</div><div class='del'>- * PLX9052 registers, and one that's 0x40 long mapped to the PCMCIA</div><div class='del'>- * slot I/O address space.</div><div class='del'>- *</div><div class='del'>- * - One PCI memory address space, mapped to the PCMCIA attribute space</div><div class='del'>- * (containing the CIS).</div><div class='del'>- *</div><div class='del'>- * Using the later, you can read through the CIS data to make sure the</div><div class='del'>- * card is compatible with the driver. Keep in mind that the PCMCIA</div><div class='del'>- * spec specifies the CIS as the lower 8 bits of each word read from</div><div class='del'>- * the CIS, so to read the bytes of the CIS, read every other byte</div><div class='del'>- * (0,2,4,...). Passing that test, you need to enable the I/O address</div><div class='del'>- * space on the PCMCIA card via the PCMCIA COR register. This is the</div><div class='del'>- * first byte following the CIS. In my case (which may not have any</div><div class='del'>- * relation to what's on the PRISM2 cards), COR was at offset 0x800</div><div class='del'>- * within the PCI memory space. Write 0x41 to the COR register to</div><div class='del'>- * enable I/O mode and to select level triggered interrupts. To</div><div class='del'>- * confirm you actually succeeded, read the COR register back and make</div><div class='del'>- * sure it actually got set to 0x41, in case you have an unexpected</div><div class='del'>- * card inserted.</div><div class='del'>- *</div><div class='del'>- * Following that, you can treat the second PCI I/O address space (the</div><div class='del'>- * one that's not 0x80 in length) as the PCMCIA I/O space.</div><div class='del'>- *</div><div class='del'>- * Note that in the Eumitcom's source for their drivers, they register</div><div class='del'>- * the interrupt as edge triggered when registering it with the</div><div class='del'>- * Windows kernel. I don't recall how to register edge triggered on</div><div class='del'>- * Linux (if it can be done at all). But in some experimentation, I</div><div class='del'>- * don't see much operational difference between using either</div><div class='del'>- * interrupt mode. Don't mess with the interrupt mode in the COR</div><div class='del'>- * register though, as the PLX9052 wants level triggers with the way</div><div class='del'>- * the serial EEPROM configures it on the WL11000.</div><div class='del'>- *</div><div class='del'>- * There's some other little quirks related to timing that I bumped</div><div class='del'>- * into, but I don't recall right now. Also, there's two variants of</div><div class='del'>- * the WL11000 I've seen, revision A1 and T2. These seem to differ</div><div class='del'>- * slightly in the timings configured in the wait-state generator in</div><div class='del'>- * the PLX9052. There have also been some comments from Eumitcom that</div><div class='del'>- * cards shouldn't be hot swapped, apparently due to risk of cooking</div><div class='del'>- * the PLX9052. I'm unsure why they believe this, as I can't see</div><div class='del'>- * anything in the design that would really cause a problem, except</div><div class='del'>- * for crashing drivers not written to expect it. And having developed</div><div class='del'>- * drivers for the WL11000, I'd say it's quite tricky to write code</div><div class='del'>- * that will successfully deal with a hot unplug. Very odd things</div><div class='del'>- * happen on the I/O side of things. But anyway, be warned. Despite</div><div class='del'>- * that, I've hot-swapped a number of times during debugging and</div><div class='del'>- * driver development for various reasons (stuck WAIT# line after the</div><div class='del'>- * radio card's firmware locks up).</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define DRIVER_NAME "orinoco_plx"</div><div class='del'>-#define PFX DRIVER_NAME ": "</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;pcmcia/cisreg.h&gt;</div><div class='del'>-</div><div class='del'>-#include "orinoco.h"</div><div class='del'>-#include "orinoco_pci.h"</div><div class='del'>-</div><div class='del'>-#define COR_OFFSET	(0x3e0)	/* COR attribute offset of Prism2 PC card */</div><div class='del'>-#define COR_VALUE	(COR_LEVEL_REQ | COR_FUNC_ENA) /* Enable PC card with interrupt in level trigger */</div><div class='del'>-#define COR_RESET     (0x80)	/* reset bit in the COR register */</div><div class='del'>-#define PLX_RESET_TIME	(500)	/* milliseconds */</div><div class='del'>-</div><div class='del'>-#define PLX_INTCSR		0x4c /* Interrupt Control &amp; Status Register */</div><div class='del'>-#define PLX_INTCSR_INTEN	(1 &lt;&lt; 6) /* Interrupt Enable bit */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Do a soft reset of the card using the Configuration Option Register</div><div class='del'>- */</div><div class='del'>-static int orinoco_plx_cor_reset(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	struct orinoco_pci_card *card = priv-&gt;card;</div><div class='del'>-	unsigned long timeout;</div><div class='del'>-	u16 reg;</div><div class='del'>-</div><div class='del'>-	iowrite8(COR_VALUE | COR_RESET, card-&gt;attr_io + COR_OFFSET);</div><div class='del'>-	mdelay(1);</div><div class='del'>-</div><div class='del'>-	iowrite8(COR_VALUE, card-&gt;attr_io + COR_OFFSET);</div><div class='del'>-	mdelay(1);</div><div class='del'>-</div><div class='del'>-	/* Just in case, wait more until the card is no longer busy */</div><div class='del'>-	timeout = jiffies + msecs_to_jiffies(PLX_RESET_TIME);</div><div class='del'>-	reg = hermes_read_regn(hw, CMD);</div><div class='del'>-	while (time_before(jiffies, timeout) &amp;&amp; (reg &amp; HERMES_CMD_BUSY)) {</div><div class='del'>-		mdelay(1);</div><div class='del'>-		reg = hermes_read_regn(hw, CMD);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Still busy? */</div><div class='del'>-	if (reg &amp; HERMES_CMD_BUSY) {</div><div class='del'>-		printk(KERN_ERR PFX "Busy timeout\n");</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_plx_hw_init(struct orinoco_pci_card *card)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	u32 csr_reg;</div><div class='del'>-	static const u8 cis_magic[] = {</div><div class='del'>-		0x01, 0x03, 0x00, 0x00, 0xff, 0x17, 0x04, 0x67</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG PFX "CIS: ");</div><div class='del'>-	for (i = 0; i &lt; 16; i++)</div><div class='del'>-		printk("%02X:", ioread8(card-&gt;attr_io + (i &lt;&lt; 1)));</div><div class='del'>-	printk("\n");</div><div class='del'>-</div><div class='del'>-	/* Verify whether a supported PC card is present */</div><div class='del'>-	/* FIXME: we probably need to be smarted about this */</div><div class='del'>-	for (i = 0; i &lt; sizeof(cis_magic); i++) {</div><div class='del'>-		if (cis_magic[i] != ioread8(card-&gt;attr_io + (i &lt;&lt; 1))) {</div><div class='del'>-			printk(KERN_ERR PFX "The CIS value of Prism2 PC "</div><div class='del'>-			       "card is unexpected\n");</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* bjoern: We need to tell the card to enable interrupts, in</div><div class='del'>-	   case the serial eprom didn't do this already.  See the</div><div class='del'>-	   PLX9052 data book, p8-1 and 8-24 for reference. */</div><div class='del'>-	csr_reg = ioread32(card-&gt;bridge_io + PLX_INTCSR);</div><div class='del'>-	if (!(csr_reg &amp; PLX_INTCSR_INTEN)) {</div><div class='del'>-		csr_reg |= PLX_INTCSR_INTEN;</div><div class='del'>-		iowrite32(csr_reg, card-&gt;bridge_io + PLX_INTCSR);</div><div class='del'>-		csr_reg = ioread32(card-&gt;bridge_io + PLX_INTCSR);</div><div class='del'>-		if (!(csr_reg &amp; PLX_INTCSR_INTEN)) {</div><div class='del'>-			printk(KERN_ERR PFX "Cannot enable interrupts\n");</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_plx_init_one(struct pci_dev *pdev,</div><div class='del'>-				const struct pci_device_id *ent)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct orinoco_private *priv;</div><div class='del'>-	struct orinoco_pci_card *card;</div><div class='del'>-	void __iomem *hermes_io, *attr_io, *bridge_io;</div><div class='del'>-</div><div class='del'>-	err = pci_enable_device(pdev);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot enable PCI device\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = pci_request_regions(pdev, DRIVER_NAME);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot obtain PCI resources\n");</div><div class='del'>-		goto fail_resources;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bridge_io = pci_iomap(pdev, 1, 0);</div><div class='del'>-	if (!bridge_io) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot map bridge registers\n");</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto fail_map_bridge;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	attr_io = pci_iomap(pdev, 2, 0);</div><div class='del'>-	if (!attr_io) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot map PCMCIA attributes\n");</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto fail_map_attr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hermes_io = pci_iomap(pdev, 3, 0);</div><div class='del'>-	if (!hermes_io) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot map chipset registers\n");</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto fail_map_hermes;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Allocate network device */</div><div class='del'>-	priv = alloc_orinocodev(sizeof(*card), &amp;pdev-&gt;dev,</div><div class='del'>-				orinoco_plx_cor_reset, NULL);</div><div class='del'>-	if (!priv) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot allocate network device\n");</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto fail_alloc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	card = priv-&gt;card;</div><div class='del'>-	card-&gt;bridge_io = bridge_io;</div><div class='del'>-	card-&gt;attr_io = attr_io;</div><div class='del'>-</div><div class='del'>-	hermes_struct_init(&amp;priv-&gt;hw, hermes_io, HERMES_16BIT_REGSPACING);</div><div class='del'>-</div><div class='del'>-	err = request_irq(pdev-&gt;irq, orinoco_interrupt, IRQF_SHARED,</div><div class='del'>-			  DRIVER_NAME, priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev-&gt;irq);</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto fail_irq;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = orinoco_plx_hw_init(card);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Hardware initialization failed\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = orinoco_plx_cor_reset(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Initial reset failed\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = orinoco_init(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "orinoco_init() failed\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = orinoco_if_add(priv, 0, 0, NULL);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "orinoco_if_add() failed\n");</div><div class='del'>-		goto fail_wiphy;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pci_set_drvdata(pdev, priv);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- fail_wiphy:</div><div class='del'>-	wiphy_unregister(priv_to_wiphy(priv));</div><div class='del'>- fail:</div><div class='del'>-	free_irq(pdev-&gt;irq, priv);</div><div class='del'>-</div><div class='del'>- fail_irq:</div><div class='del'>-	free_orinocodev(priv);</div><div class='del'>-</div><div class='del'>- fail_alloc:</div><div class='del'>-	pci_iounmap(pdev, hermes_io);</div><div class='del'>-</div><div class='del'>- fail_map_hermes:</div><div class='del'>-	pci_iounmap(pdev, attr_io);</div><div class='del'>-</div><div class='del'>- fail_map_attr:</div><div class='del'>-	pci_iounmap(pdev, bridge_io);</div><div class='del'>-</div><div class='del'>- fail_map_bridge:</div><div class='del'>-	pci_release_regions(pdev);</div><div class='del'>-</div><div class='del'>- fail_resources:</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void orinoco_plx_remove_one(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = pci_get_drvdata(pdev);</div><div class='del'>-	struct orinoco_pci_card *card = priv-&gt;card;</div><div class='del'>-</div><div class='del'>-	orinoco_if_del(priv);</div><div class='del'>-	wiphy_unregister(priv_to_wiphy(priv));</div><div class='del'>-	free_irq(pdev-&gt;irq, priv);</div><div class='del'>-	free_orinocodev(priv);</div><div class='del'>-	pci_iounmap(pdev, priv-&gt;hw.iobase);</div><div class='del'>-	pci_iounmap(pdev, card-&gt;attr_io);</div><div class='del'>-	pci_iounmap(pdev, card-&gt;bridge_io);</div><div class='del'>-	pci_release_regions(pdev);</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct pci_device_id orinoco_plx_id_table[] = {</div><div class='del'>-	{0x111a, 0x1023, PCI_ANY_ID, PCI_ANY_ID,},	/* Siemens SpeedStream SS1023 */</div><div class='del'>-	{0x1385, 0x4100, PCI_ANY_ID, PCI_ANY_ID,},	/* Netgear MA301 */</div><div class='del'>-	{0x15e8, 0x0130, PCI_ANY_ID, PCI_ANY_ID,},	/* Correga  - does this work? */</div><div class='del'>-	{0x1638, 0x1100, PCI_ANY_ID, PCI_ANY_ID,},	/* SMC EZConnect SMC2602W,</div><div class='del'>-							   Eumitcom PCI WL11000,</div><div class='del'>-							   Addtron AWA-100 */</div><div class='del'>-	{0x16ab, 0x1100, PCI_ANY_ID, PCI_ANY_ID,},	/* Global Sun Tech GL24110P */</div><div class='del'>-	{0x16ab, 0x1101, PCI_ANY_ID, PCI_ANY_ID,},	/* Reported working, but unknown */</div><div class='del'>-	{0x16ab, 0x1102, PCI_ANY_ID, PCI_ANY_ID,},	/* Linksys WDT11 */</div><div class='del'>-	{0x16ec, 0x3685, PCI_ANY_ID, PCI_ANY_ID,},	/* USR 2415 */</div><div class='del'>-	{0xec80, 0xec00, PCI_ANY_ID, PCI_ANY_ID,},	/* Belkin F5D6000 tested by</div><div class='del'>-							   Brendan W. McAdams &lt;rit AT jacked-in.org&gt; */</div><div class='del'>-	{0x10b7, 0x7770, PCI_ANY_ID, PCI_ANY_ID,},	/* 3Com AirConnect PCI tested by</div><div class='del'>-							   Damien Persohn &lt;damien AT persohn.net&gt; */</div><div class='del'>-	{0,},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_DEVICE_TABLE(pci, orinoco_plx_id_table);</div><div class='del'>-</div><div class='del'>-static struct pci_driver orinoco_plx_driver = {</div><div class='del'>-	.name		= DRIVER_NAME,</div><div class='del'>-	.id_table	= orinoco_plx_id_table,</div><div class='del'>-	.probe		= orinoco_plx_init_one,</div><div class='del'>-	.remove		= orinoco_plx_remove_one,</div><div class='del'>-	.driver.pm	= &amp;orinoco_pci_pm_ops,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION</div><div class='del'>-	" (Pavel Roskin &lt;proski@gnu.org&gt;,"</div><div class='del'>-	" David Gibson &lt;hermes@gibson.dropbear.id.au&gt;,"</div><div class='del'>-	" Daniel Barlow &lt;dan@telent.net&gt;)";</div><div class='del'>-MODULE_AUTHOR("Daniel Barlow &lt;dan@telent.net&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Driver for wireless LAN cards using the PLX9052 PCI bridge");</div><div class='del'>-MODULE_LICENSE("Dual MPL/GPL");</div><div class='del'>-</div><div class='del'>-static int __init orinoco_plx_init(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_DEBUG "%s\n", version);</div><div class='del'>-	return pci_register_driver(&amp;orinoco_plx_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit orinoco_plx_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;orinoco_plx_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(orinoco_plx_init);</div><div class='del'>-module_exit(orinoco_plx_exit);</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_tmd.c b/drivers/net/wireless/intersil/orinoco/orinoco_tmd.c<br/>deleted file mode 100644<br/>index 939d5a1dce97..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/orinoco_tmd.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/orinoco_tmd.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,237 +0,0 @@</div><div class='del'>-/* orinoco_tmd.c</div><div class='del'>- *</div><div class='del'>- * Driver for Prism II devices which would usually be driven by orinoco_cs,</div><div class='del'>- * but are connected to the PCI bus by a TMD7160.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2003 Joerg Dorchain &lt;joerg AT dorchain.net&gt;</div><div class='del'>- * based heavily upon orinoco_plx.c Copyright (C) 2001 Daniel Barlow</div><div class='del'>- *</div><div class='del'>- * The contents of this file are subject to the Mozilla Public License</div><div class='del'>- * Version 1.1 (the "License"); you may not use this file except in</div><div class='del'>- * compliance with the License. You may obtain a copy of the License</div><div class='del'>- * at http://www.mozilla.org/MPL/</div><div class='del'>- *</div><div class='del'>- * Software distributed under the License is distributed on an "AS IS"</div><div class='del'>- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See</div><div class='del'>- * the License for the specific language governing rights and</div><div class='del'>- * limitations under the License.</div><div class='del'>- *</div><div class='del'>- * Alternatively, the contents of this file may be used under the</div><div class='del'>- * terms of the GNU General Public License version 2 (the "GPL"), in</div><div class='del'>- * which case the provisions of the GPL are applicable instead of the</div><div class='del'>- * above.  If you wish to allow the use of your version of this file</div><div class='del'>- * only under the terms of the GPL and not to allow others to use your</div><div class='del'>- * version of this file under the MPL, indicate your decision by</div><div class='del'>- * deleting the provisions above and replace them with the notice and</div><div class='del'>- * other provisions required by the GPL.  If you do not delete the</div><div class='del'>- * provisions above, a recipient may use your version of this file</div><div class='del'>- * under either the MPL or the GPL.</div><div class='del'>- *</div><div class='del'>- * The actual driving is done by main.c, this is just resource</div><div class='del'>- * allocation stuff.</div><div class='del'>- *</div><div class='del'>- * This driver is modeled after the orinoco_plx driver. The main</div><div class='del'>- * difference is that the TMD chip has only IO port ranges and doesn't</div><div class='del'>- * provide access to the PCMCIA attribute space.</div><div class='del'>- *</div><div class='del'>- * Pheecom sells cards with the TMD chip as "ASIC version"</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define DRIVER_NAME "orinoco_tmd"</div><div class='del'>-#define PFX DRIVER_NAME ": "</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;pcmcia/cisreg.h&gt;</div><div class='del'>-</div><div class='del'>-#include "orinoco.h"</div><div class='del'>-#include "orinoco_pci.h"</div><div class='del'>-</div><div class='del'>-#define COR_VALUE	(COR_LEVEL_REQ | COR_FUNC_ENA) /* Enable PC card with interrupt in level trigger */</div><div class='del'>-#define COR_RESET     (0x80)	/* reset bit in the COR register */</div><div class='del'>-#define TMD_RESET_TIME	(500)	/* milliseconds */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Do a soft reset of the card using the Configuration Option Register</div><div class='del'>- */</div><div class='del'>-static int orinoco_tmd_cor_reset(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	struct orinoco_pci_card *card = priv-&gt;card;</div><div class='del'>-	unsigned long timeout;</div><div class='del'>-	u16 reg;</div><div class='del'>-</div><div class='del'>-	iowrite8(COR_VALUE | COR_RESET, card-&gt;bridge_io);</div><div class='del'>-	mdelay(1);</div><div class='del'>-</div><div class='del'>-	iowrite8(COR_VALUE, card-&gt;bridge_io);</div><div class='del'>-	mdelay(1);</div><div class='del'>-</div><div class='del'>-	/* Just in case, wait more until the card is no longer busy */</div><div class='del'>-	timeout = jiffies + msecs_to_jiffies(TMD_RESET_TIME);</div><div class='del'>-	reg = hermes_read_regn(hw, CMD);</div><div class='del'>-	while (time_before(jiffies, timeout) &amp;&amp; (reg &amp; HERMES_CMD_BUSY)) {</div><div class='del'>-		mdelay(1);</div><div class='del'>-		reg = hermes_read_regn(hw, CMD);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Still busy? */</div><div class='del'>-	if (reg &amp; HERMES_CMD_BUSY) {</div><div class='del'>-		printk(KERN_ERR PFX "Busy timeout\n");</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int orinoco_tmd_init_one(struct pci_dev *pdev,</div><div class='del'>-				const struct pci_device_id *ent)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct orinoco_private *priv;</div><div class='del'>-	struct orinoco_pci_card *card;</div><div class='del'>-	void __iomem *hermes_io, *bridge_io;</div><div class='del'>-</div><div class='del'>-	err = pci_enable_device(pdev);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot enable PCI device\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = pci_request_regions(pdev, DRIVER_NAME);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot obtain PCI resources\n");</div><div class='del'>-		goto fail_resources;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bridge_io = pci_iomap(pdev, 1, 0);</div><div class='del'>-	if (!bridge_io) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot map bridge registers\n");</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto fail_map_bridge;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hermes_io = pci_iomap(pdev, 2, 0);</div><div class='del'>-	if (!hermes_io) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot map chipset registers\n");</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto fail_map_hermes;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Allocate network device */</div><div class='del'>-	priv = alloc_orinocodev(sizeof(*card), &amp;pdev-&gt;dev,</div><div class='del'>-				orinoco_tmd_cor_reset, NULL);</div><div class='del'>-	if (!priv) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot allocate network device\n");</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto fail_alloc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	card = priv-&gt;card;</div><div class='del'>-	card-&gt;bridge_io = bridge_io;</div><div class='del'>-</div><div class='del'>-	hermes_struct_init(&amp;priv-&gt;hw, hermes_io, HERMES_16BIT_REGSPACING);</div><div class='del'>-</div><div class='del'>-	err = request_irq(pdev-&gt;irq, orinoco_interrupt, IRQF_SHARED,</div><div class='del'>-			  DRIVER_NAME, priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev-&gt;irq);</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto fail_irq;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = orinoco_tmd_cor_reset(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Initial reset failed\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = orinoco_init(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "orinoco_init() failed\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = orinoco_if_add(priv, 0, 0, NULL);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "orinoco_if_add() failed\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pci_set_drvdata(pdev, priv);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- fail:</div><div class='del'>-	free_irq(pdev-&gt;irq, priv);</div><div class='del'>-</div><div class='del'>- fail_irq:</div><div class='del'>-	free_orinocodev(priv);</div><div class='del'>-</div><div class='del'>- fail_alloc:</div><div class='del'>-	pci_iounmap(pdev, hermes_io);</div><div class='del'>-</div><div class='del'>- fail_map_hermes:</div><div class='del'>-	pci_iounmap(pdev, bridge_io);</div><div class='del'>-</div><div class='del'>- fail_map_bridge:</div><div class='del'>-	pci_release_regions(pdev);</div><div class='del'>-</div><div class='del'>- fail_resources:</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void orinoco_tmd_remove_one(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = pci_get_drvdata(pdev);</div><div class='del'>-	struct orinoco_pci_card *card = priv-&gt;card;</div><div class='del'>-</div><div class='del'>-	orinoco_if_del(priv);</div><div class='del'>-	free_irq(pdev-&gt;irq, priv);</div><div class='del'>-	free_orinocodev(priv);</div><div class='del'>-	pci_iounmap(pdev, priv-&gt;hw.iobase);</div><div class='del'>-	pci_iounmap(pdev, card-&gt;bridge_io);</div><div class='del'>-	pci_release_regions(pdev);</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct pci_device_id orinoco_tmd_id_table[] = {</div><div class='del'>-	{0x15e8, 0x0131, PCI_ANY_ID, PCI_ANY_ID,},      /* NDC and OEMs, e.g. pheecom */</div><div class='del'>-	{0,},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_DEVICE_TABLE(pci, orinoco_tmd_id_table);</div><div class='del'>-</div><div class='del'>-static struct pci_driver orinoco_tmd_driver = {</div><div class='del'>-	.name		= DRIVER_NAME,</div><div class='del'>-	.id_table	= orinoco_tmd_id_table,</div><div class='del'>-	.probe		= orinoco_tmd_init_one,</div><div class='del'>-	.remove		= orinoco_tmd_remove_one,</div><div class='del'>-	.driver.pm	= &amp;orinoco_pci_pm_ops,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION</div><div class='del'>-	" (Joerg Dorchain &lt;joerg@dorchain.net&gt;)";</div><div class='del'>-MODULE_AUTHOR("Joerg Dorchain &lt;joerg@dorchain.net&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Driver for wireless LAN cards using the TMD7160 PCI bridge");</div><div class='del'>-MODULE_LICENSE("Dual MPL/GPL");</div><div class='del'>-</div><div class='del'>-static int __init orinoco_tmd_init(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_DEBUG "%s\n", version);</div><div class='del'>-	return pci_register_driver(&amp;orinoco_tmd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit orinoco_tmd_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;orinoco_tmd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(orinoco_tmd_init);</div><div class='del'>-module_exit(orinoco_tmd_exit);</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c<br/>deleted file mode 100644<br/>index dd31929261ab..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/orinoco_usb.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/orinoco_usb.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1787 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * USB Orinoco driver</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2003 Manuel Estrada Sainz</div><div class='del'>- *</div><div class='del'>- * The contents of this file are subject to the Mozilla Public License</div><div class='del'>- * Version 1.1 (the "License"); you may not use this file except in</div><div class='del'>- * compliance with the License. You may obtain a copy of the License</div><div class='del'>- * at http://www.mozilla.org/MPL/</div><div class='del'>- *</div><div class='del'>- * Software distributed under the License is distributed on an "AS IS"</div><div class='del'>- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See</div><div class='del'>- * the License for the specific language governing rights and</div><div class='del'>- * limitations under the License.</div><div class='del'>- *</div><div class='del'>- * Alternatively, the contents of this file may be used under the</div><div class='del'>- * terms of the GNU General Public License version 2 (the "GPL"), in</div><div class='del'>- * which case the provisions of the GPL are applicable instead of the</div><div class='del'>- * above.  If you wish to allow the use of your version of this file</div><div class='del'>- * only under the terms of the GPL and not to allow others to use your</div><div class='del'>- * version of this file under the MPL, indicate your decision by</div><div class='del'>- * deleting the provisions above and replace them with the notice and</div><div class='del'>- * other provisions required by the GPL.  If you do not delete the</div><div class='del'>- * provisions above, a recipient may use your version of this file</div><div class='del'>- * under either the MPL or the GPL.</div><div class='del'>- *</div><div class='del'>- * Queueing code based on linux-wlan-ng 0.2.1-pre5</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.</div><div class='del'>- *</div><div class='del'>- *	The license is the same as above.</div><div class='del'>- *</div><div class='del'>- * Initialy based on USB Skeleton driver - 0.7</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001 Greg Kroah-Hartman (greg@kroah.com)</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License as</div><div class='del'>- *	published by the Free Software Foundation; either version 2 of</div><div class='del'>- *	the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * NOTE: The original USB Skeleton driver is GPL, but all that code is</div><div class='del'>- * gone so MPL/GPL applies.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define DRIVER_NAME "orinoco_usb"</div><div class='del'>-#define PFX DRIVER_NAME ": "</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/signal.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/poll.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/fcntl.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/wireless.h&gt;</div><div class='del'>-#include &lt;linux/firmware.h&gt;</div><div class='del'>-#include &lt;linux/refcount.h&gt;</div><div class='del'>-</div><div class='del'>-#include "mic.h"</div><div class='del'>-#include "orinoco.h"</div><div class='del'>-</div><div class='del'>-#ifndef URB_ASYNC_UNLINK</div><div class='del'>-#define URB_ASYNC_UNLINK 0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct header_struct {</div><div class='del'>-	/* 802.3 */</div><div class='del'>-	u8 dest[ETH_ALEN];</div><div class='del'>-	u8 src[ETH_ALEN];</div><div class='del'>-	__be16 len;</div><div class='del'>-	/* 802.2 */</div><div class='del'>-	u8 dsap;</div><div class='del'>-	u8 ssap;</div><div class='del'>-	u8 ctrl;</div><div class='del'>-	/* SNAP */</div><div class='del'>-	u8 oui[3];</div><div class='del'>-	__be16 ethertype;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct ez_usb_fw {</div><div class='del'>-	u16 size;</div><div class='del'>-	const u8 *code;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct ez_usb_fw firmware = {</div><div class='del'>-	.size = 0,</div><div class='del'>-	.code = NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Debugging macros */</div><div class='del'>-#undef err</div><div class='del'>-#define err(format, arg...) \</div><div class='del'>-	do { printk(KERN_ERR PFX format "\n", ## arg); } while (0)</div><div class='del'>-</div><div class='del'>-MODULE_FIRMWARE("orinoco_ezusb_fw");</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Under some conditions, the card gets stuck and stops paying attention</div><div class='del'>- * to the world (i.e. data communication stalls) until we do something to</div><div class='del'>- * it.  Sending an INQ_TALLIES command seems to be enough and should be</div><div class='del'>- * harmless otherwise.  This behaviour has been observed when using the</div><div class='del'>- * driver on a systemimager client during installation.  In the past a</div><div class='del'>- * timer was used to send INQ_TALLIES commands when there was no other</div><div class='del'>- * activity, but it was troublesome and was removed.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define USB_COMPAQ_VENDOR_ID     0x049f /* Compaq Computer Corp. */</div><div class='del'>-#define USB_COMPAQ_WL215_ID      0x001f /* Compaq WL215 USB Adapter */</div><div class='del'>-#define USB_COMPAQ_W200_ID       0x0076 /* Compaq W200 USB Adapter */</div><div class='del'>-#define USB_HP_WL215_ID          0x0082 /* Compaq WL215 USB Adapter */</div><div class='del'>-</div><div class='del'>-#define USB_MELCO_VENDOR_ID      0x0411</div><div class='del'>-#define USB_BUFFALO_L11_ID       0x0006 /* BUFFALO WLI-USB-L11 */</div><div class='del'>-#define USB_BUFFALO_L11G_WR_ID   0x000B /* BUFFALO WLI-USB-L11G-WR */</div><div class='del'>-#define USB_BUFFALO_L11G_ID      0x000D /* BUFFALO WLI-USB-L11G */</div><div class='del'>-</div><div class='del'>-#define USB_LUCENT_VENDOR_ID     0x047E /* Lucent Technologies */</div><div class='del'>-#define USB_LUCENT_ORINOCO_ID    0x0300 /* Lucent/Agere Orinoco USB Client */</div><div class='del'>-</div><div class='del'>-#define USB_AVAYA8_VENDOR_ID     0x0D98</div><div class='del'>-#define USB_AVAYAE_VENDOR_ID     0x0D9E</div><div class='del'>-#define USB_AVAYA_WIRELESS_ID    0x0300 /* Avaya Wireless USB Card */</div><div class='del'>-</div><div class='del'>-#define USB_AGERE_VENDOR_ID      0x0D4E /* Agere Systems */</div><div class='del'>-#define USB_AGERE_MODEL0801_ID   0x1000 /* Wireless USB Card Model 0801 */</div><div class='del'>-#define USB_AGERE_MODEL0802_ID   0x1001 /* Wireless USB Card Model 0802 */</div><div class='del'>-#define USB_AGERE_REBRANDED_ID   0x047A /* WLAN USB Card */</div><div class='del'>-</div><div class='del'>-#define USB_ELSA_VENDOR_ID       0x05CC</div><div class='del'>-#define USB_ELSA_AIRLANCER_ID    0x3100 /* ELSA AirLancer USB-11 */</div><div class='del'>-</div><div class='del'>-#define USB_LEGEND_VENDOR_ID     0x0E7C</div><div class='del'>-#define USB_LEGEND_JOYNET_ID     0x0300 /* Joynet WLAN USB Card */</div><div class='del'>-</div><div class='del'>-#define USB_SAMSUNG_VENDOR_ID    0x04E8</div><div class='del'>-#define USB_SAMSUNG_SEW2001U1_ID 0x5002 /* Samsung SEW-2001u Card */</div><div class='del'>-#define USB_SAMSUNG_SEW2001U2_ID 0x5B11 /* Samsung SEW-2001u Card */</div><div class='del'>-#define USB_SAMSUNG_SEW2003U_ID  0x7011 /* Samsung SEW-2003U Card */</div><div class='del'>-</div><div class='del'>-#define USB_IGATE_VENDOR_ID      0x0681</div><div class='del'>-#define USB_IGATE_IGATE_11M_ID   0x0012 /* I-GATE 11M USB Card */</div><div class='del'>-</div><div class='del'>-#define USB_FUJITSU_VENDOR_ID    0x0BF8</div><div class='del'>-#define USB_FUJITSU_E1100_ID     0x1002 /* connect2AIR WLAN E-1100 USB */</div><div class='del'>-</div><div class='del'>-#define USB_2WIRE_VENDOR_ID      0x1630</div><div class='del'>-#define USB_2WIRE_WIRELESS_ID    0xff81 /* 2Wire Wireless USB adapter */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define EZUSB_REQUEST_FW_TRANS		0xA0</div><div class='del'>-#define EZUSB_REQUEST_TRIGGER		0xAA</div><div class='del'>-#define EZUSB_REQUEST_TRIG_AC		0xAC</div><div class='del'>-#define EZUSB_CPUCS_REG			0x7F92</div><div class='del'>-</div><div class='del'>-#define EZUSB_RID_TX			0x0700</div><div class='del'>-#define EZUSB_RID_RX			0x0701</div><div class='del'>-#define EZUSB_RID_INIT1			0x0702</div><div class='del'>-#define EZUSB_RID_ACK			0x0710</div><div class='del'>-#define EZUSB_RID_READ_PDA		0x0800</div><div class='del'>-#define EZUSB_RID_PROG_INIT		0x0852</div><div class='del'>-#define EZUSB_RID_PROG_SET_ADDR		0x0853</div><div class='del'>-#define EZUSB_RID_PROG_BYTES		0x0854</div><div class='del'>-#define EZUSB_RID_PROG_END		0x0855</div><div class='del'>-#define EZUSB_RID_DOCMD			0x0860</div><div class='del'>-</div><div class='del'>-/* Recognize info frames */</div><div class='del'>-#define EZUSB_IS_INFO(id)		((id &gt;= 0xF000) &amp;&amp; (id &lt;= 0xF2FF))</div><div class='del'>-</div><div class='del'>-#define EZUSB_MAGIC			0x0210</div><div class='del'>-</div><div class='del'>-#define EZUSB_FRAME_DATA		1</div><div class='del'>-#define EZUSB_FRAME_CONTROL		2</div><div class='del'>-</div><div class='del'>-#define DEF_TIMEOUT			(3 * HZ)</div><div class='del'>-</div><div class='del'>-#define BULK_BUF_SIZE			2048</div><div class='del'>-</div><div class='del'>-#define MAX_DL_SIZE (BULK_BUF_SIZE - sizeof(struct ezusb_packet))</div><div class='del'>-</div><div class='del'>-#define FW_BUF_SIZE			64</div><div class='del'>-#define FW_VAR_OFFSET_PTR		0x359</div><div class='del'>-#define FW_VAR_VALUE			0</div><div class='del'>-#define FW_HOLE_START			0x100</div><div class='del'>-#define FW_HOLE_END			0x300</div><div class='del'>-</div><div class='del'>-struct ezusb_packet {</div><div class='del'>-	__le16 magic;		/* 0x0210 */</div><div class='del'>-	u8 req_reply_count;</div><div class='del'>-	u8 ans_reply_count;</div><div class='del'>-	__le16 frame_type;	/* 0x01 for data frames, 0x02 otherwise */</div><div class='del'>-	__le16 size;		/* transport size */</div><div class='del'>-	__le16 crc;		/* CRC up to here */</div><div class='del'>-	__le16 hermes_len;</div><div class='del'>-	__le16 hermes_rid;</div><div class='del'>-	u8 data[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* Table of devices that work or may work with this driver */</div><div class='del'>-static const struct usb_device_id ezusb_table[] = {</div><div class='del'>-	{USB_DEVICE(USB_COMPAQ_VENDOR_ID, USB_COMPAQ_WL215_ID)},</div><div class='del'>-	{USB_DEVICE(USB_COMPAQ_VENDOR_ID, USB_HP_WL215_ID)},</div><div class='del'>-	{USB_DEVICE(USB_COMPAQ_VENDOR_ID, USB_COMPAQ_W200_ID)},</div><div class='del'>-	{USB_DEVICE(USB_MELCO_VENDOR_ID, USB_BUFFALO_L11_ID)},</div><div class='del'>-	{USB_DEVICE(USB_MELCO_VENDOR_ID, USB_BUFFALO_L11G_WR_ID)},</div><div class='del'>-	{USB_DEVICE(USB_MELCO_VENDOR_ID, USB_BUFFALO_L11G_ID)},</div><div class='del'>-	{USB_DEVICE(USB_LUCENT_VENDOR_ID, USB_LUCENT_ORINOCO_ID)},</div><div class='del'>-	{USB_DEVICE(USB_AVAYA8_VENDOR_ID, USB_AVAYA_WIRELESS_ID)},</div><div class='del'>-	{USB_DEVICE(USB_AVAYAE_VENDOR_ID, USB_AVAYA_WIRELESS_ID)},</div><div class='del'>-	{USB_DEVICE(USB_AGERE_VENDOR_ID, USB_AGERE_MODEL0801_ID)},</div><div class='del'>-	{USB_DEVICE(USB_AGERE_VENDOR_ID, USB_AGERE_MODEL0802_ID)},</div><div class='del'>-	{USB_DEVICE(USB_ELSA_VENDOR_ID, USB_ELSA_AIRLANCER_ID)},</div><div class='del'>-	{USB_DEVICE(USB_LEGEND_VENDOR_ID, USB_LEGEND_JOYNET_ID)},</div><div class='del'>-	{USB_DEVICE_VER(USB_SAMSUNG_VENDOR_ID, USB_SAMSUNG_SEW2001U1_ID,</div><div class='del'>-			0, 0)},</div><div class='del'>-	{USB_DEVICE(USB_SAMSUNG_VENDOR_ID, USB_SAMSUNG_SEW2001U2_ID)},</div><div class='del'>-	{USB_DEVICE(USB_SAMSUNG_VENDOR_ID, USB_SAMSUNG_SEW2003U_ID)},</div><div class='del'>-	{USB_DEVICE(USB_IGATE_VENDOR_ID, USB_IGATE_IGATE_11M_ID)},</div><div class='del'>-	{USB_DEVICE(USB_FUJITSU_VENDOR_ID, USB_FUJITSU_E1100_ID)},</div><div class='del'>-	{USB_DEVICE(USB_2WIRE_VENDOR_ID, USB_2WIRE_WIRELESS_ID)},</div><div class='del'>-	{USB_DEVICE(USB_AGERE_VENDOR_ID, USB_AGERE_REBRANDED_ID)},</div><div class='del'>-	{}			/* Terminating entry */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_DEVICE_TABLE(usb, ezusb_table);</div><div class='del'>-</div><div class='del'>-/* Structure to hold all of our device specific stuff */</div><div class='del'>-struct ezusb_priv {</div><div class='del'>-	struct usb_device *udev;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct mutex mtx;</div><div class='del'>-	spinlock_t req_lock;</div><div class='del'>-	struct list_head req_pending;</div><div class='del'>-	struct list_head req_active;</div><div class='del'>-	spinlock_t reply_count_lock;</div><div class='del'>-	u16 hermes_reg_fake[0x40];</div><div class='del'>-	u8 *bap_buf;</div><div class='del'>-	struct urb *read_urb;</div><div class='del'>-	int read_pipe;</div><div class='del'>-	int write_pipe;</div><div class='del'>-	u8 reply_count;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum ezusb_state {</div><div class='del'>-	EZUSB_CTX_START,</div><div class='del'>-	EZUSB_CTX_QUEUED,</div><div class='del'>-	EZUSB_CTX_REQ_SUBMITTED,</div><div class='del'>-	EZUSB_CTX_REQ_COMPLETE,</div><div class='del'>-	EZUSB_CTX_RESP_RECEIVED,</div><div class='del'>-	EZUSB_CTX_REQ_TIMEOUT,</div><div class='del'>-	EZUSB_CTX_REQ_FAILED,</div><div class='del'>-	EZUSB_CTX_RESP_TIMEOUT,</div><div class='del'>-	EZUSB_CTX_REQSUBMIT_FAIL,</div><div class='del'>-	EZUSB_CTX_COMPLETE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct request_context {</div><div class='del'>-	struct list_head list;</div><div class='del'>-	refcount_t refcount;</div><div class='del'>-	struct completion done;	/* Signals that CTX is dead */</div><div class='del'>-	int killed;</div><div class='del'>-	struct urb *outurb;	/* OUT for req pkt */</div><div class='del'>-	struct ezusb_priv *upriv;</div><div class='del'>-	struct ezusb_packet *buf;</div><div class='del'>-	int buf_length;</div><div class='del'>-	struct timer_list timer;	/* Timeout handling */</div><div class='del'>-	enum ezusb_state state;	/* Current state */</div><div class='del'>-	/* the RID that we will wait for */</div><div class='del'>-	u16 out_rid;</div><div class='del'>-	u16 in_rid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Forward declarations */</div><div class='del'>-static void ezusb_ctx_complete(struct request_context *ctx);</div><div class='del'>-static void ezusb_req_queue_run(struct ezusb_priv *upriv);</div><div class='del'>-static void ezusb_bulk_in_callback(struct urb *urb);</div><div class='del'>-</div><div class='del'>-static inline u8 ezusb_reply_inc(u8 count)</div><div class='del'>-{</div><div class='del'>-	if (count &lt; 0x7F)</div><div class='del'>-		return count + 1;</div><div class='del'>-	else</div><div class='del'>-		return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ezusb_request_context_put(struct request_context *ctx)</div><div class='del'>-{</div><div class='del'>-	if (!refcount_dec_and_test(&amp;ctx-&gt;refcount))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	WARN_ON(!ctx-&gt;done.done);</div><div class='del'>-	BUG_ON(ctx-&gt;outurb-&gt;status == -EINPROGRESS);</div><div class='del'>-	BUG_ON(timer_pending(&amp;ctx-&gt;timer));</div><div class='del'>-	usb_free_urb(ctx-&gt;outurb);</div><div class='del'>-	kfree(ctx-&gt;buf);</div><div class='del'>-	kfree(ctx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void ezusb_mod_timer(struct ezusb_priv *upriv,</div><div class='del'>-				   struct timer_list *timer,</div><div class='del'>-				   unsigned long expire)</div><div class='del'>-{</div><div class='del'>-	if (!upriv-&gt;udev)</div><div class='del'>-		return;</div><div class='del'>-	mod_timer(timer, expire);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ezusb_request_timerfn(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	struct request_context *ctx = from_timer(ctx, t, timer);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;outurb-&gt;transfer_flags |= URB_ASYNC_UNLINK;</div><div class='del'>-	if (usb_unlink_urb(ctx-&gt;outurb) == -EINPROGRESS) {</div><div class='del'>-		ctx-&gt;state = EZUSB_CTX_REQ_TIMEOUT;</div><div class='del'>-	} else {</div><div class='del'>-		ctx-&gt;state = EZUSB_CTX_RESP_TIMEOUT;</div><div class='del'>-		dev_dbg(&amp;ctx-&gt;outurb-&gt;dev-&gt;dev, "couldn't unlink\n");</div><div class='del'>-		refcount_inc(&amp;ctx-&gt;refcount);</div><div class='del'>-		ctx-&gt;killed = 1;</div><div class='del'>-		ezusb_ctx_complete(ctx);</div><div class='del'>-		ezusb_request_context_put(ctx);</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct request_context *ezusb_alloc_ctx(struct ezusb_priv *upriv,</div><div class='del'>-					       u16 out_rid, u16 in_rid)</div><div class='del'>-{</div><div class='del'>-	struct request_context *ctx;</div><div class='del'>-</div><div class='del'>-	ctx = kzalloc(sizeof(*ctx), GFP_ATOMIC);</div><div class='del'>-	if (!ctx)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	ctx-&gt;buf = kmalloc(BULK_BUF_SIZE, GFP_ATOMIC);</div><div class='del'>-	if (!ctx-&gt;buf) {</div><div class='del'>-		kfree(ctx);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	ctx-&gt;outurb = usb_alloc_urb(0, GFP_ATOMIC);</div><div class='del'>-	if (!ctx-&gt;outurb) {</div><div class='del'>-		kfree(ctx-&gt;buf);</div><div class='del'>-		kfree(ctx);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ctx-&gt;upriv = upriv;</div><div class='del'>-	ctx-&gt;state = EZUSB_CTX_START;</div><div class='del'>-	ctx-&gt;out_rid = out_rid;</div><div class='del'>-	ctx-&gt;in_rid = in_rid;</div><div class='del'>-</div><div class='del'>-	refcount_set(&amp;ctx-&gt;refcount, 1);</div><div class='del'>-	init_completion(&amp;ctx-&gt;done);</div><div class='del'>-</div><div class='del'>-	timer_setup(&amp;ctx-&gt;timer, ezusb_request_timerfn, 0);</div><div class='del'>-	return ctx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ezusb_ctx_complete(struct request_context *ctx)</div><div class='del'>-{</div><div class='del'>-	struct ezusb_priv *upriv = ctx-&gt;upriv;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-</div><div class='del'>-	list_del_init(&amp;ctx-&gt;list);</div><div class='del'>-	if (upriv-&gt;udev) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-		ezusb_req_queue_run(upriv);</div><div class='del'>-		spin_lock_irqsave(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (ctx-&gt;state) {</div><div class='del'>-	case EZUSB_CTX_COMPLETE:</div><div class='del'>-	case EZUSB_CTX_REQSUBMIT_FAIL:</div><div class='del'>-	case EZUSB_CTX_REQ_FAILED:</div><div class='del'>-	case EZUSB_CTX_REQ_TIMEOUT:</div><div class='del'>-	case EZUSB_CTX_RESP_TIMEOUT:</div><div class='del'>-		spin_unlock_irqrestore(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-</div><div class='del'>-		if ((ctx-&gt;out_rid == EZUSB_RID_TX) &amp;&amp; upriv-&gt;dev) {</div><div class='del'>-			struct net_device *dev = upriv-&gt;dev;</div><div class='del'>-			struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='del'>-</div><div class='del'>-			if (ctx-&gt;state != EZUSB_CTX_COMPLETE)</div><div class='del'>-				stats-&gt;tx_errors++;</div><div class='del'>-			else</div><div class='del'>-				stats-&gt;tx_packets++;</div><div class='del'>-</div><div class='del'>-			netif_wake_queue(dev);</div><div class='del'>-		}</div><div class='del'>-		complete_all(&amp;ctx-&gt;done);</div><div class='del'>-		ezusb_request_context_put(ctx);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		spin_unlock_irqrestore(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-		if (!upriv-&gt;udev) {</div><div class='del'>-			/* This is normal, as all request contexts get flushed</div><div class='del'>-			 * when the device is disconnected */</div><div class='del'>-			err("Called, CTX not terminating, but device gone");</div><div class='del'>-			complete_all(&amp;ctx-&gt;done);</div><div class='del'>-			ezusb_request_context_put(ctx);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err("Called, CTX not in terminating state.");</div><div class='del'>-		/* Things are really bad if this happens. Just leak</div><div class='del'>-		 * the CTX because it may still be linked to the</div><div class='del'>-		 * queue or the OUT urb may still be active.</div><div class='del'>-		 * Just leaking at least prevents an Oops or Panic.</div><div class='del'>-		 */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ezusb_req_queue_run:</div><div class='del'>- * Description:</div><div class='del'>- *	Note: Only one active CTX at any one time, because there's no</div><div class='del'>- *	other (reliable) way to match the response URB to the correct</div><div class='del'>- *	CTX.</div><div class='del'>- */</div><div class='del'>-static void ezusb_req_queue_run(struct ezusb_priv *upriv)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct request_context *ctx;</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-</div><div class='del'>-	if (!list_empty(&amp;upriv-&gt;req_active))</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	if (list_empty(&amp;upriv-&gt;req_pending))</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	ctx =</div><div class='del'>-	    list_entry(upriv-&gt;req_pending.next, struct request_context,</div><div class='del'>-		       list);</div><div class='del'>-</div><div class='del'>-	if (!ctx-&gt;upriv-&gt;udev)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	/* We need to split this off to avoid a race condition */</div><div class='del'>-	list_move_tail(&amp;ctx-&gt;list, &amp;upriv-&gt;req_active);</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;state == EZUSB_CTX_QUEUED) {</div><div class='del'>-		refcount_inc(&amp;ctx-&gt;refcount);</div><div class='del'>-		result = usb_submit_urb(ctx-&gt;outurb, GFP_ATOMIC);</div><div class='del'>-		if (result) {</div><div class='del'>-			ctx-&gt;state = EZUSB_CTX_REQSUBMIT_FAIL;</div><div class='del'>-</div><div class='del'>-			spin_unlock_irqrestore(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-</div><div class='del'>-			err("Fatal, failed to submit command urb."</div><div class='del'>-			    " error=%d\n", result);</div><div class='del'>-</div><div class='del'>-			ezusb_ctx_complete(ctx);</div><div class='del'>-			ezusb_request_context_put(ctx);</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ctx-&gt;state = EZUSB_CTX_REQ_SUBMITTED;</div><div class='del'>-		ezusb_mod_timer(ctx-&gt;upriv, &amp;ctx-&gt;timer,</div><div class='del'>-				jiffies + DEF_TIMEOUT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- unlock:</div><div class='del'>-	spin_unlock_irqrestore(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-</div><div class='del'>- done:</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ezusb_req_enqueue_run(struct ezusb_priv *upriv,</div><div class='del'>-				  struct request_context *ctx)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-</div><div class='del'>-	if (!ctx-&gt;upriv-&gt;udev) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-	refcount_inc(&amp;ctx-&gt;refcount);</div><div class='del'>-	list_add_tail(&amp;ctx-&gt;list, &amp;upriv-&gt;req_pending);</div><div class='del'>-	spin_unlock_irqrestore(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;state = EZUSB_CTX_QUEUED;</div><div class='del'>-	ezusb_req_queue_run(upriv);</div><div class='del'>-</div><div class='del'>- done:</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ezusb_request_out_callback(struct urb *urb)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	enum ezusb_state state;</div><div class='del'>-	struct request_context *ctx = urb-&gt;context;</div><div class='del'>-	struct ezusb_priv *upriv = ctx-&gt;upriv;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-</div><div class='del'>-	del_timer(&amp;ctx-&gt;timer);</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;killed) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-		pr_warn("interrupt called with dead ctx\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	state = ctx-&gt;state;</div><div class='del'>-</div><div class='del'>-	if (urb-&gt;status == 0) {</div><div class='del'>-		switch (state) {</div><div class='del'>-		case EZUSB_CTX_REQ_SUBMITTED:</div><div class='del'>-			if (ctx-&gt;in_rid) {</div><div class='del'>-				ctx-&gt;state = EZUSB_CTX_REQ_COMPLETE;</div><div class='del'>-				/* reply URB still pending */</div><div class='del'>-				ezusb_mod_timer(upriv, &amp;ctx-&gt;timer,</div><div class='del'>-						jiffies + DEF_TIMEOUT);</div><div class='del'>-				spin_unlock_irqrestore(&amp;upriv-&gt;req_lock,</div><div class='del'>-						       flags);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			fallthrough;</div><div class='del'>-		case EZUSB_CTX_RESP_RECEIVED:</div><div class='del'>-			/* IN already received before this OUT-ACK */</div><div class='del'>-			ctx-&gt;state = EZUSB_CTX_COMPLETE;</div><div class='del'>-			spin_unlock_irqrestore(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-			ezusb_ctx_complete(ctx);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			spin_unlock_irqrestore(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-			err("Unexpected state(0x%x, %d) in OUT URB",</div><div class='del'>-			    state, urb-&gt;status);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* If someone cancels the OUT URB then its status</div><div class='del'>-		 * should be either -ECONNRESET or -ENOENT.</div><div class='del'>-		 */</div><div class='del'>-		switch (state) {</div><div class='del'>-		case EZUSB_CTX_REQ_SUBMITTED:</div><div class='del'>-		case EZUSB_CTX_RESP_RECEIVED:</div><div class='del'>-			ctx-&gt;state = EZUSB_CTX_REQ_FAILED;</div><div class='del'>-			fallthrough;</div><div class='del'>-</div><div class='del'>-		case EZUSB_CTX_REQ_FAILED:</div><div class='del'>-		case EZUSB_CTX_REQ_TIMEOUT:</div><div class='del'>-			spin_unlock_irqrestore(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-</div><div class='del'>-			ezusb_ctx_complete(ctx);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			spin_unlock_irqrestore(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-</div><div class='del'>-			err("Unexpected state(0x%x, %d) in OUT URB",</div><div class='del'>-			    state, urb-&gt;status);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>- out:</div><div class='del'>-	ezusb_request_context_put(ctx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ezusb_request_in_callback(struct ezusb_priv *upriv,</div><div class='del'>-				      struct urb *urb)</div><div class='del'>-{</div><div class='del'>-	struct ezusb_packet *ans = urb-&gt;transfer_buffer;</div><div class='del'>-	struct request_context *ctx = NULL;</div><div class='del'>-	enum ezusb_state state;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* Find the CTX on the active queue that requested this URB */</div><div class='del'>-	spin_lock_irqsave(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-	if (upriv-&gt;udev) {</div><div class='del'>-		struct list_head *item;</div><div class='del'>-</div><div class='del'>-		list_for_each(item, &amp;upriv-&gt;req_active) {</div><div class='del'>-			struct request_context *c;</div><div class='del'>-			int reply_count;</div><div class='del'>-</div><div class='del'>-			c = list_entry(item, struct request_context, list);</div><div class='del'>-			reply_count =</div><div class='del'>-			    ezusb_reply_inc(c-&gt;buf-&gt;req_reply_count);</div><div class='del'>-			if ((ans-&gt;ans_reply_count == reply_count)</div><div class='del'>-			    &amp;&amp; (le16_to_cpu(ans-&gt;hermes_rid) == c-&gt;in_rid)) {</div><div class='del'>-				ctx = c;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			netdev_dbg(upriv-&gt;dev, "Skipped (0x%x/0x%x) (%d/%d)\n",</div><div class='del'>-				   le16_to_cpu(ans-&gt;hermes_rid), c-&gt;in_rid,</div><div class='del'>-				   ans-&gt;ans_reply_count, reply_count);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ctx == NULL) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-		err("%s: got unexpected RID: 0x%04X", __func__,</div><div class='del'>-		    le16_to_cpu(ans-&gt;hermes_rid));</div><div class='del'>-		ezusb_req_queue_run(upriv);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* The data we want is in the in buffer, exchange */</div><div class='del'>-	urb-&gt;transfer_buffer = ctx-&gt;buf;</div><div class='del'>-	ctx-&gt;buf = (void *) ans;</div><div class='del'>-	ctx-&gt;buf_length = urb-&gt;actual_length;</div><div class='del'>-</div><div class='del'>-	state = ctx-&gt;state;</div><div class='del'>-	switch (state) {</div><div class='del'>-	case EZUSB_CTX_REQ_SUBMITTED:</div><div class='del'>-		/* We have received our response URB before</div><div class='del'>-		 * our request has been acknowledged. Do NOT</div><div class='del'>-		 * destroy our CTX yet, because our OUT URB</div><div class='del'>-		 * is still alive ...</div><div class='del'>-		 */</div><div class='del'>-		ctx-&gt;state = EZUSB_CTX_RESP_RECEIVED;</div><div class='del'>-		spin_unlock_irqrestore(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-</div><div class='del'>-		/* Let the machine continue running. */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case EZUSB_CTX_REQ_COMPLETE:</div><div class='del'>-		/* This is the usual path: our request</div><div class='del'>-		 * has already been acknowledged, and</div><div class='del'>-		 * we have now received the reply.</div><div class='del'>-		 */</div><div class='del'>-		ctx-&gt;state = EZUSB_CTX_COMPLETE;</div><div class='del'>-</div><div class='del'>-		/* Stop the intimer */</div><div class='del'>-		del_timer(&amp;ctx-&gt;timer);</div><div class='del'>-		spin_unlock_irqrestore(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-</div><div class='del'>-		/* Call the completion handler */</div><div class='del'>-		ezusb_ctx_complete(ctx);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		spin_unlock_irqrestore(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-</div><div class='del'>-		pr_warn("Matched IN URB, unexpected context state(0x%x)\n",</div><div class='del'>-			state);</div><div class='del'>-		/* Throw this CTX away and try submitting another */</div><div class='del'>-		del_timer(&amp;ctx-&gt;timer);</div><div class='del'>-		ctx-&gt;outurb-&gt;transfer_flags |= URB_ASYNC_UNLINK;</div><div class='del'>-		usb_unlink_urb(ctx-&gt;outurb);</div><div class='del'>-		ezusb_req_queue_run(upriv);</div><div class='del'>-		break;</div><div class='del'>-	}			/* switch */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (*ezusb_ctx_wait)(struct ezusb_priv *, struct request_context *);</div><div class='del'>-</div><div class='del'>-static void ezusb_req_ctx_wait_compl(struct ezusb_priv *upriv,</div><div class='del'>-				     struct request_context *ctx)</div><div class='del'>-{</div><div class='del'>-	switch (ctx-&gt;state) {</div><div class='del'>-	case EZUSB_CTX_QUEUED:</div><div class='del'>-	case EZUSB_CTX_REQ_SUBMITTED:</div><div class='del'>-	case EZUSB_CTX_REQ_COMPLETE:</div><div class='del'>-	case EZUSB_CTX_RESP_RECEIVED:</div><div class='del'>-		wait_for_completion(&amp;ctx-&gt;done);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/* Done or failed - nothing to wait for */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ezusb_req_ctx_wait_poll(struct ezusb_priv *upriv,</div><div class='del'>-				    struct request_context *ctx)</div><div class='del'>-{</div><div class='del'>-	int msecs;</div><div class='del'>-</div><div class='del'>-	switch (ctx-&gt;state) {</div><div class='del'>-	case EZUSB_CTX_QUEUED:</div><div class='del'>-	case EZUSB_CTX_REQ_SUBMITTED:</div><div class='del'>-	case EZUSB_CTX_REQ_COMPLETE:</div><div class='del'>-	case EZUSB_CTX_RESP_RECEIVED:</div><div class='del'>-		/* If we get called from a timer or with our lock acquired, then</div><div class='del'>-		 * we can't wait for the completion and have to poll. This won't</div><div class='del'>-		 * happen if the USB controller completes the URB requests in</div><div class='del'>-		 * BH.</div><div class='del'>-		 */</div><div class='del'>-		msecs = DEF_TIMEOUT * (1000 / HZ);</div><div class='del'>-</div><div class='del'>-		while (!try_wait_for_completion(&amp;ctx-&gt;done) &amp;&amp; msecs--)</div><div class='del'>-			udelay(1000);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/* Done or failed - nothing to wait for */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ezusb_req_ctx_wait_skip(struct ezusb_priv *upriv,</div><div class='del'>-				    struct request_context *ctx)</div><div class='del'>-{</div><div class='del'>-	WARN(1, "Shouldn't be invoked for in_rid\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 build_crc(struct ezusb_packet *data)</div><div class='del'>-{</div><div class='del'>-	u16 crc = 0;</div><div class='del'>-	u8 *bytes = (u8 *)data;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 8; i++)</div><div class='del'>-		crc = (crc &lt;&lt; 1) + bytes[i];</div><div class='del'>-</div><div class='del'>-	return crc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ezusb_fill_req:</div><div class='del'>- *</div><div class='del'>- * if data == NULL and length &gt; 0 the data is assumed to be already in</div><div class='del'>- * the target buffer and only the header is filled.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static int ezusb_fill_req(struct ezusb_packet *req, u16 length, u16 rid,</div><div class='del'>-			  const void *data, u16 frame_type, u8 reply_count)</div><div class='del'>-{</div><div class='del'>-	int total_size = sizeof(*req) + length;</div><div class='del'>-</div><div class='del'>-	BUG_ON(total_size &gt; BULK_BUF_SIZE);</div><div class='del'>-</div><div class='del'>-	req-&gt;magic = cpu_to_le16(EZUSB_MAGIC);</div><div class='del'>-	req-&gt;req_reply_count = reply_count;</div><div class='del'>-	req-&gt;ans_reply_count = 0;</div><div class='del'>-	req-&gt;frame_type = cpu_to_le16(frame_type);</div><div class='del'>-	req-&gt;size = cpu_to_le16(length + 4);</div><div class='del'>-	req-&gt;crc = cpu_to_le16(build_crc(req));</div><div class='del'>-	req-&gt;hermes_len = cpu_to_le16(HERMES_BYTES_TO_RECLEN(length));</div><div class='del'>-	req-&gt;hermes_rid = cpu_to_le16(rid);</div><div class='del'>-	if (data)</div><div class='del'>-		memcpy(req-&gt;data, data, length);</div><div class='del'>-	return total_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ezusb_submit_in_urb(struct ezusb_priv *upriv)</div><div class='del'>-{</div><div class='del'>-	int retval = 0;</div><div class='del'>-	void *cur_buf = upriv-&gt;read_urb-&gt;transfer_buffer;</div><div class='del'>-</div><div class='del'>-	if (upriv-&gt;read_urb-&gt;status == -EINPROGRESS) {</div><div class='del'>-		netdev_dbg(upriv-&gt;dev, "urb busy, not resubmiting\n");</div><div class='del'>-		retval = -EBUSY;</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='del'>-	usb_fill_bulk_urb(upriv-&gt;read_urb, upriv-&gt;udev, upriv-&gt;read_pipe,</div><div class='del'>-			  cur_buf, BULK_BUF_SIZE,</div><div class='del'>-			  ezusb_bulk_in_callback, upriv);</div><div class='del'>-	upriv-&gt;read_urb-&gt;transfer_flags = 0;</div><div class='del'>-	retval = usb_submit_urb(upriv-&gt;read_urb, GFP_ATOMIC);</div><div class='del'>-	if (retval)</div><div class='del'>-		err("%s submit failed %d", __func__, retval);</div><div class='del'>-</div><div class='del'>- exit:</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int ezusb_8051_cpucs(struct ezusb_priv *upriv, int reset)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	u8 *res_val = NULL;</div><div class='del'>-</div><div class='del'>-	if (!upriv-&gt;udev) {</div><div class='del'>-		err("%s: !upriv-&gt;udev", __func__);</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	res_val = kmalloc(sizeof(*res_val), GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!res_val)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	*res_val = reset;	/* avoid argument promotion */</div><div class='del'>-</div><div class='del'>-	ret =  usb_control_msg(upriv-&gt;udev,</div><div class='del'>-			       usb_sndctrlpipe(upriv-&gt;udev, 0),</div><div class='del'>-			       EZUSB_REQUEST_FW_TRANS,</div><div class='del'>-			       USB_TYPE_VENDOR | USB_RECIP_DEVICE |</div><div class='del'>-			       USB_DIR_OUT, EZUSB_CPUCS_REG, 0, res_val,</div><div class='del'>-			       sizeof(*res_val), DEF_TIMEOUT);</div><div class='del'>-</div><div class='del'>-	kfree(res_val);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ezusb_firmware_download(struct ezusb_priv *upriv,</div><div class='del'>-				   struct ez_usb_fw *fw)</div><div class='del'>-{</div><div class='del'>-	u8 *fw_buffer;</div><div class='del'>-	int retval, addr;</div><div class='del'>-	int variant_offset;</div><div class='del'>-</div><div class='del'>-	fw_buffer = kmalloc(FW_BUF_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!fw_buffer) {</div><div class='del'>-		printk(KERN_ERR PFX "Out of memory for firmware buffer.\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * This byte is 1 and should be replaced with 0.  The offset is</div><div class='del'>-	 * 0x10AD in version 0.0.6.  The byte in question should follow</div><div class='del'>-	 * the end of the code pointed to by the jump in the beginning</div><div class='del'>-	 * of the firmware.  Also, it is read by code located at 0x358.</div><div class='del'>-	 */</div><div class='del'>-	variant_offset = be16_to_cpup((__be16 *) &amp;fw-&gt;code[FW_VAR_OFFSET_PTR]);</div><div class='del'>-	if (variant_offset &gt;= fw-&gt;size) {</div><div class='del'>-		printk(KERN_ERR PFX "Invalid firmware variant offset: "</div><div class='del'>-		       "0x%04x\n", variant_offset);</div><div class='del'>-		retval = -EINVAL;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = ezusb_8051_cpucs(upriv, 1);</div><div class='del'>-	if (retval &lt; 0)</div><div class='del'>-		goto fail;</div><div class='del'>-	for (addr = 0; addr &lt; fw-&gt;size; addr += FW_BUF_SIZE) {</div><div class='del'>-		/* 0x100-0x300 should be left alone, it contains card</div><div class='del'>-		 * specific data, like USB enumeration information */</div><div class='del'>-		if ((addr &gt;= FW_HOLE_START) &amp;&amp; (addr &lt; FW_HOLE_END))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		memcpy(fw_buffer, &amp;fw-&gt;code[addr], FW_BUF_SIZE);</div><div class='del'>-		if (variant_offset &gt;= addr &amp;&amp;</div><div class='del'>-		    variant_offset &lt; addr + FW_BUF_SIZE) {</div><div class='del'>-			netdev_dbg(upriv-&gt;dev,</div><div class='del'>-				   "Patching card_variant byte at 0x%04X\n",</div><div class='del'>-				   variant_offset);</div><div class='del'>-			fw_buffer[variant_offset - addr] = FW_VAR_VALUE;</div><div class='del'>-		}</div><div class='del'>-		retval = usb_control_msg(upriv-&gt;udev,</div><div class='del'>-					 usb_sndctrlpipe(upriv-&gt;udev, 0),</div><div class='del'>-					 EZUSB_REQUEST_FW_TRANS,</div><div class='del'>-					 USB_TYPE_VENDOR | USB_RECIP_DEVICE</div><div class='del'>-					 | USB_DIR_OUT,</div><div class='del'>-					 addr, 0x0,</div><div class='del'>-					 fw_buffer, FW_BUF_SIZE,</div><div class='del'>-					 DEF_TIMEOUT);</div><div class='del'>-</div><div class='del'>-		if (retval &lt; 0)</div><div class='del'>-			goto fail;</div><div class='del'>-	}</div><div class='del'>-	retval = ezusb_8051_cpucs(upriv, 0);</div><div class='del'>-	if (retval &lt; 0)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	goto exit;</div><div class='del'>- fail:</div><div class='del'>-	printk(KERN_ERR PFX "Firmware download failed, error %d\n",</div><div class='del'>-	       retval);</div><div class='del'>- exit:</div><div class='del'>-	kfree(fw_buffer);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ezusb_access_ltv(struct ezusb_priv *upriv,</div><div class='del'>-			    struct request_context *ctx,</div><div class='del'>-			    u16 length, const void *data, u16 frame_type,</div><div class='del'>-			    void *ans_buff, unsigned ans_size, u16 *ans_length,</div><div class='del'>-			    ezusb_ctx_wait ezusb_ctx_wait_func)</div><div class='del'>-{</div><div class='del'>-	int req_size;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	enum ezusb_state state;</div><div class='del'>-</div><div class='del'>-	if (!upriv-&gt;udev) {</div><div class='del'>-		retval = -ENODEV;</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (upriv-&gt;read_urb-&gt;status != -EINPROGRESS)</div><div class='del'>-		err("%s: in urb not pending", __func__);</div><div class='del'>-</div><div class='del'>-	/* protect upriv-&gt;reply_count, guarantee sequential numbers */</div><div class='del'>-	spin_lock_bh(&amp;upriv-&gt;reply_count_lock);</div><div class='del'>-	req_size = ezusb_fill_req(ctx-&gt;buf, length, ctx-&gt;out_rid, data,</div><div class='del'>-				  frame_type, upriv-&gt;reply_count);</div><div class='del'>-	usb_fill_bulk_urb(ctx-&gt;outurb, upriv-&gt;udev, upriv-&gt;write_pipe,</div><div class='del'>-			  ctx-&gt;buf, req_size,</div><div class='del'>-			  ezusb_request_out_callback, ctx);</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;in_rid)</div><div class='del'>-		upriv-&gt;reply_count = ezusb_reply_inc(upriv-&gt;reply_count);</div><div class='del'>-</div><div class='del'>-	ezusb_req_enqueue_run(upriv, ctx);</div><div class='del'>-</div><div class='del'>-	spin_unlock_bh(&amp;upriv-&gt;reply_count_lock);</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;in_rid)</div><div class='del'>-		ezusb_ctx_wait_func(upriv, ctx);</div><div class='del'>-</div><div class='del'>-	state = ctx-&gt;state;</div><div class='del'>-	switch (state) {</div><div class='del'>-	case EZUSB_CTX_COMPLETE:</div><div class='del'>-		retval = ctx-&gt;outurb-&gt;status;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case EZUSB_CTX_QUEUED:</div><div class='del'>-	case EZUSB_CTX_REQ_SUBMITTED:</div><div class='del'>-		if (!ctx-&gt;in_rid)</div><div class='del'>-			break;</div><div class='del'>-		fallthrough;</div><div class='del'>-	default:</div><div class='del'>-		err("%s: Unexpected context state %d", __func__,</div><div class='del'>-		    state);</div><div class='del'>-		fallthrough;</div><div class='del'>-	case EZUSB_CTX_REQ_TIMEOUT:</div><div class='del'>-	case EZUSB_CTX_REQ_FAILED:</div><div class='del'>-	case EZUSB_CTX_RESP_TIMEOUT:</div><div class='del'>-	case EZUSB_CTX_REQSUBMIT_FAIL:</div><div class='del'>-		printk(KERN_ERR PFX "Access failed, resetting (state %d,"</div><div class='del'>-		       " reply_count %d)\n", state, upriv-&gt;reply_count);</div><div class='del'>-		upriv-&gt;reply_count = 0;</div><div class='del'>-		if (state == EZUSB_CTX_REQ_TIMEOUT</div><div class='del'>-		    || state == EZUSB_CTX_RESP_TIMEOUT) {</div><div class='del'>-			printk(KERN_ERR PFX "ctx timed out\n");</div><div class='del'>-			retval = -ETIMEDOUT;</div><div class='del'>-		} else {</div><div class='del'>-			printk(KERN_ERR PFX "ctx failed\n");</div><div class='del'>-			retval = -EFAULT;</div><div class='del'>-		}</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='del'>-	if (ctx-&gt;in_rid) {</div><div class='del'>-		struct ezusb_packet *ans = ctx-&gt;buf;</div><div class='del'>-		unsigned exp_len;</div><div class='del'>-</div><div class='del'>-		if (ans-&gt;hermes_len != 0)</div><div class='del'>-			exp_len = le16_to_cpu(ans-&gt;hermes_len) * 2 + 12;</div><div class='del'>-		else</div><div class='del'>-			exp_len = 14;</div><div class='del'>-</div><div class='del'>-		if (exp_len != ctx-&gt;buf_length) {</div><div class='del'>-			err("%s: length mismatch for RID 0x%04x: "</div><div class='del'>-			    "expected %d, got %d", __func__,</div><div class='del'>-			    ctx-&gt;in_rid, exp_len, ctx-&gt;buf_length);</div><div class='del'>-			retval = -EIO;</div><div class='del'>-			goto exit;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ans_buff)</div><div class='del'>-			memcpy(ans_buff, ans-&gt;data, min(exp_len, ans_size));</div><div class='del'>-		if (ans_length)</div><div class='del'>-			*ans_length = le16_to_cpu(ans-&gt;hermes_len);</div><div class='del'>-	}</div><div class='del'>- exit:</div><div class='del'>-	ezusb_request_context_put(ctx);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __ezusb_write_ltv(struct hermes *hw, int bap, u16 rid,</div><div class='del'>-			   u16 length, const void *data,</div><div class='del'>-			   ezusb_ctx_wait ezusb_ctx_wait_func)</div><div class='del'>-{</div><div class='del'>-	struct ezusb_priv *upriv = hw-&gt;priv;</div><div class='del'>-	u16 frame_type;</div><div class='del'>-	struct request_context *ctx;</div><div class='del'>-</div><div class='del'>-	if (length == 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	length = HERMES_RECLEN_TO_BYTES(length);</div><div class='del'>-</div><div class='del'>-	/* On memory mapped devices HERMES_RID_CNFGROUPADDRESSES can be</div><div class='del'>-	 * set to be empty, but the USB bridge doesn't like it */</div><div class='del'>-	if (length == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ctx = ezusb_alloc_ctx(upriv, rid, EZUSB_RID_ACK);</div><div class='del'>-	if (!ctx)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (rid == EZUSB_RID_TX)</div><div class='del'>-		frame_type = EZUSB_FRAME_DATA;</div><div class='del'>-	else</div><div class='del'>-		frame_type = EZUSB_FRAME_CONTROL;</div><div class='del'>-</div><div class='del'>-	return ezusb_access_ltv(upriv, ctx, length, data, frame_type,</div><div class='del'>-				NULL, 0, NULL, ezusb_ctx_wait_func);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ezusb_write_ltv(struct hermes *hw, int bap, u16 rid,</div><div class='del'>-			   u16 length, const void *data)</div><div class='del'>-{</div><div class='del'>-	return __ezusb_write_ltv(hw, bap, rid, length, data,</div><div class='del'>-				 ezusb_req_ctx_wait_poll);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __ezusb_read_ltv(struct hermes *hw, int bap, u16 rid,</div><div class='del'>-			    unsigned bufsize, u16 *length, void *buf,</div><div class='del'>-			    ezusb_ctx_wait ezusb_ctx_wait_func)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	struct ezusb_priv *upriv = hw-&gt;priv;</div><div class='del'>-	struct request_context *ctx;</div><div class='del'>-</div><div class='del'>-	if (bufsize % 2)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ctx = ezusb_alloc_ctx(upriv, rid, rid);</div><div class='del'>-	if (!ctx)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	return ezusb_access_ltv(upriv, ctx, 0, NULL, EZUSB_FRAME_CONTROL,</div><div class='del'>-				buf, bufsize, length, ezusb_req_ctx_wait_poll);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ezusb_read_ltv(struct hermes *hw, int bap, u16 rid,</div><div class='del'>-			    unsigned bufsize, u16 *length, void *buf)</div><div class='del'>-{</div><div class='del'>-	return __ezusb_read_ltv(hw, bap, rid, bufsize, length, buf,</div><div class='del'>-				ezusb_req_ctx_wait_poll);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ezusb_read_ltv_preempt(struct hermes *hw, int bap, u16 rid,</div><div class='del'>-				  unsigned bufsize, u16 *length, void *buf)</div><div class='del'>-{</div><div class='del'>-	return __ezusb_read_ltv(hw, bap, rid, bufsize, length, buf,</div><div class='del'>-				ezusb_req_ctx_wait_compl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ezusb_doicmd_wait(struct hermes *hw, u16 cmd, u16 parm0, u16 parm1,</div><div class='del'>-			     u16 parm2, struct hermes_response *resp)</div><div class='del'>-{</div><div class='del'>-	WARN_ON_ONCE(1);</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __ezusb_docmd_wait(struct hermes *hw, u16 cmd, u16 parm0,</div><div class='del'>-			    struct hermes_response *resp,</div><div class='del'>-			    ezusb_ctx_wait ezusb_ctx_wait_func)</div><div class='del'>-{</div><div class='del'>-	struct ezusb_priv *upriv = hw-&gt;priv;</div><div class='del'>-	struct request_context *ctx;</div><div class='del'>-</div><div class='del'>-	__le16 data[4] = {</div><div class='del'>-		cpu_to_le16(cmd),</div><div class='del'>-		cpu_to_le16(parm0),</div><div class='del'>-		0,</div><div class='del'>-		0,</div><div class='del'>-	};</div><div class='del'>-	netdev_dbg(upriv-&gt;dev, "0x%04X, parm0 0x%04X\n", cmd, parm0);</div><div class='del'>-	ctx = ezusb_alloc_ctx(upriv, EZUSB_RID_DOCMD, EZUSB_RID_ACK);</div><div class='del'>-	if (!ctx)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	return ezusb_access_ltv(upriv, ctx, sizeof(data), &amp;data,</div><div class='del'>-				EZUSB_FRAME_CONTROL, NULL, 0, NULL,</div><div class='del'>-				ezusb_ctx_wait_func);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ezusb_docmd_wait(struct hermes *hw, u16 cmd, u16 parm0,</div><div class='del'>-			    struct hermes_response *resp)</div><div class='del'>-{</div><div class='del'>-	return __ezusb_docmd_wait(hw, cmd, parm0, resp, ezusb_req_ctx_wait_poll);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ezusb_bap_pread(struct hermes *hw, int bap,</div><div class='del'>-			   void *buf, int len, u16 id, u16 offset)</div><div class='del'>-{</div><div class='del'>-	struct ezusb_priv *upriv = hw-&gt;priv;</div><div class='del'>-	struct ezusb_packet *ans = (void *) upriv-&gt;read_urb-&gt;transfer_buffer;</div><div class='del'>-	int actual_length = upriv-&gt;read_urb-&gt;actual_length;</div><div class='del'>-</div><div class='del'>-	if (id == EZUSB_RID_RX) {</div><div class='del'>-		if ((sizeof(*ans) + offset + len) &gt; actual_length) {</div><div class='del'>-			printk(KERN_ERR PFX "BAP read beyond buffer end "</div><div class='del'>-			       "in rx frame\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		memcpy(buf, ans-&gt;data + offset, len);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (EZUSB_IS_INFO(id)) {</div><div class='del'>-		/* Include 4 bytes for length/type */</div><div class='del'>-		if ((sizeof(*ans) + offset + len - 4) &gt; actual_length) {</div><div class='del'>-			printk(KERN_ERR PFX "BAP read beyond buffer end "</div><div class='del'>-			       "in info frame\n");</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-		memcpy(buf, ans-&gt;data + offset - 4, len);</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_ERR PFX "Unexpected fid 0x%04x\n", id);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ezusb_read_pda(struct hermes *hw, __le16 *pda,</div><div class='del'>-			  u32 pda_addr, u16 pda_len)</div><div class='del'>-{</div><div class='del'>-	struct ezusb_priv *upriv = hw-&gt;priv;</div><div class='del'>-	struct request_context *ctx;</div><div class='del'>-	__le16 data[] = {</div><div class='del'>-		cpu_to_le16(pda_addr &amp; 0xffff),</div><div class='del'>-		cpu_to_le16(pda_len - 4)</div><div class='del'>-	};</div><div class='del'>-	ctx = ezusb_alloc_ctx(upriv, EZUSB_RID_READ_PDA, EZUSB_RID_READ_PDA);</div><div class='del'>-	if (!ctx)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* wl_lkm does not include PDA size in the PDA area.</div><div class='del'>-	 * We will pad the information into pda, so other routines</div><div class='del'>-	 * don't have to be modified */</div><div class='del'>-	pda[0] = cpu_to_le16(pda_len - 2);</div><div class='del'>-	/* Includes CFG_PROD_DATA but not itself */</div><div class='del'>-	pda[1] = cpu_to_le16(0x0800); /* CFG_PROD_DATA */</div><div class='del'>-</div><div class='del'>-	return ezusb_access_ltv(upriv, ctx, sizeof(data), &amp;data,</div><div class='del'>-				EZUSB_FRAME_CONTROL, &amp;pda[2], pda_len - 4,</div><div class='del'>-				NULL, ezusb_req_ctx_wait_compl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ezusb_program_init(struct hermes *hw, u32 entry_point)</div><div class='del'>-{</div><div class='del'>-	struct ezusb_priv *upriv = hw-&gt;priv;</div><div class='del'>-	struct request_context *ctx;</div><div class='del'>-	__le32 data = cpu_to_le32(entry_point);</div><div class='del'>-</div><div class='del'>-	ctx = ezusb_alloc_ctx(upriv, EZUSB_RID_PROG_INIT, EZUSB_RID_ACK);</div><div class='del'>-	if (!ctx)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	return ezusb_access_ltv(upriv, ctx, sizeof(data), &amp;data,</div><div class='del'>-				EZUSB_FRAME_CONTROL, NULL, 0, NULL,</div><div class='del'>-				ezusb_req_ctx_wait_compl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ezusb_program_end(struct hermes *hw)</div><div class='del'>-{</div><div class='del'>-	struct ezusb_priv *upriv = hw-&gt;priv;</div><div class='del'>-	struct request_context *ctx;</div><div class='del'>-</div><div class='del'>-	ctx = ezusb_alloc_ctx(upriv, EZUSB_RID_PROG_END, EZUSB_RID_ACK);</div><div class='del'>-	if (!ctx)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	return ezusb_access_ltv(upriv, ctx, 0, NULL,</div><div class='del'>-				EZUSB_FRAME_CONTROL, NULL, 0, NULL,</div><div class='del'>-				ezusb_req_ctx_wait_compl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ezusb_program_bytes(struct hermes *hw, const char *buf,</div><div class='del'>-			       u32 addr, u32 len)</div><div class='del'>-{</div><div class='del'>-	struct ezusb_priv *upriv = hw-&gt;priv;</div><div class='del'>-	struct request_context *ctx;</div><div class='del'>-	__le32 data = cpu_to_le32(addr);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	ctx = ezusb_alloc_ctx(upriv, EZUSB_RID_PROG_SET_ADDR, EZUSB_RID_ACK);</div><div class='del'>-	if (!ctx)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	err = ezusb_access_ltv(upriv, ctx, sizeof(data), &amp;data,</div><div class='del'>-			       EZUSB_FRAME_CONTROL, NULL, 0, NULL,</div><div class='del'>-			       ezusb_req_ctx_wait_compl);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	ctx = ezusb_alloc_ctx(upriv, EZUSB_RID_PROG_BYTES, EZUSB_RID_ACK);</div><div class='del'>-	if (!ctx)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	return ezusb_access_ltv(upriv, ctx, len, buf,</div><div class='del'>-				EZUSB_FRAME_CONTROL, NULL, 0, NULL,</div><div class='del'>-				ezusb_req_ctx_wait_compl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ezusb_program(struct hermes *hw, const char *buf,</div><div class='del'>-			 u32 addr, u32 len)</div><div class='del'>-{</div><div class='del'>-	u32 ch_addr;</div><div class='del'>-	u32 ch_len;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	/* We can only send 2048 bytes out of the bulk xmit at a time,</div><div class='del'>-	 * so we have to split any programming into chunks of &lt;2048</div><div class='del'>-	 * bytes. */</div><div class='del'>-</div><div class='del'>-	ch_len = (len &lt; MAX_DL_SIZE) ? len : MAX_DL_SIZE;</div><div class='del'>-	ch_addr = addr;</div><div class='del'>-</div><div class='del'>-	while (ch_addr &lt; (addr + len)) {</div><div class='del'>-		pr_debug("Programming subblock of length %d "</div><div class='del'>-			 "to address 0x%08x. Data @ %p\n",</div><div class='del'>-			 ch_len, ch_addr, &amp;buf[ch_addr - addr]);</div><div class='del'>-</div><div class='del'>-		err = ezusb_program_bytes(hw, &amp;buf[ch_addr - addr],</div><div class='del'>-					  ch_addr, ch_len);</div><div class='del'>-		if (err)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		ch_addr += ch_len;</div><div class='del'>-		ch_len = ((addr + len - ch_addr) &lt; MAX_DL_SIZE) ?</div><div class='del'>-			(addr + len - ch_addr) : MAX_DL_SIZE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static netdev_tx_t ezusb_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='del'>-	struct ezusb_priv *upriv = priv-&gt;card;</div><div class='del'>-	u8 mic[MICHAEL_MIC_LEN + 1];</div><div class='del'>-	int err = 0;</div><div class='del'>-	int tx_control;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct request_context *ctx;</div><div class='del'>-	u8 *buf;</div><div class='del'>-	int tx_size;</div><div class='del'>-</div><div class='del'>-	if (!netif_running(dev)) {</div><div class='del'>-		printk(KERN_ERR "%s: Tx on stopped device!\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		return NETDEV_TX_BUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (netif_queue_stopped(dev)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: Tx while transmitter busy!\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		return NETDEV_TX_BUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0) {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "%s: ezusb_xmit() called while hw_unavailable\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		return NETDEV_TX_BUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!netif_carrier_ok(dev) ||</div><div class='del'>-	    (priv-&gt;iw_mode == NL80211_IFTYPE_MONITOR)) {</div><div class='del'>-		/* Oops, the firmware hasn't established a connection,</div><div class='del'>-		   silently drop the packet (this seems to be the</div><div class='del'>-		   safest approach). */</div><div class='del'>-		goto drop;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check packet length */</div><div class='del'>-	if (skb-&gt;len &lt; ETH_HLEN)</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	tx_control = 0;</div><div class='del'>-</div><div class='del'>-	err = orinoco_process_xmit_skb(skb, dev, priv, &amp;tx_control,</div><div class='del'>-				       &amp;mic[0]);</div><div class='del'>-	if (err)</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	ctx = ezusb_alloc_ctx(upriv, EZUSB_RID_TX, 0);</div><div class='del'>-	if (!ctx)</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	memset(ctx-&gt;buf, 0, BULK_BUF_SIZE);</div><div class='del'>-	buf = ctx-&gt;buf-&gt;data;</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		__le16 *tx_cntl = (__le16 *)buf;</div><div class='del'>-		*tx_cntl = cpu_to_le16(tx_control);</div><div class='del'>-		buf += sizeof(*tx_cntl);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(buf, skb-&gt;data, skb-&gt;len);</div><div class='del'>-	buf += skb-&gt;len;</div><div class='del'>-</div><div class='del'>-	if (tx_control &amp; HERMES_TXCTRL_MIC) {</div><div class='del'>-		u8 *m = mic;</div><div class='del'>-		/* Mic has been offset so it can be copied to an even</div><div class='del'>-		 * address. We're copying eveything anyway, so we</div><div class='del'>-		 * don't need to copy that first byte. */</div><div class='del'>-		if (skb-&gt;len % 2)</div><div class='del'>-			m++;</div><div class='del'>-		memcpy(buf, m, MICHAEL_MIC_LEN);</div><div class='del'>-		buf += MICHAEL_MIC_LEN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Finally, we actually initiate the send */</div><div class='del'>-	netif_stop_queue(dev);</div><div class='del'>-</div><div class='del'>-	/* The card may behave better if we send evenly sized usb transfers */</div><div class='del'>-	tx_size = ALIGN(buf - ctx-&gt;buf-&gt;data, 2);</div><div class='del'>-</div><div class='del'>-	err = ezusb_access_ltv(upriv, ctx, tx_size, NULL,</div><div class='del'>-			       EZUSB_FRAME_DATA, NULL, 0, NULL,</div><div class='del'>-			       ezusb_req_ctx_wait_skip);</div><div class='del'>-</div><div class='del'>-	if (err) {</div><div class='del'>-		netif_start_queue(dev);</div><div class='del'>-		if (net_ratelimit())</div><div class='del'>-			printk(KERN_ERR "%s: Error %d transmitting packet\n",</div><div class='del'>-				dev-&gt;name, err);</div><div class='del'>-		goto busy;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	netif_trans_update(dev);</div><div class='del'>-	stats-&gt;tx_bytes += skb-&gt;len;</div><div class='del'>-	goto ok;</div><div class='del'>-</div><div class='del'>- drop:</div><div class='del'>-	stats-&gt;tx_errors++;</div><div class='del'>-	stats-&gt;tx_dropped++;</div><div class='del'>-</div><div class='del'>- ok:</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-	dev_kfree_skb(skb);</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='del'>-</div><div class='del'>- busy:</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-	return NETDEV_TX_BUSY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ezusb_allocate(struct hermes *hw, u16 size, u16 *fid)</div><div class='del'>-{</div><div class='del'>-	*fid = EZUSB_RID_TX;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int ezusb_hard_reset(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct ezusb_priv *upriv = priv-&gt;card;</div><div class='del'>-	int retval = ezusb_8051_cpucs(upriv, 1);</div><div class='del'>-</div><div class='del'>-	if (retval &lt; 0) {</div><div class='del'>-		err("Failed to reset");</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = ezusb_8051_cpucs(upriv, 0);</div><div class='del'>-	if (retval &lt; 0) {</div><div class='del'>-		err("Failed to unreset");</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	netdev_dbg(upriv-&gt;dev, "sending control message\n");</div><div class='del'>-	retval = usb_control_msg(upriv-&gt;udev,</div><div class='del'>-				 usb_sndctrlpipe(upriv-&gt;udev, 0),</div><div class='del'>-				 EZUSB_REQUEST_TRIGGER,</div><div class='del'>-				 USB_TYPE_VENDOR | USB_RECIP_DEVICE |</div><div class='del'>-				 USB_DIR_OUT, 0x0, 0x0, NULL, 0,</div><div class='del'>-				 DEF_TIMEOUT);</div><div class='del'>-	if (retval &lt; 0) {</div><div class='del'>-		err("EZUSB_REQUEST_TRIGGER failed retval %d", retval);</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-#if 0</div><div class='del'>-	dbg("Sending EZUSB_REQUEST_TRIG_AC");</div><div class='del'>-	retval = usb_control_msg(upriv-&gt;udev,</div><div class='del'>-				 usb_sndctrlpipe(upriv-&gt;udev, 0),</div><div class='del'>-				 EZUSB_REQUEST_TRIG_AC,</div><div class='del'>-				 USB_TYPE_VENDOR | USB_RECIP_DEVICE |</div><div class='del'>-				 USB_DIR_OUT, 0x00FA, 0x0, NULL, 0,</div><div class='del'>-				 DEF_TIMEOUT);</div><div class='del'>-	if (retval &lt; 0) {</div><div class='del'>-		err("EZUSB_REQUEST_TRIG_AC failed retval %d", retval);</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int ezusb_init(struct hermes *hw)</div><div class='del'>-{</div><div class='del'>-	struct ezusb_priv *upriv = hw-&gt;priv;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	if (!upriv)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	upriv-&gt;reply_count = 0;</div><div class='del'>-	/* Write the MAGIC number on the simulated registers to keep</div><div class='del'>-	 * orinoco.c happy */</div><div class='del'>-	hermes_write_regn(hw, SWSUPPORT0, HERMES_MAGIC);</div><div class='del'>-	hermes_write_regn(hw, RXFID, EZUSB_RID_RX);</div><div class='del'>-</div><div class='del'>-	usb_kill_urb(upriv-&gt;read_urb);</div><div class='del'>-	ezusb_submit_in_urb(upriv);</div><div class='del'>-</div><div class='del'>-	retval = __ezusb_write_ltv(hw, 0, EZUSB_RID_INIT1,</div><div class='del'>-				 HERMES_BYTES_TO_RECLEN(2), "\x10\x00",</div><div class='del'>-				 ezusb_req_ctx_wait_compl);</div><div class='del'>-	if (retval &lt; 0) {</div><div class='del'>-		printk(KERN_ERR PFX "EZUSB_RID_INIT1 error %d\n", retval);</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = __ezusb_docmd_wait(hw, HERMES_CMD_INIT, 0, NULL,</div><div class='del'>-				    ezusb_req_ctx_wait_compl);</div><div class='del'>-	if (retval &lt; 0) {</div><div class='del'>-		printk(KERN_ERR PFX "HERMES_CMD_INIT error %d\n", retval);</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ezusb_bulk_in_callback(struct urb *urb)</div><div class='del'>-{</div><div class='del'>-	struct ezusb_priv *upriv = (struct ezusb_priv *) urb-&gt;context;</div><div class='del'>-	struct ezusb_packet *ans = urb-&gt;transfer_buffer;</div><div class='del'>-	u16 crc;</div><div class='del'>-	u16 hermes_rid;</div><div class='del'>-</div><div class='del'>-	if (upriv-&gt;udev == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (urb-&gt;status == -ETIMEDOUT) {</div><div class='del'>-		/* When a device gets unplugged we get this every time</div><div class='del'>-		 * we resubmit, flooding the logs.  Since we don't use</div><div class='del'>-		 * USB timeouts, it shouldn't happen any other time*/</div><div class='del'>-		pr_warn("%s: urb timed out, not resubmitting\n", __func__);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (urb-&gt;status == -ECONNABORTED) {</div><div class='del'>-		pr_warn("%s: connection abort, resubmitting urb\n",</div><div class='del'>-			__func__);</div><div class='del'>-		goto resubmit;</div><div class='del'>-	}</div><div class='del'>-	if ((urb-&gt;status == -EILSEQ)</div><div class='del'>-	    || (urb-&gt;status == -ENOENT)</div><div class='del'>-	    || (urb-&gt;status == -ECONNRESET)) {</div><div class='del'>-		netdev_dbg(upriv-&gt;dev, "status %d, not resubmiting\n",</div><div class='del'>-			   urb-&gt;status);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (urb-&gt;status)</div><div class='del'>-		netdev_dbg(upriv-&gt;dev, "status: %d length: %d\n",</div><div class='del'>-			   urb-&gt;status, urb-&gt;actual_length);</div><div class='del'>-	if (urb-&gt;actual_length &lt; sizeof(*ans)) {</div><div class='del'>-		err("%s: short read, ignoring", __func__);</div><div class='del'>-		goto resubmit;</div><div class='del'>-	}</div><div class='del'>-	crc = build_crc(ans);</div><div class='del'>-	if (le16_to_cpu(ans-&gt;crc) != crc) {</div><div class='del'>-		err("CRC error, ignoring packet");</div><div class='del'>-		goto resubmit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hermes_rid = le16_to_cpu(ans-&gt;hermes_rid);</div><div class='del'>-	if ((hermes_rid != EZUSB_RID_RX) &amp;&amp; !EZUSB_IS_INFO(hermes_rid)) {</div><div class='del'>-		ezusb_request_in_callback(upriv, urb);</div><div class='del'>-	} else if (upriv-&gt;dev) {</div><div class='del'>-		struct net_device *dev = upriv-&gt;dev;</div><div class='del'>-		struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-		struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-</div><div class='del'>-		if (hermes_rid == EZUSB_RID_RX) {</div><div class='del'>-			__orinoco_ev_rx(dev, hw);</div><div class='del'>-		} else {</div><div class='del'>-			hermes_write_regn(hw, INFOFID,</div><div class='del'>-					  le16_to_cpu(ans-&gt;hermes_rid));</div><div class='del'>-			__orinoco_ev_info(dev, hw);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- resubmit:</div><div class='del'>-	if (upriv-&gt;udev)</div><div class='del'>-		ezusb_submit_in_urb(upriv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void ezusb_delete(struct ezusb_priv *upriv)</div><div class='del'>-{</div><div class='del'>-	struct list_head *item;</div><div class='del'>-	struct list_head *tmp_item;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!upriv);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;upriv-&gt;mtx);</div><div class='del'>-</div><div class='del'>-	upriv-&gt;udev = NULL;	/* No timer will be rearmed from here */</div><div class='del'>-</div><div class='del'>-	usb_kill_urb(upriv-&gt;read_urb);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-	list_for_each_safe(item, tmp_item, &amp;upriv-&gt;req_active) {</div><div class='del'>-		struct request_context *ctx;</div><div class='del'>-		int err;</div><div class='del'>-</div><div class='del'>-		ctx = list_entry(item, struct request_context, list);</div><div class='del'>-		refcount_inc(&amp;ctx-&gt;refcount);</div><div class='del'>-</div><div class='del'>-		ctx-&gt;outurb-&gt;transfer_flags |= URB_ASYNC_UNLINK;</div><div class='del'>-		err = usb_unlink_urb(ctx-&gt;outurb);</div><div class='del'>-</div><div class='del'>-		spin_unlock_irqrestore(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-		if (err == -EINPROGRESS)</div><div class='del'>-			wait_for_completion(&amp;ctx-&gt;done);</div><div class='del'>-</div><div class='del'>-		del_timer_sync(&amp;ctx-&gt;timer);</div><div class='del'>-		/* FIXME: there is an slight chance for the irq handler to</div><div class='del'>-		 * be running */</div><div class='del'>-		if (!list_empty(&amp;ctx-&gt;list))</div><div class='del'>-			ezusb_ctx_complete(ctx);</div><div class='del'>-</div><div class='del'>-		ezusb_request_context_put(ctx);</div><div class='del'>-		spin_lock_irqsave(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;upriv-&gt;req_lock, flags);</div><div class='del'>-</div><div class='del'>-	list_for_each_safe(item, tmp_item, &amp;upriv-&gt;req_pending)</div><div class='del'>-	    ezusb_ctx_complete(list_entry(item,</div><div class='del'>-					  struct request_context, list));</div><div class='del'>-</div><div class='del'>-	if (upriv-&gt;read_urb &amp;&amp; upriv-&gt;read_urb-&gt;status == -EINPROGRESS)</div><div class='del'>-		printk(KERN_ERR PFX "Some URB in progress\n");</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;upriv-&gt;mtx);</div><div class='del'>-</div><div class='del'>-	if (upriv-&gt;read_urb) {</div><div class='del'>-		kfree(upriv-&gt;read_urb-&gt;transfer_buffer);</div><div class='del'>-		usb_free_urb(upriv-&gt;read_urb);</div><div class='del'>-	}</div><div class='del'>-	kfree(upriv-&gt;bap_buf);</div><div class='del'>-	if (upriv-&gt;dev) {</div><div class='del'>-		struct orinoco_private *priv = ndev_priv(upriv-&gt;dev);</div><div class='del'>-		orinoco_if_del(priv);</div><div class='del'>-		wiphy_unregister(priv_to_wiphy(upriv));</div><div class='del'>-		free_orinocodev(priv);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ezusb_lock_irqsave(spinlock_t *lock,</div><div class='del'>-			       unsigned long *flags) __acquires(lock)</div><div class='del'>-{</div><div class='del'>-	spin_lock_bh(lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ezusb_unlock_irqrestore(spinlock_t *lock,</div><div class='del'>-				    unsigned long *flags) __releases(lock)</div><div class='del'>-{</div><div class='del'>-	spin_unlock_bh(lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ezusb_lock_irq(spinlock_t *lock) __acquires(lock)</div><div class='del'>-{</div><div class='del'>-	spin_lock_bh(lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ezusb_unlock_irq(spinlock_t *lock) __releases(lock)</div><div class='del'>-{</div><div class='del'>-	spin_unlock_bh(lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct hermes_ops ezusb_ops = {</div><div class='del'>-	.init = ezusb_init,</div><div class='del'>-	.cmd_wait = ezusb_docmd_wait,</div><div class='del'>-	.init_cmd_wait = ezusb_doicmd_wait,</div><div class='del'>-	.allocate = ezusb_allocate,</div><div class='del'>-	.read_ltv = ezusb_read_ltv,</div><div class='del'>-	.read_ltv_pr = ezusb_read_ltv_preempt,</div><div class='del'>-	.write_ltv = ezusb_write_ltv,</div><div class='del'>-	.bap_pread = ezusb_bap_pread,</div><div class='del'>-	.read_pda = ezusb_read_pda,</div><div class='del'>-	.program_init = ezusb_program_init,</div><div class='del'>-	.program_end = ezusb_program_end,</div><div class='del'>-	.program = ezusb_program,</div><div class='del'>-	.lock_irqsave = ezusb_lock_irqsave,</div><div class='del'>-	.unlock_irqrestore = ezusb_unlock_irqrestore,</div><div class='del'>-	.lock_irq = ezusb_lock_irq,</div><div class='del'>-	.unlock_irq = ezusb_unlock_irq,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops ezusb_netdev_ops = {</div><div class='del'>-	.ndo_open		= orinoco_open,</div><div class='del'>-	.ndo_stop		= orinoco_stop,</div><div class='del'>-	.ndo_start_xmit		= ezusb_xmit,</div><div class='del'>-	.ndo_set_rx_mode	= orinoco_set_multicast_list,</div><div class='del'>-	.ndo_change_mtu		= orinoco_change_mtu,</div><div class='del'>-	.ndo_set_mac_address	= eth_mac_addr,</div><div class='del'>-	.ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-	.ndo_tx_timeout		= orinoco_tx_timeout,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int ezusb_probe(struct usb_interface *interface,</div><div class='del'>-		       const struct usb_device_id *id)</div><div class='del'>-{</div><div class='del'>-	struct usb_device *udev = interface_to_usbdev(interface);</div><div class='del'>-	struct orinoco_private *priv;</div><div class='del'>-	struct hermes *hw;</div><div class='del'>-	struct ezusb_priv *upriv = NULL;</div><div class='del'>-	struct usb_interface_descriptor *iface_desc;</div><div class='del'>-	struct usb_endpoint_descriptor *ep;</div><div class='del'>-	const struct firmware *fw_entry = NULL;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	priv = alloc_orinocodev(sizeof(*upriv), &amp;udev-&gt;dev,</div><div class='del'>-				ezusb_hard_reset, NULL);</div><div class='del'>-	if (!priv) {</div><div class='del'>-		err("Couldn't allocate orinocodev");</div><div class='del'>-		retval = -ENOMEM;</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hw = &amp;priv-&gt;hw;</div><div class='del'>-</div><div class='del'>-	upriv = priv-&gt;card;</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;upriv-&gt;mtx);</div><div class='del'>-	spin_lock_init(&amp;upriv-&gt;reply_count_lock);</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;upriv-&gt;req_lock);</div><div class='del'>-	INIT_LIST_HEAD(&amp;upriv-&gt;req_pending);</div><div class='del'>-	INIT_LIST_HEAD(&amp;upriv-&gt;req_active);</div><div class='del'>-</div><div class='del'>-	upriv-&gt;udev = udev;</div><div class='del'>-</div><div class='del'>-	hw-&gt;iobase = (void __force __iomem *) &amp;upriv-&gt;hermes_reg_fake;</div><div class='del'>-	hw-&gt;reg_spacing = HERMES_16BIT_REGSPACING;</div><div class='del'>-	hw-&gt;priv = upriv;</div><div class='del'>-	hw-&gt;ops = &amp;ezusb_ops;</div><div class='del'>-</div><div class='del'>-	/* set up the endpoint information */</div><div class='del'>-	/* check out the endpoints */</div><div class='del'>-</div><div class='del'>-	iface_desc = &amp;interface-&gt;cur_altsetting-&gt;desc;</div><div class='del'>-	for (i = 0; i &lt; iface_desc-&gt;bNumEndpoints; ++i) {</div><div class='del'>-		ep = &amp;interface-&gt;cur_altsetting-&gt;endpoint[i].desc;</div><div class='del'>-</div><div class='del'>-		if (usb_endpoint_is_bulk_in(ep)) {</div><div class='del'>-			/* we found a bulk in endpoint */</div><div class='del'>-			if (upriv-&gt;read_urb != NULL) {</div><div class='del'>-				pr_warn("Found a second bulk in ep, ignored\n");</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			upriv-&gt;read_urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='del'>-			if (!upriv-&gt;read_urb)</div><div class='del'>-				goto error;</div><div class='del'>-			if (le16_to_cpu(ep-&gt;wMaxPacketSize) != 64)</div><div class='del'>-				pr_warn("bulk in: wMaxPacketSize!= 64\n");</div><div class='del'>-			if (ep-&gt;bEndpointAddress != (2 | USB_DIR_IN))</div><div class='del'>-				pr_warn("bulk in: bEndpointAddress: %d\n",</div><div class='del'>-					ep-&gt;bEndpointAddress);</div><div class='del'>-			upriv-&gt;read_pipe = usb_rcvbulkpipe(udev,</div><div class='del'>-							 ep-&gt;</div><div class='del'>-							 bEndpointAddress);</div><div class='del'>-			upriv-&gt;read_urb-&gt;transfer_buffer =</div><div class='del'>-			    kmalloc(BULK_BUF_SIZE, GFP_KERNEL);</div><div class='del'>-			if (!upriv-&gt;read_urb-&gt;transfer_buffer) {</div><div class='del'>-				err("Couldn't allocate IN buffer");</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (usb_endpoint_is_bulk_out(ep)) {</div><div class='del'>-			/* we found a bulk out endpoint */</div><div class='del'>-			if (upriv-&gt;bap_buf != NULL) {</div><div class='del'>-				pr_warn("Found a second bulk out ep, ignored\n");</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (le16_to_cpu(ep-&gt;wMaxPacketSize) != 64)</div><div class='del'>-				pr_warn("bulk out: wMaxPacketSize != 64\n");</div><div class='del'>-			if (ep-&gt;bEndpointAddress != 2)</div><div class='del'>-				pr_warn("bulk out: bEndpointAddress: %d\n",</div><div class='del'>-					ep-&gt;bEndpointAddress);</div><div class='del'>-			upriv-&gt;write_pipe = usb_sndbulkpipe(udev,</div><div class='del'>-							  ep-&gt;</div><div class='del'>-							  bEndpointAddress);</div><div class='del'>-			upriv-&gt;bap_buf = kmalloc(BULK_BUF_SIZE, GFP_KERNEL);</div><div class='del'>-			if (!upriv-&gt;bap_buf) {</div><div class='del'>-				err("Couldn't allocate bulk_out_buffer");</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!upriv-&gt;bap_buf || !upriv-&gt;read_urb) {</div><div class='del'>-		err("Didn't find the required bulk endpoints");</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (request_firmware(&amp;fw_entry, "orinoco_ezusb_fw",</div><div class='del'>-			     &amp;interface-&gt;dev) == 0) {</div><div class='del'>-		firmware.size = fw_entry-&gt;size;</div><div class='del'>-		firmware.code = fw_entry-&gt;data;</div><div class='del'>-	}</div><div class='del'>-	if (firmware.size &amp;&amp; firmware.code) {</div><div class='del'>-		if (ezusb_firmware_download(upriv, &amp;firmware) &lt; 0)</div><div class='del'>-			goto error;</div><div class='del'>-	} else {</div><div class='del'>-		err("No firmware to download");</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ezusb_hard_reset(priv) &lt; 0) {</div><div class='del'>-		err("Cannot reset the device");</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the firmware is already downloaded orinoco.c will call</div><div class='del'>-	 * ezusb_init but if the firmware is not already there, that will make</div><div class='del'>-	 * the kernel very unstable, so we try initializing here and quit in</div><div class='del'>-	 * case of error */</div><div class='del'>-	if (ezusb_init(hw) &lt; 0) {</div><div class='del'>-		err("Couldn't initialize the device");</div><div class='del'>-		err("Firmware may not be downloaded or may be wrong.");</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Initialise the main driver */</div><div class='del'>-	if (orinoco_init(priv) != 0) {</div><div class='del'>-		err("orinoco_init() failed\n");</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (orinoco_if_add(priv, 0, 0, &amp;ezusb_netdev_ops) != 0) {</div><div class='del'>-		upriv-&gt;dev = NULL;</div><div class='del'>-		err("%s: orinoco_if_add() failed", __func__);</div><div class='del'>-		wiphy_unregister(priv_to_wiphy(priv));</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-	upriv-&gt;dev = priv-&gt;ndev;</div><div class='del'>-</div><div class='del'>-	goto exit;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-	ezusb_delete(upriv);</div><div class='del'>-	if (upriv-&gt;dev) {</div><div class='del'>-		/* upriv-&gt;dev was 0, so ezusb_delete() didn't free it */</div><div class='del'>-		free_orinocodev(priv);</div><div class='del'>-	}</div><div class='del'>-	upriv = NULL;</div><div class='del'>-	retval = -EFAULT;</div><div class='del'>- exit:</div><div class='del'>-	if (fw_entry) {</div><div class='del'>-		firmware.code = NULL;</div><div class='del'>-		firmware.size = 0;</div><div class='del'>-		release_firmware(fw_entry);</div><div class='del'>-	}</div><div class='del'>-	usb_set_intfdata(interface, upriv);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void ezusb_disconnect(struct usb_interface *intf)</div><div class='del'>-{</div><div class='del'>-	struct ezusb_priv *upriv = usb_get_intfdata(intf);</div><div class='del'>-	usb_set_intfdata(intf, NULL);</div><div class='del'>-	ezusb_delete(upriv);</div><div class='del'>-	printk(KERN_INFO PFX "Disconnected\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* usb specific object needed to register this driver with the usb subsystem */</div><div class='del'>-static struct usb_driver orinoco_driver = {</div><div class='del'>-	.name = DRIVER_NAME,</div><div class='del'>-	.probe = ezusb_probe,</div><div class='del'>-	.disconnect = ezusb_disconnect,</div><div class='del'>-	.id_table = ezusb_table,</div><div class='del'>-	.disable_hub_initiated_lpm = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-module_usb_driver(orinoco_driver);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Manuel Estrada Sainz");</div><div class='del'>-MODULE_DESCRIPTION("Driver for Orinoco wireless LAN cards using EZUSB bridge");</div><div class='del'>-MODULE_LICENSE("Dual MPL/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/scan.c b/drivers/net/wireless/intersil/orinoco/scan.c<br/>deleted file mode 100644<br/>index 6d1d084854fb..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/scan.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/scan.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,259 +0,0 @@</div><div class='del'>-/* Helpers for managing scan queues</div><div class='del'>- *</div><div class='del'>- * See copyright notice in main.c</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/gfp.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/ieee80211.h&gt;</div><div class='del'>-#include &lt;net/cfg80211.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hermes.h"</div><div class='del'>-#include "orinoco.h"</div><div class='del'>-#include "main.h"</div><div class='del'>-</div><div class='del'>-#include "scan.h"</div><div class='del'>-</div><div class='del'>-#define ZERO_DBM_OFFSET 0x95</div><div class='del'>-#define MAX_SIGNAL_LEVEL 0x8A</div><div class='del'>-#define MIN_SIGNAL_LEVEL 0x2F</div><div class='del'>-</div><div class='del'>-#define SIGNAL_TO_DBM(x)					\</div><div class='del'>-	(clamp_t(s32, (x), MIN_SIGNAL_LEVEL, MAX_SIGNAL_LEVEL)	\</div><div class='del'>-	 - ZERO_DBM_OFFSET)</div><div class='del'>-#define SIGNAL_TO_MBM(x) (SIGNAL_TO_DBM(x) * 100)</div><div class='del'>-</div><div class='del'>-static int symbol_build_supp_rates(u8 *buf, const __le16 *rates)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	u8 rate;</div><div class='del'>-</div><div class='del'>-	buf[0] = WLAN_EID_SUPP_RATES;</div><div class='del'>-	for (i = 0; i &lt; 5; i++) {</div><div class='del'>-		rate = le16_to_cpu(rates[i]);</div><div class='del'>-		/* NULL terminated */</div><div class='del'>-		if (rate == 0x0)</div><div class='del'>-			break;</div><div class='del'>-		buf[i + 2] = rate;</div><div class='del'>-	}</div><div class='del'>-	buf[1] = i;</div><div class='del'>-</div><div class='del'>-	return i + 2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int prism_build_supp_rates(u8 *buf, const u8 *rates)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	buf[0] = WLAN_EID_SUPP_RATES;</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		/* NULL terminated */</div><div class='del'>-		if (rates[i] == 0x0)</div><div class='del'>-			break;</div><div class='del'>-		buf[i + 2] = rates[i];</div><div class='del'>-	}</div><div class='del'>-	buf[1] = i;</div><div class='del'>-</div><div class='del'>-	/* We might still have another 2 rates, which need to go in</div><div class='del'>-	 * extended supported rates */</div><div class='del'>-	if (i == 8 &amp;&amp; rates[i] &gt; 0) {</div><div class='del'>-		buf[10] = WLAN_EID_EXT_SUPP_RATES;</div><div class='del'>-		for (; i &lt; 10; i++) {</div><div class='del'>-			/* NULL terminated */</div><div class='del'>-			if (rates[i] == 0x0)</div><div class='del'>-				break;</div><div class='del'>-			buf[i + 2] = rates[i];</div><div class='del'>-		}</div><div class='del'>-		buf[11] = i - 8;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (i &lt; 8) ? i + 2 : i + 4;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void orinoco_add_hostscan_result(struct orinoco_private *priv,</div><div class='del'>-					const union hermes_scan_info *bss)</div><div class='del'>-{</div><div class='del'>-	struct wiphy *wiphy = priv_to_wiphy(priv);</div><div class='del'>-	struct ieee80211_channel *channel;</div><div class='del'>-	struct cfg80211_bss *cbss;</div><div class='del'>-	u8 *ie;</div><div class='del'>-	u8 ie_buf[46];</div><div class='del'>-	u64 timestamp;</div><div class='del'>-	s32 signal;</div><div class='del'>-	u16 capability;</div><div class='del'>-	u16 beacon_interval;</div><div class='del'>-	int ie_len;</div><div class='del'>-	int freq;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	len = le16_to_cpu(bss-&gt;a.essid_len);</div><div class='del'>-</div><div class='del'>-	/* Reconstruct SSID and bitrate IEs to pass up */</div><div class='del'>-	ie_buf[0] = WLAN_EID_SSID;</div><div class='del'>-	ie_buf[1] = len;</div><div class='del'>-	memcpy(&amp;ie_buf[2], bss-&gt;a.essid, len);</div><div class='del'>-</div><div class='del'>-	ie = ie_buf + len + 2;</div><div class='del'>-	ie_len = ie_buf[1] + 2;</div><div class='del'>-	switch (priv-&gt;firmware_type) {</div><div class='del'>-	case FIRMWARE_TYPE_SYMBOL:</div><div class='del'>-		ie_len += symbol_build_supp_rates(ie, bss-&gt;s.rates);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case FIRMWARE_TYPE_INTERSIL:</div><div class='del'>-		ie_len += prism_build_supp_rates(ie, bss-&gt;p.rates);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case FIRMWARE_TYPE_AGERE:</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	freq = ieee80211_channel_to_frequency(</div><div class='del'>-		le16_to_cpu(bss-&gt;a.channel), NL80211_BAND_2GHZ);</div><div class='del'>-	channel = ieee80211_get_channel(wiphy, freq);</div><div class='del'>-	if (!channel) {</div><div class='del'>-		printk(KERN_DEBUG "Invalid channel designation %04X(%04X)",</div><div class='del'>-			bss-&gt;a.channel, freq);</div><div class='del'>-		return;	/* Then ignore it for now */</div><div class='del'>-	}</div><div class='del'>-	timestamp = 0;</div><div class='del'>-	capability = le16_to_cpu(bss-&gt;a.capabilities);</div><div class='del'>-	beacon_interval = le16_to_cpu(bss-&gt;a.beacon_interv);</div><div class='del'>-	signal = SIGNAL_TO_MBM(le16_to_cpu(bss-&gt;a.level));</div><div class='del'>-</div><div class='del'>-	cbss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN,</div><div class='del'>-				   bss-&gt;a.bssid, timestamp, capability,</div><div class='del'>-				   beacon_interval, ie_buf, ie_len, signal,</div><div class='del'>-				   GFP_KERNEL);</div><div class='del'>-	cfg80211_put_bss(wiphy, cbss);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void orinoco_add_extscan_result(struct orinoco_private *priv,</div><div class='del'>-				struct agere_ext_scan_info *bss,</div><div class='del'>-				size_t len)</div><div class='del'>-{</div><div class='del'>-	struct wiphy *wiphy = priv_to_wiphy(priv);</div><div class='del'>-	struct ieee80211_channel *channel;</div><div class='del'>-	struct cfg80211_bss *cbss;</div><div class='del'>-	const u8 *ie;</div><div class='del'>-	u64 timestamp;</div><div class='del'>-	s32 signal;</div><div class='del'>-	u16 capability;</div><div class='del'>-	u16 beacon_interval;</div><div class='del'>-	size_t ie_len;</div><div class='del'>-	int chan, freq;</div><div class='del'>-</div><div class='del'>-	ie_len = len - sizeof(*bss);</div><div class='del'>-	ie = cfg80211_find_ie(WLAN_EID_DS_PARAMS, bss-&gt;data, ie_len);</div><div class='del'>-	chan = ie ? ie[2] : 0;</div><div class='del'>-	freq = ieee80211_channel_to_frequency(chan, NL80211_BAND_2GHZ);</div><div class='del'>-	channel = ieee80211_get_channel(wiphy, freq);</div><div class='del'>-</div><div class='del'>-	timestamp = le64_to_cpu(bss-&gt;timestamp);</div><div class='del'>-	capability = le16_to_cpu(bss-&gt;capabilities);</div><div class='del'>-	beacon_interval = le16_to_cpu(bss-&gt;beacon_interval);</div><div class='del'>-	ie = bss-&gt;data;</div><div class='del'>-	signal = SIGNAL_TO_MBM(bss-&gt;level);</div><div class='del'>-</div><div class='del'>-	cbss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN,</div><div class='del'>-				   bss-&gt;bssid, timestamp, capability,</div><div class='del'>-				   beacon_interval, ie, ie_len, signal,</div><div class='del'>-				   GFP_KERNEL);</div><div class='del'>-	cfg80211_put_bss(wiphy, cbss);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void orinoco_add_hostscan_results(struct orinoco_private *priv,</div><div class='del'>-				  unsigned char *buf,</div><div class='del'>-				  size_t len)</div><div class='del'>-{</div><div class='del'>-	int offset;		/* In the scan data */</div><div class='del'>-	size_t atom_len;</div><div class='del'>-	bool abort = false;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;firmware_type) {</div><div class='del'>-	case FIRMWARE_TYPE_AGERE:</div><div class='del'>-		atom_len = sizeof(struct agere_scan_apinfo);</div><div class='del'>-		offset = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case FIRMWARE_TYPE_SYMBOL:</div><div class='del'>-		/* Lack of documentation necessitates this hack.</div><div class='del'>-		 * Different firmwares have 68 or 76 byte long atoms.</div><div class='del'>-		 * We try modulo first.  If the length divides by both,</div><div class='del'>-		 * we check what would be the channel in the second</div><div class='del'>-		 * frame for a 68-byte atom.  76-byte atoms have 0 there.</div><div class='del'>-		 * Valid channel cannot be 0.  */</div><div class='del'>-		if (len % 76)</div><div class='del'>-			atom_len = 68;</div><div class='del'>-		else if (len % 68)</div><div class='del'>-			atom_len = 76;</div><div class='del'>-		else if (len &gt;= 1292 &amp;&amp; buf[68] == 0)</div><div class='del'>-			atom_len = 76;</div><div class='del'>-		else</div><div class='del'>-			atom_len = 68;</div><div class='del'>-		offset = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case FIRMWARE_TYPE_INTERSIL:</div><div class='del'>-		offset = 4;</div><div class='del'>-		if (priv-&gt;has_hostscan) {</div><div class='del'>-			atom_len = le16_to_cpup((__le16 *)buf);</div><div class='del'>-			/* Sanity check for atom_len */</div><div class='del'>-			if (atom_len &lt; sizeof(struct prism2_scan_apinfo)) {</div><div class='del'>-				printk(KERN_ERR "%s: Invalid atom_len in scan "</div><div class='del'>-				       "data: %zu\n", priv-&gt;ndev-&gt;name,</div><div class='del'>-				       atom_len);</div><div class='del'>-				abort = true;</div><div class='del'>-				goto scan_abort;</div><div class='del'>-			}</div><div class='del'>-		} else</div><div class='del'>-			atom_len = offsetof(struct prism2_scan_apinfo, atim);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		abort = true;</div><div class='del'>-		goto scan_abort;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check that we got an whole number of atoms */</div><div class='del'>-	if ((len - offset) % atom_len) {</div><div class='del'>-		printk(KERN_ERR "%s: Unexpected scan data length %zu, "</div><div class='del'>-		       "atom_len %zu, offset %d\n", priv-&gt;ndev-&gt;name, len,</div><div class='del'>-		       atom_len, offset);</div><div class='del'>-		abort = true;</div><div class='del'>-		goto scan_abort;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Process the entries one by one */</div><div class='del'>-	for (; offset + atom_len &lt;= len; offset += atom_len) {</div><div class='del'>-		union hermes_scan_info *atom;</div><div class='del'>-</div><div class='del'>-		atom = (union hermes_scan_info *) (buf + offset);</div><div class='del'>-</div><div class='del'>-		orinoco_add_hostscan_result(priv, atom);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- scan_abort:</div><div class='del'>-	if (priv-&gt;scan_request) {</div><div class='del'>-		struct cfg80211_scan_info info = {</div><div class='del'>-			.aborted = abort,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cfg80211_scan_done(priv-&gt;scan_request, &amp;info);</div><div class='del'>-		priv-&gt;scan_request = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void orinoco_scan_done(struct orinoco_private *priv, bool abort)</div><div class='del'>-{</div><div class='del'>-	if (priv-&gt;scan_request) {</div><div class='del'>-		struct cfg80211_scan_info info = {</div><div class='del'>-			.aborted = abort,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cfg80211_scan_done(priv-&gt;scan_request, &amp;info);</div><div class='del'>-		priv-&gt;scan_request = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/scan.h b/drivers/net/wireless/intersil/orinoco/scan.h<br/>deleted file mode 100644<br/>index 27281fb0a6dc..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/scan.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/scan.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-/* Helpers for managing scan queues</div><div class='del'>- *</div><div class='del'>- * See copyright notice in main.c</div><div class='del'>- */</div><div class='del'>-#ifndef _ORINOCO_SCAN_H_</div><div class='del'>-#define _ORINOCO_SCAN_H_</div><div class='del'>-</div><div class='del'>-/* Forward declarations */</div><div class='del'>-struct orinoco_private;</div><div class='del'>-struct agere_ext_scan_info;</div><div class='del'>-</div><div class='del'>-/* Add scan results */</div><div class='del'>-void orinoco_add_extscan_result(struct orinoco_private *priv,</div><div class='del'>-				struct agere_ext_scan_info *atom,</div><div class='del'>-				size_t len);</div><div class='del'>-void orinoco_add_hostscan_results(struct orinoco_private *dev,</div><div class='del'>-				  unsigned char *buf,</div><div class='del'>-				  size_t len);</div><div class='del'>-void orinoco_scan_done(struct orinoco_private *priv, bool abort);</div><div class='del'>-</div><div class='del'>-#endif /* _ORINOCO_SCAN_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/spectrum_cs.c b/drivers/net/wireless/intersil/orinoco/spectrum_cs.c<br/>deleted file mode 100644<br/>index 291ef97ed45e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/spectrum_cs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/spectrum_cs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,319 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Driver for 802.11b cards using RAM-loadable Symbol firmware, such as</div><div class='del'>- * Symbol Wireless Networker LA4137, CompactFlash cards by Socket</div><div class='del'>- * Communications and Intel PRO/Wireless 2011B.</div><div class='del'>- *</div><div class='del'>- * The driver implements Symbol firmware download.  The rest is handled</div><div class='del'>- * in hermes.c and main.c.</div><div class='del'>- *</div><div class='del'>- * Utilities for downloading the Symbol firmware are available at</div><div class='del'>- * http://sourceforge.net/projects/orinoco/</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2002-2005 Pavel Roskin &lt;proski@gnu.org&gt;</div><div class='del'>- * Portions based on orinoco_cs.c:</div><div class='del'>- *	Copyright (C) David Gibson, Linuxcare Australia</div><div class='del'>- * Portions based on Spectrum24tDnld.c from original spectrum24 driver:</div><div class='del'>- *	Copyright (C) Symbol Technologies.</div><div class='del'>- *</div><div class='del'>- * See copyright notice in file main.c.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define DRIVER_NAME "spectrum_cs"</div><div class='del'>-#define PFX DRIVER_NAME ": "</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;pcmcia/cistpl.h&gt;</div><div class='del'>-#include &lt;pcmcia/cisreg.h&gt;</div><div class='del'>-#include &lt;pcmcia/ds.h&gt;</div><div class='del'>-</div><div class='del'>-#include "orinoco.h"</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Module stuff							    */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Pavel Roskin &lt;proski@gnu.org&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Driver for Symbol Spectrum24 Trilogy cards with firmware downloader");</div><div class='del'>-MODULE_LICENSE("Dual MPL/GPL");</div><div class='del'>-</div><div class='del'>-/* Module parameters */</div><div class='del'>-</div><div class='del'>-/* Some D-Link cards have buggy CIS. They do work at 5v properly, but</div><div class='del'>- * don't have any CIS entry for it. This workaround it... */</div><div class='del'>-static int ignore_cis_vcc; /* = 0 */</div><div class='del'>-module_param(ignore_cis_vcc, int, 0);</div><div class='del'>-MODULE_PARM_DESC(ignore_cis_vcc, "Allow voltage mismatch between card and socket");</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Data structures						    */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-/* PCMCIA specific device information (goes in the card field of</div><div class='del'>- * struct orinoco_private */</div><div class='del'>-struct orinoco_pccard {</div><div class='del'>-	struct pcmcia_device	*p_dev;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Function prototypes						    */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-static int spectrum_cs_config(struct pcmcia_device *link);</div><div class='del'>-static void spectrum_cs_release(struct pcmcia_device *link);</div><div class='del'>-</div><div class='del'>-/* Constants for the CISREG_CCSR register */</div><div class='del'>-#define HCR_RUN		0x07	/* run firmware after reset */</div><div class='del'>-#define HCR_IDLE	0x0E	/* don't run firmware after reset */</div><div class='del'>-#define HCR_MEM16	0x10	/* memory width bit, should be preserved */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Reset the card using configuration registers COR and CCSR.</div><div class='del'>- * If IDLE is 1, stop the firmware, so that it can be safely rewritten.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-spectrum_reset(struct pcmcia_device *link, int idle)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	u8 save_cor;</div><div class='del'>-	u8 ccsr;</div><div class='del'>-</div><div class='del'>-	/* Doing it if hardware is gone is guaranteed crash */</div><div class='del'>-	if (!pcmcia_dev_present(link))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	/* Save original COR value */</div><div class='del'>-	ret = pcmcia_read_config_byte(link, CISREG_COR, &amp;save_cor);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto failed;</div><div class='del'>-</div><div class='del'>-	/* Soft-Reset card */</div><div class='del'>-	ret = pcmcia_write_config_byte(link, CISREG_COR,</div><div class='del'>-				(save_cor | COR_SOFT_RESET));</div><div class='del'>-	if (ret)</div><div class='del'>-		goto failed;</div><div class='del'>-	udelay(1000);</div><div class='del'>-</div><div class='del'>-	/* Read CCSR */</div><div class='del'>-	ret = pcmcia_read_config_byte(link, CISREG_CCSR, &amp;ccsr);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto failed;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Start or stop the firmware.  Memory width bit should be</div><div class='del'>-	 * preserved from the value we've just read.</div><div class='del'>-	 */</div><div class='del'>-	ccsr = (idle ? HCR_IDLE : HCR_RUN) | (ccsr &amp; HCR_MEM16);</div><div class='del'>-	ret = pcmcia_write_config_byte(link, CISREG_CCSR, ccsr);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto failed;</div><div class='del'>-	udelay(1000);</div><div class='del'>-</div><div class='del'>-	/* Restore original COR configuration index */</div><div class='del'>-	ret = pcmcia_write_config_byte(link, CISREG_COR,</div><div class='del'>-				(save_cor &amp; ~COR_SOFT_RESET));</div><div class='del'>-	if (ret)</div><div class='del'>-		goto failed;</div><div class='del'>-	udelay(1000);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-failed:</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Device methods						    */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-spectrum_cs_hard_reset(struct orinoco_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_pccard *card = priv-&gt;card;</div><div class='del'>-	struct pcmcia_device *link = card-&gt;p_dev;</div><div class='del'>-</div><div class='del'>-	/* Soft reset using COR and HCR */</div><div class='del'>-	spectrum_reset(link, 0);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-spectrum_cs_stop_firmware(struct orinoco_private *priv, int idle)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_pccard *card = priv-&gt;card;</div><div class='del'>-	struct pcmcia_device *link = card-&gt;p_dev;</div><div class='del'>-</div><div class='del'>-	return spectrum_reset(link, idle);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* PCMCIA stuff							    */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-spectrum_cs_probe(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv;</div><div class='del'>-	struct orinoco_pccard *card;</div><div class='del'>-</div><div class='del'>-	priv = alloc_orinocodev(sizeof(*card), &amp;link-&gt;dev,</div><div class='del'>-				spectrum_cs_hard_reset,</div><div class='del'>-				spectrum_cs_stop_firmware);</div><div class='del'>-	if (!priv)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	card = priv-&gt;card;</div><div class='del'>-</div><div class='del'>-	/* Link both structures together */</div><div class='del'>-	card-&gt;p_dev = link;</div><div class='del'>-	link-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	return spectrum_cs_config(link);</div><div class='del'>-}				/* spectrum_cs_attach */</div><div class='del'>-</div><div class='del'>-static void spectrum_cs_detach(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = link-&gt;priv;</div><div class='del'>-</div><div class='del'>-	orinoco_if_del(priv);</div><div class='del'>-</div><div class='del'>-	spectrum_cs_release(link);</div><div class='del'>-</div><div class='del'>-	free_orinocodev(priv);</div><div class='del'>-}				/* spectrum_cs_detach */</div><div class='del'>-</div><div class='del'>-static int spectrum_cs_config_check(struct pcmcia_device *p_dev,</div><div class='del'>-				    void *priv_data)</div><div class='del'>-{</div><div class='del'>-	if (p_dev-&gt;config_index == 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return pcmcia_request_io(p_dev);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-spectrum_cs_config(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = link-&gt;priv;</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int ret;</div><div class='del'>-	void __iomem *mem;</div><div class='del'>-</div><div class='del'>-	link-&gt;config_flags |= CONF_AUTO_SET_VPP | CONF_AUTO_CHECK_VCC |</div><div class='del'>-		CONF_AUTO_SET_IO | CONF_ENABLE_IRQ;</div><div class='del'>-	if (ignore_cis_vcc)</div><div class='del'>-		link-&gt;config_flags &amp;= ~CONF_AUTO_CHECK_VCC;</div><div class='del'>-	ret = pcmcia_loop_config(link, spectrum_cs_config_check, NULL);</div><div class='del'>-	if (ret) {</div><div class='del'>-		if (!ignore_cis_vcc)</div><div class='del'>-			printk(KERN_ERR PFX "GetNextTuple(): No matching "</div><div class='del'>-			       "CIS configuration.  Maybe you need the "</div><div class='del'>-			       "ignore_cis_vcc=1 parameter.\n");</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mem = ioport_map(link-&gt;resource[0]-&gt;start,</div><div class='del'>-			resource_size(link-&gt;resource[0]));</div><div class='del'>-	if (!mem)</div><div class='del'>-		goto failed;</div><div class='del'>-</div><div class='del'>-	/* We initialize the hermes structure before completing PCMCIA</div><div class='del'>-	 * configuration just in case the interrupt handler gets</div><div class='del'>-	 * called. */</div><div class='del'>-	hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING);</div><div class='del'>-	hw-&gt;eeprom_pda = true;</div><div class='del'>-</div><div class='del'>-	ret = pcmcia_request_irq(link, orinoco_interrupt);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto failed;</div><div class='del'>-</div><div class='del'>-	ret = pcmcia_enable_device(link);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto failed;</div><div class='del'>-</div><div class='del'>-	/* Reset card */</div><div class='del'>-	if (spectrum_cs_hard_reset(priv) != 0)</div><div class='del'>-		goto failed;</div><div class='del'>-</div><div class='del'>-	/* Initialise the main driver */</div><div class='del'>-	if (orinoco_init(priv) != 0) {</div><div class='del'>-		printk(KERN_ERR PFX "orinoco_init() failed\n");</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Register an interface with the stack */</div><div class='del'>-	if (orinoco_if_add(priv, link-&gt;resource[0]-&gt;start,</div><div class='del'>-			   link-&gt;irq, NULL) != 0) {</div><div class='del'>-		printk(KERN_ERR PFX "orinoco_if_add() failed\n");</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- failed:</div><div class='del'>-	spectrum_cs_release(link);</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}				/* spectrum_cs_config */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-spectrum_cs_release(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = link-&gt;priv;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* We're committed to taking the device away now, so mark the</div><div class='del'>-	 * hardware as unavailable */</div><div class='del'>-	priv-&gt;hw.ops-&gt;lock_irqsave(&amp;priv-&gt;lock, &amp;flags);</div><div class='del'>-	priv-&gt;hw_unavailable++;</div><div class='del'>-	priv-&gt;hw.ops-&gt;unlock_irqrestore(&amp;priv-&gt;lock, &amp;flags);</div><div class='del'>-</div><div class='del'>-	pcmcia_disable_device(link);</div><div class='del'>-	if (priv-&gt;hw.iobase)</div><div class='del'>-		ioport_unmap(priv-&gt;hw.iobase);</div><div class='del'>-}				/* spectrum_cs_release */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-spectrum_cs_suspend(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = link-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Mark the device as stopped, to block IO until later */</div><div class='del'>-	orinoco_down(priv);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-spectrum_cs_resume(struct pcmcia_device *link)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = link-&gt;priv;</div><div class='del'>-	int err = orinoco_up(priv);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Module initialization					    */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-static const struct pcmcia_device_id spectrum_cs_ids[] = {</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x026c, 0x0001), /* Symbol Spectrum24 LA4137 */</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x0104, 0x0001), /* Socket Communications CF */</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("Intel", "PRO/Wireless LAN PC Card", 0x816cc815, 0x6fbf459a), /* 2011B, not 2011 */</div><div class='del'>-	PCMCIA_DEVICE_NULL,</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(pcmcia, spectrum_cs_ids);</div><div class='del'>-</div><div class='del'>-static struct pcmcia_driver orinoco_driver = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.name		= DRIVER_NAME,</div><div class='del'>-	.probe		= spectrum_cs_probe,</div><div class='del'>-	.remove		= spectrum_cs_detach,</div><div class='del'>-	.suspend	= spectrum_cs_suspend,</div><div class='del'>-	.resume		= spectrum_cs_resume,</div><div class='del'>-	.id_table       = spectrum_cs_ids,</div><div class='del'>-};</div><div class='del'>-module_pcmcia_driver(orinoco_driver);</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/wext.c b/drivers/net/wireless/intersil/orinoco/wext.c<br/>deleted file mode 100644<br/>index 7b6c4ae8ddb3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/wext.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/wext.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1413 +0,0 @@</div><div class='del'>-/* Wireless extensions support.</div><div class='del'>- *</div><div class='del'>- * See copyright notice in main.c</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/wireless.h&gt;</div><div class='del'>-#include &lt;linux/ieee80211.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;net/iw_handler.h&gt;</div><div class='del'>-#include &lt;net/cfg80211.h&gt;</div><div class='del'>-#include &lt;net/cfg80211-wext.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hermes.h"</div><div class='del'>-#include "hermes_rid.h"</div><div class='del'>-#include "orinoco.h"</div><div class='del'>-</div><div class='del'>-#include "hw.h"</div><div class='del'>-#include "mic.h"</div><div class='del'>-#include "scan.h"</div><div class='del'>-#include "main.h"</div><div class='del'>-</div><div class='del'>-#include "wext.h"</div><div class='del'>-</div><div class='del'>-#define MAX_RID_LEN 1024</div><div class='del'>-</div><div class='del'>-/* Helper routine to record keys</div><div class='del'>- * It is called under orinoco_lock so it may not sleep */</div><div class='del'>-static int orinoco_set_key(struct orinoco_private *priv, int index,</div><div class='del'>-			   enum orinoco_alg alg, const u8 *key, int key_len,</div><div class='del'>-			   const u8 *seq, int seq_len)</div><div class='del'>-{</div><div class='del'>-	kfree_sensitive(priv-&gt;keys[index].key);</div><div class='del'>-	kfree_sensitive(priv-&gt;keys[index].seq);</div><div class='del'>-</div><div class='del'>-	if (key_len) {</div><div class='del'>-		priv-&gt;keys[index].key = kzalloc(key_len, GFP_ATOMIC);</div><div class='del'>-		if (!priv-&gt;keys[index].key)</div><div class='del'>-			goto nomem;</div><div class='del'>-	} else</div><div class='del'>-		priv-&gt;keys[index].key = NULL;</div><div class='del'>-</div><div class='del'>-	if (seq_len) {</div><div class='del'>-		priv-&gt;keys[index].seq = kzalloc(seq_len, GFP_ATOMIC);</div><div class='del'>-		if (!priv-&gt;keys[index].seq)</div><div class='del'>-			goto free_key;</div><div class='del'>-	} else</div><div class='del'>-		priv-&gt;keys[index].seq = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;keys[index].key_len = key_len;</div><div class='del'>-	priv-&gt;keys[index].seq_len = seq_len;</div><div class='del'>-</div><div class='del'>-	if (key_len)</div><div class='del'>-		memcpy((void *)priv-&gt;keys[index].key, key, key_len);</div><div class='del'>-	if (seq_len)</div><div class='del'>-		memcpy((void *)priv-&gt;keys[index].seq, seq, seq_len);</div><div class='del'>-</div><div class='del'>-	switch (alg) {</div><div class='del'>-	case ORINOCO_ALG_TKIP:</div><div class='del'>-		priv-&gt;keys[index].cipher = WLAN_CIPHER_SUITE_TKIP;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ORINOCO_ALG_WEP:</div><div class='del'>-		priv-&gt;keys[index].cipher = (key_len &gt; SMALL_KEY_SIZE) ?</div><div class='del'>-			WLAN_CIPHER_SUITE_WEP104 : WLAN_CIPHER_SUITE_WEP40;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ORINOCO_ALG_NONE:</div><div class='del'>-	default:</div><div class='del'>-		priv-&gt;keys[index].cipher = 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-free_key:</div><div class='del'>-	kfree(priv-&gt;keys[index].key);</div><div class='del'>-	priv-&gt;keys[index].key = NULL;</div><div class='del'>-</div><div class='del'>-nomem:</div><div class='del'>-	priv-&gt;keys[index].key_len = 0;</div><div class='del'>-	priv-&gt;keys[index].seq_len = 0;</div><div class='del'>-	priv-&gt;keys[index].cipher = 0;</div><div class='del'>-</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct iw_statistics *orinoco_get_wireless_stats(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	struct iw_statistics *wstats = &amp;priv-&gt;wstats;</div><div class='del'>-	int err;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (!netif_device_present(dev)) {</div><div class='del'>-		printk(KERN_WARNING "%s: get_wireless_stats() called while device not present\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		return NULL; /* FIXME: Can we do better than this? */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If busy, return the old stats.  Returning NULL may cause</div><div class='del'>-	 * the interface to disappear from /proc/net/wireless */</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return wstats;</div><div class='del'>-</div><div class='del'>-	/* We can't really wait for the tallies inquiry command to</div><div class='del'>-	 * complete, so we just use the previous results and trigger</div><div class='del'>-	 * a new tallies inquiry command for next time - Jean II */</div><div class='del'>-	/* FIXME: Really we should wait for the inquiry to come back -</div><div class='del'>-	 * as it is the stats we give don't make a whole lot of sense.</div><div class='del'>-	 * Unfortunately, it's not clear how to do that within the</div><div class='del'>-	 * wireless extensions framework: I think we're in user</div><div class='del'>-	 * context, but a lock seems to be held by the time we get in</div><div class='del'>-	 * here so we're not safe to sleep here. */</div><div class='del'>-	hermes_inquire(hw, HERMES_INQ_TALLIES);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC) {</div><div class='del'>-		memset(&amp;wstats-&gt;qual, 0, sizeof(wstats-&gt;qual));</div><div class='del'>-		/* If a spy address is defined, we report stats of the</div><div class='del'>-		 * first spy address - Jean II */</div><div class='del'>-		if (SPY_NUMBER(priv)) {</div><div class='del'>-			wstats-&gt;qual.qual = priv-&gt;spy_data.spy_stat[0].qual;</div><div class='del'>-			wstats-&gt;qual.level = priv-&gt;spy_data.spy_stat[0].level;</div><div class='del'>-			wstats-&gt;qual.noise = priv-&gt;spy_data.spy_stat[0].noise;</div><div class='del'>-			wstats-&gt;qual.updated =</div><div class='del'>-				priv-&gt;spy_data.spy_stat[0].updated;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		struct {</div><div class='del'>-			__le16 qual, signal, noise, unused;</div><div class='del'>-		} __packed cq;</div><div class='del'>-</div><div class='del'>-		err = HERMES_READ_RECORD(hw, USER_BAP,</div><div class='del'>-					 HERMES_RID_COMMSQUALITY, &amp;cq);</div><div class='del'>-</div><div class='del'>-		if (!err) {</div><div class='del'>-			wstats-&gt;qual.qual = (int)le16_to_cpu(cq.qual);</div><div class='del'>-			wstats-&gt;qual.level = (int)le16_to_cpu(cq.signal) - 0x95;</div><div class='del'>-			wstats-&gt;qual.noise = (int)le16_to_cpu(cq.noise) - 0x95;</div><div class='del'>-			wstats-&gt;qual.updated =</div><div class='del'>-				IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-	return wstats;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Wireless extensions                                              */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_setwap(struct net_device *dev,</div><div class='del'>-				struct iw_request_info *info,</div><div class='del'>-				struct sockaddr *ap_addr,</div><div class='del'>-				char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	int err = -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	/* Enable automatic roaming - no sanity checks are needed */</div><div class='del'>-	if (is_zero_ether_addr(ap_addr-&gt;sa_data) ||</div><div class='del'>-	    is_broadcast_ether_addr(ap_addr-&gt;sa_data)) {</div><div class='del'>-		priv-&gt;bssid_fixed = 0;</div><div class='del'>-		eth_zero_addr(priv-&gt;desired_bssid);</div><div class='del'>-</div><div class='del'>-		/* "off" means keep existing connection */</div><div class='del'>-		if (ap_addr-&gt;sa_data[0] == 0) {</div><div class='del'>-			__orinoco_hw_set_wap(priv);</div><div class='del'>-			err = 0;</div><div class='del'>-		}</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;firmware_type == FIRMWARE_TYPE_AGERE) {</div><div class='del'>-		printk(KERN_WARNING "%s: Lucent/Agere firmware doesn't "</div><div class='del'>-		       "support manual roaming\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;iw_mode != NL80211_IFTYPE_STATION) {</div><div class='del'>-		printk(KERN_WARNING "%s: Manual roaming supported only in "</div><div class='del'>-		       "managed mode\n", dev-&gt;name);</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Intersil firmware hangs without Desired ESSID */</div><div class='del'>-	if (priv-&gt;firmware_type == FIRMWARE_TYPE_INTERSIL &amp;&amp;</div><div class='del'>-	    strlen(priv-&gt;desired_essid) == 0) {</div><div class='del'>-		printk(KERN_WARNING "%s: Desired ESSID must be set for "</div><div class='del'>-		       "manual roaming\n", dev-&gt;name);</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Finally, enable manual roaming */</div><div class='del'>-	priv-&gt;bssid_fixed = 1;</div><div class='del'>-	memcpy(priv-&gt;desired_bssid, &amp;ap_addr-&gt;sa_data, ETH_ALEN);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_getwap(struct net_device *dev,</div><div class='del'>-				struct iw_request_info *info,</div><div class='del'>-				struct sockaddr *ap_addr,</div><div class='del'>-				char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-</div><div class='del'>-	int err = 0;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	ap_addr-&gt;sa_family = ARPHRD_ETHER;</div><div class='del'>-	err = orinoco_hw_get_current_bssid(priv, ap_addr-&gt;sa_data);</div><div class='del'>-</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_setiwencode(struct net_device *dev,</div><div class='del'>-				     struct iw_request_info *info,</div><div class='del'>-				     struct iw_point *erq,</div><div class='del'>-				     char *keybuf)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	int index = (erq-&gt;flags &amp; IW_ENCODE_INDEX) - 1;</div><div class='del'>-	int setindex = priv-&gt;tx_key;</div><div class='del'>-	enum orinoco_alg encode_alg = priv-&gt;encode_alg;</div><div class='del'>-	int restricted = priv-&gt;wep_restrict;</div><div class='del'>-	int err = -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;has_wep)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (erq-&gt;pointer) {</div><div class='del'>-		/* We actually have a key to set - check its length */</div><div class='del'>-		if (erq-&gt;length &gt; LARGE_KEY_SIZE)</div><div class='del'>-			return -E2BIG;</div><div class='del'>-</div><div class='del'>-		if ((erq-&gt;length &gt; SMALL_KEY_SIZE) &amp;&amp; !priv-&gt;has_big_wep)</div><div class='del'>-			return -E2BIG;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	/* Clear any TKIP key we have */</div><div class='del'>-	if ((priv-&gt;has_wpa) &amp;&amp; (priv-&gt;encode_alg == ORINOCO_ALG_TKIP))</div><div class='del'>-		(void) orinoco_clear_tkip_key(priv, setindex);</div><div class='del'>-</div><div class='del'>-	if (erq-&gt;length &gt; 0) {</div><div class='del'>-		if ((index &lt; 0) || (index &gt;= ORINOCO_MAX_KEYS))</div><div class='del'>-			index = priv-&gt;tx_key;</div><div class='del'>-</div><div class='del'>-		/* Switch on WEP if off */</div><div class='del'>-		if (encode_alg != ORINOCO_ALG_WEP) {</div><div class='del'>-			setindex = index;</div><div class='del'>-			encode_alg = ORINOCO_ALG_WEP;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Important note : if the user do "iwconfig eth0 enc off",</div><div class='del'>-		 * we will arrive there with an index of -1. This is valid</div><div class='del'>-		 * but need to be taken care off... Jean II */</div><div class='del'>-		if ((index &lt; 0) || (index &gt;= ORINOCO_MAX_KEYS)) {</div><div class='del'>-			if ((index != -1) || (erq-&gt;flags == 0)) {</div><div class='del'>-				err = -EINVAL;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			/* Set the index : Check that the key is valid */</div><div class='del'>-			if (priv-&gt;keys[index].key_len == 0) {</div><div class='del'>-				err = -EINVAL;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			setindex = index;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (erq-&gt;flags &amp; IW_ENCODE_DISABLED)</div><div class='del'>-		encode_alg = ORINOCO_ALG_NONE;</div><div class='del'>-	if (erq-&gt;flags &amp; IW_ENCODE_OPEN)</div><div class='del'>-		restricted = 0;</div><div class='del'>-	if (erq-&gt;flags &amp; IW_ENCODE_RESTRICTED)</div><div class='del'>-		restricted = 1;</div><div class='del'>-</div><div class='del'>-	if (erq-&gt;pointer &amp;&amp; erq-&gt;length &gt; 0) {</div><div class='del'>-		err = orinoco_set_key(priv, index, ORINOCO_ALG_WEP, keybuf,</div><div class='del'>-				      erq-&gt;length, NULL, 0);</div><div class='del'>-	}</div><div class='del'>-	priv-&gt;tx_key = setindex;</div><div class='del'>-</div><div class='del'>-	/* Try fast key change if connected and only keys are changed */</div><div class='del'>-	if ((priv-&gt;encode_alg == encode_alg) &amp;&amp;</div><div class='del'>-	    (priv-&gt;wep_restrict == restricted) &amp;&amp;</div><div class='del'>-	    netif_carrier_ok(dev)) {</div><div class='del'>-		err = __orinoco_hw_setup_wepkeys(priv);</div><div class='del'>-		/* No need to commit if successful */</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;encode_alg = encode_alg;</div><div class='del'>-	priv-&gt;wep_restrict = restricted;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_getiwencode(struct net_device *dev,</div><div class='del'>-				     struct iw_request_info *info,</div><div class='del'>-				     struct iw_point *erq,</div><div class='del'>-				     char *keybuf)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	int index = (erq-&gt;flags &amp; IW_ENCODE_INDEX) - 1;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;has_wep)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	if ((index &lt; 0) || (index &gt;= ORINOCO_MAX_KEYS))</div><div class='del'>-		index = priv-&gt;tx_key;</div><div class='del'>-</div><div class='del'>-	erq-&gt;flags = 0;</div><div class='del'>-	if (!priv-&gt;encode_alg)</div><div class='del'>-		erq-&gt;flags |= IW_ENCODE_DISABLED;</div><div class='del'>-	erq-&gt;flags |= index + 1;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;wep_restrict)</div><div class='del'>-		erq-&gt;flags |= IW_ENCODE_RESTRICTED;</div><div class='del'>-	else</div><div class='del'>-		erq-&gt;flags |= IW_ENCODE_OPEN;</div><div class='del'>-</div><div class='del'>-	erq-&gt;length = priv-&gt;keys[index].key_len;</div><div class='del'>-</div><div class='del'>-	memcpy(keybuf, priv-&gt;keys[index].key, erq-&gt;length);</div><div class='del'>-</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_setessid(struct net_device *dev,</div><div class='del'>-				  struct iw_request_info *info,</div><div class='del'>-				  struct iw_point *erq,</div><div class='del'>-				  char *essidbuf)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* Note : ESSID is ignored in Ad-Hoc demo mode, but we can set it</div><div class='del'>-	 * anyway... - Jean II */</div><div class='del'>-</div><div class='del'>-	/* Hum... Should not use Wireless Extension constant (may change),</div><div class='del'>-	 * should use our own... - Jean II */</div><div class='del'>-	if (erq-&gt;length &gt; IW_ESSID_MAX_SIZE)</div><div class='del'>-		return -E2BIG;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	/* NULL the string (for NULL termination &amp; ESSID = ANY) - Jean II */</div><div class='del'>-	memset(priv-&gt;desired_essid, 0, sizeof(priv-&gt;desired_essid));</div><div class='del'>-</div><div class='del'>-	/* If not ANY, get the new ESSID */</div><div class='del'>-	if (erq-&gt;flags)</div><div class='del'>-		memcpy(priv-&gt;desired_essid, essidbuf, erq-&gt;length);</div><div class='del'>-</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	return -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_getessid(struct net_device *dev,</div><div class='del'>-				  struct iw_request_info *info,</div><div class='del'>-				  struct iw_point *erq,</div><div class='del'>-				  char *essidbuf)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	int active;</div><div class='del'>-	int err = 0;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (netif_running(dev)) {</div><div class='del'>-		err = orinoco_hw_get_essid(priv, &amp;active, essidbuf);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		erq-&gt;length = err;</div><div class='del'>-	} else {</div><div class='del'>-		if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		memcpy(essidbuf, priv-&gt;desired_essid, IW_ESSID_MAX_SIZE);</div><div class='del'>-		erq-&gt;length = strlen(priv-&gt;desired_essid);</div><div class='del'>-		orinoco_unlock(priv, &amp;flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	erq-&gt;flags = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_setfreq(struct net_device *dev,</div><div class='del'>-				 struct iw_request_info *info,</div><div class='del'>-				 struct iw_freq *frq,</div><div class='del'>-				 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	int chan = -1;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err = -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-</div><div class='del'>-	/* In infrastructure mode the AP sets the channel */</div><div class='del'>-	if (priv-&gt;iw_mode == NL80211_IFTYPE_STATION)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	if ((frq-&gt;e == 0) &amp;&amp; (frq-&gt;m &lt;= 1000)) {</div><div class='del'>-		/* Setting by channel number */</div><div class='del'>-		chan = frq-&gt;m;</div><div class='del'>-	} else {</div><div class='del'>-		/* Setting by frequency */</div><div class='del'>-		int denom = 1;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		/* Calculate denominator to rescale to MHz */</div><div class='del'>-		for (i = 0; i &lt; (6 - frq-&gt;e); i++)</div><div class='del'>-			denom *= 10;</div><div class='del'>-</div><div class='del'>-		chan = ieee80211_frequency_to_channel(frq-&gt;m / denom);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((chan &lt; 1) || (chan &gt; NUM_CHANNELS) ||</div><div class='del'>-	     !(priv-&gt;channel_mask &amp; (1 &lt;&lt; (chan - 1))))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	priv-&gt;channel = chan;</div><div class='del'>-	if (priv-&gt;iw_mode == NL80211_IFTYPE_MONITOR) {</div><div class='del'>-		/* Fast channel change - no commit if successful */</div><div class='del'>-		struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-		err = hw-&gt;ops-&gt;cmd_wait(hw, HERMES_CMD_TEST |</div><div class='del'>-					    HERMES_TEST_SET_CHANNEL,</div><div class='del'>-					chan, NULL);</div><div class='del'>-	}</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_getfreq(struct net_device *dev,</div><div class='del'>-				 struct iw_request_info *info,</div><div class='del'>-				 struct iw_freq *frq,</div><div class='del'>-				 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	int tmp;</div><div class='del'>-</div><div class='del'>-	/* Locking done in there */</div><div class='del'>-	tmp = orinoco_hw_get_freq(priv);</div><div class='del'>-	if (tmp &lt; 0)</div><div class='del'>-		return tmp;</div><div class='del'>-</div><div class='del'>-	frq-&gt;m = tmp * 100000;</div><div class='del'>-	frq-&gt;e = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_getsens(struct net_device *dev,</div><div class='del'>-				 struct iw_request_info *info,</div><div class='del'>-				 struct iw_param *srq,</div><div class='del'>-				 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	u16 val;</div><div class='del'>-	int err;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;has_sensitivity)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	err = hermes_read_wordrec(hw, USER_BAP,</div><div class='del'>-				  HERMES_RID_CNFSYSTEMSCALE, &amp;val);</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	srq-&gt;value = val;</div><div class='del'>-	srq-&gt;fixed = 0; /* auto */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_setsens(struct net_device *dev,</div><div class='del'>-				 struct iw_request_info *info,</div><div class='del'>-				 struct iw_param *srq,</div><div class='del'>-				 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	int val = srq-&gt;value;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;has_sensitivity)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if ((val &lt; 1) || (val &gt; 3))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	priv-&gt;ap_density = val;</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	return -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_setrate(struct net_device *dev,</div><div class='del'>-				 struct iw_request_info *info,</div><div class='del'>-				 struct iw_param *rrq,</div><div class='del'>-				 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	int ratemode;</div><div class='del'>-	int bitrate; /* 100s of kilobits */</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* As the user space doesn't know our highest rate, it uses -1</div><div class='del'>-	 * to ask us to set the highest rate.  Test it using "iwconfig</div><div class='del'>-	 * ethX rate auto" - Jean II */</div><div class='del'>-	if (rrq-&gt;value == -1)</div><div class='del'>-		bitrate = 110;</div><div class='del'>-	else {</div><div class='del'>-		if (rrq-&gt;value % 100000)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		bitrate = rrq-&gt;value / 100000;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ratemode = orinoco_get_bitratemode(bitrate, !rrq-&gt;fixed);</div><div class='del'>-</div><div class='del'>-	if (ratemode == -1)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	priv-&gt;bitratemode = ratemode;</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	return -EINPROGRESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_getrate(struct net_device *dev,</div><div class='del'>-				 struct iw_request_info *info,</div><div class='del'>-				 struct iw_param *rrq,</div><div class='del'>-				 char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	int err = 0;</div><div class='del'>-	int bitrate, automatic;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	orinoco_get_ratemode_cfg(priv-&gt;bitratemode, &amp;bitrate, &amp;automatic);</div><div class='del'>-</div><div class='del'>-	/* If the interface is running we try to find more about the</div><div class='del'>-	   current mode */</div><div class='del'>-	if (netif_running(dev)) {</div><div class='del'>-		int act_bitrate;</div><div class='del'>-		int lerr;</div><div class='del'>-</div><div class='del'>-		/* Ignore errors if we can't get the actual bitrate */</div><div class='del'>-		lerr = orinoco_hw_get_act_bitrate(priv, &amp;act_bitrate);</div><div class='del'>-		if (!lerr)</div><div class='del'>-			bitrate = act_bitrate;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	rrq-&gt;value = bitrate;</div><div class='del'>-	rrq-&gt;fixed = !automatic;</div><div class='del'>-	rrq-&gt;disabled = 0;</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_setpower(struct net_device *dev,</div><div class='del'>-				  struct iw_request_info *info,</div><div class='del'>-				  struct iw_param *prq,</div><div class='del'>-				  char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	int err = -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	if (prq-&gt;disabled) {</div><div class='del'>-		priv-&gt;pm_on = 0;</div><div class='del'>-	} else {</div><div class='del'>-		switch (prq-&gt;flags &amp; IW_POWER_MODE) {</div><div class='del'>-		case IW_POWER_UNICAST_R:</div><div class='del'>-			priv-&gt;pm_mcast = 0;</div><div class='del'>-			priv-&gt;pm_on = 1;</div><div class='del'>-			break;</div><div class='del'>-		case IW_POWER_ALL_R:</div><div class='del'>-			priv-&gt;pm_mcast = 1;</div><div class='del'>-			priv-&gt;pm_on = 1;</div><div class='del'>-			break;</div><div class='del'>-		case IW_POWER_ON:</div><div class='del'>-			/* No flags : but we may have a value - Jean II */</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (prq-&gt;flags &amp; IW_POWER_TIMEOUT) {</div><div class='del'>-			priv-&gt;pm_on = 1;</div><div class='del'>-			priv-&gt;pm_timeout = prq-&gt;value / 1000;</div><div class='del'>-		}</div><div class='del'>-		if (prq-&gt;flags &amp; IW_POWER_PERIOD) {</div><div class='del'>-			priv-&gt;pm_on = 1;</div><div class='del'>-			priv-&gt;pm_period = prq-&gt;value / 1000;</div><div class='del'>-		}</div><div class='del'>-		/* It's valid to not have a value if we are just toggling</div><div class='del'>-		 * the flags... Jean II */</div><div class='del'>-		if (!priv-&gt;pm_on) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_getpower(struct net_device *dev,</div><div class='del'>-				  struct iw_request_info *info,</div><div class='del'>-				  struct iw_param *prq,</div><div class='del'>-				  char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int err = 0;</div><div class='del'>-	u16 enable, period, timeout, mcast;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	err = hermes_read_wordrec(hw, USER_BAP,</div><div class='del'>-				  HERMES_RID_CNFPMENABLED, &amp;enable);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = hermes_read_wordrec(hw, USER_BAP,</div><div class='del'>-				  HERMES_RID_CNFMAXSLEEPDURATION, &amp;period);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = hermes_read_wordrec(hw, USER_BAP,</div><div class='del'>-				  HERMES_RID_CNFPMHOLDOVERDURATION, &amp;timeout);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = hermes_read_wordrec(hw, USER_BAP,</div><div class='del'>-				  HERMES_RID_CNFMULTICASTRECEIVE, &amp;mcast);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	prq-&gt;disabled = !enable;</div><div class='del'>-	/* Note : by default, display the period */</div><div class='del'>-	if ((prq-&gt;flags &amp; IW_POWER_TYPE) == IW_POWER_TIMEOUT) {</div><div class='del'>-		prq-&gt;flags = IW_POWER_TIMEOUT;</div><div class='del'>-		prq-&gt;value = timeout * 1000;</div><div class='del'>-	} else {</div><div class='del'>-		prq-&gt;flags = IW_POWER_PERIOD;</div><div class='del'>-		prq-&gt;value = period * 1000;</div><div class='del'>-	}</div><div class='del'>-	if (mcast)</div><div class='del'>-		prq-&gt;flags |= IW_POWER_ALL_R;</div><div class='del'>-	else</div><div class='del'>-		prq-&gt;flags |= IW_POWER_UNICAST_R;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_set_encodeext(struct net_device *dev,</div><div class='del'>-				       struct iw_request_info *info,</div><div class='del'>-				       union iwreq_data *wrqu,</div><div class='del'>-				       char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	struct iw_point *encoding = &amp;wrqu-&gt;encoding;</div><div class='del'>-	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;</div><div class='del'>-	int idx, alg = ext-&gt;alg, set_key = 1;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err = -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	/* Determine and validate the key index */</div><div class='del'>-	idx = encoding-&gt;flags &amp; IW_ENCODE_INDEX;</div><div class='del'>-	if (idx) {</div><div class='del'>-		if ((idx &lt; 1) || (idx &gt; 4))</div><div class='del'>-			goto out;</div><div class='del'>-		idx--;</div><div class='del'>-	} else</div><div class='del'>-		idx = priv-&gt;tx_key;</div><div class='del'>-</div><div class='del'>-	if (encoding-&gt;flags &amp; IW_ENCODE_DISABLED)</div><div class='del'>-		alg = IW_ENCODE_ALG_NONE;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;has_wpa &amp;&amp; (alg != IW_ENCODE_ALG_TKIP)) {</div><div class='del'>-		/* Clear any TKIP TX key we had */</div><div class='del'>-		(void) orinoco_clear_tkip_key(priv, priv-&gt;tx_key);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ext-&gt;ext_flags &amp; IW_ENCODE_EXT_SET_TX_KEY) {</div><div class='del'>-		priv-&gt;tx_key = idx;</div><div class='del'>-		set_key = ((alg == IW_ENCODE_ALG_TKIP) ||</div><div class='del'>-			   (ext-&gt;key_len &gt; 0)) ? 1 : 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (set_key) {</div><div class='del'>-		/* Set the requested key first */</div><div class='del'>-		switch (alg) {</div><div class='del'>-		case IW_ENCODE_ALG_NONE:</div><div class='del'>-			priv-&gt;encode_alg = ORINOCO_ALG_NONE;</div><div class='del'>-			err = orinoco_set_key(priv, idx, ORINOCO_ALG_NONE,</div><div class='del'>-					      NULL, 0, NULL, 0);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case IW_ENCODE_ALG_WEP:</div><div class='del'>-			if (ext-&gt;key_len &lt;= 0)</div><div class='del'>-				goto out;</div><div class='del'>-</div><div class='del'>-			priv-&gt;encode_alg = ORINOCO_ALG_WEP;</div><div class='del'>-			err = orinoco_set_key(priv, idx, ORINOCO_ALG_WEP,</div><div class='del'>-					      ext-&gt;key, ext-&gt;key_len, NULL, 0);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case IW_ENCODE_ALG_TKIP:</div><div class='del'>-		{</div><div class='del'>-			u8 *tkip_iv = NULL;</div><div class='del'>-</div><div class='del'>-			if (!priv-&gt;has_wpa ||</div><div class='del'>-			    (ext-&gt;key_len &gt; sizeof(struct orinoco_tkip_key)))</div><div class='del'>-				goto out;</div><div class='del'>-</div><div class='del'>-			priv-&gt;encode_alg = ORINOCO_ALG_TKIP;</div><div class='del'>-</div><div class='del'>-			if (ext-&gt;ext_flags &amp; IW_ENCODE_EXT_RX_SEQ_VALID)</div><div class='del'>-				tkip_iv = &amp;ext-&gt;rx_seq[0];</div><div class='del'>-</div><div class='del'>-			err = orinoco_set_key(priv, idx, ORINOCO_ALG_TKIP,</div><div class='del'>-					      ext-&gt;key, ext-&gt;key_len, tkip_iv,</div><div class='del'>-					      ORINOCO_SEQ_LEN);</div><div class='del'>-</div><div class='del'>-			err = __orinoco_hw_set_tkip_key(priv, idx,</div><div class='del'>-				 ext-&gt;ext_flags &amp; IW_ENCODE_EXT_SET_TX_KEY,</div><div class='del'>-				 priv-&gt;keys[idx].key,</div><div class='del'>-				 tkip_iv, ORINOCO_SEQ_LEN, NULL, 0);</div><div class='del'>-			if (err)</div><div class='del'>-				printk(KERN_ERR "%s: Error %d setting TKIP key"</div><div class='del'>-				       "\n", dev-&gt;name, err);</div><div class='del'>-</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		default:</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	err = -EINPROGRESS;</div><div class='del'>- out:</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_get_encodeext(struct net_device *dev,</div><div class='del'>-				       struct iw_request_info *info,</div><div class='del'>-				       union iwreq_data *wrqu,</div><div class='del'>-				       char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	struct iw_point *encoding = &amp;wrqu-&gt;encoding;</div><div class='del'>-	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;</div><div class='del'>-	int idx, max_key_len;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	err = -EINVAL;</div><div class='del'>-	max_key_len = encoding-&gt;length - sizeof(*ext);</div><div class='del'>-	if (max_key_len &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	idx = encoding-&gt;flags &amp; IW_ENCODE_INDEX;</div><div class='del'>-	if (idx) {</div><div class='del'>-		if ((idx &lt; 1) || (idx &gt; 4))</div><div class='del'>-			goto out;</div><div class='del'>-		idx--;</div><div class='del'>-	} else</div><div class='del'>-		idx = priv-&gt;tx_key;</div><div class='del'>-</div><div class='del'>-	encoding-&gt;flags = idx + 1;</div><div class='del'>-	memset(ext, 0, sizeof(*ext));</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;encode_alg) {</div><div class='del'>-	case ORINOCO_ALG_NONE:</div><div class='del'>-		ext-&gt;alg = IW_ENCODE_ALG_NONE;</div><div class='del'>-		ext-&gt;key_len = 0;</div><div class='del'>-		encoding-&gt;flags |= IW_ENCODE_DISABLED;</div><div class='del'>-		break;</div><div class='del'>-	case ORINOCO_ALG_WEP:</div><div class='del'>-		ext-&gt;alg = IW_ENCODE_ALG_WEP;</div><div class='del'>-		ext-&gt;key_len = min(priv-&gt;keys[idx].key_len, max_key_len);</div><div class='del'>-		memcpy(ext-&gt;key, priv-&gt;keys[idx].key, ext-&gt;key_len);</div><div class='del'>-		encoding-&gt;flags |= IW_ENCODE_ENABLED;</div><div class='del'>-		break;</div><div class='del'>-	case ORINOCO_ALG_TKIP:</div><div class='del'>-		ext-&gt;alg = IW_ENCODE_ALG_TKIP;</div><div class='del'>-		ext-&gt;key_len = min(priv-&gt;keys[idx].key_len, max_key_len);</div><div class='del'>-		memcpy(ext-&gt;key, priv-&gt;keys[idx].key, ext-&gt;key_len);</div><div class='del'>-		encoding-&gt;flags |= IW_ENCODE_ENABLED;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = 0;</div><div class='del'>- out:</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_set_auth(struct net_device *dev,</div><div class='del'>-				  struct iw_request_info *info,</div><div class='del'>-				  union iwreq_data *wrqu, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	struct iw_param *param = &amp;wrqu-&gt;param;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ret = -EINPROGRESS;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	switch (param-&gt;flags &amp; IW_AUTH_INDEX) {</div><div class='del'>-	case IW_AUTH_WPA_VERSION:</div><div class='del'>-	case IW_AUTH_CIPHER_PAIRWISE:</div><div class='del'>-	case IW_AUTH_CIPHER_GROUP:</div><div class='del'>-	case IW_AUTH_RX_UNENCRYPTED_EAPOL:</div><div class='del'>-	case IW_AUTH_PRIVACY_INVOKED:</div><div class='del'>-	case IW_AUTH_DROP_UNENCRYPTED:</div><div class='del'>-		/*</div><div class='del'>-		 * orinoco does not use these parameters</div><div class='del'>-		 */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_MFP:</div><div class='del'>-		/* Management Frame Protection not supported.</div><div class='del'>-		 * Only fail if set to required.</div><div class='del'>-		 */</div><div class='del'>-		if (param-&gt;value == IW_AUTH_MFP_REQUIRED)</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_KEY_MGMT:</div><div class='del'>-		/* wl_lkm implies value 2 == PSK for Hermes I</div><div class='del'>-		 * which ties in with WEXT</div><div class='del'>-		 * no other hints tho :(</div><div class='del'>-		 */</div><div class='del'>-		priv-&gt;key_mgmt = param-&gt;value;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_TKIP_COUNTERMEASURES:</div><div class='del'>-		/* When countermeasures are enabled, shut down the</div><div class='del'>-		 * card; when disabled, re-enable the card. This must</div><div class='del'>-		 * take effect immediately.</div><div class='del'>-		 *</div><div class='del'>-		 * TODO: Make sure that the EAPOL message is getting</div><div class='del'>-		 *       out before card disabled</div><div class='del'>-		 */</div><div class='del'>-		if (param-&gt;value) {</div><div class='del'>-			priv-&gt;tkip_cm_active = 1;</div><div class='del'>-			ret = hermes_disable_port(hw, 0);</div><div class='del'>-		} else {</div><div class='del'>-			priv-&gt;tkip_cm_active = 0;</div><div class='del'>-			ret = hermes_enable_port(hw, 0);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_80211_AUTH_ALG:</div><div class='del'>-		if (param-&gt;value &amp; IW_AUTH_ALG_SHARED_KEY)</div><div class='del'>-			priv-&gt;wep_restrict = 1;</div><div class='del'>-		else if (param-&gt;value &amp; IW_AUTH_ALG_OPEN_SYSTEM)</div><div class='del'>-			priv-&gt;wep_restrict = 0;</div><div class='del'>-		else</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_WPA_ENABLED:</div><div class='del'>-		if (priv-&gt;has_wpa) {</div><div class='del'>-			priv-&gt;wpa_enabled = param-&gt;value ? 1 : 0;</div><div class='del'>-		} else {</div><div class='del'>-			if (param-&gt;value)</div><div class='del'>-				ret = -EOPNOTSUPP;</div><div class='del'>-			/* else silently accept disable of WPA */</div><div class='del'>-			priv-&gt;wpa_enabled = 0;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_get_auth(struct net_device *dev,</div><div class='del'>-				  struct iw_request_info *info,</div><div class='del'>-				  union iwreq_data *wrqu, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	struct iw_param *param = &amp;wrqu-&gt;param;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	switch (param-&gt;flags &amp; IW_AUTH_INDEX) {</div><div class='del'>-	case IW_AUTH_KEY_MGMT:</div><div class='del'>-		param-&gt;value = priv-&gt;key_mgmt;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_TKIP_COUNTERMEASURES:</div><div class='del'>-		param-&gt;value = priv-&gt;tkip_cm_active;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_80211_AUTH_ALG:</div><div class='del'>-		if (priv-&gt;wep_restrict)</div><div class='del'>-			param-&gt;value = IW_AUTH_ALG_SHARED_KEY;</div><div class='del'>-		else</div><div class='del'>-			param-&gt;value = IW_AUTH_ALG_OPEN_SYSTEM;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_WPA_ENABLED:</div><div class='del'>-		param-&gt;value = priv-&gt;wpa_enabled;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_set_genie(struct net_device *dev,</div><div class='del'>-				   struct iw_request_info *info,</div><div class='del'>-				   union iwreq_data *wrqu, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	u8 *buf;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* cut off at IEEE80211_MAX_DATA_LEN */</div><div class='del'>-	if ((wrqu-&gt;data.length &gt; IEEE80211_MAX_DATA_LEN) ||</div><div class='del'>-	    (wrqu-&gt;data.length &amp;&amp; (extra == NULL)))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (wrqu-&gt;data.length) {</div><div class='del'>-		buf = kmemdup(extra, wrqu-&gt;data.length, GFP_KERNEL);</div><div class='del'>-		if (buf == NULL)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-	} else</div><div class='del'>-		buf = NULL;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0) {</div><div class='del'>-		kfree(buf);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(priv-&gt;wpa_ie);</div><div class='del'>-	priv-&gt;wpa_ie = buf;</div><div class='del'>-	priv-&gt;wpa_ie_len = wrqu-&gt;data.length;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;wpa_ie) {</div><div class='del'>-		/* Looks like wl_lkm wants to check the auth alg, and</div><div class='del'>-		 * somehow pass it to the firmware.</div><div class='del'>-		 * Instead it just calls the key mgmt rid</div><div class='del'>-		 *   - we do this in set auth.</div><div class='del'>-		 */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_get_genie(struct net_device *dev,</div><div class='del'>-				   struct iw_request_info *info,</div><div class='del'>-				   union iwreq_data *wrqu, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	if ((priv-&gt;wpa_ie_len == 0) || (priv-&gt;wpa_ie == NULL)) {</div><div class='del'>-		wrqu-&gt;data.length = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (wrqu-&gt;data.length &lt; priv-&gt;wpa_ie_len) {</div><div class='del'>-		err = -E2BIG;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	wrqu-&gt;data.length = priv-&gt;wpa_ie_len;</div><div class='del'>-	memcpy(extra, priv-&gt;wpa_ie, priv-&gt;wpa_ie_len);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_set_mlme(struct net_device *dev,</div><div class='del'>-				  struct iw_request_info *info,</div><div class='del'>-				  union iwreq_data *wrqu, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	struct iw_mlme *mlme = (struct iw_mlme *)extra;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	switch (mlme-&gt;cmd) {</div><div class='del'>-	case IW_MLME_DEAUTH:</div><div class='del'>-		/* silently ignore */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_MLME_DISASSOC:</div><div class='del'>-</div><div class='del'>-		ret = orinoco_hw_disassociate(priv, mlme-&gt;addr.sa_data,</div><div class='del'>-					      mlme-&gt;reason_code);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_reset(struct net_device *dev,</div><div class='del'>-			       struct iw_request_info *info,</div><div class='del'>-			       void *wrqu,</div><div class='del'>-			       char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (!capable(CAP_NET_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (info-&gt;cmd == (SIOCIWFIRSTPRIV + 0x1)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: Forcing reset!\n", dev-&gt;name);</div><div class='del'>-</div><div class='del'>-		/* Firmware reset */</div><div class='del'>-		orinoco_reset(&amp;priv-&gt;reset_work);</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_DEBUG "%s: Force scheduling reset!\n", dev-&gt;name);</div><div class='del'>-</div><div class='del'>-		schedule_work(&amp;priv-&gt;reset_work);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_setibssport(struct net_device *dev,</div><div class='del'>-				     struct iw_request_info *info,</div><div class='del'>-				     void *wrqu,</div><div class='del'>-				     char *extra)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	int val = *((int *) extra);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	priv-&gt;ibss_port = val;</div><div class='del'>-</div><div class='del'>-	/* Actually update the mode we are using */</div><div class='del'>-	set_port_type(priv);</div><div class='del'>-</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-	return -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_getibssport(struct net_device *dev,</div><div class='del'>-				     struct iw_request_info *info,</div><div class='del'>-				     void *wrqu,</div><div class='del'>-				     char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	int *val = (int *) extra;</div><div class='del'>-</div><div class='del'>-	*val = priv-&gt;ibss_port;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_setport3(struct net_device *dev,</div><div class='del'>-				  struct iw_request_info *info,</div><div class='del'>-				  void *wrqu,</div><div class='del'>-				  char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	int val = *((int *) extra);</div><div class='del'>-	int err = 0;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	switch (val) {</div><div class='del'>-	case 0: /* Try to do IEEE ad-hoc mode */</div><div class='del'>-		if (!priv-&gt;has_ibss) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		priv-&gt;prefer_port3 = 0;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 1: /* Try to do Lucent proprietary ad-hoc mode */</div><div class='del'>-		if (!priv-&gt;has_port3) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		priv-&gt;prefer_port3 = 1;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!err) {</div><div class='del'>-		/* Actually update the mode we are using */</div><div class='del'>-		set_port_type(priv);</div><div class='del'>-		err = -EINPROGRESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_getport3(struct net_device *dev,</div><div class='del'>-				  struct iw_request_info *info,</div><div class='del'>-				  void *wrqu,</div><div class='del'>-				  char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	int *val = (int *) extra;</div><div class='del'>-</div><div class='del'>-	*val = priv-&gt;prefer_port3;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_setpreamble(struct net_device *dev,</div><div class='del'>-				     struct iw_request_info *info,</div><div class='del'>-				     void *wrqu,</div><div class='del'>-				     char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int val;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;has_preamble)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	/* 802.11b has recently defined some short preamble.</div><div class='del'>-	 * Basically, the Phy header has been reduced in size.</div><div class='del'>-	 * This increase performance, especially at high rates</div><div class='del'>-	 * (the preamble is transmitted at 1Mb/s), unfortunately</div><div class='del'>-	 * this give compatibility troubles... - Jean II */</div><div class='del'>-	val = *((int *) extra);</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	if (val)</div><div class='del'>-		priv-&gt;preamble = 1;</div><div class='del'>-	else</div><div class='del'>-		priv-&gt;preamble = 0;</div><div class='del'>-</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	return -EINPROGRESS;		/* Call commit handler */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_ioctl_getpreamble(struct net_device *dev,</div><div class='del'>-				     struct iw_request_info *info,</div><div class='del'>-				     void *wrqu,</div><div class='del'>-				     char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	int *val = (int *) extra;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;has_preamble)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	*val = priv-&gt;preamble;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ioctl interface to hermes_read_ltv()</div><div class='del'>- * To use with iwpriv, pass the RID as the token argument, e.g.</div><div class='del'>- * iwpriv get_rid [0xfc00]</div><div class='del'>- * At least Wireless Tools 25 is required to use iwpriv.</div><div class='del'>- * For Wireless Tools 25 and 26 append "dummy" are the end. */</div><div class='del'>-static int orinoco_ioctl_getrid(struct net_device *dev,</div><div class='del'>-				struct iw_request_info *info,</div><div class='del'>-				struct iw_point *data,</div><div class='del'>-				char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='del'>-	int rid = data-&gt;flags;</div><div class='del'>-	u16 length;</div><div class='del'>-	int err;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* It's a "get" function, but we don't want users to access the</div><div class='del'>-	 * WEP key and other raw firmware data */</div><div class='del'>-	if (!capable(CAP_NET_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (rid &lt; 0xfc00 || rid &gt; 0xffff)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	err = hw-&gt;ops-&gt;read_ltv(hw, USER_BAP, rid, MAX_RID_LEN, &amp;length,</div><div class='del'>-				extra);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	data-&gt;length = min_t(u16, HERMES_RECLEN_TO_BYTES(length),</div><div class='del'>-			     MAX_RID_LEN);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Commit handler, called after set operations */</div><div class='del'>-static int orinoco_ioctl_commit(struct net_device *dev,</div><div class='del'>-				struct iw_request_info *info,</div><div class='del'>-				void *wrqu,</div><div class='del'>-				char *extra)</div><div class='del'>-{</div><div class='del'>-	struct orinoco_private *priv = ndev_priv(dev);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;open)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (orinoco_lock(priv, &amp;flags) != 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = orinoco_commit(priv);</div><div class='del'>-</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct iw_priv_args orinoco_privtab[] = {</div><div class='del'>-	{ SIOCIWFIRSTPRIV + 0x0, 0, 0, "force_reset" },</div><div class='del'>-	{ SIOCIWFIRSTPRIV + 0x1, 0, 0, "card_reset" },</div><div class='del'>-	{ SIOCIWFIRSTPRIV + 0x2, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,</div><div class='del'>-	  0, "set_port3" },</div><div class='del'>-	{ SIOCIWFIRSTPRIV + 0x3, 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,</div><div class='del'>-	  "get_port3" },</div><div class='del'>-	{ SIOCIWFIRSTPRIV + 0x4, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,</div><div class='del'>-	  0, "set_preamble" },</div><div class='del'>-	{ SIOCIWFIRSTPRIV + 0x5, 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,</div><div class='del'>-	  "get_preamble" },</div><div class='del'>-	{ SIOCIWFIRSTPRIV + 0x6, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,</div><div class='del'>-	  0, "set_ibssport" },</div><div class='del'>-	{ SIOCIWFIRSTPRIV + 0x7, 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,</div><div class='del'>-	  "get_ibssport" },</div><div class='del'>-	{ SIOCIWFIRSTPRIV + 0x9, 0, IW_PRIV_TYPE_BYTE | MAX_RID_LEN,</div><div class='del'>-	  "get_rid" },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Structures to export the Wireless Handlers</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static const iw_handler	orinoco_handler[] = {</div><div class='del'>-	IW_HANDLER(SIOCSIWCOMMIT,	(iw_handler)orinoco_ioctl_commit),</div><div class='del'>-	IW_HANDLER(SIOCGIWNAME,		(iw_handler)cfg80211_wext_giwname),</div><div class='del'>-	IW_HANDLER(SIOCSIWFREQ,		(iw_handler)orinoco_ioctl_setfreq),</div><div class='del'>-	IW_HANDLER(SIOCGIWFREQ,		(iw_handler)orinoco_ioctl_getfreq),</div><div class='del'>-	IW_HANDLER(SIOCSIWMODE,		(iw_handler)cfg80211_wext_siwmode),</div><div class='del'>-	IW_HANDLER(SIOCGIWMODE,		(iw_handler)cfg80211_wext_giwmode),</div><div class='del'>-	IW_HANDLER(SIOCSIWSENS,		(iw_handler)orinoco_ioctl_setsens),</div><div class='del'>-	IW_HANDLER(SIOCGIWSENS,		(iw_handler)orinoco_ioctl_getsens),</div><div class='del'>-	IW_HANDLER(SIOCGIWRANGE,	(iw_handler)cfg80211_wext_giwrange),</div><div class='del'>-	IW_HANDLER(SIOCSIWSPY,		iw_handler_set_spy),</div><div class='del'>-	IW_HANDLER(SIOCGIWSPY,		iw_handler_get_spy),</div><div class='del'>-	IW_HANDLER(SIOCSIWTHRSPY,	iw_handler_set_thrspy),</div><div class='del'>-	IW_HANDLER(SIOCGIWTHRSPY,	iw_handler_get_thrspy),</div><div class='del'>-	IW_HANDLER(SIOCSIWAP,		(iw_handler)orinoco_ioctl_setwap),</div><div class='del'>-	IW_HANDLER(SIOCGIWAP,		(iw_handler)orinoco_ioctl_getwap),</div><div class='del'>-	IW_HANDLER(SIOCSIWSCAN,		(iw_handler)cfg80211_wext_siwscan),</div><div class='del'>-	IW_HANDLER(SIOCGIWSCAN,		(iw_handler)cfg80211_wext_giwscan),</div><div class='del'>-	IW_HANDLER(SIOCSIWESSID,	(iw_handler)orinoco_ioctl_setessid),</div><div class='del'>-	IW_HANDLER(SIOCGIWESSID,	(iw_handler)orinoco_ioctl_getessid),</div><div class='del'>-	IW_HANDLER(SIOCSIWRATE,		(iw_handler)orinoco_ioctl_setrate),</div><div class='del'>-	IW_HANDLER(SIOCGIWRATE,		(iw_handler)orinoco_ioctl_getrate),</div><div class='del'>-	IW_HANDLER(SIOCSIWRTS,		(iw_handler)cfg80211_wext_siwrts),</div><div class='del'>-	IW_HANDLER(SIOCGIWRTS,		(iw_handler)cfg80211_wext_giwrts),</div><div class='del'>-	IW_HANDLER(SIOCSIWFRAG,		(iw_handler)cfg80211_wext_siwfrag),</div><div class='del'>-	IW_HANDLER(SIOCGIWFRAG,		(iw_handler)cfg80211_wext_giwfrag),</div><div class='del'>-	IW_HANDLER(SIOCGIWRETRY,	(iw_handler)cfg80211_wext_giwretry),</div><div class='del'>-	IW_HANDLER(SIOCSIWENCODE,	(iw_handler)orinoco_ioctl_setiwencode),</div><div class='del'>-	IW_HANDLER(SIOCGIWENCODE,	(iw_handler)orinoco_ioctl_getiwencode),</div><div class='del'>-	IW_HANDLER(SIOCSIWPOWER,	(iw_handler)orinoco_ioctl_setpower),</div><div class='del'>-	IW_HANDLER(SIOCGIWPOWER,	(iw_handler)orinoco_ioctl_getpower),</div><div class='del'>-	IW_HANDLER(SIOCSIWGENIE,	orinoco_ioctl_set_genie),</div><div class='del'>-	IW_HANDLER(SIOCGIWGENIE,	orinoco_ioctl_get_genie),</div><div class='del'>-	IW_HANDLER(SIOCSIWMLME,		orinoco_ioctl_set_mlme),</div><div class='del'>-	IW_HANDLER(SIOCSIWAUTH,		orinoco_ioctl_set_auth),</div><div class='del'>-	IW_HANDLER(SIOCGIWAUTH,		orinoco_ioctl_get_auth),</div><div class='del'>-	IW_HANDLER(SIOCSIWENCODEEXT,	orinoco_ioctl_set_encodeext),</div><div class='del'>-	IW_HANDLER(SIOCGIWENCODEEXT,	orinoco_ioctl_get_encodeext),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  Added typecasting since we no longer use iwreq_data -- Moustafa</div><div class='del'>- */</div><div class='del'>-static const iw_handler	orinoco_private_handler[] = {</div><div class='del'>-	[0] = (iw_handler)orinoco_ioctl_reset,</div><div class='del'>-	[1] = (iw_handler)orinoco_ioctl_reset,</div><div class='del'>-	[2] = (iw_handler)orinoco_ioctl_setport3,</div><div class='del'>-	[3] = (iw_handler)orinoco_ioctl_getport3,</div><div class='del'>-	[4] = (iw_handler)orinoco_ioctl_setpreamble,</div><div class='del'>-	[5] = (iw_handler)orinoco_ioctl_getpreamble,</div><div class='del'>-	[6] = (iw_handler)orinoco_ioctl_setibssport,</div><div class='del'>-	[7] = (iw_handler)orinoco_ioctl_getibssport,</div><div class='del'>-	[9] = (iw_handler)orinoco_ioctl_getrid,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iw_handler_def orinoco_handler_def = {</div><div class='del'>-	.num_standard = ARRAY_SIZE(orinoco_handler),</div><div class='del'>-	.num_private = ARRAY_SIZE(orinoco_private_handler),</div><div class='del'>-	.num_private_args = ARRAY_SIZE(orinoco_privtab),</div><div class='del'>-	.standard = orinoco_handler,</div><div class='del'>-	.private = orinoco_private_handler,</div><div class='del'>-	.private_args = orinoco_privtab,</div><div class='del'>-	.get_wireless_stats = orinoco_get_wireless_stats,</div><div class='del'>-};</div><div class='head'>diff --git a/drivers/net/wireless/intersil/orinoco/wext.h b/drivers/net/wireless/intersil/orinoco/wext.h<br/>deleted file mode 100644<br/>index 1479f4e26dde..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/orinoco/wext.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/orinoco/wext.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,13 +0,0 @@</div><div class='del'>-/* Wireless extensions support.</div><div class='del'>- *</div><div class='del'>- * See copyright notice in main.c</div><div class='del'>- */</div><div class='del'>-#ifndef _ORINOCO_WEXT_H_</div><div class='del'>-#define _ORINOCO_WEXT_H_</div><div class='del'>-</div><div class='del'>-#include &lt;net/iw_handler.h&gt;</div><div class='del'>-</div><div class='del'>-/* Structure defining all our WEXT handlers */</div><div class='del'>-extern const struct iw_handler_def orinoco_handler_def;</div><div class='del'>-</div><div class='del'>-#endif /* _ORINOCO_WEXT_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/p54/eeprom.h b/drivers/net/wireless/intersil/p54/eeprom.h<br/>index 1d0aaf54389a..641c4e79879e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/p54/eeprom.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/p54/eeprom.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/p54/eeprom.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intersil/p54/eeprom.h</a></div><div class='hunk'>@@ -108,10 +108,10 @@ struct pda_country {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct pda_antenna_gain {</div><div class='del'>-	struct {</div><div class='add'>+	DECLARE_FLEX_ARRAY(struct {</div><div class='ctx'> 		u8 gain_5GHz;	/* 0.25 dBi units */</div><div class='ctx'> 		u8 gain_2GHz;	/* 0.25 dBi units */</div><div class='del'>-	} __packed antenna[0];</div><div class='add'>+	} __packed, antenna);</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct pda_custom_wrapper {</div><div class='head'>diff --git a/drivers/net/wireless/intersil/p54/fwio.c b/drivers/net/wireless/intersil/p54/fwio.c<br/>index bece14e4ff0d..3baf8ab01e22 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/p54/fwio.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/p54/fwio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/p54/fwio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intersil/p54/fwio.c</a></div><div class='hunk'>@@ -125,7 +125,7 @@ int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)</div><div class='ctx'> 			   "FW rev %s - Softmac protocol %x.%x\n",</div><div class='ctx'> 			   fw_version, priv-&gt;fw_var &gt;&gt; 8, priv-&gt;fw_var &amp; 0xff);</div><div class='ctx'> 		snprintf(dev-&gt;wiphy-&gt;fw_version, sizeof(dev-&gt;wiphy-&gt;fw_version),</div><div class='del'>-				"%s - %x.%x", fw_version,</div><div class='add'>+				"%.19s - %x.%x", fw_version,</div><div class='ctx'> 				priv-&gt;fw_var &gt;&gt; 8, priv-&gt;fw_var &amp; 0xff);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -173,10 +173,8 @@ int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)</div><div class='ctx'> 		 * keeping a extra list for uploaded keys.</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		priv-&gt;used_rxkeys = kcalloc(BITS_TO_LONGS(priv-&gt;rx_keycache_size),</div><div class='del'>-					    sizeof(long),</div><div class='del'>-					    GFP_KERNEL);</div><div class='del'>-</div><div class='add'>+		priv-&gt;used_rxkeys = bitmap_zalloc(priv-&gt;rx_keycache_size,</div><div class='add'>+						  GFP_KERNEL);</div><div class='ctx'> 		if (!priv-&gt;used_rxkeys)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -218,7 +216,7 @@ int p54_download_eeprom(struct p54_common *priv, void *buf,</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	size_t eeprom_hdr_size;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	long timeout;</div><div class='add'>+	long time_left;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;fw_var &gt;= 0x509)</div><div class='ctx'> 		eeprom_hdr_size = sizeof(*eeprom_hdr);</div><div class='hunk'>@@ -233,6 +231,7 @@ int p54_download_eeprom(struct p54_common *priv, void *buf,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;eeprom_mutex);</div><div class='ctx'> 	priv-&gt;eeprom = buf;</div><div class='add'>+	priv-&gt;eeprom_slice_size = len;</div><div class='ctx'> 	eeprom_hdr = skb_put(skb, eeprom_hdr_size + len);</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;fw_var &lt; 0x509) {</div><div class='hunk'>@@ -247,14 +246,15 @@ int p54_download_eeprom(struct p54_common *priv, void *buf,</div><div class='ctx'> </div><div class='ctx'> 	p54_tx(priv, skb);</div><div class='ctx'> </div><div class='del'>-	timeout = wait_for_completion_interruptible_timeout(</div><div class='add'>+	time_left = wait_for_completion_interruptible_timeout(</div><div class='ctx'> 			&amp;priv-&gt;eeprom_comp, HZ);</div><div class='del'>-	if (timeout &lt;= 0) {</div><div class='add'>+	if (time_left &lt;= 0) {</div><div class='ctx'> 		wiphy_err(priv-&gt;hw-&gt;wiphy,</div><div class='ctx'> 			"device does not respond or signal received!\n");</div><div class='ctx'> 		ret = -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	priv-&gt;eeprom = NULL;</div><div class='add'>+	priv-&gt;eeprom_slice_size = 0;</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;eeprom_mutex);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/intersil/p54/main.c b/drivers/net/wireless/intersil/p54/main.c<br/>index a3ca6620dc0c..2ec3655f1a9c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/p54/main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/p54/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/p54/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intersil/p54/main.c</a></div><div class='hunk'>@@ -139,7 +139,7 @@ static int p54_beacon_update(struct p54_common *priv,</div><div class='ctx'> 	struct sk_buff *beacon;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	beacon = ieee80211_beacon_get(priv-&gt;hw, vif);</div><div class='add'>+	beacon = ieee80211_beacon_get(priv-&gt;hw, vif, 0);</div><div class='ctx'> 	if (!beacon)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	ret = p54_beacon_format_ie_tim(beacon);</div><div class='hunk'>@@ -197,7 +197,7 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void p54_stop(struct ieee80211_hw *dev)</div><div class='add'>+static void p54_stop(struct ieee80211_hw *dev, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct p54_common *priv = dev-&gt;priv;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -313,7 +313,7 @@ static void p54_reset_stats(struct p54_common *priv)</div><div class='ctx'> 	priv-&gt;survey_raw.tx = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int p54_config(struct ieee80211_hw *dev, u32 changed)</div><div class='add'>+static int p54_config(struct ieee80211_hw *dev, int radio_idx, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct p54_common *priv = dev-&gt;priv;</div><div class='hunk'>@@ -404,7 +404,8 @@ static void p54_configure_filter(struct ieee80211_hw *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int p54_conf_tx(struct ieee80211_hw *dev,</div><div class='del'>-		       struct ieee80211_vif *vif, u16 queue,</div><div class='add'>+		       struct ieee80211_vif *vif,</div><div class='add'>+		       unsigned int link_id, u16 queue,</div><div class='ctx'> 		       const struct ieee80211_tx_queue_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct p54_common *priv = dev-&gt;priv;</div><div class='hunk'>@@ -449,7 +450,7 @@ static int p54_get_stats(struct ieee80211_hw *dev,</div><div class='ctx'> static void p54_bss_info_changed(struct ieee80211_hw *dev,</div><div class='ctx'> 				 struct ieee80211_vif *vif,</div><div class='ctx'> 				 struct ieee80211_bss_conf *info,</div><div class='del'>-				 u32 changed)</div><div class='add'>+				 u64 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct p54_common *priv = dev-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -480,8 +481,8 @@ static void p54_bss_info_changed(struct ieee80211_hw *dev,</div><div class='ctx'> 			p54_scan(priv, P54_SCAN_EXIT, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_ASSOC) {</div><div class='del'>-		if (info-&gt;assoc) {</div><div class='del'>-			priv-&gt;aid = info-&gt;aid;</div><div class='add'>+		if (vif-&gt;cfg.assoc) {</div><div class='add'>+			priv-&gt;aid = vif-&gt;cfg.aid;</div><div class='ctx'> 			priv-&gt;wakeup_timer = info-&gt;beacon_int *</div><div class='ctx'> 					     info-&gt;dtim_period * 5;</div><div class='ctx'> 			p54_setup_mac(priv);</div><div class='hunk'>@@ -634,7 +635,7 @@ static int p54_get_survey(struct ieee80211_hw *dev, int idx,</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * hw/fw has not accumulated enough sample sets.</div><div class='ctx'> 				 * Wait for 100ms, this ought to be enough to</div><div class='del'>-				 * to get at least one non-null set of channel</div><div class='add'>+				 * get at least one non-null set of channel</div><div class='ctx'> 				 * usage statistics.</div><div class='ctx'> 				 */</div><div class='ctx'> 				msleep(100);</div><div class='hunk'>@@ -682,7 +683,7 @@ static void p54_flush(struct ieee80211_hw *dev, struct ieee80211_vif *vif,</div><div class='ctx'> 	 * queues have already been stopped and no new frames can sneak</div><div class='ctx'> 	 * up from behind.</div><div class='ctx'> 	 */</div><div class='del'>-	while ((total = p54_flush_count(priv) &amp;&amp; i--)) {</div><div class='add'>+	while ((total = p54_flush_count(priv)) &amp;&amp; i--) {</div><div class='ctx'> 		/* waste time */</div><div class='ctx'> 		msleep(20);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -691,6 +692,7 @@ static void p54_flush(struct ieee80211_hw *dev, struct ieee80211_vif *vif,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void p54_set_coverage_class(struct ieee80211_hw *dev,</div><div class='add'>+				   int radio_idx,</div><div class='ctx'> 				   s16 coverage_class)</div><div class='ctx'> {</div><div class='ctx'> 	struct p54_common *priv = dev-&gt;priv;</div><div class='hunk'>@@ -703,7 +705,12 @@ static void p54_set_coverage_class(struct ieee80211_hw *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ieee80211_ops p54_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.tx			= p54_tx_80211,</div><div class='add'>+	.wake_tx_queue		= ieee80211_handle_wake_tx_queue,</div><div class='ctx'> 	.start			= p54_start,</div><div class='ctx'> 	.stop			= p54_stop,</div><div class='ctx'> 	.add_interface		= p54_add_interface,</div><div class='hunk'>@@ -830,7 +837,7 @@ void p54_free_common(struct ieee80211_hw *dev)</div><div class='ctx'> 	kfree(priv-&gt;output_limit);</div><div class='ctx'> 	kfree(priv-&gt;curve_data);</div><div class='ctx'> 	kfree(priv-&gt;rssi_db);</div><div class='del'>-	kfree(priv-&gt;used_rxkeys);</div><div class='add'>+	bitmap_free(priv-&gt;used_rxkeys);</div><div class='ctx'> 	kfree(priv-&gt;survey);</div><div class='ctx'> 	priv-&gt;iq_autocal = NULL;</div><div class='ctx'> 	priv-&gt;output_limit = NULL;</div><div class='head'>diff --git a/drivers/net/wireless/intersil/p54/p54.h b/drivers/net/wireless/intersil/p54/p54.h<br/>index 3356ea708d81..aeb5e40cc5ef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/p54/p54.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/p54/p54.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/p54/p54.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intersil/p54/p54.h</a></div><div class='hunk'>@@ -126,7 +126,7 @@ struct p54_cal_database {</div><div class='ctx'> 	size_t entry_size;</div><div class='ctx'> 	size_t offset;</div><div class='ctx'> 	size_t len;</div><div class='del'>-	u8 data[];</div><div class='add'>+	u8 data[] __counted_by(len);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define EEPROM_READBACK_LEN 0x3fc</div><div class='hunk'>@@ -258,6 +258,7 @@ struct p54_common {</div><div class='ctx'> </div><div class='ctx'> 	/* eeprom handling */</div><div class='ctx'> 	void *eeprom;</div><div class='add'>+	size_t eeprom_slice_size;</div><div class='ctx'> 	struct completion eeprom_comp;</div><div class='ctx'> 	struct mutex eeprom_mutex;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/wireless/intersil/p54/p54pci.c b/drivers/net/wireless/intersil/p54/p54pci.c<br/>index e97ee547b9f3..6588f5477762 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/p54/p54pci.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/p54/p54pci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/p54/p54pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intersil/p54/p54pci.c</a></div><div class='hunk'>@@ -434,7 +434,7 @@ static int p54p_open(struct ieee80211_hw *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct p54p_priv *priv = dev-&gt;priv;</div><div class='ctx'> 	int err;</div><div class='del'>-	long timeout;</div><div class='add'>+	long time_left;</div><div class='ctx'> </div><div class='ctx'> 	init_completion(&amp;priv-&gt;boot_comp);</div><div class='ctx'> 	err = request_irq(priv-&gt;pdev-&gt;irq, p54p_interrupt,</div><div class='hunk'>@@ -472,12 +472,12 @@ static int p54p_open(struct ieee80211_hw *dev)</div><div class='ctx'> 	P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_RESET));</div><div class='ctx'> 	P54P_READ(dev_int);</div><div class='ctx'> </div><div class='del'>-	timeout = wait_for_completion_interruptible_timeout(</div><div class='add'>+	time_left = wait_for_completion_interruptible_timeout(</div><div class='ctx'> 			&amp;priv-&gt;boot_comp, HZ);</div><div class='del'>-	if (timeout &lt;= 0) {</div><div class='add'>+	if (time_left &lt;= 0) {</div><div class='ctx'> 		wiphy_err(dev-&gt;wiphy, "Cannot boot firmware!\n");</div><div class='ctx'> 		p54p_stop(dev);</div><div class='del'>-		return timeout ? -ERESTARTSYS : -ETIMEDOUT;</div><div class='add'>+		return time_left ? -ERESTARTSYS : -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_UPDATE));</div><div class='head'>diff --git a/drivers/net/wireless/intersil/p54/p54spi.c b/drivers/net/wireless/intersil/p54/p54spi.c<br/>index ab0fe8565851..9d66dcae54e0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/p54/p54spi.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/p54/p54spi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/p54/p54spi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intersil/p54/p54spi.c</a></div><div class='hunk'>@@ -28,10 +28,11 @@</div><div class='ctx'> #endif /* CONFIG_P54_SPI_DEFAULT_EEPROM */</div><div class='ctx'> </div><div class='ctx'> MODULE_FIRMWARE("3826.arm");</div><div class='add'>+MODULE_FIRMWARE("3826.eeprom");</div><div class='ctx'> </div><div class='ctx'> /* gpios should be handled in board files and provided via platform data,</div><div class='ctx'>  * but because it's currently impossible for p54spi to have a header file</div><div class='del'>- * in include/linux, let's use module paramaters for now</div><div class='add'>+ * in include/linux, let's use module parameters for now</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int p54spi_gpio_power = 97;</div><div class='hunk'>@@ -154,7 +155,7 @@ static int p54spi_request_firmware(struct ieee80211_hw *dev)</div><div class='ctx'> 	struct p54s_priv *priv = dev-&gt;priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* FIXME: should driver use it's own struct device? */</div><div class='add'>+	/* FIXME: should driver use its own struct device? */</div><div class='ctx'> 	ret = request_firmware(&amp;priv-&gt;firmware, "3826.arm", &amp;priv-&gt;spi-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -164,7 +165,7 @@ static int p54spi_request_firmware(struct ieee80211_hw *dev)</div><div class='ctx'> </div><div class='ctx'> 	ret = p54_parse_firmware(dev, priv-&gt;firmware);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		release_firmware(priv-&gt;firmware);</div><div class='add'>+		/* the firmware is released by the caller */</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -517,7 +518,7 @@ out:</div><div class='ctx'> static int p54spi_op_start(struct ieee80211_hw *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct p54s_priv *priv = dev-&gt;priv;</div><div class='del'>-	unsigned long timeout;</div><div class='add'>+	long time_left;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (mutex_lock_interruptible(&amp;priv-&gt;mutex)) {</div><div class='hunk'>@@ -537,10 +538,10 @@ static int p54spi_op_start(struct ieee80211_hw *dev)</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	timeout = msecs_to_jiffies(2000);</div><div class='del'>-	timeout = wait_for_completion_interruptible_timeout(&amp;priv-&gt;fw_comp,</div><div class='del'>-							    timeout);</div><div class='del'>-	if (!timeout) {</div><div class='add'>+	time_left = msecs_to_jiffies(2000);</div><div class='add'>+	time_left = wait_for_completion_interruptible_timeout(&amp;priv-&gt;fw_comp,</div><div class='add'>+							      time_left);</div><div class='add'>+	if (!time_left) {</div><div class='ctx'> 		dev_err(&amp;priv-&gt;spi-&gt;dev, "firmware boot failed");</div><div class='ctx'> 		p54spi_power_off(priv);</div><div class='ctx'> 		ret = -1;</div><div class='hunk'>@@ -623,7 +624,7 @@ static int p54spi_probe(struct spi_device *spi)</div><div class='ctx'> 	gpio_direction_input(p54spi_gpio_irq);</div><div class='ctx'> </div><div class='ctx'> 	ret = request_irq(gpio_to_irq(p54spi_gpio_irq),</div><div class='del'>-			  p54spi_interrupt, 0, "p54spi",</div><div class='add'>+			  p54spi_interrupt, IRQF_NO_AUTOEN, "p54spi",</div><div class='ctx'> 			  priv-&gt;spi);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;priv-&gt;spi-&gt;dev, "request_irq() failed");</div><div class='hunk'>@@ -632,8 +633,6 @@ static int p54spi_probe(struct spi_device *spi)</div><div class='ctx'> </div><div class='ctx'> 	irq_set_irq_type(gpio_to_irq(p54spi_gpio_irq), IRQ_TYPE_EDGE_RISING);</div><div class='ctx'> </div><div class='del'>-	disable_irq(gpio_to_irq(p54spi_gpio_irq));</div><div class='del'>-</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;work, p54spi_work);</div><div class='ctx'> 	init_completion(&amp;priv-&gt;fw_comp);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;priv-&gt;tx_pending);</div><div class='hunk'>@@ -659,6 +658,7 @@ static int p54spi_probe(struct spi_device *spi)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_free_common:</div><div class='add'>+	release_firmware(priv-&gt;firmware);</div><div class='ctx'> 	free_irq(gpio_to_irq(p54spi_gpio_irq), spi);</div><div class='ctx'> err_free_gpio_irq:</div><div class='ctx'> 	gpio_free(p54spi_gpio_irq);</div><div class='hunk'>@@ -669,7 +669,7 @@ err_free:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int p54spi_remove(struct spi_device *spi)</div><div class='add'>+static void p54spi_remove(struct spi_device *spi)</div><div class='ctx'> {</div><div class='ctx'> 	struct p54s_priv *priv = spi_get_drvdata(spi);</div><div class='ctx'> </div><div class='hunk'>@@ -684,8 +684,6 @@ static int p54spi_remove(struct spi_device *spi)</div><div class='ctx'> 	mutex_destroy(&amp;priv-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	p54_free_common(priv-&gt;hw);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -700,6 +698,7 @@ static struct spi_driver p54spi_driver = {</div><div class='ctx'> </div><div class='ctx'> module_spi_driver(p54spi_driver);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Prism54 SPI wireless driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Christian Lamparter &lt;chunkeey@web.de&gt;");</div><div class='ctx'> MODULE_ALIAS("spi:cx3110x");</div><div class='head'>diff --git a/drivers/net/wireless/intersil/p54/txrx.c b/drivers/net/wireless/intersil/p54/txrx.c<br/>index 873fea59894f..1294a1d6528e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/p54/txrx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/p54/txrx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/p54/txrx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/intersil/p54/txrx.c</a></div><div class='hunk'>@@ -317,7 +317,7 @@ static void p54_pspoll_workaround(struct p54_common *priv, struct sk_buff *skb)</div><div class='ctx'> 	tim_len = tim[1];</div><div class='ctx'> 	tim_ie = (struct ieee80211_tim_ie *) &amp;tim[2];</div><div class='ctx'> </div><div class='del'>-	new_psm = ieee80211_check_tim(tim_ie, tim_len, priv-&gt;aid);</div><div class='add'>+	new_psm = ieee80211_check_tim(tim_ie, tim_len, priv-&gt;aid, false);</div><div class='ctx'> 	if (new_psm != priv-&gt;powersave_override) {</div><div class='ctx'> 		priv-&gt;powersave_override = new_psm;</div><div class='ctx'> 		p54_set_ps(priv);</div><div class='hunk'>@@ -431,11 +431,7 @@ static void p54_rx_frame_sent(struct p54_common *priv, struct sk_buff *skb)</div><div class='ctx'> 	 * Clear manually, ieee80211_tx_info_clear_status would</div><div class='ctx'> 	 * clear the counts too and we need them.</div><div class='ctx'> 	 */</div><div class='del'>-	memset(&amp;info-&gt;status.ack_signal, 0,</div><div class='del'>-	       sizeof(struct ieee80211_tx_info) -</div><div class='del'>-	       offsetof(struct ieee80211_tx_info, status.ack_signal));</div><div class='del'>-	BUILD_BUG_ON(offsetof(struct ieee80211_tx_info,</div><div class='del'>-			      status.ack_signal) != 20);</div><div class='add'>+	memset_after(&amp;info-&gt;status, 0, rates);</div><div class='ctx'> </div><div class='ctx'> 	if (entry_hdr-&gt;flags &amp; cpu_to_le16(P54_HDR_FLAG_DATA_ALIGN))</div><div class='ctx'> 		pad = entry_data-&gt;align[0];</div><div class='hunk'>@@ -500,14 +496,19 @@ static void p54_rx_eeprom_readback(struct p54_common *priv,</div><div class='ctx'> 		return ;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;fw_var &gt;= 0x509) {</div><div class='del'>-		memcpy(priv-&gt;eeprom, eeprom-&gt;v2.data,</div><div class='del'>-		       le16_to_cpu(eeprom-&gt;v2.len));</div><div class='add'>+		if (le16_to_cpu(eeprom-&gt;v2.len) != priv-&gt;eeprom_slice_size)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		memcpy(priv-&gt;eeprom, eeprom-&gt;v2.data, priv-&gt;eeprom_slice_size);</div><div class='ctx'> 	} else {</div><div class='del'>-		memcpy(priv-&gt;eeprom, eeprom-&gt;v1.data,</div><div class='del'>-		       le16_to_cpu(eeprom-&gt;v1.len));</div><div class='add'>+		if (le16_to_cpu(eeprom-&gt;v1.len) != priv-&gt;eeprom_slice_size)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		memcpy(priv-&gt;eeprom, eeprom-&gt;v1.data, priv-&gt;eeprom_slice_size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;eeprom = NULL;</div><div class='add'>+	priv-&gt;eeprom_slice_size = 0;</div><div class='ctx'> 	tmp = p54_find_and_unlink_skb(priv, hdr-&gt;req_id);</div><div class='ctx'> 	dev_kfree_skb_any(tmp);</div><div class='ctx'> 	complete(&amp;priv-&gt;eeprom_comp);</div><div class='head'>diff --git a/drivers/net/wireless/intersil/prism54/Makefile b/drivers/net/wireless/intersil/prism54/Makefile<br/>deleted file mode 100644<br/>index 4f5572dffb5e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/prism54/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-# $Id: Makefile.k26,v 1.7 2004/01/30 16:24:00 ajfa Exp $</div><div class='del'>-</div><div class='del'>-prism54-objs := islpci_eth.o islpci_mgt.o \</div><div class='del'>-                isl_38xx.o isl_ioctl.o islpci_dev.o \</div><div class='del'>-		islpci_hotplug.o oid_mgt.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_PRISM54) += prism54.o</div><div class='del'>-</div><div class='head'>diff --git a/drivers/net/wireless/intersil/prism54/isl_38xx.c b/drivers/net/wireless/intersil/prism54/isl_38xx.c<br/>deleted file mode 100644<br/>index ae964de347f7..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/prism54/isl_38xx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/isl_38xx.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,245 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2002 Intersil Americas Inc.</div><div class='del'>- *  Copyright (C) 2003-2004 Luis R. Rodriguez &lt;mcgrof@ruslug.rutgers.edu&gt;_</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/ktime.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include "prismcompat.h"</div><div class='del'>-#include "isl_38xx.h"</div><div class='del'>-#include "islpci_dev.h"</div><div class='del'>-#include "islpci_mgt.h"</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>-    Device Interface &amp; Control functions</div><div class='del'>-******************************************************************************/</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * isl38xx_disable_interrupts - disable all interrupts</div><div class='del'>- * @device: pci memory base address</div><div class='del'>- *</div><div class='del'>- *  Instructs the device to disable all interrupt reporting by asserting</div><div class='del'>- *  the IRQ line. New events may still show up in the interrupt identification</div><div class='del'>- *  register located at offset %ISL38XX_INT_IDENT_REG.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-isl38xx_disable_interrupts(void __iomem *device)</div><div class='del'>-{</div><div class='del'>-	isl38xx_w32_flush(device, 0x00000000, ISL38XX_INT_EN_REG);</div><div class='del'>-	udelay(ISL38XX_WRITEIO_DELAY);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-isl38xx_handle_sleep_request(isl38xx_control_block *control_block,</div><div class='del'>-			     int *powerstate, void __iomem *device_base)</div><div class='del'>-{</div><div class='del'>-	/* device requests to go into sleep mode</div><div class='del'>-	 * check whether the transmit queues for data and management are empty */</div><div class='del'>-	if (isl38xx_in_queue(control_block, ISL38XX_CB_TX_DATA_LQ))</div><div class='del'>-		/* data tx queue not empty */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (isl38xx_in_queue(control_block, ISL38XX_CB_TX_MGMTQ))</div><div class='del'>-		/* management tx queue not empty */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* check also whether received frames are pending */</div><div class='del'>-	if (isl38xx_in_queue(control_block, ISL38XX_CB_RX_DATA_LQ))</div><div class='del'>-		/* data rx queue not empty */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (isl38xx_in_queue(control_block, ISL38XX_CB_RX_MGMTQ))</div><div class='del'>-		/* management rx queue not empty */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-	DEBUG(SHOW_TRACING, "Device going to sleep mode\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* all queues are empty, allow the device to go into sleep mode */</div><div class='del'>-	*powerstate = ISL38XX_PSM_POWERSAVE_STATE;</div><div class='del'>-</div><div class='del'>-	/* assert the Sleep interrupt in the Device Interrupt Register */</div><div class='del'>-	isl38xx_w32_flush(device_base, ISL38XX_DEV_INT_SLEEP,</div><div class='del'>-			  ISL38XX_DEV_INT_REG);</div><div class='del'>-	udelay(ISL38XX_WRITEIO_DELAY);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-isl38xx_handle_wakeup(isl38xx_control_block *control_block,</div><div class='del'>-		      int *powerstate, void __iomem *device_base)</div><div class='del'>-{</div><div class='del'>-	/* device is in active state, update the powerstate flag */</div><div class='del'>-	*powerstate = ISL38XX_PSM_ACTIVE_STATE;</div><div class='del'>-</div><div class='del'>-	/* now check whether there are frames pending for the card */</div><div class='del'>-	if (!isl38xx_in_queue(control_block, ISL38XX_CB_TX_DATA_LQ)</div><div class='del'>-	    &amp;&amp; !isl38xx_in_queue(control_block, ISL38XX_CB_TX_MGMTQ))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-	DEBUG(SHOW_ANYTHING, "Wake up handler trigger the device\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* either data or management transmit queue has a frame pending</div><div class='del'>-	 * trigger the device by setting the Update bit in the Device Int reg */</div><div class='del'>-	isl38xx_w32_flush(device_base, ISL38XX_DEV_INT_UPDATE,</div><div class='del'>-			  ISL38XX_DEV_INT_REG);</div><div class='del'>-	udelay(ISL38XX_WRITEIO_DELAY);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-isl38xx_trigger_device(int asleep, void __iomem *device_base)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-	u32 counter = 0;</div><div class='del'>-	struct timespec64 current_ts64;</div><div class='del'>-	DEBUG(SHOW_FUNCTION_CALLS, "isl38xx trigger device\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* check whether the device is in power save mode */</div><div class='del'>-	if (asleep) {</div><div class='del'>-		/* device is in powersave, trigger the device for wakeup */</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-		ktime_get_real_ts64(&amp;current_ts64);</div><div class='del'>-		DEBUG(SHOW_TRACING, "%lld.%09ld Device wakeup triggered\n",</div><div class='del'>-		      (s64)current_ts64.tv_sec, current_ts64.tv_nsec);</div><div class='del'>-</div><div class='del'>-		DEBUG(SHOW_TRACING, "%lld.%09ld Device register read %08x\n",</div><div class='del'>-		      (s64)current_ts64.tv_sec, current_ts64.tv_nsec,</div><div class='del'>-		      readl(device_base + ISL38XX_CTRL_STAT_REG));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		reg = readl(device_base + ISL38XX_INT_IDENT_REG);</div><div class='del'>-		if (reg == 0xabadface) {</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-			ktime_get_real_ts64(&amp;current_ts64);</div><div class='del'>-			DEBUG(SHOW_TRACING,</div><div class='del'>-			      "%lld.%09ld Device register abadface\n",</div><div class='del'>-			      (s64)current_ts64.tv_sec, current_ts64.tv_nsec);</div><div class='del'>-#endif</div><div class='del'>-			/* read the Device Status Register until Sleepmode bit is set */</div><div class='del'>-			while (reg = readl(device_base + ISL38XX_CTRL_STAT_REG),</div><div class='del'>-			       (reg &amp; ISL38XX_CTRL_STAT_SLEEPMODE) == 0) {</div><div class='del'>-				udelay(ISL38XX_WRITEIO_DELAY);</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-				counter++;</div><div class='del'>-#endif</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-			DEBUG(SHOW_TRACING,</div><div class='del'>-			      "%lld.%09ld Device register read %08x\n",</div><div class='del'>-			      (s64)current_ts64.tv_sec, current_ts64.tv_nsec,</div><div class='del'>-			      readl(device_base + ISL38XX_CTRL_STAT_REG));</div><div class='del'>-			ktime_get_real_ts64(&amp;current_ts64);</div><div class='del'>-			DEBUG(SHOW_TRACING,</div><div class='del'>-			      "%lld.%09ld Device asleep counter %i\n",</div><div class='del'>-			      (s64)current_ts64.tv_sec, current_ts64.tv_nsec,</div><div class='del'>-			      counter);</div><div class='del'>-#endif</div><div class='del'>-		}</div><div class='del'>-		/* assert the Wakeup interrupt in the Device Interrupt Register */</div><div class='del'>-		isl38xx_w32_flush(device_base, ISL38XX_DEV_INT_WAKEUP,</div><div class='del'>-				  ISL38XX_DEV_INT_REG);</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-		udelay(ISL38XX_WRITEIO_DELAY);</div><div class='del'>-</div><div class='del'>-		/* perform another read on the Device Status Register */</div><div class='del'>-		reg = readl(device_base + ISL38XX_CTRL_STAT_REG);</div><div class='del'>-		ktime_get_real_ts64(&amp;current_ts64);</div><div class='del'>-		DEBUG(SHOW_TRACING, "%lld.%00ld Device register read %08x\n",</div><div class='del'>-		      (s64)current_ts64.tv_sec, current_ts64.tv_nsec, reg);</div><div class='del'>-#endif</div><div class='del'>-	} else {</div><div class='del'>-		/* device is (still) awake  */</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-		DEBUG(SHOW_TRACING, "Device is in active state\n");</div><div class='del'>-#endif</div><div class='del'>-		/* trigger the device by setting the Update bit in the Device Int reg */</div><div class='del'>-</div><div class='del'>-		isl38xx_w32_flush(device_base, ISL38XX_DEV_INT_UPDATE,</div><div class='del'>-				  ISL38XX_DEV_INT_REG);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-isl38xx_interface_reset(void __iomem *device_base, dma_addr_t host_address)</div><div class='del'>-{</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-	DEBUG(SHOW_FUNCTION_CALLS, "isl38xx_interface_reset\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* load the address of the control block in the device */</div><div class='del'>-	isl38xx_w32_flush(device_base, host_address, ISL38XX_CTRL_BLK_BASE_REG);</div><div class='del'>-	udelay(ISL38XX_WRITEIO_DELAY);</div><div class='del'>-</div><div class='del'>-	/* set the reset bit in the Device Interrupt Register */</div><div class='del'>-	isl38xx_w32_flush(device_base, ISL38XX_DEV_INT_RESET, ISL38XX_DEV_INT_REG);</div><div class='del'>-	udelay(ISL38XX_WRITEIO_DELAY);</div><div class='del'>-</div><div class='del'>-	/* enable the interrupt for detecting initialization */</div><div class='del'>-</div><div class='del'>-	/* Note: Do not enable other interrupts here. We want the</div><div class='del'>-	 * device to have come up first 100% before allowing any other</div><div class='del'>-	 * interrupts. */</div><div class='del'>-	isl38xx_w32_flush(device_base, ISL38XX_INT_IDENT_INIT, ISL38XX_INT_EN_REG);</div><div class='del'>-	udelay(ISL38XX_WRITEIO_DELAY);  /* allow complete full reset */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-isl38xx_enable_common_interrupts(void __iomem *device_base)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	reg = ISL38XX_INT_IDENT_UPDATE | ISL38XX_INT_IDENT_SLEEP |</div><div class='del'>-	      ISL38XX_INT_IDENT_WAKEUP;</div><div class='del'>-	isl38xx_w32_flush(device_base, reg, ISL38XX_INT_EN_REG);</div><div class='del'>-	udelay(ISL38XX_WRITEIO_DELAY);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-isl38xx_in_queue(isl38xx_control_block *cb, int queue)</div><div class='del'>-{</div><div class='del'>-	const s32 delta = (le32_to_cpu(cb-&gt;driver_curr_frag[queue]) -</div><div class='del'>-			   le32_to_cpu(cb-&gt;device_curr_frag[queue]));</div><div class='del'>-</div><div class='del'>-	/* determine the amount of fragments in the queue depending on the type</div><div class='del'>-	 * of the queue, either transmit or receive */</div><div class='del'>-</div><div class='del'>-	BUG_ON(delta &lt; 0);	/* driver ptr must be ahead of device ptr */</div><div class='del'>-</div><div class='del'>-	switch (queue) {</div><div class='del'>-		/* send queues */</div><div class='del'>-	case ISL38XX_CB_TX_MGMTQ:</div><div class='del'>-		BUG_ON(delta &gt; ISL38XX_CB_MGMT_QSIZE);</div><div class='del'>-		fallthrough;</div><div class='del'>-</div><div class='del'>-	case ISL38XX_CB_TX_DATA_LQ:</div><div class='del'>-	case ISL38XX_CB_TX_DATA_HQ:</div><div class='del'>-		BUG_ON(delta &gt; ISL38XX_CB_TX_QSIZE);</div><div class='del'>-		return delta;</div><div class='del'>-</div><div class='del'>-		/* receive queues */</div><div class='del'>-	case ISL38XX_CB_RX_MGMTQ:</div><div class='del'>-		BUG_ON(delta &gt; ISL38XX_CB_MGMT_QSIZE);</div><div class='del'>-		return ISL38XX_CB_MGMT_QSIZE - delta;</div><div class='del'>-</div><div class='del'>-	case ISL38XX_CB_RX_DATA_LQ:</div><div class='del'>-	case ISL38XX_CB_RX_DATA_HQ:</div><div class='del'>-		BUG_ON(delta &gt; ISL38XX_CB_RX_QSIZE);</div><div class='del'>-		return ISL38XX_CB_RX_QSIZE - delta;</div><div class='del'>-	}</div><div class='del'>-	BUG();</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/intersil/prism54/isl_38xx.h b/drivers/net/wireless/intersil/prism54/isl_38xx.h<br/>deleted file mode 100644<br/>index 69218b8b2b23..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/prism54/isl_38xx.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/isl_38xx.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,158 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2002 Intersil Americas Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _ISL_38XX_H</div><div class='del'>-#define _ISL_38XX_H</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/byteorder.h&gt;</div><div class='del'>-</div><div class='del'>-#define ISL38XX_CB_RX_QSIZE                     8</div><div class='del'>-#define ISL38XX_CB_TX_QSIZE                     32</div><div class='del'>-</div><div class='del'>-/* ISL38XX Access Point Specific definitions */</div><div class='del'>-#define ISL38XX_MAX_WDS_LINKS                   8</div><div class='del'>-</div><div class='del'>-/* ISL38xx Client Specific definitions */</div><div class='del'>-#define ISL38XX_PSM_ACTIVE_STATE                0</div><div class='del'>-#define ISL38XX_PSM_POWERSAVE_STATE             1</div><div class='del'>-</div><div class='del'>-/* ISL38XX Host Interface Definitions */</div><div class='del'>-#define ISL38XX_PCI_MEM_SIZE                    0x02000</div><div class='del'>-#define ISL38XX_MEMORY_WINDOW_SIZE              0x01000</div><div class='del'>-#define ISL38XX_DEV_FIRMWARE_ADDRES             0x20000</div><div class='del'>-#define ISL38XX_WRITEIO_DELAY                   10	/* in us */</div><div class='del'>-#define ISL38XX_RESET_DELAY                     50	/* in ms */</div><div class='del'>-#define ISL38XX_WAIT_CYCLE                      10	/* in 10ms */</div><div class='del'>-#define ISL38XX_MAX_WAIT_CYCLES                 10</div><div class='del'>-</div><div class='del'>-/* PCI Memory Area */</div><div class='del'>-#define ISL38XX_HARDWARE_REG                    0x0000</div><div class='del'>-#define ISL38XX_CARDBUS_CIS                     0x0800</div><div class='del'>-#define ISL38XX_DIRECT_MEM_WIN                  0x1000</div><div class='del'>-</div><div class='del'>-/* Hardware registers */</div><div class='del'>-#define ISL38XX_DEV_INT_REG                     0x0000</div><div class='del'>-#define ISL38XX_INT_IDENT_REG                   0x0010</div><div class='del'>-#define ISL38XX_INT_ACK_REG                     0x0014</div><div class='del'>-#define ISL38XX_INT_EN_REG                      0x0018</div><div class='del'>-#define ISL38XX_GEN_PURP_COM_REG_1              0x0020</div><div class='del'>-#define ISL38XX_GEN_PURP_COM_REG_2              0x0024</div><div class='del'>-#define ISL38XX_CTRL_BLK_BASE_REG               ISL38XX_GEN_PURP_COM_REG_1</div><div class='del'>-#define ISL38XX_DIR_MEM_BASE_REG                0x0030</div><div class='del'>-#define ISL38XX_CTRL_STAT_REG                   0x0078</div><div class='del'>-</div><div class='del'>-/* High end mobos queue up pci writes, the following</div><div class='del'>- * is used to "read" from after a write to force flush */</div><div class='del'>-#define ISL38XX_PCI_POSTING_FLUSH		ISL38XX_INT_EN_REG</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * isl38xx_w32_flush - PCI iomem write helper</div><div class='del'>- * @base: (host) memory base address of the device</div><div class='del'>- * @val: 32bit value (host order) to write</div><div class='del'>- * @offset: byte offset into @base to write value to</div><div class='del'>- *</div><div class='del'>- *  This helper takes care of writing a 32bit datum to the</div><div class='del'>- *  specified offset into the device's pci memory space, and making sure</div><div class='del'>- *  the pci memory buffers get flushed by performing one harmless read</div><div class='del'>- *  from the %ISL38XX_PCI_POSTING_FLUSH offset.</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-isl38xx_w32_flush(void __iomem *base, u32 val, unsigned long offset)</div><div class='del'>-{</div><div class='del'>-	writel(val, base + offset);</div><div class='del'>-	(void) readl(base + ISL38XX_PCI_POSTING_FLUSH);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Device Interrupt register bits */</div><div class='del'>-#define ISL38XX_DEV_INT_RESET                   0x0001</div><div class='del'>-#define ISL38XX_DEV_INT_UPDATE                  0x0002</div><div class='del'>-#define ISL38XX_DEV_INT_WAKEUP                  0x0008</div><div class='del'>-#define ISL38XX_DEV_INT_SLEEP                   0x0010</div><div class='del'>-</div><div class='del'>-/* Interrupt Identification/Acknowledge/Enable register bits */</div><div class='del'>-#define ISL38XX_INT_IDENT_UPDATE                0x0002</div><div class='del'>-#define ISL38XX_INT_IDENT_INIT                  0x0004</div><div class='del'>-#define ISL38XX_INT_IDENT_WAKEUP                0x0008</div><div class='del'>-#define ISL38XX_INT_IDENT_SLEEP                 0x0010</div><div class='del'>-#define ISL38XX_INT_SOURCES                     0x001E</div><div class='del'>-</div><div class='del'>-/* Control/Status register bits */</div><div class='del'>-/* Looks like there are other meaningful bits</div><div class='del'>-    0x20004400 seen in normal operation,</div><div class='del'>-    0x200044db at 'timeout waiting for mgmt response'</div><div class='del'>-*/</div><div class='del'>-#define ISL38XX_CTRL_STAT_SLEEPMODE             0x00000200</div><div class='del'>-#define	ISL38XX_CTRL_STAT_CLKRUN		0x00800000</div><div class='del'>-#define ISL38XX_CTRL_STAT_RESET                 0x10000000</div><div class='del'>-#define ISL38XX_CTRL_STAT_RAMBOOT               0x20000000</div><div class='del'>-#define ISL38XX_CTRL_STAT_STARTHALTED           0x40000000</div><div class='del'>-#define ISL38XX_CTRL_STAT_HOST_OVERRIDE         0x80000000</div><div class='del'>-</div><div class='del'>-/* Control Block definitions */</div><div class='del'>-#define ISL38XX_CB_RX_DATA_LQ                   0</div><div class='del'>-#define ISL38XX_CB_TX_DATA_LQ                   1</div><div class='del'>-#define ISL38XX_CB_RX_DATA_HQ                   2</div><div class='del'>-#define ISL38XX_CB_TX_DATA_HQ                   3</div><div class='del'>-#define ISL38XX_CB_RX_MGMTQ                     4</div><div class='del'>-#define ISL38XX_CB_TX_MGMTQ                     5</div><div class='del'>-#define ISL38XX_CB_QCOUNT                       6</div><div class='del'>-#define ISL38XX_CB_MGMT_QSIZE                   4</div><div class='del'>-#define ISL38XX_MIN_QTHRESHOLD                  4	/* fragments */</div><div class='del'>-</div><div class='del'>-/* Memory Manager definitions */</div><div class='del'>-#define MGMT_FRAME_SIZE                         1500	/* &gt;= size struct obj_bsslist */</div><div class='del'>-#define MGMT_TX_FRAME_COUNT                     24	/* max 4 + spare 4 + 8 init */</div><div class='del'>-#define MGMT_RX_FRAME_COUNT                     24	/* 4*4 + spare 8 */</div><div class='del'>-#define MGMT_FRAME_COUNT                        (MGMT_TX_FRAME_COUNT + MGMT_RX_FRAME_COUNT)</div><div class='del'>-#define CONTROL_BLOCK_SIZE                      1024	/* should be enough */</div><div class='del'>-#define PSM_FRAME_SIZE                          1536</div><div class='del'>-#define PSM_MINIMAL_STATION_COUNT               64</div><div class='del'>-#define PSM_FRAME_COUNT                         PSM_MINIMAL_STATION_COUNT</div><div class='del'>-#define PSM_BUFFER_SIZE                         PSM_FRAME_SIZE * PSM_FRAME_COUNT</div><div class='del'>-#define MAX_TRAP_RX_QUEUE                       4</div><div class='del'>-#define HOST_MEM_BLOCK                          CONTROL_BLOCK_SIZE + PSM_BUFFER_SIZE</div><div class='del'>-</div><div class='del'>-/* Fragment package definitions */</div><div class='del'>-#define FRAGMENT_FLAG_MF                        0x0001</div><div class='del'>-#define MAX_FRAGMENT_SIZE                       1536</div><div class='del'>-</div><div class='del'>-/* In monitor mode frames have a header. I don't know exactly how big those</div><div class='del'>- * frame can be but I've never seen any frame bigger than 1584... :</div><div class='del'>- */</div><div class='del'>-#define MAX_FRAGMENT_SIZE_RX	                1600</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	__le32 address;		/* physical address on host */</div><div class='del'>-	__le16 size;		/* packet size */</div><div class='del'>-	__le16 flags;		/* set of bit-wise flags */</div><div class='del'>-} isl38xx_fragment;</div><div class='del'>-</div><div class='del'>-struct isl38xx_cb {</div><div class='del'>-	__le32 driver_curr_frag[ISL38XX_CB_QCOUNT];</div><div class='del'>-	__le32 device_curr_frag[ISL38XX_CB_QCOUNT];</div><div class='del'>-	isl38xx_fragment rx_data_low[ISL38XX_CB_RX_QSIZE];</div><div class='del'>-	isl38xx_fragment tx_data_low[ISL38XX_CB_TX_QSIZE];</div><div class='del'>-	isl38xx_fragment rx_data_high[ISL38XX_CB_RX_QSIZE];</div><div class='del'>-	isl38xx_fragment tx_data_high[ISL38XX_CB_TX_QSIZE];</div><div class='del'>-	isl38xx_fragment rx_data_mgmt[ISL38XX_CB_MGMT_QSIZE];</div><div class='del'>-	isl38xx_fragment tx_data_mgmt[ISL38XX_CB_MGMT_QSIZE];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct isl38xx_cb isl38xx_control_block;</div><div class='del'>-</div><div class='del'>-/* determine number of entries currently in queue */</div><div class='del'>-int isl38xx_in_queue(isl38xx_control_block *cb, int queue);</div><div class='del'>-</div><div class='del'>-void isl38xx_disable_interrupts(void __iomem *);</div><div class='del'>-void isl38xx_enable_common_interrupts(void __iomem *);</div><div class='del'>-</div><div class='del'>-void isl38xx_handle_sleep_request(isl38xx_control_block *, int *,</div><div class='del'>-				  void __iomem *);</div><div class='del'>-void isl38xx_handle_wakeup(isl38xx_control_block *, int *, void __iomem *);</div><div class='del'>-void isl38xx_trigger_device(int, void __iomem *);</div><div class='del'>-void isl38xx_interface_reset(void __iomem *, dma_addr_t);</div><div class='del'>-</div><div class='del'>-#endif				/* _ISL_38XX_H */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/prism54/isl_ioctl.c b/drivers/net/wireless/intersil/prism54/isl_ioctl.c<br/>deleted file mode 100644<br/>index 5e5ceafe098b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/prism54/isl_ioctl.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/isl_ioctl.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2909 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2002 Intersil Americas Inc.</div><div class='del'>- *            (C) 2003,2004 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='del'>- *            (C) 2003 Herbert Valerio Riedel &lt;hvr@gnu.org&gt;</div><div class='del'>- *            (C) 2003 Luis R. Rodriguez &lt;mcgrof@ruslug.rutgers.edu&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/capability.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-</div><div class='del'>-#include "prismcompat.h"</div><div class='del'>-#include "isl_ioctl.h"</div><div class='del'>-#include "islpci_mgt.h"</div><div class='del'>-#include "isl_oid.h"		/* additional types and defs for isl38xx fw */</div><div class='del'>-#include "oid_mgt.h"</div><div class='del'>-</div><div class='del'>-#include &lt;net/iw_handler.h&gt;	/* New driver API */</div><div class='del'>-</div><div class='del'>-#define KEY_SIZE_WEP104 13	/* 104/128-bit WEP keys */</div><div class='del'>-#define KEY_SIZE_WEP40  5	/* 40/64-bit WEP keys */</div><div class='del'>-/* KEY_SIZE_TKIP should match isl_oid.h, struct obj_key.key[] size */</div><div class='del'>-#define KEY_SIZE_TKIP   32	/* TKIP keys */</div><div class='del'>-</div><div class='del'>-static void prism54_wpa_bss_ie_add(islpci_private *priv, u8 *bssid,</div><div class='del'>-				u8 *wpa_ie, size_t wpa_ie_len);</div><div class='del'>-static size_t prism54_wpa_bss_ie_get(islpci_private *priv, u8 *bssid, u8 *wpa_ie);</div><div class='del'>-static int prism54_set_wpa(struct net_device *, struct iw_request_info *,</div><div class='del'>-				__u32 *, char *);</div><div class='del'>-</div><div class='del'>-/* In 500 kbps */</div><div class='del'>-static const unsigned char scan_rate_list[] = { 2, 4, 11, 22,</div><div class='del'>-						12, 18, 24, 36,</div><div class='del'>-						48, 72, 96, 108 };</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * prism54_mib_mode_helper - MIB change mode helper function</div><div class='del'>- * @priv: the &amp;struct islpci_private object to modify</div><div class='del'>- * @iw_mode: new mode (%IW_MODE_*)</div><div class='del'>- *</div><div class='del'>- *  This is a helper function, hence it does not lock. Make sure</div><div class='del'>- *  caller deals with locking *if* necessary. This function sets the</div><div class='del'>- *  mode-dependent mib values and does the mapping of the Linux</div><div class='del'>- *  Wireless API modes to Device firmware modes. It also checks for</div><div class='del'>- *  correct valid Linux wireless modes.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-prism54_mib_mode_helper(islpci_private *priv, u32 iw_mode)</div><div class='del'>-{</div><div class='del'>-	u32 config = INL_CONFIG_MANUALRUN;</div><div class='del'>-	u32 mode, bsstype;</div><div class='del'>-</div><div class='del'>-	/* For now, just catch early the Repeater and Secondary modes here */</div><div class='del'>-	if (iw_mode == IW_MODE_REPEAT || iw_mode == IW_MODE_SECOND) {</div><div class='del'>-		printk(KERN_DEBUG</div><div class='del'>-		       "%s(): Sorry, Repeater mode and Secondary mode "</div><div class='del'>-		       "are not yet supported by this driver.\n", __func__);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;iw_mode = iw_mode;</div><div class='del'>-</div><div class='del'>-	switch (iw_mode) {</div><div class='del'>-	case IW_MODE_AUTO:</div><div class='del'>-		mode = INL_MODE_CLIENT;</div><div class='del'>-		bsstype = DOT11_BSSTYPE_ANY;</div><div class='del'>-		break;</div><div class='del'>-	case IW_MODE_ADHOC:</div><div class='del'>-		mode = INL_MODE_CLIENT;</div><div class='del'>-		bsstype = DOT11_BSSTYPE_IBSS;</div><div class='del'>-		break;</div><div class='del'>-	case IW_MODE_INFRA:</div><div class='del'>-		mode = INL_MODE_CLIENT;</div><div class='del'>-		bsstype = DOT11_BSSTYPE_INFRA;</div><div class='del'>-		break;</div><div class='del'>-	case IW_MODE_MASTER:</div><div class='del'>-		mode = INL_MODE_AP;</div><div class='del'>-		bsstype = DOT11_BSSTYPE_INFRA;</div><div class='del'>-		break;</div><div class='del'>-	case IW_MODE_MONITOR:</div><div class='del'>-		mode = INL_MODE_PROMISCUOUS;</div><div class='del'>-		bsstype = DOT11_BSSTYPE_ANY;</div><div class='del'>-		config |= INL_CONFIG_RXANNEX;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (init_wds)</div><div class='del'>-		config |= INL_CONFIG_WDS;</div><div class='del'>-	mgt_set(priv, DOT11_OID_BSSTYPE, &amp;bsstype);</div><div class='del'>-	mgt_set(priv, OID_INL_CONFIG, &amp;config);</div><div class='del'>-	mgt_set(priv, OID_INL_MODE, &amp;mode);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * prism54_mib_init - fill MIB cache with defaults</div><div class='del'>- *</div><div class='del'>- *  this function initializes the struct given as @mib with defaults,</div><div class='del'>- *  of which many are retrieved from the global module parameter</div><div class='del'>- *  variables.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-prism54_mib_init(islpci_private *priv)</div><div class='del'>-{</div><div class='del'>-	u32 channel, authen, wep, filter, dot1x, mlme, conformance, power, mode;</div><div class='del'>-	struct obj_buffer psm_buffer = {</div><div class='del'>-		.size = PSM_BUFFER_SIZE,</div><div class='del'>-		.addr = priv-&gt;device_psm_buffer</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	channel = CARD_DEFAULT_CHANNEL;</div><div class='del'>-	authen = CARD_DEFAULT_AUTHEN;</div><div class='del'>-	wep = CARD_DEFAULT_WEP;</div><div class='del'>-	filter = CARD_DEFAULT_FILTER; /* (0) Do not filter un-encrypted data */</div><div class='del'>-	dot1x = CARD_DEFAULT_DOT1X;</div><div class='del'>-	mlme = CARD_DEFAULT_MLME_MODE;</div><div class='del'>-	conformance = CARD_DEFAULT_CONFORMANCE;</div><div class='del'>-	power = 127;</div><div class='del'>-	mode = CARD_DEFAULT_IW_MODE;</div><div class='del'>-</div><div class='del'>-	mgt_set(priv, DOT11_OID_CHANNEL, &amp;channel);</div><div class='del'>-	mgt_set(priv, DOT11_OID_AUTHENABLE, &amp;authen);</div><div class='del'>-	mgt_set(priv, DOT11_OID_PRIVACYINVOKED, &amp;wep);</div><div class='del'>-	mgt_set(priv, DOT11_OID_PSMBUFFER, &amp;psm_buffer);</div><div class='del'>-	mgt_set(priv, DOT11_OID_EXUNENCRYPTED, &amp;filter);</div><div class='del'>-	mgt_set(priv, DOT11_OID_DOT1XENABLE, &amp;dot1x);</div><div class='del'>-	mgt_set(priv, DOT11_OID_MLMEAUTOLEVEL, &amp;mlme);</div><div class='del'>-	mgt_set(priv, OID_INL_DOT11D_CONFORMANCE, &amp;conformance);</div><div class='del'>-	mgt_set(priv, OID_INL_OUTPUTPOWER, &amp;power);</div><div class='del'>-</div><div class='del'>-	/* This sets all of the mode-dependent values */</div><div class='del'>-	prism54_mib_mode_helper(priv, mode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this will be executed outside of atomic context thanks to</div><div class='del'>- * schedule_work(), thus we can as well use sleeping semaphore</div><div class='del'>- * locking */</div><div class='del'>-void</div><div class='del'>-prism54_update_stats(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = container_of(work, islpci_private, stats_work);</div><div class='del'>-	char *data;</div><div class='del'>-	struct obj_bss bss, *bss2;</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;stats_lock);</div><div class='del'>-</div><div class='del'>-/* Noise floor.</div><div class='del'>- * I'm not sure if the unit is dBm.</div><div class='del'>- * Note : If we are not connected, this value seems to be irrelevant. */</div><div class='del'>-</div><div class='del'>-	mgt_get_request(priv, DOT11_OID_NOISEFLOOR, 0, NULL, &amp;r);</div><div class='del'>-	priv-&gt;local_iwstatistics.qual.noise = r.u;</div><div class='del'>-</div><div class='del'>-/* Get the rssi of the link. To do this we need to retrieve a bss. */</div><div class='del'>-</div><div class='del'>-	/* First get the MAC address of the AP we are associated with. */</div><div class='del'>-	mgt_get_request(priv, DOT11_OID_BSSID, 0, NULL, &amp;r);</div><div class='del'>-	data = r.ptr;</div><div class='del'>-</div><div class='del'>-	/* copy this MAC to the bss */</div><div class='del'>-	memcpy(bss.address, data, ETH_ALEN);</div><div class='del'>-	kfree(data);</div><div class='del'>-</div><div class='del'>-	/* now ask for the corresponding bss */</div><div class='del'>-	mgt_get_request(priv, DOT11_OID_BSSFIND, 0, (void *) &amp;bss, &amp;r);</div><div class='del'>-	bss2 = r.ptr;</div><div class='del'>-	/* report the rssi and use it to calculate</div><div class='del'>-	 *  link quality through a signal-noise</div><div class='del'>-	 *  ratio */</div><div class='del'>-	priv-&gt;local_iwstatistics.qual.level = bss2-&gt;rssi;</div><div class='del'>-	priv-&gt;local_iwstatistics.qual.qual =</div><div class='del'>-	    bss2-&gt;rssi - priv-&gt;iwstatistics.qual.noise;</div><div class='del'>-</div><div class='del'>-	kfree(bss2);</div><div class='del'>-</div><div class='del'>-	/* report that the stats are new */</div><div class='del'>-	priv-&gt;local_iwstatistics.qual.updated = 0x7;</div><div class='del'>-</div><div class='del'>-/* Rx : unable to decrypt the MPDU */</div><div class='del'>-	mgt_get_request(priv, DOT11_OID_PRIVRXFAILED, 0, NULL, &amp;r);</div><div class='del'>-	priv-&gt;local_iwstatistics.discard.code = r.u;</div><div class='del'>-</div><div class='del'>-/* Tx : Max MAC retries num reached */</div><div class='del'>-	mgt_get_request(priv, DOT11_OID_MPDUTXFAILED, 0, NULL, &amp;r);</div><div class='del'>-	priv-&gt;local_iwstatistics.discard.retries = r.u;</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;stats_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct iw_statistics *</div><div class='del'>-prism54_get_wireless_stats(struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-</div><div class='del'>-	/* If the stats are being updated return old data */</div><div class='del'>-	if (mutex_trylock(&amp;priv-&gt;stats_lock)) {</div><div class='del'>-		memcpy(&amp;priv-&gt;iwstatistics, &amp;priv-&gt;local_iwstatistics,</div><div class='del'>-		       sizeof (struct iw_statistics));</div><div class='del'>-		/* They won't be marked updated for the next time */</div><div class='del'>-		priv-&gt;local_iwstatistics.qual.updated = 0;</div><div class='del'>-		mutex_unlock(&amp;priv-&gt;stats_lock);</div><div class='del'>-	} else</div><div class='del'>-		priv-&gt;iwstatistics.qual.updated = 0;</div><div class='del'>-</div><div class='del'>-	/* Update our wireless stats, but do not schedule to often</div><div class='del'>-	 * (max 1 HZ) */</div><div class='del'>-	if ((priv-&gt;stats_timestamp == 0) ||</div><div class='del'>-	    time_after(jiffies, priv-&gt;stats_timestamp + 1 * HZ)) {</div><div class='del'>-		schedule_work(&amp;priv-&gt;stats_work);</div><div class='del'>-		priv-&gt;stats_timestamp = jiffies;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return &amp;priv-&gt;iwstatistics;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_commit(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-	       char *cwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-</div><div class='del'>-	/* simply re-set the last set SSID, this should commit most stuff */</div><div class='del'>-</div><div class='del'>-	/* Commit in Monitor mode is not necessary, also setting essid</div><div class='del'>-	 * in Monitor mode does not make sense and isn't allowed for this</div><div class='del'>-	 * device's firmware */</div><div class='del'>-	if (priv-&gt;iw_mode != IW_MODE_MONITOR)</div><div class='del'>-		return mgt_set_request(priv, DOT11_OID_SSID, 0, NULL);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_get_name(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		 char *cwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	char *capabilities;</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-	int rvalue;</div><div class='del'>-</div><div class='del'>-	if (islpci_get_state(priv) &lt; PRV_STATE_INIT) {</div><div class='del'>-		strncpy(cwrq, "NOT READY!", IFNAMSIZ);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	rvalue = mgt_get_request(priv, OID_INL_PHYCAPABILITIES, 0, NULL, &amp;r);</div><div class='del'>-</div><div class='del'>-	switch (r.u) {</div><div class='del'>-	case INL_PHYCAP_5000MHZ:</div><div class='del'>-		capabilities = "IEEE 802.11a/b/g";</div><div class='del'>-		break;</div><div class='del'>-	case INL_PHYCAP_FAA:</div><div class='del'>-		capabilities = "IEEE 802.11b/g - FAA Support";</div><div class='del'>-		break;</div><div class='del'>-	case INL_PHYCAP_2400MHZ:</div><div class='del'>-	default:</div><div class='del'>-		capabilities = "IEEE 802.11b/g";	/* Default */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	strncpy(cwrq, capabilities, IFNAMSIZ);</div><div class='del'>-	return rvalue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_set_freq(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		 struct iw_freq *fwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	int rvalue;</div><div class='del'>-	u32 c;</div><div class='del'>-</div><div class='del'>-	if (fwrq-&gt;m &lt; 1000)</div><div class='del'>-		/* we have a channel number */</div><div class='del'>-		c = fwrq-&gt;m;</div><div class='del'>-	else</div><div class='del'>-		c = (fwrq-&gt;e == 1) ? channel_of_freq(fwrq-&gt;m / 100000) : 0;</div><div class='del'>-</div><div class='del'>-	rvalue = c ? mgt_set_request(priv, DOT11_OID_CHANNEL, 0, &amp;c) : -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* Call commit handler */</div><div class='del'>-	return (rvalue ? rvalue : -EINPROGRESS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_get_freq(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		 struct iw_freq *fwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-	int rvalue;</div><div class='del'>-</div><div class='del'>-	rvalue = mgt_get_request(priv, DOT11_OID_CHANNEL, 0, NULL, &amp;r);</div><div class='del'>-	fwrq-&gt;i = r.u;</div><div class='del'>-	rvalue |= mgt_get_request(priv, DOT11_OID_FREQUENCY, 0, NULL, &amp;r);</div><div class='del'>-	fwrq-&gt;m = r.u;</div><div class='del'>-	fwrq-&gt;e = 3;</div><div class='del'>-</div><div class='del'>-	return rvalue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_set_mode(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		 __u32 * uwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	u32 mlmeautolevel = CARD_DEFAULT_MLME_MODE;</div><div class='del'>-</div><div class='del'>-	/* Let's see if the user passed a valid Linux Wireless mode */</div><div class='del'>-	if (*uwrq &gt; IW_MODE_MONITOR || *uwrq &lt; IW_MODE_AUTO) {</div><div class='del'>-		printk(KERN_DEBUG</div><div class='del'>-		       "%s: %s() You passed a non-valid init_mode.\n",</div><div class='del'>-		       priv-&gt;ndev-&gt;name, __func__);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	down_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-</div><div class='del'>-	if (prism54_mib_mode_helper(priv, *uwrq)) {</div><div class='del'>-		up_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* the ACL code needs an intermediate mlmeautolevel. The wpa stuff an</div><div class='del'>-	 * extended one.</div><div class='del'>-	 */</div><div class='del'>-	if ((*uwrq == IW_MODE_MASTER) &amp;&amp; (priv-&gt;acl.policy != MAC_POLICY_OPEN))</div><div class='del'>-		mlmeautolevel = DOT11_MLME_INTERMEDIATE;</div><div class='del'>-	if (priv-&gt;wpa)</div><div class='del'>-		mlmeautolevel = DOT11_MLME_EXTENDED;</div><div class='del'>-</div><div class='del'>-	mgt_set(priv, DOT11_OID_MLMEAUTOLEVEL, &amp;mlmeautolevel);</div><div class='del'>-</div><div class='del'>-	if (mgt_commit(priv)) {</div><div class='del'>-		up_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	priv-&gt;ndev-&gt;type = (priv-&gt;iw_mode == IW_MODE_MONITOR)</div><div class='del'>-	    ? priv-&gt;monitor_type : ARPHRD_ETHER;</div><div class='del'>-	up_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Use mib cache */</div><div class='del'>-static int</div><div class='del'>-prism54_get_mode(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		 __u32 * uwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-</div><div class='del'>-	BUG_ON((priv-&gt;iw_mode &lt; IW_MODE_AUTO) || (priv-&gt;iw_mode &gt;</div><div class='del'>-						  IW_MODE_MONITOR));</div><div class='del'>-	*uwrq = priv-&gt;iw_mode;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* we use DOT11_OID_EDTHRESHOLD. From what I guess the card will not try to</div><div class='del'>- * emit data if (sensitivity &gt; rssi - noise) (in dBm).</div><div class='del'>- * prism54_set_sens does not seem to work.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_set_sens(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		 struct iw_param *vwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	u32 sens;</div><div class='del'>-</div><div class='del'>-	/* by default  the card sets this to 20. */</div><div class='del'>-	sens = vwrq-&gt;disabled ? 20 : vwrq-&gt;value;</div><div class='del'>-</div><div class='del'>-	return mgt_set_request(priv, DOT11_OID_EDTHRESHOLD, 0, &amp;sens);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_get_sens(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		 struct iw_param *vwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-	int rvalue;</div><div class='del'>-</div><div class='del'>-	rvalue = mgt_get_request(priv, DOT11_OID_EDTHRESHOLD, 0, NULL, &amp;r);</div><div class='del'>-</div><div class='del'>-	vwrq-&gt;value = r.u;</div><div class='del'>-	vwrq-&gt;disabled = (vwrq-&gt;value == 0);</div><div class='del'>-	vwrq-&gt;fixed = 1;</div><div class='del'>-</div><div class='del'>-	return rvalue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_get_range(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		  struct iw_point *dwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct iw_range *range = (struct iw_range *) extra;</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	u8 *data;</div><div class='del'>-	int i, m, rvalue;</div><div class='del'>-	struct obj_frequencies *freq;</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-</div><div class='del'>-	memset(range, 0, sizeof (struct iw_range));</div><div class='del'>-	dwrq-&gt;length = sizeof (struct iw_range);</div><div class='del'>-</div><div class='del'>-	/* set the wireless extension version number */</div><div class='del'>-	range-&gt;we_version_source = SUPPORTED_WIRELESS_EXT;</div><div class='del'>-	range-&gt;we_version_compiled = WIRELESS_EXT;</div><div class='del'>-</div><div class='del'>-	/* Now the encoding capabilities */</div><div class='del'>-	range-&gt;num_encoding_sizes = 3;</div><div class='del'>-	/* 64(40) bits WEP */</div><div class='del'>-	range-&gt;encoding_size[0] = 5;</div><div class='del'>-	/* 128(104) bits WEP */</div><div class='del'>-	range-&gt;encoding_size[1] = 13;</div><div class='del'>-	/* 256 bits for WPA-PSK */</div><div class='del'>-	range-&gt;encoding_size[2] = 32;</div><div class='del'>-	/* 4 keys are allowed */</div><div class='del'>-	range-&gt;max_encoding_tokens = 4;</div><div class='del'>-</div><div class='del'>-	/* we don't know the quality range... */</div><div class='del'>-	range-&gt;max_qual.level = 0;</div><div class='del'>-	range-&gt;max_qual.noise = 0;</div><div class='del'>-	range-&gt;max_qual.qual = 0;</div><div class='del'>-	/* these value describe an average quality. Needs more tweaking... */</div><div class='del'>-	range-&gt;avg_qual.level = -80;	/* -80 dBm */</div><div class='del'>-	range-&gt;avg_qual.noise = 0;	/* don't know what to put here */</div><div class='del'>-	range-&gt;avg_qual.qual = 0;</div><div class='del'>-</div><div class='del'>-	range-&gt;sensitivity = 200;</div><div class='del'>-</div><div class='del'>-	/* retry limit capabilities */</div><div class='del'>-	range-&gt;retry_capa = IW_RETRY_LIMIT | IW_RETRY_LIFETIME;</div><div class='del'>-	range-&gt;retry_flags = IW_RETRY_LIMIT;</div><div class='del'>-	range-&gt;r_time_flags = IW_RETRY_LIFETIME;</div><div class='del'>-</div><div class='del'>-	/* I don't know the range. Put stupid things here */</div><div class='del'>-	range-&gt;min_retry = 1;</div><div class='del'>-	range-&gt;max_retry = 65535;</div><div class='del'>-	range-&gt;min_r_time = 1024;</div><div class='del'>-	range-&gt;max_r_time = 65535 * 1024;</div><div class='del'>-</div><div class='del'>-	/* txpower is supported in dBm's */</div><div class='del'>-	range-&gt;txpower_capa = IW_TXPOW_DBM;</div><div class='del'>-</div><div class='del'>-	/* Event capability (kernel + driver) */</div><div class='del'>-	range-&gt;event_capa[0] = (IW_EVENT_CAPA_K_0 |</div><div class='del'>-	IW_EVENT_CAPA_MASK(SIOCGIWTHRSPY) |</div><div class='del'>-	IW_EVENT_CAPA_MASK(SIOCGIWAP));</div><div class='del'>-	range-&gt;event_capa[1] = IW_EVENT_CAPA_K_1;</div><div class='del'>-	range-&gt;event_capa[4] = IW_EVENT_CAPA_MASK(IWEVCUSTOM);</div><div class='del'>-</div><div class='del'>-	range-&gt;enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 |</div><div class='del'>-		IW_ENC_CAPA_CIPHER_TKIP;</div><div class='del'>-</div><div class='del'>-	if (islpci_get_state(priv) &lt; PRV_STATE_INIT)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Request the device for the supported frequencies</div><div class='del'>-	 * not really relevant since some devices will report the 5 GHz band</div><div class='del'>-	 * frequencies even if they don't support them.</div><div class='del'>-	 */</div><div class='del'>-	rvalue =</div><div class='del'>-	    mgt_get_request(priv, DOT11_OID_SUPPORTEDFREQUENCIES, 0, NULL, &amp;r);</div><div class='del'>-	freq = r.ptr;</div><div class='del'>-</div><div class='del'>-	range-&gt;num_channels = freq-&gt;nr;</div><div class='del'>-	range-&gt;num_frequency = freq-&gt;nr;</div><div class='del'>-</div><div class='del'>-	m = min(IW_MAX_FREQUENCIES, (int) freq-&gt;nr);</div><div class='del'>-	for (i = 0; i &lt; m; i++) {</div><div class='del'>-		range-&gt;freq[i].m = freq-&gt;mhz[i];</div><div class='del'>-		range-&gt;freq[i].e = 6;</div><div class='del'>-		range-&gt;freq[i].i = channel_of_freq(freq-&gt;mhz[i]);</div><div class='del'>-	}</div><div class='del'>-	kfree(freq);</div><div class='del'>-</div><div class='del'>-	rvalue |= mgt_get_request(priv, DOT11_OID_SUPPORTEDRATES, 0, NULL, &amp;r);</div><div class='del'>-	data = r.ptr;</div><div class='del'>-</div><div class='del'>-	/* We got an array of char. It is NULL terminated. */</div><div class='del'>-	i = 0;</div><div class='del'>-	while ((i &lt; IW_MAX_BITRATES) &amp;&amp; (*data != 0)) {</div><div class='del'>-		/*       the result must be in bps. The card gives us 500Kbps */</div><div class='del'>-		range-&gt;bitrate[i] = *data * 500000;</div><div class='del'>-		i++;</div><div class='del'>-		data++;</div><div class='del'>-	}</div><div class='del'>-	range-&gt;num_bitrates = i;</div><div class='del'>-	kfree(r.ptr);</div><div class='del'>-</div><div class='del'>-	return rvalue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Set AP address*/</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_set_wap(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		struct sockaddr *awrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	char bssid[6];</div><div class='del'>-	int rvalue;</div><div class='del'>-</div><div class='del'>-	if (awrq-&gt;sa_family != ARPHRD_ETHER)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* prepare the structure for the set object */</div><div class='del'>-	memcpy(&amp;bssid[0], awrq-&gt;sa_data, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	/* set the bssid -- does this make sense when in AP mode? */</div><div class='del'>-	rvalue = mgt_set_request(priv, DOT11_OID_BSSID, 0, &amp;bssid);</div><div class='del'>-</div><div class='del'>-	return (rvalue ? rvalue : -EINPROGRESS);	/* Call commit handler */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* get AP address*/</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_get_wap(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		struct sockaddr *awrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-	int rvalue;</div><div class='del'>-</div><div class='del'>-	rvalue = mgt_get_request(priv, DOT11_OID_BSSID, 0, NULL, &amp;r);</div><div class='del'>-	memcpy(awrq-&gt;sa_data, r.ptr, ETH_ALEN);</div><div class='del'>-	awrq-&gt;sa_family = ARPHRD_ETHER;</div><div class='del'>-	kfree(r.ptr);</div><div class='del'>-</div><div class='del'>-	return rvalue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_set_scan(struct net_device *dev, struct iw_request_info *info,</div><div class='del'>-		 struct iw_param *vwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	/* hehe the device does this automagicaly */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* a little helper that will translate our data into a card independent</div><div class='del'>- * format that the Wireless Tools will understand. This was inspired by</div><div class='del'>- * the "Aironet driver for 4500 and 4800 series cards" (GPL)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-prism54_translate_bss(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		      char *current_ev, char *end_buf, struct obj_bss *bss,</div><div class='del'>-		      char noise)</div><div class='del'>-{</div><div class='del'>-	struct iw_event iwe;	/* Temporary buffer */</div><div class='del'>-	short cap;</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	u8 wpa_ie[MAX_WPA_IE_LEN];</div><div class='del'>-	size_t wpa_ie_len;</div><div class='del'>-</div><div class='del'>-	/* The first entry must be the MAC address */</div><div class='del'>-	memcpy(iwe.u.ap_addr.sa_data, bss-&gt;address, ETH_ALEN);</div><div class='del'>-	iwe.u.ap_addr.sa_family = ARPHRD_ETHER;</div><div class='del'>-	iwe.cmd = SIOCGIWAP;</div><div class='del'>-	current_ev = iwe_stream_add_event(info, current_ev, end_buf,</div><div class='del'>-					  &amp;iwe, IW_EV_ADDR_LEN);</div><div class='del'>-</div><div class='del'>-	/* The following entries will be displayed in the same order we give them */</div><div class='del'>-</div><div class='del'>-	/* The ESSID. */</div><div class='del'>-	iwe.u.data.length = bss-&gt;ssid.length;</div><div class='del'>-	iwe.u.data.flags = 1;</div><div class='del'>-	iwe.cmd = SIOCGIWESSID;</div><div class='del'>-	current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='del'>-					  &amp;iwe, bss-&gt;ssid.octets);</div><div class='del'>-</div><div class='del'>-	/* Capabilities */</div><div class='del'>-#define CAP_ESS 0x01</div><div class='del'>-#define CAP_IBSS 0x02</div><div class='del'>-#define CAP_CRYPT 0x10</div><div class='del'>-</div><div class='del'>-	/* Mode */</div><div class='del'>-	cap = bss-&gt;capinfo;</div><div class='del'>-	iwe.u.mode = 0;</div><div class='del'>-	if (cap &amp; CAP_ESS)</div><div class='del'>-		iwe.u.mode = IW_MODE_MASTER;</div><div class='del'>-	else if (cap &amp; CAP_IBSS)</div><div class='del'>-		iwe.u.mode = IW_MODE_ADHOC;</div><div class='del'>-	iwe.cmd = SIOCGIWMODE;</div><div class='del'>-	if (iwe.u.mode)</div><div class='del'>-		current_ev = iwe_stream_add_event(info, current_ev, end_buf,</div><div class='del'>-						  &amp;iwe, IW_EV_UINT_LEN);</div><div class='del'>-</div><div class='del'>-	/* Encryption capability */</div><div class='del'>-	if (cap &amp; CAP_CRYPT)</div><div class='del'>-		iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;</div><div class='del'>-	else</div><div class='del'>-		iwe.u.data.flags = IW_ENCODE_DISABLED;</div><div class='del'>-	iwe.u.data.length = 0;</div><div class='del'>-	iwe.cmd = SIOCGIWENCODE;</div><div class='del'>-	current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='del'>-					  &amp;iwe, NULL);</div><div class='del'>-</div><div class='del'>-	/* Add frequency. (short) bss-&gt;channel is the frequency in MHz */</div><div class='del'>-	iwe.u.freq.m = bss-&gt;channel;</div><div class='del'>-	iwe.u.freq.e = 6;</div><div class='del'>-	iwe.cmd = SIOCGIWFREQ;</div><div class='del'>-	current_ev = iwe_stream_add_event(info, current_ev, end_buf,</div><div class='del'>-					  &amp;iwe, IW_EV_FREQ_LEN);</div><div class='del'>-</div><div class='del'>-	/* Add quality statistics */</div><div class='del'>-	iwe.u.qual.level = bss-&gt;rssi;</div><div class='del'>-	iwe.u.qual.noise = noise;</div><div class='del'>-	/* do a simple SNR for quality */</div><div class='del'>-	iwe.u.qual.qual = bss-&gt;rssi - noise;</div><div class='del'>-	iwe.cmd = IWEVQUAL;</div><div class='del'>-	current_ev = iwe_stream_add_event(info, current_ev, end_buf,</div><div class='del'>-					  &amp;iwe, IW_EV_QUAL_LEN);</div><div class='del'>-</div><div class='del'>-	/* Add WPA/RSN Information Element, if any */</div><div class='del'>-	wpa_ie_len = prism54_wpa_bss_ie_get(priv, bss-&gt;address, wpa_ie);</div><div class='del'>-	if (wpa_ie_len &gt; 0) {</div><div class='del'>-		iwe.cmd = IWEVGENIE;</div><div class='del'>-		iwe.u.data.length = min_t(size_t, wpa_ie_len, MAX_WPA_IE_LEN);</div><div class='del'>-		current_ev = iwe_stream_add_point(info, current_ev, end_buf,</div><div class='del'>-						  &amp;iwe, wpa_ie);</div><div class='del'>-	}</div><div class='del'>-	/* Do the bitrates */</div><div class='del'>-	{</div><div class='del'>-		char *current_val = current_ev + iwe_stream_lcp_len(info);</div><div class='del'>-		int i;</div><div class='del'>-		int mask;</div><div class='del'>-</div><div class='del'>-		iwe.cmd = SIOCGIWRATE;</div><div class='del'>-		/* Those two flags are ignored... */</div><div class='del'>-		iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;</div><div class='del'>-</div><div class='del'>-		/* Parse the bitmask */</div><div class='del'>-		mask = 0x1;</div><div class='del'>-		for(i = 0; i &lt; sizeof(scan_rate_list); i++) {</div><div class='del'>-			if(bss-&gt;rates &amp; mask) {</div><div class='del'>-				iwe.u.bitrate.value = (scan_rate_list[i] * 500000);</div><div class='del'>-				current_val = iwe_stream_add_value(</div><div class='del'>-					info, current_ev, current_val,</div><div class='del'>-					end_buf, &amp;iwe, IW_EV_PARAM_LEN);</div><div class='del'>-			}</div><div class='del'>-			mask &lt;&lt;= 1;</div><div class='del'>-		}</div><div class='del'>-		/* Check if we added any event */</div><div class='del'>-		if ((current_val - current_ev) &gt; iwe_stream_lcp_len(info))</div><div class='del'>-			current_ev = current_val;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return current_ev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_get_scan(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		 struct iw_point *dwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	int i, rvalue;</div><div class='del'>-	struct obj_bsslist *bsslist;</div><div class='del'>-	u32 noise = 0;</div><div class='del'>-	char *current_ev = extra;</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-</div><div class='del'>-	if (islpci_get_state(priv) &lt; PRV_STATE_INIT) {</div><div class='del'>-		/* device is not ready, fail gently */</div><div class='del'>-		dwrq-&gt;length = 0;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* first get the noise value. We will use it to report the link quality */</div><div class='del'>-	rvalue = mgt_get_request(priv, DOT11_OID_NOISEFLOOR, 0, NULL, &amp;r);</div><div class='del'>-	noise = r.u;</div><div class='del'>-</div><div class='del'>-	/* Ask the device for a list of known bss.</div><div class='del'>-	* The old API, using SIOCGIWAPLIST, had a hard limit of IW_MAX_AP=64.</div><div class='del'>-	* The new API, using SIOCGIWSCAN, is only limited by the buffer size.</div><div class='del'>-	* WE-14-&gt;WE-16, the buffer is limited to IW_SCAN_MAX_DATA bytes.</div><div class='del'>-	* Starting with WE-17, the buffer can be as big as needed.</div><div class='del'>-	* But the device won't repport anything if you change the value</div><div class='del'>-	* of IWMAX_BSS=24. */</div><div class='del'>-</div><div class='del'>-	rvalue |= mgt_get_request(priv, DOT11_OID_BSSLIST, 0, NULL, &amp;r);</div><div class='del'>-	bsslist = r.ptr;</div><div class='del'>-</div><div class='del'>-	/* ok now, scan the list and translate its info */</div><div class='del'>-	for (i = 0; i &lt; (int) bsslist-&gt;nr; i++) {</div><div class='del'>-		current_ev = prism54_translate_bss(ndev, info, current_ev,</div><div class='del'>-						   extra + dwrq-&gt;length,</div><div class='del'>-						   &amp;(bsslist-&gt;bsslist[i]),</div><div class='del'>-						   noise);</div><div class='del'>-</div><div class='del'>-		/* Check if there is space for one more entry */</div><div class='del'>-		if((extra + dwrq-&gt;length - current_ev) &lt;= IW_EV_ADDR_LEN) {</div><div class='del'>-			/* Ask user space to try again with a bigger buffer */</div><div class='del'>-			rvalue = -E2BIG;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(bsslist);</div><div class='del'>-	dwrq-&gt;length = (current_ev - extra);</div><div class='del'>-	dwrq-&gt;flags = 0;	/* todo */</div><div class='del'>-</div><div class='del'>-	return rvalue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_set_essid(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		  struct iw_point *dwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	struct obj_ssid essid;</div><div class='del'>-</div><div class='del'>-	memset(essid.octets, 0, 33);</div><div class='del'>-</div><div class='del'>-	/* Check if we were asked for `any' */</div><div class='del'>-	if (dwrq-&gt;flags &amp;&amp; dwrq-&gt;length) {</div><div class='del'>-		if (dwrq-&gt;length &gt; 32)</div><div class='del'>-			return -E2BIG;</div><div class='del'>-		essid.length = dwrq-&gt;length;</div><div class='del'>-		memcpy(essid.octets, extra, dwrq-&gt;length);</div><div class='del'>-	} else</div><div class='del'>-		essid.length = 0;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;iw_mode != IW_MODE_MONITOR)</div><div class='del'>-		return mgt_set_request(priv, DOT11_OID_SSID, 0, &amp;essid);</div><div class='del'>-</div><div class='del'>-	/* If in monitor mode, just save to mib */</div><div class='del'>-	mgt_set(priv, DOT11_OID_SSID, &amp;essid);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_get_essid(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		  struct iw_point *dwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	struct obj_ssid *essid;</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-	int rvalue;</div><div class='del'>-</div><div class='del'>-	rvalue = mgt_get_request(priv, DOT11_OID_SSID, 0, NULL, &amp;r);</div><div class='del'>-	essid = r.ptr;</div><div class='del'>-</div><div class='del'>-	if (essid-&gt;length) {</div><div class='del'>-		dwrq-&gt;flags = 1;	/* set ESSID to ON for Wireless Extensions */</div><div class='del'>-		/* if it is too big, trunk it */</div><div class='del'>-		dwrq-&gt;length = min((u8)IW_ESSID_MAX_SIZE, essid-&gt;length);</div><div class='del'>-	} else {</div><div class='del'>-		dwrq-&gt;flags = 0;</div><div class='del'>-		dwrq-&gt;length = 0;</div><div class='del'>-	}</div><div class='del'>-	essid-&gt;octets[dwrq-&gt;length] = '\0';</div><div class='del'>-	memcpy(extra, essid-&gt;octets, dwrq-&gt;length);</div><div class='del'>-	kfree(essid);</div><div class='del'>-</div><div class='del'>-	return rvalue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Provides no functionality, just completes the ioctl. In essence this is a</div><div class='del'>- * just a cosmetic ioctl.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-prism54_set_nick(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		 struct iw_point *dwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-</div><div class='del'>-	if (dwrq-&gt;length &gt; IW_ESSID_MAX_SIZE)</div><div class='del'>-		return -E2BIG;</div><div class='del'>-</div><div class='del'>-	down_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-	memset(priv-&gt;nickname, 0, sizeof (priv-&gt;nickname));</div><div class='del'>-	memcpy(priv-&gt;nickname, extra, dwrq-&gt;length);</div><div class='del'>-	up_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_get_nick(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		 struct iw_point *dwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-</div><div class='del'>-	dwrq-&gt;length = 0;</div><div class='del'>-</div><div class='del'>-	down_read(&amp;priv-&gt;mib_sem);</div><div class='del'>-	dwrq-&gt;length = strlen(priv-&gt;nickname);</div><div class='del'>-	memcpy(extra, priv-&gt;nickname, dwrq-&gt;length);</div><div class='del'>-	up_read(&amp;priv-&gt;mib_sem);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Set the allowed Bitrates */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_set_rate(struct net_device *ndev,</div><div class='del'>-		 struct iw_request_info *info,</div><div class='del'>-		 struct iw_param *vwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	u32 rate, profile;</div><div class='del'>-	char *data;</div><div class='del'>-	int ret, i;</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-</div><div class='del'>-	if (vwrq-&gt;value == -1) {</div><div class='del'>-		/* auto mode. No limit. */</div><div class='del'>-		profile = 1;</div><div class='del'>-		return mgt_set_request(priv, DOT11_OID_PROFILES, 0, &amp;profile);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = mgt_get_request(priv, DOT11_OID_SUPPORTEDRATES, 0, NULL, &amp;r);</div><div class='del'>-	if (ret) {</div><div class='del'>-		kfree(r.ptr);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rate = (u32) (vwrq-&gt;value / 500000);</div><div class='del'>-	data = r.ptr;</div><div class='del'>-	i = 0;</div><div class='del'>-</div><div class='del'>-	while (data[i]) {</div><div class='del'>-		if (rate &amp;&amp; (data[i] == rate)) {</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (vwrq-&gt;value == i) {</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		data[i] |= 0x80;</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!data[i]) {</div><div class='del'>-		kfree(r.ptr);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	data[i] |= 0x80;</div><div class='del'>-	data[i + 1] = 0;</div><div class='del'>-</div><div class='del'>-	/* Now, check if we want a fixed or auto value */</div><div class='del'>-	if (vwrq-&gt;fixed) {</div><div class='del'>-		data[0] = data[i];</div><div class='del'>-		data[1] = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-	i = 0;</div><div class='del'>-	printk("prism54 rate: ");</div><div class='del'>-	while(data[i]) {</div><div class='del'>-		printk("%u ", data[i]);</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-	printk("0\n");</div><div class='del'>-*/</div><div class='del'>-	profile = -1;</div><div class='del'>-	ret = mgt_set_request(priv, DOT11_OID_PROFILES, 0, &amp;profile);</div><div class='del'>-	ret |= mgt_set_request(priv, DOT11_OID_EXTENDEDRATES, 0, data);</div><div class='del'>-	ret |= mgt_set_request(priv, DOT11_OID_RATES, 0, data);</div><div class='del'>-</div><div class='del'>-	kfree(r.ptr);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get the current bit rate */</div><div class='del'>-static int</div><div class='del'>-prism54_get_rate(struct net_device *ndev,</div><div class='del'>-		 struct iw_request_info *info,</div><div class='del'>-		 struct iw_param *vwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	int rvalue;</div><div class='del'>-	char *data;</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-</div><div class='del'>-	/* Get the current bit rate */</div><div class='del'>-	if ((rvalue = mgt_get_request(priv, GEN_OID_LINKSTATE, 0, NULL, &amp;r)))</div><div class='del'>-		return rvalue;</div><div class='del'>-	vwrq-&gt;value = r.u * 500000;</div><div class='del'>-</div><div class='del'>-	/* request the device for the enabled rates */</div><div class='del'>-	rvalue = mgt_get_request(priv, DOT11_OID_RATES, 0, NULL, &amp;r);</div><div class='del'>-	if (rvalue) {</div><div class='del'>-		kfree(r.ptr);</div><div class='del'>-		return rvalue;</div><div class='del'>-	}</div><div class='del'>-	data = r.ptr;</div><div class='del'>-	vwrq-&gt;fixed = (data[0] != 0) &amp;&amp; (data[1] == 0);</div><div class='del'>-	kfree(r.ptr);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_set_rts(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		struct iw_param *vwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-</div><div class='del'>-	return mgt_set_request(priv, DOT11_OID_RTSTHRESH, 0, &amp;vwrq-&gt;value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_get_rts(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		struct iw_param *vwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-	int rvalue;</div><div class='del'>-</div><div class='del'>-	/* get the rts threshold */</div><div class='del'>-	rvalue = mgt_get_request(priv, DOT11_OID_RTSTHRESH, 0, NULL, &amp;r);</div><div class='del'>-	vwrq-&gt;value = r.u;</div><div class='del'>-</div><div class='del'>-	return rvalue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_set_frag(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		 struct iw_param *vwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-</div><div class='del'>-	return mgt_set_request(priv, DOT11_OID_FRAGTHRESH, 0, &amp;vwrq-&gt;value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_get_frag(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		 struct iw_param *vwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-	int rvalue;</div><div class='del'>-</div><div class='del'>-	rvalue = mgt_get_request(priv, DOT11_OID_FRAGTHRESH, 0, NULL, &amp;r);</div><div class='del'>-	vwrq-&gt;value = r.u;</div><div class='del'>-</div><div class='del'>-	return rvalue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Here we have (min,max) = max retries for (small frames, big frames). Where</div><div class='del'>- * big frame &lt;=&gt;  bigger than the rts threshold</div><div class='del'>- * small frame &lt;=&gt;  smaller than the rts threshold</div><div class='del'>- * This is not really the behavior expected by the wireless tool but it seems</div><div class='del'>- * to be a common behavior in other drivers.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_set_retry(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		  struct iw_param *vwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	u32 slimit = 0, llimit = 0;	/* short and long limit */</div><div class='del'>-	u32 lifetime = 0;</div><div class='del'>-	int rvalue = 0;</div><div class='del'>-</div><div class='del'>-	if (vwrq-&gt;disabled)</div><div class='del'>-		/* we cannot disable this feature */</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (vwrq-&gt;flags &amp; IW_RETRY_LIMIT) {</div><div class='del'>-		if (vwrq-&gt;flags &amp; IW_RETRY_SHORT)</div><div class='del'>-			slimit = vwrq-&gt;value;</div><div class='del'>-		else if (vwrq-&gt;flags &amp; IW_RETRY_LONG)</div><div class='del'>-			llimit = vwrq-&gt;value;</div><div class='del'>-		else {</div><div class='del'>-			/* we are asked to set both */</div><div class='del'>-			slimit = vwrq-&gt;value;</div><div class='del'>-			llimit = vwrq-&gt;value;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (vwrq-&gt;flags &amp; IW_RETRY_LIFETIME)</div><div class='del'>-		/* Wireless tools use us unit while the device uses 1024 us unit */</div><div class='del'>-		lifetime = vwrq-&gt;value / 1024;</div><div class='del'>-</div><div class='del'>-	/* now set what is requested */</div><div class='del'>-	if (slimit)</div><div class='del'>-		rvalue =</div><div class='del'>-		    mgt_set_request(priv, DOT11_OID_SHORTRETRIES, 0, &amp;slimit);</div><div class='del'>-	if (llimit)</div><div class='del'>-		rvalue |=</div><div class='del'>-		    mgt_set_request(priv, DOT11_OID_LONGRETRIES, 0, &amp;llimit);</div><div class='del'>-	if (lifetime)</div><div class='del'>-		rvalue |=</div><div class='del'>-		    mgt_set_request(priv, DOT11_OID_MAXTXLIFETIME, 0,</div><div class='del'>-				    &amp;lifetime);</div><div class='del'>-	return rvalue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_get_retry(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		  struct iw_param *vwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-	int rvalue = 0;</div><div class='del'>-	vwrq-&gt;disabled = 0;	/* It cannot be disabled */</div><div class='del'>-</div><div class='del'>-	if ((vwrq-&gt;flags &amp; IW_RETRY_TYPE) == IW_RETRY_LIFETIME) {</div><div class='del'>-		/* we are asked for the life time */</div><div class='del'>-		rvalue =</div><div class='del'>-		    mgt_get_request(priv, DOT11_OID_MAXTXLIFETIME, 0, NULL, &amp;r);</div><div class='del'>-		vwrq-&gt;value = r.u * 1024;</div><div class='del'>-		vwrq-&gt;flags = IW_RETRY_LIFETIME;</div><div class='del'>-	} else if ((vwrq-&gt;flags &amp; IW_RETRY_LONG)) {</div><div class='del'>-		/* we are asked for the long retry limit */</div><div class='del'>-		rvalue |=</div><div class='del'>-		    mgt_get_request(priv, DOT11_OID_LONGRETRIES, 0, NULL, &amp;r);</div><div class='del'>-		vwrq-&gt;value = r.u;</div><div class='del'>-		vwrq-&gt;flags = IW_RETRY_LIMIT | IW_RETRY_LONG;</div><div class='del'>-	} else {</div><div class='del'>-		/* default. get the  short retry limit */</div><div class='del'>-		rvalue |=</div><div class='del'>-		    mgt_get_request(priv, DOT11_OID_SHORTRETRIES, 0, NULL, &amp;r);</div><div class='del'>-		vwrq-&gt;value = r.u;</div><div class='del'>-		vwrq-&gt;flags = IW_RETRY_LIMIT | IW_RETRY_SHORT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rvalue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_set_encode(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		   struct iw_point *dwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	int rvalue = 0, force = 0;</div><div class='del'>-	int authen = DOT11_AUTH_OS, invoke = 0, exunencrypt = 0;</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-</div><div class='del'>-	/* with the new API, it's impossible to get a NULL pointer.</div><div class='del'>-	 * New version of iwconfig set the IW_ENCODE_NOKEY flag</div><div class='del'>-	 * when no key is given, but older versions don't. */</div><div class='del'>-</div><div class='del'>-	if (dwrq-&gt;length &gt; 0) {</div><div class='del'>-		/* we have a key to set */</div><div class='del'>-		int index = (dwrq-&gt;flags &amp; IW_ENCODE_INDEX) - 1;</div><div class='del'>-		int current_index;</div><div class='del'>-		struct obj_key key = { DOT11_PRIV_WEP, 0, "" };</div><div class='del'>-</div><div class='del'>-		/* get the current key index */</div><div class='del'>-		rvalue = mgt_get_request(priv, DOT11_OID_DEFKEYID, 0, NULL, &amp;r);</div><div class='del'>-		current_index = r.u;</div><div class='del'>-		/* Verify that the key is not marked as invalid */</div><div class='del'>-		if (!(dwrq-&gt;flags &amp; IW_ENCODE_NOKEY)) {</div><div class='del'>-			if (dwrq-&gt;length &gt; KEY_SIZE_TKIP) {</div><div class='del'>-				/* User-provided key data too big */</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			if (dwrq-&gt;length &gt; KEY_SIZE_WEP104) {</div><div class='del'>-				/* WPA-PSK TKIP */</div><div class='del'>-				key.type = DOT11_PRIV_TKIP;</div><div class='del'>-				key.length = KEY_SIZE_TKIP;</div><div class='del'>-			} else if (dwrq-&gt;length &gt; KEY_SIZE_WEP40) {</div><div class='del'>-				/* WEP 104/128 */</div><div class='del'>-				key.length = KEY_SIZE_WEP104;</div><div class='del'>-			} else {</div><div class='del'>-				/* WEP 40/64 */</div><div class='del'>-				key.length = KEY_SIZE_WEP40;</div><div class='del'>-			}</div><div class='del'>-			memset(key.key, 0, sizeof (key.key));</div><div class='del'>-			memcpy(key.key, extra, dwrq-&gt;length);</div><div class='del'>-</div><div class='del'>-			if ((index &lt; 0) || (index &gt; 3))</div><div class='del'>-				/* no index provided use the current one */</div><div class='del'>-				index = current_index;</div><div class='del'>-</div><div class='del'>-			/* now send the key to the card  */</div><div class='del'>-			rvalue |=</div><div class='del'>-			    mgt_set_request(priv, DOT11_OID_DEFKEYX, index,</div><div class='del'>-					    &amp;key);</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * If a valid key is set, encryption should be enabled</div><div class='del'>-		 * (user may turn it off later).</div><div class='del'>-		 * This is also how "iwconfig ethX key on" works</div><div class='del'>-		 */</div><div class='del'>-		if ((index == current_index) &amp;&amp; (key.length &gt; 0))</div><div class='del'>-			force = 1;</div><div class='del'>-	} else {</div><div class='del'>-		int index = (dwrq-&gt;flags &amp; IW_ENCODE_INDEX) - 1;</div><div class='del'>-		if ((index &gt;= 0) &amp;&amp; (index &lt;= 3)) {</div><div class='del'>-			/* we want to set the key index */</div><div class='del'>-			rvalue |=</div><div class='del'>-			    mgt_set_request(priv, DOT11_OID_DEFKEYID, 0,</div><div class='del'>-					    &amp;index);</div><div class='del'>-		} else {</div><div class='del'>-			if (!(dwrq-&gt;flags &amp; IW_ENCODE_MODE)) {</div><div class='del'>-				/* we cannot do anything. Complain. */</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* now read the flags */</div><div class='del'>-	if (dwrq-&gt;flags &amp; IW_ENCODE_DISABLED) {</div><div class='del'>-		/* Encoding disabled,</div><div class='del'>-		 * authen = DOT11_AUTH_OS;</div><div class='del'>-		 * invoke = 0;</div><div class='del'>-		 * exunencrypt = 0; */</div><div class='del'>-	}</div><div class='del'>-	if (dwrq-&gt;flags &amp; IW_ENCODE_OPEN)</div><div class='del'>-		/* Encode but accept non-encoded packets. No auth */</div><div class='del'>-		invoke = 1;</div><div class='del'>-	if ((dwrq-&gt;flags &amp; IW_ENCODE_RESTRICTED) || force) {</div><div class='del'>-		/* Refuse non-encoded packets. Auth */</div><div class='del'>-		authen = DOT11_AUTH_BOTH;</div><div class='del'>-		invoke = 1;</div><div class='del'>-		exunencrypt = 1;</div><div class='del'>-	}</div><div class='del'>-	/* do the change if requested  */</div><div class='del'>-	if ((dwrq-&gt;flags &amp; IW_ENCODE_MODE) || force) {</div><div class='del'>-		rvalue |=</div><div class='del'>-		    mgt_set_request(priv, DOT11_OID_AUTHENABLE, 0, &amp;authen);</div><div class='del'>-		rvalue |=</div><div class='del'>-		    mgt_set_request(priv, DOT11_OID_PRIVACYINVOKED, 0, &amp;invoke);</div><div class='del'>-		rvalue |=</div><div class='del'>-		    mgt_set_request(priv, DOT11_OID_EXUNENCRYPTED, 0,</div><div class='del'>-				    &amp;exunencrypt);</div><div class='del'>-	}</div><div class='del'>-	return rvalue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_get_encode(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		   struct iw_point *dwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	struct obj_key *key;</div><div class='del'>-	u32 devindex, index = (dwrq-&gt;flags &amp; IW_ENCODE_INDEX) - 1;</div><div class='del'>-	u32 authen = 0, invoke = 0, exunencrypt = 0;</div><div class='del'>-	int rvalue;</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-</div><div class='del'>-	/* first get the flags */</div><div class='del'>-	rvalue = mgt_get_request(priv, DOT11_OID_AUTHENABLE, 0, NULL, &amp;r);</div><div class='del'>-	authen = r.u;</div><div class='del'>-	rvalue |= mgt_get_request(priv, DOT11_OID_PRIVACYINVOKED, 0, NULL, &amp;r);</div><div class='del'>-	invoke = r.u;</div><div class='del'>-	rvalue |= mgt_get_request(priv, DOT11_OID_EXUNENCRYPTED, 0, NULL, &amp;r);</div><div class='del'>-	exunencrypt = r.u;</div><div class='del'>-</div><div class='del'>-	if (invoke &amp;&amp; (authen == DOT11_AUTH_BOTH) &amp;&amp; exunencrypt)</div><div class='del'>-		dwrq-&gt;flags = IW_ENCODE_RESTRICTED;</div><div class='del'>-	else if ((authen == DOT11_AUTH_OS) &amp;&amp; !exunencrypt) {</div><div class='del'>-		if (invoke)</div><div class='del'>-			dwrq-&gt;flags = IW_ENCODE_OPEN;</div><div class='del'>-		else</div><div class='del'>-			dwrq-&gt;flags = IW_ENCODE_DISABLED;</div><div class='del'>-	} else</div><div class='del'>-		/* The card should not work in this state */</div><div class='del'>-		dwrq-&gt;flags = 0;</div><div class='del'>-</div><div class='del'>-	/* get the current device key index */</div><div class='del'>-	rvalue |= mgt_get_request(priv, DOT11_OID_DEFKEYID, 0, NULL, &amp;r);</div><div class='del'>-	devindex = r.u;</div><div class='del'>-	/* Now get the key, return it */</div><div class='del'>-	if (index == -1 || index &gt; 3)</div><div class='del'>-		/* no index provided, use the current one */</div><div class='del'>-		index = devindex;</div><div class='del'>-	rvalue |= mgt_get_request(priv, DOT11_OID_DEFKEYX, index, NULL, &amp;r);</div><div class='del'>-	key = r.ptr;</div><div class='del'>-	dwrq-&gt;length = key-&gt;length;</div><div class='del'>-	memcpy(extra, key-&gt;key, dwrq-&gt;length);</div><div class='del'>-	kfree(key);</div><div class='del'>-	/* return the used key index */</div><div class='del'>-	dwrq-&gt;flags |= devindex + 1;</div><div class='del'>-</div><div class='del'>-	return rvalue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_get_txpower(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		    struct iw_param *vwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-	int rvalue;</div><div class='del'>-</div><div class='del'>-	rvalue = mgt_get_request(priv, OID_INL_OUTPUTPOWER, 0, NULL, &amp;r);</div><div class='del'>-	/* intersil firmware operates in 0.25 dBm (1/4 dBm) */</div><div class='del'>-	vwrq-&gt;value = (s32) r.u / 4;</div><div class='del'>-	vwrq-&gt;fixed = 1;</div><div class='del'>-	/* radio is not turned of</div><div class='del'>-	 * btw: how is possible to turn off only the radio</div><div class='del'>-	 */</div><div class='del'>-	vwrq-&gt;disabled = 0;</div><div class='del'>-</div><div class='del'>-	return rvalue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_set_txpower(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		    struct iw_param *vwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	s32 u = vwrq-&gt;value;</div><div class='del'>-</div><div class='del'>-	/* intersil firmware operates in 0.25 dBm (1/4) */</div><div class='del'>-	u *= 4;</div><div class='del'>-	if (vwrq-&gt;disabled) {</div><div class='del'>-		/* don't know how to disable radio */</div><div class='del'>-		printk(KERN_DEBUG</div><div class='del'>-		       "%s: %s() disabling radio is not yet supported.\n",</div><div class='del'>-		       priv-&gt;ndev-&gt;name, __func__);</div><div class='del'>-		return -ENOTSUPP;</div><div class='del'>-	} else if (vwrq-&gt;fixed)</div><div class='del'>-		/* currently only fixed value is supported */</div><div class='del'>-		return mgt_set_request(priv, OID_INL_OUTPUTPOWER, 0, &amp;u);</div><div class='del'>-	else {</div><div class='del'>-		printk(KERN_DEBUG</div><div class='del'>-		       "%s: %s() auto power will be implemented later.\n",</div><div class='del'>-		       priv-&gt;ndev-&gt;name, __func__);</div><div class='del'>-		return -ENOTSUPP;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int prism54_set_genie(struct net_device *ndev,</div><div class='del'>-			     struct iw_request_info *info,</div><div class='del'>-			     struct iw_point *data, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	int alen, ret = 0;</div><div class='del'>-	struct obj_attachment *attach;</div><div class='del'>-</div><div class='del'>-	if (data-&gt;length &gt; MAX_WPA_IE_LEN ||</div><div class='del'>-	    (data-&gt;length &amp;&amp; extra == NULL))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	memcpy(priv-&gt;wpa_ie, extra, data-&gt;length);</div><div class='del'>-	priv-&gt;wpa_ie_len = data-&gt;length;</div><div class='del'>-</div><div class='del'>-	alen = sizeof(*attach) + priv-&gt;wpa_ie_len;</div><div class='del'>-	attach = kzalloc(alen, GFP_KERNEL);</div><div class='del'>-	if (attach == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-#define WLAN_FC_TYPE_MGMT 0</div><div class='del'>-#define WLAN_FC_STYPE_ASSOC_REQ 0</div><div class='del'>-#define WLAN_FC_STYPE_REASSOC_REQ 2</div><div class='del'>-</div><div class='del'>-	/* Note: endianness is covered by mgt_set_varlen */</div><div class='del'>-	attach-&gt;type = (WLAN_FC_TYPE_MGMT &lt;&lt; 2) |</div><div class='del'>-               (WLAN_FC_STYPE_ASSOC_REQ &lt;&lt; 4);</div><div class='del'>-	attach-&gt;id = -1;</div><div class='del'>-	attach-&gt;size = priv-&gt;wpa_ie_len;</div><div class='del'>-	memcpy(attach-&gt;data, extra, priv-&gt;wpa_ie_len);</div><div class='del'>-</div><div class='del'>-	ret = mgt_set_varlen(priv, DOT11_OID_ATTACHMENT, attach,</div><div class='del'>-		priv-&gt;wpa_ie_len);</div><div class='del'>-	if (ret == 0) {</div><div class='del'>-		attach-&gt;type = (WLAN_FC_TYPE_MGMT &lt;&lt; 2) |</div><div class='del'>-			(WLAN_FC_STYPE_REASSOC_REQ &lt;&lt; 4);</div><div class='del'>-</div><div class='del'>-		ret = mgt_set_varlen(priv, DOT11_OID_ATTACHMENT, attach,</div><div class='del'>-			priv-&gt;wpa_ie_len);</div><div class='del'>-		if (ret == 0)</div><div class='del'>-			printk(KERN_DEBUG "%s: WPA IE Attachment was set\n",</div><div class='del'>-				ndev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(attach);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism54_get_genie(struct net_device *ndev,</div><div class='del'>-			     struct iw_request_info *info,</div><div class='del'>-			     struct iw_point *data, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	int len = priv-&gt;wpa_ie_len;</div><div class='del'>-</div><div class='del'>-	if (len &lt;= 0) {</div><div class='del'>-		data-&gt;length = 0;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (data-&gt;length &lt; len)</div><div class='del'>-		return -E2BIG;</div><div class='del'>-</div><div class='del'>-	data-&gt;length = len;</div><div class='del'>-	memcpy(extra, priv-&gt;wpa_ie, len);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int prism54_set_auth(struct net_device *ndev,</div><div class='del'>-			       struct iw_request_info *info,</div><div class='del'>-			       union iwreq_data *wrqu, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	struct iw_param *param = &amp;wrqu-&gt;param;</div><div class='del'>-	u32 mlmelevel = 0, authen = 0, dot1x = 0;</div><div class='del'>-	u32 exunencrypt = 0, privinvoked = 0, wpa = 0;</div><div class='del'>-	u32 old_wpa;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-</div><div class='del'>-	if (islpci_get_state(priv) &lt; PRV_STATE_INIT)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* first get the flags */</div><div class='del'>-	down_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-	wpa = old_wpa = priv-&gt;wpa;</div><div class='del'>-	up_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-	ret = mgt_get_request(priv, DOT11_OID_AUTHENABLE, 0, NULL, &amp;r);</div><div class='del'>-	authen = r.u;</div><div class='del'>-	ret = mgt_get_request(priv, DOT11_OID_PRIVACYINVOKED, 0, NULL, &amp;r);</div><div class='del'>-	privinvoked = r.u;</div><div class='del'>-	ret = mgt_get_request(priv, DOT11_OID_EXUNENCRYPTED, 0, NULL, &amp;r);</div><div class='del'>-	exunencrypt = r.u;</div><div class='del'>-	ret = mgt_get_request(priv, DOT11_OID_DOT1XENABLE, 0, NULL, &amp;r);</div><div class='del'>-	dot1x = r.u;</div><div class='del'>-	ret = mgt_get_request(priv, DOT11_OID_MLMEAUTOLEVEL, 0, NULL, &amp;r);</div><div class='del'>-	mlmelevel = r.u;</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	switch (param-&gt;flags &amp; IW_AUTH_INDEX) {</div><div class='del'>-	case IW_AUTH_CIPHER_PAIRWISE:</div><div class='del'>-	case IW_AUTH_CIPHER_GROUP:</div><div class='del'>-	case IW_AUTH_KEY_MGMT:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_WPA_ENABLED:</div><div class='del'>-		/* Do the same thing as IW_AUTH_WPA_VERSION */</div><div class='del'>-		if (param-&gt;value) {</div><div class='del'>-			wpa = 1;</div><div class='del'>-			privinvoked = 1; /* For privacy invoked */</div><div class='del'>-			exunencrypt = 1; /* Filter out all unencrypted frames */</div><div class='del'>-			dot1x = 0x01; /* To enable eap filter */</div><div class='del'>-			mlmelevel = DOT11_MLME_EXTENDED;</div><div class='del'>-			authen = DOT11_AUTH_OS; /* Only WEP uses _SK and _BOTH */</div><div class='del'>-		} else {</div><div class='del'>-			wpa = 0;</div><div class='del'>-			privinvoked = 0;</div><div class='del'>-			exunencrypt = 0; /* Do not filter un-encrypted data */</div><div class='del'>-			dot1x = 0;</div><div class='del'>-			mlmelevel = DOT11_MLME_AUTO;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_WPA_VERSION:</div><div class='del'>-		if (param-&gt;value &amp; IW_AUTH_WPA_VERSION_DISABLED) {</div><div class='del'>-			wpa = 0;</div><div class='del'>-			privinvoked = 0;</div><div class='del'>-			exunencrypt = 0; /* Do not filter un-encrypted data */</div><div class='del'>-			dot1x = 0;</div><div class='del'>-			mlmelevel = DOT11_MLME_AUTO;</div><div class='del'>-		} else {</div><div class='del'>-			if (param-&gt;value &amp; IW_AUTH_WPA_VERSION_WPA)</div><div class='del'>-				wpa = 1;</div><div class='del'>-			else if (param-&gt;value &amp; IW_AUTH_WPA_VERSION_WPA2)</div><div class='del'>-				wpa = 2;</div><div class='del'>-			privinvoked = 1; /* For privacy invoked */</div><div class='del'>-			exunencrypt = 1; /* Filter out all unencrypted frames */</div><div class='del'>-			dot1x = 0x01; /* To enable eap filter */</div><div class='del'>-			mlmelevel = DOT11_MLME_EXTENDED;</div><div class='del'>-			authen = DOT11_AUTH_OS; /* Only WEP uses _SK and _BOTH */</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_RX_UNENCRYPTED_EAPOL:</div><div class='del'>-		/* dot1x should be the opposite of RX_UNENCRYPTED_EAPOL;</div><div class='del'>-		 * turn off dot1x when allowing receipt of unencrypted EAPOL</div><div class='del'>-		 * frames, turn on dot1x when receipt should be disallowed</div><div class='del'>-		 */</div><div class='del'>-		dot1x = param-&gt;value ? 0 : 0x01;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_PRIVACY_INVOKED:</div><div class='del'>-		privinvoked = param-&gt;value ? 1 : 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_DROP_UNENCRYPTED:</div><div class='del'>-		exunencrypt = param-&gt;value ? 1 : 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_80211_AUTH_ALG:</div><div class='del'>-		if (param-&gt;value &amp; IW_AUTH_ALG_SHARED_KEY) {</div><div class='del'>-			/* Only WEP uses _SK and _BOTH */</div><div class='del'>-			if (wpa &gt; 0) {</div><div class='del'>-				ret = -EINVAL;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			authen = DOT11_AUTH_SK;</div><div class='del'>-		} else if (param-&gt;value &amp; IW_AUTH_ALG_OPEN_SYSTEM) {</div><div class='del'>-			authen = DOT11_AUTH_OS;</div><div class='del'>-		} else {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set all the values */</div><div class='del'>-	down_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-	priv-&gt;wpa = wpa;</div><div class='del'>-	up_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-	mgt_set_request(priv, DOT11_OID_AUTHENABLE, 0, &amp;authen);</div><div class='del'>-	mgt_set_request(priv, DOT11_OID_PRIVACYINVOKED, 0, &amp;privinvoked);</div><div class='del'>-	mgt_set_request(priv, DOT11_OID_EXUNENCRYPTED, 0, &amp;exunencrypt);</div><div class='del'>-	mgt_set_request(priv, DOT11_OID_DOT1XENABLE, 0, &amp;dot1x);</div><div class='del'>-	mgt_set_request(priv, DOT11_OID_MLMEAUTOLEVEL, 0, &amp;mlmelevel);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int prism54_get_auth(struct net_device *ndev,</div><div class='del'>-			    struct iw_request_info *info,</div><div class='del'>-			    union iwreq_data *wrqu, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	struct iw_param *param = &amp;wrqu-&gt;param;</div><div class='del'>-	u32 wpa = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-</div><div class='del'>-	if (islpci_get_state(priv) &lt; PRV_STATE_INIT)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* first get the flags */</div><div class='del'>-	down_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-	wpa = priv-&gt;wpa;</div><div class='del'>-	up_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-</div><div class='del'>-	switch (param-&gt;flags &amp; IW_AUTH_INDEX) {</div><div class='del'>-	case IW_AUTH_CIPHER_PAIRWISE:</div><div class='del'>-	case IW_AUTH_CIPHER_GROUP:</div><div class='del'>-	case IW_AUTH_KEY_MGMT:</div><div class='del'>-		/*</div><div class='del'>-		 * wpa_supplicant will control these internally</div><div class='del'>-		 */</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_WPA_VERSION:</div><div class='del'>-		switch (wpa) {</div><div class='del'>-		case 1:</div><div class='del'>-			param-&gt;value = IW_AUTH_WPA_VERSION_WPA;</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			param-&gt;value = IW_AUTH_WPA_VERSION_WPA2;</div><div class='del'>-			break;</div><div class='del'>-		case 0:</div><div class='del'>-		default:</div><div class='del'>-			param-&gt;value = IW_AUTH_WPA_VERSION_DISABLED;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_DROP_UNENCRYPTED:</div><div class='del'>-		ret = mgt_get_request(priv, DOT11_OID_EXUNENCRYPTED, 0, NULL, &amp;r);</div><div class='del'>-		if (ret &gt;= 0)</div><div class='del'>-			param-&gt;value = r.u &gt; 0 ? 1 : 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_80211_AUTH_ALG:</div><div class='del'>-		ret = mgt_get_request(priv, DOT11_OID_AUTHENABLE, 0, NULL, &amp;r);</div><div class='del'>-		if (ret &gt;= 0) {</div><div class='del'>-			switch (r.u) {</div><div class='del'>-			case DOT11_AUTH_OS:</div><div class='del'>-				param-&gt;value = IW_AUTH_ALG_OPEN_SYSTEM;</div><div class='del'>-				break;</div><div class='del'>-			case DOT11_AUTH_BOTH:</div><div class='del'>-			case DOT11_AUTH_SK:</div><div class='del'>-				param-&gt;value = IW_AUTH_ALG_SHARED_KEY;</div><div class='del'>-				break;</div><div class='del'>-			case DOT11_AUTH_NONE:</div><div class='del'>-			default:</div><div class='del'>-				param-&gt;value = 0;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_WPA_ENABLED:</div><div class='del'>-		param-&gt;value = wpa &gt; 0 ? 1 : 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_RX_UNENCRYPTED_EAPOL:</div><div class='del'>-		ret = mgt_get_request(priv, DOT11_OID_DOT1XENABLE, 0, NULL, &amp;r);</div><div class='del'>-		if (ret &gt;= 0)</div><div class='del'>-			param-&gt;value = r.u &gt; 0 ? 1 : 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IW_AUTH_PRIVACY_INVOKED:</div><div class='del'>-		ret = mgt_get_request(priv, DOT11_OID_PRIVACYINVOKED, 0, NULL, &amp;r);</div><div class='del'>-		if (ret &gt;= 0)</div><div class='del'>-			param-&gt;value = r.u &gt; 0 ? 1 : 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int prism54_set_encodeext(struct net_device *ndev,</div><div class='del'>-				 struct iw_request_info *info,</div><div class='del'>-				 union iwreq_data *wrqu,</div><div class='del'>-				 char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	struct iw_point *encoding = &amp;wrqu-&gt;encoding;</div><div class='del'>-	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;</div><div class='del'>-	int idx, alg = ext-&gt;alg, set_key = 1;</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-	int authen = DOT11_AUTH_OS, invoke = 0, exunencrypt = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (islpci_get_state(priv) &lt; PRV_STATE_INIT)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Determine and validate the key index */</div><div class='del'>-	idx = (encoding-&gt;flags &amp; IW_ENCODE_INDEX) - 1;</div><div class='del'>-	if (idx) {</div><div class='del'>-		if (idx &lt; 0 || idx &gt; 3)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	} else {</div><div class='del'>-		ret = mgt_get_request(priv, DOT11_OID_DEFKEYID, 0, NULL, &amp;r);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='del'>-		idx = r.u;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (encoding-&gt;flags &amp; IW_ENCODE_DISABLED)</div><div class='del'>-		alg = IW_ENCODE_ALG_NONE;</div><div class='del'>-</div><div class='del'>-	if (ext-&gt;ext_flags &amp; IW_ENCODE_EXT_SET_TX_KEY) {</div><div class='del'>-		/* Only set transmit key index here, actual</div><div class='del'>-		 * key is set below if needed.</div><div class='del'>-		 */</div><div class='del'>-		ret = mgt_set_request(priv, DOT11_OID_DEFKEYID, 0, &amp;idx);</div><div class='del'>-		set_key = ext-&gt;key_len &gt; 0 ? 1 : 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (set_key) {</div><div class='del'>-		struct obj_key key = { DOT11_PRIV_WEP, 0, "" };</div><div class='del'>-		switch (alg) {</div><div class='del'>-		case IW_ENCODE_ALG_NONE:</div><div class='del'>-			break;</div><div class='del'>-		case IW_ENCODE_ALG_WEP:</div><div class='del'>-			if (ext-&gt;key_len &gt; KEY_SIZE_WEP104) {</div><div class='del'>-				ret = -EINVAL;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			if (ext-&gt;key_len &gt; KEY_SIZE_WEP40)</div><div class='del'>-				key.length = KEY_SIZE_WEP104;</div><div class='del'>-			else</div><div class='del'>-				key.length = KEY_SIZE_WEP40;</div><div class='del'>-			break;</div><div class='del'>-		case IW_ENCODE_ALG_TKIP:</div><div class='del'>-			if (ext-&gt;key_len &gt; KEY_SIZE_TKIP) {</div><div class='del'>-				ret = -EINVAL;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			key.type = DOT11_PRIV_TKIP;</div><div class='del'>-			key.length = KEY_SIZE_TKIP;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (key.length) {</div><div class='del'>-			memset(key.key, 0, sizeof(key.key));</div><div class='del'>-			memcpy(key.key, ext-&gt;key, ext-&gt;key_len);</div><div class='del'>-			ret = mgt_set_request(priv, DOT11_OID_DEFKEYX, idx,</div><div class='del'>-					    &amp;key);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Read the flags */</div><div class='del'>-	if (encoding-&gt;flags &amp; IW_ENCODE_DISABLED) {</div><div class='del'>-		/* Encoding disabled,</div><div class='del'>-		 * authen = DOT11_AUTH_OS;</div><div class='del'>-		 * invoke = 0;</div><div class='del'>-		 * exunencrypt = 0; */</div><div class='del'>-	}</div><div class='del'>-	if (encoding-&gt;flags &amp; IW_ENCODE_OPEN) {</div><div class='del'>-		/* Encode but accept non-encoded packets. No auth */</div><div class='del'>-		invoke = 1;</div><div class='del'>-	}</div><div class='del'>-	if (encoding-&gt;flags &amp; IW_ENCODE_RESTRICTED) {</div><div class='del'>-		/* Refuse non-encoded packets. Auth */</div><div class='del'>-		authen = DOT11_AUTH_BOTH;</div><div class='del'>-		invoke = 1;</div><div class='del'>-		exunencrypt = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* do the change if requested  */</div><div class='del'>-	if (encoding-&gt;flags &amp; IW_ENCODE_MODE) {</div><div class='del'>-		ret = mgt_set_request(priv, DOT11_OID_AUTHENABLE, 0,</div><div class='del'>-				      &amp;authen);</div><div class='del'>-		ret = mgt_set_request(priv, DOT11_OID_PRIVACYINVOKED, 0,</div><div class='del'>-				      &amp;invoke);</div><div class='del'>-		ret = mgt_set_request(priv, DOT11_OID_EXUNENCRYPTED, 0,</div><div class='del'>-				      &amp;exunencrypt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prism54_get_encodeext(struct net_device *ndev,</div><div class='del'>-				 struct iw_request_info *info,</div><div class='del'>-				 union iwreq_data *wrqu,</div><div class='del'>-				 char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	struct iw_point *encoding = &amp;wrqu-&gt;encoding;</div><div class='del'>-	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;</div><div class='del'>-	int idx, max_key_len;</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-	int authen = DOT11_AUTH_OS, invoke = 0, exunencrypt = 0, wpa = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (islpci_get_state(priv) &lt; PRV_STATE_INIT)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* first get the flags */</div><div class='del'>-	ret = mgt_get_request(priv, DOT11_OID_AUTHENABLE, 0, NULL, &amp;r);</div><div class='del'>-	authen = r.u;</div><div class='del'>-	ret = mgt_get_request(priv, DOT11_OID_PRIVACYINVOKED, 0, NULL, &amp;r);</div><div class='del'>-	invoke = r.u;</div><div class='del'>-	ret = mgt_get_request(priv, DOT11_OID_EXUNENCRYPTED, 0, NULL, &amp;r);</div><div class='del'>-	exunencrypt = r.u;</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	max_key_len = encoding-&gt;length - sizeof(*ext);</div><div class='del'>-	if (max_key_len &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	idx = (encoding-&gt;flags &amp; IW_ENCODE_INDEX) - 1;</div><div class='del'>-	if (idx) {</div><div class='del'>-		if (idx &lt; 0 || idx &gt; 3)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	} else {</div><div class='del'>-		ret = mgt_get_request(priv, DOT11_OID_DEFKEYID, 0, NULL, &amp;r);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='del'>-		idx = r.u;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	encoding-&gt;flags = idx + 1;</div><div class='del'>-	memset(ext, 0, sizeof(*ext));</div><div class='del'>-</div><div class='del'>-	switch (authen) {</div><div class='del'>-	case DOT11_AUTH_BOTH:</div><div class='del'>-	case DOT11_AUTH_SK:</div><div class='del'>-		wrqu-&gt;encoding.flags |= IW_ENCODE_RESTRICTED;</div><div class='del'>-		fallthrough;</div><div class='del'>-	case DOT11_AUTH_OS:</div><div class='del'>-	default:</div><div class='del'>-		wrqu-&gt;encoding.flags |= IW_ENCODE_OPEN;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	down_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-	wpa = priv-&gt;wpa;</div><div class='del'>-	up_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-</div><div class='del'>-	if (authen == DOT11_AUTH_OS &amp;&amp; !exunencrypt &amp;&amp; !invoke &amp;&amp; !wpa) {</div><div class='del'>-		/* No encryption */</div><div class='del'>-		ext-&gt;alg = IW_ENCODE_ALG_NONE;</div><div class='del'>-		ext-&gt;key_len = 0;</div><div class='del'>-		wrqu-&gt;encoding.flags |= IW_ENCODE_DISABLED;</div><div class='del'>-	} else {</div><div class='del'>-		struct obj_key *key;</div><div class='del'>-</div><div class='del'>-		ret = mgt_get_request(priv, DOT11_OID_DEFKEYX, idx, NULL, &amp;r);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='del'>-		key = r.ptr;</div><div class='del'>-		if (max_key_len &lt; key-&gt;length) {</div><div class='del'>-			ret = -E2BIG;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		memcpy(ext-&gt;key, key-&gt;key, key-&gt;length);</div><div class='del'>-		ext-&gt;key_len = key-&gt;length;</div><div class='del'>-</div><div class='del'>-		switch (key-&gt;type) {</div><div class='del'>-		case DOT11_PRIV_TKIP:</div><div class='del'>-			ext-&gt;alg = IW_ENCODE_ALG_TKIP;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-		case DOT11_PRIV_WEP:</div><div class='del'>-			ext-&gt;alg = IW_ENCODE_ALG_WEP;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		wrqu-&gt;encoding.flags |= IW_ENCODE_ENABLED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_reset(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-	      __u32 * uwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_reset(netdev_priv(ndev), 0);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_get_oid(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		struct iw_point *dwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-	int rvalue;</div><div class='del'>-	enum oid_num_t n = dwrq-&gt;flags;</div><div class='del'>-</div><div class='del'>-	rvalue = mgt_get_request(netdev_priv(ndev), n, 0, NULL, &amp;r);</div><div class='del'>-	dwrq-&gt;length = mgt_response_to_str(n, &amp;r, extra);</div><div class='del'>-	if ((isl_oid[n].flags &amp; OID_FLAG_TYPE) != OID_TYPE_U32)</div><div class='del'>-		kfree(r.ptr);</div><div class='del'>-	return rvalue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_set_u32(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		__u32 * uwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	u32 oid = uwrq[0], u = uwrq[1];</div><div class='del'>-</div><div class='del'>-	return mgt_set_request(netdev_priv(ndev), oid, 0, &amp;u);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_set_raw(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		struct iw_point *dwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	u32 oid = dwrq-&gt;flags;</div><div class='del'>-</div><div class='del'>-	return mgt_set_request(netdev_priv(ndev), oid, 0, extra);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-prism54_acl_init(struct islpci_acl *acl)</div><div class='del'>-{</div><div class='del'>-	mutex_init(&amp;acl-&gt;lock);</div><div class='del'>-	INIT_LIST_HEAD(&amp;acl-&gt;mac_list);</div><div class='del'>-	acl-&gt;size = 0;</div><div class='del'>-	acl-&gt;policy = MAC_POLICY_OPEN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-prism54_clear_mac(struct islpci_acl *acl)</div><div class='del'>-{</div><div class='del'>-	struct list_head *ptr, *next;</div><div class='del'>-	struct mac_entry *entry;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;acl-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (acl-&gt;size == 0) {</div><div class='del'>-		mutex_unlock(&amp;acl-&gt;lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (ptr = acl-&gt;mac_list.next, next = ptr-&gt;next;</div><div class='del'>-	     ptr != &amp;acl-&gt;mac_list; ptr = next, next = ptr-&gt;next) {</div><div class='del'>-		entry = list_entry(ptr, struct mac_entry, _list);</div><div class='del'>-		list_del(ptr);</div><div class='del'>-		kfree(entry);</div><div class='del'>-	}</div><div class='del'>-	acl-&gt;size = 0;</div><div class='del'>-	mutex_unlock(&amp;acl-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-prism54_acl_clean(struct islpci_acl *acl)</div><div class='del'>-{</div><div class='del'>-	prism54_clear_mac(acl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_add_mac(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		struct sockaddr *awrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	struct islpci_acl *acl = &amp;priv-&gt;acl;</div><div class='del'>-	struct mac_entry *entry;</div><div class='del'>-	struct sockaddr *addr = (struct sockaddr *) extra;</div><div class='del'>-</div><div class='del'>-	if (addr-&gt;sa_family != ARPHRD_ETHER)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	entry = kmalloc(sizeof (struct mac_entry), GFP_KERNEL);</div><div class='del'>-	if (entry == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	memcpy(entry-&gt;addr, addr-&gt;sa_data, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	if (mutex_lock_interruptible(&amp;acl-&gt;lock)) {</div><div class='del'>-		kfree(entry);</div><div class='del'>-		return -ERESTARTSYS;</div><div class='del'>-	}</div><div class='del'>-	list_add_tail(&amp;entry-&gt;_list, &amp;acl-&gt;mac_list);</div><div class='del'>-	acl-&gt;size++;</div><div class='del'>-	mutex_unlock(&amp;acl-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_del_mac(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		struct sockaddr *awrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	struct islpci_acl *acl = &amp;priv-&gt;acl;</div><div class='del'>-	struct mac_entry *entry;</div><div class='del'>-	struct sockaddr *addr = (struct sockaddr *) extra;</div><div class='del'>-</div><div class='del'>-	if (addr-&gt;sa_family != ARPHRD_ETHER)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (mutex_lock_interruptible(&amp;acl-&gt;lock))</div><div class='del'>-		return -ERESTARTSYS;</div><div class='del'>-	list_for_each_entry(entry, &amp;acl-&gt;mac_list, _list) {</div><div class='del'>-		if (ether_addr_equal(entry-&gt;addr, addr-&gt;sa_data)) {</div><div class='del'>-			list_del(&amp;entry-&gt;_list);</div><div class='del'>-			acl-&gt;size--;</div><div class='del'>-			kfree(entry);</div><div class='del'>-			mutex_unlock(&amp;acl-&gt;lock);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;acl-&gt;lock);</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_get_mac(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		struct iw_point *dwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	struct islpci_acl *acl = &amp;priv-&gt;acl;</div><div class='del'>-	struct mac_entry *entry;</div><div class='del'>-	struct sockaddr *dst = (struct sockaddr *) extra;</div><div class='del'>-</div><div class='del'>-	dwrq-&gt;length = 0;</div><div class='del'>-</div><div class='del'>-	if (mutex_lock_interruptible(&amp;acl-&gt;lock))</div><div class='del'>-		return -ERESTARTSYS;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(entry, &amp;acl-&gt;mac_list, _list) {</div><div class='del'>-		memcpy(dst-&gt;sa_data, entry-&gt;addr, ETH_ALEN);</div><div class='del'>-		dst-&gt;sa_family = ARPHRD_ETHER;</div><div class='del'>-		dwrq-&gt;length++;</div><div class='del'>-		dst++;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;acl-&gt;lock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Setting policy also clears the MAC acl, even if we don't change the default</div><div class='del'>- * policy</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_set_policy(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		   __u32 * uwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	struct islpci_acl *acl = &amp;priv-&gt;acl;</div><div class='del'>-	u32 mlmeautolevel;</div><div class='del'>-</div><div class='del'>-	prism54_clear_mac(acl);</div><div class='del'>-</div><div class='del'>-	if ((*uwrq &lt; MAC_POLICY_OPEN) || (*uwrq &gt; MAC_POLICY_REJECT))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	down_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-</div><div class='del'>-	acl-&gt;policy = *uwrq;</div><div class='del'>-</div><div class='del'>-	/* the ACL code needs an intermediate mlmeautolevel */</div><div class='del'>-	if ((priv-&gt;iw_mode == IW_MODE_MASTER) &amp;&amp;</div><div class='del'>-	    (acl-&gt;policy != MAC_POLICY_OPEN))</div><div class='del'>-		mlmeautolevel = DOT11_MLME_INTERMEDIATE;</div><div class='del'>-	else</div><div class='del'>-		mlmeautolevel = CARD_DEFAULT_MLME_MODE;</div><div class='del'>-	if (priv-&gt;wpa)</div><div class='del'>-		mlmeautolevel = DOT11_MLME_EXTENDED;</div><div class='del'>-	mgt_set(priv, DOT11_OID_MLMEAUTOLEVEL, &amp;mlmeautolevel);</div><div class='del'>-	/* restart the card with our new policy */</div><div class='del'>-	if (mgt_commit(priv)) {</div><div class='del'>-		up_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	up_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_get_policy(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		   __u32 * uwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	struct islpci_acl *acl = &amp;priv-&gt;acl;</div><div class='del'>-</div><div class='del'>-	*uwrq = acl-&gt;policy;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Return 1 only if client should be accepted. */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_mac_accept(struct islpci_acl *acl, char *mac)</div><div class='del'>-{</div><div class='del'>-	struct mac_entry *entry;</div><div class='del'>-	int res = 0;</div><div class='del'>-</div><div class='del'>-	if (mutex_lock_interruptible(&amp;acl-&gt;lock))</div><div class='del'>-		return -ERESTARTSYS;</div><div class='del'>-</div><div class='del'>-	if (acl-&gt;policy == MAC_POLICY_OPEN) {</div><div class='del'>-		mutex_unlock(&amp;acl-&gt;lock);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(entry, &amp;acl-&gt;mac_list, _list) {</div><div class='del'>-		if (memcmp(entry-&gt;addr, mac, ETH_ALEN) == 0) {</div><div class='del'>-			res = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	res = (acl-&gt;policy == MAC_POLICY_ACCEPT) ? !res : res;</div><div class='del'>-	mutex_unlock(&amp;acl-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_kick_all(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		 struct iw_point *dwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct obj_mlme *mlme;</div><div class='del'>-	int rvalue;</div><div class='del'>-</div><div class='del'>-	mlme = kmalloc(sizeof (struct obj_mlme), GFP_KERNEL);</div><div class='del'>-	if (mlme == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* Tell the card to kick every client */</div><div class='del'>-	mlme-&gt;id = 0;</div><div class='del'>-	rvalue =</div><div class='del'>-	    mgt_set_request(netdev_priv(ndev), DOT11_OID_DISASSOCIATE, 0, mlme);</div><div class='del'>-	kfree(mlme);</div><div class='del'>-</div><div class='del'>-	return rvalue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_kick_mac(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		 struct sockaddr *awrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	struct obj_mlme *mlme;</div><div class='del'>-	struct sockaddr *addr = (struct sockaddr *) extra;</div><div class='del'>-	int rvalue;</div><div class='del'>-</div><div class='del'>-	if (addr-&gt;sa_family != ARPHRD_ETHER)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	mlme = kmalloc(sizeof (struct obj_mlme), GFP_KERNEL);</div><div class='del'>-	if (mlme == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* Tell the card to only kick the corresponding bastard */</div><div class='del'>-	memcpy(mlme-&gt;address, addr-&gt;sa_data, ETH_ALEN);</div><div class='del'>-	mlme-&gt;id = -1;</div><div class='del'>-	rvalue =</div><div class='del'>-	    mgt_set_request(netdev_priv(ndev), DOT11_OID_DISASSOCIATE, 0, mlme);</div><div class='del'>-</div><div class='del'>-	kfree(mlme);</div><div class='del'>-</div><div class='del'>-	return rvalue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Translate a TRAP oid into a wireless event. Called in islpci_mgt_receive. */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-format_event(islpci_private *priv, char *dest, const char *str,</div><div class='del'>-	     const struct obj_mlme *mlme, u16 *length, int error)</div><div class='del'>-{</div><div class='del'>-	int n = snprintf(dest, IW_CUSTOM_MAX,</div><div class='del'>-			 "%s %s %pM %s (%2.2X)",</div><div class='del'>-			 str,</div><div class='del'>-			 ((priv-&gt;iw_mode == IW_MODE_MASTER) ? "from" : "to"),</div><div class='del'>-			 mlme-&gt;address,</div><div class='del'>-			 (error ? (mlme-&gt;code ? " : REJECTED " : " : ACCEPTED ")</div><div class='del'>-			  : ""), mlme-&gt;code);</div><div class='del'>-	WARN_ON(n &gt;= IW_CUSTOM_MAX);</div><div class='del'>-	*length = n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-send_formatted_event(islpci_private *priv, const char *str,</div><div class='del'>-		     const struct obj_mlme *mlme, int error)</div><div class='del'>-{</div><div class='del'>-	union iwreq_data wrqu;</div><div class='del'>-	char *memptr;</div><div class='del'>-</div><div class='del'>-	memptr = kmalloc(IW_CUSTOM_MAX, GFP_KERNEL);</div><div class='del'>-	if (!memptr)</div><div class='del'>-		return;</div><div class='del'>-	wrqu.data.pointer = memptr;</div><div class='del'>-	wrqu.data.length = 0;</div><div class='del'>-	format_event(priv, memptr, str, mlme, &amp;wrqu.data.length,</div><div class='del'>-		     error);</div><div class='del'>-	wireless_send_event(priv-&gt;ndev, IWEVCUSTOM, &amp;wrqu, memptr);</div><div class='del'>-	kfree(memptr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-send_simple_event(islpci_private *priv, const char *str)</div><div class='del'>-{</div><div class='del'>-	union iwreq_data wrqu;</div><div class='del'>-	char *memptr;</div><div class='del'>-	int n = strlen(str);</div><div class='del'>-</div><div class='del'>-	memptr = kmalloc(IW_CUSTOM_MAX, GFP_KERNEL);</div><div class='del'>-	if (!memptr)</div><div class='del'>-		return;</div><div class='del'>-	BUG_ON(n &gt;= IW_CUSTOM_MAX);</div><div class='del'>-	wrqu.data.pointer = memptr;</div><div class='del'>-	wrqu.data.length = n;</div><div class='del'>-	strcpy(memptr, str);</div><div class='del'>-	wireless_send_event(priv-&gt;ndev, IWEVCUSTOM, &amp;wrqu, memptr);</div><div class='del'>-	kfree(memptr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-link_changed(struct net_device *ndev, u32 bitrate)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-</div><div class='del'>-	if (bitrate) {</div><div class='del'>-		netif_carrier_on(ndev);</div><div class='del'>-		if (priv-&gt;iw_mode == IW_MODE_INFRA) {</div><div class='del'>-			union iwreq_data uwrq;</div><div class='del'>-			prism54_get_wap(ndev, NULL, (struct sockaddr *) &amp;uwrq,</div><div class='del'>-					NULL);</div><div class='del'>-			wireless_send_event(ndev, SIOCGIWAP, &amp;uwrq, NULL);</div><div class='del'>-		} else</div><div class='del'>-			send_simple_event(netdev_priv(ndev),</div><div class='del'>-					  "Link established");</div><div class='del'>-	} else {</div><div class='del'>-		netif_carrier_off(ndev);</div><div class='del'>-		send_simple_event(netdev_priv(ndev), "Link lost");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Beacon/ProbeResp payload header */</div><div class='del'>-struct ieee80211_beacon_phdr {</div><div class='del'>-	u8 timestamp[8];</div><div class='del'>-	u16 beacon_int;</div><div class='del'>-	u16 capab_info;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define WLAN_EID_GENERIC 0xdd</div><div class='del'>-static u8 wpa_oid[4] = { 0x00, 0x50, 0xf2, 1 };</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-prism54_wpa_bss_ie_add(islpci_private *priv, u8 *bssid,</div><div class='del'>-		       u8 *wpa_ie, size_t wpa_ie_len)</div><div class='del'>-{</div><div class='del'>-	struct list_head *ptr;</div><div class='del'>-	struct islpci_bss_wpa_ie *bss = NULL;</div><div class='del'>-</div><div class='del'>-	if (wpa_ie_len &gt; MAX_WPA_IE_LEN)</div><div class='del'>-		wpa_ie_len = MAX_WPA_IE_LEN;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;wpa_lock);</div><div class='del'>-</div><div class='del'>-	/* try to use existing entry */</div><div class='del'>-	list_for_each(ptr, &amp;priv-&gt;bss_wpa_list) {</div><div class='del'>-		bss = list_entry(ptr, struct islpci_bss_wpa_ie, list);</div><div class='del'>-		if (memcmp(bss-&gt;bssid, bssid, ETH_ALEN) == 0) {</div><div class='del'>-			list_move(&amp;bss-&gt;list, &amp;priv-&gt;bss_wpa_list);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		bss = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bss == NULL) {</div><div class='del'>-		/* add a new BSS entry; if max number of entries is already</div><div class='del'>-		 * reached, replace the least recently updated */</div><div class='del'>-		if (priv-&gt;num_bss_wpa &gt;= MAX_BSS_WPA_IE_COUNT) {</div><div class='del'>-			bss = list_entry(priv-&gt;bss_wpa_list.prev,</div><div class='del'>-					 struct islpci_bss_wpa_ie, list);</div><div class='del'>-			list_del(&amp;bss-&gt;list);</div><div class='del'>-		} else {</div><div class='del'>-			bss = kzalloc(sizeof (*bss), GFP_ATOMIC);</div><div class='del'>-			if (bss != NULL)</div><div class='del'>-				priv-&gt;num_bss_wpa++;</div><div class='del'>-		}</div><div class='del'>-		if (bss != NULL) {</div><div class='del'>-			memcpy(bss-&gt;bssid, bssid, ETH_ALEN);</div><div class='del'>-			list_add(&amp;bss-&gt;list, &amp;priv-&gt;bss_wpa_list);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bss != NULL) {</div><div class='del'>-		memcpy(bss-&gt;wpa_ie, wpa_ie, wpa_ie_len);</div><div class='del'>-		bss-&gt;wpa_ie_len = wpa_ie_len;</div><div class='del'>-		bss-&gt;last_update = jiffies;</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_DEBUG "Failed to add BSS WPA entry for "</div><div class='del'>-		       "%pM\n", bssid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* expire old entries from WPA list */</div><div class='del'>-	while (priv-&gt;num_bss_wpa &gt; 0) {</div><div class='del'>-		bss = list_entry(priv-&gt;bss_wpa_list.prev,</div><div class='del'>-				 struct islpci_bss_wpa_ie, list);</div><div class='del'>-		if (!time_after(jiffies, bss-&gt;last_update + 60 * HZ))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		list_del(&amp;bss-&gt;list);</div><div class='del'>-		priv-&gt;num_bss_wpa--;</div><div class='del'>-		kfree(bss);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;wpa_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static size_t</div><div class='del'>-prism54_wpa_bss_ie_get(islpci_private *priv, u8 *bssid, u8 *wpa_ie)</div><div class='del'>-{</div><div class='del'>-	struct list_head *ptr;</div><div class='del'>-	struct islpci_bss_wpa_ie *bss = NULL;</div><div class='del'>-	size_t len = 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;wpa_lock);</div><div class='del'>-</div><div class='del'>-	list_for_each(ptr, &amp;priv-&gt;bss_wpa_list) {</div><div class='del'>-		bss = list_entry(ptr, struct islpci_bss_wpa_ie, list);</div><div class='del'>-		if (memcmp(bss-&gt;bssid, bssid, ETH_ALEN) == 0)</div><div class='del'>-			break;</div><div class='del'>-		bss = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (bss) {</div><div class='del'>-		len = bss-&gt;wpa_ie_len;</div><div class='del'>-		memcpy(wpa_ie, bss-&gt;wpa_ie, len);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;wpa_lock);</div><div class='del'>-</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-prism54_wpa_bss_ie_init(islpci_private *priv)</div><div class='del'>-{</div><div class='del'>-	INIT_LIST_HEAD(&amp;priv-&gt;bss_wpa_list);</div><div class='del'>-	mutex_init(&amp;priv-&gt;wpa_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-prism54_wpa_bss_ie_clean(islpci_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct islpci_bss_wpa_ie *bss, *n;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(bss, n, &amp;priv-&gt;bss_wpa_list, list) {</div><div class='del'>-		kfree(bss);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-prism54_process_bss_data(islpci_private *priv, u32 oid, u8 *addr,</div><div class='del'>-			 u8 *payload, size_t len)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_beacon_phdr *hdr;</div><div class='del'>-	u8 *pos, *end;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;wpa)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	hdr = (struct ieee80211_beacon_phdr *) payload;</div><div class='del'>-	pos = (u8 *) (hdr + 1);</div><div class='del'>-	end = payload + len;</div><div class='del'>-	while (pos &lt; end) {</div><div class='del'>-		if (pos + 2 + pos[1] &gt; end) {</div><div class='del'>-			printk(KERN_DEBUG "Parsing Beacon/ProbeResp failed "</div><div class='del'>-			       "for %pM\n", addr);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		if (pos[0] == WLAN_EID_GENERIC &amp;&amp; pos[1] &gt;= 4 &amp;&amp;</div><div class='del'>-		    memcmp(pos + 2, wpa_oid, 4) == 0) {</div><div class='del'>-			prism54_wpa_bss_ie_add(priv, addr, pos, pos[1] + 2);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		pos += 2 + pos[1];</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-handle_request(islpci_private *priv, struct obj_mlme *mlme, enum oid_num_t oid)</div><div class='del'>-{</div><div class='del'>-	if (((mlme-&gt;state == DOT11_STATE_AUTHING) ||</div><div class='del'>-	     (mlme-&gt;state == DOT11_STATE_ASSOCING))</div><div class='del'>-	    &amp;&amp; mgt_mlme_answer(priv)) {</div><div class='del'>-		/* Someone is requesting auth and we must respond. Just send back</div><div class='del'>-		 * the trap with error code set accordingly.</div><div class='del'>-		 */</div><div class='del'>-		mlme-&gt;code = prism54_mac_accept(&amp;priv-&gt;acl,</div><div class='del'>-						mlme-&gt;address) ? 0 : 1;</div><div class='del'>-		mgt_set_request(priv, oid, 0, mlme);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_process_trap_helper(islpci_private *priv, enum oid_num_t oid,</div><div class='del'>-			    char *data)</div><div class='del'>-{</div><div class='del'>-	struct obj_mlme *mlme = (struct obj_mlme *) data;</div><div class='del'>-	struct obj_mlmeex *mlmeex = (struct obj_mlmeex *) data;</div><div class='del'>-	struct obj_mlmeex *confirm;</div><div class='del'>-	u8 wpa_ie[MAX_WPA_IE_LEN];</div><div class='del'>-	int wpa_ie_len;</div><div class='del'>-	size_t len = 0; /* u16, better? */</div><div class='del'>-	u8 *payload = NULL, *pos = NULL;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* I think all trapable objects are listed here.</div><div class='del'>-	 * Some oids have a EX version. The difference is that they are emitted</div><div class='del'>-	 * in DOT11_MLME_EXTENDED mode (set with DOT11_OID_MLMEAUTOLEVEL)</div><div class='del'>-	 * with more info.</div><div class='del'>-	 * The few events already defined by the wireless tools are not really</div><div class='del'>-	 * suited. We use the more flexible custom event facility.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (oid &gt;= DOT11_OID_BEACON) {</div><div class='del'>-		len = mlmeex-&gt;size;</div><div class='del'>-		payload = pos = mlmeex-&gt;data;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* I fear prism54_process_bss_data won't work with big endian data */</div><div class='del'>-	if ((oid == DOT11_OID_BEACON) || (oid == DOT11_OID_PROBE))</div><div class='del'>-		prism54_process_bss_data(priv, oid, mlmeex-&gt;address,</div><div class='del'>-					 payload, len);</div><div class='del'>-</div><div class='del'>-	mgt_le_to_cpu(isl_oid[oid].flags &amp; OID_FLAG_TYPE, (void *) mlme);</div><div class='del'>-</div><div class='del'>-	switch (oid) {</div><div class='del'>-</div><div class='del'>-	case GEN_OID_LINKSTATE:</div><div class='del'>-		link_changed(priv-&gt;ndev, (u32) *data);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DOT11_OID_MICFAILURE:</div><div class='del'>-		send_simple_event(priv, "Mic failure");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DOT11_OID_DEAUTHENTICATE:</div><div class='del'>-		send_formatted_event(priv, "DeAuthenticate request", mlme, 0);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DOT11_OID_AUTHENTICATE:</div><div class='del'>-		handle_request(priv, mlme, oid);</div><div class='del'>-		send_formatted_event(priv, "Authenticate request", mlme, 1);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DOT11_OID_DISASSOCIATE:</div><div class='del'>-		send_formatted_event(priv, "Disassociate request", mlme, 0);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DOT11_OID_ASSOCIATE:</div><div class='del'>-		handle_request(priv, mlme, oid);</div><div class='del'>-		send_formatted_event(priv, "Associate request", mlme, 1);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DOT11_OID_REASSOCIATE:</div><div class='del'>-		handle_request(priv, mlme, oid);</div><div class='del'>-		send_formatted_event(priv, "ReAssociate request", mlme, 1);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DOT11_OID_BEACON:</div><div class='del'>-		send_formatted_event(priv,</div><div class='del'>-				     "Received a beacon from an unknown AP",</div><div class='del'>-				     mlme, 0);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DOT11_OID_PROBE:</div><div class='del'>-		/* we received a probe from a client. */</div><div class='del'>-		send_formatted_event(priv, "Received a probe from client", mlme,</div><div class='del'>-				     0);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-		/* Note : "mlme" is actually a "struct obj_mlmeex *" here, but this</div><div class='del'>-		 * is backward compatible layout-wise with "struct obj_mlme".</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-	case DOT11_OID_DEAUTHENTICATEEX:</div><div class='del'>-		send_formatted_event(priv, "DeAuthenticate request", mlme, 0);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DOT11_OID_AUTHENTICATEEX:</div><div class='del'>-		handle_request(priv, mlme, oid);</div><div class='del'>-		send_formatted_event(priv, "Authenticate request (ex)", mlme, 1);</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;iw_mode != IW_MODE_MASTER</div><div class='del'>-				&amp;&amp; mlmeex-&gt;state != DOT11_STATE_AUTHING)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		confirm = kmalloc(sizeof(struct obj_mlmeex) + 6, GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-		if (!confirm)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		memcpy(&amp;confirm-&gt;address, mlmeex-&gt;address, ETH_ALEN);</div><div class='del'>-		printk(KERN_DEBUG "Authenticate from: address:\t%pM\n",</div><div class='del'>-		       mlmeex-&gt;address);</div><div class='del'>-		confirm-&gt;id = -1; /* or mlmeex-&gt;id ? */</div><div class='del'>-		confirm-&gt;state = 0; /* not used */</div><div class='del'>-		confirm-&gt;code = 0;</div><div class='del'>-		confirm-&gt;size = 6;</div><div class='del'>-		confirm-&gt;data[0] = 0x00;</div><div class='del'>-		confirm-&gt;data[1] = 0x00;</div><div class='del'>-		confirm-&gt;data[2] = 0x02;</div><div class='del'>-		confirm-&gt;data[3] = 0x00;</div><div class='del'>-		confirm-&gt;data[4] = 0x00;</div><div class='del'>-		confirm-&gt;data[5] = 0x00;</div><div class='del'>-</div><div class='del'>-		ret = mgt_set_varlen(priv, DOT11_OID_ASSOCIATEEX, confirm, 6);</div><div class='del'>-</div><div class='del'>-		kfree(confirm);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DOT11_OID_DISASSOCIATEEX:</div><div class='del'>-		send_formatted_event(priv, "Disassociate request (ex)", mlme, 0);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DOT11_OID_ASSOCIATEEX:</div><div class='del'>-		handle_request(priv, mlme, oid);</div><div class='del'>-		send_formatted_event(priv, "Associate request (ex)", mlme, 1);</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;iw_mode != IW_MODE_MASTER</div><div class='del'>-				&amp;&amp; mlmeex-&gt;state != DOT11_STATE_ASSOCING)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		confirm = kmalloc(sizeof(struct obj_mlmeex), GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-		if (!confirm)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		memcpy(&amp;confirm-&gt;address, mlmeex-&gt;address, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-		confirm-&gt;id = ((struct obj_mlmeex *)mlme)-&gt;id;</div><div class='del'>-		confirm-&gt;state = 0; /* not used */</div><div class='del'>-		confirm-&gt;code = 0;</div><div class='del'>-</div><div class='del'>-		wpa_ie_len = prism54_wpa_bss_ie_get(priv, mlmeex-&gt;address, wpa_ie);</div><div class='del'>-</div><div class='del'>-		if (!wpa_ie_len) {</div><div class='del'>-			printk(KERN_DEBUG "No WPA IE found from address:\t%pM\n",</div><div class='del'>-			       mlmeex-&gt;address);</div><div class='del'>-			kfree(confirm);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		confirm-&gt;size = wpa_ie_len;</div><div class='del'>-		memcpy(&amp;confirm-&gt;data, wpa_ie, wpa_ie_len);</div><div class='del'>-</div><div class='del'>-		mgt_set_varlen(priv, oid, confirm, wpa_ie_len);</div><div class='del'>-</div><div class='del'>-		kfree(confirm);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DOT11_OID_REASSOCIATEEX:</div><div class='del'>-		handle_request(priv, mlme, oid);</div><div class='del'>-		send_formatted_event(priv, "Reassociate request (ex)", mlme, 1);</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;iw_mode != IW_MODE_MASTER</div><div class='del'>-				&amp;&amp; mlmeex-&gt;state != DOT11_STATE_ASSOCING)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		confirm = kmalloc(sizeof(struct obj_mlmeex), GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-		if (!confirm)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		memcpy(&amp;confirm-&gt;address, mlmeex-&gt;address, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-		confirm-&gt;id = mlmeex-&gt;id;</div><div class='del'>-		confirm-&gt;state = 0; /* not used */</div><div class='del'>-		confirm-&gt;code = 0;</div><div class='del'>-</div><div class='del'>-		wpa_ie_len = prism54_wpa_bss_ie_get(priv, mlmeex-&gt;address, wpa_ie);</div><div class='del'>-</div><div class='del'>-		if (!wpa_ie_len) {</div><div class='del'>-			printk(KERN_DEBUG "No WPA IE found from address:\t%pM\n",</div><div class='del'>-			       mlmeex-&gt;address);</div><div class='del'>-			kfree(confirm);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		confirm-&gt;size = wpa_ie_len;</div><div class='del'>-		memcpy(&amp;confirm-&gt;data, wpa_ie, wpa_ie_len);</div><div class='del'>-</div><div class='del'>-		mgt_set_varlen(priv, oid, confirm, wpa_ie_len);</div><div class='del'>-</div><div class='del'>-		kfree(confirm);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Process a device trap.  This is called via schedule_work(), outside of</div><div class='del'>- * interrupt context, no locks held.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-prism54_process_trap(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct islpci_mgmtframe *frame =</div><div class='del'>-		container_of(work, struct islpci_mgmtframe, ws);</div><div class='del'>-	struct net_device *ndev = frame-&gt;ndev;</div><div class='del'>-	enum oid_num_t n = mgt_oidtonum(frame-&gt;header-&gt;oid);</div><div class='del'>-</div><div class='del'>-	if (n != OID_NUM_LAST)</div><div class='del'>-		prism54_process_trap_helper(netdev_priv(ndev), n, frame-&gt;data);</div><div class='del'>-	islpci_mgt_release(frame);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-prism54_set_mac_address(struct net_device *ndev, void *addr)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (ndev-&gt;addr_len != 6)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	ret = mgt_set_request(priv, GEN_OID_MACADDRESS, 0,</div><div class='del'>-			      &amp;((struct sockaddr *) addr)-&gt;sa_data);</div><div class='del'>-	if (!ret)</div><div class='del'>-		memcpy(priv-&gt;ndev-&gt;dev_addr,</div><div class='del'>-		       &amp;((struct sockaddr *) addr)-&gt;sa_data, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define PRISM54_SET_WPA			SIOCIWFIRSTPRIV+12</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_set_wpa(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		__u32 * uwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	u32 mlme, authen, dot1x, filter, wep;</div><div class='del'>-</div><div class='del'>-	if (islpci_get_state(priv) &lt; PRV_STATE_INIT)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	wep = 1; /* For privacy invoked */</div><div class='del'>-	filter = 1; /* Filter out all unencrypted frames */</div><div class='del'>-	dot1x = 0x01; /* To enable eap filter */</div><div class='del'>-	mlme = DOT11_MLME_EXTENDED;</div><div class='del'>-	authen = DOT11_AUTH_OS; /* Only WEP uses _SK and _BOTH */</div><div class='del'>-</div><div class='del'>-	down_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-	priv-&gt;wpa = *uwrq;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;wpa) {</div><div class='del'>-		default:</div><div class='del'>-		case 0: /* Clears/disables WPA and friends */</div><div class='del'>-			wep = 0;</div><div class='del'>-			filter = 0; /* Do not filter un-encrypted data */</div><div class='del'>-			dot1x = 0;</div><div class='del'>-			mlme = DOT11_MLME_AUTO;</div><div class='del'>-			printk("%s: Disabling WPA\n", ndev-&gt;name);</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-		case 1: /* WPA */</div><div class='del'>-			printk("%s: Enabling WPA\n", ndev-&gt;name);</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	up_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-</div><div class='del'>-	mgt_set_request(priv, DOT11_OID_AUTHENABLE, 0, &amp;authen);</div><div class='del'>-	mgt_set_request(priv, DOT11_OID_PRIVACYINVOKED, 0, &amp;wep);</div><div class='del'>-	mgt_set_request(priv, DOT11_OID_EXUNENCRYPTED, 0, &amp;filter);</div><div class='del'>-	mgt_set_request(priv, DOT11_OID_DOT1XENABLE, 0, &amp;dot1x);</div><div class='del'>-	mgt_set_request(priv, DOT11_OID_MLMEAUTOLEVEL, 0, &amp;mlme);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_get_wpa(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		__u32 * uwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	*uwrq = priv-&gt;wpa;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_set_prismhdr(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		     __u32 * uwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	priv-&gt;monitor_type =</div><div class='del'>-	    (*uwrq ? ARPHRD_IEEE80211_PRISM : ARPHRD_IEEE80211);</div><div class='del'>-	if (priv-&gt;iw_mode == IW_MODE_MONITOR)</div><div class='del'>-		priv-&gt;ndev-&gt;type = priv-&gt;monitor_type;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_get_prismhdr(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		     __u32 * uwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	*uwrq = (priv-&gt;monitor_type == ARPHRD_IEEE80211_PRISM);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_debug_oid(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		  __u32 * uwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-</div><div class='del'>-	priv-&gt;priv_oid = *uwrq;</div><div class='del'>-	printk("%s: oid 0x%08X\n", ndev-&gt;name, *uwrq);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_debug_get_oid(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		      struct iw_point *data, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	struct islpci_mgmtframe *response;</div><div class='del'>-	int ret = -EIO;</div><div class='del'>-</div><div class='del'>-	printk("%s: get_oid 0x%08X\n", ndev-&gt;name, priv-&gt;priv_oid);</div><div class='del'>-	data-&gt;length = 0;</div><div class='del'>-</div><div class='del'>-	if (islpci_get_state(priv) &gt;= PRV_STATE_INIT) {</div><div class='del'>-		ret =</div><div class='del'>-		    islpci_mgt_transaction(priv-&gt;ndev, PIMFOR_OP_GET,</div><div class='del'>-					   priv-&gt;priv_oid, extra, 256,</div><div class='del'>-					   &amp;response);</div><div class='del'>-		printk("%s: ret: %i\n", ndev-&gt;name, ret);</div><div class='del'>-		if (ret || !response</div><div class='del'>-		    || response-&gt;header-&gt;operation == PIMFOR_OP_ERROR) {</div><div class='del'>-			if (response) {</div><div class='del'>-				islpci_mgt_release(response);</div><div class='del'>-			}</div><div class='del'>-			printk("%s: EIO\n", ndev-&gt;name);</div><div class='del'>-			ret = -EIO;</div><div class='del'>-		}</div><div class='del'>-		if (!ret) {</div><div class='del'>-			data-&gt;length = response-&gt;header-&gt;length;</div><div class='del'>-			memcpy(extra, response-&gt;data, data-&gt;length);</div><div class='del'>-			islpci_mgt_release(response);</div><div class='del'>-			printk("%s: len: %i\n", ndev-&gt;name, data-&gt;length);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_debug_set_oid(struct net_device *ndev, struct iw_request_info *info,</div><div class='del'>-		      struct iw_point *data, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	struct islpci_mgmtframe *response;</div><div class='del'>-	int ret = 0, response_op = PIMFOR_OP_ERROR;</div><div class='del'>-</div><div class='del'>-	printk("%s: set_oid 0x%08X\tlen: %d\n", ndev-&gt;name, priv-&gt;priv_oid,</div><div class='del'>-	       data-&gt;length);</div><div class='del'>-</div><div class='del'>-	if (islpci_get_state(priv) &gt;= PRV_STATE_INIT) {</div><div class='del'>-		ret =</div><div class='del'>-		    islpci_mgt_transaction(priv-&gt;ndev, PIMFOR_OP_SET,</div><div class='del'>-					   priv-&gt;priv_oid, extra, data-&gt;length,</div><div class='del'>-					   &amp;response);</div><div class='del'>-		printk("%s: ret: %i\n", ndev-&gt;name, ret);</div><div class='del'>-		if (ret || !response</div><div class='del'>-		    || response-&gt;header-&gt;operation == PIMFOR_OP_ERROR) {</div><div class='del'>-			if (response) {</div><div class='del'>-				islpci_mgt_release(response);</div><div class='del'>-			}</div><div class='del'>-			printk("%s: EIO\n", ndev-&gt;name);</div><div class='del'>-			ret = -EIO;</div><div class='del'>-		}</div><div class='del'>-		if (!ret) {</div><div class='del'>-			response_op = response-&gt;header-&gt;operation;</div><div class='del'>-			printk("%s: response_op: %i\n", ndev-&gt;name,</div><div class='del'>-			       response_op);</div><div class='del'>-			islpci_mgt_release(response);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (ret ? ret : -EINPROGRESS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_set_spy(struct net_device *ndev,</div><div class='del'>-		struct iw_request_info *info,</div><div class='del'>-		union iwreq_data *uwrq, char *extra)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	u32 u;</div><div class='del'>-	enum oid_num_t oid = OID_INL_CONFIG;</div><div class='del'>-</div><div class='del'>-	down_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-	mgt_get(priv, OID_INL_CONFIG, &amp;u);</div><div class='del'>-</div><div class='del'>-	if ((uwrq-&gt;data.length == 0) &amp;&amp; (priv-&gt;spy_data.spy_number &gt; 0))</div><div class='del'>-		/* disable spy */</div><div class='del'>-		u &amp;= ~INL_CONFIG_RXANNEX;</div><div class='del'>-	else if ((uwrq-&gt;data.length &gt; 0) &amp;&amp; (priv-&gt;spy_data.spy_number == 0))</div><div class='del'>-		/* enable spy */</div><div class='del'>-		u |= INL_CONFIG_RXANNEX;</div><div class='del'>-</div><div class='del'>-	mgt_set(priv, OID_INL_CONFIG, &amp;u);</div><div class='del'>-	mgt_commit_list(priv, &amp;oid, 1);</div><div class='del'>-	up_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-</div><div class='del'>-	return iw_handler_set_spy(ndev, info, uwrq, extra);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const iw_handler prism54_handler[] = {</div><div class='del'>-	(iw_handler) prism54_commit,	/* SIOCSIWCOMMIT */</div><div class='del'>-	(iw_handler) prism54_get_name,	/* SIOCGIWNAME */</div><div class='del'>-	(iw_handler) NULL,	/* SIOCSIWNWID */</div><div class='del'>-	(iw_handler) NULL,	/* SIOCGIWNWID */</div><div class='del'>-	(iw_handler) prism54_set_freq,	/* SIOCSIWFREQ */</div><div class='del'>-	(iw_handler) prism54_get_freq,	/* SIOCGIWFREQ */</div><div class='del'>-	(iw_handler) prism54_set_mode,	/* SIOCSIWMODE */</div><div class='del'>-	(iw_handler) prism54_get_mode,	/* SIOCGIWMODE */</div><div class='del'>-	(iw_handler) prism54_set_sens,	/* SIOCSIWSENS */</div><div class='del'>-	(iw_handler) prism54_get_sens,	/* SIOCGIWSENS */</div><div class='del'>-	(iw_handler) NULL,	/* SIOCSIWRANGE */</div><div class='del'>-	(iw_handler) prism54_get_range,	/* SIOCGIWRANGE */</div><div class='del'>-	(iw_handler) NULL,	/* SIOCSIWPRIV */</div><div class='del'>-	(iw_handler) NULL,	/* SIOCGIWPRIV */</div><div class='del'>-	(iw_handler) NULL,	/* SIOCSIWSTATS */</div><div class='del'>-	(iw_handler) NULL,	/* SIOCGIWSTATS */</div><div class='del'>-	prism54_set_spy,	/* SIOCSIWSPY */</div><div class='del'>-	iw_handler_get_spy,	/* SIOCGIWSPY */</div><div class='del'>-	iw_handler_set_thrspy,	/* SIOCSIWTHRSPY */</div><div class='del'>-	iw_handler_get_thrspy,	/* SIOCGIWTHRSPY */</div><div class='del'>-	(iw_handler) prism54_set_wap,	/* SIOCSIWAP */</div><div class='del'>-	(iw_handler) prism54_get_wap,	/* SIOCGIWAP */</div><div class='del'>-	(iw_handler) NULL,	/* -- hole -- */</div><div class='del'>-	(iw_handler) NULL,	/* SIOCGIWAPLIST deprecated */</div><div class='del'>-	(iw_handler) prism54_set_scan,	/* SIOCSIWSCAN */</div><div class='del'>-	(iw_handler) prism54_get_scan,	/* SIOCGIWSCAN */</div><div class='del'>-	(iw_handler) prism54_set_essid,	/* SIOCSIWESSID */</div><div class='del'>-	(iw_handler) prism54_get_essid,	/* SIOCGIWESSID */</div><div class='del'>-	(iw_handler) prism54_set_nick,	/* SIOCSIWNICKN */</div><div class='del'>-	(iw_handler) prism54_get_nick,	/* SIOCGIWNICKN */</div><div class='del'>-	(iw_handler) NULL,	/* -- hole -- */</div><div class='del'>-	(iw_handler) NULL,	/* -- hole -- */</div><div class='del'>-	(iw_handler) prism54_set_rate,	/* SIOCSIWRATE */</div><div class='del'>-	(iw_handler) prism54_get_rate,	/* SIOCGIWRATE */</div><div class='del'>-	(iw_handler) prism54_set_rts,	/* SIOCSIWRTS */</div><div class='del'>-	(iw_handler) prism54_get_rts,	/* SIOCGIWRTS */</div><div class='del'>-	(iw_handler) prism54_set_frag,	/* SIOCSIWFRAG */</div><div class='del'>-	(iw_handler) prism54_get_frag,	/* SIOCGIWFRAG */</div><div class='del'>-	(iw_handler) prism54_set_txpower,	/* SIOCSIWTXPOW */</div><div class='del'>-	(iw_handler) prism54_get_txpower,	/* SIOCGIWTXPOW */</div><div class='del'>-	(iw_handler) prism54_set_retry,	/* SIOCSIWRETRY */</div><div class='del'>-	(iw_handler) prism54_get_retry,	/* SIOCGIWRETRY */</div><div class='del'>-	(iw_handler) prism54_set_encode,	/* SIOCSIWENCODE */</div><div class='del'>-	(iw_handler) prism54_get_encode,	/* SIOCGIWENCODE */</div><div class='del'>-	(iw_handler) NULL,	/* SIOCSIWPOWER */</div><div class='del'>-	(iw_handler) NULL,	/* SIOCGIWPOWER */</div><div class='del'>-	NULL,			/* -- hole -- */</div><div class='del'>-	NULL,			/* -- hole -- */</div><div class='del'>-	(iw_handler) prism54_set_genie,	/* SIOCSIWGENIE */</div><div class='del'>-	(iw_handler) prism54_get_genie,	/* SIOCGIWGENIE */</div><div class='del'>-	(iw_handler) prism54_set_auth,	/* SIOCSIWAUTH */</div><div class='del'>-	(iw_handler) prism54_get_auth,	/* SIOCGIWAUTH */</div><div class='del'>-	(iw_handler) prism54_set_encodeext, /* SIOCSIWENCODEEXT */</div><div class='del'>-	(iw_handler) prism54_get_encodeext, /* SIOCGIWENCODEEXT */</div><div class='del'>-	NULL,			/* SIOCSIWPMKSA */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* The low order bit identify a SET (0) or a GET (1) ioctl.  */</div><div class='del'>-</div><div class='del'>-#define PRISM54_RESET		SIOCIWFIRSTPRIV</div><div class='del'>-#define PRISM54_GET_POLICY	SIOCIWFIRSTPRIV+1</div><div class='del'>-#define PRISM54_SET_POLICY	SIOCIWFIRSTPRIV+2</div><div class='del'>-#define PRISM54_GET_MAC		SIOCIWFIRSTPRIV+3</div><div class='del'>-#define PRISM54_ADD_MAC		SIOCIWFIRSTPRIV+4</div><div class='del'>-</div><div class='del'>-#define PRISM54_DEL_MAC		SIOCIWFIRSTPRIV+6</div><div class='del'>-</div><div class='del'>-#define PRISM54_KICK_MAC	SIOCIWFIRSTPRIV+8</div><div class='del'>-</div><div class='del'>-#define PRISM54_KICK_ALL	SIOCIWFIRSTPRIV+10</div><div class='del'>-</div><div class='del'>-#define PRISM54_GET_WPA		SIOCIWFIRSTPRIV+11</div><div class='del'>-#define PRISM54_SET_WPA		SIOCIWFIRSTPRIV+12</div><div class='del'>-</div><div class='del'>-#define PRISM54_DBG_OID		SIOCIWFIRSTPRIV+14</div><div class='del'>-#define PRISM54_DBG_GET_OID	SIOCIWFIRSTPRIV+15</div><div class='del'>-#define PRISM54_DBG_SET_OID	SIOCIWFIRSTPRIV+16</div><div class='del'>-</div><div class='del'>-#define PRISM54_GET_OID		SIOCIWFIRSTPRIV+17</div><div class='del'>-#define PRISM54_SET_OID_U32	SIOCIWFIRSTPRIV+18</div><div class='del'>-#define	PRISM54_SET_OID_STR	SIOCIWFIRSTPRIV+20</div><div class='del'>-#define	PRISM54_SET_OID_ADDR	SIOCIWFIRSTPRIV+22</div><div class='del'>-</div><div class='del'>-#define PRISM54_GET_PRISMHDR	SIOCIWFIRSTPRIV+23</div><div class='del'>-#define PRISM54_SET_PRISMHDR	SIOCIWFIRSTPRIV+24</div><div class='del'>-</div><div class='del'>-#define IWPRIV_SET_U32(n,x)	{ n, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "s_"x }</div><div class='del'>-#define IWPRIV_SET_SSID(n,x)	{ n, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 1, 0, "s_"x }</div><div class='del'>-#define IWPRIV_SET_ADDR(n,x)	{ n, IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0, "s_"x }</div><div class='del'>-#define IWPRIV_GET(n,x)	{ n, 0, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | PRIV_STR_SIZE, "g_"x }</div><div class='del'>-</div><div class='del'>-#define IWPRIV_U32(n,x)		IWPRIV_SET_U32(n,x), IWPRIV_GET(n,x)</div><div class='del'>-#define IWPRIV_SSID(n,x)	IWPRIV_SET_SSID(n,x), IWPRIV_GET(n,x)</div><div class='del'>-#define IWPRIV_ADDR(n,x)	IWPRIV_SET_ADDR(n,x), IWPRIV_GET(n,x)</div><div class='del'>-</div><div class='del'>-/* Note : limited to 128 private ioctls (wireless tools 26) */</div><div class='del'>-</div><div class='del'>-static const struct iw_priv_args prism54_private_args[] = {</div><div class='del'>-/*{ cmd, set_args, get_args, name } */</div><div class='del'>-	{PRISM54_RESET, 0, 0, "reset"},</div><div class='del'>-	{PRISM54_GET_PRISMHDR, 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,</div><div class='del'>-	 "get_prismhdr"},</div><div class='del'>-	{PRISM54_SET_PRISMHDR, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0,</div><div class='del'>-	 "set_prismhdr"},</div><div class='del'>-	{PRISM54_GET_POLICY, 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,</div><div class='del'>-	 "getPolicy"},</div><div class='del'>-	{PRISM54_SET_POLICY, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0,</div><div class='del'>-	 "setPolicy"},</div><div class='del'>-	{PRISM54_GET_MAC, 0, IW_PRIV_TYPE_ADDR | 64, "getMac"},</div><div class='del'>-	{PRISM54_ADD_MAC, IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0,</div><div class='del'>-	 "addMac"},</div><div class='del'>-	{PRISM54_DEL_MAC, IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0,</div><div class='del'>-	 "delMac"},</div><div class='del'>-	{PRISM54_KICK_MAC, IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0,</div><div class='del'>-	 "kickMac"},</div><div class='del'>-	{PRISM54_KICK_ALL, 0, 0, "kickAll"},</div><div class='del'>-	{PRISM54_GET_WPA, 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,</div><div class='del'>-	 "get_wpa"},</div><div class='del'>-	{PRISM54_SET_WPA, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0,</div><div class='del'>-	 "set_wpa"},</div><div class='del'>-	{PRISM54_DBG_OID, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0,</div><div class='del'>-	 "dbg_oid"},</div><div class='del'>-	{PRISM54_DBG_GET_OID, 0, IW_PRIV_TYPE_BYTE | 256, "dbg_get_oid"},</div><div class='del'>-	{PRISM54_DBG_SET_OID, IW_PRIV_TYPE_BYTE | 256, 0, "dbg_set_oid"},</div><div class='del'>-	/* --- sub-ioctls handlers --- */</div><div class='del'>-	{PRISM54_GET_OID,</div><div class='del'>-	 0, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | PRIV_STR_SIZE, ""},</div><div class='del'>-	{PRISM54_SET_OID_U32,</div><div class='del'>-	 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, ""},</div><div class='del'>-	{PRISM54_SET_OID_STR,</div><div class='del'>-	 IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 1, 0, ""},</div><div class='del'>-	{PRISM54_SET_OID_ADDR,</div><div class='del'>-	 IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0, ""},</div><div class='del'>-	/* --- sub-ioctls definitions --- */</div><div class='del'>-	IWPRIV_ADDR(GEN_OID_MACADDRESS, "addr"),</div><div class='del'>-	IWPRIV_GET(GEN_OID_LINKSTATE, "linkstate"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_BSSTYPE, "bsstype"),</div><div class='del'>-	IWPRIV_ADDR(DOT11_OID_BSSID, "bssid"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_STATE, "state"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_AID, "aid"),</div><div class='del'>-</div><div class='del'>-	IWPRIV_SSID(DOT11_OID_SSIDOVERRIDE, "ssidoverride"),</div><div class='del'>-</div><div class='del'>-	IWPRIV_U32(DOT11_OID_MEDIUMLIMIT, "medlimit"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_BEACONPERIOD, "beacon"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_DTIMPERIOD, "dtimperiod"),</div><div class='del'>-</div><div class='del'>-	IWPRIV_U32(DOT11_OID_AUTHENABLE, "authenable"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_PRIVACYINVOKED, "privinvok"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_EXUNENCRYPTED, "exunencrypt"),</div><div class='del'>-</div><div class='del'>-	IWPRIV_U32(DOT11_OID_REKEYTHRESHOLD, "rekeythresh"),</div><div class='del'>-</div><div class='del'>-	IWPRIV_U32(DOT11_OID_MAXTXLIFETIME, "maxtxlife"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_MAXRXLIFETIME, "maxrxlife"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_ALOFT_FIXEDRATE, "fixedrate"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_MAXFRAMEBURST, "frameburst"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_PSM, "psm"),</div><div class='del'>-</div><div class='del'>-	IWPRIV_U32(DOT11_OID_BRIDGELOCAL, "bridge"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_CLIENTS, "clients"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_CLIENTSASSOCIATED, "clientassoc"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_DOT1XENABLE, "dot1xenable"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_ANTENNARX, "rxant"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_ANTENNATX, "txant"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_ANTENNADIVERSITY, "antdivers"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_EDTHRESHOLD, "edthresh"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_PREAMBLESETTINGS, "preamble"),</div><div class='del'>-	IWPRIV_GET(DOT11_OID_RATES, "rates"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_OUTPUTPOWER, ".11outpower"),</div><div class='del'>-	IWPRIV_GET(DOT11_OID_SUPPORTEDRATES, "supprates"),</div><div class='del'>-	IWPRIV_GET(DOT11_OID_SUPPORTEDFREQUENCIES, "suppfreq"),</div><div class='del'>-</div><div class='del'>-	IWPRIV_U32(DOT11_OID_NOISEFLOOR, "noisefloor"),</div><div class='del'>-	IWPRIV_GET(DOT11_OID_FREQUENCYACTIVITY, "freqactivity"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_NONERPPROTECTION, "nonerpprotec"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_PROFILES, "profile"),</div><div class='del'>-	IWPRIV_GET(DOT11_OID_EXTENDEDRATES, "extrates"),</div><div class='del'>-	IWPRIV_U32(DOT11_OID_MLMEAUTOLEVEL, "mlmelevel"),</div><div class='del'>-</div><div class='del'>-	IWPRIV_GET(DOT11_OID_BSSS, "bsss"),</div><div class='del'>-	IWPRIV_GET(DOT11_OID_BSSLIST, "bsslist"),</div><div class='del'>-	IWPRIV_U32(OID_INL_MODE, "mode"),</div><div class='del'>-	IWPRIV_U32(OID_INL_CONFIG, "config"),</div><div class='del'>-	IWPRIV_U32(OID_INL_DOT11D_CONFORMANCE, ".11dconform"),</div><div class='del'>-	IWPRIV_GET(OID_INL_PHYCAPABILITIES, "phycapa"),</div><div class='del'>-	IWPRIV_U32(OID_INL_OUTPUTPOWER, "outpower"),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const iw_handler prism54_private_handler[] = {</div><div class='del'>-	(iw_handler) prism54_reset,</div><div class='del'>-	(iw_handler) prism54_get_policy,</div><div class='del'>-	(iw_handler) prism54_set_policy,</div><div class='del'>-	(iw_handler) prism54_get_mac,</div><div class='del'>-	(iw_handler) prism54_add_mac,</div><div class='del'>-	(iw_handler) NULL,</div><div class='del'>-	(iw_handler) prism54_del_mac,</div><div class='del'>-	(iw_handler) NULL,</div><div class='del'>-	(iw_handler) prism54_kick_mac,</div><div class='del'>-	(iw_handler) NULL,</div><div class='del'>-	(iw_handler) prism54_kick_all,</div><div class='del'>-	(iw_handler) prism54_get_wpa,</div><div class='del'>-	(iw_handler) prism54_set_wpa,</div><div class='del'>-	(iw_handler) NULL,</div><div class='del'>-	(iw_handler) prism54_debug_oid,</div><div class='del'>-	(iw_handler) prism54_debug_get_oid,</div><div class='del'>-	(iw_handler) prism54_debug_set_oid,</div><div class='del'>-	(iw_handler) prism54_get_oid,</div><div class='del'>-	(iw_handler) prism54_set_u32,</div><div class='del'>-	(iw_handler) NULL,</div><div class='del'>-	(iw_handler) prism54_set_raw,</div><div class='del'>-	(iw_handler) NULL,</div><div class='del'>-	(iw_handler) prism54_set_raw,</div><div class='del'>-	(iw_handler) prism54_get_prismhdr,</div><div class='del'>-	(iw_handler) prism54_set_prismhdr,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct iw_handler_def prism54_handler_def = {</div><div class='del'>-	.num_standard = ARRAY_SIZE(prism54_handler),</div><div class='del'>-	.num_private = ARRAY_SIZE(prism54_private_handler),</div><div class='del'>-	.num_private_args = ARRAY_SIZE(prism54_private_args),</div><div class='del'>-	.standard = (iw_handler *) prism54_handler,</div><div class='del'>-	.private = (iw_handler *) prism54_private_handler,</div><div class='del'>-	.private_args = (struct iw_priv_args *) prism54_private_args,</div><div class='del'>-	.get_wireless_stats = prism54_get_wireless_stats,</div><div class='del'>-};</div><div class='head'>diff --git a/drivers/net/wireless/intersil/prism54/isl_ioctl.h b/drivers/net/wireless/intersil/prism54/isl_ioctl.h<br/>deleted file mode 100644<br/>index 3f85fd75ac19..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/prism54/isl_ioctl.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/isl_ioctl.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,35 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2002 Intersil Americas Inc.</div><div class='del'>- *            (C) 2003 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='del'>- *            (C) 2003 Luis R. Rodriguez &lt;mcgrof@ruslug.rutgers.edu&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _ISL_IOCTL_H</div><div class='del'>-#define _ISL_IOCTL_H</div><div class='del'>-</div><div class='del'>-#include "islpci_mgt.h"</div><div class='del'>-#include "islpci_dev.h"</div><div class='del'>-</div><div class='del'>-#include &lt;net/iw_handler.h&gt;	/* New driver API */</div><div class='del'>-</div><div class='del'>-#define SUPPORTED_WIRELESS_EXT                  19</div><div class='del'>-</div><div class='del'>-void prism54_mib_init(islpci_private *);</div><div class='del'>-</div><div class='del'>-struct iw_statistics *prism54_get_wireless_stats(struct net_device *);</div><div class='del'>-void prism54_update_stats(struct work_struct *);</div><div class='del'>-</div><div class='del'>-void prism54_acl_init(struct islpci_acl *);</div><div class='del'>-void prism54_acl_clean(struct islpci_acl *);</div><div class='del'>-</div><div class='del'>-void prism54_process_trap(struct work_struct *);</div><div class='del'>-</div><div class='del'>-void prism54_wpa_bss_ie_init(islpci_private *priv);</div><div class='del'>-void prism54_wpa_bss_ie_clean(islpci_private *priv);</div><div class='del'>-</div><div class='del'>-int prism54_set_mac_address(struct net_device *, void *);</div><div class='del'>-</div><div class='del'>-extern const struct iw_handler_def prism54_handler_def;</div><div class='del'>-</div><div class='del'>-#endif				/* _ISL_IOCTL_H */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/prism54/isl_oid.h b/drivers/net/wireless/intersil/prism54/isl_oid.h<br/>deleted file mode 100644<br/>index b889bb73a485..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/prism54/isl_oid.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/isl_oid.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,492 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2003 Herbert Valerio Riedel &lt;hvr@gnu.org&gt;</div><div class='del'>- *  Copyright (C) 2004 Luis R. Rodriguez &lt;mcgrof@ruslug.rutgers.edu&gt;</div><div class='del'>- *  Copyright (C) 2004 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#if !defined(_ISL_OID_H)</div><div class='del'>-#define _ISL_OID_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * MIB related constant and structure definitions for communicating</div><div class='del'>- * with the device firmware</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct obj_ssid {</div><div class='del'>-	u8 length;</div><div class='del'>-	char octets[33];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct obj_key {</div><div class='del'>-	u8 type;		/* dot11_priv_t */</div><div class='del'>-	u8 length;</div><div class='del'>-	char key[32];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct obj_mlme {</div><div class='del'>-	u8 address[6];</div><div class='del'>-	u16 id;</div><div class='del'>-	u16 state;</div><div class='del'>-	u16 code;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct obj_mlmeex {</div><div class='del'>-	u8 address[6];</div><div class='del'>-	u16 id;</div><div class='del'>-	u16 state;</div><div class='del'>-	u16 code;</div><div class='del'>-	u16 size;</div><div class='del'>-	u8 data[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct obj_buffer {</div><div class='del'>-	u32 size;</div><div class='del'>-	u32 addr;		/* 32bit bus address */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct obj_bss {</div><div class='del'>-	u8 address[6];</div><div class='del'>-	int:16;			/* padding */</div><div class='del'>-</div><div class='del'>-	char state;</div><div class='del'>-	char reserved;</div><div class='del'>-	short age;</div><div class='del'>-</div><div class='del'>-	char quality;</div><div class='del'>-	char rssi;</div><div class='del'>-</div><div class='del'>-	struct obj_ssid ssid;</div><div class='del'>-	short channel;</div><div class='del'>-	char beacon_period;</div><div class='del'>-	char dtim_period;</div><div class='del'>-	short capinfo;</div><div class='del'>-	short rates;</div><div class='del'>-	short basic_rates;</div><div class='del'>-	int:16;			/* padding */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct obj_bsslist {</div><div class='del'>-	u32 nr;</div><div class='del'>-	struct obj_bss bsslist[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct obj_frequencies {</div><div class='del'>-	u16 nr;</div><div class='del'>-	u16 mhz[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct obj_attachment {</div><div class='del'>-	char type;</div><div class='del'>-	char reserved;</div><div class='del'>-	short id;</div><div class='del'>-	short size;</div><div class='del'>-	char data[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * in case everything's ok, the inlined function below will be</div><div class='del'>- * optimized away by the compiler...</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-__bug_on_wrong_struct_sizes(void)</div><div class='del'>-{</div><div class='del'>-	BUILD_BUG_ON(sizeof (struct obj_ssid) != 34);</div><div class='del'>-	BUILD_BUG_ON(sizeof (struct obj_key) != 34);</div><div class='del'>-	BUILD_BUG_ON(sizeof (struct obj_mlme) != 12);</div><div class='del'>-	BUILD_BUG_ON(sizeof (struct obj_mlmeex) != 14);</div><div class='del'>-	BUILD_BUG_ON(sizeof (struct obj_buffer) != 8);</div><div class='del'>-	BUILD_BUG_ON(sizeof (struct obj_bss) != 60);</div><div class='del'>-	BUILD_BUG_ON(sizeof (struct obj_bsslist) != 4);</div><div class='del'>-	BUILD_BUG_ON(sizeof (struct obj_frequencies) != 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum dot11_state_t {</div><div class='del'>-	DOT11_STATE_NONE = 0,</div><div class='del'>-	DOT11_STATE_AUTHING = 1,</div><div class='del'>-	DOT11_STATE_AUTH = 2,</div><div class='del'>-	DOT11_STATE_ASSOCING = 3,</div><div class='del'>-</div><div class='del'>-	DOT11_STATE_ASSOC = 5,</div><div class='del'>-	DOT11_STATE_IBSS = 6,</div><div class='del'>-	DOT11_STATE_WDS = 7</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum dot11_bsstype_t {</div><div class='del'>-	DOT11_BSSTYPE_NONE = 0,</div><div class='del'>-	DOT11_BSSTYPE_INFRA = 1,</div><div class='del'>-	DOT11_BSSTYPE_IBSS = 2,</div><div class='del'>-	DOT11_BSSTYPE_ANY = 3</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum dot11_auth_t {</div><div class='del'>-	DOT11_AUTH_NONE = 0,</div><div class='del'>-	DOT11_AUTH_OS = 1,</div><div class='del'>-	DOT11_AUTH_SK = 2,</div><div class='del'>-	DOT11_AUTH_BOTH = 3</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum dot11_mlme_t {</div><div class='del'>-	DOT11_MLME_AUTO = 0,</div><div class='del'>-	DOT11_MLME_INTERMEDIATE = 1,</div><div class='del'>-	DOT11_MLME_EXTENDED = 2</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum dot11_priv_t {</div><div class='del'>-	DOT11_PRIV_WEP = 0,</div><div class='del'>-	DOT11_PRIV_TKIP = 1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Prism "Nitro" / Frameburst / "Packet Frame Grouping"</div><div class='del'>- * Value is in microseconds. Represents the # microseconds</div><div class='del'>- * the firmware will take to group frames before sending out then out</div><div class='del'>- * together with a CSMA contention. Without this all frames are</div><div class='del'>- * sent with a CSMA contention.</div><div class='del'>- * Bibliography:</div><div class='del'>- * https://www.hpl.hp.com/personal/Jean_Tourrilhes/Papers/Packet.Frame.Grouping.html</div><div class='del'>- */</div><div class='del'>-enum dot11_maxframeburst_t {</div><div class='del'>-	/* Values for DOT11_OID_MAXFRAMEBURST */</div><div class='del'>-	DOT11_MAXFRAMEBURST_OFF = 0, /* Card firmware default */</div><div class='del'>-	DOT11_MAXFRAMEBURST_MIXED_SAFE = 650, /* 802.11 a,b,g safe */</div><div class='del'>-	DOT11_MAXFRAMEBURST_IDEAL = 1300, /* Theoretical ideal level */</div><div class='del'>-	DOT11_MAXFRAMEBURST_MAX = 5000, /* Use this as max,</div><div class='del'>-		* Note: firmware allows for greater values. This is a</div><div class='del'>-		* recommended max. I'll update this as I find</div><div class='del'>-		* out what the real MAX is. Also note that you don't necessarily</div><div class='del'>-		* get better results with a greater value here.</div><div class='del'>-		*/</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Support for 802.11 long and short frame preambles.</div><div class='del'>- * Long	 preamble uses 128-bit sync field, 8-bit  CRC</div><div class='del'>- * Short preamble uses 56-bit  sync field, 16-bit CRC</div><div class='del'>- *</div><div class='del'>- * 802.11a -- not sure, both optionally ?</div><div class='del'>- * 802.11b supports long and optionally short</div><div class='del'>- * 802.11g supports both */</div><div class='del'>-enum dot11_preamblesettings_t {</div><div class='del'>-	DOT11_PREAMBLESETTING_LONG = 0,</div><div class='del'>-		/* Allows *only* long 802.11 preambles */</div><div class='del'>-	DOT11_PREAMBLESETTING_SHORT = 1,</div><div class='del'>-		/* Allows *only* short 802.11 preambles */</div><div class='del'>-	DOT11_PREAMBLESETTING_DYNAMIC = 2</div><div class='del'>-		/* AutomatiGically set */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Support for 802.11 slot timing (time between packets).</div><div class='del'>- *</div><div class='del'>- * Long uses 802.11a slot timing  (9 usec ?)</div><div class='del'>- * Short uses 802.11b slot timing (20 use ?) */</div><div class='del'>-enum dot11_slotsettings_t {</div><div class='del'>-	DOT11_SLOTSETTINGS_LONG = 0,</div><div class='del'>-		/* Allows *only* long 802.11b slot timing */</div><div class='del'>-	DOT11_SLOTSETTINGS_SHORT = 1,</div><div class='del'>-		/* Allows *only* long 802.11a slot timing */</div><div class='del'>-	DOT11_SLOTSETTINGS_DYNAMIC = 2</div><div class='del'>-		/* AutomatiGically set */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* All you need to know, ERP is "Extended Rate PHY".</div><div class='del'>- * An Extended Rate PHY (ERP) STA or AP shall support three different</div><div class='del'>- * preamble and header formats:</div><div class='del'>- * Long  preamble (refer to above)</div><div class='del'>- * Short preamble (refer to above)</div><div class='del'>- * OFDM  preamble ( ? )</div><div class='del'>- *</div><div class='del'>- * I'm assuming here Protection tells the AP</div><div class='del'>- * to be careful, a STA which cannot handle the long pre-amble</div><div class='del'>- * has joined.</div><div class='del'>- */</div><div class='del'>-enum do11_nonerpstatus_t {</div><div class='del'>-	DOT11_ERPSTAT_NONEPRESENT = 0,</div><div class='del'>-	DOT11_ERPSTAT_USEPROTECTION = 1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* (ERP is "Extended Rate PHY") Way to read NONERP is NON-ERP-*</div><div class='del'>- * The key here is DOT11 NON ERP NEVER protects against</div><div class='del'>- * NON ERP STA's. You *don't* want this unless</div><div class='del'>- * you know what you are doing. It means you will only</div><div class='del'>- * get Extended Rate capabilities */</div><div class='del'>-enum dot11_nonerpprotection_t {</div><div class='del'>-	DOT11_NONERP_NEVER = 0,</div><div class='del'>-	DOT11_NONERP_ALWAYS = 1,</div><div class='del'>-	DOT11_NONERP_DYNAMIC = 2</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Preset OID configuration for 802.11 modes</div><div class='del'>- * Note: DOT11_OID_CW[MIN|MAX] hold the values of the</div><div class='del'>- * DCS MIN|MAX backoff used */</div><div class='del'>-enum dot11_profile_t { /* And set/allowed values */</div><div class='del'>-	/* Allowed values for DOT11_OID_PROFILES */</div><div class='del'>-	DOT11_PROFILE_B_ONLY = 0,</div><div class='del'>-		/* DOT11_OID_RATES: 1, 2, 5.5, 11Mbps</div><div class='del'>-		 * DOT11_OID_PREAMBLESETTINGS: DOT11_PREAMBLESETTING_DYNAMIC</div><div class='del'>-		 * DOT11_OID_CWMIN: 31</div><div class='del'>-		 * DOT11_OID_NONEPROTECTION: DOT11_NOERP_DYNAMIC</div><div class='del'>-		 * DOT11_OID_SLOTSETTINGS: DOT11_SLOTSETTINGS_LONG</div><div class='del'>-		 */</div><div class='del'>-	DOT11_PROFILE_MIXED_G_WIFI = 1,</div><div class='del'>-		/* DOT11_OID_RATES: 1, 2, 5.5, 11, 6, 9, 12, 18, 24, 36, 48, 54Mbs</div><div class='del'>-		 * DOT11_OID_PREAMBLESETTINGS: DOT11_PREAMBLESETTING_DYNAMIC</div><div class='del'>-		 * DOT11_OID_CWMIN: 15</div><div class='del'>-		 * DOT11_OID_NONEPROTECTION: DOT11_NOERP_DYNAMIC</div><div class='del'>-		 * DOT11_OID_SLOTSETTINGS: DOT11_SLOTSETTINGS_DYNAMIC</div><div class='del'>-		 */</div><div class='del'>-	DOT11_PROFILE_MIXED_LONG = 2, /* "Long range" */</div><div class='del'>-		/* Same as Profile MIXED_G_WIFI */</div><div class='del'>-	DOT11_PROFILE_G_ONLY = 3,</div><div class='del'>-		/* Same as Profile MIXED_G_WIFI */</div><div class='del'>-	DOT11_PROFILE_TEST = 4,</div><div class='del'>-		/* Same as Profile MIXED_G_WIFI except:</div><div class='del'>-		 * DOT11_OID_PREAMBLESETTINGS: DOT11_PREAMBLESETTING_SHORT</div><div class='del'>-		 * DOT11_OID_NONEPROTECTION: DOT11_NOERP_NEVER</div><div class='del'>-		 * DOT11_OID_SLOTSETTINGS: DOT11_SLOTSETTINGS_SHORT</div><div class='del'>-		 */</div><div class='del'>-	DOT11_PROFILE_B_WIFI = 5,</div><div class='del'>-		/* Same as Profile B_ONLY */</div><div class='del'>-	DOT11_PROFILE_A_ONLY = 6,</div><div class='del'>-		/* Same as Profile MIXED_G_WIFI except:</div><div class='del'>-		 * DOT11_OID_RATES: 6, 9, 12, 18, 24, 36, 48, 54Mbs</div><div class='del'>-		 */</div><div class='del'>-	DOT11_PROFILE_MIXED_SHORT = 7</div><div class='del'>-		/* Same as MIXED_G_WIFI */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The dot11d conformance level configures the 802.11d conformance levels.</div><div class='del'>- * The following conformance levels exist:*/</div><div class='del'>-enum oid_inl_conformance_t {</div><div class='del'>-	OID_INL_CONFORMANCE_NONE = 0,	/* Perform active scanning */</div><div class='del'>-	OID_INL_CONFORMANCE_STRICT = 1,	/* Strictly adhere to 802.11d */</div><div class='del'>-	OID_INL_CONFORMANCE_FLEXIBLE = 2,	/* Use passed 802.11d info to</div><div class='del'>-		* determine channel AND/OR just make assumption that active</div><div class='del'>-		* channels are valid  channels */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum oid_inl_mode_t {</div><div class='del'>-	INL_MODE_NONE = -1,</div><div class='del'>-	INL_MODE_PROMISCUOUS = 0,</div><div class='del'>-	INL_MODE_CLIENT = 1,</div><div class='del'>-	INL_MODE_AP = 2,</div><div class='del'>-	INL_MODE_SNIFFER = 3</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum oid_inl_config_t {</div><div class='del'>-	INL_CONFIG_NOTHING = 0x00,</div><div class='del'>-	INL_CONFIG_MANUALRUN = 0x01,</div><div class='del'>-	INL_CONFIG_FRAMETRAP = 0x02,</div><div class='del'>-	INL_CONFIG_RXANNEX = 0x04,</div><div class='del'>-	INL_CONFIG_TXANNEX = 0x08,</div><div class='del'>-	INL_CONFIG_WDS = 0x10</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum oid_inl_phycap_t {</div><div class='del'>-	INL_PHYCAP_2400MHZ = 1,</div><div class='del'>-	INL_PHYCAP_5000MHZ = 2,</div><div class='del'>-	INL_PHYCAP_FAA = 0x80000000,	/* Means card supports the FAA switch */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum oid_num_t {</div><div class='del'>-	GEN_OID_MACADDRESS = 0,</div><div class='del'>-	GEN_OID_LINKSTATE,</div><div class='del'>-	GEN_OID_WATCHDOG,</div><div class='del'>-	GEN_OID_MIBOP,</div><div class='del'>-	GEN_OID_OPTIONS,</div><div class='del'>-	GEN_OID_LEDCONFIG,</div><div class='del'>-</div><div class='del'>-	/* 802.11 */</div><div class='del'>-	DOT11_OID_BSSTYPE,</div><div class='del'>-	DOT11_OID_BSSID,</div><div class='del'>-	DOT11_OID_SSID,</div><div class='del'>-	DOT11_OID_STATE,</div><div class='del'>-	DOT11_OID_AID,</div><div class='del'>-	DOT11_OID_COUNTRYSTRING,</div><div class='del'>-	DOT11_OID_SSIDOVERRIDE,</div><div class='del'>-</div><div class='del'>-	DOT11_OID_MEDIUMLIMIT,</div><div class='del'>-	DOT11_OID_BEACONPERIOD,</div><div class='del'>-	DOT11_OID_DTIMPERIOD,</div><div class='del'>-	DOT11_OID_ATIMWINDOW,</div><div class='del'>-	DOT11_OID_LISTENINTERVAL,</div><div class='del'>-	DOT11_OID_CFPPERIOD,</div><div class='del'>-	DOT11_OID_CFPDURATION,</div><div class='del'>-</div><div class='del'>-	DOT11_OID_AUTHENABLE,</div><div class='del'>-	DOT11_OID_PRIVACYINVOKED,</div><div class='del'>-	DOT11_OID_EXUNENCRYPTED,</div><div class='del'>-	DOT11_OID_DEFKEYID,</div><div class='del'>-	DOT11_OID_DEFKEYX,	/* DOT11_OID_DEFKEY1,...DOT11_OID_DEFKEY4 */</div><div class='del'>-	DOT11_OID_STAKEY,</div><div class='del'>-	DOT11_OID_REKEYTHRESHOLD,</div><div class='del'>-	DOT11_OID_STASC,</div><div class='del'>-</div><div class='del'>-	DOT11_OID_PRIVTXREJECTED,</div><div class='del'>-	DOT11_OID_PRIVRXPLAIN,</div><div class='del'>-	DOT11_OID_PRIVRXFAILED,</div><div class='del'>-	DOT11_OID_PRIVRXNOKEY,</div><div class='del'>-</div><div class='del'>-	DOT11_OID_RTSTHRESH,</div><div class='del'>-	DOT11_OID_FRAGTHRESH,</div><div class='del'>-	DOT11_OID_SHORTRETRIES,</div><div class='del'>-	DOT11_OID_LONGRETRIES,</div><div class='del'>-	DOT11_OID_MAXTXLIFETIME,</div><div class='del'>-	DOT11_OID_MAXRXLIFETIME,</div><div class='del'>-	DOT11_OID_AUTHRESPTIMEOUT,</div><div class='del'>-	DOT11_OID_ASSOCRESPTIMEOUT,</div><div class='del'>-</div><div class='del'>-	DOT11_OID_ALOFT_TABLE,</div><div class='del'>-	DOT11_OID_ALOFT_CTRL_TABLE,</div><div class='del'>-	DOT11_OID_ALOFT_RETREAT,</div><div class='del'>-	DOT11_OID_ALOFT_PROGRESS,</div><div class='del'>-	DOT11_OID_ALOFT_FIXEDRATE,</div><div class='del'>-	DOT11_OID_ALOFT_RSSIGRAPH,</div><div class='del'>-	DOT11_OID_ALOFT_CONFIG,</div><div class='del'>-</div><div class='del'>-	DOT11_OID_VDCFX,</div><div class='del'>-	DOT11_OID_MAXFRAMEBURST,</div><div class='del'>-</div><div class='del'>-	DOT11_OID_PSM,</div><div class='del'>-	DOT11_OID_CAMTIMEOUT,</div><div class='del'>-	DOT11_OID_RECEIVEDTIMS,</div><div class='del'>-	DOT11_OID_ROAMPREFERENCE,</div><div class='del'>-</div><div class='del'>-	DOT11_OID_BRIDGELOCAL,</div><div class='del'>-	DOT11_OID_CLIENTS,</div><div class='del'>-	DOT11_OID_CLIENTSASSOCIATED,</div><div class='del'>-	DOT11_OID_CLIENTX,	/* DOT11_OID_CLIENTX,...DOT11_OID_CLIENT2007 */</div><div class='del'>-</div><div class='del'>-	DOT11_OID_CLIENTFIND,</div><div class='del'>-	DOT11_OID_WDSLINKADD,</div><div class='del'>-	DOT11_OID_WDSLINKREMOVE,</div><div class='del'>-	DOT11_OID_EAPAUTHSTA,</div><div class='del'>-	DOT11_OID_EAPUNAUTHSTA,</div><div class='del'>-	DOT11_OID_DOT1XENABLE,</div><div class='del'>-	DOT11_OID_MICFAILURE,</div><div class='del'>-	DOT11_OID_REKEYINDICATE,</div><div class='del'>-</div><div class='del'>-	DOT11_OID_MPDUTXSUCCESSFUL,</div><div class='del'>-	DOT11_OID_MPDUTXONERETRY,</div><div class='del'>-	DOT11_OID_MPDUTXMULTIPLERETRIES,</div><div class='del'>-	DOT11_OID_MPDUTXFAILED,</div><div class='del'>-	DOT11_OID_MPDURXSUCCESSFUL,</div><div class='del'>-	DOT11_OID_MPDURXDUPS,</div><div class='del'>-	DOT11_OID_RTSSUCCESSFUL,</div><div class='del'>-	DOT11_OID_RTSFAILED,</div><div class='del'>-	DOT11_OID_ACKFAILED,</div><div class='del'>-	DOT11_OID_FRAMERECEIVES,</div><div class='del'>-	DOT11_OID_FRAMEERRORS,</div><div class='del'>-	DOT11_OID_FRAMEABORTS,</div><div class='del'>-	DOT11_OID_FRAMEABORTSPHY,</div><div class='del'>-</div><div class='del'>-	DOT11_OID_SLOTTIME,</div><div class='del'>-	DOT11_OID_CWMIN, /* MIN DCS backoff */</div><div class='del'>-	DOT11_OID_CWMAX, /* MAX DCS backoff */</div><div class='del'>-	DOT11_OID_ACKWINDOW,</div><div class='del'>-	DOT11_OID_ANTENNARX,</div><div class='del'>-	DOT11_OID_ANTENNATX,</div><div class='del'>-	DOT11_OID_ANTENNADIVERSITY,</div><div class='del'>-	DOT11_OID_CHANNEL,</div><div class='del'>-	DOT11_OID_EDTHRESHOLD,</div><div class='del'>-	DOT11_OID_PREAMBLESETTINGS,</div><div class='del'>-	DOT11_OID_RATES,</div><div class='del'>-	DOT11_OID_CCAMODESUPPORTED,</div><div class='del'>-	DOT11_OID_CCAMODE,</div><div class='del'>-	DOT11_OID_RSSIVECTOR,</div><div class='del'>-	DOT11_OID_OUTPUTPOWERTABLE,</div><div class='del'>-	DOT11_OID_OUTPUTPOWER,</div><div class='del'>-	DOT11_OID_SUPPORTEDRATES,</div><div class='del'>-	DOT11_OID_FREQUENCY,</div><div class='del'>-	DOT11_OID_SUPPORTEDFREQUENCIES,</div><div class='del'>-	DOT11_OID_NOISEFLOOR,</div><div class='del'>-	DOT11_OID_FREQUENCYACTIVITY,</div><div class='del'>-	DOT11_OID_IQCALIBRATIONTABLE,</div><div class='del'>-	DOT11_OID_NONERPPROTECTION,</div><div class='del'>-	DOT11_OID_SLOTSETTINGS,</div><div class='del'>-	DOT11_OID_NONERPTIMEOUT,</div><div class='del'>-	DOT11_OID_PROFILES,</div><div class='del'>-	DOT11_OID_EXTENDEDRATES,</div><div class='del'>-</div><div class='del'>-	DOT11_OID_DEAUTHENTICATE,</div><div class='del'>-	DOT11_OID_AUTHENTICATE,</div><div class='del'>-	DOT11_OID_DISASSOCIATE,</div><div class='del'>-	DOT11_OID_ASSOCIATE,</div><div class='del'>-	DOT11_OID_SCAN,</div><div class='del'>-	DOT11_OID_BEACON,</div><div class='del'>-	DOT11_OID_PROBE,</div><div class='del'>-	DOT11_OID_DEAUTHENTICATEEX,</div><div class='del'>-	DOT11_OID_AUTHENTICATEEX,</div><div class='del'>-	DOT11_OID_DISASSOCIATEEX,</div><div class='del'>-	DOT11_OID_ASSOCIATEEX,</div><div class='del'>-	DOT11_OID_REASSOCIATE,</div><div class='del'>-	DOT11_OID_REASSOCIATEEX,</div><div class='del'>-</div><div class='del'>-	DOT11_OID_NONERPSTATUS,</div><div class='del'>-</div><div class='del'>-	DOT11_OID_STATIMEOUT,</div><div class='del'>-	DOT11_OID_MLMEAUTOLEVEL,</div><div class='del'>-	DOT11_OID_BSSTIMEOUT,</div><div class='del'>-	DOT11_OID_ATTACHMENT,</div><div class='del'>-	DOT11_OID_PSMBUFFER,</div><div class='del'>-</div><div class='del'>-	DOT11_OID_BSSS,</div><div class='del'>-	DOT11_OID_BSSX,		/*DOT11_OID_BSS1,...,DOT11_OID_BSS64 */</div><div class='del'>-	DOT11_OID_BSSFIND,</div><div class='del'>-	DOT11_OID_BSSLIST,</div><div class='del'>-</div><div class='del'>-	OID_INL_TUNNEL,</div><div class='del'>-	OID_INL_MEMADDR,</div><div class='del'>-	OID_INL_MEMORY,</div><div class='del'>-	OID_INL_MODE,</div><div class='del'>-	OID_INL_COMPONENT_NR,</div><div class='del'>-	OID_INL_VERSION,</div><div class='del'>-	OID_INL_INTERFACE_ID,</div><div class='del'>-	OID_INL_COMPONENT_ID,</div><div class='del'>-	OID_INL_CONFIG,</div><div class='del'>-	OID_INL_DOT11D_CONFORMANCE,</div><div class='del'>-	OID_INL_PHYCAPABILITIES,</div><div class='del'>-	OID_INL_OUTPUTPOWER,</div><div class='del'>-</div><div class='del'>-	OID_NUM_LAST</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define OID_FLAG_CACHED		0x80</div><div class='del'>-#define OID_FLAG_TYPE		0x7f</div><div class='del'>-</div><div class='del'>-#define OID_TYPE_U32		0x01</div><div class='del'>-#define OID_TYPE_SSID		0x02</div><div class='del'>-#define OID_TYPE_KEY		0x03</div><div class='del'>-#define OID_TYPE_BUFFER		0x04</div><div class='del'>-#define OID_TYPE_BSS		0x05</div><div class='del'>-#define OID_TYPE_BSSLIST	0x06</div><div class='del'>-#define OID_TYPE_FREQUENCIES	0x07</div><div class='del'>-#define OID_TYPE_MLME		0x08</div><div class='del'>-#define OID_TYPE_MLMEEX		0x09</div><div class='del'>-#define OID_TYPE_ADDR		0x0A</div><div class='del'>-#define OID_TYPE_RAW		0x0B</div><div class='del'>-#define OID_TYPE_ATTACH		0x0C</div><div class='del'>-</div><div class='del'>-/* OID_TYPE_MLMEEX is special because of a variable size field when sending.</div><div class='del'>- * Not yet implemented (not used in driver anyway).</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct oid_t {</div><div class='del'>-	enum oid_num_t oid;</div><div class='del'>-	short range;		/* to define a range of oid */</div><div class='del'>-	short size;		/* max size of the associated data */</div><div class='del'>-	char flags;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-union oid_res_t {</div><div class='del'>-	void *ptr;</div><div class='del'>-	u32 u;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define	IWMAX_BITRATES	20</div><div class='del'>-#define	IWMAX_BSS	24</div><div class='del'>-#define IWMAX_FREQ	30</div><div class='del'>-#define PRIV_STR_SIZE	1024</div><div class='del'>-</div><div class='del'>-#endif				/* !defined(_ISL_OID_H) */</div><div class='del'>-/* EOF */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/prism54/islpci_dev.c b/drivers/net/wireless/intersil/prism54/islpci_dev.c<br/>deleted file mode 100644<br/>index 8eb6d5e4bd57..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/prism54/islpci_dev.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/islpci_dev.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,951 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2002 Intersil Americas Inc.</div><div class='del'>- *  Copyright (C) 2003 Herbert Valerio Riedel &lt;hvr@gnu.org&gt;</div><div class='del'>- *  Copyright (C) 2003 Luis R. Rodriguez &lt;mcgrof@ruslug.rutgers.edu&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/hardirq.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/ethtool.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include "prismcompat.h"</div><div class='del'>-#include "isl_38xx.h"</div><div class='del'>-#include "isl_ioctl.h"</div><div class='del'>-#include "islpci_dev.h"</div><div class='del'>-#include "islpci_mgt.h"</div><div class='del'>-#include "islpci_eth.h"</div><div class='del'>-#include "oid_mgt.h"</div><div class='del'>-</div><div class='del'>-#define ISL3877_IMAGE_FILE	"isl3877"</div><div class='del'>-#define ISL3886_IMAGE_FILE	"isl3886"</div><div class='del'>-#define ISL3890_IMAGE_FILE	"isl3890"</div><div class='del'>-MODULE_FIRMWARE(ISL3877_IMAGE_FILE);</div><div class='del'>-MODULE_FIRMWARE(ISL3886_IMAGE_FILE);</div><div class='del'>-MODULE_FIRMWARE(ISL3890_IMAGE_FILE);</div><div class='del'>-</div><div class='del'>-static int prism54_bring_down(islpci_private *);</div><div class='del'>-static int islpci_alloc_memory(islpci_private *);</div><div class='del'>-</div><div class='del'>-/* Temporary dummy MAC address to use until firmware is loaded.</div><div class='del'>- * The idea there is that some tools (such as nameif) may query</div><div class='del'>- * the MAC address before the netdev is 'open'. By using a valid</div><div class='del'>- * OUI prefix, they can process the netdev properly.</div><div class='del'>- * Of course, this is not the final/real MAC address. It doesn't</div><div class='del'>- * matter, as you are suppose to be able to change it anytime via</div><div class='del'>- * ndev-&gt;set_mac_address. Jean II */</div><div class='del'>-static const unsigned char	dummy_mac[6] = { 0x00, 0x30, 0xB4, 0x00, 0x00, 0x00 };</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-isl_upload_firmware(islpci_private *priv)</div><div class='del'>-{</div><div class='del'>-	u32 reg, rc;</div><div class='del'>-	void __iomem *device_base = priv-&gt;device_base;</div><div class='del'>-</div><div class='del'>-	/* clear the RAMBoot and the Reset bit */</div><div class='del'>-	reg = readl(device_base + ISL38XX_CTRL_STAT_REG);</div><div class='del'>-	reg &amp;= ~ISL38XX_CTRL_STAT_RESET;</div><div class='del'>-	reg &amp;= ~ISL38XX_CTRL_STAT_RAMBOOT;</div><div class='del'>-	writel(reg, device_base + ISL38XX_CTRL_STAT_REG);</div><div class='del'>-	wmb();</div><div class='del'>-	udelay(ISL38XX_WRITEIO_DELAY);</div><div class='del'>-</div><div class='del'>-	/* set the Reset bit without reading the register ! */</div><div class='del'>-	reg |= ISL38XX_CTRL_STAT_RESET;</div><div class='del'>-	writel(reg, device_base + ISL38XX_CTRL_STAT_REG);</div><div class='del'>-	wmb();</div><div class='del'>-	udelay(ISL38XX_WRITEIO_DELAY);</div><div class='del'>-</div><div class='del'>-	/* clear the Reset bit */</div><div class='del'>-	reg &amp;= ~ISL38XX_CTRL_STAT_RESET;</div><div class='del'>-	writel(reg, device_base + ISL38XX_CTRL_STAT_REG);</div><div class='del'>-	wmb();</div><div class='del'>-</div><div class='del'>-	/* wait a while for the device to reboot */</div><div class='del'>-	mdelay(50);</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		const struct firmware *fw_entry = NULL;</div><div class='del'>-		long fw_len;</div><div class='del'>-		const u32 *fw_ptr;</div><div class='del'>-</div><div class='del'>-		rc = request_firmware(&amp;fw_entry, priv-&gt;firmware, PRISM_FW_PDEV);</div><div class='del'>-		if (rc) {</div><div class='del'>-			printk(KERN_ERR</div><div class='del'>-			       "%s: request_firmware() failed for '%s'\n",</div><div class='del'>-			       "prism54", priv-&gt;firmware);</div><div class='del'>-			return rc;</div><div class='del'>-		}</div><div class='del'>-		/* prepare the Direct Memory Base register */</div><div class='del'>-		reg = ISL38XX_DEV_FIRMWARE_ADDRES;</div><div class='del'>-</div><div class='del'>-		fw_ptr = (u32 *) fw_entry-&gt;data;</div><div class='del'>-		fw_len = fw_entry-&gt;size;</div><div class='del'>-</div><div class='del'>-		if (fw_len % 4) {</div><div class='del'>-			printk(KERN_ERR</div><div class='del'>-			       "%s: firmware '%s' size is not multiple of 32bit, aborting!\n",</div><div class='del'>-			       "prism54", priv-&gt;firmware);</div><div class='del'>-			release_firmware(fw_entry);</div><div class='del'>-			return -EILSEQ; /* Illegal byte sequence  */;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		while (fw_len &gt; 0) {</div><div class='del'>-			long _fw_len =</div><div class='del'>-			    (fw_len &gt;</div><div class='del'>-			     ISL38XX_MEMORY_WINDOW_SIZE) ?</div><div class='del'>-			    ISL38XX_MEMORY_WINDOW_SIZE : fw_len;</div><div class='del'>-			u32 __iomem *dev_fw_ptr = device_base + ISL38XX_DIRECT_MEM_WIN;</div><div class='del'>-</div><div class='del'>-			/* set the card's base address for writing the data */</div><div class='del'>-			isl38xx_w32_flush(device_base, reg,</div><div class='del'>-					  ISL38XX_DIR_MEM_BASE_REG);</div><div class='del'>-			wmb();	/* be paranoid */</div><div class='del'>-</div><div class='del'>-			/* increment the write address for next iteration */</div><div class='del'>-			reg += _fw_len;</div><div class='del'>-			fw_len -= _fw_len;</div><div class='del'>-</div><div class='del'>-			/* write the data to the Direct Memory Window 32bit-wise */</div><div class='del'>-			/* memcpy_toio() doesn't guarantee 32bit writes :-| */</div><div class='del'>-			while (_fw_len &gt; 0) {</div><div class='del'>-				/* use non-swapping writel() */</div><div class='del'>-				__raw_writel(*fw_ptr, dev_fw_ptr);</div><div class='del'>-				fw_ptr++, dev_fw_ptr++;</div><div class='del'>-				_fw_len -= 4;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* flush PCI posting */</div><div class='del'>-			(void) readl(device_base + ISL38XX_PCI_POSTING_FLUSH);</div><div class='del'>-			wmb();	/* be paranoid again */</div><div class='del'>-</div><div class='del'>-			BUG_ON(_fw_len != 0);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		BUG_ON(fw_len != 0);</div><div class='del'>-</div><div class='del'>-		/* Firmware version is at offset 40 (also for "newmac") */</div><div class='del'>-		printk(KERN_DEBUG "%s: firmware version: %.8s\n",</div><div class='del'>-		       priv-&gt;ndev-&gt;name, fw_entry-&gt;data + 40);</div><div class='del'>-</div><div class='del'>-		release_firmware(fw_entry);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* now reset the device</div><div class='del'>-	 * clear the Reset &amp; ClkRun bit, set the RAMBoot bit */</div><div class='del'>-	reg = readl(device_base + ISL38XX_CTRL_STAT_REG);</div><div class='del'>-	reg &amp;= ~ISL38XX_CTRL_STAT_CLKRUN;</div><div class='del'>-	reg &amp;= ~ISL38XX_CTRL_STAT_RESET;</div><div class='del'>-	reg |= ISL38XX_CTRL_STAT_RAMBOOT;</div><div class='del'>-	isl38xx_w32_flush(device_base, reg, ISL38XX_CTRL_STAT_REG);</div><div class='del'>-	wmb();</div><div class='del'>-	udelay(ISL38XX_WRITEIO_DELAY);</div><div class='del'>-</div><div class='del'>-	/* set the reset bit latches the host override and RAMBoot bits</div><div class='del'>-	 * into the device for operation when the reset bit is reset */</div><div class='del'>-	reg |= ISL38XX_CTRL_STAT_RESET;</div><div class='del'>-	writel(reg, device_base + ISL38XX_CTRL_STAT_REG);</div><div class='del'>-	/* don't do flush PCI posting here! */</div><div class='del'>-	wmb();</div><div class='del'>-	udelay(ISL38XX_WRITEIO_DELAY);</div><div class='del'>-</div><div class='del'>-	/* clear the reset bit should start the whole circus */</div><div class='del'>-	reg &amp;= ~ISL38XX_CTRL_STAT_RESET;</div><div class='del'>-	writel(reg, device_base + ISL38XX_CTRL_STAT_REG);</div><div class='del'>-	/* don't do flush PCI posting here! */</div><div class='del'>-	wmb();</div><div class='del'>-	udelay(ISL38XX_WRITEIO_DELAY);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>-    Device Interrupt Handler</div><div class='del'>-******************************************************************************/</div><div class='del'>-</div><div class='del'>-irqreturn_t</div><div class='del'>-islpci_interrupt(int irq, void *config)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-	islpci_private *priv = config;</div><div class='del'>-	struct net_device *ndev = priv-&gt;ndev;</div><div class='del'>-	void __iomem *device = priv-&gt;device_base;</div><div class='del'>-	int powerstate = ISL38XX_PSM_POWERSAVE_STATE;</div><div class='del'>-</div><div class='del'>-	/* lock the interrupt handler */</div><div class='del'>-	spin_lock(&amp;priv-&gt;slock);</div><div class='del'>-</div><div class='del'>-	/* received an interrupt request on a shared IRQ line</div><div class='del'>-	 * first check whether the device is in sleep mode */</div><div class='del'>-	reg = readl(device + ISL38XX_CTRL_STAT_REG);</div><div class='del'>-	if (reg &amp; ISL38XX_CTRL_STAT_SLEEPMODE)</div><div class='del'>-		/* device is in sleep mode, IRQ was generated by someone else */</div><div class='del'>-	{</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-		DEBUG(SHOW_TRACING, "Assuming someone else called the IRQ\n");</div><div class='del'>-#endif</div><div class='del'>-		spin_unlock(&amp;priv-&gt;slock);</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* check whether there is any source of interrupt on the device */</div><div class='del'>-	reg = readl(device + ISL38XX_INT_IDENT_REG);</div><div class='del'>-</div><div class='del'>-	/* also check the contents of the Interrupt Enable Register, because this</div><div class='del'>-	 * will filter out interrupt sources from other devices on the same irq ! */</div><div class='del'>-	reg &amp;= readl(device + ISL38XX_INT_EN_REG);</div><div class='del'>-	reg &amp;= ISL38XX_INT_SOURCES;</div><div class='del'>-</div><div class='del'>-	if (reg != 0) {</div><div class='del'>-		if (islpci_get_state(priv) != PRV_STATE_SLEEP)</div><div class='del'>-			powerstate = ISL38XX_PSM_ACTIVE_STATE;</div><div class='del'>-</div><div class='del'>-		/* reset the request bits in the Identification register */</div><div class='del'>-		isl38xx_w32_flush(device, reg, ISL38XX_INT_ACK_REG);</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-		DEBUG(SHOW_FUNCTION_CALLS,</div><div class='del'>-		      "IRQ: Identification register 0x%p 0x%x\n", device, reg);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		/* check for each bit in the register separately */</div><div class='del'>-		if (reg &amp; ISL38XX_INT_IDENT_UPDATE) {</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-			/* Queue has been updated */</div><div class='del'>-			DEBUG(SHOW_TRACING, "IRQ: Update flag\n");</div><div class='del'>-</div><div class='del'>-			DEBUG(SHOW_QUEUE_INDEXES,</div><div class='del'>-			      "CB drv Qs: [%i][%i][%i][%i][%i][%i]\n",</div><div class='del'>-			      le32_to_cpu(priv-&gt;control_block-&gt;</div><div class='del'>-					  driver_curr_frag[0]),</div><div class='del'>-			      le32_to_cpu(priv-&gt;control_block-&gt;</div><div class='del'>-					  driver_curr_frag[1]),</div><div class='del'>-			      le32_to_cpu(priv-&gt;control_block-&gt;</div><div class='del'>-					  driver_curr_frag[2]),</div><div class='del'>-			      le32_to_cpu(priv-&gt;control_block-&gt;</div><div class='del'>-					  driver_curr_frag[3]),</div><div class='del'>-			      le32_to_cpu(priv-&gt;control_block-&gt;</div><div class='del'>-					  driver_curr_frag[4]),</div><div class='del'>-			      le32_to_cpu(priv-&gt;control_block-&gt;</div><div class='del'>-					  driver_curr_frag[5])</div><div class='del'>-			    );</div><div class='del'>-</div><div class='del'>-			DEBUG(SHOW_QUEUE_INDEXES,</div><div class='del'>-			      "CB dev Qs: [%i][%i][%i][%i][%i][%i]\n",</div><div class='del'>-			      le32_to_cpu(priv-&gt;control_block-&gt;</div><div class='del'>-					  device_curr_frag[0]),</div><div class='del'>-			      le32_to_cpu(priv-&gt;control_block-&gt;</div><div class='del'>-					  device_curr_frag[1]),</div><div class='del'>-			      le32_to_cpu(priv-&gt;control_block-&gt;</div><div class='del'>-					  device_curr_frag[2]),</div><div class='del'>-			      le32_to_cpu(priv-&gt;control_block-&gt;</div><div class='del'>-					  device_curr_frag[3]),</div><div class='del'>-			      le32_to_cpu(priv-&gt;control_block-&gt;</div><div class='del'>-					  device_curr_frag[4]),</div><div class='del'>-			      le32_to_cpu(priv-&gt;control_block-&gt;</div><div class='del'>-					  device_curr_frag[5])</div><div class='del'>-			    );</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-			/* cleanup the data low transmit queue */</div><div class='del'>-			islpci_eth_cleanup_transmit(priv, priv-&gt;control_block);</div><div class='del'>-</div><div class='del'>-			/* device is in active state, update the</div><div class='del'>-			 * powerstate flag if necessary */</div><div class='del'>-			powerstate = ISL38XX_PSM_ACTIVE_STATE;</div><div class='del'>-</div><div class='del'>-			/* check all three queues in priority order</div><div class='del'>-			 * call the PIMFOR receive function until the</div><div class='del'>-			 * queue is empty */</div><div class='del'>-			if (isl38xx_in_queue(priv-&gt;control_block,</div><div class='del'>-						ISL38XX_CB_RX_MGMTQ) != 0) {</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-				DEBUG(SHOW_TRACING,</div><div class='del'>-				      "Received frame in Management Queue\n");</div><div class='del'>-#endif</div><div class='del'>-				islpci_mgt_receive(ndev);</div><div class='del'>-</div><div class='del'>-				islpci_mgt_cleanup_transmit(ndev);</div><div class='del'>-</div><div class='del'>-				/* Refill slots in receive queue */</div><div class='del'>-				islpci_mgmt_rx_fill(ndev);</div><div class='del'>-</div><div class='del'>-				/* no need to trigger the device, next</div><div class='del'>-                                   islpci_mgt_transaction does it */</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			while (isl38xx_in_queue(priv-&gt;control_block,</div><div class='del'>-						ISL38XX_CB_RX_DATA_LQ) != 0) {</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-				DEBUG(SHOW_TRACING,</div><div class='del'>-				      "Received frame in Data Low Queue\n");</div><div class='del'>-#endif</div><div class='del'>-				islpci_eth_receive(priv);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* check whether the data transmit queues were full */</div><div class='del'>-			if (priv-&gt;data_low_tx_full) {</div><div class='del'>-				/* check whether the transmit is not full anymore */</div><div class='del'>-				if (ISL38XX_CB_TX_QSIZE -</div><div class='del'>-				    isl38xx_in_queue(priv-&gt;control_block,</div><div class='del'>-						     ISL38XX_CB_TX_DATA_LQ) &gt;=</div><div class='del'>-				    ISL38XX_MIN_QTHRESHOLD) {</div><div class='del'>-					/* nope, the driver is ready for more network frames */</div><div class='del'>-					netif_wake_queue(priv-&gt;ndev);</div><div class='del'>-</div><div class='del'>-					/* reset the full flag */</div><div class='del'>-					priv-&gt;data_low_tx_full = 0;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (reg &amp; ISL38XX_INT_IDENT_INIT) {</div><div class='del'>-			/* Device has been initialized */</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-			DEBUG(SHOW_TRACING,</div><div class='del'>-			      "IRQ: Init flag, device initialized\n");</div><div class='del'>-#endif</div><div class='del'>-			wake_up(&amp;priv-&gt;reset_done);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (reg &amp; ISL38XX_INT_IDENT_SLEEP) {</div><div class='del'>-			/* Device intends to move to powersave state */</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-			DEBUG(SHOW_TRACING, "IRQ: Sleep flag\n");</div><div class='del'>-#endif</div><div class='del'>-			isl38xx_handle_sleep_request(priv-&gt;control_block,</div><div class='del'>-						     &amp;powerstate,</div><div class='del'>-						     priv-&gt;device_base);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (reg &amp; ISL38XX_INT_IDENT_WAKEUP) {</div><div class='del'>-			/* Device has been woken up to active state */</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-			DEBUG(SHOW_TRACING, "IRQ: Wakeup flag\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-			isl38xx_handle_wakeup(priv-&gt;control_block,</div><div class='del'>-					      &amp;powerstate, priv-&gt;device_base);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-		DEBUG(SHOW_TRACING, "Assuming someone else called the IRQ\n");</div><div class='del'>-#endif</div><div class='del'>-		spin_unlock(&amp;priv-&gt;slock);</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* sleep -&gt; ready */</div><div class='del'>-	if (islpci_get_state(priv) == PRV_STATE_SLEEP</div><div class='del'>-	    &amp;&amp; powerstate == ISL38XX_PSM_ACTIVE_STATE)</div><div class='del'>-		islpci_set_state(priv, PRV_STATE_READY);</div><div class='del'>-</div><div class='del'>-	/* !sleep -&gt; sleep */</div><div class='del'>-	if (islpci_get_state(priv) != PRV_STATE_SLEEP</div><div class='del'>-	    &amp;&amp; powerstate == ISL38XX_PSM_POWERSAVE_STATE)</div><div class='del'>-		islpci_set_state(priv, PRV_STATE_SLEEP);</div><div class='del'>-</div><div class='del'>-	/* unlock the interrupt handler */</div><div class='del'>-	spin_unlock(&amp;priv-&gt;slock);</div><div class='del'>-</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>-    Network Interface Control &amp; Statistical functions</div><div class='del'>-******************************************************************************/</div><div class='del'>-static int</div><div class='del'>-islpci_open(struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	u32 rc;</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-</div><div class='del'>-	/* reset data structures, upload firmware and reset device */</div><div class='del'>-	rc = islpci_reset(priv,1);</div><div class='del'>-	if (rc) {</div><div class='del'>-		prism54_bring_down(priv);</div><div class='del'>-		return rc; /* Returns informative message */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	netif_start_queue(ndev);</div><div class='del'>-</div><div class='del'>-	/* Turn off carrier if in STA or Ad-hoc mode. It will be turned on</div><div class='del'>-	 * once the firmware receives a trap of being associated</div><div class='del'>-	 * (GEN_OID_LINKSTATE). In other modes (AP or WDS or monitor) we</div><div class='del'>-	 * should just leave the carrier on as its expected the firmware</div><div class='del'>-	 * won't send us a trigger. */</div><div class='del'>-	if (priv-&gt;iw_mode == IW_MODE_INFRA || priv-&gt;iw_mode == IW_MODE_ADHOC)</div><div class='del'>-		netif_carrier_off(ndev);</div><div class='del'>-	else</div><div class='del'>-		netif_carrier_on(ndev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-islpci_close(struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: islpci_close ()\n", ndev-&gt;name);</div><div class='del'>-</div><div class='del'>-	netif_stop_queue(ndev);</div><div class='del'>-</div><div class='del'>-	return prism54_bring_down(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_bring_down(islpci_private *priv)</div><div class='del'>-{</div><div class='del'>-	void __iomem *device_base = priv-&gt;device_base;</div><div class='del'>-	u32 reg;</div><div class='del'>-	/* we are going to shutdown the device */</div><div class='del'>-	islpci_set_state(priv, PRV_STATE_PREBOOT);</div><div class='del'>-</div><div class='del'>-	/* disable all device interrupts in case they weren't */</div><div class='del'>-	isl38xx_disable_interrupts(priv-&gt;device_base);</div><div class='del'>-</div><div class='del'>-	/* For safety reasons, we may want to ensure that no DMA transfer is</div><div class='del'>-	 * currently in progress by emptying the TX and RX queues. */</div><div class='del'>-</div><div class='del'>-	/* wait until interrupts have finished executing on other CPUs */</div><div class='del'>-	synchronize_irq(priv-&gt;pdev-&gt;irq);</div><div class='del'>-</div><div class='del'>-	reg = readl(device_base + ISL38XX_CTRL_STAT_REG);</div><div class='del'>-	reg &amp;= ~(ISL38XX_CTRL_STAT_RESET | ISL38XX_CTRL_STAT_RAMBOOT);</div><div class='del'>-	writel(reg, device_base + ISL38XX_CTRL_STAT_REG);</div><div class='del'>-	wmb();</div><div class='del'>-	udelay(ISL38XX_WRITEIO_DELAY);</div><div class='del'>-</div><div class='del'>-	reg |= ISL38XX_CTRL_STAT_RESET;</div><div class='del'>-	writel(reg, device_base + ISL38XX_CTRL_STAT_REG);</div><div class='del'>-	wmb();</div><div class='del'>-	udelay(ISL38XX_WRITEIO_DELAY);</div><div class='del'>-</div><div class='del'>-	/* clear the Reset bit */</div><div class='del'>-	reg &amp;= ~ISL38XX_CTRL_STAT_RESET;</div><div class='del'>-	writel(reg, device_base + ISL38XX_CTRL_STAT_REG);</div><div class='del'>-	wmb();</div><div class='del'>-</div><div class='del'>-	/* wait a while for the device to reset */</div><div class='del'>-	schedule_timeout_uninterruptible(msecs_to_jiffies(50));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-islpci_upload_fw(islpci_private *priv)</div><div class='del'>-{</div><div class='del'>-	islpci_state_t old_state;</div><div class='del'>-	u32 rc;</div><div class='del'>-</div><div class='del'>-	old_state = islpci_set_state(priv, PRV_STATE_BOOT);</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: uploading firmware...\n", priv-&gt;ndev-&gt;name);</div><div class='del'>-</div><div class='del'>-	rc = isl_upload_firmware(priv);</div><div class='del'>-	if (rc) {</div><div class='del'>-		/* error uploading the firmware */</div><div class='del'>-		printk(KERN_ERR "%s: could not upload firmware ('%s')\n",</div><div class='del'>-		       priv-&gt;ndev-&gt;name, priv-&gt;firmware);</div><div class='del'>-</div><div class='del'>-		islpci_set_state(priv, old_state);</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: firmware upload complete\n",</div><div class='del'>-	       priv-&gt;ndev-&gt;name);</div><div class='del'>-</div><div class='del'>-	islpci_set_state(priv, PRV_STATE_POSTBOOT);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-islpci_reset_if(islpci_private *priv)</div><div class='del'>-{</div><div class='del'>-	long remaining;</div><div class='del'>-	int result = -ETIME;</div><div class='del'>-	int count;</div><div class='del'>-</div><div class='del'>-	DEFINE_WAIT(wait);</div><div class='del'>-	prepare_to_wait(&amp;priv-&gt;reset_done, &amp;wait, TASK_UNINTERRUPTIBLE);</div><div class='del'>-</div><div class='del'>-	/* now the last step is to reset the interface */</div><div class='del'>-	isl38xx_interface_reset(priv-&gt;device_base, priv-&gt;device_host_address);</div><div class='del'>-	islpci_set_state(priv, PRV_STATE_PREINIT);</div><div class='del'>-</div><div class='del'>-        for(count = 0; count &lt; 2 &amp;&amp; result; count++) {</div><div class='del'>-		/* The software reset acknowledge needs about 220 msec here.</div><div class='del'>-		 * Be conservative and wait for up to one second. */</div><div class='del'>-</div><div class='del'>-		remaining = schedule_timeout_uninterruptible(HZ);</div><div class='del'>-</div><div class='del'>-		if(remaining &gt; 0) {</div><div class='del'>-			result = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* If we're here it's because our IRQ hasn't yet gone through.</div><div class='del'>-		 * Retry a bit more...</div><div class='del'>-		 */</div><div class='del'>-		printk(KERN_ERR "%s: no 'reset complete' IRQ seen - retrying\n",</div><div class='del'>-			priv-&gt;ndev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	finish_wait(&amp;priv-&gt;reset_done, &amp;wait);</div><div class='del'>-</div><div class='del'>-	if (result) {</div><div class='del'>-		printk(KERN_ERR "%s: interface reset failure\n", priv-&gt;ndev-&gt;name);</div><div class='del'>-		return result;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	islpci_set_state(priv, PRV_STATE_INIT);</div><div class='del'>-</div><div class='del'>-	/* Now that the device is 100% up, let's allow</div><div class='del'>-	 * for the other interrupts --</div><div class='del'>-	 * NOTE: this is not *yet* true since we've only allowed the</div><div class='del'>-	 * INIT interrupt on the IRQ line. We can perhaps poll</div><div class='del'>-	 * the IRQ line until we know for sure the reset went through */</div><div class='del'>-	isl38xx_enable_common_interrupts(priv-&gt;device_base);</div><div class='del'>-</div><div class='del'>-	down_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-	result = mgt_commit(priv);</div><div class='del'>-	if (result) {</div><div class='del'>-		printk(KERN_ERR "%s: interface reset failure\n", priv-&gt;ndev-&gt;name);</div><div class='del'>-		up_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-		return result;</div><div class='del'>-	}</div><div class='del'>-	up_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-</div><div class='del'>-	islpci_set_state(priv, PRV_STATE_READY);</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: interface reset complete\n", priv-&gt;ndev-&gt;name);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-islpci_reset(islpci_private *priv, int reload_firmware)</div><div class='del'>-{</div><div class='del'>-	isl38xx_control_block *cb =    /* volatile not needed */</div><div class='del'>-		(isl38xx_control_block *) priv-&gt;control_block;</div><div class='del'>-	unsigned counter;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	if (reload_firmware)</div><div class='del'>-		islpci_set_state(priv, PRV_STATE_PREBOOT);</div><div class='del'>-	else</div><div class='del'>-		islpci_set_state(priv, PRV_STATE_POSTBOOT);</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: resetting device...\n", priv-&gt;ndev-&gt;name);</div><div class='del'>-</div><div class='del'>-	/* disable all device interrupts in case they weren't */</div><div class='del'>-	isl38xx_disable_interrupts(priv-&gt;device_base);</div><div class='del'>-</div><div class='del'>-	/* flush all management queues */</div><div class='del'>-	priv-&gt;index_mgmt_tx = 0;</div><div class='del'>-	priv-&gt;index_mgmt_rx = 0;</div><div class='del'>-</div><div class='del'>-	/* clear the indexes in the frame pointer */</div><div class='del'>-	for (counter = 0; counter &lt; ISL38XX_CB_QCOUNT; counter++) {</div><div class='del'>-		cb-&gt;driver_curr_frag[counter] = cpu_to_le32(0);</div><div class='del'>-		cb-&gt;device_curr_frag[counter] = cpu_to_le32(0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* reset the mgmt receive queue */</div><div class='del'>-	for (counter = 0; counter &lt; ISL38XX_CB_MGMT_QSIZE; counter++) {</div><div class='del'>-		isl38xx_fragment *frag = &amp;cb-&gt;rx_data_mgmt[counter];</div><div class='del'>-		frag-&gt;size = cpu_to_le16(MGMT_FRAME_SIZE);</div><div class='del'>-		frag-&gt;flags = 0;</div><div class='del'>-		frag-&gt;address = cpu_to_le32(priv-&gt;mgmt_rx[counter].pci_addr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (counter = 0; counter &lt; ISL38XX_CB_RX_QSIZE; counter++) {</div><div class='del'>-		cb-&gt;rx_data_low[counter].address =</div><div class='del'>-		    cpu_to_le32((u32) priv-&gt;pci_map_rx_address[counter]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* since the receive queues are filled with empty fragments, now we can</div><div class='del'>-	 * set the corresponding indexes in the Control Block */</div><div class='del'>-	priv-&gt;control_block-&gt;driver_curr_frag[ISL38XX_CB_RX_DATA_LQ] =</div><div class='del'>-	    cpu_to_le32(ISL38XX_CB_RX_QSIZE);</div><div class='del'>-	priv-&gt;control_block-&gt;driver_curr_frag[ISL38XX_CB_RX_MGMTQ] =</div><div class='del'>-	    cpu_to_le32(ISL38XX_CB_MGMT_QSIZE);</div><div class='del'>-</div><div class='del'>-	/* reset the remaining real index registers and full flags */</div><div class='del'>-	priv-&gt;free_data_rx = 0;</div><div class='del'>-	priv-&gt;free_data_tx = 0;</div><div class='del'>-	priv-&gt;data_low_tx_full = 0;</div><div class='del'>-</div><div class='del'>-	if (reload_firmware) { /* Should we load the firmware ? */</div><div class='del'>-	/* now that the data structures are cleaned up, upload</div><div class='del'>-	 * firmware and reset interface */</div><div class='del'>-		rc = islpci_upload_fw(priv);</div><div class='del'>-		if (rc) {</div><div class='del'>-			printk(KERN_ERR "%s: islpci_reset: failure\n",</div><div class='del'>-				priv-&gt;ndev-&gt;name);</div><div class='del'>-			return rc;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* finally reset interface */</div><div class='del'>-	rc = islpci_reset_if(priv);</div><div class='del'>-	if (rc)</div><div class='del'>-		printk(KERN_ERR "prism54: Your card/socket may be faulty, or IRQ line too busy :(\n");</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>-    Network device configuration functions</div><div class='del'>-******************************************************************************/</div><div class='del'>-static int</div><div class='del'>-islpci_alloc_memory(islpci_private *priv)</div><div class='del'>-{</div><div class='del'>-	int counter;</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-	printk(KERN_DEBUG "islpci_alloc_memory\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* remap the PCI device base address to accessible */</div><div class='del'>-	if (!(priv-&gt;device_base =</div><div class='del'>-	      ioremap(pci_resource_start(priv-&gt;pdev, 0),</div><div class='del'>-		      ISL38XX_PCI_MEM_SIZE))) {</div><div class='del'>-		/* error in remapping the PCI device memory address range */</div><div class='del'>-		printk(KERN_ERR "PCI memory remapping failed\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* memory layout for consistent DMA region:</div><div class='del'>-	 *</div><div class='del'>-	 * Area 1: Control Block for the device interface</div><div class='del'>-	 * Area 2: Power Save Mode Buffer for temporary frame storage. Be aware that</div><div class='del'>-	 *         the number of supported stations in the AP determines the minimal</div><div class='del'>-	 *         size of the buffer !</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* perform the allocation */</div><div class='del'>-	priv-&gt;driver_mem_address = dma_alloc_coherent(&amp;priv-&gt;pdev-&gt;dev,</div><div class='del'>-						      HOST_MEM_BLOCK,</div><div class='del'>-						      &amp;priv-&gt;device_host_address,</div><div class='del'>-						      GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;driver_mem_address) {</div><div class='del'>-		/* error allocating the block of PCI memory */</div><div class='del'>-		printk(KERN_ERR "%s: could not allocate DMA memory, aborting!",</div><div class='del'>-		       "prism54");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* assign the Control Block to the first address of the allocated area */</div><div class='del'>-	priv-&gt;control_block =</div><div class='del'>-	    (isl38xx_control_block *) priv-&gt;driver_mem_address;</div><div class='del'>-</div><div class='del'>-	/* set the Power Save Buffer pointer directly behind the CB */</div><div class='del'>-	priv-&gt;device_psm_buffer =</div><div class='del'>-		priv-&gt;device_host_address + CONTROL_BLOCK_SIZE;</div><div class='del'>-</div><div class='del'>-	/* make sure all buffer pointers are initialized */</div><div class='del'>-	for (counter = 0; counter &lt; ISL38XX_CB_QCOUNT; counter++) {</div><div class='del'>-		priv-&gt;control_block-&gt;driver_curr_frag[counter] = cpu_to_le32(0);</div><div class='del'>-		priv-&gt;control_block-&gt;device_curr_frag[counter] = cpu_to_le32(0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;index_mgmt_rx = 0;</div><div class='del'>-	memset(priv-&gt;mgmt_rx, 0, sizeof(priv-&gt;mgmt_rx));</div><div class='del'>-	memset(priv-&gt;mgmt_tx, 0, sizeof(priv-&gt;mgmt_tx));</div><div class='del'>-</div><div class='del'>-	/* allocate rx queue for management frames */</div><div class='del'>-	if (islpci_mgmt_rx_fill(priv-&gt;ndev) &lt; 0)</div><div class='del'>-		goto out_free;</div><div class='del'>-</div><div class='del'>-	/* now get the data rx skb's */</div><div class='del'>-	memset(priv-&gt;data_low_rx, 0, sizeof (priv-&gt;data_low_rx));</div><div class='del'>-	memset(priv-&gt;pci_map_rx_address, 0, sizeof (priv-&gt;pci_map_rx_address));</div><div class='del'>-</div><div class='del'>-	for (counter = 0; counter &lt; ISL38XX_CB_RX_QSIZE; counter++) {</div><div class='del'>-		struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-		/* allocate an sk_buff for received data frames storage</div><div class='del'>-		 * each frame on receive size consists of 1 fragment</div><div class='del'>-		 * include any required allignment operations */</div><div class='del'>-		if (!(skb = dev_alloc_skb(MAX_FRAGMENT_SIZE_RX + 2))) {</div><div class='del'>-			/* error allocating an sk_buff structure elements */</div><div class='del'>-			printk(KERN_ERR "Error allocating skb.\n");</div><div class='del'>-			skb = NULL;</div><div class='del'>-			goto out_free;</div><div class='del'>-		}</div><div class='del'>-		skb_reserve(skb, (4 - (long) skb-&gt;data) &amp; 0x03);</div><div class='del'>-		/* add the new allocated sk_buff to the buffer array */</div><div class='del'>-		priv-&gt;data_low_rx[counter] = skb;</div><div class='del'>-</div><div class='del'>-		/* map the allocated skb data area to pci */</div><div class='del'>-		priv-&gt;pci_map_rx_address[counter] =</div><div class='del'>-		    dma_map_single(&amp;priv-&gt;pdev-&gt;dev, (void *)skb-&gt;data,</div><div class='del'>-				   MAX_FRAGMENT_SIZE_RX + 2, DMA_FROM_DEVICE);</div><div class='del'>-		if (dma_mapping_error(&amp;priv-&gt;pdev-&gt;dev, priv-&gt;pci_map_rx_address[counter])) {</div><div class='del'>-			priv-&gt;pci_map_rx_address[counter] = 0;</div><div class='del'>-			/* error mapping the buffer to device</div><div class='del'>-			   accessible memory address */</div><div class='del'>-			printk(KERN_ERR "failed to map skb DMA'able\n");</div><div class='del'>-			goto out_free;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prism54_acl_init(&amp;priv-&gt;acl);</div><div class='del'>-	prism54_wpa_bss_ie_init(priv);</div><div class='del'>-	if (mgt_init(priv))</div><div class='del'>-		goto out_free;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>- out_free:</div><div class='del'>-	islpci_free_memory(priv);</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-islpci_free_memory(islpci_private *priv)</div><div class='del'>-{</div><div class='del'>-	int counter;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;device_base)</div><div class='del'>-		iounmap(priv-&gt;device_base);</div><div class='del'>-	priv-&gt;device_base = NULL;</div><div class='del'>-</div><div class='del'>-	/* free consistent DMA area... */</div><div class='del'>-	if (priv-&gt;driver_mem_address)</div><div class='del'>-		dma_free_coherent(&amp;priv-&gt;pdev-&gt;dev, HOST_MEM_BLOCK,</div><div class='del'>-				  priv-&gt;driver_mem_address,</div><div class='del'>-				  priv-&gt;device_host_address);</div><div class='del'>-</div><div class='del'>-	/* clear some dangling pointers */</div><div class='del'>-	priv-&gt;driver_mem_address = NULL;</div><div class='del'>-	priv-&gt;device_host_address = 0;</div><div class='del'>-	priv-&gt;device_psm_buffer = 0;</div><div class='del'>-	priv-&gt;control_block = NULL;</div><div class='del'>-</div><div class='del'>-        /* clean up mgmt rx buffers */</div><div class='del'>-        for (counter = 0; counter &lt; ISL38XX_CB_MGMT_QSIZE; counter++) {</div><div class='del'>-		struct islpci_membuf *buf = &amp;priv-&gt;mgmt_rx[counter];</div><div class='del'>-		if (buf-&gt;pci_addr)</div><div class='del'>-			dma_unmap_single(&amp;priv-&gt;pdev-&gt;dev, buf-&gt;pci_addr,</div><div class='del'>-					 buf-&gt;size, DMA_FROM_DEVICE);</div><div class='del'>-		buf-&gt;pci_addr = 0;</div><div class='del'>-		kfree(buf-&gt;mem);</div><div class='del'>-		buf-&gt;size = 0;</div><div class='del'>-		buf-&gt;mem = NULL;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-	/* clean up data rx buffers */</div><div class='del'>-	for (counter = 0; counter &lt; ISL38XX_CB_RX_QSIZE; counter++) {</div><div class='del'>-		if (priv-&gt;pci_map_rx_address[counter])</div><div class='del'>-			dma_unmap_single(&amp;priv-&gt;pdev-&gt;dev,</div><div class='del'>-					 priv-&gt;pci_map_rx_address[counter],</div><div class='del'>-					 MAX_FRAGMENT_SIZE_RX + 2,</div><div class='del'>-					 DMA_FROM_DEVICE);</div><div class='del'>-		priv-&gt;pci_map_rx_address[counter] = 0;</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;data_low_rx[counter])</div><div class='del'>-			dev_kfree_skb(priv-&gt;data_low_rx[counter]);</div><div class='del'>-		priv-&gt;data_low_rx[counter] = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Free the access control list and the WPA list */</div><div class='del'>-	prism54_acl_clean(&amp;priv-&gt;acl);</div><div class='del'>-	prism54_wpa_bss_ie_clean(priv);</div><div class='del'>-	mgt_clean(priv);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void</div><div class='del'>-islpci_set_multicast_list(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	/* put device into promisc mode and let network layer handle it */</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void islpci_ethtool_get_drvinfo(struct net_device *dev,</div><div class='del'>-                                       struct ethtool_drvinfo *info)</div><div class='del'>-{</div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct ethtool_ops islpci_ethtool_ops = {</div><div class='del'>-	.get_drvinfo = islpci_ethtool_get_drvinfo,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops islpci_netdev_ops = {</div><div class='del'>-	.ndo_open 		= islpci_open,</div><div class='del'>-	.ndo_stop		= islpci_close,</div><div class='del'>-	.ndo_start_xmit		= islpci_eth_transmit,</div><div class='del'>-	.ndo_tx_timeout		= islpci_eth_tx_timeout,</div><div class='del'>-	.ndo_set_mac_address 	= prism54_set_mac_address,</div><div class='del'>-	.ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct device_type wlan_type = {</div><div class='del'>-	.name	= "wlan",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct net_device *</div><div class='del'>-islpci_setup(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv;</div><div class='del'>-	struct net_device *ndev = alloc_etherdev(sizeof (islpci_private));</div><div class='del'>-</div><div class='del'>-	if (!ndev)</div><div class='del'>-		return ndev;</div><div class='del'>-</div><div class='del'>-	pci_set_drvdata(pdev, ndev);</div><div class='del'>-	SET_NETDEV_DEV(ndev, &amp;pdev-&gt;dev);</div><div class='del'>-	SET_NETDEV_DEVTYPE(ndev, &amp;wlan_type);</div><div class='del'>-</div><div class='del'>-	/* setup the structure members */</div><div class='del'>-	ndev-&gt;base_addr = pci_resource_start(pdev, 0);</div><div class='del'>-	ndev-&gt;irq = pdev-&gt;irq;</div><div class='del'>-</div><div class='del'>-	/* initialize the function pointers */</div><div class='del'>-	ndev-&gt;netdev_ops = &amp;islpci_netdev_ops;</div><div class='del'>-	ndev-&gt;wireless_handlers = &amp;prism54_handler_def;</div><div class='del'>-	ndev-&gt;ethtool_ops = &amp;islpci_ethtool_ops;</div><div class='del'>-</div><div class='del'>-	/* ndev-&gt;set_multicast_list = &amp;islpci_set_multicast_list; */</div><div class='del'>-	ndev-&gt;addr_len = ETH_ALEN;</div><div class='del'>-	/* Get a non-zero dummy MAC address for nameif. Jean II */</div><div class='del'>-	memcpy(ndev-&gt;dev_addr, dummy_mac, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	ndev-&gt;watchdog_timeo = ISLPCI_TX_TIMEOUT;</div><div class='del'>-</div><div class='del'>-	/* allocate a private device structure to the network device  */</div><div class='del'>-	priv = netdev_priv(ndev);</div><div class='del'>-	priv-&gt;ndev = ndev;</div><div class='del'>-	priv-&gt;pdev = pdev;</div><div class='del'>-	priv-&gt;monitor_type = ARPHRD_IEEE80211;</div><div class='del'>-	priv-&gt;ndev-&gt;type = (priv-&gt;iw_mode == IW_MODE_MONITOR) ?</div><div class='del'>-		priv-&gt;monitor_type : ARPHRD_ETHER;</div><div class='del'>-</div><div class='del'>-	/* Add pointers to enable iwspy support. */</div><div class='del'>-	priv-&gt;wireless_data.spy_data = &amp;priv-&gt;spy_data;</div><div class='del'>-	ndev-&gt;wireless_data = &amp;priv-&gt;wireless_data;</div><div class='del'>-</div><div class='del'>-	/* save the start and end address of the PCI memory area */</div><div class='del'>-	ndev-&gt;mem_start = (unsigned long) priv-&gt;device_base;</div><div class='del'>-	ndev-&gt;mem_end = ndev-&gt;mem_start + ISL38XX_PCI_MEM_SIZE;</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-	DEBUG(SHOW_TRACING, "PCI Memory remapped to 0x%p\n", priv-&gt;device_base);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	init_waitqueue_head(&amp;priv-&gt;reset_done);</div><div class='del'>-</div><div class='del'>-	/* init the queue read locks, process wait counter */</div><div class='del'>-	mutex_init(&amp;priv-&gt;mgmt_lock);</div><div class='del'>-	priv-&gt;mgmt_received = NULL;</div><div class='del'>-	init_waitqueue_head(&amp;priv-&gt;mgmt_wqueue);</div><div class='del'>-	mutex_init(&amp;priv-&gt;stats_lock);</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;slock);</div><div class='del'>-</div><div class='del'>-	/* init state machine with off#1 state */</div><div class='del'>-	priv-&gt;state = PRV_STATE_OFF;</div><div class='del'>-	priv-&gt;state_off = 1;</div><div class='del'>-</div><div class='del'>-	/* initialize workqueue's */</div><div class='del'>-	INIT_WORK(&amp;priv-&gt;stats_work, prism54_update_stats);</div><div class='del'>-	priv-&gt;stats_timestamp = 0;</div><div class='del'>-</div><div class='del'>-	INIT_WORK(&amp;priv-&gt;reset_task, islpci_do_reset_and_wake);</div><div class='del'>-	priv-&gt;reset_task_pending = 0;</div><div class='del'>-</div><div class='del'>-	/* allocate various memory areas */</div><div class='del'>-	if (islpci_alloc_memory(priv))</div><div class='del'>-		goto do_free_netdev;</div><div class='del'>-</div><div class='del'>-	/* select the firmware file depending on the device id */</div><div class='del'>-	switch (pdev-&gt;device) {</div><div class='del'>-	case 0x3877:</div><div class='del'>-		strcpy(priv-&gt;firmware, ISL3877_IMAGE_FILE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 0x3886:</div><div class='del'>-		strcpy(priv-&gt;firmware, ISL3886_IMAGE_FILE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		strcpy(priv-&gt;firmware, ISL3890_IMAGE_FILE);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (register_netdev(ndev)) {</div><div class='del'>-		DEBUG(SHOW_ERROR_MESSAGES,</div><div class='del'>-		      "ERROR: register_netdev() failed\n");</div><div class='del'>-		goto do_islpci_free_memory;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ndev;</div><div class='del'>-</div><div class='del'>-      do_islpci_free_memory:</div><div class='del'>-	islpci_free_memory(priv);</div><div class='del'>-      do_free_netdev:</div><div class='del'>-	free_netdev(ndev);</div><div class='del'>-	priv = NULL;</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-islpci_state_t</div><div class='del'>-islpci_set_state(islpci_private *priv, islpci_state_t new_state)</div><div class='del'>-{</div><div class='del'>-	islpci_state_t old_state;</div><div class='del'>-</div><div class='del'>-	/* lock */</div><div class='del'>-	old_state = priv-&gt;state;</div><div class='del'>-</div><div class='del'>-	/* this means either a race condition or some serious error in</div><div class='del'>-	 * the driver code */</div><div class='del'>-	switch (new_state) {</div><div class='del'>-	case PRV_STATE_OFF:</div><div class='del'>-		priv-&gt;state_off++;</div><div class='del'>-		fallthrough;</div><div class='del'>-	default:</div><div class='del'>-		priv-&gt;state = new_state;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRV_STATE_PREBOOT:</div><div class='del'>-		/* there are actually many off-states, enumerated by</div><div class='del'>-		 * state_off */</div><div class='del'>-		if (old_state == PRV_STATE_OFF)</div><div class='del'>-			priv-&gt;state_off--;</div><div class='del'>-</div><div class='del'>-		/* only if hw_unavailable is zero now it means we either</div><div class='del'>-		 * were in off#1 state, or came here from</div><div class='del'>-		 * somewhere else */</div><div class='del'>-		if (!priv-&gt;state_off)</div><div class='del'>-			priv-&gt;state = new_state;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-#if 0</div><div class='del'>-	printk(KERN_DEBUG "%s: state transition %d -&gt; %d (off#%d)\n",</div><div class='del'>-	       priv-&gt;ndev-&gt;name, old_state, new_state, priv-&gt;state_off);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* invariants */</div><div class='del'>-	BUG_ON(priv-&gt;state_off &lt; 0);</div><div class='del'>-	BUG_ON(priv-&gt;state_off &amp;&amp; (priv-&gt;state != PRV_STATE_OFF));</div><div class='del'>-	BUG_ON(!priv-&gt;state_off &amp;&amp; (priv-&gt;state == PRV_STATE_OFF));</div><div class='del'>-</div><div class='del'>-	/* unlock */</div><div class='del'>-	return old_state;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/intersil/prism54/islpci_dev.h b/drivers/net/wireless/intersil/prism54/islpci_dev.h<br/>deleted file mode 100644<br/>index 4753418dce62..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/prism54/islpci_dev.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/islpci_dev.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,204 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2002 Intersil Americas Inc.</div><div class='del'>- *  Copyright (C) 2003 Herbert Valerio Riedel &lt;hvr@gnu.org&gt;</div><div class='del'>- *  Copyright (C) 2003 Luis R. Rodriguez &lt;mcgrof@ruslug.rutgers.edu&gt;</div><div class='del'>- *  Copyright (C) 2003 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _ISLPCI_DEV_H</div><div class='del'>-#define _ISLPCI_DEV_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/irqreturn.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/wireless.h&gt;</div><div class='del'>-#include &lt;net/iw_handler.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-</div><div class='del'>-#include "isl_38xx.h"</div><div class='del'>-#include "isl_oid.h"</div><div class='del'>-#include "islpci_mgt.h"</div><div class='del'>-</div><div class='del'>-/* some states might not be superflous and may be removed when</div><div class='del'>-   design is finalized (hvr) */</div><div class='del'>-typedef enum {</div><div class='del'>-	PRV_STATE_OFF = 0,	/* this means hw_unavailable is != 0 */</div><div class='del'>-	PRV_STATE_PREBOOT,	/* we are in a pre-boot state (empty RAM) */</div><div class='del'>-	PRV_STATE_BOOT,		/* boot state (fw upload, run fw) */</div><div class='del'>-	PRV_STATE_POSTBOOT,	/* after boot state, need reset now */</div><div class='del'>-	PRV_STATE_PREINIT,	/* pre-init state */</div><div class='del'>-	PRV_STATE_INIT,		/* init state (restore MIB backup to device) */</div><div class='del'>-	PRV_STATE_READY,	/* driver&amp;device are in operational state */</div><div class='del'>-	PRV_STATE_SLEEP		/* device in sleep mode */</div><div class='del'>-} islpci_state_t;</div><div class='del'>-</div><div class='del'>-/* ACL using MAC address */</div><div class='del'>-struct mac_entry {</div><div class='del'>-   struct list_head _list;</div><div class='del'>-   char addr[ETH_ALEN];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct islpci_acl {</div><div class='del'>-   enum { MAC_POLICY_OPEN=0, MAC_POLICY_ACCEPT=1, MAC_POLICY_REJECT=2 } policy;</div><div class='del'>-   struct list_head mac_list;  /* a list of mac_entry */</div><div class='del'>-   int size;   /* size of queue */</div><div class='del'>-   struct mutex lock;   /* accessed in ioctls and trap_work */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct islpci_membuf {</div><div class='del'>-	int size;                   /* size of memory */</div><div class='del'>-	void *mem;                  /* address of memory as seen by CPU */</div><div class='del'>-	dma_addr_t pci_addr;        /* address of memory as seen by device */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define MAX_BSS_WPA_IE_COUNT 64</div><div class='del'>-#define MAX_WPA_IE_LEN 64</div><div class='del'>-struct islpci_bss_wpa_ie {</div><div class='del'>-	struct list_head list;</div><div class='del'>-	unsigned long last_update;</div><div class='del'>-	u8 bssid[ETH_ALEN];</div><div class='del'>-	u8 wpa_ie[MAX_WPA_IE_LEN];</div><div class='del'>-	size_t wpa_ie_len;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	spinlock_t slock;	/* generic spinlock; */</div><div class='del'>-</div><div class='del'>-	u32 priv_oid;</div><div class='del'>-</div><div class='del'>-	/* our mib cache */</div><div class='del'>-	u32 iw_mode;</div><div class='del'>-        struct rw_semaphore mib_sem;</div><div class='del'>-	void **mib;</div><div class='del'>-	char nickname[IW_ESSID_MAX_SIZE+1];</div><div class='del'>-</div><div class='del'>-	/* Take care of the wireless stats */</div><div class='del'>-	struct work_struct stats_work;</div><div class='del'>-	struct mutex stats_lock;</div><div class='del'>-	/* remember when we last updated the stats */</div><div class='del'>-	unsigned long stats_timestamp;</div><div class='del'>-	/* The first is accessed under semaphore locking.</div><div class='del'>-	 * The second is the clean one we return to iwconfig.</div><div class='del'>-	 */</div><div class='del'>-	struct iw_statistics local_iwstatistics;</div><div class='del'>-	struct iw_statistics iwstatistics;</div><div class='del'>-</div><div class='del'>-	struct iw_spy_data spy_data; /* iwspy support */</div><div class='del'>-</div><div class='del'>-	struct iw_public_data wireless_data;</div><div class='del'>-</div><div class='del'>-	int monitor_type; /* ARPHRD_IEEE80211 or ARPHRD_IEEE80211_PRISM */</div><div class='del'>-</div><div class='del'>-	struct islpci_acl acl;</div><div class='del'>-</div><div class='del'>-	/* PCI bus allocation &amp; configuration members */</div><div class='del'>-	struct pci_dev *pdev;	/* PCI structure information */</div><div class='del'>-	char firmware[33];</div><div class='del'>-</div><div class='del'>-	void __iomem *device_base;	/* ioremapped device base address */</div><div class='del'>-</div><div class='del'>-	/* consistent DMA region */</div><div class='del'>-	void *driver_mem_address;	/* base DMA address */</div><div class='del'>-	dma_addr_t device_host_address;	/* base DMA address (bus address) */</div><div class='del'>-	dma_addr_t device_psm_buffer;	/* host memory for PSM buffering (bus address) */</div><div class='del'>-</div><div class='del'>-	/* our network_device structure  */</div><div class='del'>-	struct net_device *ndev;</div><div class='del'>-</div><div class='del'>-	/* device queue interface members */</div><div class='del'>-	struct isl38xx_cb *control_block;	/* device control block</div><div class='del'>-							   (== driver_mem_address!) */</div><div class='del'>-</div><div class='del'>-	/* Each queue has three indexes:</div><div class='del'>-	 *   free/index_mgmt/data_rx/tx (called index, see below),</div><div class='del'>-	 *   driver_curr_frag, and device_curr_frag (in the control block)</div><div class='del'>-	 * All indexes are ever-increasing, but interpreted modulo the</div><div class='del'>-	 * device queue size when used.</div><div class='del'>-	 *   index &lt;= device_curr_frag &lt;= driver_curr_frag  at all times</div><div class='del'>-	 * For rx queues, [index, device_curr_frag) contains fragments</div><div class='del'>-	 * that the interrupt processing needs to handle (owned by driver).</div><div class='del'>-	 * [device_curr_frag, driver_curr_frag) is the free space in the</div><div class='del'>-	 * rx queue, waiting for data (owned by device).  The driver</div><div class='del'>-	 * increments driver_curr_frag to indicate to the device that more</div><div class='del'>-	 * buffers are available.</div><div class='del'>-	 * If device_curr_frag == driver_curr_frag, no more rx buffers are</div><div class='del'>-	 * available, and the rx DMA engine of the device is halted.</div><div class='del'>-	 * For tx queues, [index, device_curr_frag) contains fragments</div><div class='del'>-	 * where tx is done; they need to be freed (owned by driver).</div><div class='del'>-	 * [device_curr_frag, driver_curr_frag) contains the frames</div><div class='del'>-	 * that are being transferred (owned by device).  The driver</div><div class='del'>-	 * increments driver_curr_frag to indicate that more tx work</div><div class='del'>-	 * needs to be done.</div><div class='del'>-	 */</div><div class='del'>-	u32 index_mgmt_rx;              /* real index mgmt rx queue */</div><div class='del'>-	u32 index_mgmt_tx;              /* read index mgmt tx queue */</div><div class='del'>-	u32 free_data_rx;	/* free pointer data rx queue */</div><div class='del'>-	u32 free_data_tx;	/* free pointer data tx queue */</div><div class='del'>-	u32 data_low_tx_full;	/* full detected flag */</div><div class='del'>-</div><div class='del'>-	/* frame memory buffers for the device queues */</div><div class='del'>-	struct islpci_membuf mgmt_tx[ISL38XX_CB_MGMT_QSIZE];</div><div class='del'>-	struct islpci_membuf mgmt_rx[ISL38XX_CB_MGMT_QSIZE];</div><div class='del'>-	struct sk_buff *data_low_tx[ISL38XX_CB_TX_QSIZE];</div><div class='del'>-	struct sk_buff *data_low_rx[ISL38XX_CB_RX_QSIZE];</div><div class='del'>-	dma_addr_t pci_map_tx_address[ISL38XX_CB_TX_QSIZE];</div><div class='del'>-	dma_addr_t pci_map_rx_address[ISL38XX_CB_RX_QSIZE];</div><div class='del'>-</div><div class='del'>-	/* wait for a reset interrupt */</div><div class='del'>-	wait_queue_head_t reset_done;</div><div class='del'>-</div><div class='del'>-	/* used by islpci_mgt_transaction */</div><div class='del'>-	struct mutex mgmt_lock; /* serialize access to mailbox and wqueue */</div><div class='del'>-	struct islpci_mgmtframe *mgmt_received;	  /* mbox for incoming frame */</div><div class='del'>-	wait_queue_head_t mgmt_wqueue;            /* waitqueue for mbox */</div><div class='del'>-</div><div class='del'>-	/* state machine */</div><div class='del'>-	islpci_state_t state;</div><div class='del'>-	int state_off;		/* enumeration of off-state, if 0 then</div><div class='del'>-				 * we're not in any off-state */</div><div class='del'>-</div><div class='del'>-	/* WPA stuff */</div><div class='del'>-	int wpa; /* WPA mode enabled */</div><div class='del'>-	struct list_head bss_wpa_list;</div><div class='del'>-	int num_bss_wpa;</div><div class='del'>-	struct mutex wpa_lock;</div><div class='del'>-	u8 wpa_ie[MAX_WPA_IE_LEN];</div><div class='del'>-	size_t wpa_ie_len;</div><div class='del'>-</div><div class='del'>-	struct work_struct reset_task;</div><div class='del'>-	int reset_task_pending;</div><div class='del'>-} islpci_private;</div><div class='del'>-</div><div class='del'>-static inline islpci_state_t</div><div class='del'>-islpci_get_state(islpci_private *priv)</div><div class='del'>-{</div><div class='del'>-	/* lock */</div><div class='del'>-	return priv-&gt;state;</div><div class='del'>-	/* unlock */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-islpci_state_t islpci_set_state(islpci_private *priv, islpci_state_t new_state);</div><div class='del'>-</div><div class='del'>-#define ISLPCI_TX_TIMEOUT               (2*HZ)</div><div class='del'>-</div><div class='del'>-irqreturn_t islpci_interrupt(int, void *);</div><div class='del'>-</div><div class='del'>-int prism54_post_setup(islpci_private *, int);</div><div class='del'>-int islpci_reset(islpci_private *, int);</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-islpci_trigger(islpci_private *priv)</div><div class='del'>-{</div><div class='del'>-	isl38xx_trigger_device(islpci_get_state(priv) == PRV_STATE_SLEEP,</div><div class='del'>-			       priv-&gt;device_base);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int islpci_free_memory(islpci_private *);</div><div class='del'>-struct net_device *islpci_setup(struct pci_dev *);</div><div class='del'>-</div><div class='del'>-#define DRV_NAME	"prism54"</div><div class='del'>-#define DRV_VERSION	"1.2"</div><div class='del'>-</div><div class='del'>-#endif				/* _ISLPCI_DEV_H */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/prism54/islpci_eth.c b/drivers/net/wireless/intersil/prism54/islpci_eth.c<br/>deleted file mode 100644<br/>index 74dd65716afd..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/prism54/islpci_eth.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/islpci_eth.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,489 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2002 Intersil Americas Inc.</div><div class='del'>- *  Copyright (C) 2004 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/gfp.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;asm/byteorder.h&gt;</div><div class='del'>-</div><div class='del'>-#include "prismcompat.h"</div><div class='del'>-#include "isl_38xx.h"</div><div class='del'>-#include "islpci_eth.h"</div><div class='del'>-#include "islpci_mgt.h"</div><div class='del'>-#include "oid_mgt.h"</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>-    Network Interface functions</div><div class='del'>-******************************************************************************/</div><div class='del'>-void</div><div class='del'>-islpci_eth_cleanup_transmit(islpci_private *priv,</div><div class='del'>-			    isl38xx_control_block *control_block)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	u32 index;</div><div class='del'>-</div><div class='del'>-	/* compare the control block read pointer with the free pointer */</div><div class='del'>-	while (priv-&gt;free_data_tx !=</div><div class='del'>-	       le32_to_cpu(control_block-&gt;</div><div class='del'>-			   device_curr_frag[ISL38XX_CB_TX_DATA_LQ])) {</div><div class='del'>-		/* read the index of the first fragment to be freed */</div><div class='del'>-		index = priv-&gt;free_data_tx % ISL38XX_CB_TX_QSIZE;</div><div class='del'>-</div><div class='del'>-		/* check for holes in the arrays caused by multi fragment frames</div><div class='del'>-		 * searching for the last fragment of a frame */</div><div class='del'>-		if (priv-&gt;pci_map_tx_address[index]) {</div><div class='del'>-			/* entry is the last fragment of a frame</div><div class='del'>-			 * free the skb structure and unmap pci memory */</div><div class='del'>-			skb = priv-&gt;data_low_tx[index];</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-			DEBUG(SHOW_TRACING,</div><div class='del'>-			      "cleanup skb %p skb-&gt;data %p skb-&gt;len %u truesize %u\n",</div><div class='del'>-			      skb, skb-&gt;data, skb-&gt;len, skb-&gt;truesize);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-			dma_unmap_single(&amp;priv-&gt;pdev-&gt;dev,</div><div class='del'>-					 priv-&gt;pci_map_tx_address[index],</div><div class='del'>-					 skb-&gt;len, DMA_TO_DEVICE);</div><div class='del'>-			dev_kfree_skb_irq(skb);</div><div class='del'>-			skb = NULL;</div><div class='del'>-		}</div><div class='del'>-		/* increment the free data low queue pointer */</div><div class='del'>-		priv-&gt;free_data_tx++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-netdev_tx_t</div><div class='del'>-islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	isl38xx_control_block *cb = priv-&gt;control_block;</div><div class='del'>-	u32 index;</div><div class='del'>-	dma_addr_t pci_map_address;</div><div class='del'>-	int frame_size;</div><div class='del'>-	isl38xx_fragment *fragment;</div><div class='del'>-	int offset;</div><div class='del'>-	struct sk_buff *newskb;</div><div class='del'>-	int newskb_offset;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned char wds_mac[6];</div><div class='del'>-	u32 curr_frag;</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-	DEBUG(SHOW_FUNCTION_CALLS, "islpci_eth_transmit\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* lock the driver code */</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;slock, flags);</div><div class='del'>-</div><div class='del'>-	/* check whether the destination queue has enough fragments for the frame */</div><div class='del'>-	curr_frag = le32_to_cpu(cb-&gt;driver_curr_frag[ISL38XX_CB_TX_DATA_LQ]);</div><div class='del'>-	if (unlikely(curr_frag - priv-&gt;free_data_tx &gt;= ISL38XX_CB_TX_QSIZE)) {</div><div class='del'>-		printk(KERN_ERR "%s: transmit device queue full when awake\n",</div><div class='del'>-		       ndev-&gt;name);</div><div class='del'>-		netif_stop_queue(ndev);</div><div class='del'>-</div><div class='del'>-		/* trigger the device */</div><div class='del'>-		isl38xx_w32_flush(priv-&gt;device_base, ISL38XX_DEV_INT_UPDATE,</div><div class='del'>-				  ISL38XX_DEV_INT_REG);</div><div class='del'>-		udelay(ISL38XX_WRITEIO_DELAY);</div><div class='del'>-		goto drop_free;</div><div class='del'>-	}</div><div class='del'>-	/* Check alignment and WDS frame formatting. The start of the packet should</div><div class='del'>-	 * be aligned on a 4-byte boundary. If WDS is enabled add another 6 bytes</div><div class='del'>-	 * and add WDS address information */</div><div class='del'>-	if (likely(((long) skb-&gt;data &amp; 0x03) | init_wds)) {</div><div class='del'>-		/* get the number of bytes to add and re-align */</div><div class='del'>-		offset = (4 - (long) skb-&gt;data) &amp; 0x03;</div><div class='del'>-		offset += init_wds ? 6 : 0;</div><div class='del'>-</div><div class='del'>-		/* check whether the current skb can be used  */</div><div class='del'>-		if (!skb_cloned(skb) &amp;&amp; (skb_tailroom(skb) &gt;= offset)) {</div><div class='del'>-			unsigned char *src = skb-&gt;data;</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-			DEBUG(SHOW_TRACING, "skb offset %i wds %i\n", offset,</div><div class='del'>-			      init_wds);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-			/* align the buffer on 4-byte boundary */</div><div class='del'>-			skb_reserve(skb, (4 - (long) skb-&gt;data) &amp; 0x03);</div><div class='del'>-			if (init_wds) {</div><div class='del'>-				/* wds requires an additional address field of 6 bytes */</div><div class='del'>-				skb_put(skb, 6);</div><div class='del'>-#ifdef ISLPCI_ETH_DEBUG</div><div class='del'>-				printk("islpci_eth_transmit:wds_mac\n");</div><div class='del'>-#endif</div><div class='del'>-				memmove(skb-&gt;data + 6, src, skb-&gt;len);</div><div class='del'>-				skb_copy_to_linear_data(skb, wds_mac, 6);</div><div class='del'>-			} else {</div><div class='del'>-				memmove(skb-&gt;data, src, skb-&gt;len);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-			DEBUG(SHOW_TRACING, "memmove %p %p %i\n", skb-&gt;data,</div><div class='del'>-			      src, skb-&gt;len);</div><div class='del'>-#endif</div><div class='del'>-		} else {</div><div class='del'>-			newskb =</div><div class='del'>-			    dev_alloc_skb(init_wds ? skb-&gt;len + 6 : skb-&gt;len);</div><div class='del'>-			if (unlikely(newskb == NULL)) {</div><div class='del'>-				printk(KERN_ERR "%s: Cannot allocate skb\n",</div><div class='del'>-				       ndev-&gt;name);</div><div class='del'>-				goto drop_free;</div><div class='del'>-			}</div><div class='del'>-			newskb_offset = (4 - (long) newskb-&gt;data) &amp; 0x03;</div><div class='del'>-</div><div class='del'>-			/* Check if newskb-&gt;data is aligned */</div><div class='del'>-			if (newskb_offset)</div><div class='del'>-				skb_reserve(newskb, newskb_offset);</div><div class='del'>-</div><div class='del'>-			skb_put(newskb, init_wds ? skb-&gt;len + 6 : skb-&gt;len);</div><div class='del'>-			if (init_wds) {</div><div class='del'>-				skb_copy_from_linear_data(skb,</div><div class='del'>-							  newskb-&gt;data + 6,</div><div class='del'>-							  skb-&gt;len);</div><div class='del'>-				skb_copy_to_linear_data(newskb, wds_mac, 6);</div><div class='del'>-#ifdef ISLPCI_ETH_DEBUG</div><div class='del'>-				printk("islpci_eth_transmit:wds_mac\n");</div><div class='del'>-#endif</div><div class='del'>-			} else</div><div class='del'>-				skb_copy_from_linear_data(skb, newskb-&gt;data,</div><div class='del'>-							  skb-&gt;len);</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-			DEBUG(SHOW_TRACING, "memcpy %p %p %i wds %i\n",</div><div class='del'>-			      newskb-&gt;data, skb-&gt;data, skb-&gt;len, init_wds);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-			newskb-&gt;dev = skb-&gt;dev;</div><div class='del'>-			dev_kfree_skb_irq(skb);</div><div class='del'>-			skb = newskb;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* display the buffer contents for debugging */</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-	DEBUG(SHOW_BUFFER_CONTENTS, "\ntx %p ", skb-&gt;data);</div><div class='del'>-	display_buffer((char *) skb-&gt;data, skb-&gt;len);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* map the skb buffer to pci memory for DMA operation */</div><div class='del'>-	pci_map_address = dma_map_single(&amp;priv-&gt;pdev-&gt;dev, (void *)skb-&gt;data,</div><div class='del'>-					 skb-&gt;len, DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(&amp;priv-&gt;pdev-&gt;dev, pci_map_address)) {</div><div class='del'>-		printk(KERN_WARNING "%s: cannot map buffer to PCI\n",</div><div class='del'>-		       ndev-&gt;name);</div><div class='del'>-		goto drop_free;</div><div class='del'>-	}</div><div class='del'>-	/* Place the fragment in the control block structure. */</div><div class='del'>-	index = curr_frag % ISL38XX_CB_TX_QSIZE;</div><div class='del'>-	fragment = &amp;cb-&gt;tx_data_low[index];</div><div class='del'>-</div><div class='del'>-	priv-&gt;pci_map_tx_address[index] = pci_map_address;</div><div class='del'>-	/* store the skb address for future freeing  */</div><div class='del'>-	priv-&gt;data_low_tx[index] = skb;</div><div class='del'>-	/* set the proper fragment start address and size information */</div><div class='del'>-	frame_size = skb-&gt;len;</div><div class='del'>-	fragment-&gt;size = cpu_to_le16(frame_size);</div><div class='del'>-	fragment-&gt;flags = cpu_to_le16(0);	/* set to 1 if more fragments */</div><div class='del'>-	fragment-&gt;address = cpu_to_le32(pci_map_address);</div><div class='del'>-	curr_frag++;</div><div class='del'>-</div><div class='del'>-	/* The fragment address in the control block must have been</div><div class='del'>-	 * written before announcing the frame buffer to device. */</div><div class='del'>-	wmb();</div><div class='del'>-	cb-&gt;driver_curr_frag[ISL38XX_CB_TX_DATA_LQ] = cpu_to_le32(curr_frag);</div><div class='del'>-</div><div class='del'>-	if (curr_frag - priv-&gt;free_data_tx + ISL38XX_MIN_QTHRESHOLD</div><div class='del'>-	    &gt; ISL38XX_CB_TX_QSIZE) {</div><div class='del'>-		/* stop sends from upper layers */</div><div class='del'>-		netif_stop_queue(ndev);</div><div class='del'>-</div><div class='del'>-		/* set the full flag for the transmission queue */</div><div class='del'>-		priv-&gt;data_low_tx_full = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ndev-&gt;stats.tx_packets++;</div><div class='del'>-	ndev-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='del'>-</div><div class='del'>-	/* trigger the device */</div><div class='del'>-	islpci_trigger(priv);</div><div class='del'>-</div><div class='del'>-	/* unlock the driver code */</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;slock, flags);</div><div class='del'>-</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='del'>-</div><div class='del'>-      drop_free:</div><div class='del'>-	ndev-&gt;stats.tx_dropped++;</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;slock, flags);</div><div class='del'>-	dev_kfree_skb(skb);</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-islpci_monitor_rx(islpci_private *priv, struct sk_buff **skb)</div><div class='del'>-{</div><div class='del'>-	/* The card reports full 802.11 packets but with a 20 bytes</div><div class='del'>-	 * header and without the FCS. But there a is a bit that</div><div class='del'>-	 * indicates if the packet is corrupted :-) */</div><div class='del'>-	struct rfmon_header *hdr = (struct rfmon_header *) (*skb)-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (hdr-&gt;flags &amp; 0x01)</div><div class='del'>-		/* This one is bad. Drop it ! */</div><div class='del'>-		return -1;</div><div class='del'>-	if (priv-&gt;ndev-&gt;type == ARPHRD_IEEE80211_PRISM) {</div><div class='del'>-		struct avs_80211_1_header *avs;</div><div class='del'>-		/* extract the relevant data from the header */</div><div class='del'>-		u32 clock = le32_to_cpu(hdr-&gt;clock);</div><div class='del'>-		u8 rate = hdr-&gt;rate;</div><div class='del'>-		u16 freq = le16_to_cpu(hdr-&gt;freq);</div><div class='del'>-		u8 rssi = hdr-&gt;rssi;</div><div class='del'>-</div><div class='del'>-		skb_pull(*skb, sizeof (struct rfmon_header));</div><div class='del'>-</div><div class='del'>-		if (skb_headroom(*skb) &lt; sizeof (struct avs_80211_1_header)) {</div><div class='del'>-			struct sk_buff *newskb = skb_copy_expand(*skb,</div><div class='del'>-								 sizeof (struct</div><div class='del'>-									 avs_80211_1_header),</div><div class='del'>-								 0, GFP_ATOMIC);</div><div class='del'>-			if (newskb) {</div><div class='del'>-				dev_kfree_skb_irq(*skb);</div><div class='del'>-				*skb = newskb;</div><div class='del'>-			} else</div><div class='del'>-				return -1;</div><div class='del'>-			/* This behavior is not very subtile... */</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* make room for the new header and fill it. */</div><div class='del'>-		avs = skb_push(*skb, sizeof(struct avs_80211_1_header));</div><div class='del'>-</div><div class='del'>-		avs-&gt;version = cpu_to_be32(P80211CAPTURE_VERSION);</div><div class='del'>-		avs-&gt;length = cpu_to_be32(sizeof (struct avs_80211_1_header));</div><div class='del'>-		avs-&gt;mactime = cpu_to_be64(clock);</div><div class='del'>-		avs-&gt;hosttime = cpu_to_be64(jiffies);</div><div class='del'>-		avs-&gt;phytype = cpu_to_be32(6);	/*OFDM: 6 for (g), 8 for (a) */</div><div class='del'>-		avs-&gt;channel = cpu_to_be32(channel_of_freq(freq));</div><div class='del'>-		avs-&gt;datarate = cpu_to_be32(rate * 5);</div><div class='del'>-		avs-&gt;antenna = cpu_to_be32(0);	/*unknown */</div><div class='del'>-		avs-&gt;priority = cpu_to_be32(0);	/*unknown */</div><div class='del'>-		avs-&gt;ssi_type = cpu_to_be32(3);	/*2: dBm, 3: raw RSSI */</div><div class='del'>-		avs-&gt;ssi_signal = cpu_to_be32(rssi &amp; 0x7f);</div><div class='del'>-		avs-&gt;ssi_noise = cpu_to_be32(priv-&gt;local_iwstatistics.qual.noise);	/*better than 'undefined', I assume */</div><div class='del'>-		avs-&gt;preamble = cpu_to_be32(0);	/*unknown */</div><div class='del'>-		avs-&gt;encoding = cpu_to_be32(0);	/*unknown */</div><div class='del'>-	} else</div><div class='del'>-		skb_pull(*skb, sizeof (struct rfmon_header));</div><div class='del'>-</div><div class='del'>-	(*skb)-&gt;protocol = htons(ETH_P_802_2);</div><div class='del'>-	skb_reset_mac_header(*skb);</div><div class='del'>-	(*skb)-&gt;pkt_type = PACKET_OTHERHOST;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-islpci_eth_receive(islpci_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct net_device *ndev = priv-&gt;ndev;</div><div class='del'>-	isl38xx_control_block *control_block = priv-&gt;control_block;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	u16 size;</div><div class='del'>-	u32 index, offset;</div><div class='del'>-	unsigned char *src;</div><div class='del'>-	int discard = 0;</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-	DEBUG(SHOW_FUNCTION_CALLS, "islpci_eth_receive\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* the device has written an Ethernet frame in the data area</div><div class='del'>-	 * of the sk_buff without updating the structure, do it now */</div><div class='del'>-	index = priv-&gt;free_data_rx % ISL38XX_CB_RX_QSIZE;</div><div class='del'>-	size = le16_to_cpu(control_block-&gt;rx_data_low[index].size);</div><div class='del'>-	skb = priv-&gt;data_low_rx[index];</div><div class='del'>-	offset = ((unsigned long)</div><div class='del'>-		  le32_to_cpu(control_block-&gt;rx_data_low[index].address) -</div><div class='del'>-		  (unsigned long) skb-&gt;data) &amp; 3;</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-	DEBUG(SHOW_TRACING,</div><div class='del'>-	      "frq-&gt;addr %x skb-&gt;data %p skb-&gt;len %u offset %u truesize %u\n",</div><div class='del'>-	      control_block-&gt;rx_data_low[priv-&gt;free_data_rx].address, skb-&gt;data,</div><div class='del'>-	      skb-&gt;len, offset, skb-&gt;truesize);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* delete the streaming DMA mapping before processing the skb */</div><div class='del'>-	dma_unmap_single(&amp;priv-&gt;pdev-&gt;dev, priv-&gt;pci_map_rx_address[index],</div><div class='del'>-			 MAX_FRAGMENT_SIZE_RX + 2, DMA_FROM_DEVICE);</div><div class='del'>-</div><div class='del'>-	/* update the skb structure and align the buffer */</div><div class='del'>-	skb_put(skb, size);</div><div class='del'>-	if (offset) {</div><div class='del'>-		/* shift the buffer allocation offset bytes to get the right frame */</div><div class='del'>-		skb_pull(skb, 2);</div><div class='del'>-		skb_put(skb, 2);</div><div class='del'>-	}</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-	/* display the buffer contents for debugging */</div><div class='del'>-	DEBUG(SHOW_BUFFER_CONTENTS, "\nrx %p ", skb-&gt;data);</div><div class='del'>-	display_buffer((char *) skb-&gt;data, skb-&gt;len);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* check whether WDS is enabled and whether the data frame is a WDS frame */</div><div class='del'>-</div><div class='del'>-	if (init_wds) {</div><div class='del'>-		/* WDS enabled, check for the wds address on the first 6 bytes of the buffer */</div><div class='del'>-		src = skb-&gt;data + 6;</div><div class='del'>-		memmove(skb-&gt;data, src, skb-&gt;len - 6);</div><div class='del'>-		skb_trim(skb, skb-&gt;len - 6);</div><div class='del'>-	}</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-	DEBUG(SHOW_TRACING, "Fragment size %i in skb at %p\n", size, skb);</div><div class='del'>-	DEBUG(SHOW_TRACING, "Skb data at %p, length %i\n", skb-&gt;data, skb-&gt;len);</div><div class='del'>-</div><div class='del'>-	/* display the buffer contents for debugging */</div><div class='del'>-	DEBUG(SHOW_BUFFER_CONTENTS, "\nrx %p ", skb-&gt;data);</div><div class='del'>-	display_buffer((char *) skb-&gt;data, skb-&gt;len);</div><div class='del'>-#endif</div><div class='del'>-	/* take care of monitor mode and spy monitoring. */</div><div class='del'>-	if (unlikely(priv-&gt;iw_mode == IW_MODE_MONITOR)) {</div><div class='del'>-		skb-&gt;dev = ndev;</div><div class='del'>-		discard = islpci_monitor_rx(priv, &amp;skb);</div><div class='del'>-	} else {</div><div class='del'>-		if (unlikely(skb-&gt;data[2 * ETH_ALEN] == 0)) {</div><div class='del'>-			/* The packet has a rx_annex. Read it for spy monitoring, Then</div><div class='del'>-			 * remove it, while keeping the 2 leading MAC addr.</div><div class='del'>-			 */</div><div class='del'>-			struct iw_quality wstats;</div><div class='del'>-			struct rx_annex_header *annex =</div><div class='del'>-			    (struct rx_annex_header *) skb-&gt;data;</div><div class='del'>-			wstats.level = annex-&gt;rfmon.rssi;</div><div class='del'>-			/* The noise value can be a bit outdated if nobody's</div><div class='del'>-			 * reading wireless stats... */</div><div class='del'>-			wstats.noise = priv-&gt;local_iwstatistics.qual.noise;</div><div class='del'>-			wstats.qual = wstats.level - wstats.noise;</div><div class='del'>-			wstats.updated = 0x07;</div><div class='del'>-			/* Update spy records */</div><div class='del'>-			wireless_spy_update(ndev, annex-&gt;addr2, &amp;wstats);</div><div class='del'>-</div><div class='del'>-			skb_copy_from_linear_data(skb,</div><div class='del'>-						  (skb-&gt;data +</div><div class='del'>-						   sizeof(struct rfmon_header)),</div><div class='del'>-						  2 * ETH_ALEN);</div><div class='del'>-			skb_pull(skb, sizeof (struct rfmon_header));</div><div class='del'>-		}</div><div class='del'>-		skb-&gt;protocol = eth_type_trans(skb, ndev);</div><div class='del'>-	}</div><div class='del'>-	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='del'>-	ndev-&gt;stats.rx_packets++;</div><div class='del'>-	ndev-&gt;stats.rx_bytes += size;</div><div class='del'>-</div><div class='del'>-	/* deliver the skb to the network layer */</div><div class='del'>-#ifdef ISLPCI_ETH_DEBUG</div><div class='del'>-	printk</div><div class='del'>-	    ("islpci_eth_receive:netif_rx %2.2X %2.2X %2.2X %2.2X %2.2X %2.2X\n",</div><div class='del'>-	     skb-&gt;data[0], skb-&gt;data[1], skb-&gt;data[2], skb-&gt;data[3],</div><div class='del'>-	     skb-&gt;data[4], skb-&gt;data[5]);</div><div class='del'>-#endif</div><div class='del'>-	if (unlikely(discard)) {</div><div class='del'>-		dev_kfree_skb_irq(skb);</div><div class='del'>-		skb = NULL;</div><div class='del'>-	} else</div><div class='del'>-		netif_rx(skb);</div><div class='del'>-</div><div class='del'>-	/* increment the read index for the rx data low queue */</div><div class='del'>-	priv-&gt;free_data_rx++;</div><div class='del'>-</div><div class='del'>-	/* add one or more sk_buff structures */</div><div class='del'>-	while (index =</div><div class='del'>-	       le32_to_cpu(control_block-&gt;</div><div class='del'>-			   driver_curr_frag[ISL38XX_CB_RX_DATA_LQ]),</div><div class='del'>-	       index - priv-&gt;free_data_rx &lt; ISL38XX_CB_RX_QSIZE) {</div><div class='del'>-		/* allocate an sk_buff for received data frames storage</div><div class='del'>-		 * include any required allignment operations */</div><div class='del'>-		skb = dev_alloc_skb(MAX_FRAGMENT_SIZE_RX + 2);</div><div class='del'>-		if (unlikely(skb == NULL)) {</div><div class='del'>-			/* error allocating an sk_buff structure elements */</div><div class='del'>-			DEBUG(SHOW_ERROR_MESSAGES, "Error allocating skb\n");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		skb_reserve(skb, (4 - (long) skb-&gt;data) &amp; 0x03);</div><div class='del'>-		/* store the new skb structure pointer */</div><div class='del'>-		index = index % ISL38XX_CB_RX_QSIZE;</div><div class='del'>-		priv-&gt;data_low_rx[index] = skb;</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-		DEBUG(SHOW_TRACING,</div><div class='del'>-		      "new alloc skb %p skb-&gt;data %p skb-&gt;len %u index %u truesize %u\n",</div><div class='del'>-		      skb, skb-&gt;data, skb-&gt;len, index, skb-&gt;truesize);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		/* set the streaming DMA mapping for proper PCI bus operation */</div><div class='del'>-		priv-&gt;pci_map_rx_address[index] =</div><div class='del'>-		    dma_map_single(&amp;priv-&gt;pdev-&gt;dev, (void *)skb-&gt;data,</div><div class='del'>-				   MAX_FRAGMENT_SIZE_RX + 2, DMA_FROM_DEVICE);</div><div class='del'>-		if (dma_mapping_error(&amp;priv-&gt;pdev-&gt;dev, priv-&gt;pci_map_rx_address[index])) {</div><div class='del'>-			/* error mapping the buffer to device accessible memory address */</div><div class='del'>-			DEBUG(SHOW_ERROR_MESSAGES,</div><div class='del'>-			      "Error mapping DMA address\n");</div><div class='del'>-</div><div class='del'>-			/* free the skbuf structure before aborting */</div><div class='del'>-			dev_kfree_skb_irq(skb);</div><div class='del'>-			skb = NULL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		/* update the fragment address */</div><div class='del'>-		control_block-&gt;rx_data_low[index].address =</div><div class='del'>-			cpu_to_le32((u32)priv-&gt;pci_map_rx_address[index]);</div><div class='del'>-		wmb();</div><div class='del'>-</div><div class='del'>-		/* increment the driver read pointer */</div><div class='del'>-		le32_add_cpu(&amp;control_block-&gt;</div><div class='del'>-			     driver_curr_frag[ISL38XX_CB_RX_DATA_LQ], 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* trigger the device */</div><div class='del'>-	islpci_trigger(priv);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-islpci_do_reset_and_wake(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = container_of(work, islpci_private, reset_task);</div><div class='del'>-</div><div class='del'>-	islpci_reset(priv, 1);</div><div class='del'>-	priv-&gt;reset_task_pending = 0;</div><div class='del'>-	smp_wmb();</div><div class='del'>-	netif_wake_queue(priv-&gt;ndev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-islpci_eth_tx_timeout(struct net_device *ndev, unsigned int txqueue)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-</div><div class='del'>-	/* increment the transmit error counter */</div><div class='del'>-	ndev-&gt;stats.tx_errors++;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;reset_task_pending) {</div><div class='del'>-		printk(KERN_WARNING</div><div class='del'>-			"%s: tx_timeout, scheduling reset", ndev-&gt;name);</div><div class='del'>-		netif_stop_queue(ndev);</div><div class='del'>-		priv-&gt;reset_task_pending = 1;</div><div class='del'>-		schedule_work(&amp;priv-&gt;reset_task);</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_WARNING</div><div class='del'>-			"%s: tx_timeout, waiting for reset", ndev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/intersil/prism54/islpci_eth.h b/drivers/net/wireless/intersil/prism54/islpci_eth.h<br/>deleted file mode 100644<br/>index e433ccdc526b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/prism54/islpci_eth.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/islpci_eth.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2002 Intersil Americas Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _ISLPCI_ETH_H</div><div class='del'>-#define _ISLPCI_ETH_H</div><div class='del'>-</div><div class='del'>-#include "isl_38xx.h"</div><div class='del'>-#include "islpci_dev.h"</div><div class='del'>-</div><div class='del'>-struct rfmon_header {</div><div class='del'>-	__le16 unk0;		/* = 0x0000 */</div><div class='del'>-	__le16 length;		/* = 0x1400 */</div><div class='del'>-	__le32 clock;		/* 1MHz clock */</div><div class='del'>-	u8 flags;</div><div class='del'>-	u8 unk1;</div><div class='del'>-	u8 rate;</div><div class='del'>-	u8 unk2;</div><div class='del'>-	__le16 freq;</div><div class='del'>-	__le16 unk3;</div><div class='del'>-	u8 rssi;</div><div class='del'>-	u8 padding[3];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct rx_annex_header {</div><div class='del'>-	u8 addr1[ETH_ALEN];</div><div class='del'>-	u8 addr2[ETH_ALEN];</div><div class='del'>-	struct rfmon_header rfmon;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* wlan-ng (and hopefully others) AVS header, version one.  Fields in</div><div class='del'>- * network byte order. */</div><div class='del'>-#define P80211CAPTURE_VERSION 0x80211001</div><div class='del'>-</div><div class='del'>-struct avs_80211_1_header {</div><div class='del'>-	__be32 version;</div><div class='del'>-	__be32 length;</div><div class='del'>-	__be64 mactime;</div><div class='del'>-	__be64 hosttime;</div><div class='del'>-	__be32 phytype;</div><div class='del'>-	__be32 channel;</div><div class='del'>-	__be32 datarate;</div><div class='del'>-	__be32 antenna;</div><div class='del'>-	__be32 priority;</div><div class='del'>-	__be32 ssi_type;</div><div class='del'>-	__be32 ssi_signal;</div><div class='del'>-	__be32 ssi_noise;</div><div class='del'>-	__be32 preamble;</div><div class='del'>-	__be32 encoding;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void islpci_eth_cleanup_transmit(islpci_private *, isl38xx_control_block *);</div><div class='del'>-netdev_tx_t islpci_eth_transmit(struct sk_buff *, struct net_device *);</div><div class='del'>-int islpci_eth_receive(islpci_private *);</div><div class='del'>-void islpci_eth_tx_timeout(struct net_device *, unsigned int txqueue);</div><div class='del'>-void islpci_do_reset_and_wake(struct work_struct *);</div><div class='del'>-</div><div class='del'>-#endif				/* _ISL_GEN_H */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/prism54/islpci_hotplug.c b/drivers/net/wireless/intersil/prism54/islpci_hotplug.c<br/>deleted file mode 100644<br/>index 31a1e61326ff..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/prism54/islpci_hotplug.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/islpci_hotplug.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,316 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2002 Intersil Americas Inc.</div><div class='del'>- *  Copyright (C) 2003 Herbert Valerio Riedel &lt;hvr@gnu.org&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt; /* For __init, __exit */</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-</div><div class='del'>-#include "prismcompat.h"</div><div class='del'>-#include "islpci_dev.h"</div><div class='del'>-#include "islpci_mgt.h"		/* for pc_debug */</div><div class='del'>-#include "isl_oid.h"</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("[Intersil] R.Bastings and W.Termorshuizen, The prism54.org Development Team &lt;prism54-devel@prism54.org&gt;");</div><div class='del'>-MODULE_DESCRIPTION("The Prism54 802.11 Wireless LAN adapter");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-static int	init_pcitm = 0;</div><div class='del'>-module_param(init_pcitm, int, 0);</div><div class='del'>-</div><div class='del'>-/* In this order: vendor, device, subvendor, subdevice, class, class_mask,</div><div class='del'>- * driver_data</div><div class='del'>- * If you have an update for this please contact prism54-devel@prism54.org</div><div class='del'>- * The latest list can be found at http://wireless.wiki.kernel.org/en/users/Drivers/p54</div><div class='del'>- */</div><div class='del'>-static const struct pci_device_id prism54_id_tbl[] = {</div><div class='del'>-	/* Intersil PRISM Duette/Prism GT Wireless LAN adapter */</div><div class='del'>-	{</div><div class='del'>-	 0x1260, 0x3890,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID,</div><div class='del'>-	 0, 0, 0</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	/* 3COM 3CRWE154G72 Wireless LAN adapter */</div><div class='del'>-	{</div><div class='del'>-	 PCI_VDEVICE(3COM, 0x6001), 0</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	/* Intersil PRISM Indigo Wireless LAN adapter */</div><div class='del'>-	{</div><div class='del'>-	 0x1260, 0x3877,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID,</div><div class='del'>-	 0, 0, 0</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	/* Intersil PRISM Javelin/Xbow Wireless LAN adapter */</div><div class='del'>-	{</div><div class='del'>-	 0x1260, 0x3886,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID,</div><div class='del'>-	 0, 0, 0</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	/* End of list */</div><div class='del'>-	{0,0,0,0,0,0,0}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* register the device with the Hotplug facilities of the kernel */</div><div class='del'>-MODULE_DEVICE_TABLE(pci, prism54_id_tbl);</div><div class='del'>-</div><div class='del'>-static int prism54_probe(struct pci_dev *, const struct pci_device_id *);</div><div class='del'>-static void prism54_remove(struct pci_dev *);</div><div class='del'>-static int __maybe_unused prism54_suspend(struct device *);</div><div class='del'>-static int __maybe_unused prism54_resume(struct device *);</div><div class='del'>-</div><div class='del'>-static SIMPLE_DEV_PM_OPS(prism54_pm_ops, prism54_suspend, prism54_resume);</div><div class='del'>-</div><div class='del'>-static struct pci_driver prism54_driver = {</div><div class='del'>-	.name = DRV_NAME,</div><div class='del'>-	.id_table = prism54_id_tbl,</div><div class='del'>-	.probe = prism54_probe,</div><div class='del'>-	.remove = prism54_remove,</div><div class='del'>-	.driver.pm = &amp;prism54_pm_ops,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>-    Module initialization functions</div><div class='del'>-******************************************************************************/</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='del'>-{</div><div class='del'>-	struct net_device *ndev;</div><div class='del'>-	u8 latency_tmr;</div><div class='del'>-	u32 mem_addr;</div><div class='del'>-	islpci_private *priv;</div><div class='del'>-	int rvalue;</div><div class='del'>-</div><div class='del'>-	/* Enable the pci device */</div><div class='del'>-	if (pci_enable_device(pdev)) {</div><div class='del'>-		printk(KERN_ERR "%s: pci_enable_device() failed.\n", DRV_NAME);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check whether the latency timer is set correctly */</div><div class='del'>-	pci_read_config_byte(pdev, PCI_LATENCY_TIMER, &amp;latency_tmr);</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-	DEBUG(SHOW_TRACING, "latency timer: %x\n", latency_tmr);</div><div class='del'>-#endif</div><div class='del'>-	if (latency_tmr &lt; PCIDEVICE_LATENCY_TIMER_MIN) {</div><div class='del'>-		/* set the latency timer */</div><div class='del'>-		pci_write_config_byte(pdev, PCI_LATENCY_TIMER,</div><div class='del'>-				      PCIDEVICE_LATENCY_TIMER_VAL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* enable PCI DMA */</div><div class='del'>-	if (dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(32))) {</div><div class='del'>-		printk(KERN_ERR "%s: 32-bit PCI DMA not supported", DRV_NAME);</div><div class='del'>-		goto do_pci_disable_device;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-	/* 0x40 is the programmable timer to configure the response timeout (TRDY_TIMEOUT)</div><div class='del'>-	 * 0x41 is the programmable timer to configure the retry timeout (RETRY_TIMEOUT)</div><div class='del'>-	 *	The RETRY_TIMEOUT is used to set the number of retries that the core, as a</div><div class='del'>-	 *	Master, will perform before abandoning a cycle. The default value for</div><div class='del'>-	 *	RETRY_TIMEOUT is 0x80, which far exceeds the PCI 2.1 requirement for new</div><div class='del'>-	 *	devices. A write of zero to the RETRY_TIMEOUT register disables this</div><div class='del'>-	 *	function to allow use with any non-compliant legacy devices that may</div><div class='del'>-	 *	execute more retries.</div><div class='del'>-	 *</div><div class='del'>-	 *	Writing zero to both these two registers will disable both timeouts and</div><div class='del'>-	 *	*can* solve problems caused by devices that are slow to respond.</div><div class='del'>-	 *	Make this configurable - MSW</div><div class='del'>-	 */</div><div class='del'>-	if ( init_pcitm &gt;= 0 ) {</div><div class='del'>-		pci_write_config_byte(pdev, 0x40, (u8)init_pcitm);</div><div class='del'>-		pci_write_config_byte(pdev, 0x41, (u8)init_pcitm);</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_INFO "PCI TRDY/RETRY unchanged\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* request the pci device I/O regions */</div><div class='del'>-	rvalue = pci_request_regions(pdev, DRV_NAME);</div><div class='del'>-	if (rvalue) {</div><div class='del'>-		printk(KERN_ERR "%s: pci_request_regions failure (rc=%d)\n",</div><div class='del'>-		       DRV_NAME, rvalue);</div><div class='del'>-		goto do_pci_disable_device;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check if the memory window is indeed set */</div><div class='del'>-	rvalue = pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &amp;mem_addr);</div><div class='del'>-	if (rvalue || !mem_addr) {</div><div class='del'>-		printk(KERN_ERR "%s: PCI device memory region not configured; fix your BIOS or CardBus bridge/drivers\n",</div><div class='del'>-		       DRV_NAME);</div><div class='del'>-		goto do_pci_release_regions;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* enable PCI bus-mastering */</div><div class='del'>-	DEBUG(SHOW_TRACING, "%s: pci_set_master(pdev)\n", DRV_NAME);</div><div class='del'>-	pci_set_master(pdev);</div><div class='del'>-</div><div class='del'>-	/* enable MWI */</div><div class='del'>-	pci_try_set_mwi(pdev);</div><div class='del'>-</div><div class='del'>-	/* setup the network device interface and its structure */</div><div class='del'>-	if (!(ndev = islpci_setup(pdev))) {</div><div class='del'>-		/* error configuring the driver as a network device */</div><div class='del'>-		printk(KERN_ERR "%s: could not configure network device\n",</div><div class='del'>-		       DRV_NAME);</div><div class='del'>-		goto do_pci_clear_mwi;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv = netdev_priv(ndev);</div><div class='del'>-	islpci_set_state(priv, PRV_STATE_PREBOOT); /* we are attempting to boot */</div><div class='del'>-</div><div class='del'>-	/* card is in unknown state yet, might have some interrupts pending */</div><div class='del'>-	isl38xx_disable_interrupts(priv-&gt;device_base);</div><div class='del'>-</div><div class='del'>-	/* request for the interrupt before uploading the firmware */</div><div class='del'>-	rvalue = request_irq(pdev-&gt;irq, islpci_interrupt,</div><div class='del'>-			     IRQF_SHARED, ndev-&gt;name, priv);</div><div class='del'>-</div><div class='del'>-	if (rvalue) {</div><div class='del'>-		/* error, could not hook the handler to the irq */</div><div class='del'>-		printk(KERN_ERR "%s: could not install IRQ handler\n",</div><div class='del'>-		       ndev-&gt;name);</div><div class='del'>-		goto do_unregister_netdev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* firmware upload is triggered in islpci_open */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-      do_unregister_netdev:</div><div class='del'>-	unregister_netdev(ndev);</div><div class='del'>-	islpci_free_memory(priv);</div><div class='del'>-	free_netdev(ndev);</div><div class='del'>-	priv = NULL;</div><div class='del'>-      do_pci_clear_mwi:</div><div class='del'>-	pci_clear_mwi(pdev);</div><div class='del'>-      do_pci_release_regions:</div><div class='del'>-	pci_release_regions(pdev);</div><div class='del'>-      do_pci_disable_device:</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set by cleanup_module */</div><div class='del'>-static volatile int __in_cleanup_module = 0;</div><div class='del'>-</div><div class='del'>-/* this one removes one(!!) instance only */</div><div class='del'>-static void</div><div class='del'>-prism54_remove(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	struct net_device *ndev = pci_get_drvdata(pdev);</div><div class='del'>-	islpci_private *priv = ndev ? netdev_priv(ndev) : NULL;</div><div class='del'>-	BUG_ON(!priv);</div><div class='del'>-</div><div class='del'>-	if (!__in_cleanup_module) {</div><div class='del'>-		printk(KERN_DEBUG "%s: hot unplug detected\n", ndev-&gt;name);</div><div class='del'>-		islpci_set_state(priv, PRV_STATE_OFF);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: removing device\n", ndev-&gt;name);</div><div class='del'>-</div><div class='del'>-	unregister_netdev(ndev);</div><div class='del'>-</div><div class='del'>-	/* free the interrupt request */</div><div class='del'>-</div><div class='del'>-	if (islpci_get_state(priv) != PRV_STATE_OFF) {</div><div class='del'>-		isl38xx_disable_interrupts(priv-&gt;device_base);</div><div class='del'>-		islpci_set_state(priv, PRV_STATE_OFF);</div><div class='del'>-		/* This bellow causes a lockup at rmmod time. It might be</div><div class='del'>-		 * because some interrupts still linger after rmmod time,</div><div class='del'>-		 * see bug #17 */</div><div class='del'>-		/* pci_set_power_state(pdev, 3);*/	/* try to power-off */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	free_irq(pdev-&gt;irq, priv);</div><div class='del'>-</div><div class='del'>-	/* free the PCI memory and unmap the remapped page */</div><div class='del'>-	islpci_free_memory(priv);</div><div class='del'>-</div><div class='del'>-	free_netdev(ndev);</div><div class='del'>-	priv = NULL;</div><div class='del'>-</div><div class='del'>-	pci_clear_mwi(pdev);</div><div class='del'>-</div><div class='del'>-	pci_release_regions(pdev);</div><div class='del'>-</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __maybe_unused</div><div class='del'>-prism54_suspend(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='del'>-	islpci_private *priv = ndev ? netdev_priv(ndev) : NULL;</div><div class='del'>-	BUG_ON(!priv);</div><div class='del'>-</div><div class='del'>-	/* tell the device not to trigger interrupts for now... */</div><div class='del'>-	isl38xx_disable_interrupts(priv-&gt;device_base);</div><div class='del'>-</div><div class='del'>-	/* from now on assume the hardware was already powered down</div><div class='del'>-	   and don't touch it anymore */</div><div class='del'>-	islpci_set_state(priv, PRV_STATE_OFF);</div><div class='del'>-</div><div class='del'>-	netif_stop_queue(ndev);</div><div class='del'>-	netif_device_detach(ndev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __maybe_unused</div><div class='del'>-prism54_resume(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='del'>-	islpci_private *priv = ndev ? netdev_priv(ndev) : NULL;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!priv);</div><div class='del'>-</div><div class='del'>-	printk(KERN_NOTICE "%s: got resume request\n", ndev-&gt;name);</div><div class='del'>-</div><div class='del'>-	/* alright let's go into the PREBOOT state */</div><div class='del'>-	islpci_reset(priv, 1);</div><div class='del'>-</div><div class='del'>-	netif_device_attach(ndev);</div><div class='del'>-	netif_start_queue(ndev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-prism54_module_init(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO "Loaded %s driver, version %s\n",</div><div class='del'>-	       DRV_NAME, DRV_VERSION);</div><div class='del'>-</div><div class='del'>-	__bug_on_wrong_struct_sizes ();</div><div class='del'>-</div><div class='del'>-	return pci_register_driver(&amp;prism54_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* by the time prism54_module_exit() terminates, as a postcondition</div><div class='del'>- * all instances will have been destroyed by calls to</div><div class='del'>- * prism54_remove() */</div><div class='del'>-static void __exit</div><div class='del'>-prism54_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	__in_cleanup_module = 1;</div><div class='del'>-</div><div class='del'>-	pci_unregister_driver(&amp;prism54_driver);</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "Unloaded %s driver\n", DRV_NAME);</div><div class='del'>-</div><div class='del'>-	__in_cleanup_module = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* register entry points */</div><div class='del'>-module_init(prism54_module_init);</div><div class='del'>-module_exit(prism54_module_exit);</div><div class='del'>-/* EOF */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/prism54/islpci_mgt.c b/drivers/net/wireless/intersil/prism54/islpci_mgt.c<br/>deleted file mode 100644<br/>index 0c7fb76c7d1c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/prism54/islpci_mgt.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/islpci_mgt.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,491 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2002 Intersil Americas Inc.</div><div class='del'>- *  Copyright 2004 Jens Maurer &lt;Jens.Maurer@gmx.net&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-</div><div class='del'>-#include "prismcompat.h"</div><div class='del'>-#include "isl_38xx.h"</div><div class='del'>-#include "islpci_mgt.h"</div><div class='del'>-#include "isl_oid.h"		/* additional types and defs for isl38xx fw */</div><div class='del'>-#include "isl_ioctl.h"</div><div class='del'>-</div><div class='del'>-#include &lt;net/iw_handler.h&gt;</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>-        Global variable definition section</div><div class='del'>-******************************************************************************/</div><div class='del'>-int pc_debug = VERBOSE;</div><div class='del'>-module_param(pc_debug, int, 0);</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>-    Driver general functions</div><div class='del'>-******************************************************************************/</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-void</div><div class='del'>-display_buffer(char *buffer, int length)</div><div class='del'>-{</div><div class='del'>-	if ((pc_debug &amp; SHOW_BUFFER_CONTENTS) == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	while (length &gt; 0) {</div><div class='del'>-		printk("[%02x]", *buffer &amp; 255);</div><div class='del'>-		length--;</div><div class='del'>-		buffer++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk("\n");</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*****************************************************************************</div><div class='del'>-    Queue handling for management frames</div><div class='del'>-******************************************************************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Helper function to create a PIMFOR management frame header.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-pimfor_encode_header(int operation, u32 oid, u32 length, pimfor_header_t *h)</div><div class='del'>-{</div><div class='del'>-	h-&gt;version = PIMFOR_VERSION;</div><div class='del'>-	h-&gt;operation = operation;</div><div class='del'>-	h-&gt;device_id = PIMFOR_DEV_ID_MHLI_MIB;</div><div class='del'>-	h-&gt;flags = 0;</div><div class='del'>-	h-&gt;oid = cpu_to_be32(oid);</div><div class='del'>-	h-&gt;length = cpu_to_be32(length);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Helper function to analyze a PIMFOR management frame header.</div><div class='del'>- */</div><div class='del'>-static pimfor_header_t *</div><div class='del'>-pimfor_decode_header(void *data, int len)</div><div class='del'>-{</div><div class='del'>-	pimfor_header_t *h = data;</div><div class='del'>-</div><div class='del'>-	while ((void *) h &lt; data + len) {</div><div class='del'>-		if (h-&gt;flags &amp; PIMFOR_FLAG_LITTLE_ENDIAN) {</div><div class='del'>-			le32_to_cpus(&amp;h-&gt;oid);</div><div class='del'>-			le32_to_cpus(&amp;h-&gt;length);</div><div class='del'>-		} else {</div><div class='del'>-			be32_to_cpus(&amp;h-&gt;oid);</div><div class='del'>-			be32_to_cpus(&amp;h-&gt;length);</div><div class='del'>-		}</div><div class='del'>-		if (h-&gt;oid != OID_INL_TUNNEL)</div><div class='del'>-			return h;</div><div class='del'>-		h++;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Fill the receive queue for management frames with fresh buffers.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-islpci_mgmt_rx_fill(struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	isl38xx_control_block *cb =	/* volatile not needed */</div><div class='del'>-	    (isl38xx_control_block *) priv-&gt;control_block;</div><div class='del'>-	u32 curr = le32_to_cpu(cb-&gt;driver_curr_frag[ISL38XX_CB_RX_MGMTQ]);</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-	DEBUG(SHOW_FUNCTION_CALLS, "islpci_mgmt_rx_fill\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	while (curr - priv-&gt;index_mgmt_rx &lt; ISL38XX_CB_MGMT_QSIZE) {</div><div class='del'>-		u32 index = curr % ISL38XX_CB_MGMT_QSIZE;</div><div class='del'>-		struct islpci_membuf *buf = &amp;priv-&gt;mgmt_rx[index];</div><div class='del'>-		isl38xx_fragment *frag = &amp;cb-&gt;rx_data_mgmt[index];</div><div class='del'>-</div><div class='del'>-		if (buf-&gt;mem == NULL) {</div><div class='del'>-			buf-&gt;mem = kmalloc(MGMT_FRAME_SIZE, GFP_ATOMIC);</div><div class='del'>-			if (!buf-&gt;mem)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			buf-&gt;size = MGMT_FRAME_SIZE;</div><div class='del'>-		}</div><div class='del'>-		if (buf-&gt;pci_addr == 0) {</div><div class='del'>-			buf-&gt;pci_addr = dma_map_single(&amp;priv-&gt;pdev-&gt;dev,</div><div class='del'>-						       buf-&gt;mem,</div><div class='del'>-						       MGMT_FRAME_SIZE,</div><div class='del'>-						       DMA_FROM_DEVICE);</div><div class='del'>-			if (dma_mapping_error(&amp;priv-&gt;pdev-&gt;dev, buf-&gt;pci_addr)) {</div><div class='del'>-				printk(KERN_WARNING</div><div class='del'>-				       "Failed to make memory DMA'able.\n");</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* be safe: always reset control block information */</div><div class='del'>-		frag-&gt;size = cpu_to_le16(MGMT_FRAME_SIZE);</div><div class='del'>-		frag-&gt;flags = 0;</div><div class='del'>-		frag-&gt;address = cpu_to_le32(buf-&gt;pci_addr);</div><div class='del'>-		curr++;</div><div class='del'>-</div><div class='del'>-		/* The fragment address in the control block must have</div><div class='del'>-		 * been written before announcing the frame buffer to</div><div class='del'>-		 * device */</div><div class='del'>-		wmb();</div><div class='del'>-		cb-&gt;driver_curr_frag[ISL38XX_CB_RX_MGMTQ] = cpu_to_le32(curr);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Create and transmit a management frame using "operation" and "oid",</div><div class='del'>- * with arguments data/length.</div><div class='del'>- * We either return an error and free the frame, or we return 0 and</div><div class='del'>- * islpci_mgt_cleanup_transmit() frees the frame in the tx-done</div><div class='del'>- * interrupt.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-islpci_mgt_transmit(struct net_device *ndev, int operation, unsigned long oid,</div><div class='del'>-		    void *data, int length)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	isl38xx_control_block *cb =</div><div class='del'>-	    (isl38xx_control_block *) priv-&gt;control_block;</div><div class='del'>-	void *p;</div><div class='del'>-	int err = -EINVAL;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	isl38xx_fragment *frag;</div><div class='del'>-	struct islpci_membuf buf;</div><div class='del'>-	u32 curr_frag;</div><div class='del'>-	int index;</div><div class='del'>-	int frag_len = length + PIMFOR_HEADER_SIZE;</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-	DEBUG(SHOW_FUNCTION_CALLS, "islpci_mgt_transmit\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (frag_len &gt; MGMT_FRAME_SIZE) {</div><div class='del'>-		printk(KERN_DEBUG "%s: mgmt frame too large %d\n",</div><div class='del'>-		       ndev-&gt;name, frag_len);</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = -ENOMEM;</div><div class='del'>-	p = buf.mem = kmalloc(frag_len, GFP_KERNEL);</div><div class='del'>-	if (!buf.mem)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	buf.size = frag_len;</div><div class='del'>-</div><div class='del'>-	/* create the header directly in the fragment data area */</div><div class='del'>-	pimfor_encode_header(operation, oid, length, (pimfor_header_t *) p);</div><div class='del'>-	p += PIMFOR_HEADER_SIZE;</div><div class='del'>-</div><div class='del'>-	if (data)</div><div class='del'>-		memcpy(p, data, length);</div><div class='del'>-	else</div><div class='del'>-		memset(p, 0, length);</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-	{</div><div class='del'>-		pimfor_header_t *h = buf.mem;</div><div class='del'>-		DEBUG(SHOW_PIMFOR_FRAMES,</div><div class='del'>-		      "PIMFOR: op %i, oid 0x%08lx, device %i, flags 0x%x length 0x%x\n",</div><div class='del'>-		      h-&gt;operation, oid, h-&gt;device_id, h-&gt;flags, length);</div><div class='del'>-</div><div class='del'>-		/* display the buffer contents for debugging */</div><div class='del'>-		display_buffer((char *) h, sizeof (pimfor_header_t));</div><div class='del'>-		display_buffer(p, length);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	err = -ENOMEM;</div><div class='del'>-	buf.pci_addr = dma_map_single(&amp;priv-&gt;pdev-&gt;dev, buf.mem, frag_len,</div><div class='del'>-				      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(&amp;priv-&gt;pdev-&gt;dev, buf.pci_addr)) {</div><div class='del'>-		printk(KERN_WARNING "%s: cannot map PCI memory for mgmt\n",</div><div class='del'>-		       ndev-&gt;name);</div><div class='del'>-		goto error_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Protect the control block modifications against interrupts. */</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;slock, flags);</div><div class='del'>-	curr_frag = le32_to_cpu(cb-&gt;driver_curr_frag[ISL38XX_CB_TX_MGMTQ]);</div><div class='del'>-	if (curr_frag - priv-&gt;index_mgmt_tx &gt;= ISL38XX_CB_MGMT_QSIZE) {</div><div class='del'>-		printk(KERN_WARNING "%s: mgmt tx queue is still full\n",</div><div class='del'>-		       ndev-&gt;name);</div><div class='del'>-		goto error_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* commit the frame to the tx device queue */</div><div class='del'>-	index = curr_frag % ISL38XX_CB_MGMT_QSIZE;</div><div class='del'>-	priv-&gt;mgmt_tx[index] = buf;</div><div class='del'>-	frag = &amp;cb-&gt;tx_data_mgmt[index];</div><div class='del'>-	frag-&gt;size = cpu_to_le16(frag_len);</div><div class='del'>-	frag-&gt;flags = 0;	/* for any other than the last fragment, set to 1 */</div><div class='del'>-	frag-&gt;address = cpu_to_le32(buf.pci_addr);</div><div class='del'>-</div><div class='del'>-	/* The fragment address in the control block must have</div><div class='del'>-	 * been written before announcing the frame buffer to</div><div class='del'>-	 * device */</div><div class='del'>-	wmb();</div><div class='del'>-	cb-&gt;driver_curr_frag[ISL38XX_CB_TX_MGMTQ] = cpu_to_le32(curr_frag + 1);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;slock, flags);</div><div class='del'>-</div><div class='del'>-	/* trigger the device */</div><div class='del'>-	islpci_trigger(priv);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-      error_unlock:</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;slock, flags);</div><div class='del'>-      error_free:</div><div class='del'>-	kfree(buf.mem);</div><div class='del'>-      error:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Receive a management frame from the device.</div><div class='del'>- * This can be an arbitrary number of traps, and at most one response</div><div class='del'>- * frame for a previous request sent via islpci_mgt_transmit().</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-islpci_mgt_receive(struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	isl38xx_control_block *cb =</div><div class='del'>-	    (isl38xx_control_block *) priv-&gt;control_block;</div><div class='del'>-	u32 curr_frag;</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-	DEBUG(SHOW_FUNCTION_CALLS, "islpci_mgt_receive\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Only once per interrupt, determine fragment range to</div><div class='del'>-	 * process.  This avoids an endless loop (i.e. lockup) if</div><div class='del'>-	 * frames come in faster than we can process them. */</div><div class='del'>-	curr_frag = le32_to_cpu(cb-&gt;device_curr_frag[ISL38XX_CB_RX_MGMTQ]);</div><div class='del'>-	barrier();</div><div class='del'>-</div><div class='del'>-	for (; priv-&gt;index_mgmt_rx &lt; curr_frag; priv-&gt;index_mgmt_rx++) {</div><div class='del'>-		pimfor_header_t *header;</div><div class='del'>-		u32 index = priv-&gt;index_mgmt_rx % ISL38XX_CB_MGMT_QSIZE;</div><div class='del'>-		struct islpci_membuf *buf = &amp;priv-&gt;mgmt_rx[index];</div><div class='del'>-		u16 frag_len;</div><div class='del'>-		int size;</div><div class='del'>-		struct islpci_mgmtframe *frame;</div><div class='del'>-</div><div class='del'>-		/* I have no idea (and no documentation) if flags != 0</div><div class='del'>-		 * is possible.  Drop the frame, reuse the buffer. */</div><div class='del'>-		if (le16_to_cpu(cb-&gt;rx_data_mgmt[index].flags) != 0) {</div><div class='del'>-			printk(KERN_WARNING "%s: unknown flags 0x%04x\n",</div><div class='del'>-			       ndev-&gt;name,</div><div class='del'>-			       le16_to_cpu(cb-&gt;rx_data_mgmt[index].flags));</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* The device only returns the size of the header(s) here. */</div><div class='del'>-		frag_len = le16_to_cpu(cb-&gt;rx_data_mgmt[index].size);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We appear to have no way to tell the device the</div><div class='del'>-		 * size of a receive buffer.  Thus, if this check</div><div class='del'>-		 * triggers, we likely have kernel heap corruption. */</div><div class='del'>-		if (frag_len &gt; MGMT_FRAME_SIZE) {</div><div class='del'>-			printk(KERN_WARNING</div><div class='del'>-				"%s: Bogus packet size of %d (%#x).\n",</div><div class='del'>-				ndev-&gt;name, frag_len, frag_len);</div><div class='del'>-			frag_len = MGMT_FRAME_SIZE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Ensure the results of device DMA are visible to the CPU. */</div><div class='del'>-		dma_sync_single_for_cpu(&amp;priv-&gt;pdev-&gt;dev, buf-&gt;pci_addr,</div><div class='del'>-					buf-&gt;size, DMA_FROM_DEVICE);</div><div class='del'>-</div><div class='del'>-		/* Perform endianess conversion for PIMFOR header in-place. */</div><div class='del'>-		header = pimfor_decode_header(buf-&gt;mem, frag_len);</div><div class='del'>-		if (!header) {</div><div class='del'>-			printk(KERN_WARNING "%s: no PIMFOR header found\n",</div><div class='del'>-			       ndev-&gt;name);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* The device ID from the PIMFOR packet received from</div><div class='del'>-		 * the MVC is always 0.  We forward a sensible device_id.</div><div class='del'>-		 * Not that anyone upstream would care... */</div><div class='del'>-		header-&gt;device_id = priv-&gt;ndev-&gt;ifindex;</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-		DEBUG(SHOW_PIMFOR_FRAMES,</div><div class='del'>-		      "PIMFOR: op %i, oid 0x%08x, device %i, flags 0x%x length 0x%x\n",</div><div class='del'>-		      header-&gt;operation, header-&gt;oid, header-&gt;device_id,</div><div class='del'>-		      header-&gt;flags, header-&gt;length);</div><div class='del'>-</div><div class='del'>-		/* display the buffer contents for debugging */</div><div class='del'>-		display_buffer((char *) header, PIMFOR_HEADER_SIZE);</div><div class='del'>-		display_buffer((char *) header + PIMFOR_HEADER_SIZE,</div><div class='del'>-			       header-&gt;length);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		/* nobody sends these */</div><div class='del'>-		if (header-&gt;flags &amp; PIMFOR_FLAG_APPLIC_ORIGIN) {</div><div class='del'>-			printk(KERN_DEBUG</div><div class='del'>-			       "%s: errant PIMFOR application frame\n",</div><div class='del'>-			       ndev-&gt;name);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Determine frame size, skipping OID_INL_TUNNEL headers. */</div><div class='del'>-		size = PIMFOR_HEADER_SIZE + header-&gt;length;</div><div class='del'>-		frame = kmalloc(sizeof(struct islpci_mgmtframe) + size,</div><div class='del'>-				GFP_ATOMIC);</div><div class='del'>-		if (!frame)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		frame-&gt;ndev = ndev;</div><div class='del'>-		memcpy(&amp;frame-&gt;buf, header, size);</div><div class='del'>-		frame-&gt;header = (pimfor_header_t *) frame-&gt;buf;</div><div class='del'>-		frame-&gt;data = frame-&gt;buf + PIMFOR_HEADER_SIZE;</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-		DEBUG(SHOW_PIMFOR_FRAMES,</div><div class='del'>-		      "frame: header: %p, data: %p, size: %d\n",</div><div class='del'>-		      frame-&gt;header, frame-&gt;data, size);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		if (header-&gt;operation == PIMFOR_OP_TRAP) {</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-			printk(KERN_DEBUG</div><div class='del'>-			       "TRAP: oid 0x%x, device %i, flags 0x%x length %i\n",</div><div class='del'>-			       header-&gt;oid, header-&gt;device_id, header-&gt;flags,</div><div class='del'>-			       header-&gt;length);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-			/* Create work to handle trap out of interrupt</div><div class='del'>-			 * context. */</div><div class='del'>-			INIT_WORK(&amp;frame-&gt;ws, prism54_process_trap);</div><div class='del'>-			schedule_work(&amp;frame-&gt;ws);</div><div class='del'>-</div><div class='del'>-		} else {</div><div class='del'>-			/* Signal the one waiting process that a response</div><div class='del'>-			 * has been received. */</div><div class='del'>-			if ((frame = xchg(&amp;priv-&gt;mgmt_received, frame)) != NULL) {</div><div class='del'>-				printk(KERN_WARNING</div><div class='del'>-				       "%s: mgmt response not collected\n",</div><div class='del'>-				       ndev-&gt;name);</div><div class='del'>-				kfree(frame);</div><div class='del'>-			}</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-			DEBUG(SHOW_TRACING, "Wake up Mgmt Queue\n");</div><div class='del'>-#endif</div><div class='del'>-			wake_up(&amp;priv-&gt;mgmt_wqueue);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Cleanup the transmit queue by freeing all frames handled by the device.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-islpci_mgt_cleanup_transmit(struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	isl38xx_control_block *cb =	/* volatile not needed */</div><div class='del'>-	    (isl38xx_control_block *) priv-&gt;control_block;</div><div class='del'>-	u32 curr_frag;</div><div class='del'>-</div><div class='del'>-#if VERBOSE &gt; SHOW_ERROR_MESSAGES</div><div class='del'>-	DEBUG(SHOW_FUNCTION_CALLS, "islpci_mgt_cleanup_transmit\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Only once per cleanup, determine fragment range to</div><div class='del'>-	 * process.  This avoids an endless loop (i.e. lockup) if</div><div class='del'>-	 * the device became confused, incrementing device_curr_frag</div><div class='del'>-	 * rapidly. */</div><div class='del'>-	curr_frag = le32_to_cpu(cb-&gt;device_curr_frag[ISL38XX_CB_TX_MGMTQ]);</div><div class='del'>-	barrier();</div><div class='del'>-</div><div class='del'>-	for (; priv-&gt;index_mgmt_tx &lt; curr_frag; priv-&gt;index_mgmt_tx++) {</div><div class='del'>-		int index = priv-&gt;index_mgmt_tx % ISL38XX_CB_MGMT_QSIZE;</div><div class='del'>-		struct islpci_membuf *buf = &amp;priv-&gt;mgmt_tx[index];</div><div class='del'>-		dma_unmap_single(&amp;priv-&gt;pdev-&gt;dev, buf-&gt;pci_addr, buf-&gt;size,</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-		buf-&gt;pci_addr = 0;</div><div class='del'>-		kfree(buf-&gt;mem);</div><div class='del'>-		buf-&gt;mem = NULL;</div><div class='del'>-		buf-&gt;size = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Perform one request-response transaction to the device.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-islpci_mgt_transaction(struct net_device *ndev,</div><div class='del'>-		       int operation, unsigned long oid,</div><div class='del'>-		       void *senddata, int sendlen,</div><div class='del'>-		       struct islpci_mgmtframe **recvframe)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	const long wait_cycle_jiffies = msecs_to_jiffies(ISL38XX_WAIT_CYCLE * 10);</div><div class='del'>-	long timeout_left = ISL38XX_MAX_WAIT_CYCLES * wait_cycle_jiffies;</div><div class='del'>-	int err;</div><div class='del'>-	DEFINE_WAIT(wait);</div><div class='del'>-</div><div class='del'>-	*recvframe = NULL;</div><div class='del'>-</div><div class='del'>-	if (mutex_lock_interruptible(&amp;priv-&gt;mgmt_lock))</div><div class='del'>-		return -ERESTARTSYS;</div><div class='del'>-</div><div class='del'>-	prepare_to_wait(&amp;priv-&gt;mgmt_wqueue, &amp;wait, TASK_UNINTERRUPTIBLE);</div><div class='del'>-	err = islpci_mgt_transmit(ndev, operation, oid, senddata, sendlen);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = -ETIMEDOUT;</div><div class='del'>-	while (timeout_left &gt; 0) {</div><div class='del'>-		int timeleft;</div><div class='del'>-		struct islpci_mgmtframe *frame;</div><div class='del'>-</div><div class='del'>-		timeleft = schedule_timeout_uninterruptible(wait_cycle_jiffies);</div><div class='del'>-		frame = xchg(&amp;priv-&gt;mgmt_received, NULL);</div><div class='del'>-		if (frame) {</div><div class='del'>-			if (frame-&gt;header-&gt;oid == oid) {</div><div class='del'>-				*recvframe = frame;</div><div class='del'>-				err = 0;</div><div class='del'>-				goto out;</div><div class='del'>-			} else {</div><div class='del'>-				printk(KERN_DEBUG</div><div class='del'>-				       "%s: expecting oid 0x%x, received 0x%x.\n",</div><div class='del'>-				       ndev-&gt;name, (unsigned int) oid,</div><div class='del'>-				       frame-&gt;header-&gt;oid);</div><div class='del'>-				kfree(frame);</div><div class='del'>-				frame = NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (timeleft == 0) {</div><div class='del'>-			printk(KERN_DEBUG</div><div class='del'>-				"%s: timeout waiting for mgmt response %lu, "</div><div class='del'>-				"triggering device\n",</div><div class='del'>-				ndev-&gt;name, timeout_left);</div><div class='del'>-			islpci_trigger(priv);</div><div class='del'>-		}</div><div class='del'>-		timeout_left += timeleft - wait_cycle_jiffies;</div><div class='del'>-	}</div><div class='del'>-	printk(KERN_WARNING "%s: timeout waiting for mgmt response\n",</div><div class='del'>-	       ndev-&gt;name);</div><div class='del'>-</div><div class='del'>-	/* TODO: we should reset the device here */</div><div class='del'>- out:</div><div class='del'>-	finish_wait(&amp;priv-&gt;mgmt_wqueue, &amp;wait);</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mgmt_lock);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/drivers/net/wireless/intersil/prism54/islpci_mgt.h b/drivers/net/wireless/intersil/prism54/islpci_mgt.h<br/>deleted file mode 100644<br/>index 1f87d0aea60c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/prism54/islpci_mgt.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/islpci_mgt.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,126 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2002 Intersil Americas Inc.</div><div class='del'>- *  Copyright (C) 2003 Luis R. Rodriguez &lt;mcgrof@ruslug.rutgers.edu&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _ISLPCI_MGT_H</div><div class='del'>-#define _ISLPCI_MGT_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/wireless.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Function definitions</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define K_DEBUG(f, m, args...) do { if(f &amp; m) printk(KERN_DEBUG args); } while(0)</div><div class='del'>-#define DEBUG(f, args...) K_DEBUG(f, pc_debug, args)</div><div class='del'>-</div><div class='del'>-extern int pc_debug;</div><div class='del'>-#define init_wds 0	/* help compiler optimize away dead code */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* General driver definitions */</div><div class='del'>-#define PCIDEVICE_LATENCY_TIMER_MIN		0x40</div><div class='del'>-#define PCIDEVICE_LATENCY_TIMER_VAL		0x50</div><div class='del'>-</div><div class='del'>-/* Debugging verbose definitions */</div><div class='del'>-#define SHOW_NOTHING                            0x00	/* overrules everything */</div><div class='del'>-#define SHOW_ANYTHING                           0xFF</div><div class='del'>-#define SHOW_ERROR_MESSAGES                     0x01</div><div class='del'>-#define SHOW_TRAPS                              0x02</div><div class='del'>-#define SHOW_FUNCTION_CALLS                     0x04</div><div class='del'>-#define SHOW_TRACING                            0x08</div><div class='del'>-#define SHOW_QUEUE_INDEXES                      0x10</div><div class='del'>-#define SHOW_PIMFOR_FRAMES                      0x20</div><div class='del'>-#define SHOW_BUFFER_CONTENTS                    0x40</div><div class='del'>-#define VERBOSE                                 0x01</div><div class='del'>-</div><div class='del'>-/* Default card definitions */</div><div class='del'>-#define CARD_DEFAULT_CHANNEL                    6</div><div class='del'>-#define CARD_DEFAULT_MODE                       INL_MODE_CLIENT</div><div class='del'>-#define CARD_DEFAULT_IW_MODE			IW_MODE_INFRA</div><div class='del'>-#define CARD_DEFAULT_BSSTYPE                    DOT11_BSSTYPE_INFRA</div><div class='del'>-#define CARD_DEFAULT_CLIENT_SSID		""</div><div class='del'>-#define CARD_DEFAULT_AP_SSID			"default"</div><div class='del'>-#define CARD_DEFAULT_KEY1                       "default_key_1"</div><div class='del'>-#define CARD_DEFAULT_KEY2                       "default_key_2"</div><div class='del'>-#define CARD_DEFAULT_KEY3                       "default_key_3"</div><div class='del'>-#define CARD_DEFAULT_KEY4                       "default_key_4"</div><div class='del'>-#define CARD_DEFAULT_WEP                        0</div><div class='del'>-#define CARD_DEFAULT_FILTER                     0</div><div class='del'>-#define CARD_DEFAULT_WDS                        0</div><div class='del'>-#define	CARD_DEFAULT_AUTHEN                     DOT11_AUTH_OS</div><div class='del'>-#define	CARD_DEFAULT_DOT1X			0</div><div class='del'>-#define CARD_DEFAULT_MLME_MODE			DOT11_MLME_AUTO</div><div class='del'>-#define CARD_DEFAULT_CONFORMANCE                OID_INL_CONFORMANCE_NONE</div><div class='del'>-#define CARD_DEFAULT_PROFILE			DOT11_PROFILE_MIXED_G_WIFI</div><div class='del'>-#define CARD_DEFAULT_MAXFRAMEBURST		DOT11_MAXFRAMEBURST_MIXED_SAFE</div><div class='del'>-</div><div class='del'>-/* PIMFOR package definitions */</div><div class='del'>-#define PIMFOR_ETHERTYPE                        0x8828</div><div class='del'>-#define PIMFOR_HEADER_SIZE                      12</div><div class='del'>-#define PIMFOR_VERSION                          1</div><div class='del'>-#define PIMFOR_OP_GET                           0</div><div class='del'>-#define PIMFOR_OP_SET                           1</div><div class='del'>-#define PIMFOR_OP_RESPONSE                      2</div><div class='del'>-#define PIMFOR_OP_ERROR                         3</div><div class='del'>-#define PIMFOR_OP_TRAP                          4</div><div class='del'>-#define PIMFOR_OP_RESERVED                      5	/* till 255 */</div><div class='del'>-#define PIMFOR_DEV_ID_MHLI_MIB                  0</div><div class='del'>-#define PIMFOR_FLAG_APPLIC_ORIGIN               0x01</div><div class='del'>-#define PIMFOR_FLAG_LITTLE_ENDIAN               0x02</div><div class='del'>-</div><div class='del'>-void display_buffer(char *, int);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Type definition section</div><div class='del'>- *</div><div class='del'>- *  the structure defines only the header allowing copyless</div><div class='del'>- *  frame handling</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	u8 version;</div><div class='del'>-	u8 operation;</div><div class='del'>-	u32 oid;</div><div class='del'>-	u8 device_id;</div><div class='del'>-	u8 flags;</div><div class='del'>-	u32 length;</div><div class='del'>-} __packed</div><div class='del'>-pimfor_header_t;</div><div class='del'>-</div><div class='del'>-/* A received and interrupt-processed management frame, either for</div><div class='del'>- * schedule_work(prism54_process_trap) or for priv-&gt;mgmt_received,</div><div class='del'>- * processed by islpci_mgt_transaction(). */</div><div class='del'>-struct islpci_mgmtframe {</div><div class='del'>-	struct net_device *ndev;      /* pointer to network device */</div><div class='del'>-	pimfor_header_t *header;      /* payload header, points into buf */</div><div class='del'>-	void *data;		      /* payload ex header, points into buf */</div><div class='del'>-        struct work_struct ws;	      /* argument for schedule_work() */</div><div class='del'>-	char buf[];		      /* fragment buffer */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-islpci_mgt_receive(struct net_device *ndev);</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-islpci_mgmt_rx_fill(struct net_device *ndev);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-islpci_mgt_cleanup_transmit(struct net_device *ndev);</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-islpci_mgt_transaction(struct net_device *ndev,</div><div class='del'>-                       int operation, unsigned long oid,</div><div class='del'>-		       void *senddata, int sendlen,</div><div class='del'>-		       struct islpci_mgmtframe **recvframe);</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-islpci_mgt_release(struct islpci_mgmtframe *frame)</div><div class='del'>-{</div><div class='del'>-        kfree(frame);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif				/* _ISLPCI_MGT_H */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/prism54/oid_mgt.c b/drivers/net/wireless/intersil/prism54/oid_mgt.c<br/>deleted file mode 100644<br/>index 9fd307ca4b6d..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/prism54/oid_mgt.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/oid_mgt.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,889 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2003,2004 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include "prismcompat.h"</div><div class='del'>-#include "islpci_dev.h"</div><div class='del'>-#include "islpci_mgt.h"</div><div class='del'>-#include "isl_oid.h"</div><div class='del'>-#include "oid_mgt.h"</div><div class='del'>-#include "isl_ioctl.h"</div><div class='del'>-</div><div class='del'>-/* to convert between channel and freq */</div><div class='del'>-static const int frequency_list_bg[] = { 2412, 2417, 2422, 2427, 2432,</div><div class='del'>-	2437, 2442, 2447, 2452, 2457, 2462, 2467, 2472, 2484</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-channel_of_freq(int f)</div><div class='del'>-{</div><div class='del'>-	int c = 0;</div><div class='del'>-</div><div class='del'>-	if ((f &gt;= 2412) &amp;&amp; (f &lt;= 2484)) {</div><div class='del'>-		while ((c &lt; 14) &amp;&amp; (f != frequency_list_bg[c]))</div><div class='del'>-			c++;</div><div class='del'>-		return (c &gt;= 14) ? 0 : ++c;</div><div class='del'>-	} else if ((f &gt;= (int) 5000) &amp;&amp; (f &lt;= (int) 6000)) {</div><div class='del'>-		return ( (f - 5000) / 5 );</div><div class='del'>-	} else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define OID_STRUCT(name,oid,s,t) [name] = {oid, 0, sizeof(s), t}</div><div class='del'>-#define OID_STRUCT_C(name,oid,s,t) OID_STRUCT(name,oid,s,t | OID_FLAG_CACHED)</div><div class='del'>-#define OID_U32(name,oid) OID_STRUCT(name,oid,u32,OID_TYPE_U32)</div><div class='del'>-#define OID_U32_C(name,oid) OID_STRUCT_C(name,oid,u32,OID_TYPE_U32)</div><div class='del'>-#define OID_STRUCT_MLME(name,oid) OID_STRUCT(name,oid,struct obj_mlme,OID_TYPE_MLME)</div><div class='del'>-#define OID_STRUCT_MLMEEX(name,oid) OID_STRUCT(name,oid,struct obj_mlmeex,OID_TYPE_MLMEEX)</div><div class='del'>-</div><div class='del'>-#define OID_UNKNOWN(name,oid) OID_STRUCT(name,oid,0,0)</div><div class='del'>-</div><div class='del'>-struct oid_t isl_oid[] = {</div><div class='del'>-	OID_STRUCT(GEN_OID_MACADDRESS, 0x00000000, u8[6], OID_TYPE_ADDR),</div><div class='del'>-	OID_U32(GEN_OID_LINKSTATE, 0x00000001),</div><div class='del'>-	OID_UNKNOWN(GEN_OID_WATCHDOG, 0x00000002),</div><div class='del'>-	OID_UNKNOWN(GEN_OID_MIBOP, 0x00000003),</div><div class='del'>-	OID_UNKNOWN(GEN_OID_OPTIONS, 0x00000004),</div><div class='del'>-	OID_UNKNOWN(GEN_OID_LEDCONFIG, 0x00000005),</div><div class='del'>-</div><div class='del'>-	/* 802.11 */</div><div class='del'>-	OID_U32_C(DOT11_OID_BSSTYPE, 0x10000000),</div><div class='del'>-	OID_STRUCT_C(DOT11_OID_BSSID, 0x10000001, u8[6], OID_TYPE_RAW),</div><div class='del'>-	OID_STRUCT_C(DOT11_OID_SSID, 0x10000002, struct obj_ssid,</div><div class='del'>-		     OID_TYPE_SSID),</div><div class='del'>-	OID_U32(DOT11_OID_STATE, 0x10000003),</div><div class='del'>-	OID_U32(DOT11_OID_AID, 0x10000004),</div><div class='del'>-	OID_STRUCT(DOT11_OID_COUNTRYSTRING, 0x10000005, u8[4], OID_TYPE_RAW),</div><div class='del'>-	OID_STRUCT_C(DOT11_OID_SSIDOVERRIDE, 0x10000006, struct obj_ssid,</div><div class='del'>-		     OID_TYPE_SSID),</div><div class='del'>-</div><div class='del'>-	OID_U32(DOT11_OID_MEDIUMLIMIT, 0x11000000),</div><div class='del'>-	OID_U32_C(DOT11_OID_BEACONPERIOD, 0x11000001),</div><div class='del'>-	OID_U32(DOT11_OID_DTIMPERIOD, 0x11000002),</div><div class='del'>-	OID_U32(DOT11_OID_ATIMWINDOW, 0x11000003),</div><div class='del'>-	OID_U32(DOT11_OID_LISTENINTERVAL, 0x11000004),</div><div class='del'>-	OID_U32(DOT11_OID_CFPPERIOD, 0x11000005),</div><div class='del'>-	OID_U32(DOT11_OID_CFPDURATION, 0x11000006),</div><div class='del'>-</div><div class='del'>-	OID_U32_C(DOT11_OID_AUTHENABLE, 0x12000000),</div><div class='del'>-	OID_U32_C(DOT11_OID_PRIVACYINVOKED, 0x12000001),</div><div class='del'>-	OID_U32_C(DOT11_OID_EXUNENCRYPTED, 0x12000002),</div><div class='del'>-	OID_U32_C(DOT11_OID_DEFKEYID, 0x12000003),</div><div class='del'>-	[DOT11_OID_DEFKEYX] = {0x12000004, 3, sizeof (struct obj_key),</div><div class='del'>-			       OID_FLAG_CACHED | OID_TYPE_KEY},	/* DOT11_OID_DEFKEY1,...DOT11_OID_DEFKEY4 */</div><div class='del'>-	OID_UNKNOWN(DOT11_OID_STAKEY, 0x12000008),</div><div class='del'>-	OID_U32(DOT11_OID_REKEYTHRESHOLD, 0x12000009),</div><div class='del'>-	OID_UNKNOWN(DOT11_OID_STASC, 0x1200000a),</div><div class='del'>-</div><div class='del'>-	OID_U32(DOT11_OID_PRIVTXREJECTED, 0x1a000000),</div><div class='del'>-	OID_U32(DOT11_OID_PRIVRXPLAIN, 0x1a000001),</div><div class='del'>-	OID_U32(DOT11_OID_PRIVRXFAILED, 0x1a000002),</div><div class='del'>-	OID_U32(DOT11_OID_PRIVRXNOKEY, 0x1a000003),</div><div class='del'>-</div><div class='del'>-	OID_U32_C(DOT11_OID_RTSTHRESH, 0x13000000),</div><div class='del'>-	OID_U32_C(DOT11_OID_FRAGTHRESH, 0x13000001),</div><div class='del'>-	OID_U32_C(DOT11_OID_SHORTRETRIES, 0x13000002),</div><div class='del'>-	OID_U32_C(DOT11_OID_LONGRETRIES, 0x13000003),</div><div class='del'>-	OID_U32_C(DOT11_OID_MAXTXLIFETIME, 0x13000004),</div><div class='del'>-	OID_U32(DOT11_OID_MAXRXLIFETIME, 0x13000005),</div><div class='del'>-	OID_U32(DOT11_OID_AUTHRESPTIMEOUT, 0x13000006),</div><div class='del'>-	OID_U32(DOT11_OID_ASSOCRESPTIMEOUT, 0x13000007),</div><div class='del'>-</div><div class='del'>-	OID_UNKNOWN(DOT11_OID_ALOFT_TABLE, 0x1d000000),</div><div class='del'>-	OID_UNKNOWN(DOT11_OID_ALOFT_CTRL_TABLE, 0x1d000001),</div><div class='del'>-	OID_UNKNOWN(DOT11_OID_ALOFT_RETREAT, 0x1d000002),</div><div class='del'>-	OID_UNKNOWN(DOT11_OID_ALOFT_PROGRESS, 0x1d000003),</div><div class='del'>-	OID_U32(DOT11_OID_ALOFT_FIXEDRATE, 0x1d000004),</div><div class='del'>-	OID_UNKNOWN(DOT11_OID_ALOFT_RSSIGRAPH, 0x1d000005),</div><div class='del'>-	OID_UNKNOWN(DOT11_OID_ALOFT_CONFIG, 0x1d000006),</div><div class='del'>-</div><div class='del'>-	[DOT11_OID_VDCFX] = {0x1b000000, 7, 0, 0},</div><div class='del'>-	OID_U32(DOT11_OID_MAXFRAMEBURST, 0x1b000008),</div><div class='del'>-</div><div class='del'>-	OID_U32(DOT11_OID_PSM, 0x14000000),</div><div class='del'>-	OID_U32(DOT11_OID_CAMTIMEOUT, 0x14000001),</div><div class='del'>-	OID_U32(DOT11_OID_RECEIVEDTIMS, 0x14000002),</div><div class='del'>-	OID_U32(DOT11_OID_ROAMPREFERENCE, 0x14000003),</div><div class='del'>-</div><div class='del'>-	OID_U32(DOT11_OID_BRIDGELOCAL, 0x15000000),</div><div class='del'>-	OID_U32(DOT11_OID_CLIENTS, 0x15000001),</div><div class='del'>-	OID_U32(DOT11_OID_CLIENTSASSOCIATED, 0x15000002),</div><div class='del'>-	[DOT11_OID_CLIENTX] = {0x15000003, 2006, 0, 0},	/* DOT11_OID_CLIENTX,...DOT11_OID_CLIENT2007 */</div><div class='del'>-</div><div class='del'>-	OID_STRUCT(DOT11_OID_CLIENTFIND, 0x150007DB, u8[6], OID_TYPE_ADDR),</div><div class='del'>-	OID_STRUCT(DOT11_OID_WDSLINKADD, 0x150007DC, u8[6], OID_TYPE_ADDR),</div><div class='del'>-	OID_STRUCT(DOT11_OID_WDSLINKREMOVE, 0x150007DD, u8[6], OID_TYPE_ADDR),</div><div class='del'>-	OID_STRUCT(DOT11_OID_EAPAUTHSTA, 0x150007DE, u8[6], OID_TYPE_ADDR),</div><div class='del'>-	OID_STRUCT(DOT11_OID_EAPUNAUTHSTA, 0x150007DF, u8[6], OID_TYPE_ADDR),</div><div class='del'>-	OID_U32_C(DOT11_OID_DOT1XENABLE, 0x150007E0),</div><div class='del'>-	OID_UNKNOWN(DOT11_OID_MICFAILURE, 0x150007E1),</div><div class='del'>-	OID_UNKNOWN(DOT11_OID_REKEYINDICATE, 0x150007E2),</div><div class='del'>-</div><div class='del'>-	OID_U32(DOT11_OID_MPDUTXSUCCESSFUL, 0x16000000),</div><div class='del'>-	OID_U32(DOT11_OID_MPDUTXONERETRY, 0x16000001),</div><div class='del'>-	OID_U32(DOT11_OID_MPDUTXMULTIPLERETRIES, 0x16000002),</div><div class='del'>-	OID_U32(DOT11_OID_MPDUTXFAILED, 0x16000003),</div><div class='del'>-	OID_U32(DOT11_OID_MPDURXSUCCESSFUL, 0x16000004),</div><div class='del'>-	OID_U32(DOT11_OID_MPDURXDUPS, 0x16000005),</div><div class='del'>-	OID_U32(DOT11_OID_RTSSUCCESSFUL, 0x16000006),</div><div class='del'>-	OID_U32(DOT11_OID_RTSFAILED, 0x16000007),</div><div class='del'>-	OID_U32(DOT11_OID_ACKFAILED, 0x16000008),</div><div class='del'>-	OID_U32(DOT11_OID_FRAMERECEIVES, 0x16000009),</div><div class='del'>-	OID_U32(DOT11_OID_FRAMEERRORS, 0x1600000A),</div><div class='del'>-	OID_U32(DOT11_OID_FRAMEABORTS, 0x1600000B),</div><div class='del'>-	OID_U32(DOT11_OID_FRAMEABORTSPHY, 0x1600000C),</div><div class='del'>-</div><div class='del'>-	OID_U32(DOT11_OID_SLOTTIME, 0x17000000),</div><div class='del'>-	OID_U32(DOT11_OID_CWMIN, 0x17000001),</div><div class='del'>-	OID_U32(DOT11_OID_CWMAX, 0x17000002),</div><div class='del'>-	OID_U32(DOT11_OID_ACKWINDOW, 0x17000003),</div><div class='del'>-	OID_U32(DOT11_OID_ANTENNARX, 0x17000004),</div><div class='del'>-	OID_U32(DOT11_OID_ANTENNATX, 0x17000005),</div><div class='del'>-	OID_U32(DOT11_OID_ANTENNADIVERSITY, 0x17000006),</div><div class='del'>-	OID_U32_C(DOT11_OID_CHANNEL, 0x17000007),</div><div class='del'>-	OID_U32_C(DOT11_OID_EDTHRESHOLD, 0x17000008),</div><div class='del'>-	OID_U32(DOT11_OID_PREAMBLESETTINGS, 0x17000009),</div><div class='del'>-	OID_STRUCT(DOT11_OID_RATES, 0x1700000A, u8[IWMAX_BITRATES + 1],</div><div class='del'>-		   OID_TYPE_RAW),</div><div class='del'>-	OID_U32(DOT11_OID_CCAMODESUPPORTED, 0x1700000B),</div><div class='del'>-	OID_U32(DOT11_OID_CCAMODE, 0x1700000C),</div><div class='del'>-	OID_UNKNOWN(DOT11_OID_RSSIVECTOR, 0x1700000D),</div><div class='del'>-	OID_UNKNOWN(DOT11_OID_OUTPUTPOWERTABLE, 0x1700000E),</div><div class='del'>-	OID_U32(DOT11_OID_OUTPUTPOWER, 0x1700000F),</div><div class='del'>-	OID_STRUCT(DOT11_OID_SUPPORTEDRATES, 0x17000010,</div><div class='del'>-		   u8[IWMAX_BITRATES + 1], OID_TYPE_RAW),</div><div class='del'>-	OID_U32_C(DOT11_OID_FREQUENCY, 0x17000011),</div><div class='del'>-	[DOT11_OID_SUPPORTEDFREQUENCIES] =</div><div class='del'>-	    {0x17000012, 0, sizeof (struct obj_frequencies)</div><div class='del'>-	     + sizeof (u16) * IWMAX_FREQ, OID_TYPE_FREQUENCIES},</div><div class='del'>-</div><div class='del'>-	OID_U32(DOT11_OID_NOISEFLOOR, 0x17000013),</div><div class='del'>-	OID_STRUCT(DOT11_OID_FREQUENCYACTIVITY, 0x17000014, u8[IWMAX_FREQ + 1],</div><div class='del'>-		   OID_TYPE_RAW),</div><div class='del'>-	OID_UNKNOWN(DOT11_OID_IQCALIBRATIONTABLE, 0x17000015),</div><div class='del'>-	OID_U32(DOT11_OID_NONERPPROTECTION, 0x17000016),</div><div class='del'>-	OID_U32(DOT11_OID_SLOTSETTINGS, 0x17000017),</div><div class='del'>-	OID_U32(DOT11_OID_NONERPTIMEOUT, 0x17000018),</div><div class='del'>-	OID_U32(DOT11_OID_PROFILES, 0x17000019),</div><div class='del'>-	OID_STRUCT(DOT11_OID_EXTENDEDRATES, 0x17000020,</div><div class='del'>-		   u8[IWMAX_BITRATES + 1], OID_TYPE_RAW),</div><div class='del'>-</div><div class='del'>-	OID_STRUCT_MLME(DOT11_OID_DEAUTHENTICATE, 0x18000000),</div><div class='del'>-	OID_STRUCT_MLME(DOT11_OID_AUTHENTICATE, 0x18000001),</div><div class='del'>-	OID_STRUCT_MLME(DOT11_OID_DISASSOCIATE, 0x18000002),</div><div class='del'>-	OID_STRUCT_MLME(DOT11_OID_ASSOCIATE, 0x18000003),</div><div class='del'>-	OID_UNKNOWN(DOT11_OID_SCAN, 0x18000004),</div><div class='del'>-	OID_STRUCT_MLMEEX(DOT11_OID_BEACON, 0x18000005),</div><div class='del'>-	OID_STRUCT_MLMEEX(DOT11_OID_PROBE, 0x18000006),</div><div class='del'>-	OID_STRUCT_MLMEEX(DOT11_OID_DEAUTHENTICATEEX, 0x18000007),</div><div class='del'>-	OID_STRUCT_MLMEEX(DOT11_OID_AUTHENTICATEEX, 0x18000008),</div><div class='del'>-	OID_STRUCT_MLMEEX(DOT11_OID_DISASSOCIATEEX, 0x18000009),</div><div class='del'>-	OID_STRUCT_MLMEEX(DOT11_OID_ASSOCIATEEX, 0x1800000A),</div><div class='del'>-	OID_STRUCT_MLMEEX(DOT11_OID_REASSOCIATE, 0x1800000B),</div><div class='del'>-	OID_STRUCT_MLMEEX(DOT11_OID_REASSOCIATEEX, 0x1800000C),</div><div class='del'>-</div><div class='del'>-	OID_U32(DOT11_OID_NONERPSTATUS, 0x1E000000),</div><div class='del'>-</div><div class='del'>-	OID_U32(DOT11_OID_STATIMEOUT, 0x19000000),</div><div class='del'>-	OID_U32_C(DOT11_OID_MLMEAUTOLEVEL, 0x19000001),</div><div class='del'>-	OID_U32(DOT11_OID_BSSTIMEOUT, 0x19000002),</div><div class='del'>-	[DOT11_OID_ATTACHMENT] = {0x19000003, 0,</div><div class='del'>-		sizeof(struct obj_attachment), OID_TYPE_ATTACH},</div><div class='del'>-	OID_STRUCT_C(DOT11_OID_PSMBUFFER, 0x19000004, struct obj_buffer,</div><div class='del'>-		     OID_TYPE_BUFFER),</div><div class='del'>-</div><div class='del'>-	OID_U32(DOT11_OID_BSSS, 0x1C000000),</div><div class='del'>-	[DOT11_OID_BSSX] = {0x1C000001, 63, sizeof (struct obj_bss),</div><div class='del'>-			    OID_TYPE_BSS},	/*DOT11_OID_BSS1,...,DOT11_OID_BSS64 */</div><div class='del'>-	OID_STRUCT(DOT11_OID_BSSFIND, 0x1C000042, struct obj_bss, OID_TYPE_BSS),</div><div class='del'>-	[DOT11_OID_BSSLIST] = {0x1C000043, 0, sizeof (struct</div><div class='del'>-						      obj_bsslist) +</div><div class='del'>-			       sizeof (struct obj_bss[IWMAX_BSS]),</div><div class='del'>-			       OID_TYPE_BSSLIST},</div><div class='del'>-</div><div class='del'>-	OID_UNKNOWN(OID_INL_TUNNEL, 0xFF020000),</div><div class='del'>-	OID_UNKNOWN(OID_INL_MEMADDR, 0xFF020001),</div><div class='del'>-	OID_UNKNOWN(OID_INL_MEMORY, 0xFF020002),</div><div class='del'>-	OID_U32_C(OID_INL_MODE, 0xFF020003),</div><div class='del'>-	OID_UNKNOWN(OID_INL_COMPONENT_NR, 0xFF020004),</div><div class='del'>-	OID_STRUCT(OID_INL_VERSION, 0xFF020005, u8[8], OID_TYPE_RAW),</div><div class='del'>-	OID_UNKNOWN(OID_INL_INTERFACE_ID, 0xFF020006),</div><div class='del'>-	OID_UNKNOWN(OID_INL_COMPONENT_ID, 0xFF020007),</div><div class='del'>-	OID_U32_C(OID_INL_CONFIG, 0xFF020008),</div><div class='del'>-	OID_U32_C(OID_INL_DOT11D_CONFORMANCE, 0xFF02000C),</div><div class='del'>-	OID_U32(OID_INL_PHYCAPABILITIES, 0xFF02000D),</div><div class='del'>-	OID_U32_C(OID_INL_OUTPUTPOWER, 0xFF02000F),</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-mgt_init(islpci_private *priv)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	priv-&gt;mib = kcalloc(OID_NUM_LAST, sizeof (void *), GFP_KERNEL);</div><div class='del'>-	if (!priv-&gt;mib)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* Alloc the cache */</div><div class='del'>-	for (i = 0; i &lt; OID_NUM_LAST; i++) {</div><div class='del'>-		if (isl_oid[i].flags &amp; OID_FLAG_CACHED) {</div><div class='del'>-			priv-&gt;mib[i] = kcalloc(isl_oid[i].size,</div><div class='del'>-					       (isl_oid[i].range + 1),</div><div class='del'>-					       GFP_KERNEL);</div><div class='del'>-			if (!priv-&gt;mib[i])</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-		} else</div><div class='del'>-			priv-&gt;mib[i] = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	init_rwsem(&amp;priv-&gt;mib_sem);</div><div class='del'>-	prism54_mib_init(priv);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-mgt_clean(islpci_private *priv)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;mib)</div><div class='del'>-		return;</div><div class='del'>-	for (i = 0; i &lt; OID_NUM_LAST; i++) {</div><div class='del'>-		kfree(priv-&gt;mib[i]);</div><div class='del'>-		priv-&gt;mib[i] = NULL;</div><div class='del'>-	}</div><div class='del'>-	kfree(priv-&gt;mib);</div><div class='del'>-	priv-&gt;mib = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-mgt_le_to_cpu(int type, void *data)</div><div class='del'>-{</div><div class='del'>-	switch (type) {</div><div class='del'>-	case OID_TYPE_U32:</div><div class='del'>-		*(u32 *) data = le32_to_cpu(*(u32 *) data);</div><div class='del'>-		break;</div><div class='del'>-	case OID_TYPE_BUFFER:{</div><div class='del'>-			struct obj_buffer *buff = data;</div><div class='del'>-			buff-&gt;size = le32_to_cpu(buff-&gt;size);</div><div class='del'>-			buff-&gt;addr = le32_to_cpu(buff-&gt;addr);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	case OID_TYPE_BSS:{</div><div class='del'>-			struct obj_bss *bss = data;</div><div class='del'>-			bss-&gt;age = le16_to_cpu(bss-&gt;age);</div><div class='del'>-			bss-&gt;channel = le16_to_cpu(bss-&gt;channel);</div><div class='del'>-			bss-&gt;capinfo = le16_to_cpu(bss-&gt;capinfo);</div><div class='del'>-			bss-&gt;rates = le16_to_cpu(bss-&gt;rates);</div><div class='del'>-			bss-&gt;basic_rates = le16_to_cpu(bss-&gt;basic_rates);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	case OID_TYPE_BSSLIST:{</div><div class='del'>-			struct obj_bsslist *list = data;</div><div class='del'>-			int i;</div><div class='del'>-			list-&gt;nr = le32_to_cpu(list-&gt;nr);</div><div class='del'>-			for (i = 0; i &lt; list-&gt;nr; i++)</div><div class='del'>-				mgt_le_to_cpu(OID_TYPE_BSS, &amp;list-&gt;bsslist[i]);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	case OID_TYPE_FREQUENCIES:{</div><div class='del'>-			struct obj_frequencies *freq = data;</div><div class='del'>-			int i;</div><div class='del'>-			freq-&gt;nr = le16_to_cpu(freq-&gt;nr);</div><div class='del'>-			for (i = 0; i &lt; freq-&gt;nr; i++)</div><div class='del'>-				freq-&gt;mhz[i] = le16_to_cpu(freq-&gt;mhz[i]);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	case OID_TYPE_MLME:{</div><div class='del'>-			struct obj_mlme *mlme = data;</div><div class='del'>-			mlme-&gt;id = le16_to_cpu(mlme-&gt;id);</div><div class='del'>-			mlme-&gt;state = le16_to_cpu(mlme-&gt;state);</div><div class='del'>-			mlme-&gt;code = le16_to_cpu(mlme-&gt;code);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	case OID_TYPE_MLMEEX:{</div><div class='del'>-			struct obj_mlmeex *mlme = data;</div><div class='del'>-			mlme-&gt;id = le16_to_cpu(mlme-&gt;id);</div><div class='del'>-			mlme-&gt;state = le16_to_cpu(mlme-&gt;state);</div><div class='del'>-			mlme-&gt;code = le16_to_cpu(mlme-&gt;code);</div><div class='del'>-			mlme-&gt;size = le16_to_cpu(mlme-&gt;size);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	case OID_TYPE_ATTACH:{</div><div class='del'>-			struct obj_attachment *attach = data;</div><div class='del'>-			attach-&gt;id = le16_to_cpu(attach-&gt;id);</div><div class='del'>-			attach-&gt;size = le16_to_cpu(attach-&gt;size);</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	case OID_TYPE_SSID:</div><div class='del'>-	case OID_TYPE_KEY:</div><div class='del'>-	case OID_TYPE_ADDR:</div><div class='del'>-	case OID_TYPE_RAW:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mgt_cpu_to_le(int type, void *data)</div><div class='del'>-{</div><div class='del'>-	switch (type) {</div><div class='del'>-	case OID_TYPE_U32:</div><div class='del'>-		*(u32 *) data = cpu_to_le32(*(u32 *) data);</div><div class='del'>-		break;</div><div class='del'>-	case OID_TYPE_BUFFER:{</div><div class='del'>-			struct obj_buffer *buff = data;</div><div class='del'>-			buff-&gt;size = cpu_to_le32(buff-&gt;size);</div><div class='del'>-			buff-&gt;addr = cpu_to_le32(buff-&gt;addr);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	case OID_TYPE_BSS:{</div><div class='del'>-			struct obj_bss *bss = data;</div><div class='del'>-			bss-&gt;age = cpu_to_le16(bss-&gt;age);</div><div class='del'>-			bss-&gt;channel = cpu_to_le16(bss-&gt;channel);</div><div class='del'>-			bss-&gt;capinfo = cpu_to_le16(bss-&gt;capinfo);</div><div class='del'>-			bss-&gt;rates = cpu_to_le16(bss-&gt;rates);</div><div class='del'>-			bss-&gt;basic_rates = cpu_to_le16(bss-&gt;basic_rates);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	case OID_TYPE_BSSLIST:{</div><div class='del'>-			struct obj_bsslist *list = data;</div><div class='del'>-			int i;</div><div class='del'>-			list-&gt;nr = cpu_to_le32(list-&gt;nr);</div><div class='del'>-			for (i = 0; i &lt; list-&gt;nr; i++)</div><div class='del'>-				mgt_cpu_to_le(OID_TYPE_BSS, &amp;list-&gt;bsslist[i]);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	case OID_TYPE_FREQUENCIES:{</div><div class='del'>-			struct obj_frequencies *freq = data;</div><div class='del'>-			int i;</div><div class='del'>-			freq-&gt;nr = cpu_to_le16(freq-&gt;nr);</div><div class='del'>-			for (i = 0; i &lt; freq-&gt;nr; i++)</div><div class='del'>-				freq-&gt;mhz[i] = cpu_to_le16(freq-&gt;mhz[i]);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	case OID_TYPE_MLME:{</div><div class='del'>-			struct obj_mlme *mlme = data;</div><div class='del'>-			mlme-&gt;id = cpu_to_le16(mlme-&gt;id);</div><div class='del'>-			mlme-&gt;state = cpu_to_le16(mlme-&gt;state);</div><div class='del'>-			mlme-&gt;code = cpu_to_le16(mlme-&gt;code);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	case OID_TYPE_MLMEEX:{</div><div class='del'>-			struct obj_mlmeex *mlme = data;</div><div class='del'>-			mlme-&gt;id = cpu_to_le16(mlme-&gt;id);</div><div class='del'>-			mlme-&gt;state = cpu_to_le16(mlme-&gt;state);</div><div class='del'>-			mlme-&gt;code = cpu_to_le16(mlme-&gt;code);</div><div class='del'>-			mlme-&gt;size = cpu_to_le16(mlme-&gt;size);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	case OID_TYPE_ATTACH:{</div><div class='del'>-			struct obj_attachment *attach = data;</div><div class='del'>-			attach-&gt;id = cpu_to_le16(attach-&gt;id);</div><div class='del'>-			attach-&gt;size = cpu_to_le16(attach-&gt;size);</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	case OID_TYPE_SSID:</div><div class='del'>-	case OID_TYPE_KEY:</div><div class='del'>-	case OID_TYPE_ADDR:</div><div class='del'>-	case OID_TYPE_RAW:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Note : data is modified during this function */</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-mgt_set_request(islpci_private *priv, enum oid_num_t n, int extra, void *data)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	struct islpci_mgmtframe *response = NULL;</div><div class='del'>-	int response_op = PIMFOR_OP_ERROR;</div><div class='del'>-	int dlen;</div><div class='del'>-	void *cache, *_data = data;</div><div class='del'>-	u32 oid;</div><div class='del'>-</div><div class='del'>-	BUG_ON(n &gt;= OID_NUM_LAST);</div><div class='del'>-	BUG_ON(extra &gt; isl_oid[n].range);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;mib)</div><div class='del'>-		/* memory has been freed */</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	dlen = isl_oid[n].size;</div><div class='del'>-	cache = priv-&gt;mib[n];</div><div class='del'>-	cache += (cache ? extra * dlen : 0);</div><div class='del'>-	oid = isl_oid[n].oid + extra;</div><div class='del'>-</div><div class='del'>-	if (_data == NULL)</div><div class='del'>-		/* we are requested to re-set a cached value */</div><div class='del'>-		_data = cache;</div><div class='del'>-	else</div><div class='del'>-		mgt_cpu_to_le(isl_oid[n].flags &amp; OID_FLAG_TYPE, _data);</div><div class='del'>-	/* If we are going to write to the cache, we don't want anyone to read</div><div class='del'>-	 * it -&gt; acquire write lock.</div><div class='del'>-	 * Else we could acquire a read lock to be sure we don't bother the</div><div class='del'>-	 * commit process (which takes a write lock). But I'm not sure if it's</div><div class='del'>-	 * needed.</div><div class='del'>-	 */</div><div class='del'>-	if (cache)</div><div class='del'>-		down_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-</div><div class='del'>-	if (islpci_get_state(priv) &gt;= PRV_STATE_READY) {</div><div class='del'>-		ret = islpci_mgt_transaction(priv-&gt;ndev, PIMFOR_OP_SET, oid,</div><div class='del'>-					     _data, dlen, &amp;response);</div><div class='del'>-		if (!ret) {</div><div class='del'>-			response_op = response-&gt;header-&gt;operation;</div><div class='del'>-			islpci_mgt_release(response);</div><div class='del'>-		}</div><div class='del'>-		if (ret || response_op == PIMFOR_OP_ERROR)</div><div class='del'>-			ret = -EIO;</div><div class='del'>-	} else if (!cache)</div><div class='del'>-		ret = -EIO;</div><div class='del'>-</div><div class='del'>-	if (cache) {</div><div class='del'>-		if (!ret &amp;&amp; data)</div><div class='del'>-			memcpy(cache, _data, dlen);</div><div class='del'>-		up_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* re-set given data to what it was */</div><div class='del'>-	if (data)</div><div class='del'>-		mgt_le_to_cpu(isl_oid[n].flags &amp; OID_FLAG_TYPE, data);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* None of these are cached */</div><div class='del'>-int</div><div class='del'>-mgt_set_varlen(islpci_private *priv, enum oid_num_t n, void *data, int extra_len)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	struct islpci_mgmtframe *response;</div><div class='del'>-	int response_op = PIMFOR_OP_ERROR;</div><div class='del'>-	int dlen;</div><div class='del'>-	u32 oid;</div><div class='del'>-</div><div class='del'>-	BUG_ON(n &gt;= OID_NUM_LAST);</div><div class='del'>-</div><div class='del'>-	dlen = isl_oid[n].size;</div><div class='del'>-	oid = isl_oid[n].oid;</div><div class='del'>-</div><div class='del'>-	mgt_cpu_to_le(isl_oid[n].flags &amp; OID_FLAG_TYPE, data);</div><div class='del'>-</div><div class='del'>-	if (islpci_get_state(priv) &gt;= PRV_STATE_READY) {</div><div class='del'>-		ret = islpci_mgt_transaction(priv-&gt;ndev, PIMFOR_OP_SET, oid,</div><div class='del'>-					     data, dlen + extra_len, &amp;response);</div><div class='del'>-		if (!ret) {</div><div class='del'>-			response_op = response-&gt;header-&gt;operation;</div><div class='del'>-			islpci_mgt_release(response);</div><div class='del'>-		}</div><div class='del'>-		if (ret || response_op == PIMFOR_OP_ERROR)</div><div class='del'>-			ret = -EIO;</div><div class='del'>-	} else</div><div class='del'>-		ret = -EIO;</div><div class='del'>-</div><div class='del'>-	/* re-set given data to what it was */</div><div class='del'>-	if (data)</div><div class='del'>-		mgt_le_to_cpu(isl_oid[n].flags &amp; OID_FLAG_TYPE, data);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-mgt_get_request(islpci_private *priv, enum oid_num_t n, int extra, void *data,</div><div class='del'>-		union oid_res_t *res)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	int ret = -EIO;</div><div class='del'>-	int reslen = 0;</div><div class='del'>-	struct islpci_mgmtframe *response = NULL;</div><div class='del'>-</div><div class='del'>-	int dlen;</div><div class='del'>-	void *cache, *_res = NULL;</div><div class='del'>-	u32 oid;</div><div class='del'>-</div><div class='del'>-	BUG_ON(n &gt;= OID_NUM_LAST);</div><div class='del'>-	BUG_ON(extra &gt; isl_oid[n].range);</div><div class='del'>-</div><div class='del'>-	res-&gt;ptr = NULL;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;mib)</div><div class='del'>-		/* memory has been freed */</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	dlen = isl_oid[n].size;</div><div class='del'>-	cache = priv-&gt;mib[n];</div><div class='del'>-	cache += cache ? extra * dlen : 0;</div><div class='del'>-	oid = isl_oid[n].oid + extra;</div><div class='del'>-	reslen = dlen;</div><div class='del'>-</div><div class='del'>-	if (cache)</div><div class='del'>-		down_read(&amp;priv-&gt;mib_sem);</div><div class='del'>-</div><div class='del'>-	if (islpci_get_state(priv) &gt;= PRV_STATE_READY) {</div><div class='del'>-		ret = islpci_mgt_transaction(priv-&gt;ndev, PIMFOR_OP_GET,</div><div class='del'>-					     oid, data, dlen, &amp;response);</div><div class='del'>-		if (ret || !response ||</div><div class='del'>-		    response-&gt;header-&gt;operation == PIMFOR_OP_ERROR) {</div><div class='del'>-			if (response)</div><div class='del'>-				islpci_mgt_release(response);</div><div class='del'>-			ret = -EIO;</div><div class='del'>-		}</div><div class='del'>-		if (!ret) {</div><div class='del'>-			_res = response-&gt;data;</div><div class='del'>-			reslen = response-&gt;header-&gt;length;</div><div class='del'>-		}</div><div class='del'>-	} else if (cache) {</div><div class='del'>-		_res = cache;</div><div class='del'>-		ret = 0;</div><div class='del'>-	}</div><div class='del'>-	if ((isl_oid[n].flags &amp; OID_FLAG_TYPE) == OID_TYPE_U32)</div><div class='del'>-		res-&gt;u = ret ? 0 : le32_to_cpu(*(u32 *) _res);</div><div class='del'>-	else {</div><div class='del'>-		res-&gt;ptr = kmalloc(reslen, GFP_KERNEL);</div><div class='del'>-		BUG_ON(res-&gt;ptr == NULL);</div><div class='del'>-		if (ret)</div><div class='del'>-			memset(res-&gt;ptr, 0, reslen);</div><div class='del'>-		else {</div><div class='del'>-			memcpy(res-&gt;ptr, _res, reslen);</div><div class='del'>-			mgt_le_to_cpu(isl_oid[n].flags &amp; OID_FLAG_TYPE,</div><div class='del'>-				      res-&gt;ptr);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (cache)</div><div class='del'>-		up_read(&amp;priv-&gt;mib_sem);</div><div class='del'>-</div><div class='del'>-	if (response &amp;&amp; !ret)</div><div class='del'>-		islpci_mgt_release(response);</div><div class='del'>-</div><div class='del'>-	if (reslen &gt; isl_oid[n].size)</div><div class='del'>-		printk(KERN_DEBUG</div><div class='del'>-		       "mgt_get_request(0x%x): received data length was bigger "</div><div class='del'>-		       "than expected (%d &gt; %d). Memory is probably corrupted...",</div><div class='del'>-		       oid, reslen, isl_oid[n].size);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* lock outside */</div><div class='del'>-int</div><div class='del'>-mgt_commit_list(islpci_private *priv, enum oid_num_t *l, int n)</div><div class='del'>-{</div><div class='del'>-	int i, ret = 0;</div><div class='del'>-	struct islpci_mgmtframe *response;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; n; i++) {</div><div class='del'>-		struct oid_t *t = &amp;(isl_oid[l[i]]);</div><div class='del'>-		void *data = priv-&gt;mib[l[i]];</div><div class='del'>-		int j = 0;</div><div class='del'>-		u32 oid = t-&gt;oid;</div><div class='del'>-		BUG_ON(data == NULL);</div><div class='del'>-		while (j &lt;= t-&gt;range) {</div><div class='del'>-			int r = islpci_mgt_transaction(priv-&gt;ndev, PIMFOR_OP_SET,</div><div class='del'>-						      oid, data, t-&gt;size,</div><div class='del'>-						      &amp;response);</div><div class='del'>-			if (response) {</div><div class='del'>-				r |= (response-&gt;header-&gt;operation == PIMFOR_OP_ERROR);</div><div class='del'>-				islpci_mgt_release(response);</div><div class='del'>-			}</div><div class='del'>-			if (r)</div><div class='del'>-				printk(KERN_ERR "%s: mgt_commit_list: failure. "</div><div class='del'>-					"oid=%08x err=%d\n",</div><div class='del'>-					priv-&gt;ndev-&gt;name, oid, r);</div><div class='del'>-			ret |= r;</div><div class='del'>-			j++;</div><div class='del'>-			oid++;</div><div class='del'>-			data += t-&gt;size;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Lock outside */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-mgt_set(islpci_private *priv, enum oid_num_t n, void *data)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(n &gt;= OID_NUM_LAST);</div><div class='del'>-	BUG_ON(priv-&gt;mib[n] == NULL);</div><div class='del'>-</div><div class='del'>-	memcpy(priv-&gt;mib[n], data, isl_oid[n].size);</div><div class='del'>-	mgt_cpu_to_le(isl_oid[n].flags &amp; OID_FLAG_TYPE, priv-&gt;mib[n]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-mgt_get(islpci_private *priv, enum oid_num_t n, void *res)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(n &gt;= OID_NUM_LAST);</div><div class='del'>-	BUG_ON(priv-&gt;mib[n] == NULL);</div><div class='del'>-	BUG_ON(res == NULL);</div><div class='del'>-</div><div class='del'>-	memcpy(res, priv-&gt;mib[n], isl_oid[n].size);</div><div class='del'>-	mgt_le_to_cpu(isl_oid[n].flags &amp; OID_FLAG_TYPE, res);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Commits the cache. Lock outside. */</div><div class='del'>-</div><div class='del'>-static enum oid_num_t commit_part1[] = {</div><div class='del'>-	OID_INL_CONFIG,</div><div class='del'>-	OID_INL_MODE,</div><div class='del'>-	DOT11_OID_BSSTYPE,</div><div class='del'>-	DOT11_OID_CHANNEL,</div><div class='del'>-	DOT11_OID_MLMEAUTOLEVEL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static enum oid_num_t commit_part2[] = {</div><div class='del'>-	DOT11_OID_SSID,</div><div class='del'>-	DOT11_OID_PSMBUFFER,</div><div class='del'>-	DOT11_OID_AUTHENABLE,</div><div class='del'>-	DOT11_OID_PRIVACYINVOKED,</div><div class='del'>-	DOT11_OID_EXUNENCRYPTED,</div><div class='del'>-	DOT11_OID_DEFKEYX,	/* MULTIPLE */</div><div class='del'>-	DOT11_OID_DEFKEYID,</div><div class='del'>-	DOT11_OID_DOT1XENABLE,</div><div class='del'>-	OID_INL_DOT11D_CONFORMANCE,</div><div class='del'>-	/* Do not initialize this - fw &lt; 1.0.4.3 rejects it</div><div class='del'>-	OID_INL_OUTPUTPOWER,</div><div class='del'>-	*/</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* update the MAC addr. */</div><div class='del'>-static int</div><div class='del'>-mgt_update_addr(islpci_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct islpci_mgmtframe *res;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = islpci_mgt_transaction(priv-&gt;ndev, PIMFOR_OP_GET,</div><div class='del'>-				     isl_oid[GEN_OID_MACADDRESS].oid, NULL,</div><div class='del'>-				     isl_oid[GEN_OID_MACADDRESS].size, &amp;res);</div><div class='del'>-</div><div class='del'>-	if ((ret == 0) &amp;&amp; res &amp;&amp; (res-&gt;header-&gt;operation != PIMFOR_OP_ERROR))</div><div class='del'>-		memcpy(priv-&gt;ndev-&gt;dev_addr, res-&gt;data, ETH_ALEN);</div><div class='del'>-	else</div><div class='del'>-		ret = -EIO;</div><div class='del'>-	if (res)</div><div class='del'>-		islpci_mgt_release(res);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		printk(KERN_ERR "%s: mgt_update_addr: failure\n", priv-&gt;ndev-&gt;name);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-mgt_commit(islpci_private *priv)</div><div class='del'>-{</div><div class='del'>-	int rvalue;</div><div class='del'>-	enum oid_num_t u;</div><div class='del'>-</div><div class='del'>-	if (islpci_get_state(priv) &lt; PRV_STATE_INIT)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	rvalue = mgt_commit_list(priv, commit_part1, ARRAY_SIZE(commit_part1));</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;iw_mode != IW_MODE_MONITOR)</div><div class='del'>-		rvalue |= mgt_commit_list(priv, commit_part2, ARRAY_SIZE(commit_part2));</div><div class='del'>-</div><div class='del'>-	u = OID_INL_MODE;</div><div class='del'>-	rvalue |= mgt_commit_list(priv, &amp;u, 1);</div><div class='del'>-	rvalue |= mgt_update_addr(priv);</div><div class='del'>-</div><div class='del'>-	if (rvalue) {</div><div class='del'>-		/* some request have failed. The device might be in an</div><div class='del'>-		   incoherent state. We should reset it ! */</div><div class='del'>-		printk(KERN_DEBUG "%s: mgt_commit: failure\n", priv-&gt;ndev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-	return rvalue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* The following OIDs need to be "unlatched":</div><div class='del'>- *</div><div class='del'>- * MEDIUMLIMIT,BEACONPERIOD,DTIMPERIOD,ATIMWINDOW,LISTENINTERVAL</div><div class='del'>- * FREQUENCY,EXTENDEDRATES.</div><div class='del'>- *</div><div class='del'>- * The way to do this is to set ESSID. Note though that they may get</div><div class='del'>- * unlatch before though by setting another OID. */</div><div class='del'>-#if 0</div><div class='del'>-void</div><div class='del'>-mgt_unlatch_all(islpci_private *priv)</div><div class='del'>-{</div><div class='del'>-	u32 u;</div><div class='del'>-	int rvalue = 0;</div><div class='del'>-</div><div class='del'>-	if (islpci_get_state(priv) &lt; PRV_STATE_INIT)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	u = DOT11_OID_SSID;</div><div class='del'>-	rvalue = mgt_commit_list(priv, &amp;u, 1);</div><div class='del'>-	/* Necessary if in MANUAL RUN mode? */</div><div class='del'>-#if 0</div><div class='del'>-	u = OID_INL_MODE;</div><div class='del'>-	rvalue |= mgt_commit_list(priv, &amp;u, 1);</div><div class='del'>-</div><div class='del'>-	u = DOT11_OID_MLMEAUTOLEVEL;</div><div class='del'>-	rvalue |= mgt_commit_list(priv, &amp;u, 1);</div><div class='del'>-</div><div class='del'>-	u = OID_INL_MODE;</div><div class='del'>-	rvalue |= mgt_commit_list(priv, &amp;u, 1);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (rvalue)</div><div class='del'>-		printk(KERN_DEBUG "%s: Unlatching OIDs failed\n", priv-&gt;ndev-&gt;name);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* This will tell you if you are allowed to answer a mlme(ex) request .*/</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-mgt_mlme_answer(islpci_private *priv)</div><div class='del'>-{</div><div class='del'>-	u32 mlmeautolevel;</div><div class='del'>-	/* Acquire a read lock because if we are in a mode change, it's</div><div class='del'>-	 * possible to answer true, while the card is leaving master to managed</div><div class='del'>-	 * mode. Answering to a mlme in this situation could hang the card.</div><div class='del'>-	 */</div><div class='del'>-	down_read(&amp;priv-&gt;mib_sem);</div><div class='del'>-	mlmeautolevel =</div><div class='del'>-	    le32_to_cpu(*(u32 *) priv-&gt;mib[DOT11_OID_MLMEAUTOLEVEL]);</div><div class='del'>-	up_read(&amp;priv-&gt;mib_sem);</div><div class='del'>-</div><div class='del'>-	return ((priv-&gt;iw_mode == IW_MODE_MASTER) &amp;&amp;</div><div class='del'>-		(mlmeautolevel &gt;= DOT11_MLME_INTERMEDIATE));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum oid_num_t</div><div class='del'>-mgt_oidtonum(u32 oid)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; OID_NUM_LAST; i++)</div><div class='del'>-		if (isl_oid[i].oid == oid)</div><div class='del'>-			return i;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "looking for an unknown oid 0x%x", oid);</div><div class='del'>-</div><div class='del'>-	return OID_NUM_LAST;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-mgt_response_to_str(enum oid_num_t n, union oid_res_t *r, char *str)</div><div class='del'>-{</div><div class='del'>-	switch (isl_oid[n].flags &amp; OID_FLAG_TYPE) {</div><div class='del'>-	case OID_TYPE_U32:</div><div class='del'>-		return scnprintf(str, PRIV_STR_SIZE, "%u\n", r-&gt;u);</div><div class='del'>-	case OID_TYPE_BUFFER:{</div><div class='del'>-			struct obj_buffer *buff = r-&gt;ptr;</div><div class='del'>-			return scnprintf(str, PRIV_STR_SIZE,</div><div class='del'>-					"size=%u\naddr=0x%X\n", buff-&gt;size,</div><div class='del'>-					buff-&gt;addr);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case OID_TYPE_BSS:{</div><div class='del'>-			struct obj_bss *bss = r-&gt;ptr;</div><div class='del'>-			return scnprintf(str, PRIV_STR_SIZE,</div><div class='del'>-					"age=%u\nchannel=%u\n"</div><div class='del'>-					"capinfo=0x%X\nrates=0x%X\n"</div><div class='del'>-					"basic_rates=0x%X\n", bss-&gt;age,</div><div class='del'>-					bss-&gt;channel, bss-&gt;capinfo,</div><div class='del'>-					bss-&gt;rates, bss-&gt;basic_rates);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case OID_TYPE_BSSLIST:{</div><div class='del'>-			struct obj_bsslist *list = r-&gt;ptr;</div><div class='del'>-			int i, k;</div><div class='del'>-			k = scnprintf(str, PRIV_STR_SIZE, "nr=%u\n", list-&gt;nr);</div><div class='del'>-			for (i = 0; i &lt; list-&gt;nr; i++)</div><div class='del'>-				k += scnprintf(str + k, PRIV_STR_SIZE - k,</div><div class='del'>-					      "bss[%u] :\nage=%u\nchannel=%u\n"</div><div class='del'>-					      "capinfo=0x%X\nrates=0x%X\n"</div><div class='del'>-					      "basic_rates=0x%X\n",</div><div class='del'>-					      i, list-&gt;bsslist[i].age,</div><div class='del'>-					      list-&gt;bsslist[i].channel,</div><div class='del'>-					      list-&gt;bsslist[i].capinfo,</div><div class='del'>-					      list-&gt;bsslist[i].rates,</div><div class='del'>-					      list-&gt;bsslist[i].basic_rates);</div><div class='del'>-			return k;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case OID_TYPE_FREQUENCIES:{</div><div class='del'>-			struct obj_frequencies *freq = r-&gt;ptr;</div><div class='del'>-			int i, t;</div><div class='del'>-			printk("nr : %u\n", freq-&gt;nr);</div><div class='del'>-			t = scnprintf(str, PRIV_STR_SIZE, "nr=%u\n", freq-&gt;nr);</div><div class='del'>-			for (i = 0; i &lt; freq-&gt;nr; i++)</div><div class='del'>-				t += scnprintf(str + t, PRIV_STR_SIZE - t,</div><div class='del'>-					      "mhz[%u]=%u\n", i, freq-&gt;mhz[i]);</div><div class='del'>-			return t;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case OID_TYPE_MLME:{</div><div class='del'>-			struct obj_mlme *mlme = r-&gt;ptr;</div><div class='del'>-			return scnprintf(str, PRIV_STR_SIZE,</div><div class='del'>-					"id=0x%X\nstate=0x%X\ncode=0x%X\n",</div><div class='del'>-					mlme-&gt;id, mlme-&gt;state, mlme-&gt;code);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case OID_TYPE_MLMEEX:{</div><div class='del'>-			struct obj_mlmeex *mlme = r-&gt;ptr;</div><div class='del'>-			return scnprintf(str, PRIV_STR_SIZE,</div><div class='del'>-					"id=0x%X\nstate=0x%X\n"</div><div class='del'>-					"code=0x%X\nsize=0x%X\n", mlme-&gt;id,</div><div class='del'>-					mlme-&gt;state, mlme-&gt;code, mlme-&gt;size);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case OID_TYPE_ATTACH:{</div><div class='del'>-			struct obj_attachment *attach = r-&gt;ptr;</div><div class='del'>-			return scnprintf(str, PRIV_STR_SIZE,</div><div class='del'>-					"id=%d\nsize=%d\n",</div><div class='del'>-					attach-&gt;id,</div><div class='del'>-					attach-&gt;size);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case OID_TYPE_SSID:{</div><div class='del'>-			struct obj_ssid *ssid = r-&gt;ptr;</div><div class='del'>-			return scnprintf(str, PRIV_STR_SIZE,</div><div class='del'>-					"length=%u\noctets=%.*s\n",</div><div class='del'>-					ssid-&gt;length, ssid-&gt;length,</div><div class='del'>-					ssid-&gt;octets);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case OID_TYPE_KEY:{</div><div class='del'>-			struct obj_key *key = r-&gt;ptr;</div><div class='del'>-			int t, i;</div><div class='del'>-			t = scnprintf(str, PRIV_STR_SIZE,</div><div class='del'>-				     "type=0x%X\nlength=0x%X\nkey=0x",</div><div class='del'>-				     key-&gt;type, key-&gt;length);</div><div class='del'>-			for (i = 0; i &lt; key-&gt;length; i++)</div><div class='del'>-				t += scnprintf(str + t, PRIV_STR_SIZE - t,</div><div class='del'>-					      "%02X:", key-&gt;key[i]);</div><div class='del'>-			t += scnprintf(str + t, PRIV_STR_SIZE - t, "\n");</div><div class='del'>-			return t;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case OID_TYPE_RAW:</div><div class='del'>-	case OID_TYPE_ADDR:{</div><div class='del'>-			unsigned char *buff = r-&gt;ptr;</div><div class='del'>-			int t, i;</div><div class='del'>-			t = scnprintf(str, PRIV_STR_SIZE, "hex data=");</div><div class='del'>-			for (i = 0; i &lt; isl_oid[n].size; i++)</div><div class='del'>-				t += scnprintf(str + t, PRIV_STR_SIZE - t,</div><div class='del'>-					      "%02X:", buff[i]);</div><div class='del'>-			t += scnprintf(str + t, PRIV_STR_SIZE - t, "\n");</div><div class='del'>-			return t;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/intersil/prism54/oid_mgt.h b/drivers/net/wireless/intersil/prism54/oid_mgt.h<br/>deleted file mode 100644<br/>index a7dc9e24c0bf..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/prism54/oid_mgt.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/oid_mgt.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,46 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2003 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#if !defined(_OID_MGT_H)</div><div class='del'>-#define _OID_MGT_H</div><div class='del'>-</div><div class='del'>-#include "isl_oid.h"</div><div class='del'>-#include "islpci_dev.h"</div><div class='del'>-</div><div class='del'>-extern struct oid_t isl_oid[];</div><div class='del'>-</div><div class='del'>-int mgt_init(islpci_private *);</div><div class='del'>-</div><div class='del'>-void mgt_clean(islpci_private *);</div><div class='del'>-</div><div class='del'>-/* I don't know where to put these 2 */</div><div class='del'>-extern const int frequency_list_a[];</div><div class='del'>-int channel_of_freq(int);</div><div class='del'>-</div><div class='del'>-void mgt_le_to_cpu(int, void *);</div><div class='del'>-</div><div class='del'>-int mgt_set_request(islpci_private *, enum oid_num_t, int, void *);</div><div class='del'>-int mgt_set_varlen(islpci_private *, enum oid_num_t, void *, int);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int mgt_get_request(islpci_private *, enum oid_num_t, int, void *,</div><div class='del'>-		    union oid_res_t *);</div><div class='del'>-</div><div class='del'>-int mgt_commit_list(islpci_private *, enum oid_num_t *, int);</div><div class='del'>-</div><div class='del'>-void mgt_set(islpci_private *, enum oid_num_t, void *);</div><div class='del'>-</div><div class='del'>-void mgt_get(islpci_private *, enum oid_num_t, void *);</div><div class='del'>-</div><div class='del'>-int mgt_commit(islpci_private *);</div><div class='del'>-</div><div class='del'>-int mgt_mlme_answer(islpci_private *);</div><div class='del'>-</div><div class='del'>-enum oid_num_t mgt_oidtonum(u32 oid);</div><div class='del'>-</div><div class='del'>-int mgt_response_to_str(enum oid_num_t, union oid_res_t *, char *);</div><div class='del'>-</div><div class='del'>-#endif				/* !defined(_OID_MGT_H) */</div><div class='del'>-/* EOF */</div><div class='head'>diff --git a/drivers/net/wireless/intersil/prism54/prismcompat.h b/drivers/net/wireless/intersil/prism54/prismcompat.h<br/>deleted file mode 100644<br/>index c4489b66d07e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/intersil/prism54/prismcompat.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/intersil/prism54/prismcompat.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- *  (C) 2004 Margit Schubert-While &lt;margitsw@t-online.de&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Compatibility header file to aid support of different kernel versions</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef PRISM54_COMPAT24</div><div class='del'>-#include "prismcompat24.h"</div><div class='del'>-#else	/* PRISM54_COMPAT24 */</div><div class='del'>-</div><div class='del'>-#ifndef _PRISM_COMPAT_H</div><div class='del'>-#define _PRISM_COMPAT_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/firmware.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;linux/compiler.h&gt;</div><div class='del'>-</div><div class='del'>-#ifndef __iomem</div><div class='del'>-#define __iomem</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define PRISM_FW_PDEV		&amp;priv-&gt;pdev-&gt;dev</div><div class='del'>-</div><div class='del'>-#endif				/* _PRISM_COMPAT_H */</div><div class='del'>-#endif				/* PRISM54_COMPAT24 */</div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas/Kconfig b/drivers/net/wireless/marvell/libertas/Kconfig<br/>index 6d62ab49aa8d..caf8bc231b2e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas/Kconfig</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> config LIBERTAS</div><div class='ctx'> 	tristate "Marvell 8xxx Libertas WLAN driver support"</div><div class='add'>+	depends on USB || MMC || SPI</div><div class='ctx'> 	depends on CFG80211</div><div class='del'>-	select WIRELESS_EXT</div><div class='del'>-	select WEXT_SPY</div><div class='del'>-	select LIB80211</div><div class='ctx'> 	select FW_LOADER</div><div class='ctx'> 	help</div><div class='ctx'> 	  A library for Marvell Libertas 8xxx devices.</div><div class='hunk'>@@ -15,12 +13,6 @@ config LIBERTAS_USB</div><div class='ctx'> 	help</div><div class='ctx'> 	  A driver for Marvell Libertas 8388 USB devices.</div><div class='ctx'> </div><div class='del'>-config LIBERTAS_CS</div><div class='del'>-	tristate "Marvell Libertas 8385 CompactFlash 802.11b/g cards"</div><div class='del'>-	depends on LIBERTAS &amp;&amp; PCMCIA &amp;&amp; HAS_IOPORT_MAP</div><div class='del'>-	help</div><div class='del'>-	  A driver for Marvell Libertas 8385 CompactFlash devices.</div><div class='del'>-</div><div class='ctx'> config LIBERTAS_SDIO</div><div class='ctx'> 	tristate "Marvell Libertas 8385/8686/8688 SDIO 802.11b/g cards"</div><div class='ctx'> 	depends on LIBERTAS &amp;&amp; MMC</div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas/Makefile b/drivers/net/wireless/marvell/libertas/Makefile<br/>index 41b9b440a542..2ac04f4d61a5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas/Makefile</a></div><div class='hunk'>@@ -17,6 +17,5 @@ libertas_spi-objs += if_spi.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_LIBERTAS)     += libertas.o</div><div class='ctx'> obj-$(CONFIG_LIBERTAS_USB) += usb8xxx.o</div><div class='del'>-obj-$(CONFIG_LIBERTAS_CS)  += libertas_cs.o</div><div class='ctx'> obj-$(CONFIG_LIBERTAS_SDIO) += libertas_sdio.o</div><div class='ctx'> obj-$(CONFIG_LIBERTAS_SPI) += libertas_spi.o</div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas/cfg.c b/drivers/net/wireless/marvell/libertas/cfg.c<br/>index 4e3de684928b..caba7491cd5a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/cfg.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/cfg.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/cfg.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas/cfg.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/ieee80211.h&gt;</div><div class='ctx'> #include &lt;net/cfg80211.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "decl.h"</div><div class='ctx'> #include "cfg.h"</div><div class='hunk'>@@ -416,10 +416,20 @@ static int lbs_add_cf_param_tlv(u8 *tlv)</div><div class='ctx'> </div><div class='ctx'> static int lbs_add_wpa_tlv(u8 *tlv, const u8 *ie, u8 ie_len)</div><div class='ctx'> {</div><div class='del'>-	size_t tlv_len;</div><div class='add'>+	struct mrvl_ie_data *wpatlv = (struct mrvl_ie_data *)tlv;</div><div class='add'>+	const struct element *wpaie;</div><div class='add'>+</div><div class='add'>+	/* Find the first RSN or WPA IE to use */</div><div class='add'>+	wpaie = cfg80211_find_elem(WLAN_EID_RSN, ie, ie_len);</div><div class='add'>+	if (!wpaie)</div><div class='add'>+		wpaie = cfg80211_find_vendor_elem(WLAN_OUI_MICROSOFT,</div><div class='add'>+						  WLAN_OUI_TYPE_MICROSOFT_WPA,</div><div class='add'>+						  ie, ie_len);</div><div class='add'>+	if (!wpaie || wpaie-&gt;datalen &gt; 128)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * We need just convert an IE to an TLV. IEs use u8 for the header,</div><div class='add'>+	 * Convert the found IE to a TLV. IEs use u8 for the header,</div><div class='ctx'> 	 *   u8      type</div><div class='ctx'> 	 *   u8      len</div><div class='ctx'> 	 *   u8[]    data</div><div class='hunk'>@@ -428,14 +438,47 @@ static int lbs_add_wpa_tlv(u8 *tlv, const u8 *ie, u8 ie_len)</div><div class='ctx'> 	 *   __le16  len</div><div class='ctx'> 	 *   u8[]    data</div><div class='ctx'> 	 */</div><div class='del'>-	*tlv++ = *ie++;</div><div class='del'>-	*tlv++ = 0;</div><div class='del'>-	tlv_len = *tlv++ = *ie++;</div><div class='del'>-	*tlv++ = 0;</div><div class='del'>-	while (tlv_len--)</div><div class='del'>-		*tlv++ = *ie++;</div><div class='del'>-	/* the TLV is two bytes larger than the IE */</div><div class='del'>-	return ie_len + 2;</div><div class='add'>+	wpatlv-&gt;header.type = cpu_to_le16(wpaie-&gt;id);</div><div class='add'>+	wpatlv-&gt;header.len = cpu_to_le16(wpaie-&gt;datalen);</div><div class='add'>+	memcpy(wpatlv-&gt;data, wpaie-&gt;data, wpaie-&gt;datalen);</div><div class='add'>+</div><div class='add'>+	/* Return the total number of bytes added to the TLV buffer */</div><div class='add'>+	return sizeof(struct mrvl_ie_header) + wpaie-&gt;datalen;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Add WPS enrollee TLV</div><div class='add'>+ */</div><div class='add'>+#define LBS_MAX_WPS_ENROLLEE_TLV_SIZE		\</div><div class='add'>+	(sizeof(struct mrvl_ie_header)		\</div><div class='add'>+	 + 256)</div><div class='add'>+</div><div class='add'>+static int lbs_add_wps_enrollee_tlv(u8 *tlv, const u8 *ie, size_t ie_len)</div><div class='add'>+{</div><div class='add'>+	struct mrvl_ie_data *wpstlv = (struct mrvl_ie_data *)tlv;</div><div class='add'>+	const struct element *wpsie;</div><div class='add'>+</div><div class='add'>+	/* Look for a WPS IE and add it to the probe request */</div><div class='add'>+	wpsie = cfg80211_find_vendor_elem(WLAN_OUI_MICROSOFT,</div><div class='add'>+					  WLAN_OUI_TYPE_MICROSOFT_WPS,</div><div class='add'>+					  ie, ie_len);</div><div class='add'>+	if (!wpsie)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Convert the WPS IE to a TLV. The IE looks like this:</div><div class='add'>+	 *   u8      type (WLAN_EID_VENDOR_SPECIFIC)</div><div class='add'>+	 *   u8      len</div><div class='add'>+	 *   u8[]    data</div><div class='add'>+	 * but the TLV will look like this instead:</div><div class='add'>+	 *   __le16  type (TLV_TYPE_WPS_ENROLLEE)</div><div class='add'>+	 *   __le16  len</div><div class='add'>+	 *   u8[]    data</div><div class='add'>+	 */</div><div class='add'>+	wpstlv-&gt;header.type = cpu_to_le16(TLV_TYPE_WPS_ENROLLEE);</div><div class='add'>+	wpstlv-&gt;header.len = cpu_to_le16(wpsie-&gt;datalen);</div><div class='add'>+	memcpy(wpstlv-&gt;data, wpsie-&gt;data, wpsie-&gt;datalen);</div><div class='add'>+</div><div class='add'>+	/* Return the total number of bytes added to the TLV buffer */</div><div class='add'>+	return sizeof(struct mrvl_ie_header) + wpsie-&gt;datalen;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -443,6 +486,7 @@ static int lbs_add_wpa_tlv(u8 *tlv, const u8 *ie, u8 ie_len)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int lbs_cfg_set_monitor_channel(struct wiphy *wiphy,</div><div class='add'>+				       struct net_device *dev,</div><div class='ctx'> 				       struct cfg80211_chan_def *chandef)</div><div class='ctx'> {</div><div class='ctx'> 	struct lbs_private *priv = wiphy_priv(wiphy);</div><div class='hunk'>@@ -546,7 +590,7 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy,</div><div class='ctx'> 	pos = scanresp-&gt;bssdesc_and_tlvbuffer;</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_hex(LBS_DEB_SCAN, "SCAN_RSP", scanresp-&gt;bssdesc_and_tlvbuffer,</div><div class='del'>-			scanresp-&gt;bssdescriptsize);</div><div class='add'>+		    bsssize);</div><div class='ctx'> </div><div class='ctx'> 	tsfdesc = pos + bsssize;</div><div class='ctx'> 	tsfsize = 4 + 8 * scanresp-&gt;nr_sets;</div><div class='hunk'>@@ -664,14 +708,15 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Our scan command contains a TLV, consting of a SSID TLV, a channel list</div><div class='del'>- * TLV and a rates TLV. Determine the maximum size of them:</div><div class='add'>+ * Our scan command contains a TLV, consisting of a SSID TLV, a channel list</div><div class='add'>+ * TLV, a rates TLV, and an optional WPS IE. Determine the maximum size of them:</div><div class='ctx'>  */</div><div class='ctx'> #define LBS_SCAN_MAX_CMD_SIZE			\</div><div class='ctx'> 	(sizeof(struct cmd_ds_802_11_scan)	\</div><div class='ctx'> 	 + LBS_MAX_SSID_TLV_SIZE		\</div><div class='ctx'> 	 + LBS_MAX_CHANNEL_LIST_TLV_SIZE	\</div><div class='del'>-	 + LBS_MAX_RATES_TLV_SIZE)</div><div class='add'>+	 + LBS_MAX_RATES_TLV_SIZE		\</div><div class='add'>+	 + LBS_MAX_WPS_ENROLLEE_TLV_SIZE)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Assumes priv-&gt;scan_req is initialized and valid</div><div class='hunk'>@@ -720,6 +765,11 @@ static void lbs_scan_worker(struct work_struct *work)</div><div class='ctx'> 	/* add rates TLV */</div><div class='ctx'> 	tlv += lbs_add_supported_rates_tlv(tlv);</div><div class='ctx'> </div><div class='add'>+	/* add optional WPS enrollee TLV */</div><div class='add'>+	if (priv-&gt;scan_req-&gt;ie &amp;&amp; priv-&gt;scan_req-&gt;ie_len)</div><div class='add'>+		tlv += lbs_add_wps_enrollee_tlv(tlv, priv-&gt;scan_req-&gt;ie,</div><div class='add'>+						priv-&gt;scan_req-&gt;ie_len);</div><div class='add'>+</div><div class='ctx'> 	if (priv-&gt;scan_channel &lt; priv-&gt;scan_req-&gt;n_channels) {</div><div class='ctx'> 		cancel_delayed_work(&amp;priv-&gt;scan_work);</div><div class='ctx'> 		if (netif_running(priv-&gt;dev))</div><div class='hunk'>@@ -1053,7 +1103,6 @@ static int lbs_set_authtype(struct lbs_private *priv,</div><div class='ctx'>  */</div><div class='ctx'> #define LBS_ASSOC_MAX_CMD_SIZE                     \</div><div class='ctx'> 	(sizeof(struct cmd_ds_802_11_associate)    \</div><div class='del'>-	 - 512 /* cmd_ds_802_11_associate.iebuf */ \</div><div class='ctx'> 	 + LBS_MAX_SSID_TLV_SIZE                   \</div><div class='ctx'> 	 + LBS_MAX_CHANNEL_TLV_SIZE                \</div><div class='ctx'> 	 + LBS_MAX_CF_PARAM_TLV_SIZE               \</div><div class='hunk'>@@ -1102,10 +1151,13 @@ static int lbs_associate(struct lbs_private *priv,</div><div class='ctx'> 	/* add SSID TLV */</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	ssid_eid = ieee80211_bss_get_ie(bss, WLAN_EID_SSID);</div><div class='del'>-	if (ssid_eid)</div><div class='del'>-		pos += lbs_add_ssid_tlv(pos, ssid_eid + 2, ssid_eid[1]);</div><div class='del'>-	else</div><div class='add'>+	if (ssid_eid) {</div><div class='add'>+		u32 ssid_len = min(ssid_eid[1], IEEE80211_MAX_SSID_LEN);</div><div class='add'>+</div><div class='add'>+		pos += lbs_add_ssid_tlv(pos, ssid_eid + 2, ssid_len);</div><div class='add'>+	} else {</div><div class='ctx'> 		lbs_deb_assoc("no SSID\n");</div><div class='add'>+	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	/* add DS param TLV */</div><div class='hunk'>@@ -1130,8 +1182,7 @@ static int lbs_associate(struct lbs_private *priv,</div><div class='ctx'> 	if (sme-&gt;ie &amp;&amp; sme-&gt;ie_len)</div><div class='ctx'> 		pos += lbs_add_wpa_tlv(pos, sme-&gt;ie, sme-&gt;ie_len);</div><div class='ctx'> </div><div class='del'>-	len = (sizeof(*cmd) - sizeof(cmd-&gt;iebuf)) +</div><div class='del'>-		(u16)(pos - (u8 *) &amp;cmd-&gt;iebuf);</div><div class='add'>+	len = sizeof(*cmd) + (u16)(pos - (u8 *) &amp;cmd-&gt;iebuf);</div><div class='ctx'> 	cmd-&gt;hdr.size = cpu_to_le16(len);</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_hex(LBS_DEB_ASSOC, "ASSOC_CMD", (u8 *) cmd,</div><div class='hunk'>@@ -1437,7 +1488,7 @@ static int lbs_cfg_disconnect(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lbs_cfg_set_default_key(struct wiphy *wiphy,</div><div class='del'>-				   struct net_device *netdev,</div><div class='add'>+				   struct net_device *netdev, int link_id,</div><div class='ctx'> 				   u8 key_index, bool unicast,</div><div class='ctx'> 				   bool multicast)</div><div class='ctx'> {</div><div class='hunk'>@@ -1457,8 +1508,8 @@ static int lbs_cfg_set_default_key(struct wiphy *wiphy,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int lbs_cfg_add_key(struct wiphy *wiphy, struct net_device *netdev,</div><div class='del'>-			   u8 idx, bool pairwise, const u8 *mac_addr,</div><div class='del'>-			   struct key_params *params)</div><div class='add'>+			   int link_id, u8 idx, bool pairwise,</div><div class='add'>+			   const u8 *mac_addr, struct key_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct lbs_private *priv = wiphy_priv(wiphy);</div><div class='ctx'> 	u16 key_info;</div><div class='hunk'>@@ -1518,7 +1569,8 @@ static int lbs_cfg_add_key(struct wiphy *wiphy, struct net_device *netdev,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int lbs_cfg_del_key(struct wiphy *wiphy, struct net_device *netdev,</div><div class='del'>-			   u8 key_index, bool pairwise, const u8 *mac_addr)</div><div class='add'>+			   int link_id, u8 key_index, bool pairwise,</div><div class='add'>+			   const u8 *mac_addr)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_assoc("del_key: key_idx %d, mac_addr %pM\n",</div><div class='hunk'>@@ -2097,8 +2149,8 @@ static void lbs_reg_notifier(struct wiphy *wiphy,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This function get's called after lbs_setup_firmware() determined the</div><div class='del'>- * firmware capabities. So we can setup the wiphy according to our</div><div class='add'>+ * This function gets called after lbs_setup_firmware() determined the</div><div class='add'>+ * firmware capabilities. So we can setup the wiphy according to our</div><div class='ctx'>  * hardware/firmware.</div><div class='ctx'>  */</div><div class='ctx'> int lbs_cfg_register(struct lbs_private *priv)</div><div class='hunk'>@@ -2107,6 +2159,7 @@ int lbs_cfg_register(struct lbs_private *priv)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	wdev-&gt;wiphy-&gt;max_scan_ssids = 1;</div><div class='add'>+	wdev-&gt;wiphy-&gt;max_scan_ie_len = 256;</div><div class='ctx'> 	wdev-&gt;wiphy-&gt;signal_type = CFG80211_SIGNAL_TYPE_MBM;</div><div class='ctx'> </div><div class='ctx'> 	wdev-&gt;wiphy-&gt;interface_modes =</div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas/cmd.c b/drivers/net/wireless/marvell/libertas/cmd.c<br/>index a4d9dd73b258..21fde876bb0d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/cmd.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/cmd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/cmd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas/cmd.c</a></div><div class='hunk'>@@ -150,10 +150,9 @@ int lbs_update_hw_spec(struct lbs_private *priv)</div><div class='ctx'> 		memmove(priv-&gt;current_addr, cmd.permanentaddr, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	if (!priv-&gt;copied_hwaddr) {</div><div class='del'>-		memcpy(priv-&gt;dev-&gt;dev_addr, priv-&gt;current_addr, ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(priv-&gt;dev, priv-&gt;current_addr);</div><div class='ctx'> 		if (priv-&gt;mesh_dev)</div><div class='del'>-			memcpy(priv-&gt;mesh_dev-&gt;dev_addr,</div><div class='del'>-				priv-&gt;current_addr, ETH_ALEN);</div><div class='add'>+			eth_hw_addr_set(priv-&gt;mesh_dev, priv-&gt;current_addr);</div><div class='ctx'> 		priv-&gt;copied_hwaddr = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -454,46 +453,6 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  lbs_get_snmp_mib - Get an SNMP MIB value</div><div class='del'>- *</div><div class='del'>- *  @priv:	A pointer to &amp;struct lbs_private structure</div><div class='del'>- *  @oid:	The OID to retrieve from the firmware</div><div class='del'>- *  @out_val:	Location for the returned value</div><div class='del'>- *</div><div class='del'>- *  returns:	0 on success, error on failure</div><div class='del'>- */</div><div class='del'>-int lbs_get_snmp_mib(struct lbs_private *priv, u32 oid, u16 *out_val)</div><div class='del'>-{</div><div class='del'>-	struct cmd_ds_802_11_snmp_mib cmd;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	memset(&amp;cmd, 0, sizeof (cmd));</div><div class='del'>-	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='del'>-	cmd.action = cpu_to_le16(CMD_ACT_GET);</div><div class='del'>-	cmd.oid = cpu_to_le16(oid);</div><div class='del'>-</div><div class='del'>-	ret = lbs_cmd_with_response(priv, CMD_802_11_SNMP_MIB, &amp;cmd);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	switch (le16_to_cpu(cmd.bufsize)) {</div><div class='del'>-	case sizeof(u8):</div><div class='del'>-		*out_val = cmd.value[0];</div><div class='del'>-		break;</div><div class='del'>-	case sizeof(u16):</div><div class='del'>-		*out_val = le16_to_cpu(*((__le16 *)(&amp;cmd.value)));</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		lbs_deb_cmd("SNMP_CMD: (get) unhandled OID 0x%x size %d\n",</div><div class='del'>-		            oid, le16_to_cpu(cmd.bufsize));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  *  lbs_get_tx_power - Get the min, max, and current TX power</div><div class='ctx'>  *</div><div class='ctx'>  *  @priv:	A pointer to &amp;struct lbs_private structure</div><div class='hunk'>@@ -526,31 +485,6 @@ int lbs_get_tx_power(struct lbs_private *priv, s16 *curlevel, s16 *minlevel,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  lbs_set_tx_power - Set the TX power</div><div class='del'>- *</div><div class='del'>- *  @priv:	A pointer to &amp;struct lbs_private structure</div><div class='del'>- *  @dbm:	The desired power level in dBm</div><div class='del'>- *</div><div class='del'>- *  returns: 	   	0 on success, error on failure</div><div class='del'>- */</div><div class='del'>-int lbs_set_tx_power(struct lbs_private *priv, s16 dbm)</div><div class='del'>-{</div><div class='del'>-	struct cmd_ds_802_11_rf_tx_power cmd;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='del'>-	cmd.action = cpu_to_le16(CMD_ACT_SET);</div><div class='del'>-	cmd.curlevel = cpu_to_le16(dbm);</div><div class='del'>-</div><div class='del'>-	lbs_deb_cmd("SET_RF_TX_POWER: %d dBm\n", dbm);</div><div class='del'>-</div><div class='del'>-	ret = lbs_cmd_with_response(priv, CMD_802_11_RF_TX_POWER, &amp;cmd);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  *  lbs_set_monitor_mode - Enable or disable monitor mode</div><div class='ctx'>  *  (only implemented on OLPC usb8388 FW)</div><div class='ctx'>  *</div><div class='hunk'>@@ -969,10 +903,6 @@ static void lbs_submit_command(struct lbs_private *priv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (command == CMD_802_11_DEEP_SLEEP) {</div><div class='del'>-		if (priv-&gt;is_auto_deep_sleep_enabled) {</div><div class='del'>-			priv-&gt;wakeup_dev_required = 1;</div><div class='del'>-			priv-&gt;dnld_sent = 0;</div><div class='del'>-		}</div><div class='ctx'> 		priv-&gt;is_deep_sleep = 1;</div><div class='ctx'> 		lbs_complete_command(priv, cmdnode, 0);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1133,7 +1063,7 @@ int lbs_allocate_cmd_buffer(struct lbs_private *priv)</div><div class='ctx'> 		if (!cmdarray[i].cmdbuf) {</div><div class='ctx'> 			lbs_deb_host("ALLOC_CMD_BUF: ptempvirtualaddr is NULL\n");</div><div class='ctx'> 			ret = -1;</div><div class='del'>-			goto done;</div><div class='add'>+			goto free_cmd_array;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1141,8 +1071,17 @@ int lbs_allocate_cmd_buffer(struct lbs_private *priv)</div><div class='ctx'> 		init_waitqueue_head(&amp;cmdarray[i].cmdwait_q);</div><div class='ctx'> 		lbs_cleanup_and_insert_cmd(priv, &amp;cmdarray[i]);</div><div class='ctx'> 	}</div><div class='del'>-	ret = 0;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='add'>+free_cmd_array:</div><div class='add'>+	for (i = 0; i &lt; LBS_NUM_CMD_BUFFERS; i++) {</div><div class='add'>+		if (cmdarray[i].cmdbuf) {</div><div class='add'>+			kfree(cmdarray[i].cmdbuf);</div><div class='add'>+			cmdarray[i].cmdbuf = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	kfree(priv-&gt;cmd_array);</div><div class='add'>+	priv-&gt;cmd_array = NULL;</div><div class='ctx'> done:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1432,70 +1371,6 @@ void lbs_ps_confirm_sleep(struct lbs_private *priv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * lbs_set_tpc_cfg - Configures the transmission power control functionality</div><div class='del'>- *</div><div class='del'>- * @priv:	A pointer to &amp;struct lbs_private structure</div><div class='del'>- * @enable:	Transmission power control enable</div><div class='del'>- * @p0:		Power level when link quality is good (dBm).</div><div class='del'>- * @p1:		Power level when link quality is fair (dBm).</div><div class='del'>- * @p2:		Power level when link quality is poor (dBm).</div><div class='del'>- * @usesnr:	Use Signal to Noise Ratio in TPC</div><div class='del'>- *</div><div class='del'>- * returns:	0 on success</div><div class='del'>- */</div><div class='del'>-int lbs_set_tpc_cfg(struct lbs_private *priv, int enable, int8_t p0, int8_t p1,</div><div class='del'>-		int8_t p2, int usesnr)</div><div class='del'>-{</div><div class='del'>-	struct cmd_ds_802_11_tpc_cfg cmd;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='del'>-	cmd.action = cpu_to_le16(CMD_ACT_SET);</div><div class='del'>-	cmd.enable = !!enable;</div><div class='del'>-	cmd.usesnr = !!usesnr;</div><div class='del'>-	cmd.P0 = p0;</div><div class='del'>-	cmd.P1 = p1;</div><div class='del'>-	cmd.P2 = p2;</div><div class='del'>-</div><div class='del'>-	ret = lbs_cmd_with_response(priv, CMD_802_11_TPC_CFG, &amp;cmd);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * lbs_set_power_adapt_cfg - Configures the power adaptation settings</div><div class='del'>- *</div><div class='del'>- * @priv:	A pointer to &amp;struct lbs_private structure</div><div class='del'>- * @enable:	Power adaptation enable</div><div class='del'>- * @p0:		Power level for 1, 2, 5.5 and 11 Mbps (dBm).</div><div class='del'>- * @p1:		Power level for 6, 9, 12, 18, 22, 24 and 36 Mbps (dBm).</div><div class='del'>- * @p2:		Power level for 48 and 54 Mbps (dBm).</div><div class='del'>- *</div><div class='del'>- * returns:	0 on Success</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int lbs_set_power_adapt_cfg(struct lbs_private *priv, int enable, int8_t p0,</div><div class='del'>-		int8_t p1, int8_t p2)</div><div class='del'>-{</div><div class='del'>-	struct cmd_ds_802_11_pa_cfg cmd;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-	cmd.hdr.size = cpu_to_le16(sizeof(cmd));</div><div class='del'>-	cmd.action = cpu_to_le16(CMD_ACT_SET);</div><div class='del'>-	cmd.enable = !!enable;</div><div class='del'>-	cmd.P0 = p0;</div><div class='del'>-	cmd.P1 = p1;</div><div class='del'>-	cmd.P2 = p2;</div><div class='del'>-</div><div class='del'>-	ret = lbs_cmd_with_response(priv, CMD_802_11_PA_CFG , &amp;cmd);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> struct cmd_ctrl_node *__lbs_cmd_async(struct lbs_private *priv,</div><div class='ctx'> 	uint16_t command, struct cmd_header *in_cmd, int in_cmd_size,</div><div class='ctx'> 	int (*callback)(struct lbs_private *, unsigned long, struct cmd_header *),</div><div class='hunk'>@@ -1512,12 +1387,10 @@ struct cmd_ctrl_node *__lbs_cmd_async(struct lbs_private *priv,</div><div class='ctx'> 	/* No commands are allowed in Deep Sleep until we toggle the GPIO</div><div class='ctx'> 	 * to wake up the card and it has signaled that it's ready.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!priv-&gt;is_auto_deep_sleep_enabled) {</div><div class='del'>-		if (priv-&gt;is_deep_sleep) {</div><div class='del'>-			lbs_deb_cmd("command not allowed in deep sleep\n");</div><div class='del'>-			cmdnode = ERR_PTR(-EBUSY);</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='add'>+	if (priv-&gt;is_deep_sleep) {</div><div class='add'>+		lbs_deb_cmd("command not allowed in deep sleep\n");</div><div class='add'>+		cmdnode = ERR_PTR(-EBUSY);</div><div class='add'>+		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cmdnode = lbs_get_free_cmd_node(priv);</div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas/cmd.h b/drivers/net/wireless/marvell/libertas/cmd.h<br/>index 3c193074662b..a95c2651e67f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/cmd.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/cmd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/cmd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas/cmd.h</a></div><div class='hunk'>@@ -105,24 +105,9 @@ int lbs_get_tx_power(struct lbs_private *priv, s16 *curlevel, s16 *minlevel,</div><div class='ctx'> </div><div class='ctx'> int lbs_set_snmp_mib(struct lbs_private *priv, u32 oid, u16 val);</div><div class='ctx'> </div><div class='del'>-int lbs_get_snmp_mib(struct lbs_private *priv, u32 oid, u16 *out_val);</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /* Commands only used in wext.c, assoc. and scan.c */</div><div class='ctx'> </div><div class='del'>-int lbs_set_power_adapt_cfg(struct lbs_private *priv, int enable, int8_t p0,</div><div class='del'>-		int8_t p1, int8_t p2);</div><div class='del'>-</div><div class='del'>-int lbs_set_tpc_cfg(struct lbs_private *priv, int enable, int8_t p0, int8_t p1,</div><div class='del'>-		int8_t p2, int usesnr);</div><div class='del'>-</div><div class='del'>-int lbs_set_data_rate(struct lbs_private *priv, u8 rate);</div><div class='del'>-</div><div class='del'>-int lbs_cmd_802_11_rate_adapt_rateset(struct lbs_private *priv,</div><div class='del'>-				      uint16_t cmd_action);</div><div class='del'>-</div><div class='del'>-int lbs_set_tx_power(struct lbs_private *priv, s16 dbm);</div><div class='del'>-</div><div class='ctx'> int lbs_set_deep_sleep(struct lbs_private *priv, int deep_sleep);</div><div class='ctx'> </div><div class='ctx'> int lbs_set_host_sleep(struct lbs_private *priv, int host_sleep);</div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas/cmdresp.c b/drivers/net/wireless/marvell/libertas/cmdresp.c<br/>index cb515c5584c1..9742d3dba31c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/cmdresp.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/cmdresp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/cmdresp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas/cmdresp.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;net/cfg80211.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "cfg.h"</div><div class='hunk'>@@ -48,7 +48,7 @@ void lbs_mac_event_disconnected(struct lbs_private *priv,</div><div class='ctx'> </div><div class='ctx'> 	/* Free Tx and Rx packets */</div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='del'>-	kfree_skb(priv-&gt;currenttxskb);</div><div class='add'>+	dev_kfree_skb_irq(priv-&gt;currenttxskb);</div><div class='ctx'> 	priv-&gt;currenttxskb = NULL;</div><div class='ctx'> 	priv-&gt;tx_pending_len = 0;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='hunk'>@@ -119,7 +119,7 @@ int lbs_process_command_response(struct lbs_private *priv, u8 *data, u32 len)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Now we got response from FW, cancel the command timer */</div><div class='del'>-	del_timer(&amp;priv-&gt;command_timer);</div><div class='add'>+	timer_delete(&amp;priv-&gt;command_timer);</div><div class='ctx'> 	priv-&gt;cmd_timed_out = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (respcmd == CMD_RET(CMD_802_11_PS_MODE)) {</div><div class='hunk'>@@ -279,7 +279,6 @@ void lbs_process_event(struct lbs_private *priv, u32 event)</div><div class='ctx'> 			priv-&gt;reset_deep_sleep_wakeup(priv);</div><div class='ctx'> 		lbs_deb_cmd("EVENT: ds awake\n");</div><div class='ctx'> 		priv-&gt;is_deep_sleep = 0;</div><div class='del'>-		priv-&gt;wakeup_dev_required = 0;</div><div class='ctx'> 		wake_up_interruptible(&amp;priv-&gt;ds_awake_q);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas/decl.h b/drivers/net/wireless/marvell/libertas/decl.h<br/>index c1e0388ef01d..ea69007a2958 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/decl.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/decl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/decl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas/decl.h</a></div><div class='hunk'>@@ -64,11 +64,7 @@ int lbs_resume(struct lbs_private *priv);</div><div class='ctx'> void lbs_queue_event(struct lbs_private *priv, u32 event);</div><div class='ctx'> void lbs_notify_command_response(struct lbs_private *priv, u8 resp_idx);</div><div class='ctx'> </div><div class='del'>-int lbs_enter_auto_deep_sleep(struct lbs_private *priv);</div><div class='del'>-int lbs_exit_auto_deep_sleep(struct lbs_private *priv);</div><div class='del'>-</div><div class='ctx'> u32 lbs_fw_index_to_data_rate(u8 index);</div><div class='del'>-u8 lbs_data_rate_to_fw_index(u32 rate);</div><div class='ctx'> </div><div class='ctx'> int lbs_get_firmware(struct device *dev, u32 card_model,</div><div class='ctx'> 			const struct lbs_fw_table *fw_table,</div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas/dev.h b/drivers/net/wireless/marvell/libertas/dev.h<br/>index 4b6e05a8e5d5..c4708ce4eb83 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/dev.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/dev.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/dev.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas/dev.h</a></div><div class='hunk'>@@ -83,12 +83,8 @@ struct lbs_private {</div><div class='ctx'> 	/* Deep sleep */</div><div class='ctx'> 	int is_deep_sleep;</div><div class='ctx'> 	int deep_sleep_required;</div><div class='del'>-	int is_auto_deep_sleep_enabled;</div><div class='del'>-	int wakeup_dev_required;</div><div class='ctx'> 	int is_activity_detected;</div><div class='del'>-	int auto_deep_sleep_timeout; /* in ms */</div><div class='ctx'> 	wait_queue_head_t ds_awake_q;</div><div class='del'>-	struct timer_list auto_deepsleep_timer;</div><div class='ctx'> </div><div class='ctx'> 	/* Host sleep*/</div><div class='ctx'> 	int is_host_sleep_configured;</div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas/ethtool.c b/drivers/net/wireless/marvell/libertas/ethtool.c<br/>index 1bb8746a0b23..9f53308a9935 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/ethtool.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas/ethtool.c</a></div><div class='hunk'>@@ -20,8 +20,8 @@ static void lbs_ethtool_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 		priv-&gt;fwrelease &gt;&gt; 16 &amp; 0xff,</div><div class='ctx'> 		priv-&gt;fwrelease &gt;&gt;  8 &amp; 0xff,</div><div class='ctx'> 		priv-&gt;fwrelease       &amp; 0xff);</div><div class='del'>-	strlcpy(info-&gt;driver, "libertas", sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, lbs_driver_version, sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;driver, "libertas", sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;version, lbs_driver_version, sizeof(info-&gt;version));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -43,10 +43,8 @@ static int lbs_ethtool_get_eeprom(struct net_device *dev,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (eeprom-&gt;offset + eeprom-&gt;len &gt; LBS_EEPROM_LEN ||</div><div class='del'>-	    eeprom-&gt;len &gt; LBS_EEPROM_READ_LEN) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	    eeprom-&gt;len &gt; LBS_EEPROM_READ_LEN)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	cmd.hdr.size = cpu_to_le16(sizeof(struct cmd_ds_802_11_eeprom_access) -</div><div class='ctx'> 		LBS_EEPROM_READ_LEN + eeprom-&gt;len);</div><div class='hunk'>@@ -57,8 +55,7 @@ static int lbs_ethtool_get_eeprom(struct net_device *dev,</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		memcpy(bytes, cmd.value, eeprom-&gt;len);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-        return ret;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void lbs_ethtool_get_wol(struct net_device *dev,</div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas/host.h b/drivers/net/wireless/marvell/libertas/host.h<br/>index dfa22468b14a..a202b716ad5d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/host.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/host.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/host.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas/host.h</a></div><div class='hunk'>@@ -308,10 +308,12 @@ struct txpd {</div><div class='ctx'> 	__le32 tx_packet_location;</div><div class='ctx'> 	/* Tx packet length */</div><div class='ctx'> 	__le16 tx_packet_length;</div><div class='del'>-	/* First 2 byte of destination MAC address */</div><div class='del'>-	u8 tx_dest_addr_high[2];</div><div class='del'>-	/* Last 4 byte of destination MAC address */</div><div class='del'>-	u8 tx_dest_addr_low[4];</div><div class='add'>+	struct_group_attr(tx_dest_addr, __packed,</div><div class='add'>+		/* First 2 byte of destination MAC address */</div><div class='add'>+		u8 tx_dest_addr_high[2];</div><div class='add'>+		/* Last 4 byte of destination MAC address */</div><div class='add'>+		u8 tx_dest_addr_low[4];</div><div class='add'>+	);</div><div class='ctx'> 	/* Pkt Priority */</div><div class='ctx'> 	u8 priority;</div><div class='ctx'> 	/* Pkt Trasnit Power control */</div><div class='hunk'>@@ -526,7 +528,8 @@ struct cmd_ds_802_11_associate {</div><div class='ctx'> 	__le16 listeninterval;</div><div class='ctx'> 	__le16 bcnperiod;</div><div class='ctx'> 	u8 dtimperiod;</div><div class='del'>-	u8 iebuf[512];    /* Enough for required and most optional IEs */</div><div class='add'>+	/* 512 permitted - enough for required and most optional IEs */</div><div class='add'>+	u8 iebuf[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct cmd_ds_802_11_associate_response {</div><div class='hunk'>@@ -535,7 +538,8 @@ struct cmd_ds_802_11_associate_response {</div><div class='ctx'> 	__le16 capability;</div><div class='ctx'> 	__le16 statuscode;</div><div class='ctx'> 	__le16 aid;</div><div class='del'>-	u8 iebuf[512];</div><div class='add'>+	/* max 512 */</div><div class='add'>+	u8 iebuf[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct cmd_ds_802_11_set_wep {</div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas/if_cs.c b/drivers/net/wireless/marvell/libertas/if_cs.c<br/>deleted file mode 100644<br/>index 4103f15bca6b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/if_cs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/if_cs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,957 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>-</div><div class='del'>-  Driver for the Marvell 8385 based compact flash WLAN cards.</div><div class='del'>-</div><div class='del'>-  (C) 2007 by Holger Schurig &lt;hs4233@mail.mn-solutions.de&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/firmware.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;pcmcia/cistpl.h&gt;</div><div class='del'>-#include &lt;pcmcia/ds.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-</div><div class='del'>-#define DRV_NAME "libertas_cs"</div><div class='del'>-</div><div class='del'>-#include "decl.h"</div><div class='del'>-#include "defs.h"</div><div class='del'>-#include "dev.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Module stuff                                                     */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Holger Schurig &lt;hs4233@mail.mn-solutions.de&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Driver for Marvell 83xx compact flash WLAN cards");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Data structures                                                  */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-struct if_cs_card {</div><div class='del'>-	struct pcmcia_device *p_dev;</div><div class='del'>-	struct lbs_private *priv;</div><div class='del'>-	void __iomem *iobase;</div><div class='del'>-	bool align_regs;</div><div class='del'>-	u32 model;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	MODEL_UNKNOWN = 0x00,</div><div class='del'>-	MODEL_8305 = 0x01,</div><div class='del'>-	MODEL_8381 = 0x02,</div><div class='del'>-	MODEL_8385 = 0x03</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct lbs_fw_table fw_table[] = {</div><div class='del'>-	{ MODEL_8305, "libertas/cf8305.bin", NULL },</div><div class='del'>-	{ MODEL_8305, "libertas_cs_helper.fw", NULL },</div><div class='del'>-	{ MODEL_8381, "libertas/cf8381_helper.bin", "libertas/cf8381.bin" },</div><div class='del'>-	{ MODEL_8381, "libertas_cs_helper.fw", "libertas_cs.fw" },</div><div class='del'>-	{ MODEL_8385, "libertas/cf8385_helper.bin", "libertas/cf8385.bin" },</div><div class='del'>-	{ MODEL_8385, "libertas_cs_helper.fw", "libertas_cs.fw" },</div><div class='del'>-	{ 0, NULL, NULL }</div><div class='del'>-};</div><div class='del'>-MODULE_FIRMWARE("libertas/cf8305.bin");</div><div class='del'>-MODULE_FIRMWARE("libertas/cf8381_helper.bin");</div><div class='del'>-MODULE_FIRMWARE("libertas/cf8381.bin");</div><div class='del'>-MODULE_FIRMWARE("libertas/cf8385_helper.bin");</div><div class='del'>-MODULE_FIRMWARE("libertas/cf8385.bin");</div><div class='del'>-MODULE_FIRMWARE("libertas_cs_helper.fw");</div><div class='del'>-MODULE_FIRMWARE("libertas_cs.fw");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Hardware access                                                  */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-/* This define enables wrapper functions which allow you</div><div class='del'>-   to dump all register accesses. You normally won't this,</div><div class='del'>-   except for development */</div><div class='del'>-/* #define DEBUG_IO */</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG_IO</div><div class='del'>-static int debug_output = 0;</div><div class='del'>-#else</div><div class='del'>-/* This way the compiler optimizes the printk's away */</div><div class='del'>-#define debug_output 0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline unsigned int if_cs_read8(struct if_cs_card *card, uint reg)</div><div class='del'>-{</div><div class='del'>-	unsigned int val = ioread8(card-&gt;iobase + reg);</div><div class='del'>-	if (debug_output)</div><div class='del'>-		printk(KERN_INFO "inb %08x&lt;%02x\n", reg, val);</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-static inline unsigned int if_cs_read16(struct if_cs_card *card, uint reg)</div><div class='del'>-{</div><div class='del'>-	unsigned int val = ioread16(card-&gt;iobase + reg);</div><div class='del'>-	if (debug_output)</div><div class='del'>-		printk(KERN_INFO "inw %08x&lt;%04x\n", reg, val);</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-static inline void if_cs_read16_rep(</div><div class='del'>-	struct if_cs_card *card,</div><div class='del'>-	uint reg,</div><div class='del'>-	void *buf,</div><div class='del'>-	unsigned long count)</div><div class='del'>-{</div><div class='del'>-	if (debug_output)</div><div class='del'>-		printk(KERN_INFO "insw %08x&lt;(0x%lx words)\n",</div><div class='del'>-			reg, count);</div><div class='del'>-	ioread16_rep(card-&gt;iobase + reg, buf, count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void if_cs_write8(struct if_cs_card *card, uint reg, u8 val)</div><div class='del'>-{</div><div class='del'>-	if (debug_output)</div><div class='del'>-		printk(KERN_INFO "outb %08x&gt;%02x\n", reg, val);</div><div class='del'>-	iowrite8(val, card-&gt;iobase + reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void if_cs_write16(struct if_cs_card *card, uint reg, u16 val)</div><div class='del'>-{</div><div class='del'>-	if (debug_output)</div><div class='del'>-		printk(KERN_INFO "outw %08x&gt;%04x\n", reg, val);</div><div class='del'>-	iowrite16(val, card-&gt;iobase + reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void if_cs_write16_rep(</div><div class='del'>-	struct if_cs_card *card,</div><div class='del'>-	uint reg,</div><div class='del'>-	const void *buf,</div><div class='del'>-	unsigned long count)</div><div class='del'>-{</div><div class='del'>-	if (debug_output)</div><div class='del'>-		printk(KERN_INFO "outsw %08x&gt;(0x%lx words)\n",</div><div class='del'>-			reg, count);</div><div class='del'>-	iowrite16_rep(card-&gt;iobase + reg, buf, count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * I know that polling/delaying is frowned upon. However, this procedure</div><div class='del'>- * with polling is needed while downloading the firmware. At this stage,</div><div class='del'>- * the hardware does unfortunately not create any interrupts.</div><div class='del'>- *</div><div class='del'>- * Fortunately, this function is never used once the firmware is in</div><div class='del'>- * the card. :-)</div><div class='del'>- *</div><div class='del'>- * As a reference, see the "Firmware Specification v5.1", page 18</div><div class='del'>- * and 19. I did not follow their suggested timing to the word,</div><div class='del'>- * but this works nice &amp; fast anyway.</div><div class='del'>- */</div><div class='del'>-static int if_cs_poll_while_fw_download(struct if_cs_card *card, uint addr, u8 reg)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 100000; i++) {</div><div class='del'>-		u8 val = if_cs_read8(card, addr);</div><div class='del'>-		if (val == reg)</div><div class='del'>-			return 0;</div><div class='del'>-		udelay(5);</div><div class='del'>-	}</div><div class='del'>-	return -ETIME;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * First the bitmasks for the host/card interrupt/status registers:</div><div class='del'>- */</div><div class='del'>-#define IF_CS_BIT_TX			0x0001</div><div class='del'>-#define IF_CS_BIT_RX			0x0002</div><div class='del'>-#define IF_CS_BIT_COMMAND		0x0004</div><div class='del'>-#define IF_CS_BIT_RESP			0x0008</div><div class='del'>-#define IF_CS_BIT_EVENT			0x0010</div><div class='del'>-#define	IF_CS_BIT_MASK			0x001f</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * It's not really clear to me what the host status register is for. It</div><div class='del'>- * needs to be set almost in union with "host int cause". The following</div><div class='del'>- * bits from above are used:</div><div class='del'>- *</div><div class='del'>- *   IF_CS_BIT_TX         driver downloaded a data packet</div><div class='del'>- *   IF_CS_BIT_RX         driver got a data packet</div><div class='del'>- *   IF_CS_BIT_COMMAND    driver downloaded a command</div><div class='del'>- *   IF_CS_BIT_RESP       not used (has some meaning with powerdown)</div><div class='del'>- *   IF_CS_BIT_EVENT      driver read a host event</div><div class='del'>- */</div><div class='del'>-#define IF_CS_HOST_STATUS		0x00000000</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * With the host int cause register can the host (that is, Linux) cause</div><div class='del'>- * an interrupt in the firmware, to tell the firmware about those events:</div><div class='del'>- *</div><div class='del'>- *   IF_CS_BIT_TX         a data packet has been downloaded</div><div class='del'>- *   IF_CS_BIT_RX         a received data packet has retrieved</div><div class='del'>- *   IF_CS_BIT_COMMAND    a firmware block or a command has been downloaded</div><div class='del'>- *   IF_CS_BIT_RESP       not used (has some meaning with powerdown)</div><div class='del'>- *   IF_CS_BIT_EVENT      a host event (link lost etc) has been retrieved</div><div class='del'>- */</div><div class='del'>-#define IF_CS_HOST_INT_CAUSE		0x00000002</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The host int mask register is used to enable/disable interrupt.  However,</div><div class='del'>- * I have the suspicion that disabled interrupts are lost.</div><div class='del'>- */</div><div class='del'>-#define IF_CS_HOST_INT_MASK		0x00000004</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Used to send or receive data packets:</div><div class='del'>- */</div><div class='del'>-#define IF_CS_WRITE			0x00000016</div><div class='del'>-#define IF_CS_WRITE_LEN			0x00000014</div><div class='del'>-#define IF_CS_READ			0x00000010</div><div class='del'>-#define IF_CS_READ_LEN			0x00000024</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Used to send commands (and to send firmware block) and to</div><div class='del'>- * receive command responses:</div><div class='del'>- */</div><div class='del'>-#define IF_CS_CMD			0x0000001A</div><div class='del'>-#define IF_CS_CMD_LEN			0x00000018</div><div class='del'>-#define IF_CS_RESP			0x00000012</div><div class='del'>-#define IF_CS_RESP_LEN			0x00000030</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The card status registers shows what the card/firmware actually</div><div class='del'>- * accepts:</div><div class='del'>- *</div><div class='del'>- *   IF_CS_BIT_TX        you may send a data packet</div><div class='del'>- *   IF_CS_BIT_RX        you may retrieve a data packet</div><div class='del'>- *   IF_CS_BIT_COMMAND   you may send a command</div><div class='del'>- *   IF_CS_BIT_RESP      you may retrieve a command response</div><div class='del'>- *   IF_CS_BIT_EVENT     the card has a event for use (link lost, snr low etc)</div><div class='del'>- *</div><div class='del'>- * When reading this register several times, you will get back the same</div><div class='del'>- * results --- with one exception: the IF_CS_BIT_EVENT clear itself</div><div class='del'>- * automatically.</div><div class='del'>- *</div><div class='del'>- * Not that we don't rely on BIT_RX,_BIT_RESP or BIT_EVENT because</div><div class='del'>- * we handle this via the card int cause register.</div><div class='del'>- */</div><div class='del'>-#define IF_CS_CARD_STATUS		0x00000020</div><div class='del'>-#define IF_CS_CARD_STATUS_MASK		0x7f00</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The card int cause register is used by the card/firmware to notify us</div><div class='del'>- * about the following events:</div><div class='del'>- *</div><div class='del'>- *   IF_CS_BIT_TX        a data packet has successfully been sentx</div><div class='del'>- *   IF_CS_BIT_RX        a data packet has been received and can be retrieved</div><div class='del'>- *   IF_CS_BIT_COMMAND   not used</div><div class='del'>- *   IF_CS_BIT_RESP      the firmware has a command response for us</div><div class='del'>- *   IF_CS_BIT_EVENT     the card has a event for use (link lost, snr low etc)</div><div class='del'>- */</div><div class='del'>-#define IF_CS_CARD_INT_CAUSE		0x00000022</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is used to for handshaking with the card's bootloader/helper image</div><div class='del'>- * to synchronize downloading of firmware blocks.</div><div class='del'>- */</div><div class='del'>-#define IF_CS_SQ_READ_LOW		0x00000028</div><div class='del'>-#define IF_CS_SQ_HELPER_OK		0x10</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The scratch register tells us ...</div><div class='del'>- *</div><div class='del'>- * IF_CS_SCRATCH_BOOT_OK     the bootloader runs</div><div class='del'>- * IF_CS_SCRATCH_HELPER_OK   the helper firmware already runs</div><div class='del'>- */</div><div class='del'>-#define IF_CS_SCRATCH			0x0000003F</div><div class='del'>-#define IF_CS_SCRATCH_BOOT_OK		0x00</div><div class='del'>-#define IF_CS_SCRATCH_HELPER_OK		0x5a</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Used to detect ancient chips:</div><div class='del'>- */</div><div class='del'>-#define IF_CS_PRODUCT_ID		0x0000001C</div><div class='del'>-#define IF_CS_CF8385_B1_REV		0x12</div><div class='del'>-#define IF_CS_CF8381_B3_REV		0x04</div><div class='del'>-#define IF_CS_CF8305_B1_REV		0x03</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Used to detect other cards than CF8385 since their revisions of silicon</div><div class='del'>- * doesn't match those from CF8385, eg. CF8381 B3 works with this driver.</div><div class='del'>- */</div><div class='del'>-#define CF8305_MANFID		0x02db</div><div class='del'>-#define CF8305_CARDID		0x8103</div><div class='del'>-#define CF8381_MANFID		0x02db</div><div class='del'>-#define CF8381_CARDID		0x6064</div><div class='del'>-#define CF8385_MANFID		0x02df</div><div class='del'>-#define CF8385_CARDID		0x8103</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * FIXME: just use the 'driver_info' field of 'struct pcmcia_device_id' when</div><div class='del'>- * that gets fixed.  Currently there's no way to access it from the probe hook.</div><div class='del'>- */</div><div class='del'>-static inline u32 get_model(u16 manf_id, u16 card_id)</div><div class='del'>-{</div><div class='del'>-	/* NOTE: keep in sync with if_cs_ids */</div><div class='del'>-	if (manf_id == CF8305_MANFID &amp;&amp; card_id == CF8305_CARDID)</div><div class='del'>-		return MODEL_8305;</div><div class='del'>-	else if (manf_id == CF8381_MANFID &amp;&amp; card_id == CF8381_CARDID)</div><div class='del'>-		return MODEL_8381;</div><div class='del'>-	else if (manf_id == CF8385_MANFID &amp;&amp; card_id == CF8385_CARDID)</div><div class='del'>-		return MODEL_8385;</div><div class='del'>-	return MODEL_UNKNOWN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* I/O and interrupt handling                                       */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-static inline void if_cs_enable_ints(struct if_cs_card *card)</div><div class='del'>-{</div><div class='del'>-	if_cs_write16(card, IF_CS_HOST_INT_MASK, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void if_cs_disable_ints(struct if_cs_card *card)</div><div class='del'>-{</div><div class='del'>-	if_cs_write16(card, IF_CS_HOST_INT_MASK, IF_CS_BIT_MASK);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Called from if_cs_host_to_card to send a command to the hardware</div><div class='del'>- */</div><div class='del'>-static int if_cs_send_cmd(struct lbs_private *priv, u8 *buf, u16 nb)</div><div class='del'>-{</div><div class='del'>-	struct if_cs_card *card = (struct if_cs_card *)priv-&gt;card;</div><div class='del'>-	int ret = -1;</div><div class='del'>-	int loops = 0;</div><div class='del'>-</div><div class='del'>-	if_cs_disable_ints(card);</div><div class='del'>-</div><div class='del'>-	/* Is hardware ready? */</div><div class='del'>-	while (1) {</div><div class='del'>-		u16 status = if_cs_read16(card, IF_CS_CARD_STATUS);</div><div class='del'>-		if (status &amp; IF_CS_BIT_COMMAND)</div><div class='del'>-			break;</div><div class='del'>-		if (++loops &gt; 100) {</div><div class='del'>-			netdev_err(priv-&gt;dev, "card not ready for commands\n");</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-		mdelay(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if_cs_write16(card, IF_CS_CMD_LEN, nb);</div><div class='del'>-</div><div class='del'>-	if_cs_write16_rep(card, IF_CS_CMD, buf, nb / 2);</div><div class='del'>-	/* Are we supposed to transfer an odd amount of bytes? */</div><div class='del'>-	if (nb &amp; 1)</div><div class='del'>-		if_cs_write8(card, IF_CS_CMD, buf[nb-1]);</div><div class='del'>-</div><div class='del'>-	/* "Assert the download over interrupt command in the Host</div><div class='del'>-	 * status register" */</div><div class='del'>-	if_cs_write16(card, IF_CS_HOST_STATUS, IF_CS_BIT_COMMAND);</div><div class='del'>-</div><div class='del'>-	/* "Assert the download over interrupt command in the Card</div><div class='del'>-	 * interrupt case register" */</div><div class='del'>-	if_cs_write16(card, IF_CS_HOST_INT_CAUSE, IF_CS_BIT_COMMAND);</div><div class='del'>-	ret = 0;</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	if_cs_enable_ints(card);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Called from if_cs_host_to_card to send a data to the hardware</div><div class='del'>- */</div><div class='del'>-static void if_cs_send_data(struct lbs_private *priv, u8 *buf, u16 nb)</div><div class='del'>-{</div><div class='del'>-	struct if_cs_card *card = (struct if_cs_card *)priv-&gt;card;</div><div class='del'>-	u16 status;</div><div class='del'>-</div><div class='del'>-	if_cs_disable_ints(card);</div><div class='del'>-</div><div class='del'>-	status = if_cs_read16(card, IF_CS_CARD_STATUS);</div><div class='del'>-	BUG_ON((status &amp; IF_CS_BIT_TX) == 0);</div><div class='del'>-</div><div class='del'>-	if_cs_write16(card, IF_CS_WRITE_LEN, nb);</div><div class='del'>-</div><div class='del'>-	/* write even number of bytes, then odd byte if necessary */</div><div class='del'>-	if_cs_write16_rep(card, IF_CS_WRITE, buf, nb / 2);</div><div class='del'>-	if (nb &amp; 1)</div><div class='del'>-		if_cs_write8(card, IF_CS_WRITE, buf[nb-1]);</div><div class='del'>-</div><div class='del'>-	if_cs_write16(card, IF_CS_HOST_STATUS, IF_CS_BIT_TX);</div><div class='del'>-	if_cs_write16(card, IF_CS_HOST_INT_CAUSE, IF_CS_BIT_TX);</div><div class='del'>-	if_cs_enable_ints(card);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get the command result out of the card.</div><div class='del'>- */</div><div class='del'>-static int if_cs_receive_cmdres(struct lbs_private *priv, u8 *data, u32 *len)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ret = -1;</div><div class='del'>-	u16 status;</div><div class='del'>-</div><div class='del'>-	/* is hardware ready? */</div><div class='del'>-	status = if_cs_read16(priv-&gt;card, IF_CS_CARD_STATUS);</div><div class='del'>-	if ((status &amp; IF_CS_BIT_RESP) == 0) {</div><div class='del'>-		netdev_err(priv-&gt;dev, "no cmd response in card\n");</div><div class='del'>-		*len = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*len = if_cs_read16(priv-&gt;card, IF_CS_RESP_LEN);</div><div class='del'>-	if ((*len == 0) || (*len &gt; LBS_CMD_BUFFER_SIZE)) {</div><div class='del'>-		netdev_err(priv-&gt;dev,</div><div class='del'>-			   "card cmd buffer has invalid # of bytes (%d)\n",</div><div class='del'>-			   *len);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* read even number of bytes, then odd byte if necessary */</div><div class='del'>-	if_cs_read16_rep(priv-&gt;card, IF_CS_RESP, data, *len/sizeof(u16));</div><div class='del'>-	if (*len &amp; 1)</div><div class='del'>-		data[*len-1] = if_cs_read8(priv-&gt;card, IF_CS_RESP);</div><div class='del'>-</div><div class='del'>-	/* This is a workaround for a firmware that reports too much</div><div class='del'>-	 * bytes */</div><div class='del'>-	*len -= 8;</div><div class='del'>-	ret = 0;</div><div class='del'>-</div><div class='del'>-	/* Clear this flag again */</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='del'>-	priv-&gt;dnld_sent = DNLD_RES_RECEIVED;</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sk_buff *if_cs_receive_data(struct lbs_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-	u16 len;</div><div class='del'>-	u8 *data;</div><div class='del'>-</div><div class='del'>-	len = if_cs_read16(priv-&gt;card, IF_CS_READ_LEN);</div><div class='del'>-	if (len == 0 || len &gt; MRVDRV_ETH_RX_PACKET_BUFFER_SIZE) {</div><div class='del'>-		netdev_err(priv-&gt;dev,</div><div class='del'>-			   "card data buffer has invalid # of bytes (%d)\n",</div><div class='del'>-			   len);</div><div class='del'>-		priv-&gt;dev-&gt;stats.rx_dropped++;</div><div class='del'>-		goto dat_err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb = dev_alloc_skb(MRVDRV_ETH_RX_PACKET_BUFFER_SIZE + 2);</div><div class='del'>-	if (!skb)</div><div class='del'>-		goto out;</div><div class='del'>-	skb_put(skb, len);</div><div class='del'>-	skb_reserve(skb, 2);/* 16 byte align */</div><div class='del'>-	data = skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	/* read even number of bytes, then odd byte if necessary */</div><div class='del'>-	if_cs_read16_rep(priv-&gt;card, IF_CS_READ, data, len/sizeof(u16));</div><div class='del'>-	if (len &amp; 1)</div><div class='del'>-		data[len-1] = if_cs_read8(priv-&gt;card, IF_CS_READ);</div><div class='del'>-</div><div class='del'>-dat_err:</div><div class='del'>-	if_cs_write16(priv-&gt;card, IF_CS_HOST_STATUS, IF_CS_BIT_RX);</div><div class='del'>-	if_cs_write16(priv-&gt;card, IF_CS_HOST_INT_CAUSE, IF_CS_BIT_RX);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t if_cs_interrupt(int irq, void *data)</div><div class='del'>-{</div><div class='del'>-	struct if_cs_card *card = data;</div><div class='del'>-	struct lbs_private *priv = card-&gt;priv;</div><div class='del'>-	u16 cause;</div><div class='del'>-</div><div class='del'>-	/* Ask card interrupt cause register if there is something for us */</div><div class='del'>-	cause = if_cs_read16(card, IF_CS_CARD_INT_CAUSE);</div><div class='del'>-	lbs_deb_cs("cause 0x%04x\n", cause);</div><div class='del'>-</div><div class='del'>-	if (cause == 0) {</div><div class='del'>-		/* Not for us */</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cause == 0xffff) {</div><div class='del'>-		/* Read in junk, the card has probably been removed */</div><div class='del'>-		card-&gt;priv-&gt;surpriseremoved = 1;</div><div class='del'>-		return IRQ_HANDLED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cause &amp; IF_CS_BIT_RX) {</div><div class='del'>-		struct sk_buff *skb;</div><div class='del'>-		lbs_deb_cs("rx packet\n");</div><div class='del'>-		skb = if_cs_receive_data(priv);</div><div class='del'>-		if (skb)</div><div class='del'>-			lbs_process_rxed_packet(priv, skb);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cause &amp; IF_CS_BIT_TX) {</div><div class='del'>-		lbs_deb_cs("tx done\n");</div><div class='del'>-		lbs_host_to_card_done(priv);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cause &amp; IF_CS_BIT_RESP) {</div><div class='del'>-		unsigned long flags;</div><div class='del'>-		u8 i;</div><div class='del'>-</div><div class='del'>-		lbs_deb_cs("cmd resp\n");</div><div class='del'>-		spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='del'>-		i = (priv-&gt;resp_idx == 0) ? 1 : 0;</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='del'>-</div><div class='del'>-		BUG_ON(priv-&gt;resp_len[i]);</div><div class='del'>-		if_cs_receive_cmdres(priv, priv-&gt;resp_buf[i],</div><div class='del'>-			&amp;priv-&gt;resp_len[i]);</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='del'>-		lbs_notify_command_response(priv, i);</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cause &amp; IF_CS_BIT_EVENT) {</div><div class='del'>-		u16 status = if_cs_read16(priv-&gt;card, IF_CS_CARD_STATUS);</div><div class='del'>-		if_cs_write16(priv-&gt;card, IF_CS_HOST_INT_CAUSE,</div><div class='del'>-			IF_CS_BIT_EVENT);</div><div class='del'>-		lbs_queue_event(priv, (status &amp; IF_CS_CARD_STATUS_MASK) &gt;&gt; 8);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Clear interrupt cause */</div><div class='del'>-	if_cs_write16(card, IF_CS_CARD_INT_CAUSE, cause &amp; IF_CS_BIT_MASK);</div><div class='del'>-</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Firmware                                                         */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Tries to program the helper firmware.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success</div><div class='del'>- */</div><div class='del'>-static int if_cs_prog_helper(struct if_cs_card *card, const struct firmware *fw)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int sent = 0;</div><div class='del'>-	u8  scratch;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This is the only place where an unaligned register access happens on</div><div class='del'>-	 * the CF8305 card, therefore for the sake of speed of the driver, we do</div><div class='del'>-	 * the alignment correction here.</div><div class='del'>-	 */</div><div class='del'>-	if (card-&gt;align_regs)</div><div class='del'>-		scratch = if_cs_read16(card, IF_CS_SCRATCH) &gt;&gt; 8;</div><div class='del'>-	else</div><div class='del'>-		scratch = if_cs_read8(card, IF_CS_SCRATCH);</div><div class='del'>-</div><div class='del'>-	/* "If the value is 0x5a, the firmware is already</div><div class='del'>-	 * downloaded successfully"</div><div class='del'>-	 */</div><div class='del'>-	if (scratch == IF_CS_SCRATCH_HELPER_OK)</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	/* "If the value is != 00, it is invalid value of register */</div><div class='del'>-	if (scratch != IF_CS_SCRATCH_BOOT_OK) {</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lbs_deb_cs("helper size %td\n", fw-&gt;size);</div><div class='del'>-</div><div class='del'>-	/* "Set the 5 bytes of the helper image to 0" */</div><div class='del'>-	/* Not needed, this contains an ARM branch instruction */</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-		/* "the number of bytes to send is 256" */</div><div class='del'>-		int count = 256;</div><div class='del'>-		int remain = fw-&gt;size - sent;</div><div class='del'>-</div><div class='del'>-		if (remain &lt; count)</div><div class='del'>-			count = remain;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * "write the number of bytes to be sent to the I/O Command</div><div class='del'>-		 * write length register"</div><div class='del'>-		 */</div><div class='del'>-		if_cs_write16(card, IF_CS_CMD_LEN, count);</div><div class='del'>-</div><div class='del'>-		/* "write this to I/O Command port register as 16 bit writes */</div><div class='del'>-		if (count)</div><div class='del'>-			if_cs_write16_rep(card, IF_CS_CMD,</div><div class='del'>-				&amp;fw-&gt;data[sent],</div><div class='del'>-				count &gt;&gt; 1);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * "Assert the download over interrupt command in the Host</div><div class='del'>-		 * status register"</div><div class='del'>-		 */</div><div class='del'>-		if_cs_write8(card, IF_CS_HOST_STATUS, IF_CS_BIT_COMMAND);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * "Assert the download over interrupt command in the Card</div><div class='del'>-		 * interrupt case register"</div><div class='del'>-		 */</div><div class='del'>-		if_cs_write16(card, IF_CS_HOST_INT_CAUSE, IF_CS_BIT_COMMAND);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * "The host polls the Card Status register ... for 50 ms before</div><div class='del'>-		 * declaring a failure"</div><div class='del'>-		 */</div><div class='del'>-		ret = if_cs_poll_while_fw_download(card, IF_CS_CARD_STATUS,</div><div class='del'>-			IF_CS_BIT_COMMAND);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			pr_err("can't download helper at 0x%x, ret %d\n",</div><div class='del'>-			       sent, ret);</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (count == 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		sent += count;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int if_cs_prog_real(struct if_cs_card *card, const struct firmware *fw)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int retry = 0;</div><div class='del'>-	int len = 0;</div><div class='del'>-	int sent;</div><div class='del'>-</div><div class='del'>-	lbs_deb_cs("fw size %td\n", fw-&gt;size);</div><div class='del'>-</div><div class='del'>-	ret = if_cs_poll_while_fw_download(card, IF_CS_SQ_READ_LOW,</div><div class='del'>-		IF_CS_SQ_HELPER_OK);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		pr_err("helper firmware doesn't answer\n");</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (sent = 0; sent &lt; fw-&gt;size; sent += len) {</div><div class='del'>-		len = if_cs_read16(card, IF_CS_SQ_READ_LOW);</div><div class='del'>-		if (len &amp; 1) {</div><div class='del'>-			retry++;</div><div class='del'>-			pr_info("odd, need to retry this firmware block\n");</div><div class='del'>-		} else {</div><div class='del'>-			retry = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (retry &gt; 20) {</div><div class='del'>-			pr_err("could not download firmware\n");</div><div class='del'>-			ret = -ENODEV;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-		if (retry) {</div><div class='del'>-			sent -= len;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		if_cs_write16(card, IF_CS_CMD_LEN, len);</div><div class='del'>-</div><div class='del'>-		if_cs_write16_rep(card, IF_CS_CMD,</div><div class='del'>-			&amp;fw-&gt;data[sent],</div><div class='del'>-			(len+1) &gt;&gt; 1);</div><div class='del'>-		if_cs_write8(card, IF_CS_HOST_STATUS, IF_CS_BIT_COMMAND);</div><div class='del'>-		if_cs_write16(card, IF_CS_HOST_INT_CAUSE, IF_CS_BIT_COMMAND);</div><div class='del'>-</div><div class='del'>-		ret = if_cs_poll_while_fw_download(card, IF_CS_CARD_STATUS,</div><div class='del'>-			IF_CS_BIT_COMMAND);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			pr_err("can't download firmware at 0x%x\n", sent);</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = if_cs_poll_while_fw_download(card, IF_CS_SCRATCH, 0x5a);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		pr_err("firmware download failed\n");</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void if_cs_prog_firmware(struct lbs_private *priv, int ret,</div><div class='del'>-				 const struct firmware *helper,</div><div class='del'>-				 const struct firmware *mainfw)</div><div class='del'>-{</div><div class='del'>-	struct if_cs_card *card = priv-&gt;card;</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_err("failed to find firmware (%d)\n", ret);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Load the firmware */</div><div class='del'>-	ret = if_cs_prog_helper(card, helper);</div><div class='del'>-	if (ret == 0 &amp;&amp; (card-&gt;model != MODEL_8305))</div><div class='del'>-		ret = if_cs_prog_real(card, mainfw);</div><div class='del'>-	if (ret)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Now actually get the IRQ */</div><div class='del'>-	ret = request_irq(card-&gt;p_dev-&gt;irq, if_cs_interrupt,</div><div class='del'>-		IRQF_SHARED, DRV_NAME, card);</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_err("error in request_irq\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Clear any interrupt cause that happened while sending</div><div class='del'>-	 * firmware/initializing card</div><div class='del'>-	 */</div><div class='del'>-	if_cs_write16(card, IF_CS_CARD_INT_CAUSE, IF_CS_BIT_MASK);</div><div class='del'>-	if_cs_enable_ints(card);</div><div class='del'>-</div><div class='del'>-	/* And finally bring the card up */</div><div class='del'>-	priv-&gt;fw_ready = 1;</div><div class='del'>-	if (lbs_start_card(priv) != 0) {</div><div class='del'>-		pr_err("could not activate card\n");</div><div class='del'>-		free_irq(card-&gt;p_dev-&gt;irq, card);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Callback functions for libertas.ko                               */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-/* Send commands or data packets to the card */</div><div class='del'>-static int if_cs_host_to_card(struct lbs_private *priv,</div><div class='del'>-	u8 type,</div><div class='del'>-	u8 *buf,</div><div class='del'>-	u16 nb)</div><div class='del'>-{</div><div class='del'>-	int ret = -1;</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case MVMS_DAT:</div><div class='del'>-		priv-&gt;dnld_sent = DNLD_DATA_SENT;</div><div class='del'>-		if_cs_send_data(priv, buf, nb);</div><div class='del'>-		ret = 0;</div><div class='del'>-		break;</div><div class='del'>-	case MVMS_CMD:</div><div class='del'>-		priv-&gt;dnld_sent = DNLD_CMD_SENT;</div><div class='del'>-		ret = if_cs_send_cmd(priv, buf, nb);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		netdev_err(priv-&gt;dev, "%s: unsupported type %d\n",</div><div class='del'>-			   __func__, type);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void if_cs_release(struct pcmcia_device *p_dev)</div><div class='del'>-{</div><div class='del'>-	struct if_cs_card *card = p_dev-&gt;priv;</div><div class='del'>-</div><div class='del'>-	free_irq(p_dev-&gt;irq, card);</div><div class='del'>-	pcmcia_disable_device(p_dev);</div><div class='del'>-	if (card-&gt;iobase)</div><div class='del'>-		ioport_unmap(card-&gt;iobase);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int if_cs_ioprobe(struct pcmcia_device *p_dev, void *priv_data)</div><div class='del'>-{</div><div class='del'>-	p_dev-&gt;resource[0]-&gt;flags &amp;= ~IO_DATA_PATH_WIDTH;</div><div class='del'>-	p_dev-&gt;resource[0]-&gt;flags |= IO_DATA_PATH_WIDTH_AUTO;</div><div class='del'>-</div><div class='del'>-	if (p_dev-&gt;resource[1]-&gt;end) {</div><div class='del'>-		pr_err("wrong CIS (check number of IO windows)\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* This reserves IO space but doesn't actually enable it */</div><div class='del'>-	return pcmcia_request_io(p_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int if_cs_probe(struct pcmcia_device *p_dev)</div><div class='del'>-{</div><div class='del'>-	int ret = -ENOMEM;</div><div class='del'>-	unsigned int prod_id;</div><div class='del'>-	struct lbs_private *priv;</div><div class='del'>-	struct if_cs_card *card;</div><div class='del'>-</div><div class='del'>-	card = kzalloc(sizeof(struct if_cs_card), GFP_KERNEL);</div><div class='del'>-	if (!card)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	card-&gt;p_dev = p_dev;</div><div class='del'>-	p_dev-&gt;priv = card;</div><div class='del'>-</div><div class='del'>-	p_dev-&gt;config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;</div><div class='del'>-</div><div class='del'>-	if (pcmcia_loop_config(p_dev, if_cs_ioprobe, NULL)) {</div><div class='del'>-		pr_err("error in pcmcia_loop_config\n");</div><div class='del'>-		goto out1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Allocate an interrupt line.  Note that this does not assign</div><div class='del'>-	 * a handler to the interrupt, unless the 'Handler' member of</div><div class='del'>-	 * the irq structure is initialized.</div><div class='del'>-	 */</div><div class='del'>-	if (!p_dev-&gt;irq)</div><div class='del'>-		goto out1;</div><div class='del'>-</div><div class='del'>-	/* Initialize io access */</div><div class='del'>-	card-&gt;iobase = ioport_map(p_dev-&gt;resource[0]-&gt;start,</div><div class='del'>-				resource_size(p_dev-&gt;resource[0]));</div><div class='del'>-	if (!card-&gt;iobase) {</div><div class='del'>-		pr_err("error in ioport_map\n");</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = pcmcia_enable_device(p_dev);</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_err("error in pcmcia_enable_device\n");</div><div class='del'>-		goto out2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Finally, report what we've done */</div><div class='del'>-	lbs_deb_cs("irq %d, io %pR", p_dev-&gt;irq, p_dev-&gt;resource[0]);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Most of the libertas cards can do unaligned register access, but some</div><div class='del'>-	 * weird ones cannot. That's especially true for the CF8305 card.</div><div class='del'>-	 */</div><div class='del'>-	card-&gt;align_regs = false;</div><div class='del'>-</div><div class='del'>-	card-&gt;model = get_model(p_dev-&gt;manf_id, p_dev-&gt;card_id);</div><div class='del'>-	if (card-&gt;model == MODEL_UNKNOWN) {</div><div class='del'>-		pr_err("unsupported manf_id 0x%04x / card_id 0x%04x\n",</div><div class='del'>-		       p_dev-&gt;manf_id, p_dev-&gt;card_id);</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto out2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check if we have a current silicon */</div><div class='del'>-	prod_id = if_cs_read8(card, IF_CS_PRODUCT_ID);</div><div class='del'>-	if (card-&gt;model == MODEL_8305) {</div><div class='del'>-		card-&gt;align_regs = true;</div><div class='del'>-		if (prod_id &lt; IF_CS_CF8305_B1_REV) {</div><div class='del'>-			pr_err("8305 rev B0 and older are not supported\n");</div><div class='del'>-			ret = -ENODEV;</div><div class='del'>-			goto out2;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((card-&gt;model == MODEL_8381) &amp;&amp; prod_id &lt; IF_CS_CF8381_B3_REV) {</div><div class='del'>-		pr_err("8381 rev B2 and older are not supported\n");</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto out2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((card-&gt;model == MODEL_8385) &amp;&amp; prod_id &lt; IF_CS_CF8385_B1_REV) {</div><div class='del'>-		pr_err("8385 rev B0 and older are not supported\n");</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto out2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Make this card known to the libertas driver */</div><div class='del'>-	priv = lbs_add_card(card, &amp;p_dev-&gt;dev);</div><div class='del'>-	if (IS_ERR(priv)) {</div><div class='del'>-		ret = PTR_ERR(priv);</div><div class='del'>-		goto out2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set up fields in lbs_private */</div><div class='del'>-	card-&gt;priv = priv;</div><div class='del'>-	priv-&gt;card = card;</div><div class='del'>-	priv-&gt;hw_host_to_card = if_cs_host_to_card;</div><div class='del'>-	priv-&gt;enter_deep_sleep = NULL;</div><div class='del'>-	priv-&gt;exit_deep_sleep = NULL;</div><div class='del'>-	priv-&gt;reset_deep_sleep_wakeup = NULL;</div><div class='del'>-</div><div class='del'>-	/* Get firmware */</div><div class='del'>-	ret = lbs_get_firmware_async(priv, &amp;p_dev-&gt;dev, card-&gt;model, fw_table,</div><div class='del'>-				     if_cs_prog_firmware);</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_err("failed to find firmware (%d)\n", ret);</div><div class='del'>-		goto out3;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	goto out;</div><div class='del'>-</div><div class='del'>-out3:</div><div class='del'>-	lbs_remove_card(priv);</div><div class='del'>-out2:</div><div class='del'>-	ioport_unmap(card-&gt;iobase);</div><div class='del'>-out1:</div><div class='del'>-	pcmcia_disable_device(p_dev);</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void if_cs_detach(struct pcmcia_device *p_dev)</div><div class='del'>-{</div><div class='del'>-	struct if_cs_card *card = p_dev-&gt;priv;</div><div class='del'>-</div><div class='del'>-	lbs_stop_card(card-&gt;priv);</div><div class='del'>-	lbs_remove_card(card-&gt;priv);</div><div class='del'>-	if_cs_disable_ints(card);</div><div class='del'>-	if_cs_release(p_dev);</div><div class='del'>-	kfree(card);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='del'>-/* Module initialization                                            */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-static const struct pcmcia_device_id if_cs_ids[] = {</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(CF8305_MANFID, CF8305_CARDID),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(CF8381_MANFID, CF8381_CARDID),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(CF8385_MANFID, CF8385_CARDID),</div><div class='del'>-	/* NOTE: keep in sync with get_model() */</div><div class='del'>-	PCMCIA_DEVICE_NULL,</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(pcmcia, if_cs_ids);</div><div class='del'>-</div><div class='del'>-static struct pcmcia_driver lbs_driver = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.name		= DRV_NAME,</div><div class='del'>-	.probe		= if_cs_probe,</div><div class='del'>-	.remove		= if_cs_detach,</div><div class='del'>-	.id_table       = if_cs_ids,</div><div class='del'>-};</div><div class='del'>-module_pcmcia_driver(lbs_driver);</div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas/if_sdio.c b/drivers/net/wireless/marvell/libertas/if_sdio.c<br/>index a63c5e622ee3..fc5318035822 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/if_sdio.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/if_sdio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/if_sdio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas/if_sdio.c</a></div><div class='hunk'>@@ -101,7 +101,7 @@ MODULE_FIRMWARE("sd8688_helper.bin");</div><div class='ctx'> MODULE_FIRMWARE("sd8688.bin");</div><div class='ctx'> </div><div class='ctx'> struct if_sdio_packet {</div><div class='del'>-	struct if_sdio_packet	*next;</div><div class='add'>+	struct list_head	list;</div><div class='ctx'> 	u16			nb;</div><div class='ctx'> 	u8			buffer[] __aligned(4);</div><div class='ctx'> };</div><div class='hunk'>@@ -119,10 +119,11 @@ struct if_sdio_card {</div><div class='ctx'> 	u8			buffer[65536] __attribute__((aligned(4)));</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t		lock;</div><div class='del'>-	struct if_sdio_packet	*packets;</div><div class='add'>+	struct list_head	packets;</div><div class='ctx'> </div><div class='ctx'> 	struct workqueue_struct	*workqueue;</div><div class='ctx'> 	struct work_struct	packet_worker;</div><div class='add'>+	struct work_struct	reset_worker;</div><div class='ctx'> </div><div class='ctx'> 	u8			rx_unit;</div><div class='ctx'> };</div><div class='hunk'>@@ -404,9 +405,10 @@ static void if_sdio_host_to_card_worker(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		spin_lock_irqsave(&amp;card-&gt;lock, flags);</div><div class='del'>-		packet = card-&gt;packets;</div><div class='add'>+		packet = list_first_entry_or_null(&amp;card-&gt;packets,</div><div class='add'>+						  struct if_sdio_packet, list);</div><div class='ctx'> 		if (packet)</div><div class='del'>-			card-&gt;packets = packet-&gt;next;</div><div class='add'>+			list_del(&amp;packet-&gt;list);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;card-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 		if (!packet)</div><div class='hunk'>@@ -909,7 +911,7 @@ static int if_sdio_host_to_card(struct lbs_private *priv,</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct if_sdio_card *card;</div><div class='del'>-	struct if_sdio_packet *packet, *cur;</div><div class='add'>+	struct if_sdio_packet *packet;</div><div class='ctx'> 	u16 size;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -934,7 +936,6 @@ static int if_sdio_host_to_card(struct lbs_private *priv,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	packet-&gt;next = NULL;</div><div class='ctx'> 	packet-&gt;nb = size;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -949,14 +950,7 @@ static int if_sdio_host_to_card(struct lbs_private *priv,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;card-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (!card-&gt;packets)</div><div class='del'>-		card-&gt;packets = packet;</div><div class='del'>-	else {</div><div class='del'>-		cur = card-&gt;packets;</div><div class='del'>-		while (cur-&gt;next)</div><div class='del'>-			cur = cur-&gt;next;</div><div class='del'>-		cur-&gt;next = packet;</div><div class='del'>-	}</div><div class='add'>+	list_add_tail(&amp;packet-&gt;list, &amp;card-&gt;packets);</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case MVMS_CMD:</div><div class='hunk'>@@ -1029,10 +1023,19 @@ static int if_sdio_reset_deep_sleep_wakeup(struct lbs_private *priv)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct mmc_host *reset_host;</div><div class='del'>-</div><div class='ctx'> static void if_sdio_reset_card_worker(struct work_struct *work)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+	const char *name;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct if_sdio_card *card;</div><div class='add'>+	struct mmc_host *reset_host;</div><div class='add'>+</div><div class='add'>+	card = container_of(work, struct if_sdio_card, reset_worker);</div><div class='add'>+	reset_host = card-&gt;func-&gt;card-&gt;host;</div><div class='add'>+	name = card-&gt;priv-&gt;dev-&gt;name;</div><div class='add'>+	dev = &amp;card-&gt;func-&gt;dev;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The actual reset operation must be run outside of lbs_thread. This</div><div class='ctx'> 	 * is because mmc_remove_host() will cause the device to be instantly</div><div class='hunk'>@@ -1043,21 +1046,19 @@ static void if_sdio_reset_card_worker(struct work_struct *work)</div><div class='ctx'> 	 * instance for that reason.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	pr_info("Resetting card...");</div><div class='add'>+	dev_info(dev, "resetting card %s...", name);</div><div class='ctx'> 	mmc_remove_host(reset_host);</div><div class='del'>-	mmc_add_host(reset_host);</div><div class='add'>+	ret = mmc_add_host(reset_host);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(dev, "%s: can't add mmc host, error %d\n", name, ret);</div><div class='ctx'> }</div><div class='del'>-static DECLARE_WORK(card_reset_work, if_sdio_reset_card_worker);</div><div class='ctx'> </div><div class='ctx'> static void if_sdio_reset_card(struct lbs_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct if_sdio_card *card = priv-&gt;card;</div><div class='ctx'> </div><div class='del'>-	if (work_pending(&amp;card_reset_work))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	reset_host = card-&gt;func-&gt;card-&gt;host;</div><div class='del'>-	schedule_work(&amp;card_reset_work);</div><div class='add'>+	if (!work_pending(&amp;card-&gt;reset_worker))</div><div class='add'>+		schedule_work(&amp;card-&gt;reset_worker);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int if_sdio_power_save(struct lbs_private *priv)</div><div class='hunk'>@@ -1137,7 +1138,7 @@ static int if_sdio_probe(struct sdio_func *func,</div><div class='ctx'> 	struct lbs_private *priv;</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> 	unsigned int model;</div><div class='del'>-	struct if_sdio_packet *packet;</div><div class='add'>+	struct if_sdio_packet *packet, *tmp;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0;i &lt; func-&gt;card-&gt;num_info;i++) {</div><div class='ctx'> 		if (sscanf(func-&gt;card-&gt;info[i],</div><div class='hunk'>@@ -1178,11 +1179,16 @@ static int if_sdio_probe(struct sdio_func *func,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;card-&gt;lock);</div><div class='del'>-	card-&gt;workqueue = alloc_workqueue("libertas_sdio", WQ_MEM_RECLAIM, 0);</div><div class='add'>+	INIT_LIST_HEAD(&amp;card-&gt;packets);</div><div class='add'>+</div><div class='add'>+	card-&gt;workqueue = alloc_workqueue("libertas_sdio",</div><div class='add'>+					  WQ_MEM_RECLAIM | WQ_UNBOUND, 0);</div><div class='ctx'> 	if (unlikely(!card-&gt;workqueue)) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto err_queue;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;card-&gt;reset_worker, if_sdio_reset_card_worker);</div><div class='ctx'> 	INIT_WORK(&amp;card-&gt;packet_worker, if_sdio_host_to_card_worker);</div><div class='ctx'> 	init_waitqueue_head(&amp;card-&gt;pwron_waitq);</div><div class='ctx'> </div><div class='hunk'>@@ -1233,13 +1239,12 @@ err_activate_card:</div><div class='ctx'> 	flush_workqueue(card-&gt;workqueue);</div><div class='ctx'> 	lbs_remove_card(priv);</div><div class='ctx'> free:</div><div class='add'>+	cancel_work_sync(&amp;card-&gt;packet_worker);</div><div class='add'>+	cancel_work_sync(&amp;card-&gt;reset_worker);</div><div class='ctx'> 	destroy_workqueue(card-&gt;workqueue);</div><div class='ctx'> err_queue:</div><div class='del'>-	while (card-&gt;packets) {</div><div class='del'>-		packet = card-&gt;packets;</div><div class='del'>-		card-&gt;packets = card-&gt;packets-&gt;next;</div><div class='add'>+	list_for_each_entry_safe(packet, tmp, &amp;card-&gt;packets, list)</div><div class='ctx'> 		kfree(packet);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(card);</div><div class='ctx'> </div><div class='hunk'>@@ -1249,7 +1254,7 @@ err_queue:</div><div class='ctx'> static void if_sdio_remove(struct sdio_func *func)</div><div class='ctx'> {</div><div class='ctx'> 	struct if_sdio_card *card;</div><div class='del'>-	struct if_sdio_packet *packet;</div><div class='add'>+	struct if_sdio_packet *packet, *tmp;</div><div class='ctx'> </div><div class='ctx'> 	card = sdio_get_drvdata(func);</div><div class='ctx'> </div><div class='hunk'>@@ -1277,13 +1282,12 @@ static void if_sdio_remove(struct sdio_func *func)</div><div class='ctx'> 	lbs_stop_card(card-&gt;priv);</div><div class='ctx'> 	lbs_remove_card(card-&gt;priv);</div><div class='ctx'> </div><div class='add'>+	cancel_work_sync(&amp;card-&gt;packet_worker);</div><div class='add'>+	cancel_work_sync(&amp;card-&gt;reset_worker);</div><div class='ctx'> 	destroy_workqueue(card-&gt;workqueue);</div><div class='ctx'> </div><div class='del'>-	while (card-&gt;packets) {</div><div class='del'>-		packet = card-&gt;packets;</div><div class='del'>-		card-&gt;packets = card-&gt;packets-&gt;next;</div><div class='add'>+	list_for_each_entry_safe(packet, tmp, &amp;card-&gt;packets, list)</div><div class='ctx'> 		kfree(packet);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(card);</div><div class='ctx'> }</div><div class='hunk'>@@ -1403,8 +1407,6 @@ static void __exit if_sdio_exit_module(void)</div><div class='ctx'> 	/* Set the flag as user is removing this module. */</div><div class='ctx'> 	user_rmmod = 1;</div><div class='ctx'> </div><div class='del'>-	cancel_work_sync(&amp;card_reset_work);</div><div class='del'>-</div><div class='ctx'> 	sdio_unregister_driver(&amp;if_sdio_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas/if_spi.c b/drivers/net/wireless/marvell/libertas/if_spi.c<br/>index cd9f8ecf171f..8a2504a62840 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/if_spi.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/if_spi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/if_spi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas/if_spi.c</a></div><div class='hunk'>@@ -76,16 +76,13 @@ struct if_spi_card {</div><div class='ctx'> </div><div class='ctx'> static void free_if_spi_card(struct if_spi_card *card)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *cursor, *next;</div><div class='del'>-	struct if_spi_packet *packet;</div><div class='add'>+	struct if_spi_packet *packet, *tmp;</div><div class='ctx'> </div><div class='del'>-	list_for_each_safe(cursor, next, &amp;card-&gt;cmd_packet_list) {</div><div class='del'>-		packet = container_of(cursor, struct if_spi_packet, list);</div><div class='add'>+	list_for_each_entry_safe(packet, tmp, &amp;card-&gt;cmd_packet_list, list) {</div><div class='ctx'> 		list_del(&amp;packet-&gt;list);</div><div class='ctx'> 		kfree(packet);</div><div class='ctx'> 	}</div><div class='del'>-	list_for_each_safe(cursor, next, &amp;card-&gt;data_packet_list) {</div><div class='del'>-		packet = container_of(cursor, struct if_spi_packet, list);</div><div class='add'>+	list_for_each_entry_safe(packet, tmp, &amp;card-&gt;data_packet_list, list) {</div><div class='ctx'> 		list_del(&amp;packet-&gt;list);</div><div class='ctx'> 		kfree(packet);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -829,11 +826,16 @@ static void if_spi_e2h(struct if_spi_card *card)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* re-enable the card event interrupt */</div><div class='del'>-	spu_write_u16(card, IF_SPI_HOST_INT_STATUS_REG,</div><div class='del'>-			~IF_SPI_HICU_CARD_EVENT);</div><div class='add'>+	err = spu_write_u16(card, IF_SPI_HOST_INT_STATUS_REG,</div><div class='add'>+			    ~IF_SPI_HICU_CARD_EVENT);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* generate a card interrupt */</div><div class='del'>-	spu_write_u16(card, IF_SPI_CARD_INT_CAUSE_REG, IF_SPI_CIC_HOST_EVENT);</div><div class='add'>+	err = spu_write_u16(card, IF_SPI_CARD_INT_CAUSE_REG,</div><div class='add'>+			    IF_SPI_CIC_HOST_EVENT);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	lbs_queue_event(priv, cause &amp; 0xff);</div><div class='ctx'> out:</div><div class='hunk'>@@ -1050,8 +1052,8 @@ static int if_spi_init_card(struct if_spi_card *card)</div><div class='ctx'> 				"attached to SPI bus_num %d, chip_select %d. "</div><div class='ctx'> 				"spi-&gt;max_speed_hz=%d\n",</div><div class='ctx'> 				card-&gt;card_id, card-&gt;card_rev,</div><div class='del'>-				card-&gt;spi-&gt;master-&gt;bus_num,</div><div class='del'>-				card-&gt;spi-&gt;chip_select,</div><div class='add'>+				card-&gt;spi-&gt;controller-&gt;bus_num,</div><div class='add'>+				spi_get_chipselect(card-&gt;spi, 0),</div><div class='ctx'> 				card-&gt;spi-&gt;max_speed_hz);</div><div class='ctx'> 		err = if_spi_prog_helper_firmware(card, helper);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -1151,7 +1153,8 @@ static int if_spi_probe(struct spi_device *spi)</div><div class='ctx'> 	priv-&gt;fw_ready = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize interrupt handling stuff. */</div><div class='del'>-	card-&gt;workqueue = alloc_workqueue("libertas_spi", WQ_MEM_RECLAIM, 0);</div><div class='add'>+	card-&gt;workqueue = alloc_workqueue("libertas_spi",</div><div class='add'>+					  WQ_MEM_RECLAIM | WQ_UNBOUND, 0);</div><div class='ctx'> 	if (!card-&gt;workqueue) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto remove_card;</div><div class='hunk'>@@ -1195,7 +1198,7 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int libertas_spi_remove(struct spi_device *spi)</div><div class='add'>+static void libertas_spi_remove(struct spi_device *spi)</div><div class='ctx'> {</div><div class='ctx'> 	struct if_spi_card *card = spi_get_drvdata(spi);</div><div class='ctx'> 	struct lbs_private *priv = card-&gt;priv;</div><div class='hunk'>@@ -1212,8 +1215,6 @@ static int libertas_spi_remove(struct spi_device *spi)</div><div class='ctx'> 	if (card-&gt;pdata-&gt;teardown)</div><div class='ctx'> 		card-&gt;pdata-&gt;teardown(spi);</div><div class='ctx'> 	free_if_spi_card(card);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int if_spi_suspend(struct device *dev)</div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas/if_usb.c b/drivers/net/wireless/marvell/libertas/if_usb.c<br/>index 20436a289d5c..b3c4040257a6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/if_usb.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/if_usb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/if_usb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas/if_usb.c</a></div><div class='hunk'>@@ -165,7 +165,7 @@ static void if_usb_setup_firmware(struct lbs_private *priv)</div><div class='ctx'> </div><div class='ctx'> static void if_usb_fw_timeo(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct if_usb_card *cardp = from_timer(cardp, t, fw_timeout);</div><div class='add'>+	struct if_usb_card *cardp = timer_container_of(cardp, t, fw_timeout);</div><div class='ctx'> </div><div class='ctx'> 	if (cardp-&gt;fwdnldover) {</div><div class='ctx'> 		lbs_deb_usb("Download complete, no event. Assuming success\n");</div><div class='hunk'>@@ -287,11 +287,13 @@ static int if_usb_probe(struct usb_interface *intf,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_get_fw:</div><div class='add'>+	usb_put_dev(udev);</div><div class='ctx'> 	lbs_remove_card(priv);</div><div class='ctx'> err_add_card:</div><div class='ctx'> 	if_usb_reset_device(cardp);</div><div class='ctx'> dealloc:</div><div class='ctx'> 	if_usb_free(cardp);</div><div class='add'>+	kfree(cardp);</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='ctx'> 	return r;</div><div class='hunk'>@@ -316,6 +318,7 @@ static void if_usb_disconnect(struct usb_interface *intf)</div><div class='ctx'> </div><div class='ctx'> 	/* Unlink and free urb */</div><div class='ctx'> 	if_usb_free(cardp);</div><div class='add'>+	kfree(cardp);</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata(intf, NULL);</div><div class='ctx'> 	usb_put_dev(interface_to_usbdev(intf));</div><div class='hunk'>@@ -634,7 +637,7 @@ static inline void process_cmdrequest(int recvlength, uint8_t *recvbuff,</div><div class='ctx'> 	priv-&gt;resp_len[i] = (recvlength - MESSAGE_HEADER_LEN);</div><div class='ctx'> 	memcpy(priv-&gt;resp_buf[i], recvbuff + MESSAGE_HEADER_LEN,</div><div class='ctx'> 		priv-&gt;resp_len[i]);</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	dev_kfree_skb_irq(skb);</div><div class='ctx'> 	lbs_notify_command_response(priv, i);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='hunk'>@@ -894,7 +897,7 @@ restart:</div><div class='ctx'> 	/* ... and wait for the process to complete */</div><div class='ctx'> 	wait_event_interruptible(cardp-&gt;fw_wq, cardp-&gt;surprise_removed || cardp-&gt;fwdnldover);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;cardp-&gt;fw_timeout);</div><div class='add'>+	timer_delete_sync(&amp;cardp-&gt;fw_timeout);</div><div class='ctx'> 	usb_kill_urb(cardp-&gt;rx_urb);</div><div class='ctx'> </div><div class='ctx'> 	if (!cardp-&gt;fwdnldover) {</div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas/main.c b/drivers/net/wireless/marvell/libertas/main.c<br/>index ee4cf3437e28..d44e02c6fe38 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas/main.c</a></div><div class='hunk'>@@ -39,8 +39,7 @@ unsigned int lbs_debug;</div><div class='ctx'> EXPORT_SYMBOL_GPL(lbs_debug);</div><div class='ctx'> module_param_named(libertas_debug, lbs_debug, int, 0644);</div><div class='ctx'> </div><div class='del'>-unsigned int lbs_disablemesh;</div><div class='del'>-EXPORT_SYMBOL_GPL(lbs_disablemesh);</div><div class='add'>+static unsigned int lbs_disablemesh;</div><div class='ctx'> module_param_named(libertas_disablemesh, lbs_disablemesh, int, 0644);</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -80,26 +79,6 @@ u32 lbs_fw_index_to_data_rate(u8 idx)</div><div class='ctx'> 	return fw_data_rates[idx];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *  lbs_data_rate_to_fw_index - use rate to get the index</div><div class='del'>- *</div><div class='del'>- *  @rate:	data rate</div><div class='del'>- *  returns:	index or 0</div><div class='del'>- */</div><div class='del'>-u8 lbs_data_rate_to_fw_index(u32 rate)</div><div class='del'>-{</div><div class='del'>-	u8 i;</div><div class='del'>-</div><div class='del'>-	if (!rate)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; sizeof(fw_data_rates); i++) {</div><div class='del'>-		if (rate == fw_data_rates[i])</div><div class='del'>-			return i;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int lbs_set_iface_type(struct lbs_private *priv, enum nl80211_iftype type)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -217,13 +196,13 @@ int lbs_stop_iface(struct lbs_private *priv)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='ctx'> 	priv-&gt;iface_running = false;</div><div class='del'>-	kfree_skb(priv-&gt;currenttxskb);</div><div class='add'>+	dev_kfree_skb_irq(priv-&gt;currenttxskb);</div><div class='ctx'> 	priv-&gt;currenttxskb = NULL;</div><div class='ctx'> 	priv-&gt;tx_pending_len = 0;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	cancel_work_sync(&amp;priv-&gt;mcast_work);</div><div class='del'>-	del_timer_sync(&amp;priv-&gt;tx_lockup_timer);</div><div class='add'>+	timer_delete_sync(&amp;priv-&gt;tx_lockup_timer);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable command processing, and wait for all commands to complete */</div><div class='ctx'> 	lbs_deb_main("waiting for commands to complete\n");</div><div class='hunk'>@@ -271,14 +250,13 @@ void lbs_host_to_card_done(struct lbs_private *priv)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='del'>-	del_timer(&amp;priv-&gt;tx_lockup_timer);</div><div class='add'>+	timer_delete(&amp;priv-&gt;tx_lockup_timer);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;dnld_sent = DNLD_RES_RECEIVED;</div><div class='ctx'> </div><div class='ctx'> 	/* Wake main thread if commands are pending */</div><div class='ctx'> 	if (!priv-&gt;cur_cmd || priv-&gt;tx_pending_len &gt; 0) {</div><div class='del'>-		if (!priv-&gt;wakeup_dev_required)</div><div class='del'>-			wake_up(&amp;priv-&gt;waitq);</div><div class='add'>+		wake_up(&amp;priv-&gt;waitq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='hunk'>@@ -302,9 +280,9 @@ int lbs_set_mac_address(struct net_device *dev, void *addr)</div><div class='ctx'> 	dev = priv-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(priv-&gt;current_addr, phwaddr-&gt;sa_data, ETH_ALEN);</div><div class='del'>-	memcpy(dev-&gt;dev_addr, phwaddr-&gt;sa_data, ETH_ALEN);</div><div class='add'>+	eth_hw_addr_set(dev, phwaddr-&gt;sa_data);</div><div class='ctx'> 	if (priv-&gt;mesh_dev)</div><div class='del'>-		memcpy(priv-&gt;mesh_dev-&gt;dev_addr, phwaddr-&gt;sa_data, ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(priv-&gt;mesh_dev, phwaddr-&gt;sa_data);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -469,8 +447,7 @@ static int lbs_thread(void *data)</div><div class='ctx'> 			shouldsleep = 0;	/* We have a command response */</div><div class='ctx'> 		else if (priv-&gt;cur_cmd)</div><div class='ctx'> 			shouldsleep = 1;	/* Can't send a command; one already running */</div><div class='del'>-		else if (!list_empty(&amp;priv-&gt;cmdpendingq) &amp;&amp;</div><div class='del'>-					!(priv-&gt;wakeup_dev_required))</div><div class='add'>+		else if (!list_empty(&amp;priv-&gt;cmdpendingq))</div><div class='ctx'> 			shouldsleep = 0;	/* We have a command to send */</div><div class='ctx'> 		else if (kfifo_len(&amp;priv-&gt;event_fifo))</div><div class='ctx'> 			shouldsleep = 0;	/* We have an event to process */</div><div class='hunk'>@@ -537,14 +514,6 @@ static int lbs_thread(void *data)</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_irq(&amp;priv-&gt;driver_lock);</div><div class='ctx'> </div><div class='del'>-		if (priv-&gt;wakeup_dev_required) {</div><div class='del'>-			lbs_deb_thread("Waking up device...\n");</div><div class='del'>-			/* Wake up device */</div><div class='del'>-			if (priv-&gt;exit_deep_sleep(priv))</div><div class='del'>-				lbs_deb_thread("Wakeup device failed\n");</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		/* command timeout stuff */</div><div class='ctx'> 		if (priv-&gt;cmd_timed_out &amp;&amp; priv-&gt;cur_cmd) {</div><div class='ctx'> 			struct cmd_ctrl_node *cmdnode = priv-&gt;cur_cmd;</div><div class='hunk'>@@ -625,9 +594,8 @@ static int lbs_thread(void *data)</div><div class='ctx'> 		spin_unlock_irq(&amp;priv-&gt;driver_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	del_timer(&amp;priv-&gt;command_timer);</div><div class='del'>-	del_timer(&amp;priv-&gt;tx_lockup_timer);</div><div class='del'>-	del_timer(&amp;priv-&gt;auto_deepsleep_timer);</div><div class='add'>+	timer_delete(&amp;priv-&gt;command_timer);</div><div class='add'>+	timer_delete(&amp;priv-&gt;tx_lockup_timer);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -725,7 +693,7 @@ EXPORT_SYMBOL_GPL(lbs_resume);</div><div class='ctx'>  */</div><div class='ctx'> static void lbs_cmd_timeout_handler(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct lbs_private *priv = from_timer(priv, t, command_timer);</div><div class='add'>+	struct lbs_private *priv = timer_container_of(priv, t, command_timer);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='hunk'>@@ -759,7 +727,8 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> static void lbs_tx_lockup_handler(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct lbs_private *priv = from_timer(priv, t, tx_lockup_timer);</div><div class='add'>+	struct lbs_private *priv = timer_container_of(priv, t,</div><div class='add'>+						      tx_lockup_timer);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='hunk'>@@ -774,55 +743,6 @@ static void lbs_tx_lockup_handler(struct timer_list *t)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * auto_deepsleep_timer_fn - put the device back to deep sleep mode when</div><div class='del'>- * timer expires and no activity (command, event, data etc.) is detected.</div><div class='del'>- * @t: Context from which to retrieve a &amp;struct lbs_private pointer</div><div class='del'>- * returns:	N/A</div><div class='del'>- */</div><div class='del'>-static void auto_deepsleep_timer_fn(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	struct lbs_private *priv = from_timer(priv, t, auto_deepsleep_timer);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;is_activity_detected) {</div><div class='del'>-		priv-&gt;is_activity_detected = 0;</div><div class='del'>-	} else {</div><div class='del'>-		if (priv-&gt;is_auto_deep_sleep_enabled &amp;&amp;</div><div class='del'>-		    (!priv-&gt;wakeup_dev_required) &amp;&amp;</div><div class='del'>-		    (priv-&gt;connect_status != LBS_CONNECTED)) {</div><div class='del'>-			struct cmd_header cmd;</div><div class='del'>-</div><div class='del'>-			lbs_deb_main("Entering auto deep sleep mode...\n");</div><div class='del'>-			memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-			cmd.size = cpu_to_le16(sizeof(cmd));</div><div class='del'>-			lbs_cmd_async(priv, CMD_802_11_DEEP_SLEEP, &amp;cmd,</div><div class='del'>-					sizeof(cmd));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mod_timer(&amp;priv-&gt;auto_deepsleep_timer , jiffies +</div><div class='del'>-				(priv-&gt;auto_deep_sleep_timeout * HZ)/1000);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int lbs_enter_auto_deep_sleep(struct lbs_private *priv)</div><div class='del'>-{</div><div class='del'>-	priv-&gt;is_auto_deep_sleep_enabled = 1;</div><div class='del'>-	if (priv-&gt;is_deep_sleep)</div><div class='del'>-		priv-&gt;wakeup_dev_required = 1;</div><div class='del'>-	mod_timer(&amp;priv-&gt;auto_deepsleep_timer ,</div><div class='del'>-			jiffies + (priv-&gt;auto_deep_sleep_timeout * HZ)/1000);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int lbs_exit_auto_deep_sleep(struct lbs_private *priv)</div><div class='del'>-{</div><div class='del'>-	priv-&gt;is_auto_deep_sleep_enabled = 0;</div><div class='del'>-	priv-&gt;auto_deep_sleep_timeout = 0;</div><div class='del'>-	del_timer(&amp;priv-&gt;auto_deepsleep_timer);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int lbs_init_adapter(struct lbs_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -836,9 +756,7 @@ static int lbs_init_adapter(struct lbs_private *priv)</div><div class='ctx'> 	priv-&gt;psmode = LBS802_11POWERMODECAM;</div><div class='ctx'> 	priv-&gt;psstate = PS_STATE_FULL_POWER;</div><div class='ctx'> 	priv-&gt;is_deep_sleep = 0;</div><div class='del'>-	priv-&gt;is_auto_deep_sleep_enabled = 0;</div><div class='ctx'> 	priv-&gt;deep_sleep_required = 0;</div><div class='del'>-	priv-&gt;wakeup_dev_required = 0;</div><div class='ctx'> 	init_waitqueue_head(&amp;priv-&gt;ds_awake_q);</div><div class='ctx'> 	init_waitqueue_head(&amp;priv-&gt;scan_q);</div><div class='ctx'> 	priv-&gt;authtype_auto = 1;</div><div class='hunk'>@@ -850,7 +768,6 @@ static int lbs_init_adapter(struct lbs_private *priv)</div><div class='ctx'> </div><div class='ctx'> 	timer_setup(&amp;priv-&gt;command_timer, lbs_cmd_timeout_handler, 0);</div><div class='ctx'> 	timer_setup(&amp;priv-&gt;tx_lockup_timer, lbs_tx_lockup_handler, 0);</div><div class='del'>-	timer_setup(&amp;priv-&gt;auto_deepsleep_timer, auto_deepsleep_timer_fn, 0);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;priv-&gt;cmdfreeq);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;priv-&gt;cmdpendingq);</div><div class='hunk'>@@ -870,6 +787,7 @@ static int lbs_init_adapter(struct lbs_private *priv)</div><div class='ctx'> 	ret = kfifo_alloc(&amp;priv-&gt;event_fifo, sizeof(u32) * 16, GFP_KERNEL);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_err("Out of memory allocating event FIFO buffer\n");</div><div class='add'>+		lbs_free_cmd_buffer(priv);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -881,9 +799,8 @@ static void lbs_free_adapter(struct lbs_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	lbs_free_cmd_buffer(priv);</div><div class='ctx'> 	kfifo_free(&amp;priv-&gt;event_fifo);</div><div class='del'>-	del_timer(&amp;priv-&gt;command_timer);</div><div class='del'>-	del_timer(&amp;priv-&gt;tx_lockup_timer);</div><div class='del'>-	del_timer(&amp;priv-&gt;auto_deepsleep_timer);</div><div class='add'>+	timer_delete(&amp;priv-&gt;command_timer);</div><div class='add'>+	timer_delete(&amp;priv-&gt;tx_lockup_timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops lbs_netdev_ops = {</div><div class='hunk'>@@ -941,7 +858,7 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev)</div><div class='ctx'> 	wdev-&gt;netdev = dev;</div><div class='ctx'> 	priv-&gt;dev = dev;</div><div class='ctx'> </div><div class='del'>- 	dev-&gt;netdev_ops = &amp;lbs_netdev_ops;</div><div class='add'>+	dev-&gt;netdev_ops = &amp;lbs_netdev_ops;</div><div class='ctx'> 	dev-&gt;watchdog_timeo = 5 * HZ;</div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;lbs_ethtool_ops;</div><div class='ctx'> 	dev-&gt;flags |= IFF_BROADCAST | IFF_MULTICAST;</div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas/mesh.c b/drivers/net/wireless/marvell/libertas/mesh.c<br/>index f5b78257d551..2dd635935448 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/mesh.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/mesh.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/mesh.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas/mesh.c</a></div><div class='hunk'>@@ -109,9 +109,9 @@ static int lbs_mesh_config(struct lbs_private *priv, uint16_t action,</div><div class='ctx'> </div><div class='ctx'> 		if (priv-&gt;mesh_dev) {</div><div class='ctx'> 			mesh_wdev = priv-&gt;mesh_dev-&gt;ieee80211_ptr;</div><div class='del'>-			ie-&gt;val.mesh_id_len = mesh_wdev-&gt;mesh_id_up_len;</div><div class='del'>-			memcpy(ie-&gt;val.mesh_id, mesh_wdev-&gt;ssid,</div><div class='del'>-						mesh_wdev-&gt;mesh_id_up_len);</div><div class='add'>+			ie-&gt;val.mesh_id_len = mesh_wdev-&gt;u.mesh.id_up_len;</div><div class='add'>+			memcpy(ie-&gt;val.mesh_id, mesh_wdev-&gt;u.mesh.id,</div><div class='add'>+						mesh_wdev-&gt;u.mesh.id_up_len);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ie-&gt;len = sizeof(struct mrvl_meshie_val) -</div><div class='hunk'>@@ -151,13 +151,13 @@ static uint16_t lbs_mesh_get_channel(struct lbs_private *priv)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * lbs_anycast_get - Get function for sysfs attribute anycast_mask</div><div class='add'>+ * anycast_mask_show - Get function for sysfs attribute anycast_mask</div><div class='ctx'>  * @dev: the &amp;struct device</div><div class='ctx'>  * @attr: device attributes</div><div class='ctx'>  * @buf: buffer where data will be returned</div><div class='ctx'>  */</div><div class='del'>-static ssize_t lbs_anycast_get(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char * buf)</div><div class='add'>+static ssize_t anycast_mask_show(struct device *dev,</div><div class='add'>+				 struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lbs_private *priv = to_net_dev(dev)-&gt;ml_priv;</div><div class='ctx'> 	struct cmd_ds_mesh_access mesh_access;</div><div class='hunk'>@@ -169,26 +169,30 @@ static ssize_t lbs_anycast_get(struct device *dev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, 12, "0x%X\n", le32_to_cpu(mesh_access.data[0]));</div><div class='add'>+	return sysfs_emit(buf, "0x%X\n", le32_to_cpu(mesh_access.data[0]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * lbs_anycast_set - Set function for sysfs attribute anycast_mask</div><div class='add'>+ * anycast_mask_store - Set function for sysfs attribute anycast_mask</div><div class='ctx'>  * @dev: the &amp;struct device</div><div class='ctx'>  * @attr: device attributes</div><div class='ctx'>  * @buf: buffer that contains new attribute value</div><div class='ctx'>  * @count: size of buffer</div><div class='ctx'>  */</div><div class='del'>-static ssize_t lbs_anycast_set(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, const char * buf, size_t count)</div><div class='add'>+static ssize_t anycast_mask_store(struct device *dev,</div><div class='add'>+				  struct device_attribute *attr,</div><div class='add'>+				  const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct lbs_private *priv = to_net_dev(dev)-&gt;ml_priv;</div><div class='ctx'> 	struct cmd_ds_mesh_access mesh_access;</div><div class='ctx'> 	uint32_t datum;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	ret = kstrtouint(buf, 16, &amp;datum);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	memset(&amp;mesh_access, 0, sizeof(mesh_access));</div><div class='del'>-	sscanf(buf, "%x", &amp;datum);</div><div class='ctx'> 	mesh_access.data[0] = cpu_to_le32(datum);</div><div class='ctx'> </div><div class='ctx'> 	ret = lbs_mesh_access(priv, CMD_ACT_MESH_SET_ANYCAST, &amp;mesh_access);</div><div class='hunk'>@@ -199,13 +203,13 @@ static ssize_t lbs_anycast_set(struct device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * lbs_prb_rsp_limit_get - Get function for sysfs attribute prb_rsp_limit</div><div class='add'>+ * prb_rsp_limit_show - Get function for sysfs attribute prb_rsp_limit</div><div class='ctx'>  * @dev: the &amp;struct device</div><div class='ctx'>  * @attr: device attributes</div><div class='ctx'>  * @buf: buffer where data will be returned</div><div class='ctx'>  */</div><div class='del'>-static ssize_t lbs_prb_rsp_limit_get(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t prb_rsp_limit_show(struct device *dev,</div><div class='add'>+				  struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lbs_private *priv = to_net_dev(dev)-&gt;ml_priv;</div><div class='ctx'> 	struct cmd_ds_mesh_access mesh_access;</div><div class='hunk'>@@ -221,33 +225,33 @@ static ssize_t lbs_prb_rsp_limit_get(struct device *dev,</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	retry_limit = le32_to_cpu(mesh_access.data[1]);</div><div class='del'>-	return snprintf(buf, 10, "%d\n", retry_limit);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", retry_limit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * lbs_prb_rsp_limit_set - Set function for sysfs attribute prb_rsp_limit</div><div class='add'>+ * prb_rsp_limit_store - Set function for sysfs attribute prb_rsp_limit</div><div class='ctx'>  * @dev: the &amp;struct device</div><div class='ctx'>  * @attr: device attributes</div><div class='ctx'>  * @buf: buffer that contains new attribute value</div><div class='ctx'>  * @count: size of buffer</div><div class='ctx'>  */</div><div class='del'>-static ssize_t lbs_prb_rsp_limit_set(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+static ssize_t prb_rsp_limit_store(struct device *dev,</div><div class='add'>+				   struct device_attribute *attr,</div><div class='add'>+				   const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct lbs_private *priv = to_net_dev(dev)-&gt;ml_priv;</div><div class='ctx'> 	struct cmd_ds_mesh_access mesh_access;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned long retry_limit;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;mesh_access, 0, sizeof(mesh_access));</div><div class='del'>-	mesh_access.data[0] = cpu_to_le32(CMD_ACT_SET);</div><div class='del'>-</div><div class='ctx'> 	ret = kstrtoul(buf, 10, &amp;retry_limit);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	if (retry_limit &gt; 15)</div><div class='ctx'> 		return -ENOTSUPP;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;mesh_access, 0, sizeof(mesh_access));</div><div class='add'>+	mesh_access.data[0] = cpu_to_le32(CMD_ACT_SET);</div><div class='ctx'> 	mesh_access.data[1] = cpu_to_le32(retry_limit);</div><div class='ctx'> </div><div class='ctx'> 	ret = lbs_mesh_access(priv, CMD_ACT_MESH_SET_GET_PRB_RSP_LIMIT,</div><div class='hunk'>@@ -259,32 +263,36 @@ static ssize_t lbs_prb_rsp_limit_set(struct device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * lbs_mesh_get - Get function for sysfs attribute mesh</div><div class='add'>+ * lbs_mesh_show - Get function for sysfs attribute mesh</div><div class='ctx'>  * @dev: the &amp;struct device</div><div class='ctx'>  * @attr: device attributes</div><div class='ctx'>  * @buf: buffer where data will be returned</div><div class='ctx'>  */</div><div class='del'>-static ssize_t lbs_mesh_get(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char * buf)</div><div class='add'>+static ssize_t lbs_mesh_show(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lbs_private *priv = to_net_dev(dev)-&gt;ml_priv;</div><div class='del'>-	return snprintf(buf, 5, "0x%X\n", !!priv-&gt;mesh_dev);</div><div class='add'>+	return sysfs_emit(buf, "0x%X\n", !!priv-&gt;mesh_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * lbs_mesh_set - Set function for sysfs attribute mesh</div><div class='add'>+ * lbs_mesh_store - Set function for sysfs attribute mesh</div><div class='ctx'>  * @dev: the &amp;struct device</div><div class='ctx'>  * @attr: device attributes</div><div class='ctx'>  * @buf: buffer that contains new attribute value</div><div class='ctx'>  * @count: size of buffer</div><div class='ctx'>  */</div><div class='del'>-static ssize_t lbs_mesh_set(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, const char * buf, size_t count)</div><div class='add'>+static ssize_t lbs_mesh_store(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr,</div><div class='add'>+			      const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct lbs_private *priv = to_net_dev(dev)-&gt;ml_priv;</div><div class='del'>-	int enable;</div><div class='add'>+	int ret, enable;</div><div class='add'>+</div><div class='add'>+	ret = kstrtoint(buf, 16, &amp;enable);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	sscanf(buf, "%x", &amp;enable);</div><div class='ctx'> 	enable = !!enable;</div><div class='ctx'> 	if (enable == !!priv-&gt;mesh_dev)</div><div class='ctx'> 		return count;</div><div class='hunk'>@@ -301,20 +309,19 @@ static ssize_t lbs_mesh_set(struct device *dev,</div><div class='ctx'>  * lbs_mesh attribute to be exported per ethX interface</div><div class='ctx'>  * through sysfs (/sys/class/net/ethX/lbs_mesh)</div><div class='ctx'>  */</div><div class='del'>-static DEVICE_ATTR(lbs_mesh, 0644, lbs_mesh_get, lbs_mesh_set);</div><div class='add'>+static DEVICE_ATTR_RW(lbs_mesh);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * anycast_mask attribute to be exported per mshX interface</div><div class='ctx'>  * through sysfs (/sys/class/net/mshX/anycast_mask)</div><div class='ctx'>  */</div><div class='del'>-static DEVICE_ATTR(anycast_mask, 0644, lbs_anycast_get, lbs_anycast_set);</div><div class='add'>+static DEVICE_ATTR_RW(anycast_mask);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * prb_rsp_limit attribute to be exported per mshX interface</div><div class='ctx'>  * through sysfs (/sys/class/net/mshX/prb_rsp_limit)</div><div class='ctx'>  */</div><div class='del'>-static DEVICE_ATTR(prb_rsp_limit, 0644, lbs_prb_rsp_limit_get,</div><div class='del'>-		lbs_prb_rsp_limit_set);</div><div class='add'>+static DEVICE_ATTR_RW(prb_rsp_limit);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *lbs_mesh_sysfs_entries[] = {</div><div class='ctx'> 	&amp;dev_attr_anycast_mask.attr,</div><div class='hunk'>@@ -351,13 +358,13 @@ static int mesh_get_default_parameters(struct device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * bootflag_get - Get function for sysfs attribute bootflag</div><div class='add'>+ * bootflag_show - Get function for sysfs attribute bootflag</div><div class='ctx'>  * @dev: the &amp;struct device</div><div class='ctx'>  * @attr: device attributes</div><div class='ctx'>  * @buf: buffer where data will be returned</div><div class='ctx'>  */</div><div class='del'>-static ssize_t bootflag_get(struct device *dev,</div><div class='del'>-			    struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t bootflag_show(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct mrvl_mesh_defaults defs;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -367,29 +374,31 @@ static ssize_t bootflag_get(struct device *dev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, 12, "%d\n", le32_to_cpu(defs.bootflag));</div><div class='add'>+	return sysfs_emit(buf, "%d\n", le32_to_cpu(defs.bootflag));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * bootflag_set - Set function for sysfs attribute bootflag</div><div class='add'>+ * bootflag_store - Set function for sysfs attribute bootflag</div><div class='ctx'>  * @dev: the &amp;struct device</div><div class='ctx'>  * @attr: device attributes</div><div class='ctx'>  * @buf: buffer that contains new attribute value</div><div class='ctx'>  * @count: size of buffer</div><div class='ctx'>  */</div><div class='del'>-static ssize_t bootflag_set(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			    const char *buf, size_t count)</div><div class='add'>+static ssize_t bootflag_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			      const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct lbs_private *priv = to_net_dev(dev)-&gt;ml_priv;</div><div class='ctx'> 	struct cmd_ds_mesh_config cmd;</div><div class='ctx'> 	uint32_t datum;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-	ret = sscanf(buf, "%d", &amp;datum);</div><div class='del'>-	if ((ret != 1) || (datum &gt; 1))</div><div class='add'>+	ret = kstrtouint(buf, 10, &amp;datum);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (datum &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='ctx'> 	*((__le32 *)&amp;cmd.data[0]) = cpu_to_le32(!!datum);</div><div class='ctx'> 	cmd.length = cpu_to_le16(sizeof(uint32_t));</div><div class='ctx'> 	ret = lbs_mesh_config_send(priv, &amp;cmd, CMD_ACT_MESH_CONFIG_SET,</div><div class='hunk'>@@ -401,13 +410,13 @@ static ssize_t bootflag_set(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * boottime_get - Get function for sysfs attribute boottime</div><div class='add'>+ * boottime_show - Get function for sysfs attribute boottime</div><div class='ctx'>  * @dev: the &amp;struct device</div><div class='ctx'>  * @attr: device attributes</div><div class='ctx'>  * @buf: buffer where data will be returned</div><div class='ctx'>  */</div><div class='del'>-static ssize_t boottime_get(struct device *dev,</div><div class='del'>-			    struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t boottime_show(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct mrvl_mesh_defaults defs;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -417,29 +426,33 @@ static ssize_t boottime_get(struct device *dev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, 12, "%d\n", defs.boottime);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", defs.boottime);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * boottime_set - Set function for sysfs attribute boottime</div><div class='add'>+ * boottime_store - Set function for sysfs attribute boottime</div><div class='ctx'>  * @dev: the &amp;struct device</div><div class='ctx'>  * @attr: device attributes</div><div class='ctx'>  * @buf: buffer that contains new attribute value</div><div class='ctx'>  * @count: size of buffer</div><div class='ctx'>  */</div><div class='del'>-static ssize_t boottime_set(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+static ssize_t boottime_store(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr,</div><div class='add'>+			      const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct lbs_private *priv = to_net_dev(dev)-&gt;ml_priv;</div><div class='ctx'> 	struct cmd_ds_mesh_config cmd;</div><div class='ctx'> 	uint32_t datum;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-	ret = sscanf(buf, "%d", &amp;datum);</div><div class='del'>-	if ((ret != 1) || (datum &gt; 255))</div><div class='add'>+	ret = kstrtouint(buf, 10, &amp;datum);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (datum &gt; 255)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='add'>+</div><div class='ctx'> 	/* A too small boot time will result in the device booting into</div><div class='ctx'> 	 * standalone (no-host) mode before the host can take control of it,</div><div class='ctx'> 	 * so the change will be hard to revert.  This may be a desired</div><div class='hunk'>@@ -460,13 +473,13 @@ static ssize_t boottime_set(struct device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * channel_get - Get function for sysfs attribute channel</div><div class='add'>+ * channel_show - Get function for sysfs attribute channel</div><div class='ctx'>  * @dev: the &amp;struct device</div><div class='ctx'>  * @attr: device attributes</div><div class='ctx'>  * @buf: buffer where data will be returned</div><div class='ctx'>  */</div><div class='del'>-static ssize_t channel_get(struct device *dev,</div><div class='del'>-			   struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t channel_show(struct device *dev,</div><div class='add'>+			    struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct mrvl_mesh_defaults defs;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -476,29 +489,31 @@ static ssize_t channel_get(struct device *dev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, 12, "%d\n", le16_to_cpu(defs.channel));</div><div class='add'>+	return sysfs_emit(buf, "%d\n", le16_to_cpu(defs.channel));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * channel_set - Set function for sysfs attribute channel</div><div class='add'>+ * channel_store - Set function for sysfs attribute channel</div><div class='ctx'>  * @dev: the &amp;struct device</div><div class='ctx'>  * @attr: device attributes</div><div class='ctx'>  * @buf: buffer that contains new attribute value</div><div class='ctx'>  * @count: size of buffer</div><div class='ctx'>  */</div><div class='del'>-static ssize_t channel_set(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			   const char *buf, size_t count)</div><div class='add'>+static ssize_t channel_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct lbs_private *priv = to_net_dev(dev)-&gt;ml_priv;</div><div class='ctx'> 	struct cmd_ds_mesh_config cmd;</div><div class='ctx'> 	uint32_t datum;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-	ret = sscanf(buf, "%d", &amp;datum);</div><div class='del'>-	if (ret != 1 || datum &lt; 1 || datum &gt; 11)</div><div class='add'>+	ret = kstrtouint(buf, 10, &amp;datum);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (datum &lt; 1 || datum &gt; 11)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='ctx'> 	*((__le16 *)&amp;cmd.data[0]) = cpu_to_le16(datum);</div><div class='ctx'> 	cmd.length = cpu_to_le16(sizeof(uint16_t));</div><div class='ctx'> 	ret = lbs_mesh_config_send(priv, &amp;cmd, CMD_ACT_MESH_CONFIG_SET,</div><div class='hunk'>@@ -510,13 +525,13 @@ static ssize_t channel_set(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * mesh_id_get - Get function for sysfs attribute mesh_id</div><div class='add'>+ * mesh_id_show - Get function for sysfs attribute mesh_id</div><div class='ctx'>  * @dev: the &amp;struct device</div><div class='ctx'>  * @attr: device attributes</div><div class='ctx'>  * @buf: buffer where data will be returned</div><div class='ctx'>  */</div><div class='del'>-static ssize_t mesh_id_get(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			   char *buf)</div><div class='add'>+static ssize_t mesh_id_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct mrvl_mesh_defaults defs;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -539,14 +554,14 @@ static ssize_t mesh_id_get(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * mesh_id_set - Set function for sysfs attribute mesh_id</div><div class='add'>+ * mesh_id_store - Set function for sysfs attribute mesh_id</div><div class='ctx'>  * @dev: the &amp;struct device</div><div class='ctx'>  * @attr: device attributes</div><div class='ctx'>  * @buf: buffer that contains new attribute value</div><div class='ctx'>  * @count: size of buffer</div><div class='ctx'>  */</div><div class='del'>-static ssize_t mesh_id_set(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			   const char *buf, size_t count)</div><div class='add'>+static ssize_t mesh_id_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct cmd_ds_mesh_config cmd;</div><div class='ctx'> 	struct mrvl_mesh_defaults defs;</div><div class='hunk'>@@ -585,13 +600,14 @@ static ssize_t mesh_id_set(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * protocol_id_get - Get function for sysfs attribute protocol_id</div><div class='add'>+ * protocol_id_show - Get function for sysfs attribute protocol_id</div><div class='ctx'>  * @dev: the &amp;struct device</div><div class='ctx'>  * @attr: device attributes</div><div class='ctx'>  * @buf: buffer where data will be returned</div><div class='ctx'>  */</div><div class='del'>-static ssize_t protocol_id_get(struct device *dev,</div><div class='del'>-			       struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t protocol_id_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='add'>+				char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct mrvl_mesh_defaults defs;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -601,18 +617,19 @@ static ssize_t protocol_id_get(struct device *dev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, 5, "%d\n", defs.meshie.val.active_protocol_id);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", defs.meshie.val.active_protocol_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * protocol_id_set - Set function for sysfs attribute protocol_id</div><div class='add'>+ * protocol_id_store - Set function for sysfs attribute protocol_id</div><div class='ctx'>  * @dev: the &amp;struct device</div><div class='ctx'>  * @attr: device attributes</div><div class='ctx'>  * @buf: buffer that contains new attribute value</div><div class='ctx'>  * @count: size of buffer</div><div class='ctx'>  */</div><div class='del'>-static ssize_t protocol_id_set(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+static ssize_t protocol_id_store(struct device *dev,</div><div class='add'>+				 struct device_attribute *attr,</div><div class='add'>+				 const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct cmd_ds_mesh_config cmd;</div><div class='ctx'> 	struct mrvl_mesh_defaults defs;</div><div class='hunk'>@@ -621,11 +638,14 @@ static ssize_t protocol_id_set(struct device *dev,</div><div class='ctx'> 	uint32_t datum;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-	ret = sscanf(buf, "%d", &amp;datum);</div><div class='del'>-	if ((ret != 1) || (datum &gt; 255))</div><div class='add'>+	ret = kstrtouint(buf, 10, &amp;datum);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (datum &gt; 255)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='add'>+</div><div class='ctx'> 	/* fetch all other Information Element parameters */</div><div class='ctx'> 	ret = mesh_get_default_parameters(dev, &amp;defs);</div><div class='ctx'> </div><div class='hunk'>@@ -646,13 +666,13 @@ static ssize_t protocol_id_set(struct device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * metric_id_get - Get function for sysfs attribute metric_id</div><div class='add'>+ * metric_id_show - Get function for sysfs attribute metric_id</div><div class='ctx'>  * @dev: the &amp;struct device</div><div class='ctx'>  * @attr: device attributes</div><div class='ctx'>  * @buf: buffer where data will be returned</div><div class='ctx'>  */</div><div class='del'>-static ssize_t metric_id_get(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t metric_id_show(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct mrvl_mesh_defaults defs;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -662,18 +682,19 @@ static ssize_t metric_id_get(struct device *dev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, 5, "%d\n", defs.meshie.val.active_metric_id);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", defs.meshie.val.active_metric_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * metric_id_set - Set function for sysfs attribute metric_id</div><div class='add'>+ * metric_id_store - Set function for sysfs attribute metric_id</div><div class='ctx'>  * @dev: the &amp;struct device</div><div class='ctx'>  * @attr: device attributes</div><div class='ctx'>  * @buf: buffer that contains new attribute value</div><div class='ctx'>  * @count: size of buffer</div><div class='ctx'>  */</div><div class='del'>-static ssize_t metric_id_set(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			     const char *buf, size_t count)</div><div class='add'>+static ssize_t metric_id_store(struct device *dev,</div><div class='add'>+			       struct device_attribute *attr,</div><div class='add'>+			       const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct cmd_ds_mesh_config cmd;</div><div class='ctx'> 	struct mrvl_mesh_defaults defs;</div><div class='hunk'>@@ -707,13 +728,13 @@ static ssize_t metric_id_set(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * capability_get - Get function for sysfs attribute capability</div><div class='add'>+ * capability_show - Get function for sysfs attribute capability</div><div class='ctx'>  * @dev: the &amp;struct device</div><div class='ctx'>  * @attr: device attributes</div><div class='ctx'>  * @buf: buffer where data will be returned</div><div class='ctx'>  */</div><div class='del'>-static ssize_t capability_get(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t capability_show(struct device *dev,</div><div class='add'>+			       struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct mrvl_mesh_defaults defs;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -723,18 +744,19 @@ static ssize_t capability_get(struct device *dev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, 5, "%d\n", defs.meshie.val.mesh_capability);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", defs.meshie.val.mesh_capability);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * capability_set - Set function for sysfs attribute capability</div><div class='add'>+ * capability_store - Set function for sysfs attribute capability</div><div class='ctx'>  * @dev: the &amp;struct device</div><div class='ctx'>  * @attr: device attributes</div><div class='ctx'>  * @buf: buffer that contains new attribute value</div><div class='ctx'>  * @count: size of buffer</div><div class='ctx'>  */</div><div class='del'>-static ssize_t capability_set(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			      const char *buf, size_t count)</div><div class='add'>+static ssize_t capability_store(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='add'>+				const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct cmd_ds_mesh_config cmd;</div><div class='ctx'> 	struct mrvl_mesh_defaults defs;</div><div class='hunk'>@@ -768,13 +790,13 @@ static ssize_t capability_set(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(bootflag, 0644, bootflag_get, bootflag_set);</div><div class='del'>-static DEVICE_ATTR(boottime, 0644, boottime_get, boottime_set);</div><div class='del'>-static DEVICE_ATTR(channel, 0644, channel_get, channel_set);</div><div class='del'>-static DEVICE_ATTR(mesh_id, 0644, mesh_id_get, mesh_id_set);</div><div class='del'>-static DEVICE_ATTR(protocol_id, 0644, protocol_id_get, protocol_id_set);</div><div class='del'>-static DEVICE_ATTR(metric_id, 0644, metric_id_get, metric_id_set);</div><div class='del'>-static DEVICE_ATTR(capability, 0644, capability_get, capability_set);</div><div class='add'>+static DEVICE_ATTR_RW(bootflag);</div><div class='add'>+static DEVICE_ATTR_RW(boottime);</div><div class='add'>+static DEVICE_ATTR_RW(channel);</div><div class='add'>+static DEVICE_ATTR_RW(mesh_id);</div><div class='add'>+static DEVICE_ATTR_RW(protocol_id);</div><div class='add'>+static DEVICE_ATTR_RW(metric_id);</div><div class='add'>+static DEVICE_ATTR_RW(capability);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *boot_opts_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_bootflag.attr,</div><div class='hunk'>@@ -801,24 +823,6 @@ static const struct attribute_group mesh_ie_group = {</div><div class='ctx'> 	.attrs = mesh_ie_attrs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void lbs_persist_config_init(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	ret = sysfs_create_group(&amp;(dev-&gt;dev.kobj), &amp;boot_opts_group);</div><div class='del'>-	if (ret)</div><div class='del'>-		pr_err("failed to create boot_opts_group.\n");</div><div class='del'>-</div><div class='del'>-	ret = sysfs_create_group(&amp;(dev-&gt;dev.kobj), &amp;mesh_ie_group);</div><div class='del'>-	if (ret)</div><div class='del'>-		pr_err("failed to create mesh_ie_group.\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void lbs_persist_config_remove(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	sysfs_remove_group(&amp;(dev-&gt;dev.kobj), &amp;boot_opts_group);</div><div class='del'>-	sysfs_remove_group(&amp;(dev-&gt;dev.kobj), &amp;mesh_ie_group);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************</div><div class='ctx'>  * Initializing and starting, stopping mesh</div><div class='hunk'>@@ -997,8 +1001,8 @@ static int lbs_add_mesh(struct lbs_private *priv)</div><div class='ctx'> 	mesh_wdev-&gt;wiphy = priv-&gt;wdev-&gt;wiphy;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;mesh_tlv) {</div><div class='del'>-		sprintf(mesh_wdev-&gt;ssid, "mesh");</div><div class='del'>-		mesh_wdev-&gt;mesh_id_up_len = 4;</div><div class='add'>+		sprintf(mesh_wdev-&gt;u.mesh.id, "mesh");</div><div class='add'>+		mesh_wdev-&gt;u.mesh.id_up_len = 4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mesh_wdev-&gt;netdev = mesh_dev;</div><div class='hunk'>@@ -1014,6 +1018,10 @@ static int lbs_add_mesh(struct lbs_private *priv)</div><div class='ctx'> 	SET_NETDEV_DEV(priv-&gt;mesh_dev, priv-&gt;dev-&gt;dev.parent);</div><div class='ctx'> </div><div class='ctx'> 	mesh_dev-&gt;flags |= IFF_BROADCAST | IFF_MULTICAST;</div><div class='add'>+	mesh_dev-&gt;sysfs_groups[0] = &amp;lbs_mesh_attr_group;</div><div class='add'>+	mesh_dev-&gt;sysfs_groups[1] = &amp;boot_opts_group;</div><div class='add'>+	mesh_dev-&gt;sysfs_groups[2] = &amp;mesh_ie_group;</div><div class='add'>+</div><div class='ctx'> 	/* Register virtual mesh interface */</div><div class='ctx'> 	ret = register_netdev(mesh_dev);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -1021,19 +1029,10 @@ static int lbs_add_mesh(struct lbs_private *priv)</div><div class='ctx'> 		goto err_free_netdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = sysfs_create_group(&amp;(mesh_dev-&gt;dev.kobj), &amp;lbs_mesh_attr_group);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_unregister;</div><div class='del'>-</div><div class='del'>-	lbs_persist_config_init(mesh_dev);</div><div class='del'>-</div><div class='ctx'> 	/* Everything successful */</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> 	goto done;</div><div class='ctx'> </div><div class='del'>-err_unregister:</div><div class='del'>-	unregister_netdev(mesh_dev);</div><div class='del'>-</div><div class='ctx'> err_free_netdev:</div><div class='ctx'> 	free_netdev(mesh_dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1054,8 +1053,6 @@ void lbs_remove_mesh(struct lbs_private *priv)</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(mesh_dev);</div><div class='ctx'> 	netif_carrier_off(mesh_dev);</div><div class='del'>-	sysfs_remove_group(&amp;(mesh_dev-&gt;dev.kobj), &amp;lbs_mesh_attr_group);</div><div class='del'>-	lbs_persist_config_remove(mesh_dev);</div><div class='ctx'> 	unregister_netdev(mesh_dev);</div><div class='ctx'> 	priv-&gt;mesh_dev = NULL;</div><div class='ctx'> 	kfree(mesh_dev-&gt;ieee80211_ptr);</div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas/mesh.h b/drivers/net/wireless/marvell/libertas/mesh.h<br/>index 44c4cd0230a8..e37db10e82a9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/mesh.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/mesh.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/mesh.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas/mesh.h</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #include &lt;net/iw_handler.h&gt;</div><div class='del'>-#include &lt;net/lib80211.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "host.h"</div><div class='ctx'> #include "dev.h"</div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas/radiotap.h b/drivers/net/wireless/marvell/libertas/radiotap.h<br/>index 1ed5608d353f..d543bfe739dc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/radiotap.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/radiotap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/radiotap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas/radiotap.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> #include &lt;net/ieee80211_radiotap.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct tx_radiotap_hdr {</div><div class='del'>-	struct ieee80211_radiotap_header hdr;</div><div class='add'>+	struct ieee80211_radiotap_header_fixed hdr;</div><div class='ctx'> 	u8 rate;</div><div class='ctx'> 	u8 txpower;</div><div class='ctx'> 	u8 rts_retries;</div><div class='hunk'>@@ -31,7 +31,7 @@ struct tx_radiotap_hdr {</div><div class='ctx'> #define IEEE80211_FC_DSTODS          0x0300</div><div class='ctx'> </div><div class='ctx'> struct rx_radiotap_hdr {</div><div class='del'>-	struct ieee80211_radiotap_header hdr;</div><div class='add'>+	struct ieee80211_radiotap_header_fixed hdr;</div><div class='ctx'> 	u8 flags;</div><div class='ctx'> 	u8 rate;</div><div class='ctx'> 	u8 antsignal;</div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas/rx.c b/drivers/net/wireless/marvell/libertas/rx.c<br/>index 9f24b0760e1f..c34d30f7cbe0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/rx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/rx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/rx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas/rx.c</a></div><div class='hunk'>@@ -147,7 +147,7 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb)</div><div class='ctx'> 	dev-&gt;stats.rx_packets++;</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='del'>-	netif_rx_any_context(skb);</div><div class='add'>+	netif_rx(skb);</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> done:</div><div class='hunk'>@@ -262,7 +262,7 @@ static int process_rxed_802_11_packet(struct lbs_private *priv,</div><div class='ctx'> 	dev-&gt;stats.rx_packets++;</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;protocol = eth_type_trans(skb, priv-&gt;dev);</div><div class='del'>-	netif_rx_any_context(skb);</div><div class='add'>+	netif_rx(skb);</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas/tx.c b/drivers/net/wireless/marvell/libertas/tx.c<br/>index aeb481740df6..27304a98787d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/tx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/tx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/tx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas/tx.c</a></div><div class='hunk'>@@ -113,6 +113,7 @@ netdev_tx_t lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	p802x_hdr = skb-&gt;data;</div><div class='ctx'> 	pkt_len = skb-&gt;len;</div><div class='ctx'> </div><div class='add'>+	BUILD_BUG_ON(sizeof(txpd-&gt;tx_dest_addr) != ETH_ALEN);</div><div class='ctx'> 	if (priv-&gt;wdev-&gt;iftype == NL80211_IFTYPE_MONITOR) {</div><div class='ctx'> 		struct tx_radiotap_hdr *rtap_hdr = (void *)skb-&gt;data;</div><div class='ctx'> </div><div class='hunk'>@@ -124,10 +125,10 @@ netdev_tx_t lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		pkt_len -= sizeof(*rtap_hdr);</div><div class='ctx'> </div><div class='ctx'> 		/* copy destination address from 802.11 header */</div><div class='del'>-		memcpy(txpd-&gt;tx_dest_addr_high, p802x_hdr + 4, ETH_ALEN);</div><div class='add'>+		memcpy(&amp;txpd-&gt;tx_dest_addr, p802x_hdr + 4, ETH_ALEN);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* copy destination address from 802.3 header */</div><div class='del'>-		memcpy(txpd-&gt;tx_dest_addr_high, p802x_hdr, ETH_ALEN);</div><div class='add'>+		memcpy(&amp;txpd-&gt;tx_dest_addr, p802x_hdr, ETH_ALEN);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	txpd-&gt;tx_packet_length = cpu_to_le16(pkt_len);</div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas/types.h b/drivers/net/wireless/marvell/libertas/types.h<br/>index cd4ceb6f885d..bad38d312d0d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/types.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas/types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas/types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas/types.h</a></div><div class='hunk'>@@ -93,6 +93,7 @@ union ieee_phy_param_set {</div><div class='ctx'> #define TLV_TYPE_TSFTIMESTAMP	    (PROPRIETARY_TLV_BASE_ID + 19)</div><div class='ctx'> #define TLV_TYPE_RSSI_HIGH          (PROPRIETARY_TLV_BASE_ID + 22)</div><div class='ctx'> #define TLV_TYPE_SNR_HIGH           (PROPRIETARY_TLV_BASE_ID + 23)</div><div class='add'>+#define TLV_TYPE_WPS_ENROLLEE       (PROPRIETARY_TLV_BASE_ID + 27)</div><div class='ctx'> #define TLV_TYPE_AUTH_TYPE          (PROPRIETARY_TLV_BASE_ID + 31)</div><div class='ctx'> #define TLV_TYPE_MESH_ID            (PROPRIETARY_TLV_BASE_ID + 37)</div><div class='ctx'> #define TLV_TYPE_OLD_MESH_ID        (PROPRIETARY_TLV_BASE_ID + 291)</div><div class='hunk'>@@ -105,23 +106,23 @@ struct mrvl_ie_header {</div><div class='ctx'> </div><div class='ctx'> struct mrvl_ie_data {</div><div class='ctx'> 	struct mrvl_ie_header header;</div><div class='del'>-	u8 Data[1];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct mrvl_ie_rates_param_set {</div><div class='ctx'> 	struct mrvl_ie_header header;</div><div class='del'>-	u8 rates[1];</div><div class='add'>+	u8 rates[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct mrvl_ie_ssid_param_set {</div><div class='ctx'> 	struct mrvl_ie_header header;</div><div class='del'>-	u8 ssid[1];</div><div class='add'>+	u8 ssid[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct mrvl_ie_wildcard_ssid_param_set {</div><div class='ctx'> 	struct mrvl_ie_header header;</div><div class='del'>-	u8 MaxSsidlength;</div><div class='del'>-	u8 ssid[1];</div><div class='add'>+	u8 maxssidlength;</div><div class='add'>+	u8 ssid[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct chanscanmode {</div><div class='hunk'>@@ -146,7 +147,7 @@ struct chanscanparamset {</div><div class='ctx'> </div><div class='ctx'> struct mrvl_ie_chanlist_param_set {</div><div class='ctx'> 	struct mrvl_ie_header header;</div><div class='del'>-	struct chanscanparamset chanscanparam[1];</div><div class='add'>+	struct chanscanparamset chanscanparam[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct mrvl_ie_cf_param_set {</div><div class='hunk'>@@ -164,12 +165,12 @@ struct mrvl_ie_ds_param_set {</div><div class='ctx'> </div><div class='ctx'> struct mrvl_ie_rsn_param_set {</div><div class='ctx'> 	struct mrvl_ie_header header;</div><div class='del'>-	u8 rsnie[1];</div><div class='add'>+	u8 rsnie[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct mrvl_ie_tsf_timestamp {</div><div class='ctx'> 	struct mrvl_ie_header header;</div><div class='del'>-	__le64 tsftable[1];</div><div class='add'>+	__le64 tsftable[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* v9 and later firmware only */</div><div class='hunk'>@@ -220,7 +221,7 @@ struct led_pin {</div><div class='ctx'> </div><div class='ctx'> struct mrvl_ie_ledgpio {</div><div class='ctx'> 	struct mrvl_ie_header header;</div><div class='del'>-	struct led_pin ledpin[1];</div><div class='add'>+	struct led_pin ledpin[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct led_bhv {</div><div class='hunk'>@@ -233,7 +234,7 @@ struct led_bhv {</div><div class='ctx'> </div><div class='ctx'> struct mrvl_ie_ledbhv {</div><div class='ctx'> 	struct mrvl_ie_header header;</div><div class='del'>-	struct led_bhv ledbhv[1];</div><div class='add'>+	struct led_bhv ledbhv[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas_tf/cmd.c b/drivers/net/wireless/marvell/libertas_tf/cmd.c<br/>index efb98304555a..7fc1bdb6c458 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas_tf/cmd.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas_tf/cmd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas_tf/cmd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas_tf/cmd.c</a></div><div class='hunk'>@@ -757,7 +757,7 @@ int lbtf_process_rx_command(struct lbtf_private *priv)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Now we got response from FW, cancel the command timer */</div><div class='del'>-	del_timer(&amp;priv-&gt;command_timer);</div><div class='add'>+	timer_delete(&amp;priv-&gt;command_timer);</div><div class='ctx'> 	priv-&gt;cmd_timed_out = 0;</div><div class='ctx'> 	if (priv-&gt;nr_retries)</div><div class='ctx'> 		priv-&gt;nr_retries = 0;</div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas_tf/if_usb.c b/drivers/net/wireless/marvell/libertas_tf/if_usb.c<br/>index a92916dc81a9..5662a244f82a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas_tf/if_usb.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas_tf/if_usb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas_tf/if_usb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas_tf/if_usb.c</a></div><div class='hunk'>@@ -48,7 +48,7 @@ static int if_usb_submit_rx_urb(struct if_usb_card *cardp);</div><div class='ctx'> static int if_usb_reset_device(struct lbtf_private *priv);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  if_usb_wrike_bulk_callback -  call back to handle URB status</div><div class='add'>+ *  if_usb_write_bulk_callback -  call back to handle URB status</div><div class='ctx'>  *</div><div class='ctx'>  *  @urb:		pointer to urb structure</div><div class='ctx'>  */</div><div class='hunk'>@@ -113,7 +113,7 @@ static void if_usb_setup_firmware(struct lbtf_private *priv)</div><div class='ctx'> </div><div class='ctx'> static void if_usb_fw_timeo(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct if_usb_card *cardp = from_timer(cardp, t, fw_timeout);</div><div class='add'>+	struct if_usb_card *cardp = timer_container_of(cardp, t, fw_timeout);</div><div class='ctx'> </div><div class='ctx'> 	lbtf_deb_enter(LBTF_DEB_USB);</div><div class='ctx'> 	if (!cardp-&gt;fwdnldover) {</div><div class='hunk'>@@ -230,6 +230,7 @@ static int if_usb_probe(struct usb_interface *intf,</div><div class='ctx'> </div><div class='ctx'> dealloc:</div><div class='ctx'> 	if_usb_free(cardp);</div><div class='add'>+	kfree(cardp);</div><div class='ctx'> error:</div><div class='ctx'> lbtf_deb_leave(LBTF_DEB_MAIN);</div><div class='ctx'> 	return -ENOMEM;</div><div class='hunk'>@@ -254,6 +255,7 @@ static void if_usb_disconnect(struct usb_interface *intf)</div><div class='ctx'> </div><div class='ctx'> 	/* Unlink and free urb */</div><div class='ctx'> 	if_usb_free(cardp);</div><div class='add'>+	kfree(cardp);</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata(intf, NULL);</div><div class='ctx'> 	usb_put_dev(interface_to_usbdev(intf));</div><div class='hunk'>@@ -611,7 +613,7 @@ static inline void process_cmdrequest(int recvlength, uint8_t *recvbuff,</div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;driver_lock, flags);</div><div class='ctx'> 	memcpy(priv-&gt;cmd_resp_buff, recvbuff + MESSAGE_HEADER_LEN,</div><div class='ctx'> 	       recvlength - MESSAGE_HEADER_LEN);</div><div class='del'>-	kfree_skb(skb);</div><div class='add'>+	dev_kfree_skb_irq(skb);</div><div class='ctx'> 	lbtf_cmd_response_rx(priv);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;driver_lock, flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -873,7 +875,7 @@ restart:</div><div class='ctx'> 	wait_event_interruptible(cardp-&gt;fw_wq, cardp-&gt;priv-&gt;surpriseremoved ||</div><div class='ctx'> 					       cardp-&gt;fwdnldover);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;cardp-&gt;fw_timeout);</div><div class='add'>+	timer_delete_sync(&amp;cardp-&gt;fw_timeout);</div><div class='ctx'> 	usb_kill_urb(cardp-&gt;rx_urb);</div><div class='ctx'> </div><div class='ctx'> 	if (!cardp-&gt;fwdnldover) {</div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas_tf/libertas_tf.h b/drivers/net/wireless/marvell/libertas_tf/libertas_tf.h<br/>index 5d726545d987..a5d4c09fb918 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas_tf/libertas_tf.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas_tf/libertas_tf.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas_tf/libertas_tf.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas_tf/libertas_tf.h</a></div><div class='hunk'>@@ -268,10 +268,12 @@ struct txpd {</div><div class='ctx'> 	__le32 tx_packet_location;</div><div class='ctx'> 	/* Tx packet length */</div><div class='ctx'> 	__le16 tx_packet_length;</div><div class='del'>-	/* First 2 byte of destination MAC address */</div><div class='del'>-	u8 tx_dest_addr_high[2];</div><div class='del'>-	/* Last 4 byte of destination MAC address */</div><div class='del'>-	u8 tx_dest_addr_low[4];</div><div class='add'>+	struct_group_attr(tx_dest_addr, __packed,</div><div class='add'>+		/* First 2 byte of destination MAC address */</div><div class='add'>+		u8 tx_dest_addr_high[2];</div><div class='add'>+		/* Last 4 byte of destination MAC address */</div><div class='add'>+		u8 tx_dest_addr_low[4];</div><div class='add'>+	);</div><div class='ctx'> 	/* Pkt Priority */</div><div class='ctx'> 	u8 priority;</div><div class='ctx'> 	/* Pkt Trasnit Power control */</div><div class='hunk'>@@ -280,7 +282,7 @@ struct txpd {</div><div class='ctx'> 	u8 pktdelay_2ms;</div><div class='ctx'> 	/* reserved */</div><div class='ctx'> 	u8 reserved1;</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> /* RxPD Descriptor */</div><div class='ctx'> struct rxpd {</div><div class='hunk'>@@ -311,7 +313,7 @@ struct rxpd {</div><div class='ctx'> 	/* Pkt Priority */</div><div class='ctx'> 	u8 priority;</div><div class='ctx'> 	u8 reserved[3];</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct cmd_header {</div><div class='ctx'> 	__le16 command;</div><div class='hunk'>@@ -377,14 +379,14 @@ struct cmd_ds_mac_control {</div><div class='ctx'> 	struct cmd_header hdr;</div><div class='ctx'> 	__le16 action;</div><div class='ctx'> 	u16 reserved;</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct cmd_ds_802_11_mac_address {</div><div class='ctx'> 	struct cmd_header hdr;</div><div class='ctx'> </div><div class='ctx'> 	__le16 action;</div><div class='ctx'> 	uint8_t macadd[ETH_ALEN];</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct cmd_ds_mac_multicast_addr {</div><div class='ctx'> 	struct cmd_header hdr;</div><div class='hunk'>@@ -392,27 +394,27 @@ struct cmd_ds_mac_multicast_addr {</div><div class='ctx'> 	__le16 action;</div><div class='ctx'> 	__le16 nr_of_adrs;</div><div class='ctx'> 	u8 maclist[ETH_ALEN * MRVDRV_MAX_MULTICAST_LIST_SIZE];</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct cmd_ds_set_mode {</div><div class='ctx'> 	struct cmd_header hdr;</div><div class='ctx'> </div><div class='ctx'> 	__le16 mode;</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct cmd_ds_set_bssid {</div><div class='ctx'> 	struct cmd_header hdr;</div><div class='ctx'> </div><div class='ctx'> 	u8 bssid[6];</div><div class='ctx'> 	u8 activate;</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct cmd_ds_802_11_radio_control {</div><div class='ctx'> 	struct cmd_header hdr;</div><div class='ctx'> </div><div class='ctx'> 	__le16 action;</div><div class='ctx'> 	__le16 control;</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct cmd_ds_802_11_rf_channel {</div><div class='hunk'>@@ -423,20 +425,20 @@ struct cmd_ds_802_11_rf_channel {</div><div class='ctx'> 	__le16 rftype;      /* unused */</div><div class='ctx'> 	__le16 reserved;    /* unused */</div><div class='ctx'> 	u8 channellist[32]; /* unused */</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct cmd_ds_set_boot2_ver {</div><div class='ctx'> 	struct cmd_header hdr;</div><div class='ctx'> </div><div class='ctx'> 	__le16 action;</div><div class='ctx'> 	__le16 version;</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct cmd_ds_802_11_reset {</div><div class='ctx'> 	struct cmd_header hdr;</div><div class='ctx'> </div><div class='ctx'> 	__le16 action;</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct cmd_ds_802_11_beacon_control {</div><div class='ctx'> 	struct cmd_header hdr;</div><div class='hunk'>@@ -444,14 +446,14 @@ struct cmd_ds_802_11_beacon_control {</div><div class='ctx'> 	__le16 action;</div><div class='ctx'> 	__le16 beacon_enable;</div><div class='ctx'> 	__le16 beacon_period;</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct cmd_ds_802_11_beacon_set {</div><div class='ctx'> 	struct cmd_header hdr;</div><div class='ctx'> </div><div class='ctx'> 	__le16 len;</div><div class='ctx'> 	u8 beacon[MRVL_MAX_BCN_SIZE];</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct cmd_ctrl_node;</div><div class='ctx'> </div><div class='hunk'>@@ -482,12 +484,9 @@ void lbtf_complete_command(struct lbtf_private *priv, struct cmd_ctrl_node *cmd,</div><div class='ctx'> void lbtf_cmd_response_rx(struct lbtf_private *priv);</div><div class='ctx'> </div><div class='ctx'> /* main.c */</div><div class='del'>-struct chan_freq_power *lbtf_get_region_cfp_table(u8 region,</div><div class='del'>-	int *cfp_no);</div><div class='ctx'> struct lbtf_private *lbtf_add_card(void *card, struct device *dmdev,</div><div class='ctx'> 				   const struct lbtf_ops *ops);</div><div class='ctx'> int lbtf_remove_card(struct lbtf_private *priv);</div><div class='del'>-int lbtf_start_card(struct lbtf_private *priv);</div><div class='ctx'> int lbtf_rx(struct lbtf_private *priv, struct sk_buff *skb);</div><div class='ctx'> void lbtf_send_tx_feedback(struct lbtf_private *priv, u8 retrycnt, u8 fail);</div><div class='ctx'> void lbtf_bcn_sent(struct lbtf_private *priv);</div><div class='head'>diff --git a/drivers/net/wireless/marvell/libertas_tf/main.c b/drivers/net/wireless/marvell/libertas_tf/main.c<br/>index 71492211904b..fb20fe31cd36 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas_tf/main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/libertas_tf/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/libertas_tf/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/libertas_tf/main.c</a></div><div class='hunk'>@@ -126,7 +126,7 @@ static void lbtf_cmd_work(struct work_struct *work)</div><div class='ctx'>  */</div><div class='ctx'> static void command_timer_fn(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct lbtf_private *priv = from_timer(priv, t, command_timer);</div><div class='add'>+	struct lbtf_private *priv = timer_container_of(priv, t, command_timer);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	lbtf_deb_enter(LBTF_DEB_CMD);</div><div class='ctx'> </div><div class='hunk'>@@ -174,7 +174,7 @@ static void lbtf_free_adapter(struct lbtf_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	lbtf_deb_enter(LBTF_DEB_MAIN);</div><div class='ctx'> 	lbtf_free_cmd_buffer(priv);</div><div class='del'>-	del_timer(&amp;priv-&gt;command_timer);</div><div class='add'>+	timer_delete(&amp;priv-&gt;command_timer);</div><div class='ctx'> 	lbtf_deb_leave(LBTF_DEB_MAIN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -232,7 +232,8 @@ static void lbtf_tx_work(struct work_struct *work)</div><div class='ctx'> 			     ieee80211_get_tx_rate(priv-&gt;hw, info)-&gt;hw_value);</div><div class='ctx'> </div><div class='ctx'> 	/* copy destination address from 802.11 header */</div><div class='del'>-	memcpy(txpd-&gt;tx_dest_addr_high, skb-&gt;data + sizeof(struct txpd) + 4,</div><div class='add'>+	BUILD_BUG_ON(sizeof(txpd-&gt;tx_dest_addr) != ETH_ALEN);</div><div class='add'>+	memcpy(&amp;txpd-&gt;tx_dest_addr, skb-&gt;data + sizeof(struct txpd) + 4,</div><div class='ctx'> 		ETH_ALEN);</div><div class='ctx'> 	txpd-&gt;tx_packet_length = cpu_to_le16(len);</div><div class='ctx'> 	txpd-&gt;tx_packet_location = cpu_to_le32(sizeof(struct txpd));</div><div class='hunk'>@@ -266,7 +267,7 @@ static int lbtf_op_start(struct ieee80211_hw *hw)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void lbtf_op_stop(struct ieee80211_hw *hw)</div><div class='add'>+static void lbtf_op_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct lbtf_private *priv = hw-&gt;priv;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -336,7 +337,7 @@ static void lbtf_op_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	lbtf_deb_leave(LBTF_DEB_MACOPS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lbtf_op_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+static int lbtf_op_config(struct ieee80211_hw *hw, int radio_idx, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct lbtf_private *priv = hw-&gt;priv;</div><div class='ctx'> 	struct ieee80211_conf *conf = &amp;hw-&gt;conf;</div><div class='hunk'>@@ -416,7 +417,7 @@ static void lbtf_op_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> static void lbtf_op_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 			struct ieee80211_vif *vif,</div><div class='ctx'> 			struct ieee80211_bss_conf *bss_conf,</div><div class='del'>-			u32 changes)</div><div class='add'>+			u64 changes)</div><div class='ctx'> {</div><div class='ctx'> 	struct lbtf_private *priv = hw-&gt;priv;</div><div class='ctx'> 	struct sk_buff *beacon;</div><div class='hunk'>@@ -426,7 +427,7 @@ static void lbtf_op_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 		switch (priv-&gt;vif-&gt;type) {</div><div class='ctx'> 		case NL80211_IFTYPE_AP:</div><div class='ctx'> 		case NL80211_IFTYPE_MESH_POINT:</div><div class='del'>-			beacon = ieee80211_beacon_get(hw, vif);</div><div class='add'>+			beacon = ieee80211_beacon_get(hw, vif, 0);</div><div class='ctx'> 			if (beacon) {</div><div class='ctx'> 				lbtf_beacon_set(priv, beacon);</div><div class='ctx'> 				kfree_skb(beacon);</div><div class='hunk'>@@ -472,7 +473,12 @@ static int lbtf_op_get_survey(struct ieee80211_hw *hw, int idx,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ieee80211_ops lbtf_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.tx			= lbtf_op_tx,</div><div class='add'>+	.wake_tx_queue		= ieee80211_handle_wake_tx_queue,</div><div class='ctx'> 	.start			= lbtf_op_start,</div><div class='ctx'> 	.stop			= lbtf_op_stop,</div><div class='ctx'> 	.add_interface		= lbtf_op_add_interface,</div><div class='hunk'>@@ -636,7 +642,7 @@ int lbtf_remove_card(struct lbtf_private *priv)</div><div class='ctx'> 	lbtf_deb_enter(LBTF_DEB_MAIN);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;surpriseremoved = 1;</div><div class='del'>-	del_timer(&amp;priv-&gt;command_timer);</div><div class='add'>+	timer_delete(&amp;priv-&gt;command_timer);</div><div class='ctx'> 	lbtf_free_adapter(priv);</div><div class='ctx'> 	priv-&gt;hw = NULL;</div><div class='ctx'> 	ieee80211_unregister_hw(hw);</div><div class='hunk'>@@ -690,7 +696,7 @@ void lbtf_bcn_sent(struct lbtf_private *priv)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb = ieee80211_beacon_get(priv-&gt;hw, priv-&gt;vif);</div><div class='add'>+	skb = ieee80211_beacon_get(priv-&gt;hw, priv-&gt;vif, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (skb) {</div><div class='ctx'> 		lbtf_beacon_set(priv, skb);</div><div class='hunk'>@@ -702,7 +708,7 @@ EXPORT_SYMBOL_GPL(lbtf_bcn_sent);</div><div class='ctx'> static int __init lbtf_init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	lbtf_deb_enter(LBTF_DEB_MAIN);</div><div class='del'>-	lbtf_wq = alloc_workqueue("libertastf", WQ_MEM_RECLAIM, 0);</div><div class='add'>+	lbtf_wq = alloc_workqueue("libertastf", WQ_MEM_RECLAIM | WQ_UNBOUND, 0);</div><div class='ctx'> 	if (lbtf_wq == NULL) {</div><div class='ctx'> 		printk(KERN_ERR "libertastf: couldn't create workqueue\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/11ac.c b/drivers/net/wireless/marvell/mwifiex/11ac.c<br/>index 756f019ef28a..b9278d996c56 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/11ac.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/11ac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/11ac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/11ac.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: 802.11ac</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "decl.h"</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/11ac.h b/drivers/net/wireless/marvell/mwifiex/11ac.h<br/>index 29e83468cf3f..65a88d6d8b88 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/11ac.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/11ac.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/11ac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/11ac.h</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: 802.11ac</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _MWIFIEX_11AC_H_</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/11h.c b/drivers/net/wireless/marvell/mwifiex/11h.c<br/>index d2ee6469e67b..032b93a41d99 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/11h.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/11h.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/11h.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/11h.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: 802.11h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='hunk'>@@ -129,12 +117,12 @@ void mwifiex_dfs_cac_work_queue(struct work_struct *work)</div><div class='ctx'> 				     dfs_cac_work);</div><div class='ctx'> </div><div class='ctx'> 	chandef = priv-&gt;dfs_chandef;</div><div class='del'>-	if (priv-&gt;wdev.cac_started) {</div><div class='add'>+	if (priv-&gt;wdev.links[0].cac_started) {</div><div class='ctx'> 		mwifiex_dbg(priv-&gt;adapter, MSG,</div><div class='ctx'> 			    "CAC timer finished; No radar detected\n");</div><div class='ctx'> 		cfg80211_cac_event(priv-&gt;netdev, &amp;chandef,</div><div class='ctx'> 				   NL80211_RADAR_CAC_FINISHED,</div><div class='del'>-				   GFP_KERNEL);</div><div class='add'>+				   GFP_KERNEL, 0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -186,7 +174,7 @@ int mwifiex_stop_radar_detection(struct mwifiex_private *priv,</div><div class='ctx'>  */</div><div class='ctx'> void mwifiex_abort_cac(struct mwifiex_private *priv)</div><div class='ctx'> {</div><div class='del'>-	if (priv-&gt;wdev.cac_started) {</div><div class='add'>+	if (priv-&gt;wdev.links[0].cac_started) {</div><div class='ctx'> 		if (mwifiex_stop_radar_detection(priv, &amp;priv-&gt;dfs_chandef))</div><div class='ctx'> 			mwifiex_dbg(priv-&gt;adapter, ERROR,</div><div class='ctx'> 				    "failed to stop CAC in FW\n");</div><div class='hunk'>@@ -194,7 +182,8 @@ void mwifiex_abort_cac(struct mwifiex_private *priv)</div><div class='ctx'> 			    "Aborting delayed work for CAC.\n");</div><div class='ctx'> 		cancel_delayed_work_sync(&amp;priv-&gt;dfs_cac_work);</div><div class='ctx'> 		cfg80211_cac_event(priv-&gt;netdev, &amp;priv-&gt;dfs_chandef,</div><div class='del'>-				   NL80211_RADAR_CAC_ABORTED, GFP_KERNEL);</div><div class='add'>+				   NL80211_RADAR_CAC_ABORTED, GFP_KERNEL,</div><div class='add'>+				   0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -207,7 +196,6 @@ int mwifiex_11h_handle_chanrpt_ready(struct mwifiex_private *priv,</div><div class='ctx'> {</div><div class='ctx'> 	struct host_cmd_ds_chan_rpt_event *rpt_event;</div><div class='ctx'> 	struct mwifiex_ie_types_chan_rpt_data *rpt;</div><div class='del'>-	u8 *evt_buf;</div><div class='ctx'> 	u16 event_len, tlv_len;</div><div class='ctx'> </div><div class='ctx'> 	rpt_event = (void *)(skb-&gt;data + sizeof(u32));</div><div class='hunk'>@@ -220,8 +208,6 @@ int mwifiex_11h_handle_chanrpt_ready(struct mwifiex_private *priv,</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	evt_buf = (void *)&amp;rpt_event-&gt;tlvbuf;</div><div class='del'>-</div><div class='ctx'> 	while (event_len &gt;= sizeof(struct mwifiex_ie_types_header)) {</div><div class='ctx'> 		rpt = (void *)&amp;rpt_event-&gt;tlvbuf;</div><div class='ctx'> 		tlv_len = le16_to_cpu(rpt-&gt;header.len);</div><div class='hunk'>@@ -236,14 +222,13 @@ int mwifiex_11h_handle_chanrpt_ready(struct mwifiex_private *priv,</div><div class='ctx'> 				cfg80211_cac_event(priv-&gt;netdev,</div><div class='ctx'> 						   &amp;priv-&gt;dfs_chandef,</div><div class='ctx'> 						   NL80211_RADAR_DETECTED,</div><div class='del'>-						   GFP_KERNEL);</div><div class='add'>+						   GFP_KERNEL, 0);</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		evt_buf += (tlv_len + sizeof(rpt-&gt;header));</div><div class='ctx'> 		event_len -= (tlv_len + sizeof(rpt-&gt;header));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -303,5 +288,7 @@ void mwifiex_dfs_chan_sw_work_queue(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	mwifiex_dbg(priv-&gt;adapter, MSG,</div><div class='ctx'> 		    "indicating channel switch completion to kernel\n");</div><div class='del'>-	cfg80211_ch_switch_notify(priv-&gt;netdev, &amp;priv-&gt;dfs_chandef);</div><div class='add'>+	wiphy_lock(priv-&gt;wdev.wiphy);</div><div class='add'>+	cfg80211_ch_switch_notify(priv-&gt;netdev, &amp;priv-&gt;dfs_chandef, 0);</div><div class='add'>+	wiphy_unlock(priv-&gt;wdev.wiphy);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/11n.c b/drivers/net/wireless/marvell/mwifiex/11n.c<br/>index 6696bce56178..66f0f5377ac1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/11n.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/11n.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/11n.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/11n.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: 802.11n</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "decl.h"</div><div class='hunk'>@@ -125,7 +113,7 @@ int mwifiex_ret_11n_delba(struct mwifiex_private *priv,</div><div class='ctx'> 					   tx_ba_tbl-&gt;ra);</div><div class='ctx'> 	} else { /*</div><div class='ctx'> 		  * In case of failure, recreate the deleted stream in case</div><div class='del'>-		  * we initiated the ADDBA</div><div class='add'>+		  * we initiated the DELBA</div><div class='ctx'> 		  */</div><div class='ctx'> 		if (!INITIATOR_BIT(del_ba_param_set))</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -404,12 +392,10 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv,</div><div class='ctx'> </div><div class='ctx'> 		chan_list =</div><div class='ctx'> 			(struct mwifiex_ie_types_chan_list_param_set *) *buffer;</div><div class='del'>-		memset(chan_list, 0,</div><div class='del'>-		       sizeof(struct mwifiex_ie_types_chan_list_param_set));</div><div class='add'>+		memset(chan_list, 0, struct_size(chan_list, chan_scan_param, 1));</div><div class='ctx'> 		chan_list-&gt;header.type = cpu_to_le16(TLV_TYPE_CHANLIST);</div><div class='del'>-		chan_list-&gt;header.len = cpu_to_le16(</div><div class='del'>-			sizeof(struct mwifiex_ie_types_chan_list_param_set) -</div><div class='del'>-			sizeof(struct mwifiex_ie_types_header));</div><div class='add'>+		chan_list-&gt;header.len =</div><div class='add'>+			cpu_to_le16(sizeof(struct mwifiex_chan_scan_param_set));</div><div class='ctx'> 		chan_list-&gt;chan_scan_param[0].chan_number =</div><div class='ctx'> 			bss_desc-&gt;bcn_ht_oper-&gt;primary_chan;</div><div class='ctx'> 		chan_list-&gt;chan_scan_param[0].radio_type =</div><div class='hunk'>@@ -423,8 +409,8 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv,</div><div class='ctx'> 					  (bss_desc-&gt;bcn_ht_oper-&gt;ht_param &amp;</div><div class='ctx'> 					  IEEE80211_HT_PARAM_CHA_SEC_OFFSET));</div><div class='ctx'> </div><div class='del'>-		*buffer += sizeof(struct mwifiex_ie_types_chan_list_param_set);</div><div class='del'>-		ret_len += sizeof(struct mwifiex_ie_types_chan_list_param_set);</div><div class='add'>+		*buffer += struct_size(chan_list, chan_scan_param, 1);</div><div class='add'>+		ret_len += struct_size(chan_list, chan_scan_param, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (bss_desc-&gt;bcn_bss_co_2040) {</div><div class='hunk'>@@ -657,14 +643,15 @@ int mwifiex_send_delba(struct mwifiex_private *priv, int tid, u8 *peer_mac,</div><div class='ctx'> 	uint16_t del_ba_param_set;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;delba, 0, sizeof(delba));</div><div class='del'>-	delba.del_ba_param_set = cpu_to_le16(tid &lt;&lt; DELBA_TID_POS);</div><div class='ctx'> </div><div class='del'>-	del_ba_param_set = le16_to_cpu(delba.del_ba_param_set);</div><div class='add'>+	del_ba_param_set = tid &lt;&lt; DELBA_TID_POS;</div><div class='add'>+</div><div class='ctx'> 	if (initiator)</div><div class='ctx'> 		del_ba_param_set |= IEEE80211_DELBA_PARAM_INITIATOR_MASK;</div><div class='ctx'> 	else</div><div class='ctx'> 		del_ba_param_set &amp;= ~IEEE80211_DELBA_PARAM_INITIATOR_MASK;</div><div class='ctx'> </div><div class='add'>+	delba.del_ba_param_set = cpu_to_le16(del_ba_param_set);</div><div class='ctx'> 	memcpy(&amp;delba.peer_mac_addr, peer_mac, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	/* We don't wait for the response of this command */</div><div class='hunk'>@@ -889,13 +876,11 @@ mwifiex_send_delba_txbastream_tbl(struct mwifiex_private *priv, u8 tid)</div><div class='ctx'>  */</div><div class='ctx'> void mwifiex_update_ampdu_txwinsize(struct mwifiex_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	u8 i;</div><div class='add'>+	u8 i, j;</div><div class='ctx'> 	u32 tx_win_size;</div><div class='ctx'> 	struct mwifiex_private *priv;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='del'>-		if (!adapter-&gt;priv[i])</div><div class='del'>-			continue;</div><div class='ctx'> 		priv = adapter-&gt;priv[i];</div><div class='ctx'> 		tx_win_size = priv-&gt;add_ba_param.tx_win_size;</div><div class='ctx'> </div><div class='hunk'>@@ -920,8 +905,8 @@ void mwifiex_update_ampdu_txwinsize(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		if (tx_win_size != priv-&gt;add_ba_param.tx_win_size) {</div><div class='ctx'> 			if (!priv-&gt;media_connected)</div><div class='ctx'> 				continue;</div><div class='del'>-			for (i = 0; i &lt; MAX_NUM_TID; i++)</div><div class='del'>-				mwifiex_send_delba_txbastream_tbl(priv, i);</div><div class='add'>+			for (j = 0; j &lt; MAX_NUM_TID; j++)</div><div class='add'>+				mwifiex_send_delba_txbastream_tbl(priv, j);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/11n.h b/drivers/net/wireless/marvell/mwifiex/11n.h<br/>index 83a88eecbda6..773bd5c0f007 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/11n.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/11n.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/11n.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/11n.h</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: 802.11n</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _MWIFIEX_11N_H_</div><div class='hunk'>@@ -114,15 +102,13 @@ static inline u8 mwifiex_space_avail_for_new_ba_stream(</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_private *priv;</div><div class='ctx'> 	u8 i;</div><div class='del'>-	u32 ba_stream_num = 0, ba_stream_max;</div><div class='add'>+	size_t ba_stream_num = 0, ba_stream_max;</div><div class='ctx'> </div><div class='ctx'> 	ba_stream_max = MWIFIEX_MAX_TX_BASTREAM_SUPPORTED;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='ctx'> 		priv = adapter-&gt;priv[i];</div><div class='del'>-		if (priv)</div><div class='del'>-			ba_stream_num += mwifiex_wmm_list_len(</div><div class='del'>-				&amp;priv-&gt;tx_ba_stream_tbl_ptr);</div><div class='add'>+		ba_stream_num += list_count_nodes(&amp;priv-&gt;tx_ba_stream_tbl_ptr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;fw_api_ver == MWIFIEX_FW_V15) {</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c<br/>index 46f41dbcf30d..34b4b34276d6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/11n_aggr.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/11n_aggr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/11n_aggr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/11n_aggr.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: 802.11n Aggregation</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "decl.h"</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/11n_aggr.h b/drivers/net/wireless/marvell/mwifiex/11n_aggr.h<br/>index 382c1265c441..69b6888812f1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/11n_aggr.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/11n_aggr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/11n_aggr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/11n_aggr.h</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: 802.11n Aggregation</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _MWIFIEX_11N_AGGR_H_</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c b/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c<br/>index 1046b59647f5..354c5ce66045 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: 802.11n RX Re-ordering</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "decl.h"</div><div class='hunk'>@@ -45,7 +33,7 @@ static int mwifiex_11n_dispatch_amsdu_pkt(struct mwifiex_private *priv,</div><div class='ctx'> 		skb_trim(skb, le16_to_cpu(local_rx_pd-&gt;rx_pkt_length));</div><div class='ctx'> </div><div class='ctx'> 		ieee80211_amsdu_to_8023s(skb, &amp;list, priv-&gt;curr_addr,</div><div class='del'>-					 priv-&gt;wdev.iftype, 0, NULL, NULL);</div><div class='add'>+					 priv-&gt;wdev.iftype, 0, NULL, NULL, false);</div><div class='ctx'> </div><div class='ctx'> 		while (!skb_queue_empty(&amp;list)) {</div><div class='ctx'> 			struct rx_packet_hdr *rx_hdr;</div><div class='hunk'>@@ -218,7 +206,7 @@ mwifiex_del_rx_reorder_entry(struct mwifiex_private *priv,</div><div class='ctx'> 	start_win = (tbl-&gt;start_win + tbl-&gt;win_size) &amp; (MAX_TID_VALUE - 1);</div><div class='ctx'> 	mwifiex_11n_dispatch_pkt_until_start_win(priv, tbl, start_win);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;tbl-&gt;timer_context.timer);</div><div class='add'>+	timer_delete_sync(&amp;tbl-&gt;timer_context.timer);</div><div class='ctx'> 	tbl-&gt;timer_context.timer_is_set = false;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;priv-&gt;rx_reorder_tbl_lock);</div><div class='hunk'>@@ -312,7 +300,7 @@ static void</div><div class='ctx'> mwifiex_flush_data(struct timer_list *t)</div><div class='ctx'> {</div><div class='ctx'> 	struct reorder_tmr_cnxt *ctx =</div><div class='del'>-		from_timer(ctx, t, timer);</div><div class='add'>+		timer_container_of(ctx, t, timer);</div><div class='ctx'> 	int start_win, seq_num;</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;timer_is_set = false;</div><div class='hunk'>@@ -347,7 +335,7 @@ mwifiex_11n_create_rx_reorder_tbl(struct mwifiex_private *priv, u8 *ta,</div><div class='ctx'> 	struct mwifiex_sta_node *node;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If we get a TID, ta pair which is already present dispatch all the</div><div class='add'>+	 * If we get a TID, ta pair which is already present dispatch all</div><div class='ctx'> 	 * the packets and move the window size until the ssn</div><div class='ctx'> 	 */</div><div class='ctx'> 	tbl = mwifiex_11n_get_rx_reorder_tbl(priv, tid, ta);</div><div class='hunk'>@@ -822,8 +810,6 @@ void mwifiex_update_rxreor_flags(struct mwifiex_adapter *adapter, u8 flags)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='ctx'> 		priv = adapter-&gt;priv[i];</div><div class='del'>-		if (!priv)</div><div class='del'>-			continue;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;priv-&gt;rx_reorder_tbl_lock);</div><div class='ctx'> 		list_for_each_entry(tbl, &amp;priv-&gt;rx_reorder_tbl_ptr, list)</div><div class='hunk'>@@ -846,8 +832,6 @@ static void mwifiex_update_ampdu_rxwinsize(struct mwifiex_adapter *adapter,</div><div class='ctx'> 	dev_dbg(adapter-&gt;dev, "Update rxwinsize %d\n", coex_flag);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='del'>-		if (!adapter-&gt;priv[i])</div><div class='del'>-			continue;</div><div class='ctx'> 		priv = adapter-&gt;priv[i];</div><div class='ctx'> 		rx_win_size = priv-&gt;add_ba_param.rx_win_size;</div><div class='ctx'> 		if (coex_flag) {</div><div class='hunk'>@@ -894,17 +878,16 @@ void mwifiex_coex_ampdu_rxwinsize(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	u8 count = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='del'>-		if (adapter-&gt;priv[i]) {</div><div class='del'>-			priv = adapter-&gt;priv[i];</div><div class='del'>-			if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA) {</div><div class='del'>-				if (priv-&gt;media_connected)</div><div class='del'>-					count++;</div><div class='del'>-			}</div><div class='del'>-			if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP) {</div><div class='del'>-				if (priv-&gt;bss_started)</div><div class='del'>-					count++;</div><div class='del'>-			}</div><div class='add'>+		priv = adapter-&gt;priv[i];</div><div class='add'>+		if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA) {</div><div class='add'>+			if (priv-&gt;media_connected)</div><div class='add'>+				count++;</div><div class='add'>+		}</div><div class='add'>+		if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP) {</div><div class='add'>+			if (priv-&gt;bss_started)</div><div class='add'>+				count++;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		if (count &gt;= MWIFIEX_BSS_COEX_COUNT)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -930,9 +913,17 @@ void mwifiex_11n_rxba_sync_event(struct mwifiex_private *priv,</div><div class='ctx'> </div><div class='ctx'> 	mwifiex_dbg_dump(priv-&gt;adapter, EVT_D, "RXBA_SYNC event:",</div><div class='ctx'> 			 event_buf, len);</div><div class='del'>-	while (tlv_buf_left &gt;= sizeof(*tlv_rxba)) {</div><div class='add'>+	while (tlv_buf_left &gt; sizeof(*tlv_rxba)) {</div><div class='ctx'> 		tlv_type = le16_to_cpu(tlv_rxba-&gt;header.type);</div><div class='ctx'> 		tlv_len  = le16_to_cpu(tlv_rxba-&gt;header.len);</div><div class='add'>+		if (size_add(sizeof(tlv_rxba-&gt;header), tlv_len) &gt; tlv_buf_left) {</div><div class='add'>+			mwifiex_dbg(priv-&gt;adapter, WARN,</div><div class='add'>+				    "TLV size (%zu) overflows event_buf buf_left=%d\n",</div><div class='add'>+				    size_add(sizeof(tlv_rxba-&gt;header), tlv_len),</div><div class='add'>+				    tlv_buf_left);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (tlv_type != TLV_TYPE_RXBA_SYNC) {</div><div class='ctx'> 			mwifiex_dbg(priv-&gt;adapter, ERROR,</div><div class='ctx'> 				    "Wrong TLV id=0x%x\n", tlv_type);</div><div class='hunk'>@@ -941,6 +932,14 @@ void mwifiex_11n_rxba_sync_event(struct mwifiex_private *priv,</div><div class='ctx'> </div><div class='ctx'> 		tlv_seq_num = le16_to_cpu(tlv_rxba-&gt;seq_num);</div><div class='ctx'> 		tlv_bitmap_len = le16_to_cpu(tlv_rxba-&gt;bitmap_len);</div><div class='add'>+		if (size_add(sizeof(*tlv_rxba), tlv_bitmap_len) &gt; tlv_buf_left) {</div><div class='add'>+			mwifiex_dbg(priv-&gt;adapter, WARN,</div><div class='add'>+				    "TLV size (%zu) overflows event_buf buf_left=%d\n",</div><div class='add'>+				    size_add(sizeof(*tlv_rxba), tlv_bitmap_len),</div><div class='add'>+				    tlv_buf_left);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		mwifiex_dbg(priv-&gt;adapter, INFO,</div><div class='ctx'> 			    "%pM tid=%d seq_num=%d bitmap_len=%d\n",</div><div class='ctx'> 			    tlv_rxba-&gt;mac, tlv_rxba-&gt;tid, tlv_seq_num,</div><div class='hunk'>@@ -977,8 +976,8 @@ void mwifiex_11n_rxba_sync_event(struct mwifiex_private *priv,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		tlv_buf_left -= (sizeof(*tlv_rxba) + tlv_len);</div><div class='del'>-		tmp = (u8 *)tlv_rxba + tlv_len + sizeof(*tlv_rxba);</div><div class='add'>+		tlv_buf_left -= (sizeof(tlv_rxba-&gt;header) + tlv_len);</div><div class='add'>+		tmp = (u8 *)tlv_rxba  + sizeof(tlv_rxba-&gt;header) + tlv_len;</div><div class='ctx'> 		tlv_rxba = (struct mwifiex_ie_types_rxba_sync *)tmp;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h b/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h<br/>index 465f244b3636..c205a3bbc8b3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: 802.11n RX Re-ordering</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _MWIFIEX_11N_RXREORDER_H_</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/Kconfig b/drivers/net/wireless/marvell/mwifiex/Kconfig<br/>index 2b4ff2b78a7e..b182f7155d66 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/Kconfig</a></div><div class='hunk'>@@ -10,13 +10,14 @@ config MWIFIEX</div><div class='ctx'> 	  mwifiex.</div><div class='ctx'> </div><div class='ctx'> config MWIFIEX_SDIO</div><div class='del'>-	tristate "Marvell WiFi-Ex Driver for SD8786/SD8787/SD8797/SD8887/SD8897/SD8977/SD8987/SD8997"</div><div class='add'>+	tristate "Marvell WiFi-Ex Driver for SD8786/SD8787/SD8797/SD8887/SD8897/SD8977/SD8978/SD8987/SD8997"</div><div class='ctx'> 	depends on MWIFIEX &amp;&amp; MMC</div><div class='ctx'> 	select FW_LOADER</div><div class='ctx'> 	select WANT_DEV_COREDUMP</div><div class='ctx'> 	help</div><div class='ctx'> 	  This adds support for wireless adapters based on Marvell</div><div class='del'>-	  8786/8787/8797/8887/8897/8977/8987/8997 chipsets with SDIO interface.</div><div class='add'>+	  8786/8787/8797/8887/8897/8977/8978/8987/8997 chipsets with</div><div class='add'>+	  SDIO interface. SD8978 is also known as NXP IW416.</div><div class='ctx'> </div><div class='ctx'> 	  If you choose to build it as a module, it will be called</div><div class='ctx'> 	  mwifiex_sdio.</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/Makefile b/drivers/net/wireless/marvell/mwifiex/Makefile<br/>index 162d557b78af..12d8affced18 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/Makefile</a></div><div class='hunk'>@@ -1,18 +1,7 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Copyright 2011-2020 NXP</div><div class='ctx'> #</div><div class='del'>-# This software file (the "File") is distributed by NXP</div><div class='del'>-# under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>-# (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>-# accordance with the terms and conditions of the License, a copy of which</div><div class='del'>-# is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>-# worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>-#</div><div class='del'>-# THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>-# IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>-# ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>-# this warranty disclaimer.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> mwifiex-y += main.o</div><div class='hunk'>@@ -49,6 +38,7 @@ mwifiex_sdio-y += sdio.o</div><div class='ctx'> obj-$(CONFIG_MWIFIEX_SDIO) += mwifiex_sdio.o</div><div class='ctx'> </div><div class='ctx'> mwifiex_pcie-y += pcie.o</div><div class='add'>+mwifiex_pcie-y += pcie_quirks.o</div><div class='ctx'> obj-$(CONFIG_MWIFIEX_PCIE) += mwifiex_pcie.o</div><div class='ctx'> </div><div class='ctx'> mwifiex_usb-y += usb.o</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c<br/>index 0961f4a5e415..be23a29e7de0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/cfg80211.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/cfg80211.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/cfg80211.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/cfg80211.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: CFG80211</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "cfg80211.h"</div><div class='hunk'>@@ -154,7 +142,8 @@ static void *mwifiex_cfg80211_get_adapter(struct wiphy *wiphy)</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> mwifiex_cfg80211_del_key(struct wiphy *wiphy, struct net_device *netdev,</div><div class='del'>-			 u8 key_index, bool pairwise, const u8 *mac_addr)</div><div class='add'>+			 int link_id, u8 key_index, bool pairwise,</div><div class='add'>+			 const u8 *mac_addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_private *priv = mwifiex_netdev_get_priv(netdev);</div><div class='ctx'> 	static const u8 bc_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};</div><div class='hunk'>@@ -232,6 +221,26 @@ mwifiex_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP) {</div><div class='add'>+		if (ieee80211_is_auth(mgmt-&gt;frame_control))</div><div class='add'>+			mwifiex_dbg(priv-&gt;adapter, MSG,</div><div class='add'>+				    "auth: send auth to %pM\n", mgmt-&gt;da);</div><div class='add'>+		if (ieee80211_is_deauth(mgmt-&gt;frame_control))</div><div class='add'>+			mwifiex_dbg(priv-&gt;adapter, MSG,</div><div class='add'>+				    "auth: send deauth to %pM\n", mgmt-&gt;da);</div><div class='add'>+		if (ieee80211_is_disassoc(mgmt-&gt;frame_control))</div><div class='add'>+			mwifiex_dbg(priv-&gt;adapter, MSG,</div><div class='add'>+				    "assoc: send disassoc to %pM\n", mgmt-&gt;da);</div><div class='add'>+		if (ieee80211_is_assoc_resp(mgmt-&gt;frame_control))</div><div class='add'>+			mwifiex_dbg(priv-&gt;adapter, MSG,</div><div class='add'>+				    "assoc: send assoc resp to %pM\n",</div><div class='add'>+				    mgmt-&gt;da);</div><div class='add'>+		if (ieee80211_is_reassoc_resp(mgmt-&gt;frame_control))</div><div class='add'>+			mwifiex_dbg(priv-&gt;adapter, MSG,</div><div class='add'>+				    "assoc: send reassoc resp to %pM\n",</div><div class='add'>+				    mgmt-&gt;da);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	pkt_len = len + ETH_ALEN;</div><div class='ctx'> 	skb = dev_alloc_skb(MWIFIEX_MIN_DATA_HEADER_LEN +</div><div class='ctx'> 			    MWIFIEX_MGMT_FRAME_HEADER_SIZE +</div><div class='hunk'>@@ -250,7 +259,7 @@ mwifiex_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,</div><div class='ctx'> 	tx_info-&gt;pkt_len = pkt_len;</div><div class='ctx'> </div><div class='ctx'> 	mwifiex_form_mgmt_frame(skb, buf, len);</div><div class='del'>-	*cookie = prandom_u32() | 1;</div><div class='add'>+	*cookie = get_random_u32() | 1;</div><div class='ctx'> </div><div class='ctx'> 	if (ieee80211_is_action(mgmt-&gt;frame_control))</div><div class='ctx'> 		skb = mwifiex_clone_skb_for_tx_status(priv,</div><div class='hunk'>@@ -279,6 +288,8 @@ mwifiex_cfg80211_update_mgmt_frame_registrations(struct wiphy *wiphy,</div><div class='ctx'> </div><div class='ctx'> 	if (mask != priv-&gt;mgmt_frame_mask) {</div><div class='ctx'> 		priv-&gt;mgmt_frame_mask = mask;</div><div class='add'>+		if (priv-&gt;host_mlme_reg)</div><div class='add'>+			priv-&gt;mgmt_frame_mask |= HOST_MLME_MGMT_MASK;</div><div class='ctx'> 		mwifiex_send_cmd(priv, HostCmd_CMD_MGMT_FRAME_REG,</div><div class='ctx'> 				 HostCmd_ACT_GEN_SET, 0,</div><div class='ctx'> 				 &amp;priv-&gt;mgmt_frame_mask, false);</div><div class='hunk'>@@ -314,7 +325,7 @@ mwifiex_cfg80211_remain_on_channel(struct wiphy *wiphy,</div><div class='ctx'> 					 duration);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret) {</div><div class='del'>-		*cookie = prandom_u32() | 1;</div><div class='add'>+		*cookie = get_random_u32() | 1;</div><div class='ctx'> 		priv-&gt;roc_cfg.cookie = *cookie;</div><div class='ctx'> 		priv-&gt;roc_cfg.chan = *chan;</div><div class='ctx'> </div><div class='hunk'>@@ -364,6 +375,7 @@ mwifiex_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy,</div><div class='ctx'> static int</div><div class='ctx'> mwifiex_cfg80211_set_tx_power(struct wiphy *wiphy,</div><div class='ctx'> 			      struct wireless_dev *wdev,</div><div class='add'>+			      int radio_idx,</div><div class='ctx'> 			      enum nl80211_tx_power_setting type,</div><div class='ctx'> 			      int mbm)</div><div class='ctx'> {</div><div class='hunk'>@@ -399,7 +411,8 @@ mwifiex_cfg80211_set_tx_power(struct wiphy *wiphy,</div><div class='ctx'> static int</div><div class='ctx'> mwifiex_cfg80211_get_tx_power(struct wiphy *wiphy,</div><div class='ctx'> 			      struct wireless_dev *wdev,</div><div class='del'>-			      int *dbm)</div><div class='add'>+			      int radio_idx,</div><div class='add'>+			      unsigned int link_id, int *dbm)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy);</div><div class='ctx'> 	struct mwifiex_private *priv = mwifiex_get_priv(adapter,</div><div class='hunk'>@@ -443,7 +456,7 @@ mwifiex_cfg80211_set_power_mgmt(struct wiphy *wiphy,</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> mwifiex_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *netdev,</div><div class='del'>-				 u8 key_index, bool unicast,</div><div class='add'>+				 int link_id, u8 key_index, bool unicast,</div><div class='ctx'> 				 bool multicast)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_private *priv = mwifiex_netdev_get_priv(netdev);</div><div class='hunk'>@@ -468,8 +481,8 @@ mwifiex_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *netdev,</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> mwifiex_cfg80211_add_key(struct wiphy *wiphy, struct net_device *netdev,</div><div class='del'>-			 u8 key_index, bool pairwise, const u8 *mac_addr,</div><div class='del'>-			 struct key_params *params)</div><div class='add'>+			 int link_id, u8 key_index, bool pairwise,</div><div class='add'>+			 const u8 *mac_addr, struct key_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_private *priv = mwifiex_netdev_get_priv(netdev);</div><div class='ctx'> 	struct mwifiex_wep_key *wep_key;</div><div class='hunk'>@@ -506,6 +519,7 @@ mwifiex_cfg80211_add_key(struct wiphy *wiphy, struct net_device *netdev,</div><div class='ctx'> static int</div><div class='ctx'> mwifiex_cfg80211_set_default_mgmt_key(struct wiphy *wiphy,</div><div class='ctx'> 				      struct net_device *netdev,</div><div class='add'>+				      int link_id,</div><div class='ctx'> 				      u8 key_index)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_private *priv = mwifiex_netdev_get_priv(netdev);</div><div class='hunk'>@@ -513,14 +527,23 @@ mwifiex_cfg80211_set_default_mgmt_key(struct wiphy *wiphy,</div><div class='ctx'> </div><div class='ctx'> 	wiphy_dbg(wiphy, "set default mgmt key, key index=%d\n", key_index);</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;adapter-&gt;host_mlme_enabled)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	memset(&amp;encrypt_key, 0, sizeof(struct mwifiex_ds_encrypt_key));</div><div class='ctx'> 	encrypt_key.key_len = WLAN_KEY_LEN_CCMP;</div><div class='ctx'> 	encrypt_key.key_index = key_index;</div><div class='ctx'> 	encrypt_key.is_igtk_def_key = true;</div><div class='ctx'> 	eth_broadcast_addr(encrypt_key.mac_addr);</div><div class='ctx'> </div><div class='del'>-	return mwifiex_send_cmd(priv, HostCmd_CMD_802_11_KEY_MATERIAL,</div><div class='del'>-				HostCmd_ACT_GEN_SET, true, &amp;encrypt_key, true);</div><div class='add'>+	if (mwifiex_send_cmd(priv, HostCmd_CMD_802_11_KEY_MATERIAL,</div><div class='add'>+			     HostCmd_ACT_GEN_SET, true, &amp;encrypt_key, true)) {</div><div class='add'>+		mwifiex_dbg(priv-&gt;adapter, ERROR,</div><div class='add'>+			    "Sending KEY_MATERIAL command failed\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -663,10 +686,9 @@ static void mwifiex_reg_notifier(struct wiphy *wiphy,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Don't send world or same regdom info to firmware */</div><div class='del'>-	if (strncmp(request-&gt;alpha2, "00", 2) &amp;&amp;</div><div class='del'>-	    strncmp(request-&gt;alpha2, adapter-&gt;country_code,</div><div class='del'>-		    sizeof(request-&gt;alpha2))) {</div><div class='add'>+	/* Don't send same regdom info to firmware */</div><div class='add'>+	if (strncmp(request-&gt;alpha2, adapter-&gt;country_code,</div><div class='add'>+		    sizeof(request-&gt;alpha2)) != 0) {</div><div class='ctx'> 		memcpy(adapter-&gt;country_code, request-&gt;alpha2,</div><div class='ctx'> 		       sizeof(request-&gt;alpha2));</div><div class='ctx'> 		mwifiex_send_domain_info_cmd_fw(wiphy);</div><div class='hunk'>@@ -716,7 +738,8 @@ mwifiex_set_rts(struct mwifiex_private *priv, u32 rts_thr)</div><div class='ctx'>  * Fragmentation threshold of the driver.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-mwifiex_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)</div><div class='add'>+mwifiex_cfg80211_set_wiphy_params(struct wiphy *wiphy, int radio_idx,</div><div class='add'>+				  u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy);</div><div class='ctx'> 	struct mwifiex_private *priv;</div><div class='hunk'>@@ -852,6 +875,7 @@ static int mwifiex_deinit_priv_params(struct mwifiex_private *priv)</div><div class='ctx'> 	struct mwifiex_adapter *adapter = priv-&gt;adapter;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	priv-&gt;host_mlme_reg = false;</div><div class='ctx'> 	priv-&gt;mgmt_frame_mask = 0;</div><div class='ctx'> 	if (mwifiex_send_cmd(priv, HostCmd_CMD_MGMT_FRAME_REG,</div><div class='ctx'> 			     HostCmd_ACT_GEN_SET, 0,</div><div class='hunk'>@@ -908,16 +932,20 @@ mwifiex_init_new_priv_params(struct mwifiex_private *priv,</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		priv-&gt;bss_role =  MWIFIEX_BSS_ROLE_STA;</div><div class='add'>+		priv-&gt;bss_role = MWIFIEX_BSS_ROLE_STA;</div><div class='add'>+		priv-&gt;bss_type = MWIFIEX_BSS_TYPE_STA;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_P2P_CLIENT:</div><div class='del'>-		priv-&gt;bss_role =  MWIFIEX_BSS_ROLE_STA;</div><div class='add'>+		priv-&gt;bss_role = MWIFIEX_BSS_ROLE_STA;</div><div class='add'>+		priv-&gt;bss_type = MWIFIEX_BSS_TYPE_P2P;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_P2P_GO:</div><div class='del'>-		priv-&gt;bss_role =  MWIFIEX_BSS_ROLE_UAP;</div><div class='add'>+		priv-&gt;bss_role = MWIFIEX_BSS_ROLE_UAP;</div><div class='add'>+		priv-&gt;bss_type = MWIFIEX_BSS_TYPE_P2P;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='ctx'> 		priv-&gt;bss_role = MWIFIEX_BSS_ROLE_UAP;</div><div class='add'>+		priv-&gt;bss_type = MWIFIEX_BSS_TYPE_UAP;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		mwifiex_dbg(adapter, ERROR,</div><div class='hunk'>@@ -926,6 +954,8 @@ mwifiex_init_new_priv_params(struct mwifiex_private *priv,</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	priv-&gt;bss_num = mwifiex_get_unused_bss_num(adapter, priv-&gt;bss_type);</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;adapter-&gt;main_proc_lock, flags);</div><div class='ctx'> 	adapter-&gt;main_locked = false;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;adapter-&gt;main_proc_lock, flags);</div><div class='hunk'>@@ -939,6 +969,117 @@ mwifiex_init_new_priv_params(struct mwifiex_private *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool</div><div class='add'>+is_vif_type_change_allowed(struct mwifiex_adapter *adapter,</div><div class='add'>+			   enum nl80211_iftype old_iftype,</div><div class='add'>+			   enum nl80211_iftype new_iftype)</div><div class='add'>+{</div><div class='add'>+	switch (old_iftype) {</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		switch (new_iftype) {</div><div class='add'>+		case NL80211_IFTYPE_STATION:</div><div class='add'>+			return true;</div><div class='add'>+		case NL80211_IFTYPE_P2P_CLIENT:</div><div class='add'>+		case NL80211_IFTYPE_P2P_GO:</div><div class='add'>+			return adapter-&gt;curr_iface_comb.p2p_intf !=</div><div class='add'>+			       adapter-&gt;iface_limit.p2p_intf;</div><div class='add'>+		case NL80211_IFTYPE_AP:</div><div class='add'>+			return adapter-&gt;curr_iface_comb.uap_intf !=</div><div class='add'>+			       adapter-&gt;iface_limit.uap_intf;</div><div class='add'>+		default:</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		switch (new_iftype) {</div><div class='add'>+		case NL80211_IFTYPE_ADHOC:</div><div class='add'>+			return true;</div><div class='add'>+		case NL80211_IFTYPE_P2P_CLIENT:</div><div class='add'>+		case NL80211_IFTYPE_P2P_GO:</div><div class='add'>+			return adapter-&gt;curr_iface_comb.p2p_intf !=</div><div class='add'>+			       adapter-&gt;iface_limit.p2p_intf;</div><div class='add'>+		case NL80211_IFTYPE_AP:</div><div class='add'>+			return adapter-&gt;curr_iface_comb.uap_intf !=</div><div class='add'>+			       adapter-&gt;iface_limit.uap_intf;</div><div class='add'>+		default:</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		switch (new_iftype) {</div><div class='add'>+		case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		case NL80211_IFTYPE_STATION:</div><div class='add'>+			return adapter-&gt;curr_iface_comb.sta_intf !=</div><div class='add'>+			       adapter-&gt;iface_limit.sta_intf;</div><div class='add'>+		case NL80211_IFTYPE_P2P_CLIENT:</div><div class='add'>+		case NL80211_IFTYPE_P2P_GO:</div><div class='add'>+			return adapter-&gt;curr_iface_comb.p2p_intf !=</div><div class='add'>+			       adapter-&gt;iface_limit.p2p_intf;</div><div class='add'>+		default:</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case NL80211_IFTYPE_P2P_CLIENT:</div><div class='add'>+		switch (new_iftype) {</div><div class='add'>+		case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		case NL80211_IFTYPE_STATION:</div><div class='add'>+			return true;</div><div class='add'>+		case NL80211_IFTYPE_P2P_GO:</div><div class='add'>+			return true;</div><div class='add'>+		case NL80211_IFTYPE_AP:</div><div class='add'>+			return adapter-&gt;curr_iface_comb.uap_intf !=</div><div class='add'>+			       adapter-&gt;iface_limit.uap_intf;</div><div class='add'>+		default:</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case NL80211_IFTYPE_P2P_GO:</div><div class='add'>+		switch (new_iftype) {</div><div class='add'>+		case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		case NL80211_IFTYPE_STATION:</div><div class='add'>+			return true;</div><div class='add'>+		case NL80211_IFTYPE_P2P_CLIENT:</div><div class='add'>+			return true;</div><div class='add'>+		case NL80211_IFTYPE_AP:</div><div class='add'>+			return adapter-&gt;curr_iface_comb.uap_intf !=</div><div class='add'>+			       adapter-&gt;iface_limit.uap_intf;</div><div class='add'>+		default:</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+update_vif_type_counter(struct mwifiex_adapter *adapter,</div><div class='add'>+			enum nl80211_iftype iftype,</div><div class='add'>+			int change)</div><div class='add'>+{</div><div class='add'>+	switch (iftype) {</div><div class='add'>+	case NL80211_IFTYPE_UNSPECIFIED:</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		adapter-&gt;curr_iface_comb.sta_intf += change;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		adapter-&gt;curr_iface_comb.uap_intf += change;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_P2P_CLIENT:</div><div class='add'>+	case NL80211_IFTYPE_P2P_GO:</div><div class='add'>+		adapter-&gt;curr_iface_comb.p2p_intf += change;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		mwifiex_dbg(adapter, ERROR,</div><div class='add'>+			    "%s: Unsupported iftype passed: %d\n",</div><div class='add'>+			    __func__, iftype);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> mwifiex_change_vif_to_p2p(struct net_device *dev,</div><div class='ctx'> 			  enum nl80211_iftype curr_iftype,</div><div class='hunk'>@@ -955,13 +1096,6 @@ mwifiex_change_vif_to_p2p(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	adapter = priv-&gt;adapter;</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;curr_iface_comb.p2p_intf ==</div><div class='del'>-	    adapter-&gt;iface_limit.p2p_intf) {</div><div class='del'>-		mwifiex_dbg(adapter, ERROR,</div><div class='del'>-			    "cannot create multiple P2P ifaces\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	mwifiex_dbg(adapter, INFO,</div><div class='ctx'> 		    "%s: changing role to p2p\n", dev-&gt;name);</div><div class='ctx'> </div><div class='hunk'>@@ -970,6 +1104,10 @@ mwifiex_change_vif_to_p2p(struct net_device *dev,</div><div class='ctx'> 	if (mwifiex_init_new_priv_params(priv, dev, type))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='add'>+	update_vif_type_counter(adapter, curr_iftype, -1);</div><div class='add'>+	update_vif_type_counter(adapter, type, +1);</div><div class='add'>+	dev-&gt;ieee80211_ptr-&gt;iftype = type;</div><div class='add'>+</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case NL80211_IFTYPE_P2P_CLIENT:</div><div class='ctx'> 		if (mwifiex_cfg80211_init_p2p_client(priv))</div><div class='hunk'>@@ -990,24 +1128,9 @@ mwifiex_change_vif_to_p2p(struct net_device *dev,</div><div class='ctx'> 			     HostCmd_ACT_GEN_SET, 0, NULL, true))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	if (mwifiex_sta_init_cmd(priv, false, false))</div><div class='add'>+	if (mwifiex_sta_init_cmd(priv, false))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	switch (curr_iftype) {</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		adapter-&gt;curr_iface_comb.sta_intf--;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_AP:</div><div class='del'>-		adapter-&gt;curr_iface_comb.uap_intf--;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	adapter-&gt;curr_iface_comb.p2p_intf++;</div><div class='del'>-	dev-&gt;ieee80211_ptr-&gt;iftype = type;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1027,15 +1150,6 @@ mwifiex_change_vif_to_sta_adhoc(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	adapter = priv-&gt;adapter;</div><div class='ctx'> </div><div class='del'>-	if ((curr_iftype != NL80211_IFTYPE_P2P_CLIENT &amp;&amp;</div><div class='del'>-	     curr_iftype != NL80211_IFTYPE_P2P_GO) &amp;&amp;</div><div class='del'>-	    (adapter-&gt;curr_iface_comb.sta_intf ==</div><div class='del'>-	     adapter-&gt;iface_limit.sta_intf)) {</div><div class='del'>-		mwifiex_dbg(adapter, ERROR,</div><div class='del'>-			    "cannot create multiple station/adhoc ifaces\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (type == NL80211_IFTYPE_STATION)</div><div class='ctx'> 		mwifiex_dbg(adapter, INFO,</div><div class='ctx'> 			    "%s: changing role to station\n", dev-&gt;name);</div><div class='hunk'>@@ -1047,26 +1161,17 @@ mwifiex_change_vif_to_sta_adhoc(struct net_device *dev,</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	if (mwifiex_init_new_priv_params(priv, dev, type))</div><div class='ctx'> 		return -1;</div><div class='add'>+</div><div class='add'>+	update_vif_type_counter(adapter, curr_iftype, -1);</div><div class='add'>+	update_vif_type_counter(adapter, type, +1);</div><div class='add'>+	dev-&gt;ieee80211_ptr-&gt;iftype = type;</div><div class='add'>+</div><div class='ctx'> 	if (mwifiex_send_cmd(priv, HostCmd_CMD_SET_BSS_MODE,</div><div class='ctx'> 			     HostCmd_ACT_GEN_SET, 0, NULL, true))</div><div class='ctx'> 		return -1;</div><div class='del'>-	if (mwifiex_sta_init_cmd(priv, false, false))</div><div class='add'>+	if (mwifiex_sta_init_cmd(priv, false))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	switch (curr_iftype) {</div><div class='del'>-	case NL80211_IFTYPE_P2P_CLIENT:</div><div class='del'>-	case NL80211_IFTYPE_P2P_GO:</div><div class='del'>-		adapter-&gt;curr_iface_comb.p2p_intf--;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_AP:</div><div class='del'>-		adapter-&gt;curr_iface_comb.uap_intf--;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	adapter-&gt;curr_iface_comb.sta_intf++;</div><div class='del'>-	dev-&gt;ieee80211_ptr-&gt;iftype = type;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1086,13 +1191,6 @@ mwifiex_change_vif_to_ap(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	adapter = priv-&gt;adapter;</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;curr_iface_comb.uap_intf ==</div><div class='del'>-	    adapter-&gt;iface_limit.uap_intf) {</div><div class='del'>-		mwifiex_dbg(adapter, ERROR,</div><div class='del'>-			    "cannot create multiple AP ifaces\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	mwifiex_dbg(adapter, INFO,</div><div class='ctx'> 		    "%s: changing role to AP\n", dev-&gt;name);</div><div class='ctx'> </div><div class='hunk'>@@ -1100,27 +1198,17 @@ mwifiex_change_vif_to_ap(struct net_device *dev,</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	if (mwifiex_init_new_priv_params(priv, dev, type))</div><div class='ctx'> 		return -1;</div><div class='add'>+</div><div class='add'>+	update_vif_type_counter(adapter, curr_iftype, -1);</div><div class='add'>+	update_vif_type_counter(adapter, type, +1);</div><div class='add'>+	dev-&gt;ieee80211_ptr-&gt;iftype = type;</div><div class='add'>+</div><div class='ctx'> 	if (mwifiex_send_cmd(priv, HostCmd_CMD_SET_BSS_MODE,</div><div class='ctx'> 			     HostCmd_ACT_GEN_SET, 0, NULL, true))</div><div class='ctx'> 		return -1;</div><div class='del'>-	if (mwifiex_sta_init_cmd(priv, false, false))</div><div class='add'>+	if (mwifiex_sta_init_cmd(priv, false))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	switch (curr_iftype) {</div><div class='del'>-	case NL80211_IFTYPE_P2P_CLIENT:</div><div class='del'>-	case NL80211_IFTYPE_P2P_GO:</div><div class='del'>-		adapter-&gt;curr_iface_comb.p2p_intf--;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		adapter-&gt;curr_iface_comb.sta_intf--;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	adapter-&gt;curr_iface_comb.uap_intf++;</div><div class='del'>-	dev-&gt;ieee80211_ptr-&gt;iftype = type;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> /*</div><div class='hunk'>@@ -1141,6 +1229,27 @@ mwifiex_cfg80211_change_virtual_intf(struct wiphy *wiphy,</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (type == NL80211_IFTYPE_UNSPECIFIED) {</div><div class='add'>+		mwifiex_dbg(priv-&gt;adapter, INFO,</div><div class='add'>+			    "%s: no new type specified, keeping old type %d\n",</div><div class='add'>+			    dev-&gt;name, curr_iftype);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (curr_iftype == type) {</div><div class='add'>+		mwifiex_dbg(priv-&gt;adapter, INFO,</div><div class='add'>+			    "%s: interface already is of type %d\n",</div><div class='add'>+			    dev-&gt;name, curr_iftype);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!is_vif_type_change_allowed(priv-&gt;adapter, curr_iftype, type)) {</div><div class='add'>+		mwifiex_dbg(priv-&gt;adapter, ERROR,</div><div class='add'>+			    "%s: change from type %d to %d is not allowed\n",</div><div class='add'>+			    dev-&gt;name, curr_iftype, type);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	switch (curr_iftype) {</div><div class='ctx'> 	case NL80211_IFTYPE_ADHOC:</div><div class='ctx'> 		switch (type) {</div><div class='hunk'>@@ -1160,19 +1269,10 @@ mwifiex_cfg80211_change_virtual_intf(struct wiphy *wiphy,</div><div class='ctx'> 		case NL80211_IFTYPE_AP:</div><div class='ctx'> 			return mwifiex_change_vif_to_ap(dev, curr_iftype, type,</div><div class='ctx'> 							params);</div><div class='del'>-		case NL80211_IFTYPE_UNSPECIFIED:</div><div class='del'>-			mwifiex_dbg(priv-&gt;adapter, INFO,</div><div class='del'>-				    "%s: kept type as IBSS\n", dev-&gt;name);</div><div class='del'>-			fallthrough;</div><div class='del'>-		case NL80211_IFTYPE_ADHOC:	/* This shouldn't happen */</div><div class='del'>-			return 0;</div><div class='ctx'> 		default:</div><div class='del'>-			mwifiex_dbg(priv-&gt;adapter, ERROR,</div><div class='del'>-				    "%s: changing to %d not supported\n",</div><div class='del'>-				    dev-&gt;name, type);</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='add'>+			goto errnotsupp;</div><div class='ctx'> 		}</div><div class='del'>-		break;</div><div class='add'>+</div><div class='ctx'> 	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 		switch (type) {</div><div class='ctx'> 		case NL80211_IFTYPE_ADHOC:</div><div class='hunk'>@@ -1191,22 +1291,14 @@ mwifiex_cfg80211_change_virtual_intf(struct wiphy *wiphy,</div><div class='ctx'> 		case NL80211_IFTYPE_AP:</div><div class='ctx'> 			return mwifiex_change_vif_to_ap(dev, curr_iftype, type,</div><div class='ctx'> 							params);</div><div class='del'>-		case NL80211_IFTYPE_UNSPECIFIED:</div><div class='del'>-			mwifiex_dbg(priv-&gt;adapter, INFO,</div><div class='del'>-				    "%s: kept type as STA\n", dev-&gt;name);</div><div class='del'>-			fallthrough;</div><div class='del'>-		case NL80211_IFTYPE_STATION:	/* This shouldn't happen */</div><div class='del'>-			return 0;</div><div class='ctx'> 		default:</div><div class='del'>-			mwifiex_dbg(priv-&gt;adapter, ERROR,</div><div class='del'>-				    "%s: changing to %d not supported\n",</div><div class='del'>-				    dev-&gt;name, type);</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='add'>+			goto errnotsupp;</div><div class='ctx'> 		}</div><div class='del'>-		break;</div><div class='add'>+</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='ctx'> 		switch (type) {</div><div class='ctx'> 		case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		case NL80211_IFTYPE_STATION:</div><div class='ctx'> 			return mwifiex_change_vif_to_sta_adhoc(dev, curr_iftype,</div><div class='ctx'> 							       type, params);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1214,69 +1306,60 @@ mwifiex_cfg80211_change_virtual_intf(struct wiphy *wiphy,</div><div class='ctx'> 		case NL80211_IFTYPE_P2P_GO:</div><div class='ctx'> 			return mwifiex_change_vif_to_p2p(dev, curr_iftype,</div><div class='ctx'> 							 type, params);</div><div class='del'>-		case NL80211_IFTYPE_UNSPECIFIED:</div><div class='del'>-			mwifiex_dbg(priv-&gt;adapter, INFO,</div><div class='del'>-				    "%s: kept type as AP\n", dev-&gt;name);</div><div class='del'>-			fallthrough;</div><div class='del'>-		case NL80211_IFTYPE_AP:		/* This shouldn't happen */</div><div class='del'>-			return 0;</div><div class='ctx'> 		default:</div><div class='del'>-			mwifiex_dbg(priv-&gt;adapter, ERROR,</div><div class='del'>-				    "%s: changing to %d not supported\n",</div><div class='del'>-				    dev-&gt;name, type);</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='add'>+			goto errnotsupp;</div><div class='ctx'> 		}</div><div class='del'>-		break;</div><div class='add'>+</div><div class='ctx'> 	case NL80211_IFTYPE_P2P_CLIENT:</div><div class='del'>-	case NL80211_IFTYPE_P2P_GO:</div><div class='add'>+		if (mwifiex_cfg80211_deinit_p2p(priv))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='ctx'> 		switch (type) {</div><div class='del'>-		case NL80211_IFTYPE_STATION:</div><div class='del'>-			if (mwifiex_cfg80211_deinit_p2p(priv))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			priv-&gt;adapter-&gt;curr_iface_comb.p2p_intf--;</div><div class='del'>-			priv-&gt;adapter-&gt;curr_iface_comb.sta_intf++;</div><div class='del'>-			dev-&gt;ieee80211_ptr-&gt;iftype = type;</div><div class='del'>-			if (mwifiex_deinit_priv_params(priv))</div><div class='del'>-				return -1;</div><div class='del'>-			if (mwifiex_init_new_priv_params(priv, dev, type))</div><div class='del'>-				return -1;</div><div class='del'>-			if (mwifiex_sta_init_cmd(priv, false, false))</div><div class='del'>-				return -1;</div><div class='del'>-			break;</div><div class='ctx'> 		case NL80211_IFTYPE_ADHOC:</div><div class='del'>-			if (mwifiex_cfg80211_deinit_p2p(priv))</div><div class='del'>-				return -EFAULT;</div><div class='add'>+		case NL80211_IFTYPE_STATION:</div><div class='ctx'> 			return mwifiex_change_vif_to_sta_adhoc(dev, curr_iftype,</div><div class='ctx'> 							       type, params);</div><div class='del'>-			break;</div><div class='add'>+		case NL80211_IFTYPE_P2P_GO:</div><div class='add'>+			return mwifiex_change_vif_to_p2p(dev, curr_iftype,</div><div class='add'>+							 type, params);</div><div class='ctx'> 		case NL80211_IFTYPE_AP:</div><div class='del'>-			if (mwifiex_cfg80211_deinit_p2p(priv))</div><div class='del'>-				return -EFAULT;</div><div class='ctx'> 			return mwifiex_change_vif_to_ap(dev, curr_iftype, type,</div><div class='ctx'> 							params);</div><div class='del'>-		case NL80211_IFTYPE_UNSPECIFIED:</div><div class='del'>-			mwifiex_dbg(priv-&gt;adapter, INFO,</div><div class='del'>-				    "%s: kept type as P2P\n", dev-&gt;name);</div><div class='del'>-			fallthrough;</div><div class='add'>+		default:</div><div class='add'>+			goto errnotsupp;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case NL80211_IFTYPE_P2P_GO:</div><div class='add'>+		if (mwifiex_cfg80211_deinit_p2p(priv))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		switch (type) {</div><div class='add'>+		case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		case NL80211_IFTYPE_STATION:</div><div class='add'>+			return mwifiex_change_vif_to_sta_adhoc(dev, curr_iftype,</div><div class='add'>+							       type, params);</div><div class='ctx'> 		case NL80211_IFTYPE_P2P_CLIENT:</div><div class='del'>-		case NL80211_IFTYPE_P2P_GO:</div><div class='del'>-			return 0;</div><div class='add'>+			return mwifiex_change_vif_to_p2p(dev, curr_iftype,</div><div class='add'>+							 type, params);</div><div class='add'>+		case NL80211_IFTYPE_AP:</div><div class='add'>+			return mwifiex_change_vif_to_ap(dev, curr_iftype, type,</div><div class='add'>+							params);</div><div class='ctx'> 		default:</div><div class='del'>-			mwifiex_dbg(priv-&gt;adapter, ERROR,</div><div class='del'>-				    "%s: changing to %d not supported\n",</div><div class='del'>-				    dev-&gt;name, type);</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='add'>+			goto errnotsupp;</div><div class='ctx'> 		}</div><div class='del'>-		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='del'>-		mwifiex_dbg(priv-&gt;adapter, ERROR,</div><div class='del'>-			    "%s: unknown iftype: %d\n",</div><div class='del'>-			    dev-&gt;name, dev-&gt;ieee80211_ptr-&gt;iftype);</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+		goto errnotsupp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+errnotsupp:</div><div class='add'>+	mwifiex_dbg(priv-&gt;adapter, ERROR,</div><div class='add'>+		    "unsupported interface type transition: %d to %d\n",</div><div class='add'>+		    curr_iftype, type);</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -1690,10 +1773,12 @@ mwifiex_mgmt_stypes[NUM_NL80211_IFTYPES] = {</div><div class='ctx'>  * Function configures data rates to firmware using bitrate mask</div><div class='ctx'>  * provided by cfg80211.</div><div class='ctx'>  */</div><div class='del'>-static int mwifiex_cfg80211_set_bitrate_mask(struct wiphy *wiphy,</div><div class='del'>-				struct net_device *dev,</div><div class='del'>-				const u8 *peer,</div><div class='del'>-				const struct cfg80211_bitrate_mask *mask)</div><div class='add'>+static int</div><div class='add'>+mwifiex_cfg80211_set_bitrate_mask(struct wiphy *wiphy,</div><div class='add'>+				  struct net_device *dev,</div><div class='add'>+				  unsigned int link_id,</div><div class='add'>+				  const u8 *peer,</div><div class='add'>+				  const struct cfg80211_bitrate_mask *mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);</div><div class='ctx'> 	u16 bitmap_rates[MAX_BITMAP_RATES_SIZE];</div><div class='hunk'>@@ -1780,10 +1865,11 @@ static int mwifiex_cfg80211_set_cqm_rssi_config(struct wiphy *wiphy,</div><div class='ctx'>  */</div><div class='ctx'> static int mwifiex_cfg80211_change_beacon(struct wiphy *wiphy,</div><div class='ctx'> 					  struct net_device *dev,</div><div class='del'>-					  struct cfg80211_beacon_data *data)</div><div class='add'>+					  struct cfg80211_ap_update *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);</div><div class='ctx'> 	struct mwifiex_adapter *adapter = priv-&gt;adapter;</div><div class='add'>+	struct cfg80211_beacon_data *data = &amp;params-&gt;beacon;</div><div class='ctx'> </div><div class='ctx'> 	mwifiex_cancel_scan(adapter);</div><div class='ctx'> </div><div class='hunk'>@@ -1822,7 +1908,7 @@ mwifiex_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	struct mwifiex_sta_node *sta_node;</div><div class='ctx'> 	u8 deauth_mac[ETH_ALEN];</div><div class='ctx'> </div><div class='del'>-	if (!priv-&gt;bss_started &amp;&amp; priv-&gt;wdev.cac_started) {</div><div class='add'>+	if (!priv-&gt;bss_started &amp;&amp; priv-&gt;wdev.links[0].cac_started) {</div><div class='ctx'> 		mwifiex_dbg(priv-&gt;adapter, INFO, "%s: abort CAC!\n", __func__);</div><div class='ctx'> 		mwifiex_abort_cac(priv);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1855,7 +1941,8 @@ mwifiex_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mwifiex_cfg80211_set_antenna(struct wiphy *wiphy, u32 tx_ant, u32 rx_ant)</div><div class='add'>+mwifiex_cfg80211_set_antenna(struct wiphy *wiphy, int radio_idx, u32 tx_ant,</div><div class='add'>+			     u32 rx_ant)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy);</div><div class='ctx'> 	struct mwifiex_private *priv = mwifiex_get_priv(adapter,</div><div class='hunk'>@@ -1918,7 +2005,8 @@ mwifiex_cfg80211_set_antenna(struct wiphy *wiphy, u32 tx_ant, u32 rx_ant)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mwifiex_cfg80211_get_antenna(struct wiphy *wiphy, u32 *tx_ant, u32 *rx_ant)</div><div class='add'>+mwifiex_cfg80211_get_antenna(struct wiphy *wiphy, int radio_idx, u32 *tx_ant,</div><div class='add'>+			     u32 *rx_ant)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy);</div><div class='ctx'> 	struct mwifiex_private *priv = mwifiex_get_priv(adapter,</div><div class='hunk'>@@ -1935,7 +2023,8 @@ mwifiex_cfg80211_get_antenna(struct wiphy *wiphy, u32 *tx_ant, u32 *rx_ant)</div><div class='ctx'> /* cfg80211 operation handler for stop ap.</div><div class='ctx'>  * Function stops BSS running at uAP interface.</div><div class='ctx'>  */</div><div class='del'>-static int mwifiex_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)</div><div class='add'>+static int mwifiex_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *dev,</div><div class='add'>+				    unsigned int link_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1990,6 +2079,8 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,</div><div class='ctx'> </div><div class='ctx'> 	mwifiex_set_sys_config_invalid_data(bss_cfg);</div><div class='ctx'> </div><div class='add'>+	memcpy(bss_cfg-&gt;mac_addr, priv-&gt;curr_addr, ETH_ALEN);</div><div class='add'>+</div><div class='ctx'> 	if (params-&gt;beacon_interval)</div><div class='ctx'> 		bss_cfg-&gt;beacon_period = params-&gt;beacon_interval;</div><div class='ctx'> 	if (params-&gt;dtim_period)</div><div class='hunk'>@@ -2358,7 +2449,7 @@ mwifiex_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;wdev.current_bss) {</div><div class='add'>+	if (priv-&gt;wdev.connected) {</div><div class='ctx'> 		mwifiex_dbg(adapter, ERROR,</div><div class='ctx'> 			    "%s: already connected\n", dev-&gt;name);</div><div class='ctx'> 		return -EALREADY;</div><div class='hunk'>@@ -2586,7 +2677,7 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy,</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!priv-&gt;wdev.current_bss &amp;&amp; priv-&gt;scan_block)</div><div class='add'>+	if (!priv-&gt;wdev.connected &amp;&amp; priv-&gt;scan_block)</div><div class='ctx'> 		priv-&gt;scan_block = false;</div><div class='ctx'> </div><div class='ctx'> 	if (!mwifiex_stop_bg_scan(priv))</div><div class='hunk'>@@ -2819,16 +2910,12 @@ mwifiex_setup_ht_caps(struct ieee80211_sta_ht_cap *ht_info,</div><div class='ctx'> 		      struct mwifiex_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int rx_mcs_supp;</div><div class='del'>-	struct ieee80211_mcs_info mcs_set;</div><div class='del'>-	u8 *mcs = (u8 *)&amp;mcs_set;</div><div class='ctx'> 	struct mwifiex_adapter *adapter = priv-&gt;adapter;</div><div class='ctx'> </div><div class='ctx'> 	ht_info-&gt;ht_supported = true;</div><div class='ctx'> 	ht_info-&gt;ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;</div><div class='ctx'> 	ht_info-&gt;ampdu_density = IEEE80211_HT_MPDU_DENSITY_NONE;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;ht_info-&gt;mcs, 0, sizeof(ht_info-&gt;mcs));</div><div class='del'>-</div><div class='ctx'> 	/* Fill HT capability information */</div><div class='ctx'> 	if (ISSUPP_CHANWIDTH40(adapter-&gt;hw_dot_11n_dev_cap))</div><div class='ctx'> 		ht_info-&gt;cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;</div><div class='hunk'>@@ -2874,17 +2961,15 @@ mwifiex_setup_ht_caps(struct ieee80211_sta_ht_cap *ht_info,</div><div class='ctx'> 	ht_info-&gt;cap |= IEEE80211_HT_CAP_SM_PS;</div><div class='ctx'> </div><div class='ctx'> 	rx_mcs_supp = GET_RXMCSSUPP(adapter-&gt;user_dev_mcs_support);</div><div class='add'>+</div><div class='add'>+	memset(&amp;ht_info-&gt;mcs, 0, sizeof(ht_info-&gt;mcs));</div><div class='ctx'> 	/* Set MCS for 1x1/2x2 */</div><div class='del'>-	memset(mcs, 0xff, rx_mcs_supp);</div><div class='del'>-	/* Clear all the other values */</div><div class='del'>-	memset(&amp;mcs[rx_mcs_supp], 0,</div><div class='del'>-	       sizeof(struct ieee80211_mcs_info) - rx_mcs_supp);</div><div class='add'>+	memset(ht_info-&gt;mcs.rx_mask, 0xff, rx_mcs_supp);</div><div class='add'>+</div><div class='ctx'> 	if (priv-&gt;bss_mode == NL80211_IFTYPE_STATION ||</div><div class='ctx'> 	    ISSUPP_CHANWIDTH40(adapter-&gt;hw_dot_11n_dev_cap))</div><div class='ctx'> 		/* Set MCS32 for infra mode or ad-hoc mode with 40MHz support */</div><div class='del'>-		SETHT_MCS32(mcs_set.rx_mask);</div><div class='del'>-</div><div class='del'>-	memcpy((u8 *) &amp;ht_info-&gt;mcs, mcs, sizeof(struct ieee80211_mcs_info));</div><div class='add'>+		SETHT_MCS32(ht_info-&gt;mcs.rx_mask);</div><div class='ctx'> </div><div class='ctx'> 	ht_info-&gt;mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;</div><div class='ctx'> }</div><div class='hunk'>@@ -2926,7 +3011,6 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,</div><div class='ctx'> 			return ERR_PTR(-EFAULT);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		priv-&gt;wdev.wiphy = wiphy;</div><div class='ctx'> 		priv-&gt;wdev.iftype = NL80211_IFTYPE_STATION;</div><div class='ctx'> </div><div class='ctx'> 		if (type == NL80211_IFTYPE_UNSPECIFIED)</div><div class='hunk'>@@ -2935,8 +3019,6 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,</div><div class='ctx'> 			priv-&gt;bss_mode = type;</div><div class='ctx'> </div><div class='ctx'> 		priv-&gt;bss_type = MWIFIEX_BSS_TYPE_STA;</div><div class='del'>-		priv-&gt;frame_type = MWIFIEX_DATA_FRAME_TYPE_ETH_II;</div><div class='del'>-		priv-&gt;bss_priority = 0;</div><div class='ctx'> 		priv-&gt;bss_role = MWIFIEX_BSS_ROLE_STA;</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2956,14 +3038,10 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,</div><div class='ctx'> 			return ERR_PTR(-EFAULT);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		priv-&gt;wdev.wiphy = wiphy;</div><div class='ctx'> 		priv-&gt;wdev.iftype = NL80211_IFTYPE_AP;</div><div class='ctx'> </div><div class='ctx'> 		priv-&gt;bss_type = MWIFIEX_BSS_TYPE_UAP;</div><div class='del'>-		priv-&gt;frame_type = MWIFIEX_DATA_FRAME_TYPE_ETH_II;</div><div class='del'>-		priv-&gt;bss_priority = 0;</div><div class='ctx'> 		priv-&gt;bss_role = MWIFIEX_BSS_ROLE_UAP;</div><div class='del'>-		priv-&gt;bss_started = 0;</div><div class='ctx'> 		priv-&gt;bss_mode = type;</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2983,7 +3061,6 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,</div><div class='ctx'> 			return ERR_PTR(-EFAULT);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		priv-&gt;wdev.wiphy = wiphy;</div><div class='ctx'> 		/* At start-up, wpa_supplicant tries to change the interface</div><div class='ctx'> 		 * to NL80211_IFTYPE_STATION if it is not managed mode.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -2996,10 +3073,7 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,</div><div class='ctx'> 		 */</div><div class='ctx'> 		priv-&gt;bss_type = MWIFIEX_BSS_TYPE_P2P;</div><div class='ctx'> </div><div class='del'>-		priv-&gt;frame_type = MWIFIEX_DATA_FRAME_TYPE_ETH_II;</div><div class='del'>-		priv-&gt;bss_priority = MWIFIEX_BSS_ROLE_STA;</div><div class='ctx'> 		priv-&gt;bss_role = MWIFIEX_BSS_ROLE_STA;</div><div class='del'>-		priv-&gt;bss_started = 0;</div><div class='ctx'> </div><div class='ctx'> 		if (mwifiex_cfg80211_init_p2p_client(priv)) {</div><div class='ctx'> 			memset(&amp;priv-&gt;wdev, 0, sizeof(priv-&gt;wdev));</div><div class='hunk'>@@ -3013,6 +3087,11 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	priv-&gt;wdev.wiphy = wiphy;</div><div class='add'>+	priv-&gt;bss_priority = 0;</div><div class='add'>+	priv-&gt;bss_started = 0;</div><div class='add'>+	priv-&gt;frame_type = MWIFIEX_DATA_FRAME_TYPE_ETH_II;</div><div class='add'>+</div><div class='ctx'> 	dev = alloc_netdev_mqs(sizeof(struct mwifiex_private *), name,</div><div class='ctx'> 			       name_assign_type, ether_setup,</div><div class='ctx'> 			       IEEE80211_NUM_ACS, 1);</div><div class='hunk'>@@ -3035,7 +3114,7 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto err_set_bss_mode;</div><div class='ctx'> </div><div class='del'>-		ret = mwifiex_sta_init_cmd(priv, false, false);</div><div class='add'>+		ret = mwifiex_sta_init_cmd(priv, false);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto err_sta_init;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3071,7 +3150,7 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,</div><div class='ctx'> 	priv-&gt;dfs_cac_workqueue = alloc_workqueue("MWIFIEX_DFS_CAC%s",</div><div class='ctx'> 						  WQ_HIGHPRI |</div><div class='ctx'> 						  WQ_MEM_RECLAIM |</div><div class='del'>-						  WQ_UNBOUND, 1, name);</div><div class='add'>+						  WQ_UNBOUND, 0, name);</div><div class='ctx'> 	if (!priv-&gt;dfs_cac_workqueue) {</div><div class='ctx'> 		mwifiex_dbg(adapter, ERROR, "cannot alloc DFS CAC queue\n");</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -3082,7 +3161,7 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;dfs_chan_sw_workqueue = alloc_workqueue("MWIFIEX_DFS_CHSW%s",</div><div class='ctx'> 						      WQ_HIGHPRI | WQ_UNBOUND |</div><div class='del'>-						      WQ_MEM_RECLAIM, 1, name);</div><div class='add'>+						      WQ_MEM_RECLAIM, 0, name);</div><div class='ctx'> 	if (!priv-&gt;dfs_chan_sw_workqueue) {</div><div class='ctx'> 		mwifiex_dbg(adapter, ERROR, "cannot alloc DFS channel sw queue\n");</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -3108,23 +3187,7 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,</div><div class='ctx'> 	mwifiex_dev_debugfs_init(priv);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	switch (type) {</div><div class='del'>-	case NL80211_IFTYPE_UNSPECIFIED:</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		adapter-&gt;curr_iface_comb.sta_intf++;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_AP:</div><div class='del'>-		adapter-&gt;curr_iface_comb.uap_intf++;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_P2P_CLIENT:</div><div class='del'>-		adapter-&gt;curr_iface_comb.p2p_intf++;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/* This should be dead code; checked above */</div><div class='del'>-		mwifiex_dbg(adapter, ERROR, "type not supported\n");</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-	}</div><div class='add'>+	update_vif_type_counter(adapter, type, +1);</div><div class='ctx'> </div><div class='ctx'> 	return &amp;priv-&gt;wdev;</div><div class='ctx'> </div><div class='hunk'>@@ -3177,37 +3240,18 @@ int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)</div><div class='ctx'> 		cfg80211_unregister_netdevice(wdev-&gt;netdev);</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;dfs_cac_workqueue) {</div><div class='del'>-		flush_workqueue(priv-&gt;dfs_cac_workqueue);</div><div class='ctx'> 		destroy_workqueue(priv-&gt;dfs_cac_workqueue);</div><div class='ctx'> 		priv-&gt;dfs_cac_workqueue = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;dfs_chan_sw_workqueue) {</div><div class='del'>-		flush_workqueue(priv-&gt;dfs_chan_sw_workqueue);</div><div class='ctx'> 		destroy_workqueue(priv-&gt;dfs_chan_sw_workqueue);</div><div class='ctx'> 		priv-&gt;dfs_chan_sw_workqueue = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Clear the priv in adapter */</div><div class='ctx'> 	priv-&gt;netdev = NULL;</div><div class='ctx'> </div><div class='del'>-	switch (priv-&gt;bss_mode) {</div><div class='del'>-	case NL80211_IFTYPE_UNSPECIFIED:</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		adapter-&gt;curr_iface_comb.sta_intf--;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_AP:</div><div class='del'>-		adapter-&gt;curr_iface_comb.uap_intf--;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_P2P_CLIENT:</div><div class='del'>-	case NL80211_IFTYPE_P2P_GO:</div><div class='del'>-		adapter-&gt;curr_iface_comb.p2p_intf--;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		mwifiex_dbg(adapter, ERROR,</div><div class='del'>-			    "del_virtual_intf: type not supported\n");</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	update_vif_type_counter(adapter, priv-&gt;bss_mode, -1);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;bss_mode = NL80211_IFTYPE_UNSPECIFIED;</div><div class='ctx'> </div><div class='hunk'>@@ -3335,7 +3379,7 @@ static int mwifiex_set_wowlan_mef_entry(struct mwifiex_private *priv,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!wowlan-&gt;patterns[i].pkt_offset) {</div><div class='del'>-			if (!(byte_seq[0] &amp; 0x01) &amp;&amp;</div><div class='add'>+			if (is_unicast_ether_addr(byte_seq) &amp;&amp;</div><div class='ctx'> 			    (byte_seq[MWIFIEX_MEF_MAX_BYTESEQ] == 1)) {</div><div class='ctx'> 				mef_cfg-&gt;criteria |= MWIFIEX_CRITERIA_UNICAST;</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -3456,7 +3500,7 @@ static int mwifiex_cfg80211_suspend(struct wiphy *wiphy,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='ctx'> 		priv = adapter-&gt;priv[i];</div><div class='del'>-		if (priv &amp;&amp; priv-&gt;netdev)</div><div class='add'>+		if (priv-&gt;netdev)</div><div class='ctx'> 			netif_device_detach(priv-&gt;netdev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3470,7 +3514,7 @@ static int mwifiex_cfg80211_suspend(struct wiphy *wiphy,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!wowlan) {</div><div class='del'>-		mwifiex_dbg(adapter, ERROR,</div><div class='add'>+		mwifiex_dbg(adapter, INFO,</div><div class='ctx'> 			    "None of the WOWLAN triggers enabled\n");</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		goto done;</div><div class='hunk'>@@ -3528,7 +3572,7 @@ static int mwifiex_cfg80211_resume(struct wiphy *wiphy)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='ctx'> 		priv = adapter-&gt;priv[i];</div><div class='del'>-		if (priv &amp;&amp; priv-&gt;netdev)</div><div class='add'>+		if (priv-&gt;netdev)</div><div class='ctx'> 			netif_device_attach(priv-&gt;netdev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3607,6 +3651,9 @@ static int mwifiex_set_rekey_data(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	if (!ISSUPP_FIRMWARE_SUPPLICANT(priv-&gt;adapter-&gt;fw_cap_info))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;adapter-&gt;host_mlme_enabled)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	return mwifiex_send_cmd(priv, HostCmd_CMD_GTK_REKEY_OFFLOAD_CFG,</div><div class='ctx'> 				HostCmd_ACT_GEN_SET, 0, data, true);</div><div class='ctx'> }</div><div class='hunk'>@@ -3732,10 +3779,10 @@ static int mwifiex_cfg80211_set_coalesce(struct wiphy *wiphy,</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> mwifiex_cfg80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,</div><div class='del'>-			   const u8 *peer, u8 action_code, u8 dialog_token,</div><div class='del'>-			   u16 status_code, u32 peer_capability,</div><div class='del'>-			   bool initiator, const u8 *extra_ies,</div><div class='del'>-			   size_t extra_ies_len)</div><div class='add'>+			   const u8 *peer, int link_id, u8 action_code,</div><div class='add'>+			   u8 dialog_token, u16 status_code,</div><div class='add'>+			   u32 peer_capability, bool initiator,</div><div class='add'>+			   const u8 *extra_ies, size_t extra_ies_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -3922,11 +3969,42 @@ mwifiex_cfg80211_tdls_cancel_chan_switch(struct wiphy *wiphy,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='add'>+mwifiex_cfg80211_uap_add_station(struct mwifiex_private *priv, const u8 *mac,</div><div class='add'>+				 struct station_parameters *params)</div><div class='add'>+{</div><div class='add'>+	struct mwifiex_sta_info add_sta;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memcpy(add_sta.peer_mac, mac, ETH_ALEN);</div><div class='add'>+	add_sta.params = params;</div><div class='add'>+</div><div class='add'>+	ret = mwifiex_send_cmd(priv, HostCmd_CMD_ADD_NEW_STATION,</div><div class='add'>+			       HostCmd_ACT_ADD_STA, 0, (void *)&amp;add_sta, true);</div><div class='add'>+</div><div class='add'>+	if (!ret) {</div><div class='add'>+		struct station_info *sinfo;</div><div class='add'>+</div><div class='add'>+		sinfo = kzalloc(sizeof(*sinfo), GFP_KERNEL);</div><div class='add'>+		if (!sinfo)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		cfg80211_new_sta(priv-&gt;netdev, mac, sinfo, GFP_KERNEL);</div><div class='add'>+		kfree(sinfo);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='ctx'> mwifiex_cfg80211_add_station(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 			     const u8 *mac, struct station_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;adapter-&gt;host_mlme_enabled &amp;&amp;</div><div class='add'>+	    (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP))</div><div class='add'>+		return mwifiex_cfg80211_uap_add_station(priv, mac, params);</div><div class='add'>+</div><div class='ctx'> 	if (!(params-&gt;sta_flags_set &amp; BIT(NL80211_STA_FLAG_TDLS_PEER)))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='hunk'>@@ -3952,7 +4030,7 @@ mwifiex_cfg80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;wdev.cac_started)</div><div class='add'>+	if (priv-&gt;wdev.links[0].cac_started)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	if (cfg80211_chandef_identical(&amp;params-&gt;chandef,</div><div class='hunk'>@@ -3997,6 +4075,7 @@ mwifiex_cfg80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> static int mwifiex_cfg80211_get_channel(struct wiphy *wiphy,</div><div class='ctx'> 					struct wireless_dev *wdev,</div><div class='add'>+					unsigned int link_id,</div><div class='ctx'> 					struct cfg80211_chan_def *chandef)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_private *priv = mwifiex_netdev_get_priv(wdev-&gt;netdev);</div><div class='hunk'>@@ -4118,7 +4197,7 @@ static int</div><div class='ctx'> mwifiex_cfg80211_start_radar_detection(struct wiphy *wiphy,</div><div class='ctx'> 				       struct net_device *dev,</div><div class='ctx'> 				       struct cfg80211_chan_def *chandef,</div><div class='del'>-				       u32 cac_time_ms)</div><div class='add'>+				       u32 cac_time_ms, int link_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);</div><div class='ctx'> 	struct mwifiex_radar_params radar_params;</div><div class='hunk'>@@ -4163,6 +4242,10 @@ mwifiex_cfg80211_change_station(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;adapter-&gt;host_mlme_enabled &amp;&amp;</div><div class='add'>+	    (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/* we support change_station handler only for TDLS peers*/</div><div class='ctx'> 	if (!(params-&gt;sta_flags_set &amp; BIT(NL80211_STA_FLAG_TDLS_PEER)))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -4179,8 +4262,307 @@ mwifiex_cfg80211_change_station(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+mwifiex_cfg80211_authenticate(struct wiphy *wiphy,</div><div class='add'>+			      struct net_device *dev,</div><div class='add'>+			      struct cfg80211_auth_request *req)</div><div class='add'>+{</div><div class='add'>+	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);</div><div class='add'>+	struct mwifiex_adapter *adapter = priv-&gt;adapter;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u16 pkt_len, auth_alg;</div><div class='add'>+	int ret;</div><div class='add'>+	struct mwifiex_ieee80211_mgmt *mgmt;</div><div class='add'>+	struct mwifiex_txinfo *tx_info;</div><div class='add'>+	u32 tx_control = 0, pkt_type = PKT_TYPE_MGMT;</div><div class='add'>+	u8 trans = 1, status_code = 0;</div><div class='add'>+	u8 *varptr = NULL;</div><div class='add'>+</div><div class='add'>+	if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP) {</div><div class='add'>+		mwifiex_dbg(priv-&gt;adapter, ERROR, "Interface role is AP\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;wdev.iftype != NL80211_IFTYPE_STATION) {</div><div class='add'>+		mwifiex_dbg(priv-&gt;adapter, ERROR,</div><div class='add'>+			    "Interface type is not correct (type %d)\n",</div><div class='add'>+			    priv-&gt;wdev.iftype);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;auth_alg != WLAN_AUTH_SAE &amp;&amp;</div><div class='add'>+	    (priv-&gt;auth_flag &amp; HOST_MLME_AUTH_PENDING)) {</div><div class='add'>+		mwifiex_dbg(priv-&gt;adapter, ERROR, "Pending auth on going\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;host_mlme_reg) {</div><div class='add'>+		priv-&gt;host_mlme_reg = true;</div><div class='add'>+		priv-&gt;mgmt_frame_mask |= HOST_MLME_MGMT_MASK;</div><div class='add'>+		mwifiex_send_cmd(priv, HostCmd_CMD_MGMT_FRAME_REG,</div><div class='add'>+				 HostCmd_ACT_GEN_SET, 0,</div><div class='add'>+				 &amp;priv-&gt;mgmt_frame_mask, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (req-&gt;auth_type) {</div><div class='add'>+	case NL80211_AUTHTYPE_OPEN_SYSTEM:</div><div class='add'>+		auth_alg = WLAN_AUTH_OPEN;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_AUTHTYPE_SHARED_KEY:</div><div class='add'>+		auth_alg = WLAN_AUTH_SHARED_KEY;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_AUTHTYPE_FT:</div><div class='add'>+		auth_alg = WLAN_AUTH_FT;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_AUTHTYPE_NETWORK_EAP:</div><div class='add'>+		auth_alg = WLAN_AUTH_LEAP;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_AUTHTYPE_SAE:</div><div class='add'>+		auth_alg = WLAN_AUTH_SAE;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		mwifiex_dbg(priv-&gt;adapter, ERROR,</div><div class='add'>+			    "unsupported auth type=%d\n", req-&gt;auth_type);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;auth_flag) {</div><div class='add'>+		ret = mwifiex_remain_on_chan_cfg(priv, HostCmd_ACT_GEN_SET,</div><div class='add'>+						 req-&gt;bss-&gt;channel,</div><div class='add'>+						 AUTH_TX_DEFAULT_WAIT_TIME);</div><div class='add'>+</div><div class='add'>+		if (!ret) {</div><div class='add'>+			priv-&gt;roc_cfg.cookie = get_random_u32() | 1;</div><div class='add'>+			priv-&gt;roc_cfg.chan = *req-&gt;bss-&gt;channel;</div><div class='add'>+		} else {</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;sec_info.authentication_mode = auth_alg;</div><div class='add'>+</div><div class='add'>+	mwifiex_cancel_scan(adapter);</div><div class='add'>+</div><div class='add'>+	pkt_len = (u16)req-&gt;ie_len + req-&gt;auth_data_len +</div><div class='add'>+		MWIFIEX_MGMT_HEADER_LEN + MWIFIEX_AUTH_BODY_LEN;</div><div class='add'>+	if (req-&gt;auth_data_len &gt;= 4)</div><div class='add'>+		pkt_len -= 4;</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(MWIFIEX_MIN_DATA_HEADER_LEN +</div><div class='add'>+			    MWIFIEX_MGMT_FRAME_HEADER_SIZE +</div><div class='add'>+			    pkt_len + sizeof(pkt_len));</div><div class='add'>+	if (!skb) {</div><div class='add'>+		mwifiex_dbg(priv-&gt;adapter, ERROR,</div><div class='add'>+			    "allocate skb failed for management frame\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tx_info = MWIFIEX_SKB_TXCB(skb);</div><div class='add'>+	memset(tx_info, 0, sizeof(*tx_info));</div><div class='add'>+	tx_info-&gt;bss_num = priv-&gt;bss_num;</div><div class='add'>+	tx_info-&gt;bss_type = priv-&gt;bss_type;</div><div class='add'>+	tx_info-&gt;pkt_len = pkt_len;</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb, MWIFIEX_MIN_DATA_HEADER_LEN +</div><div class='add'>+		    MWIFIEX_MGMT_FRAME_HEADER_SIZE + sizeof(pkt_len));</div><div class='add'>+	memcpy(skb_push(skb, sizeof(pkt_len)), &amp;pkt_len, sizeof(pkt_len));</div><div class='add'>+	memcpy(skb_push(skb, sizeof(tx_control)),</div><div class='add'>+	       &amp;tx_control, sizeof(tx_control));</div><div class='add'>+	memcpy(skb_push(skb, sizeof(pkt_type)), &amp;pkt_type, sizeof(pkt_type));</div><div class='add'>+</div><div class='add'>+	mgmt = (struct mwifiex_ieee80211_mgmt *)skb_put(skb, pkt_len);</div><div class='add'>+	memset(mgmt, 0, pkt_len);</div><div class='add'>+	mgmt-&gt;frame_control =</div><div class='add'>+		cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_AUTH);</div><div class='add'>+	memcpy(mgmt-&gt;da, req-&gt;bss-&gt;bssid, ETH_ALEN);</div><div class='add'>+	memcpy(mgmt-&gt;sa, priv-&gt;curr_addr, ETH_ALEN);</div><div class='add'>+	memcpy(mgmt-&gt;bssid, req-&gt;bss-&gt;bssid, ETH_ALEN);</div><div class='add'>+	eth_broadcast_addr(mgmt-&gt;addr4);</div><div class='add'>+</div><div class='add'>+	if (req-&gt;auth_data_len &gt;= 4) {</div><div class='add'>+		if (req-&gt;auth_type == NL80211_AUTHTYPE_SAE) {</div><div class='add'>+			__le16 *pos = (__le16 *)req-&gt;auth_data;</div><div class='add'>+</div><div class='add'>+			trans = le16_to_cpu(pos[0]);</div><div class='add'>+			status_code = le16_to_cpu(pos[1]);</div><div class='add'>+		}</div><div class='add'>+		memcpy((u8 *)(&amp;mgmt-&gt;auth.variable), req-&gt;auth_data + 4,</div><div class='add'>+		       req-&gt;auth_data_len - 4);</div><div class='add'>+		varptr = (u8 *)&amp;mgmt-&gt;auth.variable +</div><div class='add'>+			 (req-&gt;auth_data_len - 4);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mgmt-&gt;auth.auth_alg = cpu_to_le16(auth_alg);</div><div class='add'>+	mgmt-&gt;auth.auth_transaction = cpu_to_le16(trans);</div><div class='add'>+	mgmt-&gt;auth.status_code = cpu_to_le16(status_code);</div><div class='add'>+</div><div class='add'>+	if (req-&gt;ie &amp;&amp; req-&gt;ie_len) {</div><div class='add'>+		if (!varptr)</div><div class='add'>+			varptr = (u8 *)&amp;mgmt-&gt;auth.variable;</div><div class='add'>+		memcpy((u8 *)varptr, req-&gt;ie, req-&gt;ie_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;auth_flag = HOST_MLME_AUTH_PENDING;</div><div class='add'>+	priv-&gt;auth_alg = auth_alg;</div><div class='add'>+</div><div class='add'>+	skb-&gt;priority = WMM_HIGHEST_PRIORITY;</div><div class='add'>+	__net_timestamp(skb);</div><div class='add'>+</div><div class='add'>+	mwifiex_dbg(priv-&gt;adapter, MSG,</div><div class='add'>+		    "auth: send authentication to %pM\n", req-&gt;bss-&gt;bssid);</div><div class='add'>+</div><div class='add'>+	mwifiex_queue_tx_pkt(priv, skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mwifiex_cfg80211_associate(struct wiphy *wiphy, struct net_device *dev,</div><div class='add'>+			   struct cfg80211_assoc_request *req)</div><div class='add'>+{</div><div class='add'>+	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);</div><div class='add'>+	struct mwifiex_adapter *adapter = priv-&gt;adapter;</div><div class='add'>+	int ret;</div><div class='add'>+	struct cfg80211_ssid req_ssid;</div><div class='add'>+	const u8 *ssid_ie;</div><div class='add'>+</div><div class='add'>+	if (GET_BSS_ROLE(priv) != MWIFIEX_BSS_ROLE_STA) {</div><div class='add'>+		mwifiex_dbg(adapter, ERROR,</div><div class='add'>+			    "%s: reject infra assoc request in non-STA role\n",</div><div class='add'>+			    dev-&gt;name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(MWIFIEX_SURPRISE_REMOVED, &amp;adapter-&gt;work_flags) ||</div><div class='add'>+	    test_bit(MWIFIEX_IS_CMD_TIMEDOUT, &amp;adapter-&gt;work_flags)) {</div><div class='add'>+		mwifiex_dbg(adapter, ERROR,</div><div class='add'>+			    "%s: Ignore association.\t"</div><div class='add'>+			    "Card removed or FW in bad state\n",</div><div class='add'>+			    dev-&gt;name);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;auth_alg == WLAN_AUTH_SAE)</div><div class='add'>+		priv-&gt;auth_flag = HOST_MLME_AUTH_DONE;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;auth_flag &amp;&amp; !(priv-&gt;auth_flag &amp; HOST_MLME_AUTH_DONE))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;roc_cfg.cookie) {</div><div class='add'>+		ret = mwifiex_remain_on_chan_cfg(priv, HostCmd_ACT_GEN_REMOVE,</div><div class='add'>+						 &amp;priv-&gt;roc_cfg.chan, 0);</div><div class='add'>+		if (!ret)</div><div class='add'>+			memset(&amp;priv-&gt;roc_cfg, 0,</div><div class='add'>+			       sizeof(struct mwifiex_roc_cfg));</div><div class='add'>+		else</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mwifiex_stop_bg_scan(priv))</div><div class='add'>+		cfg80211_sched_scan_stopped_locked(priv-&gt;wdev.wiphy, 0);</div><div class='add'>+</div><div class='add'>+	memset(&amp;req_ssid, 0, sizeof(struct cfg80211_ssid));</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ssid_ie = ieee80211_bss_get_ie(req-&gt;bss, WLAN_EID_SSID);</div><div class='add'>+</div><div class='add'>+	if (!ssid_ie)</div><div class='add'>+		goto ssid_err;</div><div class='add'>+</div><div class='add'>+	req_ssid.ssid_len = ssid_ie[1];</div><div class='add'>+	if (req_ssid.ssid_len &gt; IEEE80211_MAX_SSID_LEN) {</div><div class='add'>+		mwifiex_dbg(adapter, ERROR, "invalid SSID - aborting\n");</div><div class='add'>+		goto ssid_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(req_ssid.ssid, ssid_ie + 2, req_ssid.ssid_len);</div><div class='add'>+	if (!req_ssid.ssid_len || req_ssid.ssid[0] &lt; 0x20) {</div><div class='add'>+		mwifiex_dbg(adapter, ERROR, "invalid SSID - aborting\n");</div><div class='add'>+		goto ssid_err;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	/* As this is new association, clear locally stored</div><div class='add'>+	 * keys and security related flags</div><div class='add'>+	 */</div><div class='add'>+	priv-&gt;sec_info.wpa_enabled = false;</div><div class='add'>+	priv-&gt;sec_info.wpa2_enabled = false;</div><div class='add'>+	priv-&gt;wep_key_curr_index = 0;</div><div class='add'>+	priv-&gt;sec_info.encryption_mode = 0;</div><div class='add'>+	priv-&gt;sec_info.is_authtype_auto = 0;</div><div class='add'>+	if (mwifiex_set_encode(priv, NULL, NULL, 0, 0, NULL, 1)) {</div><div class='add'>+		mwifiex_dbg(priv-&gt;adapter, ERROR, "deleting the crypto keys\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (req-&gt;crypto.n_ciphers_pairwise)</div><div class='add'>+		priv-&gt;sec_info.encryption_mode =</div><div class='add'>+			req-&gt;crypto.ciphers_pairwise[0];</div><div class='add'>+</div><div class='add'>+	if (req-&gt;crypto.cipher_group)</div><div class='add'>+		priv-&gt;sec_info.encryption_mode = req-&gt;crypto.cipher_group;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;ie)</div><div class='add'>+		mwifiex_set_gen_ie(priv, req-&gt;ie, req-&gt;ie_len);</div><div class='add'>+</div><div class='add'>+	memcpy(priv-&gt;cfg_bssid, req-&gt;bss-&gt;bssid, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	mwifiex_dbg(adapter, MSG,</div><div class='add'>+		    "assoc: send association to %pM\n", req-&gt;bss-&gt;bssid);</div><div class='add'>+</div><div class='add'>+	cfg80211_ref_bss(adapter-&gt;wiphy, req-&gt;bss);</div><div class='add'>+	ret = mwifiex_bss_start(priv, req-&gt;bss, &amp;req_ssid);</div><div class='add'>+	if (ret) {</div><div class='add'>+		priv-&gt;auth_flag = 0;</div><div class='add'>+		priv-&gt;auth_alg = WLAN_AUTH_NONE;</div><div class='add'>+		eth_zero_addr(priv-&gt;cfg_bssid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;assoc_rsp_size) {</div><div class='add'>+		priv-&gt;req_bss = req-&gt;bss;</div><div class='add'>+		adapter-&gt;assoc_resp_received = true;</div><div class='add'>+		queue_work(adapter-&gt;host_mlme_workqueue,</div><div class='add'>+			   &amp;adapter-&gt;host_mlme_work);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cfg80211_put_bss(priv-&gt;adapter-&gt;wiphy, req-&gt;bss);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ssid_err:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return -EFAULT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mwifiex_cfg80211_deauthenticate(struct wiphy *wiphy,</div><div class='add'>+				struct net_device *dev,</div><div class='add'>+				struct cfg80211_deauth_request *req)</div><div class='add'>+{</div><div class='add'>+	return mwifiex_cfg80211_disconnect(wiphy, dev, req-&gt;reason_code);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mwifiex_cfg80211_disassociate(struct wiphy *wiphy,</div><div class='add'>+			      struct net_device *dev,</div><div class='add'>+			      struct cfg80211_disassoc_request *req)</div><div class='add'>+{</div><div class='add'>+	return mwifiex_cfg80211_disconnect(wiphy, dev, req-&gt;reason_code);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mwifiex_cfg80211_probe_client(struct wiphy *wiphy,</div><div class='add'>+			      struct net_device *dev, const u8 *peer,</div><div class='add'>+			      u64 *cookie)</div><div class='add'>+{</div><div class='add'>+	/* hostapd looks for NL80211_CMD_PROBE_CLIENT support; otherwise,</div><div class='add'>+	 * it requires monitor-mode support (which mwifiex doesn't support).</div><div class='add'>+	 * Provide fake probe_client support to work around this.</div><div class='add'>+	 */</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* station cfg80211 operations */</div><div class='del'>-static struct cfg80211_ops mwifiex_cfg80211_ops = {</div><div class='add'>+static const struct cfg80211_ops mwifiex_cfg80211_ops = {</div><div class='ctx'> 	.add_virtual_intf = mwifiex_add_virtual_intf,</div><div class='ctx'> 	.del_virtual_intf = mwifiex_del_virtual_intf,</div><div class='ctx'> 	.change_virtual_intf = mwifiex_cfg80211_change_virtual_intf,</div><div class='hunk'>@@ -4290,8 +4672,9 @@ int mwifiex_init_channel_scan_gap(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	 * additional active scan request for hidden SSIDs on passive channels.</div><div class='ctx'> 	 */</div><div class='ctx'> 	adapter-&gt;num_in_chan_stats = 2 * (n_channels_bg + n_channels_a);</div><div class='del'>-	adapter-&gt;chan_stats = vmalloc(array_size(sizeof(*adapter-&gt;chan_stats),</div><div class='del'>-						 adapter-&gt;num_in_chan_stats));</div><div class='add'>+	adapter-&gt;chan_stats = kcalloc(adapter-&gt;num_in_chan_stats,</div><div class='add'>+				      sizeof(*adapter-&gt;chan_stats),</div><div class='add'>+				      GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (!adapter-&gt;chan_stats)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -4313,34 +4696,84 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	void *wdev_priv;</div><div class='ctx'> 	struct wiphy *wiphy;</div><div class='ctx'> 	struct mwifiex_private *priv = adapter-&gt;priv[MWIFIEX_BSS_TYPE_STA];</div><div class='del'>-	u8 *country_code;</div><div class='add'>+	const u8 *country_code;</div><div class='ctx'> 	u32 thr, retry;</div><div class='add'>+	struct cfg80211_ops *ops;</div><div class='add'>+</div><div class='add'>+	ops = devm_kmemdup(adapter-&gt;dev, &amp;mwifiex_cfg80211_ops,</div><div class='add'>+			   sizeof(mwifiex_cfg80211_ops), GFP_KERNEL);</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* create a new wiphy for use with cfg80211 */</div><div class='del'>-	wiphy = wiphy_new(&amp;mwifiex_cfg80211_ops,</div><div class='del'>-			  sizeof(struct mwifiex_adapter *));</div><div class='add'>+	wiphy = wiphy_new(ops, sizeof(struct mwifiex_adapter *));</div><div class='ctx'> 	if (!wiphy) {</div><div class='ctx'> 		mwifiex_dbg(adapter, ERROR,</div><div class='ctx'> 			    "%s: creating new wiphy\n", __func__);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='add'>+	if (adapter-&gt;host_mlme_enabled) {</div><div class='add'>+		ops-&gt;auth = mwifiex_cfg80211_authenticate;</div><div class='add'>+		ops-&gt;assoc = mwifiex_cfg80211_associate;</div><div class='add'>+		ops-&gt;deauth = mwifiex_cfg80211_deauthenticate;</div><div class='add'>+		ops-&gt;disassoc = mwifiex_cfg80211_disassociate;</div><div class='add'>+		ops-&gt;disconnect = NULL;</div><div class='add'>+		ops-&gt;connect = NULL;</div><div class='add'>+		ops-&gt;probe_client = mwifiex_cfg80211_probe_client;</div><div class='add'>+	}</div><div class='ctx'> 	wiphy-&gt;max_scan_ssids = MWIFIEX_MAX_SSID_LIST_LENGTH;</div><div class='ctx'> 	wiphy-&gt;max_scan_ie_len = MWIFIEX_MAX_VSIE_LEN;</div><div class='del'>-	wiphy-&gt;mgmt_stypes = mwifiex_mgmt_stypes;</div><div class='add'>+	if (adapter-&gt;host_mlme_enabled) {</div><div class='add'>+		memcpy(adapter-&gt;mwifiex_mgmt_stypes,</div><div class='add'>+		       mwifiex_mgmt_stypes,</div><div class='add'>+		       NUM_NL80211_IFTYPES *</div><div class='add'>+		       sizeof(struct ieee80211_txrx_stypes));</div><div class='add'>+</div><div class='add'>+		adapter-&gt;mwifiex_mgmt_stypes[NL80211_IFTYPE_AP].tx = 0xffff;</div><div class='add'>+		adapter-&gt;mwifiex_mgmt_stypes[NL80211_IFTYPE_AP].rx =</div><div class='add'>+			BIT(IEEE80211_STYPE_ASSOC_REQ &gt;&gt; 4) |</div><div class='add'>+			BIT(IEEE80211_STYPE_REASSOC_REQ &gt;&gt; 4) |</div><div class='add'>+			BIT(IEEE80211_STYPE_PROBE_REQ &gt;&gt; 4) |</div><div class='add'>+			BIT(IEEE80211_STYPE_DISASSOC &gt;&gt; 4) |</div><div class='add'>+			BIT(IEEE80211_STYPE_AUTH &gt;&gt; 4) |</div><div class='add'>+			BIT(IEEE80211_STYPE_DEAUTH &gt;&gt; 4) |</div><div class='add'>+			BIT(IEEE80211_STYPE_ACTION &gt;&gt; 4);</div><div class='add'>+		wiphy-&gt;mgmt_stypes = adapter-&gt;mwifiex_mgmt_stypes;</div><div class='add'>+	} else {</div><div class='add'>+		wiphy-&gt;mgmt_stypes = mwifiex_mgmt_stypes;</div><div class='add'>+	}</div><div class='ctx'> 	wiphy-&gt;max_remain_on_channel_duration = 5000;</div><div class='ctx'> 	wiphy-&gt;interface_modes = BIT(NL80211_IFTYPE_STATION) |</div><div class='ctx'> 				 BIT(NL80211_IFTYPE_P2P_CLIENT) |</div><div class='ctx'> 				 BIT(NL80211_IFTYPE_P2P_GO) |</div><div class='ctx'> 				 BIT(NL80211_IFTYPE_AP);</div><div class='ctx'> </div><div class='add'>+	wiphy-&gt;max_num_akm_suites = CFG80211_MAX_NUM_AKM_SUITES;</div><div class='add'>+</div><div class='ctx'> 	if (ISSUPP_ADHOC_ENABLED(adapter-&gt;fw_cap_info))</div><div class='ctx'> 		wiphy-&gt;interface_modes |= BIT(NL80211_IFTYPE_ADHOC);</div><div class='ctx'> </div><div class='del'>-	wiphy-&gt;bands[NL80211_BAND_2GHZ] = &amp;mwifiex_band_2ghz;</div><div class='del'>-	if (adapter-&gt;config_bands &amp; BAND_A)</div><div class='del'>-		wiphy-&gt;bands[NL80211_BAND_5GHZ] = &amp;mwifiex_band_5ghz;</div><div class='del'>-	else</div><div class='add'>+	wiphy-&gt;bands[NL80211_BAND_2GHZ] = devm_kmemdup(adapter-&gt;dev,</div><div class='add'>+						       &amp;mwifiex_band_2ghz,</div><div class='add'>+						       sizeof(mwifiex_band_2ghz),</div><div class='add'>+						       GFP_KERNEL);</div><div class='add'>+	if (!wiphy-&gt;bands[NL80211_BAND_2GHZ]) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;config_bands &amp; BAND_A) {</div><div class='add'>+		wiphy-&gt;bands[NL80211_BAND_5GHZ] = devm_kmemdup(adapter-&gt;dev,</div><div class='add'>+							       &amp;mwifiex_band_5ghz,</div><div class='add'>+							       sizeof(mwifiex_band_5ghz),</div><div class='add'>+							       GFP_KERNEL);</div><div class='add'>+		if (!wiphy-&gt;bands[NL80211_BAND_5GHZ]) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='ctx'> 		wiphy-&gt;bands[NL80211_BAND_5GHZ] = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;drcs_enabled &amp;&amp; ISSUPP_DRCS_ENABLED(adapter-&gt;fw_cap_info))</div><div class='ctx'> 		wiphy-&gt;iface_combinations = &amp;mwifiex_iface_comb_ap_sta_drcs;</div><div class='hunk'>@@ -4350,10 +4783,9 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		wiphy-&gt;iface_combinations = &amp;mwifiex_iface_comb_ap_sta;</div><div class='ctx'> 	wiphy-&gt;n_iface_combinations = 1;</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;max_sta_conn &gt; adapter-&gt;max_p2p_conn)</div><div class='del'>-		wiphy-&gt;max_ap_assoc_sta = adapter-&gt;max_sta_conn;</div><div class='del'>-	else</div><div class='del'>-		wiphy-&gt;max_ap_assoc_sta = adapter-&gt;max_p2p_conn;</div><div class='add'>+	wiphy-&gt;max_ap_assoc_sta = max_t(typeof(wiphy-&gt;max_ap_assoc_sta),</div><div class='add'>+					adapter-&gt;max_sta_conn,</div><div class='add'>+					adapter-&gt;max_p2p_conn);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize cipher suits */</div><div class='ctx'> 	wiphy-&gt;cipher_suites = mwifiex_cipher_suites;</div><div class='hunk'>@@ -4368,13 +4800,18 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	ether_addr_copy(wiphy-&gt;perm_addr, adapter-&gt;perm_addr);</div><div class='ctx'> 	wiphy-&gt;signal_type = CFG80211_SIGNAL_TYPE_MBM;</div><div class='del'>-	wiphy-&gt;flags |= WIPHY_FLAG_HAVE_AP_SME |</div><div class='del'>-			WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD |</div><div class='add'>+	wiphy-&gt;flags |= WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD |</div><div class='ctx'> 			WIPHY_FLAG_AP_UAPSD |</div><div class='ctx'> 			WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL |</div><div class='ctx'> 			WIPHY_FLAG_HAS_CHANNEL_SWITCH |</div><div class='add'>+			WIPHY_FLAG_NETNS_OK |</div><div class='ctx'> 			WIPHY_FLAG_PS_ON_BY_DEFAULT;</div><div class='ctx'> </div><div class='add'>+	if (adapter-&gt;host_mlme_enabled)</div><div class='add'>+		wiphy-&gt;flags |= WIPHY_FLAG_REPORTS_OBSS;</div><div class='add'>+	else</div><div class='add'>+		wiphy-&gt;flags |= WIPHY_FLAG_HAVE_AP_SME;</div><div class='add'>+</div><div class='ctx'> 	if (ISSUPP_TDLS_ENABLED(adapter-&gt;fw_cap_info))</div><div class='ctx'> 		wiphy-&gt;flags |= WIPHY_FLAG_SUPPORTS_TDLS |</div><div class='ctx'> 				WIPHY_FLAG_TDLS_EXTERNAL_SETUP;</div><div class='hunk'>@@ -4404,6 +4841,9 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)</div><div class='ctx'> 			   NL80211_FEATURE_LOW_PRIORITY_SCAN |</div><div class='ctx'> 			   NL80211_FEATURE_NEED_OBSS_SCAN;</div><div class='ctx'> </div><div class='add'>+	if (adapter-&gt;host_mlme_enabled)</div><div class='add'>+		wiphy-&gt;features |= NL80211_FEATURE_SAE;</div><div class='add'>+</div><div class='ctx'> 	if (ISSUPP_ADHOC_ENABLED(adapter-&gt;fw_cap_info))</div><div class='ctx'> 		wiphy-&gt;features |= NL80211_FEATURE_HT_IBSS;</div><div class='ctx'> </div><div class='hunk'>@@ -4433,8 +4873,7 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		mwifiex_dbg(adapter, ERROR,</div><div class='ctx'> 			    "%s: wiphy_register failed: %d\n", __func__, ret);</div><div class='del'>-		wiphy_free(wiphy);</div><div class='del'>-		return ret;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!adapter-&gt;regd) {</div><div class='hunk'>@@ -4476,4 +4915,9 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;wiphy = wiphy;</div><div class='ctx'> 	return ret;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	wiphy_free(wiphy);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.h b/drivers/net/wireless/marvell/mwifiex/cfg80211.h<br/>index 530a63f13f14..50f7001f5ef0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/cfg80211.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/cfg80211.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/cfg80211.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/cfg80211.h</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: CFG80211</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MWIFIEX_CFG80211__</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/cfp.c b/drivers/net/wireless/marvell/mwifiex/cfp.c<br/>index fb91ecfc5546..686bf12b6c26 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/cfp.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/cfp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/cfp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/cfp.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: Channel, Frequence and Power</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "decl.h"</div><div class='hunk'>@@ -162,10 +150,10 @@ static const u16 ac_mcs_rate_nss2[8][10] = {</div><div class='ctx'> </div><div class='ctx'> struct region_code_mapping {</div><div class='ctx'> 	u8 code;</div><div class='del'>-	u8 region[IEEE80211_COUNTRY_STRING_LEN];</div><div class='add'>+	u8 region[IEEE80211_COUNTRY_STRING_LEN] __nonstring;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct region_code_mapping region_code_mapping_t[] = {</div><div class='add'>+static const struct region_code_mapping region_code_mapping_t[] = {</div><div class='ctx'> 	{ 0x10, "US " }, /* US FCC */</div><div class='ctx'> 	{ 0x20, "CA " }, /* IC Canada */</div><div class='ctx'> 	{ 0x30, "FR " }, /* France */</div><div class='hunk'>@@ -177,7 +165,7 @@ static struct region_code_mapping region_code_mapping_t[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* This function converts integer code to region string */</div><div class='del'>-u8 *mwifiex_11d_code_2_region(u8 code)</div><div class='add'>+const u8 *mwifiex_11d_code_2_region(u8 code)</div><div class='ctx'> {</div><div class='ctx'> 	u8 i;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c<br/>index 3a11342a6bde..0f466c31337f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/cmdevt.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/cmdevt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/cmdevt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/cmdevt.c</a></div><div class='hunk'>@@ -1,23 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: commands and events</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include "decl.h"</div><div class='ctx'> #include "ioctl.h"</div><div class='ctx'> #include "util.h"</div><div class='hunk'>@@ -171,11 +159,9 @@ static int mwifiex_cmd_host_cmd(struct mwifiex_private *priv,</div><div class='ctx'>  * sending. Afterwards, it logs the command ID and action for debugging</div><div class='ctx'>  * and sets up the command timeout timer.</div><div class='ctx'>  */</div><div class='del'>-static int mwifiex_dnld_cmd_to_fw(struct mwifiex_private *priv,</div><div class='add'>+static int mwifiex_dnld_cmd_to_fw(struct mwifiex_adapter *adapter,</div><div class='ctx'> 				  struct cmd_ctrl_node *cmd_node)</div><div class='ctx'> {</div><div class='del'>-</div><div class='del'>-	struct mwifiex_adapter *adapter = priv-&gt;adapter;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct host_cmd_ds_command *host_cmd;</div><div class='ctx'> 	uint16_t cmd_code;</div><div class='hunk'>@@ -187,7 +173,7 @@ static int mwifiex_dnld_cmd_to_fw(struct mwifiex_private *priv,</div><div class='ctx'> 	host_cmd = (struct host_cmd_ds_command *) (cmd_node-&gt;cmd_skb-&gt;data);</div><div class='ctx'> </div><div class='ctx'> 	/* Sanity test */</div><div class='del'>-	if (host_cmd == NULL || host_cmd-&gt;size == 0) {</div><div class='add'>+	if (host_cmd-&gt;size == 0) {</div><div class='ctx'> 		mwifiex_dbg(adapter, ERROR,</div><div class='ctx'> 			    "DNLD_CMD: host_cmd is null\t"</div><div class='ctx'> 			    "or cmd size is 0, not sending\n");</div><div class='hunk'>@@ -379,8 +365,7 @@ static int mwifiex_dnld_sleep_confirm_cmd(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	    (test_bit(MWIFIEX_IS_HS_CONFIGURED, &amp;adapter-&gt;work_flags) &amp;&amp;</div><div class='ctx'> 	     !adapter-&gt;sleep_period.period)) {</div><div class='ctx'> 		adapter-&gt;pm_wakeup_card_req = true;</div><div class='del'>-		mwifiex_hs_activated_event(mwifiex_get_priv</div><div class='del'>-				(adapter, MWIFIEX_BSS_ROLE_ANY), true);</div><div class='add'>+		mwifiex_hs_activated_event(adapter, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -485,8 +470,7 @@ void mwifiex_free_cmd_buffer(struct mwifiex_adapter *adapter)</div><div class='ctx'> int mwifiex_process_event(struct mwifiex_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, i;</div><div class='del'>-	struct mwifiex_private *priv =</div><div class='del'>-		mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);</div><div class='add'>+	struct mwifiex_private *priv;</div><div class='ctx'> 	struct sk_buff *skb = adapter-&gt;event_skb;</div><div class='ctx'> 	u32 eventcause;</div><div class='ctx'> 	struct mwifiex_rxinfo *rx_info;</div><div class='hunk'>@@ -494,7 +478,7 @@ int mwifiex_process_event(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	if ((adapter-&gt;event_cause &amp; EVENT_ID_MASK) == EVENT_RADAR_DETECTED) {</div><div class='ctx'> 		for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='ctx'> 			priv = adapter-&gt;priv[i];</div><div class='del'>-			if (priv &amp;&amp; mwifiex_is_11h_active(priv)) {</div><div class='add'>+			if (mwifiex_is_11h_active(priv)) {</div><div class='ctx'> 				adapter-&gt;event_cause |=</div><div class='ctx'> 					((priv-&gt;bss_num &amp; 0xff) &lt;&lt; 16) |</div><div class='ctx'> 					((priv-&gt;bss_type &amp; 0xff) &lt;&lt; 24);</div><div class='hunk'>@@ -608,6 +592,11 @@ int mwifiex_send_cmd(struct mwifiex_private *priv, u16 cmd_no,</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;adapter-&gt;hs_activated_manually &amp;&amp;</div><div class='add'>+	    cmd_no != HostCmd_CMD_802_11_HS_CFG_ENH) {</div><div class='add'>+		mwifiex_cancel_hs(priv, MWIFIEX_ASYNC_CMD);</div><div class='add'>+		priv-&gt;adapter-&gt;hs_activated_manually = false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get a new command node */</div><div class='ctx'> 	cmd_node = mwifiex_get_cmd_node(adapter);</div><div class='hunk'>@@ -642,6 +631,8 @@ int mwifiex_send_cmd(struct mwifiex_private *priv, u16 cmd_no,</div><div class='ctx'> 		case HostCmd_CMD_UAP_STA_DEAUTH:</div><div class='ctx'> 		case HOST_CMD_APCMD_SYS_RESET:</div><div class='ctx'> 		case HOST_CMD_APCMD_STA_LIST:</div><div class='add'>+		case HostCmd_CMD_CHAN_REPORT_REQUEST:</div><div class='add'>+		case HostCmd_CMD_ADD_NEW_STATION:</div><div class='ctx'> 			ret = mwifiex_uap_prepare_cmd(priv, cmd_no, cmd_action,</div><div class='ctx'> 						      cmd_oid, data_buf,</div><div class='ctx'> 						      cmd_ptr);</div><div class='hunk'>@@ -714,6 +705,15 @@ mwifiex_insert_cmd_to_pending_q(struct mwifiex_adapter *adapter,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Same with exit host sleep cmd, luckily that can't happen at the same time as EXIT_PS */</div><div class='add'>+	if (command == HostCmd_CMD_802_11_HS_CFG_ENH) {</div><div class='add'>+		struct host_cmd_ds_802_11_hs_cfg_enh *hs_cfg =</div><div class='add'>+			&amp;host_cmd-&gt;params.opt_hs_cfg;</div><div class='add'>+</div><div class='add'>+		if (le16_to_cpu(hs_cfg-&gt;action) == HS_ACTIVATE)</div><div class='add'>+				add_tail = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	spin_lock_bh(&amp;adapter-&gt;cmd_pending_q_lock);</div><div class='ctx'> 	if (add_tail)</div><div class='ctx'> 		list_add_tail(&amp;cmd_node-&gt;list, &amp;adapter-&gt;cmd_pending_q);</div><div class='hunk'>@@ -740,7 +740,6 @@ mwifiex_insert_cmd_to_pending_q(struct mwifiex_adapter *adapter,</div><div class='ctx'>  */</div><div class='ctx'> int mwifiex_exec_next_cmd(struct mwifiex_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	struct mwifiex_private *priv;</div><div class='ctx'> 	struct cmd_ctrl_node *cmd_node;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct host_cmd_ds_command *host_cmd;</div><div class='hunk'>@@ -764,7 +763,6 @@ int mwifiex_exec_next_cmd(struct mwifiex_adapter *adapter)</div><div class='ctx'> 				    struct cmd_ctrl_node, list);</div><div class='ctx'> </div><div class='ctx'> 	host_cmd = (struct host_cmd_ds_command *) (cmd_node-&gt;cmd_skb-&gt;data);</div><div class='del'>-	priv = cmd_node-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;ps_state != PS_STATE_AWAKE) {</div><div class='ctx'> 		mwifiex_dbg(adapter, ERROR,</div><div class='hunk'>@@ -779,18 +777,17 @@ int mwifiex_exec_next_cmd(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	spin_unlock_bh(&amp;adapter-&gt;cmd_pending_q_lock);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;adapter-&gt;mwifiex_cmd_lock);</div><div class='del'>-	ret = mwifiex_dnld_cmd_to_fw(priv, cmd_node);</div><div class='del'>-	priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);</div><div class='add'>+	ret = mwifiex_dnld_cmd_to_fw(adapter, cmd_node);</div><div class='add'>+</div><div class='ctx'> 	/* Any command sent to the firmware when host is in sleep</div><div class='ctx'> 	 * mode should de-configure host sleep. We should skip the</div><div class='ctx'> 	 * host sleep configuration command itself though</div><div class='ctx'> 	 */</div><div class='del'>-	if (priv &amp;&amp; (host_cmd-&gt;command !=</div><div class='del'>-	     cpu_to_le16(HostCmd_CMD_802_11_HS_CFG_ENH))) {</div><div class='add'>+	if (host_cmd-&gt;command != cpu_to_le16(HostCmd_CMD_802_11_HS_CFG_ENH)) {</div><div class='ctx'> 		if (adapter-&gt;hs_activated) {</div><div class='ctx'> 			clear_bit(MWIFIEX_IS_HS_CONFIGURED,</div><div class='ctx'> 				  &amp;adapter-&gt;work_flags);</div><div class='del'>-			mwifiex_hs_activated_event(priv, false);</div><div class='add'>+			mwifiex_hs_activated_event(adapter, false);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -806,8 +803,7 @@ int mwifiex_exec_next_cmd(struct mwifiex_adapter *adapter)</div><div class='ctx'> int mwifiex_process_cmdresp(struct mwifiex_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct host_cmd_ds_command *resp;</div><div class='del'>-	struct mwifiex_private *priv =</div><div class='del'>-		mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);</div><div class='add'>+	struct mwifiex_private *priv;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	uint16_t orig_cmdresp_no;</div><div class='ctx'> 	uint16_t cmdresp_no;</div><div class='hunk'>@@ -832,7 +828,7 @@ int mwifiex_process_cmdresp(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Now we got response from FW, cancel the command timer */</div><div class='del'>-	del_timer_sync(&amp;adapter-&gt;cmd_timer);</div><div class='add'>+	timer_delete_sync(&amp;adapter-&gt;cmd_timer);</div><div class='ctx'> 	clear_bit(MWIFIEX_IS_CMD_TIMEDOUT, &amp;adapter-&gt;work_flags);</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;curr_cmd-&gt;cmd_flag &amp; CMD_F_HOSTCMD) {</div><div class='hunk'>@@ -896,18 +892,6 @@ int mwifiex_process_cmdresp(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		ret = mwifiex_process_sta_cmdresp(priv, cmdresp_no, resp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Check init command response */</div><div class='del'>-	if (adapter-&gt;hw_status == MWIFIEX_HW_STATUS_INITIALIZING) {</div><div class='del'>-		if (ret) {</div><div class='del'>-			mwifiex_dbg(adapter, ERROR,</div><div class='del'>-				    "%s: cmd %#x failed during\t"</div><div class='del'>-				    "initialization\n", __func__, cmdresp_no);</div><div class='del'>-			mwifiex_init_fw_complete(adapter);</div><div class='del'>-			return -1;</div><div class='del'>-		} else if (adapter-&gt;last_init_cmd == cmdresp_no)</div><div class='del'>-			adapter-&gt;hw_status = MWIFIEX_HW_STATUS_INIT_DONE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (adapter-&gt;curr_cmd) {</div><div class='ctx'> 		if (adapter-&gt;curr_cmd-&gt;wait_q_enabled)</div><div class='ctx'> 			adapter-&gt;cmd_wait_q.status = ret;</div><div class='hunk'>@@ -922,6 +906,26 @@ int mwifiex_process_cmdresp(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void mwifiex_process_assoc_resp(struct mwifiex_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct cfg80211_rx_assoc_resp_data assoc_resp = {</div><div class='add'>+		.uapsd_queues = -1,</div><div class='add'>+	};</div><div class='add'>+	struct mwifiex_private *priv =</div><div class='add'>+		mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;assoc_rsp_size) {</div><div class='add'>+		assoc_resp.links[0].bss = priv-&gt;req_bss;</div><div class='add'>+		assoc_resp.buf = priv-&gt;assoc_rsp_buf;</div><div class='add'>+		assoc_resp.len = priv-&gt;assoc_rsp_size;</div><div class='add'>+		wiphy_lock(priv-&gt;wdev.wiphy);</div><div class='add'>+		cfg80211_rx_assoc_resp(priv-&gt;netdev,</div><div class='add'>+				       &amp;assoc_resp);</div><div class='add'>+		wiphy_unlock(priv-&gt;wdev.wiphy);</div><div class='add'>+		priv-&gt;assoc_rsp_size = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This function handles the timeout of command sending.</div><div class='ctx'>  *</div><div class='hunk'>@@ -930,7 +934,8 @@ int mwifiex_process_cmdresp(struct mwifiex_adapter *adapter)</div><div class='ctx'> void</div><div class='ctx'> mwifiex_cmd_timeout_func(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct mwifiex_adapter *adapter = from_timer(adapter, t, cmd_timer);</div><div class='add'>+	struct mwifiex_adapter *adapter = timer_container_of(adapter, t,</div><div class='add'>+						             cmd_timer);</div><div class='ctx'> 	struct cmd_ctrl_node *cmd_node;</div><div class='ctx'> </div><div class='ctx'> 	set_bit(MWIFIEX_IS_CMD_TIMEDOUT, &amp;adapter-&gt;work_flags);</div><div class='hunk'>@@ -1006,10 +1011,6 @@ mwifiex_cmd_timeout_func(struct timer_list *t)</div><div class='ctx'> 			mwifiex_cancel_pending_ioctl(adapter);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (adapter-&gt;hw_status == MWIFIEX_HW_STATUS_INITIALIZING) {</div><div class='del'>-		mwifiex_init_fw_complete(adapter);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;if_ops.device_dump)</div><div class='ctx'> 		adapter-&gt;if_ops.device_dump(adapter);</div><div class='hunk'>@@ -1136,27 +1137,27 @@ mwifiex_check_ps_cond(struct mwifiex_adapter *adapter)</div><div class='ctx'>  * This event is generated by the driver, with a blank event body.</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='del'>-mwifiex_hs_activated_event(struct mwifiex_private *priv, u8 activated)</div><div class='add'>+mwifiex_hs_activated_event(struct mwifiex_adapter *adapter, u8 activated)</div><div class='ctx'> {</div><div class='ctx'> 	if (activated) {</div><div class='ctx'> 		if (test_bit(MWIFIEX_IS_HS_CONFIGURED,</div><div class='del'>-			     &amp;priv-&gt;adapter-&gt;work_flags)) {</div><div class='del'>-			priv-&gt;adapter-&gt;hs_activated = true;</div><div class='del'>-			mwifiex_update_rxreor_flags(priv-&gt;adapter,</div><div class='add'>+			     &amp;adapter-&gt;work_flags)) {</div><div class='add'>+			adapter-&gt;hs_activated = true;</div><div class='add'>+			mwifiex_update_rxreor_flags(adapter,</div><div class='ctx'> 						    RXREOR_FORCE_NO_DROP);</div><div class='del'>-			mwifiex_dbg(priv-&gt;adapter, EVENT,</div><div class='add'>+			mwifiex_dbg(adapter, EVENT,</div><div class='ctx'> 				    "event: hs_activated\n");</div><div class='del'>-			priv-&gt;adapter-&gt;hs_activate_wait_q_woken = true;</div><div class='add'>+			adapter-&gt;hs_activate_wait_q_woken = true;</div><div class='ctx'> 			wake_up_interruptible(</div><div class='del'>-				&amp;priv-&gt;adapter-&gt;hs_activate_wait_q);</div><div class='add'>+				&amp;adapter-&gt;hs_activate_wait_q);</div><div class='ctx'> 		} else {</div><div class='del'>-			mwifiex_dbg(priv-&gt;adapter, EVENT,</div><div class='add'>+			mwifiex_dbg(adapter, EVENT,</div><div class='ctx'> 				    "event: HS not configured\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		mwifiex_dbg(priv-&gt;adapter, EVENT,</div><div class='add'>+		mwifiex_dbg(adapter, EVENT,</div><div class='ctx'> 			    "event: hs_deactivated\n");</div><div class='del'>-		priv-&gt;adapter-&gt;hs_activated = false;</div><div class='add'>+		adapter-&gt;hs_activated = false;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1180,7 +1181,7 @@ int mwifiex_ret_802_11_hs_cfg(struct mwifiex_private *priv,</div><div class='ctx'> </div><div class='ctx'> 	if (phs_cfg-&gt;action == cpu_to_le16(HS_ACTIVATE) &amp;&amp;</div><div class='ctx'> 	    adapter-&gt;iface_type != MWIFIEX_USB) {</div><div class='del'>-		mwifiex_hs_activated_event(priv, true);</div><div class='add'>+		mwifiex_hs_activated_event(adapter, true);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mwifiex_dbg(adapter, CMD,</div><div class='hunk'>@@ -1193,11 +1194,11 @@ int mwifiex_ret_802_11_hs_cfg(struct mwifiex_private *priv,</div><div class='ctx'> 	if (conditions != HS_CFG_CANCEL) {</div><div class='ctx'> 		set_bit(MWIFIEX_IS_HS_CONFIGURED, &amp;adapter-&gt;work_flags);</div><div class='ctx'> 		if (adapter-&gt;iface_type == MWIFIEX_USB)</div><div class='del'>-			mwifiex_hs_activated_event(priv, true);</div><div class='add'>+			mwifiex_hs_activated_event(adapter, true);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		clear_bit(MWIFIEX_IS_HS_CONFIGURED, &amp;adapter-&gt;work_flags);</div><div class='ctx'> 		if (adapter-&gt;hs_activated)</div><div class='del'>-			mwifiex_hs_activated_event(priv, false);</div><div class='add'>+			mwifiex_hs_activated_event(adapter, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1216,12 +1217,17 @@ mwifiex_process_hs_config(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		    __func__);</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;if_ops.wakeup(adapter);</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;hs_activated_manually) {</div><div class='add'>+		mwifiex_cancel_hs(mwifiex_get_priv (adapter, MWIFIEX_BSS_ROLE_ANY),</div><div class='add'>+				  MWIFIEX_ASYNC_CMD);</div><div class='add'>+		adapter-&gt;hs_activated_manually = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	adapter-&gt;hs_activated = false;</div><div class='ctx'> 	clear_bit(MWIFIEX_IS_HS_CONFIGURED, &amp;adapter-&gt;work_flags);</div><div class='ctx'> 	clear_bit(MWIFIEX_IS_SUSPENDED, &amp;adapter-&gt;work_flags);</div><div class='del'>-	mwifiex_hs_activated_event(mwifiex_get_priv(adapter,</div><div class='del'>-						    MWIFIEX_BSS_ROLE_ANY),</div><div class='del'>-				   false);</div><div class='add'>+	mwifiex_hs_activated_event(adapter, false);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mwifiex_process_hs_config);</div><div class='ctx'> </div><div class='hunk'>@@ -1235,8 +1241,6 @@ mwifiex_process_sleep_confirm_resp(struct mwifiex_adapter *adapter,</div><div class='ctx'> 				   u8 *pbuf, u32 upld_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct host_cmd_ds_command *cmd = (struct host_cmd_ds_command *) pbuf;</div><div class='del'>-	struct mwifiex_private *priv =</div><div class='del'>-		mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);</div><div class='ctx'> 	uint16_t result = le16_to_cpu(cmd-&gt;result);</div><div class='ctx'> 	uint16_t command = le16_to_cpu(cmd-&gt;command);</div><div class='ctx'> 	uint16_t seq_num = le16_to_cpu(cmd-&gt;seq_num);</div><div class='hunk'>@@ -1251,12 +1255,6 @@ mwifiex_process_sleep_confirm_resp(struct mwifiex_adapter *adapter,</div><div class='ctx'> 		    "cmd: CMD_RESP: 0x%x, result %d, len %d, seqno 0x%x\n",</div><div class='ctx'> 		    command, result, le16_to_cpu(cmd-&gt;size), seq_num);</div><div class='ctx'> </div><div class='del'>-	/* Get BSS number and corresponding priv */</div><div class='del'>-	priv = mwifiex_get_priv_by_id(adapter, HostCmd_GET_BSS_NO(seq_num),</div><div class='del'>-				      HostCmd_GET_BSS_TYPE(seq_num));</div><div class='del'>-	if (!priv)</div><div class='del'>-		priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);</div><div class='del'>-</div><div class='ctx'> 	/* Update sequence number */</div><div class='ctx'> 	seq_num = HostCmd_GET_SEQ_NO(seq_num);</div><div class='ctx'> 	/* Clear RET_BIT from HostCmd */</div><div class='hunk'>@@ -1279,9 +1277,7 @@ mwifiex_process_sleep_confirm_resp(struct mwifiex_adapter *adapter,</div><div class='ctx'> 	}</div><div class='ctx'> 	adapter-&gt;pm_wakeup_card_req = true;</div><div class='ctx'> 	if (test_bit(MWIFIEX_IS_HS_CONFIGURED, &amp;adapter-&gt;work_flags))</div><div class='del'>-		mwifiex_hs_activated_event(mwifiex_get_priv</div><div class='del'>-						(adapter, MWIFIEX_BSS_ROLE_ANY),</div><div class='del'>-					   true);</div><div class='add'>+		mwifiex_hs_activated_event(adapter, true);</div><div class='ctx'> 	adapter-&gt;ps_state = PS_STATE_SLEEP;</div><div class='ctx'> 	cmd-&gt;command = cpu_to_le16(command);</div><div class='ctx'> 	cmd-&gt;seq_num = cpu_to_le16(seq_num);</div><div class='hunk'>@@ -1598,6 +1594,11 @@ int mwifiex_ret_get_hw_spec(struct mwifiex_private *priv,</div><div class='ctx'> 						    api_rev-&gt;major_ver,</div><div class='ctx'> 						    api_rev-&gt;minor_ver);</div><div class='ctx'> 					break;</div><div class='add'>+				case FW_HOTFIX_VER_ID:</div><div class='add'>+					mwifiex_dbg(adapter, INFO,</div><div class='add'>+						    "Firmware hotfix version %d\n",</div><div class='add'>+						    api_rev-&gt;major_ver);</div><div class='add'>+					break;</div><div class='ctx'> 				default:</div><div class='ctx'> 					mwifiex_dbg(adapter, FATAL,</div><div class='ctx'> 						    "Unknown api_id: %d\n",</div><div class='hunk'>@@ -1666,6 +1667,13 @@ int mwifiex_ret_get_hw_spec(struct mwifiex_private *priv,</div><div class='ctx'> 	if (adapter-&gt;fw_api_ver == MWIFIEX_FW_V15)</div><div class='ctx'> 		adapter-&gt;scan_chan_gap_enabled = true;</div><div class='ctx'> </div><div class='add'>+	if (adapter-&gt;key_api_major_ver != KEY_API_VER_MAJOR_V2)</div><div class='add'>+		adapter-&gt;host_mlme_enabled = false;</div><div class='add'>+</div><div class='add'>+	mwifiex_dbg(adapter, MSG, "host_mlme: %s, key_api: %d\n",</div><div class='add'>+		    adapter-&gt;host_mlme_enabled ? "enable" : "disable",</div><div class='add'>+		    adapter-&gt;key_api_major_ver);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/debugfs.c b/drivers/net/wireless/marvell/mwifiex/debugfs.c<br/>index dded92db1f37..9deaf59dcb62 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/debugfs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/debugfs.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: debugfs</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='hunk'>@@ -265,8 +253,11 @@ mwifiex_histogram_read(struct file *file, char __user *ubuf,</div><div class='ctx'> 	if (!p)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (!priv || !priv-&gt;hist_data)</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	if (!priv || !priv-&gt;hist_data) {</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+		goto free_and_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	phist_data = priv-&gt;hist_data;</div><div class='ctx'> </div><div class='ctx'> 	p += sprintf(p, "\n"</div><div class='hunk'>@@ -321,6 +312,8 @@ mwifiex_histogram_read(struct file *file, char __user *ubuf,</div><div class='ctx'> 	ret = simple_read_from_buffer(ubuf, count, ppos, (char *)page,</div><div class='ctx'> 				      (unsigned long)p - page);</div><div class='ctx'> </div><div class='add'>+free_and_exit:</div><div class='add'>+	free_page(page);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -432,7 +425,10 @@ mwifiex_regrdwr_write(struct file *file,</div><div class='ctx'> 	if (IS_ERR(buf))</div><div class='ctx'> 		return PTR_ERR(buf);</div><div class='ctx'> </div><div class='del'>-	sscanf(buf, "%u %x %x", &amp;reg_type, &amp;reg_offset, &amp;reg_value);</div><div class='add'>+	if (sscanf(buf, "%u %x %x", &amp;reg_type, &amp;reg_offset, &amp;reg_value) != 3) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (reg_type == 0 || reg_offset == 0) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='hunk'>@@ -570,14 +566,8 @@ mwifiex_verext_write(struct file *file, const char __user *ubuf,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 versionstrsel;</div><div class='ctx'> 	struct mwifiex_private *priv = (void *)file-&gt;private_data;</div><div class='del'>-	char buf[16];</div><div class='del'>-</div><div class='del'>-	memset(buf, 0, sizeof(buf));</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	ret = kstrtou32(buf, 10, &amp;versionstrsel);</div><div class='add'>+	ret = kstrtou32_from_user(ubuf, count, 10, &amp;versionstrsel);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -698,7 +688,10 @@ mwifiex_rdeeprom_write(struct file *file,</div><div class='ctx'> 	if (IS_ERR(buf))</div><div class='ctx'> 		return PTR_ERR(buf);</div><div class='ctx'> </div><div class='del'>-	sscanf(buf, "%d %d", &amp;offset, &amp;bytes);</div><div class='add'>+	if (sscanf(buf, "%d %d", &amp;offset, &amp;bytes) != 2) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (offset == -1 || bytes == -1) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='hunk'>@@ -875,19 +868,14 @@ mwifiex_timeshare_coex_write(struct file *file, const char __user *ubuf,</div><div class='ctx'> {</div><div class='ctx'> 	bool timeshare_coex;</div><div class='ctx'> 	struct mwifiex_private *priv = file-&gt;private_data;</div><div class='del'>-	char kbuf[16];</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;adapter-&gt;fw_api_ver != MWIFIEX_FW_V15)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	memset(kbuf, 0, sizeof(kbuf));</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;kbuf, ubuf, min_t(size_t, sizeof(kbuf) - 1, count)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (strtobool(kbuf, &amp;timeshare_coex))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ret = kstrtobool_from_user(ubuf, count, &amp;timeshare_coex);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = mwifiex_send_cmd(priv, HostCmd_CMD_ROBUST_COEX,</div><div class='ctx'> 			       HostCmd_ACT_GEN_SET, 0, &amp;timeshare_coex, true);</div><div class='hunk'>@@ -971,9 +959,6 @@ mwifiex_dev_debugfs_init(struct mwifiex_private *priv)</div><div class='ctx'> 	priv-&gt;dfs_dev_dir = debugfs_create_dir(priv-&gt;netdev-&gt;name,</div><div class='ctx'> 					       mwifiex_dfs_dir);</div><div class='ctx'> </div><div class='del'>-	if (!priv-&gt;dfs_dev_dir)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	MWIFIEX_DFS_ADD_FILE(info);</div><div class='ctx'> 	MWIFIEX_DFS_ADD_FILE(debug);</div><div class='ctx'> 	MWIFIEX_DFS_ADD_FILE(getlog);</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/decl.h b/drivers/net/wireless/marvell/mwifiex/decl.h<br/>index 6bd23c9b1eed..84603f1e7f6e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/decl.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/decl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/decl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/decl.h</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: generic data structures and APIs</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _MWIFIEX_DECL_H_</div><div class='hunk'>@@ -43,6 +31,29 @@</div><div class='ctx'> 						 *   + sizeof(tx_control)</div><div class='ctx'> 						 */</div><div class='ctx'> </div><div class='add'>+#define FRMCTL_LEN                2</div><div class='add'>+#define DURATION_LEN              2</div><div class='add'>+#define SEQCTL_LEN                2</div><div class='add'>+/* special FW 4 address management header */</div><div class='add'>+#define MWIFIEX_MGMT_HEADER_LEN   (FRMCTL_LEN + DURATION_LEN + ETH_ALEN + \</div><div class='add'>+				   ETH_ALEN + ETH_ALEN + SEQCTL_LEN + ETH_ALEN)</div><div class='add'>+</div><div class='add'>+#define AUTH_ALG_LEN              2</div><div class='add'>+#define AUTH_TRANSACTION_LEN      2</div><div class='add'>+#define AUTH_STATUS_LEN           2</div><div class='add'>+#define MWIFIEX_AUTH_BODY_LEN     (AUTH_ALG_LEN + AUTH_TRANSACTION_LEN + \</div><div class='add'>+				   AUTH_STATUS_LEN)</div><div class='add'>+</div><div class='add'>+#define HOST_MLME_AUTH_PENDING    BIT(0)</div><div class='add'>+#define HOST_MLME_AUTH_DONE       BIT(1)</div><div class='add'>+</div><div class='add'>+#define HOST_MLME_MGMT_MASK       (BIT(IEEE80211_STYPE_AUTH &gt;&gt; 4) | \</div><div class='add'>+				   BIT(IEEE80211_STYPE_DEAUTH &gt;&gt; 4) | \</div><div class='add'>+				   BIT(IEEE80211_STYPE_DISASSOC &gt;&gt; 4))</div><div class='add'>+#define AUTH_TX_DEFAULT_WAIT_TIME 2400</div><div class='add'>+</div><div class='add'>+#define WLAN_AUTH_NONE            0xFFFF</div><div class='add'>+</div><div class='ctx'> #define MWIFIEX_MAX_TX_BASTREAM_SUPPORTED	2</div><div class='ctx'> #define MWIFIEX_MAX_RX_BASTREAM_SUPPORTED	16</div><div class='ctx'> #define MWIFIEX_MAX_TDLS_PEER_SUPPORTED 8</div><div class='hunk'>@@ -192,7 +203,6 @@ struct mwifiex_rxinfo {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mwifiex_txinfo {</div><div class='del'>-	u32 status_code;</div><div class='ctx'> 	u8 flags;</div><div class='ctx'> 	u8 bss_num;</div><div class='ctx'> 	u8 bss_type;</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/ethtool.c b/drivers/net/wireless/marvell/mwifiex/ethtool.c<br/>index 9bdad3f59039..17c6e7fedfc4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/ethtool.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/ethtool.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: ethtool</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h<br/>index 470d669c7f14..e9e896606912 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/fw.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/fw.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/fw.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/fw.h</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: Firmware specific macros &amp; structures</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _MWIFIEX_FW_H_</div><div class='hunk'>@@ -53,7 +41,7 @@ struct mwifiex_fw_header {</div><div class='ctx'> struct mwifiex_fw_data {</div><div class='ctx'> 	struct mwifiex_fw_header header;</div><div class='ctx'> 	__le32 seq_num;</div><div class='del'>-	u8 data[1];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct mwifiex_fw_dump_header {</div><div class='hunk'>@@ -177,6 +165,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {</div><div class='ctx'> #define TLV_TYPE_STA_MAC_ADDR       (PROPRIETARY_TLV_BASE_ID + 32)</div><div class='ctx'> #define TLV_TYPE_BSSID              (PROPRIETARY_TLV_BASE_ID + 35)</div><div class='ctx'> #define TLV_TYPE_CHANNELBANDLIST    (PROPRIETARY_TLV_BASE_ID + 42)</div><div class='add'>+#define TLV_TYPE_UAP_MAC_ADDRESS    (PROPRIETARY_TLV_BASE_ID + 43)</div><div class='ctx'> #define TLV_TYPE_UAP_BEACON_PERIOD  (PROPRIETARY_TLV_BASE_ID + 44)</div><div class='ctx'> #define TLV_TYPE_UAP_DTIM_PERIOD    (PROPRIETARY_TLV_BASE_ID + 45)</div><div class='ctx'> #define TLV_TYPE_UAP_BCAST_SSID     (PROPRIETARY_TLV_BASE_ID + 48)</div><div class='hunk'>@@ -221,6 +210,9 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {</div><div class='ctx'> #define TLV_TYPE_RANDOM_MAC         (PROPRIETARY_TLV_BASE_ID + 236)</div><div class='ctx'> #define TLV_TYPE_CHAN_ATTR_CFG      (PROPRIETARY_TLV_BASE_ID + 237)</div><div class='ctx'> #define TLV_TYPE_MAX_CONN           (PROPRIETARY_TLV_BASE_ID + 279)</div><div class='add'>+#define TLV_TYPE_HOST_MLME          (PROPRIETARY_TLV_BASE_ID + 307)</div><div class='add'>+#define TLV_TYPE_UAP_STA_FLAGS      (PROPRIETARY_TLV_BASE_ID + 313)</div><div class='add'>+#define TLV_TYPE_SAE_PWE_MODE       (PROPRIETARY_TLV_BASE_ID + 339)</div><div class='ctx'> </div><div class='ctx'> #define MWIFIEX_TX_DATA_BUF_SIZE_2K        2048</div><div class='ctx'> </div><div class='hunk'>@@ -416,6 +408,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {</div><div class='ctx'> #define HostCmd_CMD_STA_CONFIGURE		      0x023f</div><div class='ctx'> #define HostCmd_CMD_CHAN_REGION_CFG		      0x0242</div><div class='ctx'> #define HostCmd_CMD_PACKET_AGGR_CTRL		      0x0251</div><div class='add'>+#define HostCmd_CMD_ADD_NEW_STATION		      0x025f</div><div class='ctx'> </div><div class='ctx'> #define PROTOCOL_NO_SECURITY        0x01</div><div class='ctx'> #define PROTOCOL_STATIC_WEP         0x02</div><div class='hunk'>@@ -426,6 +419,8 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {</div><div class='ctx'> #define KEY_MGMT_NONE               0x04</div><div class='ctx'> #define KEY_MGMT_PSK                0x02</div><div class='ctx'> #define KEY_MGMT_EAP                0x01</div><div class='add'>+#define KEY_MGMT_PSK_SHA256         0x100</div><div class='add'>+#define KEY_MGMT_SAE                0x400</div><div class='ctx'> #define CIPHER_TKIP                 0x04</div><div class='ctx'> #define CIPHER_AES_CCMP             0x08</div><div class='ctx'> #define VALID_CIPHER_BITMAP         0x0c</div><div class='hunk'>@@ -459,6 +454,11 @@ enum mwifiex_channel_flags {</div><div class='ctx'> #define HostCmd_RET_BIT                       0x8000</div><div class='ctx'> #define HostCmd_ACT_GEN_GET                   0x0000</div><div class='ctx'> #define HostCmd_ACT_GEN_SET                   0x0001</div><div class='add'>+#define HOST_CMD_ACT_GEN_SET                  0x0001</div><div class='add'>+/* Add this non-CamelCase-style macro to comply with checkpatch requirements.</div><div class='add'>+ *  This macro will eventually replace all existing CamelCase-style macros in</div><div class='add'>+ *  the future for consistency.</div><div class='add'>+ */</div><div class='ctx'> #define HostCmd_ACT_GEN_REMOVE                0x0004</div><div class='ctx'> #define HostCmd_ACT_BITWISE_SET               0x0002</div><div class='ctx'> #define HostCmd_ACT_BITWISE_CLR               0x0003</div><div class='hunk'>@@ -511,6 +511,9 @@ enum mwifiex_channel_flags {</div><div class='ctx'> #define HostCmd_ACT_GET_TX              0x0008</div><div class='ctx'> #define HostCmd_ACT_GET_BOTH            0x000c</div><div class='ctx'> </div><div class='add'>+#define HostCmd_ACT_REMOVE_STA          0x0</div><div class='add'>+#define HostCmd_ACT_ADD_STA             0x1</div><div class='add'>+</div><div class='ctx'> #define RF_ANTENNA_AUTO                 0xFFFF</div><div class='ctx'> </div><div class='ctx'> #define HostCmd_SET_SEQ_NO_BSS_INFO(seq, num, type) \</div><div class='hunk'>@@ -653,7 +656,7 @@ struct mwifiex_ie_types_header {</div><div class='ctx'> </div><div class='ctx'> struct mwifiex_ie_types_data {</div><div class='ctx'> 	struct mwifiex_ie_types_header header;</div><div class='del'>-	u8 data[1];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define MWIFIEX_TxPD_POWER_MGMT_NULL_PACKET 0x01</div><div class='hunk'>@@ -755,6 +758,25 @@ struct uap_rxpd {</div><div class='ctx'> 	u8 flags;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct mwifiex_auth {</div><div class='add'>+	__le16 auth_alg;</div><div class='add'>+	__le16 auth_transaction;</div><div class='add'>+	__le16 status_code;</div><div class='add'>+	/* possibly followed by Challenge text */</div><div class='add'>+	u8 variable[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mwifiex_ieee80211_mgmt {</div><div class='add'>+	__le16 frame_control;</div><div class='add'>+	__le16 duration;</div><div class='add'>+	u8 da[ETH_ALEN];</div><div class='add'>+	u8 sa[ETH_ALEN];</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	__le16 seq_ctrl;</div><div class='add'>+	u8 addr4[ETH_ALEN];</div><div class='add'>+	struct mwifiex_auth auth;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct mwifiex_fw_chan_stats {</div><div class='ctx'> 	u8 chan_num;</div><div class='ctx'> 	u8 bandcfg;</div><div class='hunk'>@@ -781,7 +803,7 @@ struct mwifiex_chan_scan_param_set {</div><div class='ctx'> </div><div class='ctx'> struct mwifiex_ie_types_chan_list_param_set {</div><div class='ctx'> 	struct mwifiex_ie_types_header header;</div><div class='del'>-	struct mwifiex_chan_scan_param_set chan_scan_param[1];</div><div class='add'>+	struct mwifiex_chan_scan_param_set chan_scan_param[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct mwifiex_ie_types_rxba_sync {</div><div class='hunk'>@@ -791,7 +813,7 @@ struct mwifiex_ie_types_rxba_sync {</div><div class='ctx'> 	u8 reserved;</div><div class='ctx'> 	__le16 seq_num;</div><div class='ctx'> 	__le16 bitmap_len;</div><div class='del'>-	u8 bitmap[1];</div><div class='add'>+	u8 bitmap[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct chan_band_param_set {</div><div class='hunk'>@@ -806,12 +828,17 @@ struct mwifiex_ie_types_chan_band_list_param_set {</div><div class='ctx'> </div><div class='ctx'> struct mwifiex_ie_types_rates_param_set {</div><div class='ctx'> 	struct mwifiex_ie_types_header header;</div><div class='del'>-	u8 rates[1];</div><div class='add'>+	u8 rates[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct mwifiex_ie_types_ssid_param_set {</div><div class='ctx'> 	struct mwifiex_ie_types_header header;</div><div class='del'>-	u8 ssid[1];</div><div class='add'>+	u8 ssid[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mwifiex_ie_types_host_mlme {</div><div class='add'>+	struct mwifiex_ie_types_header header;</div><div class='add'>+	u8 host_mlme;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct mwifiex_ie_types_num_probes {</div><div class='hunk'>@@ -853,7 +880,7 @@ struct mwifiex_ietypes_chanstats {</div><div class='ctx'> struct mwifiex_ie_types_wildcard_ssid_params {</div><div class='ctx'> 	struct mwifiex_ie_types_header header;</div><div class='ctx'> 	u8 max_ssid_length;</div><div class='del'>-	u8 ssid[1];</div><div class='add'>+	u8 ssid[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define TSF_DATA_SIZE            8</div><div class='hunk'>@@ -917,9 +944,16 @@ struct mwifiex_ie_types_tdls_idle_timeout {</div><div class='ctx'> 	__le16 value;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+#define MWIFIEX_AUTHTYPE_SAE 6</div><div class='add'>+</div><div class='add'>+struct mwifiex_ie_types_sae_pwe_mode {</div><div class='add'>+	struct mwifiex_ie_types_header header;</div><div class='add'>+	u8 pwe[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct mwifiex_ie_types_rsn_param_set {</div><div class='ctx'> 	struct mwifiex_ie_types_header header;</div><div class='del'>-	u8 rsn_ie[1];</div><div class='add'>+	u8 rsn_ie[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define KEYPARAMSET_FIXED_LEN 6</div><div class='hunk'>@@ -995,6 +1029,11 @@ struct host_cmd_ds_802_11_key_material {</div><div class='ctx'> 	struct mwifiex_ie_type_key_param_set key_param_set;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct host_cmd_ds_802_11_key_material_wep {</div><div class='add'>+	__le16 action;</div><div class='add'>+	struct mwifiex_ie_type_key_param_set key_param_set[NUM_WEP_KEYS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct host_cmd_ds_gen {</div><div class='ctx'> 	__le16 command;</div><div class='ctx'> 	__le16 size;</div><div class='hunk'>@@ -1055,6 +1094,7 @@ enum API_VER_ID {</div><div class='ctx'> 	FW_API_VER_ID = 2,</div><div class='ctx'> 	UAP_FW_API_VER_ID = 3,</div><div class='ctx'> 	CHANRPT_API_VER_ID = 4,</div><div class='add'>+	FW_HOTFIX_VER_ID = 5,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hw_spec_api_rev {</div><div class='hunk'>@@ -1079,7 +1119,7 @@ struct host_cmd_ds_get_hw_spec {</div><div class='ctx'> 	__le32 fw_cap_info;</div><div class='ctx'> 	__le32 dot_11n_dev_cap;</div><div class='ctx'> 	u8 dev_mcs_support;</div><div class='del'>-	__le16 mp_end_port;	/* SDIO only, reserved for other interfacces */</div><div class='add'>+	__le16 mp_end_port;	/* SDIO only, reserved for other interfaces */</div><div class='ctx'> 	__le16 mgmt_buf_count;	/* mgmt IE buffer count */</div><div class='ctx'> 	__le32 reserved_5;</div><div class='ctx'> 	__le32 reserved_6;</div><div class='hunk'>@@ -1440,7 +1480,7 @@ struct mwifiex_tdls_stop_cs_params {</div><div class='ctx'> </div><div class='ctx'> struct host_cmd_ds_tdls_config {</div><div class='ctx'> 	__le16 tdls_action;</div><div class='del'>-	u8 tdls_data[1];</div><div class='add'>+	u8 tdls_data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct mwifiex_chan_desc {</div><div class='hunk'>@@ -1581,18 +1621,18 @@ struct ie_body {</div><div class='ctx'> struct host_cmd_ds_802_11_scan {</div><div class='ctx'> 	u8 bss_mode;</div><div class='ctx'> 	u8 bssid[ETH_ALEN];</div><div class='del'>-	u8 tlv_buffer[1];</div><div class='add'>+	u8 tlv_buffer[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct host_cmd_ds_802_11_scan_rsp {</div><div class='ctx'> 	__le16 bss_descript_size;</div><div class='ctx'> 	u8 number_of_sets;</div><div class='del'>-	u8 bss_desc_and_tlv_buffer[1];</div><div class='add'>+	u8 bss_desc_and_tlv_buffer[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct host_cmd_ds_802_11_scan_ext {</div><div class='ctx'> 	u32   reserved;</div><div class='del'>-	u8    tlv_buffer[1];</div><div class='add'>+	u8    tlv_buffer[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct mwifiex_ie_types_bss_mode {</div><div class='hunk'>@@ -1603,7 +1643,7 @@ struct mwifiex_ie_types_bss_mode {</div><div class='ctx'> struct mwifiex_ie_types_bss_scan_rsp {</div><div class='ctx'> 	struct mwifiex_ie_types_header header;</div><div class='ctx'> 	u8 bssid[ETH_ALEN];</div><div class='del'>-	u8 frame_body[1];</div><div class='add'>+	u8 frame_body[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct mwifiex_ie_types_bss_scan_info {</div><div class='hunk'>@@ -1699,7 +1739,7 @@ struct host_cmd_ds_11n_cfg {</div><div class='ctx'> struct host_cmd_ds_txbuf_cfg {</div><div class='ctx'> 	__le16 action;</div><div class='ctx'> 	__le16 buff_size;</div><div class='del'>-	__le16 mp_end_port;	/* SDIO only, reserved for other interfacces */</div><div class='add'>+	__le16 mp_end_port;	/* SDIO only, reserved for other interfaces */</div><div class='ctx'> 	__le16 reserved3;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -1740,7 +1780,7 @@ struct mwifiex_ie_types_local_pwr_constraint {</div><div class='ctx'> </div><div class='ctx'> struct mwifiex_ie_types_wmm_param_set {</div><div class='ctx'> 	struct mwifiex_ie_types_header header;</div><div class='del'>-	u8 wmm_ie[1];</div><div class='add'>+	u8 wmm_ie[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct mwifiex_ie_types_mgmt_frame {</div><div class='hunk'>@@ -1966,7 +2006,7 @@ struct host_cmd_tlv_wep_key {</div><div class='ctx'> 	struct mwifiex_ie_types_header header;</div><div class='ctx'> 	u8 key_index;</div><div class='ctx'> 	u8 is_default;</div><div class='del'>-	u8 key[1];</div><div class='add'>+	u8 key[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct host_cmd_tlv_auth_type {</div><div class='hunk'>@@ -2066,9 +2106,11 @@ struct mwifiex_ie_types_robust_coex {</div><div class='ctx'> 	__le32 mode;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+#define MWIFIEX_VERSION_STR_LENGTH  128</div><div class='add'>+</div><div class='ctx'> struct host_cmd_ds_version_ext {</div><div class='ctx'> 	u8 version_str_sel;</div><div class='del'>-	char version_str[128];</div><div class='add'>+	char version_str[MWIFIEX_VERSION_STR_LENGTH];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct host_cmd_ds_mgmt_frame_reg {</div><div class='hunk'>@@ -2109,7 +2151,7 @@ struct mwifiex_fw_mef_entry {</div><div class='ctx'> struct host_cmd_ds_mef_cfg {</div><div class='ctx'> 	__le32 criteria;</div><div class='ctx'> 	__le16 num_entries;</div><div class='del'>-	struct mwifiex_fw_mef_entry mef_entry[];</div><div class='add'>+	u8 mef_entry_data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define CONNECTION_TYPE_INFRA   0</div><div class='hunk'>@@ -2259,7 +2301,7 @@ struct coalesce_receive_filt_rule {</div><div class='ctx'> struct host_cmd_ds_coalesce_cfg {</div><div class='ctx'> 	__le16 action;</div><div class='ctx'> 	__le16 num_of_rules;</div><div class='del'>-	struct coalesce_receive_filt_rule rule[];</div><div class='add'>+	u8 rule_data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct host_cmd_ds_multi_chan_policy {</div><div class='hunk'>@@ -2301,6 +2343,28 @@ struct host_cmd_ds_sta_configure {</div><div class='ctx'> 	u8 tlv_buffer[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct mwifiex_ie_types_sta_flag {</div><div class='add'>+	struct mwifiex_ie_types_header header;</div><div class='add'>+	__le32 sta_flags;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct host_cmd_ds_add_station {</div><div class='add'>+	__le16 action;</div><div class='add'>+	__le16 aid;</div><div class='add'>+	u8 peer_mac[ETH_ALEN];</div><div class='add'>+	__le32 listen_interval;</div><div class='add'>+	__le16 cap_info;</div><div class='add'>+	u8 tlv[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define MWIFIEX_CFG_TYPE_CAL 0x2</div><div class='add'>+</div><div class='add'>+struct host_cmd_ds_802_11_cfg_data {</div><div class='add'>+	__le16 action;</div><div class='add'>+	__le16 type;</div><div class='add'>+	__le16 data_len;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct host_cmd_ds_command {</div><div class='ctx'> 	__le16 command;</div><div class='ctx'> 	__le16 size;</div><div class='hunk'>@@ -2347,6 +2411,7 @@ struct host_cmd_ds_command {</div><div class='ctx'> 		struct host_cmd_ds_wmm_get_status get_wmm_status;</div><div class='ctx'> 		struct host_cmd_ds_802_11_key_material key_material;</div><div class='ctx'> 		struct host_cmd_ds_802_11_key_material_v2 key_material_v2;</div><div class='add'>+		struct host_cmd_ds_802_11_key_material_wep key_material_wep;</div><div class='ctx'> 		struct host_cmd_ds_version_ext verext;</div><div class='ctx'> 		struct host_cmd_ds_mgmt_frame_reg reg_mask;</div><div class='ctx'> 		struct host_cmd_ds_remain_on_chan roc_cfg;</div><div class='hunk'>@@ -2378,6 +2443,8 @@ struct host_cmd_ds_command {</div><div class='ctx'> 		struct host_cmd_ds_chan_region_cfg reg_cfg;</div><div class='ctx'> 		struct host_cmd_ds_pkt_aggr_ctrl pkt_aggr_ctrl;</div><div class='ctx'> 		struct host_cmd_ds_sta_configure sta_cfg;</div><div class='add'>+		struct host_cmd_ds_add_station sta_info;</div><div class='add'>+		struct host_cmd_ds_802_11_cfg_data cfg_data;</div><div class='ctx'> 	} params;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/ie.c b/drivers/net/wireless/marvell/mwifiex/ie.c<br/>index 40e99eaf5a30..26694cee15d3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/ie.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/ie.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/ie.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/ie.c</a></div><div class='hunk'>@@ -1,21 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: management IE handling- setting and</div><div class='ctx'>  * deleting IE.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/init.c b/drivers/net/wireless/marvell/mwifiex/init.c<br/>index f006a3d72b40..4820010a86f6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/init.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/init.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/init.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/init.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: HW/FW Initialization</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "decl.h"</div><div class='hunk'>@@ -53,7 +41,8 @@ static int mwifiex_add_bss_prio_tbl(struct mwifiex_private *priv)</div><div class='ctx'> </div><div class='ctx'> static void wakeup_timer_fn(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct mwifiex_adapter *adapter = from_timer(adapter, t, wakeup_timer);</div><div class='add'>+	struct mwifiex_adapter *adapter = timer_container_of(adapter, t,</div><div class='add'>+						             wakeup_timer);</div><div class='ctx'> </div><div class='ctx'> 	mwifiex_dbg(adapter, ERROR, "Firmware wakeup failed\n");</div><div class='ctx'> 	adapter-&gt;hw_status = MWIFIEX_HW_STATUS_RESET;</div><div class='hunk'>@@ -63,9 +52,10 @@ static void wakeup_timer_fn(struct timer_list *t)</div><div class='ctx'> 		adapter-&gt;if_ops.card_reset(adapter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fw_dump_timer_fn(struct timer_list *t)</div><div class='add'>+static void fw_dump_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct mwifiex_adapter *adapter = from_timer(adapter, t, devdump_timer);</div><div class='add'>+	struct mwifiex_adapter *adapter =</div><div class='add'>+		container_of(work, struct mwifiex_adapter, devdump_work.work);</div><div class='ctx'> </div><div class='ctx'> 	mwifiex_upload_device_dump(adapter);</div><div class='ctx'> }</div><div class='hunk'>@@ -92,6 +82,9 @@ int mwifiex_init_priv(struct mwifiex_private *priv)</div><div class='ctx'> 	priv-&gt;bcn_avg_factor = DEFAULT_BCN_AVG_FACTOR;</div><div class='ctx'> 	priv-&gt;data_avg_factor = DEFAULT_DATA_AVG_FACTOR;</div><div class='ctx'> </div><div class='add'>+	priv-&gt;auth_flag = 0;</div><div class='add'>+	priv-&gt;auth_alg = WLAN_AUTH_NONE;</div><div class='add'>+</div><div class='ctx'> 	priv-&gt;sec_info.wep_enabled = 0;</div><div class='ctx'> 	priv-&gt;sec_info.authentication_mode = NL80211_AUTHTYPE_OPEN_SYSTEM;</div><div class='ctx'> 	priv-&gt;sec_info.encryption_mode = 0;</div><div class='hunk'>@@ -231,6 +224,9 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	adapter-&gt;cmd_resp_received = false;</div><div class='ctx'> 	adapter-&gt;event_received = false;</div><div class='ctx'> 	adapter-&gt;data_received = false;</div><div class='add'>+	adapter-&gt;assoc_resp_received = false;</div><div class='add'>+	adapter-&gt;priv_link_lost = NULL;</div><div class='add'>+	adapter-&gt;host_mlme_link_lost = false;</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(MWIFIEX_SURPRISE_REMOVED, &amp;adapter-&gt;work_flags);</div><div class='ctx'> </div><div class='hunk'>@@ -293,14 +289,12 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	sleep_cfm_buf-&gt;action = cpu_to_le16(SLEEP_CONFIRM);</div><div class='ctx'> 	sleep_cfm_buf-&gt;resp_ctrl = cpu_to_le16(RESP_NEEDED);</div><div class='ctx'> </div><div class='del'>-	memset(&amp;adapter-&gt;sleep_params, 0, sizeof(adapter-&gt;sleep_params));</div><div class='ctx'> 	memset(&amp;adapter-&gt;sleep_period, 0, sizeof(adapter-&gt;sleep_period));</div><div class='ctx'> 	adapter-&gt;tx_lock_flag = false;</div><div class='ctx'> 	adapter-&gt;null_pkt_interval = 0;</div><div class='ctx'> 	adapter-&gt;fw_bands = 0;</div><div class='ctx'> 	adapter-&gt;config_bands = 0;</div><div class='ctx'> 	adapter-&gt;adhoc_start_band = 0;</div><div class='del'>-	adapter-&gt;scan_channels = NULL;</div><div class='ctx'> 	adapter-&gt;fw_release_number = 0;</div><div class='ctx'> 	adapter-&gt;fw_cap_info = 0;</div><div class='ctx'> 	memset(&amp;adapter-&gt;upld_buf, 0, sizeof(adapter-&gt;upld_buf));</div><div class='hunk'>@@ -321,7 +315,7 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	adapter-&gt;active_scan_triggered = false;</div><div class='ctx'> 	timer_setup(&amp;adapter-&gt;wakeup_timer, wakeup_timer_fn, 0);</div><div class='ctx'> 	adapter-&gt;devdump_len = 0;</div><div class='del'>-	timer_setup(&amp;adapter-&gt;devdump_timer, fw_dump_timer_fn, 0);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;adapter-&gt;devdump_work, fw_dump_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -332,7 +326,7 @@ void mwifiex_set_trans_start(struct net_device *dev)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; dev-&gt;num_tx_queues; i++)</div><div class='del'>-		netdev_get_tx_queue(dev, i)-&gt;trans_start = jiffies;</div><div class='add'>+		txq_trans_cond_update(netdev_get_tx_queue(dev, i));</div><div class='ctx'> </div><div class='ctx'> 	netif_trans_update(dev);</div><div class='ctx'> }</div><div class='hunk'>@@ -375,15 +369,13 @@ static void mwifiex_invalidate_lists(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		list_del(&amp;adapter-&gt;bss_prio_tbl[i].bss_prio_head);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='del'>-		if (adapter-&gt;priv[i]) {</div><div class='del'>-			priv = adapter-&gt;priv[i];</div><div class='del'>-			for (j = 0; j &lt; MAX_NUM_TID; ++j)</div><div class='del'>-				list_del(&amp;priv-&gt;wmm.tid_tbl_ptr[j].ra_list);</div><div class='del'>-			list_del(&amp;priv-&gt;tx_ba_stream_tbl_ptr);</div><div class='del'>-			list_del(&amp;priv-&gt;rx_reorder_tbl_ptr);</div><div class='del'>-			list_del(&amp;priv-&gt;sta_list);</div><div class='del'>-			list_del(&amp;priv-&gt;auto_tdls_list);</div><div class='del'>-		}</div><div class='add'>+		priv = adapter-&gt;priv[i];</div><div class='add'>+		for (j = 0; j &lt; MAX_NUM_TID; ++j)</div><div class='add'>+			list_del(&amp;priv-&gt;wmm.tid_tbl_ptr[j].ra_list);</div><div class='add'>+		list_del(&amp;priv-&gt;tx_ba_stream_tbl_ptr);</div><div class='add'>+		list_del(&amp;priv-&gt;rx_reorder_tbl_ptr);</div><div class='add'>+		list_del(&amp;priv-&gt;sta_list);</div><div class='add'>+		list_del(&amp;priv-&gt;auto_tdls_list);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -399,8 +391,8 @@ static void mwifiex_invalidate_lists(struct mwifiex_adapter *adapter)</div><div class='ctx'> static void</div><div class='ctx'> mwifiex_adapter_cleanup(struct mwifiex_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	del_timer(&amp;adapter-&gt;wakeup_timer);</div><div class='del'>-	del_timer_sync(&amp;adapter-&gt;devdump_timer);</div><div class='add'>+	timer_delete(&amp;adapter-&gt;wakeup_timer);</div><div class='add'>+	cancel_delayed_work_sync(&amp;adapter-&gt;devdump_work);</div><div class='ctx'> 	mwifiex_cancel_all_pending_cmd(adapter);</div><div class='ctx'> 	wake_up_interruptible(&amp;adapter-&gt;cmd_wait_q.wait);</div><div class='ctx'> 	wake_up_interruptible(&amp;adapter-&gt;hs_activate_wait_q);</div><div class='hunk'>@@ -432,13 +424,11 @@ int mwifiex_init_lock_list(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	spin_lock_init(&amp;adapter-&gt;mwifiex_cmd_lock);</div><div class='ctx'> 	spin_lock_init(&amp;adapter-&gt;queue_lock);</div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='del'>-		if (adapter-&gt;priv[i]) {</div><div class='del'>-			priv = adapter-&gt;priv[i];</div><div class='del'>-			spin_lock_init(&amp;priv-&gt;wmm.ra_list_spinlock);</div><div class='del'>-			spin_lock_init(&amp;priv-&gt;curr_bcn_buf_lock);</div><div class='del'>-			spin_lock_init(&amp;priv-&gt;sta_list_spinlock);</div><div class='del'>-			spin_lock_init(&amp;priv-&gt;auto_tdls_lock);</div><div class='del'>-		}</div><div class='add'>+		priv = adapter-&gt;priv[i];</div><div class='add'>+		spin_lock_init(&amp;priv-&gt;wmm.ra_list_spinlock);</div><div class='add'>+		spin_lock_init(&amp;priv-&gt;curr_bcn_buf_lock);</div><div class='add'>+		spin_lock_init(&amp;priv-&gt;sta_list_spinlock);</div><div class='add'>+		spin_lock_init(&amp;priv-&gt;auto_tdls_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize cmd_free_q */</div><div class='hunk'>@@ -462,8 +452,6 @@ int mwifiex_init_lock_list(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='del'>-		if (!adapter-&gt;priv[i])</div><div class='del'>-			continue;</div><div class='ctx'> 		priv = adapter-&gt;priv[i];</div><div class='ctx'> 		for (j = 0; j &lt; MAX_NUM_TID; ++j)</div><div class='ctx'> 			INIT_LIST_HEAD(&amp;priv-&gt;wmm.tid_tbl_ptr[j].ra_list);</div><div class='hunk'>@@ -493,14 +481,12 @@ int mwifiex_init_lock_list(struct mwifiex_adapter *adapter)</div><div class='ctx'>  *      - Initialize the private structure</div><div class='ctx'>  *      - Add BSS priority tables to the adapter structure</div><div class='ctx'>  *      - For each interface, send the init commands to firmware</div><div class='del'>- *      - Send the first command in command pending queue, if available</div><div class='ctx'>  */</div><div class='ctx'> int mwifiex_init_fw(struct mwifiex_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct mwifiex_private *priv;</div><div class='ctx'> 	u8 i, first_sta = true;</div><div class='del'>-	int is_cmd_pend_q_empty;</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;hw_status = MWIFIEX_HW_STATUS_INITIALIZING;</div><div class='ctx'> </div><div class='hunk'>@@ -513,46 +499,36 @@ int mwifiex_init_fw(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	mwifiex_init_adapter(adapter);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='del'>-		if (adapter-&gt;priv[i]) {</div><div class='del'>-			priv = adapter-&gt;priv[i];</div><div class='add'>+		priv = adapter-&gt;priv[i];</div><div class='ctx'> </div><div class='del'>-			/* Initialize private structure */</div><div class='del'>-			ret = mwifiex_init_priv(priv);</div><div class='del'>-			if (ret)</div><div class='del'>-				return -1;</div><div class='del'>-		}</div><div class='add'>+		/* Initialize private structure */</div><div class='add'>+		ret = mwifiex_init_priv(priv);</div><div class='add'>+		if (ret)</div><div class='add'>+			return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (adapter-&gt;mfg_mode) {</div><div class='ctx'> 		adapter-&gt;hw_status = MWIFIEX_HW_STATUS_READY;</div><div class='del'>-		ret = -EINPROGRESS;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='del'>-			if (adapter-&gt;priv[i]) {</div><div class='del'>-				ret = mwifiex_sta_init_cmd(adapter-&gt;priv[i],</div><div class='del'>-							   first_sta, true);</div><div class='del'>-				if (ret == -1)</div><div class='del'>-					return -1;</div><div class='del'>-</div><div class='del'>-				first_sta = false;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-</div><div class='add'>+			ret = mwifiex_sta_init_cmd(adapter-&gt;priv[i],</div><div class='add'>+						   first_sta);</div><div class='add'>+			if (ret == -1)</div><div class='add'>+				return -1;</div><div class='ctx'> </div><div class='add'>+			first_sta = false;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;adapter-&gt;cmd_pending_q_lock);</div><div class='del'>-	is_cmd_pend_q_empty = list_empty(&amp;adapter-&gt;cmd_pending_q);</div><div class='add'>+	WARN_ON(!list_empty(&amp;adapter-&gt;cmd_pending_q));</div><div class='ctx'> 	spin_unlock_bh(&amp;adapter-&gt;cmd_pending_q_lock);</div><div class='del'>-	if (!is_cmd_pend_q_empty) {</div><div class='del'>-		/* Send the first command in queue and return */</div><div class='del'>-		if (mwifiex_main_process(adapter) != -1)</div><div class='del'>-			ret = -EINPROGRESS;</div><div class='del'>-	} else {</div><div class='del'>-		adapter-&gt;hw_status = MWIFIEX_HW_STATUS_READY;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	adapter-&gt;hw_status = MWIFIEX_HW_STATUS_READY;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;if_ops.init_fw_port)</div><div class='add'>+		adapter-&gt;if_ops.init_fw_port(adapter);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -633,7 +609,7 @@ mwifiex_shutdown_drv(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	if (adapter-&gt;curr_cmd) {</div><div class='ctx'> 		mwifiex_dbg(adapter, WARN,</div><div class='ctx'> 			    "curr_cmd is still in processing\n");</div><div class='del'>-		del_timer_sync(&amp;adapter-&gt;cmd_timer);</div><div class='add'>+		timer_delete_sync(&amp;adapter-&gt;cmd_timer);</div><div class='ctx'> 		mwifiex_recycle_cmd_node(adapter, adapter-&gt;curr_cmd);</div><div class='ctx'> 		adapter-&gt;curr_cmd = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -644,13 +620,11 @@ mwifiex_shutdown_drv(struct mwifiex_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	/* Clean up Tx/Rx queues and delete BSS priority table */</div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='del'>-		if (adapter-&gt;priv[i]) {</div><div class='del'>-			priv = adapter-&gt;priv[i];</div><div class='add'>+		priv = adapter-&gt;priv[i];</div><div class='ctx'> </div><div class='del'>-			mwifiex_clean_auto_tdls(priv);</div><div class='del'>-			mwifiex_abort_cac(priv);</div><div class='del'>-			mwifiex_free_priv(priv);</div><div class='del'>-		}</div><div class='add'>+		mwifiex_clean_auto_tdls(priv);</div><div class='add'>+		mwifiex_abort_cac(priv);</div><div class='add'>+		mwifiex_free_priv(priv);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;adapter-&gt;tx_queued, 0);</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/ioctl.h b/drivers/net/wireless/marvell/mwifiex/ioctl.h<br/>index 3db449efa167..74747d3a379a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/ioctl.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/ioctl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/ioctl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/ioctl.h</a></div><div class='hunk'>@@ -1,26 +1,14 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: ioctl data structures &amp; APIs</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _MWIFIEX_IOCTL_H_</div><div class='ctx'> #define _MWIFIEX_IOCTL_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;net/lib80211.h&gt;</div><div class='add'>+#define NUM_WEP_KEYS	4</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	MWIFIEX_SCAN_TYPE_UNCHANGED = 0,</div><div class='hunk'>@@ -119,6 +107,7 @@ struct mwifiex_uap_bss_param {</div><div class='ctx'> 	u8 qos_info;</div><div class='ctx'> 	u8 power_constraint;</div><div class='ctx'> 	struct mwifiex_types_wmm_info wmm_info;</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -169,6 +158,11 @@ struct mwifiex_bss_info {</div><div class='ctx'> 	u8 bssid[ETH_ALEN];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mwifiex_sta_info {</div><div class='add'>+	u8 peer_mac[ETH_ALEN];</div><div class='add'>+	struct station_parameters *params;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define MAX_NUM_TID     8</div><div class='ctx'> </div><div class='ctx'> #define MAX_RX_WINSIZE  64</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/join.c b/drivers/net/wireless/marvell/mwifiex/join.c<br/>index 173ccf79cbfc..5a1a0287c1d5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/join.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/join.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/join.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/join.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: association and ad-hoc start/join</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "decl.h"</div><div class='hunk'>@@ -394,7 +382,9 @@ int mwifiex_cmd_802_11_associate(struct mwifiex_private *priv,</div><div class='ctx'> 	struct mwifiex_ie_types_ss_param_set *ss_tlv;</div><div class='ctx'> 	struct mwifiex_ie_types_rates_param_set *rates_tlv;</div><div class='ctx'> 	struct mwifiex_ie_types_auth_type *auth_tlv;</div><div class='add'>+	struct mwifiex_ie_types_sae_pwe_mode *sae_pwe_tlv;</div><div class='ctx'> 	struct mwifiex_ie_types_chan_list_param_set *chan_tlv;</div><div class='add'>+	struct mwifiex_ie_types_host_mlme *host_mlme_tlv;</div><div class='ctx'> 	u8 rates[MWIFIEX_SUPPORTED_RATES];</div><div class='ctx'> 	u32 rates_size;</div><div class='ctx'> 	u16 tmp_cap;</div><div class='hunk'>@@ -472,6 +462,24 @@ int mwifiex_cmd_802_11_associate(struct mwifiex_private *priv,</div><div class='ctx'> </div><div class='ctx'> 	pos += sizeof(auth_tlv-&gt;header) + le16_to_cpu(auth_tlv-&gt;header.len);</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;sec_info.authentication_mode == WLAN_AUTH_SAE) {</div><div class='add'>+		auth_tlv-&gt;auth_type = cpu_to_le16(MWIFIEX_AUTHTYPE_SAE);</div><div class='add'>+		if (bss_desc-&gt;bcn_rsnx_ie &amp;&amp;</div><div class='add'>+		    bss_desc-&gt;bcn_rsnx_ie-&gt;ieee_hdr.len &amp;&amp;</div><div class='add'>+		    (bss_desc-&gt;bcn_rsnx_ie-&gt;data[0] &amp;</div><div class='add'>+		    WLAN_RSNX_CAPA_SAE_H2E)) {</div><div class='add'>+			sae_pwe_tlv =</div><div class='add'>+				(struct mwifiex_ie_types_sae_pwe_mode *)pos;</div><div class='add'>+			sae_pwe_tlv-&gt;header.type =</div><div class='add'>+				cpu_to_le16(TLV_TYPE_SAE_PWE_MODE);</div><div class='add'>+			sae_pwe_tlv-&gt;header.len =</div><div class='add'>+				cpu_to_le16(sizeof(sae_pwe_tlv-&gt;pwe[0]));</div><div class='add'>+			sae_pwe_tlv-&gt;pwe[0] = bss_desc-&gt;bcn_rsnx_ie-&gt;data[0];</div><div class='add'>+			pos += sizeof(sae_pwe_tlv-&gt;header) +</div><div class='add'>+				sizeof(sae_pwe_tlv-&gt;pwe[0]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (IS_SUPPORT_MULTI_BANDS(priv-&gt;adapter) &amp;&amp;</div><div class='ctx'> 	    !(ISSUPP_11NENABLED(priv-&gt;adapter-&gt;fw_cap_info) &amp;&amp;</div><div class='ctx'> 	    (!bss_desc-&gt;disable_11n) &amp;&amp;</div><div class='hunk'>@@ -503,6 +511,16 @@ int mwifiex_cmd_802_11_associate(struct mwifiex_private *priv,</div><div class='ctx'> 			sizeof(struct mwifiex_chan_scan_param_set);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;adapter-&gt;host_mlme_enabled) {</div><div class='add'>+		host_mlme_tlv = (struct mwifiex_ie_types_host_mlme *)pos;</div><div class='add'>+		host_mlme_tlv-&gt;header.type = cpu_to_le16(TLV_TYPE_HOST_MLME);</div><div class='add'>+		host_mlme_tlv-&gt;header.len =</div><div class='add'>+			cpu_to_le16(sizeof(host_mlme_tlv-&gt;host_mlme));</div><div class='add'>+		host_mlme_tlv-&gt;host_mlme = 1;</div><div class='add'>+		pos += sizeof(host_mlme_tlv-&gt;header) +</div><div class='add'>+			sizeof(host_mlme_tlv-&gt;host_mlme);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!priv-&gt;wps.session_enable) {</div><div class='ctx'> 		if (priv-&gt;sec_info.wpa_enabled || priv-&gt;sec_info.wpa2_enabled)</div><div class='ctx'> 			rsn_ie_len = mwifiex_append_rsn_ie_wpa_wpa2(priv, &amp;pos);</div><div class='hunk'>@@ -645,7 +663,6 @@ int mwifiex_ret_802_11_associate(struct mwifiex_private *priv,</div><div class='ctx'> 	bool enable_data = true;</div><div class='ctx'> 	u16 cap_info, status_code, aid;</div><div class='ctx'> 	const u8 *ie_ptr;</div><div class='del'>-	struct ieee80211_ht_operation *assoc_resp_ht_oper;</div><div class='ctx'> </div><div class='ctx'> 	if (!priv-&gt;attempted_bss_desc) {</div><div class='ctx'> 		mwifiex_dbg(priv-&gt;adapter, ERROR,</div><div class='hunk'>@@ -653,7 +670,21 @@ int mwifiex_ret_802_11_associate(struct mwifiex_private *priv,</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	assoc_rsp = (struct ieee_types_assoc_rsp *) &amp;resp-&gt;params;</div><div class='add'>+	if (adapter-&gt;host_mlme_enabled) {</div><div class='add'>+		struct ieee80211_mgmt *hdr;</div><div class='add'>+</div><div class='add'>+		hdr = (struct ieee80211_mgmt *)&amp;resp-&gt;params;</div><div class='add'>+		if (!memcmp(hdr-&gt;bssid,</div><div class='add'>+			    priv-&gt;attempted_bss_desc-&gt;mac_address,</div><div class='add'>+			    ETH_ALEN))</div><div class='add'>+			assoc_rsp = (struct ieee_types_assoc_rsp *)</div><div class='add'>+				&amp;hdr-&gt;u.assoc_resp;</div><div class='add'>+		else</div><div class='add'>+			assoc_rsp =</div><div class='add'>+				(struct ieee_types_assoc_rsp *)&amp;resp-&gt;params;</div><div class='add'>+	} else {</div><div class='add'>+		assoc_rsp = (struct ieee_types_assoc_rsp *)&amp;resp-&gt;params;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	cap_info = le16_to_cpu(assoc_rsp-&gt;cap_info_bitmap);</div><div class='ctx'> 	status_code = le16_to_cpu(assoc_rsp-&gt;status_code);</div><div class='hunk'>@@ -692,6 +723,9 @@ int mwifiex_ret_802_11_associate(struct mwifiex_private *priv,</div><div class='ctx'> 				mwifiex_dbg(priv-&gt;adapter, ERROR,</div><div class='ctx'> 					    "ASSOC_RESP: UNSPECIFIED failure\n");</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='add'>+			if (priv-&gt;adapter-&gt;host_mlme_enabled)</div><div class='add'>+				priv-&gt;assoc_rsp_size = 0;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ret = status_code;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -744,14 +778,8 @@ int mwifiex_ret_802_11_associate(struct mwifiex_private *priv,</div><div class='ctx'> 	ie_ptr = cfg80211_find_ie(WLAN_EID_HT_OPERATION, assoc_rsp-&gt;ie_buffer,</div><div class='ctx'> 				  priv-&gt;assoc_rsp_size</div><div class='ctx'> 				  - sizeof(struct ieee_types_assoc_rsp));</div><div class='del'>-	if (ie_ptr) {</div><div class='del'>-		assoc_resp_ht_oper = (struct ieee80211_ht_operation *)(ie_ptr</div><div class='del'>-					+ sizeof(struct ieee_types_header));</div><div class='del'>-		priv-&gt;assoc_resp_ht_param = assoc_resp_ht_oper-&gt;ht_param;</div><div class='del'>-		priv-&gt;ht_param_present = true;</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;ht_param_present = false;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;ht_param_present = ie_ptr ? true : false;</div><div class='ctx'> </div><div class='ctx'> 	mwifiex_dbg(priv-&gt;adapter, INFO,</div><div class='ctx'> 		    "info: ASSOC_RESP: curr_pkt_filter is %#x\n",</div><div class='hunk'>@@ -790,7 +818,8 @@ int mwifiex_ret_802_11_associate(struct mwifiex_private *priv,</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;adapter-&gt;dbg.num_cmd_assoc_success++;</div><div class='ctx'> </div><div class='del'>-	mwifiex_dbg(priv-&gt;adapter, INFO, "info: ASSOC_RESP: associated\n");</div><div class='add'>+	mwifiex_dbg(priv-&gt;adapter, MSG, "assoc: associated with %pM\n",</div><div class='add'>+		    priv-&gt;attempted_bss_desc-&gt;mac_address);</div><div class='ctx'> </div><div class='ctx'> 	/* Add the ra_list here for infra mode as there will be only 1 ra</div><div class='ctx'> 	   always */</div><div class='hunk'>@@ -1439,8 +1468,8 @@ int mwifiex_adhoc_join(struct mwifiex_private *priv,</div><div class='ctx'> </div><div class='ctx'> 	/* Check if the requested SSID is already joined */</div><div class='ctx'> 	if (priv-&gt;curr_bss_params.bss_descriptor.ssid.ssid_len &amp;&amp;</div><div class='del'>-	    !mwifiex_ssid_cmp(&amp;bss_desc-&gt;ssid,</div><div class='del'>-			      &amp;priv-&gt;curr_bss_params.bss_descriptor.ssid) &amp;&amp;</div><div class='add'>+	    cfg80211_ssid_eq(&amp;bss_desc-&gt;ssid,</div><div class='add'>+			     &amp;priv-&gt;curr_bss_params.bss_descriptor.ssid) &amp;&amp;</div><div class='ctx'> 	    (priv-&gt;curr_bss_params.bss_descriptor.bss_mode ==</div><div class='ctx'> 							NL80211_IFTYPE_ADHOC)) {</div><div class='ctx'> 		mwifiex_dbg(priv-&gt;adapter, INFO,</div><div class='hunk'>@@ -1503,6 +1532,20 @@ int mwifiex_deauthenticate(struct mwifiex_private *priv, u8 *mac)</div><div class='ctx'> 	if (!priv-&gt;media_connected)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;adapter-&gt;host_mlme_enabled) {</div><div class='add'>+		priv-&gt;auth_flag = 0;</div><div class='add'>+		priv-&gt;auth_alg = WLAN_AUTH_NONE;</div><div class='add'>+		priv-&gt;host_mlme_reg = false;</div><div class='add'>+		priv-&gt;mgmt_frame_mask = 0;</div><div class='add'>+		if (mwifiex_send_cmd(priv, HostCmd_CMD_MGMT_FRAME_REG,</div><div class='add'>+				     HostCmd_ACT_GEN_SET, 0,</div><div class='add'>+				     &amp;priv-&gt;mgmt_frame_mask, false)) {</div><div class='add'>+			mwifiex_dbg(priv-&gt;adapter, ERROR,</div><div class='add'>+				    "could not unregister mgmt frame rx\n");</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	switch (priv-&gt;bss_mode) {</div><div class='ctx'> 	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 	case NL80211_IFTYPE_P2P_CLIENT:</div><div class='hunk'>@@ -1532,8 +1575,7 @@ void mwifiex_deauthenticate_all(struct mwifiex_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='ctx'> 		priv = adapter-&gt;priv[i];</div><div class='del'>-		if (priv)</div><div class='del'>-			mwifiex_deauthenticate(priv, NULL);</div><div class='add'>+		mwifiex_deauthenticate(priv, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mwifiex_deauthenticate_all);</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c<br/>index 529dfd8b7ae8..ff177b06f42d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/main.c</a></div><div class='hunk'>@@ -1,23 +1,12 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: major functions</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='ctx'> #include "wmm.h"</div><div class='hunk'>@@ -66,7 +55,7 @@ const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 };</div><div class='ctx'>  * proper cleanup before exiting.</div><div class='ctx'>  */</div><div class='ctx'> static int mwifiex_register(void *card, struct device *dev,</div><div class='del'>-			    struct mwifiex_if_ops *if_ops, void **padapter)</div><div class='add'>+			    const struct mwifiex_if_ops *if_ops, void **padapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_adapter *adapter;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -135,14 +124,12 @@ static int mwifiex_unregister(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	if (adapter-&gt;if_ops.cleanup_if)</div><div class='ctx'> 		adapter-&gt;if_ops.cleanup_if(adapter);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;adapter-&gt;cmd_timer);</div><div class='add'>+	timer_shutdown_sync(&amp;adapter-&gt;cmd_timer);</div><div class='ctx'> </div><div class='ctx'> 	/* Free private structures */</div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='del'>-		if (adapter-&gt;priv[i]) {</div><div class='del'>-			mwifiex_free_curr_bcn(adapter-&gt;priv[i]);</div><div class='del'>-			kfree(adapter-&gt;priv[i]);</div><div class='del'>-		}</div><div class='add'>+		mwifiex_free_curr_bcn(adapter-&gt;priv[i]);</div><div class='add'>+		kfree(adapter-&gt;priv[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;nd_info) {</div><div class='hunk'>@@ -226,6 +213,23 @@ exit_rx_proc:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void maybe_quirk_fw_disable_ds(struct mwifiex_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct mwifiex_private *priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA);</div><div class='add'>+	struct mwifiex_ver_ext ver_ext;</div><div class='add'>+</div><div class='add'>+	if (test_and_set_bit(MWIFIEX_IS_REQUESTING_FW_VEREXT, &amp;adapter-&gt;work_flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memset(&amp;ver_ext, 0, sizeof(ver_ext));</div><div class='add'>+	ver_ext.version_str_sel = 1;</div><div class='add'>+	if (mwifiex_send_cmd(priv, HostCmd_CMD_VERSION_EXT,</div><div class='add'>+			     HostCmd_ACT_GEN_GET, 0, &amp;ver_ext, false)) {</div><div class='add'>+		mwifiex_dbg(priv-&gt;adapter, MSG,</div><div class='add'>+			    "Checking hardware revision failed.\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The main process.</div><div class='ctx'>  *</div><div class='hunk'>@@ -304,7 +308,7 @@ process_start:</div><div class='ctx'> 		if (IS_CARD_RX_RCVD(adapter)) {</div><div class='ctx'> 			adapter-&gt;data_received = false;</div><div class='ctx'> 			adapter-&gt;pm_wakeup_fw_try = false;</div><div class='del'>-			del_timer(&amp;adapter-&gt;wakeup_timer);</div><div class='add'>+			timer_delete(&amp;adapter-&gt;wakeup_timer);</div><div class='ctx'> 			if (adapter-&gt;ps_state == PS_STATE_SLEEP)</div><div class='ctx'> 				adapter-&gt;ps_state = PS_STATE_AWAKE;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -351,12 +355,6 @@ process_start:</div><div class='ctx'> 		if (adapter-&gt;cmd_resp_received) {</div><div class='ctx'> 			adapter-&gt;cmd_resp_received = false;</div><div class='ctx'> 			mwifiex_process_cmdresp(adapter);</div><div class='del'>-</div><div class='del'>-			/* call mwifiex back when init_fw is done */</div><div class='del'>-			if (adapter-&gt;hw_status == MWIFIEX_HW_STATUS_INIT_DONE) {</div><div class='del'>-				adapter-&gt;hw_status = MWIFIEX_HW_STATUS_READY;</div><div class='del'>-				mwifiex_init_fw_complete(adapter);</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Check if we need to confirm Sleep Request</div><div class='hunk'>@@ -401,14 +399,17 @@ process_start:</div><div class='ctx'> 		     !adapter-&gt;scan_processing) &amp;&amp;</div><div class='ctx'> 		    !adapter-&gt;data_sent &amp;&amp;</div><div class='ctx'> 		    !skb_queue_empty(&amp;adapter-&gt;tx_data_q)) {</div><div class='add'>+			if (adapter-&gt;hs_activated_manually) {</div><div class='add'>+				mwifiex_cancel_hs(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY),</div><div class='add'>+						  MWIFIEX_ASYNC_CMD);</div><div class='add'>+				adapter-&gt;hs_activated_manually = false;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			mwifiex_process_tx_queue(adapter);</div><div class='ctx'> 			if (adapter-&gt;hs_activated) {</div><div class='ctx'> 				clear_bit(MWIFIEX_IS_HS_CONFIGURED,</div><div class='ctx'> 					  &amp;adapter-&gt;work_flags);</div><div class='del'>-				mwifiex_hs_activated_event</div><div class='del'>-					(mwifiex_get_priv</div><div class='del'>-					(adapter, MWIFIEX_BSS_ROLE_ANY),</div><div class='del'>-					false);</div><div class='add'>+				mwifiex_hs_activated_event(adapter, false);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -418,14 +419,17 @@ process_start:</div><div class='ctx'> 		    !mwifiex_bypass_txlist_empty(adapter) &amp;&amp;</div><div class='ctx'> 		    !mwifiex_is_tdls_chan_switching</div><div class='ctx'> 			(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA))) {</div><div class='add'>+			if (adapter-&gt;hs_activated_manually) {</div><div class='add'>+				mwifiex_cancel_hs(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY),</div><div class='add'>+						  MWIFIEX_ASYNC_CMD);</div><div class='add'>+				adapter-&gt;hs_activated_manually = false;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			mwifiex_process_bypass_tx(adapter);</div><div class='ctx'> 			if (adapter-&gt;hs_activated) {</div><div class='ctx'> 				clear_bit(MWIFIEX_IS_HS_CONFIGURED,</div><div class='ctx'> 					  &amp;adapter-&gt;work_flags);</div><div class='del'>-				mwifiex_hs_activated_event</div><div class='del'>-					(mwifiex_get_priv</div><div class='del'>-					 (adapter, MWIFIEX_BSS_ROLE_ANY),</div><div class='del'>-					 false);</div><div class='add'>+				mwifiex_hs_activated_event(adapter, false);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -434,14 +438,17 @@ process_start:</div><div class='ctx'> 		    !adapter-&gt;data_sent &amp;&amp; !mwifiex_wmm_lists_empty(adapter) &amp;&amp;</div><div class='ctx'> 		    !mwifiex_is_tdls_chan_switching</div><div class='ctx'> 			(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA))) {</div><div class='add'>+			if (adapter-&gt;hs_activated_manually) {</div><div class='add'>+				mwifiex_cancel_hs(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY),</div><div class='add'>+						  MWIFIEX_ASYNC_CMD);</div><div class='add'>+				adapter-&gt;hs_activated_manually = false;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			mwifiex_wmm_process_tx(adapter);</div><div class='ctx'> 			if (adapter-&gt;hs_activated) {</div><div class='ctx'> 				clear_bit(MWIFIEX_IS_HS_CONFIGURED,</div><div class='ctx'> 					  &amp;adapter-&gt;work_flags);</div><div class='del'>-				mwifiex_hs_activated_event</div><div class='del'>-					(mwifiex_get_priv</div><div class='del'>-					 (adapter, MWIFIEX_BSS_ROLE_ANY),</div><div class='del'>-					 false);</div><div class='add'>+				mwifiex_hs_activated_event(adapter, false);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -487,6 +494,11 @@ static void mwifiex_free_adapter(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (adapter-&gt;rgpower_data) {</div><div class='add'>+		release_firmware(adapter-&gt;rgpower_data);</div><div class='add'>+		adapter-&gt;rgpower_data = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mwifiex_unregister(adapter);</div><div class='ctx'> 	pr_debug("info: %s: free adapter\n", __func__);</div><div class='ctx'> }</div><div class='hunk'>@@ -498,16 +510,19 @@ static void mwifiex_free_adapter(struct mwifiex_adapter *adapter)</div><div class='ctx'> static void mwifiex_terminate_workqueue(struct mwifiex_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	if (adapter-&gt;workqueue) {</div><div class='del'>-		flush_workqueue(adapter-&gt;workqueue);</div><div class='ctx'> 		destroy_workqueue(adapter-&gt;workqueue);</div><div class='ctx'> 		adapter-&gt;workqueue = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;rx_workqueue) {</div><div class='del'>-		flush_workqueue(adapter-&gt;rx_workqueue);</div><div class='ctx'> 		destroy_workqueue(adapter-&gt;rx_workqueue);</div><div class='ctx'> 		adapter-&gt;rx_workqueue = NULL;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;host_mlme_workqueue) {</div><div class='add'>+		destroy_workqueue(adapter-&gt;host_mlme_workqueue);</div><div class='add'>+		adapter-&gt;host_mlme_workqueue = NULL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -562,21 +577,11 @@ static int _mwifiex_fw_dpc(const struct firmware *firmware, void *context)</div><div class='ctx'> 			goto err_dnld_fw;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;init_wait_q_woken = false;</div><div class='ctx'> 	ret = mwifiex_init_fw(adapter);</div><div class='del'>-	if (ret == -1) {</div><div class='add'>+	if (ret == -1)</div><div class='ctx'> 		goto err_init_fw;</div><div class='del'>-	} else if (!ret) {</div><div class='del'>-		adapter-&gt;hw_status = MWIFIEX_HW_STATUS_READY;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-	/* Wait for mwifiex_init to complete */</div><div class='del'>-	if (!adapter-&gt;mfg_mode) {</div><div class='del'>-		wait_event_interruptible(adapter-&gt;init_wait_q,</div><div class='del'>-					 adapter-&gt;init_wait_q_woken);</div><div class='del'>-		if (adapter-&gt;hw_status != MWIFIEX_HW_STATUS_READY)</div><div class='del'>-			goto err_init_fw;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	maybe_quirk_fw_disable_ds(adapter);</div><div class='ctx'> </div><div class='ctx'> 	if (!adapter-&gt;wiphy) {</div><div class='ctx'> 		if (mwifiex_register_cfg80211(adapter)) {</div><div class='hunk'>@@ -642,7 +647,7 @@ static int _mwifiex_fw_dpc(const struct firmware *firmware, void *context)</div><div class='ctx'> 	goto done;</div><div class='ctx'> </div><div class='ctx'> err_add_intf:</div><div class='del'>-	vfree(adapter-&gt;chan_stats);</div><div class='add'>+	kfree(adapter-&gt;chan_stats);</div><div class='ctx'> err_init_chan_scan:</div><div class='ctx'> 	wiphy_unregister(adapter-&gt;wiphy);</div><div class='ctx'> 	wiphy_free(adapter-&gt;wiphy);</div><div class='hunk'>@@ -666,10 +671,6 @@ err_dnld_fw:</div><div class='ctx'> </div><div class='ctx'> 	init_failed = true;</div><div class='ctx'> done:</div><div class='del'>-	if (adapter-&gt;cal_data) {</div><div class='del'>-		release_firmware(adapter-&gt;cal_data);</div><div class='del'>-		adapter-&gt;cal_data = NULL;</div><div class='del'>-	}</div><div class='ctx'> 	if (adapter-&gt;firmware) {</div><div class='ctx'> 		release_firmware(adapter-&gt;firmware);</div><div class='ctx'> 		adapter-&gt;firmware = NULL;</div><div class='hunk'>@@ -702,14 +703,9 @@ static int mwifiex_init_hw_fw(struct mwifiex_adapter *adapter,</div><div class='ctx'> 	/* Override default firmware with manufacturing one if</div><div class='ctx'> 	 * manufacturing mode is enabled</div><div class='ctx'> 	 */</div><div class='del'>-	if (mfg_mode) {</div><div class='del'>-		if (strlcpy(adapter-&gt;fw_name, MFG_FIRMWARE,</div><div class='del'>-			    sizeof(adapter-&gt;fw_name)) &gt;=</div><div class='del'>-			    sizeof(adapter-&gt;fw_name)) {</div><div class='del'>-			pr_err("%s: fw_name too long!\n", __func__);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (mfg_mode)</div><div class='add'>+		strscpy(adapter-&gt;fw_name, MFG_FIRMWARE,</div><div class='add'>+			sizeof(adapter-&gt;fw_name));</div><div class='ctx'> </div><div class='ctx'> 	if (req_fw_nowait) {</div><div class='ctx'> 		ret = request_firmware_nowait(THIS_MODULE, 1, adapter-&gt;fw_name,</div><div class='hunk'>@@ -785,6 +781,10 @@ mwifiex_bypass_tx_queue(struct mwifiex_private *priv,</div><div class='ctx'> 			    "bypass txqueue; eth type %#x, mgmt %d\n",</div><div class='ctx'> 			     ntohs(eth_hdr-&gt;h_proto),</div><div class='ctx'> 			     mwifiex_is_skb_mgmt_frame(skb));</div><div class='add'>+		if (eth_hdr-&gt;h_proto == htons(ETH_P_PAE))</div><div class='add'>+			mwifiex_dbg(priv-&gt;adapter, MSG,</div><div class='add'>+				    "key: send EAPOL to %pM\n",</div><div class='add'>+				    eth_hdr-&gt;h_dest);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -918,8 +918,7 @@ mwifiex_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	multicast = is_multicast_ether_addr(skb-&gt;data);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!multicast &amp;&amp; skb-&gt;sk &amp;&amp;</div><div class='del'>-		     skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_WIFI_STATUS &amp;&amp;</div><div class='add'>+	if (unlikely(!multicast &amp;&amp; sk_requests_wifi_status(skb-&gt;sk) &amp;&amp;</div><div class='ctx'> 		     priv-&gt;adapter-&gt;fw_api_ver == MWIFIEX_FW_V15))</div><div class='ctx'> 		skb = mwifiex_clone_skb_for_tx_status(priv,</div><div class='ctx'> 						      skb,</div><div class='hunk'>@@ -987,7 +986,7 @@ int mwifiex_set_mac_address(struct mwifiex_private *priv,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ether_addr_copy(dev-&gt;dev_addr, priv-&gt;curr_addr);</div><div class='add'>+	eth_hw_addr_set(dev, priv-&gt;curr_addr);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1145,7 +1144,7 @@ void mwifiex_drv_info_dump(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='del'>-		if (!adapter-&gt;priv[i] || !adapter-&gt;priv[i]-&gt;netdev)</div><div class='add'>+		if (!adapter-&gt;priv[i]-&gt;netdev)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		priv = adapter-&gt;priv[i];</div><div class='ctx'> 		p += sprintf(p, "\n[interface  : \"%s\"]\n",</div><div class='hunk'>@@ -1184,7 +1183,7 @@ void mwifiex_drv_info_dump(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	debug_info = kzalloc(sizeof(*debug_info), GFP_KERNEL);</div><div class='ctx'> 	if (debug_info) {</div><div class='ctx'> 		for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='del'>-			if (!adapter-&gt;priv[i] || !adapter-&gt;priv[i]-&gt;netdev)</div><div class='add'>+			if (!adapter-&gt;priv[i]-&gt;netdev)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			priv = adapter-&gt;priv[i];</div><div class='ctx'> 			mwifiex_get_debug_info(priv, debug_info);</div><div class='hunk'>@@ -1367,6 +1366,35 @@ int is_command_pending(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	return !is_cmd_pend_q_empty;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* This is the host mlme work queue function.</div><div class='add'>+ * It handles the host mlme operations.</div><div class='add'>+ */</div><div class='add'>+static void mwifiex_host_mlme_work_queue(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct mwifiex_adapter *adapter =</div><div class='add'>+		container_of(work, struct mwifiex_adapter, host_mlme_work);</div><div class='add'>+</div><div class='add'>+	if (test_bit(MWIFIEX_SURPRISE_REMOVED, &amp;adapter-&gt;work_flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Check for host mlme disconnection */</div><div class='add'>+	if (adapter-&gt;host_mlme_link_lost) {</div><div class='add'>+		if (adapter-&gt;priv_link_lost) {</div><div class='add'>+			mwifiex_reset_connect_state(adapter-&gt;priv_link_lost,</div><div class='add'>+						    WLAN_REASON_DEAUTH_LEAVING,</div><div class='add'>+						    true);</div><div class='add'>+			adapter-&gt;priv_link_lost = NULL;</div><div class='add'>+		}</div><div class='add'>+		adapter-&gt;host_mlme_link_lost = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check for host mlme Assoc Resp */</div><div class='add'>+	if (adapter-&gt;assoc_resp_received) {</div><div class='add'>+		mwifiex_process_assoc_resp(adapter);</div><div class='add'>+		adapter-&gt;assoc_resp_received = false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This is the RX work queue function.</div><div class='ctx'>  *</div><div class='hunk'>@@ -1417,7 +1445,7 @@ static void mwifiex_uninit_sw(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	/* Stop data */</div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='ctx'> 		priv = adapter-&gt;priv[i];</div><div class='del'>-		if (priv &amp;&amp; priv-&gt;netdev) {</div><div class='add'>+		if (priv-&gt;netdev) {</div><div class='ctx'> 			mwifiex_stop_net_dev_queue(priv-&gt;netdev, adapter);</div><div class='ctx'> 			if (netif_carrier_ok(priv-&gt;netdev))</div><div class='ctx'> 				netif_carrier_off(priv-&gt;netdev);</div><div class='hunk'>@@ -1442,14 +1470,19 @@ static void mwifiex_uninit_sw(struct mwifiex_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='ctx'> 		priv = adapter-&gt;priv[i];</div><div class='del'>-		if (!priv)</div><div class='del'>-			continue;</div><div class='ctx'> 		rtnl_lock();</div><div class='del'>-		wiphy_lock(adapter-&gt;wiphy);</div><div class='ctx'> 		if (priv-&gt;netdev &amp;&amp;</div><div class='del'>-		    priv-&gt;wdev.iftype != NL80211_IFTYPE_UNSPECIFIED)</div><div class='add'>+		    priv-&gt;wdev.iftype != NL80211_IFTYPE_UNSPECIFIED) {</div><div class='add'>+			/*</div><div class='add'>+			 * Close the netdev now, because if we do it later, the</div><div class='add'>+			 * netdev notifiers will need to acquire the wiphy lock</div><div class='add'>+			 * again --&gt; deadlock.</div><div class='add'>+			 */</div><div class='add'>+			dev_close(priv-&gt;wdev.netdev);</div><div class='add'>+			wiphy_lock(adapter-&gt;wiphy);</div><div class='ctx'> 			mwifiex_del_virtual_intf(adapter-&gt;wiphy, &amp;priv-&gt;wdev);</div><div class='del'>-		wiphy_unlock(adapter-&gt;wiphy);</div><div class='add'>+			wiphy_unlock(adapter-&gt;wiphy);</div><div class='add'>+		}</div><div class='ctx'> 		rtnl_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1457,7 +1490,7 @@ static void mwifiex_uninit_sw(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	wiphy_free(adapter-&gt;wiphy);</div><div class='ctx'> 	adapter-&gt;wiphy = NULL;</div><div class='ctx'> </div><div class='del'>-	vfree(adapter-&gt;chan_stats);</div><div class='add'>+	kfree(adapter-&gt;chan_stats);</div><div class='ctx'> 	mwifiex_free_cmd_buffers(adapter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1504,7 +1537,6 @@ mwifiex_reinit_sw(struct mwifiex_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;hw_status = MWIFIEX_HW_STATUS_INITIALIZING;</div><div class='ctx'> 	clear_bit(MWIFIEX_SURPRISE_REMOVED, &amp;adapter-&gt;work_flags);</div><div class='del'>-	init_waitqueue_head(&amp;adapter-&gt;init_wait_q);</div><div class='ctx'> 	clear_bit(MWIFIEX_IS_SUSPENDED, &amp;adapter-&gt;work_flags);</div><div class='ctx'> 	adapter-&gt;hs_activated = false;</div><div class='ctx'> 	clear_bit(MWIFIEX_IS_CMD_TIMEDOUT, &amp;adapter-&gt;work_flags);</div><div class='hunk'>@@ -1518,7 +1550,7 @@ mwifiex_reinit_sw(struct mwifiex_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;workqueue =</div><div class='ctx'> 		alloc_workqueue("MWIFIEX_WORK_QUEUE",</div><div class='del'>-				WQ_HIGHPRI | WQ_MEM_RECLAIM | WQ_UNBOUND, 1);</div><div class='add'>+				WQ_HIGHPRI | WQ_MEM_RECLAIM | WQ_UNBOUND, 0);</div><div class='ctx'> 	if (!adapter-&gt;workqueue)</div><div class='ctx'> 		goto err_kmalloc;</div><div class='ctx'> </div><div class='hunk'>@@ -1528,12 +1560,24 @@ mwifiex_reinit_sw(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		adapter-&gt;rx_workqueue = alloc_workqueue("MWIFIEX_RX_WORK_QUEUE",</div><div class='ctx'> 							WQ_HIGHPRI |</div><div class='ctx'> 							WQ_MEM_RECLAIM |</div><div class='del'>-							WQ_UNBOUND, 1);</div><div class='add'>+							WQ_UNBOUND, 0);</div><div class='ctx'> 		if (!adapter-&gt;rx_workqueue)</div><div class='ctx'> 			goto err_kmalloc;</div><div class='ctx'> 		INIT_WORK(&amp;adapter-&gt;rx_work, mwifiex_rx_work_queue);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (adapter-&gt;host_mlme_enabled) {</div><div class='add'>+		adapter-&gt;host_mlme_workqueue =</div><div class='add'>+			alloc_workqueue("MWIFIEX_HOST_MLME_WORK_QUEUE",</div><div class='add'>+					WQ_HIGHPRI |</div><div class='add'>+					WQ_MEM_RECLAIM |</div><div class='add'>+					WQ_UNBOUND, 0);</div><div class='add'>+		if (!adapter-&gt;host_mlme_workqueue)</div><div class='add'>+			goto err_kmalloc;</div><div class='add'>+		INIT_WORK(&amp;adapter-&gt;host_mlme_work,</div><div class='add'>+			  mwifiex_host_mlme_work_queue);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Register the device. Fill up the private data structure with</div><div class='ctx'> 	 * relevant information from the card. Some code extracted from</div><div class='ctx'> 	 * mwifiex_register_dev()</div><div class='hunk'>@@ -1609,7 +1653,8 @@ static void mwifiex_probe_of(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = devm_request_irq(dev, adapter-&gt;irq_wakeup,</div><div class='del'>-			       mwifiex_irq_wakeup_handler, IRQF_TRIGGER_LOW,</div><div class='add'>+			       mwifiex_irq_wakeup_handler,</div><div class='add'>+			       IRQF_TRIGGER_LOW | IRQF_NO_AUTOEN,</div><div class='ctx'> 			       "wifi_wake", adapter);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev, "Failed to request irq_wakeup %d (%d)\n",</div><div class='hunk'>@@ -1617,7 +1662,6 @@ static void mwifiex_probe_of(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	disable_irq(adapter-&gt;irq_wakeup);</div><div class='ctx'> 	if (device_init_wakeup(dev, true)) {</div><div class='ctx'> 		dev_err(dev, "fail to init wakeup for mwifiex\n");</div><div class='ctx'> 		goto err_exit;</div><div class='hunk'>@@ -1643,7 +1687,7 @@ err_exit:</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='ctx'> mwifiex_add_card(void *card, struct completion *fw_done,</div><div class='del'>-		 struct mwifiex_if_ops *if_ops, u8 iface_type,</div><div class='add'>+		 const struct mwifiex_if_ops *if_ops, u8 iface_type,</div><div class='ctx'> 		 struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_adapter *adapter;</div><div class='hunk'>@@ -1660,7 +1704,6 @@ mwifiex_add_card(void *card, struct completion *fw_done,</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;hw_status = MWIFIEX_HW_STATUS_INITIALIZING;</div><div class='ctx'> 	clear_bit(MWIFIEX_SURPRISE_REMOVED, &amp;adapter-&gt;work_flags);</div><div class='del'>-	init_waitqueue_head(&amp;adapter-&gt;init_wait_q);</div><div class='ctx'> 	clear_bit(MWIFIEX_IS_SUSPENDED, &amp;adapter-&gt;work_flags);</div><div class='ctx'> 	adapter-&gt;hs_activated = false;</div><div class='ctx'> 	init_waitqueue_head(&amp;adapter-&gt;hs_activate_wait_q);</div><div class='hunk'>@@ -1673,7 +1716,7 @@ mwifiex_add_card(void *card, struct completion *fw_done,</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;workqueue =</div><div class='ctx'> 		alloc_workqueue("MWIFIEX_WORK_QUEUE",</div><div class='del'>-				WQ_HIGHPRI | WQ_MEM_RECLAIM | WQ_UNBOUND, 1);</div><div class='add'>+				WQ_HIGHPRI | WQ_MEM_RECLAIM | WQ_UNBOUND, 0);</div><div class='ctx'> 	if (!adapter-&gt;workqueue)</div><div class='ctx'> 		goto err_kmalloc;</div><div class='ctx'> </div><div class='hunk'>@@ -1683,7 +1726,7 @@ mwifiex_add_card(void *card, struct completion *fw_done,</div><div class='ctx'> 		adapter-&gt;rx_workqueue = alloc_workqueue("MWIFIEX_RX_WORK_QUEUE",</div><div class='ctx'> 							WQ_HIGHPRI |</div><div class='ctx'> 							WQ_MEM_RECLAIM |</div><div class='del'>-							WQ_UNBOUND, 1);</div><div class='add'>+							WQ_UNBOUND, 0);</div><div class='ctx'> 		if (!adapter-&gt;rx_workqueue)</div><div class='ctx'> 			goto err_kmalloc;</div><div class='ctx'> </div><div class='hunk'>@@ -1697,6 +1740,18 @@ mwifiex_add_card(void *card, struct completion *fw_done,</div><div class='ctx'> 		goto err_registerdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (adapter-&gt;host_mlme_enabled) {</div><div class='add'>+		adapter-&gt;host_mlme_workqueue =</div><div class='add'>+			alloc_workqueue("MWIFIEX_HOST_MLME_WORK_QUEUE",</div><div class='add'>+					WQ_HIGHPRI |</div><div class='add'>+					WQ_MEM_RECLAIM |</div><div class='add'>+					WQ_UNBOUND, 0);</div><div class='add'>+		if (!adapter-&gt;host_mlme_workqueue)</div><div class='add'>+			goto err_kmalloc;</div><div class='add'>+		INIT_WORK(&amp;adapter-&gt;host_mlme_work,</div><div class='add'>+			  mwifiex_host_mlme_work_queue);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (mwifiex_init_hw_fw(adapter, true)) {</div><div class='ctx'> 		pr_err("%s: firmware init failed\n", __func__);</div><div class='ctx'> 		goto err_init_fw;</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h<br/>index 5923c5c14c8d..27559e2ddc31 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/main.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/main.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/main.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/main.h</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: major data structures and prototypes</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _MWIFIEX_MAIN_H_</div><div class='hunk'>@@ -22,6 +10,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/kstrtox.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/semaphore.h&gt;</div><div class='hunk'>@@ -30,7 +19,6 @@</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='del'>-#include &lt;net/lib80211.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='hunk'>@@ -39,16 +27,15 @@</div><div class='ctx'> #include &lt;linux/inetdevice.h&gt;</div><div class='ctx'> #include &lt;linux/devcoredump.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/of_gpio.h&gt;</div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/of_irq.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "decl.h"</div><div class='ctx'> #include "ioctl.h"</div><div class='hunk'>@@ -252,7 +239,6 @@ struct mwifiex_dbg {</div><div class='ctx'> enum MWIFIEX_HARDWARE_STATUS {</div><div class='ctx'> 	MWIFIEX_HW_STATUS_READY,</div><div class='ctx'> 	MWIFIEX_HW_STATUS_INITIALIZING,</div><div class='del'>-	MWIFIEX_HW_STATUS_INIT_DONE,</div><div class='ctx'> 	MWIFIEX_HW_STATUS_RESET,</div><div class='ctx'> 	MWIFIEX_HW_STATUS_NOT_READY</div><div class='ctx'> };</div><div class='hunk'>@@ -436,6 +422,8 @@ struct mwifiex_bssdescriptor {</div><div class='ctx'> 	u16 wpa_offset;</div><div class='ctx'> 	struct ieee_types_generic *bcn_rsn_ie;</div><div class='ctx'> 	u16 rsn_offset;</div><div class='add'>+	struct ieee_types_generic *bcn_rsnx_ie;</div><div class='add'>+	u16 rsnx_offset;</div><div class='ctx'> 	struct ieee_types_generic *bcn_wapi_ie;</div><div class='ctx'> 	u16 wapi_offset;</div><div class='ctx'> 	u8 *beacon_buf;</div><div class='hunk'>@@ -454,15 +442,6 @@ struct mwifiex_current_bss_params {</div><div class='ctx'> 	u8 data_rates[MWIFIEX_SUPPORTED_RATES];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mwifiex_sleep_params {</div><div class='del'>-	u16 sp_error;</div><div class='del'>-	u16 sp_offset;</div><div class='del'>-	u16 sp_stable_time;</div><div class='del'>-	u8 sp_cal_control;</div><div class='del'>-	u8 sp_ext_sleep_clk;</div><div class='del'>-	u16 sp_reserved;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct mwifiex_sleep_period {</div><div class='ctx'> 	u16 period;</div><div class='ctx'> 	u16 reserved;</div><div class='hunk'>@@ -524,6 +503,7 @@ enum mwifiex_adapter_work_flags {</div><div class='ctx'> 	MWIFIEX_IS_SUSPENDED,</div><div class='ctx'> 	MWIFIEX_IS_HS_CONFIGURED,</div><div class='ctx'> 	MWIFIEX_IS_HS_ENABLING,</div><div class='add'>+	MWIFIEX_IS_REQUESTING_FW_VEREXT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mwifiex_band_config {</div><div class='hunk'>@@ -545,6 +525,8 @@ struct mwifiex_private {</div><div class='ctx'> 	u8 bss_priority;</div><div class='ctx'> 	u8 bss_num;</div><div class='ctx'> 	u8 bss_started;</div><div class='add'>+	u8 auth_flag;</div><div class='add'>+	u16 auth_alg;</div><div class='ctx'> 	u8 frame_type;</div><div class='ctx'> 	u8 curr_addr[ETH_ALEN];</div><div class='ctx'> 	u8 media_connected;</div><div class='hunk'>@@ -590,7 +572,6 @@ struct mwifiex_private {</div><div class='ctx'> 	u16 listen_interval;</div><div class='ctx'> 	u16 atim_window;</div><div class='ctx'> 	u8 adhoc_channel;</div><div class='del'>-	u8 adhoc_is_link_sensed;</div><div class='ctx'> 	u8 adhoc_state;</div><div class='ctx'> 	struct mwifiex_802_11_security sec_info;</div><div class='ctx'> 	struct mwifiex_wep_key wep_key[NUM_WEP_KEYS];</div><div class='hunk'>@@ -628,6 +609,7 @@ struct mwifiex_private {</div><div class='ctx'> #define MWIFIEX_ASSOC_RSP_BUF_SIZE  500</div><div class='ctx'> 	u8 assoc_rsp_buf[MWIFIEX_ASSOC_RSP_BUF_SIZE];</div><div class='ctx'> 	u32 assoc_rsp_size;</div><div class='add'>+	struct cfg80211_bss *req_bss;</div><div class='ctx'> </div><div class='ctx'> #define MWIFIEX_GENIE_BUF_SIZE      256</div><div class='ctx'> 	u8 gen_ie_buf[MWIFIEX_GENIE_BUF_SIZE];</div><div class='hunk'>@@ -646,7 +628,7 @@ struct mwifiex_private {</div><div class='ctx'> 	struct wireless_dev wdev;</div><div class='ctx'> 	struct mwifiex_chan_freq_power cfp;</div><div class='ctx'> 	u32 versionstrsel;</div><div class='del'>-	char version_str[128];</div><div class='add'>+	char version_str[MWIFIEX_VERSION_STR_LENGTH];</div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='ctx'> 	struct dentry *dfs_dev_dir;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -667,6 +649,7 @@ struct mwifiex_private {</div><div class='ctx'> 	u16 gen_idx;</div><div class='ctx'> 	u8 ap_11n_enabled;</div><div class='ctx'> 	u8 ap_11ac_enabled;</div><div class='add'>+	bool host_mlme_reg;</div><div class='ctx'> 	u32 mgmt_frame_mask;</div><div class='ctx'> 	struct mwifiex_roc_cfg roc_cfg;</div><div class='ctx'> 	bool scan_aborting;</div><div class='hunk'>@@ -690,7 +673,6 @@ struct mwifiex_private {</div><div class='ctx'> 	struct cfg80211_chan_def dfs_chandef;</div><div class='ctx'> 	struct workqueue_struct *dfs_cac_workqueue;</div><div class='ctx'> 	struct delayed_work dfs_cac_work;</div><div class='del'>-	struct timer_list dfs_chan_switch_timer;</div><div class='ctx'> 	struct workqueue_struct *dfs_chan_sw_workqueue;</div><div class='ctx'> 	struct delayed_work dfs_chan_sw_work;</div><div class='ctx'> 	struct cfg80211_beacon_data beacon_after;</div><div class='hunk'>@@ -698,7 +680,6 @@ struct mwifiex_private {</div><div class='ctx'> 	struct mwifiex_ds_mem_rw mem_rw;</div><div class='ctx'> 	struct sk_buff_head bypass_txq;</div><div class='ctx'> 	struct mwifiex_user_scan_chan hidden_chan[MWIFIEX_USER_SCAN_CHAN_MAX];</div><div class='del'>-	u8 assoc_resp_ht_param;</div><div class='ctx'> 	bool ht_param_present;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -814,10 +795,9 @@ struct mwifiex_auto_tdls_peer {</div><div class='ctx'> 	u8 mac_addr[ETH_ALEN];</div><div class='ctx'> 	u8 tdls_status;</div><div class='ctx'> 	int rssi;</div><div class='del'>-	long rssi_jiffies;</div><div class='add'>+	unsigned long rssi_jiffies;</div><div class='ctx'> 	u8 failure_count;</div><div class='ctx'> 	u8 do_discover;</div><div class='del'>-	u8 do_setup;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define MWIFIEX_TYPE_AGGR_DATA_V2 11</div><div class='hunk'>@@ -853,12 +833,12 @@ struct mwifiex_if_ops {</div><div class='ctx'> 	void (*cleanup_mpa_buf) (struct mwifiex_adapter *);</div><div class='ctx'> 	int (*cmdrsp_complete) (struct mwifiex_adapter *, struct sk_buff *);</div><div class='ctx'> 	int (*event_complete) (struct mwifiex_adapter *, struct sk_buff *);</div><div class='del'>-	int (*init_fw_port) (struct mwifiex_adapter *);</div><div class='add'>+	void (*init_fw_port)(struct mwifiex_adapter *adapter);</div><div class='ctx'> 	int (*dnld_fw) (struct mwifiex_adapter *, struct mwifiex_fw_image *);</div><div class='ctx'> 	void (*card_reset) (struct mwifiex_adapter *);</div><div class='ctx'> 	int (*reg_dump)(struct mwifiex_adapter *, char *);</div><div class='ctx'> 	void (*device_dump)(struct mwifiex_adapter *);</div><div class='del'>-	int (*clean_pcie_ring) (struct mwifiex_adapter *adapter);</div><div class='add'>+	void (*clean_pcie_ring)(struct mwifiex_adapter *adapter);</div><div class='ctx'> 	void (*iface_work)(struct work_struct *work);</div><div class='ctx'> 	void (*submit_rem_rx_urbs)(struct mwifiex_adapter *adapter);</div><div class='ctx'> 	void (*deaggr_pkt)(struct mwifiex_adapter *, struct sk_buff *);</div><div class='hunk'>@@ -884,8 +864,6 @@ struct mwifiex_adapter {</div><div class='ctx'> 	unsigned long work_flags;</div><div class='ctx'> 	u32 fw_release_number;</div><div class='ctx'> 	u8 intf_hdr_len;</div><div class='del'>-	u16 init_wait_q_woken;</div><div class='del'>-	wait_queue_head_t init_wait_q;</div><div class='ctx'> 	void *card;</div><div class='ctx'> 	struct mwifiex_if_ops if_ops;</div><div class='ctx'> 	atomic_t bypass_tx_pending;</div><div class='hunk'>@@ -897,8 +875,8 @@ struct mwifiex_adapter {</div><div class='ctx'> 	struct work_struct main_work;</div><div class='ctx'> 	struct workqueue_struct *rx_workqueue;</div><div class='ctx'> 	struct work_struct rx_work;</div><div class='del'>-	struct workqueue_struct *dfs_workqueue;</div><div class='del'>-	struct work_struct dfs_work;</div><div class='add'>+	struct workqueue_struct *host_mlme_workqueue;</div><div class='add'>+	struct work_struct host_mlme_work;</div><div class='ctx'> 	bool rx_work_enabled;</div><div class='ctx'> 	bool rx_processing;</div><div class='ctx'> 	bool delay_main_work;</div><div class='hunk'>@@ -930,12 +908,14 @@ struct mwifiex_adapter {</div><div class='ctx'> 	u8 cmd_resp_received;</div><div class='ctx'> 	u8 event_received;</div><div class='ctx'> 	u8 data_received;</div><div class='add'>+	u8 assoc_resp_received;</div><div class='add'>+	struct mwifiex_private *priv_link_lost;</div><div class='add'>+	u8 host_mlme_link_lost;</div><div class='ctx'> 	u16 seq_num;</div><div class='ctx'> 	struct cmd_ctrl_node *cmd_pool;</div><div class='ctx'> 	struct cmd_ctrl_node *curr_cmd;</div><div class='ctx'> 	/* spin lock for command */</div><div class='ctx'> 	spinlock_t mwifiex_cmd_lock;</div><div class='del'>-	u16 last_init_cmd;</div><div class='ctx'> 	struct timer_list cmd_timer;</div><div class='ctx'> 	struct list_head cmd_free_q;</div><div class='ctx'> 	/* spin lock for cmd_free_q */</div><div class='hunk'>@@ -962,9 +942,7 @@ struct mwifiex_adapter {</div><div class='ctx'> 	u8 fw_bands;</div><div class='ctx'> 	u8 adhoc_start_band;</div><div class='ctx'> 	u8 config_bands;</div><div class='del'>-	struct mwifiex_chan_scan_param_set *scan_channels;</div><div class='ctx'> 	u8 tx_lock_flag;</div><div class='del'>-	struct mwifiex_sleep_params sleep_params;</div><div class='ctx'> 	struct mwifiex_sleep_period sleep_period;</div><div class='ctx'> 	u16 ps_mode;</div><div class='ctx'> 	u32 ps_state;</div><div class='hunk'>@@ -986,6 +964,7 @@ struct mwifiex_adapter {</div><div class='ctx'> 	struct timer_list wakeup_timer;</div><div class='ctx'> 	struct mwifiex_hs_config_param hs_cfg;</div><div class='ctx'> 	u8 hs_activated;</div><div class='add'>+	u8 hs_activated_manually;</div><div class='ctx'> 	u16 hs_activate_wait_q_woken;</div><div class='ctx'> 	wait_queue_head_t hs_activate_wait_q;</div><div class='ctx'> 	u8 event_body[MAX_EVENT_SIZE];</div><div class='hunk'>@@ -1003,6 +982,7 @@ struct mwifiex_adapter {</div><div class='ctx'> 	u8 country_code[IEEE80211_COUNTRY_STRING_LEN];</div><div class='ctx'> 	u16 max_mgmt_ie_index;</div><div class='ctx'> 	const struct firmware *cal_data;</div><div class='add'>+	const struct firmware *rgpower_data;</div><div class='ctx'> 	struct device_node *dt_node;</div><div class='ctx'> </div><div class='ctx'> 	/* 11AC */</div><div class='hunk'>@@ -1020,6 +1000,8 @@ struct mwifiex_adapter {</div><div class='ctx'> 	bool is_up;</div><div class='ctx'> </div><div class='ctx'> 	bool ext_scan;</div><div class='add'>+	bool host_mlme_enabled;</div><div class='add'>+	struct ieee80211_txrx_stypes mwifiex_mgmt_stypes[NUM_NL80211_IFTYPES];</div><div class='ctx'> 	u8 fw_api_ver;</div><div class='ctx'> 	u8 key_api_major_ver, key_api_minor_ver;</div><div class='ctx'> 	u8 max_p2p_conn, max_sta_conn;</div><div class='hunk'>@@ -1053,7 +1035,9 @@ struct mwifiex_adapter {</div><div class='ctx'> 	/* Device dump data/length */</div><div class='ctx'> 	void *devdump_data;</div><div class='ctx'> 	int devdump_len;</div><div class='del'>-	struct timer_list devdump_timer;</div><div class='add'>+	struct delayed_work devdump_work;</div><div class='add'>+</div><div class='add'>+	bool ignore_btcoex_events;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void mwifiex_process_tx_queue(struct mwifiex_adapter *adapter);</div><div class='hunk'>@@ -1073,8 +1057,6 @@ void mwifiex_free_priv(struct mwifiex_private *priv);</div><div class='ctx'> </div><div class='ctx'> int mwifiex_init_fw(struct mwifiex_adapter *adapter);</div><div class='ctx'> </div><div class='del'>-int mwifiex_init_fw_complete(struct mwifiex_adapter *adapter);</div><div class='del'>-</div><div class='ctx'> void mwifiex_shutdown_drv(struct mwifiex_adapter *adapter);</div><div class='ctx'> </div><div class='ctx'> int mwifiex_dnld_fw(struct mwifiex_adapter *, struct mwifiex_fw_image *);</div><div class='hunk'>@@ -1083,6 +1065,9 @@ int mwifiex_recv_packet(struct mwifiex_private *priv, struct sk_buff *skb);</div><div class='ctx'> int mwifiex_uap_recv_packet(struct mwifiex_private *priv,</div><div class='ctx'> 			    struct sk_buff *skb);</div><div class='ctx'> </div><div class='add'>+void mwifiex_host_mlme_disconnect(struct mwifiex_private *priv,</div><div class='add'>+				  u16 reason_code, u8 *sa);</div><div class='add'>+</div><div class='ctx'> int mwifiex_process_mgmt_packet(struct mwifiex_private *priv,</div><div class='ctx'> 				struct sk_buff *skb);</div><div class='ctx'> </div><div class='hunk'>@@ -1114,6 +1099,7 @@ void mwifiex_insert_cmd_to_pending_q(struct mwifiex_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> int mwifiex_exec_next_cmd(struct mwifiex_adapter *adapter);</div><div class='ctx'> int mwifiex_process_cmdresp(struct mwifiex_adapter *adapter);</div><div class='add'>+void mwifiex_process_assoc_resp(struct mwifiex_adapter *adapter);</div><div class='ctx'> int mwifiex_handle_rx_packet(struct mwifiex_adapter *adapter,</div><div class='ctx'> 			     struct sk_buff *skb);</div><div class='ctx'> int mwifiex_process_tx(struct mwifiex_private *priv, struct sk_buff *skb,</div><div class='hunk'>@@ -1134,7 +1120,7 @@ int mwifiex_ret_enh_power_mode(struct mwifiex_private *priv,</div><div class='ctx'> 			       struct host_cmd_ds_command *resp,</div><div class='ctx'> 			       struct mwifiex_ds_pm_cfg *pm_cfg);</div><div class='ctx'> void mwifiex_process_hs_config(struct mwifiex_adapter *adapter);</div><div class='del'>-void mwifiex_hs_activated_event(struct mwifiex_private *priv,</div><div class='add'>+void mwifiex_hs_activated_event(struct mwifiex_adapter *adapter,</div><div class='ctx'> 					u8 activated);</div><div class='ctx'> int mwifiex_set_hs_params(struct mwifiex_private *priv, u16 action,</div><div class='ctx'> 			  int cmd_type, struct mwifiex_ds_hs_cfg *hs_cfg);</div><div class='hunk'>@@ -1161,16 +1147,17 @@ int mwifiex_process_uap_event(struct mwifiex_private *);</div><div class='ctx'> void mwifiex_delete_all_station_list(struct mwifiex_private *priv);</div><div class='ctx'> void mwifiex_wmm_del_peer_ra_list(struct mwifiex_private *priv,</div><div class='ctx'> 				  const u8 *ra_addr);</div><div class='del'>-void *mwifiex_process_sta_txpd(struct mwifiex_private *, struct sk_buff *skb);</div><div class='del'>-void *mwifiex_process_uap_txpd(struct mwifiex_private *, struct sk_buff *skb);</div><div class='del'>-int mwifiex_sta_init_cmd(struct mwifiex_private *, u8 first_sta, bool init);</div><div class='add'>+void mwifiex_process_sta_txpd(struct mwifiex_private *priv,</div><div class='add'>+			      struct sk_buff *skb);</div><div class='add'>+void mwifiex_process_uap_txpd(struct mwifiex_private *priv,</div><div class='add'>+			      struct sk_buff *skb);</div><div class='add'>+int mwifiex_sta_init_cmd(struct mwifiex_private *, u8 first_sta);</div><div class='ctx'> int mwifiex_cmd_802_11_scan(struct host_cmd_ds_command *cmd,</div><div class='ctx'> 			    struct mwifiex_scan_cmd_config *scan_cfg);</div><div class='ctx'> void mwifiex_queue_scan_cmd(struct mwifiex_private *priv,</div><div class='ctx'> 			    struct cmd_ctrl_node *cmd_node);</div><div class='ctx'> int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,</div><div class='ctx'> 			    struct host_cmd_ds_command *resp);</div><div class='del'>-s32 mwifiex_ssid_cmp(struct cfg80211_ssid *ssid1, struct cfg80211_ssid *ssid2);</div><div class='ctx'> int mwifiex_associate(struct mwifiex_private *priv,</div><div class='ctx'> 		      struct mwifiex_bssdescriptor *bss_desc);</div><div class='ctx'> int mwifiex_cmd_802_11_associate(struct mwifiex_private *priv,</div><div class='hunk'>@@ -1307,11 +1294,12 @@ mwifiex_get_priv_by_id(struct mwifiex_adapter *adapter,</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='del'>-		if (adapter-&gt;priv[i]) {</div><div class='del'>-			if ((adapter-&gt;priv[i]-&gt;bss_num == bss_num) &amp;&amp;</div><div class='del'>-			    (adapter-&gt;priv[i]-&gt;bss_type == bss_type))</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='add'>+		if (adapter-&gt;priv[i]-&gt;bss_mode == NL80211_IFTYPE_UNSPECIFIED)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if ((adapter-&gt;priv[i]-&gt;bss_num == bss_num) &amp;&amp;</div><div class='add'>+		    (adapter-&gt;priv[i]-&gt;bss_type == bss_type))</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ((i &lt; adapter-&gt;priv_num) ? adapter-&gt;priv[i] : NULL);</div><div class='ctx'> }</div><div class='hunk'>@@ -1327,11 +1315,9 @@ mwifiex_get_priv(struct mwifiex_adapter *adapter,</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='del'>-		if (adapter-&gt;priv[i]) {</div><div class='del'>-			if (bss_role == MWIFIEX_BSS_ROLE_ANY ||</div><div class='del'>-			    GET_BSS_ROLE(adapter-&gt;priv[i]) == bss_role)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='add'>+		if (bss_role == MWIFIEX_BSS_ROLE_ANY ||</div><div class='add'>+		    GET_BSS_ROLE(adapter-&gt;priv[i]) == bss_role)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ((i &lt; adapter-&gt;priv_num) ? adapter-&gt;priv[i] : NULL);</div><div class='hunk'>@@ -1349,12 +1335,10 @@ mwifiex_get_unused_bss_num(struct mwifiex_adapter *adapter, u8 bss_type)</div><div class='ctx'> </div><div class='ctx'> 	memset(index, 0, sizeof(index));</div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; i++)</div><div class='del'>-		if (adapter-&gt;priv[i]) {</div><div class='del'>-			if (adapter-&gt;priv[i]-&gt;bss_type == bss_type &amp;&amp;</div><div class='del'>-			    !(adapter-&gt;priv[i]-&gt;bss_mode ==</div><div class='del'>-			      NL80211_IFTYPE_UNSPECIFIED)) {</div><div class='del'>-				index[adapter-&gt;priv[i]-&gt;bss_num] = 1;</div><div class='del'>-			}</div><div class='add'>+		if (adapter-&gt;priv[i]-&gt;bss_type == bss_type &amp;&amp;</div><div class='add'>+		    !(adapter-&gt;priv[i]-&gt;bss_mode ==</div><div class='add'>+		      NL80211_IFTYPE_UNSPECIFIED)) {</div><div class='add'>+			index[adapter-&gt;priv[i]-&gt;bss_num] = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	for (j = 0; j &lt; MWIFIEX_MAX_BSS_NUM; j++)</div><div class='ctx'> 		if (!index[j])</div><div class='hunk'>@@ -1481,7 +1465,7 @@ int mwifiex_init_shutdown_fw(struct mwifiex_private *priv,</div><div class='ctx'> 			     u32 func_init_shutdown);</div><div class='ctx'> </div><div class='ctx'> int mwifiex_add_card(void *card, struct completion *fw_done,</div><div class='del'>-		     struct mwifiex_if_ops *if_ops, u8 iface_type,</div><div class='add'>+		     const struct mwifiex_if_ops *if_ops, u8 iface_type,</div><div class='ctx'> 		     struct device *dev);</div><div class='ctx'> int mwifiex_remove_card(struct mwifiex_adapter *adapter);</div><div class='ctx'> </div><div class='hunk'>@@ -1576,14 +1560,12 @@ int mwifiex_add_wowlan_magic_pkt_filter(struct mwifiex_adapter *adapter);</div><div class='ctx'> int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,</div><div class='ctx'> 			 struct cfg80211_beacon_data *data);</div><div class='ctx'> int mwifiex_del_mgmt_ies(struct mwifiex_private *priv);</div><div class='del'>-u8 *mwifiex_11d_code_2_region(u8 code);</div><div class='add'>+const u8 *mwifiex_11d_code_2_region(u8 code);</div><div class='ctx'> void mwifiex_uap_set_channel(struct mwifiex_private *priv,</div><div class='ctx'> 			     struct mwifiex_uap_bss_param *bss_cfg,</div><div class='ctx'> 			     struct cfg80211_chan_def chandef);</div><div class='ctx'> int mwifiex_config_start_uap(struct mwifiex_private *priv,</div><div class='ctx'> 			     struct mwifiex_uap_bss_param *bss_cfg);</div><div class='del'>-void mwifiex_uap_del_sta_data(struct mwifiex_private *priv,</div><div class='del'>-			      struct mwifiex_sta_node *node);</div><div class='ctx'> </div><div class='ctx'> void mwifiex_config_uap_11d(struct mwifiex_private *priv,</div><div class='ctx'> 			    struct cfg80211_beacon_data *beacon_data);</div><div class='hunk'>@@ -1598,6 +1580,8 @@ int mwifiex_11h_handle_event_chanswann(struct mwifiex_private *priv);</div><div class='ctx'> int mwifiex_dnld_dt_cfgdata(struct mwifiex_private *priv,</div><div class='ctx'> 			    struct device_node *node, const char *prefix);</div><div class='ctx'> void mwifiex_dnld_txpwr_table(struct mwifiex_private *priv);</div><div class='add'>+int mwifiex_send_rgpower_table(struct mwifiex_private *priv, const u8 *data,</div><div class='add'>+			       const size_t size);</div><div class='ctx'> </div><div class='ctx'> extern const struct ethtool_ops mwifiex_ethtool_ops;</div><div class='ctx'> </div><div class='hunk'>@@ -1611,7 +1595,6 @@ mwifiex_add_sta_entry(struct mwifiex_private *priv, const u8 *mac);</div><div class='ctx'> struct mwifiex_sta_node *</div><div class='ctx'> mwifiex_get_sta_entry(struct mwifiex_private *priv, const u8 *mac);</div><div class='ctx'> u8 mwifiex_is_tdls_chan_switching(struct mwifiex_private *priv);</div><div class='del'>-u8 mwifiex_is_tdls_off_chan(struct mwifiex_private *priv);</div><div class='ctx'> u8 mwifiex_is_send_cmd_allowed(struct mwifiex_private *priv);</div><div class='ctx'> int mwifiex_send_tdls_data_frame(struct mwifiex_private *priv, const u8 *peer,</div><div class='ctx'> 				 u8 action_code, u8 dialog_token,</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c<br/>index 94228b316df1..a760de191fce 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/pcie.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/pcie.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/pcie.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/pcie.c</a></div><div class='hunk'>@@ -1,22 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: PCIE specific handling</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "decl.h"</div><div class='hunk'>@@ -27,11 +16,12 @@</div><div class='ctx'> #include "wmm.h"</div><div class='ctx'> #include "11n.h"</div><div class='ctx'> #include "pcie.h"</div><div class='add'>+#include "pcie_quirks.h"</div><div class='ctx'> </div><div class='ctx'> #define PCIE_VERSION	"1.0"</div><div class='ctx'> #define DRV_NAME        "Marvell mwifiex PCIe"</div><div class='ctx'> </div><div class='del'>-static struct mwifiex_if_ops pcie_ops;</div><div class='add'>+static const struct mwifiex_if_ops pcie_ops;</div><div class='ctx'> </div><div class='ctx'> static const struct mwifiex_pcie_card_reg mwifiex_reg_8766 = {</div><div class='ctx'> 	.cmd_addr_lo = PCIE_SCRATCH_0_REG,</div><div class='hunk'>@@ -182,7 +172,7 @@ static const struct mwifiex_pcie_device mwifiex_pcie8997 = {</div><div class='ctx'> 	.can_ext_scan = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id mwifiex_pcie_of_match_table[] = {</div><div class='add'>+static const struct of_device_id mwifiex_pcie_of_match_table[] __maybe_unused = {</div><div class='ctx'> 	{ .compatible = "pci11ab,2b42" },</div><div class='ctx'> 	{ .compatible = "pci1b4b,2b42" },</div><div class='ctx'> 	{ }</div><div class='hunk'>@@ -199,6 +189,8 @@ static int mwifiex_pcie_probe_of(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mwifiex_pcie_work(struct work_struct *work);</div><div class='add'>+static int mwifiex_pcie_delete_rxbd_ring(struct mwifiex_adapter *adapter);</div><div class='add'>+static int mwifiex_pcie_delete_evtbd_ring(struct mwifiex_adapter *adapter);</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> mwifiex_map_pci_memory(struct mwifiex_adapter *adapter, struct sk_buff *skb,</div><div class='hunk'>@@ -230,12 +222,19 @@ static void mwifiex_unmap_pci_memory(struct mwifiex_adapter *adapter,</div><div class='ctx'> /*</div><div class='ctx'>  * This function writes data into PCIE card register.</div><div class='ctx'>  */</div><div class='del'>-static int mwifiex_write_reg(struct mwifiex_adapter *adapter, int reg, u32 data)</div><div class='add'>+static inline void</div><div class='add'>+mwifiex_write_reg(struct mwifiex_adapter *adapter, int reg, u32 data)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcie_service_card *card = adapter-&gt;card;</div><div class='ctx'> </div><div class='ctx'> 	iowrite32(data, card-&gt;pci_mmap1 + reg);</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+/* Non-void wrapper needed for read_poll_timeout(). */</div><div class='add'>+static inline int</div><div class='add'>+mwifiex_write_reg_rpt(struct mwifiex_adapter *adapter, int reg, u32 data)</div><div class='add'>+{</div><div class='add'>+	mwifiex_write_reg(adapter, reg, data);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -410,6 +409,9 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev,</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* check quirks */</div><div class='add'>+	mwifiex_initialize_quirks(card);</div><div class='add'>+</div><div class='ctx'> 	if (mwifiex_add_card(card, &amp;card-&gt;fw_done, &amp;pcie_ops,</div><div class='ctx'> 			     MWIFIEX_PCIE, &amp;pdev-&gt;dev)) {</div><div class='ctx'> 		pr_err("%s failed\n", __func__);</div><div class='hunk'>@@ -524,6 +526,13 @@ static void mwifiex_pcie_reset_prepare(struct pci_dev *pdev)</div><div class='ctx'> 	mwifiex_shutdown_sw(adapter);</div><div class='ctx'> 	clear_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &amp;card-&gt;work_flags);</div><div class='ctx'> 	clear_bit(MWIFIEX_IFACE_WORK_CARD_RESET, &amp;card-&gt;work_flags);</div><div class='add'>+</div><div class='add'>+	/* On MS Surface gen4+ devices FLR isn't effective to recover from</div><div class='add'>+	 * hangups, so we power-cycle the card instead.</div><div class='add'>+	 */</div><div class='add'>+	if (card-&gt;quirks &amp; QUIRK_FW_RST_D3COLD)</div><div class='add'>+		mwifiex_pcie_reset_d3cold_quirk(pdev);</div><div class='add'>+</div><div class='ctx'> 	mwifiex_dbg(adapter, INFO, "%s, successful\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	card-&gt;pci_reset_ongoing = true;</div><div class='hunk'>@@ -636,11 +645,15 @@ static void mwifiex_delay_for_sleep_cookie(struct mwifiex_adapter *adapter,</div><div class='ctx'> 			    "max count reached while accessing sleep cookie\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define N_WAKEUP_TRIES_SHORT_INTERVAL 15</div><div class='add'>+#define N_WAKEUP_TRIES_LONG_INTERVAL 35</div><div class='add'>+</div><div class='ctx'> /* This function wakes up the card by reading fw_status register. */</div><div class='ctx'> static int mwifiex_pm_wakeup_card(struct mwifiex_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcie_service_card *card = adapter-&gt;card;</div><div class='ctx'> 	const struct mwifiex_pcie_card_reg *reg = card-&gt;pcie.reg;</div><div class='add'>+	int retval __maybe_unused;</div><div class='ctx'> </div><div class='ctx'> 	mwifiex_dbg(adapter, EVENT,</div><div class='ctx'> 		    "event: Wakeup device...\n");</div><div class='hunk'>@@ -648,11 +661,24 @@ static int mwifiex_pm_wakeup_card(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	if (reg-&gt;sleep_cookie)</div><div class='ctx'> 		mwifiex_pcie_dev_wakeup_delay(adapter);</div><div class='ctx'> </div><div class='del'>-	/* Accessing fw_status register will wakeup device */</div><div class='del'>-	if (mwifiex_write_reg(adapter, reg-&gt;fw_status, FIRMWARE_READY_PCIE)) {</div><div class='del'>-		mwifiex_dbg(adapter, ERROR,</div><div class='del'>-			    "Writing fw_status register failed\n");</div><div class='del'>-		return -1;</div><div class='add'>+	/* The 88W8897 PCIe+USB firmware (latest version 15.68.19.p21) sometimes</div><div class='add'>+	 * appears to ignore or miss our wakeup request, so we continue trying</div><div class='add'>+	 * until we receive an interrupt from the card.</div><div class='add'>+	 */</div><div class='add'>+	if (read_poll_timeout(mwifiex_write_reg_rpt, retval,</div><div class='add'>+			      READ_ONCE(adapter-&gt;int_status) != 0,</div><div class='add'>+			      500, 500 * N_WAKEUP_TRIES_SHORT_INTERVAL,</div><div class='add'>+			      false,</div><div class='add'>+			      adapter, reg-&gt;fw_status, FIRMWARE_READY_PCIE)) {</div><div class='add'>+		if (read_poll_timeout(mwifiex_write_reg_rpt, retval,</div><div class='add'>+				      READ_ONCE(adapter-&gt;int_status) != 0,</div><div class='add'>+				      10000, 10000 * N_WAKEUP_TRIES_LONG_INTERVAL,</div><div class='add'>+				      false,</div><div class='add'>+				      adapter, reg-&gt;fw_status, FIRMWARE_READY_PCIE)) {</div><div class='add'>+			mwifiex_dbg(adapter, ERROR,</div><div class='add'>+				    "Firmware didn't wake up\n");</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (reg-&gt;sleep_cookie) {</div><div class='hunk'>@@ -684,24 +710,12 @@ static int mwifiex_pm_wakeup_card_complete(struct mwifiex_adapter *adapter)</div><div class='ctx'>  * The host interrupt mask is read, the disable bit is reset and</div><div class='ctx'>  * written back to the card host interrupt mask register.</div><div class='ctx'>  */</div><div class='del'>-static int mwifiex_pcie_disable_host_int(struct mwifiex_adapter *adapter)</div><div class='add'>+static void mwifiex_pcie_disable_host_int(struct mwifiex_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	if (mwifiex_pcie_ok_to_access_hw(adapter)) {</div><div class='del'>-		if (mwifiex_write_reg(adapter, PCIE_HOST_INT_MASK,</div><div class='del'>-				      0x00000000)) {</div><div class='del'>-			mwifiex_dbg(adapter, ERROR,</div><div class='del'>-				    "Disable host interrupt failed\n");</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (mwifiex_pcie_ok_to_access_hw(adapter))</div><div class='add'>+		mwifiex_write_reg(adapter, PCIE_HOST_INT_MASK, 0x00000000);</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;adapter-&gt;tx_hw_pending, 0);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mwifiex_pcie_disable_host_int_noerr(struct mwifiex_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	WARN_ON(mwifiex_pcie_disable_host_int(adapter));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -712,15 +726,9 @@ static void mwifiex_pcie_disable_host_int_noerr(struct mwifiex_adapter *adapter)</div><div class='ctx'>  */</div><div class='ctx'> static int mwifiex_pcie_enable_host_int(struct mwifiex_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	if (mwifiex_pcie_ok_to_access_hw(adapter)) {</div><div class='add'>+	if (mwifiex_pcie_ok_to_access_hw(adapter))</div><div class='ctx'> 		/* Simply write the mask to the register */</div><div class='del'>-		if (mwifiex_write_reg(adapter, PCIE_HOST_INT_MASK,</div><div class='del'>-				      HOST_INTR_MASK)) {</div><div class='del'>-			mwifiex_dbg(adapter, ERROR,</div><div class='del'>-				    "Enable host interrupt failed\n");</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+		mwifiex_write_reg(adapter, PCIE_HOST_INT_MASK, HOST_INTR_MASK);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -775,14 +783,15 @@ static int mwifiex_init_rxq_ring(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		if (!skb) {</div><div class='ctx'> 			mwifiex_dbg(adapter, ERROR,</div><div class='ctx'> 				    "Unable to allocate skb for RX ring.\n");</div><div class='del'>-			kfree(card-&gt;rxbd_ring_vbase);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (mwifiex_map_pci_memory(adapter, skb,</div><div class='ctx'> 					   MWIFIEX_RX_DATA_BUF_SIZE,</div><div class='del'>-					   DMA_FROM_DEVICE))</div><div class='del'>-			return -1;</div><div class='add'>+					   DMA_FROM_DEVICE)) {</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		buf_pa = MWIFIEX_SKB_DMA_ADDR(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -832,7 +841,6 @@ static int mwifiex_pcie_init_evt_ring(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		if (!skb) {</div><div class='ctx'> 			mwifiex_dbg(adapter, ERROR,</div><div class='ctx'> 				    "Unable to allocate skb for EVENT buf.\n");</div><div class='del'>-			kfree(card-&gt;evtbd_ring_vbase);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 		skb_put(skb, MAX_EVENT_SIZE);</div><div class='hunk'>@@ -840,8 +848,7 @@ static int mwifiex_pcie_init_evt_ring(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		if (mwifiex_map_pci_memory(adapter, skb, MAX_EVENT_SIZE,</div><div class='ctx'> 					   DMA_FROM_DEVICE)) {</div><div class='ctx'> 			kfree_skb(skb);</div><div class='del'>-			kfree(card-&gt;evtbd_ring_vbase);</div><div class='del'>-			return -1;</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		buf_pa = MWIFIEX_SKB_DMA_ADDR(skb);</div><div class='hunk'>@@ -1041,6 +1048,7 @@ static int mwifiex_pcie_delete_txbd_ring(struct mwifiex_adapter *adapter)</div><div class='ctx'>  */</div><div class='ctx'> static int mwifiex_pcie_create_rxbd_ring(struct mwifiex_adapter *adapter)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='ctx'> 	struct pcie_service_card *card = adapter-&gt;card;</div><div class='ctx'> 	const struct mwifiex_pcie_card_reg *reg = card-&gt;pcie.reg;</div><div class='ctx'> </div><div class='hunk'>@@ -1079,7 +1087,10 @@ static int mwifiex_pcie_create_rxbd_ring(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		    (u32)((u64)card-&gt;rxbd_ring_pbase &gt;&gt; 32),</div><div class='ctx'> 		    card-&gt;rxbd_ring_size);</div><div class='ctx'> </div><div class='del'>-	return mwifiex_init_rxq_ring(adapter);</div><div class='add'>+	ret = mwifiex_init_rxq_ring(adapter);</div><div class='add'>+	if (ret)</div><div class='add'>+		mwifiex_pcie_delete_rxbd_ring(adapter);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1110,6 +1121,7 @@ static int mwifiex_pcie_delete_rxbd_ring(struct mwifiex_adapter *adapter)</div><div class='ctx'>  */</div><div class='ctx'> static int mwifiex_pcie_create_evtbd_ring(struct mwifiex_adapter *adapter)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='ctx'> 	struct pcie_service_card *card = adapter-&gt;card;</div><div class='ctx'> 	const struct mwifiex_pcie_card_reg *reg = card-&gt;pcie.reg;</div><div class='ctx'> </div><div class='hunk'>@@ -1144,7 +1156,10 @@ static int mwifiex_pcie_create_evtbd_ring(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		    (u32)((u64)card-&gt;evtbd_ring_pbase &gt;&gt; 32),</div><div class='ctx'> 		    card-&gt;evtbd_ring_size);</div><div class='ctx'> </div><div class='del'>-	return mwifiex_pcie_init_evt_ring(adapter);</div><div class='add'>+	ret = mwifiex_pcie_init_evt_ring(adapter);</div><div class='add'>+	if (ret)</div><div class='add'>+		mwifiex_pcie_delete_evtbd_ring(adapter);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1231,7 +1246,7 @@ static int mwifiex_pcie_delete_cmdrsp_buf(struct mwifiex_adapter *adapter)</div><div class='ctx'> static int mwifiex_pcie_alloc_sleep_cookie_buf(struct mwifiex_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcie_service_card *card = adapter-&gt;card;</div><div class='del'>-	u32 tmp;</div><div class='add'>+	u32 *cookie;</div><div class='ctx'> </div><div class='ctx'> 	card-&gt;sleep_cookie_vbase = dma_alloc_coherent(&amp;card-&gt;dev-&gt;dev,</div><div class='ctx'> 						      sizeof(u32),</div><div class='hunk'>@@ -1242,13 +1257,11 @@ static int mwifiex_pcie_alloc_sleep_cookie_buf(struct mwifiex_adapter *adapter)</div><div class='ctx'> 			    "dma_alloc_coherent failed!\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='add'>+	cookie = (u32 *)card-&gt;sleep_cookie_vbase;</div><div class='ctx'> 	/* Init val of Sleep Cookie */</div><div class='del'>-	tmp = FW_AWAKE_COOKIE;</div><div class='del'>-	put_unaligned(tmp, card-&gt;sleep_cookie_vbase);</div><div class='add'>+	*cookie = FW_AWAKE_COOKIE;</div><div class='ctx'> </div><div class='del'>-	mwifiex_dbg(adapter, INFO,</div><div class='del'>-		    "alloc_scook: sleep cookie=0x%x\n",</div><div class='del'>-		    get_unaligned(card-&gt;sleep_cookie_vbase));</div><div class='add'>+	mwifiex_dbg(adapter, INFO, "alloc_scook: sleep cookie=0x%x\n", *cookie);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1279,7 +1292,7 @@ static int mwifiex_pcie_delete_sleep_cookie_buf(struct mwifiex_adapter *adapter)</div><div class='ctx'>  * This function defined as handler is also called while cleaning TXRX</div><div class='ctx'>  * during disconnect/ bss stop.</div><div class='ctx'>  */</div><div class='del'>-static int mwifiex_clean_pcie_ring_buf(struct mwifiex_adapter *adapter)</div><div class='add'>+static void mwifiex_clean_pcie_ring_buf(struct mwifiex_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcie_service_card *card = adapter-&gt;card;</div><div class='ctx'> </div><div class='hunk'>@@ -1288,14 +1301,9 @@ static int mwifiex_clean_pcie_ring_buf(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		/* write pointer already set at last send</div><div class='ctx'> 		 * send dnld-rdy intr again, wait for completion.</div><div class='ctx'> 		 */</div><div class='del'>-		if (mwifiex_write_reg(adapter, PCIE_CPU_INT_EVENT,</div><div class='del'>-				      CPU_INTR_DNLD_RDY)) {</div><div class='del'>-			mwifiex_dbg(adapter, ERROR,</div><div class='del'>-				    "failed to assert dnld-rdy interrupt.\n");</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='add'>+		mwifiex_write_reg(adapter, PCIE_CPU_INT_EVENT,</div><div class='add'>+				  CPU_INTR_DNLD_RDY);</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1405,7 +1413,6 @@ mwifiex_pcie_send_data(struct mwifiex_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> 	struct pcie_service_card *card = adapter-&gt;card;</div><div class='ctx'> 	const struct mwifiex_pcie_card_reg *reg = card-&gt;pcie.reg;</div><div class='ctx'> 	u32 wrindx, num_tx_buffs, rx_val;</div><div class='del'>-	int ret;</div><div class='ctx'> 	dma_addr_t buf_pa;</div><div class='ctx'> 	struct mwifiex_pcie_buf_desc *desc = NULL;</div><div class='ctx'> 	struct mwifiex_pfu_buf_desc *desc2 = NULL;</div><div class='hunk'>@@ -1474,13 +1481,16 @@ mwifiex_pcie_send_data(struct mwifiex_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 		rx_val = card-&gt;rxbd_rdptr &amp; reg-&gt;rx_wrap_mask;</div><div class='ctx'> 		/* Write the TX ring write pointer in to reg-&gt;tx_wrptr */</div><div class='del'>-		if (mwifiex_write_reg(adapter, reg-&gt;tx_wrptr,</div><div class='del'>-				      card-&gt;txbd_wrptr | rx_val)) {</div><div class='del'>-			mwifiex_dbg(adapter, ERROR,</div><div class='del'>-				    "SEND DATA: failed to write reg-&gt;tx_wrptr\n");</div><div class='del'>-			ret = -1;</div><div class='del'>-			goto done_unmap;</div><div class='del'>-		}</div><div class='add'>+		mwifiex_write_reg(adapter, reg-&gt;tx_wrptr,</div><div class='add'>+				  card-&gt;txbd_wrptr | rx_val);</div><div class='add'>+</div><div class='add'>+		/* The firmware (latest version 15.68.19.p21) of the 88W8897 PCIe+USB card</div><div class='add'>+		 * seems to crash randomly after setting the TX ring write pointer when</div><div class='add'>+		 * ASPM powersaving is enabled. A workaround seems to be keeping the bus</div><div class='add'>+		 * busy by reading a random register afterwards.</div><div class='add'>+		 */</div><div class='add'>+		mwifiex_read_reg(adapter, PCI_VENDOR_ID, &amp;rx_val);</div><div class='add'>+</div><div class='ctx'> 		if ((mwifiex_pcie_txbd_not_full(card)) &amp;&amp;</div><div class='ctx'> 		    tx_param-&gt;next_pkt_len) {</div><div class='ctx'> 			/* have more packets and TxBD still can hold more */</div><div class='hunk'>@@ -1489,13 +1499,8 @@ mwifiex_pcie_send_data(struct mwifiex_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> 			adapter-&gt;data_sent = false;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Send the TX ready interrupt */</div><div class='del'>-			if (mwifiex_write_reg(adapter, PCIE_CPU_INT_EVENT,</div><div class='del'>-					      CPU_INTR_DNLD_RDY)) {</div><div class='del'>-				mwifiex_dbg(adapter, ERROR,</div><div class='del'>-					    "SEND DATA: failed to assert dnld-rdy interrupt.\n");</div><div class='del'>-				ret = -1;</div><div class='del'>-				goto done_unmap;</div><div class='del'>-			}</div><div class='add'>+			mwifiex_write_reg(adapter, PCIE_CPU_INT_EVENT,</div><div class='add'>+					  CPU_INTR_DNLD_RDY);</div><div class='ctx'> 		}</div><div class='ctx'> 		mwifiex_dbg(adapter, DATA,</div><div class='ctx'> 			    "info: SEND DATA: Updated &lt;Rd: %#x, Wr:\t"</div><div class='hunk'>@@ -1506,24 +1511,12 @@ mwifiex_pcie_send_data(struct mwifiex_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> 			    "info: TX Ring full, can't send packets to fw\n");</div><div class='ctx'> 		adapter-&gt;data_sent = true;</div><div class='ctx'> 		/* Send the TX ready interrupt */</div><div class='del'>-		if (mwifiex_write_reg(adapter, PCIE_CPU_INT_EVENT,</div><div class='del'>-				      CPU_INTR_DNLD_RDY))</div><div class='del'>-			mwifiex_dbg(adapter, ERROR,</div><div class='del'>-				    "SEND DATA: failed to assert door-bell intr\n");</div><div class='add'>+		mwifiex_write_reg(adapter, PCIE_CPU_INT_EVENT,</div><div class='add'>+				  CPU_INTR_DNLD_RDY);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return -EINPROGRESS;</div><div class='del'>-done_unmap:</div><div class='del'>-	mwifiex_unmap_pci_memory(adapter, skb, DMA_TO_DEVICE);</div><div class='del'>-	card-&gt;tx_buf_list[wrindx] = NULL;</div><div class='del'>-	atomic_dec(&amp;adapter-&gt;tx_hw_pending);</div><div class='del'>-	if (reg-&gt;pfu_enabled)</div><div class='del'>-		memset(desc2, 0, sizeof(*desc2));</div><div class='del'>-	else</div><div class='del'>-		memset(desc, 0, sizeof(*desc));</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1643,13 +1636,8 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 		tx_val = card-&gt;txbd_wrptr &amp; reg-&gt;tx_wrap_mask;</div><div class='ctx'> 		/* Write the RX ring read pointer in to reg-&gt;rx_rdptr */</div><div class='del'>-		if (mwifiex_write_reg(adapter, reg-&gt;rx_rdptr,</div><div class='del'>-				      card-&gt;rxbd_rdptr | tx_val)) {</div><div class='del'>-			mwifiex_dbg(adapter, DATA,</div><div class='del'>-				    "RECV DATA: failed to write reg-&gt;rx_rdptr\n");</div><div class='del'>-			ret = -1;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='add'>+		mwifiex_write_reg(adapter, reg-&gt;rx_rdptr,</div><div class='add'>+				  card-&gt;rxbd_rdptr | tx_val);</div><div class='ctx'> </div><div class='ctx'> 		/* Read the RX ring Write pointer set by firmware */</div><div class='ctx'> 		if (mwifiex_read_reg(adapter, reg-&gt;rx_wrptr, &amp;wrptr)) {</div><div class='hunk'>@@ -1692,43 +1680,18 @@ mwifiex_pcie_send_boot_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)</div><div class='ctx'> 	/* Write the lower 32bits of the physical address to low command</div><div class='ctx'> 	 * address scratch register</div><div class='ctx'> 	 */</div><div class='del'>-	if (mwifiex_write_reg(adapter, reg-&gt;cmd_addr_lo, (u32)buf_pa)) {</div><div class='del'>-		mwifiex_dbg(adapter, ERROR,</div><div class='del'>-			    "%s: failed to write download command to boot code.\n",</div><div class='del'>-			    __func__);</div><div class='del'>-		mwifiex_unmap_pci_memory(adapter, skb, DMA_TO_DEVICE);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='add'>+	mwifiex_write_reg(adapter, reg-&gt;cmd_addr_lo, (u32)buf_pa);</div><div class='ctx'> </div><div class='ctx'> 	/* Write the upper 32bits of the physical address to high command</div><div class='ctx'> 	 * address scratch register</div><div class='ctx'> 	 */</div><div class='del'>-	if (mwifiex_write_reg(adapter, reg-&gt;cmd_addr_hi,</div><div class='del'>-			      (u32)((u64)buf_pa &gt;&gt; 32))) {</div><div class='del'>-		mwifiex_dbg(adapter, ERROR,</div><div class='del'>-			    "%s: failed to write download command to boot code.\n",</div><div class='del'>-			    __func__);</div><div class='del'>-		mwifiex_unmap_pci_memory(adapter, skb, DMA_TO_DEVICE);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='add'>+	mwifiex_write_reg(adapter, reg-&gt;cmd_addr_hi, (u32)((u64)buf_pa &gt;&gt; 32));</div><div class='ctx'> </div><div class='ctx'> 	/* Write the command length to cmd_size scratch register */</div><div class='del'>-	if (mwifiex_write_reg(adapter, reg-&gt;cmd_size, skb-&gt;len)) {</div><div class='del'>-		mwifiex_dbg(adapter, ERROR,</div><div class='del'>-			    "%s: failed to write command len to cmd_size scratch reg\n",</div><div class='del'>-			    __func__);</div><div class='del'>-		mwifiex_unmap_pci_memory(adapter, skb, DMA_TO_DEVICE);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='add'>+	mwifiex_write_reg(adapter, reg-&gt;cmd_size, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	/* Ring the door bell */</div><div class='del'>-	if (mwifiex_write_reg(adapter, PCIE_CPU_INT_EVENT,</div><div class='del'>-			      CPU_INTR_DOOR_BELL)) {</div><div class='del'>-		mwifiex_dbg(adapter, ERROR,</div><div class='del'>-			    "%s: failed to assert door-bell intr\n", __func__);</div><div class='del'>-		mwifiex_unmap_pci_memory(adapter, skb, DMA_TO_DEVICE);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='add'>+	mwifiex_write_reg(adapter, PCIE_CPU_INT_EVENT, CPU_INTR_DOOR_BELL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1736,20 +1699,14 @@ mwifiex_pcie_send_boot_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)</div><div class='ctx'> /* This function init rx port in firmware which in turn enables to receive data</div><div class='ctx'>  * from device before transmitting any packet.</div><div class='ctx'>  */</div><div class='del'>-static int mwifiex_pcie_init_fw_port(struct mwifiex_adapter *adapter)</div><div class='add'>+static void mwifiex_pcie_init_fw_port(struct mwifiex_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcie_service_card *card = adapter-&gt;card;</div><div class='ctx'> 	const struct mwifiex_pcie_card_reg *reg = card-&gt;pcie.reg;</div><div class='ctx'> 	int tx_wrap = card-&gt;txbd_wrptr &amp; reg-&gt;tx_wrap_mask;</div><div class='ctx'> </div><div class='ctx'> 	/* Write the RX ring read pointer in to reg-&gt;rx_rdptr */</div><div class='del'>-	if (mwifiex_write_reg(adapter, reg-&gt;rx_rdptr, card-&gt;rxbd_rdptr |</div><div class='del'>-			      tx_wrap)) {</div><div class='del'>-		mwifiex_dbg(adapter, ERROR,</div><div class='del'>-			    "RECV DATA: failed to write reg-&gt;rx_rdptr\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	mwifiex_write_reg(adapter, reg-&gt;rx_rdptr, card-&gt;rxbd_rdptr | tx_wrap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This function downloads commands to the device</div><div class='hunk'>@@ -1759,7 +1716,6 @@ mwifiex_pcie_send_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcie_service_card *card = adapter-&gt;card;</div><div class='ctx'> 	const struct mwifiex_pcie_card_reg *reg = card-&gt;pcie.reg;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> 	dma_addr_t cmd_buf_pa, cmdrsp_buf_pa;</div><div class='ctx'> 	u8 *payload = (u8 *)skb-&gt;data;</div><div class='ctx'> </div><div class='hunk'>@@ -1809,63 +1765,29 @@ mwifiex_pcie_send_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)</div><div class='ctx'> 		cmdrsp_buf_pa = MWIFIEX_SKB_DMA_ADDR(card-&gt;cmdrsp_buf);</div><div class='ctx'> 		/* Write the lower 32bits of the cmdrsp buffer physical</div><div class='ctx'> 		   address */</div><div class='del'>-		if (mwifiex_write_reg(adapter, reg-&gt;cmdrsp_addr_lo,</div><div class='del'>-				      (u32)cmdrsp_buf_pa)) {</div><div class='del'>-			mwifiex_dbg(adapter, ERROR,</div><div class='del'>-				    "Failed to write download cmd to boot code.\n");</div><div class='del'>-			ret = -1;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='add'>+		mwifiex_write_reg(adapter, reg-&gt;cmdrsp_addr_lo,</div><div class='add'>+				  (u32)cmdrsp_buf_pa);</div><div class='add'>+</div><div class='ctx'> 		/* Write the upper 32bits of the cmdrsp buffer physical</div><div class='ctx'> 		   address */</div><div class='del'>-		if (mwifiex_write_reg(adapter, reg-&gt;cmdrsp_addr_hi,</div><div class='del'>-				      (u32)((u64)cmdrsp_buf_pa &gt;&gt; 32))) {</div><div class='del'>-			mwifiex_dbg(adapter, ERROR,</div><div class='del'>-				    "Failed to write download cmd to boot code.\n");</div><div class='del'>-			ret = -1;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='add'>+		mwifiex_write_reg(adapter, reg-&gt;cmdrsp_addr_hi,</div><div class='add'>+				  (u32)((u64)cmdrsp_buf_pa &gt;&gt; 32));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cmd_buf_pa = MWIFIEX_SKB_DMA_ADDR(card-&gt;cmd_buf);</div><div class='add'>+</div><div class='ctx'> 	/* Write the lower 32bits of the physical address to reg-&gt;cmd_addr_lo */</div><div class='del'>-	if (mwifiex_write_reg(adapter, reg-&gt;cmd_addr_lo,</div><div class='del'>-			      (u32)cmd_buf_pa)) {</div><div class='del'>-		mwifiex_dbg(adapter, ERROR,</div><div class='del'>-			    "Failed to write download cmd to boot code.\n");</div><div class='del'>-		ret = -1;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='add'>+	mwifiex_write_reg(adapter, reg-&gt;cmd_addr_lo, (u32)cmd_buf_pa);</div><div class='add'>+</div><div class='ctx'> 	/* Write the upper 32bits of the physical address to reg-&gt;cmd_addr_hi */</div><div class='del'>-	if (mwifiex_write_reg(adapter, reg-&gt;cmd_addr_hi,</div><div class='del'>-			      (u32)((u64)cmd_buf_pa &gt;&gt; 32))) {</div><div class='del'>-		mwifiex_dbg(adapter, ERROR,</div><div class='del'>-			    "Failed to write download cmd to boot code.\n");</div><div class='del'>-		ret = -1;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='add'>+	mwifiex_write_reg(adapter, reg-&gt;cmd_addr_hi,</div><div class='add'>+			  (u32)((u64)cmd_buf_pa &gt;&gt; 32));</div><div class='ctx'> </div><div class='ctx'> 	/* Write the command length to reg-&gt;cmd_size */</div><div class='del'>-	if (mwifiex_write_reg(adapter, reg-&gt;cmd_size,</div><div class='del'>-			      card-&gt;cmd_buf-&gt;len)) {</div><div class='del'>-		mwifiex_dbg(adapter, ERROR,</div><div class='del'>-			    "Failed to write cmd len to reg-&gt;cmd_size\n");</div><div class='del'>-		ret = -1;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='add'>+	mwifiex_write_reg(adapter, reg-&gt;cmd_size, card-&gt;cmd_buf-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	/* Ring the door bell */</div><div class='del'>-	if (mwifiex_write_reg(adapter, PCIE_CPU_INT_EVENT,</div><div class='del'>-			      CPU_INTR_DOOR_BELL)) {</div><div class='del'>-		mwifiex_dbg(adapter, ERROR,</div><div class='del'>-			    "Failed to assert door-bell intr\n");</div><div class='del'>-		ret = -1;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	if (ret)</div><div class='del'>-		adapter-&gt;cmd_sent = false;</div><div class='add'>+	mwifiex_write_reg(adapter, PCIE_CPU_INT_EVENT, CPU_INTR_DOOR_BELL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1909,13 +1831,9 @@ static int mwifiex_pcie_process_cmd_complete(struct mwifiex_adapter *adapter)</div><div class='ctx'> 						   MWIFIEX_SKB_DMA_ADDR(skb),</div><div class='ctx'> 						   MWIFIEX_SLEEP_COOKIE_SIZE,</div><div class='ctx'> 						   DMA_FROM_DEVICE);</div><div class='del'>-			if (mwifiex_write_reg(adapter,</div><div class='del'>-					      PCIE_CPU_INT_EVENT,</div><div class='del'>-					      CPU_INTR_SLEEP_CFM_DONE)) {</div><div class='del'>-				mwifiex_dbg(adapter, ERROR,</div><div class='del'>-					    "Write register failed\n");</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='add'>+			mwifiex_write_reg(adapter,</div><div class='add'>+					  PCIE_CPU_INT_EVENT,</div><div class='add'>+					  CPU_INTR_SLEEP_CFM_DONE);</div><div class='ctx'> 			mwifiex_delay_for_sleep_cookie(adapter,</div><div class='ctx'> 						       MWIFIEX_MAX_DELAY_COUNT);</div><div class='ctx'> 			mwifiex_unmap_pci_memory(adapter, skb,</div><div class='hunk'>@@ -1948,18 +1866,11 @@ static int mwifiex_pcie_process_cmd_complete(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		/* Clear the cmd-rsp buffer address in scratch registers. This</div><div class='ctx'> 		   will prevent firmware from writing to the same response</div><div class='ctx'> 		   buffer again. */</div><div class='del'>-		if (mwifiex_write_reg(adapter, reg-&gt;cmdrsp_addr_lo, 0)) {</div><div class='del'>-			mwifiex_dbg(adapter, ERROR,</div><div class='del'>-				    "cmd_done: failed to clear cmd_rsp_addr_lo\n");</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='add'>+		mwifiex_write_reg(adapter, reg-&gt;cmdrsp_addr_lo, 0);</div><div class='add'>+</div><div class='ctx'> 		/* Write the upper 32bits of the cmdrsp buffer physical</div><div class='ctx'> 		   address */</div><div class='del'>-		if (mwifiex_write_reg(adapter, reg-&gt;cmdrsp_addr_hi, 0)) {</div><div class='del'>-			mwifiex_dbg(adapter, ERROR,</div><div class='del'>-				    "cmd_done: failed to clear cmd_rsp_addr_hi\n");</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='add'>+		mwifiex_write_reg(adapter, reg-&gt;cmdrsp_addr_hi, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2066,12 +1977,8 @@ static int mwifiex_pcie_process_event_ready(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		   we need to find a better method of managing these buffers.</div><div class='ctx'> 		*/</div><div class='ctx'> 	} else {</div><div class='del'>-		if (mwifiex_write_reg(adapter, PCIE_CPU_INT_EVENT,</div><div class='del'>-				      CPU_INTR_EVENT_DONE)) {</div><div class='del'>-			mwifiex_dbg(adapter, ERROR,</div><div class='del'>-				    "Write register failed\n");</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='add'>+		mwifiex_write_reg(adapter, PCIE_CPU_INT_EVENT,</div><div class='add'>+				  CPU_INTR_EVENT_DONE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2085,7 +1992,6 @@ static int mwifiex_pcie_event_complete(struct mwifiex_adapter *adapter,</div><div class='ctx'> {</div><div class='ctx'> 	struct pcie_service_card *card = adapter-&gt;card;</div><div class='ctx'> 	const struct mwifiex_pcie_card_reg *reg = card-&gt;pcie.reg;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> 	u32 rdptr = card-&gt;evtbd_rdptr &amp; MWIFIEX_EVTBD_MASK;</div><div class='ctx'> 	u32 wrptr;</div><div class='ctx'> 	struct mwifiex_evt_buf_desc *desc;</div><div class='hunk'>@@ -2137,18 +2043,11 @@ static int mwifiex_pcie_event_complete(struct mwifiex_adapter *adapter,</div><div class='ctx'> 		    card-&gt;evtbd_rdptr, wrptr);</div><div class='ctx'> </div><div class='ctx'> 	/* Write the event ring read pointer in to reg-&gt;evt_rdptr */</div><div class='del'>-	if (mwifiex_write_reg(adapter, reg-&gt;evt_rdptr,</div><div class='del'>-			      card-&gt;evtbd_rdptr)) {</div><div class='del'>-		mwifiex_dbg(adapter, ERROR,</div><div class='del'>-			    "event_complete: failed to read reg-&gt;evt_rdptr\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='add'>+	mwifiex_write_reg(adapter, reg-&gt;evt_rdptr, card-&gt;evtbd_rdptr);</div><div class='ctx'> </div><div class='ctx'> 	mwifiex_dbg(adapter, EVENT,</div><div class='ctx'> 		    "info: Check Events Again\n");</div><div class='del'>-	ret = mwifiex_pcie_process_event_ready(adapter);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return mwifiex_pcie_process_event_ready(adapter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Combo firmware image is a combination of</div><div class='hunk'>@@ -2281,11 +2180,7 @@ static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter,</div><div class='ctx'> 		    "info: Downloading FW image (%d bytes)\n",</div><div class='ctx'> 		    firmware_len);</div><div class='ctx'> </div><div class='del'>-	if (mwifiex_pcie_disable_host_int(adapter)) {</div><div class='del'>-		mwifiex_dbg(adapter, ERROR,</div><div class='del'>-			    "%s: Disabling interrupts failed.\n", __func__);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='add'>+	mwifiex_pcie_disable_host_int(adapter);</div><div class='ctx'> </div><div class='ctx'> 	skb = dev_alloc_skb(MWIFIEX_UPLD_SIZE);</div><div class='ctx'> 	if (!skb) {</div><div class='hunk'>@@ -2439,21 +2334,12 @@ mwifiex_check_fw_status(struct mwifiex_adapter *adapter, u32 poll_num)</div><div class='ctx'> 	u32 tries;</div><div class='ctx'> </div><div class='ctx'> 	/* Mask spurios interrupts */</div><div class='del'>-	if (mwifiex_write_reg(adapter, PCIE_HOST_INT_STATUS_MASK,</div><div class='del'>-			      HOST_INTR_MASK)) {</div><div class='del'>-		mwifiex_dbg(adapter, ERROR,</div><div class='del'>-			    "Write register failed\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='add'>+	mwifiex_write_reg(adapter, PCIE_HOST_INT_STATUS_MASK, HOST_INTR_MASK);</div><div class='ctx'> </div><div class='ctx'> 	mwifiex_dbg(adapter, INFO,</div><div class='ctx'> 		    "Setting driver ready signature\n");</div><div class='del'>-	if (mwifiex_write_reg(adapter, reg-&gt;drv_rdy,</div><div class='del'>-			      FIRMWARE_READY_PCIE)) {</div><div class='del'>-		mwifiex_dbg(adapter, ERROR,</div><div class='del'>-			    "Failed to write driver ready signature\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	mwifiex_write_reg(adapter, reg-&gt;drv_rdy, FIRMWARE_READY_PCIE);</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for firmware initialization event */</div><div class='ctx'> 	for (tries = 0; tries &lt; poll_num; tries++) {</div><div class='hunk'>@@ -2539,12 +2425,7 @@ static void mwifiex_interrupt_status(struct mwifiex_adapter *adapter,</div><div class='ctx'> 		mwifiex_pcie_disable_host_int(adapter);</div><div class='ctx'> </div><div class='ctx'> 		/* Clear the pending interrupts */</div><div class='del'>-		if (mwifiex_write_reg(adapter, PCIE_HOST_INT_STATUS,</div><div class='del'>-				      ~pcie_ireg)) {</div><div class='del'>-			mwifiex_dbg(adapter, ERROR,</div><div class='del'>-				    "Write register failed\n");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='add'>+		mwifiex_write_reg(adapter, PCIE_HOST_INT_STATUS, ~pcie_ireg);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!adapter-&gt;pps_uapsd_mode &amp;&amp;</div><div class='hunk'>@@ -2556,7 +2437,7 @@ static void mwifiex_interrupt_status(struct mwifiex_adapter *adapter,</div><div class='ctx'> 		 */</div><div class='ctx'> 		adapter-&gt;ps_state = PS_STATE_AWAKE;</div><div class='ctx'> 		adapter-&gt;pm_wakeup_fw_try = false;</div><div class='del'>-		del_timer(&amp;adapter-&gt;wakeup_timer);</div><div class='add'>+		timer_delete(&amp;adapter-&gt;wakeup_timer);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;adapter-&gt;int_lock, flags);</div><div class='hunk'>@@ -2639,18 +2520,14 @@ static int mwifiex_process_int_status(struct mwifiex_adapter *adapter)</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if ((pcie_ireg != 0xFFFFFFFF) &amp;&amp; (pcie_ireg)) {</div><div class='del'>-				if (mwifiex_write_reg(adapter,</div><div class='del'>-						      PCIE_HOST_INT_STATUS,</div><div class='del'>-						      ~pcie_ireg)) {</div><div class='del'>-					mwifiex_dbg(adapter, ERROR,</div><div class='del'>-						    "Write register failed\n");</div><div class='del'>-					return -1;</div><div class='del'>-				}</div><div class='add'>+				mwifiex_write_reg(adapter,</div><div class='add'>+						  PCIE_HOST_INT_STATUS,</div><div class='add'>+						  ~pcie_ireg);</div><div class='ctx'> 				if (!adapter-&gt;pps_uapsd_mode &amp;&amp;</div><div class='ctx'> 				    adapter-&gt;ps_state == PS_STATE_SLEEP) {</div><div class='ctx'> 					adapter-&gt;ps_state = PS_STATE_AWAKE;</div><div class='ctx'> 					adapter-&gt;pm_wakeup_fw_try = false;</div><div class='del'>-					del_timer(&amp;adapter-&gt;wakeup_timer);</div><div class='add'>+					timer_delete(&amp;adapter-&gt;wakeup_timer);</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2769,7 +2646,7 @@ mwifiex_pcie_reg_dump(struct mwifiex_adapter *adapter, char *drv_buf)</div><div class='ctx'> static enum rdwr_status</div><div class='ctx'> mwifiex_pcie_rdwr_firmware(struct mwifiex_adapter *adapter, u8 doneflag)</div><div class='ctx'> {</div><div class='del'>-	int ret, tries;</div><div class='add'>+	int tries;</div><div class='ctx'> 	u8 ctrl_data;</div><div class='ctx'> 	u32 fw_status;</div><div class='ctx'> 	struct pcie_service_card *card = adapter-&gt;card;</div><div class='hunk'>@@ -2778,13 +2655,7 @@ mwifiex_pcie_rdwr_firmware(struct mwifiex_adapter *adapter, u8 doneflag)</div><div class='ctx'> 	if (mwifiex_read_reg(adapter, reg-&gt;fw_status, &amp;fw_status))</div><div class='ctx'> 		return RDWR_STATUS_FAILURE;</div><div class='ctx'> </div><div class='del'>-	ret = mwifiex_write_reg(adapter, reg-&gt;fw_dump_ctrl,</div><div class='del'>-				reg-&gt;fw_dump_host_ready);</div><div class='del'>-	if (ret) {</div><div class='del'>-		mwifiex_dbg(adapter, ERROR,</div><div class='del'>-			    "PCIE write err\n");</div><div class='del'>-		return RDWR_STATUS_FAILURE;</div><div class='del'>-	}</div><div class='add'>+	mwifiex_write_reg(adapter, reg-&gt;fw_dump_ctrl, reg-&gt;fw_dump_host_ready);</div><div class='ctx'> </div><div class='ctx'> 	for (tries = 0; tries &lt; MAX_POLL_TRIES; tries++) {</div><div class='ctx'> 		mwifiex_read_reg_byte(adapter, reg-&gt;fw_dump_ctrl, &amp;ctrl_data);</div><div class='hunk'>@@ -2795,13 +2666,8 @@ mwifiex_pcie_rdwr_firmware(struct mwifiex_adapter *adapter, u8 doneflag)</div><div class='ctx'> 		if (ctrl_data != reg-&gt;fw_dump_host_ready) {</div><div class='ctx'> 			mwifiex_dbg(adapter, WARN,</div><div class='ctx'> 				    "The ctrl reg was changed, re-try again!\n");</div><div class='del'>-			ret = mwifiex_write_reg(adapter, reg-&gt;fw_dump_ctrl,</div><div class='del'>-						reg-&gt;fw_dump_host_ready);</div><div class='del'>-			if (ret) {</div><div class='del'>-				mwifiex_dbg(adapter, ERROR,</div><div class='del'>-					    "PCIE write err\n");</div><div class='del'>-				return RDWR_STATUS_FAILURE;</div><div class='del'>-			}</div><div class='add'>+			mwifiex_write_reg(adapter, reg-&gt;fw_dump_ctrl,</div><div class='add'>+					  reg-&gt;fw_dump_host_ready);</div><div class='ctx'> 		}</div><div class='ctx'> 		usleep_range(100, 200);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2820,7 +2686,6 @@ static void mwifiex_pcie_fw_dump(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	u8 idx, i, read_reg, doneflag = 0;</div><div class='ctx'> 	enum rdwr_status stat;</div><div class='ctx'> 	u32 memory_size;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!card-&gt;pcie.can_dump_fw)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2874,12 +2739,8 @@ static void mwifiex_pcie_fw_dump(struct mwifiex_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 		if (memory_size == 0) {</div><div class='ctx'> 			mwifiex_dbg(adapter, MSG, "Firmware dump Finished!\n");</div><div class='del'>-			ret = mwifiex_write_reg(adapter, creg-&gt;fw_dump_ctrl,</div><div class='del'>-						creg-&gt;fw_dump_read_done);</div><div class='del'>-			if (ret) {</div><div class='del'>-				mwifiex_dbg(adapter, ERROR, "PCIE write err\n");</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='add'>+			mwifiex_write_reg(adapter, creg-&gt;fw_dump_ctrl,</div><div class='add'>+					  creg-&gt;fw_dump_read_done);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -3110,13 +2971,16 @@ static int mwifiex_init_pcie(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		goto err_iomap2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_notice("PCI memory map Virt0: %pK PCI memory map Virt2: %pK\n",</div><div class='add'>+	pr_notice("PCI memory map Virt0: %p PCI memory map Virt2: %p\n",</div><div class='ctx'> 		  card-&gt;pci_mmap, card-&gt;pci_mmap1);</div><div class='ctx'> </div><div class='ctx'> 	ret = mwifiex_pcie_alloc_buffers(adapter);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_alloc_buffers;</div><div class='ctx'> </div><div class='add'>+	if (pdev-&gt;device == PCIE_DEVICE_ID_MARVELL_88W8897)</div><div class='add'>+		adapter-&gt;ignore_btcoex_events = true;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_alloc_buffers:</div><div class='hunk'>@@ -3162,9 +3026,7 @@ static void mwifiex_cleanup_pcie(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	if (fw_status == FIRMWARE_READY_PCIE) {</div><div class='ctx'> 		mwifiex_dbg(adapter, INFO,</div><div class='ctx'> 			    "Clearing driver ready signature\n");</div><div class='del'>-		if (mwifiex_write_reg(adapter, reg-&gt;drv_rdy, 0x00000000))</div><div class='del'>-			mwifiex_dbg(adapter, ERROR,</div><div class='del'>-				    "Failed to write driver not-ready signature\n");</div><div class='add'>+		mwifiex_write_reg(adapter, reg-&gt;drv_rdy, 0x00000000);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='hunk'>@@ -3335,7 +3197,7 @@ static void mwifiex_unregister_dev(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mwifiex_dbg(adapter, INFO,</div><div class='ctx'> 			    "%s(): calling free_irq()\n", __func__);</div><div class='del'>-	       free_irq(card-&gt;dev-&gt;irq, &amp;card-&gt;share_irq_ctx);</div><div class='add'>+		free_irq(card-&gt;dev-&gt;irq, &amp;card-&gt;share_irq_ctx);</div><div class='ctx'> </div><div class='ctx'> 		if (card-&gt;msi_enable)</div><div class='ctx'> 			pci_disable_msi(pdev);</div><div class='hunk'>@@ -3369,8 +3231,7 @@ static void mwifiex_pcie_down_dev(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	const struct mwifiex_pcie_card_reg *reg = card-&gt;pcie.reg;</div><div class='ctx'> 	struct pci_dev *pdev = card-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	if (mwifiex_write_reg(adapter, reg-&gt;drv_rdy, 0x00000000))</div><div class='del'>-		mwifiex_dbg(adapter, ERROR, "Failed to write driver not-ready signature\n");</div><div class='add'>+	mwifiex_write_reg(adapter, reg-&gt;drv_rdy, 0x00000000);</div><div class='ctx'> </div><div class='ctx'> 	pci_clear_master(pdev);</div><div class='ctx'> </div><div class='hunk'>@@ -3379,7 +3240,7 @@ static void mwifiex_pcie_down_dev(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	mwifiex_pcie_free_buffers(adapter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct mwifiex_if_ops pcie_ops = {</div><div class='add'>+static const struct mwifiex_if_ops pcie_ops = {</div><div class='ctx'> 	.init_if =			mwifiex_init_pcie,</div><div class='ctx'> 	.cleanup_if =			mwifiex_cleanup_pcie,</div><div class='ctx'> 	.check_fw_status =		mwifiex_check_fw_status,</div><div class='hunk'>@@ -3388,7 +3249,7 @@ static struct mwifiex_if_ops pcie_ops = {</div><div class='ctx'> 	.register_dev =			mwifiex_register_dev,</div><div class='ctx'> 	.unregister_dev =		mwifiex_unregister_dev,</div><div class='ctx'> 	.enable_int =			mwifiex_pcie_enable_host_int,</div><div class='del'>-	.disable_int =			mwifiex_pcie_disable_host_int_noerr,</div><div class='add'>+	.disable_int =			mwifiex_pcie_disable_host_int,</div><div class='ctx'> 	.process_int_status =		mwifiex_process_int_status,</div><div class='ctx'> 	.host_to_card =			mwifiex_pcie_host_to_card,</div><div class='ctx'> 	.wakeup =			mwifiex_pm_wakeup_card,</div><div class='hunk'>@@ -3414,3 +3275,9 @@ MODULE_AUTHOR("Marvell International Ltd.");</div><div class='ctx'> MODULE_DESCRIPTION("Marvell WiFi-Ex PCI-Express Driver version " PCIE_VERSION);</div><div class='ctx'> MODULE_VERSION(PCIE_VERSION);</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_FIRMWARE(PCIE8766_DEFAULT_FW_NAME);</div><div class='add'>+MODULE_FIRMWARE(PCIE8897_DEFAULT_FW_NAME);</div><div class='add'>+MODULE_FIRMWARE(PCIE8897_A0_FW_NAME);</div><div class='add'>+MODULE_FIRMWARE(PCIE8897_B0_FW_NAME);</div><div class='add'>+MODULE_FIRMWARE(PCIEUART8997_FW_NAME_V4);</div><div class='add'>+MODULE_FIRMWARE(PCIEUSB8997_FW_NAME_V4);</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.h b/drivers/net/wireless/marvell/mwifiex/pcie.h<br/>index 5ed613d65709..de901b3b59ad 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/pcie.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/pcie.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/pcie.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/pcie.h</a></div><div class='hunk'>@@ -1,22 +1,10 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /* @file mwifiex_pcie.h</div><div class='ctx'>  *</div><div class='ctx'>  * @brief This file contains definitions for PCI-E interface.</div><div class='ctx'>  * driver.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef	_MWIFIEX_PCIE_H</div><div class='hunk'>@@ -244,6 +232,7 @@ struct pcie_service_card {</div><div class='ctx'> 	unsigned long work_flags;</div><div class='ctx'> </div><div class='ctx'> 	bool pci_reset_ongoing;</div><div class='add'>+	unsigned long quirks;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c<br/>new file mode 100644<br/>index 000000000000..dd6d21f1dbfd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/pcie_quirks.c</a></div><div class='hunk'>@@ -0,0 +1,147 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+// NXP Wireless LAN device driver: PCIE and platform specific quirks</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dmi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "pcie_quirks.h"</div><div class='add'>+</div><div class='add'>+/* quirk table based on DMI matching */</div><div class='add'>+static const struct dmi_system_id mwifiex_quirk_table[] = {</div><div class='add'>+	{</div><div class='add'>+		.ident = "Surface Pro 4",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),</div><div class='add'>+			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 4"),</div><div class='add'>+		},</div><div class='add'>+		.driver_data = (void *)QUIRK_FW_RST_D3COLD,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ident = "Surface Pro 5",</div><div class='add'>+		.matches = {</div><div class='add'>+			/* match for SKU here due to generic product name "Surface Pro" */</div><div class='add'>+			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),</div><div class='add'>+			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1796"),</div><div class='add'>+		},</div><div class='add'>+		.driver_data = (void *)QUIRK_FW_RST_D3COLD,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ident = "Surface Pro 5 (LTE)",</div><div class='add'>+		.matches = {</div><div class='add'>+			/* match for SKU here due to generic product name "Surface Pro" */</div><div class='add'>+			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),</div><div class='add'>+			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1807"),</div><div class='add'>+		},</div><div class='add'>+		.driver_data = (void *)QUIRK_FW_RST_D3COLD,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ident = "Surface Pro 6",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),</div><div class='add'>+			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 6"),</div><div class='add'>+		},</div><div class='add'>+		.driver_data = (void *)QUIRK_FW_RST_D3COLD,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ident = "Surface Book 1",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),</div><div class='add'>+			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book"),</div><div class='add'>+		},</div><div class='add'>+		.driver_data = (void *)QUIRK_FW_RST_D3COLD,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ident = "Surface Book 2",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),</div><div class='add'>+			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book 2"),</div><div class='add'>+		},</div><div class='add'>+		.driver_data = (void *)QUIRK_FW_RST_D3COLD,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ident = "Surface Laptop 1",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),</div><div class='add'>+			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop"),</div><div class='add'>+		},</div><div class='add'>+		.driver_data = (void *)QUIRK_FW_RST_D3COLD,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ident = "Surface Laptop 2",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),</div><div class='add'>+			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop 2"),</div><div class='add'>+		},</div><div class='add'>+		.driver_data = (void *)QUIRK_FW_RST_D3COLD,</div><div class='add'>+	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void mwifiex_initialize_quirks(struct pcie_service_card *card)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = card-&gt;dev;</div><div class='add'>+	const struct dmi_system_id *dmi_id;</div><div class='add'>+</div><div class='add'>+	dmi_id = dmi_first_match(mwifiex_quirk_table);</div><div class='add'>+	if (dmi_id)</div><div class='add'>+		card-&gt;quirks = (uintptr_t)dmi_id-&gt;driver_data;</div><div class='add'>+</div><div class='add'>+	if (!card-&gt;quirks)</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "no quirks enabled\n");</div><div class='add'>+	if (card-&gt;quirks &amp; QUIRK_FW_RST_D3COLD)</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "quirk reset_d3cold enabled\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mwifiex_pcie_set_power_d3cold(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "putting into D3cold...\n");</div><div class='add'>+</div><div class='add'>+	pci_save_state(pdev);</div><div class='add'>+	if (pci_is_enabled(pdev))</div><div class='add'>+		pci_disable_device(pdev);</div><div class='add'>+	pci_set_power_state(pdev, PCI_D3cold);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mwifiex_pcie_set_power_d0(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "putting into D0...\n");</div><div class='add'>+</div><div class='add'>+	pci_set_power_state(pdev, PCI_D0);</div><div class='add'>+	ret = pci_enable_device(pdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "pci_enable_device failed\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	pci_restore_state(pdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *parent_pdev = pci_upstream_bridge(pdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Power-cycle (put into D3cold then D0) */</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "Using reset_d3cold quirk to perform FW reset\n");</div><div class='add'>+</div><div class='add'>+	/* We need to perform power-cycle also for bridge of wifi because</div><div class='add'>+	 * on some devices (e.g. Surface Book 1), the OS for some reasons</div><div class='add'>+	 * can't know the real power state of the bridge.</div><div class='add'>+	 * When tried to power-cycle only wifi, the reset failed with the</div><div class='add'>+	 * following dmesg log:</div><div class='add'>+	 * "Cannot transition to power state D0 for parent in D3hot".</div><div class='add'>+	 */</div><div class='add'>+	mwifiex_pcie_set_power_d3cold(pdev);</div><div class='add'>+	mwifiex_pcie_set_power_d3cold(parent_pdev);</div><div class='add'>+</div><div class='add'>+	ret = mwifiex_pcie_set_power_d0(parent_pdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = mwifiex_pcie_set_power_d0(pdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h<br/>new file mode 100644<br/>index 000000000000..d6ff964aec5b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/pcie_quirks.h</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* NXP Wireless LAN device driver: PCIE and platform specific quirks */</div><div class='add'>+</div><div class='add'>+#include "pcie.h"</div><div class='add'>+</div><div class='add'>+#define QUIRK_FW_RST_D3COLD	BIT(0)</div><div class='add'>+</div><div class='add'>+void mwifiex_initialize_quirks(struct pcie_service_card *card);</div><div class='add'>+int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c<br/>index 0b877f3f6b97..cab889af4c4a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/scan.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/scan.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/scan.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/scan.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: scan ioctl and command handling</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "decl.h"</div><div class='hunk'>@@ -192,17 +180,6 @@ mwifiex_is_wpa_oui_present(struct mwifiex_bssdescriptor *bss_desc, u32 cipher)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This function compares two SSIDs and checks if they match.</div><div class='del'>- */</div><div class='del'>-s32</div><div class='del'>-mwifiex_ssid_cmp(struct cfg80211_ssid *ssid1, struct cfg80211_ssid *ssid2)</div><div class='del'>-{</div><div class='del'>-	if (!ssid1 || !ssid2 || (ssid1-&gt;ssid_len != ssid2-&gt;ssid_len))</div><div class='del'>-		return -1;</div><div class='del'>-	return memcmp(ssid1-&gt;ssid, ssid2-&gt;ssid, ssid1-&gt;ssid_len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * This function checks if wapi is enabled in driver and scanned network is</div><div class='ctx'>  * compatible with it.</div><div class='ctx'>  */</div><div class='hunk'>@@ -624,7 +601,6 @@ mwifiex_scan_channel_list(struct mwifiex_private *priv,</div><div class='ctx'> 	struct mwifiex_adapter *adapter = priv-&gt;adapter;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct mwifiex_chan_scan_param_set *tmp_chan_list;</div><div class='del'>-	struct mwifiex_chan_scan_param_set *start_chan;</div><div class='ctx'> 	u32 tlv_idx, rates_size, cmd_no;</div><div class='ctx'> 	u32 total_scan_time;</div><div class='ctx'> 	u32 done_early;</div><div class='hunk'>@@ -655,7 +631,6 @@ mwifiex_scan_channel_list(struct mwifiex_private *priv,</div><div class='ctx'> 		total_scan_time = 0;</div><div class='ctx'> 		radio_type = 0;</div><div class='ctx'> 		chan_tlv_out-&gt;header.len = 0;</div><div class='del'>-		start_chan = tmp_chan_list;</div><div class='ctx'> 		done_early = false;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -689,15 +664,14 @@ mwifiex_scan_channel_list(struct mwifiex_private *priv,</div><div class='ctx'> </div><div class='ctx'> 			/* Copy the current channel TLV to the command being</div><div class='ctx'> 			   prepared */</div><div class='del'>-			memcpy(chan_tlv_out-&gt;chan_scan_param + tlv_idx,</div><div class='add'>+			memcpy(&amp;chan_tlv_out-&gt;chan_scan_param[tlv_idx],</div><div class='ctx'> 			       tmp_chan_list,</div><div class='del'>-			       sizeof(chan_tlv_out-&gt;chan_scan_param));</div><div class='add'>+			       sizeof(*chan_tlv_out-&gt;chan_scan_param));</div><div class='ctx'> </div><div class='ctx'> 			/* Increment the TLV header length by the size</div><div class='ctx'> 			   appended */</div><div class='ctx'> 			le16_unaligned_add_cpu(&amp;chan_tlv_out-&gt;header.len,</div><div class='del'>-					       sizeof(</div><div class='del'>-						chan_tlv_out-&gt;chan_scan_param));</div><div class='add'>+					       sizeof(*chan_tlv_out-&gt;chan_scan_param));</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * The tlv buffer length is set to the number of bytes</div><div class='hunk'>@@ -762,8 +736,6 @@ mwifiex_scan_channel_list(struct mwifiex_private *priv,</div><div class='ctx'> 		rates_size = mwifiex_append_rate_tlv(priv, scan_cfg_out,</div><div class='ctx'> 						     radio_type);</div><div class='ctx'> </div><div class='del'>-		priv-&gt;adapter-&gt;scan_channels = start_chan;</div><div class='del'>-</div><div class='ctx'> 		/* Send the scan command to the firmware with the specified</div><div class='ctx'> 		   cfg */</div><div class='ctx'> 		if (priv-&gt;adapter-&gt;ext_scan)</div><div class='hunk'>@@ -840,7 +812,6 @@ mwifiex_config_scan(struct mwifiex_private *priv,</div><div class='ctx'> 	u8 ssid_filter;</div><div class='ctx'> 	struct mwifiex_ie_types_htcap *ht_cap;</div><div class='ctx'> 	struct mwifiex_ie_types_bss_mode *bss_mode;</div><div class='del'>-	const u8 zero_mac[6] = {0, 0, 0, 0, 0, 0};</div><div class='ctx'> </div><div class='ctx'> 	/* The tlv_buf_len is calculated for each scan command.  The TLVs added</div><div class='ctx'> 	   in this routine will be preserved since the routine that sends the</div><div class='hunk'>@@ -978,7 +949,7 @@ mwifiex_config_scan(struct mwifiex_private *priv,</div><div class='ctx'> 				  sizeof(struct mwifiex_ie_types_scan_chan_gap);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!ether_addr_equal(user_scan_in-&gt;random_mac, zero_mac)) {</div><div class='add'>+		if (!is_zero_ether_addr(user_scan_in-&gt;random_mac)) {</div><div class='ctx'> 			random_mac_tlv = (void *)tlv_pos;</div><div class='ctx'> 			random_mac_tlv-&gt;header.type =</div><div class='ctx'> 					 cpu_to_le16(TLV_TYPE_RANDOM_MAC);</div><div class='hunk'>@@ -1400,6 +1371,12 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,</div><div class='ctx'> 			bss_entry-&gt;rsn_offset = (u16) (current_ptr -</div><div class='ctx'> 							bss_entry-&gt;beacon_buf);</div><div class='ctx'> 			break;</div><div class='add'>+		case WLAN_EID_RSNX:</div><div class='add'>+			bss_entry-&gt;bcn_rsnx_ie =</div><div class='add'>+				(struct ieee_types_generic *)current_ptr;</div><div class='add'>+			bss_entry-&gt;rsnx_offset =</div><div class='add'>+				(u16)(current_ptr - bss_entry-&gt;beacon_buf);</div><div class='add'>+			break;</div><div class='ctx'> 		case WLAN_EID_BSS_AC_ACCESS_DELAY:</div><div class='ctx'> 			bss_entry-&gt;bcn_wapi_ie =</div><div class='ctx'> 				(struct ieee_types_generic *) current_ptr;</div><div class='hunk'>@@ -2074,8 +2051,6 @@ void mwifiex_cancel_scan(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		spin_unlock_bh(&amp;adapter-&gt;mwifiex_cmd_lock);</div><div class='ctx'> 		for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='ctx'> 			priv = adapter-&gt;priv[i];</div><div class='del'>-			if (!priv)</div><div class='del'>-				continue;</div><div class='ctx'> 			if (priv-&gt;scan_request) {</div><div class='ctx'> 				struct cfg80211_scan_info info = {</div><div class='ctx'> 					.aborted = true,</div><div class='hunk'>@@ -2199,9 +2174,9 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,</div><div class='ctx'> </div><div class='ctx'> 	if (nd_config) {</div><div class='ctx'> 		adapter-&gt;nd_info =</div><div class='del'>-			kzalloc(sizeof(struct cfg80211_wowlan_nd_match) +</div><div class='del'>-				sizeof(struct cfg80211_wowlan_nd_match *) *</div><div class='del'>-				scan_rsp-&gt;number_of_sets, GFP_ATOMIC);</div><div class='add'>+			kzalloc(struct_size(adapter-&gt;nd_info, matches,</div><div class='add'>+					    scan_rsp-&gt;number_of_sets),</div><div class='add'>+				GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 		if (adapter-&gt;nd_info)</div><div class='ctx'> 			adapter-&gt;nd_info-&gt;n_matches = scan_rsp-&gt;number_of_sets;</div><div class='hunk'>@@ -2397,12 +2372,11 @@ int mwifiex_cmd_802_11_bg_scan_config(struct mwifiex_private *priv,</div><div class='ctx'> 		     chan_idx &lt; MWIFIEX_BG_SCAN_CHAN_MAX &amp;&amp;</div><div class='ctx'> 		     bgscan_cfg_in-&gt;chan_list[chan_idx].chan_number;</div><div class='ctx'> 		     chan_idx++) {</div><div class='del'>-			temp_chan = chan_list_tlv-&gt;chan_scan_param + chan_idx;</div><div class='add'>+			temp_chan = &amp;chan_list_tlv-&gt;chan_scan_param[chan_idx];</div><div class='ctx'> </div><div class='ctx'> 			/* Increment the TLV header length by size appended */</div><div class='ctx'> 			le16_unaligned_add_cpu(&amp;chan_list_tlv-&gt;header.len,</div><div class='del'>-					       sizeof(</div><div class='del'>-					       chan_list_tlv-&gt;chan_scan_param));</div><div class='add'>+					       sizeof(*chan_list_tlv-&gt;chan_scan_param));</div><div class='ctx'> </div><div class='ctx'> 			temp_chan-&gt;chan_number =</div><div class='ctx'> 				bgscan_cfg_in-&gt;chan_list[chan_idx].chan_number;</div><div class='hunk'>@@ -2441,7 +2415,7 @@ int mwifiex_cmd_802_11_bg_scan_config(struct mwifiex_private *priv,</div><div class='ctx'> 							   chan_scan_param);</div><div class='ctx'> 		le16_unaligned_add_cpu(&amp;chan_list_tlv-&gt;header.len,</div><div class='ctx'> 				       chan_num *</div><div class='del'>-			     sizeof(chan_list_tlv-&gt;chan_scan_param[0]));</div><div class='add'>+			     sizeof(*chan_list_tlv-&gt;chan_scan_param));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tlv_pos += (sizeof(chan_list_tlv-&gt;header)</div><div class='hunk'>@@ -2560,8 +2534,7 @@ int mwifiex_ret_802_11_scan_ext(struct mwifiex_private *priv,</div><div class='ctx'> 	ext_scan_resp = &amp;resp-&gt;params.ext_scan;</div><div class='ctx'> </div><div class='ctx'> 	tlv = (void *)ext_scan_resp-&gt;tlv_buffer;</div><div class='del'>-	buf_left = le16_to_cpu(resp-&gt;size) - (sizeof(*ext_scan_resp) + S_DS_GEN</div><div class='del'>-					      - 1);</div><div class='add'>+	buf_left = le16_to_cpu(resp-&gt;size) - (sizeof(*ext_scan_resp) + S_DS_GEN);</div><div class='ctx'> </div><div class='ctx'> 	while (buf_left &gt;= sizeof(struct mwifiex_ie_types_header)) {</div><div class='ctx'> 		type = le16_to_cpu(tlv-&gt;type);</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c<br/>index bde9e4bbfffe..f039d6f19183 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/sdio.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/sdio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/sdio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/sdio.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: SDIO specific handling</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='hunk'>@@ -33,7 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> static void mwifiex_sdio_work(struct work_struct *work);</div><div class='ctx'> </div><div class='del'>-static struct mwifiex_if_ops sdio_ops;</div><div class='add'>+static const struct mwifiex_if_ops sdio_ops;</div><div class='ctx'> </div><div class='ctx'> static const struct mwifiex_sdio_card_reg mwifiex_reg_sd87xx = {</div><div class='ctx'> 	.start_rd_port = 1,</div><div class='hunk'>@@ -182,6 +170,9 @@ static const struct mwifiex_sdio_card_reg mwifiex_reg_sd8997 = {</div><div class='ctx'> 	.host_int_rsr_reg = 0x4,</div><div class='ctx'> 	.host_int_status_reg = 0x0C,</div><div class='ctx'> 	.host_int_mask_reg = 0x08,</div><div class='add'>+	.host_strap_reg = 0xF4,</div><div class='add'>+	.host_strap_mask = 0x01,</div><div class='add'>+	.host_strap_value = 0x00,</div><div class='ctx'> 	.status_reg_0 = 0xE8,</div><div class='ctx'> 	.status_reg_1 = 0xE9,</div><div class='ctx'> 	.sdio_int_mask = 0xff,</div><div class='hunk'>@@ -272,7 +263,7 @@ static const struct mwifiex_sdio_card_reg mwifiex_reg_sd8887 = {</div><div class='ctx'> 				 0x68, 0x69, 0x6a},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct mwifiex_sdio_card_reg mwifiex_reg_sd8987 = {</div><div class='add'>+static const struct mwifiex_sdio_card_reg mwifiex_reg_sd89xx = {</div><div class='ctx'> 	.start_rd_port = 0,</div><div class='ctx'> 	.start_wr_port = 0,</div><div class='ctx'> 	.base_0_reg = 0xF8,</div><div class='hunk'>@@ -283,6 +274,9 @@ static const struct mwifiex_sdio_card_reg mwifiex_reg_sd8987 = {</div><div class='ctx'> 	.host_int_rsr_reg = 0x4,</div><div class='ctx'> 	.host_int_status_reg = 0x0C,</div><div class='ctx'> 	.host_int_mask_reg = 0x08,</div><div class='add'>+	.host_strap_reg = 0xF4,</div><div class='add'>+	.host_strap_mask = 0x01,</div><div class='add'>+	.host_strap_value = 0x00,</div><div class='ctx'> 	.status_reg_0 = 0xE8,</div><div class='ctx'> 	.status_reg_1 = 0xE9,</div><div class='ctx'> 	.sdio_int_mask = 0xff,</div><div class='hunk'>@@ -337,6 +331,8 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8786 = {</div><div class='ctx'> 	.can_dump_fw = false,</div><div class='ctx'> 	.can_auto_tdls = false,</div><div class='ctx'> 	.can_ext_scan = false,</div><div class='add'>+	.fw_ready_extra_delay = false,</div><div class='add'>+	.host_mlme = false,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mwifiex_sdio_device mwifiex_sdio_sd8787 = {</div><div class='hunk'>@@ -352,6 +348,8 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8787 = {</div><div class='ctx'> 	.can_dump_fw = false,</div><div class='ctx'> 	.can_auto_tdls = false,</div><div class='ctx'> 	.can_ext_scan = true,</div><div class='add'>+	.fw_ready_extra_delay = false,</div><div class='add'>+	.host_mlme = false,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mwifiex_sdio_device mwifiex_sdio_sd8797 = {</div><div class='hunk'>@@ -367,6 +365,8 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8797 = {</div><div class='ctx'> 	.can_dump_fw = false,</div><div class='ctx'> 	.can_auto_tdls = false,</div><div class='ctx'> 	.can_ext_scan = true,</div><div class='add'>+	.fw_ready_extra_delay = false,</div><div class='add'>+	.host_mlme = false,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mwifiex_sdio_device mwifiex_sdio_sd8897 = {</div><div class='hunk'>@@ -382,6 +382,8 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8897 = {</div><div class='ctx'> 	.can_dump_fw = true,</div><div class='ctx'> 	.can_auto_tdls = false,</div><div class='ctx'> 	.can_ext_scan = true,</div><div class='add'>+	.fw_ready_extra_delay = false,</div><div class='add'>+	.host_mlme = false,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mwifiex_sdio_device mwifiex_sdio_sd8977 = {</div><div class='hunk'>@@ -398,10 +400,31 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8977 = {</div><div class='ctx'> 	.fw_dump_enh = true,</div><div class='ctx'> 	.can_auto_tdls = false,</div><div class='ctx'> 	.can_ext_scan = true,</div><div class='add'>+	.fw_ready_extra_delay = false,</div><div class='add'>+	.host_mlme = false,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mwifiex_sdio_device mwifiex_sdio_sd8978 = {</div><div class='add'>+	.firmware_sdiouart = SD8978_SDIOUART_FW_NAME,</div><div class='add'>+	.reg = &amp;mwifiex_reg_sd89xx,</div><div class='add'>+	.max_ports = 32,</div><div class='add'>+	.mp_agg_pkt_limit = 16,</div><div class='add'>+	.tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_4K,</div><div class='add'>+	.mp_tx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_MAX,</div><div class='add'>+	.mp_rx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_MAX,</div><div class='add'>+	.supports_sdio_new_mode = true,</div><div class='add'>+	.has_control_mask = false,</div><div class='add'>+	.can_dump_fw = true,</div><div class='add'>+	.fw_dump_enh = true,</div><div class='add'>+	.can_auto_tdls = false,</div><div class='add'>+	.can_ext_scan = true,</div><div class='add'>+	.fw_ready_extra_delay = true,</div><div class='add'>+	.host_mlme = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mwifiex_sdio_device mwifiex_sdio_sd8997 = {</div><div class='ctx'> 	.firmware = SD8997_DEFAULT_FW_NAME,</div><div class='add'>+	.firmware_sdiouart = SD8997_SDIOUART_FW_NAME,</div><div class='ctx'> 	.reg = &amp;mwifiex_reg_sd8997,</div><div class='ctx'> 	.max_ports = 32,</div><div class='ctx'> 	.mp_agg_pkt_limit = 16,</div><div class='hunk'>@@ -414,6 +437,8 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8997 = {</div><div class='ctx'> 	.fw_dump_enh = true,</div><div class='ctx'> 	.can_auto_tdls = false,</div><div class='ctx'> 	.can_ext_scan = true,</div><div class='add'>+	.fw_ready_extra_delay = false,</div><div class='add'>+	.host_mlme = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mwifiex_sdio_device mwifiex_sdio_sd8887 = {</div><div class='hunk'>@@ -429,11 +454,13 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8887 = {</div><div class='ctx'> 	.can_dump_fw = false,</div><div class='ctx'> 	.can_auto_tdls = true,</div><div class='ctx'> 	.can_ext_scan = true,</div><div class='add'>+	.fw_ready_extra_delay = false,</div><div class='add'>+	.host_mlme = false,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mwifiex_sdio_device mwifiex_sdio_sd8987 = {</div><div class='ctx'> 	.firmware = SD8987_DEFAULT_FW_NAME,</div><div class='del'>-	.reg = &amp;mwifiex_reg_sd8987,</div><div class='add'>+	.reg = &amp;mwifiex_reg_sd89xx,</div><div class='ctx'> 	.max_ports = 32,</div><div class='ctx'> 	.mp_agg_pkt_limit = 16,</div><div class='ctx'> 	.tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K,</div><div class='hunk'>@@ -445,6 +472,8 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8987 = {</div><div class='ctx'> 	.fw_dump_enh = true,</div><div class='ctx'> 	.can_auto_tdls = true,</div><div class='ctx'> 	.can_ext_scan = true,</div><div class='add'>+	.fw_ready_extra_delay = false,</div><div class='add'>+	.host_mlme = false,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mwifiex_sdio_device mwifiex_sdio_sd8801 = {</div><div class='hunk'>@@ -460,6 +489,8 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8801 = {</div><div class='ctx'> 	.can_dump_fw = false,</div><div class='ctx'> 	.can_auto_tdls = false,</div><div class='ctx'> 	.can_ext_scan = true,</div><div class='add'>+	.fw_ready_extra_delay = false,</div><div class='add'>+	.host_mlme = false,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct memory_type_mapping generic_mem_type_map[] = {</div><div class='hunk'>@@ -484,9 +515,12 @@ static struct memory_type_mapping mem_type_mapping_tbl[] = {</div><div class='ctx'> 	{"EXTLAST", NULL, 0, 0xFE},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id mwifiex_sdio_of_match_table[] = {</div><div class='add'>+static const struct of_device_id mwifiex_sdio_of_match_table[] __maybe_unused = {</div><div class='add'>+	{ .compatible = "marvell,sd8787" },</div><div class='ctx'> 	{ .compatible = "marvell,sd8897" },</div><div class='add'>+	{ .compatible = "marvell,sd8978" },</div><div class='ctx'> 	{ .compatible = "marvell,sd8997" },</div><div class='add'>+	{ .compatible = "nxp,iw416" },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -536,6 +570,7 @@ mwifiex_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id)</div><div class='ctx'> 		struct mwifiex_sdio_device *data = (void *)id-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 		card-&gt;firmware = data-&gt;firmware;</div><div class='add'>+		card-&gt;firmware_sdiouart = data-&gt;firmware_sdiouart;</div><div class='ctx'> 		card-&gt;reg = data-&gt;reg;</div><div class='ctx'> 		card-&gt;max_ports = data-&gt;max_ports;</div><div class='ctx'> 		card-&gt;mp_agg_pkt_limit = data-&gt;mp_agg_pkt_limit;</div><div class='hunk'>@@ -548,6 +583,8 @@ mwifiex_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id)</div><div class='ctx'> 		card-&gt;fw_dump_enh = data-&gt;fw_dump_enh;</div><div class='ctx'> 		card-&gt;can_auto_tdls = data-&gt;can_auto_tdls;</div><div class='ctx'> 		card-&gt;can_ext_scan = data-&gt;can_ext_scan;</div><div class='add'>+		card-&gt;fw_ready_extra_delay = data-&gt;fw_ready_extra_delay;</div><div class='add'>+		card-&gt;host_mlme = data-&gt;host_mlme;</div><div class='ctx'> 		INIT_WORK(&amp;card-&gt;work, mwifiex_sdio_work);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -751,8 +788,9 @@ mwifiex_sdio_read_fw_status(struct mwifiex_adapter *adapter, u16 *dat)</div><div class='ctx'> static int mwifiex_check_fw_status(struct mwifiex_adapter *adapter,</div><div class='ctx'> 				   u32 poll_num)</div><div class='ctx'> {</div><div class='add'>+	struct sdio_mmc_card *card = adapter-&gt;card;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	u16 firmware_stat;</div><div class='add'>+	u16 firmware_stat = 0;</div><div class='ctx'> 	u32 tries;</div><div class='ctx'> </div><div class='ctx'> 	for (tries = 0; tries &lt; poll_num; tries++) {</div><div class='hunk'>@@ -768,6 +806,13 @@ static int mwifiex_check_fw_status(struct mwifiex_adapter *adapter,</div><div class='ctx'> 		ret = -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (card-&gt;fw_ready_extra_delay &amp;&amp;</div><div class='add'>+	    firmware_stat == FIRMWARE_READY_SDIO)</div><div class='add'>+		/* firmware might pretend to be ready, when it's not.</div><div class='add'>+		 * Wait a little bit more as a workaround.</div><div class='add'>+		 */</div><div class='add'>+		msleep(100);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -923,6 +968,8 @@ static const struct sdio_device_id mwifiex_ids[] = {</div><div class='ctx'> 		.driver_data = (unsigned long)&amp;mwifiex_sdio_sd8801},</div><div class='ctx'> 	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8977_WLAN),</div><div class='ctx'> 		.driver_data = (unsigned long)&amp;mwifiex_sdio_sd8977},</div><div class='add'>+	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8978_WLAN),</div><div class='add'>+		.driver_data = (unsigned long)&amp;mwifiex_sdio_sd8978},</div><div class='ctx'> 	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8987_WLAN),</div><div class='ctx'> 		.driver_data = (unsigned long)&amp;mwifiex_sdio_sd8987},</div><div class='ctx'> 	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8997_WLAN),</div><div class='hunk'>@@ -943,7 +990,6 @@ static struct sdio_driver mwifiex_sdio = {</div><div class='ctx'> 	.probe = mwifiex_sdio_probe,</div><div class='ctx'> 	.remove = mwifiex_sdio_remove,</div><div class='ctx'> 	.drv = {</div><div class='del'>-		.owner = THIS_MODULE,</div><div class='ctx'> 		.coredump = mwifiex_sdio_coredump,</div><div class='ctx'> 		.pm = &amp;mwifiex_sdio_pm_ops,</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1066,17 +1112,17 @@ cont:</div><div class='ctx'> 		    "info: SDIO FUNC1 IO port: %#x\n", adapter-&gt;ioport);</div><div class='ctx'> </div><div class='ctx'> 	/* Set Host interrupt reset to read to clear */</div><div class='del'>-	if (!mwifiex_read_reg(adapter, card-&gt;reg-&gt;host_int_rsr_reg, &amp;reg))</div><div class='del'>-		mwifiex_write_reg(adapter, card-&gt;reg-&gt;host_int_rsr_reg,</div><div class='del'>-				  reg | card-&gt;reg-&gt;sdio_int_mask);</div><div class='del'>-	else</div><div class='add'>+	if (mwifiex_read_reg(adapter, card-&gt;reg-&gt;host_int_rsr_reg, &amp;reg))</div><div class='add'>+		return -1;</div><div class='add'>+	if (mwifiex_write_reg(adapter, card-&gt;reg-&gt;host_int_rsr_reg,</div><div class='add'>+			      reg | card-&gt;reg-&gt;sdio_int_mask))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	/* Dnld/Upld ready set to auto reset */</div><div class='del'>-	if (!mwifiex_read_reg(adapter, card-&gt;reg-&gt;card_misc_cfg_reg, &amp;reg))</div><div class='del'>-		mwifiex_write_reg(adapter, card-&gt;reg-&gt;card_misc_cfg_reg,</div><div class='del'>-				  reg | AUTO_RE_ENABLE_INT);</div><div class='del'>-	else</div><div class='add'>+	if (mwifiex_read_reg(adapter, card-&gt;reg-&gt;card_misc_cfg_reg, &amp;reg))</div><div class='add'>+		return -1;</div><div class='add'>+	if (mwifiex_write_reg(adapter, card-&gt;reg-&gt;card_misc_cfg_reg,</div><div class='add'>+			      reg | AUTO_RE_ENABLE_INT))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1539,9 +1585,9 @@ done:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This function decode sdio aggreation pkt.</div><div class='add'>+ * This function decodes sdio aggregation pkt.</div><div class='ctx'>  *</div><div class='del'>- * Based on the the data block size and pkt_len,</div><div class='add'>+ * Based on the data block size and pkt_len,</div><div class='ctx'>  * skb data will be decoded to few packets.</div><div class='ctx'>  */</div><div class='ctx'> static void mwifiex_deaggr_sdio_pkt(struct mwifiex_adapter *adapter,</div><div class='hunk'>@@ -2249,7 +2295,7 @@ static int mwifiex_host_to_card_mp_aggr(struct mwifiex_adapter *adapter,</div><div class='ctx'> 		ret = mwifiex_write_data_to_card(adapter, card-&gt;mpa_tx.buf,</div><div class='ctx'> 						 card-&gt;mpa_tx.buf_len, mport);</div><div class='ctx'> </div><div class='del'>-		/* Save the last multi port tx aggreagation info to debug log */</div><div class='add'>+		/* Save the last multi port tx aggregation info to debug log. */</div><div class='ctx'> 		index = adapter-&gt;dbg.last_sdio_mp_index;</div><div class='ctx'> 		index = (index + 1) % MWIFIEX_DBG_SDIO_MP_NUM;</div><div class='ctx'> 		adapter-&gt;dbg.last_sdio_mp_index = index;</div><div class='hunk'>@@ -2439,6 +2485,7 @@ static int mwifiex_register_dev(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct sdio_mmc_card *card = adapter-&gt;card;</div><div class='ctx'> 	struct sdio_func *func = card-&gt;func;</div><div class='add'>+	const char *firmware = card-&gt;firmware;</div><div class='ctx'> </div><div class='ctx'> 	/* save adapter pointer in card */</div><div class='ctx'> 	card-&gt;adapter = adapter;</div><div class='hunk'>@@ -2455,7 +2502,18 @@ static int mwifiex_register_dev(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strcpy(adapter-&gt;fw_name, card-&gt;firmware);</div><div class='add'>+	/* Select correct firmware (sdsd or sdiouart) firmware based on the strapping</div><div class='add'>+	 * option</div><div class='add'>+	 */</div><div class='add'>+	if (card-&gt;firmware_sdiouart) {</div><div class='add'>+		u8 val;</div><div class='add'>+</div><div class='add'>+		mwifiex_read_reg(adapter, card-&gt;reg-&gt;host_strap_reg, &amp;val);</div><div class='add'>+		if ((val &amp; card-&gt;reg-&gt;host_strap_mask) == card-&gt;reg-&gt;host_strap_value)</div><div class='add'>+			firmware = card-&gt;firmware_sdiouart;</div><div class='add'>+	}</div><div class='add'>+	strcpy(adapter-&gt;fw_name, firmware);</div><div class='add'>+</div><div class='ctx'> 	if (card-&gt;fw_dump_enh) {</div><div class='ctx'> 		adapter-&gt;mem_type_mapping_tbl = generic_mem_type_map;</div><div class='ctx'> 		adapter-&gt;num_mem_types = 1;</div><div class='hunk'>@@ -2464,6 +2522,8 @@ static int mwifiex_register_dev(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		adapter-&gt;num_mem_types = ARRAY_SIZE(mem_type_mapping_tbl);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	adapter-&gt;host_mlme_enabled = card-&gt;host_mlme;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2496,7 +2556,8 @@ static int mwifiex_init_sdio(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	mwifiex_read_reg(adapter, card-&gt;reg-&gt;host_int_status_reg, &amp;sdio_ireg);</div><div class='ctx'> </div><div class='ctx'> 	/* Get SDIO ioport */</div><div class='del'>-	mwifiex_init_sdio_ioport(adapter);</div><div class='add'>+	if (mwifiex_init_sdio_ioport(adapter))</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize SDIO variables in card */</div><div class='ctx'> 	card-&gt;mp_rd_bitmap = 0;</div><div class='hunk'>@@ -2525,20 +2586,11 @@ static int mwifiex_init_sdio(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	if (!card-&gt;mp_regs)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	/* Allocate skb pointer buffers */</div><div class='del'>-	card-&gt;mpa_rx.skb_arr = kcalloc(card-&gt;mp_agg_pkt_limit, sizeof(void *),</div><div class='del'>-				       GFP_KERNEL);</div><div class='del'>-	if (!card-&gt;mpa_rx.skb_arr) {</div><div class='del'>-		kfree(card-&gt;mp_regs);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	card-&gt;mpa_rx.len_arr = kcalloc(card-&gt;mp_agg_pkt_limit,</div><div class='ctx'> 				       sizeof(*card-&gt;mpa_rx.len_arr),</div><div class='ctx'> 				       GFP_KERNEL);</div><div class='ctx'> 	if (!card-&gt;mpa_rx.len_arr) {</div><div class='ctx'> 		kfree(card-&gt;mp_regs);</div><div class='del'>-		kfree(card-&gt;mpa_rx.skb_arr);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2593,7 +2645,6 @@ static void mwifiex_cleanup_sdio(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	cancel_work_sync(&amp;card-&gt;work);</div><div class='ctx'> </div><div class='ctx'> 	kfree(card-&gt;mp_regs);</div><div class='del'>-	kfree(card-&gt;mpa_rx.skb_arr);</div><div class='ctx'> 	kfree(card-&gt;mpa_rx.len_arr);</div><div class='ctx'> 	kfree(card-&gt;mpa_tx.buf);</div><div class='ctx'> 	kfree(card-&gt;mpa_rx.buf);</div><div class='hunk'>@@ -2639,7 +2690,7 @@ static void mwifiex_sdio_card_reset_work(struct mwifiex_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	/* Run a HW reset of the SDIO interface. */</div><div class='ctx'> 	sdio_claim_host(func);</div><div class='del'>-	ret = mmc_hw_reset(func-&gt;card-&gt;host);</div><div class='add'>+	ret = mmc_hw_reset(func-&gt;card);</div><div class='ctx'> 	sdio_release_host(func);</div><div class='ctx'> </div><div class='ctx'> 	switch (ret) {</div><div class='hunk'>@@ -3112,10 +3163,11 @@ static void mwifiex_sdio_up_dev(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	 */</div><div class='ctx'> 	mwifiex_read_reg(adapter, card-&gt;reg-&gt;host_int_status_reg, &amp;sdio_ireg);</div><div class='ctx'> </div><div class='del'>-	mwifiex_init_sdio_ioport(adapter);</div><div class='add'>+	if (mwifiex_init_sdio_ioport(adapter))</div><div class='add'>+		dev_err(&amp;card-&gt;func-&gt;dev, "error enabling SDIO port\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct mwifiex_if_ops sdio_ops = {</div><div class='add'>+static const struct mwifiex_if_ops sdio_ops = {</div><div class='ctx'> 	.init_if = mwifiex_init_sdio,</div><div class='ctx'> 	.cleanup_if = mwifiex_cleanup_sdio,</div><div class='ctx'> 	.check_fw_status = mwifiex_check_fw_status,</div><div class='hunk'>@@ -3143,7 +3195,7 @@ static struct mwifiex_if_ops sdio_ops = {</div><div class='ctx'> 	.up_dev = mwifiex_sdio_up_dev,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-module_driver(mwifiex_sdio, sdio_register_driver, sdio_unregister_driver);</div><div class='add'>+module_sdio_driver(mwifiex_sdio);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Marvell International Ltd.");</div><div class='ctx'> MODULE_DESCRIPTION("Marvell WiFi-Ex SDIO Driver version " SDIO_VERSION);</div><div class='hunk'>@@ -3152,8 +3204,11 @@ MODULE_LICENSE("GPL v2");</div><div class='ctx'> MODULE_FIRMWARE(SD8786_DEFAULT_FW_NAME);</div><div class='ctx'> MODULE_FIRMWARE(SD8787_DEFAULT_FW_NAME);</div><div class='ctx'> MODULE_FIRMWARE(SD8797_DEFAULT_FW_NAME);</div><div class='add'>+MODULE_FIRMWARE(SD8801_DEFAULT_FW_NAME);</div><div class='ctx'> MODULE_FIRMWARE(SD8897_DEFAULT_FW_NAME);</div><div class='ctx'> MODULE_FIRMWARE(SD8887_DEFAULT_FW_NAME);</div><div class='ctx'> MODULE_FIRMWARE(SD8977_DEFAULT_FW_NAME);</div><div class='add'>+MODULE_FIRMWARE(SD8978_SDIOUART_FW_NAME);</div><div class='ctx'> MODULE_FIRMWARE(SD8987_DEFAULT_FW_NAME);</div><div class='ctx'> MODULE_FIRMWARE(SD8997_DEFAULT_FW_NAME);</div><div class='add'>+MODULE_FIRMWARE(SD8997_SDIOUART_FW_NAME);</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.h b/drivers/net/wireless/marvell/mwifiex/sdio.h<br/>index 5648512c9300..65d142286c46 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/sdio.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/sdio.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/sdio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/sdio.h</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: SDIO specific definitions</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef	_MWIFIEX_SDIO_H</div><div class='hunk'>@@ -37,8 +25,10 @@</div><div class='ctx'> #define SD8887_DEFAULT_FW_NAME "mrvl/sd8887_uapsta.bin"</div><div class='ctx'> #define SD8801_DEFAULT_FW_NAME "mrvl/sd8801_uapsta.bin"</div><div class='ctx'> #define SD8977_DEFAULT_FW_NAME "mrvl/sdsd8977_combo_v2.bin"</div><div class='add'>+#define SD8978_SDIOUART_FW_NAME "mrvl/sdiouartiw416_combo_v0.bin"</div><div class='ctx'> #define SD8987_DEFAULT_FW_NAME "mrvl/sd8987_uapsta.bin"</div><div class='ctx'> #define SD8997_DEFAULT_FW_NAME "mrvl/sdsd8997_combo_v4.bin"</div><div class='add'>+#define SD8997_SDIOUART_FW_NAME "mrvl/sdiouart8997_combo_v4.bin"</div><div class='ctx'> </div><div class='ctx'> #define BLOCK_MODE	1</div><div class='ctx'> #define BYTE_MODE	0</div><div class='hunk'>@@ -174,10 +164,7 @@ struct mwifiex_sdio_mpa_rx {</div><div class='ctx'> 	u32 pkt_cnt;</div><div class='ctx'> 	u32 ports;</div><div class='ctx'> 	u16 start_port;</div><div class='del'>-</div><div class='del'>-	struct sk_buff **skb_arr;</div><div class='ctx'> 	u32 *len_arr;</div><div class='del'>-</div><div class='ctx'> 	u8 enabled;</div><div class='ctx'> 	u32 buf_size;</div><div class='ctx'> 	u32 pkt_aggr_limit;</div><div class='hunk'>@@ -196,6 +183,9 @@ struct mwifiex_sdio_card_reg {</div><div class='ctx'> 	u8 host_int_rsr_reg;</div><div class='ctx'> 	u8 host_int_status_reg;</div><div class='ctx'> 	u8 host_int_mask_reg;</div><div class='add'>+	u8 host_strap_reg;</div><div class='add'>+	u8 host_strap_mask;</div><div class='add'>+	u8 host_strap_value;</div><div class='ctx'> 	u8 status_reg_0;</div><div class='ctx'> 	u8 status_reg_1;</div><div class='ctx'> 	u8 sdio_int_mask;</div><div class='hunk'>@@ -241,6 +231,7 @@ struct sdio_mmc_card {</div><div class='ctx'> </div><div class='ctx'> 	struct completion fw_done;</div><div class='ctx'> 	const char *firmware;</div><div class='add'>+	const char *firmware_sdiouart;</div><div class='ctx'> 	const struct mwifiex_sdio_card_reg *reg;</div><div class='ctx'> 	u8 max_ports;</div><div class='ctx'> 	u8 mp_agg_pkt_limit;</div><div class='hunk'>@@ -264,6 +255,8 @@ struct sdio_mmc_card {</div><div class='ctx'> 	bool fw_dump_enh;</div><div class='ctx'> 	bool can_auto_tdls;</div><div class='ctx'> 	bool can_ext_scan;</div><div class='add'>+	bool fw_ready_extra_delay;</div><div class='add'>+	bool host_mlme;</div><div class='ctx'> </div><div class='ctx'> 	struct mwifiex_sdio_mpa_tx mpa_tx;</div><div class='ctx'> 	struct mwifiex_sdio_mpa_rx mpa_rx;</div><div class='hunk'>@@ -274,6 +267,7 @@ struct sdio_mmc_card {</div><div class='ctx'> </div><div class='ctx'> struct mwifiex_sdio_device {</div><div class='ctx'> 	const char *firmware;</div><div class='add'>+	const char *firmware_sdiouart;</div><div class='ctx'> 	const struct mwifiex_sdio_card_reg *reg;</div><div class='ctx'> 	u8 max_ports;</div><div class='ctx'> 	u8 mp_agg_pkt_limit;</div><div class='hunk'>@@ -286,6 +280,8 @@ struct mwifiex_sdio_device {</div><div class='ctx'> 	bool fw_dump_enh;</div><div class='ctx'> 	bool can_auto_tdls;</div><div class='ctx'> 	bool can_ext_scan;</div><div class='add'>+	bool fw_ready_extra_delay;</div><div class='add'>+	bool host_mlme;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -377,7 +373,6 @@ static inline void mp_rx_aggr_setup(struct sdio_mmc_card *card,</div><div class='ctx'> 		else</div><div class='ctx'> 			card-&gt;mpa_rx.ports |= 1 &lt;&lt; (card-&gt;mpa_rx.pkt_cnt + 1);</div><div class='ctx'> 	}</div><div class='del'>-	card-&gt;mpa_rx.skb_arr[card-&gt;mpa_rx.pkt_cnt] = NULL;</div><div class='ctx'> 	card-&gt;mpa_rx.len_arr[card-&gt;mpa_rx.pkt_cnt] = rx_len;</div><div class='ctx'> 	card-&gt;mpa_rx.pkt_cnt++;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c<br/>index d3a968ef21ef..dcca71158fc6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/sta_cmd.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/sta_cmd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/sta_cmd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/sta_cmd.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: station command handling</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "decl.h"</div><div class='hunk'>@@ -169,7 +157,7 @@ mwifiex_cmd_802_11_get_log(struct host_cmd_ds_command *cmd)</div><div class='ctx'>  */</div><div class='ctx'> static int mwifiex_cmd_tx_rate_cfg(struct mwifiex_private *priv,</div><div class='ctx'> 				   struct host_cmd_ds_command *cmd,</div><div class='del'>-				   u16 cmd_action, u16 *pbitmap_rates)</div><div class='add'>+				   u16 cmd_action, const u16 *pbitmap_rates)</div><div class='ctx'> {</div><div class='ctx'> 	struct host_cmd_ds_tx_rate_cfg *rate_cfg = &amp;cmd-&gt;params.tx_rate_cfg;</div><div class='ctx'> 	struct mwifiex_rate_scope *rate_scope;</div><div class='hunk'>@@ -186,34 +174,19 @@ static int mwifiex_cmd_tx_rate_cfg(struct mwifiex_private *priv,</div><div class='ctx'> 	rate_scope-&gt;type = cpu_to_le16(TLV_TYPE_RATE_SCOPE);</div><div class='ctx'> 	rate_scope-&gt;length = cpu_to_le16</div><div class='ctx'> 		(sizeof(*rate_scope) - sizeof(struct mwifiex_ie_types_header));</div><div class='del'>-	if (pbitmap_rates != NULL) {</div><div class='del'>-		rate_scope-&gt;hr_dsss_rate_bitmap = cpu_to_le16(pbitmap_rates[0]);</div><div class='del'>-		rate_scope-&gt;ofdm_rate_bitmap = cpu_to_le16(pbitmap_rates[1]);</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(rate_scope-&gt;ht_mcs_rate_bitmap); i++)</div><div class='del'>-			rate_scope-&gt;ht_mcs_rate_bitmap[i] =</div><div class='del'>-				cpu_to_le16(pbitmap_rates[2 + i]);</div><div class='del'>-		if (priv-&gt;adapter-&gt;fw_api_ver == MWIFIEX_FW_V15) {</div><div class='del'>-			for (i = 0;</div><div class='del'>-			     i &lt; ARRAY_SIZE(rate_scope-&gt;vht_mcs_rate_bitmap);</div><div class='del'>-			     i++)</div><div class='del'>-				rate_scope-&gt;vht_mcs_rate_bitmap[i] =</div><div class='del'>-					cpu_to_le16(pbitmap_rates[10 + i]);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		rate_scope-&gt;hr_dsss_rate_bitmap =</div><div class='del'>-			cpu_to_le16(priv-&gt;bitmap_rates[0]);</div><div class='del'>-		rate_scope-&gt;ofdm_rate_bitmap =</div><div class='del'>-			cpu_to_le16(priv-&gt;bitmap_rates[1]);</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(rate_scope-&gt;ht_mcs_rate_bitmap); i++)</div><div class='del'>-			rate_scope-&gt;ht_mcs_rate_bitmap[i] =</div><div class='del'>-				cpu_to_le16(priv-&gt;bitmap_rates[2 + i]);</div><div class='del'>-		if (priv-&gt;adapter-&gt;fw_api_ver == MWIFIEX_FW_V15) {</div><div class='del'>-			for (i = 0;</div><div class='del'>-			     i &lt; ARRAY_SIZE(rate_scope-&gt;vht_mcs_rate_bitmap);</div><div class='del'>-			     i++)</div><div class='del'>-				rate_scope-&gt;vht_mcs_rate_bitmap[i] =</div><div class='del'>-					cpu_to_le16(priv-&gt;bitmap_rates[10 + i]);</div><div class='del'>-		}</div><div class='add'>+	if (!pbitmap_rates)</div><div class='add'>+		pbitmap_rates = priv-&gt;bitmap_rates;</div><div class='add'>+</div><div class='add'>+	rate_scope-&gt;hr_dsss_rate_bitmap = cpu_to_le16(pbitmap_rates[0]);</div><div class='add'>+	rate_scope-&gt;ofdm_rate_bitmap = cpu_to_le16(pbitmap_rates[1]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(rate_scope-&gt;ht_mcs_rate_bitmap); i++)</div><div class='add'>+		rate_scope-&gt;ht_mcs_rate_bitmap[i] = cpu_to_le16(pbitmap_rates[2 + i]);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;adapter-&gt;fw_api_ver == MWIFIEX_FW_V15) {</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(rate_scope-&gt;vht_mcs_rate_bitmap); i++)</div><div class='add'>+			rate_scope-&gt;vht_mcs_rate_bitmap[i] =</div><div class='add'>+				cpu_to_le16(pbitmap_rates[10 + i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rate_drop = (struct mwifiex_rate_drop_pattern *) ((u8 *) rate_scope +</div><div class='hunk'>@@ -396,6 +369,10 @@ mwifiex_cmd_802_11_hs_cfg(struct mwifiex_private *priv,</div><div class='ctx'> 	if (hs_activate) {</div><div class='ctx'> 		hs_cfg-&gt;action = cpu_to_le16(HS_ACTIVATE);</div><div class='ctx'> 		hs_cfg-&gt;params.hs_activate.resp_ctrl = cpu_to_le16(RESP_NEEDED);</div><div class='add'>+</div><div class='add'>+		adapter-&gt;hs_activated_manually = true;</div><div class='add'>+		mwifiex_dbg(priv-&gt;adapter, CMD,</div><div class='add'>+			    "cmd: Activating host sleep manually\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		hs_cfg-&gt;action = cpu_to_le16(HS_CONFIGURE);</div><div class='ctx'> 		hs_cfg-&gt;params.hs_config.conditions = hscfg_param-&gt;conditions;</div><div class='hunk'>@@ -840,14 +817,15 @@ mwifiex_cmd_802_11_key_material_v1(struct mwifiex_private *priv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!enc_key) {</div><div class='del'>-		memset(&amp;key_material-&gt;key_param_set, 0,</div><div class='del'>-		       (NUM_WEP_KEYS *</div><div class='del'>-			sizeof(struct mwifiex_ie_type_key_param_set)));</div><div class='add'>+		struct host_cmd_ds_802_11_key_material_wep *key_material_wep =</div><div class='add'>+			(struct host_cmd_ds_802_11_key_material_wep *)key_material;</div><div class='add'>+		memset(key_material_wep-&gt;key_param_set, 0,</div><div class='add'>+		       sizeof(key_material_wep-&gt;key_param_set));</div><div class='ctx'> 		ret = mwifiex_set_keyparamset_wep(priv,</div><div class='del'>-						  &amp;key_material-&gt;key_param_set,</div><div class='add'>+						  &amp;key_material_wep-&gt;key_param_set[0],</div><div class='ctx'> 						  &amp;key_param_len);</div><div class='ctx'> 		cmd-&gt;size = cpu_to_le16(key_param_len +</div><div class='del'>-				    sizeof(key_material-&gt;action) + S_DS_GEN);</div><div class='add'>+				    sizeof(key_material_wep-&gt;action) + S_DS_GEN);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	} else</div><div class='ctx'> 		memset(&amp;key_material-&gt;key_param_set, 0,</div><div class='hunk'>@@ -1442,7 +1420,7 @@ mwifiex_cmd_mef_cfg(struct mwifiex_private *priv,</div><div class='ctx'> 		mef_entry = (struct mwifiex_fw_mef_entry *)pos;</div><div class='ctx'> 		mef_entry-&gt;mode = mef-&gt;mef_entry[i].mode;</div><div class='ctx'> 		mef_entry-&gt;action = mef-&gt;mef_entry[i].action;</div><div class='del'>-		pos += sizeof(*mef_cfg-&gt;mef_entry);</div><div class='add'>+		pos += sizeof(*mef_entry);</div><div class='ctx'> </div><div class='ctx'> 		if (mwifiex_cmd_append_rpn_expression(priv,</div><div class='ctx'> 						      &amp;mef-&gt;mef_entry[i], &amp;pos))</div><div class='hunk'>@@ -1505,6 +1483,119 @@ int mwifiex_dnld_dt_cfgdata(struct mwifiex_private *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mwifiex_rgpower_table_advance_to_content(u8 **pos, const u8 *data,</div><div class='add'>+						    const size_t size)</div><div class='add'>+{</div><div class='add'>+	while (*pos - data &lt; size) {</div><div class='add'>+		/* skip spaces, tabs and empty lines */</div><div class='add'>+		if (**pos == '\r' || **pos == '\n' || **pos == '\0' ||</div><div class='add'>+		    isspace(**pos)) {</div><div class='add'>+			(*pos)++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		/* skip line comments */</div><div class='add'>+		if (**pos == '#') {</div><div class='add'>+			*pos = strchr(*pos, '\n');</div><div class='add'>+			if (!*pos)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			(*pos)++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mwifiex_send_rgpower_table(struct mwifiex_private *priv, const u8 *data,</div><div class='add'>+				const size_t size)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	bool start_raw = false;</div><div class='add'>+	u8 *ptr, *token, *pos = NULL;</div><div class='add'>+	u8 *_data __free(kfree) = NULL;</div><div class='add'>+	struct mwifiex_adapter *adapter = priv-&gt;adapter;</div><div class='add'>+	struct mwifiex_ds_misc_cmd *hostcmd __free(kfree) = NULL;</div><div class='add'>+</div><div class='add'>+	hostcmd = kzalloc(sizeof(*hostcmd), GFP_KERNEL);</div><div class='add'>+	if (!hostcmd)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	_data = kmemdup(data, size, GFP_KERNEL);</div><div class='add'>+	if (!_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pos = _data;</div><div class='add'>+	ptr = hostcmd-&gt;cmd;</div><div class='add'>+	while ((pos - _data) &lt; size) {</div><div class='add'>+		ret = mwifiex_rgpower_table_advance_to_content(&amp;pos, _data, size);</div><div class='add'>+		if (ret) {</div><div class='add'>+			mwifiex_dbg(</div><div class='add'>+				adapter, ERROR,</div><div class='add'>+				"%s: failed to advance to content in rgpower table\n",</div><div class='add'>+				__func__);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (*pos == '}' &amp;&amp; start_raw) {</div><div class='add'>+			hostcmd-&gt;len = get_unaligned_le16(&amp;hostcmd-&gt;cmd[2]);</div><div class='add'>+			ret = mwifiex_send_cmd(priv, 0, 0, 0, hostcmd, false);</div><div class='add'>+			if (ret) {</div><div class='add'>+				mwifiex_dbg(adapter, ERROR,</div><div class='add'>+					    "%s: failed to send hostcmd %d\n",</div><div class='add'>+					    __func__, ret);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			memset(hostcmd-&gt;cmd, 0, MWIFIEX_SIZE_OF_CMD_BUFFER);</div><div class='add'>+			ptr = hostcmd-&gt;cmd;</div><div class='add'>+			start_raw = false;</div><div class='add'>+			pos++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!start_raw) {</div><div class='add'>+			pos = strchr(pos, '=');</div><div class='add'>+			if (pos) {</div><div class='add'>+				pos = strchr(pos, '{');</div><div class='add'>+				if (pos) {</div><div class='add'>+					start_raw = true;</div><div class='add'>+					pos++;</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			mwifiex_dbg(adapter, ERROR,</div><div class='add'>+				    "%s: syntax error in hostcmd\n", __func__);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (start_raw) {</div><div class='add'>+			while ((*pos != '\r' &amp;&amp; *pos != '\n') &amp;&amp;</div><div class='add'>+			       (token = strsep((char **)&amp;pos, " "))) {</div><div class='add'>+				if (ptr - hostcmd-&gt;cmd &gt;=</div><div class='add'>+				    MWIFIEX_SIZE_OF_CMD_BUFFER) {</div><div class='add'>+					mwifiex_dbg(</div><div class='add'>+						adapter, ERROR,</div><div class='add'>+						"%s: hostcmd is larger than %d, aborting\n",</div><div class='add'>+						__func__, MWIFIEX_SIZE_OF_CMD_BUFFER);</div><div class='add'>+					return -ENOMEM;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				ret = kstrtou8(token, 16, ptr);</div><div class='add'>+				if (ret &lt; 0) {</div><div class='add'>+					mwifiex_dbg(</div><div class='add'>+						adapter, ERROR,</div><div class='add'>+						"%s: failed to parse hostcmd %d token: %s\n",</div><div class='add'>+						__func__, ret, token);</div><div class='add'>+					return ret;</div><div class='add'>+				}</div><div class='add'>+				ptr++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* This function prepares command of set_cfg_data. */</div><div class='ctx'> static int mwifiex_cmd_cfg_data(struct mwifiex_private *priv,</div><div class='ctx'> 				struct host_cmd_ds_command *cmd, void *data_buf)</div><div class='hunk'>@@ -1514,6 +1605,7 @@ static int mwifiex_cmd_cfg_data(struct mwifiex_private *priv,</div><div class='ctx'> 	u32 len;</div><div class='ctx'> 	u8 *data = (u8 *)cmd + S_DS_GEN;</div><div class='ctx'> 	int ret;</div><div class='add'>+	struct host_cmd_ds_802_11_cfg_data *pcfg_data;</div><div class='ctx'> </div><div class='ctx'> 	if (prop) {</div><div class='ctx'> 		len = prop-&gt;length;</div><div class='hunk'>@@ -1521,12 +1613,20 @@ static int mwifiex_cmd_cfg_data(struct mwifiex_private *priv,</div><div class='ctx'> 						data, len);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='add'>+</div><div class='add'>+		cmd-&gt;size = cpu_to_le16(S_DS_GEN + len);</div><div class='ctx'> 		mwifiex_dbg(adapter, INFO,</div><div class='ctx'> 			    "download cfg_data from device tree: %s\n",</div><div class='ctx'> 			    prop-&gt;name);</div><div class='ctx'> 	} else if (adapter-&gt;cal_data-&gt;data &amp;&amp; adapter-&gt;cal_data-&gt;size &gt; 0) {</div><div class='ctx'> 		len = mwifiex_parse_cal_cfg((u8 *)adapter-&gt;cal_data-&gt;data,</div><div class='del'>-					    adapter-&gt;cal_data-&gt;size, data);</div><div class='add'>+					    adapter-&gt;cal_data-&gt;size,</div><div class='add'>+					    data + sizeof(*pcfg_data));</div><div class='add'>+		pcfg_data = &amp;cmd-&gt;params.cfg_data;</div><div class='add'>+		pcfg_data-&gt;action = cpu_to_le16(HOST_CMD_ACT_GEN_SET);</div><div class='add'>+		pcfg_data-&gt;type = cpu_to_le16(MWIFIEX_CFG_TYPE_CAL);</div><div class='add'>+		pcfg_data-&gt;data_len = cpu_to_le16(len);</div><div class='add'>+		cmd-&gt;size = cpu_to_le16(S_DS_GEN + sizeof(*pcfg_data) + len);</div><div class='ctx'> 		mwifiex_dbg(adapter, INFO,</div><div class='ctx'> 			    "download cfg_data from config file\n");</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1534,7 +1634,6 @@ static int mwifiex_cmd_cfg_data(struct mwifiex_private *priv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;command = cpu_to_le16(HostCmd_CMD_CFG_DATA);</div><div class='del'>-	cmd-&gt;size = cpu_to_le16(S_DS_GEN + len);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1638,7 +1737,7 @@ mwifiex_cmd_coalesce_cfg(struct mwifiex_private *priv,</div><div class='ctx'> </div><div class='ctx'> 	coalesce_cfg-&gt;action = cpu_to_le16(cmd_action);</div><div class='ctx'> 	coalesce_cfg-&gt;num_of_rules = cpu_to_le16(cfg-&gt;num_of_rules);</div><div class='del'>-	rule = coalesce_cfg-&gt;rule;</div><div class='add'>+	rule = (void *)coalesce_cfg-&gt;rule_data;</div><div class='ctx'> </div><div class='ctx'> 	for (cnt = 0; cnt &lt; cfg-&gt;num_of_rules; cnt++) {</div><div class='ctx'> 		rule-&gt;header.type = cpu_to_le16(TLV_TYPE_COALESCE_RULE);</div><div class='hunk'>@@ -1785,29 +1884,31 @@ mwifiex_cmd_tdls_oper(struct mwifiex_private *priv,</div><div class='ctx'> 		wmm_qos_info-&gt;qos_info = 0;</div><div class='ctx'> 		config_len += sizeof(struct mwifiex_ie_types_qos_info);</div><div class='ctx'> </div><div class='del'>-		if (params-&gt;ht_capa) {</div><div class='add'>+		if (params-&gt;link_sta_params.ht_capa) {</div><div class='ctx'> 			ht_capab = (struct mwifiex_ie_types_htcap *)(pos +</div><div class='ctx'> 								    config_len);</div><div class='ctx'> 			ht_capab-&gt;header.type =</div><div class='ctx'> 					    cpu_to_le16(WLAN_EID_HT_CAPABILITY);</div><div class='ctx'> 			ht_capab-&gt;header.len =</div><div class='ctx'> 				   cpu_to_le16(sizeof(struct ieee80211_ht_cap));</div><div class='del'>-			memcpy(&amp;ht_capab-&gt;ht_cap, params-&gt;ht_capa,</div><div class='add'>+			memcpy(&amp;ht_capab-&gt;ht_cap, params-&gt;link_sta_params.ht_capa,</div><div class='ctx'> 			       sizeof(struct ieee80211_ht_cap));</div><div class='ctx'> 			config_len += sizeof(struct mwifiex_ie_types_htcap);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (params-&gt;supported_rates &amp;&amp; params-&gt;supported_rates_len) {</div><div class='add'>+		if (params-&gt;link_sta_params.supported_rates &amp;&amp;</div><div class='add'>+		    params-&gt;link_sta_params.supported_rates_len) {</div><div class='ctx'> 			tlv_rates = (struct host_cmd_tlv_rates *)(pos +</div><div class='ctx'> 								  config_len);</div><div class='ctx'> 			tlv_rates-&gt;header.type =</div><div class='ctx'> 					       cpu_to_le16(WLAN_EID_SUPP_RATES);</div><div class='ctx'> 			tlv_rates-&gt;header.len =</div><div class='del'>-				       cpu_to_le16(params-&gt;supported_rates_len);</div><div class='del'>-			memcpy(tlv_rates-&gt;rates, params-&gt;supported_rates,</div><div class='del'>-			       params-&gt;supported_rates_len);</div><div class='add'>+				       cpu_to_le16(params-&gt;link_sta_params.supported_rates_len);</div><div class='add'>+			memcpy(tlv_rates-&gt;rates,</div><div class='add'>+			       params-&gt;link_sta_params.supported_rates,</div><div class='add'>+			       params-&gt;link_sta_params.supported_rates_len);</div><div class='ctx'> 			config_len += sizeof(struct host_cmd_tlv_rates) +</div><div class='del'>-				      params-&gt;supported_rates_len;</div><div class='add'>+				      params-&gt;link_sta_params.supported_rates_len;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (params-&gt;ext_capab &amp;&amp; params-&gt;ext_capab_len) {</div><div class='hunk'>@@ -1821,14 +1922,14 @@ mwifiex_cmd_tdls_oper(struct mwifiex_private *priv,</div><div class='ctx'> 			config_len += sizeof(struct mwifiex_ie_types_extcap) +</div><div class='ctx'> 				      params-&gt;ext_capab_len;</div><div class='ctx'> 		}</div><div class='del'>-		if (params-&gt;vht_capa) {</div><div class='add'>+		if (params-&gt;link_sta_params.vht_capa) {</div><div class='ctx'> 			vht_capab = (struct mwifiex_ie_types_vhtcap *)(pos +</div><div class='ctx'> 								    config_len);</div><div class='ctx'> 			vht_capab-&gt;header.type =</div><div class='ctx'> 					   cpu_to_le16(WLAN_EID_VHT_CAPABILITY);</div><div class='ctx'> 			vht_capab-&gt;header.len =</div><div class='ctx'> 				  cpu_to_le16(sizeof(struct ieee80211_vht_cap));</div><div class='del'>-			memcpy(&amp;vht_capab-&gt;vht_cap, params-&gt;vht_capa,</div><div class='add'>+			memcpy(&amp;vht_capab-&gt;vht_cap, params-&gt;link_sta_params.vht_capa,</div><div class='ctx'> 			       sizeof(struct ieee80211_vht_cap));</div><div class='ctx'> 			config_len += sizeof(struct mwifiex_ie_types_vhtcap);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2255,7 +2356,7 @@ int mwifiex_sta_prepare_cmd(struct mwifiex_private *priv, uint16_t cmd_no,</div><div class='ctx'>  *      - Set 11d control</div><div class='ctx'>  *      - Set MAC control (this must be the last command to initialize firmware)</div><div class='ctx'>  */</div><div class='del'>-int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)</div><div class='add'>+int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_adapter *adapter = priv-&gt;adapter;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -2298,9 +2399,13 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)</div><div class='ctx'> 						"marvell,caldata");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (adapter-&gt;cal_data)</div><div class='add'>+		if (adapter-&gt;cal_data) {</div><div class='ctx'> 			mwifiex_send_cmd(priv, HostCmd_CMD_CFG_DATA,</div><div class='ctx'> 					 HostCmd_ACT_GEN_SET, 0, NULL, true);</div><div class='add'>+			release_firmware(adapter-&gt;cal_data);</div><div class='add'>+			adapter-&gt;cal_data = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 		/* Read MAC address from HW */</div><div class='ctx'> 		ret = mwifiex_send_cmd(priv, HostCmd_CMD_GET_HW_SPEC,</div><div class='hunk'>@@ -2426,11 +2531,5 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)</div><div class='ctx'> 	ret = mwifiex_send_cmd(priv, HostCmd_CMD_11N_CFG,</div><div class='ctx'> 			       HostCmd_ACT_GEN_SET, 0, &amp;tx_cfg, true);</div><div class='ctx'> </div><div class='del'>-	if (init) {</div><div class='del'>-		/* set last_init_cmd before sending the command */</div><div class='del'>-		priv-&gt;adapter-&gt;last_init_cmd = HostCmd_CMD_11N_CFG;</div><div class='del'>-		ret = -EINPROGRESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c<br/>index 6b5d35d9e69f..9c53825f222d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: station command response handling</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "decl.h"</div><div class='hunk'>@@ -708,11 +696,35 @@ static int mwifiex_ret_ver_ext(struct mwifiex_private *priv,</div><div class='ctx'> {</div><div class='ctx'> 	struct host_cmd_ds_version_ext *ver_ext = &amp;resp-&gt;params.verext;</div><div class='ctx'> </div><div class='add'>+	if (test_and_clear_bit(MWIFIEX_IS_REQUESTING_FW_VEREXT, &amp;priv-&gt;adapter-&gt;work_flags)) {</div><div class='add'>+		if (strncmp(ver_ext-&gt;version_str, "ChipRev:20, BB:9b(10.00), RF:40(21)",</div><div class='add'>+			    MWIFIEX_VERSION_STR_LENGTH) == 0) {</div><div class='add'>+			struct mwifiex_ds_auto_ds auto_ds = {</div><div class='add'>+				.auto_ds = DEEP_SLEEP_OFF,</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			mwifiex_dbg(priv-&gt;adapter, MSG,</div><div class='add'>+				    "Bad HW revision detected, disabling deep sleep\n");</div><div class='add'>+</div><div class='add'>+			if (mwifiex_send_cmd(priv, HostCmd_CMD_802_11_PS_MODE_ENH,</div><div class='add'>+					     DIS_AUTO_PS, BITMAP_AUTO_DS, &amp;auto_ds, false)) {</div><div class='add'>+				mwifiex_dbg(priv-&gt;adapter, MSG,</div><div class='add'>+					    "Disabling deep sleep failed.\n");</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (version_ext) {</div><div class='ctx'> 		version_ext-&gt;version_str_sel = ver_ext-&gt;version_str_sel;</div><div class='ctx'> 		memcpy(version_ext-&gt;version_str, ver_ext-&gt;version_str,</div><div class='del'>-		       sizeof(char) * 128);</div><div class='del'>-		memcpy(priv-&gt;version_str, ver_ext-&gt;version_str, 128);</div><div class='add'>+		       MWIFIEX_VERSION_STR_LENGTH);</div><div class='add'>+		memcpy(priv-&gt;version_str, ver_ext-&gt;version_str,</div><div class='add'>+		       MWIFIEX_VERSION_STR_LENGTH);</div><div class='add'>+</div><div class='add'>+		/* Ensure the version string from the firmware is 0-terminated */</div><div class='add'>+		priv-&gt;version_str[MWIFIEX_VERSION_STR_LENGTH - 1] = '\0';</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1386,6 +1398,8 @@ int mwifiex_process_sta_cmdresp(struct mwifiex_private *priv, u16 cmdresp_no,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HostCmd_CMD_UAP_STA_DEAUTH:</div><div class='ctx'> 		break;</div><div class='add'>+	case HostCmd_CMD_ADD_NEW_STATION:</div><div class='add'>+		break;</div><div class='ctx'> 	case HOST_CMD_APCMD_SYS_RESET:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HostCmd_CMD_MEF_CFG:</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/sta_event.c b/drivers/net/wireless/marvell/mwifiex/sta_event.c<br/>index 68c63268e2e6..fecd88967ceb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/sta_event.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/sta_event.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/sta_event.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/sta_event.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: station event handling</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "decl.h"</div><div class='hunk'>@@ -147,6 +135,9 @@ void mwifiex_reset_connect_state(struct mwifiex_private *priv, u16 reason_code,</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;media_connected = false;</div><div class='ctx'> </div><div class='add'>+	priv-&gt;auth_flag = 0;</div><div class='add'>+	priv-&gt;auth_alg = WLAN_AUTH_NONE;</div><div class='add'>+</div><div class='ctx'> 	priv-&gt;scan_block = false;</div><div class='ctx'> 	priv-&gt;port_open = false;</div><div class='ctx'> </div><div class='hunk'>@@ -186,17 +177,14 @@ void mwifiex_reset_connect_state(struct mwifiex_private *priv, u16 reason_code,</div><div class='ctx'> 	priv-&gt;is_data_rate_auto = true;</div><div class='ctx'> 	priv-&gt;data_rate = 0;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;assoc_resp_ht_param = 0;</div><div class='ctx'> 	priv-&gt;ht_param_present = false;</div><div class='ctx'> </div><div class='ctx'> 	if ((GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA ||</div><div class='ctx'> 	     GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP) &amp;&amp; priv-&gt;hist_data)</div><div class='ctx'> 		mwifiex_hist_data_reset(priv);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;bss_mode == NL80211_IFTYPE_ADHOC) {</div><div class='add'>+	if (priv-&gt;bss_mode == NL80211_IFTYPE_ADHOC)</div><div class='ctx'> 		priv-&gt;adhoc_state = ADHOC_IDLE;</div><div class='del'>-		priv-&gt;adhoc_is_link_sensed = false;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Memorize the previous SSID and BSSID so</div><div class='hunk'>@@ -234,8 +222,12 @@ void mwifiex_reset_connect_state(struct mwifiex_private *priv, u16 reason_code,</div><div class='ctx'> 		    priv-&gt;cfg_bssid, reason_code);</div><div class='ctx'> 	if (priv-&gt;bss_mode == NL80211_IFTYPE_STATION ||</div><div class='ctx'> 	    priv-&gt;bss_mode == NL80211_IFTYPE_P2P_CLIENT) {</div><div class='del'>-		cfg80211_disconnected(priv-&gt;netdev, reason_code, NULL, 0,</div><div class='del'>-				      !from_ap, GFP_KERNEL);</div><div class='add'>+		if (adapter-&gt;host_mlme_enabled &amp;&amp; adapter-&gt;host_mlme_link_lost)</div><div class='add'>+			mwifiex_host_mlme_disconnect(adapter-&gt;priv_link_lost,</div><div class='add'>+						     reason_code, NULL);</div><div class='add'>+		else</div><div class='add'>+			cfg80211_disconnected(priv-&gt;netdev, reason_code, NULL,</div><div class='add'>+					      0, !from_ap, GFP_KERNEL);</div><div class='ctx'> 	}</div><div class='ctx'> 	eth_zero_addr(priv-&gt;cfg_bssid);</div><div class='ctx'> </div><div class='hunk'>@@ -365,10 +357,12 @@ static void mwifiex_process_uap_tx_pause(struct mwifiex_private *priv,</div><div class='ctx'> 		sta_ptr = mwifiex_get_sta_entry(priv, tp-&gt;peermac);</div><div class='ctx'> 		if (sta_ptr &amp;&amp; sta_ptr-&gt;tx_pause != tp-&gt;tx_pause) {</div><div class='ctx'> 			sta_ptr-&gt;tx_pause = tp-&gt;tx_pause;</div><div class='add'>+			spin_unlock_bh(&amp;priv-&gt;sta_list_spinlock);</div><div class='ctx'> 			mwifiex_update_ralist_tx_pause(priv, tp-&gt;peermac,</div><div class='ctx'> 						       tp-&gt;tx_pause);</div><div class='add'>+		} else {</div><div class='add'>+			spin_unlock_bh(&amp;priv-&gt;sta_list_spinlock);</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock_bh(&amp;priv-&gt;sta_list_spinlock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -400,11 +394,13 @@ static void mwifiex_process_sta_tx_pause(struct mwifiex_private *priv,</div><div class='ctx'> 			sta_ptr = mwifiex_get_sta_entry(priv, tp-&gt;peermac);</div><div class='ctx'> 			if (sta_ptr &amp;&amp; sta_ptr-&gt;tx_pause != tp-&gt;tx_pause) {</div><div class='ctx'> 				sta_ptr-&gt;tx_pause = tp-&gt;tx_pause;</div><div class='add'>+				spin_unlock_bh(&amp;priv-&gt;sta_list_spinlock);</div><div class='ctx'> 				mwifiex_update_ralist_tx_pause(priv,</div><div class='ctx'> 							       tp-&gt;peermac,</div><div class='ctx'> 							       tp-&gt;tx_pause);</div><div class='add'>+			} else {</div><div class='add'>+				spin_unlock_bh(&amp;priv-&gt;sta_list_spinlock);</div><div class='ctx'> 			}</div><div class='del'>-			spin_unlock_bh(&amp;priv-&gt;sta_list_spinlock);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -619,8 +615,8 @@ mwifiex_fw_dump_info_event(struct mwifiex_private *priv,</div><div class='ctx'> 		 * transmission event get lost, in this cornel case,</div><div class='ctx'> 		 * user would still get partial of the dump.</div><div class='ctx'> 		 */</div><div class='del'>-		mod_timer(&amp;adapter-&gt;devdump_timer,</div><div class='del'>-			  jiffies + msecs_to_jiffies(MWIFIEX_TIMER_10S));</div><div class='add'>+		schedule_delayed_work(&amp;adapter-&gt;devdump_work,</div><div class='add'>+				      msecs_to_jiffies(MWIFIEX_TIMER_10S));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Overflow check */</div><div class='hunk'>@@ -631,7 +627,7 @@ mwifiex_fw_dump_info_event(struct mwifiex_private *priv,</div><div class='ctx'> 		adapter-&gt;event_skb-&gt;data, event_skb-&gt;len);</div><div class='ctx'> 	adapter-&gt;devdump_len += event_skb-&gt;len;</div><div class='ctx'> </div><div class='del'>-	if (le16_to_cpu(fw_dump_hdr-&gt;type == FW_DUMP_INFO_ENDED)) {</div><div class='add'>+	if (le16_to_cpu(fw_dump_hdr-&gt;type) == FW_DUMP_INFO_ENDED) {</div><div class='ctx'> 		mwifiex_dbg(adapter, MSG,</div><div class='ctx'> 			    "receive end of transmission flag event!\n");</div><div class='ctx'> 		goto upload_dump;</div><div class='hunk'>@@ -639,7 +635,7 @@ mwifiex_fw_dump_info_event(struct mwifiex_private *priv,</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> upload_dump:</div><div class='del'>-	del_timer_sync(&amp;adapter-&gt;devdump_timer);</div><div class='add'>+	cancel_delayed_work_sync(&amp;adapter-&gt;devdump_work);</div><div class='ctx'> 	mwifiex_upload_device_dump(adapter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -754,7 +750,15 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)</div><div class='ctx'> 		if (priv-&gt;media_connected) {</div><div class='ctx'> 			reason_code =</div><div class='ctx'> 				get_unaligned_le16(adapter-&gt;event_body);</div><div class='del'>-			mwifiex_reset_connect_state(priv, reason_code, true);</div><div class='add'>+			if (adapter-&gt;host_mlme_enabled) {</div><div class='add'>+				adapter-&gt;priv_link_lost = priv;</div><div class='add'>+				adapter-&gt;host_mlme_link_lost = true;</div><div class='add'>+				queue_work(adapter-&gt;host_mlme_workqueue,</div><div class='add'>+					   &amp;adapter-&gt;host_mlme_work);</div><div class='add'>+			} else {</div><div class='add'>+				mwifiex_reset_connect_state(priv, reason_code,</div><div class='add'>+							    true);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -785,7 +789,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)</div><div class='ctx'> 					adapter-&gt;ps_state = PS_STATE_AWAKE;</div><div class='ctx'> 					adapter-&gt;pm_wakeup_card_req = false;</div><div class='ctx'> 					adapter-&gt;pm_wakeup_fw_try = false;</div><div class='del'>-					del_timer(&amp;adapter-&gt;wakeup_timer);</div><div class='add'>+					timer_delete(&amp;adapter-&gt;wakeup_timer);</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> 				if (!mwifiex_send_null_packet</div><div class='hunk'>@@ -800,7 +804,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)</div><div class='ctx'> 		adapter-&gt;ps_state = PS_STATE_AWAKE;</div><div class='ctx'> 		adapter-&gt;pm_wakeup_card_req = false;</div><div class='ctx'> 		adapter-&gt;pm_wakeup_fw_try = false;</div><div class='del'>-		del_timer(&amp;adapter-&gt;wakeup_timer);</div><div class='add'>+		timer_delete(&amp;adapter-&gt;wakeup_timer);</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -836,7 +840,6 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)</div><div class='ctx'> </div><div class='ctx'> 	case EVENT_ADHOC_BCN_LOST:</div><div class='ctx'> 		mwifiex_dbg(adapter, EVENT, "event: ADHOC_BCN_LOST\n");</div><div class='del'>-		priv-&gt;adhoc_is_link_sensed = false;</div><div class='ctx'> 		mwifiex_clean_txrx(priv);</div><div class='ctx'> 		mwifiex_stop_net_dev_queue(priv-&gt;netdev, adapter);</div><div class='ctx'> 		if (netif_carrier_ok(priv-&gt;netdev))</div><div class='hunk'>@@ -1007,10 +1010,17 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)</div><div class='ctx'> 	case EVENT_REMAIN_ON_CHAN_EXPIRED:</div><div class='ctx'> 		mwifiex_dbg(adapter, EVENT,</div><div class='ctx'> 			    "event: Remain on channel expired\n");</div><div class='del'>-		cfg80211_remain_on_channel_expired(&amp;priv-&gt;wdev,</div><div class='del'>-						   priv-&gt;roc_cfg.cookie,</div><div class='del'>-						   &amp;priv-&gt;roc_cfg.chan,</div><div class='del'>-						   GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+		if (adapter-&gt;host_mlme_enabled &amp;&amp;</div><div class='add'>+		    (priv-&gt;auth_flag &amp; HOST_MLME_AUTH_PENDING)) {</div><div class='add'>+			priv-&gt;auth_flag = 0;</div><div class='add'>+			priv-&gt;auth_alg = WLAN_AUTH_NONE;</div><div class='add'>+		} else {</div><div class='add'>+			cfg80211_remain_on_channel_expired(&amp;priv-&gt;wdev,</div><div class='add'>+							   priv-&gt;roc_cfg.cookie,</div><div class='add'>+							   &amp;priv-&gt;roc_cfg.chan,</div><div class='add'>+							   GFP_ATOMIC);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		memset(&amp;priv-&gt;roc_cfg, 0x00, sizeof(struct mwifiex_roc_cfg));</div><div class='ctx'> </div><div class='hunk'>@@ -1058,6 +1068,9 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case EVENT_BT_COEX_WLAN_PARA_CHANGE:</div><div class='ctx'> 		dev_dbg(adapter-&gt;dev, "EVENT: BT coex wlan param update\n");</div><div class='add'>+		if (adapter-&gt;ignore_btcoex_events)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		mwifiex_bt_coex_wlan_param_update_event(priv,</div><div class='ctx'> 							adapter-&gt;event_skb);</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c<br/>index 653f9e094256..ef6722ffdc74 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/sta_ioctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/sta_ioctl.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: functions for station ioctl</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "decl.h"</div><div class='hunk'>@@ -192,7 +180,7 @@ int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv,</div><div class='ctx'> 	return mwifiex_update_bss_desc_with_ie(priv-&gt;adapter, bss_desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mwifiex_dnld_txpwr_table(struct mwifiex_private *priv)</div><div class='add'>+static void mwifiex_dnld_dt_txpwr_table(struct mwifiex_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	if (priv-&gt;adapter-&gt;dt_node) {</div><div class='ctx'> 		char txpwr[] = {"marvell,00_txpwrlimit"};</div><div class='hunk'>@@ -202,6 +190,62 @@ void mwifiex_dnld_txpwr_table(struct mwifiex_private *priv)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mwifiex_request_rgpower_table(struct mwifiex_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct mwifiex_802_11d_domain_reg *domain_info = &amp;priv-&gt;adapter-&gt;domain_reg;</div><div class='add'>+	struct mwifiex_adapter *adapter = priv-&gt;adapter;</div><div class='add'>+	char rgpower_table_name[30];</div><div class='add'>+	char country_code[3];</div><div class='add'>+</div><div class='add'>+	strscpy(country_code, domain_info-&gt;country_code, sizeof(country_code));</div><div class='add'>+</div><div class='add'>+	/* World regulatory domain "00" has WW as country code */</div><div class='add'>+	if (strncmp(country_code, "00", 2) == 0)</div><div class='add'>+		strscpy(country_code, "WW", sizeof(country_code));</div><div class='add'>+</div><div class='add'>+	snprintf(rgpower_table_name, sizeof(rgpower_table_name),</div><div class='add'>+		 "nxp/rgpower_%s.bin", country_code);</div><div class='add'>+</div><div class='add'>+	mwifiex_dbg(adapter, INFO, "info: %s: requesting regulatory power table %s\n",</div><div class='add'>+		    __func__, rgpower_table_name);</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;rgpower_data) {</div><div class='add'>+		release_firmware(adapter-&gt;rgpower_data);</div><div class='add'>+		adapter-&gt;rgpower_data = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((request_firmware(&amp;adapter-&gt;rgpower_data, rgpower_table_name,</div><div class='add'>+			      adapter-&gt;dev))) {</div><div class='add'>+		mwifiex_dbg(</div><div class='add'>+			adapter, INFO,</div><div class='add'>+			"info: %s: failed to request regulatory power table\n",</div><div class='add'>+			__func__);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mwifiex_dnld_rgpower_table(struct mwifiex_private *priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mwifiex_request_rgpower_table(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return mwifiex_send_rgpower_table(priv, priv-&gt;adapter-&gt;rgpower_data-&gt;data,</div><div class='add'>+					  priv-&gt;adapter-&gt;rgpower_data-&gt;size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mwifiex_dnld_txpwr_table(struct mwifiex_private *priv)</div><div class='add'>+{</div><div class='add'>+	if (mwifiex_dnld_rgpower_table(priv) == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mwifiex_dnld_dt_txpwr_table(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mwifiex_process_country_ie(struct mwifiex_private *priv,</div><div class='ctx'> 				      struct cfg80211_bss *bss)</div><div class='ctx'> {</div><div class='hunk'>@@ -351,20 +395,18 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,</div><div class='ctx'> 			ret = mwifiex_associate(priv, bss_desc);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (bss)</div><div class='add'>+		if (bss &amp;&amp; !priv-&gt;adapter-&gt;host_mlme_enabled)</div><div class='ctx'> 			cfg80211_put_bss(priv-&gt;adapter-&gt;wiphy, bss);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Adhoc mode */</div><div class='ctx'> 		/* If the requested SSID matches current SSID, return */</div><div class='ctx'> 		if (bss_desc &amp;&amp; bss_desc-&gt;ssid.ssid_len &amp;&amp;</div><div class='del'>-		    (!mwifiex_ssid_cmp(&amp;priv-&gt;curr_bss_params.bss_descriptor.</div><div class='del'>-				       ssid, &amp;bss_desc-&gt;ssid))) {</div><div class='add'>+		    cfg80211_ssid_eq(&amp;priv-&gt;curr_bss_params.bss_descriptor.ssid,</div><div class='add'>+				     &amp;bss_desc-&gt;ssid)) {</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		priv-&gt;adhoc_is_link_sensed = false;</div><div class='del'>-</div><div class='ctx'> 		ret = mwifiex_check_network_compatibility(priv, bss_desc);</div><div class='ctx'> </div><div class='ctx'> 		mwifiex_stop_net_dev_queue(priv-&gt;netdev, adapter);</div><div class='hunk'>@@ -515,8 +557,7 @@ int mwifiex_enable_hs(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	if (disconnect_on_suspend) {</div><div class='ctx'> 		for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='ctx'> 			priv = adapter-&gt;priv[i];</div><div class='del'>-			if (priv)</div><div class='del'>-				mwifiex_deauthenticate(priv, NULL);</div><div class='add'>+			mwifiex_deauthenticate(priv, NULL);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -560,7 +601,7 @@ int mwifiex_enable_hs(struct mwifiex_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	if (wait_event_interruptible_timeout(adapter-&gt;hs_activate_wait_q,</div><div class='ctx'> 					     adapter-&gt;hs_activate_wait_q_woken,</div><div class='del'>-					     (10 * HZ)) &lt;= 0) {</div><div class='add'>+					     (5 * HZ)) &lt;= 0) {</div><div class='ctx'> 		mwifiex_dbg(adapter, ERROR,</div><div class='ctx'> 			    "hs_activate_wait_q terminated\n");</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -1325,8 +1366,8 @@ mwifiex_set_gen_ie_helper(struct mwifiex_private *priv, u8 *ie_data_ptr,</div><div class='ctx'> 			  u16 ie_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee_types_vendor_header *pvendor_ie;</div><div class='del'>-	const u8 wpa_oui[] = { 0x00, 0x50, 0xf2, 0x01 };</div><div class='del'>-	const u8 wps_oui[] = { 0x00, 0x50, 0xf2, 0x04 };</div><div class='add'>+	static const u8 wpa_oui[] = { 0x00, 0x50, 0xf2, 0x01 };</div><div class='add'>+	static const u8 wps_oui[] = { 0x00, 0x50, 0xf2, 0x04 };</div><div class='ctx'> 	u16 unparsed_len = ie_len, cur_ie_len;</div><div class='ctx'> </div><div class='ctx'> 	/* If the passed length is zero, reset the buffer */</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/sta_rx.c b/drivers/net/wireless/marvell/mwifiex/sta_rx.c<br/>index 0d2adf887900..257737137cd7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/sta_rx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/sta_rx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/sta_rx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/sta_rx.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: station RX data handling</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;uapi/linux/ipv6.h&gt;</div><div class='hunk'>@@ -98,12 +86,23 @@ int mwifiex_process_rx_packet(struct mwifiex_private *priv,</div><div class='ctx'> 	rx_pkt_len = le16_to_cpu(local_rx_pd-&gt;rx_pkt_length);</div><div class='ctx'> 	rx_pkt_hdr = (void *)local_rx_pd + rx_pkt_off;</div><div class='ctx'> </div><div class='del'>-	if ((!memcmp(&amp;rx_pkt_hdr-&gt;rfc1042_hdr, bridge_tunnel_header,</div><div class='del'>-		     sizeof(bridge_tunnel_header))) ||</div><div class='del'>-	    (!memcmp(&amp;rx_pkt_hdr-&gt;rfc1042_hdr, rfc1042_header,</div><div class='del'>-		     sizeof(rfc1042_header)) &amp;&amp;</div><div class='del'>-	     ntohs(rx_pkt_hdr-&gt;rfc1042_hdr.snap_type) != ETH_P_AARP &amp;&amp;</div><div class='del'>-	     ntohs(rx_pkt_hdr-&gt;rfc1042_hdr.snap_type) != ETH_P_IPX)) {</div><div class='add'>+	if (sizeof(rx_pkt_hdr-&gt;eth803_hdr) + sizeof(rfc1042_header) +</div><div class='add'>+	    rx_pkt_off &gt; skb-&gt;len) {</div><div class='add'>+		mwifiex_dbg(priv-&gt;adapter, ERROR,</div><div class='add'>+			    "wrong rx packet offset: len=%d, rx_pkt_off=%d\n",</div><div class='add'>+			    skb-&gt;len, rx_pkt_off);</div><div class='add'>+		priv-&gt;stats.rx_dropped++;</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sizeof(*rx_pkt_hdr) + rx_pkt_off &lt;= skb-&gt;len &amp;&amp;</div><div class='add'>+	    ((!memcmp(&amp;rx_pkt_hdr-&gt;rfc1042_hdr, bridge_tunnel_header,</div><div class='add'>+		      sizeof(bridge_tunnel_header))) ||</div><div class='add'>+	     (!memcmp(&amp;rx_pkt_hdr-&gt;rfc1042_hdr, rfc1042_header,</div><div class='add'>+		      sizeof(rfc1042_header)) &amp;&amp;</div><div class='add'>+	      ntohs(rx_pkt_hdr-&gt;rfc1042_hdr.snap_type) != ETH_P_AARP &amp;&amp;</div><div class='add'>+	      ntohs(rx_pkt_hdr-&gt;rfc1042_hdr.snap_type) != ETH_P_IPX))) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 *  Replace the 803 header and rfc1042 header (llc/snap) with an</div><div class='ctx'> 		 *    EthernetII header, keep the src/dst and snap_type</div><div class='hunk'>@@ -206,7 +205,8 @@ int mwifiex_process_sta_rx_packet(struct mwifiex_private *priv,</div><div class='ctx'> </div><div class='ctx'> 	rx_pkt_hdr = (void *)local_rx_pd + rx_pkt_offset;</div><div class='ctx'> </div><div class='del'>-	if ((rx_pkt_offset + rx_pkt_length) &gt; (u16) skb-&gt;len) {</div><div class='add'>+	if ((rx_pkt_offset + rx_pkt_length) &gt; skb-&gt;len ||</div><div class='add'>+	    sizeof(rx_pkt_hdr-&gt;eth803_hdr) + rx_pkt_offset &gt; skb-&gt;len) {</div><div class='ctx'> 		mwifiex_dbg(adapter, ERROR,</div><div class='ctx'> 			    "wrong rx packet: len=%d, rx_pkt_offset=%d, rx_pkt_length=%d\n",</div><div class='ctx'> 			    skb-&gt;len, rx_pkt_offset, rx_pkt_length);</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/sta_tx.c b/drivers/net/wireless/marvell/mwifiex/sta_tx.c<br/>index 241305377e20..9d0ef04ebe02 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/sta_tx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/sta_tx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/sta_tx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/sta_tx.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: station TX data handling</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "decl.h"</div><div class='hunk'>@@ -41,38 +29,30 @@</div><div class='ctx'>  *      - Priority specific Tx control</div><div class='ctx'>  *      - Flags</div><div class='ctx'>  */</div><div class='del'>-void *mwifiex_process_sta_txpd(struct mwifiex_private *priv,</div><div class='del'>-				struct sk_buff *skb)</div><div class='add'>+void mwifiex_process_sta_txpd(struct mwifiex_private *priv,</div><div class='add'>+			      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_adapter *adapter = priv-&gt;adapter;</div><div class='ctx'> 	struct txpd *local_tx_pd;</div><div class='ctx'> 	struct mwifiex_txinfo *tx_info = MWIFIEX_SKB_TXCB(skb);</div><div class='ctx'> 	unsigned int pad;</div><div class='del'>-	u16 pkt_type, pkt_offset;</div><div class='add'>+	u16 pkt_type, pkt_length, pkt_offset;</div><div class='ctx'> 	int hroom = adapter-&gt;intf_hdr_len;</div><div class='ctx'> </div><div class='del'>-	if (!skb-&gt;len) {</div><div class='del'>-		mwifiex_dbg(adapter, ERROR,</div><div class='del'>-			    "Tx: bad packet length: %d\n", skb-&gt;len);</div><div class='del'>-		tx_info-&gt;status_code = -1;</div><div class='del'>-		return skb-&gt;data;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(skb_headroom(skb) &lt; MWIFIEX_MIN_DATA_HEADER_LEN);</div><div class='del'>-</div><div class='ctx'> 	pkt_type = mwifiex_is_skb_mgmt_frame(skb) ? PKT_TYPE_MGMT : 0;</div><div class='ctx'> </div><div class='del'>-	pad = ((void *)skb-&gt;data - (sizeof(*local_tx_pd) + hroom)-</div><div class='del'>-			 NULL) &amp; (MWIFIEX_DMA_ALIGN_SZ - 1);</div><div class='add'>+	pad = ((uintptr_t)skb-&gt;data - (sizeof(*local_tx_pd) + hroom)) &amp;</div><div class='add'>+	       (MWIFIEX_DMA_ALIGN_SZ - 1);</div><div class='ctx'> 	skb_push(skb, sizeof(*local_tx_pd) + pad);</div><div class='ctx'> </div><div class='ctx'> 	local_tx_pd = (struct txpd *) skb-&gt;data;</div><div class='ctx'> 	memset(local_tx_pd, 0, sizeof(struct txpd));</div><div class='ctx'> 	local_tx_pd-&gt;bss_num = priv-&gt;bss_num;</div><div class='ctx'> 	local_tx_pd-&gt;bss_type = priv-&gt;bss_type;</div><div class='del'>-	local_tx_pd-&gt;tx_pkt_length = cpu_to_le16((u16)(skb-&gt;len -</div><div class='del'>-						       (sizeof(struct txpd) +</div><div class='del'>-							pad)));</div><div class='add'>+	pkt_length = (u16)(skb-&gt;len - (sizeof(struct txpd) + pad));</div><div class='add'>+	if (pkt_type == PKT_TYPE_MGMT)</div><div class='add'>+		pkt_length -= MWIFIEX_MGMT_FRAME_HEADER_SIZE;</div><div class='add'>+	local_tx_pd-&gt;tx_pkt_length = cpu_to_le16(pkt_length);</div><div class='ctx'> </div><div class='ctx'> 	local_tx_pd-&gt;priority = (u8) skb-&gt;priority;</div><div class='ctx'> 	local_tx_pd-&gt;pkt_delay_2ms =</div><div class='hunk'>@@ -121,8 +101,6 @@ void *mwifiex_process_sta_txpd(struct mwifiex_private *priv,</div><div class='ctx'> 	if (!local_tx_pd-&gt;tx_control)</div><div class='ctx'> 		/* TxCtrl set by user or default */</div><div class='ctx'> 		local_tx_pd-&gt;tx_control = cpu_to_le32(priv-&gt;pkt_tx_ctrl);</div><div class='del'>-</div><div class='del'>-	return skb-&gt;data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/tdls.c b/drivers/net/wireless/marvell/mwifiex/tdls.c<br/>index 97bb87c3676b..77a9a6de636d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/tdls.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/tdls.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/tdls.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/tdls.c</a></div><div class='hunk'>@@ -735,6 +735,7 @@ mwifiex_construct_tdls_action_frame(struct mwifiex_private *priv,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u16 capab;</div><div class='ctx'> 	struct ieee80211_ht_cap *ht_cap;</div><div class='add'>+	unsigned int extra;</div><div class='ctx'> 	u8 radio, *pos;</div><div class='ctx'> </div><div class='ctx'> 	capab = priv-&gt;curr_bss_params.bss_descriptor.cap_info_bitmap;</div><div class='hunk'>@@ -753,7 +754,10 @@ mwifiex_construct_tdls_action_frame(struct mwifiex_private *priv,</div><div class='ctx'> </div><div class='ctx'> 	switch (action_code) {</div><div class='ctx'> 	case WLAN_PUB_ACTION_TDLS_DISCOVER_RES:</div><div class='del'>-		skb_put(skb, sizeof(mgmt-&gt;u.action.u.tdls_discover_resp) + 1);</div><div class='add'>+		/* See the layout of 'struct ieee80211_mgmt'. */</div><div class='add'>+		extra = sizeof(mgmt-&gt;u.action.u.tdls_discover_resp) +</div><div class='add'>+			sizeof(mgmt-&gt;u.action.category);</div><div class='add'>+		skb_put(skb, extra);</div><div class='ctx'> 		mgmt-&gt;u.action.category = WLAN_CATEGORY_PUBLIC;</div><div class='ctx'> 		mgmt-&gt;u.action.u.tdls_discover_resp.action_code =</div><div class='ctx'> 					      WLAN_PUB_ACTION_TDLS_DISCOVER_RES;</div><div class='hunk'>@@ -762,8 +766,7 @@ mwifiex_construct_tdls_action_frame(struct mwifiex_private *priv,</div><div class='ctx'> 		mgmt-&gt;u.action.u.tdls_discover_resp.capability =</div><div class='ctx'> 							     cpu_to_le16(capab);</div><div class='ctx'> 		/* move back for addr4 */</div><div class='del'>-		memmove(pos + ETH_ALEN, &amp;mgmt-&gt;u.action.category,</div><div class='del'>-			sizeof(mgmt-&gt;u.action.u.tdls_discover_resp));</div><div class='add'>+		memmove(pos + ETH_ALEN, &amp;mgmt-&gt;u.action, extra);</div><div class='ctx'> 		/* init address 4 */</div><div class='ctx'> 		eth_broadcast_addr(pos);</div><div class='ctx'> </div><div class='hunk'>@@ -1303,7 +1306,6 @@ int mwifiex_tdls_check_tx(struct mwifiex_private *priv, struct sk_buff *skb)</div><div class='ctx'> 							   peer-&gt;mac_addr,</div><div class='ctx'> 							   NL80211_TDLS_SETUP,</div><div class='ctx'> 							   0, GFP_ATOMIC);</div><div class='del'>-				peer-&gt;do_setup = false;</div><div class='ctx'> 				priv-&gt;check_tdls_tx = false;</div><div class='ctx'> 			} else if (peer-&gt;failure_count &lt;</div><div class='ctx'> 				   MWIFIEX_TDLS_MAX_FAIL_COUNT &amp;&amp;</div><div class='hunk'>@@ -1413,7 +1415,8 @@ void mwifiex_auto_tdls_update_peer_signal(struct mwifiex_private *priv,</div><div class='ctx'> </div><div class='ctx'> void mwifiex_check_auto_tdls(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct mwifiex_private *priv = from_timer(priv, t, auto_tdls_timer);</div><div class='add'>+	struct mwifiex_private *priv = timer_container_of(priv, t,</div><div class='add'>+							  auto_tdls_timer);</div><div class='ctx'> 	struct mwifiex_auto_tdls_peer *tdls_peer;</div><div class='ctx'> 	u16 reason = WLAN_REASON_TDLS_TEARDOWN_UNSPECIFIED;</div><div class='ctx'> </div><div class='hunk'>@@ -1436,8 +1439,8 @@ void mwifiex_check_auto_tdls(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;priv-&gt;auto_tdls_lock);</div><div class='ctx'> 	list_for_each_entry(tdls_peer, &amp;priv-&gt;auto_tdls_list, list) {</div><div class='del'>-		if ((jiffies - tdls_peer-&gt;rssi_jiffies) &gt;</div><div class='del'>-		    (MWIFIEX_AUTO_TDLS_IDLE_TIME * HZ)) {</div><div class='add'>+		if (time_after(jiffies, tdls_peer-&gt;rssi_jiffies +</div><div class='add'>+					 MWIFIEX_AUTO_TDLS_IDLE_TIME * HZ)) {</div><div class='ctx'> 			tdls_peer-&gt;rssi = 0;</div><div class='ctx'> 			tdls_peer-&gt;do_discover = true;</div><div class='ctx'> 			priv-&gt;check_tdls_tx = true;</div><div class='hunk'>@@ -1462,7 +1465,6 @@ void mwifiex_check_auto_tdls(struct timer_list *t)</div><div class='ctx'> 			   tdls_peer-&gt;failure_count &lt;</div><div class='ctx'> 			   MWIFIEX_TDLS_MAX_FAIL_COUNT) {</div><div class='ctx'> 				priv-&gt;check_tdls_tx = true;</div><div class='del'>-				tdls_peer-&gt;do_setup = true;</div><div class='ctx'> 				mwifiex_dbg(priv-&gt;adapter, INFO,</div><div class='ctx'> 					    "check TDLS with peer=%pM\t"</div><div class='ctx'> 					    "rssi=%d\n", tdls_peer-&gt;mac_addr,</div><div class='hunk'>@@ -1489,7 +1491,7 @@ void mwifiex_clean_auto_tdls(struct mwifiex_private *priv)</div><div class='ctx'> 	    priv-&gt;adapter-&gt;auto_tdls &amp;&amp;</div><div class='ctx'> 	    priv-&gt;bss_type == MWIFIEX_BSS_TYPE_STA) {</div><div class='ctx'> 		priv-&gt;auto_tdls_timer_active = false;</div><div class='del'>-		del_timer(&amp;priv-&gt;auto_tdls_timer);</div><div class='add'>+		timer_delete(&amp;priv-&gt;auto_tdls_timer);</div><div class='ctx'> 		mwifiex_flush_auto_tdls_list(priv);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/txrx.c b/drivers/net/wireless/marvell/mwifiex/txrx.c<br/>index a8479b879382..f44e22f24511 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/txrx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/txrx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/txrx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/txrx.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: generic TX/RX data handling</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "decl.h"</div><div class='hunk'>@@ -36,8 +24,7 @@</div><div class='ctx'> int mwifiex_handle_rx_packet(struct mwifiex_adapter *adapter,</div><div class='ctx'> 			     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct mwifiex_private *priv =</div><div class='del'>-		mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);</div><div class='add'>+	struct mwifiex_private *priv;</div><div class='ctx'> 	struct rxpd *local_rx_pd;</div><div class='ctx'> 	struct mwifiex_rxinfo *rx_info = MWIFIEX_SKB_RXCB(skb);</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -84,13 +71,18 @@ EXPORT_SYMBOL_GPL(mwifiex_handle_rx_packet);</div><div class='ctx'> int mwifiex_process_tx(struct mwifiex_private *priv, struct sk_buff *skb,</div><div class='ctx'> 		       struct mwifiex_tx_param *tx_param)</div><div class='ctx'> {</div><div class='del'>-	int hroom, ret = -1;</div><div class='add'>+	int hroom, ret;</div><div class='ctx'> 	struct mwifiex_adapter *adapter = priv-&gt;adapter;</div><div class='del'>-	u8 *head_ptr;</div><div class='ctx'> 	struct txpd *local_tx_pd = NULL;</div><div class='ctx'> 	struct mwifiex_sta_node *dest_node;</div><div class='ctx'> 	struct ethhdr *hdr = (void *)skb-&gt;data;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(!skb-&gt;len ||</div><div class='add'>+		     skb_headroom(skb) &lt; MWIFIEX_MIN_DATA_HEADER_LEN)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	hroom = adapter-&gt;intf_hdr_len;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;bss_role == MWIFIEX_BSS_ROLE_UAP) {</div><div class='hunk'>@@ -100,33 +92,31 @@ int mwifiex_process_tx(struct mwifiex_private *priv, struct sk_buff *skb,</div><div class='ctx'> 			dest_node-&gt;stats.tx_packets++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		head_ptr = mwifiex_process_uap_txpd(priv, skb);</div><div class='add'>+		mwifiex_process_uap_txpd(priv, skb);</div><div class='ctx'> 	} else {</div><div class='del'>-		head_ptr = mwifiex_process_sta_txpd(priv, skb);</div><div class='add'>+		mwifiex_process_sta_txpd(priv, skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((adapter-&gt;data_sent || adapter-&gt;tx_lock_flag) &amp;&amp; head_ptr) {</div><div class='add'>+	if (adapter-&gt;data_sent || adapter-&gt;tx_lock_flag) {</div><div class='ctx'> 		skb_queue_tail(&amp;adapter-&gt;tx_data_q, skb);</div><div class='ctx'> 		atomic_inc(&amp;adapter-&gt;tx_queued);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (head_ptr) {</div><div class='del'>-		if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA)</div><div class='del'>-			local_tx_pd = (struct txpd *)(head_ptr + hroom);</div><div class='del'>-		if (adapter-&gt;iface_type == MWIFIEX_USB) {</div><div class='del'>-			ret = adapter-&gt;if_ops.host_to_card(adapter,</div><div class='del'>-							   priv-&gt;usb_port,</div><div class='del'>-							   skb, tx_param);</div><div class='del'>-		} else {</div><div class='del'>-			ret = adapter-&gt;if_ops.host_to_card(adapter,</div><div class='del'>-							   MWIFIEX_TYPE_DATA,</div><div class='del'>-							   skb, tx_param);</div><div class='del'>-		}</div><div class='add'>+	if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA)</div><div class='add'>+		local_tx_pd = (struct txpd *)(skb-&gt;data + hroom);</div><div class='add'>+	if (adapter-&gt;iface_type == MWIFIEX_USB) {</div><div class='add'>+		ret = adapter-&gt;if_ops.host_to_card(adapter,</div><div class='add'>+						   priv-&gt;usb_port,</div><div class='add'>+						   skb, tx_param);</div><div class='add'>+	} else {</div><div class='add'>+		ret = adapter-&gt;if_ops.host_to_card(adapter,</div><div class='add'>+						   MWIFIEX_TYPE_DATA,</div><div class='add'>+						   skb, tx_param);</div><div class='ctx'> 	}</div><div class='ctx'> 	mwifiex_dbg_dump(adapter, DAT_D, "tx pkt:", skb-&gt;data,</div><div class='ctx'> 			 min_t(size_t, skb-&gt;len, DEBUG_DUMP_DATA_MAX_LEN));</div><div class='del'>-</div><div class='add'>+out:</div><div class='ctx'> 	switch (ret) {</div><div class='ctx'> 	case -ENOSR:</div><div class='ctx'> 		mwifiex_dbg(adapter, DATA, "data: -ENOSR is returned\n");</div><div class='hunk'>@@ -149,6 +139,11 @@ int mwifiex_process_tx(struct mwifiex_private *priv, struct sk_buff *skb,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case -EINPROGRESS:</div><div class='ctx'> 		break;</div><div class='add'>+	case -EINVAL:</div><div class='add'>+		mwifiex_dbg(adapter, ERROR,</div><div class='add'>+			    "malformed skb (length: %u, headroom: %u)\n",</div><div class='add'>+			    skb-&gt;len, skb_headroom(skb));</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		mwifiex_write_data_complete(adapter, skb, 0, ret);</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c<br/>index 18e89777b784..1c0ceac6b27f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/uap_cmd.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/uap_cmd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/uap_cmd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/uap_cmd.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: AP specific command handling</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='hunk'>@@ -58,31 +46,26 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv,</div><div class='ctx'> </div><div class='ctx'> 	bss_config-&gt;key_mgmt_operation |= KEY_MGMT_ON_HOST;</div><div class='ctx'> </div><div class='add'>+	bss_config-&gt;protocol = 0;</div><div class='add'>+	if (params-&gt;crypto.wpa_versions &amp; NL80211_WPA_VERSION_1)</div><div class='add'>+		bss_config-&gt;protocol |= PROTOCOL_WPA;</div><div class='add'>+	if (params-&gt;crypto.wpa_versions &amp; NL80211_WPA_VERSION_2)</div><div class='add'>+		bss_config-&gt;protocol |= PROTOCOL_WPA2;</div><div class='add'>+</div><div class='add'>+	bss_config-&gt;key_mgmt = 0;</div><div class='ctx'> 	for (i = 0; i &lt; params-&gt;crypto.n_akm_suites; i++) {</div><div class='ctx'> 		switch (params-&gt;crypto.akm_suites[i]) {</div><div class='ctx'> 		case WLAN_AKM_SUITE_8021X:</div><div class='del'>-			if (params-&gt;crypto.wpa_versions &amp;</div><div class='del'>-			    NL80211_WPA_VERSION_1) {</div><div class='del'>-				bss_config-&gt;protocol = PROTOCOL_WPA;</div><div class='del'>-				bss_config-&gt;key_mgmt = KEY_MGMT_EAP;</div><div class='del'>-			}</div><div class='del'>-			if (params-&gt;crypto.wpa_versions &amp;</div><div class='del'>-			    NL80211_WPA_VERSION_2) {</div><div class='del'>-				bss_config-&gt;protocol |= PROTOCOL_WPA2;</div><div class='del'>-				bss_config-&gt;key_mgmt = KEY_MGMT_EAP;</div><div class='del'>-			}</div><div class='add'>+			bss_config-&gt;key_mgmt |= KEY_MGMT_EAP;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case WLAN_AKM_SUITE_PSK:</div><div class='del'>-			if (params-&gt;crypto.wpa_versions &amp;</div><div class='del'>-			    NL80211_WPA_VERSION_1) {</div><div class='del'>-				bss_config-&gt;protocol = PROTOCOL_WPA;</div><div class='del'>-				bss_config-&gt;key_mgmt = KEY_MGMT_PSK;</div><div class='del'>-			}</div><div class='del'>-			if (params-&gt;crypto.wpa_versions &amp;</div><div class='del'>-			    NL80211_WPA_VERSION_2) {</div><div class='del'>-				bss_config-&gt;protocol |= PROTOCOL_WPA2;</div><div class='del'>-				bss_config-&gt;key_mgmt = KEY_MGMT_PSK;</div><div class='del'>-			}</div><div class='add'>+			bss_config-&gt;key_mgmt |= KEY_MGMT_PSK;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_AKM_SUITE_PSK_SHA256:</div><div class='add'>+			bss_config-&gt;key_mgmt |= KEY_MGMT_PSK_SHA256;</div><div class='add'>+			break;</div><div class='add'>+		case WLAN_AKM_SUITE_SAE:</div><div class='add'>+			bss_config-&gt;key_mgmt |= KEY_MGMT_SAE;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -389,7 +372,7 @@ mwifiex_set_wmm_params(struct mwifiex_private *priv,</div><div class='ctx'> {</div><div class='ctx'> 	const u8 *vendor_ie;</div><div class='ctx'> 	const u8 *wmm_ie;</div><div class='del'>-	u8 wmm_oui[] = {0x00, 0x50, 0xf2, 0x02};</div><div class='add'>+	static const u8 wmm_oui[] = {0x00, 0x50, 0xf2, 0x02};</div><div class='ctx'> </div><div class='ctx'> 	vendor_ie = cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT,</div><div class='ctx'> 					    WLAN_OUI_TYPE_MICROSOFT_WMM,</div><div class='hunk'>@@ -480,6 +463,7 @@ void mwifiex_config_uap_11d(struct mwifiex_private *priv,</div><div class='ctx'> static int</div><div class='ctx'> mwifiex_uap_bss_param_prepare(u8 *tlv, void *cmd_buf, u16 *param_size)</div><div class='ctx'> {</div><div class='add'>+	struct host_cmd_tlv_mac_addr *mac_tlv;</div><div class='ctx'> 	struct host_cmd_tlv_dtim_period *dtim_period;</div><div class='ctx'> 	struct host_cmd_tlv_beacon_period *beacon_period;</div><div class='ctx'> 	struct host_cmd_tlv_ssid *ssid;</div><div class='hunk'>@@ -499,6 +483,13 @@ mwifiex_uap_bss_param_prepare(u8 *tlv, void *cmd_buf, u16 *param_size)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u16 cmd_size = *param_size;</div><div class='ctx'> </div><div class='add'>+	mac_tlv = (struct host_cmd_tlv_mac_addr *)tlv;</div><div class='add'>+	mac_tlv-&gt;header.type = cpu_to_le16(TLV_TYPE_UAP_MAC_ADDRESS);</div><div class='add'>+	mac_tlv-&gt;header.len = cpu_to_le16(ETH_ALEN);</div><div class='add'>+	memcpy(mac_tlv-&gt;mac_addr, bss_cfg-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+	cmd_size += sizeof(struct host_cmd_tlv_mac_addr);</div><div class='add'>+	tlv += sizeof(struct host_cmd_tlv_mac_addr);</div><div class='add'>+</div><div class='ctx'> 	if (bss_cfg-&gt;ssid.ssid_len) {</div><div class='ctx'> 		ssid = (struct host_cmd_tlv_ssid *)tlv;</div><div class='ctx'> 		ssid-&gt;header.type = cpu_to_le16(TLV_TYPE_UAP_SSID);</div><div class='hunk'>@@ -755,6 +746,28 @@ mwifiex_cmd_uap_sys_config(struct host_cmd_ds_command *cmd, u16 cmd_action,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* This function prepares AP start up command with or without host MLME</div><div class='add'>+ */</div><div class='add'>+static void mwifiex_cmd_uap_bss_start(struct mwifiex_private *priv,</div><div class='add'>+				     struct host_cmd_ds_command *cmd)</div><div class='add'>+{</div><div class='add'>+	struct mwifiex_ie_types_host_mlme *tlv;</div><div class='add'>+	int size;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;command = cpu_to_le16(HostCmd_CMD_UAP_BSS_START);</div><div class='add'>+	size = S_DS_GEN;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;adapter-&gt;host_mlme_enabled) {</div><div class='add'>+		tlv = (struct mwifiex_ie_types_host_mlme *)((u8 *)cmd + size);</div><div class='add'>+		tlv-&gt;header.type = cpu_to_le16(TLV_TYPE_HOST_MLME);</div><div class='add'>+		tlv-&gt;header.len = cpu_to_le16(sizeof(tlv-&gt;host_mlme));</div><div class='add'>+		tlv-&gt;host_mlme = 1;</div><div class='add'>+		size += sizeof(struct mwifiex_ie_types_host_mlme);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd-&gt;size = cpu_to_le16(size);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* This function prepares AP specific deauth command with mac supplied in</div><div class='ctx'>  * function parameter.</div><div class='ctx'>  */</div><div class='hunk'>@@ -772,6 +785,144 @@ static int mwifiex_cmd_uap_sta_deauth(struct mwifiex_private *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* This function prepares AP specific add station command.</div><div class='add'>+ */</div><div class='add'>+static int mwifiex_cmd_uap_add_station(struct mwifiex_private *priv,</div><div class='add'>+				       struct host_cmd_ds_command *cmd,</div><div class='add'>+				       u16 cmd_action, void *data_buf)</div><div class='add'>+{</div><div class='add'>+	struct host_cmd_ds_add_station *new_sta = &amp;cmd-&gt;params.sta_info;</div><div class='add'>+	struct mwifiex_sta_info *add_sta = (struct mwifiex_sta_info *)data_buf;</div><div class='add'>+	struct station_parameters *params = add_sta-&gt;params;</div><div class='add'>+	struct mwifiex_sta_node *sta_ptr;</div><div class='add'>+	u8 *pos;</div><div class='add'>+	u8 qos_capa;</div><div class='add'>+	u16 header_len = sizeof(struct mwifiex_ie_types_header);</div><div class='add'>+	u16 tlv_len;</div><div class='add'>+	int size;</div><div class='add'>+	struct mwifiex_ie_types_data *tlv;</div><div class='add'>+	struct mwifiex_ie_types_sta_flag *sta_flag;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;command = cpu_to_le16(HostCmd_CMD_ADD_NEW_STATION);</div><div class='add'>+	new_sta-&gt;action = cpu_to_le16(cmd_action);</div><div class='add'>+	size = sizeof(struct host_cmd_ds_add_station) + S_DS_GEN;</div><div class='add'>+</div><div class='add'>+	if (cmd_action == HostCmd_ACT_ADD_STA)</div><div class='add'>+		sta_ptr = mwifiex_add_sta_entry(priv, add_sta-&gt;peer_mac);</div><div class='add'>+	else</div><div class='add'>+		sta_ptr = mwifiex_get_sta_entry(priv, add_sta-&gt;peer_mac);</div><div class='add'>+</div><div class='add'>+	if (!sta_ptr)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	memcpy(new_sta-&gt;peer_mac, add_sta-&gt;peer_mac, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	if (cmd_action == HostCmd_ACT_REMOVE_STA) {</div><div class='add'>+		cmd-&gt;size = cpu_to_le16(size);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	new_sta-&gt;aid = cpu_to_le16(params-&gt;aid);</div><div class='add'>+	new_sta-&gt;listen_interval = cpu_to_le32(params-&gt;listen_interval);</div><div class='add'>+	new_sta-&gt;cap_info = cpu_to_le16(params-&gt;capability);</div><div class='add'>+</div><div class='add'>+	pos = new_sta-&gt;tlv;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;sta_flags_set &amp; NL80211_STA_FLAG_WME)</div><div class='add'>+		sta_ptr-&gt;is_wmm_enabled = 1;</div><div class='add'>+	sta_flag = (struct mwifiex_ie_types_sta_flag *)pos;</div><div class='add'>+	sta_flag-&gt;header.type = cpu_to_le16(TLV_TYPE_UAP_STA_FLAGS);</div><div class='add'>+	sta_flag-&gt;header.len = cpu_to_le16(sizeof(__le32));</div><div class='add'>+	sta_flag-&gt;sta_flags = cpu_to_le32(params-&gt;sta_flags_set);</div><div class='add'>+	pos += sizeof(struct mwifiex_ie_types_sta_flag);</div><div class='add'>+	size += sizeof(struct mwifiex_ie_types_sta_flag);</div><div class='add'>+</div><div class='add'>+	if (params-&gt;ext_capab_len) {</div><div class='add'>+		tlv = (struct mwifiex_ie_types_data *)pos;</div><div class='add'>+		tlv-&gt;header.type = cpu_to_le16(WLAN_EID_EXT_CAPABILITY);</div><div class='add'>+		tlv_len = params-&gt;ext_capab_len;</div><div class='add'>+		tlv-&gt;header.len = cpu_to_le16(tlv_len);</div><div class='add'>+		memcpy(tlv-&gt;data, params-&gt;ext_capab, tlv_len);</div><div class='add'>+		pos += (header_len + tlv_len);</div><div class='add'>+		size += (header_len + tlv_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (params-&gt;link_sta_params.supported_rates_len) {</div><div class='add'>+		tlv = (struct mwifiex_ie_types_data *)pos;</div><div class='add'>+		tlv-&gt;header.type = cpu_to_le16(WLAN_EID_SUPP_RATES);</div><div class='add'>+		tlv_len = params-&gt;link_sta_params.supported_rates_len;</div><div class='add'>+		tlv-&gt;header.len = cpu_to_le16(tlv_len);</div><div class='add'>+		memcpy(tlv-&gt;data,</div><div class='add'>+		       params-&gt;link_sta_params.supported_rates, tlv_len);</div><div class='add'>+		pos += (header_len + tlv_len);</div><div class='add'>+		size += (header_len + tlv_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (params-&gt;uapsd_queues || params-&gt;max_sp) {</div><div class='add'>+		tlv = (struct mwifiex_ie_types_data *)pos;</div><div class='add'>+		tlv-&gt;header.type = cpu_to_le16(WLAN_EID_QOS_CAPA);</div><div class='add'>+		tlv_len = sizeof(qos_capa);</div><div class='add'>+		tlv-&gt;header.len = cpu_to_le16(tlv_len);</div><div class='add'>+		qos_capa = params-&gt;uapsd_queues | (params-&gt;max_sp &lt;&lt; 5);</div><div class='add'>+		memcpy(tlv-&gt;data, &amp;qos_capa, tlv_len);</div><div class='add'>+		pos += (header_len + tlv_len);</div><div class='add'>+		size += (header_len + tlv_len);</div><div class='add'>+		sta_ptr-&gt;is_wmm_enabled = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (params-&gt;link_sta_params.ht_capa) {</div><div class='add'>+		tlv = (struct mwifiex_ie_types_data *)pos;</div><div class='add'>+		tlv-&gt;header.type = cpu_to_le16(WLAN_EID_HT_CAPABILITY);</div><div class='add'>+		tlv_len = sizeof(struct ieee80211_ht_cap);</div><div class='add'>+		tlv-&gt;header.len = cpu_to_le16(tlv_len);</div><div class='add'>+		memcpy(tlv-&gt;data, params-&gt;link_sta_params.ht_capa, tlv_len);</div><div class='add'>+		pos += (header_len + tlv_len);</div><div class='add'>+		size += (header_len + tlv_len);</div><div class='add'>+		sta_ptr-&gt;is_11n_enabled = 1;</div><div class='add'>+		sta_ptr-&gt;max_amsdu =</div><div class='add'>+			le16_to_cpu(params-&gt;link_sta_params.ht_capa-&gt;cap_info) &amp;</div><div class='add'>+			IEEE80211_HT_CAP_MAX_AMSDU ?</div><div class='add'>+			MWIFIEX_TX_DATA_BUF_SIZE_8K :</div><div class='add'>+			MWIFIEX_TX_DATA_BUF_SIZE_4K;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (params-&gt;link_sta_params.vht_capa) {</div><div class='add'>+		tlv = (struct mwifiex_ie_types_data *)pos;</div><div class='add'>+		tlv-&gt;header.type = cpu_to_le16(WLAN_EID_VHT_CAPABILITY);</div><div class='add'>+		tlv_len = sizeof(struct ieee80211_vht_cap);</div><div class='add'>+		tlv-&gt;header.len = cpu_to_le16(tlv_len);</div><div class='add'>+		memcpy(tlv-&gt;data, params-&gt;link_sta_params.vht_capa, tlv_len);</div><div class='add'>+		pos += (header_len + tlv_len);</div><div class='add'>+		size += (header_len + tlv_len);</div><div class='add'>+		sta_ptr-&gt;is_11ac_enabled = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (params-&gt;link_sta_params.opmode_notif_used) {</div><div class='add'>+		tlv = (struct mwifiex_ie_types_data *)pos;</div><div class='add'>+		tlv-&gt;header.type = cpu_to_le16(WLAN_EID_OPMODE_NOTIF);</div><div class='add'>+		tlv_len = sizeof(u8);</div><div class='add'>+		tlv-&gt;header.len = cpu_to_le16(tlv_len);</div><div class='add'>+		memcpy(tlv-&gt;data, &amp;params-&gt;link_sta_params.opmode_notif,</div><div class='add'>+		       tlv_len);</div><div class='add'>+		pos += (header_len + tlv_len);</div><div class='add'>+		size += (header_len + tlv_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_NUM_TID; i++) {</div><div class='add'>+		if (sta_ptr-&gt;is_11n_enabled)</div><div class='add'>+			sta_ptr-&gt;ampdu_sta[i] =</div><div class='add'>+				      priv-&gt;aggr_prio_tbl[i].ampdu_user;</div><div class='add'>+		else</div><div class='add'>+			sta_ptr-&gt;ampdu_sta[i] = BA_STREAM_NOT_ALLOWED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(sta_ptr-&gt;rx_seq, 0xff, sizeof(sta_ptr-&gt;rx_seq));</div><div class='add'>+	cmd-&gt;size = cpu_to_le16(size);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* This function prepares the AP specific commands before sending them</div><div class='ctx'>  * to the firmware.</div><div class='ctx'>  * This is a generic function which calls specific command preparation</div><div class='hunk'>@@ -789,6 +940,8 @@ int mwifiex_uap_prepare_cmd(struct mwifiex_private *priv, u16 cmd_no,</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HostCmd_CMD_UAP_BSS_START:</div><div class='add'>+		mwifiex_cmd_uap_bss_start(priv, cmd);</div><div class='add'>+		break;</div><div class='ctx'> 	case HostCmd_CMD_UAP_BSS_STOP:</div><div class='ctx'> 	case HOST_CMD_APCMD_SYS_RESET:</div><div class='ctx'> 	case HOST_CMD_APCMD_STA_LIST:</div><div class='hunk'>@@ -804,6 +957,11 @@ int mwifiex_uap_prepare_cmd(struct mwifiex_private *priv, u16 cmd_no,</div><div class='ctx'> 							  data_buf))</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		break;</div><div class='add'>+	case HostCmd_CMD_ADD_NEW_STATION:</div><div class='add'>+		if (mwifiex_cmd_uap_add_station(priv, cmd, cmd_action,</div><div class='add'>+						data_buf))</div><div class='add'>+			return -1;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		mwifiex_dbg(priv-&gt;adapter, ERROR,</div><div class='ctx'> 			    "PREP_CMD: unknown cmd %#x\n", cmd_no);</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/uap_event.c b/drivers/net/wireless/marvell/mwifiex/uap_event.c<br/>index 9121447e2701..245cb99a3daa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/uap_event.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/uap_event.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/uap_event.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/uap_event.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: AP event handling</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "decl.h"</div><div class='hunk'>@@ -197,8 +185,7 @@ int mwifiex_process_uap_event(struct mwifiex_private *priv)</div><div class='ctx'> 		mwifiex_dbg(adapter, EVENT,</div><div class='ctx'> 			    "AP EVENT: event id: %#x\n", eventcause);</div><div class='ctx'> 		priv-&gt;port_open = false;</div><div class='del'>-		memcpy(priv-&gt;netdev-&gt;dev_addr, adapter-&gt;event_body + 2,</div><div class='del'>-		       ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(priv-&gt;netdev, adapter-&gt;event_body + 2);</div><div class='ctx'> 		if (priv-&gt;hist_data)</div><div class='ctx'> 			mwifiex_hist_data_reset(priv);</div><div class='ctx'> 		mwifiex_check_uap_capabilities(priv, adapter-&gt;event_skb);</div><div class='hunk'>@@ -338,19 +325,3 @@ int mwifiex_process_uap_event(struct mwifiex_private *priv)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-/* This function deletes station entry from associated station list.</div><div class='del'>- * Also if both AP and STA are 11n enabled, RxReorder tables and TxBA stream</div><div class='del'>- * tables created for this station are deleted.</div><div class='del'>- */</div><div class='del'>-void mwifiex_uap_del_sta_data(struct mwifiex_private *priv,</div><div class='del'>-			      struct mwifiex_sta_node *node)</div><div class='del'>-{</div><div class='del'>-	if (priv-&gt;ap_11n_enabled &amp;&amp; node-&gt;is_11n_enabled) {</div><div class='del'>-		mwifiex_11n_del_rx_reorder_tbl_by_ta(priv, node-&gt;mac_addr);</div><div class='del'>-		mwifiex_del_tx_ba_stream_tbl_by_ra(priv, node-&gt;mac_addr);</div><div class='del'>-	}</div><div class='del'>-	mwifiex_del_sta_entry(priv, node-&gt;mac_addr);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/uap_txrx.c b/drivers/net/wireless/marvell/mwifiex/uap_txrx.c<br/>index 9bbdb8dfce62..318bd4ed8399 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/uap_txrx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/uap_txrx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/uap_txrx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/uap_txrx.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: AP TX and RX data handling</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "decl.h"</div><div class='hunk'>@@ -115,6 +103,16 @@ static void mwifiex_uap_queue_bridged_pkt(struct mwifiex_private *priv,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (sizeof(*rx_pkt_hdr) +</div><div class='add'>+	    le16_to_cpu(uap_rx_pd-&gt;rx_pkt_offset) &gt; skb-&gt;len) {</div><div class='add'>+		mwifiex_dbg(adapter, ERROR,</div><div class='add'>+			    "wrong rx packet offset: len=%d,rx_pkt_offset=%d\n",</div><div class='add'>+			    skb-&gt;len, le16_to_cpu(uap_rx_pd-&gt;rx_pkt_offset));</div><div class='add'>+		priv-&gt;stats.rx_dropped++;</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if ((!memcmp(&amp;rx_pkt_hdr-&gt;rfc1042_hdr, bridge_tunnel_header,</div><div class='ctx'> 		     sizeof(bridge_tunnel_header))) ||</div><div class='ctx'> 	    (!memcmp(&amp;rx_pkt_hdr-&gt;rfc1042_hdr, rfc1042_header,</div><div class='hunk'>@@ -255,7 +253,15 @@ int mwifiex_handle_uap_rx_forward(struct mwifiex_private *priv,</div><div class='ctx'> </div><div class='ctx'> 	if (is_multicast_ether_addr(ra)) {</div><div class='ctx'> 		skb_uap = skb_copy(skb, GFP_ATOMIC);</div><div class='del'>-		mwifiex_uap_queue_bridged_pkt(priv, skb_uap);</div><div class='add'>+		if (likely(skb_uap)) {</div><div class='add'>+			mwifiex_uap_queue_bridged_pkt(priv, skb_uap);</div><div class='add'>+		} else {</div><div class='add'>+			mwifiex_dbg(adapter, ERROR,</div><div class='add'>+				    "failed to copy skb for uAP\n");</div><div class='add'>+			priv-&gt;stats.rx_dropped++;</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (mwifiex_get_sta_entry(priv, ra)) {</div><div class='ctx'> 			/* Requeue Intra-BSS packet */</div><div class='hunk'>@@ -350,7 +356,7 @@ int mwifiex_uap_recv_packet(struct mwifiex_private *priv,</div><div class='ctx'> 		skb-&gt;truesize += (skb-&gt;len - MWIFIEX_RX_DATA_BUF_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* Forward multicast/broadcast packet to upper layer*/</div><div class='del'>-	netif_rx_any_context(skb);</div><div class='add'>+	netif_rx(skb);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -379,6 +385,16 @@ int mwifiex_process_uap_rx_packet(struct mwifiex_private *priv,</div><div class='ctx'> 	rx_pkt_type = le16_to_cpu(uap_rx_pd-&gt;rx_pkt_type);</div><div class='ctx'> 	rx_pkt_hdr = (void *)uap_rx_pd + le16_to_cpu(uap_rx_pd-&gt;rx_pkt_offset);</div><div class='ctx'> </div><div class='add'>+	if (le16_to_cpu(uap_rx_pd-&gt;rx_pkt_offset) +</div><div class='add'>+	    sizeof(rx_pkt_hdr-&gt;eth803_hdr) &gt; skb-&gt;len) {</div><div class='add'>+		mwifiex_dbg(adapter, ERROR,</div><div class='add'>+			    "wrong rx packet for struct ethhdr: len=%d, offset=%d\n",</div><div class='add'>+			    skb-&gt;len, le16_to_cpu(uap_rx_pd-&gt;rx_pkt_offset));</div><div class='add'>+		priv-&gt;stats.rx_dropped++;</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ether_addr_copy(ta, rx_pkt_hdr-&gt;eth803_hdr.h_source);</div><div class='ctx'> </div><div class='ctx'> 	if ((le16_to_cpu(uap_rx_pd-&gt;rx_pkt_offset) +</div><div class='hunk'>@@ -454,8 +470,8 @@ int mwifiex_process_uap_rx_packet(struct mwifiex_private *priv,</div><div class='ctx'>  *      - Priority specific Tx control</div><div class='ctx'>  *      - Flags</div><div class='ctx'>  */</div><div class='del'>-void *mwifiex_process_uap_txpd(struct mwifiex_private *priv,</div><div class='del'>-			       struct sk_buff *skb)</div><div class='add'>+void mwifiex_process_uap_txpd(struct mwifiex_private *priv,</div><div class='add'>+			      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_adapter *adapter = priv-&gt;adapter;</div><div class='ctx'> 	struct uap_txpd *txpd;</div><div class='hunk'>@@ -464,19 +480,10 @@ void *mwifiex_process_uap_txpd(struct mwifiex_private *priv,</div><div class='ctx'> 	u16 pkt_type, pkt_offset;</div><div class='ctx'> 	int hroom = adapter-&gt;intf_hdr_len;</div><div class='ctx'> </div><div class='del'>-	if (!skb-&gt;len) {</div><div class='del'>-		mwifiex_dbg(adapter, ERROR,</div><div class='del'>-			    "Tx: bad packet length: %d\n", skb-&gt;len);</div><div class='del'>-		tx_info-&gt;status_code = -1;</div><div class='del'>-		return skb-&gt;data;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(skb_headroom(skb) &lt; MWIFIEX_MIN_DATA_HEADER_LEN);</div><div class='del'>-</div><div class='ctx'> 	pkt_type = mwifiex_is_skb_mgmt_frame(skb) ? PKT_TYPE_MGMT : 0;</div><div class='ctx'> </div><div class='del'>-	pad = ((void *)skb-&gt;data - (sizeof(*txpd) + hroom) - NULL) &amp;</div><div class='del'>-			(MWIFIEX_DMA_ALIGN_SZ - 1);</div><div class='add'>+	pad = ((uintptr_t)skb-&gt;data - (sizeof(*txpd) + hroom)) &amp;</div><div class='add'>+	       (MWIFIEX_DMA_ALIGN_SZ - 1);</div><div class='ctx'> </div><div class='ctx'> 	skb_push(skb, sizeof(*txpd) + pad);</div><div class='ctx'> </div><div class='hunk'>@@ -520,6 +527,4 @@ void *mwifiex_process_uap_txpd(struct mwifiex_private *priv,</div><div class='ctx'> 	if (!txpd-&gt;tx_control)</div><div class='ctx'> 		/* TxCtrl set by user or default */</div><div class='ctx'> 		txpd-&gt;tx_control = cpu_to_le32(priv-&gt;pkt_tx_ctrl);</div><div class='del'>-</div><div class='del'>-	return skb-&gt;data;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c<br/>index 426e39d4ccf0..947ecb0a7b40 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/usb.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/usb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/usb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/usb.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: USB specific handling</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='hunk'>@@ -22,7 +10,7 @@</div><div class='ctx'> </div><div class='ctx'> #define USB_VERSION	"1.0"</div><div class='ctx'> </div><div class='del'>-static struct mwifiex_if_ops usb_ops;</div><div class='add'>+static const struct mwifiex_if_ops usb_ops;</div><div class='ctx'> </div><div class='ctx'> static const struct usb_device_id mwifiex_usb_table[] = {</div><div class='ctx'> 	/* 8766 */</div><div class='hunk'>@@ -130,7 +118,8 @@ static int mwifiex_usb_recv(struct mwifiex_adapter *adapter,</div><div class='ctx'> 		default:</div><div class='ctx'> 			mwifiex_dbg(adapter, ERROR,</div><div class='ctx'> 				    "unknown recv_type %#x\n", recv_type);</div><div class='del'>-			return -1;</div><div class='add'>+			ret = -1;</div><div class='add'>+			goto exit_restore_skb;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MWIFIEX_USB_EP_DATA:</div><div class='hunk'>@@ -505,6 +494,22 @@ static int mwifiex_usb_probe(struct usb_interface *intf,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	switch (card-&gt;usb_boot_state) {</div><div class='add'>+	case USB8XXX_FW_DNLD:</div><div class='add'>+		/* Reject broken descriptors. */</div><div class='add'>+		if (!card-&gt;rx_cmd_ep || !card-&gt;tx_cmd_ep)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		if (card-&gt;bulk_out_maxpktsize == 0)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		break;</div><div class='add'>+	case USB8XXX_FW_READY:</div><div class='add'>+		/* Assume the driver can handle missing endpoints for now. */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	usb_set_intfdata(intf, card);</div><div class='ctx'> </div><div class='ctx'> 	ret = mwifiex_add_card(card, &amp;card-&gt;fw_done, &amp;usb_ops,</div><div class='hunk'>@@ -682,7 +687,7 @@ static struct usb_driver mwifiex_usb_driver = {</div><div class='ctx'> 	.suspend = mwifiex_usb_suspend,</div><div class='ctx'> 	.resume = mwifiex_usb_resume,</div><div class='ctx'> 	.soft_unbind = 1,</div><div class='del'>-	.drvwrap.driver = {</div><div class='add'>+	.driver = {</div><div class='ctx'> 		.coredump = mwifiex_usb_coredump,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -740,8 +745,6 @@ static void mwifiex_usb_port_resync(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	if (adapter-&gt;usb_mc_status) {</div><div class='ctx'> 		for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='ctx'> 			priv = adapter-&gt;priv[i];</div><div class='del'>-			if (!priv)</div><div class='del'>-				continue;</div><div class='ctx'> 			if ((priv-&gt;bss_role == MWIFIEX_BSS_ROLE_UAP &amp;&amp;</div><div class='ctx'> 			     !priv-&gt;bss_started) ||</div><div class='ctx'> 			    (priv-&gt;bss_role == MWIFIEX_BSS_ROLE_STA &amp;&amp;</div><div class='hunk'>@@ -753,8 +756,6 @@ static void mwifiex_usb_port_resync(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='ctx'> 			priv = adapter-&gt;priv[i];</div><div class='del'>-			if (!priv)</div><div class='del'>-				continue;</div><div class='ctx'> 			if ((priv-&gt;bss_role == MWIFIEX_BSS_ROLE_UAP &amp;&amp;</div><div class='ctx'> 			     priv-&gt;bss_started) ||</div><div class='ctx'> 			    (priv-&gt;bss_role == MWIFIEX_BSS_ROLE_STA &amp;&amp;</div><div class='hunk'>@@ -765,8 +766,7 @@ static void mwifiex_usb_port_resync(struct mwifiex_adapter *adapter)</div><div class='ctx'> 		}</div><div class='ctx'> 		for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='ctx'> 			priv = adapter-&gt;priv[i];</div><div class='del'>-			if (priv)</div><div class='del'>-				priv-&gt;usb_port = active_port;</div><div class='add'>+			priv-&gt;usb_port = active_port;</div><div class='ctx'> 		}</div><div class='ctx'> 		for (i = 0; i &lt; MWIFIEX_TX_DATA_PORT; i++) {</div><div class='ctx'> 			if (active_port == card-&gt;port[i].tx_data_ep)</div><div class='hunk'>@@ -877,7 +877,7 @@ static int mwifiex_usb_prepare_tx_aggr_skb(struct mwifiex_adapter *adapter,</div><div class='ctx'> 	 * write complete, delete the tx_aggr timer</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (port-&gt;tx_aggr.timer_cnxt.is_hold_timer_set) {</div><div class='del'>-		del_timer(&amp;port-&gt;tx_aggr.timer_cnxt.hold_timer);</div><div class='add'>+		timer_delete(&amp;port-&gt;tx_aggr.timer_cnxt.hold_timer);</div><div class='ctx'> 		port-&gt;tx_aggr.timer_cnxt.is_hold_timer_set = false;</div><div class='ctx'> 		port-&gt;tx_aggr.timer_cnxt.hold_tmo_msecs = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -906,14 +906,14 @@ static int mwifiex_usb_prepare_tx_aggr_skb(struct mwifiex_adapter *adapter,</div><div class='ctx'> 		memcpy(payload, skb_tmp-&gt;data, skb_tmp-&gt;len);</div><div class='ctx'> 		if (skb_queue_empty(&amp;port-&gt;tx_aggr.aggr_list)) {</div><div class='ctx'> 			/* do not padding for last packet*/</div><div class='del'>-			*(u16 *)payload = cpu_to_le16(skb_tmp-&gt;len);</div><div class='del'>-			*(u16 *)&amp;payload[2] =</div><div class='add'>+			*(__le16 *)payload = cpu_to_le16(skb_tmp-&gt;len);</div><div class='add'>+			*(__le16 *)&amp;payload[2] =</div><div class='ctx'> 				cpu_to_le16(MWIFIEX_TYPE_AGGR_DATA_V2 | 0x80);</div><div class='ctx'> 			skb_trim(skb_aggr, skb_aggr-&gt;len - pad);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* add aggregation interface header */</div><div class='del'>-			*(u16 *)payload = cpu_to_le16(skb_tmp-&gt;len + pad);</div><div class='del'>-			*(u16 *)&amp;payload[2] =</div><div class='add'>+			*(__le16 *)payload = cpu_to_le16(skb_tmp-&gt;len + pad);</div><div class='add'>+			*(__le16 *)&amp;payload[2] =</div><div class='ctx'> 				cpu_to_le16(MWIFIEX_TYPE_AGGR_DATA_V2);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1092,9 +1092,9 @@ send_aggr_buf:</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		payload = skb-&gt;data;</div><div class='del'>-		*(u16 *)&amp;payload[2] =</div><div class='add'>+		*(__le16 *)&amp;payload[2] =</div><div class='ctx'> 			cpu_to_le16(MWIFIEX_TYPE_AGGR_DATA_V2 | 0x80);</div><div class='del'>-		*(u16 *)payload = cpu_to_le16(skb-&gt;len);</div><div class='add'>+		*(__le16 *)payload = cpu_to_le16(skb-&gt;len);</div><div class='ctx'> 		skb_send = skb;</div><div class='ctx'> 		context = &amp;port-&gt;tx_data_list[port-&gt;tx_data_ix++];</div><div class='ctx'> 		return mwifiex_usb_construct_send_urb(adapter, port, ep,</div><div class='hunk'>@@ -1125,7 +1125,7 @@ static void mwifiex_usb_tx_aggr_tmo(struct timer_list *t)</div><div class='ctx'> 	struct urb_context *urb_cnxt = NULL;</div><div class='ctx'> 	struct sk_buff *skb_send = NULL;</div><div class='ctx'> 	struct tx_aggr_tmr_cnxt *timer_context =</div><div class='del'>-		from_timer(timer_context, t, hold_timer);</div><div class='add'>+		timer_container_of(timer_context, t, hold_timer);</div><div class='ctx'> 	struct mwifiex_adapter *adapter = timer_context-&gt;adapter;</div><div class='ctx'> 	struct usb_tx_data_port *port = timer_context-&gt;port;</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -1354,7 +1354,7 @@ static void mwifiex_usb_cleanup_tx_aggr(struct mwifiex_adapter *adapter)</div><div class='ctx'> 				mwifiex_write_data_complete(adapter, skb_tmp,</div><div class='ctx'> 							    0, -1);</div><div class='ctx'> 		if (port-&gt;tx_aggr.timer_cnxt.hold_timer.function)</div><div class='del'>-			del_timer_sync(&amp;port-&gt;tx_aggr.timer_cnxt.hold_timer);</div><div class='add'>+			timer_delete_sync(&amp;port-&gt;tx_aggr.timer_cnxt.hold_timer);</div><div class='ctx'> 		port-&gt;tx_aggr.timer_cnxt.is_hold_timer_set = false;</div><div class='ctx'> 		port-&gt;tx_aggr.timer_cnxt.hold_tmo_msecs = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1557,7 +1557,7 @@ static int mwifiex_pm_wakeup_card(struct mwifiex_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	/* Simulation of HS_AWAKE event */</div><div class='ctx'> 	adapter-&gt;pm_wakeup_fw_try = false;</div><div class='del'>-	del_timer(&amp;adapter-&gt;wakeup_timer);</div><div class='add'>+	timer_delete(&amp;adapter-&gt;wakeup_timer);</div><div class='ctx'> 	adapter-&gt;pm_wakeup_card_req = false;</div><div class='ctx'> 	adapter-&gt;ps_state = PS_STATE_AWAKE;</div><div class='ctx'> </div><div class='hunk'>@@ -1585,7 +1585,7 @@ mwifiex_pm_wakeup_card_complete(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct mwifiex_if_ops usb_ops = {</div><div class='add'>+static const struct mwifiex_if_ops usb_ops = {</div><div class='ctx'> 	.register_dev =		mwifiex_register_dev,</div><div class='ctx'> 	.unregister_dev =	mwifiex_unregister_dev,</div><div class='ctx'> 	.wakeup =		mwifiex_pm_wakeup_card,</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/usb.h b/drivers/net/wireless/marvell/mwifiex/usb.h<br/>index d822ec15b7e6..7e920b51994c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/usb.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/usb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/usb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/usb.h</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * This file contains definitions for mwifiex USB interface driver.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _MWIFIEX_USB_H</div><div class='hunk'>@@ -134,7 +122,7 @@ struct fw_sync_header {</div><div class='ctx'> struct fw_data {</div><div class='ctx'> 	struct fw_header fw_hdr;</div><div class='ctx'> 	__le32 seq_num;</div><div class='del'>-	u8 data[1];</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #endif /*_MWIFIEX_USB_H */</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/util.c b/drivers/net/wireless/marvell/mwifiex/util.c<br/>index d583fa600a29..6882e90e90b2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/util.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/util.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/util.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/util.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: utility functions</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "decl.h"</div><div class='hunk'>@@ -128,24 +116,6 @@ static struct mwifiex_debug_data items[] = {</div><div class='ctx'> static int num_of_items = ARRAY_SIZE(items);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Firmware initialization complete callback handler.</div><div class='del'>- *</div><div class='del'>- * This function wakes up the function waiting on the init</div><div class='del'>- * wait queue for the firmware initialization to complete.</div><div class='del'>- */</div><div class='del'>-int mwifiex_init_fw_complete(struct mwifiex_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	if (adapter-&gt;hw_status == MWIFIEX_HW_STATUS_READY)</div><div class='del'>-		if (adapter-&gt;if_ops.init_fw_port)</div><div class='del'>-			adapter-&gt;if_ops.init_fw_port(adapter);</div><div class='del'>-</div><div class='del'>-	adapter-&gt;init_wait_q_woken = true;</div><div class='del'>-	wake_up_interruptible(&amp;adapter-&gt;init_wait_q);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * This function sends init/shutdown command</div><div class='ctx'>  * to firmware.</div><div class='ctx'>  */</div><div class='hunk'>@@ -382,6 +352,45 @@ mwifiex_parse_mgmt_packet(struct mwifiex_private *priv, u8 *payload, u16 len,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* This function sends deauth packet to the kernel. */</div><div class='add'>+void mwifiex_host_mlme_disconnect(struct mwifiex_private *priv,</div><div class='add'>+				  u16 reason_code, u8 *sa)</div><div class='add'>+{</div><div class='add'>+	u8 frame_buf[100];</div><div class='add'>+	struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)frame_buf;</div><div class='add'>+</div><div class='add'>+	memset(frame_buf, 0, sizeof(frame_buf));</div><div class='add'>+	mgmt-&gt;frame_control = cpu_to_le16(IEEE80211_STYPE_DEAUTH);</div><div class='add'>+	mgmt-&gt;duration = 0;</div><div class='add'>+	mgmt-&gt;seq_ctrl = 0;</div><div class='add'>+	mgmt-&gt;u.deauth.reason_code = cpu_to_le16(reason_code);</div><div class='add'>+</div><div class='add'>+	if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA) {</div><div class='add'>+		eth_broadcast_addr(mgmt-&gt;da);</div><div class='add'>+		memcpy(mgmt-&gt;sa,</div><div class='add'>+		       priv-&gt;curr_bss_params.bss_descriptor.mac_address,</div><div class='add'>+		       ETH_ALEN);</div><div class='add'>+		memcpy(mgmt-&gt;bssid, priv-&gt;cfg_bssid, ETH_ALEN);</div><div class='add'>+		priv-&gt;auth_flag = 0;</div><div class='add'>+		priv-&gt;auth_alg = WLAN_AUTH_NONE;</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(mgmt-&gt;da, priv-&gt;curr_addr, ETH_ALEN);</div><div class='add'>+		memcpy(mgmt-&gt;sa, sa, ETH_ALEN);</div><div class='add'>+		memcpy(mgmt-&gt;bssid, priv-&gt;curr_addr, ETH_ALEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (GET_BSS_ROLE(priv) != MWIFIEX_BSS_ROLE_UAP) {</div><div class='add'>+		wiphy_lock(priv-&gt;wdev.wiphy);</div><div class='add'>+		cfg80211_rx_mlme_mgmt(priv-&gt;netdev, frame_buf, 26);</div><div class='add'>+		wiphy_unlock(priv-&gt;wdev.wiphy);</div><div class='add'>+	} else {</div><div class='add'>+		cfg80211_rx_mgmt(&amp;priv-&gt;wdev,</div><div class='add'>+				 priv-&gt;bss_chandef.chan-&gt;center_freq,</div><div class='add'>+				 0, frame_buf, 26, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This function processes the received management packet and send it</div><div class='ctx'>  * to the kernel.</div><div class='hunk'>@@ -405,11 +414,15 @@ mwifiex_process_mgmt_packet(struct mwifiex_private *priv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rx_pd = (struct rxpd *)skb-&gt;data;</div><div class='add'>+	pkt_len = le16_to_cpu(rx_pd-&gt;rx_pkt_length);</div><div class='add'>+	if (pkt_len &lt; sizeof(struct ieee80211_hdr) + sizeof(pkt_len)) {</div><div class='add'>+		mwifiex_dbg(priv-&gt;adapter, ERROR, "invalid rx_pkt_length");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	skb_pull(skb, le16_to_cpu(rx_pd-&gt;rx_pkt_offset));</div><div class='ctx'> 	skb_pull(skb, sizeof(pkt_len));</div><div class='del'>-</div><div class='del'>-	pkt_len = le16_to_cpu(rx_pd-&gt;rx_pkt_length);</div><div class='add'>+	pkt_len -= sizeof(pkt_len);</div><div class='ctx'> </div><div class='ctx'> 	ieee_hdr = (void *)skb-&gt;data;</div><div class='ctx'> 	if (ieee80211_is_mgmt(ieee_hdr-&gt;frame_control)) {</div><div class='hunk'>@@ -422,9 +435,78 @@ mwifiex_process_mgmt_packet(struct mwifiex_private *priv,</div><div class='ctx'> 		skb-&gt;data + sizeof(struct ieee80211_hdr),</div><div class='ctx'> 		pkt_len - sizeof(struct ieee80211_hdr));</div><div class='ctx'> </div><div class='del'>-	pkt_len -= ETH_ALEN + sizeof(pkt_len);</div><div class='add'>+	pkt_len -= ETH_ALEN;</div><div class='ctx'> 	rx_pd-&gt;rx_pkt_length = cpu_to_le16(pkt_len);</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;host_mlme_reg &amp;&amp;</div><div class='add'>+	    (GET_BSS_ROLE(priv) != MWIFIEX_BSS_ROLE_UAP) &amp;&amp;</div><div class='add'>+	    (ieee80211_is_auth(ieee_hdr-&gt;frame_control) ||</div><div class='add'>+	     ieee80211_is_deauth(ieee_hdr-&gt;frame_control) ||</div><div class='add'>+	     ieee80211_is_disassoc(ieee_hdr-&gt;frame_control))) {</div><div class='add'>+		if (ieee80211_is_auth(ieee_hdr-&gt;frame_control)) {</div><div class='add'>+			if (priv-&gt;auth_flag &amp; HOST_MLME_AUTH_PENDING) {</div><div class='add'>+				if (priv-&gt;auth_alg != WLAN_AUTH_SAE) {</div><div class='add'>+					priv-&gt;auth_flag &amp;=</div><div class='add'>+						~HOST_MLME_AUTH_PENDING;</div><div class='add'>+					priv-&gt;auth_flag |=</div><div class='add'>+						HOST_MLME_AUTH_DONE;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			mwifiex_dbg(priv-&gt;adapter, MSG,</div><div class='add'>+				    "auth: receive authentication from %pM\n",</div><div class='add'>+				    ieee_hdr-&gt;addr3);</div><div class='add'>+		} else {</div><div class='add'>+			if (!priv-&gt;wdev.connected ||</div><div class='add'>+			    !ether_addr_equal(ieee_hdr-&gt;addr3,</div><div class='add'>+					      priv-&gt;curr_bss_params.bss_descriptor.mac_address))</div><div class='add'>+				return 0;</div><div class='add'>+</div><div class='add'>+			if (ieee80211_is_deauth(ieee_hdr-&gt;frame_control)) {</div><div class='add'>+				mwifiex_dbg(priv-&gt;adapter, MSG,</div><div class='add'>+					    "auth: receive deauth from %pM\n",</div><div class='add'>+					    ieee_hdr-&gt;addr3);</div><div class='add'>+				priv-&gt;auth_flag = 0;</div><div class='add'>+				priv-&gt;auth_alg = WLAN_AUTH_NONE;</div><div class='add'>+			} else {</div><div class='add'>+				mwifiex_dbg</div><div class='add'>+				(priv-&gt;adapter, MSG,</div><div class='add'>+				 "assoc: receive disassoc from %pM\n",</div><div class='add'>+				 ieee_hdr-&gt;addr3);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		wiphy_lock(priv-&gt;wdev.wiphy);</div><div class='add'>+		cfg80211_rx_mlme_mgmt(priv-&gt;netdev, skb-&gt;data, pkt_len);</div><div class='add'>+		wiphy_unlock(priv-&gt;wdev.wiphy);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;adapter-&gt;host_mlme_enabled &amp;&amp;</div><div class='add'>+	    (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP)) {</div><div class='add'>+		if (ieee80211_is_auth(ieee_hdr-&gt;frame_control))</div><div class='add'>+			mwifiex_dbg(priv-&gt;adapter, MSG,</div><div class='add'>+				    "auth: receive auth from %pM\n",</div><div class='add'>+				    ieee_hdr-&gt;addr2);</div><div class='add'>+		if (ieee80211_is_deauth(ieee_hdr-&gt;frame_control))</div><div class='add'>+			mwifiex_dbg(priv-&gt;adapter, MSG,</div><div class='add'>+				    "auth: receive deauth from %pM\n",</div><div class='add'>+				    ieee_hdr-&gt;addr2);</div><div class='add'>+		if (ieee80211_is_disassoc(ieee_hdr-&gt;frame_control))</div><div class='add'>+			mwifiex_dbg(priv-&gt;adapter, MSG,</div><div class='add'>+				    "assoc: receive disassoc from %pM\n",</div><div class='add'>+				    ieee_hdr-&gt;addr2);</div><div class='add'>+		if (ieee80211_is_assoc_req(ieee_hdr-&gt;frame_control))</div><div class='add'>+			mwifiex_dbg(priv-&gt;adapter, MSG,</div><div class='add'>+				    "assoc: receive assoc req from %pM\n",</div><div class='add'>+				    ieee_hdr-&gt;addr2);</div><div class='add'>+		if (ieee80211_is_reassoc_req(ieee_hdr-&gt;frame_control))</div><div class='add'>+			mwifiex_dbg(priv-&gt;adapter, MSG,</div><div class='add'>+				    "assoc: receive reassoc req from %pM\n",</div><div class='add'>+				    ieee_hdr-&gt;addr2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	cfg80211_rx_mgmt(&amp;priv-&gt;wdev, priv-&gt;roc_cfg.chan.center_freq,</div><div class='ctx'> 			 CAL_RSSI(rx_pd-&gt;snr, rx_pd-&gt;nf), skb-&gt;data, pkt_len,</div><div class='ctx'> 			 0);</div><div class='hunk'>@@ -488,7 +570,7 @@ int mwifiex_recv_packet(struct mwifiex_private *priv, struct sk_buff *skb)</div><div class='ctx'> 	    (skb-&gt;truesize &gt; MWIFIEX_RX_DATA_BUF_SIZE))</div><div class='ctx'> 		skb-&gt;truesize += (skb-&gt;len - MWIFIEX_RX_DATA_BUF_SIZE);</div><div class='ctx'> </div><div class='del'>-	netif_rx_any_context(skb);</div><div class='add'>+	netif_rx(skb);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -565,7 +647,7 @@ u8 mwifiex_is_tdls_chan_switching(struct mwifiex_private *priv)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u8 mwifiex_is_tdls_off_chan(struct mwifiex_private *priv)</div><div class='add'>+static u8 mwifiex_is_tdls_off_chan(struct mwifiex_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_sta_node *sta_ptr;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/util.h b/drivers/net/wireless/marvell/mwifiex/util.h<br/>index 44aa80eb7827..4699c505c0a0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/util.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/util.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/util.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/util.h</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: utility functions</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _MWIFIEX_UTIL_H_</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/wmm.c b/drivers/net/wireless/marvell/mwifiex/wmm.c<br/>index 0b375608df7d..1b1222c73728 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/wmm.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/wmm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/wmm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/wmm.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: WMM</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "decl.h"</div><div class='hunk'>@@ -466,8 +454,6 @@ int mwifiex_bypass_txlist_empty(struct mwifiex_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='ctx'> 		priv = adapter-&gt;priv[i];</div><div class='del'>-		if (!priv)</div><div class='del'>-			continue;</div><div class='ctx'> 		if (adapter-&gt;if_ops.is_port_ready &amp;&amp;</div><div class='ctx'> 		    !adapter-&gt;if_ops.is_port_ready(priv))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -489,8 +475,6 @@ mwifiex_wmm_lists_empty(struct mwifiex_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; ++i) {</div><div class='ctx'> 		priv = adapter-&gt;priv[i];</div><div class='del'>-		if (!priv)</div><div class='del'>-			continue;</div><div class='ctx'> 		if (!priv-&gt;port_open &amp;&amp;</div><div class='ctx'> 		    (priv-&gt;bss_mode != NL80211_IFTYPE_ADHOC))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -883,7 +867,7 @@ mwifiex_wmm_add_buf_txqueue(struct mwifiex_private *priv,</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		memcpy(ra, skb-&gt;data, ETH_ALEN);</div><div class='del'>-		if (ra[0] &amp; 0x01 || mwifiex_is_skb_mgmt_frame(skb))</div><div class='add'>+		if (is_multicast_ether_addr(ra) || mwifiex_is_skb_mgmt_frame(skb))</div><div class='ctx'> 			eth_broadcast_addr(ra);</div><div class='ctx'> 		ra_list = mwifiex_wmm_get_queue_raptr(priv, tid_down, ra);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1444,13 +1428,13 @@ mwifiex_dequeue_tx_packet(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ptr-&gt;is_11n_enabled ||</div><div class='del'>-		ptr-&gt;ba_status ||</div><div class='del'>-		priv-&gt;wps.session_enable) {</div><div class='add'>+	    ptr-&gt;ba_status ||</div><div class='add'>+	    priv-&gt;wps.session_enable) {</div><div class='ctx'> 		if (ptr-&gt;is_11n_enabled &amp;&amp;</div><div class='del'>-			ptr-&gt;ba_status &amp;&amp;</div><div class='del'>-			ptr-&gt;amsdu_in_ampdu &amp;&amp;</div><div class='del'>-			mwifiex_is_amsdu_allowed(priv, tid) &amp;&amp;</div><div class='del'>-			mwifiex_is_11n_aggragation_possible(priv, ptr,</div><div class='add'>+		    ptr-&gt;ba_status &amp;&amp;</div><div class='add'>+		    ptr-&gt;amsdu_in_ampdu &amp;&amp;</div><div class='add'>+		    mwifiex_is_amsdu_allowed(priv, tid) &amp;&amp;</div><div class='add'>+		    mwifiex_is_11n_aggragation_possible(priv, ptr,</div><div class='ctx'> 							adapter-&gt;tx_buf_size))</div><div class='ctx'> 			mwifiex_11n_aggregate_pkt(priv, ptr, ptr_index);</div><div class='ctx'> 			/* ra_list_spinlock has been freed in</div><div class='hunk'>@@ -1503,9 +1487,6 @@ void mwifiex_process_bypass_tx(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; ++i) {</div><div class='ctx'> 		priv = adapter-&gt;priv[i];</div><div class='ctx'> </div><div class='del'>-		if (!priv)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='ctx'> 		if (adapter-&gt;if_ops.is_port_ready &amp;&amp;</div><div class='ctx'> 		    !adapter-&gt;if_ops.is_port_ready(priv))</div><div class='ctx'> 			continue;</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwifiex/wmm.h b/drivers/net/wireless/marvell/mwifiex/wmm.h<br/>index 1cb3d1804758..d7659e688933 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/wmm.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwifiex/wmm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwifiex/wmm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwifiex/wmm.h</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * NXP Wireless LAN device driver: WMM</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2011-2020 NXP</div><div class='del'>- *</div><div class='del'>- * This software file (the "File") is distributed by NXP</div><div class='del'>- * under the terms of the GNU General Public License Version 2, June 1991</div><div class='del'>- * (the "License").  You may use, redistribute and/or modify this File in</div><div class='del'>- * accordance with the terms and conditions of the License, a copy of which</div><div class='del'>- * is available by writing to the Free Software Foundation, Inc.,</div><div class='del'>- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the</div><div class='del'>- * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.</div><div class='del'>- *</div><div class='del'>- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about</div><div class='del'>- * this warranty disclaimer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _MWIFIEX_WMM_H_</div><div class='hunk'>@@ -51,21 +39,6 @@ mwifiex_get_tid(struct mwifiex_ra_list_tbl *ptr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This function gets the length of a list.</div><div class='del'>- */</div><div class='del'>-static inline int</div><div class='del'>-mwifiex_wmm_list_len(struct list_head *head)</div><div class='del'>-{</div><div class='del'>-	struct list_head *pos;</div><div class='del'>-	int count = 0;</div><div class='del'>-</div><div class='del'>-	list_for_each(pos, head)</div><div class='del'>-		++count;</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * This function checks if a RA list is empty or not.</div><div class='ctx'>  */</div><div class='ctx'> static inline u8</div><div class='head'>diff --git a/drivers/net/wireless/marvell/mwl8k.c b/drivers/net/wireless/marvell/mwl8k.c<br/>index 84b32a5f01ee..54d6d00ecdf1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwl8k.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/marvell/mwl8k.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/marvell/mwl8k.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/marvell/mwl8k.c</a></div><div class='hunk'>@@ -587,13 +587,18 @@ static int mwl8k_request_firmware(struct mwl8k_priv *priv, char *fw_image,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct mwl8k_cmd_pkt {</div><div class='del'>-	__le16	code;</div><div class='del'>-	__le16	length;</div><div class='del'>-	__u8	seq_num;</div><div class='del'>-	__u8	macid;</div><div class='del'>-	__le16	result;</div><div class='del'>-	char	payload[];</div><div class='add'>+	/* New members MUST be added within the __struct_group() macro below. */</div><div class='add'>+	__struct_group(mwl8k_cmd_pkt_hdr, hdr, __packed,</div><div class='add'>+		__le16	code;</div><div class='add'>+		__le16	length;</div><div class='add'>+		__u8	seq_num;</div><div class='add'>+		__u8	macid;</div><div class='add'>+		__le16	result;</div><div class='add'>+	);</div><div class='add'>+	char payload[];</div><div class='ctx'> } __packed;</div><div class='add'>+static_assert(offsetof(struct mwl8k_cmd_pkt, payload) == sizeof(struct mwl8k_cmd_pkt_hdr),</div><div class='add'>+	      "struct member likely outside of __struct_group()");</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Firmware loading.</div><div class='hunk'>@@ -1222,6 +1227,10 @@ static int rxq_refill(struct ieee80211_hw *hw, int index, int limit)</div><div class='ctx'> </div><div class='ctx'> 		addr = dma_map_single(&amp;priv-&gt;pdev-&gt;dev, skb-&gt;data,</div><div class='ctx'> 				      MWL8K_RX_MAXSZ, DMA_FROM_DEVICE);</div><div class='add'>+		if (dma_mapping_error(&amp;priv-&gt;pdev-&gt;dev, addr)) {</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		rxq-&gt;rxd_count++;</div><div class='ctx'> 		rx = rxq-&gt;tail++;</div><div class='hunk'>@@ -1880,7 +1889,7 @@ static inline void mwl8k_tx_count_packet(struct ieee80211_sta *sta, u8 tid)</div><div class='ctx'> 	 * packets ever exceeds the ampdu_min_traffic threshold, we will allow</div><div class='ctx'> 	 * an ampdu stream to be started.</div><div class='ctx'> 	 */</div><div class='del'>-	if (jiffies - tx_stats-&gt;start_time &gt; HZ) {</div><div class='add'>+	if (time_after(jiffies, (unsigned long)tx_stats-&gt;start_time + HZ)) {</div><div class='ctx'> 		tx_stats-&gt;pkts = 0;</div><div class='ctx'> 		tx_stats-&gt;start_time = 0;</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -1985,7 +1994,7 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	txpriority = index;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;ap_fw &amp;&amp; sta &amp;&amp; sta-&gt;ht_cap.ht_supported &amp;&amp; !eapol_frame &amp;&amp;</div><div class='add'>+	if (priv-&gt;ap_fw &amp;&amp; sta &amp;&amp; sta-&gt;deflink.ht_cap.ht_supported &amp;&amp; !eapol_frame &amp;&amp;</div><div class='ctx'> 	    ieee80211_is_data_qos(wh-&gt;frame_control)) {</div><div class='ctx'> 		tid = qos &amp; 0xf;</div><div class='ctx'> 		mwl8k_tx_count_packet(sta, tid);</div><div class='hunk'>@@ -2201,7 +2210,7 @@ static void mwl8k_enable_bsses(struct ieee80211_hw *hw, bool enable,</div><div class='ctx'> /* Timeout firmware commands after 10s */</div><div class='ctx'> #define MWL8K_CMD_TIMEOUT_MS	10000</div><div class='ctx'> </div><div class='del'>-static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd)</div><div class='add'>+static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt_hdr *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	DECLARE_COMPLETION_ONSTACK(cmd_wait);</div><div class='ctx'> 	struct mwl8k_priv *priv = hw-&gt;priv;</div><div class='hunk'>@@ -2209,7 +2218,7 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd)</div><div class='ctx'> 	dma_addr_t dma_addr;</div><div class='ctx'> 	unsigned int dma_size;</div><div class='ctx'> 	int rc;</div><div class='del'>-	unsigned long timeout = 0;</div><div class='add'>+	unsigned long time_left = 0;</div><div class='ctx'> 	u8 buf[32];</div><div class='ctx'> 	u32 bitmap = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2256,8 +2265,8 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd)</div><div class='ctx'> 	iowrite32(MWL8K_H2A_INT_DUMMY,</div><div class='ctx'> 		regs + MWL8K_HIU_H2A_INTERRUPT_EVENTS);</div><div class='ctx'> </div><div class='del'>-	timeout = wait_for_completion_timeout(&amp;cmd_wait,</div><div class='del'>-				msecs_to_jiffies(MWL8K_CMD_TIMEOUT_MS));</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;cmd_wait,</div><div class='add'>+						msecs_to_jiffies(MWL8K_CMD_TIMEOUT_MS));</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;hostcmd_wait = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -2265,7 +2274,7 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd)</div><div class='ctx'> 	dma_unmap_single(&amp;priv-&gt;pdev-&gt;dev, dma_addr, dma_size,</div><div class='ctx'> 			 DMA_BIDIRECTIONAL);</div><div class='ctx'> </div><div class='del'>-	if (!timeout) {</div><div class='add'>+	if (!time_left) {</div><div class='ctx'> 		wiphy_err(hw-&gt;wiphy, "Command %s timeout after %u ms\n",</div><div class='ctx'> 			  mwl8k_cmd_name(cmd-&gt;code, buf, sizeof(buf)),</div><div class='ctx'> 			  MWL8K_CMD_TIMEOUT_MS);</div><div class='hunk'>@@ -2273,7 +2282,7 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		int ms;</div><div class='ctx'> </div><div class='del'>-		ms = MWL8K_CMD_TIMEOUT_MS - jiffies_to_msecs(timeout);</div><div class='add'>+		ms = MWL8K_CMD_TIMEOUT_MS - jiffies_to_msecs(time_left);</div><div class='ctx'> </div><div class='ctx'> 		rc = cmd-&gt;result ? -EINVAL : 0;</div><div class='ctx'> 		if (rc)</div><div class='hunk'>@@ -2298,7 +2307,7 @@ exit:</div><div class='ctx'> </div><div class='ctx'> static int mwl8k_post_pervif_cmd(struct ieee80211_hw *hw,</div><div class='ctx'> 				 struct ieee80211_vif *vif,</div><div class='del'>-				 struct mwl8k_cmd_pkt *cmd)</div><div class='add'>+				 struct mwl8k_cmd_pkt_hdr *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	if (vif != NULL)</div><div class='ctx'> 		cmd-&gt;macid = MWL8K_VIF(vif)-&gt;macid;</div><div class='hunk'>@@ -2350,7 +2359,7 @@ static void mwl8k_setup_5ghz_band(struct ieee80211_hw *hw)</div><div class='ctx'>  * CMD_GET_HW_SPEC (STA version).</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_get_hw_spec_sta {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__u8 hw_rev;</div><div class='ctx'> 	__u8 host_interface;</div><div class='ctx'> 	__le16 num_mcaddrs;</div><div class='hunk'>@@ -2499,7 +2508,7 @@ static int mwl8k_cmd_get_hw_spec_sta(struct ieee80211_hw *hw)</div><div class='ctx'>  * CMD_GET_HW_SPEC (AP version).</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_get_hw_spec_ap {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__u8 hw_rev;</div><div class='ctx'> 	__u8 host_interface;</div><div class='ctx'> 	__le16 num_wcb;</div><div class='hunk'>@@ -2593,7 +2602,7 @@ done:</div><div class='ctx'>  * CMD_SET_HW_SPEC.</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_set_hw_spec {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__u8 hw_rev;</div><div class='ctx'> 	__u8 host_interface;</div><div class='ctx'> 	__le16 num_mcaddrs;</div><div class='hunk'>@@ -2670,7 +2679,7 @@ static int mwl8k_cmd_set_hw_spec(struct ieee80211_hw *hw)</div><div class='ctx'>  * CMD_MAC_MULTICAST_ADR.</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_mac_multicast_adr {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__le16 action;</div><div class='ctx'> 	__le16 numaddr;</div><div class='ctx'> 	__u8 addr[][ETH_ALEN];</div><div class='hunk'>@@ -2681,7 +2690,7 @@ struct mwl8k_cmd_mac_multicast_adr {</div><div class='ctx'> #define MWL8K_ENABLE_RX_ALL_MULTICAST	0x0004</div><div class='ctx'> #define MWL8K_ENABLE_RX_BROADCAST	0x0008</div><div class='ctx'> </div><div class='del'>-static struct mwl8k_cmd_pkt *</div><div class='add'>+static struct mwl8k_cmd_pkt_hdr *</div><div class='ctx'> __mwl8k_cmd_mac_multicast_adr(struct ieee80211_hw *hw, int allmulti,</div><div class='ctx'> 			      struct netdev_hw_addr_list *mc_list)</div><div class='ctx'> {</div><div class='hunk'>@@ -2718,7 +2727,7 @@ __mwl8k_cmd_mac_multicast_adr(struct ieee80211_hw *hw, int allmulti,</div><div class='ctx'> 		cmd-&gt;action |= cpu_to_le16(MWL8K_ENABLE_RX_MULTICAST);</div><div class='ctx'> 		cmd-&gt;numaddr = cpu_to_le16(mc_count);</div><div class='ctx'> 		netdev_hw_addr_list_for_each(ha, mc_list) {</div><div class='del'>-			memcpy(cmd-&gt;addr[i], ha-&gt;addr, ETH_ALEN);</div><div class='add'>+			memcpy(cmd-&gt;addr[i++], ha-&gt;addr, ETH_ALEN);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2729,7 +2738,7 @@ __mwl8k_cmd_mac_multicast_adr(struct ieee80211_hw *hw, int allmulti,</div><div class='ctx'>  * CMD_GET_STAT.</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_get_stat {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__le32 stats[64];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -2771,7 +2780,7 @@ static int mwl8k_cmd_get_stat(struct ieee80211_hw *hw,</div><div class='ctx'>  * CMD_RADIO_CONTROL.</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_radio_control {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__le16 action;</div><div class='ctx'> 	__le16 control;</div><div class='ctx'> 	__le16 radio_on;</div><div class='hunk'>@@ -2832,7 +2841,7 @@ mwl8k_set_radio_preamble(struct ieee80211_hw *hw, bool short_preamble)</div><div class='ctx'> #define MWL8K_RF_TX_POWER_LEVEL_TOTAL	8</div><div class='ctx'> </div><div class='ctx'> struct mwl8k_cmd_rf_tx_power {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__le16 action;</div><div class='ctx'> 	__le16 support_level;</div><div class='ctx'> 	__le16 current_level;</div><div class='hunk'>@@ -2866,7 +2875,7 @@ static int mwl8k_cmd_rf_tx_power(struct ieee80211_hw *hw, int dBm)</div><div class='ctx'> #define MWL8K_TX_POWER_LEVEL_TOTAL      12</div><div class='ctx'> </div><div class='ctx'> struct mwl8k_cmd_tx_power {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__le16 action;</div><div class='ctx'> 	__le16 band;</div><div class='ctx'> 	__le16 channel;</div><div class='hunk'>@@ -2925,7 +2934,7 @@ static int mwl8k_cmd_tx_power(struct ieee80211_hw *hw,</div><div class='ctx'>  * CMD_RF_ANTENNA.</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_rf_antenna {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__le16 antenna;</div><div class='ctx'> 	__le16 mode;</div><div class='ctx'> } __packed;</div><div class='hunk'>@@ -2957,8 +2966,53 @@ mwl8k_cmd_rf_antenna(struct ieee80211_hw *hw, int antenna, int mask)</div><div class='ctx'> /*</div><div class='ctx'>  * CMD_SET_BEACON.</div><div class='ctx'>  */</div><div class='add'>+</div><div class='add'>+static bool mwl8k_beacon_has_ds_params(const u8 *buf, int len)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_mgmt *mgmt = (const void *)buf;</div><div class='add'>+	int ies_len;</div><div class='add'>+</div><div class='add'>+	if (len &lt;= offsetof(struct ieee80211_mgmt, u.beacon.variable))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	ies_len = len - offsetof(struct ieee80211_mgmt, u.beacon.variable);</div><div class='add'>+</div><div class='add'>+	return cfg80211_find_ie(WLAN_EID_DS_PARAMS, mgmt-&gt;u.beacon.variable,</div><div class='add'>+				ies_len) != NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mwl8k_beacon_copy_inject_ds_params(struct ieee80211_hw *hw,</div><div class='add'>+					       u8 *buf_dst, const u8 *buf_src,</div><div class='add'>+					       int src_len)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_mgmt *mgmt = (const void *)buf_src;</div><div class='add'>+	static const u8 before_ds_params[] = {</div><div class='add'>+		WLAN_EID_SSID,</div><div class='add'>+		WLAN_EID_SUPP_RATES,</div><div class='add'>+	};</div><div class='add'>+	const u8 *ies;</div><div class='add'>+	int hdr_len, left, offs, pos;</div><div class='add'>+</div><div class='add'>+	ies = mgmt-&gt;u.beacon.variable;</div><div class='add'>+	hdr_len = offsetof(struct ieee80211_mgmt, u.beacon.variable);</div><div class='add'>+</div><div class='add'>+	offs = ieee80211_ie_split(ies, src_len - hdr_len, before_ds_params,</div><div class='add'>+				  ARRAY_SIZE(before_ds_params), 0);</div><div class='add'>+</div><div class='add'>+	pos = hdr_len + offs;</div><div class='add'>+	left = src_len - pos;</div><div class='add'>+</div><div class='add'>+	memcpy(buf_dst, buf_src, pos);</div><div class='add'>+</div><div class='add'>+	/* Inject a DSSS Parameter Set after SSID + Supp Rates */</div><div class='add'>+	buf_dst[pos + 0] = WLAN_EID_DS_PARAMS;</div><div class='add'>+	buf_dst[pos + 1] = 1;</div><div class='add'>+	buf_dst[pos + 2] = hw-&gt;conf.chandef.chan-&gt;hw_value;</div><div class='add'>+</div><div class='add'>+	memcpy(buf_dst + pos + 3, buf_src + pos, left);</div><div class='add'>+}</div><div class='ctx'> struct mwl8k_cmd_set_beacon {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__le16 beacon_len;</div><div class='ctx'> 	__u8 beacon[];</div><div class='ctx'> };</div><div class='hunk'>@@ -2966,17 +3020,33 @@ struct mwl8k_cmd_set_beacon {</div><div class='ctx'> static int mwl8k_cmd_set_beacon(struct ieee80211_hw *hw,</div><div class='ctx'> 				struct ieee80211_vif *vif, u8 *beacon, int len)</div><div class='ctx'> {</div><div class='add'>+	bool ds_params_present = mwl8k_beacon_has_ds_params(beacon, len);</div><div class='ctx'> 	struct mwl8k_cmd_set_beacon *cmd;</div><div class='del'>-	int rc;</div><div class='add'>+	int rc, final_len = len;</div><div class='add'>+</div><div class='add'>+	if (!ds_params_present) {</div><div class='add'>+		/*</div><div class='add'>+		 * mwl8k firmware requires a DS Params IE with the current</div><div class='add'>+		 * channel in AP beacons. If mac80211/hostapd does not</div><div class='add'>+		 * include it, inject one here. IE ID + length + channel</div><div class='add'>+		 * number = 3 bytes.</div><div class='add'>+		 */</div><div class='add'>+		final_len += 3;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	cmd = kzalloc(sizeof(*cmd) + len, GFP_KERNEL);</div><div class='add'>+	cmd = kzalloc(sizeof(*cmd) + final_len, GFP_KERNEL);</div><div class='ctx'> 	if (cmd == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;header.code = cpu_to_le16(MWL8K_CMD_SET_BEACON);</div><div class='del'>-	cmd-&gt;header.length = cpu_to_le16(sizeof(*cmd) + len);</div><div class='del'>-	cmd-&gt;beacon_len = cpu_to_le16(len);</div><div class='del'>-	memcpy(cmd-&gt;beacon, beacon, len);</div><div class='add'>+	cmd-&gt;header.length = cpu_to_le16(sizeof(*cmd) + final_len);</div><div class='add'>+	cmd-&gt;beacon_len = cpu_to_le16(final_len);</div><div class='add'>+</div><div class='add'>+	if (ds_params_present)</div><div class='add'>+		memcpy(cmd-&gt;beacon, beacon, len);</div><div class='add'>+	else</div><div class='add'>+		mwl8k_beacon_copy_inject_ds_params(hw, cmd-&gt;beacon, beacon,</div><div class='add'>+						   len);</div><div class='ctx'> </div><div class='ctx'> 	rc = mwl8k_post_pervif_cmd(hw, vif, &amp;cmd-&gt;header);</div><div class='ctx'> 	kfree(cmd);</div><div class='hunk'>@@ -2988,7 +3058,7 @@ static int mwl8k_cmd_set_beacon(struct ieee80211_hw *hw,</div><div class='ctx'>  * CMD_SET_PRE_SCAN.</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_set_pre_scan {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> static int mwl8k_cmd_set_pre_scan(struct ieee80211_hw *hw)</div><div class='hunk'>@@ -3013,7 +3083,7 @@ static int mwl8k_cmd_set_pre_scan(struct ieee80211_hw *hw)</div><div class='ctx'>  * CMD_BBP_REG_ACCESS.</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_bbp_reg_access {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__le16 action;</div><div class='ctx'> 	__le16 offset;</div><div class='ctx'> 	u8 value;</div><div class='hunk'>@@ -3054,7 +3124,7 @@ mwl8k_cmd_bbp_reg_access(struct ieee80211_hw *hw,</div><div class='ctx'>  * CMD_SET_POST_SCAN.</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_set_post_scan {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__le32 isibss;</div><div class='ctx'> 	__u8 bssid[ETH_ALEN];</div><div class='ctx'> } __packed;</div><div class='hunk'>@@ -3142,7 +3212,7 @@ static void mwl8k_update_survey(struct mwl8k_priv *priv,</div><div class='ctx'>  * CMD_SET_RF_CHANNEL.</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_set_rf_channel {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__le16 action;</div><div class='ctx'> 	__u8 current_channel;</div><div class='ctx'> 	__le32 channel_flags;</div><div class='hunk'>@@ -3211,7 +3281,7 @@ static int mwl8k_cmd_set_rf_channel(struct ieee80211_hw *hw,</div><div class='ctx'> #define MWL8K_FRAME_PROT_11N_HT_ALL			0x06</div><div class='ctx'> </div><div class='ctx'> struct mwl8k_cmd_update_set_aid {</div><div class='del'>-	struct	mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__le16	aid;</div><div class='ctx'> </div><div class='ctx'> 	 /* AP's MAC address (BSSID) */</div><div class='hunk'>@@ -3250,7 +3320,7 @@ mwl8k_cmd_set_aid(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;header.code = cpu_to_le16(MWL8K_CMD_SET_AID);</div><div class='ctx'> 	cmd-&gt;header.length = cpu_to_le16(sizeof(*cmd));</div><div class='del'>-	cmd-&gt;aid = cpu_to_le16(vif-&gt;bss_conf.aid);</div><div class='add'>+	cmd-&gt;aid = cpu_to_le16(vif-&gt;cfg.aid);</div><div class='ctx'> 	memcpy(cmd-&gt;bssid, vif-&gt;bss_conf.bssid, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;bss_conf.use_cts_prot) {</div><div class='hunk'>@@ -3283,7 +3353,7 @@ mwl8k_cmd_set_aid(struct ieee80211_hw *hw,</div><div class='ctx'>  * CMD_SET_RATE.</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_set_rate {</div><div class='del'>-	struct	mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__u8	legacy_rates[14];</div><div class='ctx'> </div><div class='ctx'> 	/* Bitmap for supported MCS codes.  */</div><div class='hunk'>@@ -3319,7 +3389,7 @@ mwl8k_cmd_set_rate(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> #define MWL8K_FJ_BEACON_MAXLEN	128</div><div class='ctx'> </div><div class='ctx'> struct mwl8k_cmd_finalize_join {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__le32 sleep_interval;	/* Number of beacon periods to sleep */</div><div class='ctx'> 	__u8 beacon_data[MWL8K_FJ_BEACON_MAXLEN];</div><div class='ctx'> } __packed;</div><div class='hunk'>@@ -3358,13 +3428,14 @@ static int mwl8k_cmd_finalize_join(struct ieee80211_hw *hw, void *frame,</div><div class='ctx'>  * CMD_SET_RTS_THRESHOLD.</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_set_rts_threshold {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__le16 action;</div><div class='ctx'> 	__le16 threshold;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mwl8k_cmd_set_rts_threshold(struct ieee80211_hw *hw, int rts_thresh)</div><div class='add'>+mwl8k_cmd_set_rts_threshold(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+			    int rts_thresh)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwl8k_cmd_set_rts_threshold *cmd;</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -3388,7 +3459,7 @@ mwl8k_cmd_set_rts_threshold(struct ieee80211_hw *hw, int rts_thresh)</div><div class='ctx'>  * CMD_SET_SLOT.</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_set_slot {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__le16 action;</div><div class='ctx'> 	__u8 short_slot;</div><div class='ctx'> } __packed;</div><div class='hunk'>@@ -3417,7 +3488,7 @@ static int mwl8k_cmd_set_slot(struct ieee80211_hw *hw, bool short_slot_time)</div><div class='ctx'>  * CMD_SET_EDCA_PARAMS.</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_set_edca_params {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> </div><div class='ctx'> 	/* See MWL8K_SET_EDCA_XXX below */</div><div class='ctx'> 	__le16 action;</div><div class='hunk'>@@ -3502,7 +3573,7 @@ mwl8k_cmd_set_edca_params(struct ieee80211_hw *hw, __u8 qnum,</div><div class='ctx'>  * CMD_SET_WMM_MODE.</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_set_wmm_mode {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__le16 action;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -3533,7 +3604,7 @@ static int mwl8k_cmd_set_wmm_mode(struct ieee80211_hw *hw, bool enable)</div><div class='ctx'>  * CMD_MIMO_CONFIG.</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_mimo_config {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__le32 action;</div><div class='ctx'> 	__u8 rx_antenna_map;</div><div class='ctx'> 	__u8 tx_antenna_map;</div><div class='hunk'>@@ -3564,7 +3635,7 @@ static int mwl8k_cmd_mimo_config(struct ieee80211_hw *hw, __u8 rx, __u8 tx)</div><div class='ctx'>  * CMD_USE_FIXED_RATE (STA version).</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_use_fixed_rate_sta {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__le32 action;</div><div class='ctx'> 	__le32 allow_rate_drop;</div><div class='ctx'> 	__le32 num_rates;</div><div class='hunk'>@@ -3606,7 +3677,7 @@ static int mwl8k_cmd_use_fixed_rate_sta(struct ieee80211_hw *hw)</div><div class='ctx'>  * CMD_USE_FIXED_RATE (AP version).</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_use_fixed_rate_ap {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__le32 action;</div><div class='ctx'> 	__le32 allow_rate_drop;</div><div class='ctx'> 	__le32 num_rates;</div><div class='hunk'>@@ -3647,7 +3718,7 @@ mwl8k_cmd_use_fixed_rate_ap(struct ieee80211_hw *hw, int mcast, int mgmt)</div><div class='ctx'>  * CMD_ENABLE_SNIFFER.</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_enable_sniffer {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__le32 action;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -3671,7 +3742,7 @@ static int mwl8k_cmd_enable_sniffer(struct ieee80211_hw *hw, bool enable)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct mwl8k_cmd_update_mac_addr {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			__le16 mac_type;</div><div class='hunk'>@@ -3756,7 +3827,7 @@ static inline int mwl8k_cmd_del_mac_addr(struct ieee80211_hw *hw,</div><div class='ctx'>  * CMD_SET_RATEADAPT_MODE.</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_set_rate_adapt_mode {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__le16 action;</div><div class='ctx'> 	__le16 mode;</div><div class='ctx'> } __packed;</div><div class='hunk'>@@ -3785,7 +3856,7 @@ static int mwl8k_cmd_set_rateadapt_mode(struct ieee80211_hw *hw, __u16 mode)</div><div class='ctx'>  * CMD_GET_WATCHDOG_BITMAP.</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_get_watchdog_bitmap {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	u8	bitmap;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -3865,7 +3936,7 @@ done:</div><div class='ctx'>  * CMD_BSS_START.</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_bss_start {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__le32 enable;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -3960,7 +4031,7 @@ struct mwl8k_destroy_ba_stream {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct mwl8k_cmd_bastream {</div><div class='del'>-	struct mwl8k_cmd_pkt	header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr	header;</div><div class='ctx'> 	__le32	action;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct mwl8k_create_ba_stream	create_params;</div><div class='hunk'>@@ -4027,9 +4098,9 @@ mwl8k_create_ba(struct ieee80211_hw *hw, struct mwl8k_ampdu_stream *stream,</div><div class='ctx'> 	cmd-&gt;create_params.reset_seq_no_flag = 1;</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;create_params.param_info =</div><div class='del'>-		(stream-&gt;sta-&gt;ht_cap.ampdu_factor &amp;</div><div class='add'>+		(stream-&gt;sta-&gt;deflink.ht_cap.ampdu_factor &amp;</div><div class='ctx'> 		 IEEE80211_HT_AMPDU_PARM_FACTOR) |</div><div class='del'>-		((stream-&gt;sta-&gt;ht_cap.ampdu_density &lt;&lt; 2) &amp;</div><div class='add'>+		((stream-&gt;sta-&gt;deflink.ht_cap.ampdu_density &lt;&lt; 2) &amp;</div><div class='ctx'> 		 IEEE80211_HT_AMPDU_PARM_DENSITY);</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;create_params.flags =</div><div class='hunk'>@@ -4070,7 +4141,7 @@ static void mwl8k_destroy_ba(struct ieee80211_hw *hw,</div><div class='ctx'>  * CMD_SET_NEW_STN.</div><div class='ctx'>  */</div><div class='ctx'> struct mwl8k_cmd_set_new_stn {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> 	__le16 aid;</div><div class='ctx'> 	__u8 mac_addr[6];</div><div class='ctx'> 	__le16 stn_id;</div><div class='hunk'>@@ -4113,18 +4184,18 @@ static int mwl8k_cmd_set_new_stn_add(struct ieee80211_hw *hw,</div><div class='ctx'> 	cmd-&gt;stn_id = cpu_to_le16(sta-&gt;aid);</div><div class='ctx'> 	cmd-&gt;action = cpu_to_le16(MWL8K_STA_ACTION_ADD);</div><div class='ctx'> 	if (hw-&gt;conf.chandef.chan-&gt;band == NL80211_BAND_2GHZ)</div><div class='del'>-		rates = sta-&gt;supp_rates[NL80211_BAND_2GHZ];</div><div class='add'>+		rates = sta-&gt;deflink.supp_rates[NL80211_BAND_2GHZ];</div><div class='ctx'> 	else</div><div class='del'>-		rates = sta-&gt;supp_rates[NL80211_BAND_5GHZ] &lt;&lt; 5;</div><div class='add'>+		rates = sta-&gt;deflink.supp_rates[NL80211_BAND_5GHZ] &lt;&lt; 5;</div><div class='ctx'> 	cmd-&gt;legacy_rates = cpu_to_le32(rates);</div><div class='del'>-	if (sta-&gt;ht_cap.ht_supported) {</div><div class='del'>-		cmd-&gt;ht_rates[0] = sta-&gt;ht_cap.mcs.rx_mask[0];</div><div class='del'>-		cmd-&gt;ht_rates[1] = sta-&gt;ht_cap.mcs.rx_mask[1];</div><div class='del'>-		cmd-&gt;ht_rates[2] = sta-&gt;ht_cap.mcs.rx_mask[2];</div><div class='del'>-		cmd-&gt;ht_rates[3] = sta-&gt;ht_cap.mcs.rx_mask[3];</div><div class='del'>-		cmd-&gt;ht_capabilities_info = cpu_to_le16(sta-&gt;ht_cap.cap);</div><div class='del'>-		cmd-&gt;mac_ht_param_info = (sta-&gt;ht_cap.ampdu_factor &amp; 3) |</div><div class='del'>-			((sta-&gt;ht_cap.ampdu_density &amp; 7) &lt;&lt; 2);</div><div class='add'>+	if (sta-&gt;deflink.ht_cap.ht_supported) {</div><div class='add'>+		cmd-&gt;ht_rates[0] = sta-&gt;deflink.ht_cap.mcs.rx_mask[0];</div><div class='add'>+		cmd-&gt;ht_rates[1] = sta-&gt;deflink.ht_cap.mcs.rx_mask[1];</div><div class='add'>+		cmd-&gt;ht_rates[2] = sta-&gt;deflink.ht_cap.mcs.rx_mask[2];</div><div class='add'>+		cmd-&gt;ht_rates[3] = sta-&gt;deflink.ht_cap.mcs.rx_mask[3];</div><div class='add'>+		cmd-&gt;ht_capabilities_info = cpu_to_le16(sta-&gt;deflink.ht_cap.cap);</div><div class='add'>+		cmd-&gt;mac_ht_param_info = (sta-&gt;deflink.ht_cap.ampdu_factor &amp; 3) |</div><div class='add'>+			((sta-&gt;deflink.ht_cap.ampdu_density &amp; 7) &lt;&lt; 2);</div><div class='ctx'> 		cmd-&gt;is_qos_sta = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4206,7 +4277,7 @@ static int mwl8k_cmd_set_new_stn_del(struct ieee80211_hw *hw,</div><div class='ctx'> #define MIC_KEY_LENGTH		8</div><div class='ctx'> </div><div class='ctx'> struct mwl8k_cmd_update_encryption {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> </div><div class='ctx'> 	__le32 action;</div><div class='ctx'> 	__le32 reserved;</div><div class='hunk'>@@ -4216,7 +4287,7 @@ struct mwl8k_cmd_update_encryption {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct mwl8k_cmd_set_key {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> </div><div class='ctx'> 	__le32 action;</div><div class='ctx'> 	__le32 reserved;</div><div class='hunk'>@@ -4225,9 +4296,11 @@ struct mwl8k_cmd_set_key {</div><div class='ctx'> 	__le32 key_info;</div><div class='ctx'> 	__le32 key_id;</div><div class='ctx'> 	__le16 key_len;</div><div class='del'>-	__u8 key_material[MAX_ENCR_KEY_LENGTH];</div><div class='del'>-	__u8 tkip_tx_mic_key[MIC_KEY_LENGTH];</div><div class='del'>-	__u8 tkip_rx_mic_key[MIC_KEY_LENGTH];</div><div class='add'>+	struct {</div><div class='add'>+		__u8 key_material[MAX_ENCR_KEY_LENGTH];</div><div class='add'>+		__u8 tkip_tx_mic_key[MIC_KEY_LENGTH];</div><div class='add'>+		__u8 tkip_rx_mic_key[MIC_KEY_LENGTH];</div><div class='add'>+	} tkip;</div><div class='ctx'> 	__le16 tkip_rsc_low;</div><div class='ctx'> 	__le32 tkip_rsc_high;</div><div class='ctx'> 	__le16 tkip_tsc_low;</div><div class='hunk'>@@ -4375,7 +4448,7 @@ static int mwl8k_cmd_encryption_set_key(struct ieee80211_hw *hw,</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(cmd-&gt;key_material, key-&gt;key, keymlen);</div><div class='add'>+	memcpy(&amp;cmd-&gt;tkip, key-&gt;key, keymlen);</div><div class='ctx'> 	cmd-&gt;action = cpu_to_le32(action);</div><div class='ctx'> </div><div class='ctx'> 	rc = mwl8k_post_pervif_cmd(hw, vif, &amp;cmd-&gt;header);</div><div class='hunk'>@@ -4502,7 +4575,7 @@ struct peer_capability_info {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct mwl8k_cmd_update_stadb {</div><div class='del'>-	struct mwl8k_cmd_pkt header;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr header;</div><div class='ctx'> </div><div class='ctx'> 	/* See STADB_ACTION_TYPE */</div><div class='ctx'> 	__le32	action;</div><div class='hunk'>@@ -4543,16 +4616,16 @@ static int mwl8k_cmd_update_stadb_add(struct ieee80211_hw *hw,</div><div class='ctx'> 	p = &amp;cmd-&gt;peer_info;</div><div class='ctx'> 	p-&gt;peer_type = MWL8K_PEER_TYPE_ACCESSPOINT;</div><div class='ctx'> 	p-&gt;basic_caps = cpu_to_le16(vif-&gt;bss_conf.assoc_capability);</div><div class='del'>-	p-&gt;ht_support = sta-&gt;ht_cap.ht_supported;</div><div class='del'>-	p-&gt;ht_caps = cpu_to_le16(sta-&gt;ht_cap.cap);</div><div class='del'>-	p-&gt;extended_ht_caps = (sta-&gt;ht_cap.ampdu_factor &amp; 3) |</div><div class='del'>-		((sta-&gt;ht_cap.ampdu_density &amp; 7) &lt;&lt; 2);</div><div class='add'>+	p-&gt;ht_support = sta-&gt;deflink.ht_cap.ht_supported;</div><div class='add'>+	p-&gt;ht_caps = cpu_to_le16(sta-&gt;deflink.ht_cap.cap);</div><div class='add'>+	p-&gt;extended_ht_caps = (sta-&gt;deflink.ht_cap.ampdu_factor &amp; 3) |</div><div class='add'>+		((sta-&gt;deflink.ht_cap.ampdu_density &amp; 7) &lt;&lt; 2);</div><div class='ctx'> 	if (hw-&gt;conf.chandef.chan-&gt;band == NL80211_BAND_2GHZ)</div><div class='del'>-		rates = sta-&gt;supp_rates[NL80211_BAND_2GHZ];</div><div class='add'>+		rates = sta-&gt;deflink.supp_rates[NL80211_BAND_2GHZ];</div><div class='ctx'> 	else</div><div class='del'>-		rates = sta-&gt;supp_rates[NL80211_BAND_5GHZ] &lt;&lt; 5;</div><div class='add'>+		rates = sta-&gt;deflink.supp_rates[NL80211_BAND_5GHZ] &lt;&lt; 5;</div><div class='ctx'> 	legacy_rate_mask_to_array(p-&gt;legacy_rates, rates);</div><div class='del'>-	memcpy(p-&gt;ht_rates, sta-&gt;ht_cap.mcs.rx_mask, 16);</div><div class='add'>+	memcpy(p-&gt;ht_rates, &amp;sta-&gt;deflink.ht_cap.mcs, 16);</div><div class='ctx'> 	p-&gt;interop = 1;</div><div class='ctx'> 	p-&gt;amsdu_enabled = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -4764,7 +4837,7 @@ static int mwl8k_start(struct ieee80211_hw *hw)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mwl8k_stop(struct ieee80211_hw *hw)</div><div class='add'>+static void mwl8k_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwl8k_priv *priv = hw-&gt;priv;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -4948,7 +5021,7 @@ fail:</div><div class='ctx'> 	wiphy_err(hw-&gt;wiphy, "Firmware restart failed\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mwl8k_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+static int mwl8k_config(struct ieee80211_hw *hw, int radio_idx, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_conf *conf = &amp;hw-&gt;conf;</div><div class='ctx'> 	struct mwl8k_priv *priv = hw-&gt;priv;</div><div class='hunk'>@@ -5011,13 +5084,13 @@ mwl8k_bss_info_changed_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * No need to capture a beacon if we're no longer associated.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((changed &amp; BSS_CHANGED_ASSOC) &amp;&amp; !vif-&gt;bss_conf.assoc)</div><div class='add'>+	if ((changed &amp; BSS_CHANGED_ASSOC) &amp;&amp; !vif-&gt;cfg.assoc)</div><div class='ctx'> 		priv-&gt;capture_beacon = false;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Get the AP's legacy and MCS rates.</div><div class='ctx'> 	 */</div><div class='del'>-	if (vif-&gt;bss_conf.assoc) {</div><div class='add'>+	if (vif-&gt;cfg.assoc) {</div><div class='ctx'> 		struct ieee80211_sta *ap;</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_lock();</div><div class='hunk'>@@ -5029,12 +5102,12 @@ mwl8k_bss_info_changed_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (hw-&gt;conf.chandef.chan-&gt;band == NL80211_BAND_2GHZ) {</div><div class='del'>-			ap_legacy_rates = ap-&gt;supp_rates[NL80211_BAND_2GHZ];</div><div class='add'>+			ap_legacy_rates = ap-&gt;deflink.supp_rates[NL80211_BAND_2GHZ];</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ap_legacy_rates =</div><div class='del'>-				ap-&gt;supp_rates[NL80211_BAND_5GHZ] &lt;&lt; 5;</div><div class='add'>+				ap-&gt;deflink.supp_rates[NL80211_BAND_5GHZ] &lt;&lt; 5;</div><div class='ctx'> 		}</div><div class='del'>-		memcpy(ap_mcs_rates, ap-&gt;ht_cap.mcs.rx_mask, 16);</div><div class='add'>+		memcpy(ap_mcs_rates, &amp;ap-&gt;deflink.ht_cap.mcs, 16);</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> </div><div class='hunk'>@@ -5083,7 +5156,7 @@ mwl8k_bss_info_changed_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;bss_conf.assoc &amp;&amp; !priv-&gt;ap_fw &amp;&amp;</div><div class='add'>+	if (vif-&gt;cfg.assoc &amp;&amp; !priv-&gt;ap_fw &amp;&amp;</div><div class='ctx'> 	    (changed &amp; (BSS_CHANGED_ASSOC | BSS_CHANGED_ERP_CTS_PROT |</div><div class='ctx'> 			BSS_CHANGED_HT))) {</div><div class='ctx'> 		rc = mwl8k_cmd_set_aid(hw, vif, ap_legacy_rates);</div><div class='hunk'>@@ -5091,7 +5164,7 @@ mwl8k_bss_info_changed_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;bss_conf.assoc &amp;&amp;</div><div class='add'>+	if (vif-&gt;cfg.assoc &amp;&amp;</div><div class='ctx'> 	    (changed &amp; (BSS_CHANGED_ASSOC | BSS_CHANGED_BEACON_INT))) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Finalize the join.  Tell rx handler to process</div><div class='hunk'>@@ -5145,7 +5218,7 @@ mwl8k_bss_info_changed_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	if (changed &amp; (BSS_CHANGED_BEACON_INT | BSS_CHANGED_BEACON)) {</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-		skb = ieee80211_beacon_get(hw, vif);</div><div class='add'>+		skb = ieee80211_beacon_get(hw, vif, 0);</div><div class='ctx'> 		if (skb != NULL) {</div><div class='ctx'> 			mwl8k_cmd_set_beacon(hw, vif, skb-&gt;data, skb-&gt;len);</div><div class='ctx'> 			kfree_skb(skb);</div><div class='hunk'>@@ -5161,7 +5234,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mwl8k_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-		       struct ieee80211_bss_conf *info, u32 changed)</div><div class='add'>+		       struct ieee80211_bss_conf *info, u64 changed)</div><div class='ctx'> {</div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='ctx'> 		mwl8k_bss_info_changed_sta(hw, vif, info, changed);</div><div class='hunk'>@@ -5172,7 +5245,7 @@ mwl8k_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> static u64 mwl8k_prepare_multicast(struct ieee80211_hw *hw,</div><div class='ctx'> 				   struct netdev_hw_addr_list *mc_list)</div><div class='ctx'> {</div><div class='del'>-	struct mwl8k_cmd_pkt *cmd;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr *cmd;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Synthesize and return a command packet that programs the</div><div class='hunk'>@@ -5232,7 +5305,7 @@ static void mwl8k_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> 				   u64 multicast)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwl8k_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct mwl8k_cmd_pkt *cmd = (void *)(unsigned long)multicast;</div><div class='add'>+	struct mwl8k_cmd_pkt_hdr *cmd = (void *)(unsigned long)multicast;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * AP firmware doesn't allow fine-grained control over</div><div class='hunk'>@@ -5314,9 +5387,10 @@ static void mwl8k_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> 	mwl8k_fw_unlock(hw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mwl8k_set_rts_threshold(struct ieee80211_hw *hw, u32 value)</div><div class='add'>+static int mwl8k_set_rts_threshold(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+				   u32 value)</div><div class='ctx'> {</div><div class='del'>-	return mwl8k_cmd_set_rts_threshold(hw, value);</div><div class='add'>+	return mwl8k_cmd_set_rts_threshold(hw, radio_idx, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mwl8k_sta_remove(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -5345,7 +5419,7 @@ static int mwl8k_sta_add(struct ieee80211_hw *hw,</div><div class='ctx'> 		ret = mwl8k_cmd_update_stadb_add(hw, vif, sta);</div><div class='ctx'> 		if (ret &gt;= 0) {</div><div class='ctx'> 			MWL8K_STA(sta)-&gt;peer_id = ret;</div><div class='del'>-			if (sta-&gt;ht_cap.ht_supported)</div><div class='add'>+			if (sta-&gt;deflink.ht_cap.ht_supported)</div><div class='ctx'> 				MWL8K_STA(sta)-&gt;is_ampdu_allowed = true;</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -5363,7 +5437,8 @@ static int mwl8k_sta_add(struct ieee80211_hw *hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mwl8k_conf_tx(struct ieee80211_hw *hw,</div><div class='del'>-			 struct ieee80211_vif *vif, u16 queue,</div><div class='add'>+			 struct ieee80211_vif *vif,</div><div class='add'>+			 unsigned int link_id, u16 queue,</div><div class='ctx'> 			 const struct ieee80211_tx_queue_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwl8k_priv *priv = hw-&gt;priv;</div><div class='hunk'>@@ -5607,7 +5682,12 @@ static void mwl8k_sw_scan_complete(struct ieee80211_hw *hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ieee80211_ops mwl8k_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.tx			= mwl8k_tx,</div><div class='add'>+	.wake_tx_queue		= ieee80211_handle_wake_tx_queue,</div><div class='ctx'> 	.start			= mwl8k_start,</div><div class='ctx'> 	.stop			= mwl8k_stop,</div><div class='ctx'> 	.add_interface		= mwl8k_add_interface,</div><div class='hunk'>@@ -5800,8 +5880,8 @@ static void mwl8k_fw_state_machine(const struct firmware *fw, void *context)</div><div class='ctx'> fail:</div><div class='ctx'> 	priv-&gt;fw_state = FW_STATE_ERROR;</div><div class='ctx'> 	complete(&amp;priv-&gt;firmware_loading_complete);</div><div class='del'>-	device_release_driver(&amp;priv-&gt;pdev-&gt;dev);</div><div class='ctx'> 	mwl8k_release_firmware(priv);</div><div class='add'>+	device_release_driver(&amp;priv-&gt;pdev-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define MAX_RESTART_ATTEMPTS 1</div><div class='hunk'>@@ -6013,7 +6093,7 @@ static int mwl8k_reload_firmware(struct ieee80211_hw *hw, char *fw_image)</div><div class='ctx'> 	struct mwl8k_priv *priv = hw-&gt;priv;</div><div class='ctx'> 	struct mwl8k_vif *vif, *tmp_vif;</div><div class='ctx'> </div><div class='del'>-	mwl8k_stop(hw);</div><div class='add'>+	mwl8k_stop(hw, false);</div><div class='ctx'> 	mwl8k_rxq_deinit(hw, 0);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -6043,12 +6123,12 @@ static int mwl8k_reload_firmware(struct ieee80211_hw *hw, char *fw_image)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	rc = mwl8k_config(hw, ~0);</div><div class='add'>+	rc = mwl8k_config(hw, -1, ~0);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MWL8K_TX_WMM_QUEUES; i++) {</div><div class='del'>-		rc = mwl8k_conf_tx(hw, NULL, i, &amp;priv-&gt;wmm_params[i]);</div><div class='add'>+		rc = mwl8k_conf_tx(hw, NULL, 0, i, &amp;priv-&gt;wmm_params[i]);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/Kconfig b/drivers/net/wireless/mediatek/mt76/Kconfig<br/>index 9ff43f1fc50d..502303622a53 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/Kconfig</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+# SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> config MT76_CORE</div><div class='ctx'> 	tristate</div><div class='add'>+	select PAGE_POOL</div><div class='ctx'> </div><div class='ctx'> config MT76_LEDS</div><div class='ctx'> 	bool</div><div class='hunk'>@@ -28,9 +29,23 @@ config MT76_CONNAC_LIB</div><div class='ctx'> 	tristate</div><div class='ctx'> 	select MT76_CORE</div><div class='ctx'> </div><div class='add'>+config MT792x_LIB</div><div class='add'>+	tristate</div><div class='add'>+	select MT76_CONNAC_LIB</div><div class='add'>+</div><div class='add'>+config MT792x_USB</div><div class='add'>+	tristate</div><div class='add'>+	select MT76_USB</div><div class='add'>+</div><div class='add'>+config MT76_NPU</div><div class='add'>+	bool</div><div class='add'>+	depends on MT76_CORE</div><div class='add'>+</div><div class='ctx'> source "drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/mediatek/mt76/mt7603/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/mediatek/mt76/mt7615/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/mediatek/mt76/mt7915/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/mediatek/mt76/mt7921/Kconfig"</div><div class='add'>+source "drivers/net/wireless/mediatek/mt76/mt7996/Kconfig"</div><div class='add'>+source "drivers/net/wireless/mediatek/mt76/mt7925/Kconfig"</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/Makefile b/drivers/net/wireless/mediatek/mt76/Makefile<br/>index 94efe3c29053..1d42adfe8030 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/Makefile</a></div><div class='hunk'>@@ -1,24 +1,28 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+# SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> obj-$(CONFIG_MT76_CORE) += mt76.o</div><div class='ctx'> obj-$(CONFIG_MT76_USB) += mt76-usb.o</div><div class='ctx'> obj-$(CONFIG_MT76_SDIO) += mt76-sdio.o</div><div class='ctx'> obj-$(CONFIG_MT76x02_LIB) += mt76x02-lib.o</div><div class='ctx'> obj-$(CONFIG_MT76x02_USB) += mt76x02-usb.o</div><div class='ctx'> obj-$(CONFIG_MT76_CONNAC_LIB) += mt76-connac-lib.o</div><div class='add'>+obj-$(CONFIG_MT792x_LIB) += mt792x-lib.o</div><div class='add'>+obj-$(CONFIG_MT792x_USB) += mt792x-usb.o</div><div class='ctx'> </div><div class='ctx'> mt76-y := \</div><div class='ctx'> 	mmio.o util.o trace.o dma.o mac80211.o debugfs.o eeprom.o \</div><div class='del'>-	tx.o agg-rx.o mcu.o</div><div class='add'>+	tx.o agg-rx.o mcu.o wed.o scan.o channel.o</div><div class='ctx'> </div><div class='add'>+mt76-$(CONFIG_MT76_NPU) += npu.o</div><div class='ctx'> mt76-$(CONFIG_PCI) += pci.o</div><div class='ctx'> mt76-$(CONFIG_NL80211_TESTMODE) += testmode.o</div><div class='ctx'> </div><div class='ctx'> mt76-usb-y := usb.o usb_trace.o</div><div class='del'>-mt76-sdio-y := sdio.o</div><div class='add'>+mt76-sdio-y := sdio.o sdio_txrx.o</div><div class='ctx'> </div><div class='ctx'> CFLAGS_trace.o := -I$(src)</div><div class='ctx'> CFLAGS_usb_trace.o := -I$(src)</div><div class='ctx'> CFLAGS_mt76x02_trace.o := -I$(src)</div><div class='add'>+CFLAGS_mt792x_trace.o := -I$(src)</div><div class='ctx'> </div><div class='ctx'> mt76x02-lib-y := mt76x02_util.o mt76x02_mac.o mt76x02_mcu.o \</div><div class='ctx'> 		 mt76x02_eeprom.o mt76x02_phy.o mt76x02_mmio.o \</div><div class='hunk'>@@ -27,11 +31,18 @@ mt76x02-lib-y := mt76x02_util.o mt76x02_mac.o mt76x02_mcu.o \</div><div class='ctx'> </div><div class='ctx'> mt76x02-usb-y := mt76x02_usb_mcu.o mt76x02_usb_core.o</div><div class='ctx'> </div><div class='del'>-mt76-connac-lib-y := mt76_connac_mcu.o mt76_connac_mac.o</div><div class='add'>+mt76-connac-lib-y := mt76_connac_mcu.o mt76_connac_mac.o mt76_connac3_mac.o</div><div class='add'>+</div><div class='add'>+mt792x-lib-y := mt792x_core.o mt792x_mac.o mt792x_trace.o \</div><div class='add'>+		mt792x_debugfs.o mt792x_dma.o</div><div class='add'>+mt792x-lib-$(CONFIG_ACPI) += mt792x_acpi_sar.o</div><div class='add'>+mt792x-usb-y := mt792x_usb.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MT76x0_COMMON) += mt76x0/</div><div class='ctx'> obj-$(CONFIG_MT76x2_COMMON) += mt76x2/</div><div class='ctx'> obj-$(CONFIG_MT7603E) += mt7603/</div><div class='ctx'> obj-$(CONFIG_MT7615_COMMON) += mt7615/</div><div class='ctx'> obj-$(CONFIG_MT7915E) += mt7915/</div><div class='del'>-obj-$(CONFIG_MT7921E) += mt7921/</div><div class='add'>+obj-$(CONFIG_MT7921_COMMON) += mt7921/</div><div class='add'>+obj-$(CONFIG_MT7996E) += mt7996/</div><div class='add'>+obj-$(CONFIG_MT7925_COMMON) += mt7925/</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/agg-rx.c b/drivers/net/wireless/mediatek/mt76/agg-rx.c<br/>index 72622220051b..3d34caf7e4f7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/agg-rx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/agg-rx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/agg-rx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/agg-rx.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2018 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -122,7 +122,7 @@ mt76_rx_aggr_check_ctl(struct sk_buff *skb, struct sk_buff_head *frames)</div><div class='ctx'> 	struct ieee80211_bar *bar = mt76_skb_get_hdr(skb);</div><div class='ctx'> 	struct mt76_wcid *wcid = status-&gt;wcid;</div><div class='ctx'> 	struct mt76_rx_tid *tid;</div><div class='del'>-	u8 tidno = status-&gt;qos_ctl &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='add'>+	u8 tidno;</div><div class='ctx'> 	u16 seqno;</div><div class='ctx'> </div><div class='ctx'> 	if (!ieee80211_is_ctl(bar-&gt;frame_control))</div><div class='hunk'>@@ -162,17 +162,19 @@ void mt76_rx_aggr_reorder(struct sk_buff *skb, struct sk_buff_head *frames)</div><div class='ctx'> 	if (!sta)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!status-&gt;aggr &amp;&amp; !(status-&gt;flag &amp; RX_FLAG_8023)) {</div><div class='del'>-		mt76_rx_aggr_check_ctl(skb, frames);</div><div class='add'>+	if (!status-&gt;aggr) {</div><div class='add'>+		if (!(status-&gt;flag &amp; RX_FLAG_8023))</div><div class='add'>+			mt76_rx_aggr_check_ctl(skb, frames);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* not part of a BA session */</div><div class='ctx'> 	ackp = status-&gt;qos_ctl &amp; IEEE80211_QOS_CTL_ACK_POLICY_MASK;</div><div class='del'>-	if (ackp != IEEE80211_QOS_CTL_ACK_POLICY_BLOCKACK &amp;&amp;</div><div class='del'>-	    ackp != IEEE80211_QOS_CTL_ACK_POLICY_NORMAL)</div><div class='add'>+	if (ackp == IEEE80211_QOS_CTL_ACK_POLICY_NOACK)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (wcid-&gt;def_wcid)</div><div class='add'>+		wcid = wcid-&gt;def_wcid;</div><div class='ctx'> 	tid = rcu_dereference(wcid-&gt;aggr[tidno]);</div><div class='ctx'> 	if (!tid)</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/channel.c b/drivers/net/wireless/mediatek/mt76/channel.c<br/>new file mode 100644<br/>index 000000000000..2b705bdb7993<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/channel.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/channel.c</a></div><div class='hunk'>@@ -0,0 +1,416 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='add'>+ */</div><div class='add'>+#include "mt76.h"</div><div class='add'>+</div><div class='add'>+static struct mt76_vif_link *</div><div class='add'>+mt76_alloc_mlink(struct mt76_dev *dev, struct mt76_vif_data *mvif)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mlink;</div><div class='add'>+</div><div class='add'>+	mlink = kzalloc(dev-&gt;drv-&gt;link_data_size, GFP_KERNEL);</div><div class='add'>+	if (!mlink)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	mlink-&gt;mvif = mvif;</div><div class='add'>+</div><div class='add'>+	return mlink;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt76_phy_update_channel(struct mt76_phy *phy,</div><div class='add'>+			struct ieee80211_chanctx_conf *conf)</div><div class='add'>+{</div><div class='add'>+	phy-&gt;radar_enabled = conf-&gt;radar_enabled;</div><div class='add'>+	phy-&gt;main_chandef = conf-&gt;def;</div><div class='add'>+	phy-&gt;chanctx = (struct mt76_chanctx *)conf-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	return __mt76_set_channel(phy, &amp;phy-&gt;main_chandef, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt76_add_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+		     struct ieee80211_chanctx_conf *conf)</div><div class='add'>+{</div><div class='add'>+	struct mt76_chanctx *ctx = (struct mt76_chanctx *)conf-&gt;drv_priv;</div><div class='add'>+	struct mt76_phy *phy = hw-&gt;priv;</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	phy = ctx-&gt;phy = dev-&gt;band_phys[conf-&gt;def.chan-&gt;band];</div><div class='add'>+	if (WARN_ON_ONCE(!phy))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;scan.phy == phy)</div><div class='add'>+		mt76_abort_scan(dev);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+	if (!phy-&gt;chanctx)</div><div class='add'>+		ret = mt76_phy_update_channel(phy, conf);</div><div class='add'>+	else</div><div class='add'>+		ret = 0;</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_add_chanctx);</div><div class='add'>+</div><div class='add'>+void mt76_remove_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+			 struct ieee80211_chanctx_conf *conf)</div><div class='add'>+{</div><div class='add'>+	struct mt76_chanctx *ctx = (struct mt76_chanctx *)conf-&gt;drv_priv;</div><div class='add'>+	struct mt76_phy *phy = hw-&gt;priv;</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+</div><div class='add'>+	phy = ctx-&gt;phy;</div><div class='add'>+	if (WARN_ON_ONCE(!phy))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;scan.phy == phy)</div><div class='add'>+		mt76_abort_scan(dev);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+	if (phy-&gt;chanctx == ctx)</div><div class='add'>+		phy-&gt;chanctx = NULL;</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_remove_chanctx);</div><div class='add'>+</div><div class='add'>+void mt76_change_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+			 struct ieee80211_chanctx_conf *conf,</div><div class='add'>+			 u32 changed)</div><div class='add'>+{</div><div class='add'>+	struct mt76_chanctx *ctx = (struct mt76_chanctx *)conf-&gt;drv_priv;</div><div class='add'>+	struct mt76_phy *phy = ctx-&gt;phy;</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+</div><div class='add'>+	if (!(changed &amp; (IEEE80211_CHANCTX_CHANGE_WIDTH |</div><div class='add'>+			 IEEE80211_CHANCTX_CHANGE_RADAR)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;phy-&gt;mac_work);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+	mt76_phy_update_channel(phy, conf);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_change_chanctx);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int mt76_assign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+			    struct ieee80211_vif *vif,</div><div class='add'>+			    struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			    struct ieee80211_chanctx_conf *conf)</div><div class='add'>+{</div><div class='add'>+	struct mt76_chanctx *ctx = (struct mt76_chanctx *)conf-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_link *mlink = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_data *mvif = mlink-&gt;mvif;</div><div class='add'>+	int link_id = link_conf-&gt;link_id;</div><div class='add'>+	struct mt76_phy *phy = ctx-&gt;phy;</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+	bool mlink_alloc = false;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;scan.vif == vif)</div><div class='add'>+		mt76_abort_scan(dev);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_MONITOR &amp;&amp;</div><div class='add'>+	    is_zero_ether_addr(vif-&gt;addr))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mlink = mt76_vif_conf_link(dev, vif, link_conf);</div><div class='add'>+	if (!mlink) {</div><div class='add'>+		mlink = mt76_alloc_mlink(dev, mvif);</div><div class='add'>+		if (!mlink) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		mlink_alloc = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mlink-&gt;ctx = conf;</div><div class='add'>+	ret = dev-&gt;drv-&gt;vif_link_add(phy, vif, link_conf, mlink);</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (mlink_alloc)</div><div class='add'>+			kfree(mlink);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link_conf != &amp;vif-&gt;bss_conf)</div><div class='add'>+		rcu_assign_pointer(mvif-&gt;link[link_id], mlink);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_assign_vif_chanctx);</div><div class='add'>+</div><div class='add'>+void mt76_unassign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+			       struct ieee80211_vif *vif,</div><div class='add'>+			       struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			       struct ieee80211_chanctx_conf *conf)</div><div class='add'>+{</div><div class='add'>+	struct mt76_chanctx *ctx = (struct mt76_chanctx *)conf-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_link *mlink = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_data *mvif = mlink-&gt;mvif;</div><div class='add'>+	int link_id = link_conf-&gt;link_id;</div><div class='add'>+	struct mt76_phy *phy = ctx-&gt;phy;</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;scan.vif == vif)</div><div class='add'>+		mt76_abort_scan(dev);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_MONITOR &amp;&amp;</div><div class='add'>+	    is_zero_ether_addr(vif-&gt;addr))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mlink = mt76_vif_conf_link(dev, vif, link_conf);</div><div class='add'>+	if (!mlink)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (mlink != (struct mt76_vif_link *)vif-&gt;drv_priv)</div><div class='add'>+		rcu_assign_pointer(mvif-&gt;link[link_id], NULL);</div><div class='add'>+</div><div class='add'>+	dev-&gt;drv-&gt;vif_link_remove(phy, vif, link_conf, mlink);</div><div class='add'>+	mlink-&gt;ctx = NULL;</div><div class='add'>+</div><div class='add'>+	if (mlink != (struct mt76_vif_link *)vif-&gt;drv_priv)</div><div class='add'>+		kfree_rcu(mlink, rcu_head);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_unassign_vif_chanctx);</div><div class='add'>+</div><div class='add'>+int mt76_switch_vif_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+			    struct ieee80211_vif_chanctx_switch *vifs,</div><div class='add'>+			    int n_vifs,</div><div class='add'>+			    enum ieee80211_chanctx_switch_mode mode)</div><div class='add'>+{</div><div class='add'>+	struct mt76_chanctx *old_ctx = (struct mt76_chanctx *)vifs-&gt;old_ctx-&gt;drv_priv;</div><div class='add'>+	struct mt76_chanctx *new_ctx = (struct mt76_chanctx *)vifs-&gt;new_ctx-&gt;drv_priv;</div><div class='add'>+	struct ieee80211_chanctx_conf *conf = vifs-&gt;new_ctx;</div><div class='add'>+	struct mt76_phy *old_phy = old_ctx-&gt;phy;</div><div class='add'>+	struct mt76_phy *phy = hw-&gt;priv;</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct mt76_vif_link *mlink;</div><div class='add'>+	bool update_chan;</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+</div><div class='add'>+	if (mode == CHANCTX_SWMODE_SWAP_CONTEXTS)</div><div class='add'>+		phy = new_ctx-&gt;phy = dev-&gt;band_phys[conf-&gt;def.chan-&gt;band];</div><div class='add'>+	else</div><div class='add'>+		phy = new_ctx-&gt;phy;</div><div class='add'>+	if (!phy)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	update_chan = phy-&gt;chanctx != new_ctx;</div><div class='add'>+	if (update_chan) {</div><div class='add'>+		if (dev-&gt;scan.phy == phy)</div><div class='add'>+			mt76_abort_scan(dev);</div><div class='add'>+</div><div class='add'>+		cancel_delayed_work_sync(&amp;phy-&gt;mac_work);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (mode == CHANCTX_SWMODE_SWAP_CONTEXTS &amp;&amp;</div><div class='add'>+	    phy != old_phy &amp;&amp; old_phy-&gt;chanctx == old_ctx)</div><div class='add'>+		old_phy-&gt;chanctx = NULL;</div><div class='add'>+</div><div class='add'>+	if (update_chan)</div><div class='add'>+		ret = mt76_phy_update_channel(phy, vifs-&gt;new_ctx);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (old_phy == phy)</div><div class='add'>+		goto skip_link_replace;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n_vifs; i++) {</div><div class='add'>+		mlink = mt76_vif_conf_link(dev, vifs[i].vif, vifs[i].link_conf);</div><div class='add'>+		if (!mlink)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dev-&gt;drv-&gt;vif_link_remove(old_phy, vifs[i].vif,</div><div class='add'>+					  vifs[i].link_conf, mlink);</div><div class='add'>+</div><div class='add'>+		ret = dev-&gt;drv-&gt;vif_link_add(phy, vifs[i].vif,</div><div class='add'>+					     vifs[i].link_conf, mlink);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+skip_link_replace:</div><div class='add'>+	for (i = 0; i &lt; n_vifs; i++) {</div><div class='add'>+		mlink = mt76_vif_conf_link(dev, vifs[i].vif, vifs[i].link_conf);</div><div class='add'>+		if (!mlink)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mlink-&gt;ctx = vifs-&gt;new_ctx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_switch_vif_chanctx);</div><div class='add'>+</div><div class='add'>+struct mt76_vif_link *mt76_get_vif_phy_link(struct mt76_phy *phy,</div><div class='add'>+					    struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mlink = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_data *mvif = mlink-&gt;mvif;</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mvif-&gt;link); i++) {</div><div class='add'>+		mlink = mt76_dereference(mvif-&gt;link[i], dev);</div><div class='add'>+		if (!mlink)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (mt76_vif_link_phy(mlink) == phy)</div><div class='add'>+			return mlink;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;drv-&gt;vif_link_add)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	mlink = mt76_alloc_mlink(dev, mvif);</div><div class='add'>+	if (!mlink)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	mlink-&gt;offchannel = true;</div><div class='add'>+	ret = dev-&gt;drv-&gt;vif_link_add(phy, vif, &amp;vif-&gt;bss_conf, mlink);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(mlink);</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+	}</div><div class='add'>+	rcu_assign_pointer(mvif-&gt;offchannel_link, mlink);</div><div class='add'>+</div><div class='add'>+	return mlink;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt76_put_vif_phy_link(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='add'>+			   struct mt76_vif_link *mlink)</div><div class='add'>+{</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct mt76_vif_data *mvif;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR_OR_NULL(mlink) || !mlink-&gt;offchannel)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mvif = mlink-&gt;mvif;</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(mvif-&gt;offchannel_link, NULL);</div><div class='add'>+	dev-&gt;drv-&gt;vif_link_remove(phy, vif, &amp;vif-&gt;bss_conf, mlink);</div><div class='add'>+	kfree(mlink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt76_roc_complete(struct mt76_phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mlink = phy-&gt;roc_link;</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+</div><div class='add'>+	if (!phy-&gt;roc_vif)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (mlink)</div><div class='add'>+		mlink-&gt;mvif-&gt;roc_phy = NULL;</div><div class='add'>+	if (phy-&gt;main_chandef.chan &amp;&amp;</div><div class='add'>+	    !test_bit(MT76_MCU_RESET, &amp;dev-&gt;phy.state))</div><div class='add'>+		mt76_set_channel(phy, &amp;phy-&gt;main_chandef, false);</div><div class='add'>+	mt76_put_vif_phy_link(phy, phy-&gt;roc_vif, phy-&gt;roc_link);</div><div class='add'>+	phy-&gt;roc_vif = NULL;</div><div class='add'>+	phy-&gt;roc_link = NULL;</div><div class='add'>+	if (!test_bit(MT76_MCU_RESET, &amp;dev-&gt;phy.state))</div><div class='add'>+		ieee80211_remain_on_channel_expired(phy-&gt;hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt76_roc_complete_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct mt76_phy *phy = container_of(work, struct mt76_phy, roc_work.work);</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+	mt76_roc_complete(phy);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt76_abort_roc(struct mt76_phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;phy-&gt;roc_work);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+	mt76_roc_complete(phy);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_abort_roc);</div><div class='add'>+</div><div class='add'>+int mt76_remain_on_channel(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			   struct ieee80211_channel *chan, int duration,</div><div class='add'>+			   enum ieee80211_roc_type type)</div><div class='add'>+{</div><div class='add'>+	struct cfg80211_chan_def chandef = {};</div><div class='add'>+	struct mt76_phy *phy = hw-&gt;priv;</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct mt76_vif_link *mlink;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	phy = dev-&gt;band_phys[chan-&gt;band];</div><div class='add'>+	if (!phy)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;roc_vif || dev-&gt;scan.phy == phy ||</div><div class='add'>+	    test_bit(MT76_MCU_RESET, &amp;dev-&gt;phy.state)) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mlink = mt76_get_vif_phy_link(phy, vif);</div><div class='add'>+	if (IS_ERR(mlink)) {</div><div class='add'>+		ret = PTR_ERR(mlink);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mlink-&gt;mvif-&gt;roc_phy = phy;</div><div class='add'>+	phy-&gt;roc_vif = vif;</div><div class='add'>+	phy-&gt;roc_link = mlink;</div><div class='add'>+	cfg80211_chandef_create(&amp;chandef, chan, NL80211_CHAN_HT20);</div><div class='add'>+	mt76_set_channel(phy, &amp;chandef, true);</div><div class='add'>+	ieee80211_ready_on_channel(hw);</div><div class='add'>+	ieee80211_queue_delayed_work(phy-&gt;hw, &amp;phy-&gt;roc_work,</div><div class='add'>+				     msecs_to_jiffies(duration));</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_remain_on_channel);</div><div class='add'>+</div><div class='add'>+int mt76_cancel_remain_on_channel(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mlink = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_data *mvif = mlink-&gt;mvif;</div><div class='add'>+	struct mt76_phy *phy = mvif-&gt;roc_phy;</div><div class='add'>+</div><div class='add'>+	if (!phy)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mt76_abort_roc(phy);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_cancel_remain_on_channel);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/debugfs.c b/drivers/net/wireless/mediatek/mt76/debugfs.c<br/>index fa48cc3a7a8f..a5ac6ca86735 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/debugfs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/debugfs.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -33,8 +33,8 @@ mt76_napi_threaded_set(void *data, u64 val)</div><div class='ctx'> 	if (!mt76_is_mmio(dev))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;napi_dev.threaded != val)</div><div class='del'>-		return dev_set_threaded(&amp;dev-&gt;napi_dev, val);</div><div class='add'>+	if (dev-&gt;napi_dev-&gt;threaded != val)</div><div class='add'>+		return dev_set_threaded(dev-&gt;napi_dev, val);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -44,7 +44,7 @@ mt76_napi_threaded_get(void *data, u64 *val)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_dev *dev = data;</div><div class='ctx'> </div><div class='del'>-	*val = dev-&gt;napi_dev.threaded;</div><div class='add'>+	*val = dev-&gt;napi_dev-&gt;threaded;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -56,14 +56,14 @@ int mt76_queues_read(struct seq_file *s, void *data)</div><div class='ctx'> 	struct mt76_dev *dev = dev_get_drvdata(s-&gt;private);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	seq_puts(s, "     queue | hw-queued |      head |      tail |\n");</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;phy.q_tx); i++) {</div><div class='ctx'> 		struct mt76_queue *q = dev-&gt;phy.q_tx[i];</div><div class='ctx'> </div><div class='ctx'> 		if (!q)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		seq_printf(s,</div><div class='del'>-			   "%d:	queued=%d head=%d tail=%d\n",</div><div class='add'>+		seq_printf(s, " %9d | %9d | %9d | %9d |\n",</div><div class='ctx'> 			   i, q-&gt;queued, q-&gt;head, q-&gt;tail);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -76,11 +76,12 @@ static int mt76_rx_queues_read(struct seq_file *s, void *data)</div><div class='ctx'> 	struct mt76_dev *dev = dev_get_drvdata(s-&gt;private);</div><div class='ctx'> 	int i, queued;</div><div class='ctx'> </div><div class='add'>+	seq_puts(s, "     queue | hw-queued |      head |      tail |\n");</div><div class='ctx'> 	mt76_for_each_q_rx(dev, i) {</div><div class='ctx'> 		struct mt76_queue *q = &amp;dev-&gt;q_rx[i];</div><div class='ctx'> </div><div class='ctx'> 		queued = mt76_is_usb(dev) ? q-&gt;ndesc - q-&gt;queued : q-&gt;queued;</div><div class='del'>-		seq_printf(s, "%d:	queued=%d head=%d tail=%d\n",</div><div class='add'>+		seq_printf(s, " %9d | %9d | %9d | %9d |\n",</div><div class='ctx'> 			   i, queued, q-&gt;head, q-&gt;tail);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -92,52 +93,34 @@ void mt76_seq_puts_array(struct seq_file *file, const char *str,</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	seq_printf(file, "%10s:", str);</div><div class='add'>+	seq_printf(file, "%16s:", str);</div><div class='ctx'> 	for (i = 0; i &lt; len; i++)</div><div class='del'>-		seq_printf(file, " %2d", val[i]);</div><div class='add'>+		seq_printf(file, " %4d", val[i]);</div><div class='ctx'> 	seq_puts(file, "\n");</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_seq_puts_array);</div><div class='ctx'> </div><div class='del'>-static int mt76_read_rate_txpower(struct seq_file *s, void *data)</div><div class='del'>-{</div><div class='del'>-	struct mt76_dev *dev = dev_get_drvdata(s-&gt;private);</div><div class='del'>-</div><div class='del'>-	mt76_seq_puts_array(s, "CCK", dev-&gt;rate_power.cck,</div><div class='del'>-			    ARRAY_SIZE(dev-&gt;rate_power.cck));</div><div class='del'>-	mt76_seq_puts_array(s, "OFDM", dev-&gt;rate_power.ofdm,</div><div class='del'>-			    ARRAY_SIZE(dev-&gt;rate_power.ofdm));</div><div class='del'>-	mt76_seq_puts_array(s, "STBC", dev-&gt;rate_power.stbc,</div><div class='del'>-			    ARRAY_SIZE(dev-&gt;rate_power.stbc));</div><div class='del'>-	mt76_seq_puts_array(s, "HT", dev-&gt;rate_power.ht,</div><div class='del'>-			    ARRAY_SIZE(dev-&gt;rate_power.ht));</div><div class='del'>-	mt76_seq_puts_array(s, "VHT", dev-&gt;rate_power.vht,</div><div class='del'>-			    ARRAY_SIZE(dev-&gt;rate_power.vht));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct dentry *mt76_register_debugfs(struct mt76_dev *dev)</div><div class='add'>+struct dentry *</div><div class='add'>+mt76_register_debugfs_fops(struct mt76_phy *phy,</div><div class='add'>+			   const struct file_operations *ops)</div><div class='ctx'> {</div><div class='add'>+	const struct file_operations *fops = ops ? ops : &amp;fops_regval;</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct dentry *dir;</div><div class='ctx'> </div><div class='del'>-	dir = debugfs_create_dir("mt76", dev-&gt;hw-&gt;wiphy-&gt;debugfsdir);</div><div class='del'>-	if (!dir)</div><div class='del'>-		return NULL;</div><div class='add'>+	dir = debugfs_create_dir("mt76", phy-&gt;hw-&gt;wiphy-&gt;debugfsdir);</div><div class='ctx'> </div><div class='del'>-	debugfs_create_u8("led_pin", 0600, dir, &amp;dev-&gt;led_pin);</div><div class='add'>+	debugfs_create_u8("led_pin", 0600, dir, &amp;phy-&gt;leds.pin);</div><div class='ctx'> 	debugfs_create_u32("regidx", 0600, dir, &amp;dev-&gt;debugfs_reg);</div><div class='del'>-	debugfs_create_file_unsafe("regval", 0600, dir, dev,</div><div class='del'>-				   &amp;fops_regval);</div><div class='add'>+	debugfs_create_file_unsafe("regval", 0600, dir, dev, fops);</div><div class='ctx'> 	debugfs_create_file_unsafe("napi_threaded", 0600, dir, dev,</div><div class='ctx'> 				   &amp;fops_napi_threaded);</div><div class='ctx'> 	debugfs_create_blob("eeprom", 0400, dir, &amp;dev-&gt;eeprom);</div><div class='ctx'> 	if (dev-&gt;otp.data)</div><div class='ctx'> 		debugfs_create_blob("otp", 0400, dir, &amp;dev-&gt;otp);</div><div class='del'>-	debugfs_create_devm_seqfile(dev-&gt;dev, "rate_txpower", dir,</div><div class='del'>-				    mt76_read_rate_txpower);</div><div class='ctx'> 	debugfs_create_devm_seqfile(dev-&gt;dev, "rx-queues", dir,</div><div class='ctx'> 				    mt76_rx_queues_read);</div><div class='ctx'> </div><div class='ctx'> 	return dir;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(mt76_register_debugfs);</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_register_debugfs_fops);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c<br/>index 72b1cc0ecfda..f240016ed9f0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/dma.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/dma.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/dma.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/dma.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -16,12 +16,17 @@ mt76_alloc_txwi(struct mt76_dev *dev)</div><div class='ctx'> 	int size;</div><div class='ctx'> </div><div class='ctx'> 	size = L1_CACHE_ALIGN(dev-&gt;drv-&gt;txwi_size + sizeof(*t));</div><div class='del'>-	txwi = devm_kzalloc(dev-&gt;dev, size, GFP_ATOMIC);</div><div class='add'>+	txwi = kzalloc(size, GFP_ATOMIC);</div><div class='ctx'> 	if (!txwi)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	addr = dma_map_single(dev-&gt;dev, txwi, dev-&gt;drv-&gt;txwi_size,</div><div class='add'>+	addr = dma_map_single(dev-&gt;dma_dev, txwi, dev-&gt;drv-&gt;txwi_size,</div><div class='ctx'> 			      DMA_TO_DEVICE);</div><div class='add'>+	if (unlikely(dma_mapping_error(dev-&gt;dma_dev, addr))) {</div><div class='add'>+		kfree(txwi);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	t = (struct mt76_txwi_cache *)(txwi + dev-&gt;drv-&gt;txwi_size);</div><div class='ctx'> 	t-&gt;dma_addr = addr;</div><div class='ctx'> </div><div class='hunk'>@@ -29,6 +34,19 @@ mt76_alloc_txwi(struct mt76_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct mt76_txwi_cache *</div><div class='add'>+mt76_alloc_rxwi(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_txwi_cache *t;</div><div class='add'>+</div><div class='add'>+	t = kzalloc(L1_CACHE_ALIGN(sizeof(*t)), GFP_ATOMIC);</div><div class='add'>+	if (!t)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	t-&gt;ptr = NULL;</div><div class='add'>+	return t;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct mt76_txwi_cache *</div><div class='ctx'> __mt76_get_txwi(struct mt76_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_txwi_cache *t = NULL;</div><div class='hunk'>@@ -45,6 +63,22 @@ __mt76_get_txwi(struct mt76_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct mt76_txwi_cache *</div><div class='add'>+__mt76_get_rxwi(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_txwi_cache *t = NULL;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;wed_lock);</div><div class='add'>+	if (!list_empty(&amp;dev-&gt;rxwi_cache)) {</div><div class='add'>+		t = list_first_entry(&amp;dev-&gt;rxwi_cache, struct mt76_txwi_cache,</div><div class='add'>+				     list);</div><div class='add'>+		list_del(&amp;t-&gt;list);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;wed_lock);</div><div class='add'>+</div><div class='add'>+	return t;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct mt76_txwi_cache *</div><div class='ctx'> mt76_get_txwi(struct mt76_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_txwi_cache *t = __mt76_get_txwi(dev);</div><div class='hunk'>@@ -55,6 +89,18 @@ mt76_get_txwi(struct mt76_dev *dev)</div><div class='ctx'> 	return mt76_alloc_txwi(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct mt76_txwi_cache *</div><div class='add'>+mt76_get_rxwi(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_txwi_cache *t = __mt76_get_rxwi(dev);</div><div class='add'>+</div><div class='add'>+	if (t)</div><div class='add'>+		return t;</div><div class='add'>+</div><div class='add'>+	return mt76_alloc_rxwi(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_get_rxwi);</div><div class='add'>+</div><div class='ctx'> void</div><div class='ctx'> mt76_put_txwi(struct mt76_dev *dev, struct mt76_txwi_cache *t)</div><div class='ctx'> {</div><div class='hunk'>@@ -67,72 +113,194 @@ mt76_put_txwi(struct mt76_dev *dev, struct mt76_txwi_cache *t)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_put_txwi);</div><div class='ctx'> </div><div class='add'>+void</div><div class='add'>+mt76_put_rxwi(struct mt76_dev *dev, struct mt76_txwi_cache *t)</div><div class='add'>+{</div><div class='add'>+	if (!t)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;wed_lock);</div><div class='add'>+	list_add(&amp;t-&gt;list, &amp;dev-&gt;rxwi_cache);</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;wed_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_put_rxwi);</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> mt76_free_pending_txwi(struct mt76_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_txwi_cache *t;</div><div class='ctx'> </div><div class='ctx'> 	local_bh_disable();</div><div class='del'>-	while ((t = __mt76_get_txwi(dev)) != NULL)</div><div class='del'>-		dma_unmap_single(dev-&gt;dev, t-&gt;dma_addr, dev-&gt;drv-&gt;txwi_size,</div><div class='add'>+	while ((t = __mt76_get_txwi(dev)) != NULL) {</div><div class='add'>+		dma_unmap_single(dev-&gt;dma_dev, t-&gt;dma_addr, dev-&gt;drv-&gt;txwi_size,</div><div class='ctx'> 				 DMA_TO_DEVICE);</div><div class='add'>+		kfree(mt76_get_txwi_ptr(dev, t));</div><div class='add'>+	}</div><div class='ctx'> 	local_bh_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void</div><div class='add'>+mt76_free_pending_rxwi(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_txwi_cache *t;</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	while ((t = __mt76_get_rxwi(dev)) != NULL) {</div><div class='add'>+		if (t-&gt;ptr)</div><div class='add'>+			mt76_put_page_pool_buf(t-&gt;ptr, false);</div><div class='add'>+		kfree(t);</div><div class='add'>+	}</div><div class='add'>+	local_bh_enable();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_free_pending_rxwi);</div><div class='add'>+</div><div class='ctx'> static void</div><div class='del'>-mt76_dma_sync_idx(struct mt76_dev *dev, struct mt76_queue *q)</div><div class='add'>+mt76_dma_queue_magic_cnt_init(struct mt76_dev *dev, struct mt76_queue *q)</div><div class='ctx'> {</div><div class='del'>-	writel(q-&gt;desc_dma, &amp;q-&gt;regs-&gt;desc_base);</div><div class='del'>-	writel(q-&gt;ndesc, &amp;q-&gt;regs-&gt;ring_size);</div><div class='del'>-	q-&gt;head = readl(&amp;q-&gt;regs-&gt;dma_idx);</div><div class='del'>-	q-&gt;tail = q-&gt;head;</div><div class='add'>+	if (!mt76_queue_is_wed_rro(q))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	q-&gt;magic_cnt = 0;</div><div class='add'>+	if (mt76_queue_is_wed_rro_ind(q)) {</div><div class='add'>+		struct mt76_wed_rro_desc *rro_desc;</div><div class='add'>+		u32 data1 = FIELD_PREP(RRO_IND_DATA1_MAGIC_CNT_MASK,</div><div class='add'>+				       MT_DMA_WED_IND_CMD_CNT - 1);</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		rro_desc = (struct mt76_wed_rro_desc *)q-&gt;desc;</div><div class='add'>+		for (i = 0; i &lt; q-&gt;ndesc; i++) {</div><div class='add'>+			struct mt76_wed_rro_ind *cmd;</div><div class='add'>+</div><div class='add'>+			cmd = (struct mt76_wed_rro_ind *)&amp;rro_desc[i];</div><div class='add'>+			cmd-&gt;data1 = cpu_to_le32(data1);</div><div class='add'>+		}</div><div class='add'>+	} else if (mt76_queue_is_wed_rro_rxdmad_c(q)) {</div><div class='add'>+		struct mt76_rro_rxdmad_c *dmad = (void *)q-&gt;desc;</div><div class='add'>+		u32 data3 = FIELD_PREP(RRO_RXDMAD_DATA3_MAGIC_CNT_MASK,</div><div class='add'>+				       MT_DMA_MAGIC_CNT - 1);</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; q-&gt;ndesc; i++)</div><div class='add'>+			dmad[i].data3 = cpu_to_le32(data3);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q)</div><div class='add'>+mt76_dma_sync_idx(struct mt76_dev *dev, struct mt76_queue *q)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	Q_WRITE(q, desc_base, q-&gt;desc_dma);</div><div class='add'>+	if ((q-&gt;flags &amp; MT_QFLAG_WED_RRO_EN) &amp;&amp; !mt76_npu_device_active(dev))</div><div class='add'>+		Q_WRITE(q, ring_size, MT_DMA_RRO_EN | q-&gt;ndesc);</div><div class='add'>+	else</div><div class='add'>+		Q_WRITE(q, ring_size, q-&gt;ndesc);</div><div class='add'>+</div><div class='add'>+	if (mt76_queue_is_npu_tx(q)) {</div><div class='add'>+		writel(q-&gt;desc_dma, &amp;q-&gt;regs-&gt;desc_base);</div><div class='add'>+		writel(q-&gt;ndesc, &amp;q-&gt;regs-&gt;ring_size);</div><div class='add'>+	}</div><div class='add'>+	q-&gt;head = Q_READ(q, dma_idx);</div><div class='add'>+	q-&gt;tail = q-&gt;head;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (!q)</div><div class='add'>+void mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='add'>+			  bool reset_idx)</div><div class='add'>+{</div><div class='add'>+	if (!q || !q-&gt;ndesc)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* clear descriptors */</div><div class='del'>-	for (i = 0; i &lt; q-&gt;ndesc; i++)</div><div class='del'>-		q-&gt;desc[i].ctrl = cpu_to_le32(MT_DMA_CTL_DMA_DONE);</div><div class='add'>+	if (!mt76_queue_is_wed_rro_ind(q) &amp;&amp;</div><div class='add'>+	    !mt76_queue_is_wed_rro_rxdmad_c(q) &amp;&amp; !mt76_queue_is_npu(q)) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		/* clear descriptors */</div><div class='add'>+		for (i = 0; i &lt; q-&gt;ndesc; i++)</div><div class='add'>+			q-&gt;desc[i].ctrl = cpu_to_le32(MT_DMA_CTL_DMA_DONE);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	writel(0, &amp;q-&gt;regs-&gt;cpu_idx);</div><div class='del'>-	writel(0, &amp;q-&gt;regs-&gt;dma_idx);</div><div class='add'>+	mt76_dma_queue_magic_cnt_init(dev, q);</div><div class='add'>+	if (reset_idx) {</div><div class='add'>+		if (mt76_queue_is_emi(q))</div><div class='add'>+			*q-&gt;emi_cpu_idx = 0;</div><div class='add'>+		else</div><div class='add'>+			Q_WRITE(q, cpu_idx, 0);</div><div class='add'>+		Q_WRITE(q, dma_idx, 0);</div><div class='add'>+	}</div><div class='ctx'> 	mt76_dma_sync_idx(dev, q);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt76_dma_alloc_queue(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='del'>-		     int idx, int n_desc, int bufsize,</div><div class='del'>-		     u32 ring_base)</div><div class='add'>+mt76_dma_add_rx_buf(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='add'>+		    struct mt76_queue_buf *buf, void *data)</div><div class='ctx'> {</div><div class='del'>-	int size;</div><div class='add'>+	struct mt76_queue_entry *entry = &amp;q-&gt;entry[q-&gt;head];</div><div class='add'>+	struct mt76_txwi_cache *txwi = NULL;</div><div class='add'>+	u32 buf1 = 0, ctrl, info = 0;</div><div class='add'>+	struct mt76_desc *desc;</div><div class='add'>+	int idx = q-&gt;head;</div><div class='add'>+	int rx_token;</div><div class='add'>+</div><div class='add'>+	if (mt76_queue_is_wed_rro_ind(q)) {</div><div class='add'>+		struct mt76_wed_rro_desc *rro_desc;</div><div class='add'>+</div><div class='add'>+		rro_desc = (struct mt76_wed_rro_desc *)q-&gt;desc;</div><div class='add'>+		data = &amp;rro_desc[q-&gt;head];</div><div class='add'>+		goto done;</div><div class='add'>+	} else if (mt76_queue_is_wed_rro_rxdmad_c(q)) {</div><div class='add'>+		data = &amp;q-&gt;desc[q-&gt;head];</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_init(&amp;q-&gt;lock);</div><div class='del'>-	spin_lock_init(&amp;q-&gt;cleanup_lock);</div><div class='add'>+	desc = &amp;q-&gt;desc[q-&gt;head];</div><div class='add'>+	ctrl = FIELD_PREP(MT_DMA_CTL_SD_LEN0, buf[0].len);</div><div class='add'>+#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT</div><div class='add'>+	buf1 = FIELD_PREP(MT_DMA_CTL_SDP0_H, buf-&gt;addr &gt;&gt; 32);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-	q-&gt;regs = dev-&gt;mmio.regs + ring_base + idx * MT_RING_SIZE;</div><div class='del'>-	q-&gt;ndesc = n_desc;</div><div class='del'>-	q-&gt;buf_size = bufsize;</div><div class='del'>-	q-&gt;hw_idx = idx;</div><div class='add'>+	if (mt76_queue_is_wed_rx(q) || mt76_queue_is_wed_rro_data(q)) {</div><div class='add'>+		txwi = mt76_get_rxwi(dev);</div><div class='add'>+		if (!txwi)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	size = q-&gt;ndesc * sizeof(struct mt76_desc);</div><div class='del'>-	q-&gt;desc = dmam_alloc_coherent(dev-&gt;dev, size, &amp;q-&gt;desc_dma, GFP_KERNEL);</div><div class='del'>-	if (!q-&gt;desc)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		rx_token = mt76_rx_token_consume(dev, data, txwi, buf-&gt;addr);</div><div class='add'>+		if (rx_token &lt; 0) {</div><div class='add'>+			mt76_put_rxwi(dev, txwi);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	size = q-&gt;ndesc * sizeof(*q-&gt;entry);</div><div class='del'>-	q-&gt;entry = devm_kzalloc(dev-&gt;dev, size, GFP_KERNEL);</div><div class='del'>-	if (!q-&gt;entry)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		buf1 |= FIELD_PREP(MT_DMA_CTL_TOKEN, rx_token);</div><div class='add'>+		ctrl |= MT_DMA_CTL_TO_HOST;</div><div class='ctx'> </div><div class='del'>-	mt76_dma_queue_reset(dev, q);</div><div class='add'>+		txwi-&gt;qid = q - dev-&gt;q_rx;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	if (mt76_queue_is_wed_rro_msdu_pg(q) &amp;&amp;</div><div class='add'>+	    dev-&gt;drv-&gt;rx_rro_add_msdu_page) {</div><div class='add'>+		if (dev-&gt;drv-&gt;rx_rro_add_msdu_page(dev, q, buf-&gt;addr, data))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (q-&gt;flags &amp; MT_QFLAG_WED_RRO_EN) {</div><div class='add'>+		info |= FIELD_PREP(MT_DMA_MAGIC_MASK, q-&gt;magic_cnt);</div><div class='add'>+		if ((q-&gt;head + 1) == q-&gt;ndesc)</div><div class='add'>+			q-&gt;magic_cnt = (q-&gt;magic_cnt + 1) % MT_DMA_MAGIC_CNT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(desc-&gt;buf0, cpu_to_le32(buf-&gt;addr));</div><div class='add'>+	WRITE_ONCE(desc-&gt;buf1, cpu_to_le32(buf1));</div><div class='add'>+	WRITE_ONCE(desc-&gt;ctrl, cpu_to_le32(ctrl));</div><div class='add'>+	WRITE_ONCE(desc-&gt;info, cpu_to_le32(info));</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	entry-&gt;dma_addr[0] = buf-&gt;addr;</div><div class='add'>+	entry-&gt;dma_len[0] = buf-&gt;len;</div><div class='add'>+	entry-&gt;txwi = txwi;</div><div class='add'>+	entry-&gt;buf = data;</div><div class='add'>+	entry-&gt;wcid = 0xffff;</div><div class='add'>+	entry-&gt;skip_buf1 = true;</div><div class='add'>+	q-&gt;head = (q-&gt;head + 1) % q-&gt;ndesc;</div><div class='add'>+	q-&gt;queued++;</div><div class='add'>+</div><div class='add'>+	return idx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -142,8 +310,8 @@ mt76_dma_add_buf(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_queue_entry *entry;</div><div class='ctx'> 	struct mt76_desc *desc;</div><div class='del'>-	u32 ctrl;</div><div class='ctx'> 	int i, idx = -1;</div><div class='add'>+	u32 ctrl, next;</div><div class='ctx'> </div><div class='ctx'> 	if (txwi) {</div><div class='ctx'> 		q-&gt;entry[q-&gt;head].txwi = DMA_DUMMY_DATA;</div><div class='hunk'>@@ -154,7 +322,7 @@ mt76_dma_add_buf(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='ctx'> 		u32 buf0 = buf[0].addr, buf1 = 0;</div><div class='ctx'> </div><div class='ctx'> 		idx = q-&gt;head;</div><div class='del'>-		q-&gt;head = (q-&gt;head + 1) % q-&gt;ndesc;</div><div class='add'>+		next = (q-&gt;head + 1) % q-&gt;ndesc;</div><div class='ctx'> </div><div class='ctx'> 		desc = &amp;q-&gt;desc[idx];</div><div class='ctx'> 		entry = &amp;q-&gt;entry[idx];</div><div class='hunk'>@@ -167,11 +335,18 @@ mt76_dma_add_buf(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='ctx'> 		entry-&gt;dma_len[0] = buf[0].len;</div><div class='ctx'> </div><div class='ctx'> 		ctrl = FIELD_PREP(MT_DMA_CTL_SD_LEN0, buf[0].len);</div><div class='add'>+#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT</div><div class='add'>+		info |= FIELD_PREP(MT_DMA_CTL_SDP0_H, buf[0].addr &gt;&gt; 32);</div><div class='add'>+#endif</div><div class='ctx'> 		if (i &lt; nbufs - 1) {</div><div class='ctx'> 			entry-&gt;dma_addr[1] = buf[1].addr;</div><div class='ctx'> 			entry-&gt;dma_len[1] = buf[1].len;</div><div class='ctx'> 			buf1 = buf[1].addr;</div><div class='ctx'> 			ctrl |= FIELD_PREP(MT_DMA_CTL_SD_LEN1, buf[1].len);</div><div class='add'>+#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT</div><div class='add'>+			info |= FIELD_PREP(MT_DMA_CTL_SDP1_H,</div><div class='add'>+					   buf[1].addr &gt;&gt; 32);</div><div class='add'>+#endif</div><div class='ctx'> 			if (buf[1].skip_unmap)</div><div class='ctx'> 				entry-&gt;skip_buf1 = true;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -186,11 +361,13 @@ mt76_dma_add_buf(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='ctx'> 		WRITE_ONCE(desc-&gt;info, cpu_to_le32(info));</div><div class='ctx'> 		WRITE_ONCE(desc-&gt;ctrl, cpu_to_le32(ctrl));</div><div class='ctx'> </div><div class='add'>+		q-&gt;head = next;</div><div class='ctx'> 		q-&gt;queued++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	q-&gt;entry[idx].txwi = txwi;</div><div class='ctx'> 	q-&gt;entry[idx].skb = skb;</div><div class='add'>+	q-&gt;entry[idx].wcid = 0xffff;</div><div class='ctx'> </div><div class='ctx'> 	return idx;</div><div class='ctx'> }</div><div class='hunk'>@@ -202,19 +379,16 @@ mt76_dma_tx_cleanup_idx(struct mt76_dev *dev, struct mt76_queue *q, int idx,</div><div class='ctx'> 	struct mt76_queue_entry *e = &amp;q-&gt;entry[idx];</div><div class='ctx'> </div><div class='ctx'> 	if (!e-&gt;skip_buf0)</div><div class='del'>-		dma_unmap_single(dev-&gt;dev, e-&gt;dma_addr[0], e-&gt;dma_len[0],</div><div class='add'>+		dma_unmap_single(dev-&gt;dma_dev, e-&gt;dma_addr[0], e-&gt;dma_len[0],</div><div class='ctx'> 				 DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	if (!e-&gt;skip_buf1)</div><div class='del'>-		dma_unmap_single(dev-&gt;dev, e-&gt;dma_addr[1], e-&gt;dma_len[1],</div><div class='add'>+		dma_unmap_single(dev-&gt;dma_dev, e-&gt;dma_addr[1], e-&gt;dma_len[1],</div><div class='ctx'> 				 DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	if (e-&gt;txwi == DMA_DUMMY_DATA)</div><div class='ctx'> 		e-&gt;txwi = NULL;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;skb == DMA_DUMMY_DATA)</div><div class='del'>-		e-&gt;skb = NULL;</div><div class='del'>-</div><div class='ctx'> 	*prev_e = *e;</div><div class='ctx'> 	memset(e, 0, sizeof(*e));</div><div class='ctx'> }</div><div class='hunk'>@@ -223,7 +397,10 @@ static void</div><div class='ctx'> mt76_dma_kick_queue(struct mt76_dev *dev, struct mt76_queue *q)</div><div class='ctx'> {</div><div class='ctx'> 	wmb();</div><div class='del'>-	writel(q-&gt;head, &amp;q-&gt;regs-&gt;cpu_idx);</div><div class='add'>+	if (mt76_queue_is_emi(q))</div><div class='add'>+		*q-&gt;emi_cpu_idx = cpu_to_le16(q-&gt;head);</div><div class='add'>+	else</div><div class='add'>+		Q_WRITE(q, cpu_idx, q-&gt;head);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -232,17 +409,18 @@ mt76_dma_tx_cleanup(struct mt76_dev *dev, struct mt76_queue *q, bool flush)</div><div class='ctx'> 	struct mt76_queue_entry entry;</div><div class='ctx'> 	int last;</div><div class='ctx'> </div><div class='del'>-	if (!q)</div><div class='add'>+	if (!q || !q-&gt;ndesc)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;q-&gt;cleanup_lock);</div><div class='ctx'> 	if (flush)</div><div class='ctx'> 		last = -1;</div><div class='ctx'> 	else</div><div class='del'>-		last = readl(&amp;q-&gt;regs-&gt;dma_idx);</div><div class='add'>+		last = Q_READ(q, dma_idx);</div><div class='ctx'> </div><div class='ctx'> 	while (q-&gt;queued &gt; 0 &amp;&amp; q-&gt;tail != last) {</div><div class='ctx'> 		mt76_dma_tx_cleanup_idx(dev, q, q-&gt;tail, &amp;entry);</div><div class='add'>+		mt76_npu_txdesc_cleanup(q, q-&gt;tail);</div><div class='ctx'> 		mt76_queue_tx_complete(dev, q, &amp;entry);</div><div class='ctx'> </div><div class='ctx'> 		if (entry.txwi) {</div><div class='hunk'>@@ -251,8 +429,7 @@ mt76_dma_tx_cleanup(struct mt76_dev *dev, struct mt76_queue *q, bool flush)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!flush &amp;&amp; q-&gt;tail == last)</div><div class='del'>-			last = readl(&amp;q-&gt;regs-&gt;dma_idx);</div><div class='del'>-</div><div class='add'>+			last = Q_READ(q, dma_idx);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;q-&gt;cleanup_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -268,34 +445,108 @@ mt76_dma_tx_cleanup(struct mt76_dev *dev, struct mt76_queue *q, bool flush)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *</div><div class='add'>+mt76_dma_get_rxdmad_c_buf(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='add'>+			  int idx, int *len, bool *more)</div><div class='add'>+{</div><div class='add'>+	struct mt76_queue_entry *e = &amp;q-&gt;entry[idx];</div><div class='add'>+	struct mt76_rro_rxdmad_c *dmad = e-&gt;buf;</div><div class='add'>+	u32 data1 = le32_to_cpu(dmad-&gt;data1);</div><div class='add'>+	u32 data2 = le32_to_cpu(dmad-&gt;data2);</div><div class='add'>+	struct mt76_txwi_cache *t;</div><div class='add'>+	u16 rx_token_id;</div><div class='add'>+	u8 ind_reason;</div><div class='add'>+	void *buf;</div><div class='add'>+</div><div class='add'>+	rx_token_id = FIELD_GET(RRO_RXDMAD_DATA2_RX_TOKEN_ID_MASK, data2);</div><div class='add'>+	t = mt76_rx_token_release(dev, rx_token_id);</div><div class='add'>+	if (!t)</div><div class='add'>+		return ERR_PTR(-EAGAIN);</div><div class='add'>+</div><div class='add'>+	q = &amp;dev-&gt;q_rx[t-&gt;qid];</div><div class='add'>+	dma_sync_single_for_cpu(dev-&gt;dma_dev, t-&gt;dma_addr,</div><div class='add'>+				SKB_WITH_OVERHEAD(q-&gt;buf_size),</div><div class='add'>+				page_pool_get_dma_dir(q-&gt;page_pool));</div><div class='add'>+</div><div class='add'>+	if (len)</div><div class='add'>+		*len = FIELD_GET(RRO_RXDMAD_DATA1_SDL0_MASK, data1);</div><div class='add'>+	if (more)</div><div class='add'>+		*more = !FIELD_GET(RRO_RXDMAD_DATA1_LS_MASK, data1);</div><div class='add'>+</div><div class='add'>+	buf = t-&gt;ptr;</div><div class='add'>+	ind_reason = FIELD_GET(RRO_RXDMAD_DATA2_IND_REASON_MASK, data2);</div><div class='add'>+	if (ind_reason == MT_DMA_WED_IND_REASON_REPEAT ||</div><div class='add'>+	    ind_reason == MT_DMA_WED_IND_REASON_OLDPKT) {</div><div class='add'>+		mt76_put_page_pool_buf(buf, false);</div><div class='add'>+		buf = ERR_PTR(-EAGAIN);</div><div class='add'>+	}</div><div class='add'>+	t-&gt;ptr = NULL;</div><div class='add'>+	t-&gt;dma_addr = 0;</div><div class='add'>+</div><div class='add'>+	mt76_put_rxwi(dev, t);</div><div class='add'>+</div><div class='add'>+	return buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *</div><div class='ctx'> mt76_dma_get_buf(struct mt76_dev *dev, struct mt76_queue *q, int idx,</div><div class='del'>-		 int *len, u32 *info, bool *more)</div><div class='add'>+		 int *len, u32 *info, bool *more, bool *drop, bool flush)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_queue_entry *e = &amp;q-&gt;entry[idx];</div><div class='ctx'> 	struct mt76_desc *desc = &amp;q-&gt;desc[idx];</div><div class='del'>-	dma_addr_t buf_addr;</div><div class='add'>+	u32 ctrl, desc_info, buf1;</div><div class='ctx'> 	void *buf = e-&gt;buf;</div><div class='del'>-	int buf_len = SKB_WITH_OVERHEAD(q-&gt;buf_size);</div><div class='ctx'> </div><div class='del'>-	buf_addr = e-&gt;dma_addr[0];</div><div class='add'>+	if (mt76_queue_is_wed_rro_rxdmad_c(q) &amp;&amp; !flush)</div><div class='add'>+		buf = mt76_dma_get_rxdmad_c_buf(dev, q, idx, len, more);</div><div class='add'>+</div><div class='add'>+	if (mt76_queue_is_wed_rro(q))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	ctrl = le32_to_cpu(READ_ONCE(desc-&gt;ctrl));</div><div class='ctx'> 	if (len) {</div><div class='del'>-		u32 ctl = le32_to_cpu(READ_ONCE(desc-&gt;ctrl));</div><div class='del'>-		*len = FIELD_GET(MT_DMA_CTL_SD_LEN0, ctl);</div><div class='del'>-		*more = !(ctl &amp; MT_DMA_CTL_LAST_SEC0);</div><div class='add'>+		*len = FIELD_GET(MT_DMA_CTL_SD_LEN0, ctrl);</div><div class='add'>+		*more = !(ctrl &amp; MT_DMA_CTL_LAST_SEC0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	desc_info = le32_to_cpu(desc-&gt;info);</div><div class='ctx'> 	if (info)</div><div class='del'>-		*info = le32_to_cpu(desc-&gt;info);</div><div class='add'>+		*info = desc_info;</div><div class='ctx'> </div><div class='del'>-	dma_unmap_single(dev-&gt;dev, buf_addr, buf_len, DMA_FROM_DEVICE);</div><div class='del'>-	e-&gt;buf = NULL;</div><div class='add'>+	buf1 = le32_to_cpu(desc-&gt;buf1);</div><div class='add'>+	mt76_dma_should_drop_buf(drop, ctrl, buf1, desc_info);</div><div class='add'>+</div><div class='add'>+	if (mt76_queue_is_wed_rx(q)) {</div><div class='add'>+		u32 token = FIELD_GET(MT_DMA_CTL_TOKEN, buf1);</div><div class='add'>+		struct mt76_txwi_cache *t = mt76_rx_token_release(dev, token);</div><div class='add'>+</div><div class='add'>+		if (!t)</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		dma_sync_single_for_cpu(dev-&gt;dma_dev, t-&gt;dma_addr,</div><div class='add'>+				SKB_WITH_OVERHEAD(q-&gt;buf_size),</div><div class='add'>+				page_pool_get_dma_dir(q-&gt;page_pool));</div><div class='ctx'> </div><div class='add'>+		buf = t-&gt;ptr;</div><div class='add'>+		t-&gt;dma_addr = 0;</div><div class='add'>+		t-&gt;ptr = NULL;</div><div class='add'>+</div><div class='add'>+		mt76_put_rxwi(dev, t);</div><div class='add'>+		if (drop)</div><div class='add'>+			*drop |= !!(buf1 &amp; MT_DMA_CTL_WO_DROP);</div><div class='add'>+	} else {</div><div class='add'>+		dma_sync_single_for_cpu(dev-&gt;dma_dev, e-&gt;dma_addr[0],</div><div class='add'>+				SKB_WITH_OVERHEAD(q-&gt;buf_size),</div><div class='add'>+				page_pool_get_dma_dir(q-&gt;page_pool));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	e-&gt;buf = NULL;</div><div class='ctx'> 	return buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *</div><div class='ctx'> mt76_dma_dequeue(struct mt76_dev *dev, struct mt76_queue *q, bool flush,</div><div class='del'>-		 int *len, u32 *info, bool *more)</div><div class='add'>+		 int *len, u32 *info, bool *more, bool *drop)</div><div class='ctx'> {</div><div class='ctx'> 	int idx = q-&gt;tail;</div><div class='ctx'> </div><div class='hunk'>@@ -303,15 +554,50 @@ mt76_dma_dequeue(struct mt76_dev *dev, struct mt76_queue *q, bool flush,</div><div class='ctx'> 	if (!q-&gt;queued)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	if (flush)</div><div class='del'>-		q-&gt;desc[idx].ctrl |= cpu_to_le32(MT_DMA_CTL_DMA_DONE);</div><div class='del'>-	else if (!(q-&gt;desc[idx].ctrl &amp; cpu_to_le32(MT_DMA_CTL_DMA_DONE)))</div><div class='del'>-		return NULL;</div><div class='add'>+	if (mt76_queue_is_wed_rro_data(q) || mt76_queue_is_wed_rro_msdu_pg(q))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	if (mt76_queue_is_wed_rro_ind(q)) {</div><div class='add'>+		struct mt76_wed_rro_ind *cmd;</div><div class='add'>+		u8 magic_cnt;</div><div class='ctx'> </div><div class='add'>+		if (flush)</div><div class='add'>+			goto done;</div><div class='add'>+</div><div class='add'>+		cmd = q-&gt;entry[idx].buf;</div><div class='add'>+		magic_cnt = FIELD_GET(RRO_IND_DATA1_MAGIC_CNT_MASK,</div><div class='add'>+				      le32_to_cpu(cmd-&gt;data1));</div><div class='add'>+		if (magic_cnt != q-&gt;magic_cnt)</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		if (q-&gt;tail == q-&gt;ndesc - 1)</div><div class='add'>+			q-&gt;magic_cnt = (q-&gt;magic_cnt + 1) % MT_DMA_WED_IND_CMD_CNT;</div><div class='add'>+	} else if (mt76_queue_is_wed_rro_rxdmad_c(q)) {</div><div class='add'>+		struct mt76_rro_rxdmad_c *dmad;</div><div class='add'>+		u16 magic_cnt;</div><div class='add'>+</div><div class='add'>+		if (flush)</div><div class='add'>+			goto done;</div><div class='add'>+</div><div class='add'>+		dmad = q-&gt;entry[idx].buf;</div><div class='add'>+		magic_cnt = FIELD_GET(RRO_RXDMAD_DATA3_MAGIC_CNT_MASK,</div><div class='add'>+				      le32_to_cpu(dmad-&gt;data3));</div><div class='add'>+		if (magic_cnt != q-&gt;magic_cnt)</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		if (q-&gt;tail == q-&gt;ndesc - 1)</div><div class='add'>+			q-&gt;magic_cnt = (q-&gt;magic_cnt + 1) % MT_DMA_MAGIC_CNT;</div><div class='add'>+	} else {</div><div class='add'>+		if (flush)</div><div class='add'>+			q-&gt;desc[idx].ctrl |= cpu_to_le32(MT_DMA_CTL_DMA_DONE);</div><div class='add'>+		else if (!(q-&gt;desc[idx].ctrl &amp; cpu_to_le32(MT_DMA_CTL_DMA_DONE)))</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='add'>+done:</div><div class='ctx'> 	q-&gt;tail = (q-&gt;tail + 1) % q-&gt;ndesc;</div><div class='ctx'> 	q-&gt;queued--;</div><div class='ctx'> </div><div class='del'>-	return mt76_dma_get_buf(dev, q, idx, len, info, more);</div><div class='add'>+	return mt76_dma_get_buf(dev, q, idx, len, info, more, drop, flush);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -321,12 +607,15 @@ mt76_dma_tx_queue_skb_raw(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='ctx'> 	struct mt76_queue_buf buf = {};</div><div class='ctx'> 	dma_addr_t addr;</div><div class='ctx'> </div><div class='add'>+	if (test_bit(MT76_MCU_RESET, &amp;dev-&gt;phy.state))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='ctx'> 	if (q-&gt;queued + 1 &gt;= q-&gt;ndesc - 1)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	addr = dma_map_single(dev-&gt;dev, skb-&gt;data, skb-&gt;len,</div><div class='add'>+	addr = dma_map_single(dev-&gt;dma_dev, skb-&gt;data, skb-&gt;len,</div><div class='ctx'> 			      DMA_TO_DEVICE);</div><div class='del'>-	if (unlikely(dma_mapping_error(dev-&gt;dev, addr)))</div><div class='add'>+	if (unlikely(dma_mapping_error(dev-&gt;dma_dev, addr)))</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	buf.addr = addr;</div><div class='hunk'>@@ -345,13 +634,17 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='del'>-		      struct sk_buff *skb, struct mt76_wcid *wcid,</div><div class='del'>-		      struct ieee80211_sta *sta)</div><div class='add'>+mt76_dma_tx_queue_skb(struct mt76_phy *phy, struct mt76_queue *q,</div><div class='add'>+		      enum mt76_txq_id qid, struct sk_buff *skb,</div><div class='add'>+		      struct mt76_wcid *wcid, struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_tx_status status = {</div><div class='add'>+		.sta = sta,</div><div class='add'>+	};</div><div class='ctx'> 	struct mt76_tx_info tx_info = {</div><div class='ctx'> 		.skb = skb,</div><div class='ctx'> 	};</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct ieee80211_hw *hw;</div><div class='ctx'> 	int len, n = 0, ret = -ENOMEM;</div><div class='ctx'> 	struct mt76_txwi_cache *t;</div><div class='hunk'>@@ -359,12 +652,17 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='ctx'> 	dma_addr_t addr;</div><div class='ctx'> 	u8 *txwi;</div><div class='ctx'> </div><div class='add'>+	if (test_bit(MT76_RESET, &amp;phy-&gt;state))</div><div class='add'>+		goto free_skb;</div><div class='add'>+</div><div class='add'>+	/* TODO: Take into account unlinear skbs */</div><div class='add'>+	if (mt76_npu_device_active(dev) &amp;&amp; skb_linearize(skb))</div><div class='add'>+		goto free_skb;</div><div class='add'>+</div><div class='ctx'> 	t = mt76_get_txwi(dev);</div><div class='del'>-	if (!t) {</div><div class='del'>-		hw = mt76_tx_status_get_hw(dev, skb);</div><div class='del'>-		ieee80211_free_txskb(hw, skb);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	if (!t)</div><div class='add'>+		goto free_skb;</div><div class='add'>+</div><div class='ctx'> 	txwi = mt76_get_txwi_ptr(dev, t);</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;prev = skb-&gt;next = NULL;</div><div class='hunk'>@@ -372,8 +670,8 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='ctx'> 		mt76_insert_hdr_pad(skb);</div><div class='ctx'> </div><div class='ctx'> 	len = skb_headlen(skb);</div><div class='del'>-	addr = dma_map_single(dev-&gt;dev, skb-&gt;data, len, DMA_TO_DEVICE);</div><div class='del'>-	if (unlikely(dma_mapping_error(dev-&gt;dev, addr)))</div><div class='add'>+	addr = dma_map_single(dev-&gt;dma_dev, skb-&gt;data, len, DMA_TO_DEVICE);</div><div class='add'>+	if (unlikely(dma_mapping_error(dev-&gt;dma_dev, addr)))</div><div class='ctx'> 		goto free;</div><div class='ctx'> </div><div class='ctx'> 	tx_info.buf[n].addr = t-&gt;dma_addr;</div><div class='hunk'>@@ -385,9 +683,9 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='ctx'> 		if (n == ARRAY_SIZE(tx_info.buf))</div><div class='ctx'> 			goto unmap;</div><div class='ctx'> </div><div class='del'>-		addr = dma_map_single(dev-&gt;dev, iter-&gt;data, iter-&gt;len,</div><div class='add'>+		addr = dma_map_single(dev-&gt;dma_dev, iter-&gt;data, iter-&gt;len,</div><div class='ctx'> 				      DMA_TO_DEVICE);</div><div class='del'>-		if (unlikely(dma_mapping_error(dev-&gt;dev, addr)))</div><div class='add'>+		if (unlikely(dma_mapping_error(dev-&gt;dma_dev, addr)))</div><div class='ctx'> 			goto unmap;</div><div class='ctx'> </div><div class='ctx'> 		tx_info.buf[n].addr = addr;</div><div class='hunk'>@@ -400,20 +698,23 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='ctx'> 		goto unmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dma_sync_single_for_cpu(dev-&gt;dev, t-&gt;dma_addr, dev-&gt;drv-&gt;txwi_size,</div><div class='add'>+	dma_sync_single_for_cpu(dev-&gt;dma_dev, t-&gt;dma_addr, dev-&gt;drv-&gt;txwi_size,</div><div class='ctx'> 				DMA_TO_DEVICE);</div><div class='del'>-	ret = dev-&gt;drv-&gt;tx_prepare_skb(dev, txwi, q-&gt;qid, wcid, sta, &amp;tx_info);</div><div class='del'>-	dma_sync_single_for_device(dev-&gt;dev, t-&gt;dma_addr, dev-&gt;drv-&gt;txwi_size,</div><div class='add'>+	ret = dev-&gt;drv-&gt;tx_prepare_skb(dev, txwi, qid, wcid, sta, &amp;tx_info);</div><div class='add'>+	dma_sync_single_for_device(dev-&gt;dma_dev, t-&gt;dma_addr, dev-&gt;drv-&gt;txwi_size,</div><div class='ctx'> 				   DMA_TO_DEVICE);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto unmap;</div><div class='ctx'> </div><div class='add'>+	if (mt76_npu_device_active(dev))</div><div class='add'>+		return mt76_npu_dma_add_buf(phy, q, skb, &amp;tx_info.buf[1], txwi);</div><div class='add'>+</div><div class='ctx'> 	return mt76_dma_add_buf(dev, q, tx_info.buf, tx_info.nbuf,</div><div class='ctx'> 				tx_info.info, tx_info.skb, t);</div><div class='ctx'> </div><div class='ctx'> unmap:</div><div class='ctx'> 	for (n--; n &gt; 0; n--)</div><div class='del'>-		dma_unmap_single(dev-&gt;dev, tx_info.buf[n].addr,</div><div class='add'>+		dma_unmap_single(dev-&gt;dma_dev, tx_info.buf[n].addr,</div><div class='ctx'> 				 tx_info.buf[n].len, DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> free:</div><div class='hunk'>@@ -427,97 +728,203 @@ free:</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	dev_kfree_skb(tx_info.skb);</div><div class='ctx'> 	mt76_put_txwi(dev, t);</div><div class='add'>+</div><div class='add'>+free_skb:</div><div class='add'>+	status.skb = tx_info.skb;</div><div class='add'>+	hw = mt76_tx_status_get_hw(dev, tx_info.skb);</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;rx_lock);</div><div class='add'>+	ieee80211_tx_status_ext(hw, &amp;status);</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;rx_lock);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q)</div><div class='add'>+mt76_dma_rx_fill_buf(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='add'>+		     bool allow_direct)</div><div class='ctx'> {</div><div class='del'>-	dma_addr_t addr;</div><div class='del'>-	void *buf;</div><div class='del'>-	int frames = 0;</div><div class='ctx'> 	int len = SKB_WITH_OVERHEAD(q-&gt;buf_size);</div><div class='del'>-	int offset = q-&gt;buf_offset;</div><div class='add'>+	int frames = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;q-&gt;lock);</div><div class='add'>+	if (!q-&gt;ndesc)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	while (q-&gt;queued &lt; q-&gt;ndesc - 1) {</div><div class='del'>-		struct mt76_queue_buf qbuf;</div><div class='add'>+		struct mt76_queue_buf qbuf = {};</div><div class='add'>+		void *buf = NULL;</div><div class='add'>+		int offset;</div><div class='add'>+</div><div class='add'>+		if (mt76_queue_is_wed_rro_ind(q) ||</div><div class='add'>+		    mt76_queue_is_wed_rro_rxdmad_c(q))</div><div class='add'>+			goto done;</div><div class='ctx'> </div><div class='del'>-		buf = page_frag_alloc(&amp;q-&gt;rx_page, q-&gt;buf_size, GFP_ATOMIC);</div><div class='add'>+		buf = mt76_get_page_pool_buf(q, &amp;offset, q-&gt;buf_size);</div><div class='ctx'> 		if (!buf)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		addr = dma_map_single(dev-&gt;dev, buf, len, DMA_FROM_DEVICE);</div><div class='del'>-		if (unlikely(dma_mapping_error(dev-&gt;dev, addr))) {</div><div class='del'>-			skb_free_frag(buf);</div><div class='add'>+		qbuf.addr = page_pool_get_dma_addr(virt_to_head_page(buf)) +</div><div class='add'>+			    offset + q-&gt;buf_offset;</div><div class='add'>+done:</div><div class='add'>+		qbuf.len = len - q-&gt;buf_offset;</div><div class='add'>+		qbuf.skip_unmap = false;</div><div class='add'>+		if (mt76_dma_add_rx_buf(dev, q, &amp;qbuf, buf) &lt; 0) {</div><div class='add'>+			mt76_put_page_pool_buf(buf, allow_direct);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		qbuf.addr = addr + offset;</div><div class='del'>-		qbuf.len = len - offset;</div><div class='del'>-		mt76_dma_add_buf(dev, q, &amp;qbuf, 1, 0, buf, NULL);</div><div class='ctx'> 		frames++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (frames)</div><div class='add'>+	if (frames || mt76_queue_is_wed_rx(q))</div><div class='ctx'> 		mt76_dma_kick_queue(dev, q);</div><div class='ctx'> </div><div class='add'>+	return frames;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='add'>+		     bool allow_direct)</div><div class='add'>+{</div><div class='add'>+	int frames;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;q-&gt;lock);</div><div class='add'>+	frames = mt76_dma_rx_fill_buf(dev, q, allow_direct);</div><div class='ctx'> 	spin_unlock_bh(&amp;q-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return frames;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+mt76_dma_alloc_queue(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='add'>+		     int idx, int n_desc, int bufsize,</div><div class='add'>+		     u32 ring_base)</div><div class='add'>+{</div><div class='add'>+	int ret, size;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;q-&gt;lock);</div><div class='add'>+	spin_lock_init(&amp;q-&gt;cleanup_lock);</div><div class='add'>+</div><div class='add'>+	q-&gt;regs = dev-&gt;mmio.regs + ring_base + idx * MT_RING_SIZE;</div><div class='add'>+	q-&gt;ndesc = n_desc;</div><div class='add'>+	q-&gt;buf_size = bufsize;</div><div class='add'>+	q-&gt;hw_idx = idx;</div><div class='add'>+	q-&gt;dev = dev;</div><div class='add'>+</div><div class='add'>+	if (mt76_queue_is_wed_rro_ind(q))</div><div class='add'>+		size = sizeof(struct mt76_wed_rro_desc);</div><div class='add'>+	else if (mt76_queue_is_npu_tx(q))</div><div class='add'>+		size = sizeof(struct airoha_npu_tx_dma_desc);</div><div class='add'>+	else if (mt76_queue_is_npu_rx(q))</div><div class='add'>+		size = sizeof(struct airoha_npu_rx_dma_desc);</div><div class='add'>+	else</div><div class='add'>+		size = sizeof(struct mt76_desc);</div><div class='add'>+</div><div class='add'>+	q-&gt;desc = dmam_alloc_coherent(dev-&gt;dma_dev, q-&gt;ndesc * size,</div><div class='add'>+				      &amp;q-&gt;desc_dma, GFP_KERNEL);</div><div class='add'>+	if (!q-&gt;desc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mt76_dma_queue_magic_cnt_init(dev, q);</div><div class='add'>+	size = q-&gt;ndesc * sizeof(*q-&gt;entry);</div><div class='add'>+	q-&gt;entry = devm_kzalloc(dev-&gt;dev, size, GFP_KERNEL);</div><div class='add'>+	if (!q-&gt;entry)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = mt76_create_page_pool(dev, q);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mt76_npu_queue_setup(dev, q);</div><div class='add'>+	ret = mt76_wed_dma_setup(dev, q, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (mtk_wed_device_active(&amp;dev-&gt;mmio.wed)) {</div><div class='add'>+		if ((mtk_wed_get_rx_capa(&amp;dev-&gt;mmio.wed) &amp;&amp; mt76_queue_is_wed_rro(q)) ||</div><div class='add'>+		    mt76_queue_is_wed_tx_free(q))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* HW specific driver is supposed to reset brand-new EMI queues since</div><div class='add'>+	 * it needs to set cpu index pointer.</div><div class='add'>+	 */</div><div class='add'>+	mt76_dma_queue_reset(dev, q, !mt76_queue_is_emi(q));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> mt76_dma_rx_cleanup(struct mt76_dev *dev, struct mt76_queue *q)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='ctx'> 	void *buf;</div><div class='ctx'> 	bool more;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;q-&gt;lock);</div><div class='add'>+	if (!q-&gt;ndesc)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (mt76_queue_is_npu(q)) {</div><div class='add'>+		mt76_npu_queue_cleanup(dev, q);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	do {</div><div class='del'>-		buf = mt76_dma_dequeue(dev, q, true, NULL, NULL, &amp;more);</div><div class='add'>+		spin_lock_bh(&amp;q-&gt;lock);</div><div class='add'>+		buf = mt76_dma_dequeue(dev, q, true, NULL, NULL, &amp;more, NULL);</div><div class='add'>+		spin_unlock_bh(&amp;q-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 		if (!buf)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		skb_free_frag(buf);</div><div class='add'>+		if (!mt76_queue_is_wed_rro(q))</div><div class='add'>+			mt76_put_page_pool_buf(buf, false);</div><div class='ctx'> 	} while (1);</div><div class='del'>-	spin_unlock_bh(&amp;q-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if (!q-&gt;rx_page.va)</div><div class='del'>-		return;</div><div class='add'>+	spin_lock_bh(&amp;q-&gt;lock);</div><div class='add'>+	if (q-&gt;rx_head) {</div><div class='add'>+		dev_kfree_skb(q-&gt;rx_head);</div><div class='add'>+		q-&gt;rx_head = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	page = virt_to_page(q-&gt;rx_page.va);</div><div class='del'>-	__page_frag_cache_drain(page, q-&gt;rx_page.pagecnt_bias);</div><div class='del'>-	memset(&amp;q-&gt;rx_page, 0, sizeof(q-&gt;rx_page));</div><div class='add'>+	spin_unlock_bh(&amp;q-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mt76_dma_rx_reset(struct mt76_dev *dev, enum mt76_rxq_id qid)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_queue *q = &amp;dev-&gt;q_rx[qid];</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; q-&gt;ndesc; i++)</div><div class='del'>-		q-&gt;desc[i].ctrl = cpu_to_le32(MT_DMA_CTL_DMA_DONE);</div><div class='add'>+	if (!q-&gt;ndesc)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!mt76_queue_is_wed_rro_ind(q) &amp;&amp;</div><div class='add'>+	    !mt76_queue_is_wed_rro_rxdmad_c(q) &amp;&amp; !mt76_queue_is_npu(q)) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; q-&gt;ndesc; i++)</div><div class='add'>+			q-&gt;desc[i].ctrl = cpu_to_le32(MT_DMA_CTL_DMA_DONE);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mt76_dma_rx_cleanup(dev, q);</div><div class='del'>-	mt76_dma_sync_idx(dev, q);</div><div class='del'>-	mt76_dma_rx_fill(dev, q);</div><div class='ctx'> </div><div class='del'>-	if (!q-&gt;rx_head)</div><div class='add'>+	/* reset WED rx queues */</div><div class='add'>+	mt76_wed_dma_setup(dev, q, true);</div><div class='add'>+</div><div class='add'>+	if (mt76_queue_is_wed_tx_free(q))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	dev_kfree_skb(q-&gt;rx_head);</div><div class='del'>-	q-&gt;rx_head = NULL;</div><div class='add'>+	if (mtk_wed_device_active(&amp;dev-&gt;mmio.wed) &amp;&amp;</div><div class='add'>+	    mt76_queue_is_wed_rro(q))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mt76_dma_sync_idx(dev, q);</div><div class='add'>+	if (mt76_queue_is_npu(q))</div><div class='add'>+		mt76_npu_fill_rx_queue(dev, q);</div><div class='add'>+	else</div><div class='add'>+		mt76_dma_rx_fill(dev, q, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mt76_add_fragment(struct mt76_dev *dev, struct mt76_queue *q, void *data,</div><div class='del'>-		  int len, bool more)</div><div class='add'>+		  int len, bool more, u32 info, bool allow_direct)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb = q-&gt;rx_head;</div><div class='ctx'> 	struct skb_shared_info *shinfo = skb_shinfo(skb);</div><div class='hunk'>@@ -529,7 +936,7 @@ mt76_add_fragment(struct mt76_dev *dev, struct mt76_queue *q, void *data,</div><div class='ctx'> </div><div class='ctx'> 		skb_add_rx_frag(skb, nr_frags, page, offset, len, q-&gt;buf_size);</div><div class='ctx'> 	} else {</div><div class='del'>-		skb_free_frag(data);</div><div class='add'>+		mt76_put_page_pool_buf(data, allow_direct);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (more)</div><div class='hunk'>@@ -537,7 +944,7 @@ mt76_add_fragment(struct mt76_dev *dev, struct mt76_queue *q, void *data,</div><div class='ctx'> </div><div class='ctx'> 	q-&gt;rx_head = NULL;</div><div class='ctx'> 	if (nr_frags &lt; ARRAY_SIZE(shinfo-&gt;frags))</div><div class='del'>-		dev-&gt;drv-&gt;rx_skb(dev, q - dev-&gt;q_rx, skb);</div><div class='add'>+		dev-&gt;drv-&gt;rx_skb(dev, q - dev-&gt;q_rx, skb, &amp;info);</div><div class='ctx'> 	else</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> }</div><div class='hunk'>@@ -545,18 +952,54 @@ mt76_add_fragment(struct mt76_dev *dev, struct mt76_queue *q, void *data,</div><div class='ctx'> static int</div><div class='ctx'> mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget)</div><div class='ctx'> {</div><div class='del'>-	int len, data_len, done = 0;</div><div class='add'>+	int len, data_len, done = 0, dma_idx;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	unsigned char *data;</div><div class='add'>+	bool check_ddone = false;</div><div class='add'>+	bool allow_direct = !mt76_queue_is_wed_rx(q);</div><div class='ctx'> 	bool more;</div><div class='ctx'> </div><div class='add'>+	if ((q-&gt;flags &amp; MT_QFLAG_WED_RRO_EN) ||</div><div class='add'>+	    (IS_ENABLED(CONFIG_NET_MEDIATEK_SOC_WED) &amp;&amp;</div><div class='add'>+	     mt76_queue_is_wed_tx_free(q))) {</div><div class='add'>+		dma_idx = Q_READ(q, dma_idx);</div><div class='add'>+		check_ddone = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	while (done &lt; budget) {</div><div class='add'>+		bool drop = false;</div><div class='ctx'> 		u32 info;</div><div class='ctx'> </div><div class='del'>-		data = mt76_dma_dequeue(dev, q, false, &amp;len, &amp;info, &amp;more);</div><div class='add'>+		if (check_ddone) {</div><div class='add'>+			if (q-&gt;tail == dma_idx)</div><div class='add'>+				dma_idx = Q_READ(q, dma_idx);</div><div class='add'>+</div><div class='add'>+			if (q-&gt;tail == dma_idx)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		data = mt76_dma_dequeue(dev, q, false, &amp;len, &amp;info, &amp;more,</div><div class='add'>+					&amp;drop);</div><div class='ctx'> 		if (!data)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		if (PTR_ERR(data) == -EAGAIN) {</div><div class='add'>+			done++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (mt76_queue_is_wed_rro_ind(q) &amp;&amp; dev-&gt;drv-&gt;rx_rro_ind_process)</div><div class='add'>+			dev-&gt;drv-&gt;rx_rro_ind_process(dev, data);</div><div class='add'>+</div><div class='add'>+		if (mt76_queue_is_wed_rro(q) &amp;&amp;</div><div class='add'>+		    !mt76_queue_is_wed_rro_rxdmad_c(q)) {</div><div class='add'>+			done++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (drop)</div><div class='add'>+			goto free_frag;</div><div class='add'>+</div><div class='ctx'> 		if (q-&gt;rx_head)</div><div class='ctx'> 			data_len = q-&gt;buf_size;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -565,27 +1008,27 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget)</div><div class='ctx'> 		if (data_len &lt; len + q-&gt;buf_offset) {</div><div class='ctx'> 			dev_kfree_skb(q-&gt;rx_head);</div><div class='ctx'> 			q-&gt;rx_head = NULL;</div><div class='del'>-</div><div class='del'>-			skb_free_frag(data);</div><div class='del'>-			continue;</div><div class='add'>+			goto free_frag;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (q-&gt;rx_head) {</div><div class='del'>-			mt76_add_fragment(dev, q, data, len, more);</div><div class='add'>+			mt76_add_fragment(dev, q, data, len, more, info,</div><div class='add'>+					  allow_direct);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		skb = build_skb(data, q-&gt;buf_size);</div><div class='del'>-		if (!skb) {</div><div class='del'>-			skb_free_frag(data);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='add'>+		if (!more &amp;&amp; dev-&gt;drv-&gt;rx_check &amp;&amp;</div><div class='add'>+		    !(dev-&gt;drv-&gt;rx_check(dev, data, len)))</div><div class='add'>+			goto free_frag;</div><div class='add'>+</div><div class='add'>+		skb = napi_build_skb(data, q-&gt;buf_size);</div><div class='add'>+		if (!skb)</div><div class='add'>+			goto free_frag;</div><div class='add'>+</div><div class='ctx'> 		skb_reserve(skb, q-&gt;buf_offset);</div><div class='add'>+		skb_mark_for_recycle(skb);</div><div class='ctx'> </div><div class='del'>-		if (q == &amp;dev-&gt;q_rx[MT_RXQ_MCU]) {</div><div class='del'>-			u32 *rxfce = (u32 *)skb-&gt;cb;</div><div class='del'>-			*rxfce = info;</div><div class='del'>-		}</div><div class='add'>+		*(u32 *)skb-&gt;cb = info;</div><div class='ctx'> </div><div class='ctx'> 		__skb_put(skb, len);</div><div class='ctx'> 		done++;</div><div class='hunk'>@@ -595,10 +1038,14 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		dev-&gt;drv-&gt;rx_skb(dev, q - dev-&gt;q_rx, skb);</div><div class='add'>+		dev-&gt;drv-&gt;rx_skb(dev, q - dev-&gt;q_rx, skb, &amp;info);</div><div class='add'>+		continue;</div><div class='add'>+</div><div class='add'>+free_frag:</div><div class='add'>+		mt76_put_page_pool_buf(data, allow_direct);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mt76_dma_rx_fill(dev, q);</div><div class='add'>+	mt76_dma_rx_fill(dev, q, true);</div><div class='ctx'> 	return done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -607,7 +1054,7 @@ int mt76_dma_rx_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	struct mt76_dev *dev;</div><div class='ctx'> 	int qid, done = 0, cur;</div><div class='ctx'> </div><div class='del'>-	dev = container_of(napi-&gt;dev, struct mt76_dev, napi_dev);</div><div class='add'>+	dev = mt76_priv(napi-&gt;dev);</div><div class='ctx'> 	qid = napi - dev-&gt;napi;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='hunk'>@@ -627,22 +1074,51 @@ int mt76_dma_rx_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_dma_rx_poll);</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+mt76_dma_rx_queue_init(struct mt76_dev *dev, enum mt76_rxq_id qid,</div><div class='add'>+		       int (*poll)(struct napi_struct *napi, int budget))</div><div class='add'>+{</div><div class='add'>+	netif_napi_add(dev-&gt;napi_dev, &amp;dev-&gt;napi[qid], poll);</div><div class='add'>+	mt76_dma_rx_fill_buf(dev, &amp;dev-&gt;q_rx[qid], false);</div><div class='add'>+	napi_enable(&amp;dev-&gt;napi[qid]);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> mt76_dma_init(struct mt76_dev *dev,</div><div class='ctx'> 	      int (*poll)(struct napi_struct *napi, int budget))</div><div class='ctx'> {</div><div class='add'>+	struct mt76_dev **priv;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	init_dummy_netdev(&amp;dev-&gt;napi_dev);</div><div class='del'>-	init_dummy_netdev(&amp;dev-&gt;tx_napi_dev);</div><div class='del'>-	snprintf(dev-&gt;napi_dev.name, sizeof(dev-&gt;napi_dev.name), "%s",</div><div class='add'>+	dev-&gt;napi_dev = alloc_netdev_dummy(sizeof(struct mt76_dev *));</div><div class='add'>+	if (!dev-&gt;napi_dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* napi_dev private data points to mt76_dev parent, so, mt76_dev</div><div class='add'>+	 * can be retrieved given napi_dev</div><div class='add'>+	 */</div><div class='add'>+	priv = netdev_priv(dev-&gt;napi_dev);</div><div class='add'>+	*priv = dev;</div><div class='add'>+</div><div class='add'>+	dev-&gt;tx_napi_dev = alloc_netdev_dummy(sizeof(struct mt76_dev *));</div><div class='add'>+	if (!dev-&gt;tx_napi_dev) {</div><div class='add'>+		free_netdev(dev-&gt;napi_dev);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	priv = netdev_priv(dev-&gt;tx_napi_dev);</div><div class='add'>+	*priv = dev;</div><div class='add'>+</div><div class='add'>+	snprintf(dev-&gt;napi_dev-&gt;name, sizeof(dev-&gt;napi_dev-&gt;name), "%s",</div><div class='ctx'> 		 wiphy_name(dev-&gt;hw-&gt;wiphy));</div><div class='del'>-	dev-&gt;napi_dev.threaded = 1;</div><div class='add'>+	dev-&gt;napi_dev-&gt;threaded = 1;</div><div class='add'>+	init_completion(&amp;dev-&gt;mmio.wed_reset);</div><div class='add'>+	init_completion(&amp;dev-&gt;mmio.wed_reset_complete);</div><div class='ctx'> </div><div class='ctx'> 	mt76_for_each_q_rx(dev, i) {</div><div class='del'>-		netif_napi_add(&amp;dev-&gt;napi_dev, &amp;dev-&gt;napi[i], poll, 64);</div><div class='del'>-		mt76_dma_rx_fill(dev, &amp;dev-&gt;q_rx[i]);</div><div class='del'>-		napi_enable(&amp;dev-&gt;napi[i]);</div><div class='add'>+		if (mt76_queue_is_wed_rro(&amp;dev-&gt;q_rx[i]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mt76_dma_rx_queue_init(dev, i, poll);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -655,6 +1131,7 @@ static const struct mt76_queue_ops mt76_dma_ops = {</div><div class='ctx'> 	.tx_queue_skb_raw = mt76_dma_tx_queue_skb_raw,</div><div class='ctx'> 	.tx_queue_skb = mt76_dma_tx_queue_skb,</div><div class='ctx'> 	.tx_cleanup = mt76_dma_tx_cleanup,</div><div class='add'>+	.rx_queue_init = mt76_dma_rx_queue_init,</div><div class='ctx'> 	.rx_cleanup = mt76_dma_rx_cleanup,</div><div class='ctx'> 	.rx_reset = mt76_dma_rx_reset,</div><div class='ctx'> 	.kick = mt76_dma_kick_queue,</div><div class='hunk'>@@ -671,22 +1148,45 @@ void mt76_dma_cleanup(struct mt76_dev *dev)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	mt76_worker_disable(&amp;dev-&gt;tx_worker);</div><div class='add'>+	napi_disable(&amp;dev-&gt;tx_napi);</div><div class='ctx'> 	netif_napi_del(&amp;dev-&gt;tx_napi);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;phy.q_tx); i++) {</div><div class='del'>-		mt76_dma_tx_cleanup(dev, dev-&gt;phy.q_tx[i], true);</div><div class='del'>-		if (dev-&gt;phy2)</div><div class='del'>-			mt76_dma_tx_cleanup(dev, dev-&gt;phy2-&gt;q_tx[i], true);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;phys); i++) {</div><div class='add'>+		struct mt76_phy *phy = dev-&gt;phys[i];</div><div class='add'>+		int j;</div><div class='add'>+</div><div class='add'>+		if (!phy)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; ARRAY_SIZE(phy-&gt;q_tx); j++)</div><div class='add'>+			mt76_dma_tx_cleanup(dev, phy-&gt;q_tx[j], true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;q_mcu); i++)</div><div class='ctx'> 		mt76_dma_tx_cleanup(dev, dev-&gt;q_mcu[i], true);</div><div class='ctx'> </div><div class='ctx'> 	mt76_for_each_q_rx(dev, i) {</div><div class='add'>+		struct mt76_queue *q = &amp;dev-&gt;q_rx[i];</div><div class='add'>+</div><div class='add'>+		if (mtk_wed_device_active(&amp;dev-&gt;mmio.wed) &amp;&amp;</div><div class='add'>+		    mt76_queue_is_wed_rro(q))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		netif_napi_del(&amp;dev-&gt;napi[i]);</div><div class='del'>-		mt76_dma_rx_cleanup(dev, &amp;dev-&gt;q_rx[i]);</div><div class='add'>+		mt76_dma_rx_cleanup(dev, q);</div><div class='add'>+</div><div class='add'>+		page_pool_destroy(q-&gt;page_pool);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (mtk_wed_device_active(&amp;dev-&gt;mmio.wed))</div><div class='add'>+		mtk_wed_device_detach(&amp;dev-&gt;mmio.wed);</div><div class='add'>+</div><div class='add'>+	if (mtk_wed_device_active(&amp;dev-&gt;mmio.wed_hif2))</div><div class='add'>+		mtk_wed_device_detach(&amp;dev-&gt;mmio.wed_hif2);</div><div class='add'>+</div><div class='ctx'> 	mt76_free_pending_txwi(dev);</div><div class='add'>+	mt76_free_pending_rxwi(dev);</div><div class='add'>+	free_netdev(dev-&gt;napi_dev);</div><div class='add'>+	free_netdev(dev-&gt;tx_napi_dev);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_dma_cleanup);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/dma.h b/drivers/net/wireless/mediatek/mt76/dma.h<br/>index fdf786f975ea..4a63de6c5bf5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/dma.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/dma.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/dma.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/dma.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -15,12 +15,104 @@</div><div class='ctx'> #define MT_DMA_CTL_SD_LEN0		GENMASK(29, 16)</div><div class='ctx'> #define MT_DMA_CTL_LAST_SEC0		BIT(30)</div><div class='ctx'> #define MT_DMA_CTL_DMA_DONE		BIT(31)</div><div class='add'>+#define MT_DMA_CTL_TO_HOST		BIT(8)</div><div class='add'>+#define MT_DMA_CTL_TO_HOST_A		BIT(12)</div><div class='add'>+#define MT_DMA_CTL_DROP			BIT(14)</div><div class='add'>+#define MT_DMA_CTL_TOKEN		GENMASK(31, 16)</div><div class='add'>+#define MT_DMA_CTL_SDP1_H		GENMASK(19, 16)</div><div class='add'>+#define MT_DMA_CTL_SDP0_H		GENMASK(3, 0)</div><div class='add'>+#define MT_DMA_CTL_WO_DROP		BIT(8)</div><div class='add'>+</div><div class='add'>+#define MT_DMA_PPE_CPU_REASON		GENMASK(15, 11)</div><div class='add'>+#define MT_DMA_PPE_ENTRY		GENMASK(30, 16)</div><div class='add'>+#define MT_DMA_INFO_DMA_FRAG		BIT(9)</div><div class='add'>+#define MT_DMA_INFO_PPE_VLD		BIT(31)</div><div class='add'>+</div><div class='add'>+#define MT_DMA_CTL_PN_CHK_FAIL		BIT(13)</div><div class='add'>+#define MT_DMA_CTL_VER_MASK		BIT(7)</div><div class='add'>+</div><div class='add'>+#define MT_DMA_SDP0			GENMASK(15, 0)</div><div class='add'>+#define MT_DMA_TOKEN_ID			GENMASK(31, 16)</div><div class='add'>+#define MT_DMA_MAGIC_MASK		GENMASK(31, 28)</div><div class='add'>+#define MT_DMA_RRO_EN			BIT(13)</div><div class='add'>+</div><div class='add'>+#define MT_DMA_MAGIC_CNT		16</div><div class='add'>+</div><div class='add'>+#define MT_DMA_WED_IND_CMD_CNT		8</div><div class='add'>+#define MT_DMA_WED_IND_REASON		GENMASK(15, 12)</div><div class='ctx'> </div><div class='ctx'> #define MT_DMA_HDR_LEN			4</div><div class='ctx'> #define MT_RX_INFO_LEN			4</div><div class='ctx'> #define MT_FCE_INFO_LEN			4</div><div class='ctx'> #define MT_RX_RXWI_LEN			32</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_NET_MEDIATEK_SOC_WED)</div><div class='add'>+</div><div class='add'>+#define Q_READ(_q, _field) ({						\</div><div class='add'>+	u32 _offset = offsetof(struct mt76_queue_regs, _field);		\</div><div class='add'>+	u32 _val;							\</div><div class='add'>+	if ((_q)-&gt;flags &amp; MT_QFLAG_WED)					\</div><div class='add'>+		_val = mtk_wed_device_reg_read((_q)-&gt;wed,		\</div><div class='add'>+					       ((_q)-&gt;wed_regs +	\</div><div class='add'>+						_offset));		\</div><div class='add'>+	else								\</div><div class='add'>+		_val = readl(&amp;(_q)-&gt;regs-&gt;_field);			\</div><div class='add'>+	_val;								\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define Q_WRITE(_q, _field, _val)	do {				\</div><div class='add'>+	u32 _offset = offsetof(struct mt76_queue_regs, _field);		\</div><div class='add'>+	if ((_q)-&gt;flags &amp; MT_QFLAG_WED)					\</div><div class='add'>+		mtk_wed_device_reg_write((_q)-&gt;wed,			\</div><div class='add'>+					 ((_q)-&gt;wed_regs + _offset),	\</div><div class='add'>+					 _val);				\</div><div class='add'>+	else								\</div><div class='add'>+		writel(_val, &amp;(_q)-&gt;regs-&gt;_field);			\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#elif IS_ENABLED(CONFIG_MT76_NPU)</div><div class='add'>+</div><div class='add'>+#define Q_READ(_q, _field) ({						\</div><div class='add'>+	u32 _offset = offsetof(struct mt76_queue_regs, _field);		\</div><div class='add'>+	u32 _val = 0;							\</div><div class='add'>+	if ((_q)-&gt;flags &amp; MT_QFLAG_NPU) {				\</div><div class='add'>+		struct airoha_npu *npu;					\</div><div class='add'>+									\</div><div class='add'>+		rcu_read_lock();					\</div><div class='add'>+		npu = rcu_dereference(q-&gt;dev-&gt;mmio.npu);		\</div><div class='add'>+		if (npu)						\</div><div class='add'>+			regmap_read(npu-&gt;regmap,			\</div><div class='add'>+				    ((_q)-&gt;wed_regs + _offset), &amp;_val);	\</div><div class='add'>+		rcu_read_unlock();					\</div><div class='add'>+	} else {							\</div><div class='add'>+		_val = readl(&amp;(_q)-&gt;regs-&gt;_field);			\</div><div class='add'>+	}								\</div><div class='add'>+	_val;								\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define Q_WRITE(_q, _field, _val)	do {				\</div><div class='add'>+	u32 _offset = offsetof(struct mt76_queue_regs, _field);		\</div><div class='add'>+	if ((_q)-&gt;flags &amp; MT_QFLAG_NPU) {				\</div><div class='add'>+		struct airoha_npu *npu;					\</div><div class='add'>+									\</div><div class='add'>+		rcu_read_lock();					\</div><div class='add'>+		npu = rcu_dereference(q-&gt;dev-&gt;mmio.npu);		\</div><div class='add'>+		if (npu)						\</div><div class='add'>+			regmap_write(npu-&gt;regmap,			\</div><div class='add'>+				     ((_q)-&gt;wed_regs + _offset), _val);	\</div><div class='add'>+		rcu_read_unlock();					\</div><div class='add'>+	} else {							\</div><div class='add'>+		writel(_val, &amp;(_q)-&gt;regs-&gt;_field);			\</div><div class='add'>+	}								\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#define Q_READ(_q, _field)		readl(&amp;(_q)-&gt;regs-&gt;_field)</div><div class='add'>+#define Q_WRITE(_q, _field, _val)	writel(_val, &amp;(_q)-&gt;regs-&gt;_field)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> struct mt76_desc {</div><div class='ctx'> 	__le32 buf0;</div><div class='ctx'> 	__le32 ctrl;</div><div class='hunk'>@@ -28,6 +120,26 @@ struct mt76_desc {</div><div class='ctx'> 	__le32 info;</div><div class='ctx'> } __packed __aligned(4);</div><div class='ctx'> </div><div class='add'>+struct mt76_wed_rro_desc {</div><div class='add'>+	__le32 buf0;</div><div class='add'>+	__le32 buf1;</div><div class='add'>+} __packed __aligned(4);</div><div class='add'>+</div><div class='add'>+/* data1 */</div><div class='add'>+#define RRO_RXDMAD_DATA1_LS_MASK		BIT(30)</div><div class='add'>+#define RRO_RXDMAD_DATA1_SDL0_MASK		GENMASK(29, 16)</div><div class='add'>+/* data2 */</div><div class='add'>+#define RRO_RXDMAD_DATA2_RX_TOKEN_ID_MASK	GENMASK(31, 16)</div><div class='add'>+#define RRO_RXDMAD_DATA2_IND_REASON_MASK	GENMASK(15, 12)</div><div class='add'>+/* data3 */</div><div class='add'>+#define RRO_RXDMAD_DATA3_MAGIC_CNT_MASK		GENMASK(31, 28)</div><div class='add'>+struct mt76_rro_rxdmad_c {</div><div class='add'>+	__le32 data0;</div><div class='add'>+	__le32 data1;</div><div class='add'>+	__le32 data2;</div><div class='add'>+	__le32 data3;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum mt76_qsel {</div><div class='ctx'> 	MT_QSEL_MGMT,</div><div class='ctx'> 	MT_QSEL_HCCA,</div><div class='hunk'>@@ -45,8 +157,58 @@ enum mt76_mcu_evt_type {</div><div class='ctx'> 	EVT_EVENT_DFS_DETECT_RSP,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum mt76_dma_wed_ind_reason {</div><div class='add'>+	MT_DMA_WED_IND_REASON_NORMAL,</div><div class='add'>+	MT_DMA_WED_IND_REASON_REPEAT,</div><div class='add'>+	MT_DMA_WED_IND_REASON_OLDPKT,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int mt76_dma_rx_poll(struct napi_struct *napi, int budget);</div><div class='ctx'> void mt76_dma_attach(struct mt76_dev *dev);</div><div class='ctx'> void mt76_dma_cleanup(struct mt76_dev *dev);</div><div class='add'>+int mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='add'>+		     bool allow_direct);</div><div class='add'>+void mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='add'>+			  bool reset_idx);</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+mt76_dma_reset_tx_queue(struct mt76_dev *dev, struct mt76_queue *q)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;queue_ops-&gt;reset_q(dev, q, true);</div><div class='add'>+	if (mtk_wed_device_active(&amp;dev-&gt;mmio.wed))</div><div class='add'>+		mt76_wed_dma_setup(dev, q, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+mt76_dma_should_drop_buf(bool *drop, u32 ctrl, u32 buf1, u32 info)</div><div class='add'>+{</div><div class='add'>+	if (!drop)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	*drop = !!(ctrl &amp; (MT_DMA_CTL_TO_HOST_A | MT_DMA_CTL_DROP));</div><div class='add'>+	if (!(ctrl &amp; MT_DMA_CTL_VER_MASK))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (FIELD_GET(MT_DMA_WED_IND_REASON, buf1)) {</div><div class='add'>+	case MT_DMA_WED_IND_REASON_REPEAT:</div><div class='add'>+		*drop = true;</div><div class='add'>+		break;</div><div class='add'>+	case MT_DMA_WED_IND_REASON_OLDPKT:</div><div class='add'>+		*drop = !(info &amp; MT_DMA_INFO_DMA_FRAG);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		*drop = !!(ctrl &amp; MT_DMA_CTL_PN_CHK_FAIL);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *mt76_priv(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_dev **priv;</div><div class='add'>+</div><div class='add'>+	priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	return *priv;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/eeprom.c b/drivers/net/wireless/mediatek/mt76/eeprom.c<br/>index 3b47e85e95e7..573400d57ce7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/eeprom.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/eeprom.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/eeprom.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/eeprom.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -6,24 +6,40 @@</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+#include &lt;linux/nvmem-consumer.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include "mt76.h"</div><div class='ctx'> </div><div class='del'>-int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len)</div><div class='add'>+static int mt76_get_of_eeprom_data(struct mt76_dev *dev, void *eep, int len)</div><div class='ctx'> {</div><div class='del'>-#if defined(CONFIG_OF) &amp;&amp; defined(CONFIG_MTD)</div><div class='add'>+	struct device_node *np = dev-&gt;dev-&gt;of_node;</div><div class='add'>+	const void *data;</div><div class='add'>+	int size;</div><div class='add'>+</div><div class='add'>+	data = of_get_property(np, "mediatek,eeprom-data", &amp;size);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (size &gt; len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memcpy(eep, data, size);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt76_get_of_data_from_mtd(struct mt76_dev *dev, void *eep, int offset, int len)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_MTD</div><div class='ctx'> 	struct device_node *np = dev-&gt;dev-&gt;of_node;</div><div class='ctx'> 	struct mtd_info *mtd;</div><div class='ctx'> 	const __be32 *list;</div><div class='ctx'> 	const char *part;</div><div class='ctx'> 	phandle phandle;</div><div class='del'>-	int size;</div><div class='ctx'> 	size_t retlen;</div><div class='add'>+	int size;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!np)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='ctx'> 	list = of_get_property(np, "mediatek,mtd-eeprom", &amp;size);</div><div class='ctx'> 	if (!list)</div><div class='ctx'> 		return -ENOENT;</div><div class='hunk'>@@ -51,11 +67,16 @@ int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len)</div><div class='ctx'> 		goto out_put_node;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	offset = be32_to_cpup(list);</div><div class='add'>+	offset += be32_to_cpup(list);</div><div class='ctx'> 	ret = mtd_read(mtd, offset, len, &amp;retlen, eep);</div><div class='ctx'> 	put_mtd_device(mtd);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (mtd_is_bitflip(ret))</div><div class='add'>+		ret = 0;</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev-&gt;dev, "reading EEPROM from mtd %s failed: %i\n",</div><div class='add'>+			part, ret);</div><div class='ctx'> 		goto out_put_node;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (retlen &lt; len) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='hunk'>@@ -74,6 +95,10 @@ int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NL80211_TESTMODE</div><div class='ctx'> 	dev-&gt;test_mtd.name = devm_kstrdup(dev-&gt;dev, part, GFP_KERNEL);</div><div class='add'>+	if (!dev-&gt;test_mtd.name) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_put_node;</div><div class='add'>+	}</div><div class='ctx'> 	dev-&gt;test_mtd.offset = offset;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -84,15 +109,70 @@ out_put_node:</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(mt76_get_of_eeprom);</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_get_of_data_from_mtd);</div><div class='add'>+</div><div class='add'>+int mt76_get_of_data_from_nvmem(struct mt76_dev *dev, void *eep,</div><div class='add'>+				const char *cell_name, int len)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np = dev-&gt;dev-&gt;of_node;</div><div class='add'>+	struct nvmem_cell *cell;</div><div class='add'>+	const void *data;</div><div class='add'>+	size_t retlen;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	cell = of_nvmem_cell_get(np, cell_name);</div><div class='add'>+	if (IS_ERR(cell))</div><div class='add'>+		return PTR_ERR(cell);</div><div class='add'>+</div><div class='add'>+	data = nvmem_cell_read(cell, &amp;retlen);</div><div class='add'>+	nvmem_cell_put(cell);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return PTR_ERR(data);</div><div class='add'>+</div><div class='add'>+	if (retlen &lt; len) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(eep, data, len);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	kfree(data);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_get_of_data_from_nvmem);</div><div class='ctx'> </div><div class='del'>-void</div><div class='add'>+static int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int len)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np = dev-&gt;dev-&gt;of_node;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!np)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	ret = mt76_get_of_eeprom_data(dev, eep, len);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = mt76_get_of_data_from_mtd(dev, eep, 0, len);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return mt76_get_of_data_from_nvmem(dev, eep, "eeprom", len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='ctx'> mt76_eeprom_override(struct mt76_phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct device_node *np = dev-&gt;dev-&gt;of_node;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	of_get_mac_address(np, phy-&gt;macaddr);</div><div class='add'>+	err = of_get_mac_address(np, phy-&gt;macaddr);</div><div class='add'>+	if (err == -EPROBE_DEFER)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_ether_addr(phy-&gt;macaddr)) {</div><div class='ctx'> 		eth_random_addr(phy-&gt;macaddr);</div><div class='hunk'>@@ -100,6 +180,8 @@ mt76_eeprom_override(struct mt76_phy *phy)</div><div class='ctx'> 			 "Invalid MAC address, using random address %pM\n",</div><div class='ctx'> 			 phy-&gt;macaddr);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_eeprom_override);</div><div class='ctx'> </div><div class='hunk'>@@ -117,11 +199,12 @@ static bool mt76_string_prop_find(struct property *prop, const char *str)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct device_node *</div><div class='add'>+struct device_node *</div><div class='ctx'> mt76_find_power_limits_node(struct mt76_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *np = dev-&gt;dev-&gt;of_node;</div><div class='ctx'> 	const char *const region_names[] = {</div><div class='add'>+		[NL80211_DFS_UNSET] = "ww",</div><div class='ctx'> 		[NL80211_DFS_ETSI] = "etsi",</div><div class='ctx'> 		[NL80211_DFS_FCC] = "fcc",</div><div class='ctx'> 		[NL80211_DFS_JP] = "jp",</div><div class='hunk'>@@ -146,12 +229,16 @@ mt76_find_power_limits_node(struct mt76_dev *dev)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (mt76_string_prop_find(country, dev-&gt;alpha2) ||</div><div class='del'>-		    mt76_string_prop_find(regd, region_name))</div><div class='add'>+		    mt76_string_prop_find(regd, region_name)) {</div><div class='add'>+			of_node_put(np);</div><div class='ctx'> 			return cur;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	of_node_put(np);</div><div class='ctx'> 	return fallback;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_find_power_limits_node);</div><div class='ctx'> </div><div class='ctx'> static const __be32 *</div><div class='ctx'> mt76_get_of_array(struct device_node *np, char *name, size_t *len, int min)</div><div class='hunk'>@@ -166,7 +253,20 @@ mt76_get_of_array(struct device_node *np, char *name, size_t *len, int min)</div><div class='ctx'> 	return prop-&gt;value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct device_node *</div><div class='add'>+static const s8 *</div><div class='add'>+mt76_get_of_array_s8(struct device_node *np, char *name, size_t *len, int min)</div><div class='add'>+{</div><div class='add'>+	struct property *prop = of_find_property(np, name, NULL);</div><div class='add'>+</div><div class='add'>+	if (!prop || !prop-&gt;value || prop-&gt;length &lt; min)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	*len = prop-&gt;length;</div><div class='add'>+</div><div class='add'>+	return prop-&gt;value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct device_node *</div><div class='ctx'> mt76_find_channel_node(struct device_node *np, struct ieee80211_channel *chan)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *cur;</div><div class='hunk'>@@ -190,6 +290,8 @@ mt76_find_channel_node(struct device_node *np, struct ieee80211_channel *chan)</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_find_channel_node);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static s8</div><div class='ctx'> mt76_get_txs_delta(struct device_node *np, u8 nss)</div><div class='hunk'>@@ -205,7 +307,7 @@ mt76_get_txs_delta(struct device_node *np, u8 nss)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt76_apply_array_limit(s8 *pwr, size_t pwr_len, const __be32 *data,</div><div class='add'>+mt76_apply_array_limit(s8 *pwr, size_t pwr_len, const s8 *data,</div><div class='ctx'> 		       s8 target_power, s8 nss_delta, s8 *max_power)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -214,30 +316,29 @@ mt76_apply_array_limit(s8 *pwr, size_t pwr_len, const __be32 *data,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pwr_len; i++) {</div><div class='del'>-		pwr[i] = min_t(s8, target_power,</div><div class='del'>-			       be32_to_cpu(data[i]) + nss_delta);</div><div class='add'>+		pwr[i] = min_t(s8, target_power, data[i] + nss_delta);</div><div class='ctx'> 		*max_power = max(*max_power, pwr[i]);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mt76_apply_multi_array_limit(s8 *pwr, size_t pwr_len, s8 pwr_num,</div><div class='del'>-			     const __be32 *data, size_t len, s8 target_power,</div><div class='del'>-			     s8 nss_delta, s8 *max_power)</div><div class='add'>+			     const s8 *data, size_t len, s8 target_power,</div><div class='add'>+			     s8 nss_delta)</div><div class='ctx'> {</div><div class='ctx'> 	int i, cur;</div><div class='add'>+	s8 max_power = -128;</div><div class='ctx'> </div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	len /= 4;</div><div class='del'>-	cur = be32_to_cpu(data[0]);</div><div class='add'>+	cur = data[0];</div><div class='ctx'> 	for (i = 0; i &lt; pwr_num; i++) {</div><div class='ctx'> 		if (len &lt; pwr_len + 1)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		mt76_apply_array_limit(pwr + pwr_len * i, pwr_len, data + 1,</div><div class='del'>-				       target_power, nss_delta, max_power);</div><div class='add'>+				       target_power, nss_delta, &amp;max_power);</div><div class='ctx'> 		if (--cur &gt; 0)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -246,7 +347,7 @@ mt76_apply_multi_array_limit(s8 *pwr, size_t pwr_len, s8 pwr_num,</div><div class='ctx'> 		if (!len)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		cur = be32_to_cpu(data[0]);</div><div class='add'>+		cur = data[0];</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -257,19 +358,23 @@ s8 mt76_get_rate_power_limits(struct mt76_phy *phy,</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct device_node *np;</div><div class='del'>-	const __be32 *val;</div><div class='add'>+	const s8 *val;</div><div class='ctx'> 	char name[16];</div><div class='ctx'> 	u32 mcs_rates = dev-&gt;drv-&gt;mcs_rates;</div><div class='ctx'> 	u32 ru_rates = ARRAY_SIZE(dest-&gt;ru[0]);</div><div class='ctx'> 	char band;</div><div class='ctx'> 	size_t len;</div><div class='ctx'> 	s8 max_power = 0;</div><div class='add'>+	s8 max_power_backoff = -127;</div><div class='ctx'> 	s8 txs_delta;</div><div class='add'>+	int n_chains = hweight16(phy-&gt;chainmask);</div><div class='add'>+	s8 target_power_combine = target_power + mt76_tx_power_path_delta(n_chains);</div><div class='ctx'> </div><div class='ctx'> 	if (!mcs_rates)</div><div class='ctx'> 		mcs_rates = 10;</div><div class='ctx'> </div><div class='del'>-	memset(dest, target_power, sizeof(*dest));</div><div class='add'>+	memset(dest, target_power, sizeof(*dest) - sizeof(dest-&gt;path));</div><div class='add'>+	memset(&amp;dest-&gt;path, 0, sizeof(dest-&gt;path));</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_ENABLED(CONFIG_OF))</div><div class='ctx'> 		return target_power;</div><div class='hunk'>@@ -285,6 +390,9 @@ s8 mt76_get_rate_power_limits(struct mt76_phy *phy,</div><div class='ctx'> 	case NL80211_BAND_5GHZ:</div><div class='ctx'> 		band = '5';</div><div class='ctx'> 		break;</div><div class='add'>+	case NL80211_BAND_6GHZ:</div><div class='add'>+		band = '6';</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return target_power;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -298,26 +406,49 @@ s8 mt76_get_rate_power_limits(struct mt76_phy *phy,</div><div class='ctx'> 	if (!np)</div><div class='ctx'> 		return target_power;</div><div class='ctx'> </div><div class='del'>-	txs_delta = mt76_get_txs_delta(np, hweight8(phy-&gt;antenna_mask));</div><div class='add'>+	txs_delta = mt76_get_txs_delta(np, hweight16(phy-&gt;chainmask));</div><div class='ctx'> </div><div class='del'>-	val = mt76_get_of_array(np, "rates-cck", &amp;len, ARRAY_SIZE(dest-&gt;cck));</div><div class='add'>+	val = mt76_get_of_array_s8(np, "rates-cck", &amp;len, ARRAY_SIZE(dest-&gt;cck));</div><div class='ctx'> 	mt76_apply_array_limit(dest-&gt;cck, ARRAY_SIZE(dest-&gt;cck), val,</div><div class='ctx'> 			       target_power, txs_delta, &amp;max_power);</div><div class='ctx'> </div><div class='del'>-	val = mt76_get_of_array(np, "rates-ofdm",</div><div class='del'>-				&amp;len, ARRAY_SIZE(dest-&gt;ofdm));</div><div class='add'>+	val = mt76_get_of_array_s8(np, "rates-ofdm",</div><div class='add'>+				   &amp;len, ARRAY_SIZE(dest-&gt;ofdm));</div><div class='ctx'> 	mt76_apply_array_limit(dest-&gt;ofdm, ARRAY_SIZE(dest-&gt;ofdm), val,</div><div class='ctx'> 			       target_power, txs_delta, &amp;max_power);</div><div class='ctx'> </div><div class='del'>-	val = mt76_get_of_array(np, "rates-mcs", &amp;len, mcs_rates + 1);</div><div class='add'>+	val = mt76_get_of_array_s8(np, "rates-mcs", &amp;len, mcs_rates + 1);</div><div class='ctx'> 	mt76_apply_multi_array_limit(dest-&gt;mcs[0], ARRAY_SIZE(dest-&gt;mcs[0]),</div><div class='ctx'> 				     ARRAY_SIZE(dest-&gt;mcs), val, len,</div><div class='del'>-				     target_power, txs_delta, &amp;max_power);</div><div class='add'>+				     target_power, txs_delta);</div><div class='ctx'> </div><div class='del'>-	val = mt76_get_of_array(np, "rates-ru", &amp;len, ru_rates + 1);</div><div class='add'>+	val = mt76_get_of_array_s8(np, "rates-ru", &amp;len, ru_rates + 1);</div><div class='ctx'> 	mt76_apply_multi_array_limit(dest-&gt;ru[0], ARRAY_SIZE(dest-&gt;ru[0]),</div><div class='ctx'> 				     ARRAY_SIZE(dest-&gt;ru), val, len,</div><div class='del'>-				     target_power, txs_delta, &amp;max_power);</div><div class='add'>+				     target_power, txs_delta);</div><div class='add'>+</div><div class='add'>+	max_power_backoff = max_power;</div><div class='add'>+	val = mt76_get_of_array_s8(np, "paths-cck", &amp;len, ARRAY_SIZE(dest-&gt;path.cck));</div><div class='add'>+	mt76_apply_array_limit(dest-&gt;path.cck, ARRAY_SIZE(dest-&gt;path.cck), val,</div><div class='add'>+			       target_power_combine, txs_delta, &amp;max_power_backoff);</div><div class='add'>+</div><div class='add'>+	val = mt76_get_of_array_s8(np, "paths-ofdm", &amp;len, ARRAY_SIZE(dest-&gt;path.ofdm));</div><div class='add'>+	mt76_apply_array_limit(dest-&gt;path.ofdm, ARRAY_SIZE(dest-&gt;path.ofdm), val,</div><div class='add'>+			       target_power_combine, txs_delta, &amp;max_power_backoff);</div><div class='add'>+</div><div class='add'>+	val = mt76_get_of_array_s8(np, "paths-ofdm-bf", &amp;len, ARRAY_SIZE(dest-&gt;path.ofdm_bf));</div><div class='add'>+	mt76_apply_array_limit(dest-&gt;path.ofdm_bf, ARRAY_SIZE(dest-&gt;path.ofdm_bf), val,</div><div class='add'>+			       target_power_combine, txs_delta, &amp;max_power_backoff);</div><div class='add'>+</div><div class='add'>+	val = mt76_get_of_array_s8(np, "paths-ru", &amp;len, ARRAY_SIZE(dest-&gt;path.ru[0]) + 1);</div><div class='add'>+	mt76_apply_multi_array_limit(dest-&gt;path.ru[0], ARRAY_SIZE(dest-&gt;path.ru[0]),</div><div class='add'>+				     ARRAY_SIZE(dest-&gt;path.ru), val, len,</div><div class='add'>+				     target_power_combine, txs_delta);</div><div class='add'>+</div><div class='add'>+	val = mt76_get_of_array_s8(np, "paths-ru-bf", &amp;len, ARRAY_SIZE(dest-&gt;path.ru_bf[0]) + 1);</div><div class='add'>+	mt76_apply_multi_array_limit(dest-&gt;path.ru_bf[0], ARRAY_SIZE(dest-&gt;path.ru_bf[0]),</div><div class='add'>+				     ARRAY_SIZE(dest-&gt;path.ru_bf), val, len,</div><div class='add'>+				     target_power_combine, txs_delta);</div><div class='ctx'> </div><div class='ctx'> 	return max_power;</div><div class='ctx'> }</div><div class='hunk'>@@ -331,6 +462,6 @@ mt76_eeprom_init(struct mt76_dev *dev, int len)</div><div class='ctx'> 	if (!dev-&gt;eeprom.data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	return !mt76_get_of_eeprom(dev, dev-&gt;eeprom.data, 0, len);</div><div class='add'>+	return !mt76_get_of_eeprom(dev, dev-&gt;eeprom.data, len);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_eeprom_init);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c<br/>index 977acab0360a..75772979f438 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mac80211.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mac80211.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mac80211.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mac80211.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -20,6 +20,13 @@</div><div class='ctx'> 	.max_power = 30,			\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define CHAN6G(_idx, _freq) {			\</div><div class='add'>+	.band = NL80211_BAND_6GHZ,		\</div><div class='add'>+	.center_freq = (_freq),			\</div><div class='add'>+	.hw_value = (_idx),			\</div><div class='add'>+	.max_power = 30,			\</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct ieee80211_channel mt76_channels_2ghz[] = {</div><div class='ctx'> 	CHAN2G(1, 2412),</div><div class='ctx'> 	CHAN2G(2, 2417),</div><div class='hunk'>@@ -68,6 +75,73 @@ static const struct ieee80211_channel mt76_channels_5ghz[] = {</div><div class='ctx'> 	CHAN5G(165, 5825),</div><div class='ctx'> 	CHAN5G(169, 5845),</div><div class='ctx'> 	CHAN5G(173, 5865),</div><div class='add'>+	CHAN5G(177, 5885),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_channel mt76_channels_6ghz[] = {</div><div class='add'>+	/* UNII-5 */</div><div class='add'>+	CHAN6G(1, 5955),</div><div class='add'>+	CHAN6G(5, 5975),</div><div class='add'>+	CHAN6G(9, 5995),</div><div class='add'>+	CHAN6G(13, 6015),</div><div class='add'>+	CHAN6G(17, 6035),</div><div class='add'>+	CHAN6G(21, 6055),</div><div class='add'>+	CHAN6G(25, 6075),</div><div class='add'>+	CHAN6G(29, 6095),</div><div class='add'>+	CHAN6G(33, 6115),</div><div class='add'>+	CHAN6G(37, 6135),</div><div class='add'>+	CHAN6G(41, 6155),</div><div class='add'>+	CHAN6G(45, 6175),</div><div class='add'>+	CHAN6G(49, 6195),</div><div class='add'>+	CHAN6G(53, 6215),</div><div class='add'>+	CHAN6G(57, 6235),</div><div class='add'>+	CHAN6G(61, 6255),</div><div class='add'>+	CHAN6G(65, 6275),</div><div class='add'>+	CHAN6G(69, 6295),</div><div class='add'>+	CHAN6G(73, 6315),</div><div class='add'>+	CHAN6G(77, 6335),</div><div class='add'>+	CHAN6G(81, 6355),</div><div class='add'>+	CHAN6G(85, 6375),</div><div class='add'>+	CHAN6G(89, 6395),</div><div class='add'>+	CHAN6G(93, 6415),</div><div class='add'>+	/* UNII-6 */</div><div class='add'>+	CHAN6G(97, 6435),</div><div class='add'>+	CHAN6G(101, 6455),</div><div class='add'>+	CHAN6G(105, 6475),</div><div class='add'>+	CHAN6G(109, 6495),</div><div class='add'>+	CHAN6G(113, 6515),</div><div class='add'>+	CHAN6G(117, 6535),</div><div class='add'>+	/* UNII-7 */</div><div class='add'>+	CHAN6G(121, 6555),</div><div class='add'>+	CHAN6G(125, 6575),</div><div class='add'>+	CHAN6G(129, 6595),</div><div class='add'>+	CHAN6G(133, 6615),</div><div class='add'>+	CHAN6G(137, 6635),</div><div class='add'>+	CHAN6G(141, 6655),</div><div class='add'>+	CHAN6G(145, 6675),</div><div class='add'>+	CHAN6G(149, 6695),</div><div class='add'>+	CHAN6G(153, 6715),</div><div class='add'>+	CHAN6G(157, 6735),</div><div class='add'>+	CHAN6G(161, 6755),</div><div class='add'>+	CHAN6G(165, 6775),</div><div class='add'>+	CHAN6G(169, 6795),</div><div class='add'>+	CHAN6G(173, 6815),</div><div class='add'>+	CHAN6G(177, 6835),</div><div class='add'>+	CHAN6G(181, 6855),</div><div class='add'>+	CHAN6G(185, 6875),</div><div class='add'>+	/* UNII-8 */</div><div class='add'>+	CHAN6G(189, 6895),</div><div class='add'>+	CHAN6G(193, 6915),</div><div class='add'>+	CHAN6G(197, 6935),</div><div class='add'>+	CHAN6G(201, 6955),</div><div class='add'>+	CHAN6G(205, 6975),</div><div class='add'>+	CHAN6G(209, 6995),</div><div class='add'>+	CHAN6G(213, 7015),</div><div class='add'>+	CHAN6G(217, 7035),</div><div class='add'>+	CHAN6G(221, 7055),</div><div class='add'>+	CHAN6G(225, 7075),</div><div class='add'>+	CHAN6G(229, 7095),</div><div class='add'>+	CHAN6G(233, 7115),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct ieee80211_tpt_blink mt76_tpt_blink[] = {</div><div class='hunk'>@@ -83,41 +157,95 @@ static const struct ieee80211_tpt_blink mt76_tpt_blink[] = {</div><div class='ctx'> 	{ .throughput = 300 * 1024, .blink_time =  50 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int mt76_led_init(struct mt76_dev *dev)</div><div class='add'>+struct ieee80211_rate mt76_rates[] = {</div><div class='add'>+	CCK_RATE(0, 10),</div><div class='add'>+	CCK_RATE(1, 20),</div><div class='add'>+	CCK_RATE(2, 55),</div><div class='add'>+	CCK_RATE(3, 110),</div><div class='add'>+	OFDM_RATE(11, 60),</div><div class='add'>+	OFDM_RATE(15, 90),</div><div class='add'>+	OFDM_RATE(10, 120),</div><div class='add'>+	OFDM_RATE(14, 180),</div><div class='add'>+	OFDM_RATE(9,  240),</div><div class='add'>+	OFDM_RATE(13, 360),</div><div class='add'>+	OFDM_RATE(8,  480),</div><div class='add'>+	OFDM_RATE(12, 540),</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_rates);</div><div class='add'>+</div><div class='add'>+static const struct cfg80211_sar_freq_ranges mt76_sar_freq_ranges[] = {</div><div class='add'>+	{ .start_freq = 2402, .end_freq = 2494, },</div><div class='add'>+	{ .start_freq = 5150, .end_freq = 5350, },</div><div class='add'>+	{ .start_freq = 5350, .end_freq = 5470, },</div><div class='add'>+	{ .start_freq = 5470, .end_freq = 5725, },</div><div class='add'>+	{ .start_freq = 5725, .end_freq = 5950, },</div><div class='add'>+	{ .start_freq = 5945, .end_freq = 6165, },</div><div class='add'>+	{ .start_freq = 6165, .end_freq = 6405, },</div><div class='add'>+	{ .start_freq = 6405, .end_freq = 6525, },</div><div class='add'>+	{ .start_freq = 6525, .end_freq = 6705, },</div><div class='add'>+	{ .start_freq = 6705, .end_freq = 6865, },</div><div class='add'>+	{ .start_freq = 6865, .end_freq = 7125, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct cfg80211_sar_capa mt76_sar_capa = {</div><div class='add'>+	.type = NL80211_SAR_TYPE_POWER,</div><div class='add'>+	.num_freq_ranges = ARRAY_SIZE(mt76_sar_freq_ranges),</div><div class='add'>+	.freq_ranges = &amp;mt76_sar_freq_ranges[0],</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mt76_led_init(struct mt76_phy *phy)</div><div class='ctx'> {</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct ieee80211_hw *hw = phy-&gt;hw;</div><div class='ctx'> 	struct device_node *np = dev-&gt;dev-&gt;of_node;</div><div class='del'>-	struct ieee80211_hw *hw = dev-&gt;hw;</div><div class='del'>-	int led_pin;</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;led_cdev.brightness_set &amp;&amp; !dev-&gt;led_cdev.blink_set)</div><div class='add'>+	if (!phy-&gt;leds.cdev.brightness_set &amp;&amp; !phy-&gt;leds.cdev.blink_set)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	snprintf(dev-&gt;led_name, sizeof(dev-&gt;led_name),</div><div class='del'>-		 "mt76-%s", wiphy_name(hw-&gt;wiphy));</div><div class='add'>+	np = of_get_child_by_name(np, "led");</div><div class='add'>+	if (np) {</div><div class='add'>+		if (!of_device_is_available(np)) {</div><div class='add'>+			of_node_put(np);</div><div class='add'>+			dev_info(dev-&gt;dev,</div><div class='add'>+				"led registration was explicitly disabled by dts\n");</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (phy == &amp;dev-&gt;phy) {</div><div class='add'>+			int led_pin;</div><div class='add'>+</div><div class='add'>+			if (!of_property_read_u32(np, "led-sources", &amp;led_pin))</div><div class='add'>+				phy-&gt;leds.pin = led_pin;</div><div class='add'>+</div><div class='add'>+			phy-&gt;leds.al =</div><div class='add'>+				of_property_read_bool(np, "led-active-low");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		of_node_put(np);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snprintf(phy-&gt;leds.name, sizeof(phy-&gt;leds.name), "mt76-%s",</div><div class='add'>+		 wiphy_name(hw-&gt;wiphy));</div><div class='ctx'> </div><div class='del'>-	dev-&gt;led_cdev.name = dev-&gt;led_name;</div><div class='del'>-	dev-&gt;led_cdev.default_trigger =</div><div class='add'>+	phy-&gt;leds.cdev.name = phy-&gt;leds.name;</div><div class='add'>+	phy-&gt;leds.cdev.default_trigger =</div><div class='ctx'> 		ieee80211_create_tpt_led_trigger(hw,</div><div class='ctx'> 					IEEE80211_TPT_LEDTRIG_FL_RADIO,</div><div class='ctx'> 					mt76_tpt_blink,</div><div class='ctx'> 					ARRAY_SIZE(mt76_tpt_blink));</div><div class='ctx'> </div><div class='del'>-	np = of_get_child_by_name(np, "led");</div><div class='del'>-	if (np) {</div><div class='del'>-		if (!of_property_read_u32(np, "led-sources", &amp;led_pin))</div><div class='del'>-			dev-&gt;led_pin = led_pin;</div><div class='del'>-		dev-&gt;led_al = of_property_read_bool(np, "led-active-low");</div><div class='del'>-	}</div><div class='add'>+	dev_info(dev-&gt;dev,</div><div class='add'>+		"registering led '%s'\n", phy-&gt;leds.name);</div><div class='ctx'> </div><div class='del'>-	return led_classdev_register(dev-&gt;dev, &amp;dev-&gt;led_cdev);</div><div class='add'>+	return led_classdev_register(dev-&gt;dev, &amp;phy-&gt;leds.cdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt76_led_cleanup(struct mt76_dev *dev)</div><div class='add'>+static void mt76_led_cleanup(struct mt76_phy *phy)</div><div class='ctx'> {</div><div class='del'>-	if (!dev-&gt;led_cdev.brightness_set &amp;&amp; !dev-&gt;led_cdev.blink_set)</div><div class='add'>+	if (!phy-&gt;leds.cdev.brightness_set &amp;&amp; !phy-&gt;leds.cdev.blink_set)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	led_classdev_unregister(&amp;dev-&gt;led_cdev);</div><div class='add'>+	led_classdev_unregister(&amp;phy-&gt;leds.cdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mt76_init_stream_cap(struct mt76_phy *phy,</div><div class='hunk'>@@ -145,6 +273,8 @@ static void mt76_init_stream_cap(struct mt76_phy *phy,</div><div class='ctx'> 		vht_cap-&gt;cap |= IEEE80211_VHT_CAP_TXSTBC;</div><div class='ctx'> 	else</div><div class='ctx'> 		vht_cap-&gt;cap &amp;= ~IEEE80211_VHT_CAP_TXSTBC;</div><div class='add'>+	vht_cap-&gt;cap |= IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN |</div><div class='add'>+			IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 8; i++) {</div><div class='ctx'> 		if (i &lt; nstream)</div><div class='hunk'>@@ -155,6 +285,9 @@ static void mt76_init_stream_cap(struct mt76_phy *phy,</div><div class='ctx'> 	}</div><div class='ctx'> 	vht_cap-&gt;vht_mcs.rx_mcs_map = cpu_to_le16(mcs_map);</div><div class='ctx'> 	vht_cap-&gt;vht_mcs.tx_mcs_map = cpu_to_le16(mcs_map);</div><div class='add'>+	if (ieee80211_hw_check(phy-&gt;hw, SUPPORTS_VHT_EXT_NSS_BW))</div><div class='add'>+		vht_cap-&gt;vht_mcs.tx_highest |=</div><div class='add'>+				cpu_to_le16(IEEE80211_VHT_EXT_NSS_BW_CAPABLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt76_set_stream_caps(struct mt76_phy *phy, bool vht)</div><div class='hunk'>@@ -163,13 +296,16 @@ void mt76_set_stream_caps(struct mt76_phy *phy, bool vht)</div><div class='ctx'> 		mt76_init_stream_cap(phy, &amp;phy-&gt;sband_2g.sband, false);</div><div class='ctx'> 	if (phy-&gt;cap.has_5ghz)</div><div class='ctx'> 		mt76_init_stream_cap(phy, &amp;phy-&gt;sband_5g.sband, vht);</div><div class='add'>+	if (phy-&gt;cap.has_6ghz)</div><div class='add'>+		mt76_init_stream_cap(phy, &amp;phy-&gt;sband_6g.sband, vht);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_set_stream_caps);</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> mt76_init_sband(struct mt76_phy *phy, struct mt76_sband *msband,</div><div class='ctx'> 		const struct ieee80211_channel *chan, int n_chan,</div><div class='del'>-		struct ieee80211_rate *rates, int n_rates, bool vht)</div><div class='add'>+		struct ieee80211_rate *rates, int n_rates,</div><div class='add'>+		bool ht, bool vht)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_supported_band *sband = &amp;msband-&gt;sband;</div><div class='ctx'> 	struct ieee80211_sta_vht_cap *vht_cap;</div><div class='hunk'>@@ -193,6 +329,9 @@ mt76_init_sband(struct mt76_phy *phy, struct mt76_sband *msband,</div><div class='ctx'> 	sband-&gt;bitrates = rates;</div><div class='ctx'> 	sband-&gt;n_bitrates = n_rates;</div><div class='ctx'> </div><div class='add'>+	if (!ht)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	ht_cap = &amp;sband-&gt;ht_cap;</div><div class='ctx'> 	ht_cap-&gt;ht_supported = true;</div><div class='ctx'> 	ht_cap-&gt;cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40 |</div><div class='hunk'>@@ -214,8 +353,6 @@ mt76_init_sband(struct mt76_phy *phy, struct mt76_sband *msband,</div><div class='ctx'> 	vht_cap-&gt;cap |= IEEE80211_VHT_CAP_RXLDPC |</div><div class='ctx'> 			IEEE80211_VHT_CAP_RXSTBC_1 |</div><div class='ctx'> 			IEEE80211_VHT_CAP_SHORT_GI_80 |</div><div class='del'>-			IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN |</div><div class='del'>-			IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN |</div><div class='ctx'> 			(3 &lt;&lt; IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -229,7 +366,7 @@ mt76_init_sband_2g(struct mt76_phy *phy, struct ieee80211_rate *rates,</div><div class='ctx'> </div><div class='ctx'> 	return mt76_init_sband(phy, &amp;phy-&gt;sband_2g, mt76_channels_2ghz,</div><div class='ctx'> 			       ARRAY_SIZE(mt76_channels_2ghz), rates,</div><div class='del'>-			       n_rates, false);</div><div class='add'>+			       n_rates, true, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -240,7 +377,18 @@ mt76_init_sband_5g(struct mt76_phy *phy, struct ieee80211_rate *rates,</div><div class='ctx'> </div><div class='ctx'> 	return mt76_init_sband(phy, &amp;phy-&gt;sband_5g, mt76_channels_5ghz,</div><div class='ctx'> 			       ARRAY_SIZE(mt76_channels_5ghz), rates,</div><div class='del'>-			       n_rates, vht);</div><div class='add'>+			       n_rates, true, vht);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt76_init_sband_6g(struct mt76_phy *phy, struct ieee80211_rate *rates,</div><div class='add'>+		   int n_rates)</div><div class='add'>+{</div><div class='add'>+	phy-&gt;hw-&gt;wiphy-&gt;bands[NL80211_BAND_6GHZ] = &amp;phy-&gt;sband_6g.sband;</div><div class='add'>+</div><div class='add'>+	return mt76_init_sband(phy, &amp;phy-&gt;sband_6g, mt76_channels_6ghz,</div><div class='add'>+			       ARRAY_SIZE(mt76_channels_6ghz), rates,</div><div class='add'>+			       n_rates, false, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -263,25 +411,36 @@ mt76_check_sband(struct mt76_phy *phy, struct mt76_sband *msband,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (found) {</div><div class='del'>-		phy-&gt;chandef.chan = &amp;sband-&gt;channels[0];</div><div class='add'>+		cfg80211_chandef_create(&amp;phy-&gt;chandef, &amp;sband-&gt;channels[0],</div><div class='add'>+					NL80211_CHAN_HT20);</div><div class='ctx'> 		phy-&gt;chan_state = &amp;msband-&gt;chan[0];</div><div class='add'>+		phy-&gt;dev-&gt;band_phys[band] = phy;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sband-&gt;n_channels = 0;</div><div class='del'>-	phy-&gt;hw-&gt;wiphy-&gt;bands[band] = NULL;</div><div class='add'>+	if (phy-&gt;hw-&gt;wiphy-&gt;bands[band] == sband)</div><div class='add'>+		phy-&gt;hw-&gt;wiphy-&gt;bands[band] = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+static int</div><div class='ctx'> mt76_phy_init(struct mt76_phy *phy, struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct wiphy *wiphy = hw-&gt;wiphy;</div><div class='ctx'> </div><div class='add'>+	INIT_LIST_HEAD(&amp;phy-&gt;tx_list);</div><div class='add'>+	spin_lock_init(&amp;phy-&gt;tx_lock);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;phy-&gt;roc_work, mt76_roc_complete_work);</div><div class='add'>+</div><div class='add'>+	if ((void *)phy != hw-&gt;priv)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	SET_IEEE80211_DEV(hw, dev-&gt;dev);</div><div class='ctx'> 	SET_IEEE80211_PERM_ADDR(hw, phy-&gt;macaddr);</div><div class='ctx'> </div><div class='del'>-	wiphy-&gt;features |= NL80211_FEATURE_ACTIVE_MONITOR;</div><div class='add'>+	wiphy-&gt;features |= NL80211_FEATURE_ACTIVE_MONITOR |</div><div class='add'>+			   NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE;</div><div class='ctx'> 	wiphy-&gt;flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH |</div><div class='ctx'> 			WIPHY_FLAG_SUPPORTS_TDLS |</div><div class='ctx'> 			WIPHY_FLAG_AP_UAPSD;</div><div class='hunk'>@@ -290,8 +449,17 @@ mt76_phy_init(struct mt76_phy *phy, struct ieee80211_hw *hw)</div><div class='ctx'> 	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_AIRTIME_FAIRNESS);</div><div class='ctx'> 	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_AQL);</div><div class='ctx'> </div><div class='del'>-	wiphy-&gt;available_antennas_tx = dev-&gt;phy.antenna_mask;</div><div class='del'>-	wiphy-&gt;available_antennas_rx = dev-&gt;phy.antenna_mask;</div><div class='add'>+	if (!wiphy-&gt;available_antennas_tx)</div><div class='add'>+		wiphy-&gt;available_antennas_tx = phy-&gt;antenna_mask;</div><div class='add'>+	if (!wiphy-&gt;available_antennas_rx)</div><div class='add'>+		wiphy-&gt;available_antennas_rx = phy-&gt;antenna_mask;</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;sar_capa = &amp;mt76_sar_capa;</div><div class='add'>+	phy-&gt;frp = devm_kcalloc(dev-&gt;dev, wiphy-&gt;sar_capa-&gt;num_freq_ranges,</div><div class='add'>+				sizeof(struct mt76_freq_range_power),</div><div class='add'>+				GFP_KERNEL);</div><div class='add'>+	if (!phy-&gt;frp)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;txq_data_size = sizeof(struct mt76_txq);</div><div class='ctx'> 	hw-&gt;uapsd_max_sp_len = IEEE80211_WMM_IE_STA_QOSINFO_SP_ALL;</div><div class='hunk'>@@ -306,8 +474,10 @@ mt76_phy_init(struct mt76_phy *phy, struct ieee80211_hw *hw)</div><div class='ctx'> 	ieee80211_hw_set(hw, SUPPORTS_CLONED_SKBS);</div><div class='ctx'> 	ieee80211_hw_set(hw, SUPPORTS_AMSDU_IN_AMPDU);</div><div class='ctx'> 	ieee80211_hw_set(hw, SUPPORTS_REORDERING_BUFFER);</div><div class='add'>+	ieee80211_hw_set(hw, SPECTRUM_MGMT);</div><div class='ctx'> </div><div class='del'>-	if (!(dev-&gt;drv-&gt;drv_flags &amp; MT_DRV_AMSDU_OFFLOAD)) {</div><div class='add'>+	if (!(dev-&gt;drv-&gt;drv_flags &amp; MT_DRV_AMSDU_OFFLOAD) &amp;&amp;</div><div class='add'>+	    hw-&gt;max_tx_fragments &gt; 1) {</div><div class='ctx'> 		ieee80211_hw_set(hw, TX_AMSDU);</div><div class='ctx'> 		ieee80211_hw_set(hw, TX_FRAG_LIST);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -316,21 +486,34 @@ mt76_phy_init(struct mt76_phy *phy, struct ieee80211_hw *hw)</div><div class='ctx'> 	ieee80211_hw_set(hw, AP_LINK_PS);</div><div class='ctx'> 	ieee80211_hw_set(hw, REPORTS_TX_ACK_STATUS);</div><div class='ctx'> </div><div class='del'>-	wiphy-&gt;flags |= WIPHY_FLAG_IBSS_RSN;</div><div class='del'>-	wiphy-&gt;interface_modes =</div><div class='del'>-		BIT(NL80211_IFTYPE_STATION) |</div><div class='del'>-		BIT(NL80211_IFTYPE_AP) |</div><div class='del'>-#ifdef CONFIG_MAC80211_MESH</div><div class='del'>-		BIT(NL80211_IFTYPE_MESH_POINT) |</div><div class='del'>-#endif</div><div class='del'>-		BIT(NL80211_IFTYPE_P2P_CLIENT) |</div><div class='del'>-		BIT(NL80211_IFTYPE_P2P_GO) |</div><div class='del'>-		BIT(NL80211_IFTYPE_ADHOC);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct mt76_phy *</div><div class='add'>+mt76_alloc_radio_phy(struct mt76_dev *dev, unsigned int size,</div><div class='add'>+		     u8 band_idx)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = dev-&gt;phy.hw;</div><div class='add'>+	unsigned int phy_size;</div><div class='add'>+	struct mt76_phy *phy;</div><div class='add'>+</div><div class='add'>+	phy_size = ALIGN(sizeof(*phy), 8);</div><div class='add'>+	phy = devm_kzalloc(dev-&gt;dev, size + phy_size, GFP_KERNEL);</div><div class='add'>+	if (!phy)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	phy-&gt;dev = dev;</div><div class='add'>+	phy-&gt;hw = hw;</div><div class='add'>+	phy-&gt;priv = (void *)phy + phy_size;</div><div class='add'>+	phy-&gt;band_idx = band_idx;</div><div class='add'>+</div><div class='add'>+	return phy;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_alloc_radio_phy);</div><div class='add'>+</div><div class='add'>+struct mt76_phy *</div><div class='ctx'> mt76_alloc_phy(struct mt76_dev *dev, unsigned int size,</div><div class='del'>-	       const struct ieee80211_ops *ops)</div><div class='add'>+	       const struct ieee80211_ops *ops, u8 band_idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hw *hw;</div><div class='ctx'> 	unsigned int phy_size;</div><div class='hunk'>@@ -345,6 +528,18 @@ mt76_alloc_phy(struct mt76_dev *dev, unsigned int size,</div><div class='ctx'> 	phy-&gt;dev = dev;</div><div class='ctx'> 	phy-&gt;hw = hw;</div><div class='ctx'> 	phy-&gt;priv = hw-&gt;priv + phy_size;</div><div class='add'>+	phy-&gt;band_idx = band_idx;</div><div class='add'>+</div><div class='add'>+	hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_IBSS_RSN;</div><div class='add'>+	hw-&gt;wiphy-&gt;interface_modes =</div><div class='add'>+		BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+		BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+#ifdef CONFIG_MAC80211_MESH</div><div class='add'>+		BIT(NL80211_IFTYPE_MESH_POINT) |</div><div class='add'>+#endif</div><div class='add'>+		BIT(NL80211_IFTYPE_P2P_CLIENT) |</div><div class='add'>+		BIT(NL80211_IFTYPE_P2P_GO) |</div><div class='add'>+		BIT(NL80211_IFTYPE_ADHOC);</div><div class='ctx'> </div><div class='ctx'> 	return phy;</div><div class='ctx'> }</div><div class='hunk'>@@ -355,7 +550,9 @@ int mt76_register_phy(struct mt76_phy *phy, bool vht,</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mt76_phy_init(phy, phy-&gt;hw);</div><div class='add'>+	ret = mt76_phy_init(phy, phy-&gt;hw);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (phy-&gt;cap.has_2ghz) {</div><div class='ctx'> 		ret = mt76_init_sband_2g(phy, rates, n_rates);</div><div class='hunk'>@@ -369,15 +566,31 @@ int mt76_register_phy(struct mt76_phy *phy, bool vht,</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (phy-&gt;cap.has_6ghz) {</div><div class='add'>+		ret = mt76_init_sband_6g(phy, rates + 4, n_rates - 4);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_MT76_LEDS)) {</div><div class='add'>+		ret = mt76_led_init(phy);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	wiphy_read_of_freq_limits(phy-&gt;hw-&gt;wiphy);</div><div class='ctx'> 	mt76_check_sband(phy, &amp;phy-&gt;sband_2g, NL80211_BAND_2GHZ);</div><div class='ctx'> 	mt76_check_sband(phy, &amp;phy-&gt;sband_5g, NL80211_BAND_5GHZ);</div><div class='add'>+	mt76_check_sband(phy, &amp;phy-&gt;sband_6g, NL80211_BAND_6GHZ);</div><div class='ctx'> </div><div class='del'>-	ret = ieee80211_register_hw(phy-&gt;hw);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	if ((void *)phy == phy-&gt;hw-&gt;priv) {</div><div class='add'>+		ret = ieee80211_register_hw(phy-&gt;hw);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	phy-&gt;dev-&gt;phy2 = phy;</div><div class='add'>+	set_bit(MT76_STATE_REGISTERED, &amp;phy-&gt;state);</div><div class='add'>+	phy-&gt;dev-&gt;phys[phy-&gt;band_idx] = phy;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -387,12 +600,68 @@ void mt76_unregister_phy(struct mt76_phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_dev *dev = phy-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	mt76_tx_status_check(dev, NULL, true);</div><div class='add'>+	if (!test_bit(MT76_STATE_REGISTERED, &amp;phy-&gt;state))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_MT76_LEDS))</div><div class='add'>+		mt76_led_cleanup(phy);</div><div class='add'>+	mt76_tx_status_check(dev, true);</div><div class='ctx'> 	ieee80211_unregister_hw(phy-&gt;hw);</div><div class='del'>-	dev-&gt;phy2 = NULL;</div><div class='add'>+	dev-&gt;phys[phy-&gt;band_idx] = NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_unregister_phy);</div><div class='ctx'> </div><div class='add'>+int mt76_create_page_pool(struct mt76_dev *dev, struct mt76_queue *q)</div><div class='add'>+{</div><div class='add'>+	bool is_qrx = mt76_queue_is_rx(dev, q);</div><div class='add'>+	struct page_pool_params pp_params = {</div><div class='add'>+		.order = 0,</div><div class='add'>+		.flags = 0,</div><div class='add'>+		.nid = NUMA_NO_NODE,</div><div class='add'>+		.dev = dev-&gt;dma_dev,</div><div class='add'>+	};</div><div class='add'>+	int idx = is_qrx ? q - dev-&gt;q_rx : -1;</div><div class='add'>+</div><div class='add'>+	/* Allocate page_pools just for rx/wed_tx_free queues */</div><div class='add'>+	if (!is_qrx &amp;&amp; !mt76_queue_is_wed_tx_free(q))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (idx) {</div><div class='add'>+	case MT_RXQ_MAIN:</div><div class='add'>+	case MT_RXQ_BAND1:</div><div class='add'>+	case MT_RXQ_BAND2:</div><div class='add'>+	case MT_RXQ_NPU0:</div><div class='add'>+	case MT_RXQ_NPU1:</div><div class='add'>+		pp_params.pool_size = 256;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pp_params.pool_size = 16;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mt76_is_mmio(dev)) {</div><div class='add'>+		/* rely on page_pool for DMA mapping */</div><div class='add'>+		pp_params.flags |= PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV;</div><div class='add'>+		pp_params.dma_dir = DMA_FROM_DEVICE;</div><div class='add'>+		pp_params.max_len = PAGE_SIZE;</div><div class='add'>+		pp_params.offset = 0;</div><div class='add'>+		/* NAPI is available just for rx queues */</div><div class='add'>+		if (idx &gt;= 0 &amp;&amp; idx &lt; ARRAY_SIZE(dev-&gt;napi))</div><div class='add'>+			pp_params.napi = &amp;dev-&gt;napi[idx];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	q-&gt;page_pool = page_pool_create(&amp;pp_params);</div><div class='add'>+	if (IS_ERR(q-&gt;page_pool)) {</div><div class='add'>+		int err = PTR_ERR(q-&gt;page_pool);</div><div class='add'>+</div><div class='add'>+		q-&gt;page_pool = NULL;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_create_page_pool);</div><div class='add'>+</div><div class='ctx'> struct mt76_dev *</div><div class='ctx'> mt76_alloc_device(struct device *pdev, unsigned int size,</div><div class='ctx'> 		  const struct ieee80211_ops *ops,</div><div class='hunk'>@@ -411,27 +680,52 @@ mt76_alloc_device(struct device *pdev, unsigned int size,</div><div class='ctx'> 	dev-&gt;hw = hw;</div><div class='ctx'> 	dev-&gt;dev = pdev;</div><div class='ctx'> 	dev-&gt;drv = drv_ops;</div><div class='add'>+	dev-&gt;dma_dev = pdev;</div><div class='ctx'> </div><div class='ctx'> 	phy = &amp;dev-&gt;phy;</div><div class='ctx'> 	phy-&gt;dev = dev;</div><div class='ctx'> 	phy-&gt;hw = hw;</div><div class='add'>+	phy-&gt;band_idx = MT_BAND0;</div><div class='add'>+	dev-&gt;phys[phy-&gt;band_idx] = phy;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;dev-&gt;rx_lock);</div><div class='ctx'> 	spin_lock_init(&amp;dev-&gt;lock);</div><div class='ctx'> 	spin_lock_init(&amp;dev-&gt;cc_lock);</div><div class='add'>+	spin_lock_init(&amp;dev-&gt;status_lock);</div><div class='add'>+	spin_lock_init(&amp;dev-&gt;wed_lock);</div><div class='ctx'> 	mutex_init(&amp;dev-&gt;mutex);</div><div class='ctx'> 	init_waitqueue_head(&amp;dev-&gt;tx_wait);</div><div class='del'>-	skb_queue_head_init(&amp;dev-&gt;status_list);</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_head_init(&amp;dev-&gt;mcu.res_q);</div><div class='ctx'> 	init_waitqueue_head(&amp;dev-&gt;mcu.wait);</div><div class='ctx'> 	mutex_init(&amp;dev-&gt;mcu.mutex);</div><div class='ctx'> 	dev-&gt;tx_worker.fn = mt76_tx_worker;</div><div class='ctx'> </div><div class='add'>+	hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_IBSS_RSN;</div><div class='add'>+	hw-&gt;wiphy-&gt;interface_modes =</div><div class='add'>+		BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+		BIT(NL80211_IFTYPE_AP) |</div><div class='add'>+#ifdef CONFIG_MAC80211_MESH</div><div class='add'>+		BIT(NL80211_IFTYPE_MESH_POINT) |</div><div class='add'>+#endif</div><div class='add'>+		BIT(NL80211_IFTYPE_P2P_CLIENT) |</div><div class='add'>+		BIT(NL80211_IFTYPE_P2P_GO) |</div><div class='add'>+		BIT(NL80211_IFTYPE_ADHOC);</div><div class='add'>+</div><div class='ctx'> 	spin_lock_init(&amp;dev-&gt;token_lock);</div><div class='ctx'> 	idr_init(&amp;dev-&gt;token);</div><div class='ctx'> </div><div class='add'>+	spin_lock_init(&amp;dev-&gt;rx_token_lock);</div><div class='add'>+	idr_init(&amp;dev-&gt;rx_token);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev-&gt;wcid_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev-&gt;sta_poll_list);</div><div class='add'>+	spin_lock_init(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;txwi_cache);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev-&gt;rxwi_cache);</div><div class='add'>+	dev-&gt;token_size = dev-&gt;drv-&gt;token_size;</div><div class='add'>+	INIT_DELAYED_WORK(&amp;dev-&gt;scan_work, mt76_scan_work);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;q_rx); i++)</div><div class='ctx'> 		skb_queue_head_init(&amp;dev-&gt;rx_skb[i]);</div><div class='hunk'>@@ -454,7 +748,10 @@ int mt76_register_device(struct mt76_dev *dev, bool vht,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(dev-&gt;dev, dev);</div><div class='del'>-	mt76_phy_init(phy, hw);</div><div class='add'>+	mt76_wcid_init(&amp;dev-&gt;global_wcid, phy-&gt;band_idx);</div><div class='add'>+	ret = mt76_phy_init(phy, hw);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (phy-&gt;cap.has_2ghz) {</div><div class='ctx'> 		ret = mt76_init_sband_2g(phy, rates, n_rates);</div><div class='hunk'>@@ -468,12 +765,19 @@ int mt76_register_device(struct mt76_dev *dev, bool vht,</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (phy-&gt;cap.has_6ghz) {</div><div class='add'>+		ret = mt76_init_sband_6g(phy, rates + 4, n_rates - 4);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	wiphy_read_of_freq_limits(hw-&gt;wiphy);</div><div class='ctx'> 	mt76_check_sband(&amp;dev-&gt;phy, &amp;phy-&gt;sband_2g, NL80211_BAND_2GHZ);</div><div class='ctx'> 	mt76_check_sband(&amp;dev-&gt;phy, &amp;phy-&gt;sband_5g, NL80211_BAND_5GHZ);</div><div class='add'>+	mt76_check_sband(&amp;dev-&gt;phy, &amp;phy-&gt;sband_6g, NL80211_BAND_6GHZ);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ENABLED(CONFIG_MT76_LEDS)) {</div><div class='del'>-		ret = mt76_led_init(dev);</div><div class='add'>+		ret = mt76_led_init(phy);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -483,6 +787,7 @@ int mt76_register_device(struct mt76_dev *dev, bool vht,</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(mt76_worker_setup(hw, &amp;dev-&gt;tx_worker, NULL, "tx"));</div><div class='add'>+	set_bit(MT76_STATE_REGISTERED, &amp;phy-&gt;state);</div><div class='ctx'> 	sched_set_fifo_low(dev-&gt;tx_worker.task);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -493,9 +798,13 @@ void mt76_unregister_device(struct mt76_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hw *hw = dev-&gt;hw;</div><div class='ctx'> </div><div class='add'>+	if (!test_bit(MT76_STATE_REGISTERED, &amp;dev-&gt;phy.state))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_MT76_LEDS))</div><div class='del'>-		mt76_led_cleanup(dev);</div><div class='del'>-	mt76_tx_status_check(dev, NULL, true);</div><div class='add'>+		mt76_led_cleanup(&amp;dev-&gt;phy);</div><div class='add'>+	mt76_tx_status_check(dev, true);</div><div class='add'>+	mt76_wcid_cleanup(dev, &amp;dev-&gt;global_wcid);</div><div class='ctx'> 	ieee80211_unregister_hw(hw);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_unregister_device);</div><div class='hunk'>@@ -507,17 +816,101 @@ void mt76_free_device(struct mt76_dev *dev)</div><div class='ctx'> 		destroy_workqueue(dev-&gt;wq);</div><div class='ctx'> 		dev-&gt;wq = NULL;</div><div class='ctx'> 	}</div><div class='add'>+	mt76_npu_deinit(dev);</div><div class='ctx'> 	ieee80211_free_hw(dev-&gt;hw);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_free_device);</div><div class='ctx'> </div><div class='add'>+static void mt76_reset_phy(struct mt76_phy *phy)</div><div class='add'>+{</div><div class='add'>+	if (!phy)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;phy-&gt;tx_list);</div><div class='add'>+	phy-&gt;num_sta = 0;</div><div class='add'>+	phy-&gt;chanctx = NULL;</div><div class='add'>+	mt76_roc_complete(phy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt76_reset_device(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;wcid); i++) {</div><div class='add'>+		struct mt76_wcid *wcid;</div><div class='add'>+</div><div class='add'>+		wcid = rcu_dereference(dev-&gt;wcid[i]);</div><div class='add'>+		if (!wcid)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		wcid-&gt;sta = 0;</div><div class='add'>+		mt76_wcid_cleanup(dev, wcid);</div><div class='add'>+		rcu_assign_pointer(dev-&gt;wcid[i], NULL);</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev-&gt;wcid_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev-&gt;sta_poll_list);</div><div class='add'>+	dev-&gt;vif_mask = 0;</div><div class='add'>+	memset(dev-&gt;wcid_mask, 0, sizeof(dev-&gt;wcid_mask));</div><div class='add'>+</div><div class='add'>+	mt76_reset_phy(&amp;dev-&gt;phy);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;phys); i++)</div><div class='add'>+		mt76_reset_phy(dev-&gt;phys[i]);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_reset_device);</div><div class='add'>+</div><div class='add'>+struct mt76_phy *mt76_vif_phy(struct ieee80211_hw *hw,</div><div class='add'>+			      struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mlink = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_chanctx *ctx;</div><div class='add'>+</div><div class='add'>+	if (!hw-&gt;wiphy-&gt;n_radio)</div><div class='add'>+		return hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!mlink-&gt;ctx)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ctx = (struct mt76_chanctx *)mlink-&gt;ctx-&gt;drv_priv;</div><div class='add'>+	return ctx-&gt;phy;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_vif_phy);</div><div class='add'>+</div><div class='ctx'> static void mt76_rx_release_amsdu(struct mt76_phy *phy, enum mt76_rxq_id q)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb = phy-&gt;rx_amsdu[q].head;</div><div class='add'>+	struct mt76_rx_status *status = (struct mt76_rx_status *)skb-&gt;cb;</div><div class='ctx'> 	struct mt76_dev *dev = phy-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	phy-&gt;rx_amsdu[q].head = NULL;</div><div class='ctx'> 	phy-&gt;rx_amsdu[q].tail = NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Validate if the amsdu has a proper first subframe.</div><div class='add'>+	 * A single MSDU can be parsed as A-MSDU when the unauthenticated A-MSDU</div><div class='add'>+	 * flag of the QoS header gets flipped. In such cases, the first</div><div class='add'>+	 * subframe has a LLC/SNAP header in the location of the destination</div><div class='add'>+	 * address.</div><div class='add'>+	 */</div><div class='add'>+	if (skb_shinfo(skb)-&gt;frag_list) {</div><div class='add'>+		int offset = 0;</div><div class='add'>+</div><div class='add'>+		if (!(status-&gt;flag &amp; RX_FLAG_8023)) {</div><div class='add'>+			offset = ieee80211_get_hdrlen_from_skb(skb);</div><div class='add'>+</div><div class='add'>+			if ((status-&gt;flag &amp;</div><div class='add'>+			     (RX_FLAG_DECRYPTED | RX_FLAG_IV_STRIPPED)) ==</div><div class='add'>+			    RX_FLAG_DECRYPTED)</div><div class='add'>+				offset += 8;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ether_addr_equal(skb-&gt;data + offset, rfc1042_header)) {</div><div class='add'>+			dev_kfree_skb(skb);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	__skb_queue_tail(&amp;dev-&gt;rx_skb[q], skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -547,7 +940,7 @@ static void mt76_rx_release_burst(struct mt76_phy *phy, enum mt76_rxq_id q,</div><div class='ctx'> void mt76_rx(struct mt76_dev *dev, enum mt76_rxq_id q, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_rx_status *status = (struct mt76_rx_status *)skb-&gt;cb;</div><div class='del'>-	struct mt76_phy *phy = mt76_dev_phy(dev, status-&gt;ext_phy);</div><div class='add'>+	struct mt76_phy *phy = mt76_dev_phy(dev, status-&gt;phy_idx);</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(MT76_STATE_RUNNING, &amp;phy-&gt;state)) {</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='hunk'>@@ -589,6 +982,8 @@ mt76_channel_state(struct mt76_phy *phy, struct ieee80211_channel *c)</div><div class='ctx'> </div><div class='ctx'> 	if (c-&gt;band == NL80211_BAND_2GHZ)</div><div class='ctx'> 		msband = &amp;phy-&gt;sband_2g;</div><div class='add'>+	else if (c-&gt;band == NL80211_BAND_6GHZ)</div><div class='add'>+		msband = &amp;phy-&gt;sband_6g;</div><div class='ctx'> 	else</div><div class='ctx'> 		msband = &amp;phy-&gt;sband_5g;</div><div class='ctx'> </div><div class='hunk'>@@ -606,20 +1001,19 @@ void mt76_update_survey_active_time(struct mt76_phy *phy, ktime_t time)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_update_survey_active_time);</div><div class='ctx'> </div><div class='del'>-void mt76_update_survey(struct mt76_dev *dev)</div><div class='add'>+void mt76_update_survey(struct mt76_phy *phy)</div><div class='ctx'> {</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	ktime_t cur_time;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;drv-&gt;update_survey)</div><div class='del'>-		dev-&gt;drv-&gt;update_survey(dev);</div><div class='add'>+		dev-&gt;drv-&gt;update_survey(phy);</div><div class='ctx'> </div><div class='ctx'> 	cur_time = ktime_get_boottime();</div><div class='del'>-	mt76_update_survey_active_time(&amp;dev-&gt;phy, cur_time);</div><div class='del'>-	if (dev-&gt;phy2)</div><div class='del'>-		mt76_update_survey_active_time(dev-&gt;phy2, cur_time);</div><div class='add'>+	mt76_update_survey_active_time(phy, cur_time);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;drv-&gt;drv_flags &amp; MT_DRV_SW_RX_AIRTIME) {</div><div class='del'>-		struct mt76_channel_state *state = dev-&gt;phy.chan_state;</div><div class='add'>+		struct mt76_channel_state *state = phy-&gt;chan_state;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;dev-&gt;cc_lock);</div><div class='ctx'> 		state-&gt;cc_bss_rx += dev-&gt;cur_cc_bss_rx;</div><div class='hunk'>@@ -629,49 +1023,116 @@ void mt76_update_survey(struct mt76_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_update_survey);</div><div class='ctx'> </div><div class='del'>-void mt76_set_channel(struct mt76_phy *phy)</div><div class='add'>+int __mt76_set_channel(struct mt76_phy *phy, struct cfg80211_chan_def *chandef,</div><div class='add'>+		       bool offchannel)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_dev *dev = phy-&gt;dev;</div><div class='del'>-	struct ieee80211_hw *hw = phy-&gt;hw;</div><div class='del'>-	struct cfg80211_chan_def *chandef = &amp;hw-&gt;conf.chandef;</div><div class='del'>-	bool offchannel = hw-&gt;conf.flags &amp; IEEE80211_CONF_OFFCHANNEL;</div><div class='ctx'> 	int timeout = HZ / 5;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	set_bit(MT76_RESET, &amp;phy-&gt;state);</div><div class='ctx'> </div><div class='add'>+	mt76_worker_disable(&amp;dev-&gt;tx_worker);</div><div class='ctx'> 	wait_event_timeout(dev-&gt;tx_wait, !mt76_has_tx_pending(phy), timeout);</div><div class='del'>-	mt76_update_survey(dev);</div><div class='add'>+	mt76_update_survey(phy);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;chandef.chan-&gt;center_freq != chandef-&gt;chan-&gt;center_freq ||</div><div class='add'>+	    phy-&gt;chandef.width != chandef-&gt;width)</div><div class='add'>+		phy-&gt;dfs_state = MT_DFS_STATE_UNKNOWN;</div><div class='ctx'> </div><div class='ctx'> 	phy-&gt;chandef = *chandef;</div><div class='ctx'> 	phy-&gt;chan_state = mt76_channel_state(phy, chandef-&gt;chan);</div><div class='add'>+	phy-&gt;offchannel = offchannel;</div><div class='ctx'> </div><div class='ctx'> 	if (!offchannel)</div><div class='del'>-		phy-&gt;main_chan = chandef-&gt;chan;</div><div class='add'>+		phy-&gt;main_chandef = *chandef;</div><div class='ctx'> </div><div class='del'>-	if (chandef-&gt;chan != phy-&gt;main_chan)</div><div class='add'>+	if (chandef-&gt;chan != phy-&gt;main_chandef.chan)</div><div class='ctx'> 		memset(phy-&gt;chan_state, 0, sizeof(*phy-&gt;chan_state));</div><div class='add'>+</div><div class='add'>+	ret = dev-&gt;drv-&gt;set_channel(phy);</div><div class='add'>+</div><div class='add'>+	clear_bit(MT76_RESET, &amp;phy-&gt;state);</div><div class='add'>+	mt76_worker_enable(&amp;dev-&gt;tx_worker);</div><div class='add'>+	mt76_worker_schedule(&amp;dev-&gt;tx_worker);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt76_set_channel(struct mt76_phy *phy, struct cfg80211_chan_def *chandef,</div><div class='add'>+		     bool offchannel)</div><div class='add'>+{</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;phy-&gt;mac_work);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+	ret = __mt76_set_channel(phy, chandef, offchannel);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt76_update_channel(struct mt76_phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = phy-&gt;hw;</div><div class='add'>+	struct cfg80211_chan_def *chandef = &amp;hw-&gt;conf.chandef;</div><div class='add'>+	bool offchannel = hw-&gt;conf.flags &amp; IEEE80211_CONF_OFFCHANNEL;</div><div class='add'>+</div><div class='add'>+	phy-&gt;radar_enabled = hw-&gt;conf.radar_enabled;</div><div class='add'>+</div><div class='add'>+	return mt76_set_channel(phy, chandef, offchannel);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_update_channel);</div><div class='add'>+</div><div class='add'>+static struct mt76_sband *</div><div class='add'>+mt76_get_survey_sband(struct mt76_phy *phy, int *idx)</div><div class='add'>+{</div><div class='add'>+	if (*idx &lt; phy-&gt;sband_2g.sband.n_channels)</div><div class='add'>+		return &amp;phy-&gt;sband_2g;</div><div class='add'>+</div><div class='add'>+	*idx -= phy-&gt;sband_2g.sband.n_channels;</div><div class='add'>+	if (*idx &lt; phy-&gt;sband_5g.sband.n_channels)</div><div class='add'>+		return &amp;phy-&gt;sband_5g;</div><div class='add'>+</div><div class='add'>+	*idx -= phy-&gt;sband_5g.sband.n_channels;</div><div class='add'>+	if (*idx &lt; phy-&gt;sband_6g.sband.n_channels)</div><div class='add'>+		return &amp;phy-&gt;sband_6g;</div><div class='add'>+</div><div class='add'>+	*idx -= phy-&gt;sband_6g.sband.n_channels;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(mt76_set_channel);</div><div class='ctx'> </div><div class='ctx'> int mt76_get_survey(struct ieee80211_hw *hw, int idx,</div><div class='ctx'> 		    struct survey_info *survey)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_phy *phy = hw-&gt;priv;</div><div class='ctx'> 	struct mt76_dev *dev = phy-&gt;dev;</div><div class='del'>-	struct mt76_sband *sband;</div><div class='add'>+	struct mt76_sband *sband = NULL;</div><div class='ctx'> 	struct ieee80211_channel *chan;</div><div class='ctx'> 	struct mt76_channel_state *state;</div><div class='add'>+	int phy_idx = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mutex);</div><div class='del'>-	if (idx == 0 &amp;&amp; dev-&gt;drv-&gt;update_survey)</div><div class='del'>-		mt76_update_survey(dev);</div><div class='ctx'> </div><div class='del'>-	sband = &amp;phy-&gt;sband_2g;</div><div class='del'>-	if (idx &gt;= sband-&gt;sband.n_channels) {</div><div class='del'>-		idx -= sband-&gt;sband.n_channels;</div><div class='del'>-		sband = &amp;phy-&gt;sband_5g;</div><div class='add'>+	for (phy_idx = 0; phy_idx &lt; ARRAY_SIZE(dev-&gt;phys); phy_idx++) {</div><div class='add'>+		sband = NULL;</div><div class='add'>+		phy = dev-&gt;phys[phy_idx];</div><div class='add'>+		if (!phy || phy-&gt;hw != hw)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		sband = mt76_get_survey_sband(phy, &amp;idx);</div><div class='add'>+</div><div class='add'>+		if (idx == 0 &amp;&amp; phy-&gt;dev-&gt;drv-&gt;update_survey)</div><div class='add'>+			mt76_update_survey(phy);</div><div class='add'>+</div><div class='add'>+		if (sband || !hw-&gt;wiphy-&gt;n_radio)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (idx &gt;= sband-&gt;sband.n_channels) {</div><div class='add'>+	if (!sband) {</div><div class='ctx'> 		ret = -ENOENT;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -686,7 +1147,7 @@ int mt76_get_survey(struct ieee80211_hw *hw, int idx,</div><div class='ctx'> 	if (state-&gt;noise)</div><div class='ctx'> 		survey-&gt;filled |= SURVEY_INFO_NOISE_DBM;</div><div class='ctx'> </div><div class='del'>-	if (chan == phy-&gt;main_chan) {</div><div class='add'>+	if (chan == phy-&gt;main_chandef.chan) {</div><div class='ctx'> 		survey-&gt;filled |= SURVEY_INFO_IN_USE;</div><div class='ctx'> </div><div class='ctx'> 		if (dev-&gt;drv-&gt;drv_flags &amp; MT_DRV_SW_RX_AIRTIME)</div><div class='hunk'>@@ -725,32 +1186,76 @@ void mt76_wcid_key_setup(struct mt76_dev *dev, struct mt76_wcid *wcid,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	wcid-&gt;rx_check_pn = true;</div><div class='add'>+</div><div class='add'>+	/* data frame */</div><div class='ctx'> 	for (i = 0; i &lt; IEEE80211_NUM_TIDS; i++) {</div><div class='ctx'> 		ieee80211_get_key_rx_seq(key, i, &amp;seq);</div><div class='ctx'> 		memcpy(wcid-&gt;rx_key_pn[i], seq.ccmp.pn, sizeof(seq.ccmp.pn));</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* robust management frame */</div><div class='add'>+	ieee80211_get_key_rx_seq(key, -1, &amp;seq);</div><div class='add'>+	memcpy(wcid-&gt;rx_key_pn[i], seq.ccmp.pn, sizeof(seq.ccmp.pn));</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(mt76_wcid_key_setup);</div><div class='ctx'> </div><div class='add'>+int mt76_rx_signal(u8 chain_mask, s8 *chain_signal)</div><div class='add'>+{</div><div class='add'>+	int signal = -128;</div><div class='add'>+	u8 chains;</div><div class='add'>+</div><div class='add'>+	for (chains = chain_mask; chains; chains &gt;&gt;= 1, chain_signal++) {</div><div class='add'>+		int cur, diff;</div><div class='add'>+</div><div class='add'>+		cur = *chain_signal;</div><div class='add'>+		if (!(chains &amp; BIT(0)) ||</div><div class='add'>+		    cur &gt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (cur &gt; signal)</div><div class='add'>+			swap(cur, signal);</div><div class='add'>+</div><div class='add'>+		diff = signal - cur;</div><div class='add'>+		if (diff == 0)</div><div class='add'>+			signal += 3;</div><div class='add'>+		else if (diff &lt;= 2)</div><div class='add'>+			signal += 2;</div><div class='add'>+		else if (diff &lt;= 6)</div><div class='add'>+			signal += 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return signal;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(mt76_rx_signal);</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> mt76_rx_convert(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 		struct ieee80211_hw **hw,</div><div class='ctx'> 		struct ieee80211_sta **sta)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);</div><div class='add'>+	struct ieee80211_hdr *hdr = mt76_skb_get_hdr(skb);</div><div class='ctx'> 	struct mt76_rx_status mstat;</div><div class='ctx'> </div><div class='ctx'> 	mstat = *((struct mt76_rx_status *)skb-&gt;cb);</div><div class='ctx'> 	memset(status, 0, sizeof(*status));</div><div class='ctx'> </div><div class='add'>+	skb-&gt;priority = mstat.qos_ctl &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='add'>+</div><div class='ctx'> 	status-&gt;flag = mstat.flag;</div><div class='ctx'> 	status-&gt;freq = mstat.freq;</div><div class='ctx'> 	status-&gt;enc_flags = mstat.enc_flags;</div><div class='ctx'> 	status-&gt;encoding = mstat.encoding;</div><div class='ctx'> 	status-&gt;bw = mstat.bw;</div><div class='del'>-	status-&gt;he_ru = mstat.he_ru;</div><div class='del'>-	status-&gt;he_gi = mstat.he_gi;</div><div class='del'>-	status-&gt;he_dcm = mstat.he_dcm;</div><div class='add'>+	if (status-&gt;encoding == RX_ENC_EHT) {</div><div class='add'>+		status-&gt;eht.ru = mstat.eht.ru;</div><div class='add'>+		status-&gt;eht.gi = mstat.eht.gi;</div><div class='add'>+	} else {</div><div class='add'>+		status-&gt;he_ru = mstat.he_ru;</div><div class='add'>+		status-&gt;he_gi = mstat.he_gi;</div><div class='add'>+		status-&gt;he_dcm = mstat.he_dcm;</div><div class='add'>+	}</div><div class='ctx'> 	status-&gt;rate_idx = mstat.rate_idx;</div><div class='ctx'> 	status-&gt;nss = mstat.nss;</div><div class='ctx'> 	status-&gt;band = mstat.band;</div><div class='hunk'>@@ -759,6 +1264,13 @@ mt76_rx_convert(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 	status-&gt;ampdu_reference = mstat.ampdu_ref;</div><div class='ctx'> 	status-&gt;device_timestamp = mstat.timestamp;</div><div class='ctx'> 	status-&gt;mactime = mstat.timestamp;</div><div class='add'>+	status-&gt;signal = mt76_rx_signal(mstat.chains, mstat.chain_signal);</div><div class='add'>+	if (status-&gt;signal &lt;= -128)</div><div class='add'>+		status-&gt;flag |= RX_FLAG_NO_SIGNAL_VAL;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_beacon(hdr-&gt;frame_control) ||</div><div class='add'>+	    ieee80211_is_probe_resp(hdr-&gt;frame_control))</div><div class='add'>+		status-&gt;boottime_ns = ktime_get_boottime_ns();</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(sizeof(mstat) &gt; sizeof(skb-&gt;cb));</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(status-&gt;chain_signal) !=</div><div class='hunk'>@@ -766,48 +1278,71 @@ mt76_rx_convert(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 	memcpy(status-&gt;chain_signal, mstat.chain_signal,</div><div class='ctx'> 	       sizeof(mstat.chain_signal));</div><div class='ctx'> </div><div class='add'>+	if (mstat.wcid) {</div><div class='add'>+		status-&gt;link_valid = mstat.wcid-&gt;link_valid;</div><div class='add'>+		status-&gt;link_id = mstat.wcid-&gt;link_id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	*sta = wcid_to_sta(mstat.wcid);</div><div class='del'>-	*hw = mt76_phy_hw(dev, mstat.ext_phy);</div><div class='add'>+	*hw = mt76_phy_hw(dev, mstat.phy_idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='add'>+static void</div><div class='ctx'> mt76_check_ccmp_pn(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_rx_status *status = (struct mt76_rx_status *)skb-&gt;cb;</div><div class='ctx'> 	struct mt76_wcid *wcid = status-&gt;wcid;</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='del'>-	u8 tidno = status-&gt;qos_ctl &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='add'>+	int security_idx;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!(status-&gt;flag &amp; RX_FLAG_DECRYPTED))</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (status-&gt;flag &amp; RX_FLAG_ONLY_MONITOR)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!wcid || !wcid-&gt;rx_check_pn)</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	security_idx = status-&gt;qos_ctl &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='add'>+	if (status-&gt;flag &amp; RX_FLAG_8023)</div><div class='add'>+		goto skip_hdr_check;</div><div class='ctx'> </div><div class='add'>+	hdr = mt76_skb_get_hdr(skb);</div><div class='ctx'> 	if (!(status-&gt;flag &amp; RX_FLAG_IV_STRIPPED)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Validate the first fragment both here and in mac80211</div><div class='ctx'> 		 * All further fragments will be validated by mac80211 only.</div><div class='ctx'> 		 */</div><div class='del'>-		hdr = mt76_skb_get_hdr(skb);</div><div class='ctx'> 		if (ieee80211_is_frag(hdr) &amp;&amp;</div><div class='ctx'> 		    !ieee80211_is_first_frag(hdr-&gt;frame_control))</div><div class='del'>-			return 0;</div><div class='add'>+			return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* IEEE 802.11-2020, 12.5.3.4.4 "PN and replay detection" c):</div><div class='add'>+	 *</div><div class='add'>+	 * the recipient shall maintain a single replay counter for received</div><div class='add'>+	 * individually addressed robust Management frames that are received</div><div class='add'>+	 * with the To DS subfield equal to 0, [...]</div><div class='add'>+	 */</div><div class='add'>+	if (ieee80211_is_mgmt(hdr-&gt;frame_control) &amp;&amp;</div><div class='add'>+	    !ieee80211_has_tods(hdr-&gt;frame_control))</div><div class='add'>+		security_idx = IEEE80211_NUM_TIDS;</div><div class='add'>+</div><div class='add'>+skip_hdr_check:</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(status-&gt;iv) != sizeof(wcid-&gt;rx_key_pn[0]));</div><div class='del'>-	ret = memcmp(status-&gt;iv, wcid-&gt;rx_key_pn[tidno],</div><div class='add'>+	ret = memcmp(status-&gt;iv, wcid-&gt;rx_key_pn[security_idx],</div><div class='ctx'> 		     sizeof(status-&gt;iv));</div><div class='del'>-	if (ret &lt;= 0)</div><div class='del'>-		return -EINVAL; /* replay */</div><div class='add'>+	if (ret &lt;= 0) {</div><div class='add'>+		status-&gt;flag |= RX_FLAG_ONLY_MONITOR;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	memcpy(wcid-&gt;rx_key_pn[tidno], status-&gt;iv, sizeof(status-&gt;iv));</div><div class='add'>+	memcpy(wcid-&gt;rx_key_pn[security_idx], status-&gt;iv, sizeof(status-&gt;iv));</div><div class='ctx'> </div><div class='ctx'> 	if (status-&gt;flag &amp; RX_FLAG_IV_STRIPPED)</div><div class='ctx'> 		status-&gt;flag |= RX_FLAG_PN_VALIDATED;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -912,7 +1447,7 @@ mt76_check_sta(struct mt76_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	u8 tidno = status-&gt;qos_ctl &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='ctx'> 	bool ps;</div><div class='ctx'> </div><div class='del'>-	hw = mt76_phy_hw(dev, status-&gt;ext_phy);</div><div class='add'>+	hw = mt76_phy_hw(dev, status-&gt;phy_idx);</div><div class='ctx'> 	if (ieee80211_is_pspoll(hdr-&gt;frame_control) &amp;&amp; !wcid &amp;&amp;</div><div class='ctx'> 	    !(status-&gt;flag &amp; RX_FLAG_8023)) {</div><div class='ctx'> 		sta = ieee80211_find_sta_by_ifaddr(hw, hdr-&gt;addr2, NULL);</div><div class='hunk'>@@ -959,10 +1494,13 @@ mt76_check_sta(struct mt76_dev *dev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	if (ps)</div><div class='ctx'> 		set_bit(MT_WCID_FLAG_PS, &amp;wcid-&gt;flags);</div><div class='del'>-	else</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;drv-&gt;sta_ps)</div><div class='add'>+		dev-&gt;drv-&gt;sta_ps(dev, sta, ps);</div><div class='add'>+</div><div class='add'>+	if (!ps)</div><div class='ctx'> 		clear_bit(MT_WCID_FLAG_PS, &amp;wcid-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;drv-&gt;sta_ps(dev, sta, ps);</div><div class='ctx'> 	ieee80211_sta_ps_transition(sta, ps);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -978,11 +1516,7 @@ void mt76_rx_complete(struct mt76_dev *dev, struct sk_buff_head *frames,</div><div class='ctx'> 	while ((skb = __skb_dequeue(frames)) != NULL) {</div><div class='ctx'> 		struct sk_buff *nskb = skb_shinfo(skb)-&gt;frag_list;</div><div class='ctx'> </div><div class='del'>-		if (mt76_check_ccmp_pn(skb)) {</div><div class='del'>-			dev_kfree_skb(skb);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='add'>+		mt76_check_ccmp_pn(skb);</div><div class='ctx'> 		skb_shinfo(skb)-&gt;frag_list = NULL;</div><div class='ctx'> 		mt76_rx_convert(dev, skb, &amp;hw, &amp;sta);</div><div class='ctx'> 		ieee80211_rx_list(hw, sta, skb, &amp;list);</div><div class='hunk'>@@ -1020,7 +1554,11 @@ void mt76_rx_poll_complete(struct mt76_dev *dev, enum mt76_rxq_id q,</div><div class='ctx'> </div><div class='ctx'> 	while ((skb = __skb_dequeue(&amp;dev-&gt;rx_skb[q])) != NULL) {</div><div class='ctx'> 		mt76_check_sta(dev, skb);</div><div class='del'>-		mt76_rx_aggr_reorder(skb, &amp;frames);</div><div class='add'>+		if (mtk_wed_device_active(&amp;dev-&gt;mmio.wed) ||</div><div class='add'>+		    mt76_npu_device_active(dev))</div><div class='add'>+			__skb_queue_tail(&amp;frames, skb);</div><div class='add'>+		else</div><div class='add'>+			mt76_rx_aggr_reorder(skb, &amp;frames);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mt76_rx_complete(dev, &amp;frames, napi);</div><div class='hunk'>@@ -1028,10 +1566,11 @@ void mt76_rx_poll_complete(struct mt76_dev *dev, enum mt76_rxq_id q,</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_rx_poll_complete);</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt76_sta_add(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-	     struct ieee80211_sta *sta, bool ext_phy)</div><div class='add'>+mt76_sta_add(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='add'>+	     struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_wcid *wcid = (struct mt76_wcid *)sta-&gt;drv_priv;</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1048,24 +1587,24 @@ mt76_sta_add(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		mtxq = (struct mt76_txq *)sta-&gt;txq[i]-&gt;drv_priv;</div><div class='del'>-		mtxq-&gt;wcid = wcid;</div><div class='add'>+		mtxq-&gt;wcid = wcid-&gt;idx;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ewma_signal_init(&amp;wcid-&gt;rssi);</div><div class='del'>-	if (ext_phy)</div><div class='del'>-		mt76_wcid_mask_set(dev-&gt;wcid_phy_mask, wcid-&gt;idx);</div><div class='del'>-	wcid-&gt;ext_phy = ext_phy;</div><div class='ctx'> 	rcu_assign_pointer(dev-&gt;wcid[wcid-&gt;idx], wcid);</div><div class='add'>+	phy-&gt;num_sta++;</div><div class='ctx'> </div><div class='add'>+	mt76_wcid_init(wcid, phy-&gt;band_idx);</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+void __mt76_sta_remove(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 		       struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct mt76_wcid *wcid = (struct mt76_wcid *)sta-&gt;drv_priv;</div><div class='ctx'> 	int i, idx = wcid-&gt;idx;</div><div class='ctx'> </div><div class='hunk'>@@ -1075,18 +1614,21 @@ void __mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='ctx'> 	if (dev-&gt;drv-&gt;sta_remove)</div><div class='ctx'> 		dev-&gt;drv-&gt;sta_remove(dev, vif, sta);</div><div class='ctx'> </div><div class='del'>-	mt76_tx_status_check(dev, wcid, true);</div><div class='add'>+	mt76_wcid_cleanup(dev, wcid);</div><div class='add'>+</div><div class='ctx'> 	mt76_wcid_mask_clear(dev-&gt;wcid_mask, idx);</div><div class='del'>-	mt76_wcid_mask_clear(dev-&gt;wcid_phy_mask, idx);</div><div class='add'>+	phy-&gt;num_sta--;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(__mt76_sta_remove);</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+mt76_sta_remove(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 		struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mutex);</div><div class='del'>-	__mt76_sta_remove(dev, vif, sta);</div><div class='add'>+	__mt76_sta_remove(phy, vif, sta);</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1097,22 +1639,36 @@ int mt76_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_phy *phy = hw-&gt;priv;</div><div class='ctx'> 	struct mt76_dev *dev = phy-&gt;dev;</div><div class='del'>-	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='add'>+	enum mt76_sta_event ev;</div><div class='add'>+</div><div class='add'>+	phy = mt76_vif_phy(hw, vif);</div><div class='add'>+	if (!phy)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (old_state == IEEE80211_STA_NOTEXIST &amp;&amp;</div><div class='ctx'> 	    new_state == IEEE80211_STA_NONE)</div><div class='del'>-		return mt76_sta_add(dev, vif, sta, ext_phy);</div><div class='del'>-</div><div class='del'>-	if (old_state == IEEE80211_STA_AUTH &amp;&amp;</div><div class='del'>-	    new_state == IEEE80211_STA_ASSOC &amp;&amp;</div><div class='del'>-	    dev-&gt;drv-&gt;sta_assoc)</div><div class='del'>-		dev-&gt;drv-&gt;sta_assoc(dev, vif, sta);</div><div class='add'>+		return mt76_sta_add(phy, vif, sta);</div><div class='ctx'> </div><div class='ctx'> 	if (old_state == IEEE80211_STA_NONE &amp;&amp;</div><div class='ctx'> 	    new_state == IEEE80211_STA_NOTEXIST)</div><div class='del'>-		mt76_sta_remove(dev, vif, sta);</div><div class='add'>+		mt76_sta_remove(phy, vif, sta);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	if (!dev-&gt;drv-&gt;sta_event)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (old_state == IEEE80211_STA_AUTH &amp;&amp;</div><div class='add'>+	    new_state == IEEE80211_STA_ASSOC)</div><div class='add'>+		ev = MT76_STA_EVENT_ASSOC;</div><div class='add'>+	else if (old_state == IEEE80211_STA_ASSOC &amp;&amp;</div><div class='add'>+		 new_state == IEEE80211_STA_AUTHORIZED)</div><div class='add'>+		ev = MT76_STA_EVENT_AUTHORIZE;</div><div class='add'>+	else if (old_state == IEEE80211_STA_ASSOC &amp;&amp;</div><div class='add'>+		 new_state == IEEE80211_STA_AUTH)</div><div class='add'>+		ev = MT76_STA_EVENT_DISASSOC;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return dev-&gt;drv-&gt;sta_event(dev, vif, sta, ev);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_sta_state);</div><div class='ctx'> </div><div class='hunk'>@@ -1124,29 +1680,162 @@ void mt76_sta_pre_rcu_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	struct mt76_wcid *wcid = (struct mt76_wcid *)sta-&gt;drv_priv;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;status_lock);</div><div class='ctx'> 	rcu_assign_pointer(dev-&gt;wcid[wcid-&gt;idx], NULL);</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;status_lock);</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_sta_pre_rcu_remove);</div><div class='ctx'> </div><div class='add'>+void mt76_wcid_init(struct mt76_wcid *wcid, u8 band_idx)</div><div class='add'>+{</div><div class='add'>+	wcid-&gt;hw_key_idx = -1;</div><div class='add'>+	wcid-&gt;phy_idx = band_idx;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;wcid-&gt;tx_list);</div><div class='add'>+	skb_queue_head_init(&amp;wcid-&gt;tx_pending);</div><div class='add'>+	skb_queue_head_init(&amp;wcid-&gt;tx_offchannel);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;wcid-&gt;list);</div><div class='add'>+	idr_init(&amp;wcid-&gt;pktid);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;wcid-&gt;poll_list);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_wcid_init);</div><div class='add'>+</div><div class='add'>+void mt76_wcid_cleanup(struct mt76_dev *dev, struct mt76_wcid *wcid)</div><div class='add'>+{</div><div class='add'>+	struct mt76_phy *phy = mt76_dev_phy(dev, wcid-&gt;phy_idx);</div><div class='add'>+	struct ieee80211_hw *hw;</div><div class='add'>+	struct sk_buff_head list;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	mt76_tx_status_lock(dev, &amp;list);</div><div class='add'>+	mt76_tx_status_skb_get(dev, wcid, -1, &amp;list);</div><div class='add'>+	mt76_tx_status_unlock(dev, &amp;list);</div><div class='add'>+</div><div class='add'>+	idr_destroy(&amp;wcid-&gt;pktid);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;phy-&gt;tx_lock);</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;wcid-&gt;tx_list))</div><div class='add'>+		list_del_init(&amp;wcid-&gt;tx_list);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;wcid-&gt;tx_pending.lock);</div><div class='add'>+	skb_queue_splice_tail_init(&amp;wcid-&gt;tx_pending, &amp;list);</div><div class='add'>+	spin_unlock(&amp;wcid-&gt;tx_pending.lock);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;wcid-&gt;tx_offchannel.lock);</div><div class='add'>+	skb_queue_splice_tail_init(&amp;wcid-&gt;tx_offchannel, &amp;list);</div><div class='add'>+	spin_unlock(&amp;wcid-&gt;tx_offchannel.lock);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;phy-&gt;tx_lock);</div><div class='add'>+</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;list)) != NULL) {</div><div class='add'>+		hw = mt76_tx_status_get_hw(dev, skb);</div><div class='add'>+		ieee80211_free_txskb(hw, skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_wcid_cleanup);</div><div class='add'>+</div><div class='add'>+void mt76_wcid_add_poll(struct mt76_dev *dev, struct mt76_wcid *wcid)</div><div class='add'>+{</div><div class='add'>+	if (test_bit(MT76_MCU_RESET, &amp;dev-&gt;phy.state) || !wcid-&gt;sta)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+	if (list_empty(&amp;wcid-&gt;poll_list))</div><div class='add'>+		list_add_tail(&amp;wcid-&gt;poll_list, &amp;dev-&gt;sta_poll_list);</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_wcid_add_poll);</div><div class='add'>+</div><div class='add'>+s8 mt76_get_power_bound(struct mt76_phy *phy, s8 txpower)</div><div class='add'>+{</div><div class='add'>+	int n_chains = hweight16(phy-&gt;chainmask);</div><div class='add'>+</div><div class='add'>+	txpower = mt76_get_sar_power(phy, phy-&gt;chandef.chan, txpower * 2);</div><div class='add'>+	txpower -= mt76_tx_power_path_delta(n_chains);</div><div class='add'>+</div><div class='add'>+	return txpower;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_get_power_bound);</div><div class='add'>+</div><div class='ctx'> int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-		     int *dbm)</div><div class='add'>+		     unsigned int link_id, int *dbm)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_phy *phy = hw-&gt;priv;</div><div class='del'>-	int n_chains = hweight8(phy-&gt;antenna_mask);</div><div class='del'>-	int delta = mt76_tx_power_nss_delta(n_chains);</div><div class='add'>+	struct mt76_phy *phy = mt76_vif_phy(hw, vif);</div><div class='add'>+	int n_chains, delta;</div><div class='ctx'> </div><div class='add'>+	if (!phy)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	n_chains = hweight16(phy-&gt;chainmask);</div><div class='add'>+	delta = mt76_tx_power_path_delta(n_chains);</div><div class='ctx'> 	*dbm = DIV_ROUND_UP(phy-&gt;txpower_cur + delta, 2);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_get_txpower);</div><div class='ctx'> </div><div class='add'>+int mt76_init_sar_power(struct ieee80211_hw *hw,</div><div class='add'>+			const struct cfg80211_sar_specs *sar)</div><div class='add'>+{</div><div class='add'>+	struct mt76_phy *phy = hw-&gt;priv;</div><div class='add'>+	const struct cfg80211_sar_capa *capa = hw-&gt;wiphy-&gt;sar_capa;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (sar-&gt;type != NL80211_SAR_TYPE_POWER || !sar-&gt;num_sub_specs)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sar-&gt;num_sub_specs; i++) {</div><div class='add'>+		u32 index = sar-&gt;sub_specs[i].freq_range_index;</div><div class='add'>+		/* SAR specifies power limitaton in 0.25dbm */</div><div class='add'>+		s32 power = sar-&gt;sub_specs[i].power &gt;&gt; 1;</div><div class='add'>+</div><div class='add'>+		if (power &gt; 127 || power &lt; -127)</div><div class='add'>+			power = 127;</div><div class='add'>+</div><div class='add'>+		phy-&gt;frp[index].range = &amp;capa-&gt;freq_ranges[index];</div><div class='add'>+		phy-&gt;frp[index].power = power;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_init_sar_power);</div><div class='add'>+</div><div class='add'>+int mt76_get_sar_power(struct mt76_phy *phy,</div><div class='add'>+		       struct ieee80211_channel *chan,</div><div class='add'>+		       int power)</div><div class='add'>+{</div><div class='add'>+	const struct cfg80211_sar_capa *capa = phy-&gt;hw-&gt;wiphy-&gt;sar_capa;</div><div class='add'>+	int freq, i;</div><div class='add'>+</div><div class='add'>+	if (!capa || !phy-&gt;frp)</div><div class='add'>+		return power;</div><div class='add'>+</div><div class='add'>+	if (power &gt; 127 || power &lt; -127)</div><div class='add'>+		power = 127;</div><div class='add'>+</div><div class='add'>+	freq = ieee80211_channel_to_frequency(chan-&gt;hw_value, chan-&gt;band);</div><div class='add'>+	for (i = 0 ; i &lt; capa-&gt;num_freq_ranges; i++) {</div><div class='add'>+		if (phy-&gt;frp[i].range &amp;&amp;</div><div class='add'>+		    freq &gt;= phy-&gt;frp[i].range-&gt;start_freq &amp;&amp;</div><div class='add'>+		    freq &lt; phy-&gt;frp[i].range-&gt;end_freq) {</div><div class='add'>+			power = min_t(int, phy-&gt;frp[i].power, power);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return power;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_get_sar_power);</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> __mt76_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	if (vif-&gt;csa_active &amp;&amp; ieee80211_beacon_cntdwn_is_complete(vif))</div><div class='del'>-		ieee80211_csa_finish(vif);</div><div class='add'>+	if (vif-&gt;bss_conf.csa_active &amp;&amp; ieee80211_beacon_cntdwn_is_complete(vif, 0))</div><div class='add'>+		ieee80211_csa_finish(vif, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt76_csa_finish(struct mt76_dev *dev)</div><div class='hunk'>@@ -1167,10 +1856,10 @@ __mt76_csa_check(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_dev *dev = priv;</div><div class='ctx'> </div><div class='del'>-	if (!vif-&gt;csa_active)</div><div class='add'>+	if (!vif-&gt;bss_conf.csa_active)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;csa_complete |= ieee80211_beacon_cntdwn_is_complete(vif);</div><div class='add'>+	dev-&gt;csa_complete |= ieee80211_beacon_cntdwn_is_complete(vif, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt76_csa_check(struct mt76_dev *dev)</div><div class='hunk'>@@ -1215,14 +1904,15 @@ int mt76_get_rate(struct mt76_dev *dev,</div><div class='ctx'> 		  struct ieee80211_supported_band *sband,</div><div class='ctx'> 		  int idx, bool cck)</div><div class='ctx'> {</div><div class='add'>+	bool is_2g = sband-&gt;band == NL80211_BAND_2GHZ;</div><div class='ctx'> 	int i, offset = 0, len = sband-&gt;n_bitrates;</div><div class='ctx'> </div><div class='ctx'> 	if (cck) {</div><div class='del'>-		if (sband == &amp;dev-&gt;phy.sband_5g.sband)</div><div class='add'>+		if (!is_2g)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='ctx'> 		idx &amp;= ~BIT(2); /* short preamble */</div><div class='del'>-	} else if (sband == &amp;dev-&gt;phy.sband_2g.sband) {</div><div class='add'>+	} else if (is_2g) {</div><div class='ctx'> 		offset = 4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1252,14 +1942,19 @@ void mt76_sw_scan_complete(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_sw_scan_complete);</div><div class='ctx'> </div><div class='del'>-int mt76_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant)</div><div class='add'>+int mt76_get_antenna(struct ieee80211_hw *hw, int radio_idx, u32 *tx_ant,</div><div class='add'>+		     u32 *rx_ant)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_phy *phy = hw-&gt;priv;</div><div class='ctx'> 	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mutex);</div><div class='del'>-	*tx_ant = phy-&gt;antenna_mask;</div><div class='del'>-	*rx_ant = phy-&gt;antenna_mask;</div><div class='add'>+	*tx_ant = 0;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;phys); i++)</div><div class='add'>+		if (dev-&gt;phys[i] &amp;&amp; dev-&gt;phys[i]-&gt;hw == hw)</div><div class='add'>+			*tx_ant |= dev-&gt;phys[i]-&gt;chainmask;</div><div class='add'>+	*rx_ant = *tx_ant;</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1268,7 +1963,7 @@ EXPORT_SYMBOL_GPL(mt76_get_antenna);</div><div class='ctx'> </div><div class='ctx'> struct mt76_queue *</div><div class='ctx'> mt76_init_queue(struct mt76_dev *dev, int qid, int idx, int n_desc,</div><div class='del'>-		int ring_base)</div><div class='add'>+		int ring_base, void *wed, u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_queue *hwq;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1277,6 +1972,9 @@ mt76_init_queue(struct mt76_dev *dev, int qid, int idx, int n_desc,</div><div class='ctx'> 	if (!hwq)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='add'>+	hwq-&gt;flags = flags;</div><div class='add'>+	hwq-&gt;wed = wed;</div><div class='add'>+</div><div class='ctx'> 	err = dev-&gt;queue_ops-&gt;alloc(dev, hwq, idx, n_desc, 0, ring_base);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='hunk'>@@ -1284,3 +1982,142 @@ mt76_init_queue(struct mt76_dev *dev, int qid, int idx, int n_desc,</div><div class='ctx'> 	return hwq;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_init_queue);</div><div class='add'>+</div><div class='add'>+void mt76_ethtool_worker(struct mt76_ethtool_worker_info *wi,</div><div class='add'>+			 struct mt76_sta_stats *stats, bool eht)</div><div class='add'>+{</div><div class='add'>+	int i, ei = wi-&gt;initial_stat_idx;</div><div class='add'>+	u64 *data = wi-&gt;data;</div><div class='add'>+</div><div class='add'>+	wi-&gt;sta_count++;</div><div class='add'>+</div><div class='add'>+	data[ei++] += stats-&gt;tx_mode[MT_PHY_TYPE_CCK];</div><div class='add'>+	data[ei++] += stats-&gt;tx_mode[MT_PHY_TYPE_OFDM];</div><div class='add'>+	data[ei++] += stats-&gt;tx_mode[MT_PHY_TYPE_HT];</div><div class='add'>+	data[ei++] += stats-&gt;tx_mode[MT_PHY_TYPE_HT_GF];</div><div class='add'>+	data[ei++] += stats-&gt;tx_mode[MT_PHY_TYPE_VHT];</div><div class='add'>+	data[ei++] += stats-&gt;tx_mode[MT_PHY_TYPE_HE_SU];</div><div class='add'>+	data[ei++] += stats-&gt;tx_mode[MT_PHY_TYPE_HE_EXT_SU];</div><div class='add'>+	data[ei++] += stats-&gt;tx_mode[MT_PHY_TYPE_HE_TB];</div><div class='add'>+	data[ei++] += stats-&gt;tx_mode[MT_PHY_TYPE_HE_MU];</div><div class='add'>+	if (eht) {</div><div class='add'>+		data[ei++] += stats-&gt;tx_mode[MT_PHY_TYPE_EHT_SU];</div><div class='add'>+		data[ei++] += stats-&gt;tx_mode[MT_PHY_TYPE_EHT_TRIG];</div><div class='add'>+		data[ei++] += stats-&gt;tx_mode[MT_PHY_TYPE_EHT_MU];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; (ARRAY_SIZE(stats-&gt;tx_bw) - !eht); i++)</div><div class='add'>+		data[ei++] += stats-&gt;tx_bw[i];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; (eht ? 14 : 12); i++)</div><div class='add'>+		data[ei++] += stats-&gt;tx_mcs[i];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='add'>+		data[ei++] += stats-&gt;tx_nss[i];</div><div class='add'>+</div><div class='add'>+	wi-&gt;worker_stat_count = ei - wi-&gt;initial_stat_idx;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_ethtool_worker);</div><div class='add'>+</div><div class='add'>+void mt76_ethtool_page_pool_stats(struct mt76_dev *dev, u64 *data, int *index)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PAGE_POOL_STATS</div><div class='add'>+	struct page_pool_stats stats = {};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mt76_for_each_q_rx(dev, i)</div><div class='add'>+		page_pool_get_stats(dev-&gt;q_rx[i].page_pool, &amp;stats);</div><div class='add'>+</div><div class='add'>+	page_pool_ethtool_stats_get(data, &amp;stats);</div><div class='add'>+	*index += page_pool_ethtool_stats_get_count();</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_ethtool_page_pool_stats);</div><div class='add'>+</div><div class='add'>+enum mt76_dfs_state mt76_phy_dfs_state(struct mt76_phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = phy-&gt;hw;</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;region == NL80211_DFS_UNSET ||</div><div class='add'>+	    test_bit(MT76_SCANNING, &amp;phy-&gt;state))</div><div class='add'>+		return MT_DFS_STATE_DISABLED;</div><div class='add'>+</div><div class='add'>+	if (!phy-&gt;radar_enabled) {</div><div class='add'>+		if ((hw-&gt;conf.flags &amp; IEEE80211_CONF_MONITOR) &amp;&amp;</div><div class='add'>+		    (phy-&gt;chandef.chan-&gt;flags &amp; IEEE80211_CHAN_RADAR))</div><div class='add'>+			return MT_DFS_STATE_ACTIVE;</div><div class='add'>+</div><div class='add'>+		return MT_DFS_STATE_DISABLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!cfg80211_reg_can_beacon(hw-&gt;wiphy, &amp;phy-&gt;chandef, NL80211_IFTYPE_AP))</div><div class='add'>+		return MT_DFS_STATE_CAC;</div><div class='add'>+</div><div class='add'>+	return MT_DFS_STATE_ACTIVE;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_phy_dfs_state);</div><div class='add'>+</div><div class='add'>+void mt76_vif_cleanup(struct mt76_dev *dev, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mlink = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_data *mvif = mlink-&gt;mvif;</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(mvif-&gt;link[0], NULL);</div><div class='add'>+	mt76_abort_scan(dev);</div><div class='add'>+	if (mvif-&gt;roc_phy)</div><div class='add'>+		mt76_abort_roc(mvif-&gt;roc_phy);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_vif_cleanup);</div><div class='add'>+</div><div class='add'>+u16 mt76_select_links(struct ieee80211_vif *vif, int max_active_links)</div><div class='add'>+{</div><div class='add'>+	unsigned long usable_links = ieee80211_vif_usable_links(vif);</div><div class='add'>+	struct  {</div><div class='add'>+		u8 link_id;</div><div class='add'>+		enum nl80211_band band;</div><div class='add'>+	} data[IEEE80211_MLD_MAX_NUM_LINKS];</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+	int i, n_data = 0;</div><div class='add'>+	u16 sel_links = 0;</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_vif_is_mld(vif))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;active_links == usable_links)</div><div class='add'>+		return vif-&gt;active_links;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for_each_set_bit(link_id, &amp;usable_links, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		struct ieee80211_bss_conf *link_conf;</div><div class='add'>+</div><div class='add'>+		link_conf = rcu_dereference(vif-&gt;link_conf[link_id]);</div><div class='add'>+		if (WARN_ON_ONCE(!link_conf))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		data[n_data].link_id = link_id;</div><div class='add'>+		data[n_data].band = link_conf-&gt;chanreq.oper.chan-&gt;band;</div><div class='add'>+		n_data++;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n_data; i++) {</div><div class='add'>+		int j;</div><div class='add'>+</div><div class='add'>+		if (!(BIT(data[i].link_id) &amp; vif-&gt;active_links))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		sel_links = BIT(data[i].link_id);</div><div class='add'>+		for (j = 0; j &lt; n_data; j++) {</div><div class='add'>+			if (data[i].band != data[j].band) {</div><div class='add'>+				sel_links |= BIT(data[j].link_id);</div><div class='add'>+				if (hweight16(sel_links) == max_active_links)</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sel_links;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_select_links);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mcu.c b/drivers/net/wireless/mediatek/mt76/mcu.c<br/>index d3a5e2c4f12a..535c3d8a9cc0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mcu.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mcu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mcu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mcu.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2019 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -6,18 +6,20 @@</div><div class='ctx'> #include "mt76.h"</div><div class='ctx'> </div><div class='ctx'> struct sk_buff *</div><div class='del'>-mt76_mcu_msg_alloc(struct mt76_dev *dev, const void *data,</div><div class='del'>-		   int data_len)</div><div class='add'>+__mt76_mcu_msg_alloc(struct mt76_dev *dev, const void *data,</div><div class='add'>+		     int len, int data_len, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	const struct mt76_mcu_ops *ops = dev-&gt;mcu_ops;</div><div class='del'>-	int length = ops-&gt;headroom + data_len + ops-&gt;tailroom;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	skb = alloc_skb(length, GFP_KERNEL);</div><div class='add'>+	len = max_t(int, len, data_len);</div><div class='add'>+	len = ops-&gt;headroom + len + ops-&gt;tailroom;</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(len, gfp);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	memset(skb-&gt;head, 0, length);</div><div class='add'>+	memset(skb-&gt;head, 0, len);</div><div class='ctx'> 	skb_reserve(skb, ops-&gt;headroom);</div><div class='ctx'> </div><div class='ctx'> 	if (data &amp;&amp; data_len)</div><div class='hunk'>@@ -25,7 +27,7 @@ mt76_mcu_msg_alloc(struct mt76_dev *dev, const void *data,</div><div class='ctx'> </div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(mt76_mcu_msg_alloc);</div><div class='add'>+EXPORT_SYMBOL_GPL(__mt76_mcu_msg_alloc);</div><div class='ctx'> </div><div class='ctx'> struct sk_buff *mt76_mcu_get_response(struct mt76_dev *dev,</div><div class='ctx'> 				      unsigned long expires)</div><div class='hunk'>@@ -71,14 +73,31 @@ int mt76_mcu_skb_send_and_get_msg(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 				  int cmd, bool wait_resp,</div><div class='ctx'> 				  struct sk_buff **ret_skb)</div><div class='ctx'> {</div><div class='add'>+	unsigned int retry = 0;</div><div class='add'>+	struct sk_buff *orig_skb = NULL;</div><div class='ctx'> 	unsigned long expires;</div><div class='ctx'> 	int ret, seq;</div><div class='ctx'> </div><div class='add'>+	if (mt76_is_sdio(dev))</div><div class='add'>+		if (test_bit(MT76_RESET, &amp;dev-&gt;phy.state) &amp;&amp; atomic_read(&amp;dev-&gt;bus_hung))</div><div class='add'>+			return -EIO;</div><div class='add'>+</div><div class='ctx'> 	if (ret_skb)</div><div class='ctx'> 		*ret_skb = NULL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mcu.mutex);</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;mcu_ops-&gt;mcu_skb_prepare_msg) {</div><div class='add'>+		orig_skb = skb;</div><div class='add'>+		ret = dev-&gt;mcu_ops-&gt;mcu_skb_prepare_msg(dev, skb, cmd, &amp;seq);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	/* orig skb might be needed for retry, mcu_skb_send_msg consumes it */</div><div class='add'>+	if (orig_skb)</div><div class='add'>+		skb_get(orig_skb);</div><div class='ctx'> 	ret = dev-&gt;mcu_ops-&gt;mcu_skb_send_msg(dev, skb, cmd, &amp;seq);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -92,6 +111,14 @@ int mt76_mcu_skb_send_and_get_msg(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		skb = mt76_mcu_get_response(dev, expires);</div><div class='add'>+		if (!skb &amp;&amp; !test_bit(MT76_MCU_RESET, &amp;dev-&gt;phy.state) &amp;&amp;</div><div class='add'>+		    orig_skb &amp;&amp; retry++ &lt; dev-&gt;mcu_ops-&gt;max_retry) {</div><div class='add'>+			dev_err(dev-&gt;dev, "Retry message %08x (seq %d)\n",</div><div class='add'>+				cmd, seq);</div><div class='add'>+			skb = orig_skb;</div><div class='add'>+			goto retry;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		ret = dev-&gt;mcu_ops-&gt;mcu_parse_response(dev, cmd, skb, seq);</div><div class='ctx'> 		if (!ret &amp;&amp; ret_skb)</div><div class='ctx'> 			*ret_skb = skb;</div><div class='hunk'>@@ -99,20 +126,22 @@ int mt76_mcu_skb_send_and_get_msg(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='ctx'> 	} while (ret == -EAGAIN);</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> out:</div><div class='add'>+	dev_kfree_skb(orig_skb);</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mcu.mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_mcu_skb_send_and_get_msg);</div><div class='ctx'> </div><div class='del'>-int mt76_mcu_send_firmware(struct mt76_dev *dev, int cmd, const void *data,</div><div class='del'>-			   int len)</div><div class='add'>+int __mt76_mcu_send_firmware(struct mt76_dev *dev, int cmd, const void *data,</div><div class='add'>+			     int len, int max_len)</div><div class='ctx'> {</div><div class='ctx'> 	int err, cur_len;</div><div class='ctx'> </div><div class='ctx'> 	while (len &gt; 0) {</div><div class='del'>-		cur_len = min_t(int, 4096 - dev-&gt;mcu_ops-&gt;headroom, len);</div><div class='add'>+		cur_len = min_t(int, max_len, len);</div><div class='ctx'> </div><div class='ctx'> 		err = mt76_mcu_send_msg(dev, cmd, data, cur_len, false);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -129,4 +158,4 @@ int mt76_mcu_send_firmware(struct mt76_dev *dev, int cmd, const void *data,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(mt76_mcu_send_firmware);</div><div class='add'>+EXPORT_SYMBOL_GPL(__mt76_mcu_send_firmware);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mmio.c b/drivers/net/wireless/mediatek/mt76/mmio.c<br/>index 26353b6bce97..05d74cd7248e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mmio.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mmio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mmio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mmio.c</a></div><div class='hunk'>@@ -1,9 +1,10 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "mt76.h"</div><div class='add'>+#include "dma.h"</div><div class='ctx'> #include "trace.h"</div><div class='ctx'> </div><div class='ctx'> static u32 mt76_mmio_rr(struct mt76_dev *dev, u32 offset)</div><div class='hunk'>@@ -32,13 +33,21 @@ static u32 mt76_mmio_rmw(struct mt76_dev *dev, u32 offset, u32 mask, u32 val)</div><div class='ctx'> static void mt76_mmio_write_copy(struct mt76_dev *dev, u32 offset,</div><div class='ctx'> 				 const void *data, int len)</div><div class='ctx'> {</div><div class='del'>-	__iowrite32_copy(dev-&gt;mmio.regs + offset, data, DIV_ROUND_UP(len, 4));</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ALIGN(len, 4); i += 4)</div><div class='add'>+		writel(get_unaligned_le32(data + i),</div><div class='add'>+		       dev-&gt;mmio.regs + offset + i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mt76_mmio_read_copy(struct mt76_dev *dev, u32 offset,</div><div class='ctx'> 				void *data, int len)</div><div class='ctx'> {</div><div class='del'>-	__ioread32_copy(data, dev-&gt;mmio.regs + offset, DIV_ROUND_UP(len, 4));</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ALIGN(len, 4); i += 4)</div><div class='add'>+		put_unaligned_le32(readl(dev-&gt;mmio.regs + offset + i),</div><div class='add'>+				   data + i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt76_mmio_wr_rp(struct mt76_dev *dev, u32 base,</div><div class='hunk'>@@ -73,8 +82,13 @@ void mt76_set_irq_mask(struct mt76_dev *dev, u32 addr,</div><div class='ctx'> 	spin_lock_irqsave(&amp;dev-&gt;mmio.irq_lock, flags);</div><div class='ctx'> 	dev-&gt;mmio.irqmask &amp;= ~clear;</div><div class='ctx'> 	dev-&gt;mmio.irqmask |= set;</div><div class='del'>-	if (addr)</div><div class='del'>-		mt76_mmio_wr(dev, addr, dev-&gt;mmio.irqmask);</div><div class='add'>+	if (addr) {</div><div class='add'>+		if (mtk_wed_device_active(&amp;dev-&gt;mmio.wed))</div><div class='add'>+			mtk_wed_device_irq_set_mask(&amp;dev-&gt;mmio.wed,</div><div class='add'>+						    dev-&gt;mmio.irqmask);</div><div class='add'>+		else</div><div class='add'>+			mt76_mmio_wr(dev, addr, dev-&gt;mmio.irqmask);</div><div class='add'>+	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;dev-&gt;mmio.irq_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_set_irq_mask);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h<br/>index 36ede65919f8..d05e83ea1cac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -13,22 +13,55 @@</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/average.h&gt;</div><div class='add'>+#include &lt;linux/soc/airoha/airoha_offload.h&gt;</div><div class='add'>+#include &lt;linux/soc/mediatek/mtk_wed.h&gt;</div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='add'>+#include &lt;net/page_pool/helpers.h&gt;</div><div class='ctx'> #include "util.h"</div><div class='ctx'> #include "testmode.h"</div><div class='ctx'> </div><div class='ctx'> #define MT_MCU_RING_SIZE	32</div><div class='ctx'> #define MT_RX_BUF_SIZE		2048</div><div class='del'>-#define MT_SKB_HEAD_LEN		128</div><div class='add'>+#define MT_SKB_HEAD_LEN		256</div><div class='ctx'> </div><div class='ctx'> #define MT_MAX_NON_AQL_PKT	16</div><div class='ctx'> #define MT_TXQ_FREE_THR		32</div><div class='ctx'> </div><div class='ctx'> #define MT76_TOKEN_FREE_THR	64</div><div class='ctx'> </div><div class='add'>+#define MT_QFLAG_WED_RING	GENMASK(1, 0)</div><div class='add'>+#define MT_QFLAG_WED_TYPE	GENMASK(4, 2)</div><div class='add'>+#define MT_QFLAG_WED		BIT(5)</div><div class='add'>+#define MT_QFLAG_WED_RRO	BIT(6)</div><div class='add'>+#define MT_QFLAG_WED_RRO_EN	BIT(7)</div><div class='add'>+#define MT_QFLAG_EMI_EN		BIT(8)</div><div class='add'>+#define MT_QFLAG_NPU		BIT(9)</div><div class='add'>+</div><div class='add'>+#define __MT_WED_Q(_type, _n)	(MT_QFLAG_WED | \</div><div class='add'>+				 FIELD_PREP(MT_QFLAG_WED_TYPE, _type) | \</div><div class='add'>+				 FIELD_PREP(MT_QFLAG_WED_RING, _n))</div><div class='add'>+#define __MT_WED_RRO_Q(_type, _n)	(MT_QFLAG_WED_RRO | __MT_WED_Q(_type, _n))</div><div class='add'>+</div><div class='add'>+#define MT_WED_Q_TX(_n)		__MT_WED_Q(MT76_WED_Q_TX, _n)</div><div class='add'>+#define MT_WED_Q_RX(_n)		__MT_WED_Q(MT76_WED_Q_RX, _n)</div><div class='add'>+#define MT_WED_Q_TXFREE		__MT_WED_Q(MT76_WED_Q_TXFREE, 0)</div><div class='add'>+#define MT_WED_RRO_Q_DATA(_n)	__MT_WED_RRO_Q(MT76_WED_RRO_Q_DATA, _n)</div><div class='add'>+#define MT_WED_RRO_Q_MSDU_PG(_n)	__MT_WED_RRO_Q(MT76_WED_RRO_Q_MSDU_PG, _n)</div><div class='add'>+#define MT_WED_RRO_Q_IND	__MT_WED_RRO_Q(MT76_WED_RRO_Q_IND, 0)</div><div class='add'>+#define MT_WED_RRO_Q_RXDMAD_C	__MT_WED_RRO_Q(MT76_WED_RRO_Q_RXDMAD_C, 0)</div><div class='add'>+</div><div class='add'>+#define __MT_NPU_Q(_type, _n)	(MT_QFLAG_NPU | \</div><div class='add'>+				 FIELD_PREP(MT_QFLAG_WED_TYPE, _type) | \</div><div class='add'>+				 FIELD_PREP(MT_QFLAG_WED_RING, _n))</div><div class='add'>+#define MT_NPU_Q_TX(_n)		__MT_NPU_Q(MT76_WED_Q_TX, _n)</div><div class='add'>+#define MT_NPU_Q_RX(_n)		__MT_NPU_Q(MT76_WED_Q_RX, _n)</div><div class='add'>+</div><div class='ctx'> struct mt76_dev;</div><div class='ctx'> struct mt76_phy;</div><div class='ctx'> struct mt76_wcid;</div><div class='add'>+struct mt76s_intr;</div><div class='add'>+struct mt76_chanctx;</div><div class='add'>+struct mt76_vif_link;</div><div class='ctx'> </div><div class='ctx'> struct mt76_reg_pair {</div><div class='ctx'> 	u32 reg;</div><div class='hunk'>@@ -41,6 +74,22 @@ enum mt76_bus_type {</div><div class='ctx'> 	MT76_BUS_SDIO,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum mt76_wed_type {</div><div class='add'>+	MT76_WED_Q_TX,</div><div class='add'>+	MT76_WED_Q_TXFREE,</div><div class='add'>+	MT76_WED_Q_RX,</div><div class='add'>+	MT76_WED_RRO_Q_DATA,</div><div class='add'>+	MT76_WED_RRO_Q_MSDU_PG,</div><div class='add'>+	MT76_WED_RRO_Q_IND,</div><div class='add'>+	MT76_WED_RRO_Q_RXDMAD_C,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mt76_hwrro_mode {</div><div class='add'>+	MT76_HWRRO_OFF,</div><div class='add'>+	MT76_HWRRO_V3,</div><div class='add'>+	MT76_HWRRO_V3_1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mt76_bus_ops {</div><div class='ctx'> 	u32 (*rr)(struct mt76_dev *dev, u32 offset);</div><div class='ctx'> 	void (*wr)(struct mt76_dev *dev, u32 offset, u32 val);</div><div class='hunk'>@@ -82,15 +131,71 @@ enum mt76_rxq_id {</div><div class='ctx'> 	MT_RXQ_MAIN,</div><div class='ctx'> 	MT_RXQ_MCU,</div><div class='ctx'> 	MT_RXQ_MCU_WA,</div><div class='del'>-	MT_RXQ_EXT,</div><div class='del'>-	MT_RXQ_EXT_WA,</div><div class='add'>+	MT_RXQ_BAND1,</div><div class='add'>+	MT_RXQ_BAND1_WA,</div><div class='add'>+	MT_RXQ_MAIN_WA,</div><div class='add'>+	MT_RXQ_BAND2,</div><div class='add'>+	MT_RXQ_BAND2_WA,</div><div class='add'>+	MT_RXQ_RRO_BAND0,</div><div class='add'>+	MT_RXQ_RRO_BAND1,</div><div class='add'>+	MT_RXQ_RRO_BAND2,</div><div class='add'>+	MT_RXQ_MSDU_PAGE_BAND0,</div><div class='add'>+	MT_RXQ_MSDU_PAGE_BAND1,</div><div class='add'>+	MT_RXQ_MSDU_PAGE_BAND2,</div><div class='add'>+	MT_RXQ_TXFREE_BAND0,</div><div class='add'>+	MT_RXQ_TXFREE_BAND1,</div><div class='add'>+	MT_RXQ_TXFREE_BAND2,</div><div class='add'>+	MT_RXQ_RRO_IND,</div><div class='add'>+	MT_RXQ_RRO_RXDMAD_C,</div><div class='add'>+	MT_RXQ_NPU0,</div><div class='add'>+	MT_RXQ_NPU1,</div><div class='ctx'> 	__MT_RXQ_MAX</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum mt76_band_id {</div><div class='add'>+	MT_BAND0,</div><div class='add'>+	MT_BAND1,</div><div class='add'>+	MT_BAND2,</div><div class='add'>+	__MT_MAX_BAND</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mt76_cipher_type {</div><div class='add'>+	MT_CIPHER_NONE,</div><div class='add'>+	MT_CIPHER_WEP40,</div><div class='add'>+	MT_CIPHER_TKIP,</div><div class='add'>+	MT_CIPHER_TKIP_NO_MIC,</div><div class='add'>+	MT_CIPHER_AES_CCMP,</div><div class='add'>+	MT_CIPHER_WEP104,</div><div class='add'>+	MT_CIPHER_BIP_CMAC_128,</div><div class='add'>+	MT_CIPHER_WEP128,</div><div class='add'>+	MT_CIPHER_WAPI,</div><div class='add'>+	MT_CIPHER_CCMP_CCX,</div><div class='add'>+	MT_CIPHER_CCMP_256,</div><div class='add'>+	MT_CIPHER_GCMP,</div><div class='add'>+	MT_CIPHER_GCMP_256,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mt76_dfs_state {</div><div class='add'>+	MT_DFS_STATE_UNKNOWN,</div><div class='add'>+	MT_DFS_STATE_DISABLED,</div><div class='add'>+	MT_DFS_STATE_CAC,</div><div class='add'>+	MT_DFS_STATE_ACTIVE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MT76_RNR_SCAN_MAX_BSSIDS       16</div><div class='add'>+struct mt76_scan_rnr_param {</div><div class='add'>+	u8 bssid[MT76_RNR_SCAN_MAX_BSSIDS][ETH_ALEN];</div><div class='add'>+	u8 channel[MT76_RNR_SCAN_MAX_BSSIDS];</div><div class='add'>+	u8 random_mac[ETH_ALEN];</div><div class='add'>+	u8 seq_num;</div><div class='add'>+	u8 bssid_num;</div><div class='add'>+	u32 sreq_flag;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mt76_queue_buf {</div><div class='ctx'> 	dma_addr_t addr;</div><div class='del'>-	u16 len;</div><div class='del'>-	bool skip_unmap;</div><div class='add'>+	u16 len:15,</div><div class='add'>+	    skip_unmap:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt76_tx_info {</div><div class='hunk'>@@ -110,7 +215,7 @@ struct mt76_queue_entry {</div><div class='ctx'> 		struct urb *urb;</div><div class='ctx'> 		int buf_sz;</div><div class='ctx'> 	};</div><div class='del'>-	u32 dma_addr[2];</div><div class='add'>+	dma_addr_t dma_addr[2];</div><div class='ctx'> 	u16 dma_len[2];</div><div class='ctx'> 	u16 wcid;</div><div class='ctx'> 	bool skip_buf0:1;</div><div class='hunk'>@@ -131,11 +236,14 @@ struct mt76_queue {</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> 	spinlock_t cleanup_lock;</div><div class='ctx'> 	struct mt76_queue_entry *entry;</div><div class='add'>+	struct mt76_rro_desc *rro_desc;</div><div class='ctx'> 	struct mt76_desc *desc;</div><div class='ctx'> </div><div class='ctx'> 	u16 first;</div><div class='ctx'> 	u16 head;</div><div class='ctx'> 	u16 tail;</div><div class='add'>+	u8 hw_idx;</div><div class='add'>+	u8 ep;</div><div class='ctx'> 	int ndesc;</div><div class='ctx'> 	int queued;</div><div class='ctx'> 	int buf_size;</div><div class='hunk'>@@ -143,20 +251,29 @@ struct mt76_queue {</div><div class='ctx'> 	bool blocked;</div><div class='ctx'> </div><div class='ctx'> 	u8 buf_offset;</div><div class='del'>-	u8 hw_idx;</div><div class='del'>-	u8 qid;</div><div class='add'>+	u16 flags;</div><div class='add'>+	u8 magic_cnt;</div><div class='add'>+</div><div class='add'>+	__le16 *emi_cpu_idx;</div><div class='add'>+</div><div class='add'>+	struct mtk_wed_device *wed;</div><div class='add'>+	struct mt76_dev *dev;</div><div class='add'>+	u32 wed_regs;</div><div class='ctx'> </div><div class='ctx'> 	dma_addr_t desc_dma;</div><div class='ctx'> 	struct sk_buff *rx_head;</div><div class='del'>-	struct page_frag_cache rx_page;</div><div class='add'>+	struct page_pool *page_pool;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt76_mcu_ops {</div><div class='add'>+	unsigned int max_retry;</div><div class='ctx'> 	u32 headroom;</div><div class='ctx'> 	u32 tailroom;</div><div class='ctx'> </div><div class='ctx'> 	int (*mcu_send_msg)(struct mt76_dev *dev, int cmd, const void *data,</div><div class='ctx'> 			    int len, bool wait_resp);</div><div class='add'>+	int (*mcu_skb_prepare_msg)(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='add'>+				   int cmd, int *seq);</div><div class='ctx'> 	int (*mcu_skb_send_msg)(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 				int cmd, int *seq);</div><div class='ctx'> 	int (*mcu_parse_response)(struct mt76_dev *dev, int cmd,</div><div class='hunk'>@@ -178,9 +295,9 @@ struct mt76_queue_ops {</div><div class='ctx'> 		     int idx, int n_desc, int bufsize,</div><div class='ctx'> 		     u32 ring_base);</div><div class='ctx'> </div><div class='del'>-	int (*tx_queue_skb)(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='del'>-			    struct sk_buff *skb, struct mt76_wcid *wcid,</div><div class='del'>-			    struct ieee80211_sta *sta);</div><div class='add'>+	int (*tx_queue_skb)(struct mt76_phy *phy, struct mt76_queue *q,</div><div class='add'>+			    enum mt76_txq_id qid, struct sk_buff *skb,</div><div class='add'>+			    struct mt76_wcid *wcid, struct ieee80211_sta *sta);</div><div class='ctx'> </div><div class='ctx'> 	int (*tx_queue_skb_raw)(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='ctx'> 				struct sk_buff *skb, u32 tx_info);</div><div class='hunk'>@@ -193,11 +310,48 @@ struct mt76_queue_ops {</div><div class='ctx'> 	void (*tx_cleanup)(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='ctx'> 			   bool flush);</div><div class='ctx'> </div><div class='add'>+	void (*rx_queue_init)(struct mt76_dev *dev, enum mt76_rxq_id qid,</div><div class='add'>+			      int (*poll)(struct napi_struct *napi, int budget));</div><div class='add'>+</div><div class='ctx'> 	void (*rx_cleanup)(struct mt76_dev *dev, struct mt76_queue *q);</div><div class='ctx'> </div><div class='ctx'> 	void (*kick)(struct mt76_dev *dev, struct mt76_queue *q);</div><div class='ctx'> </div><div class='del'>-	void (*reset_q)(struct mt76_dev *dev, struct mt76_queue *q);</div><div class='add'>+	void (*reset_q)(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='add'>+			bool reset_idx);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mt76_phy_type {</div><div class='add'>+	MT_PHY_TYPE_CCK,</div><div class='add'>+	MT_PHY_TYPE_OFDM,</div><div class='add'>+	MT_PHY_TYPE_HT,</div><div class='add'>+	MT_PHY_TYPE_HT_GF,</div><div class='add'>+	MT_PHY_TYPE_VHT,</div><div class='add'>+	MT_PHY_TYPE_HE_SU = 8,</div><div class='add'>+	MT_PHY_TYPE_HE_EXT_SU,</div><div class='add'>+	MT_PHY_TYPE_HE_TB,</div><div class='add'>+	MT_PHY_TYPE_HE_MU,</div><div class='add'>+	MT_PHY_TYPE_EHT_SU = 13,</div><div class='add'>+	MT_PHY_TYPE_EHT_TRIG,</div><div class='add'>+	MT_PHY_TYPE_EHT_MU,</div><div class='add'>+	__MT_PHY_TYPE_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt76_sta_stats {</div><div class='add'>+	u64 tx_mode[__MT_PHY_TYPE_MAX];</div><div class='add'>+	u64 tx_bw[5];		/* 20, 40, 80, 160, 320 */</div><div class='add'>+	u64 tx_nss[4];		/* 1, 2, 3, 4 */</div><div class='add'>+	u64 tx_mcs[16];		/* mcs idx */</div><div class='add'>+	u64 tx_bytes;</div><div class='add'>+	/* WED TX */</div><div class='add'>+	u32 tx_packets;		/* unit: MSDU */</div><div class='add'>+	u32 tx_retries;</div><div class='add'>+	u32 tx_failed;</div><div class='add'>+	/* WED RX */</div><div class='add'>+	u64 rx_bytes;</div><div class='add'>+	u32 rx_packets;</div><div class='add'>+	u32 rx_errors;</div><div class='add'>+	u32 rx_drops;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum mt76_wcid_flags {</div><div class='hunk'>@@ -207,10 +361,10 @@ enum mt76_wcid_flags {</div><div class='ctx'> 	MT_WCID_FLAG_HDR_TRANS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define MT76_N_WCIDS 288</div><div class='add'>+#define MT76_N_WCIDS 1088</div><div class='ctx'> </div><div class='ctx'> /* stored in ieee80211_tx_info::hw_queue */</div><div class='del'>-#define MT_TX_HW_QUEUE_EXT_PHY		BIT(3)</div><div class='add'>+#define MT_TX_HW_QUEUE_PHY		GENMASK(3, 2)</div><div class='ctx'> </div><div class='ctx'> DECLARE_EWMA(signal, 10, 8);</div><div class='ctx'> </div><div class='hunk'>@@ -228,37 +382,72 @@ struct mt76_wcid {</div><div class='ctx'> 	struct ewma_signal rssi;</div><div class='ctx'> 	int inactive_count;</div><div class='ctx'> </div><div class='add'>+	struct rate_info rate;</div><div class='add'>+	unsigned long ampdu_state;</div><div class='add'>+</div><div class='ctx'> 	u16 idx;</div><div class='ctx'> 	u8 hw_key_idx;</div><div class='ctx'> 	u8 hw_key_idx2;</div><div class='ctx'> </div><div class='add'>+	u8 offchannel:1;</div><div class='ctx'> 	u8 sta:1;</div><div class='del'>-	u8 ext_phy:1;</div><div class='add'>+	u8 sta_disabled:1;</div><div class='ctx'> 	u8 amsdu:1;</div><div class='add'>+	u8 phy_idx:2;</div><div class='add'>+	u8 link_id:4;</div><div class='add'>+	bool link_valid;</div><div class='ctx'> </div><div class='ctx'> 	u8 rx_check_pn;</div><div class='del'>-	u8 rx_key_pn[IEEE80211_NUM_TIDS][6];</div><div class='add'>+	u8 rx_key_pn[IEEE80211_NUM_TIDS + 1][6];</div><div class='ctx'> 	u16 cipher;</div><div class='ctx'> </div><div class='ctx'> 	u32 tx_info;</div><div class='ctx'> 	bool sw_iv;</div><div class='ctx'> </div><div class='del'>-	u8 packet_id;</div><div class='add'>+	struct list_head tx_list;</div><div class='add'>+	struct sk_buff_head tx_pending;</div><div class='add'>+	struct sk_buff_head tx_offchannel;</div><div class='add'>+</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct idr pktid;</div><div class='add'>+</div><div class='add'>+	struct mt76_sta_stats stats;</div><div class='add'>+</div><div class='add'>+	struct list_head poll_list;</div><div class='add'>+</div><div class='add'>+	struct mt76_wcid *def_wcid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt76_txq {</div><div class='del'>-	struct mt76_wcid *wcid;</div><div class='add'>+	u16 wcid;</div><div class='ctx'> </div><div class='ctx'> 	u16 agg_ssn;</div><div class='ctx'> 	bool send_bar;</div><div class='ctx'> 	bool aggr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* data0 */</div><div class='add'>+#define RRO_IND_DATA0_IND_REASON_MASK	GENMASK(31, 28)</div><div class='add'>+#define RRO_IND_DATA0_START_SEQ_MASK	GENMASK(27, 16)</div><div class='add'>+#define RRO_IND_DATA0_SEQ_ID_MASK	GENMASK(11, 0)</div><div class='add'>+/* data1 */</div><div class='add'>+#define RRO_IND_DATA1_MAGIC_CNT_MASK	GENMASK(31, 29)</div><div class='add'>+#define RRO_IND_DATA1_IND_COUNT_MASK	GENMASK(12, 0)</div><div class='add'>+struct mt76_wed_rro_ind {</div><div class='add'>+	__le32 data0;</div><div class='add'>+	__le32 data1;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mt76_txwi_cache {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	dma_addr_t dma_addr;</div><div class='ctx'> </div><div class='del'>-	struct sk_buff *skb;</div><div class='add'>+	union {</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+		void *ptr;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	u8 qid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt76_rx_tid {</div><div class='hunk'>@@ -269,6 +458,7 @@ struct mt76_rx_tid {</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> 	struct delayed_work reorder_work;</div><div class='ctx'> </div><div class='add'>+	u16 id;</div><div class='ctx'> 	u16 head;</div><div class='ctx'> 	u16 size;</div><div class='ctx'> 	u16 nframes;</div><div class='hunk'>@@ -277,7 +467,7 @@ struct mt76_rx_tid {</div><div class='ctx'> </div><div class='ctx'> 	u8 started:1, stopped:1, timer_pending:1;</div><div class='ctx'> </div><div class='del'>-	struct sk_buff *reorder_buf[];</div><div class='add'>+	struct sk_buff *reorder_buf[] __counted_by(size);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define MT_TX_CB_DMA_DONE		BIT(0)</div><div class='hunk'>@@ -287,10 +477,16 @@ struct mt76_rx_tid {</div><div class='ctx'> #define MT_PACKET_ID_MASK		GENMASK(6, 0)</div><div class='ctx'> #define MT_PACKET_ID_NO_ACK		0</div><div class='ctx'> #define MT_PACKET_ID_NO_SKB		1</div><div class='del'>-#define MT_PACKET_ID_FIRST		2</div><div class='add'>+#define MT_PACKET_ID_WED		2</div><div class='add'>+#define MT_PACKET_ID_FIRST		3</div><div class='ctx'> #define MT_PACKET_ID_HAS_RATE		BIT(7)</div><div class='del'>-</div><div class='del'>-#define MT_TX_STATUS_SKB_TIMEOUT	HZ</div><div class='add'>+/* This is timer for when to give up when waiting for TXS callback,</div><div class='add'>+ * with starting time being the time at which the DMA_DONE callback</div><div class='add'>+ * was seen (so, we know packet was processed then, it should not take</div><div class='add'>+ * long after that for firmware to send the TXS callback if it is going</div><div class='add'>+ * to do so.)</div><div class='add'>+ */</div><div class='add'>+#define MT_TX_STATUS_SKB_TIMEOUT	(HZ / 4)</div><div class='ctx'> </div><div class='ctx'> struct mt76_tx_cb {</div><div class='ctx'> 	unsigned long jiffies;</div><div class='hunk'>@@ -301,6 +497,7 @@ struct mt76_tx_cb {</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	MT76_STATE_INITIALIZED,</div><div class='add'>+	MT76_STATE_REGISTERED,</div><div class='ctx'> 	MT76_STATE_RUNNING,</div><div class='ctx'> 	MT76_STATE_MCU_RUNNING,</div><div class='ctx'> 	MT76_SCANNING,</div><div class='hunk'>@@ -315,11 +512,19 @@ enum {</div><div class='ctx'> 	MT76_STATE_SUSPEND,</div><div class='ctx'> 	MT76_STATE_ROC,</div><div class='ctx'> 	MT76_STATE_PM,</div><div class='add'>+	MT76_STATE_WED_RESET,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mt76_sta_event {</div><div class='add'>+	MT76_STA_EVENT_ASSOC,</div><div class='add'>+	MT76_STA_EVENT_AUTHORIZE,</div><div class='add'>+	MT76_STA_EVENT_DISASSOC,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt76_hw_cap {</div><div class='ctx'> 	bool has_2ghz;</div><div class='ctx'> 	bool has_5ghz;</div><div class='add'>+	bool has_6ghz;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define MT_DRV_TXWI_NO_FREE		BIT(0)</div><div class='hunk'>@@ -328,6 +533,7 @@ struct mt76_hw_cap {</div><div class='ctx'> #define MT_DRV_RX_DMA_HDR		BIT(3)</div><div class='ctx'> #define MT_DRV_HW_MGMT_TXQ		BIT(4)</div><div class='ctx'> #define MT_DRV_AMSDU_OFFLOAD		BIT(5)</div><div class='add'>+#define MT_DRV_IGNORE_TXS_FAILED	BIT(6)</div><div class='ctx'> </div><div class='ctx'> struct mt76_driver_ops {</div><div class='ctx'> 	u32 drv_flags;</div><div class='hunk'>@@ -336,7 +542,10 @@ struct mt76_driver_ops {</div><div class='ctx'> 	u16 token_size;</div><div class='ctx'> 	u8 mcs_rates;</div><div class='ctx'> </div><div class='del'>-	void (*update_survey)(struct mt76_dev *dev);</div><div class='add'>+	unsigned int link_data_size;</div><div class='add'>+</div><div class='add'>+	void (*update_survey)(struct mt76_phy *phy);</div><div class='add'>+	int (*set_channel)(struct mt76_phy *phy);</div><div class='ctx'> </div><div class='ctx'> 	int (*tx_prepare_skb)(struct mt76_dev *dev, void *txwi_ptr,</div><div class='ctx'> 			      enum mt76_txq_id qid, struct mt76_wcid *wcid,</div><div class='hunk'>@@ -348,22 +557,37 @@ struct mt76_driver_ops {</div><div class='ctx'> </div><div class='ctx'> 	bool (*tx_status_data)(struct mt76_dev *dev, u8 *update);</div><div class='ctx'> </div><div class='add'>+	bool (*rx_check)(struct mt76_dev *dev, void *data, int len);</div><div class='add'>+</div><div class='ctx'> 	void (*rx_skb)(struct mt76_dev *dev, enum mt76_rxq_id q,</div><div class='del'>-		       struct sk_buff *skb);</div><div class='add'>+		       struct sk_buff *skb, u32 *info);</div><div class='ctx'> </div><div class='ctx'> 	void (*rx_poll_complete)(struct mt76_dev *dev, enum mt76_rxq_id q);</div><div class='ctx'> </div><div class='add'>+	void (*rx_rro_ind_process)(struct mt76_dev *dev, void *data);</div><div class='add'>+	int (*rx_rro_add_msdu_page)(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='add'>+				    dma_addr_t p, void *data);</div><div class='add'>+</div><div class='ctx'> 	void (*sta_ps)(struct mt76_dev *dev, struct ieee80211_sta *sta,</div><div class='ctx'> 		       bool ps);</div><div class='ctx'> </div><div class='ctx'> 	int (*sta_add)(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='ctx'> 		       struct ieee80211_sta *sta);</div><div class='ctx'> </div><div class='del'>-	void (*sta_assoc)(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-			  struct ieee80211_sta *sta);</div><div class='add'>+	int (*sta_event)(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			 struct ieee80211_sta *sta, enum mt76_sta_event ev);</div><div class='ctx'> </div><div class='ctx'> 	void (*sta_remove)(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='ctx'> 			   struct ieee80211_sta *sta);</div><div class='add'>+</div><div class='add'>+	int (*vif_link_add)(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='add'>+			    struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			    struct mt76_vif_link *mlink);</div><div class='add'>+</div><div class='add'>+	void (*vif_link_remove)(struct mt76_phy *phy,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				struct mt76_vif_link *mlink);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt76_channel_state {</div><div class='hunk'>@@ -381,19 +605,6 @@ struct mt76_sband {</div><div class='ctx'> 	struct mt76_channel_state *chan;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mt76_rate_power {</div><div class='del'>-	union {</div><div class='del'>-		struct {</div><div class='del'>-			s8 cck[4];</div><div class='del'>-			s8 ofdm[8];</div><div class='del'>-			s8 stbc[10];</div><div class='del'>-			s8 ht[16];</div><div class='del'>-			s8 vht[10];</div><div class='del'>-		};</div><div class='del'>-		s8 all[48];</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* addr req mask */</div><div class='ctx'> #define MT_VEND_TYPE_EEPROM	BIT(31)</div><div class='ctx'> #define MT_VEND_TYPE_CFG	BIT(30)</div><div class='hunk'>@@ -465,35 +676,52 @@ struct mt76_usb {</div><div class='ctx'> 		struct mt76_reg_pair *rp;</div><div class='ctx'> 		int rp_len;</div><div class='ctx'> 		u32 base;</div><div class='del'>-		bool burst;</div><div class='ctx'> 	} mcu;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define MT76S_XMIT_BUF_SZ	(16 * PAGE_SIZE)</div><div class='add'>+#define MT76S_XMIT_BUF_SZ	0x3fe00</div><div class='add'>+#define MT76S_NUM_TX_ENTRIES	256</div><div class='add'>+#define MT76S_NUM_RX_ENTRIES	512</div><div class='ctx'> struct mt76_sdio {</div><div class='ctx'> 	struct mt76_worker txrx_worker;</div><div class='ctx'> 	struct mt76_worker status_worker;</div><div class='ctx'> 	struct mt76_worker net_worker;</div><div class='add'>+	struct mt76_worker stat_worker;</div><div class='ctx'> </div><div class='del'>-	struct work_struct stat_work;</div><div class='del'>-</div><div class='del'>-	u8 *xmit_buf[IEEE80211_NUM_ACS + 2];</div><div class='add'>+	u8 *xmit_buf;</div><div class='add'>+	u32 xmit_buf_sz;</div><div class='ctx'> </div><div class='ctx'> 	struct sdio_func *func;</div><div class='ctx'> 	void *intr_data;</div><div class='add'>+	u8 hw_ver;</div><div class='add'>+	wait_queue_head_t wait;</div><div class='ctx'> </div><div class='add'>+	int pse_mcu_quota_max;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		int pse_data_quota;</div><div class='ctx'> 		int ple_data_quota;</div><div class='ctx'> 		int pse_mcu_quota;</div><div class='add'>+		int pse_page_size;</div><div class='ctx'> 		int deficit;</div><div class='ctx'> 	} sched;</div><div class='add'>+</div><div class='add'>+	int (*parse_irq)(struct mt76_dev *dev, struct mt76s_intr *intr);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt76_mmio {</div><div class='ctx'> 	void __iomem *regs;</div><div class='ctx'> 	spinlock_t irq_lock;</div><div class='ctx'> 	u32 irqmask;</div><div class='add'>+</div><div class='add'>+	struct mtk_wed_device wed;</div><div class='add'>+	struct mtk_wed_device wed_hif2;</div><div class='add'>+	struct completion wed_reset;</div><div class='add'>+	struct completion wed_reset_complete;</div><div class='add'>+</div><div class='add'>+	struct airoha_ppe_dev __rcu *ppe_dev;</div><div class='add'>+	struct airoha_npu __rcu *npu;</div><div class='add'>+	phys_addr_t phy_addr;</div><div class='add'>+	int npu_type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt76_rx_status {</div><div class='hunk'>@@ -509,7 +737,7 @@ struct mt76_rx_status {</div><div class='ctx'> </div><div class='ctx'> 	u8 iv[6];</div><div class='ctx'> </div><div class='del'>-	u8 ext_phy:1;</div><div class='add'>+	u8 phy_idx:2;</div><div class='ctx'> 	u8 aggr:1;</div><div class='ctx'> 	u8 qos_ctl;</div><div class='ctx'> 	u16 seqno;</div><div class='hunk'>@@ -517,17 +745,32 @@ struct mt76_rx_status {</div><div class='ctx'> 	u16 freq;</div><div class='ctx'> 	u32 flag;</div><div class='ctx'> 	u8 enc_flags;</div><div class='del'>-	u8 encoding:2, bw:3, he_ru:3;</div><div class='del'>-	u8 he_gi:2, he_dcm:1;</div><div class='add'>+	u8 encoding:3, bw:4;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u8 he_ru:3;</div><div class='add'>+			u8 he_gi:2;</div><div class='add'>+			u8 he_dcm:1;</div><div class='add'>+		};</div><div class='add'>+		struct {</div><div class='add'>+			u8 ru:4;</div><div class='add'>+			u8 gi:2;</div><div class='add'>+		} eht;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	u8 amsdu:1, first_amsdu:1, last_amsdu:1;</div><div class='ctx'> 	u8 rate_idx;</div><div class='del'>-	u8 nss;</div><div class='del'>-	u8 band;</div><div class='add'>+	u8 nss:5, band:3;</div><div class='ctx'> 	s8 signal;</div><div class='ctx'> 	u8 chains;</div><div class='ctx'> 	s8 chain_signal[IEEE80211_MAX_CHAINS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mt76_freq_range_power {</div><div class='add'>+	const struct cfg80211_sar_freq_ranges *range;</div><div class='add'>+	s8 power;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mt76_testmode_ops {</div><div class='ctx'> 	int (*set_state)(struct mt76_phy *phy, enum mt76_testmode_state state);</div><div class='ctx'> 	int (*set_params)(struct mt76_phy *phy, struct nlattr **tb,</div><div class='hunk'>@@ -564,6 +807,8 @@ struct mt76_testmode_data {</div><div class='ctx'> 	u8 tx_power[4];</div><div class='ctx'> 	u8 tx_power_control;</div><div class='ctx'> </div><div class='add'>+	u8 addr[3][ETH_ALEN];</div><div class='add'>+</div><div class='ctx'> 	u32 tx_pending;</div><div class='ctx'> 	u32 tx_queued;</div><div class='ctx'> 	u16 tx_queued_limit;</div><div class='hunk'>@@ -574,12 +819,31 @@ struct mt76_testmode_data {</div><div class='ctx'> 	} rx_stats;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mt76_vif {</div><div class='add'>+struct mt76_vif_link {</div><div class='ctx'> 	u8 idx;</div><div class='add'>+	u8 link_idx;</div><div class='ctx'> 	u8 omac_idx;</div><div class='ctx'> 	u8 band_idx;</div><div class='ctx'> 	u8 wmm_idx;</div><div class='ctx'> 	u8 scan_seq_num;</div><div class='add'>+	u8 cipher;</div><div class='add'>+	u8 basic_rates_idx;</div><div class='add'>+	u8 mcast_rates_idx;</div><div class='add'>+	u8 beacon_rates_idx;</div><div class='add'>+	bool offchannel;</div><div class='add'>+	struct ieee80211_chanctx_conf *ctx;</div><div class='add'>+	struct mt76_wcid *wcid;</div><div class='add'>+	struct mt76_vif_data *mvif;</div><div class='add'>+	struct rcu_head rcu_head;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt76_vif_data {</div><div class='add'>+	struct mt76_vif_link __rcu *link[IEEE80211_MLD_MAX_NUM_LINKS];</div><div class='add'>+	struct mt76_vif_link __rcu *offchannel_link;</div><div class='add'>+</div><div class='add'>+	struct mt76_phy *roc_phy;</div><div class='add'>+	u16 valid_links;</div><div class='add'>+	u8 deflink_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt76_phy {</div><div class='hunk'>@@ -588,18 +852,34 @@ struct mt76_phy {</div><div class='ctx'> 	void *priv;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long state;</div><div class='add'>+	unsigned int num_sta;</div><div class='add'>+	u8 band_idx;</div><div class='ctx'> </div><div class='add'>+	spinlock_t tx_lock;</div><div class='add'>+	struct list_head tx_list;</div><div class='ctx'> 	struct mt76_queue *q_tx[__MT_TXQ_MAX];</div><div class='ctx'> </div><div class='ctx'> 	struct cfg80211_chan_def chandef;</div><div class='del'>-	struct ieee80211_channel *main_chan;</div><div class='add'>+	struct cfg80211_chan_def main_chandef;</div><div class='add'>+	bool offchannel;</div><div class='add'>+	bool radar_enabled;</div><div class='add'>+</div><div class='add'>+	struct delayed_work roc_work;</div><div class='add'>+	struct ieee80211_vif *roc_vif;</div><div class='add'>+	struct mt76_vif_link *roc_link;</div><div class='add'>+</div><div class='add'>+	struct mt76_chanctx *chanctx;</div><div class='ctx'> </div><div class='ctx'> 	struct mt76_channel_state *chan_state;</div><div class='add'>+	enum mt76_dfs_state dfs_state;</div><div class='ctx'> 	ktime_t survey_time;</div><div class='ctx'> </div><div class='add'>+	u32 aggr_stats[32];</div><div class='add'>+</div><div class='ctx'> 	struct mt76_hw_cap cap;</div><div class='ctx'> 	struct mt76_sband sband_2g;</div><div class='ctx'> 	struct mt76_sband sband_5g;</div><div class='add'>+	struct mt76_sband sband_6g;</div><div class='ctx'> </div><div class='ctx'> 	u8 macaddr[ETH_ALEN];</div><div class='ctx'> </div><div class='hunk'>@@ -619,15 +899,25 @@ struct mt76_phy {</div><div class='ctx'> 		struct sk_buff **tail;</div><div class='ctx'> 		u16 seqno;</div><div class='ctx'> 	} rx_amsdu[__MT_RXQ_MAX];</div><div class='add'>+</div><div class='add'>+	struct mt76_freq_range_power *frp;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		struct led_classdev cdev;</div><div class='add'>+		char name[32];</div><div class='add'>+		bool al;</div><div class='add'>+		u8 pin;</div><div class='add'>+	} leds;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt76_dev {</div><div class='ctx'> 	struct mt76_phy phy; /* must be first */</div><div class='del'>-</div><div class='del'>-	struct mt76_phy *phy2;</div><div class='add'>+	struct mt76_phy *phys[__MT_MAX_BAND];</div><div class='add'>+	struct mt76_phy *band_phys[NUM_NL80211_BANDS];</div><div class='ctx'> </div><div class='ctx'> 	struct ieee80211_hw *hw;</div><div class='ctx'> </div><div class='add'>+	spinlock_t wed_lock;</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> 	spinlock_t cc_lock;</div><div class='ctx'> </div><div class='hunk'>@@ -643,42 +933,55 @@ struct mt76_dev {</div><div class='ctx'> 	const struct mt76_driver_ops *drv;</div><div class='ctx'> 	const struct mt76_mcu_ops *mcu_ops;</div><div class='ctx'> 	struct device *dev;</div><div class='add'>+	struct device *dma_dev;</div><div class='ctx'> </div><div class='ctx'> 	struct mt76_mcu mcu;</div><div class='ctx'> </div><div class='del'>-	struct net_device napi_dev;</div><div class='del'>-	struct net_device tx_napi_dev;</div><div class='add'>+	struct net_device *napi_dev;</div><div class='add'>+	struct net_device *tx_napi_dev;</div><div class='ctx'> 	spinlock_t rx_lock;</div><div class='ctx'> 	struct napi_struct napi[__MT_RXQ_MAX];</div><div class='ctx'> 	struct sk_buff_head rx_skb[__MT_RXQ_MAX];</div><div class='add'>+	struct tasklet_struct irq_tasklet;</div><div class='ctx'> </div><div class='ctx'> 	struct list_head txwi_cache;</div><div class='add'>+	struct list_head rxwi_cache;</div><div class='ctx'> 	struct mt76_queue *q_mcu[__MT_MCUQ_MAX];</div><div class='ctx'> 	struct mt76_queue q_rx[__MT_RXQ_MAX];</div><div class='ctx'> 	const struct mt76_queue_ops *queue_ops;</div><div class='ctx'> 	int tx_dma_idx[4];</div><div class='add'>+	enum mt76_hwrro_mode hwrro_mode;</div><div class='ctx'> </div><div class='ctx'> 	struct mt76_worker tx_worker;</div><div class='ctx'> 	struct napi_struct tx_napi;</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t token_lock;</div><div class='ctx'> 	struct idr token;</div><div class='del'>-	int token_count;</div><div class='add'>+	u16 wed_token_count;</div><div class='add'>+	u16 token_count;</div><div class='add'>+	u16 token_start;</div><div class='add'>+	u16 token_size;</div><div class='add'>+</div><div class='add'>+	spinlock_t rx_token_lock;</div><div class='add'>+	struct idr rx_token;</div><div class='add'>+	u16 rx_token_size;</div><div class='ctx'> </div><div class='ctx'> 	wait_queue_head_t tx_wait;</div><div class='del'>-	struct sk_buff_head status_list;</div><div class='add'>+	/* spinclock used to protect wcid pktid linked list */</div><div class='add'>+	spinlock_t status_lock;</div><div class='ctx'> </div><div class='ctx'> 	u32 wcid_mask[DIV_ROUND_UP(MT76_N_WCIDS, 32)];</div><div class='del'>-	u32 wcid_phy_mask[DIV_ROUND_UP(MT76_N_WCIDS, 32)];</div><div class='ctx'> </div><div class='del'>-	u32 vif_mask;</div><div class='add'>+	u64 vif_mask;</div><div class='ctx'> </div><div class='ctx'> 	struct mt76_wcid global_wcid;</div><div class='ctx'> 	struct mt76_wcid __rcu *wcid[MT76_N_WCIDS];</div><div class='add'>+	struct list_head wcid_list;</div><div class='ctx'> </div><div class='del'>-	u32 rev;</div><div class='add'>+	struct list_head sta_poll_list;</div><div class='add'>+	spinlock_t sta_poll_lock;</div><div class='ctx'> </div><div class='del'>-	u32 aggr_stats[32];</div><div class='add'>+	u32 rev;</div><div class='ctx'> </div><div class='ctx'> 	struct tasklet_struct pre_tbtt_tasklet;</div><div class='ctx'> 	int beacon_int;</div><div class='hunk'>@@ -687,22 +990,27 @@ struct mt76_dev {</div><div class='ctx'> 	struct debugfs_blob_wrapper eeprom;</div><div class='ctx'> 	struct debugfs_blob_wrapper otp;</div><div class='ctx'> </div><div class='del'>-	struct mt76_rate_power rate_power;</div><div class='del'>-</div><div class='ctx'> 	char alpha2[3];</div><div class='ctx'> 	enum nl80211_dfs_regions region;</div><div class='ctx'> </div><div class='del'>-	u32 debugfs_reg;</div><div class='add'>+	struct mt76_scan_rnr_param rnr;</div><div class='ctx'> </div><div class='del'>-	struct led_classdev led_cdev;</div><div class='del'>-	char led_name[32];</div><div class='del'>-	bool led_al;</div><div class='del'>-	u8 led_pin;</div><div class='add'>+	u32 debugfs_reg;</div><div class='ctx'> </div><div class='ctx'> 	u8 csa_complete;</div><div class='ctx'> </div><div class='ctx'> 	u32 rxfilter;</div><div class='ctx'> </div><div class='add'>+	struct delayed_work scan_work;</div><div class='add'>+	struct {</div><div class='add'>+		struct cfg80211_scan_request *req;</div><div class='add'>+		struct ieee80211_channel *chan;</div><div class='add'>+		struct ieee80211_vif *vif;</div><div class='add'>+		struct mt76_vif_link *mlink;</div><div class='add'>+		struct mt76_phy *phy;</div><div class='add'>+		int chan_idx;</div><div class='add'>+	} scan;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_NL80211_TESTMODE</div><div class='ctx'> 	const struct mt76_testmode_ops *test_ops;</div><div class='ctx'> 	struct {</div><div class='hunk'>@@ -717,6 +1025,103 @@ struct mt76_dev {</div><div class='ctx'> 		struct mt76_usb usb;</div><div class='ctx'> 		struct mt76_sdio sdio;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	atomic_t bus_hung;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* per-phy stats.  */</div><div class='add'>+struct mt76_mib_stats {</div><div class='add'>+	u32 ack_fail_cnt;</div><div class='add'>+	u32 fcs_err_cnt;</div><div class='add'>+	u32 rts_cnt;</div><div class='add'>+	u32 rts_retries_cnt;</div><div class='add'>+	u32 ba_miss_cnt;</div><div class='add'>+	u32 tx_bf_cnt;</div><div class='add'>+	u32 tx_mu_bf_cnt;</div><div class='add'>+	u32 tx_mu_mpdu_cnt;</div><div class='add'>+	u32 tx_mu_acked_mpdu_cnt;</div><div class='add'>+	u32 tx_su_acked_mpdu_cnt;</div><div class='add'>+	u32 tx_bf_ibf_ppdu_cnt;</div><div class='add'>+	u32 tx_bf_ebf_ppdu_cnt;</div><div class='add'>+</div><div class='add'>+	u32 tx_bf_rx_fb_all_cnt;</div><div class='add'>+	u32 tx_bf_rx_fb_eht_cnt;</div><div class='add'>+	u32 tx_bf_rx_fb_he_cnt;</div><div class='add'>+	u32 tx_bf_rx_fb_vht_cnt;</div><div class='add'>+	u32 tx_bf_rx_fb_ht_cnt;</div><div class='add'>+</div><div class='add'>+	u32 tx_bf_rx_fb_bw; /* value of last sample, not cumulative */</div><div class='add'>+	u32 tx_bf_rx_fb_nc_cnt;</div><div class='add'>+	u32 tx_bf_rx_fb_nr_cnt;</div><div class='add'>+	u32 tx_bf_fb_cpl_cnt;</div><div class='add'>+	u32 tx_bf_fb_trig_cnt;</div><div class='add'>+</div><div class='add'>+	u32 tx_ampdu_cnt;</div><div class='add'>+	u32 tx_stop_q_empty_cnt;</div><div class='add'>+	u32 tx_mpdu_attempts_cnt;</div><div class='add'>+	u32 tx_mpdu_success_cnt;</div><div class='add'>+	u32 tx_pkt_ebf_cnt;</div><div class='add'>+	u32 tx_pkt_ibf_cnt;</div><div class='add'>+</div><div class='add'>+	u32 tx_rwp_fail_cnt;</div><div class='add'>+	u32 tx_rwp_need_cnt;</div><div class='add'>+</div><div class='add'>+	/* rx stats */</div><div class='add'>+	u32 rx_fifo_full_cnt;</div><div class='add'>+	u32 channel_idle_cnt;</div><div class='add'>+	u32 primary_cca_busy_time;</div><div class='add'>+	u32 secondary_cca_busy_time;</div><div class='add'>+	u32 primary_energy_detect_time;</div><div class='add'>+	u32 cck_mdrdy_time;</div><div class='add'>+	u32 ofdm_mdrdy_time;</div><div class='add'>+	u32 green_mdrdy_time;</div><div class='add'>+	u32 rx_vector_mismatch_cnt;</div><div class='add'>+	u32 rx_delimiter_fail_cnt;</div><div class='add'>+	u32 rx_mrdy_cnt;</div><div class='add'>+	u32 rx_len_mismatch_cnt;</div><div class='add'>+	u32 rx_mpdu_cnt;</div><div class='add'>+	u32 rx_ampdu_cnt;</div><div class='add'>+	u32 rx_ampdu_bytes_cnt;</div><div class='add'>+	u32 rx_ampdu_valid_subframe_cnt;</div><div class='add'>+	u32 rx_ampdu_valid_subframe_bytes_cnt;</div><div class='add'>+	u32 rx_pfdrop_cnt;</div><div class='add'>+	u32 rx_vec_queue_overflow_drop_cnt;</div><div class='add'>+	u32 rx_ba_cnt;</div><div class='add'>+</div><div class='add'>+	u32 tx_amsdu[8];</div><div class='add'>+	u32 tx_amsdu_cnt;</div><div class='add'>+</div><div class='add'>+	/* mcu_muru_stats */</div><div class='add'>+	u32 dl_cck_cnt;</div><div class='add'>+	u32 dl_ofdm_cnt;</div><div class='add'>+	u32 dl_htmix_cnt;</div><div class='add'>+	u32 dl_htgf_cnt;</div><div class='add'>+	u32 dl_vht_su_cnt;</div><div class='add'>+	u32 dl_vht_2mu_cnt;</div><div class='add'>+	u32 dl_vht_3mu_cnt;</div><div class='add'>+	u32 dl_vht_4mu_cnt;</div><div class='add'>+	u32 dl_he_su_cnt;</div><div class='add'>+	u32 dl_he_ext_su_cnt;</div><div class='add'>+	u32 dl_he_2ru_cnt;</div><div class='add'>+	u32 dl_he_2mu_cnt;</div><div class='add'>+	u32 dl_he_3ru_cnt;</div><div class='add'>+	u32 dl_he_3mu_cnt;</div><div class='add'>+	u32 dl_he_4ru_cnt;</div><div class='add'>+	u32 dl_he_4mu_cnt;</div><div class='add'>+	u32 dl_he_5to8ru_cnt;</div><div class='add'>+	u32 dl_he_9to16ru_cnt;</div><div class='add'>+	u32 dl_he_gtr16ru_cnt;</div><div class='add'>+</div><div class='add'>+	u32 ul_hetrig_su_cnt;</div><div class='add'>+	u32 ul_hetrig_2ru_cnt;</div><div class='add'>+	u32 ul_hetrig_3ru_cnt;</div><div class='add'>+	u32 ul_hetrig_4ru_cnt;</div><div class='add'>+	u32 ul_hetrig_5to8ru_cnt;</div><div class='add'>+	u32 ul_hetrig_9to16ru_cnt;</div><div class='add'>+	u32 ul_hetrig_gtr16ru_cnt;</div><div class='add'>+	u32 ul_hetrig_2mu_cnt;</div><div class='add'>+	u32 ul_hetrig_3mu_cnt;</div><div class='add'>+	u32 ul_hetrig_4mu_cnt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt76_power_limits {</div><div class='hunk'>@@ -724,20 +1129,44 @@ struct mt76_power_limits {</div><div class='ctx'> 	s8 ofdm[8];</div><div class='ctx'> 	s8 mcs[4][10];</div><div class='ctx'> 	s8 ru[7][12];</div><div class='add'>+	s8 eht[16][16];</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		s8 cck[4];</div><div class='add'>+		s8 ofdm[4];</div><div class='add'>+		s8 ofdm_bf[4];</div><div class='add'>+		s8 ru[7][10];</div><div class='add'>+		s8 ru_bf[7][10];</div><div class='add'>+	} path;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum mt76_phy_type {</div><div class='del'>-	MT_PHY_TYPE_CCK,</div><div class='del'>-	MT_PHY_TYPE_OFDM,</div><div class='del'>-	MT_PHY_TYPE_HT,</div><div class='del'>-	MT_PHY_TYPE_HT_GF,</div><div class='del'>-	MT_PHY_TYPE_VHT,</div><div class='del'>-	MT_PHY_TYPE_HE_SU = 8,</div><div class='del'>-	MT_PHY_TYPE_HE_EXT_SU,</div><div class='del'>-	MT_PHY_TYPE_HE_TB,</div><div class='del'>-	MT_PHY_TYPE_HE_MU,</div><div class='add'>+struct mt76_ethtool_worker_info {</div><div class='add'>+	u64 *data;</div><div class='add'>+	int idx;</div><div class='add'>+	int initial_stat_idx;</div><div class='add'>+	int worker_stat_count;</div><div class='add'>+	int sta_count;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mt76_chanctx {</div><div class='add'>+	struct mt76_phy *phy;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CCK_RATE(_idx, _rate) {					\</div><div class='add'>+	.bitrate = _rate,					\</div><div class='add'>+	.flags = IEEE80211_RATE_SHORT_PREAMBLE,			\</div><div class='add'>+	.hw_value = (MT_PHY_TYPE_CCK &lt;&lt; 8) | (_idx),		\</div><div class='add'>+	.hw_value_short = (MT_PHY_TYPE_CCK &lt;&lt; 8) | (4 + _idx),	\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define OFDM_RATE(_idx, _rate) {				\</div><div class='add'>+	.bitrate = _rate,					\</div><div class='add'>+	.hw_value = (MT_PHY_TYPE_OFDM &lt;&lt; 8) | (_idx),		\</div><div class='add'>+	.hw_value_short = (MT_PHY_TYPE_OFDM &lt;&lt; 8) | (_idx),	\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern struct ieee80211_rate mt76_rates[12];</div><div class='add'>+</div><div class='ctx'> #define __mt76_rr(dev, ...)	(dev)-&gt;bus-&gt;rr((dev), __VA_ARGS__)</div><div class='ctx'> #define __mt76_wr(dev, ...)	(dev)-&gt;bus-&gt;wr((dev), __VA_ARGS__)</div><div class='ctx'> #define __mt76_rmw(dev, ...)	(dev)-&gt;bus-&gt;rmw((dev), __VA_ARGS__)</div><div class='hunk'>@@ -757,7 +1186,6 @@ enum mt76_phy_type {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define mt76_mcu_restart(dev, ...)	(dev)-&gt;mt76.mcu_ops-&gt;mcu_restart(&amp;((dev)-&gt;mt76))</div><div class='del'>-#define __mt76_mcu_restart(dev, ...)	(dev)-&gt;mcu_ops-&gt;mcu_restart((dev))</div><div class='ctx'> </div><div class='ctx'> #define mt76_set(dev, offset, val)	mt76_rmw(dev, offset, 0, val)</div><div class='ctx'> #define mt76_clear(dev, offset, val)	mt76_rmw(dev, offset, val, 0)</div><div class='hunk'>@@ -773,28 +1201,20 @@ enum mt76_phy_type {</div><div class='ctx'> </div><div class='ctx'> #define mt76_hw(dev) (dev)-&gt;mphy.hw</div><div class='ctx'> </div><div class='del'>-static inline struct ieee80211_hw *</div><div class='del'>-mt76_wcid_hw(struct mt76_dev *dev, u16 wcid)</div><div class='del'>-{</div><div class='del'>-	if (wcid &lt;= MT76_N_WCIDS &amp;&amp;</div><div class='del'>-	    mt76_wcid_mask_test(dev-&gt;wcid_phy_mask, wcid))</div><div class='del'>-		return dev-&gt;phy2-&gt;hw;</div><div class='del'>-</div><div class='del'>-	return dev-&gt;phy.hw;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> bool __mt76_poll(struct mt76_dev *dev, u32 offset, u32 mask, u32 val,</div><div class='ctx'> 		 int timeout);</div><div class='ctx'> </div><div class='ctx'> #define mt76_poll(dev, ...) __mt76_poll(&amp;((dev)-&gt;mt76), __VA_ARGS__)</div><div class='ctx'> </div><div class='del'>-bool __mt76_poll_msec(struct mt76_dev *dev, u32 offset, u32 mask, u32 val,</div><div class='del'>-		      int timeout);</div><div class='del'>-</div><div class='del'>-#define mt76_poll_msec(dev, ...) __mt76_poll_msec(&amp;((dev)-&gt;mt76), __VA_ARGS__)</div><div class='add'>+bool ____mt76_poll_msec(struct mt76_dev *dev, u32 offset, u32 mask, u32 val,</div><div class='add'>+			int timeout, int kick);</div><div class='add'>+#define __mt76_poll_msec(...)         ____mt76_poll_msec(__VA_ARGS__, 10)</div><div class='add'>+#define mt76_poll_msec(dev, ...)      ____mt76_poll_msec(&amp;((dev)-&gt;mt76), __VA_ARGS__, 10)</div><div class='add'>+#define mt76_poll_msec_tick(dev, ...) ____mt76_poll_msec(&amp;((dev)-&gt;mt76), __VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> void mt76_mmio_init(struct mt76_dev *dev, void __iomem *regs);</div><div class='ctx'> void mt76_pci_disable_aspm(struct pci_dev *pdev);</div><div class='add'>+bool mt76_pci_aspm_supported(struct pci_dev *pdev);</div><div class='ctx'> </div><div class='ctx'> static inline u16 mt76_chip(struct mt76_dev *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -806,22 +1226,75 @@ static inline u16 mt76_rev(struct mt76_dev *dev)</div><div class='ctx'> 	return dev-&gt;rev &amp; 0xffff;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void mt76_wed_release_rx_buf(struct mtk_wed_device *wed);</div><div class='add'>+void mt76_wed_offload_disable(struct mtk_wed_device *wed);</div><div class='add'>+void mt76_wed_reset_complete(struct mtk_wed_device *wed);</div><div class='add'>+void mt76_wed_dma_reset(struct mt76_dev *dev);</div><div class='add'>+int mt76_wed_net_setup_tc(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			  struct net_device *netdev, enum tc_setup_type type,</div><div class='add'>+			  void *type_data);</div><div class='add'>+#ifdef CONFIG_NET_MEDIATEK_SOC_WED</div><div class='add'>+u32 mt76_wed_init_rx_buf(struct mtk_wed_device *wed, int size);</div><div class='add'>+int mt76_wed_offload_enable(struct mtk_wed_device *wed);</div><div class='add'>+int mt76_wed_dma_setup(struct mt76_dev *dev, struct mt76_queue *q, bool reset);</div><div class='add'>+#else</div><div class='add'>+static inline u32 mt76_wed_init_rx_buf(struct mtk_wed_device *wed, int size)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int mt76_wed_offload_enable(struct mtk_wed_device *wed)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int mt76_wed_dma_setup(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='add'>+				     bool reset)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_NET_MEDIATEK_SOC_WED */</div><div class='add'>+</div><div class='ctx'> #define mt76xx_chip(dev) mt76_chip(&amp;((dev)-&gt;mt76))</div><div class='ctx'> #define mt76xx_rev(dev) mt76_rev(&amp;((dev)-&gt;mt76))</div><div class='ctx'> </div><div class='ctx'> #define mt76_init_queues(dev, ...)		(dev)-&gt;mt76.queue_ops-&gt;init(&amp;((dev)-&gt;mt76), __VA_ARGS__)</div><div class='ctx'> #define mt76_queue_alloc(dev, ...)	(dev)-&gt;mt76.queue_ops-&gt;alloc(&amp;((dev)-&gt;mt76), __VA_ARGS__)</div><div class='ctx'> #define mt76_tx_queue_skb_raw(dev, ...)	(dev)-&gt;mt76.queue_ops-&gt;tx_queue_skb_raw(&amp;((dev)-&gt;mt76), __VA_ARGS__)</div><div class='del'>-#define mt76_tx_queue_skb(dev, ...)	(dev)-&gt;mt76.queue_ops-&gt;tx_queue_skb(&amp;((dev)-&gt;mt76), __VA_ARGS__)</div><div class='add'>+#define mt76_tx_queue_skb(dev, ...)	(dev)-&gt;mt76.queue_ops-&gt;tx_queue_skb(&amp;((dev)-&gt;mphy), __VA_ARGS__)</div><div class='ctx'> #define mt76_queue_rx_reset(dev, ...)	(dev)-&gt;mt76.queue_ops-&gt;rx_reset(&amp;((dev)-&gt;mt76), __VA_ARGS__)</div><div class='ctx'> #define mt76_queue_tx_cleanup(dev, ...)	(dev)-&gt;mt76.queue_ops-&gt;tx_cleanup(&amp;((dev)-&gt;mt76), __VA_ARGS__)</div><div class='add'>+#define mt76_queue_rx_init(dev, ...)	(dev)-&gt;mt76.queue_ops-&gt;rx_queue_init(&amp;((dev)-&gt;mt76), __VA_ARGS__)</div><div class='ctx'> #define mt76_queue_rx_cleanup(dev, ...)	(dev)-&gt;mt76.queue_ops-&gt;rx_cleanup(&amp;((dev)-&gt;mt76), __VA_ARGS__)</div><div class='ctx'> #define mt76_queue_kick(dev, ...)	(dev)-&gt;mt76.queue_ops-&gt;kick(&amp;((dev)-&gt;mt76), __VA_ARGS__)</div><div class='ctx'> #define mt76_queue_reset(dev, ...)	(dev)-&gt;mt76.queue_ops-&gt;reset_q(&amp;((dev)-&gt;mt76), __VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> #define mt76_for_each_q_rx(dev, i)	\</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE((dev)-&gt;q_rx) &amp;&amp; \</div><div class='del'>-		    (dev)-&gt;q_rx[i].ndesc; i++)</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE((dev)-&gt;q_rx); i++)	\</div><div class='add'>+		if ((dev)-&gt;q_rx[i].ndesc)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define mt76_dereference(p, dev) \</div><div class='add'>+	rcu_dereference_protected(p, lockdep_is_held(&amp;(dev)-&gt;mutex))</div><div class='add'>+</div><div class='add'>+static inline struct mt76_dev *mt76_wed_to_dev(struct mtk_wed_device *wed)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_NET_MEDIATEK_SOC_WED</div><div class='add'>+	if (wed-&gt;wlan.hif2)</div><div class='add'>+		return container_of(wed, struct mt76_dev, mmio.wed_hif2);</div><div class='add'>+#endif /* CONFIG_NET_MEDIATEK_SOC_WED */</div><div class='add'>+	return container_of(wed, struct mt76_dev, mmio.wed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct mt76_wcid *</div><div class='add'>+__mt76_wcid_ptr(struct mt76_dev *dev, u16 idx)</div><div class='add'>+{</div><div class='add'>+	if (idx &gt;= ARRAY_SIZE(dev-&gt;wcid))</div><div class='add'>+		return NULL;</div><div class='add'>+	return rcu_dereference(dev-&gt;wcid[idx]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define mt76_wcid_ptr(dev, idx) __mt76_wcid_ptr(&amp;(dev)-&gt;mt76, idx)</div><div class='ctx'> </div><div class='ctx'> struct mt76_dev *mt76_alloc_device(struct device *pdev, unsigned int size,</div><div class='ctx'> 				   const struct ieee80211_ops *ops,</div><div class='hunk'>@@ -830,35 +1303,49 @@ int mt76_register_device(struct mt76_dev *dev, bool vht,</div><div class='ctx'> 			 struct ieee80211_rate *rates, int n_rates);</div><div class='ctx'> void mt76_unregister_device(struct mt76_dev *dev);</div><div class='ctx'> void mt76_free_device(struct mt76_dev *dev);</div><div class='add'>+void mt76_reset_device(struct mt76_dev *dev);</div><div class='ctx'> void mt76_unregister_phy(struct mt76_phy *phy);</div><div class='ctx'> </div><div class='add'>+struct mt76_phy *mt76_alloc_radio_phy(struct mt76_dev *dev, unsigned int size,</div><div class='add'>+				      u8 band_idx);</div><div class='ctx'> struct mt76_phy *mt76_alloc_phy(struct mt76_dev *dev, unsigned int size,</div><div class='del'>-				const struct ieee80211_ops *ops);</div><div class='add'>+				const struct ieee80211_ops *ops,</div><div class='add'>+				u8 band_idx);</div><div class='ctx'> int mt76_register_phy(struct mt76_phy *phy, bool vht,</div><div class='ctx'> 		      struct ieee80211_rate *rates, int n_rates);</div><div class='add'>+struct mt76_phy *mt76_vif_phy(struct ieee80211_hw *hw,</div><div class='add'>+			      struct ieee80211_vif *vif);</div><div class='add'>+</div><div class='add'>+struct dentry *mt76_register_debugfs_fops(struct mt76_phy *phy,</div><div class='add'>+					  const struct file_operations *ops);</div><div class='add'>+static inline struct dentry *mt76_register_debugfs(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return mt76_register_debugfs_fops(&amp;dev-&gt;phy, NULL);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-struct dentry *mt76_register_debugfs(struct mt76_dev *dev);</div><div class='ctx'> int mt76_queues_read(struct seq_file *s, void *data);</div><div class='ctx'> void mt76_seq_puts_array(struct seq_file *file, const char *str,</div><div class='ctx'> 			 s8 *val, int len);</div><div class='ctx'> </div><div class='ctx'> int mt76_eeprom_init(struct mt76_dev *dev, int len);</div><div class='del'>-void mt76_eeprom_override(struct mt76_phy *phy);</div><div class='del'>-int mt76_get_of_eeprom(struct mt76_dev *dev, void *data, int offset, int len);</div><div class='add'>+int mt76_eeprom_override(struct mt76_phy *phy);</div><div class='add'>+int mt76_get_of_data_from_mtd(struct mt76_dev *dev, void *eep, int offset, int len);</div><div class='add'>+int mt76_get_of_data_from_nvmem(struct mt76_dev *dev, void *eep,</div><div class='add'>+				const char *cell_name, int len);</div><div class='ctx'> </div><div class='ctx'> struct mt76_queue *</div><div class='ctx'> mt76_init_queue(struct mt76_dev *dev, int qid, int idx, int n_desc,</div><div class='del'>-		int ring_base);</div><div class='add'>+		int ring_base, void *wed, u32 flags);</div><div class='ctx'> static inline int mt76_init_tx_queue(struct mt76_phy *phy, int qid, int idx,</div><div class='del'>-				     int n_desc, int ring_base)</div><div class='add'>+				     int n_desc, int ring_base, void *wed,</div><div class='add'>+				     u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_queue *q;</div><div class='ctx'> </div><div class='del'>-	q = mt76_init_queue(phy-&gt;dev, qid, idx, n_desc, ring_base);</div><div class='add'>+	q = mt76_init_queue(phy-&gt;dev, qid, idx, n_desc, ring_base, wed, flags);</div><div class='ctx'> 	if (IS_ERR(q))</div><div class='ctx'> 		return PTR_ERR(q);</div><div class='ctx'> </div><div class='del'>-	q-&gt;qid = qid;</div><div class='ctx'> 	phy-&gt;q_tx[qid] = q;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -869,28 +1356,29 @@ static inline int mt76_init_mcu_queue(struct mt76_dev *dev, int qid, int idx,</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_queue *q;</div><div class='ctx'> </div><div class='del'>-	q = mt76_init_queue(dev, qid, idx, n_desc, ring_base);</div><div class='add'>+	q = mt76_init_queue(dev, qid, idx, n_desc, ring_base, NULL, 0);</div><div class='ctx'> 	if (IS_ERR(q))</div><div class='ctx'> 		return PTR_ERR(q);</div><div class='ctx'> </div><div class='del'>-	q-&gt;qid = __MT_TXQ_MAX + qid;</div><div class='ctx'> 	dev-&gt;q_mcu[qid] = q;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct mt76_phy *</div><div class='del'>-mt76_dev_phy(struct mt76_dev *dev, bool phy_ext)</div><div class='add'>+mt76_dev_phy(struct mt76_dev *dev, u8 phy_idx)</div><div class='ctx'> {</div><div class='del'>-	if (phy_ext &amp;&amp; dev-&gt;phy2)</div><div class='del'>-		return dev-&gt;phy2;</div><div class='add'>+	if ((phy_idx == MT_BAND1 &amp;&amp; dev-&gt;phys[phy_idx]) ||</div><div class='add'>+	    (phy_idx == MT_BAND2 &amp;&amp; dev-&gt;phys[phy_idx]))</div><div class='add'>+		return dev-&gt;phys[phy_idx];</div><div class='add'>+</div><div class='ctx'> 	return &amp;dev-&gt;phy;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct ieee80211_hw *</div><div class='del'>-mt76_phy_hw(struct mt76_dev *dev, bool phy_ext)</div><div class='add'>+mt76_phy_hw(struct mt76_dev *dev, u8 phy_idx)</div><div class='ctx'> {</div><div class='del'>-	return mt76_dev_phy(dev, phy_ext)-&gt;hw;</div><div class='add'>+	return mt76_dev_phy(dev, phy_idx)-&gt;hw;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u8 *</div><div class='hunk'>@@ -929,6 +1417,9 @@ wcid_to_sta(struct mt76_wcid *wcid)</div><div class='ctx'> 	if (!wcid || !wcid-&gt;sta)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	if (wcid-&gt;def_wcid)</div><div class='add'>+		ptr = wcid-&gt;def_wcid;</div><div class='add'>+</div><div class='ctx'> 	return container_of(ptr, struct ieee80211_sta, drv_priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -980,11 +1471,12 @@ static inline bool mt76_is_skb_pktid(u8 pktid)</div><div class='ctx'> 	return pktid &gt;= MT_PACKET_ID_FIRST;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u8 mt76_tx_power_nss_delta(u8 nss)</div><div class='add'>+static inline u8 mt76_tx_power_path_delta(u8 path)</div><div class='ctx'> {</div><div class='del'>-	static const u8 nss_delta[4] = { 0, 6, 9, 12 };</div><div class='add'>+	static const u8 path_delta[5] = { 0, 6, 9, 12, 14 };</div><div class='add'>+	u8 idx = path - 1;</div><div class='ctx'> </div><div class='del'>-	return nss_delta[nss - 1];</div><div class='add'>+	return (idx &lt; ARRAY_SIZE(path_delta)) ? path_delta[idx] : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool mt76_testmode_enabled(struct mt76_phy *phy)</div><div class='hunk'>@@ -1001,13 +1493,17 @@ static inline bool mt76_is_testmode_skb(struct mt76_dev *dev,</div><div class='ctx'> 					struct ieee80211_hw **hw)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_NL80211_TESTMODE</div><div class='del'>-	if (skb == dev-&gt;phy.test.tx_skb)</div><div class='del'>-		*hw = dev-&gt;phy.hw;</div><div class='del'>-	else if (dev-&gt;phy2 &amp;&amp; skb == dev-&gt;phy2-&gt;test.tx_skb)</div><div class='del'>-		*hw = dev-&gt;phy2-&gt;hw;</div><div class='del'>-	else</div><div class='del'>-		return false;</div><div class='del'>-	return true;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;phys); i++) {</div><div class='add'>+		struct mt76_phy *phy = dev-&gt;phys[i];</div><div class='add'>+</div><div class='add'>+		if (phy &amp;&amp; skb == phy-&gt;test.tx_skb) {</div><div class='add'>+			*hw = dev-&gt;phys[i]-&gt;hw;</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='ctx'> #else</div><div class='ctx'> 	return false;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1030,11 +1526,12 @@ void mt76_release_buffered_frames(struct ieee80211_hw *hw,</div><div class='ctx'> 				  enum ieee80211_frame_release_type reason,</div><div class='ctx'> 				  bool more_data);</div><div class='ctx'> bool mt76_has_tx_pending(struct mt76_phy *phy);</div><div class='del'>-void mt76_set_channel(struct mt76_phy *phy);</div><div class='del'>-void mt76_update_survey(struct mt76_dev *dev);</div><div class='add'>+int mt76_update_channel(struct mt76_phy *phy);</div><div class='add'>+void mt76_update_survey(struct mt76_phy *phy);</div><div class='ctx'> void mt76_update_survey_active_time(struct mt76_phy *phy, ktime_t time);</div><div class='ctx'> int mt76_get_survey(struct ieee80211_hw *hw, int idx,</div><div class='ctx'> 		    struct survey_info *survey);</div><div class='add'>+int mt76_rx_signal(u8 chain_mask, s8 *chain_signal);</div><div class='ctx'> void mt76_set_stream_caps(struct mt76_phy *phy, bool vht);</div><div class='ctx'> </div><div class='ctx'> int mt76_rx_aggr_start(struct mt76_dev *dev, struct mt76_wcid *wcid, u8 tid,</div><div class='hunk'>@@ -1045,9 +1542,9 @@ void mt76_wcid_key_setup(struct mt76_dev *dev, struct mt76_wcid *wcid,</div><div class='ctx'> 			 struct ieee80211_key_conf *key);</div><div class='ctx'> </div><div class='ctx'> void mt76_tx_status_lock(struct mt76_dev *dev, struct sk_buff_head *list)</div><div class='del'>-			 __acquires(&amp;dev-&gt;status_list.lock);</div><div class='add'>+			 __acquires(&amp;dev-&gt;status_lock);</div><div class='ctx'> void mt76_tx_status_unlock(struct mt76_dev *dev, struct sk_buff_head *list)</div><div class='del'>-			   __releases(&amp;dev-&gt;status_list.lock);</div><div class='add'>+			   __releases(&amp;dev-&gt;status_lock);</div><div class='ctx'> </div><div class='ctx'> int mt76_tx_status_skb_add(struct mt76_dev *dev, struct mt76_wcid *wcid,</div><div class='ctx'> 			   struct sk_buff *skb);</div><div class='hunk'>@@ -1056,36 +1553,78 @@ struct sk_buff *mt76_tx_status_skb_get(struct mt76_dev *dev,</div><div class='ctx'> 				       struct sk_buff_head *list);</div><div class='ctx'> void mt76_tx_status_skb_done(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 			     struct sk_buff_head *list);</div><div class='del'>-void mt76_tx_complete_skb(struct mt76_dev *dev, u16 wcid, struct sk_buff *skb);</div><div class='del'>-void mt76_tx_status_check(struct mt76_dev *dev, struct mt76_wcid *wcid,</div><div class='del'>-			  bool flush);</div><div class='add'>+void __mt76_tx_complete_skb(struct mt76_dev *dev, u16 wcid, struct sk_buff *skb,</div><div class='add'>+			    struct list_head *free_list);</div><div class='add'>+static inline void</div><div class='add'>+mt76_tx_complete_skb(struct mt76_dev *dev, u16 wcid, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+    __mt76_tx_complete_skb(dev, wcid, skb, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt76_tx_status_check(struct mt76_dev *dev, bool flush);</div><div class='ctx'> int mt76_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 		   struct ieee80211_sta *sta,</div><div class='ctx'> 		   enum ieee80211_sta_state old_state,</div><div class='ctx'> 		   enum ieee80211_sta_state new_state);</div><div class='del'>-void __mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+void __mt76_sta_remove(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 		       struct ieee80211_sta *sta);</div><div class='ctx'> void mt76_sta_pre_rcu_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 			     struct ieee80211_sta *sta);</div><div class='ctx'> </div><div class='del'>-int mt76_get_min_avg_rssi(struct mt76_dev *dev, bool ext_phy);</div><div class='add'>+int mt76_get_min_avg_rssi(struct mt76_dev *dev, u8 phy_idx);</div><div class='add'>+</div><div class='add'>+s8 mt76_get_power_bound(struct mt76_phy *phy, s8 txpower);</div><div class='ctx'> </div><div class='ctx'> int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-		     int *dbm);</div><div class='add'>+		     unsigned int link_id, int *dbm);</div><div class='add'>+int mt76_init_sar_power(struct ieee80211_hw *hw,</div><div class='add'>+			const struct cfg80211_sar_specs *sar);</div><div class='add'>+int mt76_get_sar_power(struct mt76_phy *phy,</div><div class='add'>+		       struct ieee80211_channel *chan,</div><div class='add'>+		       int power);</div><div class='ctx'> </div><div class='ctx'> void mt76_csa_check(struct mt76_dev *dev);</div><div class='ctx'> void mt76_csa_finish(struct mt76_dev *dev);</div><div class='ctx'> </div><div class='del'>-int mt76_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant);</div><div class='add'>+int mt76_get_antenna(struct ieee80211_hw *hw, int radio_idx, u32 *tx_ant,</div><div class='add'>+		     u32 *rx_ant);</div><div class='ctx'> int mt76_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta, bool set);</div><div class='ctx'> void mt76_insert_ccmp_hdr(struct sk_buff *skb, u8 key_id);</div><div class='ctx'> int mt76_get_rate(struct mt76_dev *dev,</div><div class='ctx'> 		  struct ieee80211_supported_band *sband,</div><div class='ctx'> 		  int idx, bool cck);</div><div class='add'>+int mt76_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		 struct ieee80211_scan_request *hw_req);</div><div class='add'>+void mt76_cancel_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif);</div><div class='ctx'> void mt76_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 		  const u8 *mac);</div><div class='ctx'> void mt76_sw_scan_complete(struct ieee80211_hw *hw,</div><div class='ctx'> 			   struct ieee80211_vif *vif);</div><div class='add'>+enum mt76_dfs_state mt76_phy_dfs_state(struct mt76_phy *phy);</div><div class='add'>+int mt76_add_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+		     struct ieee80211_chanctx_conf *conf);</div><div class='add'>+void mt76_remove_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+			 struct ieee80211_chanctx_conf *conf);</div><div class='add'>+void mt76_change_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+			 struct ieee80211_chanctx_conf *conf,</div><div class='add'>+			 u32 changed);</div><div class='add'>+int mt76_assign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+			    struct ieee80211_vif *vif,</div><div class='add'>+			    struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			    struct ieee80211_chanctx_conf *conf);</div><div class='add'>+void mt76_unassign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+			       struct ieee80211_vif *vif,</div><div class='add'>+			       struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			       struct ieee80211_chanctx_conf *conf);</div><div class='add'>+int mt76_switch_vif_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+			    struct ieee80211_vif_chanctx_switch *vifs,</div><div class='add'>+			    int n_vifs,</div><div class='add'>+			    enum ieee80211_chanctx_switch_mode mode);</div><div class='add'>+int mt76_remain_on_channel(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			   struct ieee80211_channel *chan, int duration,</div><div class='add'>+			   enum ieee80211_roc_type type);</div><div class='add'>+int mt76_cancel_remain_on_channel(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif);</div><div class='ctx'> int mt76_testmode_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 		      void *data, int len);</div><div class='ctx'> int mt76_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *skb,</div><div class='hunk'>@@ -1093,6 +1632,109 @@ int mt76_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *skb,</div><div class='ctx'> int mt76_testmode_set_state(struct mt76_phy *phy, enum mt76_testmode_state state);</div><div class='ctx'> int mt76_testmode_alloc_skb(struct mt76_phy *phy, u32 len);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MT76_NPU</div><div class='add'>+void mt76_npu_check_ppe(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='add'>+			u32 info);</div><div class='add'>+int mt76_npu_dma_add_buf(struct mt76_phy *phy, struct mt76_queue *q,</div><div class='add'>+			 struct sk_buff *skb, struct mt76_queue_buf *buf,</div><div class='add'>+			 void *txwi_ptr);</div><div class='add'>+int mt76_npu_rx_queue_init(struct mt76_dev *dev, struct mt76_queue *q);</div><div class='add'>+int mt76_npu_fill_rx_queue(struct mt76_dev *dev, struct mt76_queue *q);</div><div class='add'>+void mt76_npu_queue_cleanup(struct mt76_dev *dev, struct mt76_queue *q);</div><div class='add'>+void mt76_npu_disable_irqs(struct mt76_dev *dev);</div><div class='add'>+int mt76_npu_init(struct mt76_dev *dev, phys_addr_t phy_addr, int type);</div><div class='add'>+void mt76_npu_deinit(struct mt76_dev *dev);</div><div class='add'>+void mt76_npu_queue_setup(struct mt76_dev *dev, struct mt76_queue *q);</div><div class='add'>+void mt76_npu_txdesc_cleanup(struct mt76_queue *q, int index);</div><div class='add'>+int mt76_npu_net_setup_tc(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			  struct net_device *dev, enum tc_setup_type type,</div><div class='add'>+			  void *type_data);</div><div class='add'>+#else</div><div class='add'>+static inline void mt76_npu_check_ppe(struct mt76_dev *dev,</div><div class='add'>+				      struct sk_buff *skb, u32 info)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int mt76_npu_dma_add_buf(struct mt76_phy *phy,</div><div class='add'>+				       struct mt76_queue *q,</div><div class='add'>+				       struct sk_buff *skb,</div><div class='add'>+				       struct mt76_queue_buf *buf,</div><div class='add'>+				       void *txwi_ptr)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int mt76_npu_fill_rx_queue(struct mt76_dev *dev,</div><div class='add'>+					 struct mt76_queue *q)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mt76_npu_queue_cleanup(struct mt76_dev *dev,</div><div class='add'>+					  struct mt76_queue *q)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mt76_npu_disable_irqs(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int mt76_npu_init(struct mt76_dev *dev, phys_addr_t phy_addr,</div><div class='add'>+				int type)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mt76_npu_deinit(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mt76_npu_queue_setup(struct mt76_dev *dev,</div><div class='add'>+					struct mt76_queue *q)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mt76_npu_txdesc_cleanup(struct mt76_queue *q,</div><div class='add'>+					   int index)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int mt76_npu_net_setup_tc(struct ieee80211_hw *hw,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					struct net_device *dev,</div><div class='add'>+					enum tc_setup_type type,</div><div class='add'>+					void *type_data)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_MT76_NPU */</div><div class='add'>+</div><div class='add'>+static inline bool mt76_npu_device_active(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return !!rcu_access_pointer(dev-&gt;mmio.npu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mt76_ppe_device_active(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return !!rcu_access_pointer(dev-&gt;mmio.ppe_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int mt76_npu_send_msg(struct airoha_npu *npu, int ifindex,</div><div class='add'>+				    enum airoha_npu_wlan_set_cmd cmd,</div><div class='add'>+				    u32 val, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	return airoha_npu_wlan_send_msg(npu, ifindex, cmd, &amp;val, sizeof(val),</div><div class='add'>+					gfp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int mt76_npu_get_msg(struct airoha_npu *npu, int ifindex,</div><div class='add'>+				   enum airoha_npu_wlan_get_cmd cmd,</div><div class='add'>+				   u32 *val, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	return airoha_npu_wlan_get_msg(npu, ifindex, cmd, val, sizeof(*val),</div><div class='add'>+				       gfp);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void mt76_testmode_reset(struct mt76_phy *phy, bool disable)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_NL80211_TESTMODE</div><div class='hunk'>@@ -1111,17 +1753,18 @@ static inline struct ieee80211_hw *</div><div class='ctx'> mt76_tx_status_get_hw(struct mt76_dev *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='del'>-	struct ieee80211_hw *hw = dev-&gt;phy.hw;</div><div class='del'>-</div><div class='del'>-	if ((info-&gt;hw_queue &amp; MT_TX_HW_QUEUE_EXT_PHY) &amp;&amp; dev-&gt;phy2)</div><div class='del'>-		hw = dev-&gt;phy2-&gt;hw;</div><div class='add'>+	u8 phy_idx = (info-&gt;hw_queue &amp; MT_TX_HW_QUEUE_PHY) &gt;&gt; 2;</div><div class='add'>+	struct ieee80211_hw *hw = mt76_phy_hw(dev, phy_idx);</div><div class='ctx'> </div><div class='del'>-	info-&gt;hw_queue &amp;= ~MT_TX_HW_QUEUE_EXT_PHY;</div><div class='add'>+	info-&gt;hw_queue &amp;= ~MT_TX_HW_QUEUE_PHY;</div><div class='ctx'> </div><div class='ctx'> 	return hw;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt76_put_txwi(struct mt76_dev *dev, struct mt76_txwi_cache *t);</div><div class='add'>+void mt76_put_rxwi(struct mt76_dev *dev, struct mt76_txwi_cache *t);</div><div class='add'>+struct mt76_txwi_cache *mt76_get_rxwi(struct mt76_dev *dev);</div><div class='add'>+void mt76_free_pending_rxwi(struct mt76_dev *dev);</div><div class='ctx'> void mt76_rx_complete(struct mt76_dev *dev, struct sk_buff_head *frames,</div><div class='ctx'> 		      struct napi_struct *napi);</div><div class='ctx'> void mt76_rx_poll_complete(struct mt76_dev *dev, enum mt76_rxq_id q,</div><div class='hunk'>@@ -1130,6 +1773,19 @@ void mt76_rx_aggr_reorder(struct sk_buff *skb, struct sk_buff_head *frames);</div><div class='ctx'> void mt76_testmode_tx_pending(struct mt76_phy *phy);</div><div class='ctx'> void mt76_queue_tx_complete(struct mt76_dev *dev, struct mt76_queue *q,</div><div class='ctx'> 			    struct mt76_queue_entry *e);</div><div class='add'>+int __mt76_set_channel(struct mt76_phy *phy, struct cfg80211_chan_def *chandef,</div><div class='add'>+		       bool offchannel);</div><div class='add'>+int mt76_set_channel(struct mt76_phy *phy, struct cfg80211_chan_def *chandef,</div><div class='add'>+		     bool offchannel);</div><div class='add'>+void mt76_scan_work(struct work_struct *work);</div><div class='add'>+void mt76_abort_scan(struct mt76_dev *dev);</div><div class='add'>+void mt76_roc_complete_work(struct work_struct *work);</div><div class='add'>+void mt76_roc_complete(struct mt76_phy *phy);</div><div class='add'>+void mt76_abort_roc(struct mt76_phy *phy);</div><div class='add'>+struct mt76_vif_link *mt76_get_vif_phy_link(struct mt76_phy *phy,</div><div class='add'>+					    struct ieee80211_vif *vif);</div><div class='add'>+void mt76_put_vif_phy_link(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='add'>+			   struct mt76_vif_link *mlink);</div><div class='ctx'> </div><div class='ctx'> /* usb */</div><div class='ctx'> static inline bool mt76u_urb_error(struct urb *urb)</div><div class='hunk'>@@ -1140,13 +1796,6 @@ static inline bool mt76u_urb_error(struct urb *urb)</div><div class='ctx'> 	       urb-&gt;status != -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Map hardware queues to usb endpoints */</div><div class='del'>-static inline u8 q2ep(u8 qid)</div><div class='del'>-{</div><div class='del'>-	/* TODO: take management packets to queue 5 */</div><div class='del'>-	return qid + 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int</div><div class='ctx'> mt76u_bulk_msg(struct mt76_dev *dev, void *data, int len, int *actual_len,</div><div class='ctx'> 	       int timeout, int ep)</div><div class='hunk'>@@ -1164,14 +1813,25 @@ mt76u_bulk_msg(struct mt76_dev *dev, void *data, int len, int *actual_len,</div><div class='ctx'> 	return usb_bulk_msg(udev, pipe, data, len, actual_len, timeout);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void mt76_ethtool_page_pool_stats(struct mt76_dev *dev, u64 *data, int *index);</div><div class='add'>+void mt76_ethtool_worker(struct mt76_ethtool_worker_info *wi,</div><div class='add'>+			 struct mt76_sta_stats *stats, bool eht);</div><div class='ctx'> int mt76_skb_adjust_pad(struct sk_buff *skb, int pad);</div><div class='add'>+int __mt76u_vendor_request(struct mt76_dev *dev, u8 req, u8 req_type,</div><div class='add'>+			   u16 val, u16 offset, void *buf, size_t len);</div><div class='ctx'> int mt76u_vendor_request(struct mt76_dev *dev, u8 req,</div><div class='ctx'> 			 u8 req_type, u16 val, u16 offset,</div><div class='ctx'> 			 void *buf, size_t len);</div><div class='ctx'> void mt76u_single_wr(struct mt76_dev *dev, const u8 req,</div><div class='ctx'> 		     const u16 offset, const u32 val);</div><div class='del'>-int mt76u_init(struct mt76_dev *dev, struct usb_interface *intf,</div><div class='del'>-	       bool ext);</div><div class='add'>+void mt76u_read_copy(struct mt76_dev *dev, u32 offset,</div><div class='add'>+		     void *data, int len);</div><div class='add'>+u32 ___mt76u_rr(struct mt76_dev *dev, u8 req, u8 req_type, u32 addr);</div><div class='add'>+void ___mt76u_wr(struct mt76_dev *dev, u8 req, u8 req_type,</div><div class='add'>+		 u32 addr, u32 val);</div><div class='add'>+int __mt76u_init(struct mt76_dev *dev, struct usb_interface *intf,</div><div class='add'>+		 struct mt76_bus_ops *ops);</div><div class='add'>+int mt76u_init(struct mt76_dev *dev, struct usb_interface *intf);</div><div class='ctx'> int mt76u_alloc_mcu_queue(struct mt76_dev *dev);</div><div class='ctx'> int mt76u_alloc_queues(struct mt76_dev *dev);</div><div class='ctx'> void mt76u_stop_tx(struct mt76_dev *dev);</div><div class='hunk'>@@ -1181,12 +1841,38 @@ void mt76u_queues_deinit(struct mt76_dev *dev);</div><div class='ctx'> </div><div class='ctx'> int mt76s_init(struct mt76_dev *dev, struct sdio_func *func,</div><div class='ctx'> 	       const struct mt76_bus_ops *bus_ops);</div><div class='del'>-int mt76s_alloc_queues(struct mt76_dev *dev);</div><div class='add'>+int mt76s_alloc_rx_queue(struct mt76_dev *dev, enum mt76_rxq_id qid);</div><div class='add'>+int mt76s_alloc_tx(struct mt76_dev *dev);</div><div class='ctx'> void mt76s_deinit(struct mt76_dev *dev);</div><div class='add'>+void mt76s_sdio_irq(struct sdio_func *func);</div><div class='add'>+void mt76s_txrx_worker(struct mt76_sdio *sdio);</div><div class='add'>+bool mt76s_txqs_empty(struct mt76_dev *dev);</div><div class='add'>+int mt76s_hw_init(struct mt76_dev *dev, struct sdio_func *func,</div><div class='add'>+		  int hw_ver);</div><div class='add'>+u32 mt76s_rr(struct mt76_dev *dev, u32 offset);</div><div class='add'>+void mt76s_wr(struct mt76_dev *dev, u32 offset, u32 val);</div><div class='add'>+u32 mt76s_rmw(struct mt76_dev *dev, u32 offset, u32 mask, u32 val);</div><div class='add'>+u32 mt76s_read_pcr(struct mt76_dev *dev);</div><div class='add'>+void mt76s_write_copy(struct mt76_dev *dev, u32 offset,</div><div class='add'>+		      const void *data, int len);</div><div class='add'>+void mt76s_read_copy(struct mt76_dev *dev, u32 offset,</div><div class='add'>+		     void *data, int len);</div><div class='add'>+int mt76s_wr_rp(struct mt76_dev *dev, u32 base,</div><div class='add'>+		const struct mt76_reg_pair *data,</div><div class='add'>+		int len);</div><div class='add'>+int mt76s_rd_rp(struct mt76_dev *dev, u32 base,</div><div class='add'>+		struct mt76_reg_pair *data, int len);</div><div class='ctx'> </div><div class='ctx'> struct sk_buff *</div><div class='add'>+__mt76_mcu_msg_alloc(struct mt76_dev *dev, const void *data,</div><div class='add'>+		     int len, int data_len, gfp_t gfp);</div><div class='add'>+static inline struct sk_buff *</div><div class='ctx'> mt76_mcu_msg_alloc(struct mt76_dev *dev, const void *data,</div><div class='del'>-		   int data_len);</div><div class='add'>+		   int data_len)</div><div class='add'>+{</div><div class='add'>+	return __mt76_mcu_msg_alloc(dev, data, data_len, data_len, GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void mt76_mcu_rx_event(struct mt76_dev *dev, struct sk_buff *skb);</div><div class='ctx'> struct sk_buff *mt76_mcu_get_response(struct mt76_dev *dev,</div><div class='ctx'> 				      unsigned long expires);</div><div class='hunk'>@@ -1194,8 +1880,17 @@ int mt76_mcu_send_and_get_msg(struct mt76_dev *dev, int cmd, const void *data,</div><div class='ctx'> 			      int len, bool wait_resp, struct sk_buff **ret);</div><div class='ctx'> int mt76_mcu_skb_send_and_get_msg(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 				  int cmd, bool wait_resp, struct sk_buff **ret);</div><div class='del'>-int mt76_mcu_send_firmware(struct mt76_dev *dev, int cmd, const void *data,</div><div class='del'>-			   int len);</div><div class='add'>+int __mt76_mcu_send_firmware(struct mt76_dev *dev, int cmd, const void *data,</div><div class='add'>+			     int len, int max_len);</div><div class='add'>+static inline int</div><div class='add'>+mt76_mcu_send_firmware(struct mt76_dev *dev, int cmd, const void *data,</div><div class='add'>+		       int len)</div><div class='add'>+{</div><div class='add'>+	int max_len = 4096 - dev-&gt;mcu_ops-&gt;headroom;</div><div class='add'>+</div><div class='add'>+	return __mt76_mcu_send_firmware(dev, cmd, data, len, max_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int</div><div class='ctx'> mt76_mcu_send_msg(struct mt76_dev *dev, int cmd, const void *data, int len,</div><div class='ctx'> 		  bool wait_resp)</div><div class='hunk'>@@ -1212,15 +1907,120 @@ mt76_mcu_skb_send_msg(struct mt76_dev *dev, struct sk_buff *skb, int cmd,</div><div class='ctx'> </div><div class='ctx'> void mt76_set_irq_mask(struct mt76_dev *dev, u32 addr, u32 clear, u32 set);</div><div class='ctx'> </div><div class='add'>+struct device_node *</div><div class='add'>+mt76_find_power_limits_node(struct mt76_dev *dev);</div><div class='add'>+struct device_node *</div><div class='add'>+mt76_find_channel_node(struct device_node *np, struct ieee80211_channel *chan);</div><div class='add'>+</div><div class='ctx'> s8 mt76_get_rate_power_limits(struct mt76_phy *phy,</div><div class='ctx'> 			      struct ieee80211_channel *chan,</div><div class='ctx'> 			      struct mt76_power_limits *dest,</div><div class='ctx'> 			      s8 target_power);</div><div class='ctx'> </div><div class='add'>+static inline bool mt76_queue_is_rx(struct mt76_dev *dev, struct mt76_queue *q)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;q_rx); i++) {</div><div class='add'>+		if (q == &amp;dev-&gt;q_rx[i])</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mt76_queue_is_wed_tx_free(struct mt76_queue *q)</div><div class='add'>+{</div><div class='add'>+	return (q-&gt;flags &amp; MT_QFLAG_WED) &amp;&amp;</div><div class='add'>+	       FIELD_GET(MT_QFLAG_WED_TYPE, q-&gt;flags) == MT76_WED_Q_TXFREE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mt76_queue_is_wed_rro(struct mt76_queue *q)</div><div class='add'>+{</div><div class='add'>+	return q-&gt;flags &amp; MT_QFLAG_WED_RRO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mt76_queue_is_wed_rro_ind(struct mt76_queue *q)</div><div class='add'>+{</div><div class='add'>+	return mt76_queue_is_wed_rro(q) &amp;&amp;</div><div class='add'>+	       FIELD_GET(MT_QFLAG_WED_TYPE, q-&gt;flags) == MT76_WED_RRO_Q_IND;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mt76_queue_is_wed_rro_rxdmad_c(struct mt76_queue *q)</div><div class='add'>+{</div><div class='add'>+	return mt76_queue_is_wed_rro(q) &amp;&amp;</div><div class='add'>+	       FIELD_GET(MT_QFLAG_WED_TYPE, q-&gt;flags) == MT76_WED_RRO_Q_RXDMAD_C;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mt76_queue_is_wed_rro_data(struct mt76_queue *q)</div><div class='add'>+{</div><div class='add'>+	return mt76_queue_is_wed_rro(q) &amp;&amp;</div><div class='add'>+	       FIELD_GET(MT_QFLAG_WED_TYPE, q-&gt;flags) == MT76_WED_RRO_Q_DATA;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mt76_queue_is_wed_rro_msdu_pg(struct mt76_queue *q)</div><div class='add'>+{</div><div class='add'>+	return mt76_queue_is_wed_rro(q) &amp;&amp;</div><div class='add'>+	       FIELD_GET(MT_QFLAG_WED_TYPE, q-&gt;flags) ==</div><div class='add'>+	       MT76_WED_RRO_Q_MSDU_PG;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mt76_queue_is_wed_rx(struct mt76_queue *q)</div><div class='add'>+{</div><div class='add'>+	return (q-&gt;flags &amp; MT_QFLAG_WED) &amp;&amp;</div><div class='add'>+	       FIELD_GET(MT_QFLAG_WED_TYPE, q-&gt;flags) == MT76_WED_Q_RX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mt76_queue_is_emi(struct mt76_queue *q)</div><div class='add'>+{</div><div class='add'>+	return q-&gt;flags &amp; MT_QFLAG_EMI_EN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mt76_queue_is_npu(struct mt76_queue *q)</div><div class='add'>+{</div><div class='add'>+	return q-&gt;flags &amp; MT_QFLAG_NPU;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mt76_queue_is_npu_tx(struct mt76_queue *q)</div><div class='add'>+{</div><div class='add'>+	return mt76_queue_is_npu(q) &amp;&amp;</div><div class='add'>+	       FIELD_GET(MT_QFLAG_WED_TYPE, q-&gt;flags) == MT76_WED_Q_TX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mt76_queue_is_npu_rx(struct mt76_queue *q)</div><div class='add'>+{</div><div class='add'>+	return mt76_queue_is_npu(q) &amp;&amp;</div><div class='add'>+	       FIELD_GET(MT_QFLAG_WED_TYPE, q-&gt;flags) == MT76_WED_Q_RX;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct mt76_txwi_cache *</div><div class='ctx'> mt76_token_release(struct mt76_dev *dev, int token, bool *wake);</div><div class='ctx'> int mt76_token_consume(struct mt76_dev *dev, struct mt76_txwi_cache **ptxwi);</div><div class='ctx'> void __mt76_set_tx_blocked(struct mt76_dev *dev, bool blocked);</div><div class='add'>+struct mt76_txwi_cache *mt76_rx_token_release(struct mt76_dev *dev, int token);</div><div class='add'>+int mt76_rx_token_consume(struct mt76_dev *dev, void *ptr,</div><div class='add'>+			  struct mt76_txwi_cache *r, dma_addr_t phys);</div><div class='add'>+int mt76_create_page_pool(struct mt76_dev *dev, struct mt76_queue *q);</div><div class='add'>+static inline void mt76_put_page_pool_buf(void *buf, bool allow_direct)</div><div class='add'>+{</div><div class='add'>+	struct page *page = virt_to_head_page(buf);</div><div class='add'>+</div><div class='add'>+	page_pool_put_full_page(pp_page_to_nmdesc(page)-&gt;pp, page,</div><div class='add'>+				allow_direct);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *</div><div class='add'>+mt76_get_page_pool_buf(struct mt76_queue *q, u32 *offset, u32 size)</div><div class='add'>+{</div><div class='add'>+	struct page *page;</div><div class='add'>+</div><div class='add'>+	page = page_pool_alloc_frag(q-&gt;page_pool, offset, size,</div><div class='add'>+				    GFP_ATOMIC | __GFP_NOWARN | GFP_DMA32);</div><div class='add'>+	if (!page)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return page_address(page) + *offset;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline void mt76_set_tx_blocked(struct mt76_dev *dev, bool blocked)</div><div class='ctx'> {</div><div class='hunk'>@@ -1235,8 +2035,7 @@ mt76_token_get(struct mt76_dev *dev, struct mt76_txwi_cache **ptxwi)</div><div class='ctx'> 	int token;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;dev-&gt;token_lock);</div><div class='del'>-	token = idr_alloc(&amp;dev-&gt;token, *ptxwi, 0, dev-&gt;drv-&gt;token_size,</div><div class='del'>-			  GFP_ATOMIC);</div><div class='add'>+	token = idr_alloc(&amp;dev-&gt;token, *ptxwi, 0, dev-&gt;token_size, GFP_ATOMIC);</div><div class='ctx'> 	spin_unlock_bh(&amp;dev-&gt;token_lock);</div><div class='ctx'> </div><div class='ctx'> 	return token;</div><div class='hunk'>@@ -1253,4 +2052,59 @@ mt76_token_put(struct mt76_dev *dev, int token)</div><div class='ctx'> </div><div class='ctx'> 	return txwi;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void mt76_wcid_init(struct mt76_wcid *wcid, u8 band_idx);</div><div class='add'>+void mt76_wcid_cleanup(struct mt76_dev *dev, struct mt76_wcid *wcid);</div><div class='add'>+void mt76_wcid_add_poll(struct mt76_dev *dev, struct mt76_wcid *wcid);</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+mt76_vif_init(struct ieee80211_vif *vif, struct mt76_vif_data *mvif)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mlink = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	mlink-&gt;mvif = mvif;</div><div class='add'>+	rcu_assign_pointer(mvif-&gt;link[0], mlink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt76_vif_cleanup(struct mt76_dev *dev, struct ieee80211_vif *vif);</div><div class='add'>+u16 mt76_select_links(struct ieee80211_vif *vif, int max_active_links);</div><div class='add'>+</div><div class='add'>+static inline struct mt76_vif_link *</div><div class='add'>+mt76_vif_link(struct mt76_dev *dev, struct ieee80211_vif *vif, int link_id)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mlink = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_data *mvif = mlink-&gt;mvif;</div><div class='add'>+</div><div class='add'>+	if (!link_id)</div><div class='add'>+		return mlink;</div><div class='add'>+</div><div class='add'>+	return mt76_dereference(mvif-&gt;link[link_id], dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct mt76_vif_link *</div><div class='add'>+mt76_vif_conf_link(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+		   struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mlink = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_data *mvif = mlink-&gt;mvif;</div><div class='add'>+</div><div class='add'>+	if (link_conf == &amp;vif-&gt;bss_conf || !link_conf-&gt;link_id)</div><div class='add'>+		return mlink;</div><div class='add'>+</div><div class='add'>+	return mt76_dereference(mvif-&gt;link[link_conf-&gt;link_id], dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct mt76_phy *</div><div class='add'>+mt76_vif_link_phy(struct mt76_vif_link *mlink)</div><div class='add'>+{</div><div class='add'>+	struct mt76_chanctx *ctx;</div><div class='add'>+</div><div class='add'>+	if (!mlink-&gt;ctx)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ctx = (struct mt76_chanctx *)mlink-&gt;ctx-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	return ctx-&gt;phy;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/Kconfig b/drivers/net/wireless/mediatek/mt76/mt7603/Kconfig<br/>index 6a0080f1d91c..ae40a596e49c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7603/Kconfig</a></div><div class='hunk'>@@ -1,11 +1,11 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+# SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> config MT7603E</div><div class='ctx'> 	tristate "MediaTek MT7603E (PCIe) and MT76x8 WLAN support"</div><div class='ctx'> 	select MT76_CORE</div><div class='ctx'> 	depends on MAC80211</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	help</div><div class='del'>-	  This adds support for MT7603E wireless PCIe devices and the WLAN core</div><div class='add'>+	  This adds support for MT7603E PCIe wireless devices and the WLAN core</div><div class='ctx'> 	  on MT7628/MT7688 SoC devices. This family supports IEEE 802.11n 2x2</div><div class='ctx'> 	  to 300Mbps PHY rate</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/Makefile b/drivers/net/wireless/mediatek/mt76/mt7603/Makefile<br/>index 6878e305c24d..e954165ee133 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7603/Makefile</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+# SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> obj-$(CONFIG_MT7603E) += mt7603e.o</div><div class='ctx'> </div><div class='ctx'> mt7603e-y := \</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c b/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c<br/>index 5d4522f440b7..300a7f9c2ef1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/beacon.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7603/beacon.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> </div><div class='ctx'> #include "mt7603.h"</div><div class='ctx'> </div><div class='hunk'>@@ -10,34 +10,66 @@ struct beacon_bc_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='add'>+mt7603_mac_stuck_beacon_recovery(struct mt7603_dev *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;beacon_check % 5 != 4)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mt76_clear(dev, MT_WPDMA_GLO_CFG, MT_WPDMA_GLO_CFG_TX_DMA_EN);</div><div class='add'>+	mt76_set(dev, MT_SCH_4, MT_SCH_4_RESET);</div><div class='add'>+	mt76_clear(dev, MT_SCH_4, MT_SCH_4_RESET);</div><div class='add'>+	mt76_set(dev, MT_WPDMA_GLO_CFG, MT_WPDMA_GLO_CFG_TX_DMA_EN);</div><div class='add'>+</div><div class='add'>+	mt76_set(dev, MT_WF_CFG_OFF_WOCCR, MT_WF_CFG_OFF_WOCCR_TMAC_GC_DIS);</div><div class='add'>+	mt76_set(dev, MT_ARB_SCR, MT_ARB_SCR_TX_DISABLE);</div><div class='add'>+	mt76_clear(dev, MT_ARB_SCR, MT_ARB_SCR_TX_DISABLE);</div><div class='add'>+	mt76_clear(dev, MT_WF_CFG_OFF_WOCCR, MT_WF_CFG_OFF_WOCCR_TMAC_GC_DIS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='ctx'> mt7603_update_beacon_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7603_dev *dev = (struct mt7603_dev *)priv;</div><div class='ctx'> 	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='ctx'> 	struct mt7603_vif *mvif = (struct mt7603_vif *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='add'>+	u32 om_idx = mvif-&gt;idx;</div><div class='add'>+	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	if (!(mdev-&gt;beacon_mask &amp; BIT(mvif-&gt;idx)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	skb = ieee80211_beacon_get(mt76_hw(dev), vif);</div><div class='add'>+	skb = ieee80211_beacon_get(mt76_hw(dev), vif, 0);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mt76_tx_queue_skb(dev, dev-&gt;mphy.q_tx[MT_TXQ_BEACON], skb,</div><div class='del'>-			  &amp;mvif-&gt;sta.wcid, NULL);</div><div class='add'>+	if (om_idx)</div><div class='add'>+		om_idx |= 0x10;</div><div class='add'>+	val = MT_DMA_FQCR0_BUSY | MT_DMA_FQCR0_MODE |</div><div class='add'>+		FIELD_PREP(MT_DMA_FQCR0_TARGET_BSS, om_idx) |</div><div class='add'>+		FIELD_PREP(MT_DMA_FQCR0_DEST_PORT_ID, 3) |</div><div class='add'>+		FIELD_PREP(MT_DMA_FQCR0_DEST_QUEUE_ID, 8);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;dev-&gt;ps_lock);</div><div class='del'>-	mt76_wr(dev, MT_DMA_FQCR0, MT_DMA_FQCR0_BUSY |</div><div class='del'>-		FIELD_PREP(MT_DMA_FQCR0_TARGET_WCID, mvif-&gt;sta.wcid.idx) |</div><div class='del'>-		FIELD_PREP(MT_DMA_FQCR0_TARGET_QID,</div><div class='del'>-			   dev-&gt;mphy.q_tx[MT_TXQ_CAB]-&gt;hw_idx) |</div><div class='del'>-		FIELD_PREP(MT_DMA_FQCR0_DEST_PORT_ID, 3) |</div><div class='del'>-		FIELD_PREP(MT_DMA_FQCR0_DEST_QUEUE_ID, 8));</div><div class='ctx'> </div><div class='del'>-	if (!mt76_poll(dev, MT_DMA_FQCR0, MT_DMA_FQCR0_BUSY, 0, 5000))</div><div class='add'>+	mt76_wr(dev, MT_DMA_FQCR0, val |</div><div class='add'>+		FIELD_PREP(MT_DMA_FQCR0_TARGET_QID, MT_TX_HW_QUEUE_BCN));</div><div class='add'>+	if (!mt76_poll(dev, MT_DMA_FQCR0, MT_DMA_FQCR0_BUSY, 0, 5000)) {</div><div class='ctx'> 		dev-&gt;beacon_check = MT7603_WATCHDOG_TIMEOUT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_DMA_FQCR0, val |</div><div class='add'>+		FIELD_PREP(MT_DMA_FQCR0_TARGET_QID, MT_TX_HW_QUEUE_BMC));</div><div class='add'>+	if (!mt76_poll(dev, MT_DMA_FQCR0, MT_DMA_FQCR0_BUSY, 0, 5000)) {</div><div class='add'>+		dev-&gt;beacon_check = MT7603_WATCHDOG_TIMEOUT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	mt76_tx_queue_skb(dev, dev-&gt;mphy.q_tx[MT_TXQ_BEACON],</div><div class='add'>+			  MT_TXQ_BEACON, skb, &amp;mvif-&gt;sta.wcid, NULL);</div><div class='add'>+</div><div class='add'>+out:</div><div class='ctx'> 	spin_unlock_bh(&amp;dev-&gt;ps_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -75,28 +107,35 @@ void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t)</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int i, nframes;</div><div class='ctx'> </div><div class='del'>-	if (mt76_hw(dev)-&gt;conf.flags &amp; IEEE80211_CONF_OFFCHANNEL)</div><div class='add'>+	if (dev-&gt;mphy.offchannel)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	data.dev = dev;</div><div class='ctx'> 	__skb_queue_head_init(&amp;data.q);</div><div class='ctx'> </div><div class='add'>+	/* Flush all previous CAB queue packets and beacons */</div><div class='add'>+	mt76_wr(dev, MT_WF_ARB_CAB_FLUSH, GENMASK(30, 16) | BIT(0));</div><div class='add'>+</div><div class='add'>+	mt76_queue_tx_cleanup(dev, dev-&gt;mphy.q_tx[MT_TXQ_CAB], false);</div><div class='add'>+	mt76_queue_tx_cleanup(dev, dev-&gt;mphy.q_tx[MT_TXQ_BEACON], false);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;mphy.q_tx[MT_TXQ_BEACON]-&gt;queued &gt; 0)</div><div class='add'>+		dev-&gt;beacon_check++;</div><div class='add'>+	else</div><div class='add'>+		dev-&gt;beacon_check = 0;</div><div class='add'>+	mt7603_mac_stuck_beacon_recovery(dev);</div><div class='add'>+</div><div class='ctx'> 	q = dev-&gt;mphy.q_tx[MT_TXQ_BEACON];</div><div class='del'>-	spin_lock_bh(&amp;q-&gt;lock);</div><div class='add'>+	spin_lock(&amp;q-&gt;lock);</div><div class='ctx'> 	ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev),</div><div class='ctx'> 		IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='ctx'> 		mt7603_update_beacon_iter, dev);</div><div class='ctx'> 	mt76_queue_kick(dev, q);</div><div class='del'>-	spin_unlock_bh(&amp;q-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/* Flush all previous CAB queue packets */</div><div class='del'>-	mt76_wr(dev, MT_WF_ARB_CAB_FLUSH, GENMASK(30, 16) | BIT(0));</div><div class='del'>-</div><div class='del'>-	mt76_queue_tx_cleanup(dev, dev-&gt;mphy.q_tx[MT_TXQ_CAB], false);</div><div class='add'>+	spin_unlock(&amp;q-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	mt76_csa_check(mdev);</div><div class='ctx'> 	if (mdev-&gt;csa_complete)</div><div class='del'>-		goto out;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	q = dev-&gt;mphy.q_tx[MT_TXQ_CAB];</div><div class='ctx'> 	do {</div><div class='hunk'>@@ -108,7 +147,7 @@ void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t)</div><div class='ctx'> 		 skb_queue_len(&amp;data.q) &lt; 8);</div><div class='ctx'> </div><div class='ctx'> 	if (skb_queue_empty(&amp;data.q))</div><div class='del'>-		goto out;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(data.tail); i++) {</div><div class='ctx'> 		if (!data.tail[i])</div><div class='hunk'>@@ -117,16 +156,16 @@ void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t)</div><div class='ctx'> 		mt76_skb_set_moredata(data.tail[i], false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;q-&gt;lock);</div><div class='add'>+	spin_lock(&amp;q-&gt;lock);</div><div class='ctx'> 	while ((skb = __skb_dequeue(&amp;data.q)) != NULL) {</div><div class='ctx'> 		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='ctx'> 		struct ieee80211_vif *vif = info-&gt;control.vif;</div><div class='ctx'> 		struct mt7603_vif *mvif = (struct mt7603_vif *)vif-&gt;drv_priv;</div><div class='ctx'> </div><div class='del'>-		mt76_tx_queue_skb(dev, q, skb, &amp;mvif-&gt;sta.wcid, NULL);</div><div class='add'>+		mt76_tx_queue_skb(dev, q, MT_TXQ_CAB, skb, &amp;mvif-&gt;sta.wcid, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	mt76_queue_kick(dev, q);</div><div class='del'>-	spin_unlock_bh(&amp;q-&gt;lock);</div><div class='add'>+	spin_unlock(&amp;q-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(data.count); i++)</div><div class='ctx'> 		mt76_wr(dev, MT_WF_ARB_CAB_COUNT_B0_REG(i),</div><div class='hunk'>@@ -136,11 +175,6 @@ void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t)</div><div class='ctx'> 		MT_WF_ARB_CAB_START_BSSn(0) |</div><div class='ctx'> 		(MT_WF_ARB_CAB_START_BSS0n(1) *</div><div class='ctx'> 		 ((1 &lt;&lt; (MT7603_MAX_INTERFACES - 1)) - 1)));</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mt76_queue_tx_cleanup(dev, dev-&gt;mphy.q_tx[MT_TXQ_BEACON], false);</div><div class='del'>-	if (dev-&gt;mphy.q_tx[MT_TXQ_BEACON]-&gt;queued &gt; hweight8(mdev-&gt;beacon_mask))</div><div class='del'>-		dev-&gt;beacon_check++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt7603_beacon_set_timer(struct mt7603_dev *dev, int idx, int intval)</div><div class='hunk'>@@ -161,7 +195,8 @@ void mt7603_beacon_set_timer(struct mt7603_dev *dev, int idx, int intval)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mt76.beacon_int = intval;</div><div class='add'>+	if (intval)</div><div class='add'>+		dev-&gt;mt76.beacon_int = intval;</div><div class='ctx'> 	mt76_wr(dev, MT_TBTT,</div><div class='ctx'> 		FIELD_PREP(MT_TBTT_PERIOD, intval) | MT_TBTT_CAL_ENABLE);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/core.c b/drivers/net/wireless/mediatek/mt76/mt7603/core.c<br/>index 60a996b63c0c..9c2943fd904e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/core.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7603/core.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> </div><div class='ctx'> #include "mt7603.h"</div><div class='ctx'> #include "../trace.h"</div><div class='hunk'>@@ -42,11 +42,13 @@ irqreturn_t mt7603_irq_handler(int irq, void *dev_instance)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (intr &amp; MT_INT_RX_DONE(0)) {</div><div class='add'>+		dev-&gt;rx_pse_check = 0;</div><div class='ctx'> 		mt7603_irq_disable(dev, MT_INT_RX_DONE(0));</div><div class='ctx'> 		napi_schedule(&amp;dev-&gt;mt76.napi[0]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (intr &amp; MT_INT_RX_DONE(1)) {</div><div class='add'>+		dev-&gt;rx_pse_check = 0;</div><div class='ctx'> 		mt7603_irq_disable(dev, MT_INT_RX_DONE(1));</div><div class='ctx'> 		napi_schedule(&amp;dev-&gt;mt76.napi[1]);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7603/debugfs.c<br/>index f52165dff422..c891ad5498e6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/debugfs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7603/debugfs.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> </div><div class='ctx'> #include "mt7603.h"</div><div class='ctx'> </div><div class='hunk'>@@ -85,7 +85,7 @@ mt7603_ampdu_stat_show(struct seq_file *file, void *data)</div><div class='ctx'> 			   bound[i], bound[i + 1]);</div><div class='ctx'> 	seq_puts(file, "\nCount:  ");</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(bound); i++)</div><div class='del'>-		seq_printf(file, "%8d | ", dev-&gt;mt76.aggr_stats[i]);</div><div class='add'>+		seq_printf(file, "%8d | ", dev-&gt;mphy.aggr_stats[i]);</div><div class='ctx'> 	seq_puts(file, "\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c<br/>index 415ea17b9be6..3a16851524a0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/dma.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/dma.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/dma.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7603/dma.c</a></div><div class='hunk'>@@ -1,9 +1,16 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> </div><div class='ctx'> #include "mt7603.h"</div><div class='ctx'> #include "mac.h"</div><div class='ctx'> #include "../dma.h"</div><div class='ctx'> </div><div class='add'>+static const u8 wmm_queue_map[] = {</div><div class='add'>+	[IEEE80211_AC_BK] = 0,</div><div class='add'>+	[IEEE80211_AC_BE] = 1,</div><div class='add'>+	[IEEE80211_AC_VI] = 2,</div><div class='add'>+	[IEEE80211_AC_VO] = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -22,10 +29,10 @@ mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	struct ieee80211_sta *sta;</div><div class='ctx'> 	struct mt7603_sta *msta;</div><div class='ctx'> 	struct mt76_wcid *wcid;</div><div class='add'>+	u8 qid, tid = 0, hwq = 0;</div><div class='ctx'> 	void *priv;</div><div class='ctx'> 	int idx;</div><div class='ctx'> 	u32 val;</div><div class='del'>-	u8 tid = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &lt; MT_TXD_SIZE + sizeof(struct ieee80211_hdr))</div><div class='ctx'> 		goto free;</div><div class='hunk'>@@ -37,24 +44,41 @@ mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	if (idx &gt;= MT7603_WTBL_STA - 1)</div><div class='ctx'> 		goto free;</div><div class='ctx'> </div><div class='del'>-	wcid = rcu_dereference(dev-&gt;mt76.wcid[idx]);</div><div class='add'>+	wcid = mt76_wcid_ptr(dev, idx);</div><div class='ctx'> 	if (!wcid)</div><div class='ctx'> 		goto free;</div><div class='ctx'> </div><div class='ctx'> 	priv = msta = container_of(wcid, struct mt7603_sta, wcid);</div><div class='del'>-	val = le32_to_cpu(txd[0]);</div><div class='del'>-	val &amp;= ~(MT_TXD0_P_IDX | MT_TXD0_Q_IDX);</div><div class='del'>-	val |= FIELD_PREP(MT_TXD0_Q_IDX, MT_TX_HW_QUEUE_MGMT);</div><div class='del'>-	txd[0] = cpu_to_le32(val);</div><div class='ctx'> </div><div class='ctx'> 	sta = container_of(priv, struct ieee80211_sta, drv_priv);</div><div class='ctx'> 	hdr = (struct ieee80211_hdr *)&amp;skb-&gt;data[MT_TXD_SIZE];</div><div class='del'>-	if (ieee80211_is_data_qos(hdr-&gt;frame_control))</div><div class='add'>+</div><div class='add'>+	hwq = wmm_queue_map[IEEE80211_AC_BE];</div><div class='add'>+	if (ieee80211_is_data_qos(hdr-&gt;frame_control)) {</div><div class='ctx'> 		tid = *ieee80211_get_qos_ctl(hdr) &amp;</div><div class='del'>-		      IEEE80211_QOS_CTL_TAG1D_MASK;</div><div class='del'>-	skb_set_queue_mapping(skb, tid_to_ac[tid]);</div><div class='add'>+			 IEEE80211_QOS_CTL_TAG1D_MASK;</div><div class='add'>+		qid = tid_to_ac[tid];</div><div class='add'>+		hwq = wmm_queue_map[qid];</div><div class='add'>+		skb_set_queue_mapping(skb, qid);</div><div class='add'>+	} else if (ieee80211_is_data(hdr-&gt;frame_control)) {</div><div class='add'>+		skb_set_queue_mapping(skb, IEEE80211_AC_BE);</div><div class='add'>+		hwq = wmm_queue_map[IEEE80211_AC_BE];</div><div class='add'>+	} else {</div><div class='add'>+		skb_pull(skb, MT_TXD_SIZE);</div><div class='add'>+		if (!ieee80211_is_bufferable_mmpdu(skb))</div><div class='add'>+			goto free;</div><div class='add'>+		skb_push(skb, MT_TXD_SIZE);</div><div class='add'>+		skb_set_queue_mapping(skb, MT_TXQ_PSD);</div><div class='add'>+		hwq = MT_TX_HW_QUEUE_MGMT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ieee80211_sta_set_buffered(sta, tid, true);</div><div class='ctx'> </div><div class='add'>+	val = le32_to_cpu(txd[0]);</div><div class='add'>+	val &amp;= ~(MT_TXD0_P_IDX | MT_TXD0_Q_IDX);</div><div class='add'>+	val |= FIELD_PREP(MT_TXD0_Q_IDX, hwq);</div><div class='add'>+	txd[0] = cpu_to_le32(val);</div><div class='add'>+</div><div class='ctx'> 	spin_lock_bh(&amp;dev-&gt;ps_lock);</div><div class='ctx'> 	__skb_queue_tail(&amp;msta-&gt;psq, skb);</div><div class='ctx'> 	if (skb_queue_len(&amp;msta-&gt;psq) &gt;= 64) {</div><div class='hunk'>@@ -69,14 +93,14 @@ free:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt7603_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,</div><div class='del'>-			 struct sk_buff *skb)</div><div class='add'>+			 struct sk_buff *skb, u32 *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76);</div><div class='ctx'> 	__le32 *rxd = (__le32 *)skb-&gt;data;</div><div class='ctx'> 	__le32 *end = (__le32 *)&amp;skb-&gt;data[skb-&gt;len];</div><div class='ctx'> 	enum rx_pkt_type type;</div><div class='ctx'> </div><div class='del'>-	type = FIELD_GET(MT_RXD0_PKT_TYPE, le32_to_cpu(rxd[0]));</div><div class='add'>+	type = le32_get_bits(rxd[0], MT_RXD0_PKT_TYPE);</div><div class='ctx'> </div><div class='ctx'> 	if (q == MT_RXQ_MCU) {</div><div class='ctx'> 		if (type == PKT_TYPE_RX_EVENT)</div><div class='hunk'>@@ -151,12 +175,6 @@ static int mt7603_poll_tx(struct napi_struct *napi, int budget)</div><div class='ctx'> </div><div class='ctx'> int mt7603_dma_init(struct mt7603_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	static const u8 wmm_queue_map[] = {</div><div class='del'>-		[IEEE80211_AC_BK] = 0,</div><div class='del'>-		[IEEE80211_AC_BE] = 1,</div><div class='del'>-		[IEEE80211_AC_VI] = 2,</div><div class='del'>-		[IEEE80211_AC_VO] = 3,</div><div class='del'>-	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -173,13 +191,14 @@ int mt7603_dma_init(struct mt7603_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(wmm_queue_map); i++) {</div><div class='ctx'> 		ret = mt76_init_tx_queue(&amp;dev-&gt;mphy, i, wmm_queue_map[i],</div><div class='del'>-					 MT7603_TX_RING_SIZE, MT_TX_RING_BASE);</div><div class='add'>+					 MT7603_TX_RING_SIZE, MT_TX_RING_BASE,</div><div class='add'>+					 NULL, 0);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = mt76_init_tx_queue(&amp;dev-&gt;mphy, MT_TXQ_PSD, MT_TX_HW_QUEUE_MGMT,</div><div class='del'>-				 MT7603_PSD_RING_SIZE, MT_TX_RING_BASE);</div><div class='add'>+				 MT7603_PSD_RING_SIZE, MT_TX_RING_BASE, NULL, 0);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -189,12 +208,12 @@ int mt7603_dma_init(struct mt7603_dev *dev)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = mt76_init_tx_queue(&amp;dev-&gt;mphy, MT_TXQ_BEACON, MT_TX_HW_QUEUE_BCN,</div><div class='del'>-				 MT_MCU_RING_SIZE, MT_TX_RING_BASE);</div><div class='add'>+				 MT_MCU_RING_SIZE, MT_TX_RING_BASE, NULL, 0);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = mt76_init_tx_queue(&amp;dev-&gt;mphy, MT_TXQ_CAB, MT_TX_HW_QUEUE_BMC,</div><div class='del'>-				 MT_MCU_RING_SIZE, MT_TX_RING_BASE);</div><div class='add'>+				 MT_MCU_RING_SIZE, MT_TX_RING_BASE, NULL, 0);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -223,8 +242,8 @@ int mt7603_dma_init(struct mt7603_dev *dev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	netif_tx_napi_add(&amp;dev-&gt;mt76.tx_napi_dev, &amp;dev-&gt;mt76.tx_napi,</div><div class='del'>-			  mt7603_poll_tx, NAPI_POLL_WEIGHT);</div><div class='add'>+	netif_napi_add_tx(dev-&gt;mt76.tx_napi_dev, &amp;dev-&gt;mt76.tx_napi,</div><div class='add'>+			  mt7603_poll_tx);</div><div class='ctx'> 	napi_enable(&amp;dev-&gt;mt76.tx_napi);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c<br/>index d951cb81df83..b89db2db6573 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include "mt7603.h"</div><div class='hunk'>@@ -181,7 +181,7 @@ int mt7603_eeprom_init(struct mt7603_dev *dev)</div><div class='ctx'> 	    is_mt7688(dev))</div><div class='ctx'> 		dev-&gt;mphy.antenna_mask = 1;</div><div class='ctx'> </div><div class='del'>-	mt76_eeprom_override(&amp;dev-&gt;mphy);</div><div class='add'>+	dev-&gt;mphy.chainmask = dev-&gt;mphy.antenna_mask;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return mt76_eeprom_override(&amp;dev-&gt;mphy);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/eeprom.h b/drivers/net/wireless/mediatek/mt76/mt7603/eeprom.h<br/>index 4687d6dc00dc..b6b746d1e56f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/eeprom.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/eeprom.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/eeprom.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7603/eeprom.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MT7603_EEPROM_H</div><div class='ctx'> #define __MT7603_EEPROM_H</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/init.c b/drivers/net/wireless/mediatek/mt76/mt7603/init.c<br/>index e1b2cfa56074..10f2ec70c792 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/init.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/init.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/init.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7603/init.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include "mt7603.h"</div><div class='hunk'>@@ -15,9 +15,10 @@ const struct mt76_driver_ops mt7603_drv_ops = {</div><div class='ctx'> 	.rx_poll_complete = mt7603_rx_poll_complete,</div><div class='ctx'> 	.sta_ps = mt7603_sta_ps,</div><div class='ctx'> 	.sta_add = mt7603_sta_add,</div><div class='del'>-	.sta_assoc = mt7603_sta_assoc,</div><div class='add'>+	.sta_event = mt7603_sta_event,</div><div class='ctx'> 	.sta_remove = mt7603_sta_remove,</div><div class='ctx'> 	.update_survey = mt7603_update_channel,</div><div class='add'>+	.set_channel = mt7603_set_channel,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -184,6 +185,13 @@ mt7603_mac_init(struct mt7603_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	mt76_set(dev, MT_TMAC_TCR, MT_TMAC_TCR_RX_RIFS_MODE);</div><div class='ctx'> </div><div class='add'>+	if (is_mt7628(dev)) {</div><div class='add'>+		mt76_set(dev, MT_TMAC_TCR,</div><div class='add'>+			 MT_TMAC_TCR_TXOP_BURST_STOP | BIT(1) | BIT(0));</div><div class='add'>+		mt76_set(dev, MT_TXREQ, BIT(27));</div><div class='add'>+		mt76_set(dev, MT_AGG_TMP, GENMASK(4, 2));</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mt7603_set_tmac_template(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable RX group to HIF */</div><div class='hunk'>@@ -304,34 +312,6 @@ mt7603_init_hardware(struct mt7603_dev *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define CCK_RATE(_idx, _rate) {					\</div><div class='del'>-	.bitrate = _rate,					\</div><div class='del'>-	.flags = IEEE80211_RATE_SHORT_PREAMBLE,			\</div><div class='del'>-	.hw_value = (MT_PHY_TYPE_CCK &lt;&lt; 8) | (_idx),		\</div><div class='del'>-	.hw_value_short = (MT_PHY_TYPE_CCK &lt;&lt; 8) | (4 + _idx),	\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define OFDM_RATE(_idx, _rate) {				\</div><div class='del'>-	.bitrate = _rate,					\</div><div class='del'>-	.hw_value = (MT_PHY_TYPE_OFDM &lt;&lt; 8) | (_idx),		\</div><div class='del'>-	.hw_value_short = (MT_PHY_TYPE_OFDM &lt;&lt; 8) | (_idx),	\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct ieee80211_rate mt7603_rates[] = {</div><div class='del'>-	CCK_RATE(0, 10),</div><div class='del'>-	CCK_RATE(1, 20),</div><div class='del'>-	CCK_RATE(2, 55),</div><div class='del'>-	CCK_RATE(3, 110),</div><div class='del'>-	OFDM_RATE(11, 60),</div><div class='del'>-	OFDM_RATE(15, 90),</div><div class='del'>-	OFDM_RATE(10, 120),</div><div class='del'>-	OFDM_RATE(14, 180),</div><div class='del'>-	OFDM_RATE(9,  240),</div><div class='del'>-	OFDM_RATE(13, 360),</div><div class='del'>-	OFDM_RATE(8,  480),</div><div class='del'>-	OFDM_RATE(12, 540),</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct ieee80211_iface_limit if_limits[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.max = 1,</div><div class='hunk'>@@ -358,10 +338,10 @@ static const struct ieee80211_iface_combination if_comb[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void mt7603_led_set_config(struct mt76_dev *mt76, u8 delay_on,</div><div class='add'>+static void mt7603_led_set_config(struct mt76_phy *mphy, u8 delay_on,</div><div class='ctx'> 				  u8 delay_off)</div><div class='ctx'> {</div><div class='del'>-	struct mt7603_dev *dev = container_of(mt76, struct mt7603_dev,</div><div class='add'>+	struct mt7603_dev *dev = container_of(mphy-&gt;dev, struct mt7603_dev,</div><div class='ctx'> 					      mt76);</div><div class='ctx'> 	u32 val, addr;</div><div class='ctx'> </div><div class='hunk'>@@ -369,15 +349,15 @@ static void mt7603_led_set_config(struct mt76_dev *mt76, u8 delay_on,</div><div class='ctx'> 	      FIELD_PREP(MT_LED_STATUS_OFF, delay_off) |</div><div class='ctx'> 	      FIELD_PREP(MT_LED_STATUS_ON, delay_on);</div><div class='ctx'> </div><div class='del'>-	addr = mt7603_reg_map(dev, MT_LED_STATUS_0(mt76-&gt;led_pin));</div><div class='add'>+	addr = mt7603_reg_map(dev, MT_LED_STATUS_0(mphy-&gt;leds.pin));</div><div class='ctx'> 	mt76_wr(dev, addr, val);</div><div class='del'>-	addr = mt7603_reg_map(dev, MT_LED_STATUS_1(mt76-&gt;led_pin));</div><div class='add'>+	addr = mt7603_reg_map(dev, MT_LED_STATUS_1(mphy-&gt;leds.pin));</div><div class='ctx'> 	mt76_wr(dev, addr, val);</div><div class='ctx'> </div><div class='del'>-	val = MT_LED_CTRL_REPLAY(mt76-&gt;led_pin) |</div><div class='del'>-	      MT_LED_CTRL_KICK(mt76-&gt;led_pin);</div><div class='del'>-	if (mt76-&gt;led_al)</div><div class='del'>-		val |= MT_LED_CTRL_POLARITY(mt76-&gt;led_pin);</div><div class='add'>+	val = MT_LED_CTRL_REPLAY(mphy-&gt;leds.pin) |</div><div class='add'>+	      MT_LED_CTRL_KICK(mphy-&gt;leds.pin);</div><div class='add'>+	if (mphy-&gt;leds.al)</div><div class='add'>+		val |= MT_LED_CTRL_POLARITY(mphy-&gt;leds.pin);</div><div class='ctx'> 	addr = mt7603_reg_map(dev, MT_LED_CTRL);</div><div class='ctx'> 	mt76_wr(dev, addr, val);</div><div class='ctx'> }</div><div class='hunk'>@@ -386,27 +366,27 @@ static int mt7603_led_set_blink(struct led_classdev *led_cdev,</div><div class='ctx'> 				unsigned long *delay_on,</div><div class='ctx'> 				unsigned long *delay_off)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_dev *mt76 = container_of(led_cdev, struct mt76_dev,</div><div class='del'>-					     led_cdev);</div><div class='add'>+	struct mt76_phy *mphy = container_of(led_cdev, struct mt76_phy,</div><div class='add'>+					     leds.cdev);</div><div class='ctx'> 	u8 delta_on, delta_off;</div><div class='ctx'> </div><div class='ctx'> 	delta_off = max_t(u8, *delay_off / 10, 1);</div><div class='ctx'> 	delta_on = max_t(u8, *delay_on / 10, 1);</div><div class='ctx'> </div><div class='del'>-	mt7603_led_set_config(mt76, delta_on, delta_off);</div><div class='add'>+	mt7603_led_set_config(mphy, delta_on, delta_off);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mt7603_led_set_brightness(struct led_classdev *led_cdev,</div><div class='ctx'> 				      enum led_brightness brightness)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_dev *mt76 = container_of(led_cdev, struct mt76_dev,</div><div class='del'>-					     led_cdev);</div><div class='add'>+	struct mt76_phy *mphy = container_of(led_cdev, struct mt76_phy,</div><div class='add'>+					     leds.cdev);</div><div class='ctx'> </div><div class='ctx'> 	if (!brightness)</div><div class='del'>-		mt7603_led_set_config(mt76, 0, 0xff);</div><div class='add'>+		mt7603_led_set_config(mphy, 0, 0xff);</div><div class='ctx'> 	else</div><div class='del'>-		mt7603_led_set_config(mt76, 0xff, 0);</div><div class='add'>+		mt7603_led_set_config(mphy, 0xff, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 __mt7603_reg_addr(struct mt7603_dev *dev, u32 addr)</div><div class='hunk'>@@ -477,11 +457,13 @@ mt7603_init_txpower(struct mt7603_dev *dev,</div><div class='ctx'> 	int target_power = eeprom[MT_EE_TX_POWER_0_START_2G + 2] &amp; ~BIT(7);</div><div class='ctx'> 	u8 *rate_power = &amp;eeprom[MT_EE_TX_POWER_CCK];</div><div class='ctx'> 	bool ext_pa = eeprom[MT_EE_NIC_CONF_0 + 1] &amp; BIT(1);</div><div class='add'>+	u8 ext_pa_pwr;</div><div class='ctx'> 	int max_offset, cur_offset;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (ext_pa &amp;&amp; is_mt7603(dev))</div><div class='del'>-		target_power = eeprom[MT_EE_TX_POWER_TSSI_OFF] &amp; ~BIT(7);</div><div class='add'>+	ext_pa_pwr = eeprom[MT_EE_TX_POWER_TSSI_OFF];</div><div class='add'>+	if (ext_pa &amp;&amp; is_mt7603(dev) &amp;&amp; ext_pa_pwr != 0 &amp;&amp; ext_pa_pwr != 0xff)</div><div class='add'>+		target_power = ext_pa_pwr &amp; ~BIT(7);</div><div class='ctx'> </div><div class='ctx'> 	if (target_power &amp; BIT(6))</div><div class='ctx'> 		target_power = -(target_power &amp; GENMASK(5, 0));</div><div class='hunk'>@@ -528,8 +510,6 @@ int mt7603_register_device(struct mt7603_dev *dev)</div><div class='ctx'> 	bus_ops-&gt;rmw = mt7603_rmw;</div><div class='ctx'> 	dev-&gt;mt76.bus = bus_ops;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;dev-&gt;sta_poll_list);</div><div class='del'>-	spin_lock_init(&amp;dev-&gt;sta_poll_lock);</div><div class='ctx'> 	spin_lock_init(&amp;dev-&gt;ps_lock);</div><div class='ctx'> </div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;dev-&gt;mphy.mac_work, mt7603_mac_work);</div><div class='hunk'>@@ -547,6 +527,7 @@ int mt7603_register_device(struct mt7603_dev *dev)</div><div class='ctx'> 	hw-&gt;max_rates = 3;</div><div class='ctx'> 	hw-&gt;max_report_rates = 7;</div><div class='ctx'> 	hw-&gt;max_rate_tries = 11;</div><div class='add'>+	hw-&gt;max_tx_fragments = 1;</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;radiotap_timestamp.units_pos =</div><div class='ctx'> 		IEEE80211_RADIOTAP_TIMESTAMP_UNIT_US;</div><div class='hunk'>@@ -563,14 +544,14 @@ int mt7603_register_device(struct mt7603_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* init led callbacks */</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_MT76_LEDS)) {</div><div class='del'>-		dev-&gt;mt76.led_cdev.brightness_set = mt7603_led_set_brightness;</div><div class='del'>-		dev-&gt;mt76.led_cdev.blink_set = mt7603_led_set_blink;</div><div class='add'>+		dev-&gt;mphy.leds.cdev.brightness_set = mt7603_led_set_brightness;</div><div class='add'>+		dev-&gt;mphy.leds.cdev.blink_set = mt7603_led_set_blink;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wiphy-&gt;reg_notifier = mt7603_regd_notifier;</div><div class='ctx'> </div><div class='del'>-	ret = mt76_register_device(&amp;dev-&gt;mt76, true, mt7603_rates,</div><div class='del'>-				   ARRAY_SIZE(mt7603_rates));</div><div class='add'>+	ret = mt76_register_device(&amp;dev-&gt;mt76, true, mt76_rates,</div><div class='add'>+				   ARRAY_SIZE(mt76_rates));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c<br/>index fbceb07c5f37..d3110eeb45d7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/mac.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/mac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7603/mac.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/timekeeping.h&gt;</div><div class='hunk'>@@ -39,7 +39,7 @@ void mt7603_mac_reset_counters(struct mt7603_dev *dev)</div><div class='ctx'> 	for (i = 0; i &lt; 2; i++)</div><div class='ctx'> 		mt76_rr(dev, MT_TX_AGG_CNT(i));</div><div class='ctx'> </div><div class='del'>-	memset(dev-&gt;mt76.aggr_stats, 0, sizeof(dev-&gt;mt76.aggr_stats));</div><div class='add'>+	memset(dev-&gt;mphy.aggr_stats, 0, sizeof(dev-&gt;mphy.aggr_stats));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt7603_mac_set_timing(struct mt7603_dev *dev)</div><div class='hunk'>@@ -178,8 +178,9 @@ mt7603_wtbl_set_skip_tx(struct mt7603_dev *dev, int idx, bool enabled)</div><div class='ctx'> 	mt76_wr(dev, addr + 3 * 4, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt7603_filter_tx(struct mt7603_dev *dev, int idx, bool abort)</div><div class='add'>+void mt7603_filter_tx(struct mt7603_dev *dev, int mac_idx, int idx, bool abort)</div><div class='ctx'> {</div><div class='add'>+	u32 flush_mask;</div><div class='ctx'> 	int i, port, queue;</div><div class='ctx'> </div><div class='ctx'> 	if (abort) {</div><div class='hunk'>@@ -195,6 +196,18 @@ void mt7603_filter_tx(struct mt7603_dev *dev, int idx, bool abort)</div><div class='ctx'> 	mt76_wr(dev, MT_TX_ABORT, MT_TX_ABORT_EN |</div><div class='ctx'> 			FIELD_PREP(MT_TX_ABORT_WCID, idx));</div><div class='ctx'> </div><div class='add'>+	flush_mask = MT_WF_ARB_TX_FLUSH_AC0 |</div><div class='add'>+		     MT_WF_ARB_TX_FLUSH_AC1 |</div><div class='add'>+		     MT_WF_ARB_TX_FLUSH_AC2 |</div><div class='add'>+		     MT_WF_ARB_TX_FLUSH_AC3;</div><div class='add'>+	flush_mask &lt;&lt;= mac_idx;</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_WF_ARB_TX_FLUSH_0, flush_mask);</div><div class='add'>+	mt76_poll(dev, MT_WF_ARB_TX_FLUSH_0, flush_mask, 0, 20000);</div><div class='add'>+	mt76_wr(dev, MT_WF_ARB_TX_START_0, flush_mask);</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_TX_ABORT, 0);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='ctx'> 		mt76_wr(dev, MT_DMA_FQCR0, MT_DMA_FQCR0_BUSY |</div><div class='ctx'> 			FIELD_PREP(MT_DMA_FQCR0_TARGET_WCID, idx) |</div><div class='hunk'>@@ -202,11 +215,10 @@ void mt7603_filter_tx(struct mt7603_dev *dev, int idx, bool abort)</div><div class='ctx'> 			FIELD_PREP(MT_DMA_FQCR0_DEST_PORT_ID, port) |</div><div class='ctx'> 			FIELD_PREP(MT_DMA_FQCR0_DEST_QUEUE_ID, queue));</div><div class='ctx'> </div><div class='del'>-		WARN_ON_ONCE(!mt76_poll(dev, MT_DMA_FQCR0, MT_DMA_FQCR0_BUSY,</div><div class='del'>-					0, 5000));</div><div class='add'>+		mt76_poll(dev, MT_DMA_FQCR0, MT_DMA_FQCR0_BUSY, 0, 5000);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mt76_wr(dev, MT_TX_ABORT, 0);</div><div class='add'>+	WARN_ON_ONCE(mt76_rr(dev, MT_DMA_FQCR0) &amp; MT_DMA_FQCR0_BUSY);</div><div class='ctx'> </div><div class='ctx'> 	mt7603_wtbl_set_skip_tx(dev, idx, false);</div><div class='ctx'> }</div><div class='hunk'>@@ -244,7 +256,7 @@ void mt7603_wtbl_set_ps(struct mt7603_dev *dev, struct mt7603_sta *sta,</div><div class='ctx'> 	mt76_poll(dev, MT_PSE_RTA, MT_PSE_RTA_BUSY, 0, 5000);</div><div class='ctx'> </div><div class='ctx'> 	if (enabled)</div><div class='del'>-		mt7603_filter_tx(dev, idx, false);</div><div class='add'>+		mt7603_filter_tx(dev, sta-&gt;vif-&gt;idx, idx, false);</div><div class='ctx'> </div><div class='ctx'> 	addr = mt7603_wtbl1_addr(idx);</div><div class='ctx'> 	mt76_set(dev, MT_WTBL1_OR, MT_WTBL1_OR_PSM_WRITE);</div><div class='hunk'>@@ -325,19 +337,21 @@ void mt7603_wtbl_update_cap(struct mt7603_dev *dev, struct ieee80211_sta *sta)</div><div class='ctx'> </div><div class='ctx'> 	addr = mt7603_wtbl1_addr(idx);</div><div class='ctx'> </div><div class='del'>-	ampdu_density = sta-&gt;ht_cap.ampdu_density;</div><div class='add'>+	ampdu_density = sta-&gt;deflink.ht_cap.ampdu_density;</div><div class='ctx'> 	if (ampdu_density &lt; IEEE80211_HT_MPDU_DENSITY_4)</div><div class='ctx'> 		ampdu_density = IEEE80211_HT_MPDU_DENSITY_4;</div><div class='ctx'> </div><div class='ctx'> 	val = mt76_rr(dev, addr + 2 * 4);</div><div class='ctx'> 	val &amp;= MT_WTBL1_W2_KEY_TYPE | MT_WTBL1_W2_ADMISSION_CONTROL;</div><div class='del'>-	val |= FIELD_PREP(MT_WTBL1_W2_AMPDU_FACTOR, sta-&gt;ht_cap.ampdu_factor) |</div><div class='del'>-	       FIELD_PREP(MT_WTBL1_W2_MPDU_DENSITY, sta-&gt;ht_cap.ampdu_density) |</div><div class='add'>+	val |= FIELD_PREP(MT_WTBL1_W2_AMPDU_FACTOR,</div><div class='add'>+			  sta-&gt;deflink.ht_cap.ampdu_factor) |</div><div class='add'>+	       FIELD_PREP(MT_WTBL1_W2_MPDU_DENSITY,</div><div class='add'>+			  sta-&gt;deflink.ht_cap.ampdu_density) |</div><div class='ctx'> 	       MT_WTBL1_W2_TXS_BAF_REPORT;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;ht_cap.cap)</div><div class='add'>+	if (sta-&gt;deflink.ht_cap.cap)</div><div class='ctx'> 		val |= MT_WTBL1_W2_HT;</div><div class='del'>-	if (sta-&gt;vht_cap.cap)</div><div class='add'>+	if (sta-&gt;deflink.vht_cap.cap)</div><div class='ctx'> 		val |= MT_WTBL1_W2_VHT;</div><div class='ctx'> </div><div class='ctx'> 	mt76_wr(dev, addr + 2 * 4, val);</div><div class='hunk'>@@ -346,9 +360,9 @@ void mt7603_wtbl_update_cap(struct mt7603_dev *dev, struct ieee80211_sta *sta)</div><div class='ctx'> 	val = mt76_rr(dev, addr + 9 * 4);</div><div class='ctx'> 	val &amp;= ~(MT_WTBL2_W9_SHORT_GI_20 | MT_WTBL2_W9_SHORT_GI_40 |</div><div class='ctx'> 		 MT_WTBL2_W9_SHORT_GI_80);</div><div class='del'>-	if (sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_20)</div><div class='add'>+	if (sta-&gt;deflink.ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_20)</div><div class='ctx'> 		val |= MT_WTBL2_W9_SHORT_GI_20;</div><div class='del'>-	if (sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_40)</div><div class='add'>+	if (sta-&gt;deflink.ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_40)</div><div class='ctx'> 		val |= MT_WTBL2_W9_SHORT_GI_40;</div><div class='ctx'> 	mt76_wr(dev, addr + 9 * 4, val);</div><div class='ctx'> }</div><div class='hunk'>@@ -409,16 +423,16 @@ void mt7603_mac_sta_poll(struct mt7603_dev *dev)</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		bool clear = false;</div><div class='ctx'> </div><div class='del'>-		spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-		if (list_empty(&amp;dev-&gt;sta_poll_list)) {</div><div class='del'>-			spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+		spin_lock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='add'>+		if (list_empty(&amp;dev-&gt;mt76.sta_poll_list)) {</div><div class='add'>+			spin_unlock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		msta = list_first_entry(&amp;dev-&gt;sta_poll_list, struct mt7603_sta,</div><div class='del'>-					poll_list);</div><div class='del'>-		list_del_init(&amp;msta-&gt;poll_list);</div><div class='del'>-		spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+		msta = list_first_entry(&amp;dev-&gt;mt76.sta_poll_list,</div><div class='add'>+					struct mt7603_sta, wcid.poll_list);</div><div class='add'>+		list_del_init(&amp;msta-&gt;wcid.poll_list);</div><div class='add'>+		spin_unlock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='ctx'> </div><div class='ctx'> 		addr = mt7603_wtbl4_addr(msta-&gt;wcid.idx);</div><div class='ctx'> 		for (i = 0; i &lt; 4; i++) {</div><div class='hunk'>@@ -473,10 +487,7 @@ mt7603_rx_get_wcid(struct mt7603_dev *dev, u8 idx, bool unicast)</div><div class='ctx'> 	struct mt7603_sta *sta;</div><div class='ctx'> 	struct mt76_wcid *wcid;</div><div class='ctx'> </div><div class='del'>-	if (idx &gt;= MT7603_WTBL_SIZE)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	wcid = rcu_dereference(dev-&gt;mt76.wcid[idx]);</div><div class='add'>+	wcid = mt76_wcid_ptr(dev, idx);</div><div class='ctx'> 	if (unicast || !wcid)</div><div class='ctx'> 		return wcid;</div><div class='ctx'> </div><div class='hunk'>@@ -525,6 +536,10 @@ mt7603_mac_fill_rx(struct mt7603_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	if (rxd2 &amp; MT_RXD2_NORMAL_TKIP_MIC_ERR)</div><div class='ctx'> 		status-&gt;flag |= RX_FLAG_MMIC_ERROR;</div><div class='ctx'> </div><div class='add'>+	/* ICV error or CCMP/BIP/WPI MIC error */</div><div class='add'>+	if (rxd2 &amp; MT_RXD2_NORMAL_ICV_ERR)</div><div class='add'>+		status-&gt;flag |= RX_FLAG_ONLY_MONITOR;</div><div class='add'>+</div><div class='ctx'> 	if (FIELD_GET(MT_RXD2_NORMAL_SEC_MODE, rxd2) != 0 &amp;&amp;</div><div class='ctx'> 	    !(rxd2 &amp; (MT_RXD2_NORMAL_CLM | MT_RXD2_NORMAL_CM))) {</div><div class='ctx'> 		status-&gt;flag |= RX_FLAG_DECRYPTED;</div><div class='hunk'>@@ -550,14 +565,27 @@ mt7603_mac_fill_rx(struct mt7603_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 		u8 *data = (u8 *)rxd;</div><div class='ctx'> </div><div class='ctx'> 		if (status-&gt;flag &amp; RX_FLAG_DECRYPTED) {</div><div class='del'>-			status-&gt;iv[0] = data[5];</div><div class='del'>-			status-&gt;iv[1] = data[4];</div><div class='del'>-			status-&gt;iv[2] = data[3];</div><div class='del'>-			status-&gt;iv[3] = data[2];</div><div class='del'>-			status-&gt;iv[4] = data[1];</div><div class='del'>-			status-&gt;iv[5] = data[0];</div><div class='del'>-</div><div class='del'>-			insert_ccmp_hdr = FIELD_GET(MT_RXD2_NORMAL_FRAG, rxd2);</div><div class='add'>+			switch (FIELD_GET(MT_RXD2_NORMAL_SEC_MODE, rxd2)) {</div><div class='add'>+			case MT_CIPHER_AES_CCMP:</div><div class='add'>+			case MT_CIPHER_CCMP_CCX:</div><div class='add'>+			case MT_CIPHER_CCMP_256:</div><div class='add'>+				insert_ccmp_hdr =</div><div class='add'>+					FIELD_GET(MT_RXD2_NORMAL_FRAG, rxd2);</div><div class='add'>+				fallthrough;</div><div class='add'>+			case MT_CIPHER_TKIP:</div><div class='add'>+			case MT_CIPHER_TKIP_NO_MIC:</div><div class='add'>+			case MT_CIPHER_GCMP:</div><div class='add'>+			case MT_CIPHER_GCMP_256:</div><div class='add'>+				status-&gt;iv[0] = data[5];</div><div class='add'>+				status-&gt;iv[1] = data[4];</div><div class='add'>+				status-&gt;iv[2] = data[3];</div><div class='add'>+				status-&gt;iv[3] = data[2];</div><div class='add'>+				status-&gt;iv[4] = data[1];</div><div class='add'>+				status-&gt;iv[5] = data[0];</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		rxd += 4;</div><div class='hunk'>@@ -625,11 +653,6 @@ mt7603_mac_fill_rx(struct mt7603_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 		status-&gt;chain_signal[1] = FIELD_GET(MT_RXV4_IB_RSSI1, rxdg3) +</div><div class='ctx'> 					  dev-&gt;rssi_offset[1];</div><div class='ctx'> </div><div class='del'>-		status-&gt;signal = status-&gt;chain_signal[0];</div><div class='del'>-		if (status-&gt;chains &amp; BIT(1))</div><div class='del'>-			status-&gt;signal = max(status-&gt;signal,</div><div class='del'>-					     status-&gt;chain_signal[1]);</div><div class='del'>-</div><div class='ctx'> 		if (FIELD_GET(MT_RXV1_FRAME_MODE, rxdg0) == 1)</div><div class='ctx'> 			status-&gt;bw = RATE_INFO_BW_40;</div><div class='ctx'> </div><div class='hunk'>@@ -831,7 +854,7 @@ void mt7603_wtbl_set_rates(struct mt7603_dev *dev, struct mt7603_sta *sta,</div><div class='ctx'> 	sta-&gt;wcid.tx_info |= MT_WCID_TX_INFO_SET;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static enum mt7603_cipher_type</div><div class='add'>+static enum mt76_cipher_type</div><div class='ctx'> mt7603_mac_get_key_info(struct ieee80211_key_conf *key, u8 *key_data)</div><div class='ctx'> {</div><div class='ctx'> 	memset(key_data, 0, 32);</div><div class='hunk'>@@ -863,7 +886,7 @@ mt7603_mac_get_key_info(struct ieee80211_key_conf *key, u8 *key_data)</div><div class='ctx'> int mt7603_wtbl_set_key(struct mt7603_dev *dev, int wcid,</div><div class='ctx'> 			struct ieee80211_key_conf *key)</div><div class='ctx'> {</div><div class='del'>-	enum mt7603_cipher_type cipher;</div><div class='add'>+	enum mt76_cipher_type cipher;</div><div class='ctx'> 	u32 addr = mt7603_wtbl3_addr(wcid);</div><div class='ctx'> 	u8 key_data[32];</div><div class='ctx'> 	int key_len = sizeof(key_data);</div><div class='hunk'>@@ -1117,7 +1140,7 @@ mt7603_fill_txs(struct mt7603_dev *dev, struct mt7603_sta *sta,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rate_set_tsf = READ_ONCE(sta-&gt;rate_set_tsf);</div><div class='del'>-	rs_idx = !((u32)(FIELD_GET(MT_TXS1_F0_TIMESTAMP, le32_to_cpu(txs_data[1])) -</div><div class='add'>+	rs_idx = !((u32)(le32_get_bits(txs_data[1], MT_TXS1_F0_TIMESTAMP) -</div><div class='ctx'> 			 rate_set_tsf) &lt; 1000000);</div><div class='ctx'> 	rs_idx ^= rate_set_tsf &amp; BIT(0);</div><div class='ctx'> 	rs = &amp;sta-&gt;rateset[rs_idx];</div><div class='hunk'>@@ -1213,7 +1236,7 @@ mt7603_mac_add_txs_skb(struct mt7603_dev *dev, struct mt7603_sta *sta, int pid,</div><div class='ctx'> 		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='ctx'> </div><div class='ctx'> 		if (!mt7603_fill_txs(dev, sta, info, txs_data)) {</div><div class='del'>-			ieee80211_tx_info_clear_status(info);</div><div class='add'>+			info-&gt;status.rates[0].count = 0;</div><div class='ctx'> 			info-&gt;status.rates[0].idx = -1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1231,35 +1254,24 @@ void mt7603_mac_add_txs(struct mt7603_dev *dev, void *data)</div><div class='ctx'> 	struct mt7603_sta *msta = NULL;</div><div class='ctx'> 	struct mt76_wcid *wcid;</div><div class='ctx'> 	__le32 *txs_data = data;</div><div class='del'>-	u32 txs;</div><div class='ctx'> 	u8 wcidx;</div><div class='ctx'> 	u8 pid;</div><div class='ctx'> </div><div class='del'>-	txs = le32_to_cpu(txs_data[4]);</div><div class='del'>-	pid = FIELD_GET(MT_TXS4_PID, txs);</div><div class='del'>-	txs = le32_to_cpu(txs_data[3]);</div><div class='del'>-	wcidx = FIELD_GET(MT_TXS3_WCID, txs);</div><div class='add'>+	pid = le32_get_bits(txs_data[4], MT_TXS4_PID);</div><div class='add'>+	wcidx = le32_get_bits(txs_data[3], MT_TXS3_WCID);</div><div class='ctx'> </div><div class='ctx'> 	if (pid == MT_PACKET_ID_NO_ACK)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (wcidx &gt;= MT7603_WTBL_SIZE)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-	wcid = rcu_dereference(dev-&gt;mt76.wcid[wcidx]);</div><div class='add'>+	wcid = mt76_wcid_ptr(dev, wcidx);</div><div class='ctx'> 	if (!wcid)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	msta = container_of(wcid, struct mt7603_sta, wcid);</div><div class='ctx'> 	sta = wcid_to_sta(wcid);</div><div class='del'>-</div><div class='del'>-	if (list_empty(&amp;msta-&gt;poll_list)) {</div><div class='del'>-		spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-		list_add_tail(&amp;msta-&gt;poll_list, &amp;dev-&gt;sta_poll_list);</div><div class='del'>-		spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-	}</div><div class='add'>+	mt76_wcid_add_poll(&amp;dev-&gt;mt76, &amp;msta-&gt;wcid);</div><div class='ctx'> </div><div class='ctx'> 	if (mt7603_mac_add_txs_skb(dev, msta, pid, txs_data))</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1267,8 +1279,11 @@ void mt7603_mac_add_txs(struct mt7603_dev *dev, void *data)</div><div class='ctx'> 	if (wcidx &gt;= MT7603_WTBL_STA || !sta)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (mt7603_fill_txs(dev, msta, &amp;info, txs_data))</div><div class='add'>+	if (mt7603_fill_txs(dev, msta, &amp;info, txs_data)) {</div><div class='add'>+		spin_lock_bh(&amp;dev-&gt;mt76.rx_lock);</div><div class='ctx'> 		ieee80211_tx_status_noskb(mt76_hw(dev), sta, &amp;info);</div><div class='add'>+		spin_unlock_bh(&amp;dev-&gt;mt76.rx_lock);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='hunk'>@@ -1367,6 +1382,7 @@ void mt7603_pse_client_reset(struct mt7603_dev *dev)</div><div class='ctx'> 		   MT_CLIENT_RESET_TX_R_E_2_S);</div><div class='ctx'> </div><div class='ctx'> 	/* Start PSE client TX abort */</div><div class='add'>+	mt76_set(dev, MT_WPDMA_GLO_CFG, MT_WPDMA_GLO_CFG_FORCE_TX_EOF);</div><div class='ctx'> 	mt76_set(dev, addr, MT_CLIENT_RESET_TX_R_E_1);</div><div class='ctx'> 	mt76_poll_msec(dev, addr, MT_CLIENT_RESET_TX_R_E_1_S,</div><div class='ctx'> 		       MT_CLIENT_RESET_TX_R_E_1_S, 500);</div><div class='hunk'>@@ -1415,15 +1431,6 @@ static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	mt7603_beacon_set_timer(dev, -1, 0);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;reset_cause[RESET_CAUSE_RESET_FAILED] ||</div><div class='del'>-	    dev-&gt;cur_reset_cause == RESET_CAUSE_RX_PSE_BUSY ||</div><div class='del'>-	    dev-&gt;cur_reset_cause == RESET_CAUSE_BEACON_STUCK ||</div><div class='del'>-	    dev-&gt;cur_reset_cause == RESET_CAUSE_TX_HANG)</div><div class='del'>-		mt7603_pse_reset(dev);</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;reset_cause[RESET_CAUSE_RESET_FAILED])</div><div class='del'>-		goto skip_dma_reset;</div><div class='del'>-</div><div class='ctx'> 	mt7603_mac_stop(dev);</div><div class='ctx'> </div><div class='ctx'> 	mt76_clear(dev, MT_WPDMA_GLO_CFG,</div><div class='hunk'>@@ -1433,42 +1440,48 @@ static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	mt7603_irq_disable(dev, mask);</div><div class='ctx'> </div><div class='del'>-	mt76_set(dev, MT_WPDMA_GLO_CFG, MT_WPDMA_GLO_CFG_FORCE_TX_EOF);</div><div class='del'>-</div><div class='ctx'> 	mt7603_pse_client_reset(dev);</div><div class='ctx'> </div><div class='ctx'> 	mt76_queue_tx_cleanup(dev, dev-&gt;mt76.q_mcu[MT_MCUQ_WM], true);</div><div class='ctx'> 	for (i = 0; i &lt; __MT_TXQ_MAX; i++)</div><div class='ctx'> 		mt76_queue_tx_cleanup(dev, dev-&gt;mphy.q_tx[i], true);</div><div class='ctx'> </div><div class='add'>+	mt7603_dma_sched_reset(dev);</div><div class='add'>+</div><div class='add'>+	mt76_tx_status_check(&amp;dev-&gt;mt76, true);</div><div class='add'>+</div><div class='ctx'> 	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i) {</div><div class='ctx'> 		mt76_queue_rx_reset(dev, i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mt76_tx_status_check(&amp;dev-&gt;mt76, NULL, true);</div><div class='add'>+	if (dev-&gt;reset_cause[RESET_CAUSE_RESET_FAILED] ||</div><div class='add'>+	    dev-&gt;cur_reset_cause == RESET_CAUSE_RX_PSE_BUSY)</div><div class='add'>+		mt7603_pse_reset(dev);</div><div class='ctx'> </div><div class='del'>-	mt7603_dma_sched_reset(dev);</div><div class='add'>+	if (!dev-&gt;reset_cause[RESET_CAUSE_RESET_FAILED]) {</div><div class='add'>+		mt7603_mac_dma_start(dev);</div><div class='ctx'> </div><div class='del'>-	mt7603_mac_dma_start(dev);</div><div class='add'>+		mt7603_irq_enable(dev, mask);</div><div class='ctx'> </div><div class='del'>-	mt7603_irq_enable(dev, mask);</div><div class='add'>+		clear_bit(MT76_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-skip_dma_reset:</div><div class='del'>-	clear_bit(MT76_RESET, &amp;dev-&gt;mphy.state);</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='ctx'> 	mt76_worker_enable(&amp;dev-&gt;mt76.tx_worker);</div><div class='del'>-	napi_enable(&amp;dev-&gt;mt76.tx_napi);</div><div class='del'>-	napi_schedule(&amp;dev-&gt;mt76.tx_napi);</div><div class='ctx'> </div><div class='ctx'> 	tasklet_enable(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='ctx'> 	mt7603_beacon_set_timer(dev, -1, beacon_int);</div><div class='ctx'> </div><div class='add'>+	napi_enable(&amp;dev-&gt;mt76.tx_napi);</div><div class='ctx'> 	napi_enable(&amp;dev-&gt;mt76.napi[0]);</div><div class='del'>-	napi_schedule(&amp;dev-&gt;mt76.napi[0]);</div><div class='del'>-</div><div class='ctx'> 	napi_enable(&amp;dev-&gt;mt76.napi[1]);</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	napi_schedule(&amp;dev-&gt;mt76.tx_napi);</div><div class='add'>+	napi_schedule(&amp;dev-&gt;mt76.napi[0]);</div><div class='ctx'> 	napi_schedule(&amp;dev-&gt;mt76.napi[1]);</div><div class='add'>+	local_bh_enable();</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_wake_queues(dev-&gt;mt76.hw);</div><div class='ctx'> 	mt76_txq_schedule_all(&amp;dev-&gt;mphy);</div><div class='hunk'>@@ -1541,20 +1554,29 @@ static bool mt7603_rx_pse_busy(struct mt7603_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 addr, val;</div><div class='ctx'> </div><div class='del'>-	if (mt76_rr(dev, MT_MCU_DEBUG_RESET) &amp; MT_MCU_DEBUG_RESET_QUEUES)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='ctx'> 	if (mt7603_rx_fifo_busy(dev))</div><div class='del'>-		return false;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	addr = mt7603_reg_map(dev, MT_CLIENT_BASE_PHYS_ADDR + MT_CLIENT_STATUS);</div><div class='ctx'> 	mt76_wr(dev, addr, 3);</div><div class='ctx'> 	val = mt76_rr(dev, addr) &gt;&gt; 16;</div><div class='ctx'> </div><div class='del'>-	if (is_mt7628(dev) &amp;&amp; (val &amp; 0x4001) == 0x4001)</div><div class='del'>-		return true;</div><div class='add'>+	if (!(val &amp; BIT(0)))</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	return (val &amp; 0x8001) == 0x8001 || (val &amp; 0xe001) == 0xe001;</div><div class='add'>+	if (is_mt7628(dev))</div><div class='add'>+		val &amp;= 0xa000;</div><div class='add'>+	else</div><div class='add'>+		val &amp;= 0x8000;</div><div class='add'>+	if (!val)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (mt76_rr(dev, MT_INT_SOURCE_CSR) &amp;</div><div class='add'>+	    (MT_INT_RX_DONE(0) | MT_INT_RX_DONE(1)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='hunk'>@@ -1584,12 +1606,12 @@ trigger:</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt7603_update_channel(struct mt76_dev *mdev)</div><div class='add'>+void mt7603_update_channel(struct mt76_phy *mphy)</div><div class='ctx'> {</div><div class='del'>-	struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76);</div><div class='add'>+	struct mt7603_dev *dev = container_of(mphy-&gt;dev, struct mt7603_dev, mt76);</div><div class='ctx'> 	struct mt76_channel_state *state;</div><div class='ctx'> </div><div class='del'>-	state = mdev-&gt;phy.chan_state;</div><div class='add'>+	state = mphy-&gt;chan_state;</div><div class='ctx'> 	state-&gt;cc_busy += mt76_rr(dev, MT_MIB_STAT_CCA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1759,7 +1781,7 @@ mt7603_false_cca_check(struct mt7603_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	mt7603_cca_stats_reset(dev);</div><div class='ctx'> </div><div class='del'>-	min_signal = mt76_get_min_avg_rssi(&amp;dev-&gt;mt76, false);</div><div class='add'>+	min_signal = mt76_get_min_avg_rssi(&amp;dev-&gt;mt76, 0);</div><div class='ctx'> 	if (!min_signal) {</div><div class='ctx'> 		dev-&gt;sensitivity = 0;</div><div class='ctx'> 		dev-&gt;last_cca_adj = jiffies;</div><div class='hunk'>@@ -1801,19 +1823,19 @@ void mt7603_mac_work(struct work_struct *work)</div><div class='ctx'> 	bool reset = false;</div><div class='ctx'> 	int i, idx;</div><div class='ctx'> </div><div class='del'>-	mt76_tx_status_check(&amp;dev-&gt;mt76, NULL, false);</div><div class='add'>+	mt76_tx_status_check(&amp;dev-&gt;mt76, false);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;mphy.mac_work_count++;</div><div class='del'>-	mt76_update_survey(&amp;dev-&gt;mt76);</div><div class='add'>+	mt76_update_survey(&amp;dev-&gt;mphy);</div><div class='ctx'> 	mt7603_edcca_check(dev);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0, idx = 0; i &lt; 2; i++) {</div><div class='ctx'> 		u32 val = mt76_rr(dev, MT_TX_AGG_CNT(i));</div><div class='ctx'> </div><div class='del'>-		dev-&gt;mt76.aggr_stats[idx++] += val &amp; 0xffff;</div><div class='del'>-		dev-&gt;mt76.aggr_stats[idx++] += val &gt;&gt; 16;</div><div class='add'>+		dev-&gt;mphy.aggr_stats[idx++] += val &amp; 0xffff;</div><div class='add'>+		dev-&gt;mphy.aggr_stats[idx++] += val &gt;&gt; 16;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;mphy.mac_work_count == 10)</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mac.h b/drivers/net/wireless/mediatek/mt76/mt7603/mac.h<br/>index 17e34ecf2bfb..9f5fab51ff83 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/mac.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/mac.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/mac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7603/mac.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MT7603_MAC_H</div><div class='ctx'> #define __MT7603_MAC_H</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/main.c b/drivers/net/wireless/mediatek/mt76/mt7603/main.c<br/>index 8edea1e7a602..0f3a7508996c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7603/main.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='hunk'>@@ -23,7 +23,7 @@ mt7603_start(struct ieee80211_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7603_stop(struct ieee80211_hw *hw)</div><div class='add'>+mt7603_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7603_dev *dev = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -44,7 +44,7 @@ mt7603_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='del'>-	mvif-&gt;idx = ffs(~dev-&gt;mt76.vif_mask) - 1;</div><div class='add'>+	mvif-&gt;idx = __ffs64(~dev-&gt;mt76.vif_mask);</div><div class='ctx'> 	if (mvif-&gt;idx &gt;= MT7603_MAX_INTERFACES) {</div><div class='ctx'> 		ret = -ENOSPC;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -65,16 +65,16 @@ mt7603_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	idx = MT7603_WTBL_RESERVED - 1 - mvif-&gt;idx;</div><div class='del'>-	dev-&gt;mt76.vif_mask |= BIT(mvif-&gt;idx);</div><div class='del'>-	INIT_LIST_HEAD(&amp;mvif-&gt;sta.poll_list);</div><div class='add'>+	dev-&gt;mt76.vif_mask |= BIT_ULL(mvif-&gt;idx);</div><div class='ctx'> 	mvif-&gt;sta.wcid.idx = idx;</div><div class='del'>-	mvif-&gt;sta.wcid.hw_key_idx = -1;</div><div class='add'>+	mvif-&gt;sta.vif = mvif;</div><div class='add'>+	mt76_wcid_init(&amp;mvif-&gt;sta.wcid, 0);</div><div class='ctx'> </div><div class='ctx'> 	eth_broadcast_addr(bc_addr);</div><div class='ctx'> 	mt7603_wtbl_init(dev, idx, mvif-&gt;idx, bc_addr);</div><div class='ctx'> </div><div class='ctx'> 	mtxq = (struct mt76_txq *)vif-&gt;txq-&gt;drv_priv;</div><div class='del'>-	mtxq-&gt;wcid = &amp;mvif-&gt;sta.wcid;</div><div class='add'>+	mtxq-&gt;wcid = idx;</div><div class='ctx'> 	rcu_assign_pointer(dev-&gt;mt76.wcid[idx], &amp;mvif-&gt;sta.wcid);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -99,14 +99,16 @@ mt7603_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> </div><div class='ctx'> 	rcu_assign_pointer(dev-&gt;mt76.wcid[idx], NULL);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-	if (!list_empty(&amp;msta-&gt;poll_list))</div><div class='del'>-		list_del_init(&amp;msta-&gt;poll_list);</div><div class='del'>-	spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='add'>+	if (!list_empty(&amp;msta-&gt;wcid.poll_list))</div><div class='add'>+		list_del_init(&amp;msta-&gt;wcid.poll_list);</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='del'>-	dev-&gt;mt76.vif_mask &amp;= ~BIT(mvif-&gt;idx);</div><div class='add'>+	dev-&gt;mt76.vif_mask &amp;= ~BIT_ULL(mvif-&gt;idx);</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	mt76_wcid_cleanup(&amp;dev-&gt;mt76, &amp;mvif-&gt;sta.wcid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt7603_init_edcca(struct mt7603_dev *dev)</div><div class='hunk'>@@ -129,28 +131,24 @@ void mt7603_init_edcca(struct mt7603_dev *dev)</div><div class='ctx'> 	mt7603_edcca_set_strict(dev, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt7603_set_channel(struct mt7603_dev *dev, struct cfg80211_chan_def *def)</div><div class='add'>+int mt7603_set_channel(struct mt76_phy *mphy)</div><div class='ctx'> {</div><div class='add'>+	struct mt7603_dev *dev = container_of(mphy-&gt;dev, struct mt7603_dev, mt76);</div><div class='add'>+	struct cfg80211_chan_def *def = &amp;mphy-&gt;chandef;</div><div class='add'>+</div><div class='ctx'> 	u8 *rssi_data = (u8 *)dev-&gt;mt76.eeprom.data;</div><div class='ctx'> 	int idx, ret;</div><div class='ctx'> 	u8 bw = MT_BW_20;</div><div class='ctx'> 	bool failed = false;</div><div class='ctx'> </div><div class='del'>-	cancel_delayed_work_sync(&amp;dev-&gt;mphy.mac_work);</div><div class='ctx'> 	tasklet_disable(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='del'>-	set_bit(MT76_RESET, &amp;dev-&gt;mphy.state);</div><div class='del'>-</div><div class='ctx'> 	mt7603_beacon_set_timer(dev, -1, 0);</div><div class='del'>-	mt76_set_channel(&amp;dev-&gt;mphy);</div><div class='ctx'> 	mt7603_mac_stop(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (def-&gt;width == NL80211_CHAN_WIDTH_40)</div><div class='ctx'> 		bw = MT_BW_40;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mphy.chandef = *def;</div><div class='ctx'> 	mt76_rmw_field(dev, MT_AGG_BWCR, MT_AGG_BWCR_BW, bw);</div><div class='ctx'> 	ret = mt7603_mcu_set_channel(dev);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -174,10 +172,6 @@ mt7603_set_channel(struct mt7603_dev *dev, struct cfg80211_chan_def *def)</div><div class='ctx'> 	mt7603_mac_set_timing(dev);</div><div class='ctx'> 	mt7603_mac_start(dev);</div><div class='ctx'> </div><div class='del'>-	clear_bit(MT76_RESET, &amp;dev-&gt;mphy.state);</div><div class='del'>-</div><div class='del'>-	mt76_txq_schedule_all(&amp;dev-&gt;mphy);</div><div class='del'>-</div><div class='ctx'> 	ieee80211_queue_delayed_work(mt76_hw(dev), &amp;dev-&gt;mphy.mac_work,</div><div class='ctx'> 				     msecs_to_jiffies(MT7603_WATCHDOG_TIME));</div><div class='ctx'> </div><div class='hunk'>@@ -193,9 +187,8 @@ mt7603_set_channel(struct mt7603_dev *dev, struct cfg80211_chan_def *def)</div><div class='ctx'> 	mt7603_init_edcca(dev);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (!(mt76_hw(dev)-&gt;conf.flags &amp; IEEE80211_CONF_OFFCHANNEL))</div><div class='add'>+	if (!mphy-&gt;offchannel)</div><div class='ctx'> 		mt7603_beacon_set_timer(dev, -1, dev-&gt;mt76.beacon_int);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='ctx'> 	tasklet_enable(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='ctx'> </div><div class='hunk'>@@ -205,18 +198,32 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mt7603_set_sar_specs(struct ieee80211_hw *hw,</div><div class='add'>+				const struct cfg80211_sar_specs *sar)</div><div class='add'>+{</div><div class='add'>+	struct mt7603_dev *dev = hw-&gt;priv;</div><div class='add'>+	struct mt76_phy *mphy = &amp;dev-&gt;mphy;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!cfg80211_chandef_valid(&amp;mphy-&gt;chandef))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = mt76_init_sar_power(hw, sar);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return mt76_update_channel(mphy);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='del'>-mt7603_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+mt7603_config(struct ieee80211_hw *hw, int radio_idx, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7603_dev *dev = hw-&gt;priv;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; (IEEE80211_CONF_CHANGE_CHANNEL |</div><div class='del'>-		       IEEE80211_CONF_CHANGE_POWER)) {</div><div class='del'>-		ieee80211_stop_queues(hw);</div><div class='del'>-		ret = mt7603_set_channel(dev, &amp;hw-&gt;conf.chandef);</div><div class='del'>-		ieee80211_wake_queues(hw);</div><div class='del'>-	}</div><div class='add'>+		       IEEE80211_CONF_CHANGE_POWER))</div><div class='add'>+		ret = mt76_update_channel(&amp;dev-&gt;mphy);</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; IEEE80211_CONF_CHANGE_MONITOR) {</div><div class='ctx'> 		mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='hunk'>@@ -276,7 +283,7 @@ mt7603_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags,</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mt7603_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-			struct ieee80211_bss_conf *info, u32 changed)</div><div class='add'>+			struct ieee80211_bss_conf *info, u64 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7603_dev *dev = hw-&gt;priv;</div><div class='ctx'> 	struct mt7603_vif *mvif = (struct mt7603_vif *)vif-&gt;drv_priv;</div><div class='hunk'>@@ -284,7 +291,7 @@ mt7603_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; (BSS_CHANGED_ASSOC | BSS_CHANGED_BSSID)) {</div><div class='del'>-		if (info-&gt;assoc || info-&gt;ibss_joined) {</div><div class='add'>+		if (vif-&gt;cfg.assoc || vif-&gt;cfg.ibss_joined) {</div><div class='ctx'> 			mt76_wr(dev, MT_BSSID0(mvif-&gt;idx),</div><div class='ctx'> 				get_unaligned_le32(info-&gt;bssid));</div><div class='ctx'> 			mt76_wr(dev, MT_BSSID1(mvif-&gt;idx),</div><div class='hunk'>@@ -330,12 +337,13 @@ mt7603_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='ctx'> 	if (idx &lt; 0)</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;msta-&gt;poll_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;msta-&gt;wcid.poll_list);</div><div class='ctx'> 	__skb_queue_head_init(&amp;msta-&gt;psq);</div><div class='ctx'> 	msta-&gt;ps = ~0;</div><div class='ctx'> 	msta-&gt;smps = ~0;</div><div class='ctx'> 	msta-&gt;wcid.sta = 1;</div><div class='ctx'> 	msta-&gt;wcid.idx = idx;</div><div class='add'>+	msta-&gt;vif = mvif;</div><div class='ctx'> 	mt7603_wtbl_init(dev, idx, mvif-&gt;idx, sta-&gt;addr);</div><div class='ctx'> 	mt7603_wtbl_set_ps(dev, msta, false);</div><div class='ctx'> </div><div class='hunk'>@@ -345,13 +353,19 @@ mt7603_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void</div><div class='del'>-mt7603_sta_assoc(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='del'>-		 struct ieee80211_sta *sta)</div><div class='add'>+int</div><div class='add'>+mt7603_sta_event(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='add'>+		 struct ieee80211_sta *sta, enum mt76_sta_event ev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76);</div><div class='ctx'> </div><div class='del'>-	mt7603_wtbl_update_cap(dev, sta);</div><div class='add'>+	if (ev == MT76_STA_EVENT_ASSOC) {</div><div class='add'>+		mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+		mt7603_wtbl_update_cap(dev, sta);</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='hunk'>@@ -359,18 +373,19 @@ mt7603_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='ctx'> 		  struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76);</div><div class='add'>+	struct mt7603_vif *mvif = (struct mt7603_vif *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct mt7603_sta *msta = (struct mt7603_sta *)sta-&gt;drv_priv;</div><div class='ctx'> 	struct mt76_wcid *wcid = (struct mt76_wcid *)sta-&gt;drv_priv;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;dev-&gt;ps_lock);</div><div class='ctx'> 	__skb_queue_purge(&amp;msta-&gt;psq);</div><div class='del'>-	mt7603_filter_tx(dev, wcid-&gt;idx, true);</div><div class='add'>+	mt7603_filter_tx(dev, mvif-&gt;idx, wcid-&gt;idx, true);</div><div class='ctx'> 	spin_unlock_bh(&amp;dev-&gt;ps_lock);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-	if (!list_empty(&amp;msta-&gt;poll_list))</div><div class='del'>-		list_del_init(&amp;msta-&gt;poll_list);</div><div class='del'>-	spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+	spin_lock_bh(&amp;mdev-&gt;sta_poll_lock);</div><div class='add'>+	if (!list_empty(&amp;msta-&gt;wcid.poll_list))</div><div class='add'>+		list_del_init(&amp;msta-&gt;wcid.poll_list);</div><div class='add'>+	spin_unlock_bh(&amp;mdev-&gt;sta_poll_lock);</div><div class='ctx'> </div><div class='ctx'> 	mt7603_wtbl_clear(dev, wcid-&gt;idx);</div><div class='ctx'> }</div><div class='hunk'>@@ -491,22 +506,23 @@ mt7603_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 	    !(key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (cmd == SET_KEY) {</div><div class='del'>-		key-&gt;hw_key_idx = wcid-&gt;idx;</div><div class='del'>-		wcid-&gt;hw_key_idx = idx;</div><div class='del'>-	} else {</div><div class='add'>+	if (cmd != SET_KEY) {</div><div class='ctx'> 		if (idx == wcid-&gt;hw_key_idx)</div><div class='ctx'> 			wcid-&gt;hw_key_idx = -1;</div><div class='ctx'> </div><div class='del'>-		key = NULL;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	key-&gt;hw_key_idx = wcid-&gt;idx;</div><div class='add'>+	wcid-&gt;hw_key_idx = idx;</div><div class='ctx'> 	mt76_wcid_key_setup(&amp;dev-&gt;mt76, wcid, key);</div><div class='ctx'> </div><div class='ctx'> 	return mt7603_wtbl_set_key(dev, wcid-&gt;idx, key);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt7603_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue,</div><div class='add'>+mt7603_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+	       unsigned int link_id, u16 queue,</div><div class='ctx'> 	       const struct ieee80211_tx_queue_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7603_dev *dev = hw-&gt;priv;</div><div class='hunk'>@@ -620,6 +636,9 @@ mt7603_sta_rate_tbl_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	struct ieee80211_sta_rates *sta_rates = rcu_dereference(sta-&gt;rates);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (!sta_rates)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_bh(&amp;dev-&gt;mt76.lock);</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(msta-&gt;rates); i++) {</div><div class='ctx'> 		msta-&gt;rates[i].idx = sta_rates-&gt;rate[i].idx;</div><div class='hunk'>@@ -633,12 +652,13 @@ mt7603_sta_rate_tbl_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	mt7603_wtbl_set_rates(dev, msta, NULL, msta-&gt;rates);</div><div class='ctx'> 	msta-&gt;rate_probe = false;</div><div class='ctx'> 	mt7603_wtbl_set_smps(dev, msta,</div><div class='del'>-			     sta-&gt;smps_mode == IEEE80211_SMPS_DYNAMIC);</div><div class='add'>+			     sta-&gt;deflink.smps_mode == IEEE80211_SMPS_DYNAMIC);</div><div class='ctx'> 	spin_unlock_bh(&amp;dev-&gt;mt76.lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7603_set_coverage_class(struct ieee80211_hw *hw, s16 coverage_class)</div><div class='add'>+mt7603_set_coverage_class(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+			  s16 coverage_class)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7603_dev *dev = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -673,6 +693,10 @@ static void mt7603_tx(struct ieee80211_hw *hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct ieee80211_ops mt7603_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.tx = mt7603_tx,</div><div class='ctx'> 	.start = mt7603_start,</div><div class='ctx'> 	.stop = mt7603_stop,</div><div class='hunk'>@@ -697,8 +721,10 @@ const struct ieee80211_ops mt7603_ops = {</div><div class='ctx'> 	.set_tim = mt76_set_tim,</div><div class='ctx'> 	.get_survey = mt76_get_survey,</div><div class='ctx'> 	.get_antenna = mt76_get_antenna,</div><div class='add'>+	.set_sar_specs = mt7603_set_sar_specs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("MediaTek MT7603E and MT76x8 wireless driver");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> </div><div class='ctx'> static int __init mt7603_init(void)</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c<br/>index 6abfe6b19afa..e432cce97640 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/mcu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7603/mcu.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include "mt7603.h"</div><div class='hunk'>@@ -221,7 +221,6 @@ int mt7603_mcu_init(struct mt7603_dev *dev)</div><div class='ctx'> 		.headroom = sizeof(struct mt7603_mcu_txd),</div><div class='ctx'> 		.mcu_skb_send_msg = mt7603_mcu_skb_send_msg,</div><div class='ctx'> 		.mcu_parse_response = mt7603_mcu_parse_response,</div><div class='del'>-		.mcu_restart = mt7603_mcu_restart,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;mt76.mcu_ops = &amp;mt7603_mcu_ops;</div><div class='hunk'>@@ -230,7 +229,7 @@ int mt7603_mcu_init(struct mt7603_dev *dev)</div><div class='ctx'> </div><div class='ctx'> void mt7603_mcu_exit(struct mt7603_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	__mt76_mcu_restart(&amp;dev-&gt;mt76);</div><div class='add'>+	mt7603_mcu_restart(&amp;dev-&gt;mt76);</div><div class='ctx'> 	skb_queue_purge(&amp;dev-&gt;mt76.mcu.res_q);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -403,7 +402,7 @@ int mt7603_mcu_set_channel(struct mt7603_dev *dev)</div><div class='ctx'> 		.tx_streams = n_chains,</div><div class='ctx'> 		.rx_streams = n_chains,</div><div class='ctx'> 	};</div><div class='del'>-	s8 tx_power;</div><div class='add'>+	s8 tx_power = hw-&gt;conf.power_level * 2;</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;mphy.chandef.width == NL80211_CHAN_WIDTH_40) {</div><div class='hunk'>@@ -414,7 +413,7 @@ int mt7603_mcu_set_channel(struct mt7603_dev *dev)</div><div class='ctx'> 			req.center_chan -= 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tx_power = hw-&gt;conf.power_level * 2;</div><div class='add'>+	tx_power = mt76_get_sar_power(&amp;dev-&gt;mphy, chandef-&gt;chan, tx_power);</div><div class='ctx'> 	if (dev-&gt;mphy.antenna_mask == 3)</div><div class='ctx'> 		tx_power -= 6;</div><div class='ctx'> 	tx_power = min(tx_power, dev-&gt;tx_power_limit);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7603/mcu.h<br/>index 30df8a3fd11a..7debe76cd092 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/mcu.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/mcu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/mcu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7603/mcu.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MT7603_MCU_H</div><div class='ctx'> #define __MT7603_MCU_H</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h b/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h<br/>index 1df5b9fed2bb..071bfab3af7c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MT7603_H</div><div class='ctx'> #define __MT7603_H</div><div class='hunk'>@@ -64,7 +64,6 @@ struct mt7603_sta {</div><div class='ctx'> </div><div class='ctx'> 	struct mt7603_vif *vif;</div><div class='ctx'> </div><div class='del'>-	struct list_head poll_list;</div><div class='ctx'> 	u32 tx_airtime_ac[4];</div><div class='ctx'> </div><div class='ctx'> 	struct sk_buff_head psq;</div><div class='hunk'>@@ -110,9 +109,6 @@ struct mt7603_dev {</div><div class='ctx'> </div><div class='ctx'> 	u32 rxfilter;</div><div class='ctx'> </div><div class='del'>-	struct list_head sta_poll_list;</div><div class='del'>-	spinlock_t sta_poll_lock;</div><div class='del'>-</div><div class='ctx'> 	struct mt7603_sta global_sta;</div><div class='ctx'> </div><div class='ctx'> 	u32 agc0, agc3;</div><div class='hunk'>@@ -217,6 +213,7 @@ void mt7603_mac_sta_poll(struct mt7603_dev *dev);</div><div class='ctx'> </div><div class='ctx'> void mt7603_pse_client_reset(struct mt7603_dev *dev);</div><div class='ctx'> </div><div class='add'>+int mt7603_set_channel(struct mt76_phy *mphy);</div><div class='ctx'> int mt7603_mcu_set_channel(struct mt7603_dev *dev);</div><div class='ctx'> int mt7603_mcu_set_eeprom(struct mt7603_dev *dev);</div><div class='ctx'> void mt7603_mcu_exit(struct mt7603_dev *dev);</div><div class='hunk'>@@ -234,7 +231,7 @@ void mt7603_wtbl_set_ps(struct mt7603_dev *dev, struct mt7603_sta *sta,</div><div class='ctx'> 			bool enabled);</div><div class='ctx'> void mt7603_wtbl_set_smps(struct mt7603_dev *dev, struct mt7603_sta *sta,</div><div class='ctx'> 			  bool enabled);</div><div class='del'>-void mt7603_filter_tx(struct mt7603_dev *dev, int idx, bool abort);</div><div class='add'>+void mt7603_filter_tx(struct mt7603_dev *dev, int mac_idx, int idx, bool abort);</div><div class='ctx'> </div><div class='ctx'> int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='ctx'> 			  enum mt76_txq_id qid, struct mt76_wcid *wcid,</div><div class='hunk'>@@ -244,19 +241,19 @@ int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='ctx'> void mt7603_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e);</div><div class='ctx'> </div><div class='ctx'> void mt7603_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,</div><div class='del'>-			 struct sk_buff *skb);</div><div class='add'>+			 struct sk_buff *skb, u32 *info);</div><div class='ctx'> void mt7603_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q);</div><div class='ctx'> void mt7603_sta_ps(struct mt76_dev *mdev, struct ieee80211_sta *sta, bool ps);</div><div class='ctx'> int mt7603_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='ctx'> 		   struct ieee80211_sta *sta);</div><div class='del'>-void mt7603_sta_assoc(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='del'>-		      struct ieee80211_sta *sta);</div><div class='add'>+int mt7603_sta_event(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='add'>+		     struct ieee80211_sta *sta, enum mt76_sta_event ev);</div><div class='ctx'> void mt7603_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='ctx'> 		       struct ieee80211_sta *sta);</div><div class='ctx'> </div><div class='ctx'> void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t);</div><div class='ctx'> </div><div class='del'>-void mt7603_update_channel(struct mt76_dev *mdev);</div><div class='add'>+void mt7603_update_channel(struct mt76_phy *mphy);</div><div class='ctx'> </div><div class='ctx'> void mt7603_edcca_set_strict(struct mt7603_dev *dev, bool val);</div><div class='ctx'> void mt7603_cca_stats_reset(struct mt7603_dev *dev);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/pci.c b/drivers/net/wireless/mediatek/mt76/mt7603/pci.c<br/>index aa6cb668b012..5fee610597a4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/pci.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/pci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7603/pci.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -28,7 +28,7 @@ mt76pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='del'>-	ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='add'>+	ret = dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/regs.h b/drivers/net/wireless/mediatek/mt76/mt7603/regs.h<br/>index 6741e6907194..97942f5ebdb4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/regs.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/regs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/regs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7603/regs.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MT7603_REGS_H</div><div class='ctx'> #define __MT7603_REGS_H</div><div class='hunk'>@@ -309,6 +309,13 @@ enum {</div><div class='ctx'> #define MT_WF_ARB_TX_STOP_0		MT_WF_ARB(0x110)</div><div class='ctx'> #define MT_WF_ARB_TX_STOP_1		MT_WF_ARB(0x114)</div><div class='ctx'> </div><div class='add'>+#define MT_WF_ARB_TX_FLUSH_AC0		BIT(0)</div><div class='add'>+#define MT_WF_ARB_TX_FLUSH_AC1		BIT(5)</div><div class='add'>+#define MT_WF_ARB_TX_FLUSH_AC2		BIT(10)</div><div class='add'>+#define MT_WF_ARB_TX_FLUSH_AC3		BIT(16)</div><div class='add'>+#define MT_WF_ARB_TX_FLUSH_AC4		BIT(21)</div><div class='add'>+#define MT_WF_ARB_TX_FLUSH_AC5		BIT(26)</div><div class='add'>+</div><div class='ctx'> #define MT_WF_ARB_BCN_START		MT_WF_ARB(0x118)</div><div class='ctx'> #define MT_WF_ARB_BCN_START_BSSn(n)	BIT(0 + (n))</div><div class='ctx'> #define MT_WF_ARB_BCN_START_T_PRE_TTTT	BIT(10)</div><div class='hunk'>@@ -462,6 +469,11 @@ enum {</div><div class='ctx'> #define MT_WF_SEC_BASE			0x21a00</div><div class='ctx'> #define MT_WF_SEC(ofs)			(MT_WF_SEC_BASE + (ofs))</div><div class='ctx'> </div><div class='add'>+#define MT_WF_CFG_OFF_BASE		0x21e00</div><div class='add'>+#define MT_WF_CFG_OFF(ofs)		(MT_WF_CFG_OFF_BASE + (ofs))</div><div class='add'>+#define MT_WF_CFG_OFF_WOCCR		MT_WF_CFG_OFF(0x004)</div><div class='add'>+#define MT_WF_CFG_OFF_WOCCR_TMAC_GC_DIS	BIT(4)</div><div class='add'>+</div><div class='ctx'> #define MT_SEC_SCR			MT_WF_SEC(0x004)</div><div class='ctx'> #define MT_SEC_SCR_MASK_ORDER		GENMASK(1, 0)</div><div class='ctx'> </div><div class='hunk'>@@ -765,16 +777,4 @@ enum {</div><div class='ctx'> #define MT_WTBL1_OR			(MT_WTBL1_BASE + 0x2300)</div><div class='ctx'> #define MT_WTBL1_OR_PSM_WRITE		BIT(31)</div><div class='ctx'> </div><div class='del'>-enum mt7603_cipher_type {</div><div class='del'>-	MT_CIPHER_NONE,</div><div class='del'>-	MT_CIPHER_WEP40,</div><div class='del'>-	MT_CIPHER_TKIP,</div><div class='del'>-	MT_CIPHER_TKIP_NO_MIC,</div><div class='del'>-	MT_CIPHER_AES_CCMP,</div><div class='del'>-	MT_CIPHER_WEP104,</div><div class='del'>-	MT_CIPHER_BIP_CMAC_128,</div><div class='del'>-	MT_CIPHER_WEP128,</div><div class='del'>-	MT_CIPHER_WAPI,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/soc.c b/drivers/net/wireless/mediatek/mt76/mt7603/soc.c<br/>index ba927033bbe8..b74256efba55 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/soc.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7603/soc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7603/soc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7603/soc.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -48,19 +48,16 @@ mt76_wmac_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> error:</div><div class='del'>-	ieee80211_free_hw(mt76_hw(dev));</div><div class='add'>+	mt76_free_device(mdev);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt76_wmac_remove(struct platform_device *pdev)</div><div class='add'>+static void mt76_wmac_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_dev *mdev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76);</div><div class='ctx'> </div><div class='ctx'> 	mt7603_unregister_device(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id of_wmac_match[] = {</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/Kconfig b/drivers/net/wireless/mediatek/mt76/mt7615/Kconfig<br/>index 30fba36ff46b..8cc0c1b5c24e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/Kconfig</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+# SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> </div><div class='ctx'> config MT7615_COMMON</div><div class='ctx'> 	tristate</div><div class='hunk'>@@ -11,7 +11,7 @@ config MT7615E</div><div class='ctx'> 	depends on MAC80211</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	help</div><div class='del'>-	  This adds support for MT7615-based wireless PCIe devices,</div><div class='add'>+	  This adds support for MT7615-based PCIe wireless devices,</div><div class='ctx'> 	  which support concurrent dual-band operation at both 5GHz</div><div class='ctx'> 	  and 2.4GHz, IEEE 802.11ac 4x4:4SS 1733Mbps PHY rate, wave2</div><div class='ctx'> 	  MU-MIMO up to 4 users/group and 160MHz channels.</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/Makefile b/drivers/net/wireless/mediatek/mt76/mt7615/Makefile<br/>index e8fc4a7ae9bc..4def3b13eae1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/Makefile</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-#SPDX-License-Identifier: ISC</div><div class='add'>+# SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MT7615_COMMON) += mt7615-common.o</div><div class='ctx'> obj-$(CONFIG_MT7615E) += mt7615e.o</div><div class='hunk'>@@ -17,4 +17,4 @@ mt7615e-$(CONFIG_MT7622_WMAC) += soc.o</div><div class='ctx'> </div><div class='ctx'> mt7663-usb-sdio-common-y := usb_sdio.o</div><div class='ctx'> mt7663u-y := usb.o usb_mcu.o</div><div class='del'>-mt7663s-y := sdio.o sdio_mcu.o sdio_txrx.o</div><div class='add'>+mt7663s-y := sdio.o sdio_mcu.o</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c<br/>index 676bb22726d6..0f7b20152279 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c</a></div><div class='hunk'>@@ -1,8 +1,35 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> </div><div class='ctx'> #include "mt7615.h"</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='add'>+mt7615_reg_set(void *data, u64 val)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev = data;</div><div class='add'>+</div><div class='add'>+	mt7615_mutex_acquire(dev);</div><div class='add'>+	mt76_wr(dev, dev-&gt;mt76.debugfs_reg, val);</div><div class='add'>+	mt7615_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7615_reg_get(void *data, u64 *val)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev = data;</div><div class='add'>+</div><div class='add'>+	mt7615_mutex_acquire(dev);</div><div class='add'>+	*val = mt76_rr(dev, dev-&gt;mt76.debugfs_reg);</div><div class='add'>+	mt7615_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(fops_regval, mt7615_reg_get, mt7615_reg_set,</div><div class='add'>+			 "0x%08llx\n");</div><div class='add'>+</div><div class='add'>+static int</div><div class='ctx'> mt7615_radar_pattern_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_dev *dev = data;</div><div class='hunk'>@@ -75,13 +102,13 @@ mt7615_pm_set(void *data, u64 val)</div><div class='ctx'> 	if (!mt7615_wait_for_mcu_init(dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!mt7615_firmware_offload(dev) || !mt76_is_mmio(&amp;dev-&gt;mt76))</div><div class='add'>+	if (!mt7615_firmware_offload(dev) || mt76_is_usb(&amp;dev-&gt;mt76))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (val == pm-&gt;enable)</div><div class='del'>-		return 0;</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='del'>-	mt7615_mutex_acquire(dev);</div><div class='add'>+	if (val == pm-&gt;enable)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;phy.n_beacon_vif) {</div><div class='ctx'> 		ret = -EBUSY;</div><div class='hunk'>@@ -92,9 +119,16 @@ mt7615_pm_set(void *data, u64 val)</div><div class='ctx'> 		pm-&gt;stats.last_wake_event = jiffies;</div><div class='ctx'> 		pm-&gt;stats.last_doze_event = jiffies;</div><div class='ctx'> 	}</div><div class='add'>+	/* make sure the chip is awake here and ps_work is scheduled</div><div class='add'>+	 * just at end of the this routine.</div><div class='add'>+	 */</div><div class='add'>+	pm-&gt;enable = false;</div><div class='add'>+	mt76_connac_pm_wake(&amp;dev-&gt;mphy, pm);</div><div class='add'>+</div><div class='ctx'> 	pm-&gt;enable = val;</div><div class='add'>+	mt76_connac_power_save_sched(&amp;dev-&gt;mphy, pm);</div><div class='ctx'> out:</div><div class='del'>-	mt7615_mutex_release(dev);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -244,7 +278,6 @@ mt7615_ampdu_stat_read_phy(struct mt7615_phy *phy,</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_dev *dev = file-&gt;private;</div><div class='ctx'> 	u32 reg = is_mt7663(&amp;dev-&gt;mt76) ? MT_MIB_ARNG(0) : MT_AGG_ASRCR0;</div><div class='del'>-	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='ctx'> 	int bound[7], i, range;</div><div class='ctx'> </div><div class='ctx'> 	if (!phy)</div><div class='hunk'>@@ -258,7 +291,7 @@ mt7615_ampdu_stat_read_phy(struct mt7615_phy *phy,</div><div class='ctx'> 	for (i = 0; i &lt; 3; i++)</div><div class='ctx'> 		bound[i + 4] = MT_AGG_ASRCR_RANGE(range, i) + 1;</div><div class='ctx'> </div><div class='del'>-	seq_printf(file, "\nPhy %d\n", ext_phy);</div><div class='add'>+	seq_printf(file, "\nPhy %d\n", phy != &amp;dev-&gt;phy);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(file, "Length: %8d | ", bound[0]);</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(bound) - 1; i++)</div><div class='hunk'>@@ -266,9 +299,8 @@ mt7615_ampdu_stat_read_phy(struct mt7615_phy *phy,</div><div class='ctx'> 			   bound[i], bound[i + 1]);</div><div class='ctx'> 	seq_puts(file, "\nCount:  ");</div><div class='ctx'> </div><div class='del'>-	range = ext_phy ? ARRAY_SIZE(dev-&gt;mt76.aggr_stats) / 2 : 0;</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(bound); i++)</div><div class='del'>-		seq_printf(file, "%8d | ", dev-&gt;mt76.aggr_stats[i + range]);</div><div class='add'>+		seq_printf(file, "%8d | ", phy-&gt;mt76-&gt;aggr_stats[i]);</div><div class='ctx'> 	seq_puts(file, "\n");</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(file, "BA miss count: %d\n", phy-&gt;mib.ba_miss_cnt);</div><div class='hunk'>@@ -319,24 +351,6 @@ mt7615_radio_read(struct seq_file *s, void *data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7615_read_temperature(struct seq_file *s, void *data)</div><div class='del'>-{</div><div class='del'>-	struct mt7615_dev *dev = dev_get_drvdata(s-&gt;private);</div><div class='del'>-	int temp;</div><div class='del'>-</div><div class='del'>-	if (!mt7615_wait_for_mcu_init(dev))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* cpu */</div><div class='del'>-	mt7615_mutex_acquire(dev);</div><div class='del'>-	temp = mt7615_mcu_get_temperature(dev, 0);</div><div class='del'>-	mt7615_mutex_release(dev);</div><div class='del'>-</div><div class='del'>-	seq_printf(s, "Temperature: %d\n", temp);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int</div><div class='ctx'> mt7615_queues_acq(struct seq_file *s, void *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -350,6 +364,9 @@ mt7615_queues_acq(struct seq_file *s, void *data)</div><div class='ctx'> 		int acs = i / MT7615_MAX_WMM_SETS;</div><div class='ctx'> 		u32 ctrl, val, qlen = 0;</div><div class='ctx'> </div><div class='add'>+		if (wmm_idx == 3 &amp;&amp; is_mt7663(&amp;dev-&gt;mt76))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		val = mt76_rr(dev, MT_PLE_AC_QEMPTY(acs, wmm_idx));</div><div class='ctx'> 		ctrl = BIT(31) | BIT(15) | (acs &lt;&lt; 8);</div><div class='ctx'> </div><div class='hunk'>@@ -424,11 +441,16 @@ mt7615_ext_mac_addr_read(struct file *file, char __user *userbuf,</div><div class='ctx'> 			 size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_dev *dev = file-&gt;private_data;</div><div class='del'>-	char buf[32 * ((ETH_ALEN * 3) + 4) + 1];</div><div class='add'>+	u32 len = 32 * ((ETH_ALEN * 3) + 4) + 1;</div><div class='ctx'> 	u8 addr[ETH_ALEN];</div><div class='add'>+	char *buf;</div><div class='ctx'> 	int ofs = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	buf = kzalloc(len, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; 32; i++) {</div><div class='ctx'> 		if (!(dev-&gt;muar_mask &amp; BIT(i)))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -439,10 +461,13 @@ mt7615_ext_mac_addr_read(struct file *file, char __user *userbuf,</div><div class='ctx'> 		put_unaligned_le32(mt76_rr(dev, MT_WF_RMAC_MAR0), addr);</div><div class='ctx'> 		put_unaligned_le16((mt76_rr(dev, MT_WF_RMAC_MAR1) &amp;</div><div class='ctx'> 				    MT_WF_RMAC_MAR1_ADDR), addr + 4);</div><div class='del'>-		ofs += snprintf(buf + ofs, sizeof(buf) - ofs, "%d=%pM\n", i, addr);</div><div class='add'>+		ofs += snprintf(buf + ofs, len - ofs, "%d=%pM\n", i, addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return simple_read_from_buffer(userbuf, count, ppos, buf, ofs);</div><div class='add'>+	ofs = simple_read_from_buffer(userbuf, count, ppos, buf, ofs);</div><div class='add'>+</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return ofs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='hunk'>@@ -524,7 +549,7 @@ int mt7615_init_debugfs(struct mt7615_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dir;</div><div class='ctx'> </div><div class='del'>-	dir = mt76_register_debugfs(&amp;dev-&gt;mt76);</div><div class='add'>+	dir = mt76_register_debugfs_fops(&amp;dev-&gt;mphy, &amp;fops_regval);</div><div class='ctx'> 	if (!dir)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -566,8 +591,6 @@ int mt7615_init_debugfs(struct mt7615_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	debugfs_create_file("reset_test", 0200, dir, dev,</div><div class='ctx'> 			    &amp;fops_reset_test);</div><div class='del'>-	debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "temperature", dir,</div><div class='del'>-				    mt7615_read_temperature);</div><div class='ctx'> 	debugfs_create_file("ext_mac_addr", 0600, dir, dev, &amp;fops_ext_mac_addr);</div><div class='ctx'> </div><div class='ctx'> 	debugfs_create_u32("rf_wfidx", 0600, dir, &amp;dev-&gt;debugfs_rf_wf);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/dma.c b/drivers/net/wireless/mediatek/mt76/mt7615/dma.c<br/>index 8004ae5c16a9..59d2b3e8696b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/dma.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/dma.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/dma.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/dma.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2019 MediaTek Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Ryder Lee &lt;ryder.lee@mediatek.com&gt;</div><div class='hunk'>@@ -26,14 +26,14 @@ mt7622_init_tx_queues_multi(struct mt7615_dev *dev)</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(wmm_queue_map); i++) {</div><div class='ctx'> 		ret = mt76_init_tx_queue(&amp;dev-&gt;mphy, i, wmm_queue_map[i],</div><div class='ctx'> 					 MT7615_TX_RING_SIZE / 2,</div><div class='del'>-					 MT_TX_RING_BASE);</div><div class='add'>+					 MT_TX_RING_BASE, NULL, 0);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = mt76_init_tx_queue(&amp;dev-&gt;mphy, MT_TXQ_PSD, MT7622_TXQ_MGMT,</div><div class='ctx'> 				 MT7615_TX_MGMT_RING_SIZE,</div><div class='del'>-				 MT_TX_RING_BASE);</div><div class='add'>+				 MT_TX_RING_BASE, NULL, 0);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -44,7 +44,7 @@ mt7622_init_tx_queues_multi(struct mt7615_dev *dev)</div><div class='ctx'> static int</div><div class='ctx'> mt7615_init_tx_queues(struct mt7615_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	int ret, i;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = mt76_init_mcu_queue(&amp;dev-&gt;mt76, MT_MCUQ_FWDL, MT7615_TXQ_FWDL,</div><div class='ctx'> 				  MT7615_TX_FWDL_RING_SIZE, MT_TX_RING_BASE);</div><div class='hunk'>@@ -54,14 +54,11 @@ mt7615_init_tx_queues(struct mt7615_dev *dev)</div><div class='ctx'> 	if (!is_mt7615(&amp;dev-&gt;mt76))</div><div class='ctx'> 		return mt7622_init_tx_queues_multi(dev);</div><div class='ctx'> </div><div class='del'>-	ret = mt76_init_tx_queue(&amp;dev-&gt;mphy, 0, 0, MT7615_TX_RING_SIZE,</div><div class='del'>-				 MT_TX_RING_BASE);</div><div class='add'>+	ret = mt76_connac_init_tx_queues(&amp;dev-&gt;mphy, 0, MT7615_TX_RING_SIZE,</div><div class='add'>+					 MT_TX_RING_BASE, NULL, 0);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	for (i = 1; i &lt;= MT_TXQ_PSD ; i++)</div><div class='del'>-		dev-&gt;mphy.q_tx[i] = dev-&gt;mphy.q_tx[0];</div><div class='del'>-</div><div class='ctx'> 	return mt76_init_mcu_queue(&amp;dev-&gt;mt76, MT_MCUQ_WM, MT7615_TXQ_MCU,</div><div class='ctx'> 				   MT7615_TX_MCU_RING_SIZE, MT_TX_RING_BASE);</div><div class='ctx'> }</div><div class='hunk'>@@ -70,7 +67,7 @@ static int mt7615_poll_tx(struct napi_struct *napi, int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_dev *dev;</div><div class='ctx'> </div><div class='del'>-	dev = container_of(napi, struct mt7615_dev, mt76.tx_napi);</div><div class='add'>+	dev = mt76_priv(napi-&gt;dev);</div><div class='ctx'> 	if (!mt76_connac_pm_ref(&amp;dev-&gt;mphy, &amp;dev-&gt;pm)) {</div><div class='ctx'> 		napi_complete(napi);</div><div class='ctx'> 		queue_work(dev-&gt;mt76.wq, &amp;dev-&gt;pm.wake_work);</div><div class='hunk'>@@ -79,9 +76,10 @@ static int mt7615_poll_tx(struct napi_struct *napi, int budget)</div><div class='ctx'> </div><div class='ctx'> 	mt76_queue_tx_cleanup(dev, dev-&gt;mt76.q_mcu[MT_MCUQ_WM], false);</div><div class='ctx'> 	if (napi_complete(napi))</div><div class='del'>-		mt7615_irq_enable(dev, mt7615_tx_mcu_int_mask(dev));</div><div class='add'>+		mt76_connac_irq_enable(&amp;dev-&gt;mt76,</div><div class='add'>+				       mt7615_tx_mcu_int_mask(dev));</div><div class='ctx'> </div><div class='del'>-	mt76_connac_pm_unref(&amp;dev-&gt;pm);</div><div class='add'>+	mt76_connac_pm_unref(&amp;dev-&gt;mphy, &amp;dev-&gt;pm);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -91,7 +89,7 @@ static int mt7615_poll_rx(struct napi_struct *napi, int budget)</div><div class='ctx'> 	struct mt7615_dev *dev;</div><div class='ctx'> 	int done;</div><div class='ctx'> </div><div class='del'>-	dev = container_of(napi-&gt;dev, struct mt7615_dev, mt76.napi_dev);</div><div class='add'>+	dev = mt76_priv(napi-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!mt76_connac_pm_ref(&amp;dev-&gt;mphy, &amp;dev-&gt;pm)) {</div><div class='ctx'> 		napi_complete(napi);</div><div class='hunk'>@@ -99,7 +97,7 @@ static int mt7615_poll_rx(struct napi_struct *napi, int budget)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	done = mt76_dma_rx_poll(napi, budget);</div><div class='del'>-	mt76_connac_pm_unref(&amp;dev-&gt;pm);</div><div class='add'>+	mt76_connac_pm_unref(&amp;dev-&gt;mphy, &amp;dev-&gt;pm);</div><div class='ctx'> </div><div class='ctx'> 	return done;</div><div class='ctx'> }</div><div class='hunk'>@@ -222,14 +220,9 @@ void mt7615_dma_start(struct mt7615_dev *dev)</div><div class='ctx'> int mt7615_dma_init(struct mt7615_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int rx_ring_size = MT7615_RX_RING_SIZE;</div><div class='del'>-	int rx_buf_size = MT_RX_BUF_SIZE;</div><div class='ctx'> 	u32 mask;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* Increase buffer size to receive large VHT MPDUs */</div><div class='del'>-	if (dev-&gt;mphy.cap.has_5ghz)</div><div class='del'>-		rx_buf_size *= 2;</div><div class='del'>-</div><div class='ctx'> 	mt76_dma_attach(&amp;dev-&gt;mt76);</div><div class='ctx'> </div><div class='ctx'> 	mt76_wr(dev, MT_WPDMA_GLO_CFG,</div><div class='hunk'>@@ -270,7 +263,7 @@ int mt7615_dma_init(struct mt7615_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* init rx queues */</div><div class='ctx'> 	ret = mt76_queue_alloc(dev, &amp;dev-&gt;mt76.q_rx[MT_RXQ_MCU], 1,</div><div class='del'>-			       MT7615_RX_MCU_RING_SIZE, rx_buf_size,</div><div class='add'>+			       MT7615_RX_MCU_RING_SIZE, MT_RX_BUF_SIZE,</div><div class='ctx'> 			       MT_RX_RING_BASE);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -279,7 +272,7 @@ int mt7615_dma_init(struct mt7615_dev *dev)</div><div class='ctx'> 	    rx_ring_size /= 2;</div><div class='ctx'> </div><div class='ctx'> 	ret = mt76_queue_alloc(dev, &amp;dev-&gt;mt76.q_rx[MT_RXQ_MAIN], 0,</div><div class='del'>-			       rx_ring_size, rx_buf_size, MT_RX_RING_BASE);</div><div class='add'>+			       rx_ring_size, MT_RX_BUF_SIZE, MT_RX_RING_BASE);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -289,8 +282,8 @@ int mt7615_dma_init(struct mt7615_dev *dev)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	netif_tx_napi_add(&amp;dev-&gt;mt76.tx_napi_dev, &amp;dev-&gt;mt76.tx_napi,</div><div class='del'>-			  mt7615_poll_tx, NAPI_POLL_WEIGHT);</div><div class='add'>+	netif_napi_add_tx(dev-&gt;mt76.tx_napi_dev, &amp;dev-&gt;mt76.tx_napi,</div><div class='add'>+			  mt7615_poll_tx);</div><div class='ctx'> 	napi_enable(&amp;dev-&gt;mt76.tx_napi);</div><div class='ctx'> </div><div class='ctx'> 	mt76_poll(dev, MT_WPDMA_GLO_CFG,</div><div class='hunk'>@@ -305,7 +298,7 @@ int mt7615_dma_init(struct mt7615_dev *dev)</div><div class='ctx'> 	else</div><div class='ctx'> 	    mask |= MT_INT_MCU_CMD;</div><div class='ctx'> </div><div class='del'>-	mt7615_irq_enable(dev, mask);</div><div class='add'>+	mt76_connac_irq_enable(&amp;dev-&gt;mt76, mask);</div><div class='ctx'> </div><div class='ctx'> 	mt7615_dma_start(dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c<br/>index 6dbaaf95ee38..d6828e1cda19 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2019 MediaTek Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Ryder Lee &lt;ryder.lee@mediatek.com&gt;</div><div class='hunk'>@@ -47,6 +47,9 @@ static int mt7615_efuse_init(struct mt7615_dev *dev, u32 base)</div><div class='ctx'> 	void *buf;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='add'>+	if (is_mt7663(&amp;dev-&gt;mt76))</div><div class='add'>+		len = MT7663_EEPROM_SIZE;</div><div class='add'>+</div><div class='ctx'> 	val = mt76_rr(dev, base + MT_EFUSE_BASE_CTRL);</div><div class='ctx'> 	if (val &amp; MT_EFUSE_BASE_CTRL_EMPTY)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -72,6 +75,8 @@ static int mt7615_eeprom_load(struct mt7615_dev *dev, u32 addr)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	BUILD_BUG_ON(MT7615_EEPROM_FULL_SIZE &lt; MT7663_EEPROM_SIZE);</div><div class='add'>+</div><div class='ctx'> 	ret = mt76_eeprom_init(&amp;dev-&gt;mt76, MT7615_EEPROM_FULL_SIZE);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -123,12 +128,12 @@ mt7615_eeprom_parse_hw_band_cap(struct mt7615_dev *dev)</div><div class='ctx'> 	case MT_EE_5GHZ:</div><div class='ctx'> 		dev-&gt;mphy.cap.has_5ghz = true;</div><div class='ctx'> 		break;</div><div class='del'>-	case MT_EE_2GHZ:</div><div class='del'>-		dev-&gt;mphy.cap.has_2ghz = true;</div><div class='del'>-		break;</div><div class='ctx'> 	case MT_EE_DBDC:</div><div class='ctx'> 		dev-&gt;dbdc_support = true;</div><div class='ctx'> 		fallthrough;</div><div class='add'>+	case MT_EE_2GHZ:</div><div class='add'>+		dev-&gt;mphy.cap.has_2ghz = true;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev-&gt;mphy.cap.has_2ghz = true;</div><div class='ctx'> 		dev-&gt;mphy.cap.has_5ghz = true;</div><div class='hunk'>@@ -336,7 +341,7 @@ int mt7615_eeprom_init(struct mt7615_dev *dev, u32 addr)</div><div class='ctx'> 	ret = mt7615_check_eeprom(&amp;dev-&gt;mt76);</div><div class='ctx'> 	if (ret &amp;&amp; dev-&gt;mt76.otp.data) {</div><div class='ctx'> 		memcpy(dev-&gt;mt76.eeprom.data, dev-&gt;mt76.otp.data,</div><div class='del'>-		       MT7615_EEPROM_SIZE);</div><div class='add'>+		       dev-&gt;mt76.otp.size);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		dev-&gt;flash_eeprom = true;</div><div class='ctx'> 		mt7615_cal_free_data(dev);</div><div class='hunk'>@@ -346,8 +351,6 @@ int mt7615_eeprom_init(struct mt7615_dev *dev, u32 addr)</div><div class='ctx'> 	memcpy(dev-&gt;mphy.macaddr, dev-&gt;mt76.eeprom.data + MT_EE_MAC_ADDR,</div><div class='ctx'> 	       ETH_ALEN);</div><div class='ctx'> </div><div class='del'>-	mt76_eeprom_override(&amp;dev-&gt;mphy);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return mt76_eeprom_override(&amp;dev-&gt;mphy);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt7615_eeprom_init);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h b/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h<br/>index a024dee10362..6aed52e14181 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /* Copyright (C) 2019 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MT7615_EEPROM_H</div><div class='hunk'>@@ -46,7 +46,7 @@ enum mt7615_eeprom_field {</div><div class='ctx'> </div><div class='ctx'> 	MT7615_EE_MAX =				0x3bf,</div><div class='ctx'> 	MT7622_EE_MAX =				0x3db,</div><div class='del'>-	MT7663_EE_MAX =				0x400,</div><div class='add'>+	MT7663_EE_MAX =				0x600,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define MT_EE_RATE_POWER_MASK			GENMASK(5, 0)</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/init.c b/drivers/net/wireless/mediatek/mt76/mt7615/init.c<br/>index 86341d1f82f3..42e11ba1206e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/init.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/init.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/init.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/init.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2019 MediaTek Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Roy Luo &lt;royluo@google.com&gt;</div><div class='hunk'>@@ -8,11 +8,63 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/hwmon.h&gt;</div><div class='add'>+#include &lt;linux/hwmon-sysfs.h&gt;</div><div class='ctx'> #include "mt7615.h"</div><div class='ctx'> #include "mac.h"</div><div class='ctx'> #include "mcu.h"</div><div class='ctx'> #include "eeprom.h"</div><div class='ctx'> </div><div class='add'>+static ssize_t mt7615_thermal_show_temp(struct device *dev,</div><div class='add'>+					struct device_attribute *attr,</div><div class='add'>+					char *buf)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *mdev = dev_get_drvdata(dev);</div><div class='add'>+	int temperature;</div><div class='add'>+</div><div class='add'>+	if (!mt7615_wait_for_mcu_init(mdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mt7615_mutex_acquire(mdev);</div><div class='add'>+	temperature = mt7615_mcu_get_temperature(mdev);</div><div class='add'>+	mt7615_mutex_release(mdev);</div><div class='add'>+</div><div class='add'>+	if (temperature &lt; 0)</div><div class='add'>+		return temperature;</div><div class='add'>+</div><div class='add'>+	/* display in millidegree celcius */</div><div class='add'>+	return sprintf(buf, "%u\n", temperature * 1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SENSOR_DEVICE_ATTR(temp1_input, 0444, mt7615_thermal_show_temp,</div><div class='add'>+			  NULL, 0);</div><div class='add'>+</div><div class='add'>+static struct attribute *mt7615_hwmon_attrs[] = {</div><div class='add'>+	&amp;sensor_dev_attr_temp1_input.dev_attr.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+ATTRIBUTE_GROUPS(mt7615_hwmon);</div><div class='add'>+</div><div class='add'>+int mt7615_thermal_init(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct wiphy *wiphy = mt76_hw(dev)-&gt;wiphy;</div><div class='add'>+	struct device *hwmon;</div><div class='add'>+	const char *name;</div><div class='add'>+</div><div class='add'>+	if (!IS_REACHABLE(CONFIG_HWMON))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	name = devm_kasprintf(&amp;wiphy-&gt;dev, GFP_KERNEL, "mt7615_%s",</div><div class='add'>+			      wiphy_name(wiphy));</div><div class='add'>+	if (!name)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hwmon = devm_hwmon_device_register_with_groups(&amp;wiphy-&gt;dev, name, dev,</div><div class='add'>+						       mt7615_hwmon_groups);</div><div class='add'>+	return PTR_ERR_OR_ZERO(hwmon);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7615_thermal_init);</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> mt7615_phy_init(struct mt7615_dev *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -142,6 +194,7 @@ mt7615_check_offload_capability(struct mt7615_dev *dev)</div><div class='ctx'> 		ieee80211_hw_set(hw, SUPPORTS_PS);</div><div class='ctx'> 		ieee80211_hw_set(hw, SUPPORTS_DYNAMIC_PS);</div><div class='ctx'> </div><div class='add'>+		wiphy-&gt;flags &amp;= ~WIPHY_FLAG_4ADDR_STATION;</div><div class='ctx'> 		wiphy-&gt;max_remain_on_channel_duration = 5000;</div><div class='ctx'> 		wiphy-&gt;features |= NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR |</div><div class='ctx'> 				   NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR |</div><div class='hunk'>@@ -174,35 +227,6 @@ bool mt7615_wait_for_mcu_init(struct mt7615_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt7615_wait_for_mcu_init);</div><div class='ctx'> </div><div class='del'>-#define CCK_RATE(_idx, _rate) {						\</div><div class='del'>-	.bitrate = _rate,						\</div><div class='del'>-	.flags = IEEE80211_RATE_SHORT_PREAMBLE,				\</div><div class='del'>-	.hw_value = (MT_PHY_TYPE_CCK &lt;&lt; 8) | (_idx),			\</div><div class='del'>-	.hw_value_short = (MT_PHY_TYPE_CCK &lt;&lt; 8) | (4 + (_idx)),	\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define OFDM_RATE(_idx, _rate) {					\</div><div class='del'>-	.bitrate = _rate,						\</div><div class='del'>-	.hw_value = (MT_PHY_TYPE_OFDM &lt;&lt; 8) | (_idx),			\</div><div class='del'>-	.hw_value_short = (MT_PHY_TYPE_OFDM &lt;&lt; 8) | (_idx),		\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct ieee80211_rate mt7615_rates[] = {</div><div class='del'>-	CCK_RATE(0, 10),</div><div class='del'>-	CCK_RATE(1, 20),</div><div class='del'>-	CCK_RATE(2, 55),</div><div class='del'>-	CCK_RATE(3, 110),</div><div class='del'>-	OFDM_RATE(11, 60),</div><div class='del'>-	OFDM_RATE(15, 90),</div><div class='del'>-	OFDM_RATE(10, 120),</div><div class='del'>-	OFDM_RATE(14, 180),</div><div class='del'>-	OFDM_RATE(9,  240),</div><div class='del'>-	OFDM_RATE(13, 360),</div><div class='del'>-	OFDM_RATE(8,  480),</div><div class='del'>-	OFDM_RATE(12, 540),</div><div class='del'>-};</div><div class='del'>-EXPORT_SYMBOL_GPL(mt7615_rates);</div><div class='del'>-</div><div class='ctx'> static const struct ieee80211_iface_limit if_limits[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.max = 1,</div><div class='hunk'>@@ -249,7 +273,7 @@ void mt7615_init_txpower(struct mt7615_dev *dev,</div><div class='ctx'> 			 struct ieee80211_supported_band *sband)</div><div class='ctx'> {</div><div class='ctx'> 	int i, n_chains = hweight8(dev-&gt;mphy.antenna_mask), target_chains;</div><div class='del'>-	int delta_idx, delta = mt76_tx_power_nss_delta(n_chains);</div><div class='add'>+	int delta_idx, delta = mt76_tx_power_path_delta(n_chains);</div><div class='ctx'> 	u8 *eep = (u8 *)dev-&gt;mt76.eeprom.data;</div><div class='ctx'> 	enum nl80211_band band = sband-&gt;band;</div><div class='ctx'> 	struct mt76_power_limits limits;</div><div class='hunk'>@@ -298,7 +322,7 @@ void mt7615_init_work(struct mt7615_dev *dev)</div><div class='ctx'> 	mt7615_mcu_set_eeprom(dev);</div><div class='ctx'> 	mt7615_mac_init(dev);</div><div class='ctx'> 	mt7615_phy_init(dev);</div><div class='del'>-	mt7615_mcu_del_wtbl_all(dev);</div><div class='add'>+	mt76_connac_mcu_del_wtbl_all(&amp;dev-&gt;mt76);</div><div class='ctx'> 	mt7615_check_offload_capability(dev);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt7615_init_work);</div><div class='hunk'>@@ -362,7 +386,7 @@ mt7615_init_wiphy(struct ieee80211_hw *hw)</div><div class='ctx'> 	wiphy-&gt;reg_notifier = mt7615_regd_notifier;</div><div class='ctx'> </div><div class='ctx'> 	wiphy-&gt;max_sched_scan_plan_interval =</div><div class='del'>-		MT76_CONNAC_MAX_SCHED_SCAN_INTERVAL;</div><div class='add'>+		MT76_CONNAC_MAX_TIME_SCHED_SCAN_INTERVAL;</div><div class='ctx'> 	wiphy-&gt;max_sched_scan_ie_len = IEEE80211_MAX_DATA_LEN;</div><div class='ctx'> 	wiphy-&gt;max_scan_ie_len = MT76_CONNAC_SCAN_IE_LEN;</div><div class='ctx'> 	wiphy-&gt;max_sched_scan_ssids = MT76_CONNAC_MAX_SCHED_SCAN_SSID;</div><div class='hunk'>@@ -372,11 +396,15 @@ mt7615_init_wiphy(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_SET_SCAN_DWELL);</div><div class='ctx'> 	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_VHT_IBSS);</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CAN_REPLACE_PTK0);</div><div class='add'>+	if (!is_mt7622(&amp;phy-&gt;dev-&gt;mt76))</div><div class='add'>+		wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_MU_MIMO_AIR_SNIFFER);</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_hw_set(hw, SINGLE_SCAN_ON_ALL_BANDS);</div><div class='ctx'> 	ieee80211_hw_set(hw, TX_STATUS_NO_AMPDU_LEN);</div><div class='ctx'> 	ieee80211_hw_set(hw, WANT_MONITOR_VIF);</div><div class='ctx'> 	ieee80211_hw_set(hw, SUPPORTS_RX_DECAP_OFFLOAD);</div><div class='add'>+	ieee80211_hw_set(hw, SUPPORTS_VHT_EXT_NSS_BW);</div><div class='ctx'> </div><div class='ctx'> 	if (is_mt7615(&amp;phy-&gt;dev-&gt;mt76))</div><div class='ctx'> 		hw-&gt;max_tx_fragments = MT_TXP_MAX_BUF_NUM;</div><div class='hunk'>@@ -418,6 +446,85 @@ mt7615_cap_dbdc_disable(struct mt7615_dev *dev)</div><div class='ctx'> 	mt76_set_stream_caps(&amp;dev-&gt;mphy, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+u32 mt7615_reg_map(struct mt7615_dev *dev, u32 addr)</div><div class='add'>+{</div><div class='add'>+	u32 base, offset;</div><div class='add'>+</div><div class='add'>+	if (is_mt7663(&amp;dev-&gt;mt76)) {</div><div class='add'>+		base = addr &amp; MT7663_MCU_PCIE_REMAP_2_BASE;</div><div class='add'>+		offset = addr &amp; MT7663_MCU_PCIE_REMAP_2_OFFSET;</div><div class='add'>+	} else {</div><div class='add'>+		base = addr &amp; MT_MCU_PCIE_REMAP_2_BASE;</div><div class='add'>+		offset = addr &amp; MT_MCU_PCIE_REMAP_2_OFFSET;</div><div class='add'>+	}</div><div class='add'>+	mt76_wr(dev, MT_MCU_PCIE_REMAP_2, base);</div><div class='add'>+</div><div class='add'>+	return MT_PCIE_REMAP_BASE_2 + offset;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7615_reg_map);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7615_led_set_config(struct led_classdev *led_cdev,</div><div class='add'>+		      u8 delay_on, u8 delay_off)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev;</div><div class='add'>+	struct mt76_phy *mphy;</div><div class='add'>+	u32 val, addr;</div><div class='add'>+	u8 index;</div><div class='add'>+</div><div class='add'>+	mphy = container_of(led_cdev, struct mt76_phy, leds.cdev);</div><div class='add'>+	dev = container_of(mphy-&gt;dev, struct mt7615_dev, mt76);</div><div class='add'>+</div><div class='add'>+	if (!mt76_connac_pm_ref(mphy, &amp;dev-&gt;pm))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_LED_STATUS_DURATION, 0xffff) |</div><div class='add'>+	      FIELD_PREP(MT_LED_STATUS_OFF, delay_off) |</div><div class='add'>+	      FIELD_PREP(MT_LED_STATUS_ON, delay_on);</div><div class='add'>+</div><div class='add'>+	index = dev-&gt;dbdc_support ? mphy-&gt;band_idx : mphy-&gt;leds.pin;</div><div class='add'>+	addr = mt7615_reg_map(dev, MT_LED_STATUS_0(index));</div><div class='add'>+	mt76_wr(dev, addr, val);</div><div class='add'>+	addr = mt7615_reg_map(dev, MT_LED_STATUS_1(index));</div><div class='add'>+	mt76_wr(dev, addr, val);</div><div class='add'>+</div><div class='add'>+	val = MT_LED_CTRL_REPLAY(index) | MT_LED_CTRL_KICK(index);</div><div class='add'>+	if (dev-&gt;mphy.leds.al)</div><div class='add'>+		val |= MT_LED_CTRL_POLARITY(index);</div><div class='add'>+	if (mphy-&gt;band_idx)</div><div class='add'>+		val |= MT_LED_CTRL_BAND(index);</div><div class='add'>+</div><div class='add'>+	addr = mt7615_reg_map(dev, MT_LED_CTRL);</div><div class='add'>+	mt76_wr(dev, addr, val);</div><div class='add'>+</div><div class='add'>+	mt76_connac_pm_unref(mphy, &amp;dev-&gt;pm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7615_led_set_blink(struct led_classdev *led_cdev,</div><div class='add'>+			 unsigned long *delay_on,</div><div class='add'>+			 unsigned long *delay_off)</div><div class='add'>+{</div><div class='add'>+	u8 delta_on, delta_off;</div><div class='add'>+</div><div class='add'>+	delta_off = max_t(u8, *delay_off / 10, 1);</div><div class='add'>+	delta_on = max_t(u8, *delay_on / 10, 1);</div><div class='add'>+</div><div class='add'>+	mt7615_led_set_config(led_cdev, delta_on, delta_off);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7615_led_set_blink);</div><div class='add'>+</div><div class='add'>+void mt7615_led_set_brightness(struct led_classdev *led_cdev,</div><div class='add'>+			       enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	if (!brightness)</div><div class='add'>+		mt7615_led_set_config(led_cdev, 0, 0xff);</div><div class='add'>+	else</div><div class='add'>+		mt7615_led_set_config(led_cdev, 0xff, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7615_led_set_brightness);</div><div class='add'>+</div><div class='ctx'> int mt7615_register_ext_phy(struct mt7615_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_phy *phy = mt7615_ext_phy(dev);</div><div class='hunk'>@@ -434,7 +541,7 @@ int mt7615_register_ext_phy(struct mt7615_dev *dev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	mt7615_cap_dbdc_enable(dev);</div><div class='del'>-	mphy = mt76_alloc_phy(&amp;dev-&gt;mt76, sizeof(*phy), &amp;mt7615_ops);</div><div class='add'>+	mphy = mt76_alloc_phy(&amp;dev-&gt;mt76, sizeof(*phy), &amp;mt7615_ops, MT_BAND1);</div><div class='ctx'> 	if (!mphy)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -463,7 +570,10 @@ int mt7615_register_ext_phy(struct mt7615_dev *dev)</div><div class='ctx'> 	       ETH_ALEN);</div><div class='ctx'> 	mphy-&gt;macaddr[0] |= 2;</div><div class='ctx'> 	mphy-&gt;macaddr[0] ^= BIT(7);</div><div class='del'>-	mt76_eeprom_override(mphy);</div><div class='add'>+</div><div class='add'>+	ret = mt76_eeprom_override(mphy);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* second phy can only handle 5 GHz */</div><div class='ctx'> 	mphy-&gt;cap.has_5ghz = true;</div><div class='hunk'>@@ -472,8 +582,14 @@ int mt7615_register_ext_phy(struct mt7615_dev *dev)</div><div class='ctx'> 	for (i = 0; i &lt;= MT_TXQ_PSD ; i++)</div><div class='ctx'> 		mphy-&gt;q_tx[i] = dev-&gt;mphy.q_tx[i];</div><div class='ctx'> </div><div class='del'>-	ret = mt76_register_phy(mphy, true, mt7615_rates,</div><div class='del'>-				ARRAY_SIZE(mt7615_rates));</div><div class='add'>+	/* init led callbacks */</div><div class='add'>+	if (IS_ENABLED(CONFIG_MT76_LEDS)) {</div><div class='add'>+		mphy-&gt;leds.cdev.brightness_set = mt7615_led_set_brightness;</div><div class='add'>+		mphy-&gt;leds.cdev.blink_set = mt7615_led_set_blink;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt76_register_phy(mphy, true, mt76_rates,</div><div class='add'>+				ARRAY_SIZE(mt76_rates));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		ieee80211_free_hw(mphy-&gt;hw);</div><div class='ctx'> </div><div class='hunk'>@@ -484,7 +600,7 @@ EXPORT_SYMBOL_GPL(mt7615_register_ext_phy);</div><div class='ctx'> void mt7615_unregister_ext_phy(struct mt7615_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_phy *phy = mt7615_ext_phy(dev);</div><div class='del'>-	struct mt76_phy *mphy = dev-&gt;mt76.phy2;</div><div class='add'>+	struct mt76_phy *mphy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='ctx'> </div><div class='ctx'> 	if (!phy)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -510,14 +626,11 @@ void mt7615_init_device(struct mt7615_dev *dev)</div><div class='ctx'> 	mutex_init(&amp;dev-&gt;pm.mutex);</div><div class='ctx'> 	init_waitqueue_head(&amp;dev-&gt;pm.wait);</div><div class='ctx'> 	spin_lock_init(&amp;dev-&gt;pm.txq_lock);</div><div class='del'>-	set_bit(MT76_STATE_PM, &amp;dev-&gt;mphy.state);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;dev-&gt;mphy.mac_work, mt7615_mac_work);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;dev-&gt;phy.scan_work, mt7615_scan_work);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;dev-&gt;coredump.work, mt7615_coredump_work);</div><div class='ctx'> 	skb_queue_head_init(&amp;dev-&gt;phy.scan_event_list);</div><div class='ctx'> 	skb_queue_head_init(&amp;dev-&gt;coredump.msg_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;dev-&gt;sta_poll_list);</div><div class='del'>-	spin_lock_init(&amp;dev-&gt;sta_poll_lock);</div><div class='ctx'> 	init_waitqueue_head(&amp;dev-&gt;reset_wait);</div><div class='ctx'> 	init_waitqueue_head(&amp;dev-&gt;phy.roc_wait);</div><div class='ctx'> </div><div class='hunk'>@@ -529,7 +642,6 @@ void mt7615_init_device(struct mt7615_dev *dev)</div><div class='ctx'> 	dev-&gt;pm.stats.last_wake_event = jiffies;</div><div class='ctx'> 	dev-&gt;pm.stats.last_doze_event = jiffies;</div><div class='ctx'> 	mt7615_cap_dbdc_disable(dev);</div><div class='del'>-	dev-&gt;phy.dfs_state = -1;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NL80211_TESTMODE</div><div class='ctx'> 	dev-&gt;mt76.test_ops = &amp;mt7615_testmode_ops;</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c<br/>index f81a17d56008..bd56cdb022a2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/mac.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/mac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/mac.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2019 MediaTek Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Ryder Lee &lt;ryder.lee@mediatek.com&gt;</div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #define to_rssi(field, rxv)		((FIELD_GET(field, rxv) - 220) / 2)</div><div class='ctx'> </div><div class='ctx'> static const struct mt7615_dfs_radar_spec etsi_radar_specs = {</div><div class='del'>-	.pulse_th = { 40, -10, -80, 800, 3360, 128, 5200 },</div><div class='add'>+	.pulse_th = { 110, -10, -80, 40, 5200, 128, 5200 },</div><div class='ctx'> 	.radar_pattern = {</div><div class='ctx'> 		[5] =  { 1, 0,  6, 32, 28, 0, 17,  990, 5010, 1, 1 },</div><div class='ctx'> 		[6] =  { 1, 0,  9, 32, 28, 0, 27,  615, 5010, 1, 1 },</div><div class='hunk'>@@ -34,7 +34,7 @@ static const struct mt7615_dfs_radar_spec etsi_radar_specs = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mt7615_dfs_radar_spec fcc_radar_specs = {</div><div class='del'>-	.pulse_th = { 40, -10, -80, 800, 3360, 128, 5200 },</div><div class='add'>+	.pulse_th = { 110, -10, -80, 40, 5200, 128, 5200 },</div><div class='ctx'> 	.radar_pattern = {</div><div class='ctx'> 		[0] = { 1, 0,  9,  32, 28, 0, 13, 508, 3076, 1,  1 },</div><div class='ctx'> 		[1] = { 1, 0, 12,  32, 28, 0, 17, 140,  240, 1,  1 },</div><div class='hunk'>@@ -45,7 +45,7 @@ static const struct mt7615_dfs_radar_spec fcc_radar_specs = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mt7615_dfs_radar_spec jp_radar_specs = {</div><div class='del'>-	.pulse_th = { 40, -10, -80, 800, 3360, 128, 5200 },</div><div class='add'>+	.pulse_th = { 110, -10, -80, 40, 5200, 128, 5200 },</div><div class='ctx'> 	.radar_pattern = {</div><div class='ctx'> 		[0] =  { 1, 0,  8, 32, 28, 0, 13,  508, 3076, 1,  1 },</div><div class='ctx'> 		[1] =  { 1, 0, 12, 32, 28, 0, 17,  140,  240, 1,  1 },</div><div class='hunk'>@@ -57,16 +57,40 @@ static const struct mt7615_dfs_radar_spec jp_radar_specs = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static enum mt76_cipher_type</div><div class='add'>+mt7615_mac_get_cipher(int cipher)</div><div class='add'>+{</div><div class='add'>+	switch (cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP40:</div><div class='add'>+		return MT_CIPHER_WEP40;</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP104:</div><div class='add'>+		return MT_CIPHER_WEP104;</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		return MT_CIPHER_TKIP;</div><div class='add'>+	case WLAN_CIPHER_SUITE_AES_CMAC:</div><div class='add'>+		return MT_CIPHER_BIP_CMAC_128;</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+		return MT_CIPHER_AES_CCMP;</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP_256:</div><div class='add'>+		return MT_CIPHER_CCMP_256;</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP:</div><div class='add'>+		return MT_CIPHER_GCMP;</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='add'>+		return MT_CIPHER_GCMP_256;</div><div class='add'>+	case WLAN_CIPHER_SUITE_SMS4:</div><div class='add'>+		return MT_CIPHER_WAPI;</div><div class='add'>+	default:</div><div class='add'>+		return MT_CIPHER_NONE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct mt76_wcid *mt7615_rx_get_wcid(struct mt7615_dev *dev,</div><div class='ctx'> 					    u8 idx, bool unicast)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_sta *sta;</div><div class='ctx'> 	struct mt76_wcid *wcid;</div><div class='ctx'> </div><div class='del'>-	if (idx &gt;= MT7615_WTBL_SIZE)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	wcid = rcu_dereference(dev-&gt;mt76.wcid[idx]);</div><div class='add'>+	wcid = mt76_wcid_ptr(dev, idx);</div><div class='ctx'> 	if (unicast || !wcid)</div><div class='ctx'> 		return wcid;</div><div class='ctx'> </div><div class='hunk'>@@ -80,8 +104,9 @@ static struct mt76_wcid *mt7615_rx_get_wcid(struct mt7615_dev *dev,</div><div class='ctx'> 	return &amp;sta-&gt;vif-&gt;sta.wcid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt7615_mac_reset_counters(struct mt7615_dev *dev)</div><div class='add'>+void mt7615_mac_reset_counters(struct mt7615_phy *phy)</div><div class='ctx'> {</div><div class='add'>+	struct mt7615_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='hunk'>@@ -89,10 +114,8 @@ void mt7615_mac_reset_counters(struct mt7615_dev *dev)</div><div class='ctx'> 		mt76_rr(dev, MT_TX_AGG_CNT(1, i));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(dev-&gt;mt76.aggr_stats, 0, sizeof(dev-&gt;mt76.aggr_stats));</div><div class='del'>-	dev-&gt;mt76.phy.survey_time = ktime_get_boottime();</div><div class='del'>-	if (dev-&gt;mt76.phy2)</div><div class='del'>-		dev-&gt;mt76.phy2-&gt;survey_time = ktime_get_boottime();</div><div class='add'>+	memset(phy-&gt;mt76-&gt;aggr_stats, 0, sizeof(phy-&gt;mt76-&gt;aggr_stats));</div><div class='add'>+	phy-&gt;mt76-&gt;survey_time = ktime_get_boottime();</div><div class='ctx'> </div><div class='ctx'> 	/* reset airtime counters */</div><div class='ctx'> 	mt76_rr(dev, MT_MIB_SDR9(0));</div><div class='hunk'>@@ -222,20 +245,104 @@ static void mt7615_mac_fill_tm_rx(struct mt7615_phy *phy, __le32 *rxv)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* The HW does not translate the mac header to 802.3 for mesh point */</div><div class='add'>+static int mt7615_reverse_frag0_hdr_trans(struct sk_buff *skb, u16 hdr_gap)</div><div class='add'>+{</div><div class='add'>+	struct mt76_rx_status *status = (struct mt76_rx_status *)skb-&gt;cb;</div><div class='add'>+	struct ethhdr *eth_hdr = (struct ethhdr *)(skb-&gt;data + hdr_gap);</div><div class='add'>+	struct mt7615_sta *msta = (struct mt7615_sta *)status-&gt;wcid;</div><div class='add'>+	__le32 *rxd = (__le32 *)skb-&gt;data;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct ieee80211_hdr hdr;</div><div class='add'>+	u16 frame_control;</div><div class='add'>+</div><div class='add'>+	if (le32_get_bits(rxd[1], MT_RXD1_NORMAL_ADDR_TYPE) !=</div><div class='add'>+	    MT_RXD1_NORMAL_U2M)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!(le32_to_cpu(rxd[0]) &amp; MT_RXD0_NORMAL_GROUP_4))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!msta || !msta-&gt;vif)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	sta = container_of((void *)msta, struct ieee80211_sta, drv_priv);</div><div class='add'>+	vif = container_of((void *)msta-&gt;vif, struct ieee80211_vif, drv_priv);</div><div class='add'>+</div><div class='add'>+	/* store the info from RXD and ethhdr to avoid being overridden */</div><div class='add'>+	frame_control = le32_get_bits(rxd[4], MT_RXD4_FRAME_CONTROL);</div><div class='add'>+	hdr.frame_control = cpu_to_le16(frame_control);</div><div class='add'>+	hdr.seq_ctrl = cpu_to_le16(le32_get_bits(rxd[6], MT_RXD6_SEQ_CTRL));</div><div class='add'>+	hdr.duration_id = 0;</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(hdr.addr1, vif-&gt;addr);</div><div class='add'>+	ether_addr_copy(hdr.addr2, sta-&gt;addr);</div><div class='add'>+	switch (frame_control &amp; (IEEE80211_FCTL_TODS |</div><div class='add'>+				 IEEE80211_FCTL_FROMDS)) {</div><div class='add'>+	case 0:</div><div class='add'>+		ether_addr_copy(hdr.addr3, vif-&gt;bss_conf.bssid);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_FCTL_FROMDS:</div><div class='add'>+		ether_addr_copy(hdr.addr3, eth_hdr-&gt;h_source);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_FCTL_TODS:</div><div class='add'>+		ether_addr_copy(hdr.addr3, eth_hdr-&gt;h_dest);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS:</div><div class='add'>+		ether_addr_copy(hdr.addr3, eth_hdr-&gt;h_dest);</div><div class='add'>+		ether_addr_copy(hdr.addr4, eth_hdr-&gt;h_source);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, hdr_gap + sizeof(struct ethhdr) - 2);</div><div class='add'>+	if (eth_hdr-&gt;h_proto == cpu_to_be16(ETH_P_AARP) ||</div><div class='add'>+	    eth_hdr-&gt;h_proto == cpu_to_be16(ETH_P_IPX))</div><div class='add'>+		ether_addr_copy(skb_push(skb, ETH_ALEN), bridge_tunnel_header);</div><div class='add'>+	else if (be16_to_cpu(eth_hdr-&gt;h_proto) &gt;= ETH_P_802_3_MIN)</div><div class='add'>+		ether_addr_copy(skb_push(skb, ETH_ALEN), rfc1042_header);</div><div class='add'>+	else</div><div class='add'>+		skb_pull(skb, 2);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_has_order(hdr.frame_control))</div><div class='add'>+		memcpy(skb_push(skb, IEEE80211_HT_CTL_LEN), &amp;rxd[7],</div><div class='add'>+		       IEEE80211_HT_CTL_LEN);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_data_qos(hdr.frame_control)) {</div><div class='add'>+		__le16 qos_ctrl;</div><div class='add'>+</div><div class='add'>+		qos_ctrl = cpu_to_le16(le32_get_bits(rxd[6], MT_RXD6_QOS_CTL));</div><div class='add'>+		memcpy(skb_push(skb, IEEE80211_QOS_CTL_LEN), &amp;qos_ctrl,</div><div class='add'>+		       IEEE80211_QOS_CTL_LEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ieee80211_has_a4(hdr.frame_control))</div><div class='add'>+		memcpy(skb_push(skb, sizeof(hdr)), &amp;hdr, sizeof(hdr));</div><div class='add'>+	else</div><div class='add'>+		memcpy(skb_push(skb, sizeof(hdr) - 6), &amp;hdr, sizeof(hdr) - 6);</div><div class='add'>+</div><div class='add'>+	status-&gt;flag &amp;= ~(RX_FLAG_RADIOTAP_HE | RX_FLAG_RADIOTAP_HE_MU);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_rx_status *status = (struct mt76_rx_status *)skb-&gt;cb;</div><div class='ctx'> 	struct mt76_phy *mphy = &amp;dev-&gt;mt76.phy;</div><div class='ctx'> 	struct mt7615_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	struct mt7615_phy *phy2 = dev-&gt;mt76.phy2 ? dev-&gt;mt76.phy2-&gt;priv : NULL;</div><div class='ctx'> 	struct ieee80211_supported_band *sband;</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='add'>+	struct mt7615_phy *phy2;</div><div class='ctx'> 	__le32 *rxd = (__le32 *)skb-&gt;data;</div><div class='ctx'> 	u32 rxd0 = le32_to_cpu(rxd[0]);</div><div class='ctx'> 	u32 rxd1 = le32_to_cpu(rxd[1]);</div><div class='ctx'> 	u32 rxd2 = le32_to_cpu(rxd[2]);</div><div class='ctx'> 	u32 csum_mask = MT_RXD0_NORMAL_IP_SUM | MT_RXD0_NORMAL_UDP_TCP_SUM;</div><div class='add'>+	u32 csum_status = *(u32 *)skb-&gt;cb;</div><div class='ctx'> 	bool unicast, hdr_trans, remove_pad, insert_ccmp_hdr = false;</div><div class='add'>+	u16 hdr_gap;</div><div class='ctx'> 	int phy_idx;</div><div class='ctx'> 	int i, idx;</div><div class='ctx'> 	u8 chfreq, amsdu_info, qos_ctl = 0;</div><div class='hunk'>@@ -245,6 +352,8 @@ static int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	memset(status, 0, sizeof(*status));</div><div class='ctx'> </div><div class='ctx'> 	chfreq = FIELD_GET(MT_RXD1_NORMAL_CH_FREQ, rxd1);</div><div class='add'>+</div><div class='add'>+	phy2 = dev-&gt;mt76.phys[MT_BAND1] ? dev-&gt;mt76.phys[MT_BAND1]-&gt;priv : NULL;</div><div class='ctx'> 	if (!phy2)</div><div class='ctx'> 		phy_idx = 0;</div><div class='ctx'> 	else if (phy2-&gt;chfreq == phy-&gt;chfreq)</div><div class='hunk'>@@ -259,22 +368,27 @@ static int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	if (rxd2 &amp; MT_RXD2_NORMAL_AMSDU_ERR)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	hdr_trans = rxd1 &amp; MT_RXD1_NORMAL_HDR_TRANS;</div><div class='add'>+	if (hdr_trans &amp;&amp; (rxd2 &amp; MT_RXD2_NORMAL_CM))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* ICV error or CCMP/BIP/WPI MIC error */</div><div class='add'>+	if (rxd2 &amp; MT_RXD2_NORMAL_ICV_ERR)</div><div class='add'>+		status-&gt;flag |= RX_FLAG_ONLY_MONITOR;</div><div class='add'>+</div><div class='ctx'> 	unicast = (rxd1 &amp; MT_RXD1_NORMAL_ADDR_TYPE) == MT_RXD1_NORMAL_U2M;</div><div class='ctx'> 	idx = FIELD_GET(MT_RXD2_NORMAL_WLAN_IDX, rxd2);</div><div class='del'>-	hdr_trans = rxd1 &amp; MT_RXD1_NORMAL_HDR_TRANS;</div><div class='ctx'> 	status-&gt;wcid = mt7615_rx_get_wcid(dev, idx, unicast);</div><div class='ctx'> </div><div class='ctx'> 	if (status-&gt;wcid) {</div><div class='ctx'> 		struct mt7615_sta *msta;</div><div class='ctx'> </div><div class='ctx'> 		msta = container_of(status-&gt;wcid, struct mt7615_sta, wcid);</div><div class='del'>-		spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-		if (list_empty(&amp;msta-&gt;poll_list))</div><div class='del'>-			list_add_tail(&amp;msta-&gt;poll_list, &amp;dev-&gt;sta_poll_list);</div><div class='del'>-		spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+		mt76_wcid_add_poll(&amp;dev-&gt;mt76, &amp;msta-&gt;wcid);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((rxd0 &amp; csum_mask) == csum_mask)</div><div class='add'>+	if (mt76_is_mmio(&amp;dev-&gt;mt76) &amp;&amp; (rxd0 &amp; csum_mask) == csum_mask &amp;&amp;</div><div class='add'>+	    !(csum_status &amp; (BIT(0) | BIT(2) | BIT(3))))</div><div class='ctx'> 		skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='ctx'> </div><div class='ctx'> 	if (rxd2 &amp; MT_RXD2_NORMAL_FCS_ERR)</div><div class='hunk'>@@ -313,14 +427,27 @@ static int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 		u8 *data = (u8 *)rxd;</div><div class='ctx'> </div><div class='ctx'> 		if (status-&gt;flag &amp; RX_FLAG_DECRYPTED) {</div><div class='del'>-			status-&gt;iv[0] = data[5];</div><div class='del'>-			status-&gt;iv[1] = data[4];</div><div class='del'>-			status-&gt;iv[2] = data[3];</div><div class='del'>-			status-&gt;iv[3] = data[2];</div><div class='del'>-			status-&gt;iv[4] = data[1];</div><div class='del'>-			status-&gt;iv[5] = data[0];</div><div class='del'>-</div><div class='del'>-			insert_ccmp_hdr = FIELD_GET(MT_RXD2_NORMAL_FRAG, rxd2);</div><div class='add'>+			switch (FIELD_GET(MT_RXD2_NORMAL_SEC_MODE, rxd2)) {</div><div class='add'>+			case MT_CIPHER_AES_CCMP:</div><div class='add'>+			case MT_CIPHER_CCMP_CCX:</div><div class='add'>+			case MT_CIPHER_CCMP_256:</div><div class='add'>+				insert_ccmp_hdr =</div><div class='add'>+					FIELD_GET(MT_RXD2_NORMAL_FRAG, rxd2);</div><div class='add'>+				fallthrough;</div><div class='add'>+			case MT_CIPHER_TKIP:</div><div class='add'>+			case MT_CIPHER_TKIP_NO_MIC:</div><div class='add'>+			case MT_CIPHER_GCMP:</div><div class='add'>+			case MT_CIPHER_GCMP_256:</div><div class='add'>+				status-&gt;iv[0] = data[5];</div><div class='add'>+				status-&gt;iv[1] = data[4];</div><div class='add'>+				status-&gt;iv[2] = data[3];</div><div class='add'>+				status-&gt;iv[3] = data[2];</div><div class='add'>+				status-&gt;iv[4] = data[1];</div><div class='add'>+				status-&gt;iv[5] = data[0];</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		rxd += 4;</div><div class='ctx'> 		if ((u8 *)rxd - skb-&gt;data &gt;= skb-&gt;len)</div><div class='hunk'>@@ -368,9 +495,9 @@ static int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (phy_idx == 1 &amp;&amp; phy2) {</div><div class='del'>-		mphy = dev-&gt;mt76.phy2;</div><div class='add'>+		mphy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='ctx'> 		phy = phy2;</div><div class='del'>-		status-&gt;ext_phy = true;</div><div class='add'>+		status-&gt;phy_idx = phy_idx;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!mt7615_firmware_offload(dev) &amp;&amp; chfreq != phy-&gt;chfreq)</div><div class='hunk'>@@ -446,15 +573,6 @@ static int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 		status-&gt;chain_signal[1] = to_rssi(MT_RXV4_RCPI1, rxdg3);</div><div class='ctx'> 		status-&gt;chain_signal[2] = to_rssi(MT_RXV4_RCPI2, rxdg3);</div><div class='ctx'> 		status-&gt;chain_signal[3] = to_rssi(MT_RXV4_RCPI3, rxdg3);</div><div class='del'>-		status-&gt;signal = status-&gt;chain_signal[0];</div><div class='del'>-</div><div class='del'>-		for (i = 1; i &lt; hweight8(mphy-&gt;antenna_mask); i++) {</div><div class='del'>-			if (!(status-&gt;chains &amp; BIT(i)))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			status-&gt;signal = max(status-&gt;signal,</div><div class='del'>-					     status-&gt;chain_signal[i]);</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		mt7615_mac_fill_tm_rx(mphy-&gt;priv, rxd);</div><div class='ctx'> </div><div class='hunk'>@@ -463,16 +581,42 @@ static int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb_pull(skb, (u8 *)rxd - skb-&gt;data + 2 * remove_pad);</div><div class='del'>-</div><div class='ctx'> 	amsdu_info = FIELD_GET(MT_RXD1_NORMAL_PAYLOAD_FORMAT, rxd1);</div><div class='ctx'> 	status-&gt;amsdu = !!amsdu_info;</div><div class='ctx'> 	if (status-&gt;amsdu) {</div><div class='ctx'> 		status-&gt;first_amsdu = amsdu_info == MT_RXD1_FIRST_AMSDU_FRAME;</div><div class='ctx'> 		status-&gt;last_amsdu = amsdu_info == MT_RXD1_LAST_AMSDU_FRAME;</div><div class='del'>-		if (!hdr_trans) {</div><div class='del'>-			memmove(skb-&gt;data + 2, skb-&gt;data,</div><div class='del'>-				ieee80211_get_hdrlen_from_skb(skb));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr_gap = (u8 *)rxd - skb-&gt;data + 2 * remove_pad;</div><div class='add'>+	if (hdr_trans &amp;&amp; ieee80211_has_morefrags(fc)) {</div><div class='add'>+		if (mt7615_reverse_frag0_hdr_trans(skb, hdr_gap))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		hdr_trans = false;</div><div class='add'>+	} else {</div><div class='add'>+		int pad_start = 0;</div><div class='add'>+</div><div class='add'>+		skb_pull(skb, hdr_gap);</div><div class='add'>+		if (!hdr_trans &amp;&amp; status-&gt;amsdu) {</div><div class='add'>+			pad_start = ieee80211_get_hdrlen_from_skb(skb);</div><div class='add'>+		} else if (hdr_trans &amp;&amp; (rxd2 &amp; MT_RXD2_NORMAL_HDR_TRANS_ERROR)) {</div><div class='add'>+			/*</div><div class='add'>+			 * When header translation failure is indicated,</div><div class='add'>+			 * the hardware will insert an extra 2-byte field</div><div class='add'>+			 * containing the data length after the protocol</div><div class='add'>+			 * type field. This happens either when the LLC-SNAP</div><div class='add'>+			 * pattern did not match, or if a VLAN header was</div><div class='add'>+			 * detected.</div><div class='add'>+			 */</div><div class='add'>+			pad_start = 12;</div><div class='add'>+			if (get_unaligned_be16(skb-&gt;data + pad_start) == ETH_P_8021Q)</div><div class='add'>+				pad_start += 4;</div><div class='add'>+			else</div><div class='add'>+				pad_start = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (pad_start) {</div><div class='add'>+			memmove(skb-&gt;data + 2, skb-&gt;data, pad_start);</div><div class='ctx'> 			skb_pull(skb, 2);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -505,11 +649,6 @@ static int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt7615_sta_ps(struct mt76_dev *mdev, struct ieee80211_sta *sta, bool ps)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(mt7615_sta_ps);</div><div class='del'>-</div><div class='ctx'> static u16</div><div class='ctx'> mt7615_mac_tx_rate_val(struct mt7615_dev *dev,</div><div class='ctx'> 		       struct mt76_phy *mphy,</div><div class='hunk'>@@ -570,13 +709,14 @@ mt7615_mac_tx_rate_val(struct mt7615_dev *dev,</div><div class='ctx'> int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi,</div><div class='ctx'> 			  struct sk_buff *skb, struct mt76_wcid *wcid,</div><div class='ctx'> 			  struct ieee80211_sta *sta, int pid,</div><div class='del'>-			  struct ieee80211_key_conf *key, bool beacon)</div><div class='add'>+			  struct ieee80211_key_conf *key,</div><div class='add'>+			  enum mt76_txq_id qid, bool beacon)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='ctx'> 	u8 fc_type, fc_stype, p_fmt, q_idx, omac_idx = 0, wmm_idx = 0;</div><div class='ctx'> 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='ctx'> 	struct ieee80211_tx_rate *rate = &amp;info-&gt;control.rates[0];</div><div class='del'>-	bool ext_phy = info-&gt;hw_queue &amp; MT_TX_HW_QUEUE_EXT_PHY;</div><div class='add'>+	u8 phy_idx = (info-&gt;hw_queue &amp; MT_TX_HW_QUEUE_PHY) &gt;&gt; 2;</div><div class='ctx'> 	bool multicast = is_multicast_ether_addr(hdr-&gt;addr1);</div><div class='ctx'> 	struct ieee80211_vif *vif = info-&gt;control.vif;</div><div class='ctx'> 	bool is_mmio = mt76_is_mmio(&amp;dev-&gt;mt76);</div><div class='hunk'>@@ -587,7 +727,7 @@ int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi,</div><div class='ctx'> 	u16 seqno = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (vif) {</div><div class='del'>-		struct mt76_vif *mvif = (struct mt76_vif *)vif-&gt;drv_priv;</div><div class='add'>+		struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='ctx'> </div><div class='ctx'> 		omac_idx = mvif-&gt;omac_idx;</div><div class='ctx'> 		wmm_idx = mvif-&gt;wmm_idx;</div><div class='hunk'>@@ -599,18 +739,18 @@ int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi,</div><div class='ctx'> 		tx_count = msta-&gt;rate_count;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ext_phy &amp;&amp; dev-&gt;mt76.phy2)</div><div class='del'>-		mphy = dev-&gt;mt76.phy2;</div><div class='add'>+	if (phy_idx &amp;&amp; dev-&gt;mt76.phys[MT_BAND1])</div><div class='add'>+		mphy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='ctx'> </div><div class='ctx'> 	fc_type = (le16_to_cpu(fc) &amp; IEEE80211_FCTL_FTYPE) &gt;&gt; 2;</div><div class='ctx'> 	fc_stype = (le16_to_cpu(fc) &amp; IEEE80211_FCTL_STYPE) &gt;&gt; 4;</div><div class='ctx'> </div><div class='ctx'> 	if (beacon) {</div><div class='ctx'> 		p_fmt = MT_TX_TYPE_FW;</div><div class='del'>-		q_idx = ext_phy ? MT_LMAC_BCN1 : MT_LMAC_BCN0;</div><div class='del'>-	} else if (skb_get_queue_mapping(skb) &gt;= MT_TXQ_PSD) {</div><div class='add'>+		q_idx = phy_idx ? MT_LMAC_BCN1 : MT_LMAC_BCN0;</div><div class='add'>+	} else if (qid &gt;= MT_TXQ_PSD) {</div><div class='ctx'> 		p_fmt = is_mmio ? MT_TX_TYPE_CT : MT_TX_TYPE_SF;</div><div class='del'>-		q_idx = ext_phy ? MT_LMAC_ALTX1 : MT_LMAC_ALTX0;</div><div class='add'>+		q_idx = phy_idx ? MT_LMAC_ALTX1 : MT_LMAC_ALTX0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		p_fmt = is_mmio ? MT_TX_TYPE_CT : MT_TX_TYPE_SF;</div><div class='ctx'> 		q_idx = wmm_idx * MT7615_MAX_WMM_SETS +</div><div class='hunk'>@@ -715,71 +855,20 @@ int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi,</div><div class='ctx'> 	if (info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)</div><div class='ctx'> 		txwi[3] |= cpu_to_le32(MT_TXD3_NO_ACK);</div><div class='ctx'> </div><div class='del'>-	txwi[7] = FIELD_PREP(MT_TXD7_TYPE, fc_type) |</div><div class='del'>-		  FIELD_PREP(MT_TXD7_SUB_TYPE, fc_stype) |</div><div class='del'>-		  FIELD_PREP(MT_TXD7_SPE_IDX, 0x18);</div><div class='del'>-	if (!is_mmio)</div><div class='del'>-		txwi[8] = FIELD_PREP(MT_TXD8_L_TYPE, fc_type) |</div><div class='del'>-			  FIELD_PREP(MT_TXD8_L_SUB_TYPE, fc_stype);</div><div class='add'>+	val = FIELD_PREP(MT_TXD7_TYPE, fc_type) |</div><div class='add'>+	      FIELD_PREP(MT_TXD7_SUB_TYPE, fc_stype) |</div><div class='add'>+	      FIELD_PREP(MT_TXD7_SPE_IDX, 0x18);</div><div class='add'>+	txwi[7] = cpu_to_le32(val);</div><div class='add'>+	if (!is_mmio) {</div><div class='add'>+		val = FIELD_PREP(MT_TXD8_L_TYPE, fc_type) |</div><div class='add'>+		      FIELD_PREP(MT_TXD8_L_SUB_TYPE, fc_stype);</div><div class='add'>+		txwi[8] = cpu_to_le32(val);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt7615_mac_write_txwi);</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7615_txp_skb_unmap_fw(struct mt76_dev *dev, struct mt7615_fw_txp *txp)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; txp-&gt;nbuf; i++)</div><div class='del'>-		dma_unmap_single(dev-&gt;dev, le32_to_cpu(txp-&gt;buf[i]),</div><div class='del'>-				 le16_to_cpu(txp-&gt;len[i]), DMA_TO_DEVICE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt7615_txp_skb_unmap_hw(struct mt76_dev *dev, struct mt7615_hw_txp *txp)</div><div class='del'>-{</div><div class='del'>-	u32 last_mask;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	last_mask = is_mt7663(dev) ? MT_TXD_LEN_LAST : MT_TXD_LEN_MSDU_LAST;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(txp-&gt;ptr); i++) {</div><div class='del'>-		struct mt7615_txp_ptr *ptr = &amp;txp-&gt;ptr[i];</div><div class='del'>-		bool last;</div><div class='del'>-		u16 len;</div><div class='del'>-</div><div class='del'>-		len = le16_to_cpu(ptr-&gt;len0);</div><div class='del'>-		last = len &amp; last_mask;</div><div class='del'>-		len &amp;= MT_TXD_LEN_MASK;</div><div class='del'>-		dma_unmap_single(dev-&gt;dev, le32_to_cpu(ptr-&gt;buf0), len,</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-		if (last)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		len = le16_to_cpu(ptr-&gt;len1);</div><div class='del'>-		last = len &amp; last_mask;</div><div class='del'>-		len &amp;= MT_TXD_LEN_MASK;</div><div class='del'>-		dma_unmap_single(dev-&gt;dev, le32_to_cpu(ptr-&gt;buf1), len,</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-		if (last)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mt7615_txp_skb_unmap(struct mt76_dev *dev,</div><div class='del'>-			  struct mt76_txwi_cache *t)</div><div class='del'>-{</div><div class='del'>-	struct mt7615_txp_common *txp;</div><div class='del'>-</div><div class='del'>-	txp = mt7615_txwi_to_txp(dev, t);</div><div class='del'>-	if (is_mt7615(dev))</div><div class='del'>-		mt7615_txp_skb_unmap_fw(dev, &amp;txp-&gt;fw);</div><div class='del'>-	else</div><div class='del'>-		mt7615_txp_skb_unmap_hw(dev, &amp;txp-&gt;hw);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(mt7615_txp_skb_unmap);</div><div class='del'>-</div><div class='ctx'> bool mt7615_mac_wtbl_update(struct mt7615_dev *dev, int idx, u32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	mt76_rmw(dev, MT_WTBL_UPDATE, MT_WTBL_UPDATE_WLAN_IDX,</div><div class='hunk'>@@ -810,16 +899,19 @@ void mt7615_mac_sta_poll(struct mt7615_dev *dev)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;sta_poll_list);</div><div class='del'>-	spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-	list_splice_init(&amp;dev-&gt;sta_poll_list, &amp;sta_poll_list);</div><div class='del'>-	spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='add'>+	list_splice_init(&amp;dev-&gt;mt76.sta_poll_list, &amp;sta_poll_list);</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;sta_poll_list)) {</div><div class='ctx'> 		bool clear = false;</div><div class='ctx'> </div><div class='ctx'> 		msta = list_first_entry(&amp;sta_poll_list, struct mt7615_sta,</div><div class='del'>-					poll_list);</div><div class='del'>-		list_del_init(&amp;msta-&gt;poll_list);</div><div class='add'>+					wcid.poll_list);</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='add'>+		list_del_init(&amp;msta-&gt;wcid.poll_list);</div><div class='add'>+		spin_unlock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='ctx'> </div><div class='ctx'> 		addr = mt7615_mac_wtbl_addr(dev, msta-&gt;wcid.idx) + 19 * 4;</div><div class='ctx'> </div><div class='hunk'>@@ -988,7 +1080,7 @@ u32 mt7615_mac_get_sta_tid_sn(struct mt7615_dev *dev, int wcid, u8 tid)</div><div class='ctx'> 	offset %= 32;</div><div class='ctx'> </div><div class='ctx'> 	val = mt76_rr(dev, addr);</div><div class='del'>-	val &gt;&gt;= (tid % 32);</div><div class='add'>+	val &gt;&gt;= offset;</div><div class='ctx'> </div><div class='ctx'> 	if (offset &gt; 20) {</div><div class='ctx'> 		addr += 4;</div><div class='hunk'>@@ -1062,7 +1154,7 @@ void mt7615_mac_set_rates(struct mt7615_phy *phy, struct mt7615_sta *sta,</div><div class='ctx'> 	idx = idx &gt; HW_BSSID_MAX ? HW_BSSID_0 : idx;</div><div class='ctx'> 	addr = idx &gt; 1 ? MT_LPON_TCR2(idx): MT_LPON_TCR0(idx);</div><div class='ctx'> </div><div class='del'>-	mt76_set(dev, addr, MT_LPON_TCR_MODE); /* TSF read */</div><div class='add'>+	mt76_rmw(dev, addr, MT_LPON_TCR_MODE, MT_LPON_TCR_READ); /* TSF read */</div><div class='ctx'> 	sta-&gt;rate_set_tsf = mt76_rr(dev, MT_LPON_UTTR0) &amp; ~BIT(0);</div><div class='ctx'> 	sta-&gt;rate_set_tsf |= rd.rateset;</div><div class='ctx'> </div><div class='hunk'>@@ -1075,11 +1167,25 @@ void mt7615_mac_set_rates(struct mt7615_phy *phy, struct mt7615_sta *sta,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt7615_mac_set_rates);</div><div class='ctx'> </div><div class='add'>+void mt7615_mac_enable_rtscts(struct mt7615_dev *dev,</div><div class='add'>+			      struct ieee80211_vif *vif, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='add'>+	u32 addr;</div><div class='add'>+</div><div class='add'>+	addr = mt7615_mac_wtbl_addr(dev, mvif-&gt;sta.wcid.idx) + 3 * 4;</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		mt76_set(dev, addr, MT_WTBL_W3_RTS);</div><div class='add'>+	else</div><div class='add'>+		mt76_clear(dev, addr, MT_WTBL_W3_RTS);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7615_mac_enable_rtscts);</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> mt7615_mac_wtbl_update_key(struct mt7615_dev *dev, struct mt76_wcid *wcid,</div><div class='ctx'> 			   struct ieee80211_key_conf *key,</div><div class='del'>-			   enum mt7615_cipher_type cipher, u16 cipher_mask,</div><div class='del'>-			   enum set_key_cmd cmd)</div><div class='add'>+			   enum mt76_cipher_type cipher, u16 cipher_mask)</div><div class='ctx'> {</div><div class='ctx'> 	u32 addr = mt7615_mac_wtbl_addr(dev, wcid-&gt;idx) + 30 * 4;</div><div class='ctx'> 	u8 data[32] = {};</div><div class='hunk'>@@ -1088,27 +1194,18 @@ mt7615_mac_wtbl_update_key(struct mt7615_dev *dev, struct mt76_wcid *wcid,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mt76_rr_copy(dev, addr, data, sizeof(data));</div><div class='del'>-	if (cmd == SET_KEY) {</div><div class='del'>-		if (cipher == MT_CIPHER_TKIP) {</div><div class='del'>-			/* Rx/Tx MIC keys are swapped */</div><div class='del'>-			memcpy(data, key-&gt;key, 16);</div><div class='del'>-			memcpy(data + 16, key-&gt;key + 24, 8);</div><div class='del'>-			memcpy(data + 24, key-&gt;key + 16, 8);</div><div class='del'>-		} else {</div><div class='del'>-			if (cipher_mask == BIT(cipher))</div><div class='del'>-				memcpy(data, key-&gt;key, key-&gt;keylen);</div><div class='del'>-			else if (cipher != MT_CIPHER_BIP_CMAC_128)</div><div class='del'>-				memcpy(data, key-&gt;key, 16);</div><div class='del'>-			if (cipher == MT_CIPHER_BIP_CMAC_128)</div><div class='del'>-				memcpy(data + 16, key-&gt;key, 16);</div><div class='del'>-		}</div><div class='add'>+	if (cipher == MT_CIPHER_TKIP) {</div><div class='add'>+		/* Rx/Tx MIC keys are swapped */</div><div class='add'>+		memcpy(data, key-&gt;key, 16);</div><div class='add'>+		memcpy(data + 16, key-&gt;key + 24, 8);</div><div class='add'>+		memcpy(data + 24, key-&gt;key + 16, 8);</div><div class='ctx'> 	} else {</div><div class='add'>+		if (cipher_mask == BIT(cipher))</div><div class='add'>+			memcpy(data, key-&gt;key, key-&gt;keylen);</div><div class='add'>+		else if (cipher != MT_CIPHER_BIP_CMAC_128)</div><div class='add'>+			memcpy(data, key-&gt;key, 16);</div><div class='ctx'> 		if (cipher == MT_CIPHER_BIP_CMAC_128)</div><div class='del'>-			memset(data + 16, 0, 16);</div><div class='del'>-		else if (cipher_mask)</div><div class='del'>-			memset(data, 0, 16);</div><div class='del'>-		if (!cipher_mask)</div><div class='del'>-			memset(data, 0, sizeof(data));</div><div class='add'>+			memcpy(data + 16, key-&gt;key, 16);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mt76_wr_copy(dev, addr, data, sizeof(data));</div><div class='hunk'>@@ -1118,8 +1215,8 @@ mt7615_mac_wtbl_update_key(struct mt7615_dev *dev, struct mt76_wcid *wcid,</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> mt7615_mac_wtbl_update_pk(struct mt7615_dev *dev, struct mt76_wcid *wcid,</div><div class='del'>-			  enum mt7615_cipher_type cipher, u16 cipher_mask,</div><div class='del'>-			  int keyidx, enum set_key_cmd cmd)</div><div class='add'>+			  enum mt76_cipher_type cipher, u16 cipher_mask,</div><div class='add'>+			  int keyidx)</div><div class='ctx'> {</div><div class='ctx'> 	u32 addr = mt7615_mac_wtbl_addr(dev, wcid-&gt;idx), w0, w1;</div><div class='ctx'> </div><div class='hunk'>@@ -1138,9 +1235,7 @@ mt7615_mac_wtbl_update_pk(struct mt7615_dev *dev, struct mt76_wcid *wcid,</div><div class='ctx'> 	else</div><div class='ctx'> 		w0 &amp;= ~MT_WTBL_W0_RX_IK_VALID;</div><div class='ctx'> </div><div class='del'>-	if (cmd == SET_KEY &amp;&amp;</div><div class='del'>-	    (cipher != MT_CIPHER_BIP_CMAC_128 ||</div><div class='del'>-	     cipher_mask == BIT(cipher))) {</div><div class='add'>+	if (cipher != MT_CIPHER_BIP_CMAC_128 || cipher_mask == BIT(cipher)) {</div><div class='ctx'> 		w0 &amp;= ~MT_WTBL_W0_KEY_IDX;</div><div class='ctx'> 		w0 |= FIELD_PREP(MT_WTBL_W0_KEY_IDX, keyidx);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1157,19 +1252,10 @@ mt7615_mac_wtbl_update_pk(struct mt7615_dev *dev, struct mt76_wcid *wcid,</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mt7615_mac_wtbl_update_cipher(struct mt7615_dev *dev, struct mt76_wcid *wcid,</div><div class='del'>-			      enum mt7615_cipher_type cipher, u16 cipher_mask,</div><div class='del'>-			      enum set_key_cmd cmd)</div><div class='add'>+			      enum mt76_cipher_type cipher, u16 cipher_mask)</div><div class='ctx'> {</div><div class='ctx'> 	u32 addr = mt7615_mac_wtbl_addr(dev, wcid-&gt;idx);</div><div class='ctx'> </div><div class='del'>-	if (!cipher_mask) {</div><div class='del'>-		mt76_clear(dev, addr + 2 * 4, MT_WTBL_W2_KEY_TYPE);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cmd != SET_KEY)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	if (cipher == MT_CIPHER_BIP_CMAC_128 &amp;&amp;</div><div class='ctx'> 	    cipher_mask &amp; ~BIT(MT_CIPHER_BIP_CMAC_128))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1180,10 +1266,9 @@ mt7615_mac_wtbl_update_cipher(struct mt7615_dev *dev, struct mt76_wcid *wcid,</div><div class='ctx'> </div><div class='ctx'> int __mt7615_mac_wtbl_set_key(struct mt7615_dev *dev,</div><div class='ctx'> 			      struct mt76_wcid *wcid,</div><div class='del'>-			      struct ieee80211_key_conf *key,</div><div class='del'>-			      enum set_key_cmd cmd)</div><div class='add'>+			      struct ieee80211_key_conf *key)</div><div class='ctx'> {</div><div class='del'>-	enum mt7615_cipher_type cipher;</div><div class='add'>+	enum mt76_cipher_type cipher;</div><div class='ctx'> 	u16 cipher_mask = wcid-&gt;cipher;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -1191,19 +1276,14 @@ int __mt7615_mac_wtbl_set_key(struct mt7615_dev *dev,</div><div class='ctx'> 	if (cipher == MT_CIPHER_NONE)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (cmd == SET_KEY)</div><div class='del'>-		cipher_mask |= BIT(cipher);</div><div class='del'>-	else</div><div class='del'>-		cipher_mask &amp;= ~BIT(cipher);</div><div class='del'>-</div><div class='del'>-	mt7615_mac_wtbl_update_cipher(dev, wcid, cipher, cipher_mask, cmd);</div><div class='del'>-	err = mt7615_mac_wtbl_update_key(dev, wcid, key, cipher, cipher_mask,</div><div class='del'>-					 cmd);</div><div class='add'>+	cipher_mask |= BIT(cipher);</div><div class='add'>+	mt7615_mac_wtbl_update_cipher(dev, wcid, cipher, cipher_mask);</div><div class='add'>+	err = mt7615_mac_wtbl_update_key(dev, wcid, key, cipher, cipher_mask);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = mt7615_mac_wtbl_update_pk(dev, wcid, cipher, cipher_mask,</div><div class='del'>-					key-&gt;keyidx, cmd);</div><div class='add'>+					key-&gt;keyidx);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1214,13 +1294,12 @@ int __mt7615_mac_wtbl_set_key(struct mt7615_dev *dev,</div><div class='ctx'> </div><div class='ctx'> int mt7615_mac_wtbl_set_key(struct mt7615_dev *dev,</div><div class='ctx'> 			    struct mt76_wcid *wcid,</div><div class='del'>-			    struct ieee80211_key_conf *key,</div><div class='del'>-			    enum set_key_cmd cmd)</div><div class='add'>+			    struct ieee80211_key_conf *key)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;dev-&gt;mt76.lock);</div><div class='del'>-	err = __mt7615_mac_wtbl_set_key(dev, wcid, key, cmd);</div><div class='add'>+	err = __mt7615_mac_wtbl_set_key(dev, wcid, key);</div><div class='ctx'> 	spin_unlock_bh(&amp;dev-&gt;mt76.lock);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1235,22 +1314,20 @@ static bool mt7615_fill_txs(struct mt7615_dev *dev, struct mt7615_sta *sta,</div><div class='ctx'> 	int first_idx = 0, last_idx;</div><div class='ctx'> 	int i, idx, count;</div><div class='ctx'> 	bool fixed_rate, ack_timeout;</div><div class='del'>-	bool probe, ampdu, cck = false;</div><div class='add'>+	bool ampdu, cck = false;</div><div class='ctx'> 	bool rs_idx;</div><div class='ctx'> 	u32 rate_set_tsf;</div><div class='ctx'> 	u32 final_rate, final_rate_flags, final_nss, txs;</div><div class='ctx'> </div><div class='del'>-	fixed_rate = info-&gt;status.rates[0].count;</div><div class='del'>-	probe = !!(info-&gt;flags &amp; IEEE80211_TX_CTL_RATE_CTRL_PROBE);</div><div class='del'>-</div><div class='ctx'> 	txs = le32_to_cpu(txs_data[1]);</div><div class='del'>-	ampdu = !fixed_rate &amp;&amp; (txs &amp; MT_TXS1_AMPDU);</div><div class='add'>+	ampdu = txs &amp; MT_TXS1_AMPDU;</div><div class='ctx'> </div><div class='ctx'> 	txs = le32_to_cpu(txs_data[3]);</div><div class='ctx'> 	count = FIELD_GET(MT_TXS3_TX_COUNT, txs);</div><div class='ctx'> 	last_idx = FIELD_GET(MT_TXS3_LAST_TX_RATE, txs);</div><div class='ctx'> </div><div class='ctx'> 	txs = le32_to_cpu(txs_data[0]);</div><div class='add'>+	fixed_rate = txs &amp; MT_TXS0_FIXED_RATE;</div><div class='ctx'> 	final_rate = FIELD_GET(MT_TXS0_TX_RATE, txs);</div><div class='ctx'> 	ack_timeout = txs &amp; MT_TXS0_ACK_TIMEOUT;</div><div class='ctx'> </div><div class='hunk'>@@ -1272,14 +1349,14 @@ static bool mt7615_fill_txs(struct mt7615_dev *dev, struct mt7615_sta *sta,</div><div class='ctx'> </div><div class='ctx'> 	first_idx = max_t(int, 0, last_idx - (count - 1) / MT7615_RATE_RETRY);</div><div class='ctx'> </div><div class='del'>-	if (fixed_rate &amp;&amp; !probe) {</div><div class='add'>+	if (fixed_rate) {</div><div class='ctx'> 		info-&gt;status.rates[0].count = count;</div><div class='ctx'> 		i = 0;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rate_set_tsf = READ_ONCE(sta-&gt;rate_set_tsf);</div><div class='del'>-	rs_idx = !((u32)(FIELD_GET(MT_TXS4_F0_TIMESTAMP, le32_to_cpu(txs_data[4])) -</div><div class='add'>+	rs_idx = !((u32)(le32_get_bits(txs_data[4], MT_TXS4_F0_TIMESTAMP) -</div><div class='ctx'> 			 rate_set_tsf) &lt; 1000000);</div><div class='ctx'> 	rs_idx ^= rate_set_tsf &amp; BIT(0);</div><div class='ctx'> 	rs = &amp;sta-&gt;rateset[rs_idx];</div><div class='hunk'>@@ -1291,8 +1368,8 @@ static bool mt7615_fill_txs(struct mt7615_dev *dev, struct mt7615_sta *sta,</div><div class='ctx'> 		if (sta-&gt;rate_probe) {</div><div class='ctx'> 			struct mt7615_phy *phy = &amp;dev-&gt;phy;</div><div class='ctx'> </div><div class='del'>-			if (sta-&gt;wcid.ext_phy &amp;&amp; dev-&gt;mt76.phy2)</div><div class='del'>-				phy = dev-&gt;mt76.phy2-&gt;priv;</div><div class='add'>+			if (sta-&gt;wcid.phy_idx &amp;&amp; dev-&gt;mt76.phys[MT_BAND1])</div><div class='add'>+				phy = dev-&gt;mt76.phys[MT_BAND1]-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 			mt7615_mac_set_rates(phy, sta, NULL, sta-&gt;rates);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1334,8 +1411,8 @@ out:</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> 	case MT_PHY_TYPE_OFDM:</div><div class='ctx'> 		mphy = &amp;dev-&gt;mphy;</div><div class='del'>-		if (sta-&gt;wcid.ext_phy &amp;&amp; dev-&gt;mt76.phy2)</div><div class='del'>-			mphy = dev-&gt;mt76.phy2;</div><div class='add'>+		if (sta-&gt;wcid.phy_idx &amp;&amp; dev-&gt;mt76.phys[MT_BAND1])</div><div class='add'>+			mphy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='ctx'> </div><div class='ctx'> 		if (mphy-&gt;chandef.chan-&gt;band == NL80211_BAND_5GHZ)</div><div class='ctx'> 			sband = &amp;mphy-&gt;sband_5g.sband;</div><div class='hunk'>@@ -1391,7 +1468,7 @@ static bool mt7615_mac_add_txs_skb(struct mt7615_dev *dev,</div><div class='ctx'> 		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='ctx'> </div><div class='ctx'> 		if (!mt7615_fill_txs(dev, sta, info, txs_data)) {</div><div class='del'>-			ieee80211_tx_info_clear_status(info);</div><div class='add'>+			info-&gt;status.rates[0].count = 0;</div><div class='ctx'> 			info-&gt;status.rates[0].idx = -1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1410,14 +1487,11 @@ static void mt7615_mac_add_txs(struct mt7615_dev *dev, void *data)</div><div class='ctx'> 	struct mt76_wcid *wcid;</div><div class='ctx'> 	struct mt76_phy *mphy = &amp;dev-&gt;mt76.phy;</div><div class='ctx'> 	__le32 *txs_data = data;</div><div class='del'>-	u32 txs;</div><div class='ctx'> 	u8 wcidx;</div><div class='ctx'> 	u8 pid;</div><div class='ctx'> </div><div class='del'>-	txs = le32_to_cpu(txs_data[0]);</div><div class='del'>-	pid = FIELD_GET(MT_TXS0_PID, txs);</div><div class='del'>-	txs = le32_to_cpu(txs_data[2]);</div><div class='del'>-	wcidx = FIELD_GET(MT_TXS2_WCID, txs);</div><div class='add'>+	pid = le32_get_bits(txs_data[0], MT_TXS0_PID);</div><div class='add'>+	wcidx = le32_get_bits(txs_data[2], MT_TXS2_WCID);</div><div class='ctx'> </div><div class='ctx'> 	if (pid == MT_PACKET_ID_NO_ACK)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1427,17 +1501,13 @@ static void mt7615_mac_add_txs(struct mt7615_dev *dev, void *data)</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-	wcid = rcu_dereference(dev-&gt;mt76.wcid[wcidx]);</div><div class='add'>+	wcid = mt76_wcid_ptr(dev, wcidx);</div><div class='ctx'> 	if (!wcid)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	msta = container_of(wcid, struct mt7615_sta, wcid);</div><div class='ctx'> 	sta = wcid_to_sta(wcid);</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-	if (list_empty(&amp;msta-&gt;poll_list))</div><div class='del'>-		list_add_tail(&amp;msta-&gt;poll_list, &amp;dev-&gt;sta_poll_list);</div><div class='del'>-	spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+	mt76_wcid_add_poll(&amp;dev-&gt;mt76, &amp;msta-&gt;wcid);</div><div class='ctx'> </div><div class='ctx'> 	if (mt7615_mac_add_txs_skb(dev, msta, pid, txs_data))</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1445,46 +1515,60 @@ static void mt7615_mac_add_txs(struct mt7615_dev *dev, void *data)</div><div class='ctx'> 	if (wcidx &gt;= MT7615_WTBL_STA || !sta)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (wcid-&gt;ext_phy &amp;&amp; dev-&gt;mt76.phy2)</div><div class='del'>-		mphy = dev-&gt;mt76.phy2;</div><div class='add'>+	if (wcid-&gt;phy_idx &amp;&amp; dev-&gt;mt76.phys[MT_BAND1])</div><div class='add'>+		mphy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='ctx'> </div><div class='del'>-	if (mt7615_fill_txs(dev, msta, &amp;info, txs_data))</div><div class='add'>+	if (mt7615_fill_txs(dev, msta, &amp;info, txs_data)) {</div><div class='add'>+		spin_lock_bh(&amp;dev-&gt;mt76.rx_lock);</div><div class='ctx'> 		ieee80211_tx_status_noskb(mphy-&gt;hw, sta, &amp;info);</div><div class='add'>+		spin_unlock_bh(&amp;dev-&gt;mt76.rx_lock);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7615_mac_tx_free_token(struct mt7615_dev *dev, u16 token)</div><div class='add'>+mt7615_txwi_free(struct mt7615_dev *dev, struct mt76_txwi_cache *txwi)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='del'>-	struct mt76_txwi_cache *txwi;</div><div class='ctx'> 	__le32 *txwi_data;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> 	u8 wcid;</div><div class='ctx'> </div><div class='del'>-	trace_mac_tx_free(dev, token);</div><div class='del'>-	txwi = mt76_token_put(mdev, token);</div><div class='del'>-	if (!txwi)</div><div class='del'>-		return;</div><div class='add'>+	mt76_connac_txp_skb_unmap(mdev, txwi);</div><div class='add'>+	if (!txwi-&gt;skb)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	txwi_data = (__le32 *)mt76_get_txwi_ptr(mdev, txwi);</div><div class='ctx'> 	val = le32_to_cpu(txwi_data[1]);</div><div class='ctx'> 	wcid = FIELD_GET(MT_TXD1_WLAN_IDX, val);</div><div class='add'>+	mt76_tx_complete_skb(mdev, wcid, txwi-&gt;skb);</div><div class='ctx'> </div><div class='del'>-	mt7615_txp_skb_unmap(mdev, txwi);</div><div class='del'>-	if (txwi-&gt;skb) {</div><div class='del'>-		mt76_tx_complete_skb(mdev, wcid, txwi-&gt;skb);</div><div class='del'>-		txwi-&gt;skb = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+out:</div><div class='add'>+	txwi-&gt;skb = NULL;</div><div class='ctx'> 	mt76_put_txwi(mdev, txwi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt7615_mac_tx_free(struct mt7615_dev *dev, struct sk_buff *skb)</div><div class='add'>+static void</div><div class='add'>+mt7615_mac_tx_free_token(struct mt7615_dev *dev, u16 token)</div><div class='add'>+{</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	struct mt76_txwi_cache *txwi;</div><div class='add'>+</div><div class='add'>+	trace_mac_tx_free(dev, token);</div><div class='add'>+	txwi = mt76_token_put(mdev, token);</div><div class='add'>+	if (!txwi)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mt7615_txwi_free(dev, txwi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7615_mac_tx_free(struct mt7615_dev *dev, void *data, int len)</div><div class='ctx'> {</div><div class='del'>-	struct mt7615_tx_free *free = (struct mt7615_tx_free *)skb-&gt;data;</div><div class='add'>+	struct mt76_connac_tx_free *free = data;</div><div class='add'>+	void *tx_token = data + sizeof(*free);</div><div class='add'>+	void *end = data + len;</div><div class='ctx'> 	u8 i, count;</div><div class='ctx'> </div><div class='ctx'> 	mt76_queue_tx_cleanup(dev, dev-&gt;mphy.q_tx[MT_TXQ_PSD], false);</div><div class='hunk'>@@ -1495,21 +1579,25 @@ static void mt7615_mac_tx_free(struct mt7615_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 			mt76_queue_tx_cleanup(dev, dev-&gt;mphy.q_tx[i], false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	count = FIELD_GET(MT_TX_FREE_MSDU_ID_CNT, le16_to_cpu(free-&gt;ctrl));</div><div class='add'>+	count = le16_get_bits(free-&gt;ctrl, MT_TX_FREE_MSDU_ID_CNT);</div><div class='ctx'> 	if (is_mt7615(&amp;dev-&gt;mt76)) {</div><div class='del'>-		__le16 *token = &amp;free-&gt;token[0];</div><div class='add'>+		__le16 *token = tx_token;</div><div class='add'>+</div><div class='add'>+		if (WARN_ON_ONCE((void *)&amp;token[count] &gt; end))</div><div class='add'>+			return;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; count; i++)</div><div class='ctx'> 			mt7615_mac_tx_free_token(dev, le16_to_cpu(token[i]));</div><div class='ctx'> 	} else {</div><div class='del'>-		__le32 *token = (__le32 *)&amp;free-&gt;token[0];</div><div class='add'>+		__le32 *token = tx_token;</div><div class='add'>+</div><div class='add'>+		if (WARN_ON_ONCE((void *)&amp;token[count] &gt; end))</div><div class='add'>+			return;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; count; i++)</div><div class='ctx'> 			mt7615_mac_tx_free_token(dev, le32_to_cpu(token[i]));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_kfree_skb(skb);</div><div class='del'>-</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	mt7615_mac_sta_poll(dev);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='hunk'>@@ -1517,8 +1605,31 @@ static void mt7615_mac_tx_free(struct mt7615_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	mt76_worker_schedule(&amp;dev-&gt;mt76.tx_worker);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool mt7615_rx_check(struct mt76_dev *mdev, void *data, int len)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);</div><div class='add'>+	__le32 *rxd = (__le32 *)data;</div><div class='add'>+	__le32 *end = (__le32 *)&amp;rxd[len / 4];</div><div class='add'>+	enum rx_pkt_type type;</div><div class='add'>+</div><div class='add'>+	type = le32_get_bits(rxd[0], MT_RXD0_PKT_TYPE);</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case PKT_TYPE_TXRX_NOTIFY:</div><div class='add'>+		mt7615_mac_tx_free(dev, data, len);</div><div class='add'>+		return false;</div><div class='add'>+	case PKT_TYPE_TXS:</div><div class='add'>+		for (rxd++; rxd + 7 &lt;= end; rxd += 7)</div><div class='add'>+			mt7615_mac_add_txs(dev, rxd);</div><div class='add'>+		return false;</div><div class='add'>+	default:</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7615_rx_check);</div><div class='add'>+</div><div class='ctx'> void mt7615_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,</div><div class='del'>-			 struct sk_buff *skb)</div><div class='add'>+			 struct sk_buff *skb, u32 *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);</div><div class='ctx'> 	__le32 *rxd = (__le32 *)skb-&gt;data;</div><div class='hunk'>@@ -1526,8 +1637,8 @@ void mt7615_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,</div><div class='ctx'> 	enum rx_pkt_type type;</div><div class='ctx'> 	u16 flag;</div><div class='ctx'> </div><div class='del'>-	type = FIELD_GET(MT_RXD0_PKT_TYPE, le32_to_cpu(rxd[0]));</div><div class='del'>-	flag = FIELD_GET(MT_RXD0_PKT_FLAG, le32_to_cpu(rxd[0]));</div><div class='add'>+	type = le32_get_bits(rxd[0], MT_RXD0_PKT_TYPE);</div><div class='add'>+	flag = le32_get_bits(rxd[0], MT_RXD0_PKT_FLAG);</div><div class='ctx'> 	if (type == PKT_TYPE_RX_EVENT &amp;&amp; flag == 0x1)</div><div class='ctx'> 		type = PKT_TYPE_NORMAL_MCU;</div><div class='ctx'> </div><div class='hunk'>@@ -1538,7 +1649,8 @@ void mt7615_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PKT_TYPE_TXRX_NOTIFY:</div><div class='del'>-		mt7615_mac_tx_free(dev, skb);</div><div class='add'>+		mt7615_mac_tx_free(dev, skb-&gt;data, skb-&gt;len);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PKT_TYPE_RX_EVENT:</div><div class='ctx'> 		mt7615_mcu_rx_event(dev, skb);</div><div class='hunk'>@@ -1675,7 +1787,7 @@ mt7615_mac_adjust_sensitivity(struct mt7615_phy *phy,</div><div class='ctx'> 	struct mt7615_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	int false_cca = ofdm ? phy-&gt;false_cca_ofdm : phy-&gt;false_cca_cck;</div><div class='ctx'> 	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='del'>-	u16 def_th = ofdm ? -98 : -110;</div><div class='add'>+	s16 def_th = ofdm ? -98 : -110;</div><div class='ctx'> 	bool update = false;</div><div class='ctx'> 	s8 *sensitivity;</div><div class='ctx'> 	int signal;</div><div class='hunk'>@@ -1821,50 +1933,49 @@ mt7615_phy_update_channel(struct mt76_phy *mphy, int idx)</div><div class='ctx'> 	state-&gt;noise = -(phy-&gt;noise &gt;&gt; 4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __mt7615_update_channel(struct mt7615_dev *dev)</div><div class='add'>+static void mt7615_update_survey(struct mt7615_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	struct mt76_phy *mphy_ext = mdev-&gt;phys[MT_BAND1];</div><div class='add'>+	ktime_t cur_time;</div><div class='add'>+</div><div class='add'>+	/* MT7615 can only update both phys simultaneously</div><div class='add'>+	 * since some reisters are shared across bands.</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='ctx'> 	mt7615_phy_update_channel(&amp;mdev-&gt;phy, 0);</div><div class='del'>-	if (mdev-&gt;phy2)</div><div class='del'>-		mt7615_phy_update_channel(mdev-&gt;phy2, 1);</div><div class='add'>+	if (mphy_ext)</div><div class='add'>+		mt7615_phy_update_channel(mphy_ext, 1);</div><div class='add'>+</div><div class='add'>+	cur_time = ktime_get_boottime();</div><div class='add'>+</div><div class='add'>+	mt76_update_survey_active_time(&amp;mdev-&gt;phy, cur_time);</div><div class='add'>+	if (mphy_ext)</div><div class='add'>+		mt76_update_survey_active_time(mphy_ext, cur_time);</div><div class='ctx'> </div><div class='ctx'> 	/* reset obss airtime */</div><div class='ctx'> 	mt76_set(dev, MT_WF_RMAC_MIB_TIME0, MT_WF_RMAC_MIB_RXTIME_CLR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt7615_update_channel(struct mt76_dev *mdev)</div><div class='add'>+void mt7615_update_channel(struct mt76_phy *mphy)</div><div class='ctx'> {</div><div class='del'>-	struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);</div><div class='add'>+	struct mt7615_dev *dev = container_of(mphy-&gt;dev, struct mt7615_dev, mt76);</div><div class='ctx'> </div><div class='ctx'> 	if (mt76_connac_pm_wake(&amp;dev-&gt;mphy, &amp;dev-&gt;pm))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	__mt7615_update_channel(dev);</div><div class='add'>+	mt7615_update_survey(dev);</div><div class='ctx'> 	mt76_connac_power_save_sched(&amp;dev-&gt;mphy, &amp;dev-&gt;pm);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt7615_update_channel);</div><div class='ctx'> </div><div class='del'>-static void mt7615_update_survey(struct mt7615_dev *dev)</div><div class='del'>-{</div><div class='del'>-	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='del'>-	ktime_t cur_time;</div><div class='del'>-</div><div class='del'>-	__mt7615_update_channel(dev);</div><div class='del'>-	cur_time = ktime_get_boottime();</div><div class='del'>-</div><div class='del'>-	mt76_update_survey_active_time(&amp;mdev-&gt;phy, cur_time);</div><div class='del'>-	if (mdev-&gt;phy2)</div><div class='del'>-		mt76_update_survey_active_time(mdev-&gt;phy2, cur_time);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> mt7615_mac_update_mib_stats(struct mt7615_phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct mib_stats *mib = &amp;phy-&gt;mib;</div><div class='ctx'> 	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='del'>-	int i, aggr;</div><div class='add'>+	int i, aggr = 0;</div><div class='ctx'> 	u32 val, val2;</div><div class='ctx'> </div><div class='ctx'> 	mib-&gt;fcs_err_cnt += mt76_get_field(dev, MT_MIB_SDR3(ext_phy),</div><div class='hunk'>@@ -1878,7 +1989,6 @@ mt7615_mac_update_mib_stats(struct mt7615_phy *phy)</div><div class='ctx'> 		mib-&gt;aggr_per = 1000 * (val - val2) / val;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	aggr = ext_phy ? ARRAY_SIZE(dev-&gt;mt76.aggr_stats) / 2 : 0;</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='ctx'> 		val = mt76_rr(dev, MT_MIB_MB_SDR1(ext_phy, i));</div><div class='ctx'> 		mib-&gt;ba_miss_cnt += FIELD_GET(MT_MIB_BA_MISS_COUNT_MASK, val);</div><div class='hunk'>@@ -1891,8 +2001,8 @@ mt7615_mac_update_mib_stats(struct mt7615_phy *phy)</div><div class='ctx'> 						  val);</div><div class='ctx'> </div><div class='ctx'> 		val = mt76_rr(dev, MT_TX_AGG_CNT(ext_phy, i));</div><div class='del'>-		dev-&gt;mt76.aggr_stats[aggr++] += val &amp; 0xffff;</div><div class='del'>-		dev-&gt;mt76.aggr_stats[aggr++] += val &gt;&gt; 16;</div><div class='add'>+		phy-&gt;mt76-&gt;aggr_stats[aggr++] += val &amp; 0xffff;</div><div class='add'>+		phy-&gt;mt76-&gt;aggr_stats[aggr++] += val &gt;&gt; 16;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1906,14 +2016,29 @@ void mt7615_pm_wake_work(struct work_struct *work)</div><div class='ctx'> 	mphy = dev-&gt;phy.mt76;</div><div class='ctx'> </div><div class='ctx'> 	if (!mt7615_mcu_set_drv_ctrl(dev)) {</div><div class='add'>+		struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='del'>-		mt76_for_each_q_rx(&amp;dev-&gt;mt76, i)</div><div class='del'>-			napi_schedule(&amp;dev-&gt;mt76.napi[i]);</div><div class='del'>-		mt76_connac_pm_dequeue_skbs(mphy, &amp;dev-&gt;pm);</div><div class='del'>-		mt76_queue_tx_cleanup(dev, dev-&gt;mt76.q_mcu[MT_MCUQ_WM], false);</div><div class='del'>-		ieee80211_queue_delayed_work(mphy-&gt;hw, &amp;mphy-&gt;mac_work,</div><div class='del'>-					     MT7615_WATCHDOG_TIME);</div><div class='add'>+		if (mt76_is_sdio(mdev)) {</div><div class='add'>+			mt76_connac_pm_dequeue_skbs(mphy, &amp;dev-&gt;pm);</div><div class='add'>+			mt76_worker_schedule(&amp;mdev-&gt;sdio.txrx_worker);</div><div class='add'>+		} else {</div><div class='add'>+			local_bh_disable();</div><div class='add'>+			mt76_for_each_q_rx(mdev, i)</div><div class='add'>+				napi_schedule(&amp;mdev-&gt;napi[i]);</div><div class='add'>+			local_bh_enable();</div><div class='add'>+			mt76_connac_pm_dequeue_skbs(mphy, &amp;dev-&gt;pm);</div><div class='add'>+			mt76_queue_tx_cleanup(dev, mdev-&gt;q_mcu[MT_MCUQ_WM],</div><div class='add'>+					      false);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (test_bit(MT76_STATE_RUNNING, &amp;mphy-&gt;state)) {</div><div class='add'>+			unsigned long timeout;</div><div class='add'>+</div><div class='add'>+			timeout = mt7615_get_macwork_timeout(dev);</div><div class='add'>+			ieee80211_queue_delayed_work(mphy-&gt;hw, &amp;mphy-&gt;mac_work,</div><div class='add'>+						     timeout);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_wake_queues(mphy-&gt;hw);</div><div class='hunk'>@@ -1933,6 +2058,14 @@ void mt7615_pm_power_save_work(struct work_struct *work)</div><div class='ctx'> 	    test_bit(MT76_HW_SCHED_SCANNING, &amp;dev-&gt;mphy.state))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	if (mutex_is_locked(&amp;dev-&gt;mt76.mutex))</div><div class='add'>+		/* if mt76 mutex is held we should not put the device</div><div class='add'>+		 * to sleep since we are currently accessing device</div><div class='add'>+		 * register map. We need to wait for the next power_save</div><div class='add'>+		 * trigger.</div><div class='add'>+		 */</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	if (time_is_after_jiffies(dev-&gt;pm.last_activity + delta)) {</div><div class='ctx'> 		delta = dev-&gt;pm.last_activity + delta - jiffies;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1948,6 +2081,7 @@ void mt7615_mac_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_phy *phy;</div><div class='ctx'> 	struct mt76_phy *mphy;</div><div class='add'>+	unsigned long timeout;</div><div class='ctx'> </div><div class='ctx'> 	mphy = (struct mt76_phy *)container_of(work, struct mt76_phy,</div><div class='ctx'> 					       mac_work.work);</div><div class='hunk'>@@ -1965,9 +2099,10 @@ void mt7615_mac_work(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	mt7615_mutex_release(phy-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	mt76_tx_status_check(mphy-&gt;dev, NULL, false);</div><div class='del'>-	ieee80211_queue_delayed_work(mphy-&gt;hw, &amp;mphy-&gt;mac_work,</div><div class='del'>-				     MT7615_WATCHDOG_TIME);</div><div class='add'>+	mt76_tx_status_check(mphy-&gt;dev, false);</div><div class='add'>+</div><div class='add'>+	timeout = mt7615_get_macwork_timeout(phy-&gt;dev);</div><div class='add'>+	ieee80211_queue_delayed_work(mphy-&gt;hw, &amp;mphy-&gt;mac_work, timeout);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt7615_tx_token_put(struct mt7615_dev *dev)</div><div class='hunk'>@@ -1976,16 +2111,8 @@ void mt7615_tx_token_put(struct mt7615_dev *dev)</div><div class='ctx'> 	int id;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;dev-&gt;mt76.token_lock);</div><div class='del'>-	idr_for_each_entry(&amp;dev-&gt;mt76.token, txwi, id) {</div><div class='del'>-		mt7615_txp_skb_unmap(&amp;dev-&gt;mt76, txwi);</div><div class='del'>-		if (txwi-&gt;skb) {</div><div class='del'>-			struct ieee80211_hw *hw;</div><div class='del'>-</div><div class='del'>-			hw = mt76_tx_status_get_hw(&amp;dev-&gt;mt76, txwi-&gt;skb);</div><div class='del'>-			ieee80211_free_txskb(hw, txwi-&gt;skb);</div><div class='del'>-		}</div><div class='del'>-		mt76_put_txwi(&amp;dev-&gt;mt76, txwi);</div><div class='del'>-	}</div><div class='add'>+	idr_for_each_entry(&amp;dev-&gt;mt76.token, txwi, id)</div><div class='add'>+		mt7615_txwi_free(dev, txwi);</div><div class='ctx'> 	spin_unlock_bh(&amp;dev-&gt;mt76.token_lock);</div><div class='ctx'> 	idr_destroy(&amp;dev-&gt;mt76.token);</div><div class='ctx'> }</div><div class='hunk'>@@ -1996,21 +2123,24 @@ static void mt7615_dfs_stop_radar_detector(struct mt7615_phy *phy)</div><div class='ctx'> 	struct mt7615_dev *dev = phy-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	if (phy-&gt;rdd_state &amp; BIT(0))</div><div class='del'>-		mt7615_mcu_rdd_cmd(dev, RDD_STOP, 0, MT_RX_SEL0, 0);</div><div class='add'>+		mt76_connac_mcu_rdd_cmd(&amp;dev-&gt;mt76, RDD_STOP, 0,</div><div class='add'>+					MT_RX_SEL0, 0);</div><div class='ctx'> 	if (phy-&gt;rdd_state &amp; BIT(1))</div><div class='del'>-		mt7615_mcu_rdd_cmd(dev, RDD_STOP, 1, MT_RX_SEL0, 0);</div><div class='add'>+		mt76_connac_mcu_rdd_cmd(&amp;dev-&gt;mt76, RDD_STOP, 1,</div><div class='add'>+					MT_RX_SEL0, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt7615_dfs_start_rdd(struct mt7615_dev *dev, int chain)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = mt7615_mcu_rdd_cmd(dev, RDD_START, chain, MT_RX_SEL0, 0);</div><div class='add'>+	err = mt76_connac_mcu_rdd_cmd(&amp;dev-&gt;mt76, RDD_START, chain,</div><div class='add'>+				      MT_RX_SEL0, 0);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	return mt7615_mcu_rdd_cmd(dev, RDD_DET_MODE, chain,</div><div class='del'>-				  MT_RX_SEL0, 1);</div><div class='add'>+	return mt76_connac_mcu_rdd_cmd(&amp;dev-&gt;mt76, RDD_DET_MODE, chain,</div><div class='add'>+				       MT_RX_SEL0, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt7615_dfs_start_radar_detector(struct mt7615_phy *phy)</div><div class='hunk'>@@ -2021,7 +2151,8 @@ static int mt7615_dfs_start_radar_detector(struct mt7615_phy *phy)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* start CAC */</div><div class='del'>-	err = mt7615_mcu_rdd_cmd(dev, RDD_CAC_START, ext_phy, MT_RX_SEL0, 0);</div><div class='add'>+	err = mt76_connac_mcu_rdd_cmd(&amp;dev-&gt;mt76, RDD_CAC_START, ext_phy,</div><div class='add'>+				      MT_RX_SEL0, 0);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -2048,14 +2179,12 @@ mt7615_dfs_init_radar_specs(struct mt7615_phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	const struct mt7615_dfs_radar_spec *radar_specs;</div><div class='ctx'> 	struct mt7615_dev *dev = phy-&gt;dev;</div><div class='del'>-	int err, i;</div><div class='add'>+	int err, i, lpn = 500;</div><div class='ctx'> </div><div class='ctx'> 	switch (dev-&gt;mt76.region) {</div><div class='ctx'> 	case NL80211_DFS_FCC:</div><div class='ctx'> 		radar_specs = &amp;fcc_radar_specs;</div><div class='del'>-		err = mt7615_mcu_set_fcc5_lpn(dev, 8);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='add'>+		lpn = 8;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_DFS_ETSI:</div><div class='ctx'> 		radar_specs = &amp;etsi_radar_specs;</div><div class='hunk'>@@ -2067,6 +2196,11 @@ mt7615_dfs_init_radar_specs(struct mt7615_phy *phy)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* avoid FCC radar detection in non-FCC region */</div><div class='add'>+	err = mt7615_mcu_set_fcc5_lpn(dev, lpn);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(radar_specs-&gt;radar_pattern); i++) {</div><div class='ctx'> 		err = mt7615_mcu_set_radar_th(dev, i,</div><div class='ctx'> 					      &amp;radar_specs-&gt;radar_pattern[i]);</div><div class='hunk'>@@ -2082,47 +2216,58 @@ int mt7615_dfs_init_radar_detector(struct mt7615_phy *phy)</div><div class='ctx'> 	struct cfg80211_chan_def *chandef = &amp;phy-&gt;mt76-&gt;chandef;</div><div class='ctx'> 	struct mt7615_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='add'>+	enum mt76_dfs_state dfs_state, prev_state;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (is_mt7663(&amp;dev-&gt;mt76))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;mt76.region == NL80211_DFS_UNSET) {</div><div class='del'>-		phy-&gt;dfs_state = -1;</div><div class='del'>-		if (phy-&gt;rdd_state)</div><div class='del'>-			goto stop;</div><div class='add'>+	prev_state = phy-&gt;mt76-&gt;dfs_state;</div><div class='add'>+	dfs_state = mt76_phy_dfs_state(phy-&gt;mt76);</div><div class='add'>+	if ((chandef-&gt;chan-&gt;flags &amp; IEEE80211_CHAN_RADAR) &amp;&amp;</div><div class='add'>+	    dfs_state &lt; MT_DFS_STATE_CAC)</div><div class='add'>+		dfs_state = MT_DFS_STATE_ACTIVE;</div><div class='ctx'> </div><div class='add'>+	if (prev_state == dfs_state)</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (test_bit(MT76_SCANNING, &amp;phy-&gt;mt76-&gt;state))</div><div class='del'>-		return 0;</div><div class='add'>+	if (dfs_state == MT_DFS_STATE_DISABLED)</div><div class='add'>+		goto stop;</div><div class='ctx'> </div><div class='del'>-	if (phy-&gt;dfs_state == chandef-&gt;chan-&gt;dfs_state)</div><div class='del'>-		return 0;</div><div class='add'>+	if (prev_state &lt;= MT_DFS_STATE_DISABLED) {</div><div class='add'>+		err = mt7615_dfs_init_radar_specs(phy);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='del'>-	err = mt7615_dfs_init_radar_specs(phy);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		phy-&gt;dfs_state = -1;</div><div class='del'>-		goto stop;</div><div class='del'>-	}</div><div class='add'>+		err = mt7615_dfs_start_radar_detector(phy);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='del'>-	phy-&gt;dfs_state = chandef-&gt;chan-&gt;dfs_state;</div><div class='add'>+		phy-&gt;mt76-&gt;dfs_state = MT_DFS_STATE_CAC;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (chandef-&gt;chan-&gt;flags &amp; IEEE80211_CHAN_RADAR) {</div><div class='del'>-		if (chandef-&gt;chan-&gt;dfs_state != NL80211_DFS_AVAILABLE)</div><div class='del'>-			return mt7615_dfs_start_radar_detector(phy);</div><div class='add'>+	if (dfs_state == MT_DFS_STATE_CAC)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		return mt7615_mcu_rdd_cmd(dev, RDD_CAC_END, ext_phy,</div><div class='del'>-					  MT_RX_SEL0, 0);</div><div class='add'>+	err = mt76_connac_mcu_rdd_cmd(&amp;dev-&gt;mt76, RDD_CAC_END,</div><div class='add'>+				      ext_phy, MT_RX_SEL0, 0);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		phy-&gt;mt76-&gt;dfs_state = MT_DFS_STATE_UNKNOWN;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	phy-&gt;mt76-&gt;dfs_state = MT_DFS_STATE_ACTIVE;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='ctx'> stop:</div><div class='del'>-	err = mt7615_mcu_rdd_cmd(dev, RDD_NORMAL_START, ext_phy, MT_RX_SEL0, 0);</div><div class='add'>+	err = mt76_connac_mcu_rdd_cmd(&amp;dev-&gt;mt76, RDD_NORMAL_START, ext_phy,</div><div class='add'>+				      MT_RX_SEL0, 0);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	mt7615_dfs_stop_radar_detector(phy);</div><div class='add'>+	phy-&gt;mt76-&gt;dfs_state = MT_DFS_STATE_DISABLED;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2198,7 +2343,7 @@ void mt7615_coredump_work(struct work_struct *work)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		skb_pull(skb, sizeof(struct mt7615_mcu_rxd));</div><div class='del'>-		if (data + skb-&gt;len - dump &gt; MT76_CONNAC_COREDUMP_SZ) {</div><div class='add'>+		if (!dump || data + skb-&gt;len - dump &gt; MT76_CONNAC_COREDUMP_SZ) {</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2208,6 +2353,8 @@ void mt7615_coredump_work(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='del'>-	dev_coredumpv(dev-&gt;mt76.dev, dump, MT76_CONNAC_COREDUMP_SZ,</div><div class='del'>-		      GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (dump)</div><div class='add'>+		dev_coredumpv(dev-&gt;mt76.dev, dump, MT76_CONNAC_COREDUMP_SZ,</div><div class='add'>+			      GFP_KERNEL);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.h b/drivers/net/wireless/mediatek/mt76/mt7615/mac.h<br/>index 6bf9da040196..336ebce5db5f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/mac.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/mac.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/mac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/mac.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /* Copyright (C) 2019 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MT7615_MAC_H</div><div class='hunk'>@@ -19,18 +19,6 @@</div><div class='ctx'> #define MT_RXD0_NORMAL_GROUP_3		BIT(27)</div><div class='ctx'> #define MT_RXD0_NORMAL_GROUP_4		BIT(28)</div><div class='ctx'> </div><div class='del'>-enum rx_pkt_type {</div><div class='del'>-	PKT_TYPE_TXS,</div><div class='del'>-	PKT_TYPE_TXRXV,</div><div class='del'>-	PKT_TYPE_NORMAL,</div><div class='del'>-	PKT_TYPE_RX_DUP_RFB,</div><div class='del'>-	PKT_TYPE_RX_TMR,</div><div class='del'>-	PKT_TYPE_RETRIEVE,</div><div class='del'>-	PKT_TYPE_TXRX_NOTIFY,</div><div class='del'>-	PKT_TYPE_RX_EVENT,</div><div class='del'>-	PKT_TYPE_NORMAL_MCU,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define MT_RXD1_NORMAL_BSSID		GENMASK(31, 26)</div><div class='ctx'> #define MT_RXD1_NORMAL_PAYLOAD_FORMAT	GENMASK(25, 24)</div><div class='ctx'> #define MT_RXD1_FIRST_AMSDU_FRAME	GENMASK(1, 0)</div><div class='hunk'>@@ -86,6 +74,8 @@ enum rx_pkt_type {</div><div class='ctx'> #define MT_RXD6_SEQ_CTRL		GENMASK(15, 0)</div><div class='ctx'> #define MT_RXD6_QOS_CTL			GENMASK(31, 16)</div><div class='ctx'> </div><div class='add'>+#define MT_RXD7_HT_CONTROL		GENMASK(31, 0)</div><div class='add'>+</div><div class='ctx'> #define MT_RXV1_ACID_DET_H		BIT(31)</div><div class='ctx'> #define MT_RXV1_ACID_DET_L		BIT(30)</div><div class='ctx'> #define MT_RXV1_VHTA2_B8_B3		GENMASK(29, 24)</div><div class='hunk'>@@ -163,12 +153,6 @@ enum tx_phy_bandwidth {</div><div class='ctx'> #define MT_CT_INFO_NONE_CIPHER_FRAME	BIT(3)</div><div class='ctx'> #define MT_CT_INFO_HSR2_TX		BIT(4)</div><div class='ctx'> </div><div class='del'>-#define MT_TXD_SIZE			(8 * 4)</div><div class='del'>-</div><div class='del'>-#define MT_USB_TXD_SIZE			(MT_TXD_SIZE + 8 * 4)</div><div class='del'>-#define MT_USB_HDR_SIZE			4</div><div class='del'>-#define MT_USB_TAIL_SIZE		4</div><div class='del'>-</div><div class='ctx'> #define MT_TXD0_P_IDX			BIT(31)</div><div class='ctx'> #define MT_TXD0_Q_IDX			GENMASK(30, 26)</div><div class='ctx'> #define MT_TXD0_UDP_TCP_SUM		BIT(24)</div><div class='hunk'>@@ -248,56 +232,6 @@ enum tx_phy_bandwidth {</div><div class='ctx'> #define MT_TX_RATE_MODE			GENMASK(8, 6)</div><div class='ctx'> #define MT_TX_RATE_IDX			GENMASK(5, 0)</div><div class='ctx'> </div><div class='del'>-#define MT_TXP_MAX_BUF_NUM		6</div><div class='del'>-#define MT_HW_TXP_MAX_MSDU_NUM		4</div><div class='del'>-#define MT_HW_TXP_MAX_BUF_NUM		4</div><div class='del'>-</div><div class='del'>-#define MT_MSDU_ID_VALID		BIT(15)</div><div class='del'>-</div><div class='del'>-#define MT_TXD_LEN_MASK			GENMASK(11, 0)</div><div class='del'>-#define MT_TXD_LEN_MSDU_LAST		BIT(14)</div><div class='del'>-#define MT_TXD_LEN_AMSDU_LAST		BIT(15)</div><div class='del'>-/* mt7663 */</div><div class='del'>-#define MT_TXD_LEN_LAST			BIT(15)</div><div class='del'>-</div><div class='del'>-struct mt7615_txp_ptr {</div><div class='del'>-	__le32 buf0;</div><div class='del'>-	__le16 len0;</div><div class='del'>-	__le16 len1;</div><div class='del'>-	__le32 buf1;</div><div class='del'>-} __packed __aligned(4);</div><div class='del'>-</div><div class='del'>-struct mt7615_hw_txp {</div><div class='del'>-	__le16 msdu_id[MT_HW_TXP_MAX_MSDU_NUM];</div><div class='del'>-	struct mt7615_txp_ptr ptr[MT_HW_TXP_MAX_BUF_NUM / 2];</div><div class='del'>-} __packed __aligned(4);</div><div class='del'>-</div><div class='del'>-struct mt7615_fw_txp {</div><div class='del'>-	__le16 flags;</div><div class='del'>-	__le16 token;</div><div class='del'>-	u8 bss_idx;</div><div class='del'>-	u8 rept_wds_wcid;</div><div class='del'>-	u8 rsv;</div><div class='del'>-	u8 nbuf;</div><div class='del'>-	__le32 buf[MT_TXP_MAX_BUF_NUM];</div><div class='del'>-	__le16 len[MT_TXP_MAX_BUF_NUM];</div><div class='del'>-} __packed __aligned(4);</div><div class='del'>-</div><div class='del'>-struct mt7615_txp_common {</div><div class='del'>-	union {</div><div class='del'>-		struct mt7615_fw_txp fw;</div><div class='del'>-		struct mt7615_hw_txp hw;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct mt7615_tx_free {</div><div class='del'>-	__le16 rx_byte_cnt;</div><div class='del'>-	__le16 ctrl;</div><div class='del'>-	u8 txd_cnt;</div><div class='del'>-	u8 rsv[3];</div><div class='del'>-	__le16 token[];</div><div class='del'>-} __packed __aligned(4);</div><div class='del'>-</div><div class='ctx'> #define MT_TX_FREE_MSDU_ID_CNT		GENMASK(6, 0)</div><div class='ctx'> </div><div class='ctx'> #define MT_TXS0_PID			GENMASK(31, 24)</div><div class='hunk'>@@ -383,61 +317,6 @@ struct mt7615_dfs_radar_spec {</div><div class='ctx'> 	struct mt7615_dfs_pattern radar_pattern[16];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum mt7615_cipher_type {</div><div class='del'>-	MT_CIPHER_NONE,</div><div class='del'>-	MT_CIPHER_WEP40,</div><div class='del'>-	MT_CIPHER_TKIP,</div><div class='del'>-	MT_CIPHER_TKIP_NO_MIC,</div><div class='del'>-	MT_CIPHER_AES_CCMP,</div><div class='del'>-	MT_CIPHER_WEP104,</div><div class='del'>-	MT_CIPHER_BIP_CMAC_128,</div><div class='del'>-	MT_CIPHER_WEP128,</div><div class='del'>-	MT_CIPHER_WAPI,</div><div class='del'>-	MT_CIPHER_CCMP_256 = 10,</div><div class='del'>-	MT_CIPHER_GCMP,</div><div class='del'>-	MT_CIPHER_GCMP_256,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline enum mt7615_cipher_type</div><div class='del'>-mt7615_mac_get_cipher(int cipher)</div><div class='del'>-{</div><div class='del'>-	switch (cipher) {</div><div class='del'>-	case WLAN_CIPHER_SUITE_WEP40:</div><div class='del'>-		return MT_CIPHER_WEP40;</div><div class='del'>-	case WLAN_CIPHER_SUITE_WEP104:</div><div class='del'>-		return MT_CIPHER_WEP104;</div><div class='del'>-	case WLAN_CIPHER_SUITE_TKIP:</div><div class='del'>-		return MT_CIPHER_TKIP;</div><div class='del'>-	case WLAN_CIPHER_SUITE_AES_CMAC:</div><div class='del'>-		return MT_CIPHER_BIP_CMAC_128;</div><div class='del'>-	case WLAN_CIPHER_SUITE_CCMP:</div><div class='del'>-		return MT_CIPHER_AES_CCMP;</div><div class='del'>-	case WLAN_CIPHER_SUITE_CCMP_256:</div><div class='del'>-		return MT_CIPHER_CCMP_256;</div><div class='del'>-	case WLAN_CIPHER_SUITE_GCMP:</div><div class='del'>-		return MT_CIPHER_GCMP;</div><div class='del'>-	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='del'>-		return MT_CIPHER_GCMP_256;</div><div class='del'>-	case WLAN_CIPHER_SUITE_SMS4:</div><div class='del'>-		return MT_CIPHER_WAPI;</div><div class='del'>-	default:</div><div class='del'>-		return MT_CIPHER_NONE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct mt7615_txp_common *</div><div class='del'>-mt7615_txwi_to_txp(struct mt76_dev *dev, struct mt76_txwi_cache *t)</div><div class='del'>-{</div><div class='del'>-	u8 *txwi;</div><div class='del'>-</div><div class='del'>-	if (!t)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	txwi = mt76_get_txwi_ptr(dev, t);</div><div class='del'>-</div><div class='del'>-	return (struct mt7615_txp_common *)(txwi + MT_TXD_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline u32 mt7615_mac_wtbl_addr(struct mt7615_dev *dev, int wcid)</div><div class='ctx'> {</div><div class='ctx'> 	return MT_WTBL_BASE(dev) + wcid * MT_WTBL_ENTRY_SIZE;</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c b/drivers/net/wireless/mediatek/mt76/mt7615/main.c<br/>index 39733b351ac4..727266892c3d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/main.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2019 MediaTek Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Roy Luo &lt;royluo@google.com&gt;</div><div class='hunk'>@@ -28,6 +28,7 @@ static int mt7615_start(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_dev *dev = mt7615_hw_dev(hw);</div><div class='ctx'> 	struct mt7615_phy *phy = mt7615_hw_phy(hw);</div><div class='add'>+	unsigned long timeout;</div><div class='ctx'> 	bool running;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -72,17 +73,17 @@ static int mt7615_start(struct ieee80211_hw *hw)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = mt7615_mcu_set_chan_info(phy, MCU_EXT_CMD_SET_RX_PATH);</div><div class='add'>+	ret = mt7615_mcu_set_chan_info(phy, MCU_EXT_CMD(SET_RX_PATH));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	set_bit(MT76_STATE_RUNNING, &amp;phy-&gt;mt76-&gt;state);</div><div class='ctx'> </div><div class='del'>-	ieee80211_queue_delayed_work(hw, &amp;phy-&gt;mt76-&gt;mac_work,</div><div class='del'>-				     MT7615_WATCHDOG_TIME);</div><div class='add'>+	timeout = mt7615_get_macwork_timeout(dev);</div><div class='add'>+	ieee80211_queue_delayed_work(hw, &amp;phy-&gt;mt76-&gt;mac_work, timeout);</div><div class='ctx'> </div><div class='ctx'> 	if (!running)</div><div class='del'>-		mt7615_mac_reset_counters(dev);</div><div class='add'>+		mt7615_mac_reset_counters(phy);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	mt7615_mutex_release(dev);</div><div class='hunk'>@@ -90,13 +91,13 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt7615_stop(struct ieee80211_hw *hw)</div><div class='add'>+static void mt7615_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_dev *dev = mt7615_hw_dev(hw);</div><div class='ctx'> 	struct mt7615_phy *phy = mt7615_hw_phy(hw);</div><div class='ctx'> </div><div class='ctx'> 	cancel_delayed_work_sync(&amp;phy-&gt;mt76-&gt;mac_work);</div><div class='del'>-	del_timer_sync(&amp;phy-&gt;roc_timer);</div><div class='add'>+	timer_delete_sync(&amp;phy-&gt;roc_timer);</div><div class='ctx'> 	cancel_work_sync(&amp;phy-&gt;roc_work);</div><div class='ctx'> </div><div class='ctx'> 	cancel_delayed_work_sync(&amp;dev-&gt;pm.ps_work);</div><div class='hunk'>@@ -134,17 +135,12 @@ static int get_omac_idx(enum nl80211_iftype type, u64 mask)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='del'>-	case NL80211_IFTYPE_MESH_POINT:</div><div class='del'>-	case NL80211_IFTYPE_ADHOC:</div><div class='ctx'> 	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 		/* prefer hw bssid slot 1-3 */</div><div class='ctx'> 		i = get_free_idx(mask, HW_BSSID_1, HW_BSSID_3);</div><div class='ctx'> 		if (i)</div><div class='ctx'> 			return i - 1;</div><div class='ctx'> </div><div class='del'>-		if (type != NL80211_IFTYPE_STATION)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='ctx'> 		/* next, try to find a free repeater entry for the sta */</div><div class='ctx'> 		i = get_free_idx(mask &gt;&gt; REPEATER_BSSID_START, 0,</div><div class='ctx'> 				 REPEATER_BSSID_MAX - REPEATER_BSSID_START);</div><div class='hunk'>@@ -159,6 +155,8 @@ static int get_omac_idx(enum nl80211_iftype type, u64 mask)</div><div class='ctx'> 			return HW_BSSID_0;</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='add'>+	case NL80211_IFTYPE_MESH_POINT:</div><div class='ctx'> 	case NL80211_IFTYPE_MONITOR:</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='ctx'> 		/* ap uses hw bssid 0 and ext bssid */</div><div class='hunk'>@@ -196,7 +194,7 @@ static int mt7615_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	    is_zero_ether_addr(vif-&gt;addr))</div><div class='ctx'> 		phy-&gt;monitor_vif = vif;</div><div class='ctx'> </div><div class='del'>-	mvif-&gt;mt76.idx = ffs(~dev-&gt;mt76.vif_mask) - 1;</div><div class='add'>+	mvif-&gt;mt76.idx = __ffs64(~dev-&gt;mt76.vif_mask);</div><div class='ctx'> 	if (mvif-&gt;mt76.idx &gt;= MT7615_MAX_INTERFACES) {</div><div class='ctx'> 		ret = -ENOSPC;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -210,13 +208,12 @@ static int mt7615_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	mvif-&gt;mt76.omac_idx = idx;</div><div class='ctx'> </div><div class='ctx'> 	mvif-&gt;mt76.band_idx = ext_phy;</div><div class='del'>-	if (mt7615_ext_phy(dev))</div><div class='del'>-		mvif-&gt;mt76.wmm_idx = ext_phy * (MT7615_MAX_WMM_SETS / 2) +</div><div class='del'>-				mvif-&gt;mt76.idx % (MT7615_MAX_WMM_SETS / 2);</div><div class='del'>-	else</div><div class='del'>-		mvif-&gt;mt76.wmm_idx = mvif-&gt;mt76.idx % MT7615_MAX_WMM_SETS;</div><div class='add'>+	mvif-&gt;mt76.wmm_idx = vif-&gt;type != NL80211_IFTYPE_AP;</div><div class='add'>+	mvif-&gt;mt76.wcid = &amp;mvif-&gt;sta.wcid;</div><div class='add'>+	if (ext_phy)</div><div class='add'>+		mvif-&gt;mt76.wmm_idx += 2;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mt76.vif_mask |= BIT(mvif-&gt;mt76.idx);</div><div class='add'>+	dev-&gt;mt76.vif_mask |= BIT_ULL(mvif-&gt;mt76.idx);</div><div class='ctx'> 	dev-&gt;omac_mask |= BIT_ULL(mvif-&gt;mt76.omac_idx);</div><div class='ctx'> 	phy-&gt;omac_mask |= BIT_ULL(mvif-&gt;mt76.omac_idx);</div><div class='ctx'> </div><div class='hunk'>@@ -226,22 +223,20 @@ static int mt7615_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	idx = MT7615_WTBL_RESERVED - mvif-&gt;mt76.idx;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;mvif-&gt;sta.poll_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;mvif-&gt;sta.wcid.poll_list);</div><div class='ctx'> 	mvif-&gt;sta.wcid.idx = idx;</div><div class='del'>-	mvif-&gt;sta.wcid.ext_phy = mvif-&gt;mt76.band_idx;</div><div class='del'>-	mvif-&gt;sta.wcid.hw_key_idx = -1;</div><div class='add'>+	mt76_wcid_init(&amp;mvif-&gt;sta.wcid, mvif-&gt;mt76.band_idx);</div><div class='add'>+</div><div class='ctx'> 	mt7615_mac_wtbl_update(dev, idx,</div><div class='ctx'> 			       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);</div><div class='ctx'> </div><div class='ctx'> 	rcu_assign_pointer(dev-&gt;mt76.wcid[idx], &amp;mvif-&gt;sta.wcid);</div><div class='ctx'> 	if (vif-&gt;txq) {</div><div class='ctx'> 		mtxq = (struct mt76_txq *)vif-&gt;txq-&gt;drv_priv;</div><div class='del'>-		mtxq-&gt;wcid = &amp;mvif-&gt;sta.wcid;</div><div class='add'>+		mtxq-&gt;wcid = idx;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = mt7615_mcu_add_dev_info(phy, vif, true);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='ctx'> out:</div><div class='ctx'> 	mt7615_mutex_release(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -272,51 +267,28 @@ static void mt7615_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	rcu_assign_pointer(dev-&gt;mt76.wcid[idx], NULL);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mt76.vif_mask &amp;= ~BIT(mvif-&gt;mt76.idx);</div><div class='add'>+	dev-&gt;mt76.vif_mask &amp;= ~BIT_ULL(mvif-&gt;mt76.idx);</div><div class='ctx'> 	dev-&gt;omac_mask &amp;= ~BIT_ULL(mvif-&gt;mt76.omac_idx);</div><div class='ctx'> 	phy-&gt;omac_mask &amp;= ~BIT_ULL(mvif-&gt;mt76.omac_idx);</div><div class='ctx'> </div><div class='ctx'> 	mt7615_mutex_release(dev);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-	if (!list_empty(&amp;msta-&gt;poll_list))</div><div class='del'>-		list_del_init(&amp;msta-&gt;poll_list);</div><div class='del'>-	spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mt7615_init_dfs_state(struct mt7615_phy *phy)</div><div class='del'>-{</div><div class='del'>-	struct mt76_phy *mphy = phy-&gt;mt76;</div><div class='del'>-	struct ieee80211_hw *hw = mphy-&gt;hw;</div><div class='del'>-	struct cfg80211_chan_def *chandef = &amp;hw-&gt;conf.chandef;</div><div class='del'>-</div><div class='del'>-	if (hw-&gt;conf.flags &amp; IEEE80211_CONF_OFFCHANNEL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!(chandef-&gt;chan-&gt;flags &amp; IEEE80211_CHAN_RADAR))</div><div class='del'>-		return;</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='add'>+	if (!list_empty(&amp;msta-&gt;wcid.poll_list))</div><div class='add'>+		list_del_init(&amp;msta-&gt;wcid.poll_list);</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='ctx'> </div><div class='del'>-	if (mphy-&gt;chandef.chan-&gt;center_freq == chandef-&gt;chan-&gt;center_freq &amp;&amp;</div><div class='del'>-	    mphy-&gt;chandef.width == chandef-&gt;width)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	phy-&gt;dfs_state = -1;</div><div class='add'>+	mt76_wcid_cleanup(&amp;dev-&gt;mt76, &amp;mvif-&gt;sta.wcid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7615_set_channel(struct mt7615_phy *phy)</div><div class='add'>+int mt7615_set_channel(struct mt76_phy *mphy)</div><div class='ctx'> {</div><div class='add'>+	struct mt7615_phy *phy = mphy-&gt;priv;</div><div class='ctx'> 	struct mt7615_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	cancel_delayed_work_sync(&amp;phy-&gt;mt76-&gt;mac_work);</div><div class='del'>-</div><div class='del'>-	mt7615_mutex_acquire(dev);</div><div class='del'>-</div><div class='del'>-	set_bit(MT76_RESET, &amp;phy-&gt;mt76-&gt;state);</div><div class='del'>-</div><div class='del'>-	mt7615_init_dfs_state(phy);</div><div class='del'>-	mt76_set_channel(phy-&gt;mt76);</div><div class='add'>+	mt76_connac_pm_wake(mphy, &amp;dev-&gt;pm);</div><div class='ctx'> </div><div class='ctx'> 	if (is_mt7615(&amp;dev-&gt;mt76) &amp;&amp; dev-&gt;flash_eeprom) {</div><div class='ctx'> 		ret = mt7615_mcu_apply_rx_dcoc(phy);</div><div class='hunk'>@@ -328,7 +300,7 @@ int mt7615_set_channel(struct mt7615_phy *phy)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = mt7615_mcu_set_chan_info(phy, MCU_EXT_CMD_CHANNEL_SWITCH);</div><div class='add'>+	ret = mt7615_mcu_set_chan_info(phy, MCU_EXT_CMD(CHANNEL_SWITCH));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -342,29 +314,30 @@ int mt7615_set_channel(struct mt7615_phy *phy)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	mt7615_mac_reset_counters(dev);</div><div class='add'>+	mt7615_mac_reset_counters(phy);</div><div class='ctx'> 	phy-&gt;noise = 0;</div><div class='ctx'> 	phy-&gt;chfreq = mt76_rr(dev, MT_CHFREQ(ext_phy));</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	clear_bit(MT76_RESET, &amp;phy-&gt;mt76-&gt;state);</div><div class='add'>+	mt76_connac_power_save_sched(mphy, &amp;dev-&gt;pm);</div><div class='ctx'> </div><div class='del'>-	mt7615_mutex_release(dev);</div><div class='add'>+	if (!mt76_testmode_enabled(phy-&gt;mt76)) {</div><div class='add'>+		unsigned long timeout = mt7615_get_macwork_timeout(dev);</div><div class='ctx'> </div><div class='del'>-	mt76_worker_schedule(&amp;dev-&gt;mt76.tx_worker);</div><div class='del'>-	if (!mt76_testmode_enabled(phy-&gt;mt76))</div><div class='ctx'> 		ieee80211_queue_delayed_work(phy-&gt;mt76-&gt;hw,</div><div class='del'>-					     &amp;phy-&gt;mt76-&gt;mac_work,</div><div class='del'>-					     MT7615_WATCHDOG_TIME);</div><div class='add'>+					     &amp;phy-&gt;mt76-&gt;mac_work, timeout);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7615_set_channel);</div><div class='ctx'> </div><div class='ctx'> static int mt7615_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 			  struct ieee80211_vif *vif, struct ieee80211_sta *sta,</div><div class='ctx'> 			  struct ieee80211_key_conf *key)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_dev *dev = mt7615_hw_dev(hw);</div><div class='add'>+	struct mt7615_phy *phy = mt7615_hw_phy(hw);</div><div class='ctx'> 	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct mt7615_sta *msta = sta ? (struct mt7615_sta *)sta-&gt;drv_priv :</div><div class='ctx'> 				  &amp;mvif-&gt;sta;</div><div class='hunk'>@@ -403,20 +376,24 @@ static int mt7615_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> </div><div class='ctx'> 	mt7615_mutex_acquire(dev);</div><div class='ctx'> </div><div class='add'>+	if (cmd == SET_KEY &amp;&amp; !sta &amp;&amp; !mvif-&gt;mt76.cipher) {</div><div class='add'>+		mvif-&gt;mt76.cipher = mt76_connac_mcu_get_cipher(key-&gt;cipher);</div><div class='add'>+		mt7615_mcu_add_bss_info(phy, vif, NULL, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (cmd == SET_KEY)</div><div class='ctx'> 		*wcid_keyidx = idx;</div><div class='del'>-	else if (idx == *wcid_keyidx)</div><div class='del'>-		*wcid_keyidx = -1;</div><div class='del'>-	else</div><div class='add'>+	else {</div><div class='add'>+		if (idx == *wcid_keyidx)</div><div class='add'>+			*wcid_keyidx = -1;</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mt76_wcid_key_setup(&amp;dev-&gt;mt76, wcid,</div><div class='del'>-			    cmd == SET_KEY ? key : NULL);</div><div class='del'>-</div><div class='add'>+	mt76_wcid_key_setup(&amp;dev-&gt;mt76, wcid, key);</div><div class='ctx'> 	if (mt76_is_mmio(&amp;dev-&gt;mt76))</div><div class='del'>-		err = mt7615_mac_wtbl_set_key(dev, wcid, key, cmd);</div><div class='add'>+		err = mt7615_mac_wtbl_set_key(dev, wcid, key);</div><div class='ctx'> 	else</div><div class='del'>-		err = __mt7615_mac_wtbl_set_key(dev, wcid, key, cmd);</div><div class='add'>+		err = __mt7615_mac_wtbl_set_key(dev, wcid, key);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	mt7615_mutex_release(dev);</div><div class='hunk'>@@ -424,7 +401,26 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7615_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+static int mt7615_set_sar_specs(struct ieee80211_hw *hw,</div><div class='add'>+				const struct cfg80211_sar_specs *sar)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_phy *phy = mt7615_hw_phy(hw);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!cfg80211_chandef_valid(&amp;phy-&gt;mt76-&gt;chandef))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = mt76_init_sar_power(hw, sar);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (mt7615_firmware_offload(phy-&gt;dev))</div><div class='add'>+		return mt76_connac_mcu_set_rate_txpower(phy-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	return mt76_update_channel(phy-&gt;mt76);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7615_config(struct ieee80211_hw *hw, int radio_idx, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_dev *dev = mt7615_hw_dev(hw);</div><div class='ctx'> 	struct mt7615_phy *phy = mt7615_hw_phy(hw);</div><div class='hunk'>@@ -440,9 +436,7 @@ static int mt7615_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> 			mt7615_mutex_release(dev);</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='del'>-		ieee80211_stop_queues(hw);</div><div class='del'>-		ret = mt7615_set_channel(phy);</div><div class='del'>-		ieee80211_wake_queues(hw);</div><div class='add'>+		ret = mt76_update_channel(phy-&gt;mt76);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mt7615_mutex_acquire(dev);</div><div class='hunk'>@@ -464,10 +458,11 @@ static int mt7615_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt7615_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue,</div><div class='add'>+mt7615_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+	       unsigned int link_id, u16 queue,</div><div class='ctx'> 	       const struct ieee80211_tx_queue_params *params)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_vif *mvif = (struct mt76_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct mt7615_dev *dev = mt7615_hw_dev(hw);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -543,10 +538,36 @@ static void mt7615_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> 	mt7615_mutex_release(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+mt7615_update_mu_group(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		       struct ieee80211_bss_conf *info)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7615_dev *dev = mt7615_hw_dev(hw);</div><div class='add'>+	u8 i, band = mvif-&gt;mt76.band_idx;</div><div class='add'>+	u32 *mu;</div><div class='add'>+</div><div class='add'>+	mu = (u32 *)info-&gt;mu_group.membership;</div><div class='add'>+	for (i = 0; i &lt; WLAN_MEMBERSHIP_LEN / sizeof(*mu); i++) {</div><div class='add'>+		if (is_mt7663(&amp;dev-&gt;mt76))</div><div class='add'>+			mt76_wr(dev, MT7663_WF_PHY_GID_TAB_VLD(band, i), mu[i]);</div><div class='add'>+		else</div><div class='add'>+			mt76_wr(dev, MT_WF_PHY_GID_TAB_VLD(band, i), mu[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mu = (u32 *)info-&gt;mu_group.position;</div><div class='add'>+	for (i = 0; i &lt; WLAN_USER_POSITION_LEN / sizeof(*mu); i++) {</div><div class='add'>+		if (is_mt7663(&amp;dev-&gt;mt76))</div><div class='add'>+			mt76_wr(dev, MT7663_WF_PHY_GID_TAB_POS(band, i), mu[i]);</div><div class='add'>+		else</div><div class='add'>+			mt76_wr(dev, MT_WF_PHY_GID_TAB_POS(band, i), mu[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void mt7615_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 				    struct ieee80211_vif *vif,</div><div class='ctx'> 				    struct ieee80211_bss_conf *info,</div><div class='del'>-				    u32 changed)</div><div class='add'>+				    u64 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_dev *dev = mt7615_hw_dev(hw);</div><div class='ctx'> 	struct mt7615_phy *phy = mt7615_hw_phy(hw);</div><div class='hunk'>@@ -562,12 +583,15 @@ static void mt7615_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (changed &amp; BSS_CHANGED_ERP_CTS_PROT)</div><div class='add'>+		mt7615_mac_enable_rtscts(dev, vif, info-&gt;use_cts_prot);</div><div class='add'>+</div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_BEACON_ENABLED &amp;&amp; info-&gt;enable_beacon) {</div><div class='ctx'> 		mt7615_mcu_add_bss_info(phy, vif, NULL, true);</div><div class='ctx'> 		mt7615_mcu_sta_add(phy, vif, NULL, true);</div><div class='ctx'> </div><div class='del'>-		if (vif-&gt;p2p)</div><div class='del'>-			mt7615_mcu_set_p2p_oppps(hw, vif);</div><div class='add'>+		if (mt7615_firmware_offload(dev) &amp;&amp; vif-&gt;p2p)</div><div class='add'>+			mt76_connac_mcu_set_p2p_oppps(hw, vif);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; (BSS_CHANGED_BEACON |</div><div class='hunk'>@@ -586,7 +610,10 @@ static void mt7615_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_ASSOC)</div><div class='del'>-		mt7615_mac_set_beacon_filter(phy, vif, info-&gt;assoc);</div><div class='add'>+		mt7615_mac_set_beacon_filter(phy, vif, vif-&gt;cfg.assoc);</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_MU_GROUPS)</div><div class='add'>+		 mt7615_update_mu_group(hw, vif, info);</div><div class='ctx'> </div><div class='ctx'> 	mt7615_mutex_release(dev);</div><div class='ctx'> }</div><div class='hunk'>@@ -616,11 +643,11 @@ int mt7615_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='ctx'> 	if (idx &lt; 0)</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;msta-&gt;poll_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;msta-&gt;wcid.poll_list);</div><div class='ctx'> 	msta-&gt;vif = mvif;</div><div class='ctx'> 	msta-&gt;wcid.sta = 1;</div><div class='ctx'> 	msta-&gt;wcid.idx = idx;</div><div class='del'>-	msta-&gt;wcid.ext_phy = mvif-&gt;mt76.band_idx;</div><div class='add'>+	msta-&gt;wcid.phy_idx = mvif-&gt;mt76.band_idx;</div><div class='ctx'> </div><div class='ctx'> 	phy = mvif-&gt;mt76.band_idx ? mt7615_ext_phy(dev) : &amp;dev-&gt;phy;</div><div class='ctx'> 	err = mt76_connac_pm_wake(phy-&gt;mt76, &amp;dev-&gt;pm);</div><div class='hunk'>@@ -664,10 +691,10 @@ void mt7615_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; !sta-&gt;tdls)</div><div class='ctx'> 		mt7615_mcu_add_bss_info(phy, vif, sta, false);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-	if (!list_empty(&amp;msta-&gt;poll_list))</div><div class='del'>-		list_del_init(&amp;msta-&gt;poll_list);</div><div class='del'>-	spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+	spin_lock_bh(&amp;mdev-&gt;sta_poll_lock);</div><div class='add'>+	if (!list_empty(&amp;msta-&gt;wcid.poll_list))</div><div class='add'>+		list_del_init(&amp;msta-&gt;wcid.poll_list);</div><div class='add'>+	spin_unlock_bh(&amp;mdev-&gt;sta_poll_lock);</div><div class='ctx'> </div><div class='ctx'> 	mt76_connac_power_save_sched(phy-&gt;mt76, &amp;dev-&gt;pm);</div><div class='ctx'> }</div><div class='hunk'>@@ -683,6 +710,9 @@ static void mt7615_sta_rate_tbl_update(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct ieee80211_sta_rates *sta_rates = rcu_dereference(sta-&gt;rates);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (!sta_rates)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_bh(&amp;dev-&gt;mt76.lock);</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(msta-&gt;rates); i++) {</div><div class='ctx'> 		msta-&gt;rates[i].idx = sta_rates-&gt;rate[i].idx;</div><div class='hunk'>@@ -695,7 +725,7 @@ static void mt7615_sta_rate_tbl_update(struct ieee80211_hw *hw,</div><div class='ctx'> 	msta-&gt;n_rates = i;</div><div class='ctx'> 	if (mt76_connac_pm_ref(phy-&gt;mt76, &amp;dev-&gt;pm)) {</div><div class='ctx'> 		mt7615_mac_set_rates(phy, msta, NULL, msta-&gt;rates);</div><div class='del'>-		mt76_connac_pm_unref(&amp;dev-&gt;pm);</div><div class='add'>+		mt76_connac_pm_unref(phy-&gt;mt76, &amp;dev-&gt;pm);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;dev-&gt;mt76.lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -711,7 +741,7 @@ void mt7615_tx_worker(struct mt76_worker *w)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mt76_tx_worker_run(&amp;dev-&gt;mt76);</div><div class='del'>-	mt76_connac_pm_unref(&amp;dev-&gt;pm);</div><div class='add'>+	mt76_connac_pm_unref(&amp;dev-&gt;mphy, &amp;dev-&gt;pm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mt7615_tx(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -741,7 +771,7 @@ static void mt7615_tx(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	if (mt76_connac_pm_ref(mphy, &amp;dev-&gt;pm)) {</div><div class='ctx'> 		mt76_tx(mphy, control-&gt;sta, wcid, skb);</div><div class='del'>-		mt76_connac_pm_unref(&amp;dev-&gt;pm);</div><div class='add'>+		mt76_connac_pm_unref(mphy, &amp;dev-&gt;pm);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -754,7 +784,8 @@ static void mt7615_tx(struct ieee80211_hw *hw,</div><div class='ctx'> 	mt76_connac_pm_queue_skb(hw, &amp;dev-&gt;pm, wcid, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7615_set_rts_threshold(struct ieee80211_hw *hw, u32 val)</div><div class='add'>+static int mt7615_set_rts_threshold(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+				    u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_dev *dev = mt7615_hw_dev(hw);</div><div class='ctx'> 	struct mt7615_phy *phy = mt7615_hw_phy(hw);</div><div class='hunk'>@@ -857,8 +888,6 @@ mt7615_get_stats(struct ieee80211_hw *hw,</div><div class='ctx'> 	stats-&gt;dot11FCSErrorCount = mib-&gt;fcs_err_cnt;</div><div class='ctx'> 	stats-&gt;dot11ACKFailureCount = mib-&gt;ack_fail_cnt;</div><div class='ctx'> </div><div class='del'>-	memset(mib, 0, sizeof(*mib));</div><div class='del'>-</div><div class='ctx'> 	mt7615_mutex_release(phy-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -881,7 +910,8 @@ mt7615_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> </div><div class='ctx'> 	mt7615_mutex_acquire(dev);</div><div class='ctx'> </div><div class='del'>-	mt76_set(dev, reg, MT_LPON_TCR_MODE); /* TSF read */</div><div class='add'>+	/* TSF read */</div><div class='add'>+	mt76_rmw(dev, reg, MT_LPON_TCR_MODE, MT_LPON_TCR_READ);</div><div class='ctx'> 	tsf.t32[0] = mt76_rr(dev, MT_LPON_UTTR0);</div><div class='ctx'> 	tsf.t32[1] = mt76_rr(dev, MT_LPON_UTTR1);</div><div class='ctx'> </div><div class='hunk'>@@ -911,13 +941,40 @@ mt7615_set_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	mt76_wr(dev, MT_LPON_UTTR0, tsf.t32[0]);</div><div class='ctx'> 	mt76_wr(dev, MT_LPON_UTTR1, tsf.t32[1]);</div><div class='ctx'> 	/* TSF software overwrite */</div><div class='del'>-	mt76_set(dev, reg, MT_LPON_TCR_WRITE);</div><div class='add'>+	mt76_rmw(dev, reg, MT_LPON_TCR_MODE, MT_LPON_TCR_WRITE);</div><div class='add'>+</div><div class='add'>+	mt7615_mutex_release(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7615_offset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		  s64 timestamp)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7615_dev *dev = mt7615_hw_dev(hw);</div><div class='add'>+	union {</div><div class='add'>+		u64 t64;</div><div class='add'>+		u32 t32[2];</div><div class='add'>+	} tsf = { .t64 = timestamp, };</div><div class='add'>+	u16 idx = mvif-&gt;mt76.omac_idx;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	idx = idx &gt; HW_BSSID_MAX ? HW_BSSID_0 : idx;</div><div class='add'>+	reg = idx &gt; 1 ? MT_LPON_TCR2(idx): MT_LPON_TCR0(idx);</div><div class='add'>+</div><div class='add'>+	mt7615_mutex_acquire(dev);</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_LPON_UTTR0, tsf.t32[0]);</div><div class='add'>+	mt76_wr(dev, MT_LPON_UTTR1, tsf.t32[1]);</div><div class='add'>+	/* TSF software adjust*/</div><div class='add'>+	mt76_rmw(dev, reg, MT_LPON_TCR_MODE, MT_LPON_TCR_ADJUST);</div><div class='ctx'> </div><div class='ctx'> 	mt7615_mutex_release(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7615_set_coverage_class(struct ieee80211_hw *hw, s16 coverage_class)</div><div class='add'>+mt7615_set_coverage_class(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+			  s16 coverage_class)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_phy *phy = mt7615_hw_phy(hw);</div><div class='ctx'> 	struct mt7615_dev *dev = phy-&gt;dev;</div><div class='hunk'>@@ -929,7 +986,8 @@ mt7615_set_coverage_class(struct ieee80211_hw *hw, s16 coverage_class)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt7615_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)</div><div class='add'>+mt7615_set_antenna(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+		   u32 tx_ant, u32 rx_ant)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_dev *dev = mt7615_hw_dev(hw);</div><div class='ctx'> 	struct mt7615_phy *phy = mt7615_hw_phy(hw);</div><div class='hunk'>@@ -988,7 +1046,7 @@ void mt7615_roc_work(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> void mt7615_roc_timer(struct timer_list *timer)</div><div class='ctx'> {</div><div class='del'>-	struct mt7615_phy *phy = from_timer(phy, timer, roc_timer);</div><div class='add'>+	struct mt7615_phy *phy = timer_container_of(phy, timer, roc_timer);</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_queue_work(phy-&gt;mt76-&gt;hw, &amp;phy-&gt;roc_work);</div><div class='ctx'> }</div><div class='hunk'>@@ -1139,7 +1197,7 @@ static int mt7615_cancel_remain_on_channel(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (!test_and_clear_bit(MT76_STATE_ROC, &amp;phy-&gt;mt76-&gt;state))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;phy-&gt;roc_timer);</div><div class='add'>+	timer_delete_sync(&amp;phy-&gt;roc_timer);</div><div class='ctx'> 	cancel_work_sync(&amp;phy-&gt;roc_work);</div><div class='ctx'> </div><div class='ctx'> 	mt7615_mutex_acquire(phy-&gt;dev);</div><div class='hunk'>@@ -1157,12 +1215,16 @@ static void mt7615_sta_set_decap_offload(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct mt7615_dev *dev = mt7615_hw_dev(hw);</div><div class='ctx'> 	struct mt7615_sta *msta = (struct mt7615_sta *)sta-&gt;drv_priv;</div><div class='ctx'> </div><div class='add'>+	mt7615_mutex_acquire(dev);</div><div class='add'>+</div><div class='ctx'> 	if (enabled)</div><div class='ctx'> 		set_bit(MT_WCID_FLAG_HDR_TRANS, &amp;msta-&gt;wcid.flags);</div><div class='ctx'> 	else</div><div class='ctx'> 		clear_bit(MT_WCID_FLAG_HDR_TRANS, &amp;msta-&gt;wcid.flags);</div><div class='ctx'> </div><div class='del'>-	mt7615_mcu_sta_update_hdr_trans(dev, vif, sta);</div><div class='add'>+	mt7615_mcu_set_sta_decap_offload(dev, vif, sta);</div><div class='add'>+</div><div class='add'>+	mt7615_mutex_release(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -1189,7 +1251,7 @@ static int mt7615_suspend(struct ieee80211_hw *hw,</div><div class='ctx'> 					    phy-&gt;mt76);</div><div class='ctx'> </div><div class='ctx'> 	if (!mt7615_dev_running(dev))</div><div class='del'>-		err = mt76_connac_mcu_set_hif_suspend(&amp;dev-&gt;mt76, true);</div><div class='add'>+		err = mt76_connac_mcu_set_hif_suspend(&amp;dev-&gt;mt76, true, true);</div><div class='ctx'> </div><div class='ctx'> 	mt7615_mutex_release(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1200,6 +1262,7 @@ static int mt7615_resume(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_phy *phy = mt7615_hw_phy(hw);</div><div class='ctx'> 	struct mt7615_dev *dev = mt7615_hw_dev(hw);</div><div class='add'>+	unsigned long timeout;</div><div class='ctx'> 	bool running;</div><div class='ctx'> </div><div class='ctx'> 	mt7615_mutex_acquire(dev);</div><div class='hunk'>@@ -1210,7 +1273,7 @@ static int mt7615_resume(struct ieee80211_hw *hw)</div><div class='ctx'> 	if (!running) {</div><div class='ctx'> 		int err;</div><div class='ctx'> </div><div class='del'>-		err = mt76_connac_mcu_set_hif_suspend(&amp;dev-&gt;mt76, false);</div><div class='add'>+		err = mt76_connac_mcu_set_hif_suspend(&amp;dev-&gt;mt76, false, true);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='ctx'> 			mt7615_mutex_release(dev);</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -1223,8 +1286,8 @@ static int mt7615_resume(struct ieee80211_hw *hw)</div><div class='ctx'> 					    mt76_connac_mcu_set_suspend_iter,</div><div class='ctx'> 					    phy-&gt;mt76);</div><div class='ctx'> </div><div class='del'>-	ieee80211_queue_delayed_work(hw, &amp;phy-&gt;mt76-&gt;mac_work,</div><div class='del'>-				     MT7615_WATCHDOG_TIME);</div><div class='add'>+	timeout = mt7615_get_macwork_timeout(dev);</div><div class='add'>+	ieee80211_queue_delayed_work(hw, &amp;phy-&gt;mt76-&gt;mac_work, timeout);</div><div class='ctx'> </div><div class='ctx'> 	mt7615_mutex_release(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1252,6 +1315,10 @@ static void mt7615_set_rekey_data(struct ieee80211_hw *hw,</div><div class='ctx'> #endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='ctx'> const struct ieee80211_ops mt7615_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.tx = mt7615_tx,</div><div class='ctx'> 	.start = mt7615_start,</div><div class='ctx'> 	.stop = mt7615_stop,</div><div class='hunk'>@@ -1278,6 +1345,7 @@ const struct ieee80211_ops mt7615_ops = {</div><div class='ctx'> 	.get_stats = mt7615_get_stats,</div><div class='ctx'> 	.get_tsf = mt7615_get_tsf,</div><div class='ctx'> 	.set_tsf = mt7615_set_tsf,</div><div class='add'>+	.offset_tsf = mt7615_offset_tsf,</div><div class='ctx'> 	.get_survey = mt76_get_survey,</div><div class='ctx'> 	.get_antenna = mt76_get_antenna,</div><div class='ctx'> 	.set_antenna = mt7615_set_antenna,</div><div class='hunk'>@@ -1296,7 +1364,9 @@ const struct ieee80211_ops mt7615_ops = {</div><div class='ctx'> 	.set_wakeup = mt7615_set_wakeup,</div><div class='ctx'> 	.set_rekey_data = mt7615_set_rekey_data,</div><div class='ctx'> #endif /* CONFIG_PM */</div><div class='add'>+	.set_sar_specs = mt7615_set_sar_specs,</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt7615_ops);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("MediaTek MT7615E and MT7663E wireless driver");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c<br/>index aa42af9ebfd6..fc0054f8bd60 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/mcu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/mcu.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2019 MediaTek Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Roy Luo &lt;royluo@google.com&gt;</div><div class='hunk'>@@ -40,18 +40,6 @@ struct mt7615_fw_trailer {</div><div class='ctx'> #define FW_START_DLYCAL                 BIT(1)</div><div class='ctx'> #define FW_START_WORKING_PDA_CR4	BIT(2)</div><div class='ctx'> </div><div class='del'>-struct mt7663_fw_trailer {</div><div class='del'>-	u8 chip_id;</div><div class='del'>-	u8 eco_code;</div><div class='del'>-	u8 n_region;</div><div class='del'>-	u8 format_ver;</div><div class='del'>-	u8 format_flag;</div><div class='del'>-	u8 reserv[2];</div><div class='del'>-	char fw_ver[10];</div><div class='del'>-	char build_date[15];</div><div class='del'>-	__le32 crc;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='ctx'> struct mt7663_fw_buf {</div><div class='ctx'> 	__le32 crc;</div><div class='ctx'> 	__le32 d_img_size;</div><div class='hunk'>@@ -71,23 +59,10 @@ struct mt7663_fw_buf {</div><div class='ctx'> </div><div class='ctx'> #define IMG_CRC_LEN			4</div><div class='ctx'> </div><div class='del'>-#define FW_FEATURE_SET_ENCRYPT		BIT(0)</div><div class='del'>-#define FW_FEATURE_SET_KEY_IDX		GENMASK(2, 1)</div><div class='del'>-</div><div class='del'>-#define DL_MODE_ENCRYPT			BIT(0)</div><div class='del'>-#define DL_MODE_KEY_IDX			GENMASK(2, 1)</div><div class='del'>-#define DL_MODE_RESET_SEC_IV		BIT(3)</div><div class='del'>-#define DL_MODE_WORKING_PDA_CR4		BIT(4)</div><div class='del'>-#define DL_MODE_VALID_RAM_ENTRY         BIT(5)</div><div class='del'>-#define DL_MODE_NEED_RSP		BIT(31)</div><div class='del'>-</div><div class='del'>-#define FW_START_OVERRIDE		BIT(0)</div><div class='del'>-#define FW_START_WORKING_PDA_CR4	BIT(2)</div><div class='del'>-</div><div class='ctx'> void mt7615_mcu_fill_msg(struct mt7615_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 			 int cmd, int *wait_seq)</div><div class='ctx'> {</div><div class='del'>-	int txd_len, mcu_cmd = cmd &amp; MCU_CMD_MASK;</div><div class='add'>+	int txd_len, mcu_cmd = FIELD_GET(__MCU_CMD_FIELD_ID, cmd);</div><div class='ctx'> 	struct mt7615_uni_txd *uni_txd;</div><div class='ctx'> 	struct mt7615_mcu_txd *mcu_txd;</div><div class='ctx'> 	u8 seq, q_idx, pkt_fmt;</div><div class='hunk'>@@ -103,10 +78,10 @@ void mt7615_mcu_fill_msg(struct mt7615_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 	if (wait_seq)</div><div class='ctx'> 		*wait_seq = seq;</div><div class='ctx'> </div><div class='del'>-	txd_len = cmd &amp; MCU_UNI_PREFIX ? sizeof(*uni_txd) : sizeof(*mcu_txd);</div><div class='add'>+	txd_len = cmd &amp; __MCU_CMD_FIELD_UNI ? sizeof(*uni_txd) : sizeof(*mcu_txd);</div><div class='ctx'> 	txd = (__le32 *)skb_push(skb, txd_len);</div><div class='ctx'> </div><div class='del'>-	if (cmd != MCU_CMD_FW_SCATTER) {</div><div class='add'>+	if (cmd != MCU_CMD(FW_SCATTER)) {</div><div class='ctx'> 		q_idx = MT_TX_MCU_PORT_RX_Q0;</div><div class='ctx'> 		pkt_fmt = MT_TX_TYPE_CMD;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -124,7 +99,7 @@ void mt7615_mcu_fill_msg(struct mt7615_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 	      FIELD_PREP(MT_TXD1_PKT_FMT, pkt_fmt);</div><div class='ctx'> 	txd[1] = cpu_to_le32(val);</div><div class='ctx'> </div><div class='del'>-	if (cmd &amp; MCU_UNI_PREFIX) {</div><div class='add'>+	if (cmd &amp; __MCU_CMD_FIELD_UNI) {</div><div class='ctx'> 		uni_txd = (struct mt7615_uni_txd *)txd;</div><div class='ctx'> 		uni_txd-&gt;len = cpu_to_le16(skb-&gt;len - sizeof(uni_txd-&gt;txd));</div><div class='ctx'> 		uni_txd-&gt;option = MCU_CMD_UNI_EXT_ACK;</div><div class='hunk'>@@ -142,28 +117,17 @@ void mt7615_mcu_fill_msg(struct mt7615_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 	mcu_txd-&gt;s2d_index = MCU_S2D_H2N;</div><div class='ctx'> 	mcu_txd-&gt;pkt_type = MCU_PKT_ID;</div><div class='ctx'> 	mcu_txd-&gt;seq = seq;</div><div class='add'>+	mcu_txd-&gt;cid = mcu_cmd;</div><div class='add'>+	mcu_txd-&gt;ext_cid = FIELD_GET(__MCU_CMD_FIELD_EXT_ID, cmd);</div><div class='ctx'> </div><div class='del'>-	switch (cmd &amp; ~MCU_CMD_MASK) {</div><div class='del'>-	case MCU_FW_PREFIX:</div><div class='del'>-		mcu_txd-&gt;set_query = MCU_Q_NA;</div><div class='del'>-		mcu_txd-&gt;cid = mcu_cmd;</div><div class='del'>-		break;</div><div class='del'>-	case MCU_CE_PREFIX:</div><div class='del'>-		if (cmd &amp; MCU_QUERY_MASK)</div><div class='add'>+	if (mcu_txd-&gt;ext_cid || (cmd &amp; __MCU_CMD_FIELD_CE)) {</div><div class='add'>+		if (cmd &amp; __MCU_CMD_FIELD_QUERY)</div><div class='ctx'> 			mcu_txd-&gt;set_query = MCU_Q_QUERY;</div><div class='ctx'> 		else</div><div class='ctx'> 			mcu_txd-&gt;set_query = MCU_Q_SET;</div><div class='del'>-		mcu_txd-&gt;cid = mcu_cmd;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		mcu_txd-&gt;cid = MCU_CMD_EXT_CID;</div><div class='del'>-		if (cmd &amp; MCU_QUERY_PREFIX)</div><div class='del'>-			mcu_txd-&gt;set_query = MCU_Q_QUERY;</div><div class='del'>-		else</div><div class='del'>-			mcu_txd-&gt;set_query = MCU_Q_SET;</div><div class='del'>-		mcu_txd-&gt;ext_cid = mcu_cmd;</div><div class='del'>-		mcu_txd-&gt;ext_cid_ack = 1;</div><div class='del'>-		break;</div><div class='add'>+		mcu_txd-&gt;ext_cid_ack = !!mcu_txd-&gt;ext_cid;</div><div class='add'>+	} else {</div><div class='add'>+		mcu_txd-&gt;set_query = MCU_Q_NA;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt7615_mcu_fill_msg);</div><div class='hunk'>@@ -184,42 +148,32 @@ int mt7615_mcu_parse_response(struct mt76_dev *mdev, int cmd,</div><div class='ctx'> 	if (seq != rxd-&gt;seq)</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case MCU_CMD_PATCH_SEM_CONTROL:</div><div class='add'>+	if (cmd == MCU_CMD(PATCH_SEM_CONTROL)) {</div><div class='ctx'> 		skb_pull(skb, sizeof(*rxd) - 4);</div><div class='ctx'> 		ret = *skb-&gt;data;</div><div class='del'>-		break;</div><div class='del'>-	case MCU_EXT_CMD_GET_TEMP:</div><div class='add'>+	} else if (cmd == MCU_EXT_CMD(THERMAL_CTRL)) {</div><div class='ctx'> 		skb_pull(skb, sizeof(*rxd));</div><div class='ctx'> 		ret = le32_to_cpu(*(__le32 *)skb-&gt;data);</div><div class='del'>-		break;</div><div class='del'>-	case MCU_EXT_CMD_RF_REG_ACCESS | MCU_QUERY_PREFIX:</div><div class='add'>+	} else if (cmd == MCU_EXT_QUERY(RF_REG_ACCESS)) {</div><div class='ctx'> 		skb_pull(skb, sizeof(*rxd));</div><div class='ctx'> 		ret = le32_to_cpu(*(__le32 *)&amp;skb-&gt;data[8]);</div><div class='del'>-		break;</div><div class='del'>-	case MCU_UNI_CMD_DEV_INFO_UPDATE:</div><div class='del'>-	case MCU_UNI_CMD_BSS_INFO_UPDATE:</div><div class='del'>-	case MCU_UNI_CMD_STA_REC_UPDATE:</div><div class='del'>-	case MCU_UNI_CMD_HIF_CTRL:</div><div class='del'>-	case MCU_UNI_CMD_OFFLOAD:</div><div class='del'>-	case MCU_UNI_CMD_SUSPEND: {</div><div class='del'>-		struct mt7615_mcu_uni_event *event;</div><div class='add'>+	} else if (cmd == MCU_UNI_CMD(DEV_INFO_UPDATE) ||</div><div class='add'>+		   cmd == MCU_UNI_CMD(BSS_INFO_UPDATE) ||</div><div class='add'>+		   cmd == MCU_UNI_CMD(STA_REC_UPDATE) ||</div><div class='add'>+		   cmd == MCU_UNI_CMD(HIF_CTRL) ||</div><div class='add'>+		   cmd == MCU_UNI_CMD(OFFLOAD) ||</div><div class='add'>+		   cmd == MCU_UNI_CMD(SUSPEND)) {</div><div class='add'>+		struct mt76_connac_mcu_uni_event *event;</div><div class='ctx'> </div><div class='ctx'> 		skb_pull(skb, sizeof(*rxd));</div><div class='del'>-		event = (struct mt7615_mcu_uni_event *)skb-&gt;data;</div><div class='add'>+		event = (struct mt76_connac_mcu_uni_event *)skb-&gt;data;</div><div class='ctx'> 		ret = le32_to_cpu(event-&gt;status);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case MCU_CMD_REG_READ: {</div><div class='del'>-		struct mt7615_mcu_reg_event *event;</div><div class='add'>+	} else if (cmd == MCU_CE_QUERY(REG_READ)) {</div><div class='add'>+		struct mt76_connac_mcu_reg_event *event;</div><div class='ctx'> </div><div class='ctx'> 		skb_pull(skb, sizeof(*rxd));</div><div class='del'>-		event = (struct mt7615_mcu_reg_event *)skb-&gt;data;</div><div class='add'>+		event = (struct mt76_connac_mcu_reg_event *)skb-&gt;data;</div><div class='ctx'> 		ret = (int)le32_to_cpu(event-&gt;val);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -253,8 +207,7 @@ u32 mt7615_rf_rr(struct mt7615_dev *dev, u32 wf, u32 reg)</div><div class='ctx'> 		.address = cpu_to_le32(reg),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76,</div><div class='del'>-				 MCU_EXT_CMD_RF_REG_ACCESS | MCU_QUERY_PREFIX,</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_QUERY(RF_REG_ACCESS),</div><div class='ctx'> 				 &amp;req, sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -270,8 +223,8 @@ int mt7615_rf_wr(struct mt7615_dev *dev, u32 wf, u32 reg, u32 val)</div><div class='ctx'> 		.data = cpu_to_le32(val),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_RF_REG_ACCESS, &amp;req,</div><div class='del'>-				 sizeof(req), false);</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(RF_REG_ACCESS),</div><div class='add'>+				 &amp;req, sizeof(req), false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt7622_trigger_hif_int(struct mt7615_dev *dev, bool en)</div><div class='hunk'>@@ -385,10 +338,11 @@ static int mt7615_mcu_fw_pmctrl(struct mt7615_dev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mt7622_trigger_hif_int(dev, false);</div><div class='del'>-</div><div class='del'>-	pm-&gt;stats.last_doze_event = jiffies;</div><div class='del'>-	pm-&gt;stats.awake_time += pm-&gt;stats.last_doze_event -</div><div class='del'>-				pm-&gt;stats.last_wake_event;</div><div class='add'>+	if (!err) {</div><div class='add'>+		pm-&gt;stats.last_doze_event = jiffies;</div><div class='add'>+		pm-&gt;stats.awake_time += pm-&gt;stats.last_doze_event -</div><div class='add'>+					pm-&gt;stats.last_wake_event;</div><div class='add'>+	}</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;pm-&gt;mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -398,8 +352,8 @@ out:</div><div class='ctx'> static void</div><div class='ctx'> mt7615_mcu_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	if (vif-&gt;csa_active)</div><div class='del'>-		ieee80211_csa_finish(vif);</div><div class='add'>+	if (vif-&gt;bss_conf.csa_active)</div><div class='add'>+		ieee80211_csa_finish(vif, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -411,8 +365,11 @@ mt7615_mcu_rx_csa_notify(struct mt7615_dev *dev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	c = (struct mt7615_mcu_csa_notify *)skb-&gt;data;</div><div class='ctx'> </div><div class='add'>+	if (c-&gt;omac_idx &gt; EXT_BSSID_MAX)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (ext_phy &amp;&amp; ext_phy-&gt;omac_mask &amp; BIT_ULL(c-&gt;omac_idx))</div><div class='del'>-		mphy = dev-&gt;mt76.phy2;</div><div class='add'>+		mphy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_iterate_active_interfaces_atomic(mphy-&gt;hw,</div><div class='ctx'> 			IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='hunk'>@@ -427,10 +384,17 @@ mt7615_mcu_rx_radar_detected(struct mt7615_dev *dev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	r = (struct mt7615_mcu_rdd_report *)skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if (r-&gt;band_idx &amp;&amp; dev-&gt;mt76.phy2)</div><div class='del'>-		mphy = dev-&gt;mt76.phy2;</div><div class='add'>+	if (!dev-&gt;radar_pattern.n_pulses &amp;&amp; !r-&gt;long_detected &amp;&amp;</div><div class='add'>+	    !r-&gt;constant_prf_detected &amp;&amp; !r-&gt;staggered_prf_detected)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (r-&gt;band_idx &amp;&amp; dev-&gt;mt76.phys[MT_BAND1])</div><div class='add'>+		mphy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='add'>+</div><div class='add'>+	if (mt76_phy_dfs_state(mphy) &lt; MT_DFS_STATE_CAC)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	ieee80211_radar_detected(mphy-&gt;hw);</div><div class='add'>+	ieee80211_radar_detected(mphy-&gt;hw, NULL);</div><div class='ctx'> 	dev-&gt;hw_pattern++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -484,12 +448,12 @@ mt7615_mcu_scan_event(struct mt7615_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	struct mt7615_phy *phy;</div><div class='ctx'> 	struct mt76_phy *mphy;</div><div class='ctx'> </div><div class='del'>-	if (*seq_num &amp; BIT(7) &amp;&amp; dev-&gt;mt76.phy2)</div><div class='del'>-		mphy = dev-&gt;mt76.phy2;</div><div class='add'>+	if (*seq_num &amp; BIT(7) &amp;&amp; dev-&gt;mt76.phys[MT_BAND1])</div><div class='add'>+		mphy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='ctx'> 	else</div><div class='ctx'> 		mphy = &amp;dev-&gt;mt76.phy;</div><div class='ctx'> </div><div class='del'>-	phy = (struct mt7615_phy *)mphy-&gt;priv;</div><div class='add'>+	phy = mphy-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;dev-&gt;mt76.lock);</div><div class='ctx'> 	__skb_queue_tail(&amp;phy-&gt;scan_event_list, skb);</div><div class='hunk'>@@ -510,14 +474,14 @@ mt7615_mcu_roc_event(struct mt7615_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	skb_pull(skb, sizeof(struct mt7615_mcu_rxd));</div><div class='ctx'> 	event = (struct mt7615_roc_tlv *)skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if (event-&gt;dbdc_band &amp;&amp; dev-&gt;mt76.phy2)</div><div class='del'>-		mphy = dev-&gt;mt76.phy2;</div><div class='add'>+	if (event-&gt;dbdc_band &amp;&amp; dev-&gt;mt76.phys[MT_BAND1])</div><div class='add'>+		mphy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='ctx'> 	else</div><div class='ctx'> 		mphy = &amp;dev-&gt;mt76.phy;</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_ready_on_channel(mphy-&gt;hw);</div><div class='ctx'> </div><div class='del'>-	phy = (struct mt7615_phy *)mphy-&gt;priv;</div><div class='add'>+	phy = mphy-&gt;priv;</div><div class='ctx'> 	phy-&gt;roc_grant = true;</div><div class='ctx'> 	wake_up(&amp;phy-&gt;roc_wait);</div><div class='ctx'> </div><div class='hunk'>@@ -535,8 +499,8 @@ mt7615_mcu_beacon_loss_event(struct mt7615_dev *dev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	skb_pull(skb, sizeof(struct mt7615_mcu_rxd));</div><div class='ctx'> 	event = (struct mt76_connac_beacon_loss_event *)skb-&gt;data;</div><div class='del'>-	if (band_idx &amp;&amp; dev-&gt;mt76.phy2)</div><div class='del'>-		mphy = dev-&gt;mt76.phy2;</div><div class='add'>+	if (band_idx &amp;&amp; dev-&gt;mt76.phys[MT_BAND1])</div><div class='add'>+		mphy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='ctx'> 	else</div><div class='ctx'> 		mphy = &amp;dev-&gt;mt76.phy;</div><div class='ctx'> </div><div class='hunk'>@@ -556,8 +520,8 @@ mt7615_mcu_bss_event(struct mt7615_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	skb_pull(skb, sizeof(struct mt7615_mcu_rxd));</div><div class='ctx'> 	event = (struct mt76_connac_mcu_bss_event *)skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if (band_idx &amp;&amp; dev-&gt;mt76.phy2)</div><div class='del'>-		mphy = dev-&gt;mt76.phy2;</div><div class='add'>+	if (band_idx &amp;&amp; dev-&gt;mt76.phys[MT_BAND1])</div><div class='add'>+		mphy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='ctx'> 	else</div><div class='ctx'> 		mphy = &amp;dev-&gt;mt76.phy;</div><div class='ctx'> </div><div class='hunk'>@@ -651,8 +615,8 @@ mt7615_mcu_muar_config(struct mt7615_dev *dev, struct ieee80211_vif *vif,</div><div class='ctx'> 	if (enable)</div><div class='ctx'> 		ether_addr_copy(req.addr, addr);</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_MUAR_UPDATE, &amp;req,</div><div class='del'>-				 sizeof(req), true);</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(MUAR_UPDATE),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -695,7 +659,7 @@ mt7615_mcu_add_dev(struct mt7615_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 		return mt7615_mcu_muar_config(dev, vif, false, enable);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(data.tlv.omac_addr, vif-&gt;addr, ETH_ALEN);</div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_DEV_INFO_UPDATE,</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(DEV_INFO_UPDATE),</div><div class='ctx'> 				 &amp;data, sizeof(data), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -734,7 +698,7 @@ mt7615_mcu_add_beacon_offload(struct mt7615_dev *dev,</div><div class='ctx'> 	if (!enable)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	skb = ieee80211_beacon_get_template(hw, vif, &amp;offs);</div><div class='add'>+	skb = ieee80211_beacon_get_template(hw, vif, &amp;offs, 0);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -744,13 +708,11 @@ mt7615_mcu_add_beacon_offload(struct mt7615_dev *dev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mvif-&gt;mt76.band_idx) {</div><div class='del'>-		info = IEEE80211_SKB_CB(skb);</div><div class='del'>-		info-&gt;hw_queue |= MT_TX_HW_QUEUE_EXT_PHY;</div><div class='del'>-	}</div><div class='add'>+	info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	info-&gt;hw_queue |= FIELD_PREP(MT_TX_HW_QUEUE_PHY, mvif-&gt;mt76.band_idx);</div><div class='ctx'> </div><div class='ctx'> 	mt7615_mac_write_txwi(dev, (__le32 *)(req.pkt), skb, wcid, NULL,</div><div class='del'>-			      0, NULL, true);</div><div class='add'>+			      0, NULL, 0, true);</div><div class='ctx'> 	memcpy(req.pkt + MT_TXD_SIZE, skb-&gt;data, skb-&gt;len);</div><div class='ctx'> 	req.pkt_len = cpu_to_le16(MT_TXD_SIZE + skb-&gt;len);</div><div class='ctx'> 	req.tim_ie_pos = cpu_to_le16(MT_TXD_SIZE + offs.tim_offset);</div><div class='hunk'>@@ -764,144 +726,14 @@ mt7615_mcu_add_beacon_offload(struct mt7615_dev *dev,</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_BCN_OFFLOAD, &amp;req,</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(BCN_OFFLOAD), &amp;req,</div><div class='ctx'> 				 sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> mt7615_mcu_ctrl_pm_state(struct mt7615_dev *dev, int band, int state)</div><div class='ctx'> {</div><div class='del'>-#define ENTER_PM_STATE	1</div><div class='del'>-#define EXIT_PM_STATE	2</div><div class='del'>-	struct {</div><div class='del'>-		u8 pm_number;</div><div class='del'>-		u8 pm_state;</div><div class='del'>-		u8 bssid[ETH_ALEN];</div><div class='del'>-		u8 dtim_period;</div><div class='del'>-		u8 wlan_idx;</div><div class='del'>-		__le16 bcn_interval;</div><div class='del'>-		__le32 aid;</div><div class='del'>-		__le32 rx_filter;</div><div class='del'>-		u8 band_idx;</div><div class='del'>-		u8 rsv[3];</div><div class='del'>-		__le32 feature;</div><div class='del'>-		u8 omac_idx;</div><div class='del'>-		u8 wmm_idx;</div><div class='del'>-		u8 bcn_loss_cnt;</div><div class='del'>-		u8 bcn_sp_duration;</div><div class='del'>-	} __packed req = {</div><div class='del'>-		.pm_number = 5,</div><div class='del'>-		.pm_state = state ? ENTER_PM_STATE : EXIT_PM_STATE,</div><div class='del'>-		.band_idx = band,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_PM_STATE_CTRL, &amp;req,</div><div class='del'>-				 sizeof(req), true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mt7615_mcu_bss_basic_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,</div><div class='del'>-			 struct ieee80211_sta *sta, bool enable)</div><div class='del'>-{</div><div class='del'>-	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='del'>-	u32 type = vif-&gt;p2p ? NETWORK_P2P : NETWORK_INFRA;</div><div class='del'>-	struct bss_info_basic *bss;</div><div class='del'>-	u8 wlan_idx = mvif-&gt;sta.wcid.idx;</div><div class='del'>-	struct tlv *tlv;</div><div class='del'>-</div><div class='del'>-	tlv = mt76_connac_mcu_add_tlv(skb, BSS_INFO_BASIC, sizeof(*bss));</div><div class='del'>-</div><div class='del'>-	switch (vif-&gt;type) {</div><div class='del'>-	case NL80211_IFTYPE_MESH_POINT:</div><div class='del'>-	case NL80211_IFTYPE_AP:</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-		/* TODO: enable BSS_INFO_UAPSD &amp; BSS_INFO_PM */</div><div class='del'>-		if (enable &amp;&amp; sta) {</div><div class='del'>-			struct mt7615_sta *msta;</div><div class='del'>-</div><div class='del'>-			msta = (struct mt7615_sta *)sta-&gt;drv_priv;</div><div class='del'>-			wlan_idx = msta-&gt;wcid.idx;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		type = NETWORK_IBSS;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bss = (struct bss_info_basic *)tlv;</div><div class='del'>-	memcpy(bss-&gt;bssid, vif-&gt;bss_conf.bssid, ETH_ALEN);</div><div class='del'>-	bss-&gt;bcn_interval = cpu_to_le16(vif-&gt;bss_conf.beacon_int);</div><div class='del'>-	bss-&gt;network_type = cpu_to_le32(type);</div><div class='del'>-	bss-&gt;dtim_period = vif-&gt;bss_conf.dtim_period;</div><div class='del'>-	bss-&gt;bmc_tx_wlan_idx = wlan_idx;</div><div class='del'>-	bss-&gt;wmm_idx = mvif-&gt;mt76.wmm_idx;</div><div class='del'>-	bss-&gt;active = enable;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt7615_mcu_bss_omac_tlv(struct sk_buff *skb, struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='del'>-	u8 omac_idx = mvif-&gt;mt76.omac_idx;</div><div class='del'>-	struct bss_info_omac *omac;</div><div class='del'>-	struct tlv *tlv;</div><div class='del'>-	u32 type = 0;</div><div class='del'>-</div><div class='del'>-	tlv = mt76_connac_mcu_add_tlv(skb, BSS_INFO_OMAC, sizeof(*omac));</div><div class='del'>-</div><div class='del'>-	switch (vif-&gt;type) {</div><div class='del'>-	case NL80211_IFTYPE_MESH_POINT:</div><div class='del'>-	case NL80211_IFTYPE_AP:</div><div class='del'>-		if (vif-&gt;p2p)</div><div class='del'>-			type = CONNECTION_P2P_GO;</div><div class='del'>-		else</div><div class='del'>-			type = CONNECTION_INFRA_AP;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-		if (vif-&gt;p2p)</div><div class='del'>-			type = CONNECTION_P2P_GC;</div><div class='del'>-		else</div><div class='del'>-			type = CONNECTION_INFRA_STA;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		type = CONNECTION_IBSS_ADHOC;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	omac = (struct bss_info_omac *)tlv;</div><div class='del'>-	omac-&gt;conn_type = cpu_to_le32(type);</div><div class='del'>-	omac-&gt;omac_idx = mvif-&gt;mt76.omac_idx;</div><div class='del'>-	omac-&gt;band_idx = mvif-&gt;mt76.band_idx;</div><div class='del'>-	omac-&gt;hw_bss_idx = omac_idx &gt; EXT_BSSID_START ? HW_BSSID_0 : omac_idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* SIFS 20us + 512 byte beacon tranmitted by 1Mbps (3906us) */</div><div class='del'>-#define BCN_TX_ESTIMATE_TIME (4096 + 20)</div><div class='del'>-static void</div><div class='del'>-mt7615_mcu_bss_ext_tlv(struct sk_buff *skb, struct mt7615_vif *mvif)</div><div class='del'>-{</div><div class='del'>-	struct bss_info_ext_bss *ext;</div><div class='del'>-	int ext_bss_idx, tsf_offset;</div><div class='del'>-	struct tlv *tlv;</div><div class='del'>-</div><div class='del'>-	ext_bss_idx = mvif-&gt;mt76.omac_idx - EXT_BSSID_START;</div><div class='del'>-	if (ext_bss_idx &lt; 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	tlv = mt76_connac_mcu_add_tlv(skb, BSS_INFO_EXT_BSS, sizeof(*ext));</div><div class='del'>-</div><div class='del'>-	ext = (struct bss_info_ext_bss *)tlv;</div><div class='del'>-	tsf_offset = ext_bss_idx * BCN_TX_ESTIMATE_TIME;</div><div class='del'>-	ext-&gt;mbss_tsf_offset = cpu_to_le32(tsf_offset);</div><div class='add'>+	return mt76_connac_mcu_set_pm(&amp;dev-&gt;mt76, band, state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -920,16 +752,17 @@ mt7615_mcu_add_bss(struct mt7615_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 		return PTR_ERR(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (enable)</div><div class='del'>-		mt7615_mcu_bss_omac_tlv(skb, vif);</div><div class='add'>+		mt76_connac_mcu_bss_omac_tlv(skb, vif);</div><div class='ctx'> </div><div class='del'>-	mt7615_mcu_bss_basic_tlv(skb, vif, sta, enable);</div><div class='add'>+	mt76_connac_mcu_bss_basic_tlv(skb, vif, sta, phy-&gt;mt76,</div><div class='add'>+				      mvif-&gt;sta.wcid.idx, enable);</div><div class='ctx'> </div><div class='ctx'> 	if (enable &amp;&amp; mvif-&gt;mt76.omac_idx &gt;= EXT_BSSID_START &amp;&amp;</div><div class='ctx'> 	    mvif-&gt;mt76.omac_idx &lt; REPEATER_BSSID_START)</div><div class='del'>-		mt7615_mcu_bss_ext_tlv(skb, mvif);</div><div class='add'>+		mt76_connac_mcu_bss_ext_tlv(skb, &amp;mvif-&gt;mt76);</div><div class='ctx'> </div><div class='ctx'> 	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='del'>-				     MCU_EXT_CMD_BSS_INFO_UPDATE, true);</div><div class='add'>+				     MCU_EXT_CMD(BSS_INFO_UPDATE), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -951,8 +784,8 @@ mt7615_mcu_wtbl_tx_ba(struct mt7615_dev *dev,</div><div class='ctx'> 	mt76_connac_mcu_wtbl_ba_tlv(&amp;dev-&gt;mt76, skb, params, enable, true,</div><div class='ctx'> 				    NULL, wtbl_hdr);</div><div class='ctx'> </div><div class='del'>-	err = mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb, MCU_EXT_CMD_WTBL_UPDATE,</div><div class='del'>-				    true);</div><div class='add'>+	err = mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='add'>+				    MCU_EXT_CMD(WTBL_UPDATE), true);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -964,7 +797,7 @@ mt7615_mcu_wtbl_tx_ba(struct mt7615_dev *dev,</div><div class='ctx'> 	mt76_connac_mcu_sta_ba_tlv(skb, params, enable, true);</div><div class='ctx'> </div><div class='ctx'> 	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='del'>-				     MCU_EXT_CMD_STA_REC_UPDATE, true);</div><div class='add'>+				     MCU_EXT_CMD(STA_REC_UPDATE), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -986,7 +819,7 @@ mt7615_mcu_wtbl_rx_ba(struct mt7615_dev *dev,</div><div class='ctx'> 	mt76_connac_mcu_sta_ba_tlv(skb, params, enable, false);</div><div class='ctx'> </div><div class='ctx'> 	err = mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='del'>-				    MCU_EXT_CMD_STA_REC_UPDATE, true);</div><div class='add'>+				    MCU_EXT_CMD(STA_REC_UPDATE), true);</div><div class='ctx'> 	if (err &lt; 0 || !enable)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -999,8 +832,8 @@ mt7615_mcu_wtbl_rx_ba(struct mt7615_dev *dev,</div><div class='ctx'> 	mt76_connac_mcu_wtbl_ba_tlv(&amp;dev-&gt;mt76, skb, params, enable, false,</div><div class='ctx'> 				    NULL, wtbl_hdr);</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb, MCU_EXT_CMD_WTBL_UPDATE,</div><div class='del'>-				     true);</div><div class='add'>+	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='add'>+				     MCU_EXT_CMD(WTBL_UPDATE), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1009,39 +842,54 @@ mt7615_mcu_wtbl_sta_add(struct mt7615_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct sk_buff *skb, *sskb, *wskb = NULL;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='ctx'> 	struct mt7615_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct wtbl_req_hdr *wtbl_hdr;</div><div class='ctx'> 	struct mt7615_sta *msta;</div><div class='add'>+	bool new_entry = true;</div><div class='add'>+	int conn_state;</div><div class='ctx'> 	int cmd, err;</div><div class='ctx'> </div><div class='ctx'> 	msta = sta ? (struct mt7615_sta *)sta-&gt;drv_priv : &amp;mvif-&gt;sta;</div><div class='add'>+	link_sta = sta ? &amp;sta-&gt;deflink : NULL;</div><div class='ctx'> </div><div class='ctx'> 	sskb = mt76_connac_mcu_alloc_sta_req(&amp;dev-&gt;mt76, &amp;mvif-&gt;mt76,</div><div class='ctx'> 					     &amp;msta-&gt;wcid);</div><div class='ctx'> 	if (IS_ERR(sskb))</div><div class='ctx'> 		return PTR_ERR(sskb);</div><div class='ctx'> </div><div class='del'>-	mt76_connac_mcu_sta_basic_tlv(sskb, vif, sta, enable);</div><div class='add'>+	if (!sta) {</div><div class='add'>+		if (mvif-&gt;sta_added)</div><div class='add'>+			new_entry = false;</div><div class='add'>+		else</div><div class='add'>+			mvif-&gt;sta_added = true;</div><div class='add'>+	}</div><div class='add'>+	conn_state = enable ? CONN_STATE_PORT_SECURE : CONN_STATE_DISCONNECT;</div><div class='add'>+	mt76_connac_mcu_sta_basic_tlv(&amp;dev-&gt;mt76, sskb, &amp;vif-&gt;bss_conf,</div><div class='add'>+				      link_sta, conn_state, new_entry);</div><div class='ctx'> 	if (enable &amp;&amp; sta)</div><div class='del'>-		mt76_connac_mcu_sta_tlv(phy-&gt;mt76, sskb, sta, vif, 0);</div><div class='add'>+		mt76_connac_mcu_sta_tlv(phy-&gt;mt76, sskb, sta, vif, 0,</div><div class='add'>+					MT76_STA_INFO_STATE_ASSOC);</div><div class='ctx'> </div><div class='ctx'> 	wtbl_hdr = mt76_connac_mcu_alloc_wtbl_req(&amp;dev-&gt;mt76, &amp;msta-&gt;wcid,</div><div class='ctx'> 						  WTBL_RESET_AND_SET, NULL,</div><div class='ctx'> 						  &amp;wskb);</div><div class='del'>-	if (IS_ERR(wtbl_hdr))</div><div class='add'>+	if (IS_ERR(wtbl_hdr)) {</div><div class='add'>+		dev_kfree_skb(sskb);</div><div class='ctx'> 		return PTR_ERR(wtbl_hdr);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (enable) {</div><div class='ctx'> 		mt76_connac_mcu_wtbl_generic_tlv(&amp;dev-&gt;mt76, wskb, vif, sta,</div><div class='ctx'> 						 NULL, wtbl_hdr);</div><div class='ctx'> 		if (sta)</div><div class='ctx'> 			mt76_connac_mcu_wtbl_ht_tlv(&amp;dev-&gt;mt76, wskb, sta,</div><div class='del'>-						    NULL, wtbl_hdr);</div><div class='del'>-		mt76_connac_mcu_wtbl_hdr_trans_tlv(wskb, &amp;msta-&gt;wcid, NULL,</div><div class='del'>-						   wtbl_hdr);</div><div class='add'>+						    NULL, wtbl_hdr, true, true);</div><div class='add'>+		mt76_connac_mcu_wtbl_hdr_trans_tlv(wskb, vif, &amp;msta-&gt;wcid,</div><div class='add'>+						   NULL, wtbl_hdr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cmd = enable ? MCU_EXT_CMD_WTBL_UPDATE : MCU_EXT_CMD_STA_REC_UPDATE;</div><div class='add'>+	cmd = enable ? MCU_EXT_CMD(WTBL_UPDATE) : MCU_EXT_CMD(STA_REC_UPDATE);</div><div class='ctx'> 	skb = enable ? wskb : sskb;</div><div class='ctx'> </div><div class='ctx'> 	err = mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb, cmd, true);</div><div class='hunk'>@@ -1052,12 +900,20 @@ mt7615_mcu_wtbl_sta_add(struct mt7615_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cmd = enable ? MCU_EXT_CMD_STA_REC_UPDATE : MCU_EXT_CMD_WTBL_UPDATE;</div><div class='add'>+	cmd = enable ? MCU_EXT_CMD(STA_REC_UPDATE) : MCU_EXT_CMD(WTBL_UPDATE);</div><div class='ctx'> 	skb = enable ? sskb : wskb;</div><div class='ctx'> </div><div class='ctx'> 	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb, cmd, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+mt7615_mcu_wtbl_update_hdr_trans(struct mt7615_dev *dev,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	return mt76_connac_mcu_wtbl_update_hdr_trans(&amp;dev-&gt;mt76, vif, sta);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct mt7615_mcu_ops wtbl_update_ops = {</div><div class='ctx'> 	.add_beacon_offload = mt7615_mcu_add_beacon_offload,</div><div class='ctx'> 	.set_pm_state = mt7615_mcu_ctrl_pm_state,</div><div class='hunk'>@@ -1068,6 +924,7 @@ static const struct mt7615_mcu_ops wtbl_update_ops = {</div><div class='ctx'> 	.sta_add = mt7615_mcu_wtbl_sta_add,</div><div class='ctx'> 	.set_drv_ctrl = mt7615_mcu_drv_pmctrl,</div><div class='ctx'> 	.set_fw_ctrl = mt7615_mcu_fw_pmctrl,</div><div class='add'>+	.set_sta_decap_offload = mt7615_mcu_wtbl_update_hdr_trans,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1099,7 +956,7 @@ mt7615_mcu_sta_ba(struct mt7615_dev *dev,</div><div class='ctx'> 				    sta_wtbl, wtbl_hdr);</div><div class='ctx'> </div><div class='ctx'> 	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='del'>-				     MCU_EXT_CMD_STA_REC_UPDATE, true);</div><div class='add'>+				     MCU_EXT_CMD(STA_REC_UPDATE), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1120,18 +977,21 @@ mt7615_mcu_sta_rx_ba(struct mt7615_dev *dev,</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> __mt7615_mcu_add_sta(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='del'>-		     struct ieee80211_sta *sta, bool enable, int cmd)</div><div class='add'>+		     struct ieee80211_sta *sta, bool enable, int cmd,</div><div class='add'>+		     bool offload_fw)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct mt76_sta_cmd_info info = {</div><div class='ctx'> 		.sta = sta,</div><div class='ctx'> 		.vif = vif,</div><div class='add'>+		.offload_fw = offload_fw,</div><div class='ctx'> 		.enable = enable,</div><div class='add'>+		.newly = true,</div><div class='ctx'> 		.cmd = cmd,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	info.wcid = sta ? (struct mt76_wcid *)sta-&gt;drv_priv : &amp;mvif-&gt;sta.wcid;</div><div class='del'>-	return mt76_connac_mcu_add_sta_cmd(phy, &amp;info);</div><div class='add'>+	return mt76_connac_mcu_sta_cmd(phy, &amp;info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1139,7 +999,19 @@ mt7615_mcu_add_sta(struct mt7615_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 		   struct ieee80211_sta *sta, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	return __mt7615_mcu_add_sta(phy-&gt;mt76, vif, sta, enable,</div><div class='del'>-				    MCU_EXT_CMD_STA_REC_UPDATE);</div><div class='add'>+				    MCU_EXT_CMD(STA_REC_UPDATE), false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7615_mcu_sta_update_hdr_trans(struct mt7615_dev *dev,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_sta *msta = (struct mt7615_sta *)sta-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	return mt76_connac_mcu_sta_update_hdr_trans(&amp;dev-&gt;mt76,</div><div class='add'>+						    vif, &amp;msta-&gt;wcid,</div><div class='add'>+						    MCU_EXT_CMD(STA_REC_UPDATE));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct mt7615_mcu_ops sta_update_ops = {</div><div class='hunk'>@@ -1152,27 +1024,9 @@ static const struct mt7615_mcu_ops sta_update_ops = {</div><div class='ctx'> 	.sta_add = mt7615_mcu_add_sta,</div><div class='ctx'> 	.set_drv_ctrl = mt7615_mcu_drv_pmctrl,</div><div class='ctx'> 	.set_fw_ctrl = mt7615_mcu_fw_pmctrl,</div><div class='add'>+	.set_sta_decap_offload = mt7615_mcu_sta_update_hdr_trans,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int mt7615_mcu_sta_update_hdr_trans(struct mt7615_dev *dev,</div><div class='del'>-				    struct ieee80211_vif *vif,</div><div class='del'>-				    struct ieee80211_sta *sta)</div><div class='del'>-{</div><div class='del'>-	struct mt7615_sta *msta = (struct mt7615_sta *)sta-&gt;drv_priv;</div><div class='del'>-	struct wtbl_req_hdr *wtbl_hdr;</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-</div><div class='del'>-	wtbl_hdr = mt76_connac_mcu_alloc_wtbl_req(&amp;dev-&gt;mt76, &amp;msta-&gt;wcid,</div><div class='del'>-						  WTBL_SET, NULL, &amp;skb);</div><div class='del'>-	if (IS_ERR(wtbl_hdr))</div><div class='del'>-		return PTR_ERR(wtbl_hdr);</div><div class='del'>-</div><div class='del'>-	mt76_connac_mcu_wtbl_hdr_trans_tlv(skb, &amp;msta-&gt;wcid, NULL, wtbl_hdr);</div><div class='del'>-</div><div class='del'>-	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb, MCU_EXT_CMD_WTBL_UPDATE,</div><div class='del'>-				     true);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int</div><div class='ctx'> mt7615_mcu_uni_ctrl_pm_state(struct mt7615_dev *dev, int band, int state)</div><div class='ctx'> {</div><div class='hunk'>@@ -1226,7 +1080,7 @@ mt7615_mcu_uni_add_beacon_offload(struct mt7615_dev *dev,</div><div class='ctx'> 	if (!enable)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	skb = ieee80211_beacon_get_template(mt76_hw(dev), vif, &amp;offs);</div><div class='add'>+	skb = ieee80211_beacon_get_template(mt76_hw(dev), vif, &amp;offs, 0);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -1237,7 +1091,7 @@ mt7615_mcu_uni_add_beacon_offload(struct mt7615_dev *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mt7615_mac_write_txwi(dev, (__le32 *)(req.beacon_tlv.pkt), skb,</div><div class='del'>-			      wcid, NULL, 0, NULL, true);</div><div class='add'>+			      wcid, NULL, 0, NULL, 0, true);</div><div class='ctx'> 	memcpy(req.beacon_tlv.pkt + MT_TXD_SIZE, skb-&gt;data, skb-&gt;len);</div><div class='ctx'> 	req.beacon_tlv.pkt_len = cpu_to_le16(MT_TXD_SIZE + skb-&gt;len);</div><div class='ctx'> 	req.beacon_tlv.tim_ie_pos = cpu_to_le16(MT_TXD_SIZE + offs.tim_offset);</div><div class='hunk'>@@ -1251,7 +1105,7 @@ mt7615_mcu_uni_add_beacon_offload(struct mt7615_dev *dev,</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD_BSS_INFO_UPDATE,</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD(BSS_INFO_UPDATE),</div><div class='ctx'> 				 &amp;req, sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1261,8 +1115,8 @@ mt7615_mcu_uni_add_dev(struct mt7615_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='ctx'> </div><div class='del'>-	return mt76_connac_mcu_uni_add_dev(phy-&gt;mt76, vif, &amp;mvif-&gt;sta.wcid,</div><div class='del'>-					   enable);</div><div class='add'>+	return mt76_connac_mcu_uni_add_dev(phy-&gt;mt76, &amp;vif-&gt;bss_conf, &amp;mvif-&gt;mt76,</div><div class='add'>+					   &amp;mvif-&gt;sta.wcid, enable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1272,7 +1126,7 @@ mt7615_mcu_uni_add_bss(struct mt7615_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='ctx'> </div><div class='ctx'> 	return mt76_connac_mcu_uni_add_bss(phy-&gt;mt76, vif, &amp;mvif-&gt;sta.wcid,</div><div class='del'>-					   enable);</div><div class='add'>+					   enable, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='hunk'>@@ -1280,7 +1134,7 @@ mt7615_mcu_uni_add_sta(struct mt7615_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 		       struct ieee80211_sta *sta, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	return __mt7615_mcu_add_sta(phy-&gt;mt76, vif, sta, enable,</div><div class='del'>-				    MCU_UNI_CMD_STA_REC_UPDATE);</div><div class='add'>+				    MCU_UNI_CMD(STA_REC_UPDATE), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1291,7 +1145,8 @@ mt7615_mcu_uni_tx_ba(struct mt7615_dev *dev,</div><div class='ctx'> 	struct mt7615_sta *sta = (struct mt7615_sta *)params-&gt;sta-&gt;drv_priv;</div><div class='ctx'> </div><div class='ctx'> 	return mt76_connac_mcu_sta_ba(&amp;dev-&gt;mt76, &amp;sta-&gt;vif-&gt;mt76, params,</div><div class='del'>-				      enable, true);</div><div class='add'>+				      MCU_UNI_CMD(STA_REC_UPDATE), enable,</div><div class='add'>+				      true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1314,7 +1169,7 @@ mt7615_mcu_uni_rx_ba(struct mt7615_dev *dev,</div><div class='ctx'> 	mt76_connac_mcu_sta_ba_tlv(skb, params, enable, false);</div><div class='ctx'> </div><div class='ctx'> 	err = mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='del'>-				    MCU_UNI_CMD_STA_REC_UPDATE, true);</div><div class='add'>+				    MCU_UNI_CMD(STA_REC_UPDATE), true);</div><div class='ctx'> 	if (err &lt; 0 || !enable)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1335,7 +1190,19 @@ mt7615_mcu_uni_rx_ba(struct mt7615_dev *dev,</div><div class='ctx'> 				    sta_wtbl, wtbl_hdr);</div><div class='ctx'> </div><div class='ctx'> 	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='del'>-				     MCU_UNI_CMD_STA_REC_UPDATE, true);</div><div class='add'>+				     MCU_UNI_CMD(STA_REC_UPDATE), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7615_mcu_sta_uni_update_hdr_trans(struct mt7615_dev *dev,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct mt7615_sta *msta = (struct mt7615_sta *)sta-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	return mt76_connac_mcu_sta_update_hdr_trans(&amp;dev-&gt;mt76,</div><div class='add'>+						    vif, &amp;msta-&gt;wcid,</div><div class='add'>+						    MCU_UNI_CMD(STA_REC_UPDATE));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct mt7615_mcu_ops uni_update_ops = {</div><div class='hunk'>@@ -1348,11 +1215,12 @@ static const struct mt7615_mcu_ops uni_update_ops = {</div><div class='ctx'> 	.sta_add = mt7615_mcu_uni_add_sta,</div><div class='ctx'> 	.set_drv_ctrl = mt7615_mcu_lp_drv_pmctrl,</div><div class='ctx'> 	.set_fw_ctrl = mt7615_mcu_fw_pmctrl,</div><div class='add'>+	.set_sta_decap_offload = mt7615_mcu_sta_uni_update_hdr_trans,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int mt7615_mcu_restart(struct mt76_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	return mt76_mcu_send_msg(dev, MCU_CMD_RESTART_DL_REQ, NULL, 0, true);</div><div class='add'>+	return mt76_mcu_send_msg(dev, MCU_CMD(RESTART_DL_REQ), NULL, 0, true);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt7615_mcu_restart);</div><div class='ctx'> </div><div class='hunk'>@@ -1398,7 +1266,7 @@ static int mt7615_load_patch(struct mt7615_dev *dev, u32 addr, const char *name)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = mt76_mcu_send_firmware(&amp;dev-&gt;mt76, MCU_CMD_FW_SCATTER,</div><div class='add'>+	ret = mt76_mcu_send_firmware(&amp;dev-&gt;mt76, MCU_CMD(FW_SCATTER),</div><div class='ctx'> 				     fw-&gt;data + sizeof(*hdr), len);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev-&gt;mt76.dev, "Failed to send firmware to device\n");</div><div class='hunk'>@@ -1426,20 +1294,6 @@ release_fw:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 mt7615_mcu_gen_dl_mode(u8 feature_set, bool is_cr4)</div><div class='del'>-{</div><div class='del'>-	u32 ret = 0;</div><div class='del'>-</div><div class='del'>-	ret |= (feature_set &amp; FW_FEATURE_SET_ENCRYPT) ?</div><div class='del'>-	       (DL_MODE_ENCRYPT | DL_MODE_RESET_SEC_IV) : 0;</div><div class='del'>-	ret |= FIELD_PREP(DL_MODE_KEY_IDX,</div><div class='del'>-			  FIELD_GET(FW_FEATURE_SET_KEY_IDX, feature_set));</div><div class='del'>-	ret |= DL_MODE_NEED_RSP;</div><div class='del'>-	ret |= is_cr4 ? DL_MODE_WORKING_PDA_CR4 : 0;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int</div><div class='ctx'> mt7615_mcu_send_ram_firmware(struct mt7615_dev *dev,</div><div class='ctx'> 			     const struct mt7615_fw_trailer *hdr,</div><div class='hunk'>@@ -1450,7 +1304,8 @@ mt7615_mcu_send_ram_firmware(struct mt7615_dev *dev,</div><div class='ctx'> 	u32 len, addr, mode;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; n_region; i++) {</div><div class='del'>-		mode = mt7615_mcu_gen_dl_mode(hdr[i].feature_set, is_cr4);</div><div class='add'>+		mode = mt76_connac_mcu_gen_dl_mode(&amp;dev-&gt;mt76,</div><div class='add'>+						   hdr[i].feature_set, is_cr4);</div><div class='ctx'> 		len = le32_to_cpu(hdr[i].len) + IMG_CRC_LEN;</div><div class='ctx'> 		addr = le32_to_cpu(hdr[i].addr);</div><div class='ctx'> </div><div class='hunk'>@@ -1461,7 +1316,7 @@ mt7615_mcu_send_ram_firmware(struct mt7615_dev *dev,</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = mt76_mcu_send_firmware(&amp;dev-&gt;mt76, MCU_CMD_FW_SCATTER,</div><div class='add'>+		err = mt76_mcu_send_firmware(&amp;dev-&gt;mt76, MCU_CMD(FW_SCATTER),</div><div class='ctx'> 					     data + offset, len);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			dev_err(dev-&gt;mt76.dev, "Failed to send firmware to device\n");</div><div class='hunk'>@@ -1597,7 +1452,7 @@ static int mt7615_load_firmware(struct mt7615_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (!mt76_poll_msec(dev, MT_TOP_MISC2, MT_TOP_MISC2_FW_STATE,</div><div class='ctx'> 			    FIELD_PREP(MT_TOP_MISC2_FW_STATE,</div><div class='del'>-				       FW_STATE_CR4_RDY), 500)) {</div><div class='add'>+				       FW_STATE_RDY), 500)) {</div><div class='ctx'> 		dev_err(dev-&gt;mt76.dev, "Timeout for initializing firmware\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1647,14 +1502,27 @@ int mt7615_mcu_fw_log_2_host(struct mt7615_dev *dev, u8 ctrl)</div><div class='ctx'> 		.ctrl_val = ctrl</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_FW_LOG_2_HOST, &amp;data,</div><div class='del'>-				 sizeof(data), true);</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(FW_LOG_2_HOST),</div><div class='add'>+				 &amp;data, sizeof(data), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7615_mcu_cal_cache_apply(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		bool cache_enable;</div><div class='add'>+		u8 pad[3];</div><div class='add'>+	} data = {</div><div class='add'>+		.cache_enable = true</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(CAL_CACHE), &amp;data,</div><div class='add'>+				 sizeof(data), false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt7663_load_n9(struct mt7615_dev *dev, const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	u32 offset = 0, override_addr = 0, flag = FW_START_DLYCAL;</div><div class='del'>-	const struct mt7663_fw_trailer *hdr;</div><div class='add'>+	const struct mt76_connac2_fw_trailer *hdr;</div><div class='ctx'> 	const struct mt7663_fw_buf *buf;</div><div class='ctx'> 	const struct firmware *fw;</div><div class='ctx'> 	const u8 *base_addr;</div><div class='hunk'>@@ -1670,9 +1538,7 @@ static int mt7663_load_n9(struct mt7615_dev *dev, const char *name)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hdr = (const struct mt7663_fw_trailer *)(fw-&gt;data + fw-&gt;size -</div><div class='del'>-						 FW_V3_COMMON_TAILER_SIZE);</div><div class='del'>-</div><div class='add'>+	hdr = (const void *)(fw-&gt;data + fw-&gt;size - FW_V3_COMMON_TAILER_SIZE);</div><div class='ctx'> 	dev_info(dev-&gt;mt76.dev, "N9 Firmware Version: %.10s, Build Time: %.15s\n",</div><div class='ctx'> 		 hdr-&gt;fw_ver, hdr-&gt;build_date);</div><div class='ctx'> 	dev_info(dev-&gt;mt76.dev, "Region number: 0x%x\n", hdr-&gt;n_region);</div><div class='hunk'>@@ -1685,7 +1551,8 @@ static int mt7663_load_n9(struct mt7615_dev *dev, const char *name)</div><div class='ctx'> 		dev_info(dev-&gt;mt76.dev, "Parsing tailer Region: %d\n", i);</div><div class='ctx'> </div><div class='ctx'> 		buf = (const struct mt7663_fw_buf *)(base_addr - shift);</div><div class='del'>-		mode = mt7615_mcu_gen_dl_mode(buf-&gt;feature_set, false);</div><div class='add'>+		mode = mt76_connac_mcu_gen_dl_mode(&amp;dev-&gt;mt76,</div><div class='add'>+						   buf-&gt;feature_set, false);</div><div class='ctx'> 		addr = le32_to_cpu(buf-&gt;img_dest_addr);</div><div class='ctx'> 		len = le32_to_cpu(buf-&gt;img_size);</div><div class='ctx'> </div><div class='hunk'>@@ -1696,7 +1563,7 @@ static int mt7663_load_n9(struct mt7615_dev *dev, const char *name)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = mt76_mcu_send_firmware(&amp;dev-&gt;mt76, MCU_CMD_FW_SCATTER,</div><div class='add'>+		ret = mt76_mcu_send_firmware(&amp;dev-&gt;mt76, MCU_CMD(FW_SCATTER),</div><div class='ctx'> 					     fw-&gt;data + offset, len);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			dev_err(dev-&gt;mt76.dev, "Failed to send firmware\n");</div><div class='hunk'>@@ -1832,11 +1699,10 @@ int mt7615_mcu_init(struct mt7615_dev *dev)</div><div class='ctx'> 		.headroom = sizeof(struct mt7615_mcu_txd),</div><div class='ctx'> 		.mcu_skb_send_msg = mt7615_mcu_send_message,</div><div class='ctx'> 		.mcu_parse_response = mt7615_mcu_parse_response,</div><div class='del'>-		.mcu_restart = mt7615_mcu_restart,</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mt76.mcu_ops = &amp;mt7615_mcu_ops,</div><div class='add'>+	dev-&gt;mt76.mcu_ops = &amp;mt7615_mcu_ops;</div><div class='ctx'> </div><div class='ctx'> 	ret = mt7615_mcu_drv_pmctrl(dev);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -1859,15 +1725,20 @@ int mt7615_mcu_init(struct mt7615_dev *dev)</div><div class='ctx'> 	mt76_queue_tx_cleanup(dev, dev-&gt;mt76.q_mcu[MT_MCUQ_FWDL], false);</div><div class='ctx'> 	dev_dbg(dev-&gt;mt76.dev, "Firmware init done\n");</div><div class='ctx'> 	set_bit(MT76_STATE_MCU_RUNNING, &amp;dev-&gt;mphy.state);</div><div class='del'>-	mt7615_mcu_fw_log_2_host(dev, 0);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	if (dev-&gt;dbdc_support) {</div><div class='add'>+		ret = mt7615_mcu_cal_cache_apply(dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mt7615_mcu_fw_log_2_host(dev, 0);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt7615_mcu_init);</div><div class='ctx'> </div><div class='ctx'> void mt7615_mcu_exit(struct mt7615_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	__mt76_mcu_restart(&amp;dev-&gt;mt76);</div><div class='add'>+	mt7615_mcu_restart(&amp;dev-&gt;mt76);</div><div class='ctx'> 	mt7615_mcu_set_fw_ctrl(dev);</div><div class='ctx'> 	skb_queue_purge(&amp;dev-&gt;mt76.mcu.res_q);</div><div class='ctx'> }</div><div class='hunk'>@@ -1912,7 +1783,7 @@ int mt7615_mcu_set_eeprom(struct mt7615_dev *dev)</div><div class='ctx'> 	skb_put_data(skb, eep + offset, eep_len);</div><div class='ctx'> </div><div class='ctx'> 	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='del'>-				     MCU_EXT_CMD_EFUSE_BUFFER_MODE, true);</div><div class='add'>+				     MCU_EXT_CMD(EFUSE_BUFFER_MODE), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mt7615_mcu_set_wmm(struct mt7615_dev *dev, u8 queue,</div><div class='hunk'>@@ -1948,8 +1819,8 @@ int mt7615_mcu_set_wmm(struct mt7615_dev *dev, u8 queue,</div><div class='ctx'> 	if (params-&gt;cw_max)</div><div class='ctx'> 		req.cw_max = cpu_to_le16(fls(params-&gt;cw_max));</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_EDCA_UPDATE, &amp;req,</div><div class='del'>-				 sizeof(req), true);</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(EDCA_UPDATE),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mt7615_mcu_set_dbdc(struct mt7615_dev *dev)</div><div class='hunk'>@@ -2007,38 +1878,7 @@ int mt7615_mcu_set_dbdc(struct mt7615_dev *dev)</div><div class='ctx'> 	ADD_DBDC_ENTRY(DBDC_TYPE_MGMT, 1, 1);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_DBDC_CTRL, &amp;req,</div><div class='del'>-				 sizeof(req), true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mt7615_mcu_del_wtbl_all(struct mt7615_dev *dev)</div><div class='del'>-{</div><div class='del'>-	struct wtbl_req_hdr req = {</div><div class='del'>-		.operation = WTBL_RESET_ALL,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_WTBL_UPDATE, &amp;req,</div><div class='del'>-				 sizeof(req), true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mt7615_mcu_rdd_cmd(struct mt7615_dev *dev,</div><div class='del'>-		       enum mt7615_rdd_cmd cmd, u8 index,</div><div class='del'>-		       u8 rx_sel, u8 val)</div><div class='del'>-{</div><div class='del'>-	struct {</div><div class='del'>-		u8 ctrl;</div><div class='del'>-		u8 rdd_idx;</div><div class='del'>-		u8 rdd_rx_sel;</div><div class='del'>-		u8 val;</div><div class='del'>-		u8 rsv[4];</div><div class='del'>-	} req = {</div><div class='del'>-		.ctrl = cmd,</div><div class='del'>-		.rdd_idx = index,</div><div class='del'>-		.rdd_rx_sel = rx_sel,</div><div class='del'>-		.val = val,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_SET_RDD_CTRL, &amp;req,</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(DBDC_CTRL), &amp;req,</div><div class='ctx'> 				 sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2052,8 +1892,8 @@ int mt7615_mcu_set_fcc5_lpn(struct mt7615_dev *dev, int val)</div><div class='ctx'> 		.min_lpn = cpu_to_le16(val),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_SET_RDD_TH, &amp;req,</div><div class='del'>-				 sizeof(req), true);</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(SET_RADAR_TH),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mt7615_mcu_set_pulse_th(struct mt7615_dev *dev,</div><div class='hunk'>@@ -2081,8 +1921,8 @@ int mt7615_mcu_set_pulse_th(struct mt7615_dev *dev,</div><div class='ctx'> #undef  __req_field</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_SET_RDD_TH, &amp;req,</div><div class='del'>-				 sizeof(req), true);</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(SET_RADAR_TH),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mt7615_mcu_set_radar_th(struct mt7615_dev *dev, int index,</div><div class='hunk'>@@ -2128,8 +1968,8 @@ int mt7615_mcu_set_radar_th(struct mt7615_dev *dev, int index,</div><div class='ctx'> #undef __req_field_u32</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_SET_RDD_TH, &amp;req,</div><div class='del'>-				 sizeof(req), true);</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(SET_RADAR_TH),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mt7615_mcu_rdd_send_pattern(struct mt7615_dev *dev)</div><div class='hunk'>@@ -2160,7 +2000,7 @@ int mt7615_mcu_rdd_send_pattern(struct mt7615_dev *dev)</div><div class='ctx'> 		req.pattern[i].start_time = cpu_to_le32(ts);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_SET_RDD_PATTERN,</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(SET_RDD_PATTERN),</div><div class='ctx'> 				 &amp;req, sizeof(req), false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2171,7 +2011,7 @@ static void mt7615_mcu_set_txpower_sku(struct mt7615_phy *phy, u8 *sku)</div><div class='ctx'> 	struct mt76_power_limits limits;</div><div class='ctx'> 	s8 *limits_array = (s8 *)&amp;limits;</div><div class='ctx'> 	int n_chains = hweight8(mphy-&gt;antenna_mask);</div><div class='del'>-	int tx_power;</div><div class='add'>+	int tx_power = hw-&gt;conf.power_level * 2;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	static const u8 sku_mapping[] = {</div><div class='ctx'> #define SKU_FIELD(_type, _field) \</div><div class='hunk'>@@ -2228,9 +2068,8 @@ static void mt7615_mcu_set_txpower_sku(struct mt7615_phy *phy, u8 *sku)</div><div class='ctx'> #undef SKU_FIELD</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	tx_power = hw-&gt;conf.power_level * 2 -</div><div class='del'>-		   mt76_tx_power_nss_delta(n_chains);</div><div class='del'>-</div><div class='add'>+	tx_power = mt76_get_sar_power(mphy, mphy-&gt;chandef.chan, tx_power);</div><div class='add'>+	tx_power -= mt76_tx_power_path_delta(n_chains);</div><div class='ctx'> 	tx_power = mt76_get_rate_power_limits(mphy, mphy-&gt;chandef.chan,</div><div class='ctx'> 					      &amp;limits, tx_power);</div><div class='ctx'> 	mphy-&gt;txpower_cur = tx_power;</div><div class='hunk'>@@ -2247,8 +2086,8 @@ static void mt7615_mcu_set_txpower_sku(struct mt7615_phy *phy, u8 *sku)</div><div class='ctx'> 		int delta = 0;</div><div class='ctx'> </div><div class='ctx'> 		if (i &lt; n_chains - 1)</div><div class='del'>-			delta = mt76_tx_power_nss_delta(n_chains) -</div><div class='del'>-				mt76_tx_power_nss_delta(i + 1);</div><div class='add'>+			delta = mt76_tx_power_path_delta(n_chains) -</div><div class='add'>+				mt76_tx_power_path_delta(i + 1);</div><div class='ctx'> 		sku[MT_SKU_1SS_DELTA + i] = delta;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -2303,10 +2142,13 @@ int mt7615_mcu_set_chan_info(struct mt7615_phy *phy, int cmd)</div><div class='ctx'> 		.center_chan2 = ieee80211_frequency_to_channel(freq2),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (phy-&gt;mt76-&gt;hw-&gt;conf.flags &amp; IEEE80211_CONF_OFFCHANNEL)</div><div class='add'>+	if (cmd == MCU_EXT_CMD(SET_RX_PATH) ||</div><div class='add'>+	    phy-&gt;mt76-&gt;hw-&gt;conf.flags &amp; IEEE80211_CONF_MONITOR)</div><div class='add'>+		req.switch_reason = CH_SWITCH_NORMAL;</div><div class='add'>+	else if (phy-&gt;mt76-&gt;offchannel)</div><div class='ctx'> 		req.switch_reason = CH_SWITCH_SCAN_BYPASS_DPD;</div><div class='del'>-	else if ((chandef-&gt;chan-&gt;flags &amp; IEEE80211_CHAN_RADAR) &amp;&amp;</div><div class='del'>-		 chandef-&gt;chan-&gt;dfs_state != NL80211_DFS_AVAILABLE)</div><div class='add'>+	else if (!cfg80211_reg_can_beacon(phy-&gt;mt76-&gt;hw-&gt;wiphy, chandef,</div><div class='add'>+					  NL80211_IFTYPE_AP))</div><div class='ctx'> 		req.switch_reason = CH_SWITCH_DFS;</div><div class='ctx'> 	else</div><div class='ctx'> 		req.switch_reason = CH_SWITCH_NORMAL;</div><div class='hunk'>@@ -2322,17 +2164,15 @@ int mt7615_mcu_set_chan_info(struct mt7615_phy *phy, int cmd)</div><div class='ctx'> 	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, cmd, &amp;req, sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7615_mcu_get_temperature(struct mt7615_dev *dev, int index)</div><div class='add'>+int mt7615_mcu_get_temperature(struct mt7615_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u8 action;</div><div class='ctx'> 		u8 rsv[3];</div><div class='del'>-	} req = {</div><div class='del'>-		.action = index,</div><div class='del'>-	};</div><div class='add'>+	} req = {};</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_GET_TEMP, &amp;req,</div><div class='del'>-				 sizeof(req), true);</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(THERMAL_CTRL),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mt7615_mcu_set_test_param(struct mt7615_dev *dev, u8 param, bool test_mode,</div><div class='hunk'>@@ -2352,8 +2192,8 @@ int mt7615_mcu_set_test_param(struct mt7615_dev *dev, u8 param, bool test_mode,</div><div class='ctx'> 		.value = cpu_to_le32(val),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_ATE_CTRL, &amp;req,</div><div class='del'>-				 sizeof(req), false);</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(ATE_CTRL),</div><div class='add'>+				 &amp;req, sizeof(req), false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mt7615_mcu_set_sku_en(struct mt7615_phy *phy, bool enable)</div><div class='hunk'>@@ -2371,8 +2211,8 @@ int mt7615_mcu_set_sku_en(struct mt7615_phy *phy, bool enable)</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	return mt76_mcu_send_msg(&amp;dev-&gt;mt76,</div><div class='del'>-				 MCU_EXT_CMD_TX_POWER_FEATURE_CTRL, &amp;req,</div><div class='del'>-				 sizeof(req), true);</div><div class='add'>+				 MCU_EXT_CMD(TX_POWER_FEATURE_CTRL),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt7615_find_freq_idx(const u16 *freqs, int n_freqs, u16 cur)</div><div class='hunk'>@@ -2484,7 +2324,7 @@ int mt7615_mcu_apply_rx_dcoc(struct mt7615_phy *phy)</div><div class='ctx'> </div><div class='ctx'> 		.bw = mt7615_mcu_chan_bw(chandef),</div><div class='ctx'> 		.band = chandef-&gt;center_freq1 &gt; 4000,</div><div class='del'>-		.dbdc_en = !!dev-&gt;mt76.phy2,</div><div class='add'>+		.dbdc_en = !!dev-&gt;mt76.phys[MT_BAND1],</div><div class='ctx'> 	};</div><div class='ctx'> 	u16 center_freq = chandef-&gt;center_freq1;</div><div class='ctx'> 	int freq_idx;</div><div class='hunk'>@@ -2511,7 +2351,7 @@ again:</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	req.center_freq = cpu_to_le16(center_freq);</div><div class='del'>-	ret = mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_RXDCOC_CAL, &amp;req,</div><div class='add'>+	ret = mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(RXDCOC_CAL), &amp;req,</div><div class='ctx'> 				sizeof(req), true);</div><div class='ctx'> </div><div class='ctx'> 	if ((chandef-&gt;width == NL80211_CHAN_WIDTH_80P80 ||</div><div class='hunk'>@@ -2605,7 +2445,7 @@ int mt7615_mcu_apply_tx_dpd(struct mt7615_phy *phy)</div><div class='ctx'> </div><div class='ctx'> 		.bw = mt7615_mcu_chan_bw(chandef),</div><div class='ctx'> 		.band = chandef-&gt;center_freq1 &gt; 4000,</div><div class='del'>-		.dbdc_en = !!dev-&gt;mt76.phy2,</div><div class='add'>+		.dbdc_en = !!dev-&gt;mt76.phys[MT_BAND1],</div><div class='ctx'> 	};</div><div class='ctx'> 	u16 center_freq = chandef-&gt;center_freq1;</div><div class='ctx'> 	int freq_idx;</div><div class='hunk'>@@ -2632,8 +2472,8 @@ again:</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	req.center_freq = cpu_to_le16(center_freq);</div><div class='del'>-	ret = mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_TXDPD_CAL, &amp;req,</div><div class='del'>-				sizeof(req), true);</div><div class='add'>+	ret = mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(TXDPD_CAL),</div><div class='add'>+				&amp;req, sizeof(req), true);</div><div class='ctx'> </div><div class='ctx'> 	if ((chandef-&gt;width == NL80211_CHAN_WIDTH_80P80 ||</div><div class='ctx'> 	     chandef-&gt;width == NL80211_CHAN_WIDTH_160) &amp;&amp; !req.is_freq2) {</div><div class='hunk'>@@ -2661,7 +2501,7 @@ int mt7615_mcu_set_rx_hdr_trans_blacklist(struct mt7615_dev *dev)</div><div class='ctx'> 		.etype = cpu_to_le16(ETH_P_PAE),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_RX_HDR_TRANS,</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(RX_HDR_TRANS),</div><div class='ctx'> 				 &amp;req, sizeof(req), false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2681,7 +2521,7 @@ int mt7615_mcu_set_bss_pm(struct mt7615_dev *dev, struct ieee80211_vif *vif,</div><div class='ctx'> 		u8 pad;</div><div class='ctx'> 	} req = {</div><div class='ctx'> 		.bss_idx = mvif-&gt;mt76.idx,</div><div class='del'>-		.aid = cpu_to_le16(vif-&gt;bss_conf.aid),</div><div class='add'>+		.aid = cpu_to_le16(vif-&gt;cfg.aid),</div><div class='ctx'> 		.dtim_period = vif-&gt;bss_conf.dtim_period,</div><div class='ctx'> 		.bcn_interval = cpu_to_le16(vif-&gt;bss_conf.beacon_int),</div><div class='ctx'> 	};</div><div class='hunk'>@@ -2696,13 +2536,13 @@ int mt7615_mcu_set_bss_pm(struct mt7615_dev *dev, struct ieee80211_vif *vif,</div><div class='ctx'> 	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	err = mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_CMD_SET_BSS_ABORT, &amp;req_hdr,</div><div class='del'>-				sizeof(req_hdr), false);</div><div class='add'>+	err = mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_CE_CMD(SET_BSS_ABORT),</div><div class='add'>+				&amp;req_hdr, sizeof(req_hdr), false);</div><div class='ctx'> 	if (err &lt; 0 || !enable)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_CMD_SET_BSS_CONNECTED, &amp;req,</div><div class='del'>-				 sizeof(req), false);</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_CE_CMD(SET_BSS_CONNECTED),</div><div class='add'>+				 &amp;req, sizeof(req), false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mt7615_mcu_set_roc(struct mt7615_phy *phy, struct ieee80211_vif *vif,</div><div class='hunk'>@@ -2721,56 +2561,6 @@ int mt7615_mcu_set_roc(struct mt7615_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> </div><div class='ctx'> 	phy-&gt;roc_grant = false;</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_CMD_SET_ROC, &amp;req,</div><div class='del'>-				 sizeof(req), false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mt7615_mcu_set_p2p_oppps(struct ieee80211_hw *hw,</div><div class='del'>-			     struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct mt7615_vif *mvif = (struct mt7615_vif *)vif-&gt;drv_priv;</div><div class='del'>-	int ct_window = vif-&gt;bss_conf.p2p_noa_attr.oppps_ctwindow;</div><div class='del'>-	struct mt7615_dev *dev = mt7615_hw_dev(hw);</div><div class='del'>-	struct {</div><div class='del'>-		__le32 ct_win;</div><div class='del'>-		u8 bss_idx;</div><div class='del'>-		u8 rsv[3];</div><div class='del'>-	} __packed req = {</div><div class='del'>-		.ct_win = cpu_to_le32(ct_window),</div><div class='del'>-		.bss_idx = mvif-&gt;mt76.idx,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (!mt7615_firmware_offload(dev))</div><div class='del'>-		return -ENOTSUPP;</div><div class='del'>-</div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_CMD_SET_P2P_OPPPS, &amp;req,</div><div class='del'>-				 sizeof(req), false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u32 mt7615_mcu_reg_rr(struct mt76_dev *dev, u32 offset)</div><div class='del'>-{</div><div class='del'>-	struct {</div><div class='del'>-		__le32 addr;</div><div class='del'>-		__le32 val;</div><div class='del'>-	} __packed req = {</div><div class='del'>-		.addr = cpu_to_le32(offset),</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return mt76_mcu_send_msg(dev, MCU_CMD_REG_READ, &amp;req, sizeof(req),</div><div class='del'>-				 true);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(mt7615_mcu_reg_rr);</div><div class='del'>-</div><div class='del'>-void mt7615_mcu_reg_wr(struct mt76_dev *dev, u32 offset, u32 val)</div><div class='del'>-{</div><div class='del'>-	struct {</div><div class='del'>-		__le32 addr;</div><div class='del'>-		__le32 val;</div><div class='del'>-	} __packed req = {</div><div class='del'>-		.addr = cpu_to_le32(offset),</div><div class='del'>-		.val = cpu_to_le32(val),</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	mt76_mcu_send_msg(dev, MCU_CMD_REG_WRITE, &amp;req, sizeof(req), false);</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_CE_CMD(SET_ROC),</div><div class='add'>+				 &amp;req, sizeof(req), false);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(mt7615_mcu_reg_wr);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.h<br/>index 98c383e400a1..851b0e4839b5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/mcu.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/mcu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/mcu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/mcu.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /* Copyright (C) 2019 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MT7615_MCU_H</div><div class='hunk'>@@ -76,35 +76,6 @@ struct mt7615_uni_txd {</div><div class='ctx'> 	u8 reserved2[4];</div><div class='ctx'> } __packed __aligned(4);</div><div class='ctx'> </div><div class='del'>-/* event table */</div><div class='del'>-enum {</div><div class='del'>-	MCU_EVENT_TARGET_ADDRESS_LEN = 0x01,</div><div class='del'>-	MCU_EVENT_FW_START = 0x01,</div><div class='del'>-	MCU_EVENT_GENERIC = 0x01,</div><div class='del'>-	MCU_EVENT_ACCESS_REG = 0x02,</div><div class='del'>-	MCU_EVENT_MT_PATCH_SEM = 0x04,</div><div class='del'>-	MCU_EVENT_REG_ACCESS = 0x05,</div><div class='del'>-	MCU_EVENT_SCAN_DONE = 0x0d,</div><div class='del'>-	MCU_EVENT_ROC = 0x10,</div><div class='del'>-	MCU_EVENT_BSS_ABSENCE  = 0x11,</div><div class='del'>-	MCU_EVENT_BSS_BEACON_LOSS = 0x13,</div><div class='del'>-	MCU_EVENT_CH_PRIVILEGE = 0x18,</div><div class='del'>-	MCU_EVENT_SCHED_SCAN_DONE = 0x23,</div><div class='del'>-	MCU_EVENT_EXT = 0xed,</div><div class='del'>-	MCU_EVENT_RESTART_DL = 0xef,</div><div class='del'>-	MCU_EVENT_COREDUMP = 0xf0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ext event table */</div><div class='del'>-enum {</div><div class='del'>-	MCU_EXT_EVENT_PS_SYNC = 0x5,</div><div class='del'>-	MCU_EXT_EVENT_FW_LOG_2_HOST = 0x13,</div><div class='del'>-	MCU_EXT_EVENT_THERMAL_PROTECT = 0x22,</div><div class='del'>-	MCU_EXT_EVENT_ASSERT_DUMP = 0x23,</div><div class='del'>-	MCU_EXT_EVENT_RDD_REPORT = 0x3a,</div><div class='del'>-	MCU_EXT_EVENT_CSA_NOTIFY = 0x4f,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> enum {</div><div class='ctx'>     MT_SKU_CCK_1_2 = 0,</div><div class='ctx'>     MT_SKU_CCK_55_11,</div><div class='hunk'>@@ -230,39 +201,11 @@ struct mt7615_mcu_rdd_report {</div><div class='ctx'> 	} hw_pulse[32];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define MCU_PQ_ID(p, q)		(((p) &lt;&lt; 15) | ((q) &lt;&lt; 10))</div><div class='del'>-#define MCU_PKT_ID		0xa0</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	MCU_Q_QUERY,</div><div class='del'>-	MCU_Q_SET,</div><div class='del'>-	MCU_Q_RESERVED,</div><div class='del'>-	MCU_Q_NA</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	MCU_S2D_H2N,</div><div class='del'>-	MCU_S2D_C2N,</div><div class='del'>-	MCU_S2D_H2C,</div><div class='del'>-	MCU_S2D_H2CN</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> enum {</div><div class='ctx'> 	MCU_ATE_SET_FREQ_OFFSET = 0xa,</div><div class='ctx'> 	MCU_ATE_SET_TX_POWER_CONTROL = 0x15,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mt7615_mcu_uni_event {</div><div class='del'>-	u8 cid;</div><div class='del'>-	u8 pad[3];</div><div class='del'>-	__le32 status; /* 0: success, others: fail */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct mt7615_mcu_reg_event {</div><div class='del'>-	__le32 reg;</div><div class='del'>-	__le32 val;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='ctx'> struct mt7615_roc_tlv {</div><div class='ctx'> 	u8 bss_idx;</div><div class='ctx'> 	u8 token;</div><div class='hunk'>@@ -281,21 +224,6 @@ struct mt7615_roc_tlv {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	PATCH_NOT_DL_SEM_FAIL	 = 0x0,</div><div class='del'>-	PATCH_IS_DL		 = 0x1,</div><div class='del'>-	PATCH_NOT_DL_SEM_SUCCESS = 0x2,</div><div class='del'>-	PATCH_REL_SEM_SUCCESS	 = 0x3</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	FW_STATE_INITIAL          = 0,</div><div class='del'>-	FW_STATE_FW_DOWNLOAD      = 1,</div><div class='del'>-	FW_STATE_NORMAL_OPERATION = 2,</div><div class='del'>-	FW_STATE_NORMAL_TRX       = 3,</div><div class='del'>-	FW_STATE_CR4_RDY          = 7</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='ctx'> 	FW_STATE_PWR_ON = 1,</div><div class='ctx'> 	FW_STATE_N9_RDY = 2,</div><div class='ctx'> };</div><div class='hunk'>@@ -312,73 +240,4 @@ enum {</div><div class='ctx'> 	__DBDC_TYPE_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct bss_info_omac {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	u8 hw_bss_idx;</div><div class='del'>-	u8 omac_idx;</div><div class='del'>-	u8 band_idx;</div><div class='del'>-	u8 rsv0;</div><div class='del'>-	__le32 conn_type;</div><div class='del'>-	u32 rsv1;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct bss_info_basic {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	__le32 network_type;</div><div class='del'>-	u8 active;</div><div class='del'>-	u8 rsv0;</div><div class='del'>-	__le16 bcn_interval;</div><div class='del'>-	u8 bssid[ETH_ALEN];</div><div class='del'>-	u8 wmm_idx;</div><div class='del'>-	u8 dtim_period;</div><div class='del'>-	u8 bmc_tx_wlan_idx;</div><div class='del'>-	u8 cipher; /* not used */</div><div class='del'>-	u8 phymode; /* not used */</div><div class='del'>-	u8 rsv1[5];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct bss_info_rf_ch {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	u8 pri_ch;</div><div class='del'>-	u8 central_ch0;</div><div class='del'>-	u8 central_ch1;</div><div class='del'>-	u8 bw;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct bss_info_ext_bss {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	__le32 mbss_tsf_offset; /* in unit of us */</div><div class='del'>-	u8 rsv[8];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	BSS_INFO_OMAC,</div><div class='del'>-	BSS_INFO_BASIC,</div><div class='del'>-	BSS_INFO_RF_CH, /* optional, for BT/LTE coex */</div><div class='del'>-	BSS_INFO_PM, /* sta only */</div><div class='del'>-	BSS_INFO_UAPSD, /* sta only */</div><div class='del'>-	BSS_INFO_ROAM_DETECTION, /* obsoleted */</div><div class='del'>-	BSS_INFO_LQ_RM, /* obsoleted */</div><div class='del'>-	BSS_INFO_EXT_BSS,</div><div class='del'>-	BSS_INFO_BMC_INFO, /* for bmc rate control in CR4 */</div><div class='del'>-	BSS_INFO_SYNC_MODE, /* obsoleted */</div><div class='del'>-	BSS_INFO_RA,</div><div class='del'>-	BSS_INFO_MAX_NUM</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CH_SWITCH_NORMAL = 0,</div><div class='del'>-	CH_SWITCH_SCAN = 3,</div><div class='del'>-	CH_SWITCH_MCC = 4,</div><div class='del'>-	CH_SWITCH_DFS = 5,</div><div class='del'>-	CH_SWITCH_BACKGROUND_SCAN_START = 6,</div><div class='del'>-	CH_SWITCH_BACKGROUND_SCAN_RUNNING = 7,</div><div class='del'>-	CH_SWITCH_BACKGROUND_SCAN_STOP = 8,</div><div class='del'>-	CH_SWITCH_SCAN_BYPASS_DPD = 9</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c<br/>index 202ea235415e..da7edd48ce2c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/mmio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/mmio.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -63,28 +63,10 @@ const u32 mt7663e_reg_map[] = {</div><div class='ctx'> 	[MT_EFUSE_ADDR_BASE]	= 0x78011000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-u32 mt7615_reg_map(struct mt7615_dev *dev, u32 addr)</div><div class='del'>-{</div><div class='del'>-	u32 base, offset;</div><div class='del'>-</div><div class='del'>-	if (is_mt7663(&amp;dev-&gt;mt76)) {</div><div class='del'>-		base = addr &amp; MT7663_MCU_PCIE_REMAP_2_BASE;</div><div class='del'>-		offset = addr &amp; MT7663_MCU_PCIE_REMAP_2_OFFSET;</div><div class='del'>-	} else {</div><div class='del'>-		base = addr &amp; MT_MCU_PCIE_REMAP_2_BASE;</div><div class='del'>-		offset = addr &amp; MT_MCU_PCIE_REMAP_2_OFFSET;</div><div class='del'>-	}</div><div class='del'>-	mt76_wr(dev, MT_MCU_PCIE_REMAP_2, base);</div><div class='del'>-</div><div class='del'>-	return MT_PCIE_REMAP_BASE_2 + offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> mt7615_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q)</div><div class='ctx'> {</div><div class='del'>-	struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);</div><div class='del'>-</div><div class='del'>-	mt7615_irq_enable(dev, MT_INT_RX_DONE(q));</div><div class='add'>+	mt76_connac_irq_enable(mdev, MT_INT_RX_DONE(q));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t mt7615_irq_handler(int irq, void *dev_instance)</div><div class='hunk'>@@ -96,14 +78,14 @@ static irqreturn_t mt7615_irq_handler(int irq, void *dev_instance)</div><div class='ctx'> 	if (!test_bit(MT76_STATE_INITIALIZED, &amp;dev-&gt;mphy.state))</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-	tasklet_schedule(&amp;dev-&gt;irq_tasklet);</div><div class='add'>+	tasklet_schedule(&amp;dev-&gt;mt76.irq_tasklet);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mt7615_irq_tasklet(struct tasklet_struct *t)</div><div class='ctx'> {</div><div class='del'>-	struct mt7615_dev *dev = from_tasklet(dev, t, irq_tasklet);</div><div class='add'>+	struct mt7615_dev *dev = from_tasklet(dev, t, mt76.irq_tasklet);</div><div class='ctx'> 	u32 intr, mask = 0, tx_mcu_mask = mt7615_tx_mcu_int_mask(dev);</div><div class='ctx'> 	u32 mcu_int;</div><div class='ctx'> </div><div class='hunk'>@@ -135,6 +117,7 @@ static void mt7615_irq_tasklet(struct tasklet_struct *t)</div><div class='ctx'> 	if (is_mt7663(&amp;dev-&gt;mt76)) {</div><div class='ctx'> 		mcu_int = mt76_rr(dev, MT_MCU2HOST_INT_STATUS);</div><div class='ctx'> 		mcu_int &amp;= MT7663_MCU_CMD_ERROR_MASK;</div><div class='add'>+		mt76_wr(dev, MT_MCU2HOST_INT_STATUS, mcu_int);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mcu_int = mt76_rr(dev, MT_MCU_CMD);</div><div class='ctx'> 		mcu_int &amp;= MT_MCU_CMD_ERROR_MASK;</div><div class='hunk'>@@ -144,7 +127,7 @@ static void mt7615_irq_tasklet(struct tasklet_struct *t)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;reset_state = mcu_int;</div><div class='del'>-	ieee80211_queue_work(mt76_hw(dev), &amp;dev-&gt;reset_work);</div><div class='add'>+	queue_work(dev-&gt;mt76.wq, &amp;dev-&gt;reset_work);</div><div class='ctx'> 	wake_up(&amp;dev-&gt;reset_wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -185,20 +168,21 @@ int mt7615_mmio_probe(struct device *pdev, void __iomem *mem_base,</div><div class='ctx'> {</div><div class='ctx'> 	static const struct mt76_driver_ops drv_ops = {</div><div class='ctx'> 		/* txwi_size = txd size + txp size */</div><div class='del'>-		.txwi_size = MT_TXD_SIZE + sizeof(struct mt7615_txp_common),</div><div class='add'>+		.txwi_size = MT_TXD_SIZE + sizeof(struct mt76_connac_txp_common),</div><div class='ctx'> 		.drv_flags = MT_DRV_TXWI_NO_FREE | MT_DRV_HW_MGMT_TXQ,</div><div class='ctx'> 		.survey_flags = SURVEY_INFO_TIME_TX |</div><div class='ctx'> 				SURVEY_INFO_TIME_RX |</div><div class='ctx'> 				SURVEY_INFO_TIME_BSS_RX,</div><div class='ctx'> 		.token_size = MT7615_TOKEN_SIZE,</div><div class='ctx'> 		.tx_prepare_skb = mt7615_tx_prepare_skb,</div><div class='del'>-		.tx_complete_skb = mt7615_tx_complete_skb,</div><div class='add'>+		.tx_complete_skb = mt76_connac_tx_complete_skb,</div><div class='add'>+		.rx_check = mt7615_rx_check,</div><div class='ctx'> 		.rx_skb = mt7615_queue_rx_skb,</div><div class='ctx'> 		.rx_poll_complete = mt7615_rx_poll_complete,</div><div class='del'>-		.sta_ps = mt7615_sta_ps,</div><div class='ctx'> 		.sta_add = mt7615_mac_sta_add,</div><div class='ctx'> 		.sta_remove = mt7615_mac_sta_remove,</div><div class='ctx'> 		.update_survey = mt7615_update_channel,</div><div class='add'>+		.set_channel = mt7615_set_channel,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct mt76_bus_ops *bus_ops;</div><div class='ctx'> 	struct ieee80211_ops *ops;</div><div class='hunk'>@@ -216,7 +200,7 @@ int mt7615_mmio_probe(struct device *pdev, void __iomem *mem_base,</div><div class='ctx'> </div><div class='ctx'> 	dev = container_of(mdev, struct mt7615_dev, mt76);</div><div class='ctx'> 	mt76_mmio_init(&amp;dev-&gt;mt76, mem_base);</div><div class='del'>-	tasklet_setup(&amp;dev-&gt;irq_tasklet, mt7615_irq_tasklet);</div><div class='add'>+	tasklet_setup(&amp;mdev-&gt;irq_tasklet, mt7615_irq_tasklet);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;reg_map = map;</div><div class='ctx'> 	dev-&gt;ops = ops;</div><div class='hunk'>@@ -229,7 +213,7 @@ int mt7615_mmio_probe(struct device *pdev, void __iomem *mem_base,</div><div class='ctx'> 			       GFP_KERNEL);</div><div class='ctx'> 	if (!bus_ops) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='del'>-		goto error;</div><div class='add'>+		goto err_free_dev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bus_ops-&gt;rr = mt7615_rr;</div><div class='hunk'>@@ -242,17 +226,20 @@ int mt7615_mmio_probe(struct device *pdev, void __iomem *mem_base,</div><div class='ctx'> 	ret = devm_request_irq(mdev-&gt;dev, irq, mt7615_irq_handler,</div><div class='ctx'> 			       IRQF_SHARED, KBUILD_MODNAME, dev);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+		goto err_free_dev;</div><div class='ctx'> </div><div class='ctx'> 	if (is_mt7663(mdev))</div><div class='ctx'> 		mt76_wr(dev, MT_PCIE_IRQ_ENABLE, 1);</div><div class='ctx'> </div><div class='ctx'> 	ret = mt7615_register_device(dev);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+		goto err_free_irq;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-error:</div><div class='add'>+</div><div class='add'>+err_free_irq:</div><div class='add'>+	devm_free_irq(pdev, irq, dev);</div><div class='add'>+err_free_dev:</div><div class='ctx'> 	mt76_free_device(&amp;dev-&gt;mt76);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -284,4 +271,5 @@ static void __exit mt7615_exit(void)</div><div class='ctx'> </div><div class='ctx'> module_init(mt7615_init);</div><div class='ctx'> module_exit(mt7615_exit);</div><div class='add'>+MODULE_DESCRIPTION("MediaTek MT7615E MMIO helpers");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h<br/>index 989f05ed4377..e16865dd8e52 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /* Copyright (C) 2019 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MT7615_H</div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> 					 MT7615_MAX_INTERFACES)</div><div class='ctx'> </div><div class='ctx'> #define MT7615_PM_TIMEOUT		(HZ / 12)</div><div class='del'>-#define MT7615_WATCHDOG_TIME		(HZ / 10)</div><div class='ctx'> #define MT7615_HW_SCAN_TIMEOUT		(HZ / 10)</div><div class='ctx'> #define MT7615_RESET_TIMEOUT		(30 * HZ)</div><div class='ctx'> #define MT7615_RATE_RETRY		2</div><div class='hunk'>@@ -52,6 +51,7 @@</div><div class='ctx'> #define MT7663_FIRMWARE_N9		"mediatek/mt7663_n9_rebb.bin"</div><div class='ctx'> </div><div class='ctx'> #define MT7615_EEPROM_SIZE		1024</div><div class='add'>+#define MT7663_EEPROM_SIZE		1536</div><div class='ctx'> #define MT7615_TOKEN_SIZE		4096</div><div class='ctx'> </div><div class='ctx'> #define MT_FRAC_SCALE		12</div><div class='hunk'>@@ -108,12 +108,23 @@ struct mt7615_wtbl_rate_desc {</div><div class='ctx'> 	struct mt7615_sta *sta;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mt7663s_intr {</div><div class='add'>+	u32 isr;</div><div class='add'>+	struct {</div><div class='add'>+		u32 wtqcr[8];</div><div class='add'>+	} tx;</div><div class='add'>+	struct {</div><div class='add'>+		u16 num[2];</div><div class='add'>+		u16 len[2][16];</div><div class='add'>+	} rx;</div><div class='add'>+	u32 rec_mb[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct mt7615_sta {</div><div class='ctx'> 	struct mt76_wcid wcid; /* must be first */</div><div class='ctx'> </div><div class='ctx'> 	struct mt7615_vif *vif;</div><div class='ctx'> </div><div class='del'>-	struct list_head poll_list;</div><div class='ctx'> 	u32 airtime_ac[8];</div><div class='ctx'> </div><div class='ctx'> 	struct ieee80211_tx_rate rates[4];</div><div class='hunk'>@@ -128,8 +139,9 @@ struct mt7615_sta {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt7615_vif {</div><div class='del'>-	struct mt76_vif mt76; /* must be first */</div><div class='add'>+	struct mt76_vif_link mt76; /* must be first */</div><div class='ctx'> 	struct mt7615_sta sta;</div><div class='add'>+	bool sta_added;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mib_stats {</div><div class='hunk'>@@ -166,7 +178,6 @@ struct mt7615_phy {</div><div class='ctx'> </div><div class='ctx'> 	u8 chfreq;</div><div class='ctx'> 	u8 rdd_state;</div><div class='del'>-	int dfs_state;</div><div class='ctx'> </div><div class='ctx'> 	u32 rx_ampdu_ts;</div><div class='ctx'> 	u32 ampdu_ref;</div><div class='hunk'>@@ -202,6 +213,7 @@ struct mt7615_phy {</div><div class='ctx'> #define mt7615_mcu_set_pm(dev, ...)	(dev)-&gt;mcu_ops-&gt;set_pm_state((dev),  __VA_ARGS__)</div><div class='ctx'> #define mt7615_mcu_set_drv_ctrl(dev)	(dev)-&gt;mcu_ops-&gt;set_drv_ctrl((dev))</div><div class='ctx'> #define mt7615_mcu_set_fw_ctrl(dev)	(dev)-&gt;mcu_ops-&gt;set_fw_ctrl((dev))</div><div class='add'>+#define mt7615_mcu_set_sta_decap_offload(dev, ...) (dev)-&gt;mcu_ops-&gt;set_sta_decap_offload((dev), __VA_ARGS__)</div><div class='ctx'> struct mt7615_mcu_ops {</div><div class='ctx'> 	int (*add_tx_ba)(struct mt7615_dev *dev,</div><div class='ctx'> 			 struct ieee80211_ampdu_params *params,</div><div class='hunk'>@@ -221,6 +233,9 @@ struct mt7615_mcu_ops {</div><div class='ctx'> 	int (*set_pm_state)(struct mt7615_dev *dev, int band, int state);</div><div class='ctx'> 	int (*set_drv_ctrl)(struct mt7615_dev *dev);</div><div class='ctx'> 	int (*set_fw_ctrl)(struct mt7615_dev *dev);</div><div class='add'>+	int (*set_sta_decap_offload)(struct mt7615_dev *dev,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     struct ieee80211_sta *sta);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt7615_dev {</div><div class='hunk'>@@ -230,8 +245,6 @@ struct mt7615_dev {</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	const struct mt76_bus_ops *bus_ops;</div><div class='del'>-	struct tasklet_struct irq_tasklet;</div><div class='del'>-</div><div class='ctx'> 	struct mt7615_phy phy;</div><div class='ctx'> 	u64 omac_mask;</div><div class='ctx'> </div><div class='hunk'>@@ -248,9 +261,6 @@ struct mt7615_dev {</div><div class='ctx'> 	wait_queue_head_t reset_wait;</div><div class='ctx'> 	u32 reset_state;</div><div class='ctx'> </div><div class='del'>-	struct list_head sta_poll_list;</div><div class='del'>-	spinlock_t sta_poll_lock;</div><div class='del'>-</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u8 n_pulses;</div><div class='ctx'> 		u32 period;</div><div class='hunk'>@@ -330,7 +340,7 @@ mt7615_hw_dev(struct ieee80211_hw *hw)</div><div class='ctx'> static inline struct mt7615_phy *</div><div class='ctx'> mt7615_ext_phy(struct mt7615_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_phy *phy = dev-&gt;mt76.phy2;</div><div class='add'>+	struct mt76_phy *phy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='ctx'> </div><div class='ctx'> 	if (!phy)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -356,10 +366,17 @@ static inline int mt7622_wmac_init(struct mt7615_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+int mt7615_thermal_init(struct mt7615_dev *dev);</div><div class='ctx'> int mt7615_mmio_probe(struct device *pdev, void __iomem *mem_base,</div><div class='ctx'> 		      int irq, const u32 *map);</div><div class='ctx'> u32 mt7615_reg_map(struct mt7615_dev *dev, u32 addr);</div><div class='ctx'> </div><div class='add'>+u32 mt7615_reg_map(struct mt7615_dev *dev, u32 addr);</div><div class='add'>+int mt7615_led_set_blink(struct led_classdev *led_cdev,</div><div class='add'>+			 unsigned long *delay_on,</div><div class='add'>+			 unsigned long *delay_off);</div><div class='add'>+void mt7615_led_set_brightness(struct led_classdev *led_cdev,</div><div class='add'>+			       enum led_brightness brightness);</div><div class='ctx'> void mt7615_init_device(struct mt7615_dev *dev);</div><div class='ctx'> int mt7615_register_device(struct mt7615_dev *dev);</div><div class='ctx'> void mt7615_unregister_device(struct mt7615_dev *dev);</div><div class='hunk'>@@ -382,42 +399,13 @@ void mt7615_mac_set_rates(struct mt7615_phy *phy, struct mt7615_sta *sta,</div><div class='ctx'> 			  struct ieee80211_tx_rate *rates);</div><div class='ctx'> void mt7615_pm_wake_work(struct work_struct *work);</div><div class='ctx'> void mt7615_pm_power_save_work(struct work_struct *work);</div><div class='del'>-int mt7615_mcu_del_wtbl_all(struct mt7615_dev *dev);</div><div class='ctx'> int mt7615_mcu_set_chan_info(struct mt7615_phy *phy, int cmd);</div><div class='ctx'> int mt7615_mcu_set_wmm(struct mt7615_dev *dev, u8 queue,</div><div class='ctx'> 		       const struct ieee80211_tx_queue_params *params);</div><div class='ctx'> void mt7615_mcu_rx_event(struct mt7615_dev *dev, struct sk_buff *skb);</div><div class='del'>-int mt7615_mcu_rdd_cmd(struct mt7615_dev *dev,</div><div class='del'>-		       enum mt7615_rdd_cmd cmd, u8 index,</div><div class='del'>-		       u8 rx_sel, u8 val);</div><div class='ctx'> int mt7615_mcu_rdd_send_pattern(struct mt7615_dev *dev);</div><div class='ctx'> int mt7615_mcu_fw_log_2_host(struct mt7615_dev *dev, u8 ctrl);</div><div class='ctx'> </div><div class='del'>-static inline bool is_mt7622(struct mt76_dev *dev)</div><div class='del'>-{</div><div class='del'>-	if (!IS_ENABLED(CONFIG_MT7622_WMAC))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return mt76_chip(dev) == 0x7622;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool is_mt7615(struct mt76_dev *dev)</div><div class='del'>-{</div><div class='del'>-	return mt76_chip(dev) == 0x7615 || mt76_chip(dev) == 0x7611;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool is_mt7611(struct mt76_dev *dev)</div><div class='del'>-{</div><div class='del'>-	return mt76_chip(dev) == 0x7611;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void mt7615_irq_enable(struct mt7615_dev *dev, u32 mask)</div><div class='del'>-{</div><div class='del'>-	mt76_set_irq_mask(&amp;dev-&gt;mt76, 0, 0, mask);</div><div class='del'>-</div><div class='del'>-	tasklet_schedule(&amp;dev-&gt;irq_tasklet);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline bool mt7615_firmware_offload(struct mt7615_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return dev-&gt;fw_ver &gt; MT7615_FIRMWARE_V2;</div><div class='hunk'>@@ -456,35 +444,42 @@ static inline u32 mt7615_tx_mcu_int_mask(struct mt7615_dev *dev)</div><div class='ctx'> 	return MT_INT_TX_DONE(dev-&gt;mt76.q_mcu[MT_MCUQ_WM]-&gt;hw_idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline unsigned long</div><div class='add'>+mt7615_get_macwork_timeout(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;pm.enable ? HZ / 3 : HZ / 10;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void mt7615_dma_reset(struct mt7615_dev *dev);</div><div class='ctx'> void mt7615_scan_work(struct work_struct *work);</div><div class='ctx'> void mt7615_roc_work(struct work_struct *work);</div><div class='ctx'> void mt7615_roc_timer(struct timer_list *timer);</div><div class='ctx'> void mt7615_init_txpower(struct mt7615_dev *dev,</div><div class='ctx'> 			 struct ieee80211_supported_band *sband);</div><div class='del'>-int mt7615_set_channel(struct mt7615_phy *phy);</div><div class='add'>+int mt7615_set_channel(struct mt76_phy *mphy);</div><div class='ctx'> void mt7615_init_work(struct mt7615_dev *dev);</div><div class='ctx'> </div><div class='ctx'> int mt7615_mcu_restart(struct mt76_dev *dev);</div><div class='del'>-void mt7615_update_channel(struct mt76_dev *mdev);</div><div class='add'>+void mt7615_update_channel(struct mt76_phy *mphy);</div><div class='ctx'> bool mt7615_mac_wtbl_update(struct mt7615_dev *dev, int idx, u32 mask);</div><div class='del'>-void mt7615_mac_reset_counters(struct mt7615_dev *dev);</div><div class='add'>+void mt7615_mac_reset_counters(struct mt7615_phy *phy);</div><div class='ctx'> void mt7615_mac_cca_stats_reset(struct mt7615_phy *phy);</div><div class='ctx'> void mt7615_mac_set_scs(struct mt7615_phy *phy, bool enable);</div><div class='ctx'> void mt7615_mac_enable_nf(struct mt7615_dev *dev, bool ext_phy);</div><div class='add'>+void mt7615_mac_enable_rtscts(struct mt7615_dev *dev,</div><div class='add'>+			      struct ieee80211_vif *vif, bool enable);</div><div class='ctx'> void mt7615_mac_sta_poll(struct mt7615_dev *dev);</div><div class='ctx'> int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi,</div><div class='ctx'> 			  struct sk_buff *skb, struct mt76_wcid *wcid,</div><div class='ctx'> 			  struct ieee80211_sta *sta, int pid,</div><div class='del'>-			  struct ieee80211_key_conf *key, bool beacon);</div><div class='add'>+			  struct ieee80211_key_conf *key,</div><div class='add'>+			  enum mt76_txq_id qid, bool beacon);</div><div class='ctx'> void mt7615_mac_set_timing(struct mt7615_phy *phy);</div><div class='ctx'> int __mt7615_mac_wtbl_set_key(struct mt7615_dev *dev,</div><div class='ctx'> 			      struct mt76_wcid *wcid,</div><div class='del'>-			      struct ieee80211_key_conf *key,</div><div class='del'>-			      enum set_key_cmd cmd);</div><div class='add'>+			      struct ieee80211_key_conf *key);</div><div class='ctx'> int mt7615_mac_wtbl_set_key(struct mt7615_dev *dev, struct mt76_wcid *wcid,</div><div class='del'>-			    struct ieee80211_key_conf *key,</div><div class='del'>-			    enum set_key_cmd cmd);</div><div class='add'>+			    struct ieee80211_key_conf *key);</div><div class='ctx'> void mt7615_mac_reset_work(struct work_struct *work);</div><div class='ctx'> u32 mt7615_mac_get_sta_tid_sn(struct mt7615_dev *dev, int wcid, u8 tid);</div><div class='ctx'> </div><div class='hunk'>@@ -494,7 +489,7 @@ u32 mt7615_rf_rr(struct mt7615_dev *dev, u32 wf, u32 reg);</div><div class='ctx'> int mt7615_rf_wr(struct mt7615_dev *dev, u32 wf, u32 reg, u32 val);</div><div class='ctx'> int mt7615_mcu_set_dbdc(struct mt7615_dev *dev);</div><div class='ctx'> int mt7615_mcu_set_eeprom(struct mt7615_dev *dev);</div><div class='del'>-int mt7615_mcu_get_temperature(struct mt7615_dev *dev, int index);</div><div class='add'>+int mt7615_mcu_get_temperature(struct mt7615_dev *dev);</div><div class='ctx'> int mt7615_mcu_set_tx_power(struct mt7615_phy *phy);</div><div class='ctx'> void mt7615_mcu_exit(struct mt7615_dev *dev);</div><div class='ctx'> void mt7615_mcu_fill_msg(struct mt7615_dev *dev, struct sk_buff *skb,</div><div class='hunk'>@@ -506,21 +501,15 @@ int mt7615_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='ctx'> 			  struct mt76_tx_info *tx_info);</div><div class='ctx'> </div><div class='ctx'> void mt7615_tx_worker(struct mt76_worker *w);</div><div class='del'>-void mt7615_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e);</div><div class='ctx'> void mt7615_tx_token_put(struct mt7615_dev *dev);</div><div class='add'>+bool mt7615_rx_check(struct mt76_dev *mdev, void *data, int len);</div><div class='ctx'> void mt7615_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,</div><div class='del'>-			 struct sk_buff *skb);</div><div class='del'>-void mt7615_sta_ps(struct mt76_dev *mdev, struct ieee80211_sta *sta, bool ps);</div><div class='add'>+			 struct sk_buff *skb, u32 *info);</div><div class='ctx'> int mt7615_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='ctx'> 		       struct ieee80211_sta *sta);</div><div class='ctx'> void mt7615_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='ctx'> 			   struct ieee80211_sta *sta);</div><div class='ctx'> void mt7615_mac_work(struct work_struct *work);</div><div class='del'>-void mt7615_txp_skb_unmap(struct mt76_dev *dev,</div><div class='del'>-			  struct mt76_txwi_cache *txwi);</div><div class='del'>-int mt7615_mcu_sta_update_hdr_trans(struct mt7615_dev *dev,</div><div class='del'>-				    struct ieee80211_vif *vif,</div><div class='del'>-				    struct ieee80211_sta *sta);</div><div class='ctx'> int mt7615_mcu_set_rx_hdr_trans_blacklist(struct mt7615_dev *dev);</div><div class='ctx'> int mt7615_mcu_set_fcc5_lpn(struct mt7615_dev *dev, int val);</div><div class='ctx'> int mt7615_mcu_set_pulse_th(struct mt7615_dev *dev,</div><div class='hunk'>@@ -534,8 +523,6 @@ int mt7615_mcu_apply_rx_dcoc(struct mt7615_phy *phy);</div><div class='ctx'> int mt7615_mcu_apply_tx_dpd(struct mt7615_phy *phy);</div><div class='ctx'> int mt7615_dfs_init_radar_detector(struct mt7615_phy *phy);</div><div class='ctx'> </div><div class='del'>-int mt7615_mcu_set_p2p_oppps(struct ieee80211_hw *hw,</div><div class='del'>-			     struct ieee80211_vif *vif);</div><div class='ctx'> int mt7615_mcu_set_roc(struct mt7615_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 		       struct ieee80211_channel *chan, int duration);</div><div class='ctx'> </div><div class='hunk'>@@ -548,8 +535,6 @@ int mt7615_mac_set_beacon_filter(struct mt7615_phy *phy,</div><div class='ctx'> int mt7615_mcu_set_bss_pm(struct mt7615_dev *dev, struct ieee80211_vif *vif,</div><div class='ctx'> 			  bool enable);</div><div class='ctx'> int __mt7663_load_firmware(struct mt7615_dev *dev);</div><div class='del'>-u32 mt7615_mcu_reg_rr(struct mt76_dev *dev, u32 offset);</div><div class='del'>-void mt7615_mcu_reg_wr(struct mt76_dev *dev, u32 offset, u32 val);</div><div class='ctx'> void mt7615_coredump_work(struct work_struct *work);</div><div class='ctx'> </div><div class='ctx'> void mt7622_trigger_hif_int(struct mt7615_dev *dev, bool en);</div><div class='hunk'>@@ -564,12 +549,9 @@ void mt7663_usb_sdio_tx_complete_skb(struct mt76_dev *mdev,</div><div class='ctx'> 				     struct mt76_queue_entry *e);</div><div class='ctx'> int mt7663_usb_sdio_register_device(struct mt7615_dev *dev);</div><div class='ctx'> int mt7663u_mcu_init(struct mt7615_dev *dev);</div><div class='add'>+int mt7663u_mcu_power_on(struct mt7615_dev *dev);</div><div class='ctx'> </div><div class='ctx'> /* sdio */</div><div class='del'>-u32 mt7663s_read_pcr(struct mt7615_dev *dev);</div><div class='ctx'> int mt7663s_mcu_init(struct mt7615_dev *dev);</div><div class='del'>-void mt7663s_txrx_worker(struct mt76_worker *w);</div><div class='del'>-void mt7663s_rx_work(struct work_struct *work);</div><div class='del'>-void mt7663s_sdio_irq(struct sdio_func *func);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615_trace.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615_trace.h<br/>index d3eb49d83b98..697fc5d225de 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/mt7615_trace.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/mt7615_trace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/mt7615_trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/mt7615_trace.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2019 Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> </div><div class='ctx'> #define MAXNAME		32</div><div class='ctx'> #define DEV_ENTRY	__array(char, wiphy_name, 32)</div><div class='del'>-#define DEV_ASSIGN	strlcpy(__entry-&gt;wiphy_name,	\</div><div class='add'>+#define DEV_ASSIGN	strscpy(__entry-&gt;wiphy_name,	\</div><div class='ctx'> 				wiphy_name(mt76_hw(dev)-&gt;wiphy), MAXNAME)</div><div class='ctx'> #define DEV_PR_FMT	"%s"</div><div class='ctx'> #define DEV_PR_ARG	__entry-&gt;wiphy_name</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/pci.c b/drivers/net/wireless/mediatek/mt76/mt7615/pci.c<br/>index 11f169cdd603..f5018bfa317a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/pci.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/pci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/pci.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2019 MediaTek Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Ryder Lee &lt;ryder.lee@mediatek.com&gt;</div><div class='hunk'>@@ -39,7 +39,7 @@ static int mt7615_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='add'>+	ret = dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -83,7 +83,7 @@ static int mt7615_pci_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 	hif_suspend = !test_bit(MT76_STATE_SUSPEND, &amp;dev-&gt;mphy.state) &amp;&amp;</div><div class='ctx'> 		      mt7615_firmware_offload(dev);</div><div class='ctx'> 	if (hif_suspend) {</div><div class='del'>-		err = mt76_connac_mcu_set_hif_suspend(mdev, true);</div><div class='add'>+		err = mt76_connac_mcu_set_hif_suspend(mdev, true, true);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -94,7 +94,7 @@ static int mt7615_pci_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 	mt76_for_each_q_rx(mdev, i) {</div><div class='ctx'> 		napi_disable(&amp;mdev-&gt;napi[i]);</div><div class='ctx'> 	}</div><div class='del'>-	tasklet_kill(&amp;dev-&gt;irq_tasklet);</div><div class='add'>+	tasklet_kill(&amp;mdev-&gt;irq_tasklet);</div><div class='ctx'> </div><div class='ctx'> 	mt7615_dma_reset(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -131,7 +131,7 @@ restore:</div><div class='ctx'> 	}</div><div class='ctx'> 	napi_enable(&amp;mdev-&gt;tx_napi);</div><div class='ctx'> 	if (hif_suspend)</div><div class='del'>-		mt76_connac_mcu_set_hif_suspend(mdev, false);</div><div class='add'>+		mt76_connac_mcu_set_hif_suspend(mdev, false, true);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -164,16 +164,22 @@ static int mt7615_pci_resume(struct pci_dev *pdev)</div><div class='ctx'> 		dev_err(mdev-&gt;dev, "PDMA engine must be reinitialized\n");</div><div class='ctx'> </div><div class='ctx'> 	mt76_worker_enable(&amp;mdev-&gt;tx_worker);</div><div class='add'>+</div><div class='ctx'> 	mt76_for_each_q_rx(mdev, i) {</div><div class='ctx'> 		napi_enable(&amp;mdev-&gt;napi[i]);</div><div class='del'>-		napi_schedule(&amp;mdev-&gt;napi[i]);</div><div class='ctx'> 	}</div><div class='ctx'> 	napi_enable(&amp;mdev-&gt;tx_napi);</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	mt76_for_each_q_rx(mdev, i) {</div><div class='add'>+		napi_schedule(&amp;mdev-&gt;napi[i]);</div><div class='add'>+	}</div><div class='ctx'> 	napi_schedule(&amp;mdev-&gt;tx_napi);</div><div class='add'>+	local_bh_enable();</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(MT76_STATE_SUSPEND, &amp;dev-&gt;mphy.state) &amp;&amp;</div><div class='ctx'> 	    mt7615_firmware_offload(dev))</div><div class='del'>-		err = mt76_connac_mcu_set_hif_suspend(mdev, false);</div><div class='add'>+		err = mt76_connac_mcu_set_hif_suspend(mdev, false, true);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c b/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c<br/>index ec8ec1a2033f..a9178e077fd6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2019 MediaTek Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Roy Luo &lt;royluo@google.com&gt;</div><div class='hunk'>@@ -28,8 +28,6 @@ static void mt7615_pci_init_work(struct work_struct *work)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	mt7615_init_work(dev);</div><div class='del'>-	if (dev-&gt;dbdc_support)</div><div class='del'>-		mt7615_register_ext_phy(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt7615_init_hardware(struct mt7615_dev *dev)</div><div class='hunk'>@@ -68,64 +66,6 @@ static int mt7615_init_hardware(struct mt7615_dev *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7615_led_set_config(struct led_classdev *led_cdev,</div><div class='del'>-		      u8 delay_on, u8 delay_off)</div><div class='del'>-{</div><div class='del'>-	struct mt7615_dev *dev;</div><div class='del'>-	struct mt76_dev *mt76;</div><div class='del'>-	u32 val, addr;</div><div class='del'>-</div><div class='del'>-	mt76 = container_of(led_cdev, struct mt76_dev, led_cdev);</div><div class='del'>-	dev = container_of(mt76, struct mt7615_dev, mt76);</div><div class='del'>-</div><div class='del'>-	if (!mt76_connac_pm_ref(&amp;dev-&gt;mphy, &amp;dev-&gt;pm))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	val = FIELD_PREP(MT_LED_STATUS_DURATION, 0xffff) |</div><div class='del'>-	      FIELD_PREP(MT_LED_STATUS_OFF, delay_off) |</div><div class='del'>-	      FIELD_PREP(MT_LED_STATUS_ON, delay_on);</div><div class='del'>-</div><div class='del'>-	addr = mt7615_reg_map(dev, MT_LED_STATUS_0(mt76-&gt;led_pin));</div><div class='del'>-	mt76_wr(dev, addr, val);</div><div class='del'>-	addr = mt7615_reg_map(dev, MT_LED_STATUS_1(mt76-&gt;led_pin));</div><div class='del'>-	mt76_wr(dev, addr, val);</div><div class='del'>-</div><div class='del'>-	val = MT_LED_CTRL_REPLAY(mt76-&gt;led_pin) |</div><div class='del'>-	      MT_LED_CTRL_KICK(mt76-&gt;led_pin);</div><div class='del'>-	if (mt76-&gt;led_al)</div><div class='del'>-		val |= MT_LED_CTRL_POLARITY(mt76-&gt;led_pin);</div><div class='del'>-	addr = mt7615_reg_map(dev, MT_LED_CTRL);</div><div class='del'>-	mt76_wr(dev, addr, val);</div><div class='del'>-</div><div class='del'>-	mt76_connac_pm_unref(&amp;dev-&gt;pm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mt7615_led_set_blink(struct led_classdev *led_cdev,</div><div class='del'>-		     unsigned long *delay_on,</div><div class='del'>-		     unsigned long *delay_off)</div><div class='del'>-{</div><div class='del'>-	u8 delta_on, delta_off;</div><div class='del'>-</div><div class='del'>-	delta_off = max_t(u8, *delay_off / 10, 1);</div><div class='del'>-	delta_on = max_t(u8, *delay_on / 10, 1);</div><div class='del'>-</div><div class='del'>-	mt7615_led_set_config(led_cdev, delta_on, delta_off);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt7615_led_set_brightness(struct led_classdev *led_cdev,</div><div class='del'>-			  enum led_brightness brightness)</div><div class='del'>-{</div><div class='del'>-	if (!brightness)</div><div class='del'>-		mt7615_led_set_config(led_cdev, 0, 0xff);</div><div class='del'>-	else</div><div class='del'>-		mt7615_led_set_config(led_cdev, 0xff, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int mt7615_register_device(struct mt7615_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -135,8 +75,8 @@ int mt7615_register_device(struct mt7615_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* init led callbacks */</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_MT76_LEDS)) {</div><div class='del'>-		dev-&gt;mt76.led_cdev.brightness_set = mt7615_led_set_brightness;</div><div class='del'>-		dev-&gt;mt76.led_cdev.blink_set = mt7615_led_set_blink;</div><div class='add'>+		dev-&gt;mphy.leds.cdev.brightness_set = mt7615_led_set_brightness;</div><div class='add'>+		dev-&gt;mphy.leds.cdev.blink_set = mt7615_led_set_blink;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = mt7622_wmac_init(dev);</div><div class='hunk'>@@ -147,8 +87,12 @@ int mt7615_register_device(struct mt7615_dev *dev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = mt76_register_device(&amp;dev-&gt;mt76, true, mt7615_rates,</div><div class='del'>-				   ARRAY_SIZE(mt7615_rates));</div><div class='add'>+	ret = mt76_register_device(&amp;dev-&gt;mt76, true, mt76_rates,</div><div class='add'>+				   ARRAY_SIZE(mt76_rates));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7615_thermal_init(dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -156,6 +100,12 @@ int mt7615_register_device(struct mt7615_dev *dev)</div><div class='ctx'> 	mt7615_init_txpower(dev, &amp;dev-&gt;mphy.sband_2g.sband);</div><div class='ctx'> 	mt7615_init_txpower(dev, &amp;dev-&gt;mphy.sband_5g.sband);</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;dbdc_support) {</div><div class='add'>+		ret = mt7615_register_ext_phy(dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return mt7615_init_debugfs(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -172,7 +122,7 @@ void mt7615_unregister_device(struct mt7615_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	mt7615_tx_token_put(dev);</div><div class='ctx'> 	mt7615_dma_cleanup(dev);</div><div class='del'>-	tasklet_disable(&amp;dev-&gt;irq_tasklet);</div><div class='add'>+	tasklet_disable(&amp;dev-&gt;mt76.irq_tasklet);</div><div class='ctx'> </div><div class='ctx'> 	mt76_free_device(&amp;dev-&gt;mt76);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c<br/>index d7cbef752f9f..53cb1eed1e4f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Ryder Lee &lt;ryder.lee@mediatek.com&gt;</div><div class='hunk'>@@ -14,75 +14,6 @@</div><div class='ctx'> #include "../dma.h"</div><div class='ctx'> #include "mac.h"</div><div class='ctx'> </div><div class='del'>-void mt7615_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e)</div><div class='del'>-{</div><div class='del'>-	if (!e-&gt;txwi) {</div><div class='del'>-		dev_kfree_skb_any(e-&gt;skb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* error path */</div><div class='del'>-	if (e-&gt;skb == DMA_DUMMY_DATA) {</div><div class='del'>-		struct mt76_txwi_cache *t;</div><div class='del'>-		struct mt7615_dev *dev;</div><div class='del'>-		struct mt7615_txp_common *txp;</div><div class='del'>-		u16 token;</div><div class='del'>-</div><div class='del'>-		dev = container_of(mdev, struct mt7615_dev, mt76);</div><div class='del'>-		txp = mt7615_txwi_to_txp(mdev, e-&gt;txwi);</div><div class='del'>-</div><div class='del'>-		if (is_mt7615(&amp;dev-&gt;mt76))</div><div class='del'>-			token = le16_to_cpu(txp-&gt;fw.token);</div><div class='del'>-		else</div><div class='del'>-			token = le16_to_cpu(txp-&gt;hw.msdu_id[0]) &amp;</div><div class='del'>-				~MT_MSDU_ID_VALID;</div><div class='del'>-</div><div class='del'>-		t = mt76_token_put(mdev, token);</div><div class='del'>-		e-&gt;skb = t ? t-&gt;skb : NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (e-&gt;skb)</div><div class='del'>-		mt76_tx_complete_skb(mdev, e-&gt;wcid, e-&gt;skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt7615_write_hw_txp(struct mt7615_dev *dev, struct mt76_tx_info *tx_info,</div><div class='del'>-		    void *txp_ptr, u32 id)</div><div class='del'>-{</div><div class='del'>-	struct mt7615_hw_txp *txp = txp_ptr;</div><div class='del'>-	struct mt7615_txp_ptr *ptr = &amp;txp-&gt;ptr[0];</div><div class='del'>-	int i, nbuf = tx_info-&gt;nbuf - 1;</div><div class='del'>-	u32 last_mask;</div><div class='del'>-</div><div class='del'>-	tx_info-&gt;buf[0].len = MT_TXD_SIZE + sizeof(*txp);</div><div class='del'>-	tx_info-&gt;nbuf = 1;</div><div class='del'>-</div><div class='del'>-	txp-&gt;msdu_id[0] = cpu_to_le16(id | MT_MSDU_ID_VALID);</div><div class='del'>-</div><div class='del'>-	if (is_mt7663(&amp;dev-&gt;mt76))</div><div class='del'>-		last_mask = MT_TXD_LEN_LAST;</div><div class='del'>-	else</div><div class='del'>-		last_mask = MT_TXD_LEN_AMSDU_LAST |</div><div class='del'>-			    MT_TXD_LEN_MSDU_LAST;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nbuf; i++) {</div><div class='del'>-		u16 len = tx_info-&gt;buf[i + 1].len &amp; MT_TXD_LEN_MASK;</div><div class='del'>-		u32 addr = tx_info-&gt;buf[i + 1].addr;</div><div class='del'>-</div><div class='del'>-		if (i == nbuf - 1)</div><div class='del'>-			len |= last_mask;</div><div class='del'>-</div><div class='del'>-		if (i &amp; 1) {</div><div class='del'>-			ptr-&gt;buf1 = cpu_to_le32(addr);</div><div class='del'>-			ptr-&gt;len1 = cpu_to_le16(len);</div><div class='del'>-			ptr++;</div><div class='del'>-		} else {</div><div class='del'>-			ptr-&gt;buf0 = cpu_to_le32(addr);</div><div class='del'>-			ptr-&gt;len0 = cpu_to_le16(len);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> mt7615_write_fw_txp(struct mt7615_dev *dev, struct mt76_tx_info *tx_info,</div><div class='ctx'> 		    void *txp_ptr, u32 id)</div><div class='hunk'>@@ -91,7 +22,8 @@ mt7615_write_fw_txp(struct mt7615_dev *dev, struct mt76_tx_info *tx_info,</div><div class='ctx'> 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx_info-&gt;skb);</div><div class='ctx'> 	struct ieee80211_key_conf *key = info-&gt;control.hw_key;</div><div class='ctx'> 	struct ieee80211_vif *vif = info-&gt;control.vif;</div><div class='del'>-	struct mt7615_fw_txp *txp = txp_ptr;</div><div class='add'>+	struct mt76_connac_fw_txp *txp = txp_ptr;</div><div class='add'>+	u8 *rept_wds_wcid = (u8 *)&amp;txp-&gt;rept_wds_wcid;</div><div class='ctx'> 	int nbuf = tx_info-&gt;nbuf - 1;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -116,13 +48,13 @@ mt7615_write_fw_txp(struct mt7615_dev *dev, struct mt76_tx_info *tx_info,</div><div class='ctx'> 		txp-&gt;flags |= cpu_to_le16(MT_CT_INFO_MGMT_FRAME);</div><div class='ctx'> </div><div class='ctx'> 	if (vif) {</div><div class='del'>-		struct mt76_vif *mvif = (struct mt76_vif *)vif-&gt;drv_priv;</div><div class='add'>+		struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='ctx'> </div><div class='ctx'> 		txp-&gt;bss_idx = mvif-&gt;idx;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	txp-&gt;token = cpu_to_le16(id);</div><div class='del'>-	txp-&gt;rept_wds_wcid = 0xff;</div><div class='add'>+	*rept_wds_wcid = 0xff;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mt7615_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='hunk'>@@ -131,24 +63,24 @@ int mt7615_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='ctx'> 			  struct mt76_tx_info *tx_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);</div><div class='del'>-	struct mt7615_sta *msta = container_of(wcid, struct mt7615_sta, wcid);</div><div class='ctx'> 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx_info-&gt;skb);</div><div class='ctx'> 	struct ieee80211_key_conf *key = info-&gt;control.hw_key;</div><div class='ctx'> 	int pid, id;</div><div class='ctx'> 	u8 *txwi = (u8 *)txwi_ptr;</div><div class='ctx'> 	struct mt76_txwi_cache *t;</div><div class='add'>+	struct mt7615_sta *msta;</div><div class='ctx'> 	void *txp;</div><div class='ctx'> </div><div class='add'>+	msta = wcid ? container_of(wcid, struct mt7615_sta, wcid) : NULL;</div><div class='ctx'> 	if (!wcid)</div><div class='ctx'> 		wcid = &amp;dev-&gt;mt76.global_wcid;</div><div class='ctx'> </div><div class='del'>-	pid = mt76_tx_status_skb_add(mdev, wcid, tx_info-&gt;skb);</div><div class='del'>-</div><div class='del'>-	if (info-&gt;flags &amp; IEEE80211_TX_CTL_RATE_CTRL_PROBE) {</div><div class='add'>+	if ((info-&gt;flags &amp; IEEE80211_TX_CTL_RATE_CTRL_PROBE) &amp;&amp; msta) {</div><div class='ctx'> 		struct mt7615_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+		u8 phy_idx = (info-&gt;hw_queue &amp; MT_TX_HW_QUEUE_PHY) &gt;&gt; 2;</div><div class='ctx'> </div><div class='del'>-		if ((info-&gt;hw_queue &amp; MT_TX_HW_QUEUE_EXT_PHY) &amp;&amp; mdev-&gt;phy2)</div><div class='del'>-			phy = mdev-&gt;phy2-&gt;priv;</div><div class='add'>+		if (phy_idx &amp;&amp; mdev-&gt;phys[MT_BAND1])</div><div class='add'>+			phy = mdev-&gt;phys[MT_BAND1]-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;dev-&gt;mt76.lock);</div><div class='ctx'> 		mt7615_mac_set_rates(phy, msta, &amp;info-&gt;control.rates[0],</div><div class='hunk'>@@ -163,17 +95,18 @@ int mt7615_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='ctx'> 	if (id &lt; 0)</div><div class='ctx'> 		return id;</div><div class='ctx'> </div><div class='add'>+	pid = mt76_tx_status_skb_add(mdev, wcid, tx_info-&gt;skb);</div><div class='ctx'> 	mt7615_mac_write_txwi(dev, txwi_ptr, tx_info-&gt;skb, wcid, sta,</div><div class='del'>-			      pid, key, false);</div><div class='add'>+			      pid, key, qid, false);</div><div class='ctx'> </div><div class='ctx'> 	txp = txwi + MT_TXD_SIZE;</div><div class='del'>-	memset(txp, 0, sizeof(struct mt7615_txp_common));</div><div class='add'>+	memset(txp, 0, sizeof(struct mt76_connac_txp_common));</div><div class='ctx'> 	if (is_mt7615(&amp;dev-&gt;mt76))</div><div class='ctx'> 		mt7615_write_fw_txp(dev, tx_info, txp, id);</div><div class='ctx'> 	else</div><div class='del'>-		mt7615_write_hw_txp(dev, tx_info, txp, id);</div><div class='add'>+		mt76_connac_write_hw_txp(mdev, tx_info, txp, id);</div><div class='ctx'> </div><div class='del'>-	tx_info-&gt;skb = DMA_DUMMY_DATA;</div><div class='add'>+	tx_info-&gt;skb = NULL;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -197,7 +130,7 @@ void mt7615_dma_reset(struct mt7615_dev *dev)</div><div class='ctx'> 	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i)</div><div class='ctx'> 		mt76_queue_rx_reset(dev, i);</div><div class='ctx'> </div><div class='del'>-	mt76_tx_status_check(&amp;dev-&gt;mt76, NULL, true);</div><div class='add'>+	mt76_tx_status_check(&amp;dev-&gt;mt76, true);</div><div class='ctx'> </div><div class='ctx'> 	mt7615_dma_start(dev);</div><div class='ctx'> }</div><div class='hunk'>@@ -250,16 +183,18 @@ mt7615_update_vif_beacon(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='ctx'> static void</div><div class='ctx'> mt7615_update_beacons(struct mt7615_dev *dev)</div><div class='ctx'> {</div><div class='add'>+	struct mt76_phy *mphy_ext = dev-&gt;mt76.phys[MT_BAND1];</div><div class='add'>+</div><div class='ctx'> 	ieee80211_iterate_active_interfaces(dev-&gt;mt76.hw,</div><div class='ctx'> 		IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='ctx'> 		mt7615_update_vif_beacon, dev-&gt;mt76.hw);</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;mt76.phy2)</div><div class='add'>+	if (!mphy_ext)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ieee80211_iterate_active_interfaces(dev-&gt;mt76.phy2-&gt;hw,</div><div class='add'>+	ieee80211_iterate_active_interfaces(mphy_ext-&gt;hw,</div><div class='ctx'> 		IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='del'>-		mt7615_update_vif_beacon, dev-&gt;mt76.phy2-&gt;hw);</div><div class='add'>+		mt7615_update_vif_beacon, mphy_ext-&gt;hw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt7615_mac_reset_work(struct work_struct *work)</div><div class='hunk'>@@ -267,9 +202,11 @@ void mt7615_mac_reset_work(struct work_struct *work)</div><div class='ctx'> 	struct mt7615_phy *phy2;</div><div class='ctx'> 	struct mt76_phy *ext_phy;</div><div class='ctx'> 	struct mt7615_dev *dev;</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	dev = container_of(work, struct mt7615_dev, reset_work);</div><div class='del'>-	ext_phy = dev-&gt;mt76.phy2;</div><div class='add'>+	ext_phy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='ctx'> 	phy2 = ext_phy ? ext_phy-&gt;priv : NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (!(READ_ONCE(dev-&gt;reset_state) &amp; MT_MCU_CMD_STOP_PDMA))</div><div class='hunk'>@@ -283,12 +220,12 @@ void mt7615_mac_reset_work(struct work_struct *work)</div><div class='ctx'> 	set_bit(MT76_MCU_RESET, &amp;dev-&gt;mphy.state);</div><div class='ctx'> 	wake_up(&amp;dev-&gt;mt76.mcu.wait);</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;dev-&gt;mphy.mac_work);</div><div class='del'>-	del_timer_sync(&amp;dev-&gt;phy.roc_timer);</div><div class='add'>+	timer_delete_sync(&amp;dev-&gt;phy.roc_timer);</div><div class='ctx'> 	cancel_work_sync(&amp;dev-&gt;phy.roc_work);</div><div class='ctx'> 	if (phy2) {</div><div class='ctx'> 		set_bit(MT76_RESET, &amp;phy2-&gt;mt76-&gt;state);</div><div class='ctx'> 		cancel_delayed_work_sync(&amp;phy2-&gt;mt76-&gt;mac_work);</div><div class='del'>-		del_timer_sync(&amp;phy2-&gt;roc_timer);</div><div class='add'>+		timer_delete_sync(&amp;phy2-&gt;roc_timer);</div><div class='ctx'> 		cancel_work_sync(&amp;phy2-&gt;roc_work);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -298,8 +235,8 @@ void mt7615_mac_reset_work(struct work_struct *work)</div><div class='ctx'> 		mt76_txq_schedule_all(ext_phy);</div><div class='ctx'> </div><div class='ctx'> 	mt76_worker_disable(&amp;dev-&gt;mt76.tx_worker);</div><div class='del'>-	napi_disable(&amp;dev-&gt;mt76.napi[0]);</div><div class='del'>-	napi_disable(&amp;dev-&gt;mt76.napi[1]);</div><div class='add'>+	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i)</div><div class='add'>+		napi_disable(&amp;dev-&gt;mt76.napi[i]);</div><div class='ctx'> 	napi_disable(&amp;dev-&gt;mt76.tx_napi);</div><div class='ctx'> </div><div class='ctx'> 	mt7615_mutex_acquire(dev);</div><div class='hunk'>@@ -324,14 +261,18 @@ void mt7615_mac_reset_work(struct work_struct *work)</div><div class='ctx'> 		clear_bit(MT76_RESET, &amp;phy2-&gt;mt76-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 	mt76_worker_enable(&amp;dev-&gt;mt76.tx_worker);</div><div class='del'>-	napi_enable(&amp;dev-&gt;mt76.tx_napi);</div><div class='del'>-	napi_schedule(&amp;dev-&gt;mt76.tx_napi);</div><div class='ctx'> </div><div class='del'>-	napi_enable(&amp;dev-&gt;mt76.napi[0]);</div><div class='del'>-	napi_schedule(&amp;dev-&gt;mt76.napi[0]);</div><div class='add'>+	napi_enable(&amp;dev-&gt;mt76.tx_napi);</div><div class='add'>+	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i) {</div><div class='add'>+		napi_enable(&amp;dev-&gt;mt76.napi[i]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	napi_enable(&amp;dev-&gt;mt76.napi[1]);</div><div class='del'>-	napi_schedule(&amp;dev-&gt;mt76.napi[1]);</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	napi_schedule(&amp;dev-&gt;mt76.tx_napi);</div><div class='add'>+	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i) {</div><div class='add'>+		napi_schedule(&amp;dev-&gt;mt76.napi[i]);</div><div class='add'>+	}</div><div class='add'>+	local_bh_enable();</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_wake_queues(mt76_hw(dev));</div><div class='ctx'> 	if (ext_phy)</div><div class='hunk'>@@ -344,11 +285,11 @@ void mt7615_mac_reset_work(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	mt7615_mutex_release(dev);</div><div class='ctx'> </div><div class='add'>+	timeout = mt7615_get_macwork_timeout(dev);</div><div class='ctx'> 	ieee80211_queue_delayed_work(mt76_hw(dev), &amp;dev-&gt;mphy.mac_work,</div><div class='del'>-				     MT7615_WATCHDOG_TIME);</div><div class='add'>+				     timeout);</div><div class='ctx'> 	if (phy2)</div><div class='ctx'> 		ieee80211_queue_delayed_work(ext_phy-&gt;hw,</div><div class='del'>-					     &amp;phy2-&gt;mt76-&gt;mac_work,</div><div class='del'>-					     MT7615_WATCHDOG_TIME);</div><div class='add'>+					     &amp;phy2-&gt;mt76-&gt;mac_work, timeout);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/regs.h b/drivers/net/wireless/mediatek/mt76/mt7615/regs.h<br/>index 63c081bb04d0..eb3c24d51987 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/regs.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/regs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/regs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/regs.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /* Copyright (C) 2019 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MT7615_REGS_H</div><div class='hunk'>@@ -212,6 +212,15 @@ enum mt7615_reg_base {</div><div class='ctx'> </div><div class='ctx'> #define MT7663_WF_PHY_R0_PHYCTRL_STS5(_phy)	MT_WF_PHY(0x0224 + ((_phy) &lt;&lt; 12))</div><div class='ctx'> </div><div class='add'>+#define MT_WF_PHY_GID_TAB_VLD(_phy, i)		MT_WF_PHY(0x0254 + (i) * 4 + \</div><div class='add'>+							  ((_phy) &lt;&lt; 9))</div><div class='add'>+#define MT7663_WF_PHY_GID_TAB_VLD(_phy, i)	MT_WF_PHY(0x0254 + (i) * 4 + \</div><div class='add'>+							  ((_phy) &lt;&lt; 12))</div><div class='add'>+#define MT_WF_PHY_GID_TAB_POS(_phy, i)		MT_WF_PHY(0x025c + (i) * 4 + \</div><div class='add'>+							  ((_phy) &lt;&lt; 9))</div><div class='add'>+#define MT7663_WF_PHY_GID_TAB_POS(_phy, i)	MT_WF_PHY(0x025c + (i) * 4 + \</div><div class='add'>+							  ((_phy) &lt;&lt; 12))</div><div class='add'>+</div><div class='ctx'> #define MT_WF_PHY_MIN_PRI_PWR(_phy)	MT_WF_PHY((_phy) ? 0x084 : 0x229c)</div><div class='ctx'> #define MT_WF_PHY_PD_OFDM_MASK(_phy)	((_phy) ? GENMASK(24, 16) : \</div><div class='ctx'> 					 GENMASK(28, 20))</div><div class='hunk'>@@ -446,6 +455,8 @@ enum mt7615_reg_base {</div><div class='ctx'> #define MT_WTBL_RIUCR3_RATE6		GENMASK(19, 8)</div><div class='ctx'> #define MT_WTBL_RIUCR3_RATE7		GENMASK(31, 20)</div><div class='ctx'> </div><div class='add'>+#define MT_WTBL_W3_RTS			BIT(22)</div><div class='add'>+</div><div class='ctx'> #define MT_WTBL_W5_CHANGE_BW_RATE	GENMASK(7, 5)</div><div class='ctx'> #define MT_WTBL_W5_SHORT_GI_20		BIT(8)</div><div class='ctx'> #define MT_WTBL_W5_SHORT_GI_40		BIT(9)</div><div class='hunk'>@@ -463,7 +474,9 @@ enum mt7615_reg_base {</div><div class='ctx'> #define MT_LPON_TCR0(_n)		MT_LPON(0x010 + ((_n) * 4))</div><div class='ctx'> #define MT_LPON_TCR2(_n)		MT_LPON(0x0f8 + ((_n) - 2) * 4)</div><div class='ctx'> #define MT_LPON_TCR_MODE		GENMASK(1, 0)</div><div class='add'>+#define MT_LPON_TCR_READ		GENMASK(1, 0)</div><div class='ctx'> #define MT_LPON_TCR_WRITE		BIT(0)</div><div class='add'>+#define MT_LPON_TCR_ADJUST		BIT(1)</div><div class='ctx'> </div><div class='ctx'> #define MT_LPON_UTTR0			MT_LPON(0x018)</div><div class='ctx'> #define MT_LPON_UTTR1			MT_LPON(0x01c)</div><div class='hunk'>@@ -540,6 +553,7 @@ enum mt7615_reg_base {</div><div class='ctx'> #define MT_LED_CTRL_POLARITY(_n)	BIT(1 + (8 * (_n)))</div><div class='ctx'> #define MT_LED_CTRL_TX_BLINK_MODE(_n)	BIT(2 + (8 * (_n)))</div><div class='ctx'> #define MT_LED_CTRL_TX_MANUAL_BLINK(_n)	BIT(3 + (8 * (_n)))</div><div class='add'>+#define MT_LED_CTRL_BAND(_n)		BIT(4 + (8 * (_n)))</div><div class='ctx'> #define MT_LED_CTRL_TX_OVER_BLINK(_n)	BIT(5 + (8 * (_n)))</div><div class='ctx'> #define MT_LED_CTRL_KICK(_n)		BIT(7 + (8 * (_n)))</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/sdio.c b/drivers/net/wireless/mediatek/mt76/mt7615/sdio.c<br/>index 305bb8597531..46188951ad19 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/sdio.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/sdio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/sdio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/sdio.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='hunk'>@@ -14,8 +14,8 @@</div><div class='ctx'> #include &lt;linux/mmc/sdio_ids.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/sdio_func.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "../sdio.h"</div><div class='ctx'> #include "mt7615.h"</div><div class='del'>-#include "sdio.h"</div><div class='ctx'> #include "mac.h"</div><div class='ctx'> #include "mcu.h"</div><div class='ctx'> </div><div class='hunk'>@@ -24,200 +24,19 @@ static const struct sdio_device_id mt7663s_table[] = {</div><div class='ctx'> 	{ }	/* Terminating entry */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u32 mt7663s_read_whisr(struct mt76_dev *dev)</div><div class='add'>+static void mt7663s_txrx_worker(struct mt76_worker *w)</div><div class='ctx'> {</div><div class='del'>-	return sdio_readl(dev-&gt;sdio.func, MCR_WHISR, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u32 mt7663s_read_pcr(struct mt7615_dev *dev)</div><div class='del'>-{</div><div class='del'>-	struct mt76_sdio *sdio = &amp;dev-&gt;mt76.sdio;</div><div class='del'>-</div><div class='del'>-	return sdio_readl(sdio-&gt;func, MCR_WHLPCR, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 mt7663s_read_mailbox(struct mt76_dev *dev, u32 offset)</div><div class='del'>-{</div><div class='del'>-	struct sdio_func *func = dev-&gt;sdio.func;</div><div class='del'>-	u32 val = ~0, status;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	sdio_claim_host(func);</div><div class='del'>-</div><div class='del'>-	sdio_writel(func, offset, MCR_H2DSM0R, &amp;err);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		dev_err(dev-&gt;dev, "failed setting address [err=%d]\n", err);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	struct mt76_sdio *sdio = container_of(w, struct mt76_sdio,</div><div class='add'>+					      txrx_worker);</div><div class='add'>+	struct mt76_dev *mdev = container_of(sdio, struct mt76_dev, sdio);</div><div class='add'>+	struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);</div><div class='ctx'> </div><div class='del'>-	sdio_writel(func, H2D_SW_INT_READ, MCR_WSICR, &amp;err);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		dev_err(dev-&gt;dev, "failed setting read mode [err=%d]\n", err);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = readx_poll_timeout(mt7663s_read_whisr, dev, status,</div><div class='del'>-				 status &amp; H2D_SW_INT_READ, 0, 1000000);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		dev_err(dev-&gt;dev, "query whisr timeout\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sdio_writel(func, H2D_SW_INT_READ, MCR_WHISR, &amp;err);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		dev_err(dev-&gt;dev, "failed setting read mode [err=%d]\n", err);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	val = sdio_readl(func, MCR_H2DSM0R, &amp;err);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		dev_err(dev-&gt;dev, "failed reading h2dsm0r [err=%d]\n", err);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (val != offset) {</div><div class='del'>-		dev_err(dev-&gt;dev, "register mismatch\n");</div><div class='del'>-		val = ~0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	val = sdio_readl(func, MCR_D2HRM1R, &amp;err);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		dev_err(dev-&gt;dev, "failed reading d2hrm1r [err=%d]\n", err);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	sdio_release_host(func);</div><div class='del'>-</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mt7663s_write_mailbox(struct mt76_dev *dev, u32 offset, u32 val)</div><div class='del'>-{</div><div class='del'>-	struct sdio_func *func = dev-&gt;sdio.func;</div><div class='del'>-	u32 status;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	sdio_claim_host(func);</div><div class='del'>-</div><div class='del'>-	sdio_writel(func, offset, MCR_H2DSM0R, &amp;err);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		dev_err(dev-&gt;dev, "failed setting address [err=%d]\n", err);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sdio_writel(func, val, MCR_H2DSM1R, &amp;err);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		dev_err(dev-&gt;dev,</div><div class='del'>-			"failed setting write value [err=%d]\n", err);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sdio_writel(func, H2D_SW_INT_WRITE, MCR_WSICR, &amp;err);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		dev_err(dev-&gt;dev, "failed setting write mode [err=%d]\n", err);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = readx_poll_timeout(mt7663s_read_whisr, dev, status,</div><div class='del'>-				 status &amp; H2D_SW_INT_WRITE, 0, 1000000);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		dev_err(dev-&gt;dev, "query whisr timeout\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sdio_writel(func, H2D_SW_INT_WRITE, MCR_WHISR, &amp;err);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		dev_err(dev-&gt;dev, "failed setting write mode [err=%d]\n", err);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	val = sdio_readl(func, MCR_H2DSM0R, &amp;err);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		dev_err(dev-&gt;dev, "failed reading h2dsm0r [err=%d]\n", err);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (val != offset)</div><div class='del'>-		dev_err(dev-&gt;dev, "register mismatch\n");</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	sdio_release_host(func);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 mt7663s_rr(struct mt76_dev *dev, u32 offset)</div><div class='del'>-{</div><div class='del'>-	if (test_bit(MT76_STATE_MCU_RUNNING, &amp;dev-&gt;phy.state))</div><div class='del'>-		return dev-&gt;mcu_ops-&gt;mcu_rr(dev, offset);</div><div class='del'>-	else</div><div class='del'>-		return mt7663s_read_mailbox(dev, offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mt7663s_wr(struct mt76_dev *dev, u32 offset, u32 val)</div><div class='del'>-{</div><div class='del'>-	if (test_bit(MT76_STATE_MCU_RUNNING, &amp;dev-&gt;phy.state))</div><div class='del'>-		dev-&gt;mcu_ops-&gt;mcu_wr(dev, offset, val);</div><div class='del'>-	else</div><div class='del'>-		mt7663s_write_mailbox(dev, offset, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 mt7663s_rmw(struct mt76_dev *dev, u32 offset, u32 mask, u32 val)</div><div class='del'>-{</div><div class='del'>-	val |= mt7663s_rr(dev, offset) &amp; ~mask;</div><div class='del'>-	mt7663s_wr(dev, offset, val);</div><div class='del'>-</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mt7663s_write_copy(struct mt76_dev *dev, u32 offset,</div><div class='del'>-			       const void *data, int len)</div><div class='del'>-{</div><div class='del'>-	const u32 *val = data;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len / sizeof(u32); i++) {</div><div class='del'>-		mt7663s_wr(dev, offset, val[i]);</div><div class='del'>-		offset += sizeof(u32);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mt7663s_read_copy(struct mt76_dev *dev, u32 offset,</div><div class='del'>-			      void *data, int len)</div><div class='del'>-{</div><div class='del'>-	u32 *val = data;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len / sizeof(u32); i++) {</div><div class='del'>-		val[i] = mt7663s_rr(dev, offset);</div><div class='del'>-		offset += sizeof(u32);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mt7663s_wr_rp(struct mt76_dev *dev, u32 base,</div><div class='del'>-			 const struct mt76_reg_pair *data,</div><div class='del'>-			 int len)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		mt7663s_wr(dev, data-&gt;reg, data-&gt;value);</div><div class='del'>-		data++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mt7663s_rd_rp(struct mt76_dev *dev, u32 base,</div><div class='del'>-			 struct mt76_reg_pair *data,</div><div class='del'>-			 int len)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		data-&gt;value = mt7663s_rr(dev, data-&gt;reg);</div><div class='del'>-		data++;</div><div class='add'>+	if (!mt76_connac_pm_ref(&amp;dev-&gt;mphy, &amp;dev-&gt;pm)) {</div><div class='add'>+		queue_work(mdev-&gt;wq, &amp;dev-&gt;pm.wake_work);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	mt76s_txrx_worker(sdio);</div><div class='add'>+	mt76_connac_pm_unref(&amp;dev-&gt;mphy, &amp;dev-&gt;pm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mt7663s_init_work(struct work_struct *work)</div><div class='hunk'>@@ -231,64 +50,27 @@ static void mt7663s_init_work(struct work_struct *work)</div><div class='ctx'> 	mt7615_init_work(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7663s_hw_init(struct mt7615_dev *dev, struct sdio_func *func)</div><div class='add'>+static int mt7663s_parse_intr(struct mt76_dev *dev, struct mt76s_intr *intr)</div><div class='ctx'> {</div><div class='del'>-	u32 status, ctrl;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	sdio_claim_host(func);</div><div class='del'>-</div><div class='del'>-	ret = sdio_enable_func(func);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto release;</div><div class='del'>-</div><div class='del'>-	/* Get ownership from the device */</div><div class='del'>-	sdio_writel(func, WHLPCR_INT_EN_CLR | WHLPCR_FW_OWN_REQ_CLR,</div><div class='del'>-		    MCR_WHLPCR, &amp;ret);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto disable_func;</div><div class='add'>+	struct mt76_sdio *sdio = &amp;dev-&gt;sdio;</div><div class='add'>+	struct mt7663s_intr *irq_data = sdio-&gt;intr_data;</div><div class='add'>+	int i, err;</div><div class='ctx'> </div><div class='del'>-	ret = readx_poll_timeout(mt7663s_read_pcr, dev, status,</div><div class='del'>-				 status &amp; WHLPCR_IS_DRIVER_OWN, 2000, 1000000);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "Cannot get ownership from device");</div><div class='del'>-		goto disable_func;</div><div class='del'>-	}</div><div class='add'>+	sdio_claim_host(sdio-&gt;func);</div><div class='add'>+	err = sdio_readsb(sdio-&gt;func, irq_data, MCR_WHISR, sizeof(*irq_data));</div><div class='add'>+	sdio_release_host(sdio-&gt;func);</div><div class='ctx'> </div><div class='del'>-	ret = sdio_set_block_size(func, 512);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto disable_func;</div><div class='del'>-</div><div class='del'>-	/* Enable interrupt */</div><div class='del'>-	sdio_writel(func, WHLPCR_INT_EN_SET, MCR_WHLPCR, &amp;ret);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto disable_func;</div><div class='del'>-</div><div class='del'>-	ctrl = WHIER_RX0_DONE_INT_EN | WHIER_TX_DONE_INT_EN;</div><div class='del'>-	sdio_writel(func, ctrl, MCR_WHIER, &amp;ret);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto disable_func;</div><div class='del'>-</div><div class='del'>-	/* set WHISR as read clear and Rx aggregation number as 16 */</div><div class='del'>-	ctrl = FIELD_PREP(MAX_HIF_RX_LEN_NUM, 16);</div><div class='del'>-	sdio_writel(func, ctrl, MCR_WHCR, &amp;ret);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto disable_func;</div><div class='del'>-</div><div class='del'>-	ret = sdio_claim_irq(func, mt7663s_sdio_irq);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto disable_func;</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	sdio_release_host(func);</div><div class='add'>+	intr-&gt;isr = irq_data-&gt;isr;</div><div class='add'>+	intr-&gt;rec_mb = irq_data-&gt;rec_mb;</div><div class='add'>+	intr-&gt;tx.wtqcr = irq_data-&gt;tx.wtqcr;</div><div class='add'>+	intr-&gt;rx.num = irq_data-&gt;rx.num;</div><div class='add'>+	for (i = 0; i &lt; 2 ; i++)</div><div class='add'>+		intr-&gt;rx.len[i] = irq_data-&gt;rx.len[i];</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-disable_func:</div><div class='del'>-	sdio_disable_func(func);</div><div class='del'>-release:</div><div class='del'>-	sdio_release_host(func);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt7663s_probe(struct sdio_func *func,</div><div class='hunk'>@@ -301,25 +83,26 @@ static int mt7663s_probe(struct sdio_func *func,</div><div class='ctx'> 		.tx_complete_skb = mt7663_usb_sdio_tx_complete_skb,</div><div class='ctx'> 		.tx_status_data = mt7663_usb_sdio_tx_status_data,</div><div class='ctx'> 		.rx_skb = mt7615_queue_rx_skb,</div><div class='del'>-		.sta_ps = mt7615_sta_ps,</div><div class='add'>+		.rx_check = mt7615_rx_check,</div><div class='ctx'> 		.sta_add = mt7615_mac_sta_add,</div><div class='ctx'> 		.sta_remove = mt7615_mac_sta_remove,</div><div class='ctx'> 		.update_survey = mt7615_update_channel,</div><div class='add'>+		.set_channel = mt7615_set_channel,</div><div class='ctx'> 	};</div><div class='ctx'> 	static const struct mt76_bus_ops mt7663s_ops = {</div><div class='del'>-		.rr = mt7663s_rr,</div><div class='del'>-		.rmw = mt7663s_rmw,</div><div class='del'>-		.wr = mt7663s_wr,</div><div class='del'>-		.write_copy = mt7663s_write_copy,</div><div class='del'>-		.read_copy = mt7663s_read_copy,</div><div class='del'>-		.wr_rp = mt7663s_wr_rp,</div><div class='del'>-		.rd_rp = mt7663s_rd_rp,</div><div class='add'>+		.rr = mt76s_rr,</div><div class='add'>+		.rmw = mt76s_rmw,</div><div class='add'>+		.wr = mt76s_wr,</div><div class='add'>+		.write_copy = mt76s_write_copy,</div><div class='add'>+		.read_copy = mt76s_read_copy,</div><div class='add'>+		.wr_rp = mt76s_wr_rp,</div><div class='add'>+		.rd_rp = mt76s_rd_rp,</div><div class='ctx'> 		.type = MT76_BUS_SDIO,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct ieee80211_ops *ops;</div><div class='ctx'> 	struct mt7615_dev *dev;</div><div class='ctx'> 	struct mt76_dev *mdev;</div><div class='del'>-	int i, ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ops = devm_kmemdup(&amp;func-&gt;dev, &amp;mt7615_ops, sizeof(mt7615_ops),</div><div class='ctx'> 			   GFP_KERNEL);</div><div class='hunk'>@@ -341,7 +124,7 @@ static int mt7663s_probe(struct sdio_func *func,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	ret = mt7663s_hw_init(dev, func);</div><div class='add'>+	ret = mt76s_hw_init(mdev, func, MT76_CONNAC_SDIO);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -349,25 +132,20 @@ static int mt7663s_probe(struct sdio_func *func,</div><div class='ctx'> 		    (mt76_rr(dev, MT_HW_REV) &amp; 0xff);</div><div class='ctx'> 	dev_dbg(mdev-&gt;dev, "ASIC revision: %04x\n", mdev-&gt;rev);</div><div class='ctx'> </div><div class='add'>+	mdev-&gt;sdio.parse_irq = mt7663s_parse_intr;</div><div class='ctx'> 	mdev-&gt;sdio.intr_data = devm_kmalloc(mdev-&gt;dev,</div><div class='del'>-					    sizeof(struct mt76s_intr),</div><div class='add'>+					    sizeof(struct mt7663s_intr),</div><div class='ctx'> 					    GFP_KERNEL);</div><div class='ctx'> 	if (!mdev-&gt;sdio.intr_data) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(mdev-&gt;sdio.xmit_buf); i++) {</div><div class='del'>-		mdev-&gt;sdio.xmit_buf[i] = devm_kmalloc(mdev-&gt;dev,</div><div class='del'>-						      MT76S_XMIT_BUF_SZ,</div><div class='del'>-						      GFP_KERNEL);</div><div class='del'>-		if (!mdev-&gt;sdio.xmit_buf[i]) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	ret = mt76s_alloc_rx_queue(mdev, MT_RXQ_MAIN);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='ctx'> </div><div class='del'>-	ret = mt76s_alloc_queues(&amp;dev-&gt;mt76);</div><div class='add'>+	ret = mt76s_alloc_tx(mdev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -403,7 +181,6 @@ static void mt7663s_remove(struct sdio_func *func)</div><div class='ctx'> 	mt76_free_device(&amp;dev-&gt;mt76);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> static int mt7663s_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdio_func *func = dev_to_sdio_func(dev);</div><div class='hunk'>@@ -414,7 +191,7 @@ static int mt7663s_suspend(struct device *dev)</div><div class='ctx'> 	    mt7615_firmware_offload(mdev)) {</div><div class='ctx'> 		int err;</div><div class='ctx'> </div><div class='del'>-		err = mt76_connac_mcu_set_hif_suspend(&amp;mdev-&gt;mt76, true);</div><div class='add'>+		err = mt76_connac_mcu_set_hif_suspend(&amp;mdev-&gt;mt76, true, true);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -428,11 +205,11 @@ static int mt7663s_suspend(struct device *dev)</div><div class='ctx'> 	mt76_worker_disable(&amp;mdev-&gt;mt76.sdio.txrx_worker);</div><div class='ctx'> 	mt76_worker_disable(&amp;mdev-&gt;mt76.sdio.status_worker);</div><div class='ctx'> 	mt76_worker_disable(&amp;mdev-&gt;mt76.sdio.net_worker);</div><div class='add'>+	mt76_worker_disable(&amp;mdev-&gt;mt76.sdio.stat_worker);</div><div class='ctx'> </div><div class='del'>-	cancel_work_sync(&amp;mdev-&gt;mt76.sdio.stat_work);</div><div class='ctx'> 	clear_bit(MT76_READING_STATS, &amp;mdev-&gt;mphy.state);</div><div class='ctx'> </div><div class='del'>-	mt76_tx_status_check(&amp;mdev-&gt;mt76, NULL, true);</div><div class='add'>+	mt76_tx_status_check(&amp;mdev-&gt;mt76, true);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -453,36 +230,29 @@ static int mt7663s_resume(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(MT76_STATE_SUSPEND, &amp;mdev-&gt;mphy.state) &amp;&amp;</div><div class='ctx'> 	    mt7615_firmware_offload(mdev))</div><div class='del'>-		err = mt76_connac_mcu_set_hif_suspend(&amp;mdev-&gt;mt76, false);</div><div class='add'>+		err = mt76_connac_mcu_set_hif_suspend(&amp;mdev-&gt;mt76, false, true);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct dev_pm_ops mt7663s_pm_ops = {</div><div class='del'>-	.suspend = mt7663s_suspend,</div><div class='del'>-	.resume = mt7663s_resume,</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> MODULE_DEVICE_TABLE(sdio, mt7663s_table);</div><div class='ctx'> MODULE_FIRMWARE(MT7663_OFFLOAD_FIRMWARE_N9);</div><div class='ctx'> MODULE_FIRMWARE(MT7663_OFFLOAD_ROM_PATCH);</div><div class='ctx'> MODULE_FIRMWARE(MT7663_FIRMWARE_N9);</div><div class='ctx'> MODULE_FIRMWARE(MT7663_ROM_PATCH);</div><div class='ctx'> </div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(mt7663s_pm_ops, mt7663s_suspend, mt7663s_resume);</div><div class='add'>+</div><div class='ctx'> static struct sdio_driver mt7663s_driver = {</div><div class='ctx'> 	.name		= KBUILD_MODNAME,</div><div class='ctx'> 	.probe		= mt7663s_probe,</div><div class='ctx'> 	.remove		= mt7663s_remove,</div><div class='ctx'> 	.id_table	= mt7663s_table,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.drv = {</div><div class='del'>-		.pm = &amp;mt7663s_pm_ops,</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	.drv.pm		= pm_sleep_ptr(&amp;mt7663s_pm_ops),</div><div class='ctx'> };</div><div class='ctx'> module_sdio_driver(mt7663s_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Sean Wang &lt;sean.wang@mediatek.com&gt;");</div><div class='ctx'> MODULE_AUTHOR("Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("MediaTek MT7663S (SDIO) wireless driver");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c<br/>index 17fe4187d1de..a7b8acb2da83 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c</a></div><div class='hunk'>@@ -10,11 +10,11 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/iopoll.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "../sdio.h"</div><div class='ctx'> #include "mt7615.h"</div><div class='ctx'> #include "mac.h"</div><div class='ctx'> #include "mcu.h"</div><div class='ctx'> #include "regs.h"</div><div class='del'>-#include "sdio.h"</div><div class='ctx'> </div><div class='ctx'> static int mt7663s_mcu_init_sched(struct mt7615_dev *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -27,6 +27,7 @@ static int mt7663s_mcu_init_sched(struct mt7615_dev *dev)</div><div class='ctx'> 						   MT_HIF1_MIN_QUOTA);</div><div class='ctx'> 	sdio-&gt;sched.ple_data_quota = mt76_get_field(dev, MT_PLE_PG_HIF0_GROUP,</div><div class='ctx'> 						    MT_HIF0_MIN_QUOTA);</div><div class='add'>+	sdio-&gt;sched.pse_page_size = MT_PSE_PAGE_SZ;</div><div class='ctx'> 	txdwcnt = mt76_get_field(dev, MT_PP_TXDWCNT,</div><div class='ctx'> 				 MT_PP_TXDWCNT_TX1_ADD_DW_CNT);</div><div class='ctx'> 	sdio-&gt;sched.deficit = txdwcnt &lt;&lt; 2;</div><div class='hunk'>@@ -51,60 +52,80 @@ mt7663s_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7663s_mcu_drv_pmctrl(struct mt7615_dev *dev)</div><div class='add'>+static int __mt7663s_mcu_drv_pmctrl(struct mt7615_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdio_func *func = dev-&gt;mt76.sdio.func;</div><div class='ctx'> 	struct mt76_phy *mphy = &amp;dev-&gt;mt76.phy;</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='ctx'> 	u32 status;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!test_and_clear_bit(MT76_STATE_PM, &amp;mphy-&gt;state))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	sdio_claim_host(func);</div><div class='ctx'> </div><div class='ctx'> 	sdio_writel(func, WHLPCR_FW_OWN_REQ_CLR, MCR_WHLPCR, NULL);</div><div class='ctx'> </div><div class='del'>-	ret = readx_poll_timeout(mt7663s_read_pcr, dev, status,</div><div class='add'>+	ret = readx_poll_timeout(mt76s_read_pcr, &amp;dev-&gt;mt76, status,</div><div class='ctx'> 				 status &amp; WHLPCR_IS_DRIVER_OWN, 2000, 1000000);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(dev-&gt;mt76.dev, "Cannot get ownership from device");</div><div class='del'>-		set_bit(MT76_STATE_PM, &amp;mphy-&gt;state);</div><div class='del'>-		sdio_release_host(func);</div><div class='add'>+	} else {</div><div class='add'>+		clear_bit(MT76_STATE_PM, &amp;mphy-&gt;state);</div><div class='ctx'> </div><div class='del'>-		return ret;</div><div class='add'>+		pm-&gt;stats.last_wake_event = jiffies;</div><div class='add'>+		pm-&gt;stats.doze_time += pm-&gt;stats.last_wake_event -</div><div class='add'>+				       pm-&gt;stats.last_doze_event;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	sdio_release_host(func);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	dev-&gt;pm.last_activity = jiffies;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+static int mt7663s_mcu_drv_pmctrl(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_phy *mphy = &amp;dev-&gt;mt76.phy;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;pm.mutex);</div><div class='add'>+</div><div class='add'>+	if (test_bit(MT76_STATE_PM, &amp;mphy-&gt;state))</div><div class='add'>+		ret = __mt7663s_mcu_drv_pmctrl(dev);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;pm.mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt7663s_mcu_fw_pmctrl(struct mt7615_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdio_func *func = dev-&gt;mt76.sdio.func;</div><div class='ctx'> 	struct mt76_phy *mphy = &amp;dev-&gt;mt76.phy;</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> 	u32 status;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='del'>-	if (test_and_set_bit(MT76_STATE_PM, &amp;mphy-&gt;state))</div><div class='del'>-		return 0;</div><div class='add'>+	mutex_lock(&amp;pm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (mt76_connac_skip_fw_pmctrl(mphy, pm))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	sdio_claim_host(func);</div><div class='ctx'> </div><div class='ctx'> 	sdio_writel(func, WHLPCR_FW_OWN_REQ_SET, MCR_WHLPCR, NULL);</div><div class='ctx'> </div><div class='del'>-	ret = readx_poll_timeout(mt7663s_read_pcr, dev, status,</div><div class='add'>+	ret = readx_poll_timeout(mt76s_read_pcr, &amp;dev-&gt;mt76, status,</div><div class='ctx'> 				 !(status &amp; WHLPCR_IS_DRIVER_OWN), 2000, 1000000);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(dev-&gt;mt76.dev, "Cannot set ownership to device");</div><div class='ctx'> 		clear_bit(MT76_STATE_PM, &amp;mphy-&gt;state);</div><div class='add'>+	} else {</div><div class='add'>+		pm-&gt;stats.last_doze_event = jiffies;</div><div class='add'>+		pm-&gt;stats.awake_time += pm-&gt;stats.last_doze_event -</div><div class='add'>+					pm-&gt;stats.last_wake_event;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sdio_release_host(func);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;pm-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -116,18 +137,17 @@ int mt7663s_mcu_init(struct mt7615_dev *dev)</div><div class='ctx'> 		.tailroom = MT_USB_TAIL_SIZE,</div><div class='ctx'> 		.mcu_skb_send_msg = mt7663s_mcu_send_message,</div><div class='ctx'> 		.mcu_parse_response = mt7615_mcu_parse_response,</div><div class='del'>-		.mcu_restart = mt7615_mcu_restart,</div><div class='del'>-		.mcu_rr = mt7615_mcu_reg_rr,</div><div class='del'>-		.mcu_wr = mt7615_mcu_reg_wr,</div><div class='add'>+		.mcu_rr = mt76_connac_mcu_reg_rr,</div><div class='add'>+		.mcu_wr = mt76_connac_mcu_reg_wr,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct mt7615_mcu_ops *mcu_ops;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = mt7663s_mcu_drv_pmctrl(dev);</div><div class='add'>+	ret = __mt7663s_mcu_drv_pmctrl(dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mt76.mcu_ops = &amp;mt7663s_mcu_ops,</div><div class='add'>+	dev-&gt;mt76.mcu_ops = &amp;mt7663s_mcu_ops;</div><div class='ctx'> </div><div class='ctx'> 	ret = mt76_get_field(dev, MT_CONN_ON_MISC, MT_TOP_MISC2_FW_N9_RDY);</div><div class='ctx'> 	if (ret) {</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/soc.c b/drivers/net/wireless/mediatek/mt76/mt7615/soc.c<br/>index be9a69fe1b38..4bd189dd67e3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/soc.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/soc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/soc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/soc.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2019 MediaTek Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Ryder Lee &lt;ryder.lee@mediatek.com&gt;</div><div class='hunk'>@@ -31,7 +31,6 @@ int mt7622_wmac_init(struct mt7615_dev *dev)</div><div class='ctx'> </div><div class='ctx'> static int mt7622_wmac_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	void __iomem *mem_base;</div><div class='ctx'> 	int irq;</div><div class='ctx'> </div><div class='hunk'>@@ -39,20 +38,18 @@ static int mt7622_wmac_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (irq &lt; 0)</div><div class='ctx'> 		return irq;</div><div class='ctx'> </div><div class='del'>-	mem_base = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+	mem_base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);</div><div class='ctx'> 	if (IS_ERR(mem_base))</div><div class='ctx'> 		return PTR_ERR(mem_base);</div><div class='ctx'> </div><div class='ctx'> 	return mt7615_mmio_probe(&amp;pdev-&gt;dev, mem_base, irq, mt7615e_reg_map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7622_wmac_remove(struct platform_device *pdev)</div><div class='add'>+static void mt7622_wmac_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_dev *dev = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	mt7615_unregister_device(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id mt7622_wmac_of_match[] = {</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/testmode.c b/drivers/net/wireless/mediatek/mt76/mt7615/testmode.c<br/>index 59d99264f5e5..6eb97b7eba2d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/testmode.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/testmode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/testmode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/testmode.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 Felix Fietkau &lt;nbd@nbd.name&gt; */</div><div class='ctx'> </div><div class='ctx'> #include "mt7615.h"</div><div class='hunk'>@@ -91,7 +91,7 @@ mt7615_tm_set_tx_power(struct mt7615_phy *phy)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='del'>-				     MCU_EXT_CMD_SET_TX_POWER_CTRL, false);</div><div class='add'>+				     MCU_EXT_CMD(SET_TX_POWER_CTRL), false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -141,7 +141,7 @@ mt7615_tm_init(struct mt7615_phy *phy)</div><div class='ctx'> 	mt7615_mcu_set_sku_en(phy, phy-&gt;mt76-&gt;test.state == MT76_TM_STATE_OFF);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='del'>-	mt7615_set_channel(phy);</div><div class='add'>+	mt76_update_channel(phy-&gt;mt76);</div><div class='ctx'> 	mt7615_ops.configure_filter(phy-&gt;mt76-&gt;hw, 0, &amp;total_flags, 0);</div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -185,36 +185,35 @@ mt7615_tm_set_tx_antenna(struct mt7615_phy *phy, bool en)</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='ctx'> 		mt76_rmw_field(dev, MT_WF_PHY_RFINTF3_0(i),</div><div class='ctx'> 			       MT_WF_PHY_RFINTF3_0_ANT,</div><div class='del'>-			       (td-&gt;tx_antenna_mask &amp; BIT(i)) ? 0 : 0xa);</div><div class='del'>-</div><div class='add'>+			       (mask &amp; BIT(i)) ? 0 : 0xa);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* 2.4 GHz band */</div><div class='ctx'> 	mt76_rmw_field(dev, MT_ANT_SWITCH_CON(3), MT_ANT_SWITCH_CON_MODE(0),</div><div class='del'>-		       (td-&gt;tx_antenna_mask &amp; BIT(0)) ? 0x8 : 0x1b);</div><div class='add'>+		       (mask &amp; BIT(0)) ? 0x8 : 0x1b);</div><div class='ctx'> 	mt76_rmw_field(dev, MT_ANT_SWITCH_CON(4), MT_ANT_SWITCH_CON_MODE(2),</div><div class='del'>-		       (td-&gt;tx_antenna_mask &amp; BIT(1)) ? 0xe : 0x1b);</div><div class='add'>+		       (mask &amp; BIT(1)) ? 0xe : 0x1b);</div><div class='ctx'> 	mt76_rmw_field(dev, MT_ANT_SWITCH_CON(6), MT_ANT_SWITCH_CON_MODE1(0),</div><div class='del'>-		       (td-&gt;tx_antenna_mask &amp; BIT(2)) ? 0x0 : 0xf);</div><div class='add'>+		       (mask &amp; BIT(2)) ? 0x0 : 0xf);</div><div class='ctx'> 	mt76_rmw_field(dev, MT_ANT_SWITCH_CON(7), MT_ANT_SWITCH_CON_MODE1(2),</div><div class='del'>-		       (td-&gt;tx_antenna_mask &amp; BIT(3)) ? 0x6 : 0xf);</div><div class='add'>+		       (mask &amp; BIT(3)) ? 0x6 : 0xf);</div><div class='ctx'> </div><div class='ctx'> 	/* 5 GHz band */</div><div class='ctx'> 	mt76_rmw_field(dev, MT_ANT_SWITCH_CON(4), MT_ANT_SWITCH_CON_MODE(1),</div><div class='del'>-		       (td-&gt;tx_antenna_mask &amp; BIT(0)) ? 0xd : 0x1b);</div><div class='add'>+		       (mask &amp; BIT(0)) ? 0xd : 0x1b);</div><div class='ctx'> 	mt76_rmw_field(dev, MT_ANT_SWITCH_CON(2), MT_ANT_SWITCH_CON_MODE(3),</div><div class='del'>-		       (td-&gt;tx_antenna_mask &amp; BIT(1)) ? 0x13 : 0x1b);</div><div class='add'>+		       (mask &amp; BIT(1)) ? 0x13 : 0x1b);</div><div class='ctx'> 	mt76_rmw_field(dev, MT_ANT_SWITCH_CON(7), MT_ANT_SWITCH_CON_MODE1(1),</div><div class='del'>-		       (td-&gt;tx_antenna_mask &amp; BIT(2)) ? 0x5 : 0xf);</div><div class='add'>+		       (mask &amp; BIT(2)) ? 0x5 : 0xf);</div><div class='ctx'> 	mt76_rmw_field(dev, MT_ANT_SWITCH_CON(8), MT_ANT_SWITCH_CON_MODE1(3),</div><div class='del'>-		       (td-&gt;tx_antenna_mask &amp; BIT(3)) ? 0xb : 0xf);</div><div class='add'>+		       (mask &amp; BIT(3)) ? 0xb : 0xf);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='ctx'> 		u32 val;</div><div class='ctx'> </div><div class='ctx'> 		val = mt7615_rf_rr(dev, i, 0x48);</div><div class='ctx'> 		val &amp;= ~(0x3ff &lt;&lt; 20);</div><div class='del'>-		if (td-&gt;tx_antenna_mask &amp; BIT(i))</div><div class='add'>+		if (mask &amp; BIT(i))</div><div class='ctx'> 			val |= 3 &lt;&lt; 20;</div><div class='ctx'> 		else</div><div class='ctx'> 			val |= (2 &lt;&lt; 28) | (2 &lt;&lt; 26) | (8 &lt;&lt; 20);</div><div class='hunk'>@@ -229,7 +228,7 @@ mt7615_tm_set_tx_frames(struct mt7615_phy *phy, bool en)</div><div class='ctx'> 	struct ieee80211_tx_info *info;</div><div class='ctx'> 	struct sk_buff *skb = phy-&gt;mt76-&gt;test.tx_skb;</div><div class='ctx'> </div><div class='del'>-	mt7615_mcu_set_chan_info(phy, MCU_EXT_CMD_SET_RX_PATH);</div><div class='add'>+	mt7615_mcu_set_chan_info(phy, MCU_EXT_CMD(SET_RX_PATH));</div><div class='ctx'> 	mt7615_tm_set_tx_antenna(phy, en);</div><div class='ctx'> 	mt7615_tm_set_rx_enable(dev, !en);</div><div class='ctx'> 	if (!en || !skb)</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/trace.c b/drivers/net/wireless/mediatek/mt76/mt7615/trace.c<br/>index 6c02d5aff68f..7ec39e0b3fb2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/trace.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/trace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/trace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/trace.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2019 Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/usb.c b/drivers/net/wireless/mediatek/mt76/mt7615/usb.c<br/>index 0396ad532ba6..d91feffadda9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/usb.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/usb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/usb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/usb.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2019 MediaTek Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='hunk'>@@ -17,16 +17,75 @@</div><div class='ctx'> </div><div class='ctx'> static const struct usb_device_id mt7615_device_table[] = {</div><div class='ctx'> 	{ USB_DEVICE_AND_INTERFACE_INFO(0x0e8d, 0x7663, 0xff, 0xff, 0xff) },</div><div class='add'>+	{ USB_DEVICE_AND_INTERFACE_INFO(0x043e, 0x310c, 0xff, 0xff, 0xff) },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void mt7663u_stop(struct ieee80211_hw *hw)</div><div class='add'>+static u32 mt7663u_rr(struct mt76_dev *dev, u32 addr)</div><div class='add'>+{</div><div class='add'>+	u32 ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;usb.usb_ctrl_mtx);</div><div class='add'>+	ret = ___mt76u_rr(dev, MT_VEND_READ_EXT,</div><div class='add'>+			  USB_DIR_IN | USB_TYPE_VENDOR, addr);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;usb.usb_ctrl_mtx);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7663u_wr(struct mt76_dev *dev, u32 addr, u32 val)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;dev-&gt;usb.usb_ctrl_mtx);</div><div class='add'>+	___mt76u_wr(dev, MT_VEND_WRITE_EXT,</div><div class='add'>+		    USB_DIR_OUT | USB_TYPE_VENDOR, addr, val);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;usb.usb_ctrl_mtx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 mt7663u_rmw(struct mt76_dev *dev, u32 addr,</div><div class='add'>+		       u32 mask, u32 val)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;dev-&gt;usb.usb_ctrl_mtx);</div><div class='add'>+	val |= ___mt76u_rr(dev, MT_VEND_READ_EXT,</div><div class='add'>+			   USB_DIR_IN | USB_TYPE_VENDOR, addr) &amp; ~mask;</div><div class='add'>+	___mt76u_wr(dev, MT_VEND_WRITE_EXT,</div><div class='add'>+		    USB_DIR_OUT | USB_TYPE_VENDOR, addr, val);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;usb.usb_ctrl_mtx);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7663u_copy(struct mt76_dev *dev, u32 offset,</div><div class='add'>+			 const void *data, int len)</div><div class='add'>+{</div><div class='add'>+	struct mt76_usb *usb = &amp;dev-&gt;usb;</div><div class='add'>+	int ret, i = 0, batch_len;</div><div class='add'>+	const u8 *val = data;</div><div class='add'>+</div><div class='add'>+	len = round_up(len, 4);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;usb-&gt;usb_ctrl_mtx);</div><div class='add'>+	while (i &lt; len) {</div><div class='add'>+		batch_len = min_t(int, usb-&gt;data_len, len - i);</div><div class='add'>+		memcpy(usb-&gt;data, val + i, batch_len);</div><div class='add'>+		ret = __mt76u_vendor_request(dev, MT_VEND_WRITE_EXT,</div><div class='add'>+					     USB_DIR_OUT | USB_TYPE_VENDOR,</div><div class='add'>+					     (offset + i) &gt;&gt; 16, offset + i,</div><div class='add'>+					     usb-&gt;data, batch_len);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		i += batch_len;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;usb-&gt;usb_ctrl_mtx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7663u_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7615_phy *phy = mt7615_hw_phy(hw);</div><div class='ctx'> 	struct mt7615_dev *dev = hw-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(MT76_STATE_RUNNING, &amp;dev-&gt;mphy.state);</div><div class='del'>-	del_timer_sync(&amp;phy-&gt;roc_timer);</div><div class='add'>+	timer_delete_sync(&amp;phy-&gt;roc_timer);</div><div class='ctx'> 	cancel_work_sync(&amp;phy-&gt;roc_work);</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;phy-&gt;scan_work);</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;phy-&gt;mt76-&gt;mac_work);</div><div class='hunk'>@@ -60,10 +119,19 @@ static int mt7663u_probe(struct usb_interface *usb_intf,</div><div class='ctx'> 		.tx_complete_skb = mt7663_usb_sdio_tx_complete_skb,</div><div class='ctx'> 		.tx_status_data = mt7663_usb_sdio_tx_status_data,</div><div class='ctx'> 		.rx_skb = mt7615_queue_rx_skb,</div><div class='del'>-		.sta_ps = mt7615_sta_ps,</div><div class='add'>+		.rx_check = mt7615_rx_check,</div><div class='ctx'> 		.sta_add = mt7615_mac_sta_add,</div><div class='ctx'> 		.sta_remove = mt7615_mac_sta_remove,</div><div class='ctx'> 		.update_survey = mt7615_update_channel,</div><div class='add'>+		.set_channel = mt7615_set_channel,</div><div class='add'>+	};</div><div class='add'>+	static struct mt76_bus_ops bus_ops = {</div><div class='add'>+		.rr = mt7663u_rr,</div><div class='add'>+		.wr = mt7663u_wr,</div><div class='add'>+		.rmw = mt7663u_rmw,</div><div class='add'>+		.read_copy = mt76u_read_copy,</div><div class='add'>+		.write_copy = mt7663u_copy,</div><div class='add'>+		.type = MT76_BUS_USB,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct usb_device *udev = interface_to_usbdev(usb_intf);</div><div class='ctx'> 	struct ieee80211_ops *ops;</div><div class='hunk'>@@ -91,7 +159,7 @@ static int mt7663u_probe(struct usb_interface *usb_intf,</div><div class='ctx'> 	INIT_WORK(&amp;dev-&gt;mcu_work, mt7663u_init_work);</div><div class='ctx'> 	dev-&gt;reg_map = mt7663_usb_sdio_reg_map;</div><div class='ctx'> 	dev-&gt;ops = ops;</div><div class='del'>-	ret = mt76u_init(mdev, usb_intf, true);</div><div class='add'>+	ret = __mt76u_init(mdev, usb_intf, &amp;bus_ops);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -99,27 +167,15 @@ static int mt7663u_probe(struct usb_interface *usb_intf,</div><div class='ctx'> 		    (mt76_rr(dev, MT_HW_REV) &amp; 0xff);</div><div class='ctx'> 	dev_dbg(mdev-&gt;dev, "ASIC revision: %04x\n", mdev-&gt;rev);</div><div class='ctx'> </div><div class='del'>-	if (mt76_poll_msec(dev, MT_CONN_ON_MISC, MT_TOP_MISC2_FW_PWR_ON,</div><div class='del'>-			   FW_STATE_PWR_ON &lt;&lt; 1, 500)) {</div><div class='del'>-		dev_dbg(dev-&gt;mt76.dev, "Usb device already powered on\n");</div><div class='del'>-		set_bit(MT76_STATE_POWER_OFF, &amp;dev-&gt;mphy.state);</div><div class='del'>-		goto alloc_queues;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = mt76u_vendor_request(&amp;dev-&gt;mt76, MT_VEND_POWER_ON,</div><div class='del'>-				   USB_DIR_OUT | USB_TYPE_VENDOR,</div><div class='del'>-				   0x0, 0x1, NULL, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='ctx'> 	if (!mt76_poll_msec(dev, MT_CONN_ON_MISC, MT_TOP_MISC2_FW_PWR_ON,</div><div class='ctx'> 			    FW_STATE_PWR_ON &lt;&lt; 1, 500)) {</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "Timeout for power on\n");</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto error;</div><div class='add'>+		ret = mt7663u_mcu_power_on(dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	} else {</div><div class='add'>+		set_bit(MT76_STATE_POWER_OFF, &amp;dev-&gt;mphy.state);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-alloc_queues:</div><div class='ctx'> 	ret = mt76u_alloc_mcu_queue(&amp;dev-&gt;mt76);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -169,7 +225,7 @@ static int mt7663u_suspend(struct usb_interface *intf, pm_message_t state)</div><div class='ctx'> 	    mt7615_firmware_offload(dev)) {</div><div class='ctx'> 		int err;</div><div class='ctx'> </div><div class='del'>-		err = mt76_connac_mcu_set_hif_suspend(&amp;dev-&gt;mt76, true);</div><div class='add'>+		err = mt76_connac_mcu_set_hif_suspend(&amp;dev-&gt;mt76, true, true);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -197,7 +253,7 @@ static int mt7663u_resume(struct usb_interface *intf)</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(MT76_STATE_SUSPEND, &amp;dev-&gt;mphy.state) &amp;&amp;</div><div class='ctx'> 	    mt7615_firmware_offload(dev))</div><div class='del'>-		err = mt76_connac_mcu_set_hif_suspend(&amp;dev-&gt;mt76, false);</div><div class='add'>+		err = mt76_connac_mcu_set_hif_suspend(&amp;dev-&gt;mt76, false, true);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -226,4 +282,5 @@ module_usb_driver(mt7663u_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Sean Wang &lt;sean.wang@mediatek.com&gt;");</div><div class='ctx'> MODULE_AUTHOR("Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("MediaTek MT7663U (USB) wireless driver");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c<br/>index c55698f9c49a..33c01f8ce8e2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@ mt7663u_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,</div><div class='ctx'> 	int ret, ep, len, pad;</div><div class='ctx'> </div><div class='ctx'> 	mt7615_mcu_fill_msg(dev, skb, cmd, seq);</div><div class='del'>-	if (cmd != MCU_CMD_FW_SCATTER)</div><div class='add'>+	if (cmd != MCU_CMD(FW_SCATTER))</div><div class='ctx'> 		ep = MT_EP_OUT_INBAND_CMD;</div><div class='ctx'> 	else</div><div class='ctx'> 		ep = MT_EP_OUT_AC_BE;</div><div class='hunk'>@@ -42,6 +42,26 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mt7663u_mcu_power_on(struct mt7615_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76u_vendor_request(&amp;dev-&gt;mt76, MT_VEND_POWER_ON,</div><div class='add'>+				   USB_DIR_OUT | USB_TYPE_VENDOR,</div><div class='add'>+				   0x0, 0x1, NULL, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!mt76_poll_msec(dev, MT_CONN_ON_MISC,</div><div class='add'>+			    MT_TOP_MISC2_FW_PWR_ON,</div><div class='add'>+			    FW_STATE_PWR_ON &lt;&lt; 1, 500)) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Timeout for power on\n");</div><div class='add'>+		ret = -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mt7663u_mcu_init(struct mt7615_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	static const struct mt76_mcu_ops mt7663u_mcu_ops = {</div><div class='hunk'>@@ -49,34 +69,24 @@ int mt7663u_mcu_init(struct mt7615_dev *dev)</div><div class='ctx'> 		.tailroom = MT_USB_TAIL_SIZE,</div><div class='ctx'> 		.mcu_skb_send_msg = mt7663u_mcu_send_message,</div><div class='ctx'> 		.mcu_parse_response = mt7615_mcu_parse_response,</div><div class='del'>-		.mcu_restart = mt7615_mcu_restart,</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mt76.mcu_ops = &amp;mt7663u_mcu_ops,</div><div class='add'>+	dev-&gt;mt76.mcu_ops = &amp;mt7663u_mcu_ops;</div><div class='ctx'> </div><div class='del'>-	/* usb does not support runtime-pm */</div><div class='del'>-	clear_bit(MT76_STATE_PM, &amp;dev-&gt;mphy.state);</div><div class='ctx'> 	mt76_set(dev, MT_UDMA_TX_QSEL, MT_FW_DL_EN);</div><div class='del'>-</div><div class='ctx'> 	if (test_and_clear_bit(MT76_STATE_POWER_OFF, &amp;dev-&gt;mphy.state)) {</div><div class='del'>-		mt7615_mcu_restart(&amp;dev-&gt;mt76);</div><div class='add'>+		ret = mt7615_mcu_restart(&amp;dev-&gt;mt76);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='ctx'> 		if (!mt76_poll_msec(dev, MT_CONN_ON_MISC,</div><div class='ctx'> 				    MT_TOP_MISC2_FW_PWR_ON, 0, 500))</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> </div><div class='del'>-		ret = mt76u_vendor_request(&amp;dev-&gt;mt76, MT_VEND_POWER_ON,</div><div class='del'>-					   USB_DIR_OUT | USB_TYPE_VENDOR,</div><div class='del'>-					   0x0, 0x1, NULL, 0);</div><div class='add'>+		ret = mt7663u_mcu_power_on(dev);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='del'>-</div><div class='del'>-		if (!mt76_poll_msec(dev, MT_CONN_ON_MISC,</div><div class='del'>-				    MT_TOP_MISC2_FW_PWR_ON,</div><div class='del'>-				    FW_STATE_PWR_ON &lt;&lt; 1, 500)) {</div><div class='del'>-			dev_err(dev-&gt;mt76.dev, "Timeout for power on\n");</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = __mt7663_load_firmware(dev);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c b/drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c<br/>index f8d3673c2cae..f4169de939c4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;</div><div class='hunk'>@@ -43,21 +43,13 @@ EXPORT_SYMBOL_GPL(mt7663_usb_sdio_reg_map);</div><div class='ctx'> static void</div><div class='ctx'> mt7663_usb_sdio_write_txwi(struct mt7615_dev *dev, struct mt76_wcid *wcid,</div><div class='ctx'> 			   enum mt76_txq_id qid, struct ieee80211_sta *sta,</div><div class='add'>+			   struct ieee80211_key_conf *key, int pid,</div><div class='ctx'> 			   struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='del'>-	struct ieee80211_key_conf *key = info-&gt;control.hw_key;</div><div class='del'>-	__le32 *txwi;</div><div class='del'>-	int pid;</div><div class='add'>+	__le32 *txwi = (__le32 *)(skb-&gt;data - MT_USB_TXD_SIZE);</div><div class='ctx'> </div><div class='del'>-	if (!wcid)</div><div class='del'>-		wcid = &amp;dev-&gt;mt76.global_wcid;</div><div class='del'>-</div><div class='del'>-	pid = mt76_tx_status_skb_add(&amp;dev-&gt;mt76, wcid, skb);</div><div class='del'>-</div><div class='del'>-	txwi = (__le32 *)(skb-&gt;data - MT_USB_TXD_SIZE);</div><div class='ctx'> 	memset(txwi, 0, MT_USB_TXD_SIZE);</div><div class='del'>-	mt7615_mac_write_txwi(dev, txwi, skb, wcid, sta, pid, key, false);</div><div class='add'>+	mt7615_mac_write_txwi(dev, txwi, skb, wcid, sta, pid, key, qid, false);</div><div class='ctx'> 	skb_push(skb, MT_USB_TXD_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -123,7 +115,7 @@ static int mt7663_usb_sdio_set_rates(struct mt7615_dev *dev,</div><div class='ctx'> 	idx = idx &gt; HW_BSSID_MAX ? HW_BSSID_0 : idx;</div><div class='ctx'> 	addr = idx &gt; 1 ? MT_LPON_TCR2(idx): MT_LPON_TCR0(idx);</div><div class='ctx'> </div><div class='del'>-	mt76_set(dev, addr, MT_LPON_TCR_MODE); /* TSF read */</div><div class='add'>+	mt76_rmw(dev, addr, MT_LPON_TCR_MODE, MT_LPON_TCR_READ); /* TSF read */</div><div class='ctx'> 	val = mt76_rr(dev, MT_LPON_UTTR0);</div><div class='ctx'> 	sta-&gt;rate_set_tsf = (val &amp; ~BIT(0)) | rate-&gt;rateset;</div><div class='ctx'> </div><div class='hunk'>@@ -169,7 +161,7 @@ bool mt7663_usb_sdio_tx_status_data(struct mt76_dev *mdev, u8 *update)</div><div class='ctx'> 	mt7615_mac_sta_poll(dev);</div><div class='ctx'> 	mt7615_mutex_release(dev);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt7663_usb_sdio_tx_status_data);</div><div class='ctx'> </div><div class='hunk'>@@ -191,14 +183,19 @@ int mt7663_usb_sdio_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='ctx'> 				   struct ieee80211_sta *sta,</div><div class='ctx'> 				   struct mt76_tx_info *tx_info)</div><div class='ctx'> {</div><div class='del'>-	struct mt7615_sta *msta = container_of(wcid, struct mt7615_sta, wcid);</div><div class='ctx'> 	struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);</div><div class='ctx'> 	struct sk_buff *skb = tx_info-&gt;skb;</div><div class='ctx'> 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='del'>-	int pad;</div><div class='add'>+	struct ieee80211_key_conf *key = info-&gt;control.hw_key;</div><div class='add'>+	struct mt7615_sta *msta;</div><div class='add'>+	int pad, err, pktid;</div><div class='add'>+</div><div class='add'>+	msta = wcid ? container_of(wcid, struct mt7615_sta, wcid) : NULL;</div><div class='add'>+	if (!wcid)</div><div class='add'>+		wcid = &amp;dev-&gt;mt76.global_wcid;</div><div class='ctx'> </div><div class='ctx'> 	if ((info-&gt;flags &amp; IEEE80211_TX_CTL_RATE_CTRL_PROBE) &amp;&amp;</div><div class='del'>-	    !msta-&gt;rate_probe) {</div><div class='add'>+	    msta &amp;&amp; !msta-&gt;rate_probe) {</div><div class='ctx'> 		/* request to configure sampling rate */</div><div class='ctx'> 		spin_lock_bh(&amp;dev-&gt;mt76.lock);</div><div class='ctx'> 		mt7615_mac_set_rates(&amp;dev-&gt;phy, msta, &amp;info-&gt;control.rates[0],</div><div class='hunk'>@@ -206,7 +203,8 @@ int mt7663_usb_sdio_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='ctx'> 		spin_unlock_bh(&amp;dev-&gt;mt76.lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mt7663_usb_sdio_write_txwi(dev, wcid, qid, sta, skb);</div><div class='add'>+	pktid = mt76_tx_status_skb_add(&amp;dev-&gt;mt76, wcid, skb);</div><div class='add'>+	mt7663_usb_sdio_write_txwi(dev, wcid, qid, sta, key, pktid, skb);</div><div class='ctx'> 	if (mt76_is_usb(mdev)) {</div><div class='ctx'> 		u32 len = skb-&gt;len;</div><div class='ctx'> </div><div class='hunk'>@@ -216,7 +214,12 @@ int mt7663_usb_sdio_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='ctx'> 		pad = round_up(skb-&gt;len, 4) - skb-&gt;len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return mt76_skb_adjust_pad(skb, pad);</div><div class='add'>+	err = mt76_skb_adjust_pad(skb, pad);</div><div class='add'>+	if (err)</div><div class='add'>+		/* Release pktid in case of error. */</div><div class='add'>+		idr_remove(&amp;wcid-&gt;pktid, pktid);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt7663_usb_sdio_tx_prepare_skb);</div><div class='ctx'> </div><div class='hunk'>@@ -323,8 +326,8 @@ int mt7663_usb_sdio_register_device(struct mt7615_dev *dev)</div><div class='ctx'> 			hw-&gt;max_tx_fragments = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = mt76_register_device(&amp;dev-&gt;mt76, true, mt7615_rates,</div><div class='del'>-				   ARRAY_SIZE(mt7615_rates));</div><div class='add'>+	err = mt76_register_device(&amp;dev-&gt;mt76, true, mt76_rates,</div><div class='add'>+				   ARRAY_SIZE(mt76_rates));</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -346,4 +349,5 @@ EXPORT_SYMBOL_GPL(mt7663_usb_sdio_register_device);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;");</div><div class='ctx'> MODULE_AUTHOR("Sean Wang &lt;sean.wang@mediatek.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("MediaTek MT7663 SDIO/USB helpers");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac.h b/drivers/net/wireless/mediatek/mt76/mt76_connac.h<br/>index 6c889b90fd12..813d61bffc2c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76_connac.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76_connac.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76_connac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76_connac.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MT76_CONNAC_H</div><div class='hunk'>@@ -6,13 +6,47 @@</div><div class='ctx'> </div><div class='ctx'> #include "mt76.h"</div><div class='ctx'> </div><div class='add'>+enum rx_pkt_type {</div><div class='add'>+	PKT_TYPE_TXS,</div><div class='add'>+	PKT_TYPE_TXRXV,</div><div class='add'>+	PKT_TYPE_NORMAL,</div><div class='add'>+	PKT_TYPE_RX_DUP_RFB,</div><div class='add'>+	PKT_TYPE_RX_TMR,</div><div class='add'>+	PKT_TYPE_RETRIEVE,</div><div class='add'>+	PKT_TYPE_TXRX_NOTIFY,</div><div class='add'>+	PKT_TYPE_RX_EVENT,</div><div class='add'>+	PKT_TYPE_NORMAL_MCU,</div><div class='add'>+	PKT_TYPE_RX_FW_MONITOR	= 0x0c,</div><div class='add'>+	PKT_TYPE_TXRX_NOTIFY_V0	= 0x18,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define MT76_CONNAC_SCAN_IE_LEN			600</div><div class='del'>-#define MT76_CONNAC_MAX_SCHED_SCAN_INTERVAL	10</div><div class='add'>+#define MT76_CONNAC_MAX_NUM_SCHED_SCAN_INTERVAL	 10</div><div class='add'>+#define MT76_CONNAC_MAX_TIME_SCHED_SCAN_INTERVAL U16_MAX</div><div class='ctx'> #define MT76_CONNAC_MAX_SCHED_SCAN_SSID		10</div><div class='ctx'> #define MT76_CONNAC_MAX_SCAN_MATCH		16</div><div class='ctx'> </div><div class='add'>+#define MT76_CONNAC_MAX_WMM_SETS		4</div><div class='add'>+</div><div class='ctx'> #define MT76_CONNAC_COREDUMP_TIMEOUT		(HZ / 20)</div><div class='del'>-#define MT76_CONNAC_COREDUMP_SZ			(128 * 1024)</div><div class='add'>+#define MT76_CONNAC_COREDUMP_SZ			(1300 * 1024)</div><div class='add'>+</div><div class='add'>+#define MT_TXD_SIZE				(8 * 4)</div><div class='add'>+</div><div class='add'>+#define MT_USB_TXD_SIZE				(MT_TXD_SIZE + 8 * 4)</div><div class='add'>+#define MT_USB_HDR_SIZE				4</div><div class='add'>+#define MT_USB_TAIL_SIZE			4</div><div class='add'>+</div><div class='add'>+#define MT_SDIO_TXD_SIZE			(MT_TXD_SIZE + 8 * 4)</div><div class='add'>+#define MT_SDIO_TAIL_SIZE			8</div><div class='add'>+#define MT_SDIO_HDR_SIZE			4</div><div class='add'>+</div><div class='add'>+#define MT_MSDU_ID_VALID		BIT(15)</div><div class='add'>+</div><div class='add'>+#define MT_TXD_LEN_LAST			BIT(15)</div><div class='add'>+#define MT_TXD_LEN_MASK			GENMASK(11, 0)</div><div class='add'>+#define MT_TXD_LEN_MSDU_LAST		BIT(14)</div><div class='add'>+#define MT_TXD_LEN_AMSDU_LAST		BIT(15)</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	CMD_CBW_20MHZ = IEEE80211_STA_RX_BW_20,</div><div class='hunk'>@@ -22,6 +56,7 @@ enum {</div><div class='ctx'> 	CMD_CBW_10MHZ,</div><div class='ctx'> 	CMD_CBW_5MHZ,</div><div class='ctx'> 	CMD_CBW_8080MHZ,</div><div class='add'>+	CMD_CBW_320MHZ,</div><div class='ctx'> </div><div class='ctx'> 	CMD_HE_MCS_BW80 = 0,</div><div class='ctx'> 	CMD_HE_MCS_BW160,</div><div class='hunk'>@@ -43,8 +78,18 @@ enum {</div><div class='ctx'> 	REPEATER_BSSID_MAX = 0x3f,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mt76_connac_reg_map {</div><div class='add'>+	u32 phys;</div><div class='add'>+	u32 maps;</div><div class='add'>+	u32 size;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mt76_connac_pm {</div><div class='del'>-	bool enable;</div><div class='add'>+	bool enable:1;</div><div class='add'>+	bool enable_user:1;</div><div class='add'>+	bool ds_enable:1;</div><div class='add'>+	bool ds_enable_user:1;</div><div class='add'>+	bool suspended:1;</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t txq_lock;</div><div class='ctx'> 	struct {</div><div class='hunk'>@@ -80,11 +125,71 @@ struct mt76_connac_coredump {</div><div class='ctx'> 	unsigned long last_activity;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mt76_connac_sta_key_conf {</div><div class='add'>+	s8 keyidx;</div><div class='add'>+	u8 key[16];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MT_TXP_MAX_BUF_NUM		6</div><div class='add'>+</div><div class='add'>+struct mt76_connac_fw_txp {</div><div class='add'>+	__le16 flags;</div><div class='add'>+	__le16 token;</div><div class='add'>+	u8 bss_idx;</div><div class='add'>+	__le16 rept_wds_wcid;</div><div class='add'>+	u8 nbuf;</div><div class='add'>+	__le32 buf[MT_TXP_MAX_BUF_NUM];</div><div class='add'>+	__le16 len[MT_TXP_MAX_BUF_NUM];</div><div class='add'>+} __packed __aligned(4);</div><div class='add'>+</div><div class='add'>+#define MT_HW_TXP_MAX_MSDU_NUM		4</div><div class='add'>+#define MT_HW_TXP_MAX_BUF_NUM		4</div><div class='add'>+</div><div class='add'>+struct mt76_connac_txp_ptr {</div><div class='add'>+	__le32 buf0;</div><div class='add'>+	__le16 len0;</div><div class='add'>+	__le16 len1;</div><div class='add'>+	__le32 buf1;</div><div class='add'>+} __packed __aligned(4);</div><div class='add'>+</div><div class='add'>+struct mt76_connac_hw_txp {</div><div class='add'>+	__le16 msdu_id[MT_HW_TXP_MAX_MSDU_NUM];</div><div class='add'>+	struct mt76_connac_txp_ptr ptr[MT_HW_TXP_MAX_BUF_NUM / 2];</div><div class='add'>+} __packed __aligned(4);</div><div class='add'>+</div><div class='add'>+struct mt76_connac_txp_common {</div><div class='add'>+	union {</div><div class='add'>+		struct mt76_connac_fw_txp fw;</div><div class='add'>+		struct mt76_connac_hw_txp hw;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt76_connac_tx_free {</div><div class='add'>+	__le16 rx_byte_cnt;</div><div class='add'>+	__le16 ctrl;</div><div class='add'>+	__le32 txd;</div><div class='add'>+} __packed __aligned(4);</div><div class='add'>+</div><div class='ctx'> extern const struct wiphy_wowlan_support mt76_connac_wowlan_support;</div><div class='ctx'> </div><div class='add'>+static inline bool is_mt7925(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return mt76_chip(dev) == 0x7925;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_mt7920(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return mt76_chip(dev) == 0x7920;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_mt7922(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return mt76_chip(dev) == 0x7922;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool is_mt7921(struct mt76_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	return mt76_chip(dev) == 0x7961;</div><div class='add'>+	return mt76_chip(dev) == 0x7961 || is_mt7922(dev) || is_mt7920(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool is_mt7663(struct mt76_dev *dev)</div><div class='hunk'>@@ -92,12 +197,157 @@ static inline bool is_mt7663(struct mt76_dev *dev)</div><div class='ctx'> 	return mt76_chip(dev) == 0x7663;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool is_mt7915(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return mt76_chip(dev) == 0x7915;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_mt7916(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return mt76_chip(dev) == 0x7906;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_mt7981(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return mt76_chip(dev) == 0x7981;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_mt7986(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return mt76_chip(dev) == 0x7986;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_mt798x(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return is_mt7981(dev) || is_mt7986(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_mt7996(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return mt76_chip(dev) == 0x7990;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_mt7992(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return mt76_chip(dev) == 0x7992;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_mt7990(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return mt76_chip(dev) == 0x7993;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_mt799x(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return is_mt7996(dev) || is_mt7992(dev) || is_mt7990(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_mt7622(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ENABLED(CONFIG_MT7622_WMAC))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return mt76_chip(dev) == 0x7622;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_mt7615(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return mt76_chip(dev) == 0x7615 || mt76_chip(dev) == 0x7611;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_mt7611(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return mt76_chip(dev) == 0x7611;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_connac_v1(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return is_mt7615(dev) || is_mt7663(dev) || is_mt7622(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_mt76_fw_txp(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	switch (mt76_chip(dev)) {</div><div class='add'>+	case 0x7961:</div><div class='add'>+	case 0x7920:</div><div class='add'>+	case 0x7922:</div><div class='add'>+	case 0x7925:</div><div class='add'>+	case 0x7663:</div><div class='add'>+	case 0x7622:</div><div class='add'>+		return false;</div><div class='add'>+	default:</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 mt76_connac_chan_bw(struct cfg80211_chan_def *chandef)</div><div class='add'>+{</div><div class='add'>+	static const u8 width_to_bw[] = {</div><div class='add'>+		[NL80211_CHAN_WIDTH_40] = CMD_CBW_40MHZ,</div><div class='add'>+		[NL80211_CHAN_WIDTH_80] = CMD_CBW_80MHZ,</div><div class='add'>+		[NL80211_CHAN_WIDTH_80P80] = CMD_CBW_8080MHZ,</div><div class='add'>+		[NL80211_CHAN_WIDTH_160] = CMD_CBW_160MHZ,</div><div class='add'>+		[NL80211_CHAN_WIDTH_5] = CMD_CBW_5MHZ,</div><div class='add'>+		[NL80211_CHAN_WIDTH_10] = CMD_CBW_10MHZ,</div><div class='add'>+		[NL80211_CHAN_WIDTH_20] = CMD_CBW_20MHZ,</div><div class='add'>+		[NL80211_CHAN_WIDTH_20_NOHT] = CMD_CBW_20MHZ,</div><div class='add'>+		[NL80211_CHAN_WIDTH_320] = CMD_CBW_320MHZ,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (chandef-&gt;width &gt;= ARRAY_SIZE(width_to_bw))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return width_to_bw[chandef-&gt;width];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 mt76_connac_lmac_mapping(u8 ac)</div><div class='add'>+{</div><div class='add'>+	/* LMAC uses the reverse order of mac80211 AC indexes */</div><div class='add'>+	return 3 - ac;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *</div><div class='add'>+mt76_connac_txwi_to_txp(struct mt76_dev *dev, struct mt76_txwi_cache *t)</div><div class='add'>+{</div><div class='add'>+	u8 *txwi;</div><div class='add'>+</div><div class='add'>+	if (!t)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	txwi = mt76_get_txwi_ptr(dev, t);</div><div class='add'>+</div><div class='add'>+	return (void *)(txwi + MT_TXD_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 mt76_connac_spe_idx(u8 antenna_mask)</div><div class='add'>+{</div><div class='add'>+	static const u8 ant_to_spe[] = {0, 0, 1, 0, 3, 2, 4, 0,</div><div class='add'>+					9, 8, 6, 10, 16, 12, 18, 0};</div><div class='add'>+</div><div class='add'>+	if (antenna_mask &gt;= sizeof(ant_to_spe))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ant_to_spe[antenna_mask];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mt76_connac_irq_enable(struct mt76_dev *dev, u32 mask)</div><div class='add'>+{</div><div class='add'>+	mt76_set_irq_mask(dev, 0, 0, mask);</div><div class='add'>+	tasklet_schedule(&amp;dev-&gt;irq_tasklet);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mt76_connac_pm_wake(struct mt76_phy *phy, struct mt76_connac_pm *pm);</div><div class='ctx'> void mt76_connac_power_save_sched(struct mt76_phy *phy,</div><div class='ctx'> 				  struct mt76_connac_pm *pm);</div><div class='ctx'> void mt76_connac_free_pending_tx_skbs(struct mt76_connac_pm *pm,</div><div class='ctx'> 				      struct mt76_wcid *wcid);</div><div class='ctx'> </div><div class='add'>+static inline void mt76_connac_tx_cleanup(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;queue_ops-&gt;tx_cleanup(dev, dev-&gt;q_mcu[MT_MCUQ_WM], false);</div><div class='add'>+	dev-&gt;queue_ops-&gt;tx_cleanup(dev, dev-&gt;q_mcu[MT_MCUQ_WA], false);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool</div><div class='ctx'> mt76_connac_pm_ref(struct mt76_phy *phy, struct mt76_connac_pm *pm)</div><div class='ctx'> {</div><div class='hunk'>@@ -116,19 +366,27 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-mt76_connac_pm_unref(struct mt76_connac_pm *pm)</div><div class='add'>+mt76_connac_pm_unref(struct mt76_phy *phy, struct mt76_connac_pm *pm)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock_bh(&amp;pm-&gt;wake.lock);</div><div class='del'>-	pm-&gt;wake.count--;</div><div class='add'>+</div><div class='ctx'> 	pm-&gt;last_activity = jiffies;</div><div class='add'>+	if (--pm-&gt;wake.count == 0 &amp;&amp;</div><div class='add'>+	    test_bit(MT76_STATE_MCU_RUNNING, &amp;phy-&gt;state))</div><div class='add'>+		mt76_connac_power_save_sched(phy, pm);</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_bh(&amp;pm-&gt;wake.lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool</div><div class='ctx'> mt76_connac_skip_fw_pmctrl(struct mt76_phy *phy, struct mt76_connac_pm *pm)</div><div class='ctx'> {</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	bool ret;</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;token_count)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_bh(&amp;pm-&gt;wake.lock);</div><div class='ctx'> 	ret = pm-&gt;wake.count || test_and_set_bit(MT76_STATE_PM, &amp;phy-&gt;state);</div><div class='ctx'> 	spin_unlock_bh(&amp;pm-&gt;wake.lock);</div><div class='hunk'>@@ -152,11 +410,52 @@ mt76_connac_mutex_release(struct mt76_dev *dev, struct mt76_connac_pm *pm)</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void mt76_connac_gen_ppe_thresh(u8 *he_ppet, int nss, enum nl80211_band band);</div><div class='add'>+int mt76_connac_init_tx_queues(struct mt76_phy *phy, int idx, int n_desc,</div><div class='add'>+			       int ring_base, void *wed, u32 flags);</div><div class='add'>+</div><div class='add'>+void mt76_connac_write_hw_txp(struct mt76_dev *dev,</div><div class='add'>+			      struct mt76_tx_info *tx_info,</div><div class='add'>+			      void *txp_ptr, u32 id);</div><div class='add'>+void mt76_connac_txp_skb_unmap(struct mt76_dev *dev,</div><div class='add'>+			       struct mt76_txwi_cache *txwi);</div><div class='add'>+void mt76_connac_tx_complete_skb(struct mt76_dev *mdev,</div><div class='add'>+				 struct mt76_queue_entry *e);</div><div class='ctx'> void mt76_connac_pm_queue_skb(struct ieee80211_hw *hw,</div><div class='ctx'> 			      struct mt76_connac_pm *pm,</div><div class='ctx'> 			      struct mt76_wcid *wcid,</div><div class='ctx'> 			      struct sk_buff *skb);</div><div class='ctx'> void mt76_connac_pm_dequeue_skbs(struct mt76_phy *phy,</div><div class='ctx'> 				 struct mt76_connac_pm *pm);</div><div class='add'>+void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi,</div><div class='add'>+				 struct sk_buff *skb, struct mt76_wcid *wcid,</div><div class='add'>+				 struct ieee80211_key_conf *key, int pid,</div><div class='add'>+				 enum mt76_txq_id qid, u32 changed);</div><div class='add'>+u16 mt76_connac2_mac_tx_rate_val(struct mt76_phy *mphy,</div><div class='add'>+				 struct ieee80211_bss_conf *conf,</div><div class='add'>+				 bool beacon, bool mcast);</div><div class='add'>+bool mt76_connac2_mac_fill_txs(struct mt76_dev *dev, struct mt76_wcid *wcid,</div><div class='add'>+			       __le32 *txs_data);</div><div class='add'>+bool mt76_connac2_mac_add_txs_skb(struct mt76_dev *dev, struct mt76_wcid *wcid,</div><div class='add'>+				  int pid, __le32 *txs_data);</div><div class='add'>+void mt76_connac2_mac_decode_he_radiotap(struct mt76_dev *dev,</div><div class='add'>+					 struct sk_buff *skb,</div><div class='add'>+					 __le32 *rxv, u32 mode);</div><div class='add'>+int mt76_connac2_reverse_frag0_hdr_trans(struct ieee80211_vif *vif,</div><div class='add'>+					 struct sk_buff *skb, u16 hdr_offset);</div><div class='add'>+int mt76_connac2_mac_fill_rx_rate(struct mt76_dev *dev,</div><div class='add'>+				  struct mt76_rx_status *status,</div><div class='add'>+				  struct ieee80211_supported_band *sband,</div><div class='add'>+				  __le32 *rxv, u8 *mode);</div><div class='add'>+void mt76_connac2_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi);</div><div class='add'>+void mt76_connac2_txwi_free(struct mt76_dev *dev, struct mt76_txwi_cache *t,</div><div class='add'>+			    struct ieee80211_sta *sta,</div><div class='add'>+			    struct list_head *free_list);</div><div class='add'>+void mt76_connac2_tx_token_put(struct mt76_dev *dev);</div><div class='ctx'> </div><div class='add'>+/* connac3 */</div><div class='add'>+void mt76_connac3_mac_decode_he_radiotap(struct sk_buff *skb, __le32 *rxv,</div><div class='add'>+					 u8 mode);</div><div class='add'>+void mt76_connac3_mac_decode_eht_radiotap(struct sk_buff *skb, __le32 *rxv,</div><div class='add'>+					  u8 mode);</div><div class='ctx'> #endif /* __MT76_CONNAC_H */</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.h b/drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h<br/>index 109c8849d106..d4e2c3140441 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/mac.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/mac.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h</a></div><div class='hunk'>@@ -1,12 +1,187 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='del'>-/* Copyright (C) 2020 MediaTek Inc. */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/* Copyright (C) 2022 MediaTek Inc. */</div><div class='ctx'> </div><div class='del'>-#ifndef __MT7921_MAC_H</div><div class='del'>-#define __MT7921_MAC_H</div><div class='add'>+#ifndef __MT76_CONNAC2_MAC_H</div><div class='add'>+#define __MT76_CONNAC2_MAC_H</div><div class='ctx'> </div><div class='del'>-#define MT_CT_PARSE_LEN			72</div><div class='del'>-#define MT_CT_DMA_BUF_NUM		2</div><div class='add'>+enum tx_header_format {</div><div class='add'>+	MT_HDR_FORMAT_802_3,</div><div class='add'>+	MT_HDR_FORMAT_CMD,</div><div class='add'>+	MT_HDR_FORMAT_802_11,</div><div class='add'>+	MT_HDR_FORMAT_802_11_EXT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum tx_pkt_type {</div><div class='add'>+	MT_TX_TYPE_CT,</div><div class='add'>+	MT_TX_TYPE_SF,</div><div class='add'>+	MT_TX_TYPE_CMD,</div><div class='add'>+	MT_TX_TYPE_FW,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MT_CTX0,</div><div class='add'>+	MT_HIF0 = 0x0,</div><div class='add'>+</div><div class='add'>+	MT_LMAC_AC00 = 0x0,</div><div class='add'>+	MT_LMAC_AC01,</div><div class='add'>+	MT_LMAC_AC02,</div><div class='add'>+	MT_LMAC_AC03,</div><div class='add'>+	MT_LMAC_ALTX0 = 0x10,</div><div class='add'>+	MT_LMAC_BMC0,</div><div class='add'>+	MT_LMAC_BCN0,</div><div class='add'>+	MT_LMAC_PSMP0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MT_TXS_MPDU_FMT = 0,</div><div class='add'>+	MT_TXS_PPDU_FMT = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MT_TX_FREE_MSDU_CNT		GENMASK(9, 0)</div><div class='add'>+#define MT_TX_FREE_WLAN_ID		GENMASK(23, 14)</div><div class='add'>+#define MT_TX_FREE_COUNT		GENMASK(12, 0)</div><div class='add'>+/* 0: success, others: dropped */</div><div class='add'>+#define MT_TX_FREE_STATUS		GENMASK(14, 13)</div><div class='add'>+#define MT_TX_FREE_MSDU_ID		GENMASK(30, 16)</div><div class='add'>+#define MT_TX_FREE_PAIR			BIT(31)</div><div class='add'>+/* will support this field in further revision */</div><div class='add'>+#define MT_TX_FREE_RATE			GENMASK(13, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXD0_Q_IDX			GENMASK(31, 25)</div><div class='add'>+#define MT_TXD0_PKT_FMT			GENMASK(24, 23)</div><div class='add'>+#define MT_TXD0_ETH_TYPE_OFFSET		GENMASK(22, 16)</div><div class='add'>+#define MT_TXD0_TX_BYTES		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXD1_LONG_FORMAT		BIT(31)</div><div class='add'>+#define MT_TXD1_TGID			BIT(30)</div><div class='add'>+#define MT_TXD1_OWN_MAC			GENMASK(29, 24)</div><div class='add'>+#define MT_TXD1_AMSDU			BIT(23)</div><div class='add'>+#define MT_TXD1_TID			GENMASK(22, 20)</div><div class='add'>+#define MT_TXD1_HDR_PAD			GENMASK(19, 18)</div><div class='add'>+#define MT_TXD1_HDR_FORMAT		GENMASK(17, 16)</div><div class='add'>+#define MT_TXD1_HDR_INFO		GENMASK(15, 11)</div><div class='add'>+#define MT_TXD1_ETH_802_3		BIT(15)</div><div class='add'>+#define MT_TXD1_VTA			BIT(10)</div><div class='add'>+#define MT_TXD1_WLAN_IDX		GENMASK(9, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXD2_FIX_RATE		BIT(31)</div><div class='add'>+#define MT_TXD2_FIXED_RATE		BIT(30)</div><div class='add'>+#define MT_TXD2_POWER_OFFSET		GENMASK(29, 24)</div><div class='add'>+#define MT_TXD2_MAX_TX_TIME		GENMASK(23, 16)</div><div class='add'>+#define MT_TXD2_FRAG			GENMASK(15, 14)</div><div class='add'>+#define MT_TXD2_HTC_VLD			BIT(13)</div><div class='add'>+#define MT_TXD2_DURATION		BIT(12)</div><div class='add'>+#define MT_TXD2_BIP			BIT(11)</div><div class='add'>+#define MT_TXD2_MULTICAST		BIT(10)</div><div class='add'>+#define MT_TXD2_RTS			BIT(9)</div><div class='add'>+#define MT_TXD2_SOUNDING		BIT(8)</div><div class='add'>+#define MT_TXD2_NDPA			BIT(7)</div><div class='add'>+#define MT_TXD2_NDP			BIT(6)</div><div class='add'>+#define MT_TXD2_FRAME_TYPE		GENMASK(5, 4)</div><div class='add'>+#define MT_TXD2_SUB_TYPE		GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXD3_SN_VALID		BIT(31)</div><div class='add'>+#define MT_TXD3_PN_VALID		BIT(30)</div><div class='add'>+#define MT_TXD3_SW_POWER_MGMT		BIT(29)</div><div class='add'>+#define MT_TXD3_BA_DISABLE		BIT(28)</div><div class='add'>+#define MT_TXD3_SEQ			GENMASK(27, 16)</div><div class='add'>+#define MT_TXD3_REM_TX_COUNT		GENMASK(15, 11)</div><div class='add'>+#define MT_TXD3_TX_COUNT		GENMASK(10, 6)</div><div class='add'>+#define MT_TXD3_TIMING_MEASURE		BIT(5)</div><div class='add'>+#define MT_TXD3_DAS			BIT(4)</div><div class='add'>+#define MT_TXD3_EEOSP			BIT(3)</div><div class='add'>+#define MT_TXD3_EMRD			BIT(2)</div><div class='add'>+#define MT_TXD3_PROTECT_FRAME		BIT(1)</div><div class='add'>+#define MT_TXD3_NO_ACK			BIT(0)</div><div class='add'>+</div><div class='add'>+#define MT_TXD4_PN_LOW			GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXD5_PN_HIGH			GENMASK(31, 16)</div><div class='add'>+#define MT_TXD5_MD			BIT(15)</div><div class='add'>+#define MT_TXD5_ADD_BA			BIT(14)</div><div class='add'>+#define MT_TXD5_TX_STATUS_HOST		BIT(10)</div><div class='add'>+#define MT_TXD5_TX_STATUS_MCU		BIT(9)</div><div class='add'>+#define MT_TXD5_TX_STATUS_FMT		BIT(8)</div><div class='add'>+#define MT_TXD5_PID			GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXD6_TX_IBF			BIT(31)</div><div class='add'>+#define MT_TXD6_TX_EBF			BIT(30)</div><div class='add'>+#define MT_TXD6_TX_RATE			GENMASK(29, 16)</div><div class='add'>+#define MT_TXD6_SGI			GENMASK(15, 14)</div><div class='add'>+#define MT_TXD6_HELTF			GENMASK(13, 12)</div><div class='add'>+#define MT_TXD6_LDPC			BIT(11)</div><div class='add'>+#define MT_TXD6_SPE_ID_IDX		BIT(10)</div><div class='add'>+#define MT_TXD6_ANT_ID			GENMASK(7, 4)</div><div class='add'>+#define MT_TXD6_DYN_BW			BIT(3)</div><div class='add'>+#define MT_TXD6_FIXED_BW		BIT(2)</div><div class='add'>+#define MT_TXD6_BW			GENMASK(1, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXD7_TXD_LEN			GENMASK(31, 30)</div><div class='add'>+#define MT_TXD7_UDP_TCP_SUM		BIT(29)</div><div class='add'>+#define MT_TXD7_IP_SUM			BIT(28)</div><div class='add'>+#define MT_TXD7_TYPE			GENMASK(21, 20)</div><div class='add'>+#define MT_TXD7_SUB_TYPE		GENMASK(19, 16)</div><div class='add'>+</div><div class='add'>+#define MT_TXD7_PSE_FID			GENMASK(27, 16)</div><div class='add'>+#define MT_TXD7_SPE_IDX			GENMASK(15, 11)</div><div class='add'>+#define MT_TXD7_HW_AMSDU		BIT(10)</div><div class='add'>+#define MT_TXD7_TX_TIME			GENMASK(9, 0)</div><div class='ctx'> </div><div class='add'>+#define MT_TXD8_L_TYPE			GENMASK(5, 4)</div><div class='add'>+#define MT_TXD8_L_SUB_TYPE		GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TX_RATE_STBC			BIT(13)</div><div class='add'>+#define MT_TX_RATE_NSS			GENMASK(12, 10)</div><div class='add'>+#define MT_TX_RATE_MODE			GENMASK(9, 6)</div><div class='add'>+#define MT_TX_RATE_SU_EXT_TONE		BIT(5)</div><div class='add'>+#define MT_TX_RATE_DCM			BIT(4)</div><div class='add'>+/* VHT/HE only use bits 0-3 */</div><div class='add'>+#define MT_TX_RATE_IDX			GENMASK(5, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS0_FIXED_RATE		BIT(31)</div><div class='add'>+#define MT_TXS0_BW			GENMASK(30, 29)</div><div class='add'>+#define MT_TXS0_TID			GENMASK(28, 26)</div><div class='add'>+#define MT_TXS0_AMPDU			BIT(25)</div><div class='add'>+#define MT_TXS0_TXS_FORMAT		GENMASK(24, 23)</div><div class='add'>+#define MT_TXS0_BA_ERROR		BIT(22)</div><div class='add'>+#define MT_TXS0_PS_FLAG			BIT(21)</div><div class='add'>+#define MT_TXS0_TXOP_TIMEOUT		BIT(20)</div><div class='add'>+#define MT_TXS0_BIP_ERROR		BIT(19)</div><div class='add'>+</div><div class='add'>+#define MT_TXS0_QUEUE_TIMEOUT		BIT(18)</div><div class='add'>+#define MT_TXS0_RTS_TIMEOUT		BIT(17)</div><div class='add'>+#define MT_TXS0_ACK_TIMEOUT		BIT(16)</div><div class='add'>+#define MT_TXS0_ACK_ERROR_MASK		GENMASK(18, 16)</div><div class='add'>+</div><div class='add'>+#define MT_TXS0_TX_STATUS_HOST		BIT(15)</div><div class='add'>+#define MT_TXS0_TX_STATUS_MCU		BIT(14)</div><div class='add'>+#define MT_TXS0_TX_RATE			GENMASK(13, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS1_SEQNO			GENMASK(31, 20)</div><div class='add'>+#define MT_TXS1_RESP_RATE		GENMASK(19, 16)</div><div class='add'>+#define MT_TXS1_RXV_SEQNO		GENMASK(15, 8)</div><div class='add'>+#define MT_TXS1_TX_POWER_DBM		GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS2_BF_STATUS		GENMASK(31, 30)</div><div class='add'>+#define MT_TXS2_LAST_TX_RATE		GENMASK(29, 27)</div><div class='add'>+#define MT_TXS2_SHARED_ANTENNA		BIT(26)</div><div class='add'>+#define MT_TXS2_WCID			GENMASK(25, 16)</div><div class='add'>+#define MT_TXS2_TX_DELAY		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS3_PID			GENMASK(31, 24)</div><div class='add'>+#define MT_TXS3_ANT_ID			GENMASK(23, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS4_TIMESTAMP		GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+/* PPDU based TXS */</div><div class='add'>+#define MT_TXS5_MPDU_TX_BYTE		GENMASK(22, 0)</div><div class='add'>+#define MT_TXS5_MPDU_TX_CNT		GENMASK(31, 23)</div><div class='add'>+</div><div class='add'>+#define MT_TXS6_MPDU_FAIL_CNT		GENMASK(31, 23)</div><div class='add'>+#define MT_TXS7_MPDU_RETRY_BYTE		GENMASK(22, 0)</div><div class='add'>+#define MT_TXS7_MPDU_RETRY_CNT		GENMASK(31, 23)</div><div class='add'>+</div><div class='add'>+/* RXD DW0 */</div><div class='ctx'> #define MT_RXD0_LENGTH			GENMASK(15, 0)</div><div class='ctx'> #define MT_RXD0_PKT_FLAG                GENMASK(19, 16)</div><div class='ctx'> #define MT_RXD0_PKT_TYPE		GENMASK(31, 27)</div><div class='hunk'>@@ -15,18 +190,6 @@</div><div class='ctx'> #define MT_RXD0_NORMAL_IP_SUM		BIT(23)</div><div class='ctx'> #define MT_RXD0_NORMAL_UDP_TCP_SUM	BIT(24)</div><div class='ctx'> </div><div class='del'>-enum rx_pkt_type {</div><div class='del'>-	PKT_TYPE_TXS,</div><div class='del'>-	PKT_TYPE_TXRXV,</div><div class='del'>-	PKT_TYPE_NORMAL,</div><div class='del'>-	PKT_TYPE_RX_DUP_RFB,</div><div class='del'>-	PKT_TYPE_RX_TMR,</div><div class='del'>-	PKT_TYPE_RETRIEVE,</div><div class='del'>-	PKT_TYPE_TXRX_NOTIFY,</div><div class='del'>-	PKT_TYPE_RX_EVENT,</div><div class='del'>-	PKT_TYPE_NORMAL_MCU,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* RXD DW1 */</div><div class='ctx'> #define MT_RXD1_NORMAL_WLAN_IDX		GENMASK(9, 0)</div><div class='ctx'> #define MT_RXD1_NORMAL_GROUP_1		BIT(11)</div><div class='hunk'>@@ -66,6 +229,22 @@ enum rx_pkt_type {</div><div class='ctx'> #define MT_RXD2_NORMAL_NON_AMPDU	BIT(30)</div><div class='ctx'> #define MT_RXD2_NORMAL_BF_REPORT	BIT(31)</div><div class='ctx'> </div><div class='add'>+/* RXD DW4 */</div><div class='add'>+#define MT_RXD4_NORMAL_PAYLOAD_FORMAT	GENMASK(1, 0)</div><div class='add'>+#define MT_RXD4_FIRST_AMSDU_FRAME	GENMASK(1, 0)</div><div class='add'>+#define MT_RXD4_MID_AMSDU_FRAME		BIT(1)</div><div class='add'>+#define MT_RXD4_LAST_AMSDU_FRAME	BIT(0)</div><div class='add'>+#define MT_RXD4_NORMAL_PATTERN_DROP	BIT(9)</div><div class='add'>+#define MT_RXD4_NORMAL_CLS		BIT(10)</div><div class='add'>+#define MT_RXD4_NORMAL_OFLD		GENMASK(12, 11)</div><div class='add'>+#define MT_RXD4_NORMAL_MAGIC_PKT	BIT(13)</div><div class='add'>+#define MT_RXD4_NORMAL_WOL		GENMASK(18, 14)</div><div class='add'>+#define MT_RXD4_NORMAL_CLS_BITMAP	GENMASK(28, 19)</div><div class='add'>+#define MT_RXD3_NORMAL_PF_MODE		BIT(29)</div><div class='add'>+#define MT_RXD3_NORMAL_PF_STS		GENMASK(31, 30)</div><div class='add'>+</div><div class='add'>+#define MT_RXV_HDR_BAND_IDX		BIT(24)</div><div class='add'>+</div><div class='ctx'> /* RXD DW3 */</div><div class='ctx'> #define MT_RXD3_NORMAL_RXV_SEQ		GENMASK(7, 0)</div><div class='ctx'> #define MT_RXD3_NORMAL_CH_FREQ		GENMASK(15, 8)</div><div class='hunk'>@@ -86,28 +265,32 @@ enum rx_pkt_type {</div><div class='ctx'> #define MT_RXD3_NORMAL_RX_DROP		BIT(30)</div><div class='ctx'> #define MT_RXD3_NORMAL_VLAN2ETH		BIT(31)</div><div class='ctx'> </div><div class='del'>-/* RXD DW4 */</div><div class='del'>-#define MT_RXD4_NORMAL_PAYLOAD_FORMAT	GENMASK(1, 0)</div><div class='del'>-#define MT_RXD4_NORMAL_PATTERN_DROP	BIT(9)</div><div class='del'>-#define MT_RXD4_NORMAL_CLS		BIT(10)</div><div class='del'>-#define MT_RXD4_NORMAL_OFLD		GENMASK(12, 11)</div><div class='del'>-#define MT_RXD4_NORMAL_MAGIC_PKT	BIT(13)</div><div class='del'>-#define MT_RXD4_NORMAL_WOL		GENMASK(18, 14)</div><div class='del'>-#define MT_RXD4_NORMAL_CLS_BITMAP	GENMASK(28, 19)</div><div class='del'>-#define MT_RXD3_NORMAL_PF_MODE		BIT(29)</div><div class='del'>-#define MT_RXD3_NORMAL_PF_STS		GENMASK(31, 30)</div><div class='add'>+/* RXD GROUP4 */</div><div class='add'>+#define MT_RXD6_FRAME_CONTROL		GENMASK(15, 0)</div><div class='add'>+#define MT_RXD6_TA_LO			GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define MT_RXD7_TA_HI			GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+#define MT_RXD8_SEQ_CTRL		GENMASK(15, 0)</div><div class='add'>+#define MT_RXD8_QOS_CTL			GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define MT_RXD9_HT_CONTROL		GENMASK(31, 0)</div><div class='ctx'> </div><div class='ctx'> /* P-RXV DW0 */</div><div class='ctx'> #define MT_PRXV_TX_RATE			GENMASK(6, 0)</div><div class='ctx'> #define MT_PRXV_TX_DCM			BIT(4)</div><div class='ctx'> #define MT_PRXV_TX_ER_SU_106T		BIT(5)</div><div class='ctx'> #define MT_PRXV_NSTS			GENMASK(9, 7)</div><div class='add'>+#define MT_PRXV_TXBF			BIT(10)</div><div class='ctx'> #define MT_PRXV_HT_AD_CODE		BIT(11)</div><div class='add'>+#define MT_PRXV_HE_RU_ALLOC_L		GENMASK(31, 28)</div><div class='add'>+</div><div class='ctx'> #define MT_PRXV_FRAME_MODE		GENMASK(14, 12)</div><div class='del'>-#define MT_PRXV_SGI			GENMASK(16, 15)</div><div class='del'>-#define MT_PRXV_STBC			GENMASK(23, 22)</div><div class='add'>+#define MT_PRXV_HT_SGI			GENMASK(16, 15)</div><div class='add'>+#define MT_PRXV_HT_STBC			GENMASK(23, 22)</div><div class='ctx'> #define MT_PRXV_TX_MODE			GENMASK(27, 24)</div><div class='del'>-#define MT_PRXV_HE_RU_ALLOC_L		GENMASK(31, 28)</div><div class='add'>+#define MT_PRXV_DCM			BIT(17)</div><div class='add'>+#define MT_PRXV_NUM_RX			BIT(20, 18)</div><div class='ctx'> </div><div class='ctx'> /* P-RXV DW1 */</div><div class='ctx'> #define MT_PRXV_RCPI3			GENMASK(31, 24)</div><div class='hunk'>@@ -124,8 +307,16 @@ enum rx_pkt_type {</div><div class='ctx'> #define MT_CRXV_HE_LTF_SIZE		GENMASK(18, 17)</div><div class='ctx'> #define MT_CRXV_HE_LDPC_EXT_SYM		BIT(20)</div><div class='ctx'> #define MT_CRXV_HE_PE_DISAMBIG		BIT(23)</div><div class='add'>+#define MT_CRXV_HE_NUM_USER		GENMASK(30, 24)</div><div class='ctx'> #define MT_CRXV_HE_UPLINK		BIT(31)</div><div class='ctx'> </div><div class='add'>+#define MT_CRXV_HE_RU0			GENMASK(7, 0)</div><div class='add'>+#define MT_CRXV_HE_RU1			GENMASK(15, 8)</div><div class='add'>+#define MT_CRXV_HE_RU2			GENMASK(23, 16)</div><div class='add'>+#define MT_CRXV_HE_RU3			GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+#define MT_CRXV_HE_MU_AID		GENMASK(30, 20)</div><div class='add'>+</div><div class='ctx'> #define MT_CRXV_HE_SR_MASK		GENMASK(11, 8)</div><div class='ctx'> #define MT_CRXV_HE_SR1_MASK		GENMASK(16, 12)</div><div class='ctx'> #define MT_CRXV_HE_SR2_MASK             GENMASK(20, 17)</div><div class='hunk'>@@ -141,24 +332,15 @@ enum rx_pkt_type {</div><div class='ctx'> #define MT_CRXV_FOE_HI		GENMASK(6, 0)</div><div class='ctx'> #define MT_CRXV_FOE_SHIFT	13</div><div class='ctx'> </div><div class='del'>-enum tx_header_format {</div><div class='del'>-	MT_HDR_FORMAT_802_3,</div><div class='del'>-	MT_HDR_FORMAT_CMD,</div><div class='del'>-	MT_HDR_FORMAT_802_11,</div><div class='del'>-	MT_HDR_FORMAT_802_11_EXT,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum tx_pkt_type {</div><div class='del'>-	MT_TX_TYPE_CT,</div><div class='del'>-	MT_TX_TYPE_SF,</div><div class='del'>-	MT_TX_TYPE_CMD,</div><div class='del'>-	MT_TX_TYPE_FW,</div><div class='del'>-};</div><div class='add'>+#define MT_CT_PARSE_LEN			72</div><div class='add'>+#define MT_CT_DMA_BUF_NUM		2</div><div class='ctx'> </div><div class='del'>-enum tx_port_idx {</div><div class='del'>-	MT_TX_PORT_IDX_LMAC,</div><div class='del'>-	MT_TX_PORT_IDX_MCU</div><div class='del'>-};</div><div class='add'>+#define MT_CT_INFO_APPLY_TXD		BIT(0)</div><div class='add'>+#define MT_CT_INFO_COPY_HOST_TXD_ALL	BIT(1)</div><div class='add'>+#define MT_CT_INFO_MGMT_FRAME		BIT(2)</div><div class='add'>+#define MT_CT_INFO_NONE_CIPHER_FRAME	BIT(3)</div><div class='add'>+#define MT_CT_INFO_HSR2_TX		BIT(4)</div><div class='add'>+#define MT_CT_INFO_FROM_HOST		BIT(7)</div><div class='ctx'> </div><div class='ctx'> enum tx_mcu_port_q_idx {</div><div class='ctx'> 	MT_TX_MCU_PORT_RX_Q0 = 0x20,</div><div class='hunk'>@@ -168,172 +350,16 @@ enum tx_mcu_port_q_idx {</div><div class='ctx'> 	MT_TX_MCU_PORT_RX_FWDL = 0x3e</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define MT_CT_INFO_APPLY_TXD		BIT(0)</div><div class='del'>-#define MT_CT_INFO_COPY_HOST_TXD_ALL	BIT(1)</div><div class='del'>-#define MT_CT_INFO_MGMT_FRAME		BIT(2)</div><div class='del'>-#define MT_CT_INFO_NONE_CIPHER_FRAME	BIT(3)</div><div class='del'>-#define MT_CT_INFO_HSR2_TX		BIT(4)</div><div class='del'>-#define MT_CT_INFO_FROM_HOST		BIT(7)</div><div class='del'>-</div><div class='del'>-#define MT_TXD_SIZE			(8 * 4)</div><div class='del'>-</div><div class='del'>-#define MT_TXD0_Q_IDX			GENMASK(31, 25)</div><div class='del'>-#define MT_TXD0_PKT_FMT			GENMASK(24, 23)</div><div class='del'>-#define MT_TXD0_ETH_TYPE_OFFSET		GENMASK(22, 16)</div><div class='del'>-#define MT_TXD0_TX_BYTES		GENMASK(15, 0)</div><div class='del'>-</div><div class='del'>-#define MT_TXD1_LONG_FORMAT		BIT(31)</div><div class='del'>-#define MT_TXD1_TGID			BIT(30)</div><div class='del'>-#define MT_TXD1_OWN_MAC			GENMASK(29, 24)</div><div class='del'>-#define MT_TXD1_AMSDU			BIT(23)</div><div class='del'>-#define MT_TXD1_TID			GENMASK(22, 20)</div><div class='del'>-#define MT_TXD1_HDR_PAD			GENMASK(19, 18)</div><div class='del'>-#define MT_TXD1_HDR_FORMAT		GENMASK(17, 16)</div><div class='del'>-#define MT_TXD1_HDR_INFO		GENMASK(15, 11)</div><div class='del'>-#define MT_TXD1_ETH_802_3		BIT(15)</div><div class='del'>-#define MT_TXD1_VTA			BIT(10)</div><div class='del'>-#define MT_TXD1_WLAN_IDX		GENMASK(9, 0)</div><div class='del'>-</div><div class='del'>-#define MT_TXD2_FIX_RATE		BIT(31)</div><div class='del'>-#define MT_TXD2_FIXED_RATE		BIT(30)</div><div class='del'>-#define MT_TXD2_POWER_OFFSET		GENMASK(29, 24)</div><div class='del'>-#define MT_TXD2_MAX_TX_TIME		GENMASK(23, 16)</div><div class='del'>-#define MT_TXD2_FRAG			GENMASK(15, 14)</div><div class='del'>-#define MT_TXD2_HTC_VLD			BIT(13)</div><div class='del'>-#define MT_TXD2_DURATION		BIT(12)</div><div class='del'>-#define MT_TXD2_BIP			BIT(11)</div><div class='del'>-#define MT_TXD2_MULTICAST		BIT(10)</div><div class='del'>-#define MT_TXD2_RTS			BIT(9)</div><div class='del'>-#define MT_TXD2_SOUNDING		BIT(8)</div><div class='del'>-#define MT_TXD2_NDPA			BIT(7)</div><div class='del'>-#define MT_TXD2_NDP			BIT(6)</div><div class='del'>-#define MT_TXD2_FRAME_TYPE		GENMASK(5, 4)</div><div class='del'>-#define MT_TXD2_SUB_TYPE		GENMASK(3, 0)</div><div class='del'>-</div><div class='del'>-#define MT_TXD3_SN_VALID		BIT(31)</div><div class='del'>-#define MT_TXD3_PN_VALID		BIT(30)</div><div class='del'>-#define MT_TXD3_SW_POWER_MGMT		BIT(29)</div><div class='del'>-#define MT_TXD3_BA_DISABLE		BIT(28)</div><div class='del'>-#define MT_TXD3_SEQ			GENMASK(27, 16)</div><div class='del'>-#define MT_TXD3_REM_TX_COUNT		GENMASK(15, 11)</div><div class='del'>-#define MT_TXD3_TX_COUNT		GENMASK(10, 6)</div><div class='del'>-#define MT_TXD3_TIMING_MEASURE		BIT(5)</div><div class='del'>-#define MT_TXD3_DAS			BIT(4)</div><div class='del'>-#define MT_TXD3_EEOSP			BIT(3)</div><div class='del'>-#define MT_TXD3_EMRD			BIT(2)</div><div class='del'>-#define MT_TXD3_PROTECT_FRAME		BIT(1)</div><div class='del'>-#define MT_TXD3_NO_ACK			BIT(0)</div><div class='del'>-</div><div class='del'>-#define MT_TXD4_PN_LOW			GENMASK(31, 0)</div><div class='del'>-</div><div class='del'>-#define MT_TXD5_PN_HIGH			GENMASK(31, 16)</div><div class='del'>-#define MT_TXD5_MD			BIT(15)</div><div class='del'>-#define MT_TXD5_ADD_BA			BIT(14)</div><div class='del'>-#define MT_TXD5_TX_STATUS_HOST		BIT(10)</div><div class='del'>-#define MT_TXD5_TX_STATUS_MCU		BIT(9)</div><div class='del'>-#define MT_TXD5_TX_STATUS_FMT		BIT(8)</div><div class='del'>-#define MT_TXD5_PID			GENMASK(7, 0)</div><div class='del'>-</div><div class='del'>-#define MT_TXD6_TX_IBF			BIT(31)</div><div class='del'>-#define MT_TXD6_TX_EBF			BIT(30)</div><div class='del'>-#define MT_TXD6_TX_RATE			GENMASK(29, 16)</div><div class='del'>-#define MT_TXD6_SGI			GENMASK(15, 14)</div><div class='del'>-#define MT_TXD6_HELTF			GENMASK(13, 12)</div><div class='del'>-#define MT_TXD6_LDPC			BIT(11)</div><div class='del'>-#define MT_TXD6_SPE_ID_IDX		BIT(10)</div><div class='del'>-#define MT_TXD6_ANT_ID			GENMASK(7, 4)</div><div class='del'>-#define MT_TXD6_DYN_BW			BIT(3)</div><div class='del'>-#define MT_TXD6_FIXED_BW		BIT(2)</div><div class='del'>-#define MT_TXD6_BW			GENMASK(1, 0)</div><div class='del'>-</div><div class='del'>-#define MT_TXD7_TXD_LEN			GENMASK(31, 30)</div><div class='del'>-#define MT_TXD7_UDP_TCP_SUM		BIT(29)</div><div class='del'>-#define MT_TXD7_IP_SUM			BIT(28)</div><div class='del'>-</div><div class='del'>-#define MT_TXD7_TYPE			GENMASK(21, 20)</div><div class='del'>-#define MT_TXD7_SUB_TYPE		GENMASK(19, 16)</div><div class='del'>-</div><div class='del'>-#define MT_TXD7_PSE_FID			GENMASK(27, 16)</div><div class='del'>-#define MT_TXD7_SPE_IDX			GENMASK(15, 11)</div><div class='del'>-#define MT_TXD7_HW_AMSDU		BIT(10)</div><div class='del'>-#define MT_TXD7_TX_TIME			GENMASK(9, 0)</div><div class='del'>-</div><div class='del'>-#define MT_TX_RATE_STBC			BIT(13)</div><div class='del'>-#define MT_TX_RATE_NSS			GENMASK(12, 10)</div><div class='del'>-#define MT_TX_RATE_MODE			GENMASK(9, 6)</div><div class='del'>-#define MT_TX_RATE_SU_EXT_TONE		BIT(5)</div><div class='del'>-#define MT_TX_RATE_DCM			BIT(4)</div><div class='del'>-#define MT_TX_RATE_IDX			GENMASK(3, 0)</div><div class='del'>-</div><div class='del'>-#define MT_TXP_MAX_BUF_NUM		6</div><div class='del'>-</div><div class='del'>-struct mt7921_txp {</div><div class='del'>-	__le16 flags;</div><div class='del'>-	__le16 token;</div><div class='del'>-	u8 bss_idx;</div><div class='del'>-	__le16 rept_wds_wcid;</div><div class='del'>-	u8 nbuf;</div><div class='del'>-	__le32 buf[MT_TXP_MAX_BUF_NUM];</div><div class='del'>-	__le16 len[MT_TXP_MAX_BUF_NUM];</div><div class='del'>-} __packed __aligned(4);</div><div class='del'>-</div><div class='del'>-struct mt7921_tx_free {</div><div class='del'>-	__le16 rx_byte_cnt;</div><div class='del'>-	__le16 ctrl;</div><div class='del'>-	u8 txd_cnt;</div><div class='del'>-	u8 rsv[3];</div><div class='del'>-	__le32 info[];</div><div class='del'>-} __packed __aligned(4);</div><div class='del'>-</div><div class='del'>-#define MT_TX_FREE_MSDU_CNT		GENMASK(9, 0)</div><div class='del'>-#define MT_TX_FREE_WLAN_ID		GENMASK(23, 14)</div><div class='del'>-#define MT_TX_FREE_LATENCY		GENMASK(12, 0)</div><div class='del'>-/* 0: success, others: dropped */</div><div class='del'>-#define MT_TX_FREE_STATUS		GENMASK(14, 13)</div><div class='del'>-#define MT_TX_FREE_MSDU_ID		GENMASK(30, 16)</div><div class='del'>-#define MT_TX_FREE_PAIR			BIT(31)</div><div class='del'>-/* will support this field in further revision */</div><div class='del'>-#define MT_TX_FREE_RATE			GENMASK(13, 0)</div><div class='del'>-</div><div class='del'>-static inline struct mt7921_txp_common *</div><div class='del'>-mt7921_txwi_to_txp(struct mt76_dev *dev, struct mt76_txwi_cache *t)</div><div class='del'>-{</div><div class='del'>-	u8 *txwi;</div><div class='del'>-</div><div class='del'>-	if (!t)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	txwi = mt76_get_txwi_ptr(dev, t);</div><div class='del'>-</div><div class='del'>-	return (struct mt7921_txp_common *)(txwi + MT_TXD_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define MT_HW_TXP_MAX_MSDU_NUM		4</div><div class='del'>-#define MT_HW_TXP_MAX_BUF_NUM		4</div><div class='del'>-</div><div class='del'>-#define MT_MSDU_ID_VALID		BIT(15)</div><div class='del'>-</div><div class='del'>-#define MT_TXD_LEN_MASK			GENMASK(11, 0)</div><div class='del'>-#define MT_TXD_LEN_MSDU_LAST		BIT(14)</div><div class='del'>-#define MT_TXD_LEN_AMSDU_LAST		BIT(15)</div><div class='del'>-#define MT_TXD_LEN_LAST			BIT(15)</div><div class='del'>-</div><div class='del'>-struct mt7921_txp_ptr {</div><div class='del'>-	__le32 buf0;</div><div class='del'>-	__le16 len0;</div><div class='del'>-	__le16 len1;</div><div class='del'>-	__le32 buf1;</div><div class='del'>-} __packed __aligned(4);</div><div class='del'>-</div><div class='del'>-struct mt7921_hw_txp {</div><div class='del'>-	__le16 msdu_id[MT_HW_TXP_MAX_MSDU_NUM];</div><div class='del'>-	struct mt7921_txp_ptr ptr[MT_HW_TXP_MAX_BUF_NUM / 2];</div><div class='del'>-} __packed __aligned(4);</div><div class='add'>+enum tx_port_idx {</div><div class='add'>+	MT_TX_PORT_IDX_LMAC,</div><div class='add'>+	MT_TX_PORT_IDX_MCU</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-struct mt7921_txp_common {</div><div class='del'>-	union {</div><div class='del'>-		struct mt7921_hw_txp hw;</div><div class='del'>-	};</div><div class='add'>+enum tx_frag_idx {</div><div class='add'>+	MT_TX_FRAG_NONE,</div><div class='add'>+	MT_TX_FRAG_FIRST,</div><div class='add'>+	MT_TX_FRAG_MID,</div><div class='add'>+	MT_TX_FRAG_LAST</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='add'>+#endif /* __MT76_CONNAC2_MAC_H */</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.c b/drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.c<br/>new file mode 100644<br/>index 000000000000..651fcd4169f4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.c</a></div><div class='hunk'>@@ -0,0 +1,268 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/* Copyright (C) 2023 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#include "mt76_connac.h"</div><div class='add'>+#include "mt76_connac3_mac.h"</div><div class='add'>+#include "dma.h"</div><div class='add'>+</div><div class='add'>+#define HE_BITS(f)		cpu_to_le16(IEEE80211_RADIOTAP_HE_##f)</div><div class='add'>+#define EHT_BITS(f)		cpu_to_le32(IEEE80211_RADIOTAP_EHT_##f)</div><div class='add'>+#define HE_PREP(f, m, v)	le16_encode_bits(le32_get_bits(v, MT_CRXV_HE_##m),\</div><div class='add'>+						 IEEE80211_RADIOTAP_HE_##f)</div><div class='add'>+#define EHT_PREP(f, m, v)	le32_encode_bits(le32_get_bits(v, MT_CRXV_EHT_##m),\</div><div class='add'>+						 IEEE80211_RADIOTAP_EHT_##f)</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt76_connac3_mac_decode_he_radiotap_ru(struct mt76_rx_status *status,</div><div class='add'>+				       struct ieee80211_radiotap_he *he,</div><div class='add'>+				       __le32 *rxv)</div><div class='add'>+{</div><div class='add'>+	u32 ru = le32_get_bits(rxv[0], MT_PRXV_HE_RU_ALLOC), offs = 0;</div><div class='add'>+</div><div class='add'>+	status-&gt;bw = RATE_INFO_BW_HE_RU;</div><div class='add'>+</div><div class='add'>+	switch (ru) {</div><div class='add'>+	case 0 ... 36:</div><div class='add'>+		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_26;</div><div class='add'>+		offs = ru;</div><div class='add'>+		break;</div><div class='add'>+	case 37 ... 52:</div><div class='add'>+		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_52;</div><div class='add'>+		offs = ru - 37;</div><div class='add'>+		break;</div><div class='add'>+	case 53 ... 60:</div><div class='add'>+		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_106;</div><div class='add'>+		offs = ru - 53;</div><div class='add'>+		break;</div><div class='add'>+	case 61 ... 64:</div><div class='add'>+		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_242;</div><div class='add'>+		offs = ru - 61;</div><div class='add'>+		break;</div><div class='add'>+	case 65 ... 66:</div><div class='add'>+		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_484;</div><div class='add'>+		offs = ru - 65;</div><div class='add'>+		break;</div><div class='add'>+	case 67:</div><div class='add'>+		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_996;</div><div class='add'>+		break;</div><div class='add'>+	case 68:</div><div class='add'>+		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_2x996;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	he-&gt;data1 |= HE_BITS(DATA1_BW_RU_ALLOC_KNOWN);</div><div class='add'>+	he-&gt;data2 |= HE_BITS(DATA2_RU_OFFSET_KNOWN) |</div><div class='add'>+		     le16_encode_bits(offs,</div><div class='add'>+				      IEEE80211_RADIOTAP_HE_DATA2_RU_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MU_PREP(f, v)	le16_encode_bits(v, IEEE80211_RADIOTAP_HE_MU_##f)</div><div class='add'>+static void</div><div class='add'>+mt76_connac3_mac_decode_he_mu_radiotap(struct sk_buff *skb, __le32 *rxv)</div><div class='add'>+{</div><div class='add'>+	struct mt76_rx_status *status = (struct mt76_rx_status *)skb-&gt;cb;</div><div class='add'>+	static const struct ieee80211_radiotap_he_mu mu_known = {</div><div class='add'>+		.flags1 = HE_BITS(MU_FLAGS1_SIG_B_MCS_KNOWN) |</div><div class='add'>+			  HE_BITS(MU_FLAGS1_SIG_B_DCM_KNOWN) |</div><div class='add'>+			  HE_BITS(MU_FLAGS1_CH1_RU_KNOWN) |</div><div class='add'>+			  HE_BITS(MU_FLAGS1_SIG_B_SYMS_USERS_KNOWN),</div><div class='add'>+		.flags2 = HE_BITS(MU_FLAGS2_BW_FROM_SIG_A_BW_KNOWN),</div><div class='add'>+	};</div><div class='add'>+	struct ieee80211_radiotap_he_mu *he_mu;</div><div class='add'>+</div><div class='add'>+	status-&gt;flag |= RX_FLAG_RADIOTAP_HE_MU;</div><div class='add'>+</div><div class='add'>+	he_mu = skb_push(skb, sizeof(mu_known));</div><div class='add'>+	memcpy(he_mu, &amp;mu_known, sizeof(mu_known));</div><div class='add'>+</div><div class='add'>+	he_mu-&gt;flags1 |= MU_PREP(FLAGS1_SIG_B_MCS, status-&gt;rate_idx);</div><div class='add'>+	if (status-&gt;he_dcm)</div><div class='add'>+		he_mu-&gt;flags1 |= MU_PREP(FLAGS1_SIG_B_DCM, status-&gt;he_dcm);</div><div class='add'>+</div><div class='add'>+	he_mu-&gt;flags2 |= MU_PREP(FLAGS2_BW_FROM_SIG_A_BW, status-&gt;bw) |</div><div class='add'>+			 MU_PREP(FLAGS2_SIG_B_SYMS_USERS,</div><div class='add'>+				 le32_get_bits(rxv[4], MT_CRXV_HE_NUM_USER));</div><div class='add'>+</div><div class='add'>+	he_mu-&gt;ru_ch1[0] = le32_get_bits(rxv[16], MT_CRXV_HE_RU0) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	if (status-&gt;bw &gt;= RATE_INFO_BW_40) {</div><div class='add'>+		he_mu-&gt;flags1 |= HE_BITS(MU_FLAGS1_CH2_RU_KNOWN);</div><div class='add'>+		he_mu-&gt;ru_ch2[0] = le32_get_bits(rxv[16], MT_CRXV_HE_RU1) &amp; 0xff;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status-&gt;bw &gt;= RATE_INFO_BW_80) {</div><div class='add'>+		u32 ru_h, ru_l;</div><div class='add'>+</div><div class='add'>+		he_mu-&gt;ru_ch1[1] = le32_get_bits(rxv[16], MT_CRXV_HE_RU2) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+		ru_l = le32_get_bits(rxv[16], MT_CRXV_HE_RU3_L);</div><div class='add'>+		ru_h = le32_get_bits(rxv[17], MT_CRXV_HE_RU3_H) &amp; 0x7;</div><div class='add'>+		he_mu-&gt;ru_ch2[1] = (u8)(ru_l | ru_h &lt;&lt; 4);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt76_connac3_mac_decode_he_radiotap(struct sk_buff *skb, __le32 *rxv,</div><div class='add'>+					 u8 mode)</div><div class='add'>+{</div><div class='add'>+	struct mt76_rx_status *status = (struct mt76_rx_status *)skb-&gt;cb;</div><div class='add'>+	static const struct ieee80211_radiotap_he known = {</div><div class='add'>+		.data1 = HE_BITS(DATA1_DATA_MCS_KNOWN) |</div><div class='add'>+			 HE_BITS(DATA1_DATA_DCM_KNOWN) |</div><div class='add'>+			 HE_BITS(DATA1_STBC_KNOWN) |</div><div class='add'>+			 HE_BITS(DATA1_CODING_KNOWN) |</div><div class='add'>+			 HE_BITS(DATA1_LDPC_XSYMSEG_KNOWN) |</div><div class='add'>+			 HE_BITS(DATA1_DOPPLER_KNOWN) |</div><div class='add'>+			 HE_BITS(DATA1_SPTL_REUSE_KNOWN) |</div><div class='add'>+			 HE_BITS(DATA1_BSS_COLOR_KNOWN),</div><div class='add'>+		.data2 = HE_BITS(DATA2_GI_KNOWN) |</div><div class='add'>+			 HE_BITS(DATA2_TXBF_KNOWN) |</div><div class='add'>+			 HE_BITS(DATA2_PE_DISAMBIG_KNOWN) |</div><div class='add'>+			 HE_BITS(DATA2_TXOP_KNOWN),</div><div class='add'>+	};</div><div class='add'>+	u32 ltf_size = le32_get_bits(rxv[4], MT_CRXV_HE_LTF_SIZE) + 1;</div><div class='add'>+	struct ieee80211_radiotap_he *he;</div><div class='add'>+</div><div class='add'>+	status-&gt;flag |= RX_FLAG_RADIOTAP_HE;</div><div class='add'>+</div><div class='add'>+	he = skb_push(skb, sizeof(known));</div><div class='add'>+	memcpy(he, &amp;known, sizeof(known));</div><div class='add'>+</div><div class='add'>+	he-&gt;data3 = HE_PREP(DATA3_BSS_COLOR, BSS_COLOR, rxv[9]) |</div><div class='add'>+		    HE_PREP(DATA3_LDPC_XSYMSEG, LDPC_EXT_SYM, rxv[4]);</div><div class='add'>+	he-&gt;data4 = HE_PREP(DATA4_SU_MU_SPTL_REUSE, SR_MASK, rxv[13]);</div><div class='add'>+	he-&gt;data5 = HE_PREP(DATA5_PE_DISAMBIG, PE_DISAMBIG, rxv[5]) |</div><div class='add'>+		    le16_encode_bits(ltf_size,</div><div class='add'>+				     IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE);</div><div class='add'>+	if (le32_to_cpu(rxv[0]) &amp; MT_PRXV_TXBF)</div><div class='add'>+		he-&gt;data5 |= HE_BITS(DATA5_TXBF);</div><div class='add'>+	he-&gt;data6 = HE_PREP(DATA6_TXOP, TXOP_DUR, rxv[9]) |</div><div class='add'>+		    HE_PREP(DATA6_DOPPLER, DOPPLER, rxv[9]);</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case MT_PHY_TYPE_HE_SU:</div><div class='add'>+		he-&gt;data1 |= HE_BITS(DATA1_FORMAT_SU) |</div><div class='add'>+			     HE_BITS(DATA1_UL_DL_KNOWN) |</div><div class='add'>+			     HE_BITS(DATA1_BEAM_CHANGE_KNOWN) |</div><div class='add'>+			     HE_BITS(DATA1_BW_RU_ALLOC_KNOWN);</div><div class='add'>+</div><div class='add'>+		he-&gt;data3 |= HE_PREP(DATA3_BEAM_CHANGE, BEAM_CHNG, rxv[8]) |</div><div class='add'>+			     HE_PREP(DATA3_UL_DL, UPLINK, rxv[5]);</div><div class='add'>+		break;</div><div class='add'>+	case MT_PHY_TYPE_HE_EXT_SU:</div><div class='add'>+		he-&gt;data1 |= HE_BITS(DATA1_FORMAT_EXT_SU) |</div><div class='add'>+			     HE_BITS(DATA1_UL_DL_KNOWN) |</div><div class='add'>+			     HE_BITS(DATA1_BW_RU_ALLOC_KNOWN);</div><div class='add'>+</div><div class='add'>+		he-&gt;data3 |= HE_PREP(DATA3_UL_DL, UPLINK, rxv[5]);</div><div class='add'>+		break;</div><div class='add'>+	case MT_PHY_TYPE_HE_MU:</div><div class='add'>+		he-&gt;data1 |= HE_BITS(DATA1_FORMAT_MU) |</div><div class='add'>+			     HE_BITS(DATA1_UL_DL_KNOWN);</div><div class='add'>+</div><div class='add'>+		he-&gt;data3 |= HE_PREP(DATA3_UL_DL, UPLINK, rxv[5]);</div><div class='add'>+		he-&gt;data4 |= HE_PREP(DATA4_MU_STA_ID, MU_AID, rxv[8]);</div><div class='add'>+</div><div class='add'>+		mt76_connac3_mac_decode_he_radiotap_ru(status, he, rxv);</div><div class='add'>+		mt76_connac3_mac_decode_he_mu_radiotap(skb, rxv);</div><div class='add'>+		break;</div><div class='add'>+	case MT_PHY_TYPE_HE_TB:</div><div class='add'>+		he-&gt;data1 |= HE_BITS(DATA1_FORMAT_TRIG) |</div><div class='add'>+			     HE_BITS(DATA1_SPTL_REUSE2_KNOWN) |</div><div class='add'>+			     HE_BITS(DATA1_SPTL_REUSE3_KNOWN) |</div><div class='add'>+			     HE_BITS(DATA1_SPTL_REUSE4_KNOWN);</div><div class='add'>+</div><div class='add'>+		he-&gt;data4 |= HE_PREP(DATA4_TB_SPTL_REUSE1, SR_MASK, rxv[13]) |</div><div class='add'>+			     HE_PREP(DATA4_TB_SPTL_REUSE2, SR1_MASK, rxv[13]) |</div><div class='add'>+			     HE_PREP(DATA4_TB_SPTL_REUSE3, SR2_MASK, rxv[13]) |</div><div class='add'>+			     HE_PREP(DATA4_TB_SPTL_REUSE4, SR3_MASK, rxv[13]);</div><div class='add'>+</div><div class='add'>+		mt76_connac3_mac_decode_he_radiotap_ru(status, he, rxv);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac3_mac_decode_he_radiotap);</div><div class='add'>+</div><div class='add'>+static void *</div><div class='add'>+mt76_connac3_mac_radiotap_push_tlv(struct sk_buff *skb, u16 type, u16 len)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_radiotap_tlv *tlv;</div><div class='add'>+</div><div class='add'>+	tlv = skb_push(skb, sizeof(*tlv) + len);</div><div class='add'>+	tlv-&gt;type = cpu_to_le16(type);</div><div class='add'>+	tlv-&gt;len = cpu_to_le16(len);</div><div class='add'>+	memset(tlv-&gt;data, 0, len);</div><div class='add'>+</div><div class='add'>+	return tlv-&gt;data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt76_connac3_mac_decode_eht_radiotap(struct sk_buff *skb, __le32 *rxv,</div><div class='add'>+					  u8 mode)</div><div class='add'>+{</div><div class='add'>+	struct mt76_rx_status *status = (struct mt76_rx_status *)skb-&gt;cb;</div><div class='add'>+	struct ieee80211_radiotap_eht_usig *usig;</div><div class='add'>+	struct ieee80211_radiotap_eht *eht;</div><div class='add'>+	u32 ltf_size = le32_get_bits(rxv[4], MT_CRXV_HE_LTF_SIZE) + 1;</div><div class='add'>+	u8 bw = FIELD_GET(MT_PRXV_FRAME_MODE, le32_to_cpu(rxv[2]));</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(skb_mac_header(skb) != skb-&gt;data,</div><div class='add'>+		      "Should push tlv at the top of mac hdr"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	eht = mt76_connac3_mac_radiotap_push_tlv(skb, IEEE80211_RADIOTAP_EHT,</div><div class='add'>+						 sizeof(*eht) + sizeof(u32));</div><div class='add'>+	usig = mt76_connac3_mac_radiotap_push_tlv(skb, IEEE80211_RADIOTAP_EHT_USIG,</div><div class='add'>+						  sizeof(*usig));</div><div class='add'>+</div><div class='add'>+	status-&gt;flag |= RX_FLAG_RADIOTAP_TLV_AT_END;</div><div class='add'>+</div><div class='add'>+	eht-&gt;known |= EHT_BITS(KNOWN_SPATIAL_REUSE) |</div><div class='add'>+		      EHT_BITS(KNOWN_GI) |</div><div class='add'>+		      EHT_BITS(KNOWN_EHT_LTF) |</div><div class='add'>+		      EHT_BITS(KNOWN_LDPC_EXTRA_SYM_OM) |</div><div class='add'>+		      EHT_BITS(KNOWN_PE_DISAMBIGUITY_OM) |</div><div class='add'>+		      EHT_BITS(KNOWN_NSS_S);</div><div class='add'>+</div><div class='add'>+	eht-&gt;data[0] |=</div><div class='add'>+		EHT_PREP(DATA0_SPATIAL_REUSE, SR_MASK, rxv[13]) |</div><div class='add'>+		cpu_to_le32(FIELD_PREP(IEEE80211_RADIOTAP_EHT_DATA0_GI, status-&gt;eht.gi) |</div><div class='add'>+			    FIELD_PREP(IEEE80211_RADIOTAP_EHT_DATA0_LTF, ltf_size)) |</div><div class='add'>+		EHT_PREP(DATA0_PE_DISAMBIGUITY_OM, PE_DISAMBIG, rxv[5]) |</div><div class='add'>+		EHT_PREP(DATA0_LDPC_EXTRA_SYM_OM, LDPC_EXT_SYM, rxv[4]);</div><div class='add'>+</div><div class='add'>+	/* iwlwifi and wireshark expect radiotap to report zero-based NSS, so subtract 1. */</div><div class='add'>+	eht-&gt;data[7] |= le32_encode_bits(status-&gt;nss - 1, IEEE80211_RADIOTAP_EHT_DATA7_NSS_S);</div><div class='add'>+</div><div class='add'>+	eht-&gt;user_info[0] |=</div><div class='add'>+		EHT_BITS(USER_INFO_MCS_KNOWN) |</div><div class='add'>+		EHT_BITS(USER_INFO_CODING_KNOWN) |</div><div class='add'>+		EHT_BITS(USER_INFO_NSS_KNOWN_O) |</div><div class='add'>+		EHT_BITS(USER_INFO_BEAMFORMING_KNOWN_O) |</div><div class='add'>+		EHT_BITS(USER_INFO_DATA_FOR_USER) |</div><div class='add'>+		le32_encode_bits(status-&gt;rate_idx, IEEE80211_RADIOTAP_EHT_USER_INFO_MCS) |</div><div class='add'>+		le32_encode_bits(status-&gt;nss - 1, IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_O);</div><div class='add'>+</div><div class='add'>+	if (le32_to_cpu(rxv[0]) &amp; MT_PRXV_TXBF)</div><div class='add'>+		eht-&gt;user_info[0] |= EHT_BITS(USER_INFO_BEAMFORMING_O);</div><div class='add'>+</div><div class='add'>+	if (le32_to_cpu(rxv[0]) &amp; MT_PRXV_HT_AD_CODE)</div><div class='add'>+		eht-&gt;user_info[0] |= EHT_BITS(USER_INFO_CODING);</div><div class='add'>+</div><div class='add'>+	if (mode == MT_PHY_TYPE_EHT_MU)</div><div class='add'>+		eht-&gt;user_info[0] |= EHT_BITS(USER_INFO_STA_ID_KNOWN) |</div><div class='add'>+				     EHT_PREP(USER_INFO_STA_ID, MU_AID, rxv[8]);</div><div class='add'>+</div><div class='add'>+	usig-&gt;common |=</div><div class='add'>+		EHT_BITS(USIG_COMMON_PHY_VER_KNOWN) |</div><div class='add'>+		EHT_BITS(USIG_COMMON_BW_KNOWN) |</div><div class='add'>+		EHT_BITS(USIG_COMMON_UL_DL_KNOWN) |</div><div class='add'>+		EHT_BITS(USIG_COMMON_BSS_COLOR_KNOWN) |</div><div class='add'>+		EHT_BITS(USIG_COMMON_TXOP_KNOWN) |</div><div class='add'>+		le32_encode_bits(0, IEEE80211_RADIOTAP_EHT_USIG_COMMON_PHY_VER) |</div><div class='add'>+		le32_encode_bits(bw, IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW) |</div><div class='add'>+		EHT_PREP(USIG_COMMON_UL_DL, UPLINK, rxv[5]) |</div><div class='add'>+		EHT_PREP(USIG_COMMON_BSS_COLOR, BSS_COLOR, rxv[9]) |</div><div class='add'>+		EHT_PREP(USIG_COMMON_TXOP, TXOP_DUR, rxv[9]);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac3_mac_decode_eht_radiotap);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.h b/drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.h<br/>new file mode 100644<br/>index 000000000000..247e2e7a47d8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.h</a></div><div class='hunk'>@@ -0,0 +1,400 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/* Copyright (C) 2023 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#ifndef __MT76_CONNAC3_MAC_H</div><div class='add'>+#define __MT76_CONNAC3_MAC_H</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MT_CTX0,</div><div class='add'>+	MT_HIF0 = 0x0,</div><div class='add'>+</div><div class='add'>+	MT_LMAC_AC00 = 0x0,</div><div class='add'>+	MT_LMAC_AC01,</div><div class='add'>+	MT_LMAC_AC02,</div><div class='add'>+	MT_LMAC_AC03,</div><div class='add'>+	MT_LMAC_ALTX0 = 0x10,</div><div class='add'>+	MT_LMAC_BMC0,</div><div class='add'>+	MT_LMAC_BCN0,</div><div class='add'>+	MT_LMAC_PSMP0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MT_CT_PARSE_LEN			72</div><div class='add'>+#define MT_CT_DMA_BUF_NUM		2</div><div class='add'>+</div><div class='add'>+#define MT_RXD0_LENGTH			GENMASK(15, 0)</div><div class='add'>+#define MT_RXD0_PKT_FLAG                GENMASK(19, 16)</div><div class='add'>+#define MT_RXD0_PKT_TYPE		GENMASK(31, 27)</div><div class='add'>+</div><div class='add'>+#define MT_RXD0_MESH			BIT(18)</div><div class='add'>+#define MT_RXD0_MHCP			BIT(19)</div><div class='add'>+#define MT_RXD0_NORMAL_ETH_TYPE_OFS	GENMASK(22, 16)</div><div class='add'>+</div><div class='add'>+#define MT_RXD0_SW_PKT_TYPE_MASK	GENMASK(31, 16)</div><div class='add'>+#define MT_RXD0_SW_PKT_TYPE_MAP		0x380F</div><div class='add'>+#define MT_RXD0_SW_PKT_TYPE_FRAME	0x3801</div><div class='add'>+</div><div class='add'>+/* RXD DW1 */</div><div class='add'>+#define MT_RXD1_NORMAL_WLAN_IDX		GENMASK(11, 0)</div><div class='add'>+#define MT_RXD1_NORMAL_GROUP_1		BIT(16)</div><div class='add'>+#define MT_RXD1_NORMAL_GROUP_2		BIT(17)</div><div class='add'>+#define MT_RXD1_NORMAL_GROUP_3		BIT(18)</div><div class='add'>+#define MT_RXD1_NORMAL_GROUP_4		BIT(19)</div><div class='add'>+#define MT_RXD1_NORMAL_GROUP_5		BIT(20)</div><div class='add'>+#define MT_RXD1_NORMAL_KEY_ID		GENMASK(22, 21)</div><div class='add'>+#define MT_RXD1_NORMAL_CM		BIT(23)</div><div class='add'>+#define MT_RXD1_NORMAL_CLM		BIT(24)</div><div class='add'>+#define MT_RXD1_NORMAL_ICV_ERR		BIT(25)</div><div class='add'>+#define MT_RXD1_NORMAL_TKIP_MIC_ERR	BIT(26)</div><div class='add'>+#define MT_RXD1_NORMAL_BAND_IDX		GENMASK(28, 27)</div><div class='add'>+#define MT_RXD1_NORMAL_SPP_EN		BIT(29)</div><div class='add'>+#define MT_RXD1_NORMAL_ADD_OM		BIT(30)</div><div class='add'>+#define MT_RXD1_NORMAL_SEC_DONE		BIT(31)</div><div class='add'>+</div><div class='add'>+/* RXD DW2 */</div><div class='add'>+#define MT_RXD2_NORMAL_BSSID		GENMASK(5, 0)</div><div class='add'>+#define MT_RXD2_NORMAL_MAC_HDR_LEN	GENMASK(12, 8)</div><div class='add'>+#define MT_RXD2_NORMAL_HDR_TRANS	BIT(7)</div><div class='add'>+#define MT_RXD2_NORMAL_HDR_OFFSET	GENMASK(15, 13)</div><div class='add'>+#define MT_RXD2_NORMAL_SEC_MODE		GENMASK(20, 16)</div><div class='add'>+#define MT_RXD2_NORMAL_MU_BAR		BIT(21)</div><div class='add'>+#define MT_RXD2_NORMAL_SW_BIT		BIT(22)</div><div class='add'>+#define MT_RXD2_NORMAL_AMSDU_ERR	BIT(23)</div><div class='add'>+#define MT_RXD2_NORMAL_MAX_LEN_ERROR	BIT(24)</div><div class='add'>+#define MT_RXD2_NORMAL_HDR_TRANS_ERROR	BIT(25)</div><div class='add'>+#define MT_RXD2_NORMAL_INT_FRAME	BIT(26)</div><div class='add'>+#define MT_RXD2_NORMAL_FRAG		BIT(27)</div><div class='add'>+#define MT_RXD2_NORMAL_NULL_FRAME	BIT(28)</div><div class='add'>+#define MT_RXD2_NORMAL_NDATA		BIT(29)</div><div class='add'>+#define MT_RXD2_NORMAL_NON_AMPDU	BIT(30)</div><div class='add'>+#define MT_RXD2_NORMAL_BF_REPORT	BIT(31)</div><div class='add'>+</div><div class='add'>+/* RXD DW3 */</div><div class='add'>+#define MT_RXD3_NORMAL_RXV_SEQ		GENMASK(7, 0)</div><div class='add'>+#define MT_RXD3_NORMAL_CH_FREQ		GENMASK(15, 8)</div><div class='add'>+#define MT_RXD3_NORMAL_ADDR_TYPE	GENMASK(17, 16)</div><div class='add'>+#define MT_RXD3_NORMAL_U2M		BIT(0)</div><div class='add'>+#define MT_RXD3_NORMAL_HTC_VLD		BIT(18)</div><div class='add'>+#define MT_RXD3_NORMAL_BEACON_MC	BIT(20)</div><div class='add'>+#define MT_RXD3_NORMAL_BEACON_UC	BIT(21)</div><div class='add'>+#define MT_RXD3_NORMAL_CO_ANT		BIT(22)</div><div class='add'>+#define MT_RXD3_NORMAL_FCS_ERR		BIT(24)</div><div class='add'>+#define MT_RXD3_NORMAL_IP_SUM		BIT(26)</div><div class='add'>+#define MT_RXD3_NORMAL_UDP_TCP_SUM	BIT(27)</div><div class='add'>+#define MT_RXD3_NORMAL_VLAN2ETH		BIT(31)</div><div class='add'>+</div><div class='add'>+/* RXD DW4 */</div><div class='add'>+#define MT_RXD4_NORMAL_PAYLOAD_FORMAT	GENMASK(1, 0)</div><div class='add'>+#define MT_RXD4_FIRST_AMSDU_FRAME	GENMASK(1, 0)</div><div class='add'>+#define MT_RXD4_MID_AMSDU_FRAME		BIT(1)</div><div class='add'>+#define MT_RXD4_LAST_AMSDU_FRAME	BIT(0)</div><div class='add'>+</div><div class='add'>+#define MT_RXV_HDR_BAND_IDX		BIT(24)</div><div class='add'>+</div><div class='add'>+/* RXD GROUP4 */</div><div class='add'>+#define MT_RXD8_FRAME_CONTROL		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define MT_RXD10_SEQ_CTRL		GENMASK(15, 0)</div><div class='add'>+#define MT_RXD10_QOS_CTL		GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define MT_RXD11_HT_CONTROL		GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+/* P-RXV */</div><div class='add'>+#define MT_PRXV_TX_RATE			GENMASK(6, 0)</div><div class='add'>+#define MT_PRXV_TX_DCM			BIT(4)</div><div class='add'>+#define MT_PRXV_TX_ER_SU_106T		BIT(5)</div><div class='add'>+#define MT_PRXV_NSTS			GENMASK(10, 7)</div><div class='add'>+#define MT_PRXV_TXBF			BIT(11)</div><div class='add'>+#define MT_PRXV_HT_AD_CODE		BIT(12)</div><div class='add'>+#define MT_PRXV_HE_RU_ALLOC		GENMASK(30, 22)</div><div class='add'>+#define MT_PRXV_RCPI3			GENMASK(31, 24)</div><div class='add'>+#define MT_PRXV_RCPI2			GENMASK(23, 16)</div><div class='add'>+#define MT_PRXV_RCPI1			GENMASK(15, 8)</div><div class='add'>+#define MT_PRXV_RCPI0			GENMASK(7, 0)</div><div class='add'>+#define MT_PRXV_HT_SHORT_GI		GENMASK(4, 3)</div><div class='add'>+#define MT_PRXV_HT_STBC			GENMASK(10, 9)</div><div class='add'>+#define MT_PRXV_TX_MODE			GENMASK(14, 11)</div><div class='add'>+#define MT_PRXV_FRAME_MODE		GENMASK(2, 0)</div><div class='add'>+#define MT_PRXV_DCM			BIT(5)</div><div class='add'>+</div><div class='add'>+/* C-RXV */</div><div class='add'>+#define MT_CRXV_HE_NUM_USER		GENMASK(26, 20)</div><div class='add'>+#define MT_CRXV_HE_LTF_SIZE		GENMASK(28, 27)</div><div class='add'>+#define MT_CRXV_HE_LDPC_EXT_SYM		BIT(30)</div><div class='add'>+</div><div class='add'>+#define MT_CRXV_HE_PE_DISAMBIG		BIT(1)</div><div class='add'>+#define MT_CRXV_HE_UPLINK		BIT(2)</div><div class='add'>+</div><div class='add'>+#define MT_CRXV_HE_MU_AID		GENMASK(27, 17)</div><div class='add'>+#define MT_CRXV_HE_BEAM_CHNG		BIT(29)</div><div class='add'>+</div><div class='add'>+#define MT_CRXV_HE_DOPPLER		BIT(0)</div><div class='add'>+#define MT_CRXV_HE_BSS_COLOR		GENMASK(15, 10)</div><div class='add'>+#define MT_CRXV_HE_TXOP_DUR		GENMASK(19, 17)</div><div class='add'>+</div><div class='add'>+#define MT_CRXV_HE_SR_MASK		GENMASK(11, 8)</div><div class='add'>+#define MT_CRXV_HE_SR1_MASK		GENMASK(16, 12)</div><div class='add'>+#define MT_CRXV_HE_SR2_MASK             GENMASK(20, 17)</div><div class='add'>+#define MT_CRXV_HE_SR3_MASK             GENMASK(24, 21)</div><div class='add'>+</div><div class='add'>+#define MT_CRXV_HE_RU0			GENMASK(8, 0)</div><div class='add'>+#define MT_CRXV_HE_RU1			GENMASK(17, 9)</div><div class='add'>+#define MT_CRXV_HE_RU2			GENMASK(26, 18)</div><div class='add'>+#define MT_CRXV_HE_RU3_L		GENMASK(31, 27)</div><div class='add'>+#define MT_CRXV_HE_RU3_H		GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+#define MT_CRXV_EHT_NUM_USER		GENMASK(26, 20)</div><div class='add'>+#define MT_CRXV_EHT_LTF_SIZE		GENMASK(28, 27)</div><div class='add'>+#define MT_CRXV_EHT_LDPC_EXT_SYM	BIT(30)</div><div class='add'>+#define MT_CRXV_EHT_PE_DISAMBIG		BIT(1)</div><div class='add'>+#define MT_CRXV_EHT_UPLINK		BIT(2)</div><div class='add'>+#define MT_CRXV_EHT_MU_AID		GENMASK(27, 17)</div><div class='add'>+#define MT_CRXV_EHT_BEAM_CHNG		BIT(29)</div><div class='add'>+#define MT_CRXV_EHT_DOPPLER		BIT(0)</div><div class='add'>+#define MT_CRXV_EHT_BSS_COLOR		GENMASK(15, 10)</div><div class='add'>+#define MT_CRXV_EHT_TXOP_DUR		GENMASK(23, 17)</div><div class='add'>+#define MT_CRXV_EHT_SR_MASK		GENMASK(11, 8)</div><div class='add'>+#define MT_CRXV_EHT_SR1_MASK		GENMASK(15, 12)</div><div class='add'>+#define MT_CRXV_EHT_SR2_MASK		GENMASK(19, 16)</div><div class='add'>+#define MT_CRXV_EHT_SR3_MASK		GENMASK(23, 20)</div><div class='add'>+#define MT_CRXV_EHT_RU0			GENMASK(8, 0)</div><div class='add'>+#define MT_CRXV_EHT_RU1			GENMASK(17, 9)</div><div class='add'>+#define MT_CRXV_EHT_RU2			GENMASK(26, 18)</div><div class='add'>+#define MT_CRXV_EHT_RU3_L		GENMASK(31, 27)</div><div class='add'>+#define MT_CRXV_EHT_RU3_H		GENMASK(3, 0)</div><div class='add'>+#define MT_CRXV_EHT_SIG_MCS		GENMASK(19, 18)</div><div class='add'>+#define MT_CRXV_EHT_LTF_SYM		GENMASK(22, 20)</div><div class='add'>+</div><div class='add'>+enum tx_header_format {</div><div class='add'>+	MT_HDR_FORMAT_802_3,</div><div class='add'>+	MT_HDR_FORMAT_CMD,</div><div class='add'>+	MT_HDR_FORMAT_802_11,</div><div class='add'>+	MT_HDR_FORMAT_802_11_EXT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum tx_pkt_type {</div><div class='add'>+	MT_TX_TYPE_CT,</div><div class='add'>+	MT_TX_TYPE_SF,</div><div class='add'>+	MT_TX_TYPE_CMD,</div><div class='add'>+	MT_TX_TYPE_FW,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum tx_port_idx {</div><div class='add'>+	MT_TX_PORT_IDX_LMAC,</div><div class='add'>+	MT_TX_PORT_IDX_MCU</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum tx_mcu_port_q_idx {</div><div class='add'>+	MT_TX_MCU_PORT_RX_Q0 = 0x20,</div><div class='add'>+	MT_TX_MCU_PORT_RX_Q1,</div><div class='add'>+	MT_TX_MCU_PORT_RX_Q2,</div><div class='add'>+	MT_TX_MCU_PORT_RX_Q3,</div><div class='add'>+	MT_TX_MCU_PORT_RX_FWDL = 0x3e</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum tx_mgnt_type {</div><div class='add'>+	MT_TX_NORMAL,</div><div class='add'>+	MT_TX_TIMING,</div><div class='add'>+	MT_TX_ADDBA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum tx_frag_idx {</div><div class='add'>+	MT_TX_FRAG_NONE,</div><div class='add'>+	MT_TX_FRAG_FIRST,</div><div class='add'>+	MT_TX_FRAG_MID,</div><div class='add'>+	MT_TX_FRAG_LAST</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MT_CT_INFO_APPLY_TXD		BIT(0)</div><div class='add'>+#define MT_CT_INFO_COPY_HOST_TXD_ALL	BIT(1)</div><div class='add'>+#define MT_CT_INFO_MGMT_FRAME		BIT(2)</div><div class='add'>+#define MT_CT_INFO_NONE_CIPHER_FRAME	BIT(3)</div><div class='add'>+#define MT_CT_INFO_HSR2_TX		BIT(4)</div><div class='add'>+#define MT_CT_INFO_FROM_HOST		BIT(7)</div><div class='add'>+</div><div class='add'>+#define MT_TXD_SIZE			(8 * 4)</div><div class='add'>+</div><div class='add'>+#define MT_TXD0_Q_IDX			GENMASK(31, 25)</div><div class='add'>+#define MT_TXD0_PKT_FMT			GENMASK(24, 23)</div><div class='add'>+#define MT_TXD0_ETH_TYPE_OFFSET		GENMASK(22, 16)</div><div class='add'>+#define MT_TXD0_TX_BYTES		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXD1_FIXED_RATE		BIT(31)</div><div class='add'>+#define MT_TXD1_OWN_MAC			GENMASK(30, 25)</div><div class='add'>+#define MT_TXD1_TID			GENMASK(24, 21)</div><div class='add'>+#define MT_TXD1_BIP			BIT(24)</div><div class='add'>+#define MT_TXD1_ETH_802_3		BIT(20)</div><div class='add'>+#define MT_TXD1_HDR_INFO		GENMASK(20, 16)</div><div class='add'>+#define MT_TXD1_HDR_FORMAT		GENMASK(15, 14)</div><div class='add'>+#define MT_TXD1_TGID			GENMASK(13, 12)</div><div class='add'>+#define MT_TXD1_WLAN_IDX		GENMASK(11, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXD2_POWER_OFFSET		GENMASK(31, 26)</div><div class='add'>+#define MT_TXD2_MAX_TX_TIME		GENMASK(25, 16)</div><div class='add'>+#define MT_TXD2_FRAG			GENMASK(15, 14)</div><div class='add'>+#define MT_TXD2_HTC_VLD			BIT(13)</div><div class='add'>+#define MT_TXD2_DURATION		BIT(12)</div><div class='add'>+#define MT_TXD2_HDR_PAD			GENMASK(11, 10)</div><div class='add'>+#define MT_TXD2_RTS			BIT(9)</div><div class='add'>+#define MT_TXD2_OWN_MAC_MAP		BIT(8)</div><div class='add'>+#define MT_TXD2_BF_TYPE			GENMASK(6, 7)</div><div class='add'>+#define MT_TXD2_FRAME_TYPE		GENMASK(5, 4)</div><div class='add'>+#define MT_TXD2_SUB_TYPE		GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXD3_SN_VALID		BIT(31)</div><div class='add'>+#define MT_TXD3_PN_VALID		BIT(30)</div><div class='add'>+#define MT_TXD3_SW_POWER_MGMT		BIT(29)</div><div class='add'>+#define MT_TXD3_BA_DISABLE		BIT(28)</div><div class='add'>+#define MT_TXD3_SEQ			GENMASK(27, 16)</div><div class='add'>+#define MT_TXD3_REM_TX_COUNT		GENMASK(15, 11)</div><div class='add'>+#define MT_TXD3_TX_COUNT		GENMASK(10, 6)</div><div class='add'>+#define MT_TXD3_HW_AMSDU		BIT(5)</div><div class='add'>+#define MT_TXD3_BCM			BIT(4)</div><div class='add'>+#define MT_TXD3_EEOSP			BIT(3)</div><div class='add'>+#define MT_TXD3_EMRD			BIT(2)</div><div class='add'>+#define MT_TXD3_PROTECT_FRAME		BIT(1)</div><div class='add'>+#define MT_TXD3_NO_ACK			BIT(0)</div><div class='add'>+</div><div class='add'>+#define MT_TXD4_PN_LOW			GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXD5_PN_HIGH			GENMASK(31, 16)</div><div class='add'>+#define MT_TXD5_FL			BIT(15)</div><div class='add'>+#define MT_TXD5_BYPASS_TBB		BIT(14)</div><div class='add'>+#define MT_TXD5_BYPASS_RBB		BIT(13)</div><div class='add'>+#define MT_TXD5_BSS_COLOR_ZERO		BIT(12)</div><div class='add'>+#define MT_TXD5_TX_STATUS_HOST		BIT(10)</div><div class='add'>+#define MT_TXD5_TX_STATUS_MCU		BIT(9)</div><div class='add'>+#define MT_TXD5_TX_STATUS_FMT		BIT(8)</div><div class='add'>+#define MT_TXD5_PID			GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXD6_TX_SRC			GENMASK(31, 30)</div><div class='add'>+#define MT_TXD6_VTA			BIT(28)</div><div class='add'>+#define MT_TXD6_FIXED_BW		BIT(25)</div><div class='add'>+#define MT_TXD6_BW			GENMASK(24, 22)</div><div class='add'>+#define MT_TXD6_TX_RATE			GENMASK(21, 16)</div><div class='add'>+#define MT_TXD6_TIMESTAMP_OFS_EN	BIT(15)</div><div class='add'>+#define MT_TXD6_TIMESTAMP_OFS_IDX	GENMASK(14, 10)</div><div class='add'>+#define MT_TXD6_TID_ADDBA		GENMASK(10, 8)</div><div class='add'>+#define MT_TXD6_MSDU_CNT		GENMASK(9, 4)</div><div class='add'>+#define MT_TXD6_MSDU_CNT_V2		GENMASK(15, 10)</div><div class='add'>+#define MT_TXD6_DIS_MAT			BIT(3)</div><div class='add'>+#define MT_TXD6_DAS			BIT(2)</div><div class='add'>+#define MT_TXD6_AMSDU_CAP		BIT(1)</div><div class='add'>+</div><div class='add'>+#define MT_TXD7_TXD_LEN			GENMASK(31, 30)</div><div class='add'>+#define MT_TXD7_IP_SUM			BIT(29)</div><div class='add'>+#define MT_TXD7_DROP_BY_SDO		BIT(28)</div><div class='add'>+#define MT_TXD7_MAC_TXD			BIT(27)</div><div class='add'>+#define MT_TXD7_CTXD			BIT(26)</div><div class='add'>+#define MT_TXD7_CTXD_CNT		GENMASK(25, 22)</div><div class='add'>+#define MT_TXD7_UDP_TCP_SUM		BIT(15)</div><div class='add'>+#define MT_TXD7_TX_TIME			GENMASK(9, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXD9_WLAN_IDX		GENMASK(23, 8)</div><div class='add'>+</div><div class='add'>+#define MT_TXP_BUF_LEN			GENMASK(11, 0)</div><div class='add'>+#define MT_TXP_DMA_ADDR_H		GENMASK(15, 12)</div><div class='add'>+</div><div class='add'>+#define MT_TXP0_TOKEN_ID0		GENMASK(14, 0)</div><div class='add'>+#define MT_TXP0_TOKEN_ID0_VALID_MASK	BIT(15)</div><div class='add'>+</div><div class='add'>+#define MT_TXP1_TID_ADDBA		GENMASK(14, 12)</div><div class='add'>+#define MT_TXP3_ML0_MASK		BIT(15)</div><div class='add'>+#define MT_TXP3_DMA_ADDR_H		GENMASK(13, 12)</div><div class='add'>+</div><div class='add'>+#define MT_TX_RATE_STBC			BIT(14)</div><div class='add'>+#define MT_TX_RATE_NSS			GENMASK(13, 10)</div><div class='add'>+#define MT_TX_RATE_MODE			GENMASK(9, 6)</div><div class='add'>+#define MT_TX_RATE_SU_EXT_TONE		BIT(5)</div><div class='add'>+#define MT_TX_RATE_DCM			BIT(4)</div><div class='add'>+/* VHT/HE only use bits 0-3 */</div><div class='add'>+#define MT_TX_RATE_IDX			GENMASK(5, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXFREE0_PKT_TYPE		GENMASK(31, 27)</div><div class='add'>+#define MT_TXFREE0_MSDU_CNT		GENMASK(25, 16)</div><div class='add'>+#define MT_TXFREE0_RX_BYTE		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXFREE1_VER			GENMASK(19, 16)</div><div class='add'>+</div><div class='add'>+#define MT_TXFREE_INFO_PAIR		BIT(31)</div><div class='add'>+#define MT_TXFREE_INFO_HEADER		BIT(30)</div><div class='add'>+#define MT_TXFREE_INFO_WLAN_ID		GENMASK(23, 12)</div><div class='add'>+#define MT_TXFREE_INFO_MSDU_ID		GENMASK(14, 0)</div><div class='add'>+#define MT_TXFREE_INFO_COUNT		GENMASK(27, 24)</div><div class='add'>+#define MT_TXFREE_INFO_STAT		GENMASK(29, 28)</div><div class='add'>+</div><div class='add'>+#define MT_TXS_HDR_SIZE			4 /* Unit: DW */</div><div class='add'>+#define MT_TXS_SIZE			12 /* Unit: DW */</div><div class='add'>+</div><div class='add'>+#define MT_TXS0_BW			GENMASK(31, 29)</div><div class='add'>+#define MT_TXS0_TID			GENMASK(28, 26)</div><div class='add'>+#define MT_TXS0_AMPDU			BIT(25)</div><div class='add'>+#define MT_TXS0_TXS_FORMAT		GENMASK(24, 23)</div><div class='add'>+#define MT_TXS0_BA_ERROR		BIT(22)</div><div class='add'>+#define MT_TXS0_PS_FLAG			BIT(21)</div><div class='add'>+#define MT_TXS0_TXOP_TIMEOUT		BIT(20)</div><div class='add'>+#define MT_TXS0_BIP_ERROR		BIT(19)</div><div class='add'>+</div><div class='add'>+#define MT_TXS0_QUEUE_TIMEOUT		BIT(18)</div><div class='add'>+#define MT_TXS0_RTS_TIMEOUT		BIT(17)</div><div class='add'>+#define MT_TXS0_ACK_TIMEOUT		BIT(16)</div><div class='add'>+#define MT_TXS0_ACK_ERROR_MASK		GENMASK(18, 16)</div><div class='add'>+</div><div class='add'>+#define MT_TXS0_TX_STATUS_HOST		BIT(15)</div><div class='add'>+#define MT_TXS0_TX_STATUS_MCU		BIT(14)</div><div class='add'>+#define MT_TXS0_TX_RATE			GENMASK(13, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS1_SEQNO			GENMASK(31, 20)</div><div class='add'>+#define MT_TXS1_RESP_RATE		GENMASK(19, 16)</div><div class='add'>+#define MT_TXS1_RXV_SEQNO		GENMASK(15, 8)</div><div class='add'>+#define MT_TXS1_TX_POWER_DBM		GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS2_BF_STATUS		GENMASK(31, 30)</div><div class='add'>+#define MT_TXS2_BAND			GENMASK(29, 28)</div><div class='add'>+#define MT_TXS2_WCID			GENMASK(27, 16)</div><div class='add'>+#define MT_TXS2_TX_DELAY		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS3_PID			GENMASK(31, 24)</div><div class='add'>+#define MT_TXS3_RATE_STBC		BIT(7)</div><div class='add'>+#define MT_TXS3_FIXED_RATE		BIT(6)</div><div class='add'>+#define MT_TXS3_SRC			GENMASK(5, 4)</div><div class='add'>+#define MT_TXS3_SHARED_ANTENNA		BIT(3)</div><div class='add'>+#define MT_TXS3_LAST_TX_RATE		GENMASK(2, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS4_TIMESTAMP		GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+/* MPDU based TXS */</div><div class='add'>+#define MT_TXS5_F0_FINAL_MPDU		BIT(31)</div><div class='add'>+#define MT_TXS5_F0_QOS			BIT(30)</div><div class='add'>+#define MT_TXS5_F0_TX_COUNT		GENMASK(29, 25)</div><div class='add'>+#define MT_TXS5_F0_FRONT_TIME		GENMASK(24, 0)</div><div class='add'>+#define MT_TXS5_F1_MPDU_TX_COUNT	GENMASK(31, 24)</div><div class='add'>+#define MT_TXS5_F1_MPDU_TX_BYTES	GENMASK(23, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS6_F0_NOISE_3		GENMASK(31, 24)</div><div class='add'>+#define MT_TXS6_F0_NOISE_2		GENMASK(23, 16)</div><div class='add'>+#define MT_TXS6_F0_NOISE_1		GENMASK(15, 8)</div><div class='add'>+#define MT_TXS6_F0_NOISE_0		GENMASK(7, 0)</div><div class='add'>+#define MT_TXS6_F1_MPDU_FAIL_COUNT	GENMASK(31, 24)</div><div class='add'>+#define MT_TXS6_F1_MPDU_FAIL_BYTES	GENMASK(23, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS7_F0_RCPI_3		GENMASK(31, 24)</div><div class='add'>+#define MT_TXS7_F0_RCPI_2		GENMASK(23, 16)</div><div class='add'>+#define MT_TXS7_F0_RCPI_1		GENMASK(15, 8)</div><div class='add'>+#define MT_TXS7_F0_RCPI_0		GENMASK(7, 0)</div><div class='add'>+#define MT_TXS7_F1_MPDU_RETRY_COUNT	GENMASK(31, 24)</div><div class='add'>+#define MT_TXS7_F1_MPDU_RETRY_BYTES	GENMASK(23, 0)</div><div class='add'>+</div><div class='add'>+/* PPDU based TXS */</div><div class='add'>+#define MT_TXS5_MPDU_TX_CNT		GENMASK(30, 20)</div><div class='add'>+#define MT_TXS5_MPDU_TX_BYTE_SCALE	BIT(15)</div><div class='add'>+#define MT_TXS5_MPDU_TX_BYTE		GENMASK(14, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS6_MPDU_FAIL_CNT		GENMASK(30, 20)</div><div class='add'>+#define MT_TXS6_MPDU_FAIL_BYTE_SCALE	BIT(15)</div><div class='add'>+#define MT_TXS6_MPDU_FAIL_BYTE		GENMASK(14, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS7_MPDU_RETRY_CNT		GENMASK(30, 20)</div><div class='add'>+#define MT_TXS7_MPDU_RETRY_BYTE_SCALE	BIT(15)</div><div class='add'>+#define MT_TXS7_MPDU_RETRY_BYTE		GENMASK(14, 0)</div><div class='add'>+</div><div class='add'>+#endif /* __MT76_CONNAC3_MAC_H */</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c<br/>index 6f180c92d413..3304b5971be0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c</a></div><div class='hunk'>@@ -1,22 +1,52 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #include "mt76_connac.h"</div><div class='add'>+#include "mt76_connac2_mac.h"</div><div class='add'>+#include "dma.h"</div><div class='add'>+</div><div class='add'>+#define HE_BITS(f)		cpu_to_le16(IEEE80211_RADIOTAP_HE_##f)</div><div class='add'>+#define HE_PREP(f, m, v)	le16_encode_bits(le32_get_bits(v, MT_CRXV_HE_##m),\</div><div class='add'>+						 IEEE80211_RADIOTAP_HE_##f)</div><div class='add'>+</div><div class='add'>+void mt76_connac_gen_ppe_thresh(u8 *he_ppet, int nss, enum nl80211_band band)</div><div class='add'>+{</div><div class='add'>+	static const u8 ppet16_ppet8_ru3_ru0[] = { 0x1c, 0xc7, 0x71 };</div><div class='add'>+	u8 i, ppet_bits, ppet_size, ru_bit_mask = 0xf;</div><div class='add'>+</div><div class='add'>+	if (band == NL80211_BAND_2GHZ)</div><div class='add'>+		ru_bit_mask = 0x3;</div><div class='add'>+</div><div class='add'>+	he_ppet[0] = FIELD_PREP(IEEE80211_PPE_THRES_NSS_MASK, nss - 1) |</div><div class='add'>+		     FIELD_PREP(IEEE80211_PPE_THRES_RU_INDEX_BITMASK_MASK,</div><div class='add'>+				ru_bit_mask);</div><div class='add'>+</div><div class='add'>+	ppet_bits = IEEE80211_PPE_THRES_INFO_PPET_SIZE *</div><div class='add'>+		    nss * hweight8(ru_bit_mask) * 2;</div><div class='add'>+	ppet_size = DIV_ROUND_UP(ppet_bits, 8);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ppet_size - 1; i++)</div><div class='add'>+		he_ppet[i + 1] = ppet16_ppet8_ru3_ru0[i % 3];</div><div class='add'>+</div><div class='add'>+	he_ppet[i + 1] = ppet16_ppet8_ru3_ru0[i % 3] &amp;</div><div class='add'>+			 (0xff &gt;&gt; (8 - (ppet_bits - 1) % 8));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_gen_ppe_thresh);</div><div class='ctx'> </div><div class='ctx'> int mt76_connac_pm_wake(struct mt76_phy *phy, struct mt76_connac_pm *pm)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_dev *dev = phy-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	if (!pm-&gt;enable)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!mt76_is_mmio(dev))</div><div class='add'>+	if (mt76_is_usb(dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	cancel_delayed_work_sync(&amp;pm-&gt;ps_work);</div><div class='ctx'> 	if (!test_bit(MT76_STATE_PM, &amp;phy-&gt;state))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	if (pm-&gt;suspended)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	queue_work(dev-&gt;wq, &amp;pm-&gt;wake_work);</div><div class='ctx'> 	if (!wait_event_timeout(pm-&gt;wait,</div><div class='ctx'> 				!test_bit(MT76_STATE_PM, &amp;phy-&gt;state),</div><div class='hunk'>@@ -34,12 +64,15 @@ void mt76_connac_power_save_sched(struct mt76_phy *phy,</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_dev *dev = phy-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	if (!mt76_is_mmio(dev))</div><div class='add'>+	if (mt76_is_usb(dev))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!pm-&gt;enable)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (pm-&gt;suspended)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	pm-&gt;last_activity = jiffies;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(MT76_STATE_PM, &amp;phy-&gt;state)) {</div><div class='hunk'>@@ -112,3 +145,1066 @@ void mt76_connac_pm_dequeue_skbs(struct mt76_phy *phy,</div><div class='ctx'> 	mt76_worker_schedule(&amp;phy-&gt;dev-&gt;tx_worker);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_pm_dequeue_skbs);</div><div class='add'>+</div><div class='add'>+void mt76_connac_tx_complete_skb(struct mt76_dev *mdev,</div><div class='add'>+				 struct mt76_queue_entry *e)</div><div class='add'>+{</div><div class='add'>+	if (!e-&gt;txwi) {</div><div class='add'>+		dev_kfree_skb_any(e-&gt;skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (e-&gt;skb)</div><div class='add'>+		mt76_tx_complete_skb(mdev, e-&gt;wcid, e-&gt;skb);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_tx_complete_skb);</div><div class='add'>+</div><div class='add'>+void mt76_connac_write_hw_txp(struct mt76_dev *dev,</div><div class='add'>+			      struct mt76_tx_info *tx_info,</div><div class='add'>+			      void *txp_ptr, u32 id)</div><div class='add'>+{</div><div class='add'>+	struct mt76_connac_hw_txp *txp = txp_ptr;</div><div class='add'>+	struct mt76_connac_txp_ptr *ptr = &amp;txp-&gt;ptr[0];</div><div class='add'>+	int i, nbuf = tx_info-&gt;nbuf - 1;</div><div class='add'>+	u32 last_mask;</div><div class='add'>+</div><div class='add'>+	tx_info-&gt;buf[0].len = MT_TXD_SIZE + sizeof(*txp);</div><div class='add'>+	tx_info-&gt;nbuf = 1;</div><div class='add'>+</div><div class='add'>+	txp-&gt;msdu_id[0] = cpu_to_le16(id | MT_MSDU_ID_VALID);</div><div class='add'>+</div><div class='add'>+	if (is_mt7663(dev) || is_mt7921(dev) || is_mt7925(dev))</div><div class='add'>+		last_mask = MT_TXD_LEN_LAST;</div><div class='add'>+	else</div><div class='add'>+		last_mask = MT_TXD_LEN_AMSDU_LAST |</div><div class='add'>+			    MT_TXD_LEN_MSDU_LAST;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nbuf; i++) {</div><div class='add'>+		u16 len = tx_info-&gt;buf[i + 1].len &amp; MT_TXD_LEN_MASK;</div><div class='add'>+		u32 addr = tx_info-&gt;buf[i + 1].addr;</div><div class='add'>+</div><div class='add'>+		if (i == nbuf - 1)</div><div class='add'>+			len |= last_mask;</div><div class='add'>+</div><div class='add'>+		if (i &amp; 1) {</div><div class='add'>+			ptr-&gt;buf1 = cpu_to_le32(addr);</div><div class='add'>+			ptr-&gt;len1 = cpu_to_le16(len);</div><div class='add'>+			ptr++;</div><div class='add'>+		} else {</div><div class='add'>+			ptr-&gt;buf0 = cpu_to_le32(addr);</div><div class='add'>+			ptr-&gt;len0 = cpu_to_le16(len);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_write_hw_txp);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt76_connac_txp_skb_unmap_fw(struct mt76_dev *mdev,</div><div class='add'>+			     struct mt76_connac_fw_txp *txp)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = is_connac_v1(mdev) ? mdev-&gt;dev : mdev-&gt;dma_dev;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; txp-&gt;nbuf; i++)</div><div class='add'>+		dma_unmap_single(dev, le32_to_cpu(txp-&gt;buf[i]),</div><div class='add'>+				 le16_to_cpu(txp-&gt;len[i]), DMA_TO_DEVICE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt76_connac_txp_skb_unmap_hw(struct mt76_dev *dev,</div><div class='add'>+			     struct mt76_connac_hw_txp *txp)</div><div class='add'>+{</div><div class='add'>+	u32 last_mask;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (is_mt7663(dev) || is_mt7921(dev) || is_mt7925(dev))</div><div class='add'>+		last_mask = MT_TXD_LEN_LAST;</div><div class='add'>+	else</div><div class='add'>+		last_mask = MT_TXD_LEN_MSDU_LAST;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(txp-&gt;ptr); i++) {</div><div class='add'>+		struct mt76_connac_txp_ptr *ptr = &amp;txp-&gt;ptr[i];</div><div class='add'>+		bool last;</div><div class='add'>+		u16 len;</div><div class='add'>+</div><div class='add'>+		len = le16_to_cpu(ptr-&gt;len0);</div><div class='add'>+		last = len &amp; last_mask;</div><div class='add'>+		len &amp;= MT_TXD_LEN_MASK;</div><div class='add'>+		dma_unmap_single(dev-&gt;dev, le32_to_cpu(ptr-&gt;buf0), len,</div><div class='add'>+				 DMA_TO_DEVICE);</div><div class='add'>+		if (last)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		len = le16_to_cpu(ptr-&gt;len1);</div><div class='add'>+		last = len &amp; last_mask;</div><div class='add'>+		len &amp;= MT_TXD_LEN_MASK;</div><div class='add'>+		dma_unmap_single(dev-&gt;dev, le32_to_cpu(ptr-&gt;buf1), len,</div><div class='add'>+				 DMA_TO_DEVICE);</div><div class='add'>+		if (last)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt76_connac_txp_skb_unmap(struct mt76_dev *dev,</div><div class='add'>+			       struct mt76_txwi_cache *t)</div><div class='add'>+{</div><div class='add'>+	struct mt76_connac_txp_common *txp;</div><div class='add'>+</div><div class='add'>+	txp = mt76_connac_txwi_to_txp(dev, t);</div><div class='add'>+	if (is_mt76_fw_txp(dev))</div><div class='add'>+		mt76_connac_txp_skb_unmap_fw(dev, &amp;txp-&gt;fw);</div><div class='add'>+	else</div><div class='add'>+		mt76_connac_txp_skb_unmap_hw(dev, &amp;txp-&gt;hw);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_txp_skb_unmap);</div><div class='add'>+</div><div class='add'>+int mt76_connac_init_tx_queues(struct mt76_phy *phy, int idx, int n_desc,</div><div class='add'>+			       int ring_base, void *wed, u32 flags)</div><div class='add'>+{</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	err = mt76_init_tx_queue(phy, 0, idx, n_desc, ring_base,</div><div class='add'>+				 wed, flags);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt;= MT_TXQ_PSD; i++)</div><div class='add'>+		phy-&gt;q_tx[i] = phy-&gt;q_tx[0];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_init_tx_queues);</div><div class='add'>+</div><div class='add'>+#define __bitrate_mask_check(_mcs, _mode)				\</div><div class='add'>+({									\</div><div class='add'>+	u8 i = 0;							\</div><div class='add'>+	for (nss = 0; i &lt; ARRAY_SIZE(mask-&gt;control[band]._mcs); i++) {	\</div><div class='add'>+		if (!mask-&gt;control[band]._mcs[i])			\</div><div class='add'>+			continue;					\</div><div class='add'>+		if (hweight16(mask-&gt;control[band]._mcs[i]) == 1) {	\</div><div class='add'>+			mode = MT_PHY_TYPE_##_mode;			\</div><div class='add'>+			rateidx = ffs(mask-&gt;control[band]._mcs[i]) - 1;	\</div><div class='add'>+			if (mode == MT_PHY_TYPE_HT)			\</div><div class='add'>+				rateidx += 8 * i;			\</div><div class='add'>+			else						\</div><div class='add'>+				nss = i + 1;				\</div><div class='add'>+			goto out;					\</div><div class='add'>+		}							\</div><div class='add'>+	}								\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+u16 mt76_connac2_mac_tx_rate_val(struct mt76_phy *mphy,</div><div class='add'>+				 struct ieee80211_bss_conf *conf,</div><div class='add'>+				 bool beacon, bool mcast)</div><div class='add'>+{</div><div class='add'>+	u8 nss = 0, mode = 0, band = NL80211_BAND_2GHZ;</div><div class='add'>+	int rateidx = 0, offset = 0, mcast_rate;</div><div class='add'>+	struct cfg80211_chan_def *chandef;</div><div class='add'>+	struct mt76_vif_link *mvif;</div><div class='add'>+</div><div class='add'>+	if (!conf)</div><div class='add'>+		goto legacy;</div><div class='add'>+</div><div class='add'>+	mvif = mt76_vif_conf_link(mphy-&gt;dev, conf-&gt;vif, conf);</div><div class='add'>+	chandef = mvif-&gt;ctx ? &amp;mvif-&gt;ctx-&gt;def : &amp;mphy-&gt;chandef;</div><div class='add'>+	band = chandef-&gt;chan-&gt;band;</div><div class='add'>+</div><div class='add'>+	if (is_mt7921(mphy-&gt;dev)) {</div><div class='add'>+		rateidx = ffs(conf-&gt;basic_rates) - 1;</div><div class='add'>+		goto legacy;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (beacon) {</div><div class='add'>+		struct cfg80211_bitrate_mask *mask;</div><div class='add'>+</div><div class='add'>+		mask = &amp;conf-&gt;beacon_tx_rate;</div><div class='add'>+</div><div class='add'>+		__bitrate_mask_check(he_mcs, HE_SU);</div><div class='add'>+		__bitrate_mask_check(vht_mcs, VHT);</div><div class='add'>+		__bitrate_mask_check(ht_mcs, HT);</div><div class='add'>+</div><div class='add'>+		if (hweight32(mask-&gt;control[band].legacy) == 1) {</div><div class='add'>+			rateidx = ffs(mask-&gt;control[band].legacy) - 1;</div><div class='add'>+			goto legacy;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mcast_rate = conf-&gt;mcast_rate[band];</div><div class='add'>+	if (mcast &amp;&amp; mcast_rate &gt; 0)</div><div class='add'>+		rateidx = mcast_rate - 1;</div><div class='add'>+	else</div><div class='add'>+		rateidx = ffs(conf-&gt;basic_rates) - 1;</div><div class='add'>+</div><div class='add'>+legacy:</div><div class='add'>+	if (band != NL80211_BAND_2GHZ)</div><div class='add'>+		offset = 4;</div><div class='add'>+</div><div class='add'>+	/* pick the lowest rate for hidden nodes */</div><div class='add'>+	if (rateidx &lt; 0)</div><div class='add'>+		rateidx = 0;</div><div class='add'>+</div><div class='add'>+	rateidx += offset;</div><div class='add'>+	if (rateidx &gt;= ARRAY_SIZE(mt76_rates))</div><div class='add'>+		rateidx = offset;</div><div class='add'>+</div><div class='add'>+	rateidx = mt76_rates[rateidx].hw_value;</div><div class='add'>+	mode = rateidx &gt;&gt; 8;</div><div class='add'>+	rateidx &amp;= GENMASK(7, 0);</div><div class='add'>+out:</div><div class='add'>+	return FIELD_PREP(MT_TX_RATE_NSS, nss) |</div><div class='add'>+	       FIELD_PREP(MT_TX_RATE_IDX, rateidx) |</div><div class='add'>+	       FIELD_PREP(MT_TX_RATE_MODE, mode);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac2_mac_tx_rate_val);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt76_connac2_mac_write_txwi_8023(__le32 *txwi, struct sk_buff *skb,</div><div class='add'>+				 struct mt76_wcid *wcid)</div><div class='add'>+{</div><div class='add'>+	u8 tid = skb-&gt;priority &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='add'>+	u8 fc_type, fc_stype;</div><div class='add'>+	u16 ethertype;</div><div class='add'>+	bool wmm = false;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (wcid-&gt;sta) {</div><div class='add'>+		struct ieee80211_sta *sta;</div><div class='add'>+</div><div class='add'>+		sta = container_of((void *)wcid, struct ieee80211_sta, drv_priv);</div><div class='add'>+		wmm = sta-&gt;wme;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD1_HDR_FORMAT, MT_HDR_FORMAT_802_3) |</div><div class='add'>+	      FIELD_PREP(MT_TXD1_TID, tid);</div><div class='add'>+</div><div class='add'>+	ethertype = get_unaligned_be16(&amp;skb-&gt;data[12]);</div><div class='add'>+	if (ethertype &gt;= ETH_P_802_3_MIN)</div><div class='add'>+		val |= MT_TXD1_ETH_802_3;</div><div class='add'>+</div><div class='add'>+	txwi[1] |= cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	fc_type = IEEE80211_FTYPE_DATA &gt;&gt; 2;</div><div class='add'>+	fc_stype = wmm ? IEEE80211_STYPE_QOS_DATA &gt;&gt; 4 : 0;</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD2_FRAME_TYPE, fc_type) |</div><div class='add'>+	      FIELD_PREP(MT_TXD2_SUB_TYPE, fc_stype);</div><div class='add'>+</div><div class='add'>+	txwi[2] |= cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD7_TYPE, fc_type) |</div><div class='add'>+	      FIELD_PREP(MT_TXD7_SUB_TYPE, fc_stype);</div><div class='add'>+</div><div class='add'>+	txwi[7] |= cpu_to_le32(val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt76_connac2_mac_write_txwi_80211(struct mt76_dev *dev, __le32 *txwi,</div><div class='add'>+				  struct sk_buff *skb,</div><div class='add'>+				  struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb-&gt;data;</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	bool multicast = is_multicast_ether_addr(hdr-&gt;addr1);</div><div class='add'>+	u8 tid = skb-&gt;priority &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='add'>+	__le16 fc = hdr-&gt;frame_control;</div><div class='add'>+	__le16 sc = hdr-&gt;seq_ctrl;</div><div class='add'>+	u8 fc_type, fc_stype;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_action(fc) &amp;&amp;</div><div class='add'>+	    mgmt-&gt;u.action.category == WLAN_CATEGORY_BACK &amp;&amp;</div><div class='add'>+	    mgmt-&gt;u.action.u.addba_req.action_code == WLAN_ACTION_ADDBA_REQ) {</div><div class='add'>+		u16 capab = le16_to_cpu(mgmt-&gt;u.action.u.addba_req.capab);</div><div class='add'>+</div><div class='add'>+		txwi[5] |= cpu_to_le32(MT_TXD5_ADD_BA);</div><div class='add'>+		tid = (capab &gt;&gt; 2) &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='add'>+	} else if (ieee80211_is_back_req(hdr-&gt;frame_control)) {</div><div class='add'>+		struct ieee80211_bar *bar = (struct ieee80211_bar *)hdr;</div><div class='add'>+		u16 control = le16_to_cpu(bar-&gt;control);</div><div class='add'>+</div><div class='add'>+		tid = FIELD_GET(IEEE80211_BAR_CTRL_TID_INFO_MASK, control);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD1_HDR_FORMAT, MT_HDR_FORMAT_802_11) |</div><div class='add'>+	      FIELD_PREP(MT_TXD1_HDR_INFO,</div><div class='add'>+			 ieee80211_get_hdrlen_from_skb(skb) / 2) |</div><div class='add'>+	      FIELD_PREP(MT_TXD1_TID, tid);</div><div class='add'>+</div><div class='add'>+	txwi[1] |= cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	fc_type = (le16_to_cpu(fc) &amp; IEEE80211_FCTL_FTYPE) &gt;&gt; 2;</div><div class='add'>+	fc_stype = (le16_to_cpu(fc) &amp; IEEE80211_FCTL_STYPE) &gt;&gt; 4;</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD2_FRAME_TYPE, fc_type) |</div><div class='add'>+	      FIELD_PREP(MT_TXD2_SUB_TYPE, fc_stype) |</div><div class='add'>+	      FIELD_PREP(MT_TXD2_MULTICAST, multicast);</div><div class='add'>+</div><div class='add'>+	if (key &amp;&amp; multicast &amp;&amp; ieee80211_is_robust_mgmt_frame(skb) &amp;&amp;</div><div class='add'>+	    key-&gt;cipher == WLAN_CIPHER_SUITE_AES_CMAC) {</div><div class='add'>+		val |= MT_TXD2_BIP;</div><div class='add'>+		txwi[3] &amp;= ~cpu_to_le32(MT_TXD3_PROTECT_FRAME);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_is_data(fc) || multicast ||</div><div class='add'>+	    info-&gt;flags &amp; IEEE80211_TX_CTL_USE_MINRATE)</div><div class='add'>+		val |= MT_TXD2_FIX_RATE;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_has_morefrags(fc) &amp;&amp; ieee80211_is_first_frag(sc))</div><div class='add'>+		val |= FIELD_PREP(MT_TXD2_FRAG, MT_TX_FRAG_FIRST);</div><div class='add'>+	else if (ieee80211_has_morefrags(fc) &amp;&amp; !ieee80211_is_first_frag(sc))</div><div class='add'>+		val |= FIELD_PREP(MT_TXD2_FRAG, MT_TX_FRAG_MID);</div><div class='add'>+	else if (!ieee80211_has_morefrags(fc) &amp;&amp; !ieee80211_is_first_frag(sc))</div><div class='add'>+		val |= FIELD_PREP(MT_TXD2_FRAG, MT_TX_FRAG_LAST);</div><div class='add'>+</div><div class='add'>+	txwi[2] |= cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_beacon(fc)) {</div><div class='add'>+		txwi[3] &amp;= ~cpu_to_le32(MT_TXD3_SW_POWER_MGMT);</div><div class='add'>+		txwi[3] |= cpu_to_le32(MT_TXD3_REM_TX_COUNT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;flags &amp; IEEE80211_TX_CTL_INJECTED) {</div><div class='add'>+		u16 seqno = le16_to_cpu(sc);</div><div class='add'>+</div><div class='add'>+		if (ieee80211_is_back_req(hdr-&gt;frame_control)) {</div><div class='add'>+			struct ieee80211_bar *bar;</div><div class='add'>+</div><div class='add'>+			bar = (struct ieee80211_bar *)skb-&gt;data;</div><div class='add'>+			seqno = le16_to_cpu(bar-&gt;start_seq_num);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		val = MT_TXD3_SN_VALID |</div><div class='add'>+		      FIELD_PREP(MT_TXD3_SEQ, IEEE80211_SEQ_TO_SN(seqno));</div><div class='add'>+		txwi[3] |= cpu_to_le32(val);</div><div class='add'>+		txwi[7] &amp;= ~cpu_to_le32(MT_TXD7_HW_AMSDU);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mt76_is_mmio(dev)) {</div><div class='add'>+		val = FIELD_PREP(MT_TXD7_TYPE, fc_type) |</div><div class='add'>+		      FIELD_PREP(MT_TXD7_SUB_TYPE, fc_stype);</div><div class='add'>+		txwi[7] |= cpu_to_le32(val);</div><div class='add'>+	} else {</div><div class='add'>+		val = FIELD_PREP(MT_TXD8_L_TYPE, fc_type) |</div><div class='add'>+		      FIELD_PREP(MT_TXD8_L_SUB_TYPE, fc_stype);</div><div class='add'>+		txwi[8] |= cpu_to_le32(val);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi,</div><div class='add'>+				 struct sk_buff *skb, struct mt76_wcid *wcid,</div><div class='add'>+				 struct ieee80211_key_conf *key, int pid,</div><div class='add'>+				 enum mt76_txq_id qid, u32 changed)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	u8 phy_idx = (info-&gt;hw_queue &amp; MT_TX_HW_QUEUE_PHY) &gt;&gt; 2;</div><div class='add'>+	struct ieee80211_vif *vif = info-&gt;control.vif;</div><div class='add'>+	struct mt76_phy *mphy = &amp;dev-&gt;phy;</div><div class='add'>+	u8 p_fmt, q_idx, omac_idx = 0, wmm_idx = 0, band_idx = 0;</div><div class='add'>+	u32 val, sz_txd = mt76_is_mmio(dev) ? MT_TXD_SIZE : MT_SDIO_TXD_SIZE;</div><div class='add'>+	bool is_8023 = info-&gt;flags &amp; IEEE80211_TX_CTL_HW_80211_ENCAP;</div><div class='add'>+	bool beacon = !!(changed &amp; (BSS_CHANGED_BEACON |</div><div class='add'>+				    BSS_CHANGED_BEACON_ENABLED));</div><div class='add'>+	bool inband_disc = !!(changed &amp; (BSS_CHANGED_UNSOL_BCAST_PROBE_RESP |</div><div class='add'>+					 BSS_CHANGED_FILS_DISCOVERY));</div><div class='add'>+	bool amsdu_en = wcid-&gt;amsdu;</div><div class='add'>+</div><div class='add'>+	if (vif) {</div><div class='add'>+		struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+		omac_idx = mvif-&gt;omac_idx;</div><div class='add'>+		wmm_idx = mvif-&gt;wmm_idx;</div><div class='add'>+		band_idx = mvif-&gt;band_idx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (phy_idx &amp;&amp; dev-&gt;phys[MT_BAND1])</div><div class='add'>+		mphy = dev-&gt;phys[MT_BAND1];</div><div class='add'>+</div><div class='add'>+	if (inband_disc) {</div><div class='add'>+		p_fmt = MT_TX_TYPE_FW;</div><div class='add'>+		q_idx = MT_LMAC_ALTX0;</div><div class='add'>+	} else if (beacon) {</div><div class='add'>+		p_fmt = MT_TX_TYPE_FW;</div><div class='add'>+		q_idx = MT_LMAC_BCN0;</div><div class='add'>+	} else if (qid &gt;= MT_TXQ_PSD) {</div><div class='add'>+		p_fmt = mt76_is_mmio(dev) ? MT_TX_TYPE_CT : MT_TX_TYPE_SF;</div><div class='add'>+		q_idx = MT_LMAC_ALTX0;</div><div class='add'>+	} else {</div><div class='add'>+		p_fmt = mt76_is_mmio(dev) ? MT_TX_TYPE_CT : MT_TX_TYPE_SF;</div><div class='add'>+		q_idx = wmm_idx * MT76_CONNAC_MAX_WMM_SETS +</div><div class='add'>+			mt76_connac_lmac_mapping(skb_get_queue_mapping(skb));</div><div class='add'>+</div><div class='add'>+		/* mt7915 WA only counts WED path */</div><div class='add'>+		if (is_mt7915(dev) &amp;&amp; mtk_wed_device_active(&amp;dev-&gt;mmio.wed))</div><div class='add'>+			wcid-&gt;stats.tx_packets++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD0_TX_BYTES, skb-&gt;len + sz_txd) |</div><div class='add'>+	      FIELD_PREP(MT_TXD0_PKT_FMT, p_fmt) |</div><div class='add'>+	      FIELD_PREP(MT_TXD0_Q_IDX, q_idx);</div><div class='add'>+	txwi[0] = cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	val = MT_TXD1_LONG_FORMAT |</div><div class='add'>+	      FIELD_PREP(MT_TXD1_WLAN_IDX, wcid-&gt;idx) |</div><div class='add'>+	      FIELD_PREP(MT_TXD1_OWN_MAC, omac_idx);</div><div class='add'>+	if (!is_mt7921(dev))</div><div class='add'>+		val |= MT_TXD1_VTA;</div><div class='add'>+	if (phy_idx || band_idx)</div><div class='add'>+		val |= MT_TXD1_TGID;</div><div class='add'>+</div><div class='add'>+	txwi[1] = cpu_to_le32(val);</div><div class='add'>+	txwi[2] = 0;</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD3_REM_TX_COUNT, 15);</div><div class='add'>+	if (!is_mt7921(dev))</div><div class='add'>+		val |= MT_TXD3_SW_POWER_MGMT;</div><div class='add'>+	if (key)</div><div class='add'>+		val |= MT_TXD3_PROTECT_FRAME;</div><div class='add'>+	if (info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)</div><div class='add'>+		val |= MT_TXD3_NO_ACK;</div><div class='add'>+</div><div class='add'>+	txwi[3] = cpu_to_le32(val);</div><div class='add'>+	txwi[4] = 0;</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD5_PID, pid);</div><div class='add'>+	if (pid &gt;= MT_PACKET_ID_FIRST) {</div><div class='add'>+		val |= MT_TXD5_TX_STATUS_HOST;</div><div class='add'>+		amsdu_en = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	txwi[5] = cpu_to_le32(val);</div><div class='add'>+	txwi[6] = 0;</div><div class='add'>+	txwi[7] = amsdu_en ? cpu_to_le32(MT_TXD7_HW_AMSDU) : 0;</div><div class='add'>+</div><div class='add'>+	if (is_8023)</div><div class='add'>+		mt76_connac2_mac_write_txwi_8023(txwi, skb, wcid);</div><div class='add'>+	else</div><div class='add'>+		mt76_connac2_mac_write_txwi_80211(dev, txwi, skb, key);</div><div class='add'>+</div><div class='add'>+	if (txwi[2] &amp; cpu_to_le32(MT_TXD2_FIX_RATE)) {</div><div class='add'>+		/* Fixed rata is available just for 802.11 txd */</div><div class='add'>+		struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+		bool multicast = ieee80211_is_data(hdr-&gt;frame_control) &amp;&amp;</div><div class='add'>+				 is_multicast_ether_addr(hdr-&gt;addr1);</div><div class='add'>+		u16 rate = mt76_connac2_mac_tx_rate_val(mphy,</div><div class='add'>+							vif ? &amp;vif-&gt;bss_conf : NULL,</div><div class='add'>+							beacon, multicast);</div><div class='add'>+		u32 val = MT_TXD6_FIXED_BW;</div><div class='add'>+</div><div class='add'>+		/* hardware won't add HTC for mgmt/ctrl frame */</div><div class='add'>+		txwi[2] |= cpu_to_le32(MT_TXD2_HTC_VLD);</div><div class='add'>+</div><div class='add'>+		val |= FIELD_PREP(MT_TXD6_TX_RATE, rate);</div><div class='add'>+		txwi[6] |= cpu_to_le32(val);</div><div class='add'>+		txwi[3] |= cpu_to_le32(MT_TXD3_BA_DISABLE);</div><div class='add'>+</div><div class='add'>+		if (!is_mt7921(dev)) {</div><div class='add'>+			u8 spe_idx = mt76_connac_spe_idx(mphy-&gt;antenna_mask);</div><div class='add'>+</div><div class='add'>+			if (!spe_idx)</div><div class='add'>+				spe_idx = 24 + phy_idx;</div><div class='add'>+			txwi[7] |= cpu_to_le32(FIELD_PREP(MT_TXD7_SPE_IDX, spe_idx));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		txwi[7] &amp;= ~cpu_to_le32(MT_TXD7_HW_AMSDU);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac2_mac_write_txwi);</div><div class='add'>+</div><div class='add'>+bool mt76_connac2_mac_fill_txs(struct mt76_dev *dev, struct mt76_wcid *wcid,</div><div class='add'>+			       __le32 *txs_data)</div><div class='add'>+{</div><div class='add'>+	struct mt76_sta_stats *stats = &amp;wcid-&gt;stats;</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	struct mt76_phy *mphy;</div><div class='add'>+	struct rate_info rate = {};</div><div class='add'>+	bool cck = false;</div><div class='add'>+	u32 txrate, txs, mode, stbc;</div><div class='add'>+</div><div class='add'>+	txs = le32_to_cpu(txs_data[0]);</div><div class='add'>+</div><div class='add'>+	/* PPDU based reporting */</div><div class='add'>+	if (mtk_wed_device_active(&amp;dev-&gt;mmio.wed) &amp;&amp;</div><div class='add'>+	    FIELD_GET(MT_TXS0_TXS_FORMAT, txs) &gt; 1) {</div><div class='add'>+		stats-&gt;tx_bytes +=</div><div class='add'>+			le32_get_bits(txs_data[5], MT_TXS5_MPDU_TX_BYTE) -</div><div class='add'>+			le32_get_bits(txs_data[7], MT_TXS7_MPDU_RETRY_BYTE);</div><div class='add'>+		stats-&gt;tx_failed +=</div><div class='add'>+			le32_get_bits(txs_data[6], MT_TXS6_MPDU_FAIL_CNT);</div><div class='add'>+		stats-&gt;tx_retries +=</div><div class='add'>+			le32_get_bits(txs_data[7], MT_TXS7_MPDU_RETRY_CNT);</div><div class='add'>+</div><div class='add'>+		if (wcid-&gt;sta) {</div><div class='add'>+			struct ieee80211_sta *sta;</div><div class='add'>+			u8 tid;</div><div class='add'>+</div><div class='add'>+			sta = container_of((void *)wcid, struct ieee80211_sta,</div><div class='add'>+					   drv_priv);</div><div class='add'>+			tid = FIELD_GET(MT_TXS0_TID, txs);</div><div class='add'>+</div><div class='add'>+			ieee80211_refresh_tx_agg_session_timer(sta, tid);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	txrate = FIELD_GET(MT_TXS0_TX_RATE, txs);</div><div class='add'>+</div><div class='add'>+	rate.mcs = FIELD_GET(MT_TX_RATE_IDX, txrate);</div><div class='add'>+	rate.nss = FIELD_GET(MT_TX_RATE_NSS, txrate) + 1;</div><div class='add'>+	stbc = FIELD_GET(MT_TX_RATE_STBC, txrate);</div><div class='add'>+</div><div class='add'>+	if (stbc &amp;&amp; rate.nss &gt; 1)</div><div class='add'>+		rate.nss &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+	if (rate.nss - 1 &lt; ARRAY_SIZE(stats-&gt;tx_nss))</div><div class='add'>+		stats-&gt;tx_nss[rate.nss - 1]++;</div><div class='add'>+	if (rate.mcs &lt; ARRAY_SIZE(stats-&gt;tx_mcs))</div><div class='add'>+		stats-&gt;tx_mcs[rate.mcs]++;</div><div class='add'>+</div><div class='add'>+	mode = FIELD_GET(MT_TX_RATE_MODE, txrate);</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case MT_PHY_TYPE_CCK:</div><div class='add'>+		cck = true;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case MT_PHY_TYPE_OFDM:</div><div class='add'>+		mphy = &amp;dev-&gt;phy;</div><div class='add'>+		if (wcid-&gt;phy_idx == MT_BAND1 &amp;&amp; dev-&gt;phys[MT_BAND1])</div><div class='add'>+			mphy = dev-&gt;phys[MT_BAND1];</div><div class='add'>+</div><div class='add'>+		if (mphy-&gt;chandef.chan-&gt;band == NL80211_BAND_5GHZ)</div><div class='add'>+			sband = &amp;mphy-&gt;sband_5g.sband;</div><div class='add'>+		else if (mphy-&gt;chandef.chan-&gt;band == NL80211_BAND_6GHZ)</div><div class='add'>+			sband = &amp;mphy-&gt;sband_6g.sband;</div><div class='add'>+		else</div><div class='add'>+			sband = &amp;mphy-&gt;sband_2g.sband;</div><div class='add'>+</div><div class='add'>+		rate.mcs = mt76_get_rate(mphy-&gt;dev, sband, rate.mcs, cck);</div><div class='add'>+		rate.legacy = sband-&gt;bitrates[rate.mcs].bitrate;</div><div class='add'>+		break;</div><div class='add'>+	case MT_PHY_TYPE_HT:</div><div class='add'>+	case MT_PHY_TYPE_HT_GF:</div><div class='add'>+		if (rate.mcs &gt; 31)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		rate.flags = RATE_INFO_FLAGS_MCS;</div><div class='add'>+		if (wcid-&gt;rate.flags &amp; RATE_INFO_FLAGS_SHORT_GI)</div><div class='add'>+			rate.flags |= RATE_INFO_FLAGS_SHORT_GI;</div><div class='add'>+		break;</div><div class='add'>+	case MT_PHY_TYPE_VHT:</div><div class='add'>+		if (rate.mcs &gt; 9)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		rate.flags = RATE_INFO_FLAGS_VHT_MCS;</div><div class='add'>+		break;</div><div class='add'>+	case MT_PHY_TYPE_HE_SU:</div><div class='add'>+	case MT_PHY_TYPE_HE_EXT_SU:</div><div class='add'>+	case MT_PHY_TYPE_HE_TB:</div><div class='add'>+	case MT_PHY_TYPE_HE_MU:</div><div class='add'>+		if (rate.mcs &gt; 11)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		rate.he_gi = wcid-&gt;rate.he_gi;</div><div class='add'>+		rate.he_dcm = FIELD_GET(MT_TX_RATE_DCM, txrate);</div><div class='add'>+		rate.flags = RATE_INFO_FLAGS_HE_MCS;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats-&gt;tx_mode[mode]++;</div><div class='add'>+</div><div class='add'>+	switch (FIELD_GET(MT_TXS0_BW, txs)) {</div><div class='add'>+	case IEEE80211_STA_RX_BW_160:</div><div class='add'>+		rate.bw = RATE_INFO_BW_160;</div><div class='add'>+		stats-&gt;tx_bw[3]++;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_STA_RX_BW_80:</div><div class='add'>+		rate.bw = RATE_INFO_BW_80;</div><div class='add'>+		stats-&gt;tx_bw[2]++;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_STA_RX_BW_40:</div><div class='add'>+		rate.bw = RATE_INFO_BW_40;</div><div class='add'>+		stats-&gt;tx_bw[1]++;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		rate.bw = RATE_INFO_BW_20;</div><div class='add'>+		stats-&gt;tx_bw[0]++;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	wcid-&gt;rate = rate;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac2_mac_fill_txs);</div><div class='add'>+</div><div class='add'>+bool mt76_connac2_mac_add_txs_skb(struct mt76_dev *dev, struct mt76_wcid *wcid,</div><div class='add'>+				  int pid, __le32 *txs_data)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff_head list;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (le32_get_bits(txs_data[0], MT_TXS0_TXS_FORMAT) == MT_TXS_PPDU_FMT)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	mt76_tx_status_lock(dev, &amp;list);</div><div class='add'>+	skb = mt76_tx_status_skb_get(dev, wcid, pid, &amp;list);</div><div class='add'>+	if (skb) {</div><div class='add'>+		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+</div><div class='add'>+		if (!(le32_to_cpu(txs_data[0]) &amp; MT_TXS0_ACK_ERROR_MASK))</div><div class='add'>+			info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='add'>+</div><div class='add'>+		info-&gt;status.ampdu_len = 1;</div><div class='add'>+		info-&gt;status.ampdu_ack_len =</div><div class='add'>+			!!(info-&gt;flags &amp; IEEE80211_TX_STAT_ACK);</div><div class='add'>+		info-&gt;status.rates[0].idx = -1;</div><div class='add'>+</div><div class='add'>+		mt76_connac2_mac_fill_txs(dev, wcid, txs_data);</div><div class='add'>+		mt76_tx_status_skb_done(dev, skb, &amp;list);</div><div class='add'>+	}</div><div class='add'>+	mt76_tx_status_unlock(dev, &amp;list);</div><div class='add'>+</div><div class='add'>+	return !!skb;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac2_mac_add_txs_skb);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt76_connac2_mac_decode_he_radiotap_ru(struct mt76_rx_status *status,</div><div class='add'>+				       struct ieee80211_radiotap_he *he,</div><div class='add'>+				       __le32 *rxv)</div><div class='add'>+{</div><div class='add'>+	u32 ru_h, ru_l;</div><div class='add'>+	u8 ru, offs = 0;</div><div class='add'>+</div><div class='add'>+	ru_l = le32_get_bits(rxv[0], MT_PRXV_HE_RU_ALLOC_L);</div><div class='add'>+	ru_h = le32_get_bits(rxv[1], MT_PRXV_HE_RU_ALLOC_H);</div><div class='add'>+	ru = (u8)(ru_l | ru_h &lt;&lt; 4);</div><div class='add'>+</div><div class='add'>+	status-&gt;bw = RATE_INFO_BW_HE_RU;</div><div class='add'>+</div><div class='add'>+	switch (ru) {</div><div class='add'>+	case 0 ... 36:</div><div class='add'>+		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_26;</div><div class='add'>+		offs = ru;</div><div class='add'>+		break;</div><div class='add'>+	case 37 ... 52:</div><div class='add'>+		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_52;</div><div class='add'>+		offs = ru - 37;</div><div class='add'>+		break;</div><div class='add'>+	case 53 ... 60:</div><div class='add'>+		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_106;</div><div class='add'>+		offs = ru - 53;</div><div class='add'>+		break;</div><div class='add'>+	case 61 ... 64:</div><div class='add'>+		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_242;</div><div class='add'>+		offs = ru - 61;</div><div class='add'>+		break;</div><div class='add'>+	case 65 ... 66:</div><div class='add'>+		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_484;</div><div class='add'>+		offs = ru - 65;</div><div class='add'>+		break;</div><div class='add'>+	case 67:</div><div class='add'>+		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_996;</div><div class='add'>+		break;</div><div class='add'>+	case 68:</div><div class='add'>+		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_2x996;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	he-&gt;data1 |= HE_BITS(DATA1_BW_RU_ALLOC_KNOWN);</div><div class='add'>+	he-&gt;data2 |= HE_BITS(DATA2_RU_OFFSET_KNOWN) |</div><div class='add'>+		     le16_encode_bits(offs,</div><div class='add'>+				      IEEE80211_RADIOTAP_HE_DATA2_RU_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt76_connac2_mac_decode_he_mu_radiotap(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='add'>+				       __le32 *rxv)</div><div class='add'>+{</div><div class='add'>+	struct mt76_rx_status *status = (struct mt76_rx_status *)skb-&gt;cb;</div><div class='add'>+	static struct ieee80211_radiotap_he_mu mu_known = {</div><div class='add'>+		.flags1 = HE_BITS(MU_FLAGS1_SIG_B_MCS_KNOWN) |</div><div class='add'>+			  HE_BITS(MU_FLAGS1_SIG_B_DCM_KNOWN) |</div><div class='add'>+			  HE_BITS(MU_FLAGS1_CH1_RU_KNOWN) |</div><div class='add'>+			  HE_BITS(MU_FLAGS1_SIG_B_SYMS_USERS_KNOWN),</div><div class='add'>+		.flags2 = HE_BITS(MU_FLAGS2_BW_FROM_SIG_A_BW_KNOWN),</div><div class='add'>+	};</div><div class='add'>+	struct ieee80211_radiotap_he_mu *he_mu;</div><div class='add'>+</div><div class='add'>+	if (is_mt7921(dev)) {</div><div class='add'>+		mu_known.flags1 |= HE_BITS(MU_FLAGS1_SIG_B_COMP_KNOWN);</div><div class='add'>+		mu_known.flags2 |= HE_BITS(MU_FLAGS2_PUNC_FROM_SIG_A_BW_KNOWN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status-&gt;flag |= RX_FLAG_RADIOTAP_HE_MU;</div><div class='add'>+</div><div class='add'>+	he_mu = skb_push(skb, sizeof(mu_known));</div><div class='add'>+	memcpy(he_mu, &amp;mu_known, sizeof(mu_known));</div><div class='add'>+</div><div class='add'>+#define MU_PREP(f, v)	le16_encode_bits(v, IEEE80211_RADIOTAP_HE_MU_##f)</div><div class='add'>+</div><div class='add'>+	he_mu-&gt;flags1 |= MU_PREP(FLAGS1_SIG_B_MCS, status-&gt;rate_idx);</div><div class='add'>+	if (status-&gt;he_dcm)</div><div class='add'>+		he_mu-&gt;flags1 |= MU_PREP(FLAGS1_SIG_B_DCM, status-&gt;he_dcm);</div><div class='add'>+</div><div class='add'>+	he_mu-&gt;flags2 |= MU_PREP(FLAGS2_BW_FROM_SIG_A_BW, status-&gt;bw) |</div><div class='add'>+			 MU_PREP(FLAGS2_SIG_B_SYMS_USERS,</div><div class='add'>+				 le32_get_bits(rxv[2], MT_CRXV_HE_NUM_USER));</div><div class='add'>+</div><div class='add'>+	he_mu-&gt;ru_ch1[0] = le32_get_bits(rxv[3], MT_CRXV_HE_RU0);</div><div class='add'>+</div><div class='add'>+	if (status-&gt;bw &gt;= RATE_INFO_BW_40) {</div><div class='add'>+		he_mu-&gt;flags1 |= HE_BITS(MU_FLAGS1_CH2_RU_KNOWN);</div><div class='add'>+		he_mu-&gt;ru_ch2[0] =</div><div class='add'>+			le32_get_bits(rxv[3], MT_CRXV_HE_RU1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status-&gt;bw &gt;= RATE_INFO_BW_80) {</div><div class='add'>+		he_mu-&gt;ru_ch1[1] =</div><div class='add'>+			le32_get_bits(rxv[3], MT_CRXV_HE_RU2);</div><div class='add'>+		he_mu-&gt;ru_ch2[1] =</div><div class='add'>+			le32_get_bits(rxv[3], MT_CRXV_HE_RU3);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt76_connac2_mac_decode_he_radiotap(struct mt76_dev *dev,</div><div class='add'>+					 struct sk_buff *skb,</div><div class='add'>+					 __le32 *rxv, u32 mode)</div><div class='add'>+{</div><div class='add'>+	struct mt76_rx_status *status = (struct mt76_rx_status *)skb-&gt;cb;</div><div class='add'>+	static const struct ieee80211_radiotap_he known = {</div><div class='add'>+		.data1 = HE_BITS(DATA1_DATA_MCS_KNOWN) |</div><div class='add'>+			 HE_BITS(DATA1_DATA_DCM_KNOWN) |</div><div class='add'>+			 HE_BITS(DATA1_STBC_KNOWN) |</div><div class='add'>+			 HE_BITS(DATA1_CODING_KNOWN) |</div><div class='add'>+			 HE_BITS(DATA1_LDPC_XSYMSEG_KNOWN) |</div><div class='add'>+			 HE_BITS(DATA1_DOPPLER_KNOWN) |</div><div class='add'>+			 HE_BITS(DATA1_SPTL_REUSE_KNOWN) |</div><div class='add'>+			 HE_BITS(DATA1_BSS_COLOR_KNOWN),</div><div class='add'>+		.data2 = HE_BITS(DATA2_GI_KNOWN) |</div><div class='add'>+			 HE_BITS(DATA2_TXBF_KNOWN) |</div><div class='add'>+			 HE_BITS(DATA2_PE_DISAMBIG_KNOWN) |</div><div class='add'>+			 HE_BITS(DATA2_TXOP_KNOWN),</div><div class='add'>+	};</div><div class='add'>+	u32 ltf_size = le32_get_bits(rxv[2], MT_CRXV_HE_LTF_SIZE) + 1;</div><div class='add'>+	struct ieee80211_radiotap_he *he;</div><div class='add'>+</div><div class='add'>+	status-&gt;flag |= RX_FLAG_RADIOTAP_HE;</div><div class='add'>+</div><div class='add'>+	he = skb_push(skb, sizeof(known));</div><div class='add'>+	memcpy(he, &amp;known, sizeof(known));</div><div class='add'>+</div><div class='add'>+	he-&gt;data3 = HE_PREP(DATA3_BSS_COLOR, BSS_COLOR, rxv[14]) |</div><div class='add'>+		    HE_PREP(DATA3_LDPC_XSYMSEG, LDPC_EXT_SYM, rxv[2]);</div><div class='add'>+	he-&gt;data4 = HE_PREP(DATA4_SU_MU_SPTL_REUSE, SR_MASK, rxv[11]);</div><div class='add'>+	he-&gt;data5 = HE_PREP(DATA5_PE_DISAMBIG, PE_DISAMBIG, rxv[2]) |</div><div class='add'>+		    le16_encode_bits(ltf_size,</div><div class='add'>+				     IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE);</div><div class='add'>+	if (le32_to_cpu(rxv[0]) &amp; MT_PRXV_TXBF)</div><div class='add'>+		he-&gt;data5 |= HE_BITS(DATA5_TXBF);</div><div class='add'>+	he-&gt;data6 = HE_PREP(DATA6_TXOP, TXOP_DUR, rxv[14]) |</div><div class='add'>+		    HE_PREP(DATA6_DOPPLER, DOPPLER, rxv[14]);</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case MT_PHY_TYPE_HE_SU:</div><div class='add'>+		he-&gt;data1 |= HE_BITS(DATA1_FORMAT_SU) |</div><div class='add'>+			     HE_BITS(DATA1_UL_DL_KNOWN) |</div><div class='add'>+			     HE_BITS(DATA1_BEAM_CHANGE_KNOWN) |</div><div class='add'>+			     HE_BITS(DATA1_BW_RU_ALLOC_KNOWN);</div><div class='add'>+</div><div class='add'>+		he-&gt;data3 |= HE_PREP(DATA3_BEAM_CHANGE, BEAM_CHNG, rxv[14]) |</div><div class='add'>+			     HE_PREP(DATA3_UL_DL, UPLINK, rxv[2]);</div><div class='add'>+		break;</div><div class='add'>+	case MT_PHY_TYPE_HE_EXT_SU:</div><div class='add'>+		he-&gt;data1 |= HE_BITS(DATA1_FORMAT_EXT_SU) |</div><div class='add'>+			     HE_BITS(DATA1_UL_DL_KNOWN) |</div><div class='add'>+			     HE_BITS(DATA1_BW_RU_ALLOC_KNOWN);</div><div class='add'>+</div><div class='add'>+		he-&gt;data3 |= HE_PREP(DATA3_UL_DL, UPLINK, rxv[2]);</div><div class='add'>+		break;</div><div class='add'>+	case MT_PHY_TYPE_HE_MU:</div><div class='add'>+		he-&gt;data1 |= HE_BITS(DATA1_FORMAT_MU) |</div><div class='add'>+			     HE_BITS(DATA1_UL_DL_KNOWN);</div><div class='add'>+</div><div class='add'>+		he-&gt;data3 |= HE_PREP(DATA3_UL_DL, UPLINK, rxv[2]);</div><div class='add'>+		he-&gt;data4 |= HE_PREP(DATA4_MU_STA_ID, MU_AID, rxv[7]);</div><div class='add'>+</div><div class='add'>+		mt76_connac2_mac_decode_he_radiotap_ru(status, he, rxv);</div><div class='add'>+		mt76_connac2_mac_decode_he_mu_radiotap(dev, skb, rxv);</div><div class='add'>+		break;</div><div class='add'>+	case MT_PHY_TYPE_HE_TB:</div><div class='add'>+		he-&gt;data1 |= HE_BITS(DATA1_FORMAT_TRIG) |</div><div class='add'>+			     HE_BITS(DATA1_SPTL_REUSE2_KNOWN) |</div><div class='add'>+			     HE_BITS(DATA1_SPTL_REUSE3_KNOWN) |</div><div class='add'>+			     HE_BITS(DATA1_SPTL_REUSE4_KNOWN);</div><div class='add'>+</div><div class='add'>+		he-&gt;data4 |= HE_PREP(DATA4_TB_SPTL_REUSE1, SR_MASK, rxv[11]) |</div><div class='add'>+			     HE_PREP(DATA4_TB_SPTL_REUSE2, SR1_MASK, rxv[11]) |</div><div class='add'>+			     HE_PREP(DATA4_TB_SPTL_REUSE3, SR2_MASK, rxv[11]) |</div><div class='add'>+			     HE_PREP(DATA4_TB_SPTL_REUSE4, SR3_MASK, rxv[11]);</div><div class='add'>+</div><div class='add'>+		mt76_connac2_mac_decode_he_radiotap_ru(status, he, rxv);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac2_mac_decode_he_radiotap);</div><div class='add'>+</div><div class='add'>+/* The HW does not translate the mac header to 802.3 for mesh point */</div><div class='add'>+int mt76_connac2_reverse_frag0_hdr_trans(struct ieee80211_vif *vif,</div><div class='add'>+					 struct sk_buff *skb, u16 hdr_offset)</div><div class='add'>+{</div><div class='add'>+	struct mt76_rx_status *status = (struct mt76_rx_status *)skb-&gt;cb;</div><div class='add'>+	struct ethhdr *eth_hdr = (struct ethhdr *)(skb-&gt;data + hdr_offset);</div><div class='add'>+	__le32 *rxd = (__le32 *)skb-&gt;data;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct ieee80211_hdr hdr;</div><div class='add'>+	u16 frame_control;</div><div class='add'>+</div><div class='add'>+	if (le32_get_bits(rxd[3], MT_RXD3_NORMAL_ADDR_TYPE) !=</div><div class='add'>+	    MT_RXD3_NORMAL_U2M)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!(le32_to_cpu(rxd[1]) &amp; MT_RXD1_NORMAL_GROUP_4))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	sta = container_of((void *)status-&gt;wcid, struct ieee80211_sta, drv_priv);</div><div class='add'>+</div><div class='add'>+	/* store the info from RXD and ethhdr to avoid being overridden */</div><div class='add'>+	frame_control = le32_get_bits(rxd[6], MT_RXD6_FRAME_CONTROL);</div><div class='add'>+	hdr.frame_control = cpu_to_le16(frame_control);</div><div class='add'>+	hdr.seq_ctrl = cpu_to_le16(le32_get_bits(rxd[8], MT_RXD8_SEQ_CTRL));</div><div class='add'>+	hdr.duration_id = 0;</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(hdr.addr1, vif-&gt;addr);</div><div class='add'>+	ether_addr_copy(hdr.addr2, sta-&gt;addr);</div><div class='add'>+	switch (frame_control &amp; (IEEE80211_FCTL_TODS |</div><div class='add'>+				 IEEE80211_FCTL_FROMDS)) {</div><div class='add'>+	case 0:</div><div class='add'>+		ether_addr_copy(hdr.addr3, vif-&gt;bss_conf.bssid);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_FCTL_FROMDS:</div><div class='add'>+		ether_addr_copy(hdr.addr3, eth_hdr-&gt;h_source);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_FCTL_TODS:</div><div class='add'>+		ether_addr_copy(hdr.addr3, eth_hdr-&gt;h_dest);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS:</div><div class='add'>+		ether_addr_copy(hdr.addr3, eth_hdr-&gt;h_dest);</div><div class='add'>+		ether_addr_copy(hdr.addr4, eth_hdr-&gt;h_source);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, hdr_offset + sizeof(struct ethhdr) - 2);</div><div class='add'>+	if (eth_hdr-&gt;h_proto == cpu_to_be16(ETH_P_AARP) ||</div><div class='add'>+	    eth_hdr-&gt;h_proto == cpu_to_be16(ETH_P_IPX))</div><div class='add'>+		ether_addr_copy(skb_push(skb, ETH_ALEN), bridge_tunnel_header);</div><div class='add'>+	else if (be16_to_cpu(eth_hdr-&gt;h_proto) &gt;= ETH_P_802_3_MIN)</div><div class='add'>+		ether_addr_copy(skb_push(skb, ETH_ALEN), rfc1042_header);</div><div class='add'>+	else</div><div class='add'>+		skb_pull(skb, 2);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_has_order(hdr.frame_control))</div><div class='add'>+		memcpy(skb_push(skb, IEEE80211_HT_CTL_LEN), &amp;rxd[9],</div><div class='add'>+		       IEEE80211_HT_CTL_LEN);</div><div class='add'>+	if (ieee80211_is_data_qos(hdr.frame_control)) {</div><div class='add'>+		__le16 qos_ctrl;</div><div class='add'>+</div><div class='add'>+		qos_ctrl = cpu_to_le16(le32_get_bits(rxd[8], MT_RXD8_QOS_CTL));</div><div class='add'>+		memcpy(skb_push(skb, IEEE80211_QOS_CTL_LEN), &amp;qos_ctrl,</div><div class='add'>+		       IEEE80211_QOS_CTL_LEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ieee80211_has_a4(hdr.frame_control))</div><div class='add'>+		memcpy(skb_push(skb, sizeof(hdr)), &amp;hdr, sizeof(hdr));</div><div class='add'>+	else</div><div class='add'>+		memcpy(skb_push(skb, sizeof(hdr) - 6), &amp;hdr, sizeof(hdr) - 6);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac2_reverse_frag0_hdr_trans);</div><div class='add'>+</div><div class='add'>+int mt76_connac2_mac_fill_rx_rate(struct mt76_dev *dev,</div><div class='add'>+				  struct mt76_rx_status *status,</div><div class='add'>+				  struct ieee80211_supported_band *sband,</div><div class='add'>+				  __le32 *rxv, u8 *mode)</div><div class='add'>+{</div><div class='add'>+	u32 v0, v2;</div><div class='add'>+	u8 stbc, gi, bw, dcm, nss;</div><div class='add'>+	int i, idx;</div><div class='add'>+	bool cck = false;</div><div class='add'>+</div><div class='add'>+	v0 = le32_to_cpu(rxv[0]);</div><div class='add'>+	v2 = le32_to_cpu(rxv[2]);</div><div class='add'>+</div><div class='add'>+	idx = i = FIELD_GET(MT_PRXV_TX_RATE, v0);</div><div class='add'>+	nss = FIELD_GET(MT_PRXV_NSTS, v0) + 1;</div><div class='add'>+</div><div class='add'>+	if (!is_mt7915(dev)) {</div><div class='add'>+		stbc = FIELD_GET(MT_PRXV_HT_STBC, v0);</div><div class='add'>+		gi = FIELD_GET(MT_PRXV_HT_SGI, v0);</div><div class='add'>+		*mode = FIELD_GET(MT_PRXV_TX_MODE, v0);</div><div class='add'>+		if (is_mt7921(dev))</div><div class='add'>+			dcm = !!(idx &amp; MT_PRXV_TX_DCM);</div><div class='add'>+		else</div><div class='add'>+			dcm = FIELD_GET(MT_PRXV_DCM, v0);</div><div class='add'>+		bw = FIELD_GET(MT_PRXV_FRAME_MODE, v0);</div><div class='add'>+	} else {</div><div class='add'>+		stbc = FIELD_GET(MT_CRXV_HT_STBC, v2);</div><div class='add'>+		gi = FIELD_GET(MT_CRXV_HT_SHORT_GI, v2);</div><div class='add'>+		*mode = FIELD_GET(MT_CRXV_TX_MODE, v2);</div><div class='add'>+		dcm = !!(idx &amp; GENMASK(3, 0) &amp; MT_PRXV_TX_DCM);</div><div class='add'>+		bw = FIELD_GET(MT_CRXV_FRAME_MODE, v2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (*mode) {</div><div class='add'>+	case MT_PHY_TYPE_CCK:</div><div class='add'>+		cck = true;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case MT_PHY_TYPE_OFDM:</div><div class='add'>+		i = mt76_get_rate(dev, sband, i, cck);</div><div class='add'>+		break;</div><div class='add'>+	case MT_PHY_TYPE_HT_GF:</div><div class='add'>+	case MT_PHY_TYPE_HT:</div><div class='add'>+		status-&gt;encoding = RX_ENC_HT;</div><div class='add'>+		if (gi)</div><div class='add'>+			status-&gt;enc_flags |= RX_ENC_FLAG_SHORT_GI;</div><div class='add'>+		if (i &gt; 31)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	case MT_PHY_TYPE_VHT:</div><div class='add'>+		status-&gt;nss = nss;</div><div class='add'>+		status-&gt;encoding = RX_ENC_VHT;</div><div class='add'>+		if (gi)</div><div class='add'>+			status-&gt;enc_flags |= RX_ENC_FLAG_SHORT_GI;</div><div class='add'>+		if (i &gt; 11)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	case MT_PHY_TYPE_HE_MU:</div><div class='add'>+	case MT_PHY_TYPE_HE_SU:</div><div class='add'>+	case MT_PHY_TYPE_HE_EXT_SU:</div><div class='add'>+	case MT_PHY_TYPE_HE_TB:</div><div class='add'>+		status-&gt;nss = nss;</div><div class='add'>+		status-&gt;encoding = RX_ENC_HE;</div><div class='add'>+		i &amp;= GENMASK(3, 0);</div><div class='add'>+</div><div class='add'>+		if (gi &lt;= NL80211_RATE_INFO_HE_GI_3_2)</div><div class='add'>+			status-&gt;he_gi = gi;</div><div class='add'>+</div><div class='add'>+		status-&gt;he_dcm = dcm;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	status-&gt;rate_idx = i;</div><div class='add'>+</div><div class='add'>+	switch (bw) {</div><div class='add'>+	case IEEE80211_STA_RX_BW_20:</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_STA_RX_BW_40:</div><div class='add'>+		if (*mode &amp; MT_PHY_TYPE_HE_EXT_SU &amp;&amp;</div><div class='add'>+		    (idx &amp; MT_PRXV_TX_ER_SU_106T)) {</div><div class='add'>+			status-&gt;bw = RATE_INFO_BW_HE_RU;</div><div class='add'>+			status-&gt;he_ru =</div><div class='add'>+				NL80211_RATE_INFO_HE_RU_ALLOC_106;</div><div class='add'>+		} else {</div><div class='add'>+			status-&gt;bw = RATE_INFO_BW_40;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_STA_RX_BW_80:</div><div class='add'>+		status-&gt;bw = RATE_INFO_BW_80;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_STA_RX_BW_160:</div><div class='add'>+		status-&gt;bw = RATE_INFO_BW_160;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status-&gt;enc_flags |= RX_ENC_FLAG_STBC_MASK * stbc;</div><div class='add'>+	if (*mode &lt; MT_PHY_TYPE_HE_SU &amp;&amp; gi)</div><div class='add'>+		status-&gt;enc_flags |= RX_ENC_FLAG_SHORT_GI;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac2_mac_fill_rx_rate);</div><div class='add'>+</div><div class='add'>+void mt76_connac2_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi)</div><div class='add'>+{</div><div class='add'>+	struct mt76_wcid *wcid;</div><div class='add'>+	u16 fc, tid;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (!sta ||</div><div class='add'>+	    !(sta-&gt;deflink.ht_cap.ht_supported || sta-&gt;deflink.he_cap.has_he))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tid = le32_get_bits(txwi[1], MT_TXD1_TID);</div><div class='add'>+	if (tid &gt;= 6) /* skip VO queue */</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	val = le32_to_cpu(txwi[2]);</div><div class='add'>+	fc = FIELD_GET(MT_TXD2_FRAME_TYPE, val) &lt;&lt; 2 |</div><div class='add'>+	     FIELD_GET(MT_TXD2_SUB_TYPE, val) &lt;&lt; 4;</div><div class='add'>+	if (unlikely(fc != (IEEE80211_FTYPE_DATA | IEEE80211_STYPE_QOS_DATA)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	wcid = (struct mt76_wcid *)sta-&gt;drv_priv;</div><div class='add'>+	if (!test_and_set_bit(tid, &amp;wcid-&gt;ampdu_state))</div><div class='add'>+		ieee80211_start_tx_ba_session(sta, tid, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac2_tx_check_aggr);</div><div class='add'>+</div><div class='add'>+void mt76_connac2_txwi_free(struct mt76_dev *dev, struct mt76_txwi_cache *t,</div><div class='add'>+			    struct ieee80211_sta *sta,</div><div class='add'>+			    struct list_head *free_list)</div><div class='add'>+{</div><div class='add'>+	struct mt76_wcid *wcid;</div><div class='add'>+	__le32 *txwi;</div><div class='add'>+	u16 wcid_idx;</div><div class='add'>+</div><div class='add'>+	mt76_connac_txp_skb_unmap(dev, t);</div><div class='add'>+	if (!t-&gt;skb)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	txwi = (__le32 *)mt76_get_txwi_ptr(dev, t);</div><div class='add'>+	if (sta) {</div><div class='add'>+		wcid = (struct mt76_wcid *)sta-&gt;drv_priv;</div><div class='add'>+		wcid_idx = wcid-&gt;idx;</div><div class='add'>+	} else {</div><div class='add'>+		wcid_idx = le32_get_bits(txwi[1], MT_TXD1_WLAN_IDX);</div><div class='add'>+		wcid = __mt76_wcid_ptr(dev, wcid_idx);</div><div class='add'>+</div><div class='add'>+		if (wcid &amp;&amp; wcid-&gt;sta) {</div><div class='add'>+			sta = container_of((void *)wcid, struct ieee80211_sta,</div><div class='add'>+					   drv_priv);</div><div class='add'>+			mt76_wcid_add_poll(dev, wcid);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sta &amp;&amp; likely(t-&gt;skb-&gt;protocol != cpu_to_be16(ETH_P_PAE)))</div><div class='add'>+		mt76_connac2_tx_check_aggr(sta, txwi);</div><div class='add'>+</div><div class='add'>+	__mt76_tx_complete_skb(dev, wcid_idx, t-&gt;skb, free_list);</div><div class='add'>+out:</div><div class='add'>+	t-&gt;skb = NULL;</div><div class='add'>+	mt76_put_txwi(dev, t);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac2_txwi_free);</div><div class='add'>+</div><div class='add'>+void mt76_connac2_tx_token_put(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_txwi_cache *txwi;</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;token_lock);</div><div class='add'>+	idr_for_each_entry(&amp;dev-&gt;token, txwi, id) {</div><div class='add'>+		mt76_connac2_txwi_free(dev, txwi, NULL, NULL);</div><div class='add'>+		dev-&gt;token_count--;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;token_lock);</div><div class='add'>+	idr_destroy(&amp;dev-&gt;token);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac2_tx_token_put);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c<br/>index fe0ab5e5ff81..ea99167765b0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c</a></div><div class='hunk'>@@ -1,6 +1,8 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include "mt76_connac2_mac.h"</div><div class='ctx'> #include "mt76_connac_mcu.h"</div><div class='ctx'> </div><div class='ctx'> int mt76_connac_mcu_start_firmware(struct mt76_dev *dev, u32 addr, u32 option)</div><div class='hunk'>@@ -13,8 +15,8 @@ int mt76_connac_mcu_start_firmware(struct mt76_dev *dev, u32 addr, u32 option)</div><div class='ctx'> 		.addr = cpu_to_le32(addr),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(dev, MCU_CMD_FW_START_REQ, &amp;req, sizeof(req),</div><div class='del'>-				 true);</div><div class='add'>+	return mt76_mcu_send_msg(dev, MCU_CMD(FW_START_REQ), &amp;req,</div><div class='add'>+				 sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_start_firmware);</div><div class='ctx'> </div><div class='hunk'>@@ -27,8 +29,8 @@ int mt76_connac_mcu_patch_sem_ctrl(struct mt76_dev *dev, bool get)</div><div class='ctx'> 		.op = cpu_to_le32(op),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(dev, MCU_CMD_PATCH_SEM_CONTROL, &amp;req,</div><div class='del'>-				 sizeof(req), true);</div><div class='add'>+	return mt76_mcu_send_msg(dev, MCU_CMD(PATCH_SEM_CONTROL),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_patch_sem_ctrl);</div><div class='ctx'> </div><div class='hunk'>@@ -41,8 +43,8 @@ int mt76_connac_mcu_start_patch(struct mt76_dev *dev)</div><div class='ctx'> 		.check_crc = 0,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(dev, MCU_CMD_PATCH_FINISH_REQ, &amp;req,</div><div class='del'>-				 sizeof(req), true);</div><div class='add'>+	return mt76_mcu_send_msg(dev, MCU_CMD(PATCH_FINISH_REQ),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_start_patch);</div><div class='ctx'> </div><div class='hunk'>@@ -62,11 +64,13 @@ int mt76_connac_mcu_init_download(struct mt76_dev *dev, u32 addr, u32 len,</div><div class='ctx'> 	};</div><div class='ctx'> 	int cmd;</div><div class='ctx'> </div><div class='del'>-	if (is_mt7921(dev) &amp;&amp;</div><div class='del'>-	    (req.addr == cpu_to_le32(MCU_PATCH_ADDRESS) || addr == 0x900000))</div><div class='del'>-		cmd = MCU_CMD_PATCH_START_REQ;</div><div class='add'>+	if ((!is_connac_v1(dev) &amp;&amp; addr == MCU_PATCH_ADDRESS) ||</div><div class='add'>+	    (is_mt7921(dev) &amp;&amp; addr == 0x900000) ||</div><div class='add'>+	    (is_mt7925(dev) &amp;&amp; (addr == 0x900000 || addr == 0xe0002800)) ||</div><div class='add'>+	    (is_mt799x(dev) &amp;&amp; addr == 0x900000))</div><div class='add'>+		cmd = MCU_CMD(PATCH_START_REQ);</div><div class='ctx'> 	else</div><div class='del'>-		cmd = MCU_CMD_TARGET_ADDRESS_LEN_REQ;</div><div class='add'>+		cmd = MCU_CMD(TARGET_ADDRESS_LEN_REQ);</div><div class='ctx'> </div><div class='ctx'> 	return mt76_mcu_send_msg(dev, cmd, &amp;req, sizeof(req), true);</div><div class='ctx'> }</div><div class='hunk'>@@ -74,7 +78,7 @@ EXPORT_SYMBOL_GPL(mt76_connac_mcu_init_download);</div><div class='ctx'> </div><div class='ctx'> int mt76_connac_mcu_set_channel_domain(struct mt76_phy *phy)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+	int len, i, n_max_channels, n_2ch = 0, n_5ch = 0, n_6ch = 0;</div><div class='ctx'> 	struct mt76_connac_mcu_channel_domain {</div><div class='ctx'> 		u8 alpha2[4]; /* regulatory_request.alpha2 */</div><div class='ctx'> 		u8 bw_2g; /* BW_20_40M		0</div><div class='hunk'>@@ -84,25 +88,29 @@ int mt76_connac_mcu_set_channel_domain(struct mt76_phy *phy)</div><div class='ctx'> 			   * BW_20_40_80_8080M	4</div><div class='ctx'> 			   */</div><div class='ctx'> 		u8 bw_5g;</div><div class='del'>-		__le16 pad;</div><div class='add'>+		u8 bw_6g;</div><div class='add'>+		u8 pad;</div><div class='ctx'> 		u8 n_2ch;</div><div class='ctx'> 		u8 n_5ch;</div><div class='del'>-		__le16 pad2;</div><div class='add'>+		u8 n_6ch;</div><div class='add'>+		u8 pad2;</div><div class='ctx'> 	} __packed hdr = {</div><div class='ctx'> 		.bw_2g = 0,</div><div class='del'>-		.bw_5g = 3,</div><div class='add'>+		.bw_5g = 3, /* BW_20_40_80_160M */</div><div class='add'>+		.bw_6g = 3,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct mt76_connac_mcu_chan {</div><div class='ctx'> 		__le16 hw_value;</div><div class='ctx'> 		__le16 pad;</div><div class='ctx'> 		__le32 flags;</div><div class='ctx'> 	} __packed channel;</div><div class='del'>-	int len, i, n_max_channels, n_2ch = 0, n_5ch = 0;</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct ieee80211_channel *chan;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='ctx'> 	n_max_channels = phy-&gt;sband_2g.sband.n_channels +</div><div class='del'>-			 phy-&gt;sband_5g.sband.n_channels;</div><div class='add'>+			 phy-&gt;sband_5g.sband.n_channels +</div><div class='add'>+			 phy-&gt;sband_6g.sband.n_channels;</div><div class='ctx'> 	len = sizeof(hdr) + n_max_channels * sizeof(channel);</div><div class='ctx'> </div><div class='ctx'> 	skb = mt76_mcu_msg_alloc(dev, NULL, len);</div><div class='hunk'>@@ -135,15 +143,29 @@ int mt76_connac_mcu_set_channel_domain(struct mt76_phy *phy)</div><div class='ctx'> 		skb_put_data(skb, &amp;channel, sizeof(channel));</div><div class='ctx'> 		n_5ch++;</div><div class='ctx'> 	}</div><div class='add'>+	for (i = 0; i &lt; phy-&gt;sband_6g.sband.n_channels; i++) {</div><div class='add'>+		chan = &amp;phy-&gt;sband_6g.sband.channels[i];</div><div class='add'>+		if (chan-&gt;flags &amp; IEEE80211_CHAN_DISABLED)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		channel.hw_value = cpu_to_le16(chan-&gt;hw_value);</div><div class='add'>+		channel.flags = cpu_to_le32(chan-&gt;flags);</div><div class='add'>+		channel.pad = 0;</div><div class='add'>+</div><div class='add'>+		skb_put_data(skb, &amp;channel, sizeof(channel));</div><div class='add'>+		n_6ch++;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(sizeof(dev-&gt;alpha2) &gt; sizeof(hdr.alpha2));</div><div class='ctx'> 	memcpy(hdr.alpha2, dev-&gt;alpha2, sizeof(dev-&gt;alpha2));</div><div class='ctx'> 	hdr.n_2ch = n_2ch;</div><div class='ctx'> 	hdr.n_5ch = n_5ch;</div><div class='add'>+	hdr.n_6ch = n_6ch;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(__skb_push(skb, sizeof(hdr)), &amp;hdr, sizeof(hdr));</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_skb_send_msg(dev, skb, MCU_CMD_SET_CHAN_DOMAIN, false);</div><div class='add'>+	return mt76_mcu_skb_send_msg(dev, skb, MCU_CE_CMD(SET_CHAN_DOMAIN),</div><div class='add'>+				     false);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_channel_domain);</div><div class='ctx'> </div><div class='hunk'>@@ -159,14 +181,14 @@ int mt76_connac_mcu_set_mac_enable(struct mt76_dev *dev, int band, bool enable,</div><div class='ctx'> 		.band = band,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(dev, MCU_EXT_CMD_MAC_INIT_CTRL, &amp;req_mac,</div><div class='add'>+	return mt76_mcu_send_msg(dev, MCU_EXT_CMD(MAC_INIT_CTRL), &amp;req_mac,</div><div class='ctx'> 				 sizeof(req_mac), true);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_mac_enable);</div><div class='ctx'> </div><div class='ctx'> int mt76_connac_mcu_set_vif_ps(struct mt76_dev *dev, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_vif *mvif = (struct mt76_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u8 bss_idx;</div><div class='ctx'> 		u8 ps_state; /* 0: device awake</div><div class='hunk'>@@ -175,14 +197,14 @@ int mt76_connac_mcu_set_vif_ps(struct mt76_dev *dev, struct ieee80211_vif *vif)</div><div class='ctx'> 			      */</div><div class='ctx'> 	} req = {</div><div class='ctx'> 		.bss_idx = mvif-&gt;idx,</div><div class='del'>-		.ps_state = vif-&gt;bss_conf.ps ? 2 : 0,</div><div class='add'>+		.ps_state = vif-&gt;cfg.ps ? 2 : 0,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(dev, MCU_CMD_SET_PS_PROFILE, &amp;req,</div><div class='del'>-				 sizeof(req), false);</div><div class='add'>+	return mt76_mcu_send_msg(dev, MCU_CE_CMD(SET_PS_PROFILE),</div><div class='add'>+				 &amp;req, sizeof(req), false);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_vif_ps);</div><div class='ctx'> </div><div class='hunk'>@@ -201,7 +223,7 @@ int mt76_connac_mcu_set_rts_thresh(struct mt76_dev *dev, u32 val, u8 band)</div><div class='ctx'> 		.pkt_thresh = cpu_to_le32(0x2),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(dev, MCU_EXT_CMD_PROTECT_CTRL, &amp;req,</div><div class='add'>+	return mt76_mcu_send_msg(dev, MCU_EXT_CMD(PROTECT_CTRL), &amp;req,</div><div class='ctx'> 				 sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_rts_thresh);</div><div class='hunk'>@@ -209,7 +231,7 @@ EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_rts_thresh);</div><div class='ctx'> void mt76_connac_mcu_beacon_loss_iter(void *priv, u8 *mac,</div><div class='ctx'> 				      struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_vif *mvif = (struct mt76_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct mt76_connac_beacon_loss_event *event = priv;</div><div class='ctx'> </div><div class='ctx'> 	if (mvif-&gt;idx != event-&gt;bss_idx)</div><div class='hunk'>@@ -234,16 +256,15 @@ mt76_connac_mcu_add_nested_tlv(struct sk_buff *skb, int tag, int len,</div><div class='ctx'> 	};</div><div class='ctx'> 	u16 ntlv;</div><div class='ctx'> </div><div class='del'>-	ptlv = skb_put(skb, len);</div><div class='add'>+	ptlv = skb_put_zero(skb, len);</div><div class='ctx'> 	memcpy(ptlv, &amp;tlv, sizeof(tlv));</div><div class='ctx'> </div><div class='ctx'> 	ntlv = le16_to_cpu(ntlv_hdr-&gt;tlv_num);</div><div class='ctx'> 	ntlv_hdr-&gt;tlv_num = cpu_to_le16(ntlv + 1);</div><div class='ctx'> </div><div class='ctx'> 	if (sta_hdr) {</div><div class='del'>-		u16 size = le16_to_cpu(sta_hdr-&gt;len);</div><div class='del'>-</div><div class='del'>-		sta_hdr-&gt;len = cpu_to_le16(size + len);</div><div class='add'>+		len += le16_to_cpu(sta_hdr-&gt;len);</div><div class='add'>+		sta_hdr-&gt;len = cpu_to_le16(len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ptlv;</div><div class='hunk'>@@ -251,8 +272,8 @@ mt76_connac_mcu_add_nested_tlv(struct sk_buff *skb, int tag, int len,</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_add_nested_tlv);</div><div class='ctx'> </div><div class='ctx'> struct sk_buff *</div><div class='del'>-mt76_connac_mcu_alloc_sta_req(struct mt76_dev *dev, struct mt76_vif *mvif,</div><div class='del'>-			      struct mt76_wcid *wcid)</div><div class='add'>+__mt76_connac_mcu_alloc_sta_req(struct mt76_dev *dev, struct mt76_vif_link *mvif,</div><div class='add'>+				struct mt76_wcid *wcid, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sta_req_hdr hdr = {</div><div class='ctx'> 		.bss_idx = mvif-&gt;idx,</div><div class='hunk'>@@ -261,9 +282,12 @@ mt76_connac_mcu_alloc_sta_req(struct mt76_dev *dev, struct mt76_vif *mvif,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='add'>+	if (wcid &amp;&amp; !wcid-&gt;sta &amp;&amp; !wcid-&gt;sta_disabled)</div><div class='add'>+		hdr.muar_idx = 0xe;</div><div class='add'>+</div><div class='ctx'> 	mt76_connac_mcu_get_wlan_idx(dev, wcid, &amp;hdr.wlan_idx_lo,</div><div class='ctx'> 				     &amp;hdr.wlan_idx_hi);</div><div class='del'>-	skb = mt76_mcu_msg_alloc(dev, NULL, MT76_CONNAC_STA_UPDATE_MAX_SIZE);</div><div class='add'>+	skb = __mt76_mcu_msg_alloc(dev, NULL, len, len, GFP_ATOMIC);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='hunk'>@@ -271,7 +295,7 @@ mt76_connac_mcu_alloc_sta_req(struct mt76_dev *dev, struct mt76_vif *mvif,</div><div class='ctx'> </div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(mt76_connac_mcu_alloc_sta_req);</div><div class='add'>+EXPORT_SYMBOL_GPL(__mt76_connac_mcu_alloc_sta_req);</div><div class='ctx'> </div><div class='ctx'> struct wtbl_req_hdr *</div><div class='ctx'> mt76_connac_mcu_alloc_wtbl_req(struct mt76_dev *dev, struct mt76_wcid *wcid,</div><div class='hunk'>@@ -295,17 +319,60 @@ mt76_connac_mcu_alloc_wtbl_req(struct mt76_dev *dev, struct mt76_wcid *wcid,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sta_hdr)</div><div class='del'>-		sta_hdr-&gt;len = cpu_to_le16(sizeof(hdr));</div><div class='add'>+		le16_add_cpu(&amp;sta_hdr-&gt;len, sizeof(hdr));</div><div class='ctx'> </div><div class='ctx'> 	return skb_put_data(nskb, &amp;hdr, sizeof(hdr));</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_alloc_wtbl_req);</div><div class='ctx'> </div><div class='del'>-void mt76_connac_mcu_sta_basic_tlv(struct sk_buff *skb,</div><div class='del'>-				   struct ieee80211_vif *vif,</div><div class='del'>-				   struct ieee80211_sta *sta,</div><div class='del'>-				   bool enable)</div><div class='add'>+void mt76_connac_mcu_bss_omac_tlv(struct sk_buff *skb,</div><div class='add'>+				  struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	u8 omac_idx = mvif-&gt;omac_idx;</div><div class='add'>+	struct bss_info_omac *omac;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+	u32 type = 0;</div><div class='add'>+</div><div class='add'>+	switch (vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_MONITOR:</div><div class='add'>+	case NL80211_IFTYPE_MESH_POINT:</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		if (vif-&gt;p2p)</div><div class='add'>+			type = CONNECTION_P2P_GO;</div><div class='add'>+		else</div><div class='add'>+			type = CONNECTION_INFRA_AP;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		if (vif-&gt;p2p)</div><div class='add'>+			type = CONNECTION_P2P_GC;</div><div class='add'>+		else</div><div class='add'>+			type = CONNECTION_INFRA_STA;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		type = CONNECTION_IBSS_ADHOC;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, BSS_INFO_OMAC, sizeof(*omac));</div><div class='add'>+</div><div class='add'>+	omac = (struct bss_info_omac *)tlv;</div><div class='add'>+	omac-&gt;conn_type = cpu_to_le32(type);</div><div class='add'>+	omac-&gt;omac_idx = mvif-&gt;omac_idx;</div><div class='add'>+	omac-&gt;band_idx = mvif-&gt;band_idx;</div><div class='add'>+	omac-&gt;hw_bss_idx = omac_idx &gt; EXT_BSSID_START ? HW_BSSID_0 : omac_idx;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_bss_omac_tlv);</div><div class='add'>+</div><div class='add'>+void mt76_connac_mcu_sta_basic_tlv(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='add'>+				   struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				   struct ieee80211_link_sta *link_sta,</div><div class='add'>+				   int conn_state, bool newly)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_vif *vif = link_conf-&gt;vif;</div><div class='ctx'> 	struct sta_rec_basic *basic;</div><div class='ctx'> 	struct tlv *tlv;</div><div class='ctx'> 	int conn_type;</div><div class='hunk'>@@ -315,54 +382,57 @@ void mt76_connac_mcu_sta_basic_tlv(struct sk_buff *skb,</div><div class='ctx'> 	basic = (struct sta_rec_basic *)tlv;</div><div class='ctx'> 	basic-&gt;extra_info = cpu_to_le16(EXTRA_INFO_VER);</div><div class='ctx'> </div><div class='del'>-	if (enable) {</div><div class='add'>+	if (newly &amp;&amp; conn_state != CONN_STATE_DISCONNECT)</div><div class='ctx'> 		basic-&gt;extra_info |= cpu_to_le16(EXTRA_INFO_NEW);</div><div class='del'>-		basic-&gt;conn_state = CONN_STATE_PORT_SECURE;</div><div class='del'>-	} else {</div><div class='del'>-		basic-&gt;conn_state = CONN_STATE_DISCONNECT;</div><div class='del'>-	}</div><div class='add'>+	basic-&gt;conn_state = conn_state;</div><div class='ctx'> </div><div class='del'>-	if (!sta) {</div><div class='add'>+	if (!link_sta) {</div><div class='ctx'> 		basic-&gt;conn_type = cpu_to_le32(CONNECTION_INFRA_BC);</div><div class='del'>-		eth_broadcast_addr(basic-&gt;peer_addr);</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+		    !is_zero_ether_addr(link_conf-&gt;bssid)) {</div><div class='add'>+			memcpy(basic-&gt;peer_addr, link_conf-&gt;bssid, ETH_ALEN);</div><div class='add'>+			basic-&gt;aid = cpu_to_le16(vif-&gt;cfg.aid);</div><div class='add'>+		} else {</div><div class='add'>+			eth_broadcast_addr(basic-&gt;peer_addr);</div><div class='add'>+		}</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (vif-&gt;type) {</div><div class='ctx'> 	case NL80211_IFTYPE_MESH_POINT:</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='del'>-		if (vif-&gt;p2p)</div><div class='add'>+		if (vif-&gt;p2p &amp;&amp; !is_mt7921(dev))</div><div class='ctx'> 			conn_type = CONNECTION_P2P_GC;</div><div class='ctx'> 		else</div><div class='ctx'> 			conn_type = CONNECTION_INFRA_STA;</div><div class='ctx'> 		basic-&gt;conn_type = cpu_to_le32(conn_type);</div><div class='del'>-		basic-&gt;aid = cpu_to_le16(sta-&gt;aid);</div><div class='add'>+		basic-&gt;aid = cpu_to_le16(link_sta-&gt;sta-&gt;aid);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_STATION:</div><div class='del'>-		if (vif-&gt;p2p)</div><div class='add'>+		if (vif-&gt;p2p &amp;&amp; !is_mt7921(dev))</div><div class='ctx'> 			conn_type = CONNECTION_P2P_GO;</div><div class='ctx'> 		else</div><div class='ctx'> 			conn_type = CONNECTION_INFRA_AP;</div><div class='ctx'> 		basic-&gt;conn_type = cpu_to_le32(conn_type);</div><div class='del'>-		basic-&gt;aid = cpu_to_le16(vif-&gt;bss_conf.aid);</div><div class='add'>+		basic-&gt;aid = cpu_to_le16(vif-&gt;cfg.aid);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_ADHOC:</div><div class='ctx'> 		basic-&gt;conn_type = cpu_to_le32(CONNECTION_IBSS_ADHOC);</div><div class='del'>-		basic-&gt;aid = cpu_to_le16(sta-&gt;aid);</div><div class='add'>+		basic-&gt;aid = cpu_to_le16(link_sta-&gt;sta-&gt;aid);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(basic-&gt;peer_addr, sta-&gt;addr, ETH_ALEN);</div><div class='del'>-	basic-&gt;qos = sta-&gt;wme;</div><div class='add'>+	memcpy(basic-&gt;peer_addr, link_sta-&gt;addr, ETH_ALEN);</div><div class='add'>+	basic-&gt;qos = link_sta-&gt;sta-&gt;wme;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_sta_basic_tlv);</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt76_connac_mcu_sta_uapsd(struct sk_buff *skb, struct ieee80211_vif *vif,</div><div class='del'>-			  struct ieee80211_sta *sta)</div><div class='add'>+void mt76_connac_mcu_sta_uapsd(struct sk_buff *skb, struct ieee80211_vif *vif,</div><div class='add'>+			       struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='ctx'> 	struct sta_rec_uapsd *uapsd;</div><div class='ctx'> 	struct tlv *tlv;</div><div class='hunk'>@@ -391,8 +461,10 @@ mt76_connac_mcu_sta_uapsd(struct sk_buff *skb, struct ieee80211_vif *vif,</div><div class='ctx'> 	}</div><div class='ctx'> 	uapsd-&gt;max_sp = sta-&gt;max_sp;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_sta_uapsd);</div><div class='ctx'> </div><div class='ctx'> void mt76_connac_mcu_wtbl_hdr_trans_tlv(struct sk_buff *skb,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='ctx'> 					struct mt76_wcid *wcid,</div><div class='ctx'> 					void *sta_wtbl, void *wtbl_tlv)</div><div class='ctx'> {</div><div class='hunk'>@@ -403,17 +475,77 @@ void mt76_connac_mcu_wtbl_hdr_trans_tlv(struct sk_buff *skb,</div><div class='ctx'> 					     sizeof(*htr),</div><div class='ctx'> 					     wtbl_tlv, sta_wtbl);</div><div class='ctx'> 	htr = (struct wtbl_hdr_trans *)tlv;</div><div class='add'>+	htr-&gt;no_rx_trans = true;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+		htr-&gt;to_ds = true;</div><div class='add'>+	else</div><div class='add'>+		htr-&gt;from_ds = true;</div><div class='add'>+</div><div class='add'>+	if (!wcid)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	htr-&gt;no_rx_trans = !test_bit(MT_WCID_FLAG_HDR_TRANS, &amp;wcid-&gt;flags);</div><div class='add'>+	if (test_bit(MT_WCID_FLAG_4ADDR, &amp;wcid-&gt;flags)) {</div><div class='add'>+		htr-&gt;to_ds = true;</div><div class='add'>+		htr-&gt;from_ds = true;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_wtbl_hdr_trans_tlv);</div><div class='ctx'> </div><div class='add'>+int mt76_connac_mcu_sta_update_hdr_trans(struct mt76_dev *dev,</div><div class='add'>+					 struct ieee80211_vif *vif,</div><div class='add'>+					 struct mt76_wcid *wcid, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct wtbl_req_hdr *wtbl_hdr;</div><div class='add'>+	struct tlv *sta_wtbl;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = mt76_connac_mcu_alloc_sta_req(dev, mvif, wcid);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+</div><div class='add'>+	sta_wtbl = mt76_connac_mcu_add_tlv(skb, STA_REC_WTBL,</div><div class='add'>+					   sizeof(struct tlv));</div><div class='add'>+</div><div class='add'>+	wtbl_hdr = mt76_connac_mcu_alloc_wtbl_req(dev, wcid, WTBL_SET,</div><div class='add'>+						  sta_wtbl, &amp;skb);</div><div class='add'>+	if (IS_ERR(wtbl_hdr))</div><div class='add'>+		return PTR_ERR(wtbl_hdr);</div><div class='add'>+</div><div class='add'>+	mt76_connac_mcu_wtbl_hdr_trans_tlv(skb, vif, wcid, sta_wtbl, wtbl_hdr);</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_skb_send_msg(dev, skb, cmd, true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_sta_update_hdr_trans);</div><div class='add'>+</div><div class='add'>+int mt76_connac_mcu_wtbl_update_hdr_trans(struct mt76_dev *dev,</div><div class='add'>+					  struct ieee80211_vif *vif,</div><div class='add'>+					  struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct mt76_wcid *wcid = (struct mt76_wcid *)sta-&gt;drv_priv;</div><div class='add'>+	struct wtbl_req_hdr *wtbl_hdr;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+</div><div class='add'>+	wtbl_hdr = mt76_connac_mcu_alloc_wtbl_req(dev, wcid, WTBL_SET, NULL,</div><div class='add'>+						  &amp;skb);</div><div class='add'>+	if (IS_ERR(wtbl_hdr))</div><div class='add'>+		return PTR_ERR(wtbl_hdr);</div><div class='add'>+</div><div class='add'>+	mt76_connac_mcu_wtbl_hdr_trans_tlv(skb, vif, wcid, NULL, wtbl_hdr);</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_skb_send_msg(dev, skb, MCU_EXT_CMD(WTBL_UPDATE), true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_wtbl_update_hdr_trans);</div><div class='add'>+</div><div class='ctx'> void mt76_connac_mcu_wtbl_generic_tlv(struct mt76_dev *dev,</div><div class='ctx'> 				      struct sk_buff *skb,</div><div class='ctx'> 				      struct ieee80211_vif *vif,</div><div class='ctx'> 				      struct ieee80211_sta *sta,</div><div class='ctx'> 				      void *sta_wtbl, void *wtbl_tlv)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_vif *mvif = (struct mt76_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct wtbl_generic *generic;</div><div class='ctx'> 	struct wtbl_rx *rx;</div><div class='ctx'> 	struct wtbl_spe *spe;</div><div class='hunk'>@@ -427,15 +559,14 @@ void mt76_connac_mcu_wtbl_generic_tlv(struct mt76_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 	if (sta) {</div><div class='ctx'> 		if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='del'>-			generic-&gt;partial_aid = cpu_to_le16(vif-&gt;bss_conf.aid);</div><div class='add'>+			generic-&gt;partial_aid = cpu_to_le16(vif-&gt;cfg.aid);</div><div class='ctx'> 		else</div><div class='ctx'> 			generic-&gt;partial_aid = cpu_to_le16(sta-&gt;aid);</div><div class='ctx'> 		memcpy(generic-&gt;peer_addr, sta-&gt;addr, ETH_ALEN);</div><div class='ctx'> 		generic-&gt;muar_idx = mvif-&gt;omac_idx;</div><div class='ctx'> 		generic-&gt;qos = sta-&gt;wme;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (is_mt7921(dev) &amp;&amp;</div><div class='del'>-		    vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+		if (!is_connac_v1(dev) &amp;&amp; vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='ctx'> 			memcpy(generic-&gt;peer_addr, vif-&gt;bss_conf.bssid,</div><div class='ctx'> 			       ETH_ALEN);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -452,7 +583,7 @@ void mt76_connac_mcu_wtbl_generic_tlv(struct mt76_dev *dev,</div><div class='ctx'> 	rx-&gt;rca2 = 1;</div><div class='ctx'> 	rx-&gt;rv = 1;</div><div class='ctx'> </div><div class='del'>-	if (is_mt7921(dev))</div><div class='add'>+	if (!is_connac_v1(dev))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	tlv = mt76_connac_mcu_add_nested_tlv(skb, WTBL_SPE, sizeof(*spe),</div><div class='hunk'>@@ -474,14 +605,14 @@ mt76_connac_mcu_sta_amsdu_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,</div><div class='ctx'> 	    vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!sta-&gt;max_amsdu_len)</div><div class='add'>+	if (!sta-&gt;deflink.agg.max_amsdu_len)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HW_AMSDU, sizeof(*amsdu));</div><div class='ctx'> 	amsdu = (struct sta_rec_amsdu *)tlv;</div><div class='ctx'> 	amsdu-&gt;max_amsdu_num = 8;</div><div class='ctx'> 	amsdu-&gt;amsdu_en = true;</div><div class='del'>-	amsdu-&gt;max_mpdu_size = sta-&gt;max_amsdu_len &gt;=</div><div class='add'>+	amsdu-&gt;max_mpdu_size = sta-&gt;deflink.agg.max_amsdu_len &gt;=</div><div class='ctx'> 			       IEEE80211_MAX_MPDU_LEN_VHT_7991;</div><div class='ctx'> </div><div class='ctx'> 	wcid-&gt;amsdu = true;</div><div class='hunk'>@@ -492,7 +623,7 @@ mt76_connac_mcu_sta_amsdu_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,</div><div class='ctx'> static void</div><div class='ctx'> mt76_connac_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sta_he_cap *he_cap = &amp;sta-&gt;he_cap;</div><div class='add'>+	struct ieee80211_sta_he_cap *he_cap = &amp;sta-&gt;deflink.he_cap;</div><div class='ctx'> 	struct ieee80211_he_cap_elem *elem = &amp;he_cap-&gt;he_cap_elem;</div><div class='ctx'> 	struct sta_rec_he *he;</div><div class='ctx'> 	struct tlv *tlv;</div><div class='hunk'>@@ -580,7 +711,7 @@ mt76_connac_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)</div><div class='ctx'> </div><div class='ctx'> 	he-&gt;he_cap = cpu_to_le32(cap);</div><div class='ctx'> </div><div class='del'>-	switch (sta-&gt;bandwidth) {</div><div class='add'>+	switch (sta-&gt;deflink.bandwidth) {</div><div class='ctx'> 	case IEEE80211_STA_RX_BW_160:</div><div class='ctx'> 		if (elem-&gt;phy_cap_info[0] &amp;</div><div class='ctx'> 		    IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G)</div><div class='hunk'>@@ -622,19 +753,56 @@ mt76_connac_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)</div><div class='ctx'> 	he-&gt;pkt_ext = 2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8</div><div class='add'>+void</div><div class='add'>+mt76_connac_mcu_sta_he_tlv_v2(struct sk_buff *skb, struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta_he_cap *he_cap = &amp;sta-&gt;deflink.he_cap;</div><div class='add'>+	struct ieee80211_he_cap_elem *elem = &amp;he_cap-&gt;he_cap_elem;</div><div class='add'>+	struct sta_rec_he_v2 *he;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HE_V2, sizeof(*he));</div><div class='add'>+</div><div class='add'>+	he = (struct sta_rec_he_v2 *)tlv;</div><div class='add'>+	memcpy(he-&gt;he_phy_cap, elem-&gt;phy_cap_info, sizeof(he-&gt;he_phy_cap));</div><div class='add'>+	memcpy(he-&gt;he_mac_cap, elem-&gt;mac_cap_info, sizeof(he-&gt;he_mac_cap));</div><div class='add'>+</div><div class='add'>+	switch (sta-&gt;deflink.bandwidth) {</div><div class='add'>+	case IEEE80211_STA_RX_BW_160:</div><div class='add'>+		if (elem-&gt;phy_cap_info[0] &amp;</div><div class='add'>+		    IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G)</div><div class='add'>+			he-&gt;max_nss_mcs[CMD_HE_MCS_BW8080] =</div><div class='add'>+				he_cap-&gt;he_mcs_nss_supp.rx_mcs_80p80;</div><div class='add'>+</div><div class='add'>+		he-&gt;max_nss_mcs[CMD_HE_MCS_BW160] =</div><div class='add'>+				he_cap-&gt;he_mcs_nss_supp.rx_mcs_160;</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		he-&gt;max_nss_mcs[CMD_HE_MCS_BW80] =</div><div class='add'>+				he_cap-&gt;he_mcs_nss_supp.rx_mcs_80;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	he-&gt;pkt_ext = IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_sta_he_tlv_v2);</div><div class='add'>+</div><div class='add'>+u8</div><div class='ctx'> mt76_connac_get_phy_mode_v2(struct mt76_phy *mphy, struct ieee80211_vif *vif,</div><div class='del'>-			    enum nl80211_band band, struct ieee80211_sta *sta)</div><div class='add'>+			    enum nl80211_band band,</div><div class='add'>+			    struct ieee80211_link_sta *link_sta)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sta_ht_cap *ht_cap;</div><div class='ctx'> 	struct ieee80211_sta_vht_cap *vht_cap;</div><div class='ctx'> 	const struct ieee80211_sta_he_cap *he_cap;</div><div class='add'>+	const struct ieee80211_sta_eht_cap *eht_cap;</div><div class='ctx'> 	u8 mode = 0;</div><div class='ctx'> </div><div class='del'>-	if (sta) {</div><div class='del'>-		ht_cap = &amp;sta-&gt;ht_cap;</div><div class='del'>-		vht_cap = &amp;sta-&gt;vht_cap;</div><div class='del'>-		he_cap = &amp;sta-&gt;he_cap;</div><div class='add'>+	if (link_sta) {</div><div class='add'>+		ht_cap = &amp;link_sta-&gt;ht_cap;</div><div class='add'>+		vht_cap = &amp;link_sta-&gt;vht_cap;</div><div class='add'>+		he_cap = &amp;link_sta-&gt;he_cap;</div><div class='add'>+		eht_cap = &amp;link_sta-&gt;eht_cap;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct ieee80211_supported_band *sband;</div><div class='ctx'> </div><div class='hunk'>@@ -642,6 +810,7 @@ mt76_connac_get_phy_mode_v2(struct mt76_phy *mphy, struct ieee80211_vif *vif,</div><div class='ctx'> 		ht_cap = &amp;sband-&gt;ht_cap;</div><div class='ctx'> 		vht_cap = &amp;sband-&gt;vht_cap;</div><div class='ctx'> 		he_cap = ieee80211_get_he_iftype_cap(sband, vif-&gt;type);</div><div class='add'>+		eht_cap = ieee80211_get_eht_iftype_cap(sband, vif-&gt;type);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (band == NL80211_BAND_2GHZ) {</div><div class='hunk'>@@ -650,9 +819,12 @@ mt76_connac_get_phy_mode_v2(struct mt76_phy *mphy, struct ieee80211_vif *vif,</div><div class='ctx'> 		if (ht_cap-&gt;ht_supported)</div><div class='ctx'> 			mode |= PHY_TYPE_BIT_HT;</div><div class='ctx'> </div><div class='del'>-		if (he_cap-&gt;has_he)</div><div class='add'>+		if (he_cap &amp;&amp; he_cap-&gt;has_he)</div><div class='ctx'> 			mode |= PHY_TYPE_BIT_HE;</div><div class='del'>-	} else if (band == NL80211_BAND_5GHZ) {</div><div class='add'>+</div><div class='add'>+		if (eht_cap &amp;&amp; eht_cap-&gt;has_eht)</div><div class='add'>+			mode |= PHY_TYPE_BIT_BE;</div><div class='add'>+	} else if (band == NL80211_BAND_5GHZ || band == NL80211_BAND_6GHZ) {</div><div class='ctx'> 		mode |= PHY_TYPE_BIT_OFDM;</div><div class='ctx'> </div><div class='ctx'> 		if (ht_cap-&gt;ht_supported)</div><div class='hunk'>@@ -661,46 +833,53 @@ mt76_connac_get_phy_mode_v2(struct mt76_phy *mphy, struct ieee80211_vif *vif,</div><div class='ctx'> 		if (vht_cap-&gt;vht_supported)</div><div class='ctx'> 			mode |= PHY_TYPE_BIT_VHT;</div><div class='ctx'> </div><div class='del'>-		if (he_cap-&gt;has_he)</div><div class='add'>+		if (he_cap &amp;&amp; he_cap-&gt;has_he)</div><div class='ctx'> 			mode |= PHY_TYPE_BIT_HE;</div><div class='add'>+</div><div class='add'>+		if (eht_cap &amp;&amp; eht_cap-&gt;has_eht)</div><div class='add'>+			mode |= PHY_TYPE_BIT_BE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return mode;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_get_phy_mode_v2);</div><div class='ctx'> </div><div class='ctx'> void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb,</div><div class='ctx'> 			     struct ieee80211_sta *sta,</div><div class='ctx'> 			     struct ieee80211_vif *vif,</div><div class='del'>-			     u8 rcpi)</div><div class='add'>+			     u8 rcpi, u8 sta_state)</div><div class='ctx'> {</div><div class='del'>-	struct cfg80211_chan_def *chandef = &amp;mphy-&gt;chandef;</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct cfg80211_chan_def *chandef = mvif-&gt;ctx ?</div><div class='add'>+					    &amp;mvif-&gt;ctx-&gt;def : &amp;mphy-&gt;chandef;</div><div class='ctx'> 	enum nl80211_band band = chandef-&gt;chan-&gt;band;</div><div class='ctx'> 	struct mt76_dev *dev = mphy-&gt;dev;</div><div class='ctx'> 	struct sta_rec_ra_info *ra_info;</div><div class='ctx'> 	struct sta_rec_state *state;</div><div class='ctx'> 	struct sta_rec_phy *phy;</div><div class='ctx'> 	struct tlv *tlv;</div><div class='add'>+	u16 supp_rates;</div><div class='ctx'> </div><div class='ctx'> 	/* starec ht */</div><div class='del'>-	if (sta-&gt;ht_cap.ht_supported) {</div><div class='add'>+	if (sta-&gt;deflink.ht_cap.ht_supported) {</div><div class='ctx'> 		struct sta_rec_ht *ht;</div><div class='ctx'> </div><div class='ctx'> 		tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HT, sizeof(*ht));</div><div class='ctx'> 		ht = (struct sta_rec_ht *)tlv;</div><div class='del'>-		ht-&gt;ht_cap = cpu_to_le16(sta-&gt;ht_cap.cap);</div><div class='add'>+		ht-&gt;ht_cap = cpu_to_le16(sta-&gt;deflink.ht_cap.cap);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* starec vht */</div><div class='del'>-	if (sta-&gt;vht_cap.vht_supported) {</div><div class='add'>+	if (sta-&gt;deflink.vht_cap.vht_supported) {</div><div class='ctx'> 		struct sta_rec_vht *vht;</div><div class='ctx'> 		int len;</div><div class='ctx'> </div><div class='ctx'> 		len = is_mt7921(dev) ? sizeof(*vht) : sizeof(*vht) - 4;</div><div class='ctx'> 		tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_VHT, len);</div><div class='ctx'> 		vht = (struct sta_rec_vht *)tlv;</div><div class='del'>-		vht-&gt;vht_cap = cpu_to_le32(sta-&gt;vht_cap.cap);</div><div class='del'>-		vht-&gt;vht_rx_mcs_map = sta-&gt;vht_cap.vht_mcs.rx_mcs_map;</div><div class='del'>-		vht-&gt;vht_tx_mcs_map = sta-&gt;vht_cap.vht_mcs.tx_mcs_map;</div><div class='add'>+		vht-&gt;vht_cap = cpu_to_le32(sta-&gt;deflink.vht_cap.cap);</div><div class='add'>+		vht-&gt;vht_rx_mcs_map = sta-&gt;deflink.vht_cap.vht_mcs.rx_mcs_map;</div><div class='add'>+		vht-&gt;vht_tx_mcs_map = sta-&gt;deflink.vht_cap.vht_mcs.tx_mcs_map;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* starec uapsd */</div><div class='hunk'>@@ -709,42 +888,67 @@ void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb,</div><div class='ctx'> 	if (!is_mt7921(dev))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;ht_cap.ht_supported)</div><div class='add'>+	if (sta-&gt;deflink.ht_cap.ht_supported || sta-&gt;deflink.he_cap.has_he)</div><div class='ctx'> 		mt76_connac_mcu_sta_amsdu_tlv(skb, sta, vif);</div><div class='ctx'> </div><div class='ctx'> 	/* starec he */</div><div class='del'>-	if (sta-&gt;he_cap.has_he)</div><div class='add'>+	if (sta-&gt;deflink.he_cap.has_he) {</div><div class='ctx'> 		mt76_connac_mcu_sta_he_tlv(skb, sta);</div><div class='add'>+		mt76_connac_mcu_sta_he_tlv_v2(skb, sta);</div><div class='add'>+		if (band == NL80211_BAND_6GHZ &amp;&amp;</div><div class='add'>+		    sta_state == MT76_STA_INFO_STATE_ASSOC) {</div><div class='add'>+			struct sta_rec_he_6g_capa *he_6g_capa;</div><div class='add'>+</div><div class='add'>+			tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HE_6G,</div><div class='add'>+						      sizeof(*he_6g_capa));</div><div class='add'>+			he_6g_capa = (struct sta_rec_he_6g_capa *)tlv;</div><div class='add'>+			he_6g_capa-&gt;capa = sta-&gt;deflink.he_6ghz_capa.capa;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_PHY, sizeof(*phy));</div><div class='ctx'> 	phy = (struct sta_rec_phy *)tlv;</div><div class='del'>-	phy-&gt;phy_type = mt76_connac_get_phy_mode_v2(mphy, vif, band, sta);</div><div class='add'>+	phy-&gt;phy_type = mt76_connac_get_phy_mode_v2(mphy, vif, band,</div><div class='add'>+						    &amp;sta-&gt;deflink);</div><div class='ctx'> 	phy-&gt;basic_rate = cpu_to_le16((u16)vif-&gt;bss_conf.basic_rates);</div><div class='ctx'> 	phy-&gt;rcpi = rcpi;</div><div class='add'>+	phy-&gt;ampdu = FIELD_PREP(IEEE80211_HT_AMPDU_PARM_FACTOR,</div><div class='add'>+				sta-&gt;deflink.ht_cap.ampdu_factor) |</div><div class='add'>+		     FIELD_PREP(IEEE80211_HT_AMPDU_PARM_DENSITY,</div><div class='add'>+				sta-&gt;deflink.ht_cap.ampdu_density);</div><div class='ctx'> </div><div class='ctx'> 	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_RA, sizeof(*ra_info));</div><div class='ctx'> 	ra_info = (struct sta_rec_ra_info *)tlv;</div><div class='del'>-	ra_info-&gt;legacy = cpu_to_le16((u16)sta-&gt;supp_rates[band]);</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;ht_cap.ht_supported)</div><div class='del'>-		memcpy(ra_info-&gt;rx_mcs_bitmask, sta-&gt;ht_cap.mcs.rx_mask,</div><div class='add'>+	supp_rates = sta-&gt;deflink.supp_rates[band];</div><div class='add'>+	if (band == NL80211_BAND_2GHZ)</div><div class='add'>+		supp_rates = FIELD_PREP(RA_LEGACY_OFDM, supp_rates &gt;&gt; 4) |</div><div class='add'>+			     FIELD_PREP(RA_LEGACY_CCK, supp_rates &amp; 0xf);</div><div class='add'>+	else</div><div class='add'>+		supp_rates = FIELD_PREP(RA_LEGACY_OFDM, supp_rates);</div><div class='add'>+</div><div class='add'>+	ra_info-&gt;legacy = cpu_to_le16(supp_rates);</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;deflink.ht_cap.ht_supported)</div><div class='add'>+		memcpy(ra_info-&gt;rx_mcs_bitmask,</div><div class='add'>+		       sta-&gt;deflink.ht_cap.mcs.rx_mask,</div><div class='ctx'> 		       HT_MCS_MASK_NUM);</div><div class='ctx'> </div><div class='ctx'> 	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_STATE, sizeof(*state));</div><div class='ctx'> 	state = (struct sta_rec_state *)tlv;</div><div class='del'>-	state-&gt;state = 2;</div><div class='add'>+	state-&gt;state = sta_state;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;vht_cap.vht_supported) {</div><div class='del'>-		state-&gt;vht_opmode = sta-&gt;bandwidth;</div><div class='del'>-		state-&gt;vht_opmode |= (sta-&gt;rx_nss - 1) &lt;&lt;</div><div class='add'>+	if (sta-&gt;deflink.vht_cap.vht_supported) {</div><div class='add'>+		state-&gt;vht_opmode = sta-&gt;deflink.bandwidth;</div><div class='add'>+		state-&gt;vht_opmode |= (sta-&gt;deflink.rx_nss - 1) &lt;&lt;</div><div class='ctx'> 			IEEE80211_OPMODE_NOTIF_RX_NSS_SHIFT;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_sta_tlv);</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt76_connac_mcu_wtbl_smps_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,</div><div class='del'>-			      void *sta_wtbl, void *wtbl_tlv)</div><div class='add'>+void mt76_connac_mcu_wtbl_smps_tlv(struct sk_buff *skb,</div><div class='add'>+				   struct ieee80211_sta *sta,</div><div class='add'>+				   void *sta_wtbl, void *wtbl_tlv)</div><div class='ctx'> {</div><div class='ctx'> 	struct wtbl_smps *smps;</div><div class='ctx'> 	struct tlv *tlv;</div><div class='hunk'>@@ -752,30 +956,39 @@ mt76_connac_mcu_wtbl_smps_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,</div><div class='ctx'> 	tlv = mt76_connac_mcu_add_nested_tlv(skb, WTBL_SMPS, sizeof(*smps),</div><div class='ctx'> 					     wtbl_tlv, sta_wtbl);</div><div class='ctx'> 	smps = (struct wtbl_smps *)tlv;</div><div class='del'>-</div><div class='del'>-	if (sta-&gt;smps_mode == IEEE80211_SMPS_DYNAMIC)</div><div class='del'>-		smps-&gt;smps = true;</div><div class='add'>+	smps-&gt;smps = (sta-&gt;deflink.smps_mode == IEEE80211_SMPS_DYNAMIC);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_wtbl_smps_tlv);</div><div class='ctx'> </div><div class='ctx'> void mt76_connac_mcu_wtbl_ht_tlv(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 				 struct ieee80211_sta *sta, void *sta_wtbl,</div><div class='del'>-				 void *wtbl_tlv)</div><div class='add'>+				 void *wtbl_tlv, bool ht_ldpc, bool vht_ldpc)</div><div class='ctx'> {</div><div class='ctx'> 	struct wtbl_ht *ht = NULL;</div><div class='ctx'> 	struct tlv *tlv;</div><div class='ctx'> 	u32 flags = 0;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;ht_cap.ht_supported) {</div><div class='add'>+	if (sta-&gt;deflink.ht_cap.ht_supported || sta-&gt;deflink.he_6ghz_capa.capa) {</div><div class='ctx'> 		tlv = mt76_connac_mcu_add_nested_tlv(skb, WTBL_HT, sizeof(*ht),</div><div class='ctx'> 						     wtbl_tlv, sta_wtbl);</div><div class='ctx'> 		ht = (struct wtbl_ht *)tlv;</div><div class='del'>-		ht-&gt;ldpc = !!(sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_LDPC_CODING);</div><div class='del'>-		ht-&gt;af = sta-&gt;ht_cap.ampdu_factor;</div><div class='del'>-		ht-&gt;mm = sta-&gt;ht_cap.ampdu_density;</div><div class='add'>+		ht-&gt;ldpc = ht_ldpc &amp;&amp;</div><div class='add'>+			   !!(sta-&gt;deflink.ht_cap.cap &amp; IEEE80211_HT_CAP_LDPC_CODING);</div><div class='add'>+</div><div class='add'>+		if (sta-&gt;deflink.ht_cap.ht_supported) {</div><div class='add'>+			ht-&gt;af = sta-&gt;deflink.ht_cap.ampdu_factor;</div><div class='add'>+			ht-&gt;mm = sta-&gt;deflink.ht_cap.ampdu_density;</div><div class='add'>+		} else {</div><div class='add'>+			ht-&gt;af = le16_get_bits(sta-&gt;deflink.he_6ghz_capa.capa,</div><div class='add'>+					       IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP);</div><div class='add'>+			ht-&gt;mm = le16_get_bits(sta-&gt;deflink.he_6ghz_capa.capa,</div><div class='add'>+					       IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		ht-&gt;ht = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;vht_cap.vht_supported) {</div><div class='add'>+	if (sta-&gt;deflink.vht_cap.vht_supported || sta-&gt;deflink.he_6ghz_capa.capa) {</div><div class='ctx'> 		struct wtbl_vht *vht;</div><div class='ctx'> 		u8 af;</div><div class='ctx'> </div><div class='hunk'>@@ -783,18 +996,19 @@ void mt76_connac_mcu_wtbl_ht_tlv(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 						     sizeof(*vht), wtbl_tlv,</div><div class='ctx'> 						     sta_wtbl);</div><div class='ctx'> 		vht = (struct wtbl_vht *)tlv;</div><div class='del'>-		vht-&gt;ldpc = !!(sta-&gt;vht_cap.cap &amp; IEEE80211_VHT_CAP_RXLDPC);</div><div class='add'>+		vht-&gt;ldpc = vht_ldpc &amp;&amp;</div><div class='add'>+			    !!(sta-&gt;deflink.vht_cap.cap &amp; IEEE80211_VHT_CAP_RXLDPC);</div><div class='ctx'> 		vht-&gt;vht = true;</div><div class='ctx'> </div><div class='ctx'> 		af = FIELD_GET(IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK,</div><div class='del'>-			       sta-&gt;vht_cap.cap);</div><div class='add'>+			       sta-&gt;deflink.vht_cap.cap);</div><div class='ctx'> 		if (ht)</div><div class='ctx'> 			ht-&gt;af = max(ht-&gt;af, af);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mt76_connac_mcu_wtbl_smps_tlv(skb, sta, sta_wtbl, wtbl_tlv);</div><div class='ctx'> </div><div class='del'>-	if (!is_mt7921(dev) &amp;&amp; sta-&gt;ht_cap.ht_supported) {</div><div class='add'>+	if (is_connac_v1(dev) &amp;&amp; sta-&gt;deflink.ht_cap.ht_supported) {</div><div class='ctx'> 		/* sgi */</div><div class='ctx'> 		u32 msk = MT_WTBL_W5_SHORT_GI_20 | MT_WTBL_W5_SHORT_GI_40 |</div><div class='ctx'> 			  MT_WTBL_W5_SHORT_GI_80 | MT_WTBL_W5_SHORT_GI_160;</div><div class='hunk'>@@ -804,15 +1018,15 @@ void mt76_connac_mcu_wtbl_ht_tlv(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 						     sizeof(*raw), wtbl_tlv,</div><div class='ctx'> 						     sta_wtbl);</div><div class='ctx'> </div><div class='del'>-		if (sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_20)</div><div class='add'>+		if (sta-&gt;deflink.ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_20)</div><div class='ctx'> 			flags |= MT_WTBL_W5_SHORT_GI_20;</div><div class='del'>-		if (sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_40)</div><div class='add'>+		if (sta-&gt;deflink.ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_40)</div><div class='ctx'> 			flags |= MT_WTBL_W5_SHORT_GI_40;</div><div class='ctx'> </div><div class='del'>-		if (sta-&gt;vht_cap.vht_supported) {</div><div class='del'>-			if (sta-&gt;vht_cap.cap &amp; IEEE80211_VHT_CAP_SHORT_GI_80)</div><div class='add'>+		if (sta-&gt;deflink.vht_cap.vht_supported) {</div><div class='add'>+			if (sta-&gt;deflink.vht_cap.cap &amp; IEEE80211_VHT_CAP_SHORT_GI_80)</div><div class='ctx'> 				flags |= MT_WTBL_W5_SHORT_GI_80;</div><div class='del'>-			if (sta-&gt;vht_cap.cap &amp; IEEE80211_VHT_CAP_SHORT_GI_160)</div><div class='add'>+			if (sta-&gt;deflink.vht_cap.cap &amp; IEEE80211_VHT_CAP_SHORT_GI_160)</div><div class='ctx'> 				flags |= MT_WTBL_W5_SHORT_GI_160;</div><div class='ctx'> 		}</div><div class='ctx'> 		raw = (struct wtbl_raw *)tlv;</div><div class='hunk'>@@ -824,23 +1038,35 @@ void mt76_connac_mcu_wtbl_ht_tlv(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_wtbl_ht_tlv);</div><div class='ctx'> </div><div class='del'>-int mt76_connac_mcu_add_sta_cmd(struct mt76_phy *phy,</div><div class='del'>-				struct mt76_sta_cmd_info *info)</div><div class='add'>+int mt76_connac_mcu_sta_cmd(struct mt76_phy *phy,</div><div class='add'>+			    struct mt76_sta_cmd_info *info)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_vif *mvif = (struct mt76_vif *)info-&gt;vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)info-&gt;vif-&gt;drv_priv;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='ctx'> 	struct mt76_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct wtbl_req_hdr *wtbl_hdr;</div><div class='ctx'> 	struct tlv *sta_wtbl;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	int conn_state;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;link_conf)</div><div class='add'>+		info-&gt;link_conf = &amp;info-&gt;vif-&gt;bss_conf;</div><div class='ctx'> </div><div class='ctx'> 	skb = mt76_connac_mcu_alloc_sta_req(dev, mvif, info-&gt;wcid);</div><div class='ctx'> 	if (IS_ERR(skb))</div><div class='ctx'> 		return PTR_ERR(skb);</div><div class='ctx'> </div><div class='del'>-	mt76_connac_mcu_sta_basic_tlv(skb, info-&gt;vif, info-&gt;sta, info-&gt;enable);</div><div class='del'>-	if (info-&gt;enable &amp;&amp; info-&gt;sta)</div><div class='del'>-		mt76_connac_mcu_sta_tlv(phy, skb, info-&gt;sta, info-&gt;vif,</div><div class='del'>-					info-&gt;rcpi);</div><div class='add'>+	conn_state = info-&gt;enable ? CONN_STATE_PORT_SECURE :</div><div class='add'>+				    CONN_STATE_DISCONNECT;</div><div class='add'>+	link_sta = info-&gt;sta ? &amp;info-&gt;sta-&gt;deflink : NULL;</div><div class='add'>+	if (info-&gt;sta || !info-&gt;offload_fw)</div><div class='add'>+		mt76_connac_mcu_sta_basic_tlv(dev, skb, info-&gt;link_conf,</div><div class='add'>+					      link_sta, conn_state,</div><div class='add'>+					      info-&gt;newly);</div><div class='add'>+	if (info-&gt;sta &amp;&amp; info-&gt;enable)</div><div class='add'>+		mt76_connac_mcu_sta_tlv(phy, skb, info-&gt;sta,</div><div class='add'>+					info-&gt;vif, info-&gt;rcpi,</div><div class='add'>+					info-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 	sta_wtbl = mt76_connac_mcu_add_tlv(skb, STA_REC_WTBL,</div><div class='ctx'> 					   sizeof(struct tlv));</div><div class='hunk'>@@ -855,14 +1081,17 @@ int mt76_connac_mcu_add_sta_cmd(struct mt76_phy *phy,</div><div class='ctx'> 		mt76_connac_mcu_wtbl_generic_tlv(dev, skb, info-&gt;vif,</div><div class='ctx'> 						 info-&gt;sta, sta_wtbl,</div><div class='ctx'> 						 wtbl_hdr);</div><div class='add'>+		mt76_connac_mcu_wtbl_hdr_trans_tlv(skb, info-&gt;vif, info-&gt;wcid,</div><div class='add'>+						   sta_wtbl, wtbl_hdr);</div><div class='ctx'> 		if (info-&gt;sta)</div><div class='ctx'> 			mt76_connac_mcu_wtbl_ht_tlv(dev, skb, info-&gt;sta,</div><div class='del'>-						    sta_wtbl, wtbl_hdr);</div><div class='add'>+						    sta_wtbl, wtbl_hdr,</div><div class='add'>+						    true, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return mt76_mcu_skb_send_msg(dev, skb, info-&gt;cmd, true);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(mt76_connac_mcu_add_sta_cmd);</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_sta_cmd);</div><div class='ctx'> </div><div class='ctx'> void mt76_connac_mcu_wtbl_ba_tlv(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 				 struct ieee80211_ampdu_params *params,</div><div class='hunk'>@@ -891,11 +1120,13 @@ void mt76_connac_mcu_wtbl_ba_tlv(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 		ba-&gt;rst_ba_sb = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (is_mt7921(dev))</div><div class='add'>+	if (!is_connac_v1(dev)) {</div><div class='add'>+		ba-&gt;ba_winsize = enable ? cpu_to_le16(params-&gt;buf_size) : 0;</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (enable &amp;&amp; tx) {</div><div class='del'>-		u8 ba_range[] = { 4, 8, 12, 24, 36, 48, 54, 64 };</div><div class='add'>+		static const u8 ba_range[] = { 4, 8, 12, 24, 36, 48, 54, 64 };</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 7; i &gt; 0; i--) {</div><div class='hunk'>@@ -908,11 +1139,11 @@ void mt76_connac_mcu_wtbl_ba_tlv(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_wtbl_ba_tlv);</div><div class='ctx'> </div><div class='ctx'> int mt76_connac_mcu_uni_add_dev(struct mt76_phy *phy,</div><div class='del'>-				struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_bss_conf *bss_conf,</div><div class='add'>+				struct mt76_vif_link *mvif,</div><div class='ctx'> 				struct mt76_wcid *wcid,</div><div class='ctx'> 				bool enable)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_vif *mvif = (struct mt76_vif *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct mt76_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct {</div><div class='hunk'>@@ -924,7 +1155,7 @@ int mt76_connac_mcu_uni_add_dev(struct mt76_phy *phy,</div><div class='ctx'> 			__le16 tag;</div><div class='ctx'> 			__le16 len;</div><div class='ctx'> 			u8 active;</div><div class='del'>-			u8 pad;</div><div class='add'>+			u8 link_idx; /* not link_id */</div><div class='ctx'> 			u8 omac_addr[ETH_ALEN];</div><div class='ctx'> 		} __packed tlv;</div><div class='ctx'> 	} dev_req = {</div><div class='hunk'>@@ -936,6 +1167,7 @@ int mt76_connac_mcu_uni_add_dev(struct mt76_phy *phy,</div><div class='ctx'> 			.tag = cpu_to_le16(DEV_INFO_ACTIVE),</div><div class='ctx'> 			.len = cpu_to_le16(sizeof(struct req_tlv)),</div><div class='ctx'> 			.active = enable,</div><div class='add'>+			.link_idx = mvif-&gt;link_idx,</div><div class='ctx'> 		},</div><div class='ctx'> 	};</div><div class='ctx'> 	struct {</div><div class='hunk'>@@ -958,12 +1190,13 @@ int mt76_connac_mcu_uni_add_dev(struct mt76_phy *phy,</div><div class='ctx'> 			.bmc_tx_wlan_idx = cpu_to_le16(wcid-&gt;idx),</div><div class='ctx'> 			.sta_idx = cpu_to_le16(wcid-&gt;idx),</div><div class='ctx'> 			.conn_state = 1,</div><div class='add'>+			.link_idx = mvif-&gt;link_idx,</div><div class='ctx'> 		},</div><div class='ctx'> 	};</div><div class='ctx'> 	int err, idx, cmd, len;</div><div class='ctx'> 	void *data;</div><div class='ctx'> </div><div class='del'>-	switch (vif-&gt;type) {</div><div class='add'>+	switch (bss_conf-&gt;vif-&gt;type) {</div><div class='ctx'> 	case NL80211_IFTYPE_MESH_POINT:</div><div class='ctx'> 	case NL80211_IFTYPE_MONITOR:</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='hunk'>@@ -972,6 +1205,9 @@ int mt76_connac_mcu_uni_add_dev(struct mt76_phy *phy,</div><div class='ctx'> 	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 		basic_req.basic.conn_type = cpu_to_le32(CONNECTION_INFRA_STA);</div><div class='ctx'> 		break;</div><div class='add'>+	case NL80211_IFTYPE_P2P_DEVICE:</div><div class='add'>+		basic_req.basic.conn_type = cpu_to_le32(CONNECTION_P2P_GO);</div><div class='add'>+		break;</div><div class='ctx'> 	case NL80211_IFTYPE_ADHOC:</div><div class='ctx'> 		basic_req.basic.conn_type = cpu_to_le32(CONNECTION_IBSS_ADHOC);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -983,9 +1219,9 @@ int mt76_connac_mcu_uni_add_dev(struct mt76_phy *phy,</div><div class='ctx'> 	idx = mvif-&gt;omac_idx &gt; EXT_BSSID_START ? HW_BSSID_0 : mvif-&gt;omac_idx;</div><div class='ctx'> 	basic_req.basic.hw_bss_idx = idx;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev_req.tlv.omac_addr, vif-&gt;addr, ETH_ALEN);</div><div class='add'>+	memcpy(dev_req.tlv.omac_addr, bss_conf-&gt;addr, ETH_ALEN);</div><div class='ctx'> </div><div class='del'>-	cmd = enable ? MCU_UNI_CMD_DEV_INFO_UPDATE : MCU_UNI_CMD_BSS_INFO_UPDATE;</div><div class='add'>+	cmd = enable ? MCU_UNI_CMD(DEV_INFO_UPDATE) : MCU_UNI_CMD(BSS_INFO_UPDATE);</div><div class='ctx'> 	data = enable ? (void *)&amp;dev_req : (void *)&amp;basic_req;</div><div class='ctx'> 	len = enable ? sizeof(dev_req) : sizeof(basic_req);</div><div class='ctx'> </div><div class='hunk'>@@ -993,7 +1229,7 @@ int mt76_connac_mcu_uni_add_dev(struct mt76_phy *phy,</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	cmd = enable ? MCU_UNI_CMD_BSS_INFO_UPDATE : MCU_UNI_CMD_DEV_INFO_UPDATE;</div><div class='add'>+	cmd = enable ? MCU_UNI_CMD(BSS_INFO_UPDATE) : MCU_UNI_CMD(DEV_INFO_UPDATE);</div><div class='ctx'> 	data = enable ? (void *)&amp;basic_req : (void *)&amp;dev_req;</div><div class='ctx'> 	len = enable ? sizeof(basic_req) : sizeof(dev_req);</div><div class='ctx'> </div><div class='hunk'>@@ -1020,9 +1256,22 @@ void mt76_connac_mcu_sta_ba_tlv(struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_sta_ba_tlv);</div><div class='ctx'> </div><div class='del'>-int mt76_connac_mcu_sta_ba(struct mt76_dev *dev, struct mt76_vif *mvif,</div><div class='add'>+int mt76_connac_mcu_sta_wed_update(struct mt76_dev *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (!mt76_is_mmio(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!mtk_wed_device_active(&amp;dev-&gt;mmio.wed))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return mtk_wed_device_update_msg(&amp;dev-&gt;mmio.wed, WED_WO_STA_REC,</div><div class='add'>+					 skb-&gt;data, skb-&gt;len);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_sta_wed_update);</div><div class='add'>+</div><div class='add'>+int mt76_connac_mcu_sta_ba(struct mt76_dev *dev, struct mt76_vif_link *mvif,</div><div class='ctx'> 			   struct ieee80211_ampdu_params *params,</div><div class='del'>-			   bool enable, bool tx)</div><div class='add'>+			   int cmd, bool enable, bool tx)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_wcid *wcid = (struct mt76_wcid *)params-&gt;sta-&gt;drv_priv;</div><div class='ctx'> 	struct wtbl_req_hdr *wtbl_hdr;</div><div class='hunk'>@@ -1045,7 +1294,11 @@ int mt76_connac_mcu_sta_ba(struct mt76_dev *dev, struct mt76_vif *mvif,</div><div class='ctx'> 	mt76_connac_mcu_wtbl_ba_tlv(dev, skb, params, enable, tx, sta_wtbl,</div><div class='ctx'> 				    wtbl_hdr);</div><div class='ctx'> </div><div class='del'>-	ret = mt76_mcu_skb_send_msg(dev, skb, MCU_UNI_CMD_STA_REC_UPDATE, true);</div><div class='add'>+	ret = mt76_connac_mcu_sta_wed_update(dev, skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_mcu_skb_send_msg(dev, skb, cmd, true);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1055,15 +1308,17 @@ int mt76_connac_mcu_sta_ba(struct mt76_dev *dev, struct mt76_vif *mvif,</div><div class='ctx'> </div><div class='ctx'> 	mt76_connac_mcu_sta_ba_tlv(skb, params, enable, tx);</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_skb_send_msg(dev, skb, MCU_UNI_CMD_STA_REC_UPDATE,</div><div class='del'>-				     true);</div><div class='add'>+	ret = mt76_connac_mcu_sta_wed_update(dev, skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_skb_send_msg(dev, skb, cmd, true);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_sta_ba);</div><div class='ctx'> </div><div class='del'>-static u8</div><div class='del'>-mt76_connac_get_phy_mode(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='del'>-			 enum nl80211_band band,</div><div class='del'>-			 struct ieee80211_sta *sta)</div><div class='add'>+u8 mt76_connac_get_phy_mode(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='add'>+			    enum nl80211_band band,</div><div class='add'>+			    struct ieee80211_link_sta *link_sta)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	const struct ieee80211_sta_he_cap *he_cap;</div><div class='hunk'>@@ -1071,13 +1326,13 @@ mt76_connac_get_phy_mode(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 	struct ieee80211_sta_ht_cap *ht_cap;</div><div class='ctx'> 	u8 mode = 0;</div><div class='ctx'> </div><div class='del'>-	if (!is_mt7921(dev))</div><div class='add'>+	if (is_connac_v1(dev))</div><div class='ctx'> 		return 0x38;</div><div class='ctx'> </div><div class='del'>-	if (sta) {</div><div class='del'>-		ht_cap = &amp;sta-&gt;ht_cap;</div><div class='del'>-		vht_cap = &amp;sta-&gt;vht_cap;</div><div class='del'>-		he_cap = &amp;sta-&gt;he_cap;</div><div class='add'>+	if (link_sta) {</div><div class='add'>+		ht_cap = &amp;link_sta-&gt;ht_cap;</div><div class='add'>+		vht_cap = &amp;link_sta-&gt;vht_cap;</div><div class='add'>+		he_cap = &amp;link_sta-&gt;he_cap;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct ieee80211_supported_band *sband;</div><div class='ctx'> </div><div class='hunk'>@@ -1093,7 +1348,7 @@ mt76_connac_get_phy_mode(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 		if (ht_cap-&gt;ht_supported)</div><div class='ctx'> 			mode |= PHY_MODE_GN;</div><div class='ctx'> </div><div class='del'>-		if (he_cap-&gt;has_he)</div><div class='add'>+		if (he_cap &amp;&amp; he_cap-&gt;has_he)</div><div class='ctx'> 			mode |= PHY_MODE_AX_24G;</div><div class='ctx'> 	} else if (band == NL80211_BAND_5GHZ) {</div><div class='ctx'> 		mode |= PHY_MODE_A;</div><div class='hunk'>@@ -1104,23 +1359,77 @@ mt76_connac_get_phy_mode(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 		if (vht_cap-&gt;vht_supported)</div><div class='ctx'> 			mode |= PHY_MODE_AC;</div><div class='ctx'> </div><div class='del'>-		if (he_cap-&gt;has_he)</div><div class='add'>+		if (he_cap &amp;&amp; he_cap-&gt;has_he)</div><div class='ctx'> 			mode |= PHY_MODE_AX_5G;</div><div class='add'>+	} else if (band == NL80211_BAND_6GHZ) {</div><div class='add'>+		mode |= PHY_MODE_A | PHY_MODE_AN |</div><div class='add'>+			PHY_MODE_AC | PHY_MODE_AX_5G;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mode;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_get_phy_mode);</div><div class='add'>+</div><div class='add'>+u8 mt76_connac_get_phy_mode_ext(struct mt76_phy *phy, struct ieee80211_bss_conf *conf,</div><div class='add'>+				enum nl80211_band band)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_sta_eht_cap *eht_cap;</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	u8 mode = 0;</div><div class='add'>+</div><div class='add'>+	if (band == NL80211_BAND_6GHZ)</div><div class='add'>+		mode |= PHY_MODE_AX_6G;</div><div class='add'>+</div><div class='add'>+	sband = phy-&gt;hw-&gt;wiphy-&gt;bands[band];</div><div class='add'>+	eht_cap = ieee80211_get_eht_iftype_cap(sband, conf-&gt;vif-&gt;type);</div><div class='add'>+</div><div class='add'>+	if (!eht_cap || !eht_cap-&gt;has_eht || !conf-&gt;eht_support)</div><div class='add'>+		return mode;</div><div class='add'>+</div><div class='add'>+	switch (band) {</div><div class='add'>+	case NL80211_BAND_6GHZ:</div><div class='add'>+		mode |= PHY_MODE_BE_6G;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_BAND_5GHZ:</div><div class='add'>+		mode |= PHY_MODE_BE_5G;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_BAND_2GHZ:</div><div class='add'>+		mode |= PHY_MODE_BE_24G;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return mode;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_get_phy_mode_ext);</div><div class='ctx'> </div><div class='del'>-static const struct ieee80211_sta_he_cap *</div><div class='add'>+const struct ieee80211_sta_he_cap *</div><div class='ctx'> mt76_connac_get_he_phy_cap(struct mt76_phy *phy, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	enum nl80211_band band = phy-&gt;chandef.chan-&gt;band;</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct cfg80211_chan_def *chandef = mvif-&gt;ctx ?</div><div class='add'>+					    &amp;mvif-&gt;ctx-&gt;def : &amp;phy-&gt;chandef;</div><div class='add'>+	enum nl80211_band band = chandef-&gt;chan-&gt;band;</div><div class='ctx'> 	struct ieee80211_supported_band *sband;</div><div class='ctx'> </div><div class='ctx'> 	sband = phy-&gt;hw-&gt;wiphy-&gt;bands[band];</div><div class='ctx'> </div><div class='ctx'> 	return ieee80211_get_he_iftype_cap(sband, vif-&gt;type);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_get_he_phy_cap);</div><div class='add'>+</div><div class='add'>+const struct ieee80211_sta_eht_cap *</div><div class='add'>+mt76_connac_get_eht_phy_cap(struct mt76_phy *phy, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	enum nl80211_band band = phy-&gt;chandef.chan-&gt;band;</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+</div><div class='add'>+	sband = phy-&gt;hw-&gt;wiphy-&gt;bands[band];</div><div class='add'>+</div><div class='add'>+	return ieee80211_get_eht_iftype_cap(sband, vif-&gt;type);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_get_eht_phy_cap);</div><div class='ctx'> </div><div class='ctx'> #define DEFAULT_HE_PE_DURATION		4</div><div class='ctx'> #define DEFAULT_HE_DURATION_RTS_THRES	1023</div><div class='hunk'>@@ -1147,13 +1456,10 @@ mt76_connac_mcu_uni_bss_he_tlv(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 	he-&gt;max_nss_mcs[CMD_HE_MCS_BW8080] = cap-&gt;he_mcs_nss_supp.tx_mcs_80p80;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt76_connac_mcu_uni_add_bss(struct mt76_phy *phy,</div><div class='del'>-				struct ieee80211_vif *vif,</div><div class='del'>-				struct mt76_wcid *wcid,</div><div class='del'>-				bool enable)</div><div class='add'>+int mt76_connac_mcu_uni_set_chctx(struct mt76_phy *phy, struct mt76_vif_link *mvif,</div><div class='add'>+				  struct ieee80211_chanctx_conf *ctx)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_vif *mvif = (struct mt76_vif *)vif-&gt;drv_priv;</div><div class='del'>-	struct cfg80211_chan_def *chandef = &amp;phy-&gt;chandef;</div><div class='add'>+	struct cfg80211_chan_def *chandef = ctx ? &amp;ctx-&gt;def : &amp;phy-&gt;chandef;</div><div class='ctx'> 	int freq1 = chandef-&gt;center_freq1, freq2 = chandef-&gt;center_freq2;</div><div class='ctx'> 	enum nl80211_band band = chandef-&gt;chan-&gt;band;</div><div class='ctx'> 	struct mt76_dev *mdev = phy-&gt;dev;</div><div class='hunk'>@@ -1162,34 +1468,6 @@ int mt76_connac_mcu_uni_add_bss(struct mt76_phy *phy,</div><div class='ctx'> 			u8 bss_idx;</div><div class='ctx'> 			u8 pad[3];</div><div class='ctx'> 		} __packed hdr;</div><div class='del'>-		struct mt76_connac_bss_basic_tlv basic;</div><div class='del'>-		struct mt76_connac_bss_qos_tlv qos;</div><div class='del'>-	} basic_req = {</div><div class='del'>-		.hdr = {</div><div class='del'>-			.bss_idx = mvif-&gt;idx,</div><div class='del'>-		},</div><div class='del'>-		.basic = {</div><div class='del'>-			.tag = cpu_to_le16(UNI_BSS_INFO_BASIC),</div><div class='del'>-			.len = cpu_to_le16(sizeof(struct mt76_connac_bss_basic_tlv)),</div><div class='del'>-			.bcn_interval = cpu_to_le16(vif-&gt;bss_conf.beacon_int),</div><div class='del'>-			.dtim_period = vif-&gt;bss_conf.dtim_period,</div><div class='del'>-			.omac_idx = mvif-&gt;omac_idx,</div><div class='del'>-			.band_idx = mvif-&gt;band_idx,</div><div class='del'>-			.wmm_idx = mvif-&gt;wmm_idx,</div><div class='del'>-			.active = true, /* keep bss deactivated */</div><div class='del'>-			.phymode = mt76_connac_get_phy_mode(phy, vif, band, NULL),</div><div class='del'>-		},</div><div class='del'>-		.qos = {</div><div class='del'>-			.tag = cpu_to_le16(UNI_BSS_INFO_QBSS),</div><div class='del'>-			.len = cpu_to_le16(sizeof(struct mt76_connac_bss_qos_tlv)),</div><div class='del'>-			.qos = vif-&gt;bss_conf.qos,</div><div class='del'>-		},</div><div class='del'>-	};</div><div class='del'>-	struct {</div><div class='del'>-		struct {</div><div class='del'>-			u8 bss_idx;</div><div class='del'>-			u8 pad[3];</div><div class='del'>-		} __packed hdr;</div><div class='ctx'> 		struct rlm_tlv {</div><div class='ctx'> 			__le16 tag;</div><div class='ctx'> 			__le16 len;</div><div class='hunk'>@@ -1202,7 +1480,8 @@ int mt76_connac_mcu_uni_add_bss(struct mt76_phy *phy,</div><div class='ctx'> 			u8 short_st;</div><div class='ctx'> 			u8 ht_op_info;</div><div class='ctx'> 			u8 sco;</div><div class='del'>-			u8 pad[3];</div><div class='add'>+			u8 band;</div><div class='add'>+			u8 pad[2];</div><div class='ctx'> 		} __packed rlm;</div><div class='ctx'> 	} __packed rlm_req = {</div><div class='ctx'> 		.hdr = {</div><div class='hunk'>@@ -1218,13 +1497,95 @@ int mt76_connac_mcu_uni_add_bss(struct mt76_phy *phy,</div><div class='ctx'> 			.ht_op_info = 4, /* set HT 40M allowed */</div><div class='ctx'> 			.rx_streams = phy-&gt;chainmask,</div><div class='ctx'> 			.short_st = true,</div><div class='add'>+			.band = band,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (chandef-&gt;width) {</div><div class='add'>+	case NL80211_CHAN_WIDTH_40:</div><div class='add'>+		rlm_req.rlm.bw = CMD_CBW_40MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_80:</div><div class='add'>+		rlm_req.rlm.bw = CMD_CBW_80MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_80P80:</div><div class='add'>+		rlm_req.rlm.bw = CMD_CBW_8080MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_160:</div><div class='add'>+		rlm_req.rlm.bw = CMD_CBW_160MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_5:</div><div class='add'>+		rlm_req.rlm.bw = CMD_CBW_5MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_10:</div><div class='add'>+		rlm_req.rlm.bw = CMD_CBW_10MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_20_NOHT:</div><div class='add'>+	case NL80211_CHAN_WIDTH_20:</div><div class='add'>+	default:</div><div class='add'>+		rlm_req.rlm.bw = CMD_CBW_20MHZ;</div><div class='add'>+		rlm_req.rlm.ht_op_info = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rlm_req.rlm.control_channel &lt; rlm_req.rlm.center_chan)</div><div class='add'>+		rlm_req.rlm.sco = 1; /* SCA */</div><div class='add'>+	else if (rlm_req.rlm.control_channel &gt; rlm_req.rlm.center_chan)</div><div class='add'>+		rlm_req.rlm.sco = 3; /* SCB */</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(mdev, MCU_UNI_CMD(BSS_INFO_UPDATE), &amp;rlm_req,</div><div class='add'>+				 sizeof(rlm_req), true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_uni_set_chctx);</div><div class='add'>+</div><div class='add'>+int mt76_connac_mcu_uni_add_bss(struct mt76_phy *phy,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct mt76_wcid *wcid,</div><div class='add'>+				bool enable,</div><div class='add'>+				struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct cfg80211_chan_def *chandef = ctx ? &amp;ctx-&gt;def : &amp;phy-&gt;chandef;</div><div class='add'>+	enum nl80211_band band = chandef-&gt;chan-&gt;band;</div><div class='add'>+	struct mt76_dev *mdev = phy-&gt;dev;</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 bss_idx;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct mt76_connac_bss_basic_tlv basic;</div><div class='add'>+		struct mt76_connac_bss_qos_tlv qos;</div><div class='add'>+	} basic_req = {</div><div class='add'>+		.hdr = {</div><div class='add'>+			.bss_idx = mvif-&gt;idx,</div><div class='add'>+		},</div><div class='add'>+		.basic = {</div><div class='add'>+			.tag = cpu_to_le16(UNI_BSS_INFO_BASIC),</div><div class='add'>+			.len = cpu_to_le16(sizeof(struct mt76_connac_bss_basic_tlv)),</div><div class='add'>+			.bcn_interval = cpu_to_le16(vif-&gt;bss_conf.beacon_int),</div><div class='add'>+			.dtim_period = vif-&gt;bss_conf.dtim_period,</div><div class='add'>+			.omac_idx = mvif-&gt;omac_idx,</div><div class='add'>+			.band_idx = mvif-&gt;band_idx,</div><div class='add'>+			.wmm_idx = mvif-&gt;wmm_idx,</div><div class='add'>+			.active = true, /* keep bss deactivated */</div><div class='add'>+			.phymode = mt76_connac_get_phy_mode(phy, vif, band, NULL),</div><div class='add'>+		},</div><div class='add'>+		.qos = {</div><div class='add'>+			.tag = cpu_to_le16(UNI_BSS_INFO_QBSS),</div><div class='add'>+			.len = cpu_to_le16(sizeof(struct mt76_connac_bss_qos_tlv)),</div><div class='add'>+			.qos = vif-&gt;bss_conf.qos,</div><div class='ctx'> 		},</div><div class='ctx'> 	};</div><div class='ctx'> 	int err, conn_type;</div><div class='del'>-	u8 idx;</div><div class='add'>+	u8 idx, basic_phy;</div><div class='ctx'> </div><div class='ctx'> 	idx = mvif-&gt;omac_idx &gt; EXT_BSSID_START ? HW_BSSID_0 : mvif-&gt;omac_idx;</div><div class='ctx'> 	basic_req.basic.hw_bss_idx = idx;</div><div class='add'>+	if (band == NL80211_BAND_6GHZ)</div><div class='add'>+		basic_req.basic.phymode_ext = PHY_MODE_AX_6G;</div><div class='add'>+</div><div class='add'>+	basic_phy = mt76_connac_get_phy_mode_v2(phy, vif, band, NULL);</div><div class='add'>+	basic_req.basic.nonht_basic_phy = cpu_to_le16(basic_phy);</div><div class='ctx'> </div><div class='ctx'> 	switch (vif-&gt;type) {</div><div class='ctx'> 	case NL80211_IFTYPE_MESH_POINT:</div><div class='hunk'>@@ -1234,6 +1595,8 @@ int mt76_connac_mcu_uni_add_bss(struct mt76_phy *phy,</div><div class='ctx'> 		else</div><div class='ctx'> 			conn_type = CONNECTION_INFRA_AP;</div><div class='ctx'> 		basic_req.basic.conn_type = cpu_to_le32(conn_type);</div><div class='add'>+		/* Fully active/deactivate BSS network in AP mode only */</div><div class='add'>+		basic_req.basic.active = enable;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_STATION:</div><div class='ctx'> 		if (vif-&gt;p2p)</div><div class='hunk'>@@ -1255,7 +1618,7 @@ int mt76_connac_mcu_uni_add_bss(struct mt76_phy *phy,</div><div class='ctx'> 	basic_req.basic.sta_idx = cpu_to_le16(wcid-&gt;idx);</div><div class='ctx'> 	basic_req.basic.conn_state = !enable;</div><div class='ctx'> </div><div class='del'>-	err = mt76_mcu_send_msg(mdev, MCU_UNI_CMD_BSS_INFO_UPDATE, &amp;basic_req,</div><div class='add'>+	err = mt76_mcu_send_msg(mdev, MCU_UNI_CMD(BSS_INFO_UPDATE), &amp;basic_req,</div><div class='ctx'> 				sizeof(basic_req), true);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -1267,6 +1630,7 @@ int mt76_connac_mcu_uni_add_bss(struct mt76_phy *phy,</div><div class='ctx'> 				u8 pad[3];</div><div class='ctx'> 			} __packed hdr;</div><div class='ctx'> 			struct bss_info_uni_he he;</div><div class='add'>+			struct bss_info_uni_bss_color bss_color;</div><div class='ctx'> 		} he_req = {</div><div class='ctx'> 			.hdr = {</div><div class='ctx'> 				.bss_idx = mvif-&gt;idx,</div><div class='hunk'>@@ -1275,68 +1639,113 @@ int mt76_connac_mcu_uni_add_bss(struct mt76_phy *phy,</div><div class='ctx'> 				.tag = cpu_to_le16(UNI_BSS_INFO_HE_BASIC),</div><div class='ctx'> 				.len = cpu_to_le16(sizeof(struct bss_info_uni_he)),</div><div class='ctx'> 			},</div><div class='add'>+			.bss_color = {</div><div class='add'>+				.tag = cpu_to_le16(UNI_BSS_INFO_BSS_COLOR),</div><div class='add'>+				.len = cpu_to_le16(sizeof(struct bss_info_uni_bss_color)),</div><div class='add'>+				.enable = 0,</div><div class='add'>+				.bss_color = 0,</div><div class='add'>+			},</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		if (enable) {</div><div class='add'>+			he_req.bss_color.enable =</div><div class='add'>+				vif-&gt;bss_conf.he_bss_color.enabled;</div><div class='add'>+			he_req.bss_color.bss_color =</div><div class='add'>+				vif-&gt;bss_conf.he_bss_color.color;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		mt76_connac_mcu_uni_bss_he_tlv(phy, vif,</div><div class='ctx'> 					       (struct tlv *)&amp;he_req.he);</div><div class='del'>-		err = mt76_mcu_send_msg(mdev, MCU_UNI_CMD_BSS_INFO_UPDATE,</div><div class='add'>+		err = mt76_mcu_send_msg(mdev, MCU_UNI_CMD(BSS_INFO_UPDATE),</div><div class='ctx'> 					&amp;he_req, sizeof(he_req), true);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (chandef-&gt;width) {</div><div class='del'>-	case NL80211_CHAN_WIDTH_40:</div><div class='del'>-		rlm_req.rlm.bw = CMD_CBW_40MHZ;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_CHAN_WIDTH_80:</div><div class='del'>-		rlm_req.rlm.bw = CMD_CBW_80MHZ;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_CHAN_WIDTH_80P80:</div><div class='del'>-		rlm_req.rlm.bw = CMD_CBW_8080MHZ;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_CHAN_WIDTH_160:</div><div class='del'>-		rlm_req.rlm.bw = CMD_CBW_160MHZ;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_CHAN_WIDTH_5:</div><div class='del'>-		rlm_req.rlm.bw = CMD_CBW_5MHZ;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_CHAN_WIDTH_10:</div><div class='del'>-		rlm_req.rlm.bw = CMD_CBW_10MHZ;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_CHAN_WIDTH_20_NOHT:</div><div class='del'>-	case NL80211_CHAN_WIDTH_20:</div><div class='del'>-	default:</div><div class='del'>-		rlm_req.rlm.bw = CMD_CBW_20MHZ;</div><div class='del'>-		rlm_req.rlm.ht_op_info = 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	if (enable &amp;&amp; vif-&gt;bss_conf.bssid_indicator) {</div><div class='add'>+		struct {</div><div class='add'>+			struct {</div><div class='add'>+				u8 bss_idx;</div><div class='add'>+				u8 pad[3];</div><div class='add'>+			} __packed hdr;</div><div class='add'>+			struct bss_info_uni_mbssid mbssid;</div><div class='add'>+		} mbssid_req = {</div><div class='add'>+			.hdr = {</div><div class='add'>+				.bss_idx = mvif-&gt;idx,</div><div class='add'>+			},</div><div class='add'>+			.mbssid = {</div><div class='add'>+				.tag = cpu_to_le16(UNI_BSS_INFO_11V_MBSSID),</div><div class='add'>+				.len = cpu_to_le16(sizeof(struct bss_info_uni_mbssid)),</div><div class='add'>+				.max_indicator = vif-&gt;bss_conf.bssid_indicator,</div><div class='add'>+				.mbss_idx =  vif-&gt;bss_conf.bssid_index,</div><div class='add'>+			},</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	if (rlm_req.rlm.control_channel &lt; rlm_req.rlm.center_chan)</div><div class='del'>-		rlm_req.rlm.sco = 1; /* SCA */</div><div class='del'>-	else if (rlm_req.rlm.control_channel &gt; rlm_req.rlm.center_chan)</div><div class='del'>-		rlm_req.rlm.sco = 3; /* SCB */</div><div class='add'>+		err = mt76_mcu_send_msg(mdev, MCU_UNI_CMD(BSS_INFO_UPDATE),</div><div class='add'>+					&amp;mbssid_req, sizeof(mbssid_req), true);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(mdev, MCU_UNI_CMD_BSS_INFO_UPDATE, &amp;rlm_req,</div><div class='del'>-				 sizeof(rlm_req), true);</div><div class='add'>+	return mt76_connac_mcu_uni_set_chctx(phy, mvif, ctx);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_uni_add_bss);</div><div class='ctx'> </div><div class='add'>+void mt76_connac_mcu_build_rnr_scan_param(struct mt76_dev *mdev,</div><div class='add'>+					  struct cfg80211_scan_request *sreq)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_channel **scan_list = sreq-&gt;channels;</div><div class='add'>+	int i, bssid_index = 0;</div><div class='add'>+</div><div class='add'>+	/* clear 6G active Scan BSSID table */</div><div class='add'>+	memset(&amp;mdev-&gt;rnr, 0, sizeof(mdev-&gt;rnr));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sreq-&gt;n_6ghz_params; i++) {</div><div class='add'>+		u8 ch_idx = sreq-&gt;scan_6ghz_params[i].channel_idx;</div><div class='add'>+		int k = 0;</div><div class='add'>+</div><div class='add'>+		/* Remove the duplicated BSSID */</div><div class='add'>+		for (k = 0; k &lt; bssid_index; k++) {</div><div class='add'>+			if (!memcmp(&amp;mdev-&gt;rnr.bssid[k],</div><div class='add'>+				    sreq-&gt;scan_6ghz_params[i].bssid,</div><div class='add'>+				    ETH_ALEN))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (k == bssid_index &amp;&amp;</div><div class='add'>+		    bssid_index &lt; MT76_RNR_SCAN_MAX_BSSIDS) {</div><div class='add'>+			memcpy(&amp;mdev-&gt;rnr.bssid[bssid_index++],</div><div class='add'>+			       sreq-&gt;scan_6ghz_params[i].bssid, ETH_ALEN);</div><div class='add'>+			mdev-&gt;rnr.channel[k] = scan_list[ch_idx]-&gt;hw_value;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mdev-&gt;rnr.bssid_num = bssid_index;</div><div class='add'>+</div><div class='add'>+	if (sreq-&gt;flags &amp; NL80211_SCAN_FLAG_RANDOM_ADDR) {</div><div class='add'>+		memcpy(mdev-&gt;rnr.random_mac, sreq-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+		mdev-&gt;rnr.sreq_flag = sreq-&gt;flags;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_build_rnr_scan_param);</div><div class='add'>+</div><div class='ctx'> #define MT76_CONNAC_SCAN_CHANNEL_TIME		60</div><div class='ctx'> int mt76_connac_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 			    struct ieee80211_scan_request *scan_req)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_vif *mvif = (struct mt76_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct cfg80211_scan_request *sreq = &amp;scan_req-&gt;req;</div><div class='ctx'> 	int n_ssids = 0, err, i, duration;</div><div class='ctx'> 	int ext_channels_num = max_t(int, sreq-&gt;n_channels - 32, 0);</div><div class='ctx'> 	struct ieee80211_channel **scan_list = sreq-&gt;channels;</div><div class='ctx'> 	struct mt76_dev *mdev = phy-&gt;dev;</div><div class='del'>-	bool ext_phy = phy == mdev-&gt;phy2;</div><div class='ctx'> 	struct mt76_connac_mcu_scan_channel *chan;</div><div class='ctx'> 	struct mt76_connac_hw_scan_req *req;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='add'>+	if (test_bit(MT76_HW_SCANNING, &amp;phy-&gt;state))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='ctx'> 	skb = mt76_mcu_msg_alloc(mdev, NULL, sizeof(*req));</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -1344,9 +1753,9 @@ int mt76_connac_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 	set_bit(MT76_HW_SCANNING, &amp;phy-&gt;state);</div><div class='ctx'> 	mvif-&gt;scan_seq_num = (mvif-&gt;scan_seq_num + 1) &amp; 0x7f;</div><div class='ctx'> </div><div class='del'>-	req = (struct mt76_connac_hw_scan_req *)skb_put(skb, sizeof(*req));</div><div class='add'>+	req = (struct mt76_connac_hw_scan_req *)skb_put_zero(skb, sizeof(*req));</div><div class='ctx'> </div><div class='del'>-	req-&gt;seq_num = mvif-&gt;scan_seq_num | ext_phy &lt;&lt; 7;</div><div class='add'>+	req-&gt;seq_num = mvif-&gt;scan_seq_num | mvif-&gt;band_idx &lt;&lt; 7;</div><div class='ctx'> 	req-&gt;bss_idx = mvif-&gt;idx;</div><div class='ctx'> 	req-&gt;scan_type = sreq-&gt;n_ssids ? 1 : 0;</div><div class='ctx'> 	req-&gt;probe_req_num = sreq-&gt;n_ssids ? 2 : 0;</div><div class='hunk'>@@ -1356,8 +1765,8 @@ int mt76_connac_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 		if (!sreq-&gt;ssids[i].ssid_len)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		req-&gt;ssids[i].ssid_len = cpu_to_le32(sreq-&gt;ssids[i].ssid_len);</div><div class='del'>-		memcpy(req-&gt;ssids[i].ssid, sreq-&gt;ssids[i].ssid,</div><div class='add'>+		req-&gt;ssids[n_ssids].ssid_len = cpu_to_le32(sreq-&gt;ssids[i].ssid_len);</div><div class='add'>+		memcpy(req-&gt;ssids[n_ssids].ssid, sreq-&gt;ssids[i].ssid,</div><div class='ctx'> 		       sreq-&gt;ssids[i].ssid_len);</div><div class='ctx'> 		n_ssids++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1373,18 +1782,35 @@ int mt76_connac_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 	req-&gt;channel_min_dwell_time = cpu_to_le16(duration);</div><div class='ctx'> 	req-&gt;channel_dwell_time = cpu_to_le16(duration);</div><div class='ctx'> </div><div class='del'>-	req-&gt;channels_num = min_t(u8, sreq-&gt;n_channels, 32);</div><div class='del'>-	req-&gt;ext_channels_num = min_t(u8, ext_channels_num, 32);</div><div class='add'>+	if (sreq-&gt;n_channels == 0 || sreq-&gt;n_channels &gt; 64) {</div><div class='add'>+		req-&gt;channel_type = 0;</div><div class='add'>+		req-&gt;channels_num = 0;</div><div class='add'>+		req-&gt;ext_channels_num = 0;</div><div class='add'>+	} else {</div><div class='add'>+		req-&gt;channel_type = 4;</div><div class='add'>+		req-&gt;channels_num = min_t(u8, sreq-&gt;n_channels, 32);</div><div class='add'>+		req-&gt;ext_channels_num = min_t(u8, ext_channels_num, 32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; req-&gt;channels_num + req-&gt;ext_channels_num; i++) {</div><div class='ctx'> 		if (i &gt;= 32)</div><div class='ctx'> 			chan = &amp;req-&gt;ext_channels[i - 32];</div><div class='ctx'> 		else</div><div class='ctx'> 			chan = &amp;req-&gt;channels[i];</div><div class='ctx'> </div><div class='del'>-		chan-&gt;band = scan_list[i]-&gt;band == NL80211_BAND_2GHZ ? 1 : 2;</div><div class='add'>+		switch (scan_list[i]-&gt;band) {</div><div class='add'>+		case NL80211_BAND_2GHZ:</div><div class='add'>+			chan-&gt;band = 1;</div><div class='add'>+			break;</div><div class='add'>+		case NL80211_BAND_6GHZ:</div><div class='add'>+			chan-&gt;band = 3;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			chan-&gt;band = 2;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		chan-&gt;channel_num = scan_list[i]-&gt;hw_value;</div><div class='ctx'> 	}</div><div class='del'>-	req-&gt;channel_type = sreq-&gt;n_channels ? 4 : 0;</div><div class='ctx'> </div><div class='ctx'> 	if (sreq-&gt;ie_len &gt; 0) {</div><div class='ctx'> 		memcpy(req-&gt;ies, sreq-&gt;ie, sreq-&gt;ie_len);</div><div class='hunk'>@@ -1401,7 +1827,8 @@ int mt76_connac_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 		req-&gt;scan_func |= SCAN_FUNC_RANDOM_MAC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = mt76_mcu_skb_send_msg(mdev, skb, MCU_CMD_START_HW_SCAN, false);</div><div class='add'>+	err = mt76_mcu_skb_send_msg(mdev, skb, MCU_CE_CMD(START_HW_SCAN),</div><div class='add'>+				    false);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		clear_bit(MT76_HW_SCANNING, &amp;phy-&gt;state);</div><div class='ctx'> </div><div class='hunk'>@@ -1412,7 +1839,7 @@ EXPORT_SYMBOL_GPL(mt76_connac_mcu_hw_scan);</div><div class='ctx'> int mt76_connac_mcu_cancel_hw_scan(struct mt76_phy *phy,</div><div class='ctx'> 				   struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_vif *mvif = (struct mt76_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u8 seq_num;</div><div class='ctx'> 		u8 is_ext_channel;</div><div class='hunk'>@@ -1429,8 +1856,8 @@ int mt76_connac_mcu_cancel_hw_scan(struct mt76_phy *phy,</div><div class='ctx'> 		ieee80211_scan_completed(phy-&gt;hw, &amp;info);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(phy-&gt;dev, MCU_CMD_CANCEL_HW_SCAN, &amp;req,</div><div class='del'>-				 sizeof(req), false);</div><div class='add'>+	return mt76_mcu_send_msg(phy-&gt;dev, MCU_CE_CMD(CANCEL_HW_SCAN),</div><div class='add'>+				 &amp;req, sizeof(req), false);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_cancel_hw_scan);</div><div class='ctx'> </div><div class='hunk'>@@ -1438,12 +1865,11 @@ int mt76_connac_mcu_sched_scan_req(struct mt76_phy *phy,</div><div class='ctx'> 				   struct ieee80211_vif *vif,</div><div class='ctx'> 				   struct cfg80211_sched_scan_request *sreq)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_vif *mvif = (struct mt76_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct ieee80211_channel **scan_list = sreq-&gt;channels;</div><div class='ctx'> 	struct mt76_connac_mcu_scan_channel *chan;</div><div class='ctx'> 	struct mt76_connac_sched_scan_req *req;</div><div class='ctx'> 	struct mt76_dev *mdev = phy-&gt;dev;</div><div class='del'>-	bool ext_phy = phy == mdev-&gt;phy2;</div><div class='ctx'> 	struct cfg80211_match_set *match;</div><div class='ctx'> 	struct cfg80211_ssid *ssid;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -1455,17 +1881,21 @@ int mt76_connac_mcu_sched_scan_req(struct mt76_phy *phy,</div><div class='ctx'> </div><div class='ctx'> 	mvif-&gt;scan_seq_num = (mvif-&gt;scan_seq_num + 1) &amp; 0x7f;</div><div class='ctx'> </div><div class='del'>-	req = (struct mt76_connac_sched_scan_req *)skb_put(skb, sizeof(*req));</div><div class='add'>+	req = (struct mt76_connac_sched_scan_req *)skb_put_zero(skb, sizeof(*req));</div><div class='ctx'> 	req-&gt;version = 1;</div><div class='del'>-	req-&gt;seq_num = mvif-&gt;scan_seq_num | ext_phy &lt;&lt; 7;</div><div class='add'>+	req-&gt;seq_num = mvif-&gt;scan_seq_num | mvif-&gt;band_idx &lt;&lt; 7;</div><div class='add'>+</div><div class='add'>+	if (sreq-&gt;flags &amp; NL80211_SCAN_FLAG_RANDOM_ADDR) {</div><div class='add'>+		u8 *addr = is_mt7663(phy-&gt;dev) ? req-&gt;mt7663.random_mac</div><div class='add'>+					       : req-&gt;mt7921.random_mac;</div><div class='ctx'> </div><div class='del'>-	if (is_mt7663(phy-&gt;dev) &amp;&amp;</div><div class='del'>-	    (sreq-&gt;flags &amp; NL80211_SCAN_FLAG_RANDOM_ADDR)) {</div><div class='del'>-		get_random_mask_addr(req-&gt;mt7663.random_mac, sreq-&gt;mac_addr,</div><div class='del'>-				     sreq-&gt;mac_addr_mask);</div><div class='ctx'> 		req-&gt;scan_func = 1;</div><div class='del'>-	} else if (is_mt7921(phy-&gt;dev)) {</div><div class='add'>+		get_random_mask_addr(addr, sreq-&gt;mac_addr,</div><div class='add'>+				     sreq-&gt;mac_addr_mask);</div><div class='add'>+	}</div><div class='add'>+	if (is_mt7921(phy-&gt;dev)) {</div><div class='ctx'> 		req-&gt;mt7921.bss_idx = mvif-&gt;idx;</div><div class='add'>+		req-&gt;mt7921.delay = cpu_to_le32(sreq-&gt;delay);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;ssids_num = sreq-&gt;n_ssids;</div><div class='hunk'>@@ -1488,7 +1918,18 @@ int mt76_connac_mcu_sched_scan_req(struct mt76_phy *phy,</div><div class='ctx'> 	req-&gt;channels_num = min_t(u8, sreq-&gt;n_channels, 64);</div><div class='ctx'> 	for (i = 0; i &lt; req-&gt;channels_num; i++) {</div><div class='ctx'> 		chan = &amp;req-&gt;channels[i];</div><div class='del'>-		chan-&gt;band = scan_list[i]-&gt;band == NL80211_BAND_2GHZ ? 1 : 2;</div><div class='add'>+</div><div class='add'>+		switch (scan_list[i]-&gt;band) {</div><div class='add'>+		case NL80211_BAND_2GHZ:</div><div class='add'>+			chan-&gt;band = 1;</div><div class='add'>+			break;</div><div class='add'>+		case NL80211_BAND_6GHZ:</div><div class='add'>+			chan-&gt;band = 3;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			chan-&gt;band = 2;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		chan-&gt;channel_num = scan_list[i]-&gt;hw_value;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1501,7 +1942,8 @@ int mt76_connac_mcu_sched_scan_req(struct mt76_phy *phy,</div><div class='ctx'> 		memcpy(skb_put(skb, sreq-&gt;ie_len), sreq-&gt;ie, sreq-&gt;ie_len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_skb_send_msg(mdev, skb, MCU_CMD_SCHED_SCAN_REQ, false);</div><div class='add'>+	return mt76_mcu_skb_send_msg(mdev, skb, MCU_CE_CMD(SCHED_SCAN_REQ),</div><div class='add'>+				     false);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_sched_scan_req);</div><div class='ctx'> </div><div class='hunk'>@@ -1521,8 +1963,8 @@ int mt76_connac_mcu_sched_scan_enable(struct mt76_phy *phy,</div><div class='ctx'> 	else</div><div class='ctx'> 		clear_bit(MT76_HW_SCHED_SCANNING, &amp;phy-&gt;state);</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(phy-&gt;dev, MCU_CMD_SCHED_SCAN_ENABLE, &amp;req,</div><div class='del'>-				 sizeof(req), false);</div><div class='add'>+	return mt76_mcu_send_msg(phy-&gt;dev, MCU_CE_CMD(SCHED_SCAN_ENABLE),</div><div class='add'>+				 &amp;req, sizeof(req), false);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_sched_scan_enable);</div><div class='ctx'> </div><div class='hunk'>@@ -1532,10 +1974,10 @@ int mt76_connac_mcu_chip_config(struct mt76_dev *dev)</div><div class='ctx'> 		.resp_type = 0,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memcpy(req.data, "assert", 7);</div><div class='add'>+	strscpy(req.data, "assert");</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(dev, MCU_CMD_CHIP_CONFIG, &amp;req, sizeof(req),</div><div class='del'>-				 false);</div><div class='add'>+	return mt76_mcu_send_msg(dev, MCU_CE_CMD(CHIP_CONFIG),</div><div class='add'>+				 &amp;req, sizeof(req), false);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_chip_config);</div><div class='ctx'> </div><div class='hunk'>@@ -1547,11 +1989,31 @@ int mt76_connac_mcu_set_deep_sleep(struct mt76_dev *dev, bool enable)</div><div class='ctx'> </div><div class='ctx'> 	snprintf(req.data, sizeof(req.data), "KeepFullPwr %d", !enable);</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(dev, MCU_CMD_CHIP_CONFIG, &amp;req, sizeof(req),</div><div class='del'>-				 false);</div><div class='add'>+	return mt76_mcu_send_msg(dev, MCU_CE_CMD(CHIP_CONFIG),</div><div class='add'>+				 &amp;req, sizeof(req), false);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_deep_sleep);</div><div class='ctx'> </div><div class='add'>+int mt76_connac_sta_state_dp(struct mt76_dev *dev,</div><div class='add'>+			     enum ieee80211_sta_state old_state,</div><div class='add'>+			     enum ieee80211_sta_state new_state)</div><div class='add'>+{</div><div class='add'>+	if ((old_state == IEEE80211_STA_ASSOC &amp;&amp;</div><div class='add'>+	     new_state == IEEE80211_STA_AUTHORIZED) ||</div><div class='add'>+	    (old_state == IEEE80211_STA_NONE &amp;&amp;</div><div class='add'>+	     new_state == IEEE80211_STA_NOTEXIST))</div><div class='add'>+		mt76_connac_mcu_set_deep_sleep(dev, true);</div><div class='add'>+</div><div class='add'>+	if ((old_state == IEEE80211_STA_NOTEXIST &amp;&amp;</div><div class='add'>+	     new_state == IEEE80211_STA_NONE) ||</div><div class='add'>+	    (old_state == IEEE80211_STA_AUTHORIZED &amp;&amp;</div><div class='add'>+	     new_state == IEEE80211_STA_ASSOC))</div><div class='add'>+		mt76_connac_mcu_set_deep_sleep(dev, false);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_sta_state_dp);</div><div class='add'>+</div><div class='ctx'> void mt76_connac_mcu_coredump_event(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 				    struct mt76_connac_coredump *coredump)</div><div class='ctx'> {</div><div class='hunk'>@@ -1609,6 +2071,47 @@ mt76_connac_mcu_build_sku(struct mt76_dev *dev, s8 *sku,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+s8 mt76_connac_get_ch_power(struct mt76_phy *phy,</div><div class='add'>+			    struct ieee80211_channel *chan,</div><div class='add'>+			    s8 target_power)</div><div class='add'>+{</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	switch (chan-&gt;band) {</div><div class='add'>+	case NL80211_BAND_2GHZ:</div><div class='add'>+		sband = &amp;phy-&gt;sband_2g.sband;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_BAND_5GHZ:</div><div class='add'>+		sband = &amp;phy-&gt;sband_5g.sband;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_BAND_6GHZ:</div><div class='add'>+		sband = &amp;phy-&gt;sband_6g.sband;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return target_power;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sband-&gt;n_channels; i++) {</div><div class='add'>+		struct ieee80211_channel *ch = &amp;sband-&gt;channels[i];</div><div class='add'>+</div><div class='add'>+		if (ch-&gt;hw_value == chan-&gt;hw_value) {</div><div class='add'>+			if (!(ch-&gt;flags &amp; IEEE80211_CHAN_DISABLED)) {</div><div class='add'>+				int power = 2 * ch-&gt;max_reg_power;</div><div class='add'>+</div><div class='add'>+				if (is_mt7663(dev) &amp;&amp; (power &gt; 63 || power &lt; -64))</div><div class='add'>+					power = 63;</div><div class='add'>+				target_power = min_t(s8, power, target_power);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return target_power;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_get_ch_power);</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> mt76_connac_mcu_rate_txpower_band(struct mt76_phy *phy,</div><div class='ctx'> 				  enum nl80211_band band)</div><div class='hunk'>@@ -1626,85 +2129,161 @@ mt76_connac_mcu_rate_txpower_band(struct mt76_phy *phy,</div><div class='ctx'> 		112, 114, 116, 118, 120, 122, 124,</div><div class='ctx'> 		126, 128, 132, 134, 136, 138, 140,</div><div class='ctx'> 		142, 144, 149, 151, 153, 155, 157,</div><div class='del'>-		159, 161, 165</div><div class='add'>+		159, 161, 165, 169, 173, 177</div><div class='add'>+	};</div><div class='add'>+	static const u8 chan_list_6ghz[] = {</div><div class='add'>+		  1,   3,   5,   7,   9,  11,  13,</div><div class='add'>+		 15,  17,  19,  21,  23,  25,  27,</div><div class='add'>+		 29,  33,  35,  37,  39,  41,  43,</div><div class='add'>+		 45,  47,  49,  51,  53,  55,  57,</div><div class='add'>+		 59,  61,  65,  67,  69,  71,  73,</div><div class='add'>+		 75,  77,  79,  81,  83,  85,  87,</div><div class='add'>+		 89,  91,  93,  97,  99, 101, 103,</div><div class='add'>+		105, 107, 109, 111, 113, 115, 117,</div><div class='add'>+		119, 121, 123, 125, 129, 131, 133,</div><div class='add'>+		135, 137, 139, 141, 143, 145, 147,</div><div class='add'>+		149, 151, 153, 155, 157, 161, 163,</div><div class='add'>+		165, 167, 169, 171, 173, 175, 177,</div><div class='add'>+		179, 181, 183, 185, 187, 189, 193,</div><div class='add'>+		195, 197, 199, 201, 203, 205, 207,</div><div class='add'>+		209, 211, 213, 215, 217, 219, 221,</div><div class='add'>+		225, 227, 229, 233</div><div class='ctx'> 	};</div><div class='add'>+	int i, n_chan, batch_size, idx = 0, tx_power, last_ch, err = 0;</div><div class='ctx'> 	struct mt76_connac_sku_tlv sku_tlbv;</div><div class='del'>-	int i, n_chan, batch_size, idx = 0;</div><div class='del'>-	struct mt76_power_limits limits;</div><div class='add'>+	struct mt76_power_limits *limits;</div><div class='ctx'> 	const u8 *ch_list;</div><div class='ctx'> </div><div class='add'>+	limits = devm_kmalloc(dev-&gt;dev, sizeof(*limits), GFP_KERNEL);</div><div class='add'>+	if (!limits)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	sku_len = is_mt7921(dev) ? sizeof(sku_tlbv) : sizeof(sku_tlbv) - 92;</div><div class='add'>+	tx_power = 2 * phy-&gt;hw-&gt;conf.power_level;</div><div class='add'>+	if (!tx_power)</div><div class='add'>+		tx_power = 127;</div><div class='ctx'> </div><div class='ctx'> 	if (band == NL80211_BAND_2GHZ) {</div><div class='ctx'> 		n_chan = ARRAY_SIZE(chan_list_2ghz);</div><div class='ctx'> 		ch_list = chan_list_2ghz;</div><div class='add'>+	} else if (band == NL80211_BAND_6GHZ) {</div><div class='add'>+		n_chan = ARRAY_SIZE(chan_list_6ghz);</div><div class='add'>+		ch_list = chan_list_6ghz;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		n_chan = ARRAY_SIZE(chan_list_5ghz);</div><div class='ctx'> 		ch_list = chan_list_5ghz;</div><div class='ctx'> 	}</div><div class='ctx'> 	batch_size = DIV_ROUND_UP(n_chan, batch_len);</div><div class='ctx'> </div><div class='add'>+	if (phy-&gt;cap.has_6ghz)</div><div class='add'>+		last_ch = chan_list_6ghz[ARRAY_SIZE(chan_list_6ghz) - 1];</div><div class='add'>+	else if (phy-&gt;cap.has_5ghz)</div><div class='add'>+		last_ch = chan_list_5ghz[ARRAY_SIZE(chan_list_5ghz) - 1];</div><div class='add'>+	else</div><div class='add'>+		last_ch = chan_list_2ghz[ARRAY_SIZE(chan_list_2ghz) - 1];</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; batch_size; i++) {</div><div class='del'>-		bool last_msg = i == batch_size - 1;</div><div class='del'>-		int num_ch = last_msg ? n_chan % batch_len : batch_len;</div><div class='del'>-		struct mt76_connac_tx_power_limit_tlv tx_power_tlv = {</div><div class='del'>-			.band = band == NL80211_BAND_2GHZ ? 1 : 2,</div><div class='del'>-			.n_chan = num_ch,</div><div class='del'>-			.last_msg = last_msg,</div><div class='del'>-		};</div><div class='add'>+		struct mt76_connac_tx_power_limit_tlv tx_power_tlv = {};</div><div class='add'>+		int j, msg_len, num_ch;</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='del'>-		int j, err, msg_len;</div><div class='ctx'> </div><div class='add'>+		num_ch = i == batch_size - 1 ? n_chan - i * batch_len : batch_len;</div><div class='ctx'> 		msg_len = sizeof(tx_power_tlv) + num_ch * sizeof(sku_tlbv);</div><div class='ctx'> 		skb = mt76_mcu_msg_alloc(dev, NULL, msg_len);</div><div class='del'>-		if (!skb)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+		if (!skb) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb_reserve(skb, sizeof(tx_power_tlv));</div><div class='ctx'> </div><div class='ctx'> 		BUILD_BUG_ON(sizeof(dev-&gt;alpha2) &gt; sizeof(tx_power_tlv.alpha2));</div><div class='ctx'> 		memcpy(tx_power_tlv.alpha2, dev-&gt;alpha2, sizeof(dev-&gt;alpha2));</div><div class='add'>+		tx_power_tlv.n_chan = num_ch;</div><div class='add'>+</div><div class='add'>+		switch (band) {</div><div class='add'>+		case NL80211_BAND_2GHZ:</div><div class='add'>+			tx_power_tlv.band = 1;</div><div class='add'>+			break;</div><div class='add'>+		case NL80211_BAND_6GHZ:</div><div class='add'>+			tx_power_tlv.band = 3;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			tx_power_tlv.band = 2;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		skb_put_data(skb, &amp;tx_power_tlv, sizeof(tx_power_tlv));</div><div class='ctx'> 		for (j = 0; j &lt; num_ch; j++, idx++) {</div><div class='ctx'> 			struct ieee80211_channel chan = {</div><div class='ctx'> 				.hw_value = ch_list[idx],</div><div class='ctx'> 				.band = band,</div><div class='ctx'> 			};</div><div class='add'>+			s8 reg_power, sar_power;</div><div class='ctx'> </div><div class='del'>-			mt76_get_rate_power_limits(phy, &amp;chan, &amp;limits, 127);</div><div class='add'>+			reg_power = mt76_connac_get_ch_power(phy, &amp;chan,</div><div class='add'>+							     tx_power);</div><div class='add'>+			sar_power = mt76_get_sar_power(phy, &amp;chan, reg_power);</div><div class='ctx'> </div><div class='add'>+			mt76_get_rate_power_limits(phy, &amp;chan, limits,</div><div class='add'>+						   sar_power);</div><div class='add'>+</div><div class='add'>+			tx_power_tlv.last_msg = ch_list[idx] == last_ch;</div><div class='ctx'> 			sku_tlbv.channel = ch_list[idx];</div><div class='add'>+</div><div class='ctx'> 			mt76_connac_mcu_build_sku(dev, sku_tlbv.pwr_limit,</div><div class='del'>-						  &amp;limits, band);</div><div class='add'>+						  limits, band);</div><div class='ctx'> 			skb_put_data(skb, &amp;sku_tlbv, sku_len);</div><div class='ctx'> 		}</div><div class='add'>+		__skb_push(skb, sizeof(tx_power_tlv));</div><div class='add'>+		memcpy(skb-&gt;data, &amp;tx_power_tlv, sizeof(tx_power_tlv));</div><div class='ctx'> </div><div class='ctx'> 		err = mt76_mcu_skb_send_msg(dev, skb,</div><div class='del'>-					    MCU_CMD_SET_RATE_TX_POWER, false);</div><div class='add'>+					    MCU_CE_CMD(SET_RATE_TX_POWER),</div><div class='add'>+					    false);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='add'>+			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+out:</div><div class='add'>+	devm_kfree(dev-&gt;dev, limits);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mt76_connac_mcu_set_rate_txpower(struct mt76_phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = mt76_connac_mcu_rate_txpower_band(phy, NL80211_BAND_2GHZ);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	if (phy-&gt;cap.has_2ghz) {</div><div class='add'>+		err = mt76_connac_mcu_rate_txpower_band(phy,</div><div class='add'>+							NL80211_BAND_2GHZ);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	if (phy-&gt;cap.has_5ghz) {</div><div class='add'>+		err = mt76_connac_mcu_rate_txpower_band(phy,</div><div class='add'>+							NL80211_BAND_5GHZ);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	if (phy-&gt;cap.has_6ghz) {</div><div class='add'>+		err = mt76_connac_mcu_rate_txpower_band(phy,</div><div class='add'>+							NL80211_BAND_6GHZ);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return mt76_connac_mcu_rate_txpower_band(phy, NL80211_BAND_5GHZ);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_rate_txpower);</div><div class='ctx'> </div><div class='ctx'> int mt76_connac_mcu_update_arp_filter(struct mt76_dev *dev,</div><div class='del'>-				      struct mt76_vif *vif,</div><div class='add'>+				      struct mt76_vif_link *vif,</div><div class='ctx'> 				      struct ieee80211_bss_conf *info)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_vif *mvif = container_of(info, struct ieee80211_vif,</div><div class='add'>+						  bss_conf);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	int i, len = min_t(int, info-&gt;arp_addr_cnt,</div><div class='add'>+	int i, len = min_t(int, mvif-&gt;cfg.arp_addr_cnt,</div><div class='ctx'> 			   IEEE80211_BSS_ARP_ADDR_LIST_LEN);</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct {</div><div class='hunk'>@@ -1731,16 +2310,33 @@ int mt76_connac_mcu_update_arp_filter(struct mt76_dev *dev,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	skb_put_data(skb, &amp;req_hdr, sizeof(req_hdr));</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		u8 *addr = (u8 *)skb_put(skb, sizeof(__be32));</div><div class='add'>+	for (i = 0; i &lt; len; i++)</div><div class='add'>+		skb_put_data(skb, &amp;mvif-&gt;cfg.arp_addr_list[i], sizeof(__be32));</div><div class='ctx'> </div><div class='del'>-		memcpy(addr, &amp;info-&gt;arp_addr_list[i], sizeof(__be32));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return mt76_mcu_skb_send_msg(dev, skb, MCU_UNI_CMD_OFFLOAD, true);</div><div class='add'>+	return mt76_mcu_skb_send_msg(dev, skb, MCU_UNI_CMD(OFFLOAD), true);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_update_arp_filter);</div><div class='ctx'> </div><div class='add'>+int mt76_connac_mcu_set_p2p_oppps(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	int ct_window = vif-&gt;bss_conf.p2p_noa_attr.oppps_ctwindow;</div><div class='add'>+	struct mt76_phy *phy = hw-&gt;priv;</div><div class='add'>+	struct {</div><div class='add'>+		__le32 ct_win;</div><div class='add'>+		u8 bss_idx;</div><div class='add'>+		u8 rsv[3];</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.ct_win = cpu_to_le32(ct_window),</div><div class='add'>+		.bss_idx = mvif-&gt;idx,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(phy-&gt;dev, MCU_CE_CMD(SET_P2P_OPPPS),</div><div class='add'>+				 &amp;req, sizeof(req), false);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_p2p_oppps);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> </div><div class='ctx'> const struct wiphy_wowlan_support mt76_connac_wowlan_support = {</div><div class='hunk'>@@ -1768,19 +2364,22 @@ mt76_connac_mcu_key_iter(struct ieee80211_hw *hw,</div><div class='ctx'> 	    key-&gt;cipher != WLAN_CIPHER_SUITE_TKIP)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (key-&gt;cipher == WLAN_CIPHER_SUITE_TKIP) {</div><div class='del'>-		gtk_tlv-&gt;proto = cpu_to_le32(NL80211_WPA_VERSION_1);</div><div class='add'>+	if (key-&gt;cipher == WLAN_CIPHER_SUITE_TKIP)</div><div class='ctx'> 		cipher = BIT(3);</div><div class='del'>-	} else {</div><div class='del'>-		gtk_tlv-&gt;proto = cpu_to_le32(NL80211_WPA_VERSION_2);</div><div class='add'>+	else</div><div class='ctx'> 		cipher = BIT(4);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* we are assuming here to have a single pairwise key */</div><div class='ctx'> 	if (key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE) {</div><div class='add'>+		if (key-&gt;cipher == WLAN_CIPHER_SUITE_TKIP)</div><div class='add'>+			gtk_tlv-&gt;proto = cpu_to_le32(NL80211_WPA_VERSION_1);</div><div class='add'>+		else</div><div class='add'>+			gtk_tlv-&gt;proto = cpu_to_le32(NL80211_WPA_VERSION_2);</div><div class='add'>+</div><div class='ctx'> 		gtk_tlv-&gt;pairwise_cipher = cpu_to_le32(cipher);</div><div class='del'>-		gtk_tlv-&gt;group_cipher = cpu_to_le32(cipher);</div><div class='ctx'> 		gtk_tlv-&gt;keyid = key-&gt;keyidx;</div><div class='add'>+	} else {</div><div class='add'>+		gtk_tlv-&gt;group_cipher = cpu_to_le32(cipher);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1788,7 +2387,7 @@ int mt76_connac_mcu_update_gtk_rekey(struct ieee80211_hw *hw,</div><div class='ctx'> 				     struct ieee80211_vif *vif,</div><div class='ctx'> 				     struct cfg80211_gtk_rekey_data *key)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_vif *mvif = (struct mt76_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct mt76_connac_gtk_rekey_tlv *gtk_tlv;</div><div class='ctx'> 	struct mt76_phy *phy = hw-&gt;priv;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -1805,7 +2404,7 @@ int mt76_connac_mcu_update_gtk_rekey(struct ieee80211_hw *hw,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	skb_put_data(skb, &amp;hdr, sizeof(hdr));</div><div class='del'>-	gtk_tlv = (struct mt76_connac_gtk_rekey_tlv *)skb_put(skb,</div><div class='add'>+	gtk_tlv = (struct mt76_connac_gtk_rekey_tlv *)skb_put_zero(skb,</div><div class='ctx'> 							 sizeof(*gtk_tlv));</div><div class='ctx'> 	gtk_tlv-&gt;tag = cpu_to_le16(UNI_OFFLOAD_OFFLOAD_GTK_REKEY);</div><div class='ctx'> 	gtk_tlv-&gt;len = cpu_to_le16(sizeof(*gtk_tlv));</div><div class='hunk'>@@ -1820,7 +2419,8 @@ int mt76_connac_mcu_update_gtk_rekey(struct ieee80211_hw *hw,</div><div class='ctx'> 	memcpy(gtk_tlv-&gt;kck, key-&gt;kck, NL80211_KCK_LEN);</div><div class='ctx'> 	memcpy(gtk_tlv-&gt;replay_ctr, key-&gt;replay_ctr, NL80211_REPLAY_CTR_LEN);</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_skb_send_msg(phy-&gt;dev, skb, MCU_UNI_CMD_OFFLOAD, true);</div><div class='add'>+	return mt76_mcu_skb_send_msg(phy-&gt;dev, skb,</div><div class='add'>+				     MCU_UNI_CMD(OFFLOAD), true);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_update_gtk_rekey);</div><div class='ctx'> </div><div class='hunk'>@@ -1828,7 +2428,7 @@ static int</div><div class='ctx'> mt76_connac_mcu_set_arp_filter(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='ctx'> 			       bool suspend)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_vif *mvif = (struct mt76_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u8 bss_idx;</div><div class='hunk'>@@ -1846,15 +2446,15 @@ mt76_connac_mcu_set_arp_filter(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='ctx'> 		},</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(dev, MCU_UNI_CMD_OFFLOAD, &amp;req, sizeof(req),</div><div class='del'>-				 true);</div><div class='add'>+	return mt76_mcu_send_msg(dev, MCU_UNI_CMD(OFFLOAD), &amp;req,</div><div class='add'>+				 sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='add'>+int</div><div class='ctx'> mt76_connac_mcu_set_gtk_rekey(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='ctx'> 			      bool suspend)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_vif *mvif = (struct mt76_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u8 bss_idx;</div><div class='hunk'>@@ -1872,17 +2472,18 @@ mt76_connac_mcu_set_gtk_rekey(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='ctx'> 		},</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(dev, MCU_UNI_CMD_OFFLOAD, &amp;req, sizeof(req),</div><div class='del'>-				 true);</div><div class='add'>+	return mt76_mcu_send_msg(dev, MCU_UNI_CMD(OFFLOAD), &amp;req,</div><div class='add'>+				 sizeof(req), true);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_gtk_rekey);</div><div class='ctx'> </div><div class='del'>-static int</div><div class='add'>+int</div><div class='ctx'> mt76_connac_mcu_set_suspend_mode(struct mt76_dev *dev,</div><div class='ctx'> 				 struct ieee80211_vif *vif,</div><div class='ctx'> 				 bool enable, u8 mdtim,</div><div class='ctx'> 				 bool wow_suspend)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_vif *mvif = (struct mt76_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u8 bss_idx;</div><div class='hunk'>@@ -1902,9 +2503,10 @@ mt76_connac_mcu_set_suspend_mode(struct mt76_dev *dev,</div><div class='ctx'> 		},</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(dev, MCU_UNI_CMD_SUSPEND, &amp;req, sizeof(req),</div><div class='del'>-				 true);</div><div class='add'>+	return mt76_mcu_send_msg(dev, MCU_UNI_CMD(SUSPEND), &amp;req,</div><div class='add'>+				 sizeof(req), true);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_suspend_mode);</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> mt76_connac_mcu_set_wow_pattern(struct mt76_dev *dev,</div><div class='hunk'>@@ -1912,7 +2514,7 @@ mt76_connac_mcu_set_wow_pattern(struct mt76_dev *dev,</div><div class='ctx'> 				u8 index, bool enable,</div><div class='ctx'> 				struct cfg80211_pkt_pattern *pattern)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_vif *mvif = (struct mt76_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct mt76_connac_wow_pattern_tlv *ptlv;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct req_hdr {</div><div class='hunk'>@@ -1927,7 +2529,7 @@ mt76_connac_mcu_set_wow_pattern(struct mt76_dev *dev,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	skb_put_data(skb, &amp;hdr, sizeof(hdr));</div><div class='del'>-	ptlv = (struct mt76_connac_wow_pattern_tlv *)skb_put(skb, sizeof(*ptlv));</div><div class='add'>+	ptlv = (struct mt76_connac_wow_pattern_tlv *)skb_put_zero(skb, sizeof(*ptlv));</div><div class='ctx'> 	ptlv-&gt;tag = cpu_to_le16(UNI_SUSPEND_WOW_PATTERN);</div><div class='ctx'> 	ptlv-&gt;len = cpu_to_le16(sizeof(*ptlv));</div><div class='ctx'> 	ptlv-&gt;data_len = pattern-&gt;pattern_len;</div><div class='hunk'>@@ -1935,16 +2537,16 @@ mt76_connac_mcu_set_wow_pattern(struct mt76_dev *dev,</div><div class='ctx'> 	ptlv-&gt;index = index;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(ptlv-&gt;pattern, pattern-&gt;pattern, pattern-&gt;pattern_len);</div><div class='del'>-	memcpy(ptlv-&gt;mask, pattern-&gt;mask, pattern-&gt;pattern_len / 8);</div><div class='add'>+	memcpy(ptlv-&gt;mask, pattern-&gt;mask, DIV_ROUND_UP(pattern-&gt;pattern_len, 8));</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_skb_send_msg(dev, skb, MCU_UNI_CMD_SUSPEND, true);</div><div class='add'>+	return mt76_mcu_skb_send_msg(dev, skb, MCU_UNI_CMD(SUSPEND), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='add'>+int</div><div class='ctx'> mt76_connac_mcu_set_wow_ctrl(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 			     bool suspend, struct cfg80211_wowlan *wowlan)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_vif *mvif = (struct mt76_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct mt76_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct {</div><div class='hunk'>@@ -1970,14 +2572,17 @@ mt76_connac_mcu_set_wow_ctrl(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	if (wowlan-&gt;magic_pkt)</div><div class='del'>-		req.wow_ctrl_tlv.trigger |= BIT(0);</div><div class='add'>+		req.wow_ctrl_tlv.trigger |= UNI_WOW_DETECT_TYPE_MAGIC;</div><div class='ctx'> 	if (wowlan-&gt;disconnect)</div><div class='del'>-		req.wow_ctrl_tlv.trigger |= BIT(2);</div><div class='add'>+		req.wow_ctrl_tlv.trigger |= (UNI_WOW_DETECT_TYPE_DISCONNECT |</div><div class='add'>+					     UNI_WOW_DETECT_TYPE_BCN_LOST);</div><div class='ctx'> 	if (wowlan-&gt;nd_config) {</div><div class='ctx'> 		mt76_connac_mcu_sched_scan_req(phy, vif, wowlan-&gt;nd_config);</div><div class='del'>-		req.wow_ctrl_tlv.trigger |= BIT(5);</div><div class='add'>+		req.wow_ctrl_tlv.trigger |= UNI_WOW_DETECT_TYPE_SCH_SCAN_HIT;</div><div class='ctx'> 		mt76_connac_mcu_sched_scan_enable(phy, vif, suspend);</div><div class='ctx'> 	}</div><div class='add'>+	if (wowlan-&gt;n_patterns)</div><div class='add'>+		req.wow_ctrl_tlv.trigger |= UNI_WOW_DETECT_TYPE_BITMAP;</div><div class='ctx'> </div><div class='ctx'> 	if (mt76_is_mmio(dev))</div><div class='ctx'> 		req.wow_ctrl_tlv.wakeup_hif = WOW_PCIE;</div><div class='hunk'>@@ -1986,11 +2591,12 @@ mt76_connac_mcu_set_wow_ctrl(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 	else if (mt76_is_sdio(dev))</div><div class='ctx'> 		req.wow_ctrl_tlv.wakeup_hif = WOW_GPIO;</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(dev, MCU_UNI_CMD_SUSPEND, &amp;req, sizeof(req),</div><div class='del'>-				 true);</div><div class='add'>+	return mt76_mcu_send_msg(dev, MCU_UNI_CMD(SUSPEND), &amp;req,</div><div class='add'>+				 sizeof(req), true);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_wow_ctrl);</div><div class='ctx'> </div><div class='del'>-int mt76_connac_mcu_set_hif_suspend(struct mt76_dev *dev, bool suspend)</div><div class='add'>+int mt76_connac_mcu_set_hif_suspend(struct mt76_dev *dev, bool suspend, bool wait_resp)</div><div class='ctx'> {</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct {</div><div class='hunk'>@@ -2004,6 +2610,7 @@ int mt76_connac_mcu_set_hif_suspend(struct mt76_dev *dev, bool suspend)</div><div class='ctx'> 			__le16 tag;</div><div class='ctx'> 			__le16 len;</div><div class='ctx'> 			u8 suspend;</div><div class='add'>+			u8 pad[7];</div><div class='ctx'> 		} __packed hif_suspend;</div><div class='ctx'> 	} req = {</div><div class='ctx'> 		.hif_suspend = {</div><div class='hunk'>@@ -2020,8 +2627,8 @@ int mt76_connac_mcu_set_hif_suspend(struct mt76_dev *dev, bool suspend)</div><div class='ctx'> 	else if (mt76_is_sdio(dev))</div><div class='ctx'> 		req.hdr.hif_type = 0;</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(dev, MCU_UNI_CMD_HIF_CTRL, &amp;req, sizeof(req),</div><div class='del'>-				 true);</div><div class='add'>+	return mt76_mcu_send_msg(dev, MCU_UNI_CMD(HIF_CTRL), &amp;req,</div><div class='add'>+				 sizeof(req), wait_resp);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_hif_suspend);</div><div class='ctx'> </div><div class='hunk'>@@ -2029,7 +2636,7 @@ void mt76_connac_mcu_set_suspend_iter(void *priv, u8 *mac,</div><div class='ctx'> 				      struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_phy *phy = priv;</div><div class='del'>-	bool suspend = test_bit(MT76_STATE_SUSPEND, &amp;phy-&gt;state);</div><div class='add'>+	bool suspend = !test_bit(MT76_STATE_RUNNING, &amp;phy-&gt;state);</div><div class='ctx'> 	struct ieee80211_hw *hw = phy-&gt;hw;</div><div class='ctx'> 	struct cfg80211_wowlan *wowlan = hw-&gt;wiphy-&gt;wowlan_config;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -2045,8 +2652,615 @@ void mt76_connac_mcu_set_suspend_iter(void *priv, u8 *mac,</div><div class='ctx'> 	mt76_connac_mcu_set_wow_ctrl(phy, vif, suspend, wowlan);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_suspend_iter);</div><div class='del'>-</div><div class='ctx'> #endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='add'>+u32 mt76_connac_mcu_reg_rr(struct mt76_dev *dev, u32 offset)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		__le32 addr;</div><div class='add'>+		__le32 val;</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.addr = cpu_to_le32(offset),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(dev, MCU_CE_QUERY(REG_READ), &amp;req,</div><div class='add'>+				 sizeof(req), true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_reg_rr);</div><div class='add'>+</div><div class='add'>+void mt76_connac_mcu_reg_wr(struct mt76_dev *dev, u32 offset, u32 val)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		__le32 addr;</div><div class='add'>+		__le32 val;</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.addr = cpu_to_le32(offset),</div><div class='add'>+		.val = cpu_to_le32(val),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mt76_mcu_send_msg(dev, MCU_CE_CMD(REG_WRITE), &amp;req,</div><div class='add'>+			  sizeof(req), false);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_reg_wr);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt76_connac_mcu_sta_key_tlv(struct mt76_connac_sta_key_conf *sta_key_conf,</div><div class='add'>+			    struct sk_buff *skb,</div><div class='add'>+			    struct ieee80211_key_conf *key,</div><div class='add'>+			    enum set_key_cmd cmd)</div><div class='add'>+{</div><div class='add'>+	struct sta_rec_sec *sec;</div><div class='add'>+	u32 len = sizeof(*sec);</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_KEY_V2, sizeof(*sec));</div><div class='add'>+	sec = (struct sta_rec_sec *)tlv;</div><div class='add'>+	sec-&gt;add = cmd;</div><div class='add'>+</div><div class='add'>+	if (cmd == SET_KEY) {</div><div class='add'>+		struct sec_key *sec_key;</div><div class='add'>+		u8 cipher;</div><div class='add'>+</div><div class='add'>+		cipher = mt76_connac_mcu_get_cipher(key-&gt;cipher);</div><div class='add'>+		if (cipher == MCU_CIPHER_NONE)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		sec_key = &amp;sec-&gt;key[0];</div><div class='add'>+		sec_key-&gt;cipher_len = sizeof(*sec_key);</div><div class='add'>+</div><div class='add'>+		if (cipher == MCU_CIPHER_BIP_CMAC_128) {</div><div class='add'>+			sec_key-&gt;cipher_id = MCU_CIPHER_AES_CCMP;</div><div class='add'>+			sec_key-&gt;key_id = sta_key_conf-&gt;keyidx;</div><div class='add'>+			sec_key-&gt;key_len = 16;</div><div class='add'>+			memcpy(sec_key-&gt;key, sta_key_conf-&gt;key, 16);</div><div class='add'>+</div><div class='add'>+			sec_key = &amp;sec-&gt;key[1];</div><div class='add'>+			sec_key-&gt;cipher_id = MCU_CIPHER_BIP_CMAC_128;</div><div class='add'>+			sec_key-&gt;cipher_len = sizeof(*sec_key);</div><div class='add'>+			sec_key-&gt;key_len = 16;</div><div class='add'>+			memcpy(sec_key-&gt;key, key-&gt;key, 16);</div><div class='add'>+			sec-&gt;n_cipher = 2;</div><div class='add'>+		} else {</div><div class='add'>+			sec_key-&gt;cipher_id = cipher;</div><div class='add'>+			sec_key-&gt;key_id = key-&gt;keyidx;</div><div class='add'>+			sec_key-&gt;key_len = key-&gt;keylen;</div><div class='add'>+			memcpy(sec_key-&gt;key, key-&gt;key, key-&gt;keylen);</div><div class='add'>+</div><div class='add'>+			if (cipher == MCU_CIPHER_TKIP) {</div><div class='add'>+				/* Rx/Tx MIC keys are swapped */</div><div class='add'>+				memcpy(sec_key-&gt;key + 16, key-&gt;key + 24, 8);</div><div class='add'>+				memcpy(sec_key-&gt;key + 24, key-&gt;key + 16, 8);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* store key_conf for BIP batch update */</div><div class='add'>+			if (cipher == MCU_CIPHER_AES_CCMP) {</div><div class='add'>+				memcpy(sta_key_conf-&gt;key, key-&gt;key, key-&gt;keylen);</div><div class='add'>+				sta_key_conf-&gt;keyidx = key-&gt;keyidx;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			len -= sizeof(*sec_key);</div><div class='add'>+			sec-&gt;n_cipher = 1;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		len -= sizeof(sec-&gt;key);</div><div class='add'>+		sec-&gt;n_cipher = 0;</div><div class='add'>+	}</div><div class='add'>+	sec-&gt;len = cpu_to_le16(len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt76_connac_mcu_add_key(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			    struct mt76_connac_sta_key_conf *sta_key_conf,</div><div class='add'>+			    struct ieee80211_key_conf *key, int mcu_cmd,</div><div class='add'>+			    struct mt76_wcid *wcid, enum set_key_cmd cmd)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = mt76_connac_mcu_alloc_sta_req(dev, mvif, wcid);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+</div><div class='add'>+	ret = mt76_connac_mcu_sta_key_tlv(sta_key_conf, skb, key, cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_connac_mcu_sta_wed_update(dev, skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_skb_send_msg(dev, skb, mcu_cmd, true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_add_key);</div><div class='add'>+</div><div class='add'>+/* SIFS 20us + 512 byte beacon transmitted by 1Mbps (3906us) */</div><div class='add'>+#define BCN_TX_ESTIMATE_TIME (4096 + 20)</div><div class='add'>+void mt76_connac_mcu_bss_ext_tlv(struct sk_buff *skb, struct mt76_vif_link *mvif)</div><div class='add'>+{</div><div class='add'>+	struct bss_info_ext_bss *ext;</div><div class='add'>+	int ext_bss_idx, tsf_offset;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	ext_bss_idx = mvif-&gt;omac_idx - EXT_BSSID_START;</div><div class='add'>+	if (ext_bss_idx &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, BSS_INFO_EXT_BSS, sizeof(*ext));</div><div class='add'>+</div><div class='add'>+	ext = (struct bss_info_ext_bss *)tlv;</div><div class='add'>+	tsf_offset = ext_bss_idx * BCN_TX_ESTIMATE_TIME;</div><div class='add'>+	ext-&gt;mbss_tsf_offset = cpu_to_le32(tsf_offset);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_bss_ext_tlv);</div><div class='add'>+</div><div class='add'>+int mt76_connac_mcu_bss_basic_tlv(struct sk_buff *skb,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  struct ieee80211_sta *sta,</div><div class='add'>+				  struct mt76_phy *phy, u16 wlan_idx,</div><div class='add'>+				  bool enable)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	u32 type = vif-&gt;p2p ? NETWORK_P2P : NETWORK_INFRA;</div><div class='add'>+	struct bss_info_basic *bss;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, BSS_INFO_BASIC, sizeof(*bss));</div><div class='add'>+	bss = (struct bss_info_basic *)tlv;</div><div class='add'>+</div><div class='add'>+	switch (vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_MESH_POINT:</div><div class='add'>+	case NL80211_IFTYPE_MONITOR:</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		if (ieee80211_hw_check(phy-&gt;hw, SUPPORTS_MULTI_BSSID)) {</div><div class='add'>+			u8 bssid_id = vif-&gt;bss_conf.bssid_indicator;</div><div class='add'>+			struct wiphy *wiphy = phy-&gt;hw-&gt;wiphy;</div><div class='add'>+</div><div class='add'>+			if (bssid_id &gt; ilog2(wiphy-&gt;mbssid_max_interfaces))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			bss-&gt;non_tx_bssid = vif-&gt;bss_conf.bssid_index;</div><div class='add'>+			bss-&gt;max_bssid = bssid_id;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		if (enable) {</div><div class='add'>+			rcu_read_lock();</div><div class='add'>+			if (!sta)</div><div class='add'>+				sta = ieee80211_find_sta(vif,</div><div class='add'>+							 vif-&gt;bss_conf.bssid);</div><div class='add'>+			/* TODO: enable BSS_INFO_UAPSD &amp; BSS_INFO_PM */</div><div class='add'>+			if (sta) {</div><div class='add'>+				struct mt76_wcid *wcid;</div><div class='add'>+</div><div class='add'>+				wcid = (struct mt76_wcid *)sta-&gt;drv_priv;</div><div class='add'>+				wlan_idx = wcid-&gt;idx;</div><div class='add'>+			}</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		type = NETWORK_IBSS;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bss-&gt;network_type = cpu_to_le32(type);</div><div class='add'>+	bss-&gt;bmc_wcid_lo = to_wcid_lo(wlan_idx);</div><div class='add'>+	bss-&gt;bmc_wcid_hi = to_wcid_hi(wlan_idx);</div><div class='add'>+	bss-&gt;wmm_idx = mvif-&gt;wmm_idx;</div><div class='add'>+	bss-&gt;active = enable;</div><div class='add'>+	bss-&gt;cipher = mvif-&gt;cipher;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_MONITOR) {</div><div class='add'>+		struct cfg80211_chan_def *chandef = &amp;phy-&gt;chandef;</div><div class='add'>+</div><div class='add'>+		memcpy(bss-&gt;bssid, vif-&gt;bss_conf.bssid, ETH_ALEN);</div><div class='add'>+		bss-&gt;bcn_interval = cpu_to_le16(vif-&gt;bss_conf.beacon_int);</div><div class='add'>+		bss-&gt;dtim_period = vif-&gt;bss_conf.dtim_period;</div><div class='add'>+		bss-&gt;phy_mode = mt76_connac_get_phy_mode(phy, vif,</div><div class='add'>+							 chandef-&gt;chan-&gt;band, NULL);</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(bss-&gt;bssid, phy-&gt;macaddr, ETH_ALEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_bss_basic_tlv);</div><div class='add'>+</div><div class='add'>+#define ENTER_PM_STATE		1</div><div class='add'>+#define EXIT_PM_STATE		2</div><div class='add'>+int mt76_connac_mcu_set_pm(struct mt76_dev *dev, int band, int enter)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		u8 pm_number;</div><div class='add'>+		u8 pm_state;</div><div class='add'>+		u8 bssid[ETH_ALEN];</div><div class='add'>+		u8 dtim_period;</div><div class='add'>+		u8 wlan_idx_lo;</div><div class='add'>+		__le16 bcn_interval;</div><div class='add'>+		__le32 aid;</div><div class='add'>+		__le32 rx_filter;</div><div class='add'>+		u8 band_idx;</div><div class='add'>+		u8 wlan_idx_hi;</div><div class='add'>+		u8 rsv[2];</div><div class='add'>+		__le32 feature;</div><div class='add'>+		u8 omac_idx;</div><div class='add'>+		u8 wmm_idx;</div><div class='add'>+		u8 bcn_loss_cnt;</div><div class='add'>+		u8 bcn_sp_duration;</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.pm_number = 5,</div><div class='add'>+		.pm_state = enter ? ENTER_PM_STATE : EXIT_PM_STATE,</div><div class='add'>+		.band_idx = band,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(dev, MCU_EXT_CMD(PM_STATE_CTRL), &amp;req,</div><div class='add'>+				 sizeof(req), true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_pm);</div><div class='add'>+</div><div class='add'>+int mt76_connac_mcu_restart(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		u8 power_mode;</div><div class='add'>+		u8 rsv[3];</div><div class='add'>+	} req = {</div><div class='add'>+		.power_mode = 1,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(dev, MCU_CMD(NIC_POWER_CTRL), &amp;req,</div><div class='add'>+				 sizeof(req), false);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_restart);</div><div class='add'>+</div><div class='add'>+int mt76_connac_mcu_del_wtbl_all(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct wtbl_req_hdr req = {</div><div class='add'>+		.operation = WTBL_RESET_ALL,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(dev, MCU_EXT_CMD(WTBL_UPDATE),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_del_wtbl_all);</div><div class='add'>+</div><div class='add'>+int mt76_connac_mcu_rdd_cmd(struct mt76_dev *dev, int cmd, u8 index,</div><div class='add'>+			    u8 rx_sel, u8 val)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		u8 ctrl;</div><div class='add'>+		u8 rdd_idx;</div><div class='add'>+		u8 rdd_rx_sel;</div><div class='add'>+		u8 val;</div><div class='add'>+		u8 rsv[4];</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.ctrl = cmd,</div><div class='add'>+		.rdd_idx = index,</div><div class='add'>+		.rdd_rx_sel = rx_sel,</div><div class='add'>+		.val = val,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(dev, MCU_EXT_CMD(SET_RDD_CTRL), &amp;req,</div><div class='add'>+				 sizeof(req), true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac_mcu_rdd_cmd);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt76_connac_mcu_send_ram_firmware(struct mt76_dev *dev,</div><div class='add'>+				  const struct mt76_connac2_fw_trailer *hdr,</div><div class='add'>+				  const u8 *data, bool is_wa)</div><div class='add'>+{</div><div class='add'>+	int i, offset = 0, max_len = mt76_is_sdio(dev) ? 2048 : 4096;</div><div class='add'>+	u32 override = 0, option = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; hdr-&gt;n_region; i++) {</div><div class='add'>+		const struct mt76_connac2_fw_region *region;</div><div class='add'>+		u32 len, addr, mode;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		region = (const void *)((const u8 *)hdr -</div><div class='add'>+					(hdr-&gt;n_region - i) * sizeof(*region));</div><div class='add'>+		mode = mt76_connac_mcu_gen_dl_mode(dev, region-&gt;feature_set,</div><div class='add'>+						   is_wa);</div><div class='add'>+		len = le32_to_cpu(region-&gt;len);</div><div class='add'>+		addr = le32_to_cpu(region-&gt;addr);</div><div class='add'>+</div><div class='add'>+		if (region-&gt;feature_set &amp; FW_FEATURE_NON_DL)</div><div class='add'>+			goto next;</div><div class='add'>+</div><div class='add'>+		if (region-&gt;feature_set &amp; FW_FEATURE_OVERRIDE_ADDR)</div><div class='add'>+			override = addr;</div><div class='add'>+</div><div class='add'>+		err = mt76_connac_mcu_init_download(dev, addr, len, mode);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev-&gt;dev, "Download request failed\n");</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = __mt76_mcu_send_firmware(dev, MCU_CMD(FW_SCATTER),</div><div class='add'>+					       data + offset, len, max_len);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev-&gt;dev, "Failed to send firmware.\n");</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+next:</div><div class='add'>+		offset += len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (override)</div><div class='add'>+		option |= FW_START_OVERRIDE;</div><div class='add'>+	if (is_wa)</div><div class='add'>+		option |= FW_START_WORKING_PDA_CR4;</div><div class='add'>+</div><div class='add'>+	return mt76_connac_mcu_start_firmware(dev, override, option);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt76_connac2_load_ram(struct mt76_dev *dev, const char *fw_wm,</div><div class='add'>+			  const char *fw_wa)</div><div class='add'>+{</div><div class='add'>+	const struct mt76_connac2_fw_trailer *hdr;</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = request_firmware(&amp;fw, fw_wm, dev-&gt;dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!fw || !fw-&gt;data || fw-&gt;size &lt; sizeof(*hdr)) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Invalid firmware\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr = (const void *)(fw-&gt;data + fw-&gt;size - sizeof(*hdr));</div><div class='add'>+	dev_info(dev-&gt;dev, "WM Firmware Version: %.10s, Build Time: %.15s\n",</div><div class='add'>+		 hdr-&gt;fw_ver, hdr-&gt;build_date);</div><div class='add'>+</div><div class='add'>+	ret = mt76_connac_mcu_send_ram_firmware(dev, hdr, fw-&gt;data, false);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Failed to start WM firmware\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snprintf(dev-&gt;hw-&gt;wiphy-&gt;fw_version,</div><div class='add'>+		 sizeof(dev-&gt;hw-&gt;wiphy-&gt;fw_version),</div><div class='add'>+		 "%.10s-%.15s", hdr-&gt;fw_ver, hdr-&gt;build_date);</div><div class='add'>+</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+</div><div class='add'>+	if (!fw_wa)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = request_firmware(&amp;fw, fw_wa, dev-&gt;dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!fw || !fw-&gt;data || fw-&gt;size &lt; sizeof(*hdr)) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Invalid firmware\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr = (const void *)(fw-&gt;data + fw-&gt;size - sizeof(*hdr));</div><div class='add'>+	dev_info(dev-&gt;dev, "WA Firmware Version: %.10s, Build Time: %.15s\n",</div><div class='add'>+		 hdr-&gt;fw_ver, hdr-&gt;build_date);</div><div class='add'>+</div><div class='add'>+	ret = mt76_connac_mcu_send_ram_firmware(dev, hdr, fw-&gt;data, true);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Failed to start WA firmware\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snprintf(dev-&gt;hw-&gt;wiphy-&gt;fw_version,</div><div class='add'>+		 sizeof(dev-&gt;hw-&gt;wiphy-&gt;fw_version),</div><div class='add'>+		 "%.10s-%.15s", hdr-&gt;fw_ver, hdr-&gt;build_date);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac2_load_ram);</div><div class='add'>+</div><div class='add'>+static u32 mt76_connac2_get_data_mode(struct mt76_dev *dev, u32 info)</div><div class='add'>+{</div><div class='add'>+	u32 mode = DL_MODE_NEED_RSP;</div><div class='add'>+</div><div class='add'>+	if ((!is_mt7921(dev) &amp;&amp; !is_mt7925(dev)) || info == PATCH_SEC_NOT_SUPPORT)</div><div class='add'>+		return mode;</div><div class='add'>+</div><div class='add'>+	switch (FIELD_GET(PATCH_SEC_ENC_TYPE_MASK, info)) {</div><div class='add'>+	case PATCH_SEC_ENC_TYPE_PLAIN:</div><div class='add'>+		break;</div><div class='add'>+	case PATCH_SEC_ENC_TYPE_AES:</div><div class='add'>+		mode |= DL_MODE_ENCRYPT;</div><div class='add'>+		mode |= FIELD_PREP(DL_MODE_KEY_IDX,</div><div class='add'>+				(info &amp; PATCH_SEC_ENC_AES_KEY_MASK)) &amp; DL_MODE_KEY_IDX;</div><div class='add'>+		mode |= DL_MODE_RESET_SEC_IV;</div><div class='add'>+		break;</div><div class='add'>+	case PATCH_SEC_ENC_TYPE_SCRAMBLE:</div><div class='add'>+		mode |= DL_MODE_ENCRYPT;</div><div class='add'>+		mode |= DL_CONFIG_ENCRY_MODE_SEL;</div><div class='add'>+		mode |= DL_MODE_RESET_SEC_IV;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev-&gt;dev, "Encryption type not support!\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt76_connac2_load_patch(struct mt76_dev *dev, const char *fw_name)</div><div class='add'>+{</div><div class='add'>+	int i, ret, sem, max_len = mt76_is_sdio(dev) ? 2048 : 4096;</div><div class='add'>+	const struct mt76_connac2_patch_hdr *hdr;</div><div class='add'>+	const struct firmware *fw = NULL;</div><div class='add'>+	char build_date[17];</div><div class='add'>+</div><div class='add'>+	sem = mt76_connac_mcu_patch_sem_ctrl(dev, true);</div><div class='add'>+	switch (sem) {</div><div class='add'>+	case PATCH_IS_DL:</div><div class='add'>+		return 0;</div><div class='add'>+	case PATCH_NOT_DL_SEM_SUCCESS:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev-&gt;dev, "Failed to get patch semaphore\n");</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = request_firmware(&amp;fw, fw_name, dev-&gt;dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!fw || !fw-&gt;data || fw-&gt;size &lt; sizeof(*hdr)) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Invalid firmware\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr = (const void *)fw-&gt;data;</div><div class='add'>+	strscpy(build_date, hdr-&gt;build_date, sizeof(build_date));</div><div class='add'>+	build_date[16] = '\0';</div><div class='add'>+	strim(build_date);</div><div class='add'>+	dev_info(dev-&gt;dev, "HW/SW Version: 0x%x, Build Time: %.16s\n",</div><div class='add'>+		 be32_to_cpu(hdr-&gt;hw_sw_ver), build_date);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; be32_to_cpu(hdr-&gt;desc.n_region); i++) {</div><div class='add'>+		struct mt76_connac2_patch_sec *sec;</div><div class='add'>+		u32 len, addr, mode;</div><div class='add'>+		const u8 *dl;</div><div class='add'>+		u32 sec_info;</div><div class='add'>+</div><div class='add'>+		sec = (void *)(fw-&gt;data + sizeof(*hdr) + i * sizeof(*sec));</div><div class='add'>+		if ((be32_to_cpu(sec-&gt;type) &amp; PATCH_SEC_TYPE_MASK) !=</div><div class='add'>+		    PATCH_SEC_TYPE_INFO) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		addr = be32_to_cpu(sec-&gt;info.addr);</div><div class='add'>+		len = be32_to_cpu(sec-&gt;info.len);</div><div class='add'>+		dl = fw-&gt;data + be32_to_cpu(sec-&gt;offs);</div><div class='add'>+		sec_info = be32_to_cpu(sec-&gt;info.sec_key_idx);</div><div class='add'>+		mode = mt76_connac2_get_data_mode(dev, sec_info);</div><div class='add'>+</div><div class='add'>+		ret = mt76_connac_mcu_init_download(dev, addr, len, mode);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(dev-&gt;dev, "Download request failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = __mt76_mcu_send_firmware(dev, MCU_CMD(FW_SCATTER),</div><div class='add'>+					       dl, len, max_len);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(dev-&gt;dev, "Failed to send patch\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt76_connac_mcu_start_patch(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(dev-&gt;dev, "Failed to start patch\n");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	sem = mt76_connac_mcu_patch_sem_ctrl(dev, false);</div><div class='add'>+	switch (sem) {</div><div class='add'>+	case PATCH_REL_SEM_SUCCESS:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EAGAIN;</div><div class='add'>+		dev_err(dev-&gt;dev, "Failed to release patch semaphore\n");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac2_load_patch);</div><div class='add'>+</div><div class='add'>+int mt76_connac2_mcu_fill_message(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='add'>+				  int cmd, int *wait_seq)</div><div class='add'>+{</div><div class='add'>+	int txd_len, mcu_cmd = FIELD_GET(__MCU_CMD_FIELD_ID, cmd);</div><div class='add'>+	struct mt76_connac2_mcu_uni_txd *uni_txd;</div><div class='add'>+	struct mt76_connac2_mcu_txd *mcu_txd;</div><div class='add'>+	__le32 *txd;</div><div class='add'>+	u32 val;</div><div class='add'>+	u8 seq;</div><div class='add'>+</div><div class='add'>+	/* TODO: make dynamic based on msg type */</div><div class='add'>+	dev-&gt;mcu.timeout = 20 * HZ;</div><div class='add'>+</div><div class='add'>+	seq = ++dev-&gt;mcu.msg_seq &amp; 0xf;</div><div class='add'>+	if (!seq)</div><div class='add'>+		seq = ++dev-&gt;mcu.msg_seq &amp; 0xf;</div><div class='add'>+</div><div class='add'>+	if (cmd == MCU_CMD(FW_SCATTER))</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	txd_len = cmd &amp; __MCU_CMD_FIELD_UNI ? sizeof(*uni_txd) : sizeof(*mcu_txd);</div><div class='add'>+	txd = (__le32 *)skb_push(skb, txd_len);</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD0_TX_BYTES, skb-&gt;len) |</div><div class='add'>+	      FIELD_PREP(MT_TXD0_PKT_FMT, MT_TX_TYPE_CMD) |</div><div class='add'>+	      FIELD_PREP(MT_TXD0_Q_IDX, MT_TX_MCU_PORT_RX_Q0);</div><div class='add'>+	txd[0] = cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	val = MT_TXD1_LONG_FORMAT |</div><div class='add'>+	      FIELD_PREP(MT_TXD1_HDR_FORMAT, MT_HDR_FORMAT_CMD);</div><div class='add'>+	txd[1] = cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	if (cmd &amp; __MCU_CMD_FIELD_UNI) {</div><div class='add'>+		uni_txd = (struct mt76_connac2_mcu_uni_txd *)txd;</div><div class='add'>+		uni_txd-&gt;len = cpu_to_le16(skb-&gt;len - sizeof(uni_txd-&gt;txd));</div><div class='add'>+		uni_txd-&gt;option = MCU_CMD_UNI_EXT_ACK;</div><div class='add'>+		uni_txd-&gt;cid = cpu_to_le16(mcu_cmd);</div><div class='add'>+		uni_txd-&gt;s2d_index = MCU_S2D_H2N;</div><div class='add'>+		uni_txd-&gt;pkt_type = MCU_PKT_ID;</div><div class='add'>+		uni_txd-&gt;seq = seq;</div><div class='add'>+</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mcu_txd = (struct mt76_connac2_mcu_txd *)txd;</div><div class='add'>+	mcu_txd-&gt;len = cpu_to_le16(skb-&gt;len - sizeof(mcu_txd-&gt;txd));</div><div class='add'>+	mcu_txd-&gt;pq_id = cpu_to_le16(MCU_PQ_ID(MT_TX_PORT_IDX_MCU,</div><div class='add'>+					       MT_TX_MCU_PORT_RX_Q0));</div><div class='add'>+	mcu_txd-&gt;pkt_type = MCU_PKT_ID;</div><div class='add'>+	mcu_txd-&gt;seq = seq;</div><div class='add'>+	mcu_txd-&gt;cid = mcu_cmd;</div><div class='add'>+	mcu_txd-&gt;ext_cid = FIELD_GET(__MCU_CMD_FIELD_EXT_ID, cmd);</div><div class='add'>+</div><div class='add'>+	if (mcu_txd-&gt;ext_cid || (cmd &amp; __MCU_CMD_FIELD_CE)) {</div><div class='add'>+		if (cmd &amp; __MCU_CMD_FIELD_QUERY)</div><div class='add'>+			mcu_txd-&gt;set_query = MCU_Q_QUERY;</div><div class='add'>+		else</div><div class='add'>+			mcu_txd-&gt;set_query = MCU_Q_SET;</div><div class='add'>+		mcu_txd-&gt;ext_cid_ack = !!mcu_txd-&gt;ext_cid;</div><div class='add'>+	} else {</div><div class='add'>+		mcu_txd-&gt;set_query = MCU_Q_NA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd &amp; __MCU_CMD_FIELD_WA)</div><div class='add'>+		mcu_txd-&gt;s2d_index = MCU_S2D_H2C;</div><div class='add'>+	else</div><div class='add'>+		mcu_txd-&gt;s2d_index = MCU_S2D_H2N;</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	if (wait_seq)</div><div class='add'>+		*wait_seq = seq;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76_connac2_mcu_fill_message);</div><div class='add'>+</div><div class='ctx'> MODULE_AUTHOR("Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("MediaTek MT76x connac layer helpers");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h<br/>index a1096861d04a..8d59cf43f0e2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MT76_CONNAC_MCU_H</div><div class='hunk'>@@ -6,11 +6,269 @@</div><div class='ctx'> </div><div class='ctx'> #include "mt76_connac.h"</div><div class='ctx'> </div><div class='add'>+#define FW_FEATURE_SET_ENCRYPT		BIT(0)</div><div class='add'>+#define FW_FEATURE_SET_KEY_IDX		GENMASK(2, 1)</div><div class='add'>+#define FW_FEATURE_ENCRY_MODE		BIT(4)</div><div class='add'>+#define FW_FEATURE_OVERRIDE_ADDR	BIT(5)</div><div class='add'>+#define FW_FEATURE_NON_DL		BIT(6)</div><div class='add'>+</div><div class='add'>+#define DL_MODE_ENCRYPT			BIT(0)</div><div class='add'>+#define DL_MODE_KEY_IDX			GENMASK(2, 1)</div><div class='add'>+#define DL_MODE_RESET_SEC_IV		BIT(3)</div><div class='add'>+#define DL_MODE_WORKING_PDA_CR4		BIT(4)</div><div class='add'>+#define DL_MODE_VALID_RAM_ENTRY         BIT(5)</div><div class='add'>+#define DL_CONFIG_ENCRY_MODE_SEL	BIT(6)</div><div class='add'>+#define DL_MODE_NEED_RSP		BIT(31)</div><div class='add'>+</div><div class='add'>+#define FW_START_OVERRIDE		BIT(0)</div><div class='add'>+#define FW_START_WORKING_PDA_CR4	BIT(2)</div><div class='add'>+#define FW_START_WORKING_PDA_DSP	BIT(3)</div><div class='add'>+</div><div class='add'>+#define PATCH_SEC_NOT_SUPPORT		GENMASK(31, 0)</div><div class='add'>+#define PATCH_SEC_TYPE_MASK		GENMASK(15, 0)</div><div class='add'>+#define PATCH_SEC_TYPE_INFO		0x2</div><div class='add'>+</div><div class='add'>+#define PATCH_SEC_ENC_TYPE_MASK			GENMASK(31, 24)</div><div class='add'>+#define PATCH_SEC_ENC_TYPE_PLAIN		0x00</div><div class='add'>+#define PATCH_SEC_ENC_TYPE_AES			0x01</div><div class='add'>+#define PATCH_SEC_ENC_TYPE_SCRAMBLE		0x02</div><div class='add'>+#define PATCH_SEC_ENC_SCRAMBLE_INFO_MASK	GENMASK(15, 0)</div><div class='add'>+#define PATCH_SEC_ENC_AES_KEY_MASK		GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	FW_TYPE_DEFAULT = 0,</div><div class='add'>+	FW_TYPE_CLC = 2,</div><div class='add'>+	FW_TYPE_MAX_NUM = 255</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MCU_PQ_ID(p, q)		(((p) &lt;&lt; 15) | ((q) &lt;&lt; 10))</div><div class='add'>+#define MCU_PKT_ID		0xa0</div><div class='add'>+</div><div class='add'>+struct mt76_connac2_mcu_txd {</div><div class='add'>+	__le32 txd[8];</div><div class='add'>+</div><div class='add'>+	__le16 len;</div><div class='add'>+	__le16 pq_id;</div><div class='add'>+</div><div class='add'>+	u8 cid;</div><div class='add'>+	u8 pkt_type;</div><div class='add'>+	u8 set_query; /* FW don't care */</div><div class='add'>+	u8 seq;</div><div class='add'>+</div><div class='add'>+	u8 uc_d2b0_rev;</div><div class='add'>+	u8 ext_cid;</div><div class='add'>+	u8 s2d_index;</div><div class='add'>+	u8 ext_cid_ack;</div><div class='add'>+</div><div class='add'>+	u32 rsv[5];</div><div class='add'>+} __packed __aligned(4);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct mt76_connac2_mcu_uni_txd - mcu command descriptor for connac2 and connac3</div><div class='add'>+ * @txd: hardware descriptor</div><div class='add'>+ * @len: total length not including txd</div><div class='add'>+ * @cid: command identifier</div><div class='add'>+ * @pkt_type: must be 0xa0 (cmd packet by long format)</div><div class='add'>+ * @frag_n: fragment number</div><div class='add'>+ * @seq: sequence number</div><div class='add'>+ * @checksum: 0 mean there is no checksum</div><div class='add'>+ * @s2d_index: index for command source and destination</div><div class='add'>+ *  Definition              | value | note</div><div class='add'>+ *  CMD_S2D_IDX_H2N         | 0x00  | command from HOST to WM</div><div class='add'>+ *  CMD_S2D_IDX_C2N         | 0x01  | command from WA to WM</div><div class='add'>+ *  CMD_S2D_IDX_H2C         | 0x02  | command from HOST to WA</div><div class='add'>+ *  CMD_S2D_IDX_H2N_AND_H2C | 0x03  | command from HOST to WA and WM</div><div class='add'>+ *</div><div class='add'>+ * @option: command option</div><div class='add'>+ *  BIT[0]: UNI_CMD_OPT_BIT_ACK</div><div class='add'>+ *          set to 1 to request a fw reply</div><div class='add'>+ *          if UNI_CMD_OPT_BIT_0_ACK is set and UNI_CMD_OPT_BIT_2_SET_QUERY</div><div class='add'>+ *          is set, mcu firmware will send response event EID = 0x01</div><div class='add'>+ *          (UNI_EVENT_ID_CMD_RESULT) to the host.</div><div class='add'>+ *  BIT[1]: UNI_CMD_OPT_BIT_UNI_CMD</div><div class='add'>+ *          0: original command</div><div class='add'>+ *          1: unified command</div><div class='add'>+ *  BIT[2]: UNI_CMD_OPT_BIT_SET_QUERY</div><div class='add'>+ *          0: QUERY command</div><div class='add'>+ *          1: SET command</div><div class='add'>+ */</div><div class='add'>+struct mt76_connac2_mcu_uni_txd {</div><div class='add'>+	__le32 txd[8];</div><div class='add'>+</div><div class='add'>+	/* DW1 */</div><div class='add'>+	__le16 len;</div><div class='add'>+	__le16 cid;</div><div class='add'>+</div><div class='add'>+	/* DW2 */</div><div class='add'>+	u8 rsv;</div><div class='add'>+	u8 pkt_type;</div><div class='add'>+	u8 frag_n;</div><div class='add'>+	u8 seq;</div><div class='add'>+</div><div class='add'>+	/* DW3 */</div><div class='add'>+	__le16 checksum;</div><div class='add'>+	u8 s2d_index;</div><div class='add'>+	u8 option;</div><div class='add'>+</div><div class='add'>+	/* DW4 */</div><div class='add'>+	u8 rsv1[4];</div><div class='add'>+} __packed __aligned(4);</div><div class='add'>+</div><div class='add'>+struct mt76_connac2_mcu_rxd {</div><div class='add'>+	/* New members MUST be added within the struct_group() macro below. */</div><div class='add'>+	struct_group_tagged(mt76_connac2_mcu_rxd_hdr, hdr,</div><div class='add'>+		__le32 rxd[6];</div><div class='add'>+</div><div class='add'>+		__le16 len;</div><div class='add'>+		__le16 pkt_type_id;</div><div class='add'>+</div><div class='add'>+		u8 eid;</div><div class='add'>+		u8 seq;</div><div class='add'>+		u8 option;</div><div class='add'>+		u8 rsv;</div><div class='add'>+		u8 ext_eid;</div><div class='add'>+		u8 rsv1[2];</div><div class='add'>+		u8 s2d_index;</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	u8 tlv[];</div><div class='add'>+};</div><div class='add'>+static_assert(offsetof(struct mt76_connac2_mcu_rxd, tlv) == sizeof(struct mt76_connac2_mcu_rxd_hdr),</div><div class='add'>+	      "struct member likely outside of struct_group_tagged()");</div><div class='add'>+</div><div class='add'>+struct mt76_connac2_patch_hdr {</div><div class='add'>+	char build_date[16];</div><div class='add'>+	char platform[4];</div><div class='add'>+	__be32 hw_sw_ver;</div><div class='add'>+	__be32 patch_ver;</div><div class='add'>+	__be16 checksum;</div><div class='add'>+	u16 rsv;</div><div class='add'>+	struct {</div><div class='add'>+		__be32 patch_ver;</div><div class='add'>+		__be32 subsys;</div><div class='add'>+		__be32 feature;</div><div class='add'>+		__be32 n_region;</div><div class='add'>+		__be32 crc;</div><div class='add'>+		u32 rsv[11];</div><div class='add'>+	} desc;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt76_connac2_patch_sec {</div><div class='add'>+	__be32 type;</div><div class='add'>+	__be32 offs;</div><div class='add'>+	__be32 size;</div><div class='add'>+	union {</div><div class='add'>+		__be32 spec[13];</div><div class='add'>+		struct {</div><div class='add'>+			__be32 addr;</div><div class='add'>+			__be32 len;</div><div class='add'>+			__be32 sec_key_idx;</div><div class='add'>+			__be32 align_len;</div><div class='add'>+			u32 rsv[9];</div><div class='add'>+		} info;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt76_connac2_fw_trailer {</div><div class='add'>+	u8 chip_id;</div><div class='add'>+	u8 eco_code;</div><div class='add'>+	u8 n_region;</div><div class='add'>+	u8 format_ver;</div><div class='add'>+	u8 format_flag;</div><div class='add'>+	u8 rsv[2];</div><div class='add'>+	char fw_ver[10];</div><div class='add'>+	char build_date[15];</div><div class='add'>+	__le32 crc;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt76_connac2_fw_region {</div><div class='add'>+	__le32 decomp_crc;</div><div class='add'>+	__le32 decomp_len;</div><div class='add'>+	__le32 decomp_blk_sz;</div><div class='add'>+	u8 rsv[4];</div><div class='add'>+	__le32 addr;</div><div class='add'>+	__le32 len;</div><div class='add'>+	u8 feature_set;</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 rsv1[14];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct tlv {</div><div class='ctx'> 	__le16 tag;</div><div class='ctx'> 	__le16 len;</div><div class='add'>+	u8 data[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct bss_info_omac {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 hw_bss_idx;</div><div class='add'>+	u8 omac_idx;</div><div class='add'>+	u8 band_idx;</div><div class='add'>+	u8 rsv0;</div><div class='add'>+	__le32 conn_type;</div><div class='add'>+	u32 rsv1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct bss_info_basic {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	__le32 network_type;</div><div class='add'>+	u8 active;</div><div class='add'>+	u8 rsv0;</div><div class='add'>+	__le16 bcn_interval;</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	u8 wmm_idx;</div><div class='add'>+	u8 dtim_period;</div><div class='add'>+	u8 bmc_wcid_lo;</div><div class='add'>+	u8 cipher;</div><div class='add'>+	u8 phy_mode;</div><div class='add'>+	u8 max_bssid;	/* max BSSID. range: 1 ~ 8, 0: MBSSID disabled */</div><div class='add'>+	u8 non_tx_bssid;/* non-transmitted BSSID, 0: transmitted BSSID */</div><div class='add'>+	u8 bmc_wcid_hi;	/* high Byte and version */</div><div class='add'>+	u8 rsv[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct bss_info_rf_ch {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 pri_ch;</div><div class='add'>+	u8 center_ch0;</div><div class='add'>+	u8 center_ch1;</div><div class='add'>+	u8 bw;</div><div class='add'>+	u8 he_ru26_block;	/* 1: don't send HETB in RU26, 0: allow */</div><div class='add'>+	u8 he_all_disable;	/* 1: disallow all HETB, 0: allow */</div><div class='add'>+	u8 rsv[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct bss_info_ext_bss {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	__le32 mbss_tsf_offset; /* in unit of us */</div><div class='add'>+	u8 rsv[8];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	BSS_INFO_OMAC,</div><div class='add'>+	BSS_INFO_BASIC,</div><div class='add'>+	BSS_INFO_RF_CH,		/* optional, for BT/LTE coex */</div><div class='add'>+	BSS_INFO_PM,		/* sta only */</div><div class='add'>+	BSS_INFO_UAPSD,		/* sta only */</div><div class='add'>+	BSS_INFO_ROAM_DETECT,	/* obsoleted */</div><div class='add'>+	BSS_INFO_LQ_RM,		/* obsoleted */</div><div class='add'>+	BSS_INFO_EXT_BSS,</div><div class='add'>+	BSS_INFO_BMC_RATE,	/* for bmc rate control in CR4 */</div><div class='add'>+	BSS_INFO_SYNC_MODE,	/* obsoleted */</div><div class='add'>+	BSS_INFO_RA,</div><div class='add'>+	BSS_INFO_HW_AMSDU,</div><div class='add'>+	BSS_INFO_BSS_COLOR,</div><div class='add'>+	BSS_INFO_HE_BASIC,</div><div class='add'>+	BSS_INFO_PROTECT_INFO,</div><div class='add'>+	BSS_INFO_OFFLOAD,</div><div class='add'>+	BSS_INFO_11V_MBSSID,</div><div class='add'>+	BSS_INFO_MAX_NUM</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* sta_rec */</div><div class='ctx'> </div><div class='ctx'> struct sta_ntlv_hdr {</div><div class='hunk'>@@ -54,7 +312,7 @@ struct sta_rec_vht {</div><div class='ctx'> 	__le32 vht_cap;</div><div class='ctx'> 	__le16 vht_rx_mcs_map;</div><div class='ctx'> 	__le16 vht_tx_mcs_map;</div><div class='del'>-	/* mt7921 */</div><div class='add'>+	/* mt7915 - mt7921 */</div><div class='ctx'> 	u8 rts_bw_sig;</div><div class='ctx'> 	u8 rsv[3];</div><div class='ctx'> } __packed;</div><div class='hunk'>@@ -105,6 +363,16 @@ struct sta_rec_he {</div><div class='ctx'> 	u8 rsv2[2];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct sta_rec_he_v2 {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 he_mac_cap[6];</div><div class='add'>+	u8 he_phy_cap[11];</div><div class='add'>+	u8 pkt_ext;</div><div class='add'>+	/* 0: BW80, 1: BW160, 2: BW8080 */</div><div class='add'>+	__le16 max_nss_mcs[CMD_HE_MCS_BW_NUM];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct sta_rec_amsdu {</div><div class='ctx'> 	__le16 tag;</div><div class='ctx'> 	__le16 len;</div><div class='hunk'>@@ -124,6 +392,8 @@ struct sta_rec_state {</div><div class='ctx'> 	u8 rsv[1];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+#define RA_LEGACY_OFDM GENMASK(13, 6)</div><div class='add'>+#define RA_LEGACY_CCK  GENMASK(3, 0)</div><div class='ctx'> #define HT_MCS_MASK_NUM 10</div><div class='ctx'> struct sta_rec_ra_info {</div><div class='ctx'> 	__le16 tag;</div><div class='hunk'>@@ -140,7 +410,222 @@ struct sta_rec_phy {</div><div class='ctx'> 	u8 ampdu;</div><div class='ctx'> 	u8 rts_policy;</div><div class='ctx'> 	u8 rcpi;</div><div class='add'>+	u8 max_ampdu_len; /* connac3 */</div><div class='add'>+	u8 rsv[1];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct sta_rec_he_6g_capa {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	__le16 capa;</div><div class='add'>+	u8 rsv[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct sta_rec_pn_info {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 pn[6];</div><div class='add'>+	u8 tsc_type;</div><div class='add'>+	u8 rsv;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct sec_key {</div><div class='add'>+	u8 cipher_id;</div><div class='add'>+	u8 cipher_len;</div><div class='add'>+	u8 key_id;</div><div class='add'>+	u8 key_len;</div><div class='add'>+	u8 key[32];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct sta_rec_sec {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 add;</div><div class='add'>+	u8 n_cipher;</div><div class='ctx'> 	u8 rsv[2];</div><div class='add'>+</div><div class='add'>+	struct sec_key key[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct sta_rec_bf {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+</div><div class='add'>+	__le16 pfmu;		/* 0xffff: no access right for PFMU */</div><div class='add'>+	bool su_mu;		/* 0: SU, 1: MU */</div><div class='add'>+	u8 bf_cap;		/* 0: iBF, 1: eBF */</div><div class='add'>+	u8 sounding_phy;	/* 0: legacy, 1: OFDM, 2: HT, 4: VHT */</div><div class='add'>+	u8 ndpa_rate;</div><div class='add'>+	u8 ndp_rate;</div><div class='add'>+	u8 rept_poll_rate;</div><div class='add'>+	u8 tx_mode;		/* 0: legacy, 1: OFDM, 2: HT, 4: VHT ... */</div><div class='add'>+	u8 ncol;</div><div class='add'>+	u8 nrow;</div><div class='add'>+	u8 bw;			/* 0: 20M, 1: 40M, 2: 80M, 3: 160M */</div><div class='add'>+</div><div class='add'>+	u8 mem_total;</div><div class='add'>+	u8 mem_20m;</div><div class='add'>+	struct {</div><div class='add'>+		u8 row;</div><div class='add'>+		u8 col: 6, row_msb: 2;</div><div class='add'>+	} mem[4];</div><div class='add'>+</div><div class='add'>+	__le16 smart_ant;</div><div class='add'>+	u8 se_idx;</div><div class='add'>+	u8 auto_sounding;	/* b7: low traffic indicator</div><div class='add'>+				 * b6: Stop sounding for this entry</div><div class='add'>+				 * b5 ~ b0: postpone sounding</div><div class='add'>+				 */</div><div class='add'>+	u8 ibf_timeout;</div><div class='add'>+	u8 ibf_dbw;</div><div class='add'>+	u8 ibf_ncol;</div><div class='add'>+	u8 ibf_nrow;</div><div class='add'>+	u8 nrow_gt_bw80;</div><div class='add'>+	u8 ncol_gt_bw80;</div><div class='add'>+	u8 ru_start_idx;</div><div class='add'>+	u8 ru_end_idx;</div><div class='add'>+</div><div class='add'>+	bool trigger_su;</div><div class='add'>+	bool trigger_mu;</div><div class='add'>+	bool ng16_su;</div><div class='add'>+	bool ng16_mu;</div><div class='add'>+	bool codebook42_su;</div><div class='add'>+	bool codebook75_mu;</div><div class='add'>+</div><div class='add'>+	u8 he_ltf;</div><div class='add'>+	u8 rsv[3];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct sta_rec_bfee {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	bool fb_identity_matrix;	/* 1: feedback identity matrix */</div><div class='add'>+	bool ignore_feedback;		/* 1: ignore */</div><div class='add'>+	u8 rsv[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct sta_rec_muru {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		bool ofdma_dl_en;</div><div class='add'>+		bool ofdma_ul_en;</div><div class='add'>+		bool mimo_dl_en;</div><div class='add'>+		bool mimo_ul_en;</div><div class='add'>+		u8 rsv[4];</div><div class='add'>+	} cfg;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u8 punc_pream_rx;</div><div class='add'>+		bool he_20m_in_40m_2g;</div><div class='add'>+		bool he_20m_in_160m;</div><div class='add'>+		bool he_80m_in_160m;</div><div class='add'>+		bool lt16_sigb;</div><div class='add'>+		bool rx_su_comp_sigb;</div><div class='add'>+		bool rx_su_non_comp_sigb;</div><div class='add'>+		u8 rsv;</div><div class='add'>+	} ofdma_dl;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u8 t_frame_dur;</div><div class='add'>+		u8 mu_cascading;</div><div class='add'>+		u8 uo_ra;</div><div class='add'>+		u8 he_2x996_tone;</div><div class='add'>+		u8 rx_t_frame_11ac;</div><div class='add'>+		u8 rx_ctrl_frame_to_mbss;</div><div class='add'>+		u8 rsv[2];</div><div class='add'>+	} ofdma_ul;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		bool vht_mu_bfee;</div><div class='add'>+		bool partial_bw_dl_mimo;</div><div class='add'>+		u8 rsv[2];</div><div class='add'>+	} mimo_dl;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		bool full_ul_mimo;</div><div class='add'>+		bool partial_ul_mimo;</div><div class='add'>+		u8 rsv[2];</div><div class='add'>+	} mimo_ul;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct sta_rec_remove {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 action;</div><div class='add'>+	u8 pad[3];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct sta_phy {</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 flag;</div><div class='add'>+	u8 stbc;</div><div class='add'>+	u8 sgi;</div><div class='add'>+	u8 bw;</div><div class='add'>+	u8 ldpc;</div><div class='add'>+	u8 mcs;</div><div class='add'>+	u8 nss;</div><div class='add'>+	u8 he_ltf;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sta_rec_ra {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+</div><div class='add'>+	u8 valid;</div><div class='add'>+	u8 auto_rate;</div><div class='add'>+	u8 phy_mode;</div><div class='add'>+	u8 channel;</div><div class='add'>+	u8 bw;</div><div class='add'>+	u8 disable_cck;</div><div class='add'>+	u8 ht_mcs32;</div><div class='add'>+	u8 ht_gf;</div><div class='add'>+	u8 ht_mcs[4];</div><div class='add'>+	u8 mmps_mode;</div><div class='add'>+	u8 gband_256;</div><div class='add'>+	u8 af;</div><div class='add'>+	u8 auth_wapi_mode;</div><div class='add'>+	u8 rate_len;</div><div class='add'>+</div><div class='add'>+	u8 supp_mode;</div><div class='add'>+	u8 supp_cck_rate;</div><div class='add'>+	u8 supp_ofdm_rate;</div><div class='add'>+	__le32 supp_ht_mcs;</div><div class='add'>+	__le16 supp_vht_mcs[4];</div><div class='add'>+</div><div class='add'>+	u8 op_mode;</div><div class='add'>+	u8 op_vht_chan_width;</div><div class='add'>+	u8 op_vht_rx_nss;</div><div class='add'>+	u8 op_vht_rx_nss_type;</div><div class='add'>+</div><div class='add'>+	__le32 sta_cap;</div><div class='add'>+</div><div class='add'>+	struct sta_phy phy;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct sta_rec_ra_fixed {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+</div><div class='add'>+	__le32 field;</div><div class='add'>+	u8 op_mode;</div><div class='add'>+	u8 op_vht_chan_width;</div><div class='add'>+	u8 op_vht_rx_nss;</div><div class='add'>+	u8 op_vht_rx_nss_type;</div><div class='add'>+</div><div class='add'>+	struct sta_phy phy;</div><div class='add'>+</div><div class='add'>+	u8 spe_idx;</div><div class='add'>+	u8 short_preamble;</div><div class='add'>+	u8 is_5g;</div><div class='add'>+	u8 mmps_mode;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct sta_rec_tx_proc {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	__le32 flag;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* wtbl_rec */</div><div class='hunk'>@@ -225,6 +710,7 @@ struct wtbl_ba {</div><div class='ctx'> 	__le16 sn;</div><div class='ctx'> 	u8 ba_en;</div><div class='ctx'> 	u8 ba_winsize_idx;</div><div class='add'>+	/* originator &amp; recipient */</div><div class='ctx'> 	__le16 ba_winsize;</div><div class='ctx'> 	/* recipient only */</div><div class='ctx'> 	u8 peer_addr[ETH_ALEN];</div><div class='hunk'>@@ -295,12 +781,21 @@ struct wtbl_raw {</div><div class='ctx'> </div><div class='ctx'> #define MT76_CONNAC_STA_UPDATE_MAX_SIZE	(sizeof(struct sta_req_hdr) +	\</div><div class='ctx'> 					 sizeof(struct sta_rec_basic) +	\</div><div class='add'>+					 sizeof(struct sta_rec_bf) +	\</div><div class='ctx'> 					 sizeof(struct sta_rec_ht) +	\</div><div class='ctx'> 					 sizeof(struct sta_rec_he) +	\</div><div class='ctx'> 					 sizeof(struct sta_rec_ba) +	\</div><div class='ctx'> 					 sizeof(struct sta_rec_vht) +	\</div><div class='ctx'> 					 sizeof(struct sta_rec_uapsd) + \</div><div class='ctx'> 					 sizeof(struct sta_rec_amsdu) +	\</div><div class='add'>+					 sizeof(struct sta_rec_muru) +	\</div><div class='add'>+					 sizeof(struct sta_rec_bfee) +	\</div><div class='add'>+					 sizeof(struct sta_rec_ra) +	\</div><div class='add'>+					 sizeof(struct sta_rec_sec) +	\</div><div class='add'>+					 sizeof(struct sta_rec_ra_fixed) + \</div><div class='add'>+					 sizeof(struct sta_rec_he_6g_capa) + \</div><div class='add'>+					 sizeof(struct sta_rec_pn_info) + \</div><div class='add'>+					 sizeof(struct sta_rec_tx_proc) + \</div><div class='ctx'> 					 sizeof(struct tlv) +		\</div><div class='ctx'> 					 MT76_CONNAC_WTBL_UPDATE_MAX_SIZE)</div><div class='ctx'> </div><div class='hunk'>@@ -327,6 +822,17 @@ enum {</div><div class='ctx'> 	STA_REC_MUEDCA,</div><div class='ctx'> 	STA_REC_BFEE,</div><div class='ctx'> 	STA_REC_PHY = 0x15,</div><div class='add'>+	STA_REC_HE_6G = 0x17,</div><div class='add'>+	STA_REC_HE_V2 = 0x19,</div><div class='add'>+	STA_REC_MLD = 0x20,</div><div class='add'>+	STA_REC_EHT_MLD = 0x21,</div><div class='add'>+	STA_REC_EHT = 0x22,</div><div class='add'>+	STA_REC_MLD_OFF = 0x23,</div><div class='add'>+	STA_REC_REMOVE = 0x25,</div><div class='add'>+	STA_REC_PN_INFO = 0x26,</div><div class='add'>+	STA_REC_KEY_V3 = 0x27,</div><div class='add'>+	STA_REC_HDRT = 0x28,</div><div class='add'>+	STA_REC_HDR_TRANS = 0x2B,</div><div class='ctx'> 	STA_REC_MAX_NUM</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -363,6 +869,7 @@ enum {</div><div class='ctx'> #define NETWORK_WDS			BIT(21)</div><div class='ctx'> </div><div class='ctx'> #define SCAN_FUNC_RANDOM_MAC		BIT(0)</div><div class='add'>+#define SCAN_FUNC_RNR_SCAN		BIT(3)</div><div class='ctx'> #define SCAN_FUNC_SPLIT_SCAN		BIT(5)</div><div class='ctx'> </div><div class='ctx'> #define CONNECTION_INFRA_STA		(STA_TYPE_STA | NETWORK_INFRA)</div><div class='hunk'>@@ -412,13 +919,33 @@ enum {</div><div class='ctx'> #define PHY_MODE_AC				BIT(5)</div><div class='ctx'> #define PHY_MODE_AX_24G				BIT(6)</div><div class='ctx'> #define PHY_MODE_AX_5G				BIT(7)</div><div class='del'>-#define PHY_MODE_AX_6G				BIT(8)</div><div class='add'>+</div><div class='add'>+#define PHY_MODE_AX_6G				BIT(0) /* phymode_ext */</div><div class='add'>+#define PHY_MODE_BE_24G				BIT(1)</div><div class='add'>+#define PHY_MODE_BE_5G				BIT(2)</div><div class='add'>+#define PHY_MODE_BE_6G				BIT(3)</div><div class='ctx'> </div><div class='ctx'> #define MODE_CCK				BIT(0)</div><div class='ctx'> #define MODE_OFDM				BIT(1)</div><div class='ctx'> #define MODE_HT					BIT(2)</div><div class='ctx'> #define MODE_VHT				BIT(3)</div><div class='ctx'> #define MODE_HE					BIT(4)</div><div class='add'>+#define MODE_EHT				BIT(5)</div><div class='add'>+</div><div class='add'>+#define STA_CAP_WMM				BIT(0)</div><div class='add'>+#define STA_CAP_SGI_20				BIT(4)</div><div class='add'>+#define STA_CAP_SGI_40				BIT(5)</div><div class='add'>+#define STA_CAP_TX_STBC				BIT(6)</div><div class='add'>+#define STA_CAP_RX_STBC				BIT(7)</div><div class='add'>+#define STA_CAP_VHT_SGI_80			BIT(16)</div><div class='add'>+#define STA_CAP_VHT_SGI_160			BIT(17)</div><div class='add'>+#define STA_CAP_VHT_TX_STBC			BIT(18)</div><div class='add'>+#define STA_CAP_VHT_RX_STBC			BIT(19)</div><div class='add'>+#define STA_CAP_VHT_LDPC			BIT(23)</div><div class='add'>+#define STA_CAP_LDPC				BIT(24)</div><div class='add'>+#define STA_CAP_HT				BIT(26)</div><div class='add'>+#define STA_CAP_VHT				BIT(27)</div><div class='add'>+#define STA_CAP_HE				BIT(28)</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	PHY_TYPE_HR_DSSS_INDEX = 0,</div><div class='hunk'>@@ -428,15 +955,20 @@ enum {</div><div class='ctx'> 	PHY_TYPE_HT_INDEX,</div><div class='ctx'> 	PHY_TYPE_VHT_INDEX,</div><div class='ctx'> 	PHY_TYPE_HE_INDEX,</div><div class='add'>+	PHY_TYPE_BE_INDEX,</div><div class='ctx'> 	PHY_TYPE_INDEX_NUM</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define HR_DSSS_ERP_BASIC_RATE			GENMASK(3, 0)</div><div class='add'>+#define OFDM_BASIC_RATE				(BIT(6) | BIT(8) | BIT(10))</div><div class='add'>+</div><div class='ctx'> #define PHY_TYPE_BIT_HR_DSSS			BIT(PHY_TYPE_HR_DSSS_INDEX)</div><div class='ctx'> #define PHY_TYPE_BIT_ERP			BIT(PHY_TYPE_ERP_INDEX)</div><div class='ctx'> #define PHY_TYPE_BIT_OFDM			BIT(PHY_TYPE_OFDM_INDEX)</div><div class='ctx'> #define PHY_TYPE_BIT_HT				BIT(PHY_TYPE_HT_INDEX)</div><div class='ctx'> #define PHY_TYPE_BIT_VHT			BIT(PHY_TYPE_VHT_INDEX)</div><div class='ctx'> #define PHY_TYPE_BIT_HE				BIT(PHY_TYPE_HE_INDEX)</div><div class='add'>+#define PHY_TYPE_BIT_BE				BIT(PHY_TYPE_BE_INDEX)</div><div class='ctx'> </div><div class='ctx'> #define MT_WTBL_RATE_TX_MODE			GENMASK(9, 6)</div><div class='ctx'> #define MT_WTBL_RATE_MCS			GENMASK(5, 0)</div><div class='hunk'>@@ -478,36 +1010,226 @@ enum {</div><div class='ctx'> 	DEV_INFO_MAX_NUM</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* event table */</div><div class='add'>+enum {</div><div class='add'>+	MCU_EVENT_TARGET_ADDRESS_LEN = 0x01,</div><div class='add'>+	MCU_EVENT_FW_START = 0x01,</div><div class='add'>+	MCU_EVENT_GENERIC = 0x01,</div><div class='add'>+	MCU_EVENT_ACCESS_REG = 0x02,</div><div class='add'>+	MCU_EVENT_MT_PATCH_SEM = 0x04,</div><div class='add'>+	MCU_EVENT_REG_ACCESS = 0x05,</div><div class='add'>+	MCU_EVENT_LP_INFO = 0x07,</div><div class='add'>+	MCU_EVENT_SCAN_DONE = 0x0d,</div><div class='add'>+	MCU_EVENT_TX_DONE = 0x0f,</div><div class='add'>+	MCU_EVENT_ROC = 0x10,</div><div class='add'>+	MCU_EVENT_BSS_ABSENCE  = 0x11,</div><div class='add'>+	MCU_EVENT_BSS_BEACON_LOSS = 0x13,</div><div class='add'>+	MCU_EVENT_CH_PRIVILEGE = 0x18,</div><div class='add'>+	MCU_EVENT_SCHED_SCAN_DONE = 0x23,</div><div class='add'>+	MCU_EVENT_DBG_MSG = 0x27,</div><div class='add'>+	MCU_EVENT_RSSI_NOTIFY = 0x96,</div><div class='add'>+	MCU_EVENT_TXPWR = 0xd0,</div><div class='add'>+	MCU_EVENT_EXT = 0xed,</div><div class='add'>+	MCU_EVENT_RESTART_DL = 0xef,</div><div class='add'>+	MCU_EVENT_COREDUMP = 0xf0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ext event table */</div><div class='add'>+enum {</div><div class='add'>+	MCU_EXT_EVENT_PS_SYNC = 0x5,</div><div class='add'>+	MCU_EXT_EVENT_FW_LOG_2_HOST = 0x13,</div><div class='add'>+	MCU_EXT_EVENT_THERMAL_PROTECT = 0x22,</div><div class='add'>+	MCU_EXT_EVENT_ASSERT_DUMP = 0x23,</div><div class='add'>+	MCU_EXT_EVENT_RDD_REPORT = 0x3a,</div><div class='add'>+	MCU_EXT_EVENT_CSA_NOTIFY = 0x4f,</div><div class='add'>+	MCU_EXT_EVENT_WA_TX_STAT = 0x74,</div><div class='add'>+	MCU_EXT_EVENT_BCC_NOTIFY = 0x75,</div><div class='add'>+	MCU_EXT_EVENT_WF_RF_PIN_CTRL = 0x9a,</div><div class='add'>+	MCU_EXT_EVENT_MURU_CTRL = 0x9f,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* unified event table */</div><div class='add'>+enum {</div><div class='add'>+	MCU_UNI_EVENT_RESULT = 0x01,</div><div class='add'>+	MCU_UNI_EVENT_HIF_CTRL = 0x03,</div><div class='add'>+	MCU_UNI_EVENT_FW_LOG_2_HOST = 0x04,</div><div class='add'>+	MCU_UNI_EVENT_ACCESS_REG = 0x6,</div><div class='add'>+	MCU_UNI_EVENT_IE_COUNTDOWN = 0x09,</div><div class='add'>+	MCU_UNI_EVENT_COREDUMP = 0x0a,</div><div class='add'>+	MCU_UNI_EVENT_BSS_BEACON_LOSS = 0x0c,</div><div class='add'>+	MCU_UNI_EVENT_SCAN_DONE = 0x0e,</div><div class='add'>+	MCU_UNI_EVENT_RDD_REPORT = 0x11,</div><div class='add'>+	MCU_UNI_EVENT_ROC = 0x27,</div><div class='add'>+	MCU_UNI_EVENT_TX_DONE = 0x2d,</div><div class='add'>+	MCU_UNI_EVENT_THERMAL = 0x35,</div><div class='add'>+	MCU_UNI_EVENT_RSSI_MONITOR = 0x41,</div><div class='add'>+	MCU_UNI_EVENT_NIC_CAPAB = 0x43,</div><div class='add'>+	MCU_UNI_EVENT_WED_RRO = 0x57,</div><div class='add'>+	MCU_UNI_EVENT_PER_STA_INFO = 0x6d,</div><div class='add'>+	MCU_UNI_EVENT_ALL_STA_INFO = 0x6e,</div><div class='add'>+	MCU_UNI_EVENT_SDO = 0x83,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MCU_UNI_CMD_EVENT			BIT(1)</div><div class='add'>+#define MCU_UNI_CMD_UNSOLICITED_EVENT		BIT(2)</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MCU_Q_QUERY,</div><div class='add'>+	MCU_Q_SET,</div><div class='add'>+	MCU_Q_RESERVED,</div><div class='add'>+	MCU_Q_NA</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MCU_S2D_H2N,</div><div class='add'>+	MCU_S2D_C2N,</div><div class='add'>+	MCU_S2D_H2C,</div><div class='add'>+	MCU_S2D_H2CN</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	PATCH_NOT_DL_SEM_FAIL,</div><div class='add'>+	PATCH_IS_DL,</div><div class='add'>+	PATCH_NOT_DL_SEM_SUCCESS,</div><div class='add'>+	PATCH_REL_SEM_SUCCESS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	FW_STATE_INITIAL,</div><div class='add'>+	FW_STATE_FW_DOWNLOAD,</div><div class='add'>+	FW_STATE_NORMAL_OPERATION,</div><div class='add'>+	FW_STATE_NORMAL_TRX,</div><div class='add'>+	FW_STATE_RDY = 7</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CH_SWITCH_NORMAL = 0,</div><div class='add'>+	CH_SWITCH_SCAN = 3,</div><div class='add'>+	CH_SWITCH_MCC = 4,</div><div class='add'>+	CH_SWITCH_DFS = 5,</div><div class='add'>+	CH_SWITCH_BACKGROUND_SCAN_START = 6,</div><div class='add'>+	CH_SWITCH_BACKGROUND_SCAN_RUNNING = 7,</div><div class='add'>+	CH_SWITCH_BACKGROUND_SCAN_STOP = 8,</div><div class='add'>+	CH_SWITCH_SCAN_BYPASS_DPD = 9</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	THERMAL_SENSOR_TEMP_QUERY,</div><div class='add'>+	THERMAL_SENSOR_MANUAL_CTRL,</div><div class='add'>+	THERMAL_SENSOR_INFO_QUERY,</div><div class='add'>+	THERMAL_SENSOR_TASK_CTRL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mcu_cipher_type {</div><div class='add'>+	MCU_CIPHER_NONE = 0,</div><div class='add'>+	MCU_CIPHER_WEP40,</div><div class='add'>+	MCU_CIPHER_WEP104,</div><div class='add'>+	MCU_CIPHER_WEP128,</div><div class='add'>+	MCU_CIPHER_TKIP,</div><div class='add'>+	MCU_CIPHER_AES_CCMP,</div><div class='add'>+	MCU_CIPHER_CCMP_256,</div><div class='add'>+	MCU_CIPHER_GCMP,</div><div class='add'>+	MCU_CIPHER_GCMP_256,</div><div class='add'>+	MCU_CIPHER_WAPI,</div><div class='add'>+	MCU_CIPHER_BIP_CMAC_128,</div><div class='add'>+	MCU_CIPHER_BIP_CMAC_256,</div><div class='add'>+	MCU_CIPHER_BCN_PROT_CMAC_128,</div><div class='add'>+	MCU_CIPHER_BCN_PROT_CMAC_256,</div><div class='add'>+	MCU_CIPHER_BCN_PROT_GMAC_128,</div><div class='add'>+	MCU_CIPHER_BCN_PROT_GMAC_256,</div><div class='add'>+	MCU_CIPHER_BIP_GMAC_128,</div><div class='add'>+	MCU_CIPHER_BIP_GMAC_256,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	EE_MODE_EFUSE,</div><div class='add'>+	EE_MODE_BUFFER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	EE_FORMAT_BIN,</div><div class='add'>+	EE_FORMAT_WHOLE,</div><div class='add'>+	EE_FORMAT_MULTIPLE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MCU_PHY_STATE_TX_RATE,</div><div class='add'>+	MCU_PHY_STATE_RX_RATE,</div><div class='add'>+	MCU_PHY_STATE_RSSI,</div><div class='add'>+	MCU_PHY_STATE_CONTENTION_RX_RATE,</div><div class='add'>+	MCU_PHY_STATE_OFDMLQ_CNINFO,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define MCU_CMD_ACK				BIT(0)</div><div class='ctx'> #define MCU_CMD_UNI				BIT(1)</div><div class='del'>-#define MCU_CMD_QUERY				BIT(2)</div><div class='add'>+#define MCU_CMD_SET				BIT(2)</div><div class='ctx'> </div><div class='ctx'> #define MCU_CMD_UNI_EXT_ACK			(MCU_CMD_ACK | MCU_CMD_UNI | \</div><div class='del'>-						 MCU_CMD_QUERY)</div><div class='del'>-</div><div class='del'>-#define MCU_FW_PREFIX				BIT(31)</div><div class='del'>-#define MCU_UNI_PREFIX				BIT(30)</div><div class='del'>-#define MCU_CE_PREFIX				BIT(29)</div><div class='del'>-#define MCU_QUERY_PREFIX			BIT(28)</div><div class='del'>-#define MCU_CMD_MASK				~(MCU_FW_PREFIX | MCU_UNI_PREFIX |	\</div><div class='del'>-						  MCU_CE_PREFIX | MCU_QUERY_PREFIX)</div><div class='del'>-</div><div class='del'>-#define MCU_QUERY_MASK				BIT(16)</div><div class='add'>+						 MCU_CMD_SET)</div><div class='add'>+#define MCU_CMD_UNI_QUERY_ACK			(MCU_CMD_ACK | MCU_CMD_UNI)</div><div class='add'>+</div><div class='add'>+#define __MCU_CMD_FIELD_ID			GENMASK(7, 0)</div><div class='add'>+#define __MCU_CMD_FIELD_EXT_ID			GENMASK(15, 8)</div><div class='add'>+#define __MCU_CMD_FIELD_QUERY			BIT(16)</div><div class='add'>+#define __MCU_CMD_FIELD_UNI			BIT(17)</div><div class='add'>+#define __MCU_CMD_FIELD_CE			BIT(18)</div><div class='add'>+#define __MCU_CMD_FIELD_WA			BIT(19)</div><div class='add'>+#define __MCU_CMD_FIELD_WM			BIT(20)</div><div class='add'>+</div><div class='add'>+#define MCU_CMD(_t)				FIELD_PREP(__MCU_CMD_FIELD_ID,		\</div><div class='add'>+							   MCU_CMD_##_t)</div><div class='add'>+#define MCU_EXT_CMD(_t)				(MCU_CMD(EXT_CID) | \</div><div class='add'>+						 FIELD_PREP(__MCU_CMD_FIELD_EXT_ID,	\</div><div class='add'>+							    MCU_EXT_CMD_##_t))</div><div class='add'>+#define MCU_EXT_QUERY(_t)			(MCU_EXT_CMD(_t) | __MCU_CMD_FIELD_QUERY)</div><div class='add'>+#define MCU_UNI_CMD(_t)				(__MCU_CMD_FIELD_UNI |			\</div><div class='add'>+						 FIELD_PREP(__MCU_CMD_FIELD_ID,		\</div><div class='add'>+							    MCU_UNI_CMD_##_t))</div><div class='add'>+</div><div class='add'>+#define MCU_UNI_QUERY(_t)			(__MCU_CMD_FIELD_UNI | __MCU_CMD_FIELD_QUERY | \</div><div class='add'>+						 FIELD_PREP(__MCU_CMD_FIELD_ID,		\</div><div class='add'>+							    MCU_UNI_CMD_##_t))</div><div class='add'>+</div><div class='add'>+#define MCU_CE_CMD(_t)				(__MCU_CMD_FIELD_CE |			\</div><div class='add'>+						 FIELD_PREP(__MCU_CMD_FIELD_ID,		\</div><div class='add'>+							   MCU_CE_CMD_##_t))</div><div class='add'>+#define MCU_CE_QUERY(_t)			(MCU_CE_CMD(_t) | __MCU_CMD_FIELD_QUERY)</div><div class='add'>+</div><div class='add'>+#define MCU_WA_CMD(_t)				(MCU_CMD(_t) | __MCU_CMD_FIELD_WA)</div><div class='add'>+#define MCU_WA_EXT_CMD(_t)			(MCU_EXT_CMD(_t) | __MCU_CMD_FIELD_WA)</div><div class='add'>+#define MCU_WA_PARAM_CMD(_t)			(MCU_WA_CMD(WA_PARAM) | \</div><div class='add'>+						 FIELD_PREP(__MCU_CMD_FIELD_EXT_ID, \</div><div class='add'>+							    MCU_WA_PARAM_CMD_##_t))</div><div class='add'>+</div><div class='add'>+#define MCU_WM_UNI_CMD(_t)			(MCU_UNI_CMD(_t) |		\</div><div class='add'>+						 __MCU_CMD_FIELD_WM)</div><div class='add'>+#define MCU_WM_UNI_CMD_QUERY(_t)		(MCU_UNI_CMD(_t) |		\</div><div class='add'>+						 __MCU_CMD_FIELD_QUERY |	\</div><div class='add'>+						 __MCU_CMD_FIELD_WM)</div><div class='add'>+#define MCU_WA_UNI_CMD(_t)			(MCU_UNI_CMD(_t) |		\</div><div class='add'>+						 __MCU_CMD_FIELD_WA)</div><div class='add'>+#define MCU_WMWA_UNI_CMD(_t)			(MCU_WM_UNI_CMD(_t) |		\</div><div class='add'>+						 __MCU_CMD_FIELD_WA)</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	MCU_EXT_CMD_EFUSE_ACCESS = 0x01,</div><div class='ctx'> 	MCU_EXT_CMD_RF_REG_ACCESS = 0x02,</div><div class='add'>+	MCU_EXT_CMD_RF_TEST = 0x04,</div><div class='add'>+	MCU_EXT_CMD_ID_RADIO_ON_OFF_CTRL = 0x05,</div><div class='ctx'> 	MCU_EXT_CMD_PM_STATE_CTRL = 0x07,</div><div class='ctx'> 	MCU_EXT_CMD_CHANNEL_SWITCH = 0x08,</div><div class='ctx'> 	MCU_EXT_CMD_SET_TX_POWER_CTRL = 0x11,</div><div class='ctx'> 	MCU_EXT_CMD_FW_LOG_2_HOST = 0x13,</div><div class='add'>+	MCU_EXT_CMD_TXBF_ACTION = 0x1e,</div><div class='ctx'> 	MCU_EXT_CMD_EFUSE_BUFFER_MODE = 0x21,</div><div class='add'>+	MCU_EXT_CMD_THERMAL_PROT = 0x23,</div><div class='ctx'> 	MCU_EXT_CMD_STA_REC_UPDATE = 0x25,</div><div class='ctx'> 	MCU_EXT_CMD_BSS_INFO_UPDATE = 0x26,</div><div class='ctx'> 	MCU_EXT_CMD_EDCA_UPDATE = 0x27,</div><div class='ctx'> 	MCU_EXT_CMD_DEV_INFO_UPDATE = 0x2A,</div><div class='del'>-	MCU_EXT_CMD_GET_TEMP = 0x2c,</div><div class='add'>+	MCU_EXT_CMD_THERMAL_CTRL = 0x2c,</div><div class='ctx'> 	MCU_EXT_CMD_WTBL_UPDATE = 0x32,</div><div class='add'>+	MCU_EXT_CMD_SET_DRR_CTRL = 0x36,</div><div class='ctx'> 	MCU_EXT_CMD_SET_RDD_CTRL = 0x3a,</div><div class='ctx'> 	MCU_EXT_CMD_ATE_CTRL = 0x3d,</div><div class='ctx'> 	MCU_EXT_CMD_PROTECT_CTRL = 0x3e,</div><div class='hunk'>@@ -516,55 +1238,120 @@ enum {</div><div class='ctx'> 	MCU_EXT_CMD_RX_HDR_TRANS = 0x47,</div><div class='ctx'> 	MCU_EXT_CMD_MUAR_UPDATE = 0x48,</div><div class='ctx'> 	MCU_EXT_CMD_BCN_OFFLOAD = 0x49,</div><div class='add'>+	MCU_EXT_CMD_RX_AIRTIME_CTRL = 0x4a,</div><div class='ctx'> 	MCU_EXT_CMD_SET_RX_PATH = 0x4e,</div><div class='add'>+	MCU_EXT_CMD_EFUSE_FREE_BLOCK = 0x4f,</div><div class='ctx'> 	MCU_EXT_CMD_TX_POWER_FEATURE_CTRL = 0x58,</div><div class='ctx'> 	MCU_EXT_CMD_RXDCOC_CAL = 0x59,</div><div class='add'>+	MCU_EXT_CMD_GET_MIB_INFO = 0x5a,</div><div class='ctx'> 	MCU_EXT_CMD_TXDPD_CAL = 0x60,</div><div class='del'>-	MCU_EXT_CMD_SET_RDD_TH = 0x7c,</div><div class='add'>+	MCU_EXT_CMD_CAL_CACHE = 0x67,</div><div class='add'>+	MCU_EXT_CMD_RED_ENABLE = 0x68,</div><div class='add'>+	MCU_EXT_CMD_CP_SUPPORT = 0x75,</div><div class='add'>+	MCU_EXT_CMD_SET_RADAR_TH = 0x7c,</div><div class='ctx'> 	MCU_EXT_CMD_SET_RDD_PATTERN = 0x7d,</div><div class='add'>+	MCU_EXT_CMD_MWDS_SUPPORT = 0x80,</div><div class='add'>+	MCU_EXT_CMD_SET_SER_TRIGGER = 0x81,</div><div class='add'>+	MCU_EXT_CMD_TWT_AGRT_UPDATE = 0x94,</div><div class='add'>+	MCU_EXT_CMD_FW_DBG_CTRL = 0x95,</div><div class='add'>+	MCU_EXT_CMD_OFFCH_SCAN_CTRL = 0x9a,</div><div class='add'>+	MCU_EXT_CMD_SET_RDD_TH = 0x9d,</div><div class='add'>+	MCU_EXT_CMD_MURU_CTRL = 0x9f,</div><div class='add'>+	MCU_EXT_CMD_SET_SPR = 0xa8,</div><div class='add'>+	MCU_EXT_CMD_GROUP_PRE_CAL_INFO = 0xab,</div><div class='add'>+	MCU_EXT_CMD_DPD_PRE_CAL_INFO = 0xac,</div><div class='add'>+	MCU_EXT_CMD_PHY_STAT_INFO = 0xad,</div><div class='add'>+	MCU_EXT_CMD_WF_RF_PIN_CTRL = 0xbd,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	MCU_UNI_CMD_DEV_INFO_UPDATE = MCU_UNI_PREFIX | 0x01,</div><div class='del'>-	MCU_UNI_CMD_BSS_INFO_UPDATE = MCU_UNI_PREFIX | 0x02,</div><div class='del'>-	MCU_UNI_CMD_STA_REC_UPDATE = MCU_UNI_PREFIX | 0x03,</div><div class='del'>-	MCU_UNI_CMD_SUSPEND = MCU_UNI_PREFIX | 0x05,</div><div class='del'>-	MCU_UNI_CMD_OFFLOAD = MCU_UNI_PREFIX | 0x06,</div><div class='del'>-	MCU_UNI_CMD_HIF_CTRL = MCU_UNI_PREFIX | 0x07,</div><div class='add'>+	MCU_UNI_CMD_DEV_INFO_UPDATE = 0x01,</div><div class='add'>+	MCU_UNI_CMD_BSS_INFO_UPDATE = 0x02,</div><div class='add'>+	MCU_UNI_CMD_STA_REC_UPDATE = 0x03,</div><div class='add'>+	MCU_UNI_CMD_EDCA_UPDATE = 0x04,</div><div class='add'>+	MCU_UNI_CMD_SUSPEND = 0x05,</div><div class='add'>+	MCU_UNI_CMD_OFFLOAD = 0x06,</div><div class='add'>+	MCU_UNI_CMD_HIF_CTRL = 0x07,</div><div class='add'>+	MCU_UNI_CMD_BAND_CONFIG = 0x08,</div><div class='add'>+	MCU_UNI_CMD_REPT_MUAR = 0x09,</div><div class='add'>+	MCU_UNI_CMD_WSYS_CONFIG = 0x0b,</div><div class='add'>+	MCU_UNI_CMD_REG_ACCESS = 0x0d,</div><div class='add'>+	MCU_UNI_CMD_CHIP_CONFIG = 0x0e,</div><div class='add'>+	MCU_UNI_CMD_POWER_CTRL = 0x0f,</div><div class='add'>+	MCU_UNI_CMD_RX_HDR_TRANS = 0x12,</div><div class='add'>+	MCU_UNI_CMD_SER = 0x13,</div><div class='add'>+	MCU_UNI_CMD_TWT = 0x14,</div><div class='add'>+	MCU_UNI_CMD_SET_DOMAIN_INFO = 0x15,</div><div class='add'>+	MCU_UNI_CMD_SCAN_REQ = 0x16,</div><div class='add'>+	MCU_UNI_CMD_RDD_CTRL = 0x19,</div><div class='add'>+	MCU_UNI_CMD_GET_MIB_INFO = 0x22,</div><div class='add'>+	MCU_UNI_CMD_GET_STAT_INFO = 0x23,</div><div class='add'>+	MCU_UNI_CMD_SNIFFER = 0x24,</div><div class='add'>+	MCU_UNI_CMD_SR = 0x25,</div><div class='add'>+	MCU_UNI_CMD_ROC = 0x27,</div><div class='add'>+	MCU_UNI_CMD_SET_DBDC_PARMS = 0x28,</div><div class='add'>+	MCU_UNI_CMD_TXPOWER = 0x2b,</div><div class='add'>+	MCU_UNI_CMD_SET_POWER_LIMIT = 0x2c,</div><div class='add'>+	MCU_UNI_CMD_EFUSE_CTRL = 0x2d,</div><div class='add'>+	MCU_UNI_CMD_RA = 0x2f,</div><div class='add'>+	MCU_UNI_CMD_MURU = 0x31,</div><div class='add'>+	MCU_UNI_CMD_TESTMODE_RX_STAT = 0x32,</div><div class='add'>+	MCU_UNI_CMD_BF = 0x33,</div><div class='add'>+	MCU_UNI_CMD_CHANNEL_SWITCH = 0x34,</div><div class='add'>+	MCU_UNI_CMD_THERMAL = 0x35,</div><div class='add'>+	MCU_UNI_CMD_VOW = 0x37,</div><div class='add'>+	MCU_UNI_CMD_FIXED_RATE_TABLE = 0x40,</div><div class='add'>+	MCU_UNI_CMD_RSSI_MONITOR = 0x41,</div><div class='add'>+	MCU_UNI_CMD_TESTMODE_CTRL = 0x46,</div><div class='add'>+	MCU_UNI_CMD_RRO = 0x57,</div><div class='add'>+	MCU_UNI_CMD_OFFCH_SCAN_CTRL = 0x58,</div><div class='add'>+	MCU_UNI_CMD_PER_STA_INFO = 0x6d,</div><div class='add'>+	MCU_UNI_CMD_ALL_STA_INFO = 0x6e,</div><div class='add'>+	MCU_UNI_CMD_ASSERT_DUMP = 0x6f,</div><div class='add'>+	MCU_UNI_CMD_RADIO_STATUS = 0x80,</div><div class='add'>+	MCU_UNI_CMD_SDO = 0x88,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	MCU_CMD_TARGET_ADDRESS_LEN_REQ = MCU_FW_PREFIX | 0x01,</div><div class='del'>-	MCU_CMD_FW_START_REQ = MCU_FW_PREFIX | 0x02,</div><div class='add'>+	MCU_CMD_TARGET_ADDRESS_LEN_REQ = 0x01,</div><div class='add'>+	MCU_CMD_FW_START_REQ = 0x02,</div><div class='ctx'> 	MCU_CMD_INIT_ACCESS_REG = 0x3,</div><div class='del'>-	MCU_CMD_NIC_POWER_CTRL = MCU_FW_PREFIX | 0x4,</div><div class='del'>-	MCU_CMD_PATCH_START_REQ = MCU_FW_PREFIX | 0x05,</div><div class='del'>-	MCU_CMD_PATCH_FINISH_REQ = MCU_FW_PREFIX | 0x07,</div><div class='del'>-	MCU_CMD_PATCH_SEM_CONTROL = MCU_FW_PREFIX | 0x10,</div><div class='add'>+	MCU_CMD_NIC_POWER_CTRL = 0x4,</div><div class='add'>+	MCU_CMD_PATCH_START_REQ = 0x05,</div><div class='add'>+	MCU_CMD_PATCH_FINISH_REQ = 0x07,</div><div class='add'>+	MCU_CMD_PATCH_SEM_CONTROL = 0x10,</div><div class='add'>+	MCU_CMD_WA_PARAM = 0xc4,</div><div class='ctx'> 	MCU_CMD_EXT_CID = 0xed,</div><div class='del'>-	MCU_CMD_FW_SCATTER = MCU_FW_PREFIX | 0xee,</div><div class='del'>-	MCU_CMD_RESTART_DL_REQ = MCU_FW_PREFIX | 0xef,</div><div class='add'>+	MCU_CMD_FW_SCATTER = 0xee,</div><div class='add'>+	MCU_CMD_RESTART_DL_REQ = 0xef,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* offload mcu commands */</div><div class='ctx'> enum {</div><div class='del'>-	MCU_CMD_START_HW_SCAN = MCU_CE_PREFIX | 0x03,</div><div class='del'>-	MCU_CMD_SET_PS_PROFILE = MCU_CE_PREFIX | 0x05,</div><div class='del'>-	MCU_CMD_SET_CHAN_DOMAIN = MCU_CE_PREFIX | 0x0f,</div><div class='del'>-	MCU_CMD_SET_BSS_CONNECTED = MCU_CE_PREFIX | 0x16,</div><div class='del'>-	MCU_CMD_SET_BSS_ABORT = MCU_CE_PREFIX | 0x17,</div><div class='del'>-	MCU_CMD_CANCEL_HW_SCAN = MCU_CE_PREFIX | 0x1b,</div><div class='del'>-	MCU_CMD_SET_ROC = MCU_CE_PREFIX | 0x1d,</div><div class='del'>-	MCU_CMD_SET_P2P_OPPPS = MCU_CE_PREFIX | 0x33,</div><div class='del'>-	MCU_CMD_SET_RATE_TX_POWER = MCU_CE_PREFIX | 0x5d,</div><div class='del'>-	MCU_CMD_SCHED_SCAN_ENABLE = MCU_CE_PREFIX | 0x61,</div><div class='del'>-	MCU_CMD_SCHED_SCAN_REQ = MCU_CE_PREFIX | 0x62,</div><div class='del'>-	MCU_CMD_REG_WRITE = MCU_CE_PREFIX | 0xc0,</div><div class='del'>-	MCU_CMD_REG_READ = MCU_CE_PREFIX | MCU_QUERY_MASK | 0xc0,</div><div class='del'>-	MCU_CMD_CHIP_CONFIG = MCU_CE_PREFIX | 0xca,</div><div class='del'>-	MCU_CMD_FWLOG_2_HOST = MCU_CE_PREFIX | 0xc5,</div><div class='del'>-	MCU_CMD_GET_WTBL = MCU_CE_PREFIX | 0xcd,</div><div class='del'>-	MCU_CMD_GET_TXPWR = MCU_CE_PREFIX | 0xd0,</div><div class='add'>+	MCU_CE_CMD_TEST_CTRL = 0x01,</div><div class='add'>+	MCU_CE_CMD_START_HW_SCAN = 0x03,</div><div class='add'>+	MCU_CE_CMD_SET_PS_PROFILE = 0x05,</div><div class='add'>+	MCU_CE_CMD_SET_RX_FILTER = 0x0a,</div><div class='add'>+	MCU_CE_CMD_SET_CHAN_DOMAIN = 0x0f,</div><div class='add'>+	MCU_CE_CMD_SET_BSS_CONNECTED = 0x16,</div><div class='add'>+	MCU_CE_CMD_SET_BSS_ABORT = 0x17,</div><div class='add'>+	MCU_CE_CMD_CANCEL_HW_SCAN = 0x1b,</div><div class='add'>+	MCU_CE_CMD_SET_ROC = 0x1c,</div><div class='add'>+	MCU_CE_CMD_SET_EDCA_PARMS = 0x1d,</div><div class='add'>+	MCU_CE_CMD_SET_P2P_OPPPS = 0x33,</div><div class='add'>+	MCU_CE_CMD_SET_CLC = 0x5c,</div><div class='add'>+	MCU_CE_CMD_SET_RATE_TX_POWER = 0x5d,</div><div class='add'>+	MCU_CE_CMD_SCHED_SCAN_ENABLE = 0x61,</div><div class='add'>+	MCU_CE_CMD_SCHED_SCAN_REQ = 0x62,</div><div class='add'>+	MCU_CE_CMD_GET_NIC_CAPAB = 0x8a,</div><div class='add'>+	MCU_CE_CMD_RSSI_MONITOR = 0xa1,</div><div class='add'>+	MCU_CE_CMD_SET_MU_EDCA_PARMS = 0xb0,</div><div class='add'>+	MCU_CE_CMD_REG_WRITE = 0xc0,</div><div class='add'>+	MCU_CE_CMD_REG_READ = 0xc0,</div><div class='add'>+	MCU_CE_CMD_CHIP_CONFIG = 0xca,</div><div class='add'>+	MCU_CE_CMD_FWLOG_2_HOST = 0xc5,</div><div class='add'>+	MCU_CE_CMD_GET_WTBL = 0xcd,</div><div class='add'>+	MCU_CE_CMD_GET_TXPWR = 0xd0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -574,13 +1361,28 @@ enum {</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	UNI_BSS_INFO_BASIC = 0,</div><div class='add'>+	UNI_BSS_INFO_RA = 1,</div><div class='ctx'> 	UNI_BSS_INFO_RLM = 2,</div><div class='add'>+	UNI_BSS_INFO_BSS_COLOR = 4,</div><div class='ctx'> 	UNI_BSS_INFO_HE_BASIC = 5,</div><div class='add'>+	UNI_BSS_INFO_11V_MBSSID = 6,</div><div class='ctx'> 	UNI_BSS_INFO_BCN_CONTENT = 7,</div><div class='add'>+	UNI_BSS_INFO_BCN_CSA = 8,</div><div class='add'>+	UNI_BSS_INFO_BCN_BCC = 9,</div><div class='add'>+	UNI_BSS_INFO_BCN_MBSSID = 10,</div><div class='add'>+	UNI_BSS_INFO_RATE = 11,</div><div class='ctx'> 	UNI_BSS_INFO_QBSS = 15,</div><div class='add'>+	UNI_BSS_INFO_SEC = 16,</div><div class='add'>+	UNI_BSS_INFO_BCN_PROT = 17,</div><div class='add'>+	UNI_BSS_INFO_TXCMD = 18,</div><div class='ctx'> 	UNI_BSS_INFO_UAPSD = 19,</div><div class='ctx'> 	UNI_BSS_INFO_PS = 21,</div><div class='ctx'> 	UNI_BSS_INFO_BCNFT = 22,</div><div class='add'>+	UNI_BSS_INFO_IFS_TIME = 23,</div><div class='add'>+	UNI_BSS_INFO_OFFLOAD = 25,</div><div class='add'>+	UNI_BSS_INFO_MLD = 26,</div><div class='add'>+	UNI_BSS_INFO_PM_DISABLE = 27,</div><div class='add'>+	UNI_BSS_INFO_EHT = 30,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -590,6 +1392,49 @@ enum {</div><div class='ctx'> 	UNI_OFFLOAD_OFFLOAD_BMC_RPY_DETECT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum UNI_ALL_STA_INFO_TAG {</div><div class='add'>+	UNI_ALL_STA_TXRX_RATE,</div><div class='add'>+	UNI_ALL_STA_TX_STAT,</div><div class='add'>+	UNI_ALL_STA_TXRX_ADM_STAT,</div><div class='add'>+	UNI_ALL_STA_TXRX_AIR_TIME,</div><div class='add'>+	UNI_ALL_STA_DATA_TX_RETRY_COUNT,</div><div class='add'>+	UNI_ALL_STA_GI_MODE,</div><div class='add'>+	UNI_ALL_STA_TXRX_MSDU_COUNT,</div><div class='add'>+	UNI_ALL_STA_MAX_NUM</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MT_NIC_CAP_TX_RESOURCE,</div><div class='add'>+	MT_NIC_CAP_TX_EFUSE_ADDR,</div><div class='add'>+	MT_NIC_CAP_COEX,</div><div class='add'>+	MT_NIC_CAP_SINGLE_SKU,</div><div class='add'>+	MT_NIC_CAP_CSUM_OFFLOAD,</div><div class='add'>+	MT_NIC_CAP_HW_VER,</div><div class='add'>+	MT_NIC_CAP_SW_VER,</div><div class='add'>+	MT_NIC_CAP_MAC_ADDR,</div><div class='add'>+	MT_NIC_CAP_PHY,</div><div class='add'>+	MT_NIC_CAP_MAC,</div><div class='add'>+	MT_NIC_CAP_FRAME_BUF,</div><div class='add'>+	MT_NIC_CAP_BEAM_FORM,</div><div class='add'>+	MT_NIC_CAP_LOCATION,</div><div class='add'>+	MT_NIC_CAP_MUMIMO,</div><div class='add'>+	MT_NIC_CAP_BUFFER_MODE_INFO,</div><div class='add'>+	MT_NIC_CAP_HW_ADIE_VERSION = 0x14,</div><div class='add'>+	MT_NIC_CAP_ANTSWP = 0x16,</div><div class='add'>+	MT_NIC_CAP_WFDMA_REALLOC,</div><div class='add'>+	MT_NIC_CAP_6G,</div><div class='add'>+	MT_NIC_CAP_CHIP_CAP = 0x20,</div><div class='add'>+	MT_NIC_CAP_EML_CAP = 0x22,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define UNI_WOW_DETECT_TYPE_MAGIC		BIT(0)</div><div class='add'>+#define UNI_WOW_DETECT_TYPE_ANY			BIT(1)</div><div class='add'>+#define UNI_WOW_DETECT_TYPE_DISCONNECT		BIT(2)</div><div class='add'>+#define UNI_WOW_DETECT_TYPE_GTK_REKEY_FAIL	BIT(3)</div><div class='add'>+#define UNI_WOW_DETECT_TYPE_BCN_LOST		BIT(4)</div><div class='add'>+#define UNI_WOW_DETECT_TYPE_SCH_SCAN_HIT	BIT(5)</div><div class='add'>+#define UNI_WOW_DETECT_TYPE_BITMAP		BIT(6)</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	UNI_SUSPEND_MODE_SETTING,</div><div class='ctx'> 	UNI_SUSPEND_WOW_CTRL,</div><div class='hunk'>@@ -624,10 +1469,14 @@ struct mt76_connac_bss_basic_tlv {</div><div class='ctx'> 		     * bit(3): GN</div><div class='ctx'> 		     * bit(4): AN</div><div class='ctx'> 		     * bit(5): AC</div><div class='add'>+		     * bit(6): AX2</div><div class='add'>+		     * bit(7): AX5</div><div class='add'>+		     * bit(8): AX6</div><div class='ctx'> 		     */</div><div class='ctx'> 	__le16 sta_idx;</div><div class='del'>-	u8 nonht_basic_phy;</div><div class='del'>-	u8 pad[3];</div><div class='add'>+	__le16 nonht_basic_phy;</div><div class='add'>+	u8 phymode_ext; /* bit(0) AX_6G */</div><div class='add'>+	u8 link_idx;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct mt76_connac_bss_qos_tlv {</div><div class='hunk'>@@ -643,6 +1492,10 @@ struct mt76_connac_beacon_loss_event {</div><div class='ctx'> 	u8 pad[2];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct mt76_connac_rssi_notify_event {</div><div class='add'>+	__le32 rssi[4];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct mt76_connac_mcu_bss_event {</div><div class='ctx'> 	u8 bss_idx;</div><div class='ctx'> 	u8 is_absent;</div><div class='hunk'>@@ -762,7 +1615,7 @@ struct mt76_connac_sched_scan_req {</div><div class='ctx'> 	u8 intervals_num;</div><div class='ctx'> 	u8 scan_func; /* MT7663: BIT(0) eable random mac address */</div><div class='ctx'> 	struct mt76_connac_mcu_scan_channel channels[64];</div><div class='del'>-	__le16 intervals[MT76_CONNAC_MAX_SCHED_SCAN_INTERVAL];</div><div class='add'>+	__le16 intervals[MT76_CONNAC_MAX_NUM_SCHED_SCAN_INTERVAL];</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u8 random_mac[ETH_ALEN];</div><div class='hunk'>@@ -770,7 +1623,11 @@ struct mt76_connac_sched_scan_req {</div><div class='ctx'> 		} mt7663;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u8 bss_idx;</div><div class='del'>-			u8 pad2[63];</div><div class='add'>+			u8 pad1[3];</div><div class='add'>+			__le32 delay;</div><div class='add'>+			u8 pad2[12];</div><div class='add'>+			u8 random_mac[ETH_ALEN];</div><div class='add'>+			u8 pad3[38];</div><div class='ctx'> 		} mt7921;</div><div class='ctx'> 	};</div><div class='ctx'> } __packed;</div><div class='hunk'>@@ -781,6 +1638,14 @@ struct mt76_connac_sched_scan_done {</div><div class='ctx'> 	__le16 pad;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct bss_info_uni_bss_color {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 enable;</div><div class='add'>+	u8 bss_color;</div><div class='add'>+	u8 rsv[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct bss_info_uni_he {</div><div class='ctx'> 	__le16 tag;</div><div class='ctx'> 	__le16 len;</div><div class='hunk'>@@ -791,6 +1656,15 @@ struct bss_info_uni_he {</div><div class='ctx'> 	u8 rsv[2];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct bss_info_uni_mbssid {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 max_indicator;</div><div class='add'>+	u8 mbss_idx;</div><div class='add'>+	u8 tx_bss_omac_idx;</div><div class='add'>+	u8 rsv;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct mt76_connac_gtk_rekey_tlv {</div><div class='ctx'> 	__le16 tag;</div><div class='ctx'> 	__le16 len;</div><div class='hunk'>@@ -802,14 +1676,14 @@ struct mt76_connac_gtk_rekey_tlv {</div><div class='ctx'> 			* 2: rekey update</div><div class='ctx'> 			*/</div><div class='ctx'> 	u8 keyid;</div><div class='del'>-	u8 pad[2];</div><div class='add'>+	u8 option; /* 1: rekey data update without enabling offload */</div><div class='add'>+	u8 pad[1];</div><div class='ctx'> 	__le32 proto; /* WPA-RSN-WAPI-OPSN */</div><div class='ctx'> 	__le32 pairwise_cipher;</div><div class='ctx'> 	__le32 group_cipher;</div><div class='ctx'> 	__le32 key_mgmt; /* NONE-PSK-IEEE802.1X */</div><div class='ctx'> 	__le32 mgmt_group_cipher;</div><div class='del'>-	u8 option; /* 1: rekey data update without enabling offload */</div><div class='del'>-	u8 reserverd[3];</div><div class='add'>+	u8 reserverd[4];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define MT76_CONNAC_WOW_MASK_MAX_LEN			16</div><div class='hunk'>@@ -885,15 +1759,28 @@ struct mt76_connac_suspend_tlv {</div><div class='ctx'> 	u8 pad[5];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+enum mt76_sta_info_state {</div><div class='add'>+	MT76_STA_INFO_STATE_NONE,</div><div class='add'>+	MT76_STA_INFO_STATE_AUTH,</div><div class='add'>+	MT76_STA_INFO_STATE_ASSOC</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mt76_sta_cmd_info {</div><div class='del'>-	struct ieee80211_sta *sta;</div><div class='add'>+	union {</div><div class='add'>+		struct ieee80211_sta *sta;</div><div class='add'>+		struct ieee80211_link_sta *link_sta;</div><div class='add'>+	};</div><div class='ctx'> 	struct mt76_wcid *wcid;</div><div class='ctx'> </div><div class='ctx'> 	struct ieee80211_vif *vif;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='ctx'> </div><div class='add'>+	bool offload_fw;</div><div class='ctx'> 	bool enable;</div><div class='add'>+	bool newly;</div><div class='ctx'> 	int cmd;</div><div class='ctx'> 	u8 rcpi;</div><div class='add'>+	u8 state;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define MT_SKU_POWER_LIMIT	161</div><div class='hunk'>@@ -910,7 +1797,7 @@ struct mt76_connac_tx_power_limit_tlv {</div><div class='ctx'> 	__le16 len;</div><div class='ctx'> 	/* DW1 - cmd hint */</div><div class='ctx'> 	u8 n_chan; /* # channel */</div><div class='del'>-	u8 band; /* 2.4GHz - 5GHz */</div><div class='add'>+	u8 band; /* 2.4GHz - 5GHz - 6GHz */</div><div class='ctx'> 	u8 last_msg;</div><div class='ctx'> 	u8 pad1;</div><div class='ctx'> 	/* DW3 */</div><div class='hunk'>@@ -927,8 +1814,70 @@ struct mt76_connac_config {</div><div class='ctx'> 	u8 data[320];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct mt76_connac_mcu_uni_event {</div><div class='add'>+	u8 cid;</div><div class='add'>+	u8 pad[3];</div><div class='add'>+	__le32 status; /* 0: success, others: fail */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt76_connac_mcu_reg_event {</div><div class='add'>+	__le32 reg;</div><div class='add'>+	__le32 val;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+static inline enum mcu_cipher_type</div><div class='add'>+mt76_connac_mcu_get_cipher(int cipher)</div><div class='add'>+{</div><div class='add'>+	switch (cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP40:</div><div class='add'>+		return MCU_CIPHER_WEP40;</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP104:</div><div class='add'>+		return MCU_CIPHER_WEP104;</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		return MCU_CIPHER_TKIP;</div><div class='add'>+	case WLAN_CIPHER_SUITE_AES_CMAC:</div><div class='add'>+		return MCU_CIPHER_BIP_CMAC_128;</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+		return MCU_CIPHER_AES_CCMP;</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP_256:</div><div class='add'>+		return MCU_CIPHER_CCMP_256;</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP:</div><div class='add'>+		return MCU_CIPHER_GCMP;</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='add'>+		return MCU_CIPHER_GCMP_256;</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_GMAC_128:</div><div class='add'>+		return MCU_CIPHER_BIP_GMAC_128;</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_GMAC_256:</div><div class='add'>+		return MCU_CIPHER_BIP_GMAC_256;</div><div class='add'>+	case WLAN_CIPHER_SUITE_BIP_CMAC_256:</div><div class='add'>+		return MCU_CIPHER_BIP_CMAC_256;</div><div class='add'>+	case WLAN_CIPHER_SUITE_SMS4:</div><div class='add'>+		return MCU_CIPHER_WAPI;</div><div class='add'>+	default:</div><div class='add'>+		return MCU_CIPHER_NONE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+mt76_connac_mcu_gen_dl_mode(struct mt76_dev *dev, u8 feature_set, bool is_wa)</div><div class='add'>+{</div><div class='add'>+	u32 ret = 0;</div><div class='add'>+</div><div class='add'>+	ret |= feature_set &amp; FW_FEATURE_SET_ENCRYPT ?</div><div class='add'>+	       DL_MODE_ENCRYPT | DL_MODE_RESET_SEC_IV : 0;</div><div class='add'>+	if (is_mt7921(dev) || is_mt7925(dev))</div><div class='add'>+		ret |= feature_set &amp; FW_FEATURE_ENCRY_MODE ?</div><div class='add'>+		       DL_CONFIG_ENCRY_MODE_SEL : 0;</div><div class='add'>+	ret |= FIELD_PREP(DL_MODE_KEY_IDX,</div><div class='add'>+			  FIELD_GET(FW_FEATURE_SET_KEY_IDX, feature_set));</div><div class='add'>+	ret |= DL_MODE_NEED_RSP;</div><div class='add'>+	ret |= is_wa ? DL_MODE_WORKING_PDA_CR4 : 0;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define to_wcid_lo(id)		FIELD_GET(GENMASK(7, 0), (u16)id)</div><div class='del'>-#define to_wcid_hi(id)		FIELD_GET(GENMASK(9, 8), (u16)id)</div><div class='add'>+#define to_wcid_hi(id)		FIELD_GET(GENMASK(10, 8), (u16)id)</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='ctx'> mt76_connac_mcu_get_wlan_idx(struct mt76_dev *dev, struct mt76_wcid *wcid,</div><div class='hunk'>@@ -936,7 +1885,7 @@ mt76_connac_mcu_get_wlan_idx(struct mt76_dev *dev, struct mt76_wcid *wcid,</div><div class='ctx'> {</div><div class='ctx'> 	*wlan_idx_hi = 0;</div><div class='ctx'> </div><div class='del'>-	if (is_mt7921(dev)) {</div><div class='add'>+	if (!is_connac_v1(dev)) {</div><div class='ctx'> 		*wlan_idx_lo = wcid ? to_wcid_lo(wcid-&gt;idx) : 0;</div><div class='ctx'> 		*wlan_idx_hi = wcid ? to_wcid_hi(wcid-&gt;idx) : 0;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -945,8 +1894,16 @@ mt76_connac_mcu_get_wlan_idx(struct mt76_dev *dev, struct mt76_wcid *wcid,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct sk_buff *</div><div class='del'>-mt76_connac_mcu_alloc_sta_req(struct mt76_dev *dev, struct mt76_vif *mvif,</div><div class='del'>-			      struct mt76_wcid *wcid);</div><div class='add'>+__mt76_connac_mcu_alloc_sta_req(struct mt76_dev *dev, struct mt76_vif_link *mvif,</div><div class='add'>+				struct mt76_wcid *wcid, int len);</div><div class='add'>+static inline struct sk_buff *</div><div class='add'>+mt76_connac_mcu_alloc_sta_req(struct mt76_dev *dev, struct mt76_vif_link *mvif,</div><div class='add'>+			      struct mt76_wcid *wcid)</div><div class='add'>+{</div><div class='add'>+	return __mt76_connac_mcu_alloc_sta_req(dev, mvif, wcid,</div><div class='add'>+					       MT76_CONNAC_STA_UPDATE_MAX_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct wtbl_req_hdr *</div><div class='ctx'> mt76_connac_mcu_alloc_wtbl_req(struct mt76_dev *dev, struct mt76_wcid *wcid,</div><div class='ctx'> 			       int cmd, void *sta_wtbl, struct sk_buff **skb);</div><div class='hunk'>@@ -961,23 +1918,35 @@ mt76_connac_mcu_add_tlv(struct sk_buff *skb, int tag, int len)</div><div class='ctx'> </div><div class='ctx'> int mt76_connac_mcu_set_channel_domain(struct mt76_phy *phy);</div><div class='ctx'> int mt76_connac_mcu_set_vif_ps(struct mt76_dev *dev, struct ieee80211_vif *vif);</div><div class='del'>-void mt76_connac_mcu_sta_basic_tlv(struct sk_buff *skb,</div><div class='del'>-				   struct ieee80211_vif *vif,</div><div class='del'>-				   struct ieee80211_sta *sta, bool enable);</div><div class='add'>+void mt76_connac_mcu_sta_basic_tlv(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='add'>+				   struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				   struct ieee80211_link_sta *link_sta,</div><div class='add'>+				   int state, bool newly);</div><div class='ctx'> void mt76_connac_mcu_wtbl_generic_tlv(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 				      struct ieee80211_vif *vif,</div><div class='ctx'> 				      struct ieee80211_sta *sta, void *sta_wtbl,</div><div class='ctx'> 				      void *wtbl_tlv);</div><div class='ctx'> void mt76_connac_mcu_wtbl_hdr_trans_tlv(struct sk_buff *skb,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='ctx'> 					struct mt76_wcid *wcid,</div><div class='ctx'> 					void *sta_wtbl, void *wtbl_tlv);</div><div class='add'>+int mt76_connac_mcu_sta_update_hdr_trans(struct mt76_dev *dev,</div><div class='add'>+					 struct ieee80211_vif *vif,</div><div class='add'>+					 struct mt76_wcid *wcid, int cmd);</div><div class='add'>+void mt76_connac_mcu_sta_he_tlv_v2(struct sk_buff *skb, struct ieee80211_sta *sta);</div><div class='add'>+u8 mt76_connac_get_phy_mode_v2(struct mt76_phy *mphy, struct ieee80211_vif *vif,</div><div class='add'>+			       enum nl80211_band band,</div><div class='add'>+			       struct ieee80211_link_sta *link_sta);</div><div class='add'>+int mt76_connac_mcu_wtbl_update_hdr_trans(struct mt76_dev *dev,</div><div class='add'>+					  struct ieee80211_vif *vif,</div><div class='add'>+					  struct ieee80211_sta *sta);</div><div class='ctx'> void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb,</div><div class='ctx'> 			     struct ieee80211_sta *sta,</div><div class='ctx'> 			     struct ieee80211_vif *vif,</div><div class='del'>-			     u8 rcpi);</div><div class='add'>+			     u8 rcpi, u8 state);</div><div class='ctx'> void mt76_connac_mcu_wtbl_ht_tlv(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 				 struct ieee80211_sta *sta, void *sta_wtbl,</div><div class='del'>-				 void *wtbl_tlv);</div><div class='add'>+				 void *wtbl_tlv, bool ht_ldpc, bool vht_ldpc);</div><div class='ctx'> void mt76_connac_mcu_wtbl_ba_tlv(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 				 struct ieee80211_ampdu_params *params,</div><div class='ctx'> 				 bool enable, bool tx, void *sta_wtbl,</div><div class='hunk'>@@ -986,18 +1955,23 @@ void mt76_connac_mcu_sta_ba_tlv(struct sk_buff *skb,</div><div class='ctx'> 				struct ieee80211_ampdu_params *params,</div><div class='ctx'> 				bool enable, bool tx);</div><div class='ctx'> int mt76_connac_mcu_uni_add_dev(struct mt76_phy *phy,</div><div class='del'>-				struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_bss_conf *bss_conf,</div><div class='add'>+				struct mt76_vif_link *mvif,</div><div class='ctx'> 				struct mt76_wcid *wcid,</div><div class='ctx'> 				bool enable);</div><div class='del'>-int mt76_connac_mcu_sta_ba(struct mt76_dev *dev, struct mt76_vif *mvif,</div><div class='add'>+int mt76_connac_mcu_sta_ba(struct mt76_dev *dev, struct mt76_vif_link *mvif,</div><div class='ctx'> 			   struct ieee80211_ampdu_params *params,</div><div class='del'>-			   bool enable, bool tx);</div><div class='add'>+			   int cmd, bool enable, bool tx);</div><div class='add'>+int mt76_connac_mcu_uni_set_chctx(struct mt76_phy *phy,</div><div class='add'>+				  struct mt76_vif_link *vif,</div><div class='add'>+				  struct ieee80211_chanctx_conf *ctx);</div><div class='ctx'> int mt76_connac_mcu_uni_add_bss(struct mt76_phy *phy,</div><div class='ctx'> 				struct ieee80211_vif *vif,</div><div class='ctx'> 				struct mt76_wcid *wcid,</div><div class='del'>-				bool enable);</div><div class='del'>-int mt76_connac_mcu_add_sta_cmd(struct mt76_phy *phy,</div><div class='del'>-				struct mt76_sta_cmd_info *info);</div><div class='add'>+				bool enable,</div><div class='add'>+				struct ieee80211_chanctx_conf *ctx);</div><div class='add'>+int mt76_connac_mcu_sta_cmd(struct mt76_phy *phy,</div><div class='add'>+			    struct mt76_sta_cmd_info *info);</div><div class='ctx'> void mt76_connac_mcu_beacon_loss_iter(void *priv, u8 *mac,</div><div class='ctx'> 				      struct ieee80211_vif *vif);</div><div class='ctx'> int mt76_connac_mcu_set_rts_thresh(struct mt76_dev *dev, u32 val, u8 band);</div><div class='hunk'>@@ -1009,6 +1983,8 @@ int mt76_connac_mcu_start_patch(struct mt76_dev *dev);</div><div class='ctx'> int mt76_connac_mcu_patch_sem_ctrl(struct mt76_dev *dev, bool get);</div><div class='ctx'> int mt76_connac_mcu_start_firmware(struct mt76_dev *dev, u32 addr, u32 option);</div><div class='ctx'> </div><div class='add'>+void mt76_connac_mcu_build_rnr_scan_param(struct mt76_dev *mdev,</div><div class='add'>+					  struct cfg80211_scan_request *sreq);</div><div class='ctx'> int mt76_connac_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 			    struct ieee80211_scan_request *scan_req);</div><div class='ctx'> int mt76_connac_mcu_cancel_hw_scan(struct mt76_phy *phy,</div><div class='hunk'>@@ -1020,17 +1996,75 @@ int mt76_connac_mcu_sched_scan_enable(struct mt76_phy *phy,</div><div class='ctx'> 				      struct ieee80211_vif *vif,</div><div class='ctx'> 				      bool enable);</div><div class='ctx'> int mt76_connac_mcu_update_arp_filter(struct mt76_dev *dev,</div><div class='del'>-				      struct mt76_vif *vif,</div><div class='add'>+				      struct mt76_vif_link *vif,</div><div class='ctx'> 				      struct ieee80211_bss_conf *info);</div><div class='add'>+int mt76_connac_mcu_set_gtk_rekey(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+				  bool suspend);</div><div class='add'>+int mt76_connac_mcu_set_wow_ctrl(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='add'>+				 bool suspend, struct cfg80211_wowlan *wowlan);</div><div class='ctx'> int mt76_connac_mcu_update_gtk_rekey(struct ieee80211_hw *hw,</div><div class='ctx'> 				     struct ieee80211_vif *vif,</div><div class='ctx'> 				     struct cfg80211_gtk_rekey_data *key);</div><div class='del'>-int mt76_connac_mcu_set_hif_suspend(struct mt76_dev *dev, bool suspend);</div><div class='add'>+int mt76_connac_mcu_set_suspend_mode(struct mt76_dev *dev,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     bool enable, u8 mdtim,</div><div class='add'>+				     bool wow_suspend);</div><div class='add'>+int mt76_connac_mcu_set_hif_suspend(struct mt76_dev *dev, bool suspend, bool wait_resp);</div><div class='ctx'> void mt76_connac_mcu_set_suspend_iter(void *priv, u8 *mac,</div><div class='ctx'> 				      struct ieee80211_vif *vif);</div><div class='add'>+int mt76_connac_sta_state_dp(struct mt76_dev *dev,</div><div class='add'>+			     enum ieee80211_sta_state old_state,</div><div class='add'>+			     enum ieee80211_sta_state new_state);</div><div class='ctx'> int mt76_connac_mcu_chip_config(struct mt76_dev *dev);</div><div class='ctx'> int mt76_connac_mcu_set_deep_sleep(struct mt76_dev *dev, bool enable);</div><div class='ctx'> void mt76_connac_mcu_coredump_event(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 				    struct mt76_connac_coredump *coredump);</div><div class='add'>+s8 mt76_connac_get_ch_power(struct mt76_phy *phy,</div><div class='add'>+			    struct ieee80211_channel *chan,</div><div class='add'>+			    s8 target_power);</div><div class='ctx'> int mt76_connac_mcu_set_rate_txpower(struct mt76_phy *phy);</div><div class='add'>+int mt76_connac_mcu_set_p2p_oppps(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif);</div><div class='add'>+u32 mt76_connac_mcu_reg_rr(struct mt76_dev *dev, u32 offset);</div><div class='add'>+void mt76_connac_mcu_reg_wr(struct mt76_dev *dev, u32 offset, u32 val);</div><div class='add'>+</div><div class='add'>+const struct ieee80211_sta_he_cap *</div><div class='add'>+mt76_connac_get_he_phy_cap(struct mt76_phy *phy, struct ieee80211_vif *vif);</div><div class='add'>+const struct ieee80211_sta_eht_cap *</div><div class='add'>+mt76_connac_get_eht_phy_cap(struct mt76_phy *phy, struct ieee80211_vif *vif);</div><div class='add'>+u8 mt76_connac_get_phy_mode(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='add'>+			    enum nl80211_band band,</div><div class='add'>+			    struct ieee80211_link_sta *sta);</div><div class='add'>+u8 mt76_connac_get_phy_mode_ext(struct mt76_phy *phy, struct ieee80211_bss_conf *conf,</div><div class='add'>+				enum nl80211_band band);</div><div class='add'>+</div><div class='add'>+int mt76_connac_mcu_add_key(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			    struct mt76_connac_sta_key_conf *sta_key_conf,</div><div class='add'>+			    struct ieee80211_key_conf *key, int mcu_cmd,</div><div class='add'>+			    struct mt76_wcid *wcid, enum set_key_cmd cmd);</div><div class='add'>+</div><div class='add'>+void mt76_connac_mcu_bss_ext_tlv(struct sk_buff *skb, struct mt76_vif_link *mvif);</div><div class='add'>+void mt76_connac_mcu_bss_omac_tlv(struct sk_buff *skb,</div><div class='add'>+				  struct ieee80211_vif *vif);</div><div class='add'>+int mt76_connac_mcu_bss_basic_tlv(struct sk_buff *skb,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  struct ieee80211_sta *sta,</div><div class='add'>+				  struct mt76_phy *phy, u16 wlan_idx,</div><div class='add'>+				  bool enable);</div><div class='add'>+void mt76_connac_mcu_sta_uapsd(struct sk_buff *skb, struct ieee80211_vif *vif,</div><div class='add'>+			       struct ieee80211_sta *sta);</div><div class='add'>+void mt76_connac_mcu_wtbl_smps_tlv(struct sk_buff *skb,</div><div class='add'>+				   struct ieee80211_sta *sta,</div><div class='add'>+				   void *sta_wtbl, void *wtbl_tlv);</div><div class='add'>+int mt76_connac_mcu_set_pm(struct mt76_dev *dev, int band, int enter);</div><div class='add'>+int mt76_connac_mcu_restart(struct mt76_dev *dev);</div><div class='add'>+int mt76_connac_mcu_del_wtbl_all(struct mt76_dev *dev);</div><div class='add'>+int mt76_connac_mcu_rdd_cmd(struct mt76_dev *dev, int cmd, u8 index,</div><div class='add'>+			    u8 rx_sel, u8 val);</div><div class='add'>+int mt76_connac_mcu_sta_wed_update(struct mt76_dev *dev, struct sk_buff *skb);</div><div class='add'>+int mt76_connac2_load_ram(struct mt76_dev *dev, const char *fw_wm,</div><div class='add'>+			  const char *fw_wa);</div><div class='add'>+int mt76_connac2_load_patch(struct mt76_dev *dev, const char *fw_name);</div><div class='add'>+int mt76_connac2_mcu_fill_message(struct mt76_dev *mdev, struct sk_buff *skb,</div><div class='add'>+				  int cmd, int *wait_seq);</div><div class='ctx'> #endif /* __MT76_CONNAC_MCU_H */</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig b/drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig<br/>index 7c88ed8b8f1e..3ed888782a70 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig</a></div><div class='hunk'>@@ -10,7 +10,7 @@ config MT76x0U</div><div class='ctx'> 	depends on MAC80211</div><div class='ctx'> 	depends on USB</div><div class='ctx'> 	help</div><div class='del'>-	  This adds support for MT7610U-based wireless USB 2.0 dongles,</div><div class='add'>+	  This adds support for MT7610U-based USB 2.0 wireless dongles,</div><div class='ctx'> 	  which comply with IEEE 802.11ac standards and support 1x1</div><div class='ctx'> 	  433Mbps PHY rate.</div><div class='ctx'> </div><div class='hunk'>@@ -22,7 +22,7 @@ config MT76x0E</div><div class='ctx'> 	depends on MAC80211</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	help</div><div class='del'>-	  This adds support for MT7610/MT7630-based wireless PCIe devices,</div><div class='add'>+	  This adds support for MT7610/MT7630-based PCIe wireless devices,</div><div class='ctx'> 	  which comply with IEEE 802.11ac standards and support 1x1</div><div class='ctx'> 	  433Mbps PHY rate.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c<br/>index dd66fd12a2e6..d4506b8b46fa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include "mt76x0.h"</div><div class='ctx'> #include "eeprom.h"</div><div class='ctx'> #include "../mt76x02_phy.h"</div><div class='hunk'>@@ -68,7 +68,7 @@ static void mt76x0_set_chip_cap(struct mt76x02_dev *dev)</div><div class='ctx'> 		nic_conf1 &amp;= 0xff00;</div><div class='ctx'> </div><div class='ctx'> 	if (nic_conf1 &amp; MT_EE_NIC_CONF_1_HW_RF_CTRL)</div><div class='del'>-		dev_err(dev-&gt;mt76.dev,</div><div class='add'>+		dev_dbg(dev-&gt;mt76.dev,</div><div class='ctx'> 			"driver does not support HW RF ctrl\n");</div><div class='ctx'> </div><div class='ctx'> 	if (!mt76x02_field_valid(nic_conf0 &gt;&gt; 8))</div><div class='hunk'>@@ -151,7 +151,7 @@ static s8 mt76x0_get_delta(struct mt76x02_dev *dev)</div><div class='ctx'> </div><div class='ctx'> void mt76x0_get_tx_power_per_rate(struct mt76x02_dev *dev,</div><div class='ctx'> 				  struct ieee80211_channel *chan,</div><div class='del'>-				  struct mt76_rate_power *t)</div><div class='add'>+				  struct mt76x02_rate_power *t)</div><div class='ctx'> {</div><div class='ctx'> 	bool is_2ghz = chan-&gt;band == NL80211_BAND_2GHZ;</div><div class='ctx'> 	u16 val, addr;</div><div class='hunk'>@@ -179,31 +179,19 @@ void mt76x0_get_tx_power_per_rate(struct mt76x02_dev *dev,</div><div class='ctx'> 	/* ht-vht mcs 1ss 0, 1, 2, 3 */</div><div class='ctx'> 	addr = is_2ghz ? MT_EE_TX_POWER_BYRATE_BASE + 6 : 0x124;</div><div class='ctx'> 	val = mt76x02_eeprom_get(dev, addr);</div><div class='del'>-	t-&gt;ht[0] = t-&gt;ht[1] = t-&gt;vht[0] = t-&gt;vht[1] = s6_to_s8(val);</div><div class='del'>-	t-&gt;ht[2] = t-&gt;ht[3] = t-&gt;vht[2] = t-&gt;vht[3] = s6_to_s8(val &gt;&gt; 8);</div><div class='add'>+	t-&gt;ht[0] = t-&gt;ht[1] = s6_to_s8(val);</div><div class='add'>+	t-&gt;ht[2] = t-&gt;ht[3] = s6_to_s8(val &gt;&gt; 8);</div><div class='ctx'> </div><div class='ctx'> 	/* ht-vht mcs 1ss 4, 5, 6 */</div><div class='ctx'> 	addr = is_2ghz ? MT_EE_TX_POWER_BYRATE_BASE + 8 : 0x126;</div><div class='ctx'> 	val = mt76x02_eeprom_get(dev, addr);</div><div class='del'>-	t-&gt;ht[4] = t-&gt;ht[5] = t-&gt;vht[4] = t-&gt;vht[5] = s6_to_s8(val);</div><div class='del'>-	t-&gt;ht[6] = t-&gt;ht[7] = t-&gt;vht[6] = t-&gt;vht[7] = s6_to_s8(val &gt;&gt; 8);</div><div class='del'>-</div><div class='del'>-	/* ht-vht mcs 1ss 0, 1, 2, 3 stbc */</div><div class='del'>-	addr = is_2ghz ? MT_EE_TX_POWER_BYRATE_BASE + 14 : 0xec;</div><div class='del'>-	val = mt76x02_eeprom_get(dev, addr);</div><div class='del'>-	t-&gt;stbc[0] = t-&gt;stbc[1] = s6_to_s8(val);</div><div class='del'>-	t-&gt;stbc[2] = t-&gt;stbc[3] = s6_to_s8(val &gt;&gt; 8);</div><div class='del'>-</div><div class='del'>-	/* ht-vht mcs 1ss 4, 5, 6 stbc */</div><div class='del'>-	addr = is_2ghz ? MT_EE_TX_POWER_BYRATE_BASE + 16 : 0xee;</div><div class='del'>-	val = mt76x02_eeprom_get(dev, addr);</div><div class='del'>-	t-&gt;stbc[4] = t-&gt;stbc[5] = s6_to_s8(val);</div><div class='del'>-	t-&gt;stbc[6] = t-&gt;stbc[7] = s6_to_s8(val &gt;&gt; 8);</div><div class='add'>+	t-&gt;ht[4] = t-&gt;ht[5] = s6_to_s8(val);</div><div class='add'>+	t-&gt;ht[6] = t-&gt;ht[7] = s6_to_s8(val &gt;&gt; 8);</div><div class='ctx'> </div><div class='ctx'> 	/* vht mcs 8, 9 5GHz */</div><div class='del'>-	val = mt76x02_eeprom_get(dev, 0x132);</div><div class='del'>-	t-&gt;vht[8] = s6_to_s8(val);</div><div class='del'>-	t-&gt;vht[9] = s6_to_s8(val &gt;&gt; 8);</div><div class='add'>+	val = mt76x02_eeprom_get(dev, 0x12c);</div><div class='add'>+	t-&gt;vht[0] = s6_to_s8(val);</div><div class='add'>+	t-&gt;vht[1] = s6_to_s8(val &gt;&gt; 8);</div><div class='ctx'> </div><div class='ctx'> 	delta = mt76x0_tssi_enabled(dev) ? 0 : mt76x0_get_delta(dev);</div><div class='ctx'> 	mt76x02_add_rate_power_offset(t, delta);</div><div class='hunk'>@@ -235,7 +223,7 @@ void mt76x0_get_power_info(struct mt76x02_dev *dev,</div><div class='ctx'> 			data = mt76x02_eeprom_get(dev, MT_EE_5G_TARGET_POWER);</div><div class='ctx'> 		else</div><div class='ctx'> 			data = mt76x02_eeprom_get(dev, MT_EE_2G_TARGET_POWER);</div><div class='del'>-		target_power = (data &amp; 0xff) - dev-&gt;mt76.rate_power.ofdm[7];</div><div class='add'>+		target_power = (data &amp; 0xff) - dev-&gt;rate_power.ofdm[7];</div><div class='ctx'> 		*tp = target_power + mt76x0_get_delta(dev);</div><div class='ctx'> </div><div class='ctx'> 		return;</div><div class='hunk'>@@ -344,7 +332,11 @@ int mt76x0_eeprom_init(struct mt76x02_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	memcpy(dev-&gt;mphy.macaddr, (u8 *)dev-&gt;mt76.eeprom.data + MT_EE_MAC_ADDR,</div><div class='ctx'> 	       ETH_ALEN);</div><div class='del'>-	mt76_eeprom_override(&amp;dev-&gt;mphy);</div><div class='add'>+</div><div class='add'>+	err = mt76_eeprom_override(&amp;dev-&gt;mphy);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	mt76x02_mac_setaddr(dev, dev-&gt;mphy.macaddr);</div><div class='ctx'> </div><div class='ctx'> 	mt76x0_set_chip_cap(dev);</div><div class='hunk'>@@ -354,4 +346,5 @@ int mt76x0_eeprom_init(struct mt76x02_dev *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("MediaTek MT76x EEPROM helpers");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h<br/>index 15540ce8db87..08f1b10bf3ba 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h</a></div><div class='hunk'>@@ -19,7 +19,7 @@ int mt76x0_eeprom_init(struct mt76x02_dev *dev);</div><div class='ctx'> void mt76x0_read_rx_gain(struct mt76x02_dev *dev);</div><div class='ctx'> void mt76x0_get_tx_power_per_rate(struct mt76x02_dev *dev,</div><div class='ctx'> 				  struct ieee80211_channel *chan,</div><div class='del'>-				  struct mt76_rate_power *t);</div><div class='add'>+				  struct mt76x02_rate_power *t);</div><div class='ctx'> void mt76x0_get_power_info(struct mt76x02_dev *dev,</div><div class='ctx'> 			   struct ieee80211_channel *chan, s8 *tp);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/init.c b/drivers/net/wireless/mediatek/mt76/mt76x0/init.c<br/>index 0bac39bf3b66..6257460f8de5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/init.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x0/init.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/init.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x0/init.c</a></div><div class='hunk'>@@ -217,7 +217,7 @@ mt76x0_init_txpower(struct mt76x02_dev *dev,</div><div class='ctx'> 		    struct ieee80211_supported_band *sband)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_channel *chan;</div><div class='del'>-	struct mt76_rate_power t;</div><div class='add'>+	struct mt76x02_rate_power t;</div><div class='ctx'> 	s8 tp;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -237,7 +237,10 @@ int mt76x0_register_device(struct mt76x02_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mt76x02_init_device(dev);</div><div class='add'>+	ret = mt76x02_init_device(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	mt76x02_config_mac_addr_list(dev);</div><div class='ctx'> </div><div class='ctx'> 	ret = mt76_register_device(&amp;dev-&gt;mt76, true, mt76x02_rates,</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/main.c b/drivers/net/wireless/mediatek/mt76/mt76x0/main.c<br/>index 700ae9c12f1d..a5c40d350612 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x0/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x0/main.c</a></div><div class='hunk'>@@ -8,16 +8,15 @@</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include "mt76x0.h"</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt76x0_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef)</div><div class='add'>+int mt76x0_set_channel(struct mt76_phy *mphy)</div><div class='ctx'> {</div><div class='del'>-	cancel_delayed_work_sync(&amp;dev-&gt;cal_work);</div><div class='add'>+	struct mt76x02_dev *dev = container_of(mphy-&gt;dev, struct mt76x02_dev, mt76);</div><div class='add'>+</div><div class='ctx'> 	mt76x02_pre_tbtt_enable(dev, false);</div><div class='ctx'> 	if (mt76_is_mmio(&amp;dev-&gt;mt76))</div><div class='ctx'> 		tasklet_disable(&amp;dev-&gt;dfs_pd.dfs_tasklet);</div><div class='ctx'> </div><div class='del'>-	mt76_set_channel(&amp;dev-&gt;mphy);</div><div class='del'>-	mt76x0_phy_set_channel(dev, chandef);</div><div class='add'>+	mt76x0_phy_set_channel(dev, &amp;mphy-&gt;chandef);</div><div class='ctx'> </div><div class='ctx'> 	mt76x02_mac_cc_reset(dev);</div><div class='ctx'> 	mt76x02_edcca_init(dev);</div><div class='hunk'>@@ -28,25 +27,53 @@ mt76x0_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef)</div><div class='ctx'> 	}</div><div class='ctx'> 	mt76x02_pre_tbtt_enable(dev, true);</div><div class='ctx'> </div><div class='del'>-	mt76_txq_schedule_all(&amp;dev-&gt;mphy);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76x0_set_channel);</div><div class='ctx'> </div><div class='del'>-int mt76x0_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+int mt76x0_set_sar_specs(struct ieee80211_hw *hw,</div><div class='add'>+			 const struct cfg80211_sar_specs *sar)</div><div class='ctx'> {</div><div class='add'>+	int err = -EINVAL, power = hw-&gt;conf.power_level * 2;</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='add'>+	struct mt76_phy *mphy = &amp;dev-&gt;mphy;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+	if (!cfg80211_chandef_valid(&amp;mphy-&gt;chandef))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	if (changed &amp; IEEE80211_CONF_CHANGE_CHANNEL) {</div><div class='del'>-		ieee80211_stop_queues(hw);</div><div class='del'>-		mt76x0_set_channel(dev, &amp;hw-&gt;conf.chandef);</div><div class='del'>-		ieee80211_wake_queues(hw);</div><div class='del'>-	}</div><div class='add'>+	err = mt76_init_sar_power(hw, sar);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	dev-&gt;txpower_conf = mt76_get_sar_power(mphy, mphy-&gt;chandef.chan,</div><div class='add'>+					       power);</div><div class='add'>+	if (test_bit(MT76_STATE_RUNNING, &amp;mphy-&gt;state))</div><div class='add'>+		mt76x0_phy_set_txpower(dev);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76x0_set_sar_specs);</div><div class='add'>+</div><div class='add'>+int mt76x0_config(struct ieee80211_hw *hw, int radio_idx, u32 changed)</div><div class='add'>+{</div><div class='add'>+	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (changed &amp; IEEE80211_CONF_CHANGE_CHANNEL)</div><div class='add'>+		mt76_update_channel(&amp;dev-&gt;mphy);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; IEEE80211_CONF_CHANGE_POWER) {</div><div class='del'>-		dev-&gt;txpower_conf = hw-&gt;conf.power_level * 2;</div><div class='add'>+		struct mt76_phy *mphy = &amp;dev-&gt;mphy;</div><div class='ctx'> </div><div class='del'>-		if (test_bit(MT76_STATE_RUNNING, &amp;dev-&gt;mphy.state))</div><div class='add'>+		dev-&gt;txpower_conf = hw-&gt;conf.power_level * 2;</div><div class='add'>+		dev-&gt;txpower_conf = mt76_get_sar_power(mphy,</div><div class='add'>+						       mphy-&gt;chandef.chan,</div><div class='add'>+						       dev-&gt;txpower_conf);</div><div class='add'>+		if (test_bit(MT76_STATE_RUNNING, &amp;mphy-&gt;state))</div><div class='ctx'> 			mt76x0_phy_set_txpower(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h b/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h<br/>index 6953f253a28a..e5bc14d4c712 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h</a></div><div class='hunk'>@@ -48,7 +48,10 @@ void mt76x0_chip_onoff(struct mt76x02_dev *dev, bool enable, bool reset);</div><div class='ctx'> </div><div class='ctx'> void mt76x0_mac_stop(struct mt76x02_dev *dev);</div><div class='ctx'> </div><div class='del'>-int mt76x0_config(struct ieee80211_hw *hw, u32 changed);</div><div class='add'>+int mt76x0_config(struct ieee80211_hw *hw, int radio_idx, u32 changed);</div><div class='add'>+int mt76x0_set_channel(struct mt76_phy *mphy);</div><div class='add'>+int mt76x0_set_sar_specs(struct ieee80211_hw *hw,</div><div class='add'>+			 const struct cfg80211_sar_specs *sar);</div><div class='ctx'> </div><div class='ctx'> /* PHY */</div><div class='ctx'> void mt76x0_phy_init(struct mt76x02_dev *dev);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c<br/>index 5847f943e8da..f8d206a07f99 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x0/pci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x0/pci.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -44,7 +44,7 @@ static void mt76x0e_stop_hw(struct mt76x02_dev *dev)</div><div class='ctx'> 	mt76_clear(dev, MT_WPDMA_GLO_CFG, MT_WPDMA_GLO_CFG_RX_DMA_EN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt76x0e_stop(struct ieee80211_hw *hw)</div><div class='add'>+static void mt76x0e_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -59,6 +59,10 @@ mt76x0e_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ieee80211_ops mt76x0e_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.tx = mt76x02_tx,</div><div class='ctx'> 	.start = mt76x0e_start,</div><div class='ctx'> 	.stop = mt76x0e_stop,</div><div class='hunk'>@@ -85,9 +89,10 @@ static const struct ieee80211_ops mt76x0e_ops = {</div><div class='ctx'> 	.set_rts_threshold = mt76x02_set_rts_threshold,</div><div class='ctx'> 	.get_antenna = mt76_get_antenna,</div><div class='ctx'> 	.reconfig_complete = mt76x02_reconfig_complete,</div><div class='add'>+	.set_sar_specs = mt76x0_set_sar_specs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int mt76x0e_register_device(struct mt76x02_dev *dev)</div><div class='add'>+static int mt76x0e_init_hardware(struct mt76x02_dev *dev, bool resume)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -100,9 +105,11 @@ static int mt76x0e_register_device(struct mt76x02_dev *dev)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = mt76x02_dma_init(dev);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	if (!resume) {</div><div class='add'>+		err = mt76x02_dma_init(dev);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = mt76x0_init_hardware(dev);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -123,6 +130,17 @@ static int mt76x0e_register_device(struct mt76x02_dev *dev)</div><div class='ctx'> 	mt76_clear(dev, 0x110, BIT(9));</div><div class='ctx'> 	mt76_set(dev, MT_MAX_LEN_CFG, BIT(13));</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt76x0e_register_device(struct mt76x02_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mt76x0e_init_hardware(dev, false);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	err = mt76x0_register_device(dev);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -138,9 +156,11 @@ mt76x0e_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	static const struct mt76_driver_ops drv_ops = {</div><div class='ctx'> 		.txwi_size = sizeof(struct mt76x02_txwi),</div><div class='ctx'> 		.drv_flags = MT_DRV_TX_ALIGNED4_SKBS |</div><div class='del'>-			     MT_DRV_SW_RX_AIRTIME,</div><div class='add'>+			     MT_DRV_SW_RX_AIRTIME |</div><div class='add'>+			     MT_DRV_IGNORE_TXS_FAILED,</div><div class='ctx'> 		.survey_flags = SURVEY_INFO_TIME_TX,</div><div class='ctx'> 		.update_survey = mt76x02_update_channel,</div><div class='add'>+		.set_channel = mt76x0_set_channel,</div><div class='ctx'> 		.tx_prepare_skb = mt76x02_tx_prepare_skb,</div><div class='ctx'> 		.tx_complete_skb = mt76x02_tx_complete_skb,</div><div class='ctx'> 		.rx_skb = mt76x02_queue_rx_skb,</div><div class='hunk'>@@ -163,10 +183,12 @@ mt76x0e_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='del'>-	ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='add'>+	ret = dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	mt76_pci_disable_aspm(pdev);</div><div class='add'>+</div><div class='ctx'> 	mdev = mt76_alloc_device(&amp;pdev-&gt;dev, sizeof(*dev), &amp;mt76x0e_ops,</div><div class='ctx'> 				 &amp;drv_ops);</div><div class='ctx'> 	if (!mdev)</div><div class='hunk'>@@ -220,6 +242,64 @@ mt76x0e_remove(struct pci_dev *pdev)</div><div class='ctx'> 	mt76_free_device(mdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int mt76x0e_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct mt76_dev *mdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mt76_worker_disable(&amp;mdev-&gt;tx_worker);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mdev-&gt;phy.q_tx); i++)</div><div class='add'>+		mt76_queue_tx_cleanup(dev, mdev-&gt;phy.q_tx[i], true);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mdev-&gt;q_mcu); i++)</div><div class='add'>+		mt76_queue_tx_cleanup(dev, mdev-&gt;q_mcu[i], true);</div><div class='add'>+	napi_disable(&amp;mdev-&gt;tx_napi);</div><div class='add'>+</div><div class='add'>+	mt76_for_each_q_rx(mdev, i)</div><div class='add'>+		napi_disable(&amp;mdev-&gt;napi[i]);</div><div class='add'>+</div><div class='add'>+	mt76x02_dma_disable(dev);</div><div class='add'>+	mt76x02_mcu_cleanup(dev);</div><div class='add'>+	mt76x0_chip_onoff(dev, false, false);</div><div class='add'>+</div><div class='add'>+	pci_enable_wake(pdev, pci_choose_state(pdev, state), true);</div><div class='add'>+	pci_save_state(pdev);</div><div class='add'>+</div><div class='add'>+	return pci_set_power_state(pdev, pci_choose_state(pdev, state));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt76x0e_resume(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_dev *mdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	err = pci_set_power_state(pdev, PCI_D0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	pci_restore_state(pdev);</div><div class='add'>+</div><div class='add'>+	mt76_worker_enable(&amp;mdev-&gt;tx_worker);</div><div class='add'>+</div><div class='add'>+	mt76_for_each_q_rx(mdev, i) {</div><div class='add'>+		mt76_queue_rx_reset(dev, i);</div><div class='add'>+		napi_enable(&amp;mdev-&gt;napi[i]);</div><div class='add'>+	}</div><div class='add'>+	napi_enable(&amp;mdev-&gt;tx_napi);</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	mt76_for_each_q_rx(mdev, i) {</div><div class='add'>+		napi_schedule(&amp;mdev-&gt;napi[i]);</div><div class='add'>+	}</div><div class='add'>+	napi_schedule(&amp;mdev-&gt;tx_napi);</div><div class='add'>+	local_bh_enable();</div><div class='add'>+</div><div class='add'>+	return mt76x0e_init_hardware(dev, true);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+</div><div class='ctx'> static const struct pci_device_id mt76x0e_device_table[] = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7610) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7630) },</div><div class='hunk'>@@ -230,6 +310,7 @@ static const struct pci_device_id mt76x0e_device_table[] = {</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, mt76x0e_device_table);</div><div class='ctx'> MODULE_FIRMWARE(MT7610E_FIRMWARE);</div><div class='ctx'> MODULE_FIRMWARE(MT7650E_FIRMWARE);</div><div class='add'>+MODULE_DESCRIPTION("MediaTek MT76x0E (PCIe) wireless driver");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver mt76x0e_driver = {</div><div class='hunk'>@@ -237,6 +318,10 @@ static struct pci_driver mt76x0e_driver = {</div><div class='ctx'> 	.id_table	= mt76x0e_device_table,</div><div class='ctx'> 	.probe		= mt76x0e_probe,</div><div class='ctx'> 	.remove		= mt76x0e_remove,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend	= mt76x0e_suspend,</div><div class='add'>+	.resume		= mt76x0e_resume,</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> module_pci_driver(mt76x0e_driver);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/pci_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76x0/pci_mcu.c<br/>index f0962507f72f..efa549dc68ec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/pci_mcu.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x0/pci_mcu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/pci_mcu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x0/pci_mcu.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c<br/>index e91c314cdfac..ec554a059216 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x0/phy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x0/phy.c</a></div><div class='hunk'>@@ -595,10 +595,7 @@ mt76x0_phy_get_target_power(struct mt76x02_dev *dev, u8 tx_mode,</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		/* cck rates */</div><div class='ctx'> 		tx_rate = (info[0] &amp; 0x60) &gt;&gt; 5;</div><div class='del'>-		if (tx_rate &gt; 3)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		*target_power = cur_power + dev-&gt;mt76.rate_power.cck[tx_rate];</div><div class='add'>+		*target_power = cur_power + dev-&gt;rate_power.cck[tx_rate];</div><div class='ctx'> 		*target_pa_power = mt76x0_phy_get_rf_pa_mode(dev, 0, tx_rate);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1: {</div><div class='hunk'>@@ -635,7 +632,7 @@ mt76x0_phy_get_target_power(struct mt76x02_dev *dev, u8 tx_mode,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		*target_power = cur_power + dev-&gt;mt76.rate_power.ofdm[index];</div><div class='add'>+		*target_power = cur_power + dev-&gt;rate_power.ofdm[index];</div><div class='ctx'> 		*target_pa_power = mt76x0_phy_get_rf_pa_mode(dev, 0, index + 4);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -645,7 +642,12 @@ mt76x0_phy_get_target_power(struct mt76x02_dev *dev, u8 tx_mode,</div><div class='ctx'> 		if (tx_rate &gt; 9)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		*target_power = cur_power + dev-&gt;mt76.rate_power.vht[tx_rate];</div><div class='add'>+		*target_power = cur_power;</div><div class='add'>+		if (tx_rate &gt; 7)</div><div class='add'>+			*target_power += dev-&gt;rate_power.vht[tx_rate - 8];</div><div class='add'>+		else</div><div class='add'>+			*target_power += dev-&gt;rate_power.ht[tx_rate];</div><div class='add'>+</div><div class='ctx'> 		*target_pa_power = mt76x0_phy_get_rf_pa_mode(dev, 1, tx_rate);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -654,7 +656,7 @@ mt76x0_phy_get_target_power(struct mt76x02_dev *dev, u8 tx_mode,</div><div class='ctx'> 		if (tx_rate &gt; 9)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		*target_power = cur_power + dev-&gt;mt76.rate_power.ht[tx_rate];</div><div class='add'>+		*target_power = cur_power + dev-&gt;rate_power.ht[tx_rate];</div><div class='ctx'> 		*target_pa_power = mt76x0_phy_get_rf_pa_mode(dev, 1, tx_rate);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -841,7 +843,7 @@ static void mt76x0_phy_tssi_calibrate(struct mt76x02_dev *dev)</div><div class='ctx'> </div><div class='ctx'> void mt76x0_phy_set_txpower(struct mt76x02_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_rate_power *t = &amp;dev-&gt;mt76.rate_power;</div><div class='add'>+	struct mt76x02_rate_power *t = &amp;dev-&gt;rate_power;</div><div class='ctx'> 	s8 info;</div><div class='ctx'> </div><div class='ctx'> 	mt76x0_get_tx_power_per_rate(dev, dev-&gt;mphy.chandef.chan, t);</div><div class='hunk'>@@ -1069,7 +1071,7 @@ mt76x0_phy_update_channel_gain(struct mt76x02_dev *dev)</div><div class='ctx'> 	u8 gain_delta;</div><div class='ctx'> 	int low_gain;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;cal.avg_rssi_all = mt76_get_min_avg_rssi(&amp;dev-&gt;mt76, false);</div><div class='add'>+	dev-&gt;cal.avg_rssi_all = mt76_get_min_avg_rssi(&amp;dev-&gt;mt76, 0);</div><div class='ctx'> 	if (!dev-&gt;cal.avg_rssi_all)</div><div class='ctx'> 		dev-&gt;cal.avg_rssi_all = -75;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c<br/>index f2b2fa733845..90e5666c0857 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x0/usb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x0/usb.c</a></div><div class='hunk'>@@ -77,7 +77,7 @@ static void mt76x0u_cleanup(struct mt76x02_dev *dev)</div><div class='ctx'> 	mt76u_queues_deinit(&amp;dev-&gt;mt76);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt76x0u_stop(struct ieee80211_hw *hw)</div><div class='add'>+static void mt76x0u_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -118,6 +118,10 @@ static int mt76x0u_start(struct ieee80211_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ieee80211_ops mt76x0u_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.tx = mt76x02_tx,</div><div class='ctx'> 	.start = mt76x0u_start,</div><div class='ctx'> 	.stop = mt76x0u_stop,</div><div class='hunk'>@@ -141,6 +145,7 @@ static const struct ieee80211_ops mt76x0u_ops = {</div><div class='ctx'> 	.set_tim = mt76_set_tim,</div><div class='ctx'> 	.release_buffered_frames = mt76_release_buffered_frames,</div><div class='ctx'> 	.get_antenna = mt76_get_antenna,</div><div class='add'>+	.set_sar_specs = mt76x0_set_sar_specs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int mt76x0u_init_hardware(struct mt76x02_dev *dev, bool reset)</div><div class='hunk'>@@ -209,9 +214,11 @@ static int mt76x0u_probe(struct usb_interface *usb_intf,</div><div class='ctx'> 			 const struct usb_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	static const struct mt76_driver_ops drv_ops = {</div><div class='del'>-		.drv_flags = MT_DRV_SW_RX_AIRTIME,</div><div class='add'>+		.drv_flags = MT_DRV_SW_RX_AIRTIME |</div><div class='add'>+			     MT_DRV_IGNORE_TXS_FAILED,</div><div class='ctx'> 		.survey_flags = SURVEY_INFO_TIME_TX,</div><div class='ctx'> 		.update_survey = mt76x02_update_channel,</div><div class='add'>+		.set_channel = mt76x0_set_channel,</div><div class='ctx'> 		.tx_prepare_skb = mt76x02u_tx_prepare_skb,</div><div class='ctx'> 		.tx_complete_skb = mt76x02u_tx_complete_skb,</div><div class='ctx'> 		.tx_status_data = mt76x02_tx_status_data,</div><div class='hunk'>@@ -244,7 +251,7 @@ static int mt76x0u_probe(struct usb_interface *usb_intf,</div><div class='ctx'> 	usb_set_intfdata(usb_intf, dev);</div><div class='ctx'> </div><div class='ctx'> 	mt76x02u_init_mcu(mdev);</div><div class='del'>-	ret = mt76u_init(mdev, usb_intf, false);</div><div class='add'>+	ret = mt76u_init(mdev, usb_intf);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='hunk'>@@ -335,6 +342,7 @@ err:</div><div class='ctx'> MODULE_DEVICE_TABLE(usb, mt76x0_device_table);</div><div class='ctx'> MODULE_FIRMWARE(MT7610E_FIRMWARE);</div><div class='ctx'> MODULE_FIRMWARE(MT7610U_FIRMWARE);</div><div class='add'>+MODULE_DESCRIPTION("MediaTek MT76x0U (USB) wireless driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static struct usb_driver mt76x0_driver = {</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c<br/>index 45502fd4693f..20a8f3659490 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -148,6 +148,7 @@ static int mt76x0u_load_firmware(struct mt76x02_dev *dev)</div><div class='ctx'> 	mt76_wr(dev, MT_USB_DMA_CFG, val);</div><div class='ctx'> </div><div class='ctx'> 	ret = mt76x0u_upload_firmware(dev, hdr);</div><div class='add'>+	mt76x02_set_ethtool_fwver(dev, hdr);</div><div class='ctx'> 	release_firmware(fw);</div><div class='ctx'> </div><div class='ctx'> 	mt76_wr(dev, MT_FCE_PSE_CTRL, 1);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02.h b/drivers/net/wireless/mediatek/mt76/mt76x02.h<br/>index 4d58c2c1c0ac..3c98808ccf26 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  * Copyright (C) 2018 Stanislaw Gruszka &lt;stf_xl@wp.pl&gt;</div><div class='hunk'>@@ -72,6 +72,18 @@ struct mt76x02_beacon_ops {</div><div class='ctx'> #define mt76x02_pre_tbtt_enable(dev, enable)	\</div><div class='ctx'> 	(dev)-&gt;beacon_ops-&gt;pre_tbtt_enable(dev, enable)</div><div class='ctx'> </div><div class='add'>+struct mt76x02_rate_power {</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			s8 cck[4];</div><div class='add'>+			s8 ofdm[8];</div><div class='add'>+			s8 ht[16];</div><div class='add'>+			s8 vht[2];</div><div class='add'>+		};</div><div class='add'>+		s8 all[30];</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mt76x02_dev {</div><div class='ctx'> 	union { /* must be first */</div><div class='ctx'> 		struct mt76_dev mt76;</div><div class='hunk'>@@ -103,9 +115,12 @@ struct mt76x02_dev {</div><div class='ctx'> 	u8 tbtt_count;</div><div class='ctx'> </div><div class='ctx'> 	u32 tx_hang_reset;</div><div class='del'>-	u8 tx_hang_check;</div><div class='add'>+	u8 tx_hang_check[4];</div><div class='add'>+	u8 beacon_hang_check;</div><div class='ctx'> 	u8 mcu_timeout;</div><div class='ctx'> </div><div class='add'>+	struct mt76x02_rate_power rate_power;</div><div class='add'>+</div><div class='ctx'> 	struct mt76x02_calibration cal;</div><div class='ctx'> </div><div class='ctx'> 	int txpower_conf;</div><div class='hunk'>@@ -133,7 +148,7 @@ struct mt76x02_dev {</div><div class='ctx'> </div><div class='ctx'> extern struct ieee80211_rate mt76x02_rates[12];</div><div class='ctx'> </div><div class='del'>-void mt76x02_init_device(struct mt76x02_dev *dev);</div><div class='add'>+int mt76x02_init_device(struct mt76x02_dev *dev);</div><div class='ctx'> void mt76x02_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> 			      unsigned int changed_flags,</div><div class='ctx'> 			      unsigned int *total_flags, u64 multicast);</div><div class='hunk'>@@ -155,7 +170,8 @@ int mt76x02_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 		    struct ieee80211_vif *vif, struct ieee80211_sta *sta,</div><div class='ctx'> 		    struct ieee80211_key_conf *key);</div><div class='ctx'> int mt76x02_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-		    u16 queue, const struct ieee80211_tx_queue_params *params);</div><div class='add'>+		    unsigned int link_id, u16 queue,</div><div class='add'>+		    const struct ieee80211_tx_queue_params *params);</div><div class='ctx'> void mt76x02_sta_rate_tbl_update(struct ieee80211_hw *hw,</div><div class='ctx'> 				 struct ieee80211_vif *vif,</div><div class='ctx'> 				 struct ieee80211_sta *sta);</div><div class='hunk'>@@ -167,12 +183,12 @@ void mt76x02_wdt_work(struct work_struct *work);</div><div class='ctx'> void mt76x02_tx_set_txpwr_auto(struct mt76x02_dev *dev, s8 txpwr);</div><div class='ctx'> void mt76x02_set_tx_ackto(struct mt76x02_dev *dev);</div><div class='ctx'> void mt76x02_set_coverage_class(struct ieee80211_hw *hw,</div><div class='del'>-				s16 coverage_class);</div><div class='del'>-int mt76x02_set_rts_threshold(struct ieee80211_hw *hw, u32 val);</div><div class='add'>+				int radio_idx, s16 coverage_class);</div><div class='add'>+int mt76x02_set_rts_threshold(struct ieee80211_hw *hw, int radio_idx, u32 val);</div><div class='ctx'> void mt76x02_remove_hdr_pad(struct sk_buff *skb, int len);</div><div class='ctx'> bool mt76x02_tx_status_data(struct mt76_dev *mdev, u8 *update);</div><div class='ctx'> void mt76x02_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,</div><div class='del'>-			  struct sk_buff *skb);</div><div class='add'>+			  struct sk_buff *skb, u32 *info);</div><div class='ctx'> void mt76x02_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q);</div><div class='ctx'> irqreturn_t mt76x02_irq_handler(int irq, void *dev_instance);</div><div class='ctx'> void mt76x02_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,</div><div class='hunk'>@@ -186,7 +202,7 @@ void mt76x02_sw_scan_complete(struct ieee80211_hw *hw,</div><div class='ctx'> void mt76x02_sta_ps(struct mt76_dev *dev, struct ieee80211_sta *sta, bool ps);</div><div class='ctx'> void mt76x02_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 			      struct ieee80211_vif *vif,</div><div class='del'>-			      struct ieee80211_bss_conf *info, u32 changed);</div><div class='add'>+			      struct ieee80211_bss_conf *info, u64 changed);</div><div class='ctx'> void mt76x02_reconfig_complete(struct ieee80211_hw *hw,</div><div class='ctx'> 			       enum ieee80211_reconfig_type reconfig_type);</div><div class='ctx'> </div><div class='hunk'>@@ -246,10 +262,7 @@ mt76x02_rx_get_sta(struct mt76_dev *dev, u8 idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_wcid *wcid;</div><div class='ctx'> </div><div class='del'>-	if (idx &gt;= MT76x02_N_WCIDS)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	wcid = rcu_dereference(dev-&gt;wcid[idx]);</div><div class='add'>+	wcid = __mt76_wcid_ptr(dev, idx);</div><div class='ctx'> 	if (!wcid)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c b/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c<br/>index 5d034cec191b..7c9b16942275 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='hunk'>@@ -57,8 +57,11 @@ void mt76x02_mac_set_beacon(struct mt76x02_dev *dev,</div><div class='ctx'> 	int bcn_len = dev-&gt;beacon_ops-&gt;slot_size;</div><div class='ctx'> 	int bcn_addr = MT_BEACON_BASE + (bcn_len * dev-&gt;beacon_data_count);</div><div class='ctx'> </div><div class='del'>-	if (!mt76x02_write_beacon(dev, bcn_addr, skb))</div><div class='add'>+	if (!mt76x02_write_beacon(dev, bcn_addr, skb)) {</div><div class='add'>+		if (!dev-&gt;beacon_data_count)</div><div class='add'>+			dev-&gt;beacon_hang_check++;</div><div class='ctx'> 		dev-&gt;beacon_data_count++;</div><div class='add'>+	}</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02_mac_set_beacon);</div><div class='hunk'>@@ -74,6 +77,7 @@ void mt76x02_mac_set_beacon_enable(struct mt76x02_dev *dev,</div><div class='ctx'> 	if (!dev-&gt;mt76.beacon_mask)</div><div class='ctx'> 		dev-&gt;tbtt_count = 0;</div><div class='ctx'> </div><div class='add'>+	dev-&gt;beacon_hang_check = 0;</div><div class='ctx'> 	if (enable) {</div><div class='ctx'> 		dev-&gt;mt76.beacon_mask |= BIT(mvif-&gt;idx);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -132,18 +136,19 @@ EXPORT_SYMBOL_GPL(mt76x02_resync_beacon_timer);</div><div class='ctx'> void</div><div class='ctx'> mt76x02_update_beacon_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct mt76x02_dev *dev = (struct mt76x02_dev *)priv;</div><div class='add'>+	struct beacon_bc_data *data = priv;</div><div class='add'>+	struct mt76x02_dev *dev = data-&gt;dev;</div><div class='ctx'> 	struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (!(dev-&gt;mt76.beacon_mask &amp; BIT(mvif-&gt;idx)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	skb = ieee80211_beacon_get(mt76_hw(dev), vif);</div><div class='add'>+	skb = ieee80211_beacon_get(mt76_hw(dev), vif, 0);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mt76x02_mac_set_beacon(dev, skb);</div><div class='add'>+	__skb_queue_tail(&amp;data-&gt;q, skb);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02_update_beacon_iter);</div><div class='ctx'> </div><div class='hunk'>@@ -178,9 +183,6 @@ mt76x02_enqueue_buffered_bc(struct mt76x02_dev *dev,</div><div class='ctx'> {</div><div class='ctx'> 	int i, nframes;</div><div class='ctx'> </div><div class='del'>-	data-&gt;dev = dev;</div><div class='del'>-	__skb_queue_head_init(&amp;data-&gt;q);</div><div class='del'>-</div><div class='ctx'> 	do {</div><div class='ctx'> 		nframes = skb_queue_len(&amp;data-&gt;q);</div><div class='ctx'> 		ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev),</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c b/drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c<br/>index c4fe1c436aaa..d81f696b32c7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -20,7 +20,7 @@ mt76x02_ampdu_stat_show(struct seq_file *file, void *data)</div><div class='ctx'> 		seq_puts(file, "Count:  ");</div><div class='ctx'> 		for (j = 0; j &lt; 8; j++)</div><div class='ctx'> 			seq_printf(file, "%8d | ",</div><div class='del'>-				   dev-&gt;mt76.aggr_stats[i * 8 + j]);</div><div class='add'>+				   dev-&gt;mphy.aggr_stats[i * 8 + j]);</div><div class='ctx'> 		seq_puts(file, "\n");</div><div class='ctx'> 		seq_puts(file, "--------");</div><div class='ctx'> 		for (j = 0; j &lt; 8; j++)</div><div class='hunk'>@@ -114,6 +114,21 @@ mt76_edcca_get(void *data, u64 *val)</div><div class='ctx'> DEFINE_DEBUGFS_ATTRIBUTE(fops_edcca, mt76_edcca_get, mt76_edcca_set,</div><div class='ctx'> 			 "%lld\n");</div><div class='ctx'> </div><div class='add'>+static int mt76x02_read_rate_txpower(struct seq_file *s, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mt76x02_dev *dev = dev_get_drvdata(s-&gt;private);</div><div class='add'>+</div><div class='add'>+	mt76_seq_puts_array(s, "CCK", dev-&gt;rate_power.cck,</div><div class='add'>+			    ARRAY_SIZE(dev-&gt;rate_power.cck));</div><div class='add'>+	mt76_seq_puts_array(s, "OFDM", dev-&gt;rate_power.ofdm,</div><div class='add'>+			    ARRAY_SIZE(dev-&gt;rate_power.ofdm));</div><div class='add'>+	mt76_seq_puts_array(s, "HT", dev-&gt;rate_power.ht,</div><div class='add'>+			    ARRAY_SIZE(dev-&gt;rate_power.ht));</div><div class='add'>+	mt76_seq_puts_array(s, "VHT", dev-&gt;rate_power.vht,</div><div class='add'>+			    ARRAY_SIZE(dev-&gt;rate_power.vht));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void mt76x02_init_debugfs(struct mt76x02_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dir;</div><div class='hunk'>@@ -133,6 +148,8 @@ void mt76x02_init_debugfs(struct mt76x02_dev *dev)</div><div class='ctx'> 	debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "txpower", dir,</div><div class='ctx'> 				    read_txpower);</div><div class='ctx'> </div><div class='add'>+	debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "rate_txpower", dir,</div><div class='add'>+				    mt76x02_read_rate_txpower);</div><div class='ctx'> 	debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "agc", dir, read_agc);</div><div class='ctx'> </div><div class='ctx'> 	debugfs_create_u32("tx_hang_reset", 0400, dir, &amp;dev-&gt;tx_hang_reset);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c b/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c<br/>index a601350531cd..21c99ad7ef59 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -630,7 +630,7 @@ static void mt76x02_dfs_tasklet(struct tasklet_struct *t)</div><div class='ctx'> 		radar_detected = mt76x02_dfs_check_detection(dev);</div><div class='ctx'> 		if (radar_detected) {</div><div class='ctx'> 			/* sw detector rx radar pattern */</div><div class='del'>-			ieee80211_radar_detected(dev-&gt;mt76.hw);</div><div class='add'>+			ieee80211_radar_detected(dev-&gt;mt76.hw, NULL);</div><div class='ctx'> 			mt76x02_dfs_detector_reset(dev);</div><div class='ctx'> </div><div class='ctx'> 			return;</div><div class='hunk'>@@ -658,7 +658,7 @@ static void mt76x02_dfs_tasklet(struct tasklet_struct *t)</div><div class='ctx'> </div><div class='ctx'> 		/* hw detector rx radar pattern */</div><div class='ctx'> 		dfs_pd-&gt;stats[i].hw_pattern++;</div><div class='del'>-		ieee80211_radar_detected(dev-&gt;mt76.hw);</div><div class='add'>+		ieee80211_radar_detected(dev-&gt;mt76.hw, NULL);</div><div class='ctx'> 		mt76x02_dfs_detector_reset(dev);</div><div class='ctx'> </div><div class='ctx'> 		return;</div><div class='hunk'>@@ -823,10 +823,7 @@ EXPORT_SYMBOL_GPL(mt76x02_phy_dfs_adjust_agc);</div><div class='ctx'> </div><div class='ctx'> void mt76x02_dfs_init_params(struct mt76x02_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct cfg80211_chan_def *chandef = &amp;dev-&gt;mphy.chandef;</div><div class='del'>-</div><div class='del'>-	if ((chandef-&gt;chan-&gt;flags &amp; IEEE80211_CHAN_RADAR) &amp;&amp;</div><div class='del'>-	    dev-&gt;mt76.region != NL80211_DFS_UNSET) {</div><div class='add'>+	if (mt76_phy_dfs_state(&amp;dev-&gt;mphy) &gt; MT_DFS_STATE_DISABLED) {</div><div class='ctx'> 		mt76x02_dfs_init_sw_detector(dev);</div><div class='ctx'> 		mt76x02_dfs_set_bbp_params(dev);</div><div class='ctx'> 		/* enable debug mode */</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.h b/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.h<br/>index 491010a32247..d40051992586 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_dfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02_dfs.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_dma.h b/drivers/net/wireless/mediatek/mt76/mt76x02_dma.h<br/>index 23b0e7d10d57..2f6ba8cf51e8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_dma.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_dma.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_dma.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02_dma.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c b/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c<br/>index 0acabba2d1a5..d16be0cb0dc7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c</a></div><div class='hunk'>@@ -1,10 +1,10 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mt76x02_eeprom.h"</div><div class='ctx'> </div><div class='hunk'>@@ -131,15 +131,8 @@ u8 mt76x02_get_lna_gain(struct mt76x02_dev *dev,</div><div class='ctx'> 			s8 *lna_2g, s8 *lna_5g,</div><div class='ctx'> 			struct ieee80211_channel *chan)</div><div class='ctx'> {</div><div class='del'>-	u16 val;</div><div class='ctx'> 	u8 lna;</div><div class='ctx'> </div><div class='del'>-	val = mt76x02_eeprom_get(dev, MT_EE_NIC_CONF_1);</div><div class='del'>-	if (val &amp; MT_EE_NIC_CONF_1_LNA_EXT_2G)</div><div class='del'>-		*lna_2g = 0;</div><div class='del'>-	if (val &amp; MT_EE_NIC_CONF_1_LNA_EXT_5G)</div><div class='del'>-		memset(lna_5g, 0, sizeof(s8) * 3);</div><div class='del'>-</div><div class='ctx'> 	if (chan-&gt;band == NL80211_BAND_2GHZ)</div><div class='ctx'> 		lna = *lna_2g;</div><div class='ctx'> 	else if (chan-&gt;hw_value &lt;= 64)</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h b/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h<br/>index 99941a4700f3..3cbb2977f375 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='hunk'>@@ -62,8 +62,6 @@ enum mt76x02_eeprom_field {</div><div class='ctx'> 	MT_EE_TX_POWER_HT_MCS4 =		0x0a8,</div><div class='ctx'> 	MT_EE_TX_POWER_HT_MCS8 =		0x0aa,</div><div class='ctx'> 	MT_EE_TX_POWER_HT_MCS12 =		0x0ac,</div><div class='del'>-	MT_EE_TX_POWER_VHT_MCS0 =		0x0ba,</div><div class='del'>-	MT_EE_TX_POWER_VHT_MCS4 =		0x0bc,</div><div class='ctx'> 	MT_EE_TX_POWER_VHT_MCS8 =		0x0be,</div><div class='ctx'> </div><div class='ctx'> 	MT_EE_2G_TARGET_POWER =			0x0d0,</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c<br/>index 0da37867cb64..14ee5b3b94d3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_mac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02_mac.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  * Copyright (C) 2018 Stanislaw Gruszka &lt;stf_xl@wp.pl&gt;</div><div class='hunk'>@@ -25,7 +25,7 @@ void mt76x02_mac_reset_counters(struct mt76x02_dev *dev)</div><div class='ctx'> 	for (i = 0; i &lt; 16; i++)</div><div class='ctx'> 		mt76_rr(dev, MT_TX_STAT_FIFO);</div><div class='ctx'> </div><div class='del'>-	memset(dev-&gt;mt76.aggr_stats, 0, sizeof(dev-&gt;mt76.aggr_stats));</div><div class='add'>+	memset(dev-&gt;mphy.aggr_stats, 0, sizeof(dev-&gt;mphy.aggr_stats));</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02_mac_reset_counters);</div><div class='ctx'> </div><div class='hunk'>@@ -34,24 +34,24 @@ mt76x02_mac_get_key_info(struct ieee80211_key_conf *key, u8 *key_data)</div><div class='ctx'> {</div><div class='ctx'> 	memset(key_data, 0, 32);</div><div class='ctx'> 	if (!key)</div><div class='del'>-		return MT_CIPHER_NONE;</div><div class='add'>+		return MT76X02_CIPHER_NONE;</div><div class='ctx'> </div><div class='ctx'> 	if (key-&gt;keylen &gt; 32)</div><div class='del'>-		return MT_CIPHER_NONE;</div><div class='add'>+		return MT76X02_CIPHER_NONE;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(key_data, key-&gt;key, key-&gt;keylen);</div><div class='ctx'> </div><div class='ctx'> 	switch (key-&gt;cipher) {</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_WEP40:</div><div class='del'>-		return MT_CIPHER_WEP40;</div><div class='add'>+		return MT76X02_CIPHER_WEP40;</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_WEP104:</div><div class='del'>-		return MT_CIPHER_WEP104;</div><div class='add'>+		return MT76X02_CIPHER_WEP104;</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_TKIP:</div><div class='del'>-		return MT_CIPHER_TKIP;</div><div class='add'>+		return MT76X02_CIPHER_TKIP;</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_CCMP:</div><div class='del'>-		return MT_CIPHER_AES_CCMP;</div><div class='add'>+		return MT76X02_CIPHER_AES_CCMP;</div><div class='ctx'> 	default:</div><div class='del'>-		return MT_CIPHER_NONE;</div><div class='add'>+		return MT76X02_CIPHER_NONE;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -63,7 +63,7 @@ int mt76x02_mac_shared_key_setup(struct mt76x02_dev *dev, u8 vif_idx,</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	cipher = mt76x02_mac_get_key_info(key, key_data);</div><div class='del'>-	if (cipher == MT_CIPHER_NONE &amp;&amp; key)</div><div class='add'>+	if (cipher == MT76X02_CIPHER_NONE &amp;&amp; key)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	val = mt76_rr(dev, MT_SKEY_MODE(vif_idx));</div><div class='hunk'>@@ -91,10 +91,10 @@ void mt76x02_mac_wcid_sync_pn(struct mt76x02_dev *dev, u8 idx,</div><div class='ctx'> 	eiv = mt76_rr(dev, MT_WCID_IV(idx) + 4);</div><div class='ctx'> </div><div class='ctx'> 	pn = (u64)eiv &lt;&lt; 16;</div><div class='del'>-	if (cipher == MT_CIPHER_TKIP) {</div><div class='add'>+	if (cipher == MT76X02_CIPHER_TKIP) {</div><div class='ctx'> 		pn |= (iv &gt;&gt; 16) &amp; 0xff;</div><div class='ctx'> 		pn |= (iv &amp; 0xff) &lt;&lt; 8;</div><div class='del'>-	} else if (cipher &gt;= MT_CIPHER_AES_CCMP) {</div><div class='add'>+	} else if (cipher &gt;= MT76X02_CIPHER_AES_CCMP) {</div><div class='ctx'> 		pn |= iv &amp; 0xffff;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -112,7 +112,7 @@ int mt76x02_mac_wcid_set_key(struct mt76x02_dev *dev, u8 idx,</div><div class='ctx'> 	u64 pn;</div><div class='ctx'> </div><div class='ctx'> 	cipher = mt76x02_mac_get_key_info(key, key_data);</div><div class='del'>-	if (cipher == MT_CIPHER_NONE &amp;&amp; key)</div><div class='add'>+	if (cipher == MT76X02_CIPHER_NONE &amp;&amp; key)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	mt76_wr_copy(dev, MT_WCID_KEY(idx), key_data, sizeof(key_data));</div><div class='hunk'>@@ -126,16 +126,16 @@ int mt76x02_mac_wcid_set_key(struct mt76x02_dev *dev, u8 idx,</div><div class='ctx'> 		pn = atomic64_read(&amp;key-&gt;tx_pn);</div><div class='ctx'> </div><div class='ctx'> 		iv_data[3] = key-&gt;keyidx &lt;&lt; 6;</div><div class='del'>-		if (cipher &gt;= MT_CIPHER_TKIP) {</div><div class='add'>+		if (cipher &gt;= MT76X02_CIPHER_TKIP) {</div><div class='ctx'> 			iv_data[3] |= 0x20;</div><div class='ctx'> 			put_unaligned_le32(pn &gt;&gt; 16, &amp;iv_data[4]);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (cipher == MT_CIPHER_TKIP) {</div><div class='add'>+		if (cipher == MT76X02_CIPHER_TKIP) {</div><div class='ctx'> 			iv_data[0] = (pn &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 			iv_data[1] = (iv_data[0] | 0x20) &amp; 0x7f;</div><div class='ctx'> 			iv_data[2] = pn &amp; 0xff;</div><div class='del'>-		} else if (cipher &gt;= MT_CIPHER_AES_CCMP) {</div><div class='add'>+		} else if (cipher &gt;= MT76X02_CIPHER_AES_CCMP) {</div><div class='ctx'> 			put_unaligned_le16((pn &amp; 0xffff), &amp;iv_data[0]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -176,7 +176,7 @@ void mt76x02_mac_wcid_set_drop(struct mt76x02_dev *dev, u8 idx, bool drop)</div><div class='ctx'> 		mt76_wr(dev, MT_WCID_DROP(idx), (val &amp; ~bit) | (bit * drop));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __le16</div><div class='add'>+static u16</div><div class='ctx'> mt76x02_mac_tx_rate_val(struct mt76x02_dev *dev,</div><div class='ctx'> 			const struct ieee80211_tx_rate *rate, u8 *nss_val)</div><div class='ctx'> {</div><div class='hunk'>@@ -222,14 +222,14 @@ mt76x02_mac_tx_rate_val(struct mt76x02_dev *dev,</div><div class='ctx'> 		rateval |= MT_RXWI_RATE_SGI;</div><div class='ctx'> </div><div class='ctx'> 	*nss_val = nss;</div><div class='del'>-	return cpu_to_le16(rateval);</div><div class='add'>+	return rateval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt76x02_mac_wcid_set_rate(struct mt76x02_dev *dev, struct mt76_wcid *wcid,</div><div class='ctx'> 			       const struct ieee80211_tx_rate *rate)</div><div class='ctx'> {</div><div class='ctx'> 	s8 max_txpwr_adj = mt76x02_tx_get_max_txpwr_adj(dev, rate);</div><div class='del'>-	__le16 rateval;</div><div class='add'>+	u16 rateval;</div><div class='ctx'> 	u32 tx_info;</div><div class='ctx'> 	s8 nss;</div><div class='ctx'> </div><div class='hunk'>@@ -342,7 +342,7 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,</div><div class='ctx'> 	struct ieee80211_key_conf *key = info-&gt;control.hw_key;</div><div class='ctx'> 	u32 wcid_tx_info;</div><div class='ctx'> 	u16 rate_ht_mask = FIELD_PREP(MT_RXWI_RATE_PHY, BIT(1) | BIT(2));</div><div class='del'>-	u16 txwi_flags = 0;</div><div class='add'>+	u16 txwi_flags = 0, rateval;</div><div class='ctx'> 	u8 nss;</div><div class='ctx'> 	s8 txpwr_adj, max_txpwr_adj;</div><div class='ctx'> 	u8 ccmp_pn[8], nstreams = dev-&gt;mphy.chainmask &amp; 0xf;</div><div class='hunk'>@@ -380,14 +380,15 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,</div><div class='ctx'> </div><div class='ctx'> 	if (wcid &amp;&amp; (rate-&gt;idx &lt; 0 || !rate-&gt;count)) {</div><div class='ctx'> 		wcid_tx_info = wcid-&gt;tx_info;</div><div class='del'>-		txwi-&gt;rate = FIELD_GET(MT_WCID_TX_INFO_RATE, wcid_tx_info);</div><div class='add'>+		rateval = FIELD_GET(MT_WCID_TX_INFO_RATE, wcid_tx_info);</div><div class='ctx'> 		max_txpwr_adj = FIELD_GET(MT_WCID_TX_INFO_TXPWR_ADJ,</div><div class='ctx'> 					  wcid_tx_info);</div><div class='ctx'> 		nss = FIELD_GET(MT_WCID_TX_INFO_NSS, wcid_tx_info);</div><div class='ctx'> 	} else {</div><div class='del'>-		txwi-&gt;rate = mt76x02_mac_tx_rate_val(dev, rate, &amp;nss);</div><div class='add'>+		rateval = mt76x02_mac_tx_rate_val(dev, rate, &amp;nss);</div><div class='ctx'> 		max_txpwr_adj = mt76x02_tx_get_max_txpwr_adj(dev, rate);</div><div class='ctx'> 	}</div><div class='add'>+	txwi-&gt;rate = cpu_to_le16(rateval);</div><div class='ctx'> </div><div class='ctx'> 	txpwr_adj = mt76x02_tx_get_txpwr_adj(dev, dev-&gt;txpower_conf,</div><div class='ctx'> 					     max_txpwr_adj);</div><div class='hunk'>@@ -403,7 +404,7 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,</div><div class='ctx'> 		txwi-&gt;rate |= cpu_to_le16(MT_RXWI_RATE_LDPC);</div><div class='ctx'> 	if ((info-&gt;flags &amp; IEEE80211_TX_CTL_STBC) &amp;&amp; nss == 1)</div><div class='ctx'> 		txwi-&gt;rate |= cpu_to_le16(MT_RXWI_RATE_STBC);</div><div class='del'>-	if (nss &gt; 1 &amp;&amp; sta &amp;&amp; sta-&gt;smps_mode == IEEE80211_SMPS_DYNAMIC)</div><div class='add'>+	if (nss &gt; 1 &amp;&amp; sta &amp;&amp; sta-&gt;deflink.smps_mode == IEEE80211_SMPS_DYNAMIC)</div><div class='ctx'> 		txwi_flags |= MT_TXWI_FLAGS_MMPS;</div><div class='ctx'> 	if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK))</div><div class='ctx'> 		txwi-&gt;ack_ctl |= MT_TXWI_ACK_CTL_REQ;</div><div class='hunk'>@@ -411,9 +412,9 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,</div><div class='ctx'> 		txwi-&gt;ack_ctl |= MT_TXWI_ACK_CTL_NSEQ;</div><div class='ctx'> 	if ((info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU) &amp;&amp; sta) {</div><div class='ctx'> 		u8 ba_size = IEEE80211_MIN_AMPDU_BUF;</div><div class='del'>-		u8 ampdu_density = sta-&gt;ht_cap.ampdu_density;</div><div class='add'>+		u8 ampdu_density = sta-&gt;deflink.ht_cap.ampdu_density;</div><div class='ctx'> </div><div class='del'>-		ba_size &lt;&lt;= sta-&gt;ht_cap.ampdu_factor;</div><div class='add'>+		ba_size &lt;&lt;= sta-&gt;deflink.ht_cap.ampdu_factor;</div><div class='ctx'> 		ba_size = min_t(int, 63, ba_size - 1);</div><div class='ctx'> 		if (info-&gt;flags &amp; IEEE80211_TX_CTL_RATE_CTRL_PROBE)</div><div class='ctx'> 			ba_size = 0;</div><div class='hunk'>@@ -563,9 +564,7 @@ void mt76x02_send_tx_status(struct mt76x02_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-	if (stat-&gt;wcid &lt; MT76x02_N_WCIDS)</div><div class='del'>-		wcid = rcu_dereference(dev-&gt;mt76.wcid[stat-&gt;wcid]);</div><div class='del'>-</div><div class='add'>+	wcid = mt76_wcid_ptr(dev, stat-&gt;wcid);</div><div class='ctx'> 	if (wcid &amp;&amp; wcid-&gt;sta) {</div><div class='ctx'> 		void *priv;</div><div class='ctx'> </div><div class='hunk'>@@ -630,8 +629,11 @@ void mt76x02_send_tx_status(struct mt76x02_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 	mt76_tx_status_unlock(mdev, &amp;list);</div><div class='ctx'> </div><div class='del'>-	if (!status.skb)</div><div class='add'>+	if (!status.skb) {</div><div class='add'>+		spin_lock_bh(&amp;dev-&gt;mt76.rx_lock);</div><div class='ctx'> 		ieee80211_tx_status_ext(mt76_hw(dev), &amp;status);</div><div class='add'>+		spin_unlock_bh(&amp;dev-&gt;mt76.rx_lock);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!len)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -849,7 +851,8 @@ int mt76x02_mac_process_rx(struct mt76x02_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 	if (WARN_ON_ONCE(len &gt; skb-&gt;len))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	pskb_trim(skb, len);</div><div class='add'>+	if (pskb_trim(skb, len))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	status-&gt;chains = BIT(0);</div><div class='ctx'> 	signal = mt76x02_mac_get_rssi(dev, rxwi-&gt;rssi[0], 0);</div><div class='hunk'>@@ -859,9 +862,7 @@ int mt76x02_mac_process_rx(struct mt76x02_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 		status-&gt;chain_signal[1] = mt76x02_mac_get_rssi(dev,</div><div class='ctx'> 							       rxwi-&gt;rssi[1],</div><div class='ctx'> 							       1);</div><div class='del'>-		signal = max_t(s8, signal, status-&gt;chain_signal[1]);</div><div class='ctx'> 	}</div><div class='del'>-	status-&gt;signal = signal;</div><div class='ctx'> 	status-&gt;freq = dev-&gt;mphy.chandef.chan-&gt;center_freq;</div><div class='ctx'> 	status-&gt;band = dev-&gt;mphy.chandef.chan-&gt;band;</div><div class='ctx'> </div><div class='hunk'>@@ -1022,12 +1023,12 @@ void mt76x02_mac_set_tx_protection(struct mt76x02_dev *dev, bool legacy_prot,</div><div class='ctx'> 		mt76_wr(dev, MT_TX_PROT_CFG6 + i * 4, vht_prot[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt76x02_update_channel(struct mt76_dev *mdev)</div><div class='add'>+void mt76x02_update_channel(struct mt76_phy *mphy)</div><div class='ctx'> {</div><div class='del'>-	struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);</div><div class='add'>+	struct mt76x02_dev *dev = container_of(mphy-&gt;dev, struct mt76x02_dev, mt76);</div><div class='ctx'> 	struct mt76_channel_state *state;</div><div class='ctx'> </div><div class='del'>-	state = mdev-&gt;phy.chan_state;</div><div class='add'>+	state = mphy-&gt;chan_state;</div><div class='ctx'> 	state-&gt;cc_busy += mt76_rr(dev, MT_CH_BUSY);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;dev-&gt;mt76.cc_lock);</div><div class='hunk'>@@ -1039,15 +1040,34 @@ EXPORT_SYMBOL_GPL(mt76x02_update_channel);</div><div class='ctx'> </div><div class='ctx'> static void mt76x02_check_mac_err(struct mt76x02_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	u32 val = mt76_rr(dev, 0x10f4);</div><div class='add'>+	if (dev-&gt;mt76.beacon_mask) {</div><div class='add'>+		if (mt76_rr(dev, MT_TX_STA_0) &amp; MT_TX_STA_0_BEACONS) {</div><div class='add'>+			dev-&gt;beacon_hang_check = 0;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (!(val &amp; BIT(29)) || !(val &amp; (BIT(7) | BIT(5))))</div><div class='del'>-		return;</div><div class='add'>+		if (dev-&gt;beacon_hang_check &lt; 10)</div><div class='add'>+			return;</div><div class='ctx'> </div><div class='del'>-	dev_err(dev-&gt;mt76.dev, "mac specific condition occurred\n");</div><div class='add'>+	} else {</div><div class='add'>+		u32 val = mt76_rr(dev, 0x10f4);</div><div class='add'>+		if (!(val &amp; BIT(29)) || !(val &amp; (BIT(7) | BIT(5))))</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	dev_err(dev-&gt;mt76.dev, "MAC error detected\n");</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_MAC_SYS_CTRL, 0);</div><div class='add'>+	if (!mt76x02_wait_for_txrx_idle(&amp;dev-&gt;mt76)) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "MAC stop failed\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;beacon_hang_check = 0;</div><div class='ctx'> 	mt76_set(dev, MT_MAC_SYS_CTRL, MT_MAC_SYS_CTRL_RESET_CSR);</div><div class='ctx'> 	udelay(10);</div><div class='add'>+</div><div class='add'>+out:</div><div class='ctx'> 	mt76_wr(dev, MT_MAC_SYS_CTRL,</div><div class='ctx'> 		MT_MAC_SYS_CTRL_ENABLE_TX | MT_MAC_SYS_CTRL_ENABLE_RX);</div><div class='ctx'> }</div><div class='hunk'>@@ -1169,23 +1189,22 @@ void mt76x02_mac_work(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='del'>-	mt76_update_survey(&amp;dev-&gt;mt76);</div><div class='add'>+	mt76_update_survey(&amp;dev-&gt;mphy);</div><div class='ctx'> 	for (i = 0, idx = 0; i &lt; 16; i++) {</div><div class='ctx'> 		u32 val = mt76_rr(dev, MT_TX_AGG_CNT(i));</div><div class='ctx'> </div><div class='del'>-		dev-&gt;mt76.aggr_stats[idx++] += val &amp; 0xffff;</div><div class='del'>-		dev-&gt;mt76.aggr_stats[idx++] += val &gt;&gt; 16;</div><div class='add'>+		dev-&gt;mphy.aggr_stats[idx++] += val &amp; 0xffff;</div><div class='add'>+		dev-&gt;mphy.aggr_stats[idx++] += val &gt;&gt; 16;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;mt76.beacon_mask)</div><div class='del'>-		mt76x02_check_mac_err(dev);</div><div class='add'>+	mt76x02_check_mac_err(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;ed_monitor)</div><div class='ctx'> 		mt76x02_edcca_check(dev);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='del'>-	mt76_tx_status_check(&amp;dev-&gt;mt76, NULL, false);</div><div class='add'>+	mt76_tx_status_check(&amp;dev-&gt;mt76, false);</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_queue_delayed_work(mt76_hw(dev), &amp;dev-&gt;mphy.mac_work,</div><div class='ctx'> 				     MT_MAC_WORK_INTERVAL);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h<br/>index 0cfbaca50210..778454ac8974 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_mac.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02_mac.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  * Copyright (C) 2018 Stanislaw Gruszka &lt;stf_xl@wp.pl&gt;</div><div class='hunk'>@@ -195,7 +195,7 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,</div><div class='ctx'> 			    struct ieee80211_sta *sta, int len);</div><div class='ctx'> void mt76x02_mac_poll_tx_status(struct mt76x02_dev *dev, bool irq);</div><div class='ctx'> void mt76x02_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e);</div><div class='del'>-void mt76x02_update_channel(struct mt76_dev *mdev);</div><div class='add'>+void mt76x02_update_channel(struct mt76_phy *mphy);</div><div class='ctx'> void mt76x02_mac_work(struct work_struct *work);</div><div class='ctx'> </div><div class='ctx'> void mt76x02_mac_cc_reset(struct mt76x02_dev *dev);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c<br/>index 75978820a260..e16f06a284ca 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.h<br/>index e187ed52968e..a422cdc520cb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_mcu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02_mcu.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c<br/>index b50084bbe83d..dd71c1c95cc9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='hunk'>@@ -16,13 +16,17 @@ static void mt76x02_pre_tbtt_tasklet(struct tasklet_struct *t)</div><div class='ctx'> 	struct mt76x02_dev *dev = from_tasklet(dev, t, mt76.pre_tbtt_tasklet);</div><div class='ctx'> 	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='ctx'> 	struct mt76_queue *q = dev-&gt;mphy.q_tx[MT_TXQ_PSD];</div><div class='del'>-	struct beacon_bc_data data = {};</div><div class='add'>+	struct beacon_bc_data data = {</div><div class='add'>+		.dev = dev,</div><div class='add'>+	};</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (mt76_hw(dev)-&gt;conf.flags &amp; IEEE80211_CONF_OFFCHANNEL)</div><div class='add'>+	if (dev-&gt;mphy.offchannel)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	__skb_queue_head_init(&amp;data.q);</div><div class='add'>+</div><div class='ctx'> 	mt76x02_resync_beacon_timer(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Prevent corrupt transmissions during update */</div><div class='hunk'>@@ -31,7 +35,10 @@ static void mt76x02_pre_tbtt_tasklet(struct tasklet_struct *t)</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev),</div><div class='ctx'> 		IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='del'>-		mt76x02_update_beacon_iter, dev);</div><div class='add'>+		mt76x02_update_beacon_iter, &amp;data);</div><div class='add'>+</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;data.q)) != NULL)</div><div class='add'>+		mt76x02_mac_set_beacon(dev, skb);</div><div class='ctx'> </div><div class='ctx'> 	mt76_wr(dev, MT_BCN_BYPASS_MASK,</div><div class='ctx'> 		0xff00 | ~(0xff00 &gt;&gt; dev-&gt;beacon_data_count));</div><div class='hunk'>@@ -53,15 +60,16 @@ static void mt76x02_pre_tbtt_tasklet(struct tasklet_struct *t)</div><div class='ctx'> 		mt76_skb_set_moredata(data.tail[i], false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;q-&gt;lock);</div><div class='add'>+	spin_lock(&amp;q-&gt;lock);</div><div class='ctx'> 	while ((skb = __skb_dequeue(&amp;data.q)) != NULL) {</div><div class='ctx'> 		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='ctx'> 		struct ieee80211_vif *vif = info-&gt;control.vif;</div><div class='ctx'> 		struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif-&gt;drv_priv;</div><div class='ctx'> </div><div class='del'>-		mt76_tx_queue_skb(dev, q, skb, &amp;mvif-&gt;group_wcid, NULL);</div><div class='add'>+		mt76_tx_queue_skb(dev, q, MT_TXQ_PSD, skb, &amp;mvif-&gt;group_wcid,</div><div class='add'>+				  NULL);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;q-&gt;lock);</div><div class='add'>+	spin_unlock(&amp;q-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mt76x02e_pre_tbtt_enable(struct mt76x02_dev *dev, bool en)</div><div class='hunk'>@@ -166,7 +174,6 @@ static int mt76x02_poll_tx(struct napi_struct *napi, int budget)</div><div class='ctx'> </div><div class='ctx'> int mt76x02_dma_init(struct mt76x02_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_txwi_cache __maybe_unused *t;</div><div class='ctx'> 	int i, ret, fifo_size;</div><div class='ctx'> 	struct mt76_queue *q;</div><div class='ctx'> 	void *status_fifo;</div><div class='hunk'>@@ -191,13 +198,14 @@ int mt76x02_dma_init(struct mt76x02_dev *dev)</div><div class='ctx'> 	for (i = 0; i &lt; IEEE80211_NUM_ACS; i++) {</div><div class='ctx'> 		ret = mt76_init_tx_queue(&amp;dev-&gt;mphy, i, mt76_ac_to_hwq(i),</div><div class='ctx'> 					 MT76x02_TX_RING_SIZE,</div><div class='del'>-					 MT_TX_RING_BASE);</div><div class='add'>+					 MT_TX_RING_BASE, NULL, 0);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = mt76_init_tx_queue(&amp;dev-&gt;mphy, MT_TXQ_PSD, MT_TX_HW_QUEUE_MGMT,</div><div class='del'>-				 MT76x02_PSD_RING_SIZE, MT_TX_RING_BASE);</div><div class='add'>+				 MT76x02_PSD_RING_SIZE, MT_TX_RING_BASE,</div><div class='add'>+				 NULL, 0);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -230,8 +238,8 @@ int mt76x02_dma_init(struct mt76x02_dev *dev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	netif_tx_napi_add(&amp;dev-&gt;mt76.tx_napi_dev, &amp;dev-&gt;mt76.tx_napi,</div><div class='del'>-			  mt76x02_poll_tx, NAPI_POLL_WEIGHT);</div><div class='add'>+	netif_napi_add_tx(dev-&gt;mt76.tx_napi_dev, &amp;dev-&gt;mt76.tx_napi,</div><div class='add'>+			  mt76x02_poll_tx);</div><div class='ctx'> 	napi_enable(&amp;dev-&gt;mt76.tx_napi);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -348,18 +356,20 @@ static bool mt76x02_tx_hang(struct mt76x02_dev *dev)</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='ctx'> 		q = dev-&gt;mphy.q_tx[i];</div><div class='ctx'> </div><div class='del'>-		if (!q-&gt;queued)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='ctx'> 		prev_dma_idx = dev-&gt;mt76.tx_dma_idx[i];</div><div class='ctx'> 		dma_idx = readl(&amp;q-&gt;regs-&gt;dma_idx);</div><div class='ctx'> 		dev-&gt;mt76.tx_dma_idx[i] = dma_idx;</div><div class='ctx'> </div><div class='del'>-		if (prev_dma_idx == dma_idx)</div><div class='del'>-			break;</div><div class='add'>+		if (!q-&gt;queued || prev_dma_idx != dma_idx) {</div><div class='add'>+			dev-&gt;tx_hang_check[i] = 0;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (++dev-&gt;tx_hang_check[i] &gt;= MT_TX_HANG_TH)</div><div class='add'>+			return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return i &lt; 4;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mt76x02_key_sync(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='hunk'>@@ -412,7 +422,7 @@ static void mt76x02_reset_state(struct mt76x02_dev *dev)</div><div class='ctx'> 		priv = msta-&gt;vif;</div><div class='ctx'> 		vif = container_of(priv, struct ieee80211_vif, drv_priv);</div><div class='ctx'> </div><div class='del'>-		__mt76_sta_remove(&amp;dev-&gt;mt76, vif, sta);</div><div class='add'>+		__mt76_sta_remove(&amp;dev-&gt;mphy, vif, sta);</div><div class='ctx'> 		memset(msta, 0, sizeof(*msta));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -472,7 +482,7 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)</div><div class='ctx'> 		mt76_queue_rx_reset(dev, i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mt76_tx_status_check(&amp;dev-&gt;mt76, NULL, true);</div><div class='add'>+	mt76_tx_status_check(&amp;dev-&gt;mt76, true);</div><div class='ctx'> </div><div class='ctx'> 	mt76x02_mac_start(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -491,15 +501,19 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)</div><div class='ctx'> 	clear_bit(MT76_RESET, &amp;dev-&gt;mphy.state);</div><div class='ctx'> </div><div class='ctx'> 	mt76_worker_enable(&amp;dev-&gt;mt76.tx_worker);</div><div class='del'>-	napi_enable(&amp;dev-&gt;mt76.tx_napi);</div><div class='del'>-	napi_schedule(&amp;dev-&gt;mt76.tx_napi);</div><div class='del'>-</div><div class='ctx'> 	tasklet_enable(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='ctx'> </div><div class='add'>+	napi_enable(&amp;dev-&gt;mt76.tx_napi);</div><div class='ctx'> 	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i) {</div><div class='ctx'> 		napi_enable(&amp;dev-&gt;mt76.napi[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	napi_schedule(&amp;dev-&gt;mt76.tx_napi);</div><div class='add'>+	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i) {</div><div class='ctx'> 		napi_schedule(&amp;dev-&gt;mt76.napi[i]);</div><div class='ctx'> 	}</div><div class='add'>+	local_bh_enable();</div><div class='ctx'> </div><div class='ctx'> 	if (restart) {</div><div class='ctx'> 		set_bit(MT76_RESTART, &amp;dev-&gt;mphy.state);</div><div class='hunk'>@@ -528,23 +542,13 @@ static void mt76x02_check_tx_hang(struct mt76x02_dev *dev)</div><div class='ctx'> 	if (test_bit(MT76_RESTART, &amp;dev-&gt;mphy.state))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (mt76x02_tx_hang(dev)) {</div><div class='del'>-		if (++dev-&gt;tx_hang_check &gt;= MT_TX_HANG_TH)</div><div class='del'>-			goto restart;</div><div class='del'>-	} else {</div><div class='del'>-		dev-&gt;tx_hang_check = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;mcu_timeout)</div><div class='del'>-		goto restart;</div><div class='del'>-</div><div class='del'>-	return;</div><div class='add'>+	if (!mt76x02_tx_hang(dev) &amp;&amp; !dev-&gt;mcu_timeout)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-restart:</div><div class='ctx'> 	mt76x02_watchdog_reset(dev);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;tx_hang_reset++;</div><div class='del'>-	dev-&gt;tx_hang_check = 0;</div><div class='add'>+	memset(dev-&gt;tx_hang_check, 0, sizeof(dev-&gt;tx_hang_check));</div><div class='ctx'> 	memset(dev-&gt;mt76.tx_dma_idx, 0xff,</div><div class='ctx'> 	       sizeof(dev-&gt;mt76.tx_dma_idx));</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c b/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c<br/>index 2e53b0c1afdd..557380c9bfab 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_phy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02_phy.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='hunk'>@@ -59,7 +59,7 @@ mt76x02_tx_power_mask(u8 v1, u8 v2, u8 v3, u8 v4)</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt76x02_get_max_rate_power(struct mt76_rate_power *r)</div><div class='add'>+int mt76x02_get_max_rate_power(struct mt76x02_rate_power *r)</div><div class='ctx'> {</div><div class='ctx'> 	s8 ret = 0;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -71,7 +71,7 @@ int mt76x02_get_max_rate_power(struct mt76_rate_power *r)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02_get_max_rate_power);</div><div class='ctx'> </div><div class='del'>-void mt76x02_limit_rate_power(struct mt76_rate_power *r, int limit)</div><div class='add'>+void mt76x02_limit_rate_power(struct mt76x02_rate_power *r, int limit)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -81,7 +81,7 @@ void mt76x02_limit_rate_power(struct mt76_rate_power *r, int limit)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02_limit_rate_power);</div><div class='ctx'> </div><div class='del'>-void mt76x02_add_rate_power_offset(struct mt76_rate_power *r, int offset)</div><div class='add'>+void mt76x02_add_rate_power_offset(struct mt76x02_rate_power *r, int offset)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -92,7 +92,7 @@ EXPORT_SYMBOL_GPL(mt76x02_add_rate_power_offset);</div><div class='ctx'> </div><div class='ctx'> void mt76x02_phy_set_txpower(struct mt76x02_dev *dev, int txp_0, int txp_1)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_rate_power *t = &amp;dev-&gt;mt76.rate_power;</div><div class='add'>+	struct mt76x02_rate_power *t = &amp;dev-&gt;rate_power;</div><div class='ctx'> </div><div class='ctx'> 	mt76_rmw_field(dev, MT_TX_ALC_CFG_0, MT_TX_ALC_CFG_0_CH_INIT_0, txp_0);</div><div class='ctx'> 	mt76_rmw_field(dev, MT_TX_ALC_CFG_0, MT_TX_ALC_CFG_0_CH_INIT_1, txp_1);</div><div class='hunk'>@@ -107,17 +107,17 @@ void mt76x02_phy_set_txpower(struct mt76x02_dev *dev, int txp_0, int txp_1)</div><div class='ctx'> 		mt76x02_tx_power_mask(t-&gt;ht[4], t-&gt;ht[6], t-&gt;ht[8],</div><div class='ctx'> 				      t-&gt;ht[10]));</div><div class='ctx'> 	mt76_wr(dev, MT_TX_PWR_CFG_3,</div><div class='del'>-		mt76x02_tx_power_mask(t-&gt;ht[12], t-&gt;ht[14], t-&gt;stbc[0],</div><div class='del'>-				      t-&gt;stbc[2]));</div><div class='add'>+		mt76x02_tx_power_mask(t-&gt;ht[12], t-&gt;ht[14], t-&gt;ht[0],</div><div class='add'>+				      t-&gt;ht[2]));</div><div class='ctx'> 	mt76_wr(dev, MT_TX_PWR_CFG_4,</div><div class='del'>-		mt76x02_tx_power_mask(t-&gt;stbc[4], t-&gt;stbc[6], 0, 0));</div><div class='add'>+		mt76x02_tx_power_mask(t-&gt;ht[4], t-&gt;ht[6], 0, 0));</div><div class='ctx'> 	mt76_wr(dev, MT_TX_PWR_CFG_7,</div><div class='del'>-		mt76x02_tx_power_mask(t-&gt;ofdm[7], t-&gt;vht[8], t-&gt;ht[7],</div><div class='del'>-				      t-&gt;vht[9]));</div><div class='add'>+		mt76x02_tx_power_mask(t-&gt;ofdm[7], t-&gt;vht[0], t-&gt;ht[7],</div><div class='add'>+				      t-&gt;vht[1]));</div><div class='ctx'> 	mt76_wr(dev, MT_TX_PWR_CFG_8,</div><div class='del'>-		mt76x02_tx_power_mask(t-&gt;ht[14], 0, t-&gt;vht[8], t-&gt;vht[9]));</div><div class='add'>+		mt76x02_tx_power_mask(t-&gt;ht[14], 0, t-&gt;vht[0], t-&gt;vht[1]));</div><div class='ctx'> 	mt76_wr(dev, MT_TX_PWR_CFG_9,</div><div class='del'>-		mt76x02_tx_power_mask(t-&gt;ht[7], 0, t-&gt;stbc[8], t-&gt;stbc[9]));</div><div class='add'>+		mt76x02_tx_power_mask(t-&gt;ht[7], 0, t-&gt;vht[0], t-&gt;vht[1]));</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02_phy_set_txpower);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_phy.h b/drivers/net/wireless/mediatek/mt76/mt76x02_phy.h<br/>index 1def25bf735a..09e8edee2195 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_phy.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_phy.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_phy.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02_phy.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -34,10 +34,10 @@ mt76x02_get_low_rssi_gain_thresh(struct mt76x02_dev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt76x02_add_rate_power_offset(struct mt76_rate_power *r, int offset);</div><div class='add'>+void mt76x02_add_rate_power_offset(struct mt76x02_rate_power *r, int offset);</div><div class='ctx'> void mt76x02_phy_set_txpower(struct mt76x02_dev *dev, int txp_0, int txp_2);</div><div class='del'>-void mt76x02_limit_rate_power(struct mt76_rate_power *r, int limit);</div><div class='del'>-int mt76x02_get_max_rate_power(struct mt76_rate_power *r);</div><div class='add'>+void mt76x02_limit_rate_power(struct mt76x02_rate_power *r, int limit);</div><div class='add'>+int mt76x02_get_max_rate_power(struct mt76x02_rate_power *r);</div><div class='ctx'> void mt76x02_phy_set_rxpath(struct mt76x02_dev *dev);</div><div class='ctx'> void mt76x02_phy_set_txdac(struct mt76x02_dev *dev);</div><div class='ctx'> void mt76x02_phy_set_bw(struct mt76x02_dev *dev, int width, u8 ctrl);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h b/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h<br/>index 3e722276b5c2..e87d3f8a1de9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_regs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02_regs.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -571,6 +571,8 @@</div><div class='ctx'> #define MT_RX_STAT_2_OVERFLOW_ERRORS	GENMASK(31, 16)</div><div class='ctx'> </div><div class='ctx'> #define MT_TX_STA_0			0x170c</div><div class='add'>+#define MT_TX_STA_0_BEACONS		GENMASK(31, 16)</div><div class='add'>+</div><div class='ctx'> #define MT_TX_STA_1			0x1710</div><div class='ctx'> #define MT_TX_STA_2			0x1714</div><div class='ctx'> </div><div class='hunk'>@@ -692,15 +694,15 @@ struct mt76_wcid_key {</div><div class='ctx'> } __packed __aligned(4);</div><div class='ctx'> </div><div class='ctx'> enum mt76x02_cipher_type {</div><div class='del'>-	MT_CIPHER_NONE,</div><div class='del'>-	MT_CIPHER_WEP40,</div><div class='del'>-	MT_CIPHER_WEP104,</div><div class='del'>-	MT_CIPHER_TKIP,</div><div class='del'>-	MT_CIPHER_AES_CCMP,</div><div class='del'>-	MT_CIPHER_CKIP40,</div><div class='del'>-	MT_CIPHER_CKIP104,</div><div class='del'>-	MT_CIPHER_CKIP128,</div><div class='del'>-	MT_CIPHER_WAPI,</div><div class='add'>+	MT76X02_CIPHER_NONE,</div><div class='add'>+	MT76X02_CIPHER_WEP40,</div><div class='add'>+	MT76X02_CIPHER_WEP104,</div><div class='add'>+	MT76X02_CIPHER_TKIP,</div><div class='add'>+	MT76X02_CIPHER_AES_CCMP,</div><div class='add'>+	MT76X02_CIPHER_CKIP40,</div><div class='add'>+	MT76X02_CIPHER_CKIP104,</div><div class='add'>+	MT76X02_CIPHER_CKIP128,</div><div class='add'>+	MT76X02_CIPHER_WAPI,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_trace.c b/drivers/net/wireless/mediatek/mt76/mt76x02_trace.c<br/>index a812c3a1e258..a92b2b7391ff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_trace.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_trace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_trace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02_trace.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_trace.h b/drivers/net/wireless/mediatek/mt76/mt76x02_trace.h<br/>index 6a98092e996b..56eea2f68983 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_trace.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_trace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02_trace.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> </div><div class='ctx'> #define MAXNAME		32</div><div class='ctx'> #define DEV_ENTRY	__array(char, wiphy_name, 32)</div><div class='del'>-#define DEV_ASSIGN	strlcpy(__entry-&gt;wiphy_name,	\</div><div class='add'>+#define DEV_ASSIGN	strscpy(__entry-&gt;wiphy_name,	\</div><div class='ctx'> 				wiphy_name(mt76_hw(dev)-&gt;wiphy), MAXNAME)</div><div class='ctx'> #define DEV_PR_FMT	"%s"</div><div class='ctx'> #define DEV_PR_ARG	__entry-&gt;wiphy_name</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c b/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c<br/>index 96fdf423a348..301b43180006 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='hunk'>@@ -33,7 +33,7 @@ void mt76x02_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02_tx);</div><div class='ctx'> </div><div class='ctx'> void mt76x02_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,</div><div class='del'>-			  struct sk_buff *skb)</div><div class='add'>+			  struct sk_buff *skb, u32 *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);</div><div class='ctx'> 	void *rxwi = skb-&gt;data;</div><div class='hunk'>@@ -62,23 +62,23 @@ s8 mt76x02_tx_get_max_txpwr_adj(struct mt76x02_dev *dev,</div><div class='ctx'> 		u8 mcs = ieee80211_rate_get_vht_mcs(rate);</div><div class='ctx'> </div><div class='ctx'> 		if (mcs == 8 || mcs == 9) {</div><div class='del'>-			max_txpwr = dev-&gt;mt76.rate_power.vht[8];</div><div class='add'>+			max_txpwr = dev-&gt;rate_power.vht[0];</div><div class='ctx'> 		} else {</div><div class='ctx'> 			u8 nss, idx;</div><div class='ctx'> </div><div class='ctx'> 			nss = ieee80211_rate_get_vht_nss(rate);</div><div class='ctx'> 			idx = ((nss - 1) &lt;&lt; 3) + mcs;</div><div class='del'>-			max_txpwr = dev-&gt;mt76.rate_power.ht[idx &amp; 0xf];</div><div class='add'>+			max_txpwr = dev-&gt;rate_power.ht[idx &amp; 0xf];</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (rate-&gt;flags &amp; IEEE80211_TX_RC_MCS) {</div><div class='del'>-		max_txpwr = dev-&gt;mt76.rate_power.ht[rate-&gt;idx &amp; 0xf];</div><div class='add'>+		max_txpwr = dev-&gt;rate_power.ht[rate-&gt;idx &amp; 0xf];</div><div class='ctx'> 	} else {</div><div class='ctx'> 		enum nl80211_band band = dev-&gt;mphy.chandef.chan-&gt;band;</div><div class='ctx'> </div><div class='ctx'> 		if (band == NL80211_BAND_2GHZ) {</div><div class='ctx'> 			const struct ieee80211_rate *r;</div><div class='ctx'> 			struct wiphy *wiphy = dev-&gt;mt76.hw-&gt;wiphy;</div><div class='del'>-			struct mt76_rate_power *rp = &amp;dev-&gt;mt76.rate_power;</div><div class='add'>+			struct mt76x02_rate_power *rp = &amp;dev-&gt;rate_power;</div><div class='ctx'> </div><div class='ctx'> 			r = &amp;wiphy-&gt;bands[band]-&gt;bitrates[rate-&gt;idx];</div><div class='ctx'> 			if (r-&gt;flags &amp; IEEE80211_RATE_SHORT_PREAMBLE)</div><div class='hunk'>@@ -86,7 +86,7 @@ s8 mt76x02_tx_get_max_txpwr_adj(struct mt76x02_dev *dev,</div><div class='ctx'> 			else</div><div class='ctx'> 				max_txpwr = rp-&gt;ofdm[r-&gt;hw_value &amp; 0x7];</div><div class='ctx'> 		} else {</div><div class='del'>-			max_txpwr = dev-&gt;mt76.rate_power.ofdm[rate-&gt;idx &amp; 0x7];</div><div class='add'>+			max_txpwr = dev-&gt;rate_power.ofdm[rate-&gt;idx &amp; 0x7];</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -112,7 +112,7 @@ void mt76x02_tx_set_txpwr_auto(struct mt76x02_dev *dev, s8 txpwr)</div><div class='ctx'> 	s8 txpwr_adj;</div><div class='ctx'> </div><div class='ctx'> 	txpwr_adj = mt76x02_tx_get_txpwr_adj(dev, txpwr,</div><div class='del'>-					     dev-&gt;mt76.rate_power.ofdm[4]);</div><div class='add'>+					     dev-&gt;rate_power.ofdm[4]);</div><div class='ctx'> 	mt76_rmw_field(dev, MT_PROT_AUTO_TX_CFG,</div><div class='ctx'> 		       MT_PROT_AUTO_TX_CFG_PROT_PADJ, txpwr_adj);</div><div class='ctx'> 	mt76_rmw_field(dev, MT_PROT_AUTO_TX_CFG,</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_usb.h b/drivers/net/wireless/mediatek/mt76/mt76x02_usb.h<br/>index b5be884b3549..49ab05c1fe73 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_usb.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_usb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_usb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02_usb.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c b/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c<br/>index efd70ddc2fd1..3a28a8cc1338 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -67,11 +67,12 @@ int mt76x02u_tx_prepare_skb(struct mt76_dev *mdev, void *data,</div><div class='ctx'> 			    struct mt76_tx_info *tx_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);</div><div class='del'>-	int pid, len = tx_info-&gt;skb-&gt;len, ep = q2ep(dev-&gt;mphy.q_tx[qid]-&gt;hw_idx);</div><div class='add'>+	int pid, len = tx_info-&gt;skb-&gt;len, ep = dev-&gt;mphy.q_tx[qid]-&gt;ep;</div><div class='ctx'> 	struct mt76x02_txwi *txwi;</div><div class='ctx'> 	bool ampdu = IEEE80211_SKB_CB(tx_info-&gt;skb)-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU;</div><div class='ctx'> 	enum mt76_qsel qsel;</div><div class='ctx'> 	u32 flags;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	mt76_insert_hdr_pad(tx_info-&gt;skb);</div><div class='ctx'> </div><div class='hunk'>@@ -106,7 +107,12 @@ int mt76x02u_tx_prepare_skb(struct mt76_dev *mdev, void *data,</div><div class='ctx'> 		ewma_pktlen_add(&amp;msta-&gt;pktlen, tx_info-&gt;skb-&gt;len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return mt76x02u_skb_dma_info(tx_info-&gt;skb, WLAN_PORT, flags);</div><div class='add'>+	err = mt76x02u_skb_dma_info(tx_info-&gt;skb, WLAN_PORT, flags);</div><div class='add'>+	if (err &amp;&amp; wcid)</div><div class='add'>+		/* Release pktid in case of error. */</div><div class='add'>+		idr_remove(&amp;wcid-&gt;pktid, pid);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02u_tx_prepare_skb);</div><div class='ctx'> </div><div class='hunk'>@@ -176,15 +182,16 @@ static void mt76x02u_pre_tbtt_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev =</div><div class='ctx'> 		container_of(work, struct mt76x02_dev, pre_tbtt_work);</div><div class='del'>-	struct beacon_bc_data data = {};</div><div class='add'>+	struct beacon_bc_data data = {</div><div class='add'>+		.dev = dev,</div><div class='add'>+	};</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int nbeacons;</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;mt76.beacon_mask)</div><div class='add'>+	if (!dev-&gt;mt76.beacon_mask || dev-&gt;mphy.offchannel)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (mt76_hw(dev)-&gt;conf.flags &amp; IEEE80211_CONF_OFFCHANNEL)</div><div class='del'>-		return;</div><div class='add'>+	__skb_queue_head_init(&amp;data.q);</div><div class='ctx'> </div><div class='ctx'> 	mt76x02_resync_beacon_timer(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -192,9 +199,12 @@ static void mt76x02u_pre_tbtt_work(struct work_struct *work)</div><div class='ctx'> 	mt76_set(dev, MT_BCN_BYPASS_MASK, 0xffff);</div><div class='ctx'> 	dev-&gt;beacon_data_count = 0;</div><div class='ctx'> </div><div class='del'>-	ieee80211_iterate_active_interfaces(mt76_hw(dev),</div><div class='add'>+	ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev),</div><div class='ctx'> 		IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='del'>-		mt76x02_update_beacon_iter, dev);</div><div class='add'>+		mt76x02_update_beacon_iter, &amp;data);</div><div class='add'>+</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;data.q)) != NULL)</div><div class='add'>+		mt76x02_mac_set_beacon(dev, skb);</div><div class='ctx'> </div><div class='ctx'> 	mt76_csa_check(&amp;dev-&gt;mt76);</div><div class='ctx'> </div><div class='hunk'>@@ -254,8 +264,8 @@ void mt76x02u_init_beacon_config(struct mt76x02_dev *dev)</div><div class='ctx'> 	};</div><div class='ctx'> 	dev-&gt;beacon_ops = &amp;beacon_ops;</div><div class='ctx'> </div><div class='del'>-	hrtimer_init(&amp;dev-&gt;pre_tbtt_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);</div><div class='del'>-	dev-&gt;pre_tbtt_timer.function = mt76x02u_pre_tbtt_interrupt;</div><div class='add'>+	hrtimer_setup(&amp;dev-&gt;pre_tbtt_timer, mt76x02u_pre_tbtt_interrupt, CLOCK_MONOTONIC,</div><div class='add'>+		      HRTIMER_MODE_REL);</div><div class='ctx'> 	INIT_WORK(&amp;dev-&gt;pre_tbtt_work, mt76x02u_pre_tbtt_work);</div><div class='ctx'> </div><div class='ctx'> 	mt76x02_init_beacon_config(dev);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c<br/>index 2953df7d8388..968c73e06a5f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -21,29 +21,16 @@ static void</div><div class='ctx'> mt76x02u_multiple_mcu_reads(struct mt76_dev *dev, u8 *data, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_usb *usb = &amp;dev-&gt;usb;</div><div class='del'>-	u32 reg, val;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (usb-&gt;mcu.burst) {</div><div class='del'>-		WARN_ON_ONCE(len / 4 != usb-&gt;mcu.rp_len);</div><div class='del'>-</div><div class='del'>-		reg = usb-&gt;mcu.rp[0].reg - usb-&gt;mcu.base;</div><div class='del'>-		for (i = 0; i &lt; usb-&gt;mcu.rp_len; i++) {</div><div class='del'>-			val = get_unaligned_le32(data + 4 * i);</div><div class='del'>-			usb-&gt;mcu.rp[i].reg = reg++;</div><div class='del'>-			usb-&gt;mcu.rp[i].value = val;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		WARN_ON_ONCE(len / 8 != usb-&gt;mcu.rp_len);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; usb-&gt;mcu.rp_len; i++) {</div><div class='del'>-			reg = get_unaligned_le32(data + 8 * i) -</div><div class='del'>-			      usb-&gt;mcu.base;</div><div class='del'>-			val = get_unaligned_le32(data + 8 * i + 4);</div><div class='del'>-</div><div class='del'>-			WARN_ON_ONCE(usb-&gt;mcu.rp[i].reg != reg);</div><div class='del'>-			usb-&gt;mcu.rp[i].value = val;</div><div class='del'>-		}</div><div class='add'>+	WARN_ON_ONCE(len / 8 != usb-&gt;mcu.rp_len);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; usb-&gt;mcu.rp_len; i++) {</div><div class='add'>+		u32 reg = get_unaligned_le32(data + 8 * i) - usb-&gt;mcu.base;</div><div class='add'>+		u32 val = get_unaligned_le32(data + 8 * i + 4);</div><div class='add'>+</div><div class='add'>+		WARN_ON_ONCE(usb-&gt;mcu.rp[i].reg != reg);</div><div class='add'>+		usb-&gt;mcu.rp[i].value = val;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -108,7 +95,7 @@ __mt76x02u_mcu_send_msg(struct mt76_dev *dev, struct sk_buff *skb,</div><div class='ctx'> 	ret = mt76u_bulk_msg(dev, skb-&gt;data, skb-&gt;len, NULL, 500,</div><div class='ctx'> 			     MT_EP_OUT_INBAND_CMD);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (wait_resp)</div><div class='ctx'> 		ret = mt76x02u_mcu_wait_resp(dev, seq);</div><div class='hunk'>@@ -207,7 +194,6 @@ mt76x02u_mcu_rd_rp(struct mt76_dev *dev, u32 base,</div><div class='ctx'> 	usb-&gt;mcu.rp = data;</div><div class='ctx'> 	usb-&gt;mcu.rp_len = n;</div><div class='ctx'> 	usb-&gt;mcu.base = base;</div><div class='del'>-	usb-&gt;mcu.burst = false;</div><div class='ctx'> </div><div class='ctx'> 	ret = __mt76x02u_mcu_send_msg(dev, skb, CMD_RANDOM_READ, true);</div><div class='ctx'> </div><div class='hunk'>@@ -307,4 +293,5 @@ void mt76x02u_init_mcu(struct mt76_dev *dev)</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02u_init_mcu);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("MediaTek MT76x02 MCU helpers");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c<br/>index 02db5d66735d..e5d9d1bc9415 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_util.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x02_util.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x02_util.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x02_util.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2018 Stanislaw Gruszka &lt;stf_xl@wp.pl&gt;</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='hunk'>@@ -7,24 +7,18 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include "mt76x02.h"</div><div class='ctx'> </div><div class='del'>-#define CCK_RATE(_idx, _rate) {					\</div><div class='add'>+#define MT76x02_CCK_RATE(_idx, _rate) {					\</div><div class='ctx'> 	.bitrate = _rate,					\</div><div class='ctx'> 	.flags = IEEE80211_RATE_SHORT_PREAMBLE,			\</div><div class='ctx'> 	.hw_value = (MT_PHY_TYPE_CCK &lt;&lt; 8) | (_idx),		\</div><div class='ctx'> 	.hw_value_short = (MT_PHY_TYPE_CCK &lt;&lt; 8) | (8 + (_idx)),	\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define OFDM_RATE(_idx, _rate) {				\</div><div class='del'>-	.bitrate = _rate,					\</div><div class='del'>-	.hw_value = (MT_PHY_TYPE_OFDM &lt;&lt; 8) | (_idx),		\</div><div class='del'>-	.hw_value_short = (MT_PHY_TYPE_OFDM &lt;&lt; 8) | (_idx),	\</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct ieee80211_rate mt76x02_rates[] = {</div><div class='del'>-	CCK_RATE(0, 10),</div><div class='del'>-	CCK_RATE(1, 20),</div><div class='del'>-	CCK_RATE(2, 55),</div><div class='del'>-	CCK_RATE(3, 110),</div><div class='add'>+	MT76x02_CCK_RATE(0, 10),</div><div class='add'>+	MT76x02_CCK_RATE(1, 20),</div><div class='add'>+	MT76x02_CCK_RATE(2, 55),</div><div class='add'>+	MT76x02_CCK_RATE(3, 110),</div><div class='ctx'> 	OFDM_RATE(0, 60),</div><div class='ctx'> 	OFDM_RATE(1, 90),</div><div class='ctx'> 	OFDM_RATE(2, 120),</div><div class='hunk'>@@ -93,10 +87,9 @@ static const struct ieee80211_iface_combination mt76x02u_if_comb[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt76x02_led_set_config(struct mt76_dev *mdev, u8 delay_on,</div><div class='del'>-		       u8 delay_off)</div><div class='add'>+mt76x02_led_set_config(struct mt76_phy *mphy, u8 delay_on, u8 delay_off)</div><div class='ctx'> {</div><div class='del'>-	struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev,</div><div class='add'>+	struct mt76x02_dev *dev = container_of(mphy-&gt;dev, struct mt76x02_dev,</div><div class='ctx'> 					       mt76);</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='hunk'>@@ -104,13 +97,13 @@ mt76x02_led_set_config(struct mt76_dev *mdev, u8 delay_on,</div><div class='ctx'> 	      FIELD_PREP(MT_LED_STATUS_OFF, delay_off) |</div><div class='ctx'> 	      FIELD_PREP(MT_LED_STATUS_ON, delay_on);</div><div class='ctx'> </div><div class='del'>-	mt76_wr(dev, MT_LED_S0(mdev-&gt;led_pin), val);</div><div class='del'>-	mt76_wr(dev, MT_LED_S1(mdev-&gt;led_pin), val);</div><div class='add'>+	mt76_wr(dev, MT_LED_S0(mphy-&gt;leds.pin), val);</div><div class='add'>+	mt76_wr(dev, MT_LED_S1(mphy-&gt;leds.pin), val);</div><div class='ctx'> </div><div class='del'>-	val = MT_LED_CTRL_REPLAY(mdev-&gt;led_pin) |</div><div class='del'>-	      MT_LED_CTRL_KICK(mdev-&gt;led_pin);</div><div class='del'>-	if (mdev-&gt;led_al)</div><div class='del'>-		val |= MT_LED_CTRL_POLARITY(mdev-&gt;led_pin);</div><div class='add'>+	val = MT_LED_CTRL_REPLAY(mphy-&gt;leds.pin) |</div><div class='add'>+	      MT_LED_CTRL_KICK(mphy-&gt;leds.pin);</div><div class='add'>+	if (mphy-&gt;leds.al)</div><div class='add'>+		val |= MT_LED_CTRL_POLARITY(mphy-&gt;leds.pin);</div><div class='ctx'> 	mt76_wr(dev, MT_LED_CTRL, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -119,14 +112,14 @@ mt76x02_led_set_blink(struct led_classdev *led_cdev,</div><div class='ctx'> 		      unsigned long *delay_on,</div><div class='ctx'> 		      unsigned long *delay_off)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_dev *mdev = container_of(led_cdev, struct mt76_dev,</div><div class='del'>-					     led_cdev);</div><div class='add'>+	struct mt76_phy *mphy = container_of(led_cdev, struct mt76_phy,</div><div class='add'>+					     leds.cdev);</div><div class='ctx'> 	u8 delta_on, delta_off;</div><div class='ctx'> </div><div class='ctx'> 	delta_off = max_t(u8, *delay_off / 10, 1);</div><div class='ctx'> 	delta_on = max_t(u8, *delay_on / 10, 1);</div><div class='ctx'> </div><div class='del'>-	mt76x02_led_set_config(mdev, delta_on, delta_off);</div><div class='add'>+	mt76x02_led_set_config(mphy, delta_on, delta_off);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -135,16 +128,16 @@ static void</div><div class='ctx'> mt76x02_led_set_brightness(struct led_classdev *led_cdev,</div><div class='ctx'> 			   enum led_brightness brightness)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_dev *mdev = container_of(led_cdev, struct mt76_dev,</div><div class='del'>-					     led_cdev);</div><div class='add'>+	struct mt76_phy *mphy = container_of(led_cdev, struct mt76_phy,</div><div class='add'>+					     leds.cdev);</div><div class='ctx'> </div><div class='ctx'> 	if (!brightness)</div><div class='del'>-		mt76x02_led_set_config(mdev, 0, 0xff);</div><div class='add'>+		mt76x02_led_set_config(mphy, 0, 0xff);</div><div class='ctx'> 	else</div><div class='del'>-		mt76x02_led_set_config(mdev, 0xff, 0);</div><div class='add'>+		mt76x02_led_set_config(mphy, 0xff, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt76x02_init_device(struct mt76x02_dev *dev)</div><div class='add'>+int mt76x02_init_device(struct mt76x02_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='ctx'> 	struct wiphy *wiphy = hw-&gt;wiphy;</div><div class='hunk'>@@ -173,9 +166,9 @@ void mt76x02_init_device(struct mt76x02_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 		/* init led callbacks */</div><div class='ctx'> 		if (IS_ENABLED(CONFIG_MT76_LEDS)) {</div><div class='del'>-			dev-&gt;mt76.led_cdev.brightness_set =</div><div class='add'>+			dev-&gt;mphy.leds.cdev.brightness_set =</div><div class='ctx'> 					mt76x02_led_set_brightness;</div><div class='del'>-			dev-&gt;mt76.led_cdev.blink_set = mt76x02_led_set_blink;</div><div class='add'>+			dev-&gt;mphy.leds.cdev.blink_set = mt76x02_led_set_blink;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -203,6 +196,8 @@ void mt76x02_init_device(struct mt76x02_dev *dev)</div><div class='ctx'> 		dev-&gt;mphy.chainmask = 0x101;</div><div class='ctx'> 		dev-&gt;mphy.antenna_mask = 1;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02_init_device);</div><div class='ctx'> </div><div class='hunk'>@@ -292,9 +287,11 @@ mt76x02_vif_init(struct mt76x02_dev *dev, struct ieee80211_vif *vif,</div><div class='ctx'> </div><div class='ctx'> 	mvif-&gt;idx = idx;</div><div class='ctx'> 	mvif-&gt;group_wcid.idx = MT_VIF_WCID(idx);</div><div class='del'>-	mvif-&gt;group_wcid.hw_key_idx = -1;</div><div class='add'>+	mt76_wcid_init(&amp;mvif-&gt;group_wcid, 0);</div><div class='add'>+</div><div class='ctx'> 	mtxq = (struct mt76_txq *)vif-&gt;txq-&gt;drv_priv;</div><div class='del'>-	mtxq-&gt;wcid = &amp;mvif-&gt;group_wcid;</div><div class='add'>+	rcu_assign_pointer(dev-&gt;mt76.wcid[MT_VIF_WCID(idx)], &amp;mvif-&gt;group_wcid);</div><div class='add'>+	mtxq-&gt;wcid = MT_VIF_WCID(idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='hunk'>@@ -329,11 +326,11 @@ mt76x02_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> 		idx += 8;</div><div class='ctx'> </div><div class='ctx'> 	/* vif is already set or idx is 8 for AP/Mesh/... */</div><div class='del'>-	if (dev-&gt;mt76.vif_mask &amp; BIT(idx) ||</div><div class='add'>+	if (dev-&gt;mt76.vif_mask &amp; BIT_ULL(idx) ||</div><div class='ctx'> 	    (vif-&gt;type != NL80211_IFTYPE_STATION &amp;&amp; idx &gt; 7))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mt76.vif_mask |= BIT(idx);</div><div class='add'>+	dev-&gt;mt76.vif_mask |= BIT_ULL(idx);</div><div class='ctx'> </div><div class='ctx'> 	mt76x02_vif_init(dev, vif, idx);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -346,7 +343,9 @@ void mt76x02_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='ctx'> 	struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif-&gt;drv_priv;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mt76.vif_mask &amp;= ~BIT(mvif-&gt;idx);</div><div class='add'>+	dev-&gt;mt76.vif_mask &amp;= ~BIT_ULL(mvif-&gt;idx);</div><div class='add'>+	rcu_assign_pointer(dev-&gt;mt76.wcid[mvif-&gt;group_wcid.idx], NULL);</div><div class='add'>+	mt76_wcid_cleanup(&amp;dev-&gt;mt76, &amp;mvif-&gt;group_wcid);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02_remove_interface);</div><div class='ctx'> </div><div class='hunk'>@@ -454,20 +453,20 @@ int mt76x02_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 	msta = sta ? (struct mt76x02_sta *)sta-&gt;drv_priv : NULL;</div><div class='ctx'> 	wcid = msta ? &amp;msta-&gt;wcid : &amp;mvif-&gt;group_wcid;</div><div class='ctx'> </div><div class='del'>-	if (cmd == SET_KEY) {</div><div class='del'>-		key-&gt;hw_key_idx = wcid-&gt;idx;</div><div class='del'>-		wcid-&gt;hw_key_idx = idx;</div><div class='del'>-		if (key-&gt;flags &amp; IEEE80211_KEY_FLAG_RX_MGMT) {</div><div class='del'>-			key-&gt;flags |= IEEE80211_KEY_FLAG_SW_MGMT_TX;</div><div class='del'>-			wcid-&gt;sw_iv = true;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='add'>+	if (cmd != SET_KEY) {</div><div class='ctx'> 		if (idx == wcid-&gt;hw_key_idx) {</div><div class='ctx'> 			wcid-&gt;hw_key_idx = -1;</div><div class='ctx'> 			wcid-&gt;sw_iv = false;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		key = NULL;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	key-&gt;hw_key_idx = wcid-&gt;idx;</div><div class='add'>+	wcid-&gt;hw_key_idx = idx;</div><div class='add'>+	if (key-&gt;flags &amp; IEEE80211_KEY_FLAG_RX_MGMT) {</div><div class='add'>+		key-&gt;flags |= IEEE80211_KEY_FLAG_SW_MGMT_TX;</div><div class='add'>+		wcid-&gt;sw_iv = true;</div><div class='ctx'> 	}</div><div class='ctx'> 	mt76_wcid_key_setup(&amp;dev-&gt;mt76, wcid, key);</div><div class='ctx'> </div><div class='hunk'>@@ -486,7 +485,8 @@ int mt76x02_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02_set_key);</div><div class='ctx'> </div><div class='ctx'> int mt76x02_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-		    u16 queue, const struct ieee80211_tx_queue_params *params)</div><div class='add'>+		    unsigned int link_id, u16 queue,</div><div class='add'>+		    const struct ieee80211_tx_queue_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='ctx'> 	u8 cw_min = 5, cw_max = 10, qid;</div><div class='hunk'>@@ -548,7 +548,7 @@ void mt76x02_set_tx_ackto(struct mt76x02_dev *dev)</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02_set_tx_ackto);</div><div class='ctx'> </div><div class='ctx'> void mt76x02_set_coverage_class(struct ieee80211_hw *hw,</div><div class='del'>-				s16 coverage_class)</div><div class='add'>+				int radio_idx, s16 coverage_class)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -559,7 +559,7 @@ void mt76x02_set_coverage_class(struct ieee80211_hw *hw,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02_set_coverage_class);</div><div class='ctx'> </div><div class='del'>-int mt76x02_set_rts_threshold(struct ieee80211_hw *hw, u32 val)</div><div class='add'>+int mt76x02_set_rts_threshold(struct ieee80211_hw *hw, int radio_idx, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -635,7 +635,7 @@ EXPORT_SYMBOL_GPL(mt76x02_sta_ps);</div><div class='ctx'> void mt76x02_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 			      struct ieee80211_vif *vif,</div><div class='ctx'> 			      struct ieee80211_bss_conf *info,</div><div class='del'>-			      u32 changed)</div><div class='add'>+			      u64 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='hunk'>@@ -695,4 +695,5 @@ void mt76x02_config_mac_addr_list(struct mt76x02_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x02_config_mac_addr_list);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("MediaTek MT76x02 helpers");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig b/drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig<br/>index 5fd4973e32df..d820510cb4bb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+# SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> config MT76x2_COMMON</div><div class='ctx'> 	tristate</div><div class='ctx'> 	select MT76x02_LIB</div><div class='hunk'>@@ -9,7 +9,7 @@ config MT76x2E</div><div class='ctx'> 	depends on MAC80211</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	help</div><div class='del'>-	  This adds support for MT7612/MT7602/MT7662-based wireless PCIe</div><div class='add'>+	  This adds support for MT7612/MT7602/MT7662-based PCIe wireless</div><div class='ctx'> 	  devices, which comply with IEEE 802.11ac standards and support</div><div class='ctx'> 	  2SS to 866Mbit/s PHY rate.</div><div class='ctx'> </div><div class='hunk'>@@ -22,7 +22,7 @@ config MT76x2U</div><div class='ctx'> 	depends on MAC80211</div><div class='ctx'> 	depends on USB</div><div class='ctx'> 	help</div><div class='del'>-	  This adds support for MT7612U-based wireless USB 3.0 dongles,</div><div class='add'>+	  This adds support for MT7612U-based USB 3.0 wireless dongles,</div><div class='ctx'> 	  which comply with IEEE 802.11ac standards and support 2SS to</div><div class='ctx'> 	  866Mbit/s PHY rate.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/Makefile b/drivers/net/wireless/mediatek/mt76/mt76x2/Makefile<br/>index caf089538c11..cbc90a9616a6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/Makefile</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+# SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> obj-$(CONFIG_MT76x2_COMMON) += mt76x2-common.o</div><div class='ctx'> obj-$(CONFIG_MT76x2E) += mt76x2e.o</div><div class='ctx'> obj-$(CONFIG_MT76x2U) += mt76x2u.o</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c<br/>index c57e05a5c65e..782813aadc0a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c</a></div><div class='hunk'>@@ -1,11 +1,11 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include "mt76x2.h"</div><div class='ctx'> #include "eeprom.h"</div><div class='ctx'> </div><div class='hunk'>@@ -256,7 +256,8 @@ void mt76x2_read_rx_gain(struct mt76x02_dev *dev)</div><div class='ctx'> 	struct ieee80211_channel *chan = dev-&gt;mphy.chandef.chan;</div><div class='ctx'> 	int channel = chan-&gt;hw_value;</div><div class='ctx'> 	s8 lna_5g[3], lna_2g;</div><div class='del'>-	u8 lna;</div><div class='add'>+	bool use_lna;</div><div class='add'>+	u8 lna = 0;</div><div class='ctx'> 	u16 val;</div><div class='ctx'> </div><div class='ctx'> 	if (chan-&gt;band == NL80211_BAND_2GHZ)</div><div class='hunk'>@@ -275,12 +276,20 @@ void mt76x2_read_rx_gain(struct mt76x02_dev *dev)</div><div class='ctx'> 	dev-&gt;cal.rx.mcu_gain |= (lna_5g[1] &amp; 0xff) &lt;&lt; 16;</div><div class='ctx'> 	dev-&gt;cal.rx.mcu_gain |= (lna_5g[2] &amp; 0xff) &lt;&lt; 24;</div><div class='ctx'> </div><div class='del'>-	lna = mt76x02_get_lna_gain(dev, &amp;lna_2g, lna_5g, chan);</div><div class='add'>+	val = mt76x02_eeprom_get(dev, MT_EE_NIC_CONF_1);</div><div class='add'>+	if (chan-&gt;band == NL80211_BAND_2GHZ)</div><div class='add'>+		use_lna = !(val &amp; MT_EE_NIC_CONF_1_LNA_EXT_2G);</div><div class='add'>+	else</div><div class='add'>+		use_lna = !(val &amp; MT_EE_NIC_CONF_1_LNA_EXT_5G);</div><div class='add'>+</div><div class='add'>+	if (use_lna)</div><div class='add'>+		lna = mt76x02_get_lna_gain(dev, &amp;lna_2g, lna_5g, chan);</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;cal.rx.lna_gain = mt76x02_sign_extend(lna, 8);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x2_read_rx_gain);</div><div class='ctx'> </div><div class='del'>-void mt76x2_get_rate_power(struct mt76x02_dev *dev, struct mt76_rate_power *t,</div><div class='add'>+void mt76x2_get_rate_power(struct mt76x02_dev *dev, struct mt76x02_rate_power *t,</div><div class='ctx'> 			   struct ieee80211_channel *chan)</div><div class='ctx'> {</div><div class='ctx'> 	bool is_5ghz;</div><div class='hunk'>@@ -324,22 +333,10 @@ void mt76x2_get_rate_power(struct mt76x02_dev *dev, struct mt76_rate_power *t,</div><div class='ctx'> 	t-&gt;ht[12] = t-&gt;ht[13] = mt76x02_rate_power_val(val);</div><div class='ctx'> 	t-&gt;ht[14] = t-&gt;ht[15] = mt76x02_rate_power_val(val &gt;&gt; 8);</div><div class='ctx'> </div><div class='del'>-	val = mt76x02_eeprom_get(dev, MT_EE_TX_POWER_VHT_MCS0);</div><div class='del'>-	t-&gt;vht[0] = t-&gt;vht[1] = mt76x02_rate_power_val(val);</div><div class='del'>-	t-&gt;vht[2] = t-&gt;vht[3] = mt76x02_rate_power_val(val &gt;&gt; 8);</div><div class='del'>-</div><div class='del'>-	val = mt76x02_eeprom_get(dev, MT_EE_TX_POWER_VHT_MCS4);</div><div class='del'>-	t-&gt;vht[4] = t-&gt;vht[5] = mt76x02_rate_power_val(val);</div><div class='del'>-	t-&gt;vht[6] = t-&gt;vht[7] = mt76x02_rate_power_val(val &gt;&gt; 8);</div><div class='del'>-</div><div class='ctx'> 	val = mt76x02_eeprom_get(dev, MT_EE_TX_POWER_VHT_MCS8);</div><div class='ctx'> 	if (!is_5ghz)</div><div class='ctx'> 		val &gt;&gt;= 8;</div><div class='del'>-	t-&gt;vht[8] = t-&gt;vht[9] = mt76x02_rate_power_val(val &gt;&gt; 8);</div><div class='del'>-</div><div class='del'>-	memcpy(t-&gt;stbc, t-&gt;ht, sizeof(t-&gt;stbc[0]) * 8);</div><div class='del'>-	t-&gt;stbc[8] = t-&gt;vht[8];</div><div class='del'>-	t-&gt;stbc[9] = t-&gt;vht[9];</div><div class='add'>+	t-&gt;vht[0] = t-&gt;vht[1] = mt76x02_rate_power_val(val &gt;&gt; 8);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x2_get_rate_power);</div><div class='ctx'> </div><div class='hunk'>@@ -502,11 +499,14 @@ int mt76x2_eeprom_init(struct mt76x02_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	mt76x02_eeprom_parse_hw_cap(dev);</div><div class='ctx'> 	mt76x2_eeprom_get_macaddr(dev);</div><div class='del'>-	mt76_eeprom_override(&amp;dev-&gt;mphy);</div><div class='add'>+	ret = mt76_eeprom_override(&amp;dev-&gt;mphy);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> 	dev-&gt;mphy.macaddr[0] &amp;= ~BIT(1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x2_eeprom_init);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("MediaTek MT76x2 EEPROM helpers");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.h b/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.h<br/>index 3755632e6494..1ee8be389b24 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -40,7 +40,7 @@ struct mt76x2_temp_comp {</div><div class='ctx'> 	unsigned int low_slope; /* J / dB */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void mt76x2_get_rate_power(struct mt76x02_dev *dev, struct mt76_rate_power *t,</div><div class='add'>+void mt76x2_get_rate_power(struct mt76x02_dev *dev, struct mt76x02_rate_power *t,</div><div class='ctx'> 			   struct ieee80211_channel *chan);</div><div class='ctx'> void mt76x2_get_power_info(struct mt76x02_dev *dev,</div><div class='ctx'> 			   struct mt76x2_tx_power_info *t,</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/init.c<br/>index a92a479aebaa..408dc08b6457 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/init.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/init.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/init.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/init.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='hunk'>@@ -8,6 +8,35 @@</div><div class='ctx'> #include "eeprom.h"</div><div class='ctx'> #include "../mt76x02_phy.h"</div><div class='ctx'> </div><div class='add'>+int mt76x2_set_sar_specs(struct ieee80211_hw *hw,</div><div class='add'>+			 const struct cfg80211_sar_specs *sar)</div><div class='add'>+{</div><div class='add'>+	int err = -EINVAL, power = hw-&gt;conf.power_level * 2;</div><div class='add'>+	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='add'>+	struct mt76_phy *mphy = &amp;dev-&gt;mphy;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+	if (!cfg80211_chandef_valid(&amp;mphy-&gt;chandef))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt76_init_sar_power(hw, sar);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	dev-&gt;txpower_conf = mt76_get_sar_power(mphy, mphy-&gt;chandef.chan,</div><div class='add'>+					       power);</div><div class='add'>+	/* convert to per-chain power for 2x2 devices */</div><div class='add'>+	dev-&gt;txpower_conf -= 6;</div><div class='add'>+</div><div class='add'>+	if (test_bit(MT76_STATE_RUNNING, &amp;mphy-&gt;state))</div><div class='add'>+		mt76x2_phy_set_txpower(dev);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt76x2_set_sar_specs);</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> mt76x2_set_wlan_state(struct mt76x02_dev *dev, bool enable)</div><div class='ctx'> {</div><div class='hunk'>@@ -153,7 +182,7 @@ void mt76x2_init_txpower(struct mt76x02_dev *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_channel *chan;</div><div class='ctx'> 	struct mt76x2_tx_power_info txp;</div><div class='del'>-	struct mt76_rate_power t = {};</div><div class='add'>+	struct mt76x02_rate_power t = {};</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; sband-&gt;n_channels; i++) {</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/mac.c b/drivers/net/wireless/mediatek/mt76/mt76x2/mac.c<br/>index e08740ca3d0c..2fa34ca69095 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/mac.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/mac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/mac.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/mac.h b/drivers/net/wireless/mediatek/mt76/mt76x2/mac.h<br/>index d5c3d26b94c1..f8ea70074c41 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/mac.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/mac.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/mac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/mac.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/mcu.c b/drivers/net/wireless/mediatek/mt76/mt76x2/mcu.c<br/>index ac83ce5f3e8b..769d924220e3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/mcu.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/mcu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/mcu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/mcu.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/mcu.h b/drivers/net/wireless/mediatek/mt76/mt76x2/mcu.h<br/>index 41fd66563e82..16a4386aa754 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/mcu.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/mcu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/mcu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/mcu.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h b/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h<br/>index d01f47c83eb1..984756c81bdc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -41,10 +41,14 @@ extern const struct ieee80211_ops mt76x2_ops;</div><div class='ctx'> int mt76x2_register_device(struct mt76x02_dev *dev);</div><div class='ctx'> int mt76x2_resume_device(struct mt76x02_dev *dev);</div><div class='ctx'> </div><div class='add'>+int mt76x2_set_sar_specs(struct ieee80211_hw *hw,</div><div class='add'>+			 const struct cfg80211_sar_specs *sar);</div><div class='ctx'> void mt76x2_phy_power_on(struct mt76x02_dev *dev);</div><div class='ctx'> void mt76x2_stop_hardware(struct mt76x02_dev *dev);</div><div class='ctx'> int mt76x2_eeprom_init(struct mt76x02_dev *dev);</div><div class='ctx'> int mt76x2_apply_calibration_data(struct mt76x02_dev *dev, int channel);</div><div class='add'>+int mt76x2e_set_channel(struct mt76_phy *phy);</div><div class='add'>+int mt76x2u_set_channel(struct mt76_phy *phy);</div><div class='ctx'> </div><div class='ctx'> void mt76x2_phy_set_antenna(struct mt76x02_dev *dev);</div><div class='ctx'> int mt76x2_phy_start(struct mt76x02_dev *dev);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2u.h b/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2u.h<br/>index f9d37c6cf1f0..27e478ab5b15 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2u.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2u.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2u.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2u.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c<br/>index adf288e50e21..491a32921a06 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/pci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/pci.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -22,9 +22,11 @@ mt76x2e_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	static const struct mt76_driver_ops drv_ops = {</div><div class='ctx'> 		.txwi_size = sizeof(struct mt76x02_txwi),</div><div class='ctx'> 		.drv_flags = MT_DRV_TX_ALIGNED4_SKBS |</div><div class='del'>-			     MT_DRV_SW_RX_AIRTIME,</div><div class='add'>+			     MT_DRV_SW_RX_AIRTIME |</div><div class='add'>+			     MT_DRV_IGNORE_TXS_FAILED,</div><div class='ctx'> 		.survey_flags = SURVEY_INFO_TIME_TX,</div><div class='ctx'> 		.update_survey = mt76x02_update_channel,</div><div class='add'>+		.set_channel = mt76x2e_set_channel,</div><div class='ctx'> 		.tx_prepare_skb = mt76x02_tx_prepare_skb,</div><div class='ctx'> 		.tx_complete_skb = mt76x02_tx_complete_skb,</div><div class='ctx'> 		.rx_skb = mt76x02_queue_rx_skb,</div><div class='hunk'>@@ -47,7 +49,7 @@ mt76x2e_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='del'>-	ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='add'>+	ret = dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -80,7 +82,7 @@ mt76x2e_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	mt76_rmw_field(dev, 0x15a10, 0x1f &lt;&lt; 16, 0x9);</div><div class='ctx'> </div><div class='ctx'> 	/* RG_SSUSB_G1_CDR_BIC_LTR = 0xf */</div><div class='del'>-	mt76_rmw_field(dev, 0x15a0c, 0xf &lt;&lt; 28, 0xf);</div><div class='add'>+	mt76_rmw_field(dev, 0x15a0c, 0xfU &lt;&lt; 28, 0xf);</div><div class='ctx'> </div><div class='ctx'> 	/* RG_SSUSB_CDR_BR_PE1D = 0x3 */</div><div class='ctx'> 	mt76_rmw_field(dev, 0x15c58, 0x3 &lt;&lt; 6, 0x3);</div><div class='hunk'>@@ -149,12 +151,18 @@ mt76x2e_resume(struct pci_dev *pdev)</div><div class='ctx'> 	pci_restore_state(pdev);</div><div class='ctx'> </div><div class='ctx'> 	mt76_worker_enable(&amp;mdev-&gt;tx_worker);</div><div class='add'>+</div><div class='ctx'> 	mt76_for_each_q_rx(mdev, i) {</div><div class='ctx'> 		napi_enable(&amp;mdev-&gt;napi[i]);</div><div class='del'>-		napi_schedule(&amp;mdev-&gt;napi[i]);</div><div class='ctx'> 	}</div><div class='ctx'> 	napi_enable(&amp;mdev-&gt;tx_napi);</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	mt76_for_each_q_rx(mdev, i) {</div><div class='add'>+		napi_schedule(&amp;mdev-&gt;napi[i]);</div><div class='add'>+	}</div><div class='ctx'> 	napi_schedule(&amp;mdev-&gt;tx_napi);</div><div class='add'>+	local_bh_enable();</div><div class='ctx'> </div><div class='ctx'> 	return mt76x2_resume_device(dev);</div><div class='ctx'> }</div><div class='hunk'>@@ -162,6 +170,7 @@ mt76x2e_resume(struct pci_dev *pdev)</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, mt76x2e_device_table);</div><div class='ctx'> MODULE_FIRMWARE(MT7662_FIRMWARE);</div><div class='ctx'> MODULE_FIRMWARE(MT7662_ROM_PATCH);</div><div class='add'>+MODULE_DESCRIPTION("MediaTek MT76x2E (PCIe) wireless driver");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver mt76pci_driver = {</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c<br/>index c6fa8cf92529..bec84f932311 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -292,8 +292,9 @@ int mt76x2_register_device(struct mt76x02_dev *dev)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;dev-&gt;cal_work, mt76x2_phy_calibrate);</div><div class='del'>-</div><div class='del'>-	mt76x02_init_device(dev);</div><div class='add'>+	ret = mt76x02_init_device(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = mt76x2_init_hardware(dev);</div><div class='ctx'> 	if (ret)</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c<br/>index 933125b07ea3..550644676201 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -24,7 +24,7 @@ mt76x2_start(struct ieee80211_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt76x2_stop(struct ieee80211_hw *hw)</div><div class='add'>+mt76x2_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -32,37 +32,29 @@ mt76x2_stop(struct ieee80211_hw *hw)</div><div class='ctx'> 	mt76x2_stop_hardware(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt76x2_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef)</div><div class='add'>+int mt76x2e_set_channel(struct mt76_phy *phy)</div><div class='ctx'> {</div><div class='del'>-	cancel_delayed_work_sync(&amp;dev-&gt;cal_work);</div><div class='add'>+	struct mt76x02_dev *dev = container_of(phy-&gt;dev, struct mt76x02_dev, mt76);</div><div class='add'>+</div><div class='ctx'> 	tasklet_disable(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='ctx'> 	tasklet_disable(&amp;dev-&gt;dfs_pd.dfs_tasklet);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='del'>-	set_bit(MT76_RESET, &amp;dev-&gt;mphy.state);</div><div class='del'>-</div><div class='del'>-	mt76_set_channel(&amp;dev-&gt;mphy);</div><div class='del'>-</div><div class='ctx'> 	mt76x2_mac_stop(dev, true);</div><div class='del'>-	mt76x2_phy_set_channel(dev, chandef);</div><div class='add'>+	mt76x2_phy_set_channel(dev, &amp;phy-&gt;chandef);</div><div class='ctx'> </div><div class='ctx'> 	mt76x02_mac_cc_reset(dev);</div><div class='ctx'> 	mt76x02_dfs_init_params(dev);</div><div class='ctx'> </div><div class='ctx'> 	mt76x2_mac_resume(dev);</div><div class='ctx'> </div><div class='del'>-	clear_bit(MT76_RESET, &amp;dev-&gt;mphy.state);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='del'>-</div><div class='ctx'> 	tasklet_enable(&amp;dev-&gt;dfs_pd.dfs_tasklet);</div><div class='ctx'> 	tasklet_enable(&amp;dev-&gt;mt76.pre_tbtt_tasklet);</div><div class='ctx'> </div><div class='del'>-	mt76_txq_schedule_all(&amp;dev-&gt;mphy);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt76x2_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+mt76x2_config(struct ieee80211_hw *hw, int radio_idx, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -78,8 +70,12 @@ mt76x2_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; IEEE80211_CONF_CHANGE_POWER) {</div><div class='del'>-		dev-&gt;txpower_conf = hw-&gt;conf.power_level * 2;</div><div class='add'>+		struct mt76_phy *mphy = &amp;dev-&gt;mphy;</div><div class='ctx'> </div><div class='add'>+		dev-&gt;txpower_conf = hw-&gt;conf.power_level * 2;</div><div class='add'>+		dev-&gt;txpower_conf = mt76_get_sar_power(mphy,</div><div class='add'>+						       mphy-&gt;chandef.chan,</div><div class='add'>+						       dev-&gt;txpower_conf);</div><div class='ctx'> 		/* convert to per-chain power for 2x2 devices */</div><div class='ctx'> 		dev-&gt;txpower_conf -= 6;</div><div class='ctx'> </div><div class='hunk'>@@ -91,11 +87,8 @@ mt76x2_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='del'>-	if (changed &amp; IEEE80211_CONF_CHANGE_CHANNEL) {</div><div class='del'>-		ieee80211_stop_queues(hw);</div><div class='del'>-		mt76x2_set_channel(dev, &amp;hw-&gt;conf.chandef);</div><div class='del'>-		ieee80211_wake_queues(hw);</div><div class='del'>-	}</div><div class='add'>+	if (changed &amp; IEEE80211_CONF_CHANGE_CHANNEL)</div><div class='add'>+		mt76_update_channel(&amp;dev-&gt;mphy);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -106,8 +99,8 @@ mt76x2_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt76x2_set_antenna(struct ieee80211_hw *hw, u32 tx_ant,</div><div class='del'>-			      u32 rx_ant)</div><div class='add'>+static int mt76x2_set_antenna(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+			      u32 tx_ant, u32 rx_ant)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -128,6 +121,10 @@ static int mt76x2_set_antenna(struct ieee80211_hw *hw, u32 tx_ant,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct ieee80211_ops mt76x2_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.tx = mt76x02_tx,</div><div class='ctx'> 	.start = mt76x2_start,</div><div class='ctx'> 	.stop = mt76x2_stop,</div><div class='hunk'>@@ -155,5 +152,6 @@ const struct ieee80211_ops mt76x2_ops = {</div><div class='ctx'> 	.get_antenna = mt76_get_antenna,</div><div class='ctx'> 	.set_rts_threshold = mt76x02_set_rts_threshold,</div><div class='ctx'> 	.reconfig_complete = mt76x02_reconfig_complete,</div><div class='add'>+	.set_sar_specs = mt76x2_set_sar_specs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c<br/>index e5b6282d1a6c..daba163802b6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c<br/>index 8831337df23e..dcf4328c1cac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c<br/>index ed2dcb05d614..a5efa13a892f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/phy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/phy.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2016 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='hunk'>@@ -116,7 +116,7 @@ void mt76x2_phy_set_txpower_regs(struct mt76x02_dev *dev,</div><div class='ctx'> EXPORT_SYMBOL_GPL(mt76x2_phy_set_txpower_regs);</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt76x2_get_min_rate_power(struct mt76_rate_power *r)</div><div class='add'>+mt76x2_get_min_rate_power(struct mt76x02_rate_power *r)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	s8 ret = 0;</div><div class='hunk'>@@ -140,7 +140,7 @@ void mt76x2_phy_set_txpower(struct mt76x02_dev *dev)</div><div class='ctx'> 	struct ieee80211_channel *chan = dev-&gt;mphy.chandef.chan;</div><div class='ctx'> 	struct mt76x2_tx_power_info txp;</div><div class='ctx'> 	int txp_0, txp_1, delta = 0;</div><div class='del'>-	struct mt76_rate_power t = {};</div><div class='add'>+	struct mt76x02_rate_power t = {};</div><div class='ctx'> 	int base_power, gain;</div><div class='ctx'> </div><div class='ctx'> 	mt76x2_get_power_info(dev, &amp;txp, chan);</div><div class='hunk'>@@ -175,7 +175,7 @@ void mt76x2_phy_set_txpower(struct mt76x02_dev *dev)</div><div class='ctx'> 	dev-&gt;target_power = txp.target_power;</div><div class='ctx'> 	dev-&gt;target_power_delta[0] = txp_0 - txp.chain[0].target_power;</div><div class='ctx'> 	dev-&gt;target_power_delta[1] = txp_1 - txp.chain[0].target_power;</div><div class='del'>-	dev-&gt;mt76.rate_power = t;</div><div class='add'>+	dev-&gt;rate_power = t;</div><div class='ctx'> </div><div class='ctx'> 	mt76x02_phy_set_txpower(dev, txp_0, txp_1);</div><div class='ctx'> }</div><div class='hunk'>@@ -280,7 +280,7 @@ void mt76x2_phy_update_channel_gain(struct mt76x02_dev *dev)</div><div class='ctx'> 	int low_gain;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;cal.avg_rssi_all = mt76_get_min_avg_rssi(&amp;dev-&gt;mt76, false);</div><div class='add'>+	dev-&gt;cal.avg_rssi_all = mt76_get_min_avg_rssi(&amp;dev-&gt;mt76, 0);</div><div class='ctx'> 	if (!dev-&gt;cal.avg_rssi_all)</div><div class='ctx'> 		dev-&gt;cal.avg_rssi_all = -75;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c<br/>index 2575369e44e2..01cb3b2830f3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/usb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/usb.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -17,10 +17,14 @@ static const struct usb_device_id mt76x2u_device_table[] = {</div><div class='ctx'> 	{ USB_DEVICE(0x057c, 0x8503) },	/* Avm FRITZ!WLAN AC860 */</div><div class='ctx'> 	{ USB_DEVICE(0x7392, 0xb711) },	/* Edimax EW 7722 UAC */</div><div class='ctx'> 	{ USB_DEVICE(0x0e8d, 0x7632) },	/* HC-M7662BU1 */</div><div class='add'>+	{ USB_DEVICE(0x0471, 0x2126) }, /* LiteOn WN4516R module, nonstandard USB connector */</div><div class='add'>+	{ USB_DEVICE(0x0471, 0x7600) }, /* LiteOn WN4519R module, nonstandard USB connector */</div><div class='ctx'> 	{ USB_DEVICE(0x2c4e, 0x0103) },	/* Mercury UD13 */</div><div class='add'>+	{ USB_DEVICE(0x0846, 0x9014) },	/* Netgear WNDA3100v3 */</div><div class='ctx'> 	{ USB_DEVICE(0x0846, 0x9053) },	/* Netgear A6210 */</div><div class='ctx'> 	{ USB_DEVICE(0x045e, 0x02e6) },	/* XBox One Wireless Adapter */</div><div class='ctx'> 	{ USB_DEVICE(0x045e, 0x02fe) },	/* XBox One Wireless Adapter */</div><div class='add'>+	{ USB_DEVICE(0x2357, 0x0137) },	/* TP-Link TL-WDN6200 */</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -28,9 +32,11 @@ static int mt76x2u_probe(struct usb_interface *intf,</div><div class='ctx'> 			 const struct usb_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	static const struct mt76_driver_ops drv_ops = {</div><div class='del'>-		.drv_flags = MT_DRV_SW_RX_AIRTIME,</div><div class='add'>+		.drv_flags = MT_DRV_SW_RX_AIRTIME |</div><div class='add'>+			     MT_DRV_IGNORE_TXS_FAILED,</div><div class='ctx'> 		.survey_flags = SURVEY_INFO_TIME_TX,</div><div class='ctx'> 		.update_survey = mt76x02_update_channel,</div><div class='add'>+		.set_channel = mt76x2u_set_channel,</div><div class='ctx'> 		.tx_prepare_skb = mt76x02u_tx_prepare_skb,</div><div class='ctx'> 		.tx_complete_skb = mt76x02u_tx_complete_skb,</div><div class='ctx'> 		.tx_status_data = mt76x02_tx_status_data,</div><div class='hunk'>@@ -57,7 +63,7 @@ static int mt76x2u_probe(struct usb_interface *intf,</div><div class='ctx'> 	usb_set_intfdata(intf, dev);</div><div class='ctx'> </div><div class='ctx'> 	mt76x02u_init_mcu(mdev);</div><div class='del'>-	err = mt76u_init(mdev, intf, false);</div><div class='add'>+	err = mt76u_init(mdev, intf);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='hunk'>@@ -147,4 +153,5 @@ static struct usb_driver mt76x2u_driver = {</div><div class='ctx'> module_usb_driver(mt76x2u_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("MediaTek MT76x2U (USB) wireless driver");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c<br/>index 85dcdc22fbeb..41778a8ef02c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -191,10 +191,13 @@ int mt76x2u_register_device(struct mt76x02_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='ctx'> 	struct mt76_usb *usb = &amp;dev-&gt;mt76.usb;</div><div class='add'>+	bool vht;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;dev-&gt;cal_work, mt76x2u_phy_calibrate);</div><div class='del'>-	mt76x02_init_device(dev);</div><div class='add'>+	err = mt76x02_init_device(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = mt76x2u_init_eeprom(dev);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -215,7 +218,17 @@ int mt76x2u_register_device(struct mt76x02_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* check hw sg support in order to enable AMSDU */</div><div class='ctx'> 	hw-&gt;max_tx_fragments = dev-&gt;mt76.usb.sg_en ? MT_TX_SG_MAX_SIZE : 1;</div><div class='del'>-	err = mt76_register_device(&amp;dev-&gt;mt76, true, mt76x02_rates,</div><div class='add'>+	switch (dev-&gt;mt76.rev) {</div><div class='add'>+	case 0x76320044:</div><div class='add'>+		/* these ASIC revisions do not support VHT */</div><div class='add'>+		vht = false;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		vht = true;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mt76_register_device(&amp;dev-&gt;mt76, vht, mt76x02_rates,</div><div class='ctx'> 				   ARRAY_SIZE(mt76x02_rates));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto fail;</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c<br/>index eaa622833f85..d0cb511ac6a2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c<br/>index b66836928d9d..66b06a493d95 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -22,7 +22,7 @@ static int mt76x2u_start(struct ieee80211_hw *hw)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt76x2u_stop(struct ieee80211_hw *hw)</div><div class='add'>+static void mt76x2u_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -31,38 +31,26 @@ static void mt76x2u_stop(struct ieee80211_hw *hw)</div><div class='ctx'> 	mt76x2u_stop_hw(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt76x2u_set_channel(struct mt76x02_dev *dev,</div><div class='del'>-		    struct cfg80211_chan_def *chandef)</div><div class='add'>+int mt76x2u_set_channel(struct mt76_phy *mphy)</div><div class='ctx'> {</div><div class='add'>+	struct mt76x02_dev *dev = container_of(mphy-&gt;dev, struct mt76x02_dev, mt76);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	cancel_delayed_work_sync(&amp;dev-&gt;cal_work);</div><div class='ctx'> 	mt76x02_pre_tbtt_enable(dev, false);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='del'>-	set_bit(MT76_RESET, &amp;dev-&gt;mphy.state);</div><div class='del'>-</div><div class='del'>-	mt76_set_channel(&amp;dev-&gt;mphy);</div><div class='del'>-</div><div class='ctx'> 	mt76x2_mac_stop(dev, false);</div><div class='ctx'> </div><div class='del'>-	err = mt76x2u_phy_set_channel(dev, chandef);</div><div class='add'>+	err = mt76x2u_phy_set_channel(dev, &amp;mphy-&gt;chandef);</div><div class='ctx'> </div><div class='ctx'> 	mt76x02_mac_cc_reset(dev);</div><div class='ctx'> 	mt76x2_mac_resume(dev);</div><div class='ctx'> </div><div class='del'>-	clear_bit(MT76_RESET, &amp;dev-&gt;mphy.state);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='del'>-</div><div class='ctx'> 	mt76x02_pre_tbtt_enable(dev, true);</div><div class='del'>-	mt76_txq_schedule_all(&amp;dev-&gt;mphy);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt76x2u_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+mt76x2u_config(struct ieee80211_hw *hw, int radio_idx, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76x02_dev *dev = hw-&gt;priv;</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -78,27 +66,32 @@ mt76x2u_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; IEEE80211_CONF_CHANGE_POWER) {</div><div class='del'>-		dev-&gt;txpower_conf = hw-&gt;conf.power_level * 2;</div><div class='add'>+		struct mt76_phy *mphy = &amp;dev-&gt;mphy;</div><div class='ctx'> </div><div class='add'>+		dev-&gt;txpower_conf = hw-&gt;conf.power_level * 2;</div><div class='add'>+		dev-&gt;txpower_conf = mt76_get_sar_power(mphy,</div><div class='add'>+						       mphy-&gt;chandef.chan,</div><div class='add'>+						       dev-&gt;txpower_conf);</div><div class='ctx'> 		/* convert to per-chain power for 2x2 devices */</div><div class='ctx'> 		dev-&gt;txpower_conf -= 6;</div><div class='ctx'> </div><div class='del'>-		if (test_bit(MT76_STATE_RUNNING, &amp;dev-&gt;mphy.state))</div><div class='add'>+		if (test_bit(MT76_STATE_RUNNING, &amp;mphy-&gt;state))</div><div class='ctx'> 			mt76x2_phy_set_txpower(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='del'>-	if (changed &amp; IEEE80211_CONF_CHANGE_CHANNEL) {</div><div class='del'>-		ieee80211_stop_queues(hw);</div><div class='del'>-		err = mt76x2u_set_channel(dev, &amp;hw-&gt;conf.chandef);</div><div class='del'>-		ieee80211_wake_queues(hw);</div><div class='del'>-	}</div><div class='add'>+	if (changed &amp; IEEE80211_CONF_CHANGE_CHANNEL)</div><div class='add'>+		mt76_update_channel(&amp;dev-&gt;mphy);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct ieee80211_ops mt76x2u_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.tx = mt76x02_tx,</div><div class='ctx'> 	.start = mt76x2u_start,</div><div class='ctx'> 	.stop = mt76x2u_stop,</div><div class='hunk'>@@ -121,4 +114,5 @@ const struct ieee80211_ops mt76x2u_ops = {</div><div class='ctx'> 	.set_tim = mt76_set_tim,</div><div class='ctx'> 	.release_buffered_frames = mt76_release_buffered_frames,</div><div class='ctx'> 	.get_antenna = mt76_get_antenna,</div><div class='add'>+	.set_sar_specs = mt76x2_set_sar_specs,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mcu.c<br/>index dd22d8af0901..9102be1803b7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mcu.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_mcu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mcu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_mcu.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c<br/>index a04a98f5ce1e..b63dd7f3ee80 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2018 Lorenzo Bianconi &lt;lorenzo.bianconi83@gmail.com&gt;</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/Kconfig b/drivers/net/wireless/mediatek/mt76/mt7915/Kconfig<br/>index d98225da694c..c24be8227f11 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7915/Kconfig</a></div><div class='hunk'>@@ -1,13 +1,25 @@</div><div class='del'>-# SPDX-License-Identifier: ISC</div><div class='add'>+# SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> config MT7915E</div><div class='ctx'> 	tristate "MediaTek MT7915E (PCIe) support"</div><div class='del'>-	select MT76_CORE</div><div class='add'>+	select MT76_CONNAC_LIB</div><div class='add'>+	select WANT_DEV_COREDUMP</div><div class='ctx'> 	depends on MAC80211</div><div class='ctx'> 	depends on PCI</div><div class='add'>+	select RELAY</div><div class='ctx'> 	help</div><div class='del'>-	  This adds support for MT7915-based wireless PCIe devices,</div><div class='add'>+	  This adds support for MT7915-based PCIe wireless devices,</div><div class='ctx'> 	  which support concurrent dual-band operation at both 5GHz</div><div class='ctx'> 	  and 2.4GHz IEEE 802.11ax 4x4:4SS 1024-QAM, 160MHz channels,</div><div class='ctx'> 	  OFDMA, spatial reuse and dual carrier modulation.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here.</div><div class='add'>+</div><div class='add'>+config MT798X_WMAC</div><div class='add'>+	bool "MT798x (SoC) WMAC support"</div><div class='add'>+	depends on MT7915E</div><div class='add'>+	depends on ARCH_MEDIATEK || COMPILE_TEST</div><div class='add'>+	select REGMAP</div><div class='add'>+	help</div><div class='add'>+	  This adds support for the built-in WMAC on MT7981 and MT7986 SoC device</div><div class='add'>+	  which has the same feature set as a MT7915, but enables 6E</div><div class='add'>+	  support.</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/Makefile b/drivers/net/wireless/mediatek/mt76/mt7915/Makefile<br/>index 40c8061787e9..963fb3109af3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7915/Makefile</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-#SPDX-License-Identifier: ISC</div><div class='add'>+# SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MT7915E) += mt7915e.o</div><div class='ctx'> </div><div class='hunk'>@@ -6,3 +6,5 @@ mt7915e-y := pci.o init.o dma.o eeprom.o main.o mcu.o mac.o \</div><div class='ctx'> 	     debugfs.o mmio.o</div><div class='ctx'> </div><div class='ctx'> mt7915e-$(CONFIG_NL80211_TESTMODE) += testmode.o</div><div class='add'>+mt7915e-$(CONFIG_MT798X_WMAC) += soc.o</div><div class='add'>+mt7915e-$(CONFIG_DEV_COREDUMP) += coredump.o</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/coredump.c b/drivers/net/wireless/mediatek/mt76/mt7915/coredump.c<br/>new file mode 100644<br/>index 000000000000..6c7273e5b0bc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/coredump.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7915/coredump.c</a></div><div class='hunk'>@@ -0,0 +1,411 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/* Copyright (C) 2022 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/devcoredump.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/utsname.h&gt;</div><div class='add'>+#include "coredump.h"</div><div class='add'>+</div><div class='add'>+static bool coredump_memdump;</div><div class='add'>+module_param(coredump_memdump, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(coredump_memdump, "Optional ability to dump firmware memory");</div><div class='add'>+</div><div class='add'>+static const struct mt7915_mem_region mt7915_mem_regions[] = {</div><div class='add'>+	{</div><div class='add'>+		.start = 0xe003b400,</div><div class='add'>+		.len = 0x00003bff,</div><div class='add'>+		.name = "CRAM",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mt7915_mem_region mt7916_mem_regions[] = {</div><div class='add'>+	{</div><div class='add'>+		.start = 0x00800000,</div><div class='add'>+		.len = 0x0005ffff,</div><div class='add'>+		.name = "ROM",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start = 0x00900000,</div><div class='add'>+		.len = 0x00013fff,</div><div class='add'>+		.name = "ULM1",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start = 0x02200000,</div><div class='add'>+		.len = 0x0004ffff,</div><div class='add'>+		.name = "ULM2",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start = 0x02300000,</div><div class='add'>+		.len = 0x0004ffff,</div><div class='add'>+		.name = "ULM3",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start = 0x00400000,</div><div class='add'>+		.len = 0x00027fff,</div><div class='add'>+		.name = "SRAM",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start = 0xe0000000,</div><div class='add'>+		.len = 0x00157fff,</div><div class='add'>+		.name = "CRAM",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mt7915_mem_region mt798x_mem_regions[] = {</div><div class='add'>+	{</div><div class='add'>+		.start = 0x00800000,</div><div class='add'>+		.len = 0x0005ffff,</div><div class='add'>+		.name = "ROM",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start = 0x00900000,</div><div class='add'>+		.len = 0x0000ffff,</div><div class='add'>+		.name = "ULM1",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start = 0x02200000,</div><div class='add'>+		.len = 0x0004ffff,</div><div class='add'>+		.name = "ULM2",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start = 0x02300000,</div><div class='add'>+		.len = 0x0004ffff,</div><div class='add'>+		.name = "ULM3",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start = 0x00400000,</div><div class='add'>+		.len = 0x00017fff,</div><div class='add'>+		.name = "SRAM",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start = 0xe0000000,</div><div class='add'>+		.len = 0x00113fff,</div><div class='add'>+		.name = "CRAM",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct mt7915_mem_region*</div><div class='add'>+mt7915_coredump_get_mem_layout(struct mt7915_dev *dev, u32 *num)</div><div class='add'>+{</div><div class='add'>+	switch (mt76_chip(&amp;dev-&gt;mt76)) {</div><div class='add'>+	case 0x7915:</div><div class='add'>+		*num = ARRAY_SIZE(mt7915_mem_regions);</div><div class='add'>+		return &amp;mt7915_mem_regions[0];</div><div class='add'>+	case 0x7981:</div><div class='add'>+	case 0x7986:</div><div class='add'>+		*num = ARRAY_SIZE(mt798x_mem_regions);</div><div class='add'>+		return &amp;mt798x_mem_regions[0];</div><div class='add'>+	case 0x7916:</div><div class='add'>+		*num = ARRAY_SIZE(mt7916_mem_regions);</div><div class='add'>+		return &amp;mt7916_mem_regions[0];</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7915_coredump_get_mem_size(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	const struct mt7915_mem_region *mem_region;</div><div class='add'>+	size_t size = 0;</div><div class='add'>+	u32 num;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mem_region = mt7915_coredump_get_mem_layout(dev, &amp;num);</div><div class='add'>+	if (!mem_region)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num; i++) {</div><div class='add'>+		size += mem_region-&gt;len;</div><div class='add'>+		mem_region++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* reserve space for the headers */</div><div class='add'>+	size += num * sizeof(struct mt7915_mem_hdr);</div><div class='add'>+	/* make sure it is aligned 4 bytes for debug message print out */</div><div class='add'>+	size = ALIGN(size, 4);</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct mt7915_crash_data *mt7915_coredump_new(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_crash_data *crash_data = dev-&gt;coredump.crash_data;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;dump_mutex);</div><div class='add'>+</div><div class='add'>+	guid_gen(&amp;crash_data-&gt;guid);</div><div class='add'>+	ktime_get_real_ts64(&amp;crash_data-&gt;timestamp);</div><div class='add'>+</div><div class='add'>+	return crash_data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7915_coredump_fw_state(struct mt7915_dev *dev, struct mt7915_coredump *dump,</div><div class='add'>+			 bool *exception)</div><div class='add'>+{</div><div class='add'>+	u32 state, count, type;</div><div class='add'>+</div><div class='add'>+	type = (u32)mt76_get_field(dev, MT_FW_EXCEPT_TYPE, GENMASK(7, 0));</div><div class='add'>+	state = (u32)mt76_get_field(dev, MT_FW_ASSERT_STAT, GENMASK(7, 0));</div><div class='add'>+	count = is_mt7915(&amp;dev-&gt;mt76) ?</div><div class='add'>+		(u32)mt76_get_field(dev, MT_FW_EXCEPT_COUNT, GENMASK(15, 8)) :</div><div class='add'>+		(u32)mt76_get_field(dev, MT_FW_EXCEPT_COUNT, GENMASK(7, 0));</div><div class='add'>+</div><div class='add'>+	/* normal mode: driver can manually trigger assert for detail info */</div><div class='add'>+	if (!count)</div><div class='add'>+		strscpy(dump-&gt;fw_state, "normal", sizeof(dump-&gt;fw_state));</div><div class='add'>+	else if (state &gt; 1 &amp;&amp; (count == 1) &amp;&amp; type == 5)</div><div class='add'>+		strscpy(dump-&gt;fw_state, "assert", sizeof(dump-&gt;fw_state));</div><div class='add'>+	else if ((state &gt; 1 &amp;&amp; count == 1) || count &gt; 1)</div><div class='add'>+		strscpy(dump-&gt;fw_state, "exception", sizeof(dump-&gt;fw_state));</div><div class='add'>+</div><div class='add'>+	*exception = !!count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7915_coredump_fw_trace(struct mt7915_dev *dev, struct mt7915_coredump *dump,</div><div class='add'>+			 bool exception)</div><div class='add'>+{</div><div class='add'>+	u32 n, irq, sch, base = MT_FW_EINT_INFO;</div><div class='add'>+</div><div class='add'>+	/* trap or run? */</div><div class='add'>+	dump-&gt;last_msg_id = mt76_rr(dev, MT_FW_LAST_MSG_ID);</div><div class='add'>+</div><div class='add'>+	n = is_mt7915(&amp;dev-&gt;mt76) ?</div><div class='add'>+	    (u32)mt76_get_field(dev, base, GENMASK(7, 0)) :</div><div class='add'>+	    (u32)mt76_get_field(dev, base, GENMASK(15, 8));</div><div class='add'>+	dump-&gt;eint_info_idx = n;</div><div class='add'>+</div><div class='add'>+	irq = mt76_rr(dev, base + 0x8);</div><div class='add'>+	n = is_mt7915(&amp;dev-&gt;mt76) ?</div><div class='add'>+	    FIELD_GET(GENMASK(7, 0), irq) : FIELD_GET(GENMASK(23, 16), irq);</div><div class='add'>+	dump-&gt;irq_info_idx = n;</div><div class='add'>+</div><div class='add'>+	sch = mt76_rr(dev, MT_FW_SCHED_INFO);</div><div class='add'>+	n = is_mt7915(&amp;dev-&gt;mt76) ?</div><div class='add'>+	    FIELD_GET(GENMASK(7, 0), sch) : FIELD_GET(GENMASK(15, 8), sch);</div><div class='add'>+	dump-&gt;sched_info_idx = n;</div><div class='add'>+</div><div class='add'>+	if (exception) {</div><div class='add'>+		u32 i, y;</div><div class='add'>+</div><div class='add'>+		/* sched trace */</div><div class='add'>+		n = is_mt7915(&amp;dev-&gt;mt76) ?</div><div class='add'>+		    FIELD_GET(GENMASK(15, 8), sch) : FIELD_GET(GENMASK(7, 0), sch);</div><div class='add'>+		n = n &gt; 60 ? 60 : n;</div><div class='add'>+</div><div class='add'>+		strscpy(dump-&gt;trace_sched, "(sched_info) id, time",</div><div class='add'>+			sizeof(dump-&gt;trace_sched));</div><div class='add'>+</div><div class='add'>+		for (y = dump-&gt;sched_info_idx, i = 0; i &lt; n; i++, y++) {</div><div class='add'>+			mt7915_memcpy_fromio(dev, dump-&gt;sched, base + 0xc + y * 12,</div><div class='add'>+					     sizeof(dump-&gt;sched));</div><div class='add'>+			y = y &gt;= n ? 0 : y;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* irq trace */</div><div class='add'>+		n = is_mt7915(&amp;dev-&gt;mt76) ?</div><div class='add'>+		    FIELD_GET(GENMASK(15, 8), irq) : FIELD_GET(GENMASK(7, 0), irq);</div><div class='add'>+		n = n &gt; 60 ? 60 : n;</div><div class='add'>+</div><div class='add'>+		strscpy(dump-&gt;trace_irq, "(irq_info) id, time",</div><div class='add'>+			sizeof(dump-&gt;trace_irq));</div><div class='add'>+</div><div class='add'>+		for (y = dump-&gt;irq_info_idx, i = 0; i &lt; n; i++, y++) {</div><div class='add'>+			mt7915_memcpy_fromio(dev, dump-&gt;irq, base + 0x4 + y * 16,</div><div class='add'>+					     sizeof(dump-&gt;irq));</div><div class='add'>+			y = y &gt;= n ? 0 : y;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7915_coredump_fw_stack(struct mt7915_dev *dev, struct mt7915_coredump *dump,</div><div class='add'>+			 bool exception)</div><div class='add'>+{</div><div class='add'>+	u32 oldest, i, idx;</div><div class='add'>+</div><div class='add'>+	/* stop call stack record */</div><div class='add'>+	if (!exception)</div><div class='add'>+		mt76_clear(dev, 0x89050200, BIT(0));</div><div class='add'>+</div><div class='add'>+	oldest = (u32)mt76_get_field(dev, 0x89050200, GENMASK(20, 16)) + 2;</div><div class='add'>+	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+		idx = ((oldest + 2 * i + 1) % 32);</div><div class='add'>+		dump-&gt;call_stack[i] = mt76_rr(dev, 0x89050204 + idx * 4);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* start call stack record */</div><div class='add'>+	if (!exception)</div><div class='add'>+		mt76_set(dev, 0x89050200, BIT(0));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7915_coredump_fw_task(struct mt7915_dev *dev, struct mt7915_coredump *dump)</div><div class='add'>+{</div><div class='add'>+	u32 offs = is_mt7915(&amp;dev-&gt;mt76) ? 0xe0 : 0x170;</div><div class='add'>+</div><div class='add'>+	strscpy(dump-&gt;task_qid, "(task queue id) read, write",</div><div class='add'>+		sizeof(dump-&gt;task_qid));</div><div class='add'>+</div><div class='add'>+	dump-&gt;taskq[0].read = mt76_rr(dev, MT_FW_TASK_QID1);</div><div class='add'>+	dump-&gt;taskq[0].write = mt76_rr(dev, MT_FW_TASK_QID1 - 4);</div><div class='add'>+	dump-&gt;taskq[1].read = mt76_rr(dev, MT_FW_TASK_QID2);</div><div class='add'>+	dump-&gt;taskq[1].write = mt76_rr(dev, MT_FW_TASK_QID2 - 4);</div><div class='add'>+</div><div class='add'>+	strscpy(dump-&gt;task_info, "(task stack) start, end, size",</div><div class='add'>+		sizeof(dump-&gt;task_info));</div><div class='add'>+</div><div class='add'>+	dump-&gt;taski[0].start = mt76_rr(dev, MT_FW_TASK_START);</div><div class='add'>+	dump-&gt;taski[0].end = mt76_rr(dev, MT_FW_TASK_END);</div><div class='add'>+	dump-&gt;taski[0].size = mt76_rr(dev, MT_FW_TASK_SIZE);</div><div class='add'>+	dump-&gt;taski[1].start = mt76_rr(dev, MT_FW_TASK_START + offs);</div><div class='add'>+	dump-&gt;taski[1].end = mt76_rr(dev, MT_FW_TASK_END + offs);</div><div class='add'>+	dump-&gt;taski[1].size = mt76_rr(dev, MT_FW_TASK_SIZE + offs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7915_coredump_fw_context(struct mt7915_dev *dev, struct mt7915_coredump *dump)</div><div class='add'>+{</div><div class='add'>+	u32 count, idx, id;</div><div class='add'>+</div><div class='add'>+	count = mt76_rr(dev, MT_FW_CIRQ_COUNT);</div><div class='add'>+</div><div class='add'>+	/* current context */</div><div class='add'>+	if (!count) {</div><div class='add'>+		strscpy(dump-&gt;fw_context, "(context) interrupt",</div><div class='add'>+			sizeof(dump-&gt;fw_context));</div><div class='add'>+</div><div class='add'>+		idx = is_mt7915(&amp;dev-&gt;mt76) ?</div><div class='add'>+		      (u32)mt76_get_field(dev, MT_FW_CIRQ_IDX, GENMASK(31, 16)) :</div><div class='add'>+		      (u32)mt76_get_field(dev, MT_FW_CIRQ_IDX, GENMASK(15, 0));</div><div class='add'>+		dump-&gt;context.idx = idx;</div><div class='add'>+		dump-&gt;context.handler = mt76_rr(dev, MT_FW_CIRQ_LISR);</div><div class='add'>+	} else {</div><div class='add'>+		idx = mt76_rr(dev, MT_FW_TASK_IDX);</div><div class='add'>+		id = mt76_rr(dev, MT_FW_TASK_ID);</div><div class='add'>+</div><div class='add'>+		if (!id &amp;&amp; idx == 3) {</div><div class='add'>+			strscpy(dump-&gt;fw_context, "(context) idle",</div><div class='add'>+				sizeof(dump-&gt;fw_context));</div><div class='add'>+		} else if (id &amp;&amp; idx != 3) {</div><div class='add'>+			strscpy(dump-&gt;fw_context, "(context) task",</div><div class='add'>+				sizeof(dump-&gt;fw_context));</div><div class='add'>+</div><div class='add'>+			dump-&gt;context.idx = idx;</div><div class='add'>+			dump-&gt;context.handler = id;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct mt7915_coredump *mt7915_coredump_build(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_crash_data *crash_data = dev-&gt;coredump.crash_data;</div><div class='add'>+	struct mt7915_coredump *dump;</div><div class='add'>+	struct mt7915_coredump_mem *dump_mem;</div><div class='add'>+	size_t len, sofar = 0, hdr_len = sizeof(*dump);</div><div class='add'>+	unsigned char *buf;</div><div class='add'>+	bool exception;</div><div class='add'>+</div><div class='add'>+	len = hdr_len;</div><div class='add'>+</div><div class='add'>+	if (coredump_memdump &amp;&amp; crash_data-&gt;memdump_buf_len)</div><div class='add'>+		len += sizeof(*dump_mem) + crash_data-&gt;memdump_buf_len;</div><div class='add'>+</div><div class='add'>+	sofar += hdr_len;</div><div class='add'>+</div><div class='add'>+	/* this is going to get big when we start dumping memory and such,</div><div class='add'>+	 * so go ahead and use vmalloc.</div><div class='add'>+	 */</div><div class='add'>+	buf = vzalloc(len);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;dump_mutex);</div><div class='add'>+</div><div class='add'>+	dump = (struct mt7915_coredump *)(buf);</div><div class='add'>+	dump-&gt;len = len;</div><div class='add'>+</div><div class='add'>+	/* plain text */</div><div class='add'>+	strscpy(dump-&gt;magic, "mt76-crash-dump", sizeof(dump-&gt;magic));</div><div class='add'>+	strscpy(dump-&gt;kernel, init_utsname()-&gt;release, sizeof(dump-&gt;kernel));</div><div class='add'>+	strscpy(dump-&gt;fw_ver, dev-&gt;mt76.hw-&gt;wiphy-&gt;fw_version,</div><div class='add'>+		sizeof(dump-&gt;fw_ver));</div><div class='add'>+</div><div class='add'>+	guid_copy(&amp;dump-&gt;guid, &amp;crash_data-&gt;guid);</div><div class='add'>+	dump-&gt;tv_sec = crash_data-&gt;timestamp.tv_sec;</div><div class='add'>+	dump-&gt;tv_nsec = crash_data-&gt;timestamp.tv_nsec;</div><div class='add'>+	dump-&gt;device_id = mt76_chip(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	mt7915_coredump_fw_state(dev, dump, &amp;exception);</div><div class='add'>+	mt7915_coredump_fw_trace(dev, dump, exception);</div><div class='add'>+	mt7915_coredump_fw_task(dev, dump);</div><div class='add'>+	mt7915_coredump_fw_context(dev, dump);</div><div class='add'>+	mt7915_coredump_fw_stack(dev, dump, exception);</div><div class='add'>+</div><div class='add'>+	/* gather memory content */</div><div class='add'>+	dump_mem = (struct mt7915_coredump_mem *)(buf + sofar);</div><div class='add'>+	dump_mem-&gt;len = crash_data-&gt;memdump_buf_len;</div><div class='add'>+	if (coredump_memdump &amp;&amp; crash_data-&gt;memdump_buf_len)</div><div class='add'>+		memcpy(dump_mem-&gt;data, crash_data-&gt;memdump_buf,</div><div class='add'>+		       crash_data-&gt;memdump_buf_len);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;dump_mutex);</div><div class='add'>+</div><div class='add'>+	return dump;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7915_coredump_submit(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_coredump *dump;</div><div class='add'>+</div><div class='add'>+	dump = mt7915_coredump_build(dev);</div><div class='add'>+	if (!dump) {</div><div class='add'>+		dev_warn(dev-&gt;mt76.dev, "no crash dump data found\n");</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_coredumpv(dev-&gt;mt76.dev, dump, dump-&gt;len, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7915_coredump_register(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_crash_data *crash_data;</div><div class='add'>+</div><div class='add'>+	crash_data = vzalloc(sizeof(*dev-&gt;coredump.crash_data));</div><div class='add'>+	if (!crash_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev-&gt;coredump.crash_data = crash_data;</div><div class='add'>+</div><div class='add'>+	if (coredump_memdump) {</div><div class='add'>+		crash_data-&gt;memdump_buf_len = mt7915_coredump_get_mem_size(dev);</div><div class='add'>+		if (!crash_data-&gt;memdump_buf_len)</div><div class='add'>+			/* no memory content */</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		crash_data-&gt;memdump_buf = vzalloc(crash_data-&gt;memdump_buf_len);</div><div class='add'>+		if (!crash_data-&gt;memdump_buf) {</div><div class='add'>+			vfree(crash_data);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7915_coredump_unregister(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;coredump.crash_data-&gt;memdump_buf) {</div><div class='add'>+		vfree(dev-&gt;coredump.crash_data-&gt;memdump_buf);</div><div class='add'>+		dev-&gt;coredump.crash_data-&gt;memdump_buf = NULL;</div><div class='add'>+		dev-&gt;coredump.crash_data-&gt;memdump_buf_len = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vfree(dev-&gt;coredump.crash_data);</div><div class='add'>+	dev-&gt;coredump.crash_data = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/coredump.h b/drivers/net/wireless/mediatek/mt76/mt7915/coredump.h<br/>new file mode 100644<br/>index 000000000000..eb3991eda2e5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/coredump.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7915/coredump.h</a></div><div class='hunk'>@@ -0,0 +1,136 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/* Copyright (C) 2022 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#ifndef _COREDUMP_H_</div><div class='add'>+#define _COREDUMP_H_</div><div class='add'>+</div><div class='add'>+#include "mt7915.h"</div><div class='add'>+</div><div class='add'>+struct trace {</div><div class='add'>+	u32 id;</div><div class='add'>+	u32 timestamp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt7915_coredump {</div><div class='add'>+	char magic[16];</div><div class='add'>+</div><div class='add'>+	u32 len;</div><div class='add'>+</div><div class='add'>+	guid_t guid;</div><div class='add'>+</div><div class='add'>+	/* time-of-day stamp */</div><div class='add'>+	u64 tv_sec;</div><div class='add'>+	/* time-of-day stamp, nano-seconds */</div><div class='add'>+	u64 tv_nsec;</div><div class='add'>+	/* kernel version */</div><div class='add'>+	char kernel[64];</div><div class='add'>+	/* firmware version */</div><div class='add'>+	char fw_ver[ETHTOOL_FWVERS_LEN];</div><div class='add'>+</div><div class='add'>+	u32 device_id;</div><div class='add'>+</div><div class='add'>+	/* exception state */</div><div class='add'>+	char fw_state[12];</div><div class='add'>+</div><div class='add'>+	u32 last_msg_id;</div><div class='add'>+	u32 eint_info_idx;</div><div class='add'>+	u32 irq_info_idx;</div><div class='add'>+	u32 sched_info_idx;</div><div class='add'>+</div><div class='add'>+	/* schedule info */</div><div class='add'>+	char trace_sched[32];</div><div class='add'>+	struct {</div><div class='add'>+		struct trace t;</div><div class='add'>+		u32 pc;</div><div class='add'>+	} sched[60];</div><div class='add'>+</div><div class='add'>+	/* irq info */</div><div class='add'>+	char trace_irq[32];</div><div class='add'>+	struct trace irq[60];</div><div class='add'>+</div><div class='add'>+	/* task queue status */</div><div class='add'>+	char task_qid[32];</div><div class='add'>+	struct {</div><div class='add'>+		u32 read;</div><div class='add'>+		u32 write;</div><div class='add'>+	} taskq[2];</div><div class='add'>+</div><div class='add'>+	/* task stack info */</div><div class='add'>+	char task_info[32];</div><div class='add'>+	struct {</div><div class='add'>+		u32 start;</div><div class='add'>+		u32 end;</div><div class='add'>+		u32 size;</div><div class='add'>+	} taski[2];</div><div class='add'>+</div><div class='add'>+	/* firmware context */</div><div class='add'>+	char fw_context[24];</div><div class='add'>+	struct {</div><div class='add'>+		u32 idx;</div><div class='add'>+		u32 handler;</div><div class='add'>+	} context;</div><div class='add'>+</div><div class='add'>+	/* link registers calltrace */</div><div class='add'>+	u32 call_stack[16];</div><div class='add'>+</div><div class='add'>+	/* memory content */</div><div class='add'>+	u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7915_coredump_mem {</div><div class='add'>+	u32 len;</div><div class='add'>+	u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7915_mem_hdr {</div><div class='add'>+	u32 start;</div><div class='add'>+	u32 len;</div><div class='add'>+	u8 data[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt7915_mem_region {</div><div class='add'>+	u32 start;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	const char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEV_COREDUMP</div><div class='add'>+</div><div class='add'>+const struct mt7915_mem_region *</div><div class='add'>+mt7915_coredump_get_mem_layout(struct mt7915_dev *dev, u32 *num);</div><div class='add'>+struct mt7915_crash_data *mt7915_coredump_new(struct mt7915_dev *dev);</div><div class='add'>+int mt7915_coredump_submit(struct mt7915_dev *dev);</div><div class='add'>+int mt7915_coredump_register(struct mt7915_dev *dev);</div><div class='add'>+void mt7915_coredump_unregister(struct mt7915_dev *dev);</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_DEV_COREDUMP */</div><div class='add'>+</div><div class='add'>+static inline const struct mt7915_mem_region *</div><div class='add'>+mt7915_coredump_get_mem_layout(struct mt7915_dev *dev, u32 *num)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int mt7915_coredump_submit(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct mt7915_crash_data *mt7915_coredump_new(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int mt7915_coredump_register(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mt7915_coredump_unregister(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_DEV_COREDUMP */</div><div class='add'>+</div><div class='add'>+#endif /* _COREDUMP_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c<br/>index 6a8ddeeecbe9..26ed3745af43 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c</a></div><div class='hunk'>@@ -1,22 +1,34 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/relay.h&gt;</div><div class='ctx'> #include "mt7915.h"</div><div class='ctx'> #include "eeprom.h"</div><div class='add'>+#include "mcu.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+</div><div class='add'>+#define FW_BIN_LOG_MAGIC	0x44e98caf</div><div class='ctx'> </div><div class='ctx'> /** global debugfs **/</div><div class='ctx'> </div><div class='add'>+struct hw_queue_map {</div><div class='add'>+	const char *name;</div><div class='add'>+	u8 index;</div><div class='add'>+	u8 pid;</div><div class='add'>+	u8 qid;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> mt7915_implicit_txbf_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_dev *dev = data;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(MT76_STATE_RUNNING, &amp;dev-&gt;mphy.state))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='add'>+	/* The existing connected stations shall reconnect to apply</div><div class='add'>+	 * new implicit txbf configuration.</div><div class='add'>+	 */</div><div class='ctx'> 	dev-&gt;ibf = !!val;</div><div class='ctx'> </div><div class='del'>-	return mt7915_mcu_set_txbf_type(dev);</div><div class='add'>+	return mt7915_mcu_set_txbf(dev, MT_BF_TYPE_UPDATE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -32,49 +44,466 @@ mt7915_implicit_txbf_get(void *data, u64 *val)</div><div class='ctx'> DEFINE_DEBUGFS_ATTRIBUTE(fops_implicit_txbf, mt7915_implicit_txbf_get,</div><div class='ctx'> 			 mt7915_implicit_txbf_set, "%lld\n");</div><div class='ctx'> </div><div class='del'>-/* test knob of system layer 1/2 error recovery */</div><div class='del'>-static int mt7915_ser_trigger_set(void *data, u64 val)</div><div class='add'>+/* test knob of system error recovery */</div><div class='add'>+static ssize_t</div><div class='add'>+mt7915_sys_recovery_set(struct file *file, const char __user *user_buf,</div><div class='add'>+			size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	enum {</div><div class='del'>-		SER_SET_RECOVER_L1 = 1,</div><div class='del'>-		SER_SET_RECOVER_L2,</div><div class='del'>-		SER_ENABLE = 2,</div><div class='del'>-		SER_RECOVER</div><div class='del'>-	};</div><div class='del'>-	struct mt7915_dev *dev = data;</div><div class='add'>+	struct mt7915_phy *phy = file-&gt;private_data;</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	bool band = phy-&gt;mt76-&gt;band_idx;</div><div class='add'>+	char buf[16];</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	if (count &gt;= sizeof(buf))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(buf, user_buf, count))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (count &amp;&amp; buf[count - 1] == '\n')</div><div class='add'>+		buf[count - 1] = '\0';</div><div class='add'>+	else</div><div class='add'>+		buf[count] = '\0';</div><div class='add'>+</div><div class='add'>+	if (kstrtou16(buf, 0, &amp;val))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	switch (val) {</div><div class='add'>+	/*</div><div class='add'>+	 * 0: grab firmware current SER state.</div><div class='add'>+	 * 1: trigger &amp; enable system error L1 recovery.</div><div class='add'>+	 * 2: trigger &amp; enable system error L2 recovery.</div><div class='add'>+	 * 3: trigger &amp; enable system error L3 rx abort.</div><div class='add'>+	 * 4: trigger &amp; enable system error L3 tx abort</div><div class='add'>+	 * 5: trigger &amp; enable system error L3 tx disable.</div><div class='add'>+	 * 6: trigger &amp; enable system error L3 bf recovery.</div><div class='add'>+	 * 7: trigger &amp; enable system error full recovery.</div><div class='add'>+	 * 8: trigger firmware crash.</div><div class='add'>+	 */</div><div class='add'>+	case SER_QUERY:</div><div class='add'>+		ret = mt7915_mcu_set_ser(dev, 0, 0, band);</div><div class='add'>+		break;</div><div class='ctx'> 	case SER_SET_RECOVER_L1:</div><div class='ctx'> 	case SER_SET_RECOVER_L2:</div><div class='del'>-		ret = mt7915_mcu_set_ser(dev, SER_ENABLE, BIT(val), 0);</div><div class='add'>+	case SER_SET_RECOVER_L3_RX_ABORT:</div><div class='add'>+	case SER_SET_RECOVER_L3_TX_ABORT:</div><div class='add'>+	case SER_SET_RECOVER_L3_TX_DISABLE:</div><div class='add'>+	case SER_SET_RECOVER_L3_BF:</div><div class='add'>+		ret = mt7915_mcu_set_ser(dev, SER_ENABLE, BIT(val), band);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = mt7915_mcu_set_ser(dev, SER_RECOVER, val, band);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	/* enable full chip reset */</div><div class='add'>+	case SER_SET_RECOVER_FULL:</div><div class='add'>+		mt76_set(dev, MT_WFDMA0_MCU_HOST_INT_ENA, MT_MCU_CMD_WDT_MASK);</div><div class='add'>+		ret = mt7915_mcu_set_ser(dev, 1, 3, band);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		return mt7915_mcu_set_ser(dev, SER_RECOVER, val, 0);</div><div class='add'>+		dev-&gt;recovery.state |= MT_MCU_CMD_WDT_MASK;</div><div class='add'>+		mt7915_reset(dev);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	/* WARNING: trigger firmware crash */</div><div class='add'>+	case SER_SET_SYSTEM_ASSERT:</div><div class='add'>+		mt76_wr(dev, MT_MCU_WM_CIRQ_EINT_MASK_CLR_ADDR, BIT(18));</div><div class='add'>+		mt76_wr(dev, MT_MCU_WM_CIRQ_EINT_SOFT_ADDR, BIT(18));</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return ret ? ret : count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+mt7915_sys_recovery_get(struct file *file, char __user *user_buf,</div><div class='add'>+			size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_phy *phy = file-&gt;private_data;</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	char *buff;</div><div class='add'>+	int desc = 0;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	static const size_t bufsz = 1024;</div><div class='add'>+</div><div class='add'>+	buff = kmalloc(bufsz, GFP_KERNEL);</div><div class='add'>+	if (!buff)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* HELP */</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='add'>+			  "Please echo the correct value ...\n");</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='add'>+			  "0: grab firmware transient SER state\n");</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='add'>+			  "1: trigger system error L1 recovery\n");</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='add'>+			  "2: trigger system error L2 recovery\n");</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='add'>+			  "3: trigger system error L3 rx abort\n");</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='add'>+			  "4: trigger system error L3 tx abort\n");</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='add'>+			  "5: trigger system error L3 tx disable\n");</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='add'>+			  "6: trigger system error L3 bf recovery\n");</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='add'>+			  "7: trigger system error full recovery\n");</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='add'>+			  "8: trigger firmware crash\n");</div><div class='add'>+</div><div class='add'>+	/* SER statistics */</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='add'>+			  "\nlet's dump firmware SER statistics...\n");</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='add'>+			  "::E  R , SER_STATUS        = 0x%08x\n",</div><div class='add'>+			  mt76_rr(dev, MT_SWDEF_SER_STATS));</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='add'>+			  "::E  R , SER_PLE_ERR       = 0x%08x\n",</div><div class='add'>+			  mt76_rr(dev, MT_SWDEF_PLE_STATS));</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='add'>+			  "::E  R , SER_PLE_ERR_1     = 0x%08x\n",</div><div class='add'>+			  mt76_rr(dev, MT_SWDEF_PLE1_STATS));</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='add'>+			  "::E  R , SER_PLE_ERR_AMSDU = 0x%08x\n",</div><div class='add'>+			  mt76_rr(dev, MT_SWDEF_PLE_AMSDU_STATS));</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='add'>+			  "::E  R , SER_PSE_ERR       = 0x%08x\n",</div><div class='add'>+			  mt76_rr(dev, MT_SWDEF_PSE_STATS));</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='add'>+			  "::E  R , SER_PSE_ERR_1     = 0x%08x\n",</div><div class='add'>+			  mt76_rr(dev, MT_SWDEF_PSE1_STATS));</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='add'>+			  "::E  R , SER_LMAC_WISR6_B0 = 0x%08x\n",</div><div class='add'>+			  mt76_rr(dev, MT_SWDEF_LAMC_WISR6_BN0_STATS));</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='add'>+			  "::E  R , SER_LMAC_WISR6_B1 = 0x%08x\n",</div><div class='add'>+			  mt76_rr(dev, MT_SWDEF_LAMC_WISR6_BN1_STATS));</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='add'>+			  "::E  R , SER_LMAC_WISR7_B0 = 0x%08x\n",</div><div class='add'>+			  mt76_rr(dev, MT_SWDEF_LAMC_WISR7_BN0_STATS));</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='add'>+			  "::E  R , SER_LMAC_WISR7_B1 = 0x%08x\n",</div><div class='add'>+			  mt76_rr(dev, MT_SWDEF_LAMC_WISR7_BN1_STATS));</div><div class='add'>+	desc += scnprintf(buff + desc, bufsz - desc,</div><div class='add'>+			  "\nSYS_RESET_COUNT: WM %d, WA %d\n",</div><div class='add'>+			  dev-&gt;recovery.wm_reset_count,</div><div class='add'>+			  dev-&gt;recovery.wa_reset_count);</div><div class='add'>+</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);</div><div class='add'>+	kfree(buff);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_DEBUGFS_ATTRIBUTE(fops_ser_trigger, NULL,</div><div class='del'>-			 mt7915_ser_trigger_set, "%lld\n");</div><div class='add'>+static const struct file_operations mt7915_sys_recovery_ops = {</div><div class='add'>+	.write = mt7915_sys_recovery_set,</div><div class='add'>+	.read = mt7915_sys_recovery_get,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> mt7915_radar_trigger(void *data, u64 val)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_dev *dev = data;</div><div class='add'>+#define RADAR_MAIN_CHAIN	1</div><div class='add'>+#define RADAR_BACKGROUND	2</div><div class='add'>+	struct mt7915_phy *phy = data;</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	int rdd_idx;</div><div class='add'>+</div><div class='add'>+	if (!val || val &gt; RADAR_BACKGROUND)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (val == RADAR_BACKGROUND &amp;&amp; !dev-&gt;rdd2_phy) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Background radar is not enabled\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rdd_idx = mt7915_get_rdd_idx(phy, val == RADAR_BACKGROUND);</div><div class='add'>+	if (rdd_idx &lt; 0) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "No RDD found\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return mt7915_mcu_rdd_cmd(dev, RDD_RADAR_EMULATE, 1, 0, 0);</div><div class='add'>+	return mt76_connac_mcu_rdd_cmd(&amp;dev-&gt;mt76, RDD_RADAR_EMULATE,</div><div class='add'>+				       rdd_idx, 0, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> DEFINE_DEBUGFS_ATTRIBUTE(fops_radar_trigger, NULL,</div><div class='ctx'> 			 mt7915_radar_trigger, "%lld\n");</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt7915_fw_debug_set(void *data, u64 val)</div><div class='add'>+mt7915_muru_debug_set(void *data, u64 val)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = data;</div><div class='add'>+</div><div class='add'>+	dev-&gt;muru_debug = val;</div><div class='add'>+	mt7915_mcu_muru_debug_set(dev, dev-&gt;muru_debug);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7915_muru_debug_get(void *data, u64 *val)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = data;</div><div class='add'>+</div><div class='add'>+	*val = dev-&gt;muru_debug;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(fops_muru_debug, mt7915_muru_debug_get,</div><div class='add'>+			 mt7915_muru_debug_set, "%lld\n");</div><div class='add'>+</div><div class='add'>+static int mt7915_muru_stats_show(struct seq_file *file, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_phy *phy = file-&gt;private;</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	static const char * const dl_non_he_type[] = {</div><div class='add'>+		"CCK", "OFDM", "HT MIX", "HT GF",</div><div class='add'>+		"VHT SU", "VHT 2MU", "VHT 3MU", "VHT 4MU"</div><div class='add'>+	};</div><div class='add'>+	static const char * const dl_he_type[] = {</div><div class='add'>+		"HE SU", "HE EXT", "HE 2MU", "HE 3MU", "HE 4MU",</div><div class='add'>+		"HE 2RU", "HE 3RU", "HE 4RU", "HE 5-8RU", "HE 9-16RU",</div><div class='add'>+		"HE &gt;16RU"</div><div class='add'>+	};</div><div class='add'>+	static const char * const ul_he_type[] = {</div><div class='add'>+		"HE 2MU", "HE 3MU", "HE 4MU", "HE SU", "HE 2RU",</div><div class='add'>+		"HE 3RU", "HE 4RU", "HE 5-8RU", "HE 9-16RU", "HE &gt;16RU"</div><div class='add'>+	};</div><div class='add'>+	int ret, i;</div><div class='add'>+	u64 total_ppdu_cnt, sub_total_cnt;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;muru_debug) {</div><div class='add'>+		seq_puts(file, "Please enable muru_debug first.\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	ret = mt7915_mcu_muru_debug_get(phy);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	/* Non-HE Downlink*/</div><div class='add'>+	seq_puts(file, "[Non-HE]\nDownlink\nData Type:  ");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 5; i++)</div><div class='add'>+		seq_printf(file, "%8s | ", dl_non_he_type[i]);</div><div class='add'>+</div><div class='add'>+	seq_puts(file, "\nTotal Count:");</div><div class='add'>+	seq_printf(file, "%8u | %8u | %8u | %8u | %8u | ",</div><div class='add'>+		   phy-&gt;mib.dl_cck_cnt,</div><div class='add'>+		   phy-&gt;mib.dl_ofdm_cnt,</div><div class='add'>+		   phy-&gt;mib.dl_htmix_cnt,</div><div class='add'>+		   phy-&gt;mib.dl_htgf_cnt,</div><div class='add'>+		   phy-&gt;mib.dl_vht_su_cnt);</div><div class='add'>+</div><div class='add'>+	seq_puts(file, "\nDownlink MU-MIMO\nData Type:  ");</div><div class='add'>+</div><div class='add'>+	for (i = 5; i &lt; 8; i++)</div><div class='add'>+		seq_printf(file, "%8s | ", dl_non_he_type[i]);</div><div class='add'>+</div><div class='add'>+	seq_puts(file, "\nTotal Count:");</div><div class='add'>+	seq_printf(file, "%8u | %8u | %8u | ",</div><div class='add'>+		   phy-&gt;mib.dl_vht_2mu_cnt,</div><div class='add'>+		   phy-&gt;mib.dl_vht_3mu_cnt,</div><div class='add'>+		   phy-&gt;mib.dl_vht_4mu_cnt);</div><div class='add'>+</div><div class='add'>+	sub_total_cnt = (u64)phy-&gt;mib.dl_vht_2mu_cnt +</div><div class='add'>+			     phy-&gt;mib.dl_vht_3mu_cnt +</div><div class='add'>+			     phy-&gt;mib.dl_vht_4mu_cnt;</div><div class='add'>+</div><div class='add'>+	seq_printf(file, "\nTotal non-HE MU-MIMO DL PPDU count: %lld",</div><div class='add'>+		   sub_total_cnt);</div><div class='add'>+</div><div class='add'>+	total_ppdu_cnt = sub_total_cnt +</div><div class='add'>+			 phy-&gt;mib.dl_cck_cnt +</div><div class='add'>+			 phy-&gt;mib.dl_ofdm_cnt +</div><div class='add'>+			 phy-&gt;mib.dl_htmix_cnt +</div><div class='add'>+			 phy-&gt;mib.dl_htgf_cnt +</div><div class='add'>+			 phy-&gt;mib.dl_vht_su_cnt;</div><div class='add'>+</div><div class='add'>+	seq_printf(file, "\nAll non-HE DL PPDU count: %lld", total_ppdu_cnt);</div><div class='add'>+</div><div class='add'>+	/* HE Downlink */</div><div class='add'>+	seq_puts(file, "\n\n[HE]\nDownlink\nData Type:  ");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; i++)</div><div class='add'>+		seq_printf(file, "%8s | ", dl_he_type[i]);</div><div class='add'>+</div><div class='add'>+	seq_puts(file, "\nTotal Count:");</div><div class='add'>+	seq_printf(file, "%8u | %8u | ",</div><div class='add'>+		   phy-&gt;mib.dl_he_su_cnt, phy-&gt;mib.dl_he_ext_su_cnt);</div><div class='add'>+</div><div class='add'>+	seq_puts(file, "\nDownlink MU-MIMO\nData Type:  ");</div><div class='add'>+</div><div class='add'>+	for (i = 2; i &lt; 5; i++)</div><div class='add'>+		seq_printf(file, "%8s | ", dl_he_type[i]);</div><div class='add'>+</div><div class='add'>+	seq_puts(file, "\nTotal Count:");</div><div class='add'>+	seq_printf(file, "%8u | %8u | %8u | ",</div><div class='add'>+		   phy-&gt;mib.dl_he_2mu_cnt, phy-&gt;mib.dl_he_3mu_cnt,</div><div class='add'>+		   phy-&gt;mib.dl_he_4mu_cnt);</div><div class='add'>+</div><div class='add'>+	seq_puts(file, "\nDownlink OFDMA\nData Type:  ");</div><div class='add'>+</div><div class='add'>+	for (i = 5; i &lt; 11; i++)</div><div class='add'>+		seq_printf(file, "%8s | ", dl_he_type[i]);</div><div class='add'>+</div><div class='add'>+	seq_puts(file, "\nTotal Count:");</div><div class='add'>+	seq_printf(file, "%8u | %8u | %8u | %8u | %9u | %8u | ",</div><div class='add'>+		   phy-&gt;mib.dl_he_2ru_cnt,</div><div class='add'>+		   phy-&gt;mib.dl_he_3ru_cnt,</div><div class='add'>+		   phy-&gt;mib.dl_he_4ru_cnt,</div><div class='add'>+		   phy-&gt;mib.dl_he_5to8ru_cnt,</div><div class='add'>+		   phy-&gt;mib.dl_he_9to16ru_cnt,</div><div class='add'>+		   phy-&gt;mib.dl_he_gtr16ru_cnt);</div><div class='add'>+</div><div class='add'>+	sub_total_cnt = (u64)phy-&gt;mib.dl_he_2mu_cnt +</div><div class='add'>+			     phy-&gt;mib.dl_he_3mu_cnt +</div><div class='add'>+			     phy-&gt;mib.dl_he_4mu_cnt;</div><div class='add'>+	total_ppdu_cnt = sub_total_cnt;</div><div class='add'>+</div><div class='add'>+	seq_printf(file, "\nTotal HE MU-MIMO DL PPDU count: %lld",</div><div class='add'>+		   sub_total_cnt);</div><div class='add'>+</div><div class='add'>+	sub_total_cnt = (u64)phy-&gt;mib.dl_he_2ru_cnt +</div><div class='add'>+			     phy-&gt;mib.dl_he_3ru_cnt +</div><div class='add'>+			     phy-&gt;mib.dl_he_4ru_cnt +</div><div class='add'>+			     phy-&gt;mib.dl_he_5to8ru_cnt +</div><div class='add'>+			     phy-&gt;mib.dl_he_9to16ru_cnt +</div><div class='add'>+			     phy-&gt;mib.dl_he_gtr16ru_cnt;</div><div class='add'>+	total_ppdu_cnt += sub_total_cnt;</div><div class='add'>+</div><div class='add'>+	seq_printf(file, "\nTotal HE OFDMA DL PPDU count: %lld",</div><div class='add'>+		   sub_total_cnt);</div><div class='add'>+</div><div class='add'>+	total_ppdu_cnt += (u64)phy-&gt;mib.dl_he_su_cnt +</div><div class='add'>+			       phy-&gt;mib.dl_he_ext_su_cnt;</div><div class='add'>+</div><div class='add'>+	seq_printf(file, "\nAll HE DL PPDU count: %lld", total_ppdu_cnt);</div><div class='add'>+</div><div class='add'>+	/* HE Uplink */</div><div class='add'>+	seq_puts(file, "\n\nUplink");</div><div class='add'>+	seq_puts(file, "\nTrigger-based Uplink MU-MIMO\nData Type:  ");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 3; i++)</div><div class='add'>+		seq_printf(file, "%8s | ", ul_he_type[i]);</div><div class='add'>+</div><div class='add'>+	seq_puts(file, "\nTotal Count:");</div><div class='add'>+	seq_printf(file, "%8u | %8u | %8u | ",</div><div class='add'>+		   phy-&gt;mib.ul_hetrig_2mu_cnt,</div><div class='add'>+		   phy-&gt;mib.ul_hetrig_3mu_cnt,</div><div class='add'>+		   phy-&gt;mib.ul_hetrig_4mu_cnt);</div><div class='add'>+</div><div class='add'>+	seq_puts(file, "\nTrigger-based Uplink OFDMA\nData Type:  ");</div><div class='add'>+</div><div class='add'>+	for (i = 3; i &lt; 10; i++)</div><div class='add'>+		seq_printf(file, "%8s | ", ul_he_type[i]);</div><div class='add'>+</div><div class='add'>+	seq_puts(file, "\nTotal Count:");</div><div class='add'>+	seq_printf(file, "%8u | %8u | %8u | %8u | %8u | %9u |  %7u | ",</div><div class='add'>+		   phy-&gt;mib.ul_hetrig_su_cnt,</div><div class='add'>+		   phy-&gt;mib.ul_hetrig_2ru_cnt,</div><div class='add'>+		   phy-&gt;mib.ul_hetrig_3ru_cnt,</div><div class='add'>+		   phy-&gt;mib.ul_hetrig_4ru_cnt,</div><div class='add'>+		   phy-&gt;mib.ul_hetrig_5to8ru_cnt,</div><div class='add'>+		   phy-&gt;mib.ul_hetrig_9to16ru_cnt,</div><div class='add'>+		   phy-&gt;mib.ul_hetrig_gtr16ru_cnt);</div><div class='add'>+</div><div class='add'>+	sub_total_cnt = (u64)phy-&gt;mib.ul_hetrig_2mu_cnt +</div><div class='add'>+			     phy-&gt;mib.ul_hetrig_3mu_cnt +</div><div class='add'>+			     phy-&gt;mib.ul_hetrig_4mu_cnt;</div><div class='add'>+	total_ppdu_cnt = sub_total_cnt;</div><div class='add'>+</div><div class='add'>+	seq_printf(file, "\nTotal HE MU-MIMO UL TB PPDU count: %lld",</div><div class='add'>+		   sub_total_cnt);</div><div class='add'>+</div><div class='add'>+	sub_total_cnt = (u64)phy-&gt;mib.ul_hetrig_2ru_cnt +</div><div class='add'>+			     phy-&gt;mib.ul_hetrig_3ru_cnt +</div><div class='add'>+			     phy-&gt;mib.ul_hetrig_4ru_cnt +</div><div class='add'>+			     phy-&gt;mib.ul_hetrig_5to8ru_cnt +</div><div class='add'>+			     phy-&gt;mib.ul_hetrig_9to16ru_cnt +</div><div class='add'>+			     phy-&gt;mib.ul_hetrig_gtr16ru_cnt;</div><div class='add'>+	total_ppdu_cnt += sub_total_cnt;</div><div class='add'>+</div><div class='add'>+	seq_printf(file, "\nTotal HE OFDMA UL TB PPDU count: %lld",</div><div class='add'>+		   sub_total_cnt);</div><div class='add'>+</div><div class='add'>+	total_ppdu_cnt += phy-&gt;mib.ul_hetrig_su_cnt;</div><div class='add'>+</div><div class='add'>+	seq_printf(file, "\nAll HE UL TB PPDU count: %lld\n", total_ppdu_cnt);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(mt7915_muru_stats);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7915_rdd_monitor(struct seq_file *s, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = dev_get_drvdata(s-&gt;private);</div><div class='add'>+	struct cfg80211_chan_def *chandef = &amp;dev-&gt;rdd2_chandef;</div><div class='add'>+	const char *bw;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	if (!mt7915_eeprom_has_background_radar(dev)) {</div><div class='add'>+		seq_puts(s, "no background radar capability\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!cfg80211_chandef_valid(chandef)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;rdd2_phy) {</div><div class='add'>+		seq_puts(s, "not running\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (chandef-&gt;width) {</div><div class='add'>+	case NL80211_CHAN_WIDTH_40:</div><div class='add'>+		bw = "40";</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_80:</div><div class='add'>+		bw = "80";</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_160:</div><div class='add'>+		bw = "160";</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_80P80:</div><div class='add'>+		bw = "80P80";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		bw = "20";</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	seq_printf(s, "channel %d (%d MHz) width %s MHz center1: %d MHz\n",</div><div class='add'>+		   chandef-&gt;chan-&gt;hw_value, chandef-&gt;chan-&gt;center_freq,</div><div class='add'>+		   bw, chandef-&gt;center_freq1);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7915_fw_debug_wm_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_dev *dev = data;</div><div class='ctx'> 	enum {</div><div class='hunk'>@@ -84,49 +513,209 @@ mt7915_fw_debug_set(void *data, u64 val)</div><div class='ctx'> 		DEBUG_SPL,</div><div class='ctx'> 		DEBUG_RPT_RX,</div><div class='ctx'> 	} debug;</div><div class='add'>+	bool tx, rx, en;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev-&gt;fw.debug_wm = val ? MCU_FW_LOG_TO_HOST : 0;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;fw.debug_bin)</div><div class='add'>+		val = 16;</div><div class='add'>+	else</div><div class='add'>+		val = dev-&gt;fw.debug_wm;</div><div class='add'>+</div><div class='add'>+	tx = dev-&gt;fw.debug_wm || (dev-&gt;fw.debug_bin &amp; BIT(1));</div><div class='add'>+	rx = dev-&gt;fw.debug_wm || (dev-&gt;fw.debug_bin &amp; BIT(2));</div><div class='add'>+	en = dev-&gt;fw.debug_wm || (dev-&gt;fw.debug_bin &amp; BIT(0));</div><div class='add'>+</div><div class='add'>+	ret = mt7915_mcu_fw_log_2_host(dev, MCU_FW_LOG_WM, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	for (debug = DEBUG_TXCMD; debug &lt;= DEBUG_RPT_RX; debug++) {</div><div class='add'>+		if (debug == DEBUG_RPT_RX)</div><div class='add'>+			val = en &amp;&amp; rx;</div><div class='add'>+		else</div><div class='add'>+			val = en &amp;&amp; tx;</div><div class='add'>+</div><div class='add'>+		ret = mt7915_mcu_fw_dbg_ctrl(dev, debug, val);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* WM CPU info record control */</div><div class='add'>+	mt76_clear(dev, MT_CPU_UTIL_CTRL, BIT(0));</div><div class='add'>+	mt76_wr(dev, MT_DIC_CMD_REG_CMD, BIT(2) | BIT(13) |</div><div class='add'>+		(dev-&gt;fw.debug_wm ? 0 : BIT(0)));</div><div class='add'>+	mt76_wr(dev, MT_MCU_WM_CIRQ_IRQ_MASK_CLR_ADDR, BIT(5));</div><div class='add'>+	mt76_wr(dev, MT_MCU_WM_CIRQ_IRQ_SOFT_ADDR, BIT(5));</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (ret)</div><div class='add'>+		dev-&gt;fw.debug_wm = 0;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7915_fw_debug_wm_get(void *data, u64 *val)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = data;</div><div class='add'>+</div><div class='add'>+	*val = dev-&gt;fw.debug_wm;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(fops_fw_debug_wm, mt7915_fw_debug_wm_get,</div><div class='add'>+			 mt7915_fw_debug_wm_set, "%lld\n");</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7915_fw_debug_wa_set(void *data, u64 val)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev-&gt;fw.debug_wa = val ? MCU_FW_LOG_TO_HOST : 0;</div><div class='add'>+</div><div class='add'>+	ret = mt7915_mcu_fw_log_2_host(dev, MCU_FW_LOG_WA, dev-&gt;fw.debug_wa);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = mt7915_mcu_wa_cmd(dev, MCU_WA_PARAM_CMD(SET),</div><div class='add'>+				MCU_WA_PARAM_PDMA_RX, !!dev-&gt;fw.debug_wa, 0);</div><div class='add'>+out:</div><div class='add'>+	if (ret)</div><div class='add'>+		dev-&gt;fw.debug_wa = 0;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7915_fw_debug_wa_get(void *data, u64 *val)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = data;</div><div class='add'>+</div><div class='add'>+	*val = dev-&gt;fw.debug_wa;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(fops_fw_debug_wa, mt7915_fw_debug_wa_get,</div><div class='add'>+			 mt7915_fw_debug_wa_set, "%lld\n");</div><div class='add'>+</div><div class='add'>+static struct dentry *</div><div class='add'>+create_buf_file_cb(const char *filename, struct dentry *parent, umode_t mode,</div><div class='add'>+		   struct rchan_buf *buf, int *is_global)</div><div class='add'>+{</div><div class='add'>+	struct dentry *f;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;fw_debug = !!val;</div><div class='add'>+	f = debugfs_create_file("fwlog_data", mode, parent, buf,</div><div class='add'>+				&amp;relay_file_operations);</div><div class='add'>+	if (IS_ERR(f))</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	mt7915_mcu_fw_log_2_host(dev, dev-&gt;fw_debug ? 2 : 0);</div><div class='add'>+	*is_global = 1;</div><div class='ctx'> </div><div class='del'>-	for (debug = DEBUG_TXCMD; debug &lt;= DEBUG_RPT_RX; debug++)</div><div class='del'>-		mt7915_mcu_fw_dbg_ctrl(dev, debug, dev-&gt;fw_debug);</div><div class='add'>+	return f;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+remove_buf_file_cb(struct dentry *f)</div><div class='add'>+{</div><div class='add'>+	debugfs_remove(f);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt7915_fw_debug_get(void *data, u64 *val)</div><div class='add'>+mt7915_fw_debug_bin_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='add'>+	static struct rchan_callbacks relay_cb = {</div><div class='add'>+		.create_buf_file = create_buf_file_cb,</div><div class='add'>+		.remove_buf_file = remove_buf_file_cb,</div><div class='add'>+	};</div><div class='ctx'> 	struct mt7915_dev *dev = data;</div><div class='ctx'> </div><div class='del'>-	*val = dev-&gt;fw_debug;</div><div class='add'>+	if (!dev-&gt;relay_fwlog)</div><div class='add'>+		dev-&gt;relay_fwlog = relay_open("fwlog_data", dev-&gt;debugfs_dir,</div><div class='add'>+					    1500, 512, &amp;relay_cb, NULL);</div><div class='add'>+	if (!dev-&gt;relay_fwlog)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev-&gt;fw.debug_bin = val;</div><div class='add'>+</div><div class='add'>+	relay_reset(dev-&gt;relay_fwlog);</div><div class='add'>+</div><div class='add'>+	return mt7915_fw_debug_wm_set(dev, dev-&gt;fw.debug_wm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7915_fw_debug_bin_get(void *data, u64 *val)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = data;</div><div class='add'>+</div><div class='add'>+	*val = dev-&gt;fw.debug_bin;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_DEBUGFS_ATTRIBUTE(fops_fw_debug, mt7915_fw_debug_get,</div><div class='del'>-			 mt7915_fw_debug_set, "%lld\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(fops_fw_debug_bin, mt7915_fw_debug_bin_get,</div><div class='add'>+			 mt7915_fw_debug_bin_set, "%lld\n");</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7915_fw_util_wm_show(struct seq_file *file, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = file-&gt;private;</div><div class='add'>+</div><div class='add'>+	seq_printf(file, "Program counter: 0x%x\n", mt76_rr(dev, MT_WM_MCU_PC));</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;fw.debug_wm) {</div><div class='add'>+		seq_printf(file, "Busy: %u%%  Peak busy: %u%%\n",</div><div class='add'>+			   mt76_rr(dev, MT_CPU_UTIL_BUSY_PCT),</div><div class='add'>+			   mt76_rr(dev, MT_CPU_UTIL_PEAK_BUSY_PCT));</div><div class='add'>+		seq_printf(file, "Idle count: %u  Peak idle count: %u\n",</div><div class='add'>+			   mt76_rr(dev, MT_CPU_UTIL_IDLE_CNT),</div><div class='add'>+			   mt76_rr(dev, MT_CPU_UTIL_PEAK_IDLE_CNT));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(mt7915_fw_util_wm);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7915_fw_util_wa_show(struct seq_file *file, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = file-&gt;private;</div><div class='add'>+</div><div class='add'>+	seq_printf(file, "Program counter: 0x%x\n", mt76_rr(dev, MT_WA_MCU_PC));</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;fw.debug_wa)</div><div class='add'>+		return mt7915_mcu_wa_cmd(dev, MCU_WA_PARAM_CMD(QUERY),</div><div class='add'>+					 MCU_WA_PARAM_CPU_UTIL, 0, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(mt7915_fw_util_wa);</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mt7915_ampdu_stat_read_phy(struct mt7915_phy *phy,</div><div class='ctx'> 			   struct seq_file *file)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_dev *dev = file-&gt;private;</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='del'>-	int bound[15], range[4], i, n;</div><div class='del'>-</div><div class='del'>-	if (!phy)</div><div class='del'>-		return;</div><div class='add'>+	int bound[15], range[4], i;</div><div class='add'>+	u8 band = phy-&gt;mt76-&gt;band_idx;</div><div class='ctx'> </div><div class='ctx'> 	/* Tx ampdu stat */</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(range); i++)</div><div class='del'>-		range[i] = mt76_rr(dev, MT_MIB_ARNG(ext_phy, i));</div><div class='add'>+		range[i] = mt76_rr(dev, MT_MIB_ARNG(band, i));</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(bound); i++)</div><div class='ctx'> 		bound[i] = MT_MIB_ARNCR_RANGE(range[i / 4], i % 4) + 1;</div><div class='ctx'> </div><div class='del'>-	seq_printf(file, "\nPhy %d\n", ext_phy);</div><div class='add'>+	seq_printf(file, "\nPhy %d, Phy band %d\n", ext_phy, band);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(file, "Length: %8d | ", bound[0]);</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(bound) - 1; i++)</div><div class='hunk'>@@ -134,9 +723,8 @@ mt7915_ampdu_stat_read_phy(struct mt7915_phy *phy,</div><div class='ctx'> 			   bound[i] + 1, bound[i + 1]);</div><div class='ctx'> </div><div class='ctx'> 	seq_puts(file, "\nCount:  ");</div><div class='del'>-	n = ext_phy ? ARRAY_SIZE(dev-&gt;mt76.aggr_stats) / 2 : 0;</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(bound); i++)</div><div class='del'>-		seq_printf(file, "%8d | ", dev-&gt;mt76.aggr_stats[i + n]);</div><div class='add'>+		seq_printf(file, "%8d | ", phy-&gt;mt76-&gt;aggr_stats[i]);</div><div class='ctx'> 	seq_puts(file, "\n");</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(file, "BA miss count: %d\n", phy-&gt;mib.ba_miss_cnt);</div><div class='hunk'>@@ -145,48 +733,46 @@ mt7915_ampdu_stat_read_phy(struct mt7915_phy *phy,</div><div class='ctx'> static void</div><div class='ctx'> mt7915_txbf_stat_read_phy(struct mt7915_phy *phy, struct seq_file *s)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_dev *dev = s-&gt;private;</div><div class='del'>-	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='del'>-	int cnt;</div><div class='del'>-</div><div class='del'>-	if (!phy)</div><div class='del'>-		return;</div><div class='add'>+	struct mt76_mib_stats *mib = &amp;phy-&gt;mib;</div><div class='add'>+	static const char * const bw[] = {</div><div class='add'>+		"BW20", "BW40", "BW80", "BW160"</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	/* Tx Beamformer monitor */</div><div class='ctx'> 	seq_puts(s, "\nTx Beamformer applied PPDU counts: ");</div><div class='ctx'> </div><div class='del'>-	cnt = mt76_rr(dev, MT_ETBF_TX_APP_CNT(ext_phy));</div><div class='del'>-	seq_printf(s, "iBF: %ld, eBF: %ld\n",</div><div class='del'>-		   FIELD_GET(MT_ETBF_TX_IBF_CNT, cnt),</div><div class='del'>-		   FIELD_GET(MT_ETBF_TX_EBF_CNT, cnt));</div><div class='add'>+	seq_printf(s, "iBF: %d, eBF: %d\n",</div><div class='add'>+		   mib-&gt;tx_bf_ibf_ppdu_cnt,</div><div class='add'>+		   mib-&gt;tx_bf_ebf_ppdu_cnt);</div><div class='ctx'> </div><div class='ctx'> 	/* Tx Beamformer Rx feedback monitor */</div><div class='ctx'> 	seq_puts(s, "Tx Beamformer Rx feedback statistics: ");</div><div class='ctx'> </div><div class='del'>-	cnt = mt76_rr(dev, MT_ETBF_RX_FB_CNT(ext_phy));</div><div class='del'>-	seq_printf(s, "All: %ld, HE: %ld, VHT: %ld, HT: %ld\n",</div><div class='del'>-		   FIELD_GET(MT_ETBF_RX_FB_ALL, cnt),</div><div class='del'>-		   FIELD_GET(MT_ETBF_RX_FB_HE, cnt),</div><div class='del'>-		   FIELD_GET(MT_ETBF_RX_FB_VHT, cnt),</div><div class='del'>-		   FIELD_GET(MT_ETBF_RX_FB_HT, cnt));</div><div class='add'>+	seq_printf(s, "All: %d, HE: %d, VHT: %d, HT: %d, ",</div><div class='add'>+		   mib-&gt;tx_bf_rx_fb_all_cnt,</div><div class='add'>+		   mib-&gt;tx_bf_rx_fb_he_cnt,</div><div class='add'>+		   mib-&gt;tx_bf_rx_fb_vht_cnt,</div><div class='add'>+		   mib-&gt;tx_bf_rx_fb_ht_cnt);</div><div class='add'>+</div><div class='add'>+	seq_printf(s, "%s, NC: %d, NR: %d\n",</div><div class='add'>+		   bw[mib-&gt;tx_bf_rx_fb_bw],</div><div class='add'>+		   mib-&gt;tx_bf_rx_fb_nc_cnt,</div><div class='add'>+		   mib-&gt;tx_bf_rx_fb_nr_cnt);</div><div class='ctx'> </div><div class='ctx'> 	/* Tx Beamformee Rx NDPA &amp; Tx feedback report */</div><div class='del'>-	cnt = mt76_rr(dev, MT_ETBF_TX_NDP_BFRP(ext_phy));</div><div class='del'>-	seq_printf(s, "Tx Beamformee successful feedback frames: %ld\n",</div><div class='del'>-		   FIELD_GET(MT_ETBF_TX_FB_CPL, cnt));</div><div class='del'>-	seq_printf(s, "Tx Beamformee feedback triggered counts: %ld\n",</div><div class='del'>-		   FIELD_GET(MT_ETBF_TX_FB_TRI, cnt));</div><div class='add'>+	seq_printf(s, "Tx Beamformee successful feedback frames: %d\n",</div><div class='add'>+		   mib-&gt;tx_bf_fb_cpl_cnt);</div><div class='add'>+	seq_printf(s, "Tx Beamformee feedback triggered counts: %d\n",</div><div class='add'>+		   mib-&gt;tx_bf_fb_trig_cnt);</div><div class='ctx'> </div><div class='ctx'> 	/* Tx SU &amp; MU counters */</div><div class='del'>-	cnt = mt76_rr(dev, MT_MIB_SDR34(ext_phy));</div><div class='del'>-	seq_printf(s, "Tx multi-user Beamforming counts: %ld\n",</div><div class='del'>-		   FIELD_GET(MT_MIB_MU_BF_TX_CNT, cnt));</div><div class='del'>-	cnt = mt76_rr(dev, MT_MIB_DR8(ext_phy));</div><div class='del'>-	seq_printf(s, "Tx multi-user MPDU counts: %d\n", cnt);</div><div class='del'>-	cnt = mt76_rr(dev, MT_MIB_DR9(ext_phy));</div><div class='del'>-	seq_printf(s, "Tx multi-user successful MPDU counts: %d\n", cnt);</div><div class='del'>-	cnt = mt76_rr(dev, MT_MIB_DR11(ext_phy));</div><div class='del'>-	seq_printf(s, "Tx single-user successful MPDU counts: %d\n", cnt);</div><div class='add'>+	seq_printf(s, "Tx multi-user Beamforming counts: %d\n",</div><div class='add'>+		   mib-&gt;tx_bf_cnt);</div><div class='add'>+	seq_printf(s, "Tx multi-user MPDU counts: %d\n", mib-&gt;tx_mu_mpdu_cnt);</div><div class='add'>+	seq_printf(s, "Tx multi-user successful MPDU counts: %d\n",</div><div class='add'>+		   mib-&gt;tx_mu_acked_mpdu_cnt);</div><div class='add'>+	seq_printf(s, "Tx single-user successful MPDU counts: %d\n",</div><div class='add'>+		   mib-&gt;tx_su_acked_mpdu_cnt);</div><div class='ctx'> </div><div class='ctx'> 	seq_puts(s, "\n");</div><div class='ctx'> }</div><div class='hunk'>@@ -194,103 +780,189 @@ mt7915_txbf_stat_read_phy(struct mt7915_phy *phy, struct seq_file *s)</div><div class='ctx'> static int</div><div class='ctx'> mt7915_tx_stats_show(struct seq_file *file, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_dev *dev = file-&gt;private;</div><div class='del'>-	int stat[8], i, n;</div><div class='add'>+	struct mt7915_phy *phy = file-&gt;private;</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct mt76_mib_stats *mib = &amp;phy-&gt;mib;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	mt7915_ampdu_stat_read_phy(&amp;dev-&gt;phy, file);</div><div class='del'>-	mt7915_txbf_stat_read_phy(&amp;dev-&gt;phy, file);</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='del'>-	mt7915_ampdu_stat_read_phy(mt7915_ext_phy(dev), file);</div><div class='del'>-	mt7915_txbf_stat_read_phy(mt7915_ext_phy(dev), file);</div><div class='add'>+	mt7915_ampdu_stat_read_phy(phy, file);</div><div class='add'>+	mt7915_mac_update_stats(phy);</div><div class='add'>+	mt7915_txbf_stat_read_phy(phy, file);</div><div class='ctx'> </div><div class='ctx'> 	/* Tx amsdu info */</div><div class='del'>-	seq_puts(file, "Tx MSDU stat:\n");</div><div class='del'>-	for (i = 0, n = 0; i &lt; ARRAY_SIZE(stat); i++) {</div><div class='del'>-		stat[i] = mt76_rr(dev,  MT_PLE_AMSDU_PACK_MSDU_CNT(i));</div><div class='del'>-		n += stat[i];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(stat); i++) {</div><div class='del'>-		seq_printf(file, "AMSDU pack count of %d MSDU in TXD: 0x%x ",</div><div class='del'>-			   i + 1, stat[i]);</div><div class='del'>-		if (n != 0)</div><div class='del'>-			seq_printf(file, "(%d%%)\n", stat[i] * 100 / n);</div><div class='add'>+	seq_puts(file, "Tx MSDU statistics:\n");</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mib-&gt;tx_amsdu); i++) {</div><div class='add'>+		seq_printf(file, "AMSDU pack count of %d MSDU in TXD: %8d ",</div><div class='add'>+			   i + 1, mib-&gt;tx_amsdu[i]);</div><div class='add'>+		if (mib-&gt;tx_amsdu_cnt)</div><div class='add'>+			seq_printf(file, "(%3d%%)\n",</div><div class='add'>+				   mib-&gt;tx_amsdu[i] * 100 / mib-&gt;tx_amsdu_cnt);</div><div class='ctx'> 		else</div><div class='ctx'> 			seq_puts(file, "\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> DEFINE_SHOW_ATTRIBUTE(mt7915_tx_stats);</div><div class='ctx'> </div><div class='del'>-static int mt7915_read_temperature(struct seq_file *s, void *data)</div><div class='add'>+static void</div><div class='add'>+mt7915_hw_queue_read(struct seq_file *s, u32 size,</div><div class='add'>+		     const struct hw_queue_map *map)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_dev *dev = dev_get_drvdata(s-&gt;private);</div><div class='del'>-	int temp;</div><div class='add'>+	struct mt7915_phy *phy = s-&gt;private;</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	u32 i, val;</div><div class='ctx'> </div><div class='del'>-	/* cpu */</div><div class='del'>-	temp = mt7915_mcu_get_temperature(dev, 0);</div><div class='del'>-	seq_printf(s, "Temperature: %d\n", temp);</div><div class='add'>+	val = mt76_rr(dev, MT_FL_Q_EMPTY);</div><div class='add'>+	for (i = 0; i &lt; size; i++) {</div><div class='add'>+		u32 ctrl, head, tail, queued;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+		if (val &amp; BIT(map[i].index))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ctrl = BIT(31) | (map[i].pid &lt;&lt; 10) | ((u32)map[i].qid &lt;&lt; 24);</div><div class='add'>+		mt76_wr(dev, MT_FL_Q0_CTRL, ctrl);</div><div class='add'>+</div><div class='add'>+		head = mt76_get_field(dev, MT_FL_Q2_CTRL,</div><div class='add'>+				      GENMASK(11, 0));</div><div class='add'>+		tail = mt76_get_field(dev, MT_FL_Q2_CTRL,</div><div class='add'>+				      GENMASK(27, 16));</div><div class='add'>+		queued = mt76_get_field(dev, MT_FL_Q3_CTRL,</div><div class='add'>+					GENMASK(11, 0));</div><div class='add'>+</div><div class='add'>+		seq_printf(s, "\t%s: ", map[i].name);</div><div class='add'>+		seq_printf(s, "queued:0x%03x head:0x%03x tail:0x%03x\n",</div><div class='add'>+			   queued, head, tail);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt7915_queues_acq(struct seq_file *s, void *data)</div><div class='add'>+static void</div><div class='add'>+mt7915_sta_hw_queue_read(void *data, struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_dev *dev = dev_get_drvdata(s-&gt;private);</div><div class='del'>-	int i;</div><div class='add'>+	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct mt7915_dev *dev = msta-&gt;vif-&gt;phy-&gt;dev;</div><div class='add'>+	struct seq_file *s = data;</div><div class='add'>+	u8 ac;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 16; i++) {</div><div class='del'>-		int j, acs = i / 4, index = i % 4;</div><div class='del'>-		u32 ctrl, val, qlen = 0;</div><div class='add'>+	for (ac = 0; ac &lt; 4; ac++) {</div><div class='add'>+		u32 qlen, ctrl, val;</div><div class='add'>+		u32 idx = msta-&gt;wcid.idx &gt;&gt; 5;</div><div class='add'>+		u8 offs = msta-&gt;wcid.idx &amp; GENMASK(4, 0);</div><div class='ctx'> </div><div class='del'>-		val = mt76_rr(dev, MT_PLE_AC_QEMPTY(acs, index));</div><div class='del'>-		ctrl = BIT(31) | BIT(15) | (acs &lt;&lt; 8);</div><div class='add'>+		ctrl = BIT(31) | BIT(11) | (ac &lt;&lt; 24);</div><div class='add'>+		val = mt76_rr(dev, MT_PLE_AC_QEMPTY(ac, idx));</div><div class='ctx'> </div><div class='del'>-		for (j = 0; j &lt; 32; j++) {</div><div class='del'>-			if (val &amp; BIT(j))</div><div class='del'>-				continue;</div><div class='add'>+		if (val &amp; BIT(offs))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-			mt76_wr(dev, MT_PLE_FL_Q0_CTRL,</div><div class='del'>-				ctrl | (j + (index &lt;&lt; 5)));</div><div class='del'>-			qlen += mt76_get_field(dev, MT_PLE_FL_Q3_CTRL,</div><div class='del'>-					       GENMASK(11, 0));</div><div class='del'>-		}</div><div class='del'>-		seq_printf(s, "AC%d%d: queued=%d\n", acs, index, qlen);</div><div class='add'>+		mt76_wr(dev, MT_FL_Q0_CTRL, ctrl | msta-&gt;wcid.idx);</div><div class='add'>+		qlen = mt76_get_field(dev, MT_FL_Q3_CTRL,</div><div class='add'>+				      GENMASK(11, 0));</div><div class='add'>+		seq_printf(s, "\tSTA %pM wcid %d: AC%d%d queued:%d\n",</div><div class='add'>+			   sta-&gt;addr, msta-&gt;wcid.idx,</div><div class='add'>+			   msta-&gt;vif-&gt;mt76.wmm_idx, ac, qlen);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7915_hw_queues_show(struct seq_file *file, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_phy *phy = file-&gt;private;</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	static const struct hw_queue_map ple_queue_map[] = {</div><div class='add'>+		{ "CPU_Q0",  0,  1, MT_CTX0	      },</div><div class='add'>+		{ "CPU_Q1",  1,  1, MT_CTX0 + 1	      },</div><div class='add'>+		{ "CPU_Q2",  2,  1, MT_CTX0 + 2	      },</div><div class='add'>+		{ "CPU_Q3",  3,  1, MT_CTX0 + 3	      },</div><div class='add'>+		{ "ALTX_Q0", 8,  2, MT_LMAC_ALTX0     },</div><div class='add'>+		{ "BMC_Q0",  9,  2, MT_LMAC_BMC0      },</div><div class='add'>+		{ "BCN_Q0",  10, 2, MT_LMAC_BCN0      },</div><div class='add'>+		{ "PSMP_Q0", 11, 2, MT_LMAC_PSMP0     },</div><div class='add'>+		{ "ALTX_Q1", 12, 2, MT_LMAC_ALTX0 + 4 },</div><div class='add'>+		{ "BMC_Q1",  13, 2, MT_LMAC_BMC0  + 4 },</div><div class='add'>+		{ "BCN_Q1",  14, 2, MT_LMAC_BCN0  + 4 },</div><div class='add'>+		{ "PSMP_Q1", 15, 2, MT_LMAC_PSMP0 + 4 },</div><div class='add'>+	};</div><div class='add'>+	static const struct hw_queue_map pse_queue_map[] = {</div><div class='add'>+		{ "CPU Q0",  0,  1, MT_CTX0	      },</div><div class='add'>+		{ "CPU Q1",  1,  1, MT_CTX0 + 1	      },</div><div class='add'>+		{ "CPU Q2",  2,  1, MT_CTX0 + 2	      },</div><div class='add'>+		{ "CPU Q3",  3,  1, MT_CTX0 + 3	      },</div><div class='add'>+		{ "HIF_Q0",  8,  0, MT_HIF0	      },</div><div class='add'>+		{ "HIF_Q1",  9,  0, MT_HIF0 + 1	      },</div><div class='add'>+		{ "HIF_Q2",  10, 0, MT_HIF0 + 2	      },</div><div class='add'>+		{ "HIF_Q3",  11, 0, MT_HIF0 + 3	      },</div><div class='add'>+		{ "HIF_Q4",  12, 0, MT_HIF0 + 4	      },</div><div class='add'>+		{ "HIF_Q5",  13, 0, MT_HIF0 + 5	      },</div><div class='add'>+		{ "LMAC_Q",  16, 2, 0		      },</div><div class='add'>+		{ "MDP_TXQ", 17, 2, 1		      },</div><div class='add'>+		{ "MDP_RXQ", 18, 2, 2		      },</div><div class='add'>+		{ "SEC_TXQ", 19, 2, 3		      },</div><div class='add'>+		{ "SEC_RXQ", 20, 2, 4		      },</div><div class='add'>+	};</div><div class='add'>+	u32 val, head, tail;</div><div class='add'>+</div><div class='add'>+	/* ple queue */</div><div class='add'>+	val = mt76_rr(dev, MT_PLE_FREEPG_CNT);</div><div class='add'>+	head = mt76_get_field(dev, MT_PLE_FREEPG_HEAD_TAIL, GENMASK(11, 0));</div><div class='add'>+	tail = mt76_get_field(dev, MT_PLE_FREEPG_HEAD_TAIL, GENMASK(27, 16));</div><div class='add'>+	seq_puts(file, "PLE page info:\n");</div><div class='add'>+	seq_printf(file,</div><div class='add'>+		   "\tTotal free page: 0x%08x head: 0x%03x tail: 0x%03x\n",</div><div class='add'>+		   val, head, tail);</div><div class='add'>+</div><div class='add'>+	val = mt76_rr(dev, MT_PLE_PG_HIF_GROUP);</div><div class='add'>+	head = mt76_get_field(dev, MT_PLE_HIF_PG_INFO, GENMASK(11, 0));</div><div class='add'>+	tail = mt76_get_field(dev, MT_PLE_HIF_PG_INFO, GENMASK(27, 16));</div><div class='add'>+	seq_printf(file, "\tHIF free page: 0x%03x res: 0x%03x used: 0x%03x\n",</div><div class='add'>+		   val, head, tail);</div><div class='add'>+</div><div class='add'>+	seq_puts(file, "PLE non-empty queue info:\n");</div><div class='add'>+	mt7915_hw_queue_read(file, ARRAY_SIZE(ple_queue_map),</div><div class='add'>+			     &amp;ple_queue_map[0]);</div><div class='add'>+</div><div class='add'>+	/* iterate per-sta ple queue */</div><div class='add'>+	ieee80211_iterate_stations_atomic(phy-&gt;mt76-&gt;hw,</div><div class='add'>+					  mt7915_sta_hw_queue_read, file);</div><div class='add'>+	/* pse queue */</div><div class='add'>+	seq_puts(file, "PSE non-empty queue info:\n");</div><div class='add'>+	mt7915_hw_queue_read(file, ARRAY_SIZE(pse_queue_map),</div><div class='add'>+			     &amp;pse_queue_map[0]);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(mt7915_hw_queues);</div><div class='add'>+</div><div class='ctx'> static int</div><div class='del'>-mt7915_queues_read(struct seq_file *s, void *data)</div><div class='add'>+mt7915_xmit_queues_show(struct seq_file *file, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_dev *dev = dev_get_drvdata(s-&gt;private);</div><div class='del'>-	struct mt76_phy *mphy_ext = dev-&gt;mt76.phy2;</div><div class='del'>-	struct mt76_queue *ext_q = mphy_ext ? mphy_ext-&gt;q_tx[MT_TXQ_BE] : NULL;</div><div class='add'>+	struct mt7915_phy *phy = file-&gt;private;</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct mt76_queue *q;</div><div class='ctx'> 		char *queue;</div><div class='ctx'> 	} queue_map[] = {</div><div class='del'>-		{ dev-&gt;mphy.q_tx[MT_TXQ_BE],	 "WFDMA0" },</div><div class='del'>-		{ ext_q,			 "WFDMA1" },</div><div class='del'>-		{ dev-&gt;mphy.q_tx[MT_TXQ_BE],	 "WFDMA0" },</div><div class='del'>-		{ dev-&gt;mt76.q_mcu[MT_MCUQ_WM],	 "MCUWM"  },</div><div class='del'>-		{ dev-&gt;mt76.q_mcu[MT_MCUQ_WA],	 "MCUWA"  },</div><div class='del'>-		{ dev-&gt;mt76.q_mcu[MT_MCUQ_FWDL], "MCUFWQ" },</div><div class='add'>+		{ phy-&gt;mt76-&gt;q_tx[MT_TXQ_BE],	 "   MAIN"  },</div><div class='add'>+		{ dev-&gt;mt76.q_mcu[MT_MCUQ_WM],	 "  MCUWM"  },</div><div class='add'>+		{ dev-&gt;mt76.q_mcu[MT_MCUQ_WA],	 "  MCUWA"  },</div><div class='add'>+		{ dev-&gt;mt76.q_mcu[MT_MCUQ_FWDL], "MCUFWDL" },</div><div class='ctx'> 	};</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	seq_puts(file, "     queue | hw-queued |      head |      tail |\n");</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(queue_map); i++) {</div><div class='ctx'> 		struct mt76_queue *q = queue_map[i].q;</div><div class='ctx'> </div><div class='ctx'> 		if (!q)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		seq_printf(s,</div><div class='del'>-			   "%s:	queued=%d head=%d tail=%d\n",</div><div class='add'>+		seq_printf(file, "   %s | %9d | %9d | %9d |\n",</div><div class='ctx'> 			   queue_map[i].queue, q-&gt;queued, q-&gt;head,</div><div class='ctx'> 			   q-&gt;tail);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -298,171 +970,518 @@ mt7915_queues_read(struct seq_file *s, void *data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7915_puts_rate_txpower(struct seq_file *s, struct mt7915_phy *phy)</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(mt7915_xmit_queues);</div><div class='add'>+</div><div class='add'>+#define mt7915_txpower_puts(rate)						\</div><div class='add'>+({										\</div><div class='add'>+	len += scnprintf(buf + len, sz - len, "%-16s:", #rate " (TMAC)");	\</div><div class='add'>+	for (i = 0; i &lt; mt7915_sku_group_len[SKU_##rate]; i++, offs++)		\</div><div class='add'>+		len += scnprintf(buf + len, sz - len, " %6d", txpwr[offs]);	\</div><div class='add'>+	len += scnprintf(buf + len, sz - len, "\n");				\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define mt7915_txpower_sets(rate, pwr, flag)			\</div><div class='add'>+({								\</div><div class='add'>+	offs += len;						\</div><div class='add'>+	len = mt7915_sku_group_len[rate];			\</div><div class='add'>+	if (mode == flag) {					\</div><div class='add'>+		for (i = 0; i &lt; len; i++)			\</div><div class='add'>+			req.txpower_sku[offs + i] = pwr;	\</div><div class='add'>+	}							\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+mt7915_rate_txpower_get(struct file *file, char __user *user_buf,</div><div class='add'>+			size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	static const char * const sku_group_name[] = {</div><div class='del'>-		"CCK", "OFDM", "HT20", "HT40",</div><div class='del'>-		"VHT20", "VHT40", "VHT80", "VHT160",</div><div class='del'>-		"RU26", "RU52", "RU106", "RU242/SU20",</div><div class='del'>-		"RU484/SU40", "RU996/SU80", "RU2x996/SU160"</div><div class='add'>+	struct mt7915_phy *phy = file-&gt;private_data;</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	s8 txpwr[MT7915_SKU_RATE_NUM];</div><div class='add'>+	static const size_t sz = 2048;</div><div class='add'>+	u8 band = phy-&gt;mt76-&gt;band_idx;</div><div class='add'>+	int i, offs = 0, len = 0;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	char *buf;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(sz, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = mt7915_mcu_get_txpower_sku(phy, txpwr, sizeof(txpwr), TX_POWER_INFO_RATE);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Txpower propagation path: TMAC -&gt; TXV -&gt; BBP */</div><div class='add'>+	len += scnprintf(buf + len, sz - len,</div><div class='add'>+			 "\nPhy%d Tx power table (channel %d)\n",</div><div class='add'>+			 phy != &amp;dev-&gt;phy, phy-&gt;mt76-&gt;chandef.chan-&gt;hw_value);</div><div class='add'>+	len += scnprintf(buf + len, sz - len, "%-16s  %6s %6s %6s %6s\n",</div><div class='add'>+			 " ", "1m", "2m", "5m", "11m");</div><div class='add'>+	mt7915_txpower_puts(CCK);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, sz - len,</div><div class='add'>+			 "%-16s  %6s %6s %6s %6s %6s %6s %6s %6s\n",</div><div class='add'>+			 " ", "6m", "9m", "12m", "18m", "24m", "36m", "48m",</div><div class='add'>+			 "54m");</div><div class='add'>+	mt7915_txpower_puts(OFDM);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, sz - len,</div><div class='add'>+			 "%-16s  %6s %6s %6s %6s %6s %6s %6s %6s\n",</div><div class='add'>+			 " ", "mcs0", "mcs1", "mcs2", "mcs3", "mcs4",</div><div class='add'>+			 "mcs5", "mcs6", "mcs7");</div><div class='add'>+	mt7915_txpower_puts(HT_BW20);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, sz - len,</div><div class='add'>+			 "%-16s  %6s %6s %6s %6s %6s %6s %6s %6s %6s\n",</div><div class='add'>+			 " ", "mcs0", "mcs1", "mcs2", "mcs3", "mcs4", "mcs5",</div><div class='add'>+			 "mcs6", "mcs7", "mcs32");</div><div class='add'>+	mt7915_txpower_puts(HT_BW40);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, sz - len,</div><div class='add'>+			 "%-16s  %6s %6s %6s %6s %6s %6s %6s %6s %6s %6s %6s %6s\n",</div><div class='add'>+			 " ", "mcs0", "mcs1", "mcs2", "mcs3", "mcs4", "mcs5",</div><div class='add'>+			 "mcs6", "mcs7", "mcs8", "mcs9", "mcs10", "mcs11");</div><div class='add'>+	mt7915_txpower_puts(VHT_BW20);</div><div class='add'>+	mt7915_txpower_puts(VHT_BW40);</div><div class='add'>+	mt7915_txpower_puts(VHT_BW80);</div><div class='add'>+	mt7915_txpower_puts(VHT_BW160);</div><div class='add'>+	mt7915_txpower_puts(HE_RU26);</div><div class='add'>+	mt7915_txpower_puts(HE_RU52);</div><div class='add'>+	mt7915_txpower_puts(HE_RU106);</div><div class='add'>+	mt7915_txpower_puts(HE_RU242);</div><div class='add'>+	mt7915_txpower_puts(HE_RU484);</div><div class='add'>+	mt7915_txpower_puts(HE_RU996);</div><div class='add'>+	mt7915_txpower_puts(HE_RU2x996);</div><div class='add'>+</div><div class='add'>+	reg = is_mt7915(&amp;dev-&gt;mt76) ? MT_WF_PHY_TPC_CTRL_STAT(band) :</div><div class='add'>+	      MT_WF_PHY_TPC_CTRL_STAT_MT7916(band);</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, sz - len, "\nTx power (bbp)  : %6ld\n",</div><div class='add'>+			 mt76_get_field(dev, reg, MT_WF_PHY_TPC_POWER));</div><div class='add'>+</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+mt7915_rate_txpower_set(struct file *file, const char __user *user_buf,</div><div class='add'>+			size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	int i, ret, pwr, pwr160 = 0, pwr80 = 0, pwr40 = 0, pwr20 = 0;</div><div class='add'>+	struct mt7915_phy *phy = file-&gt;private_data;</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct mt76_phy *mphy = phy-&gt;mt76;</div><div class='add'>+	struct mt7915_mcu_txpower_sku req = {</div><div class='add'>+		.format_id = TX_POWER_LIMIT_TABLE,</div><div class='add'>+		.band_idx = phy-&gt;mt76-&gt;band_idx,</div><div class='ctx'> 	};</div><div class='del'>-	struct mt7915_dev *dev = dev_get_drvdata(s-&gt;private);</div><div class='del'>-	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='del'>-	u32 reg_base;</div><div class='del'>-	int i, idx = 0;</div><div class='add'>+	char buf[100];</div><div class='add'>+	enum mac80211_rx_encoding mode;</div><div class='add'>+	u32 offs = 0, len = 0;</div><div class='ctx'> </div><div class='del'>-	if (!phy)</div><div class='del'>-		return;</div><div class='add'>+	if (count &gt;= sizeof(buf))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	reg_base = MT_TMAC_FP0R0(ext_phy);</div><div class='del'>-	seq_printf(s, "\nBand %d\n", ext_phy);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(mt7915_sku_group_len); i++) {</div><div class='del'>-		u8 cnt, mcs_num = mt7915_sku_group_len[i];</div><div class='del'>-		s8 txpower[12];</div><div class='del'>-		int j;</div><div class='del'>-</div><div class='del'>-		if (i == SKU_HT_BW20 || i == SKU_HT_BW40) {</div><div class='del'>-			mcs_num = 8;</div><div class='del'>-		} else if (i &gt;= SKU_VHT_BW20 &amp;&amp; i &lt;= SKU_VHT_BW160) {</div><div class='del'>-			mcs_num = 10;</div><div class='del'>-		} else if (i == SKU_HE_RU26) {</div><div class='del'>-			reg_base = MT_TMAC_FP0R18(ext_phy);</div><div class='del'>-			idx = 0;</div><div class='del'>-		}</div><div class='add'>+	if (copy_from_user(buf, user_buf, count))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (count &amp;&amp; buf[count - 1] == '\n')</div><div class='add'>+		buf[count - 1] = '\0';</div><div class='add'>+	else</div><div class='add'>+		buf[count] = '\0';</div><div class='ctx'> </div><div class='del'>-		for (j = 0, cnt = 0; j &lt; DIV_ROUND_UP(mcs_num, 4); j++) {</div><div class='del'>-			u32 val;</div><div class='add'>+	if (sscanf(buf, "%u %u %u %u %u",</div><div class='add'>+		   &amp;mode, &amp;pwr160, &amp;pwr80, &amp;pwr40, &amp;pwr20) != 5) {</div><div class='add'>+		dev_warn(dev-&gt;mt76.dev,</div><div class='add'>+			 "per bandwidth power limit: Mode BW160 BW80 BW40 BW20");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			if (i == SKU_VHT_BW160 &amp;&amp; idx == 60) {</div><div class='del'>-				reg_base = MT_TMAC_FP0R15(ext_phy);</div><div class='del'>-				idx = 0;</div><div class='del'>-			}</div><div class='add'>+	if (mode &gt; RX_ENC_HE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (pwr160)</div><div class='add'>+		pwr160 = mt76_get_power_bound(mphy, pwr160);</div><div class='add'>+	if (pwr80)</div><div class='add'>+		pwr80 = mt76_get_power_bound(mphy, pwr80);</div><div class='add'>+	if (pwr40)</div><div class='add'>+		pwr40 = mt76_get_power_bound(mphy, pwr40);</div><div class='add'>+	if (pwr20)</div><div class='add'>+		pwr20 = mt76_get_power_bound(mphy, pwr20);</div><div class='add'>+</div><div class='add'>+	if (pwr160 &lt; 0 || pwr80 &lt; 0 || pwr40 &lt; 0 || pwr20 &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+	ret = mt7915_mcu_get_txpower_sku(phy, req.txpower_sku,</div><div class='add'>+					 sizeof(req.txpower_sku), TX_POWER_INFO_RATE);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mt7915_txpower_sets(SKU_CCK, pwr20, RX_ENC_LEGACY);</div><div class='add'>+	mt7915_txpower_sets(SKU_OFDM, pwr20, RX_ENC_LEGACY);</div><div class='add'>+	if (mode == RX_ENC_LEGACY)</div><div class='add'>+		goto skip;</div><div class='add'>+</div><div class='add'>+	mt7915_txpower_sets(SKU_HT_BW20, pwr20, RX_ENC_HT);</div><div class='add'>+	mt7915_txpower_sets(SKU_HT_BW40, pwr40, RX_ENC_HT);</div><div class='add'>+	if (mode == RX_ENC_HT)</div><div class='add'>+		goto skip;</div><div class='add'>+</div><div class='add'>+	mt7915_txpower_sets(SKU_VHT_BW20, pwr20, RX_ENC_VHT);</div><div class='add'>+	mt7915_txpower_sets(SKU_VHT_BW40, pwr40, RX_ENC_VHT);</div><div class='add'>+	mt7915_txpower_sets(SKU_VHT_BW80, pwr80, RX_ENC_VHT);</div><div class='add'>+	mt7915_txpower_sets(SKU_VHT_BW160, pwr160, RX_ENC_VHT);</div><div class='add'>+	if (mode == RX_ENC_VHT)</div><div class='add'>+		goto skip;</div><div class='add'>+</div><div class='add'>+	mt7915_txpower_sets(SKU_HE_RU26, pwr20, RX_ENC_HE + 1);</div><div class='add'>+	mt7915_txpower_sets(SKU_HE_RU52, pwr20, RX_ENC_HE + 1);</div><div class='add'>+	mt7915_txpower_sets(SKU_HE_RU106, pwr20, RX_ENC_HE + 1);</div><div class='add'>+	mt7915_txpower_sets(SKU_HE_RU242, pwr20, RX_ENC_HE);</div><div class='add'>+	mt7915_txpower_sets(SKU_HE_RU484, pwr40, RX_ENC_HE);</div><div class='add'>+	mt7915_txpower_sets(SKU_HE_RU996, pwr80, RX_ENC_HE);</div><div class='add'>+	mt7915_txpower_sets(SKU_HE_RU2x996, pwr160, RX_ENC_HE);</div><div class='add'>+skip:</div><div class='add'>+	ret = mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(TX_POWER_FEATURE_CTRL),</div><div class='add'>+				&amp;req, sizeof(req), true);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	pwr = max3(pwr80, pwr40, pwr20);</div><div class='add'>+	mphy-&gt;txpower_cur = max3(mphy-&gt;txpower_cur, pwr160, pwr);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	return ret ? ret : count;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			val = mt76_rr(dev, reg_base + (idx / 4) * 4);</div><div class='add'>+static const struct file_operations mt7915_txpower_fops = {</div><div class='add'>+	.write = mt7915_rate_txpower_set,</div><div class='add'>+	.read = mt7915_rate_txpower_get,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-			if (idx &amp;&amp; idx % 4)</div><div class='del'>-				val &gt;&gt;= (idx % 4) * 8;</div><div class='add'>+static int</div><div class='add'>+mt7915_path_txpower_show(struct seq_file *file)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_phy *phy = file-&gt;private;</div><div class='add'>+	s8 txpower[MT7915_SKU_PATH_NUM], *buf = txpower;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+#define PATH_POWER_SHOW(_name, _len, _skip) do {			\</div><div class='add'>+		size_t __len = (_len);					\</div><div class='add'>+		if (_skip) {						\</div><div class='add'>+			buf -= 1;					\</div><div class='add'>+			*buf = 0;					\</div><div class='add'>+		}							\</div><div class='add'>+		mt76_seq_puts_array(file, _name, buf, __len);		\</div><div class='add'>+		buf += __len;						\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+	seq_printf(file, "\n%*c", 18, ' ');</div><div class='add'>+	seq_puts(file, "1T1S/2T1S/3T1S/4T1S/2T2S/3T2S/4T2S/3T3S/4T3S/4T4S\n");</div><div class='add'>+	ret = mt7915_mcu_get_txpower_sku(phy, txpower, sizeof(txpower),</div><div class='add'>+					 TX_POWER_INFO_PATH);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	PATH_POWER_SHOW("CCK", 4, 0);</div><div class='add'>+	PATH_POWER_SHOW("OFDM", 4, 0);</div><div class='add'>+	PATH_POWER_SHOW("BF-OFDM", 4, 1);</div><div class='add'>+</div><div class='add'>+	PATH_POWER_SHOW("HT/VHT20", 10, 0);</div><div class='add'>+	PATH_POWER_SHOW("BF-HT/VHT20", 10, 1);</div><div class='add'>+	PATH_POWER_SHOW("HT/VHT40", 10, 0);</div><div class='add'>+	PATH_POWER_SHOW("BF-HT/VHT40", 10, 1);</div><div class='add'>+</div><div class='add'>+	PATH_POWER_SHOW("BW20/RU242", 10, 0);</div><div class='add'>+	PATH_POWER_SHOW("BF-BW20/RU242", 10, 1);</div><div class='add'>+	PATH_POWER_SHOW("BW40/RU484", 10, 0);</div><div class='add'>+	PATH_POWER_SHOW("BF-BW40/RU484", 10, 1);</div><div class='add'>+	PATH_POWER_SHOW("BW80/RU996", 10, 0);</div><div class='add'>+	PATH_POWER_SHOW("BF-BW80/RU996", 10, 1);</div><div class='add'>+	PATH_POWER_SHOW("BW160/RU2x996", 10, 0);</div><div class='add'>+	PATH_POWER_SHOW("BF-BW160/RU2x996", 10, 1);</div><div class='add'>+	PATH_POWER_SHOW("RU26", 10, 0);</div><div class='add'>+	PATH_POWER_SHOW("BF-RU26", 10, 0);</div><div class='add'>+	PATH_POWER_SHOW("RU52", 10, 0);</div><div class='add'>+	PATH_POWER_SHOW("BF-RU52", 10, 0);</div><div class='add'>+	PATH_POWER_SHOW("RU106", 10, 0);</div><div class='add'>+	PATH_POWER_SHOW("BF-RU106", 10, 0);</div><div class='add'>+#undef PATH_POWER_SHOW</div><div class='ctx'> </div><div class='del'>-			while (val &gt; 0 &amp;&amp; cnt &lt; mcs_num) {</div><div class='del'>-				s8 pwr = FIELD_GET(MT_TMAC_FP_MASK, val);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-				txpower[cnt++] = pwr;</div><div class='del'>-				val &gt;&gt;= 8;</div><div class='del'>-				idx++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+static int</div><div class='add'>+mt7915_txpower_path_show(struct seq_file *file, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_phy *phy = file-&gt;private;</div><div class='ctx'> </div><div class='del'>-		mt76_seq_puts_array(s, sku_group_name[i], txpower, mcs_num);</div><div class='del'>-	}</div><div class='add'>+	seq_printf(file, "\nBand %d\n", phy != &amp;phy-&gt;dev-&gt;phy);</div><div class='add'>+</div><div class='add'>+	return mt7915_path_txpower_show(file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(mt7915_txpower_path);</div><div class='add'>+</div><div class='ctx'> static int</div><div class='del'>-mt7915_read_rate_txpower(struct seq_file *s, void *data)</div><div class='add'>+mt7915_twt_stats(struct seq_file *s, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_dev *dev = dev_get_drvdata(s-&gt;private);</div><div class='add'>+	struct mt7915_twt_flow *iter;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	seq_puts(s, "     wcid |       id |    flags |      exp | mantissa");</div><div class='add'>+	seq_puts(s, " | duration |            tsf |\n");</div><div class='add'>+	list_for_each_entry_rcu(iter, &amp;dev-&gt;twt_list, list)</div><div class='add'>+		seq_printf(s,</div><div class='add'>+			"%9d | %8d | %5c%c%c%c | %8d | %8d | %8d | %14lld |\n",</div><div class='add'>+			iter-&gt;wcid, iter-&gt;id,</div><div class='add'>+			iter-&gt;sched ? 's' : 'u',</div><div class='add'>+			iter-&gt;protection ? 'p' : '-',</div><div class='add'>+			iter-&gt;trigger ? 't' : '-',</div><div class='add'>+			iter-&gt;flowtype ? '-' : 'a',</div><div class='add'>+			iter-&gt;exp, iter-&gt;mantissa,</div><div class='add'>+			iter-&gt;duration, iter-&gt;tsf);</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The index of RF registers use the generic regidx, combined with two parts:</div><div class='add'>+ * WF selection [31:24] and offset [23:0].</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+mt7915_rf_regval_get(void *data, u64 *val)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = data;</div><div class='add'>+	u32 regval;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	mt7915_puts_rate_txpower(s, &amp;dev-&gt;phy);</div><div class='del'>-	mt7915_puts_rate_txpower(s, mt7915_ext_phy(dev));</div><div class='add'>+	ret = mt7915_mcu_rf_regval(dev, dev-&gt;mt76.debugfs_reg, &amp;regval, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*val = regval;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7915_init_debugfs(struct mt7915_dev *dev)</div><div class='add'>+static int</div><div class='add'>+mt7915_rf_regval_set(void *data, u64 val)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = data;</div><div class='add'>+	u32 val32 = val;</div><div class='add'>+</div><div class='add'>+	return mt7915_mcu_rf_regval(dev, dev-&gt;mt76.debugfs_reg, &amp;val32, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(fops_rf_regval, mt7915_rf_regval_get,</div><div class='add'>+			 mt7915_rf_regval_set, "0x%08llx\n");</div><div class='add'>+</div><div class='add'>+int mt7915_init_debugfs(struct mt7915_phy *phy)</div><div class='ctx'> {</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='ctx'> 	struct dentry *dir;</div><div class='ctx'> </div><div class='del'>-	dir = mt76_register_debugfs(&amp;dev-&gt;mt76);</div><div class='add'>+	dir = mt76_register_debugfs_fops(phy-&gt;mt76, NULL);</div><div class='ctx'> 	if (!dir)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "queues", dir,</div><div class='del'>-				    mt7915_queues_read);</div><div class='del'>-	debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "acq", dir,</div><div class='del'>-				    mt7915_queues_acq);</div><div class='del'>-	debugfs_create_file("tx_stats", 0400, dir, dev, &amp;mt7915_tx_stats_fops);</div><div class='del'>-	debugfs_create_file("fw_debug", 0600, dir, dev, &amp;fops_fw_debug);</div><div class='add'>+	debugfs_create_file("muru_debug", 0600, dir, dev, &amp;fops_muru_debug);</div><div class='add'>+	debugfs_create_file("muru_stats", 0400, dir, phy,</div><div class='add'>+			    &amp;mt7915_muru_stats_fops);</div><div class='add'>+	debugfs_create_file("hw-queues", 0400, dir, phy,</div><div class='add'>+			    &amp;mt7915_hw_queues_fops);</div><div class='add'>+	debugfs_create_file("xmit-queues", 0400, dir, phy,</div><div class='add'>+			    &amp;mt7915_xmit_queues_fops);</div><div class='add'>+	debugfs_create_file("tx_stats", 0400, dir, phy, &amp;mt7915_tx_stats_fops);</div><div class='add'>+	debugfs_create_file("sys_recovery", 0600, dir, phy,</div><div class='add'>+			    &amp;mt7915_sys_recovery_ops);</div><div class='add'>+	debugfs_create_file("fw_debug_wm", 0600, dir, dev, &amp;fops_fw_debug_wm);</div><div class='add'>+	debugfs_create_file("fw_debug_wa", 0600, dir, dev, &amp;fops_fw_debug_wa);</div><div class='add'>+	debugfs_create_file("fw_debug_bin", 0600, dir, dev, &amp;fops_fw_debug_bin);</div><div class='add'>+	debugfs_create_file("fw_util_wm", 0400, dir, dev,</div><div class='add'>+			    &amp;mt7915_fw_util_wm_fops);</div><div class='add'>+	debugfs_create_file("fw_util_wa", 0400, dir, dev,</div><div class='add'>+			    &amp;mt7915_fw_util_wa_fops);</div><div class='ctx'> 	debugfs_create_file("implicit_txbf", 0600, dir, dev,</div><div class='ctx'> 			    &amp;fops_implicit_txbf);</div><div class='del'>-	debugfs_create_u32("dfs_hw_pattern", 0400, dir, &amp;dev-&gt;hw_pattern);</div><div class='del'>-	/* test knobs */</div><div class='del'>-	debugfs_create_file("radar_trigger", 0200, dir, dev,</div><div class='del'>-			    &amp;fops_radar_trigger);</div><div class='del'>-	debugfs_create_file("ser_trigger", 0200, dir, dev, &amp;fops_ser_trigger);</div><div class='del'>-	debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "temperature", dir,</div><div class='del'>-				    mt7915_read_temperature);</div><div class='del'>-	debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "txpower_sku", dir,</div><div class='del'>-				    mt7915_read_rate_txpower);</div><div class='add'>+	debugfs_create_file("txpower_sku", 0400, dir, phy,</div><div class='add'>+			    &amp;mt7915_txpower_fops);</div><div class='add'>+	debugfs_create_file("txpower_path", 0400, dir, phy,</div><div class='add'>+			    &amp;mt7915_txpower_path_fops);</div><div class='add'>+	debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "twt_stats", dir,</div><div class='add'>+				    mt7915_twt_stats);</div><div class='add'>+	debugfs_create_file("rf_regval", 0600, dir, dev, &amp;fops_rf_regval);</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;dbdc_support || phy-&gt;mt76-&gt;band_idx) {</div><div class='add'>+		debugfs_create_u32("dfs_hw_pattern", 0400, dir,</div><div class='add'>+				   &amp;dev-&gt;hw_pattern);</div><div class='add'>+		debugfs_create_file("radar_trigger", 0200, dir, phy,</div><div class='add'>+				    &amp;fops_radar_trigger);</div><div class='add'>+		debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "rdd_monitor", dir,</div><div class='add'>+					    mt7915_rdd_monitor);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ext_phy)</div><div class='add'>+		dev-&gt;debugfs_dir = dir;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='del'>-/** per-station debugfs **/</div><div class='add'>+static void</div><div class='add'>+mt7915_debugfs_write_fwlog(struct mt7915_dev *dev, const void *hdr, int hdrlen,</div><div class='add'>+			 const void *data, int len)</div><div class='add'>+{</div><div class='add'>+	static DEFINE_SPINLOCK(lock);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	void *dest;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;lock, flags);</div><div class='add'>+	dest = relay_reserve(dev-&gt;relay_fwlog, hdrlen + len + 4);</div><div class='add'>+	if (dest) {</div><div class='add'>+		*(u32 *)dest = hdrlen + len;</div><div class='add'>+		dest += 4;</div><div class='add'>+</div><div class='add'>+		if (hdrlen) {</div><div class='add'>+			memcpy(dest, hdr, hdrlen);</div><div class='add'>+			dest += hdrlen;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-/* usage: &lt;tx mode&gt; &lt;ldpc&gt; &lt;stbc&gt; &lt;bw&gt; &lt;gi&gt; &lt;nss&gt; &lt;mcs&gt; */</div><div class='del'>-static int mt7915_sta_fixed_rate_set(void *data, u64 rate)</div><div class='add'>+		memcpy(dest, data, len);</div><div class='add'>+		relay_flush(dev-&gt;relay_fwlog);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7915_debugfs_rx_fw_monitor(struct mt7915_dev *dev, const void *data, int len)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sta *sta = data;</div><div class='del'>-	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct {</div><div class='add'>+		__le32 magic;</div><div class='add'>+		__le32 timestamp;</div><div class='add'>+		__le16 msg_type;</div><div class='add'>+		__le16 len;</div><div class='add'>+	} hdr = {</div><div class='add'>+		.magic = cpu_to_le32(FW_BIN_LOG_MAGIC),</div><div class='add'>+		.msg_type = cpu_to_le16(PKT_TYPE_RX_FW_MONITOR),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;relay_fwlog)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	return mt7915_mcu_set_fixed_rate(msta-&gt;vif-&gt;phy-&gt;dev, sta, rate);</div><div class='add'>+	hdr.timestamp = cpu_to_le32(mt76_rr(dev, MT_LPON_FRCR(0)));</div><div class='add'>+	hdr.len = *(__le16 *)data;</div><div class='add'>+	mt7915_debugfs_write_fwlog(dev, &amp;hdr, sizeof(hdr), data, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_DEBUGFS_ATTRIBUTE(fops_fixed_rate, NULL,</div><div class='del'>-			 mt7915_sta_fixed_rate_set, "%llx\n");</div><div class='add'>+bool mt7915_debugfs_rx_log(struct mt7915_dev *dev, const void *data, int len)</div><div class='add'>+{</div><div class='add'>+	if (get_unaligned_le32(data) != FW_BIN_LOG_MAGIC)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt7915_sta_stats_show(struct seq_file *s, void *data)</div><div class='add'>+	if (dev-&gt;relay_fwlog)</div><div class='add'>+		mt7915_debugfs_write_fwlog(dev, NULL, 0, data, len);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='add'>+/** per-station debugfs **/</div><div class='add'>+</div><div class='add'>+static ssize_t mt7915_sta_fixed_rate_set(struct file *file,</div><div class='add'>+					 const char __user *user_buf,</div><div class='add'>+					 size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sta *sta = s-&gt;private;</div><div class='add'>+	struct ieee80211_sta *sta = file-&gt;private_data;</div><div class='ctx'> 	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='del'>-	struct mt7915_sta_stats *stats = &amp;msta-&gt;stats;</div><div class='del'>-	struct rate_info *rate = &amp;stats-&gt;prob_rate;</div><div class='del'>-	static const char * const bw[] = {</div><div class='del'>-		"BW20", "BW5", "BW10", "BW40",</div><div class='del'>-		"BW80", "BW160", "BW_HE_RU"</div><div class='del'>-	};</div><div class='add'>+	struct mt7915_dev *dev = msta-&gt;vif-&gt;phy-&gt;dev;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct sta_phy phy = {};</div><div class='add'>+	char buf[100];</div><div class='add'>+	int ret;</div><div class='add'>+	u32 field;</div><div class='add'>+	u8 i, gi, he_ltf;</div><div class='add'>+</div><div class='add'>+	if (count &gt;= sizeof(buf))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(buf, user_buf, count))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (count &amp;&amp; buf[count - 1] == '\n')</div><div class='add'>+		buf[count - 1] = '\0';</div><div class='add'>+	else</div><div class='add'>+		buf[count] = '\0';</div><div class='add'>+</div><div class='add'>+	/* mode - cck: 0, ofdm: 1, ht: 2, gf: 3, vht: 4, he_su: 8, he_er: 9</div><div class='add'>+	 * bw - bw20: 0, bw40: 1, bw80: 2, bw160: 3</div><div class='add'>+	 * nss - vht: 1~4, he: 1~4, others: ignore</div><div class='add'>+	 * mcs - cck: 0~4, ofdm: 0~7, ht: 0~32, vht: 0~9, he_su: 0~11, he_er: 0~2</div><div class='add'>+	 * gi - (ht/vht) lgi: 0, sgi: 1; (he) 0.8us: 0, 1.6us: 1, 3.2us: 2</div><div class='add'>+	 * ldpc - off: 0, on: 1</div><div class='add'>+	 * stbc - off: 0, on: 1</div><div class='add'>+	 * he_ltf - 1xltf: 0, 2xltf: 1, 4xltf: 2</div><div class='add'>+	 */</div><div class='add'>+	if (sscanf(buf, "%hhu %hhu %hhu %hhu %hhu %hhu %hhu %hhu",</div><div class='add'>+		   &amp;phy.type, &amp;phy.bw, &amp;phy.nss, &amp;phy.mcs, &amp;gi,</div><div class='add'>+		   &amp;phy.ldpc, &amp;phy.stbc, &amp;he_ltf) != 8) {</div><div class='add'>+		dev_warn(dev-&gt;mt76.dev,</div><div class='add'>+			 "format: Mode BW NSS MCS (HE)GI LDPC STBC HE_LTF\n");</div><div class='add'>+		field = RATE_PARAM_AUTO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!rate-&gt;legacy &amp;&amp; !rate-&gt;flags)</div><div class='del'>-		return 0;</div><div class='add'>+	phy.ldpc = (phy.bw || phy.ldpc) * GENMASK(2, 0);</div><div class='add'>+	for (i = 0; i &lt;= phy.bw; i++) {</div><div class='add'>+		phy.sgi |= gi &lt;&lt; (i &lt;&lt; sta-&gt;deflink.he_cap.has_he);</div><div class='add'>+		phy.he_ltf |= he_ltf &lt;&lt; (i &lt;&lt; sta-&gt;deflink.he_cap.has_he);</div><div class='add'>+	}</div><div class='add'>+	field = RATE_PARAM_FIXED;</div><div class='ctx'> </div><div class='del'>-	seq_puts(s, "Probing rate - ");</div><div class='del'>-	if (rate-&gt;flags &amp; RATE_INFO_FLAGS_MCS)</div><div class='del'>-		seq_puts(s, "HT ");</div><div class='del'>-	else if (rate-&gt;flags &amp; RATE_INFO_FLAGS_VHT_MCS)</div><div class='del'>-		seq_puts(s, "VHT ");</div><div class='del'>-	else if (rate-&gt;flags &amp; RATE_INFO_FLAGS_HE_MCS)</div><div class='del'>-		seq_puts(s, "HE ");</div><div class='del'>-	else</div><div class='del'>-		seq_printf(s, "Bitrate %d\n", rate-&gt;legacy);</div><div class='add'>+out:</div><div class='add'>+	vif = container_of((void *)msta-&gt;vif, struct ieee80211_vif, drv_priv);</div><div class='add'>+	ret = mt7915_mcu_set_fixed_rate_ctrl(dev, vif, sta, &amp;phy, field);</div><div class='add'>+	if (ret)</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	if (rate-&gt;flags) {</div><div class='del'>-		seq_printf(s, "%s NSS%d MCS%d ",</div><div class='del'>-			   bw[rate-&gt;bw], rate-&gt;nss, rate-&gt;mcs);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		if (rate-&gt;flags &amp; RATE_INFO_FLAGS_SHORT_GI)</div><div class='del'>-			seq_puts(s, "SGI ");</div><div class='del'>-		else if (rate-&gt;he_gi)</div><div class='del'>-			seq_puts(s, "HE GI ");</div><div class='add'>+static const struct file_operations fops_fixed_rate = {</div><div class='add'>+	.write = mt7915_sta_fixed_rate_set,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		if (rate-&gt;he_dcm)</div><div class='del'>-			seq_puts(s, "DCM ");</div><div class='del'>-	}</div><div class='add'>+static int</div><div class='add'>+mt7915_queues_show(struct seq_file *s, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = s-&gt;private;</div><div class='ctx'> </div><div class='del'>-	seq_printf(s, "\nPPDU PER: %ld.%1ld%%\n",</div><div class='del'>-		   stats-&gt;per / 10, stats-&gt;per % 10);</div><div class='add'>+	mt7915_sta_hw_queue_read(s, sta);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SHOW_ATTRIBUTE(mt7915_sta_stats);</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(mt7915_queues);</div><div class='ctx'> </div><div class='ctx'> void mt7915_sta_add_debugfs(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 			    struct ieee80211_sta *sta, struct dentry *dir)</div><div class='ctx'> {</div><div class='ctx'> 	debugfs_create_file("fixed_rate", 0600, dir, sta, &amp;fops_fixed_rate);</div><div class='del'>-	debugfs_create_file("stats", 0400, dir, sta, &amp;mt7915_sta_stats_fops);</div><div class='add'>+	debugfs_create_file("hw-queues", 0400, dir, sta, &amp;mt7915_queues_fops);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/dma.c b/drivers/net/wireless/mediatek/mt76/mt7915/dma.c<br/>index 11d0b760abd7..aabd37366e86 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/dma.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/dma.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/dma.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7915/dma.c</a></div><div class='hunk'>@@ -1,62 +1,28 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #include "mt7915.h"</div><div class='ctx'> #include "../dma.h"</div><div class='ctx'> #include "mac.h"</div><div class='ctx'> </div><div class='del'>-int mt7915_init_tx_queues(struct mt7915_phy *phy, int idx, int n_desc)</div><div class='add'>+static int</div><div class='add'>+mt7915_init_tx_queues(struct mt7915_phy *phy, int idx, int n_desc, int ring_base)</div><div class='ctx'> {</div><div class='del'>-	int i, err;</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct mtk_wed_device *wed = NULL;</div><div class='ctx'> </div><div class='del'>-	err = mt76_init_tx_queue(phy-&gt;mt76, 0, idx, n_desc, MT_TX_RING_BASE);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	if (mtk_wed_device_active(&amp;dev-&gt;mt76.mmio.wed)) {</div><div class='add'>+		if (is_mt798x(&amp;dev-&gt;mt76))</div><div class='add'>+			ring_base += MT_TXQ_ID(0) * MT_RING_SIZE;</div><div class='add'>+		else</div><div class='add'>+			ring_base = MT_WED_TX_RING_BASE;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt;= MT_TXQ_PSD; i++)</div><div class='del'>-		phy-&gt;mt76-&gt;q_tx[i] = phy-&gt;mt76-&gt;q_tx[0];</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mt7915_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,</div><div class='del'>-			 struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);</div><div class='del'>-	__le32 *rxd = (__le32 *)skb-&gt;data;</div><div class='del'>-	enum rx_pkt_type type;</div><div class='del'>-</div><div class='del'>-	type = FIELD_GET(MT_RXD0_PKT_TYPE, le32_to_cpu(rxd[0]));</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case PKT_TYPE_TXRX_NOTIFY:</div><div class='del'>-		mt7915_mac_tx_free(dev, skb);</div><div class='del'>-		break;</div><div class='del'>-	case PKT_TYPE_RX_EVENT:</div><div class='del'>-		mt7915_mcu_rx_event(dev, skb);</div><div class='del'>-		break;</div><div class='del'>-#ifdef CONFIG_NL80211_TESTMODE</div><div class='del'>-	case PKT_TYPE_TXRXV:</div><div class='del'>-		mt7915_mac_fill_rx_vector(dev, skb);</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-	case PKT_TYPE_NORMAL:</div><div class='del'>-		if (!mt7915_mac_fill_rx(dev, skb)) {</div><div class='del'>-			mt76_rx(&amp;dev-&gt;mt76, q, skb);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		fallthrough;</div><div class='del'>-	default:</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		break;</div><div class='add'>+		idx -= MT_TXQ_ID(0);</div><div class='add'>+		wed = &amp;dev-&gt;mt76.mmio.wed;</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7915_tx_cleanup(struct mt7915_dev *dev)</div><div class='del'>-{</div><div class='del'>-	mt76_queue_tx_cleanup(dev, dev-&gt;mt76.q_mcu[MT_MCUQ_WM], false);</div><div class='del'>-	mt76_queue_tx_cleanup(dev, dev-&gt;mt76.q_mcu[MT_MCUQ_WA], false);</div><div class='add'>+	return mt76_connac_init_tx_queues(phy-&gt;mt76, idx, n_desc, ring_base,</div><div class='add'>+					  wed, MT_WED_Q_TX(idx));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt7915_poll_tx(struct napi_struct *napi, int budget)</div><div class='hunk'>@@ -65,150 +31,545 @@ static int mt7915_poll_tx(struct napi_struct *napi, int budget)</div><div class='ctx'> </div><div class='ctx'> 	dev = container_of(napi, struct mt7915_dev, mt76.tx_napi);</div><div class='ctx'> </div><div class='del'>-	mt7915_tx_cleanup(dev);</div><div class='del'>-</div><div class='add'>+	mt76_connac_tx_cleanup(&amp;dev-&gt;mt76);</div><div class='ctx'> 	if (napi_complete_done(napi, 0))</div><div class='ctx'> 		mt7915_irq_enable(dev, MT_INT_TX_DONE_MCU);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mt7915_dma_config(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+#define Q_CONFIG(q, wfdma, int, id) do {		\</div><div class='add'>+		if (wfdma)				\</div><div class='add'>+			dev-&gt;wfdma_mask |= (1 &lt;&lt; (q));	\</div><div class='add'>+		dev-&gt;q_int_mask[(q)] = int;		\</div><div class='add'>+		dev-&gt;q_id[(q)] = id;			\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define MCUQ_CONFIG(q, wfdma, int, id)	Q_CONFIG(q, (wfdma), (int), (id))</div><div class='add'>+#define RXQ_CONFIG(q, wfdma, int, id)	Q_CONFIG(__RXQ(q), (wfdma), (int), (id))</div><div class='add'>+#define TXQ_CONFIG(q, wfdma, int, id)	Q_CONFIG(__TXQ(q), (wfdma), (int), (id))</div><div class='add'>+</div><div class='add'>+	if (is_mt7915(&amp;dev-&gt;mt76)) {</div><div class='add'>+		RXQ_CONFIG(MT_RXQ_MAIN, WFDMA0, MT_INT_RX_DONE_BAND0,</div><div class='add'>+			   MT7915_RXQ_BAND0);</div><div class='add'>+		RXQ_CONFIG(MT_RXQ_MCU, WFDMA1, MT_INT_RX_DONE_WM,</div><div class='add'>+			   MT7915_RXQ_MCU_WM);</div><div class='add'>+		RXQ_CONFIG(MT_RXQ_MCU_WA, WFDMA1, MT_INT_RX_DONE_WA,</div><div class='add'>+			   MT7915_RXQ_MCU_WA);</div><div class='add'>+		RXQ_CONFIG(MT_RXQ_BAND1, WFDMA0, MT_INT_RX_DONE_BAND1,</div><div class='add'>+			   MT7915_RXQ_BAND1);</div><div class='add'>+		RXQ_CONFIG(MT_RXQ_BAND1_WA, WFDMA1, MT_INT_RX_DONE_WA_EXT,</div><div class='add'>+			   MT7915_RXQ_MCU_WA_EXT);</div><div class='add'>+		RXQ_CONFIG(MT_RXQ_MAIN_WA, WFDMA1, MT_INT_RX_DONE_WA_MAIN,</div><div class='add'>+			   MT7915_RXQ_MCU_WA);</div><div class='add'>+		TXQ_CONFIG(0, WFDMA1, MT_INT_TX_DONE_BAND0, MT7915_TXQ_BAND0);</div><div class='add'>+		TXQ_CONFIG(1, WFDMA1, MT_INT_TX_DONE_BAND1, MT7915_TXQ_BAND1);</div><div class='add'>+		MCUQ_CONFIG(MT_MCUQ_WM, WFDMA1, MT_INT_TX_DONE_MCU_WM,</div><div class='add'>+			    MT7915_TXQ_MCU_WM);</div><div class='add'>+		MCUQ_CONFIG(MT_MCUQ_WA, WFDMA1, MT_INT_TX_DONE_MCU_WA,</div><div class='add'>+			    MT7915_TXQ_MCU_WA);</div><div class='add'>+		MCUQ_CONFIG(MT_MCUQ_FWDL, WFDMA1, MT_INT_TX_DONE_FWDL,</div><div class='add'>+			    MT7915_TXQ_FWDL);</div><div class='add'>+	} else {</div><div class='add'>+		RXQ_CONFIG(MT_RXQ_MCU, WFDMA0, MT_INT_RX_DONE_WM,</div><div class='add'>+			   MT7916_RXQ_MCU_WM);</div><div class='add'>+		RXQ_CONFIG(MT_RXQ_BAND1_WA, WFDMA0, MT_INT_RX_DONE_WA_EXT_MT7916,</div><div class='add'>+			   MT7916_RXQ_MCU_WA_EXT);</div><div class='add'>+		MCUQ_CONFIG(MT_MCUQ_WM, WFDMA0, MT_INT_TX_DONE_MCU_WM,</div><div class='add'>+			    MT7915_TXQ_MCU_WM);</div><div class='add'>+		MCUQ_CONFIG(MT_MCUQ_WA, WFDMA0, MT_INT_TX_DONE_MCU_WA_MT7916,</div><div class='add'>+			    MT7915_TXQ_MCU_WA);</div><div class='add'>+		MCUQ_CONFIG(MT_MCUQ_FWDL, WFDMA0, MT_INT_TX_DONE_FWDL,</div><div class='add'>+			    MT7915_TXQ_FWDL);</div><div class='add'>+</div><div class='add'>+		if (is_mt7916(&amp;dev-&gt;mt76) &amp;&amp; mtk_wed_device_active(&amp;dev-&gt;mt76.mmio.wed)) {</div><div class='add'>+			RXQ_CONFIG(MT_RXQ_MAIN, WFDMA0, MT_INT_WED_RX_DONE_BAND0_MT7916,</div><div class='add'>+				   MT7916_RXQ_BAND0);</div><div class='add'>+			RXQ_CONFIG(MT_RXQ_MCU_WA, WFDMA0, MT_INT_WED_RX_DONE_WA_MT7916,</div><div class='add'>+				   MT7916_RXQ_MCU_WA);</div><div class='add'>+			if (dev-&gt;hif2)</div><div class='add'>+				RXQ_CONFIG(MT_RXQ_BAND1, WFDMA0,</div><div class='add'>+					   MT_INT_RX_DONE_BAND1_MT7916,</div><div class='add'>+					   MT7916_RXQ_BAND1);</div><div class='add'>+			else</div><div class='add'>+				RXQ_CONFIG(MT_RXQ_BAND1, WFDMA0,</div><div class='add'>+					   MT_INT_WED_RX_DONE_BAND1_MT7916,</div><div class='add'>+					   MT7916_RXQ_BAND1);</div><div class='add'>+			RXQ_CONFIG(MT_RXQ_MAIN_WA, WFDMA0, MT_INT_WED_RX_DONE_WA_MAIN_MT7916,</div><div class='add'>+				   MT7916_RXQ_MCU_WA_MAIN);</div><div class='add'>+			TXQ_CONFIG(0, WFDMA0, MT_INT_WED_TX_DONE_BAND0,</div><div class='add'>+				   MT7915_TXQ_BAND0);</div><div class='add'>+			TXQ_CONFIG(1, WFDMA0, MT_INT_WED_TX_DONE_BAND1,</div><div class='add'>+				   MT7915_TXQ_BAND1);</div><div class='add'>+		} else {</div><div class='add'>+			RXQ_CONFIG(MT_RXQ_MAIN, WFDMA0, MT_INT_RX_DONE_BAND0_MT7916,</div><div class='add'>+				   MT7916_RXQ_BAND0);</div><div class='add'>+			RXQ_CONFIG(MT_RXQ_MCU_WA, WFDMA0, MT_INT_RX_DONE_WA,</div><div class='add'>+				   MT7916_RXQ_MCU_WA);</div><div class='add'>+			RXQ_CONFIG(MT_RXQ_BAND1, WFDMA0, MT_INT_RX_DONE_BAND1_MT7916,</div><div class='add'>+				   MT7916_RXQ_BAND1);</div><div class='add'>+			RXQ_CONFIG(MT_RXQ_MAIN_WA, WFDMA0, MT_INT_RX_DONE_WA_MAIN_MT7916,</div><div class='add'>+				   MT7916_RXQ_MCU_WA_MAIN);</div><div class='add'>+			TXQ_CONFIG(0, WFDMA0, MT_INT_TX_DONE_BAND0,</div><div class='add'>+				   MT7915_TXQ_BAND0);</div><div class='add'>+			TXQ_CONFIG(1, WFDMA0, MT_INT_TX_DONE_BAND1,</div><div class='add'>+				   MT7915_TXQ_BAND1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __mt7915_dma_prefetch(struct mt7915_dev *dev, u32 ofs)</div><div class='ctx'> {</div><div class='del'>-#define PREFETCH(base, depth)	((base) &lt;&lt; 16 | (depth))</div><div class='del'>-</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_RX_RING0_EXT_CTRL + ofs, PREFETCH(0x0, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_RX_RING1_EXT_CTRL + ofs, PREFETCH(0x40, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_RX_RING2_EXT_CTRL + ofs, PREFETCH(0x80, 0x0));</div><div class='del'>-</div><div class='del'>-	mt76_wr(dev, MT_WFDMA1_TX_RING0_EXT_CTRL + ofs, PREFETCH(0x80, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA1_TX_RING1_EXT_CTRL + ofs, PREFETCH(0xc0, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA1_TX_RING2_EXT_CTRL + ofs, PREFETCH(0x100, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA1_TX_RING3_EXT_CTRL + ofs, PREFETCH(0x140, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA1_TX_RING4_EXT_CTRL + ofs, PREFETCH(0x180, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA1_TX_RING5_EXT_CTRL + ofs, PREFETCH(0x1c0, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA1_TX_RING6_EXT_CTRL + ofs, PREFETCH(0x200, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA1_TX_RING7_EXT_CTRL + ofs, PREFETCH(0x240, 0x4));</div><div class='del'>-</div><div class='del'>-	mt76_wr(dev, MT_WFDMA1_TX_RING16_EXT_CTRL + ofs, PREFETCH(0x280, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA1_TX_RING17_EXT_CTRL + ofs, PREFETCH(0x2c0, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA1_TX_RING18_EXT_CTRL + ofs, PREFETCH(0x300, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA1_TX_RING19_EXT_CTRL + ofs, PREFETCH(0x340, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA1_TX_RING20_EXT_CTRL + ofs, PREFETCH(0x380, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA1_TX_RING21_EXT_CTRL + ofs, PREFETCH(0x3c0, 0x0));</div><div class='del'>-</div><div class='del'>-	mt76_wr(dev, MT_WFDMA1_RX_RING0_EXT_CTRL + ofs, PREFETCH(0x3c0, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA1_RX_RING1_EXT_CTRL + ofs, PREFETCH(0x400, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA1_RX_RING2_EXT_CTRL + ofs, PREFETCH(0x440, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA1_RX_RING3_EXT_CTRL + ofs, PREFETCH(0x480, 0x0));</div><div class='add'>+#define PREFETCH(_base, _depth)	((_base) &lt;&lt; 16 | (_depth))</div><div class='add'>+	u32 base = 0;</div><div class='add'>+</div><div class='add'>+	/* prefetch SRAM wrapping boundary for tx/rx ring. */</div><div class='add'>+	mt76_wr(dev, MT_MCUQ_EXT_CTRL(MT_MCUQ_FWDL) + ofs, PREFETCH(0x0, 0x4));</div><div class='add'>+	mt76_wr(dev, MT_MCUQ_EXT_CTRL(MT_MCUQ_WM) + ofs, PREFETCH(0x40, 0x4));</div><div class='add'>+	mt76_wr(dev, MT_TXQ_EXT_CTRL(0) + ofs, PREFETCH(0x80, 0x4));</div><div class='add'>+	mt76_wr(dev, MT_TXQ_EXT_CTRL(1) + ofs, PREFETCH(0xc0, 0x4));</div><div class='add'>+	mt76_wr(dev, MT_MCUQ_EXT_CTRL(MT_MCUQ_WA) + ofs, PREFETCH(0x100, 0x4));</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_RXQ_BAND1_CTRL(MT_RXQ_MCU) + ofs,</div><div class='add'>+		PREFETCH(0x140, 0x4));</div><div class='add'>+	mt76_wr(dev, MT_RXQ_BAND1_CTRL(MT_RXQ_MCU_WA) + ofs,</div><div class='add'>+		PREFETCH(0x180, 0x4));</div><div class='add'>+	if (!is_mt7915(&amp;dev-&gt;mt76)) {</div><div class='add'>+		mt76_wr(dev, MT_RXQ_BAND1_CTRL(MT_RXQ_MAIN_WA) + ofs,</div><div class='add'>+			PREFETCH(0x1c0, 0x4));</div><div class='add'>+		base = 0x40;</div><div class='add'>+	}</div><div class='add'>+	mt76_wr(dev, MT_RXQ_BAND1_CTRL(MT_RXQ_BAND1_WA) + ofs,</div><div class='add'>+		PREFETCH(0x1c0 + base, 0x4));</div><div class='add'>+	mt76_wr(dev, MT_RXQ_BAND1_CTRL(MT_RXQ_MAIN) + ofs,</div><div class='add'>+		PREFETCH(0x200 + base, 0x4));</div><div class='add'>+	mt76_wr(dev, MT_RXQ_BAND1_CTRL(MT_RXQ_BAND1) + ofs,</div><div class='add'>+		PREFETCH(0x240 + base, 0x4));</div><div class='add'>+</div><div class='add'>+	/* for mt7915, the ring which is next the last</div><div class='add'>+	 * used ring must be initialized.</div><div class='add'>+	 */</div><div class='add'>+	if (is_mt7915(&amp;dev-&gt;mt76)) {</div><div class='add'>+		ofs += 0x4;</div><div class='add'>+		mt76_wr(dev, MT_MCUQ_EXT_CTRL(MT_MCUQ_WA) + ofs,</div><div class='add'>+			PREFETCH(0x140, 0x0));</div><div class='add'>+		mt76_wr(dev, MT_RXQ_BAND1_CTRL(MT_RXQ_BAND1_WA) + ofs,</div><div class='add'>+			PREFETCH(0x200 + base, 0x0));</div><div class='add'>+		mt76_wr(dev, MT_RXQ_BAND1_CTRL(MT_RXQ_BAND1) + ofs,</div><div class='add'>+			PREFETCH(0x280 + base, 0x0));</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt7915_dma_prefetch(struct mt7915_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	__mt7915_dma_prefetch(dev, 0);</div><div class='ctx'> 	if (dev-&gt;hif2)</div><div class='del'>-		__mt7915_dma_prefetch(dev, MT_WFDMA1_PCIE1_BASE - MT_WFDMA1_BASE);</div><div class='add'>+		__mt7915_dma_prefetch(dev, MT_WFDMA0_PCIE1(0) - MT_WFDMA0(0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7915_dma_init(struct mt7915_dev *dev)</div><div class='add'>+static void mt7915_dma_disable(struct mt7915_dev *dev, bool rst)</div><div class='ctx'> {</div><div class='del'>-	/* Increase buffer size to receive large VHT/HE MPDUs */</div><div class='del'>-	int rx_buf_size = MT_RX_BUF_SIZE * 2;</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='ctx'> 	u32 hif1_ofs = 0;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='del'>-	mt76_dma_attach(&amp;dev-&gt;mt76);</div><div class='add'>+	if (dev-&gt;hif2)</div><div class='add'>+		hif1_ofs = MT_WFDMA0_PCIE1(0) - MT_WFDMA0(0);</div><div class='add'>+</div><div class='add'>+	/* reset */</div><div class='add'>+	if (rst) {</div><div class='add'>+		mt76_clear(dev, MT_WFDMA0_RST,</div><div class='add'>+			   MT_WFDMA0_RST_DMASHDL_ALL_RST |</div><div class='add'>+			   MT_WFDMA0_RST_LOGIC_RST);</div><div class='add'>+</div><div class='add'>+		mt76_set(dev, MT_WFDMA0_RST,</div><div class='add'>+			 MT_WFDMA0_RST_DMASHDL_ALL_RST |</div><div class='add'>+			 MT_WFDMA0_RST_LOGIC_RST);</div><div class='add'>+</div><div class='add'>+		if (is_mt7915(mdev)) {</div><div class='add'>+			mt76_clear(dev, MT_WFDMA1_RST,</div><div class='add'>+				   MT_WFDMA1_RST_DMASHDL_ALL_RST |</div><div class='add'>+				   MT_WFDMA1_RST_LOGIC_RST);</div><div class='add'>+</div><div class='add'>+			mt76_set(dev, MT_WFDMA1_RST,</div><div class='add'>+				 MT_WFDMA1_RST_DMASHDL_ALL_RST |</div><div class='add'>+				 MT_WFDMA1_RST_LOGIC_RST);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;hif2) {</div><div class='add'>+			mt76_clear(dev, MT_WFDMA0_RST + hif1_ofs,</div><div class='add'>+				   MT_WFDMA0_RST_DMASHDL_ALL_RST |</div><div class='add'>+				   MT_WFDMA0_RST_LOGIC_RST);</div><div class='add'>+</div><div class='add'>+			mt76_set(dev, MT_WFDMA0_RST + hif1_ofs,</div><div class='add'>+				 MT_WFDMA0_RST_DMASHDL_ALL_RST |</div><div class='add'>+				 MT_WFDMA0_RST_LOGIC_RST);</div><div class='add'>+</div><div class='add'>+			if (is_mt7915(mdev)) {</div><div class='add'>+				mt76_clear(dev, MT_WFDMA1_RST + hif1_ofs,</div><div class='add'>+					   MT_WFDMA1_RST_DMASHDL_ALL_RST |</div><div class='add'>+					   MT_WFDMA1_RST_LOGIC_RST);</div><div class='add'>+</div><div class='add'>+				mt76_set(dev, MT_WFDMA1_RST + hif1_ofs,</div><div class='add'>+					 MT_WFDMA1_RST_DMASHDL_ALL_RST |</div><div class='add'>+					 MT_WFDMA1_RST_LOGIC_RST);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* disable */</div><div class='add'>+	mt76_clear(dev, MT_WFDMA0_GLO_CFG,</div><div class='add'>+		   MT_WFDMA0_GLO_CFG_TX_DMA_EN |</div><div class='add'>+		   MT_WFDMA0_GLO_CFG_RX_DMA_EN |</div><div class='add'>+		   MT_WFDMA0_GLO_CFG_OMIT_TX_INFO |</div><div class='add'>+		   MT_WFDMA0_GLO_CFG_OMIT_RX_INFO |</div><div class='add'>+		   MT_WFDMA0_GLO_CFG_OMIT_RX_INFO_PFET2);</div><div class='add'>+</div><div class='add'>+	if (is_mt7915(mdev))</div><div class='add'>+		mt76_clear(dev, MT_WFDMA1_GLO_CFG,</div><div class='add'>+			   MT_WFDMA1_GLO_CFG_TX_DMA_EN |</div><div class='add'>+			   MT_WFDMA1_GLO_CFG_RX_DMA_EN |</div><div class='add'>+			   MT_WFDMA1_GLO_CFG_OMIT_TX_INFO |</div><div class='add'>+			   MT_WFDMA1_GLO_CFG_OMIT_RX_INFO |</div><div class='add'>+			   MT_WFDMA1_GLO_CFG_OMIT_RX_INFO_PFET2);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;hif2) {</div><div class='add'>+		mt76_clear(dev, MT_WFDMA0_GLO_CFG + hif1_ofs,</div><div class='add'>+			   MT_WFDMA0_GLO_CFG_TX_DMA_EN |</div><div class='add'>+			   MT_WFDMA0_GLO_CFG_RX_DMA_EN |</div><div class='add'>+			   MT_WFDMA0_GLO_CFG_OMIT_TX_INFO |</div><div class='add'>+			   MT_WFDMA0_GLO_CFG_OMIT_RX_INFO |</div><div class='add'>+			   MT_WFDMA0_GLO_CFG_OMIT_RX_INFO_PFET2);</div><div class='add'>+</div><div class='add'>+		if (is_mt7915(mdev))</div><div class='add'>+			mt76_clear(dev, MT_WFDMA1_GLO_CFG + hif1_ofs,</div><div class='add'>+				   MT_WFDMA1_GLO_CFG_TX_DMA_EN |</div><div class='add'>+				   MT_WFDMA1_GLO_CFG_RX_DMA_EN |</div><div class='add'>+				   MT_WFDMA1_GLO_CFG_OMIT_TX_INFO |</div><div class='add'>+				   MT_WFDMA1_GLO_CFG_OMIT_RX_INFO |</div><div class='add'>+				   MT_WFDMA1_GLO_CFG_OMIT_RX_INFO_PFET2);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7915_dma_start(struct mt7915_dev *dev, bool reset, bool wed_reset)</div><div class='add'>+{</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	u32 hif1_ofs = 0;</div><div class='add'>+	u32 irq_mask;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;hif2)</div><div class='del'>-		hif1_ofs = MT_WFDMA1_PCIE1_BASE - MT_WFDMA1_BASE;</div><div class='add'>+		hif1_ofs = MT_WFDMA0_PCIE1(0) - MT_WFDMA0(0);</div><div class='add'>+</div><div class='add'>+	/* enable wpdma tx/rx */</div><div class='add'>+	if (!reset) {</div><div class='add'>+		mt76_set(dev, MT_WFDMA0_GLO_CFG,</div><div class='add'>+			MT_WFDMA0_GLO_CFG_TX_DMA_EN |</div><div class='add'>+			MT_WFDMA0_GLO_CFG_RX_DMA_EN |</div><div class='add'>+			MT_WFDMA0_GLO_CFG_OMIT_TX_INFO |</div><div class='add'>+			MT_WFDMA0_GLO_CFG_OMIT_RX_INFO_PFET2);</div><div class='add'>+</div><div class='add'>+		if (is_mt7915(mdev))</div><div class='add'>+			mt76_set(dev, MT_WFDMA1_GLO_CFG,</div><div class='add'>+				MT_WFDMA1_GLO_CFG_TX_DMA_EN |</div><div class='add'>+				MT_WFDMA1_GLO_CFG_RX_DMA_EN |</div><div class='add'>+				MT_WFDMA1_GLO_CFG_OMIT_TX_INFO |</div><div class='add'>+				MT_WFDMA1_GLO_CFG_OMIT_RX_INFO);</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;hif2) {</div><div class='add'>+			mt76_set(dev, MT_WFDMA0_GLO_CFG + hif1_ofs,</div><div class='add'>+				MT_WFDMA0_GLO_CFG_TX_DMA_EN |</div><div class='add'>+				MT_WFDMA0_GLO_CFG_RX_DMA_EN |</div><div class='add'>+				MT_WFDMA0_GLO_CFG_OMIT_TX_INFO |</div><div class='add'>+				MT_WFDMA0_GLO_CFG_OMIT_RX_INFO_PFET2);</div><div class='add'>+</div><div class='add'>+			if (is_mt7915(mdev))</div><div class='add'>+				mt76_set(dev, MT_WFDMA1_GLO_CFG + hif1_ofs,</div><div class='add'>+					MT_WFDMA1_GLO_CFG_TX_DMA_EN |</div><div class='add'>+					MT_WFDMA1_GLO_CFG_RX_DMA_EN |</div><div class='add'>+					MT_WFDMA1_GLO_CFG_OMIT_TX_INFO |</div><div class='add'>+					MT_WFDMA1_GLO_CFG_OMIT_RX_INFO);</div><div class='add'>+</div><div class='add'>+			mt76_set(dev, MT_WFDMA_HOST_CONFIG,</div><div class='add'>+				MT_WFDMA_HOST_CONFIG_PDMA_BAND);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* enable interrupts for TX/RX rings */</div><div class='add'>+	irq_mask = MT_INT_RX_DONE_MCU |</div><div class='add'>+		   MT_INT_TX_DONE_MCU |</div><div class='add'>+		   MT_INT_MCU_CMD;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;phy.mt76-&gt;band_idx)</div><div class='add'>+		irq_mask |= MT_INT_BAND0_RX_DONE;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;dbdc_support || dev-&gt;phy.mt76-&gt;band_idx)</div><div class='add'>+		irq_mask |= MT_INT_BAND1_RX_DONE;</div><div class='add'>+</div><div class='add'>+	if (mtk_wed_device_active(&amp;dev-&gt;mt76.mmio.wed) &amp;&amp; wed_reset) {</div><div class='add'>+		u32 wed_irq_mask = irq_mask;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		wed_irq_mask |= MT_INT_TX_DONE_BAND0 | MT_INT_TX_DONE_BAND1;</div><div class='add'>+		if (!is_mt798x(&amp;dev-&gt;mt76))</div><div class='add'>+			mt76_wr(dev, MT_INT_WED_MASK_CSR, wed_irq_mask);</div><div class='add'>+		else</div><div class='add'>+			mt76_wr(dev, MT_INT_MASK_CSR, wed_irq_mask);</div><div class='add'>+</div><div class='add'>+		ret = mt7915_mcu_wed_enable_rx_stats(dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		mtk_wed_device_start(&amp;dev-&gt;mt76.mmio.wed, wed_irq_mask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq_mask = reset ? MT_INT_MCU_CMD : irq_mask;</div><div class='add'>+</div><div class='add'>+	mt7915_irq_enable(dev, irq_mask);</div><div class='add'>+	mt7915_irq_disable(dev, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* configure global setting */</div><div class='del'>-	mt76_set(dev, MT_WFDMA1_GLO_CFG,</div><div class='del'>-		 MT_WFDMA1_GLO_CFG_OMIT_TX_INFO |</div><div class='del'>-		 MT_WFDMA1_GLO_CFG_OMIT_RX_INFO);</div><div class='add'>+static int mt7915_dma_enable(struct mt7915_dev *dev, bool reset)</div><div class='add'>+{</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	u32 hif1_ofs = 0;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;hif2)</div><div class='add'>+		hif1_ofs = MT_WFDMA0_PCIE1(0) - MT_WFDMA0(0);</div><div class='ctx'> </div><div class='ctx'> 	/* reset dma idx */</div><div class='ctx'> 	mt76_wr(dev, MT_WFDMA0_RST_DTX_PTR, ~0);</div><div class='del'>-	mt76_wr(dev, MT_WFDMA1_RST_DTX_PTR, ~0);</div><div class='add'>+	if (is_mt7915(mdev))</div><div class='add'>+		mt76_wr(dev, MT_WFDMA1_RST_DTX_PTR, ~0);</div><div class='add'>+	if (dev-&gt;hif2) {</div><div class='add'>+		mt76_wr(dev, MT_WFDMA0_RST_DTX_PTR + hif1_ofs, ~0);</div><div class='add'>+		if (is_mt7915(mdev))</div><div class='add'>+			mt76_wr(dev, MT_WFDMA1_RST_DTX_PTR + hif1_ofs, ~0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* configure delay interrupt */</div><div class='add'>+	/* configure delay interrupt off */</div><div class='ctx'> 	mt76_wr(dev, MT_WFDMA0_PRI_DLY_INT_CFG0, 0);</div><div class='del'>-	mt76_wr(dev, MT_WFDMA1_PRI_DLY_INT_CFG0, 0);</div><div class='add'>+	if (is_mt7915(mdev)) {</div><div class='add'>+		mt76_wr(dev, MT_WFDMA1_PRI_DLY_INT_CFG0, 0);</div><div class='add'>+	} else {</div><div class='add'>+		mt76_wr(dev, MT_WFDMA0_PRI_DLY_INT_CFG1, 0);</div><div class='add'>+		mt76_wr(dev, MT_WFDMA0_PRI_DLY_INT_CFG2, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;hif2) {</div><div class='del'>-		mt76_set(dev, MT_WFDMA1_GLO_CFG + hif1_ofs,</div><div class='del'>-			 MT_WFDMA1_GLO_CFG_OMIT_TX_INFO |</div><div class='del'>-			 MT_WFDMA1_GLO_CFG_OMIT_RX_INFO);</div><div class='del'>-</div><div class='del'>-		mt76_wr(dev, MT_WFDMA0_RST_DTX_PTR + hif1_ofs, ~0);</div><div class='del'>-		mt76_wr(dev, MT_WFDMA1_RST_DTX_PTR + hif1_ofs, ~0);</div><div class='del'>-</div><div class='ctx'> 		mt76_wr(dev, MT_WFDMA0_PRI_DLY_INT_CFG0 + hif1_ofs, 0);</div><div class='del'>-		mt76_wr(dev, MT_WFDMA1_PRI_DLY_INT_CFG0 + hif1_ofs, 0);</div><div class='add'>+		if (is_mt7915(mdev)) {</div><div class='add'>+			mt76_wr(dev, MT_WFDMA1_PRI_DLY_INT_CFG0 +</div><div class='add'>+				hif1_ofs, 0);</div><div class='add'>+		} else {</div><div class='add'>+			mt76_wr(dev, MT_WFDMA0_PRI_DLY_INT_CFG1 +</div><div class='add'>+				hif1_ofs, 0);</div><div class='add'>+			mt76_wr(dev, MT_WFDMA0_PRI_DLY_INT_CFG2 +</div><div class='add'>+				hif1_ofs, 0);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* configure perfetch settings */</div><div class='ctx'> 	mt7915_dma_prefetch(dev);</div><div class='ctx'> </div><div class='add'>+	/* hif wait WFDMA idle */</div><div class='add'>+	mt76_set(dev, MT_WFDMA0_BUSY_ENA,</div><div class='add'>+		 MT_WFDMA0_BUSY_ENA_TX_FIFO0 |</div><div class='add'>+		 MT_WFDMA0_BUSY_ENA_TX_FIFO1 |</div><div class='add'>+		 MT_WFDMA0_BUSY_ENA_RX_FIFO);</div><div class='add'>+</div><div class='add'>+	if (is_mt7915(mdev))</div><div class='add'>+		mt76_set(dev, MT_WFDMA1_BUSY_ENA,</div><div class='add'>+			 MT_WFDMA1_BUSY_ENA_TX_FIFO0 |</div><div class='add'>+			 MT_WFDMA1_BUSY_ENA_TX_FIFO1 |</div><div class='add'>+			 MT_WFDMA1_BUSY_ENA_RX_FIFO);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;hif2) {</div><div class='add'>+		mt76_set(dev, MT_WFDMA0_BUSY_ENA + hif1_ofs,</div><div class='add'>+			 MT_WFDMA0_PCIE1_BUSY_ENA_TX_FIFO0 |</div><div class='add'>+			 MT_WFDMA0_PCIE1_BUSY_ENA_TX_FIFO1 |</div><div class='add'>+			 MT_WFDMA0_PCIE1_BUSY_ENA_RX_FIFO);</div><div class='add'>+</div><div class='add'>+		if (is_mt7915(mdev))</div><div class='add'>+			mt76_set(dev, MT_WFDMA1_BUSY_ENA + hif1_ofs,</div><div class='add'>+				 MT_WFDMA1_PCIE1_BUSY_ENA_TX_FIFO0 |</div><div class='add'>+				 MT_WFDMA1_PCIE1_BUSY_ENA_TX_FIFO1 |</div><div class='add'>+				 MT_WFDMA1_PCIE1_BUSY_ENA_RX_FIFO);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt76_poll(dev, MT_WFDMA_EXT_CSR_HIF_MISC,</div><div class='add'>+		  MT_WFDMA_EXT_CSR_HIF_MISC_BUSY, 0, 1000);</div><div class='add'>+</div><div class='add'>+	return mt7915_dma_start(dev, reset, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7915_dma_init(struct mt7915_dev *dev, struct mt7915_phy *phy2)</div><div class='add'>+{</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	u32 wa_rx_base, wa_rx_idx;</div><div class='add'>+	u32 hif1_ofs = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mt7915_dma_config(dev);</div><div class='add'>+</div><div class='add'>+	mt76_dma_attach(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;hif2)</div><div class='add'>+		hif1_ofs = MT_WFDMA0_PCIE1(0) - MT_WFDMA0(0);</div><div class='add'>+</div><div class='add'>+	mt7915_dma_disable(dev, true);</div><div class='add'>+</div><div class='add'>+	if (mtk_wed_device_active(&amp;mdev-&gt;mmio.wed)) {</div><div class='add'>+		if (!is_mt798x(mdev)) {</div><div class='add'>+			u8 wed_control_rx1 = is_mt7915(mdev) ? 1 : 2;</div><div class='add'>+</div><div class='add'>+			mt76_set(dev, MT_WFDMA_HOST_CONFIG,</div><div class='add'>+				 MT_WFDMA_HOST_CONFIG_WED);</div><div class='add'>+			mt76_wr(dev, MT_WFDMA_WED_RING_CONTROL,</div><div class='add'>+				FIELD_PREP(MT_WFDMA_WED_RING_CONTROL_TX0, 18) |</div><div class='add'>+				FIELD_PREP(MT_WFDMA_WED_RING_CONTROL_TX1, 19) |</div><div class='add'>+				FIELD_PREP(MT_WFDMA_WED_RING_CONTROL_RX1,</div><div class='add'>+					   wed_control_rx1));</div><div class='add'>+			if (is_mt7915(mdev))</div><div class='add'>+				mt76_rmw(dev, MT_WFDMA0_EXT0_CFG, MT_WFDMA0_EXT0_RXWB_KEEP,</div><div class='add'>+					 MT_WFDMA0_EXT0_RXWB_KEEP);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		mt76_clear(dev, MT_WFDMA_HOST_CONFIG, MT_WFDMA_HOST_CONFIG_WED);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* init tx queue */</div><div class='del'>-	ret = mt7915_init_tx_queues(&amp;dev-&gt;phy, MT7915_TXQ_BAND0,</div><div class='del'>-				    MT7915_TX_RING_SIZE);</div><div class='add'>+	ret = mt7915_init_tx_queues(&amp;dev-&gt;phy,</div><div class='add'>+				    MT_TXQ_ID(dev-&gt;phy.mt76-&gt;band_idx),</div><div class='add'>+				    MT7915_TX_RING_SIZE,</div><div class='add'>+				    MT_TXQ_RING_BASE(0));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	if (phy2) {</div><div class='add'>+		ret = mt7915_init_tx_queues(phy2,</div><div class='add'>+					    MT_TXQ_ID(phy2-&gt;mt76-&gt;band_idx),</div><div class='add'>+					    MT7915_TX_RING_SIZE,</div><div class='add'>+					    MT_TXQ_RING_BASE(1));</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* command to WM */</div><div class='del'>-	ret = mt76_init_mcu_queue(&amp;dev-&gt;mt76, MT_MCUQ_WM, MT7915_TXQ_MCU_WM,</div><div class='del'>-				  MT7915_TX_MCU_RING_SIZE, MT_TX_RING_BASE);</div><div class='add'>+	ret = mt76_init_mcu_queue(&amp;dev-&gt;mt76, MT_MCUQ_WM,</div><div class='add'>+				  MT_MCUQ_ID(MT_MCUQ_WM),</div><div class='add'>+				  MT7915_TX_MCU_RING_SIZE,</div><div class='add'>+				  MT_MCUQ_RING_BASE(MT_MCUQ_WM));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* command to WA */</div><div class='del'>-	ret = mt76_init_mcu_queue(&amp;dev-&gt;mt76, MT_MCUQ_WA, MT7915_TXQ_MCU_WA,</div><div class='del'>-				  MT7915_TX_MCU_RING_SIZE, MT_TX_RING_BASE);</div><div class='add'>+	ret = mt76_init_mcu_queue(&amp;dev-&gt;mt76, MT_MCUQ_WA,</div><div class='add'>+				  MT_MCUQ_ID(MT_MCUQ_WA),</div><div class='add'>+				  MT7915_TX_MCU_RING_SIZE,</div><div class='add'>+				  MT_MCUQ_RING_BASE(MT_MCUQ_WA));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* firmware download */</div><div class='del'>-	ret = mt76_init_mcu_queue(&amp;dev-&gt;mt76, MT_MCUQ_FWDL, MT7915_TXQ_FWDL,</div><div class='del'>-				  MT7915_TX_FWDL_RING_SIZE, MT_TX_RING_BASE);</div><div class='add'>+	ret = mt76_init_mcu_queue(&amp;dev-&gt;mt76, MT_MCUQ_FWDL,</div><div class='add'>+				  MT_MCUQ_ID(MT_MCUQ_FWDL),</div><div class='add'>+				  MT7915_TX_FWDL_RING_SIZE,</div><div class='add'>+				  MT_MCUQ_RING_BASE(MT_MCUQ_FWDL));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* event from WM */</div><div class='ctx'> 	ret = mt76_queue_alloc(dev, &amp;dev-&gt;mt76.q_rx[MT_RXQ_MCU],</div><div class='del'>-			       MT7915_RXQ_MCU_WM, MT7915_RX_MCU_RING_SIZE,</div><div class='del'>-			       rx_buf_size, MT_RX_EVENT_RING_BASE);</div><div class='add'>+			       MT_RXQ_ID(MT_RXQ_MCU),</div><div class='add'>+			       MT7915_RX_MCU_RING_SIZE,</div><div class='add'>+			       MT_RX_BUF_SIZE,</div><div class='add'>+			       MT_RXQ_RING_BASE(MT_RXQ_MCU));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* event from WA */</div><div class='add'>+	if (mtk_wed_device_active(&amp;mdev-&gt;mmio.wed) &amp;&amp; is_mt7915(mdev)) {</div><div class='add'>+		wa_rx_base = MT_WED_RX_RING_BASE;</div><div class='add'>+		wa_rx_idx = MT7915_RXQ_MCU_WA;</div><div class='add'>+		mdev-&gt;q_rx[MT_RXQ_MCU_WA].flags = MT_WED_Q_TXFREE;</div><div class='add'>+		mdev-&gt;q_rx[MT_RXQ_MCU_WA].wed = &amp;mdev-&gt;mmio.wed;</div><div class='add'>+	} else {</div><div class='add'>+		wa_rx_base = MT_RXQ_RING_BASE(MT_RXQ_MCU_WA);</div><div class='add'>+		wa_rx_idx = MT_RXQ_ID(MT_RXQ_MCU_WA);</div><div class='add'>+	}</div><div class='ctx'> 	ret = mt76_queue_alloc(dev, &amp;dev-&gt;mt76.q_rx[MT_RXQ_MCU_WA],</div><div class='del'>-			       MT7915_RXQ_MCU_WA, MT7915_RX_MCU_RING_SIZE,</div><div class='del'>-			       rx_buf_size, MT_RX_EVENT_RING_BASE);</div><div class='add'>+			       wa_rx_idx, MT7915_RX_MCU_RING_SIZE,</div><div class='add'>+			       MT_RX_BUF_SIZE, wa_rx_base);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	/* rx data queue */</div><div class='del'>-	ret = mt76_queue_alloc(dev, &amp;dev-&gt;mt76.q_rx[MT_RXQ_MAIN],</div><div class='del'>-			       MT7915_RXQ_BAND0, MT7915_RX_RING_SIZE,</div><div class='del'>-			       rx_buf_size, MT_RX_DATA_RING_BASE);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	/* rx data queue for band0 */</div><div class='add'>+	if (!dev-&gt;phy.mt76-&gt;band_idx) {</div><div class='add'>+		if (mtk_wed_device_active(&amp;mdev-&gt;mmio.wed) &amp;&amp;</div><div class='add'>+		    mtk_wed_get_rx_capa(&amp;mdev-&gt;mmio.wed)) {</div><div class='add'>+			mdev-&gt;q_rx[MT_RXQ_MAIN].flags =</div><div class='add'>+				MT_WED_Q_RX(MT7915_RXQ_BAND0);</div><div class='add'>+			dev-&gt;mt76.rx_token_size += MT7915_RX_RING_SIZE;</div><div class='add'>+			mdev-&gt;q_rx[MT_RXQ_MAIN].wed = &amp;mdev-&gt;mmio.wed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = mt76_queue_alloc(dev, &amp;dev-&gt;mt76.q_rx[MT_RXQ_MAIN],</div><div class='add'>+				       MT_RXQ_ID(MT_RXQ_MAIN),</div><div class='add'>+				       MT7915_RX_RING_SIZE,</div><div class='add'>+				       MT_RX_BUF_SIZE,</div><div class='add'>+				       MT_RXQ_RING_BASE(MT_RXQ_MAIN));</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* tx free notify event from WA for band0 */</div><div class='add'>+	if (!is_mt7915(mdev)) {</div><div class='add'>+		wa_rx_base = MT_RXQ_RING_BASE(MT_RXQ_MAIN_WA);</div><div class='add'>+		wa_rx_idx = MT_RXQ_ID(MT_RXQ_MAIN_WA);</div><div class='add'>+</div><div class='add'>+		if (mtk_wed_device_active(&amp;mdev-&gt;mmio.wed)) {</div><div class='add'>+			mdev-&gt;q_rx[MT_RXQ_MAIN_WA].flags = MT_WED_Q_TXFREE;</div><div class='add'>+			mdev-&gt;q_rx[MT_RXQ_MAIN_WA].wed = &amp;mdev-&gt;mmio.wed;</div><div class='add'>+			if (is_mt7916(mdev)) {</div><div class='add'>+				wa_rx_base =  MT_WED_RX_RING_BASE;</div><div class='add'>+				wa_rx_idx = MT7915_RXQ_MCU_WA;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;dbdc_support) {</div><div class='del'>-		ret = mt76_queue_alloc(dev, &amp;dev-&gt;mt76.q_rx[MT_RXQ_EXT],</div><div class='del'>-				       MT7915_RXQ_BAND1, MT7915_RX_RING_SIZE,</div><div class='del'>-				       rx_buf_size,</div><div class='del'>-				       MT_RX_DATA_RING_BASE + hif1_ofs);</div><div class='add'>+		ret = mt76_queue_alloc(dev, &amp;dev-&gt;mt76.q_rx[MT_RXQ_MAIN_WA],</div><div class='add'>+				       wa_rx_idx, MT7915_RX_MCU_RING_SIZE,</div><div class='add'>+				       MT_RX_BUF_SIZE, wa_rx_base);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;dbdc_support || dev-&gt;phy.mt76-&gt;band_idx) {</div><div class='add'>+		if (mtk_wed_device_active(&amp;mdev-&gt;mmio.wed) &amp;&amp;</div><div class='add'>+		    mtk_wed_get_rx_capa(&amp;mdev-&gt;mmio.wed)) {</div><div class='add'>+			mdev-&gt;q_rx[MT_RXQ_BAND1].flags =</div><div class='add'>+				MT_WED_Q_RX(MT7915_RXQ_BAND1);</div><div class='add'>+			dev-&gt;mt76.rx_token_size += MT7915_RX_RING_SIZE;</div><div class='add'>+			mdev-&gt;q_rx[MT_RXQ_BAND1].wed = &amp;mdev-&gt;mmio.wed;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		/* event from WA */</div><div class='del'>-		ret = mt76_queue_alloc(dev, &amp;dev-&gt;mt76.q_rx[MT_RXQ_EXT_WA],</div><div class='del'>-				       MT7915_RXQ_MCU_WA_EXT,</div><div class='add'>+		/* rx data queue for band1 */</div><div class='add'>+		ret = mt76_queue_alloc(dev, &amp;dev-&gt;mt76.q_rx[MT_RXQ_BAND1],</div><div class='add'>+				       MT_RXQ_ID(MT_RXQ_BAND1),</div><div class='add'>+				       MT7915_RX_RING_SIZE,</div><div class='add'>+				       MT_RX_BUF_SIZE,</div><div class='add'>+				       MT_RXQ_RING_BASE(MT_RXQ_BAND1) + hif1_ofs);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* tx free notify event from WA for band1 */</div><div class='add'>+		ret = mt76_queue_alloc(dev, &amp;dev-&gt;mt76.q_rx[MT_RXQ_BAND1_WA],</div><div class='add'>+				       MT_RXQ_ID(MT_RXQ_BAND1_WA),</div><div class='ctx'> 				       MT7915_RX_MCU_RING_SIZE,</div><div class='del'>-				       rx_buf_size,</div><div class='del'>-				       MT_RX_EVENT_RING_BASE + hif1_ofs);</div><div class='add'>+				       MT_RX_BUF_SIZE,</div><div class='add'>+				       MT_RXQ_RING_BASE(MT_RXQ_BAND1_WA) + hif1_ofs);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -217,84 +578,78 @@ int mt7915_dma_init(struct mt7915_dev *dev)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	netif_tx_napi_add(&amp;dev-&gt;mt76.tx_napi_dev, &amp;dev-&gt;mt76.tx_napi,</div><div class='del'>-			  mt7915_poll_tx, NAPI_POLL_WEIGHT);</div><div class='add'>+	netif_napi_add_tx(dev-&gt;mt76.tx_napi_dev, &amp;dev-&gt;mt76.tx_napi,</div><div class='add'>+			  mt7915_poll_tx);</div><div class='ctx'> 	napi_enable(&amp;dev-&gt;mt76.tx_napi);</div><div class='ctx'> </div><div class='del'>-	/* hif wait WFDMA idle */</div><div class='del'>-	mt76_set(dev, MT_WFDMA0_BUSY_ENA,</div><div class='del'>-		 MT_WFDMA0_BUSY_ENA_TX_FIFO0 |</div><div class='del'>-		 MT_WFDMA0_BUSY_ENA_TX_FIFO1 |</div><div class='del'>-		 MT_WFDMA0_BUSY_ENA_RX_FIFO);</div><div class='add'>+	mt7915_dma_enable(dev, false);</div><div class='ctx'> </div><div class='del'>-	mt76_set(dev, MT_WFDMA1_BUSY_ENA,</div><div class='del'>-		 MT_WFDMA1_BUSY_ENA_TX_FIFO0 |</div><div class='del'>-		 MT_WFDMA1_BUSY_ENA_TX_FIFO1 |</div><div class='del'>-		 MT_WFDMA1_BUSY_ENA_RX_FIFO);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	mt76_set(dev, MT_WFDMA0_PCIE1_BUSY_ENA,</div><div class='del'>-		 MT_WFDMA0_PCIE1_BUSY_ENA_TX_FIFO0 |</div><div class='del'>-		 MT_WFDMA0_PCIE1_BUSY_ENA_TX_FIFO1 |</div><div class='del'>-		 MT_WFDMA0_PCIE1_BUSY_ENA_RX_FIFO);</div><div class='add'>+int mt7915_dma_reset(struct mt7915_dev *dev, bool force)</div><div class='add'>+{</div><div class='add'>+	struct mt76_phy *mphy_ext = dev-&gt;mt76.phys[MT_BAND1];</div><div class='add'>+	struct mtk_wed_device *wed = &amp;dev-&gt;mt76.mmio.wed;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* clean up hw queues */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;mt76.phy.q_tx); i++) {</div><div class='add'>+		mt76_queue_tx_cleanup(dev, dev-&gt;mphy.q_tx[i], true);</div><div class='add'>+		if (mphy_ext)</div><div class='add'>+			mt76_queue_tx_cleanup(dev, mphy_ext-&gt;q_tx[i], true);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mt76_set(dev, MT_WFDMA1_PCIE1_BUSY_ENA,</div><div class='del'>-		 MT_WFDMA1_PCIE1_BUSY_ENA_TX_FIFO0 |</div><div class='del'>-		 MT_WFDMA1_PCIE1_BUSY_ENA_TX_FIFO1 |</div><div class='del'>-		 MT_WFDMA1_PCIE1_BUSY_ENA_RX_FIFO);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;mt76.q_mcu); i++)</div><div class='add'>+		mt76_queue_tx_cleanup(dev, dev-&gt;mt76.q_mcu[i], true);</div><div class='ctx'> </div><div class='del'>-	mt76_poll(dev, MT_WFDMA_EXT_CSR_HIF_MISC,</div><div class='del'>-		  MT_WFDMA_EXT_CSR_HIF_MISC_BUSY, 0, 1000);</div><div class='add'>+	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i)</div><div class='add'>+		mt76_queue_rx_cleanup(dev, &amp;dev-&gt;mt76.q_rx[i]);</div><div class='ctx'> </div><div class='del'>-	/* set WFDMA Tx/Rx */</div><div class='del'>-	mt76_set(dev, MT_WFDMA0_GLO_CFG,</div><div class='del'>-		 MT_WFDMA0_GLO_CFG_TX_DMA_EN | MT_WFDMA0_GLO_CFG_RX_DMA_EN);</div><div class='del'>-	mt76_set(dev, MT_WFDMA1_GLO_CFG,</div><div class='del'>-		 MT_WFDMA1_GLO_CFG_TX_DMA_EN | MT_WFDMA1_GLO_CFG_RX_DMA_EN);</div><div class='add'>+	/* reset wfsys */</div><div class='add'>+	if (force)</div><div class='add'>+		mt7915_wfsys_reset(dev);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;hif2) {</div><div class='del'>-		mt76_set(dev, MT_WFDMA0_GLO_CFG + hif1_ofs,</div><div class='del'>-			 (MT_WFDMA0_GLO_CFG_TX_DMA_EN |</div><div class='del'>-			  MT_WFDMA0_GLO_CFG_RX_DMA_EN));</div><div class='del'>-		mt76_set(dev, MT_WFDMA1_GLO_CFG + hif1_ofs,</div><div class='del'>-			 (MT_WFDMA1_GLO_CFG_TX_DMA_EN |</div><div class='del'>-			  MT_WFDMA1_GLO_CFG_RX_DMA_EN));</div><div class='del'>-		mt76_set(dev, MT_WFDMA_HOST_CONFIG,</div><div class='del'>-			 MT_WFDMA_HOST_CONFIG_PDMA_BAND);</div><div class='add'>+	if (mtk_wed_device_active(wed))</div><div class='add'>+		mtk_wed_device_dma_reset(wed);</div><div class='add'>+</div><div class='add'>+	mt7915_dma_disable(dev, force);</div><div class='add'>+	mt76_wed_dma_reset(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	/* reset hw queues */</div><div class='add'>+	for (i = 0; i &lt; __MT_TXQ_MAX; i++) {</div><div class='add'>+		mt76_dma_reset_tx_queue(&amp;dev-&gt;mt76, dev-&gt;mphy.q_tx[i]);</div><div class='add'>+		if (mphy_ext)</div><div class='add'>+			mt76_dma_reset_tx_queue(&amp;dev-&gt;mt76, mphy_ext-&gt;q_tx[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* enable interrupts for TX/RX rings */</div><div class='del'>-	mt7915_irq_enable(dev, MT_INT_RX_DONE_ALL | MT_INT_TX_DONE_MCU |</div><div class='del'>-			  MT_INT_MCU_CMD);</div><div class='add'>+	for (i = 0; i &lt; __MT_MCUQ_MAX; i++)</div><div class='add'>+		mt76_queue_reset(dev, dev-&gt;mt76.q_mcu[i], true);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i) {</div><div class='add'>+		if (mt76_queue_is_wed_tx_free(&amp;dev-&gt;mt76.q_rx[i]))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-void mt7915_dma_cleanup(struct mt7915_dev *dev)</div><div class='del'>-{</div><div class='del'>-	/* disable */</div><div class='del'>-	mt76_clear(dev, MT_WFDMA0_GLO_CFG,</div><div class='del'>-		   MT_WFDMA0_GLO_CFG_TX_DMA_EN |</div><div class='del'>-		   MT_WFDMA0_GLO_CFG_RX_DMA_EN);</div><div class='del'>-	mt76_clear(dev, MT_WFDMA1_GLO_CFG,</div><div class='del'>-		   MT_WFDMA1_GLO_CFG_TX_DMA_EN |</div><div class='del'>-		   MT_WFDMA1_GLO_CFG_RX_DMA_EN);</div><div class='add'>+		mt76_queue_reset(dev, &amp;dev-&gt;mt76.q_rx[i], true);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* reset */</div><div class='del'>-	mt76_clear(dev, MT_WFDMA1_RST,</div><div class='del'>-		   MT_WFDMA1_RST_DMASHDL_ALL_RST |</div><div class='del'>-		   MT_WFDMA1_RST_LOGIC_RST);</div><div class='add'>+	mt76_tx_status_check(&amp;dev-&gt;mt76, true);</div><div class='ctx'> </div><div class='del'>-	mt76_set(dev, MT_WFDMA1_RST,</div><div class='del'>-		 MT_WFDMA1_RST_DMASHDL_ALL_RST |</div><div class='del'>-		 MT_WFDMA1_RST_LOGIC_RST);</div><div class='add'>+	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i)</div><div class='add'>+		mt76_queue_rx_reset(dev, i);</div><div class='ctx'> </div><div class='del'>-	mt76_clear(dev, MT_WFDMA0_RST,</div><div class='del'>-		   MT_WFDMA0_RST_DMASHDL_ALL_RST |</div><div class='del'>-		   MT_WFDMA0_RST_LOGIC_RST);</div><div class='add'>+	if (mtk_wed_device_active(wed) &amp;&amp; is_mt7915(&amp;dev-&gt;mt76))</div><div class='add'>+		mt76_rmw(dev, MT_WFDMA0_EXT0_CFG, MT_WFDMA0_EXT0_RXWB_KEEP,</div><div class='add'>+			 MT_WFDMA0_EXT0_RXWB_KEEP);</div><div class='ctx'> </div><div class='del'>-	mt76_set(dev, MT_WFDMA0_RST,</div><div class='del'>-		 MT_WFDMA0_RST_DMASHDL_ALL_RST |</div><div class='del'>-		 MT_WFDMA0_RST_LOGIC_RST);</div><div class='add'>+	mt7915_dma_enable(dev, !force);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7915_dma_cleanup(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	mt7915_dma_disable(dev, true);</div><div class='ctx'> </div><div class='ctx'> 	mt76_dma_cleanup(&amp;dev-&gt;mt76);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c<br/>index 8ededf2e5279..eb92cbf1a284 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c</a></div><div class='hunk'>@@ -1,50 +1,45 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include "mt7915.h"</div><div class='ctx'> #include "eeprom.h"</div><div class='ctx'> </div><div class='del'>-static u32 mt7915_eeprom_read(struct mt7915_dev *dev, u32 offset)</div><div class='del'>-{</div><div class='del'>-	u8 *data = dev-&gt;mt76.eeprom.data;</div><div class='del'>-</div><div class='del'>-	if (data[offset] == 0xff &amp;&amp; !dev-&gt;flash_mode)</div><div class='del'>-		mt7915_mcu_get_eeprom(dev, offset);</div><div class='del'>-</div><div class='del'>-	return data[offset];</div><div class='del'>-}</div><div class='add'>+static bool enable_6ghz;</div><div class='add'>+module_param(enable_6ghz, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(enable_6ghz, "Enable 6 GHz instead of 5 GHz on hardware that supports both");</div><div class='ctx'> </div><div class='ctx'> static int mt7915_eeprom_load_precal(struct mt7915_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='del'>-	u32 val;</div><div class='add'>+	u8 *eeprom = mdev-&gt;eeprom.data;</div><div class='add'>+	u32 offs = is_mt7915(&amp;dev-&gt;mt76) ? MT_EE_DO_PRE_CAL : MT_EE_DO_PRE_CAL_V2;</div><div class='add'>+	u32 size, val = eeprom[offs];</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	val = mt7915_eeprom_read(dev, MT_EE_DO_PRE_CAL);</div><div class='del'>-	if (val != (MT_EE_WIFI_CAL_DPD | MT_EE_WIFI_CAL_GROUP))</div><div class='add'>+	if (!dev-&gt;flash_mode || !val)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	val = MT_EE_CAL_GROUP_SIZE + MT_EE_CAL_DPD_SIZE;</div><div class='del'>-	dev-&gt;cal = devm_kzalloc(mdev-&gt;dev, val, GFP_KERNEL);</div><div class='add'>+	size = mt7915_get_cal_group_size(dev) + mt7915_get_cal_dpd_size(dev);</div><div class='add'>+</div><div class='add'>+	dev-&gt;cal = devm_kzalloc(mdev-&gt;dev, size, GFP_KERNEL);</div><div class='ctx'> 	if (!dev-&gt;cal)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	return mt76_get_of_eeprom(mdev, dev-&gt;cal, MT_EE_PRECAL, val);</div><div class='del'>-}</div><div class='add'>+	offs = is_mt7915(&amp;dev-&gt;mt76) ? MT_EE_PRECAL : MT_EE_PRECAL_V2;</div><div class='ctx'> </div><div class='del'>-static int mt7915_eeprom_load(struct mt7915_dev *dev)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='add'>+	ret = mt76_get_of_data_from_mtd(mdev, dev-&gt;cal, offs, size);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = mt76_eeprom_init(&amp;dev-&gt;mt76, MT7915_EEPROM_SIZE);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	ret = mt76_get_of_data_from_nvmem(mdev, dev-&gt;cal, "precal", size);</div><div class='add'>+	if (!ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (ret) {</div><div class='del'>-		dev-&gt;flash_mode = true;</div><div class='del'>-		ret = mt7915_eeprom_load_precal(dev);</div><div class='del'>-	} else {</div><div class='del'>-		memset(dev-&gt;mt76.eeprom.data, -1, MT7915_EEPROM_SIZE);</div><div class='del'>-	}</div><div class='add'>+	dev_warn(mdev-&gt;dev, "missing precal data, size=%d\n", size);</div><div class='add'>+	devm_kfree(mdev-&gt;dev, dev-&gt;cal);</div><div class='add'>+	dev-&gt;cal = NULL;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -52,29 +47,156 @@ static int mt7915_eeprom_load(struct mt7915_dev *dev)</div><div class='ctx'> static int mt7915_check_eeprom(struct mt7915_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *eeprom = dev-&gt;mt76.eeprom.data;</div><div class='del'>-	u16 val;</div><div class='del'>-</div><div class='del'>-	mt7915_eeprom_read(dev, MT_EE_CHIP_ID);</div><div class='del'>-	val = get_unaligned_le16(eeprom);</div><div class='add'>+	u16 val = get_unaligned_le16(eeprom);</div><div class='ctx'> </div><div class='add'>+#define CHECK_EEPROM_ERR(match)	(match ? 0 : -EINVAL)</div><div class='ctx'> 	switch (val) {</div><div class='ctx'> 	case 0x7915:</div><div class='del'>-		return 0;</div><div class='add'>+		return CHECK_EEPROM_ERR(is_mt7915(&amp;dev-&gt;mt76));</div><div class='add'>+	case 0x7916:</div><div class='add'>+		return CHECK_EEPROM_ERR(is_mt7916(&amp;dev-&gt;mt76));</div><div class='add'>+	case 0x7981:</div><div class='add'>+		return CHECK_EEPROM_ERR(is_mt7981(&amp;dev-&gt;mt76));</div><div class='add'>+	case 0x7986:</div><div class='add'>+		return CHECK_EEPROM_ERR(is_mt7986(&amp;dev-&gt;mt76));</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt7915_eeprom_parse_band_config(struct mt7915_phy *phy)</div><div class='add'>+static char *mt7915_eeprom_name(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	switch (mt76_chip(&amp;dev-&gt;mt76)) {</div><div class='add'>+	case 0x7915:</div><div class='add'>+		return dev-&gt;dbdc_support ?</div><div class='add'>+		       MT7915_EEPROM_DEFAULT_DBDC : MT7915_EEPROM_DEFAULT;</div><div class='add'>+	case 0x7981:</div><div class='add'>+		/* mt7981 only supports mt7976 and only in DBDC mode */</div><div class='add'>+		return MT7981_EEPROM_MT7976_DEFAULT_DBDC;</div><div class='add'>+	case 0x7986:</div><div class='add'>+		switch (mt7915_check_adie(dev, true)) {</div><div class='add'>+		case MT7976_ONE_ADIE_DBDC:</div><div class='add'>+			return MT7986_EEPROM_MT7976_DEFAULT_DBDC;</div><div class='add'>+		case MT7975_ONE_ADIE:</div><div class='add'>+			return MT7986_EEPROM_MT7975_DEFAULT;</div><div class='add'>+		case MT7976_ONE_ADIE:</div><div class='add'>+			return MT7986_EEPROM_MT7976_DEFAULT;</div><div class='add'>+		case MT7975_DUAL_ADIE:</div><div class='add'>+			return MT7986_EEPROM_MT7975_DUAL_DEFAULT;</div><div class='add'>+		case MT7976_DUAL_ADIE:</div><div class='add'>+			return MT7986_EEPROM_MT7976_DUAL_DEFAULT;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		return NULL;</div><div class='add'>+	default:</div><div class='add'>+		return MT7916_EEPROM_DEFAULT;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7915_eeprom_load_default(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u8 *eeprom = dev-&gt;mt76.eeprom.data;</div><div class='add'>+	const struct firmware *fw = NULL;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = request_firmware(&amp;fw, mt7915_eeprom_name(dev), dev-&gt;mt76.dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!fw || !fw-&gt;data) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Invalid default bin\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(eeprom, fw-&gt;data, mt7915_eeprom_size(dev));</div><div class='add'>+	dev-&gt;flash_mode = true;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7915_eeprom_load(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u16 eeprom_size = mt7915_eeprom_size(dev);</div><div class='add'>+</div><div class='add'>+	ret = mt76_eeprom_init(&amp;dev-&gt;mt76, eeprom_size);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev-&gt;flash_mode = true;</div><div class='add'>+	} else {</div><div class='add'>+		u8 free_block_num;</div><div class='add'>+		u32 block_num, i;</div><div class='add'>+		u32 eeprom_blk_size = MT7915_EEPROM_BLOCK_SIZE;</div><div class='add'>+</div><div class='add'>+		ret = mt7915_mcu_get_eeprom_free_block(dev, &amp;free_block_num);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* efuse info isn't enough */</div><div class='add'>+		if (free_block_num &gt;= 29)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/* read eeprom data from efuse */</div><div class='add'>+		block_num = DIV_ROUND_UP(eeprom_size, eeprom_blk_size);</div><div class='add'>+		for (i = 0; i &lt; block_num; i++) {</div><div class='add'>+			ret = mt7915_mcu_get_eeprom(dev, i * eeprom_blk_size, NULL);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mt7915_check_eeprom(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7915_eeprom_parse_band_config(struct mt7915_phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='del'>-	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='add'>+	u8 *eeprom = dev-&gt;mt76.eeprom.data;</div><div class='add'>+	u8 band = phy-&gt;mt76-&gt;band_idx;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	val = mt7915_eeprom_read(dev, MT_EE_WIFI_CONF + ext_phy);</div><div class='add'>+	val = eeprom[MT_EE_WIFI_CONF + band];</div><div class='ctx'> 	val = FIELD_GET(MT_EE_WIFI_CONF0_BAND_SEL, val);</div><div class='del'>-	if (val == MT_EE_BAND_SEL_DEFAULT &amp;&amp; dev-&gt;dbdc_support)</div><div class='del'>-		val = ext_phy ? MT_EE_BAND_SEL_5GHZ : MT_EE_BAND_SEL_2GHZ;</div><div class='add'>+</div><div class='add'>+	if (!is_mt7915(&amp;dev-&gt;mt76)) {</div><div class='add'>+		switch (val) {</div><div class='add'>+		case MT_EE_V2_BAND_SEL_5GHZ:</div><div class='add'>+			phy-&gt;mt76-&gt;cap.has_5ghz = true;</div><div class='add'>+			return;</div><div class='add'>+		case MT_EE_V2_BAND_SEL_6GHZ:</div><div class='add'>+			phy-&gt;mt76-&gt;cap.has_6ghz = true;</div><div class='add'>+			return;</div><div class='add'>+		case MT_EE_V2_BAND_SEL_5GHZ_6GHZ:</div><div class='add'>+			if (enable_6ghz) {</div><div class='add'>+				phy-&gt;mt76-&gt;cap.has_6ghz = true;</div><div class='add'>+				u8p_replace_bits(&amp;eeprom[MT_EE_WIFI_CONF + band],</div><div class='add'>+						 MT_EE_V2_BAND_SEL_6GHZ,</div><div class='add'>+						 MT_EE_WIFI_CONF0_BAND_SEL);</div><div class='add'>+			} else {</div><div class='add'>+				phy-&gt;mt76-&gt;cap.has_5ghz = true;</div><div class='add'>+				u8p_replace_bits(&amp;eeprom[MT_EE_WIFI_CONF + band],</div><div class='add'>+						 MT_EE_V2_BAND_SEL_5GHZ,</div><div class='add'>+						 MT_EE_WIFI_CONF0_BAND_SEL);</div><div class='add'>+			}</div><div class='add'>+			/* force to buffer mode */</div><div class='add'>+			dev-&gt;flash_mode = true;</div><div class='add'>+</div><div class='add'>+			return;</div><div class='add'>+		default:</div><div class='add'>+			phy-&gt;mt76-&gt;cap.has_2ghz = true;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	} else if (val == MT_EE_BAND_SEL_DEFAULT &amp;&amp; dev-&gt;dbdc_support) {</div><div class='add'>+		val = band ? MT_EE_BAND_SEL_5GHZ : MT_EE_BAND_SEL_2GHZ;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	switch (val) {</div><div class='ctx'> 	case MT_EE_BAND_SEL_5GHZ:</div><div class='hunk'>@@ -90,32 +212,56 @@ void mt7915_eeprom_parse_band_config(struct mt7915_phy *phy)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt7915_eeprom_parse_hw_cap(struct mt7915_dev *dev)</div><div class='add'>+void mt7915_eeprom_parse_hw_cap(struct mt7915_dev *dev,</div><div class='add'>+				struct mt7915_phy *phy)</div><div class='ctx'> {</div><div class='del'>-	u8 nss, nss_band, *eeprom = dev-&gt;mt76.eeprom.data;</div><div class='add'>+	u8 path, nss, nss_max = 4, *eeprom = dev-&gt;mt76.eeprom.data;</div><div class='add'>+	struct mt76_phy *mphy = phy-&gt;mt76;</div><div class='add'>+	u8 band = phy-&gt;mt76-&gt;band_idx;</div><div class='ctx'> </div><div class='del'>-	mt7915_eeprom_parse_band_config(&amp;dev-&gt;phy);</div><div class='add'>+	mt7915_eeprom_parse_band_config(phy);</div><div class='ctx'> </div><div class='del'>-	/* read tx mask from eeprom */</div><div class='del'>-	nss = FIELD_GET(MT_EE_WIFI_CONF0_TX_PATH, eeprom[MT_EE_WIFI_CONF]);</div><div class='del'>-	if (!nss || nss &gt; 4)</div><div class='del'>-		nss = 4;</div><div class='add'>+	/* read tx/rx path from eeprom */</div><div class='add'>+	if (is_mt7915(&amp;dev-&gt;mt76)) {</div><div class='add'>+		path = FIELD_GET(MT_EE_WIFI_CONF0_TX_PATH,</div><div class='add'>+				 eeprom[MT_EE_WIFI_CONF]);</div><div class='add'>+	} else {</div><div class='add'>+		path = FIELD_GET(MT_EE_WIFI_CONF0_TX_PATH,</div><div class='add'>+				 eeprom[MT_EE_WIFI_CONF + band]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	nss_band = nss;</div><div class='add'>+	if (!path || path &gt; 4)</div><div class='add'>+		path = 4;</div><div class='ctx'> </div><div class='add'>+	/* read tx/rx stream */</div><div class='add'>+	nss = path;</div><div class='ctx'> 	if (dev-&gt;dbdc_support) {</div><div class='del'>-		nss_band = FIELD_GET(MT_EE_WIFI_CONF3_TX_PATH_B0,</div><div class='del'>-				     eeprom[MT_EE_WIFI_CONF + 3]);</div><div class='del'>-		if (!nss_band || nss_band &gt; 2)</div><div class='del'>-			nss_band = 2;</div><div class='del'>-</div><div class='del'>-		if (nss_band &gt;= nss)</div><div class='del'>-			nss = 4;</div><div class='add'>+		if (is_mt7915(&amp;dev-&gt;mt76)) {</div><div class='add'>+			path = min_t(u8, path, 2);</div><div class='add'>+			nss = FIELD_GET(MT_EE_WIFI_CONF3_TX_PATH_B0,</div><div class='add'>+					eeprom[MT_EE_WIFI_CONF + 3]);</div><div class='add'>+			if (band)</div><div class='add'>+				nss = FIELD_GET(MT_EE_WIFI_CONF3_TX_PATH_B1,</div><div class='add'>+						eeprom[MT_EE_WIFI_CONF + 3]);</div><div class='add'>+		} else {</div><div class='add'>+			nss = FIELD_GET(MT_EE_WIFI_CONF_STREAM_NUM,</div><div class='add'>+					eeprom[MT_EE_WIFI_CONF + 2 + band]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!is_mt798x(&amp;dev-&gt;mt76))</div><div class='add'>+			nss_max = 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev-&gt;chainmask = BIT(nss) - 1;</div><div class='del'>-	dev-&gt;mphy.antenna_mask = BIT(nss_band) - 1;</div><div class='del'>-	dev-&gt;mphy.chainmask = dev-&gt;mphy.antenna_mask;</div><div class='add'>+	if (!nss)</div><div class='add'>+		nss = nss_max;</div><div class='add'>+	nss = min_t(u8, min_t(u8, nss_max, nss), path);</div><div class='add'>+</div><div class='add'>+	mphy-&gt;chainmask = BIT(path) - 1;</div><div class='add'>+	if (band)</div><div class='add'>+		mphy-&gt;chainmask &lt;&lt;= dev-&gt;chainshift;</div><div class='add'>+	mphy-&gt;antenna_mask = BIT(nss) - 1;</div><div class='add'>+	dev-&gt;chainmask |= mphy-&gt;chainmask;</div><div class='add'>+	dev-&gt;chainshift = hweight8(dev-&gt;mphy.chainmask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mt7915_eeprom_init(struct mt7915_dev *dev)</div><div class='hunk'>@@ -123,48 +269,67 @@ int mt7915_eeprom_init(struct mt7915_dev *dev)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = mt7915_eeprom_load(dev);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = mt7915_check_eeprom(dev);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		if (ret != -EINVAL)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		dev_warn(dev-&gt;mt76.dev, "eeprom load fail, use default bin\n");</div><div class='add'>+		ret = mt7915_eeprom_load_default(dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mt7915_eeprom_parse_hw_cap(dev);</div><div class='add'>+	mt7915_eeprom_load_precal(dev);</div><div class='add'>+	mt7915_eeprom_parse_hw_cap(dev, &amp;dev-&gt;phy);</div><div class='ctx'> 	memcpy(dev-&gt;mphy.macaddr, dev-&gt;mt76.eeprom.data + MT_EE_MAC_ADDR,</div><div class='ctx'> 	       ETH_ALEN);</div><div class='ctx'> </div><div class='del'>-	mt76_eeprom_override(&amp;dev-&gt;mphy);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return mt76_eeprom_override(&amp;dev-&gt;mphy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mt7915_eeprom_get_target_power(struct mt7915_dev *dev,</div><div class='ctx'> 				   struct ieee80211_channel *chan,</div><div class='ctx'> 				   u8 chain_idx)</div><div class='ctx'> {</div><div class='add'>+	u8 *eeprom = dev-&gt;mt76.eeprom.data;</div><div class='ctx'> 	int index, target_power;</div><div class='del'>-	bool tssi_on;</div><div class='add'>+	bool tssi_on, is_7976;</div><div class='ctx'> </div><div class='ctx'> 	if (chain_idx &gt; 3)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	tssi_on = mt7915_tssi_enabled(dev, chan-&gt;band);</div><div class='add'>+	is_7976 = mt7915_check_adie(dev, false) || is_mt7916(&amp;dev-&gt;mt76);</div><div class='ctx'> </div><div class='ctx'> 	if (chan-&gt;band == NL80211_BAND_2GHZ) {</div><div class='del'>-		index = MT_EE_TX0_POWER_2G + chain_idx * 3;</div><div class='del'>-		target_power = mt7915_eeprom_read(dev, index);</div><div class='del'>-</div><div class='del'>-		if (!tssi_on)</div><div class='del'>-			target_power += mt7915_eeprom_read(dev, index + 1);</div><div class='add'>+		if (is_7976) {</div><div class='add'>+			index = MT_EE_TX0_POWER_2G_V2 + chain_idx;</div><div class='add'>+			target_power = eeprom[index];</div><div class='add'>+		} else {</div><div class='add'>+			index = MT_EE_TX0_POWER_2G + chain_idx * 3;</div><div class='add'>+			target_power = eeprom[index];</div><div class='add'>+</div><div class='add'>+			if (!tssi_on)</div><div class='add'>+				target_power += eeprom[index + 1];</div><div class='add'>+		}</div><div class='add'>+	} else if (chan-&gt;band == NL80211_BAND_5GHZ) {</div><div class='add'>+		int group = mt7915_get_channel_group_5g(chan-&gt;hw_value, is_7976);</div><div class='add'>+</div><div class='add'>+		if (is_7976) {</div><div class='add'>+			index = MT_EE_TX0_POWER_5G_V2 + chain_idx * 5;</div><div class='add'>+			target_power = eeprom[index + group];</div><div class='add'>+		} else {</div><div class='add'>+			index = MT_EE_TX0_POWER_5G + chain_idx * 12;</div><div class='add'>+			target_power = eeprom[index + group];</div><div class='add'>+</div><div class='add'>+			if (!tssi_on)</div><div class='add'>+				target_power += eeprom[index + 8];</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='del'>-		int group = mt7915_get_channel_group(chan-&gt;hw_value);</div><div class='del'>-</div><div class='del'>-		index = MT_EE_TX0_POWER_5G + chain_idx * 12;</div><div class='del'>-		target_power = mt7915_eeprom_read(dev, index + group);</div><div class='add'>+		int group = mt7915_get_channel_group_6g(chan-&gt;hw_value);</div><div class='ctx'> </div><div class='del'>-		if (!tssi_on)</div><div class='del'>-			target_power += mt7915_eeprom_read(dev, index + 8);</div><div class='add'>+		index = MT_EE_TX0_POWER_6G_V2 + chain_idx * 8;</div><div class='add'>+		target_power = is_7976 ? eeprom[index + group] : 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return target_power;</div><div class='hunk'>@@ -172,15 +337,21 @@ int mt7915_eeprom_get_target_power(struct mt7915_dev *dev,</div><div class='ctx'> </div><div class='ctx'> s8 mt7915_eeprom_get_power_delta(struct mt7915_dev *dev, int band)</div><div class='ctx'> {</div><div class='del'>-	u32 val;</div><div class='add'>+	u8 *eeprom = dev-&gt;mt76.eeprom.data;</div><div class='add'>+	u32 val, offs;</div><div class='ctx'> 	s8 delta;</div><div class='add'>+	bool is_7976 = mt7915_check_adie(dev, false) || is_mt7916(&amp;dev-&gt;mt76);</div><div class='ctx'> </div><div class='ctx'> 	if (band == NL80211_BAND_2GHZ)</div><div class='del'>-		val = mt7915_eeprom_read(dev, MT_EE_RATE_DELTA_2G);</div><div class='add'>+		offs = is_7976 ? MT_EE_RATE_DELTA_2G_V2 : MT_EE_RATE_DELTA_2G;</div><div class='add'>+	else if (band == NL80211_BAND_5GHZ)</div><div class='add'>+		offs = is_7976 ? MT_EE_RATE_DELTA_5G_V2 : MT_EE_RATE_DELTA_5G;</div><div class='ctx'> 	else</div><div class='del'>-		val = mt7915_eeprom_read(dev, MT_EE_RATE_DELTA_5G);</div><div class='add'>+		offs = is_7976 ? MT_EE_RATE_DELTA_6G_V2 : 0;</div><div class='ctx'> </div><div class='del'>-	if (!(val &amp; MT_EE_RATE_DELTA_EN))</div><div class='add'>+	val = eeprom[offs];</div><div class='add'>+</div><div class='add'>+	if (!offs || !(val &amp; MT_EE_RATE_DELTA_EN))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	delta = FIELD_GET(MT_EE_RATE_DELTA_MASK, val);</div><div class='hunk'>@@ -188,6 +359,37 @@ s8 mt7915_eeprom_get_power_delta(struct mt7915_dev *dev, int band)</div><div class='ctx'> 	return val &amp; MT_EE_RATE_DELTA_SIGN ? delta : -delta;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool</div><div class='add'>+mt7915_eeprom_has_background_radar(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u8 val, buf[MT7915_EEPROM_BLOCK_SIZE];</div><div class='add'>+	u8 band_sel, tx_path, rx_path;</div><div class='add'>+	int offs = MT_EE_WIFI_CONF + 1;</div><div class='add'>+</div><div class='add'>+	switch (mt76_chip(&amp;dev-&gt;mt76)) {</div><div class='add'>+	case 0x7915:</div><div class='add'>+		return true;</div><div class='add'>+	case 0x7906:</div><div class='add'>+		/* read efuse to check background radar capability */</div><div class='add'>+		if (mt7915_mcu_get_eeprom(dev, offs, buf))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		val = buf[offs % MT7915_EEPROM_BLOCK_SIZE];</div><div class='add'>+		band_sel = u8_get_bits(val, MT_EE_WIFI_CONF0_BAND_SEL);</div><div class='add'>+		tx_path = u8_get_bits(val, MT_EE_WIFI_CONF0_TX_PATH);</div><div class='add'>+		rx_path = u8_get_bits(val, MT_EE_WIFI_CONF0_RX_PATH);</div><div class='add'>+</div><div class='add'>+		return (band_sel == MT_EE_V2_BAND_SEL_5GHZ &amp;&amp;</div><div class='add'>+			tx_path == rx_path &amp;&amp; rx_path == 2);</div><div class='add'>+	case 0x7981:</div><div class='add'>+	case 0x7986:</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const u8 mt7915_sku_group_len[] = {</div><div class='ctx'> 	[SKU_CCK] = 4,</div><div class='ctx'> 	[SKU_OFDM] = 8,</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h b/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h<br/>index 033fb592bdf0..1dc285c72991 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MT7915_EEPROM_H</div><div class='hunk'>@@ -19,26 +19,46 @@ enum mt7915_eeprom_field {</div><div class='ctx'> 	MT_EE_DDIE_FT_VERSION =	0x050,</div><div class='ctx'> 	MT_EE_DO_PRE_CAL =	0x062,</div><div class='ctx'> 	MT_EE_WIFI_CONF =	0x190,</div><div class='add'>+	MT_EE_DO_PRE_CAL_V2 =	0x19a,</div><div class='ctx'> 	MT_EE_RATE_DELTA_2G =	0x252,</div><div class='ctx'> 	MT_EE_RATE_DELTA_5G =	0x29d,</div><div class='ctx'> 	MT_EE_TX0_POWER_2G =	0x2fc,</div><div class='ctx'> 	MT_EE_TX0_POWER_5G =	0x34b,</div><div class='add'>+	MT_EE_RATE_DELTA_2G_V2 = 0x7d3,</div><div class='add'>+	MT_EE_RATE_DELTA_5G_V2 = 0x81e,</div><div class='add'>+	MT_EE_RATE_DELTA_6G_V2 = 0x884, /* 6g fields only appear in eeprom v2 */</div><div class='add'>+	MT_EE_TX0_POWER_2G_V2 =	0x441,</div><div class='add'>+	MT_EE_TX0_POWER_5G_V2 =	0x445,</div><div class='add'>+	MT_EE_TX0_POWER_6G_V2 =	0x465,</div><div class='ctx'> 	MT_EE_ADIE_FT_VERSION =	0x9a0,</div><div class='ctx'> </div><div class='ctx'> 	__MT_EE_MAX =		0xe00,</div><div class='add'>+	__MT_EE_MAX_V2 =	0x1000,</div><div class='ctx'> 	/* 0xe10 ~ 0x5780 used to save group cal data */</div><div class='del'>-	MT_EE_PRECAL =		0xe10</div><div class='add'>+	MT_EE_PRECAL =		0xe10,</div><div class='add'>+	MT_EE_PRECAL_V2 =	0x1010</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define MT_EE_WIFI_CAL_GROUP			BIT(0)</div><div class='del'>-#define MT_EE_WIFI_CAL_DPD			GENMASK(2, 1)</div><div class='add'>+#define MT_EE_WIFI_CAL_DPD_2G			BIT(2)</div><div class='add'>+#define MT_EE_WIFI_CAL_DPD_5G			BIT(1)</div><div class='add'>+#define MT_EE_WIFI_CAL_DPD_6G			BIT(3)</div><div class='add'>+#define MT_EE_WIFI_CAL_DPD			GENMASK(3, 1)</div><div class='ctx'> #define MT_EE_CAL_UNIT				1024</div><div class='del'>-#define MT_EE_CAL_GROUP_SIZE			(44 * MT_EE_CAL_UNIT)</div><div class='del'>-#define MT_EE_CAL_DPD_SIZE			(54 * MT_EE_CAL_UNIT)</div><div class='add'>+#define MT_EE_CAL_GROUP_SIZE_7915		(49 * MT_EE_CAL_UNIT + 16)</div><div class='add'>+#define MT_EE_CAL_GROUP_SIZE_7916		(54 * MT_EE_CAL_UNIT + 16)</div><div class='add'>+#define MT_EE_CAL_GROUP_SIZE_7975		(54 * MT_EE_CAL_UNIT + 16)</div><div class='add'>+#define MT_EE_CAL_GROUP_SIZE_7976		(94 * MT_EE_CAL_UNIT + 16)</div><div class='add'>+#define MT_EE_CAL_GROUP_SIZE_7916_6G		(94 * MT_EE_CAL_UNIT + 16)</div><div class='add'>+#define MT_EE_CAL_GROUP_SIZE_7981		(144 * MT_EE_CAL_UNIT + 16)</div><div class='add'>+#define MT_EE_CAL_DPD_SIZE_V1			(54 * MT_EE_CAL_UNIT)</div><div class='add'>+#define MT_EE_CAL_DPD_SIZE_V2			(300 * MT_EE_CAL_UNIT)</div><div class='ctx'> </div><div class='ctx'> #define MT_EE_WIFI_CONF0_TX_PATH		GENMASK(2, 0)</div><div class='add'>+#define MT_EE_WIFI_CONF0_RX_PATH		GENMASK(5, 3)</div><div class='ctx'> #define MT_EE_WIFI_CONF0_BAND_SEL		GENMASK(7, 6)</div><div class='ctx'> #define MT_EE_WIFI_CONF1_BAND_SEL		GENMASK(7, 6)</div><div class='add'>+#define MT_EE_WIFI_CONF_STREAM_NUM		GENMASK(7, 5)</div><div class='ctx'> #define MT_EE_WIFI_CONF3_TX_PATH_B0		GENMASK(1, 0)</div><div class='ctx'> #define MT_EE_WIFI_CONF3_TX_PATH_B1		GENMASK(5, 4)</div><div class='ctx'> #define MT_EE_WIFI_CONF7_TSSI0_2G		BIT(0)</div><div class='hunk'>@@ -49,6 +69,14 @@ enum mt7915_eeprom_field {</div><div class='ctx'> #define MT_EE_RATE_DELTA_SIGN			BIT(6)</div><div class='ctx'> #define MT_EE_RATE_DELTA_EN			BIT(7)</div><div class='ctx'> </div><div class='add'>+enum mt7915_adie_sku {</div><div class='add'>+	MT7976_ONE_ADIE_DBDC = 0x7,</div><div class='add'>+	MT7975_ONE_ADIE	= 0x8,</div><div class='add'>+	MT7976_ONE_ADIE	= 0xa,</div><div class='add'>+	MT7975_DUAL_ADIE = 0xd,</div><div class='add'>+	MT7976_DUAL_ADIE = 0xf,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum mt7915_eeprom_band {</div><div class='ctx'> 	MT_EE_BAND_SEL_DEFAULT,</div><div class='ctx'> 	MT_EE_BAND_SEL_5GHZ,</div><div class='hunk'>@@ -56,6 +84,13 @@ enum mt7915_eeprom_band {</div><div class='ctx'> 	MT_EE_BAND_SEL_DUAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum {</div><div class='add'>+	MT_EE_V2_BAND_SEL_2GHZ,</div><div class='add'>+	MT_EE_V2_BAND_SEL_5GHZ,</div><div class='add'>+	MT_EE_V2_BAND_SEL_6GHZ,</div><div class='add'>+	MT_EE_V2_BAND_SEL_5GHZ_6GHZ,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum mt7915_sku_rate_group {</div><div class='ctx'> 	SKU_CCK,</div><div class='ctx'> 	SKU_OFDM,</div><div class='hunk'>@@ -76,8 +111,20 @@ enum mt7915_sku_rate_group {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='del'>-mt7915_get_channel_group(int channel)</div><div class='add'>+mt7915_get_channel_group_5g(int channel, bool is_7976)</div><div class='ctx'> {</div><div class='add'>+	if (is_7976) {</div><div class='add'>+		if (channel &lt;= 64)</div><div class='add'>+			return 0;</div><div class='add'>+		if (channel &lt;= 96)</div><div class='add'>+			return 1;</div><div class='add'>+		if (channel &lt;= 128)</div><div class='add'>+			return 2;</div><div class='add'>+		if (channel &lt;= 144)</div><div class='add'>+			return 3;</div><div class='add'>+		return 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (channel &gt;= 184 &amp;&amp; channel &lt;= 196)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (channel &lt;= 48)</div><div class='hunk'>@@ -95,16 +142,60 @@ mt7915_get_channel_group(int channel)</div><div class='ctx'> 	return 7;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int</div><div class='add'>+mt7915_get_channel_group_6g(int channel)</div><div class='add'>+{</div><div class='add'>+	if (channel &lt;= 29)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return DIV_ROUND_UP(channel - 29, 32);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool</div><div class='ctx'> mt7915_tssi_enabled(struct mt7915_dev *dev, enum nl80211_band band)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *eep = dev-&gt;mt76.eeprom.data;</div><div class='add'>+	u8 offs = is_mt7981(&amp;dev-&gt;mt76) ? 8 : 7;</div><div class='add'>+	u8 val = eep[MT_EE_WIFI_CONF + offs];</div><div class='add'>+</div><div class='add'>+	if (band == NL80211_BAND_2GHZ)</div><div class='add'>+		return val &amp; MT_EE_WIFI_CONF7_TSSI0_2G;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;dbdc_support)</div><div class='add'>+		return val &amp; MT_EE_WIFI_CONF7_TSSI1_5G;</div><div class='add'>+	else</div><div class='add'>+		return val &amp; MT_EE_WIFI_CONF7_TSSI0_5G;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* TODO: DBDC */</div><div class='del'>-	if (band == NL80211_BAND_5GHZ)</div><div class='del'>-		return eep[MT_EE_WIFI_CONF + 7] &amp; MT_EE_WIFI_CONF7_TSSI0_5G;</div><div class='add'>+static inline u32</div><div class='add'>+mt7915_get_cal_group_size(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u8 *eep = dev-&gt;mt76.eeprom.data;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (is_mt7915(&amp;dev-&gt;mt76)) {</div><div class='add'>+		return MT_EE_CAL_GROUP_SIZE_7915;</div><div class='add'>+	} else if (is_mt7916(&amp;dev-&gt;mt76)) {</div><div class='add'>+		val = eep[MT_EE_WIFI_CONF + 1];</div><div class='add'>+		val = FIELD_GET(MT_EE_WIFI_CONF0_BAND_SEL, val);</div><div class='add'>+		return (val == MT_EE_V2_BAND_SEL_6GHZ) ? MT_EE_CAL_GROUP_SIZE_7916_6G :</div><div class='add'>+							 MT_EE_CAL_GROUP_SIZE_7916;</div><div class='add'>+	} else if (is_mt7981(&amp;dev-&gt;mt76)) {</div><div class='add'>+		return MT_EE_CAL_GROUP_SIZE_7981;</div><div class='add'>+	} else if (mt7915_check_adie(dev, false)) {</div><div class='add'>+		return MT_EE_CAL_GROUP_SIZE_7976;</div><div class='add'>+	} else {</div><div class='add'>+		return MT_EE_CAL_GROUP_SIZE_7975;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+mt7915_get_cal_dpd_size(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	if (is_mt7915(&amp;dev-&gt;mt76))</div><div class='add'>+		return MT_EE_CAL_DPD_SIZE_V1;</div><div class='ctx'> 	else</div><div class='del'>-		return eep[MT_EE_WIFI_CONF + 7] &amp; MT_EE_WIFI_CONF7_TSSI0_2G;</div><div class='add'>+		return MT_EE_CAL_DPD_SIZE_V2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern const u8 mt7915_sku_group_len[MAX_SKU_RATE_GROUP_NUM];</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c<br/>index 822f3aa6bb8b..22443cbc74ad 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/init.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/init.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/init.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7915/init.c</a></div><div class='hunk'>@@ -1,40 +1,17 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/hwmon.h&gt;</div><div class='add'>+#include &lt;linux/hwmon-sysfs.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/thermal.h&gt;</div><div class='ctx'> #include "mt7915.h"</div><div class='ctx'> #include "mac.h"</div><div class='ctx'> #include "mcu.h"</div><div class='add'>+#include "coredump.h"</div><div class='ctx'> #include "eeprom.h"</div><div class='ctx'> </div><div class='del'>-#define CCK_RATE(_idx, _rate) {						\</div><div class='del'>-	.bitrate = _rate,						\</div><div class='del'>-	.flags = IEEE80211_RATE_SHORT_PREAMBLE,				\</div><div class='del'>-	.hw_value = (MT_PHY_TYPE_CCK &lt;&lt; 8) | (_idx),			\</div><div class='del'>-	.hw_value_short = (MT_PHY_TYPE_CCK &lt;&lt; 8) | (4 + (_idx)),	\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define OFDM_RATE(_idx, _rate) {					\</div><div class='del'>-	.bitrate = _rate,						\</div><div class='del'>-	.hw_value = (MT_PHY_TYPE_OFDM &lt;&lt; 8) | (_idx),			\</div><div class='del'>-	.hw_value_short = (MT_PHY_TYPE_OFDM &lt;&lt; 8) | (_idx),		\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct ieee80211_rate mt7915_rates[] = {</div><div class='del'>-	CCK_RATE(0, 10),</div><div class='del'>-	CCK_RATE(1, 20),</div><div class='del'>-	CCK_RATE(2, 55),</div><div class='del'>-	CCK_RATE(3, 110),</div><div class='del'>-	OFDM_RATE(11, 60),</div><div class='del'>-	OFDM_RATE(15, 90),</div><div class='del'>-	OFDM_RATE(10, 120),</div><div class='del'>-	OFDM_RATE(14, 180),</div><div class='del'>-	OFDM_RATE(9,  240),</div><div class='del'>-	OFDM_RATE(13, 360),</div><div class='del'>-	OFDM_RATE(8,  480),</div><div class='del'>-	OFDM_RATE(12, 540),</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct ieee80211_iface_limit if_limits[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.max = 1,</div><div class='hunk'>@@ -62,20 +39,258 @@ static const struct ieee80211_iface_combination if_comb[] = {</div><div class='ctx'> 				       BIT(NL80211_CHAN_WIDTH_20) |</div><div class='ctx'> 				       BIT(NL80211_CHAN_WIDTH_40) |</div><div class='ctx'> 				       BIT(NL80211_CHAN_WIDTH_80) |</div><div class='del'>-				       BIT(NL80211_CHAN_WIDTH_160) |</div><div class='del'>-				       BIT(NL80211_CHAN_WIDTH_80P80),</div><div class='add'>+				       BIT(NL80211_CHAN_WIDTH_160),</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7915_init_txpower(struct mt7915_dev *dev,</div><div class='del'>-		    struct ieee80211_supported_band *sband)</div><div class='add'>+static ssize_t mt7915_thermal_temp_show(struct device *dev,</div><div class='add'>+					struct device_attribute *attr,</div><div class='add'>+					char *buf)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_phy *phy = dev_get_drvdata(dev);</div><div class='add'>+	int i = to_sensor_dev_attr(attr)-&gt;index;</div><div class='add'>+	int temperature;</div><div class='add'>+</div><div class='add'>+	switch (i) {</div><div class='add'>+	case 0:</div><div class='add'>+		mutex_lock(&amp;phy-&gt;dev-&gt;mt76.mutex);</div><div class='add'>+		temperature = mt7915_mcu_get_temperature(phy);</div><div class='add'>+		mutex_unlock(&amp;phy-&gt;dev-&gt;mt76.mutex);</div><div class='add'>+		if (temperature &lt; 0)</div><div class='add'>+			return temperature;</div><div class='add'>+		/* display in millidegree celcius */</div><div class='add'>+		return sprintf(buf, "%u\n", temperature * 1000);</div><div class='add'>+	case 1:</div><div class='add'>+	case 2:</div><div class='add'>+		return sprintf(buf, "%u\n",</div><div class='add'>+			       phy-&gt;throttle_temp[i - 1] * 1000);</div><div class='add'>+	case 3:</div><div class='add'>+		return sprintf(buf, "%hhu\n", phy-&gt;throttle_state);</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mt7915_thermal_temp_store(struct device *dev,</div><div class='add'>+					 struct device_attribute *attr,</div><div class='add'>+					 const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_phy *phy = dev_get_drvdata(dev);</div><div class='add'>+	int ret, i = to_sensor_dev_attr(attr)-&gt;index;</div><div class='add'>+	long val;</div><div class='add'>+</div><div class='add'>+	ret = kstrtol(buf, 10, &amp;val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;phy-&gt;dev-&gt;mt76.mutex);</div><div class='add'>+	val = DIV_ROUND_CLOSEST(clamp_val(val, 60 * 1000, 130 * 1000), 1000);</div><div class='add'>+</div><div class='add'>+	if ((i - 1 == MT7915_CRIT_TEMP_IDX &amp;&amp;</div><div class='add'>+	     val &gt; phy-&gt;throttle_temp[MT7915_MAX_TEMP_IDX]) ||</div><div class='add'>+	    (i - 1 == MT7915_MAX_TEMP_IDX &amp;&amp;</div><div class='add'>+	     val &lt; phy-&gt;throttle_temp[MT7915_CRIT_TEMP_IDX])) {</div><div class='add'>+		dev_err(phy-&gt;dev-&gt;mt76.dev,</div><div class='add'>+			"temp1_max shall be greater than temp1_crit.");</div><div class='add'>+		mutex_unlock(&amp;phy-&gt;dev-&gt;mt76.mutex);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	phy-&gt;throttle_temp[i - 1] = val;</div><div class='add'>+	ret = mt7915_mcu_set_thermal_protect(phy);</div><div class='add'>+	mutex_unlock(&amp;phy-&gt;dev-&gt;mt76.mutex);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_input, mt7915_thermal_temp, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_crit, mt7915_thermal_temp, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RW(temp1_max, mt7915_thermal_temp, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(throttle1, mt7915_thermal_temp, 3);</div><div class='add'>+</div><div class='add'>+static struct attribute *mt7915_hwmon_attrs[] = {</div><div class='add'>+	&amp;sensor_dev_attr_temp1_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp1_crit.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp1_max.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_throttle1.dev_attr.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+ATTRIBUTE_GROUPS(mt7915_hwmon);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7915_thermal_get_max_throttle_state(struct thermal_cooling_device *cdev,</div><div class='add'>+				      unsigned long *state)</div><div class='add'>+{</div><div class='add'>+	*state = MT7915_CDEV_THROTTLE_MAX;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7915_thermal_get_cur_throttle_state(struct thermal_cooling_device *cdev,</div><div class='add'>+				      unsigned long *state)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_phy *phy = cdev-&gt;devdata;</div><div class='add'>+</div><div class='add'>+	*state = phy-&gt;cdev_state;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7915_thermal_set_cur_throttle_state(struct thermal_cooling_device *cdev,</div><div class='add'>+				      unsigned long state)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_phy *phy = cdev-&gt;devdata;</div><div class='add'>+	u8 throttling = MT7915_THERMAL_THROTTLE_MAX - state;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (state &gt; MT7915_CDEV_THROTTLE_MAX) {</div><div class='add'>+		dev_err(phy-&gt;dev-&gt;mt76.dev,</div><div class='add'>+			"please specify a valid throttling state\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (state == phy-&gt;cdev_state)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * cooling_device convention: 0 = no cooling, more = more cooling</div><div class='add'>+	 * mcu convention: 1 = max cooling, more = less cooling</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;phy-&gt;dev-&gt;mt76.mutex);</div><div class='add'>+	ret = mt7915_mcu_set_thermal_throttling(phy, throttling);</div><div class='add'>+	mutex_unlock(&amp;phy-&gt;dev-&gt;mt76.mutex);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	phy-&gt;cdev_state = state;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct thermal_cooling_device_ops mt7915_thermal_ops = {</div><div class='add'>+	.get_max_state = mt7915_thermal_get_max_throttle_state,</div><div class='add'>+	.get_cur_state = mt7915_thermal_get_cur_throttle_state,</div><div class='add'>+	.set_cur_state = mt7915_thermal_set_cur_throttle_state,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void mt7915_unregister_thermal(struct mt7915_phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct wiphy *wiphy = phy-&gt;mt76-&gt;hw-&gt;wiphy;</div><div class='add'>+</div><div class='add'>+	if (!phy-&gt;cdev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sysfs_remove_link(&amp;wiphy-&gt;dev.kobj, "cooling_device");</div><div class='add'>+	thermal_cooling_device_unregister(phy-&gt;cdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7915_thermal_init(struct mt7915_phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct wiphy *wiphy = phy-&gt;mt76-&gt;hw-&gt;wiphy;</div><div class='add'>+	struct thermal_cooling_device *cdev;</div><div class='add'>+	struct device *hwmon;</div><div class='add'>+	const char *name;</div><div class='add'>+</div><div class='add'>+	name = devm_kasprintf(&amp;wiphy-&gt;dev, GFP_KERNEL, "mt7915_%s",</div><div class='add'>+			      wiphy_name(wiphy));</div><div class='add'>+	if (!name)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cdev = thermal_cooling_device_register(name, phy, &amp;mt7915_thermal_ops);</div><div class='add'>+	if (!IS_ERR(cdev)) {</div><div class='add'>+		if (sysfs_create_link(&amp;wiphy-&gt;dev.kobj, &amp;cdev-&gt;device.kobj,</div><div class='add'>+				      "cooling_device") &lt; 0)</div><div class='add'>+			thermal_cooling_device_unregister(cdev);</div><div class='add'>+		else</div><div class='add'>+			phy-&gt;cdev = cdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* initialize critical/maximum high temperature */</div><div class='add'>+	phy-&gt;throttle_temp[MT7915_CRIT_TEMP_IDX] = MT7915_CRIT_TEMP;</div><div class='add'>+	phy-&gt;throttle_temp[MT7915_MAX_TEMP_IDX] = MT7915_MAX_TEMP;</div><div class='add'>+</div><div class='add'>+	if (!IS_REACHABLE(CONFIG_HWMON))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hwmon = devm_hwmon_device_register_with_groups(&amp;wiphy-&gt;dev, name, phy,</div><div class='add'>+						       mt7915_hwmon_groups);</div><div class='add'>+	return PTR_ERR_OR_ZERO(hwmon);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7915_led_set_config(struct led_classdev *led_cdev,</div><div class='add'>+				  u8 delay_on, u8 delay_off)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev;</div><div class='add'>+	struct mt76_phy *mphy;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	mphy = container_of(led_cdev, struct mt76_phy, leds.cdev);</div><div class='add'>+	dev = container_of(mphy-&gt;dev, struct mt7915_dev, mt76);</div><div class='add'>+</div><div class='add'>+	/* set PWM mode */</div><div class='add'>+	val = FIELD_PREP(MT_LED_STATUS_DURATION, 0xffff) |</div><div class='add'>+	      FIELD_PREP(MT_LED_STATUS_OFF, delay_off) |</div><div class='add'>+	      FIELD_PREP(MT_LED_STATUS_ON, delay_on);</div><div class='add'>+	mt76_wr(dev, MT_LED_STATUS_0(mphy-&gt;band_idx), val);</div><div class='add'>+	mt76_wr(dev, MT_LED_STATUS_1(mphy-&gt;band_idx), val);</div><div class='add'>+</div><div class='add'>+	/* enable LED */</div><div class='add'>+	mt76_wr(dev, MT_LED_EN(mphy-&gt;band_idx), 1);</div><div class='add'>+</div><div class='add'>+	/* control LED */</div><div class='add'>+	val = MT_LED_CTRL_KICK;</div><div class='add'>+	if (dev-&gt;mphy.leds.al)</div><div class='add'>+		val |= MT_LED_CTRL_POLARITY;</div><div class='add'>+	if (mphy-&gt;band_idx)</div><div class='add'>+		val |= MT_LED_CTRL_BAND;</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_LED_CTRL(mphy-&gt;band_idx), val);</div><div class='add'>+	mt76_clear(dev, MT_LED_CTRL(mphy-&gt;band_idx), MT_LED_CTRL_KICK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7915_led_set_blink(struct led_classdev *led_cdev,</div><div class='add'>+				unsigned long *delay_on,</div><div class='add'>+				unsigned long *delay_off)</div><div class='add'>+{</div><div class='add'>+	u16 delta_on = 0, delta_off = 0;</div><div class='add'>+</div><div class='add'>+#define HW_TICK		10</div><div class='add'>+#define TO_HW_TICK(_t)	(((_t) &gt; HW_TICK) ? ((_t) / HW_TICK) : HW_TICK)</div><div class='add'>+</div><div class='add'>+	if (*delay_on)</div><div class='add'>+		delta_on = TO_HW_TICK(*delay_on);</div><div class='add'>+	if (*delay_off)</div><div class='add'>+		delta_off = TO_HW_TICK(*delay_off);</div><div class='add'>+</div><div class='add'>+	mt7915_led_set_config(led_cdev, delta_on, delta_off);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7915_led_set_brightness(struct led_classdev *led_cdev,</div><div class='add'>+				      enum led_brightness brightness)</div><div class='ctx'> {</div><div class='del'>-	int i, n_chains = hweight8(dev-&gt;mphy.antenna_mask);</div><div class='del'>-	int nss_delta = mt76_tx_power_nss_delta(n_chains);</div><div class='add'>+	if (!brightness)</div><div class='add'>+		mt7915_led_set_config(led_cdev, 0, 0xff);</div><div class='add'>+	else</div><div class='add'>+		mt7915_led_set_config(led_cdev, 0xff, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __mt7915_init_txpower(struct mt7915_phy *phy,</div><div class='add'>+				  struct ieee80211_supported_band *sband)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	int i, n_chains = hweight16(phy-&gt;mt76-&gt;chainmask);</div><div class='add'>+	int path_delta = mt76_tx_power_path_delta(n_chains);</div><div class='ctx'> 	int pwr_delta = mt7915_eeprom_get_power_delta(dev, sband-&gt;band);</div><div class='ctx'> 	struct mt76_power_limits limits;</div><div class='ctx'> </div><div class='add'>+	phy-&gt;sku_limit_en = true;</div><div class='add'>+	phy-&gt;sku_path_en = true;</div><div class='ctx'> 	for (i = 0; i &lt; sband-&gt;n_channels; i++) {</div><div class='ctx'> 		struct ieee80211_channel *chan = &amp;sband-&gt;channels[i];</div><div class='ctx'> 		u32 target_power = 0;</div><div class='hunk'>@@ -89,10 +304,15 @@ mt7915_init_txpower(struct mt7915_dev *dev,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		target_power += pwr_delta;</div><div class='del'>-		target_power = mt76_get_rate_power_limits(&amp;dev-&gt;mphy, chan,</div><div class='add'>+		target_power = mt76_get_rate_power_limits(phy-&gt;mt76, chan,</div><div class='ctx'> 							  &amp;limits,</div><div class='ctx'> 							  target_power);</div><div class='del'>-		target_power += nss_delta;</div><div class='add'>+</div><div class='add'>+		/* MT7915N can not enable Backoff table without setting value in dts */</div><div class='add'>+		if (!limits.path.ofdm[0])</div><div class='add'>+			phy-&gt;sku_path_en = false;</div><div class='add'>+</div><div class='add'>+		target_power += path_delta;</div><div class='ctx'> 		target_power = DIV_ROUND_UP(target_power, 2);</div><div class='ctx'> 		chan-&gt;max_power = min_t(int, chan-&gt;max_reg_power,</div><div class='ctx'> 					target_power);</div><div class='hunk'>@@ -100,6 +320,19 @@ mt7915_init_txpower(struct mt7915_dev *dev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void mt7915_init_txpower(struct mt7915_phy *phy)</div><div class='add'>+{</div><div class='add'>+	if (!phy)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;mt76-&gt;cap.has_2ghz)</div><div class='add'>+		__mt7915_init_txpower(phy, &amp;phy-&gt;mt76-&gt;sband_2g.sband);</div><div class='add'>+	if (phy-&gt;mt76-&gt;cap.has_5ghz)</div><div class='add'>+		__mt7915_init_txpower(phy, &amp;phy-&gt;mt76-&gt;sband_5g.sband);</div><div class='add'>+	if (phy-&gt;mt76-&gt;cap.has_6ghz)</div><div class='add'>+		__mt7915_init_txpower(phy, &amp;phy-&gt;mt76-&gt;sband_6g.sband);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> mt7915_regd_notifier(struct wiphy *wiphy,</div><div class='ctx'> 		     struct regulatory_request *request)</div><div class='hunk'>@@ -108,31 +341,36 @@ mt7915_regd_notifier(struct wiphy *wiphy,</div><div class='ctx'> 	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='ctx'> 	struct mt76_phy *mphy = hw-&gt;priv;</div><div class='ctx'> 	struct mt7915_phy *phy = mphy-&gt;priv;</div><div class='del'>-	struct cfg80211_chan_def *chandef = &amp;mphy-&gt;chandef;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(dev-&gt;mt76.alpha2, request-&gt;alpha2, sizeof(dev-&gt;mt76.alpha2));</div><div class='ctx'> 	dev-&gt;mt76.region = request-&gt;dfs_region;</div><div class='ctx'> </div><div class='del'>-	mt7915_init_txpower(dev, &amp;mphy-&gt;sband_2g.sband);</div><div class='del'>-	mt7915_init_txpower(dev, &amp;mphy-&gt;sband_5g.sband);</div><div class='add'>+	if (dev-&gt;mt76.region == NL80211_DFS_UNSET)</div><div class='add'>+		mt7915_mcu_rdd_background_enable(phy, NULL);</div><div class='ctx'> </div><div class='del'>-	if (!(chandef-&gt;chan-&gt;flags &amp; IEEE80211_CHAN_RADAR))</div><div class='del'>-		return;</div><div class='add'>+	mt7915_init_txpower(phy);</div><div class='ctx'> </div><div class='add'>+	mphy-&gt;dfs_state = MT_DFS_STATE_UNKNOWN;</div><div class='ctx'> 	mt7915_dfs_init_radar_detector(phy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7915_init_wiphy(struct ieee80211_hw *hw)</div><div class='add'>+mt7915_init_wiphy(struct mt7915_phy *phy)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='add'>+	struct mt76_phy *mphy = phy-&gt;mt76;</div><div class='add'>+	struct ieee80211_hw *hw = mphy-&gt;hw;</div><div class='add'>+	struct mt76_dev *mdev = &amp;phy-&gt;dev-&gt;mt76;</div><div class='ctx'> 	struct wiphy *wiphy = hw-&gt;wiphy;</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;queues = 4;</div><div class='del'>-	hw-&gt;max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF;</div><div class='del'>-	hw-&gt;max_tx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF;</div><div class='add'>+	hw-&gt;max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF_HE;</div><div class='add'>+	hw-&gt;max_tx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF_HE;</div><div class='ctx'> 	hw-&gt;netdev_features = NETIF_F_RXCSUM;</div><div class='ctx'> </div><div class='add'>+	if (mtk_wed_device_active(&amp;mdev-&gt;mmio.wed))</div><div class='add'>+		hw-&gt;netdev_features |= NETIF_F_HW_TC;</div><div class='add'>+</div><div class='ctx'> 	hw-&gt;radiotap_timestamp.units_pos =</div><div class='ctx'> 		IEEE80211_RADIOTAP_TIMESTAMP_UNIT_US;</div><div class='ctx'> </div><div class='hunk'>@@ -145,33 +383,101 @@ mt7915_init_wiphy(struct ieee80211_hw *hw)</div><div class='ctx'> 	wiphy-&gt;n_iface_combinations = ARRAY_SIZE(if_comb);</div><div class='ctx'> 	wiphy-&gt;reg_notifier = mt7915_regd_notifier;</div><div class='ctx'> 	wiphy-&gt;flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;</div><div class='add'>+	wiphy-&gt;mbssid_max_interfaces = 16;</div><div class='ctx'> </div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_BSS_COLOR);</div><div class='ctx'> 	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_VHT_IBSS);</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_BEACON_RATE_LEGACY);</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_BEACON_RATE_HT);</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_BEACON_RATE_VHT);</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_BEACON_RATE_HE);</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP);</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_FILS_DISCOVERY);</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT);</div><div class='add'>+	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CAN_REPLACE_PTK0);</div><div class='add'>+</div><div class='add'>+	if (!is_mt7915(&amp;dev-&gt;mt76))</div><div class='add'>+		wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_STA_TX_PWR);</div><div class='add'>+</div><div class='add'>+	if (mt7915_eeprom_has_background_radar(phy-&gt;dev) &amp;&amp;</div><div class='add'>+	    (!mdev-&gt;dev-&gt;of_node ||</div><div class='add'>+	     !of_property_read_bool(mdev-&gt;dev-&gt;of_node,</div><div class='add'>+				    "mediatek,disable-radar-background")))</div><div class='add'>+		wiphy_ext_feature_set(wiphy,</div><div class='add'>+				      NL80211_EXT_FEATURE_RADAR_BACKGROUND);</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_hw_set(hw, HAS_RATE_CONTROL);</div><div class='ctx'> 	ieee80211_hw_set(hw, SUPPORTS_TX_ENCAP_OFFLOAD);</div><div class='ctx'> 	ieee80211_hw_set(hw, SUPPORTS_RX_DECAP_OFFLOAD);</div><div class='add'>+	ieee80211_hw_set(hw, SUPPORTS_MULTI_BSSID);</div><div class='ctx'> 	ieee80211_hw_set(hw, WANT_MONITOR_VIF);</div><div class='add'>+	ieee80211_hw_set(hw, SUPPORTS_TX_FRAG);</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;max_tx_fragments = 4;</div><div class='ctx'> </div><div class='del'>-	if (phy-&gt;mt76-&gt;cap.has_2ghz)</div><div class='add'>+	if (phy-&gt;mt76-&gt;cap.has_2ghz) {</div><div class='ctx'> 		phy-&gt;mt76-&gt;sband_2g.sband.ht_cap.cap |=</div><div class='ctx'> 			IEEE80211_HT_CAP_LDPC_CODING |</div><div class='ctx'> 			IEEE80211_HT_CAP_MAX_AMSDU;</div><div class='add'>+		if (is_mt7915(&amp;dev-&gt;mt76))</div><div class='add'>+			phy-&gt;mt76-&gt;sband_2g.sband.ht_cap.ampdu_density =</div><div class='add'>+				IEEE80211_HT_MPDU_DENSITY_4;</div><div class='add'>+		else</div><div class='add'>+			phy-&gt;mt76-&gt;sband_2g.sband.ht_cap.ampdu_density =</div><div class='add'>+				IEEE80211_HT_MPDU_DENSITY_2;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (phy-&gt;mt76-&gt;cap.has_5ghz) {</div><div class='add'>+		struct ieee80211_sta_vht_cap *vht_cap;</div><div class='add'>+</div><div class='add'>+		vht_cap = &amp;phy-&gt;mt76-&gt;sband_5g.sband.vht_cap;</div><div class='ctx'> 		phy-&gt;mt76-&gt;sband_5g.sband.ht_cap.cap |=</div><div class='ctx'> 			IEEE80211_HT_CAP_LDPC_CODING |</div><div class='ctx'> 			IEEE80211_HT_CAP_MAX_AMSDU;</div><div class='del'>-		phy-&gt;mt76-&gt;sband_5g.sband.vht_cap.cap |=</div><div class='del'>-			IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 |</div><div class='del'>-			IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;</div><div class='add'>+</div><div class='add'>+		if (is_mt7915(&amp;dev-&gt;mt76)) {</div><div class='add'>+			phy-&gt;mt76-&gt;sband_5g.sband.ht_cap.ampdu_density =</div><div class='add'>+				IEEE80211_HT_MPDU_DENSITY_4;</div><div class='add'>+</div><div class='add'>+			vht_cap-&gt;cap |=</div><div class='add'>+				IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 |</div><div class='add'>+				IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;</div><div class='add'>+</div><div class='add'>+			if (!dev-&gt;dbdc_support)</div><div class='add'>+				vht_cap-&gt;cap |=</div><div class='add'>+					IEEE80211_VHT_CAP_SHORT_GI_160 |</div><div class='add'>+					FIELD_PREP(IEEE80211_VHT_CAP_EXT_NSS_BW_MASK, 1);</div><div class='add'>+		} else {</div><div class='add'>+			phy-&gt;mt76-&gt;sband_5g.sband.ht_cap.ampdu_density =</div><div class='add'>+				IEEE80211_HT_MPDU_DENSITY_2;</div><div class='add'>+</div><div class='add'>+			vht_cap-&gt;cap |=</div><div class='add'>+				IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 |</div><div class='add'>+				IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;</div><div class='add'>+</div><div class='add'>+			/* mt7916 dbdc with 2g 2x2 bw40 and 5g 2x2 bw160c */</div><div class='add'>+			vht_cap-&gt;cap |=</div><div class='add'>+				IEEE80211_VHT_CAP_SHORT_GI_160 |</div><div class='add'>+				IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!is_mt7915(&amp;dev-&gt;mt76) || !dev-&gt;dbdc_support)</div><div class='add'>+			ieee80211_hw_set(hw, SUPPORTS_VHT_EXT_NSS_BW);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mt76_set_stream_caps(phy-&gt;mt76, true);</div><div class='ctx'> 	mt7915_set_stream_vht_txbf_caps(phy);</div><div class='ctx'> 	mt7915_set_stream_he_caps(phy);</div><div class='add'>+	mt7915_init_txpower(phy);</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;available_antennas_rx = phy-&gt;mt76-&gt;antenna_mask;</div><div class='add'>+	wiphy-&gt;available_antennas_tx = phy-&gt;mt76-&gt;antenna_mask;</div><div class='add'>+</div><div class='add'>+	/* init led callbacks */</div><div class='add'>+	if (IS_ENABLED(CONFIG_MT76_LEDS)) {</div><div class='add'>+		mphy-&gt;leds.cdev.brightness_set = mt7915_led_set_brightness;</div><div class='add'>+		mphy-&gt;leds.cdev.blink_set = mt7915_led_set_blink;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -201,95 +507,230 @@ mt7915_mac_init_band(struct mt7915_dev *dev, u8 band)</div><div class='ctx'> 	      FIELD_PREP(MT_MDP_RCFR1_RX_DROPPED_MCAST, MT_MDP_TO_HIF);</div><div class='ctx'> 	mt76_rmw(dev, MT_MDP_BNRCFR1(band), mask, set);</div><div class='ctx'> </div><div class='del'>-	mt76_set(dev, MT_WF_RMAC_MIB_TIME0(band), MT_WF_RMAC_MIB_RXTIME_EN);</div><div class='del'>-	mt76_set(dev, MT_WF_RMAC_MIB_AIRTIME0(band), MT_WF_RMAC_MIB_RXTIME_EN);</div><div class='add'>+	mt76_rmw_field(dev, MT_DMA_DCR0(band), MT_DMA_DCR0_MAX_RX_LEN, 0x680);</div><div class='ctx'> </div><div class='del'>-	mt76_rmw_field(dev, MT_DMA_DCR0(band), MT_DMA_DCR0_MAX_RX_LEN, 1536);</div><div class='del'>-	/* disable rx rate report by default due to hw issues */</div><div class='add'>+	/* mt7915: disable rx rate report by default due to hw issues */</div><div class='ctx'> 	mt76_clear(dev, MT_DMA_DCR0(band), MT_DMA_DCR0_RXD_G5_EN);</div><div class='add'>+</div><div class='add'>+	/* clear estimated value of EIFS for Rx duration &amp; OBSS time */</div><div class='add'>+	mt76_wr(dev, MT_WF_RMAC_RSVD0(band), MT_WF_RMAC_RSVD0_EIFS_CLR);</div><div class='add'>+</div><div class='add'>+	/* clear backoff time for Rx duration  */</div><div class='add'>+	mt76_clear(dev, MT_WF_RMAC_MIB_AIRTIME1(band),</div><div class='add'>+		   MT_WF_RMAC_MIB_NONQOSD_BACKOFF);</div><div class='add'>+	mt76_clear(dev, MT_WF_RMAC_MIB_AIRTIME3(band),</div><div class='add'>+		   MT_WF_RMAC_MIB_QOS01_BACKOFF);</div><div class='add'>+	mt76_clear(dev, MT_WF_RMAC_MIB_AIRTIME4(band),</div><div class='add'>+		   MT_WF_RMAC_MIB_QOS23_BACKOFF);</div><div class='add'>+</div><div class='add'>+	/* clear backoff time for Tx duration */</div><div class='add'>+	mt76_clear(dev, MT_WTBLOFF_TOP_ACR(band),</div><div class='add'>+		   MT_WTBLOFF_TOP_ADM_BACKOFFTIME);</div><div class='add'>+</div><div class='add'>+	/* exclude estimated backoff time for Tx duration on MT7915 */</div><div class='add'>+	if (is_mt7915(&amp;dev-&gt;mt76))</div><div class='add'>+		mt76_set(dev, MT_AGG_ATCR0(band),</div><div class='add'>+			   MT_AGG_ATCR_MAC_BFF_TIME_EN);</div><div class='add'>+</div><div class='add'>+	/* clear backoff time and set software compensation for OBSS time */</div><div class='add'>+	mask = MT_WF_RMAC_MIB_OBSS_BACKOFF | MT_WF_RMAC_MIB_ED_OFFSET;</div><div class='add'>+	set = FIELD_PREP(MT_WF_RMAC_MIB_OBSS_BACKOFF, 0) |</div><div class='add'>+	      FIELD_PREP(MT_WF_RMAC_MIB_ED_OFFSET, 4);</div><div class='add'>+	mt76_rmw(dev, MT_WF_RMAC_MIB_AIRTIME0(band), mask, set);</div><div class='add'>+</div><div class='add'>+	/* filter out non-resp frames and get instanstaeous signal reporting */</div><div class='add'>+	mask = MT_WTBLOFF_TOP_RSCR_RCPI_MODE | MT_WTBLOFF_TOP_RSCR_RCPI_PARAM;</div><div class='add'>+	set = FIELD_PREP(MT_WTBLOFF_TOP_RSCR_RCPI_MODE, 0) |</div><div class='add'>+	      FIELD_PREP(MT_WTBLOFF_TOP_RSCR_RCPI_PARAM, 0x3);</div><div class='add'>+	mt76_rmw(dev, MT_WTBLOFF_TOP_RSCR(band), mask, set);</div><div class='add'>+</div><div class='add'>+	/* MT_TXD5_TX_STATUS_HOST (MPDU format) has higher priority than</div><div class='add'>+	 * MT_AGG_ACR_PPDU_TXS2H (PPDU format) even though ACR bit is set.</div><div class='add'>+	 */</div><div class='add'>+	if (mtk_wed_device_active(&amp;dev-&gt;mt76.mmio.wed))</div><div class='add'>+		mt76_set(dev, MT_AGG_ACR4(band), MT_AGG_ACR_PPDU_TXS2H);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt7915_mac_init(struct mt7915_dev *dev)</div><div class='add'>+static void</div><div class='add'>+mt7915_init_led_mux(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ENABLED(CONFIG_MT76_LEDS))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;dbdc_support) {</div><div class='add'>+		switch (mt76_chip(&amp;dev-&gt;mt76)) {</div><div class='add'>+		case 0x7915:</div><div class='add'>+			mt76_rmw_field(dev, MT_LED_GPIO_MUX2,</div><div class='add'>+				       GENMASK(11, 8), 4);</div><div class='add'>+			mt76_rmw_field(dev, MT_LED_GPIO_MUX3,</div><div class='add'>+				       GENMASK(11, 8), 4);</div><div class='add'>+			break;</div><div class='add'>+		case 0x7986:</div><div class='add'>+			mt76_rmw_field(dev, MT_LED_GPIO_MUX0,</div><div class='add'>+				       GENMASK(7, 4), 1);</div><div class='add'>+			mt76_rmw_field(dev, MT_LED_GPIO_MUX0,</div><div class='add'>+				       GENMASK(11, 8), 1);</div><div class='add'>+			break;</div><div class='add'>+		case 0x7916:</div><div class='add'>+			mt76_rmw_field(dev, MT_LED_GPIO_MUX1,</div><div class='add'>+				       GENMASK(27, 24), 3);</div><div class='add'>+			mt76_rmw_field(dev, MT_LED_GPIO_MUX1,</div><div class='add'>+				       GENMASK(31, 28), 3);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else if (dev-&gt;mphy.leds.pin) {</div><div class='add'>+		switch (mt76_chip(&amp;dev-&gt;mt76)) {</div><div class='add'>+		case 0x7915:</div><div class='add'>+			mt76_rmw_field(dev, MT_LED_GPIO_MUX3,</div><div class='add'>+				       GENMASK(11, 8), 4);</div><div class='add'>+			break;</div><div class='add'>+		case 0x7986:</div><div class='add'>+			mt76_rmw_field(dev, MT_LED_GPIO_MUX0,</div><div class='add'>+				       GENMASK(11, 8), 1);</div><div class='add'>+			break;</div><div class='add'>+		case 0x7916:</div><div class='add'>+			mt76_rmw_field(dev, MT_LED_GPIO_MUX1,</div><div class='add'>+				       GENMASK(31, 28), 3);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		switch (mt76_chip(&amp;dev-&gt;mt76)) {</div><div class='add'>+		case 0x7915:</div><div class='add'>+			mt76_rmw_field(dev, MT_LED_GPIO_MUX2,</div><div class='add'>+				       GENMASK(11, 8), 4);</div><div class='add'>+			break;</div><div class='add'>+		case 0x7986:</div><div class='add'>+			mt76_rmw_field(dev, MT_LED_GPIO_MUX0,</div><div class='add'>+				       GENMASK(7, 4), 1);</div><div class='add'>+			break;</div><div class='add'>+		case 0x7916:</div><div class='add'>+			mt76_rmw_field(dev, MT_LED_GPIO_MUX1,</div><div class='add'>+				       GENMASK(27, 24), 3);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7915_mac_init(struct mt7915_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='add'>+	u32 rx_len = is_mt7915(&amp;dev-&gt;mt76) ? 0x400 : 0x680;</div><div class='add'>+</div><div class='add'>+	/* config pse qid6 wfdma port selection */</div><div class='add'>+	if (!is_mt7915(&amp;dev-&gt;mt76) &amp;&amp; dev-&gt;hif2)</div><div class='add'>+		mt76_rmw(dev, MT_WF_PP_TOP_RXQ_WFDMA_CF_5, 0,</div><div class='add'>+			 MT_WF_PP_TOP_RXQ_QID6_WFDMA_HIF_SEL_MASK);</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_MDP_DCR1, MT_MDP_DCR1_MAX_RX_LEN, rx_len);</div><div class='add'>+</div><div class='add'>+	if (!is_mt7915(&amp;dev-&gt;mt76))</div><div class='add'>+		mt76_clear(dev, MT_MDP_DCR2, MT_MDP_DCR2_RX_TRANS_SHORT);</div><div class='add'>+	else</div><div class='add'>+		mt76_clear(dev, MT_PLE_HOST_RPT0, MT_PLE_HOST_RPT0_TX_LATENCY);</div><div class='ctx'> </div><div class='del'>-	mt76_rmw_field(dev, MT_MDP_DCR1, MT_MDP_DCR1_MAX_RX_LEN, 1536);</div><div class='ctx'> 	/* enable hardware de-agg */</div><div class='ctx'> 	mt76_set(dev, MT_MDP_DCR0, MT_MDP_DCR0_DAMSDU_EN);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MT7915_WTBL_SIZE; i++)</div><div class='add'>+	for (i = 0; i &lt; mt7915_wtbl_size(dev); i++)</div><div class='ctx'> 		mt7915_mac_wtbl_update(dev, i,</div><div class='ctx'> 				       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);</div><div class='ctx'> 	for (i = 0; i &lt; 2; i++)</div><div class='ctx'> 		mt7915_mac_init_band(dev, i);</div><div class='add'>+</div><div class='add'>+	mt7915_init_led_mux(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7915_txbf_init(struct mt7915_dev *dev)</div><div class='add'>+int mt7915_txbf_init(struct mt7915_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	if (dev-&gt;dbdc_support) {</div><div class='del'>-		ret = mt7915_mcu_set_txbf_module(dev);</div><div class='add'>+		ret = mt7915_mcu_set_txbf(dev, MT_BF_MODULE_UPDATE);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* trigger sounding packets */</div><div class='del'>-	ret = mt7915_mcu_set_txbf_sounding(dev);</div><div class='add'>+	ret = mt7915_mcu_set_txbf(dev, MT_BF_SOUNDING_ON);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* enable eBF */</div><div class='del'>-	return mt7915_mcu_set_txbf_type(dev);</div><div class='add'>+	return mt7915_mcu_set_txbf(dev, MT_BF_TYPE_UPDATE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7915_register_ext_phy(struct mt7915_dev *dev)</div><div class='add'>+static struct mt7915_phy *</div><div class='add'>+mt7915_alloc_ext_phy(struct mt7915_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_phy *phy = mt7915_ext_phy(dev);</div><div class='add'>+	struct mt7915_phy *phy;</div><div class='ctx'> 	struct mt76_phy *mphy;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;dbdc_support)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (phy)</div><div class='del'>-		return 0;</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	mphy = mt76_alloc_phy(&amp;dev-&gt;mt76, sizeof(*phy), &amp;mt7915_ops);</div><div class='add'>+	mphy = mt76_alloc_phy(&amp;dev-&gt;mt76, sizeof(*phy), &amp;mt7915_ops, MT_BAND1);</div><div class='ctx'> 	if (!mphy)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	phy = mphy-&gt;priv;</div><div class='ctx'> 	phy-&gt;dev = dev;</div><div class='ctx'> 	phy-&gt;mt76 = mphy;</div><div class='del'>-	mphy-&gt;chainmask = dev-&gt;chainmask &amp; ~dev-&gt;mphy.chainmask;</div><div class='del'>-	mphy-&gt;antenna_mask = BIT(hweight8(mphy-&gt;chainmask)) - 1;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;phy-&gt;stats_list);</div><div class='add'>+	/* Bind main phy to band0 and ext_phy to band1 for dbdc case */</div><div class='add'>+	phy-&gt;mt76-&gt;band_idx = 1;</div><div class='add'>+</div><div class='add'>+	return phy;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7915_register_ext_phy(struct mt7915_dev *dev, struct mt7915_phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct mt76_phy *mphy = phy-&gt;mt76;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;mphy-&gt;mac_work, mt7915_mac_work);</div><div class='ctx'> </div><div class='del'>-	mt7915_eeprom_parse_band_config(phy);</div><div class='del'>-	mt7915_init_wiphy(mphy-&gt;hw);</div><div class='add'>+	mt7915_eeprom_parse_hw_cap(dev, phy);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(mphy-&gt;macaddr, dev-&gt;mt76.eeprom.data + MT_EE_MAC_ADDR2,</div><div class='ctx'> 	       ETH_ALEN);</div><div class='del'>-	mt76_eeprom_override(mphy);</div><div class='add'>+	/* Make the secondary PHY MAC address local without overlapping with</div><div class='add'>+	 * the usual MAC address allocation scheme on multiple virtual interfaces</div><div class='add'>+	 */</div><div class='add'>+	if (!is_valid_ether_addr(mphy-&gt;macaddr)) {</div><div class='add'>+		memcpy(mphy-&gt;macaddr, dev-&gt;mt76.eeprom.data + MT_EE_MAC_ADDR,</div><div class='add'>+		       ETH_ALEN);</div><div class='add'>+		mphy-&gt;macaddr[0] |= 2;</div><div class='add'>+		mphy-&gt;macaddr[0] ^= BIT(7);</div><div class='add'>+	}</div><div class='add'>+	ret = mt76_eeprom_override(mphy);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* init wiphy according to mphy and phy */</div><div class='add'>+	mt7915_init_wiphy(phy);</div><div class='ctx'> </div><div class='del'>-	ret = mt7915_init_tx_queues(phy, MT7915_TXQ_BAND1,</div><div class='del'>-				    MT7915_TX_RING_SIZE);</div><div class='add'>+	ret = mt76_register_phy(mphy, true, mt76_rates,</div><div class='add'>+				ARRAY_SIZE(mt76_rates));</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = mt76_register_phy(mphy, true, mt7915_rates,</div><div class='del'>-				ARRAY_SIZE(mt7915_rates));</div><div class='add'>+	ret = mt7915_thermal_init(phy);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+		goto unreg;</div><div class='add'>+</div><div class='add'>+	mt7915_init_debugfs(phy);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-error:</div><div class='del'>-	ieee80211_free_hw(mphy-&gt;hw);</div><div class='add'>+unreg:</div><div class='add'>+	mt76_unregister_phy(mphy);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -300,99 +741,121 @@ static void mt7915_init_work(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	mt7915_mcu_set_eeprom(dev);</div><div class='ctx'> 	mt7915_mac_init(dev);</div><div class='del'>-	mt7915_init_txpower(dev, &amp;dev-&gt;mphy.sband_2g.sband);</div><div class='del'>-	mt7915_init_txpower(dev, &amp;dev-&gt;mphy.sband_5g.sband);</div><div class='ctx'> 	mt7915_txbf_init(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt7915_wfsys_reset(struct mt7915_dev *dev)</div><div class='add'>+void mt7915_wfsys_reset(struct mt7915_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	u32 val = MT_TOP_PWR_KEY | MT_TOP_PWR_SW_PWR_ON | MT_TOP_PWR_PWR_ON;</div><div class='del'>-</div><div class='ctx'> #define MT_MCU_DUMMY_RANDOM	GENMASK(15, 0)</div><div class='ctx'> #define MT_MCU_DUMMY_DEFAULT	GENMASK(31, 16)</div><div class='ctx'> </div><div class='del'>-	mt76_wr(dev, MT_MCU_WFDMA0_DUMMY_CR, MT_MCU_DUMMY_RANDOM);</div><div class='add'>+	if (is_mt7915(&amp;dev-&gt;mt76)) {</div><div class='add'>+		u32 val = MT_TOP_PWR_KEY | MT_TOP_PWR_SW_PWR_ON | MT_TOP_PWR_PWR_ON;</div><div class='ctx'> </div><div class='del'>-	/* change to software control */</div><div class='del'>-	val |= MT_TOP_PWR_SW_RST;</div><div class='del'>-	mt76_wr(dev, MT_TOP_PWR_CTRL, val);</div><div class='add'>+		mt76_wr(dev, MT_MCU_WFDMA0_DUMMY_CR, MT_MCU_DUMMY_RANDOM);</div><div class='ctx'> </div><div class='del'>-	/* reset wfsys */</div><div class='del'>-	val &amp;= ~MT_TOP_PWR_SW_RST;</div><div class='del'>-	mt76_wr(dev, MT_TOP_PWR_CTRL, val);</div><div class='add'>+		/* change to software control */</div><div class='add'>+		val |= MT_TOP_PWR_SW_RST;</div><div class='add'>+		mt76_wr(dev, MT_TOP_PWR_CTRL, val);</div><div class='ctx'> </div><div class='del'>-	/* release wfsys then mcu re-excutes romcode */</div><div class='del'>-	val |= MT_TOP_PWR_SW_RST;</div><div class='del'>-	mt76_wr(dev, MT_TOP_PWR_CTRL, val);</div><div class='add'>+		/* reset wfsys */</div><div class='add'>+		val &amp;= ~MT_TOP_PWR_SW_RST;</div><div class='add'>+		mt76_wr(dev, MT_TOP_PWR_CTRL, val);</div><div class='ctx'> </div><div class='del'>-	/* switch to hw control */</div><div class='del'>-	val &amp;= ~MT_TOP_PWR_SW_RST;</div><div class='del'>-	val |= MT_TOP_PWR_HW_CTRL;</div><div class='del'>-	mt76_wr(dev, MT_TOP_PWR_CTRL, val);</div><div class='add'>+		/* release wfsys then mcu re-executes romcode */</div><div class='add'>+		val |= MT_TOP_PWR_SW_RST;</div><div class='add'>+		mt76_wr(dev, MT_TOP_PWR_CTRL, val);</div><div class='ctx'> </div><div class='del'>-	/* check whether mcu resets to default */</div><div class='del'>-	if (!mt76_poll_msec(dev, MT_MCU_WFDMA0_DUMMY_CR, MT_MCU_DUMMY_DEFAULT,</div><div class='del'>-			    MT_MCU_DUMMY_DEFAULT, 1000)) {</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "wifi subsystem reset failure\n");</div><div class='del'>-		return;</div><div class='add'>+		/* switch to hw control */</div><div class='add'>+		val &amp;= ~MT_TOP_PWR_SW_RST;</div><div class='add'>+		val |= MT_TOP_PWR_HW_CTRL;</div><div class='add'>+		mt76_wr(dev, MT_TOP_PWR_CTRL, val);</div><div class='add'>+</div><div class='add'>+		/* check whether mcu resets to default */</div><div class='add'>+		if (!mt76_poll_msec(dev, MT_MCU_WFDMA0_DUMMY_CR,</div><div class='add'>+				    MT_MCU_DUMMY_DEFAULT, MT_MCU_DUMMY_DEFAULT,</div><div class='add'>+				    1000)) {</div><div class='add'>+			dev_err(dev-&gt;mt76.dev, "wifi subsystem reset failure\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* wfsys reset won't clear host registers */</div><div class='add'>+		mt76_clear(dev, MT_TOP_MISC, MT_TOP_MISC_FW_STATE);</div><div class='add'>+</div><div class='add'>+		msleep(100);</div><div class='add'>+	} else if (is_mt798x(&amp;dev-&gt;mt76)) {</div><div class='add'>+		mt7986_wmac_disable(dev);</div><div class='add'>+		msleep(20);</div><div class='add'>+</div><div class='add'>+		mt7986_wmac_enable(dev);</div><div class='add'>+		msleep(20);</div><div class='add'>+	} else {</div><div class='add'>+		mt76_set(dev, MT_WF_SUBSYS_RST, 0x1);</div><div class='add'>+		msleep(20);</div><div class='add'>+</div><div class='add'>+		mt76_clear(dev, MT_WF_SUBSYS_RST, 0x1);</div><div class='add'>+		msleep(20);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool mt7915_band_config(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	bool ret = true;</div><div class='add'>+</div><div class='add'>+	dev-&gt;phy.mt76-&gt;band_idx = 0;</div><div class='ctx'> </div><div class='del'>-	/* wfsys reset won't clear host registers */</div><div class='del'>-	mt76_clear(dev, MT_TOP_MISC, MT_TOP_MISC_FW_STATE);</div><div class='add'>+	if (is_mt798x(&amp;dev-&gt;mt76)) {</div><div class='add'>+		u32 sku = mt7915_check_adie(dev, true);</div><div class='ctx'> </div><div class='del'>-	msleep(100);</div><div class='add'>+		/*</div><div class='add'>+		 * for mt7986, dbdc support is determined by the number</div><div class='add'>+		 * of adie chips and the main phy is bound to band1 when</div><div class='add'>+		 * dbdc is disabled.</div><div class='add'>+		 */</div><div class='add'>+		if (sku == MT7975_ONE_ADIE || sku == MT7976_ONE_ADIE) {</div><div class='add'>+			dev-&gt;phy.mt76-&gt;band_idx = 1;</div><div class='add'>+			ret = false;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		ret = is_mt7915(&amp;dev-&gt;mt76) ?</div><div class='add'>+		      !!(mt76_rr(dev, MT_HW_BOUND) &amp; BIT(5)) : true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7915_init_hardware(struct mt7915_dev *dev)</div><div class='add'>+static int</div><div class='add'>+mt7915_init_hardware(struct mt7915_dev *dev, struct mt7915_phy *phy2)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, idx;</div><div class='ctx'> </div><div class='add'>+	mt76_wr(dev, MT_INT_MASK_CSR, 0);</div><div class='ctx'> 	mt76_wr(dev, MT_INT_SOURCE_CSR, ~0);</div><div class='ctx'> </div><div class='ctx'> 	INIT_WORK(&amp;dev-&gt;init_work, mt7915_init_work);</div><div class='del'>-	dev-&gt;dbdc_support = !!(mt76_rr(dev, MT_HW_BOUND) &amp; BIT(5));</div><div class='del'>-</div><div class='del'>-	/* If MCU was already running, it is likely in a bad state */</div><div class='del'>-	if (mt76_get_field(dev, MT_TOP_MISC, MT_TOP_MISC_FW_STATE) &gt;</div><div class='del'>-	    FW_STATE_FW_DOWNLOAD)</div><div class='del'>-		mt7915_wfsys_reset(dev);</div><div class='ctx'> </div><div class='del'>-	ret = mt7915_dma_init(dev);</div><div class='add'>+	ret = mt7915_dma_init(dev, phy2);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	set_bit(MT76_STATE_INITIALIZED, &amp;dev-&gt;mphy.state);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * force firmware operation mode into normal state,</div><div class='del'>-	 * which should be set before firmware download stage.</div><div class='del'>-	 */</div><div class='del'>-	mt76_wr(dev, MT_SWDEF_MODE, MT_SWDEF_NORMAL_MODE);</div><div class='del'>-</div><div class='ctx'> 	ret = mt7915_mcu_init(dev);</div><div class='del'>-	if (ret) {</div><div class='del'>-		/* Reset and try again */</div><div class='del'>-		mt7915_wfsys_reset(dev);</div><div class='del'>-</div><div class='del'>-		ret = mt7915_mcu_init(dev);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = mt7915_eeprom_init(dev);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	if (dev-&gt;flash_mode) {</div><div class='add'>+	if (dev-&gt;cal) {</div><div class='ctx'> 		ret = mt7915_mcu_apply_group_cal(dev);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Beacon and mgmt frames should occupy wcid 0 */</div><div class='del'>-	idx = mt76_wcid_alloc(dev-&gt;mt76.wcid_mask, MT7915_WTBL_STA - 1);</div><div class='add'>+	idx = mt76_wcid_alloc(dev-&gt;mt76.wcid_mask, MT7915_WTBL_STA);</div><div class='ctx'> 	if (idx)</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> </div><div class='hunk'>@@ -406,39 +869,49 @@ static int mt7915_init_hardware(struct mt7915_dev *dev)</div><div class='ctx'> </div><div class='ctx'> void mt7915_set_stream_vht_txbf_caps(struct mt7915_phy *phy)</div><div class='ctx'> {</div><div class='del'>-	int nss;</div><div class='add'>+	int sts;</div><div class='ctx'> 	u32 *cap;</div><div class='ctx'> </div><div class='ctx'> 	if (!phy-&gt;mt76-&gt;cap.has_5ghz)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	nss = hweight8(phy-&gt;mt76-&gt;chainmask);</div><div class='add'>+	sts = hweight8(phy-&gt;mt76-&gt;chainmask);</div><div class='ctx'> 	cap = &amp;phy-&gt;mt76-&gt;sband_5g.sband.vht_cap.cap;</div><div class='ctx'> </div><div class='ctx'> 	*cap |= IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE |</div><div class='ctx'> 		IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE |</div><div class='del'>-		(3 &lt;&lt; IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT);</div><div class='add'>+		FIELD_PREP(IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK,</div><div class='add'>+			   sts - 1);</div><div class='ctx'> </div><div class='ctx'> 	*cap &amp;= ~(IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK |</div><div class='ctx'> 		  IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE |</div><div class='ctx'> 		  IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE);</div><div class='ctx'> </div><div class='del'>-	if (nss &lt; 2)</div><div class='add'>+	if (sts &lt; 2)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	*cap |= IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE |</div><div class='ctx'> 		IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE |</div><div class='ctx'> 		FIELD_PREP(IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK,</div><div class='del'>-			   nss - 1);</div><div class='add'>+			   sts - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7915_set_stream_he_txbf_caps(struct ieee80211_sta_he_cap *he_cap,</div><div class='del'>-			       int vif, int nss)</div><div class='add'>+mt7915_set_stream_he_txbf_caps(struct mt7915_phy *phy,</div><div class='add'>+			       struct ieee80211_sta_he_cap *he_cap, int vif)</div><div class='ctx'> {</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct ieee80211_he_cap_elem *elem = &amp;he_cap-&gt;he_cap_elem;</div><div class='del'>-	struct ieee80211_he_mcs_nss_supp *mcs = &amp;he_cap-&gt;he_mcs_nss_supp;</div><div class='del'>-	u8 c;</div><div class='add'>+	int sts = hweight8(phy-&gt;mt76-&gt;chainmask);</div><div class='add'>+	u8 c, sts_160 = sts;</div><div class='add'>+</div><div class='add'>+	/* Can do 1/2 of STS in 160Mhz mode for mt7915 */</div><div class='add'>+	if (is_mt7915(&amp;dev-&gt;mt76)) {</div><div class='add'>+		if (!dev-&gt;dbdc_support)</div><div class='add'>+			sts_160 /= 2;</div><div class='add'>+		else</div><div class='add'>+			sts_160 = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MAC80211_MESH</div><div class='ctx'> 	if (vif == NL80211_IFTYPE_MESH_POINT)</div><div class='hunk'>@@ -448,8 +921,9 @@ mt7915_set_stream_he_txbf_caps(struct ieee80211_sta_he_cap *he_cap,</div><div class='ctx'> 	elem-&gt;phy_cap_info[3] &amp;= ~IEEE80211_HE_PHY_CAP3_SU_BEAMFORMER;</div><div class='ctx'> 	elem-&gt;phy_cap_info[4] &amp;= ~IEEE80211_HE_PHY_CAP4_MU_BEAMFORMER;</div><div class='ctx'> </div><div class='del'>-	c = IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK |</div><div class='del'>-	    IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_MASK;</div><div class='add'>+	c = IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK;</div><div class='add'>+	if (sts_160)</div><div class='add'>+		c |= IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_MASK;</div><div class='ctx'> 	elem-&gt;phy_cap_info[5] &amp;= ~c;</div><div class='ctx'> </div><div class='ctx'> 	c = IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB |</div><div class='hunk'>@@ -458,14 +932,15 @@ mt7915_set_stream_he_txbf_caps(struct ieee80211_sta_he_cap *he_cap,</div><div class='ctx'> </div><div class='ctx'> 	elem-&gt;phy_cap_info[7] &amp;= ~IEEE80211_HE_PHY_CAP7_MAX_NC_MASK;</div><div class='ctx'> </div><div class='del'>-	c = IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US |</div><div class='del'>-	    IEEE80211_HE_PHY_CAP2_UL_MU_FULL_MU_MIMO |</div><div class='del'>-	    IEEE80211_HE_PHY_CAP2_UL_MU_PARTIAL_MU_MIMO;</div><div class='add'>+	c = IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US;</div><div class='add'>+	if (!is_mt7915(&amp;dev-&gt;mt76))</div><div class='add'>+		c |= IEEE80211_HE_PHY_CAP2_UL_MU_FULL_MU_MIMO;</div><div class='ctx'> 	elem-&gt;phy_cap_info[2] |= c;</div><div class='ctx'> </div><div class='ctx'> 	c = IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE |</div><div class='del'>-	    IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_4 |</div><div class='del'>-	    IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_4;</div><div class='add'>+	    IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_4;</div><div class='add'>+	if (sts_160)</div><div class='add'>+		c |= IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_4;</div><div class='ctx'> 	elem-&gt;phy_cap_info[4] |= c;</div><div class='ctx'> </div><div class='ctx'> 	/* do not support NG16 due to spec D4.0 changes subcarrier idx */</div><div class='hunk'>@@ -477,60 +952,69 @@ mt7915_set_stream_he_txbf_caps(struct ieee80211_sta_he_cap *he_cap,</div><div class='ctx'> </div><div class='ctx'> 	elem-&gt;phy_cap_info[6] |= c;</div><div class='ctx'> </div><div class='del'>-	if (nss &lt; 2)</div><div class='add'>+	if (sts &lt; 2)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (vif != NL80211_IFTYPE_AP)</div><div class='add'>+	/* the maximum cap is 4 x 3, (Nr, Nc) = (3, 2) */</div><div class='add'>+	elem-&gt;phy_cap_info[7] |= min_t(int, sts - 1, 2) &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	if (vif != NL80211_IFTYPE_AP &amp;&amp; vif != NL80211_IFTYPE_STATION)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	elem-&gt;phy_cap_info[3] |= IEEE80211_HE_PHY_CAP3_SU_BEAMFORMER;</div><div class='del'>-	elem-&gt;phy_cap_info[4] |= IEEE80211_HE_PHY_CAP4_MU_BEAMFORMER;</div><div class='ctx'> </div><div class='del'>-	/* num_snd_dim */</div><div class='del'>-	c = (nss - 1) | (max_t(int, le16_to_cpu(mcs-&gt;tx_mcs_160), 1) &lt;&lt; 3);</div><div class='add'>+	c = FIELD_PREP(IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK,</div><div class='add'>+		       sts - 1);</div><div class='add'>+	if (sts_160)</div><div class='add'>+		c |= FIELD_PREP(IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_MASK,</div><div class='add'>+				sts_160 - 1);</div><div class='ctx'> 	elem-&gt;phy_cap_info[5] |= c;</div><div class='ctx'> </div><div class='add'>+	if (vif != NL80211_IFTYPE_AP)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	elem-&gt;phy_cap_info[4] |= IEEE80211_HE_PHY_CAP4_MU_BEAMFORMER;</div><div class='add'>+</div><div class='ctx'> 	c = IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB |</div><div class='ctx'> 	    IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB;</div><div class='ctx'> 	elem-&gt;phy_cap_info[6] |= c;</div><div class='ctx'> </div><div class='del'>-	/* the maximum cap is 4 x 3, (Nr, Nc) = (3, 2) */</div><div class='del'>-	elem-&gt;phy_cap_info[7] |= min_t(int, nss - 1, 2) &lt;&lt; 3;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt7915_gen_ppe_thresh(u8 *he_ppet, int nss)</div><div class='del'>-{</div><div class='del'>-	u8 i, ppet_bits, ppet_size, ru_bit_mask = 0x7; /* HE80 */</div><div class='del'>-	u8 ppet16_ppet8_ru3_ru0[] = {0x1c, 0xc7, 0x71};</div><div class='del'>-</div><div class='del'>-	he_ppet[0] = FIELD_PREP(IEEE80211_PPE_THRES_NSS_MASK, nss - 1) |</div><div class='del'>-		     FIELD_PREP(IEEE80211_PPE_THRES_RU_INDEX_BITMASK_MASK,</div><div class='del'>-				ru_bit_mask);</div><div class='del'>-</div><div class='del'>-	ppet_bits = IEEE80211_PPE_THRES_INFO_PPET_SIZE *</div><div class='del'>-		    nss * hweight8(ru_bit_mask) * 2;</div><div class='del'>-	ppet_size = DIV_ROUND_UP(ppet_bits, 8);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ppet_size - 1; i++)</div><div class='del'>-		he_ppet[i + 1] = ppet16_ppet8_ru3_ru0[i % 3];</div><div class='del'>-</div><div class='del'>-	he_ppet[i + 1] = ppet16_ppet8_ru3_ru0[i % 3] &amp;</div><div class='del'>-			 (0xff &gt;&gt; (8 - (ppet_bits - 1) % 8));</div><div class='add'>+	if (!is_mt7915(&amp;dev-&gt;mt76)) {</div><div class='add'>+		c = IEEE80211_HE_PHY_CAP7_STBC_TX_ABOVE_80MHZ |</div><div class='add'>+		    IEEE80211_HE_PHY_CAP7_STBC_RX_ABOVE_80MHZ;</div><div class='add'>+		elem-&gt;phy_cap_info[7] |= c;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band,</div><div class='ctx'> 		    struct ieee80211_sband_iftype_data *data)</div><div class='ctx'> {</div><div class='del'>-	int i, idx = 0, nss = hweight8(phy-&gt;mt76-&gt;chainmask);</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	int i, idx = 0, nss = hweight8(phy-&gt;mt76-&gt;antenna_mask);</div><div class='ctx'> 	u16 mcs_map = 0;</div><div class='add'>+	u16 mcs_map_160 = 0;</div><div class='add'>+	u8 nss_160;</div><div class='add'>+</div><div class='add'>+	if (!is_mt7915(&amp;dev-&gt;mt76))</div><div class='add'>+		nss_160 = nss;</div><div class='add'>+	else if (!dev-&gt;dbdc_support)</div><div class='add'>+		/* Can do 1/2 of NSS streams in 160Mhz mode for mt7915 */</div><div class='add'>+		nss_160 = nss / 2;</div><div class='add'>+	else</div><div class='add'>+		/* Can't do 160MHz with mt7915 dbdc */</div><div class='add'>+		nss_160 = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 8; i++) {</div><div class='ctx'> 		if (i &lt; nss)</div><div class='ctx'> 			mcs_map |= (IEEE80211_HE_MCS_SUPPORT_0_11 &lt;&lt; (i * 2));</div><div class='ctx'> 		else</div><div class='ctx'> 			mcs_map |= (IEEE80211_HE_MCS_NOT_SUPPORTED &lt;&lt; (i * 2));</div><div class='add'>+</div><div class='add'>+		if (i &lt; nss_160)</div><div class='add'>+			mcs_map_160 |= (IEEE80211_HE_MCS_SUPPORT_0_11 &lt;&lt; (i * 2));</div><div class='add'>+		else</div><div class='add'>+			mcs_map_160 |= (IEEE80211_HE_MCS_NOT_SUPPORTED &lt;&lt; (i * 2));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NUM_NL80211_IFTYPES; i++) {</div><div class='hunk'>@@ -565,11 +1049,13 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band,</div><div class='ctx'> 		if (band == NL80211_BAND_2GHZ)</div><div class='ctx'> 			he_cap_elem-&gt;phy_cap_info[0] =</div><div class='ctx'> 				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G;</div><div class='del'>-		else if (band == NL80211_BAND_5GHZ)</div><div class='add'>+		else if (nss_160)</div><div class='ctx'> 			he_cap_elem-&gt;phy_cap_info[0] =</div><div class='ctx'> 				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |</div><div class='del'>-				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G |</div><div class='del'>-				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G;</div><div class='add'>+				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G;</div><div class='add'>+		else</div><div class='add'>+			he_cap_elem-&gt;phy_cap_info[0] =</div><div class='add'>+				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G;</div><div class='ctx'> </div><div class='ctx'> 		he_cap_elem-&gt;phy_cap_info[1] =</div><div class='ctx'> 			IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD;</div><div class='hunk'>@@ -591,18 +1077,20 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band,</div><div class='ctx'> 				IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_QPSK |</div><div class='ctx'> 				IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_QPSK;</div><div class='ctx'> 			he_cap_elem-&gt;phy_cap_info[6] |=</div><div class='add'>+				IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE |</div><div class='ctx'> 				IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT;</div><div class='add'>+			he_cap_elem-&gt;phy_cap_info[9] |=</div><div class='add'>+				IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU |</div><div class='add'>+				IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case NL80211_IFTYPE_STATION:</div><div class='del'>-			he_cap_elem-&gt;mac_cap_info[0] |=</div><div class='del'>-				IEEE80211_HE_MAC_CAP0_TWT_REQ;</div><div class='ctx'> 			he_cap_elem-&gt;mac_cap_info[1] |=</div><div class='ctx'> 				IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US;</div><div class='ctx'> </div><div class='ctx'> 			if (band == NL80211_BAND_2GHZ)</div><div class='ctx'> 				he_cap_elem-&gt;phy_cap_info[0] |=</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_2G;</div><div class='del'>-			else if (band == NL80211_BAND_5GHZ)</div><div class='add'>+			else</div><div class='ctx'> 				he_cap_elem-&gt;phy_cap_info[0] |=</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_5G;</div><div class='ctx'> </div><div class='hunk'>@@ -621,9 +1109,11 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band,</div><div class='ctx'> 				IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI;</div><div class='ctx'> 			he_cap_elem-&gt;phy_cap_info[8] |=</div><div class='ctx'> 				IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G |</div><div class='del'>-				IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU |</div><div class='del'>-				IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU |</div><div class='ctx'> 				IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_484;</div><div class='add'>+			if (nss_160)</div><div class='add'>+				he_cap_elem-&gt;phy_cap_info[8] |=</div><div class='add'>+					IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU |</div><div class='add'>+					IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU;</div><div class='ctx'> 			he_cap_elem-&gt;phy_cap_info[9] |=</div><div class='ctx'> 				IEEE80211_HE_PHY_CAP9_LONGER_THAN_16_SIGB_OFDM_SYM |</div><div class='ctx'> 				IEEE80211_HE_PHY_CAP9_NON_TRIGGERED_CQI_FEEDBACK |</div><div class='hunk'>@@ -634,23 +1124,38 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		memset(he_mcs, 0, sizeof(*he_mcs));</div><div class='ctx'> 		he_mcs-&gt;rx_mcs_80 = cpu_to_le16(mcs_map);</div><div class='ctx'> 		he_mcs-&gt;tx_mcs_80 = cpu_to_le16(mcs_map);</div><div class='del'>-		he_mcs-&gt;rx_mcs_160 = cpu_to_le16(mcs_map);</div><div class='del'>-		he_mcs-&gt;tx_mcs_160 = cpu_to_le16(mcs_map);</div><div class='del'>-		he_mcs-&gt;rx_mcs_80p80 = cpu_to_le16(mcs_map);</div><div class='del'>-		he_mcs-&gt;tx_mcs_80p80 = cpu_to_le16(mcs_map);</div><div class='add'>+		he_mcs-&gt;rx_mcs_160 = cpu_to_le16(mcs_map_160);</div><div class='add'>+		he_mcs-&gt;tx_mcs_160 = cpu_to_le16(mcs_map_160);</div><div class='ctx'> </div><div class='del'>-		mt7915_set_stream_he_txbf_caps(he_cap, i, nss);</div><div class='add'>+		mt7915_set_stream_he_txbf_caps(phy, he_cap, i);</div><div class='ctx'> </div><div class='ctx'> 		memset(he_cap-&gt;ppe_thres, 0, sizeof(he_cap-&gt;ppe_thres));</div><div class='ctx'> 		if (he_cap_elem-&gt;phy_cap_info[6] &amp;</div><div class='ctx'> 		    IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT) {</div><div class='del'>-			mt7915_gen_ppe_thresh(he_cap-&gt;ppe_thres, nss);</div><div class='add'>+			mt76_connac_gen_ppe_thresh(he_cap-&gt;ppe_thres, nss, band);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			he_cap_elem-&gt;phy_cap_info[9] |=</div><div class='del'>-				IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_16US;</div><div class='add'>+				u8_encode_bits(IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US,</div><div class='add'>+					       IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (band == NL80211_BAND_6GHZ) {</div><div class='add'>+			u16 cap = IEEE80211_HE_6GHZ_CAP_TX_ANTPAT_CONS |</div><div class='add'>+				  IEEE80211_HE_6GHZ_CAP_RX_ANTPAT_CONS;</div><div class='add'>+</div><div class='add'>+			cap |= u16_encode_bits(IEEE80211_HT_MPDU_DENSITY_2,</div><div class='add'>+					       IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START) |</div><div class='add'>+			       u16_encode_bits(IEEE80211_VHT_MAX_AMPDU_1024K,</div><div class='add'>+					       IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP) |</div><div class='add'>+			       u16_encode_bits(IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454,</div><div class='add'>+					       IEEE80211_HE_6GHZ_CAP_MAX_MPDU_LEN);</div><div class='add'>+</div><div class='add'>+			data[idx].he_6ghz_capa.capa = cpu_to_le16(cap);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		idx++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -668,8 +1173,7 @@ void mt7915_set_stream_he_caps(struct mt7915_phy *phy)</div><div class='ctx'> 		n = mt7915_init_he_caps(phy, NL80211_BAND_2GHZ, data);</div><div class='ctx'> </div><div class='ctx'> 		band = &amp;phy-&gt;mt76-&gt;sband_2g.sband;</div><div class='del'>-		band-&gt;iftype_data = data;</div><div class='del'>-		band-&gt;n_iftype_data = n;</div><div class='add'>+		_ieee80211_set_sband_iftype_data(band, data, n);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (phy-&gt;mt76-&gt;cap.has_5ghz) {</div><div class='hunk'>@@ -677,81 +1181,124 @@ void mt7915_set_stream_he_caps(struct mt7915_phy *phy)</div><div class='ctx'> 		n = mt7915_init_he_caps(phy, NL80211_BAND_5GHZ, data);</div><div class='ctx'> </div><div class='ctx'> 		band = &amp;phy-&gt;mt76-&gt;sband_5g.sband;</div><div class='del'>-		band-&gt;iftype_data = data;</div><div class='del'>-		band-&gt;n_iftype_data = n;</div><div class='add'>+		_ieee80211_set_sband_iftype_data(band, data, n);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;mt76-&gt;cap.has_6ghz) {</div><div class='add'>+		data = phy-&gt;iftype[NL80211_BAND_6GHZ];</div><div class='add'>+		n = mt7915_init_he_caps(phy, NL80211_BAND_6GHZ, data);</div><div class='add'>+</div><div class='add'>+		band = &amp;phy-&gt;mt76-&gt;sband_6g.sband;</div><div class='add'>+		_ieee80211_set_sband_iftype_data(band, data, n);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mt7915_unregister_ext_phy(struct mt7915_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_phy *phy = mt7915_ext_phy(dev);</div><div class='del'>-	struct mt76_phy *mphy = dev-&gt;mt76.phy2;</div><div class='add'>+	struct mt76_phy *mphy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='ctx'> </div><div class='ctx'> 	if (!phy)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	mt7915_unregister_thermal(phy);</div><div class='ctx'> 	mt76_unregister_phy(mphy);</div><div class='ctx'> 	ieee80211_free_hw(mphy-&gt;hw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mt7915_stop_hardware(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	mt7915_mcu_exit(dev);</div><div class='add'>+	mt76_connac2_tx_token_put(&amp;dev-&gt;mt76);</div><div class='add'>+	mt7915_dma_cleanup(dev);</div><div class='add'>+	tasklet_disable(&amp;dev-&gt;mt76.irq_tasklet);</div><div class='add'>+</div><div class='add'>+	if (is_mt798x(&amp;dev-&gt;mt76))</div><div class='add'>+		mt7986_wmac_disable(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mt7915_register_device(struct mt7915_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='add'>+	struct mt7915_phy *phy2;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;phy.dev = dev;</div><div class='ctx'> 	dev-&gt;phy.mt76 = &amp;dev-&gt;mt76.phy;</div><div class='ctx'> 	dev-&gt;mt76.phy.priv = &amp;dev-&gt;phy;</div><div class='del'>-	INIT_LIST_HEAD(&amp;dev-&gt;phy.stats_list);</div><div class='ctx'> 	INIT_WORK(&amp;dev-&gt;rc_work, mt7915_mac_sta_rc_work);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;dev-&gt;mphy.mac_work, mt7915_mac_work);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;sta_rc_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;dev-&gt;sta_poll_list);</div><div class='del'>-	spin_lock_init(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev-&gt;twt_list);</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_head(&amp;dev-&gt;reset_wait);</div><div class='ctx'> 	INIT_WORK(&amp;dev-&gt;reset_work, mt7915_mac_reset_work);</div><div class='add'>+	INIT_WORK(&amp;dev-&gt;dump_work, mt7915_mac_dump_work);</div><div class='add'>+	mutex_init(&amp;dev-&gt;dump_mutex);</div><div class='ctx'> </div><div class='del'>-	ret = mt7915_init_hardware(dev);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	dev-&gt;dbdc_support = mt7915_band_config(dev);</div><div class='ctx'> </div><div class='del'>-	mt7915_init_wiphy(hw);</div><div class='add'>+	phy2 = mt7915_alloc_ext_phy(dev);</div><div class='add'>+	if (IS_ERR(phy2))</div><div class='add'>+		return PTR_ERR(phy2);</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;dbdc_support)</div><div class='del'>-		dev-&gt;mphy.sband_5g.sband.vht_cap.cap |=</div><div class='del'>-			IEEE80211_VHT_CAP_SHORT_GI_160 |</div><div class='del'>-			IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ;</div><div class='add'>+	ret = mt7915_init_hardware(dev, phy2);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free_phy2;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mphy.hw-&gt;wiphy-&gt;available_antennas_rx = dev-&gt;mphy.chainmask;</div><div class='del'>-	dev-&gt;mphy.hw-&gt;wiphy-&gt;available_antennas_tx = dev-&gt;mphy.chainmask;</div><div class='del'>-	dev-&gt;phy.dfs_state = -1;</div><div class='add'>+	mt7915_init_wiphy(&amp;dev-&gt;phy);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NL80211_TESTMODE</div><div class='ctx'> 	dev-&gt;mt76.test_ops = &amp;mt7915_testmode_ops;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	ret = mt76_register_device(&amp;dev-&gt;mt76, true, mt7915_rates,</div><div class='del'>-				   ARRAY_SIZE(mt7915_rates));</div><div class='add'>+	ret = mt76_register_device(&amp;dev-&gt;mt76, true, mt76_rates,</div><div class='add'>+				   ARRAY_SIZE(mt76_rates));</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+		goto stop_hw;</div><div class='add'>+</div><div class='add'>+	ret = mt7915_thermal_init(&amp;dev-&gt;phy);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unreg_dev;</div><div class='add'>+</div><div class='add'>+	if (phy2) {</div><div class='add'>+		ret = mt7915_register_ext_phy(dev, phy2);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto unreg_thermal;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_queue_work(mt76_hw(dev), &amp;dev-&gt;init_work);</div><div class='ctx'> </div><div class='del'>-	ret = mt7915_register_ext_phy(dev);</div><div class='add'>+	dev-&gt;recovery.hw_init_done = true;</div><div class='add'>+</div><div class='add'>+	ret = mt7915_init_debugfs(&amp;dev-&gt;phy);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+		goto unreg_thermal;</div><div class='ctx'> </div><div class='del'>-	return mt7915_init_debugfs(dev);</div><div class='add'>+	ret = mt7915_coredump_register(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unreg_thermal;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+unreg_thermal:</div><div class='add'>+	mt7915_unregister_thermal(&amp;dev-&gt;phy);</div><div class='add'>+unreg_dev:</div><div class='add'>+	mt76_unregister_device(&amp;dev-&gt;mt76);</div><div class='add'>+stop_hw:</div><div class='add'>+	mt7915_stop_hardware(dev);</div><div class='add'>+free_phy2:</div><div class='add'>+	if (phy2)</div><div class='add'>+		ieee80211_free_hw(phy2-&gt;mt76-&gt;hw);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt7915_unregister_device(struct mt7915_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	mt7915_unregister_ext_phy(dev);</div><div class='add'>+	mt7915_coredump_unregister(dev);</div><div class='add'>+	mt7915_unregister_thermal(&amp;dev-&gt;phy);</div><div class='ctx'> 	mt76_unregister_device(&amp;dev-&gt;mt76);</div><div class='del'>-	mt7915_mcu_exit(dev);</div><div class='del'>-	mt7915_tx_token_put(dev);</div><div class='del'>-	mt7915_dma_cleanup(dev);</div><div class='add'>+	mt7915_stop_hardware(dev);</div><div class='ctx'> </div><div class='ctx'> 	mt76_free_device(&amp;dev-&gt;mt76);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c<br/>index 7a9759fb79d8..cefe56c05731 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/mac.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/mac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7915/mac.c</a></div><div class='hunk'>@@ -1,17 +1,15 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/timekeeping.h&gt;</div><div class='add'>+#include "coredump.h"</div><div class='ctx'> #include "mt7915.h"</div><div class='ctx'> #include "../dma.h"</div><div class='ctx'> #include "mac.h"</div><div class='add'>+#include "mcu.h"</div><div class='ctx'> </div><div class='del'>-#define to_rssi(field, rxv)	((FIELD_GET(field, rxv) - 220) / 2)</div><div class='del'>-</div><div class='del'>-#define HE_BITS(f)		cpu_to_le16(IEEE80211_RADIOTAP_HE_##f)</div><div class='del'>-#define HE_PREP(f, m, v)	le16_encode_bits(le32_get_bits(v, MT_CRXV_HE_##m),\</div><div class='del'>-						 IEEE80211_RADIOTAP_HE_##f)</div><div class='add'>+#define to_rssi(field, rcpi)	((FIELD_GET(field, rcpi) - 220) / 2)</div><div class='ctx'> </div><div class='ctx'> static const struct mt7915_dfs_radar_spec etsi_radar_specs = {</div><div class='ctx'> 	.pulse_th = { 110, -10, -80, 40, 5200, 128, 5200 },</div><div class='hunk'>@@ -58,10 +56,7 @@ static struct mt76_wcid *mt7915_rx_get_wcid(struct mt7915_dev *dev,</div><div class='ctx'> 	struct mt7915_sta *sta;</div><div class='ctx'> 	struct mt76_wcid *wcid;</div><div class='ctx'> </div><div class='del'>-	if (idx &gt;= ARRAY_SIZE(dev-&gt;mt76.wcid))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	wcid = rcu_dereference(dev-&gt;mt76.wcid[idx]);</div><div class='add'>+	wcid = mt76_wcid_ptr(dev, idx);</div><div class='ctx'> 	if (unicast || !wcid)</div><div class='ctx'> 		return wcid;</div><div class='ctx'> </div><div class='hunk'>@@ -75,10 +70,6 @@ static struct mt76_wcid *mt7915_rx_get_wcid(struct mt7915_dev *dev,</div><div class='ctx'> 	return &amp;sta-&gt;vif-&gt;sta.wcid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt7915_sta_ps(struct mt76_dev *mdev, struct ieee80211_sta *sta, bool ps)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> bool mt7915_mac_wtbl_update(struct mt7915_dev *dev, int idx, u32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	mt76_rmw(dev, MT_WTBL_UPDATE, MT_WTBL_UPDATE_WLAN_IDX,</div><div class='hunk'>@@ -88,15 +79,14 @@ bool mt7915_mac_wtbl_update(struct mt7915_dev *dev, int idx, u32 mask)</div><div class='ctx'> 			 0, 5000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 mt7915_mac_wtbl_lmac_addr(struct mt7915_dev *dev, u16 wcid)</div><div class='add'>+u32 mt7915_mac_wtbl_lmac_addr(struct mt7915_dev *dev, u16 wcid, u8 dw)</div><div class='ctx'> {</div><div class='ctx'> 	mt76_wr(dev, MT_WTBLON_TOP_WDUCR,</div><div class='ctx'> 		FIELD_PREP(MT_WTBLON_TOP_WDUCR_GROUP, (wcid &gt;&gt; 7)));</div><div class='ctx'> </div><div class='del'>-	return MT_WTBL_LMAC_OFFS(wcid, 0);</div><div class='add'>+	return MT_WTBL_LMAC_OFFS(wcid, dw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* TODO: use txfree airtime info to avoid runtime accessing in the long run */</div><div class='ctx'> static void mt7915_mac_sta_poll(struct mt7915_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	static const u8 ac_to_tid[] = {</div><div class='hunk'>@@ -107,33 +97,38 @@ static void mt7915_mac_sta_poll(struct mt7915_dev *dev)</div><div class='ctx'> 	};</div><div class='ctx'> 	struct ieee80211_sta *sta;</div><div class='ctx'> 	struct mt7915_sta *msta;</div><div class='add'>+	struct rate_info *rate;</div><div class='ctx'> 	u32 tx_time[IEEE80211_NUM_ACS], rx_time[IEEE80211_NUM_ACS];</div><div class='ctx'> 	LIST_HEAD(sta_poll_list);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-	list_splice_init(&amp;dev-&gt;sta_poll_list, &amp;sta_poll_list);</div><div class='del'>-	spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='add'>+	list_splice_init(&amp;dev-&gt;mt76.sta_poll_list, &amp;sta_poll_list);</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	while (true) {</div><div class='ctx'> 		bool clear = false;</div><div class='del'>-		u32 addr;</div><div class='add'>+		u32 addr, val;</div><div class='ctx'> 		u16 idx;</div><div class='add'>+		s8 rssi[4];</div><div class='add'>+		u8 bw;</div><div class='ctx'> </div><div class='del'>-		spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+		spin_lock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='ctx'> 		if (list_empty(&amp;sta_poll_list)) {</div><div class='del'>-			spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+			spin_unlock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		msta = list_first_entry(&amp;sta_poll_list,</div><div class='del'>-					struct mt7915_sta, poll_list);</div><div class='del'>-		list_del_init(&amp;msta-&gt;poll_list);</div><div class='del'>-		spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+					struct mt7915_sta, wcid.poll_list);</div><div class='add'>+		list_del_init(&amp;msta-&gt;wcid.poll_list);</div><div class='add'>+		spin_unlock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='ctx'> </div><div class='ctx'> 		idx = msta-&gt;wcid.idx;</div><div class='del'>-		addr = mt7915_mac_wtbl_lmac_addr(dev, idx) + 20 * 4;</div><div class='add'>+</div><div class='add'>+		/* refresh peer's airtime reporting */</div><div class='add'>+		addr = mt7915_mac_wtbl_lmac_addr(dev, idx, 20);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; IEEE80211_NUM_ACS; i++) {</div><div class='ctx'> 			u32 tx_last = msta-&gt;airtime_ac[i];</div><div class='hunk'>@@ -142,8 +137,15 @@ static void mt7915_mac_sta_poll(struct mt7915_dev *dev)</div><div class='ctx'> 			msta-&gt;airtime_ac[i] = mt76_rr(dev, addr);</div><div class='ctx'> 			msta-&gt;airtime_ac[i + 4] = mt76_rr(dev, addr + 4);</div><div class='ctx'> </div><div class='del'>-			tx_time[i] = msta-&gt;airtime_ac[i] - tx_last;</div><div class='del'>-			rx_time[i] = msta-&gt;airtime_ac[i + 4] - rx_last;</div><div class='add'>+			if (msta-&gt;airtime_ac[i] &lt;= tx_last)</div><div class='add'>+				tx_time[i] = 0;</div><div class='add'>+			else</div><div class='add'>+				tx_time[i] = msta-&gt;airtime_ac[i] - tx_last;</div><div class='add'>+</div><div class='add'>+			if (msta-&gt;airtime_ac[i + 4] &lt;= rx_last)</div><div class='add'>+				rx_time[i] = 0;</div><div class='add'>+			else</div><div class='add'>+				rx_time[i] = msta-&gt;airtime_ac[i + 4] - rx_last;</div><div class='ctx'> </div><div class='ctx'> 			if ((tx_last | rx_last) &amp; BIT(30))</div><div class='ctx'> 				clear = true;</div><div class='hunk'>@@ -163,9 +165,9 @@ static void mt7915_mac_sta_poll(struct mt7915_dev *dev)</div><div class='ctx'> 		sta = container_of((void *)msta, struct ieee80211_sta,</div><div class='ctx'> 				   drv_priv);</div><div class='ctx'> 		for (i = 0; i &lt; IEEE80211_NUM_ACS; i++) {</div><div class='del'>-			u8 q = mt7915_lmac_mapping(dev, i);</div><div class='del'>-			u32 tx_cur = tx_time[q];</div><div class='del'>-			u32 rx_cur = rx_time[q];</div><div class='add'>+			u8 queue = mt76_connac_lmac_mapping(i);</div><div class='add'>+			u32 tx_cur = tx_time[queue];</div><div class='add'>+			u32 rx_cur = rx_time[queue];</div><div class='ctx'> 			u8 tid = ac_to_tid[i];</div><div class='ctx'> </div><div class='ctx'> 			if (!tx_cur &amp;&amp; !rx_cur)</div><div class='hunk'>@@ -174,149 +176,112 @@ static void mt7915_mac_sta_poll(struct mt7915_dev *dev)</div><div class='ctx'> 			ieee80211_sta_register_airtime(sta, tid, tx_cur,</div><div class='ctx'> 						       rx_cur);</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-}</div><div class='add'>+		/*</div><div class='add'>+		 * We don't support reading GI info from txs packets.</div><div class='add'>+		 * For accurate tx status reporting and AQL improvement,</div><div class='add'>+		 * we need to make sure that flags match so polling GI</div><div class='add'>+		 * from per-sta counters directly.</div><div class='add'>+		 */</div><div class='add'>+		rate = &amp;msta-&gt;wcid.rate;</div><div class='add'>+		addr = mt7915_mac_wtbl_lmac_addr(dev, idx, 7);</div><div class='add'>+		val = mt76_rr(dev, addr);</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7915_mac_decode_he_radiotap_ru(struct mt76_rx_status *status,</div><div class='del'>-				 struct ieee80211_radiotap_he *he,</div><div class='del'>-				 __le32 *rxv)</div><div class='del'>-{</div><div class='del'>-	u32 ru_h, ru_l;</div><div class='del'>-	u8 ru, offs = 0;</div><div class='add'>+		switch (rate-&gt;bw) {</div><div class='add'>+		case RATE_INFO_BW_160:</div><div class='add'>+			bw = IEEE80211_STA_RX_BW_160;</div><div class='add'>+			break;</div><div class='add'>+		case RATE_INFO_BW_80:</div><div class='add'>+			bw = IEEE80211_STA_RX_BW_80;</div><div class='add'>+			break;</div><div class='add'>+		case RATE_INFO_BW_40:</div><div class='add'>+			bw = IEEE80211_STA_RX_BW_40;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			bw = IEEE80211_STA_RX_BW_20;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (rate-&gt;flags &amp; RATE_INFO_FLAGS_HE_MCS) {</div><div class='add'>+			u8 offs = 24 + 2 * bw;</div><div class='ctx'> </div><div class='del'>-	ru_l = FIELD_GET(MT_PRXV_HE_RU_ALLOC_L, le32_to_cpu(rxv[0]));</div><div class='del'>-	ru_h = FIELD_GET(MT_PRXV_HE_RU_ALLOC_H, le32_to_cpu(rxv[1]));</div><div class='del'>-	ru = (u8)(ru_l | ru_h &lt;&lt; 4);</div><div class='add'>+			rate-&gt;he_gi = (val &amp; (0x3 &lt;&lt; offs)) &gt;&gt; offs;</div><div class='add'>+		} else if (rate-&gt;flags &amp;</div><div class='add'>+			   (RATE_INFO_FLAGS_VHT_MCS | RATE_INFO_FLAGS_MCS)) {</div><div class='add'>+			if (val &amp; BIT(12 + bw))</div><div class='add'>+				rate-&gt;flags |= RATE_INFO_FLAGS_SHORT_GI;</div><div class='add'>+			else</div><div class='add'>+				rate-&gt;flags &amp;= ~RATE_INFO_FLAGS_SHORT_GI;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	status-&gt;bw = RATE_INFO_BW_HE_RU;</div><div class='add'>+		/* get signal strength of resp frames (CTS/BA/ACK) */</div><div class='add'>+		addr = mt7915_mac_wtbl_lmac_addr(dev, idx, 30);</div><div class='add'>+		val = mt76_rr(dev, addr);</div><div class='ctx'> </div><div class='del'>-	switch (ru) {</div><div class='del'>-	case 0 ... 36:</div><div class='del'>-		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_26;</div><div class='del'>-		offs = ru;</div><div class='del'>-		break;</div><div class='del'>-	case 37 ... 52:</div><div class='del'>-		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_52;</div><div class='del'>-		offs = ru - 37;</div><div class='del'>-		break;</div><div class='del'>-	case 53 ... 60:</div><div class='del'>-		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_106;</div><div class='del'>-		offs = ru - 53;</div><div class='del'>-		break;</div><div class='del'>-	case 61 ... 64:</div><div class='del'>-		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_242;</div><div class='del'>-		offs = ru - 61;</div><div class='del'>-		break;</div><div class='del'>-	case 65 ... 66:</div><div class='del'>-		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_484;</div><div class='del'>-		offs = ru - 65;</div><div class='del'>-		break;</div><div class='del'>-	case 67:</div><div class='del'>-		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_996;</div><div class='del'>-		break;</div><div class='del'>-	case 68:</div><div class='del'>-		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_2x996;</div><div class='del'>-		break;</div><div class='add'>+		rssi[0] = to_rssi(GENMASK(7, 0), val);</div><div class='add'>+		rssi[1] = to_rssi(GENMASK(15, 8), val);</div><div class='add'>+		rssi[2] = to_rssi(GENMASK(23, 16), val);</div><div class='add'>+		rssi[3] = to_rssi(GENMASK(31, 14), val);</div><div class='add'>+</div><div class='add'>+		msta-&gt;ack_signal =</div><div class='add'>+			mt76_rx_signal(msta-&gt;vif-&gt;phy-&gt;mt76-&gt;antenna_mask, rssi);</div><div class='add'>+</div><div class='add'>+		ewma_avg_signal_add(&amp;msta-&gt;avg_ack_signal, -msta-&gt;ack_signal);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	he-&gt;data1 |= HE_BITS(DATA1_BW_RU_ALLOC_KNOWN);</div><div class='del'>-	he-&gt;data2 |= HE_BITS(DATA2_RU_OFFSET_KNOWN) |</div><div class='del'>-		     le16_encode_bits(offs,</div><div class='del'>-				      IEEE80211_RADIOTAP_HE_DATA2_RU_OFFSET);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7915_mac_enable_rtscts(struct mt7915_dev *dev,</div><div class='add'>+			      struct ieee80211_vif *vif, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	u32 addr;</div><div class='add'>+</div><div class='add'>+	addr = mt7915_mac_wtbl_lmac_addr(dev, mvif-&gt;sta.wcid.idx, 5);</div><div class='add'>+	if (enable)</div><div class='add'>+		mt76_set(dev, addr, BIT(5));</div><div class='add'>+	else</div><div class='add'>+		mt76_clear(dev, addr, BIT(5));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7915_mac_decode_he_radiotap(struct sk_buff *skb,</div><div class='del'>-			      struct mt76_rx_status *status,</div><div class='del'>-			      __le32 *rxv, u32 phy)</div><div class='add'>+mt7915_wed_check_ppe(struct mt7915_dev *dev, struct mt76_queue *q,</div><div class='add'>+		     struct mt7915_sta *msta, struct sk_buff *skb,</div><div class='add'>+		     u32 info)</div><div class='ctx'> {</div><div class='del'>-	/* TODO: struct ieee80211_radiotap_he_mu */</div><div class='del'>-	static const struct ieee80211_radiotap_he known = {</div><div class='del'>-		.data1 = HE_BITS(DATA1_DATA_MCS_KNOWN) |</div><div class='del'>-			 HE_BITS(DATA1_DATA_DCM_KNOWN) |</div><div class='del'>-			 HE_BITS(DATA1_STBC_KNOWN) |</div><div class='del'>-			 HE_BITS(DATA1_CODING_KNOWN) |</div><div class='del'>-			 HE_BITS(DATA1_LDPC_XSYMSEG_KNOWN) |</div><div class='del'>-			 HE_BITS(DATA1_DOPPLER_KNOWN) |</div><div class='del'>-			 HE_BITS(DATA1_BSS_COLOR_KNOWN),</div><div class='del'>-		.data2 = HE_BITS(DATA2_GI_KNOWN) |</div><div class='del'>-			 HE_BITS(DATA2_TXBF_KNOWN) |</div><div class='del'>-			 HE_BITS(DATA2_PE_DISAMBIG_KNOWN) |</div><div class='del'>-			 HE_BITS(DATA2_TXOP_KNOWN),</div><div class='del'>-	};</div><div class='del'>-	struct ieee80211_radiotap_he *he = NULL;</div><div class='del'>-	u32 ltf_size = le32_get_bits(rxv[2], MT_CRXV_HE_LTF_SIZE) + 1;</div><div class='del'>-</div><div class='del'>-	he = skb_push(skb, sizeof(known));</div><div class='del'>-	memcpy(he, &amp;known, sizeof(known));</div><div class='del'>-</div><div class='del'>-	he-&gt;data3 = HE_PREP(DATA3_BSS_COLOR, BSS_COLOR, rxv[14]) |</div><div class='del'>-		    HE_PREP(DATA3_LDPC_XSYMSEG, LDPC_EXT_SYM, rxv[2]);</div><div class='del'>-	he-&gt;data5 = HE_PREP(DATA5_PE_DISAMBIG, PE_DISAMBIG, rxv[2]) |</div><div class='del'>-		    le16_encode_bits(ltf_size,</div><div class='del'>-				     IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE);</div><div class='del'>-	he-&gt;data6 = HE_PREP(DATA6_TXOP, TXOP_DUR, rxv[14]) |</div><div class='del'>-		    HE_PREP(DATA6_DOPPLER, DOPPLER, rxv[14]);</div><div class='del'>-</div><div class='del'>-	switch (phy) {</div><div class='del'>-	case MT_PHY_TYPE_HE_SU:</div><div class='del'>-		he-&gt;data1 |= HE_BITS(DATA1_FORMAT_SU) |</div><div class='del'>-			     HE_BITS(DATA1_UL_DL_KNOWN) |</div><div class='del'>-			     HE_BITS(DATA1_BEAM_CHANGE_KNOWN) |</div><div class='del'>-			     HE_BITS(DATA1_SPTL_REUSE_KNOWN);</div><div class='del'>-</div><div class='del'>-		he-&gt;data3 |= HE_PREP(DATA3_BEAM_CHANGE, BEAM_CHNG, rxv[14]) |</div><div class='del'>-			     HE_PREP(DATA3_UL_DL, UPLINK, rxv[2]);</div><div class='del'>-		he-&gt;data4 |= HE_PREP(DATA4_SU_MU_SPTL_REUSE, SR_MASK, rxv[11]);</div><div class='del'>-		break;</div><div class='del'>-	case MT_PHY_TYPE_HE_EXT_SU:</div><div class='del'>-		he-&gt;data1 |= HE_BITS(DATA1_FORMAT_EXT_SU) |</div><div class='del'>-			     HE_BITS(DATA1_UL_DL_KNOWN);</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct wireless_dev *wdev;</div><div class='ctx'> </div><div class='del'>-		he-&gt;data3 |= HE_PREP(DATA3_UL_DL, UPLINK, rxv[2]);</div><div class='del'>-		break;</div><div class='del'>-	case MT_PHY_TYPE_HE_MU:</div><div class='del'>-		he-&gt;data1 |= HE_BITS(DATA1_FORMAT_MU) |</div><div class='del'>-			     HE_BITS(DATA1_UL_DL_KNOWN) |</div><div class='del'>-			     HE_BITS(DATA1_SPTL_REUSE_KNOWN);</div><div class='add'>+	if (!msta || !msta-&gt;vif)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		he-&gt;data3 |= HE_PREP(DATA3_UL_DL, UPLINK, rxv[2]);</div><div class='del'>-		he-&gt;data4 |= HE_PREP(DATA4_SU_MU_SPTL_REUSE, SR_MASK, rxv[11]);</div><div class='add'>+	if (!mt76_queue_is_wed_rx(q))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		mt7915_mac_decode_he_radiotap_ru(status, he, rxv);</div><div class='del'>-		break;</div><div class='del'>-	case MT_PHY_TYPE_HE_TB:</div><div class='del'>-		he-&gt;data1 |= HE_BITS(DATA1_FORMAT_TRIG) |</div><div class='del'>-			     HE_BITS(DATA1_SPTL_REUSE_KNOWN) |</div><div class='del'>-			     HE_BITS(DATA1_SPTL_REUSE2_KNOWN) |</div><div class='del'>-			     HE_BITS(DATA1_SPTL_REUSE3_KNOWN) |</div><div class='del'>-			     HE_BITS(DATA1_SPTL_REUSE4_KNOWN);</div><div class='del'>-</div><div class='del'>-		he-&gt;data4 |= HE_PREP(DATA4_TB_SPTL_REUSE1, SR_MASK, rxv[11]) |</div><div class='del'>-			     HE_PREP(DATA4_TB_SPTL_REUSE2, SR1_MASK, rxv[11]) |</div><div class='del'>-			     HE_PREP(DATA4_TB_SPTL_REUSE3, SR2_MASK, rxv[11]) |</div><div class='del'>-			     HE_PREP(DATA4_TB_SPTL_REUSE4, SR3_MASK, rxv[11]);</div><div class='del'>-</div><div class='del'>-		mt7915_mac_decode_he_radiotap_ru(status, he, rxv);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	if (!(info &amp; MT_DMA_INFO_PPE_VLD))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vif = container_of((void *)msta-&gt;vif, struct ieee80211_vif,</div><div class='add'>+			   drv_priv);</div><div class='add'>+	wdev = ieee80211_vif_to_wdev(vif);</div><div class='add'>+	skb-&gt;dev = wdev-&gt;netdev;</div><div class='add'>+</div><div class='add'>+	mtk_wed_device_ppe_check(&amp;dev-&gt;mt76.mmio.wed, skb,</div><div class='add'>+				 FIELD_GET(MT_DMA_PPE_CPU_REASON, info),</div><div class='add'>+				 FIELD_GET(MT_DMA_PPE_ENTRY, info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='add'>+static int</div><div class='add'>+mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb,</div><div class='add'>+		   enum mt76_rxq_id q, u32 *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_rx_status *status = (struct mt76_rx_status *)skb-&gt;cb;</div><div class='ctx'> 	struct mt76_phy *mphy = &amp;dev-&gt;mt76.phy;</div><div class='ctx'> 	struct mt7915_phy *phy = &amp;dev-&gt;phy;</div><div class='ctx'> 	struct ieee80211_supported_band *sband;</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='ctx'> 	__le32 *rxd = (__le32 *)skb-&gt;data;</div><div class='ctx'> 	__le32 *rxv = NULL;</div><div class='del'>-	u32 mode = 0;</div><div class='ctx'> 	u32 rxd0 = le32_to_cpu(rxd[0]);</div><div class='ctx'> 	u32 rxd1 = le32_to_cpu(rxd[1]);</div><div class='ctx'> 	u32 rxd2 = le32_to_cpu(rxd[2]);</div><div class='hunk'>@@ -325,21 +290,24 @@ int mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	u32 csum_mask = MT_RXD0_NORMAL_IP_SUM | MT_RXD0_NORMAL_UDP_TCP_SUM;</div><div class='ctx'> 	bool unicast, insert_ccmp_hdr = false;</div><div class='ctx'> 	u8 remove_pad, amsdu_info;</div><div class='add'>+	u8 mode = 0, qos_ctl = 0;</div><div class='add'>+	struct mt7915_sta *msta = NULL;</div><div class='add'>+	u32 csum_status = *(u32 *)skb-&gt;cb;</div><div class='ctx'> 	bool hdr_trans;</div><div class='add'>+	u16 hdr_gap;</div><div class='ctx'> 	u16 seq_ctrl = 0;</div><div class='del'>-	u8 qos_ctl = 0;</div><div class='ctx'> 	__le16 fc = 0;</div><div class='del'>-	int i, idx;</div><div class='add'>+	int idx;</div><div class='ctx'> </div><div class='ctx'> 	memset(status, 0, sizeof(*status));</div><div class='ctx'> </div><div class='del'>-	if (rxd1 &amp; MT_RXD1_NORMAL_BAND_IDX) {</div><div class='del'>-		mphy = dev-&gt;mt76.phy2;</div><div class='add'>+	if ((rxd1 &amp; MT_RXD1_NORMAL_BAND_IDX) &amp;&amp; !phy-&gt;mt76-&gt;band_idx) {</div><div class='add'>+		mphy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='ctx'> 		if (!mphy)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		phy = mphy-&gt;priv;</div><div class='del'>-		status-&gt;ext_phy = true;</div><div class='add'>+		status-&gt;phy_idx = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(MT76_STATE_RUNNING, &amp;mphy-&gt;state))</div><div class='hunk'>@@ -348,32 +316,37 @@ int mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	if (rxd2 &amp; MT_RXD2_NORMAL_AMSDU_ERR)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	hdr_trans = rxd2 &amp; MT_RXD2_NORMAL_HDR_TRANS;</div><div class='add'>+	if (hdr_trans &amp;&amp; (rxd1 &amp; MT_RXD1_NORMAL_CM))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* ICV error or CCMP/BIP/WPI MIC error */</div><div class='add'>+	if (rxd1 &amp; MT_RXD1_NORMAL_ICV_ERR)</div><div class='add'>+		status-&gt;flag |= RX_FLAG_ONLY_MONITOR;</div><div class='add'>+</div><div class='ctx'> 	unicast = FIELD_GET(MT_RXD3_NORMAL_ADDR_TYPE, rxd3) == MT_RXD3_NORMAL_U2M;</div><div class='ctx'> 	idx = FIELD_GET(MT_RXD1_NORMAL_WLAN_IDX, rxd1);</div><div class='del'>-	hdr_trans = rxd2 &amp; MT_RXD2_NORMAL_HDR_TRANS;</div><div class='ctx'> 	status-&gt;wcid = mt7915_rx_get_wcid(dev, idx, unicast);</div><div class='ctx'> </div><div class='ctx'> 	if (status-&gt;wcid) {</div><div class='del'>-		struct mt7915_sta *msta;</div><div class='del'>-</div><div class='ctx'> 		msta = container_of(status-&gt;wcid, struct mt7915_sta, wcid);</div><div class='del'>-		spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-		if (list_empty(&amp;msta-&gt;poll_list))</div><div class='del'>-			list_add_tail(&amp;msta-&gt;poll_list, &amp;dev-&gt;sta_poll_list);</div><div class='del'>-		spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+		mt76_wcid_add_poll(&amp;dev-&gt;mt76, &amp;msta-&gt;wcid);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status-&gt;freq = mphy-&gt;chandef.chan-&gt;center_freq;</div><div class='ctx'> 	status-&gt;band = mphy-&gt;chandef.chan-&gt;band;</div><div class='ctx'> 	if (status-&gt;band == NL80211_BAND_5GHZ)</div><div class='ctx'> 		sband = &amp;mphy-&gt;sband_5g.sband;</div><div class='add'>+	else if (status-&gt;band == NL80211_BAND_6GHZ)</div><div class='add'>+		sband = &amp;mphy-&gt;sband_6g.sband;</div><div class='ctx'> 	else</div><div class='ctx'> 		sband = &amp;mphy-&gt;sband_2g.sband;</div><div class='ctx'> </div><div class='ctx'> 	if (!sband-&gt;channels)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if ((rxd0 &amp; csum_mask) == csum_mask)</div><div class='add'>+	if ((rxd0 &amp; csum_mask) == csum_mask &amp;&amp;</div><div class='add'>+	    !(csum_status &amp; (BIT(0) | BIT(2) | BIT(3))))</div><div class='ctx'> 		skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='ctx'> </div><div class='ctx'> 	if (rxd1 &amp; MT_RXD1_NORMAL_FCS_ERR)</div><div class='hunk'>@@ -412,14 +385,27 @@ int mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 		u8 *data = (u8 *)rxd;</div><div class='ctx'> </div><div class='ctx'> 		if (status-&gt;flag &amp; RX_FLAG_DECRYPTED) {</div><div class='del'>-			status-&gt;iv[0] = data[5];</div><div class='del'>-			status-&gt;iv[1] = data[4];</div><div class='del'>-			status-&gt;iv[2] = data[3];</div><div class='del'>-			status-&gt;iv[3] = data[2];</div><div class='del'>-			status-&gt;iv[4] = data[1];</div><div class='del'>-			status-&gt;iv[5] = data[0];</div><div class='del'>-</div><div class='del'>-			insert_ccmp_hdr = FIELD_GET(MT_RXD2_NORMAL_FRAG, rxd2);</div><div class='add'>+			switch (FIELD_GET(MT_RXD1_NORMAL_SEC_MODE, rxd1)) {</div><div class='add'>+			case MT_CIPHER_AES_CCMP:</div><div class='add'>+			case MT_CIPHER_CCMP_CCX:</div><div class='add'>+			case MT_CIPHER_CCMP_256:</div><div class='add'>+				insert_ccmp_hdr =</div><div class='add'>+					FIELD_GET(MT_RXD2_NORMAL_FRAG, rxd2);</div><div class='add'>+				fallthrough;</div><div class='add'>+			case MT_CIPHER_TKIP:</div><div class='add'>+			case MT_CIPHER_TKIP_NO_MIC:</div><div class='add'>+			case MT_CIPHER_GCMP:</div><div class='add'>+			case MT_CIPHER_GCMP_256:</div><div class='add'>+				status-&gt;iv[0] = data[5];</div><div class='add'>+				status-&gt;iv[1] = data[4];</div><div class='add'>+				status-&gt;iv[2] = data[3];</div><div class='add'>+				status-&gt;iv[3] = data[2];</div><div class='add'>+				status-&gt;iv[4] = data[1];</div><div class='add'>+				status-&gt;iv[5] = data[0];</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		rxd += 4;</div><div class='ctx'> 		if ((u8 *)rxd - skb-&gt;data &gt;= skb-&gt;len)</div><div class='hunk'>@@ -450,7 +436,8 @@ int mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	/* RXD Group 3 - P-RXV */</div><div class='ctx'> 	if (rxd1 &amp; MT_RXD1_NORMAL_GROUP_3) {</div><div class='del'>-		u32 v0, v1, v2;</div><div class='add'>+		u32 v0, v1;</div><div class='add'>+		int ret;</div><div class='ctx'> </div><div class='ctx'> 		rxv = rxd;</div><div class='ctx'> 		rxd += 2;</div><div class='hunk'>@@ -459,7 +446,6 @@ int mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 		v0 = le32_to_cpu(rxv[0]);</div><div class='ctx'> 		v1 = le32_to_cpu(rxv[1]);</div><div class='del'>-		v2 = le32_to_cpu(rxv[2]);</div><div class='ctx'> </div><div class='ctx'> 		if (v0 &amp; MT_PRXV_HT_AD_CODE)</div><div class='ctx'> 			status-&gt;enc_flags |= RX_ENC_FLAG_LDPC;</div><div class='hunk'>@@ -469,121 +455,81 @@ int mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 		status-&gt;chain_signal[1] = to_rssi(MT_PRXV_RCPI1, v1);</div><div class='ctx'> 		status-&gt;chain_signal[2] = to_rssi(MT_PRXV_RCPI2, v1);</div><div class='ctx'> 		status-&gt;chain_signal[3] = to_rssi(MT_PRXV_RCPI3, v1);</div><div class='del'>-		status-&gt;signal = status-&gt;chain_signal[0];</div><div class='del'>-</div><div class='del'>-		for (i = 1; i &lt; hweight8(mphy-&gt;antenna_mask); i++) {</div><div class='del'>-			if (!(status-&gt;chains &amp; BIT(i)))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			status-&gt;signal = max(status-&gt;signal,</div><div class='del'>-					     status-&gt;chain_signal[i]);</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		/* RXD Group 5 - C-RXV */</div><div class='ctx'> 		if (rxd1 &amp; MT_RXD1_NORMAL_GROUP_5) {</div><div class='del'>-			u8 stbc = FIELD_GET(MT_CRXV_HT_STBC, v2);</div><div class='del'>-			u8 gi = FIELD_GET(MT_CRXV_HT_SHORT_GI, v2);</div><div class='del'>-			bool cck = false;</div><div class='del'>-</div><div class='ctx'> 			rxd += 18;</div><div class='ctx'> 			if ((u8 *)rxd - skb-&gt;data &gt;= skb-&gt;len)</div><div class='ctx'> 				return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			idx = i = FIELD_GET(MT_PRXV_TX_RATE, v0);</div><div class='del'>-			mode = FIELD_GET(MT_CRXV_TX_MODE, v2);</div><div class='del'>-</div><div class='del'>-			switch (mode) {</div><div class='del'>-			case MT_PHY_TYPE_CCK:</div><div class='del'>-				cck = true;</div><div class='del'>-				fallthrough;</div><div class='del'>-			case MT_PHY_TYPE_OFDM:</div><div class='del'>-				i = mt76_get_rate(&amp;dev-&gt;mt76, sband, i, cck);</div><div class='del'>-				break;</div><div class='del'>-			case MT_PHY_TYPE_HT_GF:</div><div class='del'>-			case MT_PHY_TYPE_HT:</div><div class='del'>-				status-&gt;encoding = RX_ENC_HT;</div><div class='del'>-				if (i &gt; 31)</div><div class='del'>-					return -EINVAL;</div><div class='del'>-				break;</div><div class='del'>-			case MT_PHY_TYPE_VHT:</div><div class='del'>-				status-&gt;nss =</div><div class='del'>-					FIELD_GET(MT_PRXV_NSTS, v0) + 1;</div><div class='del'>-				status-&gt;encoding = RX_ENC_VHT;</div><div class='del'>-				if (i &gt; 9)</div><div class='del'>-					return -EINVAL;</div><div class='del'>-				break;</div><div class='del'>-			case MT_PHY_TYPE_HE_MU:</div><div class='del'>-				status-&gt;flag |= RX_FLAG_RADIOTAP_HE_MU;</div><div class='del'>-				fallthrough;</div><div class='del'>-			case MT_PHY_TYPE_HE_SU:</div><div class='del'>-			case MT_PHY_TYPE_HE_EXT_SU:</div><div class='del'>-			case MT_PHY_TYPE_HE_TB:</div><div class='del'>-				status-&gt;nss =</div><div class='del'>-					FIELD_GET(MT_PRXV_NSTS, v0) + 1;</div><div class='del'>-				status-&gt;encoding = RX_ENC_HE;</div><div class='del'>-				status-&gt;flag |= RX_FLAG_RADIOTAP_HE;</div><div class='del'>-				i &amp;= GENMASK(3, 0);</div><div class='del'>-</div><div class='del'>-				if (gi &lt;= NL80211_RATE_INFO_HE_GI_3_2)</div><div class='del'>-					status-&gt;he_gi = gi;</div><div class='del'>-</div><div class='del'>-				status-&gt;he_dcm = !!(idx &amp; MT_PRXV_TX_DCM);</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			status-&gt;rate_idx = i;</div><div class='del'>-</div><div class='del'>-			switch (FIELD_GET(MT_CRXV_FRAME_MODE, v2)) {</div><div class='del'>-			case IEEE80211_STA_RX_BW_20:</div><div class='del'>-				break;</div><div class='del'>-			case IEEE80211_STA_RX_BW_40:</div><div class='del'>-				if (mode &amp; MT_PHY_TYPE_HE_EXT_SU &amp;&amp;</div><div class='del'>-				    (idx &amp; MT_PRXV_TX_ER_SU_106T)) {</div><div class='del'>-					status-&gt;bw = RATE_INFO_BW_HE_RU;</div><div class='del'>-					status-&gt;he_ru =</div><div class='del'>-						NL80211_RATE_INFO_HE_RU_ALLOC_106;</div><div class='del'>-				} else {</div><div class='del'>-					status-&gt;bw = RATE_INFO_BW_40;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case IEEE80211_STA_RX_BW_80:</div><div class='del'>-				status-&gt;bw = RATE_INFO_BW_80;</div><div class='del'>-				break;</div><div class='del'>-			case IEEE80211_STA_RX_BW_160:</div><div class='del'>-				status-&gt;bw = RATE_INFO_BW_160;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			status-&gt;enc_flags |= RX_ENC_FLAG_STBC_MASK * stbc;</div><div class='del'>-			if (mode &lt; MT_PHY_TYPE_HE_SU &amp;&amp; gi)</div><div class='del'>-				status-&gt;enc_flags |= RX_ENC_FLAG_SHORT_GI;</div><div class='add'>+		if (!is_mt7915(&amp;dev-&gt;mt76) || (rxd1 &amp; MT_RXD1_NORMAL_GROUP_5)) {</div><div class='add'>+			ret = mt76_connac2_mac_fill_rx_rate(&amp;dev-&gt;mt76, status,</div><div class='add'>+							    sband, rxv, &amp;mode);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb_pull(skb, (u8 *)rxd - skb-&gt;data + 2 * remove_pad);</div><div class='del'>-</div><div class='ctx'> 	amsdu_info = FIELD_GET(MT_RXD4_NORMAL_PAYLOAD_FORMAT, rxd4);</div><div class='ctx'> 	status-&gt;amsdu = !!amsdu_info;</div><div class='ctx'> 	if (status-&gt;amsdu) {</div><div class='ctx'> 		status-&gt;first_amsdu = amsdu_info == MT_RXD4_FIRST_AMSDU_FRAME;</div><div class='ctx'> 		status-&gt;last_amsdu = amsdu_info == MT_RXD4_LAST_AMSDU_FRAME;</div><div class='del'>-		if (!hdr_trans) {</div><div class='del'>-			memmove(skb-&gt;data + 2, skb-&gt;data,</div><div class='del'>-				ieee80211_get_hdrlen_from_skb(skb));</div><div class='del'>-			skb_pull(skb, 2);</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (insert_ccmp_hdr &amp;&amp; !hdr_trans) {</div><div class='del'>-		u8 key_id = FIELD_GET(MT_RXD1_NORMAL_KEY_ID, rxd1);</div><div class='add'>+	hdr_gap = (u8 *)rxd - skb-&gt;data + 2 * remove_pad;</div><div class='add'>+	if (hdr_trans &amp;&amp; ieee80211_has_morefrags(fc)) {</div><div class='add'>+		struct ieee80211_vif *vif;</div><div class='add'>+		int err;</div><div class='ctx'> </div><div class='del'>-		mt76_insert_ccmp_hdr(skb, key_id);</div><div class='add'>+		if (!msta || !msta-&gt;vif)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		vif = container_of((void *)msta-&gt;vif, struct ieee80211_vif,</div><div class='add'>+				   drv_priv);</div><div class='add'>+		err = mt76_connac2_reverse_frag0_hdr_trans(vif, skb, hdr_gap);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		hdr_trans = false;</div><div class='add'>+	} else {</div><div class='add'>+		int pad_start = 0;</div><div class='add'>+</div><div class='add'>+		skb_pull(skb, hdr_gap);</div><div class='add'>+		if (!hdr_trans &amp;&amp; status-&gt;amsdu) {</div><div class='add'>+			pad_start = ieee80211_get_hdrlen_from_skb(skb);</div><div class='add'>+		} else if (hdr_trans &amp;&amp; (rxd2 &amp; MT_RXD2_NORMAL_HDR_TRANS_ERROR)) {</div><div class='add'>+			/*</div><div class='add'>+			 * When header translation failure is indicated,</div><div class='add'>+			 * the hardware will insert an extra 2-byte field</div><div class='add'>+			 * containing the data length after the protocol</div><div class='add'>+			 * type field. This happens either when the LLC-SNAP</div><div class='add'>+			 * pattern did not match, or if a VLAN header was</div><div class='add'>+			 * detected.</div><div class='add'>+			 */</div><div class='add'>+			pad_start = 12;</div><div class='add'>+			if (get_unaligned_be16(skb-&gt;data + pad_start) == ETH_P_8021Q)</div><div class='add'>+				pad_start += 4;</div><div class='add'>+			else</div><div class='add'>+				pad_start = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (pad_start) {</div><div class='add'>+			memmove(skb-&gt;data + 2, skb-&gt;data, pad_start);</div><div class='add'>+			skb_pull(skb, 2);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!hdr_trans) {</div><div class='add'>+		struct ieee80211_hdr *hdr;</div><div class='add'>+</div><div class='add'>+		if (insert_ccmp_hdr) {</div><div class='add'>+			u8 key_id = FIELD_GET(MT_RXD1_NORMAL_KEY_ID, rxd1);</div><div class='add'>+</div><div class='add'>+			mt76_insert_ccmp_hdr(skb, key_id);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		hdr = mt76_skb_get_hdr(skb);</div><div class='ctx'> 		fc = hdr-&gt;frame_control;</div><div class='ctx'> 		if (ieee80211_is_data_qos(fc)) {</div><div class='hunk'>@@ -591,13 +537,13 @@ int mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 			qos_ctl = *ieee80211_get_qos_ctl(hdr);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		status-&gt;flag &amp;= ~(RX_FLAG_RADIOTAP_HE |</div><div class='del'>-				  RX_FLAG_RADIOTAP_HE_MU);</div><div class='ctx'> 		status-&gt;flag |= RX_FLAG_8023;</div><div class='add'>+		mt7915_wed_check_ppe(dev, &amp;dev-&gt;mt76.q_rx[q], msta, skb,</div><div class='add'>+				     *info);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (rxv &amp;&amp; status-&gt;flag &amp; RX_FLAG_RADIOTAP_HE)</div><div class='del'>-		mt7915_mac_decode_he_radiotap(skb, status, rxv, mode);</div><div class='add'>+	if (rxv &amp;&amp; mode &gt;= MT_PHY_TYPE_HE_SU &amp;&amp; !(status-&gt;flag &amp; RX_FLAG_8023))</div><div class='add'>+		mt76_connac2_mac_decode_he_radiotap(&amp;dev-&gt;mt76, skb, rxv, mode);</div><div class='ctx'> </div><div class='ctx'> 	if (!status-&gt;wcid || !ieee80211_is_data_qos(fc))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -610,22 +556,26 @@ int mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_NL80211_TESTMODE</div><div class='del'>-void mt7915_mac_fill_rx_vector(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='add'>+static void</div><div class='add'>+mt7915_mac_fill_rx_vector(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_NL80211_TESTMODE</div><div class='ctx'> 	struct mt7915_phy *phy = &amp;dev-&gt;phy;</div><div class='ctx'> 	__le32 *rxd = (__le32 *)skb-&gt;data;</div><div class='ctx'> 	__le32 *rxv_hdr = rxd + 2;</div><div class='ctx'> 	__le32 *rxv = rxd + 4;</div><div class='ctx'> 	u32 rcpi, ib_rssi, wb_rssi, v20, v21;</div><div class='del'>-	bool ext_phy;</div><div class='add'>+	u8 band_idx;</div><div class='ctx'> 	s32 foe;</div><div class='ctx'> 	u8 snr;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	ext_phy = FIELD_GET(MT_RXV_HDR_BAND_IDX, le32_to_cpu(rxv_hdr[1]));</div><div class='del'>-	if (ext_phy)</div><div class='add'>+	band_idx = le32_get_bits(rxv_hdr[1], MT_RXV_HDR_BAND_IDX);</div><div class='add'>+	if (band_idx &amp;&amp; !phy-&gt;mt76-&gt;band_idx) {</div><div class='ctx'> 		phy = mt7915_ext_phy(dev);</div><div class='add'>+		if (!phy)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rcpi = le32_to_cpu(rxv[6]);</div><div class='ctx'> 	ib_rssi = le32_to_cpu(rxv[7]);</div><div class='hunk'>@@ -650,10 +600,10 @@ void mt7915_mac_fill_rx_vector(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	phy-&gt;test.last_freq_offset = foe;</div><div class='ctx'> 	phy-&gt;test.last_snr = snr;</div><div class='del'>-</div><div class='add'>+out:</div><div class='add'>+#endif</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mt7915_mac_write_txwi_tm(struct mt7915_phy *phy, __le32 *txwi,</div><div class='hunk'>@@ -770,205 +720,19 @@ mt7915_mac_write_txwi_tm(struct mt7915_phy *phy, __le32 *txwi,</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7915_mac_write_txwi_8023(struct mt7915_dev *dev, __le32 *txwi,</div><div class='del'>-			   struct sk_buff *skb, struct mt76_wcid *wcid)</div><div class='add'>+void mt7915_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi,</div><div class='add'>+			   struct sk_buff *skb, struct mt76_wcid *wcid, int pid,</div><div class='add'>+			   struct ieee80211_key_conf *key,</div><div class='add'>+			   enum mt76_txq_id qid, u32 changed)</div><div class='ctx'> {</div><div class='del'>-</div><div class='del'>-	u8 tid = skb-&gt;priority &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='del'>-	u8 fc_type, fc_stype;</div><div class='del'>-	bool wmm = false;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	if (wcid-&gt;sta) {</div><div class='del'>-		struct ieee80211_sta *sta;</div><div class='del'>-</div><div class='del'>-		sta = container_of((void *)wcid, struct ieee80211_sta, drv_priv);</div><div class='del'>-		wmm = sta-&gt;wme;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	val = FIELD_PREP(MT_TXD1_HDR_FORMAT, MT_HDR_FORMAT_802_3) |</div><div class='del'>-	      FIELD_PREP(MT_TXD1_TID, tid);</div><div class='del'>-</div><div class='del'>-	if (be16_to_cpu(skb-&gt;protocol) &gt;= ETH_P_802_3_MIN)</div><div class='del'>-		val |= MT_TXD1_ETH_802_3;</div><div class='del'>-</div><div class='del'>-	txwi[1] |= cpu_to_le32(val);</div><div class='del'>-</div><div class='del'>-	fc_type = IEEE80211_FTYPE_DATA &gt;&gt; 2;</div><div class='del'>-	fc_stype = wmm ? IEEE80211_STYPE_QOS_DATA &gt;&gt; 4 : 0;</div><div class='del'>-</div><div class='del'>-	val = FIELD_PREP(MT_TXD2_FRAME_TYPE, fc_type) |</div><div class='del'>-	      FIELD_PREP(MT_TXD2_SUB_TYPE, fc_stype);</div><div class='del'>-</div><div class='del'>-	txwi[2] |= cpu_to_le32(val);</div><div class='del'>-</div><div class='del'>-	val = FIELD_PREP(MT_TXD7_TYPE, fc_type) |</div><div class='del'>-	      FIELD_PREP(MT_TXD7_SUB_TYPE, fc_stype);</div><div class='del'>-	txwi[7] |= cpu_to_le32(val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt7915_mac_write_txwi_80211(struct mt7915_dev *dev, __le32 *txwi,</div><div class='del'>-			    struct sk_buff *skb, struct ieee80211_key_conf *key)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='del'>-	struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb-&gt;data;</div><div class='ctx'> 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='del'>-	bool multicast = is_multicast_ether_addr(hdr-&gt;addr1);</div><div class='del'>-	u8 tid = skb-&gt;priority &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='del'>-	__le16 fc = hdr-&gt;frame_control;</div><div class='del'>-	u8 fc_type, fc_stype;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	if (ieee80211_is_action(fc) &amp;&amp;</div><div class='del'>-	    mgmt-&gt;u.action.category == WLAN_CATEGORY_BACK &amp;&amp;</div><div class='del'>-	    mgmt-&gt;u.action.u.addba_req.action_code == WLAN_ACTION_ADDBA_REQ) {</div><div class='del'>-		u16 capab = le16_to_cpu(mgmt-&gt;u.action.u.addba_req.capab);</div><div class='del'>-</div><div class='del'>-		txwi[5] |= cpu_to_le32(MT_TXD5_ADD_BA);</div><div class='del'>-		tid = (capab &gt;&gt; 2) &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='del'>-	} else if (ieee80211_is_back_req(hdr-&gt;frame_control)) {</div><div class='del'>-		struct ieee80211_bar *bar = (struct ieee80211_bar *)hdr;</div><div class='del'>-		u16 control = le16_to_cpu(bar-&gt;control);</div><div class='del'>-</div><div class='del'>-		tid = FIELD_GET(IEEE80211_BAR_CTRL_TID_INFO_MASK, control);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	val = FIELD_PREP(MT_TXD1_HDR_FORMAT, MT_HDR_FORMAT_802_11) |</div><div class='del'>-	      FIELD_PREP(MT_TXD1_HDR_INFO,</div><div class='del'>-			 ieee80211_get_hdrlen_from_skb(skb) / 2) |</div><div class='del'>-	      FIELD_PREP(MT_TXD1_TID, tid);</div><div class='del'>-	txwi[1] |= cpu_to_le32(val);</div><div class='del'>-</div><div class='del'>-	fc_type = (le16_to_cpu(fc) &amp; IEEE80211_FCTL_FTYPE) &gt;&gt; 2;</div><div class='del'>-	fc_stype = (le16_to_cpu(fc) &amp; IEEE80211_FCTL_STYPE) &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	val = FIELD_PREP(MT_TXD2_FRAME_TYPE, fc_type) |</div><div class='del'>-	      FIELD_PREP(MT_TXD2_SUB_TYPE, fc_stype) |</div><div class='del'>-	      FIELD_PREP(MT_TXD2_MULTICAST, multicast);</div><div class='del'>-</div><div class='del'>-	if (key &amp;&amp; multicast &amp;&amp; ieee80211_is_robust_mgmt_frame(skb) &amp;&amp;</div><div class='del'>-	    key-&gt;cipher == WLAN_CIPHER_SUITE_AES_CMAC) {</div><div class='del'>-		val |= MT_TXD2_BIP;</div><div class='del'>-		txwi[3] &amp;= ~cpu_to_le32(MT_TXD3_PROTECT_FRAME);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ieee80211_is_data(fc) || multicast)</div><div class='del'>-		val |= MT_TXD2_FIX_RATE;</div><div class='del'>-</div><div class='del'>-	txwi[2] |= cpu_to_le32(val);</div><div class='del'>-</div><div class='del'>-	if (ieee80211_is_beacon(fc)) {</div><div class='del'>-		txwi[3] &amp;= ~cpu_to_le32(MT_TXD3_SW_POWER_MGMT);</div><div class='del'>-		txwi[3] |= cpu_to_le32(MT_TXD3_REM_TX_COUNT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (info-&gt;flags &amp; IEEE80211_TX_CTL_INJECTED) {</div><div class='del'>-		u16 seqno = le16_to_cpu(hdr-&gt;seq_ctrl);</div><div class='del'>-</div><div class='del'>-		if (ieee80211_is_back_req(hdr-&gt;frame_control)) {</div><div class='del'>-			struct ieee80211_bar *bar;</div><div class='del'>-</div><div class='del'>-			bar = (struct ieee80211_bar *)skb-&gt;data;</div><div class='del'>-			seqno = le16_to_cpu(bar-&gt;start_seq_num);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		val = MT_TXD3_SN_VALID |</div><div class='del'>-		      FIELD_PREP(MT_TXD3_SEQ, IEEE80211_SEQ_TO_SN(seqno));</div><div class='del'>-		txwi[3] |= cpu_to_le32(val);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	val = FIELD_PREP(MT_TXD7_TYPE, fc_type) |</div><div class='del'>-	      FIELD_PREP(MT_TXD7_SUB_TYPE, fc_stype);</div><div class='del'>-	txwi[7] |= cpu_to_le32(val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mt7915_mac_write_txwi(struct mt7915_dev *dev, __le32 *txwi,</div><div class='del'>-			   struct sk_buff *skb, struct mt76_wcid *wcid,</div><div class='del'>-			   struct ieee80211_key_conf *key, bool beacon)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='del'>-	struct ieee80211_vif *vif = info-&gt;control.vif;</div><div class='del'>-	struct mt76_phy *mphy = &amp;dev-&gt;mphy;</div><div class='del'>-	bool ext_phy = info-&gt;hw_queue &amp; MT_TX_HW_QUEUE_EXT_PHY;</div><div class='del'>-	u8 p_fmt, q_idx, omac_idx = 0, wmm_idx = 0;</div><div class='del'>-	bool is_8023 = info-&gt;flags &amp; IEEE80211_TX_CTL_HW_80211_ENCAP;</div><div class='del'>-	u16 tx_count = 15;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	if (vif) {</div><div class='del'>-		struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='del'>-</div><div class='del'>-		omac_idx = mvif-&gt;omac_idx;</div><div class='del'>-		wmm_idx = mvif-&gt;wmm_idx;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ext_phy &amp;&amp; dev-&gt;mt76.phy2)</div><div class='del'>-		mphy = dev-&gt;mt76.phy2;</div><div class='del'>-</div><div class='del'>-	if (beacon) {</div><div class='del'>-		p_fmt = MT_TX_TYPE_FW;</div><div class='del'>-		q_idx = MT_LMAC_BCN0;</div><div class='del'>-	} else if (skb_get_queue_mapping(skb) &gt;= MT_TXQ_PSD) {</div><div class='del'>-		p_fmt = MT_TX_TYPE_CT;</div><div class='del'>-		q_idx = MT_LMAC_ALTX0;</div><div class='del'>-	} else {</div><div class='del'>-		p_fmt = MT_TX_TYPE_CT;</div><div class='del'>-		q_idx = wmm_idx * MT7915_MAX_WMM_SETS +</div><div class='del'>-			mt7915_lmac_mapping(dev, skb_get_queue_mapping(skb));</div><div class='del'>-	}</div><div class='add'>+	u8 phy_idx = (info-&gt;hw_queue &amp; MT_TX_HW_QUEUE_PHY) &gt;&gt; 2;</div><div class='add'>+	struct mt76_phy *mphy = &amp;dev-&gt;phy;</div><div class='ctx'> </div><div class='del'>-	val = FIELD_PREP(MT_TXD0_TX_BYTES, skb-&gt;len + MT_TXD_SIZE) |</div><div class='del'>-	      FIELD_PREP(MT_TXD0_PKT_FMT, p_fmt) |</div><div class='del'>-	      FIELD_PREP(MT_TXD0_Q_IDX, q_idx);</div><div class='del'>-	txwi[0] = cpu_to_le32(val);</div><div class='del'>-</div><div class='del'>-	val = MT_TXD1_LONG_FORMAT |</div><div class='del'>-	      FIELD_PREP(MT_TXD1_WLAN_IDX, wcid-&gt;idx) |</div><div class='del'>-	      FIELD_PREP(MT_TXD1_OWN_MAC, omac_idx);</div><div class='del'>-</div><div class='del'>-	if (ext_phy &amp;&amp; q_idx &gt;= MT_LMAC_ALTX0 &amp;&amp; q_idx &lt;= MT_LMAC_BCN0)</div><div class='del'>-		val |= MT_TXD1_TGID;</div><div class='del'>-</div><div class='del'>-	txwi[1] = cpu_to_le32(val);</div><div class='del'>-</div><div class='del'>-	txwi[2] = 0;</div><div class='del'>-</div><div class='del'>-	val = MT_TXD3_SW_POWER_MGMT |</div><div class='del'>-	      FIELD_PREP(MT_TXD3_REM_TX_COUNT, tx_count);</div><div class='del'>-	if (key)</div><div class='del'>-		val |= MT_TXD3_PROTECT_FRAME;</div><div class='del'>-	if (info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)</div><div class='del'>-		val |= MT_TXD3_NO_ACK;</div><div class='del'>-</div><div class='del'>-	txwi[3] = cpu_to_le32(val);</div><div class='del'>-	txwi[4] = 0;</div><div class='del'>-	txwi[5] = 0;</div><div class='del'>-	txwi[6] = 0;</div><div class='del'>-	txwi[7] = wcid-&gt;amsdu ? cpu_to_le32(MT_TXD7_HW_AMSDU) : 0;</div><div class='del'>-</div><div class='del'>-	if (is_8023)</div><div class='del'>-		mt7915_mac_write_txwi_8023(dev, txwi, skb, wcid);</div><div class='del'>-	else</div><div class='del'>-		mt7915_mac_write_txwi_80211(dev, txwi, skb, key);</div><div class='add'>+	if (phy_idx &amp;&amp; dev-&gt;phys[MT_BAND1])</div><div class='add'>+		mphy = dev-&gt;phys[MT_BAND1];</div><div class='ctx'> </div><div class='del'>-	if (txwi[2] &amp; cpu_to_le32(MT_TXD2_FIX_RATE)) {</div><div class='del'>-		u16 rate;</div><div class='del'>-</div><div class='del'>-		/* hardware won't add HTC for mgmt/ctrl frame */</div><div class='del'>-		txwi[2] |= cpu_to_le32(MT_TXD2_HTC_VLD);</div><div class='del'>-</div><div class='del'>-		if (mphy-&gt;chandef.chan-&gt;band == NL80211_BAND_5GHZ)</div><div class='del'>-			rate = MT7915_5G_RATE_DEFAULT;</div><div class='del'>-		else</div><div class='del'>-			rate = MT7915_2G_RATE_DEFAULT;</div><div class='del'>-</div><div class='del'>-		val = MT_TXD6_FIXED_BW |</div><div class='del'>-		      FIELD_PREP(MT_TXD6_TX_RATE, rate);</div><div class='del'>-		txwi[6] |= cpu_to_le32(val);</div><div class='del'>-		txwi[3] |= cpu_to_le32(MT_TXD3_BA_DISABLE);</div><div class='del'>-	}</div><div class='add'>+	mt76_connac2_mac_write_txwi(dev, txwi, skb, wcid, key, pid, qid, changed);</div><div class='ctx'> </div><div class='ctx'> 	if (mt76_testmode_enabled(mphy))</div><div class='ctx'> 		mt7915_mac_write_txwi_tm(mphy-&gt;priv, txwi, skb);</div><div class='hunk'>@@ -984,11 +748,11 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='ctx'> 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx_info-&gt;skb);</div><div class='ctx'> 	struct ieee80211_key_conf *key = info-&gt;control.hw_key;</div><div class='ctx'> 	struct ieee80211_vif *vif = info-&gt;control.vif;</div><div class='del'>-	struct mt76_tx_cb *cb = mt76_tx_skb_cb(tx_info-&gt;skb);</div><div class='add'>+	struct mt76_connac_fw_txp *txp;</div><div class='ctx'> 	struct mt76_txwi_cache *t;</div><div class='del'>-	struct mt7915_txp *txp;</div><div class='ctx'> 	int id, i, nbuf = tx_info-&gt;nbuf - 1;</div><div class='ctx'> 	u8 *txwi = (u8 *)txwi_ptr;</div><div class='add'>+	int pid;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(tx_info-&gt;skb-&gt;len &lt;= ETH_HLEN))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -996,12 +760,29 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='ctx'> 	if (!wcid)</div><div class='ctx'> 		wcid = &amp;dev-&gt;mt76.global_wcid;</div><div class='ctx'> </div><div class='del'>-	mt7915_mac_write_txwi(dev, txwi_ptr, tx_info-&gt;skb, wcid, key,</div><div class='del'>-			      false);</div><div class='add'>+	if (sta) {</div><div class='add'>+		struct mt7915_sta *msta;</div><div class='add'>+</div><div class='add'>+		msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+		if (time_after(jiffies, msta-&gt;jiffies + HZ / 4)) {</div><div class='add'>+			info-&gt;flags |= IEEE80211_TX_CTL_REQ_TX_STATUS;</div><div class='add'>+			msta-&gt;jiffies = jiffies;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	cb-&gt;wcid = wcid-&gt;idx;</div><div class='add'>+	t = (struct mt76_txwi_cache *)(txwi + mdev-&gt;drv-&gt;txwi_size);</div><div class='add'>+	t-&gt;skb = tx_info-&gt;skb;</div><div class='ctx'> </div><div class='del'>-	txp = (struct mt7915_txp *)(txwi + MT_TXD_SIZE);</div><div class='add'>+	id = mt76_token_consume(mdev, &amp;t);</div><div class='add'>+	if (id &lt; 0)</div><div class='add'>+		return id;</div><div class='add'>+</div><div class='add'>+	pid = mt76_tx_status_skb_add(mdev, wcid, tx_info-&gt;skb);</div><div class='add'>+	mt7915_mac_write_txwi(mdev, txwi_ptr, tx_info-&gt;skb, wcid, pid, key,</div><div class='add'>+			      qid, 0);</div><div class='add'>+</div><div class='add'>+	txp = (struct mt76_connac_fw_txp *)(txwi + MT_TXD_SIZE);</div><div class='ctx'> 	for (i = 0; i &lt; nbuf; i++) {</div><div class='ctx'> 		txp-&gt;buf[i] = cpu_to_le32(tx_info-&gt;buf[i + 1].addr);</div><div class='ctx'> 		txp-&gt;len[i] = cpu_to_le16(tx_info-&gt;buf[i + 1].len);</div><div class='hunk'>@@ -1020,22 +801,15 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='ctx'> 	if (vif) {</div><div class='ctx'> 		struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='ctx'> </div><div class='del'>-		txp-&gt;bss_idx = mvif-&gt;idx;</div><div class='add'>+		txp-&gt;bss_idx = mvif-&gt;mt76.idx;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	t = (struct mt76_txwi_cache *)(txwi + mdev-&gt;drv-&gt;txwi_size);</div><div class='del'>-	t-&gt;skb = tx_info-&gt;skb;</div><div class='del'>-</div><div class='del'>-	id = mt76_token_consume(mdev, &amp;t);</div><div class='del'>-	if (id &lt; 0)</div><div class='del'>-		return id;</div><div class='del'>-</div><div class='ctx'> 	txp-&gt;token = cpu_to_le16(id);</div><div class='ctx'> 	if (test_bit(MT_WCID_FLAG_4ADDR, &amp;wcid-&gt;flags))</div><div class='ctx'> 		txp-&gt;rept_wds_wcid = cpu_to_le16(wcid-&gt;idx);</div><div class='ctx'> 	else</div><div class='ctx'> 		txp-&gt;rept_wds_wcid = cpu_to_le16(0x3ff);</div><div class='del'>-	tx_info-&gt;skb = DMA_DUMMY_DATA;</div><div class='add'>+	tx_info-&gt;skb = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* pass partial skb header to fw */</div><div class='ctx'> 	tx_info-&gt;buf[1].len = MT_CT_PARSE_LEN;</div><div class='hunk'>@@ -1045,231 +819,297 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7915_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi)</div><div class='add'>+u32 mt7915_wed_init_buf(void *ptr, dma_addr_t phys, int token_id)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_sta *msta;</div><div class='del'>-	u16 fc, tid;</div><div class='add'>+	struct mt76_connac_fw_txp *txp = ptr + MT_TXD_SIZE;</div><div class='add'>+	__le32 *txwi = ptr;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	if (!sta || !sta-&gt;ht_cap.ht_supported)</div><div class='del'>-		return;</div><div class='add'>+	memset(ptr, 0, MT_TXD_SIZE + sizeof(*txp));</div><div class='ctx'> </div><div class='del'>-	tid = FIELD_GET(MT_TXD1_TID, le32_to_cpu(txwi[1]));</div><div class='del'>-	if (tid &gt;= 6) /* skip VO queue */</div><div class='del'>-		return;</div><div class='add'>+	val = FIELD_PREP(MT_TXD0_TX_BYTES, MT_TXD_SIZE) |</div><div class='add'>+	      FIELD_PREP(MT_TXD0_PKT_FMT, MT_TX_TYPE_CT);</div><div class='add'>+	txwi[0] = cpu_to_le32(val);</div><div class='ctx'> </div><div class='del'>-	val = le32_to_cpu(txwi[2]);</div><div class='del'>-	fc = FIELD_GET(MT_TXD2_FRAME_TYPE, val) &lt;&lt; 2 |</div><div class='del'>-	     FIELD_GET(MT_TXD2_SUB_TYPE, val) &lt;&lt; 4;</div><div class='del'>-	if (unlikely(fc != (IEEE80211_FTYPE_DATA | IEEE80211_STYPE_QOS_DATA)))</div><div class='del'>-		return;</div><div class='add'>+	val = MT_TXD1_LONG_FORMAT |</div><div class='add'>+	      FIELD_PREP(MT_TXD1_HDR_FORMAT, MT_HDR_FORMAT_802_3);</div><div class='add'>+	txwi[1] = cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	txp-&gt;token = cpu_to_le16(token_id);</div><div class='add'>+	txp-&gt;nbuf = 1;</div><div class='add'>+	txp-&gt;buf[0] = cpu_to_le32(phys + MT_TXD_SIZE + sizeof(*txp));</div><div class='ctx'> </div><div class='del'>-	msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='del'>-	if (!test_and_set_bit(tid, &amp;msta-&gt;ampdu_state))</div><div class='del'>-		ieee80211_start_tx_ba_session(sta, tid, 0);</div><div class='add'>+	return MT_TXD_SIZE + sizeof(*txp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7915_tx_complete_status(struct mt76_dev *mdev, struct sk_buff *skb,</div><div class='del'>-			  struct ieee80211_sta *sta, u8 stat,</div><div class='del'>-			  struct list_head *free_list)</div><div class='add'>+mt7915_mac_tx_free_prepare(struct mt7915_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='del'>-	struct ieee80211_tx_status status = {</div><div class='del'>-		.sta = sta,</div><div class='del'>-		.info = info,</div><div class='del'>-		.skb = skb,</div><div class='del'>-		.free_list = free_list,</div><div class='del'>-	};</div><div class='del'>-	struct ieee80211_hw *hw;</div><div class='del'>-</div><div class='del'>-	if (sta) {</div><div class='del'>-		struct mt7915_sta *msta;</div><div class='del'>-</div><div class='del'>-		msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='del'>-		status.rate = &amp;msta-&gt;stats.tx_rate;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_NL80211_TESTMODE</div><div class='del'>-	if (mt76_is_testmode_skb(mdev, skb, &amp;hw)) {</div><div class='del'>-		struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='del'>-		struct ieee80211_vif *vif = phy-&gt;monitor_vif;</div><div class='del'>-		struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	struct mt76_phy *mphy_ext = mdev-&gt;phys[MT_BAND1];</div><div class='ctx'> </div><div class='del'>-		mt76_tx_complete_skb(mdev, mvif-&gt;sta.wcid.idx, skb);</div><div class='del'>-		return;</div><div class='add'>+	/* clean DMA queues and unmap buffers first */</div><div class='add'>+	mt76_queue_tx_cleanup(dev, dev-&gt;mphy.q_tx[MT_TXQ_PSD], false);</div><div class='add'>+	mt76_queue_tx_cleanup(dev, dev-&gt;mphy.q_tx[MT_TXQ_BE], false);</div><div class='add'>+	if (mphy_ext) {</div><div class='add'>+		mt76_queue_tx_cleanup(dev, mphy_ext-&gt;q_tx[MT_TXQ_PSD], false);</div><div class='add'>+		mt76_queue_tx_cleanup(dev, mphy_ext-&gt;q_tx[MT_TXQ_BE], false);</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	hw = mt76_tx_status_get_hw(mdev, skb);</div><div class='del'>-</div><div class='del'>-	if (info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU)</div><div class='del'>-		info-&gt;flags |= IEEE80211_TX_STAT_AMPDU;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (stat)</div><div class='del'>-		ieee80211_tx_info_clear_status(info);</div><div class='add'>+static void</div><div class='add'>+mt7915_mac_tx_free_done(struct mt7915_dev *dev,</div><div class='add'>+			struct list_head *free_list, bool wake)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb, *tmp;</div><div class='ctx'> </div><div class='del'>-	if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK))</div><div class='del'>-		info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='add'>+	mt7915_mac_sta_poll(dev);</div><div class='ctx'> </div><div class='del'>-	info-&gt;status.tx_time = 0;</div><div class='del'>-	ieee80211_tx_status_ext(hw, &amp;status);</div><div class='del'>-}</div><div class='add'>+	if (wake)</div><div class='add'>+		mt76_set_tx_blocked(&amp;dev-&gt;mt76, false);</div><div class='ctx'> </div><div class='del'>-void mt7915_txp_skb_unmap(struct mt76_dev *dev,</div><div class='del'>-			  struct mt76_txwi_cache *t)</div><div class='del'>-{</div><div class='del'>-	struct mt7915_txp *txp;</div><div class='del'>-	int i;</div><div class='add'>+	mt76_worker_schedule(&amp;dev-&gt;mt76.tx_worker);</div><div class='ctx'> </div><div class='del'>-	txp = mt7915_txwi_to_txp(dev, t);</div><div class='del'>-	for (i = 0; i &lt; txp-&gt;nbuf; i++)</div><div class='del'>-		dma_unmap_single(dev-&gt;dev, le32_to_cpu(txp-&gt;buf[i]),</div><div class='del'>-				 le16_to_cpu(txp-&gt;len[i]), DMA_TO_DEVICE);</div><div class='add'>+	list_for_each_entry_safe(skb, tmp, free_list, list) {</div><div class='add'>+		skb_list_del_init(skb);</div><div class='add'>+		napi_consume_skb(skb, 1);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt7915_mac_tx_free(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='add'>+static void</div><div class='add'>+mt7915_mac_tx_free(struct mt7915_dev *dev, void *data, int len)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_tx_free *free = (struct mt7915_tx_free *)skb-&gt;data;</div><div class='add'>+	struct mt76_connac_tx_free *free = data;</div><div class='add'>+	__le32 *tx_info = (__le32 *)(data + sizeof(*free));</div><div class='ctx'> 	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='del'>-	struct mt76_phy *mphy_ext = mdev-&gt;phy2;</div><div class='ctx'> 	struct mt76_txwi_cache *txwi;</div><div class='ctx'> 	struct ieee80211_sta *sta = NULL;</div><div class='add'>+	struct mt76_wcid *wcid = NULL;</div><div class='ctx'> 	LIST_HEAD(free_list);</div><div class='del'>-	struct sk_buff *tmp;</div><div class='del'>-	u8 i, count;</div><div class='del'>-	bool wake = false;</div><div class='add'>+	void *end = data + len;</div><div class='add'>+	bool v3, wake = false;</div><div class='add'>+	u16 total, count = 0;</div><div class='add'>+	u32 txd = le32_to_cpu(free-&gt;txd);</div><div class='add'>+	__le32 *cur_info;</div><div class='ctx'> </div><div class='del'>-	/* clean DMA queues and unmap buffers first */</div><div class='del'>-	mt76_queue_tx_cleanup(dev, dev-&gt;mphy.q_tx[MT_TXQ_PSD], false);</div><div class='del'>-	mt76_queue_tx_cleanup(dev, dev-&gt;mphy.q_tx[MT_TXQ_BE], false);</div><div class='del'>-	if (mphy_ext) {</div><div class='del'>-		mt76_queue_tx_cleanup(dev, mphy_ext-&gt;q_tx[MT_TXQ_PSD], false);</div><div class='del'>-		mt76_queue_tx_cleanup(dev, mphy_ext-&gt;q_tx[MT_TXQ_BE], false);</div><div class='del'>-	}</div><div class='add'>+	mt7915_mac_tx_free_prepare(dev);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * TODO: MT_TX_FREE_LATENCY is msdu time from the TXD is queued into PLE,</div><div class='del'>-	 * to the time ack is received or dropped by hw (air + hw queue time).</div><div class='del'>-	 * Should avoid accessing WTBL to get Tx airtime, and use it instead.</div><div class='del'>-	 */</div><div class='del'>-	count = FIELD_GET(MT_TX_FREE_MSDU_CNT, le16_to_cpu(free-&gt;ctrl));</div><div class='del'>-	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		u32 msdu, info = le32_to_cpu(free-&gt;info[i]);</div><div class='del'>-		u8 stat;</div><div class='add'>+	total = le16_get_bits(free-&gt;ctrl, MT_TX_FREE_MSDU_CNT);</div><div class='add'>+	v3 = (FIELD_GET(MT_TX_FREE_VER, txd) == 0x4);</div><div class='add'>+</div><div class='add'>+	for (cur_info = tx_info; count &lt; total; cur_info++) {</div><div class='add'>+		u32 msdu, info;</div><div class='add'>+		u8 i;</div><div class='add'>+</div><div class='add'>+		if (WARN_ON_ONCE((void *)cur_info &gt;= end))</div><div class='add'>+			return;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * 1'b1: new wcid pair.</div><div class='ctx'> 		 * 1'b0: msdu_id with the same 'wcid pair' as above.</div><div class='ctx'> 		 */</div><div class='add'>+		info = le32_to_cpu(*cur_info);</div><div class='ctx'> 		if (info &amp; MT_TX_FREE_PAIR) {</div><div class='ctx'> 			struct mt7915_sta *msta;</div><div class='del'>-			struct mt7915_phy *phy;</div><div class='del'>-			struct mt76_wcid *wcid;</div><div class='ctx'> 			u16 idx;</div><div class='ctx'> </div><div class='del'>-			count++;</div><div class='ctx'> 			idx = FIELD_GET(MT_TX_FREE_WLAN_ID, info);</div><div class='del'>-			wcid = rcu_dereference(dev-&gt;mt76.wcid[idx]);</div><div class='add'>+			wcid = mt76_wcid_ptr(dev, idx);</div><div class='ctx'> 			sta = wcid_to_sta(wcid);</div><div class='ctx'> 			if (!sta)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			msta = container_of(wcid, struct mt7915_sta, wcid);</div><div class='del'>-			phy = msta-&gt;vif-&gt;phy;</div><div class='del'>-			spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-			if (list_empty(&amp;msta-&gt;stats_list))</div><div class='del'>-				list_add_tail(&amp;msta-&gt;stats_list, &amp;phy-&gt;stats_list);</div><div class='del'>-			if (list_empty(&amp;msta-&gt;poll_list))</div><div class='del'>-				list_add_tail(&amp;msta-&gt;poll_list, &amp;dev-&gt;sta_poll_list);</div><div class='del'>-			spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+			mt76_wcid_add_poll(&amp;dev-&gt;mt76, &amp;msta-&gt;wcid);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		msdu = FIELD_GET(MT_TX_FREE_MSDU_ID, info);</div><div class='del'>-		stat = FIELD_GET(MT_TX_FREE_STATUS, info);</div><div class='add'>+		if (!mtk_wed_device_active(&amp;mdev-&gt;mmio.wed) &amp;&amp; wcid) {</div><div class='add'>+			u32 tx_retries = 0, tx_failed = 0;</div><div class='add'>+</div><div class='add'>+			if (v3 &amp;&amp; (info &amp; MT_TX_FREE_MPDU_HEADER_V3)) {</div><div class='add'>+				tx_retries =</div><div class='add'>+					FIELD_GET(MT_TX_FREE_COUNT_V3, info) - 1;</div><div class='add'>+				tx_failed = tx_retries +</div><div class='add'>+					!!FIELD_GET(MT_TX_FREE_STAT_V3, info);</div><div class='add'>+			} else if (!v3 &amp;&amp; (info &amp; MT_TX_FREE_MPDU_HEADER)) {</div><div class='add'>+				tx_retries =</div><div class='add'>+					FIELD_GET(MT_TX_FREE_COUNT, info) - 1;</div><div class='add'>+				tx_failed = tx_retries +</div><div class='add'>+					!!FIELD_GET(MT_TX_FREE_STAT, info);</div><div class='add'>+			}</div><div class='add'>+			wcid-&gt;stats.tx_retries += tx_retries;</div><div class='add'>+			wcid-&gt;stats.tx_failed += tx_failed;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		txwi = mt76_token_release(mdev, msdu, &amp;wake);</div><div class='del'>-		if (!txwi)</div><div class='add'>+		if (v3 &amp;&amp; (info &amp; MT_TX_FREE_MPDU_HEADER_V3))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		mt7915_txp_skb_unmap(mdev, txwi);</div><div class='del'>-		if (txwi-&gt;skb) {</div><div class='del'>-			struct ieee80211_tx_info *info = IEEE80211_SKB_CB(txwi-&gt;skb);</div><div class='del'>-			void *txwi_ptr = mt76_get_txwi_ptr(mdev, txwi);</div><div class='del'>-</div><div class='del'>-			if (likely(txwi-&gt;skb-&gt;protocol != cpu_to_be16(ETH_P_PAE)))</div><div class='del'>-				mt7915_tx_check_aggr(sta, txwi_ptr);</div><div class='del'>-</div><div class='del'>-			if (sta &amp;&amp; !info-&gt;tx_time_est) {</div><div class='del'>-				struct mt76_wcid *wcid = (struct mt76_wcid *)sta-&gt;drv_priv;</div><div class='del'>-				int pending;</div><div class='del'>-</div><div class='del'>-				pending = atomic_dec_return(&amp;wcid-&gt;non_aql_packets);</div><div class='del'>-				if (pending &lt; 0)</div><div class='del'>-					atomic_cmpxchg(&amp;wcid-&gt;non_aql_packets, pending, 0);</div><div class='add'>+		for (i = 0; i &lt; 1 + v3; i++) {</div><div class='add'>+			if (v3) {</div><div class='add'>+				msdu = (info &gt;&gt; (15 * i)) &amp; MT_TX_FREE_MSDU_ID_V3;</div><div class='add'>+				if (msdu == MT_TX_FREE_MSDU_ID_V3)</div><div class='add'>+					continue;</div><div class='add'>+			} else {</div><div class='add'>+				msdu = FIELD_GET(MT_TX_FREE_MSDU_ID, info);</div><div class='ctx'> 			}</div><div class='add'>+			count++;</div><div class='add'>+			txwi = mt76_token_release(mdev, msdu, &amp;wake);</div><div class='add'>+			if (!txwi)</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='del'>-			mt7915_tx_complete_status(mdev, txwi-&gt;skb, sta, stat, &amp;free_list);</div><div class='del'>-			txwi-&gt;skb = NULL;</div><div class='add'>+			mt76_connac2_txwi_free(mdev, txwi, sta, &amp;free_list);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		mt76_put_txwi(mdev, txwi);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mt7915_mac_sta_poll(dev);</div><div class='add'>+	mt7915_mac_tx_free_done(dev, &amp;free_list, wake);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (wake)</div><div class='del'>-		mt76_set_tx_blocked(&amp;dev-&gt;mt76, false);</div><div class='add'>+static void</div><div class='add'>+mt7915_mac_tx_free_v0(struct mt7915_dev *dev, void *data, int len)</div><div class='add'>+{</div><div class='add'>+	struct mt76_connac_tx_free *free = data;</div><div class='add'>+	__le16 *info = (__le16 *)(data + sizeof(*free));</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	void *end = data + len;</div><div class='add'>+	LIST_HEAD(free_list);</div><div class='add'>+	bool wake = false;</div><div class='add'>+	u8 i, count;</div><div class='ctx'> </div><div class='del'>-	mt76_worker_schedule(&amp;dev-&gt;mt76.tx_worker);</div><div class='add'>+	mt7915_mac_tx_free_prepare(dev);</div><div class='ctx'> </div><div class='del'>-	napi_consume_skb(skb, 1);</div><div class='add'>+	count = FIELD_GET(MT_TX_FREE_MSDU_CNT_V0, le16_to_cpu(free-&gt;ctrl));</div><div class='add'>+	if (WARN_ON_ONCE((void *)&amp;info[count] &gt; end))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_safe(skb, tmp, &amp;free_list, list) {</div><div class='del'>-		skb_list_del_init(skb);</div><div class='del'>-		napi_consume_skb(skb, 1);</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		struct mt76_txwi_cache *txwi;</div><div class='add'>+		u16 msdu = le16_to_cpu(info[i]);</div><div class='add'>+</div><div class='add'>+		txwi = mt76_token_release(mdev, msdu, &amp;wake);</div><div class='add'>+		if (!txwi)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mt76_connac2_txwi_free(mdev, txwi, NULL, &amp;free_list);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	mt7915_mac_tx_free_done(dev, &amp;free_list, wake);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt7915_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e)</div><div class='add'>+static void mt7915_mac_add_txs(struct mt7915_dev *dev, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_dev *dev;</div><div class='add'>+	struct mt7915_sta *msta = NULL;</div><div class='add'>+	struct mt76_wcid *wcid;</div><div class='add'>+	__le32 *txs_data = data;</div><div class='add'>+	u16 wcidx;</div><div class='add'>+	u8 pid;</div><div class='add'>+</div><div class='add'>+	wcidx = le32_get_bits(txs_data[2], MT_TXS2_WCID);</div><div class='add'>+	pid = le32_get_bits(txs_data[3], MT_TXS3_PID);</div><div class='ctx'> </div><div class='del'>-	if (!e-&gt;txwi) {</div><div class='del'>-		dev_kfree_skb_any(e-&gt;skb);</div><div class='add'>+	if (pid &lt; MT_PACKET_ID_WED)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	dev = container_of(mdev, struct mt7915_dev, mt76);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	wcid = mt76_wcid_ptr(dev, wcidx);</div><div class='add'>+	if (!wcid)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	/* error path */</div><div class='del'>-	if (e-&gt;skb == DMA_DUMMY_DATA) {</div><div class='del'>-		struct mt76_txwi_cache *t;</div><div class='del'>-		struct mt7915_txp *txp;</div><div class='add'>+	msta = container_of(wcid, struct mt7915_sta, wcid);</div><div class='add'>+</div><div class='add'>+	if (pid == MT_PACKET_ID_WED)</div><div class='add'>+		mt76_connac2_mac_fill_txs(&amp;dev-&gt;mt76, wcid, txs_data);</div><div class='add'>+	else</div><div class='add'>+		mt76_connac2_mac_add_txs_skb(&amp;dev-&gt;mt76, wcid, pid, txs_data);</div><div class='ctx'> </div><div class='del'>-		txp = mt7915_txwi_to_txp(mdev, e-&gt;txwi);</div><div class='del'>-		t = mt76_token_put(mdev, le16_to_cpu(txp-&gt;token));</div><div class='del'>-		e-&gt;skb = t ? t-&gt;skb : NULL;</div><div class='add'>+	if (!wcid-&gt;sta)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mt76_wcid_add_poll(&amp;dev-&gt;mt76, &amp;msta-&gt;wcid);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool mt7915_rx_check(struct mt76_dev *mdev, void *data, int len)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);</div><div class='add'>+	__le32 *rxd = (__le32 *)data;</div><div class='add'>+	__le32 *end = (__le32 *)&amp;rxd[len / 4];</div><div class='add'>+	enum rx_pkt_type type;</div><div class='add'>+</div><div class='add'>+	type = le32_get_bits(rxd[0], MT_RXD0_PKT_TYPE);</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case PKT_TYPE_TXRX_NOTIFY:</div><div class='add'>+		mt7915_mac_tx_free(dev, data, len);</div><div class='add'>+		return false;</div><div class='add'>+	case PKT_TYPE_TXRX_NOTIFY_V0:</div><div class='add'>+		mt7915_mac_tx_free_v0(dev, data, len);</div><div class='add'>+		return false;</div><div class='add'>+	case PKT_TYPE_TXS:</div><div class='add'>+		for (rxd += 2; rxd + 8 &lt;= end; rxd += 8)</div><div class='add'>+			mt7915_mac_add_txs(dev, rxd);</div><div class='add'>+		return false;</div><div class='add'>+	case PKT_TYPE_RX_FW_MONITOR:</div><div class='add'>+		mt7915_debugfs_rx_fw_monitor(dev, data, len);</div><div class='add'>+		return false;</div><div class='add'>+	default:</div><div class='add'>+		return true;</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;skb) {</div><div class='del'>-		struct mt76_tx_cb *cb = mt76_tx_skb_cb(e-&gt;skb);</div><div class='del'>-		struct mt76_wcid *wcid;</div><div class='add'>+void mt7915_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,</div><div class='add'>+			 struct sk_buff *skb, u32 *info)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);</div><div class='add'>+	__le32 *rxd = (__le32 *)skb-&gt;data;</div><div class='add'>+	__le32 *end = (__le32 *)&amp;skb-&gt;data[skb-&gt;len];</div><div class='add'>+	enum rx_pkt_type type;</div><div class='ctx'> </div><div class='del'>-		wcid = rcu_dereference(dev-&gt;mt76.wcid[cb-&gt;wcid]);</div><div class='add'>+	type = le32_get_bits(rxd[0], MT_RXD0_PKT_TYPE);</div><div class='ctx'> </div><div class='del'>-		mt7915_tx_complete_status(mdev, e-&gt;skb, wcid_to_sta(wcid), 0,</div><div class='del'>-					  NULL);</div><div class='add'>+	switch (type) {</div><div class='add'>+	case PKT_TYPE_TXRX_NOTIFY:</div><div class='add'>+		mt7915_mac_tx_free(dev, skb-&gt;data, skb-&gt;len);</div><div class='add'>+		napi_consume_skb(skb, 1);</div><div class='add'>+		break;</div><div class='add'>+	case PKT_TYPE_TXRX_NOTIFY_V0:</div><div class='add'>+		mt7915_mac_tx_free_v0(dev, skb-&gt;data, skb-&gt;len);</div><div class='add'>+		napi_consume_skb(skb, 1);</div><div class='add'>+		break;</div><div class='add'>+	case PKT_TYPE_RX_EVENT:</div><div class='add'>+		mt7915_mcu_rx_event(dev, skb);</div><div class='add'>+		break;</div><div class='add'>+	case PKT_TYPE_TXRXV:</div><div class='add'>+		mt7915_mac_fill_rx_vector(dev, skb);</div><div class='add'>+		break;</div><div class='add'>+	case PKT_TYPE_TXS:</div><div class='add'>+		for (rxd += 2; rxd + 8 &lt;= end; rxd += 8)</div><div class='add'>+			mt7915_mac_add_txs(dev, rxd);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		break;</div><div class='add'>+	case PKT_TYPE_RX_FW_MONITOR:</div><div class='add'>+		mt7915_debugfs_rx_fw_monitor(dev, skb-&gt;data, skb-&gt;len);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		break;</div><div class='add'>+	case PKT_TYPE_NORMAL:</div><div class='add'>+		if (!mt7915_mac_fill_rx(dev, skb, q, info)) {</div><div class='add'>+			mt76_rx(&amp;dev-&gt;mt76, q, skb);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt7915_mac_cca_stats_reset(struct mt7915_phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='del'>-	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='del'>-	u32 reg = MT_WF_PHY_RX_CTRL1(ext_phy);</div><div class='add'>+	u32 reg = MT_WF_PHY_RX_CTRL1(phy-&gt;mt76-&gt;band_idx);</div><div class='ctx'> </div><div class='ctx'> 	mt76_clear(dev, reg, MT_WF_PHY_RX_CTRL1_STSCNT_EN);</div><div class='ctx'> 	mt76_set(dev, reg, BIT(11) | BIT(9));</div><div class='hunk'>@@ -1278,66 +1118,45 @@ void mt7915_mac_cca_stats_reset(struct mt7915_phy *phy)</div><div class='ctx'> void mt7915_mac_reset_counters(struct mt7915_phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='del'>-	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		mt76_rr(dev, MT_TX_AGG_CNT(ext_phy, i));</div><div class='del'>-		mt76_rr(dev, MT_TX_AGG_CNT2(ext_phy, i));</div><div class='add'>+		mt76_rr(dev, MT_TX_AGG_CNT(phy-&gt;mt76-&gt;band_idx, i));</div><div class='add'>+		mt76_rr(dev, MT_TX_AGG_CNT2(phy-&gt;mt76-&gt;band_idx, i));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ext_phy) {</div><div class='del'>-		dev-&gt;mt76.phy2-&gt;survey_time = ktime_get_boottime();</div><div class='del'>-		i = ARRAY_SIZE(dev-&gt;mt76.aggr_stats) / 2;</div><div class='del'>-	} else {</div><div class='del'>-		dev-&gt;mt76.phy.survey_time = ktime_get_boottime();</div><div class='del'>-		i = 0;</div><div class='del'>-	}</div><div class='del'>-	memset(&amp;dev-&gt;mt76.aggr_stats[i], 0, sizeof(dev-&gt;mt76.aggr_stats) / 2);</div><div class='add'>+	phy-&gt;mt76-&gt;survey_time = ktime_get_boottime();</div><div class='add'>+	memset(phy-&gt;mt76-&gt;aggr_stats, 0, sizeof(phy-&gt;mt76-&gt;aggr_stats));</div><div class='ctx'> </div><div class='ctx'> 	/* reset airtime counters */</div><div class='del'>-	mt76_rr(dev, MT_MIB_SDR9(ext_phy));</div><div class='del'>-	mt76_rr(dev, MT_MIB_SDR36(ext_phy));</div><div class='del'>-	mt76_rr(dev, MT_MIB_SDR37(ext_phy));</div><div class='del'>-</div><div class='del'>-	mt76_set(dev, MT_WF_RMAC_MIB_TIME0(ext_phy),</div><div class='del'>-		 MT_WF_RMAC_MIB_RXTIME_CLR);</div><div class='del'>-	mt76_set(dev, MT_WF_RMAC_MIB_AIRTIME0(ext_phy),</div><div class='add'>+	mt76_set(dev, MT_WF_RMAC_MIB_AIRTIME0(phy-&gt;mt76-&gt;band_idx),</div><div class='ctx'> 		 MT_WF_RMAC_MIB_RXTIME_CLR);</div><div class='add'>+</div><div class='add'>+	mt7915_mcu_get_chan_mib_info(phy, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt7915_mac_set_timing(struct mt7915_phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	s16 coverage_class = phy-&gt;coverage_class;</div><div class='ctx'> 	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='del'>-	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='add'>+	struct mt7915_phy *ext_phy = mt7915_ext_phy(dev);</div><div class='ctx'> 	u32 val, reg_offset;</div><div class='ctx'> 	u32 cck = FIELD_PREP(MT_TIMEOUT_VAL_PLCP, 231) |</div><div class='ctx'> 		  FIELD_PREP(MT_TIMEOUT_VAL_CCA, 48);</div><div class='ctx'> 	u32 ofdm = FIELD_PREP(MT_TIMEOUT_VAL_PLCP, 60) |</div><div class='ctx'> 		   FIELD_PREP(MT_TIMEOUT_VAL_CCA, 28);</div><div class='del'>-	int sifs, offset;</div><div class='del'>-	bool is_5ghz = phy-&gt;mt76-&gt;chandef.chan-&gt;band == NL80211_BAND_5GHZ;</div><div class='add'>+	u8 band = phy-&gt;mt76-&gt;band_idx;</div><div class='add'>+	int eifs_ofdm = 84, sifs = 10, offset;</div><div class='add'>+	bool a_band = !(phy-&gt;mt76-&gt;chandef.chan-&gt;band == NL80211_BAND_2GHZ);</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(MT76_STATE_RUNNING, &amp;phy-&gt;mt76-&gt;state))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (is_5ghz)</div><div class='del'>-		sifs = 16;</div><div class='del'>-	else</div><div class='del'>-		sifs = 10;</div><div class='del'>-</div><div class='del'>-	if (ext_phy) {</div><div class='add'>+	if (ext_phy)</div><div class='ctx'> 		coverage_class = max_t(s16, dev-&gt;phy.coverage_class,</div><div class='del'>-				       coverage_class);</div><div class='del'>-	} else {</div><div class='del'>-		struct mt7915_phy *phy_ext = mt7915_ext_phy(dev);</div><div class='add'>+				       ext_phy-&gt;coverage_class);</div><div class='ctx'> </div><div class='del'>-		if (phy_ext)</div><div class='del'>-			coverage_class = max_t(s16, phy_ext-&gt;coverage_class,</div><div class='del'>-					       coverage_class);</div><div class='del'>-	}</div><div class='del'>-	mt76_set(dev, MT_ARB_SCR(ext_phy),</div><div class='add'>+	mt76_set(dev, MT_ARB_SCR(band),</div><div class='ctx'> 		 MT_ARB_SCR_TX_DISABLE | MT_ARB_SCR_RX_DISABLE);</div><div class='ctx'> 	udelay(1);</div><div class='ctx'> </div><div class='hunk'>@@ -1345,32 +1164,49 @@ void mt7915_mac_set_timing(struct mt7915_phy *phy)</div><div class='ctx'> 	reg_offset = FIELD_PREP(MT_TIMEOUT_VAL_PLCP, offset) |</div><div class='ctx'> 		     FIELD_PREP(MT_TIMEOUT_VAL_CCA, offset);</div><div class='ctx'> </div><div class='del'>-	mt76_wr(dev, MT_TMAC_CDTR(ext_phy), cck + reg_offset);</div><div class='del'>-	mt76_wr(dev, MT_TMAC_ODTR(ext_phy), ofdm + reg_offset);</div><div class='del'>-	mt76_wr(dev, MT_TMAC_ICR0(ext_phy),</div><div class='del'>-		FIELD_PREP(MT_IFS_EIFS, 360) |</div><div class='add'>+	if (!is_mt7915(&amp;dev-&gt;mt76)) {</div><div class='add'>+		if (!a_band) {</div><div class='add'>+			mt76_wr(dev, MT_TMAC_ICR1(band),</div><div class='add'>+				FIELD_PREP(MT_IFS_EIFS_CCK, 314));</div><div class='add'>+			eifs_ofdm = 78;</div><div class='add'>+		} else {</div><div class='add'>+			eifs_ofdm = 84;</div><div class='add'>+		}</div><div class='add'>+	} else if (a_band) {</div><div class='add'>+		sifs = 16;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_TMAC_CDTR(band), cck + reg_offset);</div><div class='add'>+	mt76_wr(dev, MT_TMAC_ODTR(band), ofdm + reg_offset);</div><div class='add'>+	mt76_wr(dev, MT_TMAC_ICR0(band),</div><div class='add'>+		FIELD_PREP(MT_IFS_EIFS_OFDM, eifs_ofdm) |</div><div class='ctx'> 		FIELD_PREP(MT_IFS_RIFS, 2) |</div><div class='ctx'> 		FIELD_PREP(MT_IFS_SIFS, sifs) |</div><div class='ctx'> 		FIELD_PREP(MT_IFS_SLOT, phy-&gt;slottime));</div><div class='ctx'> </div><div class='del'>-	if (phy-&gt;slottime &lt; 20 || is_5ghz)</div><div class='add'>+	if (phy-&gt;slottime &lt; 20 || a_band)</div><div class='ctx'> 		val = MT7915_CFEND_RATE_DEFAULT;</div><div class='ctx'> 	else</div><div class='ctx'> 		val = MT7915_CFEND_RATE_11B;</div><div class='ctx'> </div><div class='del'>-	mt76_rmw_field(dev, MT_AGG_ACR0(ext_phy), MT_AGG_ACR_CFEND_RATE, val);</div><div class='del'>-	mt76_clear(dev, MT_ARB_SCR(ext_phy),</div><div class='add'>+	mt76_rmw_field(dev, MT_AGG_ACR0(band), MT_AGG_ACR_CFEND_RATE, val);</div><div class='add'>+	mt76_clear(dev, MT_ARB_SCR(band),</div><div class='ctx'> 		   MT_ARB_SCR_TX_DISABLE | MT_ARB_SCR_RX_DISABLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt7915_mac_enable_nf(struct mt7915_dev *dev, bool ext_phy)</div><div class='add'>+void mt7915_mac_enable_nf(struct mt7915_dev *dev, bool band)</div><div class='ctx'> {</div><div class='del'>-	mt76_set(dev, MT_WF_PHY_RXTD12(ext_phy),</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	reg = is_mt7915(&amp;dev-&gt;mt76) ? MT_WF_PHY_RXTD12(band) :</div><div class='add'>+				      MT_WF_PHY_RXTD12_MT7916(band);</div><div class='add'>+	mt76_set(dev, reg,</div><div class='ctx'> 		 MT_WF_PHY_RXTD12_IRPI_SW_CLR_ONLY |</div><div class='ctx'> 		 MT_WF_PHY_RXTD12_IRPI_SW_CLR);</div><div class='ctx'> </div><div class='del'>-	mt76_set(dev, MT_WF_PHY_RX_CTRL1(ext_phy),</div><div class='del'>-		 FIELD_PREP(MT_WF_PHY_RX_CTRL1_IPI_EN, 0x5));</div><div class='add'>+	reg = is_mt7915(&amp;dev-&gt;mt76) ? MT_WF_PHY_RX_CTRL1(band) :</div><div class='add'>+				      MT_WF_PHY_RX_CTRL1_MT7916(band);</div><div class='add'>+	mt76_set(dev, reg, FIELD_PREP(MT_WF_PHY_RX_CTRL1_IPI_EN, 0x5));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u8</div><div class='hunk'>@@ -1382,7 +1218,9 @@ mt7915_phy_get_nf(struct mt7915_phy *phy, int idx)</div><div class='ctx'> 	int nss, i;</div><div class='ctx'> </div><div class='ctx'> 	for (nss = 0; nss &lt; hweight8(phy-&gt;mt76-&gt;chainmask); nss++) {</div><div class='del'>-		u32 reg = MT_WF_IRPI(nss + (idx &lt;&lt; dev-&gt;dbdc_support));</div><div class='add'>+		u32 reg = is_mt7915(&amp;dev-&gt;mt76) ?</div><div class='add'>+			MT_WF_IRPI_NSS(0, nss + (idx &lt;&lt; dev-&gt;dbdc_support)) :</div><div class='add'>+			MT_WF_IRPI_NSS_MT7916(idx, nss);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(nf_power); i++, reg += 4) {</div><div class='ctx'> 			val = mt76_rr(dev, reg);</div><div class='hunk'>@@ -1397,60 +1235,30 @@ mt7915_phy_get_nf(struct mt7915_phy *phy, int idx)</div><div class='ctx'> 	return sum / n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7915_phy_update_channel(struct mt76_phy *mphy, int idx)</div><div class='add'>+void mt7915_update_channel(struct mt76_phy *mphy)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_dev *dev = container_of(mphy-&gt;dev, struct mt7915_dev, mt76);</div><div class='del'>-	struct mt7915_phy *phy = (struct mt7915_phy *)mphy-&gt;priv;</div><div class='del'>-	struct mt76_channel_state *state;</div><div class='del'>-	u64 busy_time, tx_time, rx_time, obss_time;</div><div class='add'>+	struct mt7915_phy *phy = mphy-&gt;priv;</div><div class='add'>+	struct mt76_channel_state *state = mphy-&gt;chan_state;</div><div class='ctx'> 	int nf;</div><div class='ctx'> </div><div class='del'>-	busy_time = mt76_get_field(dev, MT_MIB_SDR9(idx),</div><div class='del'>-				   MT_MIB_SDR9_BUSY_MASK);</div><div class='del'>-	tx_time = mt76_get_field(dev, MT_MIB_SDR36(idx),</div><div class='del'>-				 MT_MIB_SDR36_TXTIME_MASK);</div><div class='del'>-	rx_time = mt76_get_field(dev, MT_MIB_SDR37(idx),</div><div class='del'>-				 MT_MIB_SDR37_RXTIME_MASK);</div><div class='del'>-	obss_time = mt76_get_field(dev, MT_WF_RMAC_MIB_AIRTIME14(idx),</div><div class='del'>-				   MT_MIB_OBSSTIME_MASK);</div><div class='add'>+	mt7915_mcu_get_chan_mib_info(phy, false);</div><div class='ctx'> </div><div class='del'>-	nf = mt7915_phy_get_nf(phy, idx);</div><div class='add'>+	nf = mt7915_phy_get_nf(phy, phy-&gt;mt76-&gt;band_idx);</div><div class='ctx'> 	if (!phy-&gt;noise)</div><div class='ctx'> 		phy-&gt;noise = nf &lt;&lt; 4;</div><div class='ctx'> 	else if (nf)</div><div class='ctx'> 		phy-&gt;noise += nf - (phy-&gt;noise &gt;&gt; 4);</div><div class='ctx'> </div><div class='del'>-	state = mphy-&gt;chan_state;</div><div class='del'>-	state-&gt;cc_busy += busy_time;</div><div class='del'>-	state-&gt;cc_tx += tx_time;</div><div class='del'>-	state-&gt;cc_rx += rx_time + obss_time;</div><div class='del'>-	state-&gt;cc_bss_rx += rx_time;</div><div class='ctx'> 	state-&gt;noise = -(phy-&gt;noise &gt;&gt; 4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt7915_update_channel(struct mt76_dev *mdev)</div><div class='del'>-{</div><div class='del'>-	struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);</div><div class='del'>-</div><div class='del'>-	mt7915_phy_update_channel(&amp;mdev-&gt;phy, 0);</div><div class='del'>-	if (mdev-&gt;phy2)</div><div class='del'>-		mt7915_phy_update_channel(mdev-&gt;phy2, 1);</div><div class='del'>-</div><div class='del'>-	/* reset obss airtime */</div><div class='del'>-	mt76_set(dev, MT_WF_RMAC_MIB_TIME0(0), MT_WF_RMAC_MIB_RXTIME_CLR);</div><div class='del'>-	if (mdev-&gt;phy2)</div><div class='del'>-		mt76_set(dev, MT_WF_RMAC_MIB_TIME0(1),</div><div class='del'>-			 MT_WF_RMAC_MIB_RXTIME_CLR);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool</div><div class='ctx'> mt7915_wait_reset_state(struct mt7915_dev *dev, u32 state)</div><div class='ctx'> {</div><div class='ctx'> 	bool ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = wait_event_timeout(dev-&gt;reset_wait,</div><div class='del'>-				 (READ_ONCE(dev-&gt;reset_state) &amp; state),</div><div class='add'>+				 (READ_ONCE(dev-&gt;recovery.state) &amp; state),</div><div class='ctx'> 				 MT7915_RESET_TIMEOUT);</div><div class='ctx'> </div><div class='ctx'> 	WARN(!ret, "Timeout waiting for MCU reset state %x\n", state);</div><div class='hunk'>@@ -1466,7 +1274,8 @@ mt7915_update_vif_beacon(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='ctx'> 	case NL80211_IFTYPE_MESH_POINT:</div><div class='ctx'> 	case NL80211_IFTYPE_ADHOC:</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='del'>-		mt7915_mcu_add_beacon(hw, vif, vif-&gt;bss_conf.enable_beacon);</div><div class='add'>+		mt7915_mcu_add_beacon(hw, vif, vif-&gt;bss_conf.enable_beacon,</div><div class='add'>+				      BSS_CHANGED_BEACON_ENABLED);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1476,90 +1285,201 @@ mt7915_update_vif_beacon(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='ctx'> static void</div><div class='ctx'> mt7915_update_beacons(struct mt7915_dev *dev)</div><div class='ctx'> {</div><div class='add'>+	struct mt76_phy *mphy_ext = dev-&gt;mt76.phys[MT_BAND1];</div><div class='add'>+</div><div class='ctx'> 	ieee80211_iterate_active_interfaces(dev-&gt;mt76.hw,</div><div class='ctx'> 		IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='ctx'> 		mt7915_update_vif_beacon, dev-&gt;mt76.hw);</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;mt76.phy2)</div><div class='add'>+	if (!mphy_ext)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ieee80211_iterate_active_interfaces(dev-&gt;mt76.phy2-&gt;hw,</div><div class='add'>+	ieee80211_iterate_active_interfaces(mphy_ext-&gt;hw,</div><div class='ctx'> 		IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='del'>-		mt7915_update_vif_beacon, dev-&gt;mt76.phy2-&gt;hw);</div><div class='add'>+		mt7915_update_vif_beacon, mphy_ext-&gt;hw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7915_dma_reset(struct mt7915_dev *dev)</div><div class='add'>+static int</div><div class='add'>+mt7915_mac_restart(struct mt7915_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_phy *mphy_ext = dev-&gt;mt76.phy2;</div><div class='del'>-	u32 hif1_ofs = MT_WFDMA1_PCIE1_BASE - MT_WFDMA1_BASE;</div><div class='del'>-	int i;</div><div class='add'>+	struct mt7915_phy *phy2;</div><div class='add'>+	struct mt76_phy *ext_phy;</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	ext_phy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='add'>+	phy2 = ext_phy ? ext_phy-&gt;priv : NULL;</div><div class='ctx'> </div><div class='del'>-	mt76_clear(dev, MT_WFDMA0_GLO_CFG,</div><div class='del'>-		   MT_WFDMA0_GLO_CFG_TX_DMA_EN | MT_WFDMA0_GLO_CFG_RX_DMA_EN);</div><div class='del'>-	mt76_clear(dev, MT_WFDMA1_GLO_CFG,</div><div class='del'>-		   MT_WFDMA1_GLO_CFG_TX_DMA_EN | MT_WFDMA1_GLO_CFG_RX_DMA_EN);</div><div class='ctx'> 	if (dev-&gt;hif2) {</div><div class='del'>-		mt76_clear(dev, MT_WFDMA0_GLO_CFG + hif1_ofs,</div><div class='del'>-			   (MT_WFDMA0_GLO_CFG_TX_DMA_EN |</div><div class='del'>-			    MT_WFDMA0_GLO_CFG_RX_DMA_EN));</div><div class='del'>-		mt76_clear(dev, MT_WFDMA1_GLO_CFG + hif1_ofs,</div><div class='del'>-			   (MT_WFDMA1_GLO_CFG_TX_DMA_EN |</div><div class='del'>-			    MT_WFDMA1_GLO_CFG_RX_DMA_EN));</div><div class='add'>+		mt76_wr(dev, MT_INT1_MASK_CSR, 0x0);</div><div class='add'>+		mt76_wr(dev, MT_INT1_SOURCE_CSR, ~0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	usleep_range(1000, 2000);</div><div class='add'>+	if (dev_is_pci(mdev-&gt;dev)) {</div><div class='add'>+		mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0x0);</div><div class='add'>+		if (dev-&gt;hif2) {</div><div class='add'>+			if (is_mt7915(mdev))</div><div class='add'>+				mt76_wr(dev, MT_PCIE1_MAC_INT_ENABLE, 0x0);</div><div class='add'>+			else</div><div class='add'>+				mt76_wr(dev, MT_PCIE1_MAC_INT_ENABLE_MT7916, 0x0);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; __MT_TXQ_MAX; i++) {</div><div class='del'>-		mt76_queue_tx_cleanup(dev, dev-&gt;mphy.q_tx[i], true);</div><div class='del'>-		if (mphy_ext)</div><div class='del'>-			mt76_queue_tx_cleanup(dev, mphy_ext-&gt;q_tx[i], true);</div><div class='add'>+	set_bit(MT76_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+	set_bit(MT76_MCU_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+	wake_up(&amp;dev-&gt;mt76.mcu.wait);</div><div class='add'>+	if (ext_phy)</div><div class='add'>+		set_bit(MT76_RESET, &amp;ext_phy-&gt;state);</div><div class='add'>+</div><div class='add'>+	/* lock/unlock all queues to ensure that no tx is pending */</div><div class='add'>+	mt76_txq_schedule_all(&amp;dev-&gt;mphy);</div><div class='add'>+	if (ext_phy)</div><div class='add'>+		mt76_txq_schedule_all(ext_phy);</div><div class='add'>+</div><div class='add'>+	/* disable all tx/rx napi */</div><div class='add'>+	mt76_worker_disable(&amp;dev-&gt;mt76.tx_worker);</div><div class='add'>+	mt76_for_each_q_rx(mdev, i) {</div><div class='add'>+		if (mdev-&gt;q_rx[i].ndesc)</div><div class='add'>+			napi_disable(&amp;dev-&gt;mt76.napi[i]);</div><div class='ctx'> 	}</div><div class='add'>+	napi_disable(&amp;dev-&gt;mt76.tx_napi);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; __MT_MCUQ_MAX; i++)</div><div class='del'>-		mt76_queue_tx_cleanup(dev, dev-&gt;mt76.q_mcu[i], true);</div><div class='add'>+	/* token reinit */</div><div class='add'>+	mt76_connac2_tx_token_put(&amp;dev-&gt;mt76);</div><div class='add'>+	idr_init(&amp;dev-&gt;mt76.token);</div><div class='ctx'> </div><div class='del'>-	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i)</div><div class='del'>-		mt76_queue_rx_reset(dev, i);</div><div class='add'>+	mt7915_dma_reset(dev, true);</div><div class='ctx'> </div><div class='del'>-	mt76_tx_status_check(&amp;dev-&gt;mt76, NULL, true);</div><div class='add'>+	mt76_for_each_q_rx(mdev, i) {</div><div class='add'>+		if (mdev-&gt;q_rx[i].ndesc) {</div><div class='add'>+			napi_enable(&amp;dev-&gt;mt76.napi[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	mt76_for_each_q_rx(mdev, i) {</div><div class='add'>+		if (mdev-&gt;q_rx[i].ndesc) {</div><div class='add'>+			napi_schedule(&amp;dev-&gt;mt76.napi[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	local_bh_enable();</div><div class='add'>+	clear_bit(MT76_MCU_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+	clear_bit(MT76_STATE_MCU_RUNNING, &amp;dev-&gt;mphy.state);</div><div class='ctx'> </div><div class='del'>-	/* re-init prefetch settings after reset */</div><div class='del'>-	mt7915_dma_prefetch(dev);</div><div class='add'>+	mt76_wr(dev, MT_INT_MASK_CSR, dev-&gt;mt76.mmio.irqmask);</div><div class='add'>+	mt76_wr(dev, MT_INT_SOURCE_CSR, ~0);</div><div class='ctx'> </div><div class='del'>-	mt76_set(dev, MT_WFDMA0_GLO_CFG,</div><div class='del'>-		 MT_WFDMA0_GLO_CFG_TX_DMA_EN | MT_WFDMA0_GLO_CFG_RX_DMA_EN);</div><div class='del'>-	mt76_set(dev, MT_WFDMA1_GLO_CFG,</div><div class='del'>-		 MT_WFDMA1_GLO_CFG_TX_DMA_EN | MT_WFDMA1_GLO_CFG_RX_DMA_EN);</div><div class='ctx'> 	if (dev-&gt;hif2) {</div><div class='del'>-		mt76_set(dev, MT_WFDMA0_GLO_CFG + hif1_ofs,</div><div class='del'>-			(MT_WFDMA0_GLO_CFG_TX_DMA_EN |</div><div class='del'>-			 MT_WFDMA0_GLO_CFG_RX_DMA_EN));</div><div class='del'>-		mt76_set(dev, MT_WFDMA1_GLO_CFG + hif1_ofs,</div><div class='del'>-			(MT_WFDMA1_GLO_CFG_TX_DMA_EN |</div><div class='del'>-			 MT_WFDMA1_GLO_CFG_RX_DMA_EN));</div><div class='add'>+		mt76_wr(dev, MT_INT1_MASK_CSR, dev-&gt;mt76.mmio.irqmask);</div><div class='add'>+		mt76_wr(dev, MT_INT1_SOURCE_CSR, ~0);</div><div class='ctx'> 	}</div><div class='add'>+	if (dev_is_pci(mdev-&gt;dev)) {</div><div class='add'>+		mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff);</div><div class='add'>+		if (dev-&gt;hif2) {</div><div class='add'>+			mt76_wr(dev, MT_PCIE_RECOG_ID,</div><div class='add'>+				dev-&gt;hif2-&gt;index | MT_PCIE_RECOG_ID_SEM);</div><div class='add'>+			if (is_mt7915(mdev))</div><div class='add'>+				mt76_wr(dev, MT_PCIE1_MAC_INT_ENABLE, 0xff);</div><div class='add'>+			else</div><div class='add'>+				mt76_wr(dev, MT_PCIE1_MAC_INT_ENABLE_MT7916, 0xff);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* load firmware */</div><div class='add'>+	ret = mt7915_mcu_init_firmware(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* set the necessary init items */</div><div class='add'>+	ret = mt7915_mcu_set_eeprom(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mt7915_mac_init(dev);</div><div class='add'>+	mt7915_init_txpower(&amp;dev-&gt;phy);</div><div class='add'>+	mt7915_init_txpower(phy2);</div><div class='add'>+	ret = mt7915_txbf_init(dev);</div><div class='add'>+</div><div class='add'>+	if (test_bit(MT76_STATE_RUNNING, &amp;dev-&gt;mphy.state)) {</div><div class='add'>+		ret = mt7915_run(dev-&gt;mphy.hw);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ext_phy &amp;&amp; test_bit(MT76_STATE_RUNNING, &amp;ext_phy-&gt;state)) {</div><div class='add'>+		ret = mt7915_run(ext_phy-&gt;hw);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	/* reset done */</div><div class='add'>+	clear_bit(MT76_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+	if (phy2)</div><div class='add'>+		clear_bit(MT76_RESET, &amp;phy2-&gt;mt76-&gt;state);</div><div class='add'>+</div><div class='add'>+	napi_enable(&amp;dev-&gt;mt76.tx_napi);</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	napi_schedule(&amp;dev-&gt;mt76.tx_napi);</div><div class='add'>+	local_bh_enable();</div><div class='add'>+</div><div class='add'>+	mt76_worker_enable(&amp;dev-&gt;mt76.tx_worker);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt7915_tx_token_put(struct mt7915_dev *dev)</div><div class='add'>+static void</div><div class='add'>+mt7915_mac_full_reset(struct mt7915_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_txwi_cache *txwi;</div><div class='del'>-	int id;</div><div class='add'>+	struct mt76_phy *ext_phy;</div><div class='add'>+	struct mt7915_phy *phy2;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;dev-&gt;mt76.token_lock);</div><div class='del'>-	idr_for_each_entry(&amp;dev-&gt;mt76.token, txwi, id) {</div><div class='del'>-		mt7915_txp_skb_unmap(&amp;dev-&gt;mt76, txwi);</div><div class='del'>-		if (txwi-&gt;skb) {</div><div class='del'>-			struct ieee80211_hw *hw;</div><div class='add'>+	ext_phy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='add'>+	phy2 = ext_phy ? ext_phy-&gt;priv : NULL;</div><div class='ctx'> </div><div class='del'>-			hw = mt76_tx_status_get_hw(&amp;dev-&gt;mt76, txwi-&gt;skb);</div><div class='del'>-			ieee80211_free_txskb(hw, txwi-&gt;skb);</div><div class='del'>-		}</div><div class='del'>-		mt76_put_txwi(&amp;dev-&gt;mt76, txwi);</div><div class='del'>-		dev-&gt;mt76.token_count--;</div><div class='add'>+	dev-&gt;recovery.hw_full_reset = true;</div><div class='add'>+</div><div class='add'>+	set_bit(MT76_MCU_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+	wake_up(&amp;dev-&gt;mt76.mcu.wait);</div><div class='add'>+	ieee80211_stop_queues(mt76_hw(dev));</div><div class='add'>+	if (ext_phy)</div><div class='add'>+		ieee80211_stop_queues(ext_phy-&gt;hw);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;dev-&gt;mphy.mac_work);</div><div class='add'>+	if (ext_phy)</div><div class='add'>+		cancel_delayed_work_sync(&amp;ext_phy-&gt;mac_work);</div><div class='add'>+</div><div class='add'>+	mt76_abort_scan(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		if (!mt7915_mac_restart(dev))</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;dev-&gt;mt76.token_lock);</div><div class='del'>-	idr_destroy(&amp;dev-&gt;mt76.token);</div><div class='add'>+</div><div class='add'>+	if (i == 10)</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "chip full reset failed\n");</div><div class='add'>+</div><div class='add'>+	dev-&gt;phy.omac_mask = 0;</div><div class='add'>+	if (phy2)</div><div class='add'>+		phy2-&gt;omac_mask = 0;</div><div class='add'>+</div><div class='add'>+	mt76_reset_device(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev-&gt;sta_rc_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev-&gt;twt_list);</div><div class='add'>+</div><div class='add'>+	i = mt76_wcid_alloc(dev-&gt;mt76.wcid_mask, MT7915_WTBL_STA);</div><div class='add'>+	dev-&gt;mt76.global_wcid.idx = i;</div><div class='add'>+	dev-&gt;recovery.hw_full_reset = false;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	ieee80211_restart_hw(mt76_hw(dev));</div><div class='add'>+	if (ext_phy)</div><div class='add'>+		ieee80211_restart_hw(ext_phy-&gt;hw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* system error recovery */</div><div class='hunk'>@@ -1568,12 +1488,39 @@ void mt7915_mac_reset_work(struct work_struct *work)</div><div class='ctx'> 	struct mt7915_phy *phy2;</div><div class='ctx'> 	struct mt76_phy *ext_phy;</div><div class='ctx'> 	struct mt7915_dev *dev;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	dev = container_of(work, struct mt7915_dev, reset_work);</div><div class='del'>-	ext_phy = dev-&gt;mt76.phy2;</div><div class='add'>+	ext_phy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='ctx'> 	phy2 = ext_phy ? ext_phy-&gt;priv : NULL;</div><div class='ctx'> </div><div class='del'>-	if (!(READ_ONCE(dev-&gt;reset_state) &amp; MT_MCU_CMD_STOP_DMA))</div><div class='add'>+	/* chip full reset */</div><div class='add'>+	if (dev-&gt;recovery.restart) {</div><div class='add'>+		/* disable WA/WM WDT */</div><div class='add'>+		mt76_clear(dev, MT_WFDMA0_MCU_HOST_INT_ENA,</div><div class='add'>+			   MT_MCU_CMD_WDT_MASK);</div><div class='add'>+</div><div class='add'>+		if (READ_ONCE(dev-&gt;recovery.state) &amp; MT_MCU_CMD_WA_WDT)</div><div class='add'>+			dev-&gt;recovery.wa_reset_count++;</div><div class='add'>+		else</div><div class='add'>+			dev-&gt;recovery.wm_reset_count++;</div><div class='add'>+</div><div class='add'>+		mt7915_mac_full_reset(dev);</div><div class='add'>+</div><div class='add'>+		/* enable mcu irq */</div><div class='add'>+		mt7915_irq_enable(dev, MT_INT_MCU_CMD);</div><div class='add'>+		mt7915_irq_disable(dev, 0);</div><div class='add'>+</div><div class='add'>+		/* enable WA/WM WDT */</div><div class='add'>+		mt76_set(dev, MT_WFDMA0_MCU_HOST_INT_ENA, MT_MCU_CMD_WDT_MASK);</div><div class='add'>+</div><div class='add'>+		dev-&gt;recovery.state = MT_MCU_CMD_NORMAL_STATE;</div><div class='add'>+		dev-&gt;recovery.restart = false;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* chip partial reset */</div><div class='add'>+	if (!(READ_ONCE(dev-&gt;recovery.state) &amp; MT_MCU_CMD_STOP_DMA))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_stop_queues(mt76_hw(dev));</div><div class='hunk'>@@ -1588,56 +1535,64 @@ void mt7915_mac_reset_work(struct work_struct *work)</div><div class='ctx'> 		set_bit(MT76_RESET, &amp;phy2-&gt;mt76-&gt;state);</div><div class='ctx'> 		cancel_delayed_work_sync(&amp;phy2-&gt;mt76-&gt;mac_work);</div><div class='ctx'> 	}</div><div class='del'>-	/* lock/unlock all queues to ensure that no tx is pending */</div><div class='del'>-	mt76_txq_schedule_all(&amp;dev-&gt;mphy);</div><div class='del'>-	if (ext_phy)</div><div class='del'>-		mt76_txq_schedule_all(ext_phy);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='ctx'> 	mt76_worker_disable(&amp;dev-&gt;mt76.tx_worker);</div><div class='del'>-	napi_disable(&amp;dev-&gt;mt76.napi[0]);</div><div class='del'>-	napi_disable(&amp;dev-&gt;mt76.napi[1]);</div><div class='del'>-	napi_disable(&amp;dev-&gt;mt76.napi[2]);</div><div class='add'>+	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i)</div><div class='add'>+		napi_disable(&amp;dev-&gt;mt76.napi[i]);</div><div class='ctx'> 	napi_disable(&amp;dev-&gt;mt76.tx_napi);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	if (mtk_wed_device_active(&amp;dev-&gt;mt76.mmio.wed))</div><div class='add'>+		mtk_wed_device_stop(&amp;dev-&gt;mt76.mmio.wed);</div><div class='ctx'> </div><div class='ctx'> 	mt76_wr(dev, MT_MCU_INT_EVENT, MT_MCU_INT_EVENT_DMA_STOPPED);</div><div class='ctx'> </div><div class='ctx'> 	if (mt7915_wait_reset_state(dev, MT_MCU_CMD_RESET_DONE)) {</div><div class='del'>-		mt7915_dma_reset(dev);</div><div class='add'>+		mt7915_dma_reset(dev, false);</div><div class='ctx'> </div><div class='del'>-		mt7915_tx_token_put(dev);</div><div class='add'>+		mt76_connac2_tx_token_put(&amp;dev-&gt;mt76);</div><div class='ctx'> 		idr_init(&amp;dev-&gt;mt76.token);</div><div class='ctx'> </div><div class='ctx'> 		mt76_wr(dev, MT_MCU_INT_EVENT, MT_MCU_INT_EVENT_DMA_INIT);</div><div class='ctx'> 		mt7915_wait_reset_state(dev, MT_MCU_CMD_RECOVERY_DONE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mt76_wr(dev, MT_MCU_INT_EVENT, MT_MCU_INT_EVENT_RESET_DONE);</div><div class='add'>+	mt7915_wait_reset_state(dev, MT_MCU_CMD_NORMAL_STATE);</div><div class='add'>+</div><div class='add'>+	/* enable DMA Tx/Rx and interrupt */</div><div class='add'>+	mt7915_dma_start(dev, false, false);</div><div class='add'>+</div><div class='ctx'> 	clear_bit(MT76_MCU_RESET, &amp;dev-&gt;mphy.state);</div><div class='ctx'> 	clear_bit(MT76_RESET, &amp;dev-&gt;mphy.state);</div><div class='ctx'> 	if (phy2)</div><div class='ctx'> 		clear_bit(MT76_RESET, &amp;phy2-&gt;mt76-&gt;state);</div><div class='ctx'> </div><div class='del'>-	mt76_worker_enable(&amp;dev-&gt;mt76.tx_worker);</div><div class='del'>-	napi_enable(&amp;dev-&gt;mt76.tx_napi);</div><div class='del'>-	napi_schedule(&amp;dev-&gt;mt76.tx_napi);</div><div class='add'>+	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i) {</div><div class='add'>+		napi_enable(&amp;dev-&gt;mt76.napi[i]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	napi_enable(&amp;dev-&gt;mt76.napi[0]);</div><div class='del'>-	napi_schedule(&amp;dev-&gt;mt76.napi[0]);</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i) {</div><div class='add'>+		napi_schedule(&amp;dev-&gt;mt76.napi[i]);</div><div class='add'>+	}</div><div class='add'>+	local_bh_enable();</div><div class='ctx'> </div><div class='del'>-	napi_enable(&amp;dev-&gt;mt76.napi[1]);</div><div class='del'>-	napi_schedule(&amp;dev-&gt;mt76.napi[1]);</div><div class='add'>+	tasklet_schedule(&amp;dev-&gt;mt76.irq_tasklet);</div><div class='ctx'> </div><div class='del'>-	napi_enable(&amp;dev-&gt;mt76.napi[2]);</div><div class='del'>-	napi_schedule(&amp;dev-&gt;mt76.napi[2]);</div><div class='add'>+	mt76_worker_enable(&amp;dev-&gt;mt76.tx_worker);</div><div class='add'>+</div><div class='add'>+	napi_enable(&amp;dev-&gt;mt76.tx_napi);</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	napi_schedule(&amp;dev-&gt;mt76.tx_napi);</div><div class='add'>+	local_bh_enable();</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_wake_queues(mt76_hw(dev));</div><div class='ctx'> 	if (ext_phy)</div><div class='ctx'> 		ieee80211_wake_queues(ext_phy-&gt;hw);</div><div class='ctx'> </div><div class='del'>-	mt76_wr(dev, MT_MCU_INT_EVENT, MT_MCU_INT_EVENT_RESET_DONE);</div><div class='del'>-	mt7915_wait_reset_state(dev, MT_MCU_CMD_NORMAL_STATE);</div><div class='del'>-</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='ctx'> 	mt7915_update_beacons(dev);</div><div class='hunk'>@@ -1650,63 +1605,359 @@ void mt7915_mac_reset_work(struct work_struct *work)</div><div class='ctx'> 					     MT7915_WATCHDOG_TIME);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7915_mac_update_mib_stats(struct mt7915_phy *phy)</div><div class='add'>+/* firmware coredump */</div><div class='add'>+void mt7915_mac_dump_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='del'>-	struct mib_stats *mib = &amp;phy-&gt;mib;</div><div class='del'>-	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='del'>-	int i, aggr0, aggr1;</div><div class='add'>+	const struct mt7915_mem_region *mem_region;</div><div class='add'>+	struct mt7915_crash_data *crash_data;</div><div class='add'>+	struct mt7915_dev *dev;</div><div class='add'>+	struct mt7915_mem_hdr *hdr;</div><div class='add'>+	size_t buf_len;</div><div class='add'>+	int i;</div><div class='add'>+	u32 num;</div><div class='add'>+	u8 *buf;</div><div class='ctx'> </div><div class='del'>-	mib-&gt;fcs_err_cnt += mt76_get_field(dev, MT_MIB_SDR3(ext_phy),</div><div class='del'>-					   MT_MIB_SDR3_FCS_ERR_MASK);</div><div class='add'>+	dev = container_of(work, struct mt7915_dev, dump_work);</div><div class='ctx'> </div><div class='del'>-	aggr0 = ext_phy ? ARRAY_SIZE(dev-&gt;mt76.aggr_stats) / 2 : 0;</div><div class='del'>-	for (i = 0, aggr1 = aggr0 + 4; i &lt; 4; i++) {</div><div class='del'>-		u32 val;</div><div class='add'>+	mutex_lock(&amp;dev-&gt;dump_mutex);</div><div class='ctx'> </div><div class='del'>-		val = mt76_rr(dev, MT_MIB_MB_SDR1(ext_phy, i));</div><div class='del'>-		mib-&gt;ba_miss_cnt += FIELD_GET(MT_MIB_BA_MISS_COUNT_MASK, val);</div><div class='del'>-		mib-&gt;ack_fail_cnt +=</div><div class='del'>-			FIELD_GET(MT_MIB_ACK_FAIL_COUNT_MASK, val);</div><div class='add'>+	crash_data = mt7915_coredump_new(dev);</div><div class='add'>+	if (!crash_data) {</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;dump_mutex);</div><div class='add'>+		goto skip_coredump;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		val = mt76_rr(dev, MT_MIB_MB_SDR0(ext_phy, i));</div><div class='del'>-		mib-&gt;rts_cnt += FIELD_GET(MT_MIB_RTS_COUNT_MASK, val);</div><div class='del'>-		mib-&gt;rts_retries_cnt +=</div><div class='del'>-			FIELD_GET(MT_MIB_RTS_RETRIES_COUNT_MASK, val);</div><div class='add'>+	mem_region = mt7915_coredump_get_mem_layout(dev, &amp;num);</div><div class='add'>+	if (!mem_region || !crash_data-&gt;memdump_buf_len) {</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;dump_mutex);</div><div class='add'>+		goto skip_memdump;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		val = mt76_rr(dev, MT_TX_AGG_CNT(ext_phy, i));</div><div class='del'>-		dev-&gt;mt76.aggr_stats[aggr0++] += val &amp; 0xffff;</div><div class='del'>-		dev-&gt;mt76.aggr_stats[aggr0++] += val &gt;&gt; 16;</div><div class='add'>+	buf = crash_data-&gt;memdump_buf;</div><div class='add'>+	buf_len = crash_data-&gt;memdump_buf_len;</div><div class='ctx'> </div><div class='del'>-		val = mt76_rr(dev, MT_TX_AGG_CNT2(ext_phy, i));</div><div class='del'>-		dev-&gt;mt76.aggr_stats[aggr1++] += val &amp; 0xffff;</div><div class='del'>-		dev-&gt;mt76.aggr_stats[aggr1++] += val &gt;&gt; 16;</div><div class='add'>+	/* dumping memory content... */</div><div class='add'>+	memset(buf, 0, buf_len);</div><div class='add'>+	for (i = 0; i &lt; num; i++) {</div><div class='add'>+		if (mem_region-&gt;len &gt; buf_len) {</div><div class='add'>+			dev_warn(dev-&gt;mt76.dev, "%s len %lu is too large\n",</div><div class='add'>+				 mem_region-&gt;name,</div><div class='add'>+				 (unsigned long)mem_region-&gt;len);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* reserve space for the header */</div><div class='add'>+		hdr = (void *)buf;</div><div class='add'>+		buf += sizeof(*hdr);</div><div class='add'>+		buf_len -= sizeof(*hdr);</div><div class='add'>+</div><div class='add'>+		mt7915_memcpy_fromio(dev, buf, mem_region-&gt;start,</div><div class='add'>+				     mem_region-&gt;len);</div><div class='add'>+</div><div class='add'>+		hdr-&gt;start = mem_region-&gt;start;</div><div class='add'>+		hdr-&gt;len = mem_region-&gt;len;</div><div class='add'>+</div><div class='add'>+		if (!mem_region-&gt;len)</div><div class='add'>+			/* note: the header remains, just with zero length */</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		buf += mem_region-&gt;len;</div><div class='add'>+		buf_len -= mem_region-&gt;len;</div><div class='add'>+</div><div class='add'>+		mem_region++;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;dump_mutex);</div><div class='add'>+</div><div class='add'>+skip_memdump:</div><div class='add'>+	mt7915_coredump_submit(dev);</div><div class='add'>+skip_coredump:</div><div class='add'>+	queue_work(dev-&gt;mt76.wq, &amp;dev-&gt;reset_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7915_mac_sta_stats_work(struct mt7915_phy *phy)</div><div class='add'>+void mt7915_reset(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	if (!dev-&gt;recovery.hw_init_done)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;recovery.hw_full_reset)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* wm/wa exception: do full recovery */</div><div class='add'>+	if (READ_ONCE(dev-&gt;recovery.state) &amp; MT_MCU_CMD_WDT_MASK) {</div><div class='add'>+		dev-&gt;recovery.restart = true;</div><div class='add'>+		dev_info(dev-&gt;mt76.dev,</div><div class='add'>+			 "%s indicated firmware crash, attempting recovery\n",</div><div class='add'>+			 wiphy_name(dev-&gt;mt76.hw-&gt;wiphy));</div><div class='add'>+</div><div class='add'>+		mt7915_irq_disable(dev, MT_INT_MCU_CMD);</div><div class='add'>+		queue_work(dev-&gt;mt76.wq, &amp;dev-&gt;dump_work);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((READ_ONCE(dev-&gt;recovery.state) &amp; MT_MCU_CMD_STOP_DMA)) {</div><div class='add'>+		set_bit(MT76_MCU_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+		wake_up(&amp;dev-&gt;mt76.mcu.wait);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	queue_work(dev-&gt;mt76.wq, &amp;dev-&gt;reset_work);</div><div class='add'>+	wake_up(&amp;dev-&gt;reset_wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7915_mac_update_stats(struct mt7915_phy *phy)</div><div class='ctx'> {</div><div class='add'>+	struct mt76_mib_stats *mib = &amp;phy-&gt;mib;</div><div class='ctx'> 	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='del'>-	struct mt7915_sta *msta;</div><div class='del'>-	LIST_HEAD(list);</div><div class='add'>+	int i, aggr0 = 0, aggr1, cnt;</div><div class='add'>+	u8 band = phy-&gt;mt76-&gt;band_idx;</div><div class='add'>+	u32 val;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-	list_splice_init(&amp;phy-&gt;stats_list, &amp;list);</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR3(band));</div><div class='add'>+	mib-&gt;fcs_err_cnt += is_mt7915(&amp;dev-&gt;mt76) ?</div><div class='add'>+		FIELD_GET(MT_MIB_SDR3_FCS_ERR_MASK, cnt) :</div><div class='add'>+		FIELD_GET(MT_MIB_SDR3_FCS_ERR_MASK_MT7916, cnt);</div><div class='ctx'> </div><div class='del'>-	while (!list_empty(&amp;list)) {</div><div class='del'>-		msta = list_first_entry(&amp;list, struct mt7915_sta, stats_list);</div><div class='del'>-		list_del_init(&amp;msta-&gt;stats_list);</div><div class='del'>-		spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR4(band));</div><div class='add'>+	mib-&gt;rx_fifo_full_cnt += FIELD_GET(MT_MIB_SDR4_RX_FIFO_FULL_MASK, cnt);</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR5(band));</div><div class='add'>+	mib-&gt;rx_mpdu_cnt += cnt;</div><div class='ctx'> </div><div class='del'>-		/* use MT_TX_FREE_RATE to report Tx rate for further devices */</div><div class='del'>-		mt7915_mcu_get_tx_rate(dev, RATE_CTRL_RU_INFO, msta-&gt;wcid.idx);</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR6(band));</div><div class='add'>+	mib-&gt;channel_idle_cnt += FIELD_GET(MT_MIB_SDR6_CHANNEL_IDL_CNT_MASK, cnt);</div><div class='ctx'> </div><div class='del'>-		spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR7(band));</div><div class='add'>+	mib-&gt;rx_vector_mismatch_cnt +=</div><div class='add'>+		FIELD_GET(MT_MIB_SDR7_RX_VECTOR_MISMATCH_CNT_MASK, cnt);</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR8(band));</div><div class='add'>+	mib-&gt;rx_delimiter_fail_cnt +=</div><div class='add'>+		FIELD_GET(MT_MIB_SDR8_RX_DELIMITER_FAIL_CNT_MASK, cnt);</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR10(band));</div><div class='add'>+	mib-&gt;rx_mrdy_cnt += is_mt7915(&amp;dev-&gt;mt76) ?</div><div class='add'>+		FIELD_GET(MT_MIB_SDR10_MRDY_COUNT_MASK, cnt) :</div><div class='add'>+		FIELD_GET(MT_MIB_SDR10_MRDY_COUNT_MASK_MT7916, cnt);</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR11(band));</div><div class='add'>+	mib-&gt;rx_len_mismatch_cnt +=</div><div class='add'>+		FIELD_GET(MT_MIB_SDR11_RX_LEN_MISMATCH_CNT_MASK, cnt);</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR12(band));</div><div class='add'>+	mib-&gt;tx_ampdu_cnt += cnt;</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR13(band));</div><div class='add'>+	mib-&gt;tx_stop_q_empty_cnt +=</div><div class='add'>+		FIELD_GET(MT_MIB_SDR13_TX_STOP_Q_EMPTY_CNT_MASK, cnt);</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR14(band));</div><div class='add'>+	mib-&gt;tx_mpdu_attempts_cnt += is_mt7915(&amp;dev-&gt;mt76) ?</div><div class='add'>+		FIELD_GET(MT_MIB_SDR14_TX_MPDU_ATTEMPTS_CNT_MASK, cnt) :</div><div class='add'>+		FIELD_GET(MT_MIB_SDR14_TX_MPDU_ATTEMPTS_CNT_MASK_MT7916, cnt);</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR15(band));</div><div class='add'>+	mib-&gt;tx_mpdu_success_cnt += is_mt7915(&amp;dev-&gt;mt76) ?</div><div class='add'>+		FIELD_GET(MT_MIB_SDR15_TX_MPDU_SUCCESS_CNT_MASK, cnt) :</div><div class='add'>+		FIELD_GET(MT_MIB_SDR15_TX_MPDU_SUCCESS_CNT_MASK_MT7916, cnt);</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR16(band));</div><div class='add'>+	mib-&gt;primary_cca_busy_time +=</div><div class='add'>+		FIELD_GET(MT_MIB_SDR16_PRIMARY_CCA_BUSY_TIME_MASK, cnt);</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR17(band));</div><div class='add'>+	mib-&gt;secondary_cca_busy_time +=</div><div class='add'>+		FIELD_GET(MT_MIB_SDR17_SECONDARY_CCA_BUSY_TIME_MASK, cnt);</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR18(band));</div><div class='add'>+	mib-&gt;primary_energy_detect_time +=</div><div class='add'>+		FIELD_GET(MT_MIB_SDR18_PRIMARY_ENERGY_DETECT_TIME_MASK, cnt);</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR19(band));</div><div class='add'>+	mib-&gt;cck_mdrdy_time += FIELD_GET(MT_MIB_SDR19_CCK_MDRDY_TIME_MASK, cnt);</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR20(band));</div><div class='add'>+	mib-&gt;ofdm_mdrdy_time +=</div><div class='add'>+		FIELD_GET(MT_MIB_SDR20_OFDM_VHT_MDRDY_TIME_MASK, cnt);</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR21(band));</div><div class='add'>+	mib-&gt;green_mdrdy_time +=</div><div class='add'>+		FIELD_GET(MT_MIB_SDR21_GREEN_MDRDY_TIME_MASK, cnt);</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR22(band));</div><div class='add'>+	mib-&gt;rx_ampdu_cnt += cnt;</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR23(band));</div><div class='add'>+	mib-&gt;rx_ampdu_bytes_cnt += cnt;</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR24(band));</div><div class='add'>+	mib-&gt;rx_ampdu_valid_subframe_cnt += is_mt7915(&amp;dev-&gt;mt76) ?</div><div class='add'>+		FIELD_GET(MT_MIB_SDR24_RX_AMPDU_SF_CNT_MASK, cnt) :</div><div class='add'>+		FIELD_GET(MT_MIB_SDR24_RX_AMPDU_SF_CNT_MASK_MT7916, cnt);</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR25(band));</div><div class='add'>+	mib-&gt;rx_ampdu_valid_subframe_bytes_cnt += cnt;</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR27(band));</div><div class='add'>+	mib-&gt;tx_rwp_fail_cnt +=</div><div class='add'>+		FIELD_GET(MT_MIB_SDR27_TX_RWP_FAIL_CNT_MASK, cnt);</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR28(band));</div><div class='add'>+	mib-&gt;tx_rwp_need_cnt +=</div><div class='add'>+		FIELD_GET(MT_MIB_SDR28_TX_RWP_NEED_CNT_MASK, cnt);</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR29(band));</div><div class='add'>+	mib-&gt;rx_pfdrop_cnt += is_mt7915(&amp;dev-&gt;mt76) ?</div><div class='add'>+		FIELD_GET(MT_MIB_SDR29_RX_PFDROP_CNT_MASK, cnt) :</div><div class='add'>+		FIELD_GET(MT_MIB_SDR29_RX_PFDROP_CNT_MASK_MT7916, cnt);</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDRVEC(band));</div><div class='add'>+	mib-&gt;rx_vec_queue_overflow_drop_cnt += is_mt7915(&amp;dev-&gt;mt76) ?</div><div class='add'>+		FIELD_GET(MT_MIB_SDR30_RX_VEC_QUEUE_OVERFLOW_DROP_CNT_MASK, cnt) :</div><div class='add'>+		FIELD_GET(MT_MIB_SDR30_RX_VEC_QUEUE_OVERFLOW_DROP_CNT_MASK_MT7916, cnt);</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR31(band));</div><div class='add'>+	mib-&gt;rx_ba_cnt += cnt;</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDRMUBF(band));</div><div class='add'>+	mib-&gt;tx_bf_cnt += FIELD_GET(MT_MIB_MU_BF_TX_CNT, cnt);</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_DR8(band));</div><div class='add'>+	mib-&gt;tx_mu_mpdu_cnt += cnt;</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_DR9(band));</div><div class='add'>+	mib-&gt;tx_mu_acked_mpdu_cnt += cnt;</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_DR11(band));</div><div class='add'>+	mib-&gt;tx_su_acked_mpdu_cnt += cnt;</div><div class='add'>+</div><div class='add'>+	cnt = mt76_rr(dev, MT_ETBF_PAR_RPT0(band));</div><div class='add'>+	mib-&gt;tx_bf_rx_fb_bw = FIELD_GET(MT_ETBF_PAR_RPT0_FB_BW, cnt);</div><div class='add'>+	mib-&gt;tx_bf_rx_fb_nc_cnt += FIELD_GET(MT_ETBF_PAR_RPT0_FB_NC, cnt);</div><div class='add'>+	mib-&gt;tx_bf_rx_fb_nr_cnt += FIELD_GET(MT_ETBF_PAR_RPT0_FB_NR, cnt);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mib-&gt;tx_amsdu); i++) {</div><div class='add'>+		cnt = mt76_rr(dev, MT_PLE_AMSDU_PACK_MSDU_CNT(i));</div><div class='add'>+		mib-&gt;tx_amsdu[i] += cnt;</div><div class='add'>+		mib-&gt;tx_amsdu_cnt += cnt;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_mt7915(&amp;dev-&gt;mt76)) {</div><div class='add'>+		for (i = 0, aggr1 = aggr0 + 8; i &lt; 4; i++) {</div><div class='add'>+			val = mt76_rr(dev, MT_MIB_MB_SDR1(band, (i &lt;&lt; 4)));</div><div class='add'>+			mib-&gt;ba_miss_cnt +=</div><div class='add'>+				FIELD_GET(MT_MIB_BA_MISS_COUNT_MASK, val);</div><div class='add'>+			mib-&gt;ack_fail_cnt +=</div><div class='add'>+				FIELD_GET(MT_MIB_ACK_FAIL_COUNT_MASK, val);</div><div class='add'>+</div><div class='add'>+			val = mt76_rr(dev, MT_MIB_MB_SDR0(band, (i &lt;&lt; 4)));</div><div class='add'>+			mib-&gt;rts_cnt += FIELD_GET(MT_MIB_RTS_COUNT_MASK, val);</div><div class='add'>+			mib-&gt;rts_retries_cnt +=</div><div class='add'>+				FIELD_GET(MT_MIB_RTS_RETRIES_COUNT_MASK, val);</div><div class='add'>+</div><div class='add'>+			val = mt76_rr(dev, MT_TX_AGG_CNT(band, i));</div><div class='add'>+			phy-&gt;mt76-&gt;aggr_stats[aggr0++] += val &amp; 0xffff;</div><div class='add'>+			phy-&gt;mt76-&gt;aggr_stats[aggr0++] += val &gt;&gt; 16;</div><div class='add'>+</div><div class='add'>+			val = mt76_rr(dev, MT_TX_AGG_CNT2(band, i));</div><div class='add'>+			phy-&gt;mt76-&gt;aggr_stats[aggr1++] += val &amp; 0xffff;</div><div class='add'>+			phy-&gt;mt76-&gt;aggr_stats[aggr1++] += val &gt;&gt; 16;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cnt = mt76_rr(dev, MT_MIB_SDR32(band));</div><div class='add'>+		mib-&gt;tx_pkt_ebf_cnt += FIELD_GET(MT_MIB_SDR32_TX_PKT_EBF_CNT, cnt);</div><div class='add'>+</div><div class='add'>+		cnt = mt76_rr(dev, MT_MIB_SDR33(band));</div><div class='add'>+		mib-&gt;tx_pkt_ibf_cnt += FIELD_GET(MT_MIB_SDR33_TX_PKT_IBF_CNT, cnt);</div><div class='add'>+</div><div class='add'>+		cnt = mt76_rr(dev, MT_ETBF_TX_APP_CNT(band));</div><div class='add'>+		mib-&gt;tx_bf_ibf_ppdu_cnt += FIELD_GET(MT_ETBF_TX_IBF_CNT, cnt);</div><div class='add'>+		mib-&gt;tx_bf_ebf_ppdu_cnt += FIELD_GET(MT_ETBF_TX_EBF_CNT, cnt);</div><div class='add'>+</div><div class='add'>+		cnt = mt76_rr(dev, MT_ETBF_TX_NDP_BFRP(band));</div><div class='add'>+		mib-&gt;tx_bf_fb_cpl_cnt += FIELD_GET(MT_ETBF_TX_FB_CPL, cnt);</div><div class='add'>+		mib-&gt;tx_bf_fb_trig_cnt += FIELD_GET(MT_ETBF_TX_FB_TRI, cnt);</div><div class='add'>+</div><div class='add'>+		cnt = mt76_rr(dev, MT_ETBF_RX_FB_CNT(band));</div><div class='add'>+		mib-&gt;tx_bf_rx_fb_all_cnt += FIELD_GET(MT_ETBF_RX_FB_ALL, cnt);</div><div class='add'>+		mib-&gt;tx_bf_rx_fb_he_cnt += FIELD_GET(MT_ETBF_RX_FB_HE, cnt);</div><div class='add'>+		mib-&gt;tx_bf_rx_fb_vht_cnt += FIELD_GET(MT_ETBF_RX_FB_VHT, cnt);</div><div class='add'>+		mib-&gt;tx_bf_rx_fb_ht_cnt += FIELD_GET(MT_ETBF_RX_FB_HT, cnt);</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; 2; i++) {</div><div class='add'>+			/* rts count */</div><div class='add'>+			val = mt76_rr(dev, MT_MIB_MB_SDR0(band, (i &lt;&lt; 2)));</div><div class='add'>+			mib-&gt;rts_cnt += FIELD_GET(GENMASK(15, 0), val);</div><div class='add'>+			mib-&gt;rts_cnt += FIELD_GET(GENMASK(31, 16), val);</div><div class='add'>+</div><div class='add'>+			/* rts retry count */</div><div class='add'>+			val = mt76_rr(dev, MT_MIB_MB_SDR1(band, (i &lt;&lt; 2)));</div><div class='add'>+			mib-&gt;rts_retries_cnt += FIELD_GET(GENMASK(15, 0), val);</div><div class='add'>+			mib-&gt;rts_retries_cnt += FIELD_GET(GENMASK(31, 16), val);</div><div class='add'>+</div><div class='add'>+			/* ba miss count */</div><div class='add'>+			val = mt76_rr(dev, MT_MIB_MB_SDR2(band, (i &lt;&lt; 2)));</div><div class='add'>+			mib-&gt;ba_miss_cnt += FIELD_GET(GENMASK(15, 0), val);</div><div class='add'>+			mib-&gt;ba_miss_cnt += FIELD_GET(GENMASK(31, 16), val);</div><div class='add'>+</div><div class='add'>+			/* ack fail count */</div><div class='add'>+			val = mt76_rr(dev, MT_MIB_MB_BFTF(band, (i &lt;&lt; 2)));</div><div class='add'>+			mib-&gt;ack_fail_cnt += FIELD_GET(GENMASK(15, 0), val);</div><div class='add'>+			mib-&gt;ack_fail_cnt += FIELD_GET(GENMASK(31, 16), val);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; 8; i++) {</div><div class='add'>+			val = mt76_rr(dev, MT_TX_AGG_CNT(band, i));</div><div class='add'>+			phy-&gt;mt76-&gt;aggr_stats[aggr0++] += FIELD_GET(GENMASK(15, 0), val);</div><div class='add'>+			phy-&gt;mt76-&gt;aggr_stats[aggr0++] += FIELD_GET(GENMASK(31, 16), val);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cnt = mt76_rr(dev, MT_MIB_SDR32(band));</div><div class='add'>+		mib-&gt;tx_pkt_ibf_cnt += FIELD_GET(MT_MIB_SDR32_TX_PKT_IBF_CNT, cnt);</div><div class='add'>+		mib-&gt;tx_bf_ibf_ppdu_cnt += FIELD_GET(MT_MIB_SDR32_TX_PKT_IBF_CNT, cnt);</div><div class='add'>+		mib-&gt;tx_pkt_ebf_cnt += FIELD_GET(MT_MIB_SDR32_TX_PKT_EBF_CNT, cnt);</div><div class='add'>+		mib-&gt;tx_bf_ebf_ppdu_cnt += FIELD_GET(MT_MIB_SDR32_TX_PKT_EBF_CNT, cnt);</div><div class='add'>+</div><div class='add'>+		cnt = mt76_rr(dev, MT_MIB_BFCR7(band));</div><div class='add'>+		mib-&gt;tx_bf_fb_cpl_cnt += FIELD_GET(MT_MIB_BFCR7_BFEE_TX_FB_CPL, cnt);</div><div class='add'>+</div><div class='add'>+		cnt = mt76_rr(dev, MT_MIB_BFCR2(band));</div><div class='add'>+		mib-&gt;tx_bf_fb_trig_cnt += FIELD_GET(MT_MIB_BFCR2_BFEE_TX_FB_TRIG, cnt);</div><div class='add'>+</div><div class='add'>+		cnt = mt76_rr(dev, MT_MIB_BFCR0(band));</div><div class='add'>+		mib-&gt;tx_bf_rx_fb_vht_cnt += FIELD_GET(MT_MIB_BFCR0_RX_FB_VHT, cnt);</div><div class='add'>+		mib-&gt;tx_bf_rx_fb_all_cnt += FIELD_GET(MT_MIB_BFCR0_RX_FB_VHT, cnt);</div><div class='add'>+		mib-&gt;tx_bf_rx_fb_ht_cnt += FIELD_GET(MT_MIB_BFCR0_RX_FB_HT, cnt);</div><div class='add'>+		mib-&gt;tx_bf_rx_fb_all_cnt += FIELD_GET(MT_MIB_BFCR0_RX_FB_HT, cnt);</div><div class='add'>+</div><div class='add'>+		cnt = mt76_rr(dev, MT_MIB_BFCR1(band));</div><div class='add'>+		mib-&gt;tx_bf_rx_fb_he_cnt += FIELD_GET(MT_MIB_BFCR1_RX_FB_HE, cnt);</div><div class='add'>+		mib-&gt;tx_bf_rx_fb_all_cnt += FIELD_GET(MT_MIB_BFCR1_RX_FB_HE, cnt);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7915_mac_severe_check(struct mt7915_phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	u32 trb;</div><div class='add'>+</div><div class='add'>+	if (!phy-&gt;omac_mask)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* In rare cases, TRB pointers might be out of sync leads to RMAC</div><div class='add'>+	 * stopping Rx, so check status periodically to see if TRB hardware</div><div class='add'>+	 * requires minimal recovery.</div><div class='add'>+	 */</div><div class='add'>+	trb = mt76_rr(dev, MT_TRB_RXPSR0(phy-&gt;mt76-&gt;band_idx));</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+	if ((FIELD_GET(MT_TRB_RXPSR0_RX_RMAC_PTR, trb) !=</div><div class='add'>+	     FIELD_GET(MT_TRB_RXPSR0_RX_WTBL_PTR, trb)) &amp;&amp;</div><div class='add'>+	    (FIELD_GET(MT_TRB_RXPSR0_RX_RMAC_PTR, phy-&gt;trb_ts) !=</div><div class='add'>+	     FIELD_GET(MT_TRB_RXPSR0_RX_WTBL_PTR, phy-&gt;trb_ts)) &amp;&amp;</div><div class='add'>+	    trb == phy-&gt;trb_ts)</div><div class='add'>+		mt7915_mcu_set_ser(dev, SER_RECOVER, SER_SET_RECOVER_L3_RX_ABORT,</div><div class='add'>+				   phy-&gt;mt76-&gt;band_idx);</div><div class='add'>+</div><div class='add'>+	phy-&gt;trb_ts = trb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt7915_mac_sta_rc_work(struct work_struct *work)</div><div class='hunk'>@@ -1718,15 +1969,15 @@ void mt7915_mac_sta_rc_work(struct work_struct *work)</div><div class='ctx'> 	u32 changed;</div><div class='ctx'> 	LIST_HEAD(list);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='ctx'> 	list_splice_init(&amp;dev-&gt;sta_rc_list, &amp;list);</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;list)) {</div><div class='ctx'> 		msta = list_first_entry(&amp;list, struct mt7915_sta, rc_list);</div><div class='ctx'> 		list_del_init(&amp;msta-&gt;rc_list);</div><div class='del'>-		changed = msta-&gt;stats.changed;</div><div class='del'>-		msta-&gt;stats.changed = 0;</div><div class='del'>-		spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+		changed = msta-&gt;changed;</div><div class='add'>+		msta-&gt;changed = 0;</div><div class='add'>+		spin_unlock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='ctx'> </div><div class='ctx'> 		sta = container_of((void *)msta, struct ieee80211_sta, drv_priv);</div><div class='ctx'> 		vif = container_of((void *)msta-&gt;vif, struct ieee80211_vif, drv_priv);</div><div class='hunk'>@@ -1734,15 +1985,15 @@ void mt7915_mac_sta_rc_work(struct work_struct *work)</div><div class='ctx'> 		if (changed &amp; (IEEE80211_RC_SUPP_RATES_CHANGED |</div><div class='ctx'> 			       IEEE80211_RC_NSS_CHANGED |</div><div class='ctx'> 			       IEEE80211_RC_BW_CHANGED))</div><div class='del'>-			mt7915_mcu_add_rate_ctrl(dev, vif, sta);</div><div class='add'>+			mt7915_mcu_add_rate_ctrl(dev, vif, sta, true);</div><div class='ctx'> </div><div class='ctx'> 		if (changed &amp; IEEE80211_RC_SMPS_CHANGED)</div><div class='ctx'> 			mt7915_mcu_add_smps(dev, vif, sta);</div><div class='ctx'> </div><div class='del'>-		spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+		spin_lock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt7915_mac_work(struct work_struct *work)</div><div class='hunk'>@@ -1756,20 +2007,21 @@ void mt7915_mac_work(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mphy-&gt;dev-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	mt76_update_survey(mphy-&gt;dev);</div><div class='add'>+	mt76_update_survey(mphy);</div><div class='ctx'> 	if (++mphy-&gt;mac_work_count == 5) {</div><div class='ctx'> 		mphy-&gt;mac_work_count = 0;</div><div class='ctx'> </div><div class='del'>-		mt7915_mac_update_mib_stats(phy);</div><div class='del'>-	}</div><div class='add'>+		mt7915_mac_update_stats(phy);</div><div class='add'>+		mt7915_mac_severe_check(phy);</div><div class='ctx'> </div><div class='del'>-	if (++phy-&gt;sta_work_count == 10) {</div><div class='del'>-		phy-&gt;sta_work_count = 0;</div><div class='del'>-		mt7915_mac_sta_stats_work(phy);</div><div class='add'>+		if (phy-&gt;dev-&gt;muru_debug)</div><div class='add'>+			mt7915_mcu_muru_debug_get(phy);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;mphy-&gt;dev-&gt;mutex);</div><div class='ctx'> </div><div class='add'>+	mt76_tx_status_check(mphy-&gt;dev, false);</div><div class='add'>+</div><div class='ctx'> 	ieee80211_queue_delayed_work(mphy-&gt;hw, &amp;mphy-&gt;mac_work,</div><div class='ctx'> 				     MT7915_WATCHDOG_TIME);</div><div class='ctx'> }</div><div class='hunk'>@@ -1777,51 +2029,63 @@ void mt7915_mac_work(struct work_struct *work)</div><div class='ctx'> static void mt7915_dfs_stop_radar_detector(struct mt7915_phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	int rdd_idx = mt7915_get_rdd_idx(phy, false);</div><div class='add'>+</div><div class='add'>+	if (rdd_idx &lt; 0)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (phy-&gt;rdd_state &amp; BIT(0))</div><div class='del'>-		mt7915_mcu_rdd_cmd(dev, RDD_STOP, 0, MT_RX_SEL0, 0);</div><div class='del'>-	if (phy-&gt;rdd_state &amp; BIT(1))</div><div class='del'>-		mt7915_mcu_rdd_cmd(dev, RDD_STOP, 1, MT_RX_SEL0, 0);</div><div class='add'>+	mt76_connac_mcu_rdd_cmd(&amp;dev-&gt;mt76, RDD_STOP, rdd_idx, 0, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7915_dfs_start_rdd(struct mt7915_dev *dev, int chain)</div><div class='add'>+static int mt7915_dfs_start_rdd(struct mt7915_dev *dev, int rdd_idx)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+	int err, region;</div><div class='add'>+</div><div class='add'>+	switch (dev-&gt;mt76.region) {</div><div class='add'>+	case NL80211_DFS_ETSI:</div><div class='add'>+		region = 0;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_DFS_JP:</div><div class='add'>+		region = 2;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_DFS_FCC:</div><div class='add'>+	default:</div><div class='add'>+		region = 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	err = mt7915_mcu_rdd_cmd(dev, RDD_START, chain, MT_RX_SEL0, 0);</div><div class='add'>+	err = mt76_connac_mcu_rdd_cmd(&amp;dev-&gt;mt76, RDD_START, rdd_idx, 0, region);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	return mt7915_mcu_rdd_cmd(dev, RDD_DET_MODE, chain, MT_RX_SEL0, 1);</div><div class='add'>+	if (is_mt7915(&amp;dev-&gt;mt76)) {</div><div class='add'>+		err = mt76_connac_mcu_rdd_cmd(&amp;dev-&gt;mt76, RDD_SET_WF_ANT, rdd_idx,</div><div class='add'>+					      0, dev-&gt;dbdc_support ? 2 : 0);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mt76_connac_mcu_rdd_cmd(&amp;dev-&gt;mt76, RDD_DET_MODE, rdd_idx, 0, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt7915_dfs_start_radar_detector(struct mt7915_phy *phy)</div><div class='ctx'> {</div><div class='del'>-	struct cfg80211_chan_def *chandef = &amp;phy-&gt;mt76-&gt;chandef;</div><div class='ctx'> 	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='del'>-	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='del'>-	int err;</div><div class='add'>+	int err, rdd_idx;</div><div class='add'>+</div><div class='add'>+	rdd_idx = mt7915_get_rdd_idx(phy, false);</div><div class='add'>+	if (rdd_idx &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* start CAC */</div><div class='del'>-	err = mt7915_mcu_rdd_cmd(dev, RDD_CAC_START, ext_phy, MT_RX_SEL0, 0);</div><div class='add'>+	err = mt76_connac_mcu_rdd_cmd(&amp;dev-&gt;mt76, RDD_CAC_START, rdd_idx, 0, 0);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = mt7915_dfs_start_rdd(dev, ext_phy);</div><div class='add'>+	err = mt7915_dfs_start_rdd(dev, rdd_idx);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	phy-&gt;rdd_state |= BIT(ext_phy);</div><div class='del'>-</div><div class='del'>-	if (chandef-&gt;width == NL80211_CHAN_WIDTH_160 ||</div><div class='del'>-	    chandef-&gt;width == NL80211_CHAN_WIDTH_80P80) {</div><div class='del'>-		err = mt7915_dfs_start_rdd(dev, 1);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		phy-&gt;rdd_state |= BIT(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1861,47 +2125,278 @@ mt7915_dfs_init_radar_specs(struct mt7915_phy *phy)</div><div class='ctx'> </div><div class='ctx'> int mt7915_dfs_init_radar_detector(struct mt7915_phy *phy)</div><div class='ctx'> {</div><div class='del'>-	struct cfg80211_chan_def *chandef = &amp;phy-&gt;mt76-&gt;chandef;</div><div class='ctx'> 	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='del'>-	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='del'>-	int err;</div><div class='add'>+	enum mt76_dfs_state dfs_state, prev_state;</div><div class='add'>+	int err, rdd_idx = mt7915_get_rdd_idx(phy, false);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;mt76.region == NL80211_DFS_UNSET) {</div><div class='del'>-		phy-&gt;dfs_state = -1;</div><div class='del'>-		if (phy-&gt;rdd_state)</div><div class='del'>-			goto stop;</div><div class='add'>+	prev_state = phy-&gt;mt76-&gt;dfs_state;</div><div class='add'>+	dfs_state = mt76_phy_dfs_state(phy-&gt;mt76);</div><div class='ctx'> </div><div class='add'>+	if (prev_state == dfs_state || rdd_idx &lt; 0)</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (test_bit(MT76_SCANNING, &amp;phy-&gt;mt76-&gt;state))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;dfs_state == chandef-&gt;chan-&gt;dfs_state)</div><div class='del'>-		return 0;</div><div class='add'>+	if (prev_state == MT_DFS_STATE_UNKNOWN)</div><div class='add'>+		mt7915_dfs_stop_radar_detector(phy);</div><div class='ctx'> </div><div class='del'>-	err = mt7915_dfs_init_radar_specs(phy);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		phy-&gt;dfs_state = -1;</div><div class='add'>+	if (dfs_state == MT_DFS_STATE_DISABLED)</div><div class='ctx'> 		goto stop;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	phy-&gt;dfs_state = chandef-&gt;chan-&gt;dfs_state;</div><div class='add'>+	if (prev_state &lt;= MT_DFS_STATE_DISABLED) {</div><div class='add'>+		err = mt7915_dfs_init_radar_specs(phy);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='del'>-	if (chandef-&gt;chan-&gt;flags &amp; IEEE80211_CHAN_RADAR) {</div><div class='del'>-		if (chandef-&gt;chan-&gt;dfs_state != NL80211_DFS_AVAILABLE)</div><div class='del'>-			return mt7915_dfs_start_radar_detector(phy);</div><div class='add'>+		err = mt7915_dfs_start_radar_detector(phy);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='del'>-		return mt7915_mcu_rdd_cmd(dev, RDD_CAC_END, ext_phy,</div><div class='del'>-					  MT_RX_SEL0, 0);</div><div class='add'>+		phy-&gt;mt76-&gt;dfs_state = MT_DFS_STATE_CAC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (dfs_state == MT_DFS_STATE_CAC)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = mt76_connac_mcu_rdd_cmd(&amp;dev-&gt;mt76, RDD_CAC_END, rdd_idx, 0, 0);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		phy-&gt;mt76-&gt;dfs_state = MT_DFS_STATE_UNKNOWN;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	phy-&gt;mt76-&gt;dfs_state = MT_DFS_STATE_ACTIVE;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='ctx'> stop:</div><div class='del'>-	err = mt7915_mcu_rdd_cmd(dev, RDD_NORMAL_START, ext_phy,</div><div class='del'>-				 MT_RX_SEL0, 0);</div><div class='add'>+	err = mt76_connac_mcu_rdd_cmd(&amp;dev-&gt;mt76, RDD_NORMAL_START, rdd_idx, 0, 0);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	if (is_mt7915(&amp;dev-&gt;mt76)) {</div><div class='add'>+		err = mt76_connac_mcu_rdd_cmd(&amp;dev-&gt;mt76, RDD_SET_WF_ANT,</div><div class='add'>+					      rdd_idx, 0, dev-&gt;dbdc_support ? 2 : 0);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mt7915_dfs_stop_radar_detector(phy);</div><div class='add'>+	phy-&gt;mt76-&gt;dfs_state = MT_DFS_STATE_DISABLED;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7915_mac_twt_duration_align(int duration)</div><div class='add'>+{</div><div class='add'>+	return duration &lt;&lt; 8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64</div><div class='add'>+mt7915_mac_twt_sched_list_add(struct mt7915_dev *dev,</div><div class='add'>+			      struct mt7915_twt_flow *flow)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_twt_flow *iter, *iter_next;</div><div class='add'>+	u32 duration = flow-&gt;duration &lt;&lt; 8;</div><div class='add'>+	u64 start_tsf;</div><div class='add'>+</div><div class='add'>+	iter = list_first_entry_or_null(&amp;dev-&gt;twt_list,</div><div class='add'>+					struct mt7915_twt_flow, list);</div><div class='add'>+	if (!iter || !iter-&gt;sched || iter-&gt;start_tsf &gt; duration) {</div><div class='add'>+		/* add flow as first entry in the list */</div><div class='add'>+		list_add(&amp;flow-&gt;list, &amp;dev-&gt;twt_list);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(iter, iter_next, &amp;dev-&gt;twt_list, list) {</div><div class='add'>+		start_tsf = iter-&gt;start_tsf +</div><div class='add'>+			    mt7915_mac_twt_duration_align(iter-&gt;duration);</div><div class='add'>+		if (list_is_last(&amp;iter-&gt;list, &amp;dev-&gt;twt_list))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!iter_next-&gt;sched ||</div><div class='add'>+		    iter_next-&gt;start_tsf &gt; start_tsf + duration) {</div><div class='add'>+			list_add(&amp;flow-&gt;list, &amp;iter-&gt;list);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* add flow as last entry in the list */</div><div class='add'>+	list_add_tail(&amp;flow-&gt;list, &amp;dev-&gt;twt_list);</div><div class='add'>+out:</div><div class='add'>+	return start_tsf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7915_mac_check_twt_req(struct ieee80211_twt_setup *twt)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_twt_params *twt_agrt;</div><div class='add'>+	u64 interval, duration;</div><div class='add'>+	u16 mantissa;</div><div class='add'>+	u8 exp;</div><div class='add'>+</div><div class='add'>+	/* only individual agreement supported */</div><div class='add'>+	if (twt-&gt;control &amp; IEEE80211_TWT_CONTROL_NEG_TYPE_BROADCAST)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* only 256us unit supported */</div><div class='add'>+	if (twt-&gt;control &amp; IEEE80211_TWT_CONTROL_WAKE_DUR_UNIT)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	twt_agrt = (struct ieee80211_twt_params *)twt-&gt;params;</div><div class='add'>+</div><div class='add'>+	/* explicit agreement not supported */</div><div class='add'>+	if (!(twt_agrt-&gt;req_type &amp; cpu_to_le16(IEEE80211_TWT_REQTYPE_IMPLICIT)))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	exp = FIELD_GET(IEEE80211_TWT_REQTYPE_WAKE_INT_EXP,</div><div class='add'>+			le16_to_cpu(twt_agrt-&gt;req_type));</div><div class='add'>+	mantissa = le16_to_cpu(twt_agrt-&gt;mantissa);</div><div class='add'>+	duration = twt_agrt-&gt;min_twt_dur &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	interval = (u64)mantissa &lt;&lt; exp;</div><div class='add'>+	if (interval &lt; duration)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+mt7915_mac_twt_param_equal(struct mt7915_sta *msta,</div><div class='add'>+			   struct ieee80211_twt_params *twt_agrt)</div><div class='add'>+{</div><div class='add'>+	u16 type = le16_to_cpu(twt_agrt-&gt;req_type);</div><div class='add'>+	u8 exp;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	exp = FIELD_GET(IEEE80211_TWT_REQTYPE_WAKE_INT_EXP, type);</div><div class='add'>+	for (i = 0; i &lt; MT7915_MAX_STA_TWT_AGRT; i++) {</div><div class='add'>+		struct mt7915_twt_flow *f;</div><div class='add'>+</div><div class='add'>+		if (!(msta-&gt;twt.flowid_mask &amp; BIT(i)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		f = &amp;msta-&gt;twt.flow[i];</div><div class='add'>+		if (f-&gt;duration == twt_agrt-&gt;min_twt_dur &amp;&amp;</div><div class='add'>+		    f-&gt;mantissa == twt_agrt-&gt;mantissa &amp;&amp;</div><div class='add'>+		    f-&gt;exp == exp &amp;&amp;</div><div class='add'>+		    f-&gt;protection == !!(type &amp; IEEE80211_TWT_REQTYPE_PROTECTION) &amp;&amp;</div><div class='add'>+		    f-&gt;flowtype == !!(type &amp; IEEE80211_TWT_REQTYPE_FLOWTYPE) &amp;&amp;</div><div class='add'>+		    f-&gt;trigger == !!(type &amp; IEEE80211_TWT_REQTYPE_TRIGGER))</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7915_mac_add_twt_setup(struct ieee80211_hw *hw,</div><div class='add'>+			      struct ieee80211_sta *sta,</div><div class='add'>+			      struct ieee80211_twt_setup *twt)</div><div class='add'>+{</div><div class='add'>+	enum ieee80211_twt_setup_cmd setup_cmd = TWT_SETUP_CMD_REJECT;</div><div class='add'>+	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct ieee80211_twt_params *twt_agrt = (void *)twt-&gt;params;</div><div class='add'>+	u16 req_type = le16_to_cpu(twt_agrt-&gt;req_type);</div><div class='add'>+	enum ieee80211_twt_setup_cmd sta_setup_cmd;</div><div class='add'>+	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='add'>+	struct mt7915_twt_flow *flow;</div><div class='add'>+	int flowid, table_id;</div><div class='add'>+	u8 exp;</div><div class='add'>+</div><div class='add'>+	if (mt7915_mac_check_twt_req(twt))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;twt.n_agrt == MT7915_MAX_TWT_AGRT)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	if (hweight8(msta-&gt;twt.flowid_mask) == ARRAY_SIZE(msta-&gt;twt.flow))</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	if (twt_agrt-&gt;min_twt_dur &lt; MT7915_MIN_TWT_DUR) {</div><div class='add'>+		setup_cmd = TWT_SETUP_CMD_DICTATE;</div><div class='add'>+		twt_agrt-&gt;min_twt_dur = MT7915_MIN_TWT_DUR;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flowid = ffs(~msta-&gt;twt.flowid_mask) - 1;</div><div class='add'>+	twt_agrt-&gt;req_type &amp;= ~cpu_to_le16(IEEE80211_TWT_REQTYPE_FLOWID);</div><div class='add'>+	twt_agrt-&gt;req_type |= le16_encode_bits(flowid,</div><div class='add'>+					       IEEE80211_TWT_REQTYPE_FLOWID);</div><div class='add'>+</div><div class='add'>+	table_id = ffs(~dev-&gt;twt.table_mask) - 1;</div><div class='add'>+	exp = FIELD_GET(IEEE80211_TWT_REQTYPE_WAKE_INT_EXP, req_type);</div><div class='add'>+	sta_setup_cmd = FIELD_GET(IEEE80211_TWT_REQTYPE_SETUP_CMD, req_type);</div><div class='add'>+</div><div class='add'>+	if (mt7915_mac_twt_param_equal(msta, twt_agrt))</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	flow = &amp;msta-&gt;twt.flow[flowid];</div><div class='add'>+	memset(flow, 0, sizeof(*flow));</div><div class='add'>+	INIT_LIST_HEAD(&amp;flow-&gt;list);</div><div class='add'>+	flow-&gt;wcid = msta-&gt;wcid.idx;</div><div class='add'>+	flow-&gt;table_id = table_id;</div><div class='add'>+	flow-&gt;id = flowid;</div><div class='add'>+	flow-&gt;duration = twt_agrt-&gt;min_twt_dur;</div><div class='add'>+	flow-&gt;mantissa = twt_agrt-&gt;mantissa;</div><div class='add'>+	flow-&gt;exp = exp;</div><div class='add'>+	flow-&gt;protection = !!(req_type &amp; IEEE80211_TWT_REQTYPE_PROTECTION);</div><div class='add'>+	flow-&gt;flowtype = !!(req_type &amp; IEEE80211_TWT_REQTYPE_FLOWTYPE);</div><div class='add'>+	flow-&gt;trigger = !!(req_type &amp; IEEE80211_TWT_REQTYPE_TRIGGER);</div><div class='add'>+</div><div class='add'>+	if (sta_setup_cmd == TWT_SETUP_CMD_REQUEST ||</div><div class='add'>+	    sta_setup_cmd == TWT_SETUP_CMD_SUGGEST) {</div><div class='add'>+		u64 interval = (u64)le16_to_cpu(twt_agrt-&gt;mantissa) &lt;&lt; exp;</div><div class='add'>+		u64 flow_tsf, curr_tsf;</div><div class='add'>+		u32 rem;</div><div class='add'>+</div><div class='add'>+		flow-&gt;sched = true;</div><div class='add'>+		flow-&gt;start_tsf = mt7915_mac_twt_sched_list_add(dev, flow);</div><div class='add'>+		curr_tsf = __mt7915_get_tsf(hw, msta-&gt;vif);</div><div class='add'>+		div_u64_rem(curr_tsf - flow-&gt;start_tsf, interval, &amp;rem);</div><div class='add'>+		flow_tsf = curr_tsf + interval - rem;</div><div class='add'>+		twt_agrt-&gt;twt = cpu_to_le64(flow_tsf);</div><div class='add'>+	} else {</div><div class='add'>+		list_add_tail(&amp;flow-&gt;list, &amp;dev-&gt;twt_list);</div><div class='add'>+	}</div><div class='add'>+	flow-&gt;tsf = le64_to_cpu(twt_agrt-&gt;twt);</div><div class='add'>+</div><div class='add'>+	if (mt7915_mcu_twt_agrt_update(dev, msta-&gt;vif, flow, MCU_TWT_AGRT_ADD))</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	setup_cmd = TWT_SETUP_CMD_ACCEPT;</div><div class='add'>+	dev-&gt;twt.table_mask |= BIT(table_id);</div><div class='add'>+	msta-&gt;twt.flowid_mask |= BIT(flowid);</div><div class='add'>+	dev-&gt;twt.n_agrt++;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+out:</div><div class='add'>+	twt_agrt-&gt;req_type &amp;= ~cpu_to_le16(IEEE80211_TWT_REQTYPE_SETUP_CMD);</div><div class='add'>+	twt_agrt-&gt;req_type |=</div><div class='add'>+		le16_encode_bits(setup_cmd, IEEE80211_TWT_REQTYPE_SETUP_CMD);</div><div class='add'>+	twt-&gt;control = (twt-&gt;control &amp; IEEE80211_TWT_CONTROL_WAKE_DUR_UNIT) |</div><div class='add'>+		       (twt-&gt;control &amp; IEEE80211_TWT_CONTROL_RX_DISABLED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7915_mac_twt_teardown_flow(struct mt7915_dev *dev,</div><div class='add'>+				  struct mt7915_sta *msta,</div><div class='add'>+				  u8 flowid)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_twt_flow *flow;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	if (flowid &gt;= ARRAY_SIZE(msta-&gt;twt.flow))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!(msta-&gt;twt.flowid_mask &amp; BIT(flowid)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	flow = &amp;msta-&gt;twt.flow[flowid];</div><div class='add'>+	if (mt7915_mcu_twt_agrt_update(dev, msta-&gt;vif, flow,</div><div class='add'>+				       MCU_TWT_AGRT_DELETE))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	list_del_init(&amp;flow-&gt;list);</div><div class='add'>+	msta-&gt;twt.flowid_mask &amp;= ~BIT(flowid);</div><div class='add'>+	dev-&gt;twt.table_mask &amp;= ~BIT(flow-&gt;table_id);</div><div class='add'>+	dev-&gt;twt.n_agrt--;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.h b/drivers/net/wireless/mediatek/mt76/mt7915/mac.h<br/>index 0f929fb53027..e39f96e00ba4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/mac.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/mac.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/mac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7915/mac.h</a></div><div class='hunk'>@@ -1,308 +1,42 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MT7915_MAC_H</div><div class='ctx'> #define __MT7915_MAC_H</div><div class='ctx'> </div><div class='del'>-#define MT_CT_PARSE_LEN			72</div><div class='del'>-#define MT_CT_DMA_BUF_NUM		2</div><div class='add'>+#include "../mt76_connac2_mac.h"</div><div class='ctx'> </div><div class='del'>-#define MT_RXD0_LENGTH			GENMASK(15, 0)</div><div class='del'>-#define MT_RXD0_PKT_TYPE		GENMASK(31, 27)</div><div class='del'>-</div><div class='del'>-#define MT_RXD0_NORMAL_ETH_TYPE_OFS	GENMASK(22, 16)</div><div class='del'>-#define MT_RXD0_NORMAL_IP_SUM		BIT(23)</div><div class='del'>-#define MT_RXD0_NORMAL_UDP_TCP_SUM	BIT(24)</div><div class='del'>-</div><div class='del'>-enum rx_pkt_type {</div><div class='del'>-	PKT_TYPE_TXS,</div><div class='del'>-	PKT_TYPE_TXRXV,</div><div class='del'>-	PKT_TYPE_NORMAL,</div><div class='del'>-	PKT_TYPE_RX_DUP_RFB,</div><div class='del'>-	PKT_TYPE_RX_TMR,</div><div class='del'>-	PKT_TYPE_RETRIEVE,</div><div class='del'>-	PKT_TYPE_TXRX_NOTIFY,</div><div class='del'>-	PKT_TYPE_RX_EVENT,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* RXD DW1 */</div><div class='del'>-#define MT_RXD1_NORMAL_WLAN_IDX		GENMASK(9, 0)</div><div class='del'>-#define MT_RXD1_NORMAL_GROUP_1		BIT(11)</div><div class='del'>-#define MT_RXD1_NORMAL_GROUP_2		BIT(12)</div><div class='del'>-#define MT_RXD1_NORMAL_GROUP_3		BIT(13)</div><div class='del'>-#define MT_RXD1_NORMAL_GROUP_4		BIT(14)</div><div class='del'>-#define MT_RXD1_NORMAL_GROUP_5		BIT(15)</div><div class='del'>-#define MT_RXD1_NORMAL_SEC_MODE		GENMASK(20, 16)</div><div class='del'>-#define MT_RXD1_NORMAL_KEY_ID		GENMASK(22, 21)</div><div class='del'>-#define MT_RXD1_NORMAL_CM		BIT(23)</div><div class='del'>-#define MT_RXD1_NORMAL_CLM		BIT(24)</div><div class='del'>-#define MT_RXD1_NORMAL_ICV_ERR		BIT(25)</div><div class='del'>-#define MT_RXD1_NORMAL_TKIP_MIC_ERR	BIT(26)</div><div class='del'>-#define MT_RXD1_NORMAL_FCS_ERR		BIT(27)</div><div class='del'>-#define MT_RXD1_NORMAL_BAND_IDX		BIT(28)</div><div class='del'>-#define MT_RXD1_NORMAL_SPP_EN		BIT(29)</div><div class='del'>-#define MT_RXD1_NORMAL_ADD_OM		BIT(30)</div><div class='del'>-#define MT_RXD1_NORMAL_SEC_DONE		BIT(31)</div><div class='del'>-</div><div class='del'>-/* RXD DW2 */</div><div class='del'>-#define MT_RXD2_NORMAL_BSSID		GENMASK(5, 0)</div><div class='del'>-#define MT_RXD2_NORMAL_CO_ANT		BIT(6)</div><div class='del'>-#define MT_RXD2_NORMAL_BF_CQI		BIT(7)</div><div class='del'>-#define MT_RXD2_NORMAL_MAC_HDR_LEN	GENMASK(12, 8)</div><div class='del'>-#define MT_RXD2_NORMAL_HDR_TRANS	BIT(13)</div><div class='del'>-#define MT_RXD2_NORMAL_HDR_OFFSET	GENMASK(15, 14)</div><div class='del'>-#define MT_RXD2_NORMAL_TID		GENMASK(19, 16)</div><div class='del'>-#define MT_RXD2_NORMAL_MU_BAR		BIT(21)</div><div class='del'>-#define MT_RXD2_NORMAL_SW_BIT		BIT(22)</div><div class='del'>-#define MT_RXD2_NORMAL_AMSDU_ERR	BIT(23)</div><div class='del'>-#define MT_RXD2_NORMAL_MAX_LEN_ERROR	BIT(24)</div><div class='del'>-#define MT_RXD2_NORMAL_HDR_TRANS_ERROR	BIT(25)</div><div class='del'>-#define MT_RXD2_NORMAL_INT_FRAME	BIT(26)</div><div class='del'>-#define MT_RXD2_NORMAL_FRAG		BIT(27)</div><div class='del'>-#define MT_RXD2_NORMAL_NULL_FRAME	BIT(28)</div><div class='del'>-#define MT_RXD2_NORMAL_NDATA		BIT(29)</div><div class='del'>-#define MT_RXD2_NORMAL_NON_AMPDU	BIT(30)</div><div class='del'>-#define MT_RXD2_NORMAL_BF_REPORT	BIT(31)</div><div class='del'>-</div><div class='del'>-/* RXD DW3 */</div><div class='del'>-#define MT_RXD3_NORMAL_RXV_SEQ		GENMASK(7, 0)</div><div class='del'>-#define MT_RXD3_NORMAL_CH_FREQ		GENMASK(15, 8)</div><div class='del'>-#define MT_RXD3_NORMAL_ADDR_TYPE	GENMASK(17, 16)</div><div class='del'>-#define MT_RXD3_NORMAL_U2M		BIT(0)</div><div class='del'>-#define MT_RXD3_NORMAL_HTC_VLD		BIT(0)</div><div class='del'>-#define MT_RXD3_NORMAL_TSF_COMPARE_LOSS	BIT(19)</div><div class='del'>-#define MT_RXD3_NORMAL_BEACON_MC	BIT(20)</div><div class='del'>-#define MT_RXD3_NORMAL_BEACON_UC	BIT(21)</div><div class='del'>-#define MT_RXD3_NORMAL_AMSDU		BIT(22)</div><div class='del'>-#define MT_RXD3_NORMAL_MESH		BIT(23)</div><div class='del'>-#define MT_RXD3_NORMAL_MHCP		BIT(24)</div><div class='del'>-#define MT_RXD3_NORMAL_NO_INFO_WB	BIT(25)</div><div class='del'>-#define MT_RXD3_NORMAL_DISABLE_RX_HDR_TRANS	BIT(26)</div><div class='del'>-#define MT_RXD3_NORMAL_POWER_SAVE_STAT	BIT(27)</div><div class='del'>-#define MT_RXD3_NORMAL_MORE		BIT(28)</div><div class='del'>-#define MT_RXD3_NORMAL_UNWANT		BIT(29)</div><div class='del'>-#define MT_RXD3_NORMAL_RX_DROP		BIT(30)</div><div class='del'>-#define MT_RXD3_NORMAL_VLAN2ETH		BIT(31)</div><div class='del'>-</div><div class='del'>-/* RXD DW4 */</div><div class='del'>-#define MT_RXD4_NORMAL_PAYLOAD_FORMAT	GENMASK(1, 0)</div><div class='del'>-#define MT_RXD4_FIRST_AMSDU_FRAME	GENMASK(1, 0)</div><div class='del'>-#define MT_RXD4_MID_AMSDU_FRAME		BIT(1)</div><div class='del'>-#define MT_RXD4_LAST_AMSDU_FRAME	BIT(0)</div><div class='del'>-</div><div class='del'>-#define MT_RXD4_NORMAL_PATTERN_DROP	BIT(9)</div><div class='del'>-#define MT_RXD4_NORMAL_CLS		BIT(10)</div><div class='del'>-#define MT_RXD4_NORMAL_OFLD		GENMASK(12, 11)</div><div class='del'>-#define MT_RXD4_NORMAL_MAGIC_PKT	BIT(13)</div><div class='del'>-#define MT_RXD4_NORMAL_WOL		GENMASK(18, 14)</div><div class='del'>-#define MT_RXD4_NORMAL_CLS_BITMAP	GENMASK(28, 19)</div><div class='del'>-#define MT_RXD3_NORMAL_PF_MODE		BIT(29)</div><div class='del'>-#define MT_RXD3_NORMAL_PF_STS		GENMASK(31, 30)</div><div class='del'>-</div><div class='del'>-#define MT_RXV_HDR_BAND_IDX		BIT(24)</div><div class='del'>-</div><div class='del'>-/* RXD GROUP4 */</div><div class='del'>-#define MT_RXD6_FRAME_CONTROL		GENMASK(15, 0)</div><div class='del'>-#define MT_RXD6_TA_LO			GENMASK(31, 16)</div><div class='del'>-</div><div class='del'>-#define MT_RXD7_TA_HI			GENMASK(31, 0)</div><div class='del'>-</div><div class='del'>-#define MT_RXD8_SEQ_CTRL		GENMASK(15, 0)</div><div class='del'>-#define MT_RXD8_QOS_CTL			GENMASK(31, 16)</div><div class='del'>-</div><div class='del'>-#define MT_RXD9_HT_CONTROL		GENMASK(31, 0)</div><div class='del'>-</div><div class='del'>-/* P-RXV */</div><div class='del'>-#define MT_PRXV_TX_RATE			GENMASK(6, 0)</div><div class='del'>-#define MT_PRXV_TX_DCM			BIT(4)</div><div class='del'>-#define MT_PRXV_TX_ER_SU_106T		BIT(5)</div><div class='del'>-#define MT_PRXV_NSTS			GENMASK(9, 7)</div><div class='del'>-#define MT_PRXV_HT_AD_CODE		BIT(11)</div><div class='del'>-#define MT_PRXV_HE_RU_ALLOC_L		GENMASK(31, 28)</div><div class='del'>-#define MT_PRXV_HE_RU_ALLOC_H		GENMASK(3, 0)</div><div class='del'>-#define MT_PRXV_RCPI3			GENMASK(31, 24)</div><div class='del'>-#define MT_PRXV_RCPI2			GENMASK(23, 16)</div><div class='del'>-#define MT_PRXV_RCPI1			GENMASK(15, 8)</div><div class='del'>-#define MT_PRXV_RCPI0			GENMASK(7, 0)</div><div class='del'>-</div><div class='del'>-/* C-RXV */</div><div class='del'>-#define MT_CRXV_HT_STBC			GENMASK(1, 0)</div><div class='del'>-#define MT_CRXV_TX_MODE			GENMASK(7, 4)</div><div class='del'>-#define MT_CRXV_FRAME_MODE		GENMASK(10, 8)</div><div class='del'>-#define MT_CRXV_HT_SHORT_GI		GENMASK(14, 13)</div><div class='del'>-#define MT_CRXV_HE_LTF_SIZE		GENMASK(18, 17)</div><div class='del'>-#define MT_CRXV_HE_LDPC_EXT_SYM		BIT(20)</div><div class='del'>-#define MT_CRXV_HE_PE_DISAMBIG		BIT(23)</div><div class='del'>-#define MT_CRXV_HE_UPLINK		BIT(31)</div><div class='del'>-</div><div class='del'>-#define MT_CRXV_HE_SR_MASK		GENMASK(11, 8)</div><div class='del'>-#define MT_CRXV_HE_SR1_MASK		GENMASK(16, 12)</div><div class='del'>-#define MT_CRXV_HE_SR2_MASK             GENMASK(20, 17)</div><div class='del'>-#define MT_CRXV_HE_SR3_MASK             GENMASK(24, 21)</div><div class='del'>-</div><div class='del'>-#define MT_CRXV_HE_BSS_COLOR		GENMASK(5, 0)</div><div class='del'>-#define MT_CRXV_HE_TXOP_DUR		GENMASK(12, 6)</div><div class='del'>-#define MT_CRXV_HE_BEAM_CHNG		BIT(13)</div><div class='del'>-#define MT_CRXV_HE_DOPPLER		BIT(16)</div><div class='del'>-</div><div class='del'>-#define MT_CRXV_SNR		GENMASK(18, 13)</div><div class='del'>-#define MT_CRXV_FOE_LO		GENMASK(31, 19)</div><div class='del'>-#define MT_CRXV_FOE_HI		GENMASK(6, 0)</div><div class='del'>-#define MT_CRXV_FOE_SHIFT	13</div><div class='del'>-</div><div class='del'>-enum tx_header_format {</div><div class='del'>-	MT_HDR_FORMAT_802_3,</div><div class='del'>-	MT_HDR_FORMAT_CMD,</div><div class='del'>-	MT_HDR_FORMAT_802_11,</div><div class='del'>-	MT_HDR_FORMAT_802_11_EXT,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum tx_pkt_type {</div><div class='del'>-	MT_TX_TYPE_CT,</div><div class='del'>-	MT_TX_TYPE_SF,</div><div class='del'>-	MT_TX_TYPE_CMD,</div><div class='del'>-	MT_TX_TYPE_FW,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum tx_port_idx {</div><div class='del'>-	MT_TX_PORT_IDX_LMAC,</div><div class='del'>-	MT_TX_PORT_IDX_MCU</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum tx_mcu_port_q_idx {</div><div class='del'>-	MT_TX_MCU_PORT_RX_Q0 = 0x20,</div><div class='del'>-	MT_TX_MCU_PORT_RX_Q1,</div><div class='del'>-	MT_TX_MCU_PORT_RX_Q2,</div><div class='del'>-	MT_TX_MCU_PORT_RX_Q3,</div><div class='del'>-	MT_TX_MCU_PORT_RX_FWDL = 0x3e</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define MT_CT_INFO_APPLY_TXD		BIT(0)</div><div class='del'>-#define MT_CT_INFO_COPY_HOST_TXD_ALL	BIT(1)</div><div class='del'>-#define MT_CT_INFO_MGMT_FRAME		BIT(2)</div><div class='del'>-#define MT_CT_INFO_NONE_CIPHER_FRAME	BIT(3)</div><div class='del'>-#define MT_CT_INFO_HSR2_TX		BIT(4)</div><div class='del'>-#define MT_CT_INFO_FROM_HOST		BIT(7)</div><div class='del'>-</div><div class='del'>-#define MT_TXD_SIZE			(8 * 4)</div><div class='del'>-</div><div class='del'>-#define MT_TXD0_Q_IDX			GENMASK(31, 25)</div><div class='del'>-#define MT_TXD0_PKT_FMT			GENMASK(24, 23)</div><div class='del'>-#define MT_TXD0_ETH_TYPE_OFFSET		GENMASK(22, 16)</div><div class='del'>-#define MT_TXD0_TX_BYTES		GENMASK(15, 0)</div><div class='del'>-</div><div class='del'>-#define MT_TXD1_LONG_FORMAT		BIT(31)</div><div class='del'>-#define MT_TXD1_TGID			BIT(30)</div><div class='del'>-#define MT_TXD1_OWN_MAC			GENMASK(29, 24)</div><div class='del'>-#define MT_TXD1_AMSDU			BIT(23)</div><div class='del'>-#define MT_TXD1_TID			GENMASK(22, 20)</div><div class='del'>-#define MT_TXD1_HDR_PAD			GENMASK(19, 18)</div><div class='del'>-#define MT_TXD1_HDR_FORMAT		GENMASK(17, 16)</div><div class='del'>-#define MT_TXD1_HDR_INFO		GENMASK(15, 11)</div><div class='del'>-#define MT_TXD1_ETH_802_3		BIT(15)</div><div class='del'>-#define MT_TXD1_VTA			BIT(10)</div><div class='del'>-#define MT_TXD1_WLAN_IDX		GENMASK(9, 0)</div><div class='del'>-</div><div class='del'>-#define MT_TXD2_FIX_RATE		BIT(31)</div><div class='del'>-#define MT_TXD2_FIXED_RATE		BIT(30)</div><div class='del'>-#define MT_TXD2_POWER_OFFSET		GENMASK(29, 24)</div><div class='del'>-#define MT_TXD2_MAX_TX_TIME		GENMASK(23, 16)</div><div class='del'>-#define MT_TXD2_FRAG			GENMASK(15, 14)</div><div class='del'>-#define MT_TXD2_HTC_VLD			BIT(13)</div><div class='del'>-#define MT_TXD2_DURATION		BIT(12)</div><div class='del'>-#define MT_TXD2_BIP			BIT(11)</div><div class='del'>-#define MT_TXD2_MULTICAST		BIT(10)</div><div class='del'>-#define MT_TXD2_RTS			BIT(9)</div><div class='del'>-#define MT_TXD2_SOUNDING		BIT(8)</div><div class='del'>-#define MT_TXD2_NDPA			BIT(7)</div><div class='del'>-#define MT_TXD2_NDP			BIT(6)</div><div class='del'>-#define MT_TXD2_FRAME_TYPE		GENMASK(5, 4)</div><div class='del'>-#define MT_TXD2_SUB_TYPE		GENMASK(3, 0)</div><div class='del'>-</div><div class='del'>-#define MT_TXD3_SN_VALID		BIT(31)</div><div class='del'>-#define MT_TXD3_PN_VALID		BIT(30)</div><div class='del'>-#define MT_TXD3_SW_POWER_MGMT		BIT(29)</div><div class='del'>-#define MT_TXD3_BA_DISABLE		BIT(28)</div><div class='del'>-#define MT_TXD3_SEQ			GENMASK(27, 16)</div><div class='del'>-#define MT_TXD3_REM_TX_COUNT		GENMASK(15, 11)</div><div class='del'>-#define MT_TXD3_TX_COUNT		GENMASK(10, 6)</div><div class='del'>-#define MT_TXD3_TIMING_MEASURE		BIT(5)</div><div class='del'>-#define MT_TXD3_DAS			BIT(4)</div><div class='del'>-#define MT_TXD3_EEOSP			BIT(3)</div><div class='del'>-#define MT_TXD3_EMRD			BIT(2)</div><div class='del'>-#define MT_TXD3_PROTECT_FRAME		BIT(1)</div><div class='del'>-#define MT_TXD3_NO_ACK			BIT(0)</div><div class='del'>-</div><div class='del'>-#define MT_TXD4_PN_LOW			GENMASK(31, 0)</div><div class='del'>-</div><div class='del'>-#define MT_TXD5_PN_HIGH			GENMASK(31, 16)</div><div class='del'>-#define MT_TXD5_MD			BIT(15)</div><div class='del'>-#define MT_TXD5_ADD_BA			BIT(14)</div><div class='del'>-#define MT_TXD5_TX_STATUS_HOST		BIT(10)</div><div class='del'>-#define MT_TXD5_TX_STATUS_MCU		BIT(9)</div><div class='del'>-#define MT_TXD5_TX_STATUS_FMT		BIT(8)</div><div class='del'>-#define MT_TXD5_PID			GENMASK(7, 0)</div><div class='del'>-</div><div class='del'>-#define MT_TXD6_TX_IBF			BIT(31)</div><div class='del'>-#define MT_TXD6_TX_EBF			BIT(30)</div><div class='del'>-#define MT_TXD6_TX_RATE			GENMASK(29, 16)</div><div class='del'>-#define MT_TXD6_SGI			GENMASK(15, 14)</div><div class='del'>-#define MT_TXD6_HELTF			GENMASK(13, 12)</div><div class='del'>-#define MT_TXD6_LDPC			BIT(11)</div><div class='del'>-#define MT_TXD6_SPE_ID_IDX		BIT(10)</div><div class='del'>-#define MT_TXD6_ANT_ID			GENMASK(7, 4)</div><div class='del'>-#define MT_TXD6_DYN_BW			BIT(3)</div><div class='del'>-#define MT_TXD6_FIXED_BW		BIT(2)</div><div class='del'>-#define MT_TXD6_BW			GENMASK(1, 0)</div><div class='del'>-</div><div class='del'>-#define MT_TXD7_TXD_LEN			GENMASK(31, 30)</div><div class='del'>-#define MT_TXD7_UDP_TCP_SUM		BIT(29)</div><div class='del'>-#define MT_TXD7_IP_SUM			BIT(28)</div><div class='del'>-</div><div class='del'>-#define MT_TXD7_TYPE			GENMASK(21, 20)</div><div class='del'>-#define MT_TXD7_SUB_TYPE		GENMASK(19, 16)</div><div class='del'>-</div><div class='del'>-#define MT_TXD7_PSE_FID			GENMASK(27, 16)</div><div class='del'>-#define MT_TXD7_SPE_IDX			GENMASK(15, 11)</div><div class='del'>-#define MT_TXD7_HW_AMSDU		BIT(10)</div><div class='del'>-#define MT_TXD7_TX_TIME			GENMASK(9, 0)</div><div class='del'>-</div><div class='del'>-#define MT_TX_RATE_STBC			BIT(13)</div><div class='del'>-#define MT_TX_RATE_NSS			GENMASK(12, 10)</div><div class='del'>-#define MT_TX_RATE_MODE			GENMASK(9, 6)</div><div class='del'>-#define MT_TX_RATE_SU_EXT_TONE		BIT(5)</div><div class='del'>-#define MT_TX_RATE_DCM			BIT(4)</div><div class='del'>-#define MT_TX_RATE_IDX			GENMASK(3, 0)</div><div class='del'>-</div><div class='del'>-#define MT_TXP_MAX_BUF_NUM		6</div><div class='del'>-</div><div class='del'>-struct mt7915_txp {</div><div class='del'>-	__le16 flags;</div><div class='del'>-	__le16 token;</div><div class='del'>-	u8 bss_idx;</div><div class='del'>-	__le16 rept_wds_wcid;</div><div class='del'>-	u8 nbuf;</div><div class='del'>-	__le32 buf[MT_TXP_MAX_BUF_NUM];</div><div class='del'>-	__le16 len[MT_TXP_MAX_BUF_NUM];</div><div class='del'>-} __packed __aligned(4);</div><div class='del'>-</div><div class='del'>-struct mt7915_tx_free {</div><div class='del'>-	__le16 rx_byte_cnt;</div><div class='del'>-	__le16 ctrl;</div><div class='del'>-	u8 txd_cnt;</div><div class='del'>-	u8 rsv[3];</div><div class='del'>-	__le32 info[];</div><div class='del'>-} __packed __aligned(4);</div><div class='del'>-</div><div class='del'>-#define MT_TX_FREE_MSDU_CNT		GENMASK(9, 0)</div><div class='del'>-#define MT_TX_FREE_WLAN_ID		GENMASK(23, 14)</div><div class='del'>-#define MT_TX_FREE_LATENCY		GENMASK(12, 0)</div><div class='add'>+#define MT_TX_FREE_VER			GENMASK(18, 16)</div><div class='add'>+#define MT_TX_FREE_MSDU_CNT_V0		GENMASK(6, 0)</div><div class='ctx'> /* 0: success, others: dropped */</div><div class='del'>-#define MT_TX_FREE_STATUS		GENMASK(14, 13)</div><div class='del'>-#define MT_TX_FREE_MSDU_ID		GENMASK(30, 16)</div><div class='del'>-#define MT_TX_FREE_PAIR			BIT(31)</div><div class='del'>-/* will support this field in further revision */</div><div class='del'>-#define MT_TX_FREE_RATE			GENMASK(13, 0)</div><div class='add'>+#define MT_TX_FREE_COUNT		GENMASK(12, 0)</div><div class='add'>+#define MT_TX_FREE_COUNT_V3		GENMASK(27, 24)</div><div class='add'>+#define MT_TX_FREE_STAT			GENMASK(14, 13)</div><div class='add'>+#define MT_TX_FREE_STAT_V3		GENMASK(29, 28)</div><div class='add'>+#define MT_TX_FREE_MPDU_HEADER		BIT(15)</div><div class='add'>+#define MT_TX_FREE_MPDU_HEADER_V3	BIT(30)</div><div class='add'>+#define MT_TX_FREE_MSDU_ID_V3		GENMASK(14, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS5_F0_FINAL_MPDU		BIT(31)</div><div class='add'>+#define MT_TXS5_F0_QOS			BIT(30)</div><div class='add'>+#define MT_TXS5_F0_TX_COUNT		GENMASK(29, 25)</div><div class='add'>+#define MT_TXS5_F0_FRONT_TIME		GENMASK(24, 0)</div><div class='add'>+#define MT_TXS5_F1_MPDU_TX_COUNT	GENMASK(31, 24)</div><div class='add'>+#define MT_TXS5_F1_MPDU_TX_BYTES	GENMASK(23, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS6_F0_NOISE_3		GENMASK(31, 24)</div><div class='add'>+#define MT_TXS6_F0_NOISE_2		GENMASK(23, 16)</div><div class='add'>+#define MT_TXS6_F0_NOISE_1		GENMASK(15, 8)</div><div class='add'>+#define MT_TXS6_F0_NOISE_0		GENMASK(7, 0)</div><div class='add'>+#define MT_TXS6_F1_MPDU_FAIL_COUNT	GENMASK(31, 24)</div><div class='add'>+#define MT_TXS6_F1_MPDU_FAIL_BYTES	GENMASK(23, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TXS7_F0_RCPI_3		GENMASK(31, 24)</div><div class='add'>+#define MT_TXS7_F0_RCPI_2		GENMASK(23, 16)</div><div class='add'>+#define MT_TXS7_F0_RCPI_1		GENMASK(15, 8)</div><div class='add'>+#define MT_TXS7_F0_RCPI_0		GENMASK(7, 0)</div><div class='add'>+#define MT_TXS7_F1_MPDU_RETRY_COUNT	GENMASK(31, 24)</div><div class='add'>+#define MT_TXS7_F1_MPDU_RETRY_BYTES	GENMASK(23, 0)</div><div class='ctx'> </div><div class='ctx'> struct mt7915_dfs_pulse {</div><div class='ctx'> 	u32 max_width;		/* us */</div><div class='hunk'>@@ -338,17 +72,4 @@ struct mt7915_dfs_radar_spec {</div><div class='ctx'> 	struct mt7915_dfs_pattern radar_pattern[16];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline struct mt7915_txp *</div><div class='del'>-mt7915_txwi_to_txp(struct mt76_dev *dev, struct mt76_txwi_cache *t)</div><div class='del'>-{</div><div class='del'>-	u8 *txwi;</div><div class='del'>-</div><div class='del'>-	if (!t)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	txwi = mt76_get_txwi_ptr(dev, t);</div><div class='del'>-</div><div class='del'>-	return (struct mt7915_txp *)(txwi + MT_TXD_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c<br/>index e5bd687546b6..90d5e79fbf74 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7915/main.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='hunk'>@@ -20,56 +20,60 @@ static bool mt7915_dev_running(struct mt7915_dev *dev)</div><div class='ctx'> 	return phy &amp;&amp; test_bit(MT76_STATE_RUNNING, &amp;phy-&gt;mt76-&gt;state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7915_start(struct ieee80211_hw *hw)</div><div class='add'>+int mt7915_run(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='ctx'> 	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='ctx'> 	bool running;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	flush_work(&amp;dev-&gt;init_work);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='del'>-</div><div class='ctx'> 	running = mt7915_dev_running(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!running) {</div><div class='del'>-		ret = mt7915_mcu_set_pm(dev, 0, 0);</div><div class='add'>+		ret = mt76_connac_mcu_set_pm(&amp;dev-&gt;mt76,</div><div class='add'>+					     dev-&gt;phy.mt76-&gt;band_idx, 0);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		ret = mt7915_mcu_set_mac(dev, 0, true, true);</div><div class='add'>+		ret = mt7915_mcu_set_mac(dev, dev-&gt;phy.mt76-&gt;band_idx,</div><div class='add'>+					 true, true);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		ret = mt7915_mcu_set_scs(dev, 0, true);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		mt7915_mac_enable_nf(dev, 0);</div><div class='add'>+		mt7915_mac_enable_nf(dev, dev-&gt;phy.mt76-&gt;band_idx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (phy != &amp;dev-&gt;phy) {</div><div class='del'>-		ret = mt7915_mcu_set_pm(dev, 1, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		ret = mt7915_mcu_set_mac(dev, 1, true, true);</div><div class='add'>+		ret = mt76_connac_mcu_set_pm(&amp;dev-&gt;mt76,</div><div class='add'>+					     phy-&gt;mt76-&gt;band_idx, 0);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		ret = mt7915_mcu_set_scs(dev, 1, true);</div><div class='add'>+		ret = mt7915_mcu_set_mac(dev, phy-&gt;mt76-&gt;band_idx,</div><div class='add'>+					 true, true);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		mt7915_mac_enable_nf(dev, 1);</div><div class='add'>+		mt7915_mac_enable_nf(dev, phy-&gt;mt76-&gt;band_idx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = mt7915_mcu_set_rts_thresh(phy, 0x92b);</div><div class='add'>+	ret = mt7915_mcu_set_thermal_throttling(phy,</div><div class='add'>+						MT7915_THERMAL_THROTTLE_MAX);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = mt7915_mcu_set_thermal_protect(phy);</div><div class='add'>+</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = mt7915_mcu_set_sku_en(phy, true);</div><div class='add'>+	ret = mt76_connac_mcu_set_rts_thresh(&amp;dev-&gt;mt76, 0x92b,</div><div class='add'>+					     phy-&gt;mt76-&gt;band_idx);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = mt7915_mcu_set_sku_en(phy);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -87,12 +91,24 @@ static int mt7915_start(struct ieee80211_hw *hw)</div><div class='ctx'> 		mt7915_mac_reset_counters(phy);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7915_start(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	flush_work(&amp;dev-&gt;init_work);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+	ret = mt7915_run(hw);</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt7915_stop(struct ieee80211_hw *hw)</div><div class='add'>+static void mt7915_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='ctx'> 	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='hunk'>@@ -106,13 +122,13 @@ static void mt7915_stop(struct ieee80211_hw *hw)</div><div class='ctx'> 	clear_bit(MT76_STATE_RUNNING, &amp;phy-&gt;mt76-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 	if (phy != &amp;dev-&gt;phy) {</div><div class='del'>-		mt7915_mcu_set_pm(dev, 1, 1);</div><div class='del'>-		mt7915_mcu_set_mac(dev, 1, false, false);</div><div class='add'>+		mt76_connac_mcu_set_pm(&amp;dev-&gt;mt76, phy-&gt;mt76-&gt;band_idx, 1);</div><div class='add'>+		mt7915_mcu_set_mac(dev, phy-&gt;mt76-&gt;band_idx, false, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!mt7915_dev_running(dev)) {</div><div class='del'>-		mt7915_mcu_set_pm(dev, 0, 1);</div><div class='del'>-		mt7915_mcu_set_mac(dev, 0, false, false);</div><div class='add'>+		mt76_connac_mcu_set_pm(&amp;dev-&gt;mt76, dev-&gt;phy.mt76-&gt;band_idx, 1);</div><div class='add'>+		mt7915_mcu_set_mac(dev, dev-&gt;phy.mt76-&gt;band_idx, false, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='hunk'>@@ -139,12 +155,6 @@ static int get_omac_idx(enum nl80211_iftype type, u64 mask)</div><div class='ctx'> 		if (type != NL80211_IFTYPE_STATION)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		/* next, try to find a free repeater entry for the sta */</div><div class='del'>-		i = get_free_idx(mask &gt;&gt; REPEATER_BSSID_START, 0,</div><div class='del'>-				 REPEATER_BSSID_MAX - REPEATER_BSSID_START);</div><div class='del'>-		if (i)</div><div class='del'>-			return i + 32 - 1;</div><div class='del'>-</div><div class='ctx'> 		i = get_free_idx(mask, EXT_BSSID_1, EXT_BSSID_MAX);</div><div class='ctx'> 		if (i)</div><div class='ctx'> 			return i - 1;</div><div class='hunk'>@@ -172,6 +182,25 @@ static int get_omac_idx(enum nl80211_iftype type, u64 mask)</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mt7915_init_bitrate_mask(struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mvif-&gt;bitrate_mask.control); i++) {</div><div class='add'>+		mvif-&gt;bitrate_mask.control[i].gi = NL80211_TXRATE_DEFAULT_GI;</div><div class='add'>+		mvif-&gt;bitrate_mask.control[i].he_gi = 0xff;</div><div class='add'>+		mvif-&gt;bitrate_mask.control[i].he_ltf = 0xff;</div><div class='add'>+		mvif-&gt;bitrate_mask.control[i].legacy = GENMASK(31, 0);</div><div class='add'>+		memset(mvif-&gt;bitrate_mask.control[i].ht_mcs, 0xff,</div><div class='add'>+		       sizeof(mvif-&gt;bitrate_mask.control[i].ht_mcs));</div><div class='add'>+		memset(mvif-&gt;bitrate_mask.control[i].vht_mcs, 0xff,</div><div class='add'>+		       sizeof(mvif-&gt;bitrate_mask.control[i].vht_mcs));</div><div class='add'>+		memset(mvif-&gt;bitrate_mask.control[i].he_mcs, 0xff,</div><div class='add'>+		       sizeof(mvif-&gt;bitrate_mask.control[i].he_mcs));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mt7915_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 				struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='hunk'>@@ -190,8 +219,8 @@ static int mt7915_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	    is_zero_ether_addr(vif-&gt;addr))</div><div class='ctx'> 		phy-&gt;monitor_vif = vif;</div><div class='ctx'> </div><div class='del'>-	mvif-&gt;idx = ffs(~dev-&gt;mt76.vif_mask) - 1;</div><div class='del'>-	if (mvif-&gt;idx &gt;= MT7915_MAX_INTERFACES) {</div><div class='add'>+	mvif-&gt;mt76.idx = __ffs64(~dev-&gt;mt76.vif_mask);</div><div class='add'>+	if (mvif-&gt;mt76.idx &gt;= (MT7915_MAX_INTERFACES &lt;&lt; dev-&gt;dbdc_support)) {</div><div class='ctx'> 		ret = -ENOSPC;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -201,46 +230,53 @@ static int mt7915_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 		ret = -ENOSPC;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	mvif-&gt;omac_idx = idx;</div><div class='add'>+	mvif-&gt;mt76.omac_idx = idx;</div><div class='ctx'> 	mvif-&gt;phy = phy;</div><div class='del'>-	mvif-&gt;band_idx = ext_phy;</div><div class='add'>+	mvif-&gt;mt76.band_idx = phy-&gt;mt76-&gt;band_idx;</div><div class='add'>+	mvif-&gt;mt76.wcid = &amp;mvif-&gt;sta.wcid;</div><div class='ctx'> </div><div class='add'>+	mvif-&gt;mt76.wmm_idx = vif-&gt;type != NL80211_IFTYPE_AP;</div><div class='ctx'> 	if (ext_phy)</div><div class='del'>-		mvif-&gt;wmm_idx = ext_phy * (MT7915_MAX_WMM_SETS / 2) +</div><div class='del'>-				mvif-&gt;idx % (MT7915_MAX_WMM_SETS / 2);</div><div class='del'>-	else</div><div class='del'>-		mvif-&gt;wmm_idx = mvif-&gt;idx % MT7915_MAX_WMM_SETS;</div><div class='add'>+		mvif-&gt;mt76.wmm_idx += 2;</div><div class='ctx'> </div><div class='ctx'> 	ret = mt7915_mcu_add_dev_info(phy, vif, true);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mt76.vif_mask |= BIT(mvif-&gt;idx);</div><div class='del'>-	phy-&gt;omac_mask |= BIT_ULL(mvif-&gt;omac_idx);</div><div class='add'>+	dev-&gt;mt76.vif_mask |= BIT_ULL(mvif-&gt;mt76.idx);</div><div class='add'>+	phy-&gt;omac_mask |= BIT_ULL(mvif-&gt;mt76.omac_idx);</div><div class='ctx'> </div><div class='del'>-	idx = MT7915_WTBL_RESERVED - mvif-&gt;idx;</div><div class='add'>+	idx = mt76_wcid_alloc(dev-&gt;mt76.wcid_mask, mt7915_wtbl_size(dev));</div><div class='add'>+	if (idx &lt; 0) {</div><div class='add'>+		ret = -ENOSPC;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;mvif-&gt;sta.rc_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;mvif-&gt;sta.stats_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;mvif-&gt;sta.poll_list);</div><div class='ctx'> 	mvif-&gt;sta.wcid.idx = idx;</div><div class='del'>-	mvif-&gt;sta.wcid.ext_phy = mvif-&gt;band_idx;</div><div class='del'>-	mvif-&gt;sta.wcid.hw_key_idx = -1;</div><div class='ctx'> 	mvif-&gt;sta.wcid.tx_info |= MT_WCID_TX_INFO_SET;</div><div class='add'>+	mt76_wcid_init(&amp;mvif-&gt;sta.wcid, phy-&gt;mt76-&gt;band_idx);</div><div class='add'>+</div><div class='ctx'> 	mt7915_mac_wtbl_update(dev, idx,</div><div class='ctx'> 			       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);</div><div class='ctx'> </div><div class='del'>-	rcu_assign_pointer(dev-&gt;mt76.wcid[idx], &amp;mvif-&gt;sta.wcid);</div><div class='ctx'> 	if (vif-&gt;txq) {</div><div class='ctx'> 		mtxq = (struct mt76_txq *)vif-&gt;txq-&gt;drv_priv;</div><div class='del'>-		mtxq-&gt;wcid = &amp;mvif-&gt;sta.wcid;</div><div class='add'>+		mtxq-&gt;wcid = idx;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;type != NL80211_IFTYPE_AP &amp;&amp;</div><div class='del'>-	    (!mvif-&gt;omac_idx || mvif-&gt;omac_idx &gt; 3))</div><div class='add'>+	    (!mvif-&gt;mt76.omac_idx || mvif-&gt;mt76.omac_idx &gt; 3))</div><div class='ctx'> 		vif-&gt;offload_flags = 0;</div><div class='ctx'> 	vif-&gt;offload_flags |= IEEE80211_OFFLOAD_ENCAP_4ADDR;</div><div class='ctx'> </div><div class='add'>+	mt7915_init_bitrate_mask(vif);</div><div class='add'>+	memset(&amp;mvif-&gt;cap, -1, sizeof(mvif-&gt;cap));</div><div class='add'>+</div><div class='add'>+	mt7915_mcu_add_bss_info(phy, vif, true);</div><div class='add'>+	mt7915_mcu_add_sta(dev, vif, NULL, CONN_STATE_PORT_SECURE, true);</div><div class='add'>+	rcu_assign_pointer(dev-&gt;mt76.wcid[idx], &amp;mvif-&gt;sta.wcid);</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -257,7 +293,8 @@ static void mt7915_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	int idx = msta-&gt;wcid.idx;</div><div class='ctx'> </div><div class='ctx'> 	mt7915_mcu_add_bss_info(phy, vif, false);</div><div class='del'>-	mt7915_mcu_add_sta(dev, vif, NULL, false);</div><div class='add'>+	mt7915_mcu_add_sta(dev, vif, NULL, CONN_STATE_DISCONNECT, false);</div><div class='add'>+	mt76_wcid_mask_clear(dev-&gt;mt76.wcid_mask, mvif-&gt;sta.wcid.idx);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> 	mt76_testmode_reset(phy-&gt;mt76, true);</div><div class='hunk'>@@ -271,49 +308,25 @@ static void mt7915_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	rcu_assign_pointer(dev-&gt;mt76.wcid[idx], NULL);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='del'>-	dev-&gt;mt76.vif_mask &amp;= ~BIT(mvif-&gt;idx);</div><div class='del'>-	phy-&gt;omac_mask &amp;= ~BIT_ULL(mvif-&gt;omac_idx);</div><div class='add'>+	dev-&gt;mt76.vif_mask &amp;= ~BIT_ULL(mvif-&gt;mt76.idx);</div><div class='add'>+	phy-&gt;omac_mask &amp;= ~BIT_ULL(mvif-&gt;mt76.omac_idx);</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-	if (!list_empty(&amp;msta-&gt;poll_list))</div><div class='del'>-		list_del_init(&amp;msta-&gt;poll_list);</div><div class='del'>-	spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-}</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='add'>+	if (!list_empty(&amp;msta-&gt;wcid.poll_list))</div><div class='add'>+		list_del_init(&amp;msta-&gt;wcid.poll_list);</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='ctx'> </div><div class='del'>-static void mt7915_init_dfs_state(struct mt7915_phy *phy)</div><div class='del'>-{</div><div class='del'>-	struct mt76_phy *mphy = phy-&gt;mt76;</div><div class='del'>-	struct ieee80211_hw *hw = mphy-&gt;hw;</div><div class='del'>-	struct cfg80211_chan_def *chandef = &amp;hw-&gt;conf.chandef;</div><div class='del'>-</div><div class='del'>-	if (hw-&gt;conf.flags &amp; IEEE80211_CONF_OFFCHANNEL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!(chandef-&gt;chan-&gt;flags &amp; IEEE80211_CHAN_RADAR))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (mphy-&gt;chandef.chan-&gt;center_freq == chandef-&gt;chan-&gt;center_freq &amp;&amp;</div><div class='del'>-	    mphy-&gt;chandef.width == chandef-&gt;width)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	phy-&gt;dfs_state = -1;</div><div class='add'>+	mt76_wcid_cleanup(&amp;dev-&gt;mt76, &amp;msta-&gt;wcid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7915_set_channel(struct mt7915_phy *phy)</div><div class='add'>+int mt7915_set_channel(struct mt76_phy *mphy)</div><div class='ctx'> {</div><div class='add'>+	struct mt7915_phy *phy = mphy-&gt;priv;</div><div class='ctx'> 	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	cancel_delayed_work_sync(&amp;phy-&gt;mt76-&gt;mac_work);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='del'>-	set_bit(MT76_RESET, &amp;phy-&gt;mt76-&gt;state);</div><div class='del'>-</div><div class='del'>-	mt7915_init_dfs_state(phy);</div><div class='del'>-	mt76_set_channel(phy-&gt;mt76);</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;flash_mode) {</div><div class='add'>+	if (dev-&gt;cal) {</div><div class='ctx'> 		ret = mt7915_mcu_apply_tx_dpd(phy);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -331,11 +344,6 @@ int mt7915_set_channel(struct mt7915_phy *phy)</div><div class='ctx'> 	phy-&gt;noise = 0;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	clear_bit(MT76_RESET, &amp;phy-&gt;mt76-&gt;state);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='del'>-</div><div class='del'>-	mt76_txq_schedule_all(phy-&gt;mt76);</div><div class='del'>-</div><div class='ctx'> 	if (!mt76_testmode_enabled(phy-&gt;mt76))</div><div class='ctx'> 		ieee80211_queue_delayed_work(phy-&gt;mt76-&gt;hw,</div><div class='ctx'> 					     &amp;phy-&gt;mt76-&gt;mac_work,</div><div class='hunk'>@@ -349,6 +357,7 @@ static int mt7915_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 			  struct ieee80211_key_conf *key)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='add'>+	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='ctx'> 	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct mt7915_sta *msta = sta ? (struct mt7915_sta *)sta-&gt;drv_priv :</div><div class='ctx'> 				  &amp;mvif-&gt;sta;</div><div class='hunk'>@@ -357,6 +366,13 @@ static int mt7915_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 	int idx = key-&gt;keyidx;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='add'>+	if (sta &amp;&amp; !wcid-&gt;sta) {</div><div class='add'>+		if (cmd != SET_KEY)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* The hardware does not support per-STA RX GTK, fallback</div><div class='ctx'> 	 * to software mode for these.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -388,29 +404,56 @@ static int mt7915_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='del'>-	if (cmd == SET_KEY)</div><div class='add'>+	if (cmd == SET_KEY &amp;&amp; !sta &amp;&amp; !mvif-&gt;mt76.cipher) {</div><div class='add'>+		mvif-&gt;mt76.cipher = mt76_connac_mcu_get_cipher(key-&gt;cipher);</div><div class='add'>+		mt7915_mcu_add_bss_info(phy, vif, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd == SET_KEY) {</div><div class='ctx'> 		*wcid_keyidx = idx;</div><div class='del'>-	else if (idx == *wcid_keyidx)</div><div class='del'>-		*wcid_keyidx = -1;</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='add'>+		if (idx == *wcid_keyidx)</div><div class='add'>+			*wcid_keyidx = -1;</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mt76_wcid_key_setup(&amp;dev-&gt;mt76, wcid,</div><div class='del'>-			    cmd == SET_KEY ? key : NULL);</div><div class='add'>+	mt76_wcid_key_setup(&amp;dev-&gt;mt76, wcid, key);</div><div class='add'>+	err = mt76_connac_mcu_add_key(&amp;dev-&gt;mt76, vif, &amp;msta-&gt;bip,</div><div class='add'>+				      key, MCU_EXT_CMD(STA_REC_UPDATE),</div><div class='add'>+				      &amp;msta-&gt;wcid, cmd);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='del'>-	err = mt7915_mcu_add_key(dev, vif, msta, key, cmd);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static int mt7915_set_sar_specs(struct ieee80211_hw *hw,</div><div class='add'>+				const struct cfg80211_sar_specs *sar)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='add'>+	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+	if (!cfg80211_chandef_valid(&amp;phy-&gt;mt76-&gt;chandef))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt76_init_sar_power(hw, sar);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt7915_mcu_set_txpower_sku(phy);</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7915_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+static int mt7915_config(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+			 u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='ctx'> 	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='del'>-	bool band = phy != &amp;dev-&gt;phy;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; IEEE80211_CONF_CHANGE_CHANNEL) {</div><div class='hunk'>@@ -421,14 +464,13 @@ static int mt7915_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> 			mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='del'>-		ieee80211_stop_queues(hw);</div><div class='del'>-		ret = mt7915_set_channel(phy);</div><div class='add'>+		ret = mt76_update_channel(phy-&gt;mt76);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='del'>-		ieee80211_wake_queues(hw);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (changed &amp; IEEE80211_CONF_CHANGE_POWER) {</div><div class='add'>+	if (changed &amp; (IEEE80211_CONF_CHANGE_POWER |</div><div class='add'>+		       IEEE80211_CONF_CHANGE_CHANNEL)) {</div><div class='ctx'> 		ret = mt7915_mcu_set_txpower_sku(phy);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -438,16 +480,23 @@ static int mt7915_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; IEEE80211_CONF_CHANGE_MONITOR) {</div><div class='ctx'> 		bool enabled = !!(hw-&gt;conf.flags &amp; IEEE80211_CONF_MONITOR);</div><div class='del'>-</div><div class='del'>-		if (!enabled)</div><div class='del'>-			phy-&gt;rxfilter |= MT_WF_RFCR_DROP_OTHER_UC;</div><div class='del'>-		else</div><div class='del'>-			phy-&gt;rxfilter &amp;= ~MT_WF_RFCR_DROP_OTHER_UC;</div><div class='add'>+		bool band = phy-&gt;mt76-&gt;band_idx;</div><div class='add'>+		u32 rxfilter = phy-&gt;rxfilter;</div><div class='add'>+</div><div class='add'>+		if (!enabled) {</div><div class='add'>+			rxfilter |= MT_WF_RFCR_DROP_OTHER_UC;</div><div class='add'>+			dev-&gt;monitor_mask &amp;= ~BIT(band);</div><div class='add'>+		} else {</div><div class='add'>+			rxfilter &amp;= ~MT_WF_RFCR_DROP_OTHER_UC;</div><div class='add'>+			dev-&gt;monitor_mask |= BIT(band);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		mt76_rmw_field(dev, MT_DMA_DCR0(band), MT_DMA_DCR0_RXD_G5_EN,</div><div class='ctx'> 			       enabled);</div><div class='add'>+		mt76_rmw_field(dev, MT_DMA_DCR0(band), MT_MDP_DCR0_RX_HDR_TRANS_EN,</div><div class='add'>+			       !dev-&gt;monitor_mask);</div><div class='ctx'> 		mt76_testmode_reset(phy-&gt;mt76, true);</div><div class='del'>-		mt76_wr(dev, MT_WF_RFCR(band), phy-&gt;rxfilter);</div><div class='add'>+		mt76_wr(dev, MT_WF_RFCR(band), rxfilter);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='hunk'>@@ -456,14 +505,14 @@ static int mt7915_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt7915_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue,</div><div class='add'>+mt7915_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+	       unsigned int link_id, u16 queue,</div><div class='ctx'> 	       const struct ieee80211_tx_queue_params *params)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='ctx'> 	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='ctx'> </div><div class='ctx'> 	/* no need to update right away, we'll get BSS_CHANGED_QOS */</div><div class='del'>-	queue = mt7915_lmac_mapping(dev, queue);</div><div class='add'>+	queue = mt76_connac_lmac_mapping(queue);</div><div class='ctx'> 	mvif-&gt;queue_params[queue] = *params;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -476,12 +525,13 @@ static void mt7915_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='ctx'> 	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='del'>-	bool band = phy != &amp;dev-&gt;phy;</div><div class='add'>+	bool band = phy-&gt;mt76-&gt;band_idx;</div><div class='ctx'> 	u32 ctl_flags = MT_WF_RFCR1_DROP_ACK |</div><div class='ctx'> 			MT_WF_RFCR1_DROP_BF_POLL |</div><div class='ctx'> 			MT_WF_RFCR1_DROP_BA |</div><div class='ctx'> 			MT_WF_RFCR1_DROP_CFEND |</div><div class='ctx'> 			MT_WF_RFCR1_DROP_CFACK;</div><div class='add'>+	u32 rxfilter;</div><div class='ctx'> 	u32 flags = 0;</div><div class='ctx'> </div><div class='ctx'> #define MT76_FILTER(_flag, _hw) do {					\</div><div class='hunk'>@@ -512,11 +562,15 @@ static void mt7915_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	MT76_FILTER(CONTROL, MT_WF_RFCR_DROP_CTS |</div><div class='ctx'> 			     MT_WF_RFCR_DROP_RTS |</div><div class='del'>-			     MT_WF_RFCR_DROP_CTL_RSV |</div><div class='del'>-			     MT_WF_RFCR_DROP_NDPA);</div><div class='add'>+			     MT_WF_RFCR_DROP_CTL_RSV);</div><div class='ctx'> </div><div class='ctx'> 	*total_flags = flags;</div><div class='del'>-	mt76_wr(dev, MT_WF_RFCR(band), phy-&gt;rxfilter);</div><div class='add'>+	rxfilter = phy-&gt;rxfilter;</div><div class='add'>+	if (hw-&gt;conf.flags &amp; IEEE80211_CONF_MONITOR)</div><div class='add'>+		rxfilter &amp;= ~MT_WF_RFCR_DROP_OTHER_UC;</div><div class='add'>+	else</div><div class='add'>+		rxfilter |= MT_WF_RFCR_DROP_OTHER_UC;</div><div class='add'>+	mt76_wr(dev, MT_WF_RFCR(band), rxfilter);</div><div class='ctx'> </div><div class='ctx'> 	if (*total_flags &amp; FIF_CONTROL)</div><div class='ctx'> 		mt76_clear(dev, MT_WF_RFCR1(band), ctl_flags);</div><div class='hunk'>@@ -526,13 +580,37 @@ static void mt7915_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+mt7915_update_bss_color(struct ieee80211_hw *hw,</div><div class='add'>+			struct ieee80211_vif *vif,</div><div class='add'>+			struct cfg80211_he_bss_color *bss_color)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='add'>+</div><div class='add'>+	switch (vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_AP: {</div><div class='add'>+		struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+		if (mvif-&gt;mt76.omac_idx &gt; HW_BSSID_MAX)</div><div class='add'>+			return;</div><div class='add'>+		fallthrough;</div><div class='add'>+	}</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		mt7915_mcu_update_bss_color(dev, vif, bss_color);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void mt7915_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 				    struct ieee80211_vif *vif,</div><div class='ctx'> 				    struct ieee80211_bss_conf *info,</div><div class='del'>-				    u32 changed)</div><div class='add'>+				    u64 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='ctx'> 	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='add'>+	int set_bss_info = -1, set_sta = -1;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -541,20 +619,29 @@ static void mt7915_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	 * and then peer references bss_info_rfch to set bandwidth cap.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_BSSID &amp;&amp;</div><div class='del'>-	    vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='del'>-		bool join = !is_zero_ether_addr(info-&gt;bssid);</div><div class='del'>-</div><div class='del'>-		mt7915_mcu_add_bss_info(phy, vif, join);</div><div class='del'>-		mt7915_mcu_add_sta(dev, vif, NULL, join);</div><div class='del'>-	}</div><div class='add'>+	    vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+		set_bss_info = set_sta = !is_zero_ether_addr(info-&gt;bssid);</div><div class='add'>+	if (changed &amp; BSS_CHANGED_ASSOC)</div><div class='add'>+		set_bss_info = vif-&gt;cfg.assoc;</div><div class='add'>+	if (changed &amp; BSS_CHANGED_BEACON_ENABLED &amp;&amp;</div><div class='add'>+	    info-&gt;enable_beacon &amp;&amp;</div><div class='add'>+	    vif-&gt;type != NL80211_IFTYPE_AP)</div><div class='add'>+		set_bss_info = set_sta = 1;</div><div class='add'>+</div><div class='add'>+	if (set_bss_info == 1)</div><div class='add'>+		mt7915_mcu_add_bss_info(phy, vif, true);</div><div class='add'>+	if (set_sta == 1)</div><div class='add'>+		mt7915_mcu_add_sta(dev, vif, NULL, CONN_STATE_PORT_SECURE, false);</div><div class='ctx'> </div><div class='del'>-	if (changed &amp; BSS_CHANGED_ASSOC) {</div><div class='del'>-		mt7915_mcu_add_bss_info(phy, vif, info-&gt;assoc);</div><div class='del'>-		mt7915_mcu_add_obss_spr(dev, vif, info-&gt;he_obss_pd.enable);</div><div class='del'>-	}</div><div class='add'>+	if (changed &amp; BSS_CHANGED_ERP_CTS_PROT)</div><div class='add'>+		mt7915_mac_enable_rtscts(dev, vif, info-&gt;use_cts_prot);</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_ERP_SLOT) {</div><div class='del'>-		int slottime = info-&gt;use_short_slot ? 9 : 20;</div><div class='add'>+		int slottime = 9;</div><div class='add'>+</div><div class='add'>+		if (phy-&gt;mt76-&gt;chandef.chan-&gt;band == NL80211_BAND_2GHZ &amp;&amp;</div><div class='add'>+		    !info-&gt;use_short_slot)</div><div class='add'>+			slottime = 20;</div><div class='ctx'> </div><div class='ctx'> 		if (slottime != phy-&gt;slottime) {</div><div class='ctx'> 			phy-&gt;slottime = slottime;</div><div class='hunk'>@@ -562,26 +649,84 @@ static void mt7915_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (changed &amp; BSS_CHANGED_BEACON_ENABLED &amp;&amp; info-&gt;enable_beacon) {</div><div class='del'>-		mt7915_mcu_add_bss_info(phy, vif, true);</div><div class='del'>-		mt7915_mcu_add_sta(dev, vif, NULL, true);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* ensure that enable txcmd_mode after bss_info */</div><div class='ctx'> 	if (changed &amp; (BSS_CHANGED_QOS | BSS_CHANGED_BEACON_ENABLED))</div><div class='ctx'> 		mt7915_mcu_set_tx(dev, vif);</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_HE_OBSS_PD)</div><div class='del'>-		mt7915_mcu_add_obss_spr(dev, vif, info-&gt;he_obss_pd.enable);</div><div class='add'>+		mt7915_mcu_add_obss_spr(phy, vif, &amp;info-&gt;he_obss_pd);</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_HE_BSS_COLOR)</div><div class='add'>+		mt7915_update_bss_color(hw, vif, &amp;info-&gt;he_bss_color);</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; (BSS_CHANGED_BEACON |</div><div class='ctx'> 		       BSS_CHANGED_BEACON_ENABLED))</div><div class='del'>-		mt7915_mcu_add_beacon(hw, vif, info-&gt;enable_beacon);</div><div class='add'>+		mt7915_mcu_add_beacon(hw, vif, info-&gt;enable_beacon, changed);</div><div class='add'>+</div><div class='add'>+	if (changed &amp; (BSS_CHANGED_UNSOL_BCAST_PROBE_RESP |</div><div class='add'>+		       BSS_CHANGED_FILS_DISCOVERY))</div><div class='add'>+		mt7915_mcu_add_inband_discov(dev, vif, changed);</div><div class='add'>+</div><div class='add'>+	if (set_bss_info == 0)</div><div class='add'>+		mt7915_mcu_add_bss_info(phy, vif, false);</div><div class='add'>+	if (set_sta == 0)</div><div class='add'>+		mt7915_mcu_add_sta(dev, vif, NULL, CONN_STATE_DISCONNECT, false);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='add'>+mt7915_vif_check_caps(struct mt7915_phy *phy, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7915_vif_cap *vc = &amp;mvif-&gt;cap;</div><div class='add'>+</div><div class='add'>+	vc-&gt;ht_ldpc = vif-&gt;bss_conf.ht_ldpc;</div><div class='add'>+	vc-&gt;vht_ldpc = vif-&gt;bss_conf.vht_ldpc;</div><div class='add'>+	vc-&gt;vht_su_ebfer = vif-&gt;bss_conf.vht_su_beamformer;</div><div class='add'>+	vc-&gt;vht_su_ebfee = vif-&gt;bss_conf.vht_su_beamformee;</div><div class='add'>+	vc-&gt;vht_mu_ebfer = vif-&gt;bss_conf.vht_mu_beamformer;</div><div class='add'>+	vc-&gt;vht_mu_ebfee = vif-&gt;bss_conf.vht_mu_beamformee;</div><div class='add'>+	vc-&gt;he_ldpc = vif-&gt;bss_conf.he_ldpc;</div><div class='add'>+	vc-&gt;he_su_ebfer = vif-&gt;bss_conf.he_su_beamformer;</div><div class='add'>+	vc-&gt;he_su_ebfee = vif-&gt;bss_conf.he_su_beamformee;</div><div class='add'>+	vc-&gt;he_mu_ebfer = vif-&gt;bss_conf.he_mu_beamformer;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7915_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='add'>+	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	mt7915_vif_check_caps(phy, vif);</div><div class='add'>+</div><div class='add'>+	err = mt7915_mcu_add_bss_info(phy, vif, true);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+	err = mt7915_mcu_add_sta(dev, vif, NULL, CONN_STATE_PORT_SECURE, false);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7915_stop_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+	       struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+	mt7915_mcu_add_sta(dev, vif, NULL, CONN_STATE_DISCONNECT, false);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='ctx'> mt7915_channel_switch_beacon(struct ieee80211_hw *hw,</div><div class='ctx'> 			     struct ieee80211_vif *vif,</div><div class='ctx'> 			     struct cfg80211_chan_def *chandef)</div><div class='hunk'>@@ -589,7 +734,7 @@ mt7915_channel_switch_beacon(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='del'>-	mt7915_mcu_add_beacon(hw, vif, true);</div><div class='add'>+	mt7915_mcu_add_beacon(hw, vif, true, BSS_CHANGED_BEACON);</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -599,30 +744,123 @@ int mt7915_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='ctx'> 	struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);</div><div class='ctx'> 	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='ctx'> 	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='del'>-	int ret, idx;</div><div class='add'>+	bool ext_phy = mvif-&gt;phy != &amp;dev-&gt;phy;</div><div class='add'>+	int idx;</div><div class='ctx'> </div><div class='del'>-	idx = mt76_wcid_alloc(dev-&gt;mt76.wcid_mask, MT7915_WTBL_STA - 1);</div><div class='add'>+	idx = mt76_wcid_alloc(dev-&gt;mt76.wcid_mask, MT7915_WTBL_STA);</div><div class='ctx'> 	if (idx &lt; 0)</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;msta-&gt;rc_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;msta-&gt;stats_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;msta-&gt;poll_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;msta-&gt;wcid.poll_list);</div><div class='ctx'> 	msta-&gt;vif = mvif;</div><div class='del'>-	msta-&gt;wcid.sta = 1;</div><div class='add'>+	msta-&gt;wcid.sta_disabled = 1;</div><div class='ctx'> 	msta-&gt;wcid.idx = idx;</div><div class='del'>-	msta-&gt;wcid.ext_phy = mvif-&gt;band_idx;</div><div class='del'>-	msta-&gt;wcid.tx_info |= MT_WCID_TX_INFO_SET;</div><div class='del'>-	msta-&gt;stats.jiffies = jiffies;</div><div class='add'>+	msta-&gt;wcid.phy_idx = ext_phy;</div><div class='add'>+	msta-&gt;jiffies = jiffies;</div><div class='add'>+</div><div class='add'>+	ewma_avg_signal_init(&amp;msta-&gt;avg_ack_signal);</div><div class='ctx'> </div><div class='ctx'> 	mt7915_mac_wtbl_update(dev, idx,</div><div class='ctx'> 			       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);</div><div class='add'>+	mt7915_mcu_add_sta(dev, vif, sta, CONN_STATE_DISCONNECT, true);</div><div class='ctx'> </div><div class='del'>-	ret = mt7915_mcu_add_sta(dev, vif, sta, true);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct drop_sta_iter {</div><div class='add'>+	struct mt7915_dev *dev;</div><div class='add'>+	struct ieee80211_hw *hw;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	u8 sta_addr[ETH_ALEN];</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	return mt7915_mcu_add_sta_adv(dev, vif, sta, true);</div><div class='add'>+static void</div><div class='add'>+__mt7915_drop_sta(void *ptr, u8 *mac, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct drop_sta_iter *data = ptr;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct mt7915_sta *msta;</div><div class='add'>+</div><div class='add'>+	if (vif == data-&gt;vif || vif-&gt;type != NL80211_IFTYPE_AP)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sta = ieee80211_find_sta_by_ifaddr(data-&gt;hw, data-&gt;sta_addr, mac);</div><div class='add'>+	if (!sta)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='add'>+	mt7915_mcu_add_sta(data-&gt;dev, vif, sta, CONN_STATE_DISCONNECT, false);</div><div class='add'>+	msta-&gt;wcid.sta_disabled = 1;</div><div class='add'>+	msta-&gt;wcid.sta = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7915_drop_other_sta(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+		      struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct mt76_phy *ext_phy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='add'>+	struct drop_sta_iter data = {</div><div class='add'>+		.dev = dev,</div><div class='add'>+		.hw = dev-&gt;mphy.hw,</div><div class='add'>+		.vif = vif,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_AP)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memcpy(data.sta_addr, sta-&gt;addr, ETH_ALEN);</div><div class='add'>+	ieee80211_iterate_active_interfaces(data.hw, 0, __mt7915_drop_sta, &amp;data);</div><div class='add'>+</div><div class='add'>+	if (!ext_phy)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	data.hw = ext_phy-&gt;hw;</div><div class='add'>+	ieee80211_iterate_active_interfaces(data.hw, 0, __mt7915_drop_sta, &amp;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7915_mac_sta_event(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='add'>+			 struct ieee80211_sta *sta, enum mt76_sta_event ev)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);</div><div class='add'>+	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='add'>+	int i, ret;</div><div class='add'>+	u32 addr;</div><div class='add'>+</div><div class='add'>+	switch (ev) {</div><div class='add'>+	case MT76_STA_EVENT_ASSOC:</div><div class='add'>+		ret = mt7915_mcu_add_sta(dev, vif, sta, CONN_STATE_CONNECT, true);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		addr = mt7915_mac_wtbl_lmac_addr(dev, msta-&gt;wcid.idx, 30);</div><div class='add'>+		mt76_rmw_field(dev, addr, GENMASK(7, 0), 0xa0);</div><div class='add'>+</div><div class='add'>+		ret = mt7915_mcu_add_rate_ctrl(dev, vif, sta, false);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		msta-&gt;wcid.tx_info |= MT_WCID_TX_INFO_SET;</div><div class='add'>+		msta-&gt;wcid.sta = 1;</div><div class='add'>+		msta-&gt;wcid.sta_disabled = 0;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case MT76_STA_EVENT_AUTHORIZE:</div><div class='add'>+		mt7915_drop_other_sta(dev, vif, sta);</div><div class='add'>+		return mt7915_mcu_add_sta(dev, vif, sta, CONN_STATE_PORT_SECURE, false);</div><div class='add'>+</div><div class='add'>+	case MT76_STA_EVENT_DISASSOC:</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(msta-&gt;twt.flow); i++)</div><div class='add'>+			mt7915_mac_twt_teardown_flow(dev, msta, i);</div><div class='add'>+</div><div class='add'>+		mt7915_mcu_add_sta(dev, vif, sta, CONN_STATE_DISCONNECT, false);</div><div class='add'>+		msta-&gt;wcid.sta_disabled = 1;</div><div class='add'>+		msta-&gt;wcid.sta = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt7915_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='hunk'>@@ -631,20 +869,15 @@ void mt7915_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='ctx'> 	struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);</div><div class='ctx'> 	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='ctx'> </div><div class='del'>-	mt7915_mcu_add_sta_adv(dev, vif, sta, false);</div><div class='del'>-	mt7915_mcu_add_sta(dev, vif, sta, false);</div><div class='del'>-</div><div class='ctx'> 	mt7915_mac_wtbl_update(dev, msta-&gt;wcid.idx,</div><div class='ctx'> 			       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-	if (!list_empty(&amp;msta-&gt;poll_list))</div><div class='del'>-		list_del_init(&amp;msta-&gt;poll_list);</div><div class='del'>-	if (!list_empty(&amp;msta-&gt;stats_list))</div><div class='del'>-		list_del_init(&amp;msta-&gt;stats_list);</div><div class='add'>+	spin_lock_bh(&amp;mdev-&gt;sta_poll_lock);</div><div class='add'>+	if (!list_empty(&amp;msta-&gt;wcid.poll_list))</div><div class='add'>+		list_del_init(&amp;msta-&gt;wcid.poll_list);</div><div class='ctx'> 	if (!list_empty(&amp;msta-&gt;rc_list))</div><div class='ctx'> 		list_del_init(&amp;msta-&gt;rc_list);</div><div class='del'>-	spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+	spin_unlock_bh(&amp;mdev-&gt;sta_poll_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mt7915_tx(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -674,14 +907,16 @@ static void mt7915_tx(struct ieee80211_hw *hw,</div><div class='ctx'> 	mt76_tx(mphy, control-&gt;sta, wcid, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7915_set_rts_threshold(struct ieee80211_hw *hw, u32 val)</div><div class='add'>+static int mt7915_set_rts_threshold(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+				    u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='ctx'> 	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='del'>-	ret = mt7915_mcu_set_rts_thresh(phy, val);</div><div class='add'>+	ret = mt76_connac_mcu_set_rts_thresh(&amp;dev-&gt;mt76, val,</div><div class='add'>+					     phy-&gt;mt76-&gt;band_idx);</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -725,16 +960,16 @@ mt7915_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_STOP_FLUSH:</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:</div><div class='ctx'> 		mtxq-&gt;aggr = false;</div><div class='del'>-		clear_bit(tid, &amp;msta-&gt;ampdu_state);</div><div class='add'>+		clear_bit(tid, &amp;msta-&gt;wcid.ampdu_state);</div><div class='ctx'> 		ret = mt7915_mcu_add_tx_ba(dev, params, false);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_START:</div><div class='del'>-		set_bit(tid, &amp;msta-&gt;ampdu_state);</div><div class='add'>+		set_bit(tid, &amp;msta-&gt;wcid.ampdu_state);</div><div class='ctx'> 		ret = IEEE80211_AMPDU_TX_START_IMMEDIATE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_STOP_CONT:</div><div class='ctx'> 		mtxq-&gt;aggr = false;</div><div class='del'>-		clear_bit(tid, &amp;msta-&gt;ampdu_state);</div><div class='add'>+		clear_bit(tid, &amp;msta-&gt;wcid.ampdu_state);</div><div class='ctx'> 		ret = mt7915_mcu_add_tx_ba(dev, params, false);</div><div class='ctx'> 		ieee80211_stop_tx_ba_cb_irqsafe(vif, sta-&gt;addr, tid);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -745,66 +980,65 @@ mt7915_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt7915_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-	       struct ieee80211_sta *sta)</div><div class='del'>-{</div><div class='del'>-	return mt76_sta_state(hw, vif, sta, IEEE80211_STA_NOTEXIST,</div><div class='del'>-			      IEEE80211_STA_NONE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mt7915_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-		  struct ieee80211_sta *sta)</div><div class='del'>-{</div><div class='del'>-	return mt76_sta_state(hw, vif, sta, IEEE80211_STA_NONE,</div><div class='del'>-			      IEEE80211_STA_NOTEXIST);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='ctx'> mt7915_get_stats(struct ieee80211_hw *hw,</div><div class='ctx'> 		 struct ieee80211_low_level_stats *stats)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='ctx'> 	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='del'>-	struct mib_stats *mib = &amp;phy-&gt;mib;</div><div class='add'>+	struct mt76_mib_stats *mib = &amp;phy-&gt;mib;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='ctx'> 	stats-&gt;dot11RTSSuccessCount = mib-&gt;rts_cnt;</div><div class='ctx'> 	stats-&gt;dot11RTSFailureCount = mib-&gt;rts_retries_cnt;</div><div class='ctx'> 	stats-&gt;dot11FCSErrorCount = mib-&gt;fcs_err_cnt;</div><div class='ctx'> 	stats-&gt;dot11ACKFailureCount = mib-&gt;ack_fail_cnt;</div><div class='ctx'> </div><div class='del'>-	memset(mib, 0, sizeof(*mib));</div><div class='del'>-</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u64</div><div class='del'>-mt7915_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='add'>+u64 __mt7915_get_tsf(struct ieee80211_hw *hw, struct mt7915_vif *mvif)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='ctx'> 	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='del'>-	bool band = phy != &amp;dev-&gt;phy;</div><div class='add'>+	bool band = phy-&gt;mt76-&gt;band_idx;</div><div class='ctx'> 	union {</div><div class='ctx'> 		u64 t64;</div><div class='ctx'> 		u32 t32[2];</div><div class='ctx'> 	} tsf;</div><div class='ctx'> 	u16 n;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+	lockdep_assert_held(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='del'>-	n = mvif-&gt;omac_idx &gt; HW_BSSID_MAX ? HW_BSSID_0 : mvif-&gt;omac_idx;</div><div class='add'>+	n = mvif-&gt;mt76.omac_idx &gt; HW_BSSID_MAX ? HW_BSSID_0</div><div class='add'>+					       : mvif-&gt;mt76.omac_idx;</div><div class='ctx'> 	/* TSF software read */</div><div class='del'>-	mt76_set(dev, MT_LPON_TCR(band, n), MT_LPON_TCR_SW_MODE);</div><div class='add'>+	if (is_mt7915(&amp;dev-&gt;mt76))</div><div class='add'>+		mt76_rmw(dev, MT_LPON_TCR(band, n), MT_LPON_TCR_SW_MODE,</div><div class='add'>+			 MT_LPON_TCR_SW_READ);</div><div class='add'>+	else</div><div class='add'>+		mt76_rmw(dev, MT_LPON_TCR_MT7916(band, n), MT_LPON_TCR_SW_MODE,</div><div class='add'>+			 MT_LPON_TCR_SW_READ);</div><div class='ctx'> 	tsf.t32[0] = mt76_rr(dev, MT_LPON_UTTR0(band));</div><div class='ctx'> 	tsf.t32[1] = mt76_rr(dev, MT_LPON_UTTR1(band));</div><div class='ctx'> </div><div class='add'>+	return tsf.t64;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64</div><div class='add'>+mt7915_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='add'>+	u64 ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+	ret = __mt7915_get_tsf(hw, mvif);</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='del'>-	return tsf.t64;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -814,7 +1048,7 @@ mt7915_set_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='ctx'> 	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='del'>-	bool band = phy != &amp;dev-&gt;phy;</div><div class='add'>+	bool band = phy-&gt;mt76-&gt;band_idx;</div><div class='ctx'> 	union {</div><div class='ctx'> 		u64 t64;</div><div class='ctx'> 		u32 t32[2];</div><div class='hunk'>@@ -823,17 +1057,55 @@ mt7915_set_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='del'>-	n = mvif-&gt;omac_idx &gt; HW_BSSID_MAX ? HW_BSSID_0 : mvif-&gt;omac_idx;</div><div class='add'>+	n = mvif-&gt;mt76.omac_idx &gt; HW_BSSID_MAX ? HW_BSSID_0</div><div class='add'>+					       : mvif-&gt;mt76.omac_idx;</div><div class='ctx'> 	mt76_wr(dev, MT_LPON_UTTR0(band), tsf.t32[0]);</div><div class='ctx'> 	mt76_wr(dev, MT_LPON_UTTR1(band), tsf.t32[1]);</div><div class='ctx'> 	/* TSF software overwrite */</div><div class='del'>-	mt76_set(dev, MT_LPON_TCR(band, n), MT_LPON_TCR_SW_WRITE);</div><div class='add'>+	if (is_mt7915(&amp;dev-&gt;mt76))</div><div class='add'>+		mt76_rmw(dev, MT_LPON_TCR(band, n), MT_LPON_TCR_SW_MODE,</div><div class='add'>+			 MT_LPON_TCR_SW_WRITE);</div><div class='add'>+	else</div><div class='add'>+		mt76_rmw(dev, MT_LPON_TCR_MT7916(band, n), MT_LPON_TCR_SW_MODE,</div><div class='add'>+			 MT_LPON_TCR_SW_WRITE);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7915_set_coverage_class(struct ieee80211_hw *hw, s16 coverage_class)</div><div class='add'>+mt7915_offset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		  s64 timestamp)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='add'>+	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='add'>+	bool band = phy-&gt;mt76-&gt;band_idx;</div><div class='add'>+	union {</div><div class='add'>+		u64 t64;</div><div class='add'>+		u32 t32[2];</div><div class='add'>+	} tsf = { .t64 = timestamp, };</div><div class='add'>+	u16 n;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	n = mvif-&gt;mt76.omac_idx &gt; HW_BSSID_MAX ? HW_BSSID_0</div><div class='add'>+					       : mvif-&gt;mt76.omac_idx;</div><div class='add'>+	mt76_wr(dev, MT_LPON_UTTR0(band), tsf.t32[0]);</div><div class='add'>+	mt76_wr(dev, MT_LPON_UTTR1(band), tsf.t32[1]);</div><div class='add'>+	/* TSF software adjust*/</div><div class='add'>+	if (is_mt7915(&amp;dev-&gt;mt76))</div><div class='add'>+		mt76_rmw(dev, MT_LPON_TCR(band, n), MT_LPON_TCR_SW_MODE,</div><div class='add'>+			 MT_LPON_TCR_SW_ADJUST);</div><div class='add'>+	else</div><div class='add'>+		mt76_rmw(dev, MT_LPON_TCR_MT7916(band, n), MT_LPON_TCR_SW_MODE,</div><div class='add'>+			 MT_LPON_TCR_SW_ADJUST);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7915_set_coverage_class(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+			  s16 coverage_class)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='ctx'> 	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='hunk'>@@ -845,30 +1117,27 @@ mt7915_set_coverage_class(struct ieee80211_hw *hw, s16 coverage_class)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt7915_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)</div><div class='add'>+mt7915_set_antenna(struct ieee80211_hw *hw, int radio_idx, u32 tx_ant, u32 rx_ant)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='ctx'> 	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='ctx'> 	int max_nss = hweight8(hw-&gt;wiphy-&gt;available_antennas_tx);</div><div class='del'>-	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='add'>+	u8 chainshift = dev-&gt;chainshift;</div><div class='add'>+	u8 band = phy-&gt;mt76-&gt;band_idx;</div><div class='ctx'> </div><div class='ctx'> 	if (!tx_ant || tx_ant != rx_ant || ffs(tx_ant) &gt; max_nss)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if ((BIT(hweight8(tx_ant)) - 1) != tx_ant)</div><div class='del'>-		tx_ant = BIT(ffs(tx_ant) - 1) - 1;</div><div class='del'>-</div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='ctx'> 	phy-&gt;mt76-&gt;antenna_mask = tx_ant;</div><div class='ctx'> </div><div class='del'>-	if (ext_phy) {</div><div class='del'>-		if (dev-&gt;chainmask == 0xf)</div><div class='del'>-			tx_ant &lt;&lt;= 2;</div><div class='del'>-		else</div><div class='del'>-			tx_ant &lt;&lt;= 1;</div><div class='del'>-	}</div><div class='del'>-	phy-&gt;mt76-&gt;chainmask = tx_ant;</div><div class='add'>+	/* handle a variant of mt7916/mt7981 which has 3T3R but nss2 on 5 GHz band */</div><div class='add'>+	if ((is_mt7916(&amp;dev-&gt;mt76) || is_mt7981(&amp;dev-&gt;mt76)) &amp;&amp;</div><div class='add'>+	    band &amp;&amp; hweight8(tx_ant) == max_nss)</div><div class='add'>+		phy-&gt;mt76-&gt;chainmask = (dev-&gt;chainmask &gt;&gt; chainshift) &lt;&lt; chainshift;</div><div class='add'>+	else</div><div class='add'>+		phy-&gt;mt76-&gt;chainmask = tx_ant &lt;&lt; (chainshift * band);</div><div class='ctx'> </div><div class='ctx'> 	mt76_set_stream_caps(phy-&gt;mt76, true);</div><div class='ctx'> 	mt7915_set_stream_vht_txbf_caps(phy);</div><div class='hunk'>@@ -886,7 +1155,7 @@ static void mt7915_sta_statistics(struct ieee80211_hw *hw,</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='ctx'> 	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='del'>-	struct mt7915_sta_stats *stats = &amp;msta-&gt;stats;</div><div class='add'>+	struct rate_info *txrate = &amp;msta-&gt;wcid.rate;</div><div class='ctx'> 	struct rate_info rxrate = {};</div><div class='ctx'> </div><div class='ctx'> 	if (!mt7915_mcu_get_rx_rate(phy, vif, sta, &amp;rxrate)) {</div><div class='hunk'>@@ -894,41 +1163,110 @@ static void mt7915_sta_statistics(struct ieee80211_hw *hw,</div><div class='ctx'> 		sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_RX_BITRATE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!stats-&gt;tx_rate.legacy &amp;&amp; !stats-&gt;tx_rate.flags)</div><div class='del'>-		return;</div><div class='add'>+	if (txrate-&gt;legacy || txrate-&gt;flags) {</div><div class='add'>+		if (txrate-&gt;legacy) {</div><div class='add'>+			sinfo-&gt;txrate.legacy = txrate-&gt;legacy;</div><div class='add'>+		} else {</div><div class='add'>+			sinfo-&gt;txrate.mcs = txrate-&gt;mcs;</div><div class='add'>+			sinfo-&gt;txrate.nss = txrate-&gt;nss;</div><div class='add'>+			sinfo-&gt;txrate.bw = txrate-&gt;bw;</div><div class='add'>+			sinfo-&gt;txrate.he_gi = txrate-&gt;he_gi;</div><div class='add'>+			sinfo-&gt;txrate.he_dcm = txrate-&gt;he_dcm;</div><div class='add'>+			sinfo-&gt;txrate.he_ru_alloc = txrate-&gt;he_ru_alloc;</div><div class='add'>+		}</div><div class='add'>+		sinfo-&gt;txrate.flags = txrate-&gt;flags;</div><div class='add'>+		sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (stats-&gt;tx_rate.legacy) {</div><div class='del'>-		sinfo-&gt;txrate.legacy = stats-&gt;tx_rate.legacy;</div><div class='del'>-	} else {</div><div class='del'>-		sinfo-&gt;txrate.mcs = stats-&gt;tx_rate.mcs;</div><div class='del'>-		sinfo-&gt;txrate.nss = stats-&gt;tx_rate.nss;</div><div class='del'>-		sinfo-&gt;txrate.bw = stats-&gt;tx_rate.bw;</div><div class='del'>-		sinfo-&gt;txrate.he_gi = stats-&gt;tx_rate.he_gi;</div><div class='del'>-		sinfo-&gt;txrate.he_dcm = stats-&gt;tx_rate.he_dcm;</div><div class='del'>-		sinfo-&gt;txrate.he_ru_alloc = stats-&gt;tx_rate.he_ru_alloc;</div><div class='add'>+	/* offloading flows bypass networking stack, so driver counts and</div><div class='add'>+	 * reports sta statistics via NL80211_STA_INFO when WED is active.</div><div class='add'>+	 */</div><div class='add'>+	if (mtk_wed_device_active(&amp;phy-&gt;dev-&gt;mt76.mmio.wed)) {</div><div class='add'>+		sinfo-&gt;tx_bytes = msta-&gt;wcid.stats.tx_bytes;</div><div class='add'>+		sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_TX_BYTES64);</div><div class='add'>+</div><div class='add'>+		if (!mt7915_mcu_wed_wa_tx_stats(phy-&gt;dev, msta-&gt;wcid.idx)) {</div><div class='add'>+			sinfo-&gt;tx_packets = msta-&gt;wcid.stats.tx_packets;</div><div class='add'>+			sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_TX_PACKETS);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (mtk_wed_get_rx_capa(&amp;phy-&gt;dev-&gt;mt76.mmio.wed)) {</div><div class='add'>+			sinfo-&gt;rx_bytes = msta-&gt;wcid.stats.rx_bytes;</div><div class='add'>+			sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_RX_BYTES64);</div><div class='add'>+</div><div class='add'>+			sinfo-&gt;rx_packets = msta-&gt;wcid.stats.rx_packets;</div><div class='add'>+			sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_RX_PACKETS);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	sinfo-&gt;txrate.flags = stats-&gt;tx_rate.flags;</div><div class='del'>-	sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);</div><div class='add'>+</div><div class='add'>+	sinfo-&gt;tx_failed = msta-&gt;wcid.stats.tx_failed;</div><div class='add'>+	sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_TX_FAILED);</div><div class='add'>+</div><div class='add'>+	sinfo-&gt;tx_retries = msta-&gt;wcid.stats.tx_retries;</div><div class='add'>+	sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_TX_RETRIES);</div><div class='add'>+</div><div class='add'>+	sinfo-&gt;ack_signal = (s8)msta-&gt;ack_signal;</div><div class='add'>+	sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_ACK_SIGNAL);</div><div class='add'>+</div><div class='add'>+	sinfo-&gt;avg_ack_signal = -(s8)ewma_avg_signal_read(&amp;msta-&gt;avg_ack_signal);</div><div class='add'>+	sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_ACK_SIGNAL_AVG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7915_sta_rc_update(struct ieee80211_hw *hw,</div><div class='del'>-		     struct ieee80211_vif *vif,</div><div class='del'>-		     struct ieee80211_sta *sta,</div><div class='del'>-		     u32 changed)</div><div class='add'>+static void mt7915_sta_rc_work(void *data, struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='ctx'> 	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct mt7915_dev *dev = msta-&gt;vif-&gt;phy-&gt;dev;</div><div class='add'>+	u32 *changed = data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-	msta-&gt;stats.changed |= changed;</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='add'>+	msta-&gt;changed |= *changed;</div><div class='ctx'> 	if (list_empty(&amp;msta-&gt;rc_list))</div><div class='ctx'> 		list_add_tail(&amp;msta-&gt;rc_list, &amp;dev-&gt;sta_rc_list);</div><div class='del'>-	spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7915_sta_rc_update(struct ieee80211_hw *hw,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_link_sta *link_sta,</div><div class='add'>+				 u32 changed)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta = link_sta-&gt;sta;</div><div class='add'>+	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	if (!msta-&gt;wcid.sta)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='add'>+	mt7915_sta_rc_work(&amp;changed, sta);</div><div class='ctx'> 	ieee80211_queue_work(hw, &amp;dev-&gt;rc_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+mt7915_set_bitrate_mask(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			const struct cfg80211_bitrate_mask *mask)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	u32 changed = IEEE80211_RC_SUPP_RATES_CHANGED;</div><div class='add'>+</div><div class='add'>+	mvif-&gt;bitrate_mask = *mask;</div><div class='add'>+</div><div class='add'>+	/* if multiple rates across different preambles are given we can</div><div class='add'>+	 * reconfigure this info with all peers using sta_rec command with</div><div class='add'>+	 * the below exception cases.</div><div class='add'>+	 * - single rate : if a rate is passed along with different preambles,</div><div class='add'>+	 * we select the highest one as fixed rate. i.e VHT MCS for VHT peers.</div><div class='add'>+	 * - multiple rates: if it's not in range format i.e 0-{7,8,9} for VHT</div><div class='add'>+	 * then multiple MCS setting (MCS 4,5,6) is not supported.</div><div class='add'>+	 */</div><div class='add'>+	ieee80211_iterate_stations_atomic(hw, mt7915_sta_rc_work, &amp;changed);</div><div class='add'>+	ieee80211_queue_work(hw, &amp;dev-&gt;rc_work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void mt7915_sta_set_4addr(struct ieee80211_hw *hw,</div><div class='ctx'> 				 struct ieee80211_vif *vif,</div><div class='ctx'> 				 struct ieee80211_sta *sta,</div><div class='hunk'>@@ -942,7 +1280,10 @@ static void mt7915_sta_set_4addr(struct ieee80211_hw *hw,</div><div class='ctx'> 	else</div><div class='ctx'> 		clear_bit(MT_WCID_FLAG_4ADDR, &amp;msta-&gt;wcid.flags);</div><div class='ctx'> </div><div class='del'>-	mt7915_mcu_sta_update_hdr_trans(dev, vif, sta);</div><div class='add'>+	if (!msta-&gt;wcid.sta)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mt76_connac_mcu_wtbl_update_hdr_trans(&amp;dev-&gt;mt76, vif, sta);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mt7915_sta_set_decap_offload(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -958,10 +1299,468 @@ static void mt7915_sta_set_decap_offload(struct ieee80211_hw *hw,</div><div class='ctx'> 	else</div><div class='ctx'> 		clear_bit(MT_WCID_FLAG_HDR_TRANS, &amp;msta-&gt;wcid.flags);</div><div class='ctx'> </div><div class='del'>-	mt7915_mcu_sta_update_hdr_trans(dev, vif, sta);</div><div class='add'>+	if (!msta-&gt;wcid.sta)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mt76_connac_mcu_wtbl_update_hdr_trans(&amp;dev-&gt;mt76, vif, sta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7915_sta_set_txpwr(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='add'>+	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='add'>+	s16 txpower = sta-&gt;deflink.txpwr.power;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;deflink.txpwr.type == NL80211_TX_POWER_AUTOMATIC)</div><div class='add'>+		txpower = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	/* NOTE: temporarily use 0 as minimum limit, which is a</div><div class='add'>+	 * global setting and will be applied to all stations.</div><div class='add'>+	 */</div><div class='add'>+	ret = mt7915_mcu_set_txpower_frame_min(phy, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* This only applies to data frames while pushing traffic,</div><div class='add'>+	 * whereas the management frames or other packets that are</div><div class='add'>+	 * using fixed rate can be configured via TxD.</div><div class='add'>+	 */</div><div class='add'>+	ret = mt7915_mcu_set_txpower_frame(phy, vif, sta, txpower);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char mt7915_gstrings_stats[][ETH_GSTRING_LEN] = {</div><div class='add'>+	"tx_ampdu_cnt",</div><div class='add'>+	"tx_stop_q_empty_cnt",</div><div class='add'>+	"tx_mpdu_attempts",</div><div class='add'>+	"tx_mpdu_success",</div><div class='add'>+	"tx_rwp_fail_cnt",</div><div class='add'>+	"tx_rwp_need_cnt",</div><div class='add'>+	"tx_pkt_ebf_cnt",</div><div class='add'>+	"tx_pkt_ibf_cnt",</div><div class='add'>+	"tx_ampdu_len:0-1",</div><div class='add'>+	"tx_ampdu_len:2-10",</div><div class='add'>+	"tx_ampdu_len:11-19",</div><div class='add'>+	"tx_ampdu_len:20-28",</div><div class='add'>+	"tx_ampdu_len:29-37",</div><div class='add'>+	"tx_ampdu_len:38-46",</div><div class='add'>+	"tx_ampdu_len:47-55",</div><div class='add'>+	"tx_ampdu_len:56-79",</div><div class='add'>+	"tx_ampdu_len:80-103",</div><div class='add'>+	"tx_ampdu_len:104-127",</div><div class='add'>+	"tx_ampdu_len:128-151",</div><div class='add'>+	"tx_ampdu_len:152-175",</div><div class='add'>+	"tx_ampdu_len:176-199",</div><div class='add'>+	"tx_ampdu_len:200-223",</div><div class='add'>+	"tx_ampdu_len:224-247",</div><div class='add'>+	"ba_miss_count",</div><div class='add'>+	"tx_beamformer_ppdu_iBF",</div><div class='add'>+	"tx_beamformer_ppdu_eBF",</div><div class='add'>+	"tx_beamformer_rx_feedback_all",</div><div class='add'>+	"tx_beamformer_rx_feedback_he",</div><div class='add'>+	"tx_beamformer_rx_feedback_vht",</div><div class='add'>+	"tx_beamformer_rx_feedback_ht",</div><div class='add'>+	"tx_beamformer_rx_feedback_bw", /* zero based idx: 20, 40, 80, 160 */</div><div class='add'>+	"tx_beamformer_rx_feedback_nc",</div><div class='add'>+	"tx_beamformer_rx_feedback_nr",</div><div class='add'>+	"tx_beamformee_ok_feedback_pkts",</div><div class='add'>+	"tx_beamformee_feedback_trig",</div><div class='add'>+	"tx_mu_beamforming",</div><div class='add'>+	"tx_mu_mpdu",</div><div class='add'>+	"tx_mu_successful_mpdu",</div><div class='add'>+	"tx_su_successful_mpdu",</div><div class='add'>+	"tx_msdu_pack_1",</div><div class='add'>+	"tx_msdu_pack_2",</div><div class='add'>+	"tx_msdu_pack_3",</div><div class='add'>+	"tx_msdu_pack_4",</div><div class='add'>+	"tx_msdu_pack_5",</div><div class='add'>+	"tx_msdu_pack_6",</div><div class='add'>+	"tx_msdu_pack_7",</div><div class='add'>+	"tx_msdu_pack_8",</div><div class='add'>+</div><div class='add'>+	/* rx counters */</div><div class='add'>+	"rx_fifo_full_cnt",</div><div class='add'>+	"rx_mpdu_cnt",</div><div class='add'>+	"channel_idle_cnt",</div><div class='add'>+	"primary_cca_busy_time",</div><div class='add'>+	"secondary_cca_busy_time",</div><div class='add'>+	"primary_energy_detect_time",</div><div class='add'>+	"cck_mdrdy_time",</div><div class='add'>+	"ofdm_mdrdy_time",</div><div class='add'>+	"green_mdrdy_time",</div><div class='add'>+	"rx_vector_mismatch_cnt",</div><div class='add'>+	"rx_delimiter_fail_cnt",</div><div class='add'>+	"rx_mrdy_cnt",</div><div class='add'>+	"rx_len_mismatch_cnt",</div><div class='add'>+	"rx_ampdu_cnt",</div><div class='add'>+	"rx_ampdu_bytes_cnt",</div><div class='add'>+	"rx_ampdu_valid_subframe_cnt",</div><div class='add'>+	"rx_ampdu_valid_subframe_b_cnt",</div><div class='add'>+	"rx_pfdrop_cnt",</div><div class='add'>+	"rx_vec_queue_overflow_drop_cnt",</div><div class='add'>+	"rx_ba_cnt",</div><div class='add'>+</div><div class='add'>+	/* muru mu-mimo and ofdma related stats */</div><div class='add'>+	"dl_cck_cnt",</div><div class='add'>+	"dl_ofdm_cnt",</div><div class='add'>+	"dl_htmix_cnt",</div><div class='add'>+	"dl_htgf_cnt",</div><div class='add'>+	"dl_vht_su_cnt",</div><div class='add'>+	"dl_vht_2mu_cnt",</div><div class='add'>+	"dl_vht_3mu_cnt",</div><div class='add'>+	"dl_vht_4mu_cnt",</div><div class='add'>+	"dl_he_su_cnt",</div><div class='add'>+	"dl_he_ext_su_cnt",</div><div class='add'>+	"dl_he_2ru_cnt",</div><div class='add'>+	"dl_he_2mu_cnt",</div><div class='add'>+	"dl_he_3ru_cnt",</div><div class='add'>+	"dl_he_3mu_cnt",</div><div class='add'>+	"dl_he_4ru_cnt",</div><div class='add'>+	"dl_he_4mu_cnt",</div><div class='add'>+	"dl_he_5to8ru_cnt",</div><div class='add'>+	"dl_he_9to16ru_cnt",</div><div class='add'>+	"dl_he_gtr16ru_cnt",</div><div class='add'>+</div><div class='add'>+	"ul_hetrig_su_cnt",</div><div class='add'>+	"ul_hetrig_2ru_cnt",</div><div class='add'>+	"ul_hetrig_3ru_cnt",</div><div class='add'>+	"ul_hetrig_4ru_cnt",</div><div class='add'>+	"ul_hetrig_5to8ru_cnt",</div><div class='add'>+	"ul_hetrig_9to16ru_cnt",</div><div class='add'>+	"ul_hetrig_gtr16ru_cnt",</div><div class='add'>+	"ul_hetrig_2mu_cnt",</div><div class='add'>+	"ul_hetrig_3mu_cnt",</div><div class='add'>+	"ul_hetrig_4mu_cnt",</div><div class='add'>+</div><div class='add'>+	/* per vif counters */</div><div class='add'>+	"v_tx_mode_cck",</div><div class='add'>+	"v_tx_mode_ofdm",</div><div class='add'>+	"v_tx_mode_ht",</div><div class='add'>+	"v_tx_mode_ht_gf",</div><div class='add'>+	"v_tx_mode_vht",</div><div class='add'>+	"v_tx_mode_he_su",</div><div class='add'>+	"v_tx_mode_he_ext_su",</div><div class='add'>+	"v_tx_mode_he_tb",</div><div class='add'>+	"v_tx_mode_he_mu",</div><div class='add'>+	"v_tx_bw_20",</div><div class='add'>+	"v_tx_bw_40",</div><div class='add'>+	"v_tx_bw_80",</div><div class='add'>+	"v_tx_bw_160",</div><div class='add'>+	"v_tx_mcs_0",</div><div class='add'>+	"v_tx_mcs_1",</div><div class='add'>+	"v_tx_mcs_2",</div><div class='add'>+	"v_tx_mcs_3",</div><div class='add'>+	"v_tx_mcs_4",</div><div class='add'>+	"v_tx_mcs_5",</div><div class='add'>+	"v_tx_mcs_6",</div><div class='add'>+	"v_tx_mcs_7",</div><div class='add'>+	"v_tx_mcs_8",</div><div class='add'>+	"v_tx_mcs_9",</div><div class='add'>+	"v_tx_mcs_10",</div><div class='add'>+	"v_tx_mcs_11",</div><div class='add'>+	"v_tx_nss_1",</div><div class='add'>+	"v_tx_nss_2",</div><div class='add'>+	"v_tx_nss_3",</div><div class='add'>+	"v_tx_nss_4",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MT7915_SSTATS_LEN ARRAY_SIZE(mt7915_gstrings_stats)</div><div class='add'>+</div><div class='add'>+/* Ethtool related API */</div><div class='add'>+static</div><div class='add'>+void mt7915_get_et_strings(struct ieee80211_hw *hw,</div><div class='add'>+			   struct ieee80211_vif *vif,</div><div class='add'>+			   u32 sset, u8 *data)</div><div class='add'>+{</div><div class='add'>+	if (sset != ETH_SS_STATS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memcpy(data, mt7915_gstrings_stats, sizeof(mt7915_gstrings_stats));</div><div class='add'>+	data += sizeof(mt7915_gstrings_stats);</div><div class='add'>+	page_pool_ethtool_stats_get_strings(data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+int mt7915_get_et_sset_count(struct ieee80211_hw *hw,</div><div class='add'>+			     struct ieee80211_vif *vif, int sset)</div><div class='add'>+{</div><div class='add'>+	if (sset != ETH_SS_STATS)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return MT7915_SSTATS_LEN + page_pool_ethtool_stats_get_count();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7915_ethtool_worker(void *wi_data, struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct mt76_ethtool_worker_info *wi = wi_data;</div><div class='add'>+	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	if (msta-&gt;vif-&gt;mt76.idx != wi-&gt;idx)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mt76_ethtool_worker(wi, &amp;msta-&gt;wcid.stats, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void mt7915_get_et_stats(struct ieee80211_hw *hw,</div><div class='add'>+			 struct ieee80211_vif *vif,</div><div class='add'>+			 struct ethtool_stats *stats, u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='add'>+	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='add'>+	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_mib_stats *mib = &amp;phy-&gt;mib;</div><div class='add'>+	struct mt76_ethtool_worker_info wi = {</div><div class='add'>+		.data = data,</div><div class='add'>+		.idx = mvif-&gt;mt76.idx,</div><div class='add'>+	};</div><div class='add'>+	/* See mt7915_ampdu_stat_read_phy, etc */</div><div class='add'>+	int i, ei = 0, stats_size;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	mt7915_mac_update_stats(phy);</div><div class='add'>+</div><div class='add'>+	data[ei++] = mib-&gt;tx_ampdu_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;tx_stop_q_empty_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;tx_mpdu_attempts_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;tx_mpdu_success_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;tx_rwp_fail_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;tx_rwp_need_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;tx_pkt_ebf_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;tx_pkt_ibf_cnt;</div><div class='add'>+</div><div class='add'>+	/* Tx ampdu stat */</div><div class='add'>+	for (i = 0; i &lt; 15 /*ARRAY_SIZE(bound)*/; i++)</div><div class='add'>+		data[ei++] = phy-&gt;mt76-&gt;aggr_stats[i];</div><div class='add'>+</div><div class='add'>+	data[ei++] = phy-&gt;mib.ba_miss_cnt;</div><div class='add'>+</div><div class='add'>+	/* Tx Beamformer monitor */</div><div class='add'>+	data[ei++] = mib-&gt;tx_bf_ibf_ppdu_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;tx_bf_ebf_ppdu_cnt;</div><div class='add'>+</div><div class='add'>+	/* Tx Beamformer Rx feedback monitor */</div><div class='add'>+	data[ei++] = mib-&gt;tx_bf_rx_fb_all_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;tx_bf_rx_fb_he_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;tx_bf_rx_fb_vht_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;tx_bf_rx_fb_ht_cnt;</div><div class='add'>+</div><div class='add'>+	data[ei++] = mib-&gt;tx_bf_rx_fb_bw;</div><div class='add'>+	data[ei++] = mib-&gt;tx_bf_rx_fb_nc_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;tx_bf_rx_fb_nr_cnt;</div><div class='add'>+</div><div class='add'>+	/* Tx Beamformee Rx NDPA &amp; Tx feedback report */</div><div class='add'>+	data[ei++] = mib-&gt;tx_bf_fb_cpl_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;tx_bf_fb_trig_cnt;</div><div class='add'>+</div><div class='add'>+	/* Tx SU &amp; MU counters */</div><div class='add'>+	data[ei++] = mib-&gt;tx_bf_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;tx_mu_mpdu_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;tx_mu_acked_mpdu_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;tx_su_acked_mpdu_cnt;</div><div class='add'>+</div><div class='add'>+	/* Tx amsdu info (pack-count histogram) */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mib-&gt;tx_amsdu); i++)</div><div class='add'>+		data[ei++] = mib-&gt;tx_amsdu[i];</div><div class='add'>+</div><div class='add'>+	/* rx counters */</div><div class='add'>+	data[ei++] = mib-&gt;rx_fifo_full_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;rx_mpdu_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;channel_idle_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;primary_cca_busy_time;</div><div class='add'>+	data[ei++] = mib-&gt;secondary_cca_busy_time;</div><div class='add'>+	data[ei++] = mib-&gt;primary_energy_detect_time;</div><div class='add'>+	data[ei++] = mib-&gt;cck_mdrdy_time;</div><div class='add'>+	data[ei++] = mib-&gt;ofdm_mdrdy_time;</div><div class='add'>+	data[ei++] = mib-&gt;green_mdrdy_time;</div><div class='add'>+	data[ei++] = mib-&gt;rx_vector_mismatch_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;rx_delimiter_fail_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;rx_mrdy_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;rx_len_mismatch_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;rx_ampdu_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;rx_ampdu_bytes_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;rx_ampdu_valid_subframe_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;rx_ampdu_valid_subframe_bytes_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;rx_pfdrop_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;rx_vec_queue_overflow_drop_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;rx_ba_cnt;</div><div class='add'>+</div><div class='add'>+	data[ei++] = mib-&gt;dl_cck_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;dl_ofdm_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;dl_htmix_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;dl_htgf_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;dl_vht_su_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;dl_vht_2mu_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;dl_vht_3mu_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;dl_vht_4mu_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;dl_he_su_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;dl_he_ext_su_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;dl_he_2ru_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;dl_he_2mu_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;dl_he_3ru_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;dl_he_3mu_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;dl_he_4ru_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;dl_he_4mu_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;dl_he_5to8ru_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;dl_he_9to16ru_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;dl_he_gtr16ru_cnt;</div><div class='add'>+</div><div class='add'>+	data[ei++] = mib-&gt;ul_hetrig_su_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;ul_hetrig_2ru_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;ul_hetrig_3ru_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;ul_hetrig_4ru_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;ul_hetrig_5to8ru_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;ul_hetrig_9to16ru_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;ul_hetrig_gtr16ru_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;ul_hetrig_2mu_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;ul_hetrig_3mu_cnt;</div><div class='add'>+	data[ei++] = mib-&gt;ul_hetrig_4mu_cnt;</div><div class='add'>+</div><div class='add'>+	/* Add values for all stations owned by this vif */</div><div class='add'>+	wi.initial_stat_idx = ei;</div><div class='add'>+	ieee80211_iterate_stations_atomic(hw, mt7915_ethtool_worker, &amp;wi);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	if (wi.sta_count == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ei += wi.worker_stat_count;</div><div class='add'>+</div><div class='add'>+	mt76_ethtool_page_pool_stats(&amp;dev-&gt;mt76, &amp;data[ei], &amp;ei);</div><div class='add'>+</div><div class='add'>+	stats_size = MT7915_SSTATS_LEN + page_pool_ethtool_stats_get_count();</div><div class='add'>+	if (ei != stats_size)</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "ei: %d size: %d", ei, stats_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7915_twt_teardown_request(struct ieee80211_hw *hw,</div><div class='add'>+			    struct ieee80211_sta *sta,</div><div class='add'>+			    u8 flowid)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+	mt7915_mac_twt_teardown_flow(dev, msta, flowid);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7915_set_frag_threshold(struct ieee80211_hw *hw, int radio_idx, u32 val)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7915_set_radar_background(struct ieee80211_hw *hw,</div><div class='add'>+			    struct cfg80211_chan_def *chandef)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+	bool running;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;mt76.region == NL80211_DFS_UNSET)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;rdd2_phy &amp;&amp; dev-&gt;rdd2_phy != phy) {</div><div class='add'>+		/* rdd2 is already locked */</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* rdd2 already configured on a radar channel */</div><div class='add'>+	running = dev-&gt;rdd2_phy &amp;&amp;</div><div class='add'>+		  cfg80211_chandef_valid(&amp;dev-&gt;rdd2_chandef) &amp;&amp;</div><div class='add'>+		  !!(dev-&gt;rdd2_chandef.chan-&gt;flags &amp; IEEE80211_CHAN_RADAR);</div><div class='add'>+</div><div class='add'>+	if (!chandef || running ||</div><div class='add'>+	    !(chandef-&gt;chan-&gt;flags &amp; IEEE80211_CHAN_RADAR)) {</div><div class='add'>+		ret = mt7915_mcu_rdd_background_enable(phy, NULL);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		if (!running)</div><div class='add'>+			goto update_phy;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt7915_mcu_rdd_background_enable(phy, chandef);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+update_phy:</div><div class='add'>+	dev-&gt;rdd2_phy = chandef ? phy : NULL;</div><div class='add'>+	if (chandef)</div><div class='add'>+		dev-&gt;rdd2_chandef = *chandef;</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NET_MEDIATEK_SOC_WED</div><div class='add'>+static int</div><div class='add'>+mt7915_net_fill_forward_path(struct ieee80211_hw *hw,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_sta *sta,</div><div class='add'>+			     struct net_device_path_ctx *ctx,</div><div class='add'>+			     struct net_device_path *path)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='add'>+	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='add'>+	struct mtk_wed_device *wed = &amp;dev-&gt;mt76.mmio.wed;</div><div class='add'>+</div><div class='add'>+	if (!mtk_wed_device_active(wed))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (msta-&gt;wcid.idx &gt; 0xff)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	path-&gt;type = DEV_PATH_MTK_WDMA;</div><div class='add'>+	path-&gt;dev = ctx-&gt;dev;</div><div class='add'>+	path-&gt;mtk_wdma.wdma_idx = wed-&gt;wdma_idx;</div><div class='add'>+	path-&gt;mtk_wdma.bss = mvif-&gt;mt76.idx;</div><div class='add'>+	path-&gt;mtk_wdma.wcid = is_mt7915(&amp;dev-&gt;mt76) ? msta-&gt;wcid.idx : 0x3ff;</div><div class='add'>+	path-&gt;mtk_wdma.queue = phy != &amp;dev-&gt;phy;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;dev = NULL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7915_reconfig_complete(struct ieee80211_hw *hw,</div><div class='add'>+			 enum ieee80211_reconfig_type reconfig_type)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='add'>+</div><div class='add'>+	ieee80211_wake_queues(hw);</div><div class='add'>+	ieee80211_queue_delayed_work(hw, &amp;phy-&gt;mt76-&gt;mac_work,</div><div class='add'>+				     MT7915_WATCHDOG_TIME);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct ieee80211_ops mt7915_ops = {</div><div class='add'>+	.add_chanctx = ieee80211_emulate_add_chanctx,</div><div class='add'>+	.remove_chanctx = ieee80211_emulate_remove_chanctx,</div><div class='add'>+	.change_chanctx = ieee80211_emulate_change_chanctx,</div><div class='add'>+	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,</div><div class='ctx'> 	.tx = mt7915_tx,</div><div class='ctx'> 	.start = mt7915_start,</div><div class='ctx'> 	.stop = mt7915_stop,</div><div class='hunk'>@@ -971,10 +1770,11 @@ const struct ieee80211_ops mt7915_ops = {</div><div class='ctx'> 	.conf_tx = mt7915_conf_tx,</div><div class='ctx'> 	.configure_filter = mt7915_configure_filter,</div><div class='ctx'> 	.bss_info_changed = mt7915_bss_info_changed,</div><div class='del'>-	.sta_add = mt7915_sta_add,</div><div class='del'>-	.sta_remove = mt7915_sta_remove,</div><div class='add'>+	.start_ap = mt7915_start_ap,</div><div class='add'>+	.stop_ap = mt7915_stop_ap,</div><div class='add'>+	.sta_state = mt76_sta_state,</div><div class='ctx'> 	.sta_pre_rcu_remove = mt76_sta_pre_rcu_remove,</div><div class='del'>-	.sta_rc_update = mt7915_sta_rc_update,</div><div class='add'>+	.link_sta_rc_update = mt7915_sta_rc_update,</div><div class='ctx'> 	.set_key = mt7915_set_key,</div><div class='ctx'> 	.ampdu_action = mt7915_ampdu_action,</div><div class='ctx'> 	.set_rts_threshold = mt7915_set_rts_threshold,</div><div class='hunk'>@@ -983,20 +1783,36 @@ const struct ieee80211_ops mt7915_ops = {</div><div class='ctx'> 	.sw_scan_complete = mt76_sw_scan_complete,</div><div class='ctx'> 	.release_buffered_frames = mt76_release_buffered_frames,</div><div class='ctx'> 	.get_txpower = mt76_get_txpower,</div><div class='add'>+	.set_sar_specs = mt7915_set_sar_specs,</div><div class='ctx'> 	.channel_switch_beacon = mt7915_channel_switch_beacon,</div><div class='ctx'> 	.get_stats = mt7915_get_stats,</div><div class='add'>+	.get_et_sset_count = mt7915_get_et_sset_count,</div><div class='add'>+	.get_et_stats = mt7915_get_et_stats,</div><div class='add'>+	.get_et_strings = mt7915_get_et_strings,</div><div class='ctx'> 	.get_tsf = mt7915_get_tsf,</div><div class='ctx'> 	.set_tsf = mt7915_set_tsf,</div><div class='add'>+	.offset_tsf = mt7915_offset_tsf,</div><div class='ctx'> 	.get_survey = mt76_get_survey,</div><div class='ctx'> 	.get_antenna = mt76_get_antenna,</div><div class='ctx'> 	.set_antenna = mt7915_set_antenna,</div><div class='add'>+	.set_bitrate_mask = mt7915_set_bitrate_mask,</div><div class='ctx'> 	.set_coverage_class = mt7915_set_coverage_class,</div><div class='ctx'> 	.sta_statistics = mt7915_sta_statistics,</div><div class='add'>+	.sta_set_txpwr = mt7915_sta_set_txpwr,</div><div class='ctx'> 	.sta_set_4addr = mt7915_sta_set_4addr,</div><div class='ctx'> 	.sta_set_decap_offload = mt7915_sta_set_decap_offload,</div><div class='add'>+	.add_twt_setup = mt7915_mac_add_twt_setup,</div><div class='add'>+	.twt_teardown_request = mt7915_twt_teardown_request,</div><div class='add'>+	.set_frag_threshold = mt7915_set_frag_threshold,</div><div class='ctx'> 	CFG80211_TESTMODE_CMD(mt76_testmode_cmd)</div><div class='ctx'> 	CFG80211_TESTMODE_DUMP(mt76_testmode_dump)</div><div class='ctx'> #ifdef CONFIG_MAC80211_DEBUGFS</div><div class='ctx'> 	.sta_add_debugfs = mt7915_sta_add_debugfs,</div><div class='ctx'> #endif</div><div class='add'>+	.set_radar_background = mt7915_set_radar_background,</div><div class='add'>+#ifdef CONFIG_NET_MEDIATEK_SOC_WED</div><div class='add'>+	.net_fill_forward_path = mt7915_net_fill_forward_path,</div><div class='add'>+	.net_setup_tc = mt76_wed_net_setup_tc,</div><div class='add'>+#endif</div><div class='add'>+	.reconfig_complete = mt7915_reconfig_complete,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c<br/>index b3f14ff67c5a..00bff4d3aab8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/mcu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7915/mcu.c</a></div><div class='hunk'>@@ -1,229 +1,184 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include "mt7915.h"</div><div class='ctx'> #include "mcu.h"</div><div class='ctx'> #include "mac.h"</div><div class='ctx'> #include "eeprom.h"</div><div class='ctx'> </div><div class='del'>-struct mt7915_patch_hdr {</div><div class='del'>-	char build_date[16];</div><div class='del'>-	char platform[4];</div><div class='del'>-	__be32 hw_sw_ver;</div><div class='del'>-	__be32 patch_ver;</div><div class='del'>-	__be16 checksum;</div><div class='del'>-	u16 reserved;</div><div class='del'>-	struct {</div><div class='del'>-		__be32 patch_ver;</div><div class='del'>-		__be32 subsys;</div><div class='del'>-		__be32 feature;</div><div class='del'>-		__be32 n_region;</div><div class='del'>-		__be32 crc;</div><div class='del'>-		u32 reserved[11];</div><div class='del'>-	} desc;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct mt7915_patch_sec {</div><div class='del'>-	__be32 type;</div><div class='del'>-	__be32 offs;</div><div class='del'>-	__be32 size;</div><div class='del'>-	union {</div><div class='del'>-		__be32 spec[13];</div><div class='del'>-		struct {</div><div class='del'>-			__be32 addr;</div><div class='del'>-			__be32 len;</div><div class='del'>-			__be32 sec_key_idx;</div><div class='del'>-			__be32 align_len;</div><div class='del'>-			u32 reserved[9];</div><div class='del'>-		} info;</div><div class='del'>-	};</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct mt7915_fw_trailer {</div><div class='del'>-	u8 chip_id;</div><div class='del'>-	u8 eco_code;</div><div class='del'>-	u8 n_region;</div><div class='del'>-	u8 format_ver;</div><div class='del'>-	u8 format_flag;</div><div class='del'>-	u8 reserved[2];</div><div class='del'>-	char fw_ver[10];</div><div class='del'>-	char build_date[15];</div><div class='del'>-	u32 crc;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct mt7915_fw_region {</div><div class='del'>-	__le32 decomp_crc;</div><div class='del'>-	__le32 decomp_len;</div><div class='del'>-	__le32 decomp_blk_sz;</div><div class='del'>-	u8 reserved[4];</div><div class='del'>-	__le32 addr;</div><div class='del'>-	__le32 len;</div><div class='del'>-	u8 feature_set;</div><div class='del'>-	u8 reserved1[15];</div><div class='del'>-} __packed;</div><div class='add'>+#define fw_name(_dev, name, ...)	({			\</div><div class='add'>+	char *_fw;						\</div><div class='add'>+	switch (mt76_chip(&amp;(_dev)-&gt;mt76)) {			\</div><div class='add'>+	case 0x7915:						\</div><div class='add'>+		_fw = MT7915_##name;				\</div><div class='add'>+		break;						\</div><div class='add'>+	case 0x7981:						\</div><div class='add'>+		_fw = MT7981_##name;				\</div><div class='add'>+		break;						\</div><div class='add'>+	case 0x7986:						\</div><div class='add'>+		_fw = MT7986_##name##__VA_ARGS__;		\</div><div class='add'>+		break;						\</div><div class='add'>+	default:						\</div><div class='add'>+		_fw = MT7916_##name;				\</div><div class='add'>+		break;						\</div><div class='add'>+	}							\</div><div class='add'>+	_fw;							\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define fw_name_var(_dev, name)		(mt7915_check_adie(dev, false) ?	\</div><div class='add'>+					 fw_name(_dev, name) :			\</div><div class='add'>+					 fw_name(_dev, name, _MT7975))</div><div class='ctx'> </div><div class='ctx'> #define MCU_PATCH_ADDRESS		0x200000</div><div class='ctx'> </div><div class='del'>-#define FW_FEATURE_SET_ENCRYPT		BIT(0)</div><div class='del'>-#define FW_FEATURE_SET_KEY_IDX		GENMASK(2, 1)</div><div class='del'>-#define FW_FEATURE_OVERRIDE_ADDR	BIT(5)</div><div class='del'>-</div><div class='del'>-#define DL_MODE_ENCRYPT			BIT(0)</div><div class='del'>-#define DL_MODE_KEY_IDX			GENMASK(2, 1)</div><div class='del'>-#define DL_MODE_RESET_SEC_IV		BIT(3)</div><div class='del'>-#define DL_MODE_WORKING_PDA_CR4		BIT(4)</div><div class='del'>-#define DL_MODE_NEED_RSP		BIT(31)</div><div class='del'>-</div><div class='del'>-#define FW_START_OVERRIDE		BIT(0)</div><div class='del'>-#define FW_START_WORKING_PDA_CR4	BIT(2)</div><div class='del'>-</div><div class='del'>-#define PATCH_SEC_TYPE_MASK		GENMASK(15, 0)</div><div class='del'>-#define PATCH_SEC_TYPE_INFO		0x2</div><div class='del'>-</div><div class='del'>-#define to_wcid_lo(id)			FIELD_GET(GENMASK(7, 0), (u16)id)</div><div class='del'>-#define to_wcid_hi(id)			FIELD_GET(GENMASK(9, 8), (u16)id)</div><div class='del'>-</div><div class='ctx'> #define HE_PHY(p, c)			u8_get_bits(c, IEEE80211_HE_PHY_##p)</div><div class='ctx'> #define HE_MAC(m, c)			u8_get_bits(c, IEEE80211_HE_MAC_##m)</div><div class='ctx'> </div><div class='del'>-static enum mt7915_cipher_type</div><div class='del'>-mt7915_mcu_get_cipher(int cipher)</div><div class='del'>-{</div><div class='del'>-	switch (cipher) {</div><div class='del'>-	case WLAN_CIPHER_SUITE_WEP40:</div><div class='del'>-		return MT_CIPHER_WEP40;</div><div class='del'>-	case WLAN_CIPHER_SUITE_WEP104:</div><div class='del'>-		return MT_CIPHER_WEP104;</div><div class='del'>-	case WLAN_CIPHER_SUITE_TKIP:</div><div class='del'>-		return MT_CIPHER_TKIP;</div><div class='del'>-	case WLAN_CIPHER_SUITE_AES_CMAC:</div><div class='del'>-		return MT_CIPHER_BIP_CMAC_128;</div><div class='del'>-	case WLAN_CIPHER_SUITE_CCMP:</div><div class='del'>-		return MT_CIPHER_AES_CCMP;</div><div class='del'>-	case WLAN_CIPHER_SUITE_CCMP_256:</div><div class='del'>-		return MT_CIPHER_CCMP_256;</div><div class='del'>-	case WLAN_CIPHER_SUITE_GCMP:</div><div class='del'>-		return MT_CIPHER_GCMP;</div><div class='del'>-	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='del'>-		return MT_CIPHER_GCMP_256;</div><div class='del'>-	case WLAN_CIPHER_SUITE_SMS4:</div><div class='del'>-		return MT_CIPHER_WAPI;</div><div class='del'>-	default:</div><div class='del'>-		return MT_CIPHER_NONE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+static bool sr_scene_detect = true;</div><div class='add'>+module_param(sr_scene_detect, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(sr_scene_detect, "Enable firmware scene detection algorithm");</div><div class='ctx'> </div><div class='del'>-static u8 mt7915_mcu_chan_bw(struct cfg80211_chan_def *chandef)</div><div class='add'>+static u8</div><div class='add'>+mt7915_mcu_get_sta_nss(u16 mcs_map)</div><div class='ctx'> {</div><div class='del'>-	static const u8 width_to_bw[] = {</div><div class='del'>-		[NL80211_CHAN_WIDTH_40] = CMD_CBW_40MHZ,</div><div class='del'>-		[NL80211_CHAN_WIDTH_80] = CMD_CBW_80MHZ,</div><div class='del'>-		[NL80211_CHAN_WIDTH_80P80] = CMD_CBW_8080MHZ,</div><div class='del'>-		[NL80211_CHAN_WIDTH_160] = CMD_CBW_160MHZ,</div><div class='del'>-		[NL80211_CHAN_WIDTH_5] = CMD_CBW_5MHZ,</div><div class='del'>-		[NL80211_CHAN_WIDTH_10] = CMD_CBW_10MHZ,</div><div class='del'>-		[NL80211_CHAN_WIDTH_20] = CMD_CBW_20MHZ,</div><div class='del'>-		[NL80211_CHAN_WIDTH_20_NOHT] = CMD_CBW_20MHZ,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (chandef-&gt;width &gt;= ARRAY_SIZE(width_to_bw))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return width_to_bw[chandef-&gt;width];</div><div class='del'>-}</div><div class='add'>+	u8 nss;</div><div class='ctx'> </div><div class='del'>-static const struct ieee80211_sta_he_cap *</div><div class='del'>-mt7915_get_he_phy_cap(struct mt7915_phy *phy, struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_supported_band *sband;</div><div class='del'>-	enum nl80211_band band;</div><div class='add'>+	for (nss = 8; nss &gt; 0; nss--) {</div><div class='add'>+		u8 nss_mcs = (mcs_map &gt;&gt; (2 * (nss - 1))) &amp; 3;</div><div class='ctx'> </div><div class='del'>-	band = phy-&gt;mt76-&gt;chandef.chan-&gt;band;</div><div class='del'>-	sband = phy-&gt;mt76-&gt;hw-&gt;wiphy-&gt;bands[band];</div><div class='add'>+		if (nss_mcs != IEEE80211_VHT_MCS_NOT_SUPPORTED)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return ieee80211_get_he_iftype_cap(sband, vif-&gt;type);</div><div class='add'>+	return nss - 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8</div><div class='del'>-mt7915_get_phy_mode(struct mt76_phy *mphy, struct ieee80211_vif *vif,</div><div class='del'>-		    struct ieee80211_sta *sta)</div><div class='add'>+static void</div><div class='add'>+mt7915_mcu_set_sta_he_mcs(struct ieee80211_sta *sta, __le16 *he_mcs,</div><div class='add'>+			  u16 mcs_map)</div><div class='ctx'> {</div><div class='del'>-	enum nl80211_band band = mphy-&gt;chandef.chan-&gt;band;</div><div class='del'>-	struct ieee80211_sta_ht_cap *ht_cap;</div><div class='del'>-	struct ieee80211_sta_vht_cap *vht_cap;</div><div class='del'>-	const struct ieee80211_sta_he_cap *he_cap;</div><div class='del'>-	u8 mode = 0;</div><div class='del'>-</div><div class='del'>-	if (sta) {</div><div class='del'>-		ht_cap = &amp;sta-&gt;ht_cap;</div><div class='del'>-		vht_cap = &amp;sta-&gt;vht_cap;</div><div class='del'>-		he_cap = &amp;sta-&gt;he_cap;</div><div class='del'>-	} else {</div><div class='del'>-		struct ieee80211_supported_band *sband;</div><div class='del'>-</div><div class='del'>-		sband = mphy-&gt;hw-&gt;wiphy-&gt;bands[band];</div><div class='del'>-</div><div class='del'>-		ht_cap = &amp;sband-&gt;ht_cap;</div><div class='del'>-		vht_cap = &amp;sband-&gt;vht_cap;</div><div class='del'>-		he_cap = ieee80211_get_he_iftype_cap(sband, vif-&gt;type);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (band == NL80211_BAND_2GHZ) {</div><div class='del'>-		mode |= PHY_MODE_B | PHY_MODE_G;</div><div class='add'>+	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct mt7915_dev *dev = msta-&gt;vif-&gt;phy-&gt;dev;</div><div class='add'>+	enum nl80211_band band = msta-&gt;vif-&gt;phy-&gt;mt76-&gt;chandef.chan-&gt;band;</div><div class='add'>+	const u16 *mask = msta-&gt;vif-&gt;bitrate_mask.control[band].he_mcs;</div><div class='add'>+	int nss, max_nss = sta-&gt;deflink.rx_nss &gt; 3 ? 4 : sta-&gt;deflink.rx_nss;</div><div class='ctx'> </div><div class='del'>-		if (ht_cap-&gt;ht_supported)</div><div class='del'>-			mode |= PHY_MODE_GN;</div><div class='add'>+	for (nss = 0; nss &lt; max_nss; nss++) {</div><div class='add'>+		int mcs;</div><div class='ctx'> </div><div class='del'>-		if (he_cap-&gt;has_he)</div><div class='del'>-			mode |= PHY_MODE_AX_24G;</div><div class='del'>-	} else if (band == NL80211_BAND_5GHZ) {</div><div class='del'>-		mode |= PHY_MODE_A;</div><div class='add'>+		switch ((mcs_map &gt;&gt; (2 * nss)) &amp; 0x3) {</div><div class='add'>+		case IEEE80211_HE_MCS_SUPPORT_0_11:</div><div class='add'>+			mcs = GENMASK(11, 0);</div><div class='add'>+			break;</div><div class='add'>+		case IEEE80211_HE_MCS_SUPPORT_0_9:</div><div class='add'>+			mcs = GENMASK(9, 0);</div><div class='add'>+			break;</div><div class='add'>+		case IEEE80211_HE_MCS_SUPPORT_0_7:</div><div class='add'>+			mcs = GENMASK(7, 0);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			mcs = 0;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		if (ht_cap-&gt;ht_supported)</div><div class='del'>-			mode |= PHY_MODE_AN;</div><div class='add'>+		mcs = mcs ? fls(mcs &amp; mask[nss]) - 1 : -1;</div><div class='ctx'> </div><div class='del'>-		if (vht_cap-&gt;vht_supported)</div><div class='del'>-			mode |= PHY_MODE_AC;</div><div class='add'>+		switch (mcs) {</div><div class='add'>+		case 0 ... 7:</div><div class='add'>+			mcs = IEEE80211_HE_MCS_SUPPORT_0_7;</div><div class='add'>+			break;</div><div class='add'>+		case 8 ... 9:</div><div class='add'>+			mcs = IEEE80211_HE_MCS_SUPPORT_0_9;</div><div class='add'>+			break;</div><div class='add'>+		case 10 ... 11:</div><div class='add'>+			mcs = IEEE80211_HE_MCS_SUPPORT_0_11;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			mcs = IEEE80211_HE_MCS_NOT_SUPPORTED;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		mcs_map &amp;= ~(0x3 &lt;&lt; (nss * 2));</div><div class='add'>+		mcs_map |= mcs &lt;&lt; (nss * 2);</div><div class='ctx'> </div><div class='del'>-		if (he_cap-&gt;has_he)</div><div class='del'>-			mode |= PHY_MODE_AX_5G;</div><div class='add'>+		/* only support 2ss on 160MHz for mt7915 */</div><div class='add'>+		if (is_mt7915(&amp;dev-&gt;mt76) &amp;&amp; nss &gt; 1 &amp;&amp;</div><div class='add'>+		    sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_160)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return mode;</div><div class='add'>+	*he_mcs = cpu_to_le16(mcs_map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8</div><div class='del'>-mt7915_mcu_get_sta_nss(u16 mcs_map)</div><div class='add'>+static void</div><div class='add'>+mt7915_mcu_set_sta_vht_mcs(struct ieee80211_sta *sta, __le16 *vht_mcs,</div><div class='add'>+			   const u16 *mask)</div><div class='ctx'> {</div><div class='del'>-	u8 nss;</div><div class='add'>+	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct mt7915_dev *dev = msta-&gt;vif-&gt;phy-&gt;dev;</div><div class='add'>+	u16 mcs_map = le16_to_cpu(sta-&gt;deflink.vht_cap.vht_mcs.rx_mcs_map);</div><div class='add'>+	int nss, max_nss = sta-&gt;deflink.rx_nss &gt; 3 ? 4 : sta-&gt;deflink.rx_nss;</div><div class='add'>+	u16 mcs;</div><div class='add'>+</div><div class='add'>+	for (nss = 0; nss &lt; max_nss; nss++, mcs_map &gt;&gt;= 2) {</div><div class='add'>+		switch (mcs_map &amp; 0x3) {</div><div class='add'>+		case IEEE80211_VHT_MCS_SUPPORT_0_9:</div><div class='add'>+			mcs = GENMASK(9, 0);</div><div class='add'>+			break;</div><div class='add'>+		case IEEE80211_VHT_MCS_SUPPORT_0_8:</div><div class='add'>+			mcs = GENMASK(8, 0);</div><div class='add'>+			break;</div><div class='add'>+		case IEEE80211_VHT_MCS_SUPPORT_0_7:</div><div class='add'>+			mcs = GENMASK(7, 0);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			mcs = 0;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	for (nss = 8; nss &gt; 0; nss--) {</div><div class='del'>-		u8 nss_mcs = (mcs_map &gt;&gt; (2 * (nss - 1))) &amp; 3;</div><div class='add'>+		vht_mcs[nss] = cpu_to_le16(mcs &amp; mask[nss]);</div><div class='ctx'> </div><div class='del'>-		if (nss_mcs != IEEE80211_VHT_MCS_NOT_SUPPORTED)</div><div class='add'>+		/* only support 2ss on 160MHz for mt7915 */</div><div class='add'>+		if (is_mt7915(&amp;dev-&gt;mt76) &amp;&amp; nss &gt; 1 &amp;&amp;</div><div class='add'>+		    sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_160)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return nss - 1;</div><div class='add'>+static void</div><div class='add'>+mt7915_mcu_set_sta_ht_mcs(struct ieee80211_sta *sta, u8 *ht_mcs,</div><div class='add'>+			  const u8 *mask)</div><div class='add'>+{</div><div class='add'>+	int nss, max_nss = sta-&gt;deflink.rx_nss &gt; 3 ? 4 : sta-&gt;deflink.rx_nss;</div><div class='add'>+</div><div class='add'>+	for (nss = 0; nss &lt; max_nss; nss++)</div><div class='add'>+		ht_mcs[nss] = sta-&gt;deflink.ht_cap.mcs.rx_mask[nss] &amp; mask[nss];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> mt7915_mcu_parse_response(struct mt76_dev *mdev, int cmd,</div><div class='ctx'> 			  struct sk_buff *skb, int seq)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_mcu_rxd *rxd;</div><div class='add'>+	struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);</div><div class='add'>+	struct mt76_connac2_mcu_rxd *rxd;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!skb) {</div><div class='ctx'> 		dev_err(mdev-&gt;dev, "Message %08x (seq %d) timeout\n",</div><div class='ctx'> 			cmd, seq);</div><div class='add'>+</div><div class='add'>+		if (!test_and_set_bit(MT76_MCU_RESET, &amp;dev-&gt;mphy.state)) {</div><div class='add'>+			dev-&gt;recovery.restart = true;</div><div class='add'>+			wake_up(&amp;dev-&gt;mt76.mcu.wait);</div><div class='add'>+			queue_work(dev-&gt;mt76.wq, &amp;dev-&gt;reset_work);</div><div class='add'>+			wake_up(&amp;dev-&gt;reset_wait);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		return -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rxd = (struct mt7915_mcu_rxd *)skb-&gt;data;</div><div class='del'>-	if (seq != rxd-&gt;seq)</div><div class='add'>+	rxd = (struct mt76_connac2_mcu_rxd *)skb-&gt;data;</div><div class='add'>+	if (seq != rxd-&gt;seq &amp;&amp;</div><div class='add'>+	    !(rxd-&gt;eid == MCU_CMD_EXT_CID &amp;&amp;</div><div class='add'>+	      rxd-&gt;ext_eid == MCU_EXT_EVENT_WA_TX_STAT))</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 	if (cmd == MCU_CMD(PATCH_SEM_CONTROL)) {</div><div class='hunk'>@@ -233,85 +188,56 @@ mt7915_mcu_parse_response(struct mt76_dev *mdev, int cmd,</div><div class='ctx'> 		skb_pull(skb, sizeof(*rxd) + 4);</div><div class='ctx'> 		ret = le32_to_cpu(*(__le32 *)skb-&gt;data);</div><div class='ctx'> 	} else {</div><div class='del'>-		skb_pull(skb, sizeof(struct mt7915_mcu_rxd));</div><div class='add'>+		skb_pull(skb, sizeof(struct mt76_connac2_mcu_rxd));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+mt7915_mcu_set_timeout(struct mt76_dev *mdev, int cmd)</div><div class='add'>+{</div><div class='add'>+	mdev-&gt;mcu.timeout = 5 * HZ;</div><div class='add'>+</div><div class='add'>+	if ((cmd &amp; __MCU_CMD_FIELD_ID) != MCU_CMD_EXT_CID)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (FIELD_GET(__MCU_CMD_FIELD_EXT_ID, cmd)) {</div><div class='add'>+	case MCU_EXT_CMD_THERMAL_CTRL:</div><div class='add'>+	case MCU_EXT_CMD_GET_MIB_INFO:</div><div class='add'>+	case MCU_EXT_CMD_PHY_STAT_INFO:</div><div class='add'>+	case MCU_EXT_CMD_STA_REC_UPDATE:</div><div class='add'>+	case MCU_EXT_CMD_BSS_INFO_UPDATE:</div><div class='add'>+		mdev-&gt;mcu.timeout = 2 * HZ;</div><div class='add'>+		return;</div><div class='add'>+	case MCU_EXT_CMD_EFUSE_BUFFER_MODE:</div><div class='add'>+		mdev-&gt;mcu.timeout = 10 * HZ;</div><div class='add'>+		return;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> mt7915_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,</div><div class='ctx'> 			int cmd, int *wait_seq)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);</div><div class='del'>-	struct mt7915_mcu_txd *mcu_txd;</div><div class='ctx'> 	enum mt76_mcuq_id qid;</div><div class='del'>-	__le32 *txd;</div><div class='del'>-	u32 val;</div><div class='del'>-	u8 seq;</div><div class='del'>-</div><div class='del'>-	/* TODO: make dynamic based on msg type */</div><div class='del'>-	mdev-&gt;mcu.timeout = 20 * HZ;</div><div class='ctx'> </div><div class='del'>-	seq = ++dev-&gt;mt76.mcu.msg_seq &amp; 0xf;</div><div class='del'>-	if (!seq)</div><div class='del'>-		seq = ++dev-&gt;mt76.mcu.msg_seq &amp; 0xf;</div><div class='del'>-</div><div class='del'>-	if (cmd == MCU_CMD(FW_SCATTER)) {</div><div class='add'>+	if (cmd == MCU_CMD(FW_SCATTER))</div><div class='ctx'> 		qid = MT_MCUQ_FWDL;</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mcu_txd = (struct mt7915_mcu_txd *)skb_push(skb, sizeof(*mcu_txd));</div><div class='del'>-	if (test_bit(MT76_STATE_MCU_RUNNING, &amp;dev-&gt;mphy.state))</div><div class='add'>+	else if (test_bit(MT76_STATE_MCU_RUNNING, &amp;dev-&gt;mphy.state))</div><div class='ctx'> 		qid = MT_MCUQ_WA;</div><div class='ctx'> 	else</div><div class='ctx'> 		qid = MT_MCUQ_WM;</div><div class='ctx'> </div><div class='del'>-	txd = mcu_txd-&gt;txd;</div><div class='del'>-</div><div class='del'>-	val = FIELD_PREP(MT_TXD0_TX_BYTES, skb-&gt;len) |</div><div class='del'>-	      FIELD_PREP(MT_TXD0_PKT_FMT, MT_TX_TYPE_CMD) |</div><div class='del'>-	      FIELD_PREP(MT_TXD0_Q_IDX, MT_TX_MCU_PORT_RX_Q0);</div><div class='del'>-	txd[0] = cpu_to_le32(val);</div><div class='del'>-</div><div class='del'>-	val = MT_TXD1_LONG_FORMAT |</div><div class='del'>-	      FIELD_PREP(MT_TXD1_HDR_FORMAT, MT_HDR_FORMAT_CMD);</div><div class='del'>-	txd[1] = cpu_to_le32(val);</div><div class='del'>-</div><div class='del'>-	mcu_txd-&gt;len = cpu_to_le16(skb-&gt;len - sizeof(mcu_txd-&gt;txd));</div><div class='del'>-	mcu_txd-&gt;pq_id = cpu_to_le16(MCU_PQ_ID(MT_TX_PORT_IDX_MCU,</div><div class='del'>-					       MT_TX_MCU_PORT_RX_Q0));</div><div class='del'>-	mcu_txd-&gt;pkt_type = MCU_PKT_ID;</div><div class='del'>-	mcu_txd-&gt;seq = seq;</div><div class='del'>-</div><div class='del'>-	mcu_txd-&gt;cid = FIELD_GET(__MCU_CMD_FIELD_ID, cmd);</div><div class='del'>-	mcu_txd-&gt;set_query = MCU_Q_NA;</div><div class='del'>-	mcu_txd-&gt;ext_cid = FIELD_GET(__MCU_CMD_FIELD_EXT_ID, cmd);</div><div class='del'>-	if (mcu_txd-&gt;ext_cid) {</div><div class='del'>-		mcu_txd-&gt;ext_cid_ack = 1;</div><div class='del'>-</div><div class='del'>-		/* do not use Q_SET for efuse */</div><div class='del'>-		if (cmd &amp; __MCU_CMD_FIELD_QUERY)</div><div class='del'>-			mcu_txd-&gt;set_query = MCU_Q_QUERY;</div><div class='del'>-		else</div><div class='del'>-			mcu_txd-&gt;set_query = MCU_Q_SET;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cmd &amp; __MCU_CMD_FIELD_WA)</div><div class='del'>-		mcu_txd-&gt;s2d_index = MCU_S2D_H2C;</div><div class='del'>-	else</div><div class='del'>-		mcu_txd-&gt;s2d_index = MCU_S2D_H2N;</div><div class='del'>-</div><div class='del'>-exit:</div><div class='del'>-	if (wait_seq)</div><div class='del'>-		*wait_seq = seq;</div><div class='add'>+	mt7915_mcu_set_timeout(mdev, cmd);</div><div class='ctx'> </div><div class='ctx'> 	return mt76_tx_queue_skb_raw(dev, mdev-&gt;q_mcu[qid], skb, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7915_mcu_wa_cmd(struct mt7915_dev *dev, int cmd, u32 a1, u32 a2, u32 a3)</div><div class='add'>+int mt7915_mcu_wa_cmd(struct mt7915_dev *dev, int cmd, u32 a1, u32 a2, u32 a3)</div><div class='ctx'> {</div><div class='ctx'> 	struct {</div><div class='ctx'> 		__le32 args[3];</div><div class='hunk'>@@ -323,14 +249,16 @@ mt7915_mcu_wa_cmd(struct mt7915_dev *dev, int cmd, u32 a1, u32 a2, u32 a3)</div><div class='ctx'> 		},</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	mt76_mcu_send_msg(&amp;dev-&gt;mt76, cmd, &amp;req, sizeof(req), true);</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, cmd, &amp;req, sizeof(req), false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mt7915_mcu_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	if (vif-&gt;csa_active)</div><div class='del'>-		ieee80211_csa_finish(vif);</div><div class='add'>+	if (!vif-&gt;bss_conf.csa_active || vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ieee80211_csa_finish(vif, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -341,8 +269,12 @@ mt7915_mcu_rx_csa_notify(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	c = (struct mt7915_mcu_csa_notify *)skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if (c-&gt;band_idx &amp;&amp; dev-&gt;mt76.phy2)</div><div class='del'>-		mphy = dev-&gt;mt76.phy2;</div><div class='add'>+	if (c-&gt;band_idx &gt; MT_BAND1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if ((c-&gt;band_idx &amp;&amp; !dev-&gt;phy.mt76-&gt;band_idx) &amp;&amp;</div><div class='add'>+	    dev-&gt;mt76.phys[MT_BAND1])</div><div class='add'>+		mphy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_iterate_active_interfaces_atomic(mphy-&gt;hw,</div><div class='ctx'> 			IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='hunk'>@@ -350,167 +282,84 @@ mt7915_mcu_rx_csa_notify(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7915_mcu_rx_radar_detected(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='add'>+mt7915_mcu_rx_thermal_notify(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_phy *mphy = &amp;dev-&gt;mt76.phy;</div><div class='del'>-	struct mt7915_mcu_rdd_report *r;</div><div class='add'>+	struct mt7915_mcu_thermal_notify *t;</div><div class='add'>+	struct mt7915_phy *phy;</div><div class='ctx'> </div><div class='del'>-	r = (struct mt7915_mcu_rdd_report *)skb-&gt;data;</div><div class='add'>+	t = (struct mt7915_mcu_thermal_notify *)skb-&gt;data;</div><div class='add'>+	if (t-&gt;ctrl.ctrl_id != THERMAL_PROTECT_ENABLE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (t-&gt;ctrl.band_idx &gt; MT_BAND1)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (r-&gt;band_idx &amp;&amp; dev-&gt;mt76.phy2)</div><div class='del'>-		mphy = dev-&gt;mt76.phy2;</div><div class='add'>+	if ((t-&gt;ctrl.band_idx &amp;&amp; !dev-&gt;phy.mt76-&gt;band_idx) &amp;&amp;</div><div class='add'>+	    dev-&gt;mt76.phys[MT_BAND1])</div><div class='add'>+		mphy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='ctx'> </div><div class='del'>-	ieee80211_radar_detected(mphy-&gt;hw);</div><div class='del'>-	dev-&gt;hw_pattern++;</div><div class='add'>+	phy = mphy-&gt;priv;</div><div class='add'>+	phy-&gt;throttle_state = t-&gt;ctrl.duty.duty_cycle;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt7915_mcu_tx_rate_parse(struct mt76_phy *mphy, struct mt7915_mcu_ra_info *ra,</div><div class='del'>-			 struct rate_info *rate, u16 r)</div><div class='add'>+static void</div><div class='add'>+mt7915_mcu_rx_radar_detected(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_supported_band *sband;</div><div class='del'>-	u16 ru_idx = le16_to_cpu(ra-&gt;ru_idx);</div><div class='del'>-	bool cck = false;</div><div class='del'>-</div><div class='del'>-	rate-&gt;mcs = FIELD_GET(MT_RA_RATE_MCS, r);</div><div class='del'>-	rate-&gt;nss = FIELD_GET(MT_RA_RATE_NSS, r) + 1;</div><div class='del'>-</div><div class='del'>-	switch (FIELD_GET(MT_RA_RATE_TX_MODE, r)) {</div><div class='del'>-	case MT_PHY_TYPE_CCK:</div><div class='del'>-		cck = true;</div><div class='del'>-		fallthrough;</div><div class='del'>-	case MT_PHY_TYPE_OFDM:</div><div class='del'>-		if (mphy-&gt;chandef.chan-&gt;band == NL80211_BAND_5GHZ)</div><div class='del'>-			sband = &amp;mphy-&gt;sband_5g.sband;</div><div class='del'>-		else</div><div class='del'>-			sband = &amp;mphy-&gt;sband_2g.sband;</div><div class='add'>+	struct mt76_phy *mphy = &amp;dev-&gt;mt76.phy;</div><div class='add'>+	struct mt7915_mcu_rdd_report *r;</div><div class='add'>+	u32 sku;</div><div class='ctx'> </div><div class='del'>-		rate-&gt;mcs = mt76_get_rate(mphy-&gt;dev, sband, rate-&gt;mcs, cck);</div><div class='del'>-		rate-&gt;legacy = sband-&gt;bitrates[rate-&gt;mcs].bitrate;</div><div class='del'>-		break;</div><div class='del'>-	case MT_PHY_TYPE_HT:</div><div class='del'>-	case MT_PHY_TYPE_HT_GF:</div><div class='del'>-		rate-&gt;mcs += (rate-&gt;nss - 1) * 8;</div><div class='del'>-		if (rate-&gt;mcs &gt; 31)</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	r = (struct mt7915_mcu_rdd_report *)skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-		rate-&gt;flags = RATE_INFO_FLAGS_MCS;</div><div class='del'>-		if (ra-&gt;gi)</div><div class='del'>-			rate-&gt;flags |= RATE_INFO_FLAGS_SHORT_GI;</div><div class='add'>+	switch (r-&gt;rdd_idx) {</div><div class='add'>+	case MT_RDD_IDX_BAND0:</div><div class='ctx'> 		break;</div><div class='del'>-	case MT_PHY_TYPE_VHT:</div><div class='del'>-		if (rate-&gt;mcs &gt; 9)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		rate-&gt;flags = RATE_INFO_FLAGS_VHT_MCS;</div><div class='del'>-		if (ra-&gt;gi)</div><div class='del'>-			rate-&gt;flags |= RATE_INFO_FLAGS_SHORT_GI;</div><div class='add'>+	case MT_RDD_IDX_BAND1:</div><div class='add'>+		sku = mt7915_check_adie(dev, true);</div><div class='add'>+		/* the main phy is bound to band 1 for this sku */</div><div class='add'>+		if (is_mt7986(&amp;dev-&gt;mt76) &amp;&amp;</div><div class='add'>+		    (sku == MT7975_ONE_ADIE || sku == MT7976_ONE_ADIE))</div><div class='add'>+			break;</div><div class='add'>+		mphy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='ctx'> 		break;</div><div class='del'>-	case MT_PHY_TYPE_HE_SU:</div><div class='del'>-	case MT_PHY_TYPE_HE_EXT_SU:</div><div class='del'>-	case MT_PHY_TYPE_HE_TB:</div><div class='del'>-	case MT_PHY_TYPE_HE_MU:</div><div class='del'>-		if (ra-&gt;gi &gt; NL80211_RATE_INFO_HE_GI_3_2 || rate-&gt;mcs &gt; 11)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		rate-&gt;he_gi = ra-&gt;gi;</div><div class='del'>-		rate-&gt;he_dcm = FIELD_GET(MT_RA_RATE_DCM_EN, r);</div><div class='del'>-		rate-&gt;flags = RATE_INFO_FLAGS_HE_MCS;</div><div class='add'>+	case MT_RDD_IDX_BACKGROUND:</div><div class='add'>+		if (!dev-&gt;rdd2_phy)</div><div class='add'>+			return;</div><div class='add'>+		mphy = dev-&gt;rdd2_phy-&gt;mt76;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ru_idx) {</div><div class='del'>-		switch (ru_idx) {</div><div class='del'>-		case 1 ... 2:</div><div class='del'>-			rate-&gt;he_ru_alloc = NL80211_RATE_INFO_HE_RU_ALLOC_996;</div><div class='del'>-			break;</div><div class='del'>-		case 3 ... 6:</div><div class='del'>-			rate-&gt;he_ru_alloc = NL80211_RATE_INFO_HE_RU_ALLOC_484;</div><div class='del'>-			break;</div><div class='del'>-		case 7 ... 14:</div><div class='del'>-			rate-&gt;he_ru_alloc = NL80211_RATE_INFO_HE_RU_ALLOC_242;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			rate-&gt;he_ru_alloc = NL80211_RATE_INFO_HE_RU_ALLOC_106;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		rate-&gt;bw = RATE_INFO_BW_HE_RU;</div><div class='del'>-	} else {</div><div class='del'>-		u8 bw = mt7915_mcu_chan_bw(&amp;mphy-&gt;chandef) -</div><div class='del'>-			FIELD_GET(MT_RA_RATE_BW, r);</div><div class='del'>-</div><div class='del'>-		switch (bw) {</div><div class='del'>-		case IEEE80211_STA_RX_BW_160:</div><div class='del'>-			rate-&gt;bw = RATE_INFO_BW_160;</div><div class='del'>-			break;</div><div class='del'>-		case IEEE80211_STA_RX_BW_80:</div><div class='del'>-			rate-&gt;bw = RATE_INFO_BW_80;</div><div class='del'>-			break;</div><div class='del'>-		case IEEE80211_STA_RX_BW_40:</div><div class='del'>-			rate-&gt;bw = RATE_INFO_BW_40;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			rate-&gt;bw = RATE_INFO_BW_20;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt7915_mcu_tx_rate_report(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct mt7915_mcu_ra_info *ra = (struct mt7915_mcu_ra_info *)skb-&gt;data;</div><div class='del'>-	struct rate_info rate = {}, prob_rate = {};</div><div class='del'>-	u16 probe = le16_to_cpu(ra-&gt;prob_up_rate);</div><div class='del'>-	u16 attempts = le16_to_cpu(ra-&gt;attempts);</div><div class='del'>-	u16 curr = le16_to_cpu(ra-&gt;curr_rate);</div><div class='del'>-	u16 wcidx = le16_to_cpu(ra-&gt;wlan_idx);</div><div class='del'>-	struct mt76_phy *mphy = &amp;dev-&gt;mphy;</div><div class='del'>-	struct mt7915_sta_stats *stats;</div><div class='del'>-	struct mt7915_sta *msta;</div><div class='del'>-	struct mt76_wcid *wcid;</div><div class='del'>-</div><div class='del'>-	if (wcidx &gt;= MT76_N_WCIDS)</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Unknown RDD idx %d\n", r-&gt;rdd_idx);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	wcid = rcu_dereference(dev-&gt;mt76.wcid[wcidx]);</div><div class='del'>-	if (!wcid)</div><div class='add'>+	if (!mphy)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	msta = container_of(wcid, struct mt7915_sta, wcid);</div><div class='del'>-	stats = &amp;msta-&gt;stats;</div><div class='del'>-</div><div class='del'>-	if (msta-&gt;wcid.ext_phy &amp;&amp; dev-&gt;mt76.phy2)</div><div class='del'>-		mphy = dev-&gt;mt76.phy2;</div><div class='del'>-</div><div class='del'>-	/* current rate */</div><div class='del'>-	if (!mt7915_mcu_tx_rate_parse(mphy, ra, &amp;rate, curr))</div><div class='del'>-		stats-&gt;tx_rate = rate;</div><div class='del'>-</div><div class='del'>-	/* probing rate */</div><div class='del'>-	if (!mt7915_mcu_tx_rate_parse(mphy, ra, &amp;prob_rate, probe))</div><div class='del'>-		stats-&gt;prob_rate = prob_rate;</div><div class='del'>-</div><div class='del'>-	if (attempts) {</div><div class='del'>-		u16 success = le16_to_cpu(ra-&gt;success);</div><div class='del'>-</div><div class='del'>-		stats-&gt;per = 1000 * (attempts - success) / attempts;</div><div class='del'>-	}</div><div class='add'>+	if (r-&gt;rdd_idx == MT_RDD_IDX_BACKGROUND)</div><div class='add'>+		cfg80211_background_radar_event(mphy-&gt;hw-&gt;wiphy,</div><div class='add'>+						&amp;dev-&gt;rdd2_chandef,</div><div class='add'>+						GFP_ATOMIC);</div><div class='add'>+	else</div><div class='add'>+		ieee80211_radar_detected(mphy-&gt;hw, NULL);</div><div class='add'>+	dev-&gt;hw_pattern++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mt7915_mcu_rx_log_message(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_mcu_rxd *rxd = (struct mt7915_mcu_rxd *)skb-&gt;data;</div><div class='del'>-	const char *data = (char *)&amp;rxd[1];</div><div class='del'>-	const char *type;</div><div class='add'>+	struct mt76_connac2_mcu_rxd *rxd;</div><div class='add'>+	int len = skb-&gt;len - sizeof(*rxd);</div><div class='add'>+	const char *data, *type;</div><div class='add'>+</div><div class='add'>+	rxd = (struct mt76_connac2_mcu_rxd *)skb-&gt;data;</div><div class='add'>+	data = (char *)&amp;rxd[1];</div><div class='ctx'> </div><div class='ctx'> 	switch (rxd-&gt;s2d_index) {</div><div class='ctx'> 	case 0:</div><div class='add'>+		if (mt7915_debugfs_rx_log(dev, data, len))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='ctx'> 		type = "WM";</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='hunk'>@@ -521,28 +370,60 @@ mt7915_mcu_rx_log_message(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wiphy_info(mt76_hw(dev)-&gt;wiphy, "%s: %.*s", type,</div><div class='del'>-		   (int)(skb-&gt;len - sizeof(*rxd)), data);</div><div class='add'>+	wiphy_info(mt76_hw(dev)-&gt;wiphy, "%s: %.*s", type, len, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7915_mcu_cca_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	if (!vif-&gt;bss_conf.color_change_active || vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ieee80211_color_change_finish(vif, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7915_mcu_rx_bcc_notify(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct mt76_phy *mphy = &amp;dev-&gt;mt76.phy;</div><div class='add'>+	struct mt7915_mcu_bcc_notify *b;</div><div class='add'>+</div><div class='add'>+	b = (struct mt7915_mcu_bcc_notify *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (b-&gt;band_idx &gt; MT_BAND1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if ((b-&gt;band_idx &amp;&amp; !dev-&gt;phy.mt76-&gt;band_idx) &amp;&amp;</div><div class='add'>+	    dev-&gt;mt76.phys[MT_BAND1])</div><div class='add'>+		mphy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_atomic(mphy-&gt;hw,</div><div class='add'>+			IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='add'>+			mt7915_mcu_cca_finish, mphy-&gt;hw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mt7915_mcu_rx_ext_event(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_mcu_rxd *rxd = (struct mt7915_mcu_rxd *)skb-&gt;data;</div><div class='add'>+	struct mt76_connac2_mcu_rxd *rxd;</div><div class='ctx'> </div><div class='add'>+	rxd = (struct mt76_connac2_mcu_rxd *)skb-&gt;data;</div><div class='ctx'> 	switch (rxd-&gt;ext_eid) {</div><div class='add'>+	case MCU_EXT_EVENT_THERMAL_PROTECT:</div><div class='add'>+		mt7915_mcu_rx_thermal_notify(dev, skb);</div><div class='add'>+		break;</div><div class='ctx'> 	case MCU_EXT_EVENT_RDD_REPORT:</div><div class='ctx'> 		mt7915_mcu_rx_radar_detected(dev, skb);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MCU_EXT_EVENT_CSA_NOTIFY:</div><div class='ctx'> 		mt7915_mcu_rx_csa_notify(dev, skb);</div><div class='ctx'> 		break;</div><div class='del'>-	case MCU_EXT_EVENT_RATE_REPORT:</div><div class='del'>-		mt7915_mcu_tx_rate_report(dev, skb);</div><div class='del'>-		break;</div><div class='ctx'> 	case MCU_EXT_EVENT_FW_LOG_2_HOST:</div><div class='ctx'> 		mt7915_mcu_rx_log_message(dev, skb);</div><div class='ctx'> 		break;</div><div class='add'>+	case MCU_EXT_EVENT_BCC_NOTIFY:</div><div class='add'>+		mt7915_mcu_rx_bcc_notify(dev, skb);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -551,8 +432,9 @@ mt7915_mcu_rx_ext_event(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='ctx'> static void</div><div class='ctx'> mt7915_mcu_rx_unsolicited_event(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_mcu_rxd *rxd = (struct mt7915_mcu_rxd *)skb-&gt;data;</div><div class='add'>+	struct mt76_connac2_mcu_rxd *rxd;</div><div class='ctx'> </div><div class='add'>+	rxd = (struct mt76_connac2_mcu_rxd *)skb-&gt;data;</div><div class='ctx'> 	switch (rxd-&gt;eid) {</div><div class='ctx'> 	case MCU_EVENT_EXT:</div><div class='ctx'> 		mt7915_mcu_rx_ext_event(dev, skb);</div><div class='hunk'>@@ -565,101 +447,22 @@ mt7915_mcu_rx_unsolicited_event(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> void mt7915_mcu_rx_event(struct mt7915_dev *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_mcu_rxd *rxd = (struct mt7915_mcu_rxd *)skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (rxd-&gt;ext_eid == MCU_EXT_EVENT_THERMAL_PROTECT ||</div><div class='del'>-	    rxd-&gt;ext_eid == MCU_EXT_EVENT_FW_LOG_2_HOST ||</div><div class='del'>-	    rxd-&gt;ext_eid == MCU_EXT_EVENT_ASSERT_DUMP ||</div><div class='del'>-	    rxd-&gt;ext_eid == MCU_EXT_EVENT_PS_SYNC ||</div><div class='del'>-	    rxd-&gt;ext_eid == MCU_EXT_EVENT_RATE_REPORT ||</div><div class='del'>-	    !rxd-&gt;seq)</div><div class='add'>+	struct mt76_connac2_mcu_rxd *rxd;</div><div class='add'>+</div><div class='add'>+	rxd = (struct mt76_connac2_mcu_rxd *)skb-&gt;data;</div><div class='add'>+	if ((rxd-&gt;ext_eid == MCU_EXT_EVENT_THERMAL_PROTECT ||</div><div class='add'>+	     rxd-&gt;ext_eid == MCU_EXT_EVENT_FW_LOG_2_HOST ||</div><div class='add'>+	     rxd-&gt;ext_eid == MCU_EXT_EVENT_ASSERT_DUMP ||</div><div class='add'>+	     rxd-&gt;ext_eid == MCU_EXT_EVENT_PS_SYNC ||</div><div class='add'>+	     rxd-&gt;ext_eid == MCU_EXT_EVENT_BCC_NOTIFY ||</div><div class='add'>+	     !rxd-&gt;seq) &amp;&amp;</div><div class='add'>+	     !(rxd-&gt;eid == MCU_CMD_EXT_CID &amp;&amp;</div><div class='add'>+	       rxd-&gt;ext_eid == MCU_EXT_EVENT_WA_TX_STAT))</div><div class='ctx'> 		mt7915_mcu_rx_unsolicited_event(dev, skb);</div><div class='ctx'> 	else</div><div class='ctx'> 		mt76_mcu_rx_event(&amp;dev-&gt;mt76, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *</div><div class='del'>-mt7915_mcu_alloc_sta_req(struct mt7915_dev *dev, struct mt7915_vif *mvif,</div><div class='del'>-			 struct mt7915_sta *msta, int len)</div><div class='del'>-{</div><div class='del'>-	struct sta_req_hdr hdr = {</div><div class='del'>-		.bss_idx = mvif-&gt;idx,</div><div class='del'>-		.wlan_idx_lo = msta ? to_wcid_lo(msta-&gt;wcid.idx) : 0,</div><div class='del'>-		.wlan_idx_hi = msta ? to_wcid_hi(msta-&gt;wcid.idx) : 0,</div><div class='del'>-		.muar_idx = msta ? mvif-&gt;omac_idx : 0,</div><div class='del'>-		.is_tlv_append = 1,</div><div class='del'>-	};</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	skb = mt76_mcu_msg_alloc(&amp;dev-&gt;mt76, NULL, len);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	skb_put_data(skb, &amp;hdr, sizeof(hdr));</div><div class='del'>-</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct wtbl_req_hdr *</div><div class='del'>-mt7915_mcu_alloc_wtbl_req(struct mt7915_dev *dev, struct mt7915_sta *msta,</div><div class='del'>-			  int cmd, void *sta_wtbl, struct sk_buff **skb)</div><div class='del'>-{</div><div class='del'>-	struct tlv *sta_hdr = sta_wtbl;</div><div class='del'>-	struct wtbl_req_hdr hdr = {</div><div class='del'>-		.wlan_idx_lo = to_wcid_lo(msta-&gt;wcid.idx),</div><div class='del'>-		.wlan_idx_hi = to_wcid_hi(msta-&gt;wcid.idx),</div><div class='del'>-		.operation = cmd,</div><div class='del'>-	};</div><div class='del'>-	struct sk_buff *nskb = *skb;</div><div class='del'>-</div><div class='del'>-	if (!nskb) {</div><div class='del'>-		nskb = mt76_mcu_msg_alloc(&amp;dev-&gt;mt76, NULL,</div><div class='del'>-					  MT7915_WTBL_UPDATE_MAX_SIZE);</div><div class='del'>-		if (!nskb)</div><div class='del'>-			return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-		*skb = nskb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sta_hdr)</div><div class='del'>-		sta_hdr-&gt;len = cpu_to_le16(sizeof(hdr));</div><div class='del'>-</div><div class='del'>-	return skb_put_data(nskb, &amp;hdr, sizeof(hdr));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct tlv *</div><div class='del'>-mt7915_mcu_add_nested_tlv(struct sk_buff *skb, int tag, int len,</div><div class='del'>-			  void *sta_ntlv, void *sta_wtbl)</div><div class='del'>-{</div><div class='del'>-	struct sta_ntlv_hdr *ntlv_hdr = sta_ntlv;</div><div class='del'>-	struct tlv *sta_hdr = sta_wtbl;</div><div class='del'>-	struct tlv *ptlv, tlv = {</div><div class='del'>-		.tag = cpu_to_le16(tag),</div><div class='del'>-		.len = cpu_to_le16(len),</div><div class='del'>-	};</div><div class='del'>-	u16 ntlv;</div><div class='del'>-</div><div class='del'>-	ptlv = skb_put(skb, len);</div><div class='del'>-	memcpy(ptlv, &amp;tlv, sizeof(tlv));</div><div class='del'>-</div><div class='del'>-	ntlv = le16_to_cpu(ntlv_hdr-&gt;tlv_num);</div><div class='del'>-	ntlv_hdr-&gt;tlv_num = cpu_to_le16(ntlv + 1);</div><div class='del'>-</div><div class='del'>-	if (sta_hdr) {</div><div class='del'>-		u16 size = le16_to_cpu(sta_hdr-&gt;len);</div><div class='del'>-</div><div class='del'>-		sta_hdr-&gt;len = cpu_to_le16(size + len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ptlv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct tlv *</div><div class='del'>-mt7915_mcu_add_tlv(struct sk_buff *skb, int tag, int len)</div><div class='del'>-{</div><div class='del'>-	return mt7915_mcu_add_nested_tlv(skb, tag, len, skb-&gt;data, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct tlv *</div><div class='ctx'> mt7915_mcu_add_nested_subtlv(struct sk_buff *skb, int sub_tag, int sub_len,</div><div class='ctx'> 			     __le16 *sub_ntlv, __le16 *len)</div><div class='hunk'>@@ -669,7 +472,7 @@ mt7915_mcu_add_nested_subtlv(struct sk_buff *skb, int sub_tag, int sub_len,</div><div class='ctx'> 		.len = cpu_to_le16(sub_len),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	ptlv = skb_put(skb, sub_len);</div><div class='add'>+	ptlv = skb_put_zero(skb, sub_len);</div><div class='ctx'> 	memcpy(ptlv, &amp;tlv, sizeof(tlv));</div><div class='ctx'> </div><div class='ctx'> 	le16_add_cpu(sub_ntlv, 1);</div><div class='hunk'>@@ -679,104 +482,6 @@ mt7915_mcu_add_nested_subtlv(struct sk_buff *skb, int sub_tag, int sub_len,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /** bss info **/</div><div class='del'>-static int</div><div class='del'>-mt7915_mcu_bss_basic_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,</div><div class='del'>-			 struct mt7915_phy *phy, bool enable)</div><div class='del'>-{</div><div class='del'>-	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='del'>-	struct bss_info_basic *bss;</div><div class='del'>-	u16 wlan_idx = mvif-&gt;sta.wcid.idx;</div><div class='del'>-	u32 type = NETWORK_INFRA;</div><div class='del'>-	struct tlv *tlv;</div><div class='del'>-</div><div class='del'>-	tlv = mt7915_mcu_add_tlv(skb, BSS_INFO_BASIC, sizeof(*bss));</div><div class='del'>-</div><div class='del'>-	switch (vif-&gt;type) {</div><div class='del'>-	case NL80211_IFTYPE_MESH_POINT:</div><div class='del'>-	case NL80211_IFTYPE_AP:</div><div class='del'>-	case NL80211_IFTYPE_MONITOR:</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-		/* TODO: enable BSS_INFO_UAPSD &amp; BSS_INFO_PM */</div><div class='del'>-		if (enable) {</div><div class='del'>-			struct ieee80211_sta *sta;</div><div class='del'>-			struct mt7915_sta *msta;</div><div class='del'>-</div><div class='del'>-			rcu_read_lock();</div><div class='del'>-			sta = ieee80211_find_sta(vif, vif-&gt;bss_conf.bssid);</div><div class='del'>-			if (!sta) {</div><div class='del'>-				rcu_read_unlock();</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='del'>-			wlan_idx = msta-&gt;wcid.idx;</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		type = NETWORK_IBSS;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bss = (struct bss_info_basic *)tlv;</div><div class='del'>-	bss-&gt;network_type = cpu_to_le32(type);</div><div class='del'>-	bss-&gt;bmc_wcid_lo = to_wcid_lo(wlan_idx);</div><div class='del'>-	bss-&gt;bmc_wcid_hi = to_wcid_hi(wlan_idx);</div><div class='del'>-	bss-&gt;wmm_idx = mvif-&gt;wmm_idx;</div><div class='del'>-	bss-&gt;active = enable;</div><div class='del'>-</div><div class='del'>-	if (vif-&gt;type != NL80211_IFTYPE_MONITOR) {</div><div class='del'>-		memcpy(bss-&gt;bssid, vif-&gt;bss_conf.bssid, ETH_ALEN);</div><div class='del'>-		bss-&gt;bcn_interval = cpu_to_le16(vif-&gt;bss_conf.beacon_int);</div><div class='del'>-		bss-&gt;dtim_period = vif-&gt;bss_conf.dtim_period;</div><div class='del'>-		bss-&gt;phy_mode = mt7915_get_phy_mode(phy-&gt;mt76, vif, NULL);</div><div class='del'>-	} else {</div><div class='del'>-		memcpy(bss-&gt;bssid, phy-&gt;mt76-&gt;macaddr, ETH_ALEN);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt7915_mcu_bss_omac_tlv(struct sk_buff *skb, struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='del'>-	struct bss_info_omac *omac;</div><div class='del'>-	struct tlv *tlv;</div><div class='del'>-	u32 type = 0;</div><div class='del'>-	u8 idx;</div><div class='del'>-</div><div class='del'>-	tlv = mt7915_mcu_add_tlv(skb, BSS_INFO_OMAC, sizeof(*omac));</div><div class='del'>-</div><div class='del'>-	switch (vif-&gt;type) {</div><div class='del'>-	case NL80211_IFTYPE_MONITOR:</div><div class='del'>-	case NL80211_IFTYPE_MESH_POINT:</div><div class='del'>-	case NL80211_IFTYPE_AP:</div><div class='del'>-		type = CONNECTION_INFRA_AP;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-		type = CONNECTION_INFRA_STA;</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		type = CONNECTION_IBSS_ADHOC;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	omac = (struct bss_info_omac *)tlv;</div><div class='del'>-	idx = mvif-&gt;omac_idx &gt; EXT_BSSID_START ? HW_BSSID_0 : mvif-&gt;omac_idx;</div><div class='del'>-	omac-&gt;conn_type = cpu_to_le32(type);</div><div class='del'>-	omac-&gt;omac_idx = mvif-&gt;omac_idx;</div><div class='del'>-	omac-&gt;band_idx = mvif-&gt;band_idx;</div><div class='del'>-	omac-&gt;hw_bss_idx = idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct mt7915_he_obss_narrow_bw_ru_data {</div><div class='ctx'> 	bool tolerated;</div><div class='ctx'> };</div><div class='hunk'>@@ -788,12 +493,15 @@ static void mt7915_check_he_obss_narrow_bw_ru_iter(struct wiphy *wiphy,</div><div class='ctx'> 	struct mt7915_he_obss_narrow_bw_ru_data *data = _data;</div><div class='ctx'> 	const struct element *elem;</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	elem = ieee80211_bss_get_elem(bss, WLAN_EID_EXT_CAPABILITY);</div><div class='ctx'> </div><div class='del'>-	if (!elem || elem-&gt;datalen &lt; 10 ||</div><div class='add'>+	if (!elem || elem-&gt;datalen &lt;= 10 ||</div><div class='ctx'> 	    !(elem-&gt;data[10] &amp;</div><div class='ctx'> 	      WLAN_EXT_CAPA10_OBSS_NARROW_BW_RU_TOLERANCE_SUPPORT))</div><div class='ctx'> 		data-&gt;tolerated = false;</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool mt7915_check_he_obss_narrow_bw_ru(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -803,10 +511,10 @@ static bool mt7915_check_he_obss_narrow_bw_ru(struct ieee80211_hw *hw,</div><div class='ctx'> 		.tolerated = true,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (!(vif-&gt;bss_conf.chandef.chan-&gt;flags &amp; IEEE80211_CHAN_RADAR))</div><div class='add'>+	if (!(vif-&gt;bss_conf.chanreq.oper.chan-&gt;flags &amp; IEEE80211_CHAN_RADAR))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	cfg80211_bss_iter(hw-&gt;wiphy, &amp;vif-&gt;bss_conf.chandef,</div><div class='add'>+	cfg80211_bss_iter(hw-&gt;wiphy, &amp;vif-&gt;bss_conf.chanreq.oper,</div><div class='ctx'> 			  mt7915_check_he_obss_narrow_bw_ru_iter,</div><div class='ctx'> 			  &amp;iter_data);</div><div class='ctx'> </div><div class='hunk'>@@ -826,12 +534,12 @@ mt7915_mcu_bss_rfch_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,</div><div class='ctx'> 	struct tlv *tlv;</div><div class='ctx'> 	int freq1 = chandef-&gt;center_freq1;</div><div class='ctx'> </div><div class='del'>-	tlv = mt7915_mcu_add_tlv(skb, BSS_INFO_RF_CH, sizeof(*ch));</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, BSS_INFO_RF_CH, sizeof(*ch));</div><div class='ctx'> </div><div class='ctx'> 	ch = (struct bss_info_rf_ch *)tlv;</div><div class='ctx'> 	ch-&gt;pri_ch = chandef-&gt;chan-&gt;hw_value;</div><div class='ctx'> 	ch-&gt;center_ch0 = ieee80211_frequency_to_channel(freq1);</div><div class='del'>-	ch-&gt;bw = mt7915_mcu_chan_bw(chandef);</div><div class='add'>+	ch-&gt;bw = mt76_connac_chan_bw(chandef);</div><div class='ctx'> </div><div class='ctx'> 	if (chandef-&gt;width == NL80211_CHAN_WIDTH_80P80) {</div><div class='ctx'> 		int freq2 = chandef-&gt;center_freq2;</div><div class='hunk'>@@ -840,12 +548,7 @@ mt7915_mcu_bss_rfch_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;bss_conf.he_support &amp;&amp; vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='del'>-		struct mt7915_dev *dev = phy-&gt;dev;</div><div class='del'>-		struct mt76_phy *mphy = &amp;dev-&gt;mt76.phy;</div><div class='del'>-		bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='del'>-</div><div class='del'>-		if (ext_phy &amp;&amp; dev-&gt;mt76.phy2)</div><div class='del'>-			mphy = dev-&gt;mt76.phy2;</div><div class='add'>+		struct mt76_phy *mphy = phy-&gt;mt76;</div><div class='ctx'> </div><div class='ctx'> 		ch-&gt;he_ru26_block =</div><div class='ctx'> 			mt7915_check_he_obss_narrow_bw_ru(mphy-&gt;hw, vif);</div><div class='hunk'>@@ -859,11 +562,11 @@ static void</div><div class='ctx'> mt7915_mcu_bss_ra_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,</div><div class='ctx'> 		      struct mt7915_phy *phy)</div><div class='ctx'> {</div><div class='del'>-	int max_nss = hweight8(phy-&gt;mt76-&gt;chainmask);</div><div class='add'>+	int max_nss = hweight8(phy-&gt;mt76-&gt;antenna_mask);</div><div class='ctx'> 	struct bss_info_ra *ra;</div><div class='ctx'> 	struct tlv *tlv;</div><div class='ctx'> </div><div class='del'>-	tlv = mt7915_mcu_add_tlv(skb, BSS_INFO_RA, sizeof(*ra));</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, BSS_INFO_RA, sizeof(*ra));</div><div class='ctx'> </div><div class='ctx'> 	ra = (struct bss_info_ra *)tlv;</div><div class='ctx'> 	ra-&gt;op_mode = vif-&gt;type == NL80211_IFTYPE_AP;</div><div class='hunk'>@@ -891,9 +594,9 @@ mt7915_mcu_bss_he_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,</div><div class='ctx'> 	struct bss_info_he *he;</div><div class='ctx'> 	struct tlv *tlv;</div><div class='ctx'> </div><div class='del'>-	cap = mt7915_get_he_phy_cap(phy, vif);</div><div class='add'>+	cap = mt76_connac_get_he_phy_cap(phy-&gt;mt76, vif);</div><div class='ctx'> </div><div class='del'>-	tlv = mt7915_mcu_add_tlv(skb, BSS_INFO_HE_BASIC, sizeof(*he));</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, BSS_INFO_HE_BASIC, sizeof(*he));</div><div class='ctx'> </div><div class='ctx'> 	he = (struct bss_info_he *)tlv;</div><div class='ctx'> 	he-&gt;he_pe_duration = vif-&gt;bss_conf.htc_trig_based_pkt_ext;</div><div class='hunk'>@@ -917,7 +620,7 @@ mt7915_mcu_bss_hw_amsdu_tlv(struct sk_buff *skb)</div><div class='ctx'> 	struct bss_info_hw_amsdu *amsdu;</div><div class='ctx'> 	struct tlv *tlv;</div><div class='ctx'> </div><div class='del'>-	tlv = mt7915_mcu_add_tlv(skb, BSS_INFO_HW_AMSDU, sizeof(*amsdu));</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, BSS_INFO_HW_AMSDU, sizeof(*amsdu));</div><div class='ctx'> </div><div class='ctx'> 	amsdu = (struct bss_info_hw_amsdu *)tlv;</div><div class='ctx'> 	amsdu-&gt;cmp_bitmap_0 = cpu_to_le32(TXD_CMP_MAP1);</div><div class='hunk'>@@ -927,26 +630,6 @@ mt7915_mcu_bss_hw_amsdu_tlv(struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7915_mcu_bss_ext_tlv(struct sk_buff *skb, struct mt7915_vif *mvif)</div><div class='del'>-{</div><div class='del'>-/* SIFS 20us + 512 byte beacon tranmitted by 1Mbps (3906us) */</div><div class='del'>-#define BCN_TX_ESTIMATE_TIME	(4096 + 20)</div><div class='del'>-	struct bss_info_ext_bss *ext;</div><div class='del'>-	int ext_bss_idx, tsf_offset;</div><div class='del'>-	struct tlv *tlv;</div><div class='del'>-</div><div class='del'>-	ext_bss_idx = mvif-&gt;omac_idx - EXT_BSSID_START;</div><div class='del'>-	if (ext_bss_idx &lt; 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	tlv = mt7915_mcu_add_tlv(skb, BSS_INFO_EXT_BSS, sizeof(*ext));</div><div class='del'>-</div><div class='del'>-	ext = (struct bss_info_ext_bss *)tlv;</div><div class='del'>-	tsf_offset = ext_bss_idx * BCN_TX_ESTIMATE_TIME;</div><div class='del'>-	ext-&gt;mbss_tsf_offset = cpu_to_le32(tsf_offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='ctx'> mt7915_mcu_bss_bmc_tlv(struct sk_buff *skb, struct mt7915_phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct bss_info_bmc_rate *bmc;</div><div class='hunk'>@@ -954,7 +637,7 @@ mt7915_mcu_bss_bmc_tlv(struct sk_buff *skb, struct mt7915_phy *phy)</div><div class='ctx'> 	enum nl80211_band band = chandef-&gt;chan-&gt;band;</div><div class='ctx'> 	struct tlv *tlv;</div><div class='ctx'> </div><div class='del'>-	tlv = mt7915_mcu_add_tlv(skb, BSS_INFO_BMC_RATE, sizeof(*bmc));</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, BSS_INFO_BMC_RATE, sizeof(*bmc));</div><div class='ctx'> </div><div class='ctx'> 	bmc = (struct bss_info_bmc_rate *)tlv;</div><div class='ctx'> 	if (band == NL80211_BAND_2GHZ) {</div><div class='hunk'>@@ -971,7 +654,7 @@ mt7915_mcu_muar_config(struct mt7915_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='del'>-	u32 idx = mvif-&gt;omac_idx - REPEATER_BSSID_START;</div><div class='add'>+	u32 idx = mvif-&gt;mt76.omac_idx - REPEATER_BSSID_START;</div><div class='ctx'> 	u32 mask = phy-&gt;omac_mask &gt;&gt; 32 &amp; ~BIT(idx);</div><div class='ctx'> 	const u8 *addr = vif-&gt;addr;</div><div class='ctx'> 	struct {</div><div class='hunk'>@@ -989,7 +672,7 @@ mt7915_mcu_muar_config(struct mt7915_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 		.mode = !!mask || enable,</div><div class='ctx'> 		.entry_count = 1,</div><div class='ctx'> 		.write = 1,</div><div class='del'>-		.band = phy != &amp;dev-&gt;phy,</div><div class='add'>+		.band = phy-&gt;mt76-&gt;band_idx,</div><div class='ctx'> 		.index = idx * 2 + bssid,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -1007,23 +690,25 @@ int mt7915_mcu_add_bss_info(struct mt7915_phy *phy,</div><div class='ctx'> 			    struct ieee80211_vif *vif, int enable)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	if (mvif-&gt;omac_idx &gt;= REPEATER_BSSID_START) {</div><div class='add'>+	if (mvif-&gt;mt76.omac_idx &gt;= REPEATER_BSSID_START) {</div><div class='ctx'> 		mt7915_mcu_muar_config(phy, vif, false, enable);</div><div class='ctx'> 		mt7915_mcu_muar_config(phy, vif, true, enable);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb = mt7915_mcu_alloc_sta_req(phy-&gt;dev, mvif, NULL,</div><div class='del'>-				       MT7915_BSS_UPDATE_MAX_SIZE);</div><div class='add'>+	skb = __mt76_connac_mcu_alloc_sta_req(&amp;dev-&gt;mt76, &amp;mvif-&gt;mt76, NULL,</div><div class='add'>+					      MT7915_BSS_UPDATE_MAX_SIZE);</div><div class='ctx'> 	if (IS_ERR(skb))</div><div class='ctx'> 		return PTR_ERR(skb);</div><div class='ctx'> </div><div class='ctx'> 	/* bss_omac must be first */</div><div class='ctx'> 	if (enable)</div><div class='del'>-		mt7915_mcu_bss_omac_tlv(skb, vif);</div><div class='add'>+		mt76_connac_mcu_bss_omac_tlv(skb, vif);</div><div class='ctx'> </div><div class='del'>-	mt7915_mcu_bss_basic_tlv(skb, vif, phy, enable);</div><div class='add'>+	mt76_connac_mcu_bss_basic_tlv(skb, vif, NULL, phy-&gt;mt76,</div><div class='add'>+				      mvif-&gt;sta.wcid.idx, enable);</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;type == NL80211_IFTYPE_MONITOR)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1037,312 +722,62 @@ int mt7915_mcu_add_bss_info(struct mt7915_phy *phy,</div><div class='ctx'> 		if (vif-&gt;bss_conf.he_support)</div><div class='ctx'> 			mt7915_mcu_bss_he_tlv(skb, vif, phy);</div><div class='ctx'> </div><div class='del'>-		if (mvif-&gt;omac_idx &gt;= EXT_BSSID_START &amp;&amp;</div><div class='del'>-		    mvif-&gt;omac_idx &lt; REPEATER_BSSID_START)</div><div class='del'>-			mt7915_mcu_bss_ext_tlv(skb, mvif);</div><div class='add'>+		if (mvif-&gt;mt76.omac_idx &gt;= EXT_BSSID_START &amp;&amp;</div><div class='add'>+		    mvif-&gt;mt76.omac_idx &lt; REPEATER_BSSID_START)</div><div class='add'>+			mt76_connac_mcu_bss_ext_tlv(skb, &amp;mvif-&gt;mt76);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	return mt76_mcu_skb_send_msg(&amp;phy-&gt;dev-&gt;mt76, skb,</div><div class='add'>+	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='ctx'> 				     MCU_EXT_CMD(BSS_INFO_UPDATE), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /** starec &amp; wtbl **/</div><div class='del'>-static int</div><div class='del'>-mt7915_mcu_sta_key_tlv(struct mt7915_sta *msta, struct sk_buff *skb,</div><div class='del'>-		       struct ieee80211_key_conf *key, enum set_key_cmd cmd)</div><div class='del'>-{</div><div class='del'>-	struct mt7915_sta_key_conf *bip = &amp;msta-&gt;bip;</div><div class='del'>-	struct sta_rec_sec *sec;</div><div class='del'>-	struct tlv *tlv;</div><div class='del'>-	u32 len = sizeof(*sec);</div><div class='del'>-</div><div class='del'>-	tlv = mt7915_mcu_add_tlv(skb, STA_REC_KEY_V2, sizeof(*sec));</div><div class='del'>-</div><div class='del'>-	sec = (struct sta_rec_sec *)tlv;</div><div class='del'>-	sec-&gt;add = cmd;</div><div class='del'>-</div><div class='del'>-	if (cmd == SET_KEY) {</div><div class='del'>-		struct sec_key *sec_key;</div><div class='del'>-		u8 cipher;</div><div class='del'>-</div><div class='del'>-		cipher = mt7915_mcu_get_cipher(key-&gt;cipher);</div><div class='del'>-		if (cipher == MT_CIPHER_NONE)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-		sec_key = &amp;sec-&gt;key[0];</div><div class='del'>-		sec_key-&gt;cipher_len = sizeof(*sec_key);</div><div class='del'>-</div><div class='del'>-		if (cipher == MT_CIPHER_BIP_CMAC_128) {</div><div class='del'>-			sec_key-&gt;cipher_id = MT_CIPHER_AES_CCMP;</div><div class='del'>-			sec_key-&gt;key_id = bip-&gt;keyidx;</div><div class='del'>-			sec_key-&gt;key_len = 16;</div><div class='del'>-			memcpy(sec_key-&gt;key, bip-&gt;key, 16);</div><div class='del'>-</div><div class='del'>-			sec_key = &amp;sec-&gt;key[1];</div><div class='del'>-			sec_key-&gt;cipher_id = MT_CIPHER_BIP_CMAC_128;</div><div class='del'>-			sec_key-&gt;cipher_len = sizeof(*sec_key);</div><div class='del'>-			sec_key-&gt;key_len = 16;</div><div class='del'>-			memcpy(sec_key-&gt;key, key-&gt;key, 16);</div><div class='del'>-</div><div class='del'>-			sec-&gt;n_cipher = 2;</div><div class='del'>-		} else {</div><div class='del'>-			sec_key-&gt;cipher_id = cipher;</div><div class='del'>-			sec_key-&gt;key_id = key-&gt;keyidx;</div><div class='del'>-			sec_key-&gt;key_len = key-&gt;keylen;</div><div class='del'>-			memcpy(sec_key-&gt;key, key-&gt;key, key-&gt;keylen);</div><div class='del'>-</div><div class='del'>-			if (cipher == MT_CIPHER_TKIP) {</div><div class='del'>-				/* Rx/Tx MIC keys are swapped */</div><div class='del'>-				memcpy(sec_key-&gt;key + 16, key-&gt;key + 24, 8);</div><div class='del'>-				memcpy(sec_key-&gt;key + 24, key-&gt;key + 16, 8);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* store key_conf for BIP batch update */</div><div class='del'>-			if (cipher == MT_CIPHER_AES_CCMP) {</div><div class='del'>-				memcpy(bip-&gt;key, key-&gt;key, key-&gt;keylen);</div><div class='del'>-				bip-&gt;keyidx = key-&gt;keyidx;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			len -= sizeof(*sec_key);</div><div class='del'>-			sec-&gt;n_cipher = 1;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		len -= sizeof(sec-&gt;key);</div><div class='del'>-		sec-&gt;n_cipher = 0;</div><div class='del'>-	}</div><div class='del'>-	sec-&gt;len = cpu_to_le16(len);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mt7915_mcu_add_key(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-		       struct mt7915_sta *msta, struct ieee80211_key_conf *key,</div><div class='del'>-		       enum set_key_cmd cmd)</div><div class='del'>-{</div><div class='del'>-	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int len = sizeof(struct sta_req_hdr) + sizeof(struct sta_rec_sec);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta, len);</div><div class='del'>-	if (IS_ERR(skb))</div><div class='del'>-		return PTR_ERR(skb);</div><div class='del'>-</div><div class='del'>-	ret = mt7915_mcu_sta_key_tlv(msta, skb, key, cmd);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='del'>-				     MCU_EXT_CMD(STA_REC_UPDATE), true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt7915_mcu_sta_ba_tlv(struct sk_buff *skb,</div><div class='del'>-		      struct ieee80211_ampdu_params *params,</div><div class='del'>-		      bool enable, bool tx)</div><div class='del'>-{</div><div class='del'>-	struct sta_rec_ba *ba;</div><div class='del'>-	struct tlv *tlv;</div><div class='del'>-</div><div class='del'>-	tlv = mt7915_mcu_add_tlv(skb, STA_REC_BA, sizeof(*ba));</div><div class='del'>-</div><div class='del'>-	ba = (struct sta_rec_ba *)tlv;</div><div class='del'>-	ba-&gt;ba_type = tx ? MT_BA_TYPE_ORIGINATOR : MT_BA_TYPE_RECIPIENT;</div><div class='del'>-	ba-&gt;winsize = cpu_to_le16(params-&gt;buf_size);</div><div class='del'>-	ba-&gt;ssn = cpu_to_le16(params-&gt;ssn);</div><div class='del'>-	ba-&gt;ba_en = enable &lt;&lt; params-&gt;tid;</div><div class='del'>-	ba-&gt;amsdu = params-&gt;amsdu;</div><div class='del'>-	ba-&gt;tid = params-&gt;tid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt7915_mcu_wtbl_ba_tlv(struct sk_buff *skb,</div><div class='del'>-		       struct ieee80211_ampdu_params *params,</div><div class='del'>-		       bool enable, bool tx, void *sta_wtbl,</div><div class='del'>-		       void *wtbl_tlv)</div><div class='del'>-{</div><div class='del'>-	struct wtbl_ba *ba;</div><div class='del'>-	struct tlv *tlv;</div><div class='del'>-</div><div class='del'>-	tlv = mt7915_mcu_add_nested_tlv(skb, WTBL_BA, sizeof(*ba),</div><div class='del'>-					wtbl_tlv, sta_wtbl);</div><div class='del'>-</div><div class='del'>-	ba = (struct wtbl_ba *)tlv;</div><div class='del'>-	ba-&gt;tid = params-&gt;tid;</div><div class='del'>-</div><div class='del'>-	if (tx) {</div><div class='del'>-		ba-&gt;ba_type = MT_BA_TYPE_ORIGINATOR;</div><div class='del'>-		ba-&gt;sn = enable ? cpu_to_le16(params-&gt;ssn) : 0;</div><div class='del'>-		ba-&gt;ba_en = enable;</div><div class='del'>-	} else {</div><div class='del'>-		memcpy(ba-&gt;peer_addr, params-&gt;sta-&gt;addr, ETH_ALEN);</div><div class='del'>-		ba-&gt;ba_type = MT_BA_TYPE_RECIPIENT;</div><div class='del'>-		ba-&gt;rst_ba_tid = params-&gt;tid;</div><div class='del'>-		ba-&gt;rst_ba_sel = RST_BA_MAC_TID_MATCH;</div><div class='del'>-		ba-&gt;rst_ba_sb = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (enable &amp;&amp; tx)</div><div class='del'>-		ba-&gt;ba_winsize = cpu_to_le16(params-&gt;buf_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mt7915_mcu_sta_ba(struct mt7915_dev *dev,</div><div class='del'>-		  struct ieee80211_ampdu_params *params,</div><div class='del'>-		  bool enable, bool tx)</div><div class='add'>+int mt7915_mcu_add_tx_ba(struct mt7915_dev *dev,</div><div class='add'>+			 struct ieee80211_ampdu_params *params,</div><div class='add'>+			 bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_sta *msta = (struct mt7915_sta *)params-&gt;sta-&gt;drv_priv;</div><div class='ctx'> 	struct mt7915_vif *mvif = msta-&gt;vif;</div><div class='del'>-	struct wtbl_req_hdr *wtbl_hdr;</div><div class='del'>-	struct tlv *sta_wtbl;</div><div class='del'>-	struct sk_buff *skb;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (enable &amp;&amp; tx &amp;&amp; !params-&gt;amsdu)</div><div class='add'>+	mt76_worker_disable(&amp;dev-&gt;mt76.tx_worker);</div><div class='add'>+	if (enable &amp;&amp; !params-&gt;amsdu)</div><div class='ctx'> 		msta-&gt;wcid.amsdu = false;</div><div class='add'>+	ret = mt76_connac_mcu_sta_ba(&amp;dev-&gt;mt76, &amp;mvif-&gt;mt76, params,</div><div class='add'>+				     MCU_EXT_CMD(STA_REC_UPDATE),</div><div class='add'>+				     enable, true);</div><div class='add'>+	mt76_worker_enable(&amp;dev-&gt;mt76.tx_worker);</div><div class='ctx'> </div><div class='del'>-	skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta,</div><div class='del'>-				       MT7915_STA_UPDATE_MAX_SIZE);</div><div class='del'>-	if (IS_ERR(skb))</div><div class='del'>-		return PTR_ERR(skb);</div><div class='del'>-</div><div class='del'>-	sta_wtbl = mt7915_mcu_add_tlv(skb, STA_REC_WTBL, sizeof(struct tlv));</div><div class='del'>-</div><div class='del'>-	wtbl_hdr = mt7915_mcu_alloc_wtbl_req(dev, msta, WTBL_SET, sta_wtbl,</div><div class='del'>-					     &amp;skb);</div><div class='del'>-	if (IS_ERR(wtbl_hdr))</div><div class='del'>-		return PTR_ERR(wtbl_hdr);</div><div class='del'>-</div><div class='del'>-	mt7915_mcu_wtbl_ba_tlv(skb, params, enable, tx, sta_wtbl, wtbl_hdr);</div><div class='del'>-</div><div class='del'>-	ret = mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='del'>-				    MCU_EXT_CMD(STA_REC_UPDATE), true);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta,</div><div class='del'>-				       MT7915_STA_UPDATE_MAX_SIZE);</div><div class='del'>-	if (IS_ERR(skb))</div><div class='del'>-		return PTR_ERR(skb);</div><div class='del'>-</div><div class='del'>-	mt7915_mcu_sta_ba_tlv(skb, params, enable, tx);</div><div class='del'>-</div><div class='del'>-	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='del'>-				     MCU_EXT_CMD(STA_REC_UPDATE), true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mt7915_mcu_add_tx_ba(struct mt7915_dev *dev,</div><div class='del'>-			 struct ieee80211_ampdu_params *params,</div><div class='del'>-			 bool enable)</div><div class='del'>-{</div><div class='del'>-	return mt7915_mcu_sta_ba(dev, params, enable, true);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mt7915_mcu_add_rx_ba(struct mt7915_dev *dev,</div><div class='ctx'> 			 struct ieee80211_ampdu_params *params,</div><div class='ctx'> 			 bool enable)</div><div class='ctx'> {</div><div class='del'>-	return mt7915_mcu_sta_ba(dev, params, enable, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt7915_mcu_wtbl_generic_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,</div><div class='del'>-			    struct ieee80211_sta *sta, void *sta_wtbl,</div><div class='del'>-			    void *wtbl_tlv)</div><div class='del'>-{</div><div class='del'>-	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='del'>-	struct wtbl_generic *generic;</div><div class='del'>-	struct wtbl_rx *rx;</div><div class='del'>-	struct tlv *tlv;</div><div class='del'>-</div><div class='del'>-	tlv = mt7915_mcu_add_nested_tlv(skb, WTBL_GENERIC, sizeof(*generic),</div><div class='del'>-					wtbl_tlv, sta_wtbl);</div><div class='del'>-</div><div class='del'>-	generic = (struct wtbl_generic *)tlv;</div><div class='del'>-</div><div class='del'>-	if (sta) {</div><div class='del'>-		memcpy(generic-&gt;peer_addr, sta-&gt;addr, ETH_ALEN);</div><div class='del'>-		generic-&gt;partial_aid = cpu_to_le16(sta-&gt;aid);</div><div class='del'>-		generic-&gt;muar_idx = mvif-&gt;omac_idx;</div><div class='del'>-		generic-&gt;qos = sta-&gt;wme;</div><div class='del'>-	} else {</div><div class='del'>-		/* use BSSID in station mode */</div><div class='del'>-		if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='del'>-			memcpy(generic-&gt;peer_addr, vif-&gt;bss_conf.bssid,</div><div class='del'>-			       ETH_ALEN);</div><div class='del'>-		else</div><div class='del'>-			eth_broadcast_addr(generic-&gt;peer_addr);</div><div class='del'>-</div><div class='del'>-		generic-&gt;muar_idx = 0xe;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tlv = mt7915_mcu_add_nested_tlv(skb, WTBL_RX, sizeof(*rx),</div><div class='del'>-					wtbl_tlv, sta_wtbl);</div><div class='del'>-</div><div class='del'>-	rx = (struct wtbl_rx *)tlv;</div><div class='del'>-	rx-&gt;rca1 = sta ? vif-&gt;type != NL80211_IFTYPE_AP : 1;</div><div class='del'>-	rx-&gt;rca2 = 1;</div><div class='del'>-	rx-&gt;rv = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt7915_mcu_sta_basic_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,</div><div class='del'>-			 struct ieee80211_sta *sta, bool enable)</div><div class='del'>-{</div><div class='del'>-#define EXTRA_INFO_VER          BIT(0)</div><div class='del'>-#define EXTRA_INFO_NEW          BIT(1)</div><div class='del'>-	struct sta_rec_basic *basic;</div><div class='del'>-	struct tlv *tlv;</div><div class='del'>-</div><div class='del'>-	tlv = mt7915_mcu_add_tlv(skb, STA_REC_BASIC, sizeof(*basic));</div><div class='del'>-</div><div class='del'>-	basic = (struct sta_rec_basic *)tlv;</div><div class='del'>-	basic-&gt;extra_info = cpu_to_le16(EXTRA_INFO_VER);</div><div class='del'>-</div><div class='del'>-	if (enable) {</div><div class='del'>-		basic-&gt;extra_info |= cpu_to_le16(EXTRA_INFO_NEW);</div><div class='del'>-		basic-&gt;conn_state = CONN_STATE_PORT_SECURE;</div><div class='del'>-	} else {</div><div class='del'>-		basic-&gt;conn_state = CONN_STATE_DISCONNECT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!sta) {</div><div class='del'>-		basic-&gt;conn_type = cpu_to_le32(CONNECTION_INFRA_BC);</div><div class='del'>-		eth_broadcast_addr(basic-&gt;peer_addr);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (vif-&gt;type) {</div><div class='del'>-	case NL80211_IFTYPE_MESH_POINT:</div><div class='del'>-	case NL80211_IFTYPE_AP:</div><div class='del'>-		basic-&gt;conn_type = cpu_to_le32(CONNECTION_INFRA_STA);</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-		basic-&gt;conn_type = cpu_to_le32(CONNECTION_INFRA_AP);</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		basic-&gt;conn_type = cpu_to_le32(CONNECTION_IBSS_ADHOC);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	struct mt7915_sta *msta = (struct mt7915_sta *)params-&gt;sta-&gt;drv_priv;</div><div class='add'>+	struct mt7915_vif *mvif = msta-&gt;vif;</div><div class='ctx'> </div><div class='del'>-	memcpy(basic-&gt;peer_addr, sta-&gt;addr, ETH_ALEN);</div><div class='del'>-	basic-&gt;aid = cpu_to_le16(sta-&gt;aid);</div><div class='del'>-	basic-&gt;qos = sta-&gt;wme;</div><div class='add'>+	return mt76_connac_mcu_sta_ba(&amp;dev-&gt;mt76, &amp;mvif-&gt;mt76, params,</div><div class='add'>+				      MCU_EXT_CMD(STA_REC_UPDATE),</div><div class='add'>+				      enable, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)</div><div class='add'>+mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,</div><div class='add'>+		      struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sta_he_cap *he_cap = &amp;sta-&gt;he_cap;</div><div class='del'>-	struct ieee80211_he_cap_elem *elem = &amp;he_cap-&gt;he_cap_elem;</div><div class='add'>+	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct ieee80211_he_cap_elem *elem = &amp;sta-&gt;deflink.he_cap.he_cap_elem;</div><div class='add'>+	struct ieee80211_he_mcs_nss_supp mcs_map;</div><div class='ctx'> 	struct sta_rec_he *he;</div><div class='ctx'> 	struct tlv *tlv;</div><div class='ctx'> 	u32 cap = 0;</div><div class='ctx'> </div><div class='del'>-	tlv = mt7915_mcu_add_tlv(skb, STA_REC_HE, sizeof(*he));</div><div class='add'>+	if (!sta-&gt;deflink.he_cap.has_he)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HE, sizeof(*he));</div><div class='ctx'> </div><div class='ctx'> 	he = (struct sta_rec_he *)tlv;</div><div class='ctx'> </div><div class='hunk'>@@ -1366,8 +801,9 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)</div><div class='ctx'> 	     IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_5G))</div><div class='ctx'> 		cap |= STA_REC_HE_CAP_BW20_RU242_SUPPORT;</div><div class='ctx'> </div><div class='del'>-	if (elem-&gt;phy_cap_info[1] &amp;</div><div class='del'>-	    IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD)</div><div class='add'>+	if (mvif-&gt;cap.he_ldpc &amp;&amp;</div><div class='add'>+	    (elem-&gt;phy_cap_info[1] &amp;</div><div class='add'>+	     IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD))</div><div class='ctx'> 		cap |= STA_REC_HE_CAP_LDPC;</div><div class='ctx'> </div><div class='ctx'> 	if (elem-&gt;phy_cap_info[1] &amp;</div><div class='hunk'>@@ -1387,6 +823,10 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)</div><div class='ctx'> 		cap |= STA_REC_HE_CAP_LE_EQ_80M_RX_STBC;</div><div class='ctx'> </div><div class='ctx'> 	if (elem-&gt;phy_cap_info[6] &amp;</div><div class='add'>+	    IEEE80211_HE_PHY_CAP6_TRIG_CQI_FB)</div><div class='add'>+		cap |= STA_REC_HE_CAP_TRIG_CQI_FK;</div><div class='add'>+</div><div class='add'>+	if (elem-&gt;phy_cap_info[6] &amp;</div><div class='ctx'> 	    IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE)</div><div class='ctx'> 		cap |= STA_REC_HE_CAP_PARTIAL_BW_EXT_RANGE;</div><div class='ctx'> </div><div class='hunk'>@@ -1411,10 +851,6 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)</div><div class='ctx'> 		cap |= STA_REC_HE_CAP_ER_SU_PPDU_1LTF_8US_GI;</div><div class='ctx'> </div><div class='ctx'> 	if (elem-&gt;phy_cap_info[9] &amp;</div><div class='del'>-	    IEEE80211_HE_PHY_CAP9_NON_TRIGGERED_CQI_FEEDBACK)</div><div class='del'>-		cap |= STA_REC_HE_CAP_TRIG_CQI_FK;</div><div class='del'>-</div><div class='del'>-	if (elem-&gt;phy_cap_info[9] &amp;</div><div class='ctx'> 	    IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU)</div><div class='ctx'> 		cap |= STA_REC_HE_CAP_TX_1024QAM_UNDER_RU242;</div><div class='ctx'> </div><div class='hunk'>@@ -1424,19 +860,23 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)</div><div class='ctx'> </div><div class='ctx'> 	he-&gt;he_cap = cpu_to_le32(cap);</div><div class='ctx'> </div><div class='del'>-	switch (sta-&gt;bandwidth) {</div><div class='add'>+	mcs_map = sta-&gt;deflink.he_cap.he_mcs_nss_supp;</div><div class='add'>+	switch (sta-&gt;deflink.bandwidth) {</div><div class='ctx'> 	case IEEE80211_STA_RX_BW_160:</div><div class='ctx'> 		if (elem-&gt;phy_cap_info[0] &amp;</div><div class='ctx'> 		    IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G)</div><div class='del'>-			he-&gt;max_nss_mcs[CMD_HE_MCS_BW8080] =</div><div class='del'>-				he_cap-&gt;he_mcs_nss_supp.rx_mcs_80p80;</div><div class='add'>+			mt7915_mcu_set_sta_he_mcs(sta,</div><div class='add'>+						  &amp;he-&gt;max_nss_mcs[CMD_HE_MCS_BW8080],</div><div class='add'>+						  le16_to_cpu(mcs_map.rx_mcs_80p80));</div><div class='ctx'> </div><div class='del'>-		he-&gt;max_nss_mcs[CMD_HE_MCS_BW160] =</div><div class='del'>-				he_cap-&gt;he_mcs_nss_supp.rx_mcs_160;</div><div class='add'>+		mt7915_mcu_set_sta_he_mcs(sta,</div><div class='add'>+					  &amp;he-&gt;max_nss_mcs[CMD_HE_MCS_BW160],</div><div class='add'>+					  le16_to_cpu(mcs_map.rx_mcs_160));</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> 	default:</div><div class='del'>-		he-&gt;max_nss_mcs[CMD_HE_MCS_BW80] =</div><div class='del'>-				he_cap-&gt;he_mcs_nss_supp.rx_mcs_80;</div><div class='add'>+		mt7915_mcu_set_sta_he_mcs(sta,</div><div class='add'>+					  &amp;he-&gt;max_nss_mcs[CMD_HE_MCS_BW80],</div><div class='add'>+					  le16_to_cpu(mcs_map.rx_mcs_80));</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1467,50 +907,43 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7915_mcu_sta_uapsd_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,</div><div class='del'>-		     struct ieee80211_vif *vif)</div><div class='add'>+mt7915_mcu_sta_muru_tlv(struct mt7915_dev *dev, struct sk_buff *skb,</div><div class='add'>+			struct ieee80211_sta *sta, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct sta_rec_uapsd *uapsd;</div><div class='add'>+	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct ieee80211_he_cap_elem *elem = &amp;sta-&gt;deflink.he_cap.he_cap_elem;</div><div class='add'>+	struct sta_rec_muru *muru;</div><div class='ctx'> 	struct tlv *tlv;</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;type != NL80211_IFTYPE_AP || !sta-&gt;wme)</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+	    vif-&gt;type != NL80211_IFTYPE_AP)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	tlv = mt7915_mcu_add_tlv(skb, STA_REC_APPS, sizeof(*uapsd));</div><div class='del'>-	uapsd = (struct sta_rec_uapsd *)tlv;</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_MURU, sizeof(*muru));</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;uapsd_queues &amp; IEEE80211_WMM_IE_STA_QOSINFO_AC_VO) {</div><div class='del'>-		uapsd-&gt;dac_map |= BIT(3);</div><div class='del'>-		uapsd-&gt;tac_map |= BIT(3);</div><div class='del'>-	}</div><div class='del'>-	if (sta-&gt;uapsd_queues &amp; IEEE80211_WMM_IE_STA_QOSINFO_AC_VI) {</div><div class='del'>-		uapsd-&gt;dac_map |= BIT(2);</div><div class='del'>-		uapsd-&gt;tac_map |= BIT(2);</div><div class='del'>-	}</div><div class='del'>-	if (sta-&gt;uapsd_queues &amp; IEEE80211_WMM_IE_STA_QOSINFO_AC_BE) {</div><div class='del'>-		uapsd-&gt;dac_map |= BIT(1);</div><div class='del'>-		uapsd-&gt;tac_map |= BIT(1);</div><div class='del'>-	}</div><div class='del'>-	if (sta-&gt;uapsd_queues &amp; IEEE80211_WMM_IE_STA_QOSINFO_AC_BK) {</div><div class='del'>-		uapsd-&gt;dac_map |= BIT(0);</div><div class='del'>-		uapsd-&gt;tac_map |= BIT(0);</div><div class='del'>-	}</div><div class='del'>-	uapsd-&gt;max_sp = sta-&gt;max_sp;</div><div class='del'>-}</div><div class='add'>+	muru = (struct sta_rec_muru *)tlv;</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7915_mcu_sta_muru_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_sta_he_cap *he_cap = &amp;sta-&gt;he_cap;</div><div class='del'>-	struct ieee80211_he_cap_elem *elem = &amp;he_cap-&gt;he_cap_elem;</div><div class='del'>-	struct sta_rec_muru *muru;</div><div class='del'>-	struct tlv *tlv;</div><div class='add'>+	muru-&gt;cfg.mimo_dl_en = mvif-&gt;cap.he_mu_ebfer ||</div><div class='add'>+			       mvif-&gt;cap.vht_mu_ebfer ||</div><div class='add'>+			       mvif-&gt;cap.vht_mu_ebfee;</div><div class='add'>+	if (!is_mt7915(&amp;dev-&gt;mt76))</div><div class='add'>+		muru-&gt;cfg.mimo_ul_en = true;</div><div class='add'>+	muru-&gt;cfg.ofdma_dl_en = true;</div><div class='ctx'> </div><div class='del'>-	tlv = mt7915_mcu_add_tlv(skb, STA_REC_MURU, sizeof(*muru));</div><div class='add'>+	if (sta-&gt;deflink.vht_cap.vht_supported)</div><div class='add'>+		muru-&gt;mimo_dl.vht_mu_bfee =</div><div class='add'>+			!!(sta-&gt;deflink.vht_cap.cap &amp; IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE);</div><div class='ctx'> </div><div class='del'>-	muru = (struct sta_rec_muru *)tlv;</div><div class='del'>-	muru-&gt;cfg.ofdma_dl_en = true;</div><div class='del'>-	muru-&gt;cfg.mimo_dl_en = true;</div><div class='add'>+	if (!sta-&gt;deflink.he_cap.has_he)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	muru-&gt;mimo_dl.partial_bw_dl_mimo =</div><div class='add'>+		HE_PHY(CAP6_PARTIAL_BANDWIDTH_DL_MUMIMO, elem-&gt;phy_cap_info[6]);</div><div class='add'>+</div><div class='add'>+	muru-&gt;mimo_ul.full_ul_mimo =</div><div class='add'>+		HE_PHY(CAP2_UL_MU_FULL_MU_MIMO, elem-&gt;phy_cap_info[2]);</div><div class='add'>+	muru-&gt;mimo_ul.partial_ul_mimo =</div><div class='add'>+		HE_PHY(CAP2_UL_MU_PARTIAL_MU_MIMO, elem-&gt;phy_cap_info[2]);</div><div class='ctx'> </div><div class='ctx'> 	muru-&gt;ofdma_dl.punc_pream_rx =</div><div class='ctx'> 		HE_PHY(CAP1_PREAMBLE_PUNC_RX_MASK, elem-&gt;phy_cap_info[1]);</div><div class='hunk'>@@ -1520,9 +953,6 @@ mt7915_mcu_sta_muru_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)</div><div class='ctx'> 		HE_PHY(CAP8_20MHZ_IN_160MHZ_HE_PPDU, elem-&gt;phy_cap_info[8]);</div><div class='ctx'> 	muru-&gt;ofdma_dl.he_80m_in_160m =</div><div class='ctx'> 		HE_PHY(CAP8_80MHZ_IN_160MHZ_HE_PPDU, elem-&gt;phy_cap_info[8]);</div><div class='del'>-	muru-&gt;ofdma_dl.lt16_sigb = 0;</div><div class='del'>-	muru-&gt;ofdma_dl.rx_su_comp_sigb = 0;</div><div class='del'>-	muru-&gt;ofdma_dl.rx_su_non_comp_sigb = 0;</div><div class='ctx'> </div><div class='ctx'> 	muru-&gt;ofdma_ul.t_frame_dur =</div><div class='ctx'> 		HE_MAC(CAP1_TF_MAC_PAD_DUR_MASK, elem-&gt;mac_cap_info[1]);</div><div class='hunk'>@@ -1530,246 +960,154 @@ mt7915_mcu_sta_muru_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)</div><div class='ctx'> 		HE_MAC(CAP2_MU_CASCADING, elem-&gt;mac_cap_info[2]);</div><div class='ctx'> 	muru-&gt;ofdma_ul.uo_ra =</div><div class='ctx'> 		HE_MAC(CAP3_OFDMA_RA, elem-&gt;mac_cap_info[3]);</div><div class='del'>-	muru-&gt;ofdma_ul.he_2x996_tone = 0;</div><div class='del'>-	muru-&gt;ofdma_ul.rx_t_frame_11ac = 0;</div><div class='del'>-</div><div class='del'>-	muru-&gt;mimo_dl.vht_mu_bfee =</div><div class='del'>-		!!(sta-&gt;vht_cap.cap &amp; IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE);</div><div class='del'>-	muru-&gt;mimo_dl.partial_bw_dl_mimo =</div><div class='del'>-		HE_PHY(CAP6_PARTIAL_BANDWIDTH_DL_MUMIMO, elem-&gt;phy_cap_info[6]);</div><div class='del'>-</div><div class='del'>-	muru-&gt;mimo_ul.full_ul_mimo =</div><div class='del'>-		HE_PHY(CAP2_UL_MU_FULL_MU_MIMO, elem-&gt;phy_cap_info[2]);</div><div class='del'>-	muru-&gt;mimo_ul.partial_ul_mimo =</div><div class='del'>-		HE_PHY(CAP2_UL_MU_PARTIAL_MU_MIMO, elem-&gt;phy_cap_info[2]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mt7915_mcu_add_mu(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-		  struct ieee80211_sta *sta)</div><div class='del'>-{</div><div class='del'>-	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='del'>-	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int len = sizeof(struct sta_req_hdr) + sizeof(struct sta_rec_muru);</div><div class='del'>-</div><div class='del'>-	if (!sta-&gt;vht_cap.vht_supported &amp;&amp; !sta-&gt;he_cap.has_he)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta, len);</div><div class='del'>-	if (IS_ERR(skb))</div><div class='del'>-		return PTR_ERR(skb);</div><div class='del'>-</div><div class='del'>-	/* starec muru */</div><div class='del'>-	mt7915_mcu_sta_muru_tlv(skb, sta);</div><div class='del'>-</div><div class='del'>-	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='del'>-				     MCU_EXT_CMD(STA_REC_UPDATE), true);</div><div class='add'>+	muru-&gt;ofdma_ul.rx_ctrl_frame_to_mbss =</div><div class='add'>+		HE_MAC(CAP3_RX_CTRL_FRAME_TO_MULTIBSS, elem-&gt;mac_cap_info[3]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7915_mcu_sta_amsdu_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)</div><div class='add'>+mt7915_mcu_sta_ht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='del'>-	struct sta_rec_amsdu *amsdu;</div><div class='add'>+	struct sta_rec_ht *ht;</div><div class='ctx'> 	struct tlv *tlv;</div><div class='ctx'> </div><div class='del'>-	if (!sta-&gt;max_amsdu_len)</div><div class='del'>-	    return;</div><div class='add'>+	if (!sta-&gt;deflink.ht_cap.ht_supported)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	tlv = mt7915_mcu_add_tlv(skb, STA_REC_HW_AMSDU, sizeof(*amsdu));</div><div class='del'>-	amsdu = (struct sta_rec_amsdu *)tlv;</div><div class='del'>-	amsdu-&gt;max_amsdu_num = 8;</div><div class='del'>-	amsdu-&gt;amsdu_en = true;</div><div class='del'>-	amsdu-&gt;max_mpdu_size = sta-&gt;max_amsdu_len &gt;=</div><div class='del'>-			       IEEE80211_MAX_MPDU_LEN_VHT_7991;</div><div class='del'>-	msta-&gt;wcid.amsdu = true;</div><div class='del'>-}</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HT, sizeof(*ht));</div><div class='ctx'> </div><div class='del'>-static bool</div><div class='del'>-mt7915_hw_amsdu_supported(struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	switch (vif-&gt;type) {</div><div class='del'>-	case NL80211_IFTYPE_AP:</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-		return true;</div><div class='del'>-	default:</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='add'>+	ht = (struct sta_rec_ht *)tlv;</div><div class='add'>+	ht-&gt;ht_cap = cpu_to_le16(sta-&gt;deflink.ht_cap.cap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7915_mcu_sta_tlv(struct mt7915_dev *dev, struct sk_buff *skb,</div><div class='del'>-		   struct ieee80211_sta *sta, struct ieee80211_vif *vif)</div><div class='add'>+mt7915_mcu_sta_vht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='add'>+	struct sta_rec_vht *vht;</div><div class='ctx'> 	struct tlv *tlv;</div><div class='ctx'> </div><div class='del'>-	/* starec ht */</div><div class='del'>-	if (sta-&gt;ht_cap.ht_supported) {</div><div class='del'>-		struct sta_rec_ht *ht;</div><div class='del'>-</div><div class='del'>-		tlv = mt7915_mcu_add_tlv(skb, STA_REC_HT, sizeof(*ht));</div><div class='del'>-		ht = (struct sta_rec_ht *)tlv;</div><div class='del'>-		ht-&gt;ht_cap = cpu_to_le16(sta-&gt;ht_cap.cap);</div><div class='del'>-</div><div class='del'>-		if (mt7915_hw_amsdu_supported(vif))</div><div class='del'>-			mt7915_mcu_sta_amsdu_tlv(skb, sta);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* starec vht */</div><div class='del'>-	if (sta-&gt;vht_cap.vht_supported) {</div><div class='del'>-		struct sta_rec_vht *vht;</div><div class='del'>-</div><div class='del'>-		tlv = mt7915_mcu_add_tlv(skb, STA_REC_VHT, sizeof(*vht));</div><div class='del'>-		vht = (struct sta_rec_vht *)tlv;</div><div class='del'>-		vht-&gt;vht_cap = cpu_to_le32(sta-&gt;vht_cap.cap);</div><div class='del'>-		vht-&gt;vht_rx_mcs_map = sta-&gt;vht_cap.vht_mcs.rx_mcs_map;</div><div class='del'>-		vht-&gt;vht_tx_mcs_map = sta-&gt;vht_cap.vht_mcs.tx_mcs_map;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* starec he */</div><div class='del'>-	if (sta-&gt;he_cap.has_he)</div><div class='del'>-		mt7915_mcu_sta_he_tlv(skb, sta);</div><div class='del'>-</div><div class='del'>-	/* starec uapsd */</div><div class='del'>-	mt7915_mcu_sta_uapsd_tlv(skb, sta, vif);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt7915_mcu_wtbl_smps_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,</div><div class='del'>-			 void *sta_wtbl, void *wtbl_tlv)</div><div class='del'>-{</div><div class='del'>-	struct wtbl_smps *smps;</div><div class='del'>-	struct tlv *tlv;</div><div class='add'>+	if (!sta-&gt;deflink.vht_cap.vht_supported)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	tlv = mt7915_mcu_add_nested_tlv(skb, WTBL_SMPS, sizeof(*smps),</div><div class='del'>-					wtbl_tlv, sta_wtbl);</div><div class='del'>-	smps = (struct wtbl_smps *)tlv;</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_VHT, sizeof(*vht));</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;smps_mode == IEEE80211_SMPS_DYNAMIC)</div><div class='del'>-		smps-&gt;smps = true;</div><div class='add'>+	vht = (struct sta_rec_vht *)tlv;</div><div class='add'>+	vht-&gt;vht_cap = cpu_to_le32(sta-&gt;deflink.vht_cap.cap);</div><div class='add'>+	vht-&gt;vht_rx_mcs_map = sta-&gt;deflink.vht_cap.vht_mcs.rx_mcs_map;</div><div class='add'>+	vht-&gt;vht_tx_mcs_map = sta-&gt;deflink.vht_cap.vht_mcs.tx_mcs_map;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7915_mcu_wtbl_ht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,</div><div class='del'>-		       void *sta_wtbl, void *wtbl_tlv)</div><div class='add'>+mt7915_mcu_sta_amsdu_tlv(struct mt7915_dev *dev, struct sk_buff *skb,</div><div class='add'>+			 struct ieee80211_vif *vif, struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	struct wtbl_ht *ht = NULL;</div><div class='add'>+	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct sta_rec_amsdu *amsdu;</div><div class='ctx'> 	struct tlv *tlv;</div><div class='ctx'> </div><div class='del'>-	/* wtbl ht */</div><div class='del'>-	if (sta-&gt;ht_cap.ht_supported) {</div><div class='del'>-		tlv = mt7915_mcu_add_nested_tlv(skb, WTBL_HT, sizeof(*ht),</div><div class='del'>-						wtbl_tlv, sta_wtbl);</div><div class='del'>-		ht = (struct wtbl_ht *)tlv;</div><div class='del'>-		ht-&gt;ldpc = !!(sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_LDPC_CODING);</div><div class='del'>-		ht-&gt;af = sta-&gt;ht_cap.ampdu_factor;</div><div class='del'>-		ht-&gt;mm = sta-&gt;ht_cap.ampdu_density;</div><div class='del'>-		ht-&gt;ht = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* wtbl vht */</div><div class='del'>-	if (sta-&gt;vht_cap.vht_supported) {</div><div class='del'>-		struct wtbl_vht *vht;</div><div class='del'>-		u8 af;</div><div class='del'>-</div><div class='del'>-		tlv = mt7915_mcu_add_nested_tlv(skb, WTBL_VHT, sizeof(*vht),</div><div class='del'>-						wtbl_tlv, sta_wtbl);</div><div class='del'>-		vht = (struct wtbl_vht *)tlv;</div><div class='del'>-		vht-&gt;ldpc = !!(sta-&gt;vht_cap.cap &amp; IEEE80211_VHT_CAP_RXLDPC);</div><div class='del'>-		vht-&gt;vht = true;</div><div class='del'>-</div><div class='del'>-		af = FIELD_GET(IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK,</div><div class='del'>-			       sta-&gt;vht_cap.cap);</div><div class='del'>-		if (ht)</div><div class='del'>-			ht-&gt;af = max_t(u8, ht-&gt;af, af);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mt7915_mcu_wtbl_smps_tlv(skb, sta, sta_wtbl, wtbl_tlv);</div><div class='del'>-}</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+	    vif-&gt;type != NL80211_IFTYPE_AP)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7915_mcu_wtbl_hdr_trans_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,</div><div class='del'>-			      struct ieee80211_sta *sta,</div><div class='del'>-			      void *sta_wtbl, void *wtbl_tlv)</div><div class='del'>-{</div><div class='del'>-	struct mt7915_sta *msta;</div><div class='del'>-	struct wtbl_hdr_trans *htr = NULL;</div><div class='del'>-	struct tlv *tlv;</div><div class='add'>+	if (!sta-&gt;deflink.agg.max_amsdu_len)</div><div class='add'>+	    return;</div><div class='ctx'> </div><div class='del'>-	tlv = mt7915_mcu_add_nested_tlv(skb, WTBL_HDR_TRANS, sizeof(*htr),</div><div class='del'>-					wtbl_tlv, sta_wtbl);</div><div class='del'>-	htr = (struct wtbl_hdr_trans *)tlv;</div><div class='del'>-	htr-&gt;no_rx_trans = true;</div><div class='del'>-	if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='del'>-		htr-&gt;to_ds = true;</div><div class='del'>-	else</div><div class='del'>-		htr-&gt;from_ds = true;</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HW_AMSDU, sizeof(*amsdu));</div><div class='add'>+	amsdu = (struct sta_rec_amsdu *)tlv;</div><div class='add'>+	amsdu-&gt;max_amsdu_num = 8;</div><div class='add'>+	amsdu-&gt;amsdu_en = true;</div><div class='add'>+	msta-&gt;wcid.amsdu = true;</div><div class='ctx'> </div><div class='del'>-	if (!sta)</div><div class='add'>+	switch (sta-&gt;deflink.agg.max_amsdu_len) {</div><div class='add'>+	case IEEE80211_MAX_MPDU_LEN_VHT_11454:</div><div class='add'>+		if (!is_mt7915(&amp;dev-&gt;mt76)) {</div><div class='add'>+			amsdu-&gt;max_mpdu_size =</div><div class='add'>+				IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='add'>+	case IEEE80211_MAX_MPDU_LEN_HT_7935:</div><div class='add'>+	case IEEE80211_MAX_MPDU_LEN_VHT_7991:</div><div class='add'>+		amsdu-&gt;max_mpdu_size = IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991;</div><div class='add'>+		return;</div><div class='add'>+	default:</div><div class='add'>+		amsdu-&gt;max_mpdu_size = IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895;</div><div class='ctx'> 		return;</div><div class='del'>-</div><div class='del'>-	msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='del'>-	htr-&gt;no_rx_trans = !test_bit(MT_WCID_FLAG_HDR_TRANS, &amp;msta-&gt;wcid.flags);</div><div class='del'>-	if (test_bit(MT_WCID_FLAG_4ADDR, &amp;msta-&gt;wcid.flags)) {</div><div class='del'>-		htr-&gt;to_ds = true;</div><div class='del'>-		htr-&gt;from_ds = true;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7915_mcu_sta_update_hdr_trans(struct mt7915_dev *dev,</div><div class='del'>-				    struct ieee80211_vif *vif,</div><div class='del'>-				    struct ieee80211_sta *sta)</div><div class='add'>+static int</div><div class='add'>+mt7915_mcu_sta_wtbl_tlv(struct mt7915_dev *dev, struct sk_buff *skb,</div><div class='add'>+			struct ieee80211_vif *vif, struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7915_sta *msta;</div><div class='ctx'> 	struct wtbl_req_hdr *wtbl_hdr;</div><div class='del'>-	struct sk_buff *skb;</div><div class='add'>+	struct mt76_wcid *wcid;</div><div class='add'>+	struct tlv *tlv;</div><div class='ctx'> </div><div class='del'>-	skb = mt76_mcu_msg_alloc(&amp;dev-&gt;mt76, NULL, MT7915_WTBL_UPDATE_MAX_SIZE);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	msta = sta ? (struct mt7915_sta *)sta-&gt;drv_priv : &amp;mvif-&gt;sta;</div><div class='add'>+	wcid = sta ? &amp;msta-&gt;wcid : NULL;</div><div class='ctx'> </div><div class='del'>-	wtbl_hdr = mt7915_mcu_alloc_wtbl_req(dev, msta, WTBL_SET, NULL, &amp;skb);</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_WTBL, sizeof(struct tlv));</div><div class='add'>+	wtbl_hdr = mt76_connac_mcu_alloc_wtbl_req(&amp;dev-&gt;mt76, &amp;msta-&gt;wcid,</div><div class='add'>+						  WTBL_RESET_AND_SET, tlv,</div><div class='add'>+						  &amp;skb);</div><div class='ctx'> 	if (IS_ERR(wtbl_hdr))</div><div class='ctx'> 		return PTR_ERR(wtbl_hdr);</div><div class='ctx'> </div><div class='del'>-	mt7915_mcu_wtbl_hdr_trans_tlv(skb, vif, sta, NULL, wtbl_hdr);</div><div class='add'>+	mt76_connac_mcu_wtbl_generic_tlv(&amp;dev-&gt;mt76, skb, vif, sta, tlv,</div><div class='add'>+					 wtbl_hdr);</div><div class='add'>+	mt76_connac_mcu_wtbl_hdr_trans_tlv(skb, vif, wcid, tlv, wtbl_hdr);</div><div class='add'>+	if (sta)</div><div class='add'>+		mt76_connac_mcu_wtbl_ht_tlv(&amp;dev-&gt;mt76, skb, sta, tlv,</div><div class='add'>+					    wtbl_hdr, mvif-&gt;cap.ht_ldpc,</div><div class='add'>+					    mvif-&gt;cap.vht_ldpc);</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb, MCU_EXT_CMD(WTBL_UPDATE),</div><div class='del'>-				     true);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7915_mcu_add_smps(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-			struct ieee80211_sta *sta)</div><div class='add'>+static inline bool</div><div class='add'>+mt7915_is_ebf_supported(struct mt7915_phy *phy, struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_sta *sta, bool bfee)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='del'>-	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='del'>-	struct wtbl_req_hdr *wtbl_hdr;</div><div class='del'>-	struct tlv *sta_wtbl;</div><div class='del'>-	struct sk_buff *skb;</div><div class='add'>+	int sts = hweight16(phy-&gt;mt76-&gt;chainmask);</div><div class='ctx'> </div><div class='del'>-	skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta,</div><div class='del'>-				       MT7915_STA_UPDATE_MAX_SIZE);</div><div class='del'>-	if (IS_ERR(skb))</div><div class='del'>-		return PTR_ERR(skb);</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+	    vif-&gt;type != NL80211_IFTYPE_AP)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	sta_wtbl = mt7915_mcu_add_tlv(skb, STA_REC_WTBL, sizeof(struct tlv));</div><div class='add'>+	if (!bfee &amp;&amp; sts &lt; 2)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	wtbl_hdr = mt7915_mcu_alloc_wtbl_req(dev, msta, WTBL_SET, sta_wtbl,</div><div class='del'>-					     &amp;skb);</div><div class='del'>-	if (IS_ERR(wtbl_hdr))</div><div class='del'>-		return PTR_ERR(wtbl_hdr);</div><div class='add'>+	if (sta-&gt;deflink.he_cap.has_he) {</div><div class='add'>+		struct ieee80211_he_cap_elem *pe = &amp;sta-&gt;deflink.he_cap.he_cap_elem;</div><div class='add'>+</div><div class='add'>+		if (bfee)</div><div class='add'>+			return mvif-&gt;cap.he_su_ebfee &amp;&amp;</div><div class='add'>+			       HE_PHY(CAP3_SU_BEAMFORMER, pe-&gt;phy_cap_info[3]);</div><div class='add'>+		else</div><div class='add'>+			return mvif-&gt;cap.he_su_ebfer &amp;&amp;</div><div class='add'>+			       HE_PHY(CAP4_SU_BEAMFORMEE, pe-&gt;phy_cap_info[4]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mt7915_mcu_wtbl_smps_tlv(skb, sta, sta_wtbl, wtbl_hdr);</div><div class='add'>+	if (sta-&gt;deflink.vht_cap.vht_supported) {</div><div class='add'>+		u32 cap = sta-&gt;deflink.vht_cap.cap;</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='del'>-				     MCU_EXT_CMD(STA_REC_UPDATE), true);</div><div class='add'>+		if (bfee)</div><div class='add'>+			return mvif-&gt;cap.vht_su_ebfee &amp;&amp;</div><div class='add'>+			       (cap &amp; IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE);</div><div class='add'>+		else</div><div class='add'>+			return mvif-&gt;cap.vht_su_ebfer &amp;&amp;</div><div class='add'>+			       (cap &amp; IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mt7915_mcu_sta_sounding_rate(struct sta_rec_bf *bf)</div><div class='ctx'> {</div><div class='del'>-	bf-&gt;bf_cap = MT_EBF;</div><div class='ctx'> 	bf-&gt;sounding_phy = MT_PHY_TYPE_OFDM;</div><div class='ctx'> 	bf-&gt;ndp_rate = 0;				/* mcs0 */</div><div class='ctx'> 	bf-&gt;ndpa_rate = MT7915_CFEND_RATE_DEFAULT;	/* ofdm 24m */</div><div class='hunk'>@@ -1780,13 +1118,12 @@ static void</div><div class='ctx'> mt7915_mcu_sta_bfer_ht(struct ieee80211_sta *sta, struct mt7915_phy *phy,</div><div class='ctx'> 		       struct sta_rec_bf *bf)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_mcs_info *mcs = &amp;sta-&gt;ht_cap.mcs;</div><div class='add'>+	struct ieee80211_mcs_info *mcs = &amp;sta-&gt;deflink.ht_cap.mcs;</div><div class='ctx'> 	u8 n = 0;</div><div class='ctx'> </div><div class='ctx'> 	bf-&gt;tx_mode = MT_PHY_TYPE_HT;</div><div class='del'>-	bf-&gt;bf_cap = MT_IBF;</div><div class='ctx'> </div><div class='del'>-	if (mcs-&gt;tx_params &amp; IEEE80211_HT_MCS_TX_RX_DIFF &amp;&amp;</div><div class='add'>+	if ((mcs-&gt;tx_params &amp; IEEE80211_HT_MCS_TX_RX_DIFF) &amp;&amp;</div><div class='ctx'> 	    (mcs-&gt;tx_params &amp; IEEE80211_HT_MCS_TX_DEFINED))</div><div class='ctx'> 		n = FIELD_GET(IEEE80211_HT_MCS_TX_MAX_STREAMS_MASK,</div><div class='ctx'> 			      mcs-&gt;tx_params);</div><div class='hunk'>@@ -1797,8 +1134,8 @@ mt7915_mcu_sta_bfer_ht(struct ieee80211_sta *sta, struct mt7915_phy *phy,</div><div class='ctx'> 	else if (mcs-&gt;rx_mask[1])</div><div class='ctx'> 		n = 1;</div><div class='ctx'> </div><div class='del'>-	bf-&gt;nr = hweight8(phy-&gt;mt76-&gt;chainmask) - 1;</div><div class='del'>-	bf-&gt;nc = min_t(u8, bf-&gt;nr, n);</div><div class='add'>+	bf-&gt;nrow = hweight8(phy-&gt;mt76-&gt;chainmask) - 1;</div><div class='add'>+	bf-&gt;ncol = min_t(u8, bf-&gt;nrow, n);</div><div class='ctx'> 	bf-&gt;ibf_ncol = n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1806,7 +1143,7 @@ static void</div><div class='ctx'> mt7915_mcu_sta_bfer_vht(struct ieee80211_sta *sta, struct mt7915_phy *phy,</div><div class='ctx'> 			struct sta_rec_bf *bf, bool explicit)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sta_vht_cap *pc = &amp;sta-&gt;vht_cap;</div><div class='add'>+	struct ieee80211_sta_vht_cap *pc = &amp;sta-&gt;deflink.vht_cap;</div><div class='ctx'> 	struct ieee80211_sta_vht_cap *vc = &amp;phy-&gt;mt76-&gt;sband_5g.sband.vht_cap;</div><div class='ctx'> 	u16 mcs_map = le16_to_cpu(pc-&gt;vht_mcs.rx_mcs_map);</div><div class='ctx'> 	u8 nss_mcs = mt7915_mcu_get_sta_nss(mcs_map);</div><div class='hunk'>@@ -1815,26 +1152,26 @@ mt7915_mcu_sta_bfer_vht(struct ieee80211_sta *sta, struct mt7915_phy *phy,</div><div class='ctx'> 	bf-&gt;tx_mode = MT_PHY_TYPE_VHT;</div><div class='ctx'> </div><div class='ctx'> 	if (explicit) {</div><div class='del'>-		u8 bfee_nr, bfer_nr;</div><div class='add'>+		u8 sts, snd_dim;</div><div class='ctx'> </div><div class='ctx'> 		mt7915_mcu_sta_sounding_rate(bf);</div><div class='del'>-		bfee_nr = FIELD_GET(IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK,</div><div class='del'>-				    pc-&gt;cap);</div><div class='del'>-		bfer_nr = FIELD_GET(IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK,</div><div class='add'>+</div><div class='add'>+		sts = FIELD_GET(IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK,</div><div class='add'>+				pc-&gt;cap);</div><div class='add'>+		snd_dim = FIELD_GET(IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK,</div><div class='ctx'> 				    vc-&gt;cap);</div><div class='del'>-		bf-&gt;nr = min_t(u8, min_t(u8, bfer_nr, bfee_nr), tx_ant);</div><div class='del'>-		bf-&gt;nc = min_t(u8, nss_mcs, bf-&gt;nr);</div><div class='del'>-		bf-&gt;ibf_ncol = bf-&gt;nc;</div><div class='add'>+		bf-&gt;nrow = min_t(u8, min_t(u8, snd_dim, sts), tx_ant);</div><div class='add'>+		bf-&gt;ncol = min_t(u8, nss_mcs, bf-&gt;nrow);</div><div class='add'>+		bf-&gt;ibf_ncol = bf-&gt;ncol;</div><div class='ctx'> </div><div class='del'>-		if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_160)</div><div class='del'>-			bf-&gt;nr = 1;</div><div class='add'>+		if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_160)</div><div class='add'>+			bf-&gt;nrow = 1;</div><div class='ctx'> 	} else {</div><div class='del'>-		bf-&gt;bf_cap = MT_IBF;</div><div class='del'>-		bf-&gt;nr = tx_ant;</div><div class='del'>-		bf-&gt;nc = min_t(u8, nss_mcs, bf-&gt;nr);</div><div class='add'>+		bf-&gt;nrow = tx_ant;</div><div class='add'>+		bf-&gt;ncol = min_t(u8, nss_mcs, bf-&gt;nrow);</div><div class='ctx'> 		bf-&gt;ibf_ncol = nss_mcs;</div><div class='ctx'> </div><div class='del'>-		if (sta-&gt;bandwidth == IEEE80211_STA_RX_BW_160)</div><div class='add'>+		if (sta-&gt;deflink.bandwidth == IEEE80211_STA_RX_BW_160)</div><div class='ctx'> 			bf-&gt;ibf_nrow = 1;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1843,29 +1180,32 @@ static void</div><div class='ctx'> mt7915_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif,</div><div class='ctx'> 		       struct mt7915_phy *phy, struct sta_rec_bf *bf)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_sta_he_cap *pc = &amp;sta-&gt;he_cap;</div><div class='add'>+	struct ieee80211_sta_he_cap *pc = &amp;sta-&gt;deflink.he_cap;</div><div class='ctx'> 	struct ieee80211_he_cap_elem *pe = &amp;pc-&gt;he_cap_elem;</div><div class='del'>-	const struct ieee80211_sta_he_cap *vc = mt7915_get_he_phy_cap(phy, vif);</div><div class='add'>+	const struct ieee80211_sta_he_cap *vc =</div><div class='add'>+		mt76_connac_get_he_phy_cap(phy-&gt;mt76, vif);</div><div class='ctx'> 	const struct ieee80211_he_cap_elem *ve = &amp;vc-&gt;he_cap_elem;</div><div class='ctx'> 	u16 mcs_map = le16_to_cpu(pc-&gt;he_mcs_nss_supp.rx_mcs_80);</div><div class='ctx'> 	u8 nss_mcs = mt7915_mcu_get_sta_nss(mcs_map);</div><div class='del'>-	u8 bfee_nr, bfer_nr;</div><div class='add'>+	u8 snd_dim, sts;</div><div class='ctx'> </div><div class='ctx'> 	bf-&gt;tx_mode = MT_PHY_TYPE_HE_SU;</div><div class='add'>+</div><div class='ctx'> 	mt7915_mcu_sta_sounding_rate(bf);</div><div class='add'>+</div><div class='ctx'> 	bf-&gt;trigger_su = HE_PHY(CAP6_TRIG_SU_BEAMFORMING_FB,</div><div class='ctx'> 				pe-&gt;phy_cap_info[6]);</div><div class='ctx'> 	bf-&gt;trigger_mu = HE_PHY(CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB,</div><div class='ctx'> 				pe-&gt;phy_cap_info[6]);</div><div class='del'>-	bfer_nr = HE_PHY(CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK,</div><div class='add'>+	snd_dim = HE_PHY(CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK,</div><div class='ctx'> 			 ve-&gt;phy_cap_info[5]);</div><div class='del'>-	bfee_nr = HE_PHY(CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_MASK,</div><div class='del'>-			 pe-&gt;phy_cap_info[4]);</div><div class='del'>-	bf-&gt;nr = min_t(u8, bfer_nr, bfee_nr);</div><div class='del'>-	bf-&gt;nc = min_t(u8, nss_mcs, bf-&gt;nr);</div><div class='del'>-	bf-&gt;ibf_ncol = bf-&gt;nc;</div><div class='add'>+	sts = HE_PHY(CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_MASK,</div><div class='add'>+		     pe-&gt;phy_cap_info[4]);</div><div class='add'>+	bf-&gt;nrow = min_t(u8, snd_dim, sts);</div><div class='add'>+	bf-&gt;ncol = min_t(u8, nss_mcs, bf-&gt;nrow);</div><div class='add'>+	bf-&gt;ibf_ncol = bf-&gt;ncol;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;bandwidth != IEEE80211_STA_RX_BW_160)</div><div class='add'>+	if (sta-&gt;deflink.bandwidth != IEEE80211_STA_RX_BW_160)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* go over for 160MHz and 80p80 */</div><div class='hunk'>@@ -1874,7 +1214,7 @@ mt7915_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif,</div><div class='ctx'> 		mcs_map = le16_to_cpu(pc-&gt;he_mcs_nss_supp.rx_mcs_160);</div><div class='ctx'> 		nss_mcs = mt7915_mcu_get_sta_nss(mcs_map);</div><div class='ctx'> </div><div class='del'>-		bf-&gt;nc_bw160 = nss_mcs;</div><div class='add'>+		bf-&gt;ncol_gt_bw80 = nss_mcs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pe-&gt;phy_cap_info[0] &amp;</div><div class='hunk'>@@ -1882,73 +1222,76 @@ mt7915_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif,</div><div class='ctx'> 		mcs_map = le16_to_cpu(pc-&gt;he_mcs_nss_supp.rx_mcs_80p80);</div><div class='ctx'> 		nss_mcs = mt7915_mcu_get_sta_nss(mcs_map);</div><div class='ctx'> </div><div class='del'>-		if (bf-&gt;nc_bw160)</div><div class='del'>-			bf-&gt;nc_bw160 = min_t(u8, bf-&gt;nc_bw160, nss_mcs);</div><div class='add'>+		if (bf-&gt;ncol_gt_bw80)</div><div class='add'>+			bf-&gt;ncol_gt_bw80 = min_t(u8, bf-&gt;ncol_gt_bw80, nss_mcs);</div><div class='ctx'> 		else</div><div class='del'>-			bf-&gt;nc_bw160 = nss_mcs;</div><div class='add'>+			bf-&gt;ncol_gt_bw80 = nss_mcs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bfer_nr = HE_PHY(CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_MASK,</div><div class='add'>+	snd_dim = HE_PHY(CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_MASK,</div><div class='ctx'> 			 ve-&gt;phy_cap_info[5]);</div><div class='del'>-	bfee_nr = HE_PHY(CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_MASK,</div><div class='del'>-			 pe-&gt;phy_cap_info[4]);</div><div class='add'>+	sts = HE_PHY(CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_MASK,</div><div class='add'>+		     pe-&gt;phy_cap_info[4]);</div><div class='ctx'> </div><div class='del'>-	bf-&gt;nr_bw160 = min_t(int, bfer_nr, bfee_nr);</div><div class='add'>+	bf-&gt;nrow_gt_bw80 = min_t(int, snd_dim, sts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7915_mcu_sta_bfer_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,</div><div class='del'>-			struct ieee80211_vif *vif, struct mt7915_phy *phy,</div><div class='del'>-			bool enable, bool explicit)</div><div class='add'>+mt7915_mcu_sta_bfer_tlv(struct mt7915_dev *dev, struct sk_buff *skb,</div><div class='add'>+			struct ieee80211_vif *vif, struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='add'>+	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7915_phy *phy = mvif-&gt;phy;</div><div class='ctx'> 	int tx_ant = hweight8(phy-&gt;mt76-&gt;chainmask) - 1;</div><div class='ctx'> 	struct sta_rec_bf *bf;</div><div class='ctx'> 	struct tlv *tlv;</div><div class='del'>-	const u8 matrix[4][4] = {</div><div class='add'>+	static const u8 matrix[4][4] = {</div><div class='ctx'> 		{0, 0, 0, 0},</div><div class='ctx'> 		{1, 1, 0, 0},	/* 2x1, 2x2, 2x3, 2x4 */</div><div class='ctx'> 		{2, 4, 4, 0},	/* 3x1, 3x2, 3x3, 3x4 */</div><div class='ctx'> 		{3, 5, 6, 0}	/* 4x1, 4x2, 4x3, 4x4 */</div><div class='ctx'> 	};</div><div class='add'>+	bool ebf;</div><div class='ctx'> </div><div class='del'>-#define MT_BFER_FREE		cpu_to_le16(GENMASK(15, 0))</div><div class='del'>-</div><div class='del'>-	tlv = mt7915_mcu_add_tlv(skb, STA_REC_BF, sizeof(*bf));</div><div class='del'>-	bf = (struct sta_rec_bf *)tlv;</div><div class='add'>+	if (!(sta-&gt;deflink.ht_cap.ht_supported || sta-&gt;deflink.he_cap.has_he))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (!enable) {</div><div class='del'>-		bf-&gt;pfmu = MT_BFER_FREE;</div><div class='add'>+	ebf = mt7915_is_ebf_supported(phy, vif, sta, false);</div><div class='add'>+	if (!ebf &amp;&amp; !dev-&gt;ibf)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_BF, sizeof(*bf));</div><div class='add'>+	bf = (struct sta_rec_bf *)tlv;</div><div class='ctx'> </div><div class='ctx'> 	/* he: eBF only, in accordance with spec</div><div class='ctx'> 	 * vht: support eBF and iBF</div><div class='ctx'> 	 * ht: iBF only, since mac80211 lacks of eBF support</div><div class='ctx'> 	 */</div><div class='del'>-	if (sta-&gt;he_cap.has_he &amp;&amp; explicit)</div><div class='add'>+	if (sta-&gt;deflink.he_cap.has_he &amp;&amp; ebf)</div><div class='ctx'> 		mt7915_mcu_sta_bfer_he(sta, vif, phy, bf);</div><div class='del'>-	else if (sta-&gt;vht_cap.vht_supported)</div><div class='del'>-		mt7915_mcu_sta_bfer_vht(sta, phy, bf, explicit);</div><div class='del'>-	else if (sta-&gt;ht_cap.ht_supported)</div><div class='add'>+	else if (sta-&gt;deflink.vht_cap.vht_supported)</div><div class='add'>+		mt7915_mcu_sta_bfer_vht(sta, phy, bf, ebf);</div><div class='add'>+	else if (sta-&gt;deflink.ht_cap.ht_supported)</div><div class='ctx'> 		mt7915_mcu_sta_bfer_ht(sta, phy, bf);</div><div class='ctx'> 	else</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	bf-&gt;bw = sta-&gt;bandwidth;</div><div class='del'>-	bf-&gt;ibf_dbw = sta-&gt;bandwidth;</div><div class='add'>+	bf-&gt;bf_cap = ebf ? ebf : dev-&gt;ibf &lt;&lt; 1;</div><div class='add'>+	bf-&gt;bw = sta-&gt;deflink.bandwidth;</div><div class='add'>+	bf-&gt;ibf_dbw = sta-&gt;deflink.bandwidth;</div><div class='ctx'> 	bf-&gt;ibf_nrow = tx_ant;</div><div class='ctx'> </div><div class='del'>-	if (!explicit &amp;&amp; sta-&gt;bandwidth &lt;= IEEE80211_STA_RX_BW_40 &amp;&amp; !bf-&gt;nc)</div><div class='add'>+	if (!ebf &amp;&amp; sta-&gt;deflink.bandwidth &lt;= IEEE80211_STA_RX_BW_40 &amp;&amp; !bf-&gt;ncol)</div><div class='ctx'> 		bf-&gt;ibf_timeout = 0x48;</div><div class='ctx'> 	else</div><div class='ctx'> 		bf-&gt;ibf_timeout = 0x18;</div><div class='ctx'> </div><div class='del'>-	if (explicit &amp;&amp; bf-&gt;nr != tx_ant)</div><div class='del'>-		bf-&gt;mem_20m = matrix[tx_ant][bf-&gt;nc];</div><div class='add'>+	if (ebf &amp;&amp; bf-&gt;nrow != tx_ant)</div><div class='add'>+		bf-&gt;mem_20m = matrix[tx_ant][bf-&gt;ncol];</div><div class='ctx'> 	else</div><div class='del'>-		bf-&gt;mem_20m = matrix[bf-&gt;nr][bf-&gt;nc];</div><div class='add'>+		bf-&gt;mem_20m = matrix[bf-&gt;nrow][bf-&gt;ncol];</div><div class='ctx'> </div><div class='del'>-	switch (sta-&gt;bandwidth) {</div><div class='add'>+	switch (sta-&gt;deflink.bandwidth) {</div><div class='ctx'> 	case IEEE80211_STA_RX_BW_160:</div><div class='ctx'> 	case IEEE80211_STA_RX_BW_80:</div><div class='ctx'> 		bf-&gt;mem_total = bf-&gt;mem_20m * 2;</div><div class='hunk'>@@ -1963,391 +1306,488 @@ mt7915_mcu_sta_bfer_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7915_mcu_sta_bfee_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,</div><div class='del'>-			struct mt7915_phy *phy)</div><div class='add'>+mt7915_mcu_sta_bfee_tlv(struct mt7915_dev *dev, struct sk_buff *skb,</div><div class='add'>+			struct ieee80211_vif *vif, struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='add'>+	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7915_phy *phy = mvif-&gt;phy;</div><div class='ctx'> 	int tx_ant = hweight8(phy-&gt;mt76-&gt;chainmask) - 1;</div><div class='ctx'> 	struct sta_rec_bfee *bfee;</div><div class='ctx'> 	struct tlv *tlv;</div><div class='del'>-	u8 nr = 0;</div><div class='add'>+	u8 nrow = 0;</div><div class='ctx'> </div><div class='del'>-	tlv = mt7915_mcu_add_tlv(skb, STA_REC_BFEE, sizeof(*bfee));</div><div class='add'>+	if (!(sta-&gt;deflink.vht_cap.vht_supported || sta-&gt;deflink.he_cap.has_he))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!mt7915_is_ebf_supported(phy, vif, sta, true))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_BFEE, sizeof(*bfee));</div><div class='ctx'> 	bfee = (struct sta_rec_bfee *)tlv;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;he_cap.has_he) {</div><div class='del'>-		struct ieee80211_he_cap_elem *pe = &amp;sta-&gt;he_cap.he_cap_elem;</div><div class='add'>+	if (sta-&gt;deflink.he_cap.has_he) {</div><div class='add'>+		struct ieee80211_he_cap_elem *pe = &amp;sta-&gt;deflink.he_cap.he_cap_elem;</div><div class='ctx'> </div><div class='del'>-		nr = HE_PHY(CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK,</div><div class='del'>-			    pe-&gt;phy_cap_info[5]);</div><div class='del'>-	} else if (sta-&gt;vht_cap.vht_supported) {</div><div class='del'>-		struct ieee80211_sta_vht_cap *pc = &amp;sta-&gt;vht_cap;</div><div class='add'>+		nrow = HE_PHY(CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK,</div><div class='add'>+			      pe-&gt;phy_cap_info[5]);</div><div class='add'>+	} else if (sta-&gt;deflink.vht_cap.vht_supported) {</div><div class='add'>+		struct ieee80211_sta_vht_cap *pc = &amp;sta-&gt;deflink.vht_cap;</div><div class='ctx'> </div><div class='del'>-		nr = FIELD_GET(IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK,</div><div class='del'>-			       pc-&gt;cap);</div><div class='add'>+		nrow = FIELD_GET(IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK,</div><div class='add'>+				 pc-&gt;cap);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* reply with identity matrix to avoid 2x2 BF negative gain */</div><div class='del'>-	bfee-&gt;fb_identity_matrix = !!(nr == 1 &amp;&amp; tx_ant == 2);</div><div class='add'>+	bfee-&gt;fb_identity_matrix = (nrow == 1 &amp;&amp; tx_ant == 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt7915_mcu_add_txbf(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-		    struct ieee80211_sta *sta, bool enable)</div><div class='add'>+static enum mcu_mmps_mode</div><div class='add'>+mt7915_mcu_get_mmps_mode(enum ieee80211_smps_mode smps)</div><div class='add'>+{</div><div class='add'>+	switch (smps) {</div><div class='add'>+	case IEEE80211_SMPS_OFF:</div><div class='add'>+		return MCU_MMPS_DISABLE;</div><div class='add'>+	case IEEE80211_SMPS_STATIC:</div><div class='add'>+		return MCU_MMPS_STATIC;</div><div class='add'>+	case IEEE80211_SMPS_DYNAMIC:</div><div class='add'>+		return MCU_MMPS_DYNAMIC;</div><div class='add'>+	default:</div><div class='add'>+		return MCU_MMPS_DISABLE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7915_mcu_set_fixed_rate_ctrl(struct mt7915_dev *dev,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_sta *sta,</div><div class='add'>+				   void *data, u32 field)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='del'>-	struct mt7915_phy *phy;</div><div class='add'>+	struct sta_phy *phy = data;</div><div class='add'>+	struct sta_rec_ra_fixed *ra;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	int r, len;</div><div class='del'>-	bool ebfee = 0, ebf = 0;</div><div class='add'>+	struct tlv *tlv;</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;type != NL80211_IFTYPE_STATION &amp;&amp;</div><div class='del'>-	    vif-&gt;type != NL80211_IFTYPE_AP)</div><div class='del'>-		return 0;</div><div class='add'>+	skb = mt76_connac_mcu_alloc_sta_req(&amp;dev-&gt;mt76, &amp;mvif-&gt;mt76,</div><div class='add'>+					    &amp;msta-&gt;wcid);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='ctx'> </div><div class='del'>-	phy = mvif-&gt;band_idx ? mt7915_ext_phy(dev) : &amp;dev-&gt;phy;</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_RA_UPDATE, sizeof(*ra));</div><div class='add'>+	ra = (struct sta_rec_ra_fixed *)tlv;</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;he_cap.has_he) {</div><div class='del'>-		struct ieee80211_he_cap_elem *pe;</div><div class='del'>-		const struct ieee80211_he_cap_elem *ve;</div><div class='del'>-		const struct ieee80211_sta_he_cap *vc;</div><div class='add'>+	switch (field) {</div><div class='add'>+	case RATE_PARAM_AUTO:</div><div class='add'>+		break;</div><div class='add'>+	case RATE_PARAM_FIXED:</div><div class='add'>+	case RATE_PARAM_FIXED_MCS:</div><div class='add'>+	case RATE_PARAM_FIXED_GI:</div><div class='add'>+	case RATE_PARAM_FIXED_HE_LTF:</div><div class='add'>+		if (phy)</div><div class='add'>+			ra-&gt;phy = *phy;</div><div class='add'>+		break;</div><div class='add'>+	case RATE_PARAM_MMPS_UPDATE:</div><div class='add'>+		ra-&gt;mmps_mode = mt7915_mcu_get_mmps_mode(sta-&gt;deflink.smps_mode);</div><div class='add'>+		break;</div><div class='add'>+	case RATE_PARAM_SPE_UPDATE:</div><div class='add'>+		ra-&gt;spe_idx = *(u8 *)data;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	ra-&gt;field = cpu_to_le32(field);</div><div class='ctx'> </div><div class='del'>-		pe = &amp;sta-&gt;he_cap.he_cap_elem;</div><div class='del'>-		vc = mt7915_get_he_phy_cap(phy, vif);</div><div class='del'>-		ve = &amp;vc-&gt;he_cap_elem;</div><div class='add'>+	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='add'>+				     MCU_EXT_CMD(STA_REC_UPDATE), true);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		ebfee = !!((HE_PHY(CAP3_SU_BEAMFORMER, pe-&gt;phy_cap_info[3]) ||</div><div class='del'>-			    HE_PHY(CAP4_MU_BEAMFORMER, pe-&gt;phy_cap_info[4])) &amp;&amp;</div><div class='del'>-			   HE_PHY(CAP4_SU_BEAMFORMEE, ve-&gt;phy_cap_info[4]));</div><div class='del'>-		ebf = !!((HE_PHY(CAP3_SU_BEAMFORMER, ve-&gt;phy_cap_info[3]) ||</div><div class='del'>-			  HE_PHY(CAP4_MU_BEAMFORMER, ve-&gt;phy_cap_info[4])) &amp;&amp;</div><div class='del'>-			 HE_PHY(CAP4_SU_BEAMFORMEE, pe-&gt;phy_cap_info[4]));</div><div class='del'>-	} else if (sta-&gt;vht_cap.vht_supported) {</div><div class='del'>-		struct ieee80211_sta_vht_cap *pc;</div><div class='del'>-		struct ieee80211_sta_vht_cap *vc;</div><div class='del'>-		u32 cr, ce;</div><div class='add'>+int mt7915_mcu_add_smps(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct wtbl_req_hdr *wtbl_hdr;</div><div class='add'>+	struct tlv *sta_wtbl;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-		pc = &amp;sta-&gt;vht_cap;</div><div class='del'>-		vc = &amp;phy-&gt;mt76-&gt;sband_5g.sband.vht_cap;</div><div class='del'>-		cr = IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE |</div><div class='del'>-		     IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE;</div><div class='del'>-		ce = IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE |</div><div class='del'>-		     IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE;</div><div class='add'>+	skb = mt76_connac_mcu_alloc_sta_req(&amp;dev-&gt;mt76, &amp;mvif-&gt;mt76,</div><div class='add'>+					    &amp;msta-&gt;wcid);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='ctx'> </div><div class='del'>-		ebfee = !!((pc-&gt;cap &amp; cr) &amp;&amp; (vc-&gt;cap &amp; ce));</div><div class='del'>-		ebf = !!((vc-&gt;cap &amp; cr) &amp;&amp; (pc-&gt;cap &amp; ce));</div><div class='del'>-	}</div><div class='add'>+	sta_wtbl = mt76_connac_mcu_add_tlv(skb, STA_REC_WTBL,</div><div class='add'>+					   sizeof(struct tlv));</div><div class='add'>+	wtbl_hdr = mt76_connac_mcu_alloc_wtbl_req(&amp;dev-&gt;mt76, &amp;msta-&gt;wcid,</div><div class='add'>+						  WTBL_SET, sta_wtbl, &amp;skb);</div><div class='add'>+	if (IS_ERR(wtbl_hdr))</div><div class='add'>+		return PTR_ERR(wtbl_hdr);</div><div class='ctx'> </div><div class='del'>-	/* must keep each tag independent */</div><div class='add'>+	mt76_connac_mcu_wtbl_smps_tlv(skb, sta, sta_wtbl, wtbl_hdr);</div><div class='ctx'> </div><div class='del'>-	/* starec bf */</div><div class='del'>-	if (ebf || dev-&gt;ibf) {</div><div class='del'>-		len = sizeof(struct sta_req_hdr) + sizeof(struct sta_rec_bf);</div><div class='add'>+	ret = mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='add'>+				    MCU_EXT_CMD(STA_REC_UPDATE), true);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return mt7915_mcu_set_fixed_rate_ctrl(dev, vif, sta, NULL,</div><div class='add'>+					      RATE_PARAM_MMPS_UPDATE);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta, len);</div><div class='del'>-		if (IS_ERR(skb))</div><div class='del'>-			return PTR_ERR(skb);</div><div class='add'>+static int</div><div class='add'>+mt7915_mcu_set_spe_idx(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+		       struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_phy *mphy = mvif-&gt;phy-&gt;mt76;</div><div class='add'>+	u8 spe_idx = mt76_connac_spe_idx(mphy-&gt;antenna_mask);</div><div class='ctx'> </div><div class='del'>-		mt7915_mcu_sta_bfer_tlv(skb, sta, vif, phy, enable, ebf);</div><div class='add'>+	return mt7915_mcu_set_fixed_rate_ctrl(dev, vif, sta, &amp;spe_idx,</div><div class='add'>+					      RATE_PARAM_SPE_UPDATE);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		r = mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='del'>-					  MCU_EXT_CMD(STA_REC_UPDATE), true);</div><div class='del'>-		if (r)</div><div class='del'>-			return r;</div><div class='add'>+static int</div><div class='add'>+mt7915_mcu_add_rate_ctrl_fixed(struct mt7915_dev *dev,</div><div class='add'>+			       struct ieee80211_vif *vif,</div><div class='add'>+			       struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct cfg80211_chan_def *chandef = &amp;mvif-&gt;phy-&gt;mt76-&gt;chandef;</div><div class='add'>+	struct cfg80211_bitrate_mask *mask = &amp;mvif-&gt;bitrate_mask;</div><div class='add'>+	enum nl80211_band band = chandef-&gt;chan-&gt;band;</div><div class='add'>+	struct sta_phy phy = {};</div><div class='add'>+	int ret, nrates = 0;</div><div class='add'>+</div><div class='add'>+#define __sta_phy_bitrate_mask_check(_mcs, _gi, _ht, _he)			\</div><div class='add'>+	do {									\</div><div class='add'>+		u8 i, gi = mask-&gt;control[band]._gi;				\</div><div class='add'>+		gi = (_he) ? gi : gi == NL80211_TXRATE_FORCE_SGI;		\</div><div class='add'>+		for (i = 0; i &lt;= sta-&gt;deflink.bandwidth; i++) {			\</div><div class='add'>+			phy.sgi |= gi &lt;&lt; (i &lt;&lt; (_he));				\</div><div class='add'>+			phy.he_ltf |= mask-&gt;control[band].he_ltf &lt;&lt; (i &lt;&lt; (_he));\</div><div class='add'>+		}								\</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(mask-&gt;control[band]._mcs); i++) {	\</div><div class='add'>+			if (!mask-&gt;control[band]._mcs[i])			\</div><div class='add'>+				continue;					\</div><div class='add'>+			nrates += hweight16(mask-&gt;control[band]._mcs[i]);	\</div><div class='add'>+			phy.mcs = ffs(mask-&gt;control[band]._mcs[i]) - 1;		\</div><div class='add'>+			if (_ht)						\</div><div class='add'>+				phy.mcs += 8 * i;				\</div><div class='add'>+		}								\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;deflink.he_cap.has_he) {</div><div class='add'>+		__sta_phy_bitrate_mask_check(he_mcs, he_gi, 0, 1);</div><div class='add'>+	} else if (sta-&gt;deflink.vht_cap.vht_supported) {</div><div class='add'>+		__sta_phy_bitrate_mask_check(vht_mcs, gi, 0, 0);</div><div class='add'>+	} else if (sta-&gt;deflink.ht_cap.ht_supported) {</div><div class='add'>+		__sta_phy_bitrate_mask_check(ht_mcs, gi, 1, 0);</div><div class='add'>+	} else {</div><div class='add'>+		nrates = hweight32(mask-&gt;control[band].legacy);</div><div class='add'>+		phy.mcs = ffs(mask-&gt;control[band].legacy) - 1;</div><div class='ctx'> 	}</div><div class='add'>+#undef __sta_phy_bitrate_mask_check</div><div class='ctx'> </div><div class='del'>-	/* starec bfee */</div><div class='del'>-	if (ebfee) {</div><div class='del'>-		len = sizeof(struct sta_req_hdr) + sizeof(struct sta_rec_bfee);</div><div class='add'>+	/* fall back to auto rate control */</div><div class='add'>+	if (mask-&gt;control[band].gi == NL80211_TXRATE_DEFAULT_GI &amp;&amp;</div><div class='add'>+	    mask-&gt;control[band].he_gi == GENMASK(7, 0) &amp;&amp;</div><div class='add'>+	    mask-&gt;control[band].he_ltf == GENMASK(7, 0) &amp;&amp;</div><div class='add'>+	    nrates != 1)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta, len);</div><div class='del'>-		if (IS_ERR(skb))</div><div class='del'>-			return PTR_ERR(skb);</div><div class='add'>+	/* fixed single rate */</div><div class='add'>+	if (nrates == 1) {</div><div class='add'>+		ret = mt7915_mcu_set_fixed_rate_ctrl(dev, vif, sta, &amp;phy,</div><div class='add'>+						     RATE_PARAM_FIXED_MCS);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		mt7915_mcu_sta_bfee_tlv(skb, sta, phy);</div><div class='add'>+	/* fixed GI */</div><div class='add'>+	if (mask-&gt;control[band].gi != NL80211_TXRATE_DEFAULT_GI ||</div><div class='add'>+	    mask-&gt;control[band].he_gi != GENMASK(7, 0)) {</div><div class='add'>+		struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='add'>+		u32 addr;</div><div class='add'>+</div><div class='add'>+		/* firmware updates only TXCMD but doesn't take WTBL into</div><div class='add'>+		 * account, so driver should update here to reflect the</div><div class='add'>+		 * actual txrate hardware sends out.</div><div class='add'>+		 */</div><div class='add'>+		addr = mt7915_mac_wtbl_lmac_addr(dev, msta-&gt;wcid.idx, 7);</div><div class='add'>+		if (sta-&gt;deflink.he_cap.has_he)</div><div class='add'>+			mt76_rmw_field(dev, addr, GENMASK(31, 24), phy.sgi);</div><div class='add'>+		else</div><div class='add'>+			mt76_rmw_field(dev, addr, GENMASK(15, 12), phy.sgi);</div><div class='ctx'> </div><div class='del'>-		r = mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='del'>-					  MCU_EXT_CMD(STA_REC_UPDATE), true);</div><div class='del'>-		if (r)</div><div class='del'>-			return r;</div><div class='add'>+		ret = mt7915_mcu_set_fixed_rate_ctrl(dev, vif, sta, &amp;phy,</div><div class='add'>+						     RATE_PARAM_FIXED_GI);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	/* fixed HE_LTF */</div><div class='add'>+	if (mask-&gt;control[band].he_ltf != GENMASK(7, 0)) {</div><div class='add'>+		ret = mt7915_mcu_set_fixed_rate_ctrl(dev, vif, sta, &amp;phy,</div><div class='add'>+						     RATE_PARAM_FIXED_HE_LTF);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mt7915_mcu_set_spe_idx(dev, vif, sta);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mt7915_mcu_sta_rate_ctrl_tlv(struct sk_buff *skb, struct mt7915_dev *dev,</div><div class='ctx'> 			     struct ieee80211_vif *vif, struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='del'>-	struct mt76_phy *mphy = &amp;dev-&gt;mphy;</div><div class='del'>-	enum nl80211_band band;</div><div class='add'>+	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_phy *mphy = mvif-&gt;phy-&gt;mt76;</div><div class='add'>+	struct cfg80211_chan_def *chandef = &amp;mphy-&gt;chandef;</div><div class='add'>+	struct cfg80211_bitrate_mask *mask = &amp;mvif-&gt;bitrate_mask;</div><div class='add'>+	enum nl80211_band band = chandef-&gt;chan-&gt;band;</div><div class='ctx'> 	struct sta_rec_ra *ra;</div><div class='ctx'> 	struct tlv *tlv;</div><div class='del'>-	u32 supp_rate, n_rates, cap = sta-&gt;wme ? STA_CAP_WMM : 0;</div><div class='del'>-	u8 i, nss = sta-&gt;rx_nss, mcs = 0;</div><div class='add'>+	u32 supp_rate = sta-&gt;deflink.supp_rates[band];</div><div class='add'>+	u32 cap = sta-&gt;wme ? STA_CAP_WMM : 0;</div><div class='ctx'> </div><div class='del'>-	tlv = mt7915_mcu_add_tlv(skb, STA_REC_RA, sizeof(*ra));</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_RA, sizeof(*ra));</div><div class='ctx'> 	ra = (struct sta_rec_ra *)tlv;</div><div class='ctx'> </div><div class='del'>-	if (msta-&gt;wcid.ext_phy &amp;&amp; dev-&gt;mt76.phy2)</div><div class='del'>-		mphy = dev-&gt;mt76.phy2;</div><div class='del'>-</div><div class='del'>-	band = mphy-&gt;chandef.chan-&gt;band;</div><div class='del'>-	supp_rate = sta-&gt;supp_rates[band];</div><div class='del'>-	n_rates = hweight32(supp_rate);</div><div class='del'>-</div><div class='ctx'> 	ra-&gt;valid = true;</div><div class='ctx'> 	ra-&gt;auto_rate = true;</div><div class='del'>-	ra-&gt;phy_mode = mt7915_get_phy_mode(mphy, vif, sta);</div><div class='del'>-	ra-&gt;channel = mphy-&gt;chandef.chan-&gt;hw_value;</div><div class='del'>-	ra-&gt;bw = sta-&gt;bandwidth;</div><div class='del'>-	ra-&gt;rate_len = n_rates;</div><div class='del'>-	ra-&gt;phy.bw = sta-&gt;bandwidth;</div><div class='add'>+	ra-&gt;phy_mode = mt76_connac_get_phy_mode(mphy, vif, band, &amp;sta-&gt;deflink);</div><div class='add'>+	ra-&gt;channel = chandef-&gt;chan-&gt;hw_value;</div><div class='add'>+	ra-&gt;bw = sta-&gt;deflink.bandwidth;</div><div class='add'>+	ra-&gt;phy.bw = sta-&gt;deflink.bandwidth;</div><div class='add'>+	ra-&gt;mmps_mode = mt7915_mcu_get_mmps_mode(sta-&gt;deflink.smps_mode);</div><div class='add'>+</div><div class='add'>+	if (supp_rate) {</div><div class='add'>+		supp_rate &amp;= mask-&gt;control[band].legacy;</div><div class='add'>+		ra-&gt;rate_len = hweight32(supp_rate);</div><div class='ctx'> </div><div class='del'>-	if (n_rates) {</div><div class='ctx'> 		if (band == NL80211_BAND_2GHZ) {</div><div class='ctx'> 			ra-&gt;supp_mode = MODE_CCK;</div><div class='ctx'> 			ra-&gt;supp_cck_rate = supp_rate &amp; GENMASK(3, 0);</div><div class='del'>-			ra-&gt;phy.type = MT_PHY_TYPE_CCK;</div><div class='ctx'> </div><div class='del'>-			if (n_rates &gt; 4) {</div><div class='add'>+			if (ra-&gt;rate_len &gt; 4) {</div><div class='ctx'> 				ra-&gt;supp_mode |= MODE_OFDM;</div><div class='ctx'> 				ra-&gt;supp_ofdm_rate = supp_rate &gt;&gt; 4;</div><div class='del'>-				ra-&gt;phy.type = MT_PHY_TYPE_OFDM;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ra-&gt;supp_mode = MODE_OFDM;</div><div class='ctx'> 			ra-&gt;supp_ofdm_rate = supp_rate;</div><div class='del'>-			ra-&gt;phy.type = MT_PHY_TYPE_OFDM;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;ht_cap.ht_supported) {</div><div class='del'>-		for (i = 0; i &lt; nss; i++)</div><div class='del'>-			ra-&gt;ht_mcs[i] = sta-&gt;ht_cap.mcs.rx_mask[i];</div><div class='del'>-</div><div class='del'>-		ra-&gt;supp_ht_mcs = *(__le32 *)ra-&gt;ht_mcs;</div><div class='add'>+	if (sta-&gt;deflink.ht_cap.ht_supported) {</div><div class='ctx'> 		ra-&gt;supp_mode |= MODE_HT;</div><div class='del'>-		mcs = hweight32(le32_to_cpu(ra-&gt;supp_ht_mcs)) - 1;</div><div class='del'>-		ra-&gt;af = sta-&gt;ht_cap.ampdu_factor;</div><div class='del'>-		ra-&gt;ht_gf = !!(sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_GRN_FLD);</div><div class='add'>+		ra-&gt;af = sta-&gt;deflink.ht_cap.ampdu_factor;</div><div class='add'>+		ra-&gt;ht_gf = !!(sta-&gt;deflink.ht_cap.cap &amp; IEEE80211_HT_CAP_GRN_FLD);</div><div class='ctx'> </div><div class='ctx'> 		cap |= STA_CAP_HT;</div><div class='del'>-		if (sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_20)</div><div class='add'>+		if (sta-&gt;deflink.ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_20)</div><div class='ctx'> 			cap |= STA_CAP_SGI_20;</div><div class='del'>-		if (sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_40)</div><div class='add'>+		if (sta-&gt;deflink.ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_40)</div><div class='ctx'> 			cap |= STA_CAP_SGI_40;</div><div class='del'>-		if (sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_TX_STBC)</div><div class='add'>+		if (sta-&gt;deflink.ht_cap.cap &amp; IEEE80211_HT_CAP_TX_STBC)</div><div class='ctx'> 			cap |= STA_CAP_TX_STBC;</div><div class='del'>-		if (sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_RX_STBC)</div><div class='add'>+		if (sta-&gt;deflink.ht_cap.cap &amp; IEEE80211_HT_CAP_RX_STBC)</div><div class='ctx'> 			cap |= STA_CAP_RX_STBC;</div><div class='del'>-		if (sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_LDPC_CODING)</div><div class='add'>+		if (mvif-&gt;cap.ht_ldpc &amp;&amp;</div><div class='add'>+		    (sta-&gt;deflink.ht_cap.cap &amp; IEEE80211_HT_CAP_LDPC_CODING))</div><div class='ctx'> 			cap |= STA_CAP_LDPC;</div><div class='add'>+</div><div class='add'>+		mt7915_mcu_set_sta_ht_mcs(sta, ra-&gt;ht_mcs,</div><div class='add'>+					  mask-&gt;control[band].ht_mcs);</div><div class='add'>+		ra-&gt;supp_ht_mcs = *(__le32 *)ra-&gt;ht_mcs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;vht_cap.vht_supported) {</div><div class='del'>-		u16 mcs_map = le16_to_cpu(sta-&gt;vht_cap.vht_mcs.rx_mcs_map);</div><div class='del'>-		u16 vht_mcs;</div><div class='del'>-		u8 af, mcs_prev;</div><div class='add'>+	if (sta-&gt;deflink.vht_cap.vht_supported) {</div><div class='add'>+		u8 af;</div><div class='ctx'> </div><div class='add'>+		ra-&gt;supp_mode |= MODE_VHT;</div><div class='ctx'> 		af = FIELD_GET(IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK,</div><div class='del'>-			       sta-&gt;vht_cap.cap);</div><div class='add'>+			       sta-&gt;deflink.vht_cap.cap);</div><div class='ctx'> 		ra-&gt;af = max_t(u8, ra-&gt;af, af);</div><div class='ctx'> </div><div class='ctx'> 		cap |= STA_CAP_VHT;</div><div class='del'>-		if (sta-&gt;vht_cap.cap &amp; IEEE80211_VHT_CAP_SHORT_GI_80)</div><div class='add'>+		if (sta-&gt;deflink.vht_cap.cap &amp; IEEE80211_VHT_CAP_SHORT_GI_80)</div><div class='ctx'> 			cap |= STA_CAP_VHT_SGI_80;</div><div class='del'>-		if (sta-&gt;vht_cap.cap &amp; IEEE80211_VHT_CAP_SHORT_GI_160)</div><div class='add'>+		if (sta-&gt;deflink.vht_cap.cap &amp; IEEE80211_VHT_CAP_SHORT_GI_160)</div><div class='ctx'> 			cap |= STA_CAP_VHT_SGI_160;</div><div class='del'>-		if (sta-&gt;vht_cap.cap &amp; IEEE80211_VHT_CAP_TXSTBC)</div><div class='add'>+		if (sta-&gt;deflink.vht_cap.cap &amp; IEEE80211_VHT_CAP_TXSTBC)</div><div class='ctx'> 			cap |= STA_CAP_VHT_TX_STBC;</div><div class='del'>-		if (sta-&gt;vht_cap.cap &amp; IEEE80211_VHT_CAP_RXSTBC_1)</div><div class='add'>+		if (sta-&gt;deflink.vht_cap.cap &amp; IEEE80211_VHT_CAP_RXSTBC_1)</div><div class='ctx'> 			cap |= STA_CAP_VHT_RX_STBC;</div><div class='del'>-		if (sta-&gt;vht_cap.cap &amp; IEEE80211_VHT_CAP_RXLDPC)</div><div class='add'>+		if (mvif-&gt;cap.vht_ldpc &amp;&amp;</div><div class='add'>+		    (sta-&gt;deflink.vht_cap.cap &amp; IEEE80211_VHT_CAP_RXLDPC))</div><div class='ctx'> 			cap |= STA_CAP_VHT_LDPC;</div><div class='ctx'> </div><div class='del'>-		ra-&gt;supp_mode |= MODE_VHT;</div><div class='del'>-		for (mcs = 0, i = 0; i &lt; nss; i++, mcs_map &gt;&gt;= 2) {</div><div class='del'>-			switch (mcs_map &amp; 0x3) {</div><div class='del'>-			case IEEE80211_VHT_MCS_SUPPORT_0_9:</div><div class='del'>-				vht_mcs = GENMASK(9, 0);</div><div class='del'>-				break;</div><div class='del'>-			case IEEE80211_VHT_MCS_SUPPORT_0_8:</div><div class='del'>-				vht_mcs = GENMASK(8, 0);</div><div class='del'>-				break;</div><div class='del'>-			case IEEE80211_VHT_MCS_SUPPORT_0_7:</div><div class='del'>-				vht_mcs = GENMASK(7, 0);</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				vht_mcs = 0;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			ra-&gt;supp_vht_mcs[i] = cpu_to_le16(vht_mcs);</div><div class='del'>-</div><div class='del'>-			mcs_prev = hweight16(vht_mcs) - 1;</div><div class='del'>-			if (mcs_prev &gt; mcs)</div><div class='del'>-				mcs = mcs_prev;</div><div class='del'>-</div><div class='del'>-			/* only support 2ss on 160MHz */</div><div class='del'>-			if (i &gt; 1 &amp;&amp; (ra-&gt;bw == CMD_CBW_160MHZ ||</div><div class='del'>-				      ra-&gt;bw == CMD_CBW_8080MHZ))</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='add'>+		mt7915_mcu_set_sta_vht_mcs(sta, ra-&gt;supp_vht_mcs,</div><div class='add'>+					   mask-&gt;control[band].vht_mcs);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sta-&gt;he_cap.has_he) {</div><div class='add'>+	if (sta-&gt;deflink.he_cap.has_he) {</div><div class='ctx'> 		ra-&gt;supp_mode |= MODE_HE;</div><div class='ctx'> 		cap |= STA_CAP_HE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ra-&gt;sta_status = cpu_to_le32(cap);</div><div class='ctx'> </div><div class='del'>-	switch (BIT(fls(ra-&gt;supp_mode) - 1)) {</div><div class='del'>-	case MODE_VHT:</div><div class='del'>-		ra-&gt;phy.type = MT_PHY_TYPE_VHT;</div><div class='del'>-		ra-&gt;phy.mcs = mcs;</div><div class='del'>-		ra-&gt;phy.nss = nss;</div><div class='del'>-		ra-&gt;phy.stbc = !!(sta-&gt;vht_cap.cap &amp; IEEE80211_VHT_CAP_TXSTBC);</div><div class='del'>-		ra-&gt;phy.ldpc = !!(sta-&gt;vht_cap.cap &amp; IEEE80211_VHT_CAP_RXLDPC);</div><div class='del'>-		ra-&gt;phy.sgi =</div><div class='del'>-			!!(sta-&gt;vht_cap.cap &amp; IEEE80211_VHT_CAP_SHORT_GI_80);</div><div class='del'>-		break;</div><div class='del'>-	case MODE_HT:</div><div class='del'>-		ra-&gt;phy.type = MT_PHY_TYPE_HT;</div><div class='del'>-		ra-&gt;phy.mcs = mcs;</div><div class='del'>-		ra-&gt;phy.ldpc = sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_LDPC_CODING;</div><div class='del'>-		ra-&gt;phy.stbc = !!(sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_TX_STBC);</div><div class='del'>-		ra-&gt;phy.sgi = !!(sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SGI_20);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='add'>+		if (sta-&gt;deflink.he_6ghz_capa.capa)</div><div class='add'>+			ra-&gt;af = le16_get_bits(sta-&gt;deflink.he_6ghz_capa.capa,</div><div class='add'>+					       IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	ra-&gt;sta_cap = cpu_to_le32(cap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mt7915_mcu_add_rate_ctrl(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-			     struct ieee80211_sta *sta)</div><div class='add'>+			     struct ieee80211_sta *sta, bool changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	int len = sizeof(struct sta_req_hdr) + sizeof(struct sta_rec_ra);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta, len);</div><div class='add'>+	skb = mt76_connac_mcu_alloc_sta_req(&amp;dev-&gt;mt76, &amp;mvif-&gt;mt76,</div><div class='add'>+					    &amp;msta-&gt;wcid);</div><div class='ctx'> 	if (IS_ERR(skb))</div><div class='ctx'> 		return PTR_ERR(skb);</div><div class='ctx'> </div><div class='del'>-	mt7915_mcu_sta_rate_ctrl_tlv(skb, dev, vif, sta);</div><div class='del'>-</div><div class='del'>-	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='del'>-				     MCU_EXT_CMD(STA_REC_UPDATE), true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mt7915_mcu_add_sta_adv(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-			   struct ieee80211_sta *sta, bool enable)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='add'>+	/* firmware rc algorithm refers to sta_rec_he for HE control.</div><div class='add'>+	 * once dev-&gt;rc_work changes the settings driver should also</div><div class='add'>+	 * update sta_rec_he here.</div><div class='add'>+	 */</div><div class='add'>+	if (changed)</div><div class='add'>+		mt7915_mcu_sta_he_tlv(skb, sta, vif);</div><div class='ctx'> </div><div class='del'>-	if (!sta)</div><div class='del'>-		return 0;</div><div class='add'>+	/* sta_rec_ra accommodates BW, NSS and only MCS range format</div><div class='add'>+	 * i.e 0-{7,8,9} for VHT.</div><div class='add'>+	 */</div><div class='add'>+	mt7915_mcu_sta_rate_ctrl_tlv(skb, dev, vif, sta);</div><div class='ctx'> </div><div class='del'>-	/* must keep the order */</div><div class='del'>-	ret = mt7915_mcu_add_txbf(dev, vif, sta, enable);</div><div class='add'>+	ret = mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='add'>+				    MCU_EXT_CMD(STA_REC_UPDATE), true);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = mt7915_mcu_add_mu(dev, vif, sta);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	/* sta_rec_ra_fixed accommodates single rate, (HE)GI and HE_LTE,</div><div class='add'>+	 * and updates as peer fixed rate parameters, which overrides</div><div class='add'>+	 * sta_rec_ra and firmware rate control algorithm.</div><div class='add'>+	 */</div><div class='add'>+	return mt7915_mcu_add_rate_ctrl_fixed(dev, vif, sta);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (enable)</div><div class='del'>-		return mt7915_mcu_add_rate_ctrl(dev, vif, sta);</div><div class='add'>+static int</div><div class='add'>+mt7915_mcu_add_group(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+		     struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+#define MT_STA_BSS_GROUP		1</div><div class='add'>+	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7915_sta *msta;</div><div class='add'>+	struct {</div><div class='add'>+		__le32 action;</div><div class='add'>+		u8 wlan_idx_lo;</div><div class='add'>+		u8 status;</div><div class='add'>+		u8 wlan_idx_hi;</div><div class='add'>+		u8 rsv0[5];</div><div class='add'>+		__le32 val;</div><div class='add'>+		u8 rsv1[8];</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.action = cpu_to_le32(MT_STA_BSS_GROUP),</div><div class='add'>+		.val = cpu_to_le32(mvif-&gt;mt76.idx % 16),</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	msta = sta ? (struct mt7915_sta *)sta-&gt;drv_priv : &amp;mvif-&gt;sta;</div><div class='add'>+	req.wlan_idx_lo = to_wcid_lo(msta-&gt;wcid.idx);</div><div class='add'>+	req.wlan_idx_hi = to_wcid_hi(msta-&gt;wcid.idx);</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(SET_DRR_CTRL), &amp;req,</div><div class='add'>+				 sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mt7915_mcu_add_sta(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-		       struct ieee80211_sta *sta, bool enable)</div><div class='add'>+		       struct ieee80211_sta *sta, int conn_state, bool newly)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='del'>-	struct wtbl_req_hdr *wtbl_hdr;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='ctx'> 	struct mt7915_sta *msta;</div><div class='del'>-	struct tlv *sta_wtbl;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	msta = sta ? (struct mt7915_sta *)sta-&gt;drv_priv : &amp;mvif-&gt;sta;</div><div class='add'>+	link_sta = sta ? &amp;sta-&gt;deflink : NULL;</div><div class='ctx'> </div><div class='del'>-	skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta,</div><div class='del'>-				       MT7915_STA_UPDATE_MAX_SIZE);</div><div class='add'>+	skb = mt76_connac_mcu_alloc_sta_req(&amp;dev-&gt;mt76, &amp;mvif-&gt;mt76,</div><div class='add'>+					    &amp;msta-&gt;wcid);</div><div class='ctx'> 	if (IS_ERR(skb))</div><div class='ctx'> 		return PTR_ERR(skb);</div><div class='ctx'> </div><div class='del'>-	mt7915_mcu_sta_basic_tlv(skb, vif, sta, enable);</div><div class='del'>-	if (enable &amp;&amp; sta)</div><div class='del'>-		mt7915_mcu_sta_tlv(dev, skb, sta, vif);</div><div class='add'>+	/* starec basic */</div><div class='add'>+	mt76_connac_mcu_sta_basic_tlv(&amp;dev-&gt;mt76, skb, &amp;vif-&gt;bss_conf, link_sta,</div><div class='add'>+				      conn_state, newly);</div><div class='add'>+	/* tag order is in accordance with firmware dependency. */</div><div class='add'>+	if (sta &amp;&amp; conn_state != CONN_STATE_DISCONNECT) {</div><div class='add'>+		/* starec bfer */</div><div class='add'>+		mt7915_mcu_sta_bfer_tlv(dev, skb, vif, sta);</div><div class='add'>+		/* starec ht */</div><div class='add'>+		mt7915_mcu_sta_ht_tlv(skb, sta);</div><div class='add'>+		/* starec vht */</div><div class='add'>+		mt7915_mcu_sta_vht_tlv(skb, sta);</div><div class='add'>+		/* starec uapsd */</div><div class='add'>+		mt76_connac_mcu_sta_uapsd(skb, vif, sta);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	sta_wtbl = mt7915_mcu_add_tlv(skb, STA_REC_WTBL, sizeof(struct tlv));</div><div class='add'>+	if (newly || conn_state != CONN_STATE_DISCONNECT) {</div><div class='add'>+		ret = mt7915_mcu_sta_wtbl_tlv(dev, skb, vif, sta);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_kfree_skb(skb);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	wtbl_hdr = mt7915_mcu_alloc_wtbl_req(dev, msta, WTBL_RESET_AND_SET,</div><div class='del'>-					     sta_wtbl, &amp;skb);</div><div class='del'>-	if (IS_ERR(wtbl_hdr))</div><div class='del'>-		return PTR_ERR(wtbl_hdr);</div><div class='add'>+	if (conn_state == CONN_STATE_DISCONNECT)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	if (enable) {</div><div class='del'>-		mt7915_mcu_wtbl_generic_tlv(skb, vif, sta, sta_wtbl, wtbl_hdr);</div><div class='del'>-		mt7915_mcu_wtbl_hdr_trans_tlv(skb, vif, sta, sta_wtbl, wtbl_hdr);</div><div class='del'>-		if (sta)</div><div class='del'>-			mt7915_mcu_wtbl_ht_tlv(skb, sta, sta_wtbl, wtbl_hdr);</div><div class='add'>+	if (sta) {</div><div class='add'>+		/* starec amsdu */</div><div class='add'>+		mt7915_mcu_sta_amsdu_tlv(dev, skb, vif, sta);</div><div class='add'>+		/* starec he */</div><div class='add'>+		mt7915_mcu_sta_he_tlv(skb, sta, vif);</div><div class='add'>+		/* starec muru */</div><div class='add'>+		mt7915_mcu_sta_muru_tlv(dev, skb, sta, vif);</div><div class='add'>+		/* starec bfee */</div><div class='add'>+		mt7915_mcu_sta_bfee_tlv(dev, skb, vif, sta);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt7915_mcu_add_group(dev, vif, sta);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='add'>+out:</div><div class='add'>+	ret = mt76_connac_mcu_sta_wed_update(&amp;dev-&gt;mt76, skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='ctx'> 				     MCU_EXT_CMD(STA_REC_UPDATE), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7915_mcu_set_fixed_rate(struct mt7915_dev *dev,</div><div class='del'>-			      struct ieee80211_sta *sta, u32 rate)</div><div class='add'>+int mt7915_mcu_wed_enable_rx_stats(struct mt7915_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='del'>-	struct mt7915_vif *mvif = msta-&gt;vif;</div><div class='del'>-	struct sta_rec_ra_fixed *ra;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct tlv *tlv;</div><div class='del'>-	int len = sizeof(struct sta_req_hdr) + sizeof(*ra);</div><div class='del'>-</div><div class='del'>-	skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta, len);</div><div class='del'>-	if (IS_ERR(skb))</div><div class='del'>-		return PTR_ERR(skb);</div><div class='del'>-</div><div class='del'>-	tlv = mt7915_mcu_add_tlv(skb, STA_REC_RA_UPDATE, sizeof(*ra));</div><div class='del'>-	ra = (struct sta_rec_ra_fixed *)tlv;</div><div class='del'>-</div><div class='del'>-	if (!rate) {</div><div class='del'>-		ra-&gt;field = cpu_to_le32(RATE_PARAM_AUTO);</div><div class='del'>-		goto out;</div><div class='del'>-	} else {</div><div class='del'>-		ra-&gt;field = cpu_to_le32(RATE_PARAM_FIXED);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ra-&gt;phy.type = FIELD_GET(RATE_CFG_PHY_TYPE, rate);</div><div class='del'>-	ra-&gt;phy.bw = FIELD_GET(RATE_CFG_BW, rate);</div><div class='del'>-	ra-&gt;phy.nss = FIELD_GET(RATE_CFG_NSS, rate);</div><div class='del'>-	ra-&gt;phy.mcs = FIELD_GET(RATE_CFG_MCS, rate);</div><div class='del'>-	ra-&gt;phy.stbc = FIELD_GET(RATE_CFG_STBC, rate);</div><div class='del'>-</div><div class='del'>-	if (ra-&gt;phy.bw)</div><div class='del'>-		ra-&gt;phy.ldpc = 7;</div><div class='del'>-	else</div><div class='del'>-		ra-&gt;phy.ldpc = FIELD_GET(RATE_CFG_LDPC, rate) * 7;</div><div class='del'>-</div><div class='del'>-	/* HT/VHT - SGI: 1, LGI: 0; HE - SGI: 0, MGI: 1, LGI: 2 */</div><div class='del'>-	if (ra-&gt;phy.type &gt; MT_PHY_TYPE_VHT)</div><div class='del'>-		ra-&gt;phy.sgi = ra-&gt;phy.mcs * 85;</div><div class='del'>-	else</div><div class='del'>-		ra-&gt;phy.sgi = ra-&gt;phy.mcs * 15;</div><div class='add'>+#ifdef CONFIG_NET_MEDIATEK_SOC_WED</div><div class='add'>+	struct mtk_wed_device *wed = &amp;dev-&gt;mt76.mmio.wed;</div><div class='add'>+	struct {</div><div class='add'>+		__le32 args[2];</div><div class='add'>+	} req = {</div><div class='add'>+		.args[0] = cpu_to_le32(1),</div><div class='add'>+		.args[1] = cpu_to_le32(6),</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='del'>-				     MCU_EXT_CMD(STA_REC_UPDATE), true);</div><div class='add'>+	return mtk_wed_device_update_msg(wed, MTK_WED_WO_CMD_RXCNT_CTRL,</div><div class='add'>+					 &amp;req, sizeof(req));</div><div class='add'>+#else</div><div class='add'>+	return 0;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mt7915_mcu_add_dev_info(struct mt7915_phy *phy,</div><div class='hunk'>@@ -2358,7 +1798,7 @@ int mt7915_mcu_add_dev_info(struct mt7915_phy *phy,</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct req_hdr {</div><div class='ctx'> 			u8 omac_idx;</div><div class='del'>-			u8 dbdc_idx;</div><div class='add'>+			u8 band_idx;</div><div class='ctx'> 			__le16 tlv_num;</div><div class='ctx'> 			u8 is_tlv_append;</div><div class='ctx'> 			u8 rsv[3];</div><div class='hunk'>@@ -2367,13 +1807,13 @@ int mt7915_mcu_add_dev_info(struct mt7915_phy *phy,</div><div class='ctx'> 			__le16 tag;</div><div class='ctx'> 			__le16 len;</div><div class='ctx'> 			u8 active;</div><div class='del'>-			u8 dbdc_idx;</div><div class='add'>+			u8 band_idx;</div><div class='ctx'> 			u8 omac_addr[ETH_ALEN];</div><div class='ctx'> 		} __packed tlv;</div><div class='ctx'> 	} data = {</div><div class='ctx'> 		.hdr = {</div><div class='del'>-			.omac_idx = mvif-&gt;omac_idx,</div><div class='del'>-			.dbdc_idx = mvif-&gt;band_idx,</div><div class='add'>+			.omac_idx = mvif-&gt;mt76.omac_idx,</div><div class='add'>+			.band_idx = mvif-&gt;mt76.band_idx,</div><div class='ctx'> 			.tlv_num = cpu_to_le16(1),</div><div class='ctx'> 			.is_tlv_append = 1,</div><div class='ctx'> 		},</div><div class='hunk'>@@ -2381,11 +1821,11 @@ int mt7915_mcu_add_dev_info(struct mt7915_phy *phy,</div><div class='ctx'> 			.tag = cpu_to_le16(DEV_INFO_ACTIVE),</div><div class='ctx'> 			.len = cpu_to_le16(sizeof(struct req_tlv)),</div><div class='ctx'> 			.active = enable,</div><div class='del'>-			.dbdc_idx = mvif-&gt;band_idx,</div><div class='add'>+			.band_idx = mvif-&gt;mt76.band_idx,</div><div class='ctx'> 		},</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (mvif-&gt;omac_idx &gt;= REPEATER_BSSID_START)</div><div class='add'>+	if (mvif-&gt;mt76.omac_idx &gt;= REPEATER_BSSID_START)</div><div class='ctx'> 		return mt7915_mcu_muar_config(phy, vif, false, enable);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(data.tlv.omac_addr, vif-&gt;addr, ETH_ALEN);</div><div class='hunk'>@@ -2394,25 +1834,83 @@ int mt7915_mcu_add_dev_info(struct mt7915_phy *phy,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7915_mcu_beacon_csa(struct sk_buff *rskb, struct sk_buff *skb,</div><div class='del'>-		      struct bss_info_bcn *bcn,</div><div class='del'>-		      struct ieee80211_mutable_offsets *offs)</div><div class='add'>+mt7915_mcu_beacon_cntdwn(struct ieee80211_vif *vif, struct sk_buff *rskb,</div><div class='add'>+			 struct sk_buff *skb, struct bss_info_bcn *bcn,</div><div class='add'>+			 struct ieee80211_mutable_offsets *offs)</div><div class='ctx'> {</div><div class='del'>-	if (offs-&gt;cntdwn_counter_offs[0]) {</div><div class='del'>-		struct tlv *tlv;</div><div class='del'>-		struct bss_info_bcn_csa *csa;</div><div class='add'>+	struct bss_info_bcn_cntdwn *info;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+	int sub_tag;</div><div class='add'>+</div><div class='add'>+	if (!offs-&gt;cntdwn_counter_offs[0])</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sub_tag = vif-&gt;bss_conf.csa_active ? BSS_INFO_BCN_CSA : BSS_INFO_BCN_BCC;</div><div class='add'>+	tlv = mt7915_mcu_add_nested_subtlv(rskb, sub_tag, sizeof(*info),</div><div class='add'>+					   &amp;bcn-&gt;sub_ntlv, &amp;bcn-&gt;len);</div><div class='add'>+	info = (struct bss_info_bcn_cntdwn *)tlv;</div><div class='add'>+	info-&gt;cnt = skb-&gt;data[offs-&gt;cntdwn_counter_offs[0]];</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		tlv = mt7915_mcu_add_nested_subtlv(rskb, BSS_INFO_BCN_CSA,</div><div class='del'>-						   sizeof(*csa), &amp;bcn-&gt;sub_ntlv,</div><div class='del'>-						   &amp;bcn-&gt;len);</div><div class='del'>-		csa = (struct bss_info_bcn_csa *)tlv;</div><div class='del'>-		csa-&gt;cnt = skb-&gt;data[offs-&gt;cntdwn_counter_offs[0]];</div><div class='add'>+static void</div><div class='add'>+mt7915_mcu_beacon_mbss(struct sk_buff *rskb, struct sk_buff *skb,</div><div class='add'>+		       struct ieee80211_vif *vif, struct bss_info_bcn *bcn,</div><div class='add'>+		       struct ieee80211_mutable_offsets *offs)</div><div class='add'>+{</div><div class='add'>+	struct bss_info_bcn_mbss *mbss;</div><div class='add'>+	const struct element *elem;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	if (!vif-&gt;bss_conf.bssid_indicator)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tlv = mt7915_mcu_add_nested_subtlv(rskb, BSS_INFO_BCN_MBSSID,</div><div class='add'>+					   sizeof(*mbss), &amp;bcn-&gt;sub_ntlv,</div><div class='add'>+					   &amp;bcn-&gt;len);</div><div class='add'>+</div><div class='add'>+	mbss = (struct bss_info_bcn_mbss *)tlv;</div><div class='add'>+	mbss-&gt;offset[0] = cpu_to_le16(offs-&gt;tim_offset);</div><div class='add'>+	mbss-&gt;bitmap = cpu_to_le32(1);</div><div class='add'>+</div><div class='add'>+	for_each_element_id(elem, WLAN_EID_MULTIPLE_BSSID,</div><div class='add'>+			    &amp;skb-&gt;data[offs-&gt;mbssid_off],</div><div class='add'>+			    skb-&gt;len - offs-&gt;mbssid_off) {</div><div class='add'>+		const struct element *sub_elem;</div><div class='add'>+</div><div class='add'>+		if (elem-&gt;datalen &lt; 2)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for_each_element(sub_elem, elem-&gt;data + 1, elem-&gt;datalen - 1) {</div><div class='add'>+			const struct ieee80211_bssid_index *idx;</div><div class='add'>+			const u8 *idx_ie;</div><div class='add'>+</div><div class='add'>+			if (sub_elem-&gt;id || sub_elem-&gt;datalen &lt; 4)</div><div class='add'>+				continue; /* not a valid BSS profile */</div><div class='add'>+</div><div class='add'>+			/* Find WLAN_EID_MULTI_BSSID_IDX</div><div class='add'>+			 * in the merged nontransmitted profile</div><div class='add'>+			 */</div><div class='add'>+			idx_ie = cfg80211_find_ie(WLAN_EID_MULTI_BSSID_IDX,</div><div class='add'>+						  sub_elem-&gt;data,</div><div class='add'>+						  sub_elem-&gt;datalen);</div><div class='add'>+			if (!idx_ie || idx_ie[1] &lt; sizeof(*idx))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			idx = (void *)(idx_ie + 2);</div><div class='add'>+			if (!idx-&gt;bssid_index || idx-&gt;bssid_index &gt; 31)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			mbss-&gt;offset[idx-&gt;bssid_index] =</div><div class='add'>+				cpu_to_le16(idx_ie - skb-&gt;data);</div><div class='add'>+			mbss-&gt;bitmap |= cpu_to_le32(BIT(idx-&gt;bssid_index));</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7915_mcu_beacon_cont(struct mt7915_dev *dev, struct sk_buff *rskb,</div><div class='del'>-		       struct sk_buff *skb, struct bss_info_bcn *bcn,</div><div class='add'>+mt7915_mcu_beacon_cont(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+		       struct sk_buff *rskb, struct sk_buff *skb,</div><div class='add'>+		       struct bss_info_bcn *bcn,</div><div class='ctx'> 		       struct ieee80211_mutable_offsets *offs)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_wcid *wcid = &amp;dev-&gt;mt76.global_wcid;</div><div class='hunk'>@@ -2421,6 +1919,7 @@ mt7915_mcu_beacon_cont(struct mt7915_dev *dev, struct sk_buff *rskb,</div><div class='ctx'> 	u8 *buf;</div><div class='ctx'> 	int len = sizeof(*cont) + MT_TXD_SIZE + skb-&gt;len;</div><div class='ctx'> </div><div class='add'>+	len = (len &amp; 0x3) ? ((len | 0x3) + 1) : len;</div><div class='ctx'> 	tlv = mt7915_mcu_add_nested_subtlv(rskb, BSS_INFO_BCN_CONTENT,</div><div class='ctx'> 					   len, &amp;bcn-&gt;sub_ntlv, &amp;bcn-&gt;len);</div><div class='ctx'> </div><div class='hunk'>@@ -2428,377 +1927,224 @@ mt7915_mcu_beacon_cont(struct mt7915_dev *dev, struct sk_buff *rskb,</div><div class='ctx'> 	cont-&gt;pkt_len = cpu_to_le16(MT_TXD_SIZE + skb-&gt;len);</div><div class='ctx'> 	cont-&gt;tim_ofs = cpu_to_le16(offs-&gt;tim_offset);</div><div class='ctx'> </div><div class='del'>-	if (offs-&gt;cntdwn_counter_offs[0])</div><div class='del'>-		cont-&gt;csa_ofs = cpu_to_le16(offs-&gt;cntdwn_counter_offs[0] - 4);</div><div class='add'>+	if (offs-&gt;cntdwn_counter_offs[0]) {</div><div class='add'>+		u16 offset = offs-&gt;cntdwn_counter_offs[0];</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;bss_conf.csa_active)</div><div class='add'>+			cont-&gt;csa_ofs = cpu_to_le16(offset - 4);</div><div class='add'>+		if (vif-&gt;bss_conf.color_change_active)</div><div class='add'>+			cont-&gt;bcc_ofs = cpu_to_le16(offset - 3);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	buf = (u8 *)tlv + sizeof(*cont);</div><div class='del'>-	mt7915_mac_write_txwi(dev, (__le32 *)buf, skb, wcid, NULL,</div><div class='del'>-			      true);</div><div class='add'>+	mt7915_mac_write_txwi(&amp;dev-&gt;mt76, (__le32 *)buf, skb, wcid, 0, NULL,</div><div class='add'>+			      0, BSS_CHANGED_BEACON);</div><div class='ctx'> 	memcpy(buf + MT_TXD_SIZE, skb-&gt;data, skb-&gt;len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7915_mcu_add_beacon(struct ieee80211_hw *hw,</div><div class='del'>-			  struct ieee80211_vif *vif, int en)</div><div class='add'>+int</div><div class='add'>+mt7915_mcu_add_inband_discov(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			     u32 changed)</div><div class='ctx'> {</div><div class='del'>-#define MAX_BEACON_SIZE 512</div><div class='del'>-	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='add'>+#define OFFLOAD_TX_MODE_SU	BIT(0)</div><div class='add'>+#define OFFLOAD_TX_MODE_MU	BIT(1)</div><div class='add'>+	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='ctx'> 	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='ctx'> 	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='del'>-	struct ieee80211_mutable_offsets offs;</div><div class='del'>-	struct ieee80211_tx_info *info;</div><div class='del'>-	struct sk_buff *skb, *rskb;</div><div class='del'>-	struct tlv *tlv;</div><div class='add'>+	struct cfg80211_chan_def *chandef = &amp;mvif-&gt;phy-&gt;mt76-&gt;chandef;</div><div class='add'>+	enum nl80211_band band = chandef-&gt;chan-&gt;band;</div><div class='add'>+	struct mt76_wcid *wcid = &amp;dev-&gt;mt76.global_wcid;</div><div class='ctx'> 	struct bss_info_bcn *bcn;</div><div class='del'>-	int len = MT7915_BEACON_UPDATE_SIZE + MAX_BEACON_SIZE;</div><div class='add'>+	struct bss_info_inband_discovery *discov;</div><div class='add'>+	struct ieee80211_tx_info *info;</div><div class='add'>+	struct sk_buff *rskb, *skb = NULL;</div><div class='add'>+	struct tlv *tlv, *sub_tlv;</div><div class='add'>+	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='add'>+	u8 *buf, interval;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;bss_conf.nontransmitted)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	rskb = mt7915_mcu_alloc_sta_req(dev, mvif, NULL, len);</div><div class='add'>+	rskb = __mt76_connac_mcu_alloc_sta_req(&amp;dev-&gt;mt76, &amp;mvif-&gt;mt76, NULL,</div><div class='add'>+					       MT7915_MAX_BSS_OFFLOAD_SIZE);</div><div class='ctx'> 	if (IS_ERR(rskb))</div><div class='ctx'> 		return PTR_ERR(rskb);</div><div class='ctx'> </div><div class='del'>-	tlv = mt7915_mcu_add_tlv(rskb, BSS_INFO_OFFLOAD, sizeof(*bcn));</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(rskb, BSS_INFO_OFFLOAD, sizeof(*bcn));</div><div class='ctx'> 	bcn = (struct bss_info_bcn *)tlv;</div><div class='del'>-	bcn-&gt;enable = en;</div><div class='del'>-</div><div class='del'>-	if (!en)</div><div class='del'>-		goto out;</div><div class='add'>+	bcn-&gt;enable = true;</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_FILS_DISCOVERY) {</div><div class='add'>+		interval = vif-&gt;bss_conf.fils_discovery.max_interval;</div><div class='add'>+		skb = ieee80211_get_fils_discovery_tmpl(hw, vif);</div><div class='add'>+	} else if (changed &amp; BSS_CHANGED_UNSOL_BCAST_PROBE_RESP &amp;&amp;</div><div class='add'>+		   vif-&gt;bss_conf.unsol_bcast_probe_resp_interval) {</div><div class='add'>+		interval = vif-&gt;bss_conf.unsol_bcast_probe_resp_interval;</div><div class='add'>+		skb = ieee80211_get_unsol_bcast_probe_resp_tmpl(hw, vif);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	skb = ieee80211_beacon_get_template(hw, vif, &amp;offs);</div><div class='del'>-	if (!skb)</div><div class='add'>+	if (!skb) {</div><div class='add'>+		dev_kfree_skb(rskb);</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;len &gt; MAX_BEACON_SIZE - MT_TXD_SIZE) {</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "Bcn size limit exceed\n");</div><div class='add'>+	info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	info-&gt;control.vif = vif;</div><div class='add'>+	info-&gt;band = band;</div><div class='add'>+	info-&gt;hw_queue |= FIELD_PREP(MT_TX_HW_QUEUE_PHY, ext_phy);</div><div class='add'>+</div><div class='add'>+	len = sizeof(*discov) + MT_TXD_SIZE + skb-&gt;len;</div><div class='add'>+	len = (len &amp; 0x3) ? ((len | 0x3) + 1) : len;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &gt; MT7915_MAX_BEACON_SIZE) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "inband discovery size limit exceed\n");</div><div class='add'>+		dev_kfree_skb(rskb);</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mvif-&gt;band_idx) {</div><div class='del'>-		info = IEEE80211_SKB_CB(skb);</div><div class='del'>-		info-&gt;hw_queue |= MT_TX_HW_QUEUE_EXT_PHY;</div><div class='del'>-	}</div><div class='add'>+	sub_tlv = mt7915_mcu_add_nested_subtlv(rskb, BSS_INFO_BCN_DISCOV,</div><div class='add'>+					       len, &amp;bcn-&gt;sub_ntlv, &amp;bcn-&gt;len);</div><div class='add'>+	discov = (struct bss_info_inband_discovery *)sub_tlv;</div><div class='add'>+	discov-&gt;tx_mode = OFFLOAD_TX_MODE_SU;</div><div class='add'>+	/* 0: UNSOL PROBE RESP, 1: FILS DISCOV */</div><div class='add'>+	discov-&gt;tx_type = !!(changed &amp; BSS_CHANGED_FILS_DISCOVERY);</div><div class='add'>+	discov-&gt;tx_interval = interval;</div><div class='add'>+	discov-&gt;prob_rsp_len = cpu_to_le16(MT_TXD_SIZE + skb-&gt;len);</div><div class='add'>+	discov-&gt;enable = !!interval;</div><div class='add'>+</div><div class='add'>+	buf = (u8 *)sub_tlv + sizeof(*discov);</div><div class='add'>+</div><div class='add'>+	mt7915_mac_write_txwi(&amp;dev-&gt;mt76, (__le32 *)buf, skb, wcid, 0, NULL,</div><div class='add'>+			      0, changed);</div><div class='add'>+	memcpy(buf + MT_TXD_SIZE, skb-&gt;data, skb-&gt;len);</div><div class='ctx'> </div><div class='del'>-	/* TODO: subtag - bss color count &amp; 11v MBSSID */</div><div class='del'>-	mt7915_mcu_beacon_csa(rskb, skb, bcn, &amp;offs);</div><div class='del'>-	mt7915_mcu_beacon_cont(dev, rskb, skb, bcn, &amp;offs);</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='ctx'> 	return mt76_mcu_skb_send_msg(&amp;phy-&gt;dev-&gt;mt76, rskb,</div><div class='ctx'> 				     MCU_EXT_CMD(BSS_INFO_UPDATE), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7915_mcu_start_firmware(struct mt7915_dev *dev, u32 addr,</div><div class='del'>-				     u32 option)</div><div class='del'>-{</div><div class='del'>-	struct {</div><div class='del'>-		__le32 option;</div><div class='del'>-		__le32 addr;</div><div class='del'>-	} req = {</div><div class='del'>-		.option = cpu_to_le32(option),</div><div class='del'>-		.addr = cpu_to_le32(addr),</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_CMD(FW_START_REQ), &amp;req,</div><div class='del'>-				 sizeof(req), true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mt7915_mcu_restart(struct mt76_dev *dev)</div><div class='add'>+int mt7915_mcu_add_beacon(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			  int en, u32 changed)</div><div class='ctx'> {</div><div class='del'>-	struct {</div><div class='del'>-		u8 power_mode;</div><div class='del'>-		u8 rsv[3];</div><div class='del'>-	} req = {</div><div class='del'>-		.power_mode = 1,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return mt76_mcu_send_msg(dev, MCU_CMD(NIC_POWER_CTRL), &amp;req,</div><div class='del'>-				 sizeof(req), false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mt7915_mcu_patch_sem_ctrl(struct mt7915_dev *dev, bool get)</div><div class='del'>-{</div><div class='del'>-	struct {</div><div class='del'>-		__le32 op;</div><div class='del'>-	} req = {</div><div class='del'>-		.op = cpu_to_le32(get ? PATCH_SEM_GET : PATCH_SEM_RELEASE),</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_CMD(PATCH_SEM_CONTROL), &amp;req,</div><div class='del'>-				 sizeof(req), true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mt7915_mcu_start_patch(struct mt7915_dev *dev)</div><div class='del'>-{</div><div class='del'>-	struct {</div><div class='del'>-		u8 check_crc;</div><div class='del'>-		u8 reserved[3];</div><div class='del'>-	} req = {</div><div class='del'>-		.check_crc = 0,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_CMD(PATCH_FINISH_REQ), &amp;req,</div><div class='del'>-				 sizeof(req), true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mt7915_driver_own(struct mt7915_dev *dev)</div><div class='del'>-{</div><div class='del'>-	mt76_wr(dev, MT_TOP_LPCR_HOST_BAND0, MT_TOP_LPCR_HOST_DRV_OWN);</div><div class='del'>-	if (!mt76_poll_msec(dev, MT_TOP_LPCR_HOST_BAND0,</div><div class='del'>-			    MT_TOP_LPCR_HOST_FW_OWN, 0, 500)) {</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "Timeout for driver own\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mt7915_mcu_init_download(struct mt7915_dev *dev, u32 addr,</div><div class='del'>-				    u32 len, u32 mode)</div><div class='del'>-{</div><div class='del'>-	struct {</div><div class='del'>-		__le32 addr;</div><div class='del'>-		__le32 len;</div><div class='del'>-		__le32 mode;</div><div class='del'>-	} req = {</div><div class='del'>-		.addr = cpu_to_le32(addr),</div><div class='del'>-		.len = cpu_to_le32(len),</div><div class='del'>-		.mode = cpu_to_le32(mode),</div><div class='del'>-	};</div><div class='del'>-	int attr;</div><div class='del'>-</div><div class='del'>-	if (req.addr == cpu_to_le32(MCU_PATCH_ADDRESS))</div><div class='del'>-		attr = MCU_CMD(PATCH_START_REQ);</div><div class='del'>-	else</div><div class='del'>-		attr = MCU_CMD(TARGET_ADDRESS_LEN_REQ);</div><div class='add'>+	struct mt7915_dev *dev = mt7915_hw_dev(hw);</div><div class='add'>+	struct mt7915_phy *phy = mt7915_hw_phy(hw);</div><div class='add'>+	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct ieee80211_mutable_offsets offs;</div><div class='add'>+	struct ieee80211_tx_info *info;</div><div class='add'>+	struct sk_buff *skb, *rskb;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+	struct bss_info_bcn *bcn;</div><div class='add'>+	int len = MT7915_MAX_BSS_OFFLOAD_SIZE;</div><div class='add'>+	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, attr, &amp;req, sizeof(req), true);</div><div class='del'>-}</div><div class='add'>+	if (vif-&gt;bss_conf.nontransmitted)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-static int mt7915_load_patch(struct mt7915_dev *dev)</div><div class='del'>-{</div><div class='del'>-	const struct mt7915_patch_hdr *hdr;</div><div class='del'>-	const struct firmware *fw = NULL;</div><div class='del'>-	int i, ret, sem;</div><div class='add'>+	rskb = __mt76_connac_mcu_alloc_sta_req(&amp;dev-&gt;mt76, &amp;mvif-&gt;mt76,</div><div class='add'>+					       NULL, len);</div><div class='add'>+	if (IS_ERR(rskb))</div><div class='add'>+		return PTR_ERR(rskb);</div><div class='ctx'> </div><div class='del'>-	sem = mt7915_mcu_patch_sem_ctrl(dev, 1);</div><div class='del'>-	switch (sem) {</div><div class='del'>-	case PATCH_IS_DL:</div><div class='del'>-		return 0;</div><div class='del'>-	case PATCH_NOT_DL_SEM_SUCCESS:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "Failed to get patch semaphore\n");</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	}</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(rskb, BSS_INFO_OFFLOAD, sizeof(*bcn));</div><div class='add'>+	bcn = (struct bss_info_bcn *)tlv;</div><div class='add'>+	bcn-&gt;enable = en;</div><div class='ctx'> </div><div class='del'>-	ret = request_firmware(&amp;fw, MT7915_ROM_PATCH, dev-&gt;mt76.dev);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (!en)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (!fw || !fw-&gt;data || fw-&gt;size &lt; sizeof(*hdr)) {</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "Invalid firmware\n");</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='add'>+	skb = ieee80211_beacon_get_template(hw, vif, &amp;offs, 0);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		dev_kfree_skb(rskb);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hdr = (const struct mt7915_patch_hdr *)(fw-&gt;data);</div><div class='del'>-</div><div class='del'>-	dev_info(dev-&gt;mt76.dev, "HW/SW Version: 0x%x, Build Time: %.16s\n",</div><div class='del'>-		 be32_to_cpu(hdr-&gt;hw_sw_ver), hdr-&gt;build_date);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; be32_to_cpu(hdr-&gt;desc.n_region); i++) {</div><div class='del'>-		struct mt7915_patch_sec *sec;</div><div class='del'>-		const u8 *dl;</div><div class='del'>-		u32 len, addr;</div><div class='del'>-</div><div class='del'>-		sec = (struct mt7915_patch_sec *)(fw-&gt;data + sizeof(*hdr) +</div><div class='del'>-						  i * sizeof(*sec));</div><div class='del'>-		if ((be32_to_cpu(sec-&gt;type) &amp; PATCH_SEC_TYPE_MASK) !=</div><div class='del'>-		    PATCH_SEC_TYPE_INFO) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		addr = be32_to_cpu(sec-&gt;info.addr);</div><div class='del'>-		len = be32_to_cpu(sec-&gt;info.len);</div><div class='del'>-		dl = fw-&gt;data + be32_to_cpu(sec-&gt;offs);</div><div class='del'>-</div><div class='del'>-		ret = mt7915_mcu_init_download(dev, addr, len,</div><div class='del'>-					       DL_MODE_NEED_RSP);</div><div class='del'>-		if (ret) {</div><div class='del'>-			dev_err(dev-&gt;mt76.dev, "Download request failed\n");</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = mt76_mcu_send_firmware(&amp;dev-&gt;mt76, MCU_CMD(FW_SCATTER),</div><div class='del'>-					     dl, len);</div><div class='del'>-		if (ret) {</div><div class='del'>-			dev_err(dev-&gt;mt76.dev, "Failed to send patch\n");</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+	if (skb-&gt;len &gt; MT7915_MAX_BEACON_SIZE) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Bcn size limit exceed\n");</div><div class='add'>+		dev_kfree_skb(rskb);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = mt7915_mcu_start_patch(dev);</div><div class='del'>-	if (ret)</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "Failed to start patch\n");</div><div class='add'>+	info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	info-&gt;hw_queue = FIELD_PREP(MT_TX_HW_QUEUE_PHY, ext_phy);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	sem = mt7915_mcu_patch_sem_ctrl(dev, 0);</div><div class='del'>-	switch (sem) {</div><div class='del'>-	case PATCH_REL_SEM_SUCCESS:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EAGAIN;</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "Failed to release patch semaphore\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	release_firmware(fw);</div><div class='add'>+	mt7915_mcu_beacon_cntdwn(vif, rskb, skb, bcn, &amp;offs);</div><div class='add'>+	mt7915_mcu_beacon_mbss(rskb, skb, vif, bcn, &amp;offs);</div><div class='add'>+	mt7915_mcu_beacon_cont(dev, vif, rskb, skb, bcn, &amp;offs);</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+out:</div><div class='add'>+	return mt76_mcu_skb_send_msg(&amp;phy-&gt;dev-&gt;mt76, rskb,</div><div class='add'>+				     MCU_EXT_CMD(BSS_INFO_UPDATE), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 mt7915_mcu_gen_dl_mode(u8 feature_set, bool is_wa)</div><div class='add'>+static int mt7915_driver_own(struct mt7915_dev *dev, u8 band)</div><div class='ctx'> {</div><div class='del'>-	u32 ret = 0;</div><div class='add'>+	mt76_wr(dev, MT_TOP_LPCR_HOST_BAND(band), MT_TOP_LPCR_HOST_DRV_OWN);</div><div class='add'>+	if (!mt76_poll_msec(dev, MT_TOP_LPCR_HOST_BAND(band),</div><div class='add'>+			    MT_TOP_LPCR_HOST_FW_OWN_STAT, 0, 500)) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Timeout for driver own\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ret |= (feature_set &amp; FW_FEATURE_SET_ENCRYPT) ?</div><div class='del'>-	       (DL_MODE_ENCRYPT | DL_MODE_RESET_SEC_IV) : 0;</div><div class='del'>-	ret |= FIELD_PREP(DL_MODE_KEY_IDX,</div><div class='del'>-			  FIELD_GET(FW_FEATURE_SET_KEY_IDX, feature_set));</div><div class='del'>-	ret |= DL_MODE_NEED_RSP;</div><div class='del'>-	ret |= is_wa ? DL_MODE_WORKING_PDA_CR4 : 0;</div><div class='add'>+	/* clear irq when the driver own success */</div><div class='add'>+	mt76_wr(dev, MT_TOP_LPCR_HOST_BAND_IRQ_STAT(band),</div><div class='add'>+		MT_TOP_LPCR_HOST_BAND_STAT);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt7915_mcu_send_ram_firmware(struct mt7915_dev *dev,</div><div class='del'>-			     const struct mt7915_fw_trailer *hdr,</div><div class='del'>-			     const u8 *data, bool is_wa)</div><div class='del'>-{</div><div class='del'>-	int i, offset = 0;</div><div class='del'>-	u32 override = 0, option = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; hdr-&gt;n_region; i++) {</div><div class='del'>-		const struct mt7915_fw_region *region;</div><div class='del'>-		int err;</div><div class='del'>-		u32 len, addr, mode;</div><div class='del'>-</div><div class='del'>-		region = (const struct mt7915_fw_region *)((const u8 *)hdr -</div><div class='del'>-			 (hdr-&gt;n_region - i) * sizeof(*region));</div><div class='del'>-		mode = mt7915_mcu_gen_dl_mode(region-&gt;feature_set, is_wa);</div><div class='del'>-		len = le32_to_cpu(region-&gt;len);</div><div class='del'>-		addr = le32_to_cpu(region-&gt;addr);</div><div class='del'>-</div><div class='del'>-		if (region-&gt;feature_set &amp; FW_FEATURE_OVERRIDE_ADDR)</div><div class='del'>-			override = addr;</div><div class='del'>-</div><div class='del'>-		err = mt7915_mcu_init_download(dev, addr, len, mode);</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(dev-&gt;mt76.dev, "Download request failed\n");</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err = mt76_mcu_send_firmware(&amp;dev-&gt;mt76, MCU_CMD(FW_SCATTER),</div><div class='del'>-					     data + offset, len);</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(dev-&gt;mt76.dev, "Failed to send firmware.\n");</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='add'>+mt7915_firmware_state(struct mt7915_dev *dev, bool wa)</div><div class='add'>+{</div><div class='add'>+	u32 state = FIELD_PREP(MT_TOP_MISC_FW_STATE,</div><div class='add'>+			       wa ? FW_STATE_RDY : FW_STATE_FW_DOWNLOAD);</div><div class='ctx'> </div><div class='del'>-		offset += len;</div><div class='add'>+	if (!mt76_poll_msec(dev, MT_TOP_MISC, MT_TOP_MISC_FW_STATE,</div><div class='add'>+			    state, 1000)) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Timeout for initializing firmware\n");</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (override)</div><div class='del'>-		option |= FW_START_OVERRIDE;</div><div class='del'>-</div><div class='del'>-	if (is_wa)</div><div class='del'>-		option |= FW_START_WORKING_PDA_CR4;</div><div class='del'>-</div><div class='del'>-	return mt7915_mcu_start_firmware(dev, override, option);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7915_load_ram(struct mt7915_dev *dev)</div><div class='add'>+static int mt7915_load_firmware(struct mt7915_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	const struct mt7915_fw_trailer *hdr;</div><div class='del'>-	const struct firmware *fw;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = request_firmware(&amp;fw, MT7915_FIRMWARE_WM, dev-&gt;mt76.dev);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (!fw || !fw-&gt;data || fw-&gt;size &lt; sizeof(*hdr)) {</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "Invalid firmware\n");</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='add'>+	/* Release Semaphore if taken by previous failed attempt */</div><div class='add'>+	ret = mt76_connac_mcu_patch_sem_ctrl(&amp;dev-&gt;mt76, false);</div><div class='add'>+	if (ret != PATCH_REL_SEM_SUCCESS) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Could not release semaphore\n");</div><div class='add'>+		/* Continue anyways */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hdr = (const struct mt7915_fw_trailer *)(fw-&gt;data + fw-&gt;size -</div><div class='del'>-					sizeof(*hdr));</div><div class='add'>+	/* Always restart MCU firmware */</div><div class='add'>+	mt76_connac_mcu_restart(&amp;dev-&gt;mt76);</div><div class='ctx'> </div><div class='del'>-	dev_info(dev-&gt;mt76.dev, "WM Firmware Version: %.10s, Build Time: %.15s\n",</div><div class='del'>-		 hdr-&gt;fw_ver, hdr-&gt;build_date);</div><div class='del'>-</div><div class='del'>-	ret = mt7915_mcu_send_ram_firmware(dev, hdr, fw-&gt;data, false);</div><div class='add'>+	/* Check if MCU is ready */</div><div class='add'>+	ret = mt7915_firmware_state(dev, false);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "Failed to start WM firmware\n");</div><div class='del'>-		goto out;</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Firmware did not enter download state\n");</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	release_firmware(fw);</div><div class='del'>-</div><div class='del'>-	ret = request_firmware(&amp;fw, MT7915_FIRMWARE_WA, dev-&gt;mt76.dev);</div><div class='add'>+	ret = mt76_connac2_load_patch(&amp;dev-&gt;mt76, fw_name_var(dev, ROM_PATCH));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (!fw || !fw-&gt;data || fw-&gt;size &lt; sizeof(*hdr)) {</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "Invalid firmware\n");</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hdr = (const struct mt7915_fw_trailer *)(fw-&gt;data + fw-&gt;size -</div><div class='del'>-					sizeof(*hdr));</div><div class='del'>-</div><div class='del'>-	dev_info(dev-&gt;mt76.dev, "WA Firmware Version: %.10s, Build Time: %.15s\n",</div><div class='del'>-		 hdr-&gt;fw_ver, hdr-&gt;build_date);</div><div class='del'>-</div><div class='del'>-	ret = mt7915_mcu_send_ram_firmware(dev, hdr, fw-&gt;data, true);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "Failed to start WA firmware\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snprintf(dev-&gt;mt76.hw-&gt;wiphy-&gt;fw_version,</div><div class='del'>-		 sizeof(dev-&gt;mt76.hw-&gt;wiphy-&gt;fw_version),</div><div class='del'>-		 "%.10s-%.15s", hdr-&gt;fw_ver, hdr-&gt;build_date);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	release_firmware(fw);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mt7915_load_firmware(struct mt7915_dev *dev)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = mt7915_load_patch(dev);</div><div class='add'>+	ret = mt76_connac2_load_ram(&amp;dev-&gt;mt76, fw_name_var(dev, FIRMWARE_WM),</div><div class='add'>+				    fw_name(dev, FIRMWARE_WA));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = mt7915_load_ram(dev);</div><div class='add'>+	ret = mt7915_firmware_state(dev, true);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (!mt76_poll_msec(dev, MT_TOP_MISC, MT_TOP_MISC_FW_STATE,</div><div class='del'>-			    FIELD_PREP(MT_TOP_MISC_FW_STATE,</div><div class='del'>-				       FW_STATE_WACPU_RDY), 1000)) {</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "Timeout for initializing firmware\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	mt76_queue_tx_cleanup(dev, dev-&gt;mt76.q_mcu[MT_MCUQ_FWDL], false);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(dev-&gt;mt76.dev, "Firmware init done\n");</div><div class='hunk'>@@ -2806,7 +2152,7 @@ static int mt7915_load_firmware(struct mt7915_dev *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7915_mcu_fw_log_2_host(struct mt7915_dev *dev, u8 ctrl)</div><div class='add'>+int mt7915_mcu_fw_log_2_host(struct mt7915_dev *dev, u8 type, u8 ctrl)</div><div class='ctx'> {</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u8 ctrl_val;</div><div class='hunk'>@@ -2815,6 +2161,10 @@ int mt7915_mcu_fw_log_2_host(struct mt7915_dev *dev, u8 ctrl)</div><div class='ctx'> 		.ctrl_val = ctrl</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	if (type == MCU_FW_LOG_WA)</div><div class='add'>+		return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_WA_EXT_CMD(FW_LOG_2_HOST),</div><div class='add'>+					 &amp;data, sizeof(data), true);</div><div class='add'>+</div><div class='ctx'> 	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(FW_LOG_2_HOST), &amp;data,</div><div class='ctx'> 				 sizeof(data), true);</div><div class='ctx'> }</div><div class='hunk'>@@ -2837,6 +2187,82 @@ int mt7915_mcu_fw_dbg_ctrl(struct mt7915_dev *dev, u32 module, u8 level)</div><div class='ctx'> 				 sizeof(data), false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mt7915_mcu_muru_debug_set(struct mt7915_dev *dev, bool enabled)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		__le32 cmd;</div><div class='add'>+		u8 enable;</div><div class='add'>+	} data = {</div><div class='add'>+		.cmd = cpu_to_le32(MURU_SET_TXC_TX_STATS_EN),</div><div class='add'>+		.enable = enabled,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(MURU_CTRL), &amp;data,</div><div class='add'>+				sizeof(data), false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7915_mcu_muru_debug_get(struct mt7915_phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct mt7915_mcu_muru_stats *mu_stats;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		__le32 cmd;</div><div class='add'>+		u8 band_idx;</div><div class='add'>+	} req = {</div><div class='add'>+		.cmd = cpu_to_le32(MURU_GET_TXC_TX_STATS),</div><div class='add'>+		.band_idx = phy-&gt;mt76-&gt;band_idx,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(MURU_CTRL),</div><div class='add'>+					&amp;req, sizeof(req), true, &amp;skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mu_stats = (struct mt7915_mcu_muru_stats *)(skb-&gt;data);</div><div class='add'>+</div><div class='add'>+	/* accumulate stats, these are clear-on-read */</div><div class='add'>+#define __dl_u32(s)	 phy-&gt;mib.dl_##s += le32_to_cpu(mu_stats-&gt;dl.s)</div><div class='add'>+#define __ul_u32(s)	 phy-&gt;mib.ul_##s += le32_to_cpu(mu_stats-&gt;ul.s)</div><div class='add'>+	__dl_u32(cck_cnt);</div><div class='add'>+	__dl_u32(ofdm_cnt);</div><div class='add'>+	__dl_u32(htmix_cnt);</div><div class='add'>+	__dl_u32(htgf_cnt);</div><div class='add'>+	__dl_u32(vht_su_cnt);</div><div class='add'>+	__dl_u32(vht_2mu_cnt);</div><div class='add'>+	__dl_u32(vht_3mu_cnt);</div><div class='add'>+	__dl_u32(vht_4mu_cnt);</div><div class='add'>+	__dl_u32(he_su_cnt);</div><div class='add'>+	__dl_u32(he_2ru_cnt);</div><div class='add'>+	__dl_u32(he_2mu_cnt);</div><div class='add'>+	__dl_u32(he_3ru_cnt);</div><div class='add'>+	__dl_u32(he_3mu_cnt);</div><div class='add'>+	__dl_u32(he_4ru_cnt);</div><div class='add'>+	__dl_u32(he_4mu_cnt);</div><div class='add'>+	__dl_u32(he_5to8ru_cnt);</div><div class='add'>+	__dl_u32(he_9to16ru_cnt);</div><div class='add'>+	__dl_u32(he_gtr16ru_cnt);</div><div class='add'>+</div><div class='add'>+	__ul_u32(hetrig_su_cnt);</div><div class='add'>+	__ul_u32(hetrig_2ru_cnt);</div><div class='add'>+	__ul_u32(hetrig_3ru_cnt);</div><div class='add'>+	__ul_u32(hetrig_4ru_cnt);</div><div class='add'>+	__ul_u32(hetrig_5to8ru_cnt);</div><div class='add'>+	__ul_u32(hetrig_9to16ru_cnt);</div><div class='add'>+	__ul_u32(hetrig_gtr16ru_cnt);</div><div class='add'>+	__ul_u32(hetrig_2mu_cnt);</div><div class='add'>+	__ul_u32(hetrig_3mu_cnt);</div><div class='add'>+	__ul_u32(hetrig_4mu_cnt);</div><div class='add'>+#undef __dl_u32</div><div class='add'>+#undef __ul_u32</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mt7915_mcu_set_mwds(struct mt7915_dev *dev, bool enabled)</div><div class='ctx'> {</div><div class='ctx'> 	struct {</div><div class='hunk'>@@ -2850,45 +2276,192 @@ static int mt7915_mcu_set_mwds(struct mt7915_dev *dev, bool enabled)</div><div class='ctx'> 				 sizeof(req), false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7915_mcu_init(struct mt7915_dev *dev)</div><div class='add'>+int mt7915_mcu_set_muru_ctrl(struct mt7915_dev *dev, u32 cmd, u32 val)</div><div class='ctx'> {</div><div class='del'>-	static const struct mt76_mcu_ops mt7915_mcu_ops = {</div><div class='del'>-		.headroom = sizeof(struct mt7915_mcu_txd),</div><div class='del'>-		.mcu_skb_send_msg = mt7915_mcu_send_message,</div><div class='del'>-		.mcu_parse_response = mt7915_mcu_parse_response,</div><div class='del'>-		.mcu_restart = mt7915_mcu_restart,</div><div class='add'>+	struct {</div><div class='add'>+		__le32 cmd;</div><div class='add'>+		u8 val[4];</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.cmd = cpu_to_le32(cmd),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	put_unaligned_le32(val, req.val);</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(MURU_CTRL), &amp;req,</div><div class='add'>+				 sizeof(req), false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7915_mcu_init_rx_airtime(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+#define RX_AIRTIME_FEATURE_CTRL		1</div><div class='add'>+#define RX_AIRTIME_BITWISE_CTRL		2</div><div class='add'>+#define RX_AIRTIME_CLEAR_EN	1</div><div class='add'>+	struct {</div><div class='add'>+		__le16 field;</div><div class='add'>+		__le16 sub_field;</div><div class='add'>+		__le32 set_status;</div><div class='add'>+		__le32 get_status;</div><div class='add'>+		u8 _rsv[12];</div><div class='add'>+</div><div class='add'>+		bool airtime_en;</div><div class='add'>+		bool mibtime_en;</div><div class='add'>+		bool earlyend_en;</div><div class='add'>+		u8 _rsv1[9];</div><div class='add'>+</div><div class='add'>+		bool airtime_clear;</div><div class='add'>+		bool mibtime_clear;</div><div class='add'>+		u8 _rsv2[98];</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.field = cpu_to_le16(RX_AIRTIME_BITWISE_CTRL),</div><div class='add'>+		.sub_field = cpu_to_le16(RX_AIRTIME_CLEAR_EN),</div><div class='add'>+		.airtime_clear = true,</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mt76.mcu_ops = &amp;mt7915_mcu_ops;</div><div class='add'>+	ret = mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(RX_AIRTIME_CTRL), &amp;req,</div><div class='add'>+				sizeof(req), true);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	req.field = cpu_to_le16(RX_AIRTIME_FEATURE_CTRL);</div><div class='add'>+	req.sub_field = cpu_to_le16(RX_AIRTIME_CLEAR_EN);</div><div class='add'>+	req.airtime_en = true;</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(RX_AIRTIME_CTRL), &amp;req,</div><div class='add'>+				 sizeof(req), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7915_red_set_watermark(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+#define RED_GLOBAL_TOKEN_WATERMARK 2</div><div class='add'>+	struct {</div><div class='add'>+		__le32 args[3];</div><div class='add'>+		u8 cmd;</div><div class='add'>+		u8 version;</div><div class='add'>+		u8 __rsv1[4];</div><div class='add'>+		__le16 len;</div><div class='add'>+		__le16 high_mark;</div><div class='add'>+		__le16 low_mark;</div><div class='add'>+		u8 __rsv2[12];</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.args[0] = cpu_to_le32(MCU_WA_PARAM_RED_SETTING),</div><div class='add'>+		.cmd = RED_GLOBAL_TOKEN_WATERMARK,</div><div class='add'>+		.len = cpu_to_le16(sizeof(req) - sizeof(req.args)),</div><div class='add'>+		.high_mark = cpu_to_le16(MT7915_HW_TOKEN_SIZE - 256),</div><div class='add'>+		.low_mark = cpu_to_le16(MT7915_HW_TOKEN_SIZE - 256 - 1536),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_WA_PARAM_CMD(SET), &amp;req,</div><div class='add'>+				 sizeof(req), false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7915_mcu_set_red(struct mt7915_dev *dev, bool enabled)</div><div class='add'>+{</div><div class='add'>+#define RED_DISABLE		0</div><div class='add'>+#define RED_BY_WA_ENABLE	2</div><div class='add'>+	int ret;</div><div class='add'>+	u32 red_type = enabled ? RED_BY_WA_ENABLE : RED_DISABLE;</div><div class='add'>+	__le32 req = cpu_to_le32(red_type);</div><div class='add'>+</div><div class='add'>+	if (enabled) {</div><div class='add'>+		ret = mt7915_red_set_watermark(dev);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(RED_ENABLE), &amp;req,</div><div class='add'>+				sizeof(req), false);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = mt7915_driver_own(dev);</div><div class='add'>+	return mt7915_mcu_wa_cmd(dev, MCU_WA_PARAM_CMD(SET),</div><div class='add'>+				 MCU_WA_PARAM_RED, enabled, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7915_mcu_init_firmware(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* force firmware operation mode into normal state,</div><div class='add'>+	 * which should be set before firmware download stage.</div><div class='add'>+	 */</div><div class='add'>+	mt76_wr(dev, MT_SWDEF_MODE, MT_SWDEF_NORMAL_MODE);</div><div class='add'>+</div><div class='add'>+	ret = mt7915_driver_own(dev, 0);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='add'>+	/* set driver own for band1 when two hif exist */</div><div class='add'>+	if (dev-&gt;hif2) {</div><div class='add'>+		ret = mt7915_driver_own(dev, 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = mt7915_load_firmware(dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	set_bit(MT76_STATE_MCU_RUNNING, &amp;dev-&gt;mphy.state);</div><div class='del'>-	mt7915_mcu_fw_log_2_host(dev, 0);</div><div class='del'>-	mt7915_mcu_set_mwds(dev, 1);</div><div class='del'>-	mt7915_mcu_wa_cmd(dev, MCU_WA_PARAM_CMD(SET), MCU_WA_PARAM_RED, 0, 0);</div><div class='add'>+	ret = mt7915_mcu_fw_log_2_host(dev, MCU_FW_LOG_WM, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	ret = mt7915_mcu_fw_log_2_host(dev, MCU_FW_LOG_WA, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mt76_connac_mcu_del_wtbl_all(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	if ((mtk_wed_device_active(&amp;dev-&gt;mt76.mmio.wed) &amp;&amp;</div><div class='add'>+	     is_mt7915(&amp;dev-&gt;mt76)) ||</div><div class='add'>+	    !mtk_wed_get_rx_capa(&amp;dev-&gt;mt76.mmio.wed))</div><div class='add'>+		mt7915_mcu_wa_cmd(dev, MCU_WA_PARAM_CMD(CAPABILITY), 0, 0, 0);</div><div class='add'>+</div><div class='add'>+	ret = mt7915_mcu_set_mwds(dev, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7915_mcu_set_muru_ctrl(dev, MURU_SET_PLATFORM_TYPE,</div><div class='add'>+				       MURU_PLATFORM_TYPE_PERF_LEVEL_2);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7915_mcu_init_rx_airtime(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return mt7915_mcu_set_red(dev, mtk_wed_device_active(&amp;dev-&gt;mt76.mmio.wed));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7915_mcu_init(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	static const struct mt76_mcu_ops mt7915_mcu_ops = {</div><div class='add'>+		.max_retry = 1,</div><div class='add'>+		.headroom = sizeof(struct mt76_connac2_mcu_txd),</div><div class='add'>+		.mcu_skb_prepare_msg = mt76_connac2_mcu_fill_message,</div><div class='add'>+		.mcu_skb_send_msg = mt7915_mcu_send_message,</div><div class='add'>+		.mcu_parse_response = mt7915_mcu_parse_response,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dev-&gt;mt76.mcu_ops = &amp;mt7915_mcu_ops;</div><div class='add'>+</div><div class='add'>+	return mt7915_mcu_init_firmware(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt7915_mcu_exit(struct mt7915_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	__mt76_mcu_restart(&amp;dev-&gt;mt76);</div><div class='del'>-	if (!mt76_poll_msec(dev, MT_TOP_MISC, MT_TOP_MISC_FW_STATE,</div><div class='del'>-			    FIELD_PREP(MT_TOP_MISC_FW_STATE,</div><div class='del'>-				       FW_STATE_FW_DOWNLOAD), 1000)) {</div><div class='add'>+	mt76_connac_mcu_restart(&amp;dev-&gt;mt76);</div><div class='add'>+	if (mt7915_firmware_state(dev, false)) {</div><div class='ctx'> 		dev_err(dev-&gt;mt76.dev, "Failed to exit mcu\n");</div><div class='del'>-		return;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mt76_wr(dev, MT_TOP_LPCR_HOST_BAND0, MT_TOP_LPCR_HOST_FW_OWN);</div><div class='add'>+	mt76_wr(dev, MT_TOP_LPCR_HOST_BAND(0), MT_TOP_LPCR_HOST_FW_OWN);</div><div class='add'>+	if (dev-&gt;hif2)</div><div class='add'>+		mt76_wr(dev, MT_TOP_LPCR_HOST_BAND(1),</div><div class='add'>+			MT_TOP_LPCR_HOST_FW_OWN);</div><div class='add'>+out:</div><div class='ctx'> 	skb_queue_purge(&amp;dev-&gt;mt76.mcu.res_q);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2950,42 +2523,6 @@ int mt7915_mcu_set_mac(struct mt7915_dev *dev, int band,</div><div class='ctx'> 				 &amp;req_mac, sizeof(req_mac), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7915_mcu_set_scs(struct mt7915_dev *dev, u8 band, bool enable)</div><div class='del'>-{</div><div class='del'>-	struct {</div><div class='del'>-		__le32 cmd;</div><div class='del'>-		u8 band;</div><div class='del'>-		u8 enable;</div><div class='del'>-	} __packed req = {</div><div class='del'>-		.cmd = cpu_to_le32(SCS_ENABLE),</div><div class='del'>-		.band = band,</div><div class='del'>-		.enable = enable + 1,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(SCS_CTRL), &amp;req,</div><div class='del'>-				 sizeof(req), false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mt7915_mcu_set_rts_thresh(struct mt7915_phy *phy, u32 val)</div><div class='del'>-{</div><div class='del'>-	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='del'>-	struct {</div><div class='del'>-		u8 prot_idx;</div><div class='del'>-		u8 band;</div><div class='del'>-		u8 rsv[2];</div><div class='del'>-		__le32 len_thresh;</div><div class='del'>-		__le32 pkt_thresh;</div><div class='del'>-	} __packed req = {</div><div class='del'>-		.prot_idx = 1,</div><div class='del'>-		.band = phy != &amp;dev-&gt;phy,</div><div class='del'>-		.len_thresh = cpu_to_le32(val),</div><div class='del'>-		.pkt_thresh = cpu_to_le32(0x2),</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(PROTECT_CTRL), &amp;req,</div><div class='del'>-				 sizeof(req), true);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int mt7915_mcu_update_edca(struct mt7915_dev *dev, void *param)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_mcu_tx *req = (struct mt7915_mcu_tx *)param;</div><div class='hunk'>@@ -3013,7 +2550,7 @@ int mt7915_mcu_set_tx(struct mt7915_dev *dev, struct ieee80211_vif *vif)</div><div class='ctx'> 		struct edca *e = &amp;req.edca[ac];</div><div class='ctx'> </div><div class='ctx'> 		e-&gt;set = WMM_PARAM_SET;</div><div class='del'>-		e-&gt;queue = ac + mvif-&gt;wmm_idx * MT7915_MAX_WMM_SETS;</div><div class='add'>+		e-&gt;queue = ac + mvif-&gt;mt76.wmm_idx * MT76_CONNAC_MAX_WMM_SETS;</div><div class='ctx'> 		e-&gt;aifs = q-&gt;aifs;</div><div class='ctx'> 		e-&gt;txop = cpu_to_le16(q-&gt;txop);</div><div class='ctx'> </div><div class='hunk'>@@ -3031,58 +2568,6 @@ int mt7915_mcu_set_tx(struct mt7915_dev *dev, struct ieee80211_vif *vif)</div><div class='ctx'> 	return mt7915_mcu_update_edca(dev, &amp;req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7915_mcu_set_pm(struct mt7915_dev *dev, int band, int enter)</div><div class='del'>-{</div><div class='del'>-#define ENTER_PM_STATE		1</div><div class='del'>-#define EXIT_PM_STATE		2</div><div class='del'>-	struct {</div><div class='del'>-		u8 pm_number;</div><div class='del'>-		u8 pm_state;</div><div class='del'>-		u8 bssid[ETH_ALEN];</div><div class='del'>-		u8 dtim_period;</div><div class='del'>-		u8 wlan_idx_lo;</div><div class='del'>-		__le16 bcn_interval;</div><div class='del'>-		__le32 aid;</div><div class='del'>-		__le32 rx_filter;</div><div class='del'>-		u8 band_idx;</div><div class='del'>-		u8 wlan_idx_hi;</div><div class='del'>-		u8 rsv[2];</div><div class='del'>-		__le32 feature;</div><div class='del'>-		u8 omac_idx;</div><div class='del'>-		u8 wmm_idx;</div><div class='del'>-		u8 bcn_loss_cnt;</div><div class='del'>-		u8 bcn_sp_duration;</div><div class='del'>-	} __packed req = {</div><div class='del'>-		.pm_number = 5,</div><div class='del'>-		.pm_state = (enter) ? ENTER_PM_STATE : EXIT_PM_STATE,</div><div class='del'>-		.band_idx = band,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(PM_STATE_CTRL), &amp;req,</div><div class='del'>-				 sizeof(req), true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mt7915_mcu_rdd_cmd(struct mt7915_dev *dev,</div><div class='del'>-		       enum mt7915_rdd_cmd cmd, u8 index,</div><div class='del'>-		       u8 rx_sel, u8 val)</div><div class='del'>-{</div><div class='del'>-	struct {</div><div class='del'>-		u8 ctrl;</div><div class='del'>-		u8 rdd_idx;</div><div class='del'>-		u8 rdd_rx_sel;</div><div class='del'>-		u8 val;</div><div class='del'>-		u8 rsv[4];</div><div class='del'>-	} __packed req = {</div><div class='del'>-		.ctrl = cmd,</div><div class='del'>-		.rdd_idx = index,</div><div class='del'>-		.rdd_rx_sel = rx_sel,</div><div class='del'>-		.val = val,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(SET_RDD_CTRL), &amp;req,</div><div class='del'>-				 sizeof(req), true);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int mt7915_mcu_set_fcc5_lpn(struct mt7915_dev *dev, int val)</div><div class='ctx'> {</div><div class='ctx'> 	struct {</div><div class='hunk'>@@ -3181,18 +2666,118 @@ int mt7915_mcu_set_radar_th(struct mt7915_dev *dev, int index,</div><div class='ctx'> 				 sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+mt7915_mcu_background_chain_ctrl(struct mt7915_phy *phy,</div><div class='add'>+				 struct cfg80211_chan_def *chandef,</div><div class='add'>+				 int cmd)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct mt76_phy *mphy = phy-&gt;mt76;</div><div class='add'>+	struct ieee80211_channel *chan = mphy-&gt;chandef.chan;</div><div class='add'>+	int freq = mphy-&gt;chandef.center_freq1;</div><div class='add'>+	struct mt7915_mcu_background_chain_ctrl req = {</div><div class='add'>+		.monitor_scan_type = 2, /* simple rx */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!chandef &amp;&amp; cmd != CH_SWITCH_BACKGROUND_SCAN_STOP)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!cfg80211_chandef_valid(&amp;mphy-&gt;chandef))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case CH_SWITCH_BACKGROUND_SCAN_START: {</div><div class='add'>+		req.chan = chan-&gt;hw_value;</div><div class='add'>+		req.central_chan = ieee80211_frequency_to_channel(freq);</div><div class='add'>+		req.bw = mt76_connac_chan_bw(&amp;mphy-&gt;chandef);</div><div class='add'>+		req.monitor_chan = chandef-&gt;chan-&gt;hw_value;</div><div class='add'>+		req.monitor_central_chan =</div><div class='add'>+			ieee80211_frequency_to_channel(chandef-&gt;center_freq1);</div><div class='add'>+		req.monitor_bw = mt76_connac_chan_bw(chandef);</div><div class='add'>+		req.band_idx = phy-&gt;mt76-&gt;band_idx;</div><div class='add'>+		req.scan_mode = 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case CH_SWITCH_BACKGROUND_SCAN_RUNNING:</div><div class='add'>+		req.monitor_chan = chandef-&gt;chan-&gt;hw_value;</div><div class='add'>+		req.monitor_central_chan =</div><div class='add'>+			ieee80211_frequency_to_channel(chandef-&gt;center_freq1);</div><div class='add'>+		req.band_idx = phy-&gt;mt76-&gt;band_idx;</div><div class='add'>+		req.scan_mode = 2;</div><div class='add'>+		break;</div><div class='add'>+	case CH_SWITCH_BACKGROUND_SCAN_STOP:</div><div class='add'>+		req.chan = chan-&gt;hw_value;</div><div class='add'>+		req.central_chan = ieee80211_frequency_to_channel(freq);</div><div class='add'>+		req.bw = mt76_connac_chan_bw(&amp;mphy-&gt;chandef);</div><div class='add'>+		req.tx_stream = hweight8(mphy-&gt;antenna_mask);</div><div class='add'>+		req.rx_stream = mphy-&gt;antenna_mask;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	req.band = chandef ? chandef-&gt;chan-&gt;band == NL80211_BAND_5GHZ : 1;</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(OFFCH_SCAN_CTRL),</div><div class='add'>+				 &amp;req, sizeof(req), false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7915_mcu_rdd_background_enable(struct mt7915_phy *phy,</div><div class='add'>+				     struct cfg80211_chan_def *chandef)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	int err, region, rdd_idx;</div><div class='add'>+</div><div class='add'>+	rdd_idx = mt7915_get_rdd_idx(phy, true);</div><div class='add'>+	if (rdd_idx &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!chandef) { /* disable offchain */</div><div class='add'>+		err = mt76_connac_mcu_rdd_cmd(&amp;dev-&gt;mt76, RDD_STOP, rdd_idx, 0, 0);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		return mt7915_mcu_background_chain_ctrl(phy, NULL,</div><div class='add'>+				CH_SWITCH_BACKGROUND_SCAN_STOP);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mt7915_mcu_background_chain_ctrl(phy, chandef,</div><div class='add'>+					       CH_SWITCH_BACKGROUND_SCAN_START);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	switch (dev-&gt;mt76.region) {</div><div class='add'>+	case NL80211_DFS_ETSI:</div><div class='add'>+		region = 0;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_DFS_JP:</div><div class='add'>+		region = 2;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_DFS_FCC:</div><div class='add'>+	default:</div><div class='add'>+		region = 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mt76_connac_mcu_rdd_cmd(&amp;dev-&gt;mt76, RDD_START, rdd_idx, 0, region);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mt7915_mcu_set_chan_info(struct mt7915_phy *phy, int cmd)</div><div class='ctx'> {</div><div class='add'>+	static const u8 ch_band[] = {</div><div class='add'>+		[NL80211_BAND_2GHZ] = 0,</div><div class='add'>+		[NL80211_BAND_5GHZ] = 1,</div><div class='add'>+		[NL80211_BAND_6GHZ] = 2,</div><div class='add'>+	};</div><div class='ctx'> 	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct cfg80211_chan_def *chandef = &amp;phy-&gt;mt76-&gt;chandef;</div><div class='ctx'> 	int freq1 = chandef-&gt;center_freq1;</div><div class='del'>-	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='add'>+	u8 band = phy-&gt;mt76-&gt;band_idx;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u8 control_ch;</div><div class='ctx'> 		u8 center_ch;</div><div class='ctx'> 		u8 bw;</div><div class='del'>-		u8 tx_streams_num;</div><div class='del'>-		u8 rx_streams;	/* mask or num */</div><div class='add'>+		u8 tx_path_num;</div><div class='add'>+		u8 rx_path;	/* mask or num */</div><div class='ctx'> 		u8 switch_reason;</div><div class='ctx'> 		u8 band_idx;</div><div class='ctx'> 		u8 center_ch2;	/* for 80+80 only */</div><div class='hunk'>@@ -3207,38 +2792,37 @@ int mt7915_mcu_set_chan_info(struct mt7915_phy *phy, int cmd)</div><div class='ctx'> 	} __packed req = {</div><div class='ctx'> 		.control_ch = chandef-&gt;chan-&gt;hw_value,</div><div class='ctx'> 		.center_ch = ieee80211_frequency_to_channel(freq1),</div><div class='del'>-		.bw = mt7915_mcu_chan_bw(chandef),</div><div class='del'>-		.tx_streams_num = hweight8(phy-&gt;mt76-&gt;antenna_mask),</div><div class='del'>-		.rx_streams = phy-&gt;mt76-&gt;antenna_mask,</div><div class='del'>-		.band_idx = ext_phy,</div><div class='del'>-		.channel_band = chandef-&gt;chan-&gt;band,</div><div class='add'>+		.bw = mt76_connac_chan_bw(chandef),</div><div class='add'>+		.tx_path_num = hweight16(phy-&gt;mt76-&gt;chainmask),</div><div class='add'>+		.rx_path = phy-&gt;mt76-&gt;chainmask &gt;&gt; (dev-&gt;chainshift * band),</div><div class='add'>+		.band_idx = band,</div><div class='add'>+		.channel_band = ch_band[chandef-&gt;chan-&gt;band],</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NL80211_TESTMODE</div><div class='ctx'> 	if (phy-&gt;mt76-&gt;test.tx_antenna_mask &amp;&amp;</div><div class='del'>-	    (phy-&gt;mt76-&gt;test.state == MT76_TM_STATE_TX_FRAMES ||</div><div class='del'>-	     phy-&gt;mt76-&gt;test.state == MT76_TM_STATE_RX_FRAMES ||</div><div class='del'>-	     phy-&gt;mt76-&gt;test.state == MT76_TM_STATE_TX_CONT)) {</div><div class='del'>-		req.tx_streams_num = fls(phy-&gt;mt76-&gt;test.tx_antenna_mask);</div><div class='del'>-		req.rx_streams = phy-&gt;mt76-&gt;test.tx_antenna_mask;</div><div class='del'>-</div><div class='del'>-		if (ext_phy) {</div><div class='del'>-			req.tx_streams_num = 2;</div><div class='del'>-			req.rx_streams &gt;&gt;= 2;</div><div class='del'>-		}</div><div class='add'>+	    mt76_testmode_enabled(phy-&gt;mt76)) {</div><div class='add'>+		req.tx_path_num = fls(phy-&gt;mt76-&gt;test.tx_antenna_mask);</div><div class='add'>+		req.rx_path = phy-&gt;mt76-&gt;test.tx_antenna_mask;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (phy-&gt;mt76-&gt;hw-&gt;conf.flags &amp; IEEE80211_CONF_OFFCHANNEL)</div><div class='add'>+	if (mt76_connac_spe_idx(phy-&gt;mt76-&gt;antenna_mask))</div><div class='add'>+		req.tx_path_num = fls(phy-&gt;mt76-&gt;antenna_mask);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;mt76-&gt;hw-&gt;conf.flags &amp; IEEE80211_CONF_MONITOR)</div><div class='add'>+		req.switch_reason = CH_SWITCH_NORMAL;</div><div class='add'>+	else if (phy-&gt;mt76-&gt;offchannel ||</div><div class='add'>+		 phy-&gt;mt76-&gt;hw-&gt;conf.flags &amp; IEEE80211_CONF_IDLE)</div><div class='ctx'> 		req.switch_reason = CH_SWITCH_SCAN_BYPASS_DPD;</div><div class='del'>-	else if ((chandef-&gt;chan-&gt;flags &amp; IEEE80211_CHAN_RADAR) &amp;&amp;</div><div class='del'>-		 chandef-&gt;chan-&gt;dfs_state != NL80211_DFS_AVAILABLE)</div><div class='add'>+	else if (!cfg80211_reg_can_beacon(phy-&gt;mt76-&gt;hw-&gt;wiphy, chandef,</div><div class='add'>+					  NL80211_IFTYPE_AP))</div><div class='ctx'> 		req.switch_reason = CH_SWITCH_DFS;</div><div class='ctx'> 	else</div><div class='ctx'> 		req.switch_reason = CH_SWITCH_NORMAL;</div><div class='ctx'> </div><div class='ctx'> 	if (cmd == MCU_EXT_CMD(CHANNEL_SWITCH))</div><div class='del'>-		req.rx_streams = hweight8(req.rx_streams);</div><div class='add'>+		req.rx_path = hweight8(req.rx_path);</div><div class='ctx'> </div><div class='ctx'> 	if (chandef-&gt;width == NL80211_CHAN_WIDTH_80P80) {</div><div class='ctx'> 		int freq2 = chandef-&gt;center_freq2;</div><div class='hunk'>@@ -3251,21 +2835,22 @@ int mt7915_mcu_set_chan_info(struct mt7915_phy *phy, int cmd)</div><div class='ctx'> </div><div class='ctx'> static int mt7915_mcu_set_eeprom_flash(struct mt7915_dev *dev)</div><div class='ctx'> {</div><div class='del'>-#define TOTAL_PAGE_MASK		GENMASK(7, 5)</div><div class='add'>+#define MAX_PAGE_IDX_MASK	GENMASK(7, 5)</div><div class='ctx'> #define PAGE_IDX_MASK		GENMASK(4, 2)</div><div class='ctx'> #define PER_PAGE_SIZE		0x400</div><div class='ctx'> 	struct mt7915_mcu_eeprom req = { .buffer_mode = EE_MODE_BUFFER };</div><div class='del'>-	u8 total = MT7915_EEPROM_SIZE / PER_PAGE_SIZE;</div><div class='add'>+	u16 eeprom_size = mt7915_eeprom_size(dev);</div><div class='add'>+	u8 total = DIV_ROUND_UP(eeprom_size, PER_PAGE_SIZE);</div><div class='ctx'> 	u8 *eep = (u8 *)dev-&gt;mt76.eeprom.data;</div><div class='ctx'> 	int eep_len;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt;= total; i++, eep += eep_len) {</div><div class='add'>+	for (i = 0; i &lt; total; i++, eep += eep_len) {</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='del'>-		if (i == total)</div><div class='del'>-			eep_len = MT7915_EEPROM_SIZE % PER_PAGE_SIZE;</div><div class='add'>+		if (i == total - 1 &amp;&amp; !!(eeprom_size % PER_PAGE_SIZE))</div><div class='add'>+			eep_len = eeprom_size % PER_PAGE_SIZE;</div><div class='ctx'> 		else</div><div class='ctx'> 			eep_len = PER_PAGE_SIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -3274,7 +2859,7 @@ static int mt7915_mcu_set_eeprom_flash(struct mt7915_dev *dev)</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		req.format = FIELD_PREP(TOTAL_PAGE_MASK, total) |</div><div class='add'>+		req.format = FIELD_PREP(MAX_PAGE_IDX_MASK, total - 1) |</div><div class='ctx'> 			     FIELD_PREP(PAGE_IDX_MASK, i) | EE_FORMAT_WHOLE;</div><div class='ctx'> 		req.len = cpu_to_le16(eep_len);</div><div class='ctx'> </div><div class='hunk'>@@ -3304,24 +2889,53 @@ int mt7915_mcu_set_eeprom(struct mt7915_dev *dev)</div><div class='ctx'> 				 &amp;req, sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7915_mcu_get_eeprom(struct mt7915_dev *dev, u32 offset)</div><div class='add'>+int mt7915_mcu_get_eeprom(struct mt7915_dev *dev, u32 offset, u8 *read_buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_mcu_eeprom_info req = {</div><div class='del'>-		.addr = cpu_to_le32(round_down(offset, 16)),</div><div class='add'>+		.addr = cpu_to_le32(round_down(offset,</div><div class='add'>+				    MT7915_EEPROM_BLOCK_SIZE)),</div><div class='ctx'> 	};</div><div class='ctx'> 	struct mt7915_mcu_eeprom_info *res;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	u8 *buf = read_buf;</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 *buf;</div><div class='ctx'> </div><div class='del'>-	ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76, MCU_EXT_QUERY(EFUSE_ACCESS), &amp;req,</div><div class='del'>-				sizeof(req), true, &amp;skb);</div><div class='add'>+	ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76,</div><div class='add'>+					MCU_EXT_QUERY(EFUSE_ACCESS),</div><div class='add'>+					&amp;req, sizeof(req), true, &amp;skb);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	res = (struct mt7915_mcu_eeprom_info *)skb-&gt;data;</div><div class='del'>-	buf = dev-&gt;mt76.eeprom.data + le32_to_cpu(res-&gt;addr);</div><div class='del'>-	memcpy(buf, res-&gt;data, 16);</div><div class='add'>+	if (!buf)</div><div class='add'>+		buf = dev-&gt;mt76.eeprom.data + le32_to_cpu(res-&gt;addr);</div><div class='add'>+	memcpy(buf, res-&gt;data, MT7915_EEPROM_BLOCK_SIZE);</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7915_mcu_get_eeprom_free_block(struct mt7915_dev *dev, u8 *block_num)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		u8 _rsv;</div><div class='add'>+		u8 version;</div><div class='add'>+		u8 die_idx;</div><div class='add'>+		u8 _rsv2;</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.version = 1,</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76,</div><div class='add'>+					MCU_EXT_QUERY(EFUSE_FREE_BLOCK),</div><div class='add'>+					&amp;req, sizeof(req), true, &amp;skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*block_num = *(u8 *)skb-&gt;data;</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3340,7 +2954,7 @@ static int mt7915_mcu_set_pre_cal(struct mt7915_dev *dev, u8 idx,</div><div class='ctx'> 		u8 idx;</div><div class='ctx'> 		u8 rsv[4];</div><div class='ctx'> 		__le32 len;</div><div class='del'>-	} req;</div><div class='add'>+	} req = {};</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='ctx'> 	skb = mt76_mcu_msg_alloc(&amp;dev-&gt;mt76, NULL, sizeof(req) + len);</div><div class='hunk'>@@ -3358,9 +2972,10 @@ static int mt7915_mcu_set_pre_cal(struct mt7915_dev *dev, u8 idx,</div><div class='ctx'> int mt7915_mcu_apply_group_cal(struct mt7915_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u8 idx = 0, *cal = dev-&gt;cal, *eep = dev-&gt;mt76.eeprom.data;</div><div class='del'>-	u32 total = MT_EE_CAL_GROUP_SIZE;</div><div class='add'>+	u32 total = mt7915_get_cal_group_size(dev);</div><div class='add'>+	u32 offs = is_mt7915(&amp;dev-&gt;mt76) ? MT_EE_DO_PRE_CAL : MT_EE_DO_PRE_CAL_V2;</div><div class='ctx'> </div><div class='del'>-	if (!(eep[MT_EE_DO_PRE_CAL] &amp; MT_EE_WIFI_CAL_GROUP))</div><div class='add'>+	if (!(eep[offs] &amp; MT_EE_WIFI_CAL_GROUP))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3396,9 +3011,9 @@ static int mt7915_find_freq_idx(const u16 *freqs, int n_freqs, u16 cur)</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7915_dpd_freq_idx(u16 freq, u8 bw)</div><div class='add'>+static int mt7915_dpd_freq_idx(struct mt7915_dev *dev, u16 freq, u8 bw)</div><div class='ctx'> {</div><div class='del'>-	static const u16 freq_list[] = {</div><div class='add'>+	static const u16 freq_list_v1[] = {</div><div class='ctx'> 		5180, 5200, 5220, 5240,</div><div class='ctx'> 		5260, 5280, 5300, 5320,</div><div class='ctx'> 		5500, 5520, 5540, 5560,</div><div class='hunk'>@@ -3406,148 +3021,355 @@ static int mt7915_dpd_freq_idx(u16 freq, u8 bw)</div><div class='ctx'> 		5660, 5680, 5700, 5745,</div><div class='ctx'> 		5765, 5785, 5805, 5825</div><div class='ctx'> 	};</div><div class='del'>-	int offset_2g = ARRAY_SIZE(freq_list);</div><div class='del'>-	int idx;</div><div class='add'>+	static const u16 freq_list_v2[] = {</div><div class='add'>+		/* 6G BW20*/</div><div class='add'>+		5955, 5975, 5995, 6015,</div><div class='add'>+		6035, 6055, 6075, 6095,</div><div class='add'>+		6115, 6135, 6155, 6175,</div><div class='add'>+		6195, 6215, 6235, 6255,</div><div class='add'>+		6275, 6295, 6315, 6335,</div><div class='add'>+		6355, 6375, 6395, 6415,</div><div class='add'>+		6435, 6455, 6475, 6495,</div><div class='add'>+		6515, 6535, 6555, 6575,</div><div class='add'>+		6595, 6615, 6635, 6655,</div><div class='add'>+		6675, 6695, 6715, 6735,</div><div class='add'>+		6755, 6775, 6795, 6815,</div><div class='add'>+		6835, 6855, 6875, 6895,</div><div class='add'>+		6915, 6935, 6955, 6975,</div><div class='add'>+		6995, 7015, 7035, 7055,</div><div class='add'>+		7075, 7095, 7115,</div><div class='add'>+		/* 6G BW160 */</div><div class='add'>+		6025, 6185, 6345, 6505,</div><div class='add'>+		6665, 6825, 6985,</div><div class='add'>+		/* 5G BW20 */</div><div class='add'>+		5180, 5200, 5220, 5240,</div><div class='add'>+		5260, 5280, 5300, 5320,</div><div class='add'>+		5500, 5520, 5540, 5560,</div><div class='add'>+		5580, 5600, 5620, 5640,</div><div class='add'>+		5660, 5680, 5700, 5720,</div><div class='add'>+		5745, 5765, 5785, 5805,</div><div class='add'>+		5825, 5845, 5865, 5885,</div><div class='add'>+		/* 5G BW160 */</div><div class='add'>+		5250, 5570, 5815</div><div class='add'>+	};</div><div class='add'>+	const u16 *freq_list;</div><div class='add'>+	int idx, n_freqs;</div><div class='add'>+</div><div class='add'>+	if (!is_mt7915(&amp;dev-&gt;mt76)) {</div><div class='add'>+		freq_list = freq_list_v2;</div><div class='add'>+		n_freqs = ARRAY_SIZE(freq_list_v2);</div><div class='add'>+	} else {</div><div class='add'>+		freq_list = freq_list_v1;</div><div class='add'>+		n_freqs = ARRAY_SIZE(freq_list_v1);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (freq &lt; 4000) {</div><div class='ctx'> 		if (freq &lt; 2432)</div><div class='del'>-			return offset_2g;</div><div class='add'>+			return n_freqs;</div><div class='ctx'> 		if (freq &lt; 2457)</div><div class='del'>-			return offset_2g + 1;</div><div class='add'>+			return n_freqs + 1;</div><div class='ctx'> </div><div class='del'>-		return offset_2g + 2;</div><div class='add'>+		return n_freqs + 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bw == NL80211_CHAN_WIDTH_80P80 || bw == NL80211_CHAN_WIDTH_160)</div><div class='add'>+	if (bw == NL80211_CHAN_WIDTH_80P80)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	if (bw != NL80211_CHAN_WIDTH_20) {</div><div class='del'>-		idx = mt7915_find_freq_idx(freq_list, ARRAY_SIZE(freq_list),</div><div class='del'>-					   freq + 10);</div><div class='add'>+		idx = mt7915_find_freq_idx(freq_list, n_freqs, freq + 10);</div><div class='ctx'> 		if (idx &gt;= 0)</div><div class='ctx'> 			return idx;</div><div class='ctx'> </div><div class='del'>-		idx = mt7915_find_freq_idx(freq_list, ARRAY_SIZE(freq_list),</div><div class='del'>-					   freq - 10);</div><div class='add'>+		idx = mt7915_find_freq_idx(freq_list, n_freqs, freq - 10);</div><div class='ctx'> 		if (idx &gt;= 0)</div><div class='ctx'> 			return idx;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return mt7915_find_freq_idx(freq_list, ARRAY_SIZE(freq_list), freq);</div><div class='add'>+	return mt7915_find_freq_idx(freq_list, n_freqs, freq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mt7915_mcu_apply_tx_dpd(struct mt7915_phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct cfg80211_chan_def *chandef = &amp;phy-&gt;mt76-&gt;chandef;</div><div class='del'>-	u16 total = 2, idx, center_freq = chandef-&gt;center_freq1;</div><div class='add'>+	enum nl80211_band band = chandef-&gt;chan-&gt;band;</div><div class='add'>+	u32 offs = is_mt7915(&amp;dev-&gt;mt76) ? MT_EE_DO_PRE_CAL : MT_EE_DO_PRE_CAL_V2;</div><div class='add'>+	u16 center_freq = chandef-&gt;center_freq1;</div><div class='ctx'> 	u8 *cal = dev-&gt;cal, *eep = dev-&gt;mt76.eeprom.data;</div><div class='add'>+	u8 dpd_mask, cal_num = is_mt7915(&amp;dev-&gt;mt76) ? 2 : 3;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	switch (band) {</div><div class='add'>+	case NL80211_BAND_2GHZ:</div><div class='add'>+		dpd_mask = MT_EE_WIFI_CAL_DPD_2G;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_BAND_5GHZ:</div><div class='add'>+		dpd_mask = MT_EE_WIFI_CAL_DPD_5G;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_BAND_6GHZ:</div><div class='add'>+		dpd_mask = MT_EE_WIFI_CAL_DPD_6G;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dpd_mask = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!(eep[MT_EE_DO_PRE_CAL] &amp; MT_EE_WIFI_CAL_DPD))</div><div class='add'>+	if (!(eep[offs] &amp; dpd_mask))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	idx = mt7915_dpd_freq_idx(center_freq, chandef-&gt;width);</div><div class='add'>+	idx = mt7915_dpd_freq_idx(dev, center_freq, chandef-&gt;width);</div><div class='ctx'> 	if (idx &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Items: Tx DPD, Tx Flatness */</div><div class='del'>-	idx = idx * 2;</div><div class='del'>-	cal += MT_EE_CAL_GROUP_SIZE;</div><div class='add'>+	idx = idx * cal_num;</div><div class='add'>+	cal += mt7915_get_cal_group_size(dev) + (idx * MT_EE_CAL_UNIT);</div><div class='ctx'> </div><div class='del'>-	while (total--) {</div><div class='add'>+	while (cal_num--) {</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='del'>-		cal += (idx * MT_EE_CAL_UNIT);</div><div class='ctx'> 		ret = mt7915_mcu_set_pre_cal(dev, idx, cal, MT_EE_CAL_UNIT,</div><div class='ctx'> 					     MCU_EXT_CMD(DPD_PRE_CAL_INFO));</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='ctx'> 		idx++;</div><div class='add'>+		cal += MT_EE_CAL_UNIT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7915_mcu_get_temperature(struct mt7915_dev *dev, int index)</div><div class='add'>+int mt7915_mcu_get_chan_mib_info(struct mt7915_phy *phy, bool chan_switch)</div><div class='ctx'> {</div><div class='add'>+	struct mt76_channel_state *state = phy-&gt;mt76-&gt;chan_state;</div><div class='add'>+	struct mt76_channel_state *state_ts = &amp;phy-&gt;state_ts;</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct mt7915_mcu_mib *res, req[5];</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	static const u32 *offs;</div><div class='add'>+	int i, ret, len, offs_cc;</div><div class='add'>+	u64 cc_tx;</div><div class='add'>+</div><div class='add'>+	/* strict order */</div><div class='add'>+	if (is_mt7915(&amp;dev-&gt;mt76)) {</div><div class='add'>+		static const u32 chip_offs[] = {</div><div class='add'>+			MIB_NON_WIFI_TIME,</div><div class='add'>+			MIB_TX_TIME,</div><div class='add'>+			MIB_RX_TIME,</div><div class='add'>+			MIB_OBSS_AIRTIME,</div><div class='add'>+			MIB_TXOP_INIT_COUNT,</div><div class='add'>+		};</div><div class='add'>+		len = ARRAY_SIZE(chip_offs);</div><div class='add'>+		offs = chip_offs;</div><div class='add'>+		offs_cc = 20;</div><div class='add'>+	} else {</div><div class='add'>+		static const u32 chip_offs[] = {</div><div class='add'>+			MIB_NON_WIFI_TIME_V2,</div><div class='add'>+			MIB_TX_TIME_V2,</div><div class='add'>+			MIB_RX_TIME_V2,</div><div class='add'>+			MIB_OBSS_AIRTIME_V2</div><div class='add'>+		};</div><div class='add'>+		len = ARRAY_SIZE(chip_offs);</div><div class='add'>+		offs = chip_offs;</div><div class='add'>+		offs_cc = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		req[i].band = cpu_to_le32(phy-&gt;mt76-&gt;band_idx);</div><div class='add'>+		req[i].offs = cpu_to_le32(offs[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(GET_MIB_INFO),</div><div class='add'>+					req, len * sizeof(req[0]), true, &amp;skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	res = (struct mt7915_mcu_mib *)(skb-&gt;data + offs_cc);</div><div class='add'>+</div><div class='add'>+#define __res_u64(s) le64_to_cpu(res[s].data)</div><div class='add'>+	/* subtract Tx backoff time from Tx duration for MT7915 */</div><div class='add'>+	if (is_mt7915(&amp;dev-&gt;mt76)) {</div><div class='add'>+		u64 backoff = (__res_u64(4) &amp; 0xffff) * 79;  /* 16us + 9us * 7 */</div><div class='add'>+		cc_tx = __res_u64(1) - backoff;</div><div class='add'>+	} else {</div><div class='add'>+		cc_tx = __res_u64(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (chan_switch)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	state-&gt;cc_tx += cc_tx - state_ts-&gt;cc_tx;</div><div class='add'>+	state-&gt;cc_bss_rx += __res_u64(2) - state_ts-&gt;cc_bss_rx;</div><div class='add'>+	state-&gt;cc_rx += __res_u64(2) + __res_u64(3) - state_ts-&gt;cc_rx;</div><div class='add'>+	state-&gt;cc_busy += __res_u64(0) + cc_tx + __res_u64(2) + __res_u64(3) -</div><div class='add'>+			  state_ts-&gt;cc_busy;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	state_ts-&gt;cc_tx = cc_tx;</div><div class='add'>+	state_ts-&gt;cc_bss_rx = __res_u64(2);</div><div class='add'>+	state_ts-&gt;cc_rx = __res_u64(2) + __res_u64(3);</div><div class='add'>+	state_ts-&gt;cc_busy = __res_u64(0) + cc_tx + __res_u64(2) + __res_u64(3);</div><div class='add'>+#undef __res_u64</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7915_mcu_get_temperature(struct mt7915_phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u8 ctrl_id;</div><div class='ctx'> 		u8 action;</div><div class='del'>-		u8 band;</div><div class='add'>+		u8 band_idx;</div><div class='ctx'> 		u8 rsv[5];</div><div class='ctx'> 	} req = {</div><div class='ctx'> 		.ctrl_id = THERMAL_SENSOR_TEMP_QUERY,</div><div class='del'>-		.action = index,</div><div class='add'>+		.band_idx = phy-&gt;mt76-&gt;band_idx,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(THERMAL_CTRL), &amp;req,</div><div class='ctx'> 				 sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7915_mcu_get_tx_rate(struct mt7915_dev *dev, u32 cmd, u16 wlan_idx)</div><div class='add'>+int mt7915_mcu_set_thermal_throttling(struct mt7915_phy *phy, u8 state)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct mt7915_mcu_thermal_ctrl req = {</div><div class='add'>+		.band_idx = phy-&gt;mt76-&gt;band_idx,</div><div class='add'>+		.ctrl_id = THERMAL_PROTECT_DUTY_CONFIG,</div><div class='add'>+	};</div><div class='add'>+	int level, ret;</div><div class='add'>+</div><div class='add'>+	/* set duty cycle and level */</div><div class='add'>+	for (level = 0; level &lt; 4; level++) {</div><div class='add'>+		req.duty.duty_level = level;</div><div class='add'>+		req.duty.duty_cycle = state;</div><div class='add'>+		state /= 2;</div><div class='add'>+</div><div class='add'>+		ret = mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(THERMAL_PROT),</div><div class='add'>+					&amp;req, sizeof(req), false);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7915_mcu_set_thermal_protect(struct mt7915_phy *phy)</div><div class='ctx'> {</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct {</div><div class='del'>-		__le32 cmd;</div><div class='del'>-		__le16 wlan_idx;</div><div class='del'>-		__le16 ru_idx;</div><div class='del'>-		__le16 direction;</div><div class='del'>-		__le16 dump_group;</div><div class='del'>-	} req = {</div><div class='del'>-		.cmd = cpu_to_le32(cmd),</div><div class='del'>-		.wlan_idx = cpu_to_le16(wlan_idx),</div><div class='del'>-		.dump_group = cpu_to_le16(1),</div><div class='add'>+		struct mt7915_mcu_thermal_ctrl ctrl;</div><div class='add'>+</div><div class='add'>+		__le32 trigger_temp;</div><div class='add'>+		__le32 restore_temp;</div><div class='add'>+		__le16 sustain_time;</div><div class='add'>+		u8 rsv[2];</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.ctrl = {</div><div class='add'>+			.band_idx = phy-&gt;mt76-&gt;band_idx,</div><div class='add'>+			.type.protect_type = 1,</div><div class='add'>+			.type.trigger_type = 1,</div><div class='add'>+		},</div><div class='ctx'> 	};</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(RATE_CTRL), &amp;req,</div><div class='del'>-				 sizeof(req), false);</div><div class='add'>+	req.ctrl.ctrl_id = THERMAL_PROTECT_DISABLE;</div><div class='add'>+	ret = mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(THERMAL_PROT),</div><div class='add'>+				&amp;req, sizeof(req.ctrl), false);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* set high-temperature trigger threshold */</div><div class='add'>+	req.ctrl.ctrl_id = THERMAL_PROTECT_ENABLE;</div><div class='add'>+	/* add a safety margin ~10 */</div><div class='add'>+	req.restore_temp = cpu_to_le32(phy-&gt;throttle_temp[0] - 10);</div><div class='add'>+	req.trigger_temp = cpu_to_le32(phy-&gt;throttle_temp[1]);</div><div class='add'>+	req.sustain_time = cpu_to_le16(10);</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(THERMAL_PROT),</div><div class='add'>+				 &amp;req, sizeof(req), false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7915_mcu_set_txpower_sku(struct mt7915_phy *phy)</div><div class='add'>+int mt7915_mcu_set_txpower_frame_min(struct mt7915_phy *phy, s8 txpower)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct {</div><div class='add'>+		u8 format_id;</div><div class='add'>+		u8 rsv;</div><div class='add'>+		u8 band_idx;</div><div class='add'>+		s8 txpower_min;</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.format_id = TX_POWER_LIMIT_FRAME_MIN,</div><div class='add'>+		.band_idx = phy-&gt;mt76-&gt;band_idx,</div><div class='add'>+		.txpower_min = txpower * 2, /* 0.5db */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76,</div><div class='add'>+				 MCU_EXT_CMD(TX_POWER_FEATURE_CTRL), &amp;req,</div><div class='add'>+				 sizeof(req), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7915_mcu_set_txpower_frame(struct mt7915_phy *phy,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_sta *sta, s8 txpower)</div><div class='ctx'> {</div><div class='del'>-#define MT7915_SKU_RATE_NUM		161</div><div class='add'>+	struct mt7915_sta *msta = (struct mt7915_sta *)sta-&gt;drv_priv;</div><div class='ctx'> 	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct mt76_phy *mphy = phy-&gt;mt76;</div><div class='del'>-	struct ieee80211_hw *hw = mphy-&gt;hw;</div><div class='del'>-	struct mt7915_sku_val {</div><div class='add'>+	struct {</div><div class='ctx'> 		u8 format_id;</div><div class='del'>-		u8 limit_type;</div><div class='del'>-		u8 dbdc_idx;</div><div class='del'>-		s8 val[MT7915_SKU_RATE_NUM];</div><div class='add'>+		u8 rsv[3];</div><div class='add'>+		u8 band_idx;</div><div class='add'>+		s8 txpower_max;</div><div class='add'>+		__le16 wcid;</div><div class='add'>+		s8 txpower_offs[48];</div><div class='ctx'> 	} __packed req = {</div><div class='del'>-		.format_id = 4,</div><div class='del'>-		.dbdc_idx = phy != &amp;dev-&gt;phy,</div><div class='add'>+		.format_id = TX_POWER_LIMIT_FRAME,</div><div class='add'>+		.band_idx = phy-&gt;mt76-&gt;band_idx,</div><div class='add'>+		.txpower_max = DIV_ROUND_UP(mphy-&gt;txpower_cur, 2),</div><div class='add'>+		.wcid = cpu_to_le16(msta-&gt;wcid.idx),</div><div class='ctx'> 	};</div><div class='del'>-	struct mt76_power_limits limits_array;</div><div class='del'>-	s8 *la = (s8 *)&amp;limits_array;</div><div class='del'>-	int i, idx, n_chains = hweight8(mphy-&gt;antenna_mask);</div><div class='del'>-	int tx_power;</div><div class='add'>+	int ret;</div><div class='add'>+	s8 txpower_sku[MT7915_SKU_RATE_NUM];</div><div class='add'>+</div><div class='add'>+	ret = mt7915_mcu_get_txpower_sku(phy, txpower_sku, sizeof(txpower_sku),</div><div class='add'>+					 TX_POWER_INFO_RATE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	txpower = mt76_get_power_bound(mphy, txpower);</div><div class='add'>+	if (txpower &gt; mphy-&gt;txpower_cur || txpower &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	tx_power = hw-&gt;conf.power_level * 2 -</div><div class='del'>-		   mt76_tx_power_nss_delta(n_chains);</div><div class='add'>+	if (txpower) {</div><div class='add'>+		u32 offs, len, i;</div><div class='ctx'> </div><div class='del'>-	tx_power = mt76_get_rate_power_limits(mphy, mphy-&gt;chandef.chan,</div><div class='del'>-					      &amp;limits_array, tx_power);</div><div class='del'>-	mphy-&gt;txpower_cur = tx_power;</div><div class='add'>+		if (sta-&gt;deflink.ht_cap.ht_supported) {</div><div class='add'>+			const u8 *sku_len = mt7915_sku_group_len;</div><div class='ctx'> </div><div class='del'>-	for (i = 0, idx = 0; i &lt; ARRAY_SIZE(mt7915_sku_group_len); i++) {</div><div class='del'>-		u8 mcs_num, len = mt7915_sku_group_len[i];</div><div class='del'>-		int j;</div><div class='add'>+			offs = sku_len[SKU_CCK] + sku_len[SKU_OFDM];</div><div class='add'>+			len = sku_len[SKU_HT_BW20] + sku_len[SKU_HT_BW40];</div><div class='ctx'> </div><div class='del'>-		if (i &gt;= SKU_HT_BW20 &amp;&amp; i &lt;= SKU_VHT_BW160) {</div><div class='del'>-			mcs_num = 10;</div><div class='add'>+			if (sta-&gt;deflink.vht_cap.vht_supported) {</div><div class='add'>+				offs += len;</div><div class='add'>+				len = sku_len[SKU_VHT_BW20] * 4;</div><div class='ctx'> </div><div class='del'>-			if (i == SKU_HT_BW20 || i == SKU_VHT_BW20)</div><div class='del'>-				la = (s8 *)&amp;limits_array + 12;</div><div class='add'>+				if (sta-&gt;deflink.he_cap.has_he) {</div><div class='add'>+					offs += len + sku_len[SKU_HE_RU26] * 3;</div><div class='add'>+					len = sku_len[SKU_HE_RU242] * 4;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='del'>-			mcs_num = len;</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		for (j = 0; j &lt; min_t(u8, mcs_num, len); j++)</div><div class='del'>-			req.val[idx + j] = la[j];</div><div class='del'>-</div><div class='del'>-		la += mcs_num;</div><div class='del'>-		idx += len;</div><div class='add'>+		for (i = 0; i &lt; len; i++, offs++)</div><div class='add'>+			req.txpower_offs[i] =</div><div class='add'>+				DIV_ROUND_UP(txpower - txpower_sku[offs], 2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return mt76_mcu_send_msg(&amp;dev-&gt;mt76,</div><div class='hunk'>@@ -3555,6 +3377,173 @@ int mt7915_mcu_set_txpower_sku(struct mt7915_phy *phy)</div><div class='ctx'> 				 sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+mt7915_update_txpower(struct mt7915_phy *phy, int tx_power)</div><div class='add'>+{</div><div class='add'>+	struct mt76_phy *mphy = phy-&gt;mt76;</div><div class='add'>+	struct ieee80211_channel *chan = mphy-&gt;main_chandef.chan;</div><div class='add'>+	int chain_idx, val, e2p_power_limit = 0;</div><div class='add'>+</div><div class='add'>+	if (!chan) {</div><div class='add'>+		mphy-&gt;txpower_cur = tx_power;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (chain_idx = 0; chain_idx &lt; hweight16(mphy-&gt;chainmask); chain_idx++) {</div><div class='add'>+		val = mt7915_eeprom_get_target_power(phy-&gt;dev, chan, chain_idx);</div><div class='add'>+		val += mt7915_eeprom_get_power_delta(phy-&gt;dev, chan-&gt;band);</div><div class='add'>+</div><div class='add'>+		e2p_power_limit = max_t(int, e2p_power_limit, val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;sku_limit_en)</div><div class='add'>+		mphy-&gt;txpower_cur = min_t(int, e2p_power_limit, tx_power);</div><div class='add'>+	else</div><div class='add'>+		mphy-&gt;txpower_cur = e2p_power_limit;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7915_mcu_set_txpower_sku(struct mt7915_phy *phy)</div><div class='add'>+{</div><div class='add'>+#define TX_POWER_LIMIT_TABLE_RATE	0</div><div class='add'>+#define TX_POWER_LIMIT_TABLE_PATH	1</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct mt76_phy *mphy = phy-&gt;mt76;</div><div class='add'>+	struct ieee80211_hw *hw = mphy-&gt;hw;</div><div class='add'>+	struct mt7915_sku_val {</div><div class='add'>+		u8 format_id;</div><div class='add'>+		u8 limit_type;</div><div class='add'>+		u8 band_idx;</div><div class='add'>+	} __packed hdr = {</div><div class='add'>+		.format_id = TX_POWER_LIMIT_TABLE,</div><div class='add'>+		.limit_type = TX_POWER_LIMIT_TABLE_RATE,</div><div class='add'>+		.band_idx = phy-&gt;mt76-&gt;band_idx,</div><div class='add'>+	};</div><div class='add'>+	int i, ret, tx_power;</div><div class='add'>+	const u8 *len = mt7915_sku_group_len;</div><div class='add'>+	struct mt76_power_limits la = {};</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	tx_power = mt76_get_power_bound(mphy, hw-&gt;conf.power_level);</div><div class='add'>+	if (phy-&gt;sku_limit_en) {</div><div class='add'>+		tx_power = mt76_get_rate_power_limits(mphy, mphy-&gt;chandef.chan,</div><div class='add'>+						      &amp;la, tx_power);</div><div class='add'>+		mt7915_update_txpower(phy, tx_power);</div><div class='add'>+	} else {</div><div class='add'>+		mt7915_update_txpower(phy, tx_power);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = mt76_mcu_msg_alloc(&amp;dev-&gt;mt76, NULL,</div><div class='add'>+				 sizeof(hdr) + MT7915_SKU_RATE_NUM);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	skb_put_data(skb, &amp;hdr, sizeof(hdr));</div><div class='add'>+	skb_put_data(skb, &amp;la.cck, len[SKU_CCK] + len[SKU_OFDM]);</div><div class='add'>+	skb_put_data(skb, &amp;la.mcs[0], len[SKU_HT_BW20]);</div><div class='add'>+	skb_put_data(skb, &amp;la.mcs[1], len[SKU_HT_BW40]);</div><div class='add'>+</div><div class='add'>+	/* vht */</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		skb_put_data(skb, &amp;la.mcs[i], sizeof(la.mcs[i]));</div><div class='add'>+		skb_put_zero(skb, 2);  /* padding */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* he */</div><div class='add'>+	skb_put_data(skb, &amp;la.ru[0], sizeof(la.ru));</div><div class='add'>+	ret = mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='add'>+				    MCU_EXT_CMD(TX_POWER_FEATURE_CTRL), true);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* only set per-path power table when it's configured */</div><div class='add'>+	if (!phy-&gt;sku_path_en)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	skb = mt76_mcu_msg_alloc(&amp;dev-&gt;mt76, NULL,</div><div class='add'>+				 sizeof(hdr) + MT7915_SKU_PATH_NUM);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hdr.limit_type = TX_POWER_LIMIT_TABLE_PATH;</div><div class='add'>+	skb_put_data(skb, &amp;hdr, sizeof(hdr));</div><div class='add'>+	skb_put_data(skb, &amp;la.path.cck, sizeof(la.path.cck));</div><div class='add'>+	skb_put_data(skb, &amp;la.path.ofdm, sizeof(la.path.ofdm));</div><div class='add'>+	skb_put_data(skb, &amp;la.path.ofdm_bf[1], sizeof(la.path.ofdm_bf) - 1);</div><div class='add'>+</div><div class='add'>+	/* HT20 and HT40 */</div><div class='add'>+	skb_put_data(skb, &amp;la.path.ru[3], sizeof(la.path.ru[3]));</div><div class='add'>+	skb_put_data(skb, &amp;la.path.ru_bf[3][1], sizeof(la.path.ru_bf[3]) - 1);</div><div class='add'>+	skb_put_data(skb, &amp;la.path.ru[4], sizeof(la.path.ru[4]));</div><div class='add'>+	skb_put_data(skb, &amp;la.path.ru_bf[4][1], sizeof(la.path.ru_bf[4]) - 1);</div><div class='add'>+</div><div class='add'>+	/* start from non-bf and bf fields of</div><div class='add'>+	 * BW20/RU242, BW40/RU484, BW80/RU996, BW160/RU2x996,</div><div class='add'>+	 * RU26, RU52, and RU106</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		bool bf = i % 2;</div><div class='add'>+		u8 idx = (i + 6) / 2;</div><div class='add'>+		s8 *buf = bf ? la.path.ru_bf[idx] : la.path.ru[idx];</div><div class='add'>+		/* The non-bf fields of RU26 to RU106 are special cases */</div><div class='add'>+		if (bf)</div><div class='add'>+			skb_put_data(skb, buf + 1, 9);</div><div class='add'>+		else</div><div class='add'>+			skb_put_data(skb, buf, 10);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 6; i++) {</div><div class='add'>+		bool bf = i % 2;</div><div class='add'>+		u8 idx = i / 2;</div><div class='add'>+		s8 *buf = bf ? la.path.ru_bf[idx] : la.path.ru[idx];</div><div class='add'>+</div><div class='add'>+		skb_put_data(skb, buf, 10);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='add'>+				     MCU_EXT_CMD(TX_POWER_FEATURE_CTRL), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7915_mcu_get_txpower_sku(struct mt7915_phy *phy, s8 *txpower, int len,</div><div class='add'>+			       u8 category)</div><div class='add'>+{</div><div class='add'>+#define RATE_POWER_INFO	2</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct {</div><div class='add'>+		u8 format_id;</div><div class='add'>+		u8 category;</div><div class='add'>+		u8 band_idx;</div><div class='add'>+		u8 _rsv;</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.format_id = TX_POWER_LIMIT_INFO,</div><div class='add'>+		.category = category,</div><div class='add'>+		.band_idx = phy-&gt;mt76-&gt;band_idx,</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76,</div><div class='add'>+					MCU_EXT_CMD(TX_POWER_FEATURE_CTRL),</div><div class='add'>+					&amp;req, sizeof(req), true, &amp;skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (category == TX_POWER_INFO_RATE) {</div><div class='add'>+		s8 res[MT7915_SKU_RATE_NUM][2];</div><div class='add'>+</div><div class='add'>+		memcpy(res, skb-&gt;data + 4, sizeof(res));</div><div class='add'>+		for (i = 0; i &lt; len; i++)</div><div class='add'>+			txpower[i] = res[i][req.band_idx];</div><div class='add'>+	} else if (category == TX_POWER_INFO_PATH) {</div><div class='add'>+		memcpy(txpower, skb-&gt;data + 4, len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mt7915_mcu_set_test_param(struct mt7915_dev *dev, u8 param, bool test_mode,</div><div class='ctx'> 			      u8 en)</div><div class='ctx'> {</div><div class='hunk'>@@ -3577,19 +3566,30 @@ int mt7915_mcu_set_test_param(struct mt7915_dev *dev, u8 param, bool test_mode,</div><div class='ctx'> 				 sizeof(req), false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7915_mcu_set_sku_en(struct mt7915_phy *phy, bool enable)</div><div class='add'>+int mt7915_mcu_set_sku_en(struct mt7915_phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct mt7915_sku {</div><div class='ctx'> 		u8 format_id;</div><div class='ctx'> 		u8 sku_enable;</div><div class='del'>-		u8 dbdc_idx;</div><div class='add'>+		u8 band_idx;</div><div class='ctx'> 		u8 rsv;</div><div class='ctx'> 	} __packed req = {</div><div class='del'>-		.format_id = 0,</div><div class='del'>-		.dbdc_idx = phy != &amp;dev-&gt;phy,</div><div class='del'>-		.sku_enable = enable,</div><div class='add'>+		.band_idx = phy-&gt;mt76-&gt;band_idx,</div><div class='ctx'> 	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	req.sku_enable = phy-&gt;sku_limit_en;</div><div class='add'>+	req.format_id = TX_POWER_LIMIT_ENABLE;</div><div class='add'>+</div><div class='add'>+	ret = mt76_mcu_send_msg(&amp;dev-&gt;mt76,</div><div class='add'>+				MCU_EXT_CMD(TX_POWER_FEATURE_CTRL), &amp;req,</div><div class='add'>+				sizeof(req), true);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	req.sku_enable = phy-&gt;sku_path_en;</div><div class='add'>+	req.format_id = TX_POWER_LIMIT_PATH_ENABLE;</div><div class='ctx'> </div><div class='ctx'> 	return mt76_mcu_send_msg(&amp;dev-&gt;mt76,</div><div class='ctx'> 				 MCU_EXT_CMD(TX_POWER_FEATURE_CTRL), &amp;req,</div><div class='hunk'>@@ -3613,87 +3613,242 @@ int mt7915_mcu_set_ser(struct mt7915_dev *dev, u8 action, u8 set, u8 band)</div><div class='ctx'> 				 &amp;req, sizeof(req), false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7915_mcu_set_txbf_module(struct mt7915_dev *dev)</div><div class='add'>+int mt7915_mcu_set_txbf(struct mt7915_dev *dev, u8 action)</div><div class='ctx'> {</div><div class='del'>-#define MT_BF_MODULE_UPDATE               25</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u8 action;</div><div class='del'>-		u8 bf_num;</div><div class='del'>-		u8 bf_bitmap;</div><div class='del'>-		u8 bf_sel[8];</div><div class='del'>-		u8 rsv[8];</div><div class='add'>+		union {</div><div class='add'>+			struct {</div><div class='add'>+				u8 snd_mode;</div><div class='add'>+				u8 sta_num;</div><div class='add'>+				u8 rsv;</div><div class='add'>+				u8 wlan_idx[4];</div><div class='add'>+				__le32 snd_period;	/* ms */</div><div class='add'>+			} __packed snd;</div><div class='add'>+			struct {</div><div class='add'>+				bool ebf;</div><div class='add'>+				bool ibf;</div><div class='add'>+				u8 rsv;</div><div class='add'>+			} __packed type;</div><div class='add'>+			struct {</div><div class='add'>+				u8 bf_num;</div><div class='add'>+				u8 bf_bitmap;</div><div class='add'>+				u8 bf_sel[8];</div><div class='add'>+				u8 rsv[5];</div><div class='add'>+			} __packed mod;</div><div class='add'>+		};</div><div class='ctx'> 	} __packed req = {</div><div class='del'>-		.action = MT_BF_MODULE_UPDATE,</div><div class='del'>-		.bf_num = 2,</div><div class='del'>-		.bf_bitmap = GENMASK(1, 0),</div><div class='add'>+		.action = action,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+#define MT_BF_PROCESSING	4</div><div class='add'>+	switch (action) {</div><div class='add'>+	case MT_BF_SOUNDING_ON:</div><div class='add'>+		req.snd.snd_mode = MT_BF_PROCESSING;</div><div class='add'>+		break;</div><div class='add'>+	case MT_BF_TYPE_UPDATE:</div><div class='add'>+		req.type.ebf = true;</div><div class='add'>+		req.type.ibf = dev-&gt;ibf;</div><div class='add'>+		break;</div><div class='add'>+	case MT_BF_MODULE_UPDATE:</div><div class='add'>+		req.mod.bf_num = 2;</div><div class='add'>+		req.mod.bf_bitmap = GENMASK(1, 0);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(TXBF_ACTION), &amp;req,</div><div class='ctx'> 				 sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7915_mcu_set_txbf_type(struct mt7915_dev *dev)</div><div class='add'>+static int</div><div class='add'>+mt7915_mcu_enable_obss_spr(struct mt7915_phy *phy, u8 action, u8 val)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct mt7915_mcu_sr_ctrl req = {</div><div class='add'>+		.action = action,</div><div class='add'>+		.argnum = 1,</div><div class='add'>+		.band_idx = phy-&gt;mt76-&gt;band_idx,</div><div class='add'>+		.val = cpu_to_le32(val),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(SET_SPR), &amp;req,</div><div class='add'>+				 sizeof(req), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7915_mcu_set_obss_spr_pd(struct mt7915_phy *phy,</div><div class='add'>+			   struct ieee80211_he_obss_pd *he_obss_pd)</div><div class='ctx'> {</div><div class='del'>-#define MT_BF_TYPE_UPDATE		20</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct {</div><div class='del'>-		u8 action;</div><div class='del'>-		bool ebf;</div><div class='del'>-		bool ibf;</div><div class='del'>-		u8 rsv;</div><div class='add'>+		struct mt7915_mcu_sr_ctrl ctrl;</div><div class='add'>+		struct {</div><div class='add'>+			u8 pd_th_non_srg;</div><div class='add'>+			u8 pd_th_srg;</div><div class='add'>+			u8 period_offs;</div><div class='add'>+			u8 rcpi_src;</div><div class='add'>+			__le16 obss_pd_min;</div><div class='add'>+			__le16 obss_pd_min_srg;</div><div class='add'>+			u8 resp_txpwr_mode;</div><div class='add'>+			u8 txpwr_restrict_mode;</div><div class='add'>+			u8 txpwr_ref;</div><div class='add'>+			u8 rsv[3];</div><div class='add'>+		} __packed param;</div><div class='ctx'> 	} __packed req = {</div><div class='del'>-		.action = MT_BF_TYPE_UPDATE,</div><div class='del'>-		.ebf = true,</div><div class='del'>-		.ibf = dev-&gt;ibf,</div><div class='add'>+		.ctrl = {</div><div class='add'>+			.action = SPR_SET_PARAM,</div><div class='add'>+			.argnum = 9,</div><div class='add'>+			.band_idx = phy-&gt;mt76-&gt;band_idx,</div><div class='add'>+		},</div><div class='ctx'> 	};</div><div class='add'>+	int ret;</div><div class='add'>+	u8 max_th = 82, non_srg_max_th = 62;</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(TXBF_ACTION), &amp;req,</div><div class='add'>+	/* disable firmware dynamical PD asjustment */</div><div class='add'>+	ret = mt7915_mcu_enable_obss_spr(phy, SPR_ENABLE_DPD, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (he_obss_pd-&gt;sr_ctrl &amp;</div><div class='add'>+	    IEEE80211_HE_SPR_NON_SRG_OBSS_PD_SR_DISALLOWED)</div><div class='add'>+		req.param.pd_th_non_srg = max_th;</div><div class='add'>+	else if (he_obss_pd-&gt;sr_ctrl &amp; IEEE80211_HE_SPR_NON_SRG_OFFSET_PRESENT)</div><div class='add'>+		req.param.pd_th_non_srg  = max_th - he_obss_pd-&gt;non_srg_max_offset;</div><div class='add'>+	else</div><div class='add'>+		req.param.pd_th_non_srg  = non_srg_max_th;</div><div class='add'>+</div><div class='add'>+	if (he_obss_pd-&gt;sr_ctrl &amp; IEEE80211_HE_SPR_SRG_INFORMATION_PRESENT)</div><div class='add'>+		req.param.pd_th_srg = max_th - he_obss_pd-&gt;max_offset;</div><div class='add'>+</div><div class='add'>+	req.param.obss_pd_min = cpu_to_le16(82);</div><div class='add'>+	req.param.obss_pd_min_srg = cpu_to_le16(82);</div><div class='add'>+	req.param.txpwr_restrict_mode = 2;</div><div class='add'>+	req.param.txpwr_ref = 21;</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(SET_SPR), &amp;req,</div><div class='ctx'> 				 sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7915_mcu_set_txbf_sounding(struct mt7915_dev *dev)</div><div class='add'>+static int</div><div class='add'>+mt7915_mcu_set_obss_spr_siga(struct mt7915_phy *phy, struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_he_obss_pd *he_obss_pd)</div><div class='ctx'> {</div><div class='del'>-#define MT_BF_PROCESSING		4</div><div class='add'>+	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	u8 omac = mvif-&gt;mt76.omac_idx;</div><div class='ctx'> 	struct {</div><div class='del'>-		u8 action;</div><div class='del'>-		u8 snd_mode;</div><div class='del'>-		u8 sta_num;</div><div class='del'>-		u8 rsv;</div><div class='del'>-		u8 wlan_idx[4];</div><div class='del'>-		__le32 snd_period;	/* ms */</div><div class='add'>+		struct mt7915_mcu_sr_ctrl ctrl;</div><div class='add'>+		struct {</div><div class='add'>+			u8 omac;</div><div class='add'>+			u8 rsv[3];</div><div class='add'>+			u8 flag[20];</div><div class='add'>+		} __packed siga;</div><div class='ctx'> 	} __packed req = {</div><div class='del'>-		.action = true,</div><div class='del'>-		.snd_mode = MT_BF_PROCESSING,</div><div class='add'>+		.ctrl = {</div><div class='add'>+			.action = SPR_SET_SIGA,</div><div class='add'>+			.argnum = 1,</div><div class='add'>+			.band_idx = phy-&gt;mt76-&gt;band_idx,</div><div class='add'>+		},</div><div class='add'>+		.siga = {</div><div class='add'>+			.omac = omac &gt; HW_BSSID_MAX ? omac - 12 : omac,</div><div class='add'>+		},</div><div class='ctx'> 	};</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(TXBF_ACTION), &amp;req,</div><div class='add'>+	if (he_obss_pd-&gt;sr_ctrl &amp; IEEE80211_HE_SPR_HESIGA_SR_VAL15_ALLOWED)</div><div class='add'>+		req.siga.flag[req.siga.omac] = 0xf;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* switch to normal AP mode */</div><div class='add'>+	ret = mt7915_mcu_enable_obss_spr(phy, SPR_ENABLE_MODE, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(SET_SPR), &amp;req,</div><div class='ctx'> 				 sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7915_mcu_add_obss_spr(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-			    bool enable)</div><div class='add'>+static int</div><div class='add'>+mt7915_mcu_set_obss_spr_bitmap(struct mt7915_phy *phy,</div><div class='add'>+			       struct ieee80211_he_obss_pd *he_obss_pd)</div><div class='ctx'> {</div><div class='del'>-#define MT_SPR_ENABLE		1</div><div class='del'>-	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct {</div><div class='del'>-		u8 action;</div><div class='del'>-		u8 arg_num;</div><div class='del'>-		u8 band_idx;</div><div class='del'>-		u8 status;</div><div class='del'>-		u8 drop_tx_idx;</div><div class='del'>-		u8 sta_idx;	/* 256 sta */</div><div class='del'>-		u8 rsv[2];</div><div class='del'>-		__le32 val;</div><div class='add'>+		struct mt7915_mcu_sr_ctrl ctrl;</div><div class='add'>+		struct {</div><div class='add'>+			__le32 color_l[2];</div><div class='add'>+			__le32 color_h[2];</div><div class='add'>+			__le32 bssid_l[2];</div><div class='add'>+			__le32 bssid_h[2];</div><div class='add'>+		} __packed bitmap;</div><div class='ctx'> 	} __packed req = {</div><div class='del'>-		.action = MT_SPR_ENABLE,</div><div class='del'>-		.arg_num = 1,</div><div class='del'>-		.band_idx = mvif-&gt;band_idx,</div><div class='del'>-		.val = cpu_to_le32(enable),</div><div class='add'>+		.ctrl = {</div><div class='add'>+			.action = SPR_SET_SRG_BITMAP,</div><div class='add'>+			.argnum = 4,</div><div class='add'>+			.band_idx = phy-&gt;mt76-&gt;band_idx,</div><div class='add'>+		},</div><div class='ctx'> 	};</div><div class='add'>+	u32 bitmap;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;bitmap, he_obss_pd-&gt;bss_color_bitmap, sizeof(bitmap));</div><div class='add'>+	req.bitmap.color_l[req.ctrl.band_idx] = cpu_to_le32(bitmap);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;bitmap, he_obss_pd-&gt;bss_color_bitmap + 4, sizeof(bitmap));</div><div class='add'>+	req.bitmap.color_h[req.ctrl.band_idx] = cpu_to_le32(bitmap);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;bitmap, he_obss_pd-&gt;partial_bssid_bitmap, sizeof(bitmap));</div><div class='add'>+	req.bitmap.bssid_l[req.ctrl.band_idx] = cpu_to_le32(bitmap);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;bitmap, he_obss_pd-&gt;partial_bssid_bitmap + 4, sizeof(bitmap));</div><div class='add'>+	req.bitmap.bssid_h[req.ctrl.band_idx] = cpu_to_le32(bitmap);</div><div class='ctx'> </div><div class='ctx'> 	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(SET_SPR), &amp;req,</div><div class='ctx'> 				 sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mt7915_mcu_add_obss_spr(struct mt7915_phy *phy, struct ieee80211_vif *vif,</div><div class='add'>+			    struct ieee80211_he_obss_pd *he_obss_pd)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* enable firmware scene detection algorithms */</div><div class='add'>+	ret = mt7915_mcu_enable_obss_spr(phy, SPR_ENABLE_SD, sr_scene_detect);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* firmware dynamically adjusts PD threshold so skip manual control */</div><div class='add'>+	if (sr_scene_detect &amp;&amp; !he_obss_pd-&gt;enable)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* enable spatial reuse */</div><div class='add'>+	ret = mt7915_mcu_enable_obss_spr(phy, SPR_ENABLE, he_obss_pd-&gt;enable);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (sr_scene_detect || !he_obss_pd-&gt;enable)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = mt7915_mcu_enable_obss_spr(phy, SPR_ENABLE_TX, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* set SRG/non-SRG OBSS PD threshold */</div><div class='add'>+	ret = mt7915_mcu_set_obss_spr_pd(phy, he_obss_pd);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Set SR prohibit */</div><div class='add'>+	ret = mt7915_mcu_set_obss_spr_siga(phy, vif, he_obss_pd);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* set SRG BSS color/BSSID bitmap */</div><div class='add'>+	return mt7915_mcu_set_obss_spr_bitmap(phy, he_obss_pd);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mt7915_mcu_get_rx_rate(struct mt7915_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 			   struct ieee80211_sta *sta, struct rate_info *rate)</div><div class='ctx'> {</div><div class='hunk'>@@ -3707,7 +3862,7 @@ int mt7915_mcu_get_rx_rate(struct mt7915_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 		__le16 wcid;</div><div class='ctx'> 	} __packed req = {</div><div class='ctx'> 		.category = MCU_PHY_STATE_CONTENTION_RX_RATE,</div><div class='del'>-		.band = mvif-&gt;band_idx,</div><div class='add'>+		.band = mvif-&gt;mt76.band_idx,</div><div class='ctx'> 		.wcid = cpu_to_le16(msta-&gt;wcid.idx),</div><div class='ctx'> 	};</div><div class='ctx'> 	struct ieee80211_supported_band *sband;</div><div class='hunk'>@@ -3733,6 +3888,8 @@ int mt7915_mcu_get_rx_rate(struct mt7915_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 	case MT_PHY_TYPE_OFDM:</div><div class='ctx'> 		if (mphy-&gt;chandef.chan-&gt;band == NL80211_BAND_5GHZ)</div><div class='ctx'> 			sband = &amp;mphy-&gt;sband_5g.sband;</div><div class='add'>+		else if (mphy-&gt;chandef.chan-&gt;band == NL80211_BAND_6GHZ)</div><div class='add'>+			sband = &amp;mphy-&gt;sband_6g.sband;</div><div class='ctx'> 		else</div><div class='ctx'> 			sband = &amp;mphy-&gt;sband_2g.sband;</div><div class='ctx'> </div><div class='hunk'>@@ -3796,3 +3953,174 @@ out:</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int mt7915_mcu_update_bss_color(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+				struct cfg80211_he_bss_color *he_bss_color)</div><div class='add'>+{</div><div class='add'>+	int len = sizeof(struct sta_req_hdr) + sizeof(struct bss_info_color);</div><div class='add'>+	struct mt7915_vif *mvif = (struct mt7915_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct bss_info_color *bss_color;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	skb = __mt76_connac_mcu_alloc_sta_req(&amp;dev-&gt;mt76, &amp;mvif-&gt;mt76,</div><div class='add'>+					      NULL, len);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, BSS_INFO_BSS_COLOR,</div><div class='add'>+				      sizeof(*bss_color));</div><div class='add'>+	bss_color = (struct bss_info_color *)tlv;</div><div class='add'>+	bss_color-&gt;disable = !he_bss_color-&gt;enabled;</div><div class='add'>+	bss_color-&gt;color = he_bss_color-&gt;color;</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='add'>+				     MCU_EXT_CMD(BSS_INFO_UPDATE), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define TWT_AGRT_TRIGGER	BIT(0)</div><div class='add'>+#define TWT_AGRT_ANNOUNCE	BIT(1)</div><div class='add'>+#define TWT_AGRT_PROTECT	BIT(2)</div><div class='add'>+</div><div class='add'>+int mt7915_mcu_twt_agrt_update(struct mt7915_dev *dev,</div><div class='add'>+			       struct mt7915_vif *mvif,</div><div class='add'>+			       struct mt7915_twt_flow *flow,</div><div class='add'>+			       int cmd)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		u8 tbl_idx;</div><div class='add'>+		u8 cmd;</div><div class='add'>+		u8 own_mac_idx;</div><div class='add'>+		u8 flowid; /* 0xff for group id */</div><div class='add'>+		__le16 peer_id; /* specify the peer_id (msb=0)</div><div class='add'>+				 * or group_id (msb=1)</div><div class='add'>+				 */</div><div class='add'>+		u8 duration; /* 256 us */</div><div class='add'>+		u8 bss_idx;</div><div class='add'>+		__le64 start_tsf;</div><div class='add'>+		__le16 mantissa;</div><div class='add'>+		u8 exponent;</div><div class='add'>+		u8 is_ap;</div><div class='add'>+		u8 agrt_params;</div><div class='add'>+		u8 rsv[23];</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.tbl_idx = flow-&gt;table_id,</div><div class='add'>+		.cmd = cmd,</div><div class='add'>+		.own_mac_idx = mvif-&gt;mt76.omac_idx,</div><div class='add'>+		.flowid = flow-&gt;id,</div><div class='add'>+		.peer_id = cpu_to_le16(flow-&gt;wcid),</div><div class='add'>+		.duration = flow-&gt;duration,</div><div class='add'>+		.bss_idx = mvif-&gt;mt76.idx,</div><div class='add'>+		.start_tsf = cpu_to_le64(flow-&gt;tsf),</div><div class='add'>+		.mantissa = flow-&gt;mantissa,</div><div class='add'>+		.exponent = flow-&gt;exp,</div><div class='add'>+		.is_ap = true,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (flow-&gt;protection)</div><div class='add'>+		req.agrt_params |= TWT_AGRT_PROTECT;</div><div class='add'>+	if (!flow-&gt;flowtype)</div><div class='add'>+		req.agrt_params |= TWT_AGRT_ANNOUNCE;</div><div class='add'>+	if (flow-&gt;trigger)</div><div class='add'>+		req.agrt_params |= TWT_AGRT_TRIGGER;</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(TWT_AGRT_UPDATE),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7915_mcu_wed_wa_tx_stats(struct mt7915_dev *dev, u16 wlan_idx)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		__le32 cmd;</div><div class='add'>+		__le32 arg0;</div><div class='add'>+		__le32 arg1;</div><div class='add'>+		__le16 arg2;</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.cmd = cpu_to_le32(0x15),</div><div class='add'>+	};</div><div class='add'>+	struct mt7915_mcu_wa_tx_stat {</div><div class='add'>+		__le16 wcid;</div><div class='add'>+		u8 __rsv2[2];</div><div class='add'>+</div><div class='add'>+		/* tx_bytes is deprecated since WA byte counter uses u32,</div><div class='add'>+		 * which easily leads to overflow.</div><div class='add'>+		 */</div><div class='add'>+		__le32 tx_bytes;</div><div class='add'>+		__le32 tx_packets;</div><div class='add'>+	} __packed *res;</div><div class='add'>+	struct mt76_wcid *wcid;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret, len;</div><div class='add'>+	u16 ret_wcid;</div><div class='add'>+</div><div class='add'>+	if (is_mt7915(&amp;dev-&gt;mt76)) {</div><div class='add'>+		req.arg0 = cpu_to_le32(wlan_idx);</div><div class='add'>+		len = sizeof(req) - sizeof(req.arg2);</div><div class='add'>+	} else {</div><div class='add'>+		req.arg0 = cpu_to_le32(1);</div><div class='add'>+		req.arg2 = cpu_to_le16(wlan_idx);</div><div class='add'>+		len = sizeof(req);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76, MCU_WA_PARAM_CMD(QUERY),</div><div class='add'>+					&amp;req, len, true, &amp;skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!is_mt7915(&amp;dev-&gt;mt76))</div><div class='add'>+		skb_pull(skb, 4);</div><div class='add'>+</div><div class='add'>+	res = (struct mt7915_mcu_wa_tx_stat *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	ret_wcid = le16_to_cpu(res-&gt;wcid);</div><div class='add'>+	if (is_mt7915(&amp;dev-&gt;mt76))</div><div class='add'>+		ret_wcid &amp;= 0xff;</div><div class='add'>+</div><div class='add'>+	if (ret_wcid != wlan_idx) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	wcid = mt76_wcid_ptr(dev, wlan_idx);</div><div class='add'>+	if (wcid)</div><div class='add'>+		wcid-&gt;stats.tx_packets += le32_to_cpu(res-&gt;tx_packets);</div><div class='add'>+	else</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+out:</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7915_mcu_rf_regval(struct mt7915_dev *dev, u32 regidx, u32 *val, bool set)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		__le32 idx;</div><div class='add'>+		__le32 ofs;</div><div class='add'>+		__le32 data;</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.idx = cpu_to_le32(u32_get_bits(regidx, GENMASK(31, 24))),</div><div class='add'>+		.ofs = cpu_to_le32(u32_get_bits(regidx, GENMASK(23, 0))),</div><div class='add'>+		.data = set ? cpu_to_le32(*val) : 0,</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (set)</div><div class='add'>+		return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(RF_REG_ACCESS),</div><div class='add'>+					 &amp;req, sizeof(req), false);</div><div class='add'>+</div><div class='add'>+	ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76, MCU_EXT_QUERY(RF_REG_ACCESS),</div><div class='add'>+					&amp;req, sizeof(req), true, &amp;skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*val = le32_to_cpu(*(__le32 *)(skb-&gt;data + 8));</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h<br/>index 42582a66e42d..3af11a075a2f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/mcu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7915/mcu.h</a></div><div class='hunk'>@@ -1,50 +1,10 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MT7915_MCU_H</div><div class='ctx'> #define __MT7915_MCU_H</div><div class='ctx'> </div><div class='del'>-struct mt7915_mcu_txd {</div><div class='del'>-	__le32 txd[8];</div><div class='del'>-</div><div class='del'>-	__le16 len;</div><div class='del'>-	__le16 pq_id;</div><div class='del'>-</div><div class='del'>-	u8 cid;</div><div class='del'>-	u8 pkt_type;</div><div class='del'>-	u8 set_query; /* FW don't care */</div><div class='del'>-	u8 seq;</div><div class='del'>-</div><div class='del'>-	u8 uc_d2b0_rev;</div><div class='del'>-	u8 ext_cid;</div><div class='del'>-	u8 s2d_index;</div><div class='del'>-	u8 ext_cid_ack;</div><div class='del'>-</div><div class='del'>-	u32 reserved[5];</div><div class='del'>-} __packed __aligned(4);</div><div class='del'>-</div><div class='del'>-/* event table */</div><div class='del'>-enum {</div><div class='del'>-	MCU_EVENT_TARGET_ADDRESS_LEN = 0x01,</div><div class='del'>-	MCU_EVENT_FW_START = 0x01,</div><div class='del'>-	MCU_EVENT_GENERIC = 0x01,</div><div class='del'>-	MCU_EVENT_ACCESS_REG = 0x02,</div><div class='del'>-	MCU_EVENT_MT_PATCH_SEM = 0x04,</div><div class='del'>-	MCU_EVENT_CH_PRIVILEGE = 0x18,</div><div class='del'>-	MCU_EVENT_EXT = 0xed,</div><div class='del'>-	MCU_EVENT_RESTART_DL = 0xef,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ext event table */</div><div class='del'>-enum {</div><div class='del'>-	MCU_EXT_EVENT_PS_SYNC = 0x5,</div><div class='del'>-	MCU_EXT_EVENT_FW_LOG_2_HOST = 0x13,</div><div class='del'>-	MCU_EXT_EVENT_THERMAL_PROTECT = 0x22,</div><div class='del'>-	MCU_EXT_EVENT_ASSERT_DUMP = 0x23,</div><div class='del'>-	MCU_EXT_EVENT_RDD_REPORT = 0x3a,</div><div class='del'>-	MCU_EXT_EVENT_CSA_NOTIFY = 0x4f,</div><div class='del'>-	MCU_EXT_EVENT_RATE_REPORT = 0x87,</div><div class='del'>-};</div><div class='add'>+#include "../mt76_connac_mcu.h"</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	MCU_ATE_SET_TRX = 0x1,</div><div class='hunk'>@@ -53,23 +13,31 @@ enum {</div><div class='ctx'> 	MCU_ATE_CLEAN_TXQUEUE = 0x1c,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mt7915_mcu_rxd {</div><div class='del'>-	__le32 rxd[6];</div><div class='del'>-</div><div class='del'>-	__le16 len;</div><div class='del'>-	__le16 pkt_type_id;</div><div class='del'>-</div><div class='del'>-	u8 eid;</div><div class='del'>-	u8 seq;</div><div class='del'>-	__le16 __rsv;</div><div class='del'>-</div><div class='del'>-	u8 ext_eid;</div><div class='del'>-	u8 __rsv1[2];</div><div class='del'>-	u8 s2d_index;</div><div class='del'>-};</div><div class='add'>+struct mt7915_mcu_thermal_ctrl {</div><div class='add'>+	u8 ctrl_id;</div><div class='add'>+	u8 band_idx;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u8 protect_type; /* 1: duty admit, 2: radio off */</div><div class='add'>+			u8 trigger_type; /* 0: low, 1: high */</div><div class='add'>+		} __packed type;</div><div class='add'>+		struct {</div><div class='add'>+			u8 duty_level;	/* level 0~3 */</div><div class='add'>+			u8 duty_cycle;</div><div class='add'>+		} __packed duty;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7915_mcu_thermal_notify {</div><div class='add'>+	struct mt76_connac2_mcu_rxd_hdr rxd;</div><div class='add'>+</div><div class='add'>+	struct mt7915_mcu_thermal_ctrl ctrl;</div><div class='add'>+	__le32 temperature;</div><div class='add'>+	u8 rsv[8];</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct mt7915_mcu_csa_notify {</div><div class='del'>-	struct mt7915_mcu_rxd rxd;</div><div class='add'>+	struct mt76_connac2_mcu_rxd_hdr rxd;</div><div class='ctx'> </div><div class='ctx'> 	u8 omac_idx;</div><div class='ctx'> 	u8 csa_count;</div><div class='hunk'>@@ -77,10 +45,19 @@ struct mt7915_mcu_csa_notify {</div><div class='ctx'> 	u8 rsv;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct mt7915_mcu_rdd_report {</div><div class='del'>-	struct mt7915_mcu_rxd rxd;</div><div class='add'>+struct mt7915_mcu_bcc_notify {</div><div class='add'>+	struct mt76_connac2_mcu_rxd_hdr rxd;</div><div class='ctx'> </div><div class='ctx'> 	u8 band_idx;</div><div class='add'>+	u8 omac_idx;</div><div class='add'>+	u8 cca_count;</div><div class='add'>+	u8 rsv;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7915_mcu_rdd_report {</div><div class='add'>+	struct mt76_connac2_mcu_rxd_hdr rxd;</div><div class='add'>+</div><div class='add'>+	u8 rdd_idx;</div><div class='ctx'> 	u8 long_detected;</div><div class='ctx'> 	u8 constant_prf_detected;</div><div class='ctx'> 	u8 staggered_prf_detected;</div><div class='hunk'>@@ -129,6 +106,40 @@ struct mt7915_mcu_rdd_report {</div><div class='ctx'> 	} hw_pulse[32];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct mt7915_mcu_background_chain_ctrl {</div><div class='add'>+	u8 chan;		/* primary channel */</div><div class='add'>+	u8 central_chan;	/* central channel */</div><div class='add'>+	u8 bw;</div><div class='add'>+	u8 tx_stream;</div><div class='add'>+	u8 rx_stream;</div><div class='add'>+</div><div class='add'>+	u8 monitor_chan;	/* monitor channel */</div><div class='add'>+	u8 monitor_central_chan;/* monitor central channel */</div><div class='add'>+	u8 monitor_bw;</div><div class='add'>+	u8 monitor_tx_stream;</div><div class='add'>+	u8 monitor_rx_stream;</div><div class='add'>+</div><div class='add'>+	u8 scan_mode;		/* 0: ScanStop</div><div class='add'>+				 * 1: ScanStart</div><div class='add'>+				 * 2: ScanRunning</div><div class='add'>+				 */</div><div class='add'>+	u8 band_idx;		/* DBDC */</div><div class='add'>+	u8 monitor_scan_type;</div><div class='add'>+	u8 band;		/* 0: 2.4GHz, 1: 5GHz */</div><div class='add'>+	u8 rsv[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7915_mcu_sr_ctrl {</div><div class='add'>+	u8 action;</div><div class='add'>+	u8 argnum;</div><div class='add'>+	u8 band_idx;</div><div class='add'>+	u8 status;</div><div class='add'>+	u8 drop_ta_idx;</div><div class='add'>+	u8 sta_idx;	/* 256 sta */</div><div class='add'>+	u8 rsv[2];</div><div class='add'>+	__le32 val;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct mt7915_mcu_eeprom {</div><div class='ctx'> 	u8 buffer_mode;</div><div class='ctx'> 	u8 format;</div><div class='hunk'>@@ -141,41 +152,6 @@ struct mt7915_mcu_eeprom_info {</div><div class='ctx'> 	u8 data[16];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct mt7915_mcu_ra_info {</div><div class='del'>-	struct mt7915_mcu_rxd rxd;</div><div class='del'>-</div><div class='del'>-	__le32 event_id;</div><div class='del'>-	__le16 wlan_idx;</div><div class='del'>-	__le16 ru_idx;</div><div class='del'>-	__le16 direction;</div><div class='del'>-	__le16 dump_group;</div><div class='del'>-</div><div class='del'>-	__le32 suggest_rate;</div><div class='del'>-	__le32 min_rate;	/* for dynamic sounding */</div><div class='del'>-	__le32 max_rate;	/* for dynamic sounding */</div><div class='del'>-	__le32 init_rate_down_rate;</div><div class='del'>-</div><div class='del'>-	__le16 curr_rate;</div><div class='del'>-	__le16 init_rate_down_total;</div><div class='del'>-	__le16 init_rate_down_succ;</div><div class='del'>-	__le16 success;</div><div class='del'>-	__le16 attempts;</div><div class='del'>-</div><div class='del'>-	__le16 prev_rate;</div><div class='del'>-	__le16 prob_up_rate;</div><div class='del'>-	u8 no_rate_up_cnt;</div><div class='del'>-	u8 ppdu_cnt;</div><div class='del'>-	u8 gi;</div><div class='del'>-</div><div class='del'>-	u8 try_up_fail;</div><div class='del'>-	u8 try_up_total;</div><div class='del'>-	u8 suggest_wf;</div><div class='del'>-	u8 try_up_check;</div><div class='del'>-	u8 prob_up_period;</div><div class='del'>-	u8 prob_down_pending;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> struct mt7915_mcu_phy_rx_info {</div><div class='ctx'> 	u8 category;</div><div class='ctx'> 	u8 rate;</div><div class='hunk'>@@ -187,11 +163,33 @@ struct mt7915_mcu_phy_rx_info {</div><div class='ctx'> 	u8 bw;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define MT_RA_RATE_NSS			GENMASK(8, 6)</div><div class='del'>-#define MT_RA_RATE_MCS			GENMASK(3, 0)</div><div class='del'>-#define MT_RA_RATE_TX_MODE		GENMASK(12, 9)</div><div class='del'>-#define MT_RA_RATE_DCM_EN		BIT(4)</div><div class='del'>-#define MT_RA_RATE_BW			GENMASK(14, 13)</div><div class='add'>+struct mt7915_mcu_mib {</div><div class='add'>+	__le32 band;</div><div class='add'>+	__le32 offs;</div><div class='add'>+	__le64 data;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum mt7915_chan_mib_offs {</div><div class='add'>+	/* mt7915 */</div><div class='add'>+	MIB_TX_TIME = 81,</div><div class='add'>+	MIB_RX_TIME,</div><div class='add'>+	MIB_OBSS_AIRTIME = 86,</div><div class='add'>+	MIB_NON_WIFI_TIME,</div><div class='add'>+	MIB_TXOP_INIT_COUNT,</div><div class='add'>+</div><div class='add'>+	/* mt7916 */</div><div class='add'>+	MIB_TX_TIME_V2 = 6,</div><div class='add'>+	MIB_RX_TIME_V2 = 8,</div><div class='add'>+	MIB_OBSS_AIRTIME_V2 = 490,</div><div class='add'>+	MIB_NON_WIFI_TIME_V2</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt7915_mcu_txpower_sku {</div><div class='add'>+	u8 format_id;</div><div class='add'>+	u8 limit_type;</div><div class='add'>+	u8 band_idx;</div><div class='add'>+	s8 txpower_sku[MT7915_SKU_RATE_NUM];</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct edca {</div><div class='ctx'> 	u8 queue;</div><div class='hunk'>@@ -211,82 +209,62 @@ struct mt7915_mcu_tx {</div><div class='ctx'> 	struct edca edca[IEEE80211_NUM_ACS];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct mt7915_mcu_muru_stats {</div><div class='add'>+	__le32 event_id;</div><div class='add'>+	struct {</div><div class='add'>+		__le32 cck_cnt;</div><div class='add'>+		__le32 ofdm_cnt;</div><div class='add'>+		__le32 htmix_cnt;</div><div class='add'>+		__le32 htgf_cnt;</div><div class='add'>+		__le32 vht_su_cnt;</div><div class='add'>+		__le32 vht_2mu_cnt;</div><div class='add'>+		__le32 vht_3mu_cnt;</div><div class='add'>+		__le32 vht_4mu_cnt;</div><div class='add'>+		__le32 he_su_cnt;</div><div class='add'>+		__le32 he_ext_su_cnt;</div><div class='add'>+		__le32 he_2ru_cnt;</div><div class='add'>+		__le32 he_2mu_cnt;</div><div class='add'>+		__le32 he_3ru_cnt;</div><div class='add'>+		__le32 he_3mu_cnt;</div><div class='add'>+		__le32 he_4ru_cnt;</div><div class='add'>+		__le32 he_4mu_cnt;</div><div class='add'>+		__le32 he_5to8ru_cnt;</div><div class='add'>+		__le32 he_9to16ru_cnt;</div><div class='add'>+		__le32 he_gtr16ru_cnt;</div><div class='add'>+	} dl;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		__le32 hetrig_su_cnt;</div><div class='add'>+		__le32 hetrig_2ru_cnt;</div><div class='add'>+		__le32 hetrig_3ru_cnt;</div><div class='add'>+		__le32 hetrig_4ru_cnt;</div><div class='add'>+		__le32 hetrig_5to8ru_cnt;</div><div class='add'>+		__le32 hetrig_9to16ru_cnt;</div><div class='add'>+		__le32 hetrig_gtr16ru_cnt;</div><div class='add'>+		__le32 hetrig_2mu_cnt;</div><div class='add'>+		__le32 hetrig_3mu_cnt;</div><div class='add'>+		__le32 hetrig_4mu_cnt;</div><div class='add'>+	} ul;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define WMM_AIFS_SET		BIT(0)</div><div class='ctx'> #define WMM_CW_MIN_SET		BIT(1)</div><div class='ctx'> #define WMM_CW_MAX_SET		BIT(2)</div><div class='ctx'> #define WMM_TXOP_SET		BIT(3)</div><div class='ctx'> #define WMM_PARAM_SET		GENMASK(3, 0)</div><div class='ctx'> </div><div class='del'>-#define MCU_PQ_ID(p, q)			(((p) &lt;&lt; 15) | ((q) &lt;&lt; 10))</div><div class='del'>-#define MCU_PKT_ID			0xa0</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	MCU_Q_QUERY,</div><div class='del'>-	MCU_Q_SET,</div><div class='del'>-	MCU_Q_RESERVED,</div><div class='del'>-	MCU_Q_NA</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	MCU_S2D_H2N,</div><div class='del'>-	MCU_S2D_C2N,</div><div class='del'>-	MCU_S2D_H2C,</div><div class='del'>-	MCU_S2D_H2CN</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define __MCU_CMD_FIELD_ID	GENMASK(7, 0)</div><div class='del'>-#define __MCU_CMD_FIELD_EXT_ID	GENMASK(15, 8)</div><div class='del'>-#define __MCU_CMD_FIELD_QUERY	BIT(16)</div><div class='del'>-#define __MCU_CMD_FIELD_WA	BIT(17)</div><div class='del'>-</div><div class='ctx'> enum {</div><div class='del'>-	MCU_CMD_TARGET_ADDRESS_LEN_REQ = 0x01,</div><div class='del'>-	MCU_CMD_FW_START_REQ = 0x02,</div><div class='del'>-	MCU_CMD_INIT_ACCESS_REG = 0x3,</div><div class='del'>-	MCU_CMD_NIC_POWER_CTRL = 0x4,</div><div class='del'>-	MCU_CMD_PATCH_START_REQ = 0x05,</div><div class='del'>-	MCU_CMD_PATCH_FINISH_REQ = 0x07,</div><div class='del'>-	MCU_CMD_PATCH_SEM_CONTROL = 0x10,</div><div class='del'>-	MCU_CMD_WA_PARAM = 0xC4,</div><div class='del'>-	MCU_CMD_EXT_CID = 0xED,</div><div class='del'>-	MCU_CMD_FW_SCATTER = 0xEE,</div><div class='del'>-	MCU_CMD_RESTART_DL_REQ = 0xEF,</div><div class='add'>+	MCU_FW_LOG_WM,</div><div class='add'>+	MCU_FW_LOG_WA,</div><div class='add'>+	MCU_FW_LOG_TO_HOST,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	MCU_EXT_CMD_EFUSE_ACCESS = 0x01,</div><div class='del'>-	MCU_EXT_CMD_RF_TEST = 0x04,</div><div class='del'>-	MCU_EXT_CMD_PM_STATE_CTRL = 0x07,</div><div class='del'>-	MCU_EXT_CMD_CHANNEL_SWITCH = 0x08,</div><div class='del'>-	MCU_EXT_CMD_FW_LOG_2_HOST = 0x13,</div><div class='del'>-	MCU_EXT_CMD_TXBF_ACTION = 0x1e,</div><div class='del'>-	MCU_EXT_CMD_EFUSE_BUFFER_MODE = 0x21,</div><div class='del'>-	MCU_EXT_CMD_STA_REC_UPDATE = 0x25,</div><div class='del'>-	MCU_EXT_CMD_BSS_INFO_UPDATE = 0x26,</div><div class='del'>-	MCU_EXT_CMD_EDCA_UPDATE = 0x27,</div><div class='del'>-	MCU_EXT_CMD_DEV_INFO_UPDATE = 0x2A,</div><div class='del'>-	MCU_EXT_CMD_THERMAL_CTRL = 0x2c,</div><div class='del'>-	MCU_EXT_CMD_WTBL_UPDATE = 0x32,</div><div class='del'>-	MCU_EXT_CMD_SET_DRR_CTRL = 0x36,</div><div class='del'>-	MCU_EXT_CMD_SET_RDD_CTRL = 0x3a,</div><div class='del'>-	MCU_EXT_CMD_ATE_CTRL = 0x3d,</div><div class='del'>-	MCU_EXT_CMD_PROTECT_CTRL = 0x3e,</div><div class='del'>-	MCU_EXT_CMD_MAC_INIT_CTRL = 0x46,</div><div class='del'>-	MCU_EXT_CMD_RX_HDR_TRANS = 0x47,</div><div class='del'>-	MCU_EXT_CMD_MUAR_UPDATE = 0x48,</div><div class='del'>-	MCU_EXT_CMD_SET_RX_PATH = 0x4e,</div><div class='del'>-	MCU_EXT_CMD_TX_POWER_FEATURE_CTRL = 0x58,</div><div class='del'>-	MCU_EXT_CMD_MWDS_SUPPORT = 0x80,</div><div class='del'>-	MCU_EXT_CMD_SET_SER_TRIGGER = 0x81,</div><div class='del'>-	MCU_EXT_CMD_SCS_CTRL = 0x82,</div><div class='del'>-	MCU_EXT_CMD_RATE_CTRL = 0x87,</div><div class='del'>-	MCU_EXT_CMD_FW_DBG_CTRL = 0x95,</div><div class='del'>-	MCU_EXT_CMD_SET_RDD_TH = 0x9d,</div><div class='del'>-	MCU_EXT_CMD_SET_SPR = 0xa8,</div><div class='del'>-	MCU_EXT_CMD_GROUP_PRE_CAL_INFO = 0xab,</div><div class='del'>-	MCU_EXT_CMD_DPD_PRE_CAL_INFO = 0xac,</div><div class='del'>-	MCU_EXT_CMD_PHY_STAT_INFO = 0xad,</div><div class='add'>+	MCU_TWT_AGRT_ADD,</div><div class='add'>+	MCU_TWT_AGRT_MODIFY,</div><div class='add'>+	MCU_TWT_AGRT_DELETE,</div><div class='add'>+	MCU_TWT_AGRT_TEARDOWN,</div><div class='add'>+	MCU_TWT_AGRT_GET_TSF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -297,167 +275,19 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='add'>+	MCU_WA_PARAM_PDMA_RX = 0x04,</div><div class='add'>+	MCU_WA_PARAM_CPU_UTIL = 0x0b,</div><div class='ctx'> 	MCU_WA_PARAM_RED = 0x0e,</div><div class='add'>+	MCU_WA_PARAM_RED_SETTING = 0x40,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define MCU_CMD(_t)		FIELD_PREP(__MCU_CMD_FIELD_ID, MCU_CMD_##_t)</div><div class='del'>-#define MCU_EXT_CMD(_t)		(MCU_CMD(EXT_CID) | \</div><div class='del'>-				 FIELD_PREP(__MCU_CMD_FIELD_EXT_ID, \</div><div class='del'>-					    MCU_EXT_CMD_##_t))</div><div class='del'>-#define MCU_EXT_QUERY(_t)	(MCU_EXT_CMD(_t) | __MCU_CMD_FIELD_QUERY)</div><div class='del'>-</div><div class='del'>-#define MCU_WA_CMD(_t)		(MCU_CMD(_t) | __MCU_CMD_FIELD_WA)</div><div class='del'>-#define MCU_WA_EXT_CMD(_t)	(MCU_EXT_CMD(_t) | __MCU_CMD_FIELD_WA)</div><div class='del'>-#define MCU_WA_PARAM_CMD(_t)	(MCU_WA_CMD(WA_PARAM) | \</div><div class='del'>-				 FIELD_PREP(__MCU_CMD_FIELD_EXT_ID, \</div><div class='del'>-					    MCU_WA_PARAM_CMD_##_t))</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	PATCH_SEM_RELEASE,</div><div class='del'>-	PATCH_SEM_GET</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	PATCH_NOT_DL_SEM_FAIL,</div><div class='del'>-	PATCH_IS_DL,</div><div class='del'>-	PATCH_NOT_DL_SEM_SUCCESS,</div><div class='del'>-	PATCH_REL_SEM_SUCCESS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	FW_STATE_INITIAL,</div><div class='del'>-	FW_STATE_FW_DOWNLOAD,</div><div class='del'>-	FW_STATE_NORMAL_OPERATION,</div><div class='del'>-	FW_STATE_NORMAL_TRX,</div><div class='del'>-	FW_STATE_WACPU_RDY        = 7</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	EE_MODE_EFUSE,</div><div class='del'>-	EE_MODE_BUFFER,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	EE_FORMAT_BIN,</div><div class='del'>-	EE_FORMAT_WHOLE,</div><div class='del'>-	EE_FORMAT_MULTIPLE,</div><div class='add'>+enum mcu_mmps_mode {</div><div class='add'>+	MCU_MMPS_STATIC,</div><div class='add'>+	MCU_MMPS_DYNAMIC,</div><div class='add'>+	MCU_MMPS_RSV,</div><div class='add'>+	MCU_MMPS_DISABLE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum {</div><div class='del'>-	MCU_PHY_STATE_TX_RATE,</div><div class='del'>-	MCU_PHY_STATE_RX_RATE,</div><div class='del'>-	MCU_PHY_STATE_RSSI,</div><div class='del'>-	MCU_PHY_STATE_CONTENTION_RX_RATE,</div><div class='del'>-	MCU_PHY_STATE_OFDMLQ_CNINFO,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define STA_TYPE_STA			BIT(0)</div><div class='del'>-#define STA_TYPE_AP			BIT(1)</div><div class='del'>-#define STA_TYPE_ADHOC			BIT(2)</div><div class='del'>-#define STA_TYPE_WDS			BIT(4)</div><div class='del'>-#define STA_TYPE_BC			BIT(5)</div><div class='del'>-</div><div class='del'>-#define NETWORK_INFRA			BIT(16)</div><div class='del'>-#define NETWORK_P2P			BIT(17)</div><div class='del'>-#define NETWORK_IBSS			BIT(18)</div><div class='del'>-#define NETWORK_WDS			BIT(21)</div><div class='del'>-</div><div class='del'>-#define CONNECTION_INFRA_STA		(STA_TYPE_STA | NETWORK_INFRA)</div><div class='del'>-#define CONNECTION_INFRA_AP		(STA_TYPE_AP | NETWORK_INFRA)</div><div class='del'>-#define CONNECTION_P2P_GC		(STA_TYPE_STA | NETWORK_P2P)</div><div class='del'>-#define CONNECTION_P2P_GO		(STA_TYPE_AP | NETWORK_P2P)</div><div class='del'>-#define CONNECTION_IBSS_ADHOC		(STA_TYPE_ADHOC | NETWORK_IBSS)</div><div class='del'>-#define CONNECTION_WDS			(STA_TYPE_WDS | NETWORK_WDS)</div><div class='del'>-#define CONNECTION_INFRA_BC		(STA_TYPE_BC | NETWORK_INFRA)</div><div class='del'>-</div><div class='del'>-#define CONN_STATE_DISCONNECT		0</div><div class='del'>-#define CONN_STATE_CONNECT		1</div><div class='del'>-#define CONN_STATE_PORT_SECURE		2</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	DEV_INFO_ACTIVE,</div><div class='del'>-	DEV_INFO_MAX_NUM</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	SCS_SEND_DATA,</div><div class='del'>-	SCS_SET_MANUAL_PD_TH,</div><div class='del'>-	SCS_CONFIG,</div><div class='del'>-	SCS_ENABLE,</div><div class='del'>-	SCS_SHOW_INFO,</div><div class='del'>-	SCS_GET_GLO_ADDR,</div><div class='del'>-	SCS_GET_GLO_ADDR_EVENT,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CMD_CBW_20MHZ = IEEE80211_STA_RX_BW_20,</div><div class='del'>-	CMD_CBW_40MHZ = IEEE80211_STA_RX_BW_40,</div><div class='del'>-	CMD_CBW_80MHZ = IEEE80211_STA_RX_BW_80,</div><div class='del'>-	CMD_CBW_160MHZ = IEEE80211_STA_RX_BW_160,</div><div class='del'>-	CMD_CBW_10MHZ,</div><div class='del'>-	CMD_CBW_5MHZ,</div><div class='del'>-	CMD_CBW_8080MHZ,</div><div class='del'>-</div><div class='del'>-	CMD_HE_MCS_BW80 = 0,</div><div class='del'>-	CMD_HE_MCS_BW160,</div><div class='del'>-	CMD_HE_MCS_BW8080,</div><div class='del'>-	CMD_HE_MCS_BW_NUM</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct tlv {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct bss_info_omac {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	u8 hw_bss_idx;</div><div class='del'>-	u8 omac_idx;</div><div class='del'>-	u8 band_idx;</div><div class='del'>-	u8 rsv0;</div><div class='del'>-	__le32 conn_type;</div><div class='del'>-	u32 rsv1;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct bss_info_basic {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	__le32 network_type;</div><div class='del'>-	u8 active;</div><div class='del'>-	u8 rsv0;</div><div class='del'>-	__le16 bcn_interval;</div><div class='del'>-	u8 bssid[ETH_ALEN];</div><div class='del'>-	u8 wmm_idx;</div><div class='del'>-	u8 dtim_period;</div><div class='del'>-	u8 bmc_wcid_lo;</div><div class='del'>-	u8 cipher;</div><div class='del'>-	u8 phy_mode;</div><div class='del'>-	u8 max_bssid;	/* max BSSID. range: 1 ~ 8, 0: MBSSID disabled */</div><div class='del'>-	u8 non_tx_bssid;/* non-transmitted BSSID, 0: transmitted BSSID */</div><div class='del'>-	u8 bmc_wcid_hi;	/* high Byte and version */</div><div class='del'>-	u8 rsv[2];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct bss_info_rf_ch {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	u8 pri_ch;</div><div class='del'>-	u8 center_ch0;</div><div class='del'>-	u8 center_ch1;</div><div class='del'>-	u8 bw;</div><div class='del'>-	u8 he_ru26_block;	/* 1: don't send HETB in RU26, 0: allow */</div><div class='del'>-	u8 he_all_disable;	/* 1: disallow all HETB, 0: allow */</div><div class='del'>-	u8 rsv[2];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct bss_info_ext_bss {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	__le32 mbss_tsf_offset; /* in unit of us */</div><div class='del'>-	u8 rsv[8];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='ctx'> struct bss_info_bmc_rate {</div><div class='ctx'> 	__le16 tag;</div><div class='ctx'> 	__le16 len;</div><div class='hunk'>@@ -507,6 +337,14 @@ struct bss_info_hw_amsdu {</div><div class='ctx'> 	u8 rsv;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct bss_info_color {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 disable;</div><div class='add'>+	u8 color;</div><div class='add'>+	u8 rsv[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct bss_info_he {</div><div class='ctx'> 	__le16 tag;</div><div class='ctx'> 	__le16 len;</div><div class='hunk'>@@ -525,14 +363,7 @@ struct bss_info_bcn {</div><div class='ctx'> 	__le16 sub_ntlv;</div><div class='ctx'> } __packed __aligned(4);</div><div class='ctx'> </div><div class='del'>-struct bss_info_bcn_csa {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	u8 cnt;</div><div class='del'>-	u8 rsv[3];</div><div class='del'>-} __packed __aligned(4);</div><div class='del'>-</div><div class='del'>-struct bss_info_bcn_bcc {</div><div class='add'>+struct bss_info_bcn_cntdwn {</div><div class='ctx'> 	__le16 tag;</div><div class='ctx'> 	__le16 len;</div><div class='ctx'> 	u8 cnt;</div><div class='hunk'>@@ -557,393 +388,36 @@ struct bss_info_bcn_cont {</div><div class='ctx'> 	__le16 pkt_len;</div><div class='ctx'> } __packed __aligned(4);</div><div class='ctx'> </div><div class='add'>+struct bss_info_inband_discovery {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 tx_type;</div><div class='add'>+	u8 tx_mode;</div><div class='add'>+	u8 tx_interval;</div><div class='add'>+	u8 enable;</div><div class='add'>+	__le16 rsv;</div><div class='add'>+	__le16 prob_rsp_len;</div><div class='add'>+} __packed __aligned(4);</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	BSS_INFO_BCN_CSA,</div><div class='ctx'> 	BSS_INFO_BCN_BCC,</div><div class='ctx'> 	BSS_INFO_BCN_MBSSID,</div><div class='ctx'> 	BSS_INFO_BCN_CONTENT,</div><div class='add'>+	BSS_INFO_BCN_DISCOV,</div><div class='ctx'> 	BSS_INFO_BCN_MAX</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	BSS_INFO_OMAC,</div><div class='del'>-	BSS_INFO_BASIC,</div><div class='del'>-	BSS_INFO_RF_CH,		/* optional, for BT/LTE coex */</div><div class='del'>-	BSS_INFO_PM,		/* sta only */</div><div class='del'>-	BSS_INFO_UAPSD,		/* sta only */</div><div class='del'>-	BSS_INFO_ROAM_DETECT,	/* obsoleted */</div><div class='del'>-	BSS_INFO_LQ_RM,		/* obsoleted */</div><div class='del'>-	BSS_INFO_EXT_BSS,</div><div class='del'>-	BSS_INFO_BMC_RATE,	/* for bmc rate control in CR4 */</div><div class='del'>-	BSS_INFO_SYNC_MODE,	/* obsoleted */</div><div class='del'>-	BSS_INFO_RA,</div><div class='del'>-	BSS_INFO_HW_AMSDU,</div><div class='del'>-	BSS_INFO_BSS_COLOR,</div><div class='del'>-	BSS_INFO_HE_BASIC,</div><div class='del'>-	BSS_INFO_PROTECT_INFO,</div><div class='del'>-	BSS_INFO_OFFLOAD,</div><div class='del'>-	BSS_INFO_11V_MBSSID,</div><div class='del'>-	BSS_INFO_MAX_NUM</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	WTBL_RESET_AND_SET = 1,</div><div class='del'>-	WTBL_SET,</div><div class='del'>-	WTBL_QUERY,</div><div class='del'>-	WTBL_RESET_ALL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct wtbl_req_hdr {</div><div class='del'>-	u8 wlan_idx_lo;</div><div class='del'>-	u8 operation;</div><div class='del'>-	__le16 tlv_num;</div><div class='del'>-	u8 wlan_idx_hi;</div><div class='del'>-	u8 rsv[3];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct wtbl_generic {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	u8 peer_addr[ETH_ALEN];</div><div class='del'>-	u8 muar_idx;</div><div class='del'>-	u8 skip_tx;</div><div class='del'>-	u8 cf_ack;</div><div class='del'>-	u8 qos;</div><div class='del'>-	u8 mesh;</div><div class='del'>-	u8 adm;</div><div class='del'>-	__le16 partial_aid;</div><div class='del'>-	u8 baf_en;</div><div class='del'>-	u8 aad_om;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct wtbl_rx {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	u8 rcid;</div><div class='del'>-	u8 rca1;</div><div class='del'>-	u8 rca2;</div><div class='del'>-	u8 rv;</div><div class='del'>-	u8 rsv[4];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct wtbl_ht {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	u8 ht;</div><div class='del'>-	u8 ldpc;</div><div class='del'>-	u8 af;</div><div class='del'>-	u8 mm;</div><div class='del'>-	u8 rsv[4];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct wtbl_vht {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	u8 ldpc;</div><div class='del'>-	u8 dyn_bw;</div><div class='del'>-	u8 vht;</div><div class='del'>-	u8 txop_ps;</div><div class='del'>-	u8 rsv[4];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct wtbl_hdr_trans {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	u8 to_ds;</div><div class='del'>-	u8 from_ds;</div><div class='del'>-	u8 no_rx_trans;</div><div class='del'>-	u8 _rsv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	MT_BA_TYPE_INVALID,</div><div class='del'>-	MT_BA_TYPE_ORIGINATOR,</div><div class='del'>-	MT_BA_TYPE_RECIPIENT</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	RST_BA_MAC_TID_MATCH,</div><div class='del'>-	RST_BA_MAC_MATCH,</div><div class='del'>-	RST_BA_NO_MATCH</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct wtbl_ba {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	/* common */</div><div class='del'>-	u8 tid;</div><div class='del'>-	u8 ba_type;</div><div class='del'>-	u8 rsv0[2];</div><div class='del'>-	/* originator only */</div><div class='del'>-	__le16 sn;</div><div class='del'>-	u8 ba_en;</div><div class='del'>-	u8 ba_winsize_idx;</div><div class='del'>-	__le16 ba_winsize;</div><div class='del'>-	/* recipient only */</div><div class='del'>-	u8 peer_addr[ETH_ALEN];</div><div class='del'>-	u8 rst_ba_tid;</div><div class='del'>-	u8 rst_ba_sel;</div><div class='del'>-	u8 rst_ba_sb;</div><div class='del'>-	u8 band_idx;</div><div class='del'>-	u8 rsv1[4];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct wtbl_smps {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	u8 smps;</div><div class='del'>-	u8 rsv[3];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	WTBL_GENERIC,</div><div class='del'>-	WTBL_RX,</div><div class='del'>-	WTBL_HT,</div><div class='del'>-	WTBL_VHT,</div><div class='del'>-	WTBL_PEER_PS,		/* not used */</div><div class='del'>-	WTBL_TX_PS,</div><div class='del'>-	WTBL_HDR_TRANS,</div><div class='del'>-	WTBL_SEC_KEY,</div><div class='del'>-	WTBL_BA,</div><div class='del'>-	WTBL_RDG,		/* obsoleted */</div><div class='del'>-	WTBL_PROTECT,		/* not used */</div><div class='del'>-	WTBL_CLEAR,		/* not used */</div><div class='del'>-	WTBL_BF,</div><div class='del'>-	WTBL_SMPS,</div><div class='del'>-	WTBL_RAW_DATA,		/* debug only */</div><div class='del'>-	WTBL_PN,</div><div class='del'>-	WTBL_SPE,</div><div class='del'>-	WTBL_MAX_NUM</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct sta_ntlv_hdr {</div><div class='del'>-	u8 rsv[2];</div><div class='del'>-	__le16 tlv_num;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct sta_req_hdr {</div><div class='del'>-	u8 bss_idx;</div><div class='del'>-	u8 wlan_idx_lo;</div><div class='del'>-	__le16 tlv_num;</div><div class='del'>-	u8 is_tlv_append;</div><div class='del'>-	u8 muar_idx;</div><div class='del'>-	u8 wlan_idx_hi;</div><div class='del'>-	u8 rsv;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct sta_rec_basic {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	__le32 conn_type;</div><div class='del'>-	u8 conn_state;</div><div class='del'>-	u8 qos;</div><div class='del'>-	__le16 aid;</div><div class='del'>-	u8 peer_addr[ETH_ALEN];</div><div class='del'>-	__le16 extra_info;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct sta_rec_ht {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	__le16 ht_cap;</div><div class='del'>-	u16 rsv;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct sta_rec_vht {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	__le32 vht_cap;</div><div class='del'>-	__le16 vht_rx_mcs_map;</div><div class='del'>-	__le16 vht_tx_mcs_map;</div><div class='del'>-	u8 rts_bw_sig;</div><div class='del'>-	u8 rsv[3];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct sta_rec_uapsd {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	u8 dac_map;</div><div class='del'>-	u8 tac_map;</div><div class='del'>-	u8 max_sp;</div><div class='del'>-	u8 rsv0;</div><div class='del'>-	__le16 listen_interval;</div><div class='del'>-	u8 rsv1[2];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct sta_rec_muru {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-</div><div class='del'>-	struct {</div><div class='del'>-		bool ofdma_dl_en;</div><div class='del'>-		bool ofdma_ul_en;</div><div class='del'>-		bool mimo_dl_en;</div><div class='del'>-		bool mimo_ul_en;</div><div class='del'>-		u8 rsv[4];</div><div class='del'>-	} cfg;</div><div class='del'>-</div><div class='del'>-	struct {</div><div class='del'>-		u8 punc_pream_rx;</div><div class='del'>-		bool he_20m_in_40m_2g;</div><div class='del'>-		bool he_20m_in_160m;</div><div class='del'>-		bool he_80m_in_160m;</div><div class='del'>-		bool lt16_sigb;</div><div class='del'>-		bool rx_su_comp_sigb;</div><div class='del'>-		bool rx_su_non_comp_sigb;</div><div class='del'>-		u8 rsv;</div><div class='del'>-	} ofdma_dl;</div><div class='del'>-</div><div class='del'>-	struct {</div><div class='del'>-		u8 t_frame_dur;</div><div class='del'>-		u8 mu_cascading;</div><div class='del'>-		u8 uo_ra;</div><div class='del'>-		u8 he_2x996_tone;</div><div class='del'>-		u8 rx_t_frame_11ac;</div><div class='del'>-		u8 rsv[3];</div><div class='del'>-	} ofdma_ul;</div><div class='del'>-</div><div class='del'>-	struct {</div><div class='del'>-		bool vht_mu_bfee;</div><div class='del'>-		bool partial_bw_dl_mimo;</div><div class='del'>-		u8 rsv[2];</div><div class='del'>-	} mimo_dl;</div><div class='del'>-</div><div class='del'>-	struct {</div><div class='del'>-		bool full_ul_mimo;</div><div class='del'>-		bool partial_ul_mimo;</div><div class='del'>-		u8 rsv[2];</div><div class='del'>-	} mimo_ul;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct sta_rec_he {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-</div><div class='del'>-	__le32 he_cap;</div><div class='del'>-</div><div class='del'>-	u8 t_frame_dur;</div><div class='del'>-	u8 max_ampdu_exp;</div><div class='del'>-	u8 bw_set;</div><div class='del'>-	u8 device_class;</div><div class='del'>-	u8 dcm_tx_mode;</div><div class='del'>-	u8 dcm_tx_max_nss;</div><div class='del'>-	u8 dcm_rx_mode;</div><div class='del'>-	u8 dcm_rx_max_nss;</div><div class='del'>-	u8 dcm_max_ru;</div><div class='del'>-	u8 punc_pream_rx;</div><div class='del'>-	u8 pkt_ext;</div><div class='del'>-	u8 rsv1;</div><div class='del'>-</div><div class='del'>-	__le16 max_nss_mcs[CMD_HE_MCS_BW_NUM];</div><div class='del'>-</div><div class='del'>-	u8 rsv2[2];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct sta_rec_ba {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	u8 tid;</div><div class='del'>-	u8 ba_type;</div><div class='del'>-	u8 amsdu;</div><div class='del'>-	u8 ba_en;</div><div class='del'>-	__le16 ssn;</div><div class='del'>-	__le16 winsize;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct sta_rec_amsdu {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	u8 max_amsdu_num;</div><div class='del'>-	u8 max_mpdu_size;</div><div class='del'>-	u8 amsdu_en;</div><div class='del'>-	u8 rsv;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct sec_key {</div><div class='del'>-	u8 cipher_id;</div><div class='del'>-	u8 cipher_len;</div><div class='del'>-	u8 key_id;</div><div class='del'>-	u8 key_len;</div><div class='del'>-	u8 key[32];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct sta_rec_sec {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	u8 add;</div><div class='del'>-	u8 n_cipher;</div><div class='del'>-	u8 rsv[2];</div><div class='del'>-</div><div class='del'>-	struct sec_key key[2];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct ra_phy {</div><div class='del'>-	u8 type;</div><div class='del'>-	u8 flag;</div><div class='del'>-	u8 stbc;</div><div class='del'>-	u8 sgi;</div><div class='del'>-	u8 bw;</div><div class='del'>-	u8 ldpc;</div><div class='del'>-	u8 mcs;</div><div class='del'>-	u8 nss;</div><div class='del'>-	u8 he_ltf;</div><div class='add'>+	RATE_PARAM_FIXED = 3,</div><div class='add'>+	RATE_PARAM_MMPS_UPDATE = 5,</div><div class='add'>+	RATE_PARAM_FIXED_HE_LTF = 7,</div><div class='add'>+	RATE_PARAM_FIXED_MCS,</div><div class='add'>+	RATE_PARAM_FIXED_GI = 11,</div><div class='add'>+	RATE_PARAM_AUTO = 20,</div><div class='add'>+	RATE_PARAM_SPE_UPDATE = 22,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct sta_rec_ra {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-</div><div class='del'>-	u8 valid;</div><div class='del'>-	u8 auto_rate;</div><div class='del'>-	u8 phy_mode;</div><div class='del'>-	u8 channel;</div><div class='del'>-	u8 bw;</div><div class='del'>-	u8 disable_cck;</div><div class='del'>-	u8 ht_mcs32;</div><div class='del'>-	u8 ht_gf;</div><div class='del'>-	u8 ht_mcs[4];</div><div class='del'>-	u8 mmps_mode;</div><div class='del'>-	u8 gband_256;</div><div class='del'>-	u8 af;</div><div class='del'>-	u8 auth_wapi_mode;</div><div class='del'>-	u8 rate_len;</div><div class='del'>-</div><div class='del'>-	u8 supp_mode;</div><div class='del'>-	u8 supp_cck_rate;</div><div class='del'>-	u8 supp_ofdm_rate;</div><div class='del'>-	__le32 supp_ht_mcs;</div><div class='del'>-	__le16 supp_vht_mcs[4];</div><div class='del'>-</div><div class='del'>-	u8 op_mode;</div><div class='del'>-	u8 op_vht_chan_width;</div><div class='del'>-	u8 op_vht_rx_nss;</div><div class='del'>-	u8 op_vht_rx_nss_type;</div><div class='del'>-</div><div class='del'>-	__le32 sta_status;</div><div class='del'>-</div><div class='del'>-	struct ra_phy phy;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct sta_rec_ra_fixed {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-</div><div class='del'>-	__le32 field;</div><div class='del'>-	u8 op_mode;</div><div class='del'>-	u8 op_vht_chan_width;</div><div class='del'>-	u8 op_vht_rx_nss;</div><div class='del'>-	u8 op_vht_rx_nss_type;</div><div class='del'>-</div><div class='del'>-	struct ra_phy phy;</div><div class='del'>-</div><div class='del'>-	u8 spe_en;</div><div class='del'>-	u8 short_preamble;</div><div class='del'>-	u8 is_5g;</div><div class='del'>-	u8 mmps_mode;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define RATE_PARAM_FIXED		3</div><div class='del'>-#define RATE_PARAM_AUTO			20</div><div class='ctx'> #define RATE_CFG_MCS			GENMASK(3, 0)</div><div class='ctx'> #define RATE_CFG_NSS			GENMASK(7, 4)</div><div class='ctx'> #define RATE_CFG_GI			GENMASK(11, 8)</div><div class='hunk'>@@ -951,145 +425,91 @@ struct sta_rec_ra_fixed {</div><div class='ctx'> #define RATE_CFG_STBC			GENMASK(19, 16)</div><div class='ctx'> #define RATE_CFG_LDPC			GENMASK(23, 20)</div><div class='ctx'> #define RATE_CFG_PHY_TYPE		GENMASK(27, 24)</div><div class='add'>+#define RATE_CFG_HE_LTF			GENMASK(31, 28)</div><div class='ctx'> </div><div class='del'>-struct sta_rec_bf {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='add'>+enum {</div><div class='add'>+	TX_POWER_LIMIT_ENABLE,</div><div class='add'>+	TX_POWER_LIMIT_PATH_ENABLE = 0x3,</div><div class='add'>+	TX_POWER_LIMIT_TABLE = 0x4,</div><div class='add'>+	TX_POWER_LIMIT_INFO = 0x7,</div><div class='add'>+	TX_POWER_LIMIT_FRAME = 0x11,</div><div class='add'>+	TX_POWER_LIMIT_FRAME_MIN = 0x12,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	__le16 pfmu;		/* 0xffff: no access right for PFMU */</div><div class='del'>-	bool su_mu;		/* 0: SU, 1: MU */</div><div class='del'>-	u8 bf_cap;		/* 0: iBF, 1: eBF */</div><div class='del'>-	u8 sounding_phy;	/* 0: legacy, 1: OFDM, 2: HT, 4: VHT */</div><div class='del'>-	u8 ndpa_rate;</div><div class='del'>-	u8 ndp_rate;</div><div class='del'>-	u8 rept_poll_rate;</div><div class='del'>-	u8 tx_mode;		/* 0: legacy, 1: OFDM, 2: HT, 4: VHT ... */</div><div class='del'>-	u8 nc;</div><div class='del'>-	u8 nr;</div><div class='del'>-	u8 bw;			/* 0: 20M, 1: 40M, 2: 80M, 3: 160M */</div><div class='del'>-</div><div class='del'>-	u8 mem_total;</div><div class='del'>-	u8 mem_20m;</div><div class='del'>-	struct {</div><div class='del'>-		u8 row;</div><div class='del'>-		u8 col: 6, row_msb: 2;</div><div class='del'>-	} mem[4];</div><div class='del'>-</div><div class='del'>-	__le16 smart_ant;</div><div class='del'>-	u8 se_idx;</div><div class='del'>-	u8 auto_sounding;	/* b7: low traffic indicator</div><div class='del'>-				 * b6: Stop sounding for this entry</div><div class='del'>-				 * b5 ~ b0: postpone sounding</div><div class='del'>-				 */</div><div class='del'>-	u8 ibf_timeout;</div><div class='del'>-	u8 ibf_dbw;</div><div class='del'>-	u8 ibf_ncol;</div><div class='del'>-	u8 ibf_nrow;</div><div class='del'>-	u8 nr_bw160;</div><div class='del'>-	u8 nc_bw160;</div><div class='del'>-	u8 ru_start_idx;</div><div class='del'>-	u8 ru_end_idx;</div><div class='del'>-</div><div class='del'>-	bool trigger_su;</div><div class='del'>-	bool trigger_mu;</div><div class='del'>-	bool ng16_su;</div><div class='del'>-	bool ng16_mu;</div><div class='del'>-	bool codebook42_su;</div><div class='del'>-	bool codebook75_mu;</div><div class='del'>-</div><div class='del'>-	u8 he_ltf;</div><div class='del'>-	u8 rsv[2];</div><div class='del'>-} __packed;</div><div class='add'>+enum {</div><div class='add'>+	TX_POWER_INFO_PATH = 1,</div><div class='add'>+	TX_POWER_INFO_RATE,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-struct sta_rec_bfee {</div><div class='del'>-	__le16 tag;</div><div class='del'>-	__le16 len;</div><div class='del'>-	bool fb_identity_matrix;	/* 1: feedback identity matrix */</div><div class='del'>-	bool ignore_feedback;		/* 1: ignore */</div><div class='del'>-	u8 rsv[2];</div><div class='del'>-} __packed;</div><div class='add'>+enum {</div><div class='add'>+	SPR_ENABLE = 0x1,</div><div class='add'>+	SPR_ENABLE_SD = 0x3,</div><div class='add'>+	SPR_ENABLE_MODE = 0x5,</div><div class='add'>+	SPR_ENABLE_DPD = 0x23,</div><div class='add'>+	SPR_ENABLE_TX = 0x25,</div><div class='add'>+	SPR_SET_SRG_BITMAP = 0x80,</div><div class='add'>+	SPR_SET_PARAM = 0xc2,</div><div class='add'>+	SPR_SET_SIGA = 0xdc,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	STA_REC_BASIC,</div><div class='del'>-	STA_REC_RA,</div><div class='del'>-	STA_REC_RA_CMM_INFO,</div><div class='del'>-	STA_REC_RA_UPDATE,</div><div class='del'>-	STA_REC_BF,</div><div class='del'>-	STA_REC_AMSDU,</div><div class='del'>-	STA_REC_BA,</div><div class='del'>-	STA_REC_RED,		/* not used */</div><div class='del'>-	STA_REC_TX_PROC,	/* for hdr trans and CSO in CR4 */</div><div class='del'>-	STA_REC_HT,</div><div class='del'>-	STA_REC_VHT,</div><div class='del'>-	STA_REC_APPS,</div><div class='del'>-	STA_REC_KEY,</div><div class='del'>-	STA_REC_WTBL,</div><div class='del'>-	STA_REC_HE,</div><div class='del'>-	STA_REC_HW_AMSDU,</div><div class='del'>-	STA_REC_WTBL_AADOM,</div><div class='del'>-	STA_REC_KEY_V2,</div><div class='del'>-	STA_REC_MURU,</div><div class='del'>-	STA_REC_MUEDCA,</div><div class='del'>-	STA_REC_BFEE,</div><div class='del'>-	STA_REC_MAX_NUM</div><div class='add'>+	THERMAL_PROTECT_PARAMETER_CTRL,</div><div class='add'>+	THERMAL_PROTECT_BASIC_INFO,</div><div class='add'>+	THERMAL_PROTECT_ENABLE,</div><div class='add'>+	THERMAL_PROTECT_DISABLE,</div><div class='add'>+	THERMAL_PROTECT_DUTY_CONFIG,</div><div class='add'>+	THERMAL_PROTECT_MECH_INFO,</div><div class='add'>+	THERMAL_PROTECT_DUTY_INFO,</div><div class='add'>+	THERMAL_PROTECT_STATE_ACT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum mt7915_cipher_type {</div><div class='del'>-	MT_CIPHER_NONE,</div><div class='del'>-	MT_CIPHER_WEP40,</div><div class='del'>-	MT_CIPHER_WEP104,</div><div class='del'>-	MT_CIPHER_WEP128,</div><div class='del'>-	MT_CIPHER_TKIP,</div><div class='del'>-	MT_CIPHER_AES_CCMP,</div><div class='del'>-	MT_CIPHER_CCMP_256,</div><div class='del'>-	MT_CIPHER_GCMP,</div><div class='del'>-	MT_CIPHER_GCMP_256,</div><div class='del'>-	MT_CIPHER_WAPI,</div><div class='del'>-	MT_CIPHER_BIP_CMAC_128,</div><div class='add'>+enum {</div><div class='add'>+	MT_BF_SOUNDING_ON = 1,</div><div class='add'>+	MT_BF_TYPE_UPDATE = 20,</div><div class='add'>+	MT_BF_MODULE_UPDATE = 25</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	CH_SWITCH_NORMAL = 0,</div><div class='del'>-	CH_SWITCH_SCAN = 3,</div><div class='del'>-	CH_SWITCH_MCC = 4,</div><div class='del'>-	CH_SWITCH_DFS = 5,</div><div class='del'>-	CH_SWITCH_BACKGROUND_SCAN_START = 6,</div><div class='del'>-	CH_SWITCH_BACKGROUND_SCAN_RUNNING = 7,</div><div class='del'>-	CH_SWITCH_BACKGROUND_SCAN_STOP = 8,</div><div class='del'>-	CH_SWITCH_SCAN_BYPASS_DPD = 9</div><div class='add'>+	MURU_SET_ARB_OP_MODE = 14,</div><div class='add'>+	MURU_SET_PLATFORM_TYPE = 25,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	THERMAL_SENSOR_TEMP_QUERY,</div><div class='del'>-	THERMAL_SENSOR_MANUAL_CTRL,</div><div class='del'>-	THERMAL_SENSOR_INFO_QUERY,</div><div class='del'>-	THERMAL_SENSOR_TASK_CTRL,</div><div class='add'>+	MURU_PLATFORM_TYPE_PERF_LEVEL_1 = 1,</div><div class='add'>+	MURU_PLATFORM_TYPE_PERF_LEVEL_2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* tx cmd tx statistics */</div><div class='ctx'> enum {</div><div class='del'>-	MT_EBF = BIT(0),	/* explicit beamforming */</div><div class='del'>-	MT_IBF = BIT(1)		/* implicit beamforming */</div><div class='add'>+	MURU_SET_TXC_TX_STATS_EN = 150,</div><div class='add'>+	MURU_GET_TXC_TX_STATS = 151,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define MT7915_WTBL_UPDATE_MAX_SIZE	(sizeof(struct wtbl_req_hdr) +	\</div><div class='del'>-					 sizeof(struct wtbl_generic) +	\</div><div class='del'>-					 sizeof(struct wtbl_rx) +	\</div><div class='del'>-					 sizeof(struct wtbl_ht) +	\</div><div class='del'>-					 sizeof(struct wtbl_vht) +	\</div><div class='del'>-					 sizeof(struct wtbl_hdr_trans) +\</div><div class='del'>-					 sizeof(struct wtbl_ba) +	\</div><div class='del'>-					 sizeof(struct wtbl_smps))</div><div class='del'>-</div><div class='del'>-#define MT7915_STA_UPDATE_MAX_SIZE	(sizeof(struct sta_req_hdr) +	\</div><div class='del'>-					 sizeof(struct sta_rec_basic) +	\</div><div class='del'>-					 sizeof(struct sta_rec_ht) +	\</div><div class='del'>-					 sizeof(struct sta_rec_he) +	\</div><div class='del'>-					 sizeof(struct sta_rec_ba) +	\</div><div class='del'>-					 sizeof(struct sta_rec_vht) +	\</div><div class='del'>-					 sizeof(struct sta_rec_uapsd) + \</div><div class='del'>-					 sizeof(struct sta_rec_amsdu) +	\</div><div class='del'>-					 sizeof(struct tlv) +		\</div><div class='del'>-					 MT7915_WTBL_UPDATE_MAX_SIZE)</div><div class='add'>+enum {</div><div class='add'>+	SER_QUERY,</div><div class='add'>+	/* recovery */</div><div class='add'>+	SER_SET_RECOVER_L1,</div><div class='add'>+	SER_SET_RECOVER_L2,</div><div class='add'>+	SER_SET_RECOVER_L3_RX_ABORT,</div><div class='add'>+	SER_SET_RECOVER_L3_TX_ABORT,</div><div class='add'>+	SER_SET_RECOVER_L3_TX_DISABLE,</div><div class='add'>+	SER_SET_RECOVER_L3_BF,</div><div class='add'>+	SER_SET_RECOVER_FULL,</div><div class='add'>+	SER_SET_SYSTEM_ASSERT,</div><div class='add'>+	/* action */</div><div class='add'>+	SER_ENABLE = 2,</div><div class='add'>+	SER_RECOVER</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MT7915_MAX_BEACON_SIZE		1308</div><div class='add'>+#define MT7915_BEACON_UPDATE_SIZE	(sizeof(struct sta_req_hdr) +	\</div><div class='add'>+					 sizeof(struct bss_info_bcn) +	\</div><div class='add'>+					 sizeof(struct bss_info_bcn_cntdwn) +	\</div><div class='add'>+					 sizeof(struct bss_info_bcn_mbss) +	\</div><div class='add'>+					 MT_TXD_SIZE +	\</div><div class='add'>+					 sizeof(struct bss_info_bcn_cont))</div><div class='add'>+#define MT7915_MAX_BSS_OFFLOAD_SIZE	(MT7915_MAX_BEACON_SIZE +	\</div><div class='add'>+					 MT7915_BEACON_UPDATE_SIZE)</div><div class='ctx'> </div><div class='ctx'> #define MT7915_BSS_UPDATE_MAX_SIZE	(sizeof(struct sta_req_hdr) +	\</div><div class='ctx'> 					 sizeof(struct bss_info_omac) +	\</div><div class='hunk'>@@ -1101,68 +521,4 @@ enum {</div><div class='ctx'> 					 sizeof(struct bss_info_bmc_rate) +\</div><div class='ctx'> 					 sizeof(struct bss_info_ext_bss))</div><div class='ctx'> </div><div class='del'>-#define MT7915_BEACON_UPDATE_SIZE	(sizeof(struct sta_req_hdr) +	\</div><div class='del'>-					 sizeof(struct bss_info_bcn_csa) + \</div><div class='del'>-					 sizeof(struct bss_info_bcn_bcc) + \</div><div class='del'>-					 sizeof(struct bss_info_bcn_mbss) + \</div><div class='del'>-					 sizeof(struct bss_info_bcn_cont))</div><div class='del'>-</div><div class='del'>-#define PHY_MODE_A			BIT(0)</div><div class='del'>-#define PHY_MODE_B			BIT(1)</div><div class='del'>-#define PHY_MODE_G			BIT(2)</div><div class='del'>-#define PHY_MODE_GN			BIT(3)</div><div class='del'>-#define PHY_MODE_AN			BIT(4)</div><div class='del'>-#define PHY_MODE_AC			BIT(5)</div><div class='del'>-#define PHY_MODE_AX_24G			BIT(6)</div><div class='del'>-#define PHY_MODE_AX_5G			BIT(7)</div><div class='del'>-#define PHY_MODE_AX_6G			BIT(8)</div><div class='del'>-</div><div class='del'>-#define MODE_CCK			BIT(0)</div><div class='del'>-#define MODE_OFDM			BIT(1)</div><div class='del'>-#define MODE_HT				BIT(2)</div><div class='del'>-#define MODE_VHT			BIT(3)</div><div class='del'>-#define MODE_HE				BIT(4)</div><div class='del'>-</div><div class='del'>-#define STA_CAP_WMM			BIT(0)</div><div class='del'>-#define STA_CAP_SGI_20			BIT(4)</div><div class='del'>-#define STA_CAP_SGI_40			BIT(5)</div><div class='del'>-#define STA_CAP_TX_STBC			BIT(6)</div><div class='del'>-#define STA_CAP_RX_STBC			BIT(7)</div><div class='del'>-#define STA_CAP_VHT_SGI_80		BIT(16)</div><div class='del'>-#define STA_CAP_VHT_SGI_160		BIT(17)</div><div class='del'>-#define STA_CAP_VHT_TX_STBC		BIT(18)</div><div class='del'>-#define STA_CAP_VHT_RX_STBC		BIT(19)</div><div class='del'>-#define STA_CAP_VHT_LDPC		BIT(23)</div><div class='del'>-#define STA_CAP_LDPC			BIT(24)</div><div class='del'>-#define STA_CAP_HT			BIT(26)</div><div class='del'>-#define STA_CAP_VHT			BIT(27)</div><div class='del'>-#define STA_CAP_HE			BIT(28)</div><div class='del'>-</div><div class='del'>-/* HE MAC */</div><div class='del'>-#define STA_REC_HE_CAP_HTC			BIT(0)</div><div class='del'>-#define STA_REC_HE_CAP_BQR			BIT(1)</div><div class='del'>-#define STA_REC_HE_CAP_BSR			BIT(2)</div><div class='del'>-#define STA_REC_HE_CAP_OM			BIT(3)</div><div class='del'>-#define STA_REC_HE_CAP_AMSDU_IN_AMPDU		BIT(4)</div><div class='del'>-/* HE PHY */</div><div class='del'>-#define STA_REC_HE_CAP_DUAL_BAND		BIT(5)</div><div class='del'>-#define STA_REC_HE_CAP_LDPC			BIT(6)</div><div class='del'>-#define STA_REC_HE_CAP_TRIG_CQI_FK		BIT(7)</div><div class='del'>-#define STA_REC_HE_CAP_PARTIAL_BW_EXT_RANGE	BIT(8)</div><div class='del'>-/* STBC */</div><div class='del'>-#define STA_REC_HE_CAP_LE_EQ_80M_TX_STBC	BIT(9)</div><div class='del'>-#define STA_REC_HE_CAP_LE_EQ_80M_RX_STBC	BIT(10)</div><div class='del'>-#define STA_REC_HE_CAP_GT_80M_TX_STBC		BIT(11)</div><div class='del'>-#define STA_REC_HE_CAP_GT_80M_RX_STBC		BIT(12)</div><div class='del'>-/* GI */</div><div class='del'>-#define STA_REC_HE_CAP_SU_PPDU_1LTF_8US_GI	BIT(13)</div><div class='del'>-#define STA_REC_HE_CAP_SU_MU_PPDU_4LTF_8US_GI	BIT(14)</div><div class='del'>-#define STA_REC_HE_CAP_ER_SU_PPDU_1LTF_8US_GI	BIT(15)</div><div class='del'>-#define STA_REC_HE_CAP_ER_SU_PPDU_4LTF_8US_GI	BIT(16)</div><div class='del'>-#define STA_REC_HE_CAP_NDP_4LTF_3DOT2MS_GI	BIT(17)</div><div class='del'>-/* 242 TONE */</div><div class='del'>-#define STA_REC_HE_CAP_BW20_RU242_SUPPORT	BIT(18)</div><div class='del'>-#define STA_REC_HE_CAP_TX_1024QAM_UNDER_RU242	BIT(19)</div><div class='del'>-#define STA_REC_HE_CAP_RX_1024QAM_UNDER_RU242	BIT(20)</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c<br/>index af712a936ef6..2708b1556f40 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/mmio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7915/mmio.c</a></div><div class='hunk'>@@ -1,110 +1,550 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "mt7915.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+#include "mcu.h"</div><div class='add'>+#include "../trace.h"</div><div class='add'>+#include "../dma.h"</div><div class='add'>+</div><div class='add'>+static bool wed_enable;</div><div class='add'>+module_param(wed_enable, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(wed_enable, "Enable Wireless Ethernet Dispatch support");</div><div class='add'>+</div><div class='add'>+static const u32 mt7915_reg[] = {</div><div class='add'>+	[INT_SOURCE_CSR]		= 0xd7010,</div><div class='add'>+	[INT_MASK_CSR]			= 0xd7014,</div><div class='add'>+	[INT1_SOURCE_CSR]		= 0xd7088,</div><div class='add'>+	[INT1_MASK_CSR]			= 0xd708c,</div><div class='add'>+	[INT_MCU_CMD_SOURCE]		= 0xd51f0,</div><div class='add'>+	[INT_MCU_CMD_EVENT]		= 0x3108,</div><div class='add'>+	[WFDMA0_ADDR]			= 0xd4000,</div><div class='add'>+	[WFDMA0_PCIE1_ADDR]		= 0xd8000,</div><div class='add'>+	[WFDMA_EXT_CSR_ADDR]		= 0xd7000,</div><div class='add'>+	[CBTOP1_PHY_END]		= 0x77ffffff,</div><div class='add'>+	[INFRA_MCU_ADDR_END]		= 0x7c3fffff,</div><div class='add'>+	[FW_ASSERT_STAT_ADDR]		= 0x219848,</div><div class='add'>+	[FW_EXCEPT_TYPE_ADDR]		= 0x21987c,</div><div class='add'>+	[FW_EXCEPT_COUNT_ADDR]		= 0x219848,</div><div class='add'>+	[FW_CIRQ_COUNT_ADDR]		= 0x216f94,</div><div class='add'>+	[FW_CIRQ_IDX_ADDR]		= 0x216ef8,</div><div class='add'>+	[FW_CIRQ_LISR_ADDR]		= 0x2170ac,</div><div class='add'>+	[FW_TASK_ID_ADDR]		= 0x216f90,</div><div class='add'>+	[FW_TASK_IDX_ADDR]		= 0x216f9c,</div><div class='add'>+	[FW_TASK_QID1_ADDR]		= 0x219680,</div><div class='add'>+	[FW_TASK_QID2_ADDR]		= 0x219760,</div><div class='add'>+	[FW_TASK_START_ADDR]		= 0x219558,</div><div class='add'>+	[FW_TASK_END_ADDR]		= 0x219554,</div><div class='add'>+	[FW_TASK_SIZE_ADDR]		= 0x219560,</div><div class='add'>+	[FW_LAST_MSG_ID_ADDR]		= 0x216f70,</div><div class='add'>+	[FW_EINT_INFO_ADDR]		= 0x219818,</div><div class='add'>+	[FW_SCHED_INFO_ADDR]		= 0x219828,</div><div class='add'>+	[SWDEF_BASE_ADDR]		= 0x41f200,</div><div class='add'>+	[TXQ_WED_RING_BASE]		= 0xd7300,</div><div class='add'>+	[RXQ_WED_RING_BASE]		= 0xd7410,</div><div class='add'>+	[RXQ_WED_DATA_RING_BASE]	= 0xd4500,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 mt7916_reg[] = {</div><div class='add'>+	[INT_SOURCE_CSR]		= 0xd4200,</div><div class='add'>+	[INT_MASK_CSR]			= 0xd4204,</div><div class='add'>+	[INT1_SOURCE_CSR]		= 0xd8200,</div><div class='add'>+	[INT1_MASK_CSR]			= 0xd8204,</div><div class='add'>+	[INT_MCU_CMD_SOURCE]		= 0xd41f0,</div><div class='add'>+	[INT_MCU_CMD_EVENT]		= 0x2108,</div><div class='add'>+	[WFDMA0_ADDR]			= 0xd4000,</div><div class='add'>+	[WFDMA0_PCIE1_ADDR]		= 0xd8000,</div><div class='add'>+	[WFDMA_EXT_CSR_ADDR]		= 0xd7000,</div><div class='add'>+	[CBTOP1_PHY_END]		= 0x7fffffff,</div><div class='add'>+	[INFRA_MCU_ADDR_END]		= 0x7c085fff,</div><div class='add'>+	[FW_ASSERT_STAT_ADDR]		= 0x02204c14,</div><div class='add'>+	[FW_EXCEPT_TYPE_ADDR]		= 0x022051a4,</div><div class='add'>+	[FW_EXCEPT_COUNT_ADDR]		= 0x022050bc,</div><div class='add'>+	[FW_CIRQ_COUNT_ADDR]		= 0x022001ac,</div><div class='add'>+	[FW_CIRQ_IDX_ADDR]		= 0x02204f84,</div><div class='add'>+	[FW_CIRQ_LISR_ADDR]		= 0x022050d0,</div><div class='add'>+	[FW_TASK_ID_ADDR]		= 0x0220406c,</div><div class='add'>+	[FW_TASK_IDX_ADDR]		= 0x0220500c,</div><div class='add'>+	[FW_TASK_QID1_ADDR]		= 0x022028c8,</div><div class='add'>+	[FW_TASK_QID2_ADDR]		= 0x02202a38,</div><div class='add'>+	[FW_TASK_START_ADDR]		= 0x0220286c,</div><div class='add'>+	[FW_TASK_END_ADDR]		= 0x02202870,</div><div class='add'>+	[FW_TASK_SIZE_ADDR]		= 0x02202878,</div><div class='add'>+	[FW_LAST_MSG_ID_ADDR]		= 0x02204fe8,</div><div class='add'>+	[FW_EINT_INFO_ADDR]		= 0x0220525c,</div><div class='add'>+	[FW_SCHED_INFO_ADDR]		= 0x0220516c,</div><div class='add'>+	[SWDEF_BASE_ADDR]		= 0x411400,</div><div class='add'>+	[TXQ_WED_RING_BASE]		= 0xd7300,</div><div class='add'>+	[RXQ_WED_RING_BASE]		= 0xd7410,</div><div class='add'>+	[RXQ_WED_DATA_RING_BASE]	= 0xd4540,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 mt7986_reg[] = {</div><div class='add'>+	[INT_SOURCE_CSR]		= 0x24200,</div><div class='add'>+	[INT_MASK_CSR]			= 0x24204,</div><div class='add'>+	[INT1_SOURCE_CSR]		= 0x28200,</div><div class='add'>+	[INT1_MASK_CSR]			= 0x28204,</div><div class='add'>+	[INT_MCU_CMD_SOURCE]		= 0x241f0,</div><div class='add'>+	[INT_MCU_CMD_EVENT]		= 0x54000108,</div><div class='add'>+	[WFDMA0_ADDR]			= 0x24000,</div><div class='add'>+	[WFDMA0_PCIE1_ADDR]		= 0x28000,</div><div class='add'>+	[WFDMA_EXT_CSR_ADDR]		= 0x27000,</div><div class='add'>+	[CBTOP1_PHY_END]		= 0x7fffffff,</div><div class='add'>+	[INFRA_MCU_ADDR_END]		= 0x7c085fff,</div><div class='add'>+	[FW_ASSERT_STAT_ADDR]		= 0x02204b54,</div><div class='add'>+	[FW_EXCEPT_TYPE_ADDR]		= 0x022050dc,</div><div class='add'>+	[FW_EXCEPT_COUNT_ADDR]		= 0x02204ffc,</div><div class='add'>+	[FW_CIRQ_COUNT_ADDR]		= 0x022001ac,</div><div class='add'>+	[FW_CIRQ_IDX_ADDR]		= 0x02204ec4,</div><div class='add'>+	[FW_CIRQ_LISR_ADDR]		= 0x02205010,</div><div class='add'>+	[FW_TASK_ID_ADDR]		= 0x02204fac,</div><div class='add'>+	[FW_TASK_IDX_ADDR]		= 0x02204f4c,</div><div class='add'>+	[FW_TASK_QID1_ADDR]		= 0x02202814,</div><div class='add'>+	[FW_TASK_QID2_ADDR]		= 0x02202984,</div><div class='add'>+	[FW_TASK_START_ADDR]		= 0x022027b8,</div><div class='add'>+	[FW_TASK_END_ADDR]		= 0x022027bc,</div><div class='add'>+	[FW_TASK_SIZE_ADDR]		= 0x022027c4,</div><div class='add'>+	[FW_LAST_MSG_ID_ADDR]		= 0x02204f28,</div><div class='add'>+	[FW_EINT_INFO_ADDR]		= 0x02205194,</div><div class='add'>+	[FW_SCHED_INFO_ADDR]		= 0x022051a4,</div><div class='add'>+	[SWDEF_BASE_ADDR]		= 0x411400,</div><div class='add'>+	[TXQ_WED_RING_BASE]		= 0x24420,</div><div class='add'>+	[RXQ_WED_RING_BASE]		= 0x24520,</div><div class='add'>+	[RXQ_WED_DATA_RING_BASE]	= 0x24540,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 mt7915_offs[] = {</div><div class='add'>+	[TMAC_CDTR]		= 0x090,</div><div class='add'>+	[TMAC_ODTR]		= 0x094,</div><div class='add'>+	[TMAC_ATCR]		= 0x098,</div><div class='add'>+	[TMAC_TRCR0]		= 0x09c,</div><div class='add'>+	[TMAC_ICR0]		= 0x0a4,</div><div class='add'>+	[TMAC_ICR1]		= 0x0b4,</div><div class='add'>+	[TMAC_CTCR0]		= 0x0f4,</div><div class='add'>+	[TMAC_TFCR0]		= 0x1e0,</div><div class='add'>+	[MDP_BNRCFR0]		= 0x070,</div><div class='add'>+	[MDP_BNRCFR1]		= 0x074,</div><div class='add'>+	[ARB_DRNGR0]		= 0x194,</div><div class='add'>+	[ARB_SCR]		= 0x080,</div><div class='add'>+	[RMAC_MIB_AIRTIME14]	= 0x3b8,</div><div class='add'>+	[AGG_AWSCR0]		= 0x05c,</div><div class='add'>+	[AGG_PCR0]		= 0x06c,</div><div class='add'>+	[AGG_ACR0]		= 0x084,</div><div class='add'>+	[AGG_ACR4]		= 0x08c,</div><div class='add'>+	[AGG_MRCR]		= 0x098,</div><div class='add'>+	[AGG_ATCR0]		= 0x0ec,</div><div class='add'>+	[AGG_ATCR1]		= 0x0f0,</div><div class='add'>+	[AGG_ATCR3]		= 0x0f4,</div><div class='add'>+	[LPON_UTTR0]		= 0x080,</div><div class='add'>+	[LPON_UTTR1]		= 0x084,</div><div class='add'>+	[LPON_FRCR]		= 0x314,</div><div class='add'>+	[MIB_SDR3]		= 0x014,</div><div class='add'>+	[MIB_SDR4]		= 0x018,</div><div class='add'>+	[MIB_SDR5]		= 0x01c,</div><div class='add'>+	[MIB_SDR7]		= 0x024,</div><div class='add'>+	[MIB_SDR8]		= 0x028,</div><div class='add'>+	[MIB_SDR9]		= 0x02c,</div><div class='add'>+	[MIB_SDR10]		= 0x030,</div><div class='add'>+	[MIB_SDR11]		= 0x034,</div><div class='add'>+	[MIB_SDR12]		= 0x038,</div><div class='add'>+	[MIB_SDR13]		= 0x03c,</div><div class='add'>+	[MIB_SDR14]		= 0x040,</div><div class='add'>+	[MIB_SDR15]		= 0x044,</div><div class='add'>+	[MIB_SDR16]		= 0x048,</div><div class='add'>+	[MIB_SDR17]		= 0x04c,</div><div class='add'>+	[MIB_SDR18]		= 0x050,</div><div class='add'>+	[MIB_SDR19]		= 0x054,</div><div class='add'>+	[MIB_SDR20]		= 0x058,</div><div class='add'>+	[MIB_SDR21]		= 0x05c,</div><div class='add'>+	[MIB_SDR22]		= 0x060,</div><div class='add'>+	[MIB_SDR23]		= 0x064,</div><div class='add'>+	[MIB_SDR24]		= 0x068,</div><div class='add'>+	[MIB_SDR25]		= 0x06c,</div><div class='add'>+	[MIB_SDR27]		= 0x074,</div><div class='add'>+	[MIB_SDR28]		= 0x078,</div><div class='add'>+	[MIB_SDR29]		= 0x07c,</div><div class='add'>+	[MIB_SDRVEC]		= 0x080,</div><div class='add'>+	[MIB_SDR31]		= 0x084,</div><div class='add'>+	[MIB_SDR32]		= 0x088,</div><div class='add'>+	[MIB_SDRMUBF]		= 0x090,</div><div class='add'>+	[MIB_DR8]		= 0x0c0,</div><div class='add'>+	[MIB_DR9]		= 0x0c4,</div><div class='add'>+	[MIB_DR11]		= 0x0cc,</div><div class='add'>+	[MIB_MB_SDR0]		= 0x100,</div><div class='add'>+	[MIB_MB_SDR1]		= 0x104,</div><div class='add'>+	[TX_AGG_CNT]		= 0x0a8,</div><div class='add'>+	[TX_AGG_CNT2]		= 0x164,</div><div class='add'>+	[MIB_ARNG]		= 0x4b8,</div><div class='add'>+	[WTBLON_TOP_WDUCR]	= 0x0,</div><div class='add'>+	[WTBL_UPDATE]		= 0x030,</div><div class='add'>+	[PLE_FL_Q_EMPTY]	= 0x0b0,</div><div class='add'>+	[PLE_FL_Q_CTRL]		= 0x1b0,</div><div class='add'>+	[PLE_AC_QEMPTY]		= 0x500,</div><div class='add'>+	[PLE_FREEPG_CNT]	= 0x100,</div><div class='add'>+	[PLE_FREEPG_HEAD_TAIL]	= 0x104,</div><div class='add'>+	[PLE_PG_HIF_GROUP]	= 0x110,</div><div class='add'>+	[PLE_HIF_PG_INFO]	= 0x114,</div><div class='add'>+	[AC_OFFSET]		= 0x040,</div><div class='add'>+	[ETBF_PAR_RPT0]		= 0x068,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 mt7916_offs[] = {</div><div class='add'>+	[TMAC_CDTR]		= 0x0c8,</div><div class='add'>+	[TMAC_ODTR]		= 0x0cc,</div><div class='add'>+	[TMAC_ATCR]		= 0x00c,</div><div class='add'>+	[TMAC_TRCR0]		= 0x010,</div><div class='add'>+	[TMAC_ICR0]		= 0x014,</div><div class='add'>+	[TMAC_ICR1]		= 0x018,</div><div class='add'>+	[TMAC_CTCR0]		= 0x114,</div><div class='add'>+	[TMAC_TFCR0]		= 0x0e4,</div><div class='add'>+	[MDP_BNRCFR0]		= 0x090,</div><div class='add'>+	[MDP_BNRCFR1]		= 0x094,</div><div class='add'>+	[ARB_DRNGR0]		= 0x1e0,</div><div class='add'>+	[ARB_SCR]		= 0x000,</div><div class='add'>+	[RMAC_MIB_AIRTIME14]	= 0x0398,</div><div class='add'>+	[AGG_AWSCR0]		= 0x030,</div><div class='add'>+	[AGG_PCR0]		= 0x040,</div><div class='add'>+	[AGG_ACR0]		= 0x054,</div><div class='add'>+	[AGG_ACR4]		= 0x05c,</div><div class='add'>+	[AGG_MRCR]		= 0x068,</div><div class='add'>+	[AGG_ATCR0]		= 0x1a4,</div><div class='add'>+	[AGG_ATCR1]		= 0x1a8,</div><div class='add'>+	[AGG_ATCR3]		= 0x080,</div><div class='add'>+	[LPON_UTTR0]		= 0x360,</div><div class='add'>+	[LPON_UTTR1]		= 0x364,</div><div class='add'>+	[LPON_FRCR]		= 0x37c,</div><div class='add'>+	[MIB_SDR3]		= 0x698,</div><div class='add'>+	[MIB_SDR4]		= 0x788,</div><div class='add'>+	[MIB_SDR5]		= 0x780,</div><div class='add'>+	[MIB_SDR7]		= 0x5a8,</div><div class='add'>+	[MIB_SDR8]		= 0x78c,</div><div class='add'>+	[MIB_SDR9]		= 0x024,</div><div class='add'>+	[MIB_SDR10]		= 0x76c,</div><div class='add'>+	[MIB_SDR11]		= 0x790,</div><div class='add'>+	[MIB_SDR12]		= 0x558,</div><div class='add'>+	[MIB_SDR13]		= 0x560,</div><div class='add'>+	[MIB_SDR14]		= 0x564,</div><div class='add'>+	[MIB_SDR15]		= 0x568,</div><div class='add'>+	[MIB_SDR16]		= 0x7fc,</div><div class='add'>+	[MIB_SDR17]		= 0x800,</div><div class='add'>+	[MIB_SDR18]		= 0x030,</div><div class='add'>+	[MIB_SDR19]		= 0x5ac,</div><div class='add'>+	[MIB_SDR20]		= 0x5b0,</div><div class='add'>+	[MIB_SDR21]		= 0x5b4,</div><div class='add'>+	[MIB_SDR22]		= 0x770,</div><div class='add'>+	[MIB_SDR23]		= 0x774,</div><div class='add'>+	[MIB_SDR24]		= 0x778,</div><div class='add'>+	[MIB_SDR25]		= 0x77c,</div><div class='add'>+	[MIB_SDR27]		= 0x080,</div><div class='add'>+	[MIB_SDR28]		= 0x084,</div><div class='add'>+	[MIB_SDR29]		= 0x650,</div><div class='add'>+	[MIB_SDRVEC]		= 0x5a8,</div><div class='add'>+	[MIB_SDR31]		= 0x55c,</div><div class='add'>+	[MIB_SDR32]		= 0x7a8,</div><div class='add'>+	[MIB_SDRMUBF]		= 0x7ac,</div><div class='add'>+	[MIB_DR8]		= 0x56c,</div><div class='add'>+	[MIB_DR9]		= 0x570,</div><div class='add'>+	[MIB_DR11]		= 0x574,</div><div class='add'>+	[MIB_MB_SDR0]		= 0x688,</div><div class='add'>+	[MIB_MB_SDR1]		= 0x690,</div><div class='add'>+	[TX_AGG_CNT]		= 0x7dc,</div><div class='add'>+	[TX_AGG_CNT2]		= 0x7ec,</div><div class='add'>+	[MIB_ARNG]		= 0x0b0,</div><div class='add'>+	[WTBLON_TOP_WDUCR]	= 0x200,</div><div class='add'>+	[WTBL_UPDATE]		= 0x230,</div><div class='add'>+	[PLE_FL_Q_EMPTY]	= 0x360,</div><div class='add'>+	[PLE_FL_Q_CTRL]		= 0x3e0,</div><div class='add'>+	[PLE_AC_QEMPTY]		= 0x600,</div><div class='add'>+	[PLE_FREEPG_CNT]	= 0x380,</div><div class='add'>+	[PLE_FREEPG_HEAD_TAIL]	= 0x384,</div><div class='add'>+	[PLE_PG_HIF_GROUP]	= 0x00c,</div><div class='add'>+	[PLE_HIF_PG_INFO]	= 0x388,</div><div class='add'>+	[AC_OFFSET]		= 0x080,</div><div class='add'>+	[ETBF_PAR_RPT0]		= 0x100,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mt76_connac_reg_map mt7915_reg_map[] = {</div><div class='add'>+	{ 0x00400000, 0x80000, 0x10000 }, /* WF_MCU_SYSRAM */</div><div class='add'>+	{ 0x00410000, 0x90000, 0x10000 }, /* WF_MCU_SYSRAM (configure regs) */</div><div class='add'>+	{ 0x40000000, 0x70000, 0x10000 }, /* WF_UMAC_SYSRAM */</div><div class='add'>+	{ 0x54000000, 0x02000, 0x01000 }, /* WFDMA PCIE0 MCU DMA0 */</div><div class='add'>+	{ 0x55000000, 0x03000, 0x01000 }, /* WFDMA PCIE0 MCU DMA1 */</div><div class='add'>+	{ 0x58000000, 0x06000, 0x01000 }, /* WFDMA PCIE1 MCU DMA0 (MEM_DMA) */</div><div class='add'>+	{ 0x59000000, 0x07000, 0x01000 }, /* WFDMA PCIE1 MCU DMA1 */</div><div class='add'>+	{ 0x7c000000, 0xf0000, 0x10000 }, /* CONN_INFRA */</div><div class='add'>+	{ 0x7c020000, 0xd0000, 0x10000 }, /* CONN_INFRA, WFDMA */</div><div class='add'>+	{ 0x80020000, 0xb0000, 0x10000 }, /* WF_TOP_MISC_OFF */</div><div class='add'>+	{ 0x81020000, 0xc0000, 0x10000 }, /* WF_TOP_MISC_ON */</div><div class='add'>+	{ 0x820c0000, 0x08000, 0x04000 }, /* WF_UMAC_TOP (PLE) */</div><div class='add'>+	{ 0x820c8000, 0x0c000, 0x02000 }, /* WF_UMAC_TOP (PSE) */</div><div class='add'>+	{ 0x820cc000, 0x0e000, 0x02000 }, /* WF_UMAC_TOP (PP) */</div><div class='add'>+	{ 0x820ce000, 0x21c00, 0x00200 }, /* WF_LMAC_TOP (WF_SEC) */</div><div class='add'>+	{ 0x820cf000, 0x22000, 0x01000 }, /* WF_LMAC_TOP (WF_PF) */</div><div class='add'>+	{ 0x820d0000, 0x30000, 0x10000 }, /* WF_LMAC_TOP (WF_WTBLON) */</div><div class='add'>+	{ 0x820e0000, 0x20000, 0x00400 }, /* WF_LMAC_TOP BN0 (WF_CFG) */</div><div class='add'>+	{ 0x820e1000, 0x20400, 0x00200 }, /* WF_LMAC_TOP BN0 (WF_TRB) */</div><div class='add'>+	{ 0x820e2000, 0x20800, 0x00400 }, /* WF_LMAC_TOP BN0 (WF_AGG) */</div><div class='add'>+	{ 0x820e3000, 0x20c00, 0x00400 }, /* WF_LMAC_TOP BN0 (WF_ARB) */</div><div class='add'>+	{ 0x820e4000, 0x21000, 0x00400 }, /* WF_LMAC_TOP BN0 (WF_TMAC) */</div><div class='add'>+	{ 0x820e5000, 0x21400, 0x00800 }, /* WF_LMAC_TOP BN0 (WF_RMAC) */</div><div class='add'>+	{ 0x820e7000, 0x21e00, 0x00200 }, /* WF_LMAC_TOP BN0 (WF_DMA) */</div><div class='add'>+	{ 0x820e9000, 0x23400, 0x00200 }, /* WF_LMAC_TOP BN0 (WF_WTBLOFF) */</div><div class='add'>+	{ 0x820ea000, 0x24000, 0x00200 }, /* WF_LMAC_TOP BN0 (WF_ETBF) */</div><div class='add'>+	{ 0x820eb000, 0x24200, 0x00400 }, /* WF_LMAC_TOP BN0 (WF_LPON) */</div><div class='add'>+	{ 0x820ec000, 0x24600, 0x00200 }, /* WF_LMAC_TOP BN0 (WF_INT) */</div><div class='add'>+	{ 0x820ed000, 0x24800, 0x00800 }, /* WF_LMAC_TOP BN0 (WF_MIB) */</div><div class='add'>+	{ 0x820f0000, 0xa0000, 0x00400 }, /* WF_LMAC_TOP BN1 (WF_CFG) */</div><div class='add'>+	{ 0x820f1000, 0xa0600, 0x00200 }, /* WF_LMAC_TOP BN1 (WF_TRB) */</div><div class='add'>+	{ 0x820f2000, 0xa0800, 0x00400 }, /* WF_LMAC_TOP BN1 (WF_AGG) */</div><div class='add'>+	{ 0x820f3000, 0xa0c00, 0x00400 }, /* WF_LMAC_TOP BN1 (WF_ARB) */</div><div class='add'>+	{ 0x820f4000, 0xa1000, 0x00400 }, /* WF_LMAC_TOP BN1 (WF_TMAC) */</div><div class='add'>+	{ 0x820f5000, 0xa1400, 0x00800 }, /* WF_LMAC_TOP BN1 (WF_RMAC) */</div><div class='add'>+	{ 0x820f7000, 0xa1e00, 0x00200 }, /* WF_LMAC_TOP BN1 (WF_DMA) */</div><div class='add'>+	{ 0x820f9000, 0xa3400, 0x00200 }, /* WF_LMAC_TOP BN1 (WF_WTBLOFF) */</div><div class='add'>+	{ 0x820fa000, 0xa4000, 0x00200 }, /* WF_LMAC_TOP BN1 (WF_ETBF) */</div><div class='add'>+	{ 0x820fb000, 0xa4200, 0x00400 }, /* WF_LMAC_TOP BN1 (WF_LPON) */</div><div class='add'>+	{ 0x820fc000, 0xa4600, 0x00200 }, /* WF_LMAC_TOP BN1 (WF_INT) */</div><div class='add'>+	{ 0x820fd000, 0xa4800, 0x00800 }, /* WF_LMAC_TOP BN1 (WF_MIB) */</div><div class='add'>+	{ 0x0, 0x0, 0x0 }, /* imply end of search */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mt76_connac_reg_map mt7916_reg_map[] = {</div><div class='add'>+	{ 0x54000000, 0x02000, 0x01000 }, /* WFDMA_0 (PCIE0 MCU DMA0) */</div><div class='add'>+	{ 0x55000000, 0x03000, 0x01000 }, /* WFDMA_1 (PCIE0 MCU DMA1) */</div><div class='add'>+	{ 0x56000000, 0x04000, 0x01000 }, /* WFDMA_2 (Reserved) */</div><div class='add'>+	{ 0x57000000, 0x05000, 0x01000 }, /* WFDMA_3 (MCU wrap CR) */</div><div class='add'>+	{ 0x58000000, 0x06000, 0x01000 }, /* WFDMA_4 (PCIE1 MCU DMA0) */</div><div class='add'>+	{ 0x59000000, 0x07000, 0x01000 }, /* WFDMA_5 (PCIE1 MCU DMA1) */</div><div class='add'>+	{ 0x820c0000, 0x08000, 0x04000 }, /* WF_UMAC_TOP (PLE) */</div><div class='add'>+	{ 0x820c8000, 0x0c000, 0x02000 }, /* WF_UMAC_TOP (PSE) */</div><div class='add'>+	{ 0x820cc000, 0x0e000, 0x02000 }, /* WF_UMAC_TOP (PP) */</div><div class='add'>+	{ 0x820e0000, 0x20000, 0x00400 }, /* WF_LMAC_TOP BN0 (WF_CFG) */</div><div class='add'>+	{ 0x820e1000, 0x20400, 0x00200 }, /* WF_LMAC_TOP BN0 (WF_TRB) */</div><div class='add'>+	{ 0x820e2000, 0x20800, 0x00400 }, /* WF_LMAC_TOP BN0 (WF_AGG) */</div><div class='add'>+	{ 0x820e3000, 0x20c00, 0x00400 }, /* WF_LMAC_TOP BN0 (WF_ARB) */</div><div class='add'>+	{ 0x820e4000, 0x21000, 0x00400 }, /* WF_LMAC_TOP BN0 (WF_TMAC) */</div><div class='add'>+	{ 0x820e5000, 0x21400, 0x00800 }, /* WF_LMAC_TOP BN0 (WF_RMAC) */</div><div class='add'>+	{ 0x820ce000, 0x21c00, 0x00200 }, /* WF_LMAC_TOP (WF_SEC) */</div><div class='add'>+	{ 0x820e7000, 0x21e00, 0x00200 }, /* WF_LMAC_TOP BN0 (WF_DMA) */</div><div class='add'>+	{ 0x820cf000, 0x22000, 0x01000 }, /* WF_LMAC_TOP (WF_PF) */</div><div class='add'>+	{ 0x820e9000, 0x23400, 0x00200 }, /* WF_LMAC_TOP BN0 (WF_WTBLOFF) */</div><div class='add'>+	{ 0x820ea000, 0x24000, 0x00200 }, /* WF_LMAC_TOP BN0 (WF_ETBF) */</div><div class='add'>+	{ 0x820eb000, 0x24200, 0x00400 }, /* WF_LMAC_TOP BN0 (WF_LPON) */</div><div class='add'>+	{ 0x820ec000, 0x24600, 0x00200 }, /* WF_LMAC_TOP BN0 (WF_INT) */</div><div class='add'>+	{ 0x820ed000, 0x24800, 0x00800 }, /* WF_LMAC_TOP BN0 (WF_MIB) */</div><div class='add'>+	{ 0x820ca000, 0x26000, 0x02000 }, /* WF_LMAC_TOP BN0 (WF_MUCOP) */</div><div class='add'>+	{ 0x820d0000, 0x30000, 0x10000 }, /* WF_LMAC_TOP (WF_WTBLON) */</div><div class='add'>+	{ 0x00400000, 0x80000, 0x10000 }, /* WF_MCU_SYSRAM */</div><div class='add'>+	{ 0x00410000, 0x90000, 0x10000 }, /* WF_MCU_SYSRAM (configure cr) */</div><div class='add'>+	{ 0x820f0000, 0xa0000, 0x00400 }, /* WF_LMAC_TOP BN1 (WF_CFG) */</div><div class='add'>+	{ 0x820f1000, 0xa0600, 0x00200 }, /* WF_LMAC_TOP BN1 (WF_TRB) */</div><div class='add'>+	{ 0x820f2000, 0xa0800, 0x00400 }, /* WF_LMAC_TOP BN1 (WF_AGG) */</div><div class='add'>+	{ 0x820f3000, 0xa0c00, 0x00400 }, /* WF_LMAC_TOP BN1 (WF_ARB) */</div><div class='add'>+	{ 0x820f4000, 0xa1000, 0x00400 }, /* WF_LMAC_TOP BN1 (WF_TMAC) */</div><div class='add'>+	{ 0x820f5000, 0xa1400, 0x00800 }, /* WF_LMAC_TOP BN1 (WF_RMAC) */</div><div class='add'>+	{ 0x820f7000, 0xa1e00, 0x00200 }, /* WF_LMAC_TOP BN1 (WF_DMA) */</div><div class='add'>+	{ 0x820f9000, 0xa3400, 0x00200 }, /* WF_LMAC_TOP BN1 (WF_WTBLOFF) */</div><div class='add'>+	{ 0x820fa000, 0xa4000, 0x00200 }, /* WF_LMAC_TOP BN1 (WF_ETBF) */</div><div class='add'>+	{ 0x820fb000, 0xa4200, 0x00400 }, /* WF_LMAC_TOP BN1 (WF_LPON) */</div><div class='add'>+	{ 0x820fc000, 0xa4600, 0x00200 }, /* WF_LMAC_TOP BN1 (WF_INT) */</div><div class='add'>+	{ 0x820fd000, 0xa4800, 0x00800 }, /* WF_LMAC_TOP BN1 (WF_MIB) */</div><div class='add'>+	{ 0x820c4000, 0xa8000, 0x01000 }, /* WF_LMAC_TOP (WF_UWTBL ) */</div><div class='add'>+	{ 0x820b0000, 0xae000, 0x01000 }, /* [APB2] WFSYS_ON */</div><div class='add'>+	{ 0x80020000, 0xb0000, 0x10000 }, /* WF_TOP_MISC_OFF */</div><div class='add'>+	{ 0x81020000, 0xc0000, 0x10000 }, /* WF_TOP_MISC_ON */</div><div class='add'>+	{ 0x0, 0x0, 0x0 }, /* imply end of search */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mt76_connac_reg_map mt7986_reg_map[] = {</div><div class='add'>+	{ 0x54000000, 0x402000, 0x01000 }, /* WFDMA_0 (PCIE0 MCU DMA0) */</div><div class='add'>+	{ 0x55000000, 0x403000, 0x01000 }, /* WFDMA_1 (PCIE0 MCU DMA1) */</div><div class='add'>+	{ 0x56000000, 0x404000, 0x01000 }, /* WFDMA_2 (Reserved) */</div><div class='add'>+	{ 0x57000000, 0x405000, 0x01000 }, /* WFDMA_3 (MCU wrap CR) */</div><div class='add'>+	{ 0x58000000, 0x406000, 0x01000 }, /* WFDMA_4 (PCIE1 MCU DMA0) */</div><div class='add'>+	{ 0x59000000, 0x407000, 0x01000 }, /* WFDMA_5 (PCIE1 MCU DMA1) */</div><div class='add'>+	{ 0x820c0000, 0x408000, 0x04000 }, /* WF_UMAC_TOP (PLE) */</div><div class='add'>+	{ 0x820c8000, 0x40c000, 0x02000 }, /* WF_UMAC_TOP (PSE) */</div><div class='add'>+	{ 0x820cc000, 0x40e000, 0x02000 }, /* WF_UMAC_TOP (PP) */</div><div class='add'>+	{ 0x820e0000, 0x420000, 0x00400 }, /* WF_LMAC_TOP BN0 (WF_CFG) */</div><div class='add'>+	{ 0x820e1000, 0x420400, 0x00200 }, /* WF_LMAC_TOP BN0 (WF_TRB) */</div><div class='add'>+	{ 0x820e2000, 0x420800, 0x00400 }, /* WF_LMAC_TOP BN0 (WF_AGG) */</div><div class='add'>+	{ 0x820e3000, 0x420c00, 0x00400 }, /* WF_LMAC_TOP BN0 (WF_ARB) */</div><div class='add'>+	{ 0x820e4000, 0x421000, 0x00400 }, /* WF_LMAC_TOP BN0 (WF_TMAC) */</div><div class='add'>+	{ 0x820e5000, 0x421400, 0x00800 }, /* WF_LMAC_TOP BN0 (WF_RMAC) */</div><div class='add'>+	{ 0x820ce000, 0x421c00, 0x00200 }, /* WF_LMAC_TOP (WF_SEC) */</div><div class='add'>+	{ 0x820e7000, 0x421e00, 0x00200 }, /* WF_LMAC_TOP BN0 (WF_DMA) */</div><div class='add'>+	{ 0x820cf000, 0x422000, 0x01000 }, /* WF_LMAC_TOP (WF_PF) */</div><div class='add'>+	{ 0x820e9000, 0x423400, 0x00200 }, /* WF_LMAC_TOP BN0 (WF_WTBLOFF) */</div><div class='add'>+	{ 0x820ea000, 0x424000, 0x00200 }, /* WF_LMAC_TOP BN0 (WF_ETBF) */</div><div class='add'>+	{ 0x820eb000, 0x424200, 0x00400 }, /* WF_LMAC_TOP BN0 (WF_LPON) */</div><div class='add'>+	{ 0x820ec000, 0x424600, 0x00200 }, /* WF_LMAC_TOP BN0 (WF_INT) */</div><div class='add'>+	{ 0x820ed000, 0x424800, 0x00800 }, /* WF_LMAC_TOP BN0 (WF_MIB) */</div><div class='add'>+	{ 0x820ca000, 0x426000, 0x02000 }, /* WF_LMAC_TOP BN0 (WF_MUCOP) */</div><div class='add'>+	{ 0x820d0000, 0x430000, 0x10000 }, /* WF_LMAC_TOP (WF_WTBLON) */</div><div class='add'>+	{ 0x00400000, 0x480000, 0x10000 }, /* WF_MCU_SYSRAM */</div><div class='add'>+	{ 0x00410000, 0x490000, 0x10000 }, /* WF_MCU_SYSRAM */</div><div class='add'>+	{ 0x820f0000, 0x4a0000, 0x00400 }, /* WF_LMAC_TOP BN1 (WF_CFG) */</div><div class='add'>+	{ 0x820f1000, 0x4a0600, 0x00200 }, /* WF_LMAC_TOP BN1 (WF_TRB) */</div><div class='add'>+	{ 0x820f2000, 0x4a0800, 0x00400 }, /* WF_LMAC_TOP BN1 (WF_AGG) */</div><div class='add'>+	{ 0x820f3000, 0x4a0c00, 0x00400 }, /* WF_LMAC_TOP BN1 (WF_ARB) */</div><div class='add'>+	{ 0x820f4000, 0x4a1000, 0x00400 }, /* WF_LMAC_TOP BN1 (WF_TMAC) */</div><div class='add'>+	{ 0x820f5000, 0x4a1400, 0x00800 }, /* WF_LMAC_TOP BN1 (WF_RMAC) */</div><div class='add'>+	{ 0x820f7000, 0x4a1e00, 0x00200 }, /* WF_LMAC_TOP BN1 (WF_DMA) */</div><div class='add'>+	{ 0x820f9000, 0x4a3400, 0x00200 }, /* WF_LMAC_TOP BN1 (WF_WTBLOFF) */</div><div class='add'>+	{ 0x820fa000, 0x4a4000, 0x00200 }, /* WF_LMAC_TOP BN1 (WF_ETBF) */</div><div class='add'>+	{ 0x820fb000, 0x4a4200, 0x00400 }, /* WF_LMAC_TOP BN1 (WF_LPON) */</div><div class='add'>+	{ 0x820fc000, 0x4a4600, 0x00200 }, /* WF_LMAC_TOP BN1 (WF_INT) */</div><div class='add'>+	{ 0x820fd000, 0x4a4800, 0x00800 }, /* WF_LMAC_TOP BN1 (WF_MIB) */</div><div class='add'>+	{ 0x820c4000, 0x4a8000, 0x01000 }, /* WF_LMAC_TOP (WF_UWTBL ) */</div><div class='add'>+	{ 0x820b0000, 0x4ae000, 0x01000 }, /* [APB2] WFSYS_ON */</div><div class='add'>+	{ 0x80020000, 0x4b0000, 0x10000 }, /* WF_TOP_MISC_OFF */</div><div class='add'>+	{ 0x81020000, 0x4c0000, 0x10000 }, /* WF_TOP_MISC_ON */</div><div class='add'>+	{ 0x89000000, 0x4d0000, 0x01000 }, /* WF_MCU_CFG_ON */</div><div class='add'>+	{ 0x89010000, 0x4d1000, 0x01000 }, /* WF_MCU_CIRQ */</div><div class='add'>+	{ 0x89020000, 0x4d2000, 0x01000 }, /* WF_MCU_GPT */</div><div class='add'>+	{ 0x89030000, 0x4d3000, 0x01000 }, /* WF_MCU_WDT */</div><div class='add'>+	{ 0x80010000, 0x4d4000, 0x01000 }, /* WF_AXIDMA */</div><div class='add'>+	{ 0x0, 0x0, 0x0 }, /* imply end of search */</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static u32 mt7915_reg_map_l1(struct mt7915_dev *dev, u32 addr)</div><div class='ctx'> {</div><div class='ctx'> 	u32 offset = FIELD_GET(MT_HIF_REMAP_L1_OFFSET, addr);</div><div class='ctx'> 	u32 base = FIELD_GET(MT_HIF_REMAP_L1_BASE, addr);</div><div class='add'>+	u32 l1_remap;</div><div class='ctx'> </div><div class='del'>-	mt76_rmw_field(dev, MT_HIF_REMAP_L1, MT_HIF_REMAP_L1_MASK, base);</div><div class='add'>+	if (is_mt798x(&amp;dev-&gt;mt76))</div><div class='add'>+		return MT_CONN_INFRA_OFFSET(addr);</div><div class='add'>+</div><div class='add'>+	l1_remap = is_mt7915(&amp;dev-&gt;mt76) ?</div><div class='add'>+		   MT_HIF_REMAP_L1 : MT_HIF_REMAP_L1_MT7916;</div><div class='add'>+</div><div class='add'>+	dev-&gt;bus_ops-&gt;rmw(&amp;dev-&gt;mt76, l1_remap,</div><div class='add'>+			  MT_HIF_REMAP_L1_MASK,</div><div class='add'>+			  FIELD_PREP(MT_HIF_REMAP_L1_MASK, base));</div><div class='ctx'> 	/* use read to push write */</div><div class='del'>-	mt76_rr(dev, MT_HIF_REMAP_L1);</div><div class='add'>+	dev-&gt;bus_ops-&gt;rr(&amp;dev-&gt;mt76, l1_remap);</div><div class='ctx'> </div><div class='ctx'> 	return MT_HIF_REMAP_BASE_L1 + offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 mt7915_reg_map_l2(struct mt7915_dev *dev, u32 addr)</div><div class='ctx'> {</div><div class='del'>-	u32 offset = FIELD_GET(MT_HIF_REMAP_L2_OFFSET, addr);</div><div class='del'>-	u32 base = FIELD_GET(MT_HIF_REMAP_L2_BASE, addr);</div><div class='add'>+	u32 offset, base;</div><div class='ctx'> </div><div class='del'>-	mt76_rmw_field(dev, MT_HIF_REMAP_L2, MT_HIF_REMAP_L2_MASK, base);</div><div class='del'>-	/* use read to push write */</div><div class='del'>-	mt76_rr(dev, MT_HIF_REMAP_L2);</div><div class='add'>+	if (is_mt7915(&amp;dev-&gt;mt76)) {</div><div class='add'>+		offset = FIELD_GET(MT_HIF_REMAP_L2_OFFSET, addr);</div><div class='add'>+		base = FIELD_GET(MT_HIF_REMAP_L2_BASE, addr);</div><div class='add'>+</div><div class='add'>+		dev-&gt;bus_ops-&gt;rmw(&amp;dev-&gt;mt76, MT_HIF_REMAP_L2,</div><div class='add'>+				  MT_HIF_REMAP_L2_MASK,</div><div class='add'>+				  FIELD_PREP(MT_HIF_REMAP_L2_MASK, base));</div><div class='add'>+</div><div class='add'>+		/* use read to push write */</div><div class='add'>+		dev-&gt;bus_ops-&gt;rr(&amp;dev-&gt;mt76, MT_HIF_REMAP_L2);</div><div class='add'>+	} else {</div><div class='add'>+		u32 ofs = is_mt798x(&amp;dev-&gt;mt76) ? 0x400000 : 0;</div><div class='add'>+</div><div class='add'>+		offset = FIELD_GET(MT_HIF_REMAP_L2_OFFSET_MT7916, addr);</div><div class='add'>+		base = FIELD_GET(MT_HIF_REMAP_L2_BASE_MT7916, addr);</div><div class='add'>+</div><div class='add'>+		dev-&gt;bus_ops-&gt;rmw(&amp;dev-&gt;mt76, MT_HIF_REMAP_L2_MT7916 + ofs,</div><div class='add'>+				  MT_HIF_REMAP_L2_MASK_MT7916,</div><div class='add'>+				  FIELD_PREP(MT_HIF_REMAP_L2_MASK_MT7916, base));</div><div class='add'>+</div><div class='add'>+		/* use read to push write */</div><div class='add'>+		dev-&gt;bus_ops-&gt;rr(&amp;dev-&gt;mt76, MT_HIF_REMAP_L2_MT7916 + ofs);</div><div class='add'>+</div><div class='add'>+		offset += (MT_HIF_REMAP_BASE_L2_MT7916 + ofs);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return MT_HIF_REMAP_BASE_L2 + offset;</div><div class='add'>+	return offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 __mt7915_reg_addr(struct mt7915_dev *dev, u32 addr)</div><div class='ctx'> {</div><div class='del'>-	static const struct {</div><div class='del'>-		u32 phys;</div><div class='del'>-		u32 mapped;</div><div class='del'>-		u32 size;</div><div class='del'>-	} fixed_map[] = {</div><div class='del'>-		{ 0x54000000, 0x02000, 0x1000 }, /* WFDMA PCIE0 MCU DMA0 */</div><div class='del'>-		{ 0x55000000, 0x03000, 0x1000 }, /* WFDMA PCIE0 MCU DMA1 */</div><div class='del'>-		{ 0x58000000, 0x06000, 0x1000 }, /* WFDMA PCIE1 MCU DMA0 (MEM_DMA) */</div><div class='del'>-		{ 0x59000000, 0x07000, 0x1000 }, /* WFDMA PCIE1 MCU DMA1 */</div><div class='del'>-		{ 0x7c000000, 0xf0000, 0x10000 }, /* CONN_INFRA */</div><div class='del'>-		{ 0x7c020000, 0xd0000, 0x10000 }, /* CONN_INFRA, WFDMA */</div><div class='del'>-		{ 0x80020000, 0xb0000, 0x10000 }, /* WF_TOP_MISC_OFF */</div><div class='del'>-		{ 0x81020000, 0xc0000, 0x10000 }, /* WF_TOP_MISC_ON */</div><div class='del'>-		{ 0x820c0000, 0x08000, 0x4000 }, /* WF_UMAC_TOP (PLE) */</div><div class='del'>-		{ 0x820c8000, 0x0c000, 0x2000 }, /* WF_UMAC_TOP (PSE) */</div><div class='del'>-		{ 0x820cc000, 0x0e000, 0x2000 }, /* WF_UMAC_TOP (PP) */</div><div class='del'>-		{ 0x820ce000, 0x21c00, 0x0200 }, /* WF_LMAC_TOP (WF_SEC) */</div><div class='del'>-		{ 0x820cf000, 0x22000, 0x1000 }, /* WF_LMAC_TOP (WF_PF) */</div><div class='del'>-		{ 0x820d0000, 0x30000, 0x10000 }, /* WF_LMAC_TOP (WF_WTBLON) */</div><div class='del'>-		{ 0x820e0000, 0x20000, 0x0400 }, /* WF_LMAC_TOP BN0 (WF_CFG) */</div><div class='del'>-		{ 0x820e1000, 0x20400, 0x0200 }, /* WF_LMAC_TOP BN0 (WF_TRB) */</div><div class='del'>-		{ 0x820e2000, 0x20800, 0x0400 }, /* WF_LMAC_TOP BN0 (WF_AGG) */</div><div class='del'>-		{ 0x820e3000, 0x20c00, 0x0400 }, /* WF_LMAC_TOP BN0 (WF_ARB) */</div><div class='del'>-		{ 0x820e4000, 0x21000, 0x0400 }, /* WF_LMAC_TOP BN0 (WF_TMAC) */</div><div class='del'>-		{ 0x820e5000, 0x21400, 0x0800 }, /* WF_LMAC_TOP BN0 (WF_RMAC) */</div><div class='del'>-		{ 0x820e7000, 0x21e00, 0x0200 }, /* WF_LMAC_TOP BN0 (WF_DMA) */</div><div class='del'>-		{ 0x820e9000, 0x23400, 0x0200 }, /* WF_LMAC_TOP BN0 (WF_WTBLOFF) */</div><div class='del'>-		{ 0x820ea000, 0x24000, 0x0200 }, /* WF_LMAC_TOP BN0 (WF_ETBF) */</div><div class='del'>-		{ 0x820eb000, 0x24200, 0x0400 }, /* WF_LMAC_TOP BN0 (WF_LPON) */</div><div class='del'>-		{ 0x820ec000, 0x24600, 0x0200 }, /* WF_LMAC_TOP BN0 (WF_INT) */</div><div class='del'>-		{ 0x820ed000, 0x24800, 0x0800 }, /* WF_LMAC_TOP BN0 (WF_MIB) */</div><div class='del'>-		{ 0x820f0000, 0xa0000, 0x0400 }, /* WF_LMAC_TOP BN1 (WF_CFG) */</div><div class='del'>-		{ 0x820f1000, 0xa0600, 0x0200 }, /* WF_LMAC_TOP BN1 (WF_TRB) */</div><div class='del'>-		{ 0x820f2000, 0xa0800, 0x0400 }, /* WF_LMAC_TOP BN1 (WF_AGG) */</div><div class='del'>-		{ 0x820f3000, 0xa0c00, 0x0400 }, /* WF_LMAC_TOP BN1 (WF_ARB) */</div><div class='del'>-		{ 0x820f4000, 0xa1000, 0x0400 }, /* WF_LMAC_TOP BN1 (WF_TMAC) */</div><div class='del'>-		{ 0x820f5000, 0xa1400, 0x0800 }, /* WF_LMAC_TOP BN1 (WF_RMAC) */</div><div class='del'>-		{ 0x820f7000, 0xa1e00, 0x0200 }, /* WF_LMAC_TOP BN1 (WF_DMA) */</div><div class='del'>-		{ 0x820f9000, 0xa3400, 0x0200 }, /* WF_LMAC_TOP BN1 (WF_WTBLOFF) */</div><div class='del'>-		{ 0x820fa000, 0xa4000, 0x0200 }, /* WF_LMAC_TOP BN1 (WF_ETBF) */</div><div class='del'>-		{ 0x820fb000, 0xa4200, 0x0400 }, /* WF_LMAC_TOP BN1 (WF_LPON) */</div><div class='del'>-		{ 0x820fc000, 0xa4600, 0x0200 }, /* WF_LMAC_TOP BN1 (WF_INT) */</div><div class='del'>-		{ 0x820fd000, 0xa4800, 0x0800 }, /* WF_LMAC_TOP BN1 (WF_MIB) */</div><div class='del'>-	};</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (addr &lt; 0x100000)</div><div class='ctx'> 		return addr;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(fixed_map); i++) {</div><div class='add'>+	if (!dev-&gt;reg.map) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "err: reg_map is null\n");</div><div class='add'>+		return addr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;reg.map_size; i++) {</div><div class='ctx'> 		u32 ofs;</div><div class='ctx'> </div><div class='del'>-		if (addr &lt; fixed_map[i].phys)</div><div class='add'>+		if (addr &lt; dev-&gt;reg.map[i].phys)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		ofs = addr - fixed_map[i].phys;</div><div class='del'>-		if (ofs &gt; fixed_map[i].size)</div><div class='add'>+		ofs = addr - dev-&gt;reg.map[i].phys;</div><div class='add'>+		if (ofs &gt;= dev-&gt;reg.map[i].size)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		return fixed_map[i].mapped + ofs;</div><div class='add'>+		return dev-&gt;reg.map[i].maps + ofs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((addr &gt;= 0x18000000 &amp;&amp; addr &lt; 0x18c00000) ||</div><div class='del'>-	    (addr &gt;= 0x70000000 &amp;&amp; addr &lt; 0x78000000) ||</div><div class='del'>-	    (addr &gt;= 0x7c000000 &amp;&amp; addr &lt; 0x7c400000))</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 __mt7915_reg_remap_addr(struct mt7915_dev *dev, u32 addr)</div><div class='add'>+{</div><div class='add'>+	if ((addr &gt;= MT_INFRA_BASE &amp;&amp; addr &lt; MT_WFSYS0_PHY_START) ||</div><div class='add'>+	    (addr &gt;= MT_WFSYS0_PHY_START &amp;&amp; addr &lt; MT_WFSYS1_PHY_START) ||</div><div class='add'>+	    (addr &gt;= MT_WFSYS1_PHY_START &amp;&amp; addr &lt;= MT_WFSYS1_PHY_END))</div><div class='add'>+		return mt7915_reg_map_l1(dev, addr);</div><div class='add'>+</div><div class='add'>+	if (dev_is_pci(dev-&gt;mt76.dev) &amp;&amp;</div><div class='add'>+	    ((addr &gt;= MT_CBTOP1_PHY_START &amp;&amp; addr &lt;= MT_CBTOP1_PHY_END) ||</div><div class='add'>+	    addr &gt;= MT_CBTOP2_PHY_START))</div><div class='ctx'> 		return mt7915_reg_map_l1(dev, addr);</div><div class='ctx'> </div><div class='add'>+	/* CONN_INFRA: covert to phyiscal addr and use layer 1 remap */</div><div class='add'>+	if (addr &gt;= MT_INFRA_MCU_START &amp;&amp; addr &lt;= MT_INFRA_MCU_END) {</div><div class='add'>+		addr = addr - MT_INFRA_MCU_START + MT_INFRA_BASE;</div><div class='add'>+		return mt7915_reg_map_l1(dev, addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return mt7915_reg_map_l2(dev, addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void mt7915_memcpy_fromio(struct mt7915_dev *dev, void *buf, u32 offset,</div><div class='add'>+			  size_t len)</div><div class='add'>+{</div><div class='add'>+	u32 addr = __mt7915_reg_addr(dev, offset);</div><div class='add'>+</div><div class='add'>+	if (addr) {</div><div class='add'>+		memcpy_fromio(buf, dev-&gt;mt76.mmio.regs + addr, len);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;reg_lock);</div><div class='add'>+	memcpy_fromio(buf, dev-&gt;mt76.mmio.regs +</div><div class='add'>+			   __mt7915_reg_remap_addr(dev, offset), len);</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;reg_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u32 mt7915_rr(struct mt76_dev *mdev, u32 offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);</div><div class='del'>-	u32 addr = __mt7915_reg_addr(dev, offset);</div><div class='add'>+	u32 addr = __mt7915_reg_addr(dev, offset), val;</div><div class='add'>+</div><div class='add'>+	if (addr)</div><div class='add'>+		return dev-&gt;bus_ops-&gt;rr(mdev, addr);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;reg_lock);</div><div class='add'>+	val = dev-&gt;bus_ops-&gt;rr(mdev, __mt7915_reg_remap_addr(dev, offset));</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;reg_lock);</div><div class='ctx'> </div><div class='del'>-	return dev-&gt;bus_ops-&gt;rr(mdev, addr);</div><div class='add'>+	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mt7915_wr(struct mt76_dev *mdev, u32 offset, u32 val)</div><div class='hunk'>@@ -112,7 +552,14 @@ static void mt7915_wr(struct mt76_dev *mdev, u32 offset, u32 val)</div><div class='ctx'> 	struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);</div><div class='ctx'> 	u32 addr = __mt7915_reg_addr(dev, offset);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;bus_ops-&gt;wr(mdev, addr, val);</div><div class='add'>+	if (addr) {</div><div class='add'>+		dev-&gt;bus_ops-&gt;wr(mdev, addr, val);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;reg_lock);</div><div class='add'>+	dev-&gt;bus_ops-&gt;wr(mdev, __mt7915_reg_remap_addr(dev, offset), val);</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;reg_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 mt7915_rmw(struct mt76_dev *mdev, u32 offset, u32 mask, u32 val)</div><div class='hunk'>@@ -120,16 +567,210 @@ static u32 mt7915_rmw(struct mt76_dev *mdev, u32 offset, u32 mask, u32 val)</div><div class='ctx'> 	struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);</div><div class='ctx'> 	u32 addr = __mt7915_reg_addr(dev, offset);</div><div class='ctx'> </div><div class='del'>-	return dev-&gt;bus_ops-&gt;rmw(mdev, addr, mask, val);</div><div class='add'>+	if (addr)</div><div class='add'>+		return dev-&gt;bus_ops-&gt;rmw(mdev, addr, mask, val);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;reg_lock);</div><div class='add'>+	val = dev-&gt;bus_ops-&gt;rmw(mdev, __mt7915_reg_remap_addr(dev, offset), mask, val);</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NET_MEDIATEK_SOC_WED</div><div class='add'>+static void mt7915_mmio_wed_update_rx_stats(struct mtk_wed_device *wed,</div><div class='add'>+					    struct mtk_wed_wo_rx_stats *stats)</div><div class='add'>+{</div><div class='add'>+	int idx = le16_to_cpu(stats-&gt;wlan_idx);</div><div class='add'>+	struct mt7915_dev *dev;</div><div class='add'>+	struct mt76_wcid *wcid;</div><div class='add'>+</div><div class='add'>+	dev = container_of(wed, struct mt7915_dev, mt76.mmio.wed);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	wcid = mt76_wcid_ptr(dev, idx);</div><div class='add'>+	if (wcid) {</div><div class='add'>+		wcid-&gt;stats.rx_bytes += le32_to_cpu(stats-&gt;rx_byte_cnt);</div><div class='add'>+		wcid-&gt;stats.rx_packets += le32_to_cpu(stats-&gt;rx_pkt_cnt);</div><div class='add'>+		wcid-&gt;stats.rx_errors += le32_to_cpu(stats-&gt;rx_err_cnt);</div><div class='add'>+		wcid-&gt;stats.rx_drops += le32_to_cpu(stats-&gt;rx_drop_cnt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7915_mmio_wed_reset(struct mtk_wed_device *wed)</div><div class='add'>+{</div><div class='add'>+	struct mt76_dev *mdev = container_of(wed, struct mt76_dev, mmio.wed);</div><div class='add'>+	struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);</div><div class='add'>+	struct mt76_phy *mphy = &amp;dev-&gt;mphy;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (test_and_set_bit(MT76_STATE_WED_RESET, &amp;mphy-&gt;state))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	ret = mt7915_mcu_set_ser(dev, SER_RECOVER, SER_SET_RECOVER_L1,</div><div class='add'>+				 mphy-&gt;band_idx);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	if (!wait_for_completion_timeout(&amp;mdev-&gt;mmio.wed_reset, 20 * HZ)) {</div><div class='add'>+		dev_err(mdev-&gt;dev, "wed reset timeout\n");</div><div class='add'>+		ret = -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+	rtnl_lock();</div><div class='add'>+out:</div><div class='add'>+	clear_bit(MT76_STATE_WED_RESET, &amp;mphy-&gt;state);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-int mt7915_mmio_init(struct mt76_dev *mdev, void __iomem *mem_base, int irq)</div><div class='add'>+int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr,</div><div class='add'>+			 bool pci, int *irq)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_NET_MEDIATEK_SOC_WED</div><div class='add'>+	struct mtk_wed_device *wed = &amp;dev-&gt;mt76.mmio.wed;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!wed_enable)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (pci) {</div><div class='add'>+		struct pci_dev *pci_dev = pdev_ptr;</div><div class='add'>+</div><div class='add'>+		wed-&gt;wlan.pci_dev = pci_dev;</div><div class='add'>+		wed-&gt;wlan.bus_type = MTK_WED_BUS_PCIE;</div><div class='add'>+		wed-&gt;wlan.base = devm_ioremap(dev-&gt;mt76.dev,</div><div class='add'>+					      pci_resource_start(pci_dev, 0),</div><div class='add'>+					      pci_resource_len(pci_dev, 0));</div><div class='add'>+		if (!wed-&gt;wlan.base)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		wed-&gt;wlan.phy_base = pci_resource_start(pci_dev, 0);</div><div class='add'>+		wed-&gt;wlan.wpdma_int = pci_resource_start(pci_dev, 0) +</div><div class='add'>+				      MT_INT_WED_SOURCE_CSR;</div><div class='add'>+		wed-&gt;wlan.wpdma_mask = pci_resource_start(pci_dev, 0) +</div><div class='add'>+				       MT_INT_WED_MASK_CSR;</div><div class='add'>+		wed-&gt;wlan.wpdma_phys = pci_resource_start(pci_dev, 0) +</div><div class='add'>+				       MT_WFDMA_EXT_CSR_BASE;</div><div class='add'>+		wed-&gt;wlan.wpdma_tx = pci_resource_start(pci_dev, 0) +</div><div class='add'>+				     MT_TXQ_WED_RING_BASE;</div><div class='add'>+		wed-&gt;wlan.wpdma_txfree = pci_resource_start(pci_dev, 0) +</div><div class='add'>+					 MT_RXQ_WED_RING_BASE;</div><div class='add'>+		wed-&gt;wlan.wpdma_rx_glo = pci_resource_start(pci_dev, 0) +</div><div class='add'>+					 MT_WPDMA_GLO_CFG;</div><div class='add'>+		wed-&gt;wlan.wpdma_rx[0] = pci_resource_start(pci_dev, 0) +</div><div class='add'>+					MT_RXQ_WED_DATA_RING_BASE;</div><div class='add'>+	} else {</div><div class='add'>+		struct platform_device *plat_dev = pdev_ptr;</div><div class='add'>+		struct resource *res;</div><div class='add'>+</div><div class='add'>+		res = platform_get_resource(plat_dev, IORESOURCE_MEM, 0);</div><div class='add'>+		if (!res)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		wed-&gt;wlan.platform_dev = plat_dev;</div><div class='add'>+		wed-&gt;wlan.bus_type = MTK_WED_BUS_AXI;</div><div class='add'>+		wed-&gt;wlan.base = devm_ioremap(dev-&gt;mt76.dev, res-&gt;start,</div><div class='add'>+					      resource_size(res));</div><div class='add'>+		if (!wed-&gt;wlan.base)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		wed-&gt;wlan.phy_base = res-&gt;start;</div><div class='add'>+		wed-&gt;wlan.wpdma_int = res-&gt;start + MT_INT_SOURCE_CSR;</div><div class='add'>+		wed-&gt;wlan.wpdma_mask = res-&gt;start + MT_INT_MASK_CSR;</div><div class='add'>+		wed-&gt;wlan.wpdma_tx = res-&gt;start + MT_TXQ_WED_RING_BASE;</div><div class='add'>+		wed-&gt;wlan.wpdma_txfree = res-&gt;start + MT_RXQ_WED_RING_BASE;</div><div class='add'>+		wed-&gt;wlan.wpdma_rx_glo = res-&gt;start + MT_WPDMA_GLO_CFG;</div><div class='add'>+		wed-&gt;wlan.wpdma_rx[0] = res-&gt;start + MT_RXQ_WED_DATA_RING_BASE;</div><div class='add'>+	}</div><div class='add'>+	wed-&gt;wlan.nbuf = MT7915_HW_TOKEN_SIZE;</div><div class='add'>+	wed-&gt;wlan.tx_tbit[0] = is_mt7915(&amp;dev-&gt;mt76) ? 4 : 30;</div><div class='add'>+	wed-&gt;wlan.tx_tbit[1] = is_mt7915(&amp;dev-&gt;mt76) ? 5 : 31;</div><div class='add'>+	wed-&gt;wlan.txfree_tbit = is_mt798x(&amp;dev-&gt;mt76) ? 2 : 1;</div><div class='add'>+	wed-&gt;wlan.token_start = MT7915_TOKEN_SIZE - wed-&gt;wlan.nbuf;</div><div class='add'>+	wed-&gt;wlan.wcid_512 = !is_mt7915(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	wed-&gt;wlan.rx_nbuf = 65536;</div><div class='add'>+	wed-&gt;wlan.rx_npkt = MT7915_WED_RX_TOKEN_SIZE;</div><div class='add'>+	wed-&gt;wlan.rx_size = SKB_WITH_OVERHEAD(MT_RX_BUF_SIZE);</div><div class='add'>+	if (is_mt7915(&amp;dev-&gt;mt76)) {</div><div class='add'>+		wed-&gt;wlan.rx_tbit[0] = 16;</div><div class='add'>+		wed-&gt;wlan.rx_tbit[1] = 17;</div><div class='add'>+	} else if (is_mt798x(&amp;dev-&gt;mt76)) {</div><div class='add'>+		wed-&gt;wlan.rx_tbit[0] = 22;</div><div class='add'>+		wed-&gt;wlan.rx_tbit[1] = 23;</div><div class='add'>+	} else {</div><div class='add'>+		wed-&gt;wlan.rx_tbit[0] = 18;</div><div class='add'>+		wed-&gt;wlan.rx_tbit[1] = 19;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wed-&gt;wlan.init_buf = mt7915_wed_init_buf;</div><div class='add'>+	wed-&gt;wlan.offload_enable = mt76_wed_offload_enable;</div><div class='add'>+	wed-&gt;wlan.offload_disable = mt76_wed_offload_disable;</div><div class='add'>+	wed-&gt;wlan.init_rx_buf = mt76_wed_init_rx_buf;</div><div class='add'>+	wed-&gt;wlan.release_rx_buf = mt76_wed_release_rx_buf;</div><div class='add'>+	wed-&gt;wlan.update_wo_rx_stats = mt7915_mmio_wed_update_rx_stats;</div><div class='add'>+	wed-&gt;wlan.reset = mt7915_mmio_wed_reset;</div><div class='add'>+	wed-&gt;wlan.reset_complete = mt76_wed_reset_complete;</div><div class='add'>+</div><div class='add'>+	dev-&gt;mt76.rx_token_size = wed-&gt;wlan.rx_npkt;</div><div class='add'>+</div><div class='add'>+	if (mtk_wed_device_attach(wed))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	*irq = wed-&gt;irq;</div><div class='add'>+	dev-&gt;mt76.dma_dev = wed-&gt;dev;</div><div class='add'>+</div><div class='add'>+	ret = dma_set_mask(wed-&gt;dev, DMA_BIT_MASK(32));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+#else</div><div class='add'>+	return 0;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7915_mmio_init(struct mt76_dev *mdev,</div><div class='add'>+			    void __iomem *mem_base,</div><div class='add'>+			    u32 device_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_bus_ops *bus_ops;</div><div class='ctx'> 	struct mt7915_dev *dev;</div><div class='ctx'> </div><div class='ctx'> 	dev = container_of(mdev, struct mt7915_dev, mt76);</div><div class='ctx'> 	mt76_mmio_init(&amp;dev-&gt;mt76, mem_base);</div><div class='add'>+	spin_lock_init(&amp;dev-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	switch (device_id) {</div><div class='add'>+	case 0x7915:</div><div class='add'>+		dev-&gt;reg.reg_rev = mt7915_reg;</div><div class='add'>+		dev-&gt;reg.offs_rev = mt7915_offs;</div><div class='add'>+		dev-&gt;reg.map = mt7915_reg_map;</div><div class='add'>+		dev-&gt;reg.map_size = ARRAY_SIZE(mt7915_reg_map);</div><div class='add'>+		break;</div><div class='add'>+	case 0x7906:</div><div class='add'>+		dev-&gt;reg.reg_rev = mt7916_reg;</div><div class='add'>+		dev-&gt;reg.offs_rev = mt7916_offs;</div><div class='add'>+		dev-&gt;reg.map = mt7916_reg_map;</div><div class='add'>+		dev-&gt;reg.map_size = ARRAY_SIZE(mt7916_reg_map);</div><div class='add'>+		break;</div><div class='add'>+	case 0x7981:</div><div class='add'>+	case 0x7986:</div><div class='add'>+		dev-&gt;reg.reg_rev = mt7986_reg;</div><div class='add'>+		dev-&gt;reg.offs_rev = mt7916_offs;</div><div class='add'>+		dev-&gt;reg.map = mt7986_reg_map;</div><div class='add'>+		dev-&gt;reg.map_size = ARRAY_SIZE(mt7986_reg_map);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;bus_ops = dev-&gt;mt76.bus;</div><div class='ctx'> 	bus_ops = devm_kmemdup(dev-&gt;mt76.dev, dev-&gt;bus_ops, sizeof(*bus_ops),</div><div class='hunk'>@@ -142,11 +783,222 @@ int mt7915_mmio_init(struct mt76_dev *mdev, void __iomem *mem_base, int irq)</div><div class='ctx'> 	bus_ops-&gt;rmw = mt7915_rmw;</div><div class='ctx'> 	dev-&gt;mt76.bus = bus_ops;</div><div class='ctx'> </div><div class='del'>-	mdev-&gt;rev = (mt76_rr(dev, MT_HW_CHIPID) &lt;&lt; 16) |</div><div class='add'>+	mdev-&gt;rev = (device_id &lt;&lt; 16) |</div><div class='ctx'> 		    (mt76_rr(dev, MT_HW_REV) &amp; 0xff);</div><div class='ctx'> 	dev_dbg(mdev-&gt;dev, "ASIC revision: %04x\n", mdev-&gt;rev);</div><div class='ctx'> </div><div class='del'>-	mt76_wr(dev, MT_INT_MASK_CSR, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7915_dual_hif_set_irq_mask(struct mt7915_dev *dev,</div><div class='add'>+				  bool write_reg,</div><div class='add'>+				  u32 clear, u32 set)</div><div class='add'>+{</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;mdev-&gt;mmio.irq_lock, flags);</div><div class='add'>+</div><div class='add'>+	mdev-&gt;mmio.irqmask &amp;= ~clear;</div><div class='add'>+	mdev-&gt;mmio.irqmask |= set;</div><div class='add'>+</div><div class='add'>+	if (write_reg) {</div><div class='add'>+		if (mtk_wed_device_active(&amp;mdev-&gt;mmio.wed))</div><div class='add'>+			mtk_wed_device_irq_set_mask(&amp;mdev-&gt;mmio.wed,</div><div class='add'>+						    mdev-&gt;mmio.irqmask);</div><div class='add'>+		else</div><div class='add'>+			mt76_wr(dev, MT_INT_MASK_CSR, mdev-&gt;mmio.irqmask);</div><div class='add'>+		mt76_wr(dev, MT_INT1_MASK_CSR, mdev-&gt;mmio.irqmask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;mdev-&gt;mmio.irq_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7915_rx_poll_complete(struct mt76_dev *mdev,</div><div class='add'>+				    enum mt76_rxq_id q)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);</div><div class='add'>+</div><div class='add'>+	mt7915_irq_enable(dev, MT_INT_RX(q));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* TODO: support 2/4/6/8 MSI-X vectors */</div><div class='add'>+static void mt7915_irq_tasklet(struct tasklet_struct *t)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = from_tasklet(dev, t, mt76.irq_tasklet);</div><div class='add'>+	struct mtk_wed_device *wed = &amp;dev-&gt;mt76.mmio.wed;</div><div class='add'>+	u32 intr, intr1, mask;</div><div class='add'>+</div><div class='add'>+	if (mtk_wed_device_active(wed)) {</div><div class='add'>+		mtk_wed_device_irq_set_mask(wed, 0);</div><div class='add'>+		if (dev-&gt;hif2)</div><div class='add'>+			mt76_wr(dev, MT_INT1_MASK_CSR, 0);</div><div class='add'>+		intr = mtk_wed_device_irq_get(wed, dev-&gt;mt76.mmio.irqmask);</div><div class='add'>+	} else {</div><div class='add'>+		mt76_wr(dev, MT_INT_MASK_CSR, 0);</div><div class='add'>+		if (dev-&gt;hif2)</div><div class='add'>+			mt76_wr(dev, MT_INT1_MASK_CSR, 0);</div><div class='add'>+</div><div class='add'>+		intr = mt76_rr(dev, MT_INT_SOURCE_CSR);</div><div class='add'>+		intr &amp;= dev-&gt;mt76.mmio.irqmask;</div><div class='add'>+		mt76_wr(dev, MT_INT_SOURCE_CSR, intr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;hif2) {</div><div class='add'>+		intr1 = mt76_rr(dev, MT_INT1_SOURCE_CSR);</div><div class='add'>+		intr1 &amp;= dev-&gt;mt76.mmio.irqmask;</div><div class='add'>+		mt76_wr(dev, MT_INT1_SOURCE_CSR, intr1);</div><div class='add'>+</div><div class='add'>+		intr |= intr1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trace_dev_irq(&amp;dev-&gt;mt76, intr, dev-&gt;mt76.mmio.irqmask);</div><div class='add'>+</div><div class='add'>+	mask = intr &amp; MT_INT_RX_DONE_ALL;</div><div class='add'>+	if (intr &amp; MT_INT_TX_DONE_MCU)</div><div class='add'>+		mask |= MT_INT_TX_DONE_MCU;</div><div class='add'>+</div><div class='add'>+	mt7915_irq_disable(dev, mask);</div><div class='add'>+</div><div class='add'>+	if (intr &amp; MT_INT_TX_DONE_MCU)</div><div class='add'>+		napi_schedule(&amp;dev-&gt;mt76.tx_napi);</div><div class='add'>+</div><div class='add'>+	if (intr &amp; MT_INT_RX(MT_RXQ_MAIN))</div><div class='add'>+		napi_schedule(&amp;dev-&gt;mt76.napi[MT_RXQ_MAIN]);</div><div class='add'>+</div><div class='add'>+	if (intr &amp; MT_INT_RX(MT_RXQ_BAND1))</div><div class='add'>+		napi_schedule(&amp;dev-&gt;mt76.napi[MT_RXQ_BAND1]);</div><div class='add'>+</div><div class='add'>+	if (intr &amp; MT_INT_RX(MT_RXQ_MCU))</div><div class='add'>+		napi_schedule(&amp;dev-&gt;mt76.napi[MT_RXQ_MCU]);</div><div class='add'>+</div><div class='add'>+	if (intr &amp; MT_INT_RX(MT_RXQ_MCU_WA))</div><div class='add'>+		napi_schedule(&amp;dev-&gt;mt76.napi[MT_RXQ_MCU_WA]);</div><div class='add'>+</div><div class='add'>+	if (!is_mt7915(&amp;dev-&gt;mt76) &amp;&amp;</div><div class='add'>+	    (intr &amp; MT_INT_RX(MT_RXQ_MAIN_WA)))</div><div class='add'>+		napi_schedule(&amp;dev-&gt;mt76.napi[MT_RXQ_MAIN_WA]);</div><div class='add'>+</div><div class='add'>+	if (intr &amp; MT_INT_RX(MT_RXQ_BAND1_WA))</div><div class='add'>+		napi_schedule(&amp;dev-&gt;mt76.napi[MT_RXQ_BAND1_WA]);</div><div class='add'>+</div><div class='add'>+	if (intr &amp; MT_INT_MCU_CMD) {</div><div class='add'>+		u32 val = mt76_rr(dev, MT_MCU_CMD);</div><div class='add'>+</div><div class='add'>+		mt76_wr(dev, MT_MCU_CMD, val);</div><div class='add'>+		if (val &amp; (MT_MCU_CMD_ERROR_MASK | MT_MCU_CMD_WDT_MASK)) {</div><div class='add'>+			dev-&gt;recovery.state = val;</div><div class='add'>+			mt7915_reset(dev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+irqreturn_t mt7915_irq_handler(int irq, void *dev_instance)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = dev_instance;</div><div class='add'>+	struct mtk_wed_device *wed = &amp;dev-&gt;mt76.mmio.wed;</div><div class='add'>+</div><div class='add'>+	if (mtk_wed_device_active(wed))</div><div class='add'>+		mtk_wed_device_irq_set_mask(wed, 0);</div><div class='add'>+	else</div><div class='add'>+		mt76_wr(dev, MT_INT_MASK_CSR, 0);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;hif2)</div><div class='add'>+		mt76_wr(dev, MT_INT1_MASK_CSR, 0);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(MT76_STATE_INITIALIZED, &amp;dev-&gt;mphy.state))</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	tasklet_schedule(&amp;dev-&gt;mt76.irq_tasklet);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct mt7915_dev *mt7915_mmio_probe(struct device *pdev,</div><div class='add'>+				     void __iomem *mem_base, u32 device_id)</div><div class='add'>+{</div><div class='add'>+	static const struct mt76_driver_ops drv_ops = {</div><div class='add'>+		/* txwi_size = txd size + txp size */</div><div class='add'>+		.txwi_size = MT_TXD_SIZE + sizeof(struct mt76_connac_fw_txp),</div><div class='add'>+		.drv_flags = MT_DRV_TXWI_NO_FREE | MT_DRV_HW_MGMT_TXQ |</div><div class='add'>+			     MT_DRV_AMSDU_OFFLOAD,</div><div class='add'>+		.survey_flags = SURVEY_INFO_TIME_TX |</div><div class='add'>+				SURVEY_INFO_TIME_RX |</div><div class='add'>+				SURVEY_INFO_TIME_BSS_RX,</div><div class='add'>+		.token_size = MT7915_TOKEN_SIZE,</div><div class='add'>+		.tx_prepare_skb = mt7915_tx_prepare_skb,</div><div class='add'>+		.tx_complete_skb = mt76_connac_tx_complete_skb,</div><div class='add'>+		.rx_skb = mt7915_queue_rx_skb,</div><div class='add'>+		.rx_check = mt7915_rx_check,</div><div class='add'>+		.rx_poll_complete = mt7915_rx_poll_complete,</div><div class='add'>+		.sta_add = mt7915_mac_sta_add,</div><div class='add'>+		.sta_event = mt7915_mac_sta_event,</div><div class='add'>+		.sta_remove = mt7915_mac_sta_remove,</div><div class='add'>+		.update_survey = mt7915_update_channel,</div><div class='add'>+		.set_channel = mt7915_set_channel,</div><div class='add'>+	};</div><div class='add'>+	struct mt7915_dev *dev;</div><div class='add'>+	struct mt76_dev *mdev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mdev = mt76_alloc_device(pdev, sizeof(*dev), &amp;mt7915_ops, &amp;drv_ops);</div><div class='add'>+	if (!mdev)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	dev = container_of(mdev, struct mt7915_dev, mt76);</div><div class='add'>+</div><div class='add'>+	ret = mt7915_mmio_init(mdev, mem_base, device_id);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	tasklet_setup(&amp;mdev-&gt;irq_tasklet, mt7915_irq_tasklet);</div><div class='add'>+</div><div class='add'>+	return dev;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	mt76_free_device(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init mt7915_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pci_register_driver(&amp;mt7915_hif_driver);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = pci_register_driver(&amp;mt7915_pci_driver);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error_pci;</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_MT798X_WMAC)) {</div><div class='add'>+		ret = platform_driver_register(&amp;mt798x_wmac_driver);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error_wmac;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+error_wmac:</div><div class='add'>+	pci_unregister_driver(&amp;mt7915_pci_driver);</div><div class='add'>+error_pci:</div><div class='add'>+	pci_unregister_driver(&amp;mt7915_hif_driver);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static void __exit mt7915_exit(void)</div><div class='add'>+{</div><div class='add'>+	if (IS_ENABLED(CONFIG_MT798X_WMAC))</div><div class='add'>+		platform_driver_unregister(&amp;mt798x_wmac_driver);</div><div class='add'>+</div><div class='add'>+	pci_unregister_driver(&amp;mt7915_pci_driver);</div><div class='add'>+	pci_unregister_driver(&amp;mt7915_hif_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(mt7915_init);</div><div class='add'>+module_exit(mt7915_exit);</div><div class='add'>+MODULE_DESCRIPTION("MediaTek MT7915E MMIO helpers");</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h<br/>index 4ea8972d4e2f..b5c06201b707 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MT7915_H</div><div class='hunk'>@@ -6,13 +6,13 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ktime.h&gt;</div><div class='del'>-#include "../mt76.h"</div><div class='add'>+#include "../mt76_connac.h"</div><div class='ctx'> #include "regs.h"</div><div class='ctx'> </div><div class='del'>-#define MT7915_MAX_INTERFACES		32</div><div class='del'>-#define MT7915_MAX_WMM_SETS		4</div><div class='add'>+#define MT7915_MAX_INTERFACES		19</div><div class='ctx'> #define MT7915_WTBL_SIZE		288</div><div class='del'>-#define MT7915_WTBL_RESERVED		(MT7915_WTBL_SIZE - 1)</div><div class='add'>+#define MT7916_WTBL_SIZE		544</div><div class='add'>+#define MT7915_WTBL_RESERVED		(mt7915_wtbl_size(dev) - 1)</div><div class='ctx'> #define MT7915_WTBL_STA			(MT7915_WTBL_RESERVED - \</div><div class='ctx'> 					 MT7915_MAX_INTERFACES)</div><div class='ctx'> </div><div class='hunk'>@@ -30,13 +30,59 @@</div><div class='ctx'> #define MT7915_FIRMWARE_WM		"mediatek/mt7915_wm.bin"</div><div class='ctx'> #define MT7915_ROM_PATCH		"mediatek/mt7915_rom_patch.bin"</div><div class='ctx'> </div><div class='add'>+#define MT7916_FIRMWARE_WA		"mediatek/mt7916_wa.bin"</div><div class='add'>+#define MT7916_FIRMWARE_WM		"mediatek/mt7916_wm.bin"</div><div class='add'>+#define MT7916_ROM_PATCH		"mediatek/mt7916_rom_patch.bin"</div><div class='add'>+</div><div class='add'>+#define MT7981_FIRMWARE_WA		"mediatek/mt7981_wa.bin"</div><div class='add'>+#define MT7981_FIRMWARE_WM		"mediatek/mt7981_wm.bin"</div><div class='add'>+#define MT7981_ROM_PATCH		"mediatek/mt7981_rom_patch.bin"</div><div class='add'>+</div><div class='add'>+#define MT7986_FIRMWARE_WA		"mediatek/mt7986_wa.bin"</div><div class='add'>+#define MT7986_FIRMWARE_WM		"mediatek/mt7986_wm.bin"</div><div class='add'>+#define MT7986_FIRMWARE_WM_MT7975	"mediatek/mt7986_wm_mt7975.bin"</div><div class='add'>+#define MT7986_ROM_PATCH		"mediatek/mt7986_rom_patch.bin"</div><div class='add'>+#define MT7986_ROM_PATCH_MT7975		"mediatek/mt7986_rom_patch_mt7975.bin"</div><div class='add'>+</div><div class='add'>+#define MT7915_EEPROM_DEFAULT		"mediatek/mt7915_eeprom.bin"</div><div class='add'>+#define MT7915_EEPROM_DEFAULT_DBDC	"mediatek/mt7915_eeprom_dbdc.bin"</div><div class='add'>+#define MT7916_EEPROM_DEFAULT		"mediatek/mt7916_eeprom.bin"</div><div class='add'>+</div><div class='add'>+#define MT7981_EEPROM_MT7976_DEFAULT_DBDC	"mediatek/mt7981_eeprom_mt7976_dbdc.bin"</div><div class='add'>+</div><div class='add'>+#define MT7986_EEPROM_MT7975_DEFAULT		"mediatek/mt7986_eeprom_mt7975.bin"</div><div class='add'>+#define MT7986_EEPROM_MT7975_DUAL_DEFAULT	"mediatek/mt7986_eeprom_mt7975_dual.bin"</div><div class='add'>+#define MT7986_EEPROM_MT7976_DEFAULT		"mediatek/mt7986_eeprom_mt7976.bin"</div><div class='add'>+#define MT7986_EEPROM_MT7976_DEFAULT_DBDC	"mediatek/mt7986_eeprom_mt7976_dbdc.bin"</div><div class='add'>+#define MT7986_EEPROM_MT7976_DUAL_DEFAULT	"mediatek/mt7986_eeprom_mt7976_dual.bin"</div><div class='add'>+</div><div class='ctx'> #define MT7915_EEPROM_SIZE		3584</div><div class='add'>+#define MT7916_EEPROM_SIZE		4096</div><div class='add'>+</div><div class='add'>+#define MT7915_EEPROM_BLOCK_SIZE	16</div><div class='add'>+#define MT7915_HW_TOKEN_SIZE		4096</div><div class='ctx'> #define MT7915_TOKEN_SIZE		8192</div><div class='ctx'> </div><div class='ctx'> #define MT7915_CFEND_RATE_DEFAULT	0x49	/* OFDM 24M */</div><div class='ctx'> #define MT7915_CFEND_RATE_11B		0x03	/* 11B LP, 11M */</div><div class='del'>-#define MT7915_5G_RATE_DEFAULT		0x4b	/* OFDM 6M */</div><div class='del'>-#define MT7915_2G_RATE_DEFAULT		0x0	/* CCK 1M */</div><div class='add'>+</div><div class='add'>+#define MT7915_THERMAL_THROTTLE_MAX	100</div><div class='add'>+#define MT7915_CDEV_THROTTLE_MAX	99</div><div class='add'>+</div><div class='add'>+#define MT7915_SKU_RATE_NUM		161</div><div class='add'>+#define MT7915_SKU_PATH_NUM		185</div><div class='add'>+</div><div class='add'>+#define MT7915_MAX_TWT_AGRT		16</div><div class='add'>+#define MT7915_MAX_STA_TWT_AGRT		8</div><div class='add'>+#define MT7915_MIN_TWT_DUR 64</div><div class='add'>+#define MT7915_MAX_QUEUE		(MT_RXQ_BAND2 + __MT_MCUQ_MAX + 2)</div><div class='add'>+</div><div class='add'>+#define MT7915_WED_RX_TOKEN_SIZE	12288</div><div class='add'>+</div><div class='add'>+#define MT7915_CRIT_TEMP_IDX		0</div><div class='add'>+#define MT7915_MAX_TEMP_IDX		1</div><div class='add'>+#define MT7915_CRIT_TEMP		110</div><div class='add'>+#define MT7915_MAX_TEMP			120</div><div class='ctx'> </div><div class='ctx'> struct mt7915_vif;</div><div class='ctx'> struct mt7915_sta;</div><div class='hunk'>@@ -59,55 +105,85 @@ enum mt7915_rxq_id {</div><div class='ctx'> 	MT7915_RXQ_MCU_WA_EXT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mt7915_sta_stats {</div><div class='del'>-	struct rate_info prob_rate;</div><div class='del'>-	struct rate_info tx_rate;</div><div class='del'>-</div><div class='del'>-	unsigned long per;</div><div class='del'>-	unsigned long changed;</div><div class='del'>-	unsigned long jiffies;</div><div class='add'>+enum mt7916_rxq_id {</div><div class='add'>+	MT7916_RXQ_MCU_WM = 0,</div><div class='add'>+	MT7916_RXQ_MCU_WA,</div><div class='add'>+	MT7916_RXQ_MCU_WA_MAIN,</div><div class='add'>+	MT7916_RXQ_MCU_WA_EXT,</div><div class='add'>+	MT7916_RXQ_BAND0,</div><div class='add'>+	MT7916_RXQ_BAND1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mt7915_sta_key_conf {</div><div class='del'>-	s8 keyidx;</div><div class='del'>-	u8 key[16];</div><div class='add'>+struct mt7915_twt_flow {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	u64 start_tsf;</div><div class='add'>+	u64 tsf;</div><div class='add'>+	u32 duration;</div><div class='add'>+	u16 wcid;</div><div class='add'>+	__le16 mantissa;</div><div class='add'>+	u8 exp;</div><div class='add'>+	u8 table_id;</div><div class='add'>+	u8 id;</div><div class='add'>+	u8 protection:1;</div><div class='add'>+	u8 flowtype:1;</div><div class='add'>+	u8 trigger:1;</div><div class='add'>+	u8 sched:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+DECLARE_EWMA(avg_signal, 10, 8)</div><div class='add'>+</div><div class='ctx'> struct mt7915_sta {</div><div class='ctx'> 	struct mt76_wcid wcid; /* must be first */</div><div class='ctx'> </div><div class='ctx'> 	struct mt7915_vif *vif;</div><div class='ctx'> </div><div class='del'>-	struct list_head stats_list;</div><div class='del'>-	struct list_head poll_list;</div><div class='ctx'> 	struct list_head rc_list;</div><div class='ctx'> 	u32 airtime_ac[8];</div><div class='ctx'> </div><div class='del'>-	struct mt7915_sta_stats stats;</div><div class='add'>+	int ack_signal;</div><div class='add'>+	struct ewma_avg_signal avg_ack_signal;</div><div class='ctx'> </div><div class='del'>-	unsigned long ampdu_state;</div><div class='add'>+	unsigned long changed;</div><div class='add'>+	unsigned long jiffies;</div><div class='add'>+	struct mt76_connac_sta_key_conf bip;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u8 flowid_mask;</div><div class='add'>+		struct mt7915_twt_flow flow[MT7915_MAX_STA_TWT_AGRT];</div><div class='add'>+	} twt;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	struct mt7915_sta_key_conf bip;</div><div class='add'>+struct mt7915_vif_cap {</div><div class='add'>+	bool ht_ldpc:1;</div><div class='add'>+	bool vht_ldpc:1;</div><div class='add'>+	bool he_ldpc:1;</div><div class='add'>+	bool vht_su_ebfer:1;</div><div class='add'>+	bool vht_su_ebfee:1;</div><div class='add'>+	bool vht_mu_ebfer:1;</div><div class='add'>+	bool vht_mu_ebfee:1;</div><div class='add'>+	bool he_su_ebfer:1;</div><div class='add'>+	bool he_su_ebfee:1;</div><div class='add'>+	bool he_mu_ebfer:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt7915_vif {</div><div class='del'>-	u16 idx;</div><div class='del'>-	u8 omac_idx;</div><div class='del'>-	u8 band_idx;</div><div class='del'>-	u8 wmm_idx;</div><div class='add'>+	struct mt76_vif_link mt76; /* must be first */</div><div class='ctx'> </div><div class='add'>+	struct mt7915_vif_cap cap;</div><div class='ctx'> 	struct mt7915_sta sta;</div><div class='ctx'> 	struct mt7915_phy *phy;</div><div class='ctx'> </div><div class='ctx'> 	struct ieee80211_tx_queue_params queue_params[IEEE80211_NUM_ACS];</div><div class='add'>+	struct cfg80211_bitrate_mask bitrate_mask;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mib_stats {</div><div class='del'>-	u32 ack_fail_cnt;</div><div class='del'>-	u32 fcs_err_cnt;</div><div class='del'>-	u32 rts_cnt;</div><div class='del'>-	u32 rts_retries_cnt;</div><div class='del'>-	u32 ba_miss_cnt;</div><div class='add'>+/* crash-dump */</div><div class='add'>+struct mt7915_crash_data {</div><div class='add'>+	guid_t guid;</div><div class='add'>+	struct timespec64 timestamp;</div><div class='add'>+</div><div class='add'>+	u8 *memdump_buf;</div><div class='add'>+	size_t memdump_buf_len;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt7915_hif {</div><div class='hunk'>@@ -116,16 +192,22 @@ struct mt7915_hif {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	void __iomem *regs;</div><div class='ctx'> 	int irq;</div><div class='add'>+	u32 index;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt7915_phy {</div><div class='ctx'> 	struct mt76_phy *mt76;</div><div class='ctx'> 	struct mt7915_dev *dev;</div><div class='ctx'> </div><div class='del'>-	struct ieee80211_sband_iftype_data iftype[2][NUM_NL80211_IFTYPES];</div><div class='add'>+	struct ieee80211_sband_iftype_data iftype[NUM_NL80211_BANDS][NUM_NL80211_IFTYPES];</div><div class='ctx'> </div><div class='ctx'> 	struct ieee80211_vif *monitor_vif;</div><div class='ctx'> </div><div class='add'>+	struct thermal_cooling_device *cdev;</div><div class='add'>+	u8 cdev_state;</div><div class='add'>+	u8 throttle_state;</div><div class='add'>+	u32 throttle_temp[2]; /* 0: critical high, 1: maximum */</div><div class='add'>+</div><div class='ctx'> 	u32 rxfilter;</div><div class='ctx'> 	u64 omac_mask;</div><div class='ctx'> </div><div class='hunk'>@@ -134,16 +216,16 @@ struct mt7915_phy {</div><div class='ctx'> 	s16 coverage_class;</div><div class='ctx'> 	u8 slottime;</div><div class='ctx'> </div><div class='del'>-	u8 rdd_state;</div><div class='del'>-	int dfs_state;</div><div class='add'>+	u32 trb_ts;</div><div class='ctx'> </div><div class='ctx'> 	u32 rx_ampdu_ts;</div><div class='ctx'> 	u32 ampdu_ref;</div><div class='ctx'> </div><div class='del'>-	struct mib_stats mib;</div><div class='del'>-	struct list_head stats_list;</div><div class='add'>+	struct mt76_mib_stats mib;</div><div class='add'>+	struct mt76_channel_state state_ts;</div><div class='ctx'> </div><div class='del'>-	u8 sta_work_count;</div><div class='add'>+	bool sku_limit_en:1;</div><div class='add'>+	bool sku_path_en:1;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NL80211_TESTMODE</div><div class='ctx'> 	struct {</div><div class='hunk'>@@ -167,60 +249,94 @@ struct mt7915_dev {</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	struct mt7915_hif *hif2;</div><div class='add'>+	struct mt7915_reg_desc reg;</div><div class='add'>+	u8 q_id[MT7915_MAX_QUEUE];</div><div class='add'>+	u32 q_int_mask[MT7915_MAX_QUEUE];</div><div class='add'>+	u32 wfdma_mask;</div><div class='ctx'> </div><div class='ctx'> 	const struct mt76_bus_ops *bus_ops;</div><div class='ctx'> 	struct mt7915_phy phy;</div><div class='ctx'> </div><div class='add'>+	/* monitor rx chain configured channel */</div><div class='add'>+	struct cfg80211_chan_def rdd2_chandef;</div><div class='add'>+	struct mt7915_phy *rdd2_phy;</div><div class='add'>+</div><div class='ctx'> 	u16 chainmask;</div><div class='add'>+	u16 chainshift;</div><div class='ctx'> 	u32 hif_idx;</div><div class='ctx'> </div><div class='ctx'> 	struct work_struct init_work;</div><div class='ctx'> 	struct work_struct rc_work;</div><div class='add'>+	struct work_struct dump_work;</div><div class='ctx'> 	struct work_struct reset_work;</div><div class='ctx'> 	wait_queue_head_t reset_wait;</div><div class='del'>-	u32 reset_state;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u32 state;</div><div class='add'>+		u32 wa_reset_count;</div><div class='add'>+		u32 wm_reset_count;</div><div class='add'>+		bool hw_full_reset:1;</div><div class='add'>+		bool hw_init_done:1;</div><div class='add'>+		bool restart:1;</div><div class='add'>+	} recovery;</div><div class='add'>+</div><div class='add'>+	/* protects coredump data */</div><div class='add'>+	struct mutex dump_mutex;</div><div class='add'>+#ifdef CONFIG_DEV_COREDUMP</div><div class='add'>+	struct {</div><div class='add'>+		struct mt7915_crash_data *crash_data;</div><div class='add'>+	} coredump;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	struct list_head sta_rc_list;</div><div class='del'>-	struct list_head sta_poll_list;</div><div class='del'>-	spinlock_t sta_poll_lock;</div><div class='add'>+	struct list_head twt_list;</div><div class='add'>+	spinlock_t reg_lock;</div><div class='ctx'> </div><div class='ctx'> 	u32 hw_pattern;</div><div class='ctx'> </div><div class='ctx'> 	bool dbdc_support;</div><div class='ctx'> 	bool flash_mode;</div><div class='del'>-	bool fw_debug;</div><div class='add'>+	bool muru_debug;</div><div class='ctx'> 	bool ibf;</div><div class='ctx'> </div><div class='add'>+	u8 monitor_mask;</div><div class='add'>+</div><div class='add'>+	struct dentry *debugfs_dir;</div><div class='add'>+	struct rchan *relay_fwlog;</div><div class='add'>+</div><div class='ctx'> 	void *cal;</div><div class='del'>-};</div><div class='add'>+	u32 cur_prek_offset;</div><div class='add'>+	u8 dpd_chan_num_2g;</div><div class='add'>+	u8 dpd_chan_num_5g;</div><div class='add'>+	u8 dpd_chan_num_6g;</div><div class='ctx'> </div><div class='del'>-enum {</div><div class='del'>-	HW_BSSID_0 = 0x0,</div><div class='del'>-	HW_BSSID_1,</div><div class='del'>-	HW_BSSID_2,</div><div class='del'>-	HW_BSSID_3,</div><div class='del'>-	HW_BSSID_MAX = HW_BSSID_3,</div><div class='del'>-	EXT_BSSID_START = 0x10,</div><div class='del'>-	EXT_BSSID_1,</div><div class='del'>-	EXT_BSSID_15 = 0x1f,</div><div class='del'>-	EXT_BSSID_MAX = EXT_BSSID_15,</div><div class='del'>-	REPEATER_BSSID_START = 0x20,</div><div class='del'>-	REPEATER_BSSID_MAX = 0x3f,</div><div class='add'>+	struct {</div><div class='add'>+		u8 debug_wm;</div><div class='add'>+		u8 debug_wa;</div><div class='add'>+		u8 debug_bin;</div><div class='add'>+	} fw;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u16 table_mask;</div><div class='add'>+		u8 n_agrt;</div><div class='add'>+	} twt;</div><div class='add'>+</div><div class='add'>+	struct reset_control *rstc;</div><div class='add'>+	void __iomem *dcm;</div><div class='add'>+	void __iomem *sku;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	MT_LMAC_AC00,</div><div class='del'>-	MT_LMAC_AC01,</div><div class='del'>-	MT_LMAC_AC02,</div><div class='del'>-	MT_LMAC_AC03,</div><div class='del'>-	MT_LMAC_ALTX0 = 0x10,</div><div class='del'>-	MT_LMAC_BMC0,</div><div class='del'>-	MT_LMAC_BCN0,</div><div class='add'>+	WFDMA0 = 0x0,</div><div class='add'>+	WFDMA1,</div><div class='add'>+	WFDMA_EXT,</div><div class='add'>+	__MT_WFDMA_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum {</div><div class='del'>-	MT_RX_SEL0,</div><div class='del'>-	MT_RX_SEL1,</div><div class='add'>+enum rdd_idx {</div><div class='add'>+	MT_RDD_IDX_BAND0,	/* RDD idx for band idx 0 (single-band) */</div><div class='add'>+	MT_RDD_IDX_BAND1,	/* RDD idx for band idx 1 */</div><div class='add'>+	MT_RDD_IDX_BACKGROUND,	/* RDD idx for background chain */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum mt7915_rdd_cmd {</div><div class='hunk'>@@ -229,6 +345,7 @@ enum mt7915_rdd_cmd {</div><div class='ctx'> 	RDD_DET_MODE,</div><div class='ctx'> 	RDD_RADAR_EMULATE,</div><div class='ctx'> 	RDD_START_TXQ = 20,</div><div class='add'>+	RDD_SET_WF_ANT = 30,</div><div class='ctx'> 	RDD_CAC_START = 50,</div><div class='ctx'> 	RDD_CAC_END,</div><div class='ctx'> 	RDD_NORMAL_START,</div><div class='hunk'>@@ -239,12 +356,17 @@ enum mt7915_rdd_cmd {</div><div class='ctx'> 	RDD_IRQ_OFF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum {</div><div class='del'>-	RATE_CTRL_RU_INFO,</div><div class='del'>-	RATE_CTRL_FIXED_RATE_INFO,</div><div class='del'>-	RATE_CTRL_DUMP_INFO,</div><div class='del'>-	RATE_CTRL_MU_INFO,</div><div class='del'>-};</div><div class='add'>+static inline int</div><div class='add'>+mt7915_get_rdd_idx(struct mt7915_phy *phy, bool is_background)</div><div class='add'>+{</div><div class='add'>+	if (!phy-&gt;mt76-&gt;cap.has_5ghz)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (is_background)</div><div class='add'>+		return MT_RDD_IDX_BACKGROUND;</div><div class='add'>+</div><div class='add'>+	return phy-&gt;mt76-&gt;band_idx;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline struct mt7915_phy *</div><div class='ctx'> mt7915_hw_phy(struct ieee80211_hw *hw)</div><div class='hunk'>@@ -265,7 +387,7 @@ mt7915_hw_dev(struct ieee80211_hw *hw)</div><div class='ctx'> static inline struct mt7915_phy *</div><div class='ctx'> mt7915_ext_phy(struct mt7915_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_phy *phy = dev-&gt;mt76.phy2;</div><div class='add'>+	struct mt76_phy *phy = dev-&gt;mt76.phys[MT_BAND1];</div><div class='ctx'> </div><div class='ctx'> 	if (!phy)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -273,99 +395,147 @@ mt7915_ext_phy(struct mt7915_dev *dev)</div><div class='ctx'> 	return phy-&gt;priv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u8 mt7915_lmac_mapping(struct mt7915_dev *dev, u8 ac)</div><div class='add'>+static inline u32 mt7915_check_adie(struct mt7915_dev *dev, bool sku)</div><div class='ctx'> {</div><div class='del'>-	/* LMAC uses the reverse order of mac80211 AC indexes */</div><div class='del'>-	return 3 - ac;</div><div class='add'>+	u32 mask = sku ? MT_CONNINFRA_SKU_MASK : MT_ADIE_TYPE_MASK;</div><div class='add'>+	if (!is_mt798x(&amp;dev-&gt;mt76))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return mt76_rr(dev, MT_CONNINFRA_SKU_DEC_ADDR) &amp; mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern const struct ieee80211_ops mt7915_ops;</div><div class='ctx'> extern const struct mt76_testmode_ops mt7915_testmode_ops;</div><div class='add'>+extern struct pci_driver mt7915_pci_driver;</div><div class='add'>+extern struct pci_driver mt7915_hif_driver;</div><div class='add'>+extern struct platform_driver mt798x_wmac_driver;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MT798X_WMAC</div><div class='add'>+int mt7986_wmac_enable(struct mt7915_dev *dev);</div><div class='add'>+void mt7986_wmac_disable(struct mt7915_dev *dev);</div><div class='add'>+#else</div><div class='add'>+static inline int mt7986_wmac_enable(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-u32 mt7915_reg_map(struct mt7915_dev *dev, u32 addr);</div><div class='add'>+static inline void mt7986_wmac_disable(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+struct mt7915_dev *mt7915_mmio_probe(struct device *pdev,</div><div class='add'>+				     void __iomem *mem_base, u32 device_id);</div><div class='add'>+void mt7915_wfsys_reset(struct mt7915_dev *dev);</div><div class='add'>+irqreturn_t mt7915_irq_handler(int irq, void *dev_instance);</div><div class='add'>+u64 __mt7915_get_tsf(struct ieee80211_hw *hw, struct mt7915_vif *mvif);</div><div class='add'>+u32 mt7915_wed_init_buf(void *ptr, dma_addr_t phys, int token_id);</div><div class='ctx'> </div><div class='ctx'> int mt7915_register_device(struct mt7915_dev *dev);</div><div class='ctx'> void mt7915_unregister_device(struct mt7915_dev *dev);</div><div class='ctx'> int mt7915_eeprom_init(struct mt7915_dev *dev);</div><div class='del'>-void mt7915_eeprom_parse_band_config(struct mt7915_phy *phy);</div><div class='add'>+void mt7915_eeprom_parse_hw_cap(struct mt7915_dev *dev,</div><div class='add'>+				struct mt7915_phy *phy);</div><div class='ctx'> int mt7915_eeprom_get_target_power(struct mt7915_dev *dev,</div><div class='ctx'> 				   struct ieee80211_channel *chan,</div><div class='ctx'> 				   u8 chain_idx);</div><div class='ctx'> s8 mt7915_eeprom_get_power_delta(struct mt7915_dev *dev, int band);</div><div class='del'>-int mt7915_dma_init(struct mt7915_dev *dev);</div><div class='add'>+bool mt7915_eeprom_has_background_radar(struct mt7915_dev *dev);</div><div class='add'>+int mt7915_dma_init(struct mt7915_dev *dev, struct mt7915_phy *phy2);</div><div class='ctx'> void mt7915_dma_prefetch(struct mt7915_dev *dev);</div><div class='ctx'> void mt7915_dma_cleanup(struct mt7915_dev *dev);</div><div class='add'>+int mt7915_dma_reset(struct mt7915_dev *dev, bool force);</div><div class='add'>+int mt7915_dma_start(struct mt7915_dev *dev, bool reset, bool wed_reset);</div><div class='add'>+int mt7915_txbf_init(struct mt7915_dev *dev);</div><div class='add'>+void mt7915_init_txpower(struct mt7915_phy *phy);</div><div class='add'>+void mt7915_reset(struct mt7915_dev *dev);</div><div class='add'>+int mt7915_run(struct ieee80211_hw *hw);</div><div class='ctx'> int mt7915_mcu_init(struct mt7915_dev *dev);</div><div class='add'>+int mt7915_mcu_init_firmware(struct mt7915_dev *dev);</div><div class='add'>+int mt7915_mcu_twt_agrt_update(struct mt7915_dev *dev,</div><div class='add'>+			       struct mt7915_vif *mvif,</div><div class='add'>+			       struct mt7915_twt_flow *flow,</div><div class='add'>+			       int cmd);</div><div class='ctx'> int mt7915_mcu_add_dev_info(struct mt7915_phy *phy,</div><div class='ctx'> 			    struct ieee80211_vif *vif, bool enable);</div><div class='ctx'> int mt7915_mcu_add_bss_info(struct mt7915_phy *phy,</div><div class='ctx'> 			    struct ieee80211_vif *vif, int enable);</div><div class='ctx'> int mt7915_mcu_add_sta(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-		       struct ieee80211_sta *sta, bool enable);</div><div class='del'>-int mt7915_mcu_add_sta_adv(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-			   struct ieee80211_sta *sta, bool enable);</div><div class='del'>-int mt7915_mcu_sta_update_hdr_trans(struct mt7915_dev *dev,</div><div class='del'>-				    struct ieee80211_vif *vif,</div><div class='del'>-				    struct ieee80211_sta *sta);</div><div class='add'>+		       struct ieee80211_sta *sta, int conn_state, bool newly);</div><div class='ctx'> int mt7915_mcu_add_tx_ba(struct mt7915_dev *dev,</div><div class='ctx'> 			 struct ieee80211_ampdu_params *params,</div><div class='ctx'> 			 bool add);</div><div class='ctx'> int mt7915_mcu_add_rx_ba(struct mt7915_dev *dev,</div><div class='ctx'> 			 struct ieee80211_ampdu_params *params,</div><div class='ctx'> 			 bool add);</div><div class='del'>-int mt7915_mcu_add_key(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-		       struct mt7915_sta *msta, struct ieee80211_key_conf *key,</div><div class='del'>-		       enum set_key_cmd cmd);</div><div class='add'>+int mt7915_mcu_update_bss_color(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+				struct cfg80211_he_bss_color *he_bss_color);</div><div class='add'>+int mt7915_mcu_add_inband_discov(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+				 u32 changed);</div><div class='ctx'> int mt7915_mcu_add_beacon(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-			  int enable);</div><div class='del'>-int mt7915_mcu_add_obss_spr(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-                            bool enable);</div><div class='add'>+			  int enable, u32 changed);</div><div class='add'>+int mt7915_mcu_add_obss_spr(struct mt7915_phy *phy, struct ieee80211_vif *vif,</div><div class='add'>+			    struct ieee80211_he_obss_pd *he_obss_pd);</div><div class='ctx'> int mt7915_mcu_add_rate_ctrl(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-			     struct ieee80211_sta *sta);</div><div class='add'>+			     struct ieee80211_sta *sta, bool changed);</div><div class='ctx'> int mt7915_mcu_add_smps(struct mt7915_dev *dev, struct ieee80211_vif *vif,</div><div class='ctx'> 			struct ieee80211_sta *sta);</div><div class='del'>-int mt7915_set_channel(struct mt7915_phy *phy);</div><div class='add'>+int mt7915_set_channel(struct mt76_phy *mphy);</div><div class='ctx'> int mt7915_mcu_set_chan_info(struct mt7915_phy *phy, int cmd);</div><div class='ctx'> int mt7915_mcu_set_tx(struct mt7915_dev *dev, struct ieee80211_vif *vif);</div><div class='ctx'> int mt7915_mcu_update_edca(struct mt7915_dev *dev, void *req);</div><div class='del'>-int mt7915_mcu_set_fixed_rate(struct mt7915_dev *dev,</div><div class='del'>-			      struct ieee80211_sta *sta, u32 rate);</div><div class='add'>+int mt7915_mcu_set_fixed_rate_ctrl(struct mt7915_dev *dev,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_sta *sta,</div><div class='add'>+				   void *data, u32 field);</div><div class='ctx'> int mt7915_mcu_set_eeprom(struct mt7915_dev *dev);</div><div class='del'>-int mt7915_mcu_get_eeprom(struct mt7915_dev *dev, u32 offset);</div><div class='add'>+int mt7915_mcu_get_eeprom(struct mt7915_dev *dev, u32 offset, u8 *read_buf);</div><div class='add'>+int mt7915_mcu_get_eeprom_free_block(struct mt7915_dev *dev, u8 *block_num);</div><div class='ctx'> int mt7915_mcu_set_mac(struct mt7915_dev *dev, int band, bool enable,</div><div class='ctx'> 		       bool hdr_trans);</div><div class='ctx'> int mt7915_mcu_set_test_param(struct mt7915_dev *dev, u8 param, bool test_mode,</div><div class='ctx'> 			      u8 en);</div><div class='del'>-int mt7915_mcu_set_scs(struct mt7915_dev *dev, u8 band, bool enable);</div><div class='ctx'> int mt7915_mcu_set_ser(struct mt7915_dev *dev, u8 action, u8 set, u8 band);</div><div class='del'>-int mt7915_mcu_set_rts_thresh(struct mt7915_phy *phy, u32 val);</div><div class='del'>-int mt7915_mcu_set_pm(struct mt7915_dev *dev, int band, int enter);</div><div class='del'>-int mt7915_mcu_set_sku_en(struct mt7915_phy *phy, bool enable);</div><div class='add'>+int mt7915_mcu_set_sku_en(struct mt7915_phy *phy);</div><div class='ctx'> int mt7915_mcu_set_txpower_sku(struct mt7915_phy *phy);</div><div class='del'>-int mt7915_mcu_set_txbf_type(struct mt7915_dev *dev);</div><div class='del'>-int mt7915_mcu_set_txbf_module(struct mt7915_dev *dev);</div><div class='del'>-int mt7915_mcu_set_txbf_sounding(struct mt7915_dev *dev);</div><div class='add'>+int mt7915_mcu_get_txpower_sku(struct mt7915_phy *phy, s8 *txpower, int len,</div><div class='add'>+			       u8 category);</div><div class='add'>+int mt7915_mcu_set_txpower_frame_min(struct mt7915_phy *phy, s8 txpower);</div><div class='add'>+int mt7915_mcu_set_txpower_frame(struct mt7915_phy *phy,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 struct ieee80211_sta *sta, s8 txpower);</div><div class='add'>+int mt7915_mcu_set_txbf(struct mt7915_dev *dev, u8 action);</div><div class='ctx'> int mt7915_mcu_set_fcc5_lpn(struct mt7915_dev *dev, int val);</div><div class='ctx'> int mt7915_mcu_set_pulse_th(struct mt7915_dev *dev,</div><div class='ctx'> 			    const struct mt7915_dfs_pulse *pulse);</div><div class='ctx'> int mt7915_mcu_set_radar_th(struct mt7915_dev *dev, int index,</div><div class='ctx'> 			    const struct mt7915_dfs_pattern *pattern);</div><div class='add'>+int mt7915_mcu_set_muru_ctrl(struct mt7915_dev *dev, u32 cmd, u32 val);</div><div class='ctx'> int mt7915_mcu_apply_group_cal(struct mt7915_dev *dev);</div><div class='ctx'> int mt7915_mcu_apply_tx_dpd(struct mt7915_phy *phy);</div><div class='del'>-int mt7915_mcu_get_temperature(struct mt7915_dev *dev, int index);</div><div class='del'>-int mt7915_mcu_get_tx_rate(struct mt7915_dev *dev, u32 cmd, u16 wlan_idx);</div><div class='add'>+int mt7915_mcu_get_chan_mib_info(struct mt7915_phy *phy, bool chan_switch);</div><div class='add'>+int mt7915_mcu_get_temperature(struct mt7915_phy *phy);</div><div class='add'>+int mt7915_mcu_set_thermal_throttling(struct mt7915_phy *phy, u8 state);</div><div class='add'>+int mt7915_mcu_set_thermal_protect(struct mt7915_phy *phy);</div><div class='ctx'> int mt7915_mcu_get_rx_rate(struct mt7915_phy *phy, struct ieee80211_vif *vif,</div><div class='ctx'> 			   struct ieee80211_sta *sta, struct rate_info *rate);</div><div class='del'>-int mt7915_mcu_rdd_cmd(struct mt7915_dev *dev, enum mt7915_rdd_cmd cmd,</div><div class='del'>-		       u8 index, u8 rx_sel, u8 val);</div><div class='del'>-int mt7915_mcu_fw_log_2_host(struct mt7915_dev *dev, u8 ctrl);</div><div class='add'>+int mt7915_mcu_rdd_background_enable(struct mt7915_phy *phy,</div><div class='add'>+				     struct cfg80211_chan_def *chandef);</div><div class='add'>+int mt7915_mcu_wed_wa_tx_stats(struct mt7915_dev *dev, u16 wcid);</div><div class='add'>+int mt7915_mcu_rf_regval(struct mt7915_dev *dev, u32 regidx, u32 *val, bool set);</div><div class='add'>+int mt7915_mcu_wa_cmd(struct mt7915_dev *dev, int cmd, u32 a1, u32 a2, u32 a3);</div><div class='add'>+int mt7915_mcu_fw_log_2_host(struct mt7915_dev *dev, u8 type, u8 ctrl);</div><div class='ctx'> int mt7915_mcu_fw_dbg_ctrl(struct mt7915_dev *dev, u32 module, u8 level);</div><div class='ctx'> void mt7915_mcu_rx_event(struct mt7915_dev *dev, struct sk_buff *skb);</div><div class='ctx'> void mt7915_mcu_exit(struct mt7915_dev *dev);</div><div class='ctx'> </div><div class='del'>-static inline bool is_mt7915(struct mt76_dev *dev)</div><div class='add'>+static inline u16 mt7915_wtbl_size(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return is_mt7915(&amp;dev-&gt;mt76) ? MT7915_WTBL_SIZE : MT7916_WTBL_SIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 mt7915_eeprom_size(struct mt7915_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	return mt76_chip(dev) == 0x7915;</div><div class='add'>+	return is_mt7915(&amp;dev-&gt;mt76) ? MT7915_EEPROM_SIZE : MT7916_EEPROM_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt7915_dual_hif_set_irq_mask(struct mt7915_dev *dev, bool write_reg,</div><div class='hunk'>@@ -374,9 +544,11 @@ void mt7915_dual_hif_set_irq_mask(struct mt7915_dev *dev, bool write_reg,</div><div class='ctx'> static inline void mt7915_irq_enable(struct mt7915_dev *dev, u32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	if (dev-&gt;hif2)</div><div class='del'>-		mt7915_dual_hif_set_irq_mask(dev, true, 0, mask);</div><div class='add'>+		mt7915_dual_hif_set_irq_mask(dev, false, 0, mask);</div><div class='ctx'> 	else</div><div class='del'>-		mt76_set_irq_mask(&amp;dev-&gt;mt76, MT_INT_MASK_CSR, 0, mask);</div><div class='add'>+		mt76_set_irq_mask(&amp;dev-&gt;mt76, 0, 0, mask);</div><div class='add'>+</div><div class='add'>+	tasklet_schedule(&amp;dev-&gt;mt76.irq_tasklet);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void mt7915_irq_disable(struct mt7915_dev *dev, u32 mask)</div><div class='hunk'>@@ -387,47 +559,63 @@ static inline void mt7915_irq_disable(struct mt7915_dev *dev, u32 mask)</div><div class='ctx'> 		mt76_set_irq_mask(&amp;dev-&gt;mt76, MT_INT_MASK_CSR, mask, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void mt7915_memcpy_fromio(struct mt7915_dev *dev, void *buf, u32 offset,</div><div class='add'>+			  size_t len);</div><div class='add'>+</div><div class='add'>+void mt7915_mac_init(struct mt7915_dev *dev);</div><div class='add'>+u32 mt7915_mac_wtbl_lmac_addr(struct mt7915_dev *dev, u16 wcid, u8 dw);</div><div class='ctx'> bool mt7915_mac_wtbl_update(struct mt7915_dev *dev, int idx, u32 mask);</div><div class='ctx'> void mt7915_mac_reset_counters(struct mt7915_phy *phy);</div><div class='ctx'> void mt7915_mac_cca_stats_reset(struct mt7915_phy *phy);</div><div class='ctx'> void mt7915_mac_enable_nf(struct mt7915_dev *dev, bool ext_phy);</div><div class='del'>-void mt7915_mac_write_txwi(struct mt7915_dev *dev, __le32 *txwi,</div><div class='del'>-			   struct sk_buff *skb, struct mt76_wcid *wcid,</div><div class='del'>-			   struct ieee80211_key_conf *key, bool beacon);</div><div class='add'>+void mt7915_mac_enable_rtscts(struct mt7915_dev *dev,</div><div class='add'>+			      struct ieee80211_vif *vif, bool enable);</div><div class='add'>+void mt7915_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi,</div><div class='add'>+			   struct sk_buff *skb, struct mt76_wcid *wcid, int pid,</div><div class='add'>+			   struct ieee80211_key_conf *key,</div><div class='add'>+			   enum mt76_txq_id qid, u32 changed);</div><div class='ctx'> void mt7915_mac_set_timing(struct mt7915_phy *phy);</div><div class='del'>-int mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb);</div><div class='del'>-void mt7915_mac_fill_rx_vector(struct mt7915_dev *dev, struct sk_buff *skb);</div><div class='del'>-void mt7915_mac_tx_free(struct mt7915_dev *dev, struct sk_buff *skb);</div><div class='ctx'> int mt7915_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='ctx'> 		       struct ieee80211_sta *sta);</div><div class='add'>+int mt7915_mac_sta_event(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='add'>+			 struct ieee80211_sta *sta, enum mt76_sta_event ev);</div><div class='ctx'> void mt7915_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='ctx'> 			   struct ieee80211_sta *sta);</div><div class='ctx'> void mt7915_mac_work(struct work_struct *work);</div><div class='ctx'> void mt7915_mac_reset_work(struct work_struct *work);</div><div class='add'>+void mt7915_mac_dump_work(struct work_struct *work);</div><div class='ctx'> void mt7915_mac_sta_rc_work(struct work_struct *work);</div><div class='del'>-int mt7915_mmio_init(struct mt76_dev *mdev, void __iomem *mem_base, int irq);</div><div class='add'>+void mt7915_mac_update_stats(struct mt7915_phy *phy);</div><div class='add'>+void mt7915_mac_twt_teardown_flow(struct mt7915_dev *dev,</div><div class='add'>+				  struct mt7915_sta *msta,</div><div class='add'>+				  u8 flowid);</div><div class='add'>+void mt7915_mac_add_twt_setup(struct ieee80211_hw *hw,</div><div class='add'>+			      struct ieee80211_sta *sta,</div><div class='add'>+			      struct ieee80211_twt_setup *twt);</div><div class='ctx'> int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='ctx'> 			  enum mt76_txq_id qid, struct mt76_wcid *wcid,</div><div class='ctx'> 			  struct ieee80211_sta *sta,</div><div class='ctx'> 			  struct mt76_tx_info *tx_info);</div><div class='del'>-void mt7915_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e);</div><div class='del'>-void mt7915_tx_token_put(struct mt7915_dev *dev);</div><div class='del'>-int mt7915_init_tx_queues(struct mt7915_phy *phy, int idx, int n_desc);</div><div class='ctx'> void mt7915_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,</div><div class='del'>-			 struct sk_buff *skb);</div><div class='del'>-void mt7915_sta_ps(struct mt76_dev *mdev, struct ieee80211_sta *sta, bool ps);</div><div class='add'>+			 struct sk_buff *skb, u32 *info);</div><div class='add'>+bool mt7915_rx_check(struct mt76_dev *mdev, void *data, int len);</div><div class='ctx'> void mt7915_stats_work(struct work_struct *work);</div><div class='del'>-void mt7915_txp_skb_unmap(struct mt76_dev *dev,</div><div class='del'>-			  struct mt76_txwi_cache *txwi);</div><div class='ctx'> int mt76_dfs_start_rdd(struct mt7915_dev *dev, bool force);</div><div class='ctx'> int mt7915_dfs_init_radar_detector(struct mt7915_phy *phy);</div><div class='ctx'> void mt7915_set_stream_he_caps(struct mt7915_phy *phy);</div><div class='ctx'> void mt7915_set_stream_vht_txbf_caps(struct mt7915_phy *phy);</div><div class='del'>-void mt7915_update_channel(struct mt76_dev *mdev);</div><div class='del'>-int mt7915_init_debugfs(struct mt7915_dev *dev);</div><div class='add'>+void mt7915_update_channel(struct mt76_phy *mphy);</div><div class='add'>+int mt7915_mcu_muru_debug_set(struct mt7915_dev *dev, bool enable);</div><div class='add'>+int mt7915_mcu_muru_debug_get(struct mt7915_phy *phy);</div><div class='add'>+int mt7915_mcu_wed_enable_rx_stats(struct mt7915_dev *dev);</div><div class='add'>+int mt7915_init_debugfs(struct mt7915_phy *phy);</div><div class='add'>+void mt7915_debugfs_rx_fw_monitor(struct mt7915_dev *dev, const void *data, int len);</div><div class='add'>+bool mt7915_debugfs_rx_log(struct mt7915_dev *dev, const void *data, int len);</div><div class='ctx'> #ifdef CONFIG_MAC80211_DEBUGFS</div><div class='ctx'> void mt7915_sta_add_debugfs(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 			    struct ieee80211_sta *sta, struct dentry *dir);</div><div class='ctx'> #endif</div><div class='add'>+int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr,</div><div class='add'>+			 bool pci, int *irq);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/pci.c b/drivers/net/wireless/mediatek/mt76/mt7915/pci.c<br/>index 643f171884cf..f6b03211a879 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/pci.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/pci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7915/pci.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Ryder Lee &lt;ryder.lee@mediatek.com&gt;</div><div class='hunk'>@@ -18,35 +18,17 @@ static u32 hif_idx;</div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id mt7915_pci_device_table[] = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7915) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7906) },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id mt7915_hif_device_table[] = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7916) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x790a) },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void mt7915_dual_hif_set_irq_mask(struct mt7915_dev *dev, bool write_reg,</div><div class='del'>-				  u32 clear, u32 set)</div><div class='del'>-{</div><div class='del'>-	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;mdev-&gt;mmio.irq_lock, flags);</div><div class='del'>-</div><div class='del'>-	mdev-&gt;mmio.irqmask &amp;= ~clear;</div><div class='del'>-	mdev-&gt;mmio.irqmask |= set;</div><div class='del'>-</div><div class='del'>-	if (write_reg) {</div><div class='del'>-		mt76_wr(dev, MT_INT_MASK_CSR, mdev-&gt;mmio.irqmask);</div><div class='del'>-		mt76_wr(dev, MT_INT1_MASK_CSR, mdev-&gt;mmio.irqmask);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;mdev-&gt;mmio.irq_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct mt7915_hif *</div><div class='del'>-mt7915_pci_get_hif2(struct mt7915_dev *dev)</div><div class='add'>+static struct mt7915_hif *mt7915_pci_get_hif2(u32 idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_hif *hif;</div><div class='ctx'> 	u32 val;</div><div class='hunk'>@@ -56,10 +38,11 @@ mt7915_pci_get_hif2(struct mt7915_dev *dev)</div><div class='ctx'> 	list_for_each_entry(hif, &amp;hif_list, list) {</div><div class='ctx'> 		val = readl(hif-&gt;regs + MT_PCIE_RECOG_ID);</div><div class='ctx'> 		val &amp;= MT_PCIE_RECOG_ID_MASK;</div><div class='del'>-		if (val != dev-&gt;hif_idx)</div><div class='add'>+		if (val != idx)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		get_device(hif-&gt;dev);</div><div class='add'>+		hif-&gt;index = idx;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	hif = NULL;</div><div class='hunk'>@@ -78,108 +61,24 @@ static void mt7915_put_hif2(struct mt7915_hif *hif)</div><div class='ctx'> 	put_device(hif-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7915_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q)</div><div class='del'>-{</div><div class='del'>-	struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);</div><div class='del'>-	static const u32 rx_irq_mask[] = {</div><div class='del'>-		[MT_RXQ_MAIN] = MT_INT_RX_DONE_DATA0,</div><div class='del'>-		[MT_RXQ_EXT] = MT_INT_RX_DONE_DATA1,</div><div class='del'>-		[MT_RXQ_MCU] = MT_INT_RX_DONE_WM,</div><div class='del'>-		[MT_RXQ_MCU_WA] = MT_INT_RX_DONE_WA,</div><div class='del'>-		[MT_RXQ_EXT_WA] = MT_INT_RX_DONE_WA_EXT,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	mt7915_irq_enable(dev, rx_irq_mask[q]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* TODO: support 2/4/6/8 MSI-X vectors */</div><div class='del'>-static irqreturn_t mt7915_irq_handler(int irq, void *dev_instance)</div><div class='add'>+static struct mt7915_hif *mt7915_pci_init_hif2(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct mt7915_dev *dev = dev_instance;</div><div class='del'>-	u32 intr, intr1, mask;</div><div class='del'>-</div><div class='del'>-	intr = mt76_rr(dev, MT_INT_SOURCE_CSR);</div><div class='del'>-	intr &amp;= dev-&gt;mt76.mmio.irqmask;</div><div class='del'>-	mt76_wr(dev, MT_INT_SOURCE_CSR, intr);</div><div class='add'>+	struct pci_dev *tmp_pdev;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;hif2) {</div><div class='del'>-		intr1 = mt76_rr(dev, MT_INT1_SOURCE_CSR);</div><div class='del'>-		intr1 &amp;= dev-&gt;mt76.mmio.irqmask;</div><div class='del'>-		mt76_wr(dev, MT_INT1_SOURCE_CSR, intr1);</div><div class='add'>+	hif_idx++;</div><div class='ctx'> </div><div class='del'>-		intr |= intr1;</div><div class='add'>+	tmp_pdev = pci_get_device(PCI_VENDOR_ID_MEDIATEK, 0x7916, NULL);</div><div class='add'>+	if (!tmp_pdev) {</div><div class='add'>+		tmp_pdev = pci_get_device(PCI_VENDOR_ID_MEDIATEK, 0x790a, NULL);</div><div class='add'>+		if (!tmp_pdev)</div><div class='add'>+			return NULL;</div><div class='ctx'> 	}</div><div class='add'>+	pci_dev_put(tmp_pdev);</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(MT76_STATE_INITIALIZED, &amp;dev-&gt;mphy.state))</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-</div><div class='del'>-	trace_dev_irq(&amp;dev-&gt;mt76, intr, dev-&gt;mt76.mmio.irqmask);</div><div class='del'>-</div><div class='del'>-	mask = intr &amp; MT_INT_RX_DONE_ALL;</div><div class='del'>-	if (intr &amp; MT_INT_TX_DONE_MCU)</div><div class='del'>-		mask |= MT_INT_TX_DONE_MCU;</div><div class='del'>-</div><div class='del'>-	mt7915_irq_disable(dev, mask);</div><div class='del'>-</div><div class='del'>-	if (intr &amp; MT_INT_TX_DONE_MCU)</div><div class='del'>-		napi_schedule(&amp;dev-&gt;mt76.tx_napi);</div><div class='del'>-</div><div class='del'>-	if (intr &amp; MT_INT_RX_DONE_DATA0)</div><div class='del'>-		napi_schedule(&amp;dev-&gt;mt76.napi[MT_RXQ_MAIN]);</div><div class='del'>-</div><div class='del'>-	if (intr &amp; MT_INT_RX_DONE_DATA1)</div><div class='del'>-		napi_schedule(&amp;dev-&gt;mt76.napi[MT_RXQ_EXT]);</div><div class='add'>+	writel(hif_idx | MT_PCIE_RECOG_ID_SEM,</div><div class='add'>+	       pcim_iomap_table(pdev)[0] + MT_PCIE_RECOG_ID);</div><div class='ctx'> </div><div class='del'>-	if (intr &amp; MT_INT_RX_DONE_WM)</div><div class='del'>-		napi_schedule(&amp;dev-&gt;mt76.napi[MT_RXQ_MCU]);</div><div class='del'>-</div><div class='del'>-	if (intr &amp; MT_INT_RX_DONE_WA)</div><div class='del'>-		napi_schedule(&amp;dev-&gt;mt76.napi[MT_RXQ_MCU_WA]);</div><div class='del'>-</div><div class='del'>-	if (intr &amp; MT_INT_RX_DONE_WA_EXT)</div><div class='del'>-		napi_schedule(&amp;dev-&gt;mt76.napi[MT_RXQ_EXT_WA]);</div><div class='del'>-</div><div class='del'>-	if (intr &amp; MT_INT_MCU_CMD) {</div><div class='del'>-		u32 val = mt76_rr(dev, MT_MCU_CMD);</div><div class='del'>-</div><div class='del'>-		mt76_wr(dev, MT_MCU_CMD, val);</div><div class='del'>-		if (val &amp; MT_MCU_CMD_ERROR_MASK) {</div><div class='del'>-			dev-&gt;reset_state = val;</div><div class='del'>-			ieee80211_queue_work(mt76_hw(dev), &amp;dev-&gt;reset_work);</div><div class='del'>-			wake_up(&amp;dev-&gt;reset_wait);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mt7915_pci_init_hif2(struct mt7915_dev *dev)</div><div class='del'>-{</div><div class='del'>-	struct mt7915_hif *hif;</div><div class='del'>-</div><div class='del'>-	dev-&gt;hif_idx = ++hif_idx;</div><div class='del'>-	if (!pci_get_device(PCI_VENDOR_ID_MEDIATEK, 0x7916, NULL))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mt76_wr(dev, MT_PCIE_RECOG_ID, dev-&gt;hif_idx | MT_PCIE_RECOG_ID_SEM);</div><div class='del'>-</div><div class='del'>-	hif = mt7915_pci_get_hif2(dev);</div><div class='del'>-	if (!hif)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dev-&gt;hif2 = hif;</div><div class='del'>-</div><div class='del'>-	mt76_wr(dev, MT_INT1_MASK_CSR, 0);</div><div class='del'>-</div><div class='del'>-	if (devm_request_irq(dev-&gt;mt76.dev, hif-&gt;irq, mt7915_irq_handler,</div><div class='del'>-			     IRQF_SHARED, KBUILD_MODNAME "-hif", dev)) {</div><div class='del'>-		mt7915_put_hif2(hif);</div><div class='del'>-		hif = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* master switch of PCIe tnterrupt enable */</div><div class='del'>-	mt76_wr(dev, MT_PCIE1_MAC_INT_ENABLE, 0xff);</div><div class='add'>+	return mt7915_pci_get_hif2(hif_idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt7915_pci_hif2_probe(struct pci_dev *pdev)</div><div class='hunk'>@@ -204,26 +103,10 @@ static int mt7915_pci_hif2_probe(struct pci_dev *pdev)</div><div class='ctx'> static int mt7915_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 			    const struct pci_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	static const struct mt76_driver_ops drv_ops = {</div><div class='del'>-		/* txwi_size = txd size + txp size */</div><div class='del'>-		.txwi_size = MT_TXD_SIZE + sizeof(struct mt7915_txp),</div><div class='del'>-		.drv_flags = MT_DRV_TXWI_NO_FREE | MT_DRV_HW_MGMT_TXQ |</div><div class='del'>-			     MT_DRV_AMSDU_OFFLOAD,</div><div class='del'>-		.survey_flags = SURVEY_INFO_TIME_TX |</div><div class='del'>-				SURVEY_INFO_TIME_RX |</div><div class='del'>-				SURVEY_INFO_TIME_BSS_RX,</div><div class='del'>-		.token_size = MT7915_TOKEN_SIZE,</div><div class='del'>-		.tx_prepare_skb = mt7915_tx_prepare_skb,</div><div class='del'>-		.tx_complete_skb = mt7915_tx_complete_skb,</div><div class='del'>-		.rx_skb = mt7915_queue_rx_skb,</div><div class='del'>-		.rx_poll_complete = mt7915_rx_poll_complete,</div><div class='del'>-		.sta_ps = mt7915_sta_ps,</div><div class='del'>-		.sta_add = mt7915_mac_sta_add,</div><div class='del'>-		.sta_remove = mt7915_mac_sta_remove,</div><div class='del'>-		.update_survey = mt7915_update_channel,</div><div class='del'>-	};</div><div class='add'>+	struct mt7915_hif *hif2 = NULL;</div><div class='ctx'> 	struct mt7915_dev *dev;</div><div class='ctx'> 	struct mt76_dev *mdev;</div><div class='add'>+	int irq;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = pcim_enable_device(pdev);</div><div class='hunk'>@@ -236,40 +119,82 @@ static int mt7915_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='del'>-	ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='add'>+	ret = dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (id-&gt;device == 0x7916)</div><div class='add'>+	mt76_pci_disable_aspm(pdev);</div><div class='add'>+</div><div class='add'>+	if (id-&gt;device == 0x7916 || id-&gt;device == 0x790a)</div><div class='ctx'> 		return mt7915_pci_hif2_probe(pdev);</div><div class='ctx'> </div><div class='del'>-	mdev = mt76_alloc_device(&amp;pdev-&gt;dev, sizeof(*dev), &amp;mt7915_ops,</div><div class='del'>-				 &amp;drv_ops);</div><div class='del'>-	if (!mdev)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	dev = mt7915_mmio_probe(&amp;pdev-&gt;dev, pcim_iomap_table(pdev)[0],</div><div class='add'>+				id-&gt;device);</div><div class='add'>+	if (IS_ERR(dev))</div><div class='add'>+		return PTR_ERR(dev);</div><div class='ctx'> </div><div class='del'>-	dev = container_of(mdev, struct mt7915_dev, mt76);</div><div class='add'>+	mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	mt7915_wfsys_reset(dev);</div><div class='add'>+	hif2 = mt7915_pci_init_hif2(pdev);</div><div class='ctx'> </div><div class='del'>-	ret = mt7915_mmio_init(mdev, pcim_iomap_table(pdev)[0], pdev-&gt;irq);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+	ret = mt7915_mmio_wed_init(dev, pdev, true, &amp;irq);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto free_wed_or_irq_vector;</div><div class='ctx'> </div><div class='del'>-	/* master switch of PCIe tnterrupt enable */</div><div class='del'>-	mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		hif2 = mt7915_pci_init_hif2(pdev);</div><div class='add'>+</div><div class='add'>+		ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto free_device;</div><div class='add'>+</div><div class='add'>+		irq = pdev-&gt;irq;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ret = devm_request_irq(mdev-&gt;dev, pdev-&gt;irq, mt7915_irq_handler,</div><div class='add'>+	ret = devm_request_irq(mdev-&gt;dev, irq, mt7915_irq_handler,</div><div class='ctx'> 			       IRQF_SHARED, KBUILD_MODNAME, dev);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+		goto free_wed_or_irq_vector;</div><div class='add'>+</div><div class='add'>+	/* master switch of PCIe tnterrupt enable */</div><div class='add'>+	mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff);</div><div class='ctx'> </div><div class='del'>-	mt7915_pci_init_hif2(dev);</div><div class='add'>+	if (hif2) {</div><div class='add'>+		dev-&gt;hif2 = hif2;</div><div class='add'>+</div><div class='add'>+		mt76_wr(dev, MT_INT1_MASK_CSR, 0);</div><div class='add'>+		/* master switch of PCIe tnterrupt enable */</div><div class='add'>+		if (is_mt7915(mdev))</div><div class='add'>+			mt76_wr(dev, MT_PCIE1_MAC_INT_ENABLE, 0xff);</div><div class='add'>+		else</div><div class='add'>+			mt76_wr(dev, MT_PCIE1_MAC_INT_ENABLE_MT7916, 0xff);</div><div class='add'>+</div><div class='add'>+		ret = devm_request_irq(mdev-&gt;dev, dev-&gt;hif2-&gt;irq,</div><div class='add'>+				       mt7915_irq_handler, IRQF_SHARED,</div><div class='add'>+				       KBUILD_MODNAME "-hif", dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto free_hif2;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = mt7915_register_device(dev);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+		goto free_hif2_irq;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-error:</div><div class='add'>+</div><div class='add'>+free_hif2_irq:</div><div class='add'>+	if (dev-&gt;hif2)</div><div class='add'>+		devm_free_irq(mdev-&gt;dev, dev-&gt;hif2-&gt;irq, dev);</div><div class='add'>+free_hif2:</div><div class='add'>+	if (dev-&gt;hif2)</div><div class='add'>+		put_device(dev-&gt;hif2-&gt;dev);</div><div class='add'>+	devm_free_irq(mdev-&gt;dev, irq, dev);</div><div class='add'>+free_wed_or_irq_vector:</div><div class='add'>+	if (mtk_wed_device_active(&amp;mdev-&gt;mmio.wed))</div><div class='add'>+		mtk_wed_device_detach(&amp;mdev-&gt;mmio.wed);</div><div class='add'>+	else</div><div class='add'>+		pci_free_irq_vectors(pdev);</div><div class='add'>+free_device:</div><div class='ctx'> 	mt76_free_device(&amp;dev-&gt;mt76);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -293,47 +218,25 @@ static void mt7915_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> 	mt7915_unregister_device(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_driver mt7915_hif_driver = {</div><div class='add'>+struct pci_driver mt7915_hif_driver = {</div><div class='ctx'> 	.name		= KBUILD_MODNAME "_hif",</div><div class='ctx'> 	.id_table	= mt7915_hif_device_table,</div><div class='ctx'> 	.probe		= mt7915_pci_probe,</div><div class='ctx'> 	.remove		= mt7915_hif_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct pci_driver mt7915_pci_driver = {</div><div class='add'>+struct pci_driver mt7915_pci_driver = {</div><div class='ctx'> 	.name		= KBUILD_MODNAME,</div><div class='ctx'> 	.id_table	= mt7915_pci_device_table,</div><div class='ctx'> 	.probe		= mt7915_pci_probe,</div><div class='ctx'> 	.remove		= mt7915_pci_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init mt7915_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = pci_register_driver(&amp;mt7915_hif_driver);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = pci_register_driver(&amp;mt7915_pci_driver);</div><div class='del'>-	if (ret)</div><div class='del'>-		pci_unregister_driver(&amp;mt7915_hif_driver);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit mt7915_exit(void)</div><div class='del'>-{</div><div class='del'>-    pci_unregister_driver(&amp;mt7915_pci_driver);</div><div class='del'>-    pci_unregister_driver(&amp;mt7915_hif_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(mt7915_init);</div><div class='del'>-module_exit(mt7915_exit);</div><div class='del'>-</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, mt7915_pci_device_table);</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, mt7915_hif_device_table);</div><div class='ctx'> MODULE_FIRMWARE(MT7915_FIRMWARE_WA);</div><div class='ctx'> MODULE_FIRMWARE(MT7915_FIRMWARE_WM);</div><div class='ctx'> MODULE_FIRMWARE(MT7915_ROM_PATCH);</div><div class='del'>-MODULE_LICENSE("Dual BSD/GPL");</div><div class='add'>+MODULE_FIRMWARE(MT7916_FIRMWARE_WA);</div><div class='add'>+MODULE_FIRMWARE(MT7916_FIRMWARE_WM);</div><div class='add'>+MODULE_FIRMWARE(MT7916_ROM_PATCH);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h<br/>index efe0f2904c66..307bf6a75674 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/regs.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/regs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/regs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7915/regs.h</a></div><div class='hunk'>@@ -1,109 +1,276 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MT7915_REGS_H</div><div class='ctx'> #define __MT7915_REGS_H</div><div class='ctx'> </div><div class='add'>+/* used to differentiate between generations */</div><div class='add'>+struct mt7915_reg_desc {</div><div class='add'>+	const u32 *reg_rev;</div><div class='add'>+	const u32 *offs_rev;</div><div class='add'>+	const struct mt76_connac_reg_map *map;</div><div class='add'>+	u32 map_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum reg_rev {</div><div class='add'>+	INT_SOURCE_CSR,</div><div class='add'>+	INT_MASK_CSR,</div><div class='add'>+	INT1_SOURCE_CSR,</div><div class='add'>+	INT1_MASK_CSR,</div><div class='add'>+	INT_MCU_CMD_SOURCE,</div><div class='add'>+	INT_MCU_CMD_EVENT,</div><div class='add'>+	WFDMA0_ADDR,</div><div class='add'>+	WFDMA0_PCIE1_ADDR,</div><div class='add'>+	WFDMA_EXT_CSR_ADDR,</div><div class='add'>+	CBTOP1_PHY_END,</div><div class='add'>+	INFRA_MCU_ADDR_END,</div><div class='add'>+	FW_ASSERT_STAT_ADDR,</div><div class='add'>+	FW_EXCEPT_TYPE_ADDR,</div><div class='add'>+	FW_EXCEPT_COUNT_ADDR,</div><div class='add'>+	FW_CIRQ_COUNT_ADDR,</div><div class='add'>+	FW_CIRQ_IDX_ADDR,</div><div class='add'>+	FW_CIRQ_LISR_ADDR,</div><div class='add'>+	FW_TASK_ID_ADDR,</div><div class='add'>+	FW_TASK_IDX_ADDR,</div><div class='add'>+	FW_TASK_QID1_ADDR,</div><div class='add'>+	FW_TASK_QID2_ADDR,</div><div class='add'>+	FW_TASK_START_ADDR,</div><div class='add'>+	FW_TASK_END_ADDR,</div><div class='add'>+	FW_TASK_SIZE_ADDR,</div><div class='add'>+	FW_LAST_MSG_ID_ADDR,</div><div class='add'>+	FW_EINT_INFO_ADDR,</div><div class='add'>+	FW_SCHED_INFO_ADDR,</div><div class='add'>+	SWDEF_BASE_ADDR,</div><div class='add'>+	TXQ_WED_RING_BASE,</div><div class='add'>+	RXQ_WED_RING_BASE,</div><div class='add'>+	RXQ_WED_DATA_RING_BASE,</div><div class='add'>+	__MT_REG_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum offs_rev {</div><div class='add'>+	TMAC_CDTR,</div><div class='add'>+	TMAC_ODTR,</div><div class='add'>+	TMAC_ATCR,</div><div class='add'>+	TMAC_TRCR0,</div><div class='add'>+	TMAC_ICR0,</div><div class='add'>+	TMAC_ICR1,</div><div class='add'>+	TMAC_CTCR0,</div><div class='add'>+	TMAC_TFCR0,</div><div class='add'>+	MDP_BNRCFR0,</div><div class='add'>+	MDP_BNRCFR1,</div><div class='add'>+	ARB_DRNGR0,</div><div class='add'>+	ARB_SCR,</div><div class='add'>+	RMAC_MIB_AIRTIME14,</div><div class='add'>+	AGG_AWSCR0,</div><div class='add'>+	AGG_PCR0,</div><div class='add'>+	AGG_ACR0,</div><div class='add'>+	AGG_ACR4,</div><div class='add'>+	AGG_MRCR,</div><div class='add'>+	AGG_ATCR0,</div><div class='add'>+	AGG_ATCR1,</div><div class='add'>+	AGG_ATCR3,</div><div class='add'>+	LPON_UTTR0,</div><div class='add'>+	LPON_UTTR1,</div><div class='add'>+	LPON_FRCR,</div><div class='add'>+	MIB_SDR3,</div><div class='add'>+	MIB_SDR4,</div><div class='add'>+	MIB_SDR5,</div><div class='add'>+	MIB_SDR7,</div><div class='add'>+	MIB_SDR8,</div><div class='add'>+	MIB_SDR9,</div><div class='add'>+	MIB_SDR10,</div><div class='add'>+	MIB_SDR11,</div><div class='add'>+	MIB_SDR12,</div><div class='add'>+	MIB_SDR13,</div><div class='add'>+	MIB_SDR14,</div><div class='add'>+	MIB_SDR15,</div><div class='add'>+	MIB_SDR16,</div><div class='add'>+	MIB_SDR17,</div><div class='add'>+	MIB_SDR18,</div><div class='add'>+	MIB_SDR19,</div><div class='add'>+	MIB_SDR20,</div><div class='add'>+	MIB_SDR21,</div><div class='add'>+	MIB_SDR22,</div><div class='add'>+	MIB_SDR23,</div><div class='add'>+	MIB_SDR24,</div><div class='add'>+	MIB_SDR25,</div><div class='add'>+	MIB_SDR27,</div><div class='add'>+	MIB_SDR28,</div><div class='add'>+	MIB_SDR29,</div><div class='add'>+	MIB_SDRVEC,</div><div class='add'>+	MIB_SDR31,</div><div class='add'>+	MIB_SDR32,</div><div class='add'>+	MIB_SDRMUBF,</div><div class='add'>+	MIB_DR8,</div><div class='add'>+	MIB_DR9,</div><div class='add'>+	MIB_DR11,</div><div class='add'>+	MIB_MB_SDR0,</div><div class='add'>+	MIB_MB_SDR1,</div><div class='add'>+	TX_AGG_CNT,</div><div class='add'>+	TX_AGG_CNT2,</div><div class='add'>+	MIB_ARNG,</div><div class='add'>+	WTBLON_TOP_WDUCR,</div><div class='add'>+	WTBL_UPDATE,</div><div class='add'>+	PLE_FL_Q_EMPTY,</div><div class='add'>+	PLE_FL_Q_CTRL,</div><div class='add'>+	PLE_AC_QEMPTY,</div><div class='add'>+	PLE_FREEPG_CNT,</div><div class='add'>+	PLE_FREEPG_HEAD_TAIL,</div><div class='add'>+	PLE_PG_HIF_GROUP,</div><div class='add'>+	PLE_HIF_PG_INFO,</div><div class='add'>+	AC_OFFSET,</div><div class='add'>+	ETBF_PAR_RPT0,</div><div class='add'>+	__MT_OFFS_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define __REG(id)			(dev-&gt;reg.reg_rev[(id)])</div><div class='add'>+#define __OFFS(id)			(dev-&gt;reg.offs_rev[(id)])</div><div class='add'>+</div><div class='ctx'> /* MCU WFDMA0 */</div><div class='ctx'> #define MT_MCU_WFDMA0_BASE		0x2000</div><div class='ctx'> #define MT_MCU_WFDMA0(ofs)		(MT_MCU_WFDMA0_BASE + (ofs))</div><div class='add'>+</div><div class='ctx'> #define MT_MCU_WFDMA0_DUMMY_CR		MT_MCU_WFDMA0(0x120)</div><div class='ctx'> </div><div class='ctx'> /* MCU WFDMA1 */</div><div class='ctx'> #define MT_MCU_WFDMA1_BASE		0x3000</div><div class='ctx'> #define MT_MCU_WFDMA1(ofs)		(MT_MCU_WFDMA1_BASE + (ofs))</div><div class='ctx'> </div><div class='del'>-#define MT_MCU_INT_EVENT		MT_MCU_WFDMA1(0x108)</div><div class='add'>+#define MT_MCU_INT_EVENT		__REG(INT_MCU_CMD_EVENT)</div><div class='ctx'> #define MT_MCU_INT_EVENT_DMA_STOPPED	BIT(0)</div><div class='ctx'> #define MT_MCU_INT_EVENT_DMA_INIT	BIT(1)</div><div class='ctx'> #define MT_MCU_INT_EVENT_SER_TRIGGER	BIT(2)</div><div class='ctx'> #define MT_MCU_INT_EVENT_RESET_DONE	BIT(3)</div><div class='ctx'> </div><div class='del'>-#define MT_PLE_BASE			0x8000</div><div class='add'>+/* PLE */</div><div class='add'>+#define MT_PLE_BASE			0x820c0000</div><div class='ctx'> #define MT_PLE(ofs)			(MT_PLE_BASE + (ofs))</div><div class='ctx'> </div><div class='del'>-#define MT_PLE_FL_Q0_CTRL		MT_PLE(0x1b0)</div><div class='del'>-#define MT_PLE_FL_Q1_CTRL		MT_PLE(0x1b4)</div><div class='del'>-#define MT_PLE_FL_Q2_CTRL		MT_PLE(0x1b8)</div><div class='del'>-#define MT_PLE_FL_Q3_CTRL		MT_PLE(0x1bc)</div><div class='add'>+#define MT_PLE_HOST_RPT0		MT_PLE(0x030)</div><div class='add'>+#define MT_PLE_HOST_RPT0_TX_LATENCY	BIT(3)</div><div class='add'>+</div><div class='add'>+#define MT_FL_Q_EMPTY			MT_PLE(__OFFS(PLE_FL_Q_EMPTY))</div><div class='add'>+#define MT_FL_Q0_CTRL			MT_PLE(__OFFS(PLE_FL_Q_CTRL))</div><div class='add'>+#define MT_FL_Q2_CTRL			MT_PLE(__OFFS(PLE_FL_Q_CTRL) + 0x8)</div><div class='add'>+#define MT_FL_Q3_CTRL			MT_PLE(__OFFS(PLE_FL_Q_CTRL) + 0xc)</div><div class='ctx'> </div><div class='del'>-#define MT_PLE_AC_QEMPTY(ac, n)		MT_PLE(0x300 + 0x10 * (ac) + \</div><div class='del'>-					       ((n) &lt;&lt; 2))</div><div class='add'>+#define MT_PLE_FREEPG_CNT		MT_PLE(__OFFS(PLE_FREEPG_CNT))</div><div class='add'>+#define MT_PLE_FREEPG_HEAD_TAIL		MT_PLE(__OFFS(PLE_FREEPG_HEAD_TAIL))</div><div class='add'>+#define MT_PLE_PG_HIF_GROUP		MT_PLE(__OFFS(PLE_PG_HIF_GROUP))</div><div class='add'>+#define MT_PLE_HIF_PG_INFO		MT_PLE(__OFFS(PLE_HIF_PG_INFO))</div><div class='add'>+</div><div class='add'>+#define MT_PLE_AC_QEMPTY(ac, n)		MT_PLE(__OFFS(PLE_AC_QEMPTY) +	\</div><div class='add'>+					       __OFFS(AC_OFFSET) *	\</div><div class='add'>+					       (ac) + ((n) &lt;&lt; 2))</div><div class='ctx'> #define MT_PLE_AMSDU_PACK_MSDU_CNT(n)	MT_PLE(0x10e0 + ((n) &lt;&lt; 2))</div><div class='ctx'> </div><div class='del'>-#define MT_MDP_BASE			0xf000</div><div class='add'>+#define MT_PSE_BASE			0x820c8000</div><div class='add'>+#define MT_PSE(ofs)			(MT_PSE_BASE + (ofs))</div><div class='add'>+</div><div class='add'>+/* WF MDP TOP */</div><div class='add'>+#define MT_MDP_BASE			0x820cd000</div><div class='ctx'> #define MT_MDP(ofs)			(MT_MDP_BASE + (ofs))</div><div class='ctx'> </div><div class='ctx'> #define MT_MDP_DCR0			MT_MDP(0x000)</div><div class='ctx'> #define MT_MDP_DCR0_DAMSDU_EN		BIT(15)</div><div class='add'>+#define MT_MDP_DCR0_RX_HDR_TRANS_EN	BIT(19)</div><div class='ctx'> </div><div class='ctx'> #define MT_MDP_DCR1			MT_MDP(0x004)</div><div class='ctx'> #define MT_MDP_DCR1_MAX_RX_LEN		GENMASK(15, 3)</div><div class='ctx'> </div><div class='del'>-#define MT_MDP_BNRCFR0(_band)		MT_MDP(0x070 + ((_band) &lt;&lt; 8))</div><div class='add'>+#define MT_MDP_DCR2			MT_MDP(0x0e8)</div><div class='add'>+#define MT_MDP_DCR2_RX_TRANS_SHORT	BIT(2)</div><div class='add'>+</div><div class='add'>+#define MT_MDP_BNRCFR0(_band)		MT_MDP(__OFFS(MDP_BNRCFR0) + \</div><div class='add'>+					       ((_band) &lt;&lt; 8))</div><div class='ctx'> #define MT_MDP_RCFR0_MCU_RX_MGMT	GENMASK(5, 4)</div><div class='ctx'> #define MT_MDP_RCFR0_MCU_RX_CTL_NON_BAR	GENMASK(7, 6)</div><div class='ctx'> #define MT_MDP_RCFR0_MCU_RX_CTL_BAR	GENMASK(9, 8)</div><div class='ctx'> </div><div class='del'>-#define MT_MDP_BNRCFR1(_band)		MT_MDP(0x074 + ((_band) &lt;&lt; 8))</div><div class='add'>+#define MT_MDP_BNRCFR1(_band)		MT_MDP(__OFFS(MDP_BNRCFR1) + \</div><div class='add'>+					       ((_band) &lt;&lt; 8))</div><div class='ctx'> #define MT_MDP_RCFR1_MCU_RX_BYPASS	GENMASK(23, 22)</div><div class='ctx'> #define MT_MDP_RCFR1_RX_DROPPED_UCAST	GENMASK(28, 27)</div><div class='ctx'> #define MT_MDP_RCFR1_RX_DROPPED_MCAST	GENMASK(30, 29)</div><div class='ctx'> #define MT_MDP_TO_HIF			0</div><div class='ctx'> #define MT_MDP_TO_WM			1</div><div class='ctx'> </div><div class='del'>-/* TMAC: band 0(0x21000), band 1(0xa1000) */</div><div class='del'>-#define MT_WF_TMAC_BASE(_band)		((_band) ? 0xa1000 : 0x21000)</div><div class='add'>+/* TRB: band 0(0x820e1000), band 1(0x820f1000) */</div><div class='add'>+#define MT_WF_TRB_BASE(_band)		((_band) ? 0x820f1000 : 0x820e1000)</div><div class='add'>+#define MT_WF_TRB(_band, ofs)		(MT_WF_TRB_BASE(_band) + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_TRB_RXPSR0(_band)		MT_WF_TRB(_band, 0x03c)</div><div class='add'>+#define MT_TRB_RXPSR0_RX_WTBL_PTR	GENMASK(25, 16)</div><div class='add'>+#define MT_TRB_RXPSR0_RX_RMAC_PTR	GENMASK(9, 0)</div><div class='add'>+</div><div class='add'>+/* TMAC: band 0(0x820e4000), band 1(0x820f4000) */</div><div class='add'>+#define MT_WF_TMAC_BASE(_band)		((_band) ? 0x820f4000 : 0x820e4000)</div><div class='ctx'> #define MT_WF_TMAC(_band, ofs)		(MT_WF_TMAC_BASE(_band) + (ofs))</div><div class='ctx'> </div><div class='ctx'> #define MT_TMAC_TCR0(_band)		MT_WF_TMAC(_band, 0)</div><div class='add'>+#define MT_TMAC_TCR0_TX_BLINK		GENMASK(7, 6)</div><div class='ctx'> #define MT_TMAC_TCR0_TBTT_STOP_CTRL	BIT(25)</div><div class='ctx'> </div><div class='del'>-#define MT_TMAC_CDTR(_band)		MT_WF_TMAC(_band, 0x090)</div><div class='del'>-#define MT_TMAC_ODTR(_band)		MT_WF_TMAC(_band, 0x094)</div><div class='add'>+#define MT_TMAC_CDTR(_band)		MT_WF_TMAC(_band, __OFFS(TMAC_CDTR))</div><div class='add'>+ #define MT_TMAC_ODTR(_band)		MT_WF_TMAC(_band, __OFFS(TMAC_ODTR))</div><div class='ctx'> #define MT_TIMEOUT_VAL_PLCP		GENMASK(15, 0)</div><div class='ctx'> #define MT_TIMEOUT_VAL_CCA		GENMASK(31, 16)</div><div class='ctx'> </div><div class='del'>-#define MT_TMAC_ATCR(_band)		MT_WF_TMAC(_band, 0x098)</div><div class='add'>+#define MT_TMAC_ATCR(_band)		MT_WF_TMAC(_band, __OFFS(TMAC_ATCR))</div><div class='ctx'> #define MT_TMAC_ATCR_TXV_TOUT		GENMASK(7, 0)</div><div class='ctx'> </div><div class='del'>-#define MT_TMAC_TRCR0(_band)		MT_WF_TMAC(_band, 0x09c)</div><div class='add'>+#define MT_TMAC_TRCR0(_band)		MT_WF_TMAC(_band, __OFFS(TMAC_TRCR0))</div><div class='ctx'> #define MT_TMAC_TRCR0_TR2T_CHK		GENMASK(8, 0)</div><div class='ctx'> #define MT_TMAC_TRCR0_I2T_CHK		GENMASK(24, 16)</div><div class='ctx'> </div><div class='del'>-#define MT_TMAC_ICR0(_band)		MT_WF_TMAC(_band, 0x0a4)</div><div class='del'>-#define MT_IFS_EIFS			GENMASK(8, 0)</div><div class='add'>+#define MT_TMAC_ICR0(_band)		MT_WF_TMAC(_band, __OFFS(TMAC_ICR0))</div><div class='add'>+#define MT_IFS_EIFS_OFDM		GENMASK(8, 0)</div><div class='ctx'> #define MT_IFS_RIFS			GENMASK(14, 10)</div><div class='ctx'> #define MT_IFS_SIFS			GENMASK(22, 16)</div><div class='ctx'> #define MT_IFS_SLOT			GENMASK(30, 24)</div><div class='ctx'> </div><div class='del'>-#define MT_TMAC_CTCR0(_band)			MT_WF_TMAC(_band, 0x0f4)</div><div class='add'>+#define MT_TMAC_ICR1(_band)		MT_WF_TMAC(_band, __OFFS(TMAC_ICR1))</div><div class='add'>+#define MT_IFS_EIFS_CCK			GENMASK(8, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TMAC_CTCR0(_band)		MT_WF_TMAC(_band, __OFFS(TMAC_CTCR0))</div><div class='ctx'> #define MT_TMAC_CTCR0_INS_DDLMT_REFTIME		GENMASK(5, 0)</div><div class='ctx'> #define MT_TMAC_CTCR0_INS_DDLMT_EN		BIT(17)</div><div class='ctx'> #define MT_TMAC_CTCR0_INS_DDLMT_VHT_SMPDU_EN	BIT(18)</div><div class='ctx'> </div><div class='del'>-#define MT_TMAC_FP0R0(_band)		MT_WF_TMAC(_band, 0x020)</div><div class='del'>-#define MT_TMAC_FP0R15(_band)		MT_WF_TMAC(_band, 0x080)</div><div class='del'>-#define MT_TMAC_FP0R18(_band)		MT_WF_TMAC(_band, 0x270)</div><div class='del'>-#define MT_TMAC_FP_MASK			GENMASK(7, 0)</div><div class='add'>+#define MT_TMAC_TFCR0(_band)		MT_WF_TMAC(_band, __OFFS(TMAC_TFCR0))</div><div class='ctx'> </div><div class='del'>-#define MT_TMAC_TFCR0(_band)		MT_WF_TMAC(_band, 0x1e0)</div><div class='del'>-</div><div class='del'>-#define MT_WF_DMA_BASE(_band)		((_band) ? 0xa1e00 : 0x21e00)</div><div class='add'>+/* WF DMA TOP: band 0(0x820e7000),band 1(0x820f7000) */</div><div class='add'>+#define MT_WF_DMA_BASE(_band)		((_band) ? 0x820f7000 : 0x820e7000)</div><div class='ctx'> #define MT_WF_DMA(_band, ofs)		(MT_WF_DMA_BASE(_band) + (ofs))</div><div class='ctx'> </div><div class='ctx'> #define MT_DMA_DCR0(_band)		MT_WF_DMA(_band, 0x000)</div><div class='ctx'> #define MT_DMA_DCR0_MAX_RX_LEN		GENMASK(15, 3)</div><div class='ctx'> #define MT_DMA_DCR0_RXD_G5_EN		BIT(23)</div><div class='ctx'> </div><div class='del'>-/* ETBF: band 0(0x24000), band 1(0xa4000) */</div><div class='del'>-#define MT_WF_ETBF_BASE(_band)		((_band) ? 0xa4000 : 0x24000)</div><div class='add'>+/* WTBLOFF TOP: band 0(0x820e9000),band 1(0x820f9000) */</div><div class='add'>+#define MT_WTBLOFF_TOP_BASE(_band)	((_band) ? 0x820f9000 : 0x820e9000)</div><div class='add'>+#define MT_WTBLOFF_TOP(_band, ofs)	(MT_WTBLOFF_TOP_BASE(_band) + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_WTBLOFF_TOP_RSCR(_band)	MT_WTBLOFF_TOP(_band, 0x008)</div><div class='add'>+#define MT_WTBLOFF_TOP_RSCR_RCPI_MODE	GENMASK(31, 30)</div><div class='add'>+#define MT_WTBLOFF_TOP_RSCR_RCPI_PARAM	GENMASK(25, 24)</div><div class='add'>+</div><div class='add'>+#define MT_WTBLOFF_TOP_ACR(_band)	MT_WTBLOFF_TOP(_band, 0x010)</div><div class='add'>+#define MT_WTBLOFF_TOP_ADM_BACKOFFTIME	BIT(29)</div><div class='add'>+</div><div class='add'>+/* ETBF: band 0(0x820ea000), band 1(0x820fa000) */</div><div class='add'>+#define MT_WF_ETBF_BASE(_band)		((_band) ? 0x820fa000 : 0x820ea000)</div><div class='ctx'> #define MT_WF_ETBF(_band, ofs)		(MT_WF_ETBF_BASE(_band) + (ofs))</div><div class='ctx'> </div><div class='ctx'> #define MT_ETBF_TX_NDP_BFRP(_band)	MT_WF_ETBF(_band, 0x040)</div><div class='ctx'> #define MT_ETBF_TX_FB_CPL		GENMASK(31, 16)</div><div class='ctx'> #define MT_ETBF_TX_FB_TRI		GENMASK(15, 0)</div><div class='ctx'> </div><div class='add'>+#define MT_ETBF_PAR_RPT0(_band)		MT_WF_ETBF(_band, __OFFS(ETBF_PAR_RPT0))</div><div class='add'>+#define MT_ETBF_PAR_RPT0_FB_BW		GENMASK(7, 6)</div><div class='add'>+#define MT_ETBF_PAR_RPT0_FB_NC		GENMASK(5, 3)</div><div class='add'>+#define MT_ETBF_PAR_RPT0_FB_NR		GENMASK(2, 0)</div><div class='add'>+</div><div class='ctx'> #define MT_ETBF_TX_APP_CNT(_band)	MT_WF_ETBF(_band, 0x0f0)</div><div class='ctx'> #define MT_ETBF_TX_IBF_CNT		GENMASK(31, 16)</div><div class='ctx'> #define MT_ETBF_TX_EBF_CNT		GENMASK(15, 0)</div><div class='hunk'>@@ -114,81 +281,209 @@</div><div class='ctx'> #define MT_ETBF_RX_FB_VHT		GENMASK(15, 8)</div><div class='ctx'> #define MT_ETBF_RX_FB_HT		GENMASK(7, 0)</div><div class='ctx'> </div><div class='del'>-/* LPON: band 0(0x24200), band 1(0xa4200) */</div><div class='del'>-#define MT_WF_LPON_BASE(_band)		((_band) ? 0xa4200 : 0x24200)</div><div class='add'>+/* LPON: band 0(0x820eb000), band 1(0x820fb000) */</div><div class='add'>+#define MT_WF_LPON_BASE(_band)		((_band) ? 0x820fb000 : 0x820eb000)</div><div class='ctx'> #define MT_WF_LPON(_band, ofs)		(MT_WF_LPON_BASE(_band) + (ofs))</div><div class='ctx'> </div><div class='del'>-#define MT_LPON_UTTR0(_band)		MT_WF_LPON(_band, 0x080)</div><div class='del'>-#define MT_LPON_UTTR1(_band)		MT_WF_LPON(_band, 0x084)</div><div class='add'>+#define MT_LPON_UTTR0(_band)		MT_WF_LPON(_band, __OFFS(LPON_UTTR0))</div><div class='add'>+#define MT_LPON_UTTR1(_band)		MT_WF_LPON(_band, __OFFS(LPON_UTTR1))</div><div class='add'>+#define MT_LPON_FRCR(_band)		MT_WF_LPON(_band, __OFFS(LPON_FRCR))</div><div class='ctx'> </div><div class='del'>-#define MT_LPON_TCR(_band, n)		MT_WF_LPON(_band, 0x0a8 + (n) * 4)</div><div class='add'>+#define MT_LPON_TCR(_band, n)		MT_WF_LPON(_band, 0x0a8 +	\</div><div class='add'>+						   (((n) * 4) &lt;&lt; 1))</div><div class='add'>+#define MT_LPON_TCR_MT7916(_band, n)	MT_WF_LPON(_band, 0x0a8 +	\</div><div class='add'>+						   (((n) * 4) &lt;&lt; 4))</div><div class='ctx'> #define MT_LPON_TCR_SW_MODE		GENMASK(1, 0)</div><div class='ctx'> #define MT_LPON_TCR_SW_WRITE		BIT(0)</div><div class='del'>-</div><div class='del'>-/* MIB: band 0(0x24800), band 1(0xa4800) */</div><div class='del'>-#define MT_WF_MIB_BASE(_band)		((_band) ? 0xa4800 : 0x24800)</div><div class='add'>+#define MT_LPON_TCR_SW_ADJUST		BIT(1)</div><div class='add'>+#define MT_LPON_TCR_SW_READ		GENMASK(1, 0)</div><div class='add'>+</div><div class='add'>+/* MIB: band 0(0x820ed000), band 1(0x820fd000) */</div><div class='add'>+/* These counters are (mostly?) clear-on-read.  So, some should not</div><div class='add'>+ * be read at all in case firmware is already reading them.  These</div><div class='add'>+ * are commented with 'DNR' below.  The DNR stats will be read by querying</div><div class='add'>+ * the firmware API for the appropriate message.  For counters the driver</div><div class='add'>+ * does read, the driver should accumulate the counters.</div><div class='add'>+ */</div><div class='add'>+#define MT_WF_MIB_BASE(_band)		((_band) ? 0x820fd000 : 0x820ed000)</div><div class='ctx'> #define MT_WF_MIB(_band, ofs)		(MT_WF_MIB_BASE(_band) + (ofs))</div><div class='ctx'> </div><div class='del'>-#define MT_MIB_SDR3(_band)		MT_WF_MIB(_band, 0x014)</div><div class='add'>+#define MT_MIB_SDR0(_band)		MT_WF_MIB(_band, 0x010)</div><div class='add'>+#define MT_MIB_SDR0_BERACON_TX_CNT_MASK	GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define MT_MIB_SDR3(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR3))</div><div class='ctx'> #define MT_MIB_SDR3_FCS_ERR_MASK	GENMASK(15, 0)</div><div class='add'>+#define MT_MIB_SDR3_FCS_ERR_MASK_MT7916	GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define MT_MIB_SDR4(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR4))</div><div class='add'>+#define MT_MIB_SDR4_RX_FIFO_FULL_MASK	GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+/* rx mpdu counter, full 32 bits */</div><div class='add'>+#define MT_MIB_SDR5(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR5))</div><div class='add'>+</div><div class='add'>+#define MT_MIB_SDR6(_band)		MT_WF_MIB(_band, 0x020)</div><div class='add'>+#define MT_MIB_SDR6_CHANNEL_IDL_CNT_MASK	GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define MT_MIB_SDR7(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR7))</div><div class='add'>+#define MT_MIB_SDR7_RX_VECTOR_MISMATCH_CNT_MASK	GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define MT_MIB_SDR8(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR8))</div><div class='add'>+#define MT_MIB_SDR8_RX_DELIMITER_FAIL_CNT_MASK	GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+/* aka CCA_NAV_TX_TIME */</div><div class='add'>+#define MT_MIB_SDR9_DNR(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR9))</div><div class='add'>+#define MT_MIB_SDR9_CCA_BUSY_TIME_MASK		GENMASK(23, 0)</div><div class='add'>+</div><div class='add'>+#define MT_MIB_SDR10(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR10))</div><div class='add'>+#define MT_MIB_SDR10_MRDY_COUNT_MASK		GENMASK(25, 0)</div><div class='add'>+#define MT_MIB_SDR10_MRDY_COUNT_MASK_MT7916	GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+#define MT_MIB_SDR11(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR11))</div><div class='add'>+#define MT_MIB_SDR11_RX_LEN_MISMATCH_CNT_MASK	GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+/* tx ampdu cnt, full 32 bits */</div><div class='add'>+#define MT_MIB_SDR12(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR12))</div><div class='add'>+</div><div class='add'>+#define MT_MIB_SDR13(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR13))</div><div class='add'>+#define MT_MIB_SDR13_TX_STOP_Q_EMPTY_CNT_MASK	GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+/* counts all mpdus in ampdu, regardless of success */</div><div class='add'>+#define MT_MIB_SDR14(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR14))</div><div class='add'>+#define MT_MIB_SDR14_TX_MPDU_ATTEMPTS_CNT_MASK	GENMASK(23, 0)</div><div class='add'>+#define MT_MIB_SDR14_TX_MPDU_ATTEMPTS_CNT_MASK_MT7916	GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+/* counts all successfully tx'd mpdus in ampdu */</div><div class='add'>+#define MT_MIB_SDR15(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR15))</div><div class='add'>+#define MT_MIB_SDR15_TX_MPDU_SUCCESS_CNT_MASK	GENMASK(23, 0)</div><div class='add'>+#define MT_MIB_SDR15_TX_MPDU_SUCCESS_CNT_MASK_MT7916	GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+/* in units of 'us' */</div><div class='add'>+#define MT_MIB_SDR16(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR16))</div><div class='add'>+#define MT_MIB_SDR16_PRIMARY_CCA_BUSY_TIME_MASK	GENMASK(23, 0)</div><div class='add'>+</div><div class='add'>+#define MT_MIB_SDR17(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR17))</div><div class='add'>+#define MT_MIB_SDR17_SECONDARY_CCA_BUSY_TIME_MASK	GENMASK(23, 0)</div><div class='add'>+</div><div class='add'>+#define MT_MIB_SDR18(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR18))</div><div class='add'>+#define MT_MIB_SDR18_PRIMARY_ENERGY_DETECT_TIME_MASK	GENMASK(23, 0)</div><div class='add'>+</div><div class='add'>+/* units are us */</div><div class='add'>+#define MT_MIB_SDR19(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR19))</div><div class='add'>+#define MT_MIB_SDR19_CCK_MDRDY_TIME_MASK	GENMASK(23, 0)</div><div class='add'>+</div><div class='add'>+#define MT_MIB_SDR20(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR20))</div><div class='add'>+#define MT_MIB_SDR20_OFDM_VHT_MDRDY_TIME_MASK	GENMASK(23, 0)</div><div class='add'>+</div><div class='add'>+#define MT_MIB_SDR21(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR21))</div><div class='add'>+#define MT_MIB_SDR21_GREEN_MDRDY_TIME_MASK	GENMASK(23, 0)</div><div class='add'>+</div><div class='add'>+/* rx ampdu count, 32-bit */</div><div class='add'>+#define MT_MIB_SDR22(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR22))</div><div class='ctx'> </div><div class='del'>-#define MT_MIB_SDR9(_band)		MT_WF_MIB(_band, 0x02c)</div><div class='del'>-#define MT_MIB_SDR9_BUSY_MASK		GENMASK(23, 0)</div><div class='add'>+/* rx ampdu bytes count, 32-bit */</div><div class='add'>+#define MT_MIB_SDR23(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR23))</div><div class='ctx'> </div><div class='del'>-#define MT_MIB_SDR16(_band)		MT_WF_MIB(_band, 0x048)</div><div class='del'>-#define MT_MIB_SDR16_BUSY_MASK		GENMASK(23, 0)</div><div class='add'>+/* rx ampdu valid subframe count */</div><div class='add'>+#define MT_MIB_SDR24(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR24))</div><div class='add'>+#define MT_MIB_SDR24_RX_AMPDU_SF_CNT_MASK	GENMASK(23, 0)</div><div class='add'>+#define MT_MIB_SDR24_RX_AMPDU_SF_CNT_MASK_MT7916	GENMASK(31, 0)</div><div class='ctx'> </div><div class='del'>-#define MT_MIB_SDR34(_band)		MT_WF_MIB(_band, 0x090)</div><div class='add'>+/* rx ampdu valid subframe bytes count, 32bits */</div><div class='add'>+#define MT_MIB_SDR25(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR25))</div><div class='add'>+</div><div class='add'>+/* remaining windows protected stats */</div><div class='add'>+#define MT_MIB_SDR27(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR27))</div><div class='add'>+#define MT_MIB_SDR27_TX_RWP_FAIL_CNT_MASK	GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define MT_MIB_SDR28(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR28))</div><div class='add'>+#define MT_MIB_SDR28_TX_RWP_NEED_CNT_MASK	GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define MT_MIB_SDR29(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR29))</div><div class='add'>+#define MT_MIB_SDR29_RX_PFDROP_CNT_MASK		GENMASK(7, 0)</div><div class='add'>+#define MT_MIB_SDR29_RX_PFDROP_CNT_MASK_MT7916	GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define MT_MIB_SDRVEC(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDRVEC))</div><div class='add'>+#define MT_MIB_SDR30_RX_VEC_QUEUE_OVERFLOW_DROP_CNT_MASK	GENMASK(15, 0)</div><div class='add'>+#define MT_MIB_SDR30_RX_VEC_QUEUE_OVERFLOW_DROP_CNT_MASK_MT7916	GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+/* rx blockack count, 32 bits */</div><div class='add'>+#define MT_MIB_SDR31(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR31))</div><div class='add'>+</div><div class='add'>+#define MT_MIB_SDR32(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDR32))</div><div class='add'>+#define MT_MIB_SDR32_TX_PKT_EBF_CNT	GENMASK(15, 0)</div><div class='add'>+#define MT_MIB_SDR32_TX_PKT_IBF_CNT	GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define MT_MIB_SDR33(_band)		MT_WF_MIB(_band, 0x088)</div><div class='add'>+#define MT_MIB_SDR33_TX_PKT_IBF_CNT	GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define MT_MIB_SDRMUBF(_band)		MT_WF_MIB(_band, __OFFS(MIB_SDRMUBF))</div><div class='ctx'> #define MT_MIB_MU_BF_TX_CNT		GENMASK(15, 0)</div><div class='ctx'> </div><div class='del'>-#define MT_MIB_SDR36(_band)		MT_WF_MIB(_band, 0x098)</div><div class='del'>-#define MT_MIB_SDR36_TXTIME_MASK	GENMASK(23, 0)</div><div class='del'>-#define MT_MIB_SDR37(_band)		MT_WF_MIB(_band, 0x09c)</div><div class='del'>-#define MT_MIB_SDR37_RXTIME_MASK	GENMASK(23, 0)</div><div class='add'>+/* 36, 37 both DNR */</div><div class='ctx'> </div><div class='del'>-#define MT_MIB_DR8(_band)		MT_WF_MIB(_band, 0x0c0)</div><div class='del'>-#define MT_MIB_DR9(_band)		MT_WF_MIB(_band, 0x0c4)</div><div class='del'>-#define MT_MIB_DR11(_band)		MT_WF_MIB(_band, 0x0cc)</div><div class='add'>+#define MT_MIB_DR8(_band)		MT_WF_MIB(_band, __OFFS(MIB_DR8))</div><div class='add'>+#define MT_MIB_DR9(_band)		MT_WF_MIB(_band, __OFFS(MIB_DR9))</div><div class='add'>+#define MT_MIB_DR11(_band)		MT_WF_MIB(_band, __OFFS(MIB_DR11))</div><div class='ctx'> </div><div class='del'>-#define MT_MIB_MB_SDR0(_band, n)	MT_WF_MIB(_band, 0x100 + ((n) &lt;&lt; 4))</div><div class='add'>+#define MT_MIB_MB_SDR0(_band, n)	MT_WF_MIB(_band, __OFFS(MIB_MB_SDR0) + (n))</div><div class='ctx'> #define MT_MIB_RTS_RETRIES_COUNT_MASK	GENMASK(31, 16)</div><div class='ctx'> #define MT_MIB_RTS_COUNT_MASK		GENMASK(15, 0)</div><div class='ctx'> </div><div class='del'>-#define MT_MIB_MB_SDR1(_band, n)	MT_WF_MIB(_band, 0x104 + ((n) &lt;&lt; 4))</div><div class='add'>+#define MT_MIB_MB_SDR1(_band, n)	MT_WF_MIB(_band, __OFFS(MIB_MB_SDR1) + (n))</div><div class='ctx'> #define MT_MIB_BA_MISS_COUNT_MASK	GENMASK(15, 0)</div><div class='ctx'> #define MT_MIB_ACK_FAIL_COUNT_MASK	GENMASK(31, 16)</div><div class='ctx'> </div><div class='del'>-#define MT_MIB_MB_SDR2(_band, n)	MT_WF_MIB(_band, 0x108 + ((n) &lt;&lt; 4))</div><div class='del'>-#define MT_MIB_FRAME_RETRIES_COUNT_MASK	GENMASK(15, 0)</div><div class='add'>+#define MT_MIB_MB_SDR2(_band, n)	MT_WF_MIB(_band, 0x518 + (n))</div><div class='add'>+#define MT_MIB_MB_BFTF(_band, n)	MT_WF_MIB(_band, 0x510 + (n))</div><div class='ctx'> </div><div class='del'>-#define MT_TX_AGG_CNT(_band, n)		MT_WF_MIB(_band, 0x0a8 + ((n) &lt;&lt; 2))</div><div class='del'>-#define MT_TX_AGG_CNT2(_band, n)	MT_WF_MIB(_band, 0x164 + ((n) &lt;&lt; 2))</div><div class='del'>-#define MT_MIB_ARNG(_band, n)		MT_WF_MIB(_band, 0x4b8 + ((n) &lt;&lt; 2))</div><div class='add'>+#define MT_TX_AGG_CNT(_band, n)		MT_WF_MIB(_band, __OFFS(TX_AGG_CNT) +	\</div><div class='add'>+						  ((n) &lt;&lt; 2))</div><div class='add'>+#define MT_TX_AGG_CNT2(_band, n)	MT_WF_MIB(_band, __OFFS(TX_AGG_CNT2) +	\</div><div class='add'>+						  ((n) &lt;&lt; 2))</div><div class='add'>+#define MT_MIB_ARNG(_band, n)		MT_WF_MIB(_band, __OFFS(MIB_ARNG) +	\</div><div class='add'>+						  ((n) &lt;&lt; 2))</div><div class='ctx'> #define MT_MIB_ARNCR_RANGE(val, n)	(((val) &gt;&gt; ((n) &lt;&lt; 3)) &amp; GENMASK(7, 0))</div><div class='ctx'> </div><div class='del'>-#define MT_WTBLON_TOP_BASE		0x34000</div><div class='add'>+#define MT_MIB_BFCR0(_band)		MT_WF_MIB(_band, 0x7b0)</div><div class='add'>+#define MT_MIB_BFCR0_RX_FB_HT		GENMASK(15, 0)</div><div class='add'>+#define MT_MIB_BFCR0_RX_FB_VHT		GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define MT_MIB_BFCR1(_band)		MT_WF_MIB(_band, 0x7b4)</div><div class='add'>+#define MT_MIB_BFCR1_RX_FB_HE		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define MT_MIB_BFCR2(_band)		MT_WF_MIB(_band, 0x7b8)</div><div class='add'>+#define MT_MIB_BFCR2_BFEE_TX_FB_TRIG	GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define MT_MIB_BFCR7(_band)		MT_WF_MIB(_band, 0x7cc)</div><div class='add'>+#define MT_MIB_BFCR7_BFEE_TX_FB_CPL	GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+/* WTBLON TOP */</div><div class='add'>+#define MT_WTBLON_TOP_BASE		0x820d4000</div><div class='ctx'> #define MT_WTBLON_TOP(ofs)		(MT_WTBLON_TOP_BASE + (ofs))</div><div class='del'>-#define MT_WTBLON_TOP_WDUCR		MT_WTBLON_TOP(0x0)</div><div class='add'>+#define MT_WTBLON_TOP_WDUCR		MT_WTBLON_TOP(__OFFS(WTBLON_TOP_WDUCR))</div><div class='ctx'> #define MT_WTBLON_TOP_WDUCR_GROUP	GENMASK(2, 0)</div><div class='ctx'> </div><div class='del'>-#define MT_WTBL_UPDATE			MT_WTBLON_TOP(0x030)</div><div class='add'>+#define MT_WTBL_UPDATE			MT_WTBLON_TOP(__OFFS(WTBL_UPDATE))</div><div class='ctx'> #define MT_WTBL_UPDATE_WLAN_IDX		GENMASK(9, 0)</div><div class='ctx'> #define MT_WTBL_UPDATE_ADM_COUNT_CLEAR	BIT(12)</div><div class='ctx'> #define MT_WTBL_UPDATE_BUSY		BIT(31)</div><div class='ctx'> </div><div class='del'>-#define MT_WTBL_BASE			0x38000</div><div class='add'>+/* WTBL */</div><div class='add'>+#define MT_WTBL_BASE			0x820d8000</div><div class='ctx'> #define MT_WTBL_LMAC_ID			GENMASK(14, 8)</div><div class='ctx'> #define MT_WTBL_LMAC_DW			GENMASK(7, 2)</div><div class='ctx'> #define MT_WTBL_LMAC_OFFS(_id, _dw)	(MT_WTBL_BASE | \</div><div class='del'>-					FIELD_PREP(MT_WTBL_LMAC_ID, _id) | \</div><div class='del'>-					FIELD_PREP(MT_WTBL_LMAC_DW, _dw))</div><div class='add'>+					 FIELD_PREP(MT_WTBL_LMAC_ID, _id) | \</div><div class='add'>+					 FIELD_PREP(MT_WTBL_LMAC_DW, _dw))</div><div class='ctx'> </div><div class='del'>-/* AGG: band 0(0x20800), band 1(0xa0800) */</div><div class='del'>-#define MT_WF_AGG_BASE(_band)		((_band) ? 0xa0800 : 0x20800)</div><div class='add'>+/* AGG: band 0(0x820e2000), band 1(0x820f2000) */</div><div class='add'>+#define MT_WF_AGG_BASE(_band)		((_band) ? 0x820f2000 : 0x820e2000)</div><div class='ctx'> #define MT_WF_AGG(_band, ofs)		(MT_WF_AGG_BASE(_band) + (ofs))</div><div class='ctx'> </div><div class='del'>-#define MT_AGG_AWSCR0(_band, _n)	MT_WF_AGG(_band, 0x05c + (_n) * 4)</div><div class='del'>-#define MT_AGG_PCR0(_band, _n)		MT_WF_AGG(_band, 0x06c + (_n) * 4)</div><div class='add'>+#define MT_AGG_AWSCR0(_band, _n)	MT_WF_AGG(_band, (__OFFS(AGG_AWSCR0) +	\</div><div class='add'>+							  (_n) * 4))</div><div class='add'>+#define MT_AGG_PCR0(_band, _n)		MT_WF_AGG(_band, (__OFFS(AGG_PCR0) +	\</div><div class='add'>+							  (_n) * 4))</div><div class='ctx'> #define MT_AGG_PCR0_MM_PROT		BIT(0)</div><div class='ctx'> #define MT_AGG_PCR0_GF_PROT		BIT(1)</div><div class='ctx'> #define MT_AGG_PCR0_BW20_PROT		BIT(2)</div><div class='hunk'>@@ -201,31 +496,38 @@</div><div class='ctx'> #define MT_AGG_PCR1_RTS0_NUM_THRES	GENMASK(31, 23)</div><div class='ctx'> #define MT_AGG_PCR1_RTS0_LEN_THRES	GENMASK(19, 0)</div><div class='ctx'> </div><div class='del'>-#define MT_AGG_ACR0(_band)		MT_WF_AGG(_band, 0x084)</div><div class='add'>+#define MT_AGG_ACR0(_band)		MT_WF_AGG(_band, __OFFS(AGG_ACR0))</div><div class='ctx'> #define MT_AGG_ACR_CFEND_RATE		GENMASK(13, 0)</div><div class='ctx'> #define MT_AGG_ACR_BAR_RATE		GENMASK(29, 16)</div><div class='ctx'> </div><div class='del'>-#define MT_AGG_MRCR(_band)		MT_WF_AGG(_band, 0x098)</div><div class='del'>-#define MT_AGG_MRCR_BAR_CNT_LIMIT	GENMASK(15, 12)</div><div class='del'>-#define MT_AGG_MRCR_LAST_RTS_CTS_RN	BIT(6)</div><div class='del'>-#define MT_AGG_MRCR_RTS_FAIL_LIMIT	GENMASK(11, 7)</div><div class='add'>+#define MT_AGG_ACR4(_band)		MT_WF_AGG(_band, __OFFS(AGG_ACR4))</div><div class='add'>+#define MT_AGG_ACR_PPDU_TXS2H		BIT(1)</div><div class='add'>+</div><div class='add'>+#define MT_AGG_MRCR(_band)		MT_WF_AGG(_band, __OFFS(AGG_MRCR))</div><div class='add'>+#define MT_AGG_MRCR_BAR_CNT_LIMIT		GENMASK(15, 12)</div><div class='add'>+#define MT_AGG_MRCR_LAST_RTS_CTS_RN		BIT(6)</div><div class='add'>+#define MT_AGG_MRCR_RTS_FAIL_LIMIT		GENMASK(11, 7)</div><div class='ctx'> #define MT_AGG_MRCR_TXCMD_RTS_FAIL_LIMIT	GENMASK(28, 24)</div><div class='ctx'> </div><div class='del'>-#define MT_AGG_ATCR1(_band)		MT_WF_AGG(_band, 0x0f0)</div><div class='del'>-#define MT_AGG_ATCR3(_band)		MT_WF_AGG(_band, 0x0f4)</div><div class='add'>+#define MT_AGG_ATCR0(_band)			MT_WF_AGG(_band, __OFFS(AGG_ATCR0))</div><div class='add'>+#define MT_AGG_ATCR_MAC_BFF_TIME_EN	BIT(30)</div><div class='add'>+</div><div class='add'>+#define MT_AGG_ATCR1(_band)		MT_WF_AGG(_band, __OFFS(AGG_ATCR1))</div><div class='add'>+#define MT_AGG_ATCR3(_band)		MT_WF_AGG(_band, __OFFS(AGG_ATCR3))</div><div class='ctx'> </div><div class='del'>-/* ARB: band 0(0x20c00), band 1(0xa0c00) */</div><div class='del'>-#define MT_WF_ARB_BASE(_band)		((_band) ? 0xa0c00 : 0x20c00)</div><div class='add'>+/* ARB: band 0(0x820e3000), band 1(0x820f3000) */</div><div class='add'>+#define MT_WF_ARB_BASE(_band)		((_band) ? 0x820f3000 : 0x820e3000)</div><div class='ctx'> #define MT_WF_ARB(_band, ofs)		(MT_WF_ARB_BASE(_band) + (ofs))</div><div class='ctx'> </div><div class='del'>-#define MT_ARB_SCR(_band)		MT_WF_ARB(_band, 0x080)</div><div class='add'>+#define MT_ARB_SCR(_band)		MT_WF_ARB(_band, __OFFS(ARB_SCR))</div><div class='ctx'> #define MT_ARB_SCR_TX_DISABLE		BIT(8)</div><div class='ctx'> #define MT_ARB_SCR_RX_DISABLE		BIT(9)</div><div class='ctx'> </div><div class='del'>-#define MT_ARB_DRNGR0(_band, _n)	MT_WF_ARB(_band, 0x194 + (_n) * 4)</div><div class='add'>+#define MT_ARB_DRNGR0(_band, _n)	MT_WF_ARB(_band, (__OFFS(ARB_DRNGR0) +	\</div><div class='add'>+							  (_n) * 4))</div><div class='ctx'> </div><div class='del'>-/* RMAC: band 0(0x21400), band 1(0xa1400) */</div><div class='del'>-#define MT_WF_RMAC_BASE(_band)		((_band) ? 0xa1400 : 0x21400)</div><div class='add'>+/* RMAC: band 0(0x820e5000), band 1(0x820f5000) */</div><div class='add'>+#define MT_WF_RMAC_BASE(_band)		((_band) ? 0x820f5000 : 0x820e5000)</div><div class='ctx'> #define MT_WF_RMAC(_band, ofs)		(MT_WF_RMAC_BASE(_band) + (ofs))</div><div class='ctx'> </div><div class='ctx'> #define MT_WF_RFCR(_band)		MT_WF_RMAC(_band, 0x000)</div><div class='hunk'>@@ -258,16 +560,25 @@</div><div class='ctx'> #define MT_WF_RFCR1_DROP_CFEND		BIT(7)</div><div class='ctx'> #define MT_WF_RFCR1_DROP_CFACK		BIT(8)</div><div class='ctx'> </div><div class='del'>-#define MT_WF_RMAC_MIB_TIME0(_band)	MT_WF_RMAC(_band, 0x03c4)</div><div class='del'>-#define MT_WF_RMAC_MIB_RXTIME_CLR	BIT(31)</div><div class='del'>-#define MT_WF_RMAC_MIB_RXTIME_EN	BIT(30)</div><div class='add'>+#define MT_WF_RMAC_RSVD0(_band)	MT_WF_RMAC(_band, 0x02e0)</div><div class='add'>+#define MT_WF_RMAC_RSVD0_EIFS_CLR	BIT(21)</div><div class='ctx'> </div><div class='del'>-#define MT_WF_RMAC_MIB_AIRTIME14(_band)	MT_WF_RMAC(_band, 0x03b8)</div><div class='del'>-#define MT_MIB_OBSSTIME_MASK		GENMASK(23, 0)</div><div class='ctx'> #define MT_WF_RMAC_MIB_AIRTIME0(_band)	MT_WF_RMAC(_band, 0x0380)</div><div class='add'>+#define MT_WF_RMAC_MIB_RXTIME_CLR	BIT(31)</div><div class='add'>+#define MT_WF_RMAC_MIB_OBSS_BACKOFF	GENMASK(15, 0)</div><div class='add'>+#define MT_WF_RMAC_MIB_ED_OFFSET	GENMASK(20, 16)</div><div class='add'>+</div><div class='add'>+#define MT_WF_RMAC_MIB_AIRTIME1(_band)	MT_WF_RMAC(_band, 0x0384)</div><div class='add'>+#define MT_WF_RMAC_MIB_NONQOSD_BACKOFF	GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define MT_WF_RMAC_MIB_AIRTIME3(_band)	MT_WF_RMAC(_band, 0x038c)</div><div class='add'>+#define MT_WF_RMAC_MIB_QOS01_BACKOFF	GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+#define MT_WF_RMAC_MIB_AIRTIME4(_band)	MT_WF_RMAC(_band, 0x0390)</div><div class='add'>+#define MT_WF_RMAC_MIB_QOS23_BACKOFF	GENMASK(31, 0)</div><div class='ctx'> </div><div class='ctx'> /* WFDMA0 */</div><div class='del'>-#define MT_WFDMA0_BASE			0xd4000</div><div class='add'>+#define MT_WFDMA0_BASE			__REG(WFDMA0_ADDR)</div><div class='ctx'> #define MT_WFDMA0(ofs)			(MT_WFDMA0_BASE + (ofs))</div><div class='ctx'> </div><div class='ctx'> #define MT_WFDMA0_RST			MT_WFDMA0(0x100)</div><div class='hunk'>@@ -279,18 +590,24 @@</div><div class='ctx'> #define MT_WFDMA0_BUSY_ENA_TX_FIFO1	BIT(1)</div><div class='ctx'> #define MT_WFDMA0_BUSY_ENA_RX_FIFO	BIT(2)</div><div class='ctx'> </div><div class='add'>+#define MT_WFDMA0_MCU_HOST_INT_ENA	MT_WFDMA0(0x1f4)</div><div class='add'>+</div><div class='ctx'> #define MT_WFDMA0_GLO_CFG		MT_WFDMA0(0x208)</div><div class='ctx'> #define MT_WFDMA0_GLO_CFG_TX_DMA_EN	BIT(0)</div><div class='ctx'> #define MT_WFDMA0_GLO_CFG_RX_DMA_EN	BIT(2)</div><div class='add'>+#define MT_WFDMA0_GLO_CFG_OMIT_TX_INFO	BIT(28)</div><div class='add'>+#define MT_WFDMA0_GLO_CFG_OMIT_RX_INFO	BIT(27)</div><div class='add'>+#define MT_WFDMA0_GLO_CFG_OMIT_RX_INFO_PFET2	BIT(21)</div><div class='ctx'> </div><div class='ctx'> #define MT_WFDMA0_RST_DTX_PTR		MT_WFDMA0(0x20c)</div><div class='del'>-#define MT_WFDMA0_PRI_DLY_INT_CFG0	MT_WFDMA0(0x2f0)</div><div class='ctx'> </div><div class='del'>-#define MT_RX_DATA_RING_BASE		MT_WFDMA0(0x500)</div><div class='add'>+#define MT_WFDMA0_EXT0_CFG		MT_WFDMA0(0x2b0)</div><div class='add'>+#define MT_WFDMA0_EXT0_RXWB_KEEP	BIT(10)</div><div class='ctx'> </div><div class='del'>-#define MT_WFDMA0_RX_RING0_EXT_CTRL	MT_WFDMA0(0x680)</div><div class='del'>-#define MT_WFDMA0_RX_RING1_EXT_CTRL	MT_WFDMA0(0x684)</div><div class='del'>-#define MT_WFDMA0_RX_RING2_EXT_CTRL	MT_WFDMA0(0x688)</div><div class='add'>+#define MT_WFDMA0_PRI_DLY_INT_CFG0	MT_WFDMA0(0x2f0)</div><div class='add'>+#define MT_WFDMA0_PRI_DLY_INT_CFG1	MT_WFDMA0(0x2f4)</div><div class='add'>+#define MT_WFDMA0_PRI_DLY_INT_CFG2	MT_WFDMA0(0x2f8)</div><div class='add'>+#define MT_WPDMA_GLO_CFG		MT_WFDMA0(0x208)</div><div class='ctx'> </div><div class='ctx'> /* WFDMA1 */</div><div class='ctx'> #define MT_WFDMA1_BASE			0xd5000</div><div class='hunk'>@@ -305,172 +622,608 @@</div><div class='ctx'> #define MT_WFDMA1_BUSY_ENA_TX_FIFO1	BIT(1)</div><div class='ctx'> #define MT_WFDMA1_BUSY_ENA_RX_FIFO	BIT(2)</div><div class='ctx'> </div><div class='del'>-#define MT_MCU_CMD			MT_WFDMA1(0x1f0)</div><div class='del'>-#define MT_MCU_CMD_STOP_DMA_FW_RELOAD	BIT(1)</div><div class='del'>-#define MT_MCU_CMD_STOP_DMA		BIT(2)</div><div class='del'>-#define MT_MCU_CMD_RESET_DONE		BIT(3)</div><div class='del'>-#define MT_MCU_CMD_RECOVERY_DONE	BIT(4)</div><div class='del'>-#define MT_MCU_CMD_NORMAL_STATE		BIT(5)</div><div class='del'>-#define MT_MCU_CMD_ERROR_MASK		GENMASK(5, 1)</div><div class='del'>-</div><div class='ctx'> #define MT_WFDMA1_GLO_CFG		MT_WFDMA1(0x208)</div><div class='ctx'> #define MT_WFDMA1_GLO_CFG_TX_DMA_EN	BIT(0)</div><div class='ctx'> #define MT_WFDMA1_GLO_CFG_RX_DMA_EN	BIT(2)</div><div class='ctx'> #define MT_WFDMA1_GLO_CFG_OMIT_TX_INFO	BIT(28)</div><div class='ctx'> #define MT_WFDMA1_GLO_CFG_OMIT_RX_INFO	BIT(27)</div><div class='add'>+#define MT_WFDMA1_GLO_CFG_OMIT_RX_INFO_PFET2	BIT(21)</div><div class='ctx'> </div><div class='ctx'> #define MT_WFDMA1_RST_DTX_PTR		MT_WFDMA1(0x20c)</div><div class='ctx'> #define MT_WFDMA1_PRI_DLY_INT_CFG0	MT_WFDMA1(0x2f0)</div><div class='ctx'> </div><div class='del'>-#define MT_TX_RING_BASE			MT_WFDMA1(0x300)</div><div class='del'>-#define MT_RX_EVENT_RING_BASE		MT_WFDMA1(0x500)</div><div class='del'>-</div><div class='del'>-#define MT_WFDMA1_TX_RING0_EXT_CTRL	MT_WFDMA1(0x600)</div><div class='del'>-#define MT_WFDMA1_TX_RING1_EXT_CTRL	MT_WFDMA1(0x604)</div><div class='del'>-#define MT_WFDMA1_TX_RING2_EXT_CTRL	MT_WFDMA1(0x608)</div><div class='del'>-#define MT_WFDMA1_TX_RING3_EXT_CTRL	MT_WFDMA1(0x60c)</div><div class='del'>-#define MT_WFDMA1_TX_RING4_EXT_CTRL	MT_WFDMA1(0x610)</div><div class='del'>-#define MT_WFDMA1_TX_RING5_EXT_CTRL	MT_WFDMA1(0x614)</div><div class='del'>-#define MT_WFDMA1_TX_RING6_EXT_CTRL	MT_WFDMA1(0x618)</div><div class='del'>-#define MT_WFDMA1_TX_RING7_EXT_CTRL	MT_WFDMA1(0x61c)</div><div class='del'>-</div><div class='del'>-#define MT_WFDMA1_TX_RING16_EXT_CTRL	MT_WFDMA1(0x640)</div><div class='del'>-#define MT_WFDMA1_TX_RING17_EXT_CTRL	MT_WFDMA1(0x644)</div><div class='del'>-#define MT_WFDMA1_TX_RING18_EXT_CTRL	MT_WFDMA1(0x648)</div><div class='del'>-#define MT_WFDMA1_TX_RING19_EXT_CTRL	MT_WFDMA1(0x64c)</div><div class='del'>-#define MT_WFDMA1_TX_RING20_EXT_CTRL	MT_WFDMA1(0x650)</div><div class='del'>-#define MT_WFDMA1_TX_RING21_EXT_CTRL	MT_WFDMA1(0x654)</div><div class='del'>-#define MT_WFDMA1_TX_RING22_EXT_CTRL	MT_WFDMA1(0x658)</div><div class='del'>-#define MT_WFDMA1_TX_RING23_EXT_CTRL	MT_WFDMA1(0x65c)</div><div class='del'>-</div><div class='del'>-#define MT_WFDMA1_RX_RING0_EXT_CTRL	MT_WFDMA1(0x680)</div><div class='del'>-#define MT_WFDMA1_RX_RING1_EXT_CTRL	MT_WFDMA1(0x684)</div><div class='del'>-#define MT_WFDMA1_RX_RING2_EXT_CTRL	MT_WFDMA1(0x688)</div><div class='del'>-#define MT_WFDMA1_RX_RING3_EXT_CTRL	MT_WFDMA1(0x68c)</div><div class='del'>-</div><div class='ctx'> /* WFDMA CSR */</div><div class='del'>-#define MT_WFDMA_EXT_CSR_BASE		0xd7000</div><div class='add'>+#define MT_WFDMA_EXT_CSR_BASE		__REG(WFDMA_EXT_CSR_ADDR)</div><div class='add'>+#define MT_WFDMA_EXT_CSR_PHYS_BASE	0x18027000</div><div class='ctx'> #define MT_WFDMA_EXT_CSR(ofs)		(MT_WFDMA_EXT_CSR_BASE + (ofs))</div><div class='add'>+#define MT_WFDMA_EXT_CSR_PHYS(ofs)	(MT_WFDMA_EXT_CSR_PHYS_BASE + (ofs))</div><div class='ctx'> </div><div class='del'>-#define MT_INT_SOURCE_CSR		MT_WFDMA_EXT_CSR(0x10)</div><div class='del'>-#define MT_INT_MASK_CSR			MT_WFDMA_EXT_CSR(0x14)</div><div class='del'>-#define MT_INT_RX_DONE_DATA0		BIT(16)</div><div class='del'>-#define MT_INT_RX_DONE_DATA1		BIT(17)</div><div class='del'>-#define MT_INT_RX_DONE_WM		BIT(0)</div><div class='del'>-#define MT_INT_RX_DONE_WA		BIT(1)</div><div class='del'>-#define MT_INT_RX_DONE_WA_EXT		BIT(2)</div><div class='del'>-#define MT_INT_RX_DONE_ALL		(GENMASK(2, 0) | GENMASK(17, 16))</div><div class='del'>-#define MT_INT_TX_DONE_MCU_WA		BIT(15)</div><div class='del'>-#define MT_INT_TX_DONE_FWDL		BIT(26)</div><div class='del'>-#define MT_INT_TX_DONE_MCU_WM		BIT(27)</div><div class='del'>-#define MT_INT_TX_DONE_BAND0		BIT(30)</div><div class='del'>-#define MT_INT_TX_DONE_BAND1		BIT(31)</div><div class='del'>-</div><div class='del'>-#define MT_INT_BAND1_MASK		(MT_INT_RX_DONE_WA_EXT |	\</div><div class='del'>-					 MT_INT_TX_DONE_BAND1)</div><div class='del'>-</div><div class='del'>-#define MT_INT_MCU_CMD			BIT(29)</div><div class='del'>-</div><div class='del'>-#define MT_INT_TX_DONE_MCU		(MT_INT_TX_DONE_MCU_WA |	\</div><div class='del'>-					 MT_INT_TX_DONE_MCU_WM |	\</div><div class='del'>-					 MT_INT_TX_DONE_FWDL)</div><div class='del'>-</div><div class='del'>-#define MT_WFDMA_HOST_CONFIG		MT_WFDMA_EXT_CSR(0x30)</div><div class='add'>+#define MT_WFDMA_HOST_CONFIG		MT_WFDMA_EXT_CSR_PHYS(0x30)</div><div class='ctx'> #define MT_WFDMA_HOST_CONFIG_PDMA_BAND	BIT(0)</div><div class='add'>+#define MT_WFDMA_HOST_CONFIG_WED	BIT(1)</div><div class='ctx'> </div><div class='del'>-#define MT_WFDMA_EXT_CSR_HIF_MISC	MT_WFDMA_EXT_CSR(0x44)</div><div class='del'>-#define MT_WFDMA_EXT_CSR_HIF_MISC_BUSY	BIT(0)</div><div class='add'>+#define MT_WFDMA_WED_RING_CONTROL	MT_WFDMA_EXT_CSR_PHYS(0x34)</div><div class='add'>+#define MT_WFDMA_WED_RING_CONTROL_TX0	GENMASK(4, 0)</div><div class='add'>+#define MT_WFDMA_WED_RING_CONTROL_TX1	GENMASK(12, 8)</div><div class='add'>+#define MT_WFDMA_WED_RING_CONTROL_RX1	GENMASK(20, 16)</div><div class='ctx'> </div><div class='del'>-#define MT_INT1_SOURCE_CSR		MT_WFDMA_EXT_CSR(0x88)</div><div class='del'>-#define MT_INT1_MASK_CSR		MT_WFDMA_EXT_CSR(0x8c)</div><div class='add'>+#define MT_WFDMA_EXT_CSR_HIF_MISC	MT_WFDMA_EXT_CSR_PHYS(0x44)</div><div class='add'>+#define MT_WFDMA_EXT_CSR_HIF_MISC_BUSY	BIT(0)</div><div class='ctx'> </div><div class='del'>-#define MT_PCIE_RECOG_ID		MT_WFDMA_EXT_CSR(0x90)</div><div class='add'>+#define MT_PCIE_RECOG_ID		0xd7090</div><div class='ctx'> #define MT_PCIE_RECOG_ID_MASK		GENMASK(30, 0)</div><div class='ctx'> #define MT_PCIE_RECOG_ID_SEM		BIT(31)</div><div class='ctx'> </div><div class='add'>+#define MT_INT_WED_SOURCE_CSR		MT_WFDMA_EXT_CSR(0x200)</div><div class='add'>+#define MT_INT_WED_MASK_CSR		MT_WFDMA_EXT_CSR(0x204)</div><div class='add'>+</div><div class='add'>+#define MT_WED_TX_RING_BASE		MT_WFDMA_EXT_CSR(0x300)</div><div class='add'>+#define MT_WED_RX_RING_BASE		MT_WFDMA_EXT_CSR(0x400)</div><div class='add'>+</div><div class='ctx'> /* WFDMA0 PCIE1 */</div><div class='del'>-#define MT_WFDMA0_PCIE1_BASE			0xd8000</div><div class='del'>-#define MT_WFDMA0_PCIE1(ofs)			(MT_WFDMA0_PCIE1_BASE + (ofs))</div><div class='add'>+#define MT_WFDMA0_PCIE1_BASE		__REG(WFDMA0_PCIE1_ADDR)</div><div class='add'>+#define MT_WFDMA0_PCIE1(ofs)		(MT_WFDMA0_PCIE1_BASE + (ofs))</div><div class='ctx'> </div><div class='del'>-#define MT_WFDMA0_PCIE1_BUSY_ENA		MT_WFDMA0_PCIE1(0x13c)</div><div class='add'>+#define MT_WFDMA0_PCIE1_BUSY_ENA	MT_WFDMA0_PCIE1(0x13c)</div><div class='ctx'> #define MT_WFDMA0_PCIE1_BUSY_ENA_TX_FIFO0	BIT(0)</div><div class='ctx'> #define MT_WFDMA0_PCIE1_BUSY_ENA_TX_FIFO1	BIT(1)</div><div class='ctx'> #define MT_WFDMA0_PCIE1_BUSY_ENA_RX_FIFO	BIT(2)</div><div class='ctx'> </div><div class='ctx'> /* WFDMA1 PCIE1 */</div><div class='del'>-#define MT_WFDMA1_PCIE1_BASE			0xd9000</div><div class='del'>-#define MT_WFDMA1_PCIE1(ofs)			(MT_WFDMA0_PCIE1_BASE + (ofs))</div><div class='add'>+#define MT_WFDMA1_PCIE1_BASE		0xd9000</div><div class='add'>+#define MT_WFDMA1_PCIE1(ofs)		(MT_WFDMA1_PCIE1_BASE + (ofs))</div><div class='ctx'> </div><div class='del'>-#define MT_WFDMA1_PCIE1_BUSY_ENA		MT_WFDMA1_PCIE1(0x13c)</div><div class='add'>+#define MT_WFDMA1_PCIE1_BUSY_ENA	MT_WFDMA1_PCIE1(0x13c)</div><div class='ctx'> #define MT_WFDMA1_PCIE1_BUSY_ENA_TX_FIFO0	BIT(0)</div><div class='ctx'> #define MT_WFDMA1_PCIE1_BUSY_ENA_TX_FIFO1	BIT(1)</div><div class='ctx'> #define MT_WFDMA1_PCIE1_BUSY_ENA_RX_FIFO	BIT(2)</div><div class='ctx'> </div><div class='del'>-#define MT_TOP_RGU_BASE				0xf0000</div><div class='del'>-#define MT_TOP_PWR_CTRL				(MT_TOP_RGU_BASE + (0x0))</div><div class='del'>-#define MT_TOP_PWR_KEY				(0x5746 &lt;&lt; 16)</div><div class='del'>-#define MT_TOP_PWR_SW_RST			BIT(0)</div><div class='del'>-#define MT_TOP_PWR_SW_PWR_ON			GENMASK(3, 2)</div><div class='del'>-#define MT_TOP_PWR_HW_CTRL			BIT(4)</div><div class='del'>-#define MT_TOP_PWR_PWR_ON			BIT(7)</div><div class='add'>+/* WFDMA COMMON */</div><div class='add'>+#define __RXQ(q)			((q) + __MT_MCUQ_MAX)</div><div class='add'>+#define __TXQ(q)			(__RXQ(q) + MT_RXQ_BAND2)</div><div class='add'>+</div><div class='add'>+#define MT_Q_ID(q)			(dev-&gt;q_id[(q)])</div><div class='add'>+#define MT_Q_BASE(q)			((dev-&gt;wfdma_mask &gt;&gt; (q)) &amp; 0x1 ?	\</div><div class='add'>+					 MT_WFDMA1_BASE : MT_WFDMA0_BASE)</div><div class='add'>+</div><div class='add'>+#define MT_MCUQ_ID(q)			MT_Q_ID(q)</div><div class='add'>+#define MT_TXQ_ID(q)			MT_Q_ID(__TXQ(q))</div><div class='add'>+#define MT_RXQ_ID(q)			MT_Q_ID(__RXQ(q))</div><div class='add'>+</div><div class='add'>+#define MT_MCUQ_RING_BASE(q)		(MT_Q_BASE(q) + 0x300)</div><div class='add'>+#define MT_TXQ_RING_BASE(q)		(MT_Q_BASE(__TXQ(q)) + 0x300)</div><div class='add'>+#define MT_RXQ_RING_BASE(q)		(MT_Q_BASE(__RXQ(q)) + 0x500)</div><div class='add'>+</div><div class='add'>+#define MT_MCUQ_EXT_CTRL(q)		(MT_Q_BASE(q) +	0x600 +	\</div><div class='add'>+					 MT_MCUQ_ID(q)* 0x4)</div><div class='add'>+#define MT_RXQ_BAND1_CTRL(q)		(MT_Q_BASE(__RXQ(q)) + 0x680 +	\</div><div class='add'>+					 MT_RXQ_ID(q)* 0x4)</div><div class='add'>+#define MT_TXQ_EXT_CTRL(q)		(MT_Q_BASE(__TXQ(q)) + 0x600 +	\</div><div class='add'>+					 MT_TXQ_ID(q)* 0x4)</div><div class='add'>+</div><div class='add'>+#define MT_TXQ_WED_RING_BASE		__REG(TXQ_WED_RING_BASE)</div><div class='add'>+#define MT_RXQ_WED_RING_BASE		__REG(RXQ_WED_RING_BASE)</div><div class='add'>+#define MT_RXQ_WED_DATA_RING_BASE	__REG(RXQ_WED_DATA_RING_BASE)</div><div class='add'>+</div><div class='add'>+#define MT_INT_SOURCE_CSR		__REG(INT_SOURCE_CSR)</div><div class='add'>+#define MT_INT_MASK_CSR			__REG(INT_MASK_CSR)</div><div class='ctx'> </div><div class='del'>-#define MT_INFRA_CFG_BASE		0xf1000</div><div class='del'>-#define MT_INFRA(ofs)			(MT_INFRA_CFG_BASE + (ofs))</div><div class='add'>+#define MT_INT1_SOURCE_CSR		__REG(INT1_SOURCE_CSR)</div><div class='add'>+#define MT_INT1_MASK_CSR		__REG(INT1_MASK_CSR)</div><div class='add'>+</div><div class='add'>+#define MT_INT_RX_DONE_BAND0		BIT(16)</div><div class='add'>+#define MT_INT_RX_DONE_BAND1		BIT(17)</div><div class='add'>+#define MT_INT_RX_DONE_WM		BIT(0)</div><div class='add'>+#define MT_INT_RX_DONE_WA		BIT(1)</div><div class='add'>+#define MT_INT_RX_DONE_WA_MAIN		BIT(1)</div><div class='add'>+#define MT_INT_RX_DONE_WA_EXT		BIT(2)</div><div class='add'>+#define MT_INT_MCU_CMD			BIT(29)</div><div class='add'>+#define MT_INT_RX_DONE_BAND0_MT7916	BIT(22)</div><div class='add'>+#define MT_INT_RX_DONE_BAND1_MT7916	BIT(23)</div><div class='add'>+#define MT_INT_RX_DONE_WA_MAIN_MT7916	BIT(2)</div><div class='add'>+#define MT_INT_RX_DONE_WA_EXT_MT7916	BIT(3)</div><div class='add'>+</div><div class='add'>+#define MT_INT_WED_RX_DONE_BAND0_MT7916		BIT(18)</div><div class='add'>+#define MT_INT_WED_RX_DONE_BAND1_MT7916		BIT(19)</div><div class='add'>+#define MT_INT_WED_RX_DONE_WA_MAIN_MT7916	BIT(1)</div><div class='add'>+#define MT_INT_WED_RX_DONE_WA_MT7916		BIT(17)</div><div class='add'>+</div><div class='add'>+#define MT_INT_RX(q)			(dev-&gt;q_int_mask[__RXQ(q)])</div><div class='add'>+#define MT_INT_TX_MCU(q)		(dev-&gt;q_int_mask[(q)])</div><div class='add'>+</div><div class='add'>+#define MT_INT_RX_DONE_MCU		(MT_INT_RX(MT_RXQ_MCU) |	\</div><div class='add'>+					 MT_INT_RX(MT_RXQ_MCU_WA))</div><div class='add'>+</div><div class='add'>+#define MT_INT_BAND0_RX_DONE		(MT_INT_RX(MT_RXQ_MAIN) |	\</div><div class='add'>+					 MT_INT_RX(MT_RXQ_MAIN_WA))</div><div class='add'>+</div><div class='add'>+#define MT_INT_BAND1_RX_DONE		(MT_INT_RX(MT_RXQ_BAND1) |	\</div><div class='add'>+					 MT_INT_RX(MT_RXQ_BAND1_WA) |	\</div><div class='add'>+					 MT_INT_RX(MT_RXQ_MAIN_WA))</div><div class='add'>+</div><div class='add'>+#define MT_INT_RX_DONE_ALL		(MT_INT_RX_DONE_MCU |		\</div><div class='add'>+					 MT_INT_BAND0_RX_DONE |		\</div><div class='add'>+					 MT_INT_BAND1_RX_DONE)</div><div class='add'>+</div><div class='add'>+#define MT_INT_TX_DONE_FWDL		BIT(26)</div><div class='add'>+#define MT_INT_TX_DONE_MCU_WM		BIT(27)</div><div class='add'>+#define MT_INT_TX_DONE_MCU_WA		BIT(15)</div><div class='add'>+#define MT_INT_TX_DONE_BAND0		BIT(30)</div><div class='add'>+#define MT_INT_TX_DONE_BAND1		BIT(31)</div><div class='add'>+#define MT_INT_TX_DONE_MCU_WA_MT7916	BIT(25)</div><div class='add'>+#define MT_INT_WED_TX_DONE_BAND0	BIT(4)</div><div class='add'>+#define MT_INT_WED_TX_DONE_BAND1	BIT(5)</div><div class='ctx'> </div><div class='del'>-#define MT_HIF_REMAP_L1			MT_INFRA(0x1ac)</div><div class='add'>+#define MT_INT_TX_DONE_MCU		(MT_INT_TX_MCU(MT_MCUQ_WA) |	\</div><div class='add'>+					 MT_INT_TX_MCU(MT_MCUQ_WM) |	\</div><div class='add'>+					 MT_INT_TX_MCU(MT_MCUQ_FWDL))</div><div class='add'>+</div><div class='add'>+#define MT_MCU_CMD			__REG(INT_MCU_CMD_SOURCE)</div><div class='add'>+#define MT_MCU_CMD_STOP_DMA_FW_RELOAD	BIT(1)</div><div class='add'>+#define MT_MCU_CMD_STOP_DMA		BIT(2)</div><div class='add'>+#define MT_MCU_CMD_RESET_DONE		BIT(3)</div><div class='add'>+#define MT_MCU_CMD_RECOVERY_DONE	BIT(4)</div><div class='add'>+#define MT_MCU_CMD_NORMAL_STATE		BIT(5)</div><div class='add'>+#define MT_MCU_CMD_ERROR_MASK		GENMASK(5, 1)</div><div class='add'>+</div><div class='add'>+#define MT_MCU_CMD_WA_WDT		BIT(31)</div><div class='add'>+#define MT_MCU_CMD_WM_WDT		BIT(30)</div><div class='add'>+#define MT_MCU_CMD_WDT_MASK		GENMASK(31, 30)</div><div class='add'>+</div><div class='add'>+/* TOP RGU */</div><div class='add'>+#define MT_TOP_RGU_BASE			0x18000000</div><div class='add'>+#define MT_TOP_PWR_CTRL			(MT_TOP_RGU_BASE + (0x0))</div><div class='add'>+#define MT_TOP_PWR_KEY			(0x5746 &lt;&lt; 16)</div><div class='add'>+#define MT_TOP_PWR_SW_RST		BIT(0)</div><div class='add'>+#define MT_TOP_PWR_SW_PWR_ON		GENMASK(3, 2)</div><div class='add'>+#define MT_TOP_PWR_HW_CTRL		BIT(4)</div><div class='add'>+#define MT_TOP_PWR_PWR_ON		BIT(7)</div><div class='add'>+</div><div class='add'>+#define MT_TOP_RGU_SYSRAM_PDN		(MT_TOP_RGU_BASE + 0x050)</div><div class='add'>+#define MT_TOP_RGU_SYSRAM_SLP		(MT_TOP_RGU_BASE + 0x054)</div><div class='add'>+#define MT_TOP_WFSYS_PWR		(MT_TOP_RGU_BASE + 0x010)</div><div class='add'>+#define MT_TOP_PWR_EN_MASK		BIT(7)</div><div class='add'>+#define MT_TOP_PWR_ACK_MASK		BIT(6)</div><div class='add'>+#define MT_TOP_PWR_KEY_MASK		GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define MT7986_TOP_WM_RESET		(MT_TOP_RGU_BASE + 0x120)</div><div class='add'>+#define MT7986_TOP_WM_RESET_MASK	BIT(0)</div><div class='add'>+</div><div class='add'>+/* l1/l2 remap */</div><div class='add'>+#define MT_HIF_REMAP_L1			0xf11ac</div><div class='add'>+#define MT_HIF_REMAP_L1_MT7916		0xfe260</div><div class='ctx'> #define MT_HIF_REMAP_L1_MASK		GENMASK(15, 0)</div><div class='ctx'> #define MT_HIF_REMAP_L1_OFFSET		GENMASK(15, 0)</div><div class='ctx'> #define MT_HIF_REMAP_L1_BASE		GENMASK(31, 16)</div><div class='ctx'> #define MT_HIF_REMAP_BASE_L1		0xe0000</div><div class='ctx'> </div><div class='del'>-#define MT_HIF_REMAP_L2			MT_INFRA(0x1b0)</div><div class='add'>+#define MT_HIF_REMAP_L2			0xf11b0</div><div class='ctx'> #define MT_HIF_REMAP_L2_MASK		GENMASK(19, 0)</div><div class='ctx'> #define MT_HIF_REMAP_L2_OFFSET		GENMASK(11, 0)</div><div class='ctx'> #define MT_HIF_REMAP_L2_BASE		GENMASK(31, 12)</div><div class='del'>-#define MT_HIF_REMAP_BASE_L2		0x00000</div><div class='add'>+#define MT_HIF_REMAP_L2_MT7916		0x1b8</div><div class='add'>+#define MT_HIF_REMAP_L2_MASK_MT7916	GENMASK(31, 16)</div><div class='add'>+#define MT_HIF_REMAP_L2_OFFSET_MT7916	GENMASK(15, 0)</div><div class='add'>+#define MT_HIF_REMAP_L2_BASE_MT7916	GENMASK(31, 16)</div><div class='add'>+#define MT_HIF_REMAP_BASE_L2_MT7916	0x40000</div><div class='add'>+</div><div class='add'>+#define MT_INFRA_BASE			0x18000000</div><div class='add'>+#define MT_WFSYS0_PHY_START		0x18400000</div><div class='add'>+#define MT_WFSYS1_PHY_START		0x18800000</div><div class='add'>+#define MT_WFSYS1_PHY_END		0x18bfffff</div><div class='add'>+#define MT_CBTOP1_PHY_START		0x70000000</div><div class='add'>+#define MT_CBTOP1_PHY_END		__REG(CBTOP1_PHY_END)</div><div class='add'>+#define MT_CBTOP2_PHY_START		0xf0000000</div><div class='add'>+#define MT_INFRA_MCU_START		0x7c000000</div><div class='add'>+#define MT_INFRA_MCU_END		__REG(INFRA_MCU_ADDR_END)</div><div class='add'>+#define MT_CONN_INFRA_OFFSET(p)		((p) - MT_INFRA_BASE)</div><div class='add'>+</div><div class='add'>+/* CONN INFRA CFG */</div><div class='add'>+#define MT_CONN_INFRA_BASE		0x18001000</div><div class='add'>+#define MT_CONN_INFRA(ofs)		(MT_CONN_INFRA_BASE + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_CONN_INFRA_EFUSE		MT_CONN_INFRA(0x020)</div><div class='add'>+</div><div class='add'>+#define MT_CONN_INFRA_ADIE_RESET	MT_CONN_INFRA(0x030)</div><div class='add'>+#define MT_CONN_INFRA_ADIE1_RESET_MASK	BIT(0)</div><div class='add'>+#define MT_CONN_INFRA_ADIE2_RESET_MASK	BIT(2)</div><div class='add'>+</div><div class='add'>+#define MT_CONN_INFRA_OSC_RC_EN		MT_CONN_INFRA(0x380)</div><div class='add'>+</div><div class='add'>+#define MT_CONN_INFRA_OSC_CTRL		MT_CONN_INFRA(0x300)</div><div class='add'>+#define MT_CONN_INFRA_OSC_RC_EN_MASK	BIT(7)</div><div class='add'>+#define MT_CONN_INFRA_OSC_STB_TIME_MASK	GENMASK(23, 0)</div><div class='add'>+</div><div class='add'>+#define MT_CONN_INFRA_HW_CTRL		MT_CONN_INFRA(0x200)</div><div class='add'>+#define MT_CONN_INFRA_HW_CTRL_MASK	BIT(0)</div><div class='add'>+</div><div class='add'>+#define MT_CONN_INFRA_WF_SLP_PROT	MT_CONN_INFRA(0x540)</div><div class='add'>+#define MT_CONN_INFRA_WF_SLP_PROT_MASK	BIT(0)</div><div class='add'>+</div><div class='add'>+#define MT_CONN_INFRA_WF_SLP_PROT_RDY	MT_CONN_INFRA(0x544)</div><div class='add'>+#define MT_CONN_INFRA_CONN_WF_MASK	(BIT(29) | BIT(31))</div><div class='add'>+#define MT_CONN_INFRA_CONN		(BIT(25) | BIT(29) | BIT(31))</div><div class='add'>+</div><div class='add'>+#define MT_CONN_INFRA_EMI_REQ		MT_CONN_INFRA(0x414)</div><div class='add'>+#define MT_CONN_INFRA_EMI_REQ_MASK	BIT(0)</div><div class='add'>+#define MT_CONN_INFRA_INFRA_REQ_MASK	BIT(5)</div><div class='add'>+</div><div class='add'>+/* AFE */</div><div class='add'>+#define MT_AFE_CTRL_BASE(_band)		(0x18003000 + ((_band) &lt;&lt; 19))</div><div class='add'>+#define MT_AFE_CTRL(_band, ofs)		(MT_AFE_CTRL_BASE(_band) + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_AFE_DIG_EN_01(_band)		MT_AFE_CTRL(_band, 0x00)</div><div class='add'>+#define MT_AFE_DIG_EN_02(_band)		MT_AFE_CTRL(_band, 0x04)</div><div class='add'>+#define MT_AFE_DIG_EN_03(_band)		MT_AFE_CTRL(_band, 0x08)</div><div class='add'>+#define MT_AFE_DIG_TOP_01(_band)	MT_AFE_CTRL(_band, 0x0c)</div><div class='add'>+</div><div class='add'>+#define MT_AFE_PLL_STB_TIME(_band)	MT_AFE_CTRL(_band, 0xf4)</div><div class='add'>+#define MT_AFE_PLL_STB_TIME_MASK	(GENMASK(30, 16) | GENMASK(14, 0))</div><div class='add'>+#define MT_AFE_PLL_STB_TIME_VAL		(FIELD_PREP(GENMASK(30, 16), 0x4bc) | \</div><div class='add'>+					 FIELD_PREP(GENMASK(14, 0), 0x7e4))</div><div class='add'>+#define MT_AFE_BPLL_CFG_MASK		GENMASK(7, 6)</div><div class='add'>+#define MT_AFE_WPLL_CFG_MASK		GENMASK(1, 0)</div><div class='add'>+#define MT_AFE_MCU_WPLL_CFG_MASK	GENMASK(3, 2)</div><div class='add'>+#define MT_AFE_MCU_BPLL_CFG_MASK	GENMASK(17, 16)</div><div class='add'>+#define MT_AFE_PLL_CFG_MASK		(MT_AFE_BPLL_CFG_MASK | \</div><div class='add'>+					 MT_AFE_WPLL_CFG_MASK | \</div><div class='add'>+					 MT_AFE_MCU_WPLL_CFG_MASK | \</div><div class='add'>+					 MT_AFE_MCU_BPLL_CFG_MASK)</div><div class='add'>+#define MT_AFE_PLL_CFG_VAL		(FIELD_PREP(MT_AFE_BPLL_CFG_MASK, 0x1) | \</div><div class='add'>+					 FIELD_PREP(MT_AFE_WPLL_CFG_MASK, 0x2) | \</div><div class='add'>+					 FIELD_PREP(MT_AFE_MCU_WPLL_CFG_MASK, 0x1) | \</div><div class='add'>+					 FIELD_PREP(MT_AFE_MCU_BPLL_CFG_MASK, 0x2))</div><div class='add'>+</div><div class='add'>+#define MT_AFE_DIG_TOP_01_MASK		GENMASK(18, 15)</div><div class='add'>+#define MT_AFE_DIG_TOP_01_VAL		FIELD_PREP(MT_AFE_DIG_TOP_01_MASK, 0x9)</div><div class='add'>+</div><div class='add'>+#define MT_AFE_RG_WBG_EN_RCK_MASK	BIT(0)</div><div class='add'>+#define MT_AFE_RG_WBG_EN_BPLL_UP_MASK	BIT(21)</div><div class='add'>+#define MT_AFE_RG_WBG_EN_WPLL_UP_MASK	BIT(20)</div><div class='add'>+#define MT_AFE_RG_WBG_EN_PLL_UP_MASK	(MT_AFE_RG_WBG_EN_BPLL_UP_MASK | \</div><div class='add'>+					 MT_AFE_RG_WBG_EN_WPLL_UP_MASK)</div><div class='add'>+#define MT_AFE_RG_WBG_EN_TXCAL_WF4	BIT(29)</div><div class='add'>+#define MT_AFE_RG_WBG_EN_TXCAL_BT	BIT(21)</div><div class='add'>+#define MT_AFE_RG_WBG_EN_TXCAL_WF3	BIT(20)</div><div class='add'>+#define MT_AFE_RG_WBG_EN_TXCAL_WF2	BIT(19)</div><div class='add'>+#define MT_AFE_RG_WBG_EN_TXCAL_WF1	BIT(18)</div><div class='add'>+#define MT_AFE_RG_WBG_EN_TXCAL_WF0	BIT(17)</div><div class='add'>+</div><div class='add'>+#define MT_ADIE_SLP_CTRL_BASE(_band)	(0x18005000 + ((_band) &lt;&lt; 19))</div><div class='add'>+#define MT_ADIE_SLP_CTRL(_band, ofs)	(MT_ADIE_SLP_CTRL_BASE(_band) + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_ADIE_SLP_CTRL_CK0(_band)	MT_ADIE_SLP_CTRL(_band, 0x120)</div><div class='add'>+</div><div class='add'>+/* ADIE */</div><div class='add'>+#define MT_ADIE_CHIP_ID			0x02c</div><div class='add'>+#define MT_ADIE_VERSION_MASK		GENMASK(15, 0)</div><div class='add'>+#define MT_ADIE_CHIP_ID_MASK		GENMASK(31, 16)</div><div class='add'>+#define MT_ADIE_IDX0			GENMASK(15, 0)</div><div class='add'>+#define MT_ADIE_IDX1			GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define MT_ADIE_RG_TOP_THADC_BG		0x034</div><div class='add'>+#define MT_ADIE_VRPI_SEL_CR_MASK	GENMASK(15, 12)</div><div class='add'>+#define MT_ADIE_VRPI_SEL_EFUSE_MASK	GENMASK(6, 3)</div><div class='add'>+</div><div class='add'>+#define MT_ADIE_RG_TOP_THADC		0x038</div><div class='add'>+#define MT_ADIE_PGA_GAIN_MASK		GENMASK(25, 23)</div><div class='add'>+#define MT_ADIE_PGA_GAIN_EFUSE_MASK	GENMASK(2, 0)</div><div class='add'>+#define MT_ADIE_LDO_CTRL_MASK		GENMASK(27, 26)</div><div class='add'>+#define MT_ADIE_LDO_CTRL_EFUSE_MASK	GENMASK(6, 5)</div><div class='add'>+</div><div class='add'>+#define MT_AFE_RG_ENCAL_WBTAC_IF_SW	0x070</div><div class='add'>+#define MT_ADIE_EFUSE_RDATA0		0x130</div><div class='add'>+</div><div class='add'>+#define MT_ADIE_EFUSE2_CTRL		0x148</div><div class='add'>+#define MT_ADIE_EFUSE_CTRL_MASK		BIT(1)</div><div class='add'>+</div><div class='add'>+#define MT_ADIE_EFUSE_CFG		0x144</div><div class='add'>+#define MT_ADIE_EFUSE_MODE_MASK		GENMASK(7, 6)</div><div class='add'>+#define MT_ADIE_EFUSE_ADDR_MASK		GENMASK(25, 16)</div><div class='add'>+#define MT_ADIE_EFUSE_VALID_MASK	BIT(29)</div><div class='add'>+#define MT_ADIE_EFUSE_KICK_MASK		BIT(30)</div><div class='add'>+</div><div class='add'>+#define MT_ADIE_THADC_ANALOG		0x3a6</div><div class='add'>+</div><div class='add'>+#define MT_ADIE_THADC_SLOP		0x3a7</div><div class='add'>+#define MT_ADIE_ANA_EN_MASK		BIT(7)</div><div class='add'>+</div><div class='add'>+#define MT_ADIE_7975_XTAL_CAL		0x3a1</div><div class='add'>+#define MT_ADIE_TRIM_MASK		GENMASK(6, 0)</div><div class='add'>+#define MT_ADIE_EFUSE_TRIM_MASK		GENMASK(5, 0)</div><div class='add'>+#define MT_ADIE_XO_TRIM_EN_MASK		BIT(7)</div><div class='add'>+#define MT_ADIE_XTAL_DECREASE_MASK	BIT(6)</div><div class='add'>+</div><div class='add'>+#define MT_ADIE_7975_XO_TRIM2		0x3a2</div><div class='add'>+#define MT_ADIE_7975_XO_TRIM3		0x3a3</div><div class='add'>+#define MT_ADIE_7975_XO_TRIM4		0x3a4</div><div class='add'>+#define MT_ADIE_7975_XTAL_EN		0x3a5</div><div class='add'>+</div><div class='add'>+#define MT_ADIE_XO_TRIM_FLOW		0x3ac</div><div class='add'>+#define MT_ADIE_XTAL_AXM_80M_OSC	0x390</div><div class='add'>+#define MT_ADIE_XTAL_AXM_40M_OSC	0x391</div><div class='add'>+#define MT_ADIE_XTAL_TRIM1_80M_OSC	0x398</div><div class='add'>+#define MT_ADIE_XTAL_TRIM1_40M_OSC	0x399</div><div class='add'>+#define MT_ADIE_WRI_CK_SEL		0x4ac</div><div class='add'>+#define MT_ADIE_RG_STRAP_PIN_IN		0x4fc</div><div class='add'>+#define MT_ADIE_XTAL_C1			0x654</div><div class='add'>+#define MT_ADIE_XTAL_C2			0x658</div><div class='add'>+#define MT_ADIE_RG_XO_01		0x65c</div><div class='add'>+#define MT_ADIE_RG_XO_03		0x664</div><div class='add'>+</div><div class='add'>+#define MT_ADIE_CLK_EN			0xa00</div><div class='add'>+</div><div class='add'>+#define MT_ADIE_7975_XTAL		0xa18</div><div class='add'>+#define MT_ADIE_7975_XTAL_EN_MASK	BIT(29)</div><div class='add'>+</div><div class='add'>+#define MT_ADIE_7975_COCLK		0xa1c</div><div class='add'>+#define MT_ADIE_7975_XO_2		0xa84</div><div class='add'>+#define MT_ADIE_7975_XO_2_FIX_EN	BIT(31)</div><div class='add'>+</div><div class='add'>+#define MT_ADIE_7975_XO_CTRL2		0xa94</div><div class='add'>+#define MT_ADIE_7975_XO_CTRL2_C1_MASK	GENMASK(26, 20)</div><div class='add'>+#define MT_ADIE_7975_XO_CTRL2_C2_MASK	GENMASK(18, 12)</div><div class='add'>+#define MT_ADIE_7975_XO_CTRL2_MASK	(MT_ADIE_7975_XO_CTRL2_C1_MASK | \</div><div class='add'>+					 MT_ADIE_7975_XO_CTRL2_C2_MASK)</div><div class='add'>+</div><div class='add'>+#define MT_ADIE_7975_XO_CTRL6		0xaa4</div><div class='add'>+#define MT_ADIE_7975_XO_CTRL6_MASK	BIT(16)</div><div class='add'>+</div><div class='add'>+/* TOP SPI */</div><div class='add'>+#define MT_TOP_SPI_ADIE_BASE(_band)	(0x18004000 + ((_band) &lt;&lt; 19))</div><div class='add'>+#define MT_TOP_SPI_ADIE(_band, ofs)	(MT_TOP_SPI_ADIE_BASE(_band) + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_TOP_SPI_BUSY_CR(_band)	MT_TOP_SPI_ADIE(_band, 0)</div><div class='add'>+#define MT_TOP_SPI_POLLING_BIT		BIT(5)</div><div class='add'>+</div><div class='add'>+#define MT_TOP_SPI_ADDR_CR(_band)	MT_TOP_SPI_ADIE(_band, 0x50)</div><div class='add'>+#define MT_TOP_SPI_READ_ADDR_FORMAT	(BIT(12) | BIT(13) | BIT(15))</div><div class='add'>+#define MT_TOP_SPI_WRITE_ADDR_FORMAT	(BIT(13) | BIT(15))</div><div class='add'>+</div><div class='add'>+#define MT_TOP_SPI_WRITE_DATA_CR(_band)	MT_TOP_SPI_ADIE(_band, 0x54)</div><div class='add'>+#define MT_TOP_SPI_READ_DATA_CR(_band)	MT_TOP_SPI_ADIE(_band, 0x58)</div><div class='add'>+</div><div class='add'>+/* CONN INFRA CKGEN */</div><div class='add'>+#define MT_INFRA_CKGEN_BASE		0x18009000</div><div class='add'>+#define MT_INFRA_CKGEN(ofs)		(MT_INFRA_CKGEN_BASE + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_INFRA_CKGEN_BUS		MT_INFRA_CKGEN(0xa00)</div><div class='add'>+#define MT_INFRA_CKGEN_BUS_CLK_SEL_MASK	BIT(23)</div><div class='add'>+#define MT_INFRA_CKGEN_BUS_RDY_SEL_MASK	BIT(29)</div><div class='add'>+</div><div class='add'>+#define MT_INFRA_CKGEN_BUS_WPLL_DIV_1	MT_INFRA_CKGEN(0x008)</div><div class='add'>+#define MT_INFRA_CKGEN_BUS_WPLL_DIV_2	MT_INFRA_CKGEN(0x00c)</div><div class='add'>+</div><div class='add'>+#define MT_INFRA_CKGEN_RFSPI_WPLL_DIV	MT_INFRA_CKGEN(0x040)</div><div class='add'>+#define MT_INFRA_CKGEN_DIV_SEL_MASK	GENMASK(7, 2)</div><div class='add'>+#define MT_INFRA_CKGEN_DIV_EN_MASK	BIT(0)</div><div class='add'>+</div><div class='add'>+/* CONN INFRA BUS */</div><div class='add'>+#define MT_INFRA_BUS_BASE		0x1800e000</div><div class='add'>+#define MT_INFRA_BUS(ofs)		(MT_INFRA_BUS_BASE + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_INFRA_BUS_OFF_TIMEOUT	MT_INFRA_BUS(0x300)</div><div class='add'>+#define MT_INFRA_BUS_TIMEOUT_LIMIT_MASK	GENMASK(14, 7)</div><div class='add'>+#define MT_INFRA_BUS_TIMEOUT_EN_MASK	GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+#define MT_INFRA_BUS_ON_TIMEOUT		MT_INFRA_BUS(0x31c)</div><div class='add'>+#define MT_INFRA_BUS_EMI_START		MT_INFRA_BUS(0x360)</div><div class='add'>+#define MT_INFRA_BUS_EMI_END		MT_INFRA_BUS(0x364)</div><div class='add'>+</div><div class='add'>+/* CONN_INFRA_SKU */</div><div class='add'>+#define MT_CONNINFRA_SKU_DEC_ADDR	0x18050000</div><div class='add'>+#define MT_CONNINFRA_SKU_MASK		GENMASK(15, 0)</div><div class='add'>+#define MT_ADIE_TYPE_MASK		BIT(1)</div><div class='add'>+</div><div class='add'>+/* FW MODE SYNC */</div><div class='add'>+#define MT_FW_ASSERT_STAT		__REG(FW_ASSERT_STAT_ADDR)</div><div class='add'>+#define MT_FW_EXCEPT_TYPE		__REG(FW_EXCEPT_TYPE_ADDR)</div><div class='add'>+#define MT_FW_EXCEPT_COUNT		__REG(FW_EXCEPT_COUNT_ADDR)</div><div class='add'>+#define MT_FW_CIRQ_COUNT		__REG(FW_CIRQ_COUNT_ADDR)</div><div class='add'>+#define MT_FW_CIRQ_IDX			__REG(FW_CIRQ_IDX_ADDR)</div><div class='add'>+#define MT_FW_CIRQ_LISR			__REG(FW_CIRQ_LISR_ADDR)</div><div class='add'>+#define MT_FW_TASK_ID			__REG(FW_TASK_ID_ADDR)</div><div class='add'>+#define MT_FW_TASK_IDX			__REG(FW_TASK_IDX_ADDR)</div><div class='add'>+#define MT_FW_TASK_QID1			__REG(FW_TASK_QID1_ADDR)</div><div class='add'>+#define MT_FW_TASK_QID2			__REG(FW_TASK_QID2_ADDR)</div><div class='add'>+#define MT_FW_TASK_START		__REG(FW_TASK_START_ADDR)</div><div class='add'>+#define MT_FW_TASK_END			__REG(FW_TASK_END_ADDR)</div><div class='add'>+#define MT_FW_TASK_SIZE			__REG(FW_TASK_SIZE_ADDR)</div><div class='add'>+#define MT_FW_LAST_MSG_ID		__REG(FW_LAST_MSG_ID_ADDR)</div><div class='add'>+#define MT_FW_EINT_INFO			__REG(FW_EINT_INFO_ADDR)</div><div class='add'>+#define MT_FW_SCHED_INFO		__REG(FW_SCHED_INFO_ADDR)</div><div class='add'>+</div><div class='add'>+#define MT_SWDEF_BASE			__REG(SWDEF_BASE_ADDR)</div><div class='ctx'> </div><div class='del'>-#define MT_SWDEF_BASE			0x41f200</div><div class='ctx'> #define MT_SWDEF(ofs)			(MT_SWDEF_BASE + (ofs))</div><div class='ctx'> #define MT_SWDEF_MODE			MT_SWDEF(0x3c)</div><div class='ctx'> #define MT_SWDEF_NORMAL_MODE		0</div><div class='ctx'> #define MT_SWDEF_ICAP_MODE		1</div><div class='ctx'> #define MT_SWDEF_SPECTRUM_MODE		2</div><div class='ctx'> </div><div class='add'>+#define MT_SWDEF_SER_STATS		MT_SWDEF(0x040)</div><div class='add'>+#define MT_SWDEF_PLE_STATS		MT_SWDEF(0x044)</div><div class='add'>+#define MT_SWDEF_PLE1_STATS		MT_SWDEF(0x048)</div><div class='add'>+#define MT_SWDEF_PLE_AMSDU_STATS	MT_SWDEF(0x04C)</div><div class='add'>+#define MT_SWDEF_PSE_STATS		MT_SWDEF(0x050)</div><div class='add'>+#define MT_SWDEF_PSE1_STATS		MT_SWDEF(0x054)</div><div class='add'>+#define MT_SWDEF_LAMC_WISR6_BN0_STATS	MT_SWDEF(0x058)</div><div class='add'>+#define MT_SWDEF_LAMC_WISR6_BN1_STATS	MT_SWDEF(0x05C)</div><div class='add'>+#define MT_SWDEF_LAMC_WISR7_BN0_STATS	MT_SWDEF(0x060)</div><div class='add'>+#define MT_SWDEF_LAMC_WISR7_BN1_STATS	MT_SWDEF(0x064)</div><div class='add'>+</div><div class='add'>+#define MT_DIC_CMD_REG_BASE		0x41f000</div><div class='add'>+#define MT_DIC_CMD_REG(ofs)		(MT_DIC_CMD_REG_BASE + (ofs))</div><div class='add'>+#define MT_DIC_CMD_REG_CMD		MT_DIC_CMD_REG(0x10)</div><div class='add'>+</div><div class='add'>+#define MT_CPU_UTIL_BASE		0x41f030</div><div class='add'>+#define MT_CPU_UTIL(ofs)		(MT_CPU_UTIL_BASE + (ofs))</div><div class='add'>+#define MT_CPU_UTIL_BUSY_PCT		MT_CPU_UTIL(0x00)</div><div class='add'>+#define MT_CPU_UTIL_PEAK_BUSY_PCT	MT_CPU_UTIL(0x04)</div><div class='add'>+#define MT_CPU_UTIL_IDLE_CNT		MT_CPU_UTIL(0x08)</div><div class='add'>+#define MT_CPU_UTIL_PEAK_IDLE_CNT	MT_CPU_UTIL(0x0c)</div><div class='add'>+#define MT_CPU_UTIL_CTRL		MT_CPU_UTIL(0x1c)</div><div class='add'>+</div><div class='add'>+/* LED */</div><div class='add'>+#define MT_LED_TOP_BASE			0x18013000</div><div class='add'>+#define MT_LED_PHYS(_n)			(MT_LED_TOP_BASE + (_n))</div><div class='add'>+</div><div class='add'>+#define MT_LED_CTRL(_n)			MT_LED_PHYS(0x00 + ((_n) * 4))</div><div class='add'>+#define MT_LED_CTRL_KICK		BIT(7)</div><div class='add'>+#define MT_LED_CTRL_BAND		BIT(4)</div><div class='add'>+#define MT_LED_CTRL_BLINK_MODE		BIT(2)</div><div class='add'>+#define MT_LED_CTRL_POLARITY		BIT(1)</div><div class='add'>+</div><div class='add'>+#define MT_LED_TX_BLINK(_n)		MT_LED_PHYS(0x10 + ((_n) * 4))</div><div class='add'>+#define MT_LED_TX_BLINK_ON_MASK		GENMASK(7, 0)</div><div class='add'>+#define MT_LED_TX_BLINK_OFF_MASK        GENMASK(15, 8)</div><div class='add'>+</div><div class='add'>+#define MT_LED_STATUS_0(_n)		MT_LED_PHYS(0x20 + ((_n) * 8))</div><div class='add'>+#define MT_LED_STATUS_1(_n)		MT_LED_PHYS(0x24 + ((_n) * 8))</div><div class='add'>+#define MT_LED_STATUS_OFF		GENMASK(31, 24)</div><div class='add'>+#define MT_LED_STATUS_ON		GENMASK(23, 16)</div><div class='add'>+#define MT_LED_STATUS_DURATION		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define MT_LED_EN(_n)			MT_LED_PHYS(0x40 + ((_n) * 4))</div><div class='add'>+</div><div class='add'>+#define MT_LED_GPIO_MUX0		0x70005050 /* GPIO 1 and GPIO 2 */</div><div class='add'>+#define MT_LED_GPIO_MUX1		0x70005054 /* GPIO 14 and 15 */</div><div class='add'>+#define MT_LED_GPIO_MUX2                0x70005058 /* GPIO 18 */</div><div class='add'>+#define MT_LED_GPIO_MUX3		0x7000505c /* GPIO 26 */</div><div class='add'>+</div><div class='add'>+/* MT TOP */</div><div class='ctx'> #define MT_TOP_BASE			0x18060000</div><div class='ctx'> #define MT_TOP(ofs)			(MT_TOP_BASE + (ofs))</div><div class='ctx'> </div><div class='del'>-#define MT_TOP_LPCR_HOST_BAND0		MT_TOP(0x10)</div><div class='add'>+#define MT_TOP_LPCR_HOST_BAND(_band)	MT_TOP(0x10 + ((_band) * 0x10))</div><div class='ctx'> #define MT_TOP_LPCR_HOST_FW_OWN		BIT(0)</div><div class='ctx'> #define MT_TOP_LPCR_HOST_DRV_OWN	BIT(1)</div><div class='add'>+#define MT_TOP_LPCR_HOST_FW_OWN_STAT	BIT(2)</div><div class='add'>+</div><div class='add'>+#define MT_TOP_LPCR_HOST_BAND_IRQ_STAT(_band)	MT_TOP(0x14 + ((_band) * 0x10))</div><div class='add'>+#define MT_TOP_LPCR_HOST_BAND_STAT	BIT(0)</div><div class='ctx'> </div><div class='ctx'> #define MT_TOP_MISC			MT_TOP(0xf0)</div><div class='ctx'> #define MT_TOP_MISC_FW_STATE		GENMASK(2, 0)</div><div class='ctx'> </div><div class='add'>+#define MT_TOP_WFSYS_WAKEUP		MT_TOP(0x1a4)</div><div class='add'>+#define MT_TOP_WFSYS_WAKEUP_MASK	BIT(0)</div><div class='add'>+</div><div class='add'>+#define MT_TOP_MCU_EMI_BASE		MT_TOP(0x1c4)</div><div class='add'>+#define MT_TOP_MCU_EMI_BASE_MASK	GENMASK(19, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TOP_WF_AP_PERI_BASE		MT_TOP(0x1c8)</div><div class='add'>+#define MT_TOP_WF_AP_PERI_BASE_MASK	GENMASK(19, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TOP_EFUSE_BASE		MT_TOP(0x1cc)</div><div class='add'>+#define MT_TOP_EFUSE_BASE_MASK		GENMASK(19, 0)</div><div class='add'>+</div><div class='add'>+#define MT_TOP_CONN_INFRA_WAKEUP	MT_TOP(0x1a0)</div><div class='add'>+#define MT_TOP_CONN_INFRA_WAKEUP_MASK	BIT(0)</div><div class='add'>+</div><div class='add'>+#define MT_TOP_WFSYS_RESET_STATUS	MT_TOP(0x2cc)</div><div class='add'>+#define MT_TOP_WFSYS_RESET_STATUS_MASK	BIT(30)</div><div class='add'>+</div><div class='add'>+/* SEMA */</div><div class='add'>+#define MT_SEMA_BASE			0x18070000</div><div class='add'>+#define MT_SEMA(ofs)			(MT_SEMA_BASE + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_SEMA_RFSPI_STATUS		(MT_SEMA(0x2000) + (11 * 4))</div><div class='add'>+#define MT_SEMA_RFSPI_RELEASE		(MT_SEMA(0x2200) + (11 * 4))</div><div class='add'>+#define MT_SEMA_RFSPI_STATUS_MASK	BIT(1)</div><div class='add'>+</div><div class='add'>+/* MCU BUS */</div><div class='add'>+#define MT_MCU_BUS_BASE			0x18400000</div><div class='add'>+#define MT_MCU_BUS(ofs)			(MT_MCU_BUS_BASE + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_MCU_BUS_TIMEOUT		MT_MCU_BUS(0xf0440)</div><div class='add'>+#define MT_MCU_BUS_TIMEOUT_SET_MASK	GENMASK(7, 0)</div><div class='add'>+#define MT_MCU_BUS_TIMEOUT_CG_EN_MASK	BIT(28)</div><div class='add'>+#define MT_MCU_BUS_TIMEOUT_EN_MASK	BIT(31)</div><div class='add'>+</div><div class='add'>+#define MT_MCU_BUS_REMAP		MT_MCU_BUS(0x120)</div><div class='add'>+</div><div class='add'>+/* TOP CFG */</div><div class='add'>+#define MT_TOP_CFG_BASE			0x184b0000</div><div class='add'>+#define MT_TOP_CFG(ofs)			(MT_TOP_CFG_BASE + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_TOP_CFG_IP_VERSION_ADDR	MT_TOP_CFG(0x010)</div><div class='add'>+</div><div class='add'>+/* TOP CFG ON */</div><div class='add'>+#define MT_TOP_CFG_ON_BASE		0x184c1000</div><div class='add'>+#define MT_TOP_CFG_ON(ofs)		(MT_TOP_CFG_ON_BASE + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_TOP_CFG_ON_ROM_IDX		MT_TOP_CFG_ON(0x604)</div><div class='add'>+</div><div class='add'>+/* SLP CTRL */</div><div class='add'>+#define MT_SLP_BASE			0x184c3000</div><div class='add'>+#define MT_SLP(ofs)			(MT_SLP_BASE + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_SLP_STATUS			MT_SLP(0x00c)</div><div class='add'>+#define MT_SLP_WFDMA2CONN_MASK		(BIT(21) | BIT(23))</div><div class='add'>+#define MT_SLP_CTRL_EN_MASK		BIT(0)</div><div class='add'>+#define MT_SLP_CTRL_BSY_MASK		BIT(1)</div><div class='add'>+</div><div class='add'>+/* MCU BUS DBG */</div><div class='add'>+#define MT_MCU_BUS_DBG_BASE		0x18500000</div><div class='add'>+#define MT_MCU_BUS_DBG(ofs)		(MT_MCU_BUS_DBG_BASE + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_MCU_BUS_DBG_TIMEOUT		MT_MCU_BUS_DBG(0x0)</div><div class='add'>+#define MT_MCU_BUS_DBG_TIMEOUT_SET_MASK GENMASK(31, 16)</div><div class='add'>+#define MT_MCU_BUS_DBG_TIMEOUT_CK_EN_MASK BIT(3)</div><div class='add'>+#define MT_MCU_BUS_DBG_TIMEOUT_EN_MASK	BIT(2)</div><div class='add'>+</div><div class='ctx'> #define MT_HW_BOUND			0x70010020</div><div class='del'>-#define MT_HW_CHIPID			0x70010200</div><div class='ctx'> #define MT_HW_REV			0x70010204</div><div class='add'>+#define MT_WF_SUBSYS_RST		0x70002600</div><div class='ctx'> </div><div class='del'>-#define MT_PCIE1_MAC_BASE		0x74020000</div><div class='del'>-#define MT_PCIE1_MAC(ofs)		(MT_PCIE1_MAC_BASE + (ofs))</div><div class='del'>-#define MT_PCIE1_MAC_INT_ENABLE		MT_PCIE1_MAC(0x188)</div><div class='del'>-</div><div class='add'>+/* PCIE MAC */</div><div class='ctx'> #define MT_PCIE_MAC_BASE		0x74030000</div><div class='ctx'> #define MT_PCIE_MAC(ofs)		(MT_PCIE_MAC_BASE + (ofs))</div><div class='ctx'> #define MT_PCIE_MAC_INT_ENABLE		MT_PCIE_MAC(0x188)</div><div class='ctx'> </div><div class='del'>-#define MT_WF_IRPI_BASE			0x83006000</div><div class='del'>-#define MT_WF_IRPI(ofs)			(MT_WF_IRPI_BASE + ((ofs) &lt;&lt; 16))</div><div class='add'>+#define MT_PCIE1_MAC_INT_ENABLE		0x74020188</div><div class='add'>+#define MT_PCIE1_MAC_INT_ENABLE_MT7916	0x74090188</div><div class='add'>+</div><div class='add'>+#define MT_WM_MCU_PC			0x7c060204</div><div class='add'>+#define MT_WA_MCU_PC			0x7c06020c</div><div class='add'>+</div><div class='add'>+/* PP TOP */</div><div class='add'>+#define MT_WF_PP_TOP_BASE		0x820cc000</div><div class='add'>+#define MT_WF_PP_TOP(ofs)		(MT_WF_PP_TOP_BASE + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_WF_PP_TOP_RXQ_WFDMA_CF_5	MT_WF_PP_TOP(0x0e8)</div><div class='add'>+#define MT_WF_PP_TOP_RXQ_QID6_WFDMA_HIF_SEL_MASK	BIT(6)</div><div class='add'>+</div><div class='add'>+#define MT_WF_IRPI_BASE			0x83000000</div><div class='add'>+#define MT_WF_IRPI(ofs)			(MT_WF_IRPI_BASE + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_WF_IRPI_NSS(phy, nss)	MT_WF_IRPI(0x6000 + ((phy) &lt;&lt; 20) + ((nss) &lt;&lt; 16))</div><div class='add'>+#define MT_WF_IRPI_NSS_MT7916(phy, nss)	MT_WF_IRPI(0x1000 + ((phy) &lt;&lt; 20) + ((nss) &lt;&lt; 16))</div><div class='ctx'> </div><div class='del'>-/* PHY: band 0(0x83080000), band 1(0x83090000) */</div><div class='add'>+/* PHY */</div><div class='ctx'> #define MT_WF_PHY_BASE			0x83080000</div><div class='ctx'> #define MT_WF_PHY(ofs)			(MT_WF_PHY_BASE + (ofs))</div><div class='ctx'> </div><div class='ctx'> #define MT_WF_PHY_RX_CTRL1(_phy)	MT_WF_PHY(0x2004 + ((_phy) &lt;&lt; 16))</div><div class='add'>+#define MT_WF_PHY_RX_CTRL1_MT7916(_phy)	MT_WF_PHY(0x2004 + ((_phy) &lt;&lt; 20))</div><div class='ctx'> #define MT_WF_PHY_RX_CTRL1_IPI_EN	GENMASK(2, 0)</div><div class='ctx'> #define MT_WF_PHY_RX_CTRL1_STSCNT_EN	GENMASK(11, 9)</div><div class='ctx'> </div><div class='ctx'> #define MT_WF_PHY_RXTD12(_phy)		MT_WF_PHY(0x8230 + ((_phy) &lt;&lt; 16))</div><div class='add'>+#define MT_WF_PHY_RXTD12_MT7916(_phy)	MT_WF_PHY(0x8230 + ((_phy) &lt;&lt; 20))</div><div class='ctx'> #define MT_WF_PHY_RXTD12_IRPI_SW_CLR_ONLY	BIT(18)</div><div class='del'>-#define MT_WF_PHY_RXTD12_IRPI_SW_CLR	BIT(29)</div><div class='add'>+#define MT_WF_PHY_RXTD12_IRPI_SW_CLR		BIT(29)</div><div class='add'>+</div><div class='add'>+#define MT_WF_PHY_TPC_CTRL_STAT(_phy)		MT_WF_PHY(0xe7a0 + ((_phy) &lt;&lt; 16))</div><div class='add'>+#define MT_WF_PHY_TPC_CTRL_STAT_MT7916(_phy)	MT_WF_PHY(0xe7a0 + ((_phy) &lt;&lt; 20))</div><div class='add'>+#define MT_WF_PHY_TPC_POWER			GENMASK(15, 8)</div><div class='add'>+</div><div class='add'>+#define MT_MCU_WM_CIRQ_BASE			0x89010000</div><div class='add'>+#define MT_MCU_WM_CIRQ(ofs)			(MT_MCU_WM_CIRQ_BASE + (ofs))</div><div class='add'>+#define MT_MCU_WM_CIRQ_IRQ_MASK_CLR_ADDR	MT_MCU_WM_CIRQ(0x80)</div><div class='add'>+#define MT_MCU_WM_CIRQ_IRQ_SOFT_ADDR		MT_MCU_WM_CIRQ(0xc0)</div><div class='add'>+#define MT_MCU_WM_CIRQ_EINT_MASK_CLR_ADDR	MT_MCU_WM_CIRQ(0x108)</div><div class='add'>+#define MT_MCU_WM_CIRQ_EINT_SOFT_ADDR		MT_MCU_WM_CIRQ(0x118)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/soc.c b/drivers/net/wireless/mediatek/mt76/mt7915/soc.c<br/>new file mode 100644<br/>index 000000000000..54ff6de96f3e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/soc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7915/soc.c</a></div><div class='hunk'>@@ -0,0 +1,1312 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/* Copyright (C) 2022 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/pinctrl/consumer.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_reserved_mem.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='add'>+#include &lt;linux/of_net.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mt7915.h"</div><div class='add'>+</div><div class='add'>+#define MT7981_CON_INFRA_VERSION 0x02090000</div><div class='add'>+#define MT7986_CON_INFRA_VERSION 0x02070000</div><div class='add'>+</div><div class='add'>+/* INFRACFG */</div><div class='add'>+#define MT_INFRACFG_CONN2AP_SLPPROT	0x0d0</div><div class='add'>+#define MT_INFRACFG_AP2CONN_SLPPROT	0x0d4</div><div class='add'>+</div><div class='add'>+#define MT_INFRACFG_RX_EN_MASK		BIT(16)</div><div class='add'>+#define MT_INFRACFG_TX_RDY_MASK		BIT(4)</div><div class='add'>+#define MT_INFRACFG_TX_EN_MASK		BIT(0)</div><div class='add'>+</div><div class='add'>+/* TOP POS */</div><div class='add'>+#define MT_TOP_POS_FAST_CTRL		0x114</div><div class='add'>+#define MT_TOP_POS_FAST_EN_MASK		BIT(3)</div><div class='add'>+</div><div class='add'>+#define MT_TOP_POS_SKU			0x21c</div><div class='add'>+#define MT_TOP_POS_SKU_MASK		GENMASK(31, 28)</div><div class='add'>+#define MT_TOP_POS_SKU_ADIE_DBDC_MASK	BIT(2)</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	ADIE_SB,</div><div class='add'>+	ADIE_DBDC</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt76_wmac_spi_read(struct mt7915_dev *dev, u8 adie, u32 addr, u32 *val)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 cur;</div><div class='add'>+</div><div class='add'>+	ret = read_poll_timeout(mt76_rr, cur, !(cur &amp; MT_TOP_SPI_POLLING_BIT),</div><div class='add'>+				USEC_PER_MSEC, 50 * USEC_PER_MSEC, false,</div><div class='add'>+				dev, MT_TOP_SPI_BUSY_CR(adie));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_TOP_SPI_ADDR_CR(adie),</div><div class='add'>+		MT_TOP_SPI_READ_ADDR_FORMAT | addr);</div><div class='add'>+	mt76_wr(dev, MT_TOP_SPI_WRITE_DATA_CR(adie), 0);</div><div class='add'>+</div><div class='add'>+	ret = read_poll_timeout(mt76_rr, cur, !(cur &amp; MT_TOP_SPI_POLLING_BIT),</div><div class='add'>+				USEC_PER_MSEC, 50 * USEC_PER_MSEC, false,</div><div class='add'>+				dev, MT_TOP_SPI_BUSY_CR(adie));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*val = mt76_rr(dev, MT_TOP_SPI_READ_DATA_CR(adie));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt76_wmac_spi_write(struct mt7915_dev *dev, u8 adie, u32 addr, u32 val)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 cur;</div><div class='add'>+</div><div class='add'>+	ret = read_poll_timeout(mt76_rr, cur, !(cur &amp; MT_TOP_SPI_POLLING_BIT),</div><div class='add'>+				USEC_PER_MSEC, 50 * USEC_PER_MSEC, false,</div><div class='add'>+				dev, MT_TOP_SPI_BUSY_CR(adie));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_TOP_SPI_ADDR_CR(adie),</div><div class='add'>+		MT_TOP_SPI_WRITE_ADDR_FORMAT | addr);</div><div class='add'>+	mt76_wr(dev, MT_TOP_SPI_WRITE_DATA_CR(adie), val);</div><div class='add'>+</div><div class='add'>+	return read_poll_timeout(mt76_rr, cur, !(cur &amp; MT_TOP_SPI_POLLING_BIT),</div><div class='add'>+				 USEC_PER_MSEC, 50 * USEC_PER_MSEC, false,</div><div class='add'>+				 dev, MT_TOP_SPI_BUSY_CR(adie));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt76_wmac_spi_rmw(struct mt7915_dev *dev, u8 adie,</div><div class='add'>+		  u32 addr, u32 mask, u32 val)</div><div class='add'>+{</div><div class='add'>+	u32 cur, ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_wmac_spi_read(dev, adie, addr, &amp;cur);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	cur &amp;= ~mask;</div><div class='add'>+	cur |= val;</div><div class='add'>+</div><div class='add'>+	return mt76_wmac_spi_write(dev, adie, addr, cur);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7986_wmac_adie_efuse_read(struct mt7915_dev *dev, u8 adie,</div><div class='add'>+			    u32 addr, u32 *data)</div><div class='add'>+{</div><div class='add'>+	int ret, temp;</div><div class='add'>+	u32 val, mask;</div><div class='add'>+</div><div class='add'>+	ret = mt76_wmac_spi_write(dev, adie, MT_ADIE_EFUSE_CFG,</div><div class='add'>+				  MT_ADIE_EFUSE_CTRL_MASK);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_wmac_spi_rmw(dev, adie, MT_ADIE_EFUSE2_CTRL, BIT(30), 0x0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mask = (MT_ADIE_EFUSE_MODE_MASK | MT_ADIE_EFUSE_ADDR_MASK |</div><div class='add'>+		MT_ADIE_EFUSE_KICK_MASK);</div><div class='add'>+	val = FIELD_PREP(MT_ADIE_EFUSE_MODE_MASK, 0) |</div><div class='add'>+	      FIELD_PREP(MT_ADIE_EFUSE_ADDR_MASK, addr) |</div><div class='add'>+	      FIELD_PREP(MT_ADIE_EFUSE_KICK_MASK, 1);</div><div class='add'>+	ret = mt76_wmac_spi_rmw(dev, adie, MT_ADIE_EFUSE2_CTRL, mask, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = read_poll_timeout(mt76_wmac_spi_read, temp,</div><div class='add'>+				!temp &amp;&amp; !FIELD_GET(MT_ADIE_EFUSE_KICK_MASK, val),</div><div class='add'>+				USEC_PER_MSEC, 50 * USEC_PER_MSEC, false,</div><div class='add'>+				dev, adie, MT_ADIE_EFUSE2_CTRL, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_wmac_spi_read(dev, adie, MT_ADIE_EFUSE2_CTRL, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (FIELD_GET(MT_ADIE_EFUSE_VALID_MASK, val) == 1)</div><div class='add'>+		ret = mt76_wmac_spi_read(dev, adie, MT_ADIE_EFUSE_RDATA0,</div><div class='add'>+					 data);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mt76_wmac_spi_lock(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u32 cur;</div><div class='add'>+</div><div class='add'>+	read_poll_timeout(mt76_rr, cur,</div><div class='add'>+			  FIELD_GET(MT_SEMA_RFSPI_STATUS_MASK, cur),</div><div class='add'>+			  1000, 1000 * MSEC_PER_SEC, false, dev,</div><div class='add'>+			  MT_SEMA_RFSPI_STATUS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mt76_wmac_spi_unlock(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	mt76_wr(dev, MT_SEMA_RFSPI_RELEASE, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 mt76_wmac_rmw(void __iomem *base, u32 offset, u32 mask, u32 val)</div><div class='add'>+{</div><div class='add'>+	val |= readl(base + offset) &amp; ~mask;</div><div class='add'>+	writel(val, base + offset);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 mt798x_wmac_check_adie_type(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* Only DBDC A-die is used with MT7981 */</div><div class='add'>+	if (is_mt7981(&amp;dev-&gt;mt76))</div><div class='add'>+		return ADIE_DBDC;</div><div class='add'>+</div><div class='add'>+	val = readl(dev-&gt;sku + MT_TOP_POS_SKU);</div><div class='add'>+</div><div class='add'>+	return FIELD_GET(MT_TOP_POS_SKU_ADIE_DBDC_MASK, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7986_wmac_consys_reset(struct mt7915_dev *dev, bool enable)</div><div class='add'>+{</div><div class='add'>+	if (!enable)</div><div class='add'>+		return reset_control_assert(dev-&gt;rstc);</div><div class='add'>+</div><div class='add'>+	mt76_wmac_rmw(dev-&gt;sku, MT_TOP_POS_FAST_CTRL,</div><div class='add'>+		      MT_TOP_POS_FAST_EN_MASK,</div><div class='add'>+		      FIELD_PREP(MT_TOP_POS_FAST_EN_MASK, 0x1));</div><div class='add'>+</div><div class='add'>+	return reset_control_deassert(dev-&gt;rstc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7986_wmac_gpio_setup(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct pinctrl_state *state;</div><div class='add'>+	struct pinctrl *pinctrl;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 type;</div><div class='add'>+</div><div class='add'>+	type = mt798x_wmac_check_adie_type(dev);</div><div class='add'>+	pinctrl = devm_pinctrl_get(dev-&gt;mt76.dev);</div><div class='add'>+	if (IS_ERR(pinctrl))</div><div class='add'>+		return PTR_ERR(pinctrl);</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case ADIE_SB:</div><div class='add'>+		state = pinctrl_lookup_state(pinctrl, "default");</div><div class='add'>+		if (IS_ERR_OR_NULL(state))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	case ADIE_DBDC:</div><div class='add'>+		state = pinctrl_lookup_state(pinctrl, "dbdc");</div><div class='add'>+		if (IS_ERR_OR_NULL(state))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = pinctrl_select_state(pinctrl, state);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	usleep_range(500, 1000);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7986_wmac_consys_lockup(struct mt7915_dev *dev, bool enable)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 cur;</div><div class='add'>+</div><div class='add'>+	mt76_wmac_rmw(dev-&gt;dcm, MT_INFRACFG_AP2CONN_SLPPROT,</div><div class='add'>+		      MT_INFRACFG_RX_EN_MASK,</div><div class='add'>+		      FIELD_PREP(MT_INFRACFG_RX_EN_MASK, enable));</div><div class='add'>+	ret = read_poll_timeout(readl, cur, !(cur &amp; MT_INFRACFG_RX_EN_MASK),</div><div class='add'>+				USEC_PER_MSEC, 50 * USEC_PER_MSEC, false,</div><div class='add'>+				dev-&gt;dcm + MT_INFRACFG_AP2CONN_SLPPROT);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mt76_wmac_rmw(dev-&gt;dcm, MT_INFRACFG_AP2CONN_SLPPROT,</div><div class='add'>+		      MT_INFRACFG_TX_EN_MASK,</div><div class='add'>+		      FIELD_PREP(MT_INFRACFG_TX_EN_MASK, enable));</div><div class='add'>+	ret = read_poll_timeout(readl, cur, !(cur &amp; MT_INFRACFG_TX_RDY_MASK),</div><div class='add'>+				USEC_PER_MSEC, 50 * USEC_PER_MSEC, false,</div><div class='add'>+				dev-&gt;dcm + MT_INFRACFG_AP2CONN_SLPPROT);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mt76_wmac_rmw(dev-&gt;dcm, MT_INFRACFG_CONN2AP_SLPPROT,</div><div class='add'>+		      MT_INFRACFG_RX_EN_MASK,</div><div class='add'>+		      FIELD_PREP(MT_INFRACFG_RX_EN_MASK, enable));</div><div class='add'>+	mt76_wmac_rmw(dev-&gt;dcm, MT_INFRACFG_CONN2AP_SLPPROT,</div><div class='add'>+		      MT_INFRACFG_TX_EN_MASK,</div><div class='add'>+		      FIELD_PREP(MT_INFRACFG_TX_EN_MASK, enable));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt798x_wmac_coninfra_check(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u32 cur;</div><div class='add'>+	u32 con_infra_version;</div><div class='add'>+</div><div class='add'>+	if (is_mt7981(&amp;dev-&gt;mt76)) {</div><div class='add'>+		con_infra_version = MT7981_CON_INFRA_VERSION;</div><div class='add'>+	} else if (is_mt7986(&amp;dev-&gt;mt76)) {</div><div class='add'>+		con_infra_version = MT7986_CON_INFRA_VERSION;</div><div class='add'>+	} else {</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return read_poll_timeout(mt76_rr, cur, (cur == con_infra_version),</div><div class='add'>+				 USEC_PER_MSEC, 50 * USEC_PER_MSEC,</div><div class='add'>+				 false, dev, MT_CONN_INFRA_BASE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt798x_wmac_coninfra_setup(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct device *pdev = dev-&gt;mt76.dev;</div><div class='add'>+	struct resource res;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = of_reserved_mem_region_to_resource(pdev-&gt;of_node, 0, &amp;res);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	val = (res.start &gt;&gt; 16) &amp; MT_TOP_MCU_EMI_BASE_MASK;</div><div class='add'>+</div><div class='add'>+	if (is_mt7986(&amp;dev-&gt;mt76)) {</div><div class='add'>+		/* Set conninfra subsys PLL check */</div><div class='add'>+		mt76_rmw_field(dev, MT_INFRA_CKGEN_BUS,</div><div class='add'>+			       MT_INFRA_CKGEN_BUS_RDY_SEL_MASK, 0x1);</div><div class='add'>+		mt76_rmw_field(dev, MT_INFRA_CKGEN_BUS,</div><div class='add'>+			       MT_INFRA_CKGEN_BUS_RDY_SEL_MASK, 0x1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_TOP_MCU_EMI_BASE,</div><div class='add'>+		       MT_TOP_MCU_EMI_BASE_MASK, val);</div><div class='add'>+</div><div class='add'>+	if (is_mt7981(&amp;dev-&gt;mt76)) {</div><div class='add'>+		mt76_rmw_field(dev, MT_TOP_WF_AP_PERI_BASE,</div><div class='add'>+			       MT_TOP_WF_AP_PERI_BASE_MASK, 0x300d0000 &gt;&gt; 16);</div><div class='add'>+</div><div class='add'>+		mt76_rmw_field(dev, MT_TOP_EFUSE_BASE,</div><div class='add'>+			       MT_TOP_EFUSE_BASE_MASK, 0x11f20000 &gt;&gt; 16);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_INFRA_BUS_EMI_START, res.start);</div><div class='add'>+	mt76_wr(dev, MT_INFRA_BUS_EMI_END, resource_size(&amp;res));</div><div class='add'>+</div><div class='add'>+	mt76_rr(dev, MT_CONN_INFRA_EFUSE);</div><div class='add'>+</div><div class='add'>+	/* Set conninfra sysram */</div><div class='add'>+	mt76_wr(dev, MT_TOP_RGU_SYSRAM_PDN, 0);</div><div class='add'>+	mt76_wr(dev, MT_TOP_RGU_SYSRAM_SLP, 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt798x_wmac_sku_setup(struct mt7915_dev *dev, u32 *adie_type)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 adie_main = 0, adie_ext = 0;</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_CONN_INFRA_ADIE_RESET,</div><div class='add'>+		       MT_CONN_INFRA_ADIE1_RESET_MASK, 0x1);</div><div class='add'>+</div><div class='add'>+	if (is_mt7986(&amp;dev-&gt;mt76)) {</div><div class='add'>+		mt76_rmw_field(dev, MT_CONN_INFRA_ADIE_RESET,</div><div class='add'>+			       MT_CONN_INFRA_ADIE2_RESET_MASK, 0x1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt76_wmac_spi_lock(dev);</div><div class='add'>+</div><div class='add'>+	ret = mt76_wmac_spi_read(dev, 0, MT_ADIE_CHIP_ID, &amp;adie_main);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (is_mt7986(&amp;dev-&gt;mt76)) {</div><div class='add'>+		ret = mt76_wmac_spi_read(dev, 1, MT_ADIE_CHIP_ID, &amp;adie_ext);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*adie_type = FIELD_GET(MT_ADIE_CHIP_ID_MASK, adie_main) |</div><div class='add'>+		     (MT_ADIE_CHIP_ID_MASK &amp; adie_ext);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mt76_wmac_spi_unlock(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 mt7986_adie_idx(u8 adie, u32 adie_type)</div><div class='add'>+{</div><div class='add'>+	if (adie == 0)</div><div class='add'>+		return u32_get_bits(adie_type, MT_ADIE_IDX0);</div><div class='add'>+	else</div><div class='add'>+		return u32_get_bits(adie_type, MT_ADIE_IDX1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_7975(struct mt7915_dev *dev, u8 adie, u32 adie_type)</div><div class='add'>+{</div><div class='add'>+	return mt7986_adie_idx(adie, adie_type) == 0x7975;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_7976(struct mt7915_dev *dev, u8 adie, u32 adie_type)</div><div class='add'>+{</div><div class='add'>+	return mt7986_adie_idx(adie, adie_type) == 0x7976;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7986_wmac_adie_thermal_cal(struct mt7915_dev *dev, u8 adie)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 data, val;</div><div class='add'>+</div><div class='add'>+	ret = mt7986_wmac_adie_efuse_read(dev, adie, MT_ADIE_THADC_ANALOG,</div><div class='add'>+					  &amp;data);</div><div class='add'>+	if (ret || FIELD_GET(MT_ADIE_ANA_EN_MASK, data)) {</div><div class='add'>+		val = FIELD_GET(MT_ADIE_VRPI_SEL_EFUSE_MASK, data);</div><div class='add'>+		ret = mt76_wmac_spi_rmw(dev, adie, MT_ADIE_RG_TOP_THADC_BG,</div><div class='add'>+					MT_ADIE_VRPI_SEL_CR_MASK,</div><div class='add'>+					FIELD_PREP(MT_ADIE_VRPI_SEL_CR_MASK, val));</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		val = FIELD_GET(MT_ADIE_PGA_GAIN_EFUSE_MASK, data);</div><div class='add'>+		ret = mt76_wmac_spi_rmw(dev, adie, MT_ADIE_RG_TOP_THADC,</div><div class='add'>+					MT_ADIE_PGA_GAIN_MASK,</div><div class='add'>+					FIELD_PREP(MT_ADIE_PGA_GAIN_MASK, val));</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt7986_wmac_adie_efuse_read(dev, adie, MT_ADIE_THADC_SLOP,</div><div class='add'>+					  &amp;data);</div><div class='add'>+	if (ret || FIELD_GET(MT_ADIE_ANA_EN_MASK, data)) {</div><div class='add'>+		val = FIELD_GET(MT_ADIE_LDO_CTRL_EFUSE_MASK, data);</div><div class='add'>+</div><div class='add'>+		return mt76_wmac_spi_rmw(dev, adie, MT_ADIE_RG_TOP_THADC,</div><div class='add'>+					 MT_ADIE_LDO_CTRL_MASK,</div><div class='add'>+					 FIELD_PREP(MT_ADIE_LDO_CTRL_MASK, val));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7986_read_efuse_xo_trim_7976(struct mt7915_dev *dev, u8 adie,</div><div class='add'>+			       bool is_40m, int *result)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 data, addr;</div><div class='add'>+</div><div class='add'>+	addr = is_40m ? MT_ADIE_XTAL_AXM_40M_OSC : MT_ADIE_XTAL_AXM_80M_OSC;</div><div class='add'>+	ret = mt7986_wmac_adie_efuse_read(dev, adie, addr, &amp;data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!FIELD_GET(MT_ADIE_XO_TRIM_EN_MASK, data)) {</div><div class='add'>+		*result = 64;</div><div class='add'>+	} else {</div><div class='add'>+		*result = FIELD_GET(MT_ADIE_TRIM_MASK, data);</div><div class='add'>+		addr = is_40m ? MT_ADIE_XTAL_TRIM1_40M_OSC :</div><div class='add'>+				MT_ADIE_XTAL_TRIM1_80M_OSC;</div><div class='add'>+		ret = mt7986_wmac_adie_efuse_read(dev, adie, addr, &amp;data);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (FIELD_GET(MT_ADIE_XO_TRIM_EN_MASK, data) &amp;&amp;</div><div class='add'>+		    FIELD_GET(MT_ADIE_XTAL_DECREASE_MASK, data))</div><div class='add'>+			*result -= FIELD_GET(MT_ADIE_EFUSE_TRIM_MASK, data);</div><div class='add'>+		else if (FIELD_GET(MT_ADIE_XO_TRIM_EN_MASK, data))</div><div class='add'>+			*result += FIELD_GET(MT_ADIE_EFUSE_TRIM_MASK, data);</div><div class='add'>+</div><div class='add'>+		*result = max(0, min(127, *result));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7986_wmac_adie_xtal_trim_7976(struct mt7915_dev *dev, u8 adie)</div><div class='add'>+{</div><div class='add'>+	int ret, trim_80m, trim_40m;</div><div class='add'>+	u32 data, val, mode;</div><div class='add'>+</div><div class='add'>+	ret = mt7986_wmac_adie_efuse_read(dev, adie, MT_ADIE_XO_TRIM_FLOW,</div><div class='add'>+					  &amp;data);</div><div class='add'>+	if (ret || !FIELD_GET(BIT(1), data))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = mt7986_read_efuse_xo_trim_7976(dev, adie, false, &amp;trim_80m);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7986_read_efuse_xo_trim_7976(dev, adie, true, &amp;trim_40m);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_wmac_spi_read(dev, adie, MT_ADIE_RG_STRAP_PIN_IN, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mode = FIELD_PREP(GENMASK(6, 4), val);</div><div class='add'>+	if (!mode || mode == 0x2) {</div><div class='add'>+		ret = mt76_wmac_spi_rmw(dev, adie, MT_ADIE_XTAL_C1,</div><div class='add'>+					GENMASK(31, 24),</div><div class='add'>+					FIELD_PREP(GENMASK(31, 24), trim_80m));</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = mt76_wmac_spi_rmw(dev, adie, MT_ADIE_XTAL_C2,</div><div class='add'>+					GENMASK(31, 24),</div><div class='add'>+					FIELD_PREP(GENMASK(31, 24), trim_80m));</div><div class='add'>+	} else if (mode == 0x3 || mode == 0x4 || mode == 0x6) {</div><div class='add'>+		ret = mt76_wmac_spi_rmw(dev, adie, MT_ADIE_XTAL_C1,</div><div class='add'>+					GENMASK(23, 16),</div><div class='add'>+					FIELD_PREP(GENMASK(23, 16), trim_40m));</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = mt76_wmac_spi_rmw(dev, adie, MT_ADIE_XTAL_C2,</div><div class='add'>+					GENMASK(23, 16),</div><div class='add'>+					FIELD_PREP(GENMASK(23, 16), trim_40m));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt798x_wmac_adie_patch_7976(struct mt7915_dev *dev, u8 adie)</div><div class='add'>+{</div><div class='add'>+	u32 id, version, rg_xo_01, rg_xo_03;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_wmac_spi_read(dev, adie, MT_ADIE_CHIP_ID, &amp;id);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	version = FIELD_GET(MT_ADIE_VERSION_MASK, id);</div><div class='add'>+</div><div class='add'>+	ret = mt76_wmac_spi_write(dev, adie, MT_ADIE_RG_TOP_THADC, 0x4a563b00);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (version == 0x8a00 || version == 0x8a10 ||</div><div class='add'>+	    version == 0x8b00 || version == 0x8c10) {</div><div class='add'>+		rg_xo_01 = 0x1d59080f;</div><div class='add'>+		rg_xo_03 = 0x34c00fe0;</div><div class='add'>+	} else {</div><div class='add'>+		if (is_mt7981(&amp;dev-&gt;mt76)) {</div><div class='add'>+			rg_xo_01 = 0x1959c80f;</div><div class='add'>+		} else if (is_mt7986(&amp;dev-&gt;mt76)) {</div><div class='add'>+			rg_xo_01 = 0x1959f80f;</div><div class='add'>+		} else {</div><div class='add'>+			WARN_ON(1);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		rg_xo_03 = 0x34d00fe0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt76_wmac_spi_write(dev, adie, MT_ADIE_RG_XO_01, rg_xo_01);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return mt76_wmac_spi_write(dev, adie, MT_ADIE_RG_XO_03, rg_xo_03);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7986_read_efuse_xo_trim_7975(struct mt7915_dev *dev, u8 adie,</div><div class='add'>+			       u32 addr, u32 *result)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 data;</div><div class='add'>+</div><div class='add'>+	ret = mt7986_wmac_adie_efuse_read(dev, adie, addr, &amp;data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if ((data &amp; MT_ADIE_XO_TRIM_EN_MASK)) {</div><div class='add'>+		if ((data &amp; MT_ADIE_XTAL_DECREASE_MASK))</div><div class='add'>+			*result -= (data &amp; MT_ADIE_EFUSE_TRIM_MASK);</div><div class='add'>+		else</div><div class='add'>+			*result += (data &amp; MT_ADIE_EFUSE_TRIM_MASK);</div><div class='add'>+</div><div class='add'>+		*result = (*result &amp; MT_ADIE_TRIM_MASK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7986_wmac_adie_xtal_trim_7975(struct mt7915_dev *dev, u8 adie)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 data, result = 0, value;</div><div class='add'>+</div><div class='add'>+	ret = mt7986_wmac_adie_efuse_read(dev, adie, MT_ADIE_7975_XTAL_EN,</div><div class='add'>+					  &amp;data);</div><div class='add'>+	if (ret || !(data &amp; BIT(1)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = mt7986_wmac_adie_efuse_read(dev, adie, MT_ADIE_7975_XTAL_CAL,</div><div class='add'>+					  &amp;data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (data &amp; MT_ADIE_XO_TRIM_EN_MASK)</div><div class='add'>+		result = (data &amp; MT_ADIE_TRIM_MASK);</div><div class='add'>+</div><div class='add'>+	ret = mt7986_read_efuse_xo_trim_7975(dev, adie, MT_ADIE_7975_XO_TRIM2,</div><div class='add'>+					     &amp;result);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7986_read_efuse_xo_trim_7975(dev, adie, MT_ADIE_7975_XO_TRIM3,</div><div class='add'>+					     &amp;result);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7986_read_efuse_xo_trim_7975(dev, adie, MT_ADIE_7975_XO_TRIM4,</div><div class='add'>+					     &amp;result);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Update trim value to C1 and C2*/</div><div class='add'>+	value = FIELD_GET(MT_ADIE_7975_XO_CTRL2_C1_MASK, result) |</div><div class='add'>+		FIELD_GET(MT_ADIE_7975_XO_CTRL2_C2_MASK, result);</div><div class='add'>+	ret = mt76_wmac_spi_rmw(dev, adie, MT_ADIE_7975_XO_CTRL2,</div><div class='add'>+				MT_ADIE_7975_XO_CTRL2_MASK, value);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_wmac_spi_read(dev, adie, MT_ADIE_7975_XTAL, &amp;value);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (value &amp; MT_ADIE_7975_XTAL_EN_MASK) {</div><div class='add'>+		ret = mt76_wmac_spi_rmw(dev, adie, MT_ADIE_7975_XO_2,</div><div class='add'>+					MT_ADIE_7975_XO_2_FIX_EN, 0x0);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mt76_wmac_spi_rmw(dev, adie, MT_ADIE_7975_XO_CTRL6,</div><div class='add'>+				 MT_ADIE_7975_XO_CTRL6_MASK, 0x1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7986_wmac_adie_patch_7975(struct mt7915_dev *dev, u8 adie)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* disable CAL LDO and fine tune RFDIG LDO */</div><div class='add'>+	ret = mt76_wmac_spi_write(dev, adie, 0x348, 0x00000002);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_wmac_spi_write(dev, adie, 0x378, 0x00000002);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_wmac_spi_write(dev, adie, 0x3a8, 0x00000002);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_wmac_spi_write(dev, adie, 0x3d8, 0x00000002);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* set CKA driving and filter */</div><div class='add'>+	ret = mt76_wmac_spi_write(dev, adie, 0xa1c, 0x30000aaa);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* set CKB LDO to 1.4V */</div><div class='add'>+	ret = mt76_wmac_spi_write(dev, adie, 0xa84, 0x8470008a);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* turn on SX0 LTBUF */</div><div class='add'>+	if (is_mt7981(&amp;dev-&gt;mt76)) {</div><div class='add'>+		ret = mt76_wmac_spi_write(dev, adie, 0x074, 0x00000007);</div><div class='add'>+	} else if (is_mt7986(&amp;dev-&gt;mt76)) {</div><div class='add'>+		ret = mt76_wmac_spi_write(dev, adie, 0x074, 0x00000002);</div><div class='add'>+	} else {</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* CK_BUF_SW_EN = 1 (all buf in manual mode.) */</div><div class='add'>+	ret = mt76_wmac_spi_write(dev, adie, 0xaa4, 0x01001fc0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* BT mode/WF normal mode 00000005 */</div><div class='add'>+	ret = mt76_wmac_spi_write(dev, adie, 0x070, 0x00000005);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* BG thermal sensor offset update */</div><div class='add'>+	ret = mt76_wmac_spi_write(dev, adie, 0x344, 0x00000088);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_wmac_spi_write(dev, adie, 0x374, 0x00000088);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_wmac_spi_write(dev, adie, 0x3a4, 0x00000088);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_wmac_spi_write(dev, adie, 0x3d4, 0x00000088);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* set WCON VDD IPTAT to "0000" */</div><div class='add'>+	ret = mt76_wmac_spi_write(dev, adie, 0xa80, 0x44d07000);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* change back LTBUF SX3 drving to default value */</div><div class='add'>+	ret = mt76_wmac_spi_write(dev, adie, 0xa88, 0x3900aaaa);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* SM input cap off */</div><div class='add'>+	ret = mt76_wmac_spi_write(dev, adie, 0x2c4, 0x00000000);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* set CKB driving and filter */</div><div class='add'>+	if (is_mt7986(&amp;dev-&gt;mt76))</div><div class='add'>+		return mt76_wmac_spi_write(dev, adie, 0x2c8, 0x00000072);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7986_wmac_adie_cfg(struct mt7915_dev *dev, u8 adie, u32 adie_type)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mt76_wmac_spi_lock(dev);</div><div class='add'>+	ret = mt76_wmac_spi_write(dev, adie, MT_ADIE_CLK_EN, ~0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (is_7975(dev, adie, adie_type)) {</div><div class='add'>+		ret = mt76_wmac_spi_rmw(dev, adie, MT_ADIE_7975_COCLK,</div><div class='add'>+					BIT(1), 0x1);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		ret = mt7986_wmac_adie_thermal_cal(dev, adie);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		ret = mt7986_wmac_adie_xtal_trim_7975(dev, adie);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		ret = mt7986_wmac_adie_patch_7975(dev, adie);</div><div class='add'>+	} else if (is_7976(dev, adie, adie_type)) {</div><div class='add'>+		if (mt798x_wmac_check_adie_type(dev) == ADIE_DBDC) {</div><div class='add'>+			ret = mt76_wmac_spi_write(dev, adie,</div><div class='add'>+						  MT_ADIE_WRI_CK_SEL, 0x1c);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = mt7986_wmac_adie_thermal_cal(dev, adie);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		ret = mt7986_wmac_adie_xtal_trim_7976(dev, adie);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		ret = mt798x_wmac_adie_patch_7976(dev, adie);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	mt76_wmac_spi_unlock(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7986_wmac_afe_cal(struct mt7915_dev *dev, u8 adie, bool dbdc, u32 adie_type)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 idx;</div><div class='add'>+	u32 txcal;</div><div class='add'>+</div><div class='add'>+	mt76_wmac_spi_lock(dev);</div><div class='add'>+	if (is_7975(dev, adie, adie_type))</div><div class='add'>+		ret = mt76_wmac_spi_write(dev, adie,</div><div class='add'>+					  MT_AFE_RG_ENCAL_WBTAC_IF_SW,</div><div class='add'>+					  0x80000000);</div><div class='add'>+	else</div><div class='add'>+		ret = mt76_wmac_spi_write(dev, adie,</div><div class='add'>+					  MT_AFE_RG_ENCAL_WBTAC_IF_SW,</div><div class='add'>+					  0x88888005);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	idx = dbdc ? ADIE_DBDC : adie;</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_AFE_DIG_EN_01(idx),</div><div class='add'>+		       MT_AFE_RG_WBG_EN_RCK_MASK, 0x1);</div><div class='add'>+	usleep_range(60, 100);</div><div class='add'>+</div><div class='add'>+	mt76_rmw(dev, MT_AFE_DIG_EN_01(idx),</div><div class='add'>+		 MT_AFE_RG_WBG_EN_RCK_MASK, 0x0);</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_AFE_DIG_EN_03(idx),</div><div class='add'>+		       MT_AFE_RG_WBG_EN_BPLL_UP_MASK, 0x1);</div><div class='add'>+	usleep_range(30, 100);</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_AFE_DIG_EN_03(idx),</div><div class='add'>+		       MT_AFE_RG_WBG_EN_WPLL_UP_MASK, 0x1);</div><div class='add'>+	usleep_range(60, 100);</div><div class='add'>+</div><div class='add'>+	txcal = (MT_AFE_RG_WBG_EN_TXCAL_BT |</div><div class='add'>+		      MT_AFE_RG_WBG_EN_TXCAL_WF0 |</div><div class='add'>+		      MT_AFE_RG_WBG_EN_TXCAL_WF1 |</div><div class='add'>+		      MT_AFE_RG_WBG_EN_TXCAL_WF2 |</div><div class='add'>+		      MT_AFE_RG_WBG_EN_TXCAL_WF3);</div><div class='add'>+	if (is_mt7981(&amp;dev-&gt;mt76))</div><div class='add'>+		txcal |= MT_AFE_RG_WBG_EN_TXCAL_WF4;</div><div class='add'>+</div><div class='add'>+	mt76_set(dev, MT_AFE_DIG_EN_01(idx), txcal);</div><div class='add'>+	usleep_range(800, 1000);</div><div class='add'>+</div><div class='add'>+	mt76_clear(dev, MT_AFE_DIG_EN_01(idx), txcal);</div><div class='add'>+	mt76_rmw(dev, MT_AFE_DIG_EN_03(idx),</div><div class='add'>+		 MT_AFE_RG_WBG_EN_PLL_UP_MASK, 0x0);</div><div class='add'>+</div><div class='add'>+	ret = mt76_wmac_spi_write(dev, adie, MT_AFE_RG_ENCAL_WBTAC_IF_SW,</div><div class='add'>+				  0x5);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mt76_wmac_spi_unlock(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7986_wmac_subsys_pll_initial(struct mt7915_dev *dev, u8 band)</div><div class='add'>+{</div><div class='add'>+	mt76_rmw(dev, MT_AFE_PLL_STB_TIME(band),</div><div class='add'>+		 MT_AFE_PLL_STB_TIME_MASK, MT_AFE_PLL_STB_TIME_VAL);</div><div class='add'>+</div><div class='add'>+	mt76_rmw(dev, MT_AFE_DIG_EN_02(band),</div><div class='add'>+		 MT_AFE_PLL_CFG_MASK, MT_AFE_PLL_CFG_VAL);</div><div class='add'>+</div><div class='add'>+	mt76_rmw(dev, MT_AFE_DIG_TOP_01(band),</div><div class='add'>+		 MT_AFE_DIG_TOP_01_MASK, MT_AFE_DIG_TOP_01_VAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7986_wmac_subsys_setting(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	/* Subsys pll init */</div><div class='add'>+	mt7986_wmac_subsys_pll_initial(dev, 0);</div><div class='add'>+	mt7986_wmac_subsys_pll_initial(dev, 1);</div><div class='add'>+</div><div class='add'>+	/* Set legacy OSC control stable time*/</div><div class='add'>+	mt76_rmw(dev, MT_CONN_INFRA_OSC_RC_EN,</div><div class='add'>+		 MT_CONN_INFRA_OSC_RC_EN_MASK, 0x0);</div><div class='add'>+	mt76_rmw(dev, MT_CONN_INFRA_OSC_CTRL,</div><div class='add'>+		 MT_CONN_INFRA_OSC_STB_TIME_MASK, 0x80706);</div><div class='add'>+</div><div class='add'>+	/* prevent subsys from power on/of in a short time interval */</div><div class='add'>+	mt76_rmw(dev, MT_TOP_WFSYS_PWR,</div><div class='add'>+		 MT_TOP_PWR_ACK_MASK | MT_TOP_PWR_KEY_MASK,</div><div class='add'>+		 MT_TOP_PWR_KEY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7986_wmac_bus_timeout(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	mt76_rmw_field(dev, MT_INFRA_BUS_OFF_TIMEOUT,</div><div class='add'>+		       MT_INFRA_BUS_TIMEOUT_LIMIT_MASK, 0x2);</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_INFRA_BUS_OFF_TIMEOUT,</div><div class='add'>+		       MT_INFRA_BUS_TIMEOUT_EN_MASK, 0xf);</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_INFRA_BUS_ON_TIMEOUT,</div><div class='add'>+		       MT_INFRA_BUS_TIMEOUT_LIMIT_MASK, 0xc);</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_INFRA_BUS_ON_TIMEOUT,</div><div class='add'>+		       MT_INFRA_BUS_TIMEOUT_EN_MASK, 0xf);</div><div class='add'>+</div><div class='add'>+	return mt798x_wmac_coninfra_check(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7986_wmac_clock_enable(struct mt7915_dev *dev, u32 adie_type)</div><div class='add'>+{</div><div class='add'>+	u32 cur;</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_INFRA_CKGEN_BUS_WPLL_DIV_1,</div><div class='add'>+		       MT_INFRA_CKGEN_DIV_SEL_MASK, 0x1);</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_INFRA_CKGEN_BUS_WPLL_DIV_2,</div><div class='add'>+		       MT_INFRA_CKGEN_DIV_SEL_MASK, 0x1);</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_INFRA_CKGEN_BUS_WPLL_DIV_1,</div><div class='add'>+		       MT_INFRA_CKGEN_DIV_EN_MASK, 0x1);</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_INFRA_CKGEN_BUS_WPLL_DIV_2,</div><div class='add'>+		       MT_INFRA_CKGEN_DIV_EN_MASK, 0x1);</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_INFRA_CKGEN_RFSPI_WPLL_DIV,</div><div class='add'>+		       MT_INFRA_CKGEN_DIV_SEL_MASK, 0x8);</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_INFRA_CKGEN_RFSPI_WPLL_DIV,</div><div class='add'>+		       MT_INFRA_CKGEN_DIV_EN_MASK, 0x1);</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_INFRA_CKGEN_BUS,</div><div class='add'>+		       MT_INFRA_CKGEN_BUS_CLK_SEL_MASK, 0x0);</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_CONN_INFRA_HW_CTRL,</div><div class='add'>+		       MT_CONN_INFRA_HW_CTRL_MASK, 0x1);</div><div class='add'>+</div><div class='add'>+	mt76_rmw(dev, MT_TOP_CONN_INFRA_WAKEUP,</div><div class='add'>+		 MT_TOP_CONN_INFRA_WAKEUP_MASK, 0x1);</div><div class='add'>+</div><div class='add'>+	usleep_range(900, 1000);</div><div class='add'>+</div><div class='add'>+	mt76_wmac_spi_lock(dev);</div><div class='add'>+	if (is_7975(dev, 0, adie_type) || is_7976(dev, 0, adie_type)) {</div><div class='add'>+		mt76_rmw_field(dev, MT_ADIE_SLP_CTRL_CK0(0),</div><div class='add'>+			       MT_SLP_CTRL_EN_MASK, 0x1);</div><div class='add'>+</div><div class='add'>+		read_poll_timeout(mt76_rr, cur, !(cur &amp; MT_SLP_CTRL_BSY_MASK),</div><div class='add'>+				  USEC_PER_MSEC, 50 * USEC_PER_MSEC, false,</div><div class='add'>+				  dev, MT_ADIE_SLP_CTRL_CK0(0));</div><div class='add'>+	}</div><div class='add'>+	if (is_7975(dev, 1, adie_type) || is_7976(dev, 1, adie_type)) {</div><div class='add'>+		mt76_rmw_field(dev, MT_ADIE_SLP_CTRL_CK0(1),</div><div class='add'>+			       MT_SLP_CTRL_EN_MASK, 0x1);</div><div class='add'>+</div><div class='add'>+		read_poll_timeout(mt76_rr, cur, !(cur &amp; MT_SLP_CTRL_BSY_MASK),</div><div class='add'>+				  USEC_PER_MSEC, 50 * USEC_PER_MSEC, false,</div><div class='add'>+				  dev, MT_ADIE_SLP_CTRL_CK0(0));</div><div class='add'>+	}</div><div class='add'>+	mt76_wmac_spi_unlock(dev);</div><div class='add'>+</div><div class='add'>+	mt76_rmw(dev, MT_TOP_CONN_INFRA_WAKEUP,</div><div class='add'>+		 MT_TOP_CONN_INFRA_WAKEUP_MASK, 0x0);</div><div class='add'>+	usleep_range(900, 1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7986_wmac_top_wfsys_wakeup(struct mt7915_dev *dev, bool enable)</div><div class='add'>+{</div><div class='add'>+	mt76_rmw_field(dev, MT_TOP_WFSYS_WAKEUP,</div><div class='add'>+		       MT_TOP_WFSYS_WAKEUP_MASK, enable);</div><div class='add'>+</div><div class='add'>+	usleep_range(900, 1000);</div><div class='add'>+</div><div class='add'>+	if (!enable)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return mt798x_wmac_coninfra_check(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7986_wmac_wm_enable(struct mt7915_dev *dev, bool enable)</div><div class='add'>+{</div><div class='add'>+	u32 cur;</div><div class='add'>+</div><div class='add'>+	if (is_mt7986(&amp;dev-&gt;mt76))</div><div class='add'>+		mt76_wr(dev, MT_CONNINFRA_SKU_DEC_ADDR, 0);</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT7986_TOP_WM_RESET,</div><div class='add'>+		       MT7986_TOP_WM_RESET_MASK, enable);</div><div class='add'>+	if (!enable)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return read_poll_timeout(mt76_rr, cur, (cur == 0x1d1e),</div><div class='add'>+				 USEC_PER_MSEC, 5000 * USEC_PER_MSEC, false,</div><div class='add'>+				 dev, MT_TOP_CFG_ON_ROM_IDX);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7986_wmac_wfsys_poweron(struct mt7915_dev *dev, bool enable)</div><div class='add'>+{</div><div class='add'>+	u32 mask = MT_TOP_PWR_EN_MASK | MT_TOP_PWR_KEY_MASK;</div><div class='add'>+	u32 cur;</div><div class='add'>+</div><div class='add'>+	mt76_rmw(dev, MT_TOP_WFSYS_PWR, mask,</div><div class='add'>+		 MT_TOP_PWR_KEY | FIELD_PREP(MT_TOP_PWR_EN_MASK, enable));</div><div class='add'>+</div><div class='add'>+	return read_poll_timeout(mt76_rr, cur,</div><div class='add'>+		(FIELD_GET(MT_TOP_WFSYS_RESET_STATUS_MASK, cur) == enable),</div><div class='add'>+		USEC_PER_MSEC, 50 * USEC_PER_MSEC, false,</div><div class='add'>+		dev, MT_TOP_WFSYS_RESET_STATUS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7986_wmac_wfsys_setting(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 cur;</div><div class='add'>+</div><div class='add'>+	/* Turn off wfsys2conn bus sleep protect */</div><div class='add'>+	mt76_rmw(dev, MT_CONN_INFRA_WF_SLP_PROT,</div><div class='add'>+		 MT_CONN_INFRA_WF_SLP_PROT_MASK, 0x0);</div><div class='add'>+</div><div class='add'>+	ret = mt7986_wmac_wfsys_poweron(dev, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Check bus sleep protect */</div><div class='add'>+</div><div class='add'>+	ret = read_poll_timeout(mt76_rr, cur,</div><div class='add'>+				!(cur &amp; MT_CONN_INFRA_CONN_WF_MASK),</div><div class='add'>+				USEC_PER_MSEC, 50 * USEC_PER_MSEC, false,</div><div class='add'>+				dev, MT_CONN_INFRA_WF_SLP_PROT_RDY);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = read_poll_timeout(mt76_rr, cur, !(cur &amp; MT_SLP_WFDMA2CONN_MASK),</div><div class='add'>+				USEC_PER_MSEC, 50 * USEC_PER_MSEC, false,</div><div class='add'>+				dev, MT_SLP_STATUS);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return read_poll_timeout(mt76_rr, cur, (cur == 0x02060000),</div><div class='add'>+				 USEC_PER_MSEC, 50 * USEC_PER_MSEC, false,</div><div class='add'>+				 dev, MT_TOP_CFG_IP_VERSION_ADDR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7986_wmac_wfsys_set_timeout(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u32 mask = MT_MCU_BUS_TIMEOUT_SET_MASK |</div><div class='add'>+		   MT_MCU_BUS_TIMEOUT_CG_EN_MASK |</div><div class='add'>+		   MT_MCU_BUS_TIMEOUT_EN_MASK;</div><div class='add'>+	u32 val = FIELD_PREP(MT_MCU_BUS_TIMEOUT_SET_MASK, 1) |</div><div class='add'>+		  FIELD_PREP(MT_MCU_BUS_TIMEOUT_CG_EN_MASK, 1) |</div><div class='add'>+		  FIELD_PREP(MT_MCU_BUS_TIMEOUT_EN_MASK, 1);</div><div class='add'>+</div><div class='add'>+	mt76_rmw(dev, MT_MCU_BUS_TIMEOUT, mask, val);</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_MCU_BUS_REMAP, 0x810f0000);</div><div class='add'>+</div><div class='add'>+	mask = MT_MCU_BUS_DBG_TIMEOUT_SET_MASK |</div><div class='add'>+	       MT_MCU_BUS_DBG_TIMEOUT_CK_EN_MASK |</div><div class='add'>+	       MT_MCU_BUS_DBG_TIMEOUT_EN_MASK;</div><div class='add'>+	val = FIELD_PREP(MT_MCU_BUS_DBG_TIMEOUT_SET_MASK, 0x3aa) |</div><div class='add'>+	      FIELD_PREP(MT_MCU_BUS_DBG_TIMEOUT_CK_EN_MASK, 1) |</div><div class='add'>+	      FIELD_PREP(MT_MCU_BUS_DBG_TIMEOUT_EN_MASK, 1);</div><div class='add'>+</div><div class='add'>+	mt76_rmw(dev, MT_MCU_BUS_DBG_TIMEOUT, mask, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7986_wmac_sku_update(struct mt7915_dev *dev, u32 adie_type)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (is_7976(dev, 0, adie_type) &amp;&amp; is_7976(dev, 1, adie_type))</div><div class='add'>+		val = 0xf;</div><div class='add'>+	else if (is_7975(dev, 0, adie_type) &amp;&amp; is_7975(dev, 1, adie_type))</div><div class='add'>+		val = 0xd;</div><div class='add'>+	else if (is_7976(dev, 0, adie_type))</div><div class='add'>+		val = 0x7;</div><div class='add'>+	else if (is_7975(dev, 1, adie_type))</div><div class='add'>+		val = 0x8;</div><div class='add'>+	else if (is_7976(dev, 1, adie_type))</div><div class='add'>+		val = 0xa;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mt76_wmac_rmw(dev-&gt;sku, MT_TOP_POS_SKU, MT_TOP_POS_SKU_MASK,</div><div class='add'>+		      FIELD_PREP(MT_TOP_POS_SKU_MASK, val));</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_CONNINFRA_SKU_DEC_ADDR, val);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7986_wmac_adie_setup(struct mt7915_dev *dev, u8 adie, u32 adie_type)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!(is_7975(dev, adie, adie_type) || is_7976(dev, adie, adie_type)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = mt7986_wmac_adie_cfg(dev, adie, adie_type);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7986_wmac_afe_cal(dev, adie, false, adie_type);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!adie &amp;&amp; (mt798x_wmac_check_adie_type(dev) == ADIE_DBDC))</div><div class='add'>+		ret = mt7986_wmac_afe_cal(dev, adie, true, adie_type);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7986_wmac_subsys_powerup(struct mt7915_dev *dev, u32 adie_type)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mt7986_wmac_subsys_setting(dev);</div><div class='add'>+</div><div class='add'>+	ret = mt7986_wmac_bus_timeout(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mt7986_wmac_clock_enable(dev, adie_type);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7986_wmac_wfsys_powerup(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7986_wmac_wm_enable(dev, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7986_wmac_wfsys_setting(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mt7986_wmac_wfsys_set_timeout(dev);</div><div class='add'>+</div><div class='add'>+	return mt7986_wmac_wm_enable(dev, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7986_wmac_enable(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 adie_type;</div><div class='add'>+</div><div class='add'>+	ret = mt7986_wmac_consys_reset(dev, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7986_wmac_gpio_setup(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7986_wmac_consys_lockup(dev, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt798x_wmac_coninfra_check(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt798x_wmac_coninfra_setup(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt798x_wmac_sku_setup(dev, &amp;adie_type);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7986_wmac_adie_setup(dev, 0, adie_type);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* mt7981 doesn't support a second a-die */</div><div class='add'>+	if (is_mt7986(&amp;dev-&gt;mt76)) {</div><div class='add'>+		ret = mt7986_wmac_adie_setup(dev, 1, adie_type);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt7986_wmac_subsys_powerup(dev, adie_type);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7986_wmac_top_wfsys_wakeup(dev, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7986_wmac_wfsys_powerup(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return mt7986_wmac_sku_update(dev, adie_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7986_wmac_disable(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u32 cur;</div><div class='add'>+</div><div class='add'>+	mt7986_wmac_top_wfsys_wakeup(dev, true);</div><div class='add'>+</div><div class='add'>+	/* Turn on wfsys2conn bus sleep protect */</div><div class='add'>+	mt76_rmw_field(dev, MT_CONN_INFRA_WF_SLP_PROT,</div><div class='add'>+		       MT_CONN_INFRA_WF_SLP_PROT_MASK, 0x1);</div><div class='add'>+</div><div class='add'>+	/* Check wfsys2conn bus sleep protect */</div><div class='add'>+	read_poll_timeout(mt76_rr, cur, !(cur ^ MT_CONN_INFRA_CONN),</div><div class='add'>+			  USEC_PER_MSEC, 50 * USEC_PER_MSEC, false,</div><div class='add'>+			  dev, MT_CONN_INFRA_WF_SLP_PROT_RDY);</div><div class='add'>+</div><div class='add'>+	mt7986_wmac_wfsys_poweron(dev, false);</div><div class='add'>+</div><div class='add'>+	/* Turn back wpll setting */</div><div class='add'>+	mt76_rmw_field(dev, MT_AFE_DIG_EN_02(0), MT_AFE_MCU_BPLL_CFG_MASK, 0x2);</div><div class='add'>+	mt76_rmw_field(dev, MT_AFE_DIG_EN_02(0), MT_AFE_WPLL_CFG_MASK, 0x2);</div><div class='add'>+</div><div class='add'>+	/* Reset EMI */</div><div class='add'>+	mt76_rmw_field(dev, MT_CONN_INFRA_EMI_REQ,</div><div class='add'>+		       MT_CONN_INFRA_EMI_REQ_MASK, 0x1);</div><div class='add'>+	mt76_rmw_field(dev, MT_CONN_INFRA_EMI_REQ,</div><div class='add'>+		       MT_CONN_INFRA_EMI_REQ_MASK, 0x0);</div><div class='add'>+	mt76_rmw_field(dev, MT_CONN_INFRA_EMI_REQ,</div><div class='add'>+		       MT_CONN_INFRA_INFRA_REQ_MASK, 0x1);</div><div class='add'>+	mt76_rmw_field(dev, MT_CONN_INFRA_EMI_REQ,</div><div class='add'>+		       MT_CONN_INFRA_INFRA_REQ_MASK, 0x0);</div><div class='add'>+</div><div class='add'>+	mt7986_wmac_top_wfsys_wakeup(dev, false);</div><div class='add'>+	mt7986_wmac_consys_lockup(dev, true);</div><div class='add'>+	mt7986_wmac_consys_reset(dev, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt798x_wmac_init(struct mt7915_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct device *pdev = dev-&gt;mt76.dev;</div><div class='add'>+	struct platform_device *pfdev = to_platform_device(pdev);</div><div class='add'>+	struct clk *mcu_clk, *ap_conn_clk;</div><div class='add'>+</div><div class='add'>+	mcu_clk = devm_clk_get(pdev, "mcu");</div><div class='add'>+	if (IS_ERR(mcu_clk))</div><div class='add'>+		dev_err(pdev, "mcu clock not found\n");</div><div class='add'>+	else if (clk_prepare_enable(mcu_clk))</div><div class='add'>+		dev_err(pdev, "mcu clock configuration failed\n");</div><div class='add'>+</div><div class='add'>+	ap_conn_clk = devm_clk_get(pdev, "ap2conn");</div><div class='add'>+	if (IS_ERR(ap_conn_clk))</div><div class='add'>+		dev_err(pdev, "ap2conn clock not found\n");</div><div class='add'>+	else if (clk_prepare_enable(ap_conn_clk))</div><div class='add'>+		dev_err(pdev, "ap2conn clock configuration failed\n");</div><div class='add'>+</div><div class='add'>+	dev-&gt;dcm = devm_platform_ioremap_resource(pfdev, 1);</div><div class='add'>+	if (IS_ERR(dev-&gt;dcm))</div><div class='add'>+		return PTR_ERR(dev-&gt;dcm);</div><div class='add'>+</div><div class='add'>+	dev-&gt;sku = devm_platform_ioremap_resource(pfdev, 2);</div><div class='add'>+	if (IS_ERR(dev-&gt;sku))</div><div class='add'>+		return PTR_ERR(dev-&gt;sku);</div><div class='add'>+</div><div class='add'>+	dev-&gt;rstc = devm_reset_control_get(pdev, "consys");</div><div class='add'>+	return PTR_ERR_OR_ZERO(dev-&gt;rstc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt798x_wmac_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	void __iomem *mem_base;</div><div class='add'>+	struct mt7915_dev *dev;</div><div class='add'>+	struct mt76_dev *mdev;</div><div class='add'>+	int irq, ret;</div><div class='add'>+	u32 chip_id;</div><div class='add'>+</div><div class='add'>+	chip_id = (uintptr_t)of_device_get_match_data(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	mem_base = devm_platform_ioremap_resource(pdev, 0);</div><div class='add'>+	if (IS_ERR(mem_base)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to get memory resource\n");</div><div class='add'>+		return PTR_ERR(mem_base);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev = mt7915_mmio_probe(&amp;pdev-&gt;dev, mem_base, chip_id);</div><div class='add'>+	if (IS_ERR(dev))</div><div class='add'>+		return PTR_ERR(dev);</div><div class='add'>+</div><div class='add'>+	mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	ret = mt7915_mmio_wed_init(dev, pdev, false, &amp;irq);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto free_device;</div><div class='add'>+</div><div class='add'>+	if (!ret) {</div><div class='add'>+		irq = platform_get_irq(pdev, 0);</div><div class='add'>+		if (irq &lt; 0) {</div><div class='add'>+			ret = irq;</div><div class='add'>+			goto free_device;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = devm_request_irq(mdev-&gt;dev, irq, mt7915_irq_handler,</div><div class='add'>+			       IRQF_SHARED, KBUILD_MODNAME, dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free_device;</div><div class='add'>+</div><div class='add'>+	ret = mt798x_wmac_init(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free_irq;</div><div class='add'>+</div><div class='add'>+	mt7915_wfsys_reset(dev);</div><div class='add'>+</div><div class='add'>+	ret = mt7915_register_device(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free_irq;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_irq:</div><div class='add'>+	devm_free_irq(mdev-&gt;dev, irq, dev);</div><div class='add'>+free_device:</div><div class='add'>+	if (mtk_wed_device_active(&amp;mdev-&gt;mmio.wed))</div><div class='add'>+		mtk_wed_device_detach(&amp;mdev-&gt;mmio.wed);</div><div class='add'>+	mt76_free_device(mdev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt798x_wmac_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	mt7915_unregister_device(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id mt798x_wmac_of_match[] = {</div><div class='add'>+	{ .compatible = "mediatek,mt7981-wmac", .data = (u32 *)0x7981 },</div><div class='add'>+	{ .compatible = "mediatek,mt7986-wmac", .data = (u32 *)0x7986 },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(of, mt798x_wmac_of_match);</div><div class='add'>+</div><div class='add'>+struct platform_driver mt798x_wmac_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "mt798x-wmac",</div><div class='add'>+		.of_match_table = mt798x_wmac_of_match,</div><div class='add'>+	},</div><div class='add'>+	.probe = mt798x_wmac_probe,</div><div class='add'>+	.remove = mt798x_wmac_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_FIRMWARE(MT7986_FIRMWARE_WA);</div><div class='add'>+MODULE_FIRMWARE(MT7986_FIRMWARE_WM);</div><div class='add'>+MODULE_FIRMWARE(MT7986_FIRMWARE_WM_MT7975);</div><div class='add'>+MODULE_FIRMWARE(MT7986_ROM_PATCH);</div><div class='add'>+MODULE_FIRMWARE(MT7986_ROM_PATCH_MT7975);</div><div class='add'>+</div><div class='add'>+MODULE_FIRMWARE(MT7981_FIRMWARE_WA);</div><div class='add'>+MODULE_FIRMWARE(MT7981_FIRMWARE_WM);</div><div class='add'>+MODULE_FIRMWARE(MT7981_ROM_PATCH);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c b/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c<br/>index f9d81e36ef09..618a5c2bdd29 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/testmode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7915/testmode.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #include "mt7915.h"</div><div class='hunk'>@@ -23,30 +23,16 @@ struct reg_band {</div><div class='ctx'> 	u32 band[2];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define REG_BAND(_reg) \</div><div class='del'>-	{ .band[0] = MT_##_reg(0), .band[1] = MT_##_reg(1) }</div><div class='del'>-#define REG_BAND_IDX(_reg, _idx) \</div><div class='del'>-	{ .band[0] = MT_##_reg(0, _idx), .band[1] = MT_##_reg(1, _idx) }</div><div class='del'>-</div><div class='del'>-static const struct reg_band reg_backup_list[] = {</div><div class='del'>-	REG_BAND_IDX(AGG_PCR0, 0),</div><div class='del'>-	REG_BAND_IDX(AGG_PCR0, 1),</div><div class='del'>-	REG_BAND_IDX(AGG_AWSCR0, 0),</div><div class='del'>-	REG_BAND_IDX(AGG_AWSCR0, 1),</div><div class='del'>-	REG_BAND_IDX(AGG_AWSCR0, 2),</div><div class='del'>-	REG_BAND_IDX(AGG_AWSCR0, 3),</div><div class='del'>-	REG_BAND(AGG_MRCR),</div><div class='del'>-	REG_BAND(TMAC_TFCR0),</div><div class='del'>-	REG_BAND(TMAC_TCR0),</div><div class='del'>-	REG_BAND(AGG_ATCR1),</div><div class='del'>-	REG_BAND(AGG_ATCR3),</div><div class='del'>-	REG_BAND(TMAC_TRCR0),</div><div class='del'>-	REG_BAND(TMAC_ICR0),</div><div class='del'>-	REG_BAND_IDX(ARB_DRNGR0, 0),</div><div class='del'>-	REG_BAND_IDX(ARB_DRNGR0, 1),</div><div class='del'>-	REG_BAND(WF_RFCR),</div><div class='del'>-	REG_BAND(WF_RFCR1),</div><div class='del'>-};</div><div class='add'>+#define REG_BAND(_list, _reg) \</div><div class='add'>+		{ _list.band[0] = MT_##_reg(0);	\</div><div class='add'>+		  _list.band[1] = MT_##_reg(1); }</div><div class='add'>+#define REG_BAND_IDX(_list, _reg, _idx) \</div><div class='add'>+		{ _list.band[0] = MT_##_reg(0, _idx);	\</div><div class='add'>+		  _list.band[1] = MT_##_reg(1, _idx); }</div><div class='add'>+</div><div class='add'>+#define TM_REG_MAX_ID	17</div><div class='add'>+static struct reg_band reg_backup_list[TM_REG_MAX_ID];</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> mt7915_tm_set_tx_power(struct mt7915_phy *phy)</div><div class='hunk'>@@ -58,14 +44,14 @@ mt7915_tm_set_tx_power(struct mt7915_phy *phy)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u8 format_id;</div><div class='del'>-		u8 dbdc_idx;</div><div class='add'>+		u8 band_idx;</div><div class='ctx'> 		s8 tx_power;</div><div class='ctx'> 		u8 ant_idx;	/* Only 0 is valid */</div><div class='ctx'> 		u8 center_chan;</div><div class='ctx'> 		u8 rsv[3];</div><div class='ctx'> 	} __packed req = {</div><div class='ctx'> 		.format_id = 0xf,</div><div class='del'>-		.dbdc_idx = phy != &amp;dev-&gt;phy,</div><div class='add'>+		.band_idx = phy-&gt;mt76-&gt;band_idx,</div><div class='ctx'> 		.center_chan = ieee80211_frequency_to_channel(freq),</div><div class='ctx'> 	};</div><div class='ctx'> 	u8 *tx_power = NULL;</div><div class='hunk'>@@ -91,7 +77,7 @@ mt7915_tm_set_freq_offset(struct mt7915_phy *phy, bool en, u32 val)</div><div class='ctx'> 	struct mt7915_tm_cmd req = {</div><div class='ctx'> 		.testmode_en = en,</div><div class='ctx'> 		.param_idx = MCU_ATE_SET_FREQ_OFFSET,</div><div class='del'>-		.param.freq.band = phy != &amp;dev-&gt;phy,</div><div class='add'>+		.param.freq.band = phy-&gt;mt76-&gt;band_idx,</div><div class='ctx'> 		.param.freq.freq_offset = cpu_to_le32(val),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -125,7 +111,7 @@ mt7915_tm_set_trx(struct mt7915_phy *phy, int type, bool en)</div><div class='ctx'> 		.param_idx = MCU_ATE_SET_TRX,</div><div class='ctx'> 		.param.trx.type = type,</div><div class='ctx'> 		.param.trx.enable = en,</div><div class='del'>-		.param.trx.band = phy != &amp;dev-&gt;phy,</div><div class='add'>+		.param.trx.band = phy-&gt;mt76-&gt;band_idx,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(ATE_CTRL), &amp;req,</div><div class='hunk'>@@ -140,7 +126,7 @@ mt7915_tm_clean_hwq(struct mt7915_phy *phy, u8 wcid)</div><div class='ctx'> 		.testmode_en = 1,</div><div class='ctx'> 		.param_idx = MCU_ATE_CLEAN_TXQUEUE,</div><div class='ctx'> 		.param.clean.wcid = wcid,</div><div class='del'>-		.param.clean.band = phy != &amp;dev-&gt;phy,</div><div class='add'>+		.param.clean.band = phy-&gt;mt76-&gt;band_idx,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(ATE_CTRL), &amp;req,</div><div class='hunk'>@@ -158,7 +144,7 @@ mt7915_tm_set_slot_time(struct mt7915_phy *phy, u8 slot_time, u8 sifs)</div><div class='ctx'> 		.param.slot.sifs = sifs,</div><div class='ctx'> 		.param.slot.rifs = 2,</div><div class='ctx'> 		.param.slot.eifs = cpu_to_le16(60),</div><div class='del'>-		.param.slot.band = phy != &amp;dev-&gt;phy,</div><div class='add'>+		.param.slot.band = phy-&gt;mt76-&gt;band_idx,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(ATE_CTRL), &amp;req,</div><div class='hunk'>@@ -166,13 +152,30 @@ mt7915_tm_set_slot_time(struct mt7915_phy *phy, u8 slot_time, u8 sifs)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt7915_tm_set_wmm_qid(struct mt7915_dev *dev, u8 qid, u8 aifs, u8 cw_min,</div><div class='add'>+mt7915_tm_set_tam_arb(struct mt7915_phy *phy, bool enable, bool mu)</div><div class='add'>+{</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	u32 op_mode;</div><div class='add'>+</div><div class='add'>+	if (!enable)</div><div class='add'>+		op_mode = TAM_ARB_OP_MODE_NORMAL;</div><div class='add'>+	else if (mu)</div><div class='add'>+		op_mode = TAM_ARB_OP_MODE_TEST;</div><div class='add'>+	else</div><div class='add'>+		op_mode = TAM_ARB_OP_MODE_FORCE_SU;</div><div class='add'>+</div><div class='add'>+	return mt7915_mcu_set_muru_ctrl(dev, MURU_SET_ARB_OP_MODE, op_mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7915_tm_set_wmm_qid(struct mt7915_phy *phy, u8 qid, u8 aifs, u8 cw_min,</div><div class='ctx'> 		      u16 cw_max, u16 txop)</div><div class='ctx'> {</div><div class='add'>+	struct mt7915_vif *mvif = (struct mt7915_vif *)phy-&gt;monitor_vif-&gt;drv_priv;</div><div class='ctx'> 	struct mt7915_mcu_tx req = { .total = 1 };</div><div class='ctx'> 	struct edca *e = &amp;req.edca[0];</div><div class='ctx'> </div><div class='del'>-	e-&gt;queue = qid;</div><div class='add'>+	e-&gt;queue = qid + mvif-&gt;mt76.wmm_idx * MT76_CONNAC_MAX_WMM_SETS;</div><div class='ctx'> 	e-&gt;set = WMM_PARAM_SET;</div><div class='ctx'> </div><div class='ctx'> 	e-&gt;aifs = aifs;</div><div class='hunk'>@@ -180,7 +183,7 @@ mt7915_tm_set_wmm_qid(struct mt7915_dev *dev, u8 qid, u8 aifs, u8 cw_min,</div><div class='ctx'> 	e-&gt;cw_max = cpu_to_le16(cw_max);</div><div class='ctx'> 	e-&gt;txop = cpu_to_le16(txop);</div><div class='ctx'> </div><div class='del'>-	return mt7915_mcu_update_edca(dev, &amp;req);</div><div class='add'>+	return mt7915_mcu_update_edca(phy-&gt;dev, &amp;req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -195,8 +198,8 @@ mt7915_tm_set_ipg_params(struct mt7915_phy *phy, u32 ipg, u8 mode)</div><div class='ctx'> 	u8 sig_ext = (mode == MT76_TM_TX_MODE_CCK) ? 0 : 6;</div><div class='ctx'> 	u8 slot_time = 9, sifs = TM_DEFAULT_SIFS;</div><div class='ctx'> 	u8 aifsn = TM_MIN_AIFSN;</div><div class='add'>+	u8 band = phy-&gt;mt76-&gt;band_idx;</div><div class='ctx'> 	u32 i2t_time, tr2t_time, txv_time;</div><div class='del'>-	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='ctx'> 	u16 cw = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ipg &lt; sig_ext + slot_time + sifs)</div><div class='hunk'>@@ -226,29 +229,25 @@ mt7915_tm_set_ipg_params(struct mt7915_phy *phy, u32 ipg, u8 mode)</div><div class='ctx'> </div><div class='ctx'> 		ipg -= aifsn * slot_time;</div><div class='ctx'> </div><div class='del'>-		if (ipg &gt; TM_DEFAULT_SIFS) {</div><div class='del'>-			if (ipg &lt; TM_MAX_SIFS)</div><div class='del'>-				sifs = ipg;</div><div class='del'>-			else</div><div class='del'>-				sifs = TM_MAX_SIFS;</div><div class='del'>-		}</div><div class='add'>+		if (ipg &gt; TM_DEFAULT_SIFS)</div><div class='add'>+			sifs = min_t(u32, ipg, TM_MAX_SIFS);</div><div class='ctx'> 	}</div><div class='ctx'> done:</div><div class='del'>-	txv_time = mt76_get_field(dev, MT_TMAC_ATCR(ext_phy),</div><div class='add'>+	txv_time = mt76_get_field(dev, MT_TMAC_ATCR(band),</div><div class='ctx'> 				  MT_TMAC_ATCR_TXV_TOUT);</div><div class='ctx'> 	txv_time *= 50;	/* normal clock time */</div><div class='ctx'> </div><div class='ctx'> 	i2t_time = (slot_time * 1000 - txv_time - BBP_PROC_TIME) / 50;</div><div class='ctx'> 	tr2t_time = (sifs * 1000 - txv_time - BBP_PROC_TIME) / 50;</div><div class='ctx'> </div><div class='del'>-	mt76_set(dev, MT_TMAC_TRCR0(ext_phy),</div><div class='add'>+	mt76_set(dev, MT_TMAC_TRCR0(band),</div><div class='ctx'> 		 FIELD_PREP(MT_TMAC_TRCR0_TR2T_CHK, tr2t_time) |</div><div class='ctx'> 		 FIELD_PREP(MT_TMAC_TRCR0_I2T_CHK, i2t_time));</div><div class='ctx'> </div><div class='ctx'> 	mt7915_tm_set_slot_time(phy, slot_time, sifs);</div><div class='ctx'> </div><div class='del'>-	return mt7915_tm_set_wmm_qid(dev,</div><div class='del'>-				     mt7915_lmac_mapping(dev, IEEE80211_AC_BE),</div><div class='add'>+	return mt7915_tm_set_wmm_qid(phy,</div><div class='add'>+				     mt76_connac_lmac_mapping(IEEE80211_AC_BE),</div><div class='ctx'> 				     aifsn, cw, cw, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -274,6 +273,8 @@ mt7915_tm_set_tx_len(struct mt7915_phy *phy, u32 tx_time)</div><div class='ctx'> 	case MT76_TM_TX_MODE_OFDM:</div><div class='ctx'> 		if (mphy-&gt;chandef.chan-&gt;band == NL80211_BAND_5GHZ)</div><div class='ctx'> 			sband = &amp;mphy-&gt;sband_5g.sband;</div><div class='add'>+		else if (mphy-&gt;chandef.chan-&gt;band == NL80211_BAND_6GHZ)</div><div class='add'>+			sband = &amp;mphy-&gt;sband_6g.sband;</div><div class='ctx'> 		else</div><div class='ctx'> 			sband = &amp;mphy-&gt;sband_2g.sband;</div><div class='ctx'> </div><div class='hunk'>@@ -335,75 +336,98 @@ mt7915_tm_reg_backup_restore(struct mt7915_phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	int n_regs = ARRAY_SIZE(reg_backup_list);</div><div class='ctx'> 	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='del'>-	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='ctx'> 	u32 *b = phy-&gt;test.reg_backup;</div><div class='add'>+	u8 band = phy-&gt;mt76-&gt;band_idx;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	REG_BAND_IDX(reg_backup_list[0], AGG_PCR0, 0);</div><div class='add'>+	REG_BAND_IDX(reg_backup_list[1], AGG_PCR0, 1);</div><div class='add'>+	REG_BAND_IDX(reg_backup_list[2], AGG_AWSCR0, 0);</div><div class='add'>+	REG_BAND_IDX(reg_backup_list[3], AGG_AWSCR0, 1);</div><div class='add'>+	REG_BAND_IDX(reg_backup_list[4], AGG_AWSCR0, 2);</div><div class='add'>+	REG_BAND_IDX(reg_backup_list[5], AGG_AWSCR0, 3);</div><div class='add'>+	REG_BAND(reg_backup_list[6], AGG_MRCR);</div><div class='add'>+	REG_BAND(reg_backup_list[7], TMAC_TFCR0);</div><div class='add'>+	REG_BAND(reg_backup_list[8], TMAC_TCR0);</div><div class='add'>+	REG_BAND(reg_backup_list[9], AGG_ATCR1);</div><div class='add'>+	REG_BAND(reg_backup_list[10], AGG_ATCR3);</div><div class='add'>+	REG_BAND(reg_backup_list[11], TMAC_TRCR0);</div><div class='add'>+	REG_BAND(reg_backup_list[12], TMAC_ICR0);</div><div class='add'>+	REG_BAND_IDX(reg_backup_list[13], ARB_DRNGR0, 0);</div><div class='add'>+	REG_BAND_IDX(reg_backup_list[14], ARB_DRNGR0, 1);</div><div class='add'>+	REG_BAND(reg_backup_list[15], WF_RFCR);</div><div class='add'>+	REG_BAND(reg_backup_list[16], WF_RFCR1);</div><div class='add'>+</div><div class='ctx'> 	if (phy-&gt;mt76-&gt;test.state == MT76_TM_STATE_OFF) {</div><div class='ctx'> 		for (i = 0; i &lt; n_regs; i++)</div><div class='del'>-			mt76_wr(dev, reg_backup_list[i].band[ext_phy], b[i]);</div><div class='add'>+			mt76_wr(dev, reg_backup_list[i].band[band], b[i]);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (b)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	b = devm_kzalloc(dev-&gt;mt76.dev, 4 * n_regs, GFP_KERNEL);</div><div class='del'>-	if (!b)</div><div class='del'>-		return;</div><div class='add'>+	if (!b) {</div><div class='add'>+		b = devm_kzalloc(dev-&gt;mt76.dev, 4 * n_regs, GFP_KERNEL);</div><div class='add'>+		if (!b)</div><div class='add'>+			return;</div><div class='ctx'> </div><div class='del'>-	phy-&gt;test.reg_backup = b;</div><div class='del'>-	for (i = 0; i &lt; n_regs; i++)</div><div class='del'>-		b[i] = mt76_rr(dev, reg_backup_list[i].band[ext_phy]);</div><div class='add'>+		phy-&gt;test.reg_backup = b;</div><div class='add'>+		for (i = 0; i &lt; n_regs; i++)</div><div class='add'>+			b[i] = mt76_rr(dev, reg_backup_list[i].band[band]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mt76_clear(dev, MT_AGG_PCR0(ext_phy, 0), MT_AGG_PCR0_MM_PROT |</div><div class='add'>+	mt76_clear(dev, MT_AGG_PCR0(band, 0), MT_AGG_PCR0_MM_PROT |</div><div class='ctx'> 		   MT_AGG_PCR0_GF_PROT | MT_AGG_PCR0_ERP_PROT |</div><div class='ctx'> 		   MT_AGG_PCR0_VHT_PROT | MT_AGG_PCR0_BW20_PROT |</div><div class='ctx'> 		   MT_AGG_PCR0_BW40_PROT | MT_AGG_PCR0_BW80_PROT);</div><div class='del'>-	mt76_set(dev, MT_AGG_PCR0(ext_phy, 0), MT_AGG_PCR0_PTA_WIN_DIS);</div><div class='add'>+	mt76_set(dev, MT_AGG_PCR0(band, 0), MT_AGG_PCR0_PTA_WIN_DIS);</div><div class='ctx'> </div><div class='del'>-	mt76_wr(dev, MT_AGG_PCR0(ext_phy, 1), MT_AGG_PCR1_RTS0_NUM_THRES |</div><div class='add'>+	mt76_wr(dev, MT_AGG_PCR0(band, 1), MT_AGG_PCR1_RTS0_NUM_THRES |</div><div class='ctx'> 		MT_AGG_PCR1_RTS0_LEN_THRES);</div><div class='ctx'> </div><div class='del'>-	mt76_clear(dev, MT_AGG_MRCR(ext_phy), MT_AGG_MRCR_BAR_CNT_LIMIT |</div><div class='add'>+	mt76_clear(dev, MT_AGG_MRCR(band), MT_AGG_MRCR_BAR_CNT_LIMIT |</div><div class='ctx'> 		   MT_AGG_MRCR_LAST_RTS_CTS_RN | MT_AGG_MRCR_RTS_FAIL_LIMIT |</div><div class='ctx'> 		   MT_AGG_MRCR_TXCMD_RTS_FAIL_LIMIT);</div><div class='ctx'> </div><div class='del'>-	mt76_rmw(dev, MT_AGG_MRCR(ext_phy), MT_AGG_MRCR_RTS_FAIL_LIMIT |</div><div class='add'>+	mt76_rmw(dev, MT_AGG_MRCR(band), MT_AGG_MRCR_RTS_FAIL_LIMIT |</div><div class='ctx'> 		 MT_AGG_MRCR_TXCMD_RTS_FAIL_LIMIT,</div><div class='ctx'> 		 FIELD_PREP(MT_AGG_MRCR_RTS_FAIL_LIMIT, 1) |</div><div class='ctx'> 		 FIELD_PREP(MT_AGG_MRCR_TXCMD_RTS_FAIL_LIMIT, 1));</div><div class='ctx'> </div><div class='del'>-	mt76_wr(dev, MT_TMAC_TFCR0(ext_phy), 0);</div><div class='del'>-	mt76_clear(dev, MT_TMAC_TCR0(ext_phy), MT_TMAC_TCR0_TBTT_STOP_CTRL);</div><div class='add'>+	mt76_wr(dev, MT_TMAC_TFCR0(band), 0);</div><div class='add'>+	mt76_clear(dev, MT_TMAC_TCR0(band), MT_TMAC_TCR0_TBTT_STOP_CTRL);</div><div class='ctx'> </div><div class='ctx'> 	/* config rx filter for testmode rx */</div><div class='del'>-	mt76_wr(dev, MT_WF_RFCR(ext_phy), 0xcf70a);</div><div class='del'>-	mt76_wr(dev, MT_WF_RFCR1(ext_phy), 0);</div><div class='add'>+	mt76_wr(dev, MT_WF_RFCR(band), 0xcf70a);</div><div class='add'>+	mt76_wr(dev, MT_WF_RFCR1(band), 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mt7915_tm_init(struct mt7915_phy *phy, bool en)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	int state;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(MT76_STATE_RUNNING, &amp;phy-&gt;mt76-&gt;state))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mt7915_mcu_set_sku_en(phy, !en);</div><div class='add'>+	mt7915_mcu_set_sku_en(phy);</div><div class='ctx'> </div><div class='ctx'> 	mt7915_tm_mode_ctrl(dev, en);</div><div class='ctx'> 	mt7915_tm_reg_backup_restore(phy);</div><div class='ctx'> 	mt7915_tm_set_trx(phy, TM_MAC_TXRX, !en);</div><div class='ctx'> </div><div class='ctx'> 	mt7915_mcu_add_bss_info(phy, phy-&gt;monitor_vif, en);</div><div class='add'>+	state = en ? CONN_STATE_PORT_SECURE : CONN_STATE_DISCONNECT;</div><div class='add'>+	mt7915_mcu_add_sta(dev, phy-&gt;monitor_vif, NULL, state, true);</div><div class='add'>+</div><div class='add'>+	if (!en)</div><div class='add'>+		mt7915_tm_set_tam_arb(phy, en, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mt7915_tm_update_channel(struct mt7915_phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_unlock(&amp;phy-&gt;dev-&gt;mt76.mutex);</div><div class='del'>-	mt7915_set_channel(phy);</div><div class='add'>+	mt76_update_channel(phy-&gt;mt76);</div><div class='ctx'> 	mutex_lock(&amp;phy-&gt;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='ctx'> 	mt7915_mcu_set_chan_info(phy, MCU_EXT_CMD(SET_RX_PATH));</div><div class='hunk'>@@ -412,8 +436,6 @@ mt7915_tm_update_channel(struct mt7915_phy *phy)</div><div class='ctx'> static void</div><div class='ctx'> mt7915_tm_set_tx_frames(struct mt7915_phy *phy, bool en)</div><div class='ctx'> {</div><div class='del'>-	static const u8 spe_idx_map[] = {0, 0, 1, 0, 3, 2, 4, 0,</div><div class='del'>-					 9, 8, 6, 10, 16, 12, 18, 0};</div><div class='ctx'> 	struct mt76_testmode_data *td = &amp;phy-&gt;mt76-&gt;test;</div><div class='ctx'> 	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct ieee80211_tx_info *info;</div><div class='hunk'>@@ -427,17 +449,15 @@ mt7915_tm_set_tx_frames(struct mt7915_phy *phy, bool en)</div><div class='ctx'> 	if (en) {</div><div class='ctx'> 		mt7915_tm_update_channel(phy);</div><div class='ctx'> </div><div class='del'>-		if (td-&gt;tx_spe_idx) {</div><div class='add'>+		if (td-&gt;tx_spe_idx)</div><div class='ctx'> 			phy-&gt;test.spe_idx = td-&gt;tx_spe_idx;</div><div class='del'>-		} else {</div><div class='del'>-			u8 tx_ant = td-&gt;tx_antenna_mask;</div><div class='del'>-</div><div class='del'>-			if (phy != &amp;dev-&gt;phy)</div><div class='del'>-				tx_ant &gt;&gt;= 2;</div><div class='del'>-			phy-&gt;test.spe_idx = spe_idx_map[tx_ant];</div><div class='del'>-		}</div><div class='add'>+		else</div><div class='add'>+			phy-&gt;test.spe_idx = mt76_connac_spe_idx(td-&gt;tx_antenna_mask);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mt7915_tm_set_tam_arb(phy, en,</div><div class='add'>+			      td-&gt;tx_rate_mode == MT76_TM_TX_MODE_HE_MU);</div><div class='add'>+</div><div class='ctx'> 	/* if all three params are set, duty_cycle will be ignored */</div><div class='ctx'> 	if (duty_cycle &amp;&amp; tx_time &amp;&amp; !ipg) {</div><div class='ctx'> 		ipg = tx_time * 100 / duty_cycle - tx_time;</div><div class='hunk'>@@ -464,10 +484,17 @@ mt7915_tm_set_tx_frames(struct mt7915_phy *phy, bool en)</div><div class='ctx'> static void</div><div class='ctx'> mt7915_tm_set_rx_frames(struct mt7915_phy *phy, bool en)</div><div class='ctx'> {</div><div class='del'>-	if (en)</div><div class='add'>+	mt7915_tm_set_trx(phy, TM_MAC_RX_RXV, false);</div><div class='add'>+</div><div class='add'>+	if (en) {</div><div class='add'>+		struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+</div><div class='ctx'> 		mt7915_tm_update_channel(phy);</div><div class='ctx'> </div><div class='del'>-	mt7915_tm_set_trx(phy, TM_MAC_RX_RXV, en);</div><div class='add'>+		/* read-clear */</div><div class='add'>+		mt76_rr(dev, MT_MIB_SDR3(phy-&gt;mt76-&gt;band_idx));</div><div class='add'>+		mt7915_tm_set_trx(phy, TM_MAC_RX_RXV, en);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -492,6 +519,7 @@ mt7915_tm_set_tx_cont(struct mt7915_phy *phy, bool en)</div><div class='ctx'> 	struct mt76_testmode_data *td = &amp;phy-&gt;mt76-&gt;test;</div><div class='ctx'> 	u32 func_idx = en ? TX_CONT_START : TX_CONT_STOP;</div><div class='ctx'> 	u8 rate_idx = td-&gt;tx_rate_idx, mode;</div><div class='add'>+	u8 band = phy-&gt;mt76-&gt;band_idx;</div><div class='ctx'> 	u16 rateval;</div><div class='ctx'> 	struct mt7915_tm_rf_test req = {</div><div class='ctx'> 		.action = 1,</div><div class='hunk'>@@ -503,7 +531,7 @@ mt7915_tm_set_tx_cont(struct mt7915_phy *phy, bool en)</div><div class='ctx'> 	tx_cont-&gt;control_ch = chandef-&gt;chan-&gt;hw_value;</div><div class='ctx'> 	tx_cont-&gt;center_ch = freq1;</div><div class='ctx'> 	tx_cont-&gt;tx_ant = td-&gt;tx_antenna_mask;</div><div class='del'>-	tx_cont-&gt;band = phy != &amp;dev-&gt;phy;</div><div class='add'>+	tx_cont-&gt;band = band;</div><div class='ctx'> </div><div class='ctx'> 	switch (chandef-&gt;width) {</div><div class='ctx'> 	case NL80211_CHAN_WIDTH_40:</div><div class='hunk'>@@ -535,7 +563,7 @@ mt7915_tm_set_tx_cont(struct mt7915_phy *phy, bool en)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!en) {</div><div class='del'>-		req.op.rf.param.func_data = cpu_to_le32(phy != &amp;dev-&gt;phy);</div><div class='add'>+		req.op.rf.param.func_data = cpu_to_le32(band);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -545,6 +573,8 @@ mt7915_tm_set_tx_cont(struct mt7915_phy *phy, bool en)</div><div class='ctx'> </div><div class='ctx'> 		if (chandef-&gt;chan-&gt;band == NL80211_BAND_5GHZ)</div><div class='ctx'> 			sband = &amp;phy-&gt;mt76-&gt;sband_5g.sband;</div><div class='add'>+		else if (chandef-&gt;chan-&gt;band == NL80211_BAND_6GHZ)</div><div class='add'>+			sband = &amp;phy-&gt;mt76-&gt;sband_6g.sband;</div><div class='ctx'> 		else</div><div class='ctx'> 			sband = &amp;phy-&gt;mt76-&gt;sband_2g.sband;</div><div class='ctx'> </div><div class='hunk'>@@ -664,7 +694,9 @@ mt7915_tm_set_params(struct mt76_phy *mphy, struct nlattr **tb,</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_testmode_data *td = &amp;mphy-&gt;test;</div><div class='ctx'> 	struct mt7915_phy *phy = mphy-&gt;priv;</div><div class='del'>-	u32 changed = 0;</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	u32 chainmask = mphy-&gt;chainmask, changed = 0;</div><div class='add'>+	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(NUM_TM_CHANGED &gt;= 32);</div><div class='hunk'>@@ -673,7 +705,8 @@ mt7915_tm_set_params(struct mt76_phy *mphy, struct nlattr **tb,</div><div class='ctx'> 	    td-&gt;state == MT76_TM_STATE_OFF)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (td-&gt;tx_antenna_mask &amp; ~mphy-&gt;chainmask)</div><div class='add'>+	chainmask = ext_phy ? chainmask &gt;&gt; dev-&gt;chainshift : chainmask;</div><div class='add'>+	if (td-&gt;tx_antenna_mask &gt; chainmask)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(tm_change_map); i++) {</div><div class='hunk'>@@ -690,8 +723,12 @@ static int</div><div class='ctx'> mt7915_tm_dump_stats(struct mt76_phy *mphy, struct sk_buff *msg)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7915_phy *phy = mphy-&gt;priv;</div><div class='add'>+	struct mt7915_dev *dev = phy-&gt;dev;</div><div class='add'>+	enum mt76_rxq_id q;</div><div class='ctx'> 	void *rx, *rssi;</div><div class='add'>+	u16 fcs_err;</div><div class='ctx'> 	int i;</div><div class='add'>+	u32 cnt;</div><div class='ctx'> </div><div class='ctx'> 	rx = nla_nest_start(msg, MT76_TM_STATS_ATTR_LAST_RX);</div><div class='ctx'> 	if (!rx)</div><div class='hunk'>@@ -735,6 +772,14 @@ mt7915_tm_dump_stats(struct mt76_phy *mphy, struct sk_buff *msg)</div><div class='ctx'> </div><div class='ctx'> 	nla_nest_end(msg, rx);</div><div class='ctx'> </div><div class='add'>+	cnt = mt76_rr(dev, MT_MIB_SDR3(phy-&gt;mt76-&gt;band_idx));</div><div class='add'>+	fcs_err = is_mt7915(&amp;dev-&gt;mt76) ? FIELD_GET(MT_MIB_SDR3_FCS_ERR_MASK, cnt) :</div><div class='add'>+		FIELD_GET(MT_MIB_SDR3_FCS_ERR_MASK_MT7916, cnt);</div><div class='add'>+</div><div class='add'>+	q = phy-&gt;mt76-&gt;band_idx ? MT_RXQ_BAND1 : MT_RXQ_MAIN;</div><div class='add'>+	mphy-&gt;test.rx_stats.packets[q] += fcs_err;</div><div class='add'>+	mphy-&gt;test.rx_stats.fcs_error[q] += fcs_err;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/testmode.h b/drivers/net/wireless/mediatek/mt76/mt7915/testmode.h<br/>index 8f8533ef9859..bb1bc568751b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/testmode.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7915/testmode.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7915/testmode.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7915/testmode.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MT7915_TESTMODE_H</div><div class='hunk'>@@ -96,4 +96,10 @@ enum {</div><div class='ctx'> 	RF_OPER_WIFI_SPECTRUM,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum {</div><div class='add'>+	TAM_ARB_OP_MODE_NORMAL = 1,</div><div class='add'>+	TAM_ARB_OP_MODE_TEST,</div><div class='add'>+	TAM_ARB_OP_MODE_FORCE_SU = 5,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/Kconfig b/drivers/net/wireless/mediatek/mt76/mt7921/Kconfig<br/>index 001f2b9cec26..37b5f46e76f4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/Kconfig?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7921/Kconfig</a></div><div class='hunk'>@@ -1,11 +1,37 @@</div><div class='del'>-# SPDX-License-Identifier: ISC</div><div class='add'>+# SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+config MT7921_COMMON</div><div class='add'>+	tristate</div><div class='add'>+	select MT792x_LIB</div><div class='add'>+	select WANT_DEV_COREDUMP</div><div class='add'>+</div><div class='ctx'> config MT7921E</div><div class='ctx'> 	tristate "MediaTek MT7921E (PCIe) support"</div><div class='del'>-	select MT76_CONNAC_LIB</div><div class='del'>-	select WANT_DEV_COREDUMP</div><div class='add'>+	select MT7921_COMMON</div><div class='ctx'> 	depends on MAC80211</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	help</div><div class='ctx'> 	  This adds support for MT7921E 802.11ax 2x2:2SS wireless devices.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here.</div><div class='add'>+</div><div class='add'>+config MT7921S</div><div class='add'>+	tristate "MediaTek MT7921S (SDIO) support"</div><div class='add'>+	select MT76_SDIO</div><div class='add'>+	select MT7921_COMMON</div><div class='add'>+	depends on MAC80211</div><div class='add'>+	depends on MMC</div><div class='add'>+	help</div><div class='add'>+	  This adds support for MT7921S 802.11ax 2x2:2SS wireless devices.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here.</div><div class='add'>+</div><div class='add'>+config MT7921U</div><div class='add'>+	tristate "MediaTek MT7921U (USB) support"</div><div class='add'>+	select MT792x_USB</div><div class='add'>+	select MT7921_COMMON</div><div class='add'>+	depends on MAC80211</div><div class='add'>+	depends on USB</div><div class='add'>+	help</div><div class='add'>+	  This adds support for MT7921U 802.11ax 2x2:2SS wireless devices.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here.</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/Makefile b/drivers/net/wireless/mediatek/mt76/mt7921/Makefile<br/>index e531666f9fb4..2ad3c1cc3779 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/Makefile?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7921/Makefile</a></div><div class='hunk'>@@ -1,7 +1,12 @@</div><div class='del'>-#SPDX-License-Identifier: ISC</div><div class='add'>+# SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_MT7921_COMMON) += mt7921-common.o</div><div class='ctx'> obj-$(CONFIG_MT7921E) += mt7921e.o</div><div class='add'>+obj-$(CONFIG_MT7921S) += mt7921s.o</div><div class='add'>+obj-$(CONFIG_MT7921U) += mt7921u.o</div><div class='ctx'> </div><div class='del'>-CFLAGS_trace.o := -I$(src)</div><div class='del'>-</div><div class='del'>-mt7921e-y := pci.o mac.o mcu.o dma.o eeprom.o main.o init.o debugfs.o trace.o</div><div class='add'>+mt7921-common-y := mac.o mcu.o main.o init.o debugfs.o</div><div class='add'>+mt7921-common-$(CONFIG_NL80211_TESTMODE) += testmode.o</div><div class='add'>+mt7921e-y := pci.o pci_mac.o pci_mcu.o</div><div class='add'>+mt7921s-y := sdio.o sdio_mac.o sdio_mcu.o</div><div class='add'>+mt7921u-y := usb.o</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c<br/>index 6ee423dd4027..4333005b3ad9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c</a></div><div class='hunk'>@@ -1,153 +1,63 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #include "mt7921.h"</div><div class='del'>-#include "eeprom.h"</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt7921_fw_debug_set(void *data, u64 val)</div><div class='add'>+mt7921_reg_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = data;</div><div class='del'>-</div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='del'>-</div><div class='del'>-	dev-&gt;fw_debug = (u8)val;</div><div class='del'>-	mt7921_mcu_fw_log_2_host(dev, dev-&gt;fw_debug);</div><div class='add'>+	struct mt792x_dev *dev = data;</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	mt76_wr(dev, dev-&gt;mt76.debugfs_reg, val);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt7921_fw_debug_get(void *data, u64 *val)</div><div class='add'>+mt7921_reg_get(void *data, u64 *val)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = data;</div><div class='add'>+	struct mt792x_dev *dev = data;</div><div class='ctx'> </div><div class='del'>-	*val = dev-&gt;fw_debug;</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	*val = mt76_rr(dev, dev-&gt;mt76.debugfs_reg);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_DEBUGFS_ATTRIBUTE(fops_fw_debug, mt7921_fw_debug_get,</div><div class='del'>-			 mt7921_fw_debug_set, "%lld\n");</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt7921_ampdu_stat_read_phy(struct mt7921_phy *phy,</div><div class='del'>-			   struct seq_file *file)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_dev *dev = file-&gt;private;</div><div class='del'>-	int bound[15], range[4], i;</div><div class='del'>-</div><div class='del'>-	if (!phy)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Tx ampdu stat */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(range); i++)</div><div class='del'>-		range[i] = mt76_rr(dev, MT_MIB_ARNG(0, i));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(bound); i++)</div><div class='del'>-		bound[i] = MT_MIB_ARNCR_RANGE(range[i / 4], i % 4) + 1;</div><div class='del'>-</div><div class='del'>-	seq_printf(file, "\nPhy0\n");</div><div class='del'>-</div><div class='del'>-	seq_printf(file, "Length: %8d | ", bound[0]);</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(bound) - 1; i++)</div><div class='del'>-		seq_printf(file, "%3d  %3d | ", bound[i] + 1, bound[i + 1]);</div><div class='del'>-</div><div class='del'>-	seq_puts(file, "\nCount:  ");</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(bound); i++)</div><div class='del'>-		seq_printf(file, "%8d | ", dev-&gt;mt76.aggr_stats[i]);</div><div class='del'>-	seq_puts(file, "\n");</div><div class='del'>-</div><div class='del'>-	seq_printf(file, "BA miss count: %d\n", phy-&gt;mib.ba_miss_cnt);</div><div class='del'>-}</div><div class='del'>-</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(fops_regval, mt7921_reg_get, mt7921_reg_set,</div><div class='add'>+			 "0x%08llx\n");</div><div class='ctx'> static int</div><div class='del'>-mt7921_tx_stats_show(struct seq_file *file, void *data)</div><div class='add'>+mt7921_fw_debug_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = file-&gt;private;</div><div class='del'>-	int stat[8], i, n;</div><div class='add'>+	struct mt792x_dev *dev = data;</div><div class='ctx'> </div><div class='del'>-	mt7921_ampdu_stat_read_phy(&amp;dev-&gt;phy, file);</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='ctx'> </div><div class='del'>-	/* Tx amsdu info */</div><div class='del'>-	seq_puts(file, "Tx MSDU stat:\n");</div><div class='del'>-	for (i = 0, n = 0; i &lt; ARRAY_SIZE(stat); i++) {</div><div class='del'>-		stat[i] = mt76_rr(dev,  MT_PLE_AMSDU_PACK_MSDU_CNT(i));</div><div class='del'>-		n += stat[i];</div><div class='del'>-	}</div><div class='add'>+	dev-&gt;fw_debug = (u8)val;</div><div class='add'>+	mt7921_mcu_fw_log_2_host(dev, dev-&gt;fw_debug);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(stat); i++) {</div><div class='del'>-		seq_printf(file, "AMSDU pack count of %d MSDU in TXD: 0x%x ",</div><div class='del'>-			   i + 1, stat[i]);</div><div class='del'>-		if (n != 0)</div><div class='del'>-			seq_printf(file, "(%d%%)\n", stat[i] * 100 / n);</div><div class='del'>-		else</div><div class='del'>-			seq_puts(file, "\n");</div><div class='del'>-	}</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_SHOW_ATTRIBUTE(mt7921_tx_stats);</div><div class='del'>-</div><div class='ctx'> static int</div><div class='del'>-mt7921_queues_acq(struct seq_file *s, void *data)</div><div class='add'>+mt7921_fw_debug_get(void *data, u64 *val)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = dev_get_drvdata(s-&gt;private);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 16; i++) {</div><div class='del'>-		int j, acs = i / 4, index = i % 4;</div><div class='del'>-		u32 ctrl, val, qlen = 0;</div><div class='del'>-</div><div class='del'>-		val = mt76_rr(dev, MT_PLE_AC_QEMPTY(acs, index));</div><div class='del'>-		ctrl = BIT(31) | BIT(15) | (acs &lt;&lt; 8);</div><div class='del'>-</div><div class='del'>-		for (j = 0; j &lt; 32; j++) {</div><div class='del'>-			if (val &amp; BIT(j))</div><div class='del'>-				continue;</div><div class='add'>+	struct mt792x_dev *dev = data;</div><div class='ctx'> </div><div class='del'>-			mt76_wr(dev, MT_PLE_FL_Q0_CTRL,</div><div class='del'>-				ctrl | (j + (index &lt;&lt; 5)));</div><div class='del'>-			qlen += mt76_get_field(dev, MT_PLE_FL_Q3_CTRL,</div><div class='del'>-					       GENMASK(11, 0));</div><div class='del'>-		}</div><div class='del'>-		seq_printf(s, "AC%d%d: queued=%d\n", acs, index, qlen);</div><div class='del'>-	}</div><div class='add'>+	*val = dev-&gt;fw_debug;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt7921_queues_read(struct seq_file *s, void *data)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_dev *dev = dev_get_drvdata(s-&gt;private);</div><div class='del'>-	struct {</div><div class='del'>-		struct mt76_queue *q;</div><div class='del'>-		char *queue;</div><div class='del'>-	} queue_map[] = {</div><div class='del'>-		{ dev-&gt;mphy.q_tx[MT_TXQ_BE],	 "WFDMA0" },</div><div class='del'>-		{ dev-&gt;mt76.q_mcu[MT_MCUQ_WM],	 "MCUWM"  },</div><div class='del'>-		{ dev-&gt;mt76.q_mcu[MT_MCUQ_FWDL], "MCUFWQ" },</div><div class='del'>-	};</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(queue_map); i++) {</div><div class='del'>-		struct mt76_queue *q = queue_map[i].q;</div><div class='del'>-</div><div class='del'>-		if (!q)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		seq_printf(s,</div><div class='del'>-			   "%s:	queued=%d head=%d tail=%d\n",</div><div class='del'>-			   queue_map[i].queue, q-&gt;queued, q-&gt;head,</div><div class='del'>-			   q-&gt;tail);</div><div class='del'>-	}</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(fops_fw_debug, mt7921_fw_debug_get,</div><div class='add'>+			 mt7921_fw_debug_set, "%lld\n");</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(mt792x_tx_stats);</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mt7921_seq_puts_array(struct seq_file *file, const char *str,</div><div class='hunk'>@@ -180,11 +90,14 @@ mt7921_seq_puts_array(struct seq_file *file, const char *str,</div><div class='ctx'> static int</div><div class='ctx'> mt7921_txpwr(struct seq_file *s, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = dev_get_drvdata(s-&gt;private);</div><div class='add'>+	struct mt792x_dev *dev = dev_get_drvdata(s-&gt;private);</div><div class='ctx'> 	struct mt7921_txpwr txpwr;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='ctx'> 	ret = mt7921_get_txpwr_info(dev, &amp;txpwr);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -229,25 +142,32 @@ mt7921_txpwr(struct seq_file *s, void *data)</div><div class='ctx'> static int</div><div class='ctx'> mt7921_pm_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = data;</div><div class='add'>+	struct mt792x_dev *dev = data;</div><div class='ctx'> 	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='del'>-	struct mt76_phy *mphy = dev-&gt;phy.mt76;</div><div class='ctx'> </div><div class='del'>-	if (val == pm-&gt;enable)</div><div class='del'>-		return 0;</div><div class='add'>+	if (mt76_is_usb(&amp;dev-&gt;mt76))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='add'>+	if (val == pm-&gt;enable_user)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	if (!pm-&gt;enable) {</div><div class='add'>+	if (!pm-&gt;enable_user) {</div><div class='ctx'> 		pm-&gt;stats.last_wake_event = jiffies;</div><div class='ctx'> 		pm-&gt;stats.last_doze_event = jiffies;</div><div class='ctx'> 	}</div><div class='del'>-	pm-&gt;enable = val;</div><div class='del'>-</div><div class='del'>-	ieee80211_iterate_active_interfaces(mphy-&gt;hw,</div><div class='del'>-					    IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='del'>-					    mt7921_pm_interface_iter, mphy-&gt;priv);</div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='add'>+	/* make sure the chip is awake here and ps_work is scheduled</div><div class='add'>+	 * just at end of the this routine.</div><div class='add'>+	 */</div><div class='add'>+	pm-&gt;enable = false;</div><div class='add'>+	mt76_connac_pm_wake(&amp;dev-&gt;mphy, pm);</div><div class='add'>+</div><div class='add'>+	pm-&gt;enable_user = val;</div><div class='add'>+	mt7921_set_runtime_pm(dev);</div><div class='add'>+	mt76_connac_power_save_sched(&amp;dev-&gt;mphy, pm);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -255,9 +175,9 @@ mt7921_pm_set(void *data, u64 val)</div><div class='ctx'> static int</div><div class='ctx'> mt7921_pm_get(void *data, u64 *val)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = data;</div><div class='add'>+	struct mt792x_dev *dev = data;</div><div class='ctx'> </div><div class='del'>-	*val = dev-&gt;pm.enable;</div><div class='add'>+	*val = dev-&gt;pm.enable_user;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -265,66 +185,60 @@ mt7921_pm_get(void *data, u64 *val)</div><div class='ctx'> DEFINE_DEBUGFS_ATTRIBUTE(fops_pm, mt7921_pm_get, mt7921_pm_set, "%lld\n");</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt7921_pm_stats(struct seq_file *s, void *data)</div><div class='add'>+mt7921_deep_sleep_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = dev_get_drvdata(s-&gt;private);</div><div class='add'>+	struct mt792x_dev *dev = data;</div><div class='ctx'> 	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+	bool monitor = !!(dev-&gt;mphy.hw-&gt;conf.flags &amp; IEEE80211_CONF_MONITOR);</div><div class='add'>+	bool enable = !!val;</div><div class='ctx'> </div><div class='del'>-	unsigned long awake_time = pm-&gt;stats.awake_time;</div><div class='del'>-	unsigned long doze_time = pm-&gt;stats.doze_time;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(MT76_STATE_PM, &amp;dev-&gt;mphy.state))</div><div class='del'>-		awake_time += jiffies - pm-&gt;stats.last_wake_event;</div><div class='del'>-	else</div><div class='del'>-		doze_time += jiffies - pm-&gt;stats.last_doze_event;</div><div class='add'>+	if (mt76_is_usb(&amp;dev-&gt;mt76))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	seq_printf(s, "awake time: %14u\ndoze time: %15u\n",</div><div class='del'>-		   jiffies_to_msecs(awake_time),</div><div class='del'>-		   jiffies_to_msecs(doze_time));</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	if (pm-&gt;ds_enable_user == enable)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	seq_printf(s, "low power wakes: %9d\n", pm-&gt;stats.lp_wake);</div><div class='add'>+	pm-&gt;ds_enable_user = enable;</div><div class='add'>+	pm-&gt;ds_enable = enable &amp;&amp; !monitor;</div><div class='add'>+	mt76_connac_mcu_set_deep_sleep(&amp;dev-&gt;mt76, pm-&gt;ds_enable);</div><div class='add'>+out:</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt7921_pm_idle_timeout_set(void *data, u64 val)</div><div class='add'>+mt7921_deep_sleep_get(void *data, u64 *val)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = data;</div><div class='add'>+	struct mt792x_dev *dev = data;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;pm.idle_timeout = msecs_to_jiffies(val);</div><div class='add'>+	*val = dev-&gt;pm.ds_enable_user;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt7921_pm_idle_timeout_get(void *data, u64 *val)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_dev *dev = data;</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(fops_ds, mt7921_deep_sleep_get,</div><div class='add'>+			 mt7921_deep_sleep_set, "%lld\n");</div><div class='ctx'> </div><div class='del'>-	*val = jiffies_to_msecs(dev-&gt;pm.idle_timeout);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-DEFINE_DEBUGFS_ATTRIBUTE(fops_pm_idle_timeout, mt7921_pm_idle_timeout_get,</div><div class='del'>-			 mt7921_pm_idle_timeout_set, "%lld\n");</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(fops_pm_idle_timeout, mt792x_pm_idle_timeout_get,</div><div class='add'>+			 mt792x_pm_idle_timeout_set, "%lld\n");</div><div class='ctx'> </div><div class='ctx'> static int mt7921_chip_reset(void *data, u64 val)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = data;</div><div class='add'>+	struct mt792x_dev *dev = data;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (val) {</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		/* Reset wifisys directly. */</div><div class='del'>-		mt7921_reset(&amp;dev-&gt;mt76);</div><div class='add'>+		mt792x_reset(&amp;dev-&gt;mt76);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* Collect the core dump before reset wifisys. */</div><div class='del'>-		mt7921_mutex_acquire(dev);</div><div class='add'>+		mt792x_mutex_acquire(dev);</div><div class='ctx'> 		ret = mt76_connac_mcu_chip_config(&amp;dev-&gt;mt76);</div><div class='del'>-		mt7921_mutex_release(dev);</div><div class='add'>+		mt792x_mutex_release(dev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -333,28 +247,50 @@ static int mt7921_chip_reset(void *data, u64 val)</div><div class='ctx'> </div><div class='ctx'> DEFINE_DEBUGFS_ATTRIBUTE(fops_reset, NULL, mt7921_chip_reset, "%lld\n");</div><div class='ctx'> </div><div class='del'>-int mt7921_init_debugfs(struct mt7921_dev *dev)</div><div class='add'>+static int</div><div class='add'>+mt7921s_sched_quota_read(struct seq_file *s, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = dev_get_drvdata(s-&gt;private);</div><div class='add'>+	struct mt76_sdio *sdio = &amp;dev-&gt;mt76.sdio;</div><div class='add'>+</div><div class='add'>+	seq_printf(s, "pse_data_quota\t%d\n", sdio-&gt;sched.pse_data_quota);</div><div class='add'>+	seq_printf(s, "ple_data_quota\t%d\n", sdio-&gt;sched.ple_data_quota);</div><div class='add'>+	seq_printf(s, "pse_mcu_quota\t%d\n", sdio-&gt;sched.pse_mcu_quota);</div><div class='add'>+	seq_printf(s, "sched_deficit\t%d\n", sdio-&gt;sched.deficit);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7921_init_debugfs(struct mt792x_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dir;</div><div class='ctx'> </div><div class='del'>-	dir = mt76_register_debugfs(&amp;dev-&gt;mt76);</div><div class='add'>+	dir = mt76_register_debugfs_fops(&amp;dev-&gt;mphy, &amp;fops_regval);</div><div class='ctx'> 	if (!dir)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "queues", dir,</div><div class='del'>-				    mt7921_queues_read);</div><div class='add'>+	if (mt76_is_mmio(&amp;dev-&gt;mt76))</div><div class='add'>+		debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "xmit-queues",</div><div class='add'>+					    dir, mt792x_queues_read);</div><div class='add'>+	else</div><div class='add'>+		debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "xmit-queues",</div><div class='add'>+					    dir, mt76_queues_read);</div><div class='add'>+</div><div class='ctx'> 	debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "acq", dir,</div><div class='del'>-				    mt7921_queues_acq);</div><div class='add'>+				    mt792x_queues_acq);</div><div class='ctx'> 	debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "txpower_sku", dir,</div><div class='ctx'> 				    mt7921_txpwr);</div><div class='del'>-	debugfs_create_file("tx_stats", 0400, dir, dev, &amp;mt7921_tx_stats_fops);</div><div class='add'>+	debugfs_create_file("tx_stats", 0400, dir, dev, &amp;mt792x_tx_stats_fops);</div><div class='ctx'> 	debugfs_create_file("fw_debug", 0600, dir, dev, &amp;fops_fw_debug);</div><div class='ctx'> 	debugfs_create_file("runtime-pm", 0600, dir, dev, &amp;fops_pm);</div><div class='ctx'> 	debugfs_create_file("idle-timeout", 0600, dir, dev,</div><div class='ctx'> 			    &amp;fops_pm_idle_timeout);</div><div class='ctx'> 	debugfs_create_file("chip_reset", 0600, dir, dev, &amp;fops_reset);</div><div class='ctx'> 	debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "runtime_pm_stats", dir,</div><div class='del'>-				    mt7921_pm_stats);</div><div class='del'>-</div><div class='add'>+				    mt792x_pm_stats);</div><div class='add'>+	debugfs_create_file("deep-sleep", 0600, dir, dev, &amp;fops_ds);</div><div class='add'>+	if (mt76_is_sdio(&amp;dev-&gt;mt76))</div><div class='add'>+		debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "sched-quota", dir,</div><div class='add'>+					    mt7921s_sched_quota_read);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/dma.c b/drivers/net/wireless/mediatek/mt76/mt7921/dma.c<br/>deleted file mode 100644<br/>index 71e664ee7652..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/dma.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/dma.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,480 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='del'>-/* Copyright (C) 2020 MediaTek Inc. */</div><div class='del'>-</div><div class='del'>-#include "mt7921.h"</div><div class='del'>-#include "../dma.h"</div><div class='del'>-#include "mac.h"</div><div class='del'>-</div><div class='del'>-int mt7921_init_tx_queues(struct mt7921_phy *phy, int idx, int n_desc)</div><div class='del'>-{</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	err = mt76_init_tx_queue(phy-&gt;mt76, 0, idx, n_desc, MT_TX_RING_BASE);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= MT_TXQ_PSD; i++)</div><div class='del'>-		phy-&gt;mt76-&gt;q_tx[i] = phy-&gt;mt76-&gt;q_tx[0];</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mt7921_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,</div><div class='del'>-			 struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);</div><div class='del'>-	__le32 *rxd = (__le32 *)skb-&gt;data;</div><div class='del'>-	enum rx_pkt_type type;</div><div class='del'>-	u16 flag;</div><div class='del'>-</div><div class='del'>-	type = FIELD_GET(MT_RXD0_PKT_TYPE, le32_to_cpu(rxd[0]));</div><div class='del'>-	flag = FIELD_GET(MT_RXD0_PKT_FLAG, le32_to_cpu(rxd[0]));</div><div class='del'>-</div><div class='del'>-	if (type == PKT_TYPE_RX_EVENT &amp;&amp; flag == 0x1)</div><div class='del'>-		type = PKT_TYPE_NORMAL_MCU;</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case PKT_TYPE_TXRX_NOTIFY:</div><div class='del'>-		mt7921_mac_tx_free(dev, skb);</div><div class='del'>-		break;</div><div class='del'>-	case PKT_TYPE_RX_EVENT:</div><div class='del'>-		mt7921_mcu_rx_event(dev, skb);</div><div class='del'>-		break;</div><div class='del'>-	case PKT_TYPE_NORMAL_MCU:</div><div class='del'>-	case PKT_TYPE_NORMAL:</div><div class='del'>-		if (!mt7921_mac_fill_rx(dev, skb)) {</div><div class='del'>-			mt76_rx(&amp;dev-&gt;mt76, q, skb);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		fallthrough;</div><div class='del'>-	default:</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mt7921_tx_cleanup(struct mt7921_dev *dev)</div><div class='del'>-{</div><div class='del'>-	mt76_queue_tx_cleanup(dev, dev-&gt;mt76.q_mcu[MT_MCUQ_WM], false);</div><div class='del'>-	mt76_queue_tx_cleanup(dev, dev-&gt;mt76.q_mcu[MT_MCUQ_WA], false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mt7921_poll_tx(struct napi_struct *napi, int budget)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_dev *dev;</div><div class='del'>-</div><div class='del'>-	dev = container_of(napi, struct mt7921_dev, mt76.tx_napi);</div><div class='del'>-</div><div class='del'>-	if (!mt76_connac_pm_ref(&amp;dev-&gt;mphy, &amp;dev-&gt;pm)) {</div><div class='del'>-		napi_complete(napi);</div><div class='del'>-		queue_work(dev-&gt;mt76.wq, &amp;dev-&gt;pm.wake_work);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mt7921_tx_cleanup(dev);</div><div class='del'>-	if (napi_complete(napi))</div><div class='del'>-		mt7921_irq_enable(dev, MT_INT_TX_DONE_ALL);</div><div class='del'>-	mt76_connac_pm_unref(&amp;dev-&gt;pm);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mt7921_poll_rx(struct napi_struct *napi, int budget)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_dev *dev;</div><div class='del'>-	int done;</div><div class='del'>-</div><div class='del'>-	dev = container_of(napi-&gt;dev, struct mt7921_dev, mt76.napi_dev);</div><div class='del'>-</div><div class='del'>-	if (!mt76_connac_pm_ref(&amp;dev-&gt;mphy, &amp;dev-&gt;pm)) {</div><div class='del'>-		napi_complete(napi);</div><div class='del'>-		queue_work(dev-&gt;mt76.wq, &amp;dev-&gt;pm.wake_work);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	done = mt76_dma_rx_poll(napi, budget);</div><div class='del'>-	mt76_connac_pm_unref(&amp;dev-&gt;pm);</div><div class='del'>-</div><div class='del'>-	return done;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mt7921_dma_prefetch(struct mt7921_dev *dev)</div><div class='del'>-{</div><div class='del'>-#define PREFETCH(base, depth)	((base) &lt;&lt; 16 | (depth))</div><div class='del'>-</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_RX_RING0_EXT_CTRL, PREFETCH(0x0, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_RX_RING2_EXT_CTRL, PREFETCH(0x40, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_RX_RING3_EXT_CTRL, PREFETCH(0x80, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_RX_RING4_EXT_CTRL, PREFETCH(0xc0, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_RX_RING5_EXT_CTRL, PREFETCH(0x100, 0x4));</div><div class='del'>-</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_TX_RING0_EXT_CTRL, PREFETCH(0x140, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_TX_RING1_EXT_CTRL, PREFETCH(0x180, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_TX_RING2_EXT_CTRL, PREFETCH(0x1c0, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_TX_RING3_EXT_CTRL, PREFETCH(0x200, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_TX_RING4_EXT_CTRL, PREFETCH(0x240, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_TX_RING5_EXT_CTRL, PREFETCH(0x280, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_TX_RING6_EXT_CTRL, PREFETCH(0x2c0, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_TX_RING16_EXT_CTRL, PREFETCH(0x340, 0x4));</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_TX_RING17_EXT_CTRL, PREFETCH(0x380, 0x4));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 __mt7921_reg_addr(struct mt7921_dev *dev, u32 addr)</div><div class='del'>-{</div><div class='del'>-	static const struct {</div><div class='del'>-		u32 phys;</div><div class='del'>-		u32 mapped;</div><div class='del'>-		u32 size;</div><div class='del'>-	} fixed_map[] = {</div><div class='del'>-		{ 0x00400000, 0x80000, 0x10000}, /* WF_MCU_SYSRAM */</div><div class='del'>-		{ 0x00410000, 0x90000, 0x10000}, /* WF_MCU_SYSRAM (configure register) */</div><div class='del'>-		{ 0x40000000, 0x70000, 0x10000}, /* WF_UMAC_SYSRAM */</div><div class='del'>-		{ 0x54000000, 0x02000, 0x1000 }, /* WFDMA PCIE0 MCU DMA0 */</div><div class='del'>-		{ 0x55000000, 0x03000, 0x1000 }, /* WFDMA PCIE0 MCU DMA1 */</div><div class='del'>-		{ 0x58000000, 0x06000, 0x1000 }, /* WFDMA PCIE1 MCU DMA0 (MEM_DMA) */</div><div class='del'>-		{ 0x59000000, 0x07000, 0x1000 }, /* WFDMA PCIE1 MCU DMA1 */</div><div class='del'>-		{ 0x7c000000, 0xf0000, 0x10000 }, /* CONN_INFRA */</div><div class='del'>-		{ 0x7c020000, 0xd0000, 0x10000 }, /* CONN_INFRA, WFDMA */</div><div class='del'>-		{ 0x7c060000, 0xe0000, 0x10000}, /* CONN_INFRA, conn_host_csr_top */</div><div class='del'>-		{ 0x80020000, 0xb0000, 0x10000 }, /* WF_TOP_MISC_OFF */</div><div class='del'>-		{ 0x81020000, 0xc0000, 0x10000 }, /* WF_TOP_MISC_ON */</div><div class='del'>-		{ 0x820c0000, 0x08000, 0x4000 }, /* WF_UMAC_TOP (PLE) */</div><div class='del'>-		{ 0x820c8000, 0x0c000, 0x2000 }, /* WF_UMAC_TOP (PSE) */</div><div class='del'>-		{ 0x820cc000, 0x0e000, 0x2000 }, /* WF_UMAC_TOP (PP) */</div><div class='del'>-		{ 0x820ce000, 0x21c00, 0x0200 }, /* WF_LMAC_TOP (WF_SEC) */</div><div class='del'>-		{ 0x820cf000, 0x22000, 0x1000 }, /* WF_LMAC_TOP (WF_PF) */</div><div class='del'>-		{ 0x820d0000, 0x30000, 0x10000 }, /* WF_LMAC_TOP (WF_WTBLON) */</div><div class='del'>-		{ 0x820e0000, 0x20000, 0x0400 }, /* WF_LMAC_TOP BN0 (WF_CFG) */</div><div class='del'>-		{ 0x820e1000, 0x20400, 0x0200 }, /* WF_LMAC_TOP BN0 (WF_TRB) */</div><div class='del'>-		{ 0x820e2000, 0x20800, 0x0400 }, /* WF_LMAC_TOP BN0 (WF_AGG) */</div><div class='del'>-		{ 0x820e3000, 0x20c00, 0x0400 }, /* WF_LMAC_TOP BN0 (WF_ARB) */</div><div class='del'>-		{ 0x820e4000, 0x21000, 0x0400 }, /* WF_LMAC_TOP BN0 (WF_TMAC) */</div><div class='del'>-		{ 0x820e5000, 0x21400, 0x0800 }, /* WF_LMAC_TOP BN0 (WF_RMAC) */</div><div class='del'>-		{ 0x820e7000, 0x21e00, 0x0200 }, /* WF_LMAC_TOP BN0 (WF_DMA) */</div><div class='del'>-		{ 0x820e9000, 0x23400, 0x0200 }, /* WF_LMAC_TOP BN0 (WF_WTBLOFF) */</div><div class='del'>-		{ 0x820ea000, 0x24000, 0x0200 }, /* WF_LMAC_TOP BN0 (WF_ETBF) */</div><div class='del'>-		{ 0x820eb000, 0x24200, 0x0400 }, /* WF_LMAC_TOP BN0 (WF_LPON) */</div><div class='del'>-		{ 0x820ec000, 0x24600, 0x0200 }, /* WF_LMAC_TOP BN0 (WF_INT) */</div><div class='del'>-		{ 0x820ed000, 0x24800, 0x0800 }, /* WF_LMAC_TOP BN0 (WF_MIB) */</div><div class='del'>-		{ 0x820f0000, 0xa0000, 0x0400 }, /* WF_LMAC_TOP BN1 (WF_CFG) */</div><div class='del'>-		{ 0x820f1000, 0xa0600, 0x0200 }, /* WF_LMAC_TOP BN1 (WF_TRB) */</div><div class='del'>-		{ 0x820f2000, 0xa0800, 0x0400 }, /* WF_LMAC_TOP BN1 (WF_AGG) */</div><div class='del'>-		{ 0x820f3000, 0xa0c00, 0x0400 }, /* WF_LMAC_TOP BN1 (WF_ARB) */</div><div class='del'>-		{ 0x820f4000, 0xa1000, 0x0400 }, /* WF_LMAC_TOP BN1 (WF_TMAC) */</div><div class='del'>-		{ 0x820f5000, 0xa1400, 0x0800 }, /* WF_LMAC_TOP BN1 (WF_RMAC) */</div><div class='del'>-		{ 0x820f7000, 0xa1e00, 0x0200 }, /* WF_LMAC_TOP BN1 (WF_DMA) */</div><div class='del'>-		{ 0x820f9000, 0xa3400, 0x0200 }, /* WF_LMAC_TOP BN1 (WF_WTBLOFF) */</div><div class='del'>-		{ 0x820fa000, 0xa4000, 0x0200 }, /* WF_LMAC_TOP BN1 (WF_ETBF) */</div><div class='del'>-		{ 0x820fb000, 0xa4200, 0x0400 }, /* WF_LMAC_TOP BN1 (WF_LPON) */</div><div class='del'>-		{ 0x820fc000, 0xa4600, 0x0200 }, /* WF_LMAC_TOP BN1 (WF_INT) */</div><div class='del'>-		{ 0x820fd000, 0xa4800, 0x0800 }, /* WF_LMAC_TOP BN1 (WF_MIB) */</div><div class='del'>-	};</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (addr &lt; 0x100000)</div><div class='del'>-		return addr;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(fixed_map); i++) {</div><div class='del'>-		u32 ofs;</div><div class='del'>-</div><div class='del'>-		if (addr &lt; fixed_map[i].phys)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ofs = addr - fixed_map[i].phys;</div><div class='del'>-		if (ofs &gt; fixed_map[i].size)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		return fixed_map[i].mapped + ofs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((addr &gt;= 0x18000000 &amp;&amp; addr &lt; 0x18c00000) ||</div><div class='del'>-	    (addr &gt;= 0x70000000 &amp;&amp; addr &lt; 0x78000000) ||</div><div class='del'>-	    (addr &gt;= 0x7c000000 &amp;&amp; addr &lt; 0x7c400000))</div><div class='del'>-		return mt7921_reg_map_l1(dev, addr);</div><div class='del'>-</div><div class='del'>-	dev_err(dev-&gt;mt76.dev, "Access currently unsupported address %08x\n",</div><div class='del'>-		addr);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 mt7921_rr(struct mt76_dev *mdev, u32 offset)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);</div><div class='del'>-	u32 addr = __mt7921_reg_addr(dev, offset);</div><div class='del'>-</div><div class='del'>-	return dev-&gt;bus_ops-&gt;rr(mdev, addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mt7921_wr(struct mt76_dev *mdev, u32 offset, u32 val)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);</div><div class='del'>-	u32 addr = __mt7921_reg_addr(dev, offset);</div><div class='del'>-</div><div class='del'>-	dev-&gt;bus_ops-&gt;wr(mdev, addr, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 mt7921_rmw(struct mt76_dev *mdev, u32 offset, u32 mask, u32 val)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);</div><div class='del'>-	u32 addr = __mt7921_reg_addr(dev, offset);</div><div class='del'>-</div><div class='del'>-	return dev-&gt;bus_ops-&gt;rmw(mdev, addr, mask, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mt7921_dma_disable(struct mt7921_dev *dev, bool force)</div><div class='del'>-{</div><div class='del'>-	if (force) {</div><div class='del'>-		/* reset */</div><div class='del'>-		mt76_clear(dev, MT_WFDMA0_RST,</div><div class='del'>-			   MT_WFDMA0_RST_DMASHDL_ALL_RST |</div><div class='del'>-			   MT_WFDMA0_RST_LOGIC_RST);</div><div class='del'>-</div><div class='del'>-		mt76_set(dev, MT_WFDMA0_RST,</div><div class='del'>-			 MT_WFDMA0_RST_DMASHDL_ALL_RST |</div><div class='del'>-			 MT_WFDMA0_RST_LOGIC_RST);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* disable dmashdl */</div><div class='del'>-	mt76_clear(dev, MT_WFDMA0_GLO_CFG_EXT0,</div><div class='del'>-		   MT_WFDMA0_CSR_TX_DMASHDL_ENABLE);</div><div class='del'>-	mt76_set(dev, MT_DMASHDL_SW_CONTROL, MT_DMASHDL_DMASHDL_BYPASS);</div><div class='del'>-</div><div class='del'>-	/* disable WFDMA0 */</div><div class='del'>-	mt76_clear(dev, MT_WFDMA0_GLO_CFG,</div><div class='del'>-		   MT_WFDMA0_GLO_CFG_TX_DMA_EN | MT_WFDMA0_GLO_CFG_RX_DMA_EN |</div><div class='del'>-		   MT_WFDMA0_GLO_CFG_CSR_DISP_BASE_PTR_CHAIN_EN |</div><div class='del'>-		   MT_WFDMA0_GLO_CFG_OMIT_TX_INFO |</div><div class='del'>-		   MT_WFDMA0_GLO_CFG_OMIT_RX_INFO |</div><div class='del'>-		   MT_WFDMA0_GLO_CFG_OMIT_RX_INFO_PFET2);</div><div class='del'>-</div><div class='del'>-	if (!mt76_poll(dev, MT_WFDMA0_GLO_CFG,</div><div class='del'>-		       MT_WFDMA0_GLO_CFG_TX_DMA_BUSY |</div><div class='del'>-		       MT_WFDMA0_GLO_CFG_RX_DMA_BUSY, 0, 1000))</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mt7921_dma_enable(struct mt7921_dev *dev)</div><div class='del'>-{</div><div class='del'>-	/* configure perfetch settings */</div><div class='del'>-	mt7921_dma_prefetch(dev);</div><div class='del'>-</div><div class='del'>-	/* reset dma idx */</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_RST_DTX_PTR, ~0);</div><div class='del'>-</div><div class='del'>-	/* configure delay interrupt */</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_PRI_DLY_INT_CFG0, 0);</div><div class='del'>-</div><div class='del'>-	mt76_set(dev, MT_WFDMA0_GLO_CFG,</div><div class='del'>-		 MT_WFDMA0_GLO_CFG_TX_WB_DDONE |</div><div class='del'>-		 MT_WFDMA0_GLO_CFG_FIFO_LITTLE_ENDIAN |</div><div class='del'>-		 MT_WFDMA0_GLO_CFG_CLK_GAT_DIS |</div><div class='del'>-		 MT_WFDMA0_GLO_CFG_OMIT_TX_INFO |</div><div class='del'>-		 MT_WFDMA0_GLO_CFG_CSR_DISP_BASE_PTR_CHAIN_EN |</div><div class='del'>-		 MT_WFDMA0_GLO_CFG_OMIT_RX_INFO_PFET2);</div><div class='del'>-</div><div class='del'>-	mt76_set(dev, MT_WFDMA0_GLO_CFG,</div><div class='del'>-		 MT_WFDMA0_GLO_CFG_TX_DMA_EN | MT_WFDMA0_GLO_CFG_RX_DMA_EN);</div><div class='del'>-</div><div class='del'>-	mt76_set(dev, MT_WFDMA_DUMMY_CR, MT_WFDMA_NEED_REINIT);</div><div class='del'>-</div><div class='del'>-	/* enable interrupts for TX/RX rings */</div><div class='del'>-	mt7921_irq_enable(dev,</div><div class='del'>-			  MT_INT_RX_DONE_ALL | MT_INT_TX_DONE_ALL |</div><div class='del'>-			  MT_INT_MCU_CMD);</div><div class='del'>-	mt76_set(dev, MT_MCU2HOST_SW_INT_ENA, MT_MCU_CMD_WAKE_RX_PCIE);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mt7921_dma_reset(struct mt7921_dev *dev, bool force)</div><div class='del'>-{</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	err = mt7921_dma_disable(dev, force);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/* reset hw queues */</div><div class='del'>-	for (i = 0; i &lt; __MT_TXQ_MAX; i++)</div><div class='del'>-		mt76_queue_reset(dev, dev-&gt;mphy.q_tx[i]);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; __MT_MCUQ_MAX; i++)</div><div class='del'>-		mt76_queue_reset(dev, dev-&gt;mt76.q_mcu[i]);</div><div class='del'>-</div><div class='del'>-	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i)</div><div class='del'>-		mt76_queue_reset(dev, &amp;dev-&gt;mt76.q_rx[i]);</div><div class='del'>-</div><div class='del'>-	mt76_tx_status_check(&amp;dev-&gt;mt76, NULL, true);</div><div class='del'>-</div><div class='del'>-	return mt7921_dma_enable(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mt7921_wfsys_reset(struct mt7921_dev *dev)</div><div class='del'>-{</div><div class='del'>-	mt76_set(dev, 0x70002600, BIT(0));</div><div class='del'>-	msleep(200);</div><div class='del'>-	mt76_clear(dev, 0x70002600, BIT(0));</div><div class='del'>-</div><div class='del'>-	if (!__mt76_poll_msec(&amp;dev-&gt;mt76, MT_WFSYS_SW_RST_B,</div><div class='del'>-			      WFSYS_SW_INIT_DONE, WFSYS_SW_INIT_DONE, 500))</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mt7921_wpdma_reset(struct mt7921_dev *dev, bool force)</div><div class='del'>-{</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	/* clean up hw queues */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;mt76.phy.q_tx); i++)</div><div class='del'>-		mt76_queue_tx_cleanup(dev, dev-&gt;mphy.q_tx[i], true);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(dev-&gt;mt76.q_mcu); i++)</div><div class='del'>-		mt76_queue_tx_cleanup(dev, dev-&gt;mt76.q_mcu[i], true);</div><div class='del'>-</div><div class='del'>-	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i)</div><div class='del'>-		mt76_queue_rx_cleanup(dev, &amp;dev-&gt;mt76.q_rx[i]);</div><div class='del'>-</div><div class='del'>-	if (force) {</div><div class='del'>-		err = mt7921_wfsys_reset(dev);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	err = mt7921_dma_reset(dev, force);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i)</div><div class='del'>-		mt76_queue_rx_reset(dev, i);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mt7921_wpdma_reinit_cond(struct mt7921_dev *dev)</div><div class='del'>-{</div><div class='del'>-	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* check if the wpdma must be reinitialized */</div><div class='del'>-	if (mt7921_dma_need_reinit(dev)) {</div><div class='del'>-		/* disable interrutpts */</div><div class='del'>-		mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, 0);</div><div class='del'>-		mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0x0);</div><div class='del'>-</div><div class='del'>-		err = mt7921_wpdma_reset(dev, false);</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(dev-&gt;mt76.dev, "wpdma reset failed\n");</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* enable interrutpts */</div><div class='del'>-		mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff);</div><div class='del'>-		pm-&gt;stats.lp_wake++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mt7921_dma_init(struct mt7921_dev *dev)</div><div class='del'>-{</div><div class='del'>-	/* Increase buffer size to receive large VHT/HE MPDUs */</div><div class='del'>-	struct mt76_bus_ops *bus_ops;</div><div class='del'>-	int rx_buf_size = MT_RX_BUF_SIZE * 2;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	dev-&gt;bus_ops = dev-&gt;mt76.bus;</div><div class='del'>-	bus_ops = devm_kmemdup(dev-&gt;mt76.dev, dev-&gt;bus_ops, sizeof(*bus_ops),</div><div class='del'>-			       GFP_KERNEL);</div><div class='del'>-	if (!bus_ops)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	bus_ops-&gt;rr = mt7921_rr;</div><div class='del'>-	bus_ops-&gt;wr = mt7921_wr;</div><div class='del'>-	bus_ops-&gt;rmw = mt7921_rmw;</div><div class='del'>-	dev-&gt;mt76.bus = bus_ops;</div><div class='del'>-</div><div class='del'>-	mt76_dma_attach(&amp;dev-&gt;mt76);</div><div class='del'>-</div><div class='del'>-	ret = mt7921_dma_disable(dev, true);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* init tx queue */</div><div class='del'>-	ret = mt7921_init_tx_queues(&amp;dev-&gt;phy, MT7921_TXQ_BAND0,</div><div class='del'>-				    MT7921_TX_RING_SIZE);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_TX_RING0_EXT_CTRL, 0x4);</div><div class='del'>-</div><div class='del'>-	/* command to WM */</div><div class='del'>-	ret = mt76_init_mcu_queue(&amp;dev-&gt;mt76, MT_MCUQ_WM, MT7921_TXQ_MCU_WM,</div><div class='del'>-				  MT7921_TX_MCU_RING_SIZE, MT_TX_RING_BASE);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* firmware download */</div><div class='del'>-	ret = mt76_init_mcu_queue(&amp;dev-&gt;mt76, MT_MCUQ_FWDL, MT7921_TXQ_FWDL,</div><div class='del'>-				  MT7921_TX_FWDL_RING_SIZE, MT_TX_RING_BASE);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* event from WM before firmware download */</div><div class='del'>-	ret = mt76_queue_alloc(dev, &amp;dev-&gt;mt76.q_rx[MT_RXQ_MCU],</div><div class='del'>-			       MT7921_RXQ_MCU_WM,</div><div class='del'>-			       MT7921_RX_MCU_RING_SIZE,</div><div class='del'>-			       rx_buf_size, MT_RX_EVENT_RING_BASE);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Change mcu queue after firmware download */</div><div class='del'>-	ret = mt76_queue_alloc(dev, &amp;dev-&gt;mt76.q_rx[MT_RXQ_MCU_WA],</div><div class='del'>-			       MT7921_RXQ_MCU_WM,</div><div class='del'>-			       MT7921_RX_MCU_RING_SIZE,</div><div class='del'>-			       rx_buf_size, MT_WFDMA0(0x540));</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* rx data */</div><div class='del'>-	ret = mt76_queue_alloc(dev, &amp;dev-&gt;mt76.q_rx[MT_RXQ_MAIN],</div><div class='del'>-			       MT7921_RXQ_BAND0, MT7921_RX_RING_SIZE,</div><div class='del'>-			       rx_buf_size, MT_RX_DATA_RING_BASE);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = mt76_init_queues(dev, mt7921_poll_rx);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	netif_tx_napi_add(&amp;dev-&gt;mt76.tx_napi_dev, &amp;dev-&gt;mt76.tx_napi,</div><div class='del'>-			  mt7921_poll_tx, NAPI_POLL_WEIGHT);</div><div class='del'>-	napi_enable(&amp;dev-&gt;mt76.tx_napi);</div><div class='del'>-</div><div class='del'>-	return mt7921_dma_enable(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mt7921_dma_cleanup(struct mt7921_dev *dev)</div><div class='del'>-{</div><div class='del'>-	/* disable */</div><div class='del'>-	mt76_clear(dev, MT_WFDMA0_GLO_CFG,</div><div class='del'>-		   MT_WFDMA0_GLO_CFG_TX_DMA_EN |</div><div class='del'>-		   MT_WFDMA0_GLO_CFG_RX_DMA_EN |</div><div class='del'>-		   MT_WFDMA0_GLO_CFG_CSR_DISP_BASE_PTR_CHAIN_EN |</div><div class='del'>-		   MT_WFDMA0_GLO_CFG_OMIT_TX_INFO |</div><div class='del'>-		   MT_WFDMA0_GLO_CFG_OMIT_RX_INFO |</div><div class='del'>-		   MT_WFDMA0_GLO_CFG_OMIT_RX_INFO_PFET2);</div><div class='del'>-</div><div class='del'>-	/* reset */</div><div class='del'>-	mt76_clear(dev, MT_WFDMA0_RST,</div><div class='del'>-		   MT_WFDMA0_RST_DMASHDL_ALL_RST |</div><div class='del'>-		   MT_WFDMA0_RST_LOGIC_RST);</div><div class='del'>-</div><div class='del'>-	mt76_set(dev, MT_WFDMA0_RST,</div><div class='del'>-		 MT_WFDMA0_RST_DMASHDL_ALL_RST |</div><div class='del'>-		 MT_WFDMA0_RST_LOGIC_RST);</div><div class='del'>-</div><div class='del'>-	mt76_dma_cleanup(&amp;dev-&gt;mt76);</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt7921/eeprom.c<br/>deleted file mode 100644<br/>index 691d14a1a7bf..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/eeprom.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/eeprom.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,100 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='del'>-/* Copyright (C) 2020 MediaTek Inc. */</div><div class='del'>-</div><div class='del'>-#include "mt7921.h"</div><div class='del'>-#include "eeprom.h"</div><div class='del'>-</div><div class='del'>-static u32 mt7921_eeprom_read(struct mt7921_dev *dev, u32 offset)</div><div class='del'>-{</div><div class='del'>-	u8 *data = dev-&gt;mt76.eeprom.data;</div><div class='del'>-</div><div class='del'>-	if (data[offset] == 0xff)</div><div class='del'>-		mt7921_mcu_get_eeprom(dev, offset);</div><div class='del'>-</div><div class='del'>-	return data[offset];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mt7921_eeprom_load(struct mt7921_dev *dev)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = mt76_eeprom_init(&amp;dev-&gt;mt76, MT7921_EEPROM_SIZE);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	memset(dev-&gt;mt76.eeprom.data, -1, MT7921_EEPROM_SIZE);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mt7921_check_eeprom(struct mt7921_dev *dev)</div><div class='del'>-{</div><div class='del'>-	u8 *eeprom = dev-&gt;mt76.eeprom.data;</div><div class='del'>-	u16 val;</div><div class='del'>-</div><div class='del'>-	mt7921_eeprom_read(dev, MT_EE_CHIP_ID);</div><div class='del'>-	val = get_unaligned_le16(eeprom);</div><div class='del'>-</div><div class='del'>-	switch (val) {</div><div class='del'>-	case 0x7961:</div><div class='del'>-		return 0;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mt7921_eeprom_parse_band_config(struct mt7921_phy *phy)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_dev *dev = phy-&gt;dev;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	val = mt7921_eeprom_read(dev, MT_EE_WIFI_CONF);</div><div class='del'>-	val = FIELD_GET(MT_EE_WIFI_CONF_BAND_SEL, val);</div><div class='del'>-</div><div class='del'>-	switch (val) {</div><div class='del'>-	case MT_EE_5GHZ:</div><div class='del'>-		phy-&gt;mt76-&gt;cap.has_5ghz = true;</div><div class='del'>-		break;</div><div class='del'>-	case MT_EE_2GHZ:</div><div class='del'>-		phy-&gt;mt76-&gt;cap.has_2ghz = true;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		phy-&gt;mt76-&gt;cap.has_2ghz = true;</div><div class='del'>-		phy-&gt;mt76-&gt;cap.has_5ghz = true;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mt7921_eeprom_parse_hw_cap(struct mt7921_dev *dev)</div><div class='del'>-{</div><div class='del'>-	u8 tx_mask;</div><div class='del'>-</div><div class='del'>-	mt7921_eeprom_parse_band_config(&amp;dev-&gt;phy);</div><div class='del'>-</div><div class='del'>-	/* TODO: read NSS with MCU_CMD_NIC_CAPV2 */</div><div class='del'>-	tx_mask = 2;</div><div class='del'>-	dev-&gt;chainmask = BIT(tx_mask) - 1;</div><div class='del'>-	dev-&gt;mphy.antenna_mask = dev-&gt;chainmask;</div><div class='del'>-	dev-&gt;mphy.chainmask = dev-&gt;mphy.antenna_mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mt7921_eeprom_init(struct mt7921_dev *dev)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = mt7921_eeprom_load(dev);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = mt7921_check_eeprom(dev);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	mt7921_eeprom_parse_hw_cap(dev);</div><div class='del'>-	memcpy(dev-&gt;mphy.macaddr, dev-&gt;mt76.eeprom.data + MT_EE_MAC_ADDR,</div><div class='del'>-	       ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	mt76_eeprom_override(&amp;dev-&gt;mphy);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/eeprom.h b/drivers/net/wireless/mediatek/mt76/mt7921/eeprom.h<br/>deleted file mode 100644<br/>index 54f30401343c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/eeprom.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/eeprom.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,27 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='del'>-/* Copyright (C) 2020 MediaTek Inc. */</div><div class='del'>-</div><div class='del'>-#ifndef __MT7921_EEPROM_H</div><div class='del'>-#define __MT7921_EEPROM_H</div><div class='del'>-</div><div class='del'>-#include "mt7921.h"</div><div class='del'>-</div><div class='del'>-enum mt7921_eeprom_field {</div><div class='del'>-	MT_EE_CHIP_ID =		0x000,</div><div class='del'>-	MT_EE_VERSION =		0x002,</div><div class='del'>-	MT_EE_MAC_ADDR =	0x004,</div><div class='del'>-	MT_EE_WIFI_CONF =	0x07c,</div><div class='del'>-	__MT_EE_MAX =		0x3bf</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define MT_EE_WIFI_CONF_TX_MASK			BIT(0)</div><div class='del'>-#define MT_EE_WIFI_CONF_BAND_SEL		GENMASK(3, 2)</div><div class='del'>-</div><div class='del'>-enum mt7921_eeprom_band {</div><div class='del'>-	MT_EE_NA,</div><div class='del'>-	MT_EE_5GHZ,</div><div class='del'>-	MT_EE_2GHZ,</div><div class='del'>-	MT_EE_DUAL_BAND,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c<br/>index fe28bf4050c4..29732315af1c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/init.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/init.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/init.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7921/init.c</a></div><div class='hunk'>@@ -1,214 +1,269 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/hwmon.h&gt;</div><div class='add'>+#include &lt;linux/hwmon-sysfs.h&gt;</div><div class='add'>+#include &lt;linux/thermal.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include "mt7921.h"</div><div class='del'>-#include "mac.h"</div><div class='add'>+#include "../mt76_connac2_mac.h"</div><div class='ctx'> #include "mcu.h"</div><div class='del'>-#include "eeprom.h"</div><div class='ctx'> </div><div class='del'>-#define CCK_RATE(_idx, _rate) {						\</div><div class='del'>-	.bitrate = _rate,						\</div><div class='del'>-	.flags = IEEE80211_RATE_SHORT_PREAMBLE,				\</div><div class='del'>-	.hw_value = (MT_PHY_TYPE_CCK &lt;&lt; 8) | (_idx),			\</div><div class='del'>-	.hw_value_short = (MT_PHY_TYPE_CCK &lt;&lt; 8) | (4 + (_idx)),	\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define OFDM_RATE(_idx, _rate) {					\</div><div class='del'>-	.bitrate = _rate,						\</div><div class='del'>-	.hw_value = (MT_PHY_TYPE_OFDM &lt;&lt; 8) | (_idx),			\</div><div class='del'>-	.hw_value_short = (MT_PHY_TYPE_OFDM &lt;&lt; 8) | (_idx),		\</div><div class='add'>+static ssize_t mt7921_thermal_temp_show(struct device *dev,</div><div class='add'>+					struct device_attribute *attr,</div><div class='add'>+					char *buf)</div><div class='add'>+{</div><div class='add'>+	switch (to_sensor_dev_attr(attr)-&gt;index) {</div><div class='add'>+	case 0: {</div><div class='add'>+		struct mt792x_phy *phy = dev_get_drvdata(dev);</div><div class='add'>+		struct mt792x_dev *mdev = phy-&gt;dev;</div><div class='add'>+		int temperature;</div><div class='add'>+</div><div class='add'>+		mt792x_mutex_acquire(mdev);</div><div class='add'>+		temperature = mt7921_mcu_get_temperature(phy);</div><div class='add'>+		mt792x_mutex_release(mdev);</div><div class='add'>+</div><div class='add'>+		if (temperature &lt; 0)</div><div class='add'>+			return temperature;</div><div class='add'>+		/* display in millidegree Celsius */</div><div class='add'>+		return sprintf(buf, "%u\n", temperature * 1000);</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_input, mt7921_thermal_temp, 0);</div><div class='ctx'> </div><div class='del'>-static struct ieee80211_rate mt7921_rates[] = {</div><div class='del'>-	CCK_RATE(0, 10),</div><div class='del'>-	CCK_RATE(1, 20),</div><div class='del'>-	CCK_RATE(2, 55),</div><div class='del'>-	CCK_RATE(3, 110),</div><div class='del'>-	OFDM_RATE(11, 60),</div><div class='del'>-	OFDM_RATE(15, 90),</div><div class='del'>-	OFDM_RATE(10, 120),</div><div class='del'>-	OFDM_RATE(14, 180),</div><div class='del'>-	OFDM_RATE(9,  240),</div><div class='del'>-	OFDM_RATE(13, 360),</div><div class='del'>-	OFDM_RATE(8,  480),</div><div class='del'>-	OFDM_RATE(12, 540),</div><div class='add'>+static struct attribute *mt7921_hwmon_attrs[] = {</div><div class='add'>+	&amp;sensor_dev_attr_temp1_input.dev_attr.attr,</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='add'>+ATTRIBUTE_GROUPS(mt7921_hwmon);</div><div class='add'>+</div><div class='add'>+static int mt7921_thermal_init(struct mt792x_phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct wiphy *wiphy = phy-&gt;mt76-&gt;hw-&gt;wiphy;</div><div class='add'>+	struct device *hwmon;</div><div class='add'>+	const char *name;</div><div class='add'>+</div><div class='add'>+	if (!IS_REACHABLE(CONFIG_HWMON))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	name = devm_kasprintf(&amp;wiphy-&gt;dev, GFP_KERNEL, "mt7921_%s",</div><div class='add'>+			      wiphy_name(wiphy));</div><div class='add'>+	if (!name)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-static const struct ieee80211_iface_limit if_limits[] = {</div><div class='del'>-	{</div><div class='del'>-		.max = MT7921_MAX_INTERFACES,</div><div class='del'>-		.types = BIT(NL80211_IFTYPE_STATION)</div><div class='add'>+	hwmon = devm_hwmon_device_register_with_groups(&amp;wiphy-&gt;dev, name, phy,</div><div class='add'>+						       mt7921_hwmon_groups);</div><div class='add'>+	return PTR_ERR_OR_ZERO(hwmon);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7921_regd_channel_update(struct wiphy *wiphy, struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+#define IS_UNII_INVALID(idx, sfreq, efreq) \</div><div class='add'>+	(!(dev-&gt;phy.clc_chan_conf &amp; BIT(idx)) &amp;&amp; (cfreq) &gt;= (sfreq) &amp;&amp; (cfreq) &lt;= (efreq))</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	struct device_node *np, *band_np;</div><div class='add'>+	struct ieee80211_channel *ch;</div><div class='add'>+	int i, cfreq;</div><div class='add'>+</div><div class='add'>+	np = mt76_find_power_limits_node(mdev);</div><div class='add'>+</div><div class='add'>+	sband = wiphy-&gt;bands[NL80211_BAND_5GHZ];</div><div class='add'>+	band_np = np ? of_get_child_by_name(np, "txpower-5g") : NULL;</div><div class='add'>+	for (i = 0; i &lt; sband-&gt;n_channels; i++) {</div><div class='add'>+		ch = &amp;sband-&gt;channels[i];</div><div class='add'>+		cfreq = ch-&gt;center_freq;</div><div class='add'>+</div><div class='add'>+		if (np &amp;&amp; (!band_np || !mt76_find_channel_node(band_np, ch))) {</div><div class='add'>+			ch-&gt;flags |= IEEE80211_CHAN_DISABLED;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* UNII-4 */</div><div class='add'>+		if (IS_UNII_INVALID(0, 5845, 5925))</div><div class='add'>+			ch-&gt;flags |= IEEE80211_CHAN_DISABLED;</div><div class='ctx'> 	}</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-static const struct ieee80211_iface_combination if_comb[] = {</div><div class='del'>-	{</div><div class='del'>-		.limits = if_limits,</div><div class='del'>-		.n_limits = ARRAY_SIZE(if_limits),</div><div class='del'>-		.max_interfaces = MT7921_MAX_INTERFACES,</div><div class='del'>-		.num_different_channels = 1,</div><div class='del'>-		.beacon_int_infra_match = true,</div><div class='add'>+	sband = wiphy-&gt;bands[NL80211_BAND_6GHZ];</div><div class='add'>+	if (!sband)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	band_np = np ? of_get_child_by_name(np, "txpower-6g") : NULL;</div><div class='add'>+	for (i = 0; i &lt; sband-&gt;n_channels; i++) {</div><div class='add'>+		ch = &amp;sband-&gt;channels[i];</div><div class='add'>+		cfreq = ch-&gt;center_freq;</div><div class='add'>+</div><div class='add'>+		if (np &amp;&amp; (!band_np || !mt76_find_channel_node(band_np, ch))) {</div><div class='add'>+			ch-&gt;flags |= IEEE80211_CHAN_DISABLED;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* UNII-5/6/7/8 */</div><div class='add'>+		if (IS_UNII_INVALID(1, 5925, 6425) ||</div><div class='add'>+		    IS_UNII_INVALID(2, 6425, 6525) ||</div><div class='add'>+		    IS_UNII_INVALID(3, 6525, 6875) ||</div><div class='add'>+		    IS_UNII_INVALID(4, 6875, 7125))</div><div class='add'>+			ch-&gt;flags |= IEEE80211_CHAN_DISABLED;</div><div class='ctx'> 	}</div><div class='del'>-};</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7921_regd_update(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	struct ieee80211_hw *hw = mdev-&gt;hw;</div><div class='add'>+	struct wiphy *wiphy = hw-&gt;wiphy;</div><div class='add'>+</div><div class='add'>+	mt7921_mcu_set_clc(dev, mdev-&gt;alpha2, dev-&gt;country_ie_env);</div><div class='add'>+	mt7921_regd_channel_update(wiphy, dev);</div><div class='add'>+	mt76_connac_mcu_set_channel_domain(hw-&gt;priv);</div><div class='add'>+	mt7921_set_tx_sar_pwr(hw, NULL);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7921_regd_update);</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mt7921_regd_notifier(struct wiphy *wiphy,</div><div class='ctx'> 		     struct regulatory_request *request)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='del'>-	struct mt7921_phy *phy = mt7921_hw_phy(hw);</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(dev-&gt;mt76.alpha2, request-&gt;alpha2, sizeof(dev-&gt;mt76.alpha2));</div><div class='ctx'> 	dev-&gt;mt76.region = request-&gt;dfs_region;</div><div class='add'>+	dev-&gt;country_ie_env = request-&gt;country_ie_env;</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='del'>-	mt76_connac_mcu_set_channel_domain(hw-&gt;priv);</div><div class='del'>-	mt76_connac_mcu_set_rate_txpower(phy-&gt;mt76);</div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='del'>-}</div><div class='add'>+	if (request-&gt;initiator == NL80211_REGDOM_SET_BY_USER) {</div><div class='add'>+		if (dev-&gt;mt76.alpha2[0] == '0' &amp;&amp; dev-&gt;mt76.alpha2[1] == '0')</div><div class='add'>+			wiphy-&gt;regulatory_flags &amp;= ~REGULATORY_COUNTRY_IE_IGNORE;</div><div class='add'>+		else</div><div class='add'>+			wiphy-&gt;regulatory_flags |= REGULATORY_COUNTRY_IE_IGNORE;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7921_init_wiphy(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_phy *phy = mt7921_hw_phy(hw);</div><div class='del'>-	struct wiphy *wiphy = hw-&gt;wiphy;</div><div class='add'>+	if (pm-&gt;suspended)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	hw-&gt;queues = 4;</div><div class='del'>-	hw-&gt;max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF;</div><div class='del'>-	hw-&gt;max_tx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF;</div><div class='del'>-</div><div class='del'>-	hw-&gt;radiotap_timestamp.units_pos =</div><div class='del'>-		IEEE80211_RADIOTAP_TIMESTAMP_UNIT_US;</div><div class='del'>-</div><div class='del'>-	phy-&gt;slottime = 9;</div><div class='del'>-</div><div class='del'>-	hw-&gt;sta_data_size = sizeof(struct mt7921_sta);</div><div class='del'>-	hw-&gt;vif_data_size = sizeof(struct mt7921_vif);</div><div class='del'>-</div><div class='del'>-	wiphy-&gt;iface_combinations = if_comb;</div><div class='del'>-	wiphy-&gt;n_iface_combinations = ARRAY_SIZE(if_comb);</div><div class='del'>-	wiphy-&gt;max_scan_ie_len = MT76_CONNAC_SCAN_IE_LEN;</div><div class='del'>-	wiphy-&gt;max_scan_ssids = 4;</div><div class='del'>-	wiphy-&gt;max_sched_scan_plan_interval =</div><div class='del'>-		MT76_CONNAC_MAX_SCHED_SCAN_INTERVAL;</div><div class='del'>-	wiphy-&gt;max_sched_scan_ie_len = IEEE80211_MAX_DATA_LEN;</div><div class='del'>-	wiphy-&gt;max_sched_scan_ssids = MT76_CONNAC_MAX_SCHED_SCAN_SSID;</div><div class='del'>-	wiphy-&gt;max_match_sets = MT76_CONNAC_MAX_SCAN_MATCH;</div><div class='del'>-	wiphy-&gt;max_sched_scan_reqs = 1;</div><div class='del'>-	wiphy-&gt;flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;</div><div class='del'>-	wiphy-&gt;reg_notifier = mt7921_regd_notifier;</div><div class='del'>-</div><div class='del'>-	wiphy-&gt;features |= NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR;</div><div class='del'>-	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_SET_SCAN_DWELL);</div><div class='del'>-</div><div class='del'>-	ieee80211_hw_set(hw, SINGLE_SCAN_ON_ALL_BANDS);</div><div class='del'>-	ieee80211_hw_set(hw, HAS_RATE_CONTROL);</div><div class='del'>-	ieee80211_hw_set(hw, SUPPORTS_TX_ENCAP_OFFLOAD);</div><div class='del'>-	ieee80211_hw_set(hw, WANT_MONITOR_VIF);</div><div class='del'>-	ieee80211_hw_set(hw, SUPPORTS_PS);</div><div class='del'>-	ieee80211_hw_set(hw, SUPPORTS_DYNAMIC_PS);</div><div class='del'>-</div><div class='del'>-	hw-&gt;max_tx_fragments = 4;</div><div class='del'>-}</div><div class='add'>+	dev-&gt;regd_in_progress = true;</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7921_mac_init_band(struct mt7921_dev *dev, u8 band)</div><div class='del'>-{</div><div class='del'>-	u32 mask, set;</div><div class='del'>-</div><div class='del'>-	mt76_rmw_field(dev, MT_TMAC_CTCR0(band),</div><div class='del'>-		       MT_TMAC_CTCR0_INS_DDLMT_REFTIME, 0x3f);</div><div class='del'>-	mt76_set(dev, MT_TMAC_CTCR0(band),</div><div class='del'>-		 MT_TMAC_CTCR0_INS_DDLMT_VHT_SMPDU_EN |</div><div class='del'>-		 MT_TMAC_CTCR0_INS_DDLMT_EN);</div><div class='del'>-</div><div class='del'>-	mask = MT_MDP_RCFR0_MCU_RX_MGMT |</div><div class='del'>-	       MT_MDP_RCFR0_MCU_RX_CTL_NON_BAR |</div><div class='del'>-	       MT_MDP_RCFR0_MCU_RX_CTL_BAR;</div><div class='del'>-	set = FIELD_PREP(MT_MDP_RCFR0_MCU_RX_MGMT, MT_MDP_TO_HIF) |</div><div class='del'>-	      FIELD_PREP(MT_MDP_RCFR0_MCU_RX_CTL_NON_BAR, MT_MDP_TO_HIF) |</div><div class='del'>-	      FIELD_PREP(MT_MDP_RCFR0_MCU_RX_CTL_BAR, MT_MDP_TO_HIF);</div><div class='del'>-	mt76_rmw(dev, MT_MDP_BNRCFR0(band), mask, set);</div><div class='del'>-</div><div class='del'>-	mask = MT_MDP_RCFR1_MCU_RX_BYPASS |</div><div class='del'>-	       MT_MDP_RCFR1_RX_DROPPED_UCAST |</div><div class='del'>-	       MT_MDP_RCFR1_RX_DROPPED_MCAST;</div><div class='del'>-	set = FIELD_PREP(MT_MDP_RCFR1_MCU_RX_BYPASS, MT_MDP_TO_HIF) |</div><div class='del'>-	      FIELD_PREP(MT_MDP_RCFR1_RX_DROPPED_UCAST, MT_MDP_TO_HIF) |</div><div class='del'>-	      FIELD_PREP(MT_MDP_RCFR1_RX_DROPPED_MCAST, MT_MDP_TO_HIF);</div><div class='del'>-	mt76_rmw(dev, MT_MDP_BNRCFR1(band), mask, set);</div><div class='del'>-</div><div class='del'>-	mt76_set(dev, MT_WF_RMAC_MIB_TIME0(band), MT_WF_RMAC_MIB_RXTIME_EN);</div><div class='del'>-	mt76_set(dev, MT_WF_RMAC_MIB_AIRTIME0(band), MT_WF_RMAC_MIB_RXTIME_EN);</div><div class='del'>-</div><div class='del'>-	mt76_rmw_field(dev, MT_DMA_DCR0(band), MT_DMA_DCR0_MAX_RX_LEN, 1536);</div><div class='del'>-	/* disable rx rate report by default due to hw issues */</div><div class='del'>-	mt76_clear(dev, MT_DMA_DCR0(band), MT_DMA_DCR0_RXD_G5_EN);</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	mt7921_regd_update(dev);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	dev-&gt;regd_in_progress = false;</div><div class='add'>+	wake_up(&amp;dev-&gt;wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt7921_mac_init(struct mt7921_dev *dev)</div><div class='add'>+int mt7921_mac_init(struct mt792x_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	mt76_rmw_field(dev, MT_MDP_DCR1, MT_MDP_DCR1_MAX_RX_LEN, 1536);</div><div class='del'>-	/* disable hardware de-agg */</div><div class='del'>-	mt76_clear(dev, MT_MDP_DCR0, MT_MDP_DCR0_DAMSDU_EN);</div><div class='del'>-	mt76_clear(dev, MT_MDP_DCR0, MT_MDP_DCR0_RX_HDR_TRANS_EN);</div><div class='add'>+	/* enable hardware de-agg */</div><div class='add'>+	mt76_set(dev, MT_MDP_DCR0, MT_MDP_DCR0_DAMSDU_EN);</div><div class='add'>+	/* enable hardware rx header translation */</div><div class='add'>+	mt76_set(dev, MT_MDP_DCR0, MT_MDP_DCR0_RX_HDR_TRANS_EN);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MT7921_WTBL_SIZE; i++)</div><div class='add'>+	for (i = 0; i &lt; MT792x_WTBL_SIZE; i++)</div><div class='ctx'> 		mt7921_mac_wtbl_update(dev, i,</div><div class='ctx'> 				       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);</div><div class='ctx'> 	for (i = 0; i &lt; 2; i++)</div><div class='del'>-		mt7921_mac_init_band(dev, i);</div><div class='add'>+		mt792x_mac_init_band(dev, i);</div><div class='ctx'> </div><div class='del'>-	mt76_connac_mcu_set_rts_thresh(&amp;dev-&gt;mt76, 0x92b, 0);</div><div class='add'>+	return mt76_connac_mcu_set_rts_thresh(&amp;dev-&gt;mt76, 0x92b, 0);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7921_mac_init);</div><div class='ctx'> </div><div class='del'>-static int mt7921_init_hardware(struct mt7921_dev *dev)</div><div class='add'>+static int __mt7921_init_hardware(struct mt792x_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	int ret, idx;</div><div class='del'>-</div><div class='del'>-	ret = mt7921_dma_init(dev);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	set_bit(MT76_STATE_INITIALIZED, &amp;dev-&gt;mphy.state);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* force firmware operation mode into normal state,</div><div class='ctx'> 	 * which should be set before firmware download stage.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mt76_wr(dev, MT_SWDEF_MODE, MT_SWDEF_NORMAL_MODE);</div><div class='del'>-</div><div class='del'>-	ret = mt7921_mcu_init(dev);</div><div class='add'>+	ret = mt792x_mcu_init(dev);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = mt7921_eeprom_init(dev);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='add'>+	ret = mt76_eeprom_override(&amp;dev-&gt;mphy);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ret = mt7921_mcu_set_eeprom(dev);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	/* Beacon and mgmt frames should occupy wcid 0 */</div><div class='del'>-	idx = mt76_wcid_alloc(dev-&gt;mt76.wcid_mask, MT7921_WTBL_STA - 1);</div><div class='del'>-	if (idx)</div><div class='del'>-		return -ENOSPC;</div><div class='add'>+	ret = mt7921_mac_init(dev);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mt76.global_wcid.idx = idx;</div><div class='del'>-	dev-&gt;mt76.global_wcid.hw_key_idx = -1;</div><div class='del'>-	dev-&gt;mt76.global_wcid.tx_info |= MT_WCID_TX_INFO_SET;</div><div class='del'>-	rcu_assign_pointer(dev-&gt;mt76.wcid[idx], &amp;dev-&gt;mt76.global_wcid);</div><div class='add'>+static int mt7921_init_hardware(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='ctx'> </div><div class='del'>-	mt7921_mac_init(dev);</div><div class='add'>+	set_bit(MT76_STATE_INITIALIZED, &amp;dev-&gt;mphy.state);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MT792x_MCU_INIT_RETRY_COUNT; i++) {</div><div class='add'>+		ret = __mt7921_init_hardware(dev);</div><div class='add'>+		if (!ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		mt792x_init_reset(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i == MT792x_MCU_INIT_RETRY_COUNT) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "hardware init failed\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7921_register_device(struct mt7921_dev *dev)</div><div class='add'>+static void mt7921_init_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(work, struct mt792x_dev,</div><div class='add'>+					      init_work);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7921_init_hardware(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mt76_set_stream_caps(&amp;dev-&gt;mphy, true);</div><div class='add'>+	mt7921_set_stream_he_caps(&amp;dev-&gt;phy);</div><div class='add'>+	mt792x_config_mac_addr_list(dev);</div><div class='add'>+</div><div class='add'>+	ret = mt76_register_device(&amp;dev-&gt;mt76, true, mt76_rates,</div><div class='add'>+				   ARRAY_SIZE(mt76_rates));</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "register device failed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt7921_init_debugfs(dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "register debugfs failed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt7921_thermal_init(&amp;dev-&gt;phy);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "thermal init failed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* we support chip reset now */</div><div class='add'>+	dev-&gt;hw_init_done = true;</div><div class='add'>+</div><div class='add'>+	mt76_connac_mcu_set_deep_sleep(&amp;dev-&gt;mt76, dev-&gt;pm.ds_enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7921_register_device(struct mt792x_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -216,35 +271,58 @@ int mt7921_register_device(struct mt7921_dev *dev)</div><div class='ctx'> 	dev-&gt;phy.dev = dev;</div><div class='ctx'> 	dev-&gt;phy.mt76 = &amp;dev-&gt;mt76.phy;</div><div class='ctx'> 	dev-&gt;mt76.phy.priv = &amp;dev-&gt;phy;</div><div class='del'>-	dev-&gt;mt76.tx_worker.fn = mt7921_tx_worker;</div><div class='add'>+	dev-&gt;mt76.tx_worker.fn = mt792x_tx_worker;</div><div class='ctx'> </div><div class='del'>-	INIT_DELAYED_WORK(&amp;dev-&gt;pm.ps_work, mt7921_pm_power_save_work);</div><div class='del'>-	INIT_WORK(&amp;dev-&gt;pm.wake_work, mt7921_pm_wake_work);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;dev-&gt;pm.ps_work, mt792x_pm_power_save_work);</div><div class='add'>+	INIT_WORK(&amp;dev-&gt;pm.wake_work, mt792x_pm_wake_work);</div><div class='ctx'> 	spin_lock_init(&amp;dev-&gt;pm.wake.lock);</div><div class='ctx'> 	mutex_init(&amp;dev-&gt;pm.mutex);</div><div class='ctx'> 	init_waitqueue_head(&amp;dev-&gt;pm.wait);</div><div class='add'>+	init_waitqueue_head(&amp;dev-&gt;wait);</div><div class='add'>+	if (mt76_is_sdio(&amp;dev-&gt;mt76))</div><div class='add'>+		init_waitqueue_head(&amp;dev-&gt;mt76.sdio.wait);</div><div class='ctx'> 	spin_lock_init(&amp;dev-&gt;pm.txq_lock);</div><div class='del'>-	set_bit(MT76_STATE_PM, &amp;dev-&gt;mphy.state);</div><div class='del'>-	INIT_LIST_HEAD(&amp;dev-&gt;phy.stats_list);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;dev-&gt;mphy.mac_work, mt7921_mac_work);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;dev-&gt;mphy.mac_work, mt792x_mac_work);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;dev-&gt;phy.scan_work, mt7921_scan_work);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;dev-&gt;coredump.work, mt7921_coredump_work);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	INIT_WORK(&amp;dev-&gt;ipv6_ns_work, mt7921_set_ipv6_ns_work);</div><div class='add'>+	skb_queue_head_init(&amp;dev-&gt;ipv6_ns_list);</div><div class='add'>+#endif</div><div class='ctx'> 	skb_queue_head_init(&amp;dev-&gt;phy.scan_event_list);</div><div class='ctx'> 	skb_queue_head_init(&amp;dev-&gt;coredump.msg_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;dev-&gt;sta_poll_list);</div><div class='del'>-	spin_lock_init(&amp;dev-&gt;sta_poll_lock);</div><div class='ctx'> </div><div class='ctx'> 	INIT_WORK(&amp;dev-&gt;reset_work, mt7921_mac_reset_work);</div><div class='add'>+	INIT_WORK(&amp;dev-&gt;init_work, mt7921_init_work);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;pm.idle_timeout = MT7921_PM_TIMEOUT;</div><div class='add'>+	INIT_WORK(&amp;dev-&gt;phy.roc_work, mt7921_roc_work);</div><div class='add'>+	timer_setup(&amp;dev-&gt;phy.roc_timer, mt792x_roc_timer, 0);</div><div class='add'>+	init_waitqueue_head(&amp;dev-&gt;phy.roc_wait);</div><div class='add'>+</div><div class='add'>+	dev-&gt;pm.idle_timeout = MT792x_PM_TIMEOUT;</div><div class='ctx'> 	dev-&gt;pm.stats.last_wake_event = jiffies;</div><div class='ctx'> 	dev-&gt;pm.stats.last_doze_event = jiffies;</div><div class='add'>+	if (!mt76_is_usb(&amp;dev-&gt;mt76)) {</div><div class='add'>+		dev-&gt;pm.enable_user = true;</div><div class='add'>+		dev-&gt;pm.enable = true;</div><div class='add'>+		dev-&gt;pm.ds_enable_user = true;</div><div class='add'>+		dev-&gt;pm.ds_enable = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ret = mt7921_init_hardware(dev);</div><div class='add'>+	if (!mt76_is_mmio(&amp;dev-&gt;mt76))</div><div class='add'>+		hw-&gt;extra_tx_headroom += MT_SDIO_TXD_SIZE + MT_SDIO_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	mt792x_init_acpi_sar(dev);</div><div class='add'>+</div><div class='add'>+	ret = mt792x_init_wcid(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt792x_init_wiphy(hw);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	mt7921_init_wiphy(hw);</div><div class='add'>+	hw-&gt;wiphy-&gt;reg_notifier = mt7921_regd_notifier;</div><div class='ctx'> 	dev-&gt;mphy.sband_2g.sband.ht_cap.cap |=</div><div class='ctx'> 			IEEE80211_HT_CAP_LDPC_CODING |</div><div class='ctx'> 			IEEE80211_HT_CAP_MAX_AMSDU;</div><div class='hunk'>@@ -252,29 +330,21 @@ int mt7921_register_device(struct mt7921_dev *dev)</div><div class='ctx'> 			IEEE80211_HT_CAP_LDPC_CODING |</div><div class='ctx'> 			IEEE80211_HT_CAP_MAX_AMSDU;</div><div class='ctx'> 	dev-&gt;mphy.sband_5g.sband.vht_cap.cap |=</div><div class='del'>-			IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 |</div><div class='del'>-			IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;</div><div class='add'>+			IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 |</div><div class='add'>+			IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK |</div><div class='add'>+			IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE |</div><div class='add'>+			IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE |</div><div class='add'>+			(3 &lt;&lt; IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT);</div><div class='add'>+	if (is_mt7922(&amp;dev-&gt;mt76))</div><div class='add'>+		dev-&gt;mphy.sband_5g.sband.vht_cap.cap |=</div><div class='add'>+			IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ |</div><div class='add'>+			IEEE80211_VHT_CAP_SHORT_GI_160;</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;mphy.hw-&gt;wiphy-&gt;available_antennas_rx = dev-&gt;mphy.chainmask;</div><div class='ctx'> 	dev-&gt;mphy.hw-&gt;wiphy-&gt;available_antennas_tx = dev-&gt;mphy.chainmask;</div><div class='ctx'> </div><div class='del'>-	mt76_set_stream_caps(&amp;dev-&gt;mphy, true);</div><div class='del'>-	mt7921_set_stream_he_caps(&amp;dev-&gt;phy);</div><div class='del'>-</div><div class='del'>-	ret = mt76_register_device(&amp;dev-&gt;mt76, true, mt7921_rates,</div><div class='del'>-				   ARRAY_SIZE(mt7921_rates));</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	queue_work(system_percpu_wq, &amp;dev-&gt;init_work);</div><div class='ctx'> </div><div class='del'>-	return mt7921_init_debugfs(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mt7921_unregister_device(struct mt7921_dev *dev)</div><div class='del'>-{</div><div class='del'>-	mt76_unregister_device(&amp;dev-&gt;mt76);</div><div class='del'>-	mt7921_tx_token_put(dev);</div><div class='del'>-	mt7921_dma_cleanup(dev);</div><div class='del'>-	mt7921_mcu_exit(dev);</div><div class='del'>-</div><div class='del'>-	tasklet_disable(&amp;dev-&gt;irq_tasklet);</div><div class='del'>-	mt76_free_device(&amp;dev-&gt;mt76);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7921_register_device);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c<br/>index 214bd1859792..03b4960db73f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/mac.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/mac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7921/mac.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/devcoredump.h&gt;</div><div class='hunk'>@@ -6,41 +6,16 @@</div><div class='ctx'> #include &lt;linux/timekeeping.h&gt;</div><div class='ctx'> #include "mt7921.h"</div><div class='ctx'> #include "../dma.h"</div><div class='del'>-#include "mac.h"</div><div class='add'>+#include "../mt76_connac2_mac.h"</div><div class='ctx'> #include "mcu.h"</div><div class='ctx'> </div><div class='del'>-#define HE_BITS(f)		cpu_to_le16(IEEE80211_RADIOTAP_HE_##f)</div><div class='del'>-#define HE_PREP(f, m, v)	le16_encode_bits(le32_get_bits(v, MT_CRXV_HE_##m),\</div><div class='del'>-						 IEEE80211_RADIOTAP_HE_##f)</div><div class='add'>+#define MT_WTBL_TXRX_CAP_RATE_OFFSET	7</div><div class='add'>+#define MT_WTBL_TXRX_RATE_G2_HE		24</div><div class='add'>+#define MT_WTBL_TXRX_RATE_G2		12</div><div class='ctx'> </div><div class='del'>-static struct mt76_wcid *mt7921_rx_get_wcid(struct mt7921_dev *dev,</div><div class='del'>-					    u16 idx, bool unicast)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_sta *sta;</div><div class='del'>-	struct mt76_wcid *wcid;</div><div class='del'>-</div><div class='del'>-	if (idx &gt;= ARRAY_SIZE(dev-&gt;mt76.wcid))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	wcid = rcu_dereference(dev-&gt;mt76.wcid[idx]);</div><div class='del'>-	if (unicast || !wcid)</div><div class='del'>-		return wcid;</div><div class='del'>-</div><div class='del'>-	if (!wcid-&gt;sta)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	sta = container_of(wcid, struct mt7921_sta, wcid);</div><div class='del'>-	if (!sta-&gt;vif)</div><div class='del'>-		return NULL;</div><div class='add'>+#define MT_WTBL_AC0_CTT_OFFSET		20</div><div class='ctx'> </div><div class='del'>-	return &amp;sta-&gt;vif-&gt;sta.wcid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mt7921_sta_ps(struct mt76_dev *mdev, struct ieee80211_sta *sta, bool ps)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool mt7921_mac_wtbl_update(struct mt7921_dev *dev, int idx, u32 mask)</div><div class='add'>+bool mt7921_mac_wtbl_update(struct mt792x_dev *dev, int idx, u32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	mt76_rmw(dev, MT_WTBL_UPDATE, MT_WTBL_UPDATE_WLAN_IDX,</div><div class='ctx'> 		 FIELD_PREP(MT_WTBL_UPDATE_WLAN_IDX, idx) | mask);</div><div class='hunk'>@@ -49,7 +24,12 @@ bool mt7921_mac_wtbl_update(struct mt7921_dev *dev, int idx, u32 mask)</div><div class='ctx'> 			 0, 5000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt7921_mac_sta_poll(struct mt7921_dev *dev)</div><div class='add'>+static u32 mt7921_mac_wtbl_lmac_addr(int idx, u8 offset)</div><div class='add'>+{</div><div class='add'>+	return MT_WTBL_LMAC_OFFS(idx, 0) + offset * 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7921_mac_sta_poll(struct mt792x_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	static const u8 ac_to_tid[] = {</div><div class='ctx'> 		[IEEE80211_AC_BE] = 0,</div><div class='hunk'>@@ -58,44 +38,48 @@ static void mt7921_mac_sta_poll(struct mt7921_dev *dev)</div><div class='ctx'> 		[IEEE80211_AC_VO] = 6</div><div class='ctx'> 	};</div><div class='ctx'> 	struct ieee80211_sta *sta;</div><div class='del'>-	struct mt7921_sta *msta;</div><div class='add'>+	struct mt792x_sta *msta;</div><div class='add'>+	struct mt792x_link_sta *mlink;</div><div class='ctx'> 	u32 tx_time[IEEE80211_NUM_ACS], rx_time[IEEE80211_NUM_ACS];</div><div class='ctx'> 	LIST_HEAD(sta_poll_list);</div><div class='add'>+	struct rate_info *rate;</div><div class='add'>+	s8 rssi[4];</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-	list_splice_init(&amp;dev-&gt;sta_poll_list, &amp;sta_poll_list);</div><div class='del'>-	spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='add'>+	list_splice_init(&amp;dev-&gt;mt76.sta_poll_list, &amp;sta_poll_list);</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='ctx'> </div><div class='ctx'> 	while (true) {</div><div class='ctx'> 		bool clear = false;</div><div class='del'>-		u32 addr;</div><div class='add'>+		u32 addr, val;</div><div class='ctx'> 		u16 idx;</div><div class='add'>+		u8 bw;</div><div class='ctx'> </div><div class='del'>-		spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+		spin_lock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='ctx'> 		if (list_empty(&amp;sta_poll_list)) {</div><div class='del'>-			spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+			spin_unlock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		msta = list_first_entry(&amp;sta_poll_list,</div><div class='del'>-					struct mt7921_sta, poll_list);</div><div class='del'>-		list_del_init(&amp;msta-&gt;poll_list);</div><div class='del'>-		spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+		mlink = list_first_entry(&amp;sta_poll_list,</div><div class='add'>+					 struct mt792x_link_sta,</div><div class='add'>+					 wcid.poll_list);</div><div class='add'>+		msta = container_of(mlink, struct mt792x_sta, deflink);</div><div class='add'>+		list_del_init(&amp;mlink-&gt;wcid.poll_list);</div><div class='add'>+		spin_unlock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='ctx'> </div><div class='del'>-		idx = msta-&gt;wcid.idx;</div><div class='del'>-		addr = MT_WTBL_LMAC_OFFS(idx, 0) + 20 * 4;</div><div class='add'>+		idx = mlink-&gt;wcid.idx;</div><div class='add'>+		addr = mt7921_mac_wtbl_lmac_addr(idx, MT_WTBL_AC0_CTT_OFFSET);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; IEEE80211_NUM_ACS; i++) {</div><div class='del'>-			u32 tx_last = msta-&gt;airtime_ac[i];</div><div class='del'>-			u32 rx_last = msta-&gt;airtime_ac[i + 4];</div><div class='add'>+			u32 tx_last = mlink-&gt;airtime_ac[i];</div><div class='add'>+			u32 rx_last = mlink-&gt;airtime_ac[i + 4];</div><div class='ctx'> </div><div class='del'>-			msta-&gt;airtime_ac[i] = mt76_rr(dev, addr);</div><div class='del'>-			msta-&gt;airtime_ac[i + 4] = mt76_rr(dev, addr + 4);</div><div class='add'>+			mlink-&gt;airtime_ac[i] = mt76_rr(dev, addr);</div><div class='add'>+			mlink-&gt;airtime_ac[i + 4] = mt76_rr(dev, addr + 4);</div><div class='ctx'> </div><div class='del'>-			tx_time[i] = msta-&gt;airtime_ac[i] - tx_last;</div><div class='del'>-			rx_time[i] = msta-&gt;airtime_ac[i + 4] - rx_last;</div><div class='add'>+			tx_time[i] = mlink-&gt;airtime_ac[i] - tx_last;</div><div class='add'>+			rx_time[i] = mlink-&gt;airtime_ac[i + 4] - rx_last;</div><div class='ctx'> </div><div class='ctx'> 			if ((tx_last | rx_last) &amp; BIT(30))</div><div class='ctx'> 				clear = true;</div><div class='hunk'>@@ -106,16 +90,16 @@ static void mt7921_mac_sta_poll(struct mt7921_dev *dev)</div><div class='ctx'> 		if (clear) {</div><div class='ctx'> 			mt7921_mac_wtbl_update(dev, idx,</div><div class='ctx'> 					       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);</div><div class='del'>-			memset(msta-&gt;airtime_ac, 0, sizeof(msta-&gt;airtime_ac));</div><div class='add'>+			memset(mlink-&gt;airtime_ac, 0, sizeof(mlink-&gt;airtime_ac));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!msta-&gt;wcid.sta)</div><div class='add'>+		if (!mlink-&gt;wcid.sta)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		sta = container_of((void *)msta, struct ieee80211_sta,</div><div class='ctx'> 				   drv_priv);</div><div class='ctx'> 		for (i = 0; i &lt; IEEE80211_NUM_ACS; i++) {</div><div class='del'>-			u8 q = mt7921_lmac_mapping(dev, i);</div><div class='add'>+			u8 q = mt76_connac_lmac_mapping(i);</div><div class='ctx'> 			u32 tx_cur = tx_time[q];</div><div class='ctx'> 			u32 rx_cur = rx_time[q];</div><div class='ctx'> 			u8 tid = ac_to_tid[i];</div><div class='hunk'>@@ -126,203 +110,84 @@ static void mt7921_mac_sta_poll(struct mt7921_dev *dev)</div><div class='ctx'> 			ieee80211_sta_register_airtime(sta, tid, tx_cur,</div><div class='ctx'> 						       rx_cur);</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt7921_mac_decode_he_radiotap_ru(struct mt76_rx_status *status,</div><div class='del'>-				 struct ieee80211_radiotap_he *he,</div><div class='del'>-				 __le32 *rxv)</div><div class='del'>-{</div><div class='del'>-	u32 ru_h, ru_l;</div><div class='del'>-	u8 ru, offs = 0;</div><div class='del'>-</div><div class='del'>-	ru_l = FIELD_GET(MT_PRXV_HE_RU_ALLOC_L, le32_to_cpu(rxv[0]));</div><div class='del'>-	ru_h = FIELD_GET(MT_PRXV_HE_RU_ALLOC_H, le32_to_cpu(rxv[1]));</div><div class='del'>-	ru = (u8)(ru_l | ru_h &lt;&lt; 4);</div><div class='del'>-</div><div class='del'>-	status-&gt;bw = RATE_INFO_BW_HE_RU;</div><div class='ctx'> </div><div class='del'>-	switch (ru) {</div><div class='del'>-	case 0 ... 36:</div><div class='del'>-		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_26;</div><div class='del'>-		offs = ru;</div><div class='del'>-		break;</div><div class='del'>-	case 37 ... 52:</div><div class='del'>-		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_52;</div><div class='del'>-		offs = ru - 37;</div><div class='del'>-		break;</div><div class='del'>-	case 53 ... 60:</div><div class='del'>-		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_106;</div><div class='del'>-		offs = ru - 53;</div><div class='del'>-		break;</div><div class='del'>-	case 61 ... 64:</div><div class='del'>-		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_242;</div><div class='del'>-		offs = ru - 61;</div><div class='del'>-		break;</div><div class='del'>-	case 65 ... 66:</div><div class='del'>-		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_484;</div><div class='del'>-		offs = ru - 65;</div><div class='del'>-		break;</div><div class='del'>-	case 67:</div><div class='del'>-		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_996;</div><div class='del'>-		break;</div><div class='del'>-	case 68:</div><div class='del'>-		status-&gt;he_ru = NL80211_RATE_INFO_HE_RU_ALLOC_2x996;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+		/* We don't support reading GI info from txs packets.</div><div class='add'>+		 * For accurate tx status reporting and AQL improvement,</div><div class='add'>+		 * we need to make sure that flags match so polling GI</div><div class='add'>+		 * from per-sta counters directly.</div><div class='add'>+		 */</div><div class='add'>+		rate = &amp;mlink-&gt;wcid.rate;</div><div class='add'>+		addr = mt7921_mac_wtbl_lmac_addr(idx,</div><div class='add'>+						 MT_WTBL_TXRX_CAP_RATE_OFFSET);</div><div class='add'>+		val = mt76_rr(dev, addr);</div><div class='add'>+</div><div class='add'>+		switch (rate-&gt;bw) {</div><div class='add'>+		case RATE_INFO_BW_160:</div><div class='add'>+			bw = IEEE80211_STA_RX_BW_160;</div><div class='add'>+			break;</div><div class='add'>+		case RATE_INFO_BW_80:</div><div class='add'>+			bw = IEEE80211_STA_RX_BW_80;</div><div class='add'>+			break;</div><div class='add'>+		case RATE_INFO_BW_40:</div><div class='add'>+			bw = IEEE80211_STA_RX_BW_40;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			bw = IEEE80211_STA_RX_BW_20;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	he-&gt;data1 |= HE_BITS(DATA1_BW_RU_ALLOC_KNOWN);</div><div class='del'>-	he-&gt;data2 |= HE_BITS(DATA2_RU_OFFSET_KNOWN) |</div><div class='del'>-		     le16_encode_bits(offs,</div><div class='del'>-				      IEEE80211_RADIOTAP_HE_DATA2_RU_OFFSET);</div><div class='del'>-}</div><div class='add'>+		if (rate-&gt;flags &amp; RATE_INFO_FLAGS_HE_MCS) {</div><div class='add'>+			u8 offs = MT_WTBL_TXRX_RATE_G2_HE + 2 * bw;</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7921_mac_decode_he_radiotap(struct sk_buff *skb,</div><div class='del'>-			      struct mt76_rx_status *status,</div><div class='del'>-			      __le32 *rxv, u32 phy)</div><div class='del'>-{</div><div class='del'>-	/* TODO: struct ieee80211_radiotap_he_mu */</div><div class='del'>-	static const struct ieee80211_radiotap_he known = {</div><div class='del'>-		.data1 = HE_BITS(DATA1_DATA_MCS_KNOWN) |</div><div class='del'>-			 HE_BITS(DATA1_DATA_DCM_KNOWN) |</div><div class='del'>-			 HE_BITS(DATA1_STBC_KNOWN) |</div><div class='del'>-			 HE_BITS(DATA1_CODING_KNOWN) |</div><div class='del'>-			 HE_BITS(DATA1_LDPC_XSYMSEG_KNOWN) |</div><div class='del'>-			 HE_BITS(DATA1_DOPPLER_KNOWN) |</div><div class='del'>-			 HE_BITS(DATA1_BSS_COLOR_KNOWN),</div><div class='del'>-		.data2 = HE_BITS(DATA2_GI_KNOWN) |</div><div class='del'>-			 HE_BITS(DATA2_TXBF_KNOWN) |</div><div class='del'>-			 HE_BITS(DATA2_PE_DISAMBIG_KNOWN) |</div><div class='del'>-			 HE_BITS(DATA2_TXOP_KNOWN),</div><div class='del'>-	};</div><div class='del'>-	struct ieee80211_radiotap_he *he = NULL;</div><div class='del'>-	u32 ltf_size = le32_get_bits(rxv[2], MT_CRXV_HE_LTF_SIZE) + 1;</div><div class='del'>-</div><div class='del'>-	he = skb_push(skb, sizeof(known));</div><div class='del'>-	memcpy(he, &amp;known, sizeof(known));</div><div class='del'>-</div><div class='del'>-	he-&gt;data3 = HE_PREP(DATA3_BSS_COLOR, BSS_COLOR, rxv[14]) |</div><div class='del'>-		    HE_PREP(DATA3_LDPC_XSYMSEG, LDPC_EXT_SYM, rxv[2]);</div><div class='del'>-	he-&gt;data5 = HE_PREP(DATA5_PE_DISAMBIG, PE_DISAMBIG, rxv[2]) |</div><div class='del'>-		    le16_encode_bits(ltf_size,</div><div class='del'>-				     IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE);</div><div class='del'>-	he-&gt;data6 = HE_PREP(DATA6_TXOP, TXOP_DUR, rxv[14]) |</div><div class='del'>-		    HE_PREP(DATA6_DOPPLER, DOPPLER, rxv[14]);</div><div class='del'>-</div><div class='del'>-	switch (phy) {</div><div class='del'>-	case MT_PHY_TYPE_HE_SU:</div><div class='del'>-		he-&gt;data1 |= HE_BITS(DATA1_FORMAT_SU) |</div><div class='del'>-			     HE_BITS(DATA1_UL_DL_KNOWN) |</div><div class='del'>-			     HE_BITS(DATA1_BEAM_CHANGE_KNOWN) |</div><div class='del'>-			     HE_BITS(DATA1_SPTL_REUSE_KNOWN);</div><div class='del'>-</div><div class='del'>-		he-&gt;data3 |= HE_PREP(DATA3_BEAM_CHANGE, BEAM_CHNG, rxv[14]) |</div><div class='del'>-			     HE_PREP(DATA3_UL_DL, UPLINK, rxv[2]);</div><div class='del'>-		he-&gt;data4 |= HE_PREP(DATA4_SU_MU_SPTL_REUSE, SR_MASK, rxv[11]);</div><div class='del'>-		break;</div><div class='del'>-	case MT_PHY_TYPE_HE_EXT_SU:</div><div class='del'>-		he-&gt;data1 |= HE_BITS(DATA1_FORMAT_EXT_SU) |</div><div class='del'>-			     HE_BITS(DATA1_UL_DL_KNOWN);</div><div class='add'>+			rate-&gt;he_gi = (val &amp; (0x3 &lt;&lt; offs)) &gt;&gt; offs;</div><div class='add'>+		} else if (rate-&gt;flags &amp;</div><div class='add'>+			   (RATE_INFO_FLAGS_VHT_MCS | RATE_INFO_FLAGS_MCS)) {</div><div class='add'>+			if (val &amp; BIT(MT_WTBL_TXRX_RATE_G2 + bw))</div><div class='add'>+				rate-&gt;flags |= RATE_INFO_FLAGS_SHORT_GI;</div><div class='add'>+			else</div><div class='add'>+				rate-&gt;flags &amp;= ~RATE_INFO_FLAGS_SHORT_GI;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		he-&gt;data3 |= HE_PREP(DATA3_UL_DL, UPLINK, rxv[2]);</div><div class='del'>-		break;</div><div class='del'>-	case MT_PHY_TYPE_HE_MU:</div><div class='del'>-		he-&gt;data1 |= HE_BITS(DATA1_FORMAT_MU) |</div><div class='del'>-			     HE_BITS(DATA1_UL_DL_KNOWN) |</div><div class='del'>-			     HE_BITS(DATA1_SPTL_REUSE_KNOWN);</div><div class='add'>+		/* get signal strength of resp frames (CTS/BA/ACK) */</div><div class='add'>+		addr = mt7921_mac_wtbl_lmac_addr(idx, 30);</div><div class='add'>+		val = mt76_rr(dev, addr);</div><div class='ctx'> </div><div class='del'>-		he-&gt;data3 |= HE_PREP(DATA3_UL_DL, UPLINK, rxv[2]);</div><div class='del'>-		he-&gt;data4 |= HE_PREP(DATA4_SU_MU_SPTL_REUSE, SR_MASK, rxv[11]);</div><div class='add'>+		rssi[0] = to_rssi(GENMASK(7, 0), val);</div><div class='add'>+		rssi[1] = to_rssi(GENMASK(15, 8), val);</div><div class='add'>+		rssi[2] = to_rssi(GENMASK(23, 16), val);</div><div class='add'>+		rssi[3] = to_rssi(GENMASK(31, 14), val);</div><div class='ctx'> </div><div class='del'>-		mt7921_mac_decode_he_radiotap_ru(status, he, rxv);</div><div class='del'>-		break;</div><div class='del'>-	case MT_PHY_TYPE_HE_TB:</div><div class='del'>-		he-&gt;data1 |= HE_BITS(DATA1_FORMAT_TRIG) |</div><div class='del'>-			     HE_BITS(DATA1_SPTL_REUSE_KNOWN) |</div><div class='del'>-			     HE_BITS(DATA1_SPTL_REUSE2_KNOWN) |</div><div class='del'>-			     HE_BITS(DATA1_SPTL_REUSE3_KNOWN) |</div><div class='del'>-			     HE_BITS(DATA1_SPTL_REUSE4_KNOWN);</div><div class='del'>-</div><div class='del'>-		he-&gt;data4 |= HE_PREP(DATA4_TB_SPTL_REUSE1, SR_MASK, rxv[11]) |</div><div class='del'>-			     HE_PREP(DATA4_TB_SPTL_REUSE2, SR1_MASK, rxv[11]) |</div><div class='del'>-			     HE_PREP(DATA4_TB_SPTL_REUSE3, SR2_MASK, rxv[11]) |</div><div class='del'>-			     HE_PREP(DATA4_TB_SPTL_REUSE4, SR3_MASK, rxv[11]);</div><div class='del'>-</div><div class='del'>-		mt7921_mac_decode_he_radiotap_ru(status, he, rxv);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+		mlink-&gt;ack_signal =</div><div class='add'>+			mt76_rx_signal(msta-&gt;vif-&gt;phy-&gt;mt76-&gt;antenna_mask, rssi);</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7921_get_status_freq_info(struct mt7921_dev *dev, struct mt76_phy *mphy,</div><div class='del'>-			    struct mt76_rx_status *status, u8 chfreq)</div><div class='del'>-{</div><div class='del'>-	if (!test_bit(MT76_HW_SCANNING, &amp;mphy-&gt;state) &amp;&amp;</div><div class='del'>-	    !test_bit(MT76_HW_SCHED_SCANNING, &amp;mphy-&gt;state) &amp;&amp;</div><div class='del'>-	    !test_bit(MT76_STATE_ROC, &amp;mphy-&gt;state)) {</div><div class='del'>-		status-&gt;freq = mphy-&gt;chandef.chan-&gt;center_freq;</div><div class='del'>-		status-&gt;band = mphy-&gt;chandef.chan-&gt;band;</div><div class='del'>-		return;</div><div class='add'>+		ewma_avg_signal_add(&amp;mlink-&gt;avg_ack_signal, -mlink-&gt;ack_signal);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	status-&gt;band = chfreq &lt;= 14 ? NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;</div><div class='del'>-	status-&gt;freq = ieee80211_channel_to_frequency(chfreq, status-&gt;band);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt7921_mac_rssi_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb = priv;</div><div class='del'>-	struct mt76_rx_status *status = (struct mt76_rx_status *)skb-&gt;cb;</div><div class='del'>-	struct mt7921_vif *mvif = (struct mt7921_vif *)vif-&gt;drv_priv;</div><div class='del'>-	struct ieee80211_hdr *hdr = mt76_skb_get_hdr(skb);</div><div class='del'>-</div><div class='del'>-	if (status-&gt;signal &gt; 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!ether_addr_equal(vif-&gt;addr, hdr-&gt;addr1))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ewma_rssi_add(&amp;mvif-&gt;rssi, -status-&gt;signal);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7921_mac_assoc_rssi(struct mt7921_dev *dev, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hdr *hdr = mt76_skb_get_hdr(skb);</div><div class='del'>-</div><div class='del'>-	if (!ieee80211_is_assoc_resp(hdr-&gt;frame_control) &amp;&amp;</div><div class='del'>-	    !ieee80211_is_auth(hdr-&gt;frame_control))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev),</div><div class='del'>-		IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='del'>-		mt7921_mac_rssi_iter, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mt7921_mac_fill_rx(struct mt7921_dev *dev, struct sk_buff *skb)</div><div class='add'>+static int</div><div class='add'>+mt7921_mac_fill_rx(struct mt792x_dev *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	u32 csum_mask = MT_RXD0_NORMAL_IP_SUM | MT_RXD0_NORMAL_UDP_TCP_SUM;</div><div class='ctx'> 	struct mt76_rx_status *status = (struct mt76_rx_status *)skb-&gt;cb;</div><div class='add'>+	bool hdr_trans, unicast, insert_ccmp_hdr = false;</div><div class='add'>+	u8 chfreq, qos_ctl = 0, remove_pad, amsdu_info;</div><div class='add'>+	u16 hdr_gap;</div><div class='add'>+	__le32 *rxv = NULL, *rxd = (__le32 *)skb-&gt;data;</div><div class='ctx'> 	struct mt76_phy *mphy = &amp;dev-&gt;mt76.phy;</div><div class='del'>-	struct mt7921_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct mt792x_phy *phy = &amp;dev-&gt;phy;</div><div class='ctx'> 	struct ieee80211_supported_band *sband;</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-	__le32 *rxd = (__le32 *)skb-&gt;data;</div><div class='del'>-	__le32 *rxv = NULL;</div><div class='del'>-	u32 mode = 0;</div><div class='add'>+	u32 csum_status = *(u32 *)skb-&gt;cb;</div><div class='add'>+	u32 rxd0 = le32_to_cpu(rxd[0]);</div><div class='ctx'> 	u32 rxd1 = le32_to_cpu(rxd[1]);</div><div class='ctx'> 	u32 rxd2 = le32_to_cpu(rxd[2]);</div><div class='ctx'> 	u32 rxd3 = le32_to_cpu(rxd[3]);</div><div class='del'>-	bool unicast, insert_ccmp_hdr = false;</div><div class='del'>-	u8 remove_pad;</div><div class='add'>+	u32 rxd4 = le32_to_cpu(rxd[4]);</div><div class='add'>+	struct mt792x_sta *msta = NULL;</div><div class='add'>+	struct mt792x_link_sta *mlink;</div><div class='add'>+	u16 seq_ctrl = 0;</div><div class='add'>+	__le16 fc = 0;</div><div class='add'>+	u8 mode = 0;</div><div class='ctx'> 	int i, idx;</div><div class='del'>-	u8 chfreq;</div><div class='ctx'> </div><div class='ctx'> 	memset(status, 0, sizeof(*status));</div><div class='ctx'> </div><div class='hunk'>@@ -332,31 +197,49 @@ int mt7921_mac_fill_rx(struct mt7921_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	if (!test_bit(MT76_STATE_RUNNING, &amp;mphy-&gt;state))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (rxd2 &amp; MT_RXD2_NORMAL_AMSDU_ERR)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	hdr_trans = rxd2 &amp; MT_RXD2_NORMAL_HDR_TRANS;</div><div class='add'>+	if (hdr_trans &amp;&amp; (rxd1 &amp; MT_RXD1_NORMAL_CM))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* ICV error or CCMP/BIP/WPI MIC error */</div><div class='add'>+	if (rxd1 &amp; MT_RXD1_NORMAL_ICV_ERR)</div><div class='add'>+		status-&gt;flag |= RX_FLAG_ONLY_MONITOR;</div><div class='add'>+</div><div class='ctx'> 	chfreq = FIELD_GET(MT_RXD3_NORMAL_CH_FREQ, rxd3);</div><div class='ctx'> 	unicast = FIELD_GET(MT_RXD3_NORMAL_ADDR_TYPE, rxd3) == MT_RXD3_NORMAL_U2M;</div><div class='ctx'> 	idx = FIELD_GET(MT_RXD1_NORMAL_WLAN_IDX, rxd1);</div><div class='del'>-	status-&gt;wcid = mt7921_rx_get_wcid(dev, idx, unicast);</div><div class='add'>+	status-&gt;wcid = mt792x_rx_get_wcid(dev, idx, unicast);</div><div class='ctx'> </div><div class='ctx'> 	if (status-&gt;wcid) {</div><div class='del'>-		struct mt7921_sta *msta;</div><div class='del'>-</div><div class='del'>-		msta = container_of(status-&gt;wcid, struct mt7921_sta, wcid);</div><div class='del'>-		spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-		if (list_empty(&amp;msta-&gt;poll_list))</div><div class='del'>-			list_add_tail(&amp;msta-&gt;poll_list, &amp;dev-&gt;sta_poll_list);</div><div class='del'>-		spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+		mlink = container_of(status-&gt;wcid, struct mt792x_link_sta, wcid);</div><div class='add'>+		msta = container_of(mlink, struct mt792x_sta, deflink);</div><div class='add'>+		mt76_wcid_add_poll(&amp;dev-&gt;mt76, &amp;mlink-&gt;wcid);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mt7921_get_status_freq_info(dev, mphy, status, chfreq);</div><div class='add'>+	mt792x_get_status_freq_info(status, chfreq);</div><div class='ctx'> </div><div class='del'>-	if (status-&gt;band == NL80211_BAND_5GHZ)</div><div class='add'>+	switch (status-&gt;band) {</div><div class='add'>+	case NL80211_BAND_5GHZ:</div><div class='ctx'> 		sband = &amp;mphy-&gt;sband_5g.sband;</div><div class='del'>-	else</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_BAND_6GHZ:</div><div class='add'>+		sband = &amp;mphy-&gt;sband_6g.sband;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		sband = &amp;mphy-&gt;sband_2g.sband;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!sband-&gt;channels)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (mt76_is_mmio(&amp;dev-&gt;mt76) &amp;&amp; (rxd0 &amp; csum_mask) == csum_mask &amp;&amp;</div><div class='add'>+	    !(csum_status &amp; (BIT(0) | BIT(2) | BIT(3))))</div><div class='add'>+		skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+</div><div class='ctx'> 	if (rxd1 &amp; MT_RXD1_NORMAL_FCS_ERR)</div><div class='ctx'> 		status-&gt;flag |= RX_FLAG_FAILED_FCS_CRC;</div><div class='ctx'> </div><div class='hunk'>@@ -377,6 +260,13 @@ int mt7921_mac_fill_rx(struct mt7921_dev *dev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	rxd += 6;</div><div class='ctx'> 	if (rxd1 &amp; MT_RXD1_NORMAL_GROUP_4) {</div><div class='add'>+		u32 v0 = le32_to_cpu(rxd[0]);</div><div class='add'>+		u32 v2 = le32_to_cpu(rxd[2]);</div><div class='add'>+</div><div class='add'>+		fc = cpu_to_le16(FIELD_GET(MT_RXD6_FRAME_CONTROL, v0));</div><div class='add'>+		seq_ctrl = FIELD_GET(MT_RXD8_SEQ_CTRL, v2);</div><div class='add'>+		qos_ctl = FIELD_GET(MT_RXD8_QOS_CTL, v2);</div><div class='add'>+</div><div class='ctx'> 		rxd += 4;</div><div class='ctx'> 		if ((u8 *)rxd - skb-&gt;data &gt;= skb-&gt;len)</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -386,14 +276,27 @@ int mt7921_mac_fill_rx(struct mt7921_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 		u8 *data = (u8 *)rxd;</div><div class='ctx'> </div><div class='ctx'> 		if (status-&gt;flag &amp; RX_FLAG_DECRYPTED) {</div><div class='del'>-			status-&gt;iv[0] = data[5];</div><div class='del'>-			status-&gt;iv[1] = data[4];</div><div class='del'>-			status-&gt;iv[2] = data[3];</div><div class='del'>-			status-&gt;iv[3] = data[2];</div><div class='del'>-			status-&gt;iv[4] = data[1];</div><div class='del'>-			status-&gt;iv[5] = data[0];</div><div class='del'>-</div><div class='del'>-			insert_ccmp_hdr = FIELD_GET(MT_RXD2_NORMAL_FRAG, rxd2);</div><div class='add'>+			switch (FIELD_GET(MT_RXD1_NORMAL_SEC_MODE, rxd1)) {</div><div class='add'>+			case MT_CIPHER_AES_CCMP:</div><div class='add'>+			case MT_CIPHER_CCMP_CCX:</div><div class='add'>+			case MT_CIPHER_CCMP_256:</div><div class='add'>+				insert_ccmp_hdr =</div><div class='add'>+					FIELD_GET(MT_RXD2_NORMAL_FRAG, rxd2);</div><div class='add'>+				fallthrough;</div><div class='add'>+			case MT_CIPHER_TKIP:</div><div class='add'>+			case MT_CIPHER_TKIP_NO_MIC:</div><div class='add'>+			case MT_CIPHER_GCMP:</div><div class='add'>+			case MT_CIPHER_GCMP_256:</div><div class='add'>+				status-&gt;iv[0] = data[5];</div><div class='add'>+				status-&gt;iv[1] = data[4];</div><div class='add'>+				status-&gt;iv[2] = data[3];</div><div class='add'>+				status-&gt;iv[3] = data[2];</div><div class='add'>+				status-&gt;iv[4] = data[1];</div><div class='add'>+				status-&gt;iv[5] = data[0];</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		rxd += 4;</div><div class='ctx'> 		if ((u8 *)rxd - skb-&gt;data &gt;= skb-&gt;len)</div><div class='hunk'>@@ -424,9 +327,8 @@ int mt7921_mac_fill_rx(struct mt7921_dev *dev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	/* RXD Group 3 - P-RXV */</div><div class='ctx'> 	if (rxd1 &amp; MT_RXD1_NORMAL_GROUP_3) {</div><div class='del'>-		u8 stbc, gi;</div><div class='ctx'> 		u32 v0, v1;</div><div class='del'>-		bool cck;</div><div class='add'>+		int ret;</div><div class='ctx'> </div><div class='ctx'> 		rxv = rxd;</div><div class='ctx'> 		rxd += 2;</div><div class='hunk'>@@ -439,493 +341,157 @@ int mt7921_mac_fill_rx(struct mt7921_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 		if (v0 &amp; MT_PRXV_HT_AD_CODE)</div><div class='ctx'> 			status-&gt;enc_flags |= RX_ENC_FLAG_LDPC;</div><div class='ctx'> </div><div class='add'>+		ret = mt76_connac2_mac_fill_rx_rate(&amp;dev-&gt;mt76, status, sband,</div><div class='add'>+						    rxv, &amp;mode);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (rxd1 &amp; MT_RXD1_NORMAL_GROUP_5) {</div><div class='add'>+			rxd += 6;</div><div class='add'>+			if ((u8 *)rxd - skb-&gt;data &gt;= skb-&gt;len)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			rxv = rxd;</div><div class='add'>+			/* Monitor mode would use RCPI described in GROUP 5</div><div class='add'>+			 * instead.</div><div class='add'>+			 */</div><div class='add'>+			v1 = le32_to_cpu(rxv[0]);</div><div class='add'>+</div><div class='add'>+			rxd += 12;</div><div class='add'>+			if ((u8 *)rxd - skb-&gt;data &gt;= skb-&gt;len)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		status-&gt;chains = mphy-&gt;antenna_mask;</div><div class='ctx'> 		status-&gt;chain_signal[0] = to_rssi(MT_PRXV_RCPI0, v1);</div><div class='ctx'> 		status-&gt;chain_signal[1] = to_rssi(MT_PRXV_RCPI1, v1);</div><div class='ctx'> 		status-&gt;chain_signal[2] = to_rssi(MT_PRXV_RCPI2, v1);</div><div class='ctx'> 		status-&gt;chain_signal[3] = to_rssi(MT_PRXV_RCPI3, v1);</div><div class='del'>-		status-&gt;signal = status-&gt;chain_signal[0];</div><div class='del'>-</div><div class='del'>-		for (i = 1; i &lt; hweight8(mphy-&gt;antenna_mask); i++) {</div><div class='del'>-			if (!(status-&gt;chains &amp; BIT(i)))</div><div class='add'>+		status-&gt;signal = -128;</div><div class='add'>+		for (i = 0; i &lt; hweight8(mphy-&gt;antenna_mask); i++) {</div><div class='add'>+			if (!(status-&gt;chains &amp; BIT(i)) ||</div><div class='add'>+			    status-&gt;chain_signal[i] &gt;= 0)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			status-&gt;signal = max(status-&gt;signal,</div><div class='ctx'> 					     status-&gt;chain_signal[i]);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		stbc = FIELD_GET(MT_PRXV_STBC, v0);</div><div class='del'>-		gi = FIELD_GET(MT_PRXV_SGI, v0);</div><div class='del'>-		cck = false;</div><div class='del'>-</div><div class='del'>-		idx = i = FIELD_GET(MT_PRXV_TX_RATE, v0);</div><div class='del'>-		mode = FIELD_GET(MT_PRXV_TX_MODE, v0);</div><div class='del'>-</div><div class='del'>-		switch (mode) {</div><div class='del'>-		case MT_PHY_TYPE_CCK:</div><div class='del'>-			cck = true;</div><div class='del'>-			fallthrough;</div><div class='del'>-		case MT_PHY_TYPE_OFDM:</div><div class='del'>-			i = mt76_get_rate(&amp;dev-&gt;mt76, sband, i, cck);</div><div class='del'>-			break;</div><div class='del'>-		case MT_PHY_TYPE_HT_GF:</div><div class='del'>-		case MT_PHY_TYPE_HT:</div><div class='del'>-			status-&gt;encoding = RX_ENC_HT;</div><div class='del'>-			if (i &gt; 31)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		case MT_PHY_TYPE_VHT:</div><div class='del'>-			status-&gt;nss =</div><div class='del'>-				FIELD_GET(MT_PRXV_NSTS, v0) + 1;</div><div class='del'>-			status-&gt;encoding = RX_ENC_VHT;</div><div class='del'>-			if (i &gt; 9)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		case MT_PHY_TYPE_HE_MU:</div><div class='del'>-			status-&gt;flag |= RX_FLAG_RADIOTAP_HE_MU;</div><div class='del'>-			fallthrough;</div><div class='del'>-		case MT_PHY_TYPE_HE_SU:</div><div class='del'>-		case MT_PHY_TYPE_HE_EXT_SU:</div><div class='del'>-		case MT_PHY_TYPE_HE_TB:</div><div class='del'>-			status-&gt;nss =</div><div class='del'>-				FIELD_GET(MT_PRXV_NSTS, v0) + 1;</div><div class='del'>-			status-&gt;encoding = RX_ENC_HE;</div><div class='del'>-			status-&gt;flag |= RX_FLAG_RADIOTAP_HE;</div><div class='del'>-			i &amp;= GENMASK(3, 0);</div><div class='del'>-</div><div class='del'>-			if (gi &lt;= NL80211_RATE_INFO_HE_GI_3_2)</div><div class='del'>-				status-&gt;he_gi = gi;</div><div class='del'>-</div><div class='del'>-			status-&gt;he_dcm = !!(idx &amp; MT_PRXV_TX_DCM);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		status-&gt;rate_idx = i;</div><div class='del'>-</div><div class='del'>-		switch (FIELD_GET(MT_PRXV_FRAME_MODE, v0)) {</div><div class='del'>-		case IEEE80211_STA_RX_BW_20:</div><div class='del'>-			break;</div><div class='del'>-		case IEEE80211_STA_RX_BW_40:</div><div class='del'>-			if (mode &amp; MT_PHY_TYPE_HE_EXT_SU &amp;&amp;</div><div class='del'>-			    (idx &amp; MT_PRXV_TX_ER_SU_106T)) {</div><div class='del'>-				status-&gt;bw = RATE_INFO_BW_HE_RU;</div><div class='del'>-				status-&gt;he_ru =</div><div class='del'>-					NL80211_RATE_INFO_HE_RU_ALLOC_106;</div><div class='del'>-			} else {</div><div class='del'>-				status-&gt;bw = RATE_INFO_BW_40;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case IEEE80211_STA_RX_BW_80:</div><div class='del'>-			status-&gt;bw = RATE_INFO_BW_80;</div><div class='del'>-			break;</div><div class='del'>-		case IEEE80211_STA_RX_BW_160:</div><div class='del'>-			status-&gt;bw = RATE_INFO_BW_160;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		status-&gt;enc_flags |= RX_ENC_FLAG_STBC_MASK * stbc;</div><div class='del'>-		if (mode &lt; MT_PHY_TYPE_HE_SU &amp;&amp; gi)</div><div class='del'>-			status-&gt;enc_flags |= RX_ENC_FLAG_SHORT_GI;</div><div class='del'>-</div><div class='del'>-		if (rxd1 &amp; MT_RXD1_NORMAL_GROUP_5) {</div><div class='del'>-			rxd += 18;</div><div class='del'>-			if ((u8 *)rxd - skb-&gt;data &gt;= skb-&gt;len)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_pull(skb, (u8 *)rxd - skb-&gt;data + 2 * remove_pad);</div><div class='del'>-</div><div class='del'>-	if (insert_ccmp_hdr) {</div><div class='del'>-		u8 key_id = FIELD_GET(MT_RXD1_NORMAL_KEY_ID, rxd1);</div><div class='del'>-</div><div class='del'>-		mt76_insert_ccmp_hdr(skb, key_id);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mt7921_mac_assoc_rssi(dev, skb);</div><div class='del'>-</div><div class='del'>-	if (rxv &amp;&amp; status-&gt;flag &amp; RX_FLAG_RADIOTAP_HE)</div><div class='del'>-		mt7921_mac_decode_he_radiotap(skb, status, rxv, mode);</div><div class='del'>-</div><div class='del'>-	hdr = mt76_skb_get_hdr(skb);</div><div class='del'>-	if (!status-&gt;wcid || !ieee80211_is_data_qos(hdr-&gt;frame_control))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	status-&gt;aggr = unicast &amp;&amp;</div><div class='del'>-		       !ieee80211_is_qos_nullfunc(hdr-&gt;frame_control);</div><div class='del'>-	status-&gt;qos_ctl = *ieee80211_get_qos_ctl(hdr);</div><div class='del'>-	status-&gt;seqno = IEEE80211_SEQ_TO_SN(le16_to_cpu(hdr-&gt;seq_ctrl));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt7921_mac_write_txwi_8023(struct mt7921_dev *dev, __le32 *txwi,</div><div class='del'>-			   struct sk_buff *skb, struct mt76_wcid *wcid)</div><div class='del'>-{</div><div class='del'>-	u8 tid = skb-&gt;priority &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='del'>-	u8 fc_type, fc_stype;</div><div class='del'>-	bool wmm = false;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	if (wcid-&gt;sta) {</div><div class='del'>-		struct ieee80211_sta *sta;</div><div class='del'>-</div><div class='del'>-		sta = container_of((void *)wcid, struct ieee80211_sta, drv_priv);</div><div class='del'>-		wmm = sta-&gt;wme;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	val = FIELD_PREP(MT_TXD1_HDR_FORMAT, MT_HDR_FORMAT_802_3) |</div><div class='del'>-	      FIELD_PREP(MT_TXD1_TID, tid);</div><div class='del'>-</div><div class='del'>-	if (be16_to_cpu(skb-&gt;protocol) &gt;= ETH_P_802_3_MIN)</div><div class='del'>-		val |= MT_TXD1_ETH_802_3;</div><div class='del'>-</div><div class='del'>-	txwi[1] |= cpu_to_le32(val);</div><div class='del'>-</div><div class='del'>-	fc_type = IEEE80211_FTYPE_DATA &gt;&gt; 2;</div><div class='del'>-	fc_stype = wmm ? IEEE80211_STYPE_QOS_DATA &gt;&gt; 4 : 0;</div><div class='del'>-</div><div class='del'>-	val = FIELD_PREP(MT_TXD2_FRAME_TYPE, fc_type) |</div><div class='del'>-	      FIELD_PREP(MT_TXD2_SUB_TYPE, fc_stype);</div><div class='del'>-</div><div class='del'>-	txwi[2] |= cpu_to_le32(val);</div><div class='del'>-</div><div class='del'>-	val = FIELD_PREP(MT_TXD7_TYPE, fc_type) |</div><div class='del'>-	      FIELD_PREP(MT_TXD7_SUB_TYPE, fc_stype);</div><div class='del'>-	txwi[7] |= cpu_to_le32(val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt7921_mac_write_txwi_80211(struct mt7921_dev *dev, __le32 *txwi,</div><div class='del'>-			    struct sk_buff *skb, struct ieee80211_key_conf *key)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='del'>-	struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb-&gt;data;</div><div class='del'>-	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='del'>-	bool multicast = is_multicast_ether_addr(hdr-&gt;addr1);</div><div class='del'>-	u8 tid = skb-&gt;priority &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='del'>-	__le16 fc = hdr-&gt;frame_control;</div><div class='del'>-	u8 fc_type, fc_stype;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	if (ieee80211_is_action(fc) &amp;&amp;</div><div class='del'>-	    mgmt-&gt;u.action.category == WLAN_CATEGORY_BACK &amp;&amp;</div><div class='del'>-	    mgmt-&gt;u.action.u.addba_req.action_code == WLAN_ACTION_ADDBA_REQ) {</div><div class='del'>-		u16 capab = le16_to_cpu(mgmt-&gt;u.action.u.addba_req.capab);</div><div class='del'>-</div><div class='del'>-		txwi[5] |= cpu_to_le32(MT_TXD5_ADD_BA);</div><div class='del'>-		tid = (capab &gt;&gt; 2) &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='del'>-	} else if (ieee80211_is_back_req(hdr-&gt;frame_control)) {</div><div class='del'>-		struct ieee80211_bar *bar = (struct ieee80211_bar *)hdr;</div><div class='del'>-		u16 control = le16_to_cpu(bar-&gt;control);</div><div class='del'>-</div><div class='del'>-		tid = FIELD_GET(IEEE80211_BAR_CTRL_TID_INFO_MASK, control);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	val = FIELD_PREP(MT_TXD1_HDR_FORMAT, MT_HDR_FORMAT_802_11) |</div><div class='del'>-	      FIELD_PREP(MT_TXD1_HDR_INFO,</div><div class='del'>-			 ieee80211_get_hdrlen_from_skb(skb) / 2) |</div><div class='del'>-	      FIELD_PREP(MT_TXD1_TID, tid);</div><div class='del'>-	txwi[1] |= cpu_to_le32(val);</div><div class='del'>-</div><div class='del'>-	fc_type = (le16_to_cpu(fc) &amp; IEEE80211_FCTL_FTYPE) &gt;&gt; 2;</div><div class='del'>-	fc_stype = (le16_to_cpu(fc) &amp; IEEE80211_FCTL_STYPE) &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	val = FIELD_PREP(MT_TXD2_FRAME_TYPE, fc_type) |</div><div class='del'>-	      FIELD_PREP(MT_TXD2_SUB_TYPE, fc_stype) |</div><div class='del'>-	      FIELD_PREP(MT_TXD2_MULTICAST, multicast);</div><div class='del'>-</div><div class='del'>-	if (key &amp;&amp; multicast &amp;&amp; ieee80211_is_robust_mgmt_frame(skb) &amp;&amp;</div><div class='del'>-	    key-&gt;cipher == WLAN_CIPHER_SUITE_AES_CMAC) {</div><div class='del'>-		val |= MT_TXD2_BIP;</div><div class='del'>-		txwi[3] &amp;= ~cpu_to_le32(MT_TXD3_PROTECT_FRAME);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ieee80211_is_data(fc) || multicast)</div><div class='del'>-		val |= MT_TXD2_FIX_RATE;</div><div class='del'>-</div><div class='del'>-	txwi[2] |= cpu_to_le32(val);</div><div class='del'>-</div><div class='del'>-	if (ieee80211_is_beacon(fc)) {</div><div class='del'>-		txwi[3] &amp;= ~cpu_to_le32(MT_TXD3_SW_POWER_MGMT);</div><div class='del'>-		txwi[3] |= cpu_to_le32(MT_TXD3_REM_TX_COUNT);</div><div class='add'>+	amsdu_info = FIELD_GET(MT_RXD4_NORMAL_PAYLOAD_FORMAT, rxd4);</div><div class='add'>+	status-&gt;amsdu = !!amsdu_info;</div><div class='add'>+	if (status-&gt;amsdu) {</div><div class='add'>+		status-&gt;first_amsdu = amsdu_info == MT_RXD4_FIRST_AMSDU_FRAME;</div><div class='add'>+		status-&gt;last_amsdu = amsdu_info == MT_RXD4_LAST_AMSDU_FRAME;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;flags &amp; IEEE80211_TX_CTL_INJECTED) {</div><div class='del'>-		u16 seqno = le16_to_cpu(hdr-&gt;seq_ctrl);</div><div class='del'>-</div><div class='del'>-		if (ieee80211_is_back_req(hdr-&gt;frame_control)) {</div><div class='del'>-			struct ieee80211_bar *bar;</div><div class='add'>+	hdr_gap = (u8 *)rxd - skb-&gt;data + 2 * remove_pad;</div><div class='add'>+	if (hdr_trans &amp;&amp; ieee80211_has_morefrags(fc)) {</div><div class='add'>+		struct ieee80211_vif *vif;</div><div class='add'>+		int err;</div><div class='ctx'> </div><div class='del'>-			bar = (struct ieee80211_bar *)skb-&gt;data;</div><div class='del'>-			seqno = le16_to_cpu(bar-&gt;start_seq_num);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		val = MT_TXD3_SN_VALID |</div><div class='del'>-		      FIELD_PREP(MT_TXD3_SEQ, IEEE80211_SEQ_TO_SN(seqno));</div><div class='del'>-		txwi[3] |= cpu_to_le32(val);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	val = FIELD_PREP(MT_TXD7_TYPE, fc_type) |</div><div class='del'>-	      FIELD_PREP(MT_TXD7_SUB_TYPE, fc_stype);</div><div class='del'>-	txwi[7] |= cpu_to_le32(val);</div><div class='del'>-}</div><div class='add'>+		if (!msta || !msta-&gt;vif)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-void mt7921_mac_write_txwi(struct mt7921_dev *dev, __le32 *txwi,</div><div class='del'>-			   struct sk_buff *skb, struct mt76_wcid *wcid,</div><div class='del'>-			   struct ieee80211_key_conf *key, bool beacon)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='del'>-	struct ieee80211_vif *vif = info-&gt;control.vif;</div><div class='del'>-	struct mt76_phy *mphy = &amp;dev-&gt;mphy;</div><div class='del'>-	u8 p_fmt, q_idx, omac_idx = 0, wmm_idx = 0;</div><div class='del'>-	bool is_8023 = info-&gt;flags &amp; IEEE80211_TX_CTL_HW_80211_ENCAP;</div><div class='del'>-	u16 tx_count = 15;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	if (vif) {</div><div class='del'>-		struct mt76_vif *mvif = (struct mt76_vif *)vif-&gt;drv_priv;</div><div class='del'>-</div><div class='del'>-		omac_idx = mvif-&gt;omac_idx;</div><div class='del'>-		wmm_idx = mvif-&gt;wmm_idx;</div><div class='del'>-	}</div><div class='add'>+		vif = container_of((void *)msta-&gt;vif, struct ieee80211_vif,</div><div class='add'>+				   drv_priv);</div><div class='add'>+		err = mt76_connac2_reverse_frag0_hdr_trans(vif, skb, hdr_gap);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='del'>-	if (beacon) {</div><div class='del'>-		p_fmt = MT_TX_TYPE_FW;</div><div class='del'>-		q_idx = MT_LMAC_BCN0;</div><div class='del'>-	} else if (skb_get_queue_mapping(skb) &gt;= MT_TXQ_PSD) {</div><div class='del'>-		p_fmt = MT_TX_TYPE_CT;</div><div class='del'>-		q_idx = MT_LMAC_ALTX0;</div><div class='add'>+		hdr_trans = false;</div><div class='ctx'> 	} else {</div><div class='del'>-		p_fmt = MT_TX_TYPE_CT;</div><div class='del'>-		q_idx = wmm_idx * MT7921_MAX_WMM_SETS +</div><div class='del'>-			mt7921_lmac_mapping(dev, skb_get_queue_mapping(skb));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	val = FIELD_PREP(MT_TXD0_TX_BYTES, skb-&gt;len + MT_TXD_SIZE) |</div><div class='del'>-	      FIELD_PREP(MT_TXD0_PKT_FMT, p_fmt) |</div><div class='del'>-	      FIELD_PREP(MT_TXD0_Q_IDX, q_idx);</div><div class='del'>-	txwi[0] = cpu_to_le32(val);</div><div class='del'>-</div><div class='del'>-	val = MT_TXD1_LONG_FORMAT |</div><div class='del'>-	      FIELD_PREP(MT_TXD1_WLAN_IDX, wcid-&gt;idx) |</div><div class='del'>-	      FIELD_PREP(MT_TXD1_OWN_MAC, omac_idx);</div><div class='del'>-</div><div class='del'>-	txwi[1] = cpu_to_le32(val);</div><div class='del'>-	txwi[2] = 0;</div><div class='del'>-</div><div class='del'>-	val = FIELD_PREP(MT_TXD3_REM_TX_COUNT, tx_count);</div><div class='del'>-	if (key)</div><div class='del'>-		val |= MT_TXD3_PROTECT_FRAME;</div><div class='del'>-	if (info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)</div><div class='del'>-		val |= MT_TXD3_NO_ACK;</div><div class='del'>-</div><div class='del'>-	txwi[3] = cpu_to_le32(val);</div><div class='del'>-	txwi[4] = 0;</div><div class='del'>-	txwi[5] = 0;</div><div class='del'>-	txwi[6] = 0;</div><div class='del'>-	txwi[7] = wcid-&gt;amsdu ? cpu_to_le32(MT_TXD7_HW_AMSDU) : 0;</div><div class='del'>-</div><div class='del'>-	if (is_8023)</div><div class='del'>-		mt7921_mac_write_txwi_8023(dev, txwi, skb, wcid);</div><div class='del'>-	else</div><div class='del'>-		mt7921_mac_write_txwi_80211(dev, txwi, skb, key);</div><div class='del'>-</div><div class='del'>-	if (txwi[2] &amp; cpu_to_le32(MT_TXD2_FIX_RATE)) {</div><div class='del'>-		u16 rate;</div><div class='del'>-</div><div class='del'>-		/* hardware won't add HTC for mgmt/ctrl frame */</div><div class='del'>-		txwi[2] |= cpu_to_le32(MT_TXD2_HTC_VLD);</div><div class='del'>-</div><div class='del'>-		if (mphy-&gt;chandef.chan-&gt;band == NL80211_BAND_5GHZ)</div><div class='del'>-			rate = MT7921_5G_RATE_DEFAULT;</div><div class='del'>-		else</div><div class='del'>-			rate = MT7921_2G_RATE_DEFAULT;</div><div class='del'>-</div><div class='del'>-		val = MT_TXD6_FIXED_BW |</div><div class='del'>-		      FIELD_PREP(MT_TXD6_TX_RATE, rate);</div><div class='del'>-		txwi[6] |= cpu_to_le32(val);</div><div class='del'>-		txwi[3] |= cpu_to_le32(MT_TXD3_BA_DISABLE);</div><div class='add'>+		skb_pull(skb, hdr_gap);</div><div class='add'>+		if (!hdr_trans &amp;&amp; status-&gt;amsdu) {</div><div class='add'>+			memmove(skb-&gt;data + 2, skb-&gt;data,</div><div class='add'>+				ieee80211_get_hdrlen_from_skb(skb));</div><div class='add'>+			skb_pull(skb, 2);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7921_write_hw_txp(struct mt7921_dev *dev, struct mt76_tx_info *tx_info,</div><div class='del'>-		    void *txp_ptr, u32 id)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_hw_txp *txp = txp_ptr;</div><div class='del'>-	struct mt7921_txp_ptr *ptr = &amp;txp-&gt;ptr[0];</div><div class='del'>-	int i, nbuf = tx_info-&gt;nbuf - 1;</div><div class='del'>-</div><div class='del'>-	tx_info-&gt;buf[0].len = MT_TXD_SIZE + sizeof(*txp);</div><div class='del'>-	tx_info-&gt;nbuf = 1;</div><div class='del'>-</div><div class='del'>-	txp-&gt;msdu_id[0] = cpu_to_le16(id | MT_MSDU_ID_VALID);</div><div class='add'>+	if (!hdr_trans) {</div><div class='add'>+		struct ieee80211_hdr *hdr;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; nbuf; i++) {</div><div class='del'>-		u16 len = tx_info-&gt;buf[i + 1].len &amp; MT_TXD_LEN_MASK;</div><div class='del'>-		u32 addr = tx_info-&gt;buf[i + 1].addr;</div><div class='add'>+		if (insert_ccmp_hdr) {</div><div class='add'>+			u8 key_id = FIELD_GET(MT_RXD1_NORMAL_KEY_ID, rxd1);</div><div class='ctx'> </div><div class='del'>-		if (i == nbuf - 1)</div><div class='del'>-			len |= MT_TXD_LEN_LAST;</div><div class='add'>+			mt76_insert_ccmp_hdr(skb, key_id);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		if (i &amp; 1) {</div><div class='del'>-			ptr-&gt;buf1 = cpu_to_le32(addr);</div><div class='del'>-			ptr-&gt;len1 = cpu_to_le16(len);</div><div class='del'>-			ptr++;</div><div class='del'>-		} else {</div><div class='del'>-			ptr-&gt;buf0 = cpu_to_le32(addr);</div><div class='del'>-			ptr-&gt;len0 = cpu_to_le16(len);</div><div class='add'>+		hdr = mt76_skb_get_hdr(skb);</div><div class='add'>+		fc = hdr-&gt;frame_control;</div><div class='add'>+		if (ieee80211_is_data_qos(fc)) {</div><div class='add'>+			seq_ctrl = le16_to_cpu(hdr-&gt;seq_ctrl);</div><div class='add'>+			qos_ctl = *ieee80211_get_qos_ctl(hdr);</div><div class='ctx'> 		}</div><div class='add'>+	} else {</div><div class='add'>+		status-&gt;flag |= RX_FLAG_8023;</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mt7921_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='del'>-			  enum mt76_txq_id qid, struct mt76_wcid *wcid,</div><div class='del'>-			  struct ieee80211_sta *sta,</div><div class='del'>-			  struct mt76_tx_info *tx_info)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);</div><div class='del'>-	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx_info-&gt;skb);</div><div class='del'>-	struct ieee80211_key_conf *key = info-&gt;control.hw_key;</div><div class='del'>-	struct mt76_tx_cb *cb = mt76_tx_skb_cb(tx_info-&gt;skb);</div><div class='del'>-	struct mt76_txwi_cache *t;</div><div class='del'>-	struct mt7921_txp_common *txp;</div><div class='del'>-	int id;</div><div class='del'>-	u8 *txwi = (u8 *)txwi_ptr;</div><div class='del'>-</div><div class='del'>-	if (unlikely(tx_info-&gt;skb-&gt;len &lt;= ETH_HLEN))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!wcid)</div><div class='del'>-		wcid = &amp;dev-&gt;mt76.global_wcid;</div><div class='ctx'> </div><div class='del'>-	cb-&gt;wcid = wcid-&gt;idx;</div><div class='add'>+	mt792x_mac_assoc_rssi(dev, skb);</div><div class='ctx'> </div><div class='del'>-	t = (struct mt76_txwi_cache *)(txwi + mdev-&gt;drv-&gt;txwi_size);</div><div class='del'>-	t-&gt;skb = tx_info-&gt;skb;</div><div class='add'>+	if (rxv &amp;&amp; mode &gt;= MT_PHY_TYPE_HE_SU &amp;&amp; !(status-&gt;flag &amp; RX_FLAG_8023))</div><div class='add'>+		mt76_connac2_mac_decode_he_radiotap(&amp;dev-&gt;mt76, skb, rxv, mode);</div><div class='ctx'> </div><div class='del'>-	id = mt76_token_consume(mdev, &amp;t);</div><div class='del'>-	if (id &lt; 0)</div><div class='del'>-		return id;</div><div class='del'>-</div><div class='del'>-	mt7921_mac_write_txwi(dev, txwi_ptr, tx_info-&gt;skb, wcid, key,</div><div class='del'>-			      false);</div><div class='del'>-</div><div class='del'>-	txp = (struct mt7921_txp_common *)(txwi + MT_TXD_SIZE);</div><div class='del'>-	memset(txp, 0, sizeof(struct mt7921_txp_common));</div><div class='del'>-	mt7921_write_hw_txp(dev, tx_info, txp, id);</div><div class='add'>+	if (!status-&gt;wcid || !ieee80211_is_data_qos(fc))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	tx_info-&gt;skb = DMA_DUMMY_DATA;</div><div class='add'>+	status-&gt;aggr = unicast &amp;&amp; !ieee80211_is_qos_nullfunc(fc);</div><div class='add'>+	status-&gt;seqno = IEEE80211_SEQ_TO_SN(seq_ctrl);</div><div class='add'>+	status-&gt;qos_ctl = qos_ctl;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7921_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi)</div><div class='add'>+void mt7921_mac_add_txs(struct mt792x_dev *dev, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_sta *msta;</div><div class='del'>-	u16 fc, tid;</div><div class='del'>-	u32 val;</div><div class='add'>+	struct mt792x_link_sta *mlink;</div><div class='add'>+	struct mt76_wcid *wcid;</div><div class='add'>+	__le32 *txs_data = data;</div><div class='add'>+	u16 wcidx;</div><div class='add'>+	u8 pid;</div><div class='ctx'> </div><div class='del'>-	if (!sta || !sta-&gt;ht_cap.ht_supported)</div><div class='add'>+	if (le32_get_bits(txs_data[0], MT_TXS0_TXS_FORMAT) &gt; 1)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	tid = FIELD_GET(MT_TXD1_TID, le32_to_cpu(txwi[1]));</div><div class='del'>-	if (tid &gt;= 6) /* skip VO queue */</div><div class='del'>-		return;</div><div class='add'>+	wcidx = le32_get_bits(txs_data[2], MT_TXS2_WCID);</div><div class='add'>+	pid = le32_get_bits(txs_data[3], MT_TXS3_PID);</div><div class='ctx'> </div><div class='del'>-	val = le32_to_cpu(txwi[2]);</div><div class='del'>-	fc = FIELD_GET(MT_TXD2_FRAME_TYPE, val) &lt;&lt; 2 |</div><div class='del'>-	     FIELD_GET(MT_TXD2_SUB_TYPE, val) &lt;&lt; 4;</div><div class='del'>-	if (unlikely(fc != (IEEE80211_FTYPE_DATA | IEEE80211_STYPE_QOS_DATA)))</div><div class='add'>+	if (pid &lt; MT_PACKET_ID_FIRST)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	msta = (struct mt7921_sta *)sta-&gt;drv_priv;</div><div class='del'>-	if (!test_and_set_bit(tid, &amp;msta-&gt;ampdu_state))</div><div class='del'>-		ieee80211_start_tx_ba_session(sta, tid, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt7921_tx_complete_status(struct mt76_dev *mdev, struct sk_buff *skb,</div><div class='del'>-			  struct ieee80211_sta *sta, u8 stat,</div><div class='del'>-			  struct list_head *free_list)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='del'>-	struct ieee80211_tx_status status = {</div><div class='del'>-		.sta = sta,</div><div class='del'>-		.info = info,</div><div class='del'>-		.skb = skb,</div><div class='del'>-		.free_list = free_list,</div><div class='del'>-	};</div><div class='del'>-	struct ieee80211_hw *hw;</div><div class='del'>-</div><div class='del'>-	if (sta) {</div><div class='del'>-		struct mt7921_sta *msta;</div><div class='del'>-</div><div class='del'>-		msta = (struct mt7921_sta *)sta-&gt;drv_priv;</div><div class='del'>-		status.rate = &amp;msta-&gt;stats.tx_rate;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hw = mt76_tx_status_get_hw(mdev, skb);</div><div class='del'>-</div><div class='del'>-	if (info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU)</div><div class='del'>-		info-&gt;flags |= IEEE80211_TX_STAT_AMPDU;</div><div class='del'>-</div><div class='del'>-	if (stat)</div><div class='del'>-		ieee80211_tx_info_clear_status(info);</div><div class='del'>-</div><div class='del'>-	if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK))</div><div class='del'>-		info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='add'>+	if (wcidx &gt;= MT792x_WTBL_SIZE)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	info-&gt;status.tx_time = 0;</div><div class='del'>-	ieee80211_tx_status_ext(hw, &amp;status);</div><div class='del'>-}</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-void mt7921_txp_skb_unmap(struct mt76_dev *dev,</div><div class='del'>-			  struct mt76_txwi_cache *t)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_txp_common *txp;</div><div class='del'>-	int i;</div><div class='add'>+	wcid = mt76_wcid_ptr(dev, wcidx);</div><div class='add'>+	if (!wcid)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	txp = mt7921_txwi_to_txp(dev, t);</div><div class='add'>+	mlink = container_of(wcid, struct mt792x_link_sta, wcid);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(txp-&gt;hw.ptr); i++) {</div><div class='del'>-		struct mt7921_txp_ptr *ptr = &amp;txp-&gt;hw.ptr[i];</div><div class='del'>-		bool last;</div><div class='del'>-		u16 len;</div><div class='add'>+	mt76_connac2_mac_add_txs_skb(&amp;dev-&gt;mt76, wcid, pid, txs_data);</div><div class='add'>+	if (!wcid-&gt;sta)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-		len = le16_to_cpu(ptr-&gt;len0);</div><div class='del'>-		last = len &amp; MT_TXD_LEN_LAST;</div><div class='del'>-		len &amp;= MT_TXD_LEN_MASK;</div><div class='del'>-		dma_unmap_single(dev-&gt;dev, le32_to_cpu(ptr-&gt;buf0), len,</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-		if (last)</div><div class='del'>-			break;</div><div class='add'>+	mt76_wcid_add_poll(&amp;dev-&gt;mt76, &amp;mlink-&gt;wcid);</div><div class='ctx'> </div><div class='del'>-		len = le16_to_cpu(ptr-&gt;len1);</div><div class='del'>-		last = len &amp; MT_TXD_LEN_LAST;</div><div class='del'>-		len &amp;= MT_TXD_LEN_MASK;</div><div class='del'>-		dma_unmap_single(dev-&gt;dev, le32_to_cpu(ptr-&gt;buf1), len,</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-		if (last)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt7921_mac_tx_free(struct mt7921_dev *dev, struct sk_buff *skb)</div><div class='add'>+static void mt7921_mac_tx_free(struct mt792x_dev *dev, void *data, int len)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_tx_free *free = (struct mt7921_tx_free *)skb-&gt;data;</div><div class='add'>+	struct mt76_connac_tx_free *free = data;</div><div class='add'>+	__le32 *tx_info = (__le32 *)(data + sizeof(*free));</div><div class='ctx'> 	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='ctx'> 	struct mt76_txwi_cache *txwi;</div><div class='ctx'> 	struct ieee80211_sta *sta = NULL;</div><div class='add'>+	struct mt76_wcid *wcid = NULL;</div><div class='add'>+	struct sk_buff *skb, *tmp;</div><div class='add'>+	void *end = data + len;</div><div class='ctx'> 	LIST_HEAD(free_list);</div><div class='del'>-	struct sk_buff *tmp;</div><div class='ctx'> 	bool wake = false;</div><div class='ctx'> 	u8 i, count;</div><div class='ctx'> </div><div class='hunk'>@@ -933,354 +499,184 @@ void mt7921_mac_tx_free(struct mt7921_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	mt76_queue_tx_cleanup(dev, dev-&gt;mphy.q_tx[MT_TXQ_PSD], false);</div><div class='ctx'> 	mt76_queue_tx_cleanup(dev, dev-&gt;mphy.q_tx[MT_TXQ_BE], false);</div><div class='ctx'> </div><div class='del'>-	/* TODO: MT_TX_FREE_LATENCY is msdu time from the TXD is queued into PLE,</div><div class='del'>-	 * to the time ack is received or dropped by hw (air + hw queue time).</div><div class='del'>-	 * Should avoid accessing WTBL to get Tx airtime, and use it instead.</div><div class='del'>-	 */</div><div class='del'>-	count = FIELD_GET(MT_TX_FREE_MSDU_CNT, le16_to_cpu(free-&gt;ctrl));</div><div class='add'>+	count = le16_get_bits(free-&gt;ctrl, MT_TX_FREE_MSDU_CNT);</div><div class='add'>+	if (WARN_ON_ONCE((void *)&amp;tx_info[count] &gt; end))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		u32 msdu, info = le32_to_cpu(free-&gt;info[i]);</div><div class='add'>+		u32 msdu, info = le32_to_cpu(tx_info[i]);</div><div class='ctx'> 		u8 stat;</div><div class='ctx'> </div><div class='ctx'> 		/* 1'b1: new wcid pair.</div><div class='ctx'> 		 * 1'b0: msdu_id with the same 'wcid pair' as above.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (info &amp; MT_TX_FREE_PAIR) {</div><div class='del'>-			struct mt7921_sta *msta;</div><div class='del'>-			struct mt7921_phy *phy;</div><div class='del'>-			struct mt76_wcid *wcid;</div><div class='add'>+			struct mt792x_link_sta *mlink;</div><div class='ctx'> 			u16 idx;</div><div class='ctx'> </div><div class='ctx'> 			count++;</div><div class='ctx'> 			idx = FIELD_GET(MT_TX_FREE_WLAN_ID, info);</div><div class='del'>-			wcid = rcu_dereference(dev-&gt;mt76.wcid[idx]);</div><div class='add'>+			wcid = mt76_wcid_ptr(dev, idx);</div><div class='ctx'> 			sta = wcid_to_sta(wcid);</div><div class='ctx'> 			if (!sta)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			msta = container_of(wcid, struct mt7921_sta, wcid);</div><div class='del'>-			phy = msta-&gt;vif-&gt;phy;</div><div class='del'>-			spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-			if (list_empty(&amp;msta-&gt;stats_list))</div><div class='del'>-				list_add_tail(&amp;msta-&gt;stats_list, &amp;phy-&gt;stats_list);</div><div class='del'>-			if (list_empty(&amp;msta-&gt;poll_list))</div><div class='del'>-				list_add_tail(&amp;msta-&gt;poll_list, &amp;dev-&gt;sta_poll_list);</div><div class='del'>-			spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+			mlink = container_of(wcid, struct mt792x_link_sta, wcid);</div><div class='add'>+			mt76_wcid_add_poll(&amp;dev-&gt;mt76, &amp;mlink-&gt;wcid);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		msdu = FIELD_GET(MT_TX_FREE_MSDU_ID, info);</div><div class='ctx'> 		stat = FIELD_GET(MT_TX_FREE_STATUS, info);</div><div class='ctx'> </div><div class='add'>+		if (wcid) {</div><div class='add'>+			wcid-&gt;stats.tx_retries +=</div><div class='add'>+				FIELD_GET(MT_TX_FREE_COUNT, info) - 1;</div><div class='add'>+			wcid-&gt;stats.tx_failed += !!stat;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		txwi = mt76_token_release(mdev, msdu, &amp;wake);</div><div class='ctx'> 		if (!txwi)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		mt7921_txp_skb_unmap(mdev, txwi);</div><div class='del'>-		if (txwi-&gt;skb) {</div><div class='del'>-			struct ieee80211_tx_info *info = IEEE80211_SKB_CB(txwi-&gt;skb);</div><div class='del'>-			void *txwi_ptr = mt76_get_txwi_ptr(mdev, txwi);</div><div class='del'>-</div><div class='del'>-			if (likely(txwi-&gt;skb-&gt;protocol != cpu_to_be16(ETH_P_PAE)))</div><div class='del'>-				mt7921_tx_check_aggr(sta, txwi_ptr);</div><div class='del'>-</div><div class='del'>-			if (sta &amp;&amp; !info-&gt;tx_time_est) {</div><div class='del'>-				struct mt76_wcid *wcid = (struct mt76_wcid *)sta-&gt;drv_priv;</div><div class='del'>-				int pending;</div><div class='del'>-</div><div class='del'>-				pending = atomic_dec_return(&amp;wcid-&gt;non_aql_packets);</div><div class='del'>-				if (pending &lt; 0)</div><div class='del'>-					atomic_cmpxchg(&amp;wcid-&gt;non_aql_packets, pending, 0);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			mt7921_tx_complete_status(mdev, txwi-&gt;skb, sta, stat, &amp;free_list);</div><div class='del'>-			txwi-&gt;skb = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		mt76_put_txwi(mdev, txwi);</div><div class='add'>+		mt76_connac2_txwi_free(mdev, txwi, sta, &amp;free_list);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (wake)</div><div class='ctx'> 		mt76_set_tx_blocked(&amp;dev-&gt;mt76, false);</div><div class='ctx'> </div><div class='del'>-	napi_consume_skb(skb, 1);</div><div class='del'>-</div><div class='ctx'> 	list_for_each_entry_safe(skb, tmp, &amp;free_list, list) {</div><div class='ctx'> 		skb_list_del_init(skb);</div><div class='ctx'> 		napi_consume_skb(skb, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	mt7921_mac_sta_poll(dev);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 	mt76_worker_schedule(&amp;dev-&gt;mt76.tx_worker);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt7921_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e)</div><div class='add'>+bool mt7921_rx_check(struct mt76_dev *mdev, void *data, int len)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev;</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	__le32 *rxd = (__le32 *)data;</div><div class='add'>+	__le32 *end = (__le32 *)&amp;rxd[len / 4];</div><div class='add'>+	enum rx_pkt_type type;</div><div class='ctx'> </div><div class='del'>-	if (!e-&gt;txwi) {</div><div class='del'>-		dev_kfree_skb_any(e-&gt;skb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev = container_of(mdev, struct mt7921_dev, mt76);</div><div class='del'>-</div><div class='del'>-	/* error path */</div><div class='del'>-	if (e-&gt;skb == DMA_DUMMY_DATA) {</div><div class='del'>-		struct mt76_txwi_cache *t;</div><div class='del'>-		struct mt7921_txp_common *txp;</div><div class='del'>-		u16 token;</div><div class='del'>-</div><div class='del'>-		txp = mt7921_txwi_to_txp(mdev, e-&gt;txwi);</div><div class='del'>-		token = le16_to_cpu(txp-&gt;hw.msdu_id[0]) &amp; ~MT_MSDU_ID_VALID;</div><div class='del'>-		t = mt76_token_put(mdev, token);</div><div class='del'>-		e-&gt;skb = t ? t-&gt;skb : NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (e-&gt;skb) {</div><div class='del'>-		struct mt76_tx_cb *cb = mt76_tx_skb_cb(e-&gt;skb);</div><div class='del'>-		struct mt76_wcid *wcid;</div><div class='del'>-</div><div class='del'>-		wcid = rcu_dereference(dev-&gt;mt76.wcid[cb-&gt;wcid]);</div><div class='del'>-</div><div class='del'>-		mt7921_tx_complete_status(mdev, e-&gt;skb, wcid_to_sta(wcid), 0,</div><div class='del'>-					  NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mt7921_mac_reset_counters(struct mt7921_phy *phy)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_dev *dev = phy-&gt;dev;</div><div class='del'>-	int i;</div><div class='add'>+	type = le32_get_bits(rxd[0], MT_RXD0_PKT_TYPE);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		mt76_rr(dev, MT_TX_AGG_CNT(0, i));</div><div class='del'>-		mt76_rr(dev, MT_TX_AGG_CNT2(0, i));</div><div class='add'>+	switch (type) {</div><div class='add'>+	case PKT_TYPE_TXRX_NOTIFY:</div><div class='add'>+		/* PKT_TYPE_TXRX_NOTIFY can be received only by mmio devices */</div><div class='add'>+		mt7921_mac_tx_free(dev, data, len); /* mmio */</div><div class='add'>+		return false;</div><div class='add'>+	case PKT_TYPE_TXS:</div><div class='add'>+		for (rxd += 2; rxd + 8 &lt;= end; rxd += 8)</div><div class='add'>+			mt7921_mac_add_txs(dev, rxd);</div><div class='add'>+		return false;</div><div class='add'>+	default:</div><div class='add'>+		return true;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	dev-&gt;mt76.phy.survey_time = ktime_get_boottime();</div><div class='del'>-	memset(&amp;dev-&gt;mt76.aggr_stats[0], 0, sizeof(dev-&gt;mt76.aggr_stats) / 2);</div><div class='del'>-</div><div class='del'>-	/* reset airtime counters */</div><div class='del'>-	mt76_rr(dev, MT_MIB_SDR9(0));</div><div class='del'>-	mt76_rr(dev, MT_MIB_SDR36(0));</div><div class='del'>-	mt76_rr(dev, MT_MIB_SDR37(0));</div><div class='del'>-</div><div class='del'>-	mt76_set(dev, MT_WF_RMAC_MIB_TIME0(0), MT_WF_RMAC_MIB_RXTIME_CLR);</div><div class='del'>-	mt76_set(dev, MT_WF_RMAC_MIB_AIRTIME0(0), MT_WF_RMAC_MIB_RXTIME_CLR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mt7921_mac_set_timing(struct mt7921_phy *phy)</div><div class='del'>-{</div><div class='del'>-	s16 coverage_class = phy-&gt;coverage_class;</div><div class='del'>-	struct mt7921_dev *dev = phy-&gt;dev;</div><div class='del'>-	u32 val, reg_offset;</div><div class='del'>-	u32 cck = FIELD_PREP(MT_TIMEOUT_VAL_PLCP, 231) |</div><div class='del'>-		  FIELD_PREP(MT_TIMEOUT_VAL_CCA, 48);</div><div class='del'>-	u32 ofdm = FIELD_PREP(MT_TIMEOUT_VAL_PLCP, 60) |</div><div class='del'>-		   FIELD_PREP(MT_TIMEOUT_VAL_CCA, 28);</div><div class='del'>-	int sifs, offset;</div><div class='del'>-	bool is_5ghz = phy-&gt;mt76-&gt;chandef.chan-&gt;band == NL80211_BAND_5GHZ;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(MT76_STATE_RUNNING, &amp;phy-&gt;mt76-&gt;state))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (is_5ghz)</div><div class='del'>-		sifs = 16;</div><div class='del'>-	else</div><div class='del'>-		sifs = 10;</div><div class='del'>-</div><div class='del'>-	mt76_set(dev, MT_ARB_SCR(0),</div><div class='del'>-		 MT_ARB_SCR_TX_DISABLE | MT_ARB_SCR_RX_DISABLE);</div><div class='del'>-	udelay(1);</div><div class='del'>-</div><div class='del'>-	offset = 3 * coverage_class;</div><div class='del'>-	reg_offset = FIELD_PREP(MT_TIMEOUT_VAL_PLCP, offset) |</div><div class='del'>-		     FIELD_PREP(MT_TIMEOUT_VAL_CCA, offset);</div><div class='del'>-</div><div class='del'>-	mt76_wr(dev, MT_TMAC_CDTR(0), cck + reg_offset);</div><div class='del'>-	mt76_wr(dev, MT_TMAC_ODTR(0), ofdm + reg_offset);</div><div class='del'>-	mt76_wr(dev, MT_TMAC_ICR0(0),</div><div class='del'>-		FIELD_PREP(MT_IFS_EIFS, 360) |</div><div class='del'>-		FIELD_PREP(MT_IFS_RIFS, 2) |</div><div class='del'>-		FIELD_PREP(MT_IFS_SIFS, sifs) |</div><div class='del'>-		FIELD_PREP(MT_IFS_SLOT, phy-&gt;slottime));</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;slottime &lt; 20 || is_5ghz)</div><div class='del'>-		val = MT7921_CFEND_RATE_DEFAULT;</div><div class='del'>-	else</div><div class='del'>-		val = MT7921_CFEND_RATE_11B;</div><div class='del'>-</div><div class='del'>-	mt76_rmw_field(dev, MT_AGG_ACR0(0), MT_AGG_ACR_CFEND_RATE, val);</div><div class='del'>-	mt76_clear(dev, MT_ARB_SCR(0),</div><div class='del'>-		   MT_ARB_SCR_TX_DISABLE | MT_ARB_SCR_RX_DISABLE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8</div><div class='del'>-mt7921_phy_get_nf(struct mt7921_phy *phy, int idx)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7921_rx_check);</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7921_phy_update_channel(struct mt76_phy *mphy, int idx)</div><div class='add'>+void mt7921_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,</div><div class='add'>+			 struct sk_buff *skb, u32 *info)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = container_of(mphy-&gt;dev, struct mt7921_dev, mt76);</div><div class='del'>-	struct mt7921_phy *phy = (struct mt7921_phy *)mphy-&gt;priv;</div><div class='del'>-	struct mt76_channel_state *state;</div><div class='del'>-	u64 busy_time, tx_time, rx_time, obss_time;</div><div class='del'>-	int nf;</div><div class='del'>-</div><div class='del'>-	busy_time = mt76_get_field(dev, MT_MIB_SDR9(idx),</div><div class='del'>-				   MT_MIB_SDR9_BUSY_MASK);</div><div class='del'>-	tx_time = mt76_get_field(dev, MT_MIB_SDR36(idx),</div><div class='del'>-				 MT_MIB_SDR36_TXTIME_MASK);</div><div class='del'>-	rx_time = mt76_get_field(dev, MT_MIB_SDR37(idx),</div><div class='del'>-				 MT_MIB_SDR37_RXTIME_MASK);</div><div class='del'>-	obss_time = mt76_get_field(dev, MT_WF_RMAC_MIB_AIRTIME14(idx),</div><div class='del'>-				   MT_MIB_OBSSTIME_MASK);</div><div class='del'>-</div><div class='del'>-	nf = mt7921_phy_get_nf(phy, idx);</div><div class='del'>-	if (!phy-&gt;noise)</div><div class='del'>-		phy-&gt;noise = nf &lt;&lt; 4;</div><div class='del'>-	else if (nf)</div><div class='del'>-		phy-&gt;noise += nf - (phy-&gt;noise &gt;&gt; 4);</div><div class='del'>-</div><div class='del'>-	state = mphy-&gt;chan_state;</div><div class='del'>-	state-&gt;cc_busy += busy_time;</div><div class='del'>-	state-&gt;cc_tx += tx_time;</div><div class='del'>-	state-&gt;cc_rx += rx_time + obss_time;</div><div class='del'>-	state-&gt;cc_bss_rx += rx_time;</div><div class='del'>-	state-&gt;noise = -(phy-&gt;noise &gt;&gt; 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mt7921_update_channel(struct mt76_dev *mdev)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);</div><div class='del'>-</div><div class='del'>-	if (mt76_connac_pm_wake(&amp;dev-&gt;mphy, &amp;dev-&gt;pm))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mt7921_phy_update_channel(&amp;mdev-&gt;phy, 0);</div><div class='del'>-	/* reset obss airtime */</div><div class='del'>-	mt76_set(dev, MT_WF_RMAC_MIB_TIME0(0), MT_WF_RMAC_MIB_RXTIME_CLR);</div><div class='del'>-</div><div class='del'>-	mt76_connac_power_save_sched(&amp;dev-&gt;mphy, &amp;dev-&gt;pm);</div><div class='del'>-}</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	__le32 *rxd = (__le32 *)skb-&gt;data;</div><div class='add'>+	__le32 *end = (__le32 *)&amp;skb-&gt;data[skb-&gt;len];</div><div class='add'>+	enum rx_pkt_type type;</div><div class='add'>+	u16 flag;</div><div class='ctx'> </div><div class='del'>-void mt7921_tx_token_put(struct mt7921_dev *dev)</div><div class='del'>-{</div><div class='del'>-	struct mt76_txwi_cache *txwi;</div><div class='del'>-	int id;</div><div class='add'>+	type = le32_get_bits(rxd[0], MT_RXD0_PKT_TYPE);</div><div class='add'>+	flag = le32_get_bits(rxd[0], MT_RXD0_PKT_FLAG);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;dev-&gt;mt76.token_lock);</div><div class='del'>-	idr_for_each_entry(&amp;dev-&gt;mt76.token, txwi, id) {</div><div class='del'>-		mt7921_txp_skb_unmap(&amp;dev-&gt;mt76, txwi);</div><div class='del'>-		if (txwi-&gt;skb) {</div><div class='del'>-			struct ieee80211_hw *hw;</div><div class='add'>+	if (type == PKT_TYPE_RX_EVENT &amp;&amp; flag == 0x1)</div><div class='add'>+		type = PKT_TYPE_NORMAL_MCU;</div><div class='ctx'> </div><div class='del'>-			hw = mt76_tx_status_get_hw(&amp;dev-&gt;mt76, txwi-&gt;skb);</div><div class='del'>-			ieee80211_free_txskb(hw, txwi-&gt;skb);</div><div class='add'>+	switch (type) {</div><div class='add'>+	case PKT_TYPE_TXRX_NOTIFY:</div><div class='add'>+		/* PKT_TYPE_TXRX_NOTIFY can be received only by mmio devices */</div><div class='add'>+		mt7921_mac_tx_free(dev, skb-&gt;data, skb-&gt;len);</div><div class='add'>+		napi_consume_skb(skb, 1);</div><div class='add'>+		break;</div><div class='add'>+	case PKT_TYPE_RX_EVENT:</div><div class='add'>+		mt7921_mcu_rx_event(dev, skb);</div><div class='add'>+		break;</div><div class='add'>+	case PKT_TYPE_TXS:</div><div class='add'>+		for (rxd += 2; rxd + 8 &lt;= end; rxd += 8)</div><div class='add'>+			mt7921_mac_add_txs(dev, rxd);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		break;</div><div class='add'>+	case PKT_TYPE_NORMAL_MCU:</div><div class='add'>+	case PKT_TYPE_NORMAL:</div><div class='add'>+		if (!mt7921_mac_fill_rx(dev, skb)) {</div><div class='add'>+			mt76_rx(&amp;dev-&gt;mt76, q, skb);</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='del'>-		mt76_put_txwi(&amp;dev-&gt;mt76, txwi);</div><div class='del'>-		dev-&gt;mt76.token_count--;</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;dev-&gt;mt76.token_lock);</div><div class='del'>-	idr_destroy(&amp;dev-&gt;mt76.token);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7921_queue_rx_skb);</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mt7921_vif_connect_iter(void *priv, u8 *mac,</div><div class='ctx'> 			struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_vif *mvif = (struct mt7921_vif *)vif-&gt;drv_priv;</div><div class='del'>-	struct mt7921_dev *dev = mvif-&gt;phy-&gt;dev;</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_dev *dev = mvif-&gt;phy-&gt;dev;</div><div class='add'>+	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='ctx'> </div><div class='del'>-	ieee80211_disconnect(vif, true);</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+		ieee80211_disconnect(vif, true);</div><div class='ctx'> </div><div class='del'>-	mt76_connac_mcu_uni_add_dev(&amp;dev-&gt;mphy, vif, &amp;mvif-&gt;sta.wcid, true);</div><div class='add'>+	mt76_connac_mcu_uni_add_dev(&amp;dev-&gt;mphy, &amp;vif-&gt;bss_conf,</div><div class='add'>+				    &amp;mvif-&gt;bss_conf.mt76,</div><div class='add'>+				    &amp;mvif-&gt;sta.deflink.wcid, true);</div><div class='ctx'> 	mt7921_mcu_set_tx(dev, vif);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mt7921_mac_reset(struct mt7921_dev *dev)</div><div class='del'>-{</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	mt76_connac_free_pending_tx_skbs(&amp;dev-&gt;pm, NULL);</div><div class='ctx'> </div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, 0);</div><div class='del'>-	mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0x0);</div><div class='del'>-</div><div class='del'>-	set_bit(MT76_MCU_RESET, &amp;dev-&gt;mphy.state);</div><div class='del'>-	wake_up(&amp;dev-&gt;mt76.mcu.wait);</div><div class='del'>-	skb_queue_purge(&amp;dev-&gt;mt76.mcu.res_q);</div><div class='del'>-</div><div class='del'>-	mt76_txq_schedule_all(&amp;dev-&gt;mphy);</div><div class='del'>-</div><div class='del'>-	mt76_worker_disable(&amp;dev-&gt;mt76.tx_worker);</div><div class='del'>-	napi_disable(&amp;dev-&gt;mt76.napi[MT_RXQ_MAIN]);</div><div class='del'>-	napi_disable(&amp;dev-&gt;mt76.napi[MT_RXQ_MCU]);</div><div class='del'>-	napi_disable(&amp;dev-&gt;mt76.napi[MT_RXQ_MCU_WA]);</div><div class='del'>-	napi_disable(&amp;dev-&gt;mt76.tx_napi);</div><div class='del'>-</div><div class='del'>-	mt7921_tx_token_put(dev);</div><div class='del'>-	idr_init(&amp;dev-&gt;mt76.token);</div><div class='del'>-</div><div class='del'>-	err = mt7921_wpdma_reset(dev, true);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i) {</div><div class='del'>-		napi_enable(&amp;dev-&gt;mt76.napi[i]);</div><div class='del'>-		napi_schedule(&amp;dev-&gt;mt76.napi[i]);</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP) {</div><div class='add'>+		mt76_connac_mcu_uni_add_bss(dev-&gt;phy.mt76, vif, &amp;mvif-&gt;sta.deflink.wcid,</div><div class='add'>+					    true, NULL);</div><div class='add'>+		mt7921_mcu_sta_update(dev, NULL, vif, true,</div><div class='add'>+				      MT76_STA_INFO_STATE_NONE);</div><div class='add'>+		mt7921_mcu_uni_add_beacon_offload(dev, hw, vif, true);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	napi_enable(&amp;dev-&gt;mt76.tx_napi);</div><div class='del'>-	napi_schedule(&amp;dev-&gt;mt76.tx_napi);</div><div class='del'>-	mt76_worker_enable(&amp;dev-&gt;mt76.tx_worker);</div><div class='del'>-</div><div class='del'>-	clear_bit(MT76_MCU_RESET, &amp;dev-&gt;mphy.state);</div><div class='del'>-	clear_bit(MT76_STATE_PM, &amp;dev-&gt;mphy.state);</div><div class='del'>-</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, 0);</div><div class='del'>-	mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff);</div><div class='del'>-</div><div class='del'>-	err = mt7921_run_firmware(dev);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = mt7921_mcu_set_eeprom(dev);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	mt7921_mac_init(dev);</div><div class='del'>-	return __mt7921_start(&amp;dev-&gt;phy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* system error recovery */</div><div class='ctx'> void mt7921_mac_reset_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_hw *hw;</div><div class='del'>-	struct mt7921_dev *dev;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	dev = container_of(work, struct mt7921_dev, reset_work);</div><div class='del'>-	hw = mt76_hw(dev);</div><div class='add'>+	struct mt792x_dev *dev = container_of(work, struct mt792x_dev,</div><div class='add'>+					      reset_work);</div><div class='add'>+	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+	int i, ret;</div><div class='ctx'> </div><div class='del'>-	dev_err(dev-&gt;mt76.dev, "chip reset\n");</div><div class='add'>+	dev_dbg(dev-&gt;mt76.dev, "chip reset\n");</div><div class='add'>+	set_bit(MT76_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+	dev-&gt;hw_full_reset = true;</div><div class='ctx'> 	ieee80211_stop_queues(hw);</div><div class='ctx'> </div><div class='ctx'> 	cancel_delayed_work_sync(&amp;dev-&gt;mphy.mac_work);</div><div class='del'>-	cancel_delayed_work_sync(&amp;dev-&gt;pm.ps_work);</div><div class='del'>-	cancel_work_sync(&amp;dev-&gt;pm.wake_work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;pm-&gt;ps_work);</div><div class='add'>+	cancel_work_sync(&amp;pm-&gt;wake_work);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='ctx'> 	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		if (!mt7921_mac_reset(dev))</div><div class='add'>+		mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+		ret = mt792x_dev_reset(dev);</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+		if (!ret)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+	if (mt76_is_sdio(&amp;dev-&gt;mt76) &amp;&amp; atomic_read(&amp;dev-&gt;mt76.bus_hung))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	if (i == 10)</div><div class='ctx'> 		dev_err(dev-&gt;mt76.dev, "chip reset failed\n");</div><div class='hunk'>@@ -1293,217 +689,180 @@ void mt7921_mac_reset_work(struct work_struct *work)</div><div class='ctx'> 		ieee80211_scan_completed(dev-&gt;mphy.hw, &amp;info);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	dev-&gt;hw_full_reset = false;</div><div class='add'>+	clear_bit(MT76_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+	pm-&gt;suspended = false;</div><div class='ctx'> 	ieee80211_wake_queues(hw);</div><div class='ctx'> 	ieee80211_iterate_active_interfaces(hw,</div><div class='ctx'> 					    IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='ctx'> 					    mt7921_vif_connect_iter, NULL);</div><div class='add'>+	mt76_connac_power_save_sched(&amp;dev-&gt;mt76.phy, pm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt7921_reset(struct mt76_dev *mdev)</div><div class='add'>+void mt7921_coredump_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);</div><div class='add'>+	struct mt792x_dev *dev;</div><div class='add'>+	char *dump, *data;</div><div class='ctx'> </div><div class='del'>-	queue_work(dev-&gt;mt76.wq, &amp;dev-&gt;reset_work);</div><div class='del'>-}</div><div class='add'>+	dev = (struct mt792x_dev *)container_of(work, struct mt792x_dev,</div><div class='add'>+						coredump.work.work);</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7921_mac_update_mib_stats(struct mt7921_phy *phy)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_dev *dev = phy-&gt;dev;</div><div class='del'>-	struct mib_stats *mib = &amp;phy-&gt;mib;</div><div class='del'>-	int i, aggr0 = 0, aggr1;</div><div class='del'>-</div><div class='del'>-	mib-&gt;fcs_err_cnt += mt76_get_field(dev, MT_MIB_SDR3(0),</div><div class='del'>-					   MT_MIB_SDR3_FCS_ERR_MASK);</div><div class='del'>-	mib-&gt;ack_fail_cnt += mt76_get_field(dev, MT_MIB_MB_BSDR3(0),</div><div class='del'>-					    MT_MIB_ACK_FAIL_COUNT_MASK);</div><div class='del'>-	mib-&gt;ba_miss_cnt += mt76_get_field(dev, MT_MIB_MB_BSDR2(0),</div><div class='del'>-					   MT_MIB_BA_FAIL_COUNT_MASK);</div><div class='del'>-	mib-&gt;rts_cnt += mt76_get_field(dev, MT_MIB_MB_BSDR0(0),</div><div class='del'>-				       MT_MIB_RTS_COUNT_MASK);</div><div class='del'>-	mib-&gt;rts_retries_cnt += mt76_get_field(dev, MT_MIB_MB_BSDR1(0),</div><div class='del'>-					       MT_MIB_RTS_FAIL_COUNT_MASK);</div><div class='del'>-</div><div class='del'>-	for (i = 0, aggr1 = aggr0 + 4; i &lt; 4; i++) {</div><div class='del'>-		u32 val, val2;</div><div class='del'>-</div><div class='del'>-		val = mt76_rr(dev, MT_TX_AGG_CNT(0, i));</div><div class='del'>-		val2 = mt76_rr(dev, MT_TX_AGG_CNT2(0, i));</div><div class='del'>-</div><div class='del'>-		dev-&gt;mt76.aggr_stats[aggr0++] += val &amp; 0xffff;</div><div class='del'>-		dev-&gt;mt76.aggr_stats[aggr0++] += val &gt;&gt; 16;</div><div class='del'>-		dev-&gt;mt76.aggr_stats[aggr1++] += val2 &amp; 0xffff;</div><div class='del'>-		dev-&gt;mt76.aggr_stats[aggr1++] += val2 &gt;&gt; 16;</div><div class='add'>+	if (time_is_after_jiffies(dev-&gt;coredump.last_activity +</div><div class='add'>+				  4 * MT76_CONNAC_COREDUMP_TIMEOUT)) {</div><div class='add'>+		queue_delayed_work(dev-&gt;mt76.wq, &amp;dev-&gt;coredump.work,</div><div class='add'>+				   MT76_CONNAC_COREDUMP_TIMEOUT);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt7921_mac_sta_stats_work(struct mt7921_phy *phy)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_dev *dev = phy-&gt;dev;</div><div class='del'>-	struct mt7921_sta *msta;</div><div class='del'>-	LIST_HEAD(list);</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-	list_splice_init(&amp;phy-&gt;stats_list, &amp;list);</div><div class='del'>-</div><div class='del'>-	while (!list_empty(&amp;list)) {</div><div class='del'>-		msta = list_first_entry(&amp;list, struct mt7921_sta, stats_list);</div><div class='del'>-		list_del_init(&amp;msta-&gt;stats_list);</div><div class='del'>-		spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='ctx'> </div><div class='del'>-		/* query wtbl info to report tx rate for further devices */</div><div class='del'>-		mt7921_get_wtbl_info(dev, msta-&gt;wcid.idx);</div><div class='del'>-</div><div class='del'>-		spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-	}</div><div class='add'>+	dump = vzalloc(MT76_CONNAC_COREDUMP_SZ);</div><div class='add'>+	data = dump;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-}</div><div class='add'>+	while (true) {</div><div class='add'>+		struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-void mt7921_mac_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_phy *phy;</div><div class='del'>-	struct mt76_phy *mphy;</div><div class='add'>+		spin_lock_bh(&amp;dev-&gt;mt76.lock);</div><div class='add'>+		skb = __skb_dequeue(&amp;dev-&gt;coredump.msg_list);</div><div class='add'>+		spin_unlock_bh(&amp;dev-&gt;mt76.lock);</div><div class='ctx'> </div><div class='del'>-	mphy = (struct mt76_phy *)container_of(work, struct mt76_phy,</div><div class='del'>-					       mac_work.work);</div><div class='del'>-	phy = mphy-&gt;priv;</div><div class='add'>+		if (!skb)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_acquire(phy-&gt;dev);</div><div class='add'>+		skb_pull(skb, sizeof(struct mt76_connac2_mcu_rxd));</div><div class='add'>+		if (!dump || data + skb-&gt;len - dump &gt; MT76_CONNAC_COREDUMP_SZ) {</div><div class='add'>+			dev_kfree_skb(skb);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	mt76_update_survey(mphy-&gt;dev);</div><div class='del'>-	if (++mphy-&gt;mac_work_count == 2) {</div><div class='del'>-		mphy-&gt;mac_work_count = 0;</div><div class='add'>+		memcpy(data, skb-&gt;data, skb-&gt;len);</div><div class='add'>+		data += skb-&gt;len;</div><div class='ctx'> </div><div class='del'>-		mt7921_mac_update_mib_stats(phy);</div><div class='del'>-	}</div><div class='del'>-	if (++phy-&gt;sta_work_count == 4) {</div><div class='del'>-		phy-&gt;sta_work_count = 0;</div><div class='del'>-		mt7921_mac_sta_stats_work(phy);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_release(phy-&gt;dev);</div><div class='del'>-	ieee80211_queue_delayed_work(phy-&gt;mt76-&gt;hw, &amp;mphy-&gt;mac_work,</div><div class='del'>-				     MT7921_WATCHDOG_TIME);</div><div class='add'>+	if (dump)</div><div class='add'>+		dev_coredumpv(dev-&gt;mt76.dev, dump, MT76_CONNAC_COREDUMP_SZ,</div><div class='add'>+			      GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	mt792x_reset(&amp;dev-&gt;mt76);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt7921_pm_wake_work(struct work_struct *work)</div><div class='add'>+/* usb_sdio */</div><div class='add'>+static void</div><div class='add'>+mt7921_usb_sdio_write_txwi(struct mt792x_dev *dev, struct mt76_wcid *wcid,</div><div class='add'>+			   enum mt76_txq_id qid, struct ieee80211_sta *sta,</div><div class='add'>+			   struct ieee80211_key_conf *key, int pid,</div><div class='add'>+			   struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev;</div><div class='del'>-	struct mt76_phy *mphy;</div><div class='del'>-</div><div class='del'>-	dev = (struct mt7921_dev *)container_of(work, struct mt7921_dev,</div><div class='del'>-						pm.wake_work);</div><div class='del'>-	mphy = dev-&gt;phy.mt76;</div><div class='del'>-</div><div class='del'>-	if (!mt7921_mcu_drv_pmctrl(dev)) {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		mt76_for_each_q_rx(&amp;dev-&gt;mt76, i)</div><div class='del'>-			napi_schedule(&amp;dev-&gt;mt76.napi[i]);</div><div class='del'>-		mt76_connac_pm_dequeue_skbs(mphy, &amp;dev-&gt;pm);</div><div class='del'>-		mt7921_tx_cleanup(dev);</div><div class='del'>-		ieee80211_queue_delayed_work(mphy-&gt;hw, &amp;mphy-&gt;mac_work,</div><div class='del'>-					     MT7921_WATCHDOG_TIME);</div><div class='del'>-	}</div><div class='add'>+	__le32 *txwi = (__le32 *)(skb-&gt;data - MT_SDIO_TXD_SIZE);</div><div class='ctx'> </div><div class='del'>-	ieee80211_wake_queues(mphy-&gt;hw);</div><div class='del'>-	wake_up(&amp;dev-&gt;pm.wait);</div><div class='add'>+	memset(txwi, 0, MT_SDIO_TXD_SIZE);</div><div class='add'>+	mt76_connac2_mac_write_txwi(&amp;dev-&gt;mt76, txwi, skb, wcid, key, pid, qid, 0);</div><div class='add'>+	skb_push(skb, MT_SDIO_TXD_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt7921_pm_power_save_work(struct work_struct *work)</div><div class='add'>+int mt7921_usb_sdio_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='add'>+				   enum mt76_txq_id qid, struct mt76_wcid *wcid,</div><div class='add'>+				   struct ieee80211_sta *sta,</div><div class='add'>+				   struct mt76_tx_info *tx_info)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev;</div><div class='del'>-	unsigned long delta;</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx_info-&gt;skb);</div><div class='add'>+	struct ieee80211_key_conf *key = info-&gt;control.hw_key;</div><div class='add'>+	struct sk_buff *skb = tx_info-&gt;skb;</div><div class='add'>+	int err, pad, pktid, type;</div><div class='add'>+</div><div class='add'>+	if (unlikely(tx_info-&gt;skb-&gt;len &lt;= ETH_HLEN))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	dev = (struct mt7921_dev *)container_of(work, struct mt7921_dev,</div><div class='del'>-						pm.ps_work.work);</div><div class='add'>+	err = skb_cow_head(skb, MT_SDIO_TXD_SIZE + MT_SDIO_HDR_SIZE);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	delta = dev-&gt;pm.idle_timeout;</div><div class='del'>-	if (test_bit(MT76_HW_SCANNING, &amp;dev-&gt;mphy.state) ||</div><div class='del'>-	    test_bit(MT76_HW_SCHED_SCANNING, &amp;dev-&gt;mphy.state))</div><div class='del'>-		goto out;</div><div class='add'>+	if (!wcid)</div><div class='add'>+		wcid = &amp;dev-&gt;mt76.global_wcid;</div><div class='ctx'> </div><div class='del'>-	if (time_is_after_jiffies(dev-&gt;pm.last_activity + delta)) {</div><div class='del'>-		delta = dev-&gt;pm.last_activity + delta - jiffies;</div><div class='del'>-		goto out;</div><div class='add'>+	if (sta) {</div><div class='add'>+		struct mt792x_sta *msta = (struct mt792x_sta *)sta-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+		if (time_after(jiffies, msta-&gt;deflink.last_txs + HZ / 4)) {</div><div class='add'>+			info-&gt;flags |= IEEE80211_TX_CTL_REQ_TX_STATUS;</div><div class='add'>+			msta-&gt;deflink.last_txs = jiffies;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!mt7921_mcu_fw_pmctrl(dev))</div><div class='del'>-		return;</div><div class='del'>-out:</div><div class='del'>-	queue_delayed_work(dev-&gt;mt76.wq, &amp;dev-&gt;pm.ps_work, delta);</div><div class='add'>+	pktid = mt76_tx_status_skb_add(&amp;dev-&gt;mt76, wcid, skb);</div><div class='add'>+	mt7921_usb_sdio_write_txwi(dev, wcid, qid, sta, key, pktid, skb);</div><div class='add'>+</div><div class='add'>+	type = mt76_is_sdio(mdev) ? MT7921_SDIO_DATA : 0;</div><div class='add'>+	mt792x_skb_add_usb_sdio_hdr(dev, skb, type);</div><div class='add'>+	pad = round_up(skb-&gt;len, 4) - skb-&gt;len;</div><div class='add'>+	if (mt76_is_usb(mdev))</div><div class='add'>+		pad += 4;</div><div class='add'>+</div><div class='add'>+	err = mt76_skb_adjust_pad(skb, pad);</div><div class='add'>+	if (err)</div><div class='add'>+		/* Release pktid in case of error. */</div><div class='add'>+		idr_remove(&amp;wcid-&gt;pktid, pktid);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7921_usb_sdio_tx_prepare_skb);</div><div class='ctx'> </div><div class='del'>-int mt7921_mac_set_beacon_filter(struct mt7921_phy *phy,</div><div class='del'>-				 struct ieee80211_vif *vif,</div><div class='del'>-				 bool enable)</div><div class='add'>+void mt7921_usb_sdio_tx_complete_skb(struct mt76_dev *mdev,</div><div class='add'>+				     struct mt76_queue_entry *e)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = phy-&gt;dev;</div><div class='del'>-	bool ext_phy = phy != &amp;dev-&gt;phy;</div><div class='del'>-	int err;</div><div class='add'>+	__le32 *txwi = (__le32 *)(e-&gt;skb-&gt;data + MT_SDIO_HDR_SIZE);</div><div class='add'>+	unsigned int headroom = MT_SDIO_TXD_SIZE + MT_SDIO_HDR_SIZE;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct mt76_wcid *wcid;</div><div class='add'>+	u16 idx;</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;pm.enable)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+	idx = le32_get_bits(txwi[1], MT_TXD1_WLAN_IDX);</div><div class='add'>+	wcid = __mt76_wcid_ptr(mdev, idx);</div><div class='add'>+	sta = wcid_to_sta(wcid);</div><div class='ctx'> </div><div class='del'>-	err = mt7921_mcu_set_bss_pm(dev, vif, enable);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (enable) {</div><div class='del'>-		vif-&gt;driver_flags |= IEEE80211_VIF_BEACON_FILTER;</div><div class='del'>-		mt76_set(dev, MT_WF_RFCR(ext_phy),</div><div class='del'>-			 MT_WF_RFCR_DROP_OTHER_BEACON);</div><div class='del'>-	} else {</div><div class='del'>-		vif-&gt;driver_flags &amp;= ~IEEE80211_VIF_BEACON_FILTER;</div><div class='del'>-		mt76_clear(dev, MT_WF_RFCR(ext_phy),</div><div class='del'>-			   MT_WF_RFCR_DROP_OTHER_BEACON);</div><div class='del'>-	}</div><div class='add'>+	if (sta &amp;&amp; likely(e-&gt;skb-&gt;protocol != cpu_to_be16(ETH_P_PAE)))</div><div class='add'>+		mt76_connac2_tx_check_aggr(sta, txwi);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	skb_pull(e-&gt;skb, headroom);</div><div class='add'>+	mt76_tx_complete_skb(mdev, e-&gt;wcid, e-&gt;skb);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7921_usb_sdio_tx_complete_skb);</div><div class='ctx'> </div><div class='del'>-void mt7921_coredump_work(struct work_struct *work)</div><div class='add'>+bool mt7921_usb_sdio_tx_status_data(struct mt76_dev *mdev, u8 *update)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev;</div><div class='del'>-	char *dump, *data;</div><div class='del'>-</div><div class='del'>-	dev = (struct mt7921_dev *)container_of(work, struct mt7921_dev,</div><div class='del'>-						coredump.work.work);</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='ctx'> </div><div class='del'>-	if (time_is_after_jiffies(dev-&gt;coredump.last_activity +</div><div class='del'>-				  4 * MT76_CONNAC_COREDUMP_TIMEOUT)) {</div><div class='del'>-		queue_delayed_work(dev-&gt;mt76.wq, &amp;dev-&gt;coredump.work,</div><div class='del'>-				   MT76_CONNAC_COREDUMP_TIMEOUT);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	mt7921_mac_sta_poll(dev);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='ctx'> </div><div class='del'>-	dump = vzalloc(MT76_CONNAC_COREDUMP_SZ);</div><div class='del'>-	data = dump;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7921_usb_sdio_tx_status_data);</div><div class='ctx'> </div><div class='del'>-	while (true) {</div><div class='del'>-		struct sk_buff *skb;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+void mt7921_set_ipv6_ns_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(work, struct mt792x_dev,</div><div class='add'>+					      ipv6_ns_work);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-		spin_lock_bh(&amp;dev-&gt;mt76.lock);</div><div class='del'>-		skb = __skb_dequeue(&amp;dev-&gt;coredump.msg_list);</div><div class='del'>-		spin_unlock_bh(&amp;dev-&gt;mt76.lock);</div><div class='add'>+	do {</div><div class='add'>+		skb = skb_dequeue(&amp;dev-&gt;ipv6_ns_list);</div><div class='ctx'> </div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		skb_pull(skb, sizeof(struct mt7921_mcu_rxd));</div><div class='del'>-		if (data + skb-&gt;len - dump &gt; MT76_CONNAC_COREDUMP_SZ) {</div><div class='del'>-			dev_kfree_skb(skb);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='add'>+		mt792x_mutex_acquire(dev);</div><div class='add'>+		ret = mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='add'>+					    MCU_UNI_CMD(OFFLOAD), true);</div><div class='add'>+		mt792x_mutex_release(dev);</div><div class='ctx'> </div><div class='del'>-		memcpy(data, skb-&gt;data, skb-&gt;len);</div><div class='del'>-		data += skb-&gt;len;</div><div class='add'>+	} while (!ret);</div><div class='ctx'> </div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-	}</div><div class='del'>-	dev_coredumpv(dev-&gt;mt76.dev, dump, MT76_CONNAC_COREDUMP_SZ,</div><div class='del'>-		      GFP_KERNEL);</div><div class='del'>-	mt7921_reset(&amp;dev-&gt;mt76);</div><div class='add'>+	if (ret)</div><div class='add'>+		skb_queue_purge(&amp;dev-&gt;ipv6_ns_list);</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c<br/>index f4c27aa41048..5fae9a6e273c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/main.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7921/main.c</a></div><div class='hunk'>@@ -1,36 +1,16 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include "mt7921.h"</div><div class='ctx'> #include "mcu.h"</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7921_gen_ppe_thresh(u8 *he_ppet, int nss)</div><div class='del'>-{</div><div class='del'>-	u8 i, ppet_bits, ppet_size, ru_bit_mask = 0x7; /* HE80 */</div><div class='del'>-	u8 ppet16_ppet8_ru3_ru0[] = {0x1c, 0xc7, 0x71};</div><div class='del'>-</div><div class='del'>-	he_ppet[0] = FIELD_PREP(IEEE80211_PPE_THRES_NSS_MASK, nss - 1) |</div><div class='del'>-		     FIELD_PREP(IEEE80211_PPE_THRES_RU_INDEX_BITMASK_MASK,</div><div class='del'>-				ru_bit_mask);</div><div class='del'>-</div><div class='del'>-	ppet_bits = IEEE80211_PPE_THRES_INFO_PPET_SIZE *</div><div class='del'>-		    nss * hweight8(ru_bit_mask) * 2;</div><div class='del'>-	ppet_size = DIV_ROUND_UP(ppet_bits, 8);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ppet_size - 1; i++)</div><div class='del'>-		he_ppet[i + 1] = ppet16_ppet8_ru3_ru0[i % 3];</div><div class='del'>-</div><div class='del'>-	he_ppet[i + 1] = ppet16_ppet8_ru3_ru0[i % 3] &amp;</div><div class='del'>-			 (0xff &gt;&gt; (8 - (ppet_bits - 1) % 8));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int</div><div class='del'>-mt7921_init_he_caps(struct mt7921_phy *phy, enum nl80211_band band,</div><div class='add'>+mt7921_init_he_caps(struct mt792x_phy *phy, enum nl80211_band band,</div><div class='ctx'> 		    struct ieee80211_sband_iftype_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	int i, idx = 0;</div><div class='hunk'>@@ -53,6 +33,7 @@ mt7921_init_he_caps(struct mt7921_phy *phy, enum nl80211_band band,</div><div class='ctx'> </div><div class='ctx'> 		switch (i) {</div><div class='ctx'> 		case NL80211_IFTYPE_STATION:</div><div class='add'>+		case NL80211_IFTYPE_AP:</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -72,28 +53,50 @@ mt7921_init_he_caps(struct mt7921_phy *phy, enum nl80211_band band,</div><div class='ctx'> 		if (band == NL80211_BAND_2GHZ)</div><div class='ctx'> 			he_cap_elem-&gt;phy_cap_info[0] =</div><div class='ctx'> 				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G;</div><div class='del'>-		else if (band == NL80211_BAND_5GHZ)</div><div class='add'>+		else</div><div class='ctx'> 			he_cap_elem-&gt;phy_cap_info[0] =</div><div class='del'>-				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |</div><div class='del'>-				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G;</div><div class='add'>+				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G;</div><div class='ctx'> </div><div class='ctx'> 		he_cap_elem-&gt;phy_cap_info[1] =</div><div class='ctx'> 			IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD;</div><div class='ctx'> 		he_cap_elem-&gt;phy_cap_info[2] =</div><div class='add'>+			IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US |</div><div class='ctx'> 			IEEE80211_HE_PHY_CAP2_STBC_TX_UNDER_80MHZ |</div><div class='del'>-			IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ;</div><div class='add'>+			IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ |</div><div class='add'>+			IEEE80211_HE_PHY_CAP2_UL_MU_FULL_MU_MIMO |</div><div class='add'>+			IEEE80211_HE_PHY_CAP2_UL_MU_PARTIAL_MU_MIMO;</div><div class='ctx'> </div><div class='ctx'> 		switch (i) {</div><div class='add'>+		case NL80211_IFTYPE_AP:</div><div class='add'>+			he_cap_elem-&gt;mac_cap_info[2] |=</div><div class='add'>+				IEEE80211_HE_MAC_CAP2_BSR;</div><div class='add'>+			he_cap_elem-&gt;mac_cap_info[4] |=</div><div class='add'>+				IEEE80211_HE_MAC_CAP4_BQR;</div><div class='add'>+			he_cap_elem-&gt;mac_cap_info[5] |=</div><div class='add'>+				IEEE80211_HE_MAC_CAP5_OM_CTRL_UL_MU_DATA_DIS_RX;</div><div class='add'>+			he_cap_elem-&gt;phy_cap_info[3] |=</div><div class='add'>+				IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_QPSK |</div><div class='add'>+				IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_QPSK;</div><div class='add'>+			he_cap_elem-&gt;phy_cap_info[6] |=</div><div class='add'>+				IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE |</div><div class='add'>+				IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT;</div><div class='add'>+			he_cap_elem-&gt;phy_cap_info[9] |=</div><div class='add'>+				IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU |</div><div class='add'>+				IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU;</div><div class='add'>+</div><div class='add'>+			if (is_mt7922(phy-&gt;mt76-&gt;dev)) {</div><div class='add'>+				he_cap_elem-&gt;phy_cap_info[0] |=</div><div class='add'>+					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='ctx'> 		case NL80211_IFTYPE_STATION:</div><div class='del'>-			he_cap_elem-&gt;mac_cap_info[0] |=</div><div class='del'>-				IEEE80211_HE_MAC_CAP0_TWT_REQ;</div><div class='ctx'> 			he_cap_elem-&gt;mac_cap_info[1] |=</div><div class='ctx'> 				IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US;</div><div class='ctx'> </div><div class='ctx'> 			if (band == NL80211_BAND_2GHZ)</div><div class='ctx'> 				he_cap_elem-&gt;phy_cap_info[0] |=</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_2G;</div><div class='del'>-			else if (band == NL80211_BAND_5GHZ)</div><div class='add'>+			else</div><div class='ctx'> 				he_cap_elem-&gt;phy_cap_info[0] |=</div><div class='ctx'> 					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_5G;</div><div class='ctx'> </div><div class='hunk'>@@ -103,7 +106,15 @@ mt7921_init_he_caps(struct mt7921_phy *phy, enum nl80211_band band,</div><div class='ctx'> 			he_cap_elem-&gt;phy_cap_info[3] |=</div><div class='ctx'> 				IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_QPSK |</div><div class='ctx'> 				IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_QPSK;</div><div class='add'>+			he_cap_elem-&gt;phy_cap_info[4] |=</div><div class='add'>+				IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE |</div><div class='add'>+				IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_4;</div><div class='add'>+			he_cap_elem-&gt;phy_cap_info[5] |=</div><div class='add'>+				IEEE80211_HE_PHY_CAP5_NG16_SU_FEEDBACK |</div><div class='add'>+				IEEE80211_HE_PHY_CAP5_NG16_MU_FEEDBACK;</div><div class='ctx'> 			he_cap_elem-&gt;phy_cap_info[6] |=</div><div class='add'>+				IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_42_SU |</div><div class='add'>+				IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_75_MU |</div><div class='ctx'> 				IEEE80211_HE_PHY_CAP6_TRIG_CQI_FB |</div><div class='ctx'> 				IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE |</div><div class='ctx'> 				IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT;</div><div class='hunk'>@@ -120,19 +131,60 @@ mt7921_init_he_caps(struct mt7921_phy *phy, enum nl80211_band band,</div><div class='ctx'> 				IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU |</div><div class='ctx'> 				IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB |</div><div class='ctx'> 				IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB;</div><div class='add'>+</div><div class='add'>+			if (is_mt7922(phy-&gt;mt76-&gt;dev)) {</div><div class='add'>+				he_cap_elem-&gt;phy_cap_info[0] |=</div><div class='add'>+					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G;</div><div class='add'>+				he_cap_elem-&gt;phy_cap_info[4] |=</div><div class='add'>+					IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_4;</div><div class='add'>+				he_cap_elem-&gt;phy_cap_info[8] |=</div><div class='add'>+					IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU |</div><div class='add'>+					IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU;</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		he_mcs-&gt;rx_mcs_80 = cpu_to_le16(mcs_map);</div><div class='ctx'> 		he_mcs-&gt;tx_mcs_80 = cpu_to_le16(mcs_map);</div><div class='add'>+		if (is_mt7922(phy-&gt;mt76-&gt;dev)) {</div><div class='add'>+			he_mcs-&gt;rx_mcs_160 = cpu_to_le16(mcs_map);</div><div class='add'>+			he_mcs-&gt;tx_mcs_160 = cpu_to_le16(mcs_map);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		memset(he_cap-&gt;ppe_thres, 0, sizeof(he_cap-&gt;ppe_thres));</div><div class='ctx'> 		if (he_cap_elem-&gt;phy_cap_info[6] &amp;</div><div class='ctx'> 		    IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT) {</div><div class='del'>-			mt7921_gen_ppe_thresh(he_cap-&gt;ppe_thres, nss);</div><div class='add'>+			mt76_connac_gen_ppe_thresh(he_cap-&gt;ppe_thres, nss, band);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			he_cap_elem-&gt;phy_cap_info[9] |=</div><div class='del'>-				IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_16US;</div><div class='add'>+				u8_encode_bits(IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US,</div><div class='add'>+					       IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (band == NL80211_BAND_6GHZ) {</div><div class='add'>+			struct ieee80211_supported_band *sband =</div><div class='add'>+				&amp;phy-&gt;mt76-&gt;sband_5g.sband;</div><div class='add'>+			struct ieee80211_sta_vht_cap *vht_cap = &amp;sband-&gt;vht_cap;</div><div class='add'>+			struct ieee80211_sta_ht_cap *ht_cap = &amp;sband-&gt;ht_cap;</div><div class='add'>+			u32 exp;</div><div class='add'>+			u16 cap;</div><div class='add'>+</div><div class='add'>+			cap = u16_encode_bits(ht_cap-&gt;ampdu_density,</div><div class='add'>+					IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START);</div><div class='add'>+			exp = u32_get_bits(vht_cap-&gt;cap,</div><div class='add'>+				IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK);</div><div class='add'>+			cap |= u16_encode_bits(exp,</div><div class='add'>+					IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP);</div><div class='add'>+			exp = u32_get_bits(vht_cap-&gt;cap,</div><div class='add'>+					   IEEE80211_VHT_CAP_MAX_MPDU_MASK);</div><div class='add'>+			cap |= u16_encode_bits(exp,</div><div class='add'>+					IEEE80211_HE_6GHZ_CAP_MAX_MPDU_LEN);</div><div class='add'>+			if (vht_cap-&gt;cap &amp; IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN)</div><div class='add'>+				cap |= IEEE80211_HE_6GHZ_CAP_TX_ANTPAT_CONS;</div><div class='add'>+			if (vht_cap-&gt;cap &amp; IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN)</div><div class='add'>+				cap |= IEEE80211_HE_6GHZ_CAP_RX_ANTPAT_CONS;</div><div class='add'>+</div><div class='add'>+			data[idx].he_6ghz_capa.capa = cpu_to_le16(cap);</div><div class='ctx'> 		}</div><div class='ctx'> 		idx++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -140,7 +192,7 @@ mt7921_init_he_caps(struct mt7921_phy *phy, enum nl80211_band band,</div><div class='ctx'> 	return idx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt7921_set_stream_he_caps(struct mt7921_phy *phy)</div><div class='add'>+void mt7921_set_stream_he_caps(struct mt792x_phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sband_iftype_data *data;</div><div class='ctx'> 	struct ieee80211_supported_band *band;</div><div class='hunk'>@@ -151,8 +203,7 @@ void mt7921_set_stream_he_caps(struct mt7921_phy *phy)</div><div class='ctx'> 		n = mt7921_init_he_caps(phy, NL80211_BAND_2GHZ, data);</div><div class='ctx'> </div><div class='ctx'> 		band = &amp;phy-&gt;mt76-&gt;sband_2g.sband;</div><div class='del'>-		band-&gt;iftype_data = data;</div><div class='del'>-		band-&gt;n_iftype_data = n;</div><div class='add'>+		_ieee80211_set_sband_iftype_data(band, data, n);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (phy-&gt;mt76-&gt;cap.has_5ghz) {</div><div class='hunk'>@@ -160,12 +211,19 @@ void mt7921_set_stream_he_caps(struct mt7921_phy *phy)</div><div class='ctx'> 		n = mt7921_init_he_caps(phy, NL80211_BAND_5GHZ, data);</div><div class='ctx'> </div><div class='ctx'> 		band = &amp;phy-&gt;mt76-&gt;sband_5g.sband;</div><div class='del'>-		band-&gt;iftype_data = data;</div><div class='del'>-		band-&gt;n_iftype_data = n;</div><div class='add'>+		_ieee80211_set_sband_iftype_data(band, data, n);</div><div class='add'>+</div><div class='add'>+		if (phy-&gt;mt76-&gt;cap.has_6ghz) {</div><div class='add'>+			data = phy-&gt;iftype[NL80211_BAND_6GHZ];</div><div class='add'>+			n = mt7921_init_he_caps(phy, NL80211_BAND_6GHZ, data);</div><div class='add'>+</div><div class='add'>+			band = &amp;phy-&gt;mt76-&gt;sband_6g.sband;</div><div class='add'>+			_ieee80211_set_sband_iftype_data(band, data, n);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __mt7921_start(struct mt7921_phy *phy)</div><div class='add'>+int __mt7921_start(struct mt792x_phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_phy *mphy = phy-&gt;mt76;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -178,239 +236,273 @@ int __mt7921_start(struct mt7921_phy *phy)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = mt7921_mcu_set_chan_info(phy, MCU_EXT_CMD_SET_RX_PATH);</div><div class='add'>+	err = mt7921_mcu_set_chan_info(phy, MCU_EXT_CMD(SET_RX_PATH));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = mt76_connac_mcu_set_rate_txpower(phy-&gt;mt76);</div><div class='add'>+	err = mt7921_set_tx_sar_pwr(mphy-&gt;hw, NULL);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	mt7921_mac_reset_counters(phy);</div><div class='add'>+	mt792x_mac_reset_counters(phy);</div><div class='ctx'> 	set_bit(MT76_STATE_RUNNING, &amp;mphy-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_queue_delayed_work(mphy-&gt;hw, &amp;mphy-&gt;mac_work,</div><div class='del'>-				     MT7921_WATCHDOG_TIME);</div><div class='add'>+				     MT792x_WATCHDOG_TIME);</div><div class='add'>+	if (mt76_is_mmio(mphy-&gt;dev)) {</div><div class='add'>+		err = mt7921_mcu_radio_led_ctrl(phy-&gt;dev, EXT_CMD_RADIO_LED_CTRL_ENABLE);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = mt7921_mcu_radio_led_ctrl(phy-&gt;dev, EXT_CMD_RADIO_ON_LED);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;chip_cap &amp; MT792x_CHIP_CAP_WF_RF_PIN_CTRL_EVT_EN) {</div><div class='add'>+		mt7921_mcu_wf_rf_pin_ctrl(phy, WF_RF_PIN_INIT);</div><div class='add'>+		wiphy_rfkill_start_polling(mphy-&gt;hw-&gt;wiphy);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(__mt7921_start);</div><div class='ctx'> </div><div class='ctx'> static int mt7921_start(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_phy *phy = mt7921_hw_phy(hw);</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_acquire(phy-&gt;dev);</div><div class='add'>+	mt792x_mutex_acquire(phy-&gt;dev);</div><div class='ctx'> 	err = __mt7921_start(phy);</div><div class='del'>-	mt7921_mutex_release(phy-&gt;dev);</div><div class='add'>+	mt792x_mutex_release(phy-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt7921_stop(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='del'>-	struct mt7921_phy *phy = mt7921_hw_phy(hw);</div><div class='del'>-</div><div class='del'>-	cancel_delayed_work_sync(&amp;phy-&gt;mt76-&gt;mac_work);</div><div class='del'>-</div><div class='del'>-	cancel_delayed_work_sync(&amp;dev-&gt;pm.ps_work);</div><div class='del'>-	cancel_work_sync(&amp;dev-&gt;pm.wake_work);</div><div class='del'>-	mt76_connac_free_pending_tx_skbs(&amp;dev-&gt;pm, NULL);</div><div class='del'>-</div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='del'>-	clear_bit(MT76_STATE_RUNNING, &amp;phy-&gt;mt76-&gt;state);</div><div class='del'>-	mt76_connac_mcu_set_mac_enable(&amp;dev-&gt;mt76, 0, false, false);</div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int get_free_idx(u32 mask, u8 start, u8 end)</div><div class='add'>+static void mt7921_stop(struct ieee80211_hw *hw, bool suspend)</div><div class='ctx'> {</div><div class='del'>-	return ffs(~mask &amp; GENMASK(end, start));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int get_omac_idx(enum nl80211_iftype type, u64 mask)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-		/* prefer hw bssid slot 1-3 */</div><div class='del'>-		i = get_free_idx(mask, HW_BSSID_1, HW_BSSID_3);</div><div class='del'>-		if (i)</div><div class='del'>-			return i - 1;</div><div class='del'>-</div><div class='del'>-		/* next, try to find a free repeater entry for the sta */</div><div class='del'>-		i = get_free_idx(mask &gt;&gt; REPEATER_BSSID_START, 0,</div><div class='del'>-				 REPEATER_BSSID_MAX - REPEATER_BSSID_START);</div><div class='del'>-		if (i)</div><div class='del'>-			return i + 32 - 1;</div><div class='del'>-</div><div class='del'>-		i = get_free_idx(mask, EXT_BSSID_1, EXT_BSSID_MAX);</div><div class='del'>-		if (i)</div><div class='del'>-			return i - 1;</div><div class='del'>-</div><div class='del'>-		if (~mask &amp; BIT(HW_BSSID_0))</div><div class='del'>-			return HW_BSSID_0;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_MONITOR:</div><div class='del'>-		/* ap uses hw bssid 0 and ext bssid */</div><div class='del'>-		if (~mask &amp; BIT(HW_BSSID_0))</div><div class='del'>-			return HW_BSSID_0;</div><div class='del'>-</div><div class='del'>-		i = get_free_idx(mask, EXT_BSSID_1, EXT_BSSID_MAX);</div><div class='del'>-		if (i)</div><div class='del'>-			return i - 1;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		break;</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (mt76_is_mmio(&amp;dev-&gt;mt76)) {</div><div class='add'>+		mt792x_mutex_acquire(dev);</div><div class='add'>+		err = mt7921_mcu_radio_led_ctrl(dev, EXT_CMD_RADIO_OFF_LED);</div><div class='add'>+		mt792x_mutex_release(dev);</div><div class='add'>+		if (err)</div><div class='add'>+			return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return -1;</div><div class='add'>+	mt792x_stop(hw, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7921_add_interface(struct ieee80211_hw *hw,</div><div class='del'>-				struct ieee80211_vif *vif)</div><div class='add'>+static int</div><div class='add'>+mt7921_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_vif *mvif = (struct mt7921_vif *)vif-&gt;drv_priv;</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='del'>-	struct mt7921_phy *phy = mt7921_hw_phy(hw);</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='ctx'> 	struct mt76_txq *mtxq;</div><div class='ctx'> 	int idx, ret = 0;</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='del'>-</div><div class='del'>-	if (vif-&gt;type == NL80211_IFTYPE_MONITOR &amp;&amp;</div><div class='del'>-	    is_zero_ether_addr(vif-&gt;addr))</div><div class='del'>-		phy-&gt;monitor_vif = vif;</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='ctx'> </div><div class='del'>-	mvif-&gt;mt76.idx = ffs(~dev-&gt;mt76.vif_mask) - 1;</div><div class='del'>-	if (mvif-&gt;mt76.idx &gt;= MT7921_MAX_INTERFACES) {</div><div class='add'>+	mvif-&gt;bss_conf.mt76.idx = __ffs64(~dev-&gt;mt76.vif_mask);</div><div class='add'>+	if (mvif-&gt;bss_conf.mt76.idx &gt;= MT792x_MAX_INTERFACES) {</div><div class='ctx'> 		ret = -ENOSPC;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	idx = get_omac_idx(vif-&gt;type, phy-&gt;omac_mask);</div><div class='del'>-	if (idx &lt; 0) {</div><div class='del'>-		ret = -ENOSPC;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	mvif-&gt;mt76.omac_idx = idx;</div><div class='add'>+	mvif-&gt;bss_conf.mt76.omac_idx = mvif-&gt;bss_conf.mt76.idx;</div><div class='ctx'> 	mvif-&gt;phy = phy;</div><div class='del'>-	mvif-&gt;mt76.band_idx = 0;</div><div class='del'>-	mvif-&gt;mt76.wmm_idx = mvif-&gt;mt76.idx % MT7921_MAX_WMM_SETS;</div><div class='add'>+	mvif-&gt;bss_conf.vif = mvif;</div><div class='add'>+	mvif-&gt;bss_conf.mt76.band_idx = 0;</div><div class='add'>+	mvif-&gt;bss_conf.mt76.wmm_idx = mvif-&gt;bss_conf.mt76.idx % MT76_CONNAC_MAX_WMM_SETS;</div><div class='ctx'> </div><div class='del'>-	ret = mt76_connac_mcu_uni_add_dev(&amp;dev-&gt;mphy, vif, &amp;mvif-&gt;sta.wcid,</div><div class='del'>-					  true);</div><div class='add'>+	ret = mt76_connac_mcu_uni_add_dev(&amp;dev-&gt;mphy, &amp;vif-&gt;bss_conf,</div><div class='add'>+					  &amp;mvif-&gt;bss_conf.mt76,</div><div class='add'>+					  &amp;mvif-&gt;sta.deflink.wcid, true);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mt76.vif_mask |= BIT(mvif-&gt;mt76.idx);</div><div class='del'>-	phy-&gt;omac_mask |= BIT_ULL(mvif-&gt;mt76.omac_idx);</div><div class='add'>+	dev-&gt;mt76.vif_mask |= BIT_ULL(mvif-&gt;bss_conf.mt76.idx);</div><div class='add'>+	phy-&gt;omac_mask |= BIT_ULL(mvif-&gt;bss_conf.mt76.omac_idx);</div><div class='ctx'> </div><div class='del'>-	idx = MT7921_WTBL_RESERVED - mvif-&gt;mt76.idx;</div><div class='add'>+	idx = MT792x_WTBL_RESERVED - mvif-&gt;bss_conf.mt76.idx;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;mvif-&gt;sta.deflink.wcid.poll_list);</div><div class='add'>+	mvif-&gt;sta.deflink.wcid.idx = idx;</div><div class='add'>+	mvif-&gt;sta.deflink.wcid.tx_info |= MT_WCID_TX_INFO_SET;</div><div class='add'>+	mt76_wcid_init(&amp;mvif-&gt;sta.deflink.wcid, mvif-&gt;bss_conf.mt76.band_idx);</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;mvif-&gt;sta.stats_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;mvif-&gt;sta.poll_list);</div><div class='del'>-	mvif-&gt;sta.wcid.idx = idx;</div><div class='del'>-	mvif-&gt;sta.wcid.ext_phy = mvif-&gt;mt76.band_idx;</div><div class='del'>-	mvif-&gt;sta.wcid.hw_key_idx = -1;</div><div class='del'>-	mvif-&gt;sta.wcid.tx_info |= MT_WCID_TX_INFO_SET;</div><div class='ctx'> 	mt7921_mac_wtbl_update(dev, idx,</div><div class='ctx'> 			       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);</div><div class='ctx'> </div><div class='del'>-	ewma_rssi_init(&amp;mvif-&gt;rssi);</div><div class='add'>+	ewma_rssi_init(&amp;mvif-&gt;bss_conf.rssi);</div><div class='ctx'> </div><div class='del'>-	rcu_assign_pointer(dev-&gt;mt76.wcid[idx], &amp;mvif-&gt;sta.wcid);</div><div class='add'>+	rcu_assign_pointer(dev-&gt;mt76.wcid[idx], &amp;mvif-&gt;sta.deflink.wcid);</div><div class='ctx'> 	if (vif-&gt;txq) {</div><div class='ctx'> 		mtxq = (struct mt76_txq *)vif-&gt;txq-&gt;drv_priv;</div><div class='del'>-		mtxq-&gt;wcid = &amp;mvif-&gt;sta.wcid;</div><div class='add'>+		mtxq-&gt;wcid = idx;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;type != NL80211_IFTYPE_AP &amp;&amp;</div><div class='del'>-	    (!mvif-&gt;mt76.omac_idx || mvif-&gt;mt76.omac_idx &gt; 3))</div><div class='del'>-		vif-&gt;offload_flags = 0;</div><div class='del'>-</div><div class='del'>-	vif-&gt;offload_flags |= IEEE80211_OFFLOAD_ENCAP_4ADDR;</div><div class='add'>+	vif-&gt;driver_flags |= IEEE80211_VIF_BEACON_FILTER;</div><div class='add'>+	if (phy-&gt;chip_cap &amp; MT792x_CHIP_CAP_RSSI_NOTIFY_EVT_EN)</div><div class='add'>+		vif-&gt;driver_flags |= IEEE80211_VIF_SUPPORTS_CQM_RSSI;</div><div class='ctx'> </div><div class='add'>+	INIT_WORK(&amp;mvif-&gt;csa_work, mt7921_csa_work);</div><div class='add'>+	timer_setup(&amp;mvif-&gt;csa_timer, mt792x_csa_timer, 0);</div><div class='ctx'> out:</div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt7921_remove_interface(struct ieee80211_hw *hw,</div><div class='del'>-				    struct ieee80211_vif *vif)</div><div class='add'>+static void mt7921_roc_iter(void *priv, u8 *mac,</div><div class='add'>+			    struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_vif *mvif = (struct mt7921_vif *)vif-&gt;drv_priv;</div><div class='del'>-	struct mt7921_sta *msta = &amp;mvif-&gt;sta;</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='del'>-	struct mt7921_phy *phy = mt7921_hw_phy(hw);</div><div class='del'>-	int idx = msta-&gt;wcid.idx;</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_phy *phy = priv;</div><div class='ctx'> </div><div class='del'>-	if (vif == phy-&gt;monitor_vif)</div><div class='del'>-		phy-&gt;monitor_vif = NULL;</div><div class='add'>+	mt7921_mcu_abort_roc(phy, mvif, phy-&gt;roc_token_id);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='del'>-	mt76_connac_free_pending_tx_skbs(&amp;dev-&gt;pm, &amp;msta-&gt;wcid);</div><div class='del'>-	mt76_connac_mcu_uni_add_dev(&amp;dev-&gt;mphy, vif, &amp;mvif-&gt;sta.wcid, false);</div><div class='add'>+void mt7921_roc_abort_sync(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+</div><div class='add'>+	timer_delete_sync(&amp;phy-&gt;roc_timer);</div><div class='add'>+	cancel_work_sync(&amp;phy-&gt;roc_work);</div><div class='add'>+	if (test_and_clear_bit(MT76_STATE_ROC, &amp;phy-&gt;mt76-&gt;state))</div><div class='add'>+		ieee80211_iterate_interfaces(mt76_hw(dev),</div><div class='add'>+					     IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='add'>+					     mt7921_roc_iter, (void *)phy);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7921_roc_abort_sync);</div><div class='ctx'> </div><div class='del'>-	rcu_assign_pointer(dev-&gt;mt76.wcid[idx], NULL);</div><div class='add'>+void mt7921_roc_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_phy *phy;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mt76.vif_mask &amp;= ~BIT(mvif-&gt;mt76.idx);</div><div class='del'>-	phy-&gt;omac_mask &amp;= ~BIT_ULL(mvif-&gt;mt76.omac_idx);</div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='add'>+	phy = (struct mt792x_phy *)container_of(work, struct mt792x_phy,</div><div class='add'>+						roc_work);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-	if (!list_empty(&amp;msta-&gt;poll_list))</div><div class='del'>-		list_del_init(&amp;msta-&gt;poll_list);</div><div class='del'>-	spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+	if (!test_and_clear_bit(MT76_STATE_ROC, &amp;phy-&gt;mt76-&gt;state))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(phy-&gt;dev);</div><div class='add'>+	ieee80211_iterate_active_interfaces(phy-&gt;mt76-&gt;hw,</div><div class='add'>+					    IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='add'>+					    mt7921_roc_iter, phy);</div><div class='add'>+	mt792x_mutex_release(phy-&gt;dev);</div><div class='add'>+	ieee80211_remain_on_channel_expired(phy-&gt;mt76-&gt;hw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7921_set_channel(struct mt7921_phy *phy)</div><div class='add'>+static int mt7921_abort_roc(struct mt792x_phy *phy, struct mt792x_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = phy-&gt;dev;</div><div class='del'>-	int ret;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='del'>-	cancel_delayed_work_sync(&amp;phy-&gt;mt76-&gt;mac_work);</div><div class='add'>+	timer_delete_sync(&amp;phy-&gt;roc_timer);</div><div class='add'>+	cancel_work_sync(&amp;phy-&gt;roc_work);</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='del'>-	set_bit(MT76_RESET, &amp;phy-&gt;mt76-&gt;state);</div><div class='add'>+	mt792x_mutex_acquire(phy-&gt;dev);</div><div class='add'>+	if (test_and_clear_bit(MT76_STATE_ROC, &amp;phy-&gt;mt76-&gt;state))</div><div class='add'>+		err = mt7921_mcu_abort_roc(phy, vif, phy-&gt;roc_token_id);</div><div class='add'>+	mt792x_mutex_release(phy-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	mt76_set_channel(phy-&gt;mt76);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ret = mt7921_mcu_set_chan_info(phy, MCU_EXT_CMD_CHANNEL_SWITCH);</div><div class='del'>-	if (ret)</div><div class='add'>+static int mt7921_set_roc(struct mt792x_phy *phy,</div><div class='add'>+			  struct mt792x_vif *vif,</div><div class='add'>+			  struct ieee80211_channel *chan,</div><div class='add'>+			  int duration,</div><div class='add'>+			  enum mt7921_roc_req type)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (test_and_set_bit(MT76_STATE_ROC, &amp;phy-&gt;mt76-&gt;state))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	phy-&gt;roc_grant = false;</div><div class='add'>+</div><div class='add'>+	err = mt7921_mcu_set_roc(phy, vif, chan, duration, type,</div><div class='add'>+				 ++phy-&gt;roc_token_id);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		clear_bit(MT76_STATE_ROC, &amp;phy-&gt;mt76-&gt;state);</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mt7921_mac_set_timing(phy);</div><div class='add'>+	if (!wait_event_timeout(phy-&gt;roc_wait, phy-&gt;roc_grant, HZ)) {</div><div class='add'>+		mt7921_mcu_abort_roc(phy, vif, phy-&gt;roc_token_id);</div><div class='add'>+		clear_bit(MT76_STATE_ROC, &amp;phy-&gt;mt76-&gt;state);</div><div class='add'>+		err = -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7921_remain_on_channel(struct ieee80211_hw *hw,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct ieee80211_channel *chan,</div><div class='add'>+				    int duration,</div><div class='add'>+				    enum ieee80211_roc_type type)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	mt7921_mac_reset_counters(phy);</div><div class='add'>+	mt792x_mutex_acquire(phy-&gt;dev);</div><div class='add'>+	err = mt7921_set_roc(phy, mvif, chan, duration, MT7921_ROC_REQ_ROC);</div><div class='add'>+	mt792x_mutex_release(phy-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7921_cancel_remain_on_channel(struct ieee80211_hw *hw,</div><div class='add'>+					   struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='add'>+</div><div class='add'>+	return mt7921_abort_roc(phy, mvif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7921_set_channel(struct mt76_phy *mphy)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_phy *phy = mphy-&gt;priv;</div><div class='add'>+	struct mt792x_dev *dev = phy-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mt76_connac_pm_wake(mphy, &amp;dev-&gt;pm);</div><div class='add'>+	ret = mt7921_mcu_set_chan_info(phy, MCU_EXT_CMD(CHANNEL_SWITCH));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mt792x_mac_set_timeing(phy);</div><div class='add'>+	mt792x_mac_reset_counters(phy);</div><div class='ctx'> 	phy-&gt;noise = 0;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	clear_bit(MT76_RESET, &amp;phy-&gt;mt76-&gt;state);</div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='add'>+	mt76_connac_power_save_sched(mphy, &amp;dev-&gt;pm);</div><div class='ctx'> </div><div class='del'>-	mt76_worker_schedule(&amp;dev-&gt;mt76.tx_worker);</div><div class='del'>-	ieee80211_queue_delayed_work(phy-&gt;mt76-&gt;hw, &amp;phy-&gt;mt76-&gt;mac_work,</div><div class='del'>-				     MT7921_WATCHDOG_TIME);</div><div class='add'>+	ieee80211_queue_delayed_work(mphy-&gt;hw, &amp;mphy-&gt;mac_work,</div><div class='add'>+				     MT792x_WATCHDOG_TIME);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7921_set_channel);</div><div class='ctx'> </div><div class='ctx'> static int mt7921_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 			  struct ieee80211_vif *vif, struct ieee80211_sta *sta,</div><div class='ctx'> 			  struct ieee80211_key_conf *key)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='del'>-	struct mt7921_vif *mvif = (struct mt7921_vif *)vif-&gt;drv_priv;</div><div class='del'>-	struct mt7921_sta *msta = sta ? (struct mt7921_sta *)sta-&gt;drv_priv :</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_sta *msta = sta ? (struct mt792x_sta *)sta-&gt;drv_priv :</div><div class='ctx'> 				  &amp;mvif-&gt;sta;</div><div class='del'>-	struct mt76_wcid *wcid = &amp;msta-&gt;wcid;</div><div class='add'>+	struct mt76_wcid *wcid = &amp;msta-&gt;deflink.wcid;</div><div class='ctx'> 	u8 *wcid_keyidx = &amp;wcid-&gt;hw_key_idx;</div><div class='ctx'> 	int idx = key-&gt;keyidx, err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -430,6 +522,11 @@ static int mt7921_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 		key-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_MMIE;</div><div class='ctx'> 		wcid_keyidx = &amp;wcid-&gt;hw_key_idx2;</div><div class='ctx'> 		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP40:</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP104:</div><div class='add'>+		if (!mvif-&gt;wep_sta)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_TKIP:</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_CCMP:</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_CCMP_256:</div><div class='hunk'>@@ -437,184 +534,183 @@ static int mt7921_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_SMS4:</div><div class='ctx'> 		break;</div><div class='del'>-	case WLAN_CIPHER_SUITE_WEP40:</div><div class='del'>-	case WLAN_CIPHER_SUITE_WEP104:</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='ctx'> </div><div class='del'>-	if (cmd == SET_KEY)</div><div class='add'>+	if (cmd == SET_KEY) {</div><div class='ctx'> 		*wcid_keyidx = idx;</div><div class='del'>-	else if (idx == *wcid_keyidx)</div><div class='del'>-		*wcid_keyidx = -1;</div><div class='del'>-	else</div><div class='del'>-		goto out;</div><div class='add'>+	} else {</div><div class='add'>+		if (idx == *wcid_keyidx)</div><div class='add'>+			*wcid_keyidx = -1;</div><div class='add'>+</div><div class='add'>+		/* For security issue we don't trigger the key deletion when</div><div class='add'>+		 * reassociating. But we should trigger the deletion process</div><div class='add'>+		 * to avoid using incorrect cipher after disconnection,</div><div class='add'>+		 */</div><div class='add'>+		if (vif-&gt;type != NL80211_IFTYPE_STATION || vif-&gt;cfg.assoc)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mt76_wcid_key_setup(&amp;dev-&gt;mt76, wcid,</div><div class='del'>-			    cmd == SET_KEY ? key : NULL);</div><div class='add'>+	mt76_wcid_key_setup(&amp;dev-&gt;mt76, wcid, key);</div><div class='add'>+	err = mt76_connac_mcu_add_key(&amp;dev-&gt;mt76, vif, &amp;msta-&gt;deflink.bip,</div><div class='add'>+				      key, MCU_UNI_CMD(STA_REC_UPDATE),</div><div class='add'>+				      &amp;msta-&gt;deflink.wcid, cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	err = mt7921_mcu_add_key(dev, vif, msta, key, cmd);</div><div class='add'>+	if (key-&gt;cipher == WLAN_CIPHER_SUITE_WEP104 ||</div><div class='add'>+	    key-&gt;cipher == WLAN_CIPHER_SUITE_WEP40)</div><div class='add'>+		err = mt76_connac_mcu_add_key(&amp;dev-&gt;mt76, vif,</div><div class='add'>+					      &amp;mvif-&gt;wep_sta-&gt;deflink.bip,</div><div class='add'>+					      key, MCU_UNI_CMD(STA_REC_UPDATE),</div><div class='add'>+					      &amp;mvif-&gt;wep_sta-&gt;deflink.wcid, cmd);</div><div class='ctx'> out:</div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7921_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+static void</div><div class='add'>+mt7921_pm_interface_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='del'>-	struct mt7921_phy *phy = mt7921_hw_phy(hw);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (changed &amp; IEEE80211_CONF_CHANGE_CHANNEL) {</div><div class='del'>-		ieee80211_stop_queues(hw);</div><div class='del'>-		ret = mt7921_set_channel(phy);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-		ieee80211_wake_queues(hw);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='del'>-</div><div class='del'>-	if (changed &amp; IEEE80211_CONF_CHANGE_MONITOR) {</div><div class='del'>-		bool enabled = !!(hw-&gt;conf.flags &amp; IEEE80211_CONF_MONITOR);</div><div class='add'>+	struct mt792x_dev *dev = priv;</div><div class='add'>+	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='add'>+	bool pm_enable = dev-&gt;pm.enable;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-		if (!enabled)</div><div class='del'>-			phy-&gt;rxfilter |= MT_WF_RFCR_DROP_OTHER_UC;</div><div class='del'>-		else</div><div class='del'>-			phy-&gt;rxfilter &amp;= ~MT_WF_RFCR_DROP_OTHER_UC;</div><div class='add'>+	err = mt7921_mcu_set_beacon_filter(dev, vif, pm_enable);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		mt76_rmw_field(dev, MT_DMA_DCR0(0), MT_DMA_DCR0_RXD_G5_EN,</div><div class='del'>-			       enabled);</div><div class='del'>-		mt76_wr(dev, MT_WF_RFCR(0), phy-&gt;rxfilter);</div><div class='add'>+	if (pm_enable) {</div><div class='add'>+		vif-&gt;driver_flags |= IEEE80211_VIF_BEACON_FILTER;</div><div class='add'>+		ieee80211_hw_set(hw, CONNECTION_MONITOR);</div><div class='add'>+	} else {</div><div class='add'>+		vif-&gt;driver_flags &amp;= ~IEEE80211_VIF_BEACON_FILTER;</div><div class='add'>+		__clear_bit(IEEE80211_HW_CONNECTION_MONITOR, hw-&gt;flags);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt7921_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue,</div><div class='del'>-	       const struct ieee80211_tx_queue_params *params)</div><div class='add'>+static void</div><div class='add'>+mt7921_sniffer_interface_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='del'>-	struct mt7921_vif *mvif = (struct mt7921_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_dev *dev = priv;</div><div class='add'>+	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+	bool monitor = !!(hw-&gt;conf.flags &amp; IEEE80211_CONF_MONITOR);</div><div class='ctx'> </div><div class='del'>-	/* no need to update right away, we'll get BSS_CHANGED_QOS */</div><div class='del'>-	queue = mt7921_lmac_mapping(dev, queue);</div><div class='del'>-	mvif-&gt;queue_params[queue] = *params;</div><div class='add'>+	mt7921_mcu_set_sniffer(dev, vif, monitor);</div><div class='add'>+	pm-&gt;enable = pm-&gt;enable_user &amp;&amp; !monitor;</div><div class='add'>+	pm-&gt;ds_enable = pm-&gt;ds_enable_user &amp;&amp; !monitor;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	mt76_connac_mcu_set_deep_sleep(&amp;dev-&gt;mt76, pm-&gt;ds_enable);</div><div class='add'>+</div><div class='add'>+	if (monitor)</div><div class='add'>+		mt7921_mcu_set_beacon_filter(dev, vif, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt7921_configure_filter(struct ieee80211_hw *hw,</div><div class='del'>-				    unsigned int changed_flags,</div><div class='del'>-				    unsigned int *total_flags,</div><div class='del'>-				    u64 multicast)</div><div class='add'>+void mt7921_set_runtime_pm(struct mt792x_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='del'>-	struct mt7921_phy *phy = mt7921_hw_phy(hw);</div><div class='del'>-	u32 ctl_flags = MT_WF_RFCR1_DROP_ACK |</div><div class='del'>-			MT_WF_RFCR1_DROP_BF_POLL |</div><div class='del'>-			MT_WF_RFCR1_DROP_BA |</div><div class='del'>-			MT_WF_RFCR1_DROP_CFEND |</div><div class='del'>-			MT_WF_RFCR1_DROP_CFACK;</div><div class='del'>-	u32 flags = 0;</div><div class='del'>-</div><div class='del'>-#define MT76_FILTER(_flag, _hw) do {					\</div><div class='del'>-		flags |= *total_flags &amp; FIF_##_flag;			\</div><div class='del'>-		phy-&gt;rxfilter &amp;= ~(_hw);				\</div><div class='del'>-		phy-&gt;rxfilter |= !(flags &amp; FIF_##_flag) * (_hw);	\</div><div class='del'>-	} while (0)</div><div class='add'>+	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+	bool monitor = !!(hw-&gt;conf.flags &amp; IEEE80211_CONF_MONITOR);</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='add'>+	pm-&gt;enable = pm-&gt;enable_user &amp;&amp; !monitor;</div><div class='add'>+	ieee80211_iterate_active_interfaces(hw,</div><div class='add'>+					    IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='add'>+					    mt7921_pm_interface_iter, dev);</div><div class='add'>+	pm-&gt;ds_enable = pm-&gt;ds_enable_user &amp;&amp; !monitor;</div><div class='add'>+	mt76_connac_mcu_set_deep_sleep(&amp;dev-&gt;mt76, pm-&gt;ds_enable);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	phy-&gt;rxfilter &amp;= ~(MT_WF_RFCR_DROP_OTHER_BSS |</div><div class='del'>-			   MT_WF_RFCR_DROP_OTHER_BEACON |</div><div class='del'>-			   MT_WF_RFCR_DROP_FRAME_REPORT |</div><div class='del'>-			   MT_WF_RFCR_DROP_PROBEREQ |</div><div class='del'>-			   MT_WF_RFCR_DROP_MCAST_FILTERED |</div><div class='del'>-			   MT_WF_RFCR_DROP_MCAST |</div><div class='del'>-			   MT_WF_RFCR_DROP_BCAST |</div><div class='del'>-			   MT_WF_RFCR_DROP_DUPLICATE |</div><div class='del'>-			   MT_WF_RFCR_DROP_A2_BSSID |</div><div class='del'>-			   MT_WF_RFCR_DROP_UNWANTED_CTL |</div><div class='del'>-			   MT_WF_RFCR_DROP_STBC_MULTI);</div><div class='add'>+static int mt7921_config(struct ieee80211_hw *hw, int radio_idx, u32 changed)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	MT76_FILTER(OTHER_BSS, MT_WF_RFCR_DROP_OTHER_TIM |</div><div class='del'>-			       MT_WF_RFCR_DROP_A3_MAC |</div><div class='del'>-			       MT_WF_RFCR_DROP_A3_BSSID);</div><div class='add'>+	if (changed &amp; IEEE80211_CONF_CHANGE_CHANNEL) {</div><div class='add'>+		ret = mt76_update_channel(phy-&gt;mt76);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	MT76_FILTER(FCSFAIL, MT_WF_RFCR_DROP_FCSFAIL);</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='ctx'> </div><div class='del'>-	MT76_FILTER(CONTROL, MT_WF_RFCR_DROP_CTS |</div><div class='del'>-			     MT_WF_RFCR_DROP_RTS |</div><div class='del'>-			     MT_WF_RFCR_DROP_CTL_RSV |</div><div class='del'>-			     MT_WF_RFCR_DROP_NDPA);</div><div class='add'>+	if (changed &amp; IEEE80211_CONF_CHANGE_POWER) {</div><div class='add'>+		ret = mt7921_set_tx_sar_pwr(hw, NULL);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	*total_flags = flags;</div><div class='del'>-	mt76_wr(dev, MT_WF_RFCR(0), phy-&gt;rxfilter);</div><div class='add'>+	if (changed &amp; IEEE80211_CONF_CHANGE_MONITOR) {</div><div class='add'>+		ieee80211_iterate_active_interfaces(hw,</div><div class='add'>+						    IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='add'>+						    mt7921_sniffer_interface_iter, dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (*total_flags &amp; FIF_CONTROL)</div><div class='del'>-		mt76_clear(dev, MT_WF_RFCR1(0), ctl_flags);</div><div class='del'>-	else</div><div class='del'>-		mt76_set(dev, MT_WF_RFCR1(0), ctl_flags);</div><div class='add'>+out:</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt7921_bss_bcnft_apply(struct mt7921_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-		       bool assoc)</div><div class='add'>+static void mt7921_configure_filter(struct ieee80211_hw *hw,</div><div class='add'>+				    unsigned int changed_flags,</div><div class='add'>+				    unsigned int *total_flags,</div><div class='add'>+				    u64 multicast)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!dev-&gt;pm.enable)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (assoc) {</div><div class='del'>-		ret = mt7921_mcu_uni_bss_bcnft(dev, vif, true);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+#define MT7921_FILTER_FCSFAIL    BIT(2)</div><div class='add'>+#define MT7921_FILTER_CONTROL    BIT(5)</div><div class='add'>+#define MT7921_FILTER_OTHER_BSS  BIT(6)</div><div class='add'>+#define MT7921_FILTER_ENABLE     BIT(31)</div><div class='ctx'> </div><div class='del'>-		vif-&gt;driver_flags |= IEEE80211_VIF_BEACON_FILTER;</div><div class='del'>-		mt76_set(dev, MT_WF_RFCR(0), MT_WF_RFCR_DROP_OTHER_BEACON);</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	u32 flags = MT7921_FILTER_ENABLE;</div><div class='ctx'> </div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+#define MT7921_FILTER(_fif, _type) do {			\</div><div class='add'>+		if (*total_flags &amp; (_fif))		\</div><div class='add'>+			flags |= MT7921_FILTER_##_type;	\</div><div class='add'>+	} while (0)</div><div class='ctx'> </div><div class='del'>-	ret = mt7921_mcu_set_bss_pm(dev, vif, false);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	MT7921_FILTER(FIF_FCSFAIL, FCSFAIL);</div><div class='add'>+	MT7921_FILTER(FIF_CONTROL, CONTROL);</div><div class='add'>+	MT7921_FILTER(FIF_OTHER_BSS, OTHER_BSS);</div><div class='ctx'> </div><div class='del'>-	vif-&gt;driver_flags &amp;= ~IEEE80211_VIF_BEACON_FILTER;</div><div class='del'>-	mt76_clear(dev, MT_WF_RFCR(0), MT_WF_RFCR_DROP_OTHER_BEACON);</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	mt7921_mcu_set_rxfilter(dev, flags, 0, 0);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	*total_flags &amp;= (FIF_OTHER_BSS | FIF_FCSFAIL | FIF_CONTROL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mt7921_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 				    struct ieee80211_vif *vif,</div><div class='ctx'> 				    struct ieee80211_bss_conf *info,</div><div class='del'>-				    u32 changed)</div><div class='add'>+				    u64 changed)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_phy *phy = mt7921_hw_phy(hw);</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_ERP_SLOT) {</div><div class='ctx'> 		int slottime = info-&gt;use_short_slot ? 9 : 20;</div><div class='ctx'> </div><div class='ctx'> 		if (slottime != phy-&gt;slottime) {</div><div class='ctx'> 			phy-&gt;slottime = slottime;</div><div class='del'>-			mt7921_mac_set_timing(phy);</div><div class='add'>+			mt792x_mac_set_timeing(phy);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (changed &amp; (BSS_CHANGED_BEACON |</div><div class='add'>+		       BSS_CHANGED_BEACON_ENABLED))</div><div class='add'>+		mt7921_mcu_uni_add_beacon_offload(dev, hw, vif,</div><div class='add'>+						  info-&gt;enable_beacon);</div><div class='add'>+</div><div class='ctx'> 	/* ensure that enable txcmd_mode after bss_info */</div><div class='ctx'> 	if (changed &amp; (BSS_CHANGED_QOS | BSS_CHANGED_BEACON_ENABLED))</div><div class='ctx'> 		mt7921_mcu_set_tx(dev, vif);</div><div class='hunk'>@@ -622,155 +718,205 @@ static void mt7921_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_PS)</div><div class='ctx'> 		mt7921_mcu_uni_bss_ps(dev, vif);</div><div class='ctx'> </div><div class='add'>+	if (changed &amp; BSS_CHANGED_CQM)</div><div class='add'>+		mt7921_mcu_set_rssimonitor(dev, vif);</div><div class='add'>+</div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_ASSOC) {</div><div class='del'>-		mt7921_mcu_sta_add(dev, NULL, vif, true);</div><div class='del'>-		mt7921_bss_bcnft_apply(dev, vif, info-&gt;assoc);</div><div class='add'>+		mt7921_mcu_sta_update(dev, NULL, vif, true,</div><div class='add'>+				      MT76_STA_INFO_STATE_ASSOC);</div><div class='add'>+		mt7921_mcu_set_beacon_filter(dev, vif, vif-&gt;cfg.assoc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_ARP_FILTER) {</div><div class='del'>-		struct mt7921_vif *mvif = (struct mt7921_vif *)vif-&gt;drv_priv;</div><div class='add'>+		struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='ctx'> </div><div class='del'>-		mt76_connac_mcu_update_arp_filter(&amp;dev-&gt;mt76, &amp;mvif-&gt;mt76,</div><div class='add'>+		mt76_connac_mcu_update_arp_filter(&amp;dev-&gt;mt76, &amp;mvif-&gt;bss_conf.mt76,</div><div class='ctx'> 						  info);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7921_calc_vif_num(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	u32 *num = priv;</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+	case NL80211_IFTYPE_P2P_CLIENT:</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+	case NL80211_IFTYPE_P2P_GO:</div><div class='add'>+		*num += 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7921_regd_set_6ghz_power_type(struct ieee80211_vif *vif, bool is_add)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_phy *phy = mvif-&gt;phy;</div><div class='add'>+	struct mt792x_dev *dev = phy-&gt;dev;</div><div class='add'>+	u32 valid_vif_num = 0;</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces(mt76_hw(dev),</div><div class='add'>+					    IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='add'>+					    mt7921_calc_vif_num, &amp;valid_vif_num);</div><div class='add'>+</div><div class='add'>+	if (valid_vif_num &gt; 1) {</div><div class='add'>+		phy-&gt;power_type = MT_AP_DEFAULT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!is_add)</div><div class='add'>+		vif-&gt;bss_conf.power_type = IEEE80211_REG_UNSET_AP;</div><div class='add'>+</div><div class='add'>+	switch (vif-&gt;bss_conf.power_type) {</div><div class='add'>+	case IEEE80211_REG_SP_AP:</div><div class='add'>+		phy-&gt;power_type = MT_AP_SP;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_REG_VLP_AP:</div><div class='add'>+		phy-&gt;power_type = MT_AP_VLP;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_REG_LPI_AP:</div><div class='add'>+		phy-&gt;power_type = MT_AP_LPI;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_REG_UNSET_AP:</div><div class='add'>+		phy-&gt;power_type = MT_AP_UNSET;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		phy-&gt;power_type = MT_AP_DEFAULT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mt7921_mcu_set_clc(dev, dev-&gt;mt76.alpha2, dev-&gt;country_ie_env);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mt7921_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='ctx'> 		       struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);</div><div class='del'>-	struct mt7921_sta *msta = (struct mt7921_sta *)sta-&gt;drv_priv;</div><div class='del'>-	struct mt7921_vif *mvif = (struct mt7921_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	struct mt792x_sta *msta = (struct mt792x_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='ctx'> 	int ret, idx;</div><div class='ctx'> </div><div class='del'>-	idx = mt76_wcid_alloc(dev-&gt;mt76.wcid_mask, MT7921_WTBL_STA - 1);</div><div class='add'>+	idx = mt76_wcid_alloc(dev-&gt;mt76.wcid_mask, MT792x_WTBL_STA - 1);</div><div class='ctx'> 	if (idx &lt; 0)</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;msta-&gt;stats_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;msta-&gt;poll_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;msta-&gt;deflink.wcid.poll_list);</div><div class='ctx'> 	msta-&gt;vif = mvif;</div><div class='del'>-	msta-&gt;wcid.sta = 1;</div><div class='del'>-	msta-&gt;wcid.idx = idx;</div><div class='del'>-	msta-&gt;wcid.ext_phy = mvif-&gt;mt76.band_idx;</div><div class='del'>-	msta-&gt;wcid.tx_info |= MT_WCID_TX_INFO_SET;</div><div class='del'>-	msta-&gt;stats.jiffies = jiffies;</div><div class='add'>+	msta-&gt;deflink.wcid.sta = 1;</div><div class='add'>+	msta-&gt;deflink.wcid.idx = idx;</div><div class='add'>+	msta-&gt;deflink.wcid.phy_idx = mvif-&gt;bss_conf.mt76.band_idx;</div><div class='add'>+	msta-&gt;deflink.wcid.tx_info |= MT_WCID_TX_INFO_SET;</div><div class='add'>+	msta-&gt;deflink.last_txs = jiffies;</div><div class='add'>+	msta-&gt;deflink.sta = msta;</div><div class='ctx'> </div><div class='ctx'> 	ret = mt76_connac_pm_wake(&amp;dev-&gt;mphy, &amp;dev-&gt;pm);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; !sta-&gt;tdls)</div><div class='del'>-		mt76_connac_mcu_uni_add_bss(&amp;dev-&gt;mphy, vif, &amp;mvif-&gt;sta.wcid,</div><div class='del'>-					    true);</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+		mvif-&gt;wep_sta = msta;</div><div class='ctx'> </div><div class='ctx'> 	mt7921_mac_wtbl_update(dev, idx,</div><div class='ctx'> 			       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);</div><div class='ctx'> </div><div class='del'>-	ret = mt7921_mcu_sta_add(dev, sta, vif, true);</div><div class='add'>+	ret = mt7921_mcu_sta_update(dev, sta, vif, true,</div><div class='add'>+				    MT76_STA_INFO_STATE_NONE);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	mt7921_regd_set_6ghz_power_type(vif, true);</div><div class='add'>+</div><div class='ctx'> 	mt76_connac_power_save_sched(&amp;dev-&gt;mphy, &amp;dev-&gt;pm);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7921_mac_sta_add);</div><div class='ctx'> </div><div class='del'>-void mt7921_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='del'>-			   struct ieee80211_sta *sta)</div><div class='add'>+int mt7921_mac_sta_event(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='add'>+			 struct ieee80211_sta *sta, enum mt76_sta_event ev)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);</div><div class='del'>-	struct mt7921_sta *msta = (struct mt7921_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	struct mt792x_sta *msta = (struct mt792x_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='ctx'> </div><div class='del'>-	mt76_connac_free_pending_tx_skbs(&amp;dev-&gt;pm, &amp;msta-&gt;wcid);</div><div class='del'>-	mt76_connac_pm_wake(&amp;dev-&gt;mphy, &amp;dev-&gt;pm);</div><div class='add'>+	if (ev != MT76_STA_EVENT_ASSOC)</div><div class='add'>+	    return 0;</div><div class='ctx'> </div><div class='del'>-	mt7921_mcu_sta_add(dev, sta, vif, false);</div><div class='del'>-	mt7921_mac_wtbl_update(dev, msta-&gt;wcid.idx,</div><div class='del'>-			       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);</div><div class='del'>-</div><div class='del'>-	if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='del'>-		struct mt7921_vif *mvif = (struct mt7921_vif *)vif-&gt;drv_priv;</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='ctx'> </div><div class='del'>-		ewma_rssi_init(&amp;mvif-&gt;rssi);</div><div class='del'>-		if (!sta-&gt;tdls)</div><div class='del'>-			mt76_connac_mcu_uni_add_bss(&amp;dev-&gt;mphy, vif,</div><div class='del'>-						    &amp;mvif-&gt;sta.wcid, false);</div><div class='del'>-	}</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; !sta-&gt;tdls)</div><div class='add'>+		mt76_connac_mcu_uni_add_bss(&amp;dev-&gt;mphy, vif, &amp;mvif-&gt;sta.deflink.wcid,</div><div class='add'>+					    true, mvif-&gt;bss_conf.mt76.ctx);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='del'>-	if (!list_empty(&amp;msta-&gt;poll_list))</div><div class='del'>-		list_del_init(&amp;msta-&gt;poll_list);</div><div class='del'>-	if (!list_empty(&amp;msta-&gt;stats_list))</div><div class='del'>-		list_del_init(&amp;msta-&gt;stats_list);</div><div class='del'>-	spin_unlock_bh(&amp;dev-&gt;sta_poll_lock);</div><div class='add'>+	ewma_avg_signal_init(&amp;msta-&gt;deflink.avg_ack_signal);</div><div class='ctx'> </div><div class='del'>-	mt76_connac_power_save_sched(&amp;dev-&gt;mphy, &amp;dev-&gt;pm);</div><div class='del'>-}</div><div class='add'>+	mt7921_mac_wtbl_update(dev, msta-&gt;deflink.wcid.idx,</div><div class='add'>+			       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);</div><div class='add'>+	memset(msta-&gt;deflink.airtime_ac, 0, sizeof(msta-&gt;deflink.airtime_ac));</div><div class='ctx'> </div><div class='del'>-void mt7921_tx_worker(struct mt76_worker *w)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_dev *dev = container_of(w, struct mt7921_dev,</div><div class='del'>-					      mt76.tx_worker);</div><div class='add'>+	mt7921_mcu_sta_update(dev, sta, vif, true, MT76_STA_INFO_STATE_ASSOC);</div><div class='ctx'> </div><div class='del'>-	if (!mt76_connac_pm_ref(&amp;dev-&gt;mphy, &amp;dev-&gt;pm)) {</div><div class='del'>-		queue_work(dev-&gt;mt76.wq, &amp;dev-&gt;pm.wake_work);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='ctx'> </div><div class='del'>-	mt76_txq_schedule_all(&amp;dev-&gt;mphy);</div><div class='del'>-	mt76_connac_pm_unref(&amp;dev-&gt;pm);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7921_mac_sta_event);</div><div class='ctx'> </div><div class='del'>-static void mt7921_tx(struct ieee80211_hw *hw,</div><div class='del'>-		      struct ieee80211_tx_control *control,</div><div class='del'>-		      struct sk_buff *skb)</div><div class='add'>+void mt7921_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='add'>+			   struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='del'>-	struct mt76_phy *mphy = hw-&gt;priv;</div><div class='del'>-	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='del'>-	struct ieee80211_vif *vif = info-&gt;control.vif;</div><div class='del'>-	struct mt76_wcid *wcid = &amp;dev-&gt;mt76.global_wcid;</div><div class='del'>-	int qid;</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	struct mt792x_sta *msta = (struct mt792x_sta *)sta-&gt;drv_priv;</div><div class='ctx'> </div><div class='del'>-	if (control-&gt;sta) {</div><div class='del'>-		struct mt7921_sta *sta;</div><div class='add'>+	mt7921_roc_abort_sync(dev);</div><div class='add'>+	mt76_connac_free_pending_tx_skbs(&amp;dev-&gt;pm, &amp;msta-&gt;deflink.wcid);</div><div class='add'>+	mt76_connac_pm_wake(&amp;dev-&gt;mphy, &amp;dev-&gt;pm);</div><div class='ctx'> </div><div class='del'>-		sta = (struct mt7921_sta *)control-&gt;sta-&gt;drv_priv;</div><div class='del'>-		wcid = &amp;sta-&gt;wcid;</div><div class='del'>-	}</div><div class='add'>+	mt7921_mcu_sta_update(dev, sta, vif, false, MT76_STA_INFO_STATE_NONE);</div><div class='add'>+	mt7921_mac_wtbl_update(dev, msta-&gt;deflink.wcid.idx,</div><div class='add'>+			       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);</div><div class='ctx'> </div><div class='del'>-	if (vif &amp;&amp; !control-&gt;sta) {</div><div class='del'>-		struct mt7921_vif *mvif;</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='add'>+		struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='ctx'> </div><div class='del'>-		mvif = (struct mt7921_vif *)vif-&gt;drv_priv;</div><div class='del'>-		wcid = &amp;mvif-&gt;sta.wcid;</div><div class='add'>+		mvif-&gt;wep_sta = NULL;</div><div class='add'>+		ewma_rssi_init(&amp;mvif-&gt;bss_conf.rssi);</div><div class='add'>+		if (!sta-&gt;tdls)</div><div class='add'>+			mt76_connac_mcu_uni_add_bss(&amp;dev-&gt;mphy, vif,</div><div class='add'>+						    &amp;mvif-&gt;sta.deflink.wcid, false,</div><div class='add'>+						    mvif-&gt;bss_conf.mt76.ctx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mt76_connac_pm_ref(mphy, &amp;dev-&gt;pm)) {</div><div class='del'>-		mt76_tx(mphy, control-&gt;sta, wcid, skb);</div><div class='del'>-		mt76_connac_pm_unref(&amp;dev-&gt;pm);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='add'>+	if (!list_empty(&amp;msta-&gt;deflink.wcid.poll_list))</div><div class='add'>+		list_del_init(&amp;msta-&gt;deflink.wcid.poll_list);</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='ctx'> </div><div class='del'>-	qid = skb_get_queue_mapping(skb);</div><div class='del'>-	if (qid &gt;= MT_TXQ_PSD) {</div><div class='del'>-		qid = IEEE80211_AC_BE;</div><div class='del'>-		skb_set_queue_mapping(skb, qid);</div><div class='del'>-	}</div><div class='add'>+	mt7921_regd_set_6ghz_power_type(vif, false);</div><div class='ctx'> </div><div class='del'>-	mt76_connac_pm_queue_skb(hw, &amp;dev-&gt;pm, wcid, skb);</div><div class='add'>+	mt76_connac_power_save_sched(&amp;dev-&gt;mphy, &amp;dev-&gt;pm);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7921_mac_sta_remove);</div><div class='ctx'> </div><div class='del'>-static int mt7921_set_rts_threshold(struct ieee80211_hw *hw, u32 val)</div><div class='add'>+static int mt7921_set_rts_threshold(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+				    u32 val)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='ctx'> 	mt76_connac_mcu_set_rts_thresh(&amp;dev-&gt;mt76, val, 0);</div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -780,10 +926,10 @@ mt7921_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 		    struct ieee80211_ampdu_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	enum ieee80211_ampdu_mlme_action action = params-&gt;action;</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='ctx'> 	struct ieee80211_sta *sta = params-&gt;sta;</div><div class='ctx'> 	struct ieee80211_txq *txq = sta-&gt;txq[params-&gt;tid];</div><div class='del'>-	struct mt7921_sta *msta = (struct mt7921_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct mt792x_sta *msta = (struct mt792x_sta *)sta-&gt;drv_priv;</div><div class='ctx'> 	u16 tid = params-&gt;tid;</div><div class='ctx'> 	u16 ssn = params-&gt;ssn;</div><div class='ctx'> 	struct mt76_txq *mtxq;</div><div class='hunk'>@@ -794,15 +940,15 @@ mt7921_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> </div><div class='ctx'> 	mtxq = (struct mt76_txq *)txq-&gt;drv_priv;</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='ctx'> 	switch (action) {</div><div class='ctx'> 	case IEEE80211_AMPDU_RX_START:</div><div class='del'>-		mt76_rx_aggr_start(&amp;dev-&gt;mt76, &amp;msta-&gt;wcid, tid, ssn,</div><div class='add'>+		mt76_rx_aggr_start(&amp;dev-&gt;mt76, &amp;msta-&gt;deflink.wcid, tid, ssn,</div><div class='ctx'> 				   params-&gt;buf_size);</div><div class='ctx'> 		mt7921_mcu_uni_rx_ba(dev, params, true);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_AMPDU_RX_STOP:</div><div class='del'>-		mt76_rx_aggr_stop(&amp;dev-&gt;mt76, &amp;msta-&gt;wcid, tid);</div><div class='add'>+		mt76_rx_aggr_stop(&amp;dev-&gt;mt76, &amp;msta-&gt;deflink.wcid, tid);</div><div class='ctx'> 		mt7921_mcu_uni_rx_ba(dev, params, false);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_OPERATIONAL:</div><div class='hunk'>@@ -813,132 +959,51 @@ mt7921_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_STOP_FLUSH:</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:</div><div class='ctx'> 		mtxq-&gt;aggr = false;</div><div class='del'>-		clear_bit(tid, &amp;msta-&gt;ampdu_state);</div><div class='add'>+		clear_bit(tid, &amp;msta-&gt;deflink.wcid.ampdu_state);</div><div class='ctx'> 		mt7921_mcu_uni_tx_ba(dev, params, false);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_START:</div><div class='del'>-		set_bit(tid, &amp;msta-&gt;ampdu_state);</div><div class='add'>+		set_bit(tid, &amp;msta-&gt;deflink.wcid.ampdu_state);</div><div class='ctx'> 		ret = IEEE80211_AMPDU_TX_START_IMMEDIATE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_STOP_CONT:</div><div class='ctx'> 		mtxq-&gt;aggr = false;</div><div class='del'>-		clear_bit(tid, &amp;msta-&gt;ampdu_state);</div><div class='add'>+		clear_bit(tid, &amp;msta-&gt;deflink.wcid.ampdu_state);</div><div class='ctx'> 		mt7921_mcu_uni_tx_ba(dev, params, false);</div><div class='ctx'> 		ieee80211_stop_tx_ba_cb_irqsafe(vif, sta-&gt;addr, tid);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt7921_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-	       struct ieee80211_sta *sta)</div><div class='del'>-{</div><div class='del'>-	return mt76_sta_state(hw, vif, sta, IEEE80211_STA_NOTEXIST,</div><div class='del'>-			      IEEE80211_STA_NONE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mt7921_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-		  struct ieee80211_sta *sta)</div><div class='del'>-{</div><div class='del'>-	return mt76_sta_state(hw, vif, sta, IEEE80211_STA_NONE,</div><div class='del'>-			      IEEE80211_STA_NOTEXIST);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mt7921_get_stats(struct ieee80211_hw *hw,</div><div class='del'>-		 struct ieee80211_low_level_stats *stats)</div><div class='add'>+static int mt7921_sta_state(struct ieee80211_hw *hw,</div><div class='add'>+			    struct ieee80211_vif *vif,</div><div class='add'>+			    struct ieee80211_sta *sta,</div><div class='add'>+			    enum ieee80211_sta_state old_state,</div><div class='add'>+			    enum ieee80211_sta_state new_state)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_phy *phy = mt7921_hw_phy(hw);</div><div class='del'>-	struct mib_stats *mib = &amp;phy-&gt;mib;</div><div class='del'>-</div><div class='del'>-	mt7921_mutex_acquire(phy-&gt;dev);</div><div class='del'>-</div><div class='del'>-	stats-&gt;dot11RTSSuccessCount = mib-&gt;rts_cnt;</div><div class='del'>-	stats-&gt;dot11RTSFailureCount = mib-&gt;rts_retries_cnt;</div><div class='del'>-	stats-&gt;dot11FCSErrorCount = mib-&gt;fcs_err_cnt;</div><div class='del'>-	stats-&gt;dot11ACKFailureCount = mib-&gt;ack_fail_cnt;</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='ctx'> </div><div class='del'>-	memset(mib, 0, sizeof(*mib));</div><div class='del'>-</div><div class='del'>-	mt7921_mutex_release(phy-&gt;dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u64</div><div class='del'>-mt7921_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_vif *mvif = (struct mt7921_vif *)vif-&gt;drv_priv;</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='del'>-	u8 omac_idx = mvif-&gt;mt76.omac_idx;</div><div class='del'>-	union {</div><div class='del'>-		u64 t64;</div><div class='del'>-		u32 t32[2];</div><div class='del'>-	} tsf;</div><div class='del'>-	u16 n;</div><div class='del'>-</div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='del'>-</div><div class='del'>-	n = omac_idx &gt; HW_BSSID_MAX ? HW_BSSID_0 : omac_idx;</div><div class='del'>-	/* TSF software read */</div><div class='del'>-	mt76_set(dev, MT_LPON_TCR(0, n), MT_LPON_TCR_SW_MODE);</div><div class='del'>-	tsf.t32[0] = mt76_rr(dev, MT_LPON_UTTR0(0));</div><div class='del'>-	tsf.t32[1] = mt76_rr(dev, MT_LPON_UTTR1(0));</div><div class='del'>-</div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='del'>-</div><div class='del'>-	return tsf.t64;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt7921_set_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-	       u64 timestamp)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_vif *mvif = (struct mt7921_vif *)vif-&gt;drv_priv;</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='del'>-	u8 omac_idx = mvif-&gt;mt76.omac_idx;</div><div class='del'>-	union {</div><div class='del'>-		u64 t64;</div><div class='del'>-		u32 t32[2];</div><div class='del'>-	} tsf = { .t64 = timestamp, };</div><div class='del'>-	u16 n;</div><div class='del'>-</div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='del'>-</div><div class='del'>-	n = omac_idx &gt; HW_BSSID_MAX ? HW_BSSID_0 : omac_idx;</div><div class='del'>-	mt76_wr(dev, MT_LPON_UTTR0(0), tsf.t32[0]);</div><div class='del'>-	mt76_wr(dev, MT_LPON_UTTR1(0), tsf.t32[1]);</div><div class='del'>-	/* TSF software overwrite */</div><div class='del'>-	mt76_set(dev, MT_LPON_TCR(0, n), MT_LPON_TCR_SW_WRITE);</div><div class='del'>-</div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mt7921_set_coverage_class(struct ieee80211_hw *hw, s16 coverage_class)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_phy *phy = mt7921_hw_phy(hw);</div><div class='del'>-	struct mt7921_dev *dev = phy-&gt;dev;</div><div class='add'>+	if (dev-&gt;pm.ds_enable) {</div><div class='add'>+		mt792x_mutex_acquire(dev);</div><div class='add'>+		mt76_connac_sta_state_dp(&amp;dev-&gt;mt76, old_state, new_state);</div><div class='add'>+		mt792x_mutex_release(dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='del'>-	phy-&gt;coverage_class = max_t(s16, coverage_class, 0);</div><div class='del'>-	mt7921_mac_set_timing(phy);</div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='add'>+	return mt76_sta_state(hw, vif, sta, old_state, new_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mt7921_scan_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_phy *phy;</div><div class='add'>+	struct mt792x_phy *phy;</div><div class='ctx'> </div><div class='del'>-	phy = (struct mt7921_phy *)container_of(work, struct mt7921_phy,</div><div class='add'>+	phy = (struct mt792x_phy *)container_of(work, struct mt792x_phy,</div><div class='ctx'> 						scan_work.work);</div><div class='ctx'> </div><div class='ctx'> 	while (true) {</div><div class='del'>-		struct mt7921_mcu_rxd *rxd;</div><div class='add'>+		struct mt76_connac2_mcu_rxd *rxd;</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;phy-&gt;dev-&gt;mt76.lock);</div><div class='hunk'>@@ -948,7 +1013,7 @@ void mt7921_scan_work(struct work_struct *work)</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		rxd = (struct mt7921_mcu_rxd *)skb-&gt;data;</div><div class='add'>+		rxd = (struct mt76_connac2_mcu_rxd *)skb-&gt;data;</div><div class='ctx'> 		if (rxd-&gt;eid == MCU_EVENT_SCHED_SCAN_DONE) {</div><div class='ctx'> 			ieee80211_sched_scan_results(phy-&gt;mt76-&gt;hw);</div><div class='ctx'> 		} else if (test_and_clear_bit(MT76_HW_SCANNING,</div><div class='hunk'>@@ -967,13 +1032,13 @@ static int</div><div class='ctx'> mt7921_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	       struct ieee80211_scan_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='ctx'> 	struct mt76_phy *mphy = hw-&gt;priv;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='ctx'> 	err = mt76_connac_mcu_hw_scan(mphy, vif, req);</div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -981,12 +1046,12 @@ mt7921_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> static void</div><div class='ctx'> mt7921_cancel_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='ctx'> 	struct mt76_phy *mphy = hw-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='ctx'> 	mt76_connac_mcu_cancel_hw_scan(mphy, vif);</div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -994,11 +1059,11 @@ mt7921_start_sched_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 			struct cfg80211_sched_scan_request *req,</div><div class='ctx'> 			struct ieee80211_scan_ies *ies)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='ctx'> 	struct mt76_phy *mphy = hw-&gt;priv;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='ctx'> </div><div class='ctx'> 	err = mt76_connac_mcu_sched_scan_req(mphy, vif, req);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -1006,7 +1071,7 @@ mt7921_start_sched_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> </div><div class='ctx'> 	err = mt76_connac_mcu_sched_scan_enable(mphy, vif, true);</div><div class='ctx'> out:</div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1014,31 +1079,32 @@ out:</div><div class='ctx'> static int</div><div class='ctx'> mt7921_stop_sched_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='ctx'> 	struct mt76_phy *mphy = hw-&gt;priv;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='ctx'> 	err = mt76_connac_mcu_sched_scan_enable(mphy, vif, false);</div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt7921_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)</div><div class='add'>+mt7921_set_antenna(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+		   u32 tx_ant, u32 rx_ant)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='del'>-	struct mt7921_phy *phy = mt7921_hw_phy(hw);</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='ctx'> 	int max_nss = hweight8(hw-&gt;wiphy-&gt;available_antennas_tx);</div><div class='ctx'> </div><div class='ctx'> 	if (!tx_ant || tx_ant != rx_ant || ffs(tx_ant) &gt; max_nss)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if ((BIT(hweight8(tx_ant)) - 1) != tx_ant)</div><div class='del'>-		tx_ant = BIT(ffs(tx_ant) - 1) - 1;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='ctx'> </div><div class='ctx'> 	phy-&gt;mt76-&gt;antenna_mask = tx_ant;</div><div class='ctx'> 	phy-&gt;mt76-&gt;chainmask = tx_ant;</div><div class='hunk'>@@ -1046,43 +1112,17 @@ mt7921_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)</div><div class='ctx'> 	mt76_set_stream_caps(phy-&gt;mt76, true);</div><div class='ctx'> 	mt7921_set_stream_he_caps(phy);</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt7921_sta_statistics(struct ieee80211_hw *hw,</div><div class='del'>-				  struct ieee80211_vif *vif,</div><div class='del'>-				  struct ieee80211_sta *sta,</div><div class='del'>-				  struct station_info *sinfo)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_sta *msta = (struct mt7921_sta *)sta-&gt;drv_priv;</div><div class='del'>-	struct mt7921_sta_stats *stats = &amp;msta-&gt;stats;</div><div class='del'>-</div><div class='del'>-	if (!stats-&gt;tx_rate.legacy &amp;&amp; !stats-&gt;tx_rate.flags)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (stats-&gt;tx_rate.legacy) {</div><div class='del'>-		sinfo-&gt;txrate.legacy = stats-&gt;tx_rate.legacy;</div><div class='del'>-	} else {</div><div class='del'>-		sinfo-&gt;txrate.mcs = stats-&gt;tx_rate.mcs;</div><div class='del'>-		sinfo-&gt;txrate.nss = stats-&gt;tx_rate.nss;</div><div class='del'>-		sinfo-&gt;txrate.bw = stats-&gt;tx_rate.bw;</div><div class='del'>-		sinfo-&gt;txrate.he_gi = stats-&gt;tx_rate.he_gi;</div><div class='del'>-		sinfo-&gt;txrate.he_dcm = stats-&gt;tx_rate.he_dcm;</div><div class='del'>-		sinfo-&gt;txrate.he_ru_alloc = stats-&gt;tx_rate.he_ru_alloc;</div><div class='del'>-	}</div><div class='del'>-	sinfo-&gt;txrate.flags = stats-&gt;tx_rate.flags;</div><div class='del'>-	sinfo-&gt;filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static int mt7921_suspend(struct ieee80211_hw *hw,</div><div class='ctx'> 			  struct cfg80211_wowlan *wowlan)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='del'>-	struct mt7921_phy *phy = mt7921_hw_phy(hw);</div><div class='del'>-	int err;</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='ctx'> </div><div class='ctx'> 	cancel_delayed_work_sync(&amp;phy-&gt;scan_work);</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;phy-&gt;mt76-&gt;mac_work);</div><div class='hunk'>@@ -1090,116 +1130,461 @@ static int mt7921_suspend(struct ieee80211_hw *hw,</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;dev-&gt;pm.ps_work);</div><div class='ctx'> 	mt76_connac_free_pending_tx_skbs(&amp;dev-&gt;pm, NULL);</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(MT76_STATE_RUNNING, &amp;phy-&gt;mt76-&gt;state);</div><div class='del'>-</div><div class='del'>-	set_bit(MT76_STATE_SUSPEND, &amp;phy-&gt;mt76-&gt;state);</div><div class='ctx'> 	ieee80211_iterate_active_interfaces(hw,</div><div class='ctx'> 					    IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='del'>-					    mt76_connac_mcu_set_suspend_iter,</div><div class='add'>+					    mt7921_mcu_set_suspend_iter,</div><div class='ctx'> 					    &amp;dev-&gt;mphy);</div><div class='ctx'> </div><div class='del'>-	err = mt76_connac_mcu_set_hif_suspend(&amp;dev-&gt;mt76, true);</div><div class='del'>-</div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt7921_resume(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='del'>-	struct mt7921_phy *phy = mt7921_hw_phy(hw);</div><div class='del'>-	int err;</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='del'>-</div><div class='del'>-	err = mt76_connac_mcu_set_hif_suspend(&amp;dev-&gt;mt76, false);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(MT76_STATE_RUNNING, &amp;phy-&gt;mt76-&gt;state);</div><div class='del'>-	clear_bit(MT76_STATE_SUSPEND, &amp;phy-&gt;mt76-&gt;state);</div><div class='ctx'> 	ieee80211_iterate_active_interfaces(hw,</div><div class='ctx'> 					    IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='ctx'> 					    mt76_connac_mcu_set_suspend_iter,</div><div class='ctx'> 					    &amp;dev-&gt;mphy);</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_queue_delayed_work(hw, &amp;phy-&gt;mt76-&gt;mac_work,</div><div class='del'>-				     MT7921_WATCHDOG_TIME);</div><div class='add'>+				     MT792x_WATCHDOG_TIME);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7921_set_rekey_data(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  struct cfg80211_gtk_rekey_data *data)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	mt76_connac_mcu_update_gtk_rekey(hw, vif, data);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+</div><div class='add'>+static void mt7921_sta_set_decap_offload(struct ieee80211_hw *hw,</div><div class='add'>+					 struct ieee80211_vif *vif,</div><div class='add'>+					 struct ieee80211_sta *sta,</div><div class='add'>+					 bool enabled)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_sta *msta = (struct mt792x_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+</div><div class='add'>+	if (!msta-&gt;deflink.wcid.sta)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+</div><div class='add'>+	if (enabled)</div><div class='add'>+		set_bit(MT_WCID_FLAG_HDR_TRANS, &amp;msta-&gt;deflink.wcid.flags);</div><div class='add'>+	else</div><div class='add'>+		clear_bit(MT_WCID_FLAG_HDR_TRANS, &amp;msta-&gt;deflink.wcid.flags);</div><div class='add'>+</div><div class='add'>+	mt76_connac_mcu_sta_update_hdr_trans(&amp;dev-&gt;mt76, vif, &amp;msta-&gt;deflink.wcid,</div><div class='add'>+					     MCU_UNI_CMD(STA_REC_UPDATE));</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+static void mt7921_ipv6_addr_change(struct ieee80211_hw *hw,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct inet6_dev *idev)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct inet6_ifaddr *ifa;</div><div class='add'>+	struct in6_addr ns_addrs[IEEE80211_BSS_ARP_ADDR_LIST_LEN];</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u8 i, idx = 0;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 bss_idx;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct mt76_connac_arpns_tlv arpns;</div><div class='add'>+	} req_hdr = {</div><div class='add'>+		.hdr = {</div><div class='add'>+			.bss_idx = mvif-&gt;bss_conf.mt76.idx,</div><div class='add'>+		},</div><div class='add'>+		.arpns = {</div><div class='add'>+			.tag = cpu_to_le16(UNI_OFFLOAD_OFFLOAD_ND),</div><div class='add'>+			.mode = 2,  /* update */</div><div class='add'>+			.option = 1, /* update only */</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	read_lock_bh(&amp;idev-&gt;lock);</div><div class='add'>+	list_for_each_entry(ifa, &amp;idev-&gt;addr_list, if_list) {</div><div class='add'>+		if (ifa-&gt;flags &amp; IFA_F_TENTATIVE)</div><div class='add'>+			continue;</div><div class='add'>+		ns_addrs[idx] = ifa-&gt;addr;</div><div class='add'>+		if (++idx &gt;= IEEE80211_BSS_ARP_ADDR_LIST_LEN)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!idx)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	req_hdr.arpns.ips_num = idx;</div><div class='add'>+	req_hdr.arpns.len = cpu_to_le16(sizeof(struct mt76_connac_arpns_tlv)</div><div class='add'>+					+ idx * sizeof(struct in6_addr));</div><div class='add'>+	skb = __mt76_mcu_msg_alloc(&amp;dev-&gt;mt76, &amp;req_hdr,</div><div class='add'>+			sizeof(req_hdr) + idx * sizeof(struct in6_addr),</div><div class='add'>+			sizeof(req_hdr), GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; idx; i++)</div><div class='add'>+		skb_put_data(skb, &amp;ns_addrs[i].in6_u, sizeof(struct in6_addr));</div><div class='add'>+</div><div class='add'>+	skb_queue_tail(&amp;dev-&gt;ipv6_ns_list, skb);</div><div class='add'>+</div><div class='add'>+	ieee80211_queue_work(dev-&gt;mt76.hw, &amp;dev-&gt;ipv6_ns_work);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int mt7921_set_tx_sar_pwr(struct ieee80211_hw *hw,</div><div class='add'>+			  const struct cfg80211_sar_specs *sar)</div><div class='add'>+{</div><div class='add'>+	struct mt76_phy *mphy = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (sar) {</div><div class='add'>+		int err = mt76_init_sar_power(hw, sar);</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	mt792x_init_acpi_sar_power(mt792x_hw_phy(hw), !sar);</div><div class='add'>+</div><div class='add'>+	return mt76_connac_mcu_set_rate_txpower(mphy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7921_set_sar_specs(struct ieee80211_hw *hw,</div><div class='add'>+				const struct cfg80211_sar_specs *sar)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	err = mt7921_mcu_set_clc(dev, dev-&gt;mt76.alpha2,</div><div class='add'>+				 dev-&gt;country_ie_env);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt7921_set_tx_sar_pwr(hw, sar);</div><div class='ctx'> out:</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7921_channel_switch_beacon(struct ieee80211_hw *hw,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     struct cfg80211_chan_def *chandef)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	mt7921_mcu_uni_add_beacon_offload(dev, hw, vif, true);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7921_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+</div><div class='add'>+	err = mt76_connac_mcu_uni_add_bss(phy-&gt;mt76, vif, &amp;mvif-&gt;sta.deflink.wcid,</div><div class='add'>+					  true, mvif-&gt;bss_conf.mt76.ctx);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='add'>+	err = mt7921_mcu_set_bss_pm(dev, vif, true);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt7921_mcu_sta_update(dev, NULL, vif, true,</div><div class='add'>+				    MT76_STA_INFO_STATE_NONE);</div><div class='add'>+out:</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt7921_set_wakeup(struct ieee80211_hw *hw, bool enabled)</div><div class='add'>+static void</div><div class='add'>+mt7921_stop_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+	       struct ieee80211_bss_conf *link_conf)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='del'>-	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='ctx'> </div><div class='del'>-	device_set_wakeup_enable(mdev-&gt;dev, enabled);</div><div class='add'>+	err = mt7921_mcu_set_bss_pm(dev, vif, false);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mt76_connac_mcu_uni_add_bss(phy-&gt;mt76, vif, &amp;mvif-&gt;sta.deflink.wcid, false,</div><div class='add'>+				    mvif-&gt;bss_conf.mt76.ctx);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt7921_set_rekey_data(struct ieee80211_hw *hw,</div><div class='add'>+static int</div><div class='add'>+mt7921_add_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+		   struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+</div><div class='add'>+	dev-&gt;new_ctx = ctx;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7921_remove_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+		      struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;new_ctx == ctx)</div><div class='add'>+		dev-&gt;new_ctx = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7921_change_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+		      struct ieee80211_chanctx_conf *ctx,</div><div class='add'>+		      u32 changed)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_chanctx *mctx = (struct mt792x_chanctx *)ctx-&gt;drv_priv;</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct mt792x_vif *mvif;</div><div class='add'>+</div><div class='add'>+	if (!mctx-&gt;bss_conf)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mvif = container_of(mctx-&gt;bss_conf, struct mt792x_vif, bss_conf);</div><div class='add'>+	vif = container_of((void *)mvif, struct ieee80211_vif, drv_priv);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(phy-&gt;dev);</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_MONITOR)</div><div class='add'>+		mt7921_mcu_config_sniffer(mvif, ctx);</div><div class='add'>+	else</div><div class='add'>+		mt76_connac_mcu_uni_set_chctx(mvif-&gt;phy-&gt;mt76, &amp;mvif-&gt;bss_conf.mt76, ctx);</div><div class='add'>+	mt792x_mutex_release(phy-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7921_mgd_prepare_tx(struct ieee80211_hw *hw,</div><div class='ctx'> 				  struct ieee80211_vif *vif,</div><div class='del'>-				  struct cfg80211_gtk_rekey_data *data)</div><div class='add'>+				  struct ieee80211_prep_tx_info *info)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	u16 duration = info-&gt;duration ? info-&gt;duration :</div><div class='add'>+		       jiffies_to_msecs(HZ);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	mt7921_set_roc(mvif-&gt;phy, mvif, mvif-&gt;bss_conf.mt76.ctx-&gt;def.chan, duration,</div><div class='add'>+		       MT7921_ROC_REQ_JOIN);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	mt7921_mutex_acquire(dev);</div><div class='del'>-	mt76_connac_mcu_update_gtk_rekey(hw, vif, data);</div><div class='del'>-	mt7921_mutex_release(dev);</div><div class='add'>+static void mt7921_mgd_complete_tx(struct ieee80211_hw *hw,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_prep_tx_info *info)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	mt7921_abort_roc(mvif-&gt;phy, mvif);</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='del'>-static void mt7921_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-			 u32 queues, bool drop)</div><div class='add'>+static int mt7921_switch_vif_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+				     struct ieee80211_vif_chanctx_switch *vifs,</div><div class='add'>+				     int n_vifs,</div><div class='add'>+				     enum ieee80211_chanctx_switch_mode mode)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = mt7921_hw_dev(hw);</div><div class='add'>+	return mt792x_assign_vif_chanctx(hw, vifs-&gt;vif, vifs-&gt;link_conf,</div><div class='add'>+					 vifs-&gt;new_ctx);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	wait_event_timeout(dev-&gt;mt76.tx_wait, !mt76_has_tx_pending(&amp;dev-&gt;mphy),</div><div class='del'>-			   HZ / 2);</div><div class='add'>+void mt7921_csa_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif;</div><div class='add'>+	struct mt792x_dev *dev;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mvif = (struct mt792x_vif *)container_of(work, struct mt792x_vif,</div><div class='add'>+						csa_work);</div><div class='add'>+	dev = mvif-&gt;phy-&gt;dev;</div><div class='add'>+	vif = container_of((void *)mvif, struct ieee80211_vif, drv_priv);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	ret = mt76_connac_mcu_uni_set_chctx(mvif-&gt;phy-&gt;mt76, &amp;mvif-&gt;bss_conf.mt76,</div><div class='add'>+					    dev-&gt;new_ctx);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	ieee80211_chswitch_done(vif, !ret, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7921_pre_channel_switch(struct ieee80211_hw *hw,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     struct ieee80211_channel_switch *chsw)</div><div class='add'>+{</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION || !vif-&gt;cfg.assoc)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!cfg80211_chandef_usable(hw-&gt;wiphy, &amp;chsw-&gt;chandef,</div><div class='add'>+				     IEEE80211_CHAN_DISABLED))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7921_channel_switch(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  struct ieee80211_channel_switch *chsw)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	u16 beacon_interval = vif-&gt;bss_conf.beacon_int;</div><div class='add'>+</div><div class='add'>+	mvif-&gt;csa_timer.expires = TU_TO_EXP_TIME(beacon_interval * chsw-&gt;count);</div><div class='add'>+	add_timer(&amp;mvif-&gt;csa_timer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7921_abort_channel_switch(struct ieee80211_hw *hw,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	timer_delete_sync(&amp;mvif-&gt;csa_timer);</div><div class='add'>+	cancel_work_sync(&amp;mvif-&gt;csa_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7921_channel_switch_rx_beacon(struct ieee80211_hw *hw,</div><div class='add'>+					    struct ieee80211_vif *vif,</div><div class='add'>+					    struct ieee80211_channel_switch *chsw)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	u16 beacon_interval = vif-&gt;bss_conf.beacon_int;</div><div class='add'>+</div><div class='add'>+	if (cfg80211_chandef_identical(&amp;chsw-&gt;chandef,</div><div class='add'>+				       &amp;dev-&gt;new_ctx-&gt;def) &amp;&amp;</div><div class='add'>+				       chsw-&gt;count) {</div><div class='add'>+		mod_timer(&amp;mvif-&gt;csa_timer,</div><div class='add'>+			  TU_TO_EXP_TIME(beacon_interval * chsw-&gt;count));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7921_rfkill_poll(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(phy-&gt;dev);</div><div class='add'>+	ret = mt7921_mcu_wf_rf_pin_ctrl(phy, WF_RF_PIN_POLL);</div><div class='add'>+	mt792x_mutex_release(phy-&gt;dev);</div><div class='add'>+</div><div class='add'>+	wiphy_rfkill_set_hw_state(hw-&gt;wiphy, ret ? false : true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct ieee80211_ops mt7921_ops = {</div><div class='del'>-	.tx = mt7921_tx,</div><div class='add'>+	.tx = mt792x_tx,</div><div class='ctx'> 	.start = mt7921_start,</div><div class='ctx'> 	.stop = mt7921_stop,</div><div class='ctx'> 	.add_interface = mt7921_add_interface,</div><div class='del'>-	.remove_interface = mt7921_remove_interface,</div><div class='add'>+	.remove_interface = mt792x_remove_interface,</div><div class='ctx'> 	.config = mt7921_config,</div><div class='del'>-	.conf_tx = mt7921_conf_tx,</div><div class='add'>+	.conf_tx = mt792x_conf_tx,</div><div class='ctx'> 	.configure_filter = mt7921_configure_filter,</div><div class='ctx'> 	.bss_info_changed = mt7921_bss_info_changed,</div><div class='del'>-	.sta_add = mt7921_sta_add,</div><div class='del'>-	.sta_remove = mt7921_sta_remove,</div><div class='add'>+	.start_ap = mt7921_start_ap,</div><div class='add'>+	.stop_ap = mt7921_stop_ap,</div><div class='add'>+	.sta_state = mt7921_sta_state,</div><div class='ctx'> 	.sta_pre_rcu_remove = mt76_sta_pre_rcu_remove,</div><div class='ctx'> 	.set_key = mt7921_set_key,</div><div class='add'>+	.sta_set_decap_offload = mt7921_sta_set_decap_offload,</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	.ipv6_addr_change = mt7921_ipv6_addr_change,</div><div class='add'>+#endif /* CONFIG_IPV6 */</div><div class='ctx'> 	.ampdu_action = mt7921_ampdu_action,</div><div class='ctx'> 	.set_rts_threshold = mt7921_set_rts_threshold,</div><div class='ctx'> 	.wake_tx_queue = mt76_wake_tx_queue,</div><div class='ctx'> 	.release_buffered_frames = mt76_release_buffered_frames,</div><div class='add'>+	.channel_switch_beacon = mt7921_channel_switch_beacon,</div><div class='ctx'> 	.get_txpower = mt76_get_txpower,</div><div class='del'>-	.get_stats = mt7921_get_stats,</div><div class='del'>-	.get_tsf = mt7921_get_tsf,</div><div class='del'>-	.set_tsf = mt7921_set_tsf,</div><div class='add'>+	.get_stats = mt792x_get_stats,</div><div class='add'>+	.get_et_sset_count = mt792x_get_et_sset_count,</div><div class='add'>+	.get_et_strings = mt792x_get_et_strings,</div><div class='add'>+	.get_et_stats = mt792x_get_et_stats,</div><div class='add'>+	.get_tsf = mt792x_get_tsf,</div><div class='add'>+	.set_tsf = mt792x_set_tsf,</div><div class='ctx'> 	.get_survey = mt76_get_survey,</div><div class='ctx'> 	.get_antenna = mt76_get_antenna,</div><div class='ctx'> 	.set_antenna = mt7921_set_antenna,</div><div class='del'>-	.set_coverage_class = mt7921_set_coverage_class,</div><div class='add'>+	.set_coverage_class = mt792x_set_coverage_class,</div><div class='ctx'> 	.hw_scan = mt7921_hw_scan,</div><div class='ctx'> 	.cancel_hw_scan = mt7921_cancel_hw_scan,</div><div class='del'>-	.sta_statistics = mt7921_sta_statistics,</div><div class='add'>+	.sta_statistics = mt792x_sta_statistics,</div><div class='ctx'> 	.sched_scan_start = mt7921_start_sched_scan,</div><div class='ctx'> 	.sched_scan_stop = mt7921_stop_sched_scan,</div><div class='add'>+	CFG80211_TESTMODE_CMD(mt7921_testmode_cmd)</div><div class='add'>+	CFG80211_TESTMODE_DUMP(mt7921_testmode_dump)</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend = mt7921_suspend,</div><div class='ctx'> 	.resume = mt7921_resume,</div><div class='del'>-	.set_wakeup = mt7921_set_wakeup,</div><div class='add'>+	.set_wakeup = mt792x_set_wakeup,</div><div class='ctx'> 	.set_rekey_data = mt7921_set_rekey_data,</div><div class='ctx'> #endif /* CONFIG_PM */</div><div class='del'>-	.flush = mt7921_flush,</div><div class='add'>+	.flush = mt792x_flush,</div><div class='add'>+	.set_sar_specs = mt7921_set_sar_specs,</div><div class='add'>+	.rfkill_poll = mt7921_rfkill_poll,</div><div class='add'>+	.remain_on_channel = mt7921_remain_on_channel,</div><div class='add'>+	.cancel_remain_on_channel = mt7921_cancel_remain_on_channel,</div><div class='add'>+	.add_chanctx = mt7921_add_chanctx,</div><div class='add'>+	.remove_chanctx = mt7921_remove_chanctx,</div><div class='add'>+	.change_chanctx = mt7921_change_chanctx,</div><div class='add'>+	.assign_vif_chanctx = mt792x_assign_vif_chanctx,</div><div class='add'>+	.unassign_vif_chanctx = mt792x_unassign_vif_chanctx,</div><div class='add'>+	.mgd_prepare_tx = mt7921_mgd_prepare_tx,</div><div class='add'>+	.mgd_complete_tx = mt7921_mgd_complete_tx,</div><div class='add'>+	.switch_vif_chanctx = mt7921_switch_vif_chanctx,</div><div class='add'>+	.pre_channel_switch = mt7921_pre_channel_switch,</div><div class='add'>+	.channel_switch = mt7921_channel_switch,</div><div class='add'>+	.abort_channel_switch = mt7921_abort_channel_switch,</div><div class='add'>+	.channel_switch_rx_beacon = mt7921_channel_switch_rx_beacon,</div><div class='ctx'> };</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7921_ops);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("MediaTek MT7921 core driver");</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='add'>+MODULE_AUTHOR("Sean Wang &lt;sean.wang@mediatek.com&gt;");</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c<br/>index 5f3d56d570a5..833d0ab64230 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/mcu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7921/mcu.c</a></div><div class='hunk'>@@ -1,486 +1,214 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include "mt7921.h"</div><div class='del'>-#include "mt7921_trace.h"</div><div class='ctx'> #include "mcu.h"</div><div class='del'>-#include "mac.h"</div><div class='del'>-</div><div class='del'>-struct mt7921_patch_hdr {</div><div class='del'>-	char build_date[16];</div><div class='del'>-	char platform[4];</div><div class='del'>-	__be32 hw_sw_ver;</div><div class='del'>-	__be32 patch_ver;</div><div class='del'>-	__be16 checksum;</div><div class='del'>-	u16 reserved;</div><div class='del'>-	struct {</div><div class='del'>-		__be32 patch_ver;</div><div class='del'>-		__be32 subsys;</div><div class='del'>-		__be32 feature;</div><div class='del'>-		__be32 n_region;</div><div class='del'>-		__be32 crc;</div><div class='del'>-		u32 reserved[11];</div><div class='del'>-	} desc;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct mt7921_patch_sec {</div><div class='del'>-	__be32 type;</div><div class='del'>-	__be32 offs;</div><div class='del'>-	__be32 size;</div><div class='del'>-	union {</div><div class='del'>-		__be32 spec[13];</div><div class='del'>-		struct {</div><div class='del'>-			__be32 addr;</div><div class='del'>-			__be32 len;</div><div class='del'>-			__be32 sec_key_idx;</div><div class='del'>-			__be32 align_len;</div><div class='del'>-			u32 reserved[9];</div><div class='del'>-		} info;</div><div class='del'>-	};</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct mt7921_fw_trailer {</div><div class='del'>-	u8 chip_id;</div><div class='del'>-	u8 eco_code;</div><div class='del'>-	u8 n_region;</div><div class='del'>-	u8 format_ver;</div><div class='del'>-	u8 format_flag;</div><div class='del'>-	u8 reserved[2];</div><div class='del'>-	char fw_ver[10];</div><div class='del'>-	char build_date[15];</div><div class='del'>-	u32 crc;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct mt7921_fw_region {</div><div class='del'>-	__le32 decomp_crc;</div><div class='del'>-	__le32 decomp_len;</div><div class='del'>-	__le32 decomp_blk_sz;</div><div class='del'>-	u8 reserved[4];</div><div class='del'>-	__le32 addr;</div><div class='del'>-	__le32 len;</div><div class='del'>-	u8 feature_set;</div><div class='del'>-	u8 reserved1[15];</div><div class='del'>-} __packed;</div><div class='add'>+#include "../mt76_connac2_mac.h"</div><div class='add'>+#include "../mt792x_trace.h"</div><div class='ctx'> </div><div class='ctx'> #define MT_STA_BFER			BIT(0)</div><div class='ctx'> #define MT_STA_BFEE			BIT(1)</div><div class='ctx'> </div><div class='del'>-#define FW_FEATURE_SET_ENCRYPT		BIT(0)</div><div class='del'>-#define FW_FEATURE_SET_KEY_IDX		GENMASK(2, 1)</div><div class='del'>-#define FW_FEATURE_ENCRY_MODE		BIT(4)</div><div class='del'>-#define FW_FEATURE_OVERRIDE_ADDR	BIT(5)</div><div class='del'>-</div><div class='del'>-#define DL_MODE_ENCRYPT			BIT(0)</div><div class='del'>-#define DL_MODE_KEY_IDX			GENMASK(2, 1)</div><div class='del'>-#define DL_MODE_RESET_SEC_IV		BIT(3)</div><div class='del'>-#define DL_MODE_WORKING_PDA_CR4		BIT(4)</div><div class='del'>-#define DL_CONFIG_ENCRY_MODE_SEL	BIT(6)</div><div class='del'>-#define DL_MODE_NEED_RSP		BIT(31)</div><div class='del'>-</div><div class='del'>-#define FW_START_OVERRIDE		BIT(0)</div><div class='del'>-#define FW_START_WORKING_PDA_CR4	BIT(2)</div><div class='del'>-</div><div class='del'>-#define PATCH_SEC_TYPE_MASK		GENMASK(15, 0)</div><div class='del'>-#define PATCH_SEC_TYPE_INFO		0x2</div><div class='del'>-</div><div class='del'>-#define to_wcid_lo(id)			FIELD_GET(GENMASK(7, 0), (u16)id)</div><div class='del'>-#define to_wcid_hi(id)			FIELD_GET(GENMASK(9, 8), (u16)id)</div><div class='add'>+static bool mt7921_disable_clc;</div><div class='add'>+module_param_named(disable_clc, mt7921_disable_clc, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(disable_clc, "disable CLC support");</div><div class='ctx'> </div><div class='del'>-static enum mt7921_cipher_type</div><div class='del'>-mt7921_mcu_get_cipher(int cipher)</div><div class='add'>+int mt7921_mcu_parse_response(struct mt76_dev *mdev, int cmd,</div><div class='add'>+			      struct sk_buff *skb, int seq)</div><div class='ctx'> {</div><div class='del'>-	switch (cipher) {</div><div class='del'>-	case WLAN_CIPHER_SUITE_WEP40:</div><div class='del'>-		return MT_CIPHER_WEP40;</div><div class='del'>-	case WLAN_CIPHER_SUITE_WEP104:</div><div class='del'>-		return MT_CIPHER_WEP104;</div><div class='del'>-	case WLAN_CIPHER_SUITE_TKIP:</div><div class='del'>-		return MT_CIPHER_TKIP;</div><div class='del'>-	case WLAN_CIPHER_SUITE_AES_CMAC:</div><div class='del'>-		return MT_CIPHER_BIP_CMAC_128;</div><div class='del'>-	case WLAN_CIPHER_SUITE_CCMP:</div><div class='del'>-		return MT_CIPHER_AES_CCMP;</div><div class='del'>-	case WLAN_CIPHER_SUITE_CCMP_256:</div><div class='del'>-		return MT_CIPHER_CCMP_256;</div><div class='del'>-	case WLAN_CIPHER_SUITE_GCMP:</div><div class='del'>-		return MT_CIPHER_GCMP;</div><div class='del'>-	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='del'>-		return MT_CIPHER_GCMP_256;</div><div class='del'>-	case WLAN_CIPHER_SUITE_SMS4:</div><div class='del'>-		return MT_CIPHER_WAPI;</div><div class='del'>-	default:</div><div class='del'>-		return MT_CIPHER_NONE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 mt7921_mcu_chan_bw(struct cfg80211_chan_def *chandef)</div><div class='del'>-{</div><div class='del'>-	static const u8 width_to_bw[] = {</div><div class='del'>-		[NL80211_CHAN_WIDTH_40] = CMD_CBW_40MHZ,</div><div class='del'>-		[NL80211_CHAN_WIDTH_80] = CMD_CBW_80MHZ,</div><div class='del'>-		[NL80211_CHAN_WIDTH_80P80] = CMD_CBW_8080MHZ,</div><div class='del'>-		[NL80211_CHAN_WIDTH_160] = CMD_CBW_160MHZ,</div><div class='del'>-		[NL80211_CHAN_WIDTH_5] = CMD_CBW_5MHZ,</div><div class='del'>-		[NL80211_CHAN_WIDTH_10] = CMD_CBW_10MHZ,</div><div class='del'>-		[NL80211_CHAN_WIDTH_20] = CMD_CBW_20MHZ,</div><div class='del'>-		[NL80211_CHAN_WIDTH_20_NOHT] = CMD_CBW_20MHZ,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (chandef-&gt;width &gt;= ARRAY_SIZE(width_to_bw))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return width_to_bw[chandef-&gt;width];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mt7921_mcu_parse_eeprom(struct mt76_dev *dev, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_mcu_eeprom_info *res;</div><div class='del'>-	u8 *buf;</div><div class='del'>-</div><div class='del'>-	if (!skb)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	skb_pull(skb, sizeof(struct mt7921_mcu_rxd));</div><div class='del'>-</div><div class='del'>-	res = (struct mt7921_mcu_eeprom_info *)skb-&gt;data;</div><div class='del'>-	buf = dev-&gt;eeprom.data + le32_to_cpu(res-&gt;addr);</div><div class='del'>-	memcpy(buf, res-&gt;data, 16);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mt7921_mcu_parse_response(struct mt76_dev *mdev, int cmd,</div><div class='del'>-			  struct sk_buff *skb, int seq)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_mcu_rxd *rxd;</div><div class='add'>+	int mcu_cmd = FIELD_GET(__MCU_CMD_FIELD_ID, cmd);</div><div class='add'>+	struct mt76_connac2_mcu_rxd *rxd;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!skb) {</div><div class='ctx'> 		dev_err(mdev-&gt;dev, "Message %08x (seq %d) timeout\n",</div><div class='ctx'> 			cmd, seq);</div><div class='del'>-		mt7921_reset(mdev);</div><div class='add'>+		mt792x_reset(mdev);</div><div class='ctx'> </div><div class='ctx'> 		return -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rxd = (struct mt7921_mcu_rxd *)skb-&gt;data;</div><div class='add'>+	rxd = (struct mt76_connac2_mcu_rxd *)skb-&gt;data;</div><div class='ctx'> 	if (seq != rxd-&gt;seq)</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case MCU_CMD_PATCH_SEM_CONTROL:</div><div class='add'>+	if (cmd == MCU_CMD(PATCH_SEM_CONTROL) ||</div><div class='add'>+	    cmd == MCU_CMD(PATCH_FINISH_REQ)) {</div><div class='ctx'> 		skb_pull(skb, sizeof(*rxd) - 4);</div><div class='ctx'> 		ret = *skb-&gt;data;</div><div class='del'>-		break;</div><div class='del'>-	case MCU_EXT_CMD_GET_TEMP:</div><div class='add'>+	} else if (cmd == MCU_EXT_CMD(THERMAL_CTRL)) {</div><div class='ctx'> 		skb_pull(skb, sizeof(*rxd) + 4);</div><div class='ctx'> 		ret = le32_to_cpu(*(__le32 *)skb-&gt;data);</div><div class='del'>-		break;</div><div class='del'>-	case MCU_EXT_CMD_EFUSE_ACCESS:</div><div class='del'>-		ret = mt7921_mcu_parse_eeprom(mdev, skb);</div><div class='del'>-		break;</div><div class='del'>-	case MCU_UNI_CMD_DEV_INFO_UPDATE:</div><div class='del'>-	case MCU_UNI_CMD_BSS_INFO_UPDATE:</div><div class='del'>-	case MCU_UNI_CMD_STA_REC_UPDATE:</div><div class='del'>-	case MCU_UNI_CMD_HIF_CTRL:</div><div class='del'>-	case MCU_UNI_CMD_OFFLOAD:</div><div class='del'>-	case MCU_UNI_CMD_SUSPEND: {</div><div class='del'>-		struct mt7921_mcu_uni_event *event;</div><div class='add'>+	} else if (cmd == MCU_UNI_CMD(DEV_INFO_UPDATE) ||</div><div class='add'>+		   cmd == MCU_UNI_CMD(BSS_INFO_UPDATE) ||</div><div class='add'>+		   cmd == MCU_UNI_CMD(STA_REC_UPDATE) ||</div><div class='add'>+		   cmd == MCU_UNI_CMD(HIF_CTRL) ||</div><div class='add'>+		   cmd == MCU_UNI_CMD(OFFLOAD) ||</div><div class='add'>+		   cmd == MCU_UNI_CMD(SUSPEND)) {</div><div class='add'>+		struct mt76_connac_mcu_uni_event *event;</div><div class='ctx'> </div><div class='ctx'> 		skb_pull(skb, sizeof(*rxd));</div><div class='del'>-		event = (struct mt7921_mcu_uni_event *)skb-&gt;data;</div><div class='add'>+		event = (struct mt76_connac_mcu_uni_event *)skb-&gt;data;</div><div class='ctx'> 		ret = le32_to_cpu(event-&gt;status);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case MCU_CMD_REG_READ: {</div><div class='del'>-		struct mt7921_mcu_reg_event *event;</div><div class='add'>+		/* skip invalid event */</div><div class='add'>+		if (mcu_cmd != event-&gt;cid)</div><div class='add'>+			ret = -EAGAIN;</div><div class='add'>+	} else if (cmd == MCU_CE_QUERY(REG_READ)) {</div><div class='add'>+		struct mt76_connac_mcu_reg_event *event;</div><div class='ctx'> </div><div class='ctx'> 		skb_pull(skb, sizeof(*rxd));</div><div class='del'>-		event = (struct mt7921_mcu_reg_event *)skb-&gt;data;</div><div class='add'>+		event = (struct mt76_connac_mcu_reg_event *)skb-&gt;data;</div><div class='ctx'> 		ret = (int)le32_to_cpu(event-&gt;val);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	default:</div><div class='del'>-		skb_pull(skb, sizeof(struct mt7921_mcu_rxd));</div><div class='del'>-		break;</div><div class='add'>+	} else if (cmd == MCU_EXT_CMD(WF_RF_PIN_CTRL)) {</div><div class='add'>+		struct mt7921_wf_rf_pin_ctrl_event *event;</div><div class='add'>+</div><div class='add'>+		skb_pull(skb, sizeof(*rxd));</div><div class='add'>+		event = (struct mt7921_wf_rf_pin_ctrl_event *)skb-&gt;data;</div><div class='add'>+		ret = (int)event-&gt;result;</div><div class='add'>+	} else {</div><div class='add'>+		skb_pull(skb, sizeof(struct mt76_connac2_mcu_rxd));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7921_mcu_parse_response);</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt7921_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,</div><div class='del'>-			int cmd, int *wait_seq)</div><div class='add'>+static int mt7921_mcu_read_eeprom(struct mt792x_dev *dev, u32 offset, u8 *val)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);</div><div class='del'>-	int txd_len, mcu_cmd = cmd &amp; MCU_CMD_MASK;</div><div class='del'>-	enum mt76_mcuq_id txq = MT_MCUQ_WM;</div><div class='del'>-	struct mt7921_uni_txd *uni_txd;</div><div class='del'>-	struct mt7921_mcu_txd *mcu_txd;</div><div class='del'>-	__le32 *txd;</div><div class='del'>-	u32 val;</div><div class='del'>-	u8 seq;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case MCU_UNI_CMD_HIF_CTRL:</div><div class='del'>-	case MCU_UNI_CMD_SUSPEND:</div><div class='del'>-	case MCU_UNI_CMD_OFFLOAD:</div><div class='del'>-		mdev-&gt;mcu.timeout = HZ / 3;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		mdev-&gt;mcu.timeout = 3 * HZ;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	seq = ++dev-&gt;mt76.mcu.msg_seq &amp; 0xf;</div><div class='del'>-	if (!seq)</div><div class='del'>-		seq = ++dev-&gt;mt76.mcu.msg_seq &amp; 0xf;</div><div class='del'>-</div><div class='del'>-	if (cmd == MCU_CMD_FW_SCATTER) {</div><div class='del'>-		txq = MT_MCUQ_FWDL;</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	txd_len = cmd &amp; MCU_UNI_PREFIX ? sizeof(*uni_txd) : sizeof(*mcu_txd);</div><div class='del'>-	txd = (__le32 *)skb_push(skb, txd_len);</div><div class='del'>-</div><div class='del'>-	val = FIELD_PREP(MT_TXD0_TX_BYTES, skb-&gt;len) |</div><div class='del'>-	      FIELD_PREP(MT_TXD0_PKT_FMT, MT_TX_TYPE_CMD) |</div><div class='del'>-	      FIELD_PREP(MT_TXD0_Q_IDX, MT_TX_MCU_PORT_RX_Q0);</div><div class='del'>-	txd[0] = cpu_to_le32(val);</div><div class='del'>-</div><div class='del'>-	val = MT_TXD1_LONG_FORMAT |</div><div class='del'>-	      FIELD_PREP(MT_TXD1_HDR_FORMAT, MT_HDR_FORMAT_CMD);</div><div class='del'>-	txd[1] = cpu_to_le32(val);</div><div class='add'>+	struct mt7921_mcu_eeprom_info *res, req = {</div><div class='add'>+		.addr = cpu_to_le32(round_down(offset,</div><div class='add'>+				    MT7921_EEPROM_BLOCK_SIZE)),</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (cmd &amp; MCU_UNI_PREFIX) {</div><div class='del'>-		uni_txd = (struct mt7921_uni_txd *)txd;</div><div class='del'>-		uni_txd-&gt;len = cpu_to_le16(skb-&gt;len - sizeof(uni_txd-&gt;txd));</div><div class='del'>-		uni_txd-&gt;option = MCU_CMD_UNI_EXT_ACK;</div><div class='del'>-		uni_txd-&gt;cid = cpu_to_le16(mcu_cmd);</div><div class='del'>-		uni_txd-&gt;s2d_index = MCU_S2D_H2N;</div><div class='del'>-		uni_txd-&gt;pkt_type = MCU_PKT_ID;</div><div class='del'>-		uni_txd-&gt;seq = seq;</div><div class='add'>+	ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76, MCU_EXT_QUERY(EFUSE_ACCESS),</div><div class='add'>+					&amp;req, sizeof(req), true, &amp;skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='add'>+	res = (struct mt7921_mcu_eeprom_info *)skb-&gt;data;</div><div class='add'>+	*val = res-&gt;data[offset % MT7921_EEPROM_BLOCK_SIZE];</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='del'>-	mcu_txd = (struct mt7921_mcu_txd *)txd;</div><div class='del'>-	mcu_txd-&gt;len = cpu_to_le16(skb-&gt;len - sizeof(mcu_txd-&gt;txd));</div><div class='del'>-	mcu_txd-&gt;pq_id = cpu_to_le16(MCU_PQ_ID(MT_TX_PORT_IDX_MCU,</div><div class='del'>-					       MT_TX_MCU_PORT_RX_Q0));</div><div class='del'>-	mcu_txd-&gt;pkt_type = MCU_PKT_ID;</div><div class='del'>-	mcu_txd-&gt;seq = seq;</div><div class='del'>-</div><div class='del'>-	switch (cmd &amp; ~MCU_CMD_MASK) {</div><div class='del'>-	case MCU_FW_PREFIX:</div><div class='del'>-		mcu_txd-&gt;set_query = MCU_Q_NA;</div><div class='del'>-		mcu_txd-&gt;cid = mcu_cmd;</div><div class='del'>-		break;</div><div class='del'>-	case MCU_CE_PREFIX:</div><div class='del'>-		if (cmd &amp; MCU_QUERY_MASK)</div><div class='del'>-			mcu_txd-&gt;set_query = MCU_Q_QUERY;</div><div class='del'>-		else</div><div class='del'>-			mcu_txd-&gt;set_query = MCU_Q_SET;</div><div class='del'>-		mcu_txd-&gt;cid = mcu_cmd;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		mcu_txd-&gt;cid = MCU_CMD_EXT_CID;</div><div class='del'>-		if (cmd &amp; MCU_QUERY_PREFIX || cmd == MCU_EXT_CMD_EFUSE_ACCESS)</div><div class='del'>-			mcu_txd-&gt;set_query = MCU_Q_QUERY;</div><div class='del'>-		else</div><div class='del'>-			mcu_txd-&gt;set_query = MCU_Q_SET;</div><div class='del'>-		mcu_txd-&gt;ext_cid = mcu_cmd;</div><div class='del'>-		mcu_txd-&gt;ext_cid_ack = 1;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	mcu_txd-&gt;s2d_index = MCU_S2D_H2N;</div><div class='del'>-	WARN_ON(cmd == MCU_EXT_CMD_EFUSE_ACCESS &amp;&amp;</div><div class='del'>-		mcu_txd-&gt;set_query != MCU_Q_QUERY);</div><div class='add'>+#ifdef CONFIG_PM</div><div class='ctx'> </div><div class='del'>-exit:</div><div class='del'>-	if (wait_seq)</div><div class='del'>-		*wait_seq = seq;</div><div class='add'>+static int</div><div class='add'>+mt7921_mcu_set_ipv6_ns_filter(struct mt76_dev *dev,</div><div class='add'>+			      struct ieee80211_vif *vif, bool suspend)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 bss_idx;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct mt76_connac_arpns_tlv arpns;</div><div class='add'>+	} req = {</div><div class='add'>+		.hdr = {</div><div class='add'>+			.bss_idx = mvif-&gt;bss_conf.mt76.idx,</div><div class='add'>+		},</div><div class='add'>+		.arpns = {</div><div class='add'>+			.tag = cpu_to_le16(UNI_OFFLOAD_OFFLOAD_ND),</div><div class='add'>+			.len = cpu_to_le16(sizeof(struct mt76_connac_arpns_tlv)),</div><div class='add'>+			.mode = suspend,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-	return mt76_tx_queue_skb_raw(dev, mdev-&gt;q_mcu[txq], skb, 0);</div><div class='add'>+	return mt76_mcu_send_msg(dev, MCU_UNI_CMD_OFFLOAD, &amp;req, sizeof(req),</div><div class='add'>+				 true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7921_mcu_tx_rate_parse(struct mt76_phy *mphy,</div><div class='del'>-			 struct mt7921_mcu_peer_cap *peer,</div><div class='del'>-			 struct rate_info *rate, u16 r)</div><div class='add'>+void mt7921_mcu_set_suspend_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_supported_band *sband;</div><div class='del'>-	u16 flags = 0;</div><div class='del'>-	u8 txmode = FIELD_GET(MT_WTBL_RATE_TX_MODE, r);</div><div class='del'>-	u8 gi = 0;</div><div class='del'>-	u8 bw = 0;</div><div class='del'>-</div><div class='del'>-	rate-&gt;mcs = FIELD_GET(MT_WTBL_RATE_MCS, r);</div><div class='del'>-	rate-&gt;nss = FIELD_GET(MT_WTBL_RATE_NSS, r) + 1;</div><div class='del'>-</div><div class='del'>-	switch (peer-&gt;bw) {</div><div class='del'>-	case IEEE80211_STA_RX_BW_160:</div><div class='del'>-		gi = peer-&gt;g16;</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_STA_RX_BW_80:</div><div class='del'>-		gi = peer-&gt;g8;</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_STA_RX_BW_40:</div><div class='del'>-		gi = peer-&gt;g4;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		gi = peer-&gt;g2;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	if (IS_ENABLED(CONFIG_IPV6)) {</div><div class='add'>+		struct mt76_phy *phy = priv;</div><div class='ctx'> </div><div class='del'>-	gi = txmode &gt;= MT_PHY_TYPE_HE_SU ?</div><div class='del'>-		FIELD_GET(MT_WTBL_RATE_HE_GI, gi) :</div><div class='del'>-		FIELD_GET(MT_WTBL_RATE_GI, gi);</div><div class='del'>-</div><div class='del'>-	switch (txmode) {</div><div class='del'>-	case MT_PHY_TYPE_CCK:</div><div class='del'>-	case MT_PHY_TYPE_OFDM:</div><div class='del'>-		if (mphy-&gt;chandef.chan-&gt;band == NL80211_BAND_5GHZ)</div><div class='del'>-			sband = &amp;mphy-&gt;sband_5g.sband;</div><div class='del'>-		else</div><div class='del'>-			sband = &amp;mphy-&gt;sband_2g.sband;</div><div class='del'>-</div><div class='del'>-		rate-&gt;legacy = sband-&gt;bitrates[rate-&gt;mcs].bitrate;</div><div class='del'>-		break;</div><div class='del'>-	case MT_PHY_TYPE_HT:</div><div class='del'>-	case MT_PHY_TYPE_HT_GF:</div><div class='del'>-		flags |= RATE_INFO_FLAGS_MCS;</div><div class='del'>-</div><div class='del'>-		if (gi)</div><div class='del'>-			flags |= RATE_INFO_FLAGS_SHORT_GI;</div><div class='del'>-		break;</div><div class='del'>-	case MT_PHY_TYPE_VHT:</div><div class='del'>-		flags |= RATE_INFO_FLAGS_VHT_MCS;</div><div class='del'>-</div><div class='del'>-		if (gi)</div><div class='del'>-			flags |= RATE_INFO_FLAGS_SHORT_GI;</div><div class='del'>-		break;</div><div class='del'>-	case MT_PHY_TYPE_HE_SU:</div><div class='del'>-	case MT_PHY_TYPE_HE_EXT_SU:</div><div class='del'>-	case MT_PHY_TYPE_HE_TB:</div><div class='del'>-	case MT_PHY_TYPE_HE_MU:</div><div class='del'>-		rate-&gt;he_gi = gi;</div><div class='del'>-		rate-&gt;he_dcm = FIELD_GET(MT_RA_RATE_DCM_EN, r);</div><div class='del'>-</div><div class='del'>-		flags |= RATE_INFO_FLAGS_HE_MCS;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='add'>+		mt7921_mcu_set_ipv6_ns_filter(phy-&gt;dev, vif,</div><div class='add'>+					      !test_bit(MT76_STATE_RUNNING,</div><div class='add'>+					      &amp;phy-&gt;state));</div><div class='ctx'> 	}</div><div class='del'>-	rate-&gt;flags = flags;</div><div class='del'>-</div><div class='del'>-	bw = mt7921_mcu_chan_bw(&amp;mphy-&gt;chandef) - FIELD_GET(MT_RA_RATE_BW, r);</div><div class='ctx'> </div><div class='del'>-	switch (bw) {</div><div class='del'>-	case IEEE80211_STA_RX_BW_160:</div><div class='del'>-		rate-&gt;bw = RATE_INFO_BW_160;</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_STA_RX_BW_80:</div><div class='del'>-		rate-&gt;bw = RATE_INFO_BW_80;</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_STA_RX_BW_40:</div><div class='del'>-		rate-&gt;bw = RATE_INFO_BW_40;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		rate-&gt;bw = RATE_INFO_BW_20;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	mt76_connac_mcu_set_suspend_iter(priv, mac, vif);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+</div><div class='ctx'> static void</div><div class='del'>-mt7921_mcu_tx_rate_report(struct mt7921_dev *dev, struct sk_buff *skb,</div><div class='del'>-			  u16 wlan_idx)</div><div class='add'>+mt7921_mcu_uni_roc_event(struct mt792x_dev *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_mcu_wlan_info_event *wtbl_info =</div><div class='del'>-		(struct mt7921_mcu_wlan_info_event *)(skb-&gt;data);</div><div class='del'>-	struct rate_info rate = {};</div><div class='del'>-	u8 curr_idx = wtbl_info-&gt;rate_info.rate_idx;</div><div class='del'>-	u16 curr = le16_to_cpu(wtbl_info-&gt;rate_info.rate[curr_idx]);</div><div class='del'>-	struct mt7921_mcu_peer_cap peer = wtbl_info-&gt;peer_cap;</div><div class='del'>-	struct mt76_phy *mphy = &amp;dev-&gt;mphy;</div><div class='del'>-	struct mt7921_sta_stats *stats;</div><div class='del'>-	struct mt7921_sta *msta;</div><div class='del'>-	struct mt76_wcid *wcid;</div><div class='del'>-</div><div class='del'>-	if (wlan_idx &gt;= MT76_N_WCIDS)</div><div class='del'>-		return;</div><div class='add'>+	struct mt7921_roc_grant_tlv *grant;</div><div class='add'>+	struct mt76_connac2_mcu_rxd *rxd;</div><div class='add'>+	int duration;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='add'>+	rxd = (struct mt76_connac2_mcu_rxd *)skb-&gt;data;</div><div class='add'>+	grant = (struct mt7921_roc_grant_tlv *)(rxd-&gt;tlv + 4);</div><div class='ctx'> </div><div class='del'>-	wcid = rcu_dereference(dev-&gt;mt76.wcid[wlan_idx]);</div><div class='del'>-	if (!wcid)</div><div class='del'>-		goto out;</div><div class='add'>+	/* should never happen */</div><div class='add'>+	WARN_ON_ONCE((le16_to_cpu(grant-&gt;tag) != UNI_EVENT_ROC_GRANT));</div><div class='ctx'> </div><div class='del'>-	msta = container_of(wcid, struct mt7921_sta, wcid);</div><div class='del'>-	stats = &amp;msta-&gt;stats;</div><div class='add'>+	if (grant-&gt;reqtype == MT7921_ROC_REQ_ROC)</div><div class='add'>+		ieee80211_ready_on_channel(dev-&gt;mt76.phy.hw);</div><div class='ctx'> </div><div class='del'>-	/* current rate */</div><div class='del'>-	mt7921_mcu_tx_rate_parse(mphy, &amp;peer, &amp;rate, curr);</div><div class='del'>-	stats-&gt;tx_rate = rate;</div><div class='del'>-out:</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	dev-&gt;phy.roc_grant = true;</div><div class='add'>+	wake_up(&amp;dev-&gt;phy.roc_wait);</div><div class='add'>+	duration = le32_to_cpu(grant-&gt;max_interval);</div><div class='add'>+	mod_timer(&amp;dev-&gt;phy.roc_timer,</div><div class='add'>+		  jiffies + msecs_to_jiffies(duration));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7921_mcu_scan_event(struct mt7921_dev *dev, struct sk_buff *skb)</div><div class='add'>+mt7921_mcu_scan_event(struct mt792x_dev *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_phy *mphy = &amp;dev-&gt;mt76.phy;</div><div class='del'>-	struct mt7921_phy *phy = (struct mt7921_phy *)mphy-&gt;priv;</div><div class='add'>+	struct mt792x_phy *phy = mphy-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;dev-&gt;mt76.lock);</div><div class='ctx'> 	__skb_queue_tail(&amp;phy-&gt;scan_event_list, skb);</div><div class='ctx'> 	spin_unlock_bh(&amp;dev-&gt;mt76.lock);</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_queue_delayed_work(mphy-&gt;hw, &amp;phy-&gt;scan_work,</div><div class='del'>-				     MT7921_HW_SCAN_TIMEOUT);</div><div class='add'>+				     MT792x_HW_SCAN_TIMEOUT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7921_mcu_beacon_loss_event(struct mt7921_dev *dev, struct sk_buff *skb)</div><div class='add'>+mt7921_mcu_connection_loss_iter(void *priv, u8 *mac,</div><div class='add'>+				struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_connac_beacon_loss_event *event;</div><div class='del'>-	struct mt76_phy *mphy;</div><div class='del'>-	u8 band_idx = 0; /* DBDC support */</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_connac_beacon_loss_event *event = priv;</div><div class='ctx'> </div><div class='del'>-	skb_pull(skb, sizeof(struct mt7921_mcu_rxd));</div><div class='del'>-	event = (struct mt76_connac_beacon_loss_event *)skb-&gt;data;</div><div class='del'>-	if (band_idx &amp;&amp; dev-&gt;mt76.phy2)</div><div class='del'>-		mphy = dev-&gt;mt76.phy2;</div><div class='del'>-	else</div><div class='del'>-		mphy = &amp;dev-&gt;mt76.phy;</div><div class='add'>+	if (mvif-&gt;idx != event-&gt;bss_idx)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	ieee80211_iterate_active_interfaces_atomic(mphy-&gt;hw,</div><div class='del'>-					IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='del'>-					mt76_connac_mcu_beacon_loss_iter, event);</div><div class='add'>+	if (!(vif-&gt;driver_flags &amp; IEEE80211_VIF_BEACON_FILTER) ||</div><div class='add'>+	    vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ieee80211_connection_loss(vif);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7921_mcu_bss_event(struct mt7921_dev *dev, struct sk_buff *skb)</div><div class='add'>+mt7921_mcu_connection_loss_event(struct mt792x_dev *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct mt76_connac_beacon_loss_event *event;</div><div class='ctx'> 	struct mt76_phy *mphy = &amp;dev-&gt;mt76.phy;</div><div class='del'>-	struct mt76_connac_mcu_bss_event *event;</div><div class='ctx'> </div><div class='del'>-	skb_pull(skb, sizeof(struct mt7921_mcu_rxd));</div><div class='del'>-	event = (struct mt76_connac_mcu_bss_event *)skb-&gt;data;</div><div class='del'>-	if (event-&gt;is_absent)</div><div class='del'>-		ieee80211_stop_queues(mphy-&gt;hw);</div><div class='del'>-	else</div><div class='del'>-		ieee80211_wake_queues(mphy-&gt;hw);</div><div class='add'>+	skb_pull(skb, sizeof(struct mt76_connac2_mcu_rxd));</div><div class='add'>+	event = (struct mt76_connac_beacon_loss_event *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_atomic(mphy-&gt;hw,</div><div class='add'>+					IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='add'>+					mt7921_mcu_connection_loss_iter, event);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7921_mcu_debug_msg_event(struct mt7921_dev *dev, struct sk_buff *skb)</div><div class='add'>+mt7921_mcu_debug_msg_event(struct mt792x_dev *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7921_debug_msg {</div><div class='ctx'> 		__le16 id;</div><div class='hunk'>@@ -491,7 +219,7 @@ mt7921_mcu_debug_msg_event(struct mt7921_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 		u8 content[512];</div><div class='ctx'> 	} __packed * msg;</div><div class='ctx'> </div><div class='del'>-	skb_pull(skb, sizeof(struct mt7921_mcu_rxd));</div><div class='add'>+	skb_pull(skb, sizeof(struct mt76_connac2_mcu_rxd));</div><div class='ctx'> 	msg = (struct mt7921_debug_msg *)skb-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	if (msg-&gt;type == 3) { /* fw log */</div><div class='hunk'>@@ -507,54 +235,134 @@ mt7921_mcu_debug_msg_event(struct mt7921_dev *dev, struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7921_mcu_low_power_event(struct mt7921_dev *dev, struct sk_buff *skb)</div><div class='add'>+mt7921_mcu_low_power_event(struct mt792x_dev *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7921_mcu_lp_event {</div><div class='ctx'> 		u8 state;</div><div class='ctx'> 		u8 reserved[3];</div><div class='ctx'> 	} __packed * event;</div><div class='ctx'> </div><div class='del'>-	skb_pull(skb, sizeof(struct mt7921_mcu_rxd));</div><div class='add'>+	skb_pull(skb, sizeof(struct mt76_connac2_mcu_rxd));</div><div class='ctx'> 	event = (struct mt7921_mcu_lp_event *)skb-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	trace_lp_event(dev, event-&gt;state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7921_mcu_rx_unsolicited_event(struct mt7921_dev *dev, struct sk_buff *skb)</div><div class='add'>+mt7921_mcu_tx_done_event(struct mt792x_dev *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct mt7921_mcu_tx_done_event *event;</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, sizeof(struct mt76_connac2_mcu_rxd));</div><div class='add'>+	event = (struct mt7921_mcu_tx_done_event *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	mt7921_mac_add_txs(dev, event-&gt;txs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7921_mcu_rssi_monitor_iter(void *priv, u8 *mac,</div><div class='add'>+			     struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_connac_rssi_notify_event *event = priv;</div><div class='add'>+	enum nl80211_cqm_rssi_threshold_event nl_event;</div><div class='add'>+	s32 rssi = le32_to_cpu(event-&gt;rssi[mvif-&gt;bss_conf.mt76.idx]);</div><div class='add'>+</div><div class='add'>+	if (!rssi)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!(vif-&gt;driver_flags &amp; IEEE80211_VIF_SUPPORTS_CQM_RSSI))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (rssi &gt; vif-&gt;bss_conf.cqm_rssi_thold)</div><div class='add'>+		nl_event = NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH;</div><div class='add'>+	else</div><div class='add'>+		nl_event = NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW;</div><div class='add'>+</div><div class='add'>+	ieee80211_cqm_rssi_notify(vif, nl_event, rssi, GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7921_mcu_rssi_monitor_event(struct mt792x_dev *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_mcu_rxd *rxd = (struct mt7921_mcu_rxd *)skb-&gt;data;</div><div class='add'>+	struct mt76_connac_rssi_notify_event *event;</div><div class='ctx'> </div><div class='add'>+	skb_pull(skb, sizeof(struct mt76_connac2_mcu_rxd));</div><div class='add'>+	event = (struct mt76_connac_rssi_notify_event *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev),</div><div class='add'>+						   IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='add'>+						   mt7921_mcu_rssi_monitor_iter, event);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7921_mcu_rx_unsolicited_event(struct mt792x_dev *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct mt76_connac2_mcu_rxd *rxd;</div><div class='add'>+</div><div class='add'>+	rxd = (struct mt76_connac2_mcu_rxd *)skb-&gt;data;</div><div class='ctx'> 	switch (rxd-&gt;eid) {</div><div class='ctx'> 	case MCU_EVENT_BSS_BEACON_LOSS:</div><div class='del'>-		mt7921_mcu_beacon_loss_event(dev, skb);</div><div class='add'>+		mt7921_mcu_connection_loss_event(dev, skb);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MCU_EVENT_SCHED_SCAN_DONE:</div><div class='ctx'> 	case MCU_EVENT_SCAN_DONE:</div><div class='ctx'> 		mt7921_mcu_scan_event(dev, skb);</div><div class='ctx'> 		return;</div><div class='del'>-	case MCU_EVENT_BSS_ABSENCE:</div><div class='del'>-		mt7921_mcu_bss_event(dev, skb);</div><div class='del'>-		break;</div><div class='ctx'> 	case MCU_EVENT_DBG_MSG:</div><div class='ctx'> 		mt7921_mcu_debug_msg_event(dev, skb);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MCU_EVENT_COREDUMP:</div><div class='add'>+		dev-&gt;fw_assert = true;</div><div class='ctx'> 		mt76_connac_mcu_coredump_event(&amp;dev-&gt;mt76, skb,</div><div class='ctx'> 					       &amp;dev-&gt;coredump);</div><div class='ctx'> 		return;</div><div class='ctx'> 	case MCU_EVENT_LP_INFO:</div><div class='ctx'> 		mt7921_mcu_low_power_event(dev, skb);</div><div class='ctx'> 		break;</div><div class='add'>+	case MCU_EVENT_TX_DONE:</div><div class='add'>+		mt7921_mcu_tx_done_event(dev, skb);</div><div class='add'>+		break;</div><div class='add'>+	case MCU_EVENT_RSSI_NOTIFY:</div><div class='add'>+		mt7921_mcu_rssi_monitor_event(dev, skb);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mt7921_mcu_rx_event(struct mt7921_dev *dev, struct sk_buff *skb)</div><div class='add'>+static void</div><div class='add'>+mt7921_mcu_uni_rx_unsolicited_event(struct mt792x_dev *dev,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_mcu_rxd *rxd = (struct mt7921_mcu_rxd *)skb-&gt;data;</div><div class='add'>+	struct mt76_connac2_mcu_rxd *rxd;</div><div class='add'>+</div><div class='add'>+	rxd = (struct mt76_connac2_mcu_rxd *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	switch (rxd-&gt;eid) {</div><div class='add'>+	case MCU_UNI_EVENT_ROC:</div><div class='add'>+		mt7921_mcu_uni_roc_event(dev, skb);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7921_mcu_rx_event(struct mt792x_dev *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct mt76_connac2_mcu_rxd *rxd;</div><div class='add'>+</div><div class='add'>+	if (skb_linearize(skb))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rxd = (struct mt76_connac2_mcu_rxd *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (rxd-&gt;option &amp; MCU_UNI_CMD_UNSOLICITED_EVENT) {</div><div class='add'>+		mt7921_mcu_uni_rx_unsolicited_event(dev, skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (rxd-&gt;eid == 0x6) {</div><div class='ctx'> 		mt76_mcu_rx_event(&amp;dev-&gt;mt76, skb);</div><div class='hunk'>@@ -564,8 +372,9 @@ void mt7921_mcu_rx_event(struct mt7921_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	if (rxd-&gt;ext_eid == MCU_EXT_EVENT_RATE_REPORT ||</div><div class='ctx'> 	    rxd-&gt;eid == MCU_EVENT_BSS_BEACON_LOSS ||</div><div class='ctx'> 	    rxd-&gt;eid == MCU_EVENT_SCHED_SCAN_DONE ||</div><div class='del'>-	    rxd-&gt;eid == MCU_EVENT_BSS_ABSENCE ||</div><div class='add'>+	    rxd-&gt;eid == MCU_EVENT_RSSI_NOTIFY ||</div><div class='ctx'> 	    rxd-&gt;eid == MCU_EVENT_SCAN_DONE ||</div><div class='add'>+	    rxd-&gt;eid == MCU_EVENT_TX_DONE ||</div><div class='ctx'> 	    rxd-&gt;eid == MCU_EVENT_DBG_MSG ||</div><div class='ctx'> 	    rxd-&gt;eid == MCU_EVENT_COREDUMP ||</div><div class='ctx'> 	    rxd-&gt;eid == MCU_EVENT_LP_INFO ||</div><div class='hunk'>@@ -576,369 +385,243 @@ void mt7921_mcu_rx_event(struct mt7921_dev *dev, struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /** starec &amp; wtbl **/</div><div class='del'>-static int</div><div class='del'>-mt7921_mcu_sta_key_tlv(struct mt7921_sta *msta, struct sk_buff *skb,</div><div class='del'>-		       struct ieee80211_key_conf *key, enum set_key_cmd cmd)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_sta_key_conf *bip = &amp;msta-&gt;bip;</div><div class='del'>-	struct sta_rec_sec *sec;</div><div class='del'>-	struct tlv *tlv;</div><div class='del'>-	u32 len = sizeof(*sec);</div><div class='del'>-</div><div class='del'>-	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_KEY_V2, sizeof(*sec));</div><div class='del'>-</div><div class='del'>-	sec = (struct sta_rec_sec *)tlv;</div><div class='del'>-	sec-&gt;add = cmd;</div><div class='del'>-</div><div class='del'>-	if (cmd == SET_KEY) {</div><div class='del'>-		struct sec_key *sec_key;</div><div class='del'>-		u8 cipher;</div><div class='del'>-</div><div class='del'>-		cipher = mt7921_mcu_get_cipher(key-&gt;cipher);</div><div class='del'>-		if (cipher == MT_CIPHER_NONE)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-		sec_key = &amp;sec-&gt;key[0];</div><div class='del'>-		sec_key-&gt;cipher_len = sizeof(*sec_key);</div><div class='del'>-</div><div class='del'>-		if (cipher == MT_CIPHER_BIP_CMAC_128) {</div><div class='del'>-			sec_key-&gt;cipher_id = MT_CIPHER_AES_CCMP;</div><div class='del'>-			sec_key-&gt;key_id = bip-&gt;keyidx;</div><div class='del'>-			sec_key-&gt;key_len = 16;</div><div class='del'>-			memcpy(sec_key-&gt;key, bip-&gt;key, 16);</div><div class='del'>-</div><div class='del'>-			sec_key = &amp;sec-&gt;key[1];</div><div class='del'>-			sec_key-&gt;cipher_id = MT_CIPHER_BIP_CMAC_128;</div><div class='del'>-			sec_key-&gt;cipher_len = sizeof(*sec_key);</div><div class='del'>-			sec_key-&gt;key_len = 16;</div><div class='del'>-			memcpy(sec_key-&gt;key, key-&gt;key, 16);</div><div class='del'>-</div><div class='del'>-			sec-&gt;n_cipher = 2;</div><div class='del'>-		} else {</div><div class='del'>-			sec_key-&gt;cipher_id = cipher;</div><div class='del'>-			sec_key-&gt;key_id = key-&gt;keyidx;</div><div class='del'>-			sec_key-&gt;key_len = key-&gt;keylen;</div><div class='del'>-			memcpy(sec_key-&gt;key, key-&gt;key, key-&gt;keylen);</div><div class='del'>-</div><div class='del'>-			if (cipher == MT_CIPHER_TKIP) {</div><div class='del'>-				/* Rx/Tx MIC keys are swapped */</div><div class='del'>-				memcpy(sec_key-&gt;key + 16, key-&gt;key + 24, 8);</div><div class='del'>-				memcpy(sec_key-&gt;key + 24, key-&gt;key + 16, 8);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* store key_conf for BIP batch update */</div><div class='del'>-			if (cipher == MT_CIPHER_AES_CCMP) {</div><div class='del'>-				memcpy(bip-&gt;key, key-&gt;key, key-&gt;keylen);</div><div class='del'>-				bip-&gt;keyidx = key-&gt;keyidx;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			len -= sizeof(*sec_key);</div><div class='del'>-			sec-&gt;n_cipher = 1;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		len -= sizeof(sec-&gt;key);</div><div class='del'>-		sec-&gt;n_cipher = 0;</div><div class='del'>-	}</div><div class='del'>-	sec-&gt;len = cpu_to_le16(len);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mt7921_mcu_add_key(struct mt7921_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-		       struct mt7921_sta *msta, struct ieee80211_key_conf *key,</div><div class='del'>-		       enum set_key_cmd cmd)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_vif *mvif = (struct mt7921_vif *)vif-&gt;drv_priv;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	skb = mt76_connac_mcu_alloc_sta_req(&amp;dev-&gt;mt76, &amp;mvif-&gt;mt76,</div><div class='del'>-					    &amp;msta-&gt;wcid);</div><div class='del'>-	if (IS_ERR(skb))</div><div class='del'>-		return PTR_ERR(skb);</div><div class='del'>-</div><div class='del'>-	ret = mt7921_mcu_sta_key_tlv(msta, skb, key, cmd);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='del'>-				     MCU_UNI_CMD_STA_REC_UPDATE, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mt7921_mcu_uni_tx_ba(struct mt7921_dev *dev,</div><div class='add'>+int mt7921_mcu_uni_tx_ba(struct mt792x_dev *dev,</div><div class='ctx'> 			 struct ieee80211_ampdu_params *params,</div><div class='ctx'> 			 bool enable)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_sta *msta = (struct mt7921_sta *)params-&gt;sta-&gt;drv_priv;</div><div class='add'>+	struct mt792x_sta *msta = (struct mt792x_sta *)params-&gt;sta-&gt;drv_priv;</div><div class='ctx'> </div><div class='ctx'> 	if (enable &amp;&amp; !params-&gt;amsdu)</div><div class='del'>-		msta-&gt;wcid.amsdu = false;</div><div class='add'>+		msta-&gt;deflink.wcid.amsdu = false;</div><div class='ctx'> </div><div class='del'>-	return mt76_connac_mcu_sta_ba(&amp;dev-&gt;mt76, &amp;msta-&gt;vif-&gt;mt76, params,</div><div class='add'>+	return mt76_connac_mcu_sta_ba(&amp;dev-&gt;mt76, &amp;msta-&gt;vif-&gt;bss_conf.mt76, params,</div><div class='add'>+				      MCU_UNI_CMD(STA_REC_UPDATE),</div><div class='ctx'> 				      enable, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7921_mcu_uni_rx_ba(struct mt7921_dev *dev,</div><div class='add'>+int mt7921_mcu_uni_rx_ba(struct mt792x_dev *dev,</div><div class='ctx'> 			 struct ieee80211_ampdu_params *params,</div><div class='ctx'> 			 bool enable)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_sta *msta = (struct mt7921_sta *)params-&gt;sta-&gt;drv_priv;</div><div class='add'>+	struct mt792x_sta *msta = (struct mt792x_sta *)params-&gt;sta-&gt;drv_priv;</div><div class='ctx'> </div><div class='del'>-	return mt76_connac_mcu_sta_ba(&amp;dev-&gt;mt76, &amp;msta-&gt;vif-&gt;mt76, params,</div><div class='add'>+	return mt76_connac_mcu_sta_ba(&amp;dev-&gt;mt76, &amp;msta-&gt;vif-&gt;bss_conf.mt76, params,</div><div class='add'>+				      MCU_UNI_CMD(STA_REC_UPDATE),</div><div class='ctx'> 				      enable, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7921_mcu_restart(struct mt76_dev *dev)</div><div class='del'>-{</div><div class='del'>-	struct {</div><div class='del'>-		u8 power_mode;</div><div class='del'>-		u8 rsv[3];</div><div class='del'>-	} req = {</div><div class='del'>-		.power_mode = 1,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return mt76_mcu_send_msg(dev, MCU_CMD_NIC_POWER_CTRL, &amp;req,</div><div class='del'>-				 sizeof(req), false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mt7921_driver_own(struct mt7921_dev *dev)</div><div class='del'>-{</div><div class='del'>-	u32 reg = mt7921_reg_map_l1(dev, MT_TOP_LPCR_HOST_BAND0);</div><div class='del'>-</div><div class='del'>-	mt76_wr(dev, reg, MT_TOP_LPCR_HOST_DRV_OWN);</div><div class='del'>-	if (!mt76_poll_msec(dev, reg, MT_TOP_LPCR_HOST_FW_OWN,</div><div class='del'>-			    0, 500)) {</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "Timeout for driver own\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mt7921_load_patch(struct mt7921_dev *dev)</div><div class='add'>+static int mt7921_load_clc(struct mt792x_dev *dev, const char *fw_name)</div><div class='ctx'> {</div><div class='del'>-	const struct mt7921_patch_hdr *hdr;</div><div class='del'>-	const struct firmware *fw = NULL;</div><div class='del'>-	int i, ret, sem;</div><div class='add'>+	const struct mt76_connac2_fw_trailer *hdr;</div><div class='add'>+	const struct mt76_connac2_fw_region *region;</div><div class='add'>+	const struct mt7921_clc *clc;</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	struct mt792x_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	int ret, i, len, offset = 0;</div><div class='add'>+	u8 *clc_base = NULL, hw_encap = 0;</div><div class='ctx'> </div><div class='del'>-	sem = mt76_connac_mcu_patch_sem_ctrl(&amp;dev-&gt;mt76, true);</div><div class='del'>-	switch (sem) {</div><div class='del'>-	case PATCH_IS_DL:</div><div class='add'>+	dev-&gt;phy.clc_chan_conf = 0xff;</div><div class='add'>+	if (mt7921_disable_clc ||</div><div class='add'>+	    mt76_is_usb(&amp;dev-&gt;mt76))</div><div class='ctx'> 		return 0;</div><div class='del'>-	case PATCH_NOT_DL_SEM_SUCCESS:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "Failed to get patch semaphore\n");</div><div class='del'>-		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	if (mt76_is_mmio(&amp;dev-&gt;mt76)) {</div><div class='add'>+		ret = mt7921_mcu_read_eeprom(dev, MT_EE_HW_TYPE, &amp;hw_encap);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		hw_encap = u8_get_bits(hw_encap, MT_EE_HW_TYPE_ENCAP);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = request_firmware(&amp;fw, MT7921_ROM_PATCH, dev-&gt;mt76.dev);</div><div class='add'>+	ret = request_firmware(&amp;fw, fw_name, mdev-&gt;dev);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!fw || !fw-&gt;data || fw-&gt;size &lt; sizeof(*hdr)) {</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "Invalid firmware\n");</div><div class='add'>+		dev_err(mdev-&gt;dev, "Invalid firmware\n");</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hdr = (const struct mt7921_patch_hdr *)(fw-&gt;data);</div><div class='del'>-</div><div class='del'>-	dev_info(dev-&gt;mt76.dev, "HW/SW Version: 0x%x, Build Time: %.16s\n",</div><div class='del'>-		 be32_to_cpu(hdr-&gt;hw_sw_ver), hdr-&gt;build_date);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; be32_to_cpu(hdr-&gt;desc.n_region); i++) {</div><div class='del'>-		struct mt7921_patch_sec *sec;</div><div class='del'>-		const u8 *dl;</div><div class='del'>-		u32 len, addr;</div><div class='add'>+	hdr = (const void *)(fw-&gt;data + fw-&gt;size - sizeof(*hdr));</div><div class='add'>+	for (i = 0; i &lt; hdr-&gt;n_region; i++) {</div><div class='add'>+		region = (const void *)((const u8 *)hdr -</div><div class='add'>+					(hdr-&gt;n_region - i) * sizeof(*region));</div><div class='add'>+		len = le32_to_cpu(region-&gt;len);</div><div class='ctx'> </div><div class='del'>-		sec = (struct mt7921_patch_sec *)(fw-&gt;data + sizeof(*hdr) +</div><div class='del'>-						  i * sizeof(*sec));</div><div class='del'>-		if ((be32_to_cpu(sec-&gt;type) &amp; PATCH_SEC_TYPE_MASK) !=</div><div class='del'>-		    PATCH_SEC_TYPE_INFO) {</div><div class='add'>+		/* check if we have valid buffer size */</div><div class='add'>+		if (offset + len &gt; fw-&gt;size) {</div><div class='add'>+			dev_err(mdev-&gt;dev, "Invalid firmware region\n");</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		addr = be32_to_cpu(sec-&gt;info.addr);</div><div class='del'>-		len = be32_to_cpu(sec-&gt;info.len);</div><div class='del'>-		dl = fw-&gt;data + be32_to_cpu(sec-&gt;offs);</div><div class='del'>-</div><div class='del'>-		ret = mt76_connac_mcu_init_download(&amp;dev-&gt;mt76, addr, len,</div><div class='del'>-						    DL_MODE_NEED_RSP);</div><div class='del'>-		if (ret) {</div><div class='del'>-			dev_err(dev-&gt;mt76.dev, "Download request failed\n");</div><div class='del'>-			goto out;</div><div class='add'>+		if ((region-&gt;feature_set &amp; FW_FEATURE_NON_DL) &amp;&amp;</div><div class='add'>+		    region-&gt;type == FW_TYPE_CLC) {</div><div class='add'>+			clc_base = (u8 *)(fw-&gt;data + offset);</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='add'>+		offset += len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!clc_base)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-		ret = mt76_mcu_send_firmware(&amp;dev-&gt;mt76, MCU_CMD_FW_SCATTER,</div><div class='del'>-					     dl, len);</div><div class='del'>-		if (ret) {</div><div class='del'>-			dev_err(dev-&gt;mt76.dev, "Failed to send patch\n");</div><div class='add'>+	for (offset = 0; offset &lt; len; offset += le32_to_cpu(clc-&gt;len)) {</div><div class='add'>+		clc = (const struct mt7921_clc *)(clc_base + offset);</div><div class='add'>+</div><div class='add'>+		/* do not init buf again if chip reset triggered */</div><div class='add'>+		if (phy-&gt;clc[clc-&gt;idx])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* header content sanity */</div><div class='add'>+		if (clc-&gt;idx == MT7921_CLC_POWER &amp;&amp;</div><div class='add'>+		    u8_get_bits(clc-&gt;type, MT_EE_HW_TYPE_ENCAP) != hw_encap)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		phy-&gt;clc[clc-&gt;idx] = devm_kmemdup(mdev-&gt;dev, clc,</div><div class='add'>+						  le32_to_cpu(clc-&gt;len),</div><div class='add'>+						  GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+		if (!phy-&gt;clc[clc-&gt;idx]) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	ret = mt76_connac_mcu_start_patch(&amp;dev-&gt;mt76);</div><div class='del'>-	if (ret)</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "Failed to start patch\n");</div><div class='del'>-</div><div class='add'>+	ret = mt7921_mcu_set_clc(dev, "00", ENVIRON_INDOOR);</div><div class='ctx'> out:</div><div class='del'>-	sem = mt76_connac_mcu_patch_sem_ctrl(&amp;dev-&gt;mt76, false);</div><div class='del'>-	switch (sem) {</div><div class='del'>-	case PATCH_REL_SEM_SUCCESS:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EAGAIN;</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "Failed to release patch semaphore\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='ctx'> 	release_firmware(fw);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 mt7921_mcu_gen_dl_mode(u8 feature_set, bool is_wa)</div><div class='add'>+static void mt7921_mcu_parse_tx_resource(struct mt76_dev *dev,</div><div class='add'>+					 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	u32 ret = 0;</div><div class='del'>-</div><div class='del'>-	ret |= (feature_set &amp; FW_FEATURE_SET_ENCRYPT) ?</div><div class='del'>-	       (DL_MODE_ENCRYPT | DL_MODE_RESET_SEC_IV) : 0;</div><div class='del'>-	ret |= (feature_set &amp; FW_FEATURE_ENCRY_MODE) ?</div><div class='del'>-	       DL_CONFIG_ENCRY_MODE_SEL : 0;</div><div class='del'>-	ret |= FIELD_PREP(DL_MODE_KEY_IDX,</div><div class='del'>-			  FIELD_GET(FW_FEATURE_SET_KEY_IDX, feature_set));</div><div class='del'>-	ret |= DL_MODE_NEED_RSP;</div><div class='del'>-	ret |= is_wa ? DL_MODE_WORKING_PDA_CR4 : 0;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	struct mt76_sdio *sdio = &amp;dev-&gt;sdio;</div><div class='add'>+	struct mt7921_tx_resource {</div><div class='add'>+		__le32 version;</div><div class='add'>+		__le32 pse_data_quota;</div><div class='add'>+		__le32 pse_mcu_quota;</div><div class='add'>+		__le32 ple_data_quota;</div><div class='add'>+		__le32 ple_mcu_quota;</div><div class='add'>+		__le16 pse_page_size;</div><div class='add'>+		__le16 ple_page_size;</div><div class='add'>+		u8 pp_padding;</div><div class='add'>+		u8 pad[3];</div><div class='add'>+	} __packed * tx_res;</div><div class='add'>+</div><div class='add'>+	tx_res = (struct mt7921_tx_resource *)skb-&gt;data;</div><div class='add'>+	sdio-&gt;sched.pse_data_quota = le32_to_cpu(tx_res-&gt;pse_data_quota);</div><div class='add'>+	sdio-&gt;pse_mcu_quota_max = le32_to_cpu(tx_res-&gt;pse_mcu_quota);</div><div class='add'>+	/* The mcu quota usage of this function itself must be taken into consideration */</div><div class='add'>+	sdio-&gt;sched.pse_mcu_quota =</div><div class='add'>+		sdio-&gt;sched.pse_mcu_quota ? sdio-&gt;pse_mcu_quota_max : sdio-&gt;pse_mcu_quota_max - 1;</div><div class='add'>+	sdio-&gt;sched.ple_data_quota = le32_to_cpu(tx_res-&gt;ple_data_quota);</div><div class='add'>+	sdio-&gt;sched.pse_page_size = le16_to_cpu(tx_res-&gt;pse_page_size);</div><div class='add'>+	sdio-&gt;sched.deficit = tx_res-&gt;pp_padding;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt7921_mcu_send_ram_firmware(struct mt7921_dev *dev,</div><div class='del'>-			     const struct mt7921_fw_trailer *hdr,</div><div class='del'>-			     const u8 *data, bool is_wa)</div><div class='add'>+static void mt7921_mcu_parse_phy_cap(struct mt76_dev *dev,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	int i, offset = 0;</div><div class='del'>-	u32 override = 0, option = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; hdr-&gt;n_region; i++) {</div><div class='del'>-		const struct mt7921_fw_region *region;</div><div class='del'>-		int err;</div><div class='del'>-		u32 len, addr, mode;</div><div class='del'>-</div><div class='del'>-		region = (const struct mt7921_fw_region *)((const u8 *)hdr -</div><div class='del'>-			 (hdr-&gt;n_region - i) * sizeof(*region));</div><div class='del'>-		mode = mt7921_mcu_gen_dl_mode(region-&gt;feature_set, is_wa);</div><div class='del'>-		len = le32_to_cpu(region-&gt;len);</div><div class='del'>-		addr = le32_to_cpu(region-&gt;addr);</div><div class='del'>-</div><div class='del'>-		if (region-&gt;feature_set &amp; FW_FEATURE_OVERRIDE_ADDR)</div><div class='del'>-			override = addr;</div><div class='del'>-</div><div class='del'>-		err = mt76_connac_mcu_init_download(&amp;dev-&gt;mt76, addr, len,</div><div class='del'>-						    mode);</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(dev-&gt;mt76.dev, "Download request failed\n");</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err = mt76_mcu_send_firmware(&amp;dev-&gt;mt76, MCU_CMD_FW_SCATTER,</div><div class='del'>-					     data + offset, len);</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(dev-&gt;mt76.dev, "Failed to send firmware.\n");</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		offset += len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (override)</div><div class='del'>-		option |= FW_START_OVERRIDE;</div><div class='add'>+	struct mt7921_phy_cap {</div><div class='add'>+		u8 ht;</div><div class='add'>+		u8 vht;</div><div class='add'>+		u8 _5g;</div><div class='add'>+		u8 max_bw;</div><div class='add'>+		u8 nss;</div><div class='add'>+		u8 dbdc;</div><div class='add'>+		u8 tx_ldpc;</div><div class='add'>+		u8 rx_ldpc;</div><div class='add'>+		u8 tx_stbc;</div><div class='add'>+		u8 rx_stbc;</div><div class='add'>+		u8 hw_path;</div><div class='add'>+		u8 he;</div><div class='add'>+	} __packed * cap;</div><div class='add'>+</div><div class='add'>+	enum {</div><div class='add'>+		WF0_24G,</div><div class='add'>+		WF0_5G</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-	if (is_wa)</div><div class='del'>-		option |= FW_START_WORKING_PDA_CR4;</div><div class='add'>+	cap = (struct mt7921_phy_cap *)skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-	return mt76_connac_mcu_start_firmware(&amp;dev-&gt;mt76, override, option);</div><div class='add'>+	dev-&gt;phy.antenna_mask = BIT(cap-&gt;nss) - 1;</div><div class='add'>+	dev-&gt;phy.chainmask = dev-&gt;phy.antenna_mask;</div><div class='add'>+	dev-&gt;phy.cap.has_2ghz = cap-&gt;hw_path &amp; BIT(WF0_24G);</div><div class='add'>+	dev-&gt;phy.cap.has_5ghz = cap-&gt;hw_path &amp; BIT(WF0_5G);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7921_load_ram(struct mt7921_dev *dev)</div><div class='add'>+static int mt7921_mcu_get_nic_capability(struct mt792x_phy *mphy)</div><div class='ctx'> {</div><div class='del'>-	const struct mt7921_fw_trailer *hdr;</div><div class='del'>-	const struct firmware *fw;</div><div class='del'>-	int ret;</div><div class='add'>+	struct mt76_connac_cap_hdr {</div><div class='add'>+		__le16 n_element;</div><div class='add'>+		u8 rsv[2];</div><div class='add'>+	} __packed * hdr;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct mt76_phy *phy = mphy-&gt;mt76;</div><div class='add'>+	int ret, i;</div><div class='ctx'> </div><div class='del'>-	ret = request_firmware(&amp;fw, MT7921_FIRMWARE_WM, dev-&gt;mt76.dev);</div><div class='add'>+	ret = mt76_mcu_send_and_get_msg(phy-&gt;dev, MCU_CE_CMD(GET_NIC_CAPAB),</div><div class='add'>+					NULL, 0, true, &amp;skb);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (!fw || !fw-&gt;data || fw-&gt;size &lt; sizeof(*hdr)) {</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "Invalid firmware\n");</div><div class='add'>+	hdr = (struct mt76_connac_cap_hdr *)skb-&gt;data;</div><div class='add'>+	if (skb-&gt;len &lt; sizeof(*hdr)) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hdr = (const struct mt7921_fw_trailer *)(fw-&gt;data + fw-&gt;size -</div><div class='del'>-					sizeof(*hdr));</div><div class='del'>-</div><div class='del'>-	dev_info(dev-&gt;mt76.dev, "WM Firmware Version: %.10s, Build Time: %.15s\n",</div><div class='del'>-		 hdr-&gt;fw_ver, hdr-&gt;build_date);</div><div class='del'>-</div><div class='del'>-	ret = mt7921_mcu_send_ram_firmware(dev, hdr, fw-&gt;data, false);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "Failed to start WM firmware\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	skb_pull(skb, sizeof(*hdr));</div><div class='ctx'> </div><div class='del'>-	snprintf(dev-&gt;mt76.hw-&gt;wiphy-&gt;fw_version,</div><div class='del'>-		 sizeof(dev-&gt;mt76.hw-&gt;wiphy-&gt;fw_version),</div><div class='del'>-		 "%.10s-%.15s", hdr-&gt;fw_ver, hdr-&gt;build_date);</div><div class='add'>+	for (i = 0; i &lt; le16_to_cpu(hdr-&gt;n_element); i++) {</div><div class='add'>+		struct tlv_hdr {</div><div class='add'>+			__le32 type;</div><div class='add'>+			__le32 len;</div><div class='add'>+		} __packed * tlv = (struct tlv_hdr *)skb-&gt;data;</div><div class='add'>+		int len;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	release_firmware(fw);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mt7921_load_firmware(struct mt7921_dev *dev)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = mt76_get_field(dev, MT_CONN_ON_MISC, MT_TOP_MISC2_FW_N9_RDY);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_dbg(dev-&gt;mt76.dev, "Firmware is already download\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = mt7921_load_patch(dev);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+		if (skb-&gt;len &lt; sizeof(*tlv))</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-	ret = mt7921_load_ram(dev);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+		skb_pull(skb, sizeof(*tlv));</div><div class='ctx'> </div><div class='del'>-	if (!mt76_poll_msec(dev, MT_CONN_ON_MISC, MT_TOP_MISC2_FW_N9_RDY,</div><div class='del'>-			    MT_TOP_MISC2_FW_N9_RDY, 1500)) {</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "Timeout for initializing firmware\n");</div><div class='add'>+		len = le32_to_cpu(tlv-&gt;len);</div><div class='add'>+		if (skb-&gt;len &lt; len)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-		return -EIO;</div><div class='add'>+		switch (le32_to_cpu(tlv-&gt;type)) {</div><div class='add'>+		case MT_NIC_CAP_6G:</div><div class='add'>+			phy-&gt;cap.has_6ghz = skb-&gt;data[0];</div><div class='add'>+			break;</div><div class='add'>+		case MT_NIC_CAP_MAC_ADDR:</div><div class='add'>+			memcpy(phy-&gt;macaddr, (void *)skb-&gt;data, ETH_ALEN);</div><div class='add'>+			break;</div><div class='add'>+		case MT_NIC_CAP_PHY:</div><div class='add'>+			mt7921_mcu_parse_phy_cap(phy-&gt;dev, skb);</div><div class='add'>+			break;</div><div class='add'>+		case MT_NIC_CAP_TX_RESOURCE:</div><div class='add'>+			if (mt76_is_sdio(phy-&gt;dev))</div><div class='add'>+				mt7921_mcu_parse_tx_resource(phy-&gt;dev,</div><div class='add'>+							     skb);</div><div class='add'>+			break;</div><div class='add'>+		case MT_NIC_CAP_CHIP_CAP:</div><div class='add'>+			memcpy(&amp;mphy-&gt;chip_cap, (void *)skb-&gt;data, sizeof(u64));</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		skb_pull(skb, len);</div><div class='ctx'> 	}</div><div class='add'>+out:</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='del'>-	mt76_queue_tx_cleanup(dev, dev-&gt;mt76.q_mcu[MT_MCUQ_FWDL], false);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	dev-&gt;mt76.hw-&gt;wiphy-&gt;wowlan = &amp;mt76_connac_wowlan_support;</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='del'>-</div><div class='del'>-	clear_bit(MT76_STATE_PM, &amp;dev-&gt;mphy.state);</div><div class='del'>-</div><div class='del'>-	dev_err(dev-&gt;mt76.dev, "Firmware init done\n");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7921_mcu_fw_log_2_host(struct mt7921_dev *dev, u8 ctrl)</div><div class='add'>+int mt7921_mcu_fw_log_2_host(struct mt792x_dev *dev, u8 ctrl)</div><div class='ctx'> {</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u8 ctrl_val;</div><div class='hunk'>@@ -947,105 +630,239 @@ int mt7921_mcu_fw_log_2_host(struct mt7921_dev *dev, u8 ctrl)</div><div class='ctx'> 		.ctrl_val = ctrl</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_CMD_FWLOG_2_HOST, &amp;data,</div><div class='del'>-				 sizeof(data), false);</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_CE_CMD(FWLOG_2_HOST),</div><div class='add'>+				 &amp;data, sizeof(data), false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7921_run_firmware(struct mt7921_dev *dev)</div><div class='add'>+int mt7921_run_firmware(struct mt792x_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = mt7921_driver_own(dev);</div><div class='add'>+	err = mt792x_load_firmware(dev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = mt7921_load_firmware(dev);</div><div class='add'>+	err = mt7921_mcu_get_nic_capability(&amp;dev-&gt;phy);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	err = mt7921_load_clc(dev, mt792x_ram_name(dev));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> 	set_bit(MT76_STATE_MCU_RUNNING, &amp;dev-&gt;mphy.state);</div><div class='del'>-	mt7921_mcu_fw_log_2_host(dev, 1);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return mt7921_mcu_fw_log_2_host(dev, 1);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7921_run_firmware);</div><div class='ctx'> </div><div class='del'>-int mt7921_mcu_init(struct mt7921_dev *dev)</div><div class='add'>+int mt7921_mcu_radio_led_ctrl(struct mt792x_dev *dev, u8 value)</div><div class='ctx'> {</div><div class='del'>-	static const struct mt76_mcu_ops mt7921_mcu_ops = {</div><div class='del'>-		.headroom = sizeof(struct mt7921_mcu_txd),</div><div class='del'>-		.mcu_skb_send_msg = mt7921_mcu_send_message,</div><div class='del'>-		.mcu_parse_response = mt7921_mcu_parse_response,</div><div class='del'>-		.mcu_restart = mt7921_mcu_restart,</div><div class='add'>+	struct {</div><div class='add'>+		u8 ctrlid;</div><div class='add'>+		u8 rsv[3];</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.ctrlid = value,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mt76.mcu_ops = &amp;mt7921_mcu_ops;</div><div class='del'>-</div><div class='del'>-	return mt7921_run_firmware(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mt7921_mcu_exit(struct mt7921_dev *dev)</div><div class='del'>-{</div><div class='del'>-	mt7921_wfsys_reset(dev);</div><div class='del'>-	skb_queue_purge(&amp;dev-&gt;mt76.mcu.res_q);</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(ID_RADIO_ON_OFF_CTRL),</div><div class='add'>+				&amp;req, sizeof(req), false);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7921_mcu_radio_led_ctrl);</div><div class='ctx'> </div><div class='del'>-int mt7921_mcu_set_tx(struct mt7921_dev *dev, struct ieee80211_vif *vif)</div><div class='add'>+int mt7921_mcu_set_tx(struct mt792x_dev *dev, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-#define WMM_AIFS_SET		BIT(0)</div><div class='del'>-#define WMM_CW_MIN_SET		BIT(1)</div><div class='del'>-#define WMM_CW_MAX_SET		BIT(2)</div><div class='del'>-#define WMM_TXOP_SET		BIT(3)</div><div class='del'>-#define WMM_PARAM_SET		GENMASK(3, 0)</div><div class='del'>-#define TX_CMD_MODE		1</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct edca {</div><div class='del'>-		u8 queue;</div><div class='del'>-		u8 set;</div><div class='del'>-		u8 aifs;</div><div class='del'>-		u8 cw_min;</div><div class='add'>+		__le16 cw_min;</div><div class='ctx'> 		__le16 cw_max;</div><div class='ctx'> 		__le16 txop;</div><div class='del'>-	};</div><div class='add'>+		__le16 aifs;</div><div class='add'>+		u8 guardtime;</div><div class='add'>+		u8 acm;</div><div class='add'>+	} __packed;</div><div class='ctx'> 	struct mt7921_mcu_tx {</div><div class='del'>-		u8 total;</div><div class='del'>-		u8 action;</div><div class='del'>-		u8 valid;</div><div class='del'>-		u8 mode;</div><div class='del'>-</div><div class='ctx'> 		struct edca edca[IEEE80211_NUM_ACS];</div><div class='add'>+		u8 bss_idx;</div><div class='add'>+		u8 qos;</div><div class='add'>+		u8 wmm_idx;</div><div class='add'>+		u8 pad;</div><div class='ctx'> 	} __packed req = {</div><div class='del'>-		.valid = true,</div><div class='del'>-		.mode = TX_CMD_MODE,</div><div class='del'>-		.total = IEEE80211_NUM_ACS,</div><div class='add'>+		.bss_idx = mvif-&gt;bss_conf.mt76.idx,</div><div class='add'>+		.qos = vif-&gt;bss_conf.qos,</div><div class='add'>+		.wmm_idx = mvif-&gt;bss_conf.mt76.wmm_idx,</div><div class='add'>+	};</div><div class='add'>+	struct mu_edca {</div><div class='add'>+		u8 cw_min;</div><div class='add'>+		u8 cw_max;</div><div class='add'>+		u8 aifsn;</div><div class='add'>+		u8 acm;</div><div class='add'>+		u8 timer;</div><div class='add'>+		u8 padding[3];</div><div class='add'>+	};</div><div class='add'>+	struct mt7921_mcu_mu_tx {</div><div class='add'>+		u8 ver;</div><div class='add'>+		u8 pad0;</div><div class='add'>+		__le16 len;</div><div class='add'>+		u8 bss_idx;</div><div class='add'>+		u8 qos;</div><div class='add'>+		u8 wmm_idx;</div><div class='add'>+		u8 pad1;</div><div class='add'>+		struct mu_edca edca[IEEE80211_NUM_ACS];</div><div class='add'>+		u8 pad3[32];</div><div class='add'>+	} __packed req_mu = {</div><div class='add'>+		.bss_idx = mvif-&gt;bss_conf.mt76.idx,</div><div class='add'>+		.qos = vif-&gt;bss_conf.qos,</div><div class='add'>+		.wmm_idx = mvif-&gt;bss_conf.mt76.wmm_idx,</div><div class='ctx'> 	};</div><div class='del'>-	struct mt7921_vif *mvif = (struct mt7921_vif *)vif-&gt;drv_priv;</div><div class='del'>-	int ac;</div><div class='add'>+	static const int to_aci[] = { 1, 0, 2, 3 };</div><div class='add'>+	int ac, ret;</div><div class='ctx'> </div><div class='ctx'> 	for (ac = 0; ac &lt; IEEE80211_NUM_ACS; ac++) {</div><div class='del'>-		struct ieee80211_tx_queue_params *q = &amp;mvif-&gt;queue_params[ac];</div><div class='del'>-		struct edca *e = &amp;req.edca[ac];</div><div class='add'>+		struct ieee80211_tx_queue_params *q = &amp;mvif-&gt;bss_conf.queue_params[ac];</div><div class='add'>+		struct edca *e = &amp;req.edca[to_aci[ac]];</div><div class='ctx'> </div><div class='del'>-		e-&gt;set = WMM_PARAM_SET;</div><div class='del'>-		e-&gt;queue = ac + mvif-&gt;mt76.wmm_idx * MT7921_MAX_WMM_SETS;</div><div class='del'>-		e-&gt;aifs = q-&gt;aifs;</div><div class='add'>+		e-&gt;aifs = cpu_to_le16(q-&gt;aifs);</div><div class='ctx'> 		e-&gt;txop = cpu_to_le16(q-&gt;txop);</div><div class='ctx'> </div><div class='ctx'> 		if (q-&gt;cw_min)</div><div class='del'>-			e-&gt;cw_min = fls(q-&gt;cw_min);</div><div class='add'>+			e-&gt;cw_min = cpu_to_le16(q-&gt;cw_min);</div><div class='ctx'> 		else</div><div class='del'>-			e-&gt;cw_min = 5;</div><div class='add'>+			e-&gt;cw_min = cpu_to_le16(5);</div><div class='ctx'> </div><div class='ctx'> 		if (q-&gt;cw_max)</div><div class='del'>-			e-&gt;cw_max = cpu_to_le16(fls(q-&gt;cw_max));</div><div class='add'>+			e-&gt;cw_max = cpu_to_le16(q-&gt;cw_max);</div><div class='ctx'> 		else</div><div class='ctx'> 			e-&gt;cw_max = cpu_to_le16(10);</div><div class='ctx'> 	}</div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_EDCA_UPDATE, &amp;req,</div><div class='del'>-				 sizeof(req), true);</div><div class='add'>+</div><div class='add'>+	ret = mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_CE_CMD(SET_EDCA_PARMS), &amp;req,</div><div class='add'>+				sizeof(req), false);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!vif-&gt;bss_conf.he_support)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (ac = 0; ac &lt; IEEE80211_NUM_ACS; ac++) {</div><div class='add'>+		struct ieee80211_he_mu_edca_param_ac_rec *q;</div><div class='add'>+		struct mu_edca *e;</div><div class='add'>+</div><div class='add'>+		if (!mvif-&gt;bss_conf.queue_params[ac].mu_edca)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		q = &amp;mvif-&gt;bss_conf.queue_params[ac].mu_edca_param_rec;</div><div class='add'>+		e = &amp;(req_mu.edca[to_aci[ac]]);</div><div class='add'>+</div><div class='add'>+		e-&gt;cw_min = q-&gt;ecw_min_max &amp; 0xf;</div><div class='add'>+		e-&gt;cw_max = (q-&gt;ecw_min_max &amp; 0xf0) &gt;&gt; 4;</div><div class='add'>+		e-&gt;aifsn = q-&gt;aifsn;</div><div class='add'>+		e-&gt;timer = q-&gt;mu_edca_timer;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_CE_CMD(SET_MU_EDCA_PARMS),</div><div class='add'>+				 &amp;req_mu, sizeof(req_mu), false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7921_mcu_set_roc(struct mt792x_phy *phy, struct mt792x_vif *vif,</div><div class='add'>+		       struct ieee80211_channel *chan, int duration,</div><div class='add'>+		       enum mt7921_roc_req type, u8 token_id)</div><div class='add'>+{</div><div class='add'>+	int center_ch = ieee80211_frequency_to_channel(chan-&gt;center_freq);</div><div class='add'>+	struct mt792x_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 rsv[4];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct roc_acquire_tlv {</div><div class='add'>+			__le16 tag;</div><div class='add'>+			__le16 len;</div><div class='add'>+			u8 bss_idx;</div><div class='add'>+			u8 tokenid;</div><div class='add'>+			u8 control_channel;</div><div class='add'>+			u8 sco;</div><div class='add'>+			u8 band;</div><div class='add'>+			u8 bw;</div><div class='add'>+			u8 center_chan;</div><div class='add'>+			u8 center_chan2;</div><div class='add'>+			u8 bw_from_ap;</div><div class='add'>+			u8 center_chan_from_ap;</div><div class='add'>+			u8 center_chan2_from_ap;</div><div class='add'>+			u8 reqtype;</div><div class='add'>+			__le32 maxinterval;</div><div class='add'>+			u8 dbdcband;</div><div class='add'>+			u8 rsv[3];</div><div class='add'>+		} __packed roc;</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.roc = {</div><div class='add'>+			.tag = cpu_to_le16(UNI_ROC_ACQUIRE),</div><div class='add'>+			.len = cpu_to_le16(sizeof(struct roc_acquire_tlv)),</div><div class='add'>+			.tokenid = token_id,</div><div class='add'>+			.reqtype = type,</div><div class='add'>+			.maxinterval = cpu_to_le32(duration),</div><div class='add'>+			.bss_idx = vif-&gt;bss_conf.mt76.idx,</div><div class='add'>+			.control_channel = chan-&gt;hw_value,</div><div class='add'>+			.bw = CMD_CBW_20MHZ,</div><div class='add'>+			.bw_from_ap = CMD_CBW_20MHZ,</div><div class='add'>+			.center_chan = center_ch,</div><div class='add'>+			.center_chan_from_ap = center_ch,</div><div class='add'>+			.dbdcband = 0xff, /* auto */</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (chan-&gt;hw_value &lt; center_ch)</div><div class='add'>+		req.roc.sco = 1; /* SCA */</div><div class='add'>+	else if (chan-&gt;hw_value &gt; center_ch)</div><div class='add'>+		req.roc.sco = 3; /* SCB */</div><div class='add'>+</div><div class='add'>+	switch (chan-&gt;band) {</div><div class='add'>+	case NL80211_BAND_6GHZ:</div><div class='add'>+		req.roc.band = 3;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_BAND_5GHZ:</div><div class='add'>+		req.roc.band = 2;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		req.roc.band = 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD(ROC),</div><div class='add'>+				 &amp;req, sizeof(req), false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7921_mcu_set_chan_info(struct mt7921_phy *phy, int cmd)</div><div class='add'>+int mt7921_mcu_abort_roc(struct mt792x_phy *phy, struct mt792x_vif *vif,</div><div class='add'>+			 u8 token_id)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct mt792x_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 rsv[4];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct roc_abort_tlv {</div><div class='add'>+			__le16 tag;</div><div class='add'>+			__le16 len;</div><div class='add'>+			u8 bss_idx;</div><div class='add'>+			u8 tokenid;</div><div class='add'>+			u8 dbdcband;</div><div class='add'>+			u8 rsv[5];</div><div class='add'>+		} __packed abort;</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.abort = {</div><div class='add'>+			.tag = cpu_to_le16(UNI_ROC_ABORT),</div><div class='add'>+			.len = cpu_to_le16(sizeof(struct roc_abort_tlv)),</div><div class='add'>+			.tokenid = token_id,</div><div class='add'>+			.bss_idx = vif-&gt;bss_conf.mt76.idx,</div><div class='add'>+			.dbdcband = 0xff, /* auto*/</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD(ROC),</div><div class='add'>+				 &amp;req, sizeof(req), false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7921_mcu_set_chan_info(struct mt792x_phy *phy, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = phy-&gt;dev;</div><div class='ctx'> 	struct cfg80211_chan_def *chandef = &amp;phy-&gt;mt76-&gt;chandef;</div><div class='ctx'> 	int freq1 = chandef-&gt;center_freq1;</div><div class='ctx'> 	struct {</div><div class='hunk'>@@ -1068,22 +885,29 @@ int mt7921_mcu_set_chan_info(struct mt7921_phy *phy, int cmd)</div><div class='ctx'> 	} __packed req = {</div><div class='ctx'> 		.control_ch = chandef-&gt;chan-&gt;hw_value,</div><div class='ctx'> 		.center_ch = ieee80211_frequency_to_channel(freq1),</div><div class='del'>-		.bw = mt7921_mcu_chan_bw(chandef),</div><div class='add'>+		.bw = mt76_connac_chan_bw(chandef),</div><div class='ctx'> 		.tx_streams_num = hweight8(phy-&gt;mt76-&gt;antenna_mask),</div><div class='ctx'> 		.rx_streams = phy-&gt;mt76-&gt;antenna_mask,</div><div class='ctx'> 		.band_idx = phy != &amp;dev-&gt;phy,</div><div class='del'>-		.channel_band = chandef-&gt;chan-&gt;band,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;mt76.hw-&gt;conf.flags &amp; IEEE80211_CONF_OFFCHANNEL)</div><div class='add'>+	if (chandef-&gt;chan-&gt;band == NL80211_BAND_6GHZ)</div><div class='add'>+		req.channel_band = 2;</div><div class='add'>+	else</div><div class='add'>+		req.channel_band = chandef-&gt;chan-&gt;band;</div><div class='add'>+</div><div class='add'>+	if (cmd == MCU_EXT_CMD(SET_RX_PATH) ||</div><div class='add'>+	    dev-&gt;mt76.hw-&gt;conf.flags &amp; IEEE80211_CONF_MONITOR)</div><div class='add'>+		req.switch_reason = CH_SWITCH_NORMAL;</div><div class='add'>+	else if (phy-&gt;mt76-&gt;offchannel)</div><div class='ctx'> 		req.switch_reason = CH_SWITCH_SCAN_BYPASS_DPD;</div><div class='del'>-	else if ((chandef-&gt;chan-&gt;flags &amp; IEEE80211_CHAN_RADAR) &amp;&amp;</div><div class='del'>-		 chandef-&gt;chan-&gt;dfs_state != NL80211_DFS_AVAILABLE)</div><div class='add'>+	else if (!cfg80211_reg_can_beacon(dev-&gt;mt76.hw-&gt;wiphy, chandef,</div><div class='add'>+					  NL80211_IFTYPE_AP))</div><div class='ctx'> 		req.switch_reason = CH_SWITCH_DFS;</div><div class='ctx'> 	else</div><div class='ctx'> 		req.switch_reason = CH_SWITCH_NORMAL;</div><div class='ctx'> </div><div class='del'>-	if (cmd == MCU_EXT_CMD_CHANNEL_SWITCH)</div><div class='add'>+	if (cmd == MCU_EXT_CMD(CHANNEL_SWITCH))</div><div class='ctx'> 		req.rx_streams = hweight8(req.rx_streams);</div><div class='ctx'> </div><div class='ctx'> 	if (chandef-&gt;width == NL80211_CHAN_WIDTH_80P80) {</div><div class='hunk'>@@ -1095,7 +919,7 @@ int mt7921_mcu_set_chan_info(struct mt7921_phy *phy, int cmd)</div><div class='ctx'> 	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, cmd, &amp;req, sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7921_mcu_set_eeprom(struct mt7921_dev *dev)</div><div class='add'>+int mt7921_mcu_set_eeprom(struct mt792x_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct req_hdr {</div><div class='ctx'> 		u8 buffer_mode;</div><div class='hunk'>@@ -1106,56 +930,14 @@ int mt7921_mcu_set_eeprom(struct mt7921_dev *dev)</div><div class='ctx'> 		.format = EE_FORMAT_WHOLE,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_EFUSE_BUFFER_MODE,</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(EFUSE_BUFFER_MODE),</div><div class='ctx'> 				 &amp;req, sizeof(req), true);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7921_mcu_set_eeprom);</div><div class='ctx'> </div><div class='del'>-int mt7921_mcu_get_eeprom(struct mt7921_dev *dev, u32 offset)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_mcu_eeprom_info req = {</div><div class='del'>-		.addr = cpu_to_le32(round_down(offset, 16)),</div><div class='del'>-	};</div><div class='del'>-	struct mt7921_mcu_eeprom_info *res;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int ret;</div><div class='del'>-	u8 *buf;</div><div class='del'>-</div><div class='del'>-	ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD_EFUSE_ACCESS, &amp;req,</div><div class='del'>-					sizeof(req), true, &amp;skb);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	res = (struct mt7921_mcu_eeprom_info *)skb-&gt;data;</div><div class='del'>-	buf = dev-&gt;mt76.eeprom.data + le32_to_cpu(res-&gt;addr);</div><div class='del'>-	memcpy(buf, res-&gt;data, 16);</div><div class='del'>-	dev_kfree_skb(skb);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u32 mt7921_get_wtbl_info(struct mt7921_dev *dev, u32 wlan_idx)</div><div class='del'>-{</div><div class='del'>-	struct mt7921_mcu_wlan_info wtbl_info = {</div><div class='del'>-		.wlan_idx = cpu_to_le32(wlan_idx),</div><div class='del'>-	};</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76, MCU_CMD_GET_WTBL,</div><div class='del'>-					&amp;wtbl_info, sizeof(wtbl_info), true,</div><div class='del'>-					&amp;skb);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	mt7921_mcu_tx_rate_report(dev, skb, wlan_idx);</div><div class='del'>-	dev_kfree_skb(skb);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mt7921_mcu_uni_bss_ps(struct mt7921_dev *dev, struct ieee80211_vif *vif)</div><div class='add'>+int mt7921_mcu_uni_bss_ps(struct mt792x_dev *dev, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_vif *mvif = (struct mt7921_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u8 bss_idx;</div><div class='hunk'>@@ -1174,26 +956,27 @@ int mt7921_mcu_uni_bss_ps(struct mt7921_dev *dev, struct ieee80211_vif *vif)</div><div class='ctx'> 		} __packed ps;</div><div class='ctx'> 	} __packed ps_req = {</div><div class='ctx'> 		.hdr = {</div><div class='del'>-			.bss_idx = mvif-&gt;mt76.idx,</div><div class='add'>+			.bss_idx = mvif-&gt;bss_conf.mt76.idx,</div><div class='ctx'> 		},</div><div class='ctx'> 		.ps = {</div><div class='ctx'> 			.tag = cpu_to_le16(UNI_BSS_INFO_PS),</div><div class='ctx'> 			.len = cpu_to_le16(sizeof(struct ps_tlv)),</div><div class='del'>-			.ps_state = vif-&gt;bss_conf.ps ? 2 : 0,</div><div class='add'>+			.ps_state = vif-&gt;cfg.ps ? 2 : 0,</div><div class='ctx'> 		},</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD_BSS_INFO_UPDATE,</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD(BSS_INFO_UPDATE),</div><div class='ctx'> 				 &amp;ps_req, sizeof(ps_req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7921_mcu_uni_bss_bcnft(struct mt7921_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-			     bool enable)</div><div class='add'>+static int</div><div class='add'>+mt7921_mcu_uni_bss_bcnft(struct mt792x_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			 bool enable)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_vif *mvif = (struct mt7921_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u8 bss_idx;</div><div class='hunk'>@@ -1208,7 +991,7 @@ int mt7921_mcu_uni_bss_bcnft(struct mt7921_dev *dev, struct ieee80211_vif *vif,</div><div class='ctx'> 		} __packed bcnft;</div><div class='ctx'> 	} __packed bcnft_req = {</div><div class='ctx'> 		.hdr = {</div><div class='del'>-			.bss_idx = mvif-&gt;mt76.idx,</div><div class='add'>+			.bss_idx = mvif-&gt;bss_conf.mt76.idx,</div><div class='ctx'> 		},</div><div class='ctx'> 		.bcnft = {</div><div class='ctx'> 			.tag = cpu_to_le16(UNI_BSS_INFO_BCNFT),</div><div class='hunk'>@@ -1221,14 +1004,15 @@ int mt7921_mcu_uni_bss_bcnft(struct mt7921_dev *dev, struct ieee80211_vif *vif,</div><div class='ctx'> 	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD_BSS_INFO_UPDATE,</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD(BSS_INFO_UPDATE),</div><div class='ctx'> 				 &amp;bcnft_req, sizeof(bcnft_req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7921_mcu_set_bss_pm(struct mt7921_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-			  bool enable)</div><div class='add'>+int</div><div class='add'>+mt7921_mcu_set_bss_pm(struct mt792x_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+		      bool enable)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_vif *mvif = (struct mt7921_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u8 bss_idx;</div><div class='ctx'> 		u8 dtim_period;</div><div class='hunk'>@@ -1240,8 +1024,8 @@ int mt7921_mcu_set_bss_pm(struct mt7921_dev *dev, struct ieee80211_vif *vif,</div><div class='ctx'> 		u8 bmc_triggered_ac;</div><div class='ctx'> 		u8 pad;</div><div class='ctx'> 	} req = {</div><div class='del'>-		.bss_idx = mvif-&gt;mt76.idx,</div><div class='del'>-		.aid = cpu_to_le16(vif-&gt;bss_conf.aid),</div><div class='add'>+		.bss_idx = mvif-&gt;bss_conf.mt76.idx,</div><div class='add'>+		.aid = cpu_to_le16(vif-&gt;cfg.aid),</div><div class='ctx'> 		.dtim_period = vif-&gt;bss_conf.dtim_period,</div><div class='ctx'> 		.bcn_interval = cpu_to_le16(vif-&gt;bss_conf.beacon_int),</div><div class='ctx'> 	};</div><div class='hunk'>@@ -1249,160 +1033,460 @@ int mt7921_mcu_set_bss_pm(struct mt7921_dev *dev, struct ieee80211_vif *vif,</div><div class='ctx'> 		u8 bss_idx;</div><div class='ctx'> 		u8 pad[3];</div><div class='ctx'> 	} req_hdr = {</div><div class='del'>-		.bss_idx = mvif-&gt;mt76.idx,</div><div class='add'>+		.bss_idx = mvif-&gt;bss_conf.mt76.idx,</div><div class='ctx'> 	};</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	err = mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_CMD_SET_BSS_ABORT, &amp;req_hdr,</div><div class='del'>-				sizeof(req_hdr), false);</div><div class='add'>+	err = mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_CE_CMD(SET_BSS_ABORT),</div><div class='add'>+				&amp;req_hdr, sizeof(req_hdr), false);</div><div class='ctx'> 	if (err &lt; 0 || !enable)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_CMD_SET_BSS_CONNECTED, &amp;req,</div><div class='del'>-				 sizeof(req), false);</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_CE_CMD(SET_BSS_CONNECTED),</div><div class='add'>+				 &amp;req, sizeof(req), false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7921_mcu_sta_add(struct mt7921_dev *dev, struct ieee80211_sta *sta,</div><div class='del'>-		       struct ieee80211_vif *vif, bool enable)</div><div class='add'>+int mt7921_mcu_sta_update(struct mt792x_dev *dev, struct ieee80211_sta *sta,</div><div class='add'>+			  struct ieee80211_vif *vif, bool enable,</div><div class='add'>+			  enum mt76_sta_info_state state)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_vif *mvif = (struct mt7921_vif *)vif-&gt;drv_priv;</div><div class='del'>-	int rssi = -ewma_rssi_read(&amp;mvif-&gt;rssi);</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	int rssi = -ewma_rssi_read(&amp;mvif-&gt;bss_conf.rssi);</div><div class='ctx'> 	struct mt76_sta_cmd_info info = {</div><div class='ctx'> 		.sta = sta,</div><div class='ctx'> 		.vif = vif,</div><div class='ctx'> 		.enable = enable,</div><div class='del'>-		.cmd = MCU_UNI_CMD_STA_REC_UPDATE,</div><div class='add'>+		.cmd = MCU_UNI_CMD(STA_REC_UPDATE),</div><div class='add'>+		.state = state,</div><div class='add'>+		.offload_fw = true,</div><div class='ctx'> 		.rcpi = to_rcpi(rssi),</div><div class='ctx'> 	};</div><div class='del'>-	struct mt7921_sta *msta;</div><div class='add'>+	struct mt792x_sta *msta;</div><div class='ctx'> </div><div class='del'>-	msta = sta ? (struct mt7921_sta *)sta-&gt;drv_priv : NULL;</div><div class='del'>-	info.wcid = msta ? &amp;msta-&gt;wcid : &amp;mvif-&gt;sta.wcid;</div><div class='add'>+	msta = sta ? (struct mt792x_sta *)sta-&gt;drv_priv : NULL;</div><div class='add'>+	info.wcid = msta ? &amp;msta-&gt;deflink.wcid : &amp;mvif-&gt;sta.deflink.wcid;</div><div class='add'>+	info.newly = msta ? state != MT76_STA_INFO_STATE_ASSOC : true;</div><div class='ctx'> </div><div class='del'>-	return mt76_connac_mcu_add_sta_cmd(&amp;dev-&gt;mphy, &amp;info);</div><div class='add'>+	return mt76_connac_mcu_sta_cmd(&amp;dev-&gt;mphy, &amp;info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7921_mcu_drv_pmctrl(struct mt7921_dev *dev)</div><div class='add'>+int mt7921_mcu_set_beacon_filter(struct mt792x_dev *dev,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 bool enable)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_phy *mphy = &amp;dev-&gt;mt76.phy;</div><div class='del'>-	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='del'>-	int i, err = 0;</div><div class='add'>+#define MT7921_FIF_BIT_CLR		BIT(1)</div><div class='add'>+#define MT7921_FIF_BIT_SET		BIT(0)</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;pm-&gt;mutex);</div><div class='add'>+	if (enable) {</div><div class='add'>+		err = mt7921_mcu_uni_bss_bcnft(dev, vif, true);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(MT76_STATE_PM, &amp;mphy-&gt;state))</div><div class='del'>-		goto out;</div><div class='add'>+		err = mt7921_mcu_set_rxfilter(dev, 0,</div><div class='add'>+					      MT7921_FIF_BIT_SET,</div><div class='add'>+					      MT_WF_RFCR_DROP_OTHER_BEACON);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MT7921_DRV_OWN_RETRY_COUNT; i++) {</div><div class='del'>-		mt76_wr(dev, MT_CONN_ON_LPCTL, PCIE_LPCR_HOST_CLR_OWN);</div><div class='del'>-		if (mt76_poll_msec(dev, MT_CONN_ON_LPCTL,</div><div class='del'>-				   PCIE_LPCR_HOST_OWN_SYNC, 0, 50))</div><div class='del'>-			break;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (i == MT7921_DRV_OWN_RETRY_COUNT) {</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "driver own failed\n");</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	err = mt7921_mcu_set_bss_pm(dev, vif, false);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	mt7921_wpdma_reinit_cond(dev);</div><div class='del'>-	clear_bit(MT76_STATE_PM, &amp;mphy-&gt;state);</div><div class='add'>+	err = mt7921_mcu_set_rxfilter(dev, 0,</div><div class='add'>+				      MT7921_FIF_BIT_CLR,</div><div class='add'>+				      MT_WF_RFCR_DROP_OTHER_BEACON);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	pm-&gt;stats.last_wake_event = jiffies;</div><div class='del'>-	pm-&gt;stats.doze_time += pm-&gt;stats.last_wake_event -</div><div class='del'>-			       pm-&gt;stats.last_doze_event;</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;pm-&gt;mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (err)</div><div class='del'>-		mt7921_reset(&amp;dev-&gt;mt76);</div><div class='add'>+int mt7921_get_txpwr_info(struct mt792x_dev *dev, struct mt7921_txpwr *txpwr)</div><div class='add'>+{</div><div class='add'>+	struct mt7921_txpwr_event *event;</div><div class='add'>+	struct mt7921_txpwr_req req = {</div><div class='add'>+		.dbdc_idx = 0,</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76, MCU_CE_CMD(GET_TXPWR),</div><div class='add'>+					&amp;req, sizeof(req), true, &amp;skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	event = (struct mt7921_txpwr_event *)skb-&gt;data;</div><div class='add'>+	WARN_ON(skb-&gt;len != le16_to_cpu(event-&gt;len));</div><div class='add'>+	memcpy(txpwr, &amp;event-&gt;txpwr, sizeof(event-&gt;txpwr));</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7921_mcu_fw_pmctrl(struct mt7921_dev *dev)</div><div class='add'>+int mt7921_mcu_set_sniffer(struct mt792x_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			   bool enable)</div><div class='ctx'> {</div><div class='del'>-	struct mt76_phy *mphy = &amp;dev-&gt;mt76.phy;</div><div class='del'>-	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='del'>-	int i, err = 0;</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 band_idx;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct sniffer_enable_tlv {</div><div class='add'>+			__le16 tag;</div><div class='add'>+			__le16 len;</div><div class='add'>+			u8 enable;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed enable;</div><div class='add'>+	} req = {</div><div class='add'>+		.hdr = {</div><div class='add'>+			.band_idx = mvif-&gt;band_idx,</div><div class='add'>+		},</div><div class='add'>+		.enable = {</div><div class='add'>+			.tag = cpu_to_le16(0),</div><div class='add'>+			.len = cpu_to_le16(sizeof(struct sniffer_enable_tlv)),</div><div class='add'>+			.enable = enable,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD(SNIFFER), &amp;req, sizeof(req),</div><div class='add'>+				 true);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;pm-&gt;mutex);</div><div class='add'>+int mt7921_mcu_config_sniffer(struct mt792x_vif *vif,</div><div class='add'>+			      struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct cfg80211_chan_def *chandef = &amp;ctx-&gt;def;</div><div class='add'>+	int freq1 = chandef-&gt;center_freq1, freq2 = chandef-&gt;center_freq2;</div><div class='add'>+	static const u8 ch_band[] = {</div><div class='add'>+		[NL80211_BAND_2GHZ] = 1,</div><div class='add'>+		[NL80211_BAND_5GHZ] = 2,</div><div class='add'>+		[NL80211_BAND_6GHZ] = 3,</div><div class='add'>+	};</div><div class='add'>+	static const u8 ch_width[] = {</div><div class='add'>+		[NL80211_CHAN_WIDTH_20_NOHT] = 0,</div><div class='add'>+		[NL80211_CHAN_WIDTH_20] = 0,</div><div class='add'>+		[NL80211_CHAN_WIDTH_40] = 0,</div><div class='add'>+		[NL80211_CHAN_WIDTH_80] = 1,</div><div class='add'>+		[NL80211_CHAN_WIDTH_160] = 2,</div><div class='add'>+		[NL80211_CHAN_WIDTH_80P80] = 3,</div><div class='add'>+		[NL80211_CHAN_WIDTH_5] = 4,</div><div class='add'>+		[NL80211_CHAN_WIDTH_10] = 5,</div><div class='add'>+		[NL80211_CHAN_WIDTH_320] = 6,</div><div class='add'>+	};</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 band_idx;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct config_tlv {</div><div class='add'>+			__le16 tag;</div><div class='add'>+			__le16 len;</div><div class='add'>+			u16 aid;</div><div class='add'>+			u8 ch_band;</div><div class='add'>+			u8 bw;</div><div class='add'>+			u8 control_ch;</div><div class='add'>+			u8 sco;</div><div class='add'>+			u8 center_ch;</div><div class='add'>+			u8 center_ch2;</div><div class='add'>+			u8 drop_err;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed tlv;</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.hdr = {</div><div class='add'>+			.band_idx = vif-&gt;bss_conf.mt76.band_idx,</div><div class='add'>+		},</div><div class='add'>+		.tlv = {</div><div class='add'>+			.tag = cpu_to_le16(1),</div><div class='add'>+			.len = cpu_to_le16(sizeof(req.tlv)),</div><div class='add'>+			.control_ch = chandef-&gt;chan-&gt;hw_value,</div><div class='add'>+			.center_ch = ieee80211_frequency_to_channel(freq1),</div><div class='add'>+			.drop_err = 1,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	if (chandef-&gt;chan-&gt;band &lt; ARRAY_SIZE(ch_band))</div><div class='add'>+		req.tlv.ch_band = ch_band[chandef-&gt;chan-&gt;band];</div><div class='add'>+	if (chandef-&gt;width &lt; ARRAY_SIZE(ch_width))</div><div class='add'>+		req.tlv.bw = ch_width[chandef-&gt;width];</div><div class='ctx'> </div><div class='del'>-	if (mt76_connac_skip_fw_pmctrl(mphy, pm))</div><div class='del'>-		goto out;</div><div class='add'>+	if (freq2)</div><div class='add'>+		req.tlv.center_ch2 = ieee80211_frequency_to_channel(freq2);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MT7921_DRV_OWN_RETRY_COUNT; i++) {</div><div class='del'>-		mt76_wr(dev, MT_CONN_ON_LPCTL, PCIE_LPCR_HOST_SET_OWN);</div><div class='del'>-		if (mt76_poll_msec(dev, MT_CONN_ON_LPCTL,</div><div class='del'>-				   PCIE_LPCR_HOST_OWN_SYNC, 4, 50))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='add'>+	if (req.tlv.control_ch &lt; req.tlv.center_ch)</div><div class='add'>+		req.tlv.sco = 1; /* SCA */</div><div class='add'>+	else if (req.tlv.control_ch &gt; req.tlv.center_ch)</div><div class='add'>+		req.tlv.sco = 3; /* SCB */</div><div class='ctx'> </div><div class='del'>-	if (i == MT7921_DRV_OWN_RETRY_COUNT) {</div><div class='del'>-		dev_err(dev-&gt;mt76.dev, "firmware own failed\n");</div><div class='del'>-		clear_bit(MT76_STATE_PM, &amp;mphy-&gt;state);</div><div class='del'>-		err = -EIO;</div><div class='add'>+	return mt76_mcu_send_msg(vif-&gt;phy-&gt;mt76-&gt;dev, MCU_UNI_CMD(SNIFFER),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+mt7921_mcu_uni_add_beacon_offload(struct mt792x_dev *dev,</div><div class='add'>+				  struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  bool enable)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_wcid *wcid = &amp;dev-&gt;mt76.global_wcid;</div><div class='add'>+	struct ieee80211_mutable_offsets offs;</div><div class='add'>+	struct {</div><div class='add'>+		struct req_hdr {</div><div class='add'>+			u8 bss_idx;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct bcn_content_tlv {</div><div class='add'>+			__le16 tag;</div><div class='add'>+			__le16 len;</div><div class='add'>+			__le16 tim_ie_pos;</div><div class='add'>+			__le16 csa_ie_pos;</div><div class='add'>+			__le16 bcc_ie_pos;</div><div class='add'>+			/* 0: disable beacon offload</div><div class='add'>+			 * 1: enable beacon offload</div><div class='add'>+			 * 2: update probe respond offload</div><div class='add'>+			 */</div><div class='add'>+			u8 enable;</div><div class='add'>+			/* 0: legacy format (TXD + payload)</div><div class='add'>+			 * 1: only cap field IE</div><div class='add'>+			 */</div><div class='add'>+			u8 type;</div><div class='add'>+			__le16 pkt_len;</div><div class='add'>+			u8 pkt[512];</div><div class='add'>+		} __packed beacon_tlv;</div><div class='add'>+	} req = {</div><div class='add'>+		.hdr = {</div><div class='add'>+			.bss_idx = mvif-&gt;bss_conf.mt76.idx,</div><div class='add'>+		},</div><div class='add'>+		.beacon_tlv = {</div><div class='add'>+			.tag = cpu_to_le16(UNI_BSS_INFO_BCN_CONTENT),</div><div class='add'>+			.len = cpu_to_le16(sizeof(struct bcn_content_tlv)),</div><div class='add'>+			.enable = enable,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	/* support enable/update process only</div><div class='add'>+	 * disable flow would be handled in bss stop handler automatically</div><div class='add'>+	 */</div><div class='add'>+	if (!enable)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	skb = ieee80211_beacon_get_template(mt76_hw(dev), vif, &amp;offs, 0);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &gt; 512 - MT_TXD_SIZE) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "beacon size limit exceed\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pm-&gt;stats.last_doze_event = jiffies;</div><div class='del'>-	pm-&gt;stats.awake_time += pm-&gt;stats.last_doze_event -</div><div class='del'>-				pm-&gt;stats.last_wake_event;</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;pm-&gt;mutex);</div><div class='add'>+	mt76_connac2_mac_write_txwi(&amp;dev-&gt;mt76, (__le32 *)(req.beacon_tlv.pkt),</div><div class='add'>+				    skb, wcid, NULL, 0, 0, BSS_CHANGED_BEACON);</div><div class='add'>+	memcpy(req.beacon_tlv.pkt + MT_TXD_SIZE, skb-&gt;data, skb-&gt;len);</div><div class='add'>+	req.beacon_tlv.pkt_len = cpu_to_le16(MT_TXD_SIZE + skb-&gt;len);</div><div class='add'>+	req.beacon_tlv.tim_ie_pos = cpu_to_le16(MT_TXD_SIZE + offs.tim_offset);</div><div class='ctx'> </div><div class='del'>-	if (err)</div><div class='del'>-		mt7921_reset(&amp;dev-&gt;mt76);</div><div class='add'>+	if (offs.cntdwn_counter_offs[0]) {</div><div class='add'>+		u16 csa_offs;</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+		csa_offs = MT_TXD_SIZE + offs.cntdwn_counter_offs[0] - 4;</div><div class='add'>+		req.beacon_tlv.csa_ie_pos = cpu_to_le16(csa_offs);</div><div class='add'>+	}</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD(BSS_INFO_UPDATE),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void</div><div class='del'>-mt7921_pm_interface_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='add'>+static</div><div class='add'>+int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,</div><div class='add'>+			 enum environment_cap env_cap,</div><div class='add'>+			 struct mt7921_clc *clc,</div><div class='add'>+			 u8 idx)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_phy *phy = priv;</div><div class='del'>-	struct mt7921_dev *dev = phy-&gt;dev;</div><div class='del'>-	int ret;</div><div class='add'>+#define CLC_CAP_EVT_EN BIT(0)</div><div class='add'>+#define CLC_CAP_DTS_EN BIT(1)</div><div class='add'>+	struct sk_buff *skb, *ret_skb = NULL;</div><div class='add'>+	struct {</div><div class='add'>+		u8 ver;</div><div class='add'>+		u8 pad0;</div><div class='add'>+		__le16 len;</div><div class='add'>+		u8 idx;</div><div class='add'>+		u8 env;</div><div class='add'>+		u8 acpi_conf;</div><div class='add'>+		u8 cap;</div><div class='add'>+		u8 alpha2[2];</div><div class='add'>+		u8 type[2];</div><div class='add'>+		u8 env_6g;</div><div class='add'>+		u8 mtcl_conf;</div><div class='add'>+		u8 rsvd[62];</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.ver = 1,</div><div class='add'>+		.idx = idx,</div><div class='add'>+		.env = env_cap,</div><div class='add'>+		.env_6g = dev-&gt;phy.power_type,</div><div class='add'>+		.acpi_conf = mt792x_acpi_get_flags(&amp;dev-&gt;phy),</div><div class='add'>+		.mtcl_conf = mt792x_acpi_get_mtcl_conf(&amp;dev-&gt;phy, alpha2),</div><div class='add'>+	};</div><div class='add'>+	int ret, valid_cnt = 0;</div><div class='add'>+	u32 buf_len = 0;</div><div class='add'>+	u8 *pos;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;pm.enable)</div><div class='del'>-		ret = mt7921_mcu_uni_bss_bcnft(dev, vif, true);</div><div class='del'>-	else</div><div class='del'>-		ret = mt7921_mcu_set_bss_pm(dev, vif, false);</div><div class='add'>+	if (!clc)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	if (ret)</div><div class='del'>-		return;</div><div class='add'>+	if (dev-&gt;phy.chip_cap &amp; MT792x_CHIP_CAP_CLC_EVT_EN)</div><div class='add'>+		req.cap |= CLC_CAP_EVT_EN;</div><div class='add'>+	if (mt76_find_power_limits_node(&amp;dev-&gt;mt76))</div><div class='add'>+		req.cap |= CLC_CAP_DTS_EN;</div><div class='add'>+</div><div class='add'>+	buf_len = le32_to_cpu(clc-&gt;len) - sizeof(*clc);</div><div class='add'>+	pos = clc-&gt;data;</div><div class='add'>+	while (buf_len &gt; 16) {</div><div class='add'>+		struct mt7921_clc_rule *rule = (struct mt7921_clc_rule *)pos;</div><div class='add'>+		u16 len = le16_to_cpu(rule-&gt;len);</div><div class='add'>+		u16 offset = len + sizeof(*rule);</div><div class='add'>+</div><div class='add'>+		pos += offset;</div><div class='add'>+		buf_len -= offset;</div><div class='add'>+		if (rule-&gt;alpha2[0] != alpha2[0] ||</div><div class='add'>+		    rule-&gt;alpha2[1] != alpha2[1])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		memcpy(req.alpha2, rule-&gt;alpha2, 2);</div><div class='add'>+		memcpy(req.type, rule-&gt;type, 2);</div><div class='add'>+</div><div class='add'>+		req.len = cpu_to_le16(sizeof(req) + len);</div><div class='add'>+		skb = __mt76_mcu_msg_alloc(&amp;dev-&gt;mt76, &amp;req,</div><div class='add'>+					   le16_to_cpu(req.len),</div><div class='add'>+					   sizeof(req), GFP_KERNEL);</div><div class='add'>+		if (!skb)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		skb_put_data(skb, rule-&gt;data, len);</div><div class='add'>+</div><div class='add'>+		ret = mt76_mcu_skb_send_and_get_msg(&amp;dev-&gt;mt76, skb,</div><div class='add'>+						    MCU_CE_CMD(SET_CLC),</div><div class='add'>+						    !!(req.cap &amp; CLC_CAP_EVT_EN),</div><div class='add'>+						    &amp;ret_skb);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (ret_skb) {</div><div class='add'>+			struct mt7921_clc_info_tlv *info;</div><div class='add'>+</div><div class='add'>+			info = (struct mt7921_clc_info_tlv *)(ret_skb-&gt;data + 4);</div><div class='add'>+			dev-&gt;phy.clc_chan_conf = info-&gt;chan_conf;</div><div class='add'>+			dev_kfree_skb(ret_skb);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;pm.enable) {</div><div class='del'>-		vif-&gt;driver_flags |= IEEE80211_VIF_BEACON_FILTER;</div><div class='del'>-		mt76_set(dev, MT_WF_RFCR(0), MT_WF_RFCR_DROP_OTHER_BEACON);</div><div class='del'>-	} else {</div><div class='del'>-		vif-&gt;driver_flags &amp;= ~IEEE80211_VIF_BEACON_FILTER;</div><div class='del'>-		mt76_clear(dev, MT_WF_RFCR(0), MT_WF_RFCR_DROP_OTHER_BEACON);</div><div class='add'>+		valid_cnt++;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (!valid_cnt)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mt7921_get_txpwr_info(struct mt7921_dev *dev, struct mt7921_txpwr *txpwr)</div><div class='add'>+int mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,</div><div class='add'>+		       enum environment_cap env_cap)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_txpwr_event *event;</div><div class='del'>-	struct mt7921_txpwr_req req = {</div><div class='del'>-		.dbdc_idx = 0,</div><div class='add'>+	struct mt792x_phy *phy = (struct mt792x_phy *)&amp;dev-&gt;phy;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	/* submit all clc config */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(phy-&gt;clc); i++) {</div><div class='add'>+		ret = __mt7921_mcu_set_clc(dev, alpha2, env_cap,</div><div class='add'>+					   phy-&gt;clc[i], i);</div><div class='add'>+</div><div class='add'>+		/* If no country found, set "00" as default */</div><div class='add'>+		if (ret == -ENOENT)</div><div class='add'>+			ret = __mt7921_mcu_set_clc(dev, "00",</div><div class='add'>+						   ENVIRON_INDOOR,</div><div class='add'>+						   phy-&gt;clc[i], i);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7921_mcu_get_temperature(struct mt792x_phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct {</div><div class='add'>+		u8 ctrl_id;</div><div class='add'>+		u8 action;</div><div class='add'>+		u8 band_idx;</div><div class='add'>+		u8 rsv[5];</div><div class='add'>+	} req = {</div><div class='add'>+		.ctrl_id = THERMAL_SENSOR_TEMP_QUERY,</div><div class='add'>+		.band_idx = phy-&gt;mt76-&gt;band_idx,</div><div class='ctx'> 	};</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76, MCU_CMD_GET_TXPWR,</div><div class='del'>-					&amp;req, sizeof(req), true, &amp;skb);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(THERMAL_CTRL), &amp;req,</div><div class='add'>+				 sizeof(req), true);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	event = (struct mt7921_txpwr_event *)skb-&gt;data;</div><div class='del'>-	WARN_ON(skb-&gt;len != le16_to_cpu(event-&gt;len));</div><div class='del'>-	memcpy(txpwr, &amp;event-&gt;txpwr, sizeof(event-&gt;txpwr));</div><div class='add'>+int mt7921_mcu_wf_rf_pin_ctrl(struct mt792x_phy *phy, u8 action)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct {</div><div class='add'>+		u8 action;</div><div class='add'>+		u8 value;</div><div class='add'>+	} req = {</div><div class='add'>+		.action = action,</div><div class='add'>+		.value = 0,</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-	dev_kfree_skb(skb);</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_EXT_CMD(WF_RF_PIN_CTRL), &amp;req,</div><div class='add'>+				 sizeof(req), action ? true : false);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+int mt7921_mcu_set_rxfilter(struct mt792x_dev *dev, u32 fif,</div><div class='add'>+			    u8 bit_op, u32 bit_map)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		u8 rsv[4];</div><div class='add'>+		u8 mode;</div><div class='add'>+		u8 rsv2[3];</div><div class='add'>+		__le32 fif;</div><div class='add'>+		__le32 bit_map; /* bit_* for bitmap update */</div><div class='add'>+		u8 bit_op;</div><div class='add'>+		u8 pad[51];</div><div class='add'>+	} __packed data = {</div><div class='add'>+		.mode = fif ? 1 : 2,</div><div class='add'>+		.fif = cpu_to_le32(fif),</div><div class='add'>+		.bit_map = cpu_to_le32(bit_map),</div><div class='add'>+		.bit_op = bit_op,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_CE_CMD(SET_RX_FILTER),</div><div class='add'>+				 &amp;data, sizeof(data), false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7921_mcu_set_rssimonitor(struct mt792x_dev *dev, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct {</div><div class='add'>+		u8 enable;</div><div class='add'>+		s8 cqm_rssi_high;</div><div class='add'>+		s8 cqm_rssi_low;</div><div class='add'>+		u8 bss_idx;</div><div class='add'>+		u16 duration;</div><div class='add'>+		u8 rsv2[2];</div><div class='add'>+	} __packed data = {</div><div class='add'>+		.enable = vif-&gt;cfg.assoc,</div><div class='add'>+		.cqm_rssi_high = vif-&gt;bss_conf.cqm_rssi_thold + vif-&gt;bss_conf.cqm_rssi_hyst,</div><div class='add'>+		.cqm_rssi_low = vif-&gt;bss_conf.cqm_rssi_thold - vif-&gt;bss_conf.cqm_rssi_hyst,</div><div class='add'>+		.bss_idx = mvif-&gt;bss_conf.mt76.idx,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_CE_CMD(RSSI_MONITOR),</div><div class='add'>+				 &amp;data, sizeof(data), false);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h<br/>index 49823d0a3d0a..de676b83b89c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/mcu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7921/mcu.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MT7921_MCU_H</div><div class='hunk'>@@ -6,114 +6,42 @@</div><div class='ctx'> </div><div class='ctx'> #include "../mt76_connac_mcu.h"</div><div class='ctx'> </div><div class='del'>-struct mt7921_mcu_txd {</div><div class='del'>-	__le32 txd[8];</div><div class='add'>+struct mt7921_mcu_tx_done_event {</div><div class='add'>+	u8 pid;</div><div class='add'>+	u8 status;</div><div class='add'>+	__le16 seq;</div><div class='ctx'> </div><div class='del'>-	__le16 len;</div><div class='del'>-	__le16 pq_id;</div><div class='del'>-</div><div class='del'>-	u8 cid;</div><div class='del'>-	u8 pkt_type;</div><div class='del'>-	u8 set_query; /* FW don't care */</div><div class='del'>-	u8 seq;</div><div class='del'>-</div><div class='del'>-	u8 uc_d2b0_rev;</div><div class='del'>-	u8 ext_cid;</div><div class='del'>-	u8 s2d_index;</div><div class='del'>-	u8 ext_cid_ack;</div><div class='del'>-</div><div class='del'>-	u32 reserved[5];</div><div class='del'>-} __packed __aligned(4);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct mt7921_uni_txd - mcu command descriptor for firmware v3</div><div class='del'>- * @txd: hardware descriptor</div><div class='del'>- * @len: total length not including txd</div><div class='del'>- * @cid: command identifier</div><div class='del'>- * @pkt_type: must be 0xa0 (cmd packet by long format)</div><div class='del'>- * @frag_n: fragment number</div><div class='del'>- * @seq: sequence number</div><div class='del'>- * @checksum: 0 mean there is no checksum</div><div class='del'>- * @s2d_index: index for command source and destination</div><div class='del'>- *  Definition              | value | note</div><div class='del'>- *  CMD_S2D_IDX_H2N         | 0x00  | command from HOST to WM</div><div class='del'>- *  CMD_S2D_IDX_C2N         | 0x01  | command from WA to WM</div><div class='del'>- *  CMD_S2D_IDX_H2C         | 0x02  | command from HOST to WA</div><div class='del'>- *  CMD_S2D_IDX_H2N_AND_H2C | 0x03  | command from HOST to WA and WM</div><div class='del'>- *</div><div class='del'>- * @option: command option</div><div class='del'>- *  BIT[0]: UNI_CMD_OPT_BIT_ACK</div><div class='del'>- *          set to 1 to request a fw reply</div><div class='del'>- *          if UNI_CMD_OPT_BIT_0_ACK is set and UNI_CMD_OPT_BIT_2_SET_QUERY</div><div class='del'>- *          is set, mcu firmware will send response event EID = 0x01</div><div class='del'>- *          (UNI_EVENT_ID_CMD_RESULT) to the host.</div><div class='del'>- *  BIT[1]: UNI_CMD_OPT_BIT_UNI_CMD</div><div class='del'>- *          0: original command</div><div class='del'>- *          1: unified command</div><div class='del'>- *  BIT[2]: UNI_CMD_OPT_BIT_SET_QUERY</div><div class='del'>- *          0: QUERY command</div><div class='del'>- *          1: SET command</div><div class='del'>- */</div><div class='del'>-struct mt7921_uni_txd {</div><div class='del'>-	__le32 txd[8];</div><div class='del'>-</div><div class='del'>-	/* DW1 */</div><div class='del'>-	__le16 len;</div><div class='del'>-	__le16 cid;</div><div class='add'>+	u8 wlan_idx;</div><div class='add'>+	u8 tx_cnt;</div><div class='add'>+	__le16 tx_rate;</div><div class='ctx'> </div><div class='del'>-	/* DW2 */</div><div class='del'>-	u8 reserved;</div><div class='del'>-	u8 pkt_type;</div><div class='del'>-	u8 frag_n;</div><div class='del'>-	u8 seq;</div><div class='add'>+	u8 flag;</div><div class='add'>+	u8 tid;</div><div class='add'>+	u8 rsp_rate;</div><div class='add'>+	u8 mcs;</div><div class='ctx'> </div><div class='del'>-	/* DW3 */</div><div class='del'>-	__le16 checksum;</div><div class='del'>-	u8 s2d_index;</div><div class='del'>-	u8 option;</div><div class='add'>+	u8 bw;</div><div class='add'>+	u8 tx_pwr;</div><div class='add'>+	u8 reason;</div><div class='add'>+	u8 rsv0[1];</div><div class='ctx'> </div><div class='del'>-	/* DW4 */</div><div class='del'>-	u8 reserved2[4];</div><div class='del'>-} __packed __aligned(4);</div><div class='add'>+	__le32 delay;</div><div class='add'>+	__le32 timestamp;</div><div class='add'>+	__le32 applied_flag;</div><div class='add'>+	u8 txs[28];</div><div class='ctx'> </div><div class='del'>-/* event table */</div><div class='del'>-enum {</div><div class='del'>-	MCU_EVENT_REG_ACCESS = 0x05,</div><div class='del'>-	MCU_EVENT_LP_INFO = 0x07,</div><div class='del'>-	MCU_EVENT_SCAN_DONE = 0x0d,</div><div class='del'>-	MCU_EVENT_BSS_ABSENCE  = 0x11,</div><div class='del'>-	MCU_EVENT_BSS_BEACON_LOSS = 0x13,</div><div class='del'>-	MCU_EVENT_CH_PRIVILEGE = 0x18,</div><div class='del'>-	MCU_EVENT_SCHED_SCAN_DONE = 0x23,</div><div class='del'>-	MCU_EVENT_DBG_MSG = 0x27,</div><div class='del'>-	MCU_EVENT_TXPWR = 0xd0,</div><div class='del'>-	MCU_EVENT_COREDUMP = 0xf0,</div><div class='del'>-};</div><div class='add'>+	u8 rsv1[32];</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> /* ext event table */</div><div class='ctx'> enum {</div><div class='ctx'> 	MCU_EXT_EVENT_RATE_REPORT = 0x87,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mt7921_mcu_rxd {</div><div class='del'>-	__le32 rxd[6];</div><div class='del'>-</div><div class='del'>-	__le16 len;</div><div class='del'>-	__le16 pkt_type_id;</div><div class='del'>-</div><div class='del'>-	u8 eid;</div><div class='del'>-	u8 seq;</div><div class='del'>-	__le16 __rsv;</div><div class='del'>-</div><div class='del'>-	u8 ext_eid;</div><div class='del'>-	u8 __rsv1[2];</div><div class='del'>-	u8 s2d_index;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct mt7921_mcu_eeprom_info {</div><div class='ctx'> 	__le32 addr;</div><div class='ctx'> 	__le32 valid;</div><div class='del'>-	u8 data[16];</div><div class='add'>+	u8 data[MT7921_EEPROM_BLOCK_SIZE];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define MT_RA_RATE_NSS			GENMASK(8, 6)</div><div class='hunk'>@@ -122,289 +50,71 @@ struct mt7921_mcu_eeprom_info {</div><div class='ctx'> #define MT_RA_RATE_DCM_EN		BIT(4)</div><div class='ctx'> #define MT_RA_RATE_BW			GENMASK(14, 13)</div><div class='ctx'> </div><div class='del'>-#define MCU_PQ_ID(p, q)			(((p) &lt;&lt; 15) | ((q) &lt;&lt; 10))</div><div class='del'>-#define MCU_PKT_ID			0xa0</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	MCU_Q_QUERY,</div><div class='del'>-	MCU_Q_SET,</div><div class='del'>-	MCU_Q_RESERVED,</div><div class='del'>-	MCU_Q_NA</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> enum {</div><div class='del'>-	MCU_S2D_H2N,</div><div class='del'>-	MCU_S2D_C2N,</div><div class='del'>-	MCU_S2D_H2C,</div><div class='del'>-	MCU_S2D_H2CN</div><div class='add'>+	MT_EBF = BIT(0),	/* explicit beamforming */</div><div class='add'>+	MT_IBF = BIT(1)		/* implicit beamforming */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mt7921_mcu_uni_event {</div><div class='del'>-	u8 cid;</div><div class='del'>-	u8 pad[3];</div><div class='del'>-	__le32 status; /* 0: success, others: fail */</div><div class='add'>+struct mt7921_mcu_ant_id_config {</div><div class='add'>+	u8 ant_id[4];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-enum {</div><div class='del'>-	PATCH_NOT_DL_SEM_FAIL,</div><div class='del'>-	PATCH_IS_DL,</div><div class='del'>-	PATCH_NOT_DL_SEM_SUCCESS,</div><div class='del'>-	PATCH_REL_SEM_SUCCESS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	FW_STATE_INITIAL,</div><div class='del'>-	FW_STATE_FW_DOWNLOAD,</div><div class='del'>-	FW_STATE_NORMAL_OPERATION,</div><div class='del'>-	FW_STATE_NORMAL_TRX,</div><div class='del'>-	FW_STATE_WACPU_RDY        = 7</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	EE_MODE_EFUSE,</div><div class='del'>-	EE_MODE_BUFFER,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	EE_FORMAT_BIN,</div><div class='del'>-	EE_FORMAT_WHOLE,</div><div class='del'>-	EE_FORMAT_MULTIPLE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	MCU_PHY_STATE_TX_RATE,</div><div class='del'>-	MCU_PHY_STATE_RX_RATE,</div><div class='del'>-	MCU_PHY_STATE_RSSI,</div><div class='del'>-	MCU_PHY_STATE_CONTENTION_RX_RATE,</div><div class='del'>-	MCU_PHY_STATE_OFDMLQ_CNINFO,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct sec_key {</div><div class='del'>-	u8 cipher_id;</div><div class='del'>-	u8 cipher_len;</div><div class='del'>-	u8 key_id;</div><div class='del'>-	u8 key_len;</div><div class='del'>-	u8 key[32];</div><div class='add'>+struct mt7921_txpwr_req {</div><div class='add'>+	u8 ver;</div><div class='add'>+	u8 action;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 dbdc_idx;</div><div class='add'>+	u8 rsv[3];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct sta_rec_sec {</div><div class='del'>-	__le16 tag;</div><div class='add'>+struct mt7921_txpwr_event {</div><div class='add'>+	u8 ver;</div><div class='add'>+	u8 action;</div><div class='ctx'> 	__le16 len;</div><div class='del'>-	u8 add;</div><div class='del'>-	u8 n_cipher;</div><div class='del'>-	u8 rsv[2];</div><div class='del'>-</div><div class='del'>-	struct sec_key key[2];</div><div class='add'>+	struct mt7921_txpwr txpwr;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-enum mt7921_cipher_type {</div><div class='del'>-	MT_CIPHER_NONE,</div><div class='del'>-	MT_CIPHER_WEP40,</div><div class='del'>-	MT_CIPHER_WEP104,</div><div class='del'>-	MT_CIPHER_WEP128,</div><div class='del'>-	MT_CIPHER_TKIP,</div><div class='del'>-	MT_CIPHER_AES_CCMP,</div><div class='del'>-	MT_CIPHER_CCMP_256,</div><div class='del'>-	MT_CIPHER_GCMP,</div><div class='del'>-	MT_CIPHER_GCMP_256,</div><div class='del'>-	MT_CIPHER_WAPI,</div><div class='del'>-	MT_CIPHER_BIP_CMAC_128,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CH_SWITCH_NORMAL = 0,</div><div class='del'>-	CH_SWITCH_SCAN = 3,</div><div class='del'>-	CH_SWITCH_MCC = 4,</div><div class='del'>-	CH_SWITCH_DFS = 5,</div><div class='del'>-	CH_SWITCH_BACKGROUND_SCAN_START = 6,</div><div class='del'>-	CH_SWITCH_BACKGROUND_SCAN_RUNNING = 7,</div><div class='del'>-	CH_SWITCH_BACKGROUND_SCAN_STOP = 8,</div><div class='del'>-	CH_SWITCH_SCAN_BYPASS_DPD = 9</div><div class='del'>-};</div><div class='add'>+struct mt7921_wf_rf_pin_ctrl_event {</div><div class='add'>+	u8 result;</div><div class='add'>+	u8 value;</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	THERMAL_SENSOR_TEMP_QUERY,</div><div class='del'>-	THERMAL_SENSOR_MANUAL_CTRL,</div><div class='del'>-	THERMAL_SENSOR_INFO_QUERY,</div><div class='del'>-	THERMAL_SENSOR_TASK_CTRL,</div><div class='add'>+	TM_SWITCH_MODE,</div><div class='add'>+	TM_SET_AT_CMD,</div><div class='add'>+	TM_QUERY_AT_CMD,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	MT_EBF = BIT(0),	/* explicit beamforming */</div><div class='del'>-	MT_IBF = BIT(1)		/* implicit beamforming */</div><div class='add'>+	MT7921_TM_NORMAL,</div><div class='add'>+	MT7921_TM_TESTMODE,</div><div class='add'>+	MT7921_TM_ICAP,</div><div class='add'>+	MT7921_TM_ICAP_OVERLAP,</div><div class='add'>+	MT7921_TM_WIFISPECTRUM,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define STA_CAP_WMM			BIT(0)</div><div class='del'>-#define STA_CAP_SGI_20			BIT(4)</div><div class='del'>-#define STA_CAP_SGI_40			BIT(5)</div><div class='del'>-#define STA_CAP_TX_STBC			BIT(6)</div><div class='del'>-#define STA_CAP_RX_STBC			BIT(7)</div><div class='del'>-#define STA_CAP_VHT_SGI_80		BIT(16)</div><div class='del'>-#define STA_CAP_VHT_SGI_160		BIT(17)</div><div class='del'>-#define STA_CAP_VHT_TX_STBC		BIT(18)</div><div class='del'>-#define STA_CAP_VHT_RX_STBC		BIT(19)</div><div class='del'>-#define STA_CAP_VHT_LDPC		BIT(23)</div><div class='del'>-#define STA_CAP_LDPC			BIT(24)</div><div class='del'>-#define STA_CAP_HT			BIT(26)</div><div class='del'>-#define STA_CAP_VHT			BIT(27)</div><div class='del'>-#define STA_CAP_HE			BIT(28)</div><div class='del'>-</div><div class='del'>-struct mt7921_mcu_reg_event {</div><div class='del'>-	__le32 reg;</div><div class='del'>-	__le32 val;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct mt7921_mcu_tx_config {</div><div class='del'>-	u8 peer_addr[ETH_ALEN];</div><div class='del'>-	u8 sw;</div><div class='del'>-	u8 dis_rx_hdr_tran;</div><div class='del'>-</div><div class='del'>-	u8 aad_om;</div><div class='del'>-	u8 pfmu_idx;</div><div class='del'>-	__le16 partial_aid;</div><div class='del'>-</div><div class='del'>-	u8 ibf;</div><div class='del'>-	u8 ebf;</div><div class='del'>-	u8 is_ht;</div><div class='del'>-	u8 is_vht;</div><div class='del'>-</div><div class='del'>-	u8 mesh;</div><div class='del'>-	u8 baf_en;</div><div class='del'>-	u8 cf_ack;</div><div class='del'>-	u8 rdg_ba;</div><div class='del'>-</div><div class='del'>-	u8 rdg;</div><div class='del'>-	u8 pm;</div><div class='del'>-	u8 rts;</div><div class='del'>-	u8 smps;</div><div class='del'>-</div><div class='del'>-	u8 txop_ps;</div><div class='del'>-	u8 not_update_ipsm;</div><div class='del'>-	u8 skip_tx;</div><div class='del'>-	u8 ldpc;</div><div class='del'>-</div><div class='del'>-	u8 qos;</div><div class='del'>-	u8 from_ds;</div><div class='del'>-	u8 to_ds;</div><div class='del'>-	u8 dyn_bw;</div><div class='del'>-</div><div class='del'>-	u8 amdsu_cross_lg;</div><div class='del'>-	u8 check_per;</div><div class='del'>-	u8 gid_63;</div><div class='del'>-	u8 he;</div><div class='del'>-</div><div class='del'>-	u8 vht_ibf;</div><div class='del'>-	u8 vht_ebf;</div><div class='del'>-	u8 vht_ldpc;</div><div class='del'>-	u8 he_ldpc;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct mt7921_mcu_sec_config {</div><div class='del'>-	u8 wpi_flag;</div><div class='del'>-	u8 rv;</div><div class='del'>-	u8 ikv;</div><div class='del'>-	u8 rkv;</div><div class='del'>-</div><div class='del'>-	u8 rcid;</div><div class='del'>-	u8 rca1;</div><div class='del'>-	u8 rca2;</div><div class='del'>-	u8 even_pn;</div><div class='del'>-</div><div class='del'>-	u8 key_id;</div><div class='del'>-	u8 muar_idx;</div><div class='del'>-	u8 cipher_suit;</div><div class='del'>-	u8 rsv[1];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct mt7921_mcu_key_config {</div><div class='del'>-	u8 key[32];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct mt7921_mcu_rate_info {</div><div class='del'>-	u8 mpdu_fail;</div><div class='del'>-	u8 mpdu_tx;</div><div class='del'>-	u8 rate_idx;</div><div class='del'>-	u8 rsv[1];</div><div class='del'>-	__le16 rate[8];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct mt7921_mcu_ba_config {</div><div class='del'>-	u8 ba_en;</div><div class='add'>+struct mt7921_rftest_cmd {</div><div class='add'>+	u8 action;</div><div class='ctx'> 	u8 rsv[3];</div><div class='del'>-	__le32 ba_winsize;</div><div class='add'>+	__le32 param0;</div><div class='add'>+	__le32 param1;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct mt7921_mcu_ant_id_config {</div><div class='del'>-	u8 ant_id[4];</div><div class='add'>+struct mt7921_rftest_evt {</div><div class='add'>+	__le32 param0;</div><div class='add'>+	__le32 param1;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct mt7921_mcu_peer_cap {</div><div class='del'>-	struct mt7921_mcu_ant_id_config ant_id_config;</div><div class='del'>-</div><div class='del'>-	u8 power_offset;</div><div class='del'>-	u8 bw_selector;</div><div class='del'>-	u8 change_bw_rate_n;</div><div class='del'>-	u8 bw;</div><div class='del'>-	u8 spe_idx;</div><div class='del'>-</div><div class='del'>-	u8 g2;</div><div class='del'>-	u8 g4;</div><div class='del'>-	u8 g8;</div><div class='del'>-	u8 g16;</div><div class='del'>-</div><div class='del'>-	u8 mmss;</div><div class='del'>-	u8 ampdu_factor;</div><div class='del'>-	u8 rsv[1];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct mt7921_mcu_rx_cnt {</div><div class='del'>-	u8 rx_rcpi[4];</div><div class='del'>-	u8 rx_cc[4];</div><div class='del'>-	u8 rx_cc_sel;</div><div class='del'>-	u8 ce_rmsd;</div><div class='del'>-	u8 rsv[2];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct mt7921_mcu_tx_cnt {</div><div class='del'>-	__le16 rate1_cnt;</div><div class='del'>-	__le16 rate1_fail_cnt;</div><div class='del'>-	__le16 rate2_cnt;</div><div class='del'>-	__le16 rate3_cnt;</div><div class='del'>-	__le16 cur_bw_tx_cnt;</div><div class='del'>-	__le16 cur_bw_tx_fail_cnt;</div><div class='del'>-	__le16 other_bw_tx_cnt;</div><div class='del'>-	__le16 other_bw_tx_fail_cnt;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct mt7921_mcu_wlan_info_event {</div><div class='del'>-	struct mt7921_mcu_tx_config tx_config;</div><div class='del'>-	struct mt7921_mcu_sec_config sec_config;</div><div class='del'>-	struct mt7921_mcu_key_config key_config;</div><div class='del'>-	struct mt7921_mcu_rate_info rate_info;</div><div class='del'>-	struct mt7921_mcu_ba_config ba_config;</div><div class='del'>-	struct mt7921_mcu_peer_cap peer_cap;</div><div class='del'>-	struct mt7921_mcu_rx_cnt rx_cnt;</div><div class='del'>-	struct mt7921_mcu_tx_cnt tx_cnt;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct mt7921_mcu_wlan_info {</div><div class='del'>-	__le32 wlan_idx;</div><div class='del'>-	struct mt7921_mcu_wlan_info_event event;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct mt7921_txpwr_req {</div><div class='del'>-	u8 ver;</div><div class='del'>-	u8 action;</div><div class='add'>+struct mt7921_clc_info_tlv {</div><div class='add'>+	__le16 tag;</div><div class='ctx'> 	__le16 len;</div><div class='del'>-	u8 dbdc_idx;</div><div class='del'>-	u8 rsv[3];</div><div class='del'>-} __packed;</div><div class='ctx'> </div><div class='del'>-struct mt7921_txpwr_event {</div><div class='del'>-	u8 ver;</div><div class='del'>-	u8 action;</div><div class='del'>-	__le16 len;</div><div class='del'>-	struct mt7921_txpwr txpwr;</div><div class='add'>+	u8 chan_conf; /* BIT(0) : Enable UNII-4</div><div class='add'>+		       * BIT(1) : Enable UNII-5</div><div class='add'>+		       * BIT(2) : Enable UNII-6</div><div class='add'>+		       * BIT(3) : Enable UNII-7</div><div class='add'>+		       * BIT(4) : Enable UNII-8</div><div class='add'>+		       */</div><div class='add'>+	u8 rsv[63];</div><div class='ctx'> } __packed;</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h<br/>index 59862ea4951c..83fc7f49ff84 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h</a></div><div class='hunk'>@@ -1,171 +1,156 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MT7921_H</div><div class='ctx'> #define __MT7921_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/ktime.h&gt;</div><div class='del'>-#include "../mt76_connac_mcu.h"</div><div class='add'>+#include "../mt792x.h"</div><div class='ctx'> #include "regs.h"</div><div class='ctx'> </div><div class='del'>-#define MT7921_MAX_INTERFACES		4</div><div class='del'>-#define MT7921_MAX_WMM_SETS		4</div><div class='del'>-#define MT7921_WTBL_SIZE		20</div><div class='del'>-#define MT7921_WTBL_RESERVED		(MT7921_WTBL_SIZE - 1)</div><div class='del'>-#define MT7921_WTBL_STA			(MT7921_WTBL_RESERVED - \</div><div class='del'>-					 MT7921_MAX_INTERFACES)</div><div class='del'>-</div><div class='del'>-#define MT7921_PM_TIMEOUT		(HZ / 12)</div><div class='del'>-#define MT7921_HW_SCAN_TIMEOUT		(HZ / 10)</div><div class='del'>-#define MT7921_WATCHDOG_TIME		(HZ / 4)</div><div class='del'>-#define MT7921_RESET_TIMEOUT		(30 * HZ)</div><div class='del'>-</div><div class='ctx'> #define MT7921_TX_RING_SIZE		2048</div><div class='ctx'> #define MT7921_TX_MCU_RING_SIZE		256</div><div class='ctx'> #define MT7921_TX_FWDL_RING_SIZE	128</div><div class='ctx'> </div><div class='ctx'> #define MT7921_RX_RING_SIZE		1536</div><div class='del'>-#define MT7921_RX_MCU_RING_SIZE		512</div><div class='del'>-</div><div class='del'>-#define MT7921_DRV_OWN_RETRY_COUNT	10</div><div class='del'>-</div><div class='del'>-#define MT7921_FIRMWARE_WM		"mediatek/WIFI_RAM_CODE_MT7961_1.bin"</div><div class='del'>-#define MT7921_ROM_PATCH		"mediatek/WIFI_MT7961_patch_mcu_1_2_hdr.bin"</div><div class='add'>+#define MT7921_RX_MCU_RING_SIZE		8</div><div class='add'>+#define MT7921_RX_MCU_WA_RING_SIZE	512</div><div class='ctx'> </div><div class='ctx'> #define MT7921_EEPROM_SIZE		3584</div><div class='ctx'> #define MT7921_TOKEN_SIZE		8192</div><div class='ctx'> </div><div class='del'>-#define MT7921_CFEND_RATE_DEFAULT	0x49	/* OFDM 24M */</div><div class='del'>-#define MT7921_CFEND_RATE_11B		0x03	/* 11B LP, 11M */</div><div class='del'>-#define MT7921_5G_RATE_DEFAULT		0x4b	/* OFDM 6M */</div><div class='del'>-#define MT7921_2G_RATE_DEFAULT		0x0	/* CCK 1M */</div><div class='add'>+#define MT7921_EEPROM_BLOCK_SIZE	16</div><div class='ctx'> </div><div class='ctx'> #define MT7921_SKU_RATE_NUM		161</div><div class='ctx'> #define MT7921_SKU_MAX_DELTA_IDX	MT7921_SKU_RATE_NUM</div><div class='ctx'> #define MT7921_SKU_TABLE_SIZE		(MT7921_SKU_RATE_NUM + 1)</div><div class='ctx'> </div><div class='del'>-#define to_rssi(field, rxv)		((FIELD_GET(field, rxv) - 220) / 2)</div><div class='del'>-#define to_rcpi(rssi)			(2 * (rssi) + 220)</div><div class='add'>+#define MCU_UNI_EVENT_ROC  0x27</div><div class='add'>+#define MCU_UNI_EVENT_CLC  0x80</div><div class='ctx'> </div><div class='del'>-struct mt7921_vif;</div><div class='del'>-struct mt7921_sta;</div><div class='add'>+#define EXT_CMD_RADIO_LED_CTRL_ENABLE   0x1</div><div class='add'>+#define EXT_CMD_RADIO_ON_LED            0x2</div><div class='add'>+#define EXT_CMD_RADIO_OFF_LED           0x3</div><div class='ctx'> </div><div class='del'>-enum mt7921_txq_id {</div><div class='del'>-	MT7921_TXQ_BAND0,</div><div class='del'>-	MT7921_TXQ_BAND1,</div><div class='del'>-	MT7921_TXQ_FWDL = 16,</div><div class='del'>-	MT7921_TXQ_MCU_WM,</div><div class='del'>-};</div><div class='add'>+#define WF_RF_PIN_INIT		0x0</div><div class='add'>+#define WF_RF_PIN_POLL		0x1</div><div class='ctx'> </div><div class='del'>-enum mt7921_rxq_id {</div><div class='del'>-	MT7921_RXQ_BAND0 = 0,</div><div class='del'>-	MT7921_RXQ_BAND1,</div><div class='del'>-	MT7921_RXQ_MCU_WM = 0,</div><div class='add'>+enum {</div><div class='add'>+	UNI_ROC_ACQUIRE,</div><div class='add'>+	UNI_ROC_ABORT,</div><div class='add'>+	UNI_ROC_NUM</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mt7921_sta_stats {</div><div class='del'>-	struct rate_info prob_rate;</div><div class='del'>-	struct rate_info tx_rate;</div><div class='del'>-</div><div class='del'>-	unsigned long per;</div><div class='del'>-	unsigned long changed;</div><div class='del'>-	unsigned long jiffies;</div><div class='add'>+enum mt7921_roc_req {</div><div class='add'>+	MT7921_ROC_REQ_JOIN,</div><div class='add'>+	MT7921_ROC_REQ_ROC,</div><div class='add'>+	MT7921_ROC_REQ_NUM</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mt7921_sta_key_conf {</div><div class='del'>-	s8 keyidx;</div><div class='del'>-	u8 key[16];</div><div class='add'>+enum {</div><div class='add'>+	UNI_EVENT_ROC_GRANT = 0,</div><div class='add'>+	UNI_EVENT_ROC_TAG_NUM</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mt7921_sta {</div><div class='del'>-	struct mt76_wcid wcid; /* must be first */</div><div class='del'>-</div><div class='del'>-	struct mt7921_vif *vif;</div><div class='del'>-</div><div class='del'>-	struct list_head stats_list;</div><div class='del'>-	struct list_head poll_list;</div><div class='del'>-	u32 airtime_ac[8];</div><div class='del'>-</div><div class='del'>-	struct mt7921_sta_stats stats;</div><div class='del'>-</div><div class='del'>-	unsigned long ampdu_state;</div><div class='del'>-</div><div class='del'>-	struct mt7921_sta_key_conf bip;</div><div class='add'>+struct mt7921_realease_info {</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 pad_len;</div><div class='add'>+	u8 tag;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7921_fw_features {</div><div class='add'>+	u8 segment;</div><div class='add'>+	u8 data;</div><div class='add'>+	u8 rsv[14];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7921_roc_grant_tlv {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 bss_idx;</div><div class='add'>+	u8 tokenid;</div><div class='add'>+	u8 status;</div><div class='add'>+	u8 primarychannel;</div><div class='add'>+	u8 rfsco;</div><div class='add'>+	u8 rfband;</div><div class='add'>+	u8 channelwidth;</div><div class='add'>+	u8 centerfreqseg1;</div><div class='add'>+	u8 centerfreqseg2;</div><div class='add'>+	u8 reqtype;</div><div class='add'>+	u8 dbdcband;</div><div class='add'>+	u8 rsv[1];</div><div class='add'>+	__le32 max_interval;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum mt7921_sdio_pkt_type {</div><div class='add'>+	MT7921_SDIO_TXD,</div><div class='add'>+	MT7921_SDIO_DATA,</div><div class='add'>+	MT7921_SDIO_CMD,</div><div class='add'>+	MT7921_SDIO_FWDL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-DECLARE_EWMA(rssi, 10, 8);</div><div class='del'>-</div><div class='del'>-struct mt7921_vif {</div><div class='del'>-	struct mt76_vif mt76; /* must be first */</div><div class='del'>-</div><div class='del'>-	struct mt7921_sta sta;</div><div class='del'>-	struct mt7921_phy *phy;</div><div class='add'>+struct mt7921_sdio_intr {</div><div class='add'>+	u32 isr;</div><div class='add'>+	struct {</div><div class='add'>+		u32 wtqcr[16];</div><div class='add'>+	} tx;</div><div class='add'>+	struct {</div><div class='add'>+		u16 num[2];</div><div class='add'>+		u16 len0[16];</div><div class='add'>+		u16 len1[128];</div><div class='add'>+	} rx;</div><div class='add'>+	u32 rec_mb[2];</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='del'>-	struct ewma_rssi rssi;</div><div class='add'>+#define to_rssi(field, rxv)		((FIELD_GET(field, rxv) - 220) / 2)</div><div class='add'>+#define to_rcpi(rssi)			(2 * (rssi) + 220)</div><div class='ctx'> </div><div class='del'>-	struct ieee80211_tx_queue_params queue_params[IEEE80211_NUM_ACS];</div><div class='add'>+enum mt7921_txq_id {</div><div class='add'>+	MT7921_TXQ_BAND0,</div><div class='add'>+	MT7921_TXQ_BAND1,</div><div class='add'>+	MT7921_TXQ_FWDL = 16,</div><div class='add'>+	MT7921_TXQ_MCU_WM,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mib_stats {</div><div class='del'>-	u32 ack_fail_cnt;</div><div class='del'>-	u32 fcs_err_cnt;</div><div class='del'>-	u32 rts_cnt;</div><div class='del'>-	u32 rts_retries_cnt;</div><div class='del'>-	u32 ba_miss_cnt;</div><div class='add'>+enum mt7921_rxq_id {</div><div class='add'>+	MT7921_RXQ_BAND0 = 0,</div><div class='add'>+	MT7921_RXQ_BAND1,</div><div class='add'>+	MT7921_RXQ_MCU_WM = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mt7921_phy {</div><div class='del'>-	struct mt76_phy *mt76;</div><div class='del'>-	struct mt7921_dev *dev;</div><div class='del'>-</div><div class='del'>-	struct ieee80211_sband_iftype_data iftype[2][NUM_NL80211_IFTYPES];</div><div class='del'>-</div><div class='del'>-	struct ieee80211_vif *monitor_vif;</div><div class='del'>-</div><div class='del'>-	u32 rxfilter;</div><div class='del'>-	u64 omac_mask;</div><div class='del'>-</div><div class='del'>-	u16 noise;</div><div class='del'>-</div><div class='del'>-	s16 coverage_class;</div><div class='del'>-	u8 slottime;</div><div class='del'>-</div><div class='del'>-	u32 rx_ampdu_ts;</div><div class='del'>-	u32 ampdu_ref;</div><div class='del'>-</div><div class='del'>-	struct mib_stats mib;</div><div class='del'>-	struct list_head stats_list;</div><div class='del'>-</div><div class='del'>-	u8 sta_work_count;</div><div class='del'>-</div><div class='del'>-	struct sk_buff_head scan_event_list;</div><div class='del'>-	struct delayed_work scan_work;</div><div class='add'>+enum {</div><div class='add'>+	MT7921_CLC_POWER,</div><div class='add'>+	MT7921_CLC_CHAN,</div><div class='add'>+	MT7921_CLC_MAX_NUM,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mt7921_dev {</div><div class='del'>-	union { /* must be first */</div><div class='del'>-		struct mt76_dev mt76;</div><div class='del'>-		struct mt76_phy mphy;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	const struct mt76_bus_ops *bus_ops;</div><div class='del'>-	struct mt7921_phy phy;</div><div class='del'>-	struct tasklet_struct irq_tasklet;</div><div class='del'>-</div><div class='del'>-	u16 chainmask;</div><div class='del'>-</div><div class='del'>-	struct work_struct reset_work;</div><div class='del'>-</div><div class='del'>-	struct list_head sta_poll_list;</div><div class='del'>-	spinlock_t sta_poll_lock;</div><div class='del'>-</div><div class='del'>-	u8 fw_debug;</div><div class='del'>-</div><div class='del'>-	struct mt76_connac_pm pm;</div><div class='del'>-	struct mt76_connac_coredump coredump;</div><div class='add'>+struct mt7921_clc_rule {</div><div class='add'>+	u8 alpha2[2];</div><div class='add'>+	u8 type[2];</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7921_clc {</div><div class='add'>+	__le32 len;</div><div class='add'>+	u8 idx;</div><div class='add'>+	u8 ver;</div><div class='add'>+	u8 nr_country;</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 rsv[8];</div><div class='add'>+	u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum mt7921_eeprom_field {</div><div class='add'>+	MT_EE_CHIP_ID =		0x000,</div><div class='add'>+	MT_EE_VERSION =		0x002,</div><div class='add'>+	MT_EE_MAC_ADDR =	0x004,</div><div class='add'>+	MT_EE_WIFI_CONF =	0x07c,</div><div class='add'>+	MT_EE_HW_TYPE =		0x55b,</div><div class='add'>+	__MT_EE_MAX =		0x9ff</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define MT_EE_HW_TYPE_ENCAP			BIT(0)</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	TXPWR_USER,</div><div class='ctx'> 	TXPWR_EEPROM,</div><div class='hunk'>@@ -196,88 +181,34 @@ struct mt7921_txpwr {</div><div class='ctx'> 	} data[TXPWR_MAX_NUM];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum {</div><div class='del'>-	MT_LMAC_AC00,</div><div class='del'>-	MT_LMAC_AC01,</div><div class='del'>-	MT_LMAC_AC02,</div><div class='del'>-	MT_LMAC_AC03,</div><div class='del'>-	MT_LMAC_ALTX0 = 0x10,</div><div class='del'>-	MT_LMAC_BMC0,</div><div class='del'>-	MT_LMAC_BCN0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct mt7921_phy *</div><div class='del'>-mt7921_hw_phy(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct mt76_phy *phy = hw-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return phy-&gt;priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct mt7921_dev *</div><div class='del'>-mt7921_hw_dev(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct mt76_phy *phy = hw-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return container_of(phy-&gt;dev, struct mt7921_dev, mt76);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define mt7921_mutex_acquire(dev)	\</div><div class='del'>-	mt76_connac_mutex_acquire(&amp;(dev)-&gt;mt76, &amp;(dev)-&gt;pm)</div><div class='del'>-#define mt7921_mutex_release(dev)	\</div><div class='del'>-	mt76_connac_mutex_release(&amp;(dev)-&gt;mt76, &amp;(dev)-&gt;pm)</div><div class='del'>-</div><div class='del'>-static inline u8 mt7921_lmac_mapping(struct mt7921_dev *dev, u8 ac)</div><div class='del'>-{</div><div class='del'>-	/* LMAC uses the reverse order of mac80211 AC indexes */</div><div class='del'>-	return 3 - ac;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> extern const struct ieee80211_ops mt7921_ops;</div><div class='del'>-extern struct pci_driver mt7921_pci_driver;</div><div class='del'>-</div><div class='del'>-u32 mt7921_reg_map(struct mt7921_dev *dev, u32 addr);</div><div class='del'>-</div><div class='del'>-int __mt7921_start(struct mt7921_phy *phy);</div><div class='del'>-int mt7921_register_device(struct mt7921_dev *dev);</div><div class='del'>-void mt7921_unregister_device(struct mt7921_dev *dev);</div><div class='del'>-int mt7921_eeprom_init(struct mt7921_dev *dev);</div><div class='del'>-void mt7921_eeprom_parse_band_config(struct mt7921_phy *phy);</div><div class='del'>-int mt7921_eeprom_get_target_power(struct mt7921_dev *dev,</div><div class='del'>-				   struct ieee80211_channel *chan,</div><div class='del'>-				   u8 chain_idx);</div><div class='del'>-void mt7921_eeprom_init_sku(struct mt7921_dev *dev);</div><div class='del'>-int mt7921_dma_init(struct mt7921_dev *dev);</div><div class='del'>-int mt7921_wpdma_reset(struct mt7921_dev *dev, bool force);</div><div class='del'>-int mt7921_wpdma_reinit_cond(struct mt7921_dev *dev);</div><div class='del'>-void mt7921_dma_cleanup(struct mt7921_dev *dev);</div><div class='del'>-int mt7921_run_firmware(struct mt7921_dev *dev);</div><div class='del'>-int mt7921_mcu_init(struct mt7921_dev *dev);</div><div class='del'>-int mt7921_mcu_add_key(struct mt7921_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-		       struct mt7921_sta *msta, struct ieee80211_key_conf *key,</div><div class='del'>-		       enum set_key_cmd cmd);</div><div class='del'>-int mt7921_set_channel(struct mt7921_phy *phy);</div><div class='del'>-int mt7921_mcu_sta_add(struct mt7921_dev *dev, struct ieee80211_sta *sta,</div><div class='del'>-		       struct ieee80211_vif *vif, bool enable);</div><div class='del'>-int mt7921_mcu_set_chan_info(struct mt7921_phy *phy, int cmd);</div><div class='del'>-int mt7921_mcu_set_tx(struct mt7921_dev *dev, struct ieee80211_vif *vif);</div><div class='del'>-int mt7921_mcu_set_eeprom(struct mt7921_dev *dev);</div><div class='del'>-int mt7921_mcu_get_eeprom(struct mt7921_dev *dev, u32 offset);</div><div class='del'>-int mt7921_mcu_get_rx_rate(struct mt7921_phy *phy, struct ieee80211_vif *vif,</div><div class='del'>-			   struct ieee80211_sta *sta, struct rate_info *rate);</div><div class='del'>-int mt7921_mcu_fw_log_2_host(struct mt7921_dev *dev, u8 ctrl);</div><div class='del'>-void mt7921_mcu_rx_event(struct mt7921_dev *dev, struct sk_buff *skb);</div><div class='del'>-void mt7921_mcu_exit(struct mt7921_dev *dev);</div><div class='ctx'> </div><div class='del'>-static inline void mt7921_irq_enable(struct mt7921_dev *dev, u32 mask)</div><div class='del'>-{</div><div class='del'>-	mt76_set_irq_mask(&amp;dev-&gt;mt76, 0, 0, mask);</div><div class='add'>+u32 mt7921_reg_map(struct mt792x_dev *dev, u32 addr);</div><div class='ctx'> </div><div class='del'>-	tasklet_schedule(&amp;dev-&gt;irq_tasklet);</div><div class='del'>-}</div><div class='add'>+int __mt7921_start(struct mt792x_phy *phy);</div><div class='add'>+int mt7921_register_device(struct mt792x_dev *dev);</div><div class='add'>+void mt7921_unregister_device(struct mt792x_dev *dev);</div><div class='add'>+int mt7921_run_firmware(struct mt792x_dev *dev);</div><div class='add'>+int mt7921_set_channel(struct mt76_phy *mphy);</div><div class='add'>+int mt7921_mcu_set_bss_pm(struct mt792x_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			  bool enable);</div><div class='add'>+int mt7921_mcu_sta_update(struct mt792x_dev *dev, struct ieee80211_sta *sta,</div><div class='add'>+			  struct ieee80211_vif *vif, bool enable,</div><div class='add'>+			  enum mt76_sta_info_state state);</div><div class='add'>+int mt7921_mcu_set_chan_info(struct mt792x_phy *phy, int cmd);</div><div class='add'>+int mt7921_mcu_set_tx(struct mt792x_dev *dev, struct ieee80211_vif *vif);</div><div class='add'>+int mt7921_mcu_set_eeprom(struct mt792x_dev *dev);</div><div class='add'>+int mt7921_mcu_get_rx_rate(struct mt792x_phy *phy, struct ieee80211_vif *vif,</div><div class='add'>+			   struct ieee80211_sta *sta, struct rate_info *rate);</div><div class='add'>+int mt7921_mcu_fw_log_2_host(struct mt792x_dev *dev, u8 ctrl);</div><div class='add'>+void mt7921_mcu_rx_event(struct mt792x_dev *dev, struct sk_buff *skb);</div><div class='add'>+int mt7921_mcu_set_rxfilter(struct mt792x_dev *dev, u32 fif,</div><div class='add'>+			    u8 bit_op, u32 bit_map);</div><div class='add'>+int mt7921_mcu_radio_led_ctrl(struct mt792x_dev *dev, u8 value);</div><div class='add'>+int mt7921_mcu_wf_rf_pin_ctrl(struct mt792x_phy *phy, u8 action);</div><div class='ctx'> </div><div class='ctx'> static inline u32</div><div class='del'>-mt7921_reg_map_l1(struct mt7921_dev *dev, u32 addr)</div><div class='add'>+mt7921_reg_map_l1(struct mt792x_dev *dev, u32 addr)</div><div class='ctx'> {</div><div class='ctx'> 	u32 offset = FIELD_GET(MT_HIF_REMAP_L1_OFFSET, addr);</div><div class='ctx'> 	u32 base = FIELD_GET(MT_HIF_REMAP_L1_BASE, addr);</div><div class='hunk'>@@ -290,19 +221,19 @@ mt7921_reg_map_l1(struct mt7921_dev *dev, u32 addr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u32</div><div class='del'>-mt7921_l1_rr(struct mt7921_dev *dev, u32 addr)</div><div class='add'>+mt7921_l1_rr(struct mt792x_dev *dev, u32 addr)</div><div class='ctx'> {</div><div class='ctx'> 	return mt76_rr(dev, mt7921_reg_map_l1(dev, addr));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-mt7921_l1_wr(struct mt7921_dev *dev, u32 addr, u32 val)</div><div class='add'>+mt7921_l1_wr(struct mt792x_dev *dev, u32 addr, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	mt76_wr(dev, mt7921_reg_map_l1(dev, addr), val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u32</div><div class='del'>-mt7921_l1_rmw(struct mt7921_dev *dev, u32 addr, u32 mask, u32 val)</div><div class='add'>+mt7921_l1_rmw(struct mt792x_dev *dev, u32 addr, u32 mask, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	val |= mt7921_l1_rr(dev, addr) &amp; ~mask;</div><div class='ctx'> 	mt7921_l1_wr(dev, addr, val);</div><div class='hunk'>@@ -313,71 +244,95 @@ mt7921_l1_rmw(struct mt7921_dev *dev, u32 addr, u32 mask, u32 val)</div><div class='ctx'> #define mt7921_l1_set(dev, addr, val)	mt7921_l1_rmw(dev, addr, 0, val)</div><div class='ctx'> #define mt7921_l1_clear(dev, addr, val)	mt7921_l1_rmw(dev, addr, val, 0)</div><div class='ctx'> </div><div class='del'>-static inline bool mt7921_dma_need_reinit(struct mt7921_dev *dev)</div><div class='del'>-{</div><div class='del'>-	return !mt76_get_field(dev, MT_WFDMA_DUMMY_CR, MT_WFDMA_NEED_REINIT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mt7921_mac_init(struct mt7921_dev *dev);</div><div class='del'>-bool mt7921_mac_wtbl_update(struct mt7921_dev *dev, int idx, u32 mask);</div><div class='del'>-void mt7921_mac_reset_counters(struct mt7921_phy *phy);</div><div class='del'>-void mt7921_mac_write_txwi(struct mt7921_dev *dev, __le32 *txwi,</div><div class='del'>-			   struct sk_buff *skb, struct mt76_wcid *wcid,</div><div class='del'>-			   struct ieee80211_key_conf *key, bool beacon);</div><div class='del'>-void mt7921_mac_set_timing(struct mt7921_phy *phy);</div><div class='del'>-int mt7921_mac_fill_rx(struct mt7921_dev *dev, struct sk_buff *skb);</div><div class='del'>-void mt7921_mac_fill_rx_vector(struct mt7921_dev *dev, struct sk_buff *skb);</div><div class='del'>-void mt7921_mac_tx_free(struct mt7921_dev *dev, struct sk_buff *skb);</div><div class='add'>+void mt7921_regd_update(struct mt792x_dev *dev);</div><div class='add'>+int mt7921_mac_init(struct mt792x_dev *dev);</div><div class='add'>+bool mt7921_mac_wtbl_update(struct mt792x_dev *dev, int idx, u32 mask);</div><div class='ctx'> int mt7921_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='ctx'> 		       struct ieee80211_sta *sta);</div><div class='add'>+int mt7921_mac_sta_event(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='add'>+			 struct ieee80211_sta *sta, enum mt76_sta_event ev);</div><div class='ctx'> void mt7921_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='ctx'> 			   struct ieee80211_sta *sta);</div><div class='del'>-void mt7921_mac_work(struct work_struct *work);</div><div class='ctx'> void mt7921_mac_reset_work(struct work_struct *work);</div><div class='del'>-void mt7921_reset(struct mt76_dev *mdev);</div><div class='del'>-void mt7921_tx_cleanup(struct mt7921_dev *dev);</div><div class='del'>-int mt7921_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='del'>-			  enum mt76_txq_id qid, struct mt76_wcid *wcid,</div><div class='del'>-			  struct ieee80211_sta *sta,</div><div class='del'>-			  struct mt76_tx_info *tx_info);</div><div class='del'>-</div><div class='del'>-void mt7921_tx_worker(struct mt76_worker *w);</div><div class='del'>-void mt7921_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e);</div><div class='del'>-int mt7921_init_tx_queues(struct mt7921_phy *phy, int idx, int n_desc);</div><div class='del'>-void mt7921_tx_token_put(struct mt7921_dev *dev);</div><div class='add'>+int mt7921e_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='add'>+			   enum mt76_txq_id qid, struct mt76_wcid *wcid,</div><div class='add'>+			   struct ieee80211_sta *sta,</div><div class='add'>+			   struct mt76_tx_info *tx_info);</div><div class='add'>+</div><div class='add'>+bool mt7921_rx_check(struct mt76_dev *mdev, void *data, int len);</div><div class='ctx'> void mt7921_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,</div><div class='del'>-			 struct sk_buff *skb);</div><div class='del'>-void mt7921_sta_ps(struct mt76_dev *mdev, struct ieee80211_sta *sta, bool ps);</div><div class='add'>+			 struct sk_buff *skb, u32 *info);</div><div class='ctx'> void mt7921_stats_work(struct work_struct *work);</div><div class='del'>-void mt7921_txp_skb_unmap(struct mt76_dev *dev,</div><div class='del'>-			  struct mt76_txwi_cache *txwi);</div><div class='del'>-void mt7921_set_stream_he_caps(struct mt7921_phy *phy);</div><div class='del'>-void mt7921_update_channel(struct mt76_dev *mdev);</div><div class='del'>-int mt7921_init_debugfs(struct mt7921_dev *dev);</div><div class='add'>+void mt7921_set_stream_he_caps(struct mt792x_phy *phy);</div><div class='add'>+int mt7921_init_debugfs(struct mt792x_dev *dev);</div><div class='ctx'> </div><div class='del'>-int mt7921_mcu_uni_tx_ba(struct mt7921_dev *dev,</div><div class='add'>+int mt7921_mcu_set_beacon_filter(struct mt792x_dev *dev,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 bool enable);</div><div class='add'>+int mt7921_mcu_uni_tx_ba(struct mt792x_dev *dev,</div><div class='ctx'> 			 struct ieee80211_ampdu_params *params,</div><div class='ctx'> 			 bool enable);</div><div class='del'>-int mt7921_mcu_uni_rx_ba(struct mt7921_dev *dev,</div><div class='add'>+int mt7921_mcu_uni_rx_ba(struct mt792x_dev *dev,</div><div class='ctx'> 			 struct ieee80211_ampdu_params *params,</div><div class='ctx'> 			 bool enable);</div><div class='ctx'> void mt7921_scan_work(struct work_struct *work);</div><div class='del'>-u32 mt7921_get_wtbl_info(struct mt7921_dev *dev, u32 wlan_idx);</div><div class='del'>-int mt7921_mcu_uni_bss_ps(struct mt7921_dev *dev, struct ieee80211_vif *vif);</div><div class='del'>-int mt7921_mcu_uni_bss_bcnft(struct mt7921_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-			     bool enable);</div><div class='del'>-int mt7921_mcu_set_bss_pm(struct mt7921_dev *dev, struct ieee80211_vif *vif,</div><div class='del'>-			  bool enable);</div><div class='del'>-int mt7921_mcu_drv_pmctrl(struct mt7921_dev *dev);</div><div class='del'>-int mt7921_mcu_fw_pmctrl(struct mt7921_dev *dev);</div><div class='del'>-void mt7921_pm_wake_work(struct work_struct *work);</div><div class='del'>-void mt7921_pm_power_save_work(struct work_struct *work);</div><div class='del'>-bool mt7921_wait_for_mcu_init(struct mt7921_dev *dev);</div><div class='del'>-int mt7921_mac_set_beacon_filter(struct mt7921_phy *phy,</div><div class='del'>-				 struct ieee80211_vif *vif,</div><div class='del'>-				 bool enable);</div><div class='del'>-void mt7921_pm_interface_iter(void *priv, u8 *mac, struct ieee80211_vif *vif);</div><div class='add'>+void mt7921_roc_work(struct work_struct *work);</div><div class='add'>+void mt7921_csa_work(struct work_struct *work);</div><div class='add'>+int mt7921_mcu_uni_bss_ps(struct mt792x_dev *dev, struct ieee80211_vif *vif);</div><div class='ctx'> void mt7921_coredump_work(struct work_struct *work);</div><div class='del'>-int mt7921_wfsys_reset(struct mt7921_dev *dev);</div><div class='del'>-int mt7921_get_txpwr_info(struct mt7921_dev *dev, struct mt7921_txpwr *txpwr);</div><div class='add'>+int mt7921_get_txpwr_info(struct mt792x_dev *dev, struct mt7921_txpwr *txpwr);</div><div class='add'>+int mt7921_testmode_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			void *data, int len);</div><div class='add'>+int mt7921_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *msg,</div><div class='add'>+			 struct netlink_callback *cb, void *data, int len);</div><div class='add'>+int mt7921_mcu_parse_response(struct mt76_dev *mdev, int cmd,</div><div class='add'>+			      struct sk_buff *skb, int seq);</div><div class='add'>+</div><div class='add'>+int mt7921e_driver_own(struct mt792x_dev *dev);</div><div class='add'>+int mt7921e_mac_reset(struct mt792x_dev *dev);</div><div class='add'>+int mt7921e_mcu_init(struct mt792x_dev *dev);</div><div class='add'>+int mt7921s_wfsys_reset(struct mt792x_dev *dev);</div><div class='add'>+int mt7921s_mac_reset(struct mt792x_dev *dev);</div><div class='add'>+int mt7921s_init_reset(struct mt792x_dev *dev);</div><div class='add'>+</div><div class='add'>+int mt7921s_mcu_init(struct mt792x_dev *dev);</div><div class='add'>+int mt7921s_mcu_drv_pmctrl(struct mt792x_dev *dev);</div><div class='add'>+int mt7921s_mcu_fw_pmctrl(struct mt792x_dev *dev);</div><div class='add'>+void mt7921_mac_add_txs(struct mt792x_dev *dev, void *data);</div><div class='add'>+void mt7921_set_runtime_pm(struct mt792x_dev *dev);</div><div class='add'>+void mt7921_mcu_set_suspend_iter(void *priv, u8 *mac,</div><div class='add'>+				 struct ieee80211_vif *vif);</div><div class='add'>+void mt7921_set_ipv6_ns_work(struct work_struct *work);</div><div class='add'>+</div><div class='add'>+int mt7921_mcu_set_sniffer(struct mt792x_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			   bool enable);</div><div class='add'>+int mt7921_mcu_config_sniffer(struct mt792x_vif *vif,</div><div class='add'>+			      struct ieee80211_chanctx_conf *ctx);</div><div class='add'>+int mt7921_mcu_get_temperature(struct mt792x_phy *phy);</div><div class='add'>+</div><div class='add'>+int mt7921_usb_sdio_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='add'>+				   enum mt76_txq_id qid, struct mt76_wcid *wcid,</div><div class='add'>+				   struct ieee80211_sta *sta,</div><div class='add'>+				   struct mt76_tx_info *tx_info);</div><div class='add'>+void mt7921_usb_sdio_tx_complete_skb(struct mt76_dev *mdev,</div><div class='add'>+				     struct mt76_queue_entry *e);</div><div class='add'>+bool mt7921_usb_sdio_tx_status_data(struct mt76_dev *mdev, u8 *update);</div><div class='add'>+</div><div class='add'>+/* usb */</div><div class='add'>+int mt7921_mcu_uni_add_beacon_offload(struct mt792x_dev *dev,</div><div class='add'>+				      struct ieee80211_hw *hw,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      bool enable);</div><div class='add'>+int mt7921_set_tx_sar_pwr(struct ieee80211_hw *hw,</div><div class='add'>+			  const struct cfg80211_sar_specs *sar);</div><div class='add'>+</div><div class='add'>+int mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,</div><div class='add'>+		       enum environment_cap env_cap);</div><div class='add'>+int mt7921_mcu_set_roc(struct mt792x_phy *phy, struct mt792x_vif *vif,</div><div class='add'>+		       struct ieee80211_channel *chan, int duration,</div><div class='add'>+		       enum mt7921_roc_req type, u8 token_id);</div><div class='add'>+int mt7921_mcu_abort_roc(struct mt792x_phy *phy, struct mt792x_vif *vif,</div><div class='add'>+			 u8 token_id);</div><div class='add'>+void mt7921_roc_abort_sync(struct mt792x_dev *dev);</div><div class='add'>+int mt7921_mcu_set_rssimonitor(struct mt792x_dev *dev, struct ieee80211_vif *vif);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c<br/>index fa02d934f0bf..ec9686183251 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/pci.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/pci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7921/pci.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='hunk'>@@ -6,86 +6,228 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mt7921.h"</div><div class='del'>-#include "mac.h"</div><div class='add'>+#include "../mt76_connac2_mac.h"</div><div class='add'>+#include "../dma.h"</div><div class='ctx'> #include "mcu.h"</div><div class='del'>-#include "../trace.h"</div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id mt7921_pci_device_table[] = {</div><div class='del'>-	{ PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7961) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7961),</div><div class='add'>+		.driver_data = (kernel_ulong_t)MT7921_FIRMWARE_WM },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7922),</div><div class='add'>+		.driver_data = (kernel_ulong_t)MT7922_FIRMWARE_WM },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_ITTIM, 0x7922),</div><div class='add'>+		.driver_data = (kernel_ulong_t)MT7922_FIRMWARE_WM },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x0608),</div><div class='add'>+		.driver_data = (kernel_ulong_t)MT7921_FIRMWARE_WM },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x0616),</div><div class='add'>+		.driver_data = (kernel_ulong_t)MT7922_FIRMWARE_WM },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7920),</div><div class='add'>+		.driver_data = (kernel_ulong_t)MT7920_FIRMWARE_WM },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7921_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q)</div><div class='add'>+static bool mt7921_disable_aspm;</div><div class='add'>+module_param_named(disable_aspm, mt7921_disable_aspm, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(disable_aspm, "disable PCI ASPM support");</div><div class='add'>+</div><div class='add'>+static int mt7921e_init_reset(struct mt792x_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);</div><div class='del'>-</div><div class='del'>-	if (q == MT_RXQ_MAIN)</div><div class='del'>-		mt7921_irq_enable(dev, MT_INT_RX_DONE_DATA);</div><div class='del'>-	else if (q == MT_RXQ_MCU_WA)</div><div class='del'>-		mt7921_irq_enable(dev, MT_INT_RX_DONE_WM2);</div><div class='del'>-	else</div><div class='del'>-		mt7921_irq_enable(dev, MT_INT_RX_DONE_WM);</div><div class='add'>+	return mt792x_wpdma_reset(dev, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static irqreturn_t mt7921_irq_handler(int irq, void *dev_instance)</div><div class='add'>+static void mt7921e_unregister_device(struct mt792x_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = dev_instance;</div><div class='add'>+	int i;</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;phy.chip_cap &amp; MT792x_CHIP_CAP_WF_RF_PIN_CTRL_EVT_EN)</div><div class='add'>+		wiphy_rfkill_stop_polling(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;dev-&gt;init_work);</div><div class='add'>+	mt76_unregister_device(&amp;dev-&gt;mt76);</div><div class='add'>+	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i)</div><div class='add'>+		napi_disable(&amp;dev-&gt;mt76.napi[i]);</div><div class='add'>+	cancel_delayed_work_sync(&amp;pm-&gt;ps_work);</div><div class='add'>+	cancel_work_sync(&amp;pm-&gt;wake_work);</div><div class='add'>+	cancel_work_sync(&amp;dev-&gt;reset_work);</div><div class='add'>+</div><div class='add'>+	mt76_connac2_tx_token_put(&amp;dev-&gt;mt76);</div><div class='add'>+	__mt792x_mcu_drv_pmctrl(dev);</div><div class='add'>+	mt792x_dma_cleanup(dev);</div><div class='add'>+	mt792x_wfsys_reset(dev);</div><div class='add'>+	skb_queue_purge(&amp;dev-&gt;mt76.mcu.res_q);</div><div class='add'>+</div><div class='add'>+	tasklet_disable(&amp;dev-&gt;mt76.irq_tasklet);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, 0);</div><div class='add'>+static u32 __mt7921_reg_addr(struct mt792x_dev *dev, u32 addr)</div><div class='add'>+{</div><div class='add'>+	static const struct mt76_connac_reg_map fixed_map[] = {</div><div class='add'>+		{ 0x820d0000, 0x30000, 0x10000 }, /* WF_LMAC_TOP (WF_WTBLON) */</div><div class='add'>+		{ 0x820ed000, 0x24800, 0x00800 }, /* WF_LMAC_TOP BN0 (WF_MIB) */</div><div class='add'>+		{ 0x820e4000, 0x21000, 0x00400 }, /* WF_LMAC_TOP BN0 (WF_TMAC) */</div><div class='add'>+		{ 0x820e7000, 0x21e00, 0x00200 }, /* WF_LMAC_TOP BN0 (WF_DMA) */</div><div class='add'>+		{ 0x820eb000, 0x24200, 0x00400 }, /* WF_LMAC_TOP BN0 (WF_LPON) */</div><div class='add'>+		{ 0x820e2000, 0x20800, 0x00400 }, /* WF_LMAC_TOP BN0 (WF_AGG) */</div><div class='add'>+		{ 0x820e3000, 0x20c00, 0x00400 }, /* WF_LMAC_TOP BN0 (WF_ARB) */</div><div class='add'>+		{ 0x820e5000, 0x21400, 0x00800 }, /* WF_LMAC_TOP BN0 (WF_RMAC) */</div><div class='add'>+		{ 0x00400000, 0x80000, 0x10000 }, /* WF_MCU_SYSRAM */</div><div class='add'>+		{ 0x00410000, 0x90000, 0x10000 }, /* WF_MCU_SYSRAM (configure register) */</div><div class='add'>+		{ 0x40000000, 0x70000, 0x10000 }, /* WF_UMAC_SYSRAM */</div><div class='add'>+		{ 0x54000000, 0x02000, 0x01000 }, /* WFDMA PCIE0 MCU DMA0 */</div><div class='add'>+		{ 0x55000000, 0x03000, 0x01000 }, /* WFDMA PCIE0 MCU DMA1 */</div><div class='add'>+		{ 0x58000000, 0x06000, 0x01000 }, /* WFDMA PCIE1 MCU DMA0 (MEM_DMA) */</div><div class='add'>+		{ 0x59000000, 0x07000, 0x01000 }, /* WFDMA PCIE1 MCU DMA1 */</div><div class='add'>+		{ 0x7c000000, 0xf0000, 0x10000 }, /* CONN_INFRA */</div><div class='add'>+		{ 0x7c020000, 0xd0000, 0x10000 }, /* CONN_INFRA, WFDMA */</div><div class='add'>+		{ 0x7c060000, 0xe0000, 0x10000 }, /* CONN_INFRA, conn_host_csr_top */</div><div class='add'>+		{ 0x80020000, 0xb0000, 0x10000 }, /* WF_TOP_MISC_OFF */</div><div class='add'>+		{ 0x81020000, 0xc0000, 0x10000 }, /* WF_TOP_MISC_ON */</div><div class='add'>+		{ 0x820c0000, 0x08000, 0x04000 }, /* WF_UMAC_TOP (PLE) */</div><div class='add'>+		{ 0x820c8000, 0x0c000, 0x02000 }, /* WF_UMAC_TOP (PSE) */</div><div class='add'>+		{ 0x820cc000, 0x0e000, 0x01000 }, /* WF_UMAC_TOP (PP) */</div><div class='add'>+		{ 0x820cd000, 0x0f000, 0x01000 }, /* WF_MDP_TOP */</div><div class='add'>+		{ 0x74030000, 0x10000, 0x10000 }, /* PCIE_MAC_IREG */</div><div class='add'>+		{ 0x820ce000, 0x21c00, 0x00200 }, /* WF_LMAC_TOP (WF_SEC) */</div><div class='add'>+		{ 0x820cf000, 0x22000, 0x01000 }, /* WF_LMAC_TOP (WF_PF) */</div><div class='add'>+		{ 0x820e0000, 0x20000, 0x00400 }, /* WF_LMAC_TOP BN0 (WF_CFG) */</div><div class='add'>+		{ 0x820e1000, 0x20400, 0x00200 }, /* WF_LMAC_TOP BN0 (WF_TRB) */</div><div class='add'>+		{ 0x820e9000, 0x23400, 0x00200 }, /* WF_LMAC_TOP BN0 (WF_WTBLOFF) */</div><div class='add'>+		{ 0x820ea000, 0x24000, 0x00200 }, /* WF_LMAC_TOP BN0 (WF_ETBF) */</div><div class='add'>+		{ 0x820ec000, 0x24600, 0x00200 }, /* WF_LMAC_TOP BN0 (WF_INT) */</div><div class='add'>+		{ 0x820f0000, 0xa0000, 0x00400 }, /* WF_LMAC_TOP BN1 (WF_CFG) */</div><div class='add'>+		{ 0x820f1000, 0xa0600, 0x00200 }, /* WF_LMAC_TOP BN1 (WF_TRB) */</div><div class='add'>+		{ 0x820f2000, 0xa0800, 0x00400 }, /* WF_LMAC_TOP BN1 (WF_AGG) */</div><div class='add'>+		{ 0x820f3000, 0xa0c00, 0x00400 }, /* WF_LMAC_TOP BN1 (WF_ARB) */</div><div class='add'>+		{ 0x820f4000, 0xa1000, 0x00400 }, /* WF_LMAC_TOP BN1 (WF_TMAC) */</div><div class='add'>+		{ 0x820f5000, 0xa1400, 0x00800 }, /* WF_LMAC_TOP BN1 (WF_RMAC) */</div><div class='add'>+		{ 0x820f7000, 0xa1e00, 0x00200 }, /* WF_LMAC_TOP BN1 (WF_DMA) */</div><div class='add'>+		{ 0x820f9000, 0xa3400, 0x00200 }, /* WF_LMAC_TOP BN1 (WF_WTBLOFF) */</div><div class='add'>+		{ 0x820fa000, 0xa4000, 0x00200 }, /* WF_LMAC_TOP BN1 (WF_ETBF) */</div><div class='add'>+		{ 0x820fb000, 0xa4200, 0x00400 }, /* WF_LMAC_TOP BN1 (WF_LPON) */</div><div class='add'>+		{ 0x820fc000, 0xa4600, 0x00200 }, /* WF_LMAC_TOP BN1 (WF_INT) */</div><div class='add'>+		{ 0x820fd000, 0xa4800, 0x00800 }, /* WF_LMAC_TOP BN1 (WF_MIB) */</div><div class='add'>+	};</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(MT76_STATE_INITIALIZED, &amp;dev-&gt;mphy.state))</div><div class='del'>-		return IRQ_NONE;</div><div class='add'>+	if (addr &lt; 0x100000)</div><div class='add'>+		return addr;</div><div class='ctx'> </div><div class='del'>-	tasklet_schedule(&amp;dev-&gt;irq_tasklet);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(fixed_map); i++) {</div><div class='add'>+		u32 ofs;</div><div class='ctx'> </div><div class='del'>-	return IRQ_HANDLED;</div><div class='add'>+		if (addr &lt; fixed_map[i].phys)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ofs = addr - fixed_map[i].phys;</div><div class='add'>+		if (ofs &gt; fixed_map[i].size)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		return fixed_map[i].maps + ofs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((addr &gt;= 0x18000000 &amp;&amp; addr &lt; 0x18c00000) ||</div><div class='add'>+	    (addr &gt;= 0x70000000 &amp;&amp; addr &lt; 0x78000000) ||</div><div class='add'>+	    (addr &gt;= 0x7c000000 &amp;&amp; addr &lt; 0x7c400000))</div><div class='add'>+		return mt7921_reg_map_l1(dev, addr);</div><div class='add'>+</div><div class='add'>+	dev_err(dev-&gt;mt76.dev, "Access currently unsupported address %08x\n",</div><div class='add'>+		addr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt7921_irq_tasklet(unsigned long data)</div><div class='add'>+static u32 mt7921_rr(struct mt76_dev *mdev, u32 offset)</div><div class='ctx'> {</div><div class='del'>-	struct mt7921_dev *dev = (struct mt7921_dev *)data;</div><div class='del'>-	u32 intr, mask = 0;</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	u32 addr = __mt7921_reg_addr(dev, offset);</div><div class='ctx'> </div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, 0);</div><div class='add'>+	return dev-&gt;bus_ops-&gt;rr(mdev, addr);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	intr = mt76_rr(dev, MT_WFDMA0_HOST_INT_STA);</div><div class='del'>-	intr &amp;= dev-&gt;mt76.mmio.irqmask;</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_HOST_INT_STA, intr);</div><div class='add'>+static void mt7921_wr(struct mt76_dev *mdev, u32 offset, u32 val)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	u32 addr = __mt7921_reg_addr(dev, offset);</div><div class='ctx'> </div><div class='del'>-	trace_dev_irq(&amp;dev-&gt;mt76, intr, dev-&gt;mt76.mmio.irqmask);</div><div class='add'>+	dev-&gt;bus_ops-&gt;wr(mdev, addr, val);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	mask |= intr &amp; MT_INT_RX_DONE_ALL;</div><div class='del'>-	if (intr &amp; MT_INT_TX_DONE_MCU)</div><div class='del'>-		mask |= MT_INT_TX_DONE_MCU;</div><div class='add'>+static u32 mt7921_rmw(struct mt76_dev *mdev, u32 offset, u32 mask, u32 val)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	u32 addr = __mt7921_reg_addr(dev, offset);</div><div class='ctx'> </div><div class='del'>-	if (intr &amp; MT_INT_MCU_CMD) {</div><div class='del'>-		u32 intr_sw;</div><div class='add'>+	return dev-&gt;bus_ops-&gt;rmw(mdev, addr, mask, val);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		intr_sw = mt76_rr(dev, MT_MCU_CMD);</div><div class='del'>-		/* ack MCU2HOST_SW_INT_STA */</div><div class='del'>-		mt76_wr(dev, MT_MCU_CMD, intr_sw);</div><div class='del'>-		if (intr_sw &amp; MT_MCU_CMD_WAKE_RX_PCIE) {</div><div class='del'>-			mask |= MT_INT_RX_DONE_DATA;</div><div class='del'>-			intr |= MT_INT_RX_DONE_DATA;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+static int mt7921_dma_init(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mt76_dma_attach(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	ret = mt792x_dma_disable(dev, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* init tx queue */</div><div class='add'>+	ret = mt76_connac_init_tx_queues(dev-&gt;phy.mt76, MT7921_TXQ_BAND0,</div><div class='add'>+					 MT7921_TX_RING_SIZE,</div><div class='add'>+					 MT_TX_RING_BASE, NULL, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	mt76_set_irq_mask(&amp;dev-&gt;mt76, MT_WFDMA0_HOST_INT_ENA, mask, 0);</div><div class='add'>+	mt76_wr(dev, MT_WFDMA0_TX_RING0_EXT_CTRL, 0x4);</div><div class='ctx'> </div><div class='del'>-	if (intr &amp; MT_INT_TX_DONE_ALL)</div><div class='del'>-		napi_schedule(&amp;dev-&gt;mt76.tx_napi);</div><div class='add'>+	/* command to WM */</div><div class='add'>+	ret = mt76_init_mcu_queue(&amp;dev-&gt;mt76, MT_MCUQ_WM, MT7921_TXQ_MCU_WM,</div><div class='add'>+				  MT7921_TX_MCU_RING_SIZE, MT_TX_RING_BASE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (intr &amp; MT_INT_RX_DONE_WM)</div><div class='del'>-		napi_schedule(&amp;dev-&gt;mt76.napi[MT_RXQ_MCU]);</div><div class='add'>+	/* firmware download */</div><div class='add'>+	ret = mt76_init_mcu_queue(&amp;dev-&gt;mt76, MT_MCUQ_FWDL, MT7921_TXQ_FWDL,</div><div class='add'>+				  MT7921_TX_FWDL_RING_SIZE, MT_TX_RING_BASE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (intr &amp; MT_INT_RX_DONE_WM2)</div><div class='del'>-		napi_schedule(&amp;dev-&gt;mt76.napi[MT_RXQ_MCU_WA]);</div><div class='add'>+	/* event from WM before firmware download */</div><div class='add'>+	ret = mt76_queue_alloc(dev, &amp;dev-&gt;mt76.q_rx[MT_RXQ_MCU],</div><div class='add'>+			       MT7921_RXQ_MCU_WM,</div><div class='add'>+			       MT7921_RX_MCU_RING_SIZE,</div><div class='add'>+			       MT_RX_BUF_SIZE, MT_RX_EVENT_RING_BASE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Change mcu queue after firmware download */</div><div class='add'>+	ret = mt76_queue_alloc(dev, &amp;dev-&gt;mt76.q_rx[MT_RXQ_MCU_WA],</div><div class='add'>+			       MT7921_RXQ_MCU_WM,</div><div class='add'>+			       MT7921_RX_MCU_WA_RING_SIZE,</div><div class='add'>+			       MT_RX_BUF_SIZE, MT_WFDMA0(0x540));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* rx data */</div><div class='add'>+	ret = mt76_queue_alloc(dev, &amp;dev-&gt;mt76.q_rx[MT_RXQ_MAIN],</div><div class='add'>+			       MT7921_RXQ_BAND0, MT7921_RX_RING_SIZE,</div><div class='add'>+			       MT_RX_BUF_SIZE, MT_RX_DATA_RING_BASE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (intr &amp; MT_INT_RX_DONE_DATA)</div><div class='del'>-		napi_schedule(&amp;dev-&gt;mt76.napi[MT_RXQ_MAIN]);</div><div class='add'>+	ret = mt76_init_queues(dev, mt792x_poll_rx);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	netif_napi_add_tx(dev-&gt;mt76.tx_napi_dev, &amp;dev-&gt;mt76.tx_napi,</div><div class='add'>+			  mt792x_poll_tx);</div><div class='add'>+	napi_enable(&amp;dev-&gt;mt76.tx_napi);</div><div class='add'>+</div><div class='add'>+	return mt792x_dma_enable(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt7921_pci_probe(struct pci_dev *pdev,</div><div class='hunk'>@@ -93,24 +235,49 @@ static int mt7921_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> {</div><div class='ctx'> 	static const struct mt76_driver_ops drv_ops = {</div><div class='ctx'> 		/* txwi_size = txd size + txp size */</div><div class='del'>-		.txwi_size = MT_TXD_SIZE + sizeof(struct mt7921_txp_common),</div><div class='add'>+		.txwi_size = MT_TXD_SIZE + sizeof(struct mt76_connac_hw_txp),</div><div class='ctx'> 		.drv_flags = MT_DRV_TXWI_NO_FREE | MT_DRV_HW_MGMT_TXQ |</div><div class='ctx'> 			     MT_DRV_AMSDU_OFFLOAD,</div><div class='ctx'> 		.survey_flags = SURVEY_INFO_TIME_TX |</div><div class='ctx'> 				SURVEY_INFO_TIME_RX |</div><div class='ctx'> 				SURVEY_INFO_TIME_BSS_RX,</div><div class='ctx'> 		.token_size = MT7921_TOKEN_SIZE,</div><div class='del'>-		.tx_prepare_skb = mt7921_tx_prepare_skb,</div><div class='del'>-		.tx_complete_skb = mt7921_tx_complete_skb,</div><div class='add'>+		.tx_prepare_skb = mt7921e_tx_prepare_skb,</div><div class='add'>+		.tx_complete_skb = mt76_connac_tx_complete_skb,</div><div class='add'>+		.rx_check = mt7921_rx_check,</div><div class='ctx'> 		.rx_skb = mt7921_queue_rx_skb,</div><div class='del'>-		.rx_poll_complete = mt7921_rx_poll_complete,</div><div class='del'>-		.sta_ps = mt7921_sta_ps,</div><div class='add'>+		.rx_poll_complete = mt792x_rx_poll_complete,</div><div class='ctx'> 		.sta_add = mt7921_mac_sta_add,</div><div class='add'>+		.sta_event = mt7921_mac_sta_event,</div><div class='ctx'> 		.sta_remove = mt7921_mac_sta_remove,</div><div class='del'>-		.update_survey = mt7921_update_channel,</div><div class='add'>+		.update_survey = mt792x_update_channel,</div><div class='add'>+		.set_channel = mt7921_set_channel,</div><div class='add'>+	};</div><div class='add'>+	static const struct mt792x_hif_ops mt7921_pcie_ops = {</div><div class='add'>+		.init_reset = mt7921e_init_reset,</div><div class='add'>+		.reset = mt7921e_mac_reset,</div><div class='add'>+		.mcu_init = mt7921e_mcu_init,</div><div class='add'>+		.drv_own = mt792xe_mcu_drv_pmctrl,</div><div class='add'>+		.fw_own = mt792xe_mcu_fw_pmctrl,</div><div class='add'>+	};</div><div class='add'>+	static const struct mt792x_irq_map irq_map = {</div><div class='add'>+		.host_irq_enable = MT_WFDMA0_HOST_INT_ENA,</div><div class='add'>+		.tx = {</div><div class='add'>+			.all_complete_mask = MT_INT_TX_DONE_ALL,</div><div class='add'>+			.mcu_complete_mask = MT_INT_TX_DONE_MCU,</div><div class='add'>+		},</div><div class='add'>+		.rx = {</div><div class='add'>+			.data_complete_mask = MT_INT_RX_DONE_DATA,</div><div class='add'>+			.wm_complete_mask = MT_INT_RX_DONE_WM,</div><div class='add'>+			.wm2_complete_mask = MT_INT_RX_DONE_WM2,</div><div class='add'>+		},</div><div class='ctx'> 	};</div><div class='del'>-	struct mt7921_dev *dev;</div><div class='add'>+	struct ieee80211_ops *ops;</div><div class='add'>+	struct mt76_bus_ops *bus_ops;</div><div class='add'>+	struct mt792x_dev *dev;</div><div class='ctx'> 	struct mt76_dev *mdev;</div><div class='add'>+	u16 cmd, chipid;</div><div class='add'>+	u8 features;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = pcim_enable_device(pdev);</div><div class='hunk'>@@ -121,46 +288,104 @@ static int mt7921_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	pci_read_config_word(pdev, PCI_COMMAND, &amp;cmd);</div><div class='add'>+	if (!(cmd &amp; PCI_COMMAND_MEMORY)) {</div><div class='add'>+		cmd |= PCI_COMMAND_MEMORY;</div><div class='add'>+		pci_write_config_word(pdev, PCI_COMMAND, cmd);</div><div class='add'>+	}</div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='ctx'> 	ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='add'>+	ret = dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_free_pci_vec;</div><div class='ctx'> </div><div class='del'>-	mt76_pci_disable_aspm(pdev);</div><div class='add'>+	if (mt7921_disable_aspm)</div><div class='add'>+		mt76_pci_disable_aspm(pdev);</div><div class='add'>+</div><div class='add'>+	ops = mt792x_get_mac80211_ops(&amp;pdev-&gt;dev, &amp;mt7921_ops,</div><div class='add'>+				      (void *)id-&gt;driver_data, &amp;features);</div><div class='add'>+	if (!ops) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_free_pci_vec;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mdev = mt76_alloc_device(&amp;pdev-&gt;dev, sizeof(*dev), &amp;mt7921_ops,</div><div class='del'>-				 &amp;drv_ops);</div><div class='add'>+	mdev = mt76_alloc_device(&amp;pdev-&gt;dev, sizeof(*dev), ops, &amp;drv_ops);</div><div class='ctx'> 	if (!mdev) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto err_free_pci_vec;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev = container_of(mdev, struct mt7921_dev, mt76);</div><div class='add'>+	pci_set_drvdata(pdev, mdev);</div><div class='ctx'> </div><div class='add'>+	dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	dev-&gt;fw_features = features;</div><div class='add'>+	dev-&gt;hif_ops = &amp;mt7921_pcie_ops;</div><div class='add'>+	dev-&gt;irq_map = &amp;irq_map;</div><div class='ctx'> 	mt76_mmio_init(&amp;dev-&gt;mt76, pcim_iomap_table(pdev)[0]);</div><div class='del'>-	tasklet_init(&amp;dev-&gt;irq_tasklet, mt7921_irq_tasklet, (unsigned long)dev);</div><div class='del'>-	mdev-&gt;rev = (mt7921_l1_rr(dev, MT_HW_CHIPID) &lt;&lt; 16) |</div><div class='add'>+	tasklet_init(&amp;mdev-&gt;irq_tasklet, mt792x_irq_tasklet, (unsigned long)dev);</div><div class='add'>+</div><div class='add'>+	dev-&gt;phy.dev = dev;</div><div class='add'>+	dev-&gt;phy.mt76 = &amp;dev-&gt;mt76.phy;</div><div class='add'>+	dev-&gt;mt76.phy.priv = &amp;dev-&gt;phy;</div><div class='add'>+	dev-&gt;bus_ops = dev-&gt;mt76.bus;</div><div class='add'>+	bus_ops = devm_kmemdup(dev-&gt;mt76.dev, dev-&gt;bus_ops, sizeof(*bus_ops),</div><div class='add'>+			       GFP_KERNEL);</div><div class='add'>+	if (!bus_ops) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_free_dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bus_ops-&gt;rr = mt7921_rr;</div><div class='add'>+	bus_ops-&gt;wr = mt7921_wr;</div><div class='add'>+	bus_ops-&gt;rmw = mt7921_rmw;</div><div class='add'>+	dev-&gt;mt76.bus = bus_ops;</div><div class='add'>+</div><div class='add'>+	if (!mt7921_disable_aspm &amp;&amp; mt76_pci_aspm_supported(pdev))</div><div class='add'>+		dev-&gt;aspm_supported = true;</div><div class='add'>+</div><div class='add'>+	ret = mt792xe_mcu_fw_pmctrl(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free_dev;</div><div class='add'>+</div><div class='add'>+	ret = __mt792xe_mcu_drv_pmctrl(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free_dev;</div><div class='add'>+</div><div class='add'>+	chipid = mt7921_l1_rr(dev, MT_HW_CHIPID);</div><div class='add'>+	if (chipid == 0x7961 &amp;&amp; (mt7921_l1_rr(dev, MT_HW_BOUND) &amp; BIT(7)))</div><div class='add'>+		chipid = 0x7920;</div><div class='add'>+	mdev-&gt;rev = (chipid &lt;&lt; 16) |</div><div class='ctx'> 		    (mt7921_l1_rr(dev, MT_HW_REV) &amp; 0xff);</div><div class='del'>-	dev_err(mdev-&gt;dev, "ASIC revision: %04x\n", mdev-&gt;rev);</div><div class='add'>+	dev_info(mdev-&gt;dev, "ASIC revision: %04x\n", mdev-&gt;rev);</div><div class='ctx'> </div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, 0);</div><div class='add'>+	ret = mt792x_wfsys_reset(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free_dev;</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, irq_map.host_irq_enable, 0);</div><div class='ctx'> </div><div class='ctx'> 	mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff);</div><div class='ctx'> </div><div class='del'>-	ret = devm_request_irq(mdev-&gt;dev, pdev-&gt;irq, mt7921_irq_handler,</div><div class='add'>+	ret = devm_request_irq(mdev-&gt;dev, pdev-&gt;irq, mt792x_irq_handler,</div><div class='ctx'> 			       IRQF_SHARED, KBUILD_MODNAME, dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_free_dev;</div><div class='ctx'> </div><div class='add'>+	ret = mt7921_dma_init(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free_irq;</div><div class='add'>+</div><div class='ctx'> 	ret = mt7921_register_device(dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_free_irq;</div><div class='ctx'> </div><div class='add'>+	if (of_property_read_bool(dev-&gt;mt76.dev-&gt;of_node, "wakeup-source"))</div><div class='add'>+		device_init_wakeup(dev-&gt;mt76.dev, true);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_free_irq:</div><div class='hunk'>@@ -176,34 +401,52 @@ err_free_pci_vec:</div><div class='ctx'> static void mt7921_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt76_dev *mdev = pci_get_drvdata(pdev);</div><div class='del'>-	struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+</div><div class='add'>+	if (of_property_read_bool(dev-&gt;mt76.dev-&gt;of_node, "wakeup-source"))</div><div class='add'>+		device_init_wakeup(dev-&gt;mt76.dev, false);</div><div class='ctx'> </div><div class='del'>-	mt7921_unregister_device(dev);</div><div class='add'>+	mt7921e_unregister_device(dev);</div><div class='add'>+	set_bit(MT76_REMOVED, &amp;mdev-&gt;phy.state);</div><div class='ctx'> 	devm_free_irq(&amp;pdev-&gt;dev, pdev-&gt;irq, dev);</div><div class='add'>+	mt76_free_device(&amp;dev-&gt;mt76);</div><div class='ctx'> 	pci_free_irq_vectors(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int mt7921_pci_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+static int mt7921_pci_suspend(struct device *device)</div><div class='ctx'> {</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(device);</div><div class='ctx'> 	struct mt76_dev *mdev = pci_get_drvdata(pdev);</div><div class='del'>-	struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);</div><div class='del'>-	bool hif_suspend;</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='ctx'> 	int i, err;</div><div class='ctx'> </div><div class='del'>-	err = mt76_connac_pm_wake(&amp;dev-&gt;mphy, &amp;dev-&gt;pm);</div><div class='add'>+	pm-&gt;suspended = true;</div><div class='add'>+	flush_work(&amp;dev-&gt;reset_work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;pm-&gt;ps_work);</div><div class='add'>+	cancel_work_sync(&amp;pm-&gt;wake_work);</div><div class='add'>+</div><div class='add'>+	mt7921_roc_abort_sync(dev);</div><div class='add'>+</div><div class='add'>+	err = mt792x_mcu_drv_pmctrl(dev);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+		goto restore_suspend;</div><div class='ctx'> </div><div class='del'>-	hif_suspend = !test_bit(MT76_STATE_SUSPEND, &amp;dev-&gt;mphy.state);</div><div class='del'>-	if (hif_suspend) {</div><div class='del'>-		err = mt76_connac_mcu_set_hif_suspend(mdev, true);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='add'>+	wait_event_timeout(dev-&gt;wait,</div><div class='add'>+			   !dev-&gt;regd_in_progress, 5 * HZ);</div><div class='add'>+</div><div class='add'>+	err = mt7921_mcu_radio_led_ctrl(dev, EXT_CMD_RADIO_OFF_LED);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto restore_suspend;</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;pm.enable)</div><div class='del'>-		mt76_connac_mcu_set_deep_sleep(&amp;dev-&gt;mt76, true);</div><div class='add'>+	err = mt76_connac_mcu_set_hif_suspend(mdev, true, true);</div><div class='add'>+	if (err)</div><div class='add'>+		goto restore_suspend;</div><div class='add'>+</div><div class='add'>+	/* always enable deep sleep during suspend to reduce</div><div class='add'>+	 * power consumption</div><div class='add'>+	 */</div><div class='add'>+	mt76_connac_mcu_set_deep_sleep(&amp;dev-&gt;mt76, true);</div><div class='ctx'> </div><div class='ctx'> 	napi_disable(&amp;mdev-&gt;tx_napi);</div><div class='ctx'> 	mt76_worker_disable(&amp;mdev-&gt;tx_worker);</div><div class='hunk'>@@ -212,8 +455,6 @@ static int mt7921_pci_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 		napi_disable(&amp;mdev-&gt;napi[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pci_enable_wake(pdev, pci_choose_state(pdev, state), true);</div><div class='del'>-</div><div class='ctx'> 	/* wait until dma is idle  */</div><div class='ctx'> 	mt76_poll(dev, MT_WFDMA0_GLO_CFG,</div><div class='ctx'> 		  MT_WFDMA0_GLO_CFG_TX_DMA_BUSY |</div><div class='hunk'>@@ -224,59 +465,56 @@ static int mt7921_pci_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 		   MT_WFDMA0_GLO_CFG_TX_DMA_EN | MT_WFDMA0_GLO_CFG_RX_DMA_EN);</div><div class='ctx'> </div><div class='ctx'> 	/* disable interrupt */</div><div class='del'>-	mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, 0);</div><div class='add'>+	mt76_wr(dev, dev-&gt;irq_map-&gt;host_irq_enable, 0);</div><div class='ctx'> 	mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0x0);</div><div class='ctx'> 	synchronize_irq(pdev-&gt;irq);</div><div class='del'>-	tasklet_kill(&amp;dev-&gt;irq_tasklet);</div><div class='add'>+	tasklet_kill(&amp;mdev-&gt;irq_tasklet);</div><div class='ctx'> </div><div class='del'>-	err = mt7921_mcu_fw_pmctrl(dev);</div><div class='add'>+	err = mt792x_mcu_fw_pmctrl(dev);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto restore;</div><div class='del'>-</div><div class='del'>-	pci_save_state(pdev);</div><div class='del'>-	err = pci_set_power_state(pdev, pci_choose_state(pdev, state));</div><div class='del'>-	if (err)</div><div class='del'>-		goto restore;</div><div class='add'>+		goto restore_napi;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-restore:</div><div class='add'>+restore_napi:</div><div class='ctx'> 	mt76_for_each_q_rx(mdev, i) {</div><div class='ctx'> 		napi_enable(&amp;mdev-&gt;napi[i]);</div><div class='ctx'> 	}</div><div class='ctx'> 	napi_enable(&amp;mdev-&gt;tx_napi);</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;pm.enable)</div><div class='add'>+	if (!pm-&gt;ds_enable)</div><div class='ctx'> 		mt76_connac_mcu_set_deep_sleep(&amp;dev-&gt;mt76, false);</div><div class='ctx'> </div><div class='del'>-	if (hif_suspend)</div><div class='del'>-		mt76_connac_mcu_set_hif_suspend(mdev, false);</div><div class='add'>+	mt76_connac_mcu_set_hif_suspend(mdev, false, true);</div><div class='add'>+</div><div class='add'>+restore_suspend:</div><div class='add'>+	pm-&gt;suspended = false;</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		mt792x_reset(&amp;dev-&gt;mt76);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7921_pci_resume(struct pci_dev *pdev)</div><div class='add'>+static int mt7921_pci_resume(struct device *device)</div><div class='ctx'> {</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(device);</div><div class='ctx'> 	struct mt76_dev *mdev = pci_get_drvdata(pdev);</div><div class='del'>-	struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='ctx'> 	int i, err;</div><div class='ctx'> </div><div class='del'>-	err = pci_set_power_state(pdev, PCI_D0);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	pci_restore_state(pdev);</div><div class='del'>-</div><div class='del'>-	err = mt7921_mcu_drv_pmctrl(dev);</div><div class='add'>+	err = mt792x_mcu_drv_pmctrl(dev);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+		goto failed;</div><div class='ctx'> </div><div class='del'>-	mt7921_wpdma_reinit_cond(dev);</div><div class='add'>+	mt792x_wpdma_reinit_cond(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* enable interrupt */</div><div class='ctx'> 	mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff);</div><div class='del'>-	mt7921_irq_enable(dev, MT_INT_RX_DONE_ALL | MT_INT_TX_DONE_ALL |</div><div class='del'>-			  MT_INT_MCU_CMD);</div><div class='add'>+	mt76_connac_irq_enable(&amp;dev-&gt;mt76,</div><div class='add'>+			       dev-&gt;irq_map-&gt;tx.all_complete_mask |</div><div class='add'>+			       MT_INT_RX_DONE_ALL | MT_INT_MCU_CMD);</div><div class='ctx'> 	mt76_set(dev, MT_MCU2HOST_SW_INT_ENA, MT_MCU_CMD_WAKE_RX_PCIE);</div><div class='ctx'> </div><div class='ctx'> 	/* put dma enabled */</div><div class='hunk'>@@ -284,39 +522,64 @@ static int mt7921_pci_resume(struct pci_dev *pdev)</div><div class='ctx'> 		 MT_WFDMA0_GLO_CFG_TX_DMA_EN | MT_WFDMA0_GLO_CFG_RX_DMA_EN);</div><div class='ctx'> </div><div class='ctx'> 	mt76_worker_enable(&amp;mdev-&gt;tx_worker);</div><div class='add'>+</div><div class='ctx'> 	mt76_for_each_q_rx(mdev, i) {</div><div class='ctx'> 		napi_enable(&amp;mdev-&gt;napi[i]);</div><div class='del'>-		napi_schedule(&amp;mdev-&gt;napi[i]);</div><div class='ctx'> 	}</div><div class='ctx'> 	napi_enable(&amp;mdev-&gt;tx_napi);</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	mt76_for_each_q_rx(mdev, i) {</div><div class='add'>+		napi_schedule(&amp;mdev-&gt;napi[i]);</div><div class='add'>+	}</div><div class='ctx'> 	napi_schedule(&amp;mdev-&gt;tx_napi);</div><div class='add'>+	local_bh_enable();</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;pm.enable)</div><div class='add'>+	/* restore previous ds setting */</div><div class='add'>+	if (!pm-&gt;ds_enable)</div><div class='ctx'> 		mt76_connac_mcu_set_deep_sleep(&amp;dev-&gt;mt76, false);</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(MT76_STATE_SUSPEND, &amp;dev-&gt;mphy.state))</div><div class='del'>-		err = mt76_connac_mcu_set_hif_suspend(mdev, false);</div><div class='add'>+	err = mt76_connac_mcu_set_hif_suspend(mdev, false, true);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	mt7921_regd_update(dev);</div><div class='add'>+	err = mt7921_mcu_radio_led_ctrl(dev, EXT_CMD_RADIO_ON_LED);</div><div class='add'>+failed:</div><div class='add'>+	pm-&gt;suspended = false;</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		mt792x_reset(&amp;dev-&gt;mt76);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='del'>-struct pci_driver mt7921_pci_driver = {</div><div class='add'>+static void mt7921_pci_shutdown(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	mt7921_pci_remove(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(mt7921_pm_ops, mt7921_pci_suspend, mt7921_pci_resume);</div><div class='add'>+</div><div class='add'>+static struct pci_driver mt7921_pci_driver = {</div><div class='ctx'> 	.name		= KBUILD_MODNAME,</div><div class='ctx'> 	.id_table	= mt7921_pci_device_table,</div><div class='ctx'> 	.probe		= mt7921_pci_probe,</div><div class='ctx'> 	.remove		= mt7921_pci_remove,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend	= mt7921_pci_suspend,</div><div class='del'>-	.resume		= mt7921_pci_resume,</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='add'>+	.shutdown	= mt7921_pci_shutdown,</div><div class='add'>+	.driver.pm	= pm_sleep_ptr(&amp;mt7921_pm_ops),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> module_pci_driver(mt7921_pci_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, mt7921_pci_device_table);</div><div class='add'>+MODULE_FIRMWARE(MT7920_FIRMWARE_WM);</div><div class='add'>+MODULE_FIRMWARE(MT7920_ROM_PATCH);</div><div class='ctx'> MODULE_FIRMWARE(MT7921_FIRMWARE_WM);</div><div class='ctx'> MODULE_FIRMWARE(MT7921_ROM_PATCH);</div><div class='add'>+MODULE_FIRMWARE(MT7922_FIRMWARE_WM);</div><div class='add'>+MODULE_FIRMWARE(MT7922_ROM_PATCH);</div><div class='ctx'> MODULE_AUTHOR("Sean Wang &lt;sean.wang@mediatek.com&gt;");</div><div class='ctx'> MODULE_AUTHOR("Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("MediaTek MT7921E (PCIe) wireless driver");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c<br/>new file mode 100644<br/>index 000000000000..5ec084432ae3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c</a></div><div class='hunk'>@@ -0,0 +1,129 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/* Copyright (C) 2021 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#include "mt7921.h"</div><div class='add'>+#include "../dma.h"</div><div class='add'>+#include "../mt76_connac2_mac.h"</div><div class='add'>+</div><div class='add'>+int mt7921e_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='add'>+			   enum mt76_txq_id qid, struct mt76_wcid *wcid,</div><div class='add'>+			   struct ieee80211_sta *sta,</div><div class='add'>+			   struct mt76_tx_info *tx_info)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx_info-&gt;skb);</div><div class='add'>+	struct ieee80211_key_conf *key = info-&gt;control.hw_key;</div><div class='add'>+	struct mt76_connac_hw_txp *txp;</div><div class='add'>+	struct mt76_txwi_cache *t;</div><div class='add'>+	int id, pid;</div><div class='add'>+	u8 *txwi = (u8 *)txwi_ptr;</div><div class='add'>+</div><div class='add'>+	if (unlikely(tx_info-&gt;skb-&gt;len &lt;= ETH_HLEN))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!wcid)</div><div class='add'>+		wcid = &amp;dev-&gt;mt76.global_wcid;</div><div class='add'>+</div><div class='add'>+	t = (struct mt76_txwi_cache *)(txwi + mdev-&gt;drv-&gt;txwi_size);</div><div class='add'>+	t-&gt;skb = tx_info-&gt;skb;</div><div class='add'>+</div><div class='add'>+	id = mt76_token_consume(mdev, &amp;t);</div><div class='add'>+	if (id &lt; 0)</div><div class='add'>+		return id;</div><div class='add'>+</div><div class='add'>+	if (sta) {</div><div class='add'>+		struct mt792x_sta *msta = (struct mt792x_sta *)sta-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+		if (time_after(jiffies, msta-&gt;deflink.last_txs + HZ / 4)) {</div><div class='add'>+			info-&gt;flags |= IEEE80211_TX_CTL_REQ_TX_STATUS;</div><div class='add'>+			msta-&gt;deflink.last_txs = jiffies;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pid = mt76_tx_status_skb_add(mdev, wcid, tx_info-&gt;skb);</div><div class='add'>+	mt76_connac2_mac_write_txwi(mdev, txwi_ptr, tx_info-&gt;skb, wcid, key,</div><div class='add'>+				    pid, qid, 0);</div><div class='add'>+</div><div class='add'>+	txp = (struct mt76_connac_hw_txp *)(txwi + MT_TXD_SIZE);</div><div class='add'>+	memset(txp, 0, sizeof(struct mt76_connac_hw_txp));</div><div class='add'>+	mt76_connac_write_hw_txp(mdev, tx_info, txp, id);</div><div class='add'>+</div><div class='add'>+	tx_info-&gt;skb = NULL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7921e_mac_reset(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	mt792xe_mcu_drv_pmctrl(dev);</div><div class='add'>+</div><div class='add'>+	mt76_connac_free_pending_tx_skbs(&amp;dev-&gt;pm, NULL);</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, dev-&gt;irq_map-&gt;host_irq_enable, 0);</div><div class='add'>+	mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0x0);</div><div class='add'>+</div><div class='add'>+	set_bit(MT76_MCU_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+	wake_up(&amp;dev-&gt;mt76.mcu.wait);</div><div class='add'>+	skb_queue_purge(&amp;dev-&gt;mt76.mcu.res_q);</div><div class='add'>+</div><div class='add'>+	mt76_txq_schedule_all(&amp;dev-&gt;mphy);</div><div class='add'>+</div><div class='add'>+	mt76_worker_disable(&amp;dev-&gt;mt76.tx_worker);</div><div class='add'>+	napi_disable(&amp;dev-&gt;mt76.napi[MT_RXQ_MAIN]);</div><div class='add'>+	napi_disable(&amp;dev-&gt;mt76.napi[MT_RXQ_MCU]);</div><div class='add'>+	napi_disable(&amp;dev-&gt;mt76.napi[MT_RXQ_MCU_WA]);</div><div class='add'>+	napi_disable(&amp;dev-&gt;mt76.tx_napi);</div><div class='add'>+</div><div class='add'>+	mt76_connac2_tx_token_put(&amp;dev-&gt;mt76);</div><div class='add'>+	idr_init(&amp;dev-&gt;mt76.token);</div><div class='add'>+</div><div class='add'>+	mt792x_wpdma_reset(dev, true);</div><div class='add'>+</div><div class='add'>+	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i) {</div><div class='add'>+		napi_enable(&amp;dev-&gt;mt76.napi[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i) {</div><div class='add'>+		napi_schedule(&amp;dev-&gt;mt76.napi[i]);</div><div class='add'>+	}</div><div class='add'>+	local_bh_enable();</div><div class='add'>+</div><div class='add'>+	dev-&gt;fw_assert = false;</div><div class='add'>+	clear_bit(MT76_MCU_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, dev-&gt;irq_map-&gt;host_irq_enable,</div><div class='add'>+		dev-&gt;irq_map-&gt;tx.all_complete_mask |</div><div class='add'>+		MT_INT_RX_DONE_ALL | MT_INT_MCU_CMD);</div><div class='add'>+	mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff);</div><div class='add'>+</div><div class='add'>+	err = mt7921e_driver_own(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt7921_run_firmware(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt7921_mcu_set_eeprom(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt7921_mac_init(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = __mt7921_start(&amp;dev-&gt;phy);</div><div class='add'>+out:</div><div class='add'>+</div><div class='add'>+	napi_enable(&amp;dev-&gt;mt76.tx_napi);</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	napi_schedule(&amp;dev-&gt;mt76.tx_napi);</div><div class='add'>+	local_bh_enable();</div><div class='add'>+</div><div class='add'>+	mt76_worker_enable(&amp;dev-&gt;mt76.tx_worker);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c<br/>new file mode 100644<br/>index 000000000000..8439c849a7a6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c</a></div><div class='hunk'>@@ -0,0 +1,63 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/* Copyright (C) 2021 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#include "mt7921.h"</div><div class='add'>+#include "mcu.h"</div><div class='add'>+</div><div class='add'>+int mt7921e_driver_own(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u32 reg = mt7921_reg_map_l1(dev, MT_TOP_LPCR_HOST_BAND0);</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, reg, MT_TOP_LPCR_HOST_DRV_OWN);</div><div class='add'>+	if (!mt76_poll_msec(dev, reg, MT_TOP_LPCR_HOST_FW_OWN,</div><div class='add'>+			    0, 500)) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "Timeout for driver own\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7921_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,</div><div class='add'>+			int cmd, int *seq)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	enum mt76_mcuq_id txq = MT_MCUQ_WM;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_connac2_mcu_fill_message(mdev, skb, cmd, seq);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mdev-&gt;mcu.timeout = 3 * HZ;</div><div class='add'>+</div><div class='add'>+	if (cmd == MCU_CMD(FW_SCATTER))</div><div class='add'>+		txq = MT_MCUQ_FWDL;</div><div class='add'>+</div><div class='add'>+	return mt76_tx_queue_skb_raw(dev, mdev-&gt;q_mcu[txq], skb, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7921e_mcu_init(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	static const struct mt76_mcu_ops mt7921_mcu_ops = {</div><div class='add'>+		.headroom = sizeof(struct mt76_connac2_mcu_txd),</div><div class='add'>+		.mcu_skb_send_msg = mt7921_mcu_send_message,</div><div class='add'>+		.mcu_parse_response = mt7921_mcu_parse_response,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dev-&gt;mt76.mcu_ops = &amp;mt7921_mcu_ops;</div><div class='add'>+</div><div class='add'>+	err = mt7921e_driver_own(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_PCIE_MAC_PM, MT_PCIE_MAC_PM_L0S_DIS, 1);</div><div class='add'>+</div><div class='add'>+	err = mt7921_run_firmware(dev);</div><div class='add'>+</div><div class='add'>+	mt76_queue_tx_cleanup(dev, dev-&gt;mt76.q_mcu[MT_MCUQ_FWDL], false);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/regs.h b/drivers/net/wireless/mediatek/mt76/mt7921/regs.h<br/>index b6944c867a57..4d9eaf1e0692 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/regs.h?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/regs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/regs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7921/regs.h</a></div><div class='hunk'>@@ -1,32 +1,12 @@</div><div class='del'>-/* SPDX-License-Identifier: ISC */</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='ctx'> /* Copyright (C) 2020 MediaTek Inc. */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MT7921_REGS_H</div><div class='ctx'> #define __MT7921_REGS_H</div><div class='ctx'> </div><div class='del'>-/* MCU WFDMA1 */</div><div class='del'>-#define MT_MCU_WFDMA1_BASE		0x3000</div><div class='del'>-#define MT_MCU_WFDMA1(ofs)		(MT_MCU_WFDMA1_BASE + (ofs))</div><div class='add'>+#include "../mt792x_regs.h"</div><div class='ctx'> </div><div class='del'>-#define MT_MCU_INT_EVENT		MT_MCU_WFDMA1(0x108)</div><div class='del'>-#define MT_MCU_INT_EVENT_DMA_STOPPED	BIT(0)</div><div class='del'>-#define MT_MCU_INT_EVENT_DMA_INIT	BIT(1)</div><div class='del'>-#define MT_MCU_INT_EVENT_SER_TRIGGER	BIT(2)</div><div class='del'>-#define MT_MCU_INT_EVENT_RESET_DONE	BIT(3)</div><div class='del'>-</div><div class='del'>-#define MT_PLE_BASE			0x8000</div><div class='del'>-#define MT_PLE(ofs)			(MT_PLE_BASE + (ofs))</div><div class='del'>-</div><div class='del'>-#define MT_PLE_FL_Q0_CTRL		MT_PLE(0x1b0)</div><div class='del'>-#define MT_PLE_FL_Q1_CTRL		MT_PLE(0x1b4)</div><div class='del'>-#define MT_PLE_FL_Q2_CTRL		MT_PLE(0x1b8)</div><div class='del'>-#define MT_PLE_FL_Q3_CTRL		MT_PLE(0x1bc)</div><div class='del'>-</div><div class='del'>-#define MT_PLE_AC_QEMPTY(ac, n)		MT_PLE(0x300 + 0x10 * (ac) + \</div><div class='del'>-					       ((n) &lt;&lt; 2))</div><div class='del'>-#define MT_PLE_AMSDU_PACK_MSDU_CNT(n)	MT_PLE(0x10e0 + ((n) &lt;&lt; 2))</div><div class='del'>-</div><div class='del'>-#define MT_MDP_BASE			0xf000</div><div class='add'>+#define MT_MDP_BASE			0x820cd000</div><div class='ctx'> #define MT_MDP(ofs)			(MT_MDP_BASE + (ofs))</div><div class='ctx'> </div><div class='ctx'> #define MT_MDP_DCR0			MT_MDP(0x000)</div><div class='hunk'>@@ -48,240 +28,7 @@</div><div class='ctx'> #define MT_MDP_TO_HIF			0</div><div class='ctx'> #define MT_MDP_TO_WM			1</div><div class='ctx'> </div><div class='del'>-/* TMAC: band 0(0x21000), band 1(0xa1000) */</div><div class='del'>-#define MT_WF_TMAC_BASE(_band)		((_band) ? 0xa1000 : 0x21000)</div><div class='del'>-#define MT_WF_TMAC(_band, ofs)		(MT_WF_TMAC_BASE(_band) + (ofs))</div><div class='del'>-</div><div class='del'>-#define MT_TMAC_TCR0(_band)		MT_WF_TMAC(_band, 0)</div><div class='del'>-#define MT_TMAC_TCR0_TBTT_STOP_CTRL	BIT(25)</div><div class='del'>-</div><div class='del'>-#define MT_TMAC_CDTR(_band)		MT_WF_TMAC(_band, 0x090)</div><div class='del'>-#define MT_TMAC_ODTR(_band)		MT_WF_TMAC(_band, 0x094)</div><div class='del'>-#define MT_TIMEOUT_VAL_PLCP		GENMASK(15, 0)</div><div class='del'>-#define MT_TIMEOUT_VAL_CCA		GENMASK(31, 16)</div><div class='del'>-</div><div class='del'>-#define MT_TMAC_ICR0(_band)		MT_WF_TMAC(_band, 0x0a4)</div><div class='del'>-#define MT_IFS_EIFS			GENMASK(8, 0)</div><div class='del'>-#define MT_IFS_RIFS			GENMASK(14, 10)</div><div class='del'>-#define MT_IFS_SIFS			GENMASK(22, 16)</div><div class='del'>-#define MT_IFS_SLOT			GENMASK(30, 24)</div><div class='del'>-</div><div class='del'>-#define MT_TMAC_CTCR0(_band)			MT_WF_TMAC(_band, 0x0f4)</div><div class='del'>-#define MT_TMAC_CTCR0_INS_DDLMT_REFTIME		GENMASK(5, 0)</div><div class='del'>-#define MT_TMAC_CTCR0_INS_DDLMT_EN		BIT(17)</div><div class='del'>-#define MT_TMAC_CTCR0_INS_DDLMT_VHT_SMPDU_EN	BIT(18)</div><div class='del'>-</div><div class='del'>-#define MT_TMAC_TRCR0(_band)		MT_WF_TMAC(_band, 0x09c)</div><div class='del'>-#define MT_TMAC_TFCR0(_band)		MT_WF_TMAC(_band, 0x1e0)</div><div class='del'>-</div><div class='del'>-#define MT_WF_DMA_BASE(_band)		((_band) ? 0xa1e00 : 0x21e00)</div><div class='del'>-#define MT_WF_DMA(_band, ofs)		(MT_WF_DMA_BASE(_band) + (ofs))</div><div class='del'>-</div><div class='del'>-#define MT_DMA_DCR0(_band)		MT_WF_DMA(_band, 0x000)</div><div class='del'>-#define MT_DMA_DCR0_MAX_RX_LEN		GENMASK(15, 3)</div><div class='del'>-#define MT_DMA_DCR0_RXD_G5_EN		BIT(23)</div><div class='del'>-</div><div class='del'>-/* LPON: band 0(0x24200), band 1(0xa4200) */</div><div class='del'>-#define MT_WF_LPON_BASE(_band)		((_band) ? 0xa4200 : 0x24200)</div><div class='del'>-#define MT_WF_LPON(_band, ofs)		(MT_WF_LPON_BASE(_band) + (ofs))</div><div class='del'>-</div><div class='del'>-#define MT_LPON_UTTR0(_band)		MT_WF_LPON(_band, 0x080)</div><div class='del'>-#define MT_LPON_UTTR1(_band)		MT_WF_LPON(_band, 0x084)</div><div class='del'>-</div><div class='del'>-#define MT_LPON_TCR(_band, n)		MT_WF_LPON(_band, 0x0a8 + (n) * 4)</div><div class='del'>-#define MT_LPON_TCR_SW_MODE		GENMASK(1, 0)</div><div class='del'>-#define MT_LPON_TCR_SW_WRITE		BIT(0)</div><div class='del'>-</div><div class='del'>-/* MIB: band 0(0x24800), band 1(0xa4800) */</div><div class='del'>-#define MT_WF_MIB_BASE(_band)		((_band) ? 0xa4800 : 0x24800)</div><div class='del'>-#define MT_WF_MIB(_band, ofs)		(MT_WF_MIB_BASE(_band) + (ofs))</div><div class='del'>-</div><div class='del'>-#define MT_MIB_SDR3(_band)		MT_WF_MIB(_band, 0x698)</div><div class='del'>-#define MT_MIB_SDR3_FCS_ERR_MASK	GENMASK(31, 16)</div><div class='del'>-</div><div class='del'>-#define MT_MIB_SDR9(_band)		MT_WF_MIB(_band, 0x02c)</div><div class='del'>-#define MT_MIB_SDR9_BUSY_MASK		GENMASK(23, 0)</div><div class='del'>-</div><div class='del'>-#define MT_MIB_SDR16(_band)		MT_WF_MIB(_band, 0x048)</div><div class='del'>-#define MT_MIB_SDR16_BUSY_MASK		GENMASK(23, 0)</div><div class='del'>-</div><div class='del'>-#define MT_MIB_SDR34(_band)		MT_WF_MIB(_band, 0x090)</div><div class='del'>-#define MT_MIB_MU_BF_TX_CNT		GENMASK(15, 0)</div><div class='del'>-</div><div class='del'>-#define MT_MIB_SDR36(_band)		MT_WF_MIB(_band, 0x098)</div><div class='del'>-#define MT_MIB_SDR36_TXTIME_MASK	GENMASK(23, 0)</div><div class='del'>-#define MT_MIB_SDR37(_band)		MT_WF_MIB(_band, 0x09c)</div><div class='del'>-#define MT_MIB_SDR37_RXTIME_MASK	GENMASK(23, 0)</div><div class='del'>-</div><div class='del'>-#define MT_MIB_DR8(_band)		MT_WF_MIB(_band, 0x0c0)</div><div class='del'>-#define MT_MIB_DR9(_band)		MT_WF_MIB(_band, 0x0c4)</div><div class='del'>-#define MT_MIB_DR11(_band)		MT_WF_MIB(_band, 0x0cc)</div><div class='del'>-</div><div class='del'>-#define MT_MIB_MB_SDR0(_band, n)	MT_WF_MIB(_band, 0x100 + ((n) &lt;&lt; 4))</div><div class='del'>-#define MT_MIB_RTS_RETRIES_COUNT_MASK	GENMASK(31, 16)</div><div class='del'>-#define MT_MIB_RTS_COUNT_MASK		GENMASK(15, 0)</div><div class='del'>-</div><div class='del'>-#define MT_MIB_MB_BSDR0(_band)		MT_WF_MIB(_band, 0x688)</div><div class='del'>-#define MT_MIB_RTS_COUNT_MASK		GENMASK(15, 0)</div><div class='del'>-#define MT_MIB_MB_BSDR1(_band)		MT_WF_MIB(_band, 0x690)</div><div class='del'>-#define MT_MIB_RTS_FAIL_COUNT_MASK	GENMASK(15, 0)</div><div class='del'>-#define MT_MIB_MB_BSDR2(_band)		MT_WF_MIB(_band, 0x518)</div><div class='del'>-#define MT_MIB_BA_FAIL_COUNT_MASK	GENMASK(15, 0)</div><div class='del'>-#define MT_MIB_MB_BSDR3(_band)		MT_WF_MIB(_band, 0x520)</div><div class='del'>-#define MT_MIB_ACK_FAIL_COUNT_MASK	GENMASK(15, 0)</div><div class='del'>-</div><div class='del'>-#define MT_MIB_MB_SDR2(_band, n)	MT_WF_MIB(_band, 0x108 + ((n) &lt;&lt; 4))</div><div class='del'>-#define MT_MIB_FRAME_RETRIES_COUNT_MASK	GENMASK(15, 0)</div><div class='del'>-</div><div class='del'>-#define MT_TX_AGG_CNT(_band, n)		MT_WF_MIB(_band, 0x7dc + ((n) &lt;&lt; 2))</div><div class='del'>-#define MT_TX_AGG_CNT2(_band, n)	MT_WF_MIB(_band, 0x7ec + ((n) &lt;&lt; 2))</div><div class='del'>-#define MT_MIB_ARNG(_band, n)		MT_WF_MIB(_band, 0x0b0 + ((n) &lt;&lt; 2))</div><div class='del'>-#define MT_MIB_ARNCR_RANGE(val, n)	(((val) &gt;&gt; ((n) &lt;&lt; 3)) &amp; GENMASK(7, 0))</div><div class='del'>-</div><div class='del'>-#define MT_WTBLON_TOP_BASE		0x34000</div><div class='del'>-#define MT_WTBLON_TOP(ofs)		(MT_WTBLON_TOP_BASE + (ofs))</div><div class='del'>-#define MT_WTBLON_TOP_WDUCR		MT_WTBLON_TOP(0x200)</div><div class='del'>-#define MT_WTBLON_TOP_WDUCR_GROUP	GENMASK(2, 0)</div><div class='del'>-</div><div class='del'>-#define MT_WTBL_UPDATE			MT_WTBLON_TOP(0x230)</div><div class='del'>-#define MT_WTBL_UPDATE_WLAN_IDX		GENMASK(9, 0)</div><div class='del'>-#define MT_WTBL_UPDATE_ADM_COUNT_CLEAR	BIT(12)</div><div class='del'>-#define MT_WTBL_UPDATE_BUSY		BIT(31)</div><div class='del'>-</div><div class='del'>-#define MT_WTBL_BASE			0x38000</div><div class='del'>-#define MT_WTBL_LMAC_ID			GENMASK(14, 8)</div><div class='del'>-#define MT_WTBL_LMAC_DW			GENMASK(7, 2)</div><div class='del'>-#define MT_WTBL_LMAC_OFFS(_id, _dw)	(MT_WTBL_BASE | \</div><div class='del'>-					FIELD_PREP(MT_WTBL_LMAC_ID, _id) | \</div><div class='del'>-					FIELD_PREP(MT_WTBL_LMAC_DW, _dw))</div><div class='del'>-</div><div class='del'>-/* AGG: band 0(0x20800), band 1(0xa0800) */</div><div class='del'>-#define MT_WF_AGG_BASE(_band)		((_band) ? 0xa0800 : 0x20800)</div><div class='del'>-#define MT_WF_AGG(_band, ofs)		(MT_WF_AGG_BASE(_band) + (ofs))</div><div class='del'>-</div><div class='del'>-#define MT_AGG_AWSCR0(_band, _n)	MT_WF_AGG(_band, 0x05c + (_n) * 4)</div><div class='del'>-#define MT_AGG_PCR0(_band, _n)		MT_WF_AGG(_band, 0x06c + (_n) * 4)</div><div class='del'>-#define MT_AGG_PCR0_MM_PROT		BIT(0)</div><div class='del'>-#define MT_AGG_PCR0_GF_PROT		BIT(1)</div><div class='del'>-#define MT_AGG_PCR0_BW20_PROT		BIT(2)</div><div class='del'>-#define MT_AGG_PCR0_BW40_PROT		BIT(4)</div><div class='del'>-#define MT_AGG_PCR0_BW80_PROT		BIT(6)</div><div class='del'>-#define MT_AGG_PCR0_ERP_PROT		GENMASK(12, 8)</div><div class='del'>-#define MT_AGG_PCR0_VHT_PROT		BIT(13)</div><div class='del'>-#define MT_AGG_PCR0_PTA_WIN_DIS		BIT(15)</div><div class='del'>-</div><div class='del'>-#define MT_AGG_PCR1_RTS0_NUM_THRES	GENMASK(31, 23)</div><div class='del'>-#define MT_AGG_PCR1_RTS0_LEN_THRES	GENMASK(19, 0)</div><div class='del'>-</div><div class='del'>-#define MT_AGG_ACR0(_band)		MT_WF_AGG(_band, 0x084)</div><div class='del'>-#define MT_AGG_ACR_CFEND_RATE		GENMASK(13, 0)</div><div class='del'>-#define MT_AGG_ACR_BAR_RATE		GENMASK(29, 16)</div><div class='del'>-</div><div class='del'>-#define MT_AGG_MRCR(_band)		MT_WF_AGG(_band, 0x098)</div><div class='del'>-#define MT_AGG_MRCR_BAR_CNT_LIMIT	GENMASK(15, 12)</div><div class='del'>-#define MT_AGG_MRCR_LAST_RTS_CTS_RN	BIT(6)</div><div class='del'>-#define MT_AGG_MRCR_RTS_FAIL_LIMIT	GENMASK(11, 7)</div><div class='del'>-#define MT_AGG_MRCR_TXCMD_RTS_FAIL_LIMIT	GENMASK(28, 24)</div><div class='del'>-</div><div class='del'>-#define MT_AGG_ATCR1(_band)		MT_WF_AGG(_band, 0x0f0)</div><div class='del'>-#define MT_AGG_ATCR3(_band)		MT_WF_AGG(_band, 0x0f4)</div><div class='del'>-</div><div class='del'>-/* ARB: band 0(0x20c00), band 1(0xa0c00) */</div><div class='del'>-#define MT_WF_ARB_BASE(_band)		((_band) ? 0xa0c00 : 0x20c00)</div><div class='del'>-#define MT_WF_ARB(_band, ofs)		(MT_WF_ARB_BASE(_band) + (ofs))</div><div class='del'>-</div><div class='del'>-#define MT_ARB_SCR(_band)		MT_WF_ARB(_band, 0x080)</div><div class='del'>-#define MT_ARB_SCR_TX_DISABLE		BIT(8)</div><div class='del'>-#define MT_ARB_SCR_RX_DISABLE		BIT(9)</div><div class='del'>-</div><div class='del'>-#define MT_ARB_DRNGR0(_band, _n)	MT_WF_ARB(_band, 0x194 + (_n) * 4)</div><div class='del'>-</div><div class='del'>-/* RMAC: band 0(0x21400), band 1(0xa1400) */</div><div class='del'>-#define MT_WF_RMAC_BASE(_band)		((_band) ? 0xa1400 : 0x21400)</div><div class='del'>-#define MT_WF_RMAC(_band, ofs)		(MT_WF_RMAC_BASE(_band) + (ofs))</div><div class='del'>-</div><div class='del'>-#define MT_WF_RFCR(_band)		MT_WF_RMAC(_band, 0x000)</div><div class='del'>-#define MT_WF_RFCR_DROP_STBC_MULTI	BIT(0)</div><div class='del'>-#define MT_WF_RFCR_DROP_FCSFAIL		BIT(1)</div><div class='del'>-#define MT_WF_RFCR_DROP_VERSION		BIT(3)</div><div class='del'>-#define MT_WF_RFCR_DROP_PROBEREQ	BIT(4)</div><div class='del'>-#define MT_WF_RFCR_DROP_MCAST		BIT(5)</div><div class='del'>-#define MT_WF_RFCR_DROP_BCAST		BIT(6)</div><div class='del'>-#define MT_WF_RFCR_DROP_MCAST_FILTERED	BIT(7)</div><div class='del'>-#define MT_WF_RFCR_DROP_A3_MAC		BIT(8)</div><div class='del'>-#define MT_WF_RFCR_DROP_A3_BSSID	BIT(9)</div><div class='del'>-#define MT_WF_RFCR_DROP_A2_BSSID	BIT(10)</div><div class='del'>-#define MT_WF_RFCR_DROP_OTHER_BEACON	BIT(11)</div><div class='del'>-#define MT_WF_RFCR_DROP_FRAME_REPORT	BIT(12)</div><div class='del'>-#define MT_WF_RFCR_DROP_CTL_RSV		BIT(13)</div><div class='del'>-#define MT_WF_RFCR_DROP_CTS		BIT(14)</div><div class='del'>-#define MT_WF_RFCR_DROP_RTS		BIT(15)</div><div class='del'>-#define MT_WF_RFCR_DROP_DUPLICATE	BIT(16)</div><div class='del'>-#define MT_WF_RFCR_DROP_OTHER_BSS	BIT(17)</div><div class='del'>-#define MT_WF_RFCR_DROP_OTHER_UC	BIT(18)</div><div class='del'>-#define MT_WF_RFCR_DROP_OTHER_TIM	BIT(19)</div><div class='del'>-#define MT_WF_RFCR_DROP_NDPA		BIT(20)</div><div class='del'>-#define MT_WF_RFCR_DROP_UNWANTED_CTL	BIT(21)</div><div class='del'>-</div><div class='del'>-#define MT_WF_RFCR1(_band)		MT_WF_RMAC(_band, 0x004)</div><div class='del'>-#define MT_WF_RFCR1_DROP_ACK		BIT(4)</div><div class='del'>-#define MT_WF_RFCR1_DROP_BF_POLL	BIT(5)</div><div class='del'>-#define MT_WF_RFCR1_DROP_BA		BIT(6)</div><div class='del'>-#define MT_WF_RFCR1_DROP_CFEND		BIT(7)</div><div class='del'>-#define MT_WF_RFCR1_DROP_CFACK		BIT(8)</div><div class='del'>-</div><div class='del'>-#define MT_WF_RMAC_MIB_TIME0(_band)	MT_WF_RMAC(_band, 0x03c4)</div><div class='del'>-#define MT_WF_RMAC_MIB_RXTIME_CLR	BIT(31)</div><div class='del'>-#define MT_WF_RMAC_MIB_RXTIME_EN	BIT(30)</div><div class='del'>-</div><div class='del'>-#define MT_WF_RMAC_MIB_AIRTIME14(_band)	MT_WF_RMAC(_band, 0x03b8)</div><div class='del'>-#define MT_MIB_OBSSTIME_MASK		GENMASK(23, 0)</div><div class='del'>-#define MT_WF_RMAC_MIB_AIRTIME0(_band)	MT_WF_RMAC(_band, 0x0380)</div><div class='del'>-</div><div class='del'>-/* WFDMA0 */</div><div class='del'>-#define MT_WFDMA0_BASE			0xd4000</div><div class='del'>-#define MT_WFDMA0(ofs)			(MT_WFDMA0_BASE + (ofs))</div><div class='del'>-</div><div class='del'>-#define MT_WFDMA0_RST			MT_WFDMA0(0x100)</div><div class='del'>-#define MT_WFDMA0_RST_LOGIC_RST		BIT(4)</div><div class='del'>-#define MT_WFDMA0_RST_DMASHDL_ALL_RST	BIT(5)</div><div class='del'>-</div><div class='del'>-#define MT_WFDMA0_BUSY_ENA		MT_WFDMA0(0x13c)</div><div class='del'>-#define MT_WFDMA0_BUSY_ENA_TX_FIFO0	BIT(0)</div><div class='del'>-#define MT_WFDMA0_BUSY_ENA_TX_FIFO1	BIT(1)</div><div class='del'>-#define MT_WFDMA0_BUSY_ENA_RX_FIFO	BIT(2)</div><div class='del'>-</div><div class='del'>-#define MT_MCU_CMD			MT_WFDMA0(0x1f0)</div><div class='del'>-#define MT_MCU_CMD_WAKE_RX_PCIE		BIT(0)</div><div class='del'>-#define MT_MCU_CMD_STOP_DMA_FW_RELOAD	BIT(1)</div><div class='del'>-#define MT_MCU_CMD_STOP_DMA		BIT(2)</div><div class='del'>-#define MT_MCU_CMD_RESET_DONE		BIT(3)</div><div class='del'>-#define MT_MCU_CMD_RECOVERY_DONE	BIT(4)</div><div class='del'>-#define MT_MCU_CMD_NORMAL_STATE		BIT(5)</div><div class='del'>-#define MT_MCU_CMD_ERROR_MASK		GENMASK(5, 1)</div><div class='del'>-</div><div class='del'>-#define MT_MCU2HOST_SW_INT_ENA		MT_WFDMA0(0x1f4)</div><div class='del'>-</div><div class='del'>-#define MT_WFDMA0_HOST_INT_STA		MT_WFDMA0(0x200)</div><div class='del'>-#define HOST_RX_DONE_INT_STS0		BIT(0)	/* Rx mcu */</div><div class='del'>-#define HOST_RX_DONE_INT_STS2		BIT(2)	/* Rx data */</div><div class='del'>-#define HOST_RX_DONE_INT_STS4		BIT(22)	/* Rx mcu after fw downloaded */</div><div class='del'>-#define HOST_TX_DONE_INT_STS16		BIT(26)</div><div class='del'>-#define HOST_TX_DONE_INT_STS17		BIT(27) /* MCU tx done*/</div><div class='del'>-</div><div class='ctx'> #define MT_WFDMA0_HOST_INT_ENA		MT_WFDMA0(0x204)</div><div class='del'>-#define HOST_RX_DONE_INT_ENA0		BIT(0)</div><div class='del'>-#define HOST_RX_DONE_INT_ENA1		BIT(1)</div><div class='del'>-#define HOST_RX_DONE_INT_ENA2		BIT(2)</div><div class='del'>-#define HOST_RX_DONE_INT_ENA3		BIT(3)</div><div class='del'>-#define HOST_TX_DONE_INT_ENA0		BIT(4)</div><div class='del'>-#define HOST_TX_DONE_INT_ENA1		BIT(5)</div><div class='del'>-#define HOST_TX_DONE_INT_ENA2		BIT(6)</div><div class='del'>-#define HOST_TX_DONE_INT_ENA3		BIT(7)</div><div class='del'>-#define HOST_TX_DONE_INT_ENA4		BIT(8)</div><div class='del'>-#define HOST_TX_DONE_INT_ENA5		BIT(9)</div><div class='del'>-#define HOST_TX_DONE_INT_ENA6		BIT(10)</div><div class='del'>-#define HOST_TX_DONE_INT_ENA7		BIT(11)</div><div class='ctx'> #define HOST_TX_DONE_INT_ENA8		BIT(12)</div><div class='ctx'> #define HOST_TX_DONE_INT_ENA9		BIT(13)</div><div class='ctx'> #define HOST_TX_DONE_INT_ENA10		BIT(14)</div><div class='hunk'>@@ -289,14 +36,10 @@</div><div class='ctx'> #define HOST_TX_DONE_INT_ENA12		BIT(16)</div><div class='ctx'> #define HOST_TX_DONE_INT_ENA13		BIT(17)</div><div class='ctx'> #define HOST_TX_DONE_INT_ENA14		BIT(18)</div><div class='del'>-#define HOST_RX_COHERENT_EN		BIT(20)</div><div class='del'>-#define HOST_TX_COHERENT_EN		BIT(21)</div><div class='ctx'> #define HOST_RX_DONE_INT_ENA4		BIT(22)</div><div class='ctx'> #define HOST_RX_DONE_INT_ENA5		BIT(23)</div><div class='ctx'> #define HOST_TX_DONE_INT_ENA16		BIT(26)</div><div class='ctx'> #define HOST_TX_DONE_INT_ENA17		BIT(27)</div><div class='del'>-#define MCU2HOST_SW_INT_ENA		BIT(29)</div><div class='del'>-#define HOST_TX_DONE_INT_ENA18		BIT(30)</div><div class='ctx'> </div><div class='ctx'> /* WFDMA interrupt */</div><div class='ctx'> #define MT_INT_RX_DONE_DATA		HOST_RX_DONE_INT_ENA2</div><div class='hunk'>@@ -308,7 +51,6 @@</div><div class='ctx'> #define MT_INT_TX_DONE_MCU_WM		HOST_TX_DONE_INT_ENA17</div><div class='ctx'> #define MT_INT_TX_DONE_FWDL		HOST_TX_DONE_INT_ENA16</div><div class='ctx'> #define MT_INT_TX_DONE_BAND0		HOST_TX_DONE_INT_ENA0</div><div class='del'>-#define MT_INT_MCU_CMD			MCU2HOST_SW_INT_ENA</div><div class='ctx'> </div><div class='ctx'> #define MT_INT_TX_DONE_MCU		(MT_INT_TX_DONE_MCU_WM |	\</div><div class='ctx'> 					 MT_INT_TX_DONE_FWDL)</div><div class='hunk'>@@ -316,52 +58,8 @@</div><div class='ctx'> 					 MT_INT_TX_DONE_BAND0 |	\</div><div class='ctx'> 					GENMASK(18, 4))</div><div class='ctx'> </div><div class='del'>-#define MT_WFDMA0_GLO_CFG		MT_WFDMA0(0x208)</div><div class='del'>-#define MT_WFDMA0_GLO_CFG_TX_DMA_EN	BIT(0)</div><div class='del'>-#define MT_WFDMA0_GLO_CFG_TX_DMA_BUSY	BIT(1)</div><div class='del'>-#define MT_WFDMA0_GLO_CFG_RX_DMA_EN	BIT(2)</div><div class='del'>-#define MT_WFDMA0_GLO_CFG_RX_DMA_BUSY	BIT(3)</div><div class='del'>-#define MT_WFDMA0_GLO_CFG_TX_WB_DDONE	BIT(6)</div><div class='del'>-#define MT_WFDMA0_GLO_CFG_FIFO_LITTLE_ENDIAN	BIT(12)</div><div class='del'>-#define MT_WFDMA0_GLO_CFG_CSR_DISP_BASE_PTR_CHAIN_EN BIT(15)</div><div class='del'>-#define MT_WFDMA0_GLO_CFG_OMIT_RX_INFO_PFET2	BIT(21)</div><div class='del'>-#define MT_WFDMA0_GLO_CFG_OMIT_RX_INFO	BIT(27)</div><div class='del'>-#define MT_WFDMA0_GLO_CFG_OMIT_TX_INFO	BIT(28)</div><div class='del'>-#define MT_WFDMA0_GLO_CFG_CLK_GAT_DIS	BIT(30)</div><div class='del'>-</div><div class='del'>-#define MT_WFDMA0_RST_DTX_PTR		MT_WFDMA0(0x20c)</div><div class='del'>-#define MT_WFDMA0_GLO_CFG_EXT0		MT_WFDMA0(0x2b0)</div><div class='del'>-#define MT_WFDMA0_CSR_TX_DMASHDL_ENABLE	BIT(6)</div><div class='del'>-#define MT_WFDMA0_PRI_DLY_INT_CFG0	MT_WFDMA0(0x2f0)</div><div class='del'>-</div><div class='ctx'> #define MT_RX_DATA_RING_BASE		MT_WFDMA0(0x520)</div><div class='ctx'> </div><div class='del'>-#define MT_WFDMA0_TX_RING0_EXT_CTRL	MT_WFDMA0(0x600)</div><div class='del'>-#define MT_WFDMA0_TX_RING1_EXT_CTRL	MT_WFDMA0(0x604)</div><div class='del'>-#define MT_WFDMA0_TX_RING2_EXT_CTRL	MT_WFDMA0(0x608)</div><div class='del'>-#define MT_WFDMA0_TX_RING3_EXT_CTRL	MT_WFDMA0(0x60c)</div><div class='del'>-#define MT_WFDMA0_TX_RING4_EXT_CTRL	MT_WFDMA0(0x610)</div><div class='del'>-#define MT_WFDMA0_TX_RING5_EXT_CTRL	MT_WFDMA0(0x614)</div><div class='del'>-#define MT_WFDMA0_TX_RING6_EXT_CTRL	MT_WFDMA0(0x618)</div><div class='del'>-#define MT_WFDMA0_TX_RING16_EXT_CTRL	MT_WFDMA0(0x640)</div><div class='del'>-#define MT_WFDMA0_TX_RING17_EXT_CTRL	MT_WFDMA0(0x644)</div><div class='del'>-</div><div class='del'>-#define MT_WFDMA0_RX_RING0_EXT_CTRL	MT_WFDMA0(0x680)</div><div class='del'>-#define MT_WFDMA0_RX_RING1_EXT_CTRL	MT_WFDMA0(0x684)</div><div class='del'>-#define MT_WFDMA0_RX_RING2_EXT_CTRL	MT_WFDMA0(0x688)</div><div class='del'>-#define MT_WFDMA0_RX_RING3_EXT_CTRL	MT_WFDMA0(0x68c)</div><div class='del'>-#define MT_WFDMA0_RX_RING4_EXT_CTRL	MT_WFDMA0(0x690)</div><div class='del'>-#define MT_WFDMA0_RX_RING5_EXT_CTRL	MT_WFDMA0(0x694)</div><div class='del'>-</div><div class='del'>-#define MT_TX_RING_BASE			MT_WFDMA0(0x300)</div><div class='del'>-#define MT_RX_EVENT_RING_BASE		MT_WFDMA0(0x500)</div><div class='del'>-</div><div class='del'>-/* WFDMA CSR */</div><div class='del'>-#define MT_WFDMA_EXT_CSR_BASE          0xd7000</div><div class='del'>-#define MT_WFDMA_EXT_CSR(ofs)          (MT_WFDMA_EXT_CSR_BASE + (ofs))</div><div class='del'>-#define MT_WFDMA_EXT_CSR_HIF_MISC	MT_WFDMA_EXT_CSR(0x44)</div><div class='del'>-#define MT_WFDMA_EXT_CSR_HIF_MISC_BUSY	BIT(0)</div><div class='del'>-</div><div class='ctx'> #define MT_INFRA_CFG_BASE		0xfe000</div><div class='ctx'> #define MT_INFRA(ofs)			(MT_INFRA_CFG_BASE + (ofs))</div><div class='ctx'> </div><div class='hunk'>@@ -371,67 +69,13 @@</div><div class='ctx'> #define MT_HIF_REMAP_L1_BASE		GENMASK(31, 16)</div><div class='ctx'> #define MT_HIF_REMAP_BASE_L1		0x40000</div><div class='ctx'> </div><div class='del'>-#define MT_SWDEF_BASE			0x41f200</div><div class='del'>-#define MT_SWDEF(ofs)			(MT_SWDEF_BASE + (ofs))</div><div class='del'>-#define MT_SWDEF_MODE			MT_SWDEF(0x3c)</div><div class='del'>-#define MT_SWDEF_NORMAL_MODE		0</div><div class='del'>-#define MT_SWDEF_ICAP_MODE		1</div><div class='del'>-#define MT_SWDEF_SPECTRUM_MODE		2</div><div class='del'>-</div><div class='del'>-#define MT_TOP_BASE			0x18060000</div><div class='del'>-#define MT_TOP(ofs)			(MT_TOP_BASE + (ofs))</div><div class='del'>-</div><div class='del'>-#define MT_TOP_LPCR_HOST_BAND0		MT_TOP(0x10)</div><div class='del'>-#define MT_TOP_LPCR_HOST_FW_OWN		BIT(0)</div><div class='del'>-#define MT_TOP_LPCR_HOST_DRV_OWN	BIT(1)</div><div class='del'>-</div><div class='del'>-#define MT_TOP_MISC			MT_TOP(0xf0)</div><div class='del'>-#define MT_TOP_MISC_FW_STATE		GENMASK(2, 0)</div><div class='del'>-</div><div class='del'>-#define MT_MCU_WPDMA0_BASE		0x54000000</div><div class='del'>-#define MT_MCU_WPDMA0(ofs)		(MT_MCU_WPDMA0_BASE + (ofs))</div><div class='del'>-</div><div class='del'>-#define MT_WFDMA_DUMMY_CR		MT_MCU_WPDMA0(0x120)</div><div class='del'>-#define MT_WFDMA_NEED_REINIT		BIT(1)</div><div class='del'>-</div><div class='del'>-#define MT_HW_BOUND			0x70010020</div><div class='del'>-#define MT_HW_CHIPID			0x70010200</div><div class='del'>-#define MT_HW_REV			0x70010204</div><div class='del'>-</div><div class='del'>-#define MT_PCIE_MAC_BASE		0x10000</div><div class='del'>-#define MT_PCIE_MAC(ofs)		(MT_PCIE_MAC_BASE + (ofs))</div><div class='del'>-#define MT_PCIE_MAC_INT_ENABLE		MT_PCIE_MAC(0x188)</div><div class='del'>-</div><div class='del'>-#define MT_DMA_SHDL(ofs)		(0xd6000 + (ofs))</div><div class='del'>-#define MT_DMASHDL_SW_CONTROL		MT_DMA_SHDL(0x004)</div><div class='del'>-#define MT_DMASHDL_DMASHDL_BYPASS	BIT(28)</div><div class='del'>-#define MT_DMASHDL_OPTIONAL		MT_DMA_SHDL(0x008)</div><div class='del'>-#define MT_DMASHDL_PAGE			MT_DMA_SHDL(0x00c)</div><div class='del'>-#define MT_DMASHDL_REFILL		MT_DMA_SHDL(0x010)</div><div class='del'>-#define MT_DMASHDL_PKT_MAX_SIZE		MT_DMA_SHDL(0x01c)</div><div class='del'>-#define MT_DMASHDL_PKT_MAX_SIZE_PLE	GENMASK(11, 0)</div><div class='del'>-#define MT_DMASHDL_PKT_MAX_SIZE_PSE	GENMASK(27, 16)</div><div class='del'>-</div><div class='del'>-#define MT_DMASHDL_GROUP_QUOTA(_n)	MT_DMA_SHDL(0x020 + ((_n) &lt;&lt; 2))</div><div class='del'>-#define MT_DMASHDL_GROUP_QUOTA_MIN	GENMASK(11, 0)</div><div class='del'>-#define MT_DMASHDL_GROUP_QUOTA_MAX	GENMASK(27, 16)</div><div class='del'>-</div><div class='del'>-#define MT_DMASHDL_Q_MAP(_n)		MT_DMA_SHDL(0x060 + ((_n) &lt;&lt; 2))</div><div class='del'>-#define MT_DMASHDL_Q_MAP_MASK		GENMASK(3, 0)</div><div class='del'>-#define MT_DMASHDL_Q_MAP_SHIFT(_n)	(4 * ((_n) % 8))</div><div class='del'>-</div><div class='del'>-#define MT_DMASHDL_SCHED_SET(_n)	MT_DMA_SHDL(0x070 + ((_n) &lt;&lt; 2))</div><div class='del'>-</div><div class='del'>-#define MT_CONN_ON_LPCTL		0x7c060010</div><div class='del'>-#define PCIE_LPCR_HOST_OWN_SYNC		BIT(2)</div><div class='del'>-#define PCIE_LPCR_HOST_CLR_OWN		BIT(1)</div><div class='del'>-#define PCIE_LPCR_HOST_SET_OWN		BIT(0)</div><div class='del'>-</div><div class='ctx'> #define MT_WFSYS_SW_RST_B		0x18000140</div><div class='del'>-#define WFSYS_SW_RST_B			BIT(0)</div><div class='del'>-#define WFSYS_SW_INIT_DONE		BIT(4)</div><div class='ctx'> </div><div class='del'>-#define MT_CONN_ON_MISC			0x7c0600f0</div><div class='del'>-#define MT_TOP_MISC2_FW_N9_RDY		GENMASK(1, 0)</div><div class='add'>+#define MT_WTBLON_TOP_WDUCR		MT_WTBLON_TOP(0x200)</div><div class='add'>+#define MT_WTBLON_TOP_WDUCR_GROUP	GENMASK(2, 0)</div><div class='add'>+</div><div class='add'>+#define MT_WTBL_UPDATE			MT_WTBLON_TOP(0x230)</div><div class='add'>+#define MT_WTBL_UPDATE_WLAN_IDX		GENMASK(9, 0)</div><div class='add'>+#define MT_WTBL_UPDATE_ADM_COUNT_CLEAR	BIT(12)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c b/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c<br/>new file mode 100644<br/>index 000000000000..3421e53dc948<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7921/sdio.c</a></div><div class='hunk'>@@ -0,0 +1,333 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/* Copyright (C) 2021 MediaTek Inc.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mmc/host.h&gt;</div><div class='add'>+#include &lt;linux/mmc/sdio_ids.h&gt;</div><div class='add'>+#include &lt;linux/mmc/sdio_func.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mt7921.h"</div><div class='add'>+#include "../sdio.h"</div><div class='add'>+#include "../mt76_connac2_mac.h"</div><div class='add'>+#include "mcu.h"</div><div class='add'>+</div><div class='add'>+static const struct sdio_device_id mt7921s_table[] = {</div><div class='add'>+	{ SDIO_DEVICE(SDIO_VENDOR_ID_MEDIATEK, 0x7901),</div><div class='add'>+		.driver_data = (kernel_ulong_t)MT7921_FIRMWARE_WM },</div><div class='add'>+	{ }	/* Terminating entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void mt7921s_txrx_worker(struct mt76_worker *w)</div><div class='add'>+{</div><div class='add'>+	struct mt76_sdio *sdio = container_of(w, struct mt76_sdio,</div><div class='add'>+					      txrx_worker);</div><div class='add'>+	struct mt76_dev *mdev = container_of(sdio, struct mt76_dev, sdio);</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+</div><div class='add'>+	if (!mt76_connac_pm_ref(&amp;dev-&gt;mphy, &amp;dev-&gt;pm)) {</div><div class='add'>+		queue_work(mdev-&gt;wq, &amp;dev-&gt;pm.wake_work);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt76s_txrx_worker(sdio);</div><div class='add'>+	mt76_connac_pm_unref(&amp;dev-&gt;mphy, &amp;dev-&gt;pm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7921s_unregister_device(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;dev-&gt;init_work);</div><div class='add'>+	mt76_unregister_device(&amp;dev-&gt;mt76);</div><div class='add'>+	cancel_delayed_work_sync(&amp;pm-&gt;ps_work);</div><div class='add'>+	cancel_work_sync(&amp;pm-&gt;wake_work);</div><div class='add'>+</div><div class='add'>+	mt76s_deinit(&amp;dev-&gt;mt76);</div><div class='add'>+	mt7921s_wfsys_reset(dev);</div><div class='add'>+	skb_queue_purge(&amp;dev-&gt;mt76.mcu.res_q);</div><div class='add'>+</div><div class='add'>+	mt76_free_device(&amp;dev-&gt;mt76);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7921s_parse_intr(struct mt76_dev *dev, struct mt76s_intr *intr)</div><div class='add'>+{</div><div class='add'>+	struct mt76_sdio *sdio = &amp;dev-&gt;sdio;</div><div class='add'>+	struct mt7921_sdio_intr *irq_data = sdio-&gt;intr_data;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	sdio_claim_host(sdio-&gt;func);</div><div class='add'>+	err = sdio_readsb(sdio-&gt;func, irq_data, MCR_WHISR, sizeof(*irq_data));</div><div class='add'>+	sdio_release_host(sdio-&gt;func);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (irq_data-&gt;rx.num[0] &gt; 16 ||</div><div class='add'>+	    irq_data-&gt;rx.num[1] &gt; 128)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	intr-&gt;isr = irq_data-&gt;isr;</div><div class='add'>+	intr-&gt;rec_mb = irq_data-&gt;rec_mb;</div><div class='add'>+	intr-&gt;tx.wtqcr = irq_data-&gt;tx.wtqcr;</div><div class='add'>+	intr-&gt;rx.num = irq_data-&gt;rx.num;</div><div class='add'>+	for (i = 0; i &lt; 2 ; i++) {</div><div class='add'>+		if (!i)</div><div class='add'>+			intr-&gt;rx.len[0] = irq_data-&gt;rx.len0;</div><div class='add'>+		else</div><div class='add'>+			intr-&gt;rx.len[1] = irq_data-&gt;rx.len1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7921s_probe(struct sdio_func *func,</div><div class='add'>+			 const struct sdio_device_id *id)</div><div class='add'>+{</div><div class='add'>+	static const struct mt76_driver_ops drv_ops = {</div><div class='add'>+		.txwi_size = MT_SDIO_TXD_SIZE,</div><div class='add'>+		.drv_flags = MT_DRV_AMSDU_OFFLOAD,</div><div class='add'>+		.survey_flags = SURVEY_INFO_TIME_TX |</div><div class='add'>+				SURVEY_INFO_TIME_RX |</div><div class='add'>+				SURVEY_INFO_TIME_BSS_RX,</div><div class='add'>+		.tx_prepare_skb = mt7921_usb_sdio_tx_prepare_skb,</div><div class='add'>+		.tx_complete_skb = mt7921_usb_sdio_tx_complete_skb,</div><div class='add'>+		.tx_status_data = mt7921_usb_sdio_tx_status_data,</div><div class='add'>+		.rx_skb = mt7921_queue_rx_skb,</div><div class='add'>+		.rx_check = mt7921_rx_check,</div><div class='add'>+		.sta_add = mt7921_mac_sta_add,</div><div class='add'>+		.sta_event = mt7921_mac_sta_event,</div><div class='add'>+		.sta_remove = mt7921_mac_sta_remove,</div><div class='add'>+		.update_survey = mt792x_update_channel,</div><div class='add'>+		.set_channel = mt7921_set_channel,</div><div class='add'>+	};</div><div class='add'>+	static const struct mt76_bus_ops mt7921s_ops = {</div><div class='add'>+		.rr = mt76s_rr,</div><div class='add'>+		.rmw = mt76s_rmw,</div><div class='add'>+		.wr = mt76s_wr,</div><div class='add'>+		.write_copy = mt76s_write_copy,</div><div class='add'>+		.read_copy = mt76s_read_copy,</div><div class='add'>+		.wr_rp = mt76s_wr_rp,</div><div class='add'>+		.rd_rp = mt76s_rd_rp,</div><div class='add'>+		.type = MT76_BUS_SDIO,</div><div class='add'>+	};</div><div class='add'>+	static const struct mt792x_hif_ops mt7921_sdio_ops = {</div><div class='add'>+		.init_reset = mt7921s_init_reset,</div><div class='add'>+		.reset = mt7921s_mac_reset,</div><div class='add'>+		.mcu_init = mt7921s_mcu_init,</div><div class='add'>+		.drv_own = mt7921s_mcu_drv_pmctrl,</div><div class='add'>+		.fw_own = mt7921s_mcu_fw_pmctrl,</div><div class='add'>+	};</div><div class='add'>+	struct ieee80211_ops *ops;</div><div class='add'>+	struct mt792x_dev *dev;</div><div class='add'>+	struct mt76_dev *mdev;</div><div class='add'>+	u8 features;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ops = mt792x_get_mac80211_ops(&amp;func-&gt;dev, &amp;mt7921_ops,</div><div class='add'>+				      (void *)id-&gt;driver_data, &amp;features);</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mdev = mt76_alloc_device(&amp;func-&gt;dev, sizeof(*dev), ops, &amp;drv_ops);</div><div class='add'>+	if (!mdev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	dev-&gt;fw_features = features;</div><div class='add'>+	dev-&gt;hif_ops = &amp;mt7921_sdio_ops;</div><div class='add'>+	sdio_set_drvdata(func, dev);</div><div class='add'>+</div><div class='add'>+	ret = mt76s_init(mdev, func, &amp;mt7921s_ops);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ret = mt76s_hw_init(mdev, func, MT76_CONNAC2_SDIO);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;mdev-&gt;bus_hung, false);</div><div class='add'>+</div><div class='add'>+	mdev-&gt;rev = (mt76_rr(dev, MT_HW_CHIPID) &lt;&lt; 16) |</div><div class='add'>+		    (mt76_rr(dev, MT_HW_REV) &amp; 0xff);</div><div class='add'>+	dev_dbg(mdev-&gt;dev, "ASIC revision: %04x\n", mdev-&gt;rev);</div><div class='add'>+</div><div class='add'>+	mdev-&gt;sdio.parse_irq = mt7921s_parse_intr;</div><div class='add'>+	mdev-&gt;sdio.intr_data = devm_kmalloc(mdev-&gt;dev,</div><div class='add'>+					    sizeof(struct mt7921_sdio_intr),</div><div class='add'>+					    GFP_KERNEL);</div><div class='add'>+	if (!mdev-&gt;sdio.intr_data) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt76s_alloc_rx_queue(mdev, MT_RXQ_MAIN);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ret = mt76s_alloc_rx_queue(mdev, MT_RXQ_MCU);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ret = mt76s_alloc_tx(mdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ret = mt76_worker_setup(mt76_hw(dev), &amp;mdev-&gt;sdio.txrx_worker,</div><div class='add'>+				mt7921s_txrx_worker, "sdio-txrx");</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	sched_set_fifo_low(mdev-&gt;sdio.txrx_worker.task);</div><div class='add'>+</div><div class='add'>+	ret = mt7921_register_device(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	mt76s_deinit(&amp;dev-&gt;mt76);</div><div class='add'>+	mt76_free_device(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7921s_remove(struct sdio_func *func)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = sdio_get_drvdata(func);</div><div class='add'>+</div><div class='add'>+	mt7921s_unregister_device(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7921s_suspend(struct device *__dev)</div><div class='add'>+{</div><div class='add'>+	struct sdio_func *func = dev_to_sdio_func(__dev);</div><div class='add'>+	struct mt792x_dev *dev = sdio_get_drvdata(func);</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	pm-&gt;suspended = true;</div><div class='add'>+	set_bit(MT76_STATE_SUSPEND, &amp;mdev-&gt;phy.state);</div><div class='add'>+</div><div class='add'>+	flush_work(&amp;dev-&gt;reset_work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;pm-&gt;ps_work);</div><div class='add'>+	cancel_work_sync(&amp;pm-&gt;wake_work);</div><div class='add'>+</div><div class='add'>+	mt7921_roc_abort_sync(dev);</div><div class='add'>+</div><div class='add'>+	err = mt792x_mcu_drv_pmctrl(dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto restore_suspend;</div><div class='add'>+</div><div class='add'>+	/* always enable deep sleep during suspend to reduce</div><div class='add'>+	 * power consumption</div><div class='add'>+	 */</div><div class='add'>+	mt76_connac_mcu_set_deep_sleep(mdev, true);</div><div class='add'>+</div><div class='add'>+	mt76_txq_schedule_all(&amp;dev-&gt;mphy);</div><div class='add'>+	mt76_worker_disable(&amp;mdev-&gt;tx_worker);</div><div class='add'>+	mt76_worker_disable(&amp;mdev-&gt;sdio.status_worker);</div><div class='add'>+	mt76_worker_disable(&amp;mdev-&gt;sdio.stat_worker);</div><div class='add'>+	clear_bit(MT76_READING_STATS, &amp;dev-&gt;mphy.state);</div><div class='add'>+	mt76_tx_status_check(mdev, true);</div><div class='add'>+</div><div class='add'>+	mt76_worker_schedule(&amp;mdev-&gt;sdio.txrx_worker);</div><div class='add'>+	wait_event_timeout(dev-&gt;mt76.sdio.wait,</div><div class='add'>+			   mt76s_txqs_empty(&amp;dev-&gt;mt76), 5 * HZ);</div><div class='add'>+</div><div class='add'>+	/* It is supposed that SDIO bus is idle at the point */</div><div class='add'>+	err = mt76_connac_mcu_set_hif_suspend(mdev, true, true);</div><div class='add'>+	if (err)</div><div class='add'>+		goto restore_worker;</div><div class='add'>+</div><div class='add'>+	mt76_worker_disable(&amp;mdev-&gt;sdio.txrx_worker);</div><div class='add'>+	mt76_worker_disable(&amp;mdev-&gt;sdio.net_worker);</div><div class='add'>+</div><div class='add'>+	err = mt792x_mcu_fw_pmctrl(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto restore_txrx_worker;</div><div class='add'>+</div><div class='add'>+	sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+restore_txrx_worker:</div><div class='add'>+	mt76_worker_enable(&amp;mdev-&gt;sdio.net_worker);</div><div class='add'>+	mt76_worker_enable(&amp;mdev-&gt;sdio.txrx_worker);</div><div class='add'>+	mt76_connac_mcu_set_hif_suspend(mdev, false, true);</div><div class='add'>+</div><div class='add'>+restore_worker:</div><div class='add'>+	mt76_worker_enable(&amp;mdev-&gt;tx_worker);</div><div class='add'>+	mt76_worker_enable(&amp;mdev-&gt;sdio.status_worker);</div><div class='add'>+	mt76_worker_enable(&amp;mdev-&gt;sdio.stat_worker);</div><div class='add'>+</div><div class='add'>+	if (!pm-&gt;ds_enable)</div><div class='add'>+		mt76_connac_mcu_set_deep_sleep(mdev, false);</div><div class='add'>+</div><div class='add'>+restore_suspend:</div><div class='add'>+	clear_bit(MT76_STATE_SUSPEND, &amp;mdev-&gt;phy.state);</div><div class='add'>+	pm-&gt;suspended = false;</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		mt792x_reset(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7921s_resume(struct device *__dev)</div><div class='add'>+{</div><div class='add'>+	struct sdio_func *func = dev_to_sdio_func(__dev);</div><div class='add'>+	struct mt792x_dev *dev = sdio_get_drvdata(func);</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	clear_bit(MT76_STATE_SUSPEND, &amp;mdev-&gt;phy.state);</div><div class='add'>+</div><div class='add'>+	err = mt792x_mcu_drv_pmctrl(dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	mt76_worker_enable(&amp;mdev-&gt;tx_worker);</div><div class='add'>+	mt76_worker_enable(&amp;mdev-&gt;sdio.txrx_worker);</div><div class='add'>+	mt76_worker_enable(&amp;mdev-&gt;sdio.status_worker);</div><div class='add'>+	mt76_worker_enable(&amp;mdev-&gt;sdio.net_worker);</div><div class='add'>+	mt76_worker_enable(&amp;mdev-&gt;sdio.stat_worker);</div><div class='add'>+</div><div class='add'>+	/* restore previous ds setting */</div><div class='add'>+	if (!pm-&gt;ds_enable)</div><div class='add'>+		mt76_connac_mcu_set_deep_sleep(mdev, false);</div><div class='add'>+</div><div class='add'>+	err = mt76_connac_mcu_set_hif_suspend(mdev, false, true);</div><div class='add'>+failed:</div><div class='add'>+	pm-&gt;suspended = false;</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		mt792x_reset(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(sdio, mt7921s_table);</div><div class='add'>+MODULE_FIRMWARE(MT7921_FIRMWARE_WM);</div><div class='add'>+MODULE_FIRMWARE(MT7921_ROM_PATCH);</div><div class='add'>+</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(mt7921s_pm_ops, mt7921s_suspend, mt7921s_resume);</div><div class='add'>+</div><div class='add'>+static struct sdio_driver mt7921s_driver = {</div><div class='add'>+	.name		= KBUILD_MODNAME,</div><div class='add'>+	.probe		= mt7921s_probe,</div><div class='add'>+	.remove		= mt7921s_remove,</div><div class='add'>+	.id_table	= mt7921s_table,</div><div class='add'>+	.drv.pm		= pm_sleep_ptr(&amp;mt7921s_pm_ops),</div><div class='add'>+};</div><div class='add'>+module_sdio_driver(mt7921s_driver);</div><div class='add'>+MODULE_DESCRIPTION("MediaTek MT7921S (SDIO) wireless driver");</div><div class='add'>+MODULE_AUTHOR("Sean Wang &lt;sean.wang@mediatek.com&gt;");</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c<br/>new file mode 100644<br/>index 000000000000..416d49e53499<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c</a></div><div class='hunk'>@@ -0,0 +1,199 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/* Copyright (C) 2021 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/mmc/sdio_func.h&gt;</div><div class='add'>+#include "mt7921.h"</div><div class='add'>+#include "../mt76_connac2_mac.h"</div><div class='add'>+#include "../sdio.h"</div><div class='add'>+#include &lt;linux/mmc/host.h&gt;</div><div class='add'>+#include &lt;linux/kallsyms.h&gt;</div><div class='add'>+</div><div class='add'>+static void mt7921s_enable_irq(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_sdio *sdio = &amp;dev-&gt;sdio;</div><div class='add'>+</div><div class='add'>+	sdio_claim_host(sdio-&gt;func);</div><div class='add'>+	sdio_writel(sdio-&gt;func, WHLPCR_INT_EN_SET, MCR_WHLPCR, NULL);</div><div class='add'>+	sdio_release_host(sdio-&gt;func);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7921s_disable_irq(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_sdio *sdio = &amp;dev-&gt;sdio;</div><div class='add'>+</div><div class='add'>+	sdio_claim_host(sdio-&gt;func);</div><div class='add'>+	sdio_writel(sdio-&gt;func, WHLPCR_INT_EN_CLR, MCR_WHLPCR, NULL);</div><div class='add'>+	sdio_release_host(sdio-&gt;func);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 mt7921s_read_whcr(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return sdio_readl(dev-&gt;sdio.func, MCR_WHCR, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7921s_wfsys_reset(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_sdio *sdio = &amp;dev-&gt;mt76.sdio;</div><div class='add'>+	u32 val, status;</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;dev-&gt;mt76.bus_hung))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mt7921s_mcu_drv_pmctrl(dev);</div><div class='add'>+</div><div class='add'>+	sdio_claim_host(sdio-&gt;func);</div><div class='add'>+</div><div class='add'>+	val = sdio_readl(sdio-&gt;func, MCR_WHCR, NULL);</div><div class='add'>+	val &amp;= ~WF_WHOLE_PATH_RSTB;</div><div class='add'>+	sdio_writel(sdio-&gt;func, val, MCR_WHCR, NULL);</div><div class='add'>+</div><div class='add'>+	msleep(50);</div><div class='add'>+</div><div class='add'>+	val = sdio_readl(sdio-&gt;func, MCR_WHCR, NULL);</div><div class='add'>+	val &amp;= ~WF_SDIO_WF_PATH_RSTB;</div><div class='add'>+	sdio_writel(sdio-&gt;func, val, MCR_WHCR, NULL);</div><div class='add'>+</div><div class='add'>+	usleep_range(1000, 2000);</div><div class='add'>+</div><div class='add'>+	val = sdio_readl(sdio-&gt;func, MCR_WHCR, NULL);</div><div class='add'>+	val |= WF_WHOLE_PATH_RSTB;</div><div class='add'>+	sdio_writel(sdio-&gt;func, val, MCR_WHCR, NULL);</div><div class='add'>+</div><div class='add'>+	readx_poll_timeout(mt7921s_read_whcr, &amp;dev-&gt;mt76, status,</div><div class='add'>+			   status &amp; WF_RST_DONE, 50000, 2000000);</div><div class='add'>+</div><div class='add'>+	sdio_release_host(sdio-&gt;func);</div><div class='add'>+</div><div class='add'>+	clear_bit(MT76_STATE_MCU_RUNNING, &amp;dev-&gt;mphy.state);</div><div class='add'>+</div><div class='add'>+	/* activate mt7921s again */</div><div class='add'>+	mt7921s_mcu_drv_pmctrl(dev);</div><div class='add'>+	mt76_clear(dev, MT_CONN_STATUS, MT_WIFI_PATCH_DL_STATE);</div><div class='add'>+	mt7921s_mcu_fw_pmctrl(dev);</div><div class='add'>+	mt7921s_mcu_drv_pmctrl(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7921s_init_reset(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	set_bit(MT76_MCU_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+</div><div class='add'>+	wake_up(&amp;dev-&gt;mt76.mcu.wait);</div><div class='add'>+	skb_queue_purge(&amp;dev-&gt;mt76.mcu.res_q);</div><div class='add'>+	wait_event_timeout(dev-&gt;mt76.sdio.wait,</div><div class='add'>+			   mt76s_txqs_empty(&amp;dev-&gt;mt76), 5 * HZ);</div><div class='add'>+	mt76_worker_disable(&amp;dev-&gt;mt76.sdio.txrx_worker);</div><div class='add'>+</div><div class='add'>+	mt7921s_disable_irq(&amp;dev-&gt;mt76);</div><div class='add'>+	mt7921s_wfsys_reset(dev);</div><div class='add'>+</div><div class='add'>+	mt76_worker_enable(&amp;dev-&gt;mt76.sdio.txrx_worker);</div><div class='add'>+	clear_bit(MT76_MCU_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+	mt7921s_enable_irq(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct mt76_sdio *msdio;</div><div class='add'>+static void mt7921s_card_reset(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct mmc_host *sdio_host = msdio-&gt;func-&gt;card-&gt;host;</div><div class='add'>+</div><div class='add'>+	sdio_claim_host(msdio-&gt;func);</div><div class='add'>+	sdio_release_irq(msdio-&gt;func);</div><div class='add'>+	sdio_release_host(msdio-&gt;func);</div><div class='add'>+</div><div class='add'>+	mmc_remove_host(sdio_host);</div><div class='add'>+	msleep(50);</div><div class='add'>+	mmc_add_host(sdio_host);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DECLARE_WORK(sdio_reset_work, mt7921s_card_reset);</div><div class='add'>+static int mt7921s_check_bus(struct mt76_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_sdio *sdio = &amp;dev-&gt;sdio;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	sdio_claim_host(sdio-&gt;func);</div><div class='add'>+	sdio_readl(dev-&gt;sdio.func, MCR_WHCR, &amp;err);</div><div class='add'>+	sdio_release_host(sdio-&gt;func);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7921s_host_reset(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	int err = -1;</div><div class='add'>+</div><div class='add'>+	if (!atomic_read(&amp;mdev-&gt;bus_hung))</div><div class='add'>+		err = mt7921s_check_bus(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		atomic_set(&amp;mdev-&gt;bus_hung, true);</div><div class='add'>+		msdio = &amp;dev-&gt;mt76.sdio;</div><div class='add'>+		dev_err(mdev-&gt;dev, "SDIO bus problem detected(%d), resetting card!!\n", err);</div><div class='add'>+		schedule_work(&amp;sdio_reset_work);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;mdev-&gt;bus_hung, false);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7921s_mac_reset(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mt76_connac_free_pending_tx_skbs(&amp;dev-&gt;pm, NULL);</div><div class='add'>+</div><div class='add'>+	mt7921s_host_reset(dev);</div><div class='add'>+	if (atomic_read(&amp;dev-&gt;mt76.bus_hung))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mt76_txq_schedule_all(&amp;dev-&gt;mphy);</div><div class='add'>+	mt76_worker_disable(&amp;dev-&gt;mt76.tx_worker);</div><div class='add'>+	set_bit(MT76_MCU_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+	wake_up(&amp;dev-&gt;mt76.mcu.wait);</div><div class='add'>+	skb_queue_purge(&amp;dev-&gt;mt76.mcu.res_q);</div><div class='add'>+	wait_event_timeout(dev-&gt;mt76.sdio.wait,</div><div class='add'>+			   mt76s_txqs_empty(&amp;dev-&gt;mt76), 5 * HZ);</div><div class='add'>+	mt76_worker_disable(&amp;dev-&gt;mt76.sdio.txrx_worker);</div><div class='add'>+	mt76_worker_disable(&amp;dev-&gt;mt76.sdio.status_worker);</div><div class='add'>+	mt76_worker_disable(&amp;dev-&gt;mt76.sdio.net_worker);</div><div class='add'>+	mt76_worker_disable(&amp;dev-&gt;mt76.sdio.stat_worker);</div><div class='add'>+</div><div class='add'>+	mt7921s_disable_irq(&amp;dev-&gt;mt76);</div><div class='add'>+	mt7921s_wfsys_reset(dev);</div><div class='add'>+</div><div class='add'>+	mt76_worker_enable(&amp;dev-&gt;mt76.sdio.txrx_worker);</div><div class='add'>+	mt76_worker_enable(&amp;dev-&gt;mt76.sdio.status_worker);</div><div class='add'>+	mt76_worker_enable(&amp;dev-&gt;mt76.sdio.net_worker);</div><div class='add'>+	mt76_worker_enable(&amp;dev-&gt;mt76.sdio.stat_worker);</div><div class='add'>+</div><div class='add'>+	dev-&gt;fw_assert = false;</div><div class='add'>+	clear_bit(MT76_MCU_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+	mt7921s_enable_irq(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	err = mt7921_run_firmware(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt7921_mcu_set_eeprom(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt7921_mac_init(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = __mt7921_start(&amp;dev-&gt;phy);</div><div class='add'>+out:</div><div class='add'>+</div><div class='add'>+	mt76_worker_enable(&amp;dev-&gt;mt76.tx_worker);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c<br/>new file mode 100644<br/>index 000000000000..14e66f3f5aad<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c</a></div><div class='hunk'>@@ -0,0 +1,175 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/* Copyright (C) 2021 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/mmc/sdio_func.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mt7921.h"</div><div class='add'>+#include "../sdio.h"</div><div class='add'>+#include "../mt76_connac2_mac.h"</div><div class='add'>+#include "mcu.h"</div><div class='add'>+#include "regs.h"</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7921s_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,</div><div class='add'>+			 int cmd, int *seq)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	enum mt7921_sdio_pkt_type type = MT7921_SDIO_CMD;</div><div class='add'>+	enum mt76_mcuq_id txq = MT_MCUQ_WM;</div><div class='add'>+	int ret, pad;</div><div class='add'>+</div><div class='add'>+	/* We just return in case firmware assertion to avoid blocking the</div><div class='add'>+	 * common workqueue to run, for example, the coredump work might be</div><div class='add'>+	 * blocked by mt792x_mac_work that is excuting register access via sdio</div><div class='add'>+	 * bus.</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;fw_assert)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	ret = mt76_connac2_mcu_fill_message(mdev, skb, cmd, seq);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mdev-&gt;mcu.timeout = 3 * HZ;</div><div class='add'>+</div><div class='add'>+	if (cmd == MCU_CMD(FW_SCATTER))</div><div class='add'>+		type = MT7921_SDIO_FWDL;</div><div class='add'>+</div><div class='add'>+	mt792x_skb_add_usb_sdio_hdr(dev, skb, type);</div><div class='add'>+	pad = round_up(skb-&gt;len, 4) - skb-&gt;len;</div><div class='add'>+	__skb_put_zero(skb, pad);</div><div class='add'>+</div><div class='add'>+	ret = mt76_tx_queue_skb_raw(dev, mdev-&gt;q_mcu[txq], skb, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mt76_queue_kick(dev, mdev-&gt;q_mcu[txq]);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 mt7921s_read_rm3r(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_sdio *sdio = &amp;dev-&gt;mt76.sdio;</div><div class='add'>+</div><div class='add'>+	return sdio_readl(sdio-&gt;func, MCR_D2HRM3R, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 mt7921s_clear_rm3r_drv_own(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_sdio *sdio = &amp;dev-&gt;mt76.sdio;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = sdio_readl(sdio-&gt;func, MCR_D2HRM3R, NULL);</div><div class='add'>+	if (val)</div><div class='add'>+		sdio_writel(sdio-&gt;func, H2D_SW_INT_CLEAR_MAILBOX_ACK,</div><div class='add'>+			    MCR_WSICR, NULL);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7921s_mcu_init(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	static const struct mt76_mcu_ops mt7921s_mcu_ops = {</div><div class='add'>+		.headroom = MT_SDIO_HDR_SIZE +</div><div class='add'>+			    sizeof(struct mt76_connac2_mcu_txd),</div><div class='add'>+		.tailroom = MT_SDIO_TAIL_SIZE,</div><div class='add'>+		.mcu_skb_send_msg = mt7921s_mcu_send_message,</div><div class='add'>+		.mcu_parse_response = mt7921_mcu_parse_response,</div><div class='add'>+		.mcu_rr = mt76_connac_mcu_reg_rr,</div><div class='add'>+		.mcu_wr = mt76_connac_mcu_reg_wr,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mt7921s_mcu_drv_pmctrl(dev);</div><div class='add'>+</div><div class='add'>+	dev-&gt;mt76.mcu_ops = &amp;mt7921s_mcu_ops;</div><div class='add'>+</div><div class='add'>+	ret = mt7921_run_firmware(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	set_bit(MT76_STATE_MCU_RUNNING, &amp;dev-&gt;mphy.state);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7921s_mcu_drv_pmctrl(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct sdio_func *func = dev-&gt;mt76.sdio.func;</div><div class='add'>+	struct mt76_phy *mphy = &amp;dev-&gt;mt76.phy;</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+	u32 status;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	sdio_claim_host(func);</div><div class='add'>+</div><div class='add'>+	sdio_writel(func, WHLPCR_FW_OWN_REQ_CLR, MCR_WHLPCR, NULL);</div><div class='add'>+</div><div class='add'>+	err = readx_poll_timeout(mt76s_read_pcr, &amp;dev-&gt;mt76, status,</div><div class='add'>+				 status &amp; WHLPCR_IS_DRIVER_OWN, 2000, 1000000);</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; test_bit(MT76_STATE_MCU_RUNNING, &amp;dev-&gt;mphy.state))</div><div class='add'>+		err = readx_poll_timeout(mt7921s_read_rm3r, dev, status,</div><div class='add'>+					 status &amp; D2HRM3R_IS_DRIVER_OWN,</div><div class='add'>+					 2000, 1000000);</div><div class='add'>+</div><div class='add'>+	sdio_release_host(func);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "driver own failed\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clear_bit(MT76_STATE_PM, &amp;mphy-&gt;state);</div><div class='add'>+</div><div class='add'>+	pm-&gt;stats.last_wake_event = jiffies;</div><div class='add'>+	pm-&gt;stats.doze_time += pm-&gt;stats.last_wake_event -</div><div class='add'>+			       pm-&gt;stats.last_doze_event;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7921s_mcu_fw_pmctrl(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct sdio_func *func = dev-&gt;mt76.sdio.func;</div><div class='add'>+	struct mt76_phy *mphy = &amp;dev-&gt;mt76.phy;</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+	u32 status;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	sdio_claim_host(func);</div><div class='add'>+</div><div class='add'>+	if (test_bit(MT76_STATE_MCU_RUNNING, &amp;dev-&gt;mphy.state)) {</div><div class='add'>+		err = readx_poll_timeout(mt7921s_clear_rm3r_drv_own,</div><div class='add'>+					 dev, status,</div><div class='add'>+					 !(status &amp; D2HRM3R_IS_DRIVER_OWN),</div><div class='add'>+					 2000, 1000000);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(dev-&gt;mt76.dev, "mailbox ACK not cleared\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sdio_writel(func, WHLPCR_FW_OWN_REQ_SET, MCR_WHLPCR, NULL);</div><div class='add'>+</div><div class='add'>+	err = readx_poll_timeout(mt76s_read_pcr, &amp;dev-&gt;mt76, status,</div><div class='add'>+				 !(status &amp; WHLPCR_IS_DRIVER_OWN), 2000, 1000000);</div><div class='add'>+out:</div><div class='add'>+	sdio_release_host(func);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "firmware own failed\n");</div><div class='add'>+		clear_bit(MT76_STATE_PM, &amp;mphy-&gt;state);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pm-&gt;stats.last_doze_event = jiffies;</div><div class='add'>+	pm-&gt;stats.awake_time += pm-&gt;stats.last_doze_event -</div><div class='add'>+				pm-&gt;stats.last_wake_event;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/testmode.c b/drivers/net/wireless/mediatek/mt76/mt7921/testmode.c<br/>new file mode 100644<br/>index 000000000000..e60ee992edf8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/testmode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7921/testmode.c</a></div><div class='hunk'>@@ -0,0 +1,196 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+</div><div class='add'>+#include "mt7921.h"</div><div class='add'>+#include "mcu.h"</div><div class='add'>+</div><div class='add'>+enum mt7921_testmode_attr {</div><div class='add'>+	MT7921_TM_ATTR_UNSPEC,</div><div class='add'>+	MT7921_TM_ATTR_SET,</div><div class='add'>+	MT7921_TM_ATTR_QUERY,</div><div class='add'>+	MT7921_TM_ATTR_RSP,</div><div class='add'>+</div><div class='add'>+	/* keep last */</div><div class='add'>+	NUM_MT7921_TM_ATTRS,</div><div class='add'>+	MT7921_TM_ATTR_MAX = NUM_MT7921_TM_ATTRS - 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt7921_tm_cmd {</div><div class='add'>+	u8 action;</div><div class='add'>+	u32 param0;</div><div class='add'>+	u32 param1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt7921_tm_evt {</div><div class='add'>+	u32 param0;</div><div class='add'>+	u32 param1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy mt7921_tm_policy[NUM_MT7921_TM_ATTRS] = {</div><div class='add'>+	[MT7921_TM_ATTR_SET] = NLA_POLICY_EXACT_LEN(sizeof(struct mt7921_tm_cmd)),</div><div class='add'>+	[MT7921_TM_ATTR_QUERY] = NLA_POLICY_EXACT_LEN(sizeof(struct mt7921_tm_cmd)),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7921_tm_set(struct mt792x_dev *dev, struct mt7921_tm_cmd *req)</div><div class='add'>+{</div><div class='add'>+	struct mt7921_rftest_cmd cmd = {</div><div class='add'>+		.action = req-&gt;action,</div><div class='add'>+		.param0 = cpu_to_le32(req-&gt;param0),</div><div class='add'>+		.param1 = cpu_to_le32(req-&gt;param1),</div><div class='add'>+	};</div><div class='add'>+	bool testmode = false, normal = false;</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+	struct mt76_phy *phy = &amp;dev-&gt;mphy;</div><div class='add'>+	int ret = -ENOTCONN;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	if (req-&gt;action == TM_SWITCH_MODE) {</div><div class='add'>+		if (req-&gt;param0 == MT7921_TM_NORMAL)</div><div class='add'>+			normal = true;</div><div class='add'>+		else</div><div class='add'>+			testmode = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (testmode) {</div><div class='add'>+		/* Make sure testmode running on full power mode */</div><div class='add'>+		pm-&gt;enable = false;</div><div class='add'>+		cancel_delayed_work_sync(&amp;pm-&gt;ps_work);</div><div class='add'>+		cancel_work_sync(&amp;pm-&gt;wake_work);</div><div class='add'>+		__mt792x_mcu_drv_pmctrl(dev);</div><div class='add'>+</div><div class='add'>+		phy-&gt;test.state = MT76_TM_STATE_ON;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mt76_testmode_enabled(phy))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_CE_CMD(TEST_CTRL), &amp;cmd,</div><div class='add'>+				sizeof(cmd), false);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (normal) {</div><div class='add'>+		/* Switch back to the normal world */</div><div class='add'>+		phy-&gt;test.state = MT76_TM_STATE_OFF;</div><div class='add'>+		pm-&gt;enable = true;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7921_tm_query(struct mt792x_dev *dev, struct mt7921_tm_cmd *req,</div><div class='add'>+		struct mt7921_tm_evt *evt_resp)</div><div class='add'>+{</div><div class='add'>+	struct mt7921_rftest_cmd cmd = {</div><div class='add'>+		.action = req-&gt;action,</div><div class='add'>+		.param0 = cpu_to_le32(req-&gt;param0),</div><div class='add'>+		.param1 = cpu_to_le32(req-&gt;param1),</div><div class='add'>+	};</div><div class='add'>+	struct mt7921_rftest_evt *evt;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76, MCU_CE_CMD(TEST_CTRL),</div><div class='add'>+					&amp;cmd, sizeof(cmd), true, &amp;skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	evt = (struct mt7921_rftest_evt *)skb-&gt;data;</div><div class='add'>+	evt_resp-&gt;param0 = le32_to_cpu(evt-&gt;param0);</div><div class='add'>+	evt_resp-&gt;param1 = le32_to_cpu(evt-&gt;param1);</div><div class='add'>+out:</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7921_testmode_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			void *data, int len)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[NUM_MT76_TM_ATTRS];</div><div class='add'>+	struct mt76_phy *mphy = hw-&gt;priv;</div><div class='add'>+	struct mt792x_phy *phy = mphy-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(MT76_STATE_RUNNING, &amp;mphy-&gt;state) ||</div><div class='add'>+	    !(hw-&gt;conf.flags &amp; IEEE80211_CONF_MONITOR))</div><div class='add'>+		return -ENOTCONN;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_deprecated(tb, MT76_TM_ATTR_MAX, data, len,</div><div class='add'>+				   mt76_tm_policy, NULL);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (tb[MT76_TM_ATTR_DRV_DATA]) {</div><div class='add'>+		struct nlattr *drv_tb[NUM_MT7921_TM_ATTRS], *data;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		data = tb[MT76_TM_ATTR_DRV_DATA];</div><div class='add'>+		ret = nla_parse_nested_deprecated(drv_tb,</div><div class='add'>+						  MT7921_TM_ATTR_MAX,</div><div class='add'>+						  data, mt7921_tm_policy,</div><div class='add'>+						  NULL);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		data = drv_tb[MT7921_TM_ATTR_SET];</div><div class='add'>+		if (data)</div><div class='add'>+			return mt7921_tm_set(phy-&gt;dev, nla_data(data));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7921_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *msg,</div><div class='add'>+			 struct netlink_callback *cb, void *data, int len)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[NUM_MT76_TM_ATTRS];</div><div class='add'>+	struct mt76_phy *mphy = hw-&gt;priv;</div><div class='add'>+	struct mt792x_phy *phy = mphy-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(MT76_STATE_RUNNING, &amp;mphy-&gt;state) ||</div><div class='add'>+	    !(hw-&gt;conf.flags &amp; IEEE80211_CONF_MONITOR) ||</div><div class='add'>+	    !mt76_testmode_enabled(mphy))</div><div class='add'>+		return -ENOTCONN;</div><div class='add'>+</div><div class='add'>+	if (cb-&gt;args[2]++ &gt; 0)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_deprecated(tb, MT76_TM_ATTR_MAX, data, len,</div><div class='add'>+				   mt76_tm_policy, NULL);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (tb[MT76_TM_ATTR_DRV_DATA]) {</div><div class='add'>+		struct nlattr *drv_tb[NUM_MT7921_TM_ATTRS], *data;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		data = tb[MT76_TM_ATTR_DRV_DATA];</div><div class='add'>+		ret = nla_parse_nested_deprecated(drv_tb,</div><div class='add'>+						  MT7921_TM_ATTR_MAX,</div><div class='add'>+						  data, mt7921_tm_policy,</div><div class='add'>+						  NULL);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		data = drv_tb[MT7921_TM_ATTR_QUERY];</div><div class='add'>+		if (data) {</div><div class='add'>+			struct mt7921_tm_evt evt_resp;</div><div class='add'>+</div><div class='add'>+			err = mt7921_tm_query(phy-&gt;dev, nla_data(data),</div><div class='add'>+					      &amp;evt_resp);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+</div><div class='add'>+			return nla_put(msg, MT7921_TM_ATTR_RSP,</div><div class='add'>+				       sizeof(evt_resp), &amp;evt_resp);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/trace.c b/drivers/net/wireless/mediatek/mt76/mt7921/trace.c<br/>deleted file mode 100644<br/>index 4dc3c7b89ebd..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/trace.c?id=fb6c79d7261afb7e942251254ea47951c2a9a706'>drivers/net/wireless/mediatek/mt76/mt7921/trace.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: ISC</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2021 Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='del'>-#ifndef __CHECKER__</div><div class='del'>-#define CREATE_TRACE_POINTS</div><div class='del'>-#include "mt7921_trace.h"</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/usb.c b/drivers/net/wireless/mediatek/mt76/mt7921/usb.c<br/>new file mode 100644<br/>index 000000000000..17057e68bf21<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7921/usb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7921/usb.c</a></div><div class='hunk'>@@ -0,0 +1,348 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/* Copyright (C) 2022 MediaTek Inc.</div><div class='add'>+ *</div><div class='add'>+ * Author: Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mt7921.h"</div><div class='add'>+#include "mcu.h"</div><div class='add'>+#include "../mt76_connac2_mac.h"</div><div class='add'>+</div><div class='add'>+static const struct usb_device_id mt7921u_device_table[] = {</div><div class='add'>+	{ USB_DEVICE_AND_INTERFACE_INFO(0x0e8d, 0x7961, 0xff, 0xff, 0xff),</div><div class='add'>+		.driver_info = (kernel_ulong_t)MT7921_FIRMWARE_WM },</div><div class='add'>+	/* Comfast CF-952AX */</div><div class='add'>+	{ USB_DEVICE_AND_INTERFACE_INFO(0x3574, 0x6211, 0xff, 0xff, 0xff),</div><div class='add'>+		.driver_info = (kernel_ulong_t)MT7921_FIRMWARE_WM },</div><div class='add'>+	/* Netgear, Inc. [A8000,AXE3000] */</div><div class='add'>+	{ USB_DEVICE_AND_INTERFACE_INFO(0x0846, 0x9060, 0xff, 0xff, 0xff),</div><div class='add'>+		.driver_info = (kernel_ulong_t)MT7921_FIRMWARE_WM },</div><div class='add'>+	/* Netgear, Inc. A7500 */</div><div class='add'>+	{ USB_DEVICE_AND_INTERFACE_INFO(0x0846, 0x9065, 0xff, 0xff, 0xff),</div><div class='add'>+		.driver_info = (kernel_ulong_t)MT7921_FIRMWARE_WM },</div><div class='add'>+	/* TP-Link TXE50UH */</div><div class='add'>+	{ USB_DEVICE_AND_INTERFACE_INFO(0x35bc, 0x0107, 0xff, 0xff, 0xff),</div><div class='add'>+		.driver_info = (kernel_ulong_t)MT7921_FIRMWARE_WM },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7921u_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,</div><div class='add'>+			 int cmd, int *seq)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	u32 pad, ep;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_connac2_mcu_fill_message(mdev, skb, cmd, seq);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mdev-&gt;mcu.timeout = 3 * HZ;</div><div class='add'>+</div><div class='add'>+	if (cmd != MCU_CMD(FW_SCATTER))</div><div class='add'>+		ep = MT_EP_OUT_INBAND_CMD;</div><div class='add'>+	else</div><div class='add'>+		ep = MT_EP_OUT_AC_BE;</div><div class='add'>+</div><div class='add'>+	mt792x_skb_add_usb_sdio_hdr(dev, skb, 0);</div><div class='add'>+	pad = round_up(skb-&gt;len, 4) + 4 - skb-&gt;len;</div><div class='add'>+	__skb_put_zero(skb, pad);</div><div class='add'>+</div><div class='add'>+	ret = mt76u_bulk_msg(&amp;dev-&gt;mt76, skb-&gt;data, skb-&gt;len, NULL,</div><div class='add'>+			     1000, ep);</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7921u_mcu_init(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	static const struct mt76_mcu_ops mcu_ops = {</div><div class='add'>+		.headroom = MT_SDIO_HDR_SIZE +</div><div class='add'>+			    sizeof(struct mt76_connac2_mcu_txd),</div><div class='add'>+		.tailroom = MT_USB_TAIL_SIZE,</div><div class='add'>+		.mcu_skb_send_msg = mt7921u_mcu_send_message,</div><div class='add'>+		.mcu_parse_response = mt7921_mcu_parse_response,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev-&gt;mt76.mcu_ops = &amp;mcu_ops;</div><div class='add'>+</div><div class='add'>+	mt76_set(dev, MT_UDMA_TX_QSEL, MT_FW_DL_EN);</div><div class='add'>+	ret = mt7921_run_firmware(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	set_bit(MT76_STATE_MCU_RUNNING, &amp;dev-&gt;mphy.state);</div><div class='add'>+	mt76_clear(dev, MT_UDMA_TX_QSEL, MT_FW_DL_EN);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7921u_mac_reset(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mt76_txq_schedule_all(&amp;dev-&gt;mphy);</div><div class='add'>+	mt76_worker_disable(&amp;dev-&gt;mt76.tx_worker);</div><div class='add'>+</div><div class='add'>+	set_bit(MT76_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+	set_bit(MT76_MCU_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+</div><div class='add'>+	wake_up(&amp;dev-&gt;mt76.mcu.wait);</div><div class='add'>+	skb_queue_purge(&amp;dev-&gt;mt76.mcu.res_q);</div><div class='add'>+</div><div class='add'>+	mt76u_stop_rx(&amp;dev-&gt;mt76);</div><div class='add'>+	mt76u_stop_tx(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	mt792xu_wfsys_reset(dev);</div><div class='add'>+</div><div class='add'>+	clear_bit(MT76_MCU_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+	err = mt76u_resume_rx(&amp;dev-&gt;mt76);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt792xu_mcu_power_on(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt792xu_dma_init(dev, false);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_SWDEF_MODE, MT_SWDEF_NORMAL_MODE);</div><div class='add'>+	mt76_set(dev, MT_UDMA_TX_QSEL, MT_FW_DL_EN);</div><div class='add'>+</div><div class='add'>+	err = mt7921_run_firmware(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mt76_clear(dev, MT_UDMA_TX_QSEL, MT_FW_DL_EN);</div><div class='add'>+</div><div class='add'>+	err = mt7921_mcu_set_eeprom(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt7921_mac_init(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = __mt7921_start(&amp;dev-&gt;phy);</div><div class='add'>+out:</div><div class='add'>+	clear_bit(MT76_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+</div><div class='add'>+	mt76_worker_enable(&amp;dev-&gt;mt76.tx_worker);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7921u_probe(struct usb_interface *usb_intf,</div><div class='add'>+			 const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	static const struct mt76_driver_ops drv_ops = {</div><div class='add'>+		.txwi_size = MT_SDIO_TXD_SIZE,</div><div class='add'>+		.drv_flags = MT_DRV_RX_DMA_HDR | MT_DRV_HW_MGMT_TXQ |</div><div class='add'>+			     MT_DRV_AMSDU_OFFLOAD,</div><div class='add'>+		.survey_flags = SURVEY_INFO_TIME_TX |</div><div class='add'>+				SURVEY_INFO_TIME_RX |</div><div class='add'>+				SURVEY_INFO_TIME_BSS_RX,</div><div class='add'>+		.tx_prepare_skb = mt7921_usb_sdio_tx_prepare_skb,</div><div class='add'>+		.tx_complete_skb = mt7921_usb_sdio_tx_complete_skb,</div><div class='add'>+		.tx_status_data = mt7921_usb_sdio_tx_status_data,</div><div class='add'>+		.rx_skb = mt7921_queue_rx_skb,</div><div class='add'>+		.rx_check = mt7921_rx_check,</div><div class='add'>+		.sta_add = mt7921_mac_sta_add,</div><div class='add'>+		.sta_event = mt7921_mac_sta_event,</div><div class='add'>+		.sta_remove = mt7921_mac_sta_remove,</div><div class='add'>+		.update_survey = mt792x_update_channel,</div><div class='add'>+		.set_channel = mt7921_set_channel,</div><div class='add'>+	};</div><div class='add'>+	static const struct mt792x_hif_ops hif_ops = {</div><div class='add'>+		.mcu_init = mt7921u_mcu_init,</div><div class='add'>+		.init_reset = mt792xu_init_reset,</div><div class='add'>+		.reset = mt7921u_mac_reset,</div><div class='add'>+	};</div><div class='add'>+	static struct mt76_bus_ops bus_ops = {</div><div class='add'>+		.rr = mt792xu_rr,</div><div class='add'>+		.wr = mt792xu_wr,</div><div class='add'>+		.rmw = mt792xu_rmw,</div><div class='add'>+		.read_copy = mt76u_read_copy,</div><div class='add'>+		.write_copy = mt792xu_copy,</div><div class='add'>+		.type = MT76_BUS_USB,</div><div class='add'>+	};</div><div class='add'>+	struct usb_device *udev = interface_to_usbdev(usb_intf);</div><div class='add'>+	struct ieee80211_ops *ops;</div><div class='add'>+	struct ieee80211_hw *hw;</div><div class='add'>+	struct mt792x_dev *dev;</div><div class='add'>+	struct mt76_dev *mdev;</div><div class='add'>+	u8 features;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ops = mt792x_get_mac80211_ops(&amp;usb_intf-&gt;dev, &amp;mt7921_ops,</div><div class='add'>+				      (void *)id-&gt;driver_info, &amp;features);</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ops-&gt;stop = mt792xu_stop;</div><div class='add'>+	mdev = mt76_alloc_device(&amp;usb_intf-&gt;dev, sizeof(*dev), ops, &amp;drv_ops);</div><div class='add'>+	if (!mdev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	dev-&gt;fw_features = features;</div><div class='add'>+	dev-&gt;hif_ops = &amp;hif_ops;</div><div class='add'>+</div><div class='add'>+	udev = usb_get_dev(udev);</div><div class='add'>+	usb_reset_device(udev);</div><div class='add'>+</div><div class='add'>+	usb_set_intfdata(usb_intf, dev);</div><div class='add'>+</div><div class='add'>+	ret = __mt76u_init(mdev, usb_intf, &amp;bus_ops);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	mdev-&gt;rev = (mt76_rr(dev, MT_HW_CHIPID) &lt;&lt; 16) |</div><div class='add'>+		    (mt76_rr(dev, MT_HW_REV) &amp; 0xff);</div><div class='add'>+	dev_dbg(mdev-&gt;dev, "ASIC revision: %04x\n", mdev-&gt;rev);</div><div class='add'>+</div><div class='add'>+	if (mt76_get_field(dev, MT_CONN_ON_MISC, MT_TOP_MISC2_FW_N9_RDY)) {</div><div class='add'>+		ret = mt792xu_wfsys_reset(dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt792xu_mcu_power_on(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ret = mt76u_alloc_mcu_queue(&amp;dev-&gt;mt76);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ret = mt76u_alloc_queues(&amp;dev-&gt;mt76);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ret = mt792xu_dma_init(dev, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	hw = mt76_hw(dev);</div><div class='add'>+	/* check hw sg support in order to enable AMSDU */</div><div class='add'>+	hw-&gt;max_tx_fragments = mdev-&gt;usb.sg_en ? MT_HW_TXP_MAX_BUF_NUM : 1;</div><div class='add'>+</div><div class='add'>+	ret = mt7921_register_device(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	mt76u_queues_deinit(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	usb_set_intfdata(usb_intf, NULL);</div><div class='add'>+	usb_put_dev(interface_to_usbdev(usb_intf));</div><div class='add'>+</div><div class='add'>+	mt76_free_device(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int mt7921u_suspend(struct usb_interface *intf, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = usb_get_intfdata(intf);</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	pm-&gt;suspended = true;</div><div class='add'>+	flush_work(&amp;dev-&gt;reset_work);</div><div class='add'>+</div><div class='add'>+	err = mt76_connac_mcu_set_hif_suspend(&amp;dev-&gt;mt76, true, true);</div><div class='add'>+	if (err)</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	mt76u_stop_rx(&amp;dev-&gt;mt76);</div><div class='add'>+	mt76u_stop_tx(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+failed:</div><div class='add'>+	pm-&gt;suspended = false;</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		mt792x_reset(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7921u_resume(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = usb_get_intfdata(intf);</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+	bool reinit = true;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		u32 val = mt76_rr(dev, MT_WF_SW_DEF_CR_USB_MCU_EVENT);</div><div class='add'>+</div><div class='add'>+		if (!(val &amp; MT_WF_SW_SER_TRIGGER_SUSPEND)) {</div><div class='add'>+			reinit = false;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (val &amp; MT_WF_SW_SER_DONE_SUSPEND) {</div><div class='add'>+			mt76_wr(dev, MT_WF_SW_DEF_CR_USB_MCU_EVENT, 0);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		msleep(20);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (reinit || mt792x_dma_need_reinit(dev)) {</div><div class='add'>+		err = mt792xu_dma_init(dev, true);</div><div class='add'>+		if (err)</div><div class='add'>+			goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mt76u_resume_rx(&amp;dev-&gt;mt76);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	err = mt76_connac_mcu_set_hif_suspend(&amp;dev-&gt;mt76, false, true);</div><div class='add'>+failed:</div><div class='add'>+	pm-&gt;suspended = false;</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		mt792x_reset(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(usb, mt7921u_device_table);</div><div class='add'>+MODULE_FIRMWARE(MT7921_FIRMWARE_WM);</div><div class='add'>+MODULE_FIRMWARE(MT7921_ROM_PATCH);</div><div class='add'>+</div><div class='add'>+static struct usb_driver mt7921u_driver = {</div><div class='add'>+	.name		= KBUILD_MODNAME,</div><div class='add'>+	.id_table	= mt7921u_device_table,</div><div class='add'>+	.probe		= mt7921u_probe,</div><div class='add'>+	.disconnect	= mt792xu_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend	= mt7921u_suspend,</div><div class='add'>+	.resume		= mt7921u_resume,</div><div class='add'>+	.reset_resume	= mt7921u_resume,</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+	.soft_unbind	= 1,</div><div class='add'>+	.disable_hub_initiated_lpm = 1,</div><div class='add'>+};</div><div class='add'>+module_usb_driver(mt7921u_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("MediaTek MT7921U (USB) wireless driver");</div><div class='add'>+MODULE_AUTHOR("Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;");</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/Kconfig b/drivers/net/wireless/mediatek/mt76/mt7925/Kconfig<br/>new file mode 100644<br/>index 000000000000..f4f7c93c2ea7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7925/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7925/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+# SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+config MT7925_COMMON</div><div class='add'>+	tristate</div><div class='add'>+	select MT792x_LIB</div><div class='add'>+	select WANT_DEV_COREDUMP</div><div class='add'>+</div><div class='add'>+config MT7925E</div><div class='add'>+	tristate "MediaTek MT7925E (PCIe) support"</div><div class='add'>+	select MT7925_COMMON</div><div class='add'>+	depends on MAC80211</div><div class='add'>+	depends on PCI</div><div class='add'>+	help</div><div class='add'>+	  This adds support for MT7925-based wireless PCIe devices,</div><div class='add'>+	  which support operation at 6GHz, 5GHz, and 2.4GHz IEEE 802.11be</div><div class='add'>+	  2x2:2SS 4096-QAM, 160MHz channels.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here.</div><div class='add'>+</div><div class='add'>+config MT7925U</div><div class='add'>+	tristate "MediaTek MT7925U (USB) support"</div><div class='add'>+	select MT792x_USB</div><div class='add'>+	select MT7925_COMMON</div><div class='add'>+	depends on MAC80211</div><div class='add'>+	depends on USB</div><div class='add'>+	help</div><div class='add'>+	  This adds support for MT7925-based wireless USB devices,</div><div class='add'>+	  which support operation at 6GHz, 5GHz, and 2.4GHz IEEE 802.11be</div><div class='add'>+	  2x2:2SS 4096-QAM, 160MHz channels.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here.</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/Makefile b/drivers/net/wireless/mediatek/mt76/mt7925/Makefile<br/>new file mode 100644<br/>index 000000000000..8f1078ce3231<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7925/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7925/Makefile</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+# SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_MT7925_COMMON) += mt7925-common.o</div><div class='add'>+obj-$(CONFIG_MT7925E) += mt7925e.o</div><div class='add'>+obj-$(CONFIG_MT7925U) += mt7925u.o</div><div class='add'>+</div><div class='add'>+mt7925-common-y := mac.o mcu.o regd.o main.o init.o debugfs.o</div><div class='add'>+mt7925-common-$(CONFIG_NL80211_TESTMODE) += testmode.o</div><div class='add'>+mt7925e-y := pci.o pci_mac.o pci_mcu.o</div><div class='add'>+mt7925u-y := usb.o</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7925/debugfs.c<br/>new file mode 100644<br/>index 000000000000..e2498659c884<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7925/debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7925/debugfs.c</a></div><div class='hunk'>@@ -0,0 +1,319 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/* Copyright (C) 2023 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#include "mt7925.h"</div><div class='add'>+#include "mcu.h"</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_reg_set(void *data, u64 val)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = data;</div><div class='add'>+	u32 regval = val;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	mt7925_mcu_regval(dev, dev-&gt;mt76.debugfs_reg, &amp;regval, true);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_reg_get(void *data, u64 *val)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = data;</div><div class='add'>+	u32 regval;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	ret = mt7925_mcu_regval(dev, dev-&gt;mt76.debugfs_reg, &amp;regval, false);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+	if (!ret)</div><div class='add'>+		*val = regval;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(fops_regval, mt7925_reg_get, mt7925_reg_set,</div><div class='add'>+			 "0x%08llx\n");</div><div class='add'>+static int</div><div class='add'>+mt7925_fw_debug_set(void *data, u64 val)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = data;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+</div><div class='add'>+	dev-&gt;fw_debug = (u8)val;</div><div class='add'>+	mt7925_mcu_fw_log_2_host(dev, dev-&gt;fw_debug);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_fw_debug_get(void *data, u64 *val)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = data;</div><div class='add'>+</div><div class='add'>+	*val = dev-&gt;fw_debug;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(fops_fw_debug, mt7925_fw_debug_get,</div><div class='add'>+			 mt7925_fw_debug_set, "%lld\n");</div><div class='add'>+</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(mt792x_tx_stats);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_seq_puts_array(struct seq_file *file, const char *str,</div><div class='add'>+		      s8 val[][2], int len, u8 band_idx)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	seq_printf(file, "%-22s:", str);</div><div class='add'>+	for (i = 0; i &lt; len; i++)</div><div class='add'>+		if (val[i][band_idx] == 127)</div><div class='add'>+			seq_printf(file, " %6s", "N.A");</div><div class='add'>+		else</div><div class='add'>+			seq_printf(file, " %6d", val[i][band_idx]);</div><div class='add'>+	seq_puts(file, "\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define mt7925_print_txpwr_entry(prefix, rate, idx)	\</div><div class='add'>+({							\</div><div class='add'>+	mt7925_seq_puts_array(s, #prefix " (tmac)",	\</div><div class='add'>+			      txpwr-&gt;rate,		\</div><div class='add'>+			      ARRAY_SIZE(txpwr-&gt;rate),	\</div><div class='add'>+			      idx);			\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+mt7925_eht_txpwr(struct seq_file *s, struct mt7925_txpwr *txpwr, u8 band_idx)</div><div class='add'>+{</div><div class='add'>+	seq_printf(s, "%-22s  %6s %6s %6s %6s %6s %6s %6s %6s %6s %6s %6s %6s %6s %6s %6s %6s\n",</div><div class='add'>+		   " ", "mcs0", "mcs1", "mcs2", "mcs3", "mcs4", "mcs5",</div><div class='add'>+		   "mcs6", "mcs7", "mcs8", "mcs9", "mcs10", "mcs11",</div><div class='add'>+		   "mcs12", "mcs13", "mcs14", "mcs15");</div><div class='add'>+	mt7925_print_txpwr_entry(EHT26, eht26, band_idx);</div><div class='add'>+	mt7925_print_txpwr_entry(EHT52, eht52, band_idx);</div><div class='add'>+	mt7925_print_txpwr_entry(EHT106, eht106, band_idx);</div><div class='add'>+	mt7925_print_txpwr_entry(EHT242, eht242, band_idx);</div><div class='add'>+	mt7925_print_txpwr_entry(EHT484, eht484, band_idx);</div><div class='add'>+</div><div class='add'>+	mt7925_print_txpwr_entry(EHT996, eht996, band_idx);</div><div class='add'>+	mt7925_print_txpwr_entry(EHT996x2, eht996x2, band_idx);</div><div class='add'>+	mt7925_print_txpwr_entry(EHT996x4, eht996x4, band_idx);</div><div class='add'>+	mt7925_print_txpwr_entry(EHT26_52, eht26_52, band_idx);</div><div class='add'>+	mt7925_print_txpwr_entry(EHT26_106, eht26_106, band_idx);</div><div class='add'>+	mt7925_print_txpwr_entry(EHT484_242, eht484_242, band_idx);</div><div class='add'>+	mt7925_print_txpwr_entry(EHT996_484, eht996_484, band_idx);</div><div class='add'>+	mt7925_print_txpwr_entry(EHT996_484_242, eht996_484_242, band_idx);</div><div class='add'>+	mt7925_print_txpwr_entry(EHT996x2_484, eht996x2_484, band_idx);</div><div class='add'>+	mt7925_print_txpwr_entry(EHT996x3, eht996x3, band_idx);</div><div class='add'>+	mt7925_print_txpwr_entry(EHT996x3_484, eht996x3_484, band_idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_txpwr(struct seq_file *s, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = dev_get_drvdata(s-&gt;private);</div><div class='add'>+	struct mt7925_txpwr *txpwr = NULL;</div><div class='add'>+	u8 band_idx = dev-&gt;mphy.band_idx;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	txpwr = devm_kmalloc(dev-&gt;mt76.dev, sizeof(*txpwr), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!txpwr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	ret = mt7925_get_txpwr_info(dev, band_idx, txpwr);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	seq_printf(s, "%-22s  %6s %6s %6s %6s\n",</div><div class='add'>+		   " ", "1m", "2m", "5m", "11m");</div><div class='add'>+	mt7925_print_txpwr_entry(CCK, cck, band_idx);</div><div class='add'>+</div><div class='add'>+	seq_printf(s, "%-22s  %6s %6s %6s %6s %6s %6s %6s %6s\n",</div><div class='add'>+		   " ", "6m", "9m", "12m", "18m", "24m", "36m",</div><div class='add'>+		   "48m", "54m");</div><div class='add'>+	mt7925_print_txpwr_entry(OFDM, ofdm, band_idx);</div><div class='add'>+</div><div class='add'>+	seq_printf(s, "%-22s  %6s %6s %6s %6s %6s %6s %6s %6s\n",</div><div class='add'>+		   " ", "mcs0", "mcs1", "mcs2", "mcs3", "mcs4", "mcs5",</div><div class='add'>+		   "mcs6", "mcs7");</div><div class='add'>+	mt7925_print_txpwr_entry(HT20, ht20, band_idx);</div><div class='add'>+</div><div class='add'>+	seq_printf(s, "%-22s  %6s %6s %6s %6s %6s %6s %6s %6s %6s\n",</div><div class='add'>+		   " ", "mcs0", "mcs1", "mcs2", "mcs3", "mcs4", "mcs5",</div><div class='add'>+		   "mcs6", "mcs7", "mcs32");</div><div class='add'>+	mt7925_print_txpwr_entry(HT40, ht40, band_idx);</div><div class='add'>+</div><div class='add'>+	seq_printf(s, "%-22s  %6s %6s %6s %6s %6s %6s %6s %6s %6s %6s %6s %6s\n",</div><div class='add'>+		   " ", "mcs0", "mcs1", "mcs2", "mcs3", "mcs4", "mcs5",</div><div class='add'>+		   "mcs6", "mcs7", "mcs8", "mcs9", "mcs10", "mcs11");</div><div class='add'>+	mt7925_print_txpwr_entry(VHT20, vht20, band_idx);</div><div class='add'>+	mt7925_print_txpwr_entry(VHT40, vht40, band_idx);</div><div class='add'>+</div><div class='add'>+	mt7925_print_txpwr_entry(VHT80, vht80, band_idx);</div><div class='add'>+	mt7925_print_txpwr_entry(VHT160, vht160, band_idx);</div><div class='add'>+</div><div class='add'>+	mt7925_print_txpwr_entry(HE26, he26, band_idx);</div><div class='add'>+	mt7925_print_txpwr_entry(HE52, he52, band_idx);</div><div class='add'>+	mt7925_print_txpwr_entry(HE106, he106, band_idx);</div><div class='add'>+	mt7925_print_txpwr_entry(HE242, he242, band_idx);</div><div class='add'>+	mt7925_print_txpwr_entry(HE484, he484, band_idx);</div><div class='add'>+</div><div class='add'>+	mt7925_print_txpwr_entry(HE996, he996, band_idx);</div><div class='add'>+	mt7925_print_txpwr_entry(HE996x2, he996x2, band_idx);</div><div class='add'>+</div><div class='add'>+	mt7925_eht_txpwr(s, txpwr, band_idx);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	devm_kfree(dev-&gt;mt76.dev, txpwr);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_pm_set(void *data, u64 val)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = data;</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+</div><div class='add'>+	if (mt76_is_usb(&amp;dev-&gt;mt76))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	if (val == pm-&gt;enable_user)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!pm-&gt;enable_user) {</div><div class='add'>+		pm-&gt;stats.last_wake_event = jiffies;</div><div class='add'>+		pm-&gt;stats.last_doze_event = jiffies;</div><div class='add'>+	}</div><div class='add'>+	/* make sure the chip is awake here and ps_work is scheduled</div><div class='add'>+	 * just at end of the this routine.</div><div class='add'>+	 */</div><div class='add'>+	pm-&gt;enable = false;</div><div class='add'>+	mt76_connac_pm_wake(&amp;dev-&gt;mphy, pm);</div><div class='add'>+</div><div class='add'>+	pm-&gt;enable_user = val;</div><div class='add'>+	mt7925_set_runtime_pm(dev);</div><div class='add'>+	mt76_connac_power_save_sched(&amp;dev-&gt;mphy, pm);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_pm_get(void *data, u64 *val)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = data;</div><div class='add'>+</div><div class='add'>+	*val = dev-&gt;pm.enable_user;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(fops_pm, mt7925_pm_get, mt7925_pm_set, "%lld\n");</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_deep_sleep_set(void *data, u64 val)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = data;</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+	bool monitor = !!(dev-&gt;mphy.hw-&gt;conf.flags &amp; IEEE80211_CONF_MONITOR);</div><div class='add'>+	bool enable = !!val;</div><div class='add'>+</div><div class='add'>+	if (mt76_is_usb(&amp;dev-&gt;mt76))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	if (pm-&gt;ds_enable_user == enable)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	pm-&gt;ds_enable_user = enable;</div><div class='add'>+	pm-&gt;ds_enable = enable &amp;&amp; !monitor;</div><div class='add'>+	mt7925_mcu_set_deep_sleep(dev, pm-&gt;ds_enable);</div><div class='add'>+out:</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_deep_sleep_get(void *data, u64 *val)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = data;</div><div class='add'>+</div><div class='add'>+	*val = dev-&gt;pm.ds_enable_user;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(fops_ds, mt7925_deep_sleep_get,</div><div class='add'>+			 mt7925_deep_sleep_set, "%lld\n");</div><div class='add'>+</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(fops_pm_idle_timeout, mt792x_pm_idle_timeout_get,</div><div class='add'>+			 mt792x_pm_idle_timeout_set, "%lld\n");</div><div class='add'>+</div><div class='add'>+static int mt7925_chip_reset(void *data, u64 val)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = data;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (val) {</div><div class='add'>+	case 1:</div><div class='add'>+		/* Reset wifisys directly. */</div><div class='add'>+		mt792x_reset(&amp;dev-&gt;mt76);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* Collect the core dump before reset wifisys. */</div><div class='add'>+		mt792x_mutex_acquire(dev);</div><div class='add'>+		ret = mt7925_mcu_chip_config(dev, "assert");</div><div class='add'>+		mt792x_mutex_release(dev);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(fops_reset, NULL, mt7925_chip_reset, "%lld\n");</div><div class='add'>+</div><div class='add'>+int mt7925_init_debugfs(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct dentry *dir;</div><div class='add'>+</div><div class='add'>+	dir = mt76_register_debugfs_fops(&amp;dev-&gt;mphy, &amp;fops_regval);</div><div class='add'>+	if (!dir)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (mt76_is_mmio(&amp;dev-&gt;mt76))</div><div class='add'>+		debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "xmit-queues",</div><div class='add'>+					    dir, mt792x_queues_read);</div><div class='add'>+	else</div><div class='add'>+		debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "xmit-queues",</div><div class='add'>+					    dir, mt76_queues_read);</div><div class='add'>+</div><div class='add'>+	debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "acq", dir,</div><div class='add'>+				    mt792x_queues_acq);</div><div class='add'>+	debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "txpower_sku", dir,</div><div class='add'>+				    mt7925_txpwr);</div><div class='add'>+	debugfs_create_file("tx_stats", 0400, dir, dev, &amp;mt792x_tx_stats_fops);</div><div class='add'>+	debugfs_create_file("fw_debug", 0600, dir, dev, &amp;fops_fw_debug);</div><div class='add'>+	debugfs_create_file("runtime-pm", 0600, dir, dev, &amp;fops_pm);</div><div class='add'>+	debugfs_create_file("idle-timeout", 0600, dir, dev,</div><div class='add'>+			    &amp;fops_pm_idle_timeout);</div><div class='add'>+	debugfs_create_file("chip_reset", 0600, dir, dev, &amp;fops_reset);</div><div class='add'>+	debugfs_create_devm_seqfile(dev-&gt;mt76.dev, "runtime_pm_stats", dir,</div><div class='add'>+				    mt792x_pm_stats);</div><div class='add'>+	debugfs_create_file("deep-sleep", 0600, dir, dev, &amp;fops_ds);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/init.c b/drivers/net/wireless/mediatek/mt76/mt7925/init.c<br/>new file mode 100644<br/>index 000000000000..3ce5d6fcc69d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7925/init.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7925/init.c</a></div><div class='hunk'>@@ -0,0 +1,281 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/* Copyright (C) 2023 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/hwmon.h&gt;</div><div class='add'>+#include &lt;linux/hwmon-sysfs.h&gt;</div><div class='add'>+#include &lt;linux/thermal.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include "mt7925.h"</div><div class='add'>+#include "regd.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+#include "mcu.h"</div><div class='add'>+</div><div class='add'>+static ssize_t mt7925_thermal_temp_show(struct device *dev,</div><div class='add'>+					struct device_attribute *attr,</div><div class='add'>+					char *buf)</div><div class='add'>+{</div><div class='add'>+	switch (to_sensor_dev_attr(attr)-&gt;index) {</div><div class='add'>+	case 0: {</div><div class='add'>+		struct mt792x_phy *phy = dev_get_drvdata(dev);</div><div class='add'>+		struct mt792x_dev *mdev = phy-&gt;dev;</div><div class='add'>+		int temperature;</div><div class='add'>+</div><div class='add'>+		mt792x_mutex_acquire(mdev);</div><div class='add'>+		temperature = mt7925_mcu_get_temperature(phy);</div><div class='add'>+		mt792x_mutex_release(mdev);</div><div class='add'>+</div><div class='add'>+		if (temperature &lt; 0)</div><div class='add'>+			return temperature;</div><div class='add'>+		/* display in millidegree Celsius */</div><div class='add'>+		return sprintf(buf, "%u\n", temperature * 1000);</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+static SENSOR_DEVICE_ATTR_RO(temp1_input, mt7925_thermal_temp, 0);</div><div class='add'>+</div><div class='add'>+static struct attribute *mt7925_hwmon_attrs[] = {</div><div class='add'>+	&amp;sensor_dev_attr_temp1_input.dev_attr.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+ATTRIBUTE_GROUPS(mt7925_hwmon);</div><div class='add'>+</div><div class='add'>+static int mt7925_thermal_init(struct mt792x_phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct wiphy *wiphy = phy-&gt;mt76-&gt;hw-&gt;wiphy;</div><div class='add'>+	struct device *hwmon;</div><div class='add'>+	const char *name;</div><div class='add'>+</div><div class='add'>+	if (!IS_REACHABLE(CONFIG_HWMON))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	name = devm_kasprintf(&amp;wiphy-&gt;dev, GFP_KERNEL, "mt7925_%s",</div><div class='add'>+			      wiphy_name(wiphy));</div><div class='add'>+	if (!name)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hwmon = devm_hwmon_device_register_with_groups(&amp;wiphy-&gt;dev, name, phy,</div><div class='add'>+						       mt7925_hwmon_groups);</div><div class='add'>+	return PTR_ERR_OR_ZERO(hwmon);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7925_mac_init_basic_rates(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mt76_rates); i++) {</div><div class='add'>+		u16 rate = mt76_rates[i].hw_value;</div><div class='add'>+		u16 idx = MT792x_BASIC_RATES_TBL + i;</div><div class='add'>+</div><div class='add'>+		rate = FIELD_PREP(MT_TX_RATE_MODE, rate &gt;&gt; 8) |</div><div class='add'>+		       FIELD_PREP(MT_TX_RATE_IDX, rate &amp; GENMASK(7, 0));</div><div class='add'>+		mt7925_mac_set_fixed_rate_table(dev, idx, rate);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mac_init(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_MDP_DCR1, MT_MDP_DCR1_MAX_RX_LEN, 1536);</div><div class='add'>+	/* enable hardware de-agg */</div><div class='add'>+	mt76_set(dev, MT_MDP_DCR0, MT_MDP_DCR0_DAMSDU_EN);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MT792x_WTBL_SIZE; i++)</div><div class='add'>+		mt7925_mac_wtbl_update(dev, i,</div><div class='add'>+				       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);</div><div class='add'>+	for (i = 0; i &lt; 2; i++)</div><div class='add'>+		mt792x_mac_init_band(dev, i);</div><div class='add'>+</div><div class='add'>+	mt7925_mac_init_basic_rates(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_mac_init);</div><div class='add'>+</div><div class='add'>+static int __mt7925_init_hardware(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt792x_mcu_init(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = mt76_eeprom_override(&amp;dev-&gt;mphy);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = mt7925_mcu_set_eeprom(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = mt7925_mac_init(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925_init_hardware(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	set_bit(MT76_STATE_INITIALIZED, &amp;dev-&gt;mphy.state);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MT792x_MCU_INIT_RETRY_COUNT; i++) {</div><div class='add'>+		ret = __mt7925_init_hardware(dev);</div><div class='add'>+		if (!ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		mt792x_init_reset(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i == MT792x_MCU_INIT_RETRY_COUNT) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "hardware init failed\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7925_init_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(work, struct mt792x_dev,</div><div class='add'>+					      init_work);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7925_init_hardware(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mt76_set_stream_caps(&amp;dev-&gt;mphy, true);</div><div class='add'>+	mt7925_set_stream_he_eht_caps(&amp;dev-&gt;phy);</div><div class='add'>+	mt792x_config_mac_addr_list(dev);</div><div class='add'>+</div><div class='add'>+	ret = mt7925_init_mlo_caps(&amp;dev-&gt;phy);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "MLO init failed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt76_register_device(&amp;dev-&gt;mt76, true, mt76_rates,</div><div class='add'>+				   ARRAY_SIZE(mt76_rates));</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "register device failed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt7925_init_debugfs(dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "register debugfs failed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt7925_thermal_init(&amp;dev-&gt;phy);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "thermal init failed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt7925_mcu_set_thermal_protect(dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "thermal protection enable failed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* we support chip reset now */</div><div class='add'>+	dev-&gt;hw_init_done = true;</div><div class='add'>+</div><div class='add'>+	mt7925_mcu_set_deep_sleep(dev, dev-&gt;pm.ds_enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_register_device(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev-&gt;phy.dev = dev;</div><div class='add'>+	dev-&gt;phy.mt76 = &amp;dev-&gt;mt76.phy;</div><div class='add'>+	dev-&gt;mt76.phy.priv = &amp;dev-&gt;phy;</div><div class='add'>+	dev-&gt;mt76.tx_worker.fn = mt792x_tx_worker;</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;dev-&gt;pm.ps_work, mt792x_pm_power_save_work);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;dev-&gt;mlo_pm_work, mt7925_mlo_pm_work);</div><div class='add'>+	INIT_WORK(&amp;dev-&gt;pm.wake_work, mt792x_pm_wake_work);</div><div class='add'>+	spin_lock_init(&amp;dev-&gt;pm.wake.lock);</div><div class='add'>+	mutex_init(&amp;dev-&gt;pm.mutex);</div><div class='add'>+	init_waitqueue_head(&amp;dev-&gt;pm.wait);</div><div class='add'>+	init_waitqueue_head(&amp;dev-&gt;wait);</div><div class='add'>+	spin_lock_init(&amp;dev-&gt;pm.txq_lock);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;dev-&gt;mphy.mac_work, mt792x_mac_work);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;dev-&gt;phy.scan_work, mt7925_scan_work);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;dev-&gt;coredump.work, mt7925_coredump_work);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	INIT_WORK(&amp;dev-&gt;ipv6_ns_work, mt7925_set_ipv6_ns_work);</div><div class='add'>+	skb_queue_head_init(&amp;dev-&gt;ipv6_ns_list);</div><div class='add'>+#endif</div><div class='add'>+	skb_queue_head_init(&amp;dev-&gt;phy.scan_event_list);</div><div class='add'>+	skb_queue_head_init(&amp;dev-&gt;coredump.msg_list);</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;dev-&gt;reset_work, mt7925_mac_reset_work);</div><div class='add'>+	INIT_WORK(&amp;dev-&gt;init_work, mt7925_init_work);</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;dev-&gt;phy.roc_work, mt7925_roc_work);</div><div class='add'>+	timer_setup(&amp;dev-&gt;phy.roc_timer, mt792x_roc_timer, 0);</div><div class='add'>+	init_waitqueue_head(&amp;dev-&gt;phy.roc_wait);</div><div class='add'>+</div><div class='add'>+	dev-&gt;pm.idle_timeout = MT792x_PM_TIMEOUT;</div><div class='add'>+	dev-&gt;pm.stats.last_wake_event = jiffies;</div><div class='add'>+	dev-&gt;pm.stats.last_doze_event = jiffies;</div><div class='add'>+	if (!mt76_is_usb(&amp;dev-&gt;mt76)) {</div><div class='add'>+		dev-&gt;pm.enable_user = true;</div><div class='add'>+		dev-&gt;pm.enable = true;</div><div class='add'>+		dev-&gt;pm.ds_enable_user = true;</div><div class='add'>+		dev-&gt;pm.ds_enable = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mt76_is_mmio(&amp;dev-&gt;mt76))</div><div class='add'>+		hw-&gt;extra_tx_headroom += MT_SDIO_TXD_SIZE + MT_SDIO_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+	mt792x_init_acpi_sar(dev);</div><div class='add'>+</div><div class='add'>+	ret = mt792x_init_wcid(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt792x_init_wiphy(hw);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	hw-&gt;wiphy-&gt;reg_notifier = mt7925_regd_notifier;</div><div class='add'>+	dev-&gt;mphy.sband_2g.sband.ht_cap.cap |=</div><div class='add'>+			IEEE80211_HT_CAP_LDPC_CODING |</div><div class='add'>+			IEEE80211_HT_CAP_MAX_AMSDU;</div><div class='add'>+	dev-&gt;mphy.sband_2g.sband.ht_cap.ampdu_density =</div><div class='add'>+			IEEE80211_HT_MPDU_DENSITY_2;</div><div class='add'>+	dev-&gt;mphy.sband_5g.sband.ht_cap.cap |=</div><div class='add'>+			IEEE80211_HT_CAP_LDPC_CODING |</div><div class='add'>+			IEEE80211_HT_CAP_MAX_AMSDU;</div><div class='add'>+	dev-&gt;mphy.sband_2g.sband.ht_cap.ampdu_density =</div><div class='add'>+			IEEE80211_HT_MPDU_DENSITY_1;</div><div class='add'>+	dev-&gt;mphy.sband_5g.sband.vht_cap.cap |=</div><div class='add'>+			IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 |</div><div class='add'>+			IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK |</div><div class='add'>+			IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE |</div><div class='add'>+			IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE |</div><div class='add'>+			(3 &lt;&lt; IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT);</div><div class='add'>+	dev-&gt;mphy.sband_5g.sband.vht_cap.cap |=</div><div class='add'>+			IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ |</div><div class='add'>+			IEEE80211_VHT_CAP_SHORT_GI_160;</div><div class='add'>+</div><div class='add'>+	dev-&gt;mphy.hw-&gt;wiphy-&gt;available_antennas_rx = dev-&gt;mphy.chainmask;</div><div class='add'>+	dev-&gt;mphy.hw-&gt;wiphy-&gt;available_antennas_tx = dev-&gt;mphy.chainmask;</div><div class='add'>+</div><div class='add'>+	queue_work(system_percpu_wq, &amp;dev-&gt;init_work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_register_device);</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mac.c b/drivers/net/wireless/mediatek/mt76/mt7925/mac.c<br/>new file mode 100644<br/>index 000000000000..871b67101976<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7925/mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7925/mac.c</a></div><div class='hunk'>@@ -0,0 +1,1497 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/* Copyright (C) 2023 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/devcoredump.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/timekeeping.h&gt;</div><div class='add'>+#include "mt7925.h"</div><div class='add'>+#include "../dma.h"</div><div class='add'>+#include "regd.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+#include "mcu.h"</div><div class='add'>+</div><div class='add'>+bool mt7925_mac_wtbl_update(struct mt792x_dev *dev, int idx, u32 mask)</div><div class='add'>+{</div><div class='add'>+	mt76_rmw(dev, MT_WTBL_UPDATE, MT_WTBL_UPDATE_WLAN_IDX,</div><div class='add'>+		 FIELD_PREP(MT_WTBL_UPDATE_WLAN_IDX, idx) | mask);</div><div class='add'>+</div><div class='add'>+	return mt76_poll(dev, MT_WTBL_UPDATE, MT_WTBL_UPDATE_BUSY,</div><div class='add'>+			 0, 5000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7925_mac_sta_poll(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	static const u8 ac_to_tid[] = {</div><div class='add'>+		[IEEE80211_AC_BE] = 0,</div><div class='add'>+		[IEEE80211_AC_BK] = 1,</div><div class='add'>+		[IEEE80211_AC_VI] = 4,</div><div class='add'>+		[IEEE80211_AC_VO] = 6</div><div class='add'>+	};</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct mt792x_sta *msta;</div><div class='add'>+	struct mt792x_link_sta *mlink;</div><div class='add'>+	u32 tx_time[IEEE80211_NUM_ACS], rx_time[IEEE80211_NUM_ACS];</div><div class='add'>+	LIST_HEAD(sta_poll_list);</div><div class='add'>+	struct rate_info *rate;</div><div class='add'>+	s8 rssi[4];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='add'>+	list_splice_init(&amp;dev-&gt;mt76.sta_poll_list, &amp;sta_poll_list);</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='add'>+</div><div class='add'>+	while (true) {</div><div class='add'>+		bool clear = false;</div><div class='add'>+		u32 addr, val;</div><div class='add'>+		u16 idx;</div><div class='add'>+		u8 bw;</div><div class='add'>+</div><div class='add'>+		if (list_empty(&amp;sta_poll_list))</div><div class='add'>+			break;</div><div class='add'>+		mlink = list_first_entry(&amp;sta_poll_list,</div><div class='add'>+					 struct mt792x_link_sta, wcid.poll_list);</div><div class='add'>+		msta = mlink-&gt;sta;</div><div class='add'>+		spin_lock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='add'>+		list_del_init(&amp;mlink-&gt;wcid.poll_list);</div><div class='add'>+		spin_unlock_bh(&amp;dev-&gt;mt76.sta_poll_lock);</div><div class='add'>+</div><div class='add'>+		idx = mlink-&gt;wcid.idx;</div><div class='add'>+		addr = mt7925_mac_wtbl_lmac_addr(dev, idx, MT_WTBL_AC0_CTT_OFFSET);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; IEEE80211_NUM_ACS; i++) {</div><div class='add'>+			u32 tx_last = mlink-&gt;airtime_ac[i];</div><div class='add'>+			u32 rx_last = mlink-&gt;airtime_ac[i + 4];</div><div class='add'>+</div><div class='add'>+			mlink-&gt;airtime_ac[i] = mt76_rr(dev, addr);</div><div class='add'>+			mlink-&gt;airtime_ac[i + 4] = mt76_rr(dev, addr + 4);</div><div class='add'>+</div><div class='add'>+			tx_time[i] = mlink-&gt;airtime_ac[i] - tx_last;</div><div class='add'>+			rx_time[i] = mlink-&gt;airtime_ac[i + 4] - rx_last;</div><div class='add'>+</div><div class='add'>+			if ((tx_last | rx_last) &amp; BIT(30))</div><div class='add'>+				clear = true;</div><div class='add'>+</div><div class='add'>+			addr += 8;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (clear) {</div><div class='add'>+			mt7925_mac_wtbl_update(dev, idx,</div><div class='add'>+					       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);</div><div class='add'>+			memset(mlink-&gt;airtime_ac, 0, sizeof(mlink-&gt;airtime_ac));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!mlink-&gt;wcid.sta)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		sta = container_of((void *)msta, struct ieee80211_sta,</div><div class='add'>+				   drv_priv);</div><div class='add'>+		for (i = 0; i &lt; IEEE80211_NUM_ACS; i++) {</div><div class='add'>+			u8 q = mt76_connac_lmac_mapping(i);</div><div class='add'>+			u32 tx_cur = tx_time[q];</div><div class='add'>+			u32 rx_cur = rx_time[q];</div><div class='add'>+			u8 tid = ac_to_tid[i];</div><div class='add'>+</div><div class='add'>+			if (!tx_cur &amp;&amp; !rx_cur)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			ieee80211_sta_register_airtime(sta, tid, tx_cur,</div><div class='add'>+						       rx_cur);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* We don't support reading GI info from txs packets.</div><div class='add'>+		 * For accurate tx status reporting and AQL improvement,</div><div class='add'>+		 * we need to make sure that flags match so polling GI</div><div class='add'>+		 * from per-sta counters directly.</div><div class='add'>+		 */</div><div class='add'>+		rate = &amp;mlink-&gt;wcid.rate;</div><div class='add'>+</div><div class='add'>+		switch (rate-&gt;bw) {</div><div class='add'>+		case RATE_INFO_BW_160:</div><div class='add'>+			bw = IEEE80211_STA_RX_BW_160;</div><div class='add'>+			break;</div><div class='add'>+		case RATE_INFO_BW_80:</div><div class='add'>+			bw = IEEE80211_STA_RX_BW_80;</div><div class='add'>+			break;</div><div class='add'>+		case RATE_INFO_BW_40:</div><div class='add'>+			bw = IEEE80211_STA_RX_BW_40;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			bw = IEEE80211_STA_RX_BW_20;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		addr = mt7925_mac_wtbl_lmac_addr(dev, idx, 6);</div><div class='add'>+		val = mt76_rr(dev, addr);</div><div class='add'>+		if (rate-&gt;flags &amp; RATE_INFO_FLAGS_EHT_MCS) {</div><div class='add'>+			addr = mt7925_mac_wtbl_lmac_addr(dev, idx, 5);</div><div class='add'>+			val = mt76_rr(dev, addr);</div><div class='add'>+			rate-&gt;eht_gi = FIELD_GET(GENMASK(25, 24), val);</div><div class='add'>+		} else if (rate-&gt;flags &amp; RATE_INFO_FLAGS_HE_MCS) {</div><div class='add'>+			u8 offs = MT_WTBL_TXRX_RATE_G2_HE + 2 * bw;</div><div class='add'>+</div><div class='add'>+			rate-&gt;he_gi = (val &amp; (0x3 &lt;&lt; offs)) &gt;&gt; offs;</div><div class='add'>+		} else if (rate-&gt;flags &amp;</div><div class='add'>+			   (RATE_INFO_FLAGS_VHT_MCS | RATE_INFO_FLAGS_MCS)) {</div><div class='add'>+			if (val &amp; BIT(MT_WTBL_TXRX_RATE_G2 + bw))</div><div class='add'>+				rate-&gt;flags |= RATE_INFO_FLAGS_SHORT_GI;</div><div class='add'>+			else</div><div class='add'>+				rate-&gt;flags &amp;= ~RATE_INFO_FLAGS_SHORT_GI;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* get signal strength of resp frames (CTS/BA/ACK) */</div><div class='add'>+		addr = mt7925_mac_wtbl_lmac_addr(dev, idx, 34);</div><div class='add'>+		val = mt76_rr(dev, addr);</div><div class='add'>+</div><div class='add'>+		rssi[0] = to_rssi(GENMASK(7, 0), val);</div><div class='add'>+		rssi[1] = to_rssi(GENMASK(15, 8), val);</div><div class='add'>+		rssi[2] = to_rssi(GENMASK(23, 16), val);</div><div class='add'>+		rssi[3] = to_rssi(GENMASK(31, 14), val);</div><div class='add'>+</div><div class='add'>+		mlink-&gt;ack_signal =</div><div class='add'>+			mt76_rx_signal(msta-&gt;vif-&gt;phy-&gt;mt76-&gt;antenna_mask, rssi);</div><div class='add'>+</div><div class='add'>+		ewma_avg_signal_add(&amp;mlink-&gt;avg_ack_signal, -mlink-&gt;ack_signal);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7925_mac_set_fixed_rate_table(struct mt792x_dev *dev,</div><div class='add'>+				     u8 tbl_idx, u16 rate_idx)</div><div class='add'>+{</div><div class='add'>+	u32 ctrl = MT_WTBL_ITCR_WR | MT_WTBL_ITCR_EXEC | tbl_idx;</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_WTBL_ITDR0, rate_idx);</div><div class='add'>+	/* use wtbl spe idx */</div><div class='add'>+	mt76_wr(dev, MT_WTBL_ITDR1, MT_WTBL_SPE_IDX_SEL);</div><div class='add'>+	mt76_wr(dev, MT_WTBL_ITCR, ctrl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The HW does not translate the mac header to 802.3 for mesh point */</div><div class='add'>+static int mt7925_reverse_frag0_hdr_trans(struct sk_buff *skb, u16 hdr_gap)</div><div class='add'>+{</div><div class='add'>+	struct mt76_rx_status *status = (struct mt76_rx_status *)skb-&gt;cb;</div><div class='add'>+	struct ethhdr *eth_hdr = (struct ethhdr *)(skb-&gt;data + hdr_gap);</div><div class='add'>+	struct mt792x_sta *msta = (struct mt792x_sta *)status-&gt;wcid;</div><div class='add'>+	__le32 *rxd = (__le32 *)skb-&gt;data;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct ieee80211_hdr hdr;</div><div class='add'>+	u16 frame_control;</div><div class='add'>+</div><div class='add'>+	if (le32_get_bits(rxd[3], MT_RXD3_NORMAL_ADDR_TYPE) !=</div><div class='add'>+	    MT_RXD3_NORMAL_U2M)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!(le32_to_cpu(rxd[1]) &amp; MT_RXD1_NORMAL_GROUP_4))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!msta || !msta-&gt;vif)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	sta = container_of((void *)msta, struct ieee80211_sta, drv_priv);</div><div class='add'>+	vif = container_of((void *)msta-&gt;vif, struct ieee80211_vif, drv_priv);</div><div class='add'>+</div><div class='add'>+	/* store the info from RXD and ethhdr to avoid being overridden */</div><div class='add'>+	frame_control = le32_get_bits(rxd[8], MT_RXD8_FRAME_CONTROL);</div><div class='add'>+	hdr.frame_control = cpu_to_le16(frame_control);</div><div class='add'>+	hdr.seq_ctrl = cpu_to_le16(le32_get_bits(rxd[10], MT_RXD10_SEQ_CTRL));</div><div class='add'>+	hdr.duration_id = 0;</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(hdr.addr1, vif-&gt;addr);</div><div class='add'>+	ether_addr_copy(hdr.addr2, sta-&gt;addr);</div><div class='add'>+	switch (frame_control &amp; (IEEE80211_FCTL_TODS |</div><div class='add'>+				 IEEE80211_FCTL_FROMDS)) {</div><div class='add'>+	case 0:</div><div class='add'>+		ether_addr_copy(hdr.addr3, vif-&gt;bss_conf.bssid);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_FCTL_FROMDS:</div><div class='add'>+		ether_addr_copy(hdr.addr3, eth_hdr-&gt;h_source);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_FCTL_TODS:</div><div class='add'>+		ether_addr_copy(hdr.addr3, eth_hdr-&gt;h_dest);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS:</div><div class='add'>+		ether_addr_copy(hdr.addr3, eth_hdr-&gt;h_dest);</div><div class='add'>+		ether_addr_copy(hdr.addr4, eth_hdr-&gt;h_source);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, hdr_gap + sizeof(struct ethhdr) - 2);</div><div class='add'>+	if (eth_hdr-&gt;h_proto == cpu_to_be16(ETH_P_AARP) ||</div><div class='add'>+	    eth_hdr-&gt;h_proto == cpu_to_be16(ETH_P_IPX))</div><div class='add'>+		ether_addr_copy(skb_push(skb, ETH_ALEN), bridge_tunnel_header);</div><div class='add'>+	else if (be16_to_cpu(eth_hdr-&gt;h_proto) &gt;= ETH_P_802_3_MIN)</div><div class='add'>+		ether_addr_copy(skb_push(skb, ETH_ALEN), rfc1042_header);</div><div class='add'>+	else</div><div class='add'>+		skb_pull(skb, 2);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_has_order(hdr.frame_control))</div><div class='add'>+		memcpy(skb_push(skb, IEEE80211_HT_CTL_LEN), &amp;rxd[11],</div><div class='add'>+		       IEEE80211_HT_CTL_LEN);</div><div class='add'>+	if (ieee80211_is_data_qos(hdr.frame_control)) {</div><div class='add'>+		__le16 qos_ctrl;</div><div class='add'>+</div><div class='add'>+		qos_ctrl = cpu_to_le16(le32_get_bits(rxd[10], MT_RXD10_QOS_CTL));</div><div class='add'>+		memcpy(skb_push(skb, IEEE80211_QOS_CTL_LEN), &amp;qos_ctrl,</div><div class='add'>+		       IEEE80211_QOS_CTL_LEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ieee80211_has_a4(hdr.frame_control))</div><div class='add'>+		memcpy(skb_push(skb, sizeof(hdr)), &amp;hdr, sizeof(hdr));</div><div class='add'>+	else</div><div class='add'>+		memcpy(skb_push(skb, sizeof(hdr) - 6), &amp;hdr, sizeof(hdr) - 6);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_mac_fill_rx_rate(struct mt792x_dev *dev,</div><div class='add'>+			struct mt76_rx_status *status,</div><div class='add'>+			struct ieee80211_supported_band *sband,</div><div class='add'>+			__le32 *rxv, u8 *mode)</div><div class='add'>+{</div><div class='add'>+	u32 v0, v2;</div><div class='add'>+	u8 stbc, gi, bw, dcm, nss;</div><div class='add'>+	int i, idx;</div><div class='add'>+	bool cck = false;</div><div class='add'>+</div><div class='add'>+	v0 = le32_to_cpu(rxv[0]);</div><div class='add'>+	v2 = le32_to_cpu(rxv[2]);</div><div class='add'>+</div><div class='add'>+	idx = FIELD_GET(MT_PRXV_TX_RATE, v0);</div><div class='add'>+	i = idx;</div><div class='add'>+	nss = FIELD_GET(MT_PRXV_NSTS, v0) + 1;</div><div class='add'>+</div><div class='add'>+	stbc = FIELD_GET(MT_PRXV_HT_STBC, v2);</div><div class='add'>+	gi = FIELD_GET(MT_PRXV_HT_SHORT_GI, v2);</div><div class='add'>+	*mode = FIELD_GET(MT_PRXV_TX_MODE, v2);</div><div class='add'>+	dcm = FIELD_GET(MT_PRXV_DCM, v2);</div><div class='add'>+	bw = FIELD_GET(MT_PRXV_FRAME_MODE, v2);</div><div class='add'>+</div><div class='add'>+	switch (*mode) {</div><div class='add'>+	case MT_PHY_TYPE_CCK:</div><div class='add'>+		cck = true;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case MT_PHY_TYPE_OFDM:</div><div class='add'>+		i = mt76_get_rate(&amp;dev-&gt;mt76, sband, i, cck);</div><div class='add'>+		break;</div><div class='add'>+	case MT_PHY_TYPE_HT_GF:</div><div class='add'>+	case MT_PHY_TYPE_HT:</div><div class='add'>+		status-&gt;encoding = RX_ENC_HT;</div><div class='add'>+		if (gi)</div><div class='add'>+			status-&gt;enc_flags |= RX_ENC_FLAG_SHORT_GI;</div><div class='add'>+		if (i &gt; 31)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	case MT_PHY_TYPE_VHT:</div><div class='add'>+		status-&gt;nss = nss;</div><div class='add'>+		status-&gt;encoding = RX_ENC_VHT;</div><div class='add'>+		if (gi)</div><div class='add'>+			status-&gt;enc_flags |= RX_ENC_FLAG_SHORT_GI;</div><div class='add'>+		if (i &gt; 11)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	case MT_PHY_TYPE_HE_MU:</div><div class='add'>+	case MT_PHY_TYPE_HE_SU:</div><div class='add'>+	case MT_PHY_TYPE_HE_EXT_SU:</div><div class='add'>+	case MT_PHY_TYPE_HE_TB:</div><div class='add'>+		status-&gt;nss = nss;</div><div class='add'>+		status-&gt;encoding = RX_ENC_HE;</div><div class='add'>+		i &amp;= GENMASK(3, 0);</div><div class='add'>+</div><div class='add'>+		if (gi &lt;= NL80211_RATE_INFO_HE_GI_3_2)</div><div class='add'>+			status-&gt;he_gi = gi;</div><div class='add'>+</div><div class='add'>+		status-&gt;he_dcm = dcm;</div><div class='add'>+		break;</div><div class='add'>+	case MT_PHY_TYPE_EHT_SU:</div><div class='add'>+	case MT_PHY_TYPE_EHT_TRIG:</div><div class='add'>+	case MT_PHY_TYPE_EHT_MU:</div><div class='add'>+		status-&gt;nss = nss;</div><div class='add'>+		status-&gt;encoding = RX_ENC_EHT;</div><div class='add'>+		i &amp;= GENMASK(3, 0);</div><div class='add'>+</div><div class='add'>+		if (gi &lt;= NL80211_RATE_INFO_EHT_GI_3_2)</div><div class='add'>+			status-&gt;eht.gi = gi;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	status-&gt;rate_idx = i;</div><div class='add'>+</div><div class='add'>+	switch (bw) {</div><div class='add'>+	case IEEE80211_STA_RX_BW_20:</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_STA_RX_BW_40:</div><div class='add'>+		if (*mode &amp; MT_PHY_TYPE_HE_EXT_SU &amp;&amp;</div><div class='add'>+		    (idx &amp; MT_PRXV_TX_ER_SU_106T)) {</div><div class='add'>+			status-&gt;bw = RATE_INFO_BW_HE_RU;</div><div class='add'>+			status-&gt;he_ru =</div><div class='add'>+				NL80211_RATE_INFO_HE_RU_ALLOC_106;</div><div class='add'>+		} else {</div><div class='add'>+			status-&gt;bw = RATE_INFO_BW_40;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_STA_RX_BW_80:</div><div class='add'>+		status-&gt;bw = RATE_INFO_BW_80;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_STA_RX_BW_160:</div><div class='add'>+		status-&gt;bw = RATE_INFO_BW_160;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status-&gt;enc_flags |= RX_ENC_FLAG_STBC_MASK * stbc;</div><div class='add'>+	if (*mode &lt; MT_PHY_TYPE_HE_SU &amp;&amp; gi)</div><div class='add'>+		status-&gt;enc_flags |= RX_ENC_FLAG_SHORT_GI;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_mac_fill_rx(struct mt792x_dev *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	u32 csum_mask = MT_RXD3_NORMAL_IP_SUM | MT_RXD3_NORMAL_UDP_TCP_SUM;</div><div class='add'>+	struct mt76_rx_status *status = (struct mt76_rx_status *)skb-&gt;cb;</div><div class='add'>+	bool hdr_trans, unicast, insert_ccmp_hdr = false;</div><div class='add'>+	u8 chfreq, qos_ctl = 0, remove_pad, amsdu_info;</div><div class='add'>+	u16 hdr_gap;</div><div class='add'>+	__le32 *rxv = NULL, *rxd = (__le32 *)skb-&gt;data;</div><div class='add'>+	struct mt76_phy *mphy = &amp;dev-&gt;mt76.phy;</div><div class='add'>+	struct mt792x_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	u32 csum_status = *(u32 *)skb-&gt;cb;</div><div class='add'>+	u32 rxd1 = le32_to_cpu(rxd[1]);</div><div class='add'>+	u32 rxd2 = le32_to_cpu(rxd[2]);</div><div class='add'>+	u32 rxd3 = le32_to_cpu(rxd[3]);</div><div class='add'>+	u32 rxd4 = le32_to_cpu(rxd[4]);</div><div class='add'>+	struct mt792x_link_sta *mlink;</div><div class='add'>+	u8 mode = 0; /* , band_idx; */</div><div class='add'>+	u16 seq_ctrl = 0;</div><div class='add'>+	__le16 fc = 0;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	memset(status, 0, sizeof(*status));</div><div class='add'>+</div><div class='add'>+	if (!test_bit(MT76_STATE_RUNNING, &amp;mphy-&gt;state))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (rxd2 &amp; MT_RXD2_NORMAL_AMSDU_ERR)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	hdr_trans = rxd2 &amp; MT_RXD2_NORMAL_HDR_TRANS;</div><div class='add'>+	if (hdr_trans &amp;&amp; (rxd1 &amp; MT_RXD1_NORMAL_CM))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* ICV error or CCMP/BIP/WPI MIC error */</div><div class='add'>+	if (rxd1 &amp; MT_RXD1_NORMAL_ICV_ERR)</div><div class='add'>+		status-&gt;flag |= RX_FLAG_ONLY_MONITOR;</div><div class='add'>+</div><div class='add'>+	chfreq = FIELD_GET(MT_RXD3_NORMAL_CH_FREQ, rxd3);</div><div class='add'>+	unicast = FIELD_GET(MT_RXD3_NORMAL_ADDR_TYPE, rxd3) == MT_RXD3_NORMAL_U2M;</div><div class='add'>+	idx = FIELD_GET(MT_RXD1_NORMAL_WLAN_IDX, rxd1);</div><div class='add'>+	status-&gt;wcid = mt792x_rx_get_wcid(dev, idx, unicast);</div><div class='add'>+</div><div class='add'>+	if (status-&gt;wcid) {</div><div class='add'>+		mlink = container_of(status-&gt;wcid, struct mt792x_link_sta, wcid);</div><div class='add'>+		mt76_wcid_add_poll(&amp;dev-&gt;mt76, &amp;mlink-&gt;wcid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt792x_get_status_freq_info(status, chfreq);</div><div class='add'>+</div><div class='add'>+	switch (status-&gt;band) {</div><div class='add'>+	case NL80211_BAND_5GHZ:</div><div class='add'>+		sband = &amp;mphy-&gt;sband_5g.sband;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_BAND_6GHZ:</div><div class='add'>+		sband = &amp;mphy-&gt;sband_6g.sband;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		sband = &amp;mphy-&gt;sband_2g.sband;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!sband-&gt;channels)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (mt76_is_mmio(&amp;dev-&gt;mt76) &amp;&amp; (rxd3 &amp; csum_mask) == csum_mask &amp;&amp;</div><div class='add'>+	    !(csum_status &amp; (BIT(0) | BIT(2) | BIT(3))))</div><div class='add'>+		skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+</div><div class='add'>+	if (rxd3 &amp; MT_RXD3_NORMAL_FCS_ERR)</div><div class='add'>+		status-&gt;flag |= RX_FLAG_FAILED_FCS_CRC;</div><div class='add'>+</div><div class='add'>+	if (rxd1 &amp; MT_RXD1_NORMAL_TKIP_MIC_ERR)</div><div class='add'>+		status-&gt;flag |= RX_FLAG_MMIC_ERROR;</div><div class='add'>+</div><div class='add'>+	if (FIELD_GET(MT_RXD2_NORMAL_SEC_MODE, rxd2) != 0 &amp;&amp;</div><div class='add'>+	    !(rxd1 &amp; (MT_RXD1_NORMAL_CLM | MT_RXD1_NORMAL_CM))) {</div><div class='add'>+		status-&gt;flag |= RX_FLAG_DECRYPTED;</div><div class='add'>+		status-&gt;flag |= RX_FLAG_IV_STRIPPED;</div><div class='add'>+		status-&gt;flag |= RX_FLAG_MMIC_STRIPPED | RX_FLAG_MIC_STRIPPED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	remove_pad = FIELD_GET(MT_RXD2_NORMAL_HDR_OFFSET, rxd2);</div><div class='add'>+</div><div class='add'>+	if (rxd2 &amp; MT_RXD2_NORMAL_MAX_LEN_ERROR)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rxd += 8;</div><div class='add'>+	if (rxd1 &amp; MT_RXD1_NORMAL_GROUP_4) {</div><div class='add'>+		u32 v0 = le32_to_cpu(rxd[0]);</div><div class='add'>+		u32 v2 = le32_to_cpu(rxd[2]);</div><div class='add'>+</div><div class='add'>+		/* TODO: need to map rxd address */</div><div class='add'>+		fc = cpu_to_le16(FIELD_GET(MT_RXD8_FRAME_CONTROL, v0));</div><div class='add'>+		seq_ctrl = FIELD_GET(MT_RXD10_SEQ_CTRL, v2);</div><div class='add'>+		qos_ctl = FIELD_GET(MT_RXD10_QOS_CTL, v2);</div><div class='add'>+</div><div class='add'>+		rxd += 4;</div><div class='add'>+		if ((u8 *)rxd - skb-&gt;data &gt;= skb-&gt;len)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rxd1 &amp; MT_RXD1_NORMAL_GROUP_1) {</div><div class='add'>+		u8 *data = (u8 *)rxd;</div><div class='add'>+</div><div class='add'>+		if (status-&gt;flag &amp; RX_FLAG_DECRYPTED) {</div><div class='add'>+			switch (FIELD_GET(MT_RXD2_NORMAL_SEC_MODE, rxd2)) {</div><div class='add'>+			case MT_CIPHER_AES_CCMP:</div><div class='add'>+			case MT_CIPHER_CCMP_CCX:</div><div class='add'>+			case MT_CIPHER_CCMP_256:</div><div class='add'>+				insert_ccmp_hdr =</div><div class='add'>+					FIELD_GET(MT_RXD2_NORMAL_FRAG, rxd2);</div><div class='add'>+				fallthrough;</div><div class='add'>+			case MT_CIPHER_TKIP:</div><div class='add'>+			case MT_CIPHER_TKIP_NO_MIC:</div><div class='add'>+			case MT_CIPHER_GCMP:</div><div class='add'>+			case MT_CIPHER_GCMP_256:</div><div class='add'>+				status-&gt;iv[0] = data[5];</div><div class='add'>+				status-&gt;iv[1] = data[4];</div><div class='add'>+				status-&gt;iv[2] = data[3];</div><div class='add'>+				status-&gt;iv[3] = data[2];</div><div class='add'>+				status-&gt;iv[4] = data[1];</div><div class='add'>+				status-&gt;iv[5] = data[0];</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		rxd += 4;</div><div class='add'>+		if ((u8 *)rxd - skb-&gt;data &gt;= skb-&gt;len)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rxd1 &amp; MT_RXD1_NORMAL_GROUP_2) {</div><div class='add'>+		status-&gt;timestamp = le32_to_cpu(rxd[0]);</div><div class='add'>+		status-&gt;flag |= RX_FLAG_MACTIME_START;</div><div class='add'>+</div><div class='add'>+		if (!(rxd2 &amp; MT_RXD2_NORMAL_NON_AMPDU)) {</div><div class='add'>+			status-&gt;flag |= RX_FLAG_AMPDU_DETAILS;</div><div class='add'>+</div><div class='add'>+			/* all subframes of an A-MPDU have the same timestamp */</div><div class='add'>+			if (phy-&gt;rx_ampdu_ts != status-&gt;timestamp) {</div><div class='add'>+				if (!++phy-&gt;ampdu_ref)</div><div class='add'>+					phy-&gt;ampdu_ref++;</div><div class='add'>+			}</div><div class='add'>+			phy-&gt;rx_ampdu_ts = status-&gt;timestamp;</div><div class='add'>+</div><div class='add'>+			status-&gt;ampdu_ref = phy-&gt;ampdu_ref;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rxd += 4;</div><div class='add'>+		if ((u8 *)rxd - skb-&gt;data &gt;= skb-&gt;len)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* RXD Group 3 - P-RXV */</div><div class='add'>+	if (rxd1 &amp; MT_RXD1_NORMAL_GROUP_3) {</div><div class='add'>+		u32 v3;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		rxv = rxd;</div><div class='add'>+		rxd += 4;</div><div class='add'>+		if ((u8 *)rxd - skb-&gt;data &gt;= skb-&gt;len)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		v3 = le32_to_cpu(rxv[3]);</div><div class='add'>+</div><div class='add'>+		status-&gt;chains = mphy-&gt;antenna_mask;</div><div class='add'>+		status-&gt;chain_signal[0] = to_rssi(MT_PRXV_RCPI0, v3);</div><div class='add'>+		status-&gt;chain_signal[1] = to_rssi(MT_PRXV_RCPI1, v3);</div><div class='add'>+		status-&gt;chain_signal[2] = to_rssi(MT_PRXV_RCPI2, v3);</div><div class='add'>+		status-&gt;chain_signal[3] = to_rssi(MT_PRXV_RCPI3, v3);</div><div class='add'>+</div><div class='add'>+		/* RXD Group 5 - C-RXV */</div><div class='add'>+		if (rxd1 &amp; MT_RXD1_NORMAL_GROUP_5) {</div><div class='add'>+			rxd += 24;</div><div class='add'>+			if ((u8 *)rxd - skb-&gt;data &gt;= skb-&gt;len)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = mt7925_mac_fill_rx_rate(dev, status, sband, rxv, &amp;mode);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	amsdu_info = FIELD_GET(MT_RXD4_NORMAL_PAYLOAD_FORMAT, rxd4);</div><div class='add'>+	status-&gt;amsdu = !!amsdu_info;</div><div class='add'>+	if (status-&gt;amsdu) {</div><div class='add'>+		status-&gt;first_amsdu = amsdu_info == MT_RXD4_FIRST_AMSDU_FRAME;</div><div class='add'>+		status-&gt;last_amsdu = amsdu_info == MT_RXD4_LAST_AMSDU_FRAME;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr_gap = (u8 *)rxd - skb-&gt;data + 2 * remove_pad;</div><div class='add'>+	if (hdr_trans &amp;&amp; ieee80211_has_morefrags(fc)) {</div><div class='add'>+		if (mt7925_reverse_frag0_hdr_trans(skb, hdr_gap))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		hdr_trans = false;</div><div class='add'>+	} else {</div><div class='add'>+		int pad_start = 0;</div><div class='add'>+</div><div class='add'>+		skb_pull(skb, hdr_gap);</div><div class='add'>+		if (!hdr_trans &amp;&amp; status-&gt;amsdu) {</div><div class='add'>+			pad_start = ieee80211_get_hdrlen_from_skb(skb);</div><div class='add'>+		} else if (hdr_trans &amp;&amp; (rxd2 &amp; MT_RXD2_NORMAL_HDR_TRANS_ERROR)) {</div><div class='add'>+			/* When header translation failure is indicated,</div><div class='add'>+			 * the hardware will insert an extra 2-byte field</div><div class='add'>+			 * containing the data length after the protocol</div><div class='add'>+			 * type field.</div><div class='add'>+			 */</div><div class='add'>+			pad_start = 12;</div><div class='add'>+			if (get_unaligned_be16(skb-&gt;data + pad_start) == ETH_P_8021Q)</div><div class='add'>+				pad_start += 4;</div><div class='add'>+			else</div><div class='add'>+				pad_start = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (pad_start) {</div><div class='add'>+			memmove(skb-&gt;data + 2, skb-&gt;data, pad_start);</div><div class='add'>+			skb_pull(skb, 2);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!hdr_trans) {</div><div class='add'>+		struct ieee80211_hdr *hdr;</div><div class='add'>+</div><div class='add'>+		if (insert_ccmp_hdr) {</div><div class='add'>+			u8 key_id = FIELD_GET(MT_RXD1_NORMAL_KEY_ID, rxd1);</div><div class='add'>+</div><div class='add'>+			mt76_insert_ccmp_hdr(skb, key_id);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		hdr = mt76_skb_get_hdr(skb);</div><div class='add'>+		fc = hdr-&gt;frame_control;</div><div class='add'>+		if (ieee80211_is_data_qos(fc)) {</div><div class='add'>+			seq_ctrl = le16_to_cpu(hdr-&gt;seq_ctrl);</div><div class='add'>+			qos_ctl = *ieee80211_get_qos_ctl(hdr);</div><div class='add'>+		}</div><div class='add'>+		skb_set_mac_header(skb, (unsigned char *)hdr - skb-&gt;data);</div><div class='add'>+	} else {</div><div class='add'>+		status-&gt;flag |= RX_FLAG_8023;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt792x_mac_assoc_rssi(dev, skb);</div><div class='add'>+</div><div class='add'>+	if (rxv &amp;&amp; !(status-&gt;flag &amp; RX_FLAG_8023)) {</div><div class='add'>+		switch (status-&gt;encoding) {</div><div class='add'>+		case RX_ENC_EHT:</div><div class='add'>+			mt76_connac3_mac_decode_eht_radiotap(skb, rxv, mode);</div><div class='add'>+			break;</div><div class='add'>+		case RX_ENC_HE:</div><div class='add'>+			mt76_connac3_mac_decode_he_radiotap(skb, rxv, mode);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!status-&gt;wcid || !ieee80211_is_data_qos(fc))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	status-&gt;aggr = unicast &amp;&amp; !ieee80211_is_qos_nullfunc(fc);</div><div class='add'>+	status-&gt;seqno = IEEE80211_SEQ_TO_SN(seq_ctrl);</div><div class='add'>+	status-&gt;qos_ctl = qos_ctl;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mac_write_txwi_8023(__le32 *txwi, struct sk_buff *skb,</div><div class='add'>+			   struct mt76_wcid *wcid)</div><div class='add'>+{</div><div class='add'>+	u8 tid = skb-&gt;priority &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='add'>+	u8 fc_type, fc_stype;</div><div class='add'>+	u16 ethertype;</div><div class='add'>+	bool wmm = false;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (wcid-&gt;sta) {</div><div class='add'>+		struct ieee80211_sta *sta;</div><div class='add'>+</div><div class='add'>+		sta = container_of((void *)wcid, struct ieee80211_sta, drv_priv);</div><div class='add'>+		wmm = sta-&gt;wme;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD1_HDR_FORMAT, MT_HDR_FORMAT_802_3) |</div><div class='add'>+	      FIELD_PREP(MT_TXD1_TID, tid);</div><div class='add'>+</div><div class='add'>+	ethertype = get_unaligned_be16(&amp;skb-&gt;data[12]);</div><div class='add'>+	if (ethertype &gt;= ETH_P_802_3_MIN)</div><div class='add'>+		val |= MT_TXD1_ETH_802_3;</div><div class='add'>+</div><div class='add'>+	txwi[1] |= cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	fc_type = IEEE80211_FTYPE_DATA &gt;&gt; 2;</div><div class='add'>+	fc_stype = wmm ? IEEE80211_STYPE_QOS_DATA &gt;&gt; 4 : 0;</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD2_FRAME_TYPE, fc_type) |</div><div class='add'>+	      FIELD_PREP(MT_TXD2_SUB_TYPE, fc_stype);</div><div class='add'>+</div><div class='add'>+	txwi[2] |= cpu_to_le32(val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mac_write_txwi_80211(struct mt76_dev *dev, __le32 *txwi,</div><div class='add'>+			    struct sk_buff *skb,</div><div class='add'>+			    struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb-&gt;data;</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	bool multicast = is_multicast_ether_addr(hdr-&gt;addr1);</div><div class='add'>+	u8 tid = skb-&gt;priority &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='add'>+	__le16 fc = hdr-&gt;frame_control;</div><div class='add'>+	u8 fc_type, fc_stype;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_action(fc) &amp;&amp;</div><div class='add'>+	    mgmt-&gt;u.action.category == WLAN_CATEGORY_BACK &amp;&amp;</div><div class='add'>+	    mgmt-&gt;u.action.u.addba_req.action_code == WLAN_ACTION_ADDBA_REQ)</div><div class='add'>+		tid = MT_TX_ADDBA;</div><div class='add'>+	else if (ieee80211_is_mgmt(hdr-&gt;frame_control))</div><div class='add'>+		tid = MT_TX_NORMAL;</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD1_HDR_FORMAT, MT_HDR_FORMAT_802_11) |</div><div class='add'>+	      FIELD_PREP(MT_TXD1_HDR_INFO,</div><div class='add'>+			 ieee80211_get_hdrlen_from_skb(skb) / 2) |</div><div class='add'>+	      FIELD_PREP(MT_TXD1_TID, tid);</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_is_data(fc) || multicast ||</div><div class='add'>+	    info-&gt;flags &amp; IEEE80211_TX_CTL_USE_MINRATE)</div><div class='add'>+		val |= MT_TXD1_FIXED_RATE;</div><div class='add'>+</div><div class='add'>+	if (key &amp;&amp; multicast &amp;&amp; ieee80211_is_robust_mgmt_frame(skb) &amp;&amp;</div><div class='add'>+	    key-&gt;cipher == WLAN_CIPHER_SUITE_AES_CMAC) {</div><div class='add'>+		val |= MT_TXD1_BIP;</div><div class='add'>+		txwi[3] &amp;= ~cpu_to_le32(MT_TXD3_PROTECT_FRAME);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	txwi[1] |= cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	fc_type = (le16_to_cpu(fc) &amp; IEEE80211_FCTL_FTYPE) &gt;&gt; 2;</div><div class='add'>+	fc_stype = (le16_to_cpu(fc) &amp; IEEE80211_FCTL_STYPE) &gt;&gt; 4;</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD2_FRAME_TYPE, fc_type) |</div><div class='add'>+	      FIELD_PREP(MT_TXD2_SUB_TYPE, fc_stype);</div><div class='add'>+</div><div class='add'>+	txwi[2] |= cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	txwi[3] |= cpu_to_le32(FIELD_PREP(MT_TXD3_BCM, multicast));</div><div class='add'>+	if (ieee80211_is_beacon(fc))</div><div class='add'>+		txwi[3] |= cpu_to_le32(MT_TXD3_REM_TX_COUNT);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;flags &amp; IEEE80211_TX_CTL_INJECTED) {</div><div class='add'>+		u16 seqno = le16_to_cpu(hdr-&gt;seq_ctrl);</div><div class='add'>+</div><div class='add'>+		if (ieee80211_is_back_req(hdr-&gt;frame_control)) {</div><div class='add'>+			struct ieee80211_bar *bar;</div><div class='add'>+</div><div class='add'>+			bar = (struct ieee80211_bar *)skb-&gt;data;</div><div class='add'>+			seqno = le16_to_cpu(bar-&gt;start_seq_num);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		val = MT_TXD3_SN_VALID |</div><div class='add'>+		      FIELD_PREP(MT_TXD3_SEQ, IEEE80211_SEQ_TO_SN(seqno));</div><div class='add'>+		txwi[3] |= cpu_to_le32(val);</div><div class='add'>+		txwi[3] &amp;= ~cpu_to_le32(MT_TXD3_HW_AMSDU);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+mt7925_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi,</div><div class='add'>+		      struct sk_buff *skb, struct mt76_wcid *wcid,</div><div class='add'>+		      struct ieee80211_key_conf *key, int pid,</div><div class='add'>+		      enum mt76_txq_id qid, u32 changed)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	struct ieee80211_vif *vif = info-&gt;control.vif;</div><div class='add'>+	u8 p_fmt, q_idx, omac_idx = 0, wmm_idx = 0, band_idx = 0;</div><div class='add'>+	u32 val, sz_txd = mt76_is_mmio(dev) ? MT_TXD_SIZE : MT_SDIO_TXD_SIZE;</div><div class='add'>+	bool is_8023 = info-&gt;flags &amp; IEEE80211_TX_CTL_HW_80211_ENCAP;</div><div class='add'>+	struct mt76_vif_link *mvif;</div><div class='add'>+	bool beacon = !!(changed &amp; (BSS_CHANGED_BEACON |</div><div class='add'>+				    BSS_CHANGED_BEACON_ENABLED));</div><div class='add'>+	bool inband_disc = !!(changed &amp; (BSS_CHANGED_UNSOL_BCAST_PROBE_RESP |</div><div class='add'>+					 BSS_CHANGED_FILS_DISCOVERY));</div><div class='add'>+	struct mt792x_bss_conf *mconf;</div><div class='add'>+</div><div class='add'>+	mconf = vif ? mt792x_vif_to_link((struct mt792x_vif *)vif-&gt;drv_priv,</div><div class='add'>+					 wcid-&gt;link_id) : NULL;</div><div class='add'>+	mvif = mconf ? (struct mt76_vif_link *)&amp;mconf-&gt;mt76 : NULL;</div><div class='add'>+</div><div class='add'>+	if (mvif) {</div><div class='add'>+		omac_idx = mvif-&gt;omac_idx;</div><div class='add'>+		wmm_idx = mvif-&gt;wmm_idx;</div><div class='add'>+		band_idx = mvif-&gt;band_idx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (inband_disc) {</div><div class='add'>+		p_fmt = MT_TX_TYPE_FW;</div><div class='add'>+		q_idx = MT_LMAC_ALTX0;</div><div class='add'>+	} else if (beacon) {</div><div class='add'>+		p_fmt = MT_TX_TYPE_FW;</div><div class='add'>+		q_idx = MT_LMAC_BCN0;</div><div class='add'>+	} else if (qid &gt;= MT_TXQ_PSD) {</div><div class='add'>+		p_fmt = mt76_is_mmio(dev) ? MT_TX_TYPE_CT : MT_TX_TYPE_SF;</div><div class='add'>+		q_idx = MT_LMAC_ALTX0;</div><div class='add'>+	} else {</div><div class='add'>+		p_fmt = mt76_is_mmio(dev) ? MT_TX_TYPE_CT : MT_TX_TYPE_SF;</div><div class='add'>+		q_idx = wmm_idx * MT76_CONNAC_MAX_WMM_SETS +</div><div class='add'>+			mt76_connac_lmac_mapping(skb_get_queue_mapping(skb));</div><div class='add'>+</div><div class='add'>+		/* counting non-offloading skbs */</div><div class='add'>+		wcid-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='add'>+		wcid-&gt;stats.tx_packets++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD0_TX_BYTES, skb-&gt;len + sz_txd) |</div><div class='add'>+	      FIELD_PREP(MT_TXD0_PKT_FMT, p_fmt) |</div><div class='add'>+	      FIELD_PREP(MT_TXD0_Q_IDX, q_idx);</div><div class='add'>+	txwi[0] = cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD1_WLAN_IDX, wcid-&gt;idx) |</div><div class='add'>+	      FIELD_PREP(MT_TXD1_OWN_MAC, omac_idx);</div><div class='add'>+</div><div class='add'>+	if (band_idx)</div><div class='add'>+		val |= FIELD_PREP(MT_TXD1_TGID, band_idx);</div><div class='add'>+</div><div class='add'>+	txwi[1] = cpu_to_le32(val);</div><div class='add'>+	txwi[2] = 0;</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD3_REM_TX_COUNT, 15);</div><div class='add'>+</div><div class='add'>+	if (key)</div><div class='add'>+		val |= MT_TXD3_PROTECT_FRAME;</div><div class='add'>+	if (info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)</div><div class='add'>+		val |= MT_TXD3_NO_ACK;</div><div class='add'>+	if (wcid-&gt;amsdu)</div><div class='add'>+		val |= MT_TXD3_HW_AMSDU;</div><div class='add'>+</div><div class='add'>+	txwi[3] = cpu_to_le32(val);</div><div class='add'>+	txwi[4] = 0;</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD5_PID, pid);</div><div class='add'>+	if (pid &gt;= MT_PACKET_ID_FIRST) {</div><div class='add'>+		val |= MT_TXD5_TX_STATUS_HOST;</div><div class='add'>+		txwi[3] |= cpu_to_le32(MT_TXD3_BA_DISABLE);</div><div class='add'>+		txwi[3] &amp;= ~cpu_to_le32(MT_TXD3_HW_AMSDU);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	txwi[5] = cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	val = MT_TXD6_DAS | FIELD_PREP(MT_TXD6_MSDU_CNT, 1);</div><div class='add'>+	if (!ieee80211_vif_is_mld(vif) ||</div><div class='add'>+	    (q_idx &gt;= MT_LMAC_ALTX0 &amp;&amp; q_idx &lt;= MT_LMAC_BCN0))</div><div class='add'>+		val |= MT_TXD6_DIS_MAT;</div><div class='add'>+	txwi[6] = cpu_to_le32(val);</div><div class='add'>+	txwi[7] = 0;</div><div class='add'>+</div><div class='add'>+	if (is_8023)</div><div class='add'>+		mt7925_mac_write_txwi_8023(txwi, skb, wcid);</div><div class='add'>+	else</div><div class='add'>+		mt7925_mac_write_txwi_80211(dev, txwi, skb, key);</div><div class='add'>+</div><div class='add'>+	if (txwi[1] &amp; cpu_to_le32(MT_TXD1_FIXED_RATE)) {</div><div class='add'>+		struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+		bool mcast = ieee80211_is_data(hdr-&gt;frame_control) &amp;&amp;</div><div class='add'>+			     is_multicast_ether_addr(hdr-&gt;addr1);</div><div class='add'>+		u8 idx = MT792x_BASIC_RATES_TBL;</div><div class='add'>+</div><div class='add'>+		if (mvif) {</div><div class='add'>+			if (mcast &amp;&amp; mvif-&gt;mcast_rates_idx)</div><div class='add'>+				idx = mvif-&gt;mcast_rates_idx;</div><div class='add'>+			else if (beacon &amp;&amp; mvif-&gt;beacon_rates_idx)</div><div class='add'>+				idx = mvif-&gt;beacon_rates_idx;</div><div class='add'>+			else</div><div class='add'>+				idx = mvif-&gt;basic_rates_idx;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		txwi[6] |= cpu_to_le32(FIELD_PREP(MT_TXD6_TX_RATE, idx));</div><div class='add'>+		txwi[3] |= cpu_to_le32(MT_TXD3_BA_DISABLE);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_mac_write_txwi);</div><div class='add'>+</div><div class='add'>+static void mt7925_tx_check_aggr(struct ieee80211_sta *sta, struct sk_buff *skb,</div><div class='add'>+				 struct mt76_wcid *wcid)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	struct mt792x_link_sta *mlink;</div><div class='add'>+	struct mt792x_sta *msta;</div><div class='add'>+	bool is_8023;</div><div class='add'>+	u16 fc, tid;</div><div class='add'>+</div><div class='add'>+	link_sta = rcu_dereference(sta-&gt;link[wcid-&gt;link_id]);</div><div class='add'>+	if (!link_sta)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!sta || !(link_sta-&gt;ht_cap.ht_supported || link_sta-&gt;he_cap.has_he))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tid = skb-&gt;priority &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='add'>+	is_8023 = info-&gt;flags &amp; IEEE80211_TX_CTL_HW_80211_ENCAP;</div><div class='add'>+</div><div class='add'>+	if (is_8023) {</div><div class='add'>+		fc = IEEE80211_FTYPE_DATA |</div><div class='add'>+		     (sta-&gt;wme ? IEEE80211_STYPE_QOS_DATA :</div><div class='add'>+		      IEEE80211_STYPE_DATA);</div><div class='add'>+	} else {</div><div class='add'>+		/* No need to get precise TID for Action/Management Frame,</div><div class='add'>+		 * since it will not meet the following Frame Control</div><div class='add'>+		 * condition anyway.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+		fc = le16_to_cpu(hdr-&gt;frame_control) &amp;</div><div class='add'>+		     (IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(fc != (IEEE80211_FTYPE_DATA | IEEE80211_STYPE_QOS_DATA)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	msta = (struct mt792x_sta *)sta-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	if (sta-&gt;mlo &amp;&amp; msta-&gt;deflink_id != IEEE80211_LINK_UNSPECIFIED)</div><div class='add'>+		mlink = rcu_dereference(msta-&gt;link[msta-&gt;deflink_id]);</div><div class='add'>+	else</div><div class='add'>+		mlink = &amp;msta-&gt;deflink;</div><div class='add'>+</div><div class='add'>+	if (!test_and_set_bit(tid, &amp;mlink-&gt;wcid.ampdu_state))</div><div class='add'>+		ieee80211_start_tx_ba_session(sta, tid, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+mt7925_mac_add_txs_skb(struct mt792x_dev *dev, struct mt76_wcid *wcid,</div><div class='add'>+		       int pid, __le32 *txs_data)</div><div class='add'>+{</div><div class='add'>+	struct mt76_sta_stats *stats = &amp;wcid-&gt;stats;</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	struct mt76_phy *mphy;</div><div class='add'>+	struct ieee80211_tx_info *info;</div><div class='add'>+	struct sk_buff_head list;</div><div class='add'>+	struct rate_info rate = {};</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	bool cck = false;</div><div class='add'>+	u32 txrate, txs, mode, stbc;</div><div class='add'>+</div><div class='add'>+	mt76_tx_status_lock(mdev, &amp;list);</div><div class='add'>+	skb = mt76_tx_status_skb_get(mdev, wcid, pid, &amp;list);</div><div class='add'>+	if (!skb)</div><div class='add'>+		goto out_no_skb;</div><div class='add'>+</div><div class='add'>+	txs = le32_to_cpu(txs_data[0]);</div><div class='add'>+</div><div class='add'>+	info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	if (!(txs &amp; MT_TXS0_ACK_ERROR_MASK))</div><div class='add'>+		info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='add'>+</div><div class='add'>+	info-&gt;status.ampdu_len = 1;</div><div class='add'>+	info-&gt;status.ampdu_ack_len = !!(info-&gt;flags &amp;</div><div class='add'>+					IEEE80211_TX_STAT_ACK);</div><div class='add'>+</div><div class='add'>+	info-&gt;status.rates[0].idx = -1;</div><div class='add'>+</div><div class='add'>+	txrate = FIELD_GET(MT_TXS0_TX_RATE, txs);</div><div class='add'>+</div><div class='add'>+	rate.mcs = FIELD_GET(MT_TX_RATE_IDX, txrate);</div><div class='add'>+	rate.nss = FIELD_GET(MT_TX_RATE_NSS, txrate) + 1;</div><div class='add'>+	stbc = le32_get_bits(txs_data[3], MT_TXS3_RATE_STBC);</div><div class='add'>+</div><div class='add'>+	if (stbc &amp;&amp; rate.nss &gt; 1)</div><div class='add'>+		rate.nss &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+	if (rate.nss - 1 &lt; ARRAY_SIZE(stats-&gt;tx_nss))</div><div class='add'>+		stats-&gt;tx_nss[rate.nss - 1]++;</div><div class='add'>+	if (rate.mcs &lt; ARRAY_SIZE(stats-&gt;tx_mcs))</div><div class='add'>+		stats-&gt;tx_mcs[rate.mcs]++;</div><div class='add'>+</div><div class='add'>+	mode = FIELD_GET(MT_TX_RATE_MODE, txrate);</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case MT_PHY_TYPE_CCK:</div><div class='add'>+		cck = true;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case MT_PHY_TYPE_OFDM:</div><div class='add'>+		mphy = mt76_dev_phy(mdev, wcid-&gt;phy_idx);</div><div class='add'>+</div><div class='add'>+		if (mphy-&gt;chandef.chan-&gt;band == NL80211_BAND_5GHZ)</div><div class='add'>+			sband = &amp;mphy-&gt;sband_5g.sband;</div><div class='add'>+		else if (mphy-&gt;chandef.chan-&gt;band == NL80211_BAND_6GHZ)</div><div class='add'>+			sband = &amp;mphy-&gt;sband_6g.sband;</div><div class='add'>+		else</div><div class='add'>+			sband = &amp;mphy-&gt;sband_2g.sband;</div><div class='add'>+</div><div class='add'>+		rate.mcs = mt76_get_rate(mphy-&gt;dev, sband, rate.mcs, cck);</div><div class='add'>+		rate.legacy = sband-&gt;bitrates[rate.mcs].bitrate;</div><div class='add'>+		break;</div><div class='add'>+	case MT_PHY_TYPE_HT:</div><div class='add'>+	case MT_PHY_TYPE_HT_GF:</div><div class='add'>+		if (rate.mcs &gt; 31)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		rate.flags = RATE_INFO_FLAGS_MCS;</div><div class='add'>+		if (wcid-&gt;rate.flags &amp; RATE_INFO_FLAGS_SHORT_GI)</div><div class='add'>+			rate.flags |= RATE_INFO_FLAGS_SHORT_GI;</div><div class='add'>+		break;</div><div class='add'>+	case MT_PHY_TYPE_VHT:</div><div class='add'>+		if (rate.mcs &gt; 9)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		rate.flags = RATE_INFO_FLAGS_VHT_MCS;</div><div class='add'>+		break;</div><div class='add'>+	case MT_PHY_TYPE_HE_SU:</div><div class='add'>+	case MT_PHY_TYPE_HE_EXT_SU:</div><div class='add'>+	case MT_PHY_TYPE_HE_TB:</div><div class='add'>+	case MT_PHY_TYPE_HE_MU:</div><div class='add'>+		if (rate.mcs &gt; 11)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		rate.he_gi = wcid-&gt;rate.he_gi;</div><div class='add'>+		rate.he_dcm = FIELD_GET(MT_TX_RATE_DCM, txrate);</div><div class='add'>+		rate.flags = RATE_INFO_FLAGS_HE_MCS;</div><div class='add'>+		break;</div><div class='add'>+	case MT_PHY_TYPE_EHT_SU:</div><div class='add'>+	case MT_PHY_TYPE_EHT_TRIG:</div><div class='add'>+	case MT_PHY_TYPE_EHT_MU:</div><div class='add'>+		if (rate.mcs &gt; 13)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		rate.eht_gi = wcid-&gt;rate.eht_gi;</div><div class='add'>+		rate.flags = RATE_INFO_FLAGS_EHT_MCS;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats-&gt;tx_mode[mode]++;</div><div class='add'>+</div><div class='add'>+	switch (FIELD_GET(MT_TXS0_BW, txs)) {</div><div class='add'>+	case IEEE80211_STA_RX_BW_160:</div><div class='add'>+		rate.bw = RATE_INFO_BW_160;</div><div class='add'>+		stats-&gt;tx_bw[3]++;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_STA_RX_BW_80:</div><div class='add'>+		rate.bw = RATE_INFO_BW_80;</div><div class='add'>+		stats-&gt;tx_bw[2]++;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_STA_RX_BW_40:</div><div class='add'>+		rate.bw = RATE_INFO_BW_40;</div><div class='add'>+		stats-&gt;tx_bw[1]++;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		rate.bw = RATE_INFO_BW_20;</div><div class='add'>+		stats-&gt;tx_bw[0]++;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	wcid-&gt;rate = rate;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mt76_tx_status_skb_done(mdev, skb, &amp;list);</div><div class='add'>+</div><div class='add'>+out_no_skb:</div><div class='add'>+	mt76_tx_status_unlock(mdev, &amp;list);</div><div class='add'>+</div><div class='add'>+	return !!skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7925_mac_add_txs(struct mt792x_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_link_sta *mlink = NULL;</div><div class='add'>+	struct mt76_wcid *wcid;</div><div class='add'>+	__le32 *txs_data = data;</div><div class='add'>+	u16 wcidx;</div><div class='add'>+	u8 pid;</div><div class='add'>+</div><div class='add'>+	if (le32_get_bits(txs_data[0], MT_TXS0_TXS_FORMAT) &gt; 1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	wcidx = le32_get_bits(txs_data[2], MT_TXS2_WCID);</div><div class='add'>+	pid = le32_get_bits(txs_data[3], MT_TXS3_PID);</div><div class='add'>+</div><div class='add'>+	if (pid &lt; MT_PACKET_ID_FIRST)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (wcidx &gt;= MT792x_WTBL_SIZE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	wcid = mt76_wcid_ptr(dev, wcidx);</div><div class='add'>+	if (!wcid)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mlink = container_of(wcid, struct mt792x_link_sta, wcid);</div><div class='add'>+</div><div class='add'>+	mt7925_mac_add_txs_skb(dev, wcid, pid, txs_data);</div><div class='add'>+	if (!wcid-&gt;sta)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mt76_wcid_add_poll(&amp;dev-&gt;mt76, &amp;mlink-&gt;wcid);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7925_txwi_free(struct mt792x_dev *dev, struct mt76_txwi_cache *t,</div><div class='add'>+		      struct ieee80211_sta *sta, struct mt76_wcid *wcid,</div><div class='add'>+		      struct list_head *free_list)</div><div class='add'>+{</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	__le32 *txwi;</div><div class='add'>+	u16 wcid_idx;</div><div class='add'>+</div><div class='add'>+	mt76_connac_txp_skb_unmap(mdev, t);</div><div class='add'>+	if (!t-&gt;skb)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	txwi = (__le32 *)mt76_get_txwi_ptr(mdev, t);</div><div class='add'>+	if (sta) {</div><div class='add'>+		if (likely(t-&gt;skb-&gt;protocol != cpu_to_be16(ETH_P_PAE)))</div><div class='add'>+			mt7925_tx_check_aggr(sta, t-&gt;skb, wcid);</div><div class='add'>+</div><div class='add'>+		wcid_idx = wcid-&gt;idx;</div><div class='add'>+	} else {</div><div class='add'>+		wcid_idx = le32_get_bits(txwi[1], MT_TXD1_WLAN_IDX);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__mt76_tx_complete_skb(mdev, wcid_idx, t-&gt;skb, free_list);</div><div class='add'>+out:</div><div class='add'>+	t-&gt;skb = NULL;</div><div class='add'>+	mt76_put_txwi(mdev, t);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_txwi_free);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mac_tx_free(struct mt792x_dev *dev, void *data, int len)</div><div class='add'>+{</div><div class='add'>+	__le32 *tx_free = (__le32 *)data, *cur_info;</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	struct mt76_txwi_cache *txwi;</div><div class='add'>+	struct ieee80211_sta *sta = NULL;</div><div class='add'>+	struct mt76_wcid *wcid = NULL;</div><div class='add'>+	LIST_HEAD(free_list);</div><div class='add'>+	struct sk_buff *skb, *tmp;</div><div class='add'>+	void *end = data + len;</div><div class='add'>+	bool wake = false;</div><div class='add'>+	u16 total, count = 0;</div><div class='add'>+</div><div class='add'>+	/* clean DMA queues and unmap buffers first */</div><div class='add'>+	mt76_queue_tx_cleanup(dev, dev-&gt;mphy.q_tx[MT_TXQ_PSD], false);</div><div class='add'>+	mt76_queue_tx_cleanup(dev, dev-&gt;mphy.q_tx[MT_TXQ_BE], false);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(le32_get_bits(tx_free[1], MT_TXFREE1_VER) &lt; 4))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	total = le32_get_bits(tx_free[0], MT_TXFREE0_MSDU_CNT);</div><div class='add'>+	for (cur_info = &amp;tx_free[2]; count &lt; total; cur_info++) {</div><div class='add'>+		u32 msdu, info;</div><div class='add'>+		u8 i;</div><div class='add'>+</div><div class='add'>+		if (WARN_ON_ONCE((void *)cur_info &gt;= end))</div><div class='add'>+			return;</div><div class='add'>+		/* 1'b1: new wcid pair.</div><div class='add'>+		 * 1'b0: msdu_id with the same 'wcid pair' as above.</div><div class='add'>+		 */</div><div class='add'>+		info = le32_to_cpu(*cur_info);</div><div class='add'>+		if (info &amp; MT_TXFREE_INFO_PAIR) {</div><div class='add'>+			struct mt792x_link_sta *mlink;</div><div class='add'>+			u16 idx;</div><div class='add'>+</div><div class='add'>+			idx = FIELD_GET(MT_TXFREE_INFO_WLAN_ID, info);</div><div class='add'>+			wcid = mt76_wcid_ptr(dev, idx);</div><div class='add'>+			sta = wcid_to_sta(wcid);</div><div class='add'>+			if (!sta)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			mlink = container_of(wcid, struct mt792x_link_sta, wcid);</div><div class='add'>+			mt76_wcid_add_poll(&amp;dev-&gt;mt76, &amp;mlink-&gt;wcid);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (info &amp; MT_TXFREE_INFO_HEADER) {</div><div class='add'>+			if (wcid) {</div><div class='add'>+				wcid-&gt;stats.tx_retries +=</div><div class='add'>+					FIELD_GET(MT_TXFREE_INFO_COUNT, info) - 1;</div><div class='add'>+				wcid-&gt;stats.tx_failed +=</div><div class='add'>+					!!FIELD_GET(MT_TXFREE_INFO_STAT, info);</div><div class='add'>+			}</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; 2; i++) {</div><div class='add'>+			msdu = (info &gt;&gt; (15 * i)) &amp; MT_TXFREE_INFO_MSDU_ID;</div><div class='add'>+			if (msdu == MT_TXFREE_INFO_MSDU_ID)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			count++;</div><div class='add'>+			txwi = mt76_token_release(mdev, msdu, &amp;wake);</div><div class='add'>+			if (!txwi)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			mt7925_txwi_free(dev, txwi, sta, wcid, &amp;free_list);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt7925_mac_sta_poll(dev);</div><div class='add'>+</div><div class='add'>+	if (wake)</div><div class='add'>+		mt76_set_tx_blocked(&amp;dev-&gt;mt76, false);</div><div class='add'>+</div><div class='add'>+	mt76_worker_schedule(&amp;dev-&gt;mt76.tx_worker);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(skb, tmp, &amp;free_list, list) {</div><div class='add'>+		skb_list_del_init(skb);</div><div class='add'>+		napi_consume_skb(skb, 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool mt7925_rx_check(struct mt76_dev *mdev, void *data, int len)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	__le32 *rxd = (__le32 *)data;</div><div class='add'>+	__le32 *end = (__le32 *)&amp;rxd[len / 4];</div><div class='add'>+	enum rx_pkt_type type;</div><div class='add'>+</div><div class='add'>+	type = le32_get_bits(rxd[0], MT_RXD0_PKT_TYPE);</div><div class='add'>+	if (type != PKT_TYPE_NORMAL) {</div><div class='add'>+		u32 sw_type = le32_get_bits(rxd[0], MT_RXD0_SW_PKT_TYPE_MASK);</div><div class='add'>+</div><div class='add'>+		if (unlikely((sw_type &amp; MT_RXD0_SW_PKT_TYPE_MAP) ==</div><div class='add'>+			     MT_RXD0_SW_PKT_TYPE_FRAME))</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case PKT_TYPE_TXRX_NOTIFY:</div><div class='add'>+		/* PKT_TYPE_TXRX_NOTIFY can be received only by mmio devices */</div><div class='add'>+		mt7925_mac_tx_free(dev, data, len); /* mmio */</div><div class='add'>+		return false;</div><div class='add'>+	case PKT_TYPE_TXS:</div><div class='add'>+		for (rxd += 4; rxd + 12 &lt;= end; rxd += 12)</div><div class='add'>+			mt7925_mac_add_txs(dev, rxd);</div><div class='add'>+		return false;</div><div class='add'>+	default:</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_rx_check);</div><div class='add'>+</div><div class='add'>+void mt7925_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,</div><div class='add'>+			 struct sk_buff *skb, u32 *info)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	__le32 *rxd = (__le32 *)skb-&gt;data;</div><div class='add'>+	__le32 *end = (__le32 *)&amp;skb-&gt;data[skb-&gt;len];</div><div class='add'>+	enum rx_pkt_type type;</div><div class='add'>+	u16 flag;</div><div class='add'>+</div><div class='add'>+	type = le32_get_bits(rxd[0], MT_RXD0_PKT_TYPE);</div><div class='add'>+	flag = le32_get_bits(rxd[0], MT_RXD0_PKT_FLAG);</div><div class='add'>+	if (type != PKT_TYPE_NORMAL) {</div><div class='add'>+		u32 sw_type = le32_get_bits(rxd[0], MT_RXD0_SW_PKT_TYPE_MASK);</div><div class='add'>+</div><div class='add'>+		if (unlikely((sw_type &amp; MT_RXD0_SW_PKT_TYPE_MAP) ==</div><div class='add'>+			     MT_RXD0_SW_PKT_TYPE_FRAME))</div><div class='add'>+			type = PKT_TYPE_NORMAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (type == PKT_TYPE_RX_EVENT &amp;&amp; flag == 0x1)</div><div class='add'>+		type = PKT_TYPE_NORMAL_MCU;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case PKT_TYPE_TXRX_NOTIFY:</div><div class='add'>+		/* PKT_TYPE_TXRX_NOTIFY can be received only by mmio devices */</div><div class='add'>+		mt7925_mac_tx_free(dev, skb-&gt;data, skb-&gt;len);</div><div class='add'>+		napi_consume_skb(skb, 1);</div><div class='add'>+		break;</div><div class='add'>+	case PKT_TYPE_RX_EVENT:</div><div class='add'>+		mt7925_mcu_rx_event(dev, skb);</div><div class='add'>+		break;</div><div class='add'>+	case PKT_TYPE_TXS:</div><div class='add'>+		for (rxd += 2; rxd + 8 &lt;= end; rxd += 8)</div><div class='add'>+			mt7925_mac_add_txs(dev, rxd);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		break;</div><div class='add'>+	case PKT_TYPE_NORMAL_MCU:</div><div class='add'>+	case PKT_TYPE_NORMAL:</div><div class='add'>+		if (!mt7925_mac_fill_rx(dev, skb)) {</div><div class='add'>+			mt76_rx(&amp;dev-&gt;mt76, q, skb);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_queue_rx_skb);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_vif_connect_iter(void *priv, u8 *mac,</div><div class='add'>+			struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	unsigned long valid = ieee80211_vif_is_mld(vif) ?</div><div class='add'>+			      mvif-&gt;valid_links : BIT(0);</div><div class='add'>+	struct mt792x_dev *dev = mvif-&gt;phy-&gt;dev;</div><div class='add'>+	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='add'>+	struct ieee80211_bss_conf *bss_conf;</div><div class='add'>+	struct mt792x_bss_conf *mconf;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+		ieee80211_disconnect(vif, true);</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(i, &amp;valid, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		bss_conf = mt792x_vif_to_bss_conf(vif, i);</div><div class='add'>+		mconf = mt792x_vif_to_link(mvif, i);</div><div class='add'>+</div><div class='add'>+		mt76_connac_mcu_uni_add_dev(&amp;dev-&gt;mphy, bss_conf, &amp;mconf-&gt;mt76,</div><div class='add'>+					    &amp;mvif-&gt;sta.deflink.wcid, true);</div><div class='add'>+		mt7925_mcu_set_tx(dev, bss_conf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP) {</div><div class='add'>+		mt76_connac_mcu_uni_add_bss(dev-&gt;phy.mt76, vif, &amp;mvif-&gt;sta.deflink.wcid,</div><div class='add'>+					    true, NULL);</div><div class='add'>+		mt7925_mcu_sta_update(dev, NULL, vif, true,</div><div class='add'>+				      MT76_STA_INFO_STATE_NONE);</div><div class='add'>+		mt7925_mcu_uni_add_beacon_offload(dev, hw, vif, true);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* system error recovery */</div><div class='add'>+void mt7925_mac_reset_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(work, struct mt792x_dev,</div><div class='add'>+					      reset_work);</div><div class='add'>+	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev-&gt;mt76.dev, "chip reset\n");</div><div class='add'>+	dev-&gt;hw_full_reset = true;</div><div class='add'>+	ieee80211_stop_queues(hw);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;dev-&gt;mphy.mac_work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;pm-&gt;ps_work);</div><div class='add'>+	cancel_work_sync(&amp;pm-&gt;wake_work);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+		ret = mt792x_dev_reset(dev);</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+		if (!ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i == 10)</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "chip reset failed\n");</div><div class='add'>+</div><div class='add'>+	if (test_and_clear_bit(MT76_HW_SCANNING, &amp;dev-&gt;mphy.state)) {</div><div class='add'>+		struct cfg80211_scan_info info = {</div><div class='add'>+			.aborted = true,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ieee80211_scan_completed(dev-&gt;mphy.hw, &amp;info);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;hw_full_reset = false;</div><div class='add'>+	pm-&gt;suspended = false;</div><div class='add'>+	ieee80211_wake_queues(hw);</div><div class='add'>+	ieee80211_iterate_active_interfaces(hw,</div><div class='add'>+					    IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='add'>+					    mt7925_vif_connect_iter, NULL);</div><div class='add'>+	mt76_connac_power_save_sched(&amp;dev-&gt;mt76.phy, pm);</div><div class='add'>+</div><div class='add'>+	mt7925_regd_change(&amp;dev-&gt;phy, "00");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7925_coredump_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev;</div><div class='add'>+	char *dump, *data;</div><div class='add'>+</div><div class='add'>+	dev = (struct mt792x_dev *)container_of(work, struct mt792x_dev,</div><div class='add'>+						coredump.work.work);</div><div class='add'>+</div><div class='add'>+	if (time_is_after_jiffies(dev-&gt;coredump.last_activity +</div><div class='add'>+				  4 * MT76_CONNAC_COREDUMP_TIMEOUT)) {</div><div class='add'>+		queue_delayed_work(dev-&gt;mt76.wq, &amp;dev-&gt;coredump.work,</div><div class='add'>+				   MT76_CONNAC_COREDUMP_TIMEOUT);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dump = vzalloc(MT76_CONNAC_COREDUMP_SZ);</div><div class='add'>+	data = dump;</div><div class='add'>+</div><div class='add'>+	while (true) {</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;dev-&gt;mt76.lock);</div><div class='add'>+		skb = __skb_dequeue(&amp;dev-&gt;coredump.msg_list);</div><div class='add'>+		spin_unlock_bh(&amp;dev-&gt;mt76.lock);</div><div class='add'>+</div><div class='add'>+		if (!skb)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		skb_pull(skb, sizeof(struct mt7925_mcu_rxd) + 8);</div><div class='add'>+		if (!dump || data + skb-&gt;len - dump &gt; MT76_CONNAC_COREDUMP_SZ) {</div><div class='add'>+			dev_kfree_skb(skb);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memcpy(data, skb-&gt;data, skb-&gt;len);</div><div class='add'>+		data += skb-&gt;len;</div><div class='add'>+</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dump)</div><div class='add'>+		dev_coredumpv(dev-&gt;mt76.dev, dump, MT76_CONNAC_COREDUMP_SZ,</div><div class='add'>+			      GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	mt792x_reset(&amp;dev-&gt;mt76);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* usb_sdio */</div><div class='add'>+static void</div><div class='add'>+mt7925_usb_sdio_write_txwi(struct mt792x_dev *dev, struct mt76_wcid *wcid,</div><div class='add'>+			   enum mt76_txq_id qid, struct ieee80211_sta *sta,</div><div class='add'>+			   struct ieee80211_key_conf *key, int pid,</div><div class='add'>+			   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	__le32 *txwi = (__le32 *)(skb-&gt;data - MT_SDIO_TXD_SIZE);</div><div class='add'>+</div><div class='add'>+	memset(txwi, 0, MT_SDIO_TXD_SIZE);</div><div class='add'>+	mt7925_mac_write_txwi(&amp;dev-&gt;mt76, txwi, skb, wcid, key, pid, qid, 0);</div><div class='add'>+	skb_push(skb, MT_SDIO_TXD_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_usb_sdio_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='add'>+				   enum mt76_txq_id qid, struct mt76_wcid *wcid,</div><div class='add'>+				   struct ieee80211_sta *sta,</div><div class='add'>+				   struct mt76_tx_info *tx_info)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx_info-&gt;skb);</div><div class='add'>+	struct ieee80211_key_conf *key = info-&gt;control.hw_key;</div><div class='add'>+	struct sk_buff *skb = tx_info-&gt;skb;</div><div class='add'>+	int err, pad, pktid;</div><div class='add'>+</div><div class='add'>+	if (unlikely(tx_info-&gt;skb-&gt;len &lt;= ETH_HLEN))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!wcid)</div><div class='add'>+		wcid = &amp;dev-&gt;mt76.global_wcid;</div><div class='add'>+</div><div class='add'>+	if (sta) {</div><div class='add'>+		struct mt792x_sta *msta = (struct mt792x_sta *)sta-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+		if (time_after(jiffies, msta-&gt;deflink.last_txs + HZ / 4)) {</div><div class='add'>+			info-&gt;flags |= IEEE80211_TX_CTL_REQ_TX_STATUS;</div><div class='add'>+			msta-&gt;deflink.last_txs = jiffies;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pktid = mt76_tx_status_skb_add(&amp;dev-&gt;mt76, wcid, skb);</div><div class='add'>+	mt7925_usb_sdio_write_txwi(dev, wcid, qid, sta, key, pktid, skb);</div><div class='add'>+</div><div class='add'>+	mt792x_skb_add_usb_sdio_hdr(dev, skb, 0);</div><div class='add'>+	pad = round_up(skb-&gt;len, 4) - skb-&gt;len;</div><div class='add'>+	if (mt76_is_usb(mdev))</div><div class='add'>+		pad += 4;</div><div class='add'>+</div><div class='add'>+	err = mt76_skb_adjust_pad(skb, pad);</div><div class='add'>+	if (err)</div><div class='add'>+		/* Release pktid in case of error. */</div><div class='add'>+		idr_remove(&amp;wcid-&gt;pktid, pktid);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_usb_sdio_tx_prepare_skb);</div><div class='add'>+</div><div class='add'>+void mt7925_usb_sdio_tx_complete_skb(struct mt76_dev *mdev,</div><div class='add'>+				     struct mt76_queue_entry *e)</div><div class='add'>+{</div><div class='add'>+	__le32 *txwi = (__le32 *)(e-&gt;skb-&gt;data + MT_SDIO_HDR_SIZE);</div><div class='add'>+	unsigned int headroom = MT_SDIO_TXD_SIZE + MT_SDIO_HDR_SIZE;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct mt76_wcid *wcid;</div><div class='add'>+	u16 idx;</div><div class='add'>+</div><div class='add'>+	idx = le32_get_bits(txwi[1], MT_TXD1_WLAN_IDX);</div><div class='add'>+	wcid = __mt76_wcid_ptr(mdev, idx);</div><div class='add'>+	sta = wcid_to_sta(wcid);</div><div class='add'>+</div><div class='add'>+	if (sta &amp;&amp; likely(e-&gt;skb-&gt;protocol != cpu_to_be16(ETH_P_PAE)))</div><div class='add'>+		mt7925_tx_check_aggr(sta, e-&gt;skb, wcid);</div><div class='add'>+</div><div class='add'>+	skb_pull(e-&gt;skb, headroom);</div><div class='add'>+	mt76_tx_complete_skb(mdev, e-&gt;wcid, e-&gt;skb);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_usb_sdio_tx_complete_skb);</div><div class='add'>+</div><div class='add'>+bool mt7925_usb_sdio_tx_status_data(struct mt76_dev *mdev, u8 *update)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	mt7925_mac_sta_poll(dev);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_usb_sdio_tx_status_data);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+void mt7925_set_ipv6_ns_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(work, struct mt792x_dev,</div><div class='add'>+						ipv6_ns_work);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		skb = skb_dequeue(&amp;dev-&gt;ipv6_ns_list);</div><div class='add'>+</div><div class='add'>+		if (!skb)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		mt792x_mutex_acquire(dev);</div><div class='add'>+		ret = mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='add'>+					    MCU_UNI_CMD(OFFLOAD), true);</div><div class='add'>+		mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	} while (!ret);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		skb_queue_purge(&amp;dev-&gt;ipv6_ns_list);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mac.h b/drivers/net/wireless/mediatek/mt76/mt7925/mac.h<br/>new file mode 100644<br/>index 000000000000..83ea9021daea<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7925/mac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7925/mac.h</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/* Copyright (C) 2023 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#ifndef __MT7925_MAC_H</div><div class='add'>+#define __MT7925_MAC_H</div><div class='add'>+</div><div class='add'>+#include "../mt76_connac3_mac.h"</div><div class='add'>+</div><div class='add'>+#define MT_WTBL_TXRX_CAP_RATE_OFFSET	7</div><div class='add'>+#define MT_WTBL_TXRX_RATE_G2_HE		24</div><div class='add'>+#define MT_WTBL_TXRX_RATE_G2		12</div><div class='add'>+</div><div class='add'>+#define MT_WTBL_AC0_CTT_OFFSET		20</div><div class='add'>+</div><div class='add'>+static inline u32 mt7925_mac_wtbl_lmac_addr(struct mt792x_dev *dev, u16 wcid, u8 dw)</div><div class='add'>+{</div><div class='add'>+	mt76_wr(dev, MT_WTBLON_TOP_WDUCR,</div><div class='add'>+		FIELD_PREP(MT_WTBLON_TOP_WDUCR_GROUP, (wcid &gt;&gt; 7)));</div><div class='add'>+</div><div class='add'>+	return MT_WTBL_LMAC_OFFS(wcid, dw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/net/wireless/mediatek/mt76/mt7925/main.c<br/>new file mode 100644<br/>index 000000000000..2d358a96640c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7925/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7925/main.c</a></div><div class='hunk'>@@ -0,0 +1,2229 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/* Copyright (C) 2023 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='add'>+#include "mt7925.h"</div><div class='add'>+#include "regd.h"</div><div class='add'>+#include "mcu.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_init_he_caps(struct mt792x_phy *phy, enum nl80211_band band,</div><div class='add'>+		    struct ieee80211_sband_iftype_data *data,</div><div class='add'>+		    enum nl80211_iftype iftype)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta_he_cap *he_cap = &amp;data-&gt;he_cap;</div><div class='add'>+	struct ieee80211_he_cap_elem *he_cap_elem = &amp;he_cap-&gt;he_cap_elem;</div><div class='add'>+	struct ieee80211_he_mcs_nss_supp *he_mcs = &amp;he_cap-&gt;he_mcs_nss_supp;</div><div class='add'>+	int i, nss = hweight8(phy-&gt;mt76-&gt;antenna_mask);</div><div class='add'>+	u16 mcs_map = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		if (i &lt; nss)</div><div class='add'>+			mcs_map |= (IEEE80211_HE_MCS_SUPPORT_0_11 &lt;&lt; (i * 2));</div><div class='add'>+		else</div><div class='add'>+			mcs_map |= (IEEE80211_HE_MCS_NOT_SUPPORTED &lt;&lt; (i * 2));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	he_cap-&gt;has_he = true;</div><div class='add'>+</div><div class='add'>+	he_cap_elem-&gt;mac_cap_info[0] = IEEE80211_HE_MAC_CAP0_HTC_HE;</div><div class='add'>+	he_cap_elem-&gt;mac_cap_info[3] = IEEE80211_HE_MAC_CAP3_OMI_CONTROL |</div><div class='add'>+				       IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3;</div><div class='add'>+	he_cap_elem-&gt;mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU;</div><div class='add'>+</div><div class='add'>+	if (band == NL80211_BAND_2GHZ)</div><div class='add'>+		he_cap_elem-&gt;phy_cap_info[0] =</div><div class='add'>+			IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G;</div><div class='add'>+	else</div><div class='add'>+		he_cap_elem-&gt;phy_cap_info[0] =</div><div class='add'>+			IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |</div><div class='add'>+			IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G;</div><div class='add'>+</div><div class='add'>+	he_cap_elem-&gt;phy_cap_info[1] =</div><div class='add'>+		IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD;</div><div class='add'>+	he_cap_elem-&gt;phy_cap_info[2] =</div><div class='add'>+		IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US |</div><div class='add'>+		IEEE80211_HE_PHY_CAP2_STBC_TX_UNDER_80MHZ |</div><div class='add'>+		IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ |</div><div class='add'>+		IEEE80211_HE_PHY_CAP2_UL_MU_FULL_MU_MIMO |</div><div class='add'>+		IEEE80211_HE_PHY_CAP2_UL_MU_PARTIAL_MU_MIMO;</div><div class='add'>+</div><div class='add'>+	switch (iftype) {</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		he_cap_elem-&gt;mac_cap_info[2] |=</div><div class='add'>+			IEEE80211_HE_MAC_CAP2_BSR;</div><div class='add'>+		he_cap_elem-&gt;mac_cap_info[4] |=</div><div class='add'>+			IEEE80211_HE_MAC_CAP4_BQR;</div><div class='add'>+		he_cap_elem-&gt;mac_cap_info[5] |=</div><div class='add'>+			IEEE80211_HE_MAC_CAP5_OM_CTRL_UL_MU_DATA_DIS_RX;</div><div class='add'>+		he_cap_elem-&gt;phy_cap_info[3] |=</div><div class='add'>+			IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_QPSK |</div><div class='add'>+			IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_QPSK;</div><div class='add'>+		he_cap_elem-&gt;phy_cap_info[6] |=</div><div class='add'>+			IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE |</div><div class='add'>+			IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT;</div><div class='add'>+		he_cap_elem-&gt;phy_cap_info[9] |=</div><div class='add'>+			IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU |</div><div class='add'>+			IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		he_cap_elem-&gt;mac_cap_info[1] |=</div><div class='add'>+			IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US;</div><div class='add'>+</div><div class='add'>+		if (band == NL80211_BAND_2GHZ)</div><div class='add'>+			he_cap_elem-&gt;phy_cap_info[0] |=</div><div class='add'>+				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_2G;</div><div class='add'>+		else</div><div class='add'>+			he_cap_elem-&gt;phy_cap_info[0] |=</div><div class='add'>+				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_5G;</div><div class='add'>+</div><div class='add'>+		he_cap_elem-&gt;phy_cap_info[1] |=</div><div class='add'>+			IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A |</div><div class='add'>+			IEEE80211_HE_PHY_CAP1_HE_LTF_AND_GI_FOR_HE_PPDUS_0_8US;</div><div class='add'>+		he_cap_elem-&gt;phy_cap_info[3] |=</div><div class='add'>+			IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_QPSK |</div><div class='add'>+			IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_QPSK;</div><div class='add'>+		he_cap_elem-&gt;phy_cap_info[4] |=</div><div class='add'>+			IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE |</div><div class='add'>+			IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_4 |</div><div class='add'>+			IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_4;</div><div class='add'>+		he_cap_elem-&gt;phy_cap_info[5] |=</div><div class='add'>+			IEEE80211_HE_PHY_CAP5_NG16_SU_FEEDBACK |</div><div class='add'>+			IEEE80211_HE_PHY_CAP5_NG16_MU_FEEDBACK;</div><div class='add'>+		he_cap_elem-&gt;phy_cap_info[6] |=</div><div class='add'>+			IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_42_SU |</div><div class='add'>+			IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_75_MU |</div><div class='add'>+			IEEE80211_HE_PHY_CAP6_TRIG_CQI_FB |</div><div class='add'>+			IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE |</div><div class='add'>+			IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT;</div><div class='add'>+		he_cap_elem-&gt;phy_cap_info[7] |=</div><div class='add'>+			IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP |</div><div class='add'>+			IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI;</div><div class='add'>+		he_cap_elem-&gt;phy_cap_info[8] |=</div><div class='add'>+			IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G |</div><div class='add'>+			IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU |</div><div class='add'>+			IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU |</div><div class='add'>+			IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_484;</div><div class='add'>+		he_cap_elem-&gt;phy_cap_info[9] |=</div><div class='add'>+			IEEE80211_HE_PHY_CAP9_LONGER_THAN_16_SIGB_OFDM_SYM |</div><div class='add'>+			IEEE80211_HE_PHY_CAP9_NON_TRIGGERED_CQI_FEEDBACK |</div><div class='add'>+			IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU |</div><div class='add'>+			IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU |</div><div class='add'>+			IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB |</div><div class='add'>+			IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	he_mcs-&gt;rx_mcs_80 = cpu_to_le16(mcs_map);</div><div class='add'>+	he_mcs-&gt;tx_mcs_80 = cpu_to_le16(mcs_map);</div><div class='add'>+	he_mcs-&gt;rx_mcs_160 = cpu_to_le16(mcs_map);</div><div class='add'>+	he_mcs-&gt;tx_mcs_160 = cpu_to_le16(mcs_map);</div><div class='add'>+</div><div class='add'>+	memset(he_cap-&gt;ppe_thres, 0, sizeof(he_cap-&gt;ppe_thres));</div><div class='add'>+</div><div class='add'>+	if (he_cap_elem-&gt;phy_cap_info[6] &amp;</div><div class='add'>+	    IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT) {</div><div class='add'>+		mt76_connac_gen_ppe_thresh(he_cap-&gt;ppe_thres, nss, band);</div><div class='add'>+	} else {</div><div class='add'>+		he_cap_elem-&gt;phy_cap_info[9] |=</div><div class='add'>+			u8_encode_bits(IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US,</div><div class='add'>+				       IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (band == NL80211_BAND_6GHZ) {</div><div class='add'>+		struct ieee80211_supported_band *sband =</div><div class='add'>+			&amp;phy-&gt;mt76-&gt;sband_5g.sband;</div><div class='add'>+		struct ieee80211_sta_ht_cap *ht_cap = &amp;sband-&gt;ht_cap;</div><div class='add'>+</div><div class='add'>+		u16 cap = IEEE80211_HE_6GHZ_CAP_TX_ANTPAT_CONS |</div><div class='add'>+			  IEEE80211_HE_6GHZ_CAP_RX_ANTPAT_CONS;</div><div class='add'>+</div><div class='add'>+		cap |= u16_encode_bits(ht_cap-&gt;ampdu_density,</div><div class='add'>+				       IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START) |</div><div class='add'>+		       u16_encode_bits(IEEE80211_VHT_MAX_AMPDU_1024K,</div><div class='add'>+				       IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP) |</div><div class='add'>+		       u16_encode_bits(IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454,</div><div class='add'>+				       IEEE80211_HE_6GHZ_CAP_MAX_MPDU_LEN);</div><div class='add'>+</div><div class='add'>+		data-&gt;he_6ghz_capa.capa = cpu_to_le16(cap);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_init_eht_caps(struct mt792x_phy *phy, enum nl80211_band band,</div><div class='add'>+		     struct ieee80211_sband_iftype_data *data)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta_eht_cap *eht_cap = &amp;data-&gt;eht_cap;</div><div class='add'>+	struct ieee80211_eht_cap_elem_fixed *eht_cap_elem = &amp;eht_cap-&gt;eht_cap_elem;</div><div class='add'>+	struct ieee80211_eht_mcs_nss_supp *eht_nss = &amp;eht_cap-&gt;eht_mcs_nss_supp;</div><div class='add'>+	enum nl80211_chan_width width = phy-&gt;mt76-&gt;chandef.width;</div><div class='add'>+	int nss = hweight8(phy-&gt;mt76-&gt;antenna_mask);</div><div class='add'>+	int sts = hweight16(phy-&gt;mt76-&gt;chainmask);</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	if (!phy-&gt;dev-&gt;has_eht)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	eht_cap-&gt;has_eht = true;</div><div class='add'>+</div><div class='add'>+	eht_cap_elem-&gt;mac_cap_info[0] =</div><div class='add'>+		IEEE80211_EHT_MAC_CAP0_EPCS_PRIO_ACCESS |</div><div class='add'>+		IEEE80211_EHT_MAC_CAP0_OM_CONTROL;</div><div class='add'>+</div><div class='add'>+	eht_cap_elem-&gt;phy_cap_info[0] =</div><div class='add'>+		IEEE80211_EHT_PHY_CAP0_NDP_4_EHT_LFT_32_GI |</div><div class='add'>+		IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMER |</div><div class='add'>+		IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMEE;</div><div class='add'>+</div><div class='add'>+	eht_cap_elem-&gt;phy_cap_info[0] |=</div><div class='add'>+		u8_encode_bits(u8_get_bits(sts - 1, BIT(0)),</div><div class='add'>+			       IEEE80211_EHT_PHY_CAP0_BEAMFORMEE_SS_80MHZ_MASK);</div><div class='add'>+</div><div class='add'>+	eht_cap_elem-&gt;phy_cap_info[1] =</div><div class='add'>+		u8_encode_bits(u8_get_bits(sts - 1, GENMASK(2, 1)),</div><div class='add'>+			       IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_80MHZ_MASK) |</div><div class='add'>+		u8_encode_bits(sts - 1,</div><div class='add'>+			       IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_160MHZ_MASK);</div><div class='add'>+</div><div class='add'>+	eht_cap_elem-&gt;phy_cap_info[2] =</div><div class='add'>+		u8_encode_bits(sts - 1, IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_80MHZ_MASK) |</div><div class='add'>+		u8_encode_bits(sts - 1, IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_160MHZ_MASK);</div><div class='add'>+</div><div class='add'>+	eht_cap_elem-&gt;phy_cap_info[3] =</div><div class='add'>+		IEEE80211_EHT_PHY_CAP3_NG_16_SU_FEEDBACK |</div><div class='add'>+		IEEE80211_EHT_PHY_CAP3_NG_16_MU_FEEDBACK |</div><div class='add'>+		IEEE80211_EHT_PHY_CAP3_CODEBOOK_4_2_SU_FDBK |</div><div class='add'>+		IEEE80211_EHT_PHY_CAP3_CODEBOOK_7_5_MU_FDBK |</div><div class='add'>+		IEEE80211_EHT_PHY_CAP3_TRIG_SU_BF_FDBK |</div><div class='add'>+		IEEE80211_EHT_PHY_CAP3_TRIG_MU_BF_PART_BW_FDBK |</div><div class='add'>+		IEEE80211_EHT_PHY_CAP3_TRIG_CQI_FDBK;</div><div class='add'>+</div><div class='add'>+	eht_cap_elem-&gt;phy_cap_info[4] =</div><div class='add'>+		u8_encode_bits(min_t(int, sts - 1, 2),</div><div class='add'>+			       IEEE80211_EHT_PHY_CAP4_MAX_NC_MASK);</div><div class='add'>+</div><div class='add'>+	eht_cap_elem-&gt;phy_cap_info[5] =</div><div class='add'>+		IEEE80211_EHT_PHY_CAP5_NON_TRIG_CQI_FEEDBACK |</div><div class='add'>+		u8_encode_bits(IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_16US,</div><div class='add'>+			       IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_MASK) |</div><div class='add'>+		u8_encode_bits(u8_get_bits(0x11, GENMASK(1, 0)),</div><div class='add'>+			       IEEE80211_EHT_PHY_CAP5_MAX_NUM_SUPP_EHT_LTF_MASK);</div><div class='add'>+</div><div class='add'>+	val = width == NL80211_CHAN_WIDTH_160 ? 0x7 :</div><div class='add'>+	      width == NL80211_CHAN_WIDTH_80 ? 0x3 : 0x1;</div><div class='add'>+	eht_cap_elem-&gt;phy_cap_info[6] =</div><div class='add'>+		u8_encode_bits(u8_get_bits(0x11, GENMASK(4, 2)),</div><div class='add'>+			       IEEE80211_EHT_PHY_CAP6_MAX_NUM_SUPP_EHT_LTF_MASK) |</div><div class='add'>+		u8_encode_bits(val, IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_MASK);</div><div class='add'>+</div><div class='add'>+	eht_cap_elem-&gt;phy_cap_info[7] =</div><div class='add'>+		IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_80MHZ |</div><div class='add'>+		IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_160MHZ |</div><div class='add'>+		IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_80MHZ |</div><div class='add'>+		IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_160MHZ;</div><div class='add'>+</div><div class='add'>+	val = u8_encode_bits(nss, IEEE80211_EHT_MCS_NSS_RX) |</div><div class='add'>+	      u8_encode_bits(nss, IEEE80211_EHT_MCS_NSS_TX);</div><div class='add'>+</div><div class='add'>+	eht_nss-&gt;bw._80.rx_tx_mcs9_max_nss = val;</div><div class='add'>+	eht_nss-&gt;bw._80.rx_tx_mcs11_max_nss = val;</div><div class='add'>+	eht_nss-&gt;bw._80.rx_tx_mcs13_max_nss = val;</div><div class='add'>+	eht_nss-&gt;bw._160.rx_tx_mcs9_max_nss = val;</div><div class='add'>+	eht_nss-&gt;bw._160.rx_tx_mcs11_max_nss = val;</div><div class='add'>+	eht_nss-&gt;bw._160.rx_tx_mcs13_max_nss = val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_init_mlo_caps(struct mt792x_phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct wiphy *wiphy = phy-&gt;mt76-&gt;hw-&gt;wiphy;</div><div class='add'>+	static const u8 ext_capa_sta[] = {</div><div class='add'>+		[2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT,</div><div class='add'>+		[7] = WLAN_EXT_CAPA8_OPMODE_NOTIF,</div><div class='add'>+	};</div><div class='add'>+	static struct wiphy_iftype_ext_capab ext_capab[] = {</div><div class='add'>+		{</div><div class='add'>+			.iftype = NL80211_IFTYPE_STATION,</div><div class='add'>+			.extended_capabilities = ext_capa_sta,</div><div class='add'>+			.extended_capabilities_mask = ext_capa_sta,</div><div class='add'>+			.extended_capabilities_len = sizeof(ext_capa_sta),</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!(phy-&gt;chip_cap &amp; MT792x_CHIP_CAP_MLO_EN))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ext_capab[0].eml_capabilities = phy-&gt;eml_cap;</div><div class='add'>+	ext_capab[0].mld_capa_and_ops =</div><div class='add'>+		u16_encode_bits(0, IEEE80211_MLD_CAP_OP_MAX_SIMUL_LINKS);</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;flags |= WIPHY_FLAG_SUPPORTS_MLO;</div><div class='add'>+	wiphy-&gt;iftype_ext_capab = ext_capab;</div><div class='add'>+	wiphy-&gt;num_iftype_ext_capab = ARRAY_SIZE(ext_capab);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+__mt7925_set_stream_he_eht_caps(struct mt792x_phy *phy,</div><div class='add'>+				struct ieee80211_supported_band *sband,</div><div class='add'>+				enum nl80211_band band)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sband_iftype_data *data = phy-&gt;iftype[band];</div><div class='add'>+	int i, n = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_NL80211_IFTYPES; i++) {</div><div class='add'>+		switch (i) {</div><div class='add'>+		case NL80211_IFTYPE_STATION:</div><div class='add'>+		case NL80211_IFTYPE_AP:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		data[n].types_mask = BIT(i);</div><div class='add'>+		mt7925_init_he_caps(phy, band, &amp;data[n], i);</div><div class='add'>+		mt7925_init_eht_caps(phy, band, &amp;data[n]);</div><div class='add'>+</div><div class='add'>+		n++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	_ieee80211_set_sband_iftype_data(sband, data, n);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7925_set_stream_he_eht_caps(struct mt792x_phy *phy)</div><div class='add'>+{</div><div class='add'>+	if (phy-&gt;mt76-&gt;cap.has_2ghz)</div><div class='add'>+		__mt7925_set_stream_he_eht_caps(phy, &amp;phy-&gt;mt76-&gt;sband_2g.sband,</div><div class='add'>+						NL80211_BAND_2GHZ);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;mt76-&gt;cap.has_5ghz)</div><div class='add'>+		__mt7925_set_stream_he_eht_caps(phy, &amp;phy-&gt;mt76-&gt;sband_5g.sband,</div><div class='add'>+						NL80211_BAND_5GHZ);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;mt76-&gt;cap.has_6ghz)</div><div class='add'>+		__mt7925_set_stream_he_eht_caps(phy, &amp;phy-&gt;mt76-&gt;sband_6g.sband,</div><div class='add'>+						NL80211_BAND_6GHZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __mt7925_start(struct mt792x_phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct mt76_phy *mphy = phy-&gt;mt76;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mt7925_mcu_set_channel_domain(mphy);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mt7925_mcu_set_rts_thresh(phy, 0x92b);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	mt792x_mac_reset_counters(phy);</div><div class='add'>+	set_bit(MT76_STATE_RUNNING, &amp;mphy-&gt;state);</div><div class='add'>+</div><div class='add'>+	ieee80211_queue_delayed_work(mphy-&gt;hw, &amp;mphy-&gt;mac_work,</div><div class='add'>+				     MT792x_WATCHDOG_TIME);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;chip_cap &amp; MT792x_CHIP_CAP_WF_RF_PIN_CTRL_EVT_EN)</div><div class='add'>+		wiphy_rfkill_start_polling(mphy-&gt;hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__mt7925_start);</div><div class='add'>+</div><div class='add'>+static int mt7925_start(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(phy-&gt;dev);</div><div class='add'>+	err = __mt7925_start(phy);</div><div class='add'>+	mt792x_mutex_release(phy-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925_mac_link_bss_add(struct mt792x_dev *dev,</div><div class='add'>+				   struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				   struct mt792x_link_sta *mlink)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_bss_conf *mconf = mt792x_link_conf_to_mconf(link_conf);</div><div class='add'>+	struct ieee80211_vif *vif = link_conf-&gt;vif;</div><div class='add'>+	struct mt792x_vif *mvif = mconf-&gt;vif;</div><div class='add'>+	struct mt76_txq *mtxq;</div><div class='add'>+	int idx, ret = 0;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_P2P_DEVICE) {</div><div class='add'>+		mconf-&gt;mt76.idx = MT792x_MAX_INTERFACES;</div><div class='add'>+	} else {</div><div class='add'>+		mconf-&gt;mt76.idx = __ffs64(~dev-&gt;mt76.vif_mask);</div><div class='add'>+</div><div class='add'>+		if (mconf-&gt;mt76.idx &gt;= MT792x_MAX_INTERFACES) {</div><div class='add'>+			ret = -ENOSPC;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mconf-&gt;mt76.omac_idx = ieee80211_vif_is_mld(vif) ?</div><div class='add'>+			       0 : mconf-&gt;mt76.idx;</div><div class='add'>+	mconf-&gt;mt76.band_idx = 0xff;</div><div class='add'>+	mconf-&gt;mt76.wmm_idx = ieee80211_vif_is_mld(vif) ?</div><div class='add'>+			      0 : mconf-&gt;mt76.idx % MT76_CONNAC_MAX_WMM_SETS;</div><div class='add'>+	mconf-&gt;mt76.link_idx = hweight16(mvif-&gt;valid_links);</div><div class='add'>+</div><div class='add'>+	if (mvif-&gt;phy-&gt;mt76-&gt;chandef.chan-&gt;band != NL80211_BAND_2GHZ)</div><div class='add'>+		mconf-&gt;mt76.basic_rates_idx = MT792x_BASIC_RATES_TBL + 4;</div><div class='add'>+	else</div><div class='add'>+		mconf-&gt;mt76.basic_rates_idx = MT792x_BASIC_RATES_TBL;</div><div class='add'>+</div><div class='add'>+	dev-&gt;mt76.vif_mask |= BIT_ULL(mconf-&gt;mt76.idx);</div><div class='add'>+	mvif-&gt;phy-&gt;omac_mask |= BIT_ULL(mconf-&gt;mt76.omac_idx);</div><div class='add'>+</div><div class='add'>+	idx = MT792x_WTBL_RESERVED - mconf-&gt;mt76.idx;</div><div class='add'>+</div><div class='add'>+	mlink-&gt;wcid.idx = idx;</div><div class='add'>+	mlink-&gt;wcid.tx_info |= MT_WCID_TX_INFO_SET;</div><div class='add'>+	mt76_wcid_init(&amp;mlink-&gt;wcid, 0);</div><div class='add'>+</div><div class='add'>+	mt7925_mac_wtbl_update(dev, idx,</div><div class='add'>+			       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);</div><div class='add'>+</div><div class='add'>+	ewma_rssi_init(&amp;mconf-&gt;rssi);</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(dev-&gt;mt76.wcid[idx], &amp;mlink-&gt;wcid);</div><div class='add'>+</div><div class='add'>+	ret = mt76_connac_mcu_uni_add_dev(&amp;dev-&gt;mphy, link_conf, &amp;mconf-&gt;mt76,</div><div class='add'>+					  &amp;mlink-&gt;wcid, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;txq) {</div><div class='add'>+		mtxq = (struct mt76_txq *)vif-&gt;txq-&gt;drv_priv;</div><div class='add'>+		mtxq-&gt;wcid = idx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+</div><div class='add'>+	mvif-&gt;phy = phy;</div><div class='add'>+	mvif-&gt;bss_conf.vif = mvif;</div><div class='add'>+	mvif-&gt;sta.vif = mvif;</div><div class='add'>+	mvif-&gt;deflink_id = IEEE80211_LINK_UNSPECIFIED;</div><div class='add'>+	mvif-&gt;mlo_pm_state = MT792x_MLO_LINK_DISASSOC;</div><div class='add'>+</div><div class='add'>+	ret = mt7925_mac_link_bss_add(dev, &amp;vif-&gt;bss_conf, &amp;mvif-&gt;sta.deflink);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	vif-&gt;driver_flags |= IEEE80211_VIF_BEACON_FILTER;</div><div class='add'>+	if (phy-&gt;chip_cap &amp; MT792x_CHIP_CAP_RSSI_NOTIFY_EVT_EN)</div><div class='add'>+		vif-&gt;driver_flags |= IEEE80211_VIF_SUPPORTS_CQM_RSSI;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7925_roc_iter(void *priv, u8 *mac,</div><div class='add'>+			    struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_phy *phy = priv;</div><div class='add'>+</div><div class='add'>+	mt7925_mcu_abort_roc(phy, &amp;mvif-&gt;bss_conf, phy-&gt;roc_token_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7925_roc_abort_sync(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+</div><div class='add'>+	timer_delete_sync(&amp;phy-&gt;roc_timer);</div><div class='add'>+	cancel_work_sync(&amp;phy-&gt;roc_work);</div><div class='add'>+	if (test_and_clear_bit(MT76_STATE_ROC, &amp;phy-&gt;mt76-&gt;state))</div><div class='add'>+		ieee80211_iterate_interfaces(mt76_hw(dev),</div><div class='add'>+					     IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='add'>+					     mt7925_roc_iter, (void *)phy);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_roc_abort_sync);</div><div class='add'>+</div><div class='add'>+void mt7925_roc_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_phy *phy;</div><div class='add'>+</div><div class='add'>+	phy = (struct mt792x_phy *)container_of(work, struct mt792x_phy,</div><div class='add'>+						roc_work);</div><div class='add'>+</div><div class='add'>+	if (!test_and_clear_bit(MT76_STATE_ROC, &amp;phy-&gt;mt76-&gt;state))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(phy-&gt;dev);</div><div class='add'>+	ieee80211_iterate_active_interfaces(phy-&gt;mt76-&gt;hw,</div><div class='add'>+					    IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='add'>+					    mt7925_roc_iter, phy);</div><div class='add'>+	mt792x_mutex_release(phy-&gt;dev);</div><div class='add'>+	ieee80211_remain_on_channel_expired(phy-&gt;mt76-&gt;hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925_abort_roc(struct mt792x_phy *phy,</div><div class='add'>+			    struct mt792x_bss_conf *mconf)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	timer_delete_sync(&amp;phy-&gt;roc_timer);</div><div class='add'>+	cancel_work_sync(&amp;phy-&gt;roc_work);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(phy-&gt;dev);</div><div class='add'>+	if (test_and_clear_bit(MT76_STATE_ROC, &amp;phy-&gt;mt76-&gt;state))</div><div class='add'>+		err = mt7925_mcu_abort_roc(phy, mconf, phy-&gt;roc_token_id);</div><div class='add'>+	mt792x_mutex_release(phy-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925_set_roc(struct mt792x_phy *phy,</div><div class='add'>+			  struct mt792x_bss_conf *mconf,</div><div class='add'>+			  struct ieee80211_channel *chan,</div><div class='add'>+			  int duration,</div><div class='add'>+			  enum mt7925_roc_req type)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (test_and_set_bit(MT76_STATE_ROC, &amp;phy-&gt;mt76-&gt;state))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	phy-&gt;roc_grant = false;</div><div class='add'>+</div><div class='add'>+	err = mt7925_mcu_set_roc(phy, mconf, chan, duration, type,</div><div class='add'>+				 ++phy-&gt;roc_token_id);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		clear_bit(MT76_STATE_ROC, &amp;phy-&gt;mt76-&gt;state);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!wait_event_timeout(phy-&gt;roc_wait, phy-&gt;roc_grant, 4 * HZ)) {</div><div class='add'>+		mt7925_mcu_abort_roc(phy, mconf, phy-&gt;roc_token_id);</div><div class='add'>+		clear_bit(MT76_STATE_ROC, &amp;phy-&gt;mt76-&gt;state);</div><div class='add'>+		err = -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925_set_mlo_roc(struct mt792x_phy *phy,</div><div class='add'>+			      struct mt792x_bss_conf *mconf,</div><div class='add'>+			      u16 sel_links)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(test_and_set_bit(MT76_STATE_ROC, &amp;phy-&gt;mt76-&gt;state)))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	phy-&gt;roc_grant = false;</div><div class='add'>+</div><div class='add'>+	err = mt7925_mcu_set_mlo_roc(mconf, sel_links, 5, ++phy-&gt;roc_token_id);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		clear_bit(MT76_STATE_ROC, &amp;phy-&gt;mt76-&gt;state);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!wait_event_timeout(phy-&gt;roc_wait, phy-&gt;roc_grant, 4 * HZ)) {</div><div class='add'>+		mt7925_mcu_abort_roc(phy, mconf, phy-&gt;roc_token_id);</div><div class='add'>+		clear_bit(MT76_STATE_ROC, &amp;phy-&gt;mt76-&gt;state);</div><div class='add'>+		err = -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925_remain_on_channel(struct ieee80211_hw *hw,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct ieee80211_channel *chan,</div><div class='add'>+				    int duration,</div><div class='add'>+				    enum ieee80211_roc_type type)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(phy-&gt;dev);</div><div class='add'>+	err = mt7925_set_roc(phy, &amp;mvif-&gt;bss_conf,</div><div class='add'>+			     chan, duration, MT7925_ROC_REQ_ROC);</div><div class='add'>+	mt792x_mutex_release(phy-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925_cancel_remain_on_channel(struct ieee80211_hw *hw,</div><div class='add'>+					   struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='add'>+</div><div class='add'>+	return mt7925_abort_roc(phy, &amp;mvif-&gt;bss_conf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925_set_link_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='add'>+			       struct ieee80211_vif *vif, struct ieee80211_sta *sta,</div><div class='add'>+			       struct ieee80211_key_conf *key, int link_id)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_sta *msta = sta ? (struct mt792x_sta *)sta-&gt;drv_priv :</div><div class='add'>+				  &amp;mvif-&gt;sta;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct ieee80211_link_sta *link_sta;</div><div class='add'>+	int idx = key-&gt;keyidx, err = 0;</div><div class='add'>+	struct mt792x_link_sta *mlink;</div><div class='add'>+	struct mt792x_bss_conf *mconf;</div><div class='add'>+	struct mt76_wcid *wcid;</div><div class='add'>+	u8 *wcid_keyidx;</div><div class='add'>+</div><div class='add'>+	link_conf = mt792x_vif_to_bss_conf(vif, link_id);</div><div class='add'>+	link_sta = sta ? mt792x_sta_to_link_sta(vif, sta, link_id) : NULL;</div><div class='add'>+	mconf = mt792x_vif_to_link(mvif, link_id);</div><div class='add'>+	mlink = mt792x_sta_to_link(msta, link_id);</div><div class='add'>+	wcid = &amp;mlink-&gt;wcid;</div><div class='add'>+	wcid_keyidx = &amp;wcid-&gt;hw_key_idx;</div><div class='add'>+</div><div class='add'>+	/* fall back to sw encryption for unsupported ciphers */</div><div class='add'>+	switch (key-&gt;cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_AES_CMAC:</div><div class='add'>+		key-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_MMIE;</div><div class='add'>+		wcid_keyidx = &amp;wcid-&gt;hw_key_idx2;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP40:</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP104:</div><div class='add'>+		if (!mvif-&gt;wep_sta)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP_256:</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP:</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='add'>+	case WLAN_CIPHER_SUITE_SMS4:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd == SET_KEY &amp;&amp; !mconf-&gt;mt76.cipher) {</div><div class='add'>+		struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='add'>+</div><div class='add'>+		mconf-&gt;mt76.cipher = mt7925_mcu_get_cipher(key-&gt;cipher);</div><div class='add'>+		mt7925_mcu_add_bss_info(phy, mconf-&gt;mt76.ctx, link_conf,</div><div class='add'>+					link_sta, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd == SET_KEY)</div><div class='add'>+		*wcid_keyidx = idx;</div><div class='add'>+	else if (idx == *wcid_keyidx)</div><div class='add'>+		*wcid_keyidx = -1;</div><div class='add'>+	else</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mt76_wcid_key_setup(&amp;dev-&gt;mt76, wcid,</div><div class='add'>+			    cmd == SET_KEY ? key : NULL);</div><div class='add'>+</div><div class='add'>+	err = mt7925_mcu_add_key(&amp;dev-&gt;mt76, vif, &amp;mlink-&gt;bip,</div><div class='add'>+				 key, MCU_UNI_CMD(STA_REC_UPDATE),</div><div class='add'>+				 &amp;mlink-&gt;wcid, cmd, msta);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (key-&gt;cipher == WLAN_CIPHER_SUITE_WEP104 ||</div><div class='add'>+	    key-&gt;cipher == WLAN_CIPHER_SUITE_WEP40)</div><div class='add'>+		err = mt7925_mcu_add_key(&amp;dev-&gt;mt76, vif, &amp;mvif-&gt;wep_sta-&gt;deflink.bip,</div><div class='add'>+					 key, MCU_WMWA_UNI_CMD(STA_REC_UPDATE),</div><div class='add'>+					 &amp;mvif-&gt;wep_sta-&gt;deflink.wcid, cmd, msta);</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='add'>+			  struct ieee80211_vif *vif, struct ieee80211_sta *sta,</div><div class='add'>+			  struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_sta *msta = sta ? (struct mt792x_sta *)sta-&gt;drv_priv :</div><div class='add'>+				  &amp;mvif-&gt;sta;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* The hardware does not support per-STA RX GTK, fallback</div><div class='add'>+	 * to software mode for these.</div><div class='add'>+	 */</div><div class='add'>+	if ((vif-&gt;type == NL80211_IFTYPE_ADHOC ||</div><div class='add'>+	     vif-&gt;type == NL80211_IFTYPE_MESH_POINT) &amp;&amp;</div><div class='add'>+	    (key-&gt;cipher == WLAN_CIPHER_SUITE_TKIP ||</div><div class='add'>+	     key-&gt;cipher == WLAN_CIPHER_SUITE_CCMP) &amp;&amp;</div><div class='add'>+	    !(key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_is_mld(vif)) {</div><div class='add'>+		unsigned int link_id;</div><div class='add'>+		unsigned long add;</div><div class='add'>+</div><div class='add'>+		add = key-&gt;link_id != -1 ? BIT(key-&gt;link_id) : msta-&gt;valid_links;</div><div class='add'>+</div><div class='add'>+		for_each_set_bit(link_id, &amp;add, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+			err = mt7925_set_link_key(hw, cmd, vif, sta, key, link_id);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		err = mt7925_set_link_key(hw, cmd, vif, sta, key, vif-&gt;bss_conf.link_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_pm_interface_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = priv;</div><div class='add'>+	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='add'>+	bool pm_enable = dev-&gt;pm.enable;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mt7925_mcu_set_beacon_filter(dev, vif, pm_enable);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (pm_enable) {</div><div class='add'>+		vif-&gt;driver_flags |= IEEE80211_VIF_BEACON_FILTER;</div><div class='add'>+		ieee80211_hw_set(hw, CONNECTION_MONITOR);</div><div class='add'>+	} else {</div><div class='add'>+		vif-&gt;driver_flags &amp;= ~IEEE80211_VIF_BEACON_FILTER;</div><div class='add'>+		__clear_bit(IEEE80211_HW_CONNECTION_MONITOR, hw-&gt;flags);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_sniffer_interface_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = priv;</div><div class='add'>+	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+	bool monitor = !!(hw-&gt;conf.flags &amp; IEEE80211_CONF_MONITOR);</div><div class='add'>+</div><div class='add'>+	mt7925_mcu_set_sniffer(dev, vif, monitor);</div><div class='add'>+	pm-&gt;enable = pm-&gt;enable_user &amp;&amp; !monitor;</div><div class='add'>+	pm-&gt;ds_enable = pm-&gt;ds_enable_user &amp;&amp; !monitor;</div><div class='add'>+</div><div class='add'>+	mt7925_mcu_set_deep_sleep(dev, pm-&gt;ds_enable);</div><div class='add'>+</div><div class='add'>+	if (monitor)</div><div class='add'>+		mt7925_mcu_set_beacon_filter(dev, vif, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7925_set_runtime_pm(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+	bool monitor = !!(hw-&gt;conf.flags &amp; IEEE80211_CONF_MONITOR);</div><div class='add'>+</div><div class='add'>+	pm-&gt;enable = pm-&gt;enable_user &amp;&amp; !monitor;</div><div class='add'>+	ieee80211_iterate_active_interfaces(hw,</div><div class='add'>+					    IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='add'>+					    mt7925_pm_interface_iter, dev);</div><div class='add'>+	pm-&gt;ds_enable = pm-&gt;ds_enable_user &amp;&amp; !monitor;</div><div class='add'>+	mt7925_mcu_set_deep_sleep(dev, pm-&gt;ds_enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925_config(struct ieee80211_hw *hw, int radio_idx, u32 changed)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+</div><div class='add'>+	if (changed &amp; IEEE80211_CONF_CHANGE_POWER) {</div><div class='add'>+		ret = mt7925_set_tx_sar_pwr(hw, NULL);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; IEEE80211_CONF_CHANGE_MONITOR) {</div><div class='add'>+		ieee80211_iterate_active_interfaces(hw,</div><div class='add'>+						    IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='add'>+						    mt7925_sniffer_interface_iter, dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7925_configure_filter(struct ieee80211_hw *hw,</div><div class='add'>+				    unsigned int changed_flags,</div><div class='add'>+				    unsigned int *total_flags,</div><div class='add'>+				    u64 multicast)</div><div class='add'>+{</div><div class='add'>+#define MT7925_FILTER_FCSFAIL    BIT(2)</div><div class='add'>+#define MT7925_FILTER_CONTROL    BIT(5)</div><div class='add'>+#define MT7925_FILTER_OTHER_BSS  BIT(6)</div><div class='add'>+#define MT7925_FILTER_ENABLE     BIT(31)</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	u32 flags = MT7925_FILTER_ENABLE;</div><div class='add'>+</div><div class='add'>+#define MT7925_FILTER(_fif, _type) do {			\</div><div class='add'>+		if (*total_flags &amp; (_fif))		\</div><div class='add'>+			flags |= MT7925_FILTER_##_type;	\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+	MT7925_FILTER(FIF_FCSFAIL, FCSFAIL);</div><div class='add'>+	MT7925_FILTER(FIF_CONTROL, CONTROL);</div><div class='add'>+	MT7925_FILTER(FIF_OTHER_BSS, OTHER_BSS);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	mt7925_mcu_set_rxfilter(dev, flags, 0, 0);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	*total_flags &amp;= (FIF_OTHER_BSS | FIF_FCSFAIL | FIF_CONTROL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8</div><div class='add'>+mt7925_get_rates_table(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		       bool beacon, bool mcast)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_phy *mphy = hw-&gt;priv;</div><div class='add'>+	u16 rate;</div><div class='add'>+	u8 i, idx, ht;</div><div class='add'>+</div><div class='add'>+	rate = mt76_connac2_mac_tx_rate_val(mphy, &amp;vif-&gt;bss_conf, beacon, mcast);</div><div class='add'>+	ht = FIELD_GET(MT_TX_RATE_MODE, rate) &gt; MT_PHY_TYPE_OFDM;</div><div class='add'>+</div><div class='add'>+	if (beacon &amp;&amp; ht) {</div><div class='add'>+		struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+</div><div class='add'>+		/* must odd index */</div><div class='add'>+		idx = MT7925_BEACON_RATES_TBL + 2 * (mvif-&gt;idx % 20);</div><div class='add'>+		mt7925_mac_set_fixed_rate_table(dev, idx, rate);</div><div class='add'>+		return idx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	idx = FIELD_GET(MT_TX_RATE_IDX, rate);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mt76_rates); i++)</div><div class='add'>+		if ((mt76_rates[i].hw_value &amp; GENMASK(7, 0)) == idx)</div><div class='add'>+			return MT792x_BASIC_RATES_TBL + i;</div><div class='add'>+</div><div class='add'>+	return mvif-&gt;basic_rates_idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925_mac_link_sta_add(struct mt76_dev *mdev,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct mt792x_bss_conf *mconf;</div><div class='add'>+	u8 link_id = link_sta-&gt;link_id;</div><div class='add'>+	struct mt792x_link_sta *mlink;</div><div class='add'>+	struct mt792x_sta *msta;</div><div class='add'>+	struct mt76_wcid *wcid;</div><div class='add'>+	int ret, idx;</div><div class='add'>+</div><div class='add'>+	msta = (struct mt792x_sta *)link_sta-&gt;sta-&gt;drv_priv;</div><div class='add'>+	mlink = mt792x_sta_to_link(msta, link_id);</div><div class='add'>+</div><div class='add'>+	idx = mt76_wcid_alloc(dev-&gt;mt76.wcid_mask, MT792x_WTBL_STA - 1);</div><div class='add'>+	if (idx &lt; 0)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	mconf = mt792x_vif_to_link(mvif, link_id);</div><div class='add'>+	mt76_wcid_init(&amp;mlink-&gt;wcid, 0);</div><div class='add'>+	mlink-&gt;wcid.sta = 1;</div><div class='add'>+	mlink-&gt;wcid.idx = idx;</div><div class='add'>+	mlink-&gt;wcid.tx_info |= MT_WCID_TX_INFO_SET;</div><div class='add'>+	mlink-&gt;last_txs = jiffies;</div><div class='add'>+	mlink-&gt;wcid.link_id = link_sta-&gt;link_id;</div><div class='add'>+	mlink-&gt;wcid.link_valid = !!link_sta-&gt;sta-&gt;valid_links;</div><div class='add'>+	mlink-&gt;sta = msta;</div><div class='add'>+</div><div class='add'>+	wcid = &amp;mlink-&gt;wcid;</div><div class='add'>+	ewma_signal_init(&amp;wcid-&gt;rssi);</div><div class='add'>+	rcu_assign_pointer(dev-&gt;mt76.wcid[wcid-&gt;idx], wcid);</div><div class='add'>+	mt76_wcid_init(wcid, 0);</div><div class='add'>+	ewma_avg_signal_init(&amp;mlink-&gt;avg_ack_signal);</div><div class='add'>+	memset(mlink-&gt;airtime_ac, 0,</div><div class='add'>+	       sizeof(msta-&gt;deflink.airtime_ac));</div><div class='add'>+</div><div class='add'>+	ret = mt76_connac_pm_wake(&amp;dev-&gt;mphy, &amp;dev-&gt;pm);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mt7925_mac_wtbl_update(dev, idx,</div><div class='add'>+			       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);</div><div class='add'>+</div><div class='add'>+	link_conf = mt792x_vif_to_bss_conf(vif, link_id);</div><div class='add'>+</div><div class='add'>+	/* should update bss info before STA add */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; !link_sta-&gt;sta-&gt;tdls) {</div><div class='add'>+		if (ieee80211_vif_is_mld(vif))</div><div class='add'>+			mt7925_mcu_add_bss_info(&amp;dev-&gt;phy, mconf-&gt;mt76.ctx,</div><div class='add'>+						link_conf, link_sta, link_sta != mlink-&gt;pri_link);</div><div class='add'>+		else</div><div class='add'>+			mt7925_mcu_add_bss_info(&amp;dev-&gt;phy, mconf-&gt;mt76.ctx,</div><div class='add'>+						link_conf, link_sta, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_is_mld(vif) &amp;&amp;</div><div class='add'>+	    link_sta == mlink-&gt;pri_link) {</div><div class='add'>+		ret = mt7925_mcu_sta_update(dev, link_sta, vif, true,</div><div class='add'>+					    MT76_STA_INFO_STATE_NONE);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	} else if (ieee80211_vif_is_mld(vif) &amp;&amp;</div><div class='add'>+		   link_sta != mlink-&gt;pri_link) {</div><div class='add'>+		ret = mt7925_mcu_sta_update(dev, mlink-&gt;pri_link, vif,</div><div class='add'>+					    true, MT76_STA_INFO_STATE_ASSOC);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = mt7925_mcu_sta_update(dev, link_sta, vif, true,</div><div class='add'>+					    MT76_STA_INFO_STATE_ASSOC);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	} else {</div><div class='add'>+		ret = mt7925_mcu_sta_update(dev, link_sta, vif, true,</div><div class='add'>+					    MT76_STA_INFO_STATE_NONE);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt76_connac_power_save_sched(&amp;dev-&gt;mphy, &amp;dev-&gt;pm);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_mac_sta_add_links(struct mt792x_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			 struct ieee80211_sta *sta, unsigned long new_links)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_sta *msta = (struct mt792x_sta *)sta-&gt;drv_priv;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(link_id, &amp;new_links, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		struct ieee80211_link_sta *link_sta;</div><div class='add'>+		struct mt792x_link_sta *mlink;</div><div class='add'>+</div><div class='add'>+		if (msta-&gt;deflink_id == IEEE80211_LINK_UNSPECIFIED) {</div><div class='add'>+			mlink = &amp;msta-&gt;deflink;</div><div class='add'>+			msta-&gt;deflink_id = link_id;</div><div class='add'>+		} else {</div><div class='add'>+			mlink = devm_kzalloc(dev-&gt;mt76.dev, sizeof(*mlink), GFP_KERNEL);</div><div class='add'>+			if (!mlink) {</div><div class='add'>+				err = -ENOMEM;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		msta-&gt;valid_links |= BIT(link_id);</div><div class='add'>+		rcu_assign_pointer(msta-&gt;link[link_id], mlink);</div><div class='add'>+		mlink-&gt;sta = msta;</div><div class='add'>+		mlink-&gt;pri_link = &amp;sta-&gt;deflink;</div><div class='add'>+		mlink-&gt;wcid.def_wcid = &amp;msta-&gt;deflink.wcid;</div><div class='add'>+</div><div class='add'>+		link_sta = mt792x_sta_to_link_sta(vif, sta, link_id);</div><div class='add'>+		mt7925_mac_link_sta_add(&amp;dev-&gt;mt76, vif, link_sta);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='add'>+		       struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_sta *msta = (struct mt792x_sta *)sta-&gt;drv_priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	msta-&gt;vif = mvif;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+		mvif-&gt;wep_sta = msta;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_is_mld(vif)) {</div><div class='add'>+		msta-&gt;deflink_id = IEEE80211_LINK_UNSPECIFIED;</div><div class='add'>+</div><div class='add'>+		err = mt7925_mac_sta_add_links(dev, vif, sta, sta-&gt;valid_links);</div><div class='add'>+	} else {</div><div class='add'>+		err = mt7925_mac_link_sta_add(mdev, vif, &amp;sta-&gt;deflink);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_mac_sta_add);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mac_set_links(struct mt76_dev *mdev, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf =</div><div class='add'>+		mt792x_vif_to_bss_conf(vif, mvif-&gt;deflink_id);</div><div class='add'>+	struct cfg80211_chan_def *chandef = &amp;link_conf-&gt;chanreq.oper;</div><div class='add'>+	enum nl80211_band band = chandef-&gt;chan-&gt;band, secondary_band;</div><div class='add'>+</div><div class='add'>+	u16 sel_links = mt76_select_links(vif, 2);</div><div class='add'>+	u8 secondary_link_id = __ffs(~BIT(mvif-&gt;deflink_id) &amp; sel_links);</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_vif_is_mld(vif) || hweight16(sel_links) &lt; 2)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	link_conf = mt792x_vif_to_bss_conf(vif, secondary_link_id);</div><div class='add'>+	secondary_band = link_conf-&gt;chanreq.oper.chan-&gt;band;</div><div class='add'>+</div><div class='add'>+	if (band == NL80211_BAND_2GHZ ||</div><div class='add'>+	    (band == NL80211_BAND_5GHZ &amp;&amp; secondary_band == NL80211_BAND_6GHZ)) {</div><div class='add'>+		mt7925_abort_roc(mvif-&gt;phy, &amp;mvif-&gt;bss_conf);</div><div class='add'>+</div><div class='add'>+		mt792x_mutex_acquire(dev);</div><div class='add'>+</div><div class='add'>+		mt7925_set_mlo_roc(mvif-&gt;phy, &amp;mvif-&gt;bss_conf, sel_links);</div><div class='add'>+</div><div class='add'>+		mt792x_mutex_release(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ieee80211_set_active_links_async(vif, sel_links);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7925_mac_link_sta_assoc(struct mt76_dev *mdev,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct mt792x_link_sta *mlink;</div><div class='add'>+	struct mt792x_sta *msta;</div><div class='add'>+</div><div class='add'>+	msta = (struct mt792x_sta *)link_sta-&gt;sta-&gt;drv_priv;</div><div class='add'>+	mlink = mt792x_sta_to_link(msta, link_sta-&gt;link_id);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_is_mld(vif)) {</div><div class='add'>+		link_conf = mt792x_vif_to_bss_conf(vif, msta-&gt;deflink_id);</div><div class='add'>+	} else {</div><div class='add'>+		link_conf = mt792x_vif_to_bss_conf(vif, vif-&gt;bss_conf.link_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; !link_sta-&gt;sta-&gt;tdls) {</div><div class='add'>+		struct mt792x_bss_conf *mconf;</div><div class='add'>+</div><div class='add'>+		mconf = mt792x_link_conf_to_mconf(link_conf);</div><div class='add'>+		mt7925_mcu_add_bss_info(&amp;dev-&gt;phy, mconf-&gt;mt76.ctx,</div><div class='add'>+					link_conf, link_sta, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ewma_avg_signal_init(&amp;mlink-&gt;avg_ack_signal);</div><div class='add'>+</div><div class='add'>+	mt7925_mac_wtbl_update(dev, mlink-&gt;wcid.idx,</div><div class='add'>+			       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);</div><div class='add'>+	memset(mlink-&gt;airtime_ac, 0, sizeof(mlink-&gt;airtime_ac));</div><div class='add'>+</div><div class='add'>+	mt7925_mcu_sta_update(dev, link_sta, vif, true, MT76_STA_INFO_STATE_ASSOC);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mac_sta_event(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='add'>+			 struct ieee80211_sta *sta, enum mt76_sta_event ev)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_link_sta *link_sta = &amp;sta-&gt;deflink;</div><div class='add'>+</div><div class='add'>+	if (ev != MT76_STA_EVENT_ASSOC)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_is_mld(vif)) {</div><div class='add'>+		struct mt792x_sta *msta = (struct mt792x_sta *)sta-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+		link_sta = mt792x_sta_to_link_sta(vif, sta, msta-&gt;deflink_id);</div><div class='add'>+		mt7925_mac_set_links(mdev, vif);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt7925_mac_link_sta_assoc(mdev, vif, link_sta);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_mac_sta_event);</div><div class='add'>+</div><div class='add'>+static void mt7925_mac_link_sta_remove(struct mt76_dev *mdev,</div><div class='add'>+				       struct ieee80211_vif *vif,</div><div class='add'>+				       struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	u8 link_id = link_sta-&gt;link_id;</div><div class='add'>+	struct mt792x_link_sta *mlink;</div><div class='add'>+	struct mt792x_sta *msta;</div><div class='add'>+</div><div class='add'>+	msta = (struct mt792x_sta *)link_sta-&gt;sta-&gt;drv_priv;</div><div class='add'>+	mlink = mt792x_sta_to_link(msta, link_id);</div><div class='add'>+</div><div class='add'>+	mt7925_roc_abort_sync(dev);</div><div class='add'>+</div><div class='add'>+	mt76_connac_free_pending_tx_skbs(&amp;dev-&gt;pm, &amp;mlink-&gt;wcid);</div><div class='add'>+	mt76_connac_pm_wake(&amp;dev-&gt;mphy, &amp;dev-&gt;pm);</div><div class='add'>+</div><div class='add'>+	mt7925_mcu_sta_update(dev, link_sta, vif, false,</div><div class='add'>+			      MT76_STA_INFO_STATE_NONE);</div><div class='add'>+	mt7925_mac_wtbl_update(dev, mlink-&gt;wcid.idx,</div><div class='add'>+			       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);</div><div class='add'>+</div><div class='add'>+	link_conf = mt792x_vif_to_bss_conf(vif, link_id);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp; !link_sta-&gt;sta-&gt;tdls) {</div><div class='add'>+		struct mt792x_bss_conf *mconf;</div><div class='add'>+</div><div class='add'>+		mconf = mt792x_link_conf_to_mconf(link_conf);</div><div class='add'>+</div><div class='add'>+		if (ieee80211_vif_is_mld(vif))</div><div class='add'>+			mt792x_mac_link_bss_remove(dev, mconf, mlink);</div><div class='add'>+		else</div><div class='add'>+			mt7925_mcu_add_bss_info(&amp;dev-&gt;phy, mconf-&gt;mt76.ctx, link_conf,</div><div class='add'>+						link_sta, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;mdev-&gt;sta_poll_lock);</div><div class='add'>+	if (!list_empty(&amp;mlink-&gt;wcid.poll_list))</div><div class='add'>+		list_del_init(&amp;mlink-&gt;wcid.poll_list);</div><div class='add'>+	spin_unlock_bh(&amp;mdev-&gt;sta_poll_lock);</div><div class='add'>+</div><div class='add'>+	mt76_connac_power_save_sched(&amp;dev-&gt;mphy, &amp;dev-&gt;pm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_mac_sta_remove_links(struct mt792x_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			    struct ieee80211_sta *sta, unsigned long old_links)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_sta *msta = (struct mt792x_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	struct mt76_wcid *wcid;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+</div><div class='add'>+	/* clean up bss before starec */</div><div class='add'>+	for_each_set_bit(link_id, &amp;old_links, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		struct ieee80211_link_sta *link_sta;</div><div class='add'>+		struct ieee80211_bss_conf *link_conf;</div><div class='add'>+		struct mt792x_bss_conf *mconf;</div><div class='add'>+		struct mt792x_link_sta *mlink;</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_AP)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		link_sta = mt792x_sta_to_link_sta(vif, sta, link_id);</div><div class='add'>+		if (!link_sta)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mlink = mt792x_sta_to_link(msta, link_id);</div><div class='add'>+		if (!mlink)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		link_conf = mt792x_vif_to_bss_conf(vif, link_id);</div><div class='add'>+		if (!link_conf)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mconf = mt792x_link_conf_to_mconf(link_conf);</div><div class='add'>+</div><div class='add'>+		mt7925_mcu_add_bss_info(&amp;dev-&gt;phy, mconf-&gt;mt76.ctx, link_conf,</div><div class='add'>+					link_sta, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(link_id, &amp;old_links, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		struct ieee80211_link_sta *link_sta;</div><div class='add'>+		struct mt792x_link_sta *mlink;</div><div class='add'>+</div><div class='add'>+		link_sta = mt792x_sta_to_link_sta(vif, sta, link_id);</div><div class='add'>+		if (!link_sta)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mlink = mt792x_sta_to_link(msta, link_id);</div><div class='add'>+		if (!mlink)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mt7925_mac_link_sta_remove(&amp;dev-&gt;mt76, vif, link_sta);</div><div class='add'>+</div><div class='add'>+		wcid = &amp;mlink-&gt;wcid;</div><div class='add'>+		rcu_assign_pointer(msta-&gt;link[link_id], NULL);</div><div class='add'>+		msta-&gt;valid_links &amp;= ~BIT(link_id);</div><div class='add'>+		mlink-&gt;sta = NULL;</div><div class='add'>+		mlink-&gt;pri_link = NULL;</div><div class='add'>+</div><div class='add'>+		if (link_sta != mlink-&gt;pri_link) {</div><div class='add'>+			mt76_wcid_cleanup(mdev, wcid);</div><div class='add'>+			mt76_wcid_mask_clear(mdev-&gt;wcid_mask, wcid-&gt;idx);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (msta-&gt;deflink_id == link_id)</div><div class='add'>+			msta-&gt;deflink_id = IEEE80211_LINK_UNSPECIFIED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7925_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='add'>+			   struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	struct mt792x_sta *msta = (struct mt792x_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	unsigned long rem;</div><div class='add'>+</div><div class='add'>+	rem = ieee80211_vif_is_mld(vif) ? msta-&gt;valid_links : BIT(0);</div><div class='add'>+</div><div class='add'>+	mt7925_mac_sta_remove_links(dev, vif, sta, rem);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_is_mld(vif))</div><div class='add'>+		mt7925_mcu_del_dev(mdev, vif);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='add'>+		mvif-&gt;wep_sta = NULL;</div><div class='add'>+		ewma_rssi_init(&amp;mvif-&gt;bss_conf.rssi);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mvif-&gt;mlo_pm_state = MT792x_MLO_LINK_DISASSOC;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_mac_sta_remove);</div><div class='add'>+</div><div class='add'>+static int mt7925_set_rts_threshold(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+				    u32 val)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	mt7925_mcu_set_rts_thresh(&amp;dev-&gt;phy, val);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		    struct ieee80211_ampdu_params *params)</div><div class='add'>+{</div><div class='add'>+	enum ieee80211_ampdu_mlme_action action = params-&gt;action;</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct ieee80211_sta *sta = params-&gt;sta;</div><div class='add'>+	struct ieee80211_txq *txq = sta-&gt;txq[params-&gt;tid];</div><div class='add'>+	struct mt792x_sta *msta = (struct mt792x_sta *)sta-&gt;drv_priv;</div><div class='add'>+	u16 tid = params-&gt;tid;</div><div class='add'>+	u16 ssn = params-&gt;ssn;</div><div class='add'>+	struct mt76_txq *mtxq;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!txq)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mtxq = (struct mt76_txq *)txq-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	switch (action) {</div><div class='add'>+	case IEEE80211_AMPDU_RX_START:</div><div class='add'>+		mt76_rx_aggr_start(&amp;dev-&gt;mt76, &amp;msta-&gt;deflink.wcid, tid, ssn,</div><div class='add'>+				   params-&gt;buf_size);</div><div class='add'>+		mt7925_mcu_uni_rx_ba(dev, params, true);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_RX_STOP:</div><div class='add'>+		mt76_rx_aggr_stop(&amp;dev-&gt;mt76, &amp;msta-&gt;deflink.wcid, tid);</div><div class='add'>+		mt7925_mcu_uni_rx_ba(dev, params, false);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_TX_OPERATIONAL:</div><div class='add'>+		mtxq-&gt;aggr = true;</div><div class='add'>+		mtxq-&gt;send_bar = false;</div><div class='add'>+		mt7925_mcu_uni_tx_ba(dev, params, true);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_TX_STOP_FLUSH:</div><div class='add'>+	case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:</div><div class='add'>+		mtxq-&gt;aggr = false;</div><div class='add'>+		clear_bit(tid, &amp;msta-&gt;deflink.wcid.ampdu_state);</div><div class='add'>+		mt7925_mcu_uni_tx_ba(dev, params, false);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_TX_START:</div><div class='add'>+		set_bit(tid, &amp;msta-&gt;deflink.wcid.ampdu_state);</div><div class='add'>+		ret = IEEE80211_AMPDU_TX_START_IMMEDIATE;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_TX_STOP_CONT:</div><div class='add'>+		mtxq-&gt;aggr = false;</div><div class='add'>+		clear_bit(tid, &amp;msta-&gt;deflink.wcid.ampdu_state);</div><div class='add'>+		mt7925_mcu_uni_tx_ba(dev, params, false);</div><div class='add'>+		ieee80211_stop_tx_ba_cb_irqsafe(vif, sta-&gt;addr, tid);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mlo_pm_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = priv;</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	unsigned long valid = ieee80211_vif_is_mld(vif) ?</div><div class='add'>+				    mvif-&gt;valid_links : BIT(0);</div><div class='add'>+	struct ieee80211_bss_conf *bss_conf;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (mvif-&gt;mlo_pm_state != MT792x_MLO_CHANGED_PS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	for_each_set_bit(i, &amp;valid, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		bss_conf = mt792x_vif_to_bss_conf(vif, i);</div><div class='add'>+		mt7925_mcu_uni_bss_ps(dev, bss_conf);</div><div class='add'>+	}</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7925_mlo_pm_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(work, struct mt792x_dev,</div><div class='add'>+					      mlo_pm_work.work);</div><div class='add'>+	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces(hw,</div><div class='add'>+					    IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='add'>+					    mt7925_mlo_pm_iter, dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7925_scan_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_phy *phy;</div><div class='add'>+</div><div class='add'>+	phy = (struct mt792x_phy *)container_of(work, struct mt792x_phy,</div><div class='add'>+						scan_work.work);</div><div class='add'>+</div><div class='add'>+	while (true) {</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+		struct tlv *tlv;</div><div class='add'>+		int tlv_len;</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;phy-&gt;dev-&gt;mt76.lock);</div><div class='add'>+		skb = __skb_dequeue(&amp;phy-&gt;scan_event_list);</div><div class='add'>+		spin_unlock_bh(&amp;phy-&gt;dev-&gt;mt76.lock);</div><div class='add'>+</div><div class='add'>+		if (!skb)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		skb_pull(skb, sizeof(struct mt7925_mcu_rxd) + 4);</div><div class='add'>+		tlv = (struct tlv *)skb-&gt;data;</div><div class='add'>+		tlv_len = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+		while (tlv_len &gt; 0 &amp;&amp; le16_to_cpu(tlv-&gt;len) &lt;= tlv_len) {</div><div class='add'>+			struct mt7925_mcu_scan_chinfo_event *evt;</div><div class='add'>+</div><div class='add'>+			switch (le16_to_cpu(tlv-&gt;tag)) {</div><div class='add'>+			case UNI_EVENT_SCAN_DONE_BASIC:</div><div class='add'>+				if (test_and_clear_bit(MT76_HW_SCANNING, &amp;phy-&gt;mt76-&gt;state)) {</div><div class='add'>+					struct cfg80211_scan_info info = {</div><div class='add'>+						.aborted = false,</div><div class='add'>+					};</div><div class='add'>+					ieee80211_scan_completed(phy-&gt;mt76-&gt;hw, &amp;info);</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+			case UNI_EVENT_SCAN_DONE_CHNLINFO:</div><div class='add'>+				evt = (struct mt7925_mcu_scan_chinfo_event *)tlv-&gt;data;</div><div class='add'>+</div><div class='add'>+				mt7925_regd_change(phy, evt-&gt;alpha2);</div><div class='add'>+</div><div class='add'>+				break;</div><div class='add'>+			case UNI_EVENT_SCAN_DONE_NLO:</div><div class='add'>+				ieee80211_sched_scan_results(phy-&gt;mt76-&gt;hw);</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			tlv_len -= le16_to_cpu(tlv-&gt;len);</div><div class='add'>+			tlv = (struct tlv *)((char *)(tlv) + le16_to_cpu(tlv-&gt;len));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+	       struct ieee80211_scan_request *req)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt76_phy *mphy = hw-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	err = mt7925_mcu_hw_scan(mphy, vif, req);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_cancel_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt76_phy *mphy = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	mt7925_mcu_cancel_hw_scan(mphy, vif);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_start_sched_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			struct cfg80211_sched_scan_request *req,</div><div class='add'>+			struct ieee80211_scan_ies *ies)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt76_phy *mphy = hw-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+</div><div class='add'>+	err = mt7925_mcu_sched_scan_req(mphy, vif, req, ies);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt7925_mcu_sched_scan_enable(mphy, vif, true);</div><div class='add'>+out:</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_stop_sched_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt76_phy *mphy = hw-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	err = mt7925_mcu_sched_scan_enable(mphy, vif, false);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_set_antenna(struct ieee80211_hw *hw, int radio_idx,</div><div class='add'>+		   u32 tx_ant, u32 rx_ant)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='add'>+	int max_nss = hweight8(hw-&gt;wiphy-&gt;available_antennas_tx);</div><div class='add'>+</div><div class='add'>+	if (!tx_ant || tx_ant != rx_ant || ffs(tx_ant) &gt; max_nss)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if ((BIT(hweight8(tx_ant)) - 1) != tx_ant)</div><div class='add'>+		tx_ant = BIT(ffs(tx_ant) - 1) - 1;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+</div><div class='add'>+	phy-&gt;mt76-&gt;antenna_mask = tx_ant;</div><div class='add'>+	phy-&gt;mt76-&gt;chainmask = tx_ant;</div><div class='add'>+</div><div class='add'>+	mt76_set_stream_caps(phy-&gt;mt76, true);</div><div class='add'>+	mt7925_set_stream_he_eht_caps(phy);</div><div class='add'>+</div><div class='add'>+	/* TODO: update bmc_wtbl spe_idx when antenna changes */</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int mt7925_suspend(struct ieee80211_hw *hw,</div><div class='add'>+			  struct cfg80211_wowlan *wowlan)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;phy-&gt;scan_work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;phy-&gt;mt76-&gt;mac_work);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;dev-&gt;pm.ps_work);</div><div class='add'>+	mt76_connac_free_pending_tx_skbs(&amp;dev-&gt;pm, NULL);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+</div><div class='add'>+	clear_bit(MT76_STATE_RUNNING, &amp;phy-&gt;mt76-&gt;state);</div><div class='add'>+	ieee80211_iterate_active_interfaces(hw,</div><div class='add'>+					    IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='add'>+					    mt7925_mcu_set_suspend_iter,</div><div class='add'>+					    &amp;dev-&gt;mphy);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925_resume(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+</div><div class='add'>+	set_bit(MT76_STATE_RUNNING, &amp;phy-&gt;mt76-&gt;state);</div><div class='add'>+	ieee80211_iterate_active_interfaces(hw,</div><div class='add'>+					    IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='add'>+					    mt7925_mcu_set_suspend_iter,</div><div class='add'>+					    &amp;dev-&gt;mphy);</div><div class='add'>+</div><div class='add'>+	ieee80211_queue_delayed_work(hw, &amp;phy-&gt;mt76-&gt;mac_work,</div><div class='add'>+				     MT792x_WATCHDOG_TIME);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7925_set_rekey_data(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  struct cfg80211_gtk_rekey_data *data)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	mt76_connac_mcu_update_gtk_rekey(hw, vif, data);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+</div><div class='add'>+static void mt7925_sta_set_decap_offload(struct ieee80211_hw *hw,</div><div class='add'>+					 struct ieee80211_vif *vif,</div><div class='add'>+					 struct ieee80211_sta *sta,</div><div class='add'>+					 bool enabled)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_sta *msta = (struct mt792x_sta *)sta-&gt;drv_priv;</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	unsigned long valid = mvif-&gt;valid_links;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (!msta-&gt;vif)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+</div><div class='add'>+	valid = ieee80211_vif_is_mld(vif) ? mvif-&gt;valid_links : BIT(0);</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(i, &amp;valid, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		struct mt792x_link_sta *mlink;</div><div class='add'>+</div><div class='add'>+		mlink = mt792x_sta_to_link(msta, i);</div><div class='add'>+</div><div class='add'>+		if (enabled)</div><div class='add'>+			set_bit(MT_WCID_FLAG_HDR_TRANS, &amp;mlink-&gt;wcid.flags);</div><div class='add'>+		else</div><div class='add'>+			clear_bit(MT_WCID_FLAG_HDR_TRANS, &amp;mlink-&gt;wcid.flags);</div><div class='add'>+</div><div class='add'>+		if (!mlink-&gt;wcid.sta)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mt7925_mcu_wtbl_update_hdr_trans(dev, vif, sta, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+static void __mt7925_ipv6_addr_change(struct ieee80211_hw *hw,</div><div class='add'>+				      struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				      struct inet6_dev *idev)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_bss_conf *mconf = mt792x_link_conf_to_mconf(link_conf);</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct inet6_ifaddr *ifa;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u8 idx = 0;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 bss_idx;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct mt7925_arpns_tlv arpns;</div><div class='add'>+		struct in6_addr ns_addrs[IEEE80211_BSS_ARP_ADDR_LIST_LEN];</div><div class='add'>+	} req_hdr = {</div><div class='add'>+		.hdr = {</div><div class='add'>+			.bss_idx = mconf-&gt;mt76.idx,</div><div class='add'>+		},</div><div class='add'>+		.arpns = {</div><div class='add'>+			.tag = cpu_to_le16(UNI_OFFLOAD_OFFLOAD_ND),</div><div class='add'>+			.len = cpu_to_le16(sizeof(req_hdr) - 4),</div><div class='add'>+			.enable = true,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	read_lock_bh(&amp;idev-&gt;lock);</div><div class='add'>+	list_for_each_entry(ifa, &amp;idev-&gt;addr_list, if_list) {</div><div class='add'>+		if (ifa-&gt;flags &amp; IFA_F_TENTATIVE)</div><div class='add'>+			continue;</div><div class='add'>+		req_hdr.ns_addrs[idx] = ifa-&gt;addr;</div><div class='add'>+		if (++idx &gt;= IEEE80211_BSS_ARP_ADDR_LIST_LEN)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!idx)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	req_hdr.arpns.ips_num = idx;</div><div class='add'>+</div><div class='add'>+	skb = __mt76_mcu_msg_alloc(&amp;dev-&gt;mt76, NULL, sizeof(req_hdr),</div><div class='add'>+				   0, GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb_put_data(skb, &amp;req_hdr, sizeof(req_hdr));</div><div class='add'>+</div><div class='add'>+	skb_queue_tail(&amp;dev-&gt;ipv6_ns_list, skb);</div><div class='add'>+</div><div class='add'>+	ieee80211_queue_work(dev-&gt;mt76.hw, &amp;dev-&gt;ipv6_ns_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7925_ipv6_addr_change(struct ieee80211_hw *hw,</div><div class='add'>+				    struct ieee80211_vif *vif,</div><div class='add'>+				    struct inet6_dev *idev)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	unsigned long valid = ieee80211_vif_is_mld(vif) ?</div><div class='add'>+			      mvif-&gt;valid_links : BIT(0);</div><div class='add'>+	struct ieee80211_bss_conf *bss_conf;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(i, &amp;valid, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		bss_conf = mt792x_vif_to_bss_conf(vif, i);</div><div class='add'>+		__mt7925_ipv6_addr_change(hw, bss_conf, idev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int mt7925_set_tx_sar_pwr(struct ieee80211_hw *hw,</div><div class='add'>+			  const struct cfg80211_sar_specs *sar)</div><div class='add'>+{</div><div class='add'>+	struct mt76_phy *mphy = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (sar) {</div><div class='add'>+		int err = mt76_init_sar_power(hw, sar);</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	mt792x_init_acpi_sar_power(mt792x_hw_phy(hw), !sar);</div><div class='add'>+</div><div class='add'>+	return mt7925_mcu_set_rate_txpower(mphy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925_set_sar_specs(struct ieee80211_hw *hw,</div><div class='add'>+				const struct cfg80211_sar_specs *sar)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	err = mt7925_set_tx_sar_pwr(hw, sar);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_channel_switch_beacon(struct ieee80211_hw *hw,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     struct cfg80211_chan_def *chandef)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	mt7925_mcu_uni_add_beacon_offload(dev, hw, vif, true);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+	       unsigned int link_id, u16 queue,</div><div class='add'>+	       const struct ieee80211_tx_queue_params *params)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_bss_conf *mconf = mt792x_vif_to_link(mvif, link_id);</div><div class='add'>+	static const u8 mq_to_aci[] = {</div><div class='add'>+		    [IEEE80211_AC_VO] = 3,</div><div class='add'>+		    [IEEE80211_AC_VI] = 2,</div><div class='add'>+		    [IEEE80211_AC_BE] = 0,</div><div class='add'>+		    [IEEE80211_AC_BK] = 1,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* firmware uses access class index */</div><div class='add'>+	mconf-&gt;queue_params[mq_to_aci[queue]] = *params;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+</div><div class='add'>+	err = mt7925_mcu_add_bss_info(&amp;dev-&gt;phy, mvif-&gt;bss_conf.mt76.ctx,</div><div class='add'>+				      link_conf, NULL, true);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt7925_mcu_set_bss_pm(dev, link_conf, true);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt7925_mcu_sta_update(dev, NULL, vif, true,</div><div class='add'>+				    MT76_STA_INFO_STATE_NONE);</div><div class='add'>+out:</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_stop_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+	       struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+</div><div class='add'>+	err = mt7925_mcu_set_bss_pm(dev, link_conf, false);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mt7925_mcu_add_bss_info(&amp;dev-&gt;phy, mvif-&gt;bss_conf.mt76.ctx, link_conf,</div><div class='add'>+				NULL, false);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_add_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+		   struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_remove_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+		      struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_change_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+		      struct ieee80211_chanctx_conf *ctx,</div><div class='add'>+		      u32 changed)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_chanctx *mctx = (struct mt792x_chanctx *)ctx-&gt;drv_priv;</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='add'>+	struct mt792x_bss_conf *mconf;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct mt792x_vif *mvif;</div><div class='add'>+</div><div class='add'>+	if (!mctx-&gt;bss_conf)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mconf = mctx-&gt;bss_conf;</div><div class='add'>+	mvif = mconf-&gt;vif;</div><div class='add'>+	vif = container_of((void *)mvif, struct ieee80211_vif, drv_priv);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(phy-&gt;dev);</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_MONITOR) {</div><div class='add'>+		mt7925_mcu_set_sniffer(mvif-&gt;phy-&gt;dev, vif, true);</div><div class='add'>+		mt7925_mcu_config_sniffer(mvif, ctx);</div><div class='add'>+	} else {</div><div class='add'>+		if (ieee80211_vif_is_mld(vif)) {</div><div class='add'>+			unsigned long valid = mvif-&gt;valid_links;</div><div class='add'>+			u8 i;</div><div class='add'>+</div><div class='add'>+			for_each_set_bit(i, &amp;valid, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+				mconf = mt792x_vif_to_link(mvif, i);</div><div class='add'>+				if (mconf &amp;&amp; mconf-&gt;mt76.ctx == ctx)</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+		} else {</div><div class='add'>+			mconf = &amp;mvif-&gt;bss_conf;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (mconf) {</div><div class='add'>+			struct ieee80211_bss_conf *link_conf;</div><div class='add'>+</div><div class='add'>+			link_conf = mt792x_vif_to_bss_conf(vif, mconf-&gt;link_id);</div><div class='add'>+			mt7925_mcu_set_chctx(mvif-&gt;phy-&gt;mt76, &amp;mconf-&gt;mt76,</div><div class='add'>+					     link_conf, ctx);</div><div class='add'>+</div><div class='add'>+			if (changed &amp; IEEE80211_CHANCTX_CHANGE_PUNCTURING)</div><div class='add'>+				mt7925_mcu_set_eht_pp(mvif-&gt;phy-&gt;mt76, &amp;mconf-&gt;mt76,</div><div class='add'>+						      link_conf, ctx);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_release(phy-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7925_mgd_prepare_tx(struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  struct ieee80211_prep_tx_info *info)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	u16 duration = info-&gt;duration ? info-&gt;duration :</div><div class='add'>+		       jiffies_to_msecs(HZ);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	mt7925_set_roc(mvif-&gt;phy, &amp;mvif-&gt;bss_conf,</div><div class='add'>+		       mvif-&gt;bss_conf.mt76.ctx-&gt;def.chan, duration,</div><div class='add'>+		       MT7925_ROC_REQ_JOIN);</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7925_mgd_complete_tx(struct ieee80211_hw *hw,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   struct ieee80211_prep_tx_info *info)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	mt7925_abort_roc(mvif-&gt;phy, &amp;mvif-&gt;bss_conf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7925_vif_cfg_changed(struct ieee80211_hw *hw,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   u64 changed)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	unsigned long valid = ieee80211_vif_is_mld(vif) ?</div><div class='add'>+				      mvif-&gt;valid_links : BIT(0);</div><div class='add'>+	struct ieee80211_bss_conf *bss_conf;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_ASSOC) {</div><div class='add'>+		mt7925_mcu_sta_update(dev, NULL, vif, true,</div><div class='add'>+				      MT76_STA_INFO_STATE_ASSOC);</div><div class='add'>+		mt7925_mcu_set_beacon_filter(dev, vif, vif-&gt;cfg.assoc);</div><div class='add'>+</div><div class='add'>+		if (ieee80211_vif_is_mld(vif))</div><div class='add'>+			mvif-&gt;mlo_pm_state = MT792x_MLO_LINK_ASSOC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_ARP_FILTER) {</div><div class='add'>+		for_each_set_bit(i, &amp;valid, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+			bss_conf = mt792x_vif_to_bss_conf(vif, i);</div><div class='add'>+			mt7925_mcu_update_arp_filter(&amp;dev-&gt;mt76, bss_conf);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_PS) {</div><div class='add'>+		if (hweight16(mvif-&gt;valid_links) &lt; 2) {</div><div class='add'>+			/* legacy */</div><div class='add'>+			bss_conf = &amp;vif-&gt;bss_conf;</div><div class='add'>+			mt7925_mcu_uni_bss_ps(dev, bss_conf);</div><div class='add'>+		} else {</div><div class='add'>+			if (mvif-&gt;mlo_pm_state == MT792x_MLO_LINK_ASSOC) {</div><div class='add'>+				mvif-&gt;mlo_pm_state = MT792x_MLO_CHANGED_PS_PENDING;</div><div class='add'>+			} else if (mvif-&gt;mlo_pm_state == MT792x_MLO_CHANGED_PS) {</div><div class='add'>+				for_each_set_bit(i, &amp;valid, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+					bss_conf = mt792x_vif_to_bss_conf(vif, i);</div><div class='add'>+					mt7925_mcu_uni_bss_ps(dev, bss_conf);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7925_link_info_changed(struct ieee80211_hw *hw,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     struct ieee80211_bss_conf *info,</div><div class='add'>+				     u64 changed)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt792x_bss_conf *mconf;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+</div><div class='add'>+	mconf = mt792x_vif_to_link(mvif, info-&gt;link_id);</div><div class='add'>+	link_conf = mt792x_vif_to_bss_conf(vif, mconf-&gt;link_id);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_ERP_SLOT) {</div><div class='add'>+		int slottime = info-&gt;use_short_slot ? 9 : 20;</div><div class='add'>+</div><div class='add'>+		if (slottime != phy-&gt;slottime) {</div><div class='add'>+			phy-&gt;slottime = slottime;</div><div class='add'>+			mt7925_mcu_set_timing(phy, info);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_MCAST_RATE)</div><div class='add'>+		mconf-&gt;mt76.mcast_rates_idx =</div><div class='add'>+				mt7925_get_rates_table(hw, vif, false, true);</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_BASIC_RATES)</div><div class='add'>+		mconf-&gt;mt76.basic_rates_idx =</div><div class='add'>+				mt7925_get_rates_table(hw, vif, false, false);</div><div class='add'>+</div><div class='add'>+	if (changed &amp; (BSS_CHANGED_BEACON |</div><div class='add'>+		       BSS_CHANGED_BEACON_ENABLED)) {</div><div class='add'>+		mconf-&gt;mt76.beacon_rates_idx =</div><div class='add'>+				mt7925_get_rates_table(hw, vif, true, false);</div><div class='add'>+</div><div class='add'>+		mt7925_mcu_uni_add_beacon_offload(dev, hw, vif,</div><div class='add'>+						  info-&gt;enable_beacon);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ensure that enable txcmd_mode after bss_info */</div><div class='add'>+	if (changed &amp; (BSS_CHANGED_QOS | BSS_CHANGED_BEACON_ENABLED))</div><div class='add'>+		mt7925_mcu_set_tx(dev, info);</div><div class='add'>+</div><div class='add'>+	if (mvif-&gt;mlo_pm_state == MT792x_MLO_CHANGED_PS_PENDING) {</div><div class='add'>+		/* Indicate the secondary setup done */</div><div class='add'>+		mt7925_mcu_uni_bss_bcnft(dev, info, true);</div><div class='add'>+</div><div class='add'>+		ieee80211_queue_delayed_work(hw, &amp;dev-&gt;mlo_pm_work, 5 * HZ);</div><div class='add'>+		mvif-&gt;mlo_pm_state = MT792x_MLO_CHANGED_PS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; IEEE80211_CHANCTX_CHANGE_PUNCTURING)</div><div class='add'>+		mt7925_mcu_set_eht_pp(mvif-&gt;phy-&gt;mt76, &amp;mconf-&gt;mt76,</div><div class='add'>+				      link_conf, NULL);</div><div class='add'>+</div><div class='add'>+	if (changed &amp; BSS_CHANGED_CQM)</div><div class='add'>+		mt7925_mcu_set_rssimonitor(dev, vif);</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_change_vif_links(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			u16 old_links, u16 new_links,</div><div class='add'>+			struct ieee80211_bss_conf *old[IEEE80211_MLD_MAX_NUM_LINKS])</div><div class='add'>+{</div><div class='add'>+	struct mt792x_bss_conf *mconfs[IEEE80211_MLD_MAX_NUM_LINKS] = {}, *mconf;</div><div class='add'>+	struct mt792x_link_sta *mlinks[IEEE80211_MLD_MAX_NUM_LINKS] = {}, *mlink;</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	unsigned long add = new_links &amp; ~old_links;</div><div class='add'>+	unsigned long rem = old_links &amp; ~new_links;</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (old_links == new_links)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(link_id, &amp;rem, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		mconf = mt792x_vif_to_link(mvif, link_id);</div><div class='add'>+		mlink = mt792x_sta_to_link(&amp;mvif-&gt;sta, link_id);</div><div class='add'>+</div><div class='add'>+		if (!mconf || !mlink)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (mconf != &amp;mvif-&gt;bss_conf) {</div><div class='add'>+			mt792x_mac_link_bss_remove(dev, mconf, mlink);</div><div class='add'>+			devm_kfree(dev-&gt;mt76.dev, mconf);</div><div class='add'>+			devm_kfree(dev-&gt;mt76.dev, mlink);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rcu_assign_pointer(mvif-&gt;link_conf[link_id], NULL);</div><div class='add'>+		rcu_assign_pointer(mvif-&gt;sta.link[link_id], NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(link_id, &amp;add, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		if (!old_links) {</div><div class='add'>+			mvif-&gt;deflink_id = link_id;</div><div class='add'>+			mconf = &amp;mvif-&gt;bss_conf;</div><div class='add'>+			mlink = &amp;mvif-&gt;sta.deflink;</div><div class='add'>+		} else {</div><div class='add'>+			mconf = devm_kzalloc(dev-&gt;mt76.dev, sizeof(*mconf),</div><div class='add'>+					     GFP_KERNEL);</div><div class='add'>+			mlink = devm_kzalloc(dev-&gt;mt76.dev, sizeof(*mlink),</div><div class='add'>+					     GFP_KERNEL);</div><div class='add'>+			if (!mconf || !mlink) {</div><div class='add'>+				mt792x_mutex_release(dev);</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mconfs[link_id] = mconf;</div><div class='add'>+		mlinks[link_id] = mlink;</div><div class='add'>+		mconf-&gt;link_id = link_id;</div><div class='add'>+		mconf-&gt;vif = mvif;</div><div class='add'>+		mlink-&gt;wcid.link_id = link_id;</div><div class='add'>+		mlink-&gt;wcid.link_valid = !!vif-&gt;valid_links;</div><div class='add'>+		mlink-&gt;wcid.def_wcid = &amp;mvif-&gt;sta.deflink.wcid;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hweight16(mvif-&gt;valid_links) == 0)</div><div class='add'>+		mt792x_mac_link_bss_remove(dev, &amp;mvif-&gt;bss_conf,</div><div class='add'>+					   &amp;mvif-&gt;sta.deflink);</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(link_id, &amp;add, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		mconf = mconfs[link_id];</div><div class='add'>+		mlink = mlinks[link_id];</div><div class='add'>+		link_conf = mt792x_vif_to_bss_conf(vif, link_id);</div><div class='add'>+</div><div class='add'>+		rcu_assign_pointer(mvif-&gt;link_conf[link_id], mconf);</div><div class='add'>+		rcu_assign_pointer(mvif-&gt;sta.link[link_id], mlink);</div><div class='add'>+</div><div class='add'>+		err = mt7925_mac_link_bss_add(dev, link_conf, mlink);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto free;</div><div class='add'>+</div><div class='add'>+		if (mconf != &amp;mvif-&gt;bss_conf) {</div><div class='add'>+			err = mt7925_set_mlo_roc(phy, &amp;mvif-&gt;bss_conf,</div><div class='add'>+						 vif-&gt;active_links);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto free;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mvif-&gt;valid_links = new_links;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free:</div><div class='add'>+	for_each_set_bit(link_id, &amp;add, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		rcu_assign_pointer(mvif-&gt;link_conf[link_id], NULL);</div><div class='add'>+		rcu_assign_pointer(mvif-&gt;sta.link[link_id], NULL);</div><div class='add'>+</div><div class='add'>+		if (mconf != &amp;mvif-&gt;bss_conf)</div><div class='add'>+			devm_kfree(dev-&gt;mt76.dev, mconfs[link_id]);</div><div class='add'>+		if (mlink != &amp;mvif-&gt;sta.deflink)</div><div class='add'>+			devm_kfree(dev-&gt;mt76.dev, mlinks[link_id]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_change_sta_links(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_sta *sta, u16 old_links, u16 new_links)</div><div class='add'>+{</div><div class='add'>+	unsigned long add = new_links &amp; ~old_links;</div><div class='add'>+	unsigned long rem = old_links &amp; ~new_links;</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (old_links == new_links)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+</div><div class='add'>+	err = mt7925_mac_sta_remove_links(dev, vif, sta, rem);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt7925_mac_sta_add_links(dev, vif, sta, add);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925_assign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     struct ieee80211_bss_conf *link_conf,</div><div class='add'>+				     struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_chanctx *mctx = (struct mt792x_chanctx *)ctx-&gt;drv_priv;</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct ieee80211_bss_conf *pri_link_conf;</div><div class='add'>+	struct mt792x_bss_conf *mconf;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_is_mld(vif)) {</div><div class='add'>+		mconf = mt792x_vif_to_link(mvif, link_conf-&gt;link_id);</div><div class='add'>+		pri_link_conf = mt792x_vif_to_bss_conf(vif, mvif-&gt;deflink_id);</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+		    mconf == &amp;mvif-&gt;bss_conf)</div><div class='add'>+			mt7925_mcu_add_bss_info(&amp;dev-&gt;phy, NULL, pri_link_conf,</div><div class='add'>+						NULL, true);</div><div class='add'>+	} else {</div><div class='add'>+		mconf = &amp;mvif-&gt;bss_conf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mconf-&gt;mt76.ctx = ctx;</div><div class='add'>+	mctx-&gt;bss_conf = mconf;</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7925_unassign_vif_chanctx(struct ieee80211_hw *hw,</div><div class='add'>+					struct ieee80211_vif *vif,</div><div class='add'>+					struct ieee80211_bss_conf *link_conf,</div><div class='add'>+					struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_chanctx *mctx = (struct mt792x_chanctx *)ctx-&gt;drv_priv;</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt792x_bss_conf *mconf;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_is_mld(vif)) {</div><div class='add'>+		mconf = mt792x_vif_to_link(mvif, link_conf-&gt;link_id);</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+		    mconf == &amp;mvif-&gt;bss_conf)</div><div class='add'>+			mt7925_mcu_add_bss_info(&amp;dev-&gt;phy, NULL, link_conf,</div><div class='add'>+						NULL, false);</div><div class='add'>+	} else {</div><div class='add'>+		mconf = &amp;mvif-&gt;bss_conf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mctx-&gt;bss_conf = NULL;</div><div class='add'>+	mconf-&gt;mt76.ctx = NULL;</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7925_rfkill_poll(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_phy *phy = mt792x_hw_phy(hw);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(phy-&gt;dev);</div><div class='add'>+	ret = mt7925_mcu_wf_rf_pin_ctrl(phy);</div><div class='add'>+	mt792x_mutex_release(phy-&gt;dev);</div><div class='add'>+</div><div class='add'>+	wiphy_rfkill_set_hw_state(hw-&gt;wiphy, ret == 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ieee80211_ops mt7925_ops = {</div><div class='add'>+	.tx = mt792x_tx,</div><div class='add'>+	.start = mt7925_start,</div><div class='add'>+	.stop = mt792x_stop,</div><div class='add'>+	.add_interface = mt7925_add_interface,</div><div class='add'>+	.remove_interface = mt792x_remove_interface,</div><div class='add'>+	.config = mt7925_config,</div><div class='add'>+	.conf_tx = mt7925_conf_tx,</div><div class='add'>+	.configure_filter = mt7925_configure_filter,</div><div class='add'>+	.start_ap = mt7925_start_ap,</div><div class='add'>+	.stop_ap = mt7925_stop_ap,</div><div class='add'>+	.sta_state = mt76_sta_state,</div><div class='add'>+	.sta_pre_rcu_remove = mt76_sta_pre_rcu_remove,</div><div class='add'>+	.set_key = mt7925_set_key,</div><div class='add'>+	.sta_set_decap_offload = mt7925_sta_set_decap_offload,</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	.ipv6_addr_change = mt7925_ipv6_addr_change,</div><div class='add'>+#endif /* CONFIG_IPV6 */</div><div class='add'>+	.ampdu_action = mt7925_ampdu_action,</div><div class='add'>+	.set_rts_threshold = mt7925_set_rts_threshold,</div><div class='add'>+	.wake_tx_queue = mt76_wake_tx_queue,</div><div class='add'>+	.release_buffered_frames = mt76_release_buffered_frames,</div><div class='add'>+	.channel_switch_beacon = mt7925_channel_switch_beacon,</div><div class='add'>+	.get_txpower = mt76_get_txpower,</div><div class='add'>+	.get_stats = mt792x_get_stats,</div><div class='add'>+	.get_et_sset_count = mt792x_get_et_sset_count,</div><div class='add'>+	.get_et_strings = mt792x_get_et_strings,</div><div class='add'>+	.get_et_stats = mt792x_get_et_stats,</div><div class='add'>+	.get_tsf = mt792x_get_tsf,</div><div class='add'>+	.set_tsf = mt792x_set_tsf,</div><div class='add'>+	.get_survey = mt76_get_survey,</div><div class='add'>+	.get_antenna = mt76_get_antenna,</div><div class='add'>+	.set_antenna = mt7925_set_antenna,</div><div class='add'>+	.set_coverage_class = mt792x_set_coverage_class,</div><div class='add'>+	.hw_scan = mt7925_hw_scan,</div><div class='add'>+	.cancel_hw_scan = mt7925_cancel_hw_scan,</div><div class='add'>+	.sta_statistics = mt792x_sta_statistics,</div><div class='add'>+	.sched_scan_start = mt7925_start_sched_scan,</div><div class='add'>+	.sched_scan_stop = mt7925_stop_sched_scan,</div><div class='add'>+	CFG80211_TESTMODE_CMD(mt7925_testmode_cmd)</div><div class='add'>+	CFG80211_TESTMODE_DUMP(mt7925_testmode_dump)</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = mt7925_suspend,</div><div class='add'>+	.resume = mt7925_resume,</div><div class='add'>+	.set_wakeup = mt792x_set_wakeup,</div><div class='add'>+	.set_rekey_data = mt7925_set_rekey_data,</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+	.flush = mt792x_flush,</div><div class='add'>+	.set_sar_specs = mt7925_set_sar_specs,</div><div class='add'>+	.remain_on_channel = mt7925_remain_on_channel,</div><div class='add'>+	.cancel_remain_on_channel = mt7925_cancel_remain_on_channel,</div><div class='add'>+	.add_chanctx = mt7925_add_chanctx,</div><div class='add'>+	.remove_chanctx = mt7925_remove_chanctx,</div><div class='add'>+	.change_chanctx = mt7925_change_chanctx,</div><div class='add'>+	.assign_vif_chanctx = mt7925_assign_vif_chanctx,</div><div class='add'>+	.unassign_vif_chanctx = mt7925_unassign_vif_chanctx,</div><div class='add'>+	.mgd_prepare_tx = mt7925_mgd_prepare_tx,</div><div class='add'>+	.mgd_complete_tx = mt7925_mgd_complete_tx,</div><div class='add'>+	.vif_cfg_changed = mt7925_vif_cfg_changed,</div><div class='add'>+	.link_info_changed = mt7925_link_info_changed,</div><div class='add'>+	.change_vif_links = mt7925_change_vif_links,</div><div class='add'>+	.change_sta_links = mt7925_change_sta_links,</div><div class='add'>+	.rfkill_poll = mt7925_rfkill_poll,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_ops);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Deren Wu &lt;deren.wu@mediatek.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("MediaTek MT7925 core driver");</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c<br/>new file mode 100644<br/>index 000000000000..cf0fdea45cf7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7925/mcu.c</a></div><div class='hunk'>@@ -0,0 +1,3903 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/* Copyright (C) 2023 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include "mt7925.h"</div><div class='add'>+#include "regd.h"</div><div class='add'>+#include "mcu.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+</div><div class='add'>+#define MT_STA_BFER			BIT(0)</div><div class='add'>+#define MT_STA_BFEE			BIT(1)</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_parse_response(struct mt76_dev *mdev, int cmd,</div><div class='add'>+			      struct sk_buff *skb, int seq)</div><div class='add'>+{</div><div class='add'>+	int mcu_cmd = FIELD_GET(__MCU_CMD_FIELD_ID, cmd);</div><div class='add'>+	struct mt7925_mcu_rxd *rxd;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!skb) {</div><div class='add'>+		dev_err(mdev-&gt;dev, "Message %08x (seq %d) timeout\n", cmd, seq);</div><div class='add'>+		mt792x_reset(mdev);</div><div class='add'>+</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rxd = (struct mt7925_mcu_rxd *)skb-&gt;data;</div><div class='add'>+	if (seq != rxd-&gt;seq)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	if (cmd == MCU_CMD(PATCH_SEM_CONTROL) ||</div><div class='add'>+	    cmd == MCU_CMD(PATCH_FINISH_REQ)) {</div><div class='add'>+		skb_pull(skb, sizeof(*rxd) - 4);</div><div class='add'>+		ret = *skb-&gt;data;</div><div class='add'>+	} else if (cmd == MCU_UNI_CMD(DEV_INFO_UPDATE) ||</div><div class='add'>+		   cmd == MCU_UNI_CMD(BSS_INFO_UPDATE) ||</div><div class='add'>+		   cmd == MCU_UNI_CMD(STA_REC_UPDATE) ||</div><div class='add'>+		   cmd == MCU_UNI_CMD(OFFLOAD) ||</div><div class='add'>+		   cmd == MCU_UNI_CMD(SUSPEND)) {</div><div class='add'>+		struct mt7925_mcu_uni_event *event;</div><div class='add'>+</div><div class='add'>+		skb_pull(skb, sizeof(*rxd));</div><div class='add'>+		event = (struct mt7925_mcu_uni_event *)skb-&gt;data;</div><div class='add'>+		ret = le32_to_cpu(event-&gt;status);</div><div class='add'>+		/* skip invalid event */</div><div class='add'>+		if (mcu_cmd != event-&gt;cid)</div><div class='add'>+			ret = -EAGAIN;</div><div class='add'>+	} else {</div><div class='add'>+		skb_pull(skb, sizeof(*rxd));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_mcu_parse_response);</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_regval(struct mt792x_dev *dev, u32 regidx, u32 *val, bool set)</div><div class='add'>+{</div><div class='add'>+#define MT_RF_REG_HDR           GENMASK(31, 24)</div><div class='add'>+#define MT_RF_REG_ANT           GENMASK(23, 16)</div><div class='add'>+#define RF_REG_PREFIX           0x99</div><div class='add'>+	struct {</div><div class='add'>+		u8 __rsv[4];</div><div class='add'>+		union {</div><div class='add'>+			struct uni_cmd_access_reg_basic {</div><div class='add'>+				__le16 tag;</div><div class='add'>+				__le16 len;</div><div class='add'>+				__le32 idx;</div><div class='add'>+				__le32 data;</div><div class='add'>+			} __packed reg;</div><div class='add'>+			struct uni_cmd_access_rf_reg_basic {</div><div class='add'>+				__le16 tag;</div><div class='add'>+				__le16 len;</div><div class='add'>+				__le16 ant;</div><div class='add'>+				u8 __rsv[2];</div><div class='add'>+				__le32 idx;</div><div class='add'>+				__le32 data;</div><div class='add'>+			} __packed rf_reg;</div><div class='add'>+		};</div><div class='add'>+	} __packed * res, req;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (u32_get_bits(regidx, MT_RF_REG_HDR) == RF_REG_PREFIX) {</div><div class='add'>+		req.rf_reg.tag = cpu_to_le16(UNI_CMD_ACCESS_RF_REG_BASIC);</div><div class='add'>+		req.rf_reg.len = cpu_to_le16(sizeof(req.rf_reg));</div><div class='add'>+		req.rf_reg.ant = cpu_to_le16(u32_get_bits(regidx, MT_RF_REG_ANT));</div><div class='add'>+		req.rf_reg.idx = cpu_to_le32(regidx);</div><div class='add'>+		req.rf_reg.data = set ? cpu_to_le32(*val) : 0;</div><div class='add'>+	} else {</div><div class='add'>+		req.reg.tag = cpu_to_le16(UNI_CMD_ACCESS_REG_BASIC);</div><div class='add'>+		req.reg.len = cpu_to_le16(sizeof(req.reg));</div><div class='add'>+		req.reg.idx = cpu_to_le32(regidx);</div><div class='add'>+		req.reg.data = set ? cpu_to_le32(*val) : 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (set)</div><div class='add'>+		return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_WM_UNI_CMD(REG_ACCESS),</div><div class='add'>+					 &amp;req, sizeof(req), true);</div><div class='add'>+</div><div class='add'>+	ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76,</div><div class='add'>+					MCU_WM_UNI_CMD_QUERY(REG_ACCESS),</div><div class='add'>+					&amp;req, sizeof(req), true, &amp;skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	res = (void *)skb-&gt;data;</div><div class='add'>+	if (u32_get_bits(regidx, MT_RF_REG_HDR) == RF_REG_PREFIX)</div><div class='add'>+		*val = le32_to_cpu(res-&gt;rf_reg.data);</div><div class='add'>+	else</div><div class='add'>+		*val = le32_to_cpu(res-&gt;reg.data);</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_mcu_regval);</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_update_arp_filter(struct mt76_dev *dev,</div><div class='add'>+				 struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_bss_conf *mconf = mt792x_link_conf_to_mconf(link_conf);</div><div class='add'>+	struct ieee80211_vif *mvif = link_conf-&gt;vif;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int i, len = min_t(int, mvif-&gt;cfg.arp_addr_cnt,</div><div class='add'>+			   IEEE80211_BSS_ARP_ADDR_LIST_LEN);</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 bss_idx;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct mt7925_arpns_tlv arp;</div><div class='add'>+	} req = {</div><div class='add'>+		.hdr = {</div><div class='add'>+			.bss_idx = mconf-&gt;mt76.idx,</div><div class='add'>+		},</div><div class='add'>+		.arp = {</div><div class='add'>+			.tag = cpu_to_le16(UNI_OFFLOAD_OFFLOAD_ARP),</div><div class='add'>+			.len = cpu_to_le16(sizeof(req) - 4 + len * 2 * sizeof(__be32)),</div><div class='add'>+			.ips_num = len,</div><div class='add'>+			.enable = true,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	skb = mt76_mcu_msg_alloc(dev, NULL, sizeof(req) + len * 2 * sizeof(__be32));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	skb_put_data(skb, &amp;req, sizeof(req));</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		skb_put_data(skb, &amp;mvif-&gt;cfg.arp_addr_list[i], sizeof(__be32));</div><div class='add'>+		skb_put_zero(skb, sizeof(__be32));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_skb_send_msg(dev, skb, MCU_UNI_CMD(OFFLOAD), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int</div><div class='add'>+mt7925_connac_mcu_set_wow_ctrl(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='add'>+			       bool suspend, struct cfg80211_wowlan *wowlan)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct ieee80211_scan_ies ies = {};</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 bss_idx;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct mt76_connac_wow_ctrl_tlv wow_ctrl_tlv;</div><div class='add'>+		struct mt76_connac_wow_gpio_param_tlv gpio_tlv;</div><div class='add'>+	} req = {</div><div class='add'>+		.hdr = {</div><div class='add'>+			.bss_idx = mvif-&gt;idx,</div><div class='add'>+		},</div><div class='add'>+		.wow_ctrl_tlv = {</div><div class='add'>+			.tag = cpu_to_le16(UNI_SUSPEND_WOW_CTRL),</div><div class='add'>+			.len = cpu_to_le16(sizeof(struct mt76_connac_wow_ctrl_tlv)),</div><div class='add'>+			.cmd = suspend ? 1 : 2,</div><div class='add'>+		},</div><div class='add'>+		.gpio_tlv = {</div><div class='add'>+			.tag = cpu_to_le16(UNI_SUSPEND_WOW_GPIO_PARAM),</div><div class='add'>+			.len = cpu_to_le16(sizeof(struct mt76_connac_wow_gpio_param_tlv)),</div><div class='add'>+			.gpio_pin = 0xff, /* follow fw about GPIO pin */</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (wowlan-&gt;magic_pkt)</div><div class='add'>+		req.wow_ctrl_tlv.trigger |= UNI_WOW_DETECT_TYPE_MAGIC;</div><div class='add'>+	if (wowlan-&gt;disconnect)</div><div class='add'>+		req.wow_ctrl_tlv.trigger |= (UNI_WOW_DETECT_TYPE_DISCONNECT |</div><div class='add'>+					     UNI_WOW_DETECT_TYPE_BCN_LOST);</div><div class='add'>+	if (wowlan-&gt;nd_config) {</div><div class='add'>+		mt7925_mcu_sched_scan_req(phy, vif, wowlan-&gt;nd_config, &amp;ies);</div><div class='add'>+		req.wow_ctrl_tlv.trigger |= UNI_WOW_DETECT_TYPE_SCH_SCAN_HIT;</div><div class='add'>+		mt7925_mcu_sched_scan_enable(phy, vif, suspend);</div><div class='add'>+	}</div><div class='add'>+	if (wowlan-&gt;n_patterns)</div><div class='add'>+		req.wow_ctrl_tlv.trigger |= UNI_WOW_DETECT_TYPE_BITMAP;</div><div class='add'>+</div><div class='add'>+	if (mt76_is_mmio(dev))</div><div class='add'>+		req.wow_ctrl_tlv.wakeup_hif = WOW_PCIE;</div><div class='add'>+	else if (mt76_is_usb(dev))</div><div class='add'>+		req.wow_ctrl_tlv.wakeup_hif = WOW_USB;</div><div class='add'>+	else if (mt76_is_sdio(dev))</div><div class='add'>+		req.wow_ctrl_tlv.wakeup_hif = WOW_GPIO;</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(dev, MCU_UNI_CMD(SUSPEND), &amp;req,</div><div class='add'>+				 sizeof(req), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_mcu_set_wow_pattern(struct mt76_dev *dev,</div><div class='add'>+			   struct ieee80211_vif *vif,</div><div class='add'>+			   u8 index, bool enable,</div><div class='add'>+			   struct cfg80211_pkt_pattern *pattern)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7925_wow_pattern_tlv *tlv;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct {</div><div class='add'>+		u8 bss_idx;</div><div class='add'>+		u8 pad[3];</div><div class='add'>+	} __packed hdr = {</div><div class='add'>+		.bss_idx = mvif-&gt;idx,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	skb = mt76_mcu_msg_alloc(dev, NULL, sizeof(hdr) + sizeof(*tlv));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	skb_put_data(skb, &amp;hdr, sizeof(hdr));</div><div class='add'>+	tlv = (struct mt7925_wow_pattern_tlv *)skb_put(skb, sizeof(*tlv));</div><div class='add'>+	tlv-&gt;tag = cpu_to_le16(UNI_SUSPEND_WOW_PATTERN);</div><div class='add'>+	tlv-&gt;len = cpu_to_le16(sizeof(*tlv));</div><div class='add'>+	tlv-&gt;bss_idx = 0xF;</div><div class='add'>+	tlv-&gt;data_len = pattern-&gt;pattern_len;</div><div class='add'>+	tlv-&gt;enable = enable;</div><div class='add'>+	tlv-&gt;index = index;</div><div class='add'>+	tlv-&gt;offset = 0;</div><div class='add'>+</div><div class='add'>+	memcpy(tlv-&gt;pattern, pattern-&gt;pattern, pattern-&gt;pattern_len);</div><div class='add'>+	memcpy(tlv-&gt;mask, pattern-&gt;mask, DIV_ROUND_UP(pattern-&gt;pattern_len, 8));</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_skb_send_msg(dev, skb, MCU_UNI_CMD(SUSPEND), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7925_mcu_set_suspend_iter(void *priv, u8 *mac,</div><div class='add'>+				 struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt76_phy *phy = priv;</div><div class='add'>+	bool suspend = !test_bit(MT76_STATE_RUNNING, &amp;phy-&gt;state);</div><div class='add'>+	struct ieee80211_hw *hw = phy-&gt;hw;</div><div class='add'>+	struct cfg80211_wowlan *wowlan = hw-&gt;wiphy-&gt;wowlan_config;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mt76_connac_mcu_set_gtk_rekey(phy-&gt;dev, vif, suspend);</div><div class='add'>+</div><div class='add'>+	mt76_connac_mcu_set_suspend_mode(phy-&gt;dev, vif, suspend, 1, true);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; wowlan-&gt;n_patterns; i++)</div><div class='add'>+		mt7925_mcu_set_wow_pattern(phy-&gt;dev, vif, i, suspend,</div><div class='add'>+					   &amp;wowlan-&gt;patterns[i]);</div><div class='add'>+	mt7925_connac_mcu_set_wow_ctrl(phy, vif, suspend, wowlan);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_connection_loss_iter(void *priv, u8 *mac,</div><div class='add'>+				struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7925_uni_beacon_loss_event *event = priv;</div><div class='add'>+</div><div class='add'>+	if (mvif-&gt;idx != event-&gt;hdr.bss_idx)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!(vif-&gt;driver_flags &amp; IEEE80211_VIF_BEACON_FILTER) ||</div><div class='add'>+	    vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ieee80211_connection_loss(vif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_connection_loss_event(struct mt792x_dev *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct mt7925_uni_beacon_loss_event *event;</div><div class='add'>+	struct mt76_phy *mphy = &amp;dev-&gt;mt76.phy;</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, sizeof(struct mt7925_mcu_rxd));</div><div class='add'>+	event = (struct mt7925_uni_beacon_loss_event *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	ieee80211_iterate_active_interfaces_atomic(mphy-&gt;hw,</div><div class='add'>+					IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='add'>+					mt7925_mcu_connection_loss_iter, event);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_roc_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt7925_roc_grant_tlv *grant = priv;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_vif_is_mld(vif) &amp;&amp; vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (mvif-&gt;idx != grant-&gt;bss_idx)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mvif-&gt;band_idx = grant-&gt;dbdcband;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7925_mcu_roc_handle_grant(struct mt792x_dev *dev,</div><div class='add'>+					struct tlv *tlv)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = dev-&gt;mt76.hw;</div><div class='add'>+	struct mt7925_roc_grant_tlv *grant;</div><div class='add'>+	int duration;</div><div class='add'>+</div><div class='add'>+	grant = (struct mt7925_roc_grant_tlv *)tlv;</div><div class='add'>+</div><div class='add'>+	/* should never happen */</div><div class='add'>+	WARN_ON_ONCE((le16_to_cpu(grant-&gt;tag) != UNI_EVENT_ROC_GRANT));</div><div class='add'>+</div><div class='add'>+	if (grant-&gt;reqtype == MT7925_ROC_REQ_ROC)</div><div class='add'>+		ieee80211_ready_on_channel(hw);</div><div class='add'>+	else if (grant-&gt;reqtype == MT7925_ROC_REQ_JOIN)</div><div class='add'>+		ieee80211_iterate_active_interfaces_atomic(hw,</div><div class='add'>+						IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='add'>+						mt7925_mcu_roc_iter, grant);</div><div class='add'>+	dev-&gt;phy.roc_grant = true;</div><div class='add'>+	wake_up(&amp;dev-&gt;phy.roc_wait);</div><div class='add'>+	duration = le32_to_cpu(grant-&gt;max_interval);</div><div class='add'>+	mod_timer(&amp;dev-&gt;phy.roc_timer,</div><div class='add'>+		  jiffies + msecs_to_jiffies(duration));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_handle_hif_ctrl_basic(struct mt792x_dev *dev, struct tlv *tlv)</div><div class='add'>+{</div><div class='add'>+	struct mt7925_mcu_hif_ctrl_basic_tlv *basic;</div><div class='add'>+</div><div class='add'>+	basic = (struct mt7925_mcu_hif_ctrl_basic_tlv *)tlv;</div><div class='add'>+</div><div class='add'>+	if (basic-&gt;hifsuspend) {</div><div class='add'>+		dev-&gt;hif_idle = true;</div><div class='add'>+		if (!(basic-&gt;hif_tx_traffic_status == HIF_TRAFFIC_IDLE &amp;&amp;</div><div class='add'>+		      basic-&gt;hif_rx_traffic_status == HIF_TRAFFIC_IDLE))</div><div class='add'>+			dev_info(dev-&gt;mt76.dev, "Hif traffic not idle.\n");</div><div class='add'>+	} else {</div><div class='add'>+		dev-&gt;hif_resumed = true;</div><div class='add'>+	}</div><div class='add'>+	wake_up(&amp;dev-&gt;wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_uni_hif_ctrl_event(struct mt792x_dev *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+	u32 tlv_len;</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, sizeof(struct mt7925_mcu_rxd) + 4);</div><div class='add'>+	tlv = (struct tlv *)skb-&gt;data;</div><div class='add'>+	tlv_len = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	while (tlv_len &gt; 0 &amp;&amp; le16_to_cpu(tlv-&gt;len) &lt;= tlv_len) {</div><div class='add'>+		switch (le16_to_cpu(tlv-&gt;tag)) {</div><div class='add'>+		case UNI_EVENT_HIF_CTRL_BASIC:</div><div class='add'>+			mt7925_mcu_handle_hif_ctrl_basic(dev, tlv);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		tlv_len -= le16_to_cpu(tlv-&gt;len);</div><div class='add'>+		tlv = (struct tlv *)((char *)(tlv) + le16_to_cpu(tlv-&gt;len));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_uni_roc_event(struct mt792x_dev *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, sizeof(struct mt7925_mcu_rxd) + 4);</div><div class='add'>+</div><div class='add'>+	while (i &lt; skb-&gt;len) {</div><div class='add'>+		tlv = (struct tlv *)(skb-&gt;data + i);</div><div class='add'>+</div><div class='add'>+		switch (le16_to_cpu(tlv-&gt;tag)) {</div><div class='add'>+		case UNI_EVENT_ROC_GRANT:</div><div class='add'>+			mt7925_mcu_roc_handle_grant(dev, tlv);</div><div class='add'>+			break;</div><div class='add'>+		case UNI_EVENT_ROC_GRANT_SUB_LINK:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		i += le16_to_cpu(tlv-&gt;len);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_scan_event(struct mt792x_dev *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct mt76_phy *mphy = &amp;dev-&gt;mt76.phy;</div><div class='add'>+	struct mt792x_phy *phy = mphy-&gt;priv;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;mt76.lock);</div><div class='add'>+	__skb_queue_tail(&amp;phy-&gt;scan_event_list, skb);</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;mt76.lock);</div><div class='add'>+</div><div class='add'>+	ieee80211_queue_delayed_work(mphy-&gt;hw, &amp;phy-&gt;scan_work,</div><div class='add'>+				     MT792x_HW_SCAN_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_tx_done_event(struct mt792x_dev *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+#define UNI_EVENT_TX_DONE_MSG 0</div><div class='add'>+#define UNI_EVENT_TX_DONE_RAW 1</div><div class='add'>+	struct mt7925_mcu_txs_event {</div><div class='add'>+		u8 ver;</div><div class='add'>+		u8 rsv[3];</div><div class='add'>+		u8 data[];</div><div class='add'>+	} __packed * txs;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+	u32 tlv_len;</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, sizeof(struct mt7925_mcu_rxd) + 4);</div><div class='add'>+	tlv = (struct tlv *)skb-&gt;data;</div><div class='add'>+	tlv_len = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	while (tlv_len &gt; 0 &amp;&amp; le16_to_cpu(tlv-&gt;len) &lt;= tlv_len) {</div><div class='add'>+		switch (le16_to_cpu(tlv-&gt;tag)) {</div><div class='add'>+		case UNI_EVENT_TX_DONE_RAW:</div><div class='add'>+			txs = (struct mt7925_mcu_txs_event *)tlv-&gt;data;</div><div class='add'>+			mt7925_mac_add_txs(dev, txs-&gt;data);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		tlv_len -= le16_to_cpu(tlv-&gt;len);</div><div class='add'>+		tlv = (struct tlv *)((char *)(tlv) + le16_to_cpu(tlv-&gt;len));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_rssi_monitor_iter(void *priv, u8 *mac,</div><div class='add'>+			     struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt7925_uni_rssi_monitor_event *event = priv;</div><div class='add'>+	enum nl80211_cqm_rssi_threshold_event nl_event;</div><div class='add'>+	s32 rssi = le32_to_cpu(event-&gt;rssi);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!(vif-&gt;driver_flags &amp; IEEE80211_VIF_SUPPORTS_CQM_RSSI))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (rssi &gt; vif-&gt;bss_conf.cqm_rssi_thold)</div><div class='add'>+		nl_event = NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH;</div><div class='add'>+	else</div><div class='add'>+		nl_event = NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW;</div><div class='add'>+</div><div class='add'>+	ieee80211_cqm_rssi_notify(vif, nl_event, rssi, GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_rssi_monitor_event(struct mt792x_dev *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+	u32 tlv_len;</div><div class='add'>+	struct mt7925_uni_rssi_monitor_event *event;</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, sizeof(struct mt7925_mcu_rxd) + 4);</div><div class='add'>+	tlv = (struct tlv *)skb-&gt;data;</div><div class='add'>+	tlv_len = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	while (tlv_len &gt; 0 &amp;&amp; le16_to_cpu(tlv-&gt;len) &lt;= tlv_len) {</div><div class='add'>+		switch (le16_to_cpu(tlv-&gt;tag)) {</div><div class='add'>+		case UNI_EVENT_RSSI_MONITOR_INFO:</div><div class='add'>+			event = (struct mt7925_uni_rssi_monitor_event *)skb-&gt;data;</div><div class='add'>+			ieee80211_iterate_active_interfaces_atomic(dev-&gt;mt76.hw,</div><div class='add'>+								   IEEE80211_IFACE_ITER_RESUME_ALL,</div><div class='add'>+								   mt7925_mcu_rssi_monitor_iter,</div><div class='add'>+								   event);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		tlv_len -= le16_to_cpu(tlv-&gt;len);</div><div class='add'>+		tlv = (struct tlv *)((char *)(tlv) + le16_to_cpu(tlv-&gt;len));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_uni_debug_msg_event(struct mt792x_dev *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct mt7925_uni_debug_msg {</div><div class='add'>+		__le16 tag;</div><div class='add'>+		__le16 len;</div><div class='add'>+		u8 fmt;</div><div class='add'>+		u8 rsv[3];</div><div class='add'>+		u8 id;</div><div class='add'>+		u8 type:3;</div><div class='add'>+		u8 nr_args:5;</div><div class='add'>+		union {</div><div class='add'>+			struct idxlog {</div><div class='add'>+				__le16 rsv;</div><div class='add'>+				__le32 ts;</div><div class='add'>+				__le32 idx;</div><div class='add'>+				u8 data[];</div><div class='add'>+			} __packed idx;</div><div class='add'>+			struct txtlog {</div><div class='add'>+				u8 len;</div><div class='add'>+				u8 rsv;</div><div class='add'>+				__le32 ts;</div><div class='add'>+				u8 data[];</div><div class='add'>+			} __packed txt;</div><div class='add'>+		};</div><div class='add'>+	} __packed * hdr;</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, sizeof(struct mt7925_mcu_rxd) + 4);</div><div class='add'>+	hdr = (struct mt7925_uni_debug_msg *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;id == 0x28) {</div><div class='add'>+		skb_pull(skb, offsetof(struct mt7925_uni_debug_msg, id));</div><div class='add'>+		wiphy_info(mt76_hw(dev)-&gt;wiphy, "%.*s", skb-&gt;len, skb-&gt;data);</div><div class='add'>+		return;</div><div class='add'>+	} else if (hdr-&gt;id != 0xa8) {</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;type == 0) { /* idx log */</div><div class='add'>+		int i, ret, len = PAGE_SIZE - 1, nr_val;</div><div class='add'>+		struct page *page = dev_alloc_pages(get_order(len));</div><div class='add'>+		__le32 *val;</div><div class='add'>+		char *buf, *cur;</div><div class='add'>+</div><div class='add'>+		if (!page)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		buf = page_address(page);</div><div class='add'>+		cur = buf;</div><div class='add'>+</div><div class='add'>+		nr_val = (le16_to_cpu(hdr-&gt;len) - sizeof(*hdr)) / 4;</div><div class='add'>+		val = (__le32 *)hdr-&gt;idx.data;</div><div class='add'>+		for (i = 0; i &lt; nr_val &amp;&amp; len &gt; 0; i++) {</div><div class='add'>+			ret = snprintf(cur, len, "0x%x,", le32_to_cpu(val[i]));</div><div class='add'>+			if (ret &lt;= 0)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			cur += ret;</div><div class='add'>+			len -= ret;</div><div class='add'>+		}</div><div class='add'>+		if (cur &gt; buf)</div><div class='add'>+			wiphy_info(mt76_hw(dev)-&gt;wiphy, "idx: 0x%X,%d,%s",</div><div class='add'>+				   le32_to_cpu(hdr-&gt;idx.idx), nr_val, buf);</div><div class='add'>+		put_page(page);</div><div class='add'>+	} else if (hdr-&gt;type == 2) { /* str log */</div><div class='add'>+		wiphy_info(mt76_hw(dev)-&gt;wiphy, "%.*s", hdr-&gt;txt.len, hdr-&gt;txt.data);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_uni_rx_unsolicited_event(struct mt792x_dev *dev,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct mt7925_mcu_rxd *rxd;</div><div class='add'>+</div><div class='add'>+	rxd = (struct mt7925_mcu_rxd *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	switch (rxd-&gt;eid) {</div><div class='add'>+	case MCU_UNI_EVENT_HIF_CTRL:</div><div class='add'>+		mt7925_mcu_uni_hif_ctrl_event(dev, skb);</div><div class='add'>+		break;</div><div class='add'>+	case MCU_UNI_EVENT_FW_LOG_2_HOST:</div><div class='add'>+		mt7925_mcu_uni_debug_msg_event(dev, skb);</div><div class='add'>+		break;</div><div class='add'>+	case MCU_UNI_EVENT_ROC:</div><div class='add'>+		mt7925_mcu_uni_roc_event(dev, skb);</div><div class='add'>+		break;</div><div class='add'>+	case MCU_UNI_EVENT_SCAN_DONE:</div><div class='add'>+		mt7925_mcu_scan_event(dev, skb);</div><div class='add'>+		return;</div><div class='add'>+	case MCU_UNI_EVENT_TX_DONE:</div><div class='add'>+		mt7925_mcu_tx_done_event(dev, skb);</div><div class='add'>+		break;</div><div class='add'>+	case MCU_UNI_EVENT_BSS_BEACON_LOSS:</div><div class='add'>+		mt7925_mcu_connection_loss_event(dev, skb);</div><div class='add'>+		break;</div><div class='add'>+	case MCU_UNI_EVENT_RSSI_MONITOR:</div><div class='add'>+		mt7925_mcu_rssi_monitor_event(dev, skb);</div><div class='add'>+		break;</div><div class='add'>+	case MCU_UNI_EVENT_COREDUMP:</div><div class='add'>+		dev-&gt;fw_assert = true;</div><div class='add'>+		mt76_connac_mcu_coredump_event(&amp;dev-&gt;mt76, skb, &amp;dev-&gt;coredump);</div><div class='add'>+		return;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7925_mcu_rx_event(struct mt792x_dev *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct mt7925_mcu_rxd *rxd = (struct mt7925_mcu_rxd *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (skb_linearize(skb))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (rxd-&gt;option &amp; MCU_UNI_CMD_UNSOLICITED_EVENT) {</div><div class='add'>+		mt7925_mcu_uni_rx_unsolicited_event(dev, skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt76_mcu_rx_event(&amp;dev-&gt;mt76, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_mcu_sta_ba(struct mt76_dev *dev, struct mt76_vif_link *mvif,</div><div class='add'>+		  struct ieee80211_ampdu_params *params,</div><div class='add'>+		  bool enable, bool tx)</div><div class='add'>+{</div><div class='add'>+	struct mt76_wcid *wcid = (struct mt76_wcid *)params-&gt;sta-&gt;drv_priv;</div><div class='add'>+	struct sta_rec_ba_uni *ba;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(struct sta_req_hdr) + sizeof(*ba);</div><div class='add'>+	skb = __mt76_connac_mcu_alloc_sta_req(dev, mvif, wcid,</div><div class='add'>+					      len);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_BA, sizeof(*ba));</div><div class='add'>+</div><div class='add'>+	ba = (struct sta_rec_ba_uni *)tlv;</div><div class='add'>+	ba-&gt;ba_type = tx ? MT_BA_TYPE_ORIGINATOR : MT_BA_TYPE_RECIPIENT;</div><div class='add'>+	ba-&gt;winsize = cpu_to_le16(params-&gt;buf_size);</div><div class='add'>+	ba-&gt;ssn = cpu_to_le16(params-&gt;ssn);</div><div class='add'>+	ba-&gt;ba_en = enable &lt;&lt; params-&gt;tid;</div><div class='add'>+	ba-&gt;amsdu = params-&gt;amsdu;</div><div class='add'>+	ba-&gt;tid = params-&gt;tid;</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_skb_send_msg(dev, skb,</div><div class='add'>+				     MCU_UNI_CMD(STA_REC_UPDATE), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/** starec &amp; wtbl **/</div><div class='add'>+int mt7925_mcu_uni_tx_ba(struct mt792x_dev *dev,</div><div class='add'>+			 struct ieee80211_ampdu_params *params,</div><div class='add'>+			 bool enable)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_sta *msta = (struct mt792x_sta *)params-&gt;sta-&gt;drv_priv;</div><div class='add'>+	struct mt792x_vif *mvif = msta-&gt;vif;</div><div class='add'>+</div><div class='add'>+	if (enable &amp;&amp; !params-&gt;amsdu)</div><div class='add'>+		msta-&gt;deflink.wcid.amsdu = false;</div><div class='add'>+</div><div class='add'>+	return mt7925_mcu_sta_ba(&amp;dev-&gt;mt76, &amp;mvif-&gt;bss_conf.mt76, params,</div><div class='add'>+				 enable, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_uni_rx_ba(struct mt792x_dev *dev,</div><div class='add'>+			 struct ieee80211_ampdu_params *params,</div><div class='add'>+			 bool enable)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_sta *msta = (struct mt792x_sta *)params-&gt;sta-&gt;drv_priv;</div><div class='add'>+	struct mt792x_vif *mvif = msta-&gt;vif;</div><div class='add'>+</div><div class='add'>+	return mt7925_mcu_sta_ba(&amp;dev-&gt;mt76, &amp;mvif-&gt;bss_conf.mt76, params,</div><div class='add'>+				 enable, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925_mcu_read_eeprom(struct mt792x_dev *dev, u32 offset, u8 *val)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		u8 rsv[4];</div><div class='add'>+</div><div class='add'>+		__le16 tag;</div><div class='add'>+		__le16 len;</div><div class='add'>+</div><div class='add'>+		__le32 addr;</div><div class='add'>+		__le32 valid;</div><div class='add'>+		u8 data[MT7925_EEPROM_BLOCK_SIZE];</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.tag = cpu_to_le16(1),</div><div class='add'>+		.len = cpu_to_le16(sizeof(req) - 4),</div><div class='add'>+		.addr = cpu_to_le32(round_down(offset,</div><div class='add'>+				    MT7925_EEPROM_BLOCK_SIZE)),</div><div class='add'>+	};</div><div class='add'>+	struct evt {</div><div class='add'>+		u8 rsv[4];</div><div class='add'>+</div><div class='add'>+		__le16 tag;</div><div class='add'>+		__le16 len;</div><div class='add'>+</div><div class='add'>+		__le32 ver;</div><div class='add'>+		__le32 addr;</div><div class='add'>+		__le32 valid;</div><div class='add'>+		__le32 size;</div><div class='add'>+		__le32 magic_num;</div><div class='add'>+		__le32 type;</div><div class='add'>+		__le32 rsv1[4];</div><div class='add'>+		u8 data[32];</div><div class='add'>+	} __packed *res;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76, MCU_WM_UNI_CMD_QUERY(EFUSE_CTRL),</div><div class='add'>+					&amp;req, sizeof(req), true, &amp;skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	res = (struct evt *)skb-&gt;data;</div><div class='add'>+	*val = res-&gt;data[offset % MT7925_EEPROM_BLOCK_SIZE];</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925_load_clc(struct mt792x_dev *dev, const char *fw_name)</div><div class='add'>+{</div><div class='add'>+	const struct mt76_connac2_fw_trailer *hdr;</div><div class='add'>+	const struct mt76_connac2_fw_region *region;</div><div class='add'>+	const struct mt7925_clc *clc;</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	struct mt792x_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	u8 *clc_base = NULL, hw_encap = 0;</div><div class='add'>+	int ret, i, len, offset = 0;</div><div class='add'>+</div><div class='add'>+	dev-&gt;phy.clc_chan_conf = 0xff;</div><div class='add'>+	dev-&gt;regd_user = false;</div><div class='add'>+	if (!mt7925_regd_clc_supported(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (mt76_is_mmio(&amp;dev-&gt;mt76)) {</div><div class='add'>+		ret = mt7925_mcu_read_eeprom(dev, MT_EE_HW_TYPE, &amp;hw_encap);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		hw_encap = u8_get_bits(hw_encap, MT_EE_HW_TYPE_ENCAP);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = request_firmware(&amp;fw, fw_name, mdev-&gt;dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!fw || !fw-&gt;data || fw-&gt;size &lt; sizeof(*hdr)) {</div><div class='add'>+		dev_err(mdev-&gt;dev, "Invalid firmware\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr = (const void *)(fw-&gt;data + fw-&gt;size - sizeof(*hdr));</div><div class='add'>+	for (i = 0; i &lt; hdr-&gt;n_region; i++) {</div><div class='add'>+		region = (const void *)((const u8 *)hdr -</div><div class='add'>+					(hdr-&gt;n_region - i) * sizeof(*region));</div><div class='add'>+		len = le32_to_cpu(region-&gt;len);</div><div class='add'>+</div><div class='add'>+		/* check if we have valid buffer size */</div><div class='add'>+		if (offset + len &gt; fw-&gt;size) {</div><div class='add'>+			dev_err(mdev-&gt;dev, "Invalid firmware region\n");</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((region-&gt;feature_set &amp; FW_FEATURE_NON_DL) &amp;&amp;</div><div class='add'>+		    region-&gt;type == FW_TYPE_CLC) {</div><div class='add'>+			clc_base = (u8 *)(fw-&gt;data + offset);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		offset += len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!clc_base)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	for (offset = 0; offset &lt; len; offset += le32_to_cpu(clc-&gt;len)) {</div><div class='add'>+		clc = (const struct mt7925_clc *)(clc_base + offset);</div><div class='add'>+</div><div class='add'>+		if (clc-&gt;idx &gt;= ARRAY_SIZE(phy-&gt;clc))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* do not init buf again if chip reset triggered */</div><div class='add'>+		if (phy-&gt;clc[clc-&gt;idx])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* header content sanity */</div><div class='add'>+		if ((clc-&gt;idx == MT792x_CLC_BE_CTRL &amp;&amp;</div><div class='add'>+		     u8_get_bits(clc-&gt;t2.type, MT_EE_HW_TYPE_ENCAP) != hw_encap) ||</div><div class='add'>+		    u8_get_bits(clc-&gt;t0.type, MT_EE_HW_TYPE_ENCAP) != hw_encap)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		phy-&gt;clc[clc-&gt;idx] = devm_kmemdup(mdev-&gt;dev, clc,</div><div class='add'>+						  le32_to_cpu(clc-&gt;len),</div><div class='add'>+						  GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+		if (!phy-&gt;clc[clc-&gt;idx]) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt7925_regd_init(phy);</div><div class='add'>+out:</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_fw_log_2_host(struct mt792x_dev *dev, u8 ctrl)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		u8 _rsv[4];</div><div class='add'>+</div><div class='add'>+		__le16 tag;</div><div class='add'>+		__le16 len;</div><div class='add'>+		u8 ctrl;</div><div class='add'>+		u8 interval;</div><div class='add'>+		u8 _rsv2[2];</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.tag = cpu_to_le16(UNI_WSYS_CONFIG_FW_LOG_CTRL),</div><div class='add'>+		.len = cpu_to_le16(sizeof(req) - 4),</div><div class='add'>+		.ctrl = ctrl,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD(WSYS_CONFIG),</div><div class='add'>+					&amp;req, sizeof(req), true, NULL);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_get_temperature(struct mt792x_phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		u8 _rsv[4];</div><div class='add'>+</div><div class='add'>+		__le16 tag;</div><div class='add'>+		__le16 len;</div><div class='add'>+		u8 _rsv2[4];</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.tag = cpu_to_le16(0x0),</div><div class='add'>+		.len = cpu_to_le16(sizeof(req) - 4),</div><div class='add'>+	};</div><div class='add'>+	struct mt7925_thermal_evt {</div><div class='add'>+		u8 rsv[4];</div><div class='add'>+		__le32 temperature;</div><div class='add'>+	} __packed * evt;</div><div class='add'>+	struct mt792x_dev *dev = phy-&gt;dev;</div><div class='add'>+	int temperature, ret;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76,</div><div class='add'>+					MCU_WM_UNI_CMD_QUERY(THERMAL),</div><div class='add'>+					&amp;req, sizeof(req), true, &amp;skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, 4 + sizeof(struct tlv));</div><div class='add'>+	evt = (struct mt7925_thermal_evt *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	temperature = le32_to_cpu(evt-&gt;temperature);</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return temperature;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_parse_phy_cap(struct mt792x_dev *dev, char *data)</div><div class='add'>+{</div><div class='add'>+	struct mt76_phy *mphy = &amp;dev-&gt;mt76.phy;</div><div class='add'>+	struct mt76_dev *mdev = mphy-&gt;dev;</div><div class='add'>+	struct mt7925_mcu_phy_cap {</div><div class='add'>+		u8 ht;</div><div class='add'>+		u8 vht;</div><div class='add'>+		u8 _5g;</div><div class='add'>+		u8 max_bw;</div><div class='add'>+		u8 nss;</div><div class='add'>+		u8 dbdc;</div><div class='add'>+		u8 tx_ldpc;</div><div class='add'>+		u8 rx_ldpc;</div><div class='add'>+		u8 tx_stbc;</div><div class='add'>+		u8 rx_stbc;</div><div class='add'>+		u8 hw_path;</div><div class='add'>+		u8 he;</div><div class='add'>+		u8 eht;</div><div class='add'>+	} __packed * cap;</div><div class='add'>+	enum {</div><div class='add'>+		WF0_24G,</div><div class='add'>+		WF0_5G</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cap = (struct mt7925_mcu_phy_cap *)data;</div><div class='add'>+</div><div class='add'>+	mdev-&gt;phy.antenna_mask = BIT(cap-&gt;nss) - 1;</div><div class='add'>+	mdev-&gt;phy.chainmask = mdev-&gt;phy.antenna_mask;</div><div class='add'>+	mdev-&gt;phy.cap.has_2ghz = cap-&gt;hw_path &amp; BIT(WF0_24G);</div><div class='add'>+	mdev-&gt;phy.cap.has_5ghz = cap-&gt;hw_path &amp; BIT(WF0_5G);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_parse_eml_cap(struct mt792x_dev *dev, char *data)</div><div class='add'>+{</div><div class='add'>+	struct mt7925_mcu_eml_cap {</div><div class='add'>+		u8 rsv[4];</div><div class='add'>+		__le16 eml_cap;</div><div class='add'>+		u8 rsv2[6];</div><div class='add'>+	} __packed * cap;</div><div class='add'>+</div><div class='add'>+	cap = (struct mt7925_mcu_eml_cap *)data;</div><div class='add'>+</div><div class='add'>+	dev-&gt;phy.eml_cap = le16_to_cpu(cap-&gt;eml_cap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_mcu_get_nic_capability(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_phy *mphy = &amp;dev-&gt;mt76.phy;</div><div class='add'>+	struct {</div><div class='add'>+		u8 _rsv[4];</div><div class='add'>+</div><div class='add'>+		__le16 tag;</div><div class='add'>+		__le16 len;</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.tag = cpu_to_le16(UNI_CHIP_CONFIG_NIC_CAPA),</div><div class='add'>+		.len = cpu_to_le16(sizeof(req) - 4),</div><div class='add'>+	};</div><div class='add'>+	struct mt76_connac_cap_hdr {</div><div class='add'>+		__le16 n_element;</div><div class='add'>+		u8 rsv[2];</div><div class='add'>+	} __packed * hdr;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD(CHIP_CONFIG),</div><div class='add'>+					&amp;req, sizeof(req), true, &amp;skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	hdr = (struct mt76_connac_cap_hdr *)skb-&gt;data;</div><div class='add'>+	if (skb-&gt;len &lt; sizeof(*hdr)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, sizeof(*hdr));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; le16_to_cpu(hdr-&gt;n_element); i++) {</div><div class='add'>+		struct tlv *tlv = (struct tlv *)skb-&gt;data;</div><div class='add'>+		int len;</div><div class='add'>+</div><div class='add'>+		if (skb-&gt;len &lt; sizeof(*tlv))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		len = le16_to_cpu(tlv-&gt;len);</div><div class='add'>+		if (skb-&gt;len &lt; len)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		switch (le16_to_cpu(tlv-&gt;tag)) {</div><div class='add'>+		case MT_NIC_CAP_6G:</div><div class='add'>+			mphy-&gt;cap.has_6ghz = !!tlv-&gt;data[0];</div><div class='add'>+			break;</div><div class='add'>+		case MT_NIC_CAP_MAC_ADDR:</div><div class='add'>+			memcpy(mphy-&gt;macaddr, (void *)tlv-&gt;data, ETH_ALEN);</div><div class='add'>+			break;</div><div class='add'>+		case MT_NIC_CAP_PHY:</div><div class='add'>+			mt7925_mcu_parse_phy_cap(dev, tlv-&gt;data);</div><div class='add'>+			break;</div><div class='add'>+		case MT_NIC_CAP_CHIP_CAP:</div><div class='add'>+			dev-&gt;phy.chip_cap = le64_to_cpu(*(__le64 *)tlv-&gt;data);</div><div class='add'>+			break;</div><div class='add'>+		case MT_NIC_CAP_EML_CAP:</div><div class='add'>+			mt7925_mcu_parse_eml_cap(dev, tlv-&gt;data);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		skb_pull(skb, len);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_chip_config(struct mt792x_dev *dev, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	u16 len = strlen(cmd) + 1;</div><div class='add'>+	struct {</div><div class='add'>+		u8 _rsv[4];</div><div class='add'>+		__le16 tag;</div><div class='add'>+		__le16 len;</div><div class='add'>+		struct mt76_connac_config config;</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.tag = cpu_to_le16(UNI_CHIP_CONFIG_CHIP_CFG),</div><div class='add'>+		.len = cpu_to_le16(sizeof(req) - 4),</div><div class='add'>+		.config = {</div><div class='add'>+			.resp_type = 0,</div><div class='add'>+			.type = 0,</div><div class='add'>+			.data_size = cpu_to_le16(len),</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memcpy(req.config.data, cmd, len);</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD(CHIP_CONFIG),</div><div class='add'>+				 &amp;req, sizeof(req), false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_deep_sleep(struct mt792x_dev *dev, bool enable)</div><div class='add'>+{</div><div class='add'>+	char cmd[16];</div><div class='add'>+</div><div class='add'>+	snprintf(cmd, sizeof(cmd), "KeepFullPwr %d", !enable);</div><div class='add'>+</div><div class='add'>+	return mt7925_mcu_chip_config(dev, cmd);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_mcu_set_deep_sleep);</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_thermal_protect(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	char cmd[64];</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	snprintf(cmd, sizeof(cmd), "ThermalProtGband %d %d %d %d %d %d %d %d %d %d",</div><div class='add'>+		 0, 100, 90, 80, 30, 1, 1, 115, 105, 5);</div><div class='add'>+	ret = mt7925_mcu_chip_config(dev, cmd);</div><div class='add'>+</div><div class='add'>+	snprintf(cmd, sizeof(cmd), "ThermalProtAband %d %d %d %d %d %d %d %d %d %d",</div><div class='add'>+		 1, 100, 90, 80, 30, 1, 1, 115, 105, 5);</div><div class='add'>+	ret |= mt7925_mcu_chip_config(dev, cmd);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_mcu_set_thermal_protect);</div><div class='add'>+</div><div class='add'>+int mt7925_run_firmware(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mt792x_load_firmware(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mt7925_mcu_get_nic_capability(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mt7925_load_clc(dev, mt792x_ram_name(dev));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	set_bit(MT76_STATE_MCU_RUNNING, &amp;dev-&gt;mphy.state);</div><div class='add'>+</div><div class='add'>+	return mt7925_mcu_fw_log_2_host(dev, 1);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_run_firmware);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_sta_hdr_trans_tlv(struct sk_buff *skb,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct sta_rec_hdr_trans *hdr_trans;</div><div class='add'>+	struct mt76_wcid *wcid;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HDR_TRANS, sizeof(*hdr_trans));</div><div class='add'>+	hdr_trans = (struct sta_rec_hdr_trans *)tlv;</div><div class='add'>+	hdr_trans-&gt;dis_rx_hdr_tran = true;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_STATION)</div><div class='add'>+		hdr_trans-&gt;to_ds = true;</div><div class='add'>+	else</div><div class='add'>+		hdr_trans-&gt;from_ds = true;</div><div class='add'>+</div><div class='add'>+	if (link_sta) {</div><div class='add'>+		struct mt792x_sta *msta = (struct mt792x_sta *)link_sta-&gt;sta-&gt;drv_priv;</div><div class='add'>+		struct mt792x_link_sta *mlink;</div><div class='add'>+</div><div class='add'>+		mlink = mt792x_sta_to_link(msta, link_sta-&gt;link_id);</div><div class='add'>+		wcid = &amp;mlink-&gt;wcid;</div><div class='add'>+	} else {</div><div class='add'>+		wcid = &amp;mvif-&gt;sta.deflink.wcid;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!wcid)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hdr_trans-&gt;dis_rx_hdr_tran = !test_bit(MT_WCID_FLAG_HDR_TRANS, &amp;wcid-&gt;flags);</div><div class='add'>+	if (test_bit(MT_WCID_FLAG_4ADDR, &amp;wcid-&gt;flags)) {</div><div class='add'>+		hdr_trans-&gt;to_ds = true;</div><div class='add'>+		hdr_trans-&gt;from_ds = true;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_wtbl_update_hdr_trans(struct mt792x_dev *dev,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     struct ieee80211_sta *sta,</div><div class='add'>+				     int link_id)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct ieee80211_link_sta *link_sta = sta ? &amp;sta-&gt;deflink : NULL;</div><div class='add'>+	struct mt792x_link_sta *mlink;</div><div class='add'>+	struct mt792x_bss_conf *mconf;</div><div class='add'>+	struct mt792x_sta *msta;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	msta = sta ? (struct mt792x_sta *)sta-&gt;drv_priv : &amp;mvif-&gt;sta;</div><div class='add'>+</div><div class='add'>+	mlink = mt792x_sta_to_link(msta, link_id);</div><div class='add'>+	link_sta = mt792x_sta_to_link_sta(vif, sta, link_id);</div><div class='add'>+	mconf = mt792x_vif_to_link(mvif, link_id);</div><div class='add'>+</div><div class='add'>+	skb = __mt76_connac_mcu_alloc_sta_req(&amp;dev-&gt;mt76, &amp;mconf-&gt;mt76,</div><div class='add'>+					      &amp;mlink-&gt;wcid,</div><div class='add'>+					      MT7925_STA_UPDATE_MAX_SIZE);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+</div><div class='add'>+	/* starec hdr trans */</div><div class='add'>+	mt7925_mcu_sta_hdr_trans_tlv(skb, vif, link_sta);</div><div class='add'>+	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='add'>+				     MCU_WMWA_UNI_CMD(STA_REC_UPDATE), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_tx(struct mt792x_dev *dev,</div><div class='add'>+		      struct ieee80211_bss_conf *bss_conf)</div><div class='add'>+{</div><div class='add'>+#define MCU_EDCA_AC_PARAM	0</div><div class='add'>+#define WMM_AIFS_SET		BIT(0)</div><div class='add'>+#define WMM_CW_MIN_SET		BIT(1)</div><div class='add'>+#define WMM_CW_MAX_SET		BIT(2)</div><div class='add'>+#define WMM_TXOP_SET		BIT(3)</div><div class='add'>+#define WMM_PARAM_SET		(WMM_AIFS_SET | WMM_CW_MIN_SET | \</div><div class='add'>+				 WMM_CW_MAX_SET | WMM_TXOP_SET)</div><div class='add'>+	struct mt792x_bss_conf *mconf = mt792x_link_conf_to_mconf(bss_conf);</div><div class='add'>+	struct {</div><div class='add'>+		u8 bss_idx;</div><div class='add'>+		u8 __rsv[3];</div><div class='add'>+	} __packed hdr = {</div><div class='add'>+		.bss_idx = mconf-&gt;mt76.idx,</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int len = sizeof(hdr) + IEEE80211_NUM_ACS * sizeof(struct edca);</div><div class='add'>+	int ac;</div><div class='add'>+</div><div class='add'>+	skb = mt76_mcu_msg_alloc(&amp;dev-&gt;mt76, NULL, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	skb_put_data(skb, &amp;hdr, sizeof(hdr));</div><div class='add'>+</div><div class='add'>+	for (ac = 0; ac &lt; IEEE80211_NUM_ACS; ac++) {</div><div class='add'>+		struct ieee80211_tx_queue_params *q = &amp;mconf-&gt;queue_params[ac];</div><div class='add'>+		struct edca *e;</div><div class='add'>+		struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+		tlv = mt76_connac_mcu_add_tlv(skb, MCU_EDCA_AC_PARAM, sizeof(*e));</div><div class='add'>+</div><div class='add'>+		e = (struct edca *)tlv;</div><div class='add'>+		e-&gt;set = WMM_PARAM_SET;</div><div class='add'>+		e-&gt;queue = ac;</div><div class='add'>+		e-&gt;aifs = q-&gt;aifs;</div><div class='add'>+		e-&gt;txop = cpu_to_le16(q-&gt;txop);</div><div class='add'>+</div><div class='add'>+		if (q-&gt;cw_min)</div><div class='add'>+			e-&gt;cw_min = fls(q-&gt;cw_min);</div><div class='add'>+		else</div><div class='add'>+			e-&gt;cw_min = 5;</div><div class='add'>+</div><div class='add'>+		if (q-&gt;cw_max)</div><div class='add'>+			e-&gt;cw_max = fls(q-&gt;cw_max);</div><div class='add'>+		else</div><div class='add'>+			e-&gt;cw_max = 10;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='add'>+				     MCU_UNI_CMD(EDCA_UPDATE), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_mcu_sta_key_tlv(struct mt76_wcid *wcid,</div><div class='add'>+		       struct mt76_connac_sta_key_conf *sta_key_conf,</div><div class='add'>+		       struct sk_buff *skb,</div><div class='add'>+		       struct ieee80211_key_conf *key,</div><div class='add'>+		       enum set_key_cmd cmd,</div><div class='add'>+		       struct mt792x_sta *msta)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = msta-&gt;vif;</div><div class='add'>+	struct mt792x_bss_conf *mconf = mt792x_vif_to_link(mvif, wcid-&gt;link_id);</div><div class='add'>+	struct sta_rec_sec_uni *sec;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	sta = msta == &amp;mvif-&gt;sta ?</div><div class='add'>+		      NULL :</div><div class='add'>+		      container_of((void *)msta, struct ieee80211_sta, drv_priv);</div><div class='add'>+	vif = container_of((void *)mvif, struct ieee80211_vif, drv_priv);</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_KEY_V3, sizeof(*sec));</div><div class='add'>+	sec = (struct sta_rec_sec_uni *)tlv;</div><div class='add'>+	sec-&gt;bss_idx = mconf-&gt;mt76.idx;</div><div class='add'>+	sec-&gt;is_authenticator = 0;</div><div class='add'>+	sec-&gt;mgmt_prot = 1; /* only used in MLO mode */</div><div class='add'>+	sec-&gt;wlan_idx = (u8)wcid-&gt;idx;</div><div class='add'>+</div><div class='add'>+	if (sta) {</div><div class='add'>+		struct ieee80211_link_sta *link_sta;</div><div class='add'>+</div><div class='add'>+		sec-&gt;tx_key = 1;</div><div class='add'>+		sec-&gt;key_type = 1;</div><div class='add'>+		link_sta = mt792x_sta_to_link_sta(vif, sta, wcid-&gt;link_id);</div><div class='add'>+</div><div class='add'>+		if (link_sta)</div><div class='add'>+			memcpy(sec-&gt;peer_addr, link_sta-&gt;addr, ETH_ALEN);</div><div class='add'>+	} else {</div><div class='add'>+		struct ieee80211_bss_conf *link_conf;</div><div class='add'>+</div><div class='add'>+		link_conf = mt792x_vif_to_bss_conf(vif, wcid-&gt;link_id);</div><div class='add'>+</div><div class='add'>+		if (link_conf)</div><div class='add'>+			memcpy(sec-&gt;peer_addr, link_conf-&gt;bssid, ETH_ALEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd == SET_KEY) {</div><div class='add'>+		u8 cipher;</div><div class='add'>+</div><div class='add'>+		sec-&gt;add = 1;</div><div class='add'>+		cipher = mt7925_mcu_get_cipher(key-&gt;cipher);</div><div class='add'>+		if (cipher == CONNAC3_CIPHER_NONE)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		if (cipher == CONNAC3_CIPHER_BIP_CMAC_128) {</div><div class='add'>+			sec-&gt;cipher_id = CONNAC3_CIPHER_BIP_CMAC_128;</div><div class='add'>+			sec-&gt;key_id = sta_key_conf-&gt;keyidx;</div><div class='add'>+			sec-&gt;key_len = 32;</div><div class='add'>+			memcpy(sec-&gt;key, sta_key_conf-&gt;key, 16);</div><div class='add'>+			memcpy(sec-&gt;key + 16, key-&gt;key, 16);</div><div class='add'>+		} else {</div><div class='add'>+			sec-&gt;cipher_id = cipher;</div><div class='add'>+			sec-&gt;key_id = key-&gt;keyidx;</div><div class='add'>+			sec-&gt;key_len = key-&gt;keylen;</div><div class='add'>+			memcpy(sec-&gt;key, key-&gt;key, key-&gt;keylen);</div><div class='add'>+</div><div class='add'>+			if (cipher == CONNAC3_CIPHER_TKIP) {</div><div class='add'>+				/* Rx/Tx MIC keys are swapped */</div><div class='add'>+				memcpy(sec-&gt;key + 16, key-&gt;key + 24, 8);</div><div class='add'>+				memcpy(sec-&gt;key + 24, key-&gt;key + 16, 8);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* store key_conf for BIP batch update */</div><div class='add'>+			if (cipher == CONNAC3_CIPHER_AES_CCMP) {</div><div class='add'>+				memcpy(sta_key_conf-&gt;key, key-&gt;key, key-&gt;keylen);</div><div class='add'>+				sta_key_conf-&gt;keyidx = key-&gt;keyidx;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		sec-&gt;add = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_add_key(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+		       struct mt76_connac_sta_key_conf *sta_key_conf,</div><div class='add'>+		       struct ieee80211_key_conf *key, int mcu_cmd,</div><div class='add'>+		       struct mt76_wcid *wcid, enum set_key_cmd cmd,</div><div class='add'>+		       struct mt792x_sta *msta)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_bss_conf *mconf = mt792x_vif_to_link(mvif, wcid-&gt;link_id);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = __mt76_connac_mcu_alloc_sta_req(dev, &amp;mconf-&gt;mt76, wcid,</div><div class='add'>+					      MT7925_STA_UPDATE_MAX_SIZE);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+</div><div class='add'>+	ret = mt7925_mcu_sta_key_tlv(wcid, sta_key_conf, skb, key, cmd, msta);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_skb_send_msg(dev, skb, mcu_cmd, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_mlo_roc(struct mt792x_bss_conf *mconf, u16 sel_links,</div><div class='add'>+			   int duration, u8 token_id)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = mconf-&gt;vif;</div><div class='add'>+	struct ieee80211_vif *vif = container_of((void *)mvif,</div><div class='add'>+						 struct ieee80211_vif, drv_priv);</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct ieee80211_channel *chan;</div><div class='add'>+	const u8 ch_band[] = {</div><div class='add'>+		[NL80211_BAND_2GHZ] = 1,</div><div class='add'>+		[NL80211_BAND_5GHZ] = 2,</div><div class='add'>+		[NL80211_BAND_6GHZ] = 3,</div><div class='add'>+	};</div><div class='add'>+	enum mt7925_roc_req type;</div><div class='add'>+	int center_ch, i = 0;</div><div class='add'>+	bool is_AG_band = false;</div><div class='add'>+	struct {</div><div class='add'>+		u8 id;</div><div class='add'>+		u8 bss_idx;</div><div class='add'>+		u16 tag;</div><div class='add'>+		struct mt792x_bss_conf *mconf;</div><div class='add'>+		struct ieee80211_channel *chan;</div><div class='add'>+	} links[2];</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 rsv[4];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct roc_acquire_tlv roc[2];</div><div class='add'>+	} __packed req = {</div><div class='add'>+			.roc[0].tag = cpu_to_le16(UNI_ROC_NUM),</div><div class='add'>+			.roc[0].len = cpu_to_le16(sizeof(struct roc_acquire_tlv)),</div><div class='add'>+			.roc[1].tag = cpu_to_le16(UNI_ROC_NUM),</div><div class='add'>+			.roc[1].len = cpu_to_le16(sizeof(struct roc_acquire_tlv))</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!mconf || hweight16(vif-&gt;valid_links) &lt; 2 ||</div><div class='add'>+	    hweight16(sel_links) != 2)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(links); i++) {</div><div class='add'>+		links[i].id = i ? __ffs(~BIT(mconf-&gt;link_id) &amp; sel_links) :</div><div class='add'>+				 mconf-&gt;link_id;</div><div class='add'>+		link_conf = mt792x_vif_to_bss_conf(vif, links[i].id);</div><div class='add'>+		if (WARN_ON_ONCE(!link_conf))</div><div class='add'>+			return -EPERM;</div><div class='add'>+</div><div class='add'>+		links[i].chan = link_conf-&gt;chanreq.oper.chan;</div><div class='add'>+		if (WARN_ON_ONCE(!links[i].chan))</div><div class='add'>+			return -EPERM;</div><div class='add'>+</div><div class='add'>+		links[i].mconf = mt792x_vif_to_link(mvif, links[i].id);</div><div class='add'>+		links[i].tag = links[i].id == mconf-&gt;link_id ?</div><div class='add'>+			       UNI_ROC_ACQUIRE : UNI_ROC_SUB_LINK;</div><div class='add'>+</div><div class='add'>+		is_AG_band |= links[i].chan-&gt;band == NL80211_BAND_2GHZ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;cfg.eml_cap &amp; IEEE80211_EML_CAP_EMLSR_SUPP)</div><div class='add'>+		type = is_AG_band ? MT7925_ROC_REQ_MLSR_AG :</div><div class='add'>+				    MT7925_ROC_REQ_MLSR_AA;</div><div class='add'>+	else</div><div class='add'>+		type = MT7925_ROC_REQ_JOIN;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(links) &amp;&amp; i &lt; hweight16(vif-&gt;active_links); i++) {</div><div class='add'>+		if (WARN_ON_ONCE(!links[i].mconf || !links[i].chan))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		chan = links[i].chan;</div><div class='add'>+		center_ch = ieee80211_frequency_to_channel(chan-&gt;center_freq);</div><div class='add'>+		req.roc[i].len = cpu_to_le16(sizeof(struct roc_acquire_tlv));</div><div class='add'>+		req.roc[i].tag = cpu_to_le16(links[i].tag);</div><div class='add'>+		req.roc[i].tokenid = token_id;</div><div class='add'>+		req.roc[i].reqtype = type;</div><div class='add'>+		req.roc[i].maxinterval = cpu_to_le32(duration);</div><div class='add'>+		req.roc[i].bss_idx = links[i].mconf-&gt;mt76.idx;</div><div class='add'>+		req.roc[i].control_channel = chan-&gt;hw_value;</div><div class='add'>+		req.roc[i].bw = CMD_CBW_20MHZ;</div><div class='add'>+		req.roc[i].bw_from_ap = CMD_CBW_20MHZ;</div><div class='add'>+		req.roc[i].center_chan = center_ch;</div><div class='add'>+		req.roc[i].center_chan_from_ap = center_ch;</div><div class='add'>+		req.roc[i].center_chan2 = 0;</div><div class='add'>+		req.roc[i].center_chan2_from_ap = 0;</div><div class='add'>+</div><div class='add'>+		/* STR : 0xfe indicates BAND_ALL with enabling DBDC</div><div class='add'>+		 * EMLSR : 0xff indicates (BAND_AUTO) without DBDC</div><div class='add'>+		 */</div><div class='add'>+		req.roc[i].dbdcband = type == MT7925_ROC_REQ_JOIN ? 0xfe : 0xff;</div><div class='add'>+</div><div class='add'>+		if (chan-&gt;hw_value &lt; center_ch)</div><div class='add'>+			req.roc[i].sco = 1; /* SCA */</div><div class='add'>+		else if (chan-&gt;hw_value &gt; center_ch)</div><div class='add'>+			req.roc[i].sco = 3; /* SCB */</div><div class='add'>+</div><div class='add'>+		req.roc[i].band = ch_band[chan-&gt;band];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;mvif-&gt;phy-&gt;dev-&gt;mt76, MCU_UNI_CMD(ROC),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_roc(struct mt792x_phy *phy, struct mt792x_bss_conf *mconf,</div><div class='add'>+		       struct ieee80211_channel *chan, int duration,</div><div class='add'>+		       enum mt7925_roc_req type, u8 token_id)</div><div class='add'>+{</div><div class='add'>+	int center_ch = ieee80211_frequency_to_channel(chan-&gt;center_freq);</div><div class='add'>+	struct mt792x_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 rsv[4];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct roc_acquire_tlv roc;</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.roc = {</div><div class='add'>+			.tag = cpu_to_le16(UNI_ROC_ACQUIRE),</div><div class='add'>+			.len = cpu_to_le16(sizeof(struct roc_acquire_tlv)),</div><div class='add'>+			.tokenid = token_id,</div><div class='add'>+			.reqtype = type,</div><div class='add'>+			.maxinterval = cpu_to_le32(duration),</div><div class='add'>+			.bss_idx = mconf-&gt;mt76.idx,</div><div class='add'>+			.control_channel = chan-&gt;hw_value,</div><div class='add'>+			.bw = CMD_CBW_20MHZ,</div><div class='add'>+			.bw_from_ap = CMD_CBW_20MHZ,</div><div class='add'>+			.center_chan = center_ch,</div><div class='add'>+			.center_chan_from_ap = center_ch,</div><div class='add'>+			.dbdcband = 0xff, /* auto */</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (chan-&gt;hw_value &lt; center_ch)</div><div class='add'>+		req.roc.sco = 1; /* SCA */</div><div class='add'>+	else if (chan-&gt;hw_value &gt; center_ch)</div><div class='add'>+		req.roc.sco = 3; /* SCB */</div><div class='add'>+</div><div class='add'>+	switch (chan-&gt;band) {</div><div class='add'>+	case NL80211_BAND_6GHZ:</div><div class='add'>+		req.roc.band = 3;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_BAND_5GHZ:</div><div class='add'>+		req.roc.band = 2;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		req.roc.band = 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD(ROC),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_abort_roc(struct mt792x_phy *phy, struct mt792x_bss_conf *mconf,</div><div class='add'>+			 u8 token_id)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 rsv[4];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct roc_abort_tlv {</div><div class='add'>+			__le16 tag;</div><div class='add'>+			__le16 len;</div><div class='add'>+			u8 bss_idx;</div><div class='add'>+			u8 tokenid;</div><div class='add'>+			u8 dbdcband;</div><div class='add'>+			u8 rsv[5];</div><div class='add'>+		} __packed abort;</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.abort = {</div><div class='add'>+			.tag = cpu_to_le16(UNI_ROC_ABORT),</div><div class='add'>+			.len = cpu_to_le16(sizeof(struct roc_abort_tlv)),</div><div class='add'>+			.tokenid = token_id,</div><div class='add'>+			.bss_idx = mconf-&gt;mt76.idx,</div><div class='add'>+			.dbdcband = 0xff, /* auto*/</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD(ROC),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_eeprom(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		u8 _rsv[4];</div><div class='add'>+</div><div class='add'>+		__le16 tag;</div><div class='add'>+		__le16 len;</div><div class='add'>+		u8 buffer_mode;</div><div class='add'>+		u8 format;</div><div class='add'>+		__le16 buf_len;</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.tag = cpu_to_le16(UNI_EFUSE_BUFFER_MODE),</div><div class='add'>+		.len = cpu_to_le16(sizeof(req) - 4),</div><div class='add'>+		.buffer_mode = EE_MODE_EFUSE,</div><div class='add'>+		.format = EE_FORMAT_WHOLE</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD(EFUSE_CTRL),</div><div class='add'>+					 &amp;req, sizeof(req), true, NULL);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_mcu_set_eeprom);</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_uni_bss_ps(struct mt792x_dev *dev,</div><div class='add'>+			  struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_bss_conf *mconf = mt792x_link_conf_to_mconf(link_conf);</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 bss_idx;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct ps_tlv {</div><div class='add'>+			__le16 tag;</div><div class='add'>+			__le16 len;</div><div class='add'>+			u8 ps_state; /* 0: device awake</div><div class='add'>+				      * 1: static power save</div><div class='add'>+				      * 2: dynamic power saving</div><div class='add'>+				      * 3: enter TWT power saving</div><div class='add'>+				      * 4: leave TWT power saving</div><div class='add'>+				      */</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed ps;</div><div class='add'>+	} __packed ps_req = {</div><div class='add'>+		.hdr = {</div><div class='add'>+			.bss_idx = mconf-&gt;mt76.idx,</div><div class='add'>+		},</div><div class='add'>+		.ps = {</div><div class='add'>+			.tag = cpu_to_le16(UNI_BSS_INFO_PS),</div><div class='add'>+			.len = cpu_to_le16(sizeof(struct ps_tlv)),</div><div class='add'>+			.ps_state = link_conf-&gt;vif-&gt;cfg.ps ? 2 : 0,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (link_conf-&gt;vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD(BSS_INFO_UPDATE),</div><div class='add'>+				 &amp;ps_req, sizeof(ps_req), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+mt7925_mcu_uni_bss_bcnft(struct mt792x_dev *dev,</div><div class='add'>+			 struct ieee80211_bss_conf *link_conf, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_bss_conf *mconf = mt792x_link_conf_to_mconf(link_conf);</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 bss_idx;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct bcnft_tlv {</div><div class='add'>+			__le16 tag;</div><div class='add'>+			__le16 len;</div><div class='add'>+			__le16 bcn_interval;</div><div class='add'>+			u8 dtim_period;</div><div class='add'>+			u8 bmc_delivered_ac;</div><div class='add'>+			u8 bmc_triggered_ac;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed bcnft;</div><div class='add'>+	} __packed bcnft_req = {</div><div class='add'>+		.hdr = {</div><div class='add'>+			.bss_idx = mconf-&gt;mt76.idx,</div><div class='add'>+		},</div><div class='add'>+		.bcnft = {</div><div class='add'>+			.tag = cpu_to_le16(UNI_BSS_INFO_BCNFT),</div><div class='add'>+			.len = cpu_to_le16(sizeof(struct bcnft_tlv)),</div><div class='add'>+			.bcn_interval = cpu_to_le16(link_conf-&gt;beacon_int),</div><div class='add'>+			.dtim_period = link_conf-&gt;dtim_period,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (link_conf-&gt;vif-&gt;type != NL80211_IFTYPE_STATION)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD(BSS_INFO_UPDATE),</div><div class='add'>+				 &amp;bcnft_req, sizeof(bcnft_req), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+mt7925_mcu_set_bss_pm(struct mt792x_dev *dev,</div><div class='add'>+		      struct ieee80211_bss_conf *link_conf,</div><div class='add'>+		      bool enable)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_bss_conf *mconf = mt792x_link_conf_to_mconf(link_conf);</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 bss_idx;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct bcnft_tlv {</div><div class='add'>+			__le16 tag;</div><div class='add'>+			__le16 len;</div><div class='add'>+			__le16 bcn_interval;</div><div class='add'>+			u8 dtim_period;</div><div class='add'>+			u8 bmc_delivered_ac;</div><div class='add'>+			u8 bmc_triggered_ac;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed enable;</div><div class='add'>+	} req = {</div><div class='add'>+		.hdr = {</div><div class='add'>+			.bss_idx = mconf-&gt;mt76.idx,</div><div class='add'>+		},</div><div class='add'>+		.enable = {</div><div class='add'>+			.tag = cpu_to_le16(UNI_BSS_INFO_BCNFT),</div><div class='add'>+			.len = cpu_to_le16(sizeof(struct bcnft_tlv)),</div><div class='add'>+			.dtim_period = link_conf-&gt;dtim_period,</div><div class='add'>+			.bcn_interval = cpu_to_le16(link_conf-&gt;beacon_int),</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 bss_idx;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct pm_disable {</div><div class='add'>+			__le16 tag;</div><div class='add'>+			__le16 len;</div><div class='add'>+		} __packed disable;</div><div class='add'>+	} req1 = {</div><div class='add'>+		.hdr = {</div><div class='add'>+			.bss_idx = mconf-&gt;mt76.idx,</div><div class='add'>+		},</div><div class='add'>+		.disable = {</div><div class='add'>+			.tag = cpu_to_le16(UNI_BSS_INFO_PM_DISABLE),</div><div class='add'>+			.len = cpu_to_le16(sizeof(struct pm_disable))</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD(BSS_INFO_UPDATE),</div><div class='add'>+				&amp;req1, sizeof(req1), true);</div><div class='add'>+	if (err &lt; 0 || !enable)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD(BSS_INFO_UPDATE),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	if (!link_sta-&gt;he_cap.has_he)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mt76_connac_mcu_sta_he_tlv_v2(skb, link_sta-&gt;sta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_sta_he_6g_tlv(struct sk_buff *skb,</div><div class='add'>+			 struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	struct sta_rec_he_6g_capa *he_6g;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	if (!link_sta-&gt;he_6ghz_capa.capa)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HE_6G, sizeof(*he_6g));</div><div class='add'>+</div><div class='add'>+	he_6g = (struct sta_rec_he_6g_capa *)tlv;</div><div class='add'>+	he_6g-&gt;capa = link_sta-&gt;he_6ghz_capa.capa;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_sta_eht_tlv(struct sk_buff *skb, struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_eht_mcs_nss_supp *mcs_map;</div><div class='add'>+	struct ieee80211_eht_cap_elem_fixed *elem;</div><div class='add'>+	struct sta_rec_eht *eht;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	if (!link_sta-&gt;eht_cap.has_eht)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mcs_map = &amp;link_sta-&gt;eht_cap.eht_mcs_nss_supp;</div><div class='add'>+	elem = &amp;link_sta-&gt;eht_cap.eht_cap_elem;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_EHT, sizeof(*eht));</div><div class='add'>+</div><div class='add'>+	eht = (struct sta_rec_eht *)tlv;</div><div class='add'>+	eht-&gt;tid_bitmap = 0xff;</div><div class='add'>+	eht-&gt;mac_cap = cpu_to_le16(*(u16 *)elem-&gt;mac_cap_info);</div><div class='add'>+	eht-&gt;phy_cap = cpu_to_le64(*(u64 *)elem-&gt;phy_cap_info);</div><div class='add'>+	eht-&gt;phy_cap_ext = cpu_to_le64(elem-&gt;phy_cap_info[8]);</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;bandwidth == IEEE80211_STA_RX_BW_20)</div><div class='add'>+		memcpy(eht-&gt;mcs_map_bw20, &amp;mcs_map-&gt;only_20mhz, sizeof(eht-&gt;mcs_map_bw20));</div><div class='add'>+	memcpy(eht-&gt;mcs_map_bw80, &amp;mcs_map-&gt;bw._80, sizeof(eht-&gt;mcs_map_bw80));</div><div class='add'>+	memcpy(eht-&gt;mcs_map_bw160, &amp;mcs_map-&gt;bw._160, sizeof(eht-&gt;mcs_map_bw160));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_sta_ht_tlv(struct sk_buff *skb, struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	struct sta_rec_ht *ht;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	if (!link_sta-&gt;ht_cap.ht_supported)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HT, sizeof(*ht));</div><div class='add'>+</div><div class='add'>+	ht = (struct sta_rec_ht *)tlv;</div><div class='add'>+	ht-&gt;ht_cap = cpu_to_le16(link_sta-&gt;ht_cap.cap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_sta_vht_tlv(struct sk_buff *skb, struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	struct sta_rec_vht *vht;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	/* For 6G band, this tlv is necessary to let hw work normally */</div><div class='add'>+	if (!link_sta-&gt;he_6ghz_capa.capa &amp;&amp; !link_sta-&gt;vht_cap.vht_supported)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_VHT, sizeof(*vht));</div><div class='add'>+</div><div class='add'>+	vht = (struct sta_rec_vht *)tlv;</div><div class='add'>+	vht-&gt;vht_cap = cpu_to_le32(link_sta-&gt;vht_cap.cap);</div><div class='add'>+	vht-&gt;vht_rx_mcs_map = link_sta-&gt;vht_cap.vht_mcs.rx_mcs_map;</div><div class='add'>+	vht-&gt;vht_tx_mcs_map = link_sta-&gt;vht_cap.vht_mcs.tx_mcs_map;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_sta_amsdu_tlv(struct sk_buff *skb,</div><div class='add'>+			 struct ieee80211_vif *vif,</div><div class='add'>+			 struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_sta *msta = (struct mt792x_sta *)link_sta-&gt;sta-&gt;drv_priv;</div><div class='add'>+	struct mt792x_link_sta *mlink;</div><div class='add'>+	struct sta_rec_amsdu *amsdu;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+	    vif-&gt;type != NL80211_IFTYPE_AP)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!link_sta-&gt;agg.max_amsdu_len)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HW_AMSDU, sizeof(*amsdu));</div><div class='add'>+	amsdu = (struct sta_rec_amsdu *)tlv;</div><div class='add'>+	amsdu-&gt;max_amsdu_num = 8;</div><div class='add'>+	amsdu-&gt;amsdu_en = true;</div><div class='add'>+</div><div class='add'>+	mlink = mt792x_sta_to_link(msta, link_sta-&gt;link_id);</div><div class='add'>+	mlink-&gt;wcid.amsdu = true;</div><div class='add'>+</div><div class='add'>+	switch (link_sta-&gt;agg.max_amsdu_len) {</div><div class='add'>+	case IEEE80211_MAX_MPDU_LEN_VHT_11454:</div><div class='add'>+		amsdu-&gt;max_mpdu_size =</div><div class='add'>+			IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454;</div><div class='add'>+		return;</div><div class='add'>+	case IEEE80211_MAX_MPDU_LEN_HT_7935:</div><div class='add'>+	case IEEE80211_MAX_MPDU_LEN_VHT_7991:</div><div class='add'>+		amsdu-&gt;max_mpdu_size = IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991;</div><div class='add'>+		return;</div><div class='add'>+	default:</div><div class='add'>+		amsdu-&gt;max_mpdu_size = IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_sta_phy_tlv(struct sk_buff *skb,</div><div class='add'>+		       struct ieee80211_vif *vif,</div><div class='add'>+		       struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct cfg80211_chan_def *chandef;</div><div class='add'>+	struct mt792x_bss_conf *mconf;</div><div class='add'>+	struct sta_rec_phy *phy;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+	u8 af = 0, mm = 0;</div><div class='add'>+</div><div class='add'>+	link_conf = mt792x_vif_to_bss_conf(vif, link_sta-&gt;link_id);</div><div class='add'>+	mconf = mt792x_vif_to_link(mvif, link_sta-&gt;link_id);</div><div class='add'>+	chandef = mconf-&gt;mt76.ctx ? &amp;mconf-&gt;mt76.ctx-&gt;def :</div><div class='add'>+				    &amp;link_conf-&gt;chanreq.oper;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_PHY, sizeof(*phy));</div><div class='add'>+	phy = (struct sta_rec_phy *)tlv;</div><div class='add'>+	phy-&gt;phy_type = mt76_connac_get_phy_mode_v2(mvif-&gt;phy-&gt;mt76, vif,</div><div class='add'>+						    chandef-&gt;chan-&gt;band,</div><div class='add'>+						    link_sta);</div><div class='add'>+	phy-&gt;basic_rate = cpu_to_le16((u16)link_conf-&gt;basic_rates);</div><div class='add'>+	if (link_sta-&gt;ht_cap.ht_supported) {</div><div class='add'>+		af = link_sta-&gt;ht_cap.ampdu_factor;</div><div class='add'>+		mm = link_sta-&gt;ht_cap.ampdu_density;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;vht_cap.vht_supported) {</div><div class='add'>+		u8 vht_af = FIELD_GET(IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK,</div><div class='add'>+				      link_sta-&gt;vht_cap.cap);</div><div class='add'>+</div><div class='add'>+		af = max_t(u8, af, vht_af);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;he_6ghz_capa.capa) {</div><div class='add'>+		af = le16_get_bits(link_sta-&gt;he_6ghz_capa.capa,</div><div class='add'>+				   IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP);</div><div class='add'>+		mm = le16_get_bits(link_sta-&gt;he_6ghz_capa.capa,</div><div class='add'>+				   IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	phy-&gt;ampdu = FIELD_PREP(IEEE80211_HT_AMPDU_PARM_FACTOR, af) |</div><div class='add'>+		     FIELD_PREP(IEEE80211_HT_AMPDU_PARM_DENSITY, mm);</div><div class='add'>+	phy-&gt;max_ampdu_len = af;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_sta_state_v2_tlv(struct mt76_phy *mphy, struct sk_buff *skb,</div><div class='add'>+			    struct ieee80211_link_sta *link_sta,</div><div class='add'>+			    struct ieee80211_vif *vif,</div><div class='add'>+			    u8 rcpi, u8 sta_state)</div><div class='add'>+{</div><div class='add'>+	struct sta_rec_state_v2 {</div><div class='add'>+		__le16 tag;</div><div class='add'>+		__le16 len;</div><div class='add'>+		u8 state;</div><div class='add'>+		u8 rsv[3];</div><div class='add'>+		__le32 flags;</div><div class='add'>+		u8 vht_opmode;</div><div class='add'>+		u8 action;</div><div class='add'>+		u8 rsv2[2];</div><div class='add'>+	} __packed * state;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_STATE, sizeof(*state));</div><div class='add'>+	state = (struct sta_rec_state_v2 *)tlv;</div><div class='add'>+	state-&gt;state = sta_state;</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;vht_cap.vht_supported) {</div><div class='add'>+		state-&gt;vht_opmode = link_sta-&gt;bandwidth;</div><div class='add'>+		state-&gt;vht_opmode |= link_sta-&gt;rx_nss &lt;&lt;</div><div class='add'>+			IEEE80211_OPMODE_NOTIF_RX_NSS_SHIFT;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_sta_rate_ctrl_tlv(struct sk_buff *skb,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct ieee80211_bss_conf *link_conf;</div><div class='add'>+	struct cfg80211_chan_def *chandef;</div><div class='add'>+	struct sta_rec_ra_info *ra_info;</div><div class='add'>+	struct mt792x_bss_conf *mconf;</div><div class='add'>+	enum nl80211_band band;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+	u16 supp_rates;</div><div class='add'>+</div><div class='add'>+	link_conf = mt792x_vif_to_bss_conf(vif, link_sta-&gt;link_id);</div><div class='add'>+	mconf = mt792x_vif_to_link(mvif, link_sta-&gt;link_id);</div><div class='add'>+	chandef = mconf-&gt;mt76.ctx ? &amp;mconf-&gt;mt76.ctx-&gt;def :</div><div class='add'>+				    &amp;link_conf-&gt;chanreq.oper;</div><div class='add'>+	band = chandef-&gt;chan-&gt;band;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_RA, sizeof(*ra_info));</div><div class='add'>+	ra_info = (struct sta_rec_ra_info *)tlv;</div><div class='add'>+</div><div class='add'>+	supp_rates = link_sta-&gt;supp_rates[band];</div><div class='add'>+	if (band == NL80211_BAND_2GHZ)</div><div class='add'>+		supp_rates = FIELD_PREP(RA_LEGACY_OFDM, supp_rates &gt;&gt; 4) |</div><div class='add'>+			     FIELD_PREP(RA_LEGACY_CCK, supp_rates &amp; 0xf);</div><div class='add'>+	else</div><div class='add'>+		supp_rates = FIELD_PREP(RA_LEGACY_OFDM, supp_rates);</div><div class='add'>+</div><div class='add'>+	ra_info-&gt;legacy = cpu_to_le16(supp_rates);</div><div class='add'>+</div><div class='add'>+	if (link_sta-&gt;ht_cap.ht_supported)</div><div class='add'>+		memcpy(ra_info-&gt;rx_mcs_bitmask,</div><div class='add'>+		       link_sta-&gt;ht_cap.mcs.rx_mask,</div><div class='add'>+		       HT_MCS_MASK_NUM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_sta_eht_mld_tlv(struct sk_buff *skb,</div><div class='add'>+			   struct ieee80211_vif *vif, struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct wiphy *wiphy = mvif-&gt;phy-&gt;mt76-&gt;hw-&gt;wiphy;</div><div class='add'>+	const struct wiphy_iftype_ext_capab *ext_capa;</div><div class='add'>+	struct sta_rec_eht_mld *eht_mld;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+	u16 eml_cap;</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_vif_is_mld(vif))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_EHT_MLD, sizeof(*eht_mld));</div><div class='add'>+	eht_mld = (struct sta_rec_eht_mld *)tlv;</div><div class='add'>+	eht_mld-&gt;mld_type = 0xff;</div><div class='add'>+</div><div class='add'>+	ext_capa = cfg80211_get_iftype_ext_capa(wiphy,</div><div class='add'>+						ieee80211_vif_type_p2p(vif));</div><div class='add'>+	if (!ext_capa)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	eml_cap = (vif-&gt;cfg.eml_cap &amp; (IEEE80211_EML_CAP_EMLSR_SUPP |</div><div class='add'>+				       IEEE80211_EML_CAP_TRANSITION_TIMEOUT)) |</div><div class='add'>+		  (ext_capa-&gt;eml_capabilities &amp; (IEEE80211_EML_CAP_EMLSR_PADDING_DELAY |</div><div class='add'>+						IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY));</div><div class='add'>+</div><div class='add'>+	if (eml_cap &amp; IEEE80211_EML_CAP_EMLSR_SUPP) {</div><div class='add'>+		eht_mld-&gt;eml_cap[0] = u16_get_bits(eml_cap, GENMASK(7, 0));</div><div class='add'>+		eht_mld-&gt;eml_cap[1] = u16_get_bits(eml_cap, GENMASK(15, 8));</div><div class='add'>+	} else {</div><div class='add'>+		eht_mld-&gt;str_cap[0] = BIT(1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_sta_mld_tlv(struct sk_buff *skb,</div><div class='add'>+		       struct ieee80211_vif *vif, struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_sta *msta = (struct mt792x_sta *)sta-&gt;drv_priv;</div><div class='add'>+	unsigned long valid = mvif-&gt;valid_links;</div><div class='add'>+	struct mt792x_bss_conf *mconf;</div><div class='add'>+	struct mt792x_link_sta *mlink;</div><div class='add'>+	struct sta_rec_mld *mld;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+	int i, cnt = 0;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_MLD, sizeof(*mld));</div><div class='add'>+	mld = (struct sta_rec_mld *)tlv;</div><div class='add'>+	memcpy(mld-&gt;mac_addr, sta-&gt;addr, ETH_ALEN);</div><div class='add'>+	mld-&gt;primary_id = cpu_to_le16(msta-&gt;deflink.wcid.idx);</div><div class='add'>+	mld-&gt;wlan_id = cpu_to_le16(msta-&gt;deflink.wcid.idx);</div><div class='add'>+	mld-&gt;link_num = min_t(u8, hweight16(mvif-&gt;valid_links), 2);</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(i, &amp;valid, IEEE80211_MLD_MAX_NUM_LINKS) {</div><div class='add'>+		if (cnt == mld-&gt;link_num)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		mconf = mt792x_vif_to_link(mvif, i);</div><div class='add'>+		mlink = mt792x_sta_to_link(msta, i);</div><div class='add'>+		mld-&gt;link[cnt].wlan_id = cpu_to_le16(mlink-&gt;wcid.idx);</div><div class='add'>+		mld-&gt;link[cnt++].bss_idx = mconf-&gt;mt76.idx;</div><div class='add'>+</div><div class='add'>+		if (mlink != &amp;msta-&gt;deflink)</div><div class='add'>+			mld-&gt;secondary_id = cpu_to_le16(mlink-&gt;wcid.idx);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_sta_remove_tlv(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sta_rec_remove *rem;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, 0x25, sizeof(*rem));</div><div class='add'>+	rem = (struct sta_rec_remove *)tlv;</div><div class='add'>+	rem-&gt;action = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_mcu_sta_cmd(struct mt76_phy *phy,</div><div class='add'>+		   struct mt76_sta_cmd_info *info)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)info-&gt;vif-&gt;drv_priv;</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct mt792x_bss_conf *mconf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int conn_state;</div><div class='add'>+</div><div class='add'>+	mconf = mt792x_vif_to_link(mvif, info-&gt;wcid-&gt;link_id);</div><div class='add'>+</div><div class='add'>+	skb = __mt76_connac_mcu_alloc_sta_req(dev, &amp;mconf-&gt;mt76, info-&gt;wcid,</div><div class='add'>+					      MT7925_STA_UPDATE_MAX_SIZE);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+</div><div class='add'>+	conn_state = info-&gt;enable ? CONN_STATE_PORT_SECURE :</div><div class='add'>+				    CONN_STATE_DISCONNECT;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;enable &amp;&amp; info-&gt;link_sta) {</div><div class='add'>+		mt76_connac_mcu_sta_basic_tlv(dev, skb, info-&gt;link_conf,</div><div class='add'>+					      info-&gt;link_sta,</div><div class='add'>+					      conn_state, info-&gt;newly);</div><div class='add'>+		mt7925_mcu_sta_phy_tlv(skb, info-&gt;vif, info-&gt;link_sta);</div><div class='add'>+		mt7925_mcu_sta_ht_tlv(skb, info-&gt;link_sta);</div><div class='add'>+		mt7925_mcu_sta_vht_tlv(skb, info-&gt;link_sta);</div><div class='add'>+		mt76_connac_mcu_sta_uapsd(skb, info-&gt;vif, info-&gt;link_sta-&gt;sta);</div><div class='add'>+		mt7925_mcu_sta_amsdu_tlv(skb, info-&gt;vif, info-&gt;link_sta);</div><div class='add'>+		mt7925_mcu_sta_he_tlv(skb, info-&gt;link_sta);</div><div class='add'>+		mt7925_mcu_sta_he_6g_tlv(skb, info-&gt;link_sta);</div><div class='add'>+		mt7925_mcu_sta_eht_tlv(skb, info-&gt;link_sta);</div><div class='add'>+		mt7925_mcu_sta_rate_ctrl_tlv(skb, info-&gt;vif,</div><div class='add'>+					     info-&gt;link_sta);</div><div class='add'>+		mt7925_mcu_sta_state_v2_tlv(phy, skb, info-&gt;link_sta,</div><div class='add'>+					    info-&gt;vif, info-&gt;rcpi,</div><div class='add'>+					    info-&gt;state);</div><div class='add'>+</div><div class='add'>+		if (info-&gt;state != MT76_STA_INFO_STATE_NONE) {</div><div class='add'>+			mt7925_mcu_sta_mld_tlv(skb, info-&gt;vif, info-&gt;link_sta-&gt;sta);</div><div class='add'>+			mt7925_mcu_sta_eht_mld_tlv(skb, info-&gt;vif, info-&gt;link_sta-&gt;sta);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;enable) {</div><div class='add'>+		mt7925_mcu_sta_remove_tlv(skb);</div><div class='add'>+		mt76_connac_mcu_add_tlv(skb, STA_REC_MLD_OFF,</div><div class='add'>+					sizeof(struct tlv));</div><div class='add'>+	} else {</div><div class='add'>+		mt7925_mcu_sta_hdr_trans_tlv(skb, info-&gt;vif, info-&gt;link_sta);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_skb_send_msg(dev, skb, info-&gt;cmd, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_sta_update(struct mt792x_dev *dev,</div><div class='add'>+			  struct ieee80211_link_sta *link_sta,</div><div class='add'>+			  struct ieee80211_vif *vif, bool enable,</div><div class='add'>+			  enum mt76_sta_info_state state)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	int rssi = -ewma_rssi_read(&amp;mvif-&gt;bss_conf.rssi);</div><div class='add'>+	struct mt76_sta_cmd_info info = {</div><div class='add'>+		.link_sta = link_sta,</div><div class='add'>+		.vif = vif,</div><div class='add'>+		.link_conf = &amp;vif-&gt;bss_conf,</div><div class='add'>+		.enable = enable,</div><div class='add'>+		.cmd = MCU_UNI_CMD(STA_REC_UPDATE),</div><div class='add'>+		.state = state,</div><div class='add'>+		.offload_fw = true,</div><div class='add'>+		.rcpi = to_rcpi(rssi),</div><div class='add'>+	};</div><div class='add'>+	struct mt792x_sta *msta;</div><div class='add'>+	struct mt792x_link_sta *mlink;</div><div class='add'>+</div><div class='add'>+	if (link_sta) {</div><div class='add'>+		msta = (struct mt792x_sta *)link_sta-&gt;sta-&gt;drv_priv;</div><div class='add'>+		mlink = mt792x_sta_to_link(msta, link_sta-&gt;link_id);</div><div class='add'>+	}</div><div class='add'>+	info.wcid = link_sta ? &amp;mlink-&gt;wcid : &amp;mvif-&gt;sta.deflink.wcid;</div><div class='add'>+	info.newly = state != MT76_STA_INFO_STATE_ASSOC;</div><div class='add'>+</div><div class='add'>+	return mt7925_mcu_sta_cmd(&amp;dev-&gt;mphy, &amp;info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_beacon_filter(struct mt792x_dev *dev,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 bool enable)</div><div class='add'>+{</div><div class='add'>+#define MT7925_FIF_BIT_CLR		BIT(1)</div><div class='add'>+#define MT7925_FIF_BIT_SET		BIT(0)</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		err = mt7925_mcu_uni_bss_bcnft(dev, &amp;vif-&gt;bss_conf, true);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		return mt7925_mcu_set_rxfilter(dev, 0,</div><div class='add'>+					       MT7925_FIF_BIT_SET,</div><div class='add'>+					       MT_WF_RFCR_DROP_OTHER_BEACON);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mt7925_mcu_set_bss_pm(dev, &amp;vif-&gt;bss_conf, false);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return mt7925_mcu_set_rxfilter(dev, 0,</div><div class='add'>+				       MT7925_FIF_BIT_CLR,</div><div class='add'>+				       MT_WF_RFCR_DROP_OTHER_BEACON);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_get_txpwr_info(struct mt792x_dev *dev, u8 band_idx, struct mt7925_txpwr *txpwr)</div><div class='add'>+{</div><div class='add'>+#define TX_POWER_SHOW_INFO 0x7</div><div class='add'>+#define TXPOWER_ALL_RATE_POWER_INFO 0x2</div><div class='add'>+	struct mt7925_txpwr_event *event;</div><div class='add'>+	struct mt7925_txpwr_req req = {</div><div class='add'>+		.tag = cpu_to_le16(TX_POWER_SHOW_INFO),</div><div class='add'>+		.len = cpu_to_le16(sizeof(req) - 4),</div><div class='add'>+		.catg = TXPOWER_ALL_RATE_POWER_INFO,</div><div class='add'>+		.band_idx = band_idx,</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD(TXPOWER),</div><div class='add'>+					&amp;req, sizeof(req), true, &amp;skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	event = (struct mt7925_txpwr_event *)skb-&gt;data;</div><div class='add'>+	memcpy(txpwr, &amp;event-&gt;txpwr, sizeof(event-&gt;txpwr));</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_sniffer(struct mt792x_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			   bool enable)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 band_idx;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct sniffer_enable_tlv {</div><div class='add'>+			__le16 tag;</div><div class='add'>+			__le16 len;</div><div class='add'>+			u8 enable;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed enable;</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.hdr = {</div><div class='add'>+			.band_idx = 0,</div><div class='add'>+		},</div><div class='add'>+		.enable = {</div><div class='add'>+			.tag = cpu_to_le16(UNI_SNIFFER_ENABLE),</div><div class='add'>+			.len = cpu_to_le16(sizeof(struct sniffer_enable_tlv)),</div><div class='add'>+			.enable = enable,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD(SNIFFER), &amp;req, sizeof(req),</div><div class='add'>+				 true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_config_sniffer(struct mt792x_vif *vif,</div><div class='add'>+			      struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct mt76_phy *mphy = vif-&gt;phy-&gt;mt76;</div><div class='add'>+	struct cfg80211_chan_def *chandef = ctx ? &amp;ctx-&gt;def : &amp;mphy-&gt;chandef;</div><div class='add'>+	int freq1 = chandef-&gt;center_freq1, freq2 = chandef-&gt;center_freq2;</div><div class='add'>+</div><div class='add'>+	static const u8 ch_band[] = {</div><div class='add'>+		[NL80211_BAND_2GHZ] = 1,</div><div class='add'>+		[NL80211_BAND_5GHZ] = 2,</div><div class='add'>+		[NL80211_BAND_6GHZ] = 3,</div><div class='add'>+	};</div><div class='add'>+	static const u8 ch_width[] = {</div><div class='add'>+		[NL80211_CHAN_WIDTH_20_NOHT] = 0,</div><div class='add'>+		[NL80211_CHAN_WIDTH_20] = 0,</div><div class='add'>+		[NL80211_CHAN_WIDTH_40] = 0,</div><div class='add'>+		[NL80211_CHAN_WIDTH_80] = 1,</div><div class='add'>+		[NL80211_CHAN_WIDTH_160] = 2,</div><div class='add'>+		[NL80211_CHAN_WIDTH_80P80] = 3,</div><div class='add'>+		[NL80211_CHAN_WIDTH_5] = 4,</div><div class='add'>+		[NL80211_CHAN_WIDTH_10] = 5,</div><div class='add'>+		[NL80211_CHAN_WIDTH_320] = 6,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 band_idx;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct config_tlv {</div><div class='add'>+			__le16 tag;</div><div class='add'>+			__le16 len;</div><div class='add'>+			u16 aid;</div><div class='add'>+			u8 ch_band;</div><div class='add'>+			u8 bw;</div><div class='add'>+			u8 control_ch;</div><div class='add'>+			u8 sco;</div><div class='add'>+			u8 center_ch;</div><div class='add'>+			u8 center_ch2;</div><div class='add'>+			u8 drop_err;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed tlv;</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.hdr = {</div><div class='add'>+			.band_idx = 0,</div><div class='add'>+		},</div><div class='add'>+		.tlv = {</div><div class='add'>+			.tag = cpu_to_le16(UNI_SNIFFER_CONFIG),</div><div class='add'>+			.len = cpu_to_le16(sizeof(req.tlv)),</div><div class='add'>+			.control_ch = chandef-&gt;chan-&gt;hw_value,</div><div class='add'>+			.center_ch = ieee80211_frequency_to_channel(freq1),</div><div class='add'>+			.drop_err = 1,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (chandef-&gt;chan-&gt;band &lt; ARRAY_SIZE(ch_band))</div><div class='add'>+		req.tlv.ch_band = ch_band[chandef-&gt;chan-&gt;band];</div><div class='add'>+	if (chandef-&gt;width &lt; ARRAY_SIZE(ch_width))</div><div class='add'>+		req.tlv.bw = ch_width[chandef-&gt;width];</div><div class='add'>+</div><div class='add'>+	if (freq2)</div><div class='add'>+		req.tlv.center_ch2 = ieee80211_frequency_to_channel(freq2);</div><div class='add'>+</div><div class='add'>+	if (req.tlv.control_ch &lt; req.tlv.center_ch)</div><div class='add'>+		req.tlv.sco = 1; /* SCA */</div><div class='add'>+	else if (req.tlv.control_ch &gt; req.tlv.center_ch)</div><div class='add'>+		req.tlv.sco = 3; /* SCB */</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(mphy-&gt;dev, MCU_UNI_CMD(SNIFFER),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+mt7925_mcu_uni_add_beacon_offload(struct mt792x_dev *dev,</div><div class='add'>+				  struct ieee80211_hw *hw,</div><div class='add'>+				  struct ieee80211_vif *vif,</div><div class='add'>+				  bool enable)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)vif-&gt;drv_priv;</div><div class='add'>+	struct ieee80211_mutable_offsets offs;</div><div class='add'>+	struct {</div><div class='add'>+		struct req_hdr {</div><div class='add'>+			u8 bss_idx;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct bcn_content_tlv {</div><div class='add'>+			__le16 tag;</div><div class='add'>+			__le16 len;</div><div class='add'>+			__le16 tim_ie_pos;</div><div class='add'>+			__le16 csa_ie_pos;</div><div class='add'>+			__le16 bcc_ie_pos;</div><div class='add'>+			/* 0: disable beacon offload</div><div class='add'>+			 * 1: enable beacon offload</div><div class='add'>+			 * 2: update probe respond offload</div><div class='add'>+			 */</div><div class='add'>+			u8 enable;</div><div class='add'>+			/* 0: legacy format (TXD + payload)</div><div class='add'>+			 * 1: only cap field IE</div><div class='add'>+			 */</div><div class='add'>+			u8 type;</div><div class='add'>+			__le16 pkt_len;</div><div class='add'>+			u8 pkt[512];</div><div class='add'>+		} __packed beacon_tlv;</div><div class='add'>+	} req = {</div><div class='add'>+		.hdr = {</div><div class='add'>+			.bss_idx = mvif-&gt;bss_conf.mt76.idx,</div><div class='add'>+		},</div><div class='add'>+		.beacon_tlv = {</div><div class='add'>+			.tag = cpu_to_le16(UNI_BSS_INFO_BCN_CONTENT),</div><div class='add'>+			.len = cpu_to_le16(sizeof(struct bcn_content_tlv)),</div><div class='add'>+			.enable = enable,</div><div class='add'>+			.type = 1,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u8 cap_offs;</div><div class='add'>+</div><div class='add'>+	/* support enable/update process only</div><div class='add'>+	 * disable flow would be handled in bss stop handler automatically</div><div class='add'>+	 */</div><div class='add'>+	if (!enable)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	skb = ieee80211_beacon_get_template(mt76_hw(dev), vif, &amp;offs, 0);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cap_offs = offsetof(struct ieee80211_mgmt, u.beacon.capab_info);</div><div class='add'>+	if (!skb_pull(skb, cap_offs)) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "beacon format err\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &gt; 512) {</div><div class='add'>+		dev_err(dev-&gt;mt76.dev, "beacon size limit exceed\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(req.beacon_tlv.pkt, skb-&gt;data, skb-&gt;len);</div><div class='add'>+	req.beacon_tlv.pkt_len = cpu_to_le16(skb-&gt;len);</div><div class='add'>+	offs.tim_offset -= cap_offs;</div><div class='add'>+	req.beacon_tlv.tim_ie_pos = cpu_to_le16(offs.tim_offset);</div><div class='add'>+</div><div class='add'>+	if (offs.cntdwn_counter_offs[0]) {</div><div class='add'>+		u16 csa_offs;</div><div class='add'>+</div><div class='add'>+		csa_offs = offs.cntdwn_counter_offs[0] - cap_offs - 4;</div><div class='add'>+		req.beacon_tlv.csa_ie_pos = cpu_to_le16(csa_offs);</div><div class='add'>+	}</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD(BSS_INFO_UPDATE),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void mt7925_mcu_bss_rlm_tlv(struct sk_buff *skb, struct mt76_phy *phy,</div><div class='add'>+			    struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			    struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct cfg80211_chan_def *chandef = ctx ? &amp;ctx-&gt;def :</div><div class='add'>+						  &amp;link_conf-&gt;chanreq.oper;</div><div class='add'>+	int freq1 = chandef-&gt;center_freq1, freq2 = chandef-&gt;center_freq2;</div><div class='add'>+	enum nl80211_band band = chandef-&gt;chan-&gt;band;</div><div class='add'>+	struct bss_rlm_tlv *req;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, UNI_BSS_INFO_RLM, sizeof(*req));</div><div class='add'>+	req = (struct bss_rlm_tlv *)tlv;</div><div class='add'>+	req-&gt;control_channel = chandef-&gt;chan-&gt;hw_value;</div><div class='add'>+	req-&gt;center_chan = ieee80211_frequency_to_channel(freq1);</div><div class='add'>+	req-&gt;center_chan2 = 0;</div><div class='add'>+	req-&gt;tx_streams = hweight8(phy-&gt;antenna_mask);</div><div class='add'>+	req-&gt;ht_op_info = 4; /* set HT 40M allowed */</div><div class='add'>+	req-&gt;rx_streams = hweight8(phy-&gt;antenna_mask);</div><div class='add'>+	req-&gt;center_chan2 = 0;</div><div class='add'>+	req-&gt;sco = 0;</div><div class='add'>+	req-&gt;band = 1;</div><div class='add'>+</div><div class='add'>+	switch (band) {</div><div class='add'>+	case NL80211_BAND_2GHZ:</div><div class='add'>+		req-&gt;band = 1;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_BAND_5GHZ:</div><div class='add'>+		req-&gt;band = 2;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_BAND_6GHZ:</div><div class='add'>+		req-&gt;band = 3;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (chandef-&gt;width) {</div><div class='add'>+	case NL80211_CHAN_WIDTH_40:</div><div class='add'>+		req-&gt;bw = CMD_CBW_40MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_80:</div><div class='add'>+		req-&gt;bw = CMD_CBW_80MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_80P80:</div><div class='add'>+		req-&gt;bw = CMD_CBW_8080MHZ;</div><div class='add'>+		req-&gt;center_chan2 = ieee80211_frequency_to_channel(freq2);</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_160:</div><div class='add'>+		req-&gt;bw = CMD_CBW_160MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_5:</div><div class='add'>+		req-&gt;bw = CMD_CBW_5MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_10:</div><div class='add'>+		req-&gt;bw = CMD_CBW_10MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_CHAN_WIDTH_20_NOHT:</div><div class='add'>+	case NL80211_CHAN_WIDTH_20:</div><div class='add'>+	default:</div><div class='add'>+		req-&gt;bw = CMD_CBW_20MHZ;</div><div class='add'>+		req-&gt;ht_op_info = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (req-&gt;control_channel &lt; req-&gt;center_chan)</div><div class='add'>+		req-&gt;sco = 1; /* SCA */</div><div class='add'>+	else if (req-&gt;control_channel &gt; req-&gt;center_chan)</div><div class='add'>+		req-&gt;sco = 3; /* SCB */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *</div><div class='add'>+__mt7925_mcu_alloc_bss_req(struct mt76_dev *dev, struct mt76_vif_link *mvif, int len)</div><div class='add'>+{</div><div class='add'>+	struct bss_req_hdr hdr = {</div><div class='add'>+		.bss_idx = mvif-&gt;idx,</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = mt76_mcu_msg_alloc(dev, NULL, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	skb_put_data(skb, &amp;hdr, sizeof(hdr));</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void mt7925_mcu_bss_eht_tlv(struct sk_buff *skb, struct mt76_phy *phy,</div><div class='add'>+			    struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			    struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct cfg80211_chan_def *chandef = ctx ? &amp;ctx-&gt;def :</div><div class='add'>+						  &amp;link_conf-&gt;chanreq.oper;</div><div class='add'>+</div><div class='add'>+	struct bss_eht_tlv *req;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, UNI_BSS_INFO_EHT, sizeof(*req));</div><div class='add'>+	req = (struct bss_eht_tlv *)tlv;</div><div class='add'>+	req-&gt;is_eth_dscb_present = chandef-&gt;punctured ? 1 : 0;</div><div class='add'>+	req-&gt;eht_dis_sub_chan_bitmap = cpu_to_le16(chandef-&gt;punctured);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_eht_pp(struct mt76_phy *phy, struct mt76_vif_link *mvif,</div><div class='add'>+			  struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			  struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = __mt7925_mcu_alloc_bss_req(phy-&gt;dev, mvif,</div><div class='add'>+					 MT7925_BSS_UPDATE_MAX_SIZE);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+</div><div class='add'>+	mt7925_mcu_bss_eht_tlv(skb, phy, link_conf, ctx);</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_skb_send_msg(phy-&gt;dev, skb,</div><div class='add'>+				     MCU_UNI_CMD(BSS_INFO_UPDATE), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_chctx(struct mt76_phy *phy, struct mt76_vif_link *mvif,</div><div class='add'>+			 struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			 struct ieee80211_chanctx_conf *ctx)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = __mt7925_mcu_alloc_bss_req(phy-&gt;dev, mvif,</div><div class='add'>+					 MT7925_BSS_UPDATE_MAX_SIZE);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+</div><div class='add'>+	mt7925_mcu_bss_rlm_tlv(skb, phy, link_conf, ctx);</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_skb_send_msg(phy-&gt;dev, skb,</div><div class='add'>+				     MCU_UNI_CMD(BSS_INFO_UPDATE), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8</div><div class='add'>+mt7925_get_phy_mode_ext(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='add'>+			enum nl80211_band band,</div><div class='add'>+			struct ieee80211_link_sta *link_sta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_he_6ghz_capa *he_6ghz_capa;</div><div class='add'>+	const struct ieee80211_sta_eht_cap *eht_cap;</div><div class='add'>+	__le16 capa = 0;</div><div class='add'>+	u8 mode = 0;</div><div class='add'>+</div><div class='add'>+	if (link_sta) {</div><div class='add'>+		he_6ghz_capa = &amp;link_sta-&gt;he_6ghz_capa;</div><div class='add'>+		eht_cap = &amp;link_sta-&gt;eht_cap;</div><div class='add'>+	} else {</div><div class='add'>+		struct ieee80211_supported_band *sband;</div><div class='add'>+</div><div class='add'>+		sband = phy-&gt;hw-&gt;wiphy-&gt;bands[band];</div><div class='add'>+		capa = ieee80211_get_he_6ghz_capa(sband, vif-&gt;type);</div><div class='add'>+		he_6ghz_capa = (struct ieee80211_he_6ghz_capa *)&amp;capa;</div><div class='add'>+</div><div class='add'>+		eht_cap = ieee80211_get_eht_iftype_cap(sband, vif-&gt;type);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (band) {</div><div class='add'>+	case NL80211_BAND_2GHZ:</div><div class='add'>+		if (eht_cap &amp;&amp; eht_cap-&gt;has_eht)</div><div class='add'>+			mode |= PHY_MODE_BE_24G;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_BAND_5GHZ:</div><div class='add'>+		if (eht_cap &amp;&amp; eht_cap-&gt;has_eht)</div><div class='add'>+			mode |= PHY_MODE_BE_5G;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_BAND_6GHZ:</div><div class='add'>+		if (he_6ghz_capa &amp;&amp; he_6ghz_capa-&gt;capa)</div><div class='add'>+			mode |= PHY_MODE_AX_6G;</div><div class='add'>+</div><div class='add'>+		if (eht_cap &amp;&amp; eht_cap-&gt;has_eht)</div><div class='add'>+			mode |= PHY_MODE_BE_6G;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_bss_basic_tlv(struct sk_buff *skb,</div><div class='add'>+			 struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			 struct ieee80211_link_sta *link_sta,</div><div class='add'>+			 struct ieee80211_chanctx_conf *ctx,</div><div class='add'>+			 struct mt76_phy *phy, u16 wlan_idx,</div><div class='add'>+			 bool enable)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = link_conf-&gt;vif;</div><div class='add'>+	struct mt792x_bss_conf *mconf = mt792x_link_conf_to_mconf(link_conf);</div><div class='add'>+	struct cfg80211_chan_def *chandef = ctx ? &amp;ctx-&gt;def :</div><div class='add'>+						  &amp;link_conf-&gt;chanreq.oper;</div><div class='add'>+	enum nl80211_band band = chandef-&gt;chan-&gt;band;</div><div class='add'>+	struct mt76_connac_bss_basic_tlv *basic_req;</div><div class='add'>+	struct mt792x_link_sta *mlink;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+	int conn_type;</div><div class='add'>+	u8 idx;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, UNI_BSS_INFO_BASIC, sizeof(*basic_req));</div><div class='add'>+	basic_req = (struct mt76_connac_bss_basic_tlv *)tlv;</div><div class='add'>+</div><div class='add'>+	idx = mconf-&gt;mt76.omac_idx &gt; EXT_BSSID_START ? HW_BSSID_0 :</div><div class='add'>+						      mconf-&gt;mt76.omac_idx;</div><div class='add'>+	basic_req-&gt;hw_bss_idx = idx;</div><div class='add'>+</div><div class='add'>+	basic_req-&gt;phymode_ext = mt7925_get_phy_mode_ext(phy, vif, band,</div><div class='add'>+							 link_sta);</div><div class='add'>+</div><div class='add'>+	if (band == NL80211_BAND_2GHZ)</div><div class='add'>+		basic_req-&gt;nonht_basic_phy = cpu_to_le16(PHY_TYPE_ERP_INDEX);</div><div class='add'>+	else</div><div class='add'>+		basic_req-&gt;nonht_basic_phy = cpu_to_le16(PHY_TYPE_OFDM_INDEX);</div><div class='add'>+</div><div class='add'>+	memcpy(basic_req-&gt;bssid, link_conf-&gt;bssid, ETH_ALEN);</div><div class='add'>+	basic_req-&gt;phymode = mt76_connac_get_phy_mode(phy, vif, band, link_sta);</div><div class='add'>+	basic_req-&gt;bcn_interval = cpu_to_le16(link_conf-&gt;beacon_int);</div><div class='add'>+	basic_req-&gt;dtim_period = link_conf-&gt;dtim_period;</div><div class='add'>+	basic_req-&gt;bmc_tx_wlan_idx = cpu_to_le16(wlan_idx);</div><div class='add'>+	basic_req-&gt;link_idx = mconf-&gt;mt76.idx;</div><div class='add'>+</div><div class='add'>+	if (link_sta) {</div><div class='add'>+		struct mt792x_sta *msta;</div><div class='add'>+</div><div class='add'>+		msta = (struct mt792x_sta *)link_sta-&gt;sta-&gt;drv_priv;</div><div class='add'>+		mlink = mt792x_sta_to_link(msta, link_sta-&gt;link_id);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		mlink = &amp;mconf-&gt;vif-&gt;sta.deflink;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	basic_req-&gt;sta_idx = cpu_to_le16(mlink-&gt;wcid.idx);</div><div class='add'>+	basic_req-&gt;omac_idx = mconf-&gt;mt76.omac_idx;</div><div class='add'>+	basic_req-&gt;band_idx = mconf-&gt;mt76.band_idx;</div><div class='add'>+	basic_req-&gt;wmm_idx = mconf-&gt;mt76.wmm_idx;</div><div class='add'>+	basic_req-&gt;conn_state = !enable;</div><div class='add'>+</div><div class='add'>+	switch (vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_MESH_POINT:</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		if (vif-&gt;p2p)</div><div class='add'>+			conn_type = CONNECTION_P2P_GO;</div><div class='add'>+		else</div><div class='add'>+			conn_type = CONNECTION_INFRA_AP;</div><div class='add'>+		basic_req-&gt;conn_type = cpu_to_le32(conn_type);</div><div class='add'>+		basic_req-&gt;active = enable;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		if (vif-&gt;p2p)</div><div class='add'>+			conn_type = CONNECTION_P2P_GC;</div><div class='add'>+		else</div><div class='add'>+			conn_type = CONNECTION_INFRA_STA;</div><div class='add'>+		basic_req-&gt;conn_type = cpu_to_le32(conn_type);</div><div class='add'>+		basic_req-&gt;active = true;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		basic_req-&gt;conn_type = cpu_to_le32(CONNECTION_IBSS_ADHOC);</div><div class='add'>+		basic_req-&gt;active = true;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_bss_sec_tlv(struct sk_buff *skb,</div><div class='add'>+		       struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_bss_conf *mconf = mt792x_link_conf_to_mconf(link_conf);</div><div class='add'>+	struct mt76_vif_link *mvif = &amp;mconf-&gt;mt76;</div><div class='add'>+	struct bss_sec_tlv {</div><div class='add'>+		__le16 tag;</div><div class='add'>+		__le16 len;</div><div class='add'>+		u8 mode;</div><div class='add'>+		u8 status;</div><div class='add'>+		u8 cipher;</div><div class='add'>+		u8 __rsv;</div><div class='add'>+	} __packed * sec;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, UNI_BSS_INFO_SEC, sizeof(*sec));</div><div class='add'>+	sec = (struct bss_sec_tlv *)tlv;</div><div class='add'>+</div><div class='add'>+	switch (mvif-&gt;cipher) {</div><div class='add'>+	case CONNAC3_CIPHER_GCMP_256:</div><div class='add'>+	case CONNAC3_CIPHER_GCMP:</div><div class='add'>+		sec-&gt;mode = MODE_WPA3_SAE;</div><div class='add'>+		sec-&gt;status = 8;</div><div class='add'>+		break;</div><div class='add'>+	case CONNAC3_CIPHER_AES_CCMP:</div><div class='add'>+		sec-&gt;mode = MODE_WPA2_PSK;</div><div class='add'>+		sec-&gt;status = 6;</div><div class='add'>+		break;</div><div class='add'>+	case CONNAC3_CIPHER_TKIP:</div><div class='add'>+		sec-&gt;mode = MODE_WPA2_PSK;</div><div class='add'>+		sec-&gt;status = 4;</div><div class='add'>+		break;</div><div class='add'>+	case CONNAC3_CIPHER_WEP104:</div><div class='add'>+	case CONNAC3_CIPHER_WEP40:</div><div class='add'>+		sec-&gt;mode = MODE_SHARED;</div><div class='add'>+		sec-&gt;status = 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		sec-&gt;mode = MODE_OPEN;</div><div class='add'>+		sec-&gt;status = 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sec-&gt;cipher = mvif-&gt;cipher;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_bss_bmc_tlv(struct sk_buff *skb, struct mt792x_phy *phy,</div><div class='add'>+		       struct ieee80211_chanctx_conf *ctx,</div><div class='add'>+		       struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct cfg80211_chan_def *chandef = ctx ? &amp;ctx-&gt;def :</div><div class='add'>+						  &amp;link_conf-&gt;chanreq.oper;</div><div class='add'>+	struct mt792x_bss_conf *mconf = mt792x_link_conf_to_mconf(link_conf);</div><div class='add'>+	enum nl80211_band band = chandef-&gt;chan-&gt;band;</div><div class='add'>+	struct mt76_vif_link *mvif = &amp;mconf-&gt;mt76;</div><div class='add'>+	struct bss_rate_tlv *bmc;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+	u8 idx = mvif-&gt;mcast_rates_idx ?</div><div class='add'>+		 mvif-&gt;mcast_rates_idx : mvif-&gt;basic_rates_idx;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, UNI_BSS_INFO_RATE, sizeof(*bmc));</div><div class='add'>+</div><div class='add'>+	bmc = (struct bss_rate_tlv *)tlv;</div><div class='add'>+</div><div class='add'>+	if (band == NL80211_BAND_2GHZ)</div><div class='add'>+		bmc-&gt;basic_rate = cpu_to_le16(HR_DSSS_ERP_BASIC_RATE);</div><div class='add'>+	else</div><div class='add'>+		bmc-&gt;basic_rate = cpu_to_le16(OFDM_BASIC_RATE);</div><div class='add'>+</div><div class='add'>+	bmc-&gt;short_preamble = (band == NL80211_BAND_2GHZ);</div><div class='add'>+	bmc-&gt;bc_fixed_rate = idx;</div><div class='add'>+	bmc-&gt;mc_fixed_rate = idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_bss_mld_tlv(struct sk_buff *skb,</div><div class='add'>+		       struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = link_conf-&gt;vif;</div><div class='add'>+	struct mt792x_bss_conf *mconf = mt792x_link_conf_to_mconf(link_conf);</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)link_conf-&gt;vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_phy *phy = mvif-&gt;phy;</div><div class='add'>+	struct bss_mld_tlv *mld;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+	bool is_mld;</div><div class='add'>+</div><div class='add'>+	is_mld = ieee80211_vif_is_mld(link_conf-&gt;vif) ||</div><div class='add'>+		 (hweight16(mvif-&gt;valid_links) &gt; 1);</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, UNI_BSS_INFO_MLD, sizeof(*mld));</div><div class='add'>+	mld = (struct bss_mld_tlv *)tlv;</div><div class='add'>+</div><div class='add'>+	mld-&gt;link_id = is_mld ? link_conf-&gt;link_id : 0xff;</div><div class='add'>+	/* apply the index of the primary link */</div><div class='add'>+	mld-&gt;group_mld_id = is_mld ? mvif-&gt;bss_conf.mt76.idx : 0xff;</div><div class='add'>+	mld-&gt;own_mld_id = mconf-&gt;mt76.idx + 32;</div><div class='add'>+	mld-&gt;remap_idx = 0xff;</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;chip_cap &amp; MT792x_CHIP_CAP_MLO_EML_EN) {</div><div class='add'>+		mld-&gt;eml_enable = !!(link_conf-&gt;vif-&gt;cfg.eml_cap &amp;</div><div class='add'>+				     IEEE80211_EML_CAP_EMLSR_SUPP);</div><div class='add'>+	} else {</div><div class='add'>+		mld-&gt;eml_enable = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(mld-&gt;mac_addr, vif-&gt;addr, ETH_ALEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_bss_qos_tlv(struct sk_buff *skb, struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct mt76_connac_bss_qos_tlv *qos;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, UNI_BSS_INFO_QBSS, sizeof(*qos));</div><div class='add'>+	qos = (struct mt76_connac_bss_qos_tlv *)tlv;</div><div class='add'>+	qos-&gt;qos = link_conf-&gt;qos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_bss_mbssid_tlv(struct sk_buff *skb, struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			  bool enable)</div><div class='add'>+{</div><div class='add'>+	struct bss_info_uni_mbssid *mbssid;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	if (!enable &amp;&amp; !link_conf-&gt;bssid_indicator)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, UNI_BSS_INFO_11V_MBSSID,</div><div class='add'>+				      sizeof(*mbssid));</div><div class='add'>+</div><div class='add'>+	mbssid = (struct bss_info_uni_mbssid *)tlv;</div><div class='add'>+	mbssid-&gt;max_indicator = link_conf-&gt;bssid_indicator;</div><div class='add'>+	mbssid-&gt;mbss_idx = link_conf-&gt;bssid_index;</div><div class='add'>+	mbssid-&gt;tx_bss_omac_idx = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_bss_he_tlv(struct sk_buff *skb, struct ieee80211_bss_conf *link_conf,</div><div class='add'>+		      struct mt792x_phy *phy)</div><div class='add'>+{</div><div class='add'>+#define DEFAULT_HE_PE_DURATION		4</div><div class='add'>+#define DEFAULT_HE_DURATION_RTS_THRES	1023</div><div class='add'>+	const struct ieee80211_sta_he_cap *cap;</div><div class='add'>+	struct bss_info_uni_he *he;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	cap = mt76_connac_get_he_phy_cap(phy-&gt;mt76, link_conf-&gt;vif);</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, UNI_BSS_INFO_HE_BASIC, sizeof(*he));</div><div class='add'>+</div><div class='add'>+	he = (struct bss_info_uni_he *)tlv;</div><div class='add'>+	he-&gt;he_pe_duration = link_conf-&gt;htc_trig_based_pkt_ext;</div><div class='add'>+	if (!he-&gt;he_pe_duration)</div><div class='add'>+		he-&gt;he_pe_duration = DEFAULT_HE_PE_DURATION;</div><div class='add'>+</div><div class='add'>+	he-&gt;he_rts_thres = cpu_to_le16(link_conf-&gt;frame_time_rts_th);</div><div class='add'>+	if (!he-&gt;he_rts_thres)</div><div class='add'>+		he-&gt;he_rts_thres = cpu_to_le16(DEFAULT_HE_DURATION_RTS_THRES);</div><div class='add'>+</div><div class='add'>+	he-&gt;max_nss_mcs[CMD_HE_MCS_BW80] = cap-&gt;he_mcs_nss_supp.tx_mcs_80;</div><div class='add'>+	he-&gt;max_nss_mcs[CMD_HE_MCS_BW160] = cap-&gt;he_mcs_nss_supp.tx_mcs_160;</div><div class='add'>+	he-&gt;max_nss_mcs[CMD_HE_MCS_BW8080] = cap-&gt;he_mcs_nss_supp.tx_mcs_80p80;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_bss_color_tlv(struct sk_buff *skb, struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			 bool enable)</div><div class='add'>+{</div><div class='add'>+	struct bss_info_uni_bss_color *color;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, UNI_BSS_INFO_BSS_COLOR, sizeof(*color));</div><div class='add'>+	color = (struct bss_info_uni_bss_color *)tlv;</div><div class='add'>+</div><div class='add'>+	color-&gt;enable = enable ?</div><div class='add'>+		link_conf-&gt;he_bss_color.enabled : 0;</div><div class='add'>+	color-&gt;bss_color = enable ?</div><div class='add'>+		link_conf-&gt;he_bss_color.color : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_bss_ifs_tlv(struct sk_buff *skb,</div><div class='add'>+		       struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)link_conf-&gt;vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_phy *phy = mvif-&gt;phy;</div><div class='add'>+	struct bss_ifs_time_tlv *ifs_time;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, UNI_BSS_INFO_IFS_TIME, sizeof(*ifs_time));</div><div class='add'>+	ifs_time = (struct bss_ifs_time_tlv *)tlv;</div><div class='add'>+	ifs_time-&gt;slot_valid = true;</div><div class='add'>+	ifs_time-&gt;slot_time = cpu_to_le16(phy-&gt;slottime);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_timing(struct mt792x_phy *phy,</div><div class='add'>+			  struct ieee80211_bss_conf *link_conf)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_bss_conf *mconf = mt792x_link_conf_to_mconf(link_conf);</div><div class='add'>+	struct mt792x_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = __mt7925_mcu_alloc_bss_req(&amp;dev-&gt;mt76, &amp;mconf-&gt;mt76,</div><div class='add'>+					 MT7925_BSS_UPDATE_MAX_SIZE);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+</div><div class='add'>+	mt7925_mcu_bss_ifs_tlv(skb, link_conf);</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='add'>+				     MCU_UNI_CMD(BSS_INFO_UPDATE), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7925_mcu_del_dev(struct mt76_dev *mdev,</div><div class='add'>+			struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 omac_idx;</div><div class='add'>+			u8 band_idx;</div><div class='add'>+			__le16 pad;</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct req_tlv {</div><div class='add'>+			__le16 tag;</div><div class='add'>+			__le16 len;</div><div class='add'>+			u8 active;</div><div class='add'>+			u8 link_idx; /* hw link idx */</div><div class='add'>+			u8 omac_addr[ETH_ALEN];</div><div class='add'>+		} __packed tlv;</div><div class='add'>+	} dev_req = {</div><div class='add'>+		.tlv = {</div><div class='add'>+			.tag = cpu_to_le16(DEV_INFO_ACTIVE),</div><div class='add'>+			.len = cpu_to_le16(sizeof(struct req_tlv)),</div><div class='add'>+			.active = true,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 bss_idx;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct mt76_connac_bss_basic_tlv basic;</div><div class='add'>+	} basic_req = {</div><div class='add'>+		.basic = {</div><div class='add'>+			.tag = cpu_to_le16(UNI_BSS_INFO_BASIC),</div><div class='add'>+			.len = cpu_to_le16(sizeof(struct mt76_connac_bss_basic_tlv)),</div><div class='add'>+			.active = true,</div><div class='add'>+			.conn_state = 1,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dev_req.hdr.omac_idx = mvif-&gt;omac_idx;</div><div class='add'>+	dev_req.hdr.band_idx = mvif-&gt;band_idx;</div><div class='add'>+</div><div class='add'>+	basic_req.hdr.bss_idx = mvif-&gt;idx;</div><div class='add'>+	basic_req.basic.omac_idx = mvif-&gt;omac_idx;</div><div class='add'>+	basic_req.basic.band_idx = mvif-&gt;band_idx;</div><div class='add'>+	basic_req.basic.link_idx = mvif-&gt;link_idx;</div><div class='add'>+</div><div class='add'>+	mt76_mcu_send_msg(mdev, MCU_UNI_CMD(BSS_INFO_UPDATE),</div><div class='add'>+			  &amp;basic_req, sizeof(basic_req), true);</div><div class='add'>+</div><div class='add'>+	/* recovery omac address for the legacy interface */</div><div class='add'>+	memcpy(dev_req.tlv.omac_addr, vif-&gt;addr, ETH_ALEN);</div><div class='add'>+	mt76_mcu_send_msg(mdev, MCU_UNI_CMD(DEV_INFO_UPDATE),</div><div class='add'>+			  &amp;dev_req, sizeof(dev_req), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_add_bss_info(struct mt792x_phy *phy,</div><div class='add'>+			    struct ieee80211_chanctx_conf *ctx,</div><div class='add'>+			    struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			    struct ieee80211_link_sta *link_sta,</div><div class='add'>+			    int enable)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_vif *mvif = (struct mt792x_vif *)link_conf-&gt;vif-&gt;drv_priv;</div><div class='add'>+	struct mt792x_bss_conf *mconf = mt792x_link_conf_to_mconf(link_conf);</div><div class='add'>+	struct mt792x_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct mt792x_link_sta *mlink_bc;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = __mt7925_mcu_alloc_bss_req(&amp;dev-&gt;mt76, &amp;mconf-&gt;mt76,</div><div class='add'>+					 MT7925_BSS_UPDATE_MAX_SIZE);</div><div class='add'>+	if (IS_ERR(skb))</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+</div><div class='add'>+	mlink_bc = mt792x_sta_to_link(&amp;mvif-&gt;sta, mconf-&gt;link_id);</div><div class='add'>+</div><div class='add'>+	/* bss_basic must be first */</div><div class='add'>+	mt7925_mcu_bss_basic_tlv(skb, link_conf, link_sta, ctx, phy-&gt;mt76,</div><div class='add'>+				 mlink_bc-&gt;wcid.idx, enable);</div><div class='add'>+	mt7925_mcu_bss_sec_tlv(skb, link_conf);</div><div class='add'>+	mt7925_mcu_bss_bmc_tlv(skb, phy, ctx, link_conf);</div><div class='add'>+	mt7925_mcu_bss_qos_tlv(skb, link_conf);</div><div class='add'>+	mt7925_mcu_bss_mld_tlv(skb, link_conf);</div><div class='add'>+	mt7925_mcu_bss_ifs_tlv(skb, link_conf);</div><div class='add'>+</div><div class='add'>+	if (link_conf-&gt;he_support) {</div><div class='add'>+		mt7925_mcu_bss_he_tlv(skb, link_conf, phy);</div><div class='add'>+		mt7925_mcu_bss_color_tlv(skb, link_conf, enable);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		mt7925_mcu_bss_rlm_tlv(skb, phy-&gt;mt76, link_conf, ctx);</div><div class='add'>+		mt7925_mcu_bss_mbssid_tlv(skb, link_conf, enable);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='add'>+				     MCU_UNI_CMD(BSS_INFO_UPDATE), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_dbdc(struct mt76_phy *phy, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct mt76_dev *mdev = phy-&gt;dev;</div><div class='add'>+</div><div class='add'>+	struct mbmc_conf_tlv *conf;</div><div class='add'>+	struct mbmc_set_req *hdr;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+	int max_len, err;</div><div class='add'>+</div><div class='add'>+	max_len = sizeof(*hdr) + sizeof(*conf);</div><div class='add'>+	skb = mt76_mcu_msg_alloc(mdev, NULL, max_len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hdr = (struct mbmc_set_req *)skb_put(skb, sizeof(*hdr));</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, UNI_MBMC_SETTING, sizeof(*conf));</div><div class='add'>+	conf = (struct mbmc_conf_tlv *)tlv;</div><div class='add'>+</div><div class='add'>+	conf-&gt;mbmc_en = enable;</div><div class='add'>+	conf-&gt;band = 0; /* unused */</div><div class='add'>+</div><div class='add'>+	err = mt76_mcu_skb_send_msg(mdev, skb, MCU_UNI_CMD(SET_DBDC_PARMS),</div><div class='add'>+				    true);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_build_scan_ie_tlv(struct mt76_dev *mdev,</div><div class='add'>+			     struct sk_buff *skb,</div><div class='add'>+			     struct ieee80211_scan_ies *scan_ies)</div><div class='add'>+{</div><div class='add'>+	u32 max_len = sizeof(struct scan_ie_tlv) + MT76_CONNAC_SCAN_IE_LEN;</div><div class='add'>+	struct scan_ie_tlv *ie;</div><div class='add'>+	enum nl80211_band i;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+	const u8 *ies;</div><div class='add'>+	u16 ies_len;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= NL80211_BAND_6GHZ; i++) {</div><div class='add'>+		if (i == NL80211_BAND_60GHZ)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ies = scan_ies-&gt;ies[i];</div><div class='add'>+		ies_len = scan_ies-&gt;len[i];</div><div class='add'>+</div><div class='add'>+		if (!ies || !ies_len)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (ies_len &gt; max_len)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		tlv = mt76_connac_mcu_add_tlv(skb, UNI_SCAN_IE,</div><div class='add'>+					      sizeof(*ie) + ies_len);</div><div class='add'>+		ie = (struct scan_ie_tlv *)tlv;</div><div class='add'>+</div><div class='add'>+		memcpy(ie-&gt;ies, ies, ies_len);</div><div class='add'>+		ie-&gt;ies_len = cpu_to_le16(ies_len);</div><div class='add'>+</div><div class='add'>+		switch (i) {</div><div class='add'>+		case NL80211_BAND_2GHZ:</div><div class='add'>+			ie-&gt;band = 1;</div><div class='add'>+			break;</div><div class='add'>+		case NL80211_BAND_6GHZ:</div><div class='add'>+			ie-&gt;band = 3;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ie-&gt;band = 2;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		max_len -= (sizeof(*ie) + ies_len);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='add'>+		       struct ieee80211_scan_request *scan_req)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct cfg80211_scan_request *sreq = &amp;scan_req-&gt;req;</div><div class='add'>+	int n_ssids = 0, err, i;</div><div class='add'>+	struct ieee80211_channel **scan_list = sreq-&gt;channels;</div><div class='add'>+	struct mt76_dev *mdev = phy-&gt;dev;</div><div class='add'>+	struct mt76_connac_mcu_scan_channel *chan;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct scan_hdr_tlv *hdr;</div><div class='add'>+	struct scan_req_tlv *req;</div><div class='add'>+	struct scan_ssid_tlv *ssid;</div><div class='add'>+	struct scan_bssid_tlv *bssid;</div><div class='add'>+	struct scan_chan_info_tlv *chan_info;</div><div class='add'>+	struct scan_ie_tlv *ie;</div><div class='add'>+	struct scan_misc_tlv *misc;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+	int max_len;</div><div class='add'>+</div><div class='add'>+	if (test_bit(MT76_HW_SCANNING, &amp;phy-&gt;state))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	max_len = sizeof(*hdr) + sizeof(*req) + sizeof(*ssid) +</div><div class='add'>+		  sizeof(*bssid) * MT7925_RNR_SCAN_MAX_BSSIDS +</div><div class='add'>+		  sizeof(*chan_info) + sizeof(*misc) + sizeof(*ie) +</div><div class='add'>+		  MT76_CONNAC_SCAN_IE_LEN;</div><div class='add'>+</div><div class='add'>+	skb = mt76_mcu_msg_alloc(mdev, NULL, max_len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	set_bit(MT76_HW_SCANNING, &amp;phy-&gt;state);</div><div class='add'>+	mvif-&gt;scan_seq_num = (mvif-&gt;scan_seq_num + 1) &amp; 0x7f;</div><div class='add'>+</div><div class='add'>+	hdr = (struct scan_hdr_tlv *)skb_put(skb, sizeof(*hdr));</div><div class='add'>+	hdr-&gt;seq_num = mvif-&gt;scan_seq_num | mvif-&gt;band_idx &lt;&lt; 7;</div><div class='add'>+	hdr-&gt;bss_idx = mvif-&gt;idx;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, UNI_SCAN_REQ, sizeof(*req));</div><div class='add'>+	req = (struct scan_req_tlv *)tlv;</div><div class='add'>+	req-&gt;scan_type = sreq-&gt;n_ssids ? 1 : 0;</div><div class='add'>+	req-&gt;probe_req_num = sreq-&gt;n_ssids ? 2 : 0;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, UNI_SCAN_SSID, sizeof(*ssid));</div><div class='add'>+	ssid = (struct scan_ssid_tlv *)tlv;</div><div class='add'>+	for (i = 0; i &lt; sreq-&gt;n_ssids; i++) {</div><div class='add'>+		if (!sreq-&gt;ssids[i].ssid_len)</div><div class='add'>+			continue;</div><div class='add'>+		if (i &gt;= MT7925_RNR_SCAN_MAX_BSSIDS)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ssid-&gt;ssids[n_ssids].ssid_len = cpu_to_le32(sreq-&gt;ssids[i].ssid_len);</div><div class='add'>+		memcpy(ssid-&gt;ssids[n_ssids].ssid, sreq-&gt;ssids[i].ssid,</div><div class='add'>+		       sreq-&gt;ssids[i].ssid_len);</div><div class='add'>+		n_ssids++;</div><div class='add'>+	}</div><div class='add'>+	ssid-&gt;ssid_type = n_ssids ? BIT(2) : BIT(0);</div><div class='add'>+	ssid-&gt;ssids_num = n_ssids;</div><div class='add'>+</div><div class='add'>+	if (sreq-&gt;n_6ghz_params) {</div><div class='add'>+		u8 j;</div><div class='add'>+</div><div class='add'>+		mt76_connac_mcu_build_rnr_scan_param(mdev, sreq);</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; mdev-&gt;rnr.bssid_num; j++) {</div><div class='add'>+			if (j &gt;= MT7925_RNR_SCAN_MAX_BSSIDS)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			tlv = mt76_connac_mcu_add_tlv(skb, UNI_SCAN_BSSID,</div><div class='add'>+						      sizeof(*bssid));</div><div class='add'>+			bssid = (struct scan_bssid_tlv *)tlv;</div><div class='add'>+</div><div class='add'>+			ether_addr_copy(bssid-&gt;bssid, mdev-&gt;rnr.bssid[j]);</div><div class='add'>+			bssid-&gt;match_ch = mdev-&gt;rnr.channel[j];</div><div class='add'>+			bssid-&gt;match_ssid_ind = MT7925_RNR_SCAN_MAX_BSSIDS;</div><div class='add'>+			bssid-&gt;match_short_ssid_ind = MT7925_RNR_SCAN_MAX_BSSIDS;</div><div class='add'>+		}</div><div class='add'>+		req-&gt;scan_func |= SCAN_FUNC_RNR_SCAN;</div><div class='add'>+	} else {</div><div class='add'>+		tlv = mt76_connac_mcu_add_tlv(skb, UNI_SCAN_BSSID, sizeof(*bssid));</div><div class='add'>+		bssid = (struct scan_bssid_tlv *)tlv;</div><div class='add'>+</div><div class='add'>+		ether_addr_copy(bssid-&gt;bssid, sreq-&gt;bssid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, UNI_SCAN_CHANNEL, sizeof(*chan_info));</div><div class='add'>+	chan_info = (struct scan_chan_info_tlv *)tlv;</div><div class='add'>+	chan_info-&gt;channels_num = min_t(u8, sreq-&gt;n_channels,</div><div class='add'>+					ARRAY_SIZE(chan_info-&gt;channels));</div><div class='add'>+	for (i = 0; i &lt; chan_info-&gt;channels_num; i++) {</div><div class='add'>+		chan = &amp;chan_info-&gt;channels[i];</div><div class='add'>+</div><div class='add'>+		switch (scan_list[i]-&gt;band) {</div><div class='add'>+		case NL80211_BAND_2GHZ:</div><div class='add'>+			chan-&gt;band = 1;</div><div class='add'>+			break;</div><div class='add'>+		case NL80211_BAND_6GHZ:</div><div class='add'>+			chan-&gt;band = 3;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			chan-&gt;band = 2;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		chan-&gt;channel_num = scan_list[i]-&gt;hw_value;</div><div class='add'>+	}</div><div class='add'>+	chan_info-&gt;channel_type = sreq-&gt;n_channels ? 4 : 0;</div><div class='add'>+</div><div class='add'>+	req-&gt;scan_func |= SCAN_FUNC_SPLIT_SCAN;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, UNI_SCAN_MISC, sizeof(*misc));</div><div class='add'>+	misc = (struct scan_misc_tlv *)tlv;</div><div class='add'>+	if (sreq-&gt;flags &amp; NL80211_SCAN_FLAG_RANDOM_ADDR) {</div><div class='add'>+		get_random_mask_addr(misc-&gt;random_mac, sreq-&gt;mac_addr,</div><div class='add'>+				     sreq-&gt;mac_addr_mask);</div><div class='add'>+		req-&gt;scan_func |= SCAN_FUNC_RANDOM_MAC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Append scan probe IEs as the last tlv */</div><div class='add'>+	mt7925_mcu_build_scan_ie_tlv(mdev, skb, &amp;scan_req-&gt;ies);</div><div class='add'>+</div><div class='add'>+	err = mt76_mcu_skb_send_msg(mdev, skb, MCU_UNI_CMD(SCAN_REQ),</div><div class='add'>+				    true);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		clear_bit(MT76_HW_SCANNING, &amp;phy-&gt;state);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_mcu_hw_scan);</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_sched_scan_req(struct mt76_phy *phy,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      struct cfg80211_sched_scan_request *sreq,</div><div class='add'>+			      struct ieee80211_scan_ies *ies)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct ieee80211_channel **scan_list = sreq-&gt;channels;</div><div class='add'>+	struct mt76_connac_mcu_scan_channel *chan;</div><div class='add'>+	struct mt76_dev *mdev = phy-&gt;dev;</div><div class='add'>+	struct cfg80211_match_set *cfg_match;</div><div class='add'>+	struct cfg80211_ssid *cfg_ssid;</div><div class='add'>+</div><div class='add'>+	struct scan_hdr_tlv *hdr;</div><div class='add'>+	struct scan_sched_req *req;</div><div class='add'>+	struct scan_ssid_tlv *ssid;</div><div class='add'>+	struct scan_chan_info_tlv *chan_info;</div><div class='add'>+	struct scan_ie_tlv *ie;</div><div class='add'>+	struct scan_sched_ssid_match_sets *match;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+	int i, max_len;</div><div class='add'>+</div><div class='add'>+	max_len = sizeof(*hdr) + sizeof(*req) + sizeof(*ssid) +</div><div class='add'>+		  sizeof(*chan_info) + sizeof(*ie) +</div><div class='add'>+		  sizeof(*match);</div><div class='add'>+</div><div class='add'>+	skb = mt76_mcu_msg_alloc(mdev, NULL, max_len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mvif-&gt;scan_seq_num = (mvif-&gt;scan_seq_num + 1) &amp; 0x7f;</div><div class='add'>+</div><div class='add'>+	hdr = (struct scan_hdr_tlv *)skb_put(skb, sizeof(*hdr));</div><div class='add'>+	hdr-&gt;seq_num = mvif-&gt;scan_seq_num | mvif-&gt;band_idx &lt;&lt; 7;</div><div class='add'>+	hdr-&gt;bss_idx = mvif-&gt;idx;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, UNI_SCAN_SCHED_REQ, sizeof(*req));</div><div class='add'>+	req = (struct scan_sched_req *)tlv;</div><div class='add'>+	req-&gt;version = 1;</div><div class='add'>+</div><div class='add'>+	if (sreq-&gt;flags &amp; NL80211_SCAN_FLAG_RANDOM_ADDR)</div><div class='add'>+		req-&gt;scan_func |= SCAN_FUNC_RANDOM_MAC;</div><div class='add'>+</div><div class='add'>+	req-&gt;intervals_num = sreq-&gt;n_scan_plans;</div><div class='add'>+	for (i = 0; i &lt; req-&gt;intervals_num; i++)</div><div class='add'>+		req-&gt;intervals[i] = cpu_to_le16(sreq-&gt;scan_plans[i].interval);</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, UNI_SCAN_SSID, sizeof(*ssid));</div><div class='add'>+	ssid = (struct scan_ssid_tlv *)tlv;</div><div class='add'>+</div><div class='add'>+	ssid-&gt;ssids_num = sreq-&gt;n_ssids;</div><div class='add'>+	ssid-&gt;ssid_type = BIT(2);</div><div class='add'>+	for (i = 0; i &lt; ssid-&gt;ssids_num; i++) {</div><div class='add'>+		cfg_ssid = &amp;sreq-&gt;ssids[i];</div><div class='add'>+		memcpy(ssid-&gt;ssids[i].ssid, cfg_ssid-&gt;ssid, cfg_ssid-&gt;ssid_len);</div><div class='add'>+		ssid-&gt;ssids[i].ssid_len = cpu_to_le32(cfg_ssid-&gt;ssid_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, UNI_SCAN_SSID_MATCH_SETS, sizeof(*match));</div><div class='add'>+	match = (struct scan_sched_ssid_match_sets *)tlv;</div><div class='add'>+	match-&gt;match_num = sreq-&gt;n_match_sets;</div><div class='add'>+	for (i = 0; i &lt; match-&gt;match_num; i++) {</div><div class='add'>+		cfg_match = &amp;sreq-&gt;match_sets[i];</div><div class='add'>+		memcpy(match-&gt;match[i].ssid, cfg_match-&gt;ssid.ssid,</div><div class='add'>+		       cfg_match-&gt;ssid.ssid_len);</div><div class='add'>+		match-&gt;match[i].rssi_th = cpu_to_le32(cfg_match-&gt;rssi_thold);</div><div class='add'>+		match-&gt;match[i].ssid_len = cfg_match-&gt;ssid.ssid_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, UNI_SCAN_CHANNEL, sizeof(*chan_info));</div><div class='add'>+	chan_info = (struct scan_chan_info_tlv *)tlv;</div><div class='add'>+	chan_info-&gt;channels_num = min_t(u8, sreq-&gt;n_channels,</div><div class='add'>+					ARRAY_SIZE(chan_info-&gt;channels));</div><div class='add'>+	for (i = 0; i &lt; chan_info-&gt;channels_num; i++) {</div><div class='add'>+		chan = &amp;chan_info-&gt;channels[i];</div><div class='add'>+</div><div class='add'>+		switch (scan_list[i]-&gt;band) {</div><div class='add'>+		case NL80211_BAND_2GHZ:</div><div class='add'>+			chan-&gt;band = 1;</div><div class='add'>+			break;</div><div class='add'>+		case NL80211_BAND_6GHZ:</div><div class='add'>+			chan-&gt;band = 3;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			chan-&gt;band = 2;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		chan-&gt;channel_num = scan_list[i]-&gt;hw_value;</div><div class='add'>+	}</div><div class='add'>+	chan_info-&gt;channel_type = sreq-&gt;n_channels ? 4 : 0;</div><div class='add'>+</div><div class='add'>+	/* Append scan probe IEs as the last tlv */</div><div class='add'>+	mt7925_mcu_build_scan_ie_tlv(mdev, skb, ies);</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_skb_send_msg(mdev, skb, MCU_UNI_CMD(SCAN_REQ),</div><div class='add'>+				     true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_mcu_sched_scan_req);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+mt7925_mcu_sched_scan_enable(struct mt76_phy *phy,</div><div class='add'>+			     struct ieee80211_vif *vif,</div><div class='add'>+			     bool enable)</div><div class='add'>+{</div><div class='add'>+	struct mt76_dev *mdev = phy-&gt;dev;</div><div class='add'>+	struct scan_sched_enable *req;</div><div class='add'>+	struct scan_hdr_tlv *hdr;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct tlv *tlv;</div><div class='add'>+	int max_len;</div><div class='add'>+</div><div class='add'>+	max_len = sizeof(*hdr) + sizeof(*req);</div><div class='add'>+</div><div class='add'>+	skb = mt76_mcu_msg_alloc(mdev, NULL, max_len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hdr = (struct scan_hdr_tlv *)skb_put(skb, sizeof(*hdr));</div><div class='add'>+	hdr-&gt;seq_num = 0;</div><div class='add'>+	hdr-&gt;bss_idx = 0;</div><div class='add'>+</div><div class='add'>+	tlv = mt76_connac_mcu_add_tlv(skb, UNI_SCAN_SCHED_ENABLE, sizeof(*req));</div><div class='add'>+	req = (struct scan_sched_enable *)tlv;</div><div class='add'>+	req-&gt;active = !enable;</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		set_bit(MT76_HW_SCHED_SCANNING, &amp;phy-&gt;state);</div><div class='add'>+	else</div><div class='add'>+		clear_bit(MT76_HW_SCHED_SCANNING, &amp;phy-&gt;state);</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_skb_send_msg(mdev, skb, MCU_UNI_CMD(SCAN_REQ),</div><div class='add'>+				     true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_cancel_hw_scan(struct mt76_phy *phy,</div><div class='add'>+			      struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif-&gt;drv_priv;</div><div class='add'>+	struct {</div><div class='add'>+		struct scan_hdr {</div><div class='add'>+			u8 seq_num;</div><div class='add'>+			u8 bss_idx;</div><div class='add'>+			u8 pad[2];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct scan_cancel_tlv {</div><div class='add'>+			__le16 tag;</div><div class='add'>+			__le16 len;</div><div class='add'>+			u8 is_ext_channel;</div><div class='add'>+			u8 rsv[3];</div><div class='add'>+		} __packed cancel;</div><div class='add'>+	} req = {</div><div class='add'>+		.hdr = {</div><div class='add'>+			.seq_num = mvif-&gt;scan_seq_num,</div><div class='add'>+			.bss_idx = mvif-&gt;idx,</div><div class='add'>+		},</div><div class='add'>+		.cancel = {</div><div class='add'>+			.tag = cpu_to_le16(UNI_SCAN_CANCEL),</div><div class='add'>+			.len = cpu_to_le16(sizeof(struct scan_cancel_tlv)),</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (test_and_clear_bit(MT76_HW_SCANNING, &amp;phy-&gt;state)) {</div><div class='add'>+		struct cfg80211_scan_info info = {</div><div class='add'>+			.aborted = true,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ieee80211_scan_completed(phy-&gt;hw, &amp;info);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(phy-&gt;dev, MCU_UNI_CMD(SCAN_REQ),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_mcu_cancel_hw_scan);</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_channel_domain(struct mt76_phy *phy)</div><div class='add'>+{</div><div class='add'>+	int len, i, n_max_channels, n_2ch = 0, n_5ch = 0, n_6ch = 0;</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 alpha2[4]; /* regulatory_request.alpha2 */</div><div class='add'>+			u8 bw_2g; /* BW_20_40M		0</div><div class='add'>+				   * BW_20M		1</div><div class='add'>+				   * BW_20_40_80M	2</div><div class='add'>+				   * BW_20_40_80_160M	3</div><div class='add'>+				   * BW_20_40_80_8080M	4</div><div class='add'>+				   */</div><div class='add'>+			u8 bw_5g;</div><div class='add'>+			u8 bw_6g;</div><div class='add'>+			u8 pad;</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		struct n_chan {</div><div class='add'>+			__le16 tag;</div><div class='add'>+			__le16 len;</div><div class='add'>+			u8 n_2ch;</div><div class='add'>+			u8 n_5ch;</div><div class='add'>+			u8 n_6ch;</div><div class='add'>+			u8 pad;</div><div class='add'>+		} __packed n_ch;</div><div class='add'>+	} req = {</div><div class='add'>+		.hdr = {</div><div class='add'>+			.bw_2g = 0,</div><div class='add'>+			.bw_5g = 3, /* BW_20_40_80_160M */</div><div class='add'>+			.bw_6g = 3,</div><div class='add'>+		},</div><div class='add'>+		.n_ch = {</div><div class='add'>+			.tag = cpu_to_le16(2),</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	struct mt76_connac_mcu_chan {</div><div class='add'>+		__le16 hw_value;</div><div class='add'>+		__le16 pad;</div><div class='add'>+		__le32 flags;</div><div class='add'>+	} __packed channel;</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct ieee80211_channel *chan;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	n_max_channels = phy-&gt;sband_2g.sband.n_channels +</div><div class='add'>+			 phy-&gt;sband_5g.sband.n_channels +</div><div class='add'>+			 phy-&gt;sband_6g.sband.n_channels;</div><div class='add'>+	len = sizeof(req) + n_max_channels * sizeof(channel);</div><div class='add'>+</div><div class='add'>+	skb = mt76_mcu_msg_alloc(dev, NULL, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb, sizeof(req));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; phy-&gt;sband_2g.sband.n_channels; i++) {</div><div class='add'>+		chan = &amp;phy-&gt;sband_2g.sband.channels[i];</div><div class='add'>+		if (chan-&gt;flags &amp; IEEE80211_CHAN_DISABLED)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		channel.hw_value = cpu_to_le16(chan-&gt;hw_value);</div><div class='add'>+		channel.flags = cpu_to_le32(chan-&gt;flags);</div><div class='add'>+		channel.pad = 0;</div><div class='add'>+</div><div class='add'>+		skb_put_data(skb, &amp;channel, sizeof(channel));</div><div class='add'>+		n_2ch++;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; phy-&gt;sband_5g.sband.n_channels; i++) {</div><div class='add'>+		chan = &amp;phy-&gt;sband_5g.sband.channels[i];</div><div class='add'>+		if (chan-&gt;flags &amp; IEEE80211_CHAN_DISABLED)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		channel.hw_value = cpu_to_le16(chan-&gt;hw_value);</div><div class='add'>+		channel.flags = cpu_to_le32(chan-&gt;flags);</div><div class='add'>+		channel.pad = 0;</div><div class='add'>+</div><div class='add'>+		skb_put_data(skb, &amp;channel, sizeof(channel));</div><div class='add'>+		n_5ch++;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; phy-&gt;sband_6g.sband.n_channels; i++) {</div><div class='add'>+		chan = &amp;phy-&gt;sband_6g.sband.channels[i];</div><div class='add'>+		if (chan-&gt;flags &amp; IEEE80211_CHAN_DISABLED)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		channel.hw_value = cpu_to_le16(chan-&gt;hw_value);</div><div class='add'>+		channel.flags = cpu_to_le32(chan-&gt;flags);</div><div class='add'>+		channel.pad = 0;</div><div class='add'>+</div><div class='add'>+		skb_put_data(skb, &amp;channel, sizeof(channel));</div><div class='add'>+		n_6ch++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(dev-&gt;alpha2) &gt; sizeof(req.hdr.alpha2));</div><div class='add'>+	memcpy(req.hdr.alpha2, dev-&gt;alpha2, sizeof(dev-&gt;alpha2));</div><div class='add'>+	req.n_ch.n_2ch = n_2ch;</div><div class='add'>+	req.n_ch.n_5ch = n_5ch;</div><div class='add'>+	req.n_ch.n_6ch = n_6ch;</div><div class='add'>+	len = sizeof(struct n_chan) + (n_2ch + n_5ch + n_6ch) * sizeof(channel);</div><div class='add'>+	req.n_ch.len = cpu_to_le16(len);</div><div class='add'>+	memcpy(__skb_push(skb, sizeof(req)), &amp;req, sizeof(req));</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_skb_send_msg(dev, skb, MCU_UNI_CMD(SET_DOMAIN_INFO),</div><div class='add'>+				     true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_mcu_set_channel_domain);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+__mt7925_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,</div><div class='add'>+		     enum environment_cap env_cap,</div><div class='add'>+		     struct mt7925_clc *clc, u8 idx)</div><div class='add'>+{</div><div class='add'>+	struct mt7925_clc_segment *seg;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct {</div><div class='add'>+		u8 rsv[4];</div><div class='add'>+		__le16 tag;</div><div class='add'>+		__le16 len;</div><div class='add'>+</div><div class='add'>+		u8 ver;</div><div class='add'>+		u8 pad0;</div><div class='add'>+		__le16 size;</div><div class='add'>+		u8 idx;</div><div class='add'>+		u8 env;</div><div class='add'>+		u8 acpi_conf;</div><div class='add'>+		u8 pad1;</div><div class='add'>+		u8 alpha2[2];</div><div class='add'>+		u8 type[2];</div><div class='add'>+		u8 rsvd[64];</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.tag = cpu_to_le16(0x3),</div><div class='add'>+		.len = cpu_to_le16(sizeof(req) - 4),</div><div class='add'>+</div><div class='add'>+		.idx = idx,</div><div class='add'>+		.env = env_cap,</div><div class='add'>+	};</div><div class='add'>+	int ret, valid_cnt = 0;</div><div class='add'>+	u8 *pos, *last_pos;</div><div class='add'>+</div><div class='add'>+	if (!clc)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	req.ver = clc-&gt;ver;</div><div class='add'>+	pos = clc-&gt;data + sizeof(*seg) * clc-&gt;t0.nr_seg;</div><div class='add'>+	last_pos = clc-&gt;data + le32_to_cpu(*(__le32 *)(clc-&gt;data + 4));</div><div class='add'>+	while (pos &lt; last_pos) {</div><div class='add'>+		struct mt7925_clc_rule *rule = (struct mt7925_clc_rule *)pos;</div><div class='add'>+</div><div class='add'>+		pos += sizeof(*rule);</div><div class='add'>+		if (rule-&gt;alpha2[0] != alpha2[0] ||</div><div class='add'>+		    rule-&gt;alpha2[1] != alpha2[1])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		seg = (struct mt7925_clc_segment *)clc-&gt;data</div><div class='add'>+			  + rule-&gt;seg_idx - 1;</div><div class='add'>+</div><div class='add'>+		memcpy(req.alpha2, rule-&gt;alpha2, 2);</div><div class='add'>+		memcpy(req.type, rule-&gt;type, 2);</div><div class='add'>+</div><div class='add'>+		req.size = cpu_to_le16(seg-&gt;len);</div><div class='add'>+		dev-&gt;phy.clc_chan_conf = clc-&gt;ver == 1 ? 0xff : rule-&gt;flag;</div><div class='add'>+		skb = __mt76_mcu_msg_alloc(&amp;dev-&gt;mt76, &amp;req,</div><div class='add'>+					   le16_to_cpu(req.size) + sizeof(req),</div><div class='add'>+					   sizeof(req), GFP_KERNEL);</div><div class='add'>+		if (!skb)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		skb_put_data(skb, clc-&gt;data + seg-&gt;offset, seg-&gt;len);</div><div class='add'>+</div><div class='add'>+		ret = mt76_mcu_skb_send_msg(&amp;dev-&gt;mt76, skb,</div><div class='add'>+					    MCU_UNI_CMD(SET_POWER_LIMIT),</div><div class='add'>+					    true);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		valid_cnt++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!valid_cnt) {</div><div class='add'>+		dev-&gt;phy.clc_chan_conf = 0xff;</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,</div><div class='add'>+		       enum environment_cap env_cap)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_phy *phy = (struct mt792x_phy *)&amp;dev-&gt;phy;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	if (!ARRAY_SIZE(phy-&gt;clc))</div><div class='add'>+		return -ESRCH;</div><div class='add'>+</div><div class='add'>+	/* submit all clc config */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(phy-&gt;clc); i++) {</div><div class='add'>+		if (i == MT792x_CLC_BE_CTRL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = __mt7925_mcu_set_clc(dev, alpha2, env_cap,</div><div class='add'>+					   phy-&gt;clc[i], i);</div><div class='add'>+</div><div class='add'>+		/* If no country found, set "00" as default */</div><div class='add'>+		if (ret == -ENOENT)</div><div class='add'>+			ret = __mt7925_mcu_set_clc(dev, "00",</div><div class='add'>+						   ENVIRON_INDOOR,</div><div class='add'>+						   phy-&gt;clc[i], i);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_fill_message(struct mt76_dev *mdev, struct sk_buff *skb,</div><div class='add'>+			    int cmd, int *wait_seq)</div><div class='add'>+{</div><div class='add'>+	int txd_len, mcu_cmd = FIELD_GET(__MCU_CMD_FIELD_ID, cmd);</div><div class='add'>+	struct mt76_connac2_mcu_uni_txd *uni_txd;</div><div class='add'>+	struct mt76_connac2_mcu_txd *mcu_txd;</div><div class='add'>+	__le32 *txd;</div><div class='add'>+	u32 val;</div><div class='add'>+	u8 seq;</div><div class='add'>+</div><div class='add'>+	/* TODO: make dynamic based on msg type */</div><div class='add'>+	mdev-&gt;mcu.timeout = 20 * HZ;</div><div class='add'>+</div><div class='add'>+	seq = ++mdev-&gt;mcu.msg_seq &amp; 0xf;</div><div class='add'>+	if (!seq)</div><div class='add'>+		seq = ++mdev-&gt;mcu.msg_seq &amp; 0xf;</div><div class='add'>+</div><div class='add'>+	if (cmd == MCU_CMD(FW_SCATTER))</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	txd_len = cmd &amp; __MCU_CMD_FIELD_UNI ? sizeof(*uni_txd) : sizeof(*mcu_txd);</div><div class='add'>+	txd = (__le32 *)skb_push(skb, txd_len);</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD0_TX_BYTES, skb-&gt;len) |</div><div class='add'>+	      FIELD_PREP(MT_TXD0_PKT_FMT, MT_TX_TYPE_CMD) |</div><div class='add'>+	      FIELD_PREP(MT_TXD0_Q_IDX, MT_TX_MCU_PORT_RX_Q0);</div><div class='add'>+	txd[0] = cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MT_TXD1_HDR_FORMAT, MT_HDR_FORMAT_CMD);</div><div class='add'>+	txd[1] = cpu_to_le32(val);</div><div class='add'>+</div><div class='add'>+	if (cmd &amp; __MCU_CMD_FIELD_UNI) {</div><div class='add'>+		uni_txd = (struct mt76_connac2_mcu_uni_txd *)txd;</div><div class='add'>+		uni_txd-&gt;len = cpu_to_le16(skb-&gt;len - sizeof(uni_txd-&gt;txd));</div><div class='add'>+		uni_txd-&gt;cid = cpu_to_le16(mcu_cmd);</div><div class='add'>+		uni_txd-&gt;s2d_index = MCU_S2D_H2N;</div><div class='add'>+		uni_txd-&gt;pkt_type = MCU_PKT_ID;</div><div class='add'>+		uni_txd-&gt;seq = seq;</div><div class='add'>+</div><div class='add'>+		if (cmd &amp; __MCU_CMD_FIELD_QUERY)</div><div class='add'>+			uni_txd-&gt;option = MCU_CMD_UNI_QUERY_ACK;</div><div class='add'>+		else</div><div class='add'>+			uni_txd-&gt;option = MCU_CMD_UNI_EXT_ACK;</div><div class='add'>+</div><div class='add'>+		if (cmd == MCU_UNI_CMD(HIF_CTRL) ||</div><div class='add'>+		    cmd == MCU_UNI_CMD(CHIP_CONFIG))</div><div class='add'>+			uni_txd-&gt;option &amp;= ~MCU_CMD_ACK;</div><div class='add'>+</div><div class='add'>+		if (mcu_cmd == MCU_UNI_CMD_TESTMODE_CTRL ||</div><div class='add'>+		    mcu_cmd == MCU_UNI_CMD_TESTMODE_RX_STAT) {</div><div class='add'>+			if (cmd &amp; __MCU_CMD_FIELD_QUERY)</div><div class='add'>+				uni_txd-&gt;option = 0x2;</div><div class='add'>+			else</div><div class='add'>+				uni_txd-&gt;option = 0x6;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mcu_txd = (struct mt76_connac2_mcu_txd *)txd;</div><div class='add'>+	mcu_txd-&gt;len = cpu_to_le16(skb-&gt;len - sizeof(mcu_txd-&gt;txd));</div><div class='add'>+	mcu_txd-&gt;pq_id = cpu_to_le16(MCU_PQ_ID(MT_TX_PORT_IDX_MCU,</div><div class='add'>+					       MT_TX_MCU_PORT_RX_Q0));</div><div class='add'>+	mcu_txd-&gt;pkt_type = MCU_PKT_ID;</div><div class='add'>+	mcu_txd-&gt;seq = seq;</div><div class='add'>+	mcu_txd-&gt;cid = mcu_cmd;</div><div class='add'>+	mcu_txd-&gt;ext_cid = FIELD_GET(__MCU_CMD_FIELD_EXT_ID, cmd);</div><div class='add'>+</div><div class='add'>+	if (mcu_txd-&gt;ext_cid || (cmd &amp; __MCU_CMD_FIELD_CE)) {</div><div class='add'>+		if (cmd &amp; __MCU_CMD_FIELD_QUERY)</div><div class='add'>+			mcu_txd-&gt;set_query = MCU_Q_QUERY;</div><div class='add'>+		else</div><div class='add'>+			mcu_txd-&gt;set_query = MCU_Q_SET;</div><div class='add'>+		mcu_txd-&gt;ext_cid_ack = !!mcu_txd-&gt;ext_cid;</div><div class='add'>+	} else {</div><div class='add'>+		mcu_txd-&gt;set_query = MCU_Q_NA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd &amp; __MCU_CMD_FIELD_WA)</div><div class='add'>+		mcu_txd-&gt;s2d_index = MCU_S2D_H2C;</div><div class='add'>+	else</div><div class='add'>+		mcu_txd-&gt;s2d_index = MCU_S2D_H2N;</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	if (wait_seq)</div><div class='add'>+		*wait_seq = seq;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_mcu_fill_message);</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_rts_thresh(struct mt792x_phy *phy, u32 val)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		u8 band_idx;</div><div class='add'>+		u8 _rsv[3];</div><div class='add'>+</div><div class='add'>+		__le16 tag;</div><div class='add'>+		__le16 len;</div><div class='add'>+		__le32 len_thresh;</div><div class='add'>+		__le32 pkt_thresh;</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.band_idx = phy-&gt;mt76-&gt;band_idx,</div><div class='add'>+		.tag = cpu_to_le16(UNI_BAND_CONFIG_RTS_THRESHOLD),</div><div class='add'>+		.len = cpu_to_le16(sizeof(req) - 4),</div><div class='add'>+		.len_thresh = cpu_to_le32(val),</div><div class='add'>+		.pkt_thresh = cpu_to_le32(0x2),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;phy-&gt;dev-&gt;mt76, MCU_UNI_CMD(BAND_CONFIG),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_radio_en(struct mt792x_phy *phy, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		u8 band_idx;</div><div class='add'>+		u8 _rsv[3];</div><div class='add'>+</div><div class='add'>+		__le16 tag;</div><div class='add'>+		__le16 len;</div><div class='add'>+		u8 enable;</div><div class='add'>+		u8 _rsv2[3];</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.band_idx = phy-&gt;mt76-&gt;band_idx,</div><div class='add'>+		.tag = cpu_to_le16(UNI_BAND_CONFIG_RADIO_ENABLE),</div><div class='add'>+		.len = cpu_to_le16(sizeof(req) - 4),</div><div class='add'>+		.enable = enable,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;phy-&gt;dev-&gt;mt76, MCU_UNI_CMD(BAND_CONFIG),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_mcu_build_sku(struct mt76_dev *dev, s8 *sku,</div><div class='add'>+		     struct mt76_power_limits *limits,</div><div class='add'>+		     enum nl80211_band band)</div><div class='add'>+{</div><div class='add'>+	int i, offset = sizeof(limits-&gt;cck);</div><div class='add'>+</div><div class='add'>+	memset(sku, 127, MT_CONNAC3_SKU_POWER_LIMIT);</div><div class='add'>+</div><div class='add'>+	if (band == NL80211_BAND_2GHZ) {</div><div class='add'>+		/* cck */</div><div class='add'>+		memcpy(sku, limits-&gt;cck, sizeof(limits-&gt;cck));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ofdm */</div><div class='add'>+	memcpy(&amp;sku[offset], limits-&gt;ofdm, sizeof(limits-&gt;ofdm));</div><div class='add'>+	offset += (sizeof(limits-&gt;ofdm) * 5);</div><div class='add'>+</div><div class='add'>+	/* ht */</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		memcpy(&amp;sku[offset], limits-&gt;mcs[i], 8);</div><div class='add'>+		offset += 8;</div><div class='add'>+	}</div><div class='add'>+	sku[offset++] = limits-&gt;mcs[0][0];</div><div class='add'>+</div><div class='add'>+	/* vht */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(limits-&gt;mcs); i++) {</div><div class='add'>+		memcpy(&amp;sku[offset], limits-&gt;mcs[i],</div><div class='add'>+		       ARRAY_SIZE(limits-&gt;mcs[i]));</div><div class='add'>+		offset += 12;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* he */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(limits-&gt;ru); i++) {</div><div class='add'>+		memcpy(&amp;sku[offset], limits-&gt;ru[i], ARRAY_SIZE(limits-&gt;ru[i]));</div><div class='add'>+		offset += ARRAY_SIZE(limits-&gt;ru[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* eht */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(limits-&gt;eht); i++) {</div><div class='add'>+		memcpy(&amp;sku[offset], limits-&gt;eht[i], ARRAY_SIZE(limits-&gt;eht[i]));</div><div class='add'>+		offset += ARRAY_SIZE(limits-&gt;eht[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_mcu_rate_txpower_band(struct mt76_phy *phy,</div><div class='add'>+			     enum nl80211_band band)</div><div class='add'>+{</div><div class='add'>+	int tx_power, n_chan, last_ch, err = 0, idx = 0;</div><div class='add'>+	int i, sku_len, batch_size, batch_len = 3;</div><div class='add'>+	struct mt76_dev *dev = phy-&gt;dev;</div><div class='add'>+	static const u8 chan_list_2ghz[] = {</div><div class='add'>+		1, 2,  3,  4,  5,  6,  7,</div><div class='add'>+		8, 9, 10, 11, 12, 13, 14</div><div class='add'>+	};</div><div class='add'>+	static const u8 chan_list_5ghz[] = {</div><div class='add'>+		 36,  38,  40,  42,  44,  46,  48,</div><div class='add'>+		 50,  52,  54,  56,  58,  60,  62,</div><div class='add'>+		 64, 100, 102, 104, 106, 108, 110,</div><div class='add'>+		112, 114, 116, 118, 120, 122, 124,</div><div class='add'>+		126, 128, 132, 134, 136, 138, 140,</div><div class='add'>+		142, 144, 149, 151, 153, 155, 157,</div><div class='add'>+		159, 161, 165, 167</div><div class='add'>+	};</div><div class='add'>+	static const u8 chan_list_6ghz[] = {</div><div class='add'>+		  1,   3,   5,   7,   9,  11,  13,</div><div class='add'>+		 15,  17,  19,  21,  23,  25,  27,</div><div class='add'>+		 29,  33,  35,  37,  39,  41,  43,</div><div class='add'>+		 45,  47,  49,  51,  53,  55,  57,</div><div class='add'>+		 59,  61,  65,  67,  69,  71,  73,</div><div class='add'>+		 75,  77,  79,  81,  83,  85,  87,</div><div class='add'>+		 89,  91,  93,  97,  99, 101, 103,</div><div class='add'>+		105, 107, 109, 111, 113, 115, 117,</div><div class='add'>+		119, 121, 123, 125, 129, 131, 133,</div><div class='add'>+		135, 137, 139, 141, 143, 145, 147,</div><div class='add'>+		149, 151, 153, 155, 157, 161, 163,</div><div class='add'>+		165, 167, 169, 171, 173, 175, 177,</div><div class='add'>+		179, 181, 183, 185, 187, 189, 193,</div><div class='add'>+		195, 197, 199, 201, 203, 205, 207,</div><div class='add'>+		209, 211, 213, 215, 217, 219, 221,</div><div class='add'>+		225, 227, 229, 233</div><div class='add'>+	};</div><div class='add'>+	struct mt76_power_limits *limits;</div><div class='add'>+	struct mt7925_sku_tlv *sku_tlbv;</div><div class='add'>+	const u8 *ch_list;</div><div class='add'>+</div><div class='add'>+	sku_len = sizeof(*sku_tlbv);</div><div class='add'>+	tx_power = 2 * phy-&gt;hw-&gt;conf.power_level;</div><div class='add'>+	if (!tx_power)</div><div class='add'>+		tx_power = 127;</div><div class='add'>+</div><div class='add'>+	if (band == NL80211_BAND_2GHZ) {</div><div class='add'>+		n_chan = ARRAY_SIZE(chan_list_2ghz);</div><div class='add'>+		ch_list = chan_list_2ghz;</div><div class='add'>+		last_ch = chan_list_2ghz[ARRAY_SIZE(chan_list_2ghz) - 1];</div><div class='add'>+	} else if (band == NL80211_BAND_6GHZ) {</div><div class='add'>+		n_chan = ARRAY_SIZE(chan_list_6ghz);</div><div class='add'>+		ch_list = chan_list_6ghz;</div><div class='add'>+		last_ch = chan_list_6ghz[ARRAY_SIZE(chan_list_6ghz) - 1];</div><div class='add'>+	} else {</div><div class='add'>+		n_chan = ARRAY_SIZE(chan_list_5ghz);</div><div class='add'>+		ch_list = chan_list_5ghz;</div><div class='add'>+		last_ch = chan_list_5ghz[ARRAY_SIZE(chan_list_5ghz) - 1];</div><div class='add'>+	}</div><div class='add'>+	batch_size = DIV_ROUND_UP(n_chan, batch_len);</div><div class='add'>+</div><div class='add'>+	limits = devm_kmalloc(dev-&gt;dev, sizeof(*limits), GFP_KERNEL);</div><div class='add'>+	if (!limits)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	sku_tlbv = devm_kmalloc(dev-&gt;dev, sku_len, GFP_KERNEL);</div><div class='add'>+	if (!sku_tlbv) {</div><div class='add'>+		devm_kfree(dev-&gt;dev, limits);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; batch_size; i++) {</div><div class='add'>+		struct mt7925_tx_power_limit_tlv *tx_power_tlv;</div><div class='add'>+		int j, msg_len, num_ch;</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+		num_ch = i == batch_size - 1 ? n_chan % batch_len : batch_len;</div><div class='add'>+		msg_len = sizeof(*tx_power_tlv) + num_ch * sku_len;</div><div class='add'>+		skb = mt76_mcu_msg_alloc(dev, NULL, msg_len);</div><div class='add'>+		if (!skb) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tx_power_tlv = (struct mt7925_tx_power_limit_tlv *)</div><div class='add'>+			       skb_put(skb, sizeof(*tx_power_tlv));</div><div class='add'>+</div><div class='add'>+		BUILD_BUG_ON(sizeof(dev-&gt;alpha2) &gt; sizeof(tx_power_tlv-&gt;alpha2));</div><div class='add'>+		memcpy(tx_power_tlv-&gt;alpha2, dev-&gt;alpha2, sizeof(dev-&gt;alpha2));</div><div class='add'>+		tx_power_tlv-&gt;n_chan = num_ch;</div><div class='add'>+		tx_power_tlv-&gt;tag = cpu_to_le16(0x1);</div><div class='add'>+		tx_power_tlv-&gt;len = cpu_to_le16(sizeof(*tx_power_tlv));</div><div class='add'>+</div><div class='add'>+		switch (band) {</div><div class='add'>+		case NL80211_BAND_2GHZ:</div><div class='add'>+			tx_power_tlv-&gt;band = 1;</div><div class='add'>+			break;</div><div class='add'>+		case NL80211_BAND_6GHZ:</div><div class='add'>+			tx_power_tlv-&gt;band = 3;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			tx_power_tlv-&gt;band = 2;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; num_ch; j++, idx++) {</div><div class='add'>+			struct ieee80211_channel chan = {</div><div class='add'>+				.hw_value = ch_list[idx],</div><div class='add'>+				.band = band,</div><div class='add'>+			};</div><div class='add'>+			s8 reg_power, sar_power;</div><div class='add'>+</div><div class='add'>+			reg_power = mt76_connac_get_ch_power(phy, &amp;chan,</div><div class='add'>+							     tx_power);</div><div class='add'>+			sar_power = mt76_get_sar_power(phy, &amp;chan, reg_power);</div><div class='add'>+</div><div class='add'>+			mt76_get_rate_power_limits(phy, &amp;chan, limits,</div><div class='add'>+						   sar_power);</div><div class='add'>+</div><div class='add'>+			tx_power_tlv-&gt;last_msg = ch_list[idx] == last_ch;</div><div class='add'>+			sku_tlbv-&gt;channel = ch_list[idx];</div><div class='add'>+</div><div class='add'>+			mt7925_mcu_build_sku(dev, sku_tlbv-&gt;pwr_limit,</div><div class='add'>+					     limits, band);</div><div class='add'>+			skb_put_data(skb, sku_tlbv, sku_len);</div><div class='add'>+		}</div><div class='add'>+		err = mt76_mcu_skb_send_msg(dev, skb,</div><div class='add'>+					    MCU_UNI_CMD(SET_POWER_LIMIT),</div><div class='add'>+					    true);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	devm_kfree(dev-&gt;dev, sku_tlbv);</div><div class='add'>+	devm_kfree(dev-&gt;dev, limits);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_rate_txpower(struct mt76_phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct mt76_dev *mdev = phy-&gt;dev;</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(mdev-&gt;hw);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;cap.has_2ghz) {</div><div class='add'>+		err = mt7925_mcu_rate_txpower_band(phy,</div><div class='add'>+						   NL80211_BAND_2GHZ);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;cap.has_5ghz) {</div><div class='add'>+		err = mt7925_mcu_rate_txpower_band(phy,</div><div class='add'>+						   NL80211_BAND_5GHZ);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;cap.has_6ghz &amp;&amp; dev-&gt;phy.clc_chan_conf) {</div><div class='add'>+		err = mt7925_mcu_rate_txpower_band(phy,</div><div class='add'>+						   NL80211_BAND_6GHZ);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_wf_rf_pin_ctrl(struct mt792x_phy *phy)</div><div class='add'>+{</div><div class='add'>+#define UNI_CMD_RADIO_STATUS_GET	0</div><div class='add'>+	struct mt792x_dev *dev = phy-&gt;dev;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+	struct {</div><div class='add'>+		__le16 tag;</div><div class='add'>+		__le16 len;</div><div class='add'>+		u8 rsv[4];</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.tag = UNI_CMD_RADIO_STATUS_GET,</div><div class='add'>+		.len = cpu_to_le16(sizeof(req)),</div><div class='add'>+	};</div><div class='add'>+	struct mt7925_radio_status_event {</div><div class='add'>+		__le16 tag;</div><div class='add'>+		__le16 len;</div><div class='add'>+</div><div class='add'>+		u8 data;</div><div class='add'>+		u8 rsv[3];</div><div class='add'>+	} __packed *status;</div><div class='add'>+</div><div class='add'>+	ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76,</div><div class='add'>+					MCU_UNI_CMD(RADIO_STATUS),</div><div class='add'>+					&amp;req, sizeof(req), true, &amp;skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, sizeof(struct tlv));</div><div class='add'>+	status = (struct mt7925_radio_status_event *)skb-&gt;data;</div><div class='add'>+	ret = status-&gt;data;</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_rxfilter(struct mt792x_dev *dev, u32 fif,</div><div class='add'>+			    u8 bit_op, u32 bit_map)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct {</div><div class='add'>+		u8 band_idx;</div><div class='add'>+		u8 rsv1[3];</div><div class='add'>+</div><div class='add'>+		__le16 tag;</div><div class='add'>+		__le16 len;</div><div class='add'>+		u8 mode;</div><div class='add'>+		u8 rsv2[3];</div><div class='add'>+		__le32 fif;</div><div class='add'>+		__le32 bit_map; /* bit_* for bitmap update */</div><div class='add'>+		u8 bit_op;</div><div class='add'>+		u8 pad[51];</div><div class='add'>+	} __packed req = {</div><div class='add'>+		.band_idx = phy-&gt;mt76-&gt;band_idx,</div><div class='add'>+		.tag = cpu_to_le16(UNI_BAND_CONFIG_SET_MAC80211_RX_FILTER),</div><div class='add'>+		.len = cpu_to_le16(sizeof(req) - 4),</div><div class='add'>+</div><div class='add'>+		.mode = fif ? 0 : 1,</div><div class='add'>+		.fif = cpu_to_le32(fif),</div><div class='add'>+		.bit_map = cpu_to_le32(bit_map),</div><div class='add'>+		.bit_op = bit_op,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;phy-&gt;dev-&gt;mt76, MCU_UNI_CMD(BAND_CONFIG),</div><div class='add'>+				 &amp;req, sizeof(req), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_rssimonitor(struct mt792x_dev *dev, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_bss_conf *mconf = mt792x_link_conf_to_mconf(&amp;vif-&gt;bss_conf);</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 bss_idx;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		} __packed hdr;</div><div class='add'>+		__le16 tag;</div><div class='add'>+		__le16 len;</div><div class='add'>+		u8 enable;</div><div class='add'>+		s8 cqm_rssi_high;</div><div class='add'>+		s8 cqm_rssi_low;</div><div class='add'>+		u8 rsv;</div><div class='add'>+	} req = {</div><div class='add'>+		.hdr = {</div><div class='add'>+			.bss_idx = mconf-&gt;mt76.idx,</div><div class='add'>+		},</div><div class='add'>+		.tag = cpu_to_le16(UNI_CMD_RSSI_MONITOR_SET),</div><div class='add'>+		.len = cpu_to_le16(sizeof(req) - 4),</div><div class='add'>+		.enable = vif-&gt;cfg.assoc,</div><div class='add'>+		.cqm_rssi_high = (s8)(vif-&gt;bss_conf.cqm_rssi_thold + vif-&gt;bss_conf.cqm_rssi_hyst),</div><div class='add'>+		.cqm_rssi_low = (s8)(vif-&gt;bss_conf.cqm_rssi_thold - vif-&gt;bss_conf.cqm_rssi_hyst),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD(RSSI_MONITOR), &amp;req,</div><div class='add'>+				 sizeof(req), false);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.h<br/>new file mode 100644<br/>index 000000000000..e09e0600534a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7925/mcu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7925/mcu.h</a></div><div class='hunk'>@@ -0,0 +1,714 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/* Copyright (C) 2023 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#ifndef __MT7925_MCU_H</div><div class='add'>+#define __MT7925_MCU_H</div><div class='add'>+</div><div class='add'>+#include "../mt76_connac_mcu.h"</div><div class='add'>+</div><div class='add'>+/* ext event table */</div><div class='add'>+enum {</div><div class='add'>+	MCU_EXT_EVENT_RATE_REPORT = 0x87,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt7925_mcu_eeprom_info {</div><div class='add'>+	__le32 addr;</div><div class='add'>+	__le32 valid;</div><div class='add'>+	u8 data[MT7925_EEPROM_BLOCK_SIZE];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define MT_RA_RATE_NSS			GENMASK(8, 6)</div><div class='add'>+#define MT_RA_RATE_MCS			GENMASK(3, 0)</div><div class='add'>+#define MT_RA_RATE_TX_MODE		GENMASK(12, 9)</div><div class='add'>+#define MT_RA_RATE_DCM_EN		BIT(4)</div><div class='add'>+#define MT_RA_RATE_BW			GENMASK(14, 13)</div><div class='add'>+</div><div class='add'>+struct mt7925_mcu_rxd {</div><div class='add'>+	__le32 rxd[8];</div><div class='add'>+</div><div class='add'>+	__le16 len;</div><div class='add'>+	__le16 pkt_type_id;</div><div class='add'>+</div><div class='add'>+	u8 eid;</div><div class='add'>+	u8 seq;</div><div class='add'>+	u8 option;</div><div class='add'>+	u8 __rsv;</div><div class='add'>+</div><div class='add'>+	u8 ext_eid;</div><div class='add'>+	u8 __rsv1[2];</div><div class='add'>+	u8 s2d_index;</div><div class='add'>+</div><div class='add'>+	u8 tlv[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt7925_mcu_uni_event {</div><div class='add'>+	u8 cid;</div><div class='add'>+	u8 pad[3];</div><div class='add'>+	__le32 status; /* 0: success, others: fail */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MT_EBF = BIT(0),	/* explicit beamforming */</div><div class='add'>+	MT_IBF = BIT(1)		/* implicit beamforming */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt7925_mcu_reg_event {</div><div class='add'>+	__le32 reg;</div><div class='add'>+	__le32 val;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7925_mcu_ant_id_config {</div><div class='add'>+	u8 ant_id[4];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7925_txpwr_req {</div><div class='add'>+	u8 _rsv[4];</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+</div><div class='add'>+	u8 format_id;</div><div class='add'>+	u8 catg;</div><div class='add'>+	u8 band_idx;</div><div class='add'>+	u8 _rsv1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7925_txpwr_event {</div><div class='add'>+	u8 rsv[4];</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+</div><div class='add'>+	u8 catg;</div><div class='add'>+	u8 band_idx;</div><div class='add'>+	u8 ch_band;</div><div class='add'>+	u8 format; /* 0:Legacy, 1:HE */</div><div class='add'>+</div><div class='add'>+	/* Rate power info */</div><div class='add'>+	struct mt7925_txpwr txpwr;</div><div class='add'>+</div><div class='add'>+	s8 pwr_max;</div><div class='add'>+	s8 pwr_min;</div><div class='add'>+	u8 rsv1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	TM_SWITCH_MODE,</div><div class='add'>+	TM_SET_AT_CMD,</div><div class='add'>+	TM_QUERY_AT_CMD,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MT7925_TM_NORMAL,</div><div class='add'>+	MT7925_TM_TESTMODE,</div><div class='add'>+	MT7925_TM_ICAP,</div><div class='add'>+	MT7925_TM_ICAP_OVERLAP,</div><div class='add'>+	MT7925_TM_WIFISPECTRUM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt7925_rftest_evt {</div><div class='add'>+	__le32 param0;</div><div class='add'>+	__le32 param1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	UNI_CHANNEL_SWITCH,</div><div class='add'>+	UNI_CHANNEL_RX_PATH,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	UNI_CHIP_CONFIG_CHIP_CFG = 0x2,</div><div class='add'>+	UNI_CHIP_CONFIG_NIC_CAPA = 0x3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	UNI_BAND_CONFIG_RADIO_ENABLE,</div><div class='add'>+	UNI_BAND_CONFIG_RTS_THRESHOLD = 0x08,</div><div class='add'>+	UNI_BAND_CONFIG_SET_MAC80211_RX_FILTER = 0x0C,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	UNI_WSYS_CONFIG_FW_LOG_CTRL,</div><div class='add'>+	UNI_WSYS_CONFIG_FW_DBG_CTRL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	UNI_EFUSE_ACCESS = 1,</div><div class='add'>+	UNI_EFUSE_BUFFER_MODE,</div><div class='add'>+	UNI_EFUSE_FREE_BLOCK,</div><div class='add'>+	UNI_EFUSE_BUFFER_RD,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	UNI_CMD_ACCESS_REG_BASIC = 0x0,</div><div class='add'>+	UNI_CMD_ACCESS_RF_REG_BASIC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	UNI_MBMC_SETTING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	UNI_EVENT_SCAN_DONE_BASIC = 0,</div><div class='add'>+	UNI_EVENT_SCAN_DONE_CHNLINFO = 2,</div><div class='add'>+	UNI_EVENT_SCAN_DONE_NLO = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	UNI_CMD_RSSI_MONITOR_SET = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	UNI_EVENT_RSSI_MONITOR_INFO = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum connac3_mcu_cipher_type {</div><div class='add'>+	CONNAC3_CIPHER_NONE = 0,</div><div class='add'>+	CONNAC3_CIPHER_WEP40 = 1,</div><div class='add'>+	CONNAC3_CIPHER_TKIP = 2,</div><div class='add'>+	CONNAC3_CIPHER_AES_CCMP = 4,</div><div class='add'>+	CONNAC3_CIPHER_WEP104 = 5,</div><div class='add'>+	CONNAC3_CIPHER_BIP_CMAC_128 = 6,</div><div class='add'>+	CONNAC3_CIPHER_WEP128 = 7,</div><div class='add'>+	CONNAC3_CIPHER_WAPI = 8,</div><div class='add'>+	CONNAC3_CIPHER_CCMP_256 = 10,</div><div class='add'>+	CONNAC3_CIPHER_GCMP = 11,</div><div class='add'>+	CONNAC3_CIPHER_GCMP_256 = 12,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt7925_mcu_scan_chinfo_event {</div><div class='add'>+	u8 nr_chan;</div><div class='add'>+	u8 alpha2[3];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	UNI_SCAN_REQ = 1,</div><div class='add'>+	UNI_SCAN_CANCEL = 2,</div><div class='add'>+	UNI_SCAN_SCHED_REQ = 3,</div><div class='add'>+	UNI_SCAN_SCHED_ENABLE = 4,</div><div class='add'>+	UNI_SCAN_SSID = 10,</div><div class='add'>+	UNI_SCAN_BSSID,</div><div class='add'>+	UNI_SCAN_CHANNEL,</div><div class='add'>+	UNI_SCAN_IE,</div><div class='add'>+	UNI_SCAN_MISC,</div><div class='add'>+	UNI_SCAN_SSID_MATCH_SETS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	UNI_SNIFFER_ENABLE,</div><div class='add'>+	UNI_SNIFFER_CONFIG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MT7925_RNR_SCAN_MAX_BSSIDS	10</div><div class='add'>+struct scan_hdr_tlv {</div><div class='add'>+	/* fixed field */</div><div class='add'>+	u8 seq_num;</div><div class='add'>+	u8 bss_idx;</div><div class='add'>+	u8 pad[2];</div><div class='add'>+	/* tlv */</div><div class='add'>+	u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct scan_req_tlv {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+</div><div class='add'>+	u8 scan_type; /* 0: PASSIVE SCAN</div><div class='add'>+		       * 1: ACTIVE SCAN</div><div class='add'>+		       */</div><div class='add'>+	u8 probe_req_num; /* Number of probe request for each SSID */</div><div class='add'>+	u8 scan_func; /* BIT(0) Enable random MAC scan</div><div class='add'>+		       * BIT(1) Disable DBDC scan type 1~3.</div><div class='add'>+		       * BIT(2) Use DBDC scan type 3 (dedicated one RF to scan).</div><div class='add'>+		       */</div><div class='add'>+	u8 src_mask;</div><div class='add'>+	__le16 channel_min_dwell_time;</div><div class='add'>+	__le16 channel_dwell_time; /* channel Dwell interval */</div><div class='add'>+	__le16 timeout_value;</div><div class='add'>+	__le16 probe_delay_time;</div><div class='add'>+	__le32 func_mask_ext;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct scan_ssid_tlv {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+</div><div class='add'>+	u8 ssid_type; /* BIT(0) wildcard SSID</div><div class='add'>+		       * BIT(1) P2P wildcard SSID</div><div class='add'>+		       * BIT(2) specified SSID + wildcard SSID</div><div class='add'>+		       * BIT(2) + ssid_type_ext BIT(0) specified SSID only</div><div class='add'>+		       */</div><div class='add'>+	u8 ssids_num;</div><div class='add'>+	u8 is_short_ssid;</div><div class='add'>+	u8 pad;</div><div class='add'>+	struct mt76_connac_mcu_scan_ssid ssids[MT7925_RNR_SCAN_MAX_BSSIDS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct scan_bssid_tlv {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	u8 match_ch;</div><div class='add'>+	u8 match_ssid_ind;</div><div class='add'>+	u8 rcpi;</div><div class='add'>+	u8 match_short_ssid_ind;</div><div class='add'>+	u8 pad[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct scan_chan_info_tlv {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+</div><div class='add'>+	u8 channel_type; /* 0: Full channels</div><div class='add'>+			  * 1: Only 2.4GHz channels</div><div class='add'>+			  * 2: Only 5GHz channels</div><div class='add'>+			  * 3: P2P social channel only (channel #1, #6 and #11)</div><div class='add'>+			  * 4: Specified channels</div><div class='add'>+			  * Others: Reserved</div><div class='add'>+			  */</div><div class='add'>+	u8 channels_num; /* valid when channel_type is 4 */</div><div class='add'>+	u8 pad[2];</div><div class='add'>+	struct mt76_connac_mcu_scan_channel channels[64];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct scan_ie_tlv {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+</div><div class='add'>+	__le16 ies_len;</div><div class='add'>+	u8 band;</div><div class='add'>+	u8 pad;</div><div class='add'>+	u8 ies[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct scan_misc_tlv {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+</div><div class='add'>+	u8 random_mac[ETH_ALEN];</div><div class='add'>+	u8 rsv[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct scan_sched_req {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+</div><div class='add'>+	u8 version;</div><div class='add'>+	u8 stop_on_match;</div><div class='add'>+	u8 intervals_num;</div><div class='add'>+	u8 scan_func;</div><div class='add'>+	__le16 intervals[MT76_CONNAC_MAX_NUM_SCHED_SCAN_INTERVAL];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct scan_sched_ssid_match_sets {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+</div><div class='add'>+	u8 match_num;</div><div class='add'>+	u8 rsv[3];</div><div class='add'>+</div><div class='add'>+	struct mt76_connac_mcu_scan_match match[MT76_CONNAC_MAX_SCAN_MATCH];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct scan_sched_enable {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+</div><div class='add'>+	u8 active;</div><div class='add'>+	u8 rsv[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mbmc_set_req {</div><div class='add'>+	u8 pad[4];</div><div class='add'>+	u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mbmc_conf_tlv {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+</div><div class='add'>+	u8 mbmc_en;</div><div class='add'>+	u8 band;</div><div class='add'>+	u8 pad[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct edca {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+</div><div class='add'>+	u8 queue;</div><div class='add'>+	u8 set;</div><div class='add'>+	u8 cw_min;</div><div class='add'>+	u8 cw_max;</div><div class='add'>+	__le16 txop;</div><div class='add'>+	u8 aifs;</div><div class='add'>+	u8 __rsv;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bss_req_hdr {</div><div class='add'>+	u8 bss_idx;</div><div class='add'>+	u8 __rsv[3];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct bss_rate_tlv {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 __rsv1[2];</div><div class='add'>+	__le16 basic_rate;</div><div class='add'>+	__le16 bc_trans;</div><div class='add'>+	__le16 mc_trans;</div><div class='add'>+	u8 short_preamble;</div><div class='add'>+	u8 bc_fixed_rate;</div><div class='add'>+	u8 mc_fixed_rate;</div><div class='add'>+	u8 __rsv2;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct bss_mld_tlv {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 group_mld_id;</div><div class='add'>+	u8 own_mld_id;</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='add'>+	u8 remap_idx;</div><div class='add'>+	u8 link_id;</div><div class='add'>+	u8 eml_enable;</div><div class='add'>+	u8 max_link_num;</div><div class='add'>+	u8 hybrid_mode;</div><div class='add'>+	u8 __rsv[3];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct bss_eht_tlv {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8  is_eht_op_present;</div><div class='add'>+	u8  is_eth_dscb_present;</div><div class='add'>+	u8  eht_ctrl;</div><div class='add'>+	u8  eht_ccfs0;</div><div class='add'>+	u8  eht_ccfs1;</div><div class='add'>+	u8  pad1;</div><div class='add'>+	__le16 eht_dis_sub_chan_bitmap;</div><div class='add'>+	u8  pad2[4];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct sta_rec_ba_uni {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 tid;</div><div class='add'>+	u8 ba_type;</div><div class='add'>+	u8 amsdu;</div><div class='add'>+	u8 ba_en;</div><div class='add'>+	__le16 ssn;</div><div class='add'>+	__le16 winsize;</div><div class='add'>+	u8 ba_rdd_rro;</div><div class='add'>+	u8 __rsv[3];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct sta_rec_eht {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 tid_bitmap;</div><div class='add'>+	u8 _rsv;</div><div class='add'>+	__le16 mac_cap;</div><div class='add'>+	__le64 phy_cap;</div><div class='add'>+	__le64 phy_cap_ext;</div><div class='add'>+	u8 mcs_map_bw20[4];</div><div class='add'>+	u8 mcs_map_bw80[3];</div><div class='add'>+	u8 mcs_map_bw160[3];</div><div class='add'>+	u8 mcs_map_bw320[3];</div><div class='add'>+	u8 _rsv2[3];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct sta_rec_sec_uni {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 add;</div><div class='add'>+	u8 tx_key;</div><div class='add'>+	u8 key_type;</div><div class='add'>+	u8 is_authenticator;</div><div class='add'>+	u8 peer_addr[6];</div><div class='add'>+	u8 bss_idx;</div><div class='add'>+	u8 cipher_id;</div><div class='add'>+	u8 key_id;</div><div class='add'>+	u8 key_len;</div><div class='add'>+	u8 wlan_idx;</div><div class='add'>+	u8 mgmt_prot;</div><div class='add'>+	u8 key[32];</div><div class='add'>+	u8 key_rsc[16];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct sta_rec_hdr_trans {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 from_ds;</div><div class='add'>+	u8 to_ds;</div><div class='add'>+	u8 dis_rx_hdr_tran;</div><div class='add'>+	u8 rsv;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct sta_rec_mld {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='add'>+	__le16 primary_id;</div><div class='add'>+	__le16 secondary_id;</div><div class='add'>+	__le16 wlan_id;</div><div class='add'>+	u8 link_num;</div><div class='add'>+	u8 rsv[3];</div><div class='add'>+	struct {</div><div class='add'>+		__le16 wlan_id;</div><div class='add'>+		u8 bss_idx;</div><div class='add'>+		u8 rsv;</div><div class='add'>+	} __packed link[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct sta_rec_eht_mld {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 nsep;</div><div class='add'>+	u8 mld_type;</div><div class='add'>+	u8 __rsv1[1];</div><div class='add'>+	u8 str_cap[3];</div><div class='add'>+	u8 eml_cap[3];</div><div class='add'>+	u8 __rsv2[3];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct bss_ifs_time_tlv {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 slot_valid;</div><div class='add'>+	u8 sifs_valid;</div><div class='add'>+	u8 rifs_valid;</div><div class='add'>+	u8 eifs_valid;</div><div class='add'>+	__le16 slot_time;</div><div class='add'>+	__le16 sifs_time;</div><div class='add'>+	__le16 rifs_time;</div><div class='add'>+	__le16 eifs_time;</div><div class='add'>+	u8 eifs_cck_valid;</div><div class='add'>+	u8 rsv;</div><div class='add'>+	__le16 eifs_cck_time;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct bss_rlm_tlv {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 control_channel;</div><div class='add'>+	u8 center_chan;</div><div class='add'>+	u8 center_chan2;</div><div class='add'>+	u8 bw;</div><div class='add'>+	u8 tx_streams;</div><div class='add'>+	u8 rx_streams;</div><div class='add'>+	u8 ht_op_info;</div><div class='add'>+	u8 sco;</div><div class='add'>+	u8 band;</div><div class='add'>+	u8 pad[3];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define MT7925_STA_UPDATE_MAX_SIZE	(sizeof(struct sta_req_hdr) +		\</div><div class='add'>+					 sizeof(struct sta_rec_basic) +		\</div><div class='add'>+					 sizeof(struct sta_rec_bf) +		\</div><div class='add'>+					 sizeof(struct sta_rec_ht) +		\</div><div class='add'>+					 sizeof(struct sta_rec_he_v2) +		\</div><div class='add'>+					 sizeof(struct sta_rec_ba_uni) +	\</div><div class='add'>+					 sizeof(struct sta_rec_vht) +		\</div><div class='add'>+					 sizeof(struct sta_rec_uapsd) +		\</div><div class='add'>+					 sizeof(struct sta_rec_amsdu) +		\</div><div class='add'>+					 sizeof(struct sta_rec_bfee) +		\</div><div class='add'>+					 sizeof(struct sta_rec_phy) +		\</div><div class='add'>+					 sizeof(struct sta_rec_ra) +		\</div><div class='add'>+					 sizeof(struct sta_rec_sec_uni) +   \</div><div class='add'>+					 sizeof(struct sta_rec_ra_fixed) +	\</div><div class='add'>+					 sizeof(struct sta_rec_he_6g_capa) +	\</div><div class='add'>+					 sizeof(struct sta_rec_eht) +		\</div><div class='add'>+					 sizeof(struct sta_rec_hdr_trans) +	\</div><div class='add'>+					 sizeof(struct sta_rec_mld) +		\</div><div class='add'>+					 sizeof(struct tlv) * 2 +		\</div><div class='add'>+					 sizeof(struct sta_rec_remove))</div><div class='add'>+</div><div class='add'>+#define MT7925_BSS_UPDATE_MAX_SIZE	(sizeof(struct bss_req_hdr) +		\</div><div class='add'>+					 sizeof(struct mt76_connac_bss_basic_tlv) +	\</div><div class='add'>+					 sizeof(struct mt76_connac_bss_qos_tlv) +	\</div><div class='add'>+					 sizeof(struct bss_rate_tlv) +			\</div><div class='add'>+					 sizeof(struct bss_mld_tlv) +			\</div><div class='add'>+					 sizeof(struct bss_info_uni_he) +		\</div><div class='add'>+					 sizeof(struct bss_info_uni_bss_color) +	\</div><div class='add'>+					 sizeof(struct bss_ifs_time_tlv) +		\</div><div class='add'>+					 sizeof(struct bss_rlm_tlv) +		\</div><div class='add'>+					 sizeof(struct tlv))</div><div class='add'>+</div><div class='add'>+#define MT_CONNAC3_SKU_POWER_LIMIT      449</div><div class='add'>+struct mt7925_sku_tlv {</div><div class='add'>+	u8 channel;</div><div class='add'>+	s8 pwr_limit[MT_CONNAC3_SKU_POWER_LIMIT];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7925_tx_power_limit_tlv {</div><div class='add'>+	u8 rsv[4];</div><div class='add'>+</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+</div><div class='add'>+	/* DW0 - common info*/</div><div class='add'>+	u8 ver;</div><div class='add'>+	u8 pad0;</div><div class='add'>+	__le16 rsv1;</div><div class='add'>+	/* DW1 - cmd hint */</div><div class='add'>+	u8 n_chan; /* # channel */</div><div class='add'>+	u8 band; /* 2.4GHz - 5GHz - 6GHz */</div><div class='add'>+	u8 last_msg;</div><div class='add'>+	u8 limit_type;</div><div class='add'>+	/* DW3 */</div><div class='add'>+	u8 alpha2[4]; /* regulatory_request.alpha2 */</div><div class='add'>+	u8 pad2[32];</div><div class='add'>+</div><div class='add'>+	u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7925_arpns_tlv {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+</div><div class='add'>+	u8 enable;</div><div class='add'>+	u8 ips_num;</div><div class='add'>+	u8 rsv[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7925_wow_pattern_tlv {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 bss_idx;</div><div class='add'>+	u8 index; /* pattern index */</div><div class='add'>+	u8 enable; /* 0: disable</div><div class='add'>+		    * 1: enable</div><div class='add'>+		    */</div><div class='add'>+	u8 data_len; /* pattern length */</div><div class='add'>+	u8 offset;</div><div class='add'>+	u8 mask[MT76_CONNAC_WOW_MASK_MAX_LEN];</div><div class='add'>+	u8 pattern[MT76_CONNAC_WOW_PATTEN_MAX_LEN];</div><div class='add'>+	u8 rsv[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct roc_acquire_tlv {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 bss_idx;</div><div class='add'>+	u8 tokenid;</div><div class='add'>+	u8 control_channel;</div><div class='add'>+	u8 sco;</div><div class='add'>+	u8 band;</div><div class='add'>+	u8 bw;</div><div class='add'>+	u8 center_chan;</div><div class='add'>+	u8 center_chan2;</div><div class='add'>+	u8 bw_from_ap;</div><div class='add'>+	u8 center_chan_from_ap;</div><div class='add'>+	u8 center_chan2_from_ap;</div><div class='add'>+	u8 reqtype;</div><div class='add'>+	__le32 maxinterval;</div><div class='add'>+	u8 dbdcband;</div><div class='add'>+	u8 rsv[3];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum ENUM_CMD_TEST_CTRL_ACT {</div><div class='add'>+	CMD_TEST_CTRL_ACT_SWITCH_MODE = 0,</div><div class='add'>+	CMD_TEST_CTRL_ACT_SET_AT = 1,</div><div class='add'>+	CMD_TEST_CTRL_ACT_GET_AT = 2,</div><div class='add'>+	CMD_TEST_CTRL_ACT_SET_AT_ENG = 3,</div><div class='add'>+	CMD_TEST_CTRL_ACT_GET_AT_ENG = 4,</div><div class='add'>+	CMD_TEST_CTRL_ACT_NUM</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ENUM_CMD_TEST_CTRL_ACT_SWITCH_MODE_OP {</div><div class='add'>+	CMD_TEST_CTRL_ACT_SWITCH_MODE_NORMAL = 0,</div><div class='add'>+	CMD_TEST_CTRL_ACT_SWITCH_MODE_RF_TEST = 1,</div><div class='add'>+	CMD_TEST_CTRL_ACT_SWITCH_MODE_ICAP = 2,</div><div class='add'>+	CMD_TEST_CTRL_ACT_SWITCH_MODE_NUM</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union testmode_data {</div><div class='add'>+	__le32 op_mode;</div><div class='add'>+	__le32 channel_freq;</div><div class='add'>+	u8 rf_at_info[84];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union testmode_evt {</div><div class='add'>+	__le32 op_mode;</div><div class='add'>+	__le32 channel_freq;</div><div class='add'>+	u8 rf_at_info[1024];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct uni_cmd_testmode_ctrl {</div><div class='add'>+	u16 tag;</div><div class='add'>+	u16 length;</div><div class='add'>+	u8 action;</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+	union testmode_data data;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7925_rftest_cmd {</div><div class='add'>+	u8 padding[4];</div><div class='add'>+	struct uni_cmd_testmode_ctrl ctrl;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+static inline enum connac3_mcu_cipher_type</div><div class='add'>+mt7925_mcu_get_cipher(int cipher)</div><div class='add'>+{</div><div class='add'>+	switch (cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP40:</div><div class='add'>+		return CONNAC3_CIPHER_WEP40;</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP104:</div><div class='add'>+		return CONNAC3_CIPHER_WEP104;</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		return CONNAC3_CIPHER_TKIP;</div><div class='add'>+	case WLAN_CIPHER_SUITE_AES_CMAC:</div><div class='add'>+		return CONNAC3_CIPHER_BIP_CMAC_128;</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+		return CONNAC3_CIPHER_AES_CCMP;</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP_256:</div><div class='add'>+		return CONNAC3_CIPHER_CCMP_256;</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP:</div><div class='add'>+		return CONNAC3_CIPHER_GCMP;</div><div class='add'>+	case WLAN_CIPHER_SUITE_GCMP_256:</div><div class='add'>+		return CONNAC3_CIPHER_GCMP_256;</div><div class='add'>+	case WLAN_CIPHER_SUITE_SMS4:</div><div class='add'>+		return CONNAC3_CIPHER_WAPI;</div><div class='add'>+	default:</div><div class='add'>+		return CONNAC3_CIPHER_NONE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_dbdc(struct mt76_phy *phy, bool enable);</div><div class='add'>+int mt7925_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif,</div><div class='add'>+		       struct ieee80211_scan_request *scan_req);</div><div class='add'>+int mt7925_mcu_cancel_hw_scan(struct mt76_phy *phy,</div><div class='add'>+			      struct ieee80211_vif *vif);</div><div class='add'>+int mt7925_mcu_sched_scan_req(struct mt76_phy *phy,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      struct cfg80211_sched_scan_request *sreq,</div><div class='add'>+			      struct ieee80211_scan_ies *ies);</div><div class='add'>+int mt7925_mcu_sched_scan_enable(struct mt76_phy *phy,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 bool enable);</div><div class='add'>+void mt7925_mcu_del_dev(struct mt76_dev *mdev,</div><div class='add'>+			struct ieee80211_vif *vif);</div><div class='add'>+int mt7925_mcu_add_bss_info(struct mt792x_phy *phy,</div><div class='add'>+			    struct ieee80211_chanctx_conf *ctx,</div><div class='add'>+			    struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			    struct ieee80211_link_sta *link_sta,</div><div class='add'>+			    int enable);</div><div class='add'>+int mt7925_mcu_set_timing(struct mt792x_phy *phy,</div><div class='add'>+			  struct ieee80211_bss_conf *link_conf);</div><div class='add'>+int mt7925_mcu_set_deep_sleep(struct mt792x_dev *dev, bool enable);</div><div class='add'>+int mt7925_mcu_set_thermal_protect(struct mt792x_dev *dev);</div><div class='add'>+int mt7925_mcu_set_channel_domain(struct mt76_phy *phy);</div><div class='add'>+int mt7925_mcu_set_radio_en(struct mt792x_phy *phy, bool enable);</div><div class='add'>+int mt7925_mcu_set_chctx(struct mt76_phy *phy, struct mt76_vif_link *mvif,</div><div class='add'>+			 struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			 struct ieee80211_chanctx_conf *ctx);</div><div class='add'>+int mt7925_mcu_set_eht_pp(struct mt76_phy *phy, struct mt76_vif_link *mvif,</div><div class='add'>+			  struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			  struct ieee80211_chanctx_conf *ctx);</div><div class='add'>+int mt7925_mcu_set_rate_txpower(struct mt76_phy *phy);</div><div class='add'>+int mt7925_mcu_update_arp_filter(struct mt76_dev *dev,</div><div class='add'>+				 struct ieee80211_bss_conf *link_conf);</div><div class='add'>+int</div><div class='add'>+mt7925_mcu_uni_bss_bcnft(struct mt792x_dev *dev,</div><div class='add'>+			 struct ieee80211_bss_conf *link_conf, bool enable);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h b/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h<br/>new file mode 100644<br/>index 000000000000..6b9bf1b89032<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h</a></div><div class='hunk'>@@ -0,0 +1,380 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/* Copyright (C) 2023 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#ifndef __MT7925_H</div><div class='add'>+#define __MT7925_H</div><div class='add'>+</div><div class='add'>+#include "../mt792x.h"</div><div class='add'>+#include "regs.h"</div><div class='add'>+</div><div class='add'>+#define MT7925_BEACON_RATES_TBL		25</div><div class='add'>+</div><div class='add'>+#define MT7925_TX_RING_SIZE		2048</div><div class='add'>+#define MT7925_TX_MCU_RING_SIZE		256</div><div class='add'>+#define MT7925_TX_FWDL_RING_SIZE	128</div><div class='add'>+</div><div class='add'>+#define MT7925_RX_RING_SIZE		1536</div><div class='add'>+#define MT7925_RX_MCU_RING_SIZE		512</div><div class='add'>+</div><div class='add'>+#define MT7925_EEPROM_SIZE		3584</div><div class='add'>+#define MT7925_TOKEN_SIZE		8192</div><div class='add'>+</div><div class='add'>+#define MT7925_EEPROM_BLOCK_SIZE	16</div><div class='add'>+</div><div class='add'>+#define MT7925_SKU_RATE_NUM		161</div><div class='add'>+#define MT7925_SKU_MAX_DELTA_IDX	MT7925_SKU_RATE_NUM</div><div class='add'>+#define MT7925_SKU_TABLE_SIZE		(MT7925_SKU_RATE_NUM + 1)</div><div class='add'>+</div><div class='add'>+#define MCU_UNI_EVENT_ROC  0x27</div><div class='add'>+</div><div class='add'>+#define HIF_TRAFFIC_IDLE 0x2</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	UNI_EVENT_HIF_CTRL_BASIC = 0,</div><div class='add'>+	UNI_EVENT_HIF_CTRL_TAG_NUM</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt7925_mcu_hif_ctrl_basic_tlv {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 cid;</div><div class='add'>+	u8 pad[3];</div><div class='add'>+	u32 status;</div><div class='add'>+	u8 hif_type;</div><div class='add'>+	u8 hif_tx_traffic_status;</div><div class='add'>+	u8 hif_rx_traffic_status;</div><div class='add'>+	u8 hifsuspend;</div><div class='add'>+	u8 rsv[4];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	UNI_ROC_ACQUIRE,</div><div class='add'>+	UNI_ROC_ABORT,</div><div class='add'>+	UNI_ROC_SUB_LINK = 3,</div><div class='add'>+	UNI_ROC_NUM</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mt7925_roc_req {</div><div class='add'>+	MT7925_ROC_REQ_JOIN,</div><div class='add'>+	MT7925_ROC_REQ_ROC,</div><div class='add'>+	MT7925_ROC_REQ_SUB_LINK,</div><div class='add'>+	MT7925_ROC_REQ_MLSR_AG = 10,</div><div class='add'>+	MT7925_ROC_REQ_MLSR_AA,</div><div class='add'>+	MT7925_ROC_REQ_NUM</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	UNI_EVENT_ROC_GRANT = 0,</div><div class='add'>+	UNI_EVENT_ROC_GRANT_SUB_LINK = 4,</div><div class='add'>+	UNI_EVENT_ROC_TAG_NUM</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt7925_roc_grant_tlv {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 bss_idx;</div><div class='add'>+	u8 tokenid;</div><div class='add'>+	u8 status;</div><div class='add'>+	u8 primarychannel;</div><div class='add'>+	u8 rfsco;</div><div class='add'>+	u8 rfband;</div><div class='add'>+	u8 channelwidth;</div><div class='add'>+	u8 centerfreqseg1;</div><div class='add'>+	u8 centerfreqseg2;</div><div class='add'>+	u8 reqtype;</div><div class='add'>+	u8 dbdcband;</div><div class='add'>+	u8 rsv[1];</div><div class='add'>+	__le32 max_interval;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7925_beacon_loss_tlv {</div><div class='add'>+	__le16 tag;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 reason;</div><div class='add'>+	u8 nr_btolink;</div><div class='add'>+	u8 pad[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7925_uni_beacon_loss_event {</div><div class='add'>+	struct {</div><div class='add'>+		u8 bss_idx;</div><div class='add'>+		u8 pad[3];</div><div class='add'>+	} __packed hdr;</div><div class='add'>+	struct mt7925_beacon_loss_tlv beacon_loss;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7925_uni_rssi_monitor_event {</div><div class='add'>+		__le16 tag;</div><div class='add'>+		__le16 len;</div><div class='add'>+		__le32 rssi;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define to_rssi(field, rxv)		((FIELD_GET(field, rxv) - 220) / 2)</div><div class='add'>+#define to_rcpi(rssi)			(2 * (rssi) + 220)</div><div class='add'>+</div><div class='add'>+enum mt7925_txq_id {</div><div class='add'>+	MT7925_TXQ_BAND0,</div><div class='add'>+	MT7925_TXQ_BAND1,</div><div class='add'>+	MT7925_TXQ_MCU_WM = 15,</div><div class='add'>+	MT7925_TXQ_FWDL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mt7925_rxq_id {</div><div class='add'>+	MT7925_RXQ_BAND0 = 2,</div><div class='add'>+	MT7925_RXQ_BAND1,</div><div class='add'>+	MT7925_RXQ_MCU_WM = 0,</div><div class='add'>+	MT7925_RXQ_MCU_WM2, /* for tx done */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MODE_OPEN = 0,</div><div class='add'>+	MODE_SHARED = 1,</div><div class='add'>+	MODE_WPA = 3,</div><div class='add'>+	MODE_WPA_PSK = 4,</div><div class='add'>+	MODE_WPA_NONE = 5,</div><div class='add'>+	MODE_WPA2 = 6,</div><div class='add'>+	MODE_WPA2_PSK = 7,</div><div class='add'>+	MODE_WPA3_SAE = 11,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MT7925_CLC_POWER,</div><div class='add'>+	MT7925_CLC_CHAN,</div><div class='add'>+	MT7925_CLC_MAX_NUM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt7925_clc_rule_v2 {</div><div class='add'>+	u32 flag;</div><div class='add'>+	u8 alpha2[2];</div><div class='add'>+	u8 rsv[10];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7925_clc_rule {</div><div class='add'>+	u8 alpha2[2];</div><div class='add'>+	u8 type[2];</div><div class='add'>+	u8 seg_idx;</div><div class='add'>+	u8 flag; /* UNII4~8 ctrl flag */</div><div class='add'>+	u8 rsv[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7925_clc_segment {</div><div class='add'>+	u8 idx;</div><div class='add'>+	u8 rsv1[3];</div><div class='add'>+	u32 offset;</div><div class='add'>+	u32 len;</div><div class='add'>+	u8 rsv2[4];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7925_clc_type0 {</div><div class='add'>+	u8 nr_country;</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 nr_seg;</div><div class='add'>+	u8 rsv[7];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7925_clc_type2 {</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 rsv[9];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7925_clc {</div><div class='add'>+	__le32 len;</div><div class='add'>+	u8 idx;</div><div class='add'>+	u8 ver;</div><div class='add'>+	union {</div><div class='add'>+		struct mt7925_clc_type0 t0;</div><div class='add'>+		struct mt7925_clc_type2 t2;</div><div class='add'>+	};</div><div class='add'>+	u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum mt7925_eeprom_field {</div><div class='add'>+	MT_EE_CHIP_ID =		0x000,</div><div class='add'>+	MT_EE_VERSION =		0x002,</div><div class='add'>+	MT_EE_MAC_ADDR =	0x004,</div><div class='add'>+	MT_EE_HW_TYPE =		0xa71,</div><div class='add'>+	__MT_EE_MAX =		0x9ff</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MT_EE_HW_TYPE_ENCAP     GENMASK(1, 0)</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	TXPWR_USER,</div><div class='add'>+	TXPWR_EEPROM,</div><div class='add'>+	TXPWR_MAC,</div><div class='add'>+	TXPWR_MAX_NUM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt7925_txpwr {</div><div class='add'>+	s8 cck[4][2];</div><div class='add'>+	s8 ofdm[8][2];</div><div class='add'>+	s8 ht20[8][2];</div><div class='add'>+	s8 ht40[9][2];</div><div class='add'>+	s8 vht20[12][2];</div><div class='add'>+	s8 vht40[12][2];</div><div class='add'>+	s8 vht80[12][2];</div><div class='add'>+	s8 vht160[12][2];</div><div class='add'>+	s8 he26[12][2];</div><div class='add'>+	s8 he52[12][2];</div><div class='add'>+	s8 he106[12][2];</div><div class='add'>+	s8 he242[12][2];</div><div class='add'>+	s8 he484[12][2];</div><div class='add'>+	s8 he996[12][2];</div><div class='add'>+	s8 he996x2[12][2];</div><div class='add'>+	s8 eht26[16][2];</div><div class='add'>+	s8 eht52[16][2];</div><div class='add'>+	s8 eht106[16][2];</div><div class='add'>+	s8 eht242[16][2];</div><div class='add'>+	s8 eht484[16][2];</div><div class='add'>+	s8 eht996[16][2];</div><div class='add'>+	s8 eht996x2[16][2];</div><div class='add'>+	s8 eht996x4[16][2];</div><div class='add'>+	s8 eht26_52[16][2];</div><div class='add'>+	s8 eht26_106[16][2];</div><div class='add'>+	s8 eht484_242[16][2];</div><div class='add'>+	s8 eht996_484[16][2];</div><div class='add'>+	s8 eht996_484_242[16][2];</div><div class='add'>+	s8 eht996x2_484[16][2];</div><div class='add'>+	s8 eht996x3[16][2];</div><div class='add'>+	s8 eht996x3_484[16][2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct ieee80211_ops mt7925_ops;</div><div class='add'>+</div><div class='add'>+int __mt7925_start(struct mt792x_phy *phy);</div><div class='add'>+int mt7925_register_device(struct mt792x_dev *dev);</div><div class='add'>+void mt7925_unregister_device(struct mt792x_dev *dev);</div><div class='add'>+int mt7925_run_firmware(struct mt792x_dev *dev);</div><div class='add'>+int mt7925_mcu_set_bss_pm(struct mt792x_dev *dev,</div><div class='add'>+			  struct ieee80211_bss_conf *link_conf,</div><div class='add'>+			  bool enable);</div><div class='add'>+int mt7925_mcu_sta_update(struct mt792x_dev *dev,</div><div class='add'>+			  struct ieee80211_link_sta *link_sta,</div><div class='add'>+			  struct ieee80211_vif *vif, bool enable,</div><div class='add'>+			  enum mt76_sta_info_state state);</div><div class='add'>+int mt7925_mcu_set_chan_info(struct mt792x_phy *phy, u16 tag);</div><div class='add'>+int mt7925_mcu_set_tx(struct mt792x_dev *dev, struct ieee80211_bss_conf *bss_conf);</div><div class='add'>+int mt7925_mcu_set_eeprom(struct mt792x_dev *dev);</div><div class='add'>+int mt7925_mcu_get_rx_rate(struct mt792x_phy *phy, struct ieee80211_vif *vif,</div><div class='add'>+			   struct ieee80211_sta *sta, struct rate_info *rate);</div><div class='add'>+int mt7925_mcu_fw_log_2_host(struct mt792x_dev *dev, u8 ctrl);</div><div class='add'>+void mt7925_mcu_rx_event(struct mt792x_dev *dev, struct sk_buff *skb);</div><div class='add'>+int mt7925_mcu_chip_config(struct mt792x_dev *dev, const char *cmd);</div><div class='add'>+int mt7925_mcu_set_rxfilter(struct mt792x_dev *dev, u32 fif,</div><div class='add'>+			    u8 bit_op, u32 bit_map);</div><div class='add'>+</div><div class='add'>+int mt7925_mac_init(struct mt792x_dev *dev);</div><div class='add'>+int mt7925_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='add'>+		       struct ieee80211_sta *sta);</div><div class='add'>+bool mt7925_mac_wtbl_update(struct mt792x_dev *dev, int idx, u32 mask);</div><div class='add'>+int mt7925_mac_sta_event(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='add'>+			 struct ieee80211_sta *sta, enum mt76_sta_event ev);</div><div class='add'>+void mt7925_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,</div><div class='add'>+			   struct ieee80211_sta *sta);</div><div class='add'>+void mt7925_mac_reset_work(struct work_struct *work);</div><div class='add'>+int mt7925e_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='add'>+			   enum mt76_txq_id qid, struct mt76_wcid *wcid,</div><div class='add'>+			   struct ieee80211_sta *sta,</div><div class='add'>+			   struct mt76_tx_info *tx_info);</div><div class='add'>+</div><div class='add'>+void mt7925_tx_token_put(struct mt792x_dev *dev);</div><div class='add'>+bool mt7925_rx_check(struct mt76_dev *mdev, void *data, int len);</div><div class='add'>+void mt7925_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,</div><div class='add'>+			 struct sk_buff *skb, u32 *info);</div><div class='add'>+void mt7925_stats_work(struct work_struct *work);</div><div class='add'>+void mt7925_set_stream_he_eht_caps(struct mt792x_phy *phy);</div><div class='add'>+int mt7925_init_mlo_caps(struct mt792x_phy *phy);</div><div class='add'>+int mt7925_init_debugfs(struct mt792x_dev *dev);</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_beacon_filter(struct mt792x_dev *dev,</div><div class='add'>+				 struct ieee80211_vif *vif,</div><div class='add'>+				 bool enable);</div><div class='add'>+int mt7925_mcu_uni_tx_ba(struct mt792x_dev *dev,</div><div class='add'>+			 struct ieee80211_ampdu_params *params,</div><div class='add'>+			 bool enable);</div><div class='add'>+int mt7925_mcu_uni_rx_ba(struct mt792x_dev *dev,</div><div class='add'>+			 struct ieee80211_ampdu_params *params,</div><div class='add'>+			 bool enable);</div><div class='add'>+void mt7925_mlo_pm_work(struct work_struct *work);</div><div class='add'>+void mt7925_scan_work(struct work_struct *work);</div><div class='add'>+void mt7925_roc_work(struct work_struct *work);</div><div class='add'>+int mt7925_mcu_uni_bss_ps(struct mt792x_dev *dev,</div><div class='add'>+			  struct ieee80211_bss_conf *link_conf);</div><div class='add'>+void mt7925_coredump_work(struct work_struct *work);</div><div class='add'>+int mt7925_get_txpwr_info(struct mt792x_dev *dev, u8 band_idx,</div><div class='add'>+			  struct mt7925_txpwr *txpwr);</div><div class='add'>+void mt7925_mac_set_fixed_rate_table(struct mt792x_dev *dev,</div><div class='add'>+				     u8 tbl_idx, u16 rate_idx);</div><div class='add'>+void mt7925_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi,</div><div class='add'>+			   struct sk_buff *skb, struct mt76_wcid *wcid,</div><div class='add'>+			   struct ieee80211_key_conf *key, int pid,</div><div class='add'>+			   enum mt76_txq_id qid, u32 changed);</div><div class='add'>+void mt7925_txwi_free(struct mt792x_dev *dev, struct mt76_txwi_cache *t,</div><div class='add'>+		      struct ieee80211_sta *sta, struct mt76_wcid *wcid,</div><div class='add'>+		      struct list_head *free_list);</div><div class='add'>+int mt7925_mcu_parse_response(struct mt76_dev *mdev, int cmd,</div><div class='add'>+			      struct sk_buff *skb, int seq);</div><div class='add'>+</div><div class='add'>+int mt7925e_mac_reset(struct mt792x_dev *dev);</div><div class='add'>+int mt7925e_mcu_init(struct mt792x_dev *dev);</div><div class='add'>+void mt7925_mac_add_txs(struct mt792x_dev *dev, void *data);</div><div class='add'>+void mt7925_set_runtime_pm(struct mt792x_dev *dev);</div><div class='add'>+void mt7925_mcu_set_suspend_iter(void *priv, u8 *mac,</div><div class='add'>+				 struct ieee80211_vif *vif);</div><div class='add'>+void mt7925_connac_mcu_set_suspend_iter(void *priv, u8 *mac,</div><div class='add'>+					struct ieee80211_vif *vif);</div><div class='add'>+void mt7925_set_ipv6_ns_work(struct work_struct *work);</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_sniffer(struct mt792x_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+			   bool enable);</div><div class='add'>+int mt7925_mcu_config_sniffer(struct mt792x_vif *vif,</div><div class='add'>+			      struct ieee80211_chanctx_conf *ctx);</div><div class='add'>+int mt7925_mcu_get_temperature(struct mt792x_phy *phy);</div><div class='add'>+</div><div class='add'>+int mt7925_usb_sdio_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='add'>+				   enum mt76_txq_id qid, struct mt76_wcid *wcid,</div><div class='add'>+				   struct ieee80211_sta *sta,</div><div class='add'>+				   struct mt76_tx_info *tx_info);</div><div class='add'>+void mt7925_usb_sdio_tx_complete_skb(struct mt76_dev *mdev,</div><div class='add'>+				     struct mt76_queue_entry *e);</div><div class='add'>+bool mt7925_usb_sdio_tx_status_data(struct mt76_dev *mdev, u8 *update);</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_uni_add_beacon_offload(struct mt792x_dev *dev,</div><div class='add'>+				      struct ieee80211_hw *hw,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      bool enable);</div><div class='add'>+int mt7925_set_tx_sar_pwr(struct ieee80211_hw *hw,</div><div class='add'>+			  const struct cfg80211_sar_specs *sar);</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_regval(struct mt792x_dev *dev, u32 regidx, u32 *val, bool set);</div><div class='add'>+int mt7925_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,</div><div class='add'>+		       enum environment_cap env_cap);</div><div class='add'>+int mt7925_mcu_set_mlo_roc(struct mt792x_bss_conf *mconf, u16 sel_links,</div><div class='add'>+			   int duration, u8 token_id);</div><div class='add'>+int mt7925_mcu_set_roc(struct mt792x_phy *phy, struct mt792x_bss_conf *mconf,</div><div class='add'>+		       struct ieee80211_channel *chan, int duration,</div><div class='add'>+		       enum mt7925_roc_req type, u8 token_id);</div><div class='add'>+int mt7925_mcu_abort_roc(struct mt792x_phy *phy, struct mt792x_bss_conf *mconf,</div><div class='add'>+			 u8 token_id);</div><div class='add'>+void mt7925_roc_abort_sync(struct mt792x_dev *dev);</div><div class='add'>+int mt7925_mcu_fill_message(struct mt76_dev *mdev, struct sk_buff *skb,</div><div class='add'>+			    int cmd, int *wait_seq);</div><div class='add'>+int mt7925_mcu_add_key(struct mt76_dev *dev, struct ieee80211_vif *vif,</div><div class='add'>+		       struct mt76_connac_sta_key_conf *sta_key_conf,</div><div class='add'>+		       struct ieee80211_key_conf *key, int mcu_cmd,</div><div class='add'>+		       struct mt76_wcid *wcid, enum set_key_cmd cmd,</div><div class='add'>+		       struct mt792x_sta *msta);</div><div class='add'>+int mt7925_mcu_set_rts_thresh(struct mt792x_phy *phy, u32 val);</div><div class='add'>+int mt7925_mcu_wtbl_update_hdr_trans(struct mt792x_dev *dev,</div><div class='add'>+				     struct ieee80211_vif *vif,</div><div class='add'>+				     struct ieee80211_sta *sta,</div><div class='add'>+				     int link_id);</div><div class='add'>+int mt7925_mcu_wf_rf_pin_ctrl(struct mt792x_phy *phy);</div><div class='add'>+</div><div class='add'>+int mt7925_testmode_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			void *data, int len);</div><div class='add'>+int mt7925_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *msg,</div><div class='add'>+			 struct netlink_callback *cb, void *data, int len);</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_set_rssimonitor(struct mt792x_dev *dev, struct ieee80211_vif *vif);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/pci.c b/drivers/net/wireless/mediatek/mt76/mt7925/pci.c<br/>new file mode 100644<br/>index 000000000000..c4161754c01d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7925/pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7925/pci.c</a></div><div class='hunk'>@@ -0,0 +1,639 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/* Copyright (C) 2023 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mt7925.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+#include "mcu.h"</div><div class='add'>+#include "regd.h"</div><div class='add'>+#include "../dma.h"</div><div class='add'>+</div><div class='add'>+static const struct pci_device_id mt7925_pci_device_table[] = {</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7925),</div><div class='add'>+		.driver_data = (kernel_ulong_t)MT7925_FIRMWARE_WM },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x0717),</div><div class='add'>+		.driver_data = (kernel_ulong_t)MT7925_FIRMWARE_WM },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool mt7925_disable_aspm;</div><div class='add'>+module_param_named(disable_aspm, mt7925_disable_aspm, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(disable_aspm, "disable PCI ASPM support");</div><div class='add'>+</div><div class='add'>+static int mt7925e_init_reset(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return mt792x_wpdma_reset(dev, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7925e_unregister_device(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;phy.chip_cap &amp; MT792x_CHIP_CAP_WF_RF_PIN_CTRL_EVT_EN)</div><div class='add'>+		wiphy_rfkill_stop_polling(hw-&gt;wiphy);</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;dev-&gt;init_work);</div><div class='add'>+	mt76_unregister_device(&amp;dev-&gt;mt76);</div><div class='add'>+	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i)</div><div class='add'>+		napi_disable(&amp;dev-&gt;mt76.napi[i]);</div><div class='add'>+	cancel_delayed_work_sync(&amp;pm-&gt;ps_work);</div><div class='add'>+	cancel_work_sync(&amp;pm-&gt;wake_work);</div><div class='add'>+	cancel_work_sync(&amp;dev-&gt;reset_work);</div><div class='add'>+</div><div class='add'>+	mt7925_tx_token_put(dev);</div><div class='add'>+	__mt792x_mcu_drv_pmctrl(dev);</div><div class='add'>+	mt792x_dma_cleanup(dev);</div><div class='add'>+	mt792x_wfsys_reset(dev);</div><div class='add'>+	skb_queue_purge(&amp;dev-&gt;mt76.mcu.res_q);</div><div class='add'>+</div><div class='add'>+	tasklet_disable(&amp;dev-&gt;mt76.irq_tasklet);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7925_reg_remap_restore(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	/* remap to ori status */</div><div class='add'>+	if (unlikely(dev-&gt;backup_l1)) {</div><div class='add'>+		dev-&gt;bus_ops-&gt;wr(&amp;dev-&gt;mt76, MT_HIF_REMAP_L1, dev-&gt;backup_l1);</div><div class='add'>+		dev-&gt;backup_l1 = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;backup_l2) {</div><div class='add'>+		dev-&gt;bus_ops-&gt;wr(&amp;dev-&gt;mt76, MT_HIF_REMAP_L2, dev-&gt;backup_l2);</div><div class='add'>+		dev-&gt;backup_l2 = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 mt7925_reg_map_l1(struct mt792x_dev *dev, u32 addr)</div><div class='add'>+{</div><div class='add'>+	u32 offset = FIELD_GET(MT_HIF_REMAP_L1_OFFSET, addr);</div><div class='add'>+	u32 base = FIELD_GET(MT_HIF_REMAP_L1_BASE, addr);</div><div class='add'>+</div><div class='add'>+	dev-&gt;backup_l1 = dev-&gt;bus_ops-&gt;rr(&amp;dev-&gt;mt76, MT_HIF_REMAP_L1);</div><div class='add'>+</div><div class='add'>+	dev-&gt;bus_ops-&gt;rmw(&amp;dev-&gt;mt76, MT_HIF_REMAP_L1,</div><div class='add'>+			  MT_HIF_REMAP_L1_MASK,</div><div class='add'>+			  FIELD_PREP(MT_HIF_REMAP_L1_MASK, base));</div><div class='add'>+</div><div class='add'>+	/* use read to push write */</div><div class='add'>+	dev-&gt;bus_ops-&gt;rr(&amp;dev-&gt;mt76, MT_HIF_REMAP_L1);</div><div class='add'>+</div><div class='add'>+	return MT_HIF_REMAP_BASE_L1 + offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 mt7925_reg_map_l2(struct mt792x_dev *dev, u32 addr)</div><div class='add'>+{</div><div class='add'>+	u32 base = FIELD_GET(MT_HIF_REMAP_L1_BASE, MT_HIF_REMAP_BASE_L2);</div><div class='add'>+</div><div class='add'>+	dev-&gt;backup_l2 = dev-&gt;bus_ops-&gt;rr(&amp;dev-&gt;mt76, MT_HIF_REMAP_L1);</div><div class='add'>+</div><div class='add'>+	dev-&gt;bus_ops-&gt;rmw(&amp;dev-&gt;mt76, MT_HIF_REMAP_L1,</div><div class='add'>+			  MT_HIF_REMAP_L1_MASK,</div><div class='add'>+			  FIELD_PREP(MT_HIF_REMAP_L1_MASK, base));</div><div class='add'>+</div><div class='add'>+	dev-&gt;bus_ops-&gt;wr(&amp;dev-&gt;mt76, MT_HIF_REMAP_L2, addr);</div><div class='add'>+	/* use read to push write */</div><div class='add'>+	dev-&gt;bus_ops-&gt;rr(&amp;dev-&gt;mt76, MT_HIF_REMAP_L1);</div><div class='add'>+</div><div class='add'>+	return MT_HIF_REMAP_BASE_L1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 __mt7925_reg_addr(struct mt792x_dev *dev, u32 addr)</div><div class='add'>+{</div><div class='add'>+	static const struct mt76_connac_reg_map fixed_map[] = {</div><div class='add'>+		{ 0x830c0000, 0x000000, 0x0001000 }, /* WF_MCU_BUS_CR_REMAP */</div><div class='add'>+		{ 0x54000000, 0x002000, 0x0001000 }, /* WFDMA PCIE0 MCU DMA0 */</div><div class='add'>+		{ 0x55000000, 0x003000, 0x0001000 }, /* WFDMA PCIE0 MCU DMA1 */</div><div class='add'>+		{ 0x56000000, 0x004000, 0x0001000 }, /* WFDMA reserved */</div><div class='add'>+		{ 0x57000000, 0x005000, 0x0001000 }, /* WFDMA MCU wrap CR */</div><div class='add'>+		{ 0x58000000, 0x006000, 0x0001000 }, /* WFDMA PCIE1 MCU DMA0 (MEM_DMA) */</div><div class='add'>+		{ 0x59000000, 0x007000, 0x0001000 }, /* WFDMA PCIE1 MCU DMA1 */</div><div class='add'>+		{ 0x820c0000, 0x008000, 0x0004000 }, /* WF_UMAC_TOP (PLE) */</div><div class='add'>+		{ 0x820c8000, 0x00c000, 0x0002000 }, /* WF_UMAC_TOP (PSE) */</div><div class='add'>+		{ 0x820cc000, 0x00e000, 0x0002000 }, /* WF_UMAC_TOP (PP) */</div><div class='add'>+		{ 0x74030000, 0x010000, 0x0001000 }, /* PCIe MAC */</div><div class='add'>+		{ 0x820e0000, 0x020000, 0x0000400 }, /* WF_LMAC_TOP BN0 (WF_CFG) */</div><div class='add'>+		{ 0x820e1000, 0x020400, 0x0000200 }, /* WF_LMAC_TOP BN0 (WF_TRB) */</div><div class='add'>+		{ 0x820e2000, 0x020800, 0x0000400 }, /* WF_LMAC_TOP BN0 (WF_AGG) */</div><div class='add'>+		{ 0x820e3000, 0x020c00, 0x0000400 }, /* WF_LMAC_TOP BN0 (WF_ARB) */</div><div class='add'>+		{ 0x820e4000, 0x021000, 0x0000400 }, /* WF_LMAC_TOP BN0 (WF_TMAC) */</div><div class='add'>+		{ 0x820e5000, 0x021400, 0x0000800 }, /* WF_LMAC_TOP BN0 (WF_RMAC) */</div><div class='add'>+		{ 0x820ce000, 0x021c00, 0x0000200 }, /* WF_LMAC_TOP (WF_SEC) */</div><div class='add'>+		{ 0x820e7000, 0x021e00, 0x0000200 }, /* WF_LMAC_TOP BN0 (WF_DMA) */</div><div class='add'>+		{ 0x820cf000, 0x022000, 0x0001000 }, /* WF_LMAC_TOP (WF_PF) */</div><div class='add'>+		{ 0x820e9000, 0x023400, 0x0000200 }, /* WF_LMAC_TOP BN0 (WF_WTBLOFF) */</div><div class='add'>+		{ 0x820ea000, 0x024000, 0x0000200 }, /* WF_LMAC_TOP BN0 (WF_ETBF) */</div><div class='add'>+		{ 0x820eb000, 0x024200, 0x0000400 }, /* WF_LMAC_TOP BN0 (WF_LPON) */</div><div class='add'>+		{ 0x820ec000, 0x024600, 0x0000200 }, /* WF_LMAC_TOP BN0 (WF_INT) */</div><div class='add'>+		{ 0x820ed000, 0x024800, 0x0000800 }, /* WF_LMAC_TOP BN0 (WF_MIB) */</div><div class='add'>+		{ 0x820ca000, 0x026000, 0x0002000 }, /* WF_LMAC_TOP BN0 (WF_MUCOP) */</div><div class='add'>+		{ 0x820d0000, 0x030000, 0x0010000 }, /* WF_LMAC_TOP (WF_WTBLON) */</div><div class='add'>+		{ 0x40000000, 0x070000, 0x0010000 }, /* WF_UMAC_SYSRAM */</div><div class='add'>+		{ 0x00400000, 0x080000, 0x0010000 }, /* WF_MCU_SYSRAM */</div><div class='add'>+		{ 0x00410000, 0x090000, 0x0010000 }, /* WF_MCU_SYSRAM (configure register) */</div><div class='add'>+		{ 0x820f0000, 0x0a0000, 0x0000400 }, /* WF_LMAC_TOP BN1 (WF_CFG) */</div><div class='add'>+		{ 0x820f1000, 0x0a0600, 0x0000200 }, /* WF_LMAC_TOP BN1 (WF_TRB) */</div><div class='add'>+		{ 0x820f2000, 0x0a0800, 0x0000400 }, /* WF_LMAC_TOP BN1 (WF_AGG) */</div><div class='add'>+		{ 0x820f3000, 0x0a0c00, 0x0000400 }, /* WF_LMAC_TOP BN1 (WF_ARB) */</div><div class='add'>+		{ 0x820f4000, 0x0a1000, 0x0000400 }, /* WF_LMAC_TOP BN1 (WF_TMAC) */</div><div class='add'>+		{ 0x820f5000, 0x0a1400, 0x0000800 }, /* WF_LMAC_TOP BN1 (WF_RMAC) */</div><div class='add'>+		{ 0x820f7000, 0x0a1e00, 0x0000200 }, /* WF_LMAC_TOP BN1 (WF_DMA) */</div><div class='add'>+		{ 0x820f9000, 0x0a3400, 0x0000200 }, /* WF_LMAC_TOP BN1 (WF_WTBLOFF) */</div><div class='add'>+		{ 0x820fa000, 0x0a4000, 0x0000200 }, /* WF_LMAC_TOP BN1 (WF_ETBF) */</div><div class='add'>+		{ 0x820fb000, 0x0a4200, 0x0000400 }, /* WF_LMAC_TOP BN1 (WF_LPON) */</div><div class='add'>+		{ 0x820fc000, 0x0a4600, 0x0000200 }, /* WF_LMAC_TOP BN1 (WF_INT) */</div><div class='add'>+		{ 0x820fd000, 0x0a4800, 0x0000800 }, /* WF_LMAC_TOP BN1 (WF_MIB) */</div><div class='add'>+		{ 0x820c4000, 0x0a8000, 0x0004000 }, /* WF_LMAC_TOP BN1 (WF_MUCOP) */</div><div class='add'>+		{ 0x820b0000, 0x0ae000, 0x0001000 }, /* [APB2] WFSYS_ON */</div><div class='add'>+		{ 0x80020000, 0x0b0000, 0x0010000 }, /* WF_TOP_MISC_OFF */</div><div class='add'>+		{ 0x81020000, 0x0c0000, 0x0010000 }, /* WF_TOP_MISC_ON */</div><div class='add'>+		{ 0x7c020000, 0x0d0000, 0x0010000 }, /* CONN_INFRA, wfdma */</div><div class='add'>+		{ 0x7c060000, 0x0e0000, 0x0010000 }, /* CONN_INFRA, conn_host_csr_top */</div><div class='add'>+		{ 0x7c000000, 0x0f0000, 0x0010000 }, /* CONN_INFRA */</div><div class='add'>+		{ 0x70020000, 0x1f0000, 0x0010000 }, /* Reserved for CBTOP, can't switch */</div><div class='add'>+		{ 0x7c500000, 0x060000, 0x2000000 }, /* remap */</div><div class='add'>+		{ 0x0, 0x0, 0x0 } /* End */</div><div class='add'>+	};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (addr &lt; 0x200000)</div><div class='add'>+		return addr;</div><div class='add'>+</div><div class='add'>+	mt7925_reg_remap_restore(dev);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(fixed_map); i++) {</div><div class='add'>+		u32 ofs;</div><div class='add'>+</div><div class='add'>+		if (addr &lt; fixed_map[i].phys)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ofs = addr - fixed_map[i].phys;</div><div class='add'>+		if (ofs &gt; fixed_map[i].size)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		return fixed_map[i].maps + ofs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((addr &gt;= 0x18000000 &amp;&amp; addr &lt; 0x18c00000) ||</div><div class='add'>+	    (addr &gt;= 0x70000000 &amp;&amp; addr &lt; 0x78000000) ||</div><div class='add'>+	    (addr &gt;= 0x7c000000 &amp;&amp; addr &lt; 0x7c400000))</div><div class='add'>+		return mt7925_reg_map_l1(dev, addr);</div><div class='add'>+</div><div class='add'>+	return mt7925_reg_map_l2(dev, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 mt7925_rr(struct mt76_dev *mdev, u32 offset)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	u32 addr = __mt7925_reg_addr(dev, offset);</div><div class='add'>+</div><div class='add'>+	return dev-&gt;bus_ops-&gt;rr(mdev, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7925_wr(struct mt76_dev *mdev, u32 offset, u32 val)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	u32 addr = __mt7925_reg_addr(dev, offset);</div><div class='add'>+</div><div class='add'>+	dev-&gt;bus_ops-&gt;wr(mdev, addr, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 mt7925_rmw(struct mt76_dev *mdev, u32 offset, u32 mask, u32 val)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	u32 addr = __mt7925_reg_addr(dev, offset);</div><div class='add'>+</div><div class='add'>+	return dev-&gt;bus_ops-&gt;rmw(mdev, addr, mask, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925_dma_init(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mt76_dma_attach(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	ret = mt792x_dma_disable(dev, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* init tx queue */</div><div class='add'>+	ret = mt76_connac_init_tx_queues(dev-&gt;phy.mt76, MT7925_TXQ_BAND0,</div><div class='add'>+					 MT7925_TX_RING_SIZE,</div><div class='add'>+					 MT_TX_RING_BASE, NULL, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_WFDMA0_TX_RING0_EXT_CTRL, 0x4);</div><div class='add'>+</div><div class='add'>+	/* command to WM */</div><div class='add'>+	ret = mt76_init_mcu_queue(&amp;dev-&gt;mt76, MT_MCUQ_WM, MT7925_TXQ_MCU_WM,</div><div class='add'>+				  MT7925_TX_MCU_RING_SIZE, MT_TX_RING_BASE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* firmware download */</div><div class='add'>+	ret = mt76_init_mcu_queue(&amp;dev-&gt;mt76, MT_MCUQ_FWDL, MT7925_TXQ_FWDL,</div><div class='add'>+				  MT7925_TX_FWDL_RING_SIZE, MT_TX_RING_BASE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* rx event */</div><div class='add'>+	ret = mt76_queue_alloc(dev, &amp;dev-&gt;mt76.q_rx[MT_RXQ_MCU],</div><div class='add'>+			       MT7925_RXQ_MCU_WM, MT7925_RX_MCU_RING_SIZE,</div><div class='add'>+			       MT_RX_BUF_SIZE, MT_RX_EVENT_RING_BASE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* rx data */</div><div class='add'>+	ret = mt76_queue_alloc(dev, &amp;dev-&gt;mt76.q_rx[MT_RXQ_MAIN],</div><div class='add'>+			       MT7925_RXQ_BAND0, MT7925_RX_RING_SIZE,</div><div class='add'>+			       MT_RX_BUF_SIZE, MT_RX_DATA_RING_BASE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt76_init_queues(dev, mt792x_poll_rx);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	netif_napi_add_tx(dev-&gt;mt76.tx_napi_dev, &amp;dev-&gt;mt76.tx_napi,</div><div class='add'>+			  mt792x_poll_tx);</div><div class='add'>+	napi_enable(&amp;dev-&gt;mt76.tx_napi);</div><div class='add'>+</div><div class='add'>+	return mt792x_dma_enable(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925_pci_probe(struct pci_dev *pdev,</div><div class='add'>+			    const struct pci_device_id *id)</div><div class='add'>+{</div><div class='add'>+	static const struct mt76_driver_ops drv_ops = {</div><div class='add'>+		/* txwi_size = txd size + txp size */</div><div class='add'>+		.txwi_size = MT_TXD_SIZE + sizeof(struct mt76_connac_hw_txp),</div><div class='add'>+		.drv_flags = MT_DRV_TXWI_NO_FREE | MT_DRV_HW_MGMT_TXQ |</div><div class='add'>+			     MT_DRV_AMSDU_OFFLOAD,</div><div class='add'>+		.survey_flags = SURVEY_INFO_TIME_TX |</div><div class='add'>+				SURVEY_INFO_TIME_RX |</div><div class='add'>+				SURVEY_INFO_TIME_BSS_RX,</div><div class='add'>+		.token_size = MT7925_TOKEN_SIZE,</div><div class='add'>+		.tx_prepare_skb = mt7925e_tx_prepare_skb,</div><div class='add'>+		.tx_complete_skb = mt76_connac_tx_complete_skb,</div><div class='add'>+		.rx_check = mt7925_rx_check,</div><div class='add'>+		.rx_skb = mt7925_queue_rx_skb,</div><div class='add'>+		.rx_poll_complete = mt792x_rx_poll_complete,</div><div class='add'>+		.sta_add = mt7925_mac_sta_add,</div><div class='add'>+		.sta_event = mt7925_mac_sta_event,</div><div class='add'>+		.sta_remove = mt7925_mac_sta_remove,</div><div class='add'>+		.update_survey = mt792x_update_channel,</div><div class='add'>+	};</div><div class='add'>+	static const struct mt792x_hif_ops mt7925_pcie_ops = {</div><div class='add'>+		.init_reset = mt7925e_init_reset,</div><div class='add'>+		.reset = mt7925e_mac_reset,</div><div class='add'>+		.mcu_init = mt7925e_mcu_init,</div><div class='add'>+		.drv_own = mt792xe_mcu_drv_pmctrl,</div><div class='add'>+		.fw_own = mt792xe_mcu_fw_pmctrl,</div><div class='add'>+	};</div><div class='add'>+	static const struct mt792x_irq_map irq_map = {</div><div class='add'>+		.host_irq_enable = MT_WFDMA0_HOST_INT_ENA,</div><div class='add'>+		.tx = {</div><div class='add'>+			.all_complete_mask = MT_INT_TX_DONE_ALL,</div><div class='add'>+			.mcu_complete_mask = MT_INT_TX_DONE_MCU,</div><div class='add'>+		},</div><div class='add'>+		.rx = {</div><div class='add'>+			.data_complete_mask = HOST_RX_DONE_INT_ENA2,</div><div class='add'>+			.wm_complete_mask = HOST_RX_DONE_INT_ENA0,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	struct ieee80211_ops *ops;</div><div class='add'>+	struct mt76_bus_ops *bus_ops;</div><div class='add'>+	struct mt792x_dev *dev;</div><div class='add'>+	struct mt76_dev *mdev;</div><div class='add'>+	u8 features;</div><div class='add'>+	int ret;</div><div class='add'>+	u16 cmd;</div><div class='add'>+</div><div class='add'>+	ret = pcim_enable_device(pdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = pcim_iomap_regions(pdev, BIT(0), pci_name(pdev));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	pci_read_config_word(pdev, PCI_COMMAND, &amp;cmd);</div><div class='add'>+	if (!(cmd &amp; PCI_COMMAND_MEMORY)) {</div><div class='add'>+		cmd |= PCI_COMMAND_MEMORY;</div><div class='add'>+		pci_write_config_word(pdev, PCI_COMMAND, cmd);</div><div class='add'>+	}</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free_pci_vec;</div><div class='add'>+</div><div class='add'>+	if (mt7925_disable_aspm)</div><div class='add'>+		mt76_pci_disable_aspm(pdev);</div><div class='add'>+</div><div class='add'>+	ops = mt792x_get_mac80211_ops(&amp;pdev-&gt;dev, &amp;mt7925_ops,</div><div class='add'>+				      (void *)id-&gt;driver_data, &amp;features);</div><div class='add'>+	if (!ops) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_free_pci_vec;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mdev = mt76_alloc_device(&amp;pdev-&gt;dev, sizeof(*dev), ops, &amp;drv_ops);</div><div class='add'>+	if (!mdev) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_free_pci_vec;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pdev, mdev);</div><div class='add'>+</div><div class='add'>+	dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	dev-&gt;fw_features = features;</div><div class='add'>+	dev-&gt;hif_ops = &amp;mt7925_pcie_ops;</div><div class='add'>+	dev-&gt;irq_map = &amp;irq_map;</div><div class='add'>+	mt76_mmio_init(&amp;dev-&gt;mt76, pcim_iomap_table(pdev)[0]);</div><div class='add'>+	tasklet_init(&amp;mdev-&gt;irq_tasklet, mt792x_irq_tasklet, (unsigned long)dev);</div><div class='add'>+</div><div class='add'>+	dev-&gt;phy.dev = dev;</div><div class='add'>+	dev-&gt;phy.mt76 = &amp;dev-&gt;mt76.phy;</div><div class='add'>+	dev-&gt;mt76.phy.priv = &amp;dev-&gt;phy;</div><div class='add'>+	dev-&gt;bus_ops = dev-&gt;mt76.bus;</div><div class='add'>+	bus_ops = devm_kmemdup(dev-&gt;mt76.dev, dev-&gt;bus_ops, sizeof(*bus_ops),</div><div class='add'>+			       GFP_KERNEL);</div><div class='add'>+	if (!bus_ops) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_free_dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bus_ops-&gt;rr = mt7925_rr;</div><div class='add'>+	bus_ops-&gt;wr = mt7925_wr;</div><div class='add'>+	bus_ops-&gt;rmw = mt7925_rmw;</div><div class='add'>+	dev-&gt;mt76.bus = bus_ops;</div><div class='add'>+</div><div class='add'>+	if (!mt7925_disable_aspm &amp;&amp; mt76_pci_aspm_supported(pdev))</div><div class='add'>+		dev-&gt;aspm_supported = true;</div><div class='add'>+</div><div class='add'>+	ret = __mt792x_mcu_fw_pmctrl(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free_dev;</div><div class='add'>+</div><div class='add'>+	ret = __mt792xe_mcu_drv_pmctrl(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free_dev;</div><div class='add'>+</div><div class='add'>+	mdev-&gt;rev = (mt76_rr(dev, MT_HW_CHIPID) &lt;&lt; 16) |</div><div class='add'>+		    (mt76_rr(dev, MT_HW_REV) &amp; 0xff);</div><div class='add'>+</div><div class='add'>+	dev_info(mdev-&gt;dev, "ASIC revision: %04x\n", mdev-&gt;rev);</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_HW_EMI_CTL, MT_HW_EMI_CTL_SLPPROT_EN, 1);</div><div class='add'>+</div><div class='add'>+	ret = mt792x_wfsys_reset(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free_dev;</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, irq_map.host_irq_enable, 0);</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff);</div><div class='add'>+</div><div class='add'>+	ret = devm_request_irq(mdev-&gt;dev, pdev-&gt;irq, mt792x_irq_handler,</div><div class='add'>+			       IRQF_SHARED, KBUILD_MODNAME, dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free_dev;</div><div class='add'>+</div><div class='add'>+	ret = mt7925_dma_init(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free_irq;</div><div class='add'>+</div><div class='add'>+	ret = mt7925_register_device(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free_irq;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_irq:</div><div class='add'>+	devm_free_irq(&amp;pdev-&gt;dev, pdev-&gt;irq, dev);</div><div class='add'>+err_free_dev:</div><div class='add'>+	mt76_free_device(&amp;dev-&gt;mt76);</div><div class='add'>+err_free_pci_vec:</div><div class='add'>+	pci_free_irq_vectors(pdev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7925_pci_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_dev *mdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+</div><div class='add'>+	mt7925e_unregister_device(dev);</div><div class='add'>+	set_bit(MT76_REMOVED, &amp;mdev-&gt;phy.state);</div><div class='add'>+	devm_free_irq(&amp;pdev-&gt;dev, pdev-&gt;irq, dev);</div><div class='add'>+	mt76_free_device(&amp;dev-&gt;mt76);</div><div class='add'>+	pci_free_irq_vectors(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925_pci_suspend(struct device *device)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(device);</div><div class='add'>+	struct mt76_dev *mdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+	int i, err, ret;</div><div class='add'>+</div><div class='add'>+	pm-&gt;suspended = true;</div><div class='add'>+	dev-&gt;hif_resumed = false;</div><div class='add'>+	flush_work(&amp;dev-&gt;reset_work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;pm-&gt;ps_work);</div><div class='add'>+	cancel_work_sync(&amp;pm-&gt;wake_work);</div><div class='add'>+</div><div class='add'>+	mt7925_roc_abort_sync(dev);</div><div class='add'>+</div><div class='add'>+	err = mt792x_mcu_drv_pmctrl(dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto restore_suspend;</div><div class='add'>+</div><div class='add'>+	wait_event_timeout(dev-&gt;wait,</div><div class='add'>+			   !dev-&gt;regd_in_progress, 5 * HZ);</div><div class='add'>+</div><div class='add'>+	/* always enable deep sleep during suspend to reduce</div><div class='add'>+	 * power consumption</div><div class='add'>+	 */</div><div class='add'>+	mt7925_mcu_set_deep_sleep(dev, true);</div><div class='add'>+</div><div class='add'>+	mt76_connac_mcu_set_hif_suspend(mdev, true, false);</div><div class='add'>+	ret = wait_event_timeout(dev-&gt;wait,</div><div class='add'>+				 dev-&gt;hif_idle, 3 * HZ);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		err = -ETIMEDOUT;</div><div class='add'>+		goto restore_suspend;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	napi_disable(&amp;mdev-&gt;tx_napi);</div><div class='add'>+	mt76_worker_disable(&amp;mdev-&gt;tx_worker);</div><div class='add'>+</div><div class='add'>+	mt76_for_each_q_rx(mdev, i) {</div><div class='add'>+		napi_disable(&amp;mdev-&gt;napi[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* wait until dma is idle  */</div><div class='add'>+	mt76_poll(dev, MT_WFDMA0_GLO_CFG,</div><div class='add'>+		  MT_WFDMA0_GLO_CFG_TX_DMA_BUSY |</div><div class='add'>+		  MT_WFDMA0_GLO_CFG_RX_DMA_BUSY, 0, 1000);</div><div class='add'>+</div><div class='add'>+	/* put dma disabled */</div><div class='add'>+	mt76_clear(dev, MT_WFDMA0_GLO_CFG,</div><div class='add'>+		   MT_WFDMA0_GLO_CFG_TX_DMA_EN | MT_WFDMA0_GLO_CFG_RX_DMA_EN);</div><div class='add'>+</div><div class='add'>+	/* disable interrupt */</div><div class='add'>+	mt76_wr(dev, dev-&gt;irq_map-&gt;host_irq_enable, 0);</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0x0);</div><div class='add'>+</div><div class='add'>+	synchronize_irq(pdev-&gt;irq);</div><div class='add'>+	tasklet_kill(&amp;mdev-&gt;irq_tasklet);</div><div class='add'>+</div><div class='add'>+	err = mt792x_mcu_fw_pmctrl(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto restore_napi;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+restore_napi:</div><div class='add'>+	mt76_for_each_q_rx(mdev, i) {</div><div class='add'>+		napi_enable(&amp;mdev-&gt;napi[i]);</div><div class='add'>+	}</div><div class='add'>+	napi_enable(&amp;mdev-&gt;tx_napi);</div><div class='add'>+</div><div class='add'>+	if (!pm-&gt;ds_enable)</div><div class='add'>+		mt7925_mcu_set_deep_sleep(dev, false);</div><div class='add'>+</div><div class='add'>+	mt76_connac_mcu_set_hif_suspend(mdev, false, false);</div><div class='add'>+	ret = wait_event_timeout(dev-&gt;wait,</div><div class='add'>+				 dev-&gt;hif_resumed, 3 * HZ);</div><div class='add'>+	if (!ret)</div><div class='add'>+		err = -ETIMEDOUT;</div><div class='add'>+restore_suspend:</div><div class='add'>+	pm-&gt;suspended = false;</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		mt792x_reset(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int _mt7925_pci_resume(struct device *device, bool restore)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(device);</div><div class='add'>+	struct mt76_dev *mdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+	int i, err, ret;</div><div class='add'>+</div><div class='add'>+	dev-&gt;hif_idle = false;</div><div class='add'>+	err = mt792x_mcu_drv_pmctrl(dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	mt792x_wpdma_reinit_cond(dev);</div><div class='add'>+</div><div class='add'>+	/* enable interrupt */</div><div class='add'>+	mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff);</div><div class='add'>+	mt76_connac_irq_enable(&amp;dev-&gt;mt76,</div><div class='add'>+			       dev-&gt;irq_map-&gt;tx.all_complete_mask |</div><div class='add'>+			       MT_INT_RX_DONE_ALL | MT_INT_MCU_CMD);</div><div class='add'>+	mt76_set(dev, MT_MCU2HOST_SW_INT_ENA, MT_MCU_CMD_WAKE_RX_PCIE);</div><div class='add'>+</div><div class='add'>+	/* put dma enabled */</div><div class='add'>+	mt76_set(dev, MT_WFDMA0_GLO_CFG,</div><div class='add'>+		 MT_WFDMA0_GLO_CFG_TX_DMA_EN | MT_WFDMA0_GLO_CFG_RX_DMA_EN);</div><div class='add'>+</div><div class='add'>+	mt76_worker_enable(&amp;mdev-&gt;tx_worker);</div><div class='add'>+</div><div class='add'>+	mt76_for_each_q_rx(mdev, i) {</div><div class='add'>+		napi_enable(&amp;mdev-&gt;napi[i]);</div><div class='add'>+	}</div><div class='add'>+	napi_enable(&amp;mdev-&gt;tx_napi);</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	mt76_for_each_q_rx(mdev, i) {</div><div class='add'>+		napi_schedule(&amp;mdev-&gt;napi[i]);</div><div class='add'>+	}</div><div class='add'>+	napi_schedule(&amp;mdev-&gt;tx_napi);</div><div class='add'>+	local_bh_enable();</div><div class='add'>+</div><div class='add'>+	if (restore)</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	mt76_connac_mcu_set_hif_suspend(mdev, false, false);</div><div class='add'>+	ret = wait_event_timeout(dev-&gt;wait,</div><div class='add'>+				 dev-&gt;hif_resumed, 3 * HZ);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		err = -ETIMEDOUT;</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* restore previous ds setting */</div><div class='add'>+	if (!pm-&gt;ds_enable)</div><div class='add'>+		mt7925_mcu_set_deep_sleep(dev, false);</div><div class='add'>+</div><div class='add'>+	mt7925_mcu_regd_update(dev, mdev-&gt;alpha2, dev-&gt;country_ie_env);</div><div class='add'>+failed:</div><div class='add'>+	pm-&gt;suspended = false;</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0 || restore)</div><div class='add'>+		mt792x_reset(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7925_pci_shutdown(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	mt7925_pci_remove(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925_pci_resume(struct device *device)</div><div class='add'>+{</div><div class='add'>+	return _mt7925_pci_resume(device, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925_pci_restore(struct device *device)</div><div class='add'>+{</div><div class='add'>+	return _mt7925_pci_resume(device, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops mt7925_pm_ops = {</div><div class='add'>+	.suspend = pm_sleep_ptr(mt7925_pci_suspend),</div><div class='add'>+	.resume  = pm_sleep_ptr(mt7925_pci_resume),</div><div class='add'>+	.freeze = pm_sleep_ptr(mt7925_pci_suspend),</div><div class='add'>+	.thaw = pm_sleep_ptr(mt7925_pci_resume),</div><div class='add'>+	.poweroff = pm_sleep_ptr(mt7925_pci_suspend),</div><div class='add'>+	.restore = pm_sleep_ptr(mt7925_pci_restore),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pci_driver mt7925_pci_driver = {</div><div class='add'>+	.name		= KBUILD_MODNAME,</div><div class='add'>+	.id_table	= mt7925_pci_device_table,</div><div class='add'>+	.probe		= mt7925_pci_probe,</div><div class='add'>+	.remove		= mt7925_pci_remove,</div><div class='add'>+	.shutdown       = mt7925_pci_shutdown,</div><div class='add'>+	.driver.pm	= pm_sleep_ptr(&amp;mt7925_pm_ops),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_pci_driver(mt7925_pci_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(pci, mt7925_pci_device_table);</div><div class='add'>+MODULE_FIRMWARE(MT7925_FIRMWARE_WM);</div><div class='add'>+MODULE_FIRMWARE(MT7925_ROM_PATCH);</div><div class='add'>+MODULE_AUTHOR("Deren Wu &lt;deren.wu@mediatek.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("MediaTek MT7925E (PCIe) wireless driver");</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c b/drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c<br/>new file mode 100644<br/>index 000000000000..3072850c2752<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c</a></div><div class='hunk'>@@ -0,0 +1,151 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/* Copyright (C) 2023 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#include "mt7925.h"</div><div class='add'>+#include "../dma.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+</div><div class='add'>+int mt7925e_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,</div><div class='add'>+			   enum mt76_txq_id qid, struct mt76_wcid *wcid,</div><div class='add'>+			   struct ieee80211_sta *sta,</div><div class='add'>+			   struct mt76_tx_info *tx_info)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx_info-&gt;skb);</div><div class='add'>+	struct ieee80211_key_conf *key = info-&gt;control.hw_key;</div><div class='add'>+	struct mt76_connac_hw_txp *txp;</div><div class='add'>+	struct mt76_txwi_cache *t;</div><div class='add'>+	int id, pid;</div><div class='add'>+	u8 *txwi = (u8 *)txwi_ptr;</div><div class='add'>+</div><div class='add'>+	if (unlikely(tx_info-&gt;skb-&gt;len &lt;= ETH_HLEN))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!wcid)</div><div class='add'>+		wcid = &amp;dev-&gt;mt76.global_wcid;</div><div class='add'>+</div><div class='add'>+	t = (struct mt76_txwi_cache *)(txwi + mdev-&gt;drv-&gt;txwi_size);</div><div class='add'>+	t-&gt;skb = tx_info-&gt;skb;</div><div class='add'>+</div><div class='add'>+	id = mt76_token_consume(mdev, &amp;t);</div><div class='add'>+	if (id &lt; 0)</div><div class='add'>+		return id;</div><div class='add'>+</div><div class='add'>+	if (sta) {</div><div class='add'>+		struct mt792x_sta *msta = (struct mt792x_sta *)sta-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+		if (time_after(jiffies, msta-&gt;deflink.last_txs + HZ / 4)) {</div><div class='add'>+			info-&gt;flags |= IEEE80211_TX_CTL_REQ_TX_STATUS;</div><div class='add'>+			msta-&gt;deflink.last_txs = jiffies;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pid = mt76_tx_status_skb_add(mdev, wcid, tx_info-&gt;skb);</div><div class='add'>+	mt7925_mac_write_txwi(mdev, txwi_ptr, tx_info-&gt;skb, wcid, key,</div><div class='add'>+			      pid, qid, 0);</div><div class='add'>+</div><div class='add'>+	txp = (struct mt76_connac_hw_txp *)(txwi + MT_TXD_SIZE);</div><div class='add'>+	memset(txp, 0, sizeof(struct mt76_connac_hw_txp));</div><div class='add'>+	mt76_connac_write_hw_txp(mdev, tx_info, txp, id);</div><div class='add'>+</div><div class='add'>+	tx_info-&gt;skb = NULL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7925_tx_token_put(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mt76_txwi_cache *txwi;</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;dev-&gt;mt76.token_lock);</div><div class='add'>+	idr_for_each_entry(&amp;dev-&gt;mt76.token, txwi, id) {</div><div class='add'>+		mt7925_txwi_free(dev, txwi, NULL, NULL, NULL);</div><div class='add'>+		dev-&gt;mt76.token_count--;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;dev-&gt;mt76.token_lock);</div><div class='add'>+	idr_destroy(&amp;dev-&gt;mt76.token);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925e_mac_reset(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	const struct mt792x_irq_map *irq_map = dev-&gt;irq_map;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	mt792xe_mcu_drv_pmctrl(dev);</div><div class='add'>+</div><div class='add'>+	mt76_connac_free_pending_tx_skbs(&amp;dev-&gt;pm, NULL);</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, dev-&gt;irq_map-&gt;host_irq_enable, 0);</div><div class='add'>+	mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0x0);</div><div class='add'>+</div><div class='add'>+	set_bit(MT76_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+	set_bit(MT76_MCU_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+	wake_up(&amp;dev-&gt;mt76.mcu.wait);</div><div class='add'>+	skb_queue_purge(&amp;dev-&gt;mt76.mcu.res_q);</div><div class='add'>+</div><div class='add'>+	mt76_txq_schedule_all(&amp;dev-&gt;mphy);</div><div class='add'>+</div><div class='add'>+	mt76_worker_disable(&amp;dev-&gt;mt76.tx_worker);</div><div class='add'>+	if (irq_map-&gt;rx.data_complete_mask)</div><div class='add'>+		napi_disable(&amp;dev-&gt;mt76.napi[MT_RXQ_MAIN]);</div><div class='add'>+	if (irq_map-&gt;rx.wm_complete_mask)</div><div class='add'>+		napi_disable(&amp;dev-&gt;mt76.napi[MT_RXQ_MCU]);</div><div class='add'>+	if (irq_map-&gt;rx.wm2_complete_mask)</div><div class='add'>+		napi_disable(&amp;dev-&gt;mt76.napi[MT_RXQ_MCU_WA]);</div><div class='add'>+	if (irq_map-&gt;tx.all_complete_mask)</div><div class='add'>+		napi_disable(&amp;dev-&gt;mt76.tx_napi);</div><div class='add'>+</div><div class='add'>+	mt7925_tx_token_put(dev);</div><div class='add'>+	idr_init(&amp;dev-&gt;mt76.token);</div><div class='add'>+</div><div class='add'>+	mt792x_wpdma_reset(dev, true);</div><div class='add'>+</div><div class='add'>+	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i) {</div><div class='add'>+		napi_enable(&amp;dev-&gt;mt76.napi[i]);</div><div class='add'>+	}</div><div class='add'>+	napi_enable(&amp;dev-&gt;mt76.tx_napi);</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	mt76_for_each_q_rx(&amp;dev-&gt;mt76, i) {</div><div class='add'>+		napi_schedule(&amp;dev-&gt;mt76.napi[i]);</div><div class='add'>+	}</div><div class='add'>+	napi_schedule(&amp;dev-&gt;mt76.tx_napi);</div><div class='add'>+	local_bh_enable();</div><div class='add'>+</div><div class='add'>+	dev-&gt;fw_assert = false;</div><div class='add'>+	clear_bit(MT76_MCU_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, dev-&gt;irq_map-&gt;host_irq_enable,</div><div class='add'>+		dev-&gt;irq_map-&gt;tx.all_complete_mask |</div><div class='add'>+		MT_INT_RX_DONE_ALL | MT_INT_MCU_CMD);</div><div class='add'>+	mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff);</div><div class='add'>+</div><div class='add'>+	err = mt792xe_mcu_fw_pmctrl(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = __mt792xe_mcu_drv_pmctrl(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt7925_run_firmware(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt7925_mcu_set_eeprom(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt7925_mac_init(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = __mt7925_start(&amp;dev-&gt;phy);</div><div class='add'>+out:</div><div class='add'>+	clear_bit(MT76_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+</div><div class='add'>+	mt76_worker_enable(&amp;dev-&gt;mt76.tx_worker);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/pci_mcu.c b/drivers/net/wireless/mediatek/mt76/mt7925/pci_mcu.c<br/>new file mode 100644<br/>index 000000000000..6cceff88c656<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7925/pci_mcu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7925/pci_mcu.c</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/* Copyright (C) 2023 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#include "mt7925.h"</div><div class='add'>+#include "mcu.h"</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,</div><div class='add'>+			int cmd, int *seq)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	enum mt76_mcuq_id txq = MT_MCUQ_WM;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7925_mcu_fill_message(mdev, skb, cmd, seq);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mdev-&gt;mcu.timeout = 3 * HZ;</div><div class='add'>+</div><div class='add'>+	if (cmd == MCU_CMD(FW_SCATTER))</div><div class='add'>+		txq = MT_MCUQ_FWDL;</div><div class='add'>+</div><div class='add'>+	return mt76_tx_queue_skb_raw(dev, mdev-&gt;q_mcu[txq], skb, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925e_mcu_init(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	static const struct mt76_mcu_ops mt7925_mcu_ops = {</div><div class='add'>+		.headroom = sizeof(struct mt76_connac2_mcu_txd),</div><div class='add'>+		.mcu_skb_send_msg = mt7925_mcu_send_message,</div><div class='add'>+		.mcu_parse_response = mt7925_mcu_parse_response,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dev-&gt;mt76.mcu_ops = &amp;mt7925_mcu_ops;</div><div class='add'>+</div><div class='add'>+	err = mt792xe_mcu_fw_pmctrl(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = __mt792xe_mcu_drv_pmctrl(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	mt76_rmw_field(dev, MT_PCIE_MAC_PM, MT_PCIE_MAC_PM_L0S_DIS, 1);</div><div class='add'>+</div><div class='add'>+	err = mt7925_run_firmware(dev);</div><div class='add'>+</div><div class='add'>+	mt76_queue_tx_cleanup(dev, dev-&gt;mt76.q_mcu[MT_MCUQ_FWDL], false);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/regd.c b/drivers/net/wireless/mediatek/mt76/mt7925/regd.c<br/>new file mode 100644<br/>index 000000000000..292087e882d1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7925/regd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7925/regd.c</a></div><div class='hunk'>@@ -0,0 +1,265 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/* Copyright (C) 2025 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#include "mt7925.h"</div><div class='add'>+#include "regd.h"</div><div class='add'>+#include "mcu.h"</div><div class='add'>+</div><div class='add'>+static bool mt7925_disable_clc;</div><div class='add'>+module_param_named(disable_clc, mt7925_disable_clc, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(disable_clc, "disable CLC support");</div><div class='add'>+</div><div class='add'>+bool mt7925_regd_clc_supported(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	if (mt7925_disable_clc ||</div><div class='add'>+	    mt76_is_usb(&amp;dev-&gt;mt76))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mt7925_regd_be_ctrl(struct mt792x_dev *dev, u8 *alpha2)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct mt7925_clc_rule_v2 *rule;</div><div class='add'>+	struct mt7925_clc *clc;</div><div class='add'>+	bool old = dev-&gt;has_eht, new = true;</div><div class='add'>+	u32 mtcl_conf = mt792x_acpi_get_mtcl_conf(&amp;dev-&gt;phy, alpha2);</div><div class='add'>+	u8 *pos;</div><div class='add'>+</div><div class='add'>+	if (mtcl_conf != MT792X_ACPI_MTCL_INVALID &amp;&amp;</div><div class='add'>+	    (((mtcl_conf &gt;&gt; 4) &amp; 0x3) == 0)) {</div><div class='add'>+		new = false;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!phy-&gt;clc[MT792x_CLC_BE_CTRL])</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	clc = (struct mt7925_clc *)phy-&gt;clc[MT792x_CLC_BE_CTRL];</div><div class='add'>+	pos = clc-&gt;data;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		rule = (struct mt7925_clc_rule_v2 *)pos;</div><div class='add'>+</div><div class='add'>+		if (rule-&gt;alpha2[0] == alpha2[0] &amp;&amp;</div><div class='add'>+		    rule-&gt;alpha2[1] == alpha2[1]) {</div><div class='add'>+			new = false;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Check the last one */</div><div class='add'>+		if (rule-&gt;flag &amp; BIT(0))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		pos += sizeof(*rule);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (old == new)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dev-&gt;has_eht = new;</div><div class='add'>+	mt7925_set_stream_he_eht_caps(phy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7925_regd_channel_update(struct wiphy *wiphy, struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+#define IS_UNII_INVALID(idx, sfreq, efreq, cfreq) \</div><div class='add'>+	(!(dev-&gt;phy.clc_chan_conf &amp; BIT(idx)) &amp;&amp; (cfreq) &gt;= (sfreq) &amp;&amp; (cfreq) &lt;= (efreq))</div><div class='add'>+#define MT7925_UNII_59G_IS_VALID	0x1</div><div class='add'>+#define MT7925_UNII_6G_IS_VALID	0x1e</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+	struct ieee80211_channel *ch;</div><div class='add'>+	u32 mtcl_conf = mt792x_acpi_get_mtcl_conf(&amp;dev-&gt;phy, mdev-&gt;alpha2);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (mtcl_conf != MT792X_ACPI_MTCL_INVALID) {</div><div class='add'>+		if ((mtcl_conf &amp; 0x3) == 0)</div><div class='add'>+			dev-&gt;phy.clc_chan_conf &amp;= ~MT7925_UNII_59G_IS_VALID;</div><div class='add'>+		if (((mtcl_conf &gt;&gt; 2) &amp; 0x3) == 0)</div><div class='add'>+			dev-&gt;phy.clc_chan_conf &amp;= ~MT7925_UNII_6G_IS_VALID;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sband = wiphy-&gt;bands[NL80211_BAND_2GHZ];</div><div class='add'>+	if (!sband)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sband-&gt;n_channels; i++) {</div><div class='add'>+		ch = &amp;sband-&gt;channels[i];</div><div class='add'>+</div><div class='add'>+		if (!dev-&gt;has_eht)</div><div class='add'>+			ch-&gt;flags |= IEEE80211_CHAN_NO_EHT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sband = wiphy-&gt;bands[NL80211_BAND_5GHZ];</div><div class='add'>+	if (!sband)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sband-&gt;n_channels; i++) {</div><div class='add'>+		ch = &amp;sband-&gt;channels[i];</div><div class='add'>+</div><div class='add'>+		/* UNII-4 */</div><div class='add'>+		if (IS_UNII_INVALID(0, 5845, 5925, ch-&gt;center_freq))</div><div class='add'>+			ch-&gt;flags |= IEEE80211_CHAN_DISABLED;</div><div class='add'>+</div><div class='add'>+		if (!dev-&gt;has_eht)</div><div class='add'>+			ch-&gt;flags |= IEEE80211_CHAN_NO_EHT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sband = wiphy-&gt;bands[NL80211_BAND_6GHZ];</div><div class='add'>+	if (!sband)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sband-&gt;n_channels; i++) {</div><div class='add'>+		ch = &amp;sband-&gt;channels[i];</div><div class='add'>+</div><div class='add'>+		/* UNII-5/6/7/8 */</div><div class='add'>+		if (IS_UNII_INVALID(1, 5925, 6425, ch-&gt;center_freq) ||</div><div class='add'>+		    IS_UNII_INVALID(2, 6425, 6525, ch-&gt;center_freq) ||</div><div class='add'>+		    IS_UNII_INVALID(3, 6525, 6875, ch-&gt;center_freq) ||</div><div class='add'>+		    IS_UNII_INVALID(4, 6875, 7125, ch-&gt;center_freq))</div><div class='add'>+			ch-&gt;flags |= IEEE80211_CHAN_DISABLED;</div><div class='add'>+</div><div class='add'>+		if (!dev-&gt;has_eht)</div><div class='add'>+			ch-&gt;flags |= IEEE80211_CHAN_NO_EHT;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_regd_update(struct mt792x_dev *dev, u8 *alpha2,</div><div class='add'>+			   enum environment_cap country_ie_env)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = mt76_hw(dev);</div><div class='add'>+	struct wiphy *wiphy = hw-&gt;wiphy;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	dev-&gt;regd_in_progress = true;</div><div class='add'>+</div><div class='add'>+	mt792x_mutex_acquire(dev);</div><div class='add'>+	if (!dev-&gt;regd_change)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = mt7925_mcu_set_clc(dev, alpha2, country_ie_env);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	mt7925_regd_be_ctrl(dev, alpha2);</div><div class='add'>+	mt7925_regd_channel_update(wiphy, dev);</div><div class='add'>+</div><div class='add'>+	ret = mt7925_mcu_set_channel_domain(hw-&gt;priv);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = mt7925_set_tx_sar_pwr(hw, NULL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	mt792x_mutex_release(dev);</div><div class='add'>+	dev-&gt;regd_change = false;</div><div class='add'>+	dev-&gt;regd_in_progress = false;</div><div class='add'>+	wake_up(&amp;dev-&gt;wait);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_mcu_regd_update);</div><div class='add'>+</div><div class='add'>+void mt7925_regd_notifier(struct wiphy *wiphy, struct regulatory_request *req)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;initiator == NL80211_REGDOM_SET_BY_USER &amp;&amp;</div><div class='add'>+	    !dev-&gt;regd_user)</div><div class='add'>+		dev-&gt;regd_user = true;</div><div class='add'>+</div><div class='add'>+	/* allow world regdom at the first boot only */</div><div class='add'>+	if (!memcmp(req-&gt;alpha2, "00", 2) &amp;&amp;</div><div class='add'>+	    mdev-&gt;alpha2[0] &amp;&amp; mdev-&gt;alpha2[1])</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* do not need to update the same country twice */</div><div class='add'>+	if (!memcmp(req-&gt;alpha2, mdev-&gt;alpha2, 2) &amp;&amp;</div><div class='add'>+	    dev-&gt;country_ie_env == req-&gt;country_ie_env)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memcpy(mdev-&gt;alpha2, req-&gt;alpha2, 2);</div><div class='add'>+	mdev-&gt;region = req-&gt;dfs_region;</div><div class='add'>+	dev-&gt;country_ie_env = req-&gt;country_ie_env;</div><div class='add'>+</div><div class='add'>+	dev-&gt;regd_change = true;</div><div class='add'>+</div><div class='add'>+	if (pm-&gt;suspended)</div><div class='add'>+		/* postpone the mcu update to resume */</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mt7925_mcu_regd_update(dev, req-&gt;alpha2,</div><div class='add'>+			       req-&gt;country_ie_env);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+mt7925_regd_is_valid_alpha2(const char *alpha2)</div><div class='add'>+{</div><div class='add'>+	if (!alpha2)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (alpha2[0] == '0' &amp;&amp; alpha2[1] == '0')</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (isalpha(alpha2[0]) &amp;&amp; isalpha(alpha2[1]))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_regd_change(struct mt792x_phy *phy, char *alpha2)</div><div class='add'>+{</div><div class='add'>+	struct wiphy *wiphy = phy-&gt;mt76-&gt;hw-&gt;wiphy;</div><div class='add'>+	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;hw_full_reset)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!mt7925_regd_is_valid_alpha2(alpha2) ||</div><div class='add'>+	    !mt7925_regd_clc_supported(dev) ||</div><div class='add'>+	    dev-&gt;regd_user)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (mdev-&gt;alpha2[0] != '0' &amp;&amp; mdev-&gt;alpha2[1] != '0')</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* do not need to update the same country twice */</div><div class='add'>+	if (!memcmp(alpha2, mdev-&gt;alpha2, 2))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;chip_cap &amp; MT792x_CHIP_CAP_11D_EN) {</div><div class='add'>+		return regulatory_hint(wiphy, alpha2);</div><div class='add'>+	} else {</div><div class='add'>+		return mt7925_mcu_set_clc(dev, alpha2, ENVIRON_INDOOR);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7925_regd_change);</div><div class='add'>+</div><div class='add'>+int mt7925_regd_init(struct mt792x_phy *phy)</div><div class='add'>+{</div><div class='add'>+	struct wiphy *wiphy = phy-&gt;mt76-&gt;hw-&gt;wiphy;</div><div class='add'>+	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);</div><div class='add'>+	struct mt792x_dev *dev = mt792x_hw_dev(hw);</div><div class='add'>+	struct mt76_dev *mdev = &amp;dev-&gt;mt76;</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;chip_cap &amp; MT792x_CHIP_CAP_11D_EN) {</div><div class='add'>+		wiphy-&gt;regulatory_flags |= REGULATORY_COUNTRY_IE_IGNORE |</div><div class='add'>+					   REGULATORY_DISABLE_BEACON_HINTS;</div><div class='add'>+	} else {</div><div class='add'>+		memzero_explicit(&amp;mdev-&gt;alpha2, sizeof(mdev-&gt;alpha2));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/regd.h b/drivers/net/wireless/mediatek/mt76/mt7925/regd.h<br/>new file mode 100644<br/>index 000000000000..0767f078862e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7925/regd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7925/regd.h</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/* Copyright (C) 2025 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#ifndef __MT7925_REGD_H</div><div class='add'>+#define __MT7925_REGD_H</div><div class='add'>+</div><div class='add'>+#include "mt7925.h"</div><div class='add'>+</div><div class='add'>+int mt7925_mcu_regd_update(struct mt792x_dev *dev, u8 *alpha2,</div><div class='add'>+			   enum environment_cap country_ie_env);</div><div class='add'>+</div><div class='add'>+void mt7925_regd_be_ctrl(struct mt792x_dev *dev, u8 *alpha2);</div><div class='add'>+void mt7925_regd_notifier(struct wiphy *wiphy, struct regulatory_request *req);</div><div class='add'>+bool mt7925_regd_clc_supported(struct mt792x_dev *dev);</div><div class='add'>+int mt7925_regd_change(struct mt792x_phy *phy, char *alpha2);</div><div class='add'>+int mt7925_regd_init(struct mt792x_phy *phy);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/regs.h b/drivers/net/wireless/mediatek/mt76/mt7925/regs.h<br/>new file mode 100644<br/>index 000000000000..24985bba1b90<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7925/regs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7925/regs.h</a></div><div class='hunk'>@@ -0,0 +1,92 @@</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause-Clear */</div><div class='add'>+/* Copyright (C) 2023 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#ifndef __MT7925_REGS_H</div><div class='add'>+#define __MT7925_REGS_H</div><div class='add'>+</div><div class='add'>+#include "../mt792x_regs.h"</div><div class='add'>+</div><div class='add'>+#define MT_MDP_BASE			0x820cc800</div><div class='add'>+#define MT_MDP(ofs)			(MT_MDP_BASE + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_MDP_DCR0			MT_MDP(0x000)</div><div class='add'>+#define MT_MDP_DCR0_DAMSDU_EN		BIT(15)</div><div class='add'>+#define MT_MDP_DCR0_RX_HDR_TRANS_EN	BIT(19)</div><div class='add'>+</div><div class='add'>+#define MT_MDP_DCR1			MT_MDP(0x004)</div><div class='add'>+#define MT_MDP_DCR1_MAX_RX_LEN		GENMASK(15, 3)</div><div class='add'>+</div><div class='add'>+#define MT_MDP_BNRCFR0(_band)		MT_MDP(0x090 + ((_band) &lt;&lt; 8))</div><div class='add'>+#define MT_MDP_RCFR0_MCU_RX_MGMT	GENMASK(5, 4)</div><div class='add'>+#define MT_MDP_RCFR0_MCU_RX_CTL_NON_BAR	GENMASK(7, 6)</div><div class='add'>+#define MT_MDP_RCFR0_MCU_RX_CTL_BAR	GENMASK(9, 8)</div><div class='add'>+</div><div class='add'>+#define MT_MDP_BNRCFR1(_band)		MT_MDP(0x094 + ((_band) &lt;&lt; 8))</div><div class='add'>+#define MT_MDP_RCFR1_MCU_RX_BYPASS	GENMASK(23, 22)</div><div class='add'>+#define MT_MDP_RCFR1_RX_DROPPED_UCAST	GENMASK(28, 27)</div><div class='add'>+#define MT_MDP_RCFR1_RX_DROPPED_MCAST	GENMASK(30, 29)</div><div class='add'>+#define MT_MDP_TO_HIF			0</div><div class='add'>+#define MT_MDP_TO_WM			1</div><div class='add'>+</div><div class='add'>+#define MT_WFDMA0_HOST_INT_ENA		MT_WFDMA0(0x204)</div><div class='add'>+#define MT_WFDMA0_HOST_INT_DIS		MT_WFDMA0(0x22c)</div><div class='add'>+#define HOST_RX_DONE_INT_ENA4		BIT(12)</div><div class='add'>+#define HOST_RX_DONE_INT_ENA5		BIT(13)</div><div class='add'>+#define HOST_RX_DONE_INT_ENA6		BIT(14)</div><div class='add'>+#define HOST_RX_DONE_INT_ENA7		BIT(15)</div><div class='add'>+#define HOST_RX_DONE_INT_ENA8		BIT(16)</div><div class='add'>+#define HOST_RX_DONE_INT_ENA9		BIT(17)</div><div class='add'>+#define HOST_RX_DONE_INT_ENA10		BIT(18)</div><div class='add'>+#define HOST_RX_DONE_INT_ENA11		BIT(19)</div><div class='add'>+#define HOST_TX_DONE_INT_ENA15		BIT(25)</div><div class='add'>+#define HOST_TX_DONE_INT_ENA16		BIT(26)</div><div class='add'>+#define HOST_TX_DONE_INT_ENA17		BIT(27)</div><div class='add'>+</div><div class='add'>+/* WFDMA interrupt */</div><div class='add'>+#define MT_INT_RX_DONE_DATA		HOST_RX_DONE_INT_ENA2</div><div class='add'>+#define MT_INT_RX_DONE_WM		HOST_RX_DONE_INT_ENA0</div><div class='add'>+#define MT_INT_RX_DONE_WM2		HOST_RX_DONE_INT_ENA1</div><div class='add'>+#define MT_INT_RX_DONE_ALL		(MT_INT_RX_DONE_DATA | \</div><div class='add'>+					 MT_INT_RX_DONE_WM | \</div><div class='add'>+					 MT_INT_RX_DONE_WM2)</div><div class='add'>+</div><div class='add'>+#define MT_INT_TX_DONE_MCU_WM		(HOST_TX_DONE_INT_ENA15 | \</div><div class='add'>+					 HOST_TX_DONE_INT_ENA17)</div><div class='add'>+</div><div class='add'>+#define MT_INT_TX_DONE_FWDL		HOST_TX_DONE_INT_ENA16</div><div class='add'>+#define MT_INT_TX_DONE_BAND0		HOST_TX_DONE_INT_ENA0</div><div class='add'>+</div><div class='add'>+#define MT_INT_TX_DONE_MCU		(MT_INT_TX_DONE_MCU_WM |	\</div><div class='add'>+					 MT_INT_TX_DONE_FWDL)</div><div class='add'>+#define MT_INT_TX_DONE_ALL		(MT_INT_TX_DONE_MCU |	\</div><div class='add'>+					 MT_INT_TX_DONE_BAND0 |	\</div><div class='add'>+					GENMASK(18, 4))</div><div class='add'>+</div><div class='add'>+#define MT_RX_DATA_RING_BASE		MT_WFDMA0(0x500)</div><div class='add'>+</div><div class='add'>+#define MT_INFRA_CFG_BASE		0xd1000</div><div class='add'>+#define MT_INFRA(ofs)			(MT_INFRA_CFG_BASE + (ofs))</div><div class='add'>+</div><div class='add'>+#define MT_HIF_REMAP_L1			0x155024</div><div class='add'>+#define MT_HIF_REMAP_L1_MASK		GENMASK(31, 16)</div><div class='add'>+#define MT_HIF_REMAP_L1_OFFSET		GENMASK(15, 0)</div><div class='add'>+#define MT_HIF_REMAP_L1_BASE		GENMASK(31, 16)</div><div class='add'>+#define MT_HIF_REMAP_BASE_L1		0x130000</div><div class='add'>+</div><div class='add'>+#define MT_HIF_REMAP_L2			0x0120</div><div class='add'>+#if IS_ENABLED(CONFIG_MT76_DEV)</div><div class='add'>+#define MT_HIF_REMAP_BASE_L2		(0x7c500000 - (0x7c000000 - 0x18000000))</div><div class='add'>+#else</div><div class='add'>+#define MT_HIF_REMAP_BASE_L2		0x18500000</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define MT_WFSYS_SW_RST_B		0x7c000140</div><div class='add'>+</div><div class='add'>+#define MT_WTBLON_TOP_WDUCR		MT_WTBLON_TOP(0x370)</div><div class='add'>+#define MT_WTBLON_TOP_WDUCR_GROUP	GENMASK(4, 0)</div><div class='add'>+</div><div class='add'>+#define MT_WTBL_UPDATE			MT_WTBLON_TOP(0x380)</div><div class='add'>+#define MT_WTBL_UPDATE_WLAN_IDX		GENMASK(11, 0)</div><div class='add'>+#define MT_WTBL_UPDATE_ADM_COUNT_CLEAR	BIT(14)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/testmode.c b/drivers/net/wireless/mediatek/mt76/mt7925/testmode.c<br/>new file mode 100644<br/>index 000000000000..3d40aacfc011<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7925/testmode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7925/testmode.c</a></div><div class='hunk'>@@ -0,0 +1,201 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+</div><div class='add'>+#include "mt7925.h"</div><div class='add'>+#include "mcu.h"</div><div class='add'>+</div><div class='add'>+#define MT7925_EVT_RSP_LEN 512</div><div class='add'>+</div><div class='add'>+enum mt7925_testmode_attr {</div><div class='add'>+	MT7925_TM_ATTR_UNSPEC,</div><div class='add'>+	MT7925_TM_ATTR_SET,</div><div class='add'>+	MT7925_TM_ATTR_QUERY,</div><div class='add'>+	MT7925_TM_ATTR_RSP,</div><div class='add'>+</div><div class='add'>+	/* keep last */</div><div class='add'>+	NUM_MT7925_TM_ATTRS,</div><div class='add'>+	MT7925_TM_ATTR_MAX = NUM_MT7925_TM_ATTRS - 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt7925_tm_cmd {</div><div class='add'>+	u8 padding[4];</div><div class='add'>+	struct uni_cmd_testmode_ctrl c;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct mt7925_tm_evt {</div><div class='add'>+	u32 param0;</div><div class='add'>+	u32 param1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+static const struct nla_policy mt7925_tm_policy[NUM_MT7925_TM_ATTRS] = {</div><div class='add'>+	[MT7925_TM_ATTR_SET] = NLA_POLICY_EXACT_LEN(sizeof(struct mt7925_tm_cmd)),</div><div class='add'>+	[MT7925_TM_ATTR_QUERY] = NLA_POLICY_EXACT_LEN(sizeof(struct mt7925_tm_cmd)),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_tm_set(struct mt792x_dev *dev, struct mt7925_tm_cmd *req)</div><div class='add'>+{</div><div class='add'>+	struct mt7925_rftest_cmd cmd;</div><div class='add'>+	struct mt7925_rftest_cmd *pcmd = &amp;cmd;</div><div class='add'>+	bool testmode = false, normal = false;</div><div class='add'>+	struct mt76_connac_pm *pm = &amp;dev-&gt;pm;</div><div class='add'>+	struct mt76_phy *phy = &amp;dev-&gt;mphy;</div><div class='add'>+	int ret = -ENOTCONN;</div><div class='add'>+</div><div class='add'>+	memset(pcmd, 0, sizeof(*pcmd));</div><div class='add'>+	memcpy(pcmd, req, sizeof(struct mt7925_tm_cmd));</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	if (pcmd-&gt;ctrl.action == CMD_TEST_CTRL_ACT_SWITCH_MODE) {</div><div class='add'>+		if (pcmd-&gt;ctrl.data.op_mode == CMD_TEST_CTRL_ACT_SWITCH_MODE_NORMAL)</div><div class='add'>+			normal = true;</div><div class='add'>+		else</div><div class='add'>+			testmode = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (testmode) {</div><div class='add'>+		/* Make sure testmode running on full power mode */</div><div class='add'>+		pm-&gt;enable = false;</div><div class='add'>+		cancel_delayed_work_sync(&amp;pm-&gt;ps_work);</div><div class='add'>+		cancel_work_sync(&amp;pm-&gt;wake_work);</div><div class='add'>+		__mt792x_mcu_drv_pmctrl(dev);</div><div class='add'>+</div><div class='add'>+		phy-&gt;test.state = MT76_TM_STATE_ON;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mt76_testmode_enabled(phy))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = mt76_mcu_send_msg(&amp;dev-&gt;mt76, MCU_UNI_CMD(TESTMODE_CTRL), &amp;cmd,</div><div class='add'>+				sizeof(cmd), false);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (normal) {</div><div class='add'>+		/* Switch back to the normal world */</div><div class='add'>+		phy-&gt;test.state = MT76_TM_STATE_OFF;</div><div class='add'>+		pm-&gt;enable = true;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mt76.mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925_tm_query(struct mt792x_dev *dev, struct mt7925_tm_cmd *req,</div><div class='add'>+		char *evt_resp)</div><div class='add'>+{</div><div class='add'>+	struct mt7925_rftest_cmd cmd;</div><div class='add'>+	char *pcmd = (char *)&amp;cmd;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	int ret = 1;</div><div class='add'>+</div><div class='add'>+	memset(pcmd, 0, sizeof(*pcmd));</div><div class='add'>+	memcpy(pcmd + 4, (char *)&amp;req-&gt;c, sizeof(struct uni_cmd_testmode_ctrl));</div><div class='add'>+</div><div class='add'>+	if (*((uint16_t *)req-&gt;padding) == MCU_UNI_CMD_TESTMODE_CTRL)</div><div class='add'>+		ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76, MCU_UNI_QUERY(TESTMODE_CTRL),</div><div class='add'>+						&amp;cmd, sizeof(cmd), true, &amp;skb);</div><div class='add'>+	else if (*((uint16_t *)req-&gt;padding) == MCU_UNI_CMD_TESTMODE_RX_STAT)</div><div class='add'>+		ret = mt76_mcu_send_and_get_msg(&amp;dev-&gt;mt76, MCU_UNI_QUERY(TESTMODE_RX_STAT),</div><div class='add'>+						&amp;cmd, sizeof(cmd), true, &amp;skb);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	memcpy((char *)evt_resp, (char *)skb-&gt;data + 8, MT7925_EVT_RSP_LEN);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_testmode_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			void *data, int len)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[NUM_MT76_TM_ATTRS];</div><div class='add'>+	struct mt76_phy *mphy = hw-&gt;priv;</div><div class='add'>+	struct mt792x_phy *phy = mphy-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(MT76_STATE_RUNNING, &amp;mphy-&gt;state) ||</div><div class='add'>+	    !(hw-&gt;conf.flags &amp; IEEE80211_CONF_MONITOR))</div><div class='add'>+		return -ENOTCONN;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_deprecated(tb, MT76_TM_ATTR_MAX, data, len,</div><div class='add'>+				   mt76_tm_policy, NULL);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (tb[MT76_TM_ATTR_DRV_DATA]) {</div><div class='add'>+		struct nlattr *drv_tb[NUM_MT7925_TM_ATTRS], *data;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		data = tb[MT76_TM_ATTR_DRV_DATA];</div><div class='add'>+		ret = nla_parse_nested_deprecated(drv_tb,</div><div class='add'>+						  MT7925_TM_ATTR_MAX,</div><div class='add'>+						  data, mt7925_tm_policy,</div><div class='add'>+						  NULL);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		data = drv_tb[MT7925_TM_ATTR_SET];</div><div class='add'>+		if (data)</div><div class='add'>+			return mt7925_tm_set(phy-&gt;dev, nla_data(data));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt7925_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *msg,</div><div class='add'>+			 struct netlink_callback *cb, void *data, int len)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb[NUM_MT76_TM_ATTRS];</div><div class='add'>+	struct mt76_phy *mphy = hw-&gt;priv;</div><div class='add'>+	struct mt792x_phy *phy = mphy-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(MT76_STATE_RUNNING, &amp;mphy-&gt;state) ||</div><div class='add'>+	    !(hw-&gt;conf.flags &amp; IEEE80211_CONF_MONITOR) ||</div><div class='add'>+	    !mt76_testmode_enabled(mphy))</div><div class='add'>+		return -ENOTCONN;</div><div class='add'>+</div><div class='add'>+	if (cb-&gt;args[2]++ &gt; 0)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	err = nla_parse_deprecated(tb, MT76_TM_ATTR_MAX, data, len,</div><div class='add'>+				   mt76_tm_policy, NULL);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (tb[MT76_TM_ATTR_DRV_DATA]) {</div><div class='add'>+		struct nlattr *drv_tb[NUM_MT7925_TM_ATTRS], *data;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		data = tb[MT76_TM_ATTR_DRV_DATA];</div><div class='add'>+		ret = nla_parse_nested_deprecated(drv_tb,</div><div class='add'>+						  MT7925_TM_ATTR_MAX,</div><div class='add'>+						  data, mt7925_tm_policy,</div><div class='add'>+						  NULL);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		data = drv_tb[MT7925_TM_ATTR_QUERY];</div><div class='add'>+		if (data) {</div><div class='add'>+			char evt_resp[MT7925_EVT_RSP_LEN];</div><div class='add'>+</div><div class='add'>+			err = mt7925_tm_query(phy-&gt;dev, nla_data(data),</div><div class='add'>+					      evt_resp);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+</div><div class='add'>+			return nla_put(msg, MT7925_TM_ATTR_RSP,</div><div class='add'>+				       sizeof(evt_resp), evt_resp);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/usb.c b/drivers/net/wireless/mediatek/mt76/mt7925/usb.c<br/>new file mode 100644<br/>index 000000000000..d9968f03856d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/wireless/mediatek/mt76/mt7925/usb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/wireless/mediatek/mt76/mt7925/usb.c</a></div><div class='hunk'>@@ -0,0 +1,346 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause-Clear</div><div class='add'>+/* Copyright (C) 2023 MediaTek Inc. */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mt7925.h"</div><div class='add'>+#include "mcu.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+</div><div class='add'>+static const struct usb_device_id mt7925u_device_table[] = {</div><div class='add'>+	{ USB_DEVICE_AND_INTERFACE_INFO(0x0e8d, 0x7925, 0xff, 0xff, 0xff),</div><div class='add'>+		.driver_info = (kernel_ulong_t)MT7925_FIRMWARE_WM },</div><div class='add'>+	/* Netgear, Inc. A9000 */</div><div class='add'>+	{ USB_DEVICE_AND_INTERFACE_INFO(0x0846, 0x9072, 0xff, 0xff, 0xff),</div><div class='add'>+		.driver_info = (kernel_ulong_t)MT7925_FIRMWARE_WM },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7925u_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,</div><div class='add'>+			 int cmd, int *seq)</div><div class='add'>+{</div><div class='add'>+	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);</div><div class='add'>+	u32 pad, ep;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7925_mcu_fill_message(mdev, skb, cmd, seq);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mdev-&gt;mcu.timeout = 3 * HZ;</div><div class='add'>+</div><div class='add'>+	if (cmd != MCU_CMD(FW_SCATTER))</div><div class='add'>+		ep = MT_EP_OUT_INBAND_CMD;</div><div class='add'>+	else</div><div class='add'>+		ep = MT_EP_OUT_AC_BE;</div><div class='add'>+</div><div class='add'>+	mt792x_skb_add_usb_sdio_hdr(dev, skb, 0);</div><div class='add'>+	pad = round_up(skb-&gt;len, 4) + 4 - skb-&gt;len;</div><div class='add'>+	__skb_put_zero(skb, pad);</div><div class='add'>+</div><div class='add'>+	ret = mt76u_bulk_msg(&amp;dev-&gt;mt76, skb-&gt;data, skb-&gt;len, NULL,</div><div class='add'>+			     1000, ep);</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925u_mcu_init(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	static const struct mt76_mcu_ops mcu_ops = {</div><div class='add'>+		.headroom = MT_SDIO_HDR_SIZE +</div><div class='add'>+			    sizeof(struct mt76_connac2_mcu_txd),</div><div class='add'>+		.tailroom = MT_USB_TAIL_SIZE,</div><div class='add'>+		.mcu_skb_send_msg = mt7925u_mcu_send_message,</div><div class='add'>+		.mcu_parse_response = mt7925_mcu_parse_response,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev-&gt;mt76.mcu_ops = &amp;mcu_ops;</div><div class='add'>+</div><div class='add'>+	mt76_set(dev, MT_UDMA_TX_QSEL, MT_FW_DL_EN);</div><div class='add'>+	ret = mt7925_run_firmware(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	set_bit(MT76_STATE_MCU_RUNNING, &amp;dev-&gt;mphy.state);</div><div class='add'>+	mt76_clear(dev, MT_UDMA_TX_QSEL, MT_FW_DL_EN);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925u_mac_reset(struct mt792x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mt76_txq_schedule_all(&amp;dev-&gt;mphy);</div><div class='add'>+	mt76_worker_disable(&amp;dev-&gt;mt76.tx_worker);</div><div class='add'>+</div><div class='add'>+	set_bit(MT76_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+	set_bit(MT76_MCU_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+</div><div class='add'>+	wake_up(&amp;dev-&gt;mt76.mcu.wait);</div><div class='add'>+	skb_queue_purge(&amp;dev-&gt;mt76.mcu.res_q);</div><div class='add'>+</div><div class='add'>+	mt76u_stop_rx(&amp;dev-&gt;mt76);</div><div class='add'>+	mt76u_stop_tx(&amp;dev-&gt;mt76);</div><div class='add'>+</div><div class='add'>+	mt792xu_wfsys_reset(dev);</div><div class='add'>+</div><div class='add'>+	clear_bit(MT76_MCU_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+	err = mt76u_resume_rx(&amp;dev-&gt;mt76);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt792xu_mcu_power_on(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt792xu_dma_init(dev, false);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mt76_wr(dev, MT_SWDEF_MODE, MT_SWDEF_NORMAL_MODE);</div><div class='add'>+	mt76_set(dev, MT_UDMA_TX_QSEL, MT_FW_DL_EN);</div><div class='add'>+</div><div class='add'>+	err = mt7925_run_firmware(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mt76_clear(dev, MT_UDMA_TX_QSEL, MT_FW_DL_EN);</div><div class='add'>+</div><div class='add'>+	err = mt7925_mcu_set_eeprom(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = mt7925_mac_init(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = __mt7925_start(&amp;dev-&gt;phy);</div><div class='add'>+out:</div><div class='add'>+	clear_bit(MT76_RESET, &amp;dev-&gt;mphy.state);</div><div class='add'>+</div><div class='add'>+	mt76_worker_enable(&amp;dev-&gt;mt76.tx_worker);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7925u_probe(struct usb_interface *usb_intf,</div><div class='add'>+			 const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	static const struct mt76_driver_ops drv_ops = {</div><div class='add'>+		.txwi_size = MT_SDIO_TXD_SIZE,</div><div class='add'>+		.drv_flags = MT_DRV_RX_DMA_HDR | MT_DRV_HW_MGMT_TXQ |</div><div class='add'>+			     MT_DRV_AMSDU_OFFLOAD,</div><div class='add'>+		.survey_flags = SURVEY_INFO_TIME_TX |</div><div class='add'>+				SURVEY_INFO_TIME_RX |</div><div class='add'>+				SURVEY_INFO_TIME_BSS_RX,</div><div class='add'>+		.tx_prepare_skb = mt7925_usb_sdio_tx_prepare_skb,</div><div class='add'>+		.tx_complete_skb = mt7925_usb_sdio_tx_complete_skb,</div><div class='add'>+		.tx_status_data = mt7925_usb_sdio_tx_status_data,</div><div class='add'>+		.rx_skb = mt7925_queue_rx_skb,</div><div class='add'>+		.rx_check = mt7925_rx_check,</div><div class='add'>+		.sta_add = mt7925_mac_sta_add,</div><div class='add'>+		.sta_event = mt7925_mac_sta_event,</div><div class='add'>+		.sta_remove = mt7925_mac_sta_remove,</div><div class='add'>+		.update_survey = mt792x_update_channel,</div><div class='add'>+	};</div><div class='add'>+	static const struct mt792x_hif_ops hif_ops = {</div><div class='add'>+		.mcu_init = mt7925u_mcu_init,</div><div class='add'>+		.init_reset = mt792xu_init_reset,</div><div class='add'>+		.reset = mt7925u_mac_reset,</div><div class='add'>+	};</div><div class='add'>+	static struct mt76_bus_ops bus_ops = {</div><div class='add'>+		.rr = mt792xu_rr,</div><div class='add'>+		.wr = mt792xu_wr,</div><div class='add'>+		.rmw = mt792xu_rmw,</div><div class='add'>+		.read_copy = mt76u_read_copy,</div><div class='add'>